From 090c677210ee2946d99c71412e4ff762bb300f4f Mon Sep 17 00:00:00 2001
From: phil <phil>
Date: Mon, 17 May 2004 11:52:09 +0000
Subject: [PATCH] smash the HEAD with the contents of b_cmd. 
 HEAD_PRE_CMD_SMASH and cMD_PRE_CMD_SMASH are the relevant tags.

The pre-smashing contents of HEAD will be committed by yury into b_cmd as a
merge of the two branches.  These will be stabilized on b_cmd and eventually
landed onto HEAD.
---
 .../patches/export-ext3-2.6-suse.patch             |     33 -
 .../patches/export_symbols-ext3-2.6-suse.patch     |     17 -
 .../patches/ext3-ea-in-inode-2.6-suse.patch        |    833 -
 .../patches/ext3-include-fixes-2.6-suse.patch      |     20 -
 .../kernel_patches/patches/iopen-2.6-suse.patch    |    475 -
 .../kernel_patches/series/ldiskfs-2.6-suse.series  |      9 -
 ldiskfs/ldiskfs/Makefile.in                        |     19 -
 ldiskfs/ldiskfs/autoMakefile.am                    |     64 -
 lnet/.cvsignore                                    |      6 +-
 lnet/Makefile.am                                   |     19 +
 lnet/Makefile.in                                   |      9 -
 lnet/Rules.linux                                   |     29 +
 lnet/archdep.m4                                    |    792 +-
 lnet/build.m4                                      |     51 +-
 .../autoMakefile.am => lnet/include/Makefile.am    |      4 +-
 lnet/include/linux/Makefile.am                     |     10 +
 lnet/include/linux/kp30.h                          |     79 +-
 lnet/include/linux/kpr.h                           |     15 +
 lnet/include/linux/libcfs.h                        |     79 +-
 lnet/include/linux/portals_compat25.h              |     28 +-
 lnet/include/lnet/Makefile.am                      |     10 +
 lnet/include/lnet/api-support.h                    |      2 +
 lnet/include/lnet/api.h                            |     21 +-
 lnet/include/lnet/arg-blocks.h                     |      4 +-
 lnet/include/lnet/errno.h                          |      7 +-
 lnet/include/lnet/internal.h                       |     17 +-
 lnet/include/lnet/lib-dispatch.h                   |      1 +
 lnet/include/lnet/lib-lnet.h                       |      9 +-
 lnet/include/lnet/lib-p30.h                        |      9 +-
 lnet/include/lnet/lib-types.h                      |      8 +-
 lnet/include/lnet/lnet.h                           |     39 +
 lnet/include/lnet/lnetctl.h                        |     12 +-
 lnet/include/lnet/nal.h                            |     31 +-
 lnet/include/lnet/nalids.h                         |      4 +
 lnet/include/lnet/p30.h                            |     39 +
 lnet/include/lnet/ptlctl.h                         |     12 +-
 lnet/include/lnet/types.h                          |     60 +-
 lnet/klnds/.cvsignore                              |      6 +-
 {lustre/include/lustre => lnet/klnds}/Makefile.am  |      6 +-
 lnet/klnds/Makefile.in                             |      6 -
 lnet/klnds/gmlnd/.cvsignore                        |      9 +-
 lnet/klnds/gmlnd/Makefile.am                       |     13 +
 lnet/klnds/gmlnd/Makefile.in                       |      6 -
 lnet/klnds/gmlnd/autoMakefile.am                   |     15 -
 lnet/klnds/gmlnd/gmlnd.h                           |     11 +-
 lnet/klnds/gmlnd/gmlnd_api.c                       |    179 +-
 lnet/klnds/gmlnd/gmlnd_module.c                    |     26 +-
 lnet/klnds/iblnd/.cvsignore                        |      9 +-
 lnet/klnds/iblnd/Makefile.am                       |     10 +
 lnet/klnds/iblnd/Makefile.in                       |      6 -
 lnet/klnds/iblnd/autoMakefile.am                   |     10 -
 lnet/klnds/iblnd/ibnal.c                           |     11 +-
 lnet/klnds/qswlnd/.cvsignore                       |      9 +-
 lnet/klnds/qswlnd/Makefile.am                      |     17 +
 lnet/klnds/qswlnd/Makefile.in                      |      6 -
 lnet/klnds/qswlnd/autoMakefile.am                  |     15 -
 lnet/klnds/qswlnd/qswlnd.c                         |    291 +-
 lnet/klnds/qswlnd/qswlnd.h                         |     35 +-
 lnet/klnds/qswlnd/qswlnd_cb.c                      |    132 +-
 lnet/klnds/scimaclnd/.cvsignore                    |      9 +-
 lnet/klnds/scimaclnd/Makefile.am                   |     11 +
 lnet/klnds/scimaclnd/Makefile.in                   |      6 -
 lnet/klnds/scimaclnd/autoMakefile.am               |     13 -
 lnet/klnds/scimaclnd/scimacnal.c                   |    166 +-
 lnet/klnds/socklnd/.cvsignore                      |     10 +-
 lnet/klnds/socklnd/Makefile.am                     |     17 +
 lnet/klnds/socklnd/Makefile.in                     |      8 -
 lnet/klnds/socklnd/autoMakefile.am                 |     13 -
 lnet/klnds/socklnd/socklnd.c                       |    227 +-
 lnet/klnds/socklnd/socklnd.h                       |      9 +-
 lnet/klnds/socklnd/socklnd_cb.c                    |     37 +-
 lnet/libcfs/.cvsignore                             |     10 +-
 lnet/libcfs/Makefile.am                            |     20 +
 lnet/libcfs/Makefile.in                            |      4 -
 lnet/libcfs/autoMakefile.am                        |     11 -
 lnet/libcfs/debug.c                                |     96 +-
 lnet/libcfs/module.c                               |    105 +-
 lnet/libcfs/proc.c                                 |     24 +-
 lnet/lnet/.cvsignore                               |     10 +-
 lnet/lnet/{autoMakefile.am => Makefile.am}         |     30 +-
 lnet/lnet/Makefile.in                              |      6 -
 lnet/lnet/api-eq.c                                 |     23 +-
 lnet/lnet/api-errno.c                              |      3 +-
 lnet/lnet/api-init.c                               |     26 +-
 lnet/lnet/api-me.c                                 |     16 +-
 lnet/lnet/api-ni.c                                 |    247 +-
 lnet/lnet/api-wrap.c                               |     88 +-
 lnet/lnet/lib-dispatch.c                           |      1 +
 lnet/lnet/lib-init.c                               |     71 +-
 lnet/lnet/lib-md.c                                 |     66 +-
 lnet/lnet/lib-me.c                                 |      7 +
 lnet/lnet/lib-msg.c                                |      4 +
 lnet/lnet/lib-ni.c                                 |     12 +
 lnet/lnet/module.c                                 |    352 +-
 lnet/router/.cvsignore                             |     10 +-
 lnet/router/Makefile.am                            |     16 +
 lnet/router/Makefile.in                            |      4 -
 lnet/router/autoMakefile.am                        |     13 -
 lnet/router/router.c                               |    149 +-
 lnet/router/router.h                               |      9 +
 lnet/tests/.cvsignore                              |     10 +-
 lnet/tests/Makefile.am                             |     23 +
 lnet/tests/Makefile.in                             |     16 -
 lnet/tests/autoMakefile.am                         |     16 -
 lnet/tests/ping_cli.c                              |     41 +-
 lnet/tests/ping_srv.c                              |     22 +-
 lnet/tests/sping_cli.c                             |     44 +-
 lnet/tests/sping_srv.c                             |     23 +-
 lnet/ulnds/Makefile.am                             |     13 +-
 lnet/ulnds/bridge.h                                |     12 +-
 lnet/ulnds/connection.c                            |      9 +-
 lnet/ulnds/procapi.c                               |     61 +-
 lnet/ulnds/procbridge.h                            |      7 +-
 lnet/ulnds/proclib.c                               |     37 +-
 lnet/ulnds/socklnd/Makefile.am                     |     13 +-
 lnet/ulnds/socklnd/bridge.h                        |     12 +-
 lnet/ulnds/socklnd/connection.c                    |      9 +-
 lnet/ulnds/socklnd/procapi.c                       |     61 +-
 lnet/ulnds/socklnd/procbridge.h                    |      7 +-
 lnet/ulnds/socklnd/proclib.c                       |     37 +-
 lnet/utils/Makefile.am                             |     30 +-
 lnet/utils/acceptor.c                              |      2 +
 lnet/utils/debug.c                                 |     12 +-
 lnet/utils/gmlndnid.c                              |      2 +
 lnet/utils/l_ioctl.c                               |     10 +-
 lnet/utils/parser.c                                |     77 +-
 lnet/utils/parser.h                                |      6 +
 lnet/utils/portals.c                               |    129 +-
 lnet/utils/wirecheck.c                             |      2 +-
 lustre/.cvsignore                                  |     15 +-
 lustre/ChangeLog                                   |     58 +-
 lustre/Makefile.am                                 |     66 +
 lustre/Makefile.in                                 |     25 -
 lustre/README.kernel-source                        |     74 -
 lustre/Rules                                       |     49 +
 lustre/Rules.in                                    |     46 -
 lustre/autoMakefile.am                             |     91 -
 lustre/autogen.sh                                  |     91 +-
 lustre/cobd/.cvsignore                             |      9 +-
 lustre/cobd/{autoMakefile.am => Makefile.am}       |     14 +-
 lustre/cobd/Makefile.in                            |      4 -
 lustre/cobd/cache_obd.c                            |     67 +-
 lustre/conf/Makefile.am                            |      3 +
 lustre/conf/lustre.dtd                             |      4 +-
 lustre/configure.in                                |    261 +-
 lustre/doc/Makefile.am                             |      2 +
 lustre/doc/lmc.1                                   |      2 +-
 lustre/doc/lmc.lyx                                 |      2 +-
 lustre/include/.cvsignore                          |      1 -
 lustre/include/Makefile.am                         |      4 +-
 lustre/include/config.h.in                         |     61 +
 lustre/include/liblustre.h                         |    127 +-
 lustre/include/linux/Makefile.am                   |      5 +-
 lustre/include/linux/lprocfs_status.h              |     37 +-
 lustre/include/linux/lustre_compat25.h             |     47 +-
 lustre/include/linux/lustre_dlm.h                  |     23 +-
 lustre/include/linux/lustre_export.h               |      3 +
 lustre/include/linux/lustre_fsfilt.h               |    354 +-
 lustre/include/linux/lustre_idl.h                  |     89 +-
 lustre/include/linux/lustre_lib.h                  |     14 +-
 lustre/include/linux/lustre_lite.h                 |      9 +-
 lustre/include/linux/lustre_log.h                  |    290 +-
 lustre/include/linux/lustre_mds.h                  |     23 +-
 lustre/include/linux/lustre_net.h                  |     66 +-
 lustre/include/linux/lustre_smfs.h                 |    274 -
 lustre/include/{lustre => linux}/lustre_user.h     |     49 +-
 lustre/include/linux/lvfs.h                        |     29 +-
 lustre/include/linux/lvfs_linux.h                  |      4 +-
 lustre/include/linux/obd.h                         |    157 +-
 lustre/include/linux/obd_class.h                   |    308 +-
 lustre/include/linux/obd_lmv.h                     |     11 +
 lustre/include/linux/obd_support.h                 |      2 -
 lustre/include/lustre/liblustreapi.h               |     42 -
 lustre/install-sh                                  |    251 +
 lustre/kernel-tests/.cvsignore                     |      5 -
 lustre/kernel-tests/Makefile                       |     24 -
 .../kernel-2.4.18-chaos-2.4.18-i686-smp.config     |   1103 -
 .../kernel-2.4.18-chaos-2.4.18-i686.config         |   1103 -
 ...config => kernel-2.4.20-rh-2.4-i586-smp.config} |      0
 ...686.config => kernel-2.4.20-rh-2.4-i586.config} |      0
 .../kernel-2.4.21-suse-2.4.21-2-x86_64.config      |   2036 -
 lustre/kernel_patches/patches/2.6.0-mm2.patch      | 203869 ++++++++++++++++++
 .../kernel_patches/patches/2.6.0-test6-mm4.patch   | 113204 ++++++++++
 .../kernel_patches/patches/add_page_private.patch  |     22 +-
 lustre/kernel_patches/patches/bproc-patch-2.4.20   |      6 +-
 lustre/kernel_patches/patches/cifs_2.6.5.patch     |     65 -
 .../configurable-x86-stack-2.4.21-sles8sp3.patch   |    330 -
 .../patches/dev_read_only-suse-2.4.19.patch        |     76 -
 ...ly-2.6-suse.patch => dev_read_only_2.6.0.patch} |      0
 .../kernel_patches/patches/directio-2.4.24.patch   |     15 -
 .../patches/dynamic-locks-2.4.24.patch             |    217 +
 .../kernel_patches/patches/export-2.6-suse.patch   |     24 -
 lustre/kernel_patches/patches/export-2.6.3.patch   |     57 +
 .../patches/export-ext3-2.6-suse.patch             |     33 -
 ...2.6-suse.patch => export-truncate-2.5.63.patch} |      0
 .../patches/export_symbols-2.6.0-test6.patch       |     68 +
 ...s-2.6-suse.patch => export_symbols-2.6.0.patch} |     42 +-
 .../patches/export_symbols-ext3-2.6-suse.patch     |     17 -
 .../patches/exports_2.4.19-suse.patch              |     36 +-
 .../patches/ext-2.4-patch-1-suse-2.4.19.patch      |   2551 -
 .../patches/ext3-ea-in-inode-2.4.18-chaos.patch    |     30 +-
 .../patches/ext3-ea-in-inode-2.4.20.patch          |     30 +-
 .../patches/ext3-ea-in-inode-2.4.21-chaos.patch    |     30 +-
 .../patches/ext3-ea-in-inode-2.4.21-suse2.patch    |     30 +-
 .../patches/ext3-ea-in-inode-2.4.22-rh.patch       |     30 +-
 ...2.6-suse.patch => ext3-ea-in-inode-2.6.0.patch} |     28 +-
 .../ext3-extents-2.4.18-chaos-pdirops.patch        |      2 +-
 .../patches/ext3-extents-2.4.18-chaos.patch        |      2 +-
 .../patches/ext3-extents-2.4.24.patch              |   2810 -
 .../patches/ext3-htree-2.4.19-pre1.patch           |      4 +-
 .../patches/ext3-htree-2.4.21-chaos.patch          |      4 +-
 .../patches/ext3-htree-2.4.22-rh.patch             |      4 +-
 .../kernel_patches/patches/ext3-htree-suse.patch   |      4 +-
 lustre/kernel_patches/patches/ext3-htree.patch     |      4 +-
 .../patches/ext3-include-fixes-2.6-suse.patch      |     20 -
 ...suse.patch => ext3-init-generation-2.6.0.patch} |      0
 .../patches/ext3-map_inode_page-2.6-suse.patch     |     81 -
 .../patches/ext3-map_inode_page-2.6.0.patch        |      0
 .../patches/ext3-mballoc-2.4.21-suse2.patch        |      6 +-
 .../patches/ext3-mballoc-2.4.24.patch              |      6 +-
 .../patches/ext3-mds-num-2.4.24.patch              |    285 +
 .../patches/ext3-orphan_lock-2.4.19-suse.patch     |     30 +-
 .../patches/ext3-pdirops-2.4.24.patch              |   1248 +
 .../patches/ext3-san-jdike-2.5.73.patch            |      0
 .../patches/ext3-san-jdike-2.6-suse.patch          |    106 -
 .../patches/ext3-trusted_ea-suse-2.4.19.patch      |    179 -
 .../patches/ext3-use-after-free-suse.patch         |     14 +-
 .../patches/ext3-wantedi-2.6.3.patch               |     16 +
 ...ntedi-2.6-suse.patch => ext3-wantedi-2.6.patch} |     64 +-
 .../patches/ext3-wantedi-misc-2.6-suse.patch       |     16 -
 .../patches/ext3-xattr-header-move-2.6.suse.patch  |    506 -
 ...nt-2.6-suse.patch => fs-intent-2.6.3-mm4.patch} |     46 +-
 .../patches/header-guards-2.6-suse.patch           |     38 -
 .../kernel_patches/patches/htree-ext3-2.4.18.patch |      4 +-
 .../patches/invalidate_show-2.4.21-sles8sp3.patch  |    134 -
 .../patches/invalidate_show-2.6.0.patch            |     54 +
 lustre/kernel_patches/patches/iopen-2.4.18-2.patch |    189 +-
 lustre/kernel_patches/patches/iopen-2.4.18.patch   |    189 +-
 .../kernel_patches/patches/iopen-2.4.19-suse.patch |     58 +-
 .../patches/iopen-2.4.21-sles8sp3.patch            |    494 -
 lustre/kernel_patches/patches/iopen-2.5.73.patch   |    403 +
 lustre/kernel_patches/patches/iopen-2.6-suse.patch |    475 -
 .../kernel_patches/patches/iopen-2.6.0-test6.patch |    422 +
 lustre/kernel_patches/patches/iopen-2.6.0.patch    |    403 +
 ...pen-2.6-vanilla.patch => iopen-2.6.3-mm4.patch} |    110 +-
 .../patches/iopen-misc-2.6-suse.patch              |     80 -
 .../kernel_text_address-2.4.21-sles8sp3.patch      |    115 -
 .../patches/kernel_text_address-2.6.0.patch        |     45 +
 .../patches/kernel_text_address-2.6.3.patch        |     26 +
 .../kernel_patches/patches/kexec-2.6.0-full.patch  |   1406 +
 .../patches/kexec-2.6.0-test6-full.patch           |   1481 +
 .../patches/linux-2.4.19-pre1-xattr-0.8.54.patch   |     41 +-
 .../patches/linux-2.4.19-xattr-0.8.54-suse.patch   |     33 +-
 .../patches/linux-2.4.20-tmpfs-iopen.patch         |   1287 +
 .../patches/linux-2.4.20-tmpfs-xattr.patch         |    543 +
 .../patches/linux-2.4.20-xattr-0.8.54-chaos.patch  |     41 +-
 .../patches/linux-2.4.20-xattr-0.8.54-hp.patch     |     10 +-
 .../patches/linux-2.4.20-xattr-0.8.54.patch        |     41 +-
 .../patches/linux-2.4.21-xattr-0.8.54-chaos.patch  |      4 +-
 .../patches/linux-2.4.21-xattr-0.8.54-suse.patch   |     28 +-
 .../patches/linux-2.4.22-xattr-0.8.54.patch        |     28 +-
 .../patches/linux-2.4.24-xattr-0.8.54.patch        |     28 +-
 .../patches/linux-2.6.3-CITI_NFS4_ALL.patch        |  14513 ++
 .../patches/linux-2.6.3-nfs-intent.patch           |     76 +
 .../patches/lkcd-cvs-2.6.0-test6.patch             |   6496 +
 .../patches/lkcd-kernel-changes-2.6.0-test6.patch  |    615 +
 lustre/kernel_patches/patches/lustre_version.patch |      7 +-
 .../patches/mkdep-revert-rh-2.4.patch              |     50 -
 .../patches/nfs-cifs-intent-2.6.3-suse.patch       |    111 +
 .../patches/qla2xxx-v8.00.00b1-2.5.73.patch        |  58389 +++++
 .../patches/removepage-2.6-suse.patch              |     30 -
 .../kernel_patches/patches/removepage-2.6.0.patch  |     28 +
 .../patches/removepage-vanilla-2.6.5.patch         |     31 -
 .../patches/revalide-special-oops-2.6.4.suse.patch |     22 -
 .../patches/tcp-zero-copy-2.4.21-sles8sp3.patch    |    458 -
 lustre/kernel_patches/patches/uml-2.6.0-fix.patch  |     19 +
 lustre/kernel_patches/patches/uml-fix-2.6.3.patch  |     13 +
 ...tch-2.4.24-1.patch => uml-patch-2.4.23-1.patch} |    887 +-
 .../patches/uml-patch-2.6.0-1-fix1.patch           |     15 +
 .../kernel_patches/patches/uml-patch-2.6.0-1.patch |  18163 ++
 .../patches/uml-patch-2.6.0-test5.patch            |   9304 +
 .../patches/uml-patch-2.6.3-rc2-1.patch            |  18844 ++
 .../patches/vfs_intent-2.4.18-18-chaos65.patch     |    485 +-
 .../patches/vfs_intent-2.4.19-pre1.patch           |    418 +-
 .../patches/vfs_intent-2.4.19-suse.patch           |    414 +-
 .../patches/vfs_intent-2.4.20-hp.patch             |    410 +-
 .../patches/vfs_intent-2.4.20-rh.patch             |     80 +-
 .../patches/vfs_intent-2.4.20-vanilla.patch        |    383 +-
 .../patches/vfs_intent-2.4.21-chaos.patch          |     19 +-
 .../patches/vfs_intent-2.4.21-sles8sp3.patch       |   1862 -
 .../patches/vfs_intent-2.4.21-suse2.patch          |    213 +-
 .../patches/vfs_intent-2.4.22-rh.patch             |     45 +-
 .../patches/vfs_intent-2.6.3-suse.patch            |    777 +
 ...ntent-2.6-suse.patch => vfs_intent-2.6.3.patch} |    205 +-
 .../patches/vfs_intent_2.6.0-test1.patch           |    734 +
 .../patches/vfs_intent_2.6.0-test6.patch           |    754 +
 .../kernel_patches/patches/vfs_intent_2.6.0.patch  |    762 +
 .../patches/vfs_mntcwd_2.5.72_rev1.patch           |      0
 .../patches/vfs_nointent-2.6.3-mm4.patch           |    423 +
 .../patches/vfs_nointent_2.6.0-test1.patch         |    405 +
 .../patches/vfs_nointent_2.6.0-test6.patch         |    423 +
 .../patches/vfs_nointent_2.6.0-uml1.patch          |    423 +
 ....6-suse.patch => vfs_nointent_2.6.3-suse.patch} |    190 +-
 ...-2.6-suse.patch => vfs_races_2.5.72_rev1.patch} |      0
 .../patches/xattr-0.8.54-2.4.22-rh.patch           |     41 +-
 lustre/kernel_patches/series/2.6-suse.series       |     13 -
 lustre/kernel_patches/series/2.6.3-mm4             |     17 +
 lustre/kernel_patches/series/chaos-2.4.18          |      3 -
 lustre/kernel_patches/series/chaos-2.4.18-pdirops  |      1 -
 lustre/kernel_patches/series/chaos-2.4.21          |      2 +-
 lustre/kernel_patches/series/kgdb_2.6.0            |     20 +
 lustre/kernel_patches/series/kgdb_2.6.0_test1      |     16 +
 lustre/kernel_patches/series/kgdb_2.6.0_test6      |     23 +
 .../kernel_patches/series/ldiskfs-2.6-suse.series  |      9 -
 .../series/ldiskfs-2.6.6-vanilla.series            |      9 -
 lustre/kernel_patches/series/rh-2.4.20             |      1 -
 lustre/kernel_patches/series/suse-2.4.19           |      7 +-
 lustre/kernel_patches/series/suse-2.4.21-2         |      2 +-
 lustre/kernel_patches/series/suse-2.6.3            |     17 +
 lustre/kernel_patches/series/suse-sles8sp3-2.4.21  |     31 -
 lustre/kernel_patches/series/uml_2.6.0             |     20 +
 lustre/kernel_patches/series/uml_2.6.0_test3       |     15 +
 lustre/kernel_patches/series/vanilla-2.4.20        |      2 +
 lustre/kernel_patches/series/vanilla-2.4.24        |      7 +-
 lustre/kernel_patches/series/vanilla-2.6.3-nfs4    |     20 +
 lustre/kernel_patches/series/vanilla-2.6.6         |     13 -
 lustre/kernel_patches/targets/2.6-suse.target      |     13 -
 lustre/kernel_patches/targets/chaos-2.4.18.target  |     13 -
 lustre/kernel_patches/targets/rh-2.4.target        |     10 +-
 lustre/kernel_patches/targets/suse-2.4.21-2.target |     14 -
 lustre/kernel_patches/which_patch                  |      1 -
 lustre/ldiskfs/.cvsignore                          |     19 -
 lustre/ldiskfs/Makefile.in                         |     19 -
 lustre/ldiskfs/autoMakefile.am                     |     64 -
 lustre/ldlm/.cvsignore                             |      2 -
 lustre/ldlm/Makefile.am                            |     14 +-
 lustre/ldlm/Makefile.mk                            |      3 +-
 lustre/ldlm/ldlm_extent.c                          |    127 +-
 lustre/ldlm/ldlm_internal.h                        |     34 +-
 lustre/ldlm/ldlm_lib.c                             |     20 +-
 lustre/ldlm/ldlm_lock.c                            |     34 +-
 lustre/ldlm/ldlm_lockd.c                           |    239 +-
 lustre/ldlm/ldlm_request.c                         |     39 +-
 lustre/ldlm/ldlm_resource.c                        |     18 +-
 lustre/liblustre/Makefile.am                       |     52 +-
 lustre/liblustre/dir.c                             |      7 +-
 lustre/liblustre/file.c                            |     28 +-
 lustre/liblustre/genlib.sh                         |      2 +-
 lustre/liblustre/llite_lib.c                       |    238 +-
 lustre/liblustre/namei.c                           |     19 +-
 lustre/liblustre/rw.c                              |    111 +-
 lustre/liblustre/super.c                           |     49 +-
 lustre/liblustre/tests/.cvsignore                  |      7 +-
 lustre/liblustre/tests/Makefile.am                 |     39 +-
 lustre/liblustre/tests/echo_test.c                 |     77 +-
 lustre/liblustre/tests/recovery_small.c            |     27 +-
 lustre/liblustre/tests/replay_single.c             |     43 +-
 lustre/liblustre/tests/sanity.c                    |      8 +-
 lustre/liblustre/tests/test_common.c               |     13 -
 lustre/liblustre/tests/test_common.h               |      2 -
 lustre/llite/.cvsignore                            |      8 +-
 lustre/llite/Makefile.am                           |     21 +
 lustre/llite/Makefile.in                           |     10 -
 lustre/llite/Makefile.mk                           |      2 +-
 lustre/llite/autoMakefile.am                       |     11 -
 lustre/llite/dcache.c                              |    112 +-
 lustre/llite/dir.c                                 |    193 +-
 lustre/llite/file.c                                |    266 +-
 lustre/llite/llite_close.c                         |      4 +-
 lustre/llite/llite_internal.h                      |     60 +-
 lustre/llite/llite_lib.c                           |    202 +-
 lustre/llite/llite_nfs.c                           |      9 +-
 lustre/llite/lproc_llite.c                         |     62 +-
 lustre/llite/namei.c                               |    116 +-
 lustre/llite/rw.c                                  |    451 +-
 lustre/llite/rw24.c                                |     81 +-
 lustre/llite/rw26.c                                |     60 +-
 lustre/llite/special.c                             |    399 -
 lustre/llite/super.c                               |     45 +-
 lustre/llite/super25.c                             |     30 +-
 lustre/llite/symlink.c                             |     16 +-
 lustre/{include/lustre => lmv}/.cvsignore          |      1 +
 lustre/lmv/Makefile.am                             |     18 +
 lustre/lmv/lmv_intent.c                            |    727 +
 lustre/lmv/lmv_internal.h                          |     88 +
 lustre/lmv/lmv_obd.c                               |   1206 +
 lustre/lmv/lmv_objmgr.c                            |    200 +
 lustre/lov/.cvsignore                              |      8 +-
 lustre/lov/{autoMakefile.am => Makefile.am}        |     17 +-
 lustre/lov/Makefile.in                             |      4 -
 lustre/lov/lov_internal.h                          |      8 +-
 lustre/lov/lov_log.c                               |     53 +-
 lustre/lov/lov_obd.c                               |    267 +-
 lustre/lov/lov_pack.c                              |     31 +-
 lustre/lov/lproc_lov.c                             |      7 +-
 lustre/lvfs/.cvsignore                             |     11 +-
 lustre/lvfs/Makefile.am                            |     52 +
 lustre/lvfs/Makefile.in                            |     18 -
 lustre/lvfs/Makefile.mk                            |      5 +-
 lustre/lvfs/autoMakefile.am                        |     46 -
 lustre/lvfs/fsfilt_ext3.c                          |    600 +-
 lustre/lvfs/fsfilt_reiserfs.c                      |     26 +-
 lustre/lvfs/fsfilt_smfs.c                          |    700 -
 lustre/lvfs/llog_lvfs.c                            |    933 -
 lustre/lvfs/lvfs_common.c                          |      2 +-
 lustre/lvfs/lvfs_internal.h                        |      3 -
 lustre/lvfs/lvfs_linux.c                           |     46 +-
 lustre/lvfs/lvfs_reint.c                           |    542 -
 lustre/lvfs/lvfs_undo.c                            |    421 -
 lustre/lvfs/lvfs_userfs.c                          |      9 +-
 lustre/mdc/.cvsignore                              |      8 +-
 lustre/mdc/{autoMakefile.am => Makefile.am}        |     16 +-
 lustre/mdc/Makefile.in                             |      4 -
 lustre/mdc/mdc_internal.h                          |      2 -
 lustre/mdc/mdc_lib.c                               |     35 +-
 lustre/mdc/mdc_locks.c                             |     32 +-
 lustre/mdc/mdc_reint.c                             |      1 +
 lustre/mdc/mdc_request.c                           |    446 +-
 lustre/mds/.cvsignore                              |      8 +-
 lustre/mds/Makefile.am                             |     13 +
 lustre/mds/Makefile.in                             |      5 -
 lustre/mds/autoMakefile.am                         |     11 -
 lustre/mds/handler.c                               |    832 +-
 lustre/mds/lproc_mds.c                             |     12 +-
 lustre/mds/mds_fs.c                                |     94 +-
 lustre/mds/mds_internal.h                          |     25 +-
 lustre/mds/mds_lib.c                               |     40 +-
 lustre/mds/mds_lmv.c                               |    643 +
 lustre/mds/mds_log.c                               |     57 +-
 lustre/mds/mds_lov.c                               |    116 +-
 lustre/mds/mds_open.c                              |    325 +-
 lustre/mds/mds_reint.c                             |    938 +-
 lustre/mds/mds_unlink_open.c                       |     33 +-
 lustre/mgmt/.cvsignore                             |      5 +-
 .../{portals/autoMakefile.am => mgmt/Makefile.am}  |      7 +-
 lustre/mgmt/Makefile.in                            |      9 -
 lustre/mgmt/autoMakefile.am                        |      9 -
 lustre/mgmt/mgmt_cli.c                             |      6 +-
 lustre/mgmt/mgmt_svc.c                             |     10 +-
 lustre/missing                                     |    336 +
 lustre/mkinstalldirs                               |     40 +
 lustre/obdclass/.cvsignore                         |      8 +-
 lustre/obdclass/Makefile.am                        |     53 +
 lustre/obdclass/Makefile.in                        |     15 -
 lustre/obdclass/Makefile.mk                        |      4 +-
 lustre/obdclass/autoMakefile.am                    |     18 -
 lustre/obdclass/class_obd.c                        |     65 +-
 lustre/obdclass/genops.c                           |     19 +-
 lustre/{lvfs => obdclass}/llog.c                   |    125 +-
 lustre/{lvfs => obdclass}/llog_cat.c               |    316 +-
 lustre/obdclass/llog_internal.h                    |      8 +
 lustre/obdclass/llog_ioctl.c                       |     12 +-
 lustre/obdclass/llog_lvfs.c                        |    764 +
 lustre/obdclass/llog_obd.c                         |    196 +-
 lustre/obdclass/llog_test.c                        |    105 +-
 lustre/obdclass/lprocfs_status.c                   |     74 +-
 lustre/obdclass/lustre_peer.c                      |     29 +-
 lustre/obdclass/mea.c                              |     72 +
 lustre/obdclass/obd_config.c                       |     64 +-
 lustre/obdclass/simple.c                           |     44 +-
 lustre/obdclass/sysctl.c                           |      3 -
 lustre/obdecho/.cvsignore                          |      8 +-
 lustre/obdecho/{autoMakefile.am => Makefile.am}    |     18 +-
 lustre/obdecho/Makefile.in                         |      4 -
 lustre/obdecho/echo.c                              |     93 +-
 lustre/obdecho/echo_client.c                       |     38 +-
 lustre/obdfilter/.cvsignore                        |      8 +-
 lustre/obdfilter/Makefile.am                       |     19 +
 lustre/obdfilter/Makefile.in                       |     11 -
 lustre/obdfilter/autoMakefile.am                   |     11 -
 lustre/obdfilter/filter.c                          |   1047 +-
 lustre/obdfilter/filter_internal.h                 |     13 +-
 lustre/obdfilter/filter_io.c                       |    164 +-
 lustre/obdfilter/filter_io_24.c                    |     51 +-
 lustre/obdfilter/filter_io_26.c                    |     79 +-
 lustre/obdfilter/filter_log.c                      |     29 +-
 lustre/obdfilter/filter_lvb.c                      |     69 +-
 lustre/obdfilter/lproc_obdfilter.c                 |     89 +-
 lustre/osc/.cvsignore                              |      8 +-
 lustre/osc/{autoMakefile.am => Makefile.am}        |     17 +-
 lustre/osc/Makefile.in                             |      4 -
 lustre/osc/lproc_osc.c                             |     29 +-
 lustre/osc/osc_create.c                            |     69 +-
 lustre/osc/osc_request.c                           |    330 +-
 lustre/ost/.cvsignore                              |      8 +-
 lustre/ost/{autoMakefile.am => Makefile.am}        |     12 +-
 lustre/ost/Makefile.in                             |      4 -
 lustre/ost/ost_handler.c                           |    130 +-
 lustre/portals/.cvsignore                          |      6 +-
 lustre/portals/Makefile.am                         |     19 +
 lustre/portals/Makefile.in                         |      9 -
 lustre/portals/Rules.linux                         |     29 +
 lustre/portals/archdep.m4                          |    792 +-
 lustre/portals/build.m4                            |     51 +-
 .../portals/include/Makefile.am                    |      4 +-
 lustre/portals/include/linux/Makefile.am           |     10 +
 lustre/portals/include/linux/kp30.h                |     79 +-
 lustre/portals/include/linux/kpr.h                 |     15 +
 lustre/portals/include/linux/libcfs.h              |     79 +-
 lustre/portals/include/linux/portals_compat25.h    |     28 +-
 lustre/portals/include/portals/Makefile.am         |     10 +
 lustre/portals/include/portals/api-support.h       |      2 +
 lustre/portals/include/portals/api.h               |     21 +-
 lustre/portals/include/portals/arg-blocks.h        |      4 +-
 lustre/portals/include/portals/errno.h             |      7 +-
 lustre/portals/include/portals/lib-dispatch.h      |      1 +
 lustre/portals/include/portals/lib-p30.h           |      9 +-
 lustre/portals/include/portals/lib-types.h         |      8 +-
 lustre/portals/include/portals/nal.h               |     31 +-
 lustre/portals/include/portals/nalids.h            |      4 +
 lustre/portals/include/portals/p30.h               |     39 +
 lustre/portals/include/portals/ptlctl.h            |     12 +-
 lustre/portals/include/portals/types.h             |     60 +-
 lustre/portals/knals/.cvsignore                    |      6 +-
 .../portals/knals/Makefile.am                      |      5 +-
 lustre/portals/knals/Makefile.in                   |      6 -
 lustre/portals/knals/gmnal/.cvsignore              |      9 +-
 lustre/portals/knals/gmnal/Makefile.am             |     13 +
 lustre/portals/knals/gmnal/Makefile.in             |      6 -
 lustre/portals/knals/gmnal/autoMakefile.am         |     15 -
 lustre/portals/knals/gmnal/gmnal.h                 |     11 +-
 lustre/portals/knals/gmnal/gmnal_api.c             |    179 +-
 lustre/portals/knals/gmnal/gmnal_module.c          |     26 +-
 lustre/portals/knals/ibnal/.cvsignore              |      9 +-
 lustre/portals/knals/ibnal/Makefile.am             |     10 +
 lustre/portals/knals/ibnal/Makefile.in             |      6 -
 lustre/portals/knals/ibnal/autoMakefile.am         |     10 -
 lustre/portals/knals/ibnal/ibnal.c                 |     11 +-
 lustre/portals/knals/qswnal/.cvsignore             |      9 +-
 lustre/portals/knals/qswnal/Makefile.am            |     17 +
 lustre/portals/knals/qswnal/Makefile.in            |      6 -
 lustre/portals/knals/qswnal/autoMakefile.am        |     15 -
 lustre/portals/knals/qswnal/qswnal.c               |    291 +-
 lustre/portals/knals/qswnal/qswnal.h               |     35 +-
 lustre/portals/knals/qswnal/qswnal_cb.c            |    132 +-
 lustre/portals/knals/scimacnal/.cvsignore          |      9 +-
 lustre/portals/knals/scimacnal/Makefile.am         |     11 +
 lustre/portals/knals/scimacnal/Makefile.in         |      6 -
 lustre/portals/knals/scimacnal/autoMakefile.am     |     13 -
 lustre/portals/knals/scimacnal/scimacnal.c         |    166 +-
 lustre/portals/knals/socknal/.cvsignore            |     10 +-
 lustre/portals/knals/socknal/Makefile.am           |     17 +
 lustre/portals/knals/socknal/Makefile.in           |      8 -
 lustre/portals/knals/socknal/autoMakefile.am       |     13 -
 lustre/portals/knals/socknal/socknal.c             |    227 +-
 lustre/portals/knals/socknal/socknal.h             |      9 +-
 lustre/portals/knals/socknal/socknal_cb.c          |     37 +-
 lustre/portals/libcfs/.cvsignore                   |     10 +-
 lustre/portals/libcfs/Makefile.am                  |     20 +
 lustre/portals/libcfs/Makefile.in                  |      4 -
 lustre/portals/libcfs/autoMakefile.am              |     11 -
 lustre/portals/libcfs/debug.c                      |     96 +-
 lustre/portals/libcfs/module.c                     |    105 +-
 lustre/portals/libcfs/proc.c                       |     24 +-
 lustre/portals/portals/.cvsignore                  |     10 +-
 .../portals/{autoMakefile.am => Makefile.am}       |     30 +-
 lustre/portals/portals/Makefile.in                 |      6 -
 lustre/portals/portals/api-eq.c                    |     23 +-
 lustre/portals/portals/api-errno.c                 |      3 +-
 lustre/portals/portals/api-init.c                  |     26 +-
 lustre/portals/portals/api-me.c                    |     16 +-
 lustre/portals/portals/api-ni.c                    |    247 +-
 lustre/portals/portals/api-wrap.c                  |     88 +-
 lustre/portals/portals/lib-dispatch.c              |      1 +
 lustre/portals/portals/lib-init.c                  |     71 +-
 lustre/portals/portals/lib-md.c                    |     66 +-
 lustre/portals/portals/lib-me.c                    |      7 +
 lustre/portals/portals/lib-msg.c                   |      4 +
 lustre/portals/portals/lib-ni.c                    |     12 +
 lustre/portals/portals/module.c                    |    352 +-
 lustre/portals/router/.cvsignore                   |     10 +-
 lustre/portals/router/Makefile.am                  |     16 +
 lustre/portals/router/Makefile.in                  |      4 -
 lustre/portals/router/autoMakefile.am              |     13 -
 lustre/portals/router/router.c                     |    149 +-
 lustre/portals/router/router.h                     |      9 +
 lustre/portals/tests/.cvsignore                    |     10 +-
 lustre/portals/tests/Makefile.am                   |     23 +
 lustre/portals/tests/Makefile.in                   |     16 -
 lustre/portals/tests/autoMakefile.am               |     16 -
 lustre/portals/tests/ping_cli.c                    |     41 +-
 lustre/portals/tests/ping_srv.c                    |     22 +-
 lustre/portals/tests/sping_cli.c                   |     44 +-
 lustre/portals/tests/sping_srv.c                   |     23 +-
 lustre/portals/unals/Makefile.am                   |     13 +-
 lustre/portals/unals/bridge.h                      |     12 +-
 lustre/portals/unals/connection.c                  |      9 +-
 lustre/portals/unals/procapi.c                     |     61 +-
 lustre/portals/unals/procbridge.h                  |      7 +-
 lustre/portals/unals/proclib.c                     |     37 +-
 lustre/portals/utils/Makefile.am                   |     30 +-
 lustre/portals/utils/acceptor.c                    |      2 +
 lustre/portals/utils/debug.c                       |     12 +-
 lustre/portals/utils/gmnalnid.c                    |      2 +
 lustre/portals/utils/l_ioctl.c                     |     10 +-
 lustre/portals/utils/parser.c                      |     77 +-
 lustre/portals/utils/parser.h                      |      6 +
 lustre/portals/utils/portals.c                     |    129 +-
 lustre/portals/utils/wirecheck.c                   |      2 +-
 lustre/ptlbd/.cvsignore                            |      8 +-
 lustre/ptlbd/{autoMakefile.am => Makefile.am}      |     13 +-
 lustre/ptlbd/Makefile.in                           |      4 -
 lustre/ptlbd/blk.c                                 |      6 +-
 lustre/ptlbd/client.c                              |     26 +-
 lustre/ptlbd/server.c                              |     36 +-
 lustre/ptlrpc/.cvsignore                           |      8 +-
 lustre/ptlrpc/{autoMakefile.am => Makefile.am}     |     23 +-
 lustre/ptlrpc/Makefile.in                          |     27 -
 lustre/ptlrpc/Makefile.mk                          |      3 +-
 lustre/ptlrpc/client.c                             |     66 +-
 lustre/ptlrpc/connection.c                         |     32 +-
 lustre/ptlrpc/events.c                             |     97 +-
 lustre/ptlrpc/import.c                             |     69 +-
 lustre/ptlrpc/llog_client.c                        |     72 +-
 lustre/ptlrpc/llog_net.c                           |      5 +-
 lustre/ptlrpc/llog_server.c                        |    136 +-
 lustre/ptlrpc/niobuf.c                             |     78 +-
 lustre/ptlrpc/pack_generic.c                       |     27 +-
 lustre/ptlrpc/pers.c                               |     62 +-
 lustre/ptlrpc/pinger.c                             |      9 +-
 lustre/ptlrpc/ptlrpc_internal.h                    |     53 +-
 lustre/ptlrpc/ptlrpc_module.c                      |      1 -
 lustre/ptlrpc/recov_thread.c                       |     18 +-
 lustre/ptlrpc/recover.c                            |      5 +-
 lustre/ptlrpc/service.c                            |     59 +-
 lustre/scripts/.cvsignore                          |      1 -
 lustre/scripts/Makefile.am                         |      4 +-
 lustre/scripts/collect-stats.sh                    |    180 -
 lustre/scripts/graph-rpcs.sh                       |    359 -
 lustre/scripts/land1.sh                            |      2 +-
 lustre/scripts/lbuild                              |     37 +-
 lustre/scripts/lmake                               |     31 +-
 lustre/scripts/lustre-kernel-2.4.spec.in           |     30 +-
 lustre/scripts/lustre.spec.in                      |      4 +-
 lustre/scripts/merge1.sh                           |      7 +-
 .../scripts/{version_tag.pl.in => version_tag.pl}  |     18 +-
 lustre/smfs/.cvsignore                             |      7 +-
 lustre/smfs/Makefile.am                            |     16 +
 lustre/smfs/Makefile.in                            |      5 -
 lustre/smfs/autoMakefile.am                        |     11 -
 lustre/smfs/cache.c                                |    597 +-
 lustre/smfs/cache_space.c                          |    649 -
 lustre/smfs/dir.c                                  |    989 +-
 lustre/smfs/file.c                                 |    769 +-
 lustre/smfs/inode.c                                |    452 +-
 lustre/smfs/ioctl.c                                |    164 -
 lustre/smfs/journal.c                              |    637 +-
 lustre/smfs/journal_ext3.c                         |     96 +
 lustre/smfs/kml.c                                  |    327 +-
 lustre/smfs/kml_idl.h                              |     52 +
 lustre/smfs/options.c                              |    161 +-
 lustre/smfs/reint.c                                |     15 +
 lustre/smfs/sm_fs.c                                |     66 +-
 lustre/smfs/smfs_internal.h                        |    337 +-
 lustre/smfs/smfs_llog.c                            |    219 +-
 lustre/smfs/smfs_support.h                         |    161 +
 lustre/smfs/super.c                                |    586 +-
 lustre/smfs/symlink.c                              |    108 +-
 lustre/smfs/sysctl.c                               |     81 +-
 lustre/snapfs/.cvsignore                           |      7 +-
 lustre/snapfs/Makefile.am                          |     19 +
 lustre/snapfs/Makefile.in                          |      6 -
 lustre/snapfs/autoMakefile.am                      |     14 -
 lustre/snapfs/options.c                            |      6 +-
 lustre/snapfs/utils/Makefile.am                    |     11 +-
 lustre/snapfs/utils/parser.c                       |     11 +-
 lustre/tests/.RC_CURRENT.tag                       |      2 +-
 lustre/tests/.cvsignore                            |      4 -
 lustre/tests/Makefile.am                           |     25 +-
 lustre/tests/acceptance-small.sh                   |      8 +-
 lustre/tests/ba-echo.sh                            |     38 +
 lustre/tests/ba-mount.sh                           |     53 +
 lustre/tests/cfg/insanity-adev.sh                  |      2 +-
 lustre/tests/cfg/insanity-local.sh                 |     10 +-
 lustre/tests/cfg/insanity-mdev.sh                  |      2 +-
 lustre/tests/cfg/lmv.sh                            |     38 +
 lustre/tests/cfg/local.sh                          |      2 +-
 lustre/tests/cfg/mdev.sh                           |      2 +-
 lustre/tests/cmknod.c                              |     44 +-
 lustre/tests/conf-sanity.sh                        |     35 +-
 lustre/tests/copy_attr.c                           |     56 -
 lustre/tests/createdestroy.c                       |    129 +-
 lustre/tests/createmany.c                          |      2 +-
 lustre/tests/directio.c                            |    118 +-
 lustre/tests/echo.sh                               |      2 +-
 lustre/tests/fsx.c                                 |    307 +-
 lustre/tests/insanity.sh                           |      4 +-
 lustre/tests/lfsck_config.sh                       |     47 -
 lustre/tests/lfscktest.sh                          |    123 -
 lustre/tests/lfscktest_config.sh                   |     36 -
 lustre/tests/ll_dirstripe_verify.c                 |    201 -
 lustre/tests/llmount.sh                            |      4 +-
 lustre/tests/llmountcleanup.sh                     |      5 +-
 lustre/tests/lmv.sh                                |     53 +
 lustre/tests/local.sh                              |     30 +-
 lustre/tests/lov.sh                                |      2 +-
 lustre/tests/lp_utils.c                            |    265 -
 lustre/tests/lp_utils.h                            |    103 -
 lustre/tests/lsmfs.sh                              |      5 -
 lustre/tests/mcr-routed-config.sh                  |      2 +-
 lustre/tests/mcrlov.sh                             |      2 +-
 lustre/tests/mkdirmany.c                           |      4 +-
 lustre/tests/mount2.sh                             |     34 +
 lustre/tests/mount2fs.sh                           |      5 +-
 lustre/tests/mount2lov.sh                          |     38 +
 lustre/tests/multiop.c                             |    193 +-
 lustre/tests/munlink.c                             |      2 +-
 lustre/tests/oos.sh                                |     16 +-
 lustre/tests/oos2.sh                               |     12 +-
 lustre/tests/open_delay.c                          |      2 +-
 lustre/tests/openclose.c                           |      2 +-
 lustre/tests/openfile.c                            |      4 +-
 lustre/tests/openfilleddirunlink.c                 |     79 -
 lustre/tests/parallel_grouplock.c                  |    899 -
 lustre/tests/recovery-cleanup.sh                   |      3 +-
 lustre/tests/recovery-small-upcall.sh              |      3 +-
 lustre/tests/recovery-small.sh                     |    193 +-
 lustre/tests/replay-dual.sh                        |      6 +-
 lustre/tests/replay-ost-single.sh                  |     32 +-
 lustre/tests/replay-single.sh                      |    112 +-
 lustre/tests/run-llog.sh                           |      2 +-
 lustre/tests/run_lfscktest.sh                      |     22 -
 lustre/tests/runas.c                               |     50 +-
 lustre/tests/runregression-brw.sh                  |      2 +-
 lustre/tests/runregression-mds.sh                  |      8 +-
 lustre/tests/runregression-net.sh                  |      2 +-
 lustre/tests/runtests                              |     10 +-
 lustre/tests/sanity.sh                             |    259 +-
 lustre/tests/sanityN.sh                            |     16 +-
 lustre/tests/socketserver                          |      8 -
 lustre/tests/stat.c                                |     20 +-
 lustre/tests/stat_fs.h                             |      1 -
 lustre/tests/statmany.c                            |      2 +-
 lustre/tests/test-framework.sh                     |     60 +-
 lustre/tests/uml.sh                                |      3 +-
 lustre/tests/write_append_truncate.c               |      5 +-
 lustre/tests/write_disjoint.c                      |     33 +-
 lustre/utils/Lustre/lustredb.py                    |      4 -
 lustre/utils/Makefile.am                           |     38 +-
 lustre/utils/lconf                                 |    562 +-
 lustre/utils/lctl.c                                |     34 +-
 lustre/utils/lfs.c                                 |    123 +-
 lustre/utils/liblustreapi.c                        |    328 +-
 lustre/utils/llmount.c                             |      8 +-
 lustre/utils/lmc                                   |    179 +-
 lustre/utils/lustre_cfg.c                          |     63 +-
 lustre/utils/obd.c                                 |     15 +-
 lustre/utils/obdctl.h                              |      1 +
 lustre/utils/parser.c                              |     11 +-
 lustre/utils/wirecheck.c                           |      2 +-
 lustre/utils/wiretest.c                            |      2 +-
 751 files changed, 479541 insertions(+), 42834 deletions(-)
 delete mode 100644 ldiskfs/kernel_patches/patches/export-ext3-2.6-suse.patch
 delete mode 100644 ldiskfs/kernel_patches/patches/export_symbols-ext3-2.6-suse.patch
 delete mode 100644 ldiskfs/kernel_patches/patches/ext3-ea-in-inode-2.6-suse.patch
 delete mode 100644 ldiskfs/kernel_patches/patches/ext3-include-fixes-2.6-suse.patch
 delete mode 100644 ldiskfs/kernel_patches/patches/iopen-2.6-suse.patch
 delete mode 100644 ldiskfs/kernel_patches/series/ldiskfs-2.6-suse.series
 delete mode 100644 ldiskfs/ldiskfs/Makefile.in
 delete mode 100644 ldiskfs/ldiskfs/autoMakefile.am
 create mode 100644 lnet/Makefile.am
 delete mode 100644 lnet/Makefile.in
 create mode 100644 lnet/Rules.linux
 rename lustre/portals/knals/autoMakefile.am => lnet/include/Makefile.am (66%)
 create mode 100644 lnet/include/linux/Makefile.am
 create mode 100644 lnet/include/lnet/Makefile.am
 rename {lustre/include/lustre => lnet/klnds}/Makefile.am (59%)
 delete mode 100644 lnet/klnds/Makefile.in
 create mode 100644 lnet/klnds/gmlnd/Makefile.am
 delete mode 100644 lnet/klnds/gmlnd/Makefile.in
 delete mode 100644 lnet/klnds/gmlnd/autoMakefile.am
 create mode 100644 lnet/klnds/iblnd/Makefile.am
 delete mode 100644 lnet/klnds/iblnd/Makefile.in
 delete mode 100644 lnet/klnds/iblnd/autoMakefile.am
 create mode 100644 lnet/klnds/qswlnd/Makefile.am
 delete mode 100644 lnet/klnds/qswlnd/Makefile.in
 delete mode 100644 lnet/klnds/qswlnd/autoMakefile.am
 create mode 100644 lnet/klnds/scimaclnd/Makefile.am
 delete mode 100644 lnet/klnds/scimaclnd/Makefile.in
 delete mode 100644 lnet/klnds/scimaclnd/autoMakefile.am
 create mode 100644 lnet/klnds/socklnd/Makefile.am
 delete mode 100644 lnet/klnds/socklnd/Makefile.in
 delete mode 100644 lnet/klnds/socklnd/autoMakefile.am
 create mode 100644 lnet/libcfs/Makefile.am
 delete mode 100644 lnet/libcfs/Makefile.in
 delete mode 100644 lnet/libcfs/autoMakefile.am
 rename lnet/lnet/{autoMakefile.am => Makefile.am} (57%)
 delete mode 100644 lnet/lnet/Makefile.in
 create mode 100644 lnet/router/Makefile.am
 delete mode 100644 lnet/router/Makefile.in
 delete mode 100644 lnet/router/autoMakefile.am
 create mode 100644 lnet/tests/Makefile.am
 delete mode 100644 lnet/tests/Makefile.in
 delete mode 100644 lnet/tests/autoMakefile.am
 create mode 100644 lustre/Makefile.am
 delete mode 100644 lustre/Makefile.in
 delete mode 100644 lustre/README.kernel-source
 create mode 100644 lustre/Rules
 delete mode 100644 lustre/Rules.in
 delete mode 100644 lustre/autoMakefile.am
 rename lustre/cobd/{autoMakefile.am => Makefile.am} (50%)
 delete mode 100644 lustre/cobd/Makefile.in
 create mode 100644 lustre/include/config.h.in
 delete mode 100644 lustre/include/linux/lustre_smfs.h
 rename lustre/include/{lustre => linux}/lustre_user.h (75%)
 create mode 100644 lustre/include/linux/obd_lmv.h
 delete mode 100644 lustre/include/lustre/liblustreapi.h
 create mode 100755 lustre/install-sh
 delete mode 100644 lustre/kernel-tests/.cvsignore
 delete mode 100644 lustre/kernel-tests/Makefile
 delete mode 100644 lustre/kernel_patches/kernel_configs/kernel-2.4.18-chaos-2.4.18-i686-smp.config
 delete mode 100644 lustre/kernel_patches/kernel_configs/kernel-2.4.18-chaos-2.4.18-i686.config
 rename lustre/kernel_patches/kernel_configs/{kernel-2.4.20-rh-2.4-i686-smp.config => kernel-2.4.20-rh-2.4-i586-smp.config} (100%)
 rename lustre/kernel_patches/kernel_configs/{kernel-2.4.20-rh-2.4-i686.config => kernel-2.4.20-rh-2.4-i586.config} (100%)
 delete mode 100644 lustre/kernel_patches/kernel_configs/kernel-2.4.21-suse-2.4.21-2-x86_64.config
 create mode 100644 lustre/kernel_patches/patches/2.6.0-mm2.patch
 create mode 100644 lustre/kernel_patches/patches/2.6.0-test6-mm4.patch
 delete mode 100644 lustre/kernel_patches/patches/cifs_2.6.5.patch
 delete mode 100644 lustre/kernel_patches/patches/configurable-x86-stack-2.4.21-sles8sp3.patch
 delete mode 100644 lustre/kernel_patches/patches/dev_read_only-suse-2.4.19.patch
 rename lustre/kernel_patches/patches/{dev_read_only-2.6-suse.patch => dev_read_only_2.6.0.patch} (100%)
 delete mode 100644 lustre/kernel_patches/patches/directio-2.4.24.patch
 create mode 100644 lustre/kernel_patches/patches/dynamic-locks-2.4.24.patch
 delete mode 100644 lustre/kernel_patches/patches/export-2.6-suse.patch
 create mode 100644 lustre/kernel_patches/patches/export-2.6.3.patch
 delete mode 100644 lustre/kernel_patches/patches/export-ext3-2.6-suse.patch
 rename lustre/kernel_patches/patches/{export-truncate-2.6-suse.patch => export-truncate-2.5.63.patch} (100%)
 create mode 100644 lustre/kernel_patches/patches/export_symbols-2.6.0-test6.patch
 rename lustre/kernel_patches/patches/{export_symbols-2.6-suse.patch => export_symbols-2.6.0.patch} (50%)
 delete mode 100644 lustre/kernel_patches/patches/export_symbols-ext3-2.6-suse.patch
 delete mode 100644 lustre/kernel_patches/patches/ext-2.4-patch-1-suse-2.4.19.patch
 rename lustre/kernel_patches/patches/{ext3-ea-in-inode-2.6-suse.patch => ext3-ea-in-inode-2.6.0.patch} (98%)
 delete mode 100644 lustre/kernel_patches/patches/ext3-extents-2.4.24.patch
 delete mode 100644 lustre/kernel_patches/patches/ext3-include-fixes-2.6-suse.patch
 rename lustre/kernel_patches/patches/{ext3-init-generation-2.6-suse.patch => ext3-init-generation-2.6.0.patch} (100%)
 delete mode 100644 lustre/kernel_patches/patches/ext3-map_inode_page-2.6-suse.patch
 rename ldiskfs/kernel_patches/patches/ext3-map_inode_page-2.6-suse.patch => lustre/kernel_patches/patches/ext3-map_inode_page-2.6.0.patch (100%)
 create mode 100644 lustre/kernel_patches/patches/ext3-mds-num-2.4.24.patch
 create mode 100644 lustre/kernel_patches/patches/ext3-pdirops-2.4.24.patch
 rename ldiskfs/kernel_patches/patches/ext3-san-jdike-2.6-suse.patch => lustre/kernel_patches/patches/ext3-san-jdike-2.5.73.patch (100%)
 delete mode 100644 lustre/kernel_patches/patches/ext3-san-jdike-2.6-suse.patch
 delete mode 100644 lustre/kernel_patches/patches/ext3-trusted_ea-suse-2.4.19.patch
 rename ldiskfs/kernel_patches/patches/ext3-wantedi-2.6-suse.patch => lustre/kernel_patches/patches/ext3-wantedi-2.6.3.patch (91%)
 rename lustre/kernel_patches/patches/{ext3-wantedi-2.6-suse.patch => ext3-wantedi-2.6.patch} (72%)
 delete mode 100644 lustre/kernel_patches/patches/ext3-wantedi-misc-2.6-suse.patch
 delete mode 100644 lustre/kernel_patches/patches/ext3-xattr-header-move-2.6.suse.patch
 rename lustre/kernel_patches/patches/{nfs-cifs-intent-2.6-suse.patch => fs-intent-2.6.3-mm4.patch} (77%)
 delete mode 100644 lustre/kernel_patches/patches/header-guards-2.6-suse.patch
 delete mode 100644 lustre/kernel_patches/patches/invalidate_show-2.4.21-sles8sp3.patch
 create mode 100644 lustre/kernel_patches/patches/invalidate_show-2.6.0.patch
 delete mode 100644 lustre/kernel_patches/patches/iopen-2.4.21-sles8sp3.patch
 create mode 100644 lustre/kernel_patches/patches/iopen-2.5.73.patch
 delete mode 100644 lustre/kernel_patches/patches/iopen-2.6-suse.patch
 create mode 100644 lustre/kernel_patches/patches/iopen-2.6.0-test6.patch
 create mode 100644 lustre/kernel_patches/patches/iopen-2.6.0.patch
 rename lustre/kernel_patches/patches/{iopen-2.6-vanilla.patch => iopen-2.6.3-mm4.patch} (77%)
 delete mode 100644 lustre/kernel_patches/patches/iopen-misc-2.6-suse.patch
 delete mode 100644 lustre/kernel_patches/patches/kernel_text_address-2.4.21-sles8sp3.patch
 create mode 100644 lustre/kernel_patches/patches/kernel_text_address-2.6.0.patch
 create mode 100644 lustre/kernel_patches/patches/kernel_text_address-2.6.3.patch
 create mode 100644 lustre/kernel_patches/patches/kexec-2.6.0-full.patch
 create mode 100644 lustre/kernel_patches/patches/kexec-2.6.0-test6-full.patch
 create mode 100644 lustre/kernel_patches/patches/linux-2.4.20-tmpfs-iopen.patch
 create mode 100644 lustre/kernel_patches/patches/linux-2.4.20-tmpfs-xattr.patch
 create mode 100644 lustre/kernel_patches/patches/linux-2.6.3-CITI_NFS4_ALL.patch
 create mode 100644 lustre/kernel_patches/patches/linux-2.6.3-nfs-intent.patch
 create mode 100644 lustre/kernel_patches/patches/lkcd-cvs-2.6.0-test6.patch
 create mode 100644 lustre/kernel_patches/patches/lkcd-kernel-changes-2.6.0-test6.patch
 delete mode 100644 lustre/kernel_patches/patches/mkdep-revert-rh-2.4.patch
 create mode 100644 lustre/kernel_patches/patches/nfs-cifs-intent-2.6.3-suse.patch
 create mode 100644 lustre/kernel_patches/patches/qla2xxx-v8.00.00b1-2.5.73.patch
 delete mode 100644 lustre/kernel_patches/patches/removepage-2.6-suse.patch
 create mode 100644 lustre/kernel_patches/patches/removepage-2.6.0.patch
 delete mode 100644 lustre/kernel_patches/patches/removepage-vanilla-2.6.5.patch
 delete mode 100644 lustre/kernel_patches/patches/revalide-special-oops-2.6.4.suse.patch
 delete mode 100644 lustre/kernel_patches/patches/tcp-zero-copy-2.4.21-sles8sp3.patch
 create mode 100644 lustre/kernel_patches/patches/uml-2.6.0-fix.patch
 create mode 100644 lustre/kernel_patches/patches/uml-fix-2.6.3.patch
 rename lustre/kernel_patches/patches/{uml-patch-2.4.24-1.patch => uml-patch-2.4.23-1.patch} (98%)
 create mode 100644 lustre/kernel_patches/patches/uml-patch-2.6.0-1-fix1.patch
 create mode 100644 lustre/kernel_patches/patches/uml-patch-2.6.0-1.patch
 create mode 100644 lustre/kernel_patches/patches/uml-patch-2.6.0-test5.patch
 create mode 100644 lustre/kernel_patches/patches/uml-patch-2.6.3-rc2-1.patch
 delete mode 100644 lustre/kernel_patches/patches/vfs_intent-2.4.21-sles8sp3.patch
 create mode 100644 lustre/kernel_patches/patches/vfs_intent-2.6.3-suse.patch
 rename lustre/kernel_patches/patches/{vfs_intent-2.6-suse.patch => vfs_intent-2.6.3.patch} (81%)
 create mode 100644 lustre/kernel_patches/patches/vfs_intent_2.6.0-test1.patch
 create mode 100644 lustre/kernel_patches/patches/vfs_intent_2.6.0-test6.patch
 create mode 100644 lustre/kernel_patches/patches/vfs_intent_2.6.0.patch
 create mode 100644 lustre/kernel_patches/patches/vfs_mntcwd_2.5.72_rev1.patch
 create mode 100644 lustre/kernel_patches/patches/vfs_nointent-2.6.3-mm4.patch
 create mode 100644 lustre/kernel_patches/patches/vfs_nointent_2.6.0-test1.patch
 create mode 100644 lustre/kernel_patches/patches/vfs_nointent_2.6.0-test6.patch
 create mode 100644 lustre/kernel_patches/patches/vfs_nointent_2.6.0-uml1.patch
 rename lustre/kernel_patches/patches/{vfs_nointent-2.6-suse.patch => vfs_nointent_2.6.3-suse.patch} (76%)
 rename lustre/kernel_patches/patches/{vfs_races-2.6-suse.patch => vfs_races_2.5.72_rev1.patch} (100%)
 delete mode 100644 lustre/kernel_patches/series/2.6-suse.series
 create mode 100644 lustre/kernel_patches/series/2.6.3-mm4
 create mode 100644 lustre/kernel_patches/series/kgdb_2.6.0
 create mode 100644 lustre/kernel_patches/series/kgdb_2.6.0_test1
 create mode 100644 lustre/kernel_patches/series/kgdb_2.6.0_test6
 delete mode 100644 lustre/kernel_patches/series/ldiskfs-2.6-suse.series
 delete mode 100644 lustre/kernel_patches/series/ldiskfs-2.6.6-vanilla.series
 create mode 100644 lustre/kernel_patches/series/suse-2.6.3
 delete mode 100644 lustre/kernel_patches/series/suse-sles8sp3-2.4.21
 create mode 100644 lustre/kernel_patches/series/uml_2.6.0
 create mode 100644 lustre/kernel_patches/series/uml_2.6.0_test3
 create mode 100644 lustre/kernel_patches/series/vanilla-2.6.3-nfs4
 delete mode 100644 lustre/kernel_patches/series/vanilla-2.6.6
 delete mode 100644 lustre/kernel_patches/targets/2.6-suse.target
 delete mode 100644 lustre/kernel_patches/targets/chaos-2.4.18.target
 delete mode 100644 lustre/kernel_patches/targets/suse-2.4.21-2.target
 delete mode 100644 lustre/ldiskfs/.cvsignore
 delete mode 100644 lustre/ldiskfs/Makefile.in
 delete mode 100644 lustre/ldiskfs/autoMakefile.am
 create mode 100644 lustre/llite/Makefile.am
 delete mode 100644 lustre/llite/Makefile.in
 delete mode 100644 lustre/llite/autoMakefile.am
 delete mode 100644 lustre/llite/special.c
 rename lustre/{include/lustre => lmv}/.cvsignore (77%)
 create mode 100644 lustre/lmv/Makefile.am
 create mode 100644 lustre/lmv/lmv_intent.c
 create mode 100644 lustre/lmv/lmv_internal.h
 create mode 100644 lustre/lmv/lmv_obd.c
 create mode 100644 lustre/lmv/lmv_objmgr.c
 rename lustre/lov/{autoMakefile.am => Makefile.am} (56%)
 delete mode 100644 lustre/lov/Makefile.in
 create mode 100644 lustre/lvfs/Makefile.am
 delete mode 100644 lustre/lvfs/Makefile.in
 delete mode 100644 lustre/lvfs/autoMakefile.am
 delete mode 100644 lustre/lvfs/fsfilt_smfs.c
 delete mode 100644 lustre/lvfs/llog_lvfs.c
 delete mode 100644 lustre/lvfs/lvfs_reint.c
 delete mode 100644 lustre/lvfs/lvfs_undo.c
 rename lustre/mdc/{autoMakefile.am => Makefile.am} (57%)
 delete mode 100644 lustre/mdc/Makefile.in
 create mode 100644 lustre/mds/Makefile.am
 delete mode 100644 lustre/mds/Makefile.in
 delete mode 100644 lustre/mds/autoMakefile.am
 create mode 100644 lustre/mds/mds_lmv.c
 rename lustre/{portals/autoMakefile.am => mgmt/Makefile.am} (59%)
 delete mode 100644 lustre/mgmt/Makefile.in
 delete mode 100644 lustre/mgmt/autoMakefile.am
 create mode 100755 lustre/missing
 create mode 100755 lustre/mkinstalldirs
 create mode 100644 lustre/obdclass/Makefile.am
 delete mode 100644 lustre/obdclass/Makefile.in
 delete mode 100644 lustre/obdclass/autoMakefile.am
 rename lustre/{lvfs => obdclass}/llog.c (65%)
 rename lustre/{lvfs => obdclass}/llog_cat.c (57%)
 create mode 100644 lustre/obdclass/llog_internal.h
 create mode 100644 lustre/obdclass/llog_lvfs.c
 create mode 100644 lustre/obdclass/mea.c
 rename lustre/obdecho/{autoMakefile.am => Makefile.am} (54%)
 delete mode 100644 lustre/obdecho/Makefile.in
 create mode 100644 lustre/obdfilter/Makefile.am
 delete mode 100644 lustre/obdfilter/Makefile.in
 delete mode 100644 lustre/obdfilter/autoMakefile.am
 rename lustre/osc/{autoMakefile.am => Makefile.am} (58%)
 delete mode 100644 lustre/osc/Makefile.in
 rename lustre/ost/{autoMakefile.am => Makefile.am} (54%)
 delete mode 100644 lustre/ost/Makefile.in
 create mode 100644 lustre/portals/Makefile.am
 delete mode 100644 lustre/portals/Makefile.in
 create mode 100644 lustre/portals/Rules.linux
 rename lnet/klnds/autoMakefile.am => lustre/portals/include/Makefile.am (66%)
 create mode 100644 lustre/portals/include/linux/Makefile.am
 create mode 100644 lustre/portals/include/portals/Makefile.am
 rename lnet/autoMakefile.am => lustre/portals/knals/Makefile.am (59%)
 delete mode 100644 lustre/portals/knals/Makefile.in
 create mode 100644 lustre/portals/knals/gmnal/Makefile.am
 delete mode 100644 lustre/portals/knals/gmnal/Makefile.in
 delete mode 100644 lustre/portals/knals/gmnal/autoMakefile.am
 create mode 100644 lustre/portals/knals/ibnal/Makefile.am
 delete mode 100644 lustre/portals/knals/ibnal/Makefile.in
 delete mode 100644 lustre/portals/knals/ibnal/autoMakefile.am
 create mode 100644 lustre/portals/knals/qswnal/Makefile.am
 delete mode 100644 lustre/portals/knals/qswnal/Makefile.in
 delete mode 100644 lustre/portals/knals/qswnal/autoMakefile.am
 create mode 100644 lustre/portals/knals/scimacnal/Makefile.am
 delete mode 100644 lustre/portals/knals/scimacnal/Makefile.in
 delete mode 100644 lustre/portals/knals/scimacnal/autoMakefile.am
 create mode 100644 lustre/portals/knals/socknal/Makefile.am
 delete mode 100644 lustre/portals/knals/socknal/Makefile.in
 delete mode 100644 lustre/portals/knals/socknal/autoMakefile.am
 create mode 100644 lustre/portals/libcfs/Makefile.am
 delete mode 100644 lustre/portals/libcfs/Makefile.in
 delete mode 100644 lustre/portals/libcfs/autoMakefile.am
 rename lustre/portals/portals/{autoMakefile.am => Makefile.am} (57%)
 delete mode 100644 lustre/portals/portals/Makefile.in
 create mode 100644 lustre/portals/router/Makefile.am
 delete mode 100644 lustre/portals/router/Makefile.in
 delete mode 100644 lustre/portals/router/autoMakefile.am
 create mode 100644 lustre/portals/tests/Makefile.am
 delete mode 100644 lustre/portals/tests/Makefile.in
 delete mode 100644 lustre/portals/tests/autoMakefile.am
 rename lustre/ptlbd/{autoMakefile.am => Makefile.am} (50%)
 delete mode 100644 lustre/ptlbd/Makefile.in
 rename lustre/ptlrpc/{autoMakefile.am => Makefile.am} (72%)
 delete mode 100644 lustre/ptlrpc/Makefile.in
 delete mode 100644 lustre/scripts/collect-stats.sh
 delete mode 100755 lustre/scripts/graph-rpcs.sh
 rename lustre/scripts/{version_tag.pl.in => version_tag.pl} (94%)
 create mode 100644 lustre/smfs/Makefile.am
 delete mode 100644 lustre/smfs/Makefile.in
 delete mode 100644 lustre/smfs/autoMakefile.am
 delete mode 100644 lustre/smfs/cache_space.c
 delete mode 100644 lustre/smfs/ioctl.c
 create mode 100644 lustre/smfs/journal_ext3.c
 create mode 100644 lustre/smfs/kml_idl.h
 create mode 100644 lustre/smfs/reint.c
 create mode 100644 lustre/smfs/smfs_support.h
 create mode 100644 lustre/snapfs/Makefile.am
 delete mode 100644 lustre/snapfs/Makefile.in
 delete mode 100644 lustre/snapfs/autoMakefile.am
 create mode 100644 lustre/tests/ba-echo.sh
 create mode 100644 lustre/tests/ba-mount.sh
 create mode 100644 lustre/tests/cfg/lmv.sh
 delete mode 100644 lustre/tests/copy_attr.c
 delete mode 100755 lustre/tests/lfsck_config.sh
 delete mode 100755 lustre/tests/lfscktest.sh
 delete mode 100644 lustre/tests/lfscktest_config.sh
 delete mode 100644 lustre/tests/ll_dirstripe_verify.c
 create mode 100755 lustre/tests/lmv.sh
 delete mode 100644 lustre/tests/lp_utils.c
 delete mode 100644 lustre/tests/lp_utils.h
 delete mode 100755 lustre/tests/lsmfs.sh
 create mode 100644 lustre/tests/mount2.sh
 create mode 100644 lustre/tests/mount2lov.sh
 delete mode 100644 lustre/tests/openfilleddirunlink.c
 delete mode 100644 lustre/tests/parallel_grouplock.c
 delete mode 100755 lustre/tests/run_lfscktest.sh

diff --git a/ldiskfs/kernel_patches/patches/export-ext3-2.6-suse.patch b/ldiskfs/kernel_patches/patches/export-ext3-2.6-suse.patch
deleted file mode 100644
index 638b4bf..0000000
--- a/ldiskfs/kernel_patches/patches/export-ext3-2.6-suse.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: linux-stage/fs/ext3/super.c
-===================================================================
---- linux-stage.orig/fs/ext3/super.c	2004-04-02 16:40:18.000000000 -0500
-+++ linux-stage/fs/ext3/super.c	2004-04-02 16:40:18.000000000 -0500
-@@ -115,6 +115,8 @@
- 		handle->h_err = err;
- }
- 
-+EXPORT_SYMBOL(ext3_journal_abort_handle);
-+
- static char error_buf[1024];
- 
- /* Deal with the reporting of failure conditions on a filesystem such as
-@@ -1774,6 +1776,8 @@
- 	return ret;
- }
- 
-+EXPORT_SYMBOL(ext3_force_commit);
-+
- /*
-  * Ext3 always journals updates to the superblock itself, so we don't
-  * have to propagate any other updates to the superblock on disk at this
-@@ -2088,6 +2092,10 @@
-                         unsigned long *blocks, int *created, int create);
- EXPORT_SYMBOL(ext3_map_inode_page);
- 
-+EXPORT_SYMBOL(ext3_xattr_get);
-+EXPORT_SYMBOL(ext3_xattr_set_handle);
-+EXPORT_SYMBOL(ext3_bread);
-+
- MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others");
- MODULE_DESCRIPTION("Second Extended Filesystem with journaling extensions");
- MODULE_LICENSE("GPL");
diff --git a/ldiskfs/kernel_patches/patches/export_symbols-ext3-2.6-suse.patch b/ldiskfs/kernel_patches/patches/export_symbols-ext3-2.6-suse.patch
deleted file mode 100644
index 2327263..0000000
--- a/ldiskfs/kernel_patches/patches/export_symbols-ext3-2.6-suse.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: linux-2.6.0/include/linux/ext3_fs_sb.h
-===================================================================
---- linux-2.6.0.orig/include/linux/ext3_fs_sb.h	2003-06-24 18:05:26.000000000 +0400
-+++ linux-2.6.0/include/linux/ext3_fs_sb.h	2003-12-31 01:09:26.000000000 +0300
-@@ -19,9 +19,12 @@
- #ifdef __KERNEL__
- #include <linux/timer.h>
- #include <linux/wait.h>
-+#ifndef EXT_INCLUDE
-+#define EXT_INCLUDE
- #include <linux/blockgroup_lock.h>
- #include <linux/percpu_counter.h>
- #endif
-+#endif
- 
- /*
-  * third extended-fs super-block data in memory
diff --git a/ldiskfs/kernel_patches/patches/ext3-ea-in-inode-2.6-suse.patch b/ldiskfs/kernel_patches/patches/ext3-ea-in-inode-2.6-suse.patch
deleted file mode 100644
index 39fa9ce..0000000
--- a/ldiskfs/kernel_patches/patches/ext3-ea-in-inode-2.6-suse.patch
+++ /dev/null
@@ -1,833 +0,0 @@
-%patch
-Index: linux-2.6.0/fs/ext3/ialloc.c
-===================================================================
---- linux-2.6.0.orig/fs/ext3/ialloc.c	2004-01-14 18:54:11.000000000 +0300
-+++ linux-2.6.0/fs/ext3/ialloc.c	2004-01-14 18:54:12.000000000 +0300
-@@ -627,6 +627,11 @@
- 	inode->i_generation = EXT3_SB(sb)->s_next_generation++;
- 
- 	ei->i_state = EXT3_STATE_NEW;
-+	if (EXT3_INODE_SIZE(inode->i_sb) > EXT3_GOOD_OLD_INODE_SIZE) {
-+		ei->i_extra_isize = sizeof(__u16)	/* i_extra_isize */
-+				+ sizeof(__u16);	/* i_pad1 */
-+	} else
-+		ei->i_extra_isize = 0;
- 
- 	ret = inode;
- 	if(DQUOT_ALLOC_INODE(inode)) {
-Index: linux-2.6.0/fs/ext3/inode.c
-===================================================================
---- linux-2.6.0.orig/fs/ext3/inode.c	2004-01-14 18:54:12.000000000 +0300
-+++ linux-2.6.0/fs/ext3/inode.c	2004-01-14 19:09:46.000000000 +0300
-@@ -2339,7 +2339,7 @@
-  * trying to determine the inode's location on-disk and no read need be
-  * performed.
-  */
--static int ext3_get_inode_loc(struct inode *inode,
-+int ext3_get_inode_loc(struct inode *inode,
- 				struct ext3_iloc *iloc, int in_mem)
- {
- 	unsigned long block;
-@@ -2547,6 +2547,11 @@
- 		ei->i_data[block] = raw_inode->i_block[block];
- 	INIT_LIST_HEAD(&ei->i_orphan);
- 
-+	if (EXT3_INODE_SIZE(inode->i_sb) > EXT3_GOOD_OLD_INODE_SIZE)
-+		ei->i_extra_isize = le16_to_cpu(raw_inode->i_extra_isize);
-+	else
-+		ei->i_extra_isize = 0;
-+
- 	if (S_ISREG(inode->i_mode)) {
- 		inode->i_op = &ext3_file_inode_operations;
- 		inode->i_fop = &ext3_file_operations;
-@@ -2682,6 +2687,9 @@
- 	} else for (block = 0; block < EXT3_N_BLOCKS; block++)
- 		raw_inode->i_block[block] = ei->i_data[block];
- 
-+	if (EXT3_INODE_SIZE(inode->i_sb) > EXT3_GOOD_OLD_INODE_SIZE)
-+		raw_inode->i_extra_isize = cpu_to_le16(ei->i_extra_isize);
-+
- 	BUFFER_TRACE(bh, "call ext3_journal_dirty_metadata");
- 	rc = ext3_journal_dirty_metadata(handle, bh);
- 	if (!err)
-Index: linux-2.6.0/fs/ext3/xattr.c
-===================================================================
---- linux-2.6.0.orig/fs/ext3/xattr.c	2003-12-30 08:33:13.000000000 +0300
-+++ linux-2.6.0/fs/ext3/xattr.c	2004-01-14 18:54:12.000000000 +0300
-@@ -246,17 +246,12 @@
- }
- 
- /*
-- * ext3_xattr_get()
-- *
-- * Copy an extended attribute into the buffer
-- * provided, or compute the buffer size required.
-- * Buffer is NULL to compute the size of the buffer required.
-+ * ext3_xattr_block_get()
-  *
-- * Returns a negative error number on failure, or the number of bytes
-- * used / required on success.
-+ * routine looks for attribute in EA block and returns it's value and size
-  */
- int
--ext3_xattr_get(struct inode *inode, int name_index, const char *name,
-+ext3_xattr_block_get(struct inode *inode, int name_index, const char *name,
- 	       void *buffer, size_t buffer_size)
- {
- 	struct buffer_head *bh = NULL;
-@@ -270,7 +265,6 @@
- 
- 	if (name == NULL)
- 		return -EINVAL;
--	down_read(&EXT3_I(inode)->xattr_sem);
- 	error = -ENODATA;
- 	if (!EXT3_I(inode)->i_file_acl)
- 		goto cleanup;
-@@ -343,15 +337,87 @@
- 
- cleanup:
- 	brelse(bh);
--	up_read(&EXT3_I(inode)->xattr_sem);
- 
- 	return error;
- }
- 
- /*
-- * ext3_xattr_list()
-+ * ext3_xattr_ibode_get()
-  *
-- * Copy a list of attribute names into the buffer
-+ * routine looks for attribute in inode body and returns it's value and size
-+ */
-+int
-+ext3_xattr_ibody_get(struct inode *inode, int name_index, const char *name,
-+	       void *buffer, size_t buffer_size)
-+{
-+	int size, name_len = strlen(name), storage_size;
-+	struct ext3_xattr_entry *last;
-+	struct ext3_inode *raw_inode;
-+	struct ext3_iloc iloc;
-+	char *start, *end;
-+	int ret = -ENOENT;
-+	
-+	if (EXT3_SB(inode->i_sb)->s_inode_size <= EXT3_GOOD_OLD_INODE_SIZE)
-+		return -ENOENT;
-+
-+	ret = ext3_get_inode_loc(inode, &iloc);
-+	if (ret)
-+		return ret;
-+	raw_inode = ext3_raw_inode(&iloc);
-+
-+	storage_size = EXT3_SB(inode->i_sb)->s_inode_size -
-+				EXT3_GOOD_OLD_INODE_SIZE -
-+				EXT3_I(inode)->i_extra_isize -
-+				sizeof(__u32);
-+	start = (char *) raw_inode + EXT3_GOOD_OLD_INODE_SIZE +
-+			EXT3_I(inode)->i_extra_isize;
-+	if (le32_to_cpu((*(__u32*) start)) != EXT3_XATTR_MAGIC) {
-+		brelse(iloc.bh);
-+		return -ENOENT;
-+	}
-+	start += sizeof(__u32);
-+	end = (char *) raw_inode + EXT3_SB(inode->i_sb)->s_inode_size;
-+
-+	last = (struct ext3_xattr_entry *) start;
-+	while (!IS_LAST_ENTRY(last)) {
-+		struct ext3_xattr_entry *next = EXT3_XATTR_NEXT(last);
-+		if (le32_to_cpu(last->e_value_size) > storage_size ||
-+				(char *) next >= end) {
-+			ext3_error(inode->i_sb, "ext3_xattr_ibody_get",
-+				"inode %ld", inode->i_ino);
-+			brelse(iloc.bh);
-+			return -EIO;
-+		}
-+		if (name_index == last->e_name_index &&
-+		    name_len == last->e_name_len &&
-+		    !memcmp(name, last->e_name, name_len))
-+			goto found;
-+		last = next;
-+	}
-+
-+	/* can't find EA */
-+	brelse(iloc.bh);
-+	return -ENOENT;
-+	
-+found:
-+	size = le32_to_cpu(last->e_value_size);
-+	if (buffer) {
-+		ret = -ERANGE;
-+		if (buffer_size >= size) {
-+			memcpy(buffer, start + le16_to_cpu(last->e_value_offs),
-+				size);
-+			ret = size;
-+		}
-+	} else
-+		ret = size;
-+	brelse(iloc.bh);
-+	return ret;
-+}
-+
-+/*
-+ * ext3_xattr_get()
-+ *
-+ * Copy an extended attribute into the buffer
-  * provided, or compute the buffer size required.
-  * Buffer is NULL to compute the size of the buffer required.
-  *
-@@ -359,7 +425,31 @@
-  * used / required on success.
-  */
- int
--ext3_xattr_list(struct inode *inode, char *buffer, size_t buffer_size)
-+ext3_xattr_get(struct inode *inode, int name_index, const char *name,
-+	       void *buffer, size_t buffer_size)
-+{
-+	int err;
-+
-+	down_read(&EXT3_I(inode)->xattr_sem);
-+
-+	/* try to find attribute in inode body */
-+	err = ext3_xattr_ibody_get(inode, name_index, name,
-+					buffer, buffer_size);
-+	if (err < 0)
-+		/* search was unsuccessful, try to find EA in dedicated block */
-+		err = ext3_xattr_block_get(inode, name_index, name,
-+				buffer, buffer_size);
-+	up_read(&EXT3_I(inode)->xattr_sem);
-+
-+	return err;
-+}
-+
-+/* ext3_xattr_ibody_list()
-+ *
-+ * generate list of attributes stored in EA block
-+ */
-+int
-+ext3_xattr_block_list(struct inode *inode, char *buffer, size_t buffer_size)
- {
- 	struct buffer_head *bh = NULL;
- 	struct ext3_xattr_entry *entry;
-@@ -370,7 +460,6 @@
- 	ea_idebug(inode, "buffer=%p, buffer_size=%ld",
- 		  buffer, (long)buffer_size);
- 
--	down_read(&EXT3_I(inode)->xattr_sem);
- 	error = 0;
- 	if (!EXT3_I(inode)->i_file_acl)
- 		goto cleanup;
-@@ -380,7 +469,7 @@
- 	if (!bh)
- 		goto cleanup;
- 	ea_bdebug(bh, "b_count=%d, refcount=%d",
--		atomic_read(&(bh->b_count)), le32_to_cpu(HDR(bh)->h_refcount));
-+		(int) atomic_read(&(bh->b_count)), (int) le32_to_cpu(HDR(bh)->h_refcount));
- 	end = bh->b_data + bh->b_size;
- 	if (HDR(bh)->h_magic != cpu_to_le32(EXT3_XATTR_MAGIC) ||
- 	    HDR(bh)->h_blocks != cpu_to_le32(1)) {
-@@ -431,11 +520,138 @@
- 
- cleanup:
- 	brelse(bh);
--	up_read(&EXT3_I(inode)->xattr_sem);
- 
- 	return error;
- }
- 
-+/* ext3_xattr_ibody_list()
-+ *
-+ * generate list of attributes stored in inode body
-+ */
-+int
-+ext3_xattr_ibody_list(struct inode *inode, char *buffer, size_t buffer_size)
-+{
-+	struct ext3_xattr_entry *last;
-+	struct ext3_inode *raw_inode;
-+	char *start, *end, *buf;
-+	struct ext3_iloc iloc;
-+	int storage_size;
-+	int ret;
-+	int size = 0;
-+	
-+	if (EXT3_SB(inode->i_sb)->s_inode_size <= EXT3_GOOD_OLD_INODE_SIZE)
-+		return 0;
-+
-+	ret = ext3_get_inode_loc(inode, &iloc);
-+	if (ret)
-+		return ret;
-+	raw_inode = ext3_raw_inode(&iloc);
-+
-+	storage_size = EXT3_SB(inode->i_sb)->s_inode_size -
-+				EXT3_GOOD_OLD_INODE_SIZE -
-+				EXT3_I(inode)->i_extra_isize -
-+				sizeof(__u32);
-+	start = (char *) raw_inode + EXT3_GOOD_OLD_INODE_SIZE +
-+			EXT3_I(inode)->i_extra_isize;
-+	if (le32_to_cpu((*(__u32*) start)) != EXT3_XATTR_MAGIC) {
-+		brelse(iloc.bh);
-+		return 0;
-+	}
-+	start += sizeof(__u32);
-+	end = (char *) raw_inode + EXT3_SB(inode->i_sb)->s_inode_size;
-+
-+	last = (struct ext3_xattr_entry *) start;
-+	while (!IS_LAST_ENTRY(last)) {
-+		struct ext3_xattr_entry *next = EXT3_XATTR_NEXT(last);
-+		struct ext3_xattr_handler *handler;
-+		if (le32_to_cpu(last->e_value_size) > storage_size ||
-+				(char *) next >= end) {
-+			ext3_error(inode->i_sb, "ext3_xattr_ibody_list",
-+				"inode %ld", inode->i_ino);
-+			brelse(iloc.bh);
-+			return -EIO;
-+		}
-+		handler = ext3_xattr_handler(last->e_name_index);
-+		if (handler)
-+			size += handler->list(NULL, inode, last->e_name,
-+					      last->e_name_len);
-+		last = next;
-+	}
-+
-+	if (!buffer) {
-+		ret = size;
-+		goto cleanup;
-+	} else {
-+		ret = -ERANGE;
-+		if (size > buffer_size)
-+			goto cleanup;
-+	}
-+
-+	last = (struct ext3_xattr_entry *) start;
-+	buf = buffer;
-+	while (!IS_LAST_ENTRY(last)) {
-+		struct ext3_xattr_entry *next = EXT3_XATTR_NEXT(last);
-+		struct ext3_xattr_handler *handler;
-+		handler = ext3_xattr_handler(last->e_name_index);
-+		if (handler)
-+			buf += handler->list(buf, inode, last->e_name,
-+					      last->e_name_len);
-+		last = next;
-+	}
-+	ret = size;
-+cleanup:
-+	brelse(iloc.bh);
-+	return ret;
-+}
-+
-+/*
-+ * ext3_xattr_list()
-+ *
-+ * Copy a list of attribute names into the buffer
-+ * provided, or compute the buffer size required.
-+ * Buffer is NULL to compute the size of the buffer required.
-+ *
-+ * Returns a negative error number on failure, or the number of bytes
-+ * used / required on success.
-+ */
-+int
-+ext3_xattr_list(struct inode *inode, char *buffer, size_t buffer_size)
-+{
-+	int error;
-+	int size = buffer_size;
-+
-+	down_read(&EXT3_I(inode)->xattr_sem);
-+
-+	/* get list of attributes stored in inode body */
-+	error = ext3_xattr_ibody_list(inode, buffer, buffer_size);
-+	if (error < 0) {
-+		/* some error occured while collecting
-+		 * attributes in inode body */
-+		size = 0;
-+		goto cleanup;
-+	}
-+	size = error;
-+
-+	/* get list of attributes stored in dedicated block */
-+	if (buffer) {
-+		buffer_size -= error;
-+		if (buffer_size <= 0) {
-+			buffer = NULL;
-+			buffer_size = 0;
-+		} else
-+			buffer += error;
-+	}
-+
-+	error = ext3_xattr_block_list(inode, buffer, buffer_size);
-+	if (error < 0)
-+		/* listing was successful, so we return len */
-+		size = 0;
-+
-+cleanup:
-+	up_read(&EXT3_I(inode)->xattr_sem);
-+	return error + size;
-+}
-+
- /*
-  * If the EXT3_FEATURE_COMPAT_EXT_ATTR feature of this file system is
-  * not set, set it.
-@@ -457,6 +673,279 @@
- }
- 
- /*
-+ * ext3_xattr_ibody_find()
-+ *
-+ * search attribute and calculate free space in inode body
-+ * NOTE: free space includes space our attribute hold
-+ */
-+int
-+ext3_xattr_ibody_find(struct inode *inode, int name_index,
-+		const char *name, struct ext3_xattr_entry *rentry, int *free)
-+{
-+	struct ext3_xattr_entry *last;
-+	struct ext3_inode *raw_inode;
-+	int name_len = strlen(name);
-+	int err, storage_size;
-+	struct ext3_iloc iloc;
-+	char *start, *end;
-+	int ret = -ENOENT;
-+	
-+	if (EXT3_SB(inode->i_sb)->s_inode_size <= EXT3_GOOD_OLD_INODE_SIZE)
-+		return ret;
-+
-+	err = ext3_get_inode_loc(inode, &iloc);
-+	if (err)
-+		return -EIO;
-+	raw_inode = ext3_raw_inode(&iloc);
-+
-+	storage_size = EXT3_SB(inode->i_sb)->s_inode_size -
-+				EXT3_GOOD_OLD_INODE_SIZE -
-+				EXT3_I(inode)->i_extra_isize -
-+				sizeof(__u32);
-+	*free = storage_size - sizeof(__u32);
-+	start = (char *) raw_inode + EXT3_GOOD_OLD_INODE_SIZE +
-+			EXT3_I(inode)->i_extra_isize;
-+	if (le32_to_cpu((*(__u32*) start)) != EXT3_XATTR_MAGIC) {
-+		brelse(iloc.bh);
-+		return -ENOENT;
-+	}
-+	start += sizeof(__u32);
-+	end = (char *) raw_inode + EXT3_SB(inode->i_sb)->s_inode_size;
-+
-+	last = (struct ext3_xattr_entry *) start;
-+	while (!IS_LAST_ENTRY(last)) {
-+		struct ext3_xattr_entry *next = EXT3_XATTR_NEXT(last);
-+		if (le32_to_cpu(last->e_value_size) > storage_size ||
-+				(char *) next >= end) {
-+			ext3_error(inode->i_sb, "ext3_xattr_ibody_find",
-+				"inode %ld", inode->i_ino);
-+			brelse(iloc.bh);
-+			return -EIO;
-+		}
-+
-+		if (name_index == last->e_name_index &&
-+		    name_len == last->e_name_len &&
-+		    !memcmp(name, last->e_name, name_len)) {
-+			memcpy(rentry, last, sizeof(struct ext3_xattr_entry));
-+			ret = 0;
-+		} else {
-+			*free -= EXT3_XATTR_LEN(last->e_name_len);
-+			*free -= le32_to_cpu(last->e_value_size);
-+		}
-+		last = next;
-+	}
-+	
-+	brelse(iloc.bh);
-+	return ret;
-+}
-+
-+/*
-+ * ext3_xattr_block_find()
-+ *
-+ * search attribute and calculate free space in EA block (if it allocated)
-+ * NOTE: free space includes space our attribute hold
-+ */
-+int
-+ext3_xattr_block_find(struct inode *inode, int name_index, const char *name,
-+	       struct ext3_xattr_entry *rentry, int *free)
-+{
-+	struct buffer_head *bh = NULL;
-+	struct ext3_xattr_entry *entry;
-+	char *end;
-+	int name_len, error = -ENOENT;
-+
-+	if (!EXT3_I(inode)->i_file_acl) {
-+		*free = inode->i_sb->s_blocksize -
-+			sizeof(struct ext3_xattr_header) -
-+			sizeof(__u32);
-+		return -ENOENT;
-+	}
-+	ea_idebug(inode, "reading block %d", EXT3_I(inode)->i_file_acl);
-+	bh = sb_bread(inode->i_sb, EXT3_I(inode)->i_file_acl);
-+	if (!bh)
-+		return -EIO;
-+	ea_bdebug(bh, "b_count=%d, refcount=%d",
-+		atomic_read(&(bh->b_count)), le32_to_cpu(HDR(bh)->h_refcount));
-+	end = bh->b_data + bh->b_size;
-+	if (HDR(bh)->h_magic != cpu_to_le32(EXT3_XATTR_MAGIC) ||
-+	    HDR(bh)->h_blocks != cpu_to_le32(1)) {
-+bad_block:	ext3_error(inode->i_sb, "ext3_xattr_get",
-+			"inode %ld: bad block %d", inode->i_ino,
-+			EXT3_I(inode)->i_file_acl);
-+		brelse(bh);
-+		return -EIO;
-+	}
-+	/* find named attribute */
-+	name_len = strlen(name);
-+	*free = bh->b_size - sizeof(__u32);
-+
-+	entry = FIRST_ENTRY(bh);
-+	while (!IS_LAST_ENTRY(entry)) {
-+		struct ext3_xattr_entry *next =
-+			EXT3_XATTR_NEXT(entry);
-+		if ((char *)next >= end)
-+			goto bad_block;
-+		if (name_index == entry->e_name_index &&
-+		    name_len == entry->e_name_len &&
-+		    memcmp(name, entry->e_name, name_len) == 0) {
-+			memcpy(rentry, entry, sizeof(struct ext3_xattr_entry));
-+			error = 0;
-+		} else {
-+			*free -= EXT3_XATTR_LEN(entry->e_name_len);
-+			*free -= le32_to_cpu(entry->e_value_size);
-+		}
-+		entry = next;
-+	}
-+	brelse(bh);
-+
-+	return error;
-+}
-+
-+/*
-+ * ext3_xattr_inode_set()
-+ *
-+ * this routine add/remove/replace attribute in inode body
-+ */
-+int
-+ext3_xattr_ibody_set(handle_t *handle, struct inode *inode, int name_index,
-+		      const char *name, const void *value, size_t value_len,
-+		      int flags)
-+{
-+	struct ext3_xattr_entry *last, *next, *here = NULL;
-+	struct ext3_inode *raw_inode;
-+	int name_len = strlen(name);
-+	int esize = EXT3_XATTR_LEN(name_len);
-+	struct buffer_head *bh;
-+	int err, storage_size;
-+	struct ext3_iloc iloc;
-+	int free, min_offs;
-+	char *start, *end;
-+	
-+	if (EXT3_SB(inode->i_sb)->s_inode_size <= EXT3_GOOD_OLD_INODE_SIZE)
-+		return -ENOSPC;
-+
-+	err = ext3_get_inode_loc(inode, &iloc);
-+	if (err)
-+		return err;
-+	raw_inode = ext3_raw_inode(&iloc);
-+	bh = iloc.bh;
-+
-+	storage_size = EXT3_SB(inode->i_sb)->s_inode_size -
-+				EXT3_GOOD_OLD_INODE_SIZE -
-+				EXT3_I(inode)->i_extra_isize -
-+				sizeof(__u32);
-+	start = (char *) raw_inode + EXT3_GOOD_OLD_INODE_SIZE +
-+			EXT3_I(inode)->i_extra_isize;
-+	if ((*(__u32*) start) != EXT3_XATTR_MAGIC) {
-+		/* inode had no attributes before */
-+		*((__u32*) start) = cpu_to_le32(EXT3_XATTR_MAGIC);
-+	}
-+	start += sizeof(__u32);
-+	end = (char *) raw_inode + EXT3_SB(inode->i_sb)->s_inode_size;
-+	min_offs = storage_size;
-+	free = storage_size - sizeof(__u32);
-+
-+	last = (struct ext3_xattr_entry *) start;	
-+	while (!IS_LAST_ENTRY(last)) {
-+		next = EXT3_XATTR_NEXT(last);
-+		if (le32_to_cpu(last->e_value_size) > storage_size ||
-+				(char *) next >= end) {
-+			ext3_error(inode->i_sb, "ext3_xattr_ibody_set",
-+				"inode %ld", inode->i_ino);
-+			brelse(bh);
-+			return -EIO;
-+		}
-+		
-+		if (last->e_value_size) {
-+			int offs = le16_to_cpu(last->e_value_offs);
-+			if (offs < min_offs)
-+				min_offs = offs;
-+		}
-+		if (name_index == last->e_name_index &&
-+			name_len == last->e_name_len &&
-+			!memcmp(name, last->e_name, name_len))
-+			here = last;
-+		else {
-+			/* we calculate all but our attribute
-+			 * because it will be removed before changing */
-+			free -= EXT3_XATTR_LEN(last->e_name_len);
-+			free -= le32_to_cpu(last->e_value_size);
-+		}
-+		last = next;
-+	}
-+
-+	if (value && (esize + value_len > free)) {
-+		brelse(bh);
-+		return -ENOSPC;
-+	}
-+	
-+	err = ext3_reserve_inode_write(handle, inode, &iloc);
-+	if (err) {
-+		brelse(bh);	
-+		return err;
-+	}
-+
-+	if (here) {
-+		/* time to remove old value */
-+		struct ext3_xattr_entry *e;
-+		int size = le32_to_cpu(here->e_value_size);
-+		int border = le16_to_cpu(here->e_value_offs);
-+		char *src;
-+
-+		/* move tail */
-+		memmove(start + min_offs + size, start + min_offs,
-+				border - min_offs);
-+
-+		/* recalculate offsets */
-+		e = (struct ext3_xattr_entry *) start;
-+		while (!IS_LAST_ENTRY(e)) {
-+			struct ext3_xattr_entry *next = EXT3_XATTR_NEXT(e);
-+			int offs = le16_to_cpu(e->e_value_offs);
-+			if (offs < border)
-+				e->e_value_offs =
-+					cpu_to_le16(offs + size);
-+			e = next;
-+		}
-+		min_offs += size;
-+
-+		/* remove entry */
-+		border = EXT3_XATTR_LEN(here->e_name_len);
-+		src = (char *) here + EXT3_XATTR_LEN(here->e_name_len);
-+		size = (char *) last - src;
-+		if ((char *) here + size > end)
-+			printk("ALERT at %s:%d: 0x%p + %d > 0x%p\n",
-+					__FILE__, __LINE__, here, size, end);
-+		memmove(here, src, size);
-+		last = (struct ext3_xattr_entry *) ((char *) last - border);
-+		*((__u32 *) last) = 0;
-+	}
-+	
-+	if (value) {
-+		int offs = min_offs - value_len;
-+		/* use last to create new entry */
-+		last->e_name_len = strlen(name);
-+		last->e_name_index = name_index;
-+		last->e_value_offs = cpu_to_le16(offs);
-+		last->e_value_size = cpu_to_le32(value_len);
-+		last->e_hash = last->e_value_block = 0;
-+		memset(last->e_name, 0, esize);
-+		memcpy(last->e_name, name, last->e_name_len);
-+		if (start + offs + value_len > end)
-+			printk("ALERT at %s:%d: 0x%p + %d + %d > 0x%p\n",
-+					__FILE__, __LINE__, start, offs,
-+					value_len, end);
-+		memcpy(start + offs, value, value_len);
-+		last = EXT3_XATTR_NEXT(last);
-+		*((__u32 *) last) = 0;
-+	}
-+	
-+	ext3_mark_iloc_dirty(handle, inode, &iloc);
-+	brelse(bh);
-+
-+	return 0;
-+}
-+
-+/*
-  * ext3_xattr_set_handle()
-  *
-  * Create, replace or remove an extended attribute for this inode. Buffer
-@@ -470,6 +959,104 @@
-  */
- int
- ext3_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index,
-+		const char *name, const void *value, size_t value_len,
-+		int flags)
-+{
-+	struct ext3_xattr_entry entry;
-+	int err, where = 0, found = 0, total;
-+	int free1 = -1, free2 = -1;
-+	int name_len;
-+	
-+	ea_idebug(inode, "name=%d.%s, value=%p, value_len=%ld",
-+		  name_index, name, value, (long)value_len);
-+
-+	if (IS_RDONLY(inode))
-+		return -EROFS;
-+	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
-+		return -EPERM;
-+	if (value == NULL)
-+		value_len = 0;
-+	if (name == NULL)
-+		return -EINVAL;
-+	name_len = strlen(name);
-+	if (name_len > 255 || value_len > inode->i_sb->s_blocksize)
-+		return -ERANGE;
-+	down_write(&EXT3_I(inode)->xattr_sem);
-+
-+	/* try to find attribute in inode body */
-+	err = ext3_xattr_ibody_find(inode, name_index, name, &entry, &free1);
-+	if (err == 0) {
-+		/* found EA in inode */
-+		found = 1;
-+		where = 0;
-+	} else if (err == -ENOENT) {
-+		/* there is no such attribute in inode body */
-+		/* try to find attribute in dedicated block */
-+		err = ext3_xattr_block_find(inode, name_index, name,
-+						&entry, &free2);
-+		if (err != 0 && err != -ENOENT) {
-+			/* not found EA in block */
-+			goto finish;	
-+		} else if (err == 0) {
-+			/* found EA in block */
-+			where = 1;
-+			found = 1;
-+		}
-+	} else
-+		goto finish;
-+
-+	/* check flags: may replace? may create ? */
-+	if (found && (flags & XATTR_CREATE)) {
-+		err = -EEXIST;
-+		goto finish;
-+	} else if (!found && (flags & XATTR_REPLACE)) {
-+		err = -ENODATA;
-+		goto finish;
-+	}
-+
-+	/* check if we have enough space to store attribute */
-+	total = EXT3_XATTR_LEN(strlen(name)) + value_len;
-+	if (free1 >= 0 && total > free1 && free2 >= 0 && total > free2) {
-+		/* have no enough space */
-+		err = -ENOSPC;
-+		goto finish;
-+	}
-+	
-+	/* time to remove attribute */
-+	if (found) {
-+		if (where == 0) {
-+			/* EA is stored in inode body */
-+			ext3_xattr_ibody_set(handle, inode, name_index, name,
-+					NULL, 0, flags);
-+		} else {
-+			/* EA is stored in separated block */
-+			ext3_xattr_block_set(handle, inode, name_index, name,
-+					NULL, 0, flags);
-+		}
-+	}
-+
-+	/* try to store EA in inode body */
-+	err = ext3_xattr_ibody_set(handle, inode, name_index, name,
-+				value, value_len, flags);
-+	if (err) {
-+		/* can't store EA in inode body */
-+		/* try to store in block */
-+		err = ext3_xattr_block_set(handle, inode, name_index,
-+					name, value, value_len, flags);	
-+	}
-+
-+finish:	
-+	up_write(&EXT3_I(inode)->xattr_sem);
-+	return err;
-+}
-+
-+/*
-+ * ext3_xattr_block_set()
-+ *
-+ * this routine add/remove/replace attribute in EA block
-+ */
-+int
-+ext3_xattr_block_set(handle_t *handle, struct inode *inode, int name_index,
- 		      const char *name, const void *value, size_t value_len,
- 		      int flags)
- {
-@@ -492,22 +1078,7 @@
- 	 *             towards the end of the block).
- 	 * end -- Points right after the block pointed to by header.
- 	 */
--
--	ea_idebug(inode, "name=%d.%s, value=%p, value_len=%ld",
--		  name_index, name, value, (long)value_len);
--
--	if (IS_RDONLY(inode))
--		return -EROFS;
--	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
--		return -EPERM;
--	if (value == NULL)
--		value_len = 0;
--	if (name == NULL)
--		return -EINVAL;
- 	name_len = strlen(name);
--	if (name_len > 255 || value_len > sb->s_blocksize)
--		return -ERANGE;
--	down_write(&EXT3_I(inode)->xattr_sem);
- 	if (EXT3_I(inode)->i_file_acl) {
- 		/* The inode already has an extended attribute block. */
- 		bh = sb_bread(sb, EXT3_I(inode)->i_file_acl);
-@@ -733,7 +1304,6 @@
- 	brelse(bh);
- 	if (!(bh && header == HDR(bh)))
- 		kfree(header);
--	up_write(&EXT3_I(inode)->xattr_sem);
- 
- 	return error;
- }
-Index: linux-2.6.0/fs/ext3/xattr.h
-===================================================================
---- linux-2.6.0.orig/fs/ext3/xattr.h	2003-06-24 18:04:43.000000000 +0400
-+++ linux-2.6.0/fs/ext3/xattr.h	2004-01-14 18:54:12.000000000 +0300
-@@ -77,7 +77,8 @@
- extern int ext3_xattr_get(struct inode *, int, const char *, void *, size_t);
- extern int ext3_xattr_list(struct inode *, char *, size_t);
- extern int ext3_xattr_set(struct inode *, int, const char *, const void *, size_t, int);
--extern int ext3_xattr_set_handle(handle_t *, struct inode *, int, const char *, const void *, size_t, int);
-+extern int ext3_xattr_set_handle(handle_t *, struct inode *, int, const char *,const void *,size_t,int);
-+extern int ext3_xattr_block_set(handle_t *, struct inode *, int, const char *,const void *,size_t,int);
- 
- extern void ext3_xattr_delete_inode(handle_t *, struct inode *);
- extern void ext3_xattr_put_super(struct super_block *);
-Index: linux-2.6.0/include/linux/ext3_fs.h
-===================================================================
---- linux-2.6.0.orig/include/linux/ext3_fs.h	2004-01-14 18:54:11.000000000 +0300
-+++ linux-2.6.0/include/linux/ext3_fs.h	2004-01-14 18:54:12.000000000 +0300
-@@ -265,6 +265,8 @@
- 			__u32	m_i_reserved2[2];
- 		} masix2;
- 	} osd2;				/* OS dependent 2 */
-+	__u16	i_extra_isize;
-+	__u16	i_pad1;
- };
- 
- #define i_size_high	i_dir_acl
-Index: linux-2.6.0/include/linux/ext3_fs_i.h
-===================================================================
---- linux-2.6.0.orig/include/linux/ext3_fs_i.h	2003-12-30 08:32:44.000000000 +0300
-+++ linux-2.6.0/include/linux/ext3_fs_i.h	2004-01-14 18:54:12.000000000 +0300
-@@ -96,6 +96,9 @@
- 	 */
- 	loff_t	i_disksize;
- 
-+	/* on-disk additional length */
-+	__u16 i_extra_isize;
-+
- 	/*
- 	 * truncate_sem is for serialising ext3_truncate() against
- 	 * ext3_getblock().  In the 2.4 ext2 design, great chunks of inode's
-
-%diffstat
- fs/ext3/ialloc.c          |    5 
- fs/ext3/inode.c           |   10 
- fs/ext3/xattr.c           |  634 +++++++++++++++++++++++++++++++++++++++++++---
- fs/ext3/xattr.h           |    3 
- include/linux/ext3_fs.h   |    2 
- include/linux/ext3_fs_i.h |    3 
- 6 files changed, 623 insertions(+), 34 deletions(-)
-
diff --git a/ldiskfs/kernel_patches/patches/ext3-include-fixes-2.6-suse.patch b/ldiskfs/kernel_patches/patches/ext3-include-fixes-2.6-suse.patch
deleted file mode 100644
index 28e3587..0000000
--- a/ldiskfs/kernel_patches/patches/ext3-include-fixes-2.6-suse.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: linux-stage/include/linux/ext3_fs.h
-===================================================================
---- linux-stage.orig/include/linux/ext3_fs.h	2004-04-02 16:43:37.000000000 -0500
-+++ linux-stage/include/linux/ext3_fs.h	2004-04-02 16:43:37.000000000 -0500
-@@ -331,12 +331,13 @@
- #define EXT3_MOUNT_IOPEN_NOPRIV	       0x20000  /* Make iopen world-readable */
- 
- /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
--#ifndef _LINUX_EXT2_FS_H
-+#ifndef clear_opt
- #define clear_opt(o, opt)		o &= ~EXT3_MOUNT_##opt
- #define set_opt(o, opt)			o |= EXT3_MOUNT_##opt
- #define test_opt(sb, opt)		(EXT3_SB(sb)->s_mount_opt & \
- 					 EXT3_MOUNT_##opt)
--#else
-+#endif
-+#ifndef EXT2_MOUNT_NOLOAD
- #define EXT2_MOUNT_NOLOAD		EXT3_MOUNT_NOLOAD
- #define EXT2_MOUNT_ABORT		EXT3_MOUNT_ABORT
- #define EXT2_MOUNT_DATA_FLAGS		EXT3_MOUNT_DATA_FLAGS
diff --git a/ldiskfs/kernel_patches/patches/iopen-2.6-suse.patch b/ldiskfs/kernel_patches/patches/iopen-2.6-suse.patch
deleted file mode 100644
index 2133355..0000000
--- a/ldiskfs/kernel_patches/patches/iopen-2.6-suse.patch
+++ /dev/null
@@ -1,475 +0,0 @@
- fs/ext3/inode.c                    |    3 
- fs/ext3/iopen.c                    |  239 +++++++++++++++++++++++++++++++++++++
- fs/ext3/iopen.h                    |   15 ++
- fs/ext3/namei.c                    |   13 ++
- fs/ext3/super.c                    |   17 ++
- include/linux/ext3_fs.h            |    2 
- 7 files changed, 304 insertions(+), 1 deletion(-)
-
-Index: linux-stage/fs/ext3/Makefile
-===================================================================
---- linux-stage.orig/fs/ext3/Makefile	2004-05-07 16:00:16.000000000 -0400
-+++ linux-stage/fs/ext3/Makefile	2004-05-07 16:00:17.000000000 -0400
-@@ -4,7 +4,7 @@
- 
- obj-$(CONFIG_EXT3_FS) += ext3.o
- 
--ext3-y	:= balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
-+ext3-y	:= balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o iopen.o \
- 	   ioctl.o namei.o super.o symlink.o hash.o
- 
- ext3-$(CONFIG_EXT3_FS_XATTR)	 += xattr.o xattr_user.o xattr_trusted.o
-Index: linux-stage/fs/ext3/inode.c
-===================================================================
---- linux-stage.orig/fs/ext3/inode.c	2004-05-07 16:00:16.000000000 -0400
-+++ linux-stage/fs/ext3/inode.c	2004-05-07 17:21:59.000000000 -0400
-@@ -37,6 +37,7 @@
- #include <linux/mpage.h>
- #include <linux/uio.h>
- #include "xattr.h"
-+#include "iopen.h"
- #include "acl.h"
- 
- /*
-@@ -2472,6 +2473,9 @@
- 	ei->i_acl = EXT3_ACL_NOT_CACHED;
- 	ei->i_default_acl = EXT3_ACL_NOT_CACHED;
- #endif
-+	if (ext3_iopen_get_inode(inode))
-+		return;
-+
- 	if (ext3_get_inode_loc(inode, &iloc, 0))
- 		goto bad_inode;
- 	bh = iloc.bh;
-Index: linux-stage/fs/ext3/iopen.c
-===================================================================
---- linux-stage.orig/fs/ext3/iopen.c	2004-05-07 16:00:17.000000000 -0400
-+++ linux-stage/fs/ext3/iopen.c	2004-05-07 17:22:37.000000000 -0400
-@@ -0,0 +1,272 @@
-+/*
-+ * linux/fs/ext3/iopen.c
-+ *
-+ * Special support for open by inode number
-+ *
-+ * Copyright (C) 2001 by Theodore Ts'o (tytso@alum.mit.edu).
-+ *
-+ * This file may be redistributed under the terms of the GNU General
-+ * Public License.
-+ *
-+ *
-+ * Invariants:
-+ *   - there is only ever a single DCACHE_NFSD_DISCONNECTED dentry alias
-+ *     for an inode at one time.
-+ *   - there are never both connected and DCACHE_NFSD_DISCONNECTED dentry
-+ *     aliases on an inode at the same time.
-+ *
-+ * If we have any connected dentry aliases for an inode, use one of those
-+ * in iopen_lookup().  Otherwise, we instantiate a single NFSD_DISCONNECTED
-+ * dentry for this inode, which thereafter will be found by the dcache
-+ * when looking up this inode number in __iopen__, so we don't return here
-+ * until it is gone.
-+ *
-+ * If we get an inode via a regular name lookup, then we "rename" the
-+ * NFSD_DISCONNECTED dentry to the proper name and parent.  This ensures
-+ * existing users of the disconnected dentry will continue to use the same
-+ * dentry as the connected users, and there will never be both kinds of
-+ * dentry aliases at one time.
-+ */
-+
-+#include <linux/sched.h>
-+#include <linux/fs.h>
-+#include <linux/ext3_jbd.h>
-+#include <linux/jbd.h>
-+#include <linux/ext3_fs.h>
-+#include <linux/smp_lock.h>
-+#include <linux/dcache.h>
-+#include <linux/security.h>
-+#include "iopen.h"
-+
-+#ifndef assert
-+#define assert(test) J_ASSERT(test)
-+#endif
-+
-+#define IOPEN_NAME_LEN	32
-+
-+/*
-+ * This implements looking up an inode by number.
-+ */
-+static struct dentry *iopen_lookup(struct inode * dir, struct dentry *dentry,
-+				   struct nameidata *nd)
-+{
-+	struct inode *inode;
-+	unsigned long ino;
-+	struct list_head *lp;
-+	struct dentry *alternate;
-+	char buf[IOPEN_NAME_LEN];
-+
-+	if (dentry->d_name.len >= IOPEN_NAME_LEN)
-+		return ERR_PTR(-ENAMETOOLONG);
-+
-+	memcpy(buf, dentry->d_name.name, dentry->d_name.len);
-+	buf[dentry->d_name.len] = 0;
-+
-+	if (strcmp(buf, ".") == 0)
-+		ino = dir->i_ino;
-+	else if (strcmp(buf, "..") == 0)
-+		ino = EXT3_ROOT_INO;
-+	else
-+		ino = simple_strtoul(buf, 0, 0);
-+
-+	if ((ino != EXT3_ROOT_INO &&
-+	     //ino != EXT3_ACL_IDX_INO &&
-+	     //ino != EXT3_ACL_DATA_INO &&
-+	     ino < EXT3_FIRST_INO(dir->i_sb)) ||
-+	    ino > le32_to_cpu(EXT3_SB(dir->i_sb)->s_es->s_inodes_count))
-+		return ERR_PTR(-ENOENT);
-+
-+	inode = iget(dir->i_sb, ino);
-+	if (!inode)
-+		return ERR_PTR(-EACCES);
-+	if (is_bad_inode(inode)) {
-+		iput(inode);
-+		return ERR_PTR(-ENOENT);
-+	}
-+
-+	assert(list_empty(&dentry->d_alias));		/* d_instantiate */
-+	assert(d_unhashed(dentry));		/* d_rehash */
-+
-+	/* preferrably return a connected dentry */
-+	spin_lock(&dcache_lock);
-+	list_for_each(lp, &inode->i_dentry) {
-+		alternate = list_entry(lp, struct dentry, d_alias);
-+		assert(!(alternate->d_flags & DCACHE_DISCONNECTED));
-+	}
-+
-+	if (!list_empty(&inode->i_dentry)) {
-+		alternate = list_entry(inode->i_dentry.next,
-+				       struct dentry, d_alias);
-+		dget_locked(alternate);
-+		alternate->d_vfs_flags |= DCACHE_REFERENCED;
-+		iput(inode);
-+		spin_unlock(&dcache_lock);
-+		return alternate;
-+	}
-+	dentry->d_flags |= DCACHE_DISCONNECTED;
-+
-+	/* d_add(), but don't drop dcache_lock before adding dentry to inode */
-+	list_add(&dentry->d_alias, &inode->i_dentry);	/* d_instantiate */
-+	dentry->d_inode = inode;
-+
-+	__d_rehash(dentry, 0);				/* d_rehash */
-+	spin_unlock(&dcache_lock);
-+
-+	return NULL;
-+}
-+
-+#define do_switch(x,y) do { \
-+	__typeof__ (x) __tmp = x; \
-+	x = y; y = __tmp; } while (0)
-+
-+static inline void switch_names(struct dentry *dentry, struct dentry *target)
-+{
-+	const unsigned char *old_name, *new_name;
-+
-+	memcpy(dentry->d_iname, target->d_iname, DNAME_INLINE_LEN);
-+	old_name = target->d_name.name;
-+	new_name = dentry->d_name.name;
-+	if (old_name == target->d_iname)
-+		old_name = dentry->d_iname;
-+	if (new_name == dentry->d_iname)
-+		new_name = target->d_iname;
-+	target->d_name.name = new_name;
-+	dentry->d_name.name = old_name;
-+}
-+
-+/* This function is spliced into ext3_lookup and does the move of a
-+ * disconnected dentry (if it exists) to a connected dentry.
-+ */
-+struct dentry *iopen_connect_dentry(struct dentry *dentry, struct inode *inode,
-+				    int rehash)
-+{
-+	struct dentry *tmp, *goal = NULL;
-+	struct list_head *lp;
-+
-+	/* verify this dentry is really new */
-+	assert(dentry->d_inode == NULL);
-+	assert(list_empty(&dentry->d_alias));		/* d_instantiate */
-+	if (rehash)
-+		assert(d_unhashed(dentry));	/* d_rehash */
-+	assert(list_empty(&dentry->d_subdirs));
-+
-+	spin_lock(&dcache_lock);
-+	if (!inode)
-+		goto do_rehash;
-+
-+	/* preferrably return a connected dentry */
-+	list_for_each(lp, &inode->i_dentry) {
-+		tmp = list_entry(lp, struct dentry, d_alias);
-+		if (tmp->d_flags & DCACHE_DISCONNECTED) {
-+			assert(tmp->d_alias.next == &inode->i_dentry);
-+			assert(tmp->d_alias.prev == &inode->i_dentry);
-+			goal = tmp;
-+			dget_locked(goal);
-+			break;
-+		}
-+	}
-+
-+	if (!goal)
-+		goto do_instantiate;
-+
-+	/* Move the goal to the de hash queue */
-+	goal->d_flags &= ~ DCACHE_DISCONNECTED;
-+	security_d_instantiate(goal, inode);
-+	__d_rehash(dentry, 0);
-+	__d_move(goal, dentry);
-+	spin_unlock(&dcache_lock);
-+	iput(inode);
-+
-+	return goal;
-+
-+	/* d_add(), but don't drop dcache_lock before adding dentry to inode */
-+do_instantiate:
-+	list_add(&dentry->d_alias, &inode->i_dentry);	/* d_instantiate */
-+	dentry->d_inode = inode;
-+do_rehash:
-+	if (rehash)
-+		__d_rehash(dentry, 0);			/* d_rehash */
-+	spin_unlock(&dcache_lock);
-+
-+	return NULL;
-+}
-+
-+/*
-+ * These are the special structures for the iopen pseudo directory.
-+ */
-+
-+static struct inode_operations iopen_inode_operations = {
-+	lookup:		iopen_lookup,		/* BKL held */
-+};
-+
-+static struct file_operations iopen_file_operations = {
-+	read:		generic_read_dir,
-+};
-+
-+static int match_dentry(struct dentry *dentry, const char *name)
-+{
-+	int	len;
-+
-+	len = strlen(name);
-+	if (dentry->d_name.len != len)
-+		return 0;
-+	if (strncmp(dentry->d_name.name, name, len))
-+		return 0;
-+	return 1;
-+}
-+
-+/*
-+ * This function is spliced into ext3_lookup and returns 1 the file
-+ * name is __iopen__ and dentry has been filled in appropriately.
-+ */
-+int ext3_check_for_iopen(struct inode *dir, struct dentry *dentry)
-+{
-+	struct inode *inode;
-+
-+	if (dir->i_ino != EXT3_ROOT_INO ||
-+	    !test_opt(dir->i_sb, IOPEN) ||
-+	    !match_dentry(dentry, "__iopen__"))
-+		return 0;
-+
-+	inode = iget(dir->i_sb, EXT3_BAD_INO);
-+
-+	if (!inode)
-+		return 0;
-+	d_add(dentry, inode);
-+	return 1;
-+}
-+
-+/*
-+ * This function is spliced into read_inode; it returns 1 if inode
-+ * number is the one for /__iopen__, in which case the inode is filled
-+ * in appropriately.  Otherwise, this fuction returns 0.
-+ */
-+int ext3_iopen_get_inode(struct inode *inode)
-+{
-+	if (inode->i_ino != EXT3_BAD_INO)
-+		return 0;
-+
-+	inode->i_mode = S_IFDIR | S_IRUSR | S_IXUSR;
-+	if (test_opt(inode->i_sb, IOPEN_NOPRIV))
-+		inode->i_mode |= 0777;
-+	inode->i_uid = 0;
-+	inode->i_gid = 0;
-+	inode->i_nlink = 1;
-+	inode->i_size = 4096;
-+	inode->i_atime = CURRENT_TIME;
-+	inode->i_ctime = CURRENT_TIME;
-+	inode->i_mtime = CURRENT_TIME;
-+	EXT3_I(inode)->i_dtime = 0;
-+	inode->i_blksize = PAGE_SIZE;	/* This is the optimal IO size
-+					 * (for stat), not the fs block
-+					 * size */
-+	inode->i_blocks = 0;
-+	inode->i_version = 1;
-+	inode->i_generation = 0;
-+
-+	inode->i_op = &iopen_inode_operations;
-+	inode->i_fop = &iopen_file_operations;
-+	inode->i_mapping->a_ops = 0;
-+
-+	return 1;
-+}
-Index: linux-stage/fs/ext3/iopen.h
-===================================================================
---- linux-stage.orig/fs/ext3/iopen.h	2004-05-07 16:00:17.000000000 -0400
-+++ linux-stage/fs/ext3/iopen.h	2004-05-07 16:00:17.000000000 -0400
-@@ -0,0 +1,15 @@
-+/*
-+ * iopen.h
-+ *
-+ * Special support for opening files by inode number.
-+ *
-+ * Copyright (C) 2001 by Theodore Ts'o (tytso@alum.mit.edu).
-+ *
-+ * This file may be redistributed under the terms of the GNU General
-+ * Public License.
-+ */
-+
-+extern int ext3_check_for_iopen(struct inode *dir, struct dentry *dentry);
-+extern int ext3_iopen_get_inode(struct inode *inode);
-+extern struct dentry *iopen_connect_dentry(struct dentry *dentry,
-+					   struct inode *inode, int rehash);
-Index: linux-stage/fs/ext3/namei.c
-===================================================================
---- linux-stage.orig/fs/ext3/namei.c	2004-05-07 16:00:16.000000000 -0400
-+++ linux-stage/fs/ext3/namei.c	2004-05-07 16:00:17.000000000 -0400
-@@ -37,6 +37,7 @@
- #include <linux/buffer_head.h>
- #include <linux/smp_lock.h>
- #include "xattr.h"
-+#include "iopen.h"
- #include "acl.h"
- 
- /*
-@@ -979,6 +980,9 @@
- 	if (dentry->d_name.len > EXT3_NAME_LEN)
- 		return ERR_PTR(-ENAMETOOLONG);
- 
-+	if (ext3_check_for_iopen(dir, dentry))
-+		return NULL;
-+
- 	bh = ext3_find_entry(dentry, &de);
- 	inode = NULL;
- 	if (bh) {
-@@ -989,10 +993,8 @@
- 		if (!inode)
- 			return ERR_PTR(-EACCES);
- 	}
--	if (inode)
--		return d_splice_alias(inode, dentry);
--	d_add(dentry, inode);
--	return NULL;
-+
-+	return iopen_connect_dentry(dentry, inode, 1);
- }
- 
- 
-@@ -2019,10 +2021,6 @@
- 			      inode->i_nlink);
- 	inode->i_version++;
- 	inode->i_nlink = 0;
--	/* There's no need to set i_disksize: the fact that i_nlink is
--	 * zero will ensure that the right thing happens during any
--	 * recovery. */
--	inode->i_size = 0;
- 	ext3_orphan_add(handle, inode);
- 	inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME;
- 	ext3_mark_inode_dirty(handle, inode);
-@@ -2139,6 +2137,23 @@
- 	return err;
- }
- 
-+/* Like ext3_add_nondir() except for call to iopen_connect_dentry */
-+static int ext3_add_link(handle_t *handle, struct dentry *dentry,
-+			 struct inode *inode)
-+{
-+	int err = ext3_add_entry(handle, dentry, inode);
-+	if (!err) {
-+		err = ext3_mark_inode_dirty(handle, inode);
-+		if (err == 0) {
-+			(void)iopen_connect_dentry(dentry, inode, 0);
-+			return 0;
-+		}
-+	}
-+	ext3_dec_count(handle, inode);
-+	iput(inode);
-+	return err;
-+}
-+
- static int ext3_link (struct dentry * old_dentry,
- 		struct inode * dir, struct dentry *dentry)
- {
-@@ -2161,7 +2176,8 @@
- 	ext3_inc_count(handle, inode);
- 	atomic_inc(&inode->i_count);
- 
--	err = ext3_add_nondir(handle, dentry, inode);
-+	err = ext3_add_link(handle, dentry, inode);
-+	ext3_orphan_del(handle,inode);
- 	ext3_journal_stop(handle);
- 	return err;
- }
-Index: linux-stage/fs/ext3/super.c
-===================================================================
---- linux-stage.orig/fs/ext3/super.c	2004-05-07 16:00:16.000000000 -0400
-+++ linux-stage/fs/ext3/super.c	2004-05-07 17:21:59.000000000 -0400
-@@ -536,7 +536,7 @@
- 	Opt_user_xattr, Opt_nouser_xattr, Opt_acl, Opt_noacl, Opt_noload,
- 	Opt_commit, Opt_journal_update, Opt_journal_inum,
- 	Opt_abort, Opt_data_journal, Opt_data_ordered, Opt_data_writeback,
--	Opt_ignore, Opt_err,
-+	Opt_ignore, Opt_err, Opt_iopen, Opt_noiopen, Opt_iopen_nopriv,
- };
- 
- static match_table_t tokens = {
-@@ -575,6 +575,9 @@
- 	{Opt_ignore, "noquota"},
- 	{Opt_ignore, "quota"},
- 	{Opt_ignore, "usrquota"},
-+	{Opt_iopen,  "iopen"},
-+	{Opt_noiopen,  "noiopen"},
-+	{Opt_iopen_nopriv,  "iopen_nopriv"},
- 	{Opt_err, NULL}
- };
- 
-@@ -762,6 +765,18 @@
- 		case Opt_abort:
- 			set_opt(sbi->s_mount_opt, ABORT);
- 			break;
-+		case Opt_iopen:
-+			set_opt (sbi->s_mount_opt, IOPEN);
-+			clear_opt (sbi->s_mount_opt, IOPEN_NOPRIV);
-+			break;
-+		case Opt_noiopen:
-+			clear_opt (sbi->s_mount_opt, IOPEN);
-+			clear_opt (sbi->s_mount_opt, IOPEN_NOPRIV);
-+			break;
-+		case Opt_iopen_nopriv:
-+			set_opt (sbi->s_mount_opt, IOPEN);
-+			set_opt (sbi->s_mount_opt, IOPEN_NOPRIV);
-+			break;
- 		case Opt_ignore:
- 			break;
- 		default:
-Index: linux-stage/include/linux/ext3_fs.h
-===================================================================
---- linux-stage.orig/include/linux/ext3_fs.h	2004-05-07 16:00:16.000000000 -0400
-+++ linux-stage/include/linux/ext3_fs.h	2004-05-07 16:00:17.000000000 -0400
-@@ -325,6 +325,8 @@
- #define EXT3_MOUNT_NO_UID32		0x2000  /* Disable 32-bit UIDs */
- #define EXT3_MOUNT_XATTR_USER		0x4000	/* Extended user attributes */
- #define EXT3_MOUNT_POSIX_ACL		0x8000	/* POSIX Access Control Lists */
-+#define EXT3_MOUNT_IOPEN	       0x10000  /* Allow access via iopen */
-+#define EXT3_MOUNT_IOPEN_NOPRIV	       0x20000  /* Make iopen world-readable */
- 
- /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
- #ifndef _LINUX_EXT2_FS_H
diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-suse.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-suse.series
deleted file mode 100644
index cff99dd..0000000
--- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-suse.series
+++ /dev/null
@@ -1,9 +0,0 @@
-ext3-wantedi-2.6-suse.patch
-ext3-san-jdike-2.6-suse.patch
-iopen-2.6-suse.patch 
-export_symbols-ext3-2.6-suse.patch
-ext3-map_inode_page-2.6-suse.patch
-ext3-init-generation-2.6-suse.patch
-ext3-ea-in-inode-2.6-suse.patch
-export-ext3-2.6-suse.patch
-ext3-include-fixes-2.6-suse.patch
diff --git a/ldiskfs/ldiskfs/Makefile.in b/ldiskfs/ldiskfs/Makefile.in
deleted file mode 100644
index 7d1e229..0000000
--- a/ldiskfs/ldiskfs/Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
-default: all
-
-MODULES := ldiskfs
-
-# copy makefile over to not break patches
-ext3_extra := $(wildcard @LINUX@/fs/ext3/Makefile)
-
-ext3_headers := $(wildcard @LINUX@/fs/ext3/*.h)
-linux_headers := $(wildcard @LINUX@/include/linux/ext3*.h)
-
-ext3_sources := $(filter-out %.mod.c,$(wildcard @LINUX@/fs/ext3/*.c))
-new_sources := iopen.c iopen.h
-ldiskfs_sources := $(notdir $(ext3_sources) $(ext3_headers)) $(new_sources)
-
-ldiskfs-objs := $(filter %.o,$(ldiskfs_sources:.c=.o))
-
-EXTRA_PRE_CFLAGS := -I@LINUX@/fs -I@LUSTRE@ -I@LUSTRE@/ldiskfs
-
-@INCLUDE_RULES@
diff --git a/ldiskfs/ldiskfs/autoMakefile.am b/ldiskfs/ldiskfs/autoMakefile.am
deleted file mode 100644
index b24081e..0000000
--- a/ldiskfs/ldiskfs/autoMakefile.am
+++ /dev/null
@@ -1,64 +0,0 @@
-if LDISKFS
-modulefs_DATA = ldiskfs$(KMODEXT)
-endif
-
-ldiskfs_linux_headers := $(addprefix linux/,$(subst ext3,ldiskfs,$(notdir $(linux_headers))))
-
-$(filter %.c,$(ldiskfs_sources)): sources $(ldiskfs_linux_headers) $(filter %.h,$(ldiskfs_sources))
-
-ldiskfs_sed_flags = \
-	-e "s/dx_hash_info/ext3_dx_hash_info/g" \
-	-e "s/dir_private_info/ext3_dir_private_info/g" \
-	-e "s/DX_HASH/EXT3_DX_HASH/g" \
-	-e "s/EXT3/LDISKFS/g" -e "s/ext3/ldiskfs/g"
-
-%.c: linux-stage/fs/ext3/%.c
-	sed $(strip $(ldiskfs_sed_flags)) $< > $@
-
-%.h: linux-stage/fs/ext3/%.h
-	sed $(strip $(ldiskfs_sed_flags)) $< > $@
-
-linux/ldiskfs%.h: linux-stage/include/linux/ext3%.h
-	sed $(strip $(ldiskfs_sed_flags)) $< > $@
-
-#
-# FIXME: we need to grab the series in configure somehow
-# (see bug 1679)
-#
-series := @top_srcdir@/kernel_patches/series/ldiskfs-2.6-suse.series
-
-sources: $(ext3_sources) $(ext3_headers) $(linux_headers) $(series)
-	rm -rf linux-stage linux sources $(ldiskfs_SOURCES)
-	mkdir -p linux-stage/fs/ext3 linux-stage/include/linux
-	cd linux-stage && quilt setup -l ../$(series)
-	cp $(ext3_sources) $(ext3_headers) $(ext3_extra) linux-stage/fs/ext3
-	cp $(linux_headers) linux-stage/include/linux
-	cd linux-stage && quilt push -a -q
-	mkdir linux
-	@echo -n "Replacing 'ext3' with 'ldiskfs':"
-	@for i in $(notdir $(ext3_headers) $(ext3_sources)) $(new_sources) ; do \
-		echo -n " $$i" ; \
-		sed $(strip $(ldiskfs_sed_flags)) \
-			linux-stage/fs/ext3/$$i > $$i ; \
-	done
-	@for i in $(subst ext3,,$(notdir $(linux_headers))) ; do \
-		echo -n " ext3$$i" ; \
-		sed $(strip $(ldiskfs_sed_flags)) \
-			linux-stage/include/linux/ext3$$i \
-			> linux/ldiskfs$$i ; \
-	done
-	touch sources
-
-foo-check:
-	@echo "ldiskfs_sources: $(ldiskfs_sources)"
-	@echo "ldiskfs_SOURCES: $(ldiskfs_SOURCES)"
-	@echo "ldiskfs_headers: $(ldiskfs_headers)"
-	@echo "ldiskfs_objects: $(ldiskfs_objects)"
-	@echo "ldiskfs_OBJECTS: $(ldiskfs_OBJECTS)"
-	@echo "ldiskfs_LDADD: $(ldiskfs_LDADD)"
-
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-CLEANFILES = sources *.c *.h
-
-clean: clean-am
-	rm -rf linux linux-stage
diff --git a/lnet/.cvsignore b/lnet/.cvsignore
index f30d862..c1a9bdf 100644
--- a/lnet/.cvsignore
+++ b/lnet/.cvsignore
@@ -1,11 +1,9 @@
 Kernelenv
 Makefile
-autoMakefile
-autoMakefile.in
+Makefile.in
 aclocal.m4
 autom4te.cache
 config.log
 config.status
 configure
-.*.cmd
-.depend
+.*.o.cmd
diff --git a/lnet/Makefile.am b/lnet/Makefile.am
new file mode 100644
index 0000000..0083ac1
--- /dev/null
+++ b/lnet/Makefile.am
@@ -0,0 +1,19 @@
+# Copyright (C) 2001  Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+EXTRA_DIST = Rules.linux archdep.m4 include 
+DIST_SUBDIRS = libcfs portals knals unals utils tests doc router
+
+if LIBLUSTRE
+SUBDIRS = portals unals utils
+else
+
+if CRAY_PORTALS
+SUBDIRS = libcfs tests doc 
+else 
+SUBDIRS = libcfs portals knals unals utils tests doc router
+endif
+
+endif
diff --git a/lnet/Makefile.in b/lnet/Makefile.in
deleted file mode 100644
index 71d0dc8..0000000
--- a/lnet/Makefile.in
+++ /dev/null
@@ -1,9 +0,0 @@
-subdir-m += libcfs
-
-cray-subdirs += portals
-cray-subdirs += knals
-cray-subdirs += router
-cray-subdirs += tests
-@CRAY_PORTALS_FALSE@subdir-m += $(cray-subdirs)
-
-@INCLUDE_RULES@
diff --git a/lnet/Rules.linux b/lnet/Rules.linux
new file mode 100644
index 0000000..232a248
--- /dev/null
+++ b/lnet/Rules.linux
@@ -0,0 +1,29 @@
+# included in Linux kernel directories
+# Rules for module building
+
+if LINUX25
+
+basename=$(shell echo $< | sed -e 's/\.c//g' | sed -e 's/-//g' | sed -e 's/\.o//g' | sed -e 's/^.*\///g')
+AM_CPPFLAGS= -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2  -DKBUILD_MODNAME=$(MODULE) -DKBUILD_BASENAME=$(basename)
+
+$(MODULE).o: $($(MODULE)_OBJECTS) $($(MODULE)_DEPENDENCIES)
+	$(LD) -m $(MOD_LINK) -r -o $(MODULE)_tmp.o $($(MODULE)_OBJECTS)
+	rm -f $(MODULE)_tmp.c
+	$(LINUX)/scripts/modpost $(LINUX)/vmlinux $(MODULE)_tmp.o
+	$(COMPILE) -UKBUILD_BASENAME -DKBUILD_BASENAME=$(MODULE) -c $(MODULE)_tmp.mod.c
+	$(LD) -m $(MOD_LINK) -r -o $(MODULE).o $(MODULE)_tmp.o $(MODULE)_tmp.mod.o
+
+else
+
+$(MODULE).o: $($(MODULE)_OBJECTS)
+	$(LD) -m $(MOD_LINK) -r -o $(MODULE).o $($(MODULE)_OBJECTS)
+
+endif
+
+tags:
+	rm -f $(top_srcdir)/TAGS
+	rm -f $(top_srcdir)/tags
+	find $(top_srcdir)/../portals/ -name '*.[hc]' | xargs etags -a
+	find $(top_srcdir) -name '*.[hc]' | grep -v ".orig" | xargs etags -a
+	find $(top_srcdir)/../portals/ -name '*.[hc]' | xargs ctags -a
+	find $(top_srcdir) -name '*.[hc]' | grep -v ".orig" | xargs ctags -a
diff --git a/lnet/archdep.m4 b/lnet/archdep.m4
index 636ee1d..b203a95 100644
--- a/lnet/archdep.m4
+++ b/lnet/archdep.m4
@@ -1,55 +1,25 @@
-# -------- we can't build modules unless srcdir = builddir
-if test x$enable_modules != xno ; then
-AC_CHECK_FILE([autoMakefile.am],[],
-	[AC_MSG_ERROR([At this time, Lustre does not support building kernel modules with srcdir != buildir.])])
-fi
 
 # -------- in kernel compilation? (2.5 only) -------------
-AC_MSG_CHECKING([if inkernel build support is requested])
-AC_ARG_ENABLE([inkernel],
-	AC_HELP_STRING([--enable-inkernel],
-		       [set up 2.5 kernel makefiles]),
-	[],[enable_inkernel=no])
-AC_MSG_RESULT([$enable_inkernel])
+AC_ARG_ENABLE(inkernel, [  --enable-inkernel set up 2.5 kernel makefiles])
 AM_CONDITIONAL(INKERNEL, test x$enable_inkernel = xyes)
+echo "Makefile for in kernel build: $INKERNEL"
 
 # -------- are we building against an external portals? -------
-AC_MSG_CHECKING([if Cray portals should be used])
-AC_ARG_WITH([cray-portals],
-	AC_HELP_STRING([--with-cray-portals=path],
-		       [path to cray portals]),
-	[
-	        if test "$with_cray_portals" != no; then
-			if test -r $with_cray_portals/include/portals/api.h ; then
-				CRAY_PORTALS_INCLUDE="-I$with_cray_portals/include"
-				AC_DEFINE(CRAY_PORTALS, 1, [Building with Cray Portals])
-			else
-				AC_MSG_ERROR([--with-cray-portals specified badly])
-                        fi
-                fi
-	],[with_cray_portals=no])
-AC_MSG_RESULT([$with_cray_portals])
-
-AM_CONDITIONAL(CRAY_PORTALS, test x$with_cray_portals != xno)
-
-# -------- enable tests and utils? -------
-if test x$enable_tests = xno ; then
-	AC_MSG_NOTICE([disabling tests])
-	enable_tests=no
-fi
-if test x$enable_utils = xno ; then
-	AC_MSG_NOTICE([disabling utilities])
-	enable_utils=no
-fi
+# haha, I wonder how one is really supposed to do this
+# automake seems to have a DEFS variable which looks good
+AC_ARG_WITH(cray-portals, [  --with-cray-portals=[path] path to cray portals],
+	CRAY_PORTALS_INCLUDE="-I$with_cray_portals"
+	CC="$CC -DCRAY_PORTALS=1"
+	)
+AC_SUBST(CRAY_PORTALS_INCLUDE)
+AM_CONDITIONAL(CRAY_PORTALS, test ! "x$with_cray_portals" = x)
+
+# -------- liblustre compilation --------------
+AC_ARG_WITH(lib, [  --with-lib compile lustre library], host_cpu="lib")
 
 # -------- set linuxdir ------------
-AC_MSG_CHECKING([for Linux sources])
-AC_ARG_WITH([linux],
-	AC_HELP_STRING([--with-linux=path],
-		       [set path to Linux source (default=/usr/src/linux)]),
-	[LINUX=$with_linux],
-	[LINUX=/usr/src/linux])
-AC_MSG_RESULT([$LINUX])
+
+AC_ARG_WITH(linux, [  --with-linux=[path] set path to Linux source (default=/usr/src/linux)],LINUX=$with_linux,LINUX=/usr/src/linux)
 AC_SUBST(LINUX)
 if test x$enable_inkernel = xyes ; then
         echo ln -s `pwd` $LINUX/fs/lustre
@@ -57,196 +27,201 @@ if test x$enable_inkernel = xyes ; then
         ln -s `pwd` $LINUX/fs/lustre
 fi
 
-# -------- check for .confg --------
-AC_ARG_WITH([linux-config],
-	[AC_HELP_STRING([--with-linux-config=path],
-			[set path to Linux .conf (default=\$LINUX/.config)])],
-	[LINUX_CONFIG=$with_linux_config],
-	[LINUX_CONFIG=$LINUX/.config])
-AC_SUBST(LINUX_CONFIG)
-
-AC_CHECK_FILE([/boot/kernel.h],
-	[KERNEL_SOURCE_HEADER='/boot/kernel.h'],
-	[AC_CHECK_FILE([/var/adm/running-kernel.h]),
-		[KERNEL_SOURCE_HEADER='/var/adm/running-kernel.h']])
-
-AC_ARG_WITH([kernel-source-header],
-	AC_HELP_STRING([--with-kernel-source-header=path],
-			[Use a different kernel version header.  Consult README.kernel-source for details.]),
-	[KERNEL_SOURCE_HEADER=$with_kernel_source_header])
-
 #  --------------------
-ARCH_UM=
-UML_CFLAGS=
-if test x$enable_modules != xno ; then
-	AC_MSG_CHECKING([if you are running user mode linux for $host_cpu])
-	if test -e $LINUX/include/asm-um ; then
-		if test  X`ls -id $LINUX/include/asm/ | awk '{print $1}'` = X`ls -id $LINUX/include/asm-um | awk '{print $1}'` ; then
-			ARCH_UM='ARCH=um'
-			# see notes in Rules.in
-			UML_CFLAGS='-O0'
-			AC_MSG_RESULT(yes)
-	    	else
-			AC_MSG_RESULT([no (asm doesn't point at asm-um)])
-		fi
-	else
-		AC_MSG_RESULT([no (asm-um missing)])
-	fi
+AC_MSG_CHECKING(if you are running user mode linux for $host_cpu ...)
+if test $host_cpu = "lib" ; then 
+        host_cpu="lib"
+	AC_MSG_RESULT(no building Lustre library)
+else
+  if test -e $LINUX/include/asm-um ; then
+    if test  X`ls -id $LINUX/include/asm/ | awk '{print $1}'` = X`ls -id $LINUX/include/asm-um | awk '{print $1}'` ; then
+	host_cpu="um";
+	AC_MSG_RESULT(yes)
+    else
+	AC_MSG_RESULT(no (asm doesn't point at asm-um))
+    fi
+
+  else 
+        AC_MSG_RESULT(no (asm-um missing))
+  fi
 fi
-AC_SUBST(ARCH_UM)
-AC_SUBST(UML_CFLAGS)
+
 # --------- Linux 25 ------------------
 
-AC_CHECK_FILE([$LINUX/include/linux/namei.h],
-	[
-	        linux25="yes"
-		KMODEXT=".ko"
-	],[
-		KMODEXT=".o"
-        	linux25="no"
-	])
-AC_MSG_CHECKING([if you are using Linux 2.6])
-AC_MSG_RESULT([$linux25])
+AC_MSG_CHECKING(if you are running linux 2.5)
+if test -e $LINUX/include/linux/namei.h ; then
+        linux25="yes"
+        AC_MSG_RESULT(yes)
+else
+        linux25="no"
+        AC_MSG_RESULT(no)
+fi
 AM_CONDITIONAL(LINUX25, test x$linux25 = xyes)
-AC_SUBST(KMODEXT)
+echo "Makefiles for in linux 2.5 build: $LINUX25"
 
 # -------  Makeflags ------------------
 
-CPPFLAGS="$CRAY_PORTALS_INCLUDE $CRAY_PORTALS_COMMANDLINE -I\$(top_srcdir)/include -I\$(top_srcdir)/portals/include"
-
-# liblustre are all the same
-LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1"
-AC_SUBST(LLCPPFLAGS)
-
-LLCFLAGS="-g -Wall -fPIC"
-AC_SUBST(LLCFLAGS)
-
-# everyone builds against portals and lustre
-
-if test x$enable_ldiskfs = xyes ; then
-	AC_DEFINE(CONFIG_LDISKFS_FS_MODULE, 1, [build ldiskfs as a module])
-	AC_DEFINE(CONFIG_LDISKFS_FS_XATTR, 1, [enable extended attributes for ldiskfs])
-	AC_DEFINE(CONFIG_LDISKFS_FS_POSIX_ACL, 1, [enable posix acls])
-	AC_DEFINE(CONFIG_LDISKFS_FS_SECURITY, 1, [enable fs security])
+AC_MSG_CHECKING(setting make flags system architecture: )
+case ${host_cpu} in
+	lib )
+	AC_MSG_RESULT($host_cpu)
+	KCFLAGS='-g -Wall '
+	KCPPFLAGS='-D__arch_lib__ '
+   	libdir='${exec_prefix}/lib/lustre'
+        MOD_LINK=elf_i386
+;;
+	um )
+	AC_MSG_RESULT($host_cpu)
+	KCFLAGS='-g -Wall -pipe -Wno-trigraphs -Wstrict-prototypes -fno-strict-aliasing -fno-common '
+        case ${linux25} in
+                yes )
+                KCPPFLAGS='-D__KERNEL__ -U__i386__ -Ui386 -DUM_FASTCALL -D__arch_um__ -DSUBARCH="i386" -DNESTING=0 -D_LARGEFILE64_SOURCE  -Derrno=kernel_errno -DPATCHLEVEL=4 -DMODULE -I$(LINUX)/arch/um/include -I$(LINUX)/arch/um/kernel/tt/include -I$(LINUX)/arch/um/kernel/skas/include -O2 -nostdinc -iwithprefix include'
+        ;;
+                * )
+                KCPPFLAGS='-D__KERNEL__ -U__i386__ -Ui386 -DUM_FASTCALL -D__arch_um__ -DSUBARCH="i386" -DNESTING=0 -D_LARGEFILE64_SOURCE  -Derrno=kernel_errno -DPATCHLEVEL=4 -DMODULE -I$(LINUX)/arch/um/kernel/tt/include -I$(LINUX)/arch/um/include '
+        ;;
+        esac
+
+        MOD_LINK=elf_i386
+;;
+	i*86 )
+	AC_MSG_RESULT($host_cpu)
+        KCFLAGS='-g -O2 -Wall -Wstrict-prototypes -pipe'
+        case ${linux25} in
+                yes )
+                KCPPFLAGS='-D__KERNEL__ -DMODULE -march=i686 -I$(LINUX)/include/asm-i386/mach-default -nostdinc -iwithprefix include '
+        ;;
+                * )
+                KCPPFLAGS='-D__KERNEL__ -DMODULE '
+        ;;
+        esac
+        MOD_LINK=elf_i386
+;;
+
+	alphaev6 )
+	AC_MSG_RESULT($host_cpu)
+        KCFLAGS='-g -O2  -Wall -Wstrict-prototypes -Wno-trigraphs -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mno-fp-regs -ffixed-8 -mcpu=ev5 -Wa,-mev6'
+        KCPPFLAGS='-D__KERNEL__ -DMODULE '
+        MOD_LINK=elf64alpha
+;;
+
+	alphaev67 )
+	AC_MSG_RESULT($host_cpu)
+        KCFLAGS='-g -O2  -Wall -Wstrict-prototypes -Wno-trigraphs -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mno-fp-regs -ffixed-8 -mcpu=ev5 -Wa,-mev6'
+        KCPPFLAGS='-D__KERNEL__ -DMODULE '
+        MOD_LINK=elf64alpha
+;;
+
+	alpha* )
+	AC_MSG_RESULT($host_cpu)
+        KCFLAGS='-g -O2  -Wall -Wstrict-prototypes -Wno-trigraphs -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mno-fp-regs -ffixed-8 -mcpu=ev5 -Wa,-mev5'
+        KCPPFLAGS='-D__KERNEL__ -DMODULE '
+        MOD_LINK=elf64alpha
+;;
+
+	ia64 )
+	AC_MSG_RESULT($host_cpu)
+        KCFLAGS='-g -O2 -Wall -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -pipe -ffixed-r13 -mfixed-range=f10-f15,f32-f127 -falign-functions=32 -mb-step'
+	KCPPFLAGS='-D__KERNEL__ -DMODULE'
+        MOD_LINK=elf64_ia64
+;;
+
+	x86_64 )
+	AC_MSG_RESULT($host_cpu)
+        KCFLAGS='-g -O2 -Wall -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -fomit-frame-pointer -mno-red-zone -mcmodel=kernel -pipe -fno-reorder-blocks -finline-limit=2000 -fno-strength-reduce -fno-asynchronous-unwind-tables'
+	KCPPFLAGS='-D__KERNEL__ -DMODULE'
+        MOD_LINK=elf_x86_64
+;;
+
+	sparc64 )
+	AC_MSG_RESULT($host_cpu)
+        KCFLAGS='-O2 -Wall -Wstrict-prototypes -Wno-trigraphs -fomit-frame-pointer -fno-strict-aliasing -fno-common -Wno-unused -m64 -pipe -mno-fpu -mcpu=ultrasparc -mcmodel=medlow -ffixed-g4 -fcall-used-g5 -fcall-used-g7 -Wno-sign-compare -Wa,--undeclared-regs'
+        KCPPFLAGS='-D__KERNEL__'
+        MOD_LINK=elf64_sparc
+
+;;
+
+	powerpc )
+	AC_MSG_RESULT($host_cpu)
+        KCFLAGS='-O2 -g -Wall -Wstrict-prototypes -Wno-trigraphs -fomit-frame-pointer -fno-strict-aliasing -fno-common -D__powerpc__ -fsigned-char -msoft-float -pipe -ffixed-r2 -Wno-uninitialized -mmultiple -mstring'
+        KCPPFLAGS='-D__KERNEL__ -DMODULE'
+        MOD_LINK=elf32ppclinux
+;;
+
+        *)
+	AC_ERROR("Unknown Linux Platform: $host_cpu")
+;;
+esac
+
+# ----------- make dep run? ------------------
+
+if test $host_cpu != "lib" ; then 
+  AC_MSG_CHECKING(if make dep has been run in kernel source (host $host_cpu) )
+  if test -f $LINUX/include/linux/config.h ; then
+  AC_MSG_RESULT(yes)
+ else
+  AC_MSG_ERROR(** cannot find $LINUX/include/linux/config.h. Run make dep in $LINUX.)
+  fi
 fi
 
-EXTRA_KCFLAGS="-g $CRAY_PORTALS_INCLUDE $CRAY_PORTALS_COMMANDLINE -I$PWD/portals/include -I$PWD/include"
-
-# these are like AC_TRY_COMPILE, but try to build modules against the
-# kernel, inside the kernel-tests directory
-
-AC_DEFUN([LUSTRE_MODULE_CONFTEST],
-[cat >conftest.c <<_ACEOF
-$1
-_ACEOF
-])
-
-AC_DEFUN([LUSTRE_MODULE_COMPILE_IFELSE],
-[m4_ifvaln([$1], [LUSTRE_MODULE_CONFTEST([$1])])dnl
-rm -f kernel-tests/conftest.o kernel-tests/conftest.mod.c kernel-tests/conftest.ko
-AS_IF([AC_TRY_COMMAND(cp conftest.c kernel-tests && make [$2] -f $PWD/kernel-tests/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX EXTRA_CFLAGS="$EXTRA_KCFLAGS" $ARCH_UM SUBDIRS=$PWD/kernel-tests) >/dev/null && AC_TRY_COMMAND([$3])],
-	[$4],
-	[_AC_MSG_LOG_CONFTEST
-m4_ifvaln([$5],[$5])dnl])dnl
-rm -f kernel-tests/conftest.o kernel-tests/conftest.mod.c kernel-tests/conftest.mod.o kernel-tests/conftest.ko m4_ifval([$1], [kernel-tests/conftest.c conftest.c])[]dnl
-])
-
-AC_DEFUN([LUSTRE_MODULE_TRY_COMPILE],
-[LUSTRE_MODULE_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM([[$1]], [[$2]])],
-	[modules],
-	[test -s kernel-tests/conftest.o],
-	[$3], [$4])])
-
-AC_DEFUN([LUSTRE_MODULE_TRY_MAKE],
-[LUSTRE_MODULE_COMPILE_IFELSE([AC_LANG_PROGRAM([[$1]], [[$2]])], [$3], [$4], [$5], [$6])])
-
 # ------------ include paths ------------------
 
-if test x$enable_modules != xno ; then
-	# ------------ .config exists ----------------
-	AC_CHECK_FILE([$LINUX_CONFIG],[],
-		[AC_MSG_ERROR([Kernel config could not be found.  If you are building from a kernel-source rpm consult README.kernel-source])])
-
-	# ----------- make dep run? ------------------
-	AC_CHECK_FILES([$LINUX/include/linux/autoconf.h
-			$LINUX/include/linux/version.h
-			$LINUX/include/linux/config.h],[],
-		[AC_MSG_ERROR([Run make config in $LINUX.])])
-
-	# ------------ rhconfig.h includes runtime-generated bits --
-	# red hat kernel-source checks
-
-	# we know this exists after the check above.  if the user
-	# tarred up the tree and ran make dep etc. in it, then
-	# version.h gets overwritten with a standard linux one.
-
-	if grep rhconfig $LINUX/include/linux/version.h >/dev/null ; then
-		# This is a clean kernel-source tree, we need to
-		# enable extensive workarounds to get this to build
-		# modules
-		AC_CHECK_FILE([$KERNEL_SOURCE_HEADER],
-			[if test $KERNEL_SOURCE_HEADER = '/boot/kernel.h' ; then
-				AC_MSG_WARN([Using /boot/kernel.h from RUNNING kernel.])
-				AC_MSG_WARN([If this is not what you want, use --with-kernel-source-header.])
-				AC_MSG_WARN([Consult README.kernel-source for details.])
-			fi],
-			[AC_MSG_ERROR([$KERNEL_SOURCE_HEADER not found.  Consult README.kernel-source for details.])])
-		EXTRA_KCFLAGS="-include $KERNEL_SOURCE_HEADER $EXTRA_KCFLAGS"
-	fi
-
-	# --- check that we can build modules at all
-	AC_MSG_CHECKING([that modules can be built])
-	LUSTRE_MODULE_TRY_COMPILE([],[],
-		[
-			AC_MSG_RESULT([yes])
-		],[
-			AC_MSG_RESULT([no])
-			AC_MSG_WARN([Consult config.log for details.])
-			AC_MSG_WARN([If you are trying to build with a kernel-source rpm, consult README.kernel-source])
-			AC_MSG_ERROR([Kernel modules could not be built.])
-		])
-
-	# ------------ LINUXRELEASE and moduledir ------------------
-	AC_MSG_CHECKING([for Linux release])
-	rm -f kernel-tests/conftest.i
-	LINUXRELEASE=
-	if test $linux25 = 'yes' ; then
-		makerule="$PWD/kernel-tests"
-	else
-		makerule="_dir_$PWD/kernel-tests"
-	fi
-	LUSTRE_MODULE_TRY_MAKE(
-		[#include <linux/version.h>],
-		[LINUXRELEASE=UTS_RELEASE],
-		[$makerule LUSTRE_KERNEL_TEST=conftest.i],
-		[test -s kernel-tests/conftest.i],
-		[
-			# LINUXRELEASE="UTS_RELEASE"
-			eval $(grep LINUXRELEASE kernel-tests/conftest.i)
-		],[
-			AC_MSG_RESULT([unknown])
-			AC_MSG_ERROR([Could not preprocess test program.  Consult config.log for details.])
-		])
-	rm -f kernel-tests/conftest.i
-	if test x$LINUXRELEASE = x ; then
-		AC_MSG_RESULT([unknown])
-		AC_MSG_ERROR([Could not determine Linux release version from linux/version.h.])
-	fi
-	AC_MSG_RESULT([$LINUXRELEASE])
-	AC_SUBST(LINUXRELEASE)
-
-	moduledir='$(libdir)/modules/'$LINUXRELEASE/kernel
-	AC_SUBST(moduledir)
-
-	modulefsdir='$(moduledir)/fs/$(PACKAGE)'
-	AC_SUBST(modulefsdir)
-
-	# ------------ RELEASE --------------------------------
-	AC_MSG_CHECKING([for Lustre release])
-  	RELEASE="`echo ${LINUXRELEASE} | tr '-' '_'`_`date +%Y%m%d%H%M`"
-	AC_MSG_RESULT($RELEASE)
-	AC_SUBST(RELEASE)
+KINCFLAGS="$CRAY_PORTALS_INCLUDE $CRAY_PORTALS_COMMANDLINE \
+	-I\$(top_srcdir)/include \
+	-I\$(top_srcdir)/portals/include"
+if test $host_cpu != "lib" ; then 
+    KINCFLAGS="$KINCFLAGS -I$LINUX/include -I$LINUX/include"
+fi
+CPPFLAGS="$KINCFLAGS $ARCHCPPFLAGS"
+
+if test $host_cpu != "lib" ; then 
+# ------------ autoconf.h ------------------
+  AC_MSG_CHECKING(if autoconf.h is in kernel source)
+  if test -f $LINUX/include/linux/autoconf.h ; then
+      AC_MSG_RESULT(yes)
+  else
+      AC_MSG_ERROR(** cannot find $LINUX/include/linux/autoconf.h. Run make config in $LINUX.)
+  fi
+
+# ------------ LINUXRELEASE and moduledir ------------------
+  AC_MSG_CHECKING(for Linux release)
+  
+  dnl We need to rid ourselves of the nasty [ ] quotes.
+  changequote(, )
+  dnl Get release from version.h
+  LINUXRELEASE="`sed -ne 's/.*UTS_RELEASE[ \"]*\([0-9.a-zA-Z_-]*\).*/\1/p' $LINUX/include/linux/version.h`"
+  changequote([, ])
+  
+  moduledir='$(libdir)/modules/'$LINUXRELEASE/kernel
+  AC_SUBST(moduledir)
+  
+  modulefsdir='$(moduledir)/fs/$(PACKAGE)'
+  AC_SUBST(modulefsdir)
+  
+  AC_MSG_RESULT($LINUXRELEASE)
+  AC_SUBST(LINUXRELEASE)
+
+# ------------ RELEASE --------------------------------
+  AC_MSG_CHECKING(lustre release)
+  
+  dnl We need to rid ourselves of the nasty [ ] quotes.
+  changequote(, )
+  dnl Get release from version.h
+  RELEASE="`sed -ne 's/-/_/g' -e 's/.*UTS_RELEASE[ \"]*\([0-9.a-zA-Z_]*\).*/\1/p' $LINUX/include/linux/version.h`_`date +%Y%m%d%H%M`"
+  changequote([, ])
+
+  AC_MSG_RESULT($RELEASE)
+  AC_SUBST(RELEASE)
+
+# ---------- modversions? --------------------
+  AC_MSG_CHECKING(for MODVERSIONS)
+  if egrep -e 'MODVERSIONS.*1' $LINUX/include/linux/autoconf.h >/dev/null 2>&1;
+  then
+	if test $linux25 != "yes"; then
+                MFLAGS="-DMODULE -DMODVERSIONS -include $LINUX/include/linux/modversions.h -DEXPORT_SYMTAB"
+                AC_MSG_RESULT(yes)
+        fi
+  fi
 fi
 
 # ---------- Portals flags --------------------
@@ -259,299 +234,166 @@ fi
 #fi
 #AC_SUBST(usrprefix)
 
-AC_MSG_CHECKING([for zero-copy TCP support])
-AC_ARG_ENABLE([zerocopy],
-	AC_HELP_STRING([--disable-zerocopy],
-		       [disable socknal zerocopy]),
-	[],[enable_zerocopy='yes'])
-if test x$enable_zerocopy = xno ; then
-	AC_MSG_RESULT([no (by request)])
+AC_MSG_CHECKING(if kernel has CPU affinity support)
+SET_CPUS_ALLOW="`grep -c set_cpus_allowed $LINUX/kernel/softirq.c`"
+if test "$SET_CPUS_ALLOW" != 0 ; then
+  enable_affinity_temp="-DCPU_AFFINITY=1"
+  AC_MSG_RESULT(yes)
 else
-	ZCCD="`grep -c zccd $LINUX/include/linux/skbuff.h`"
-	if test "$ZCCD" != 0 ; then
-		AC_DEFINE(SOCKNAL_ZC, 1, [use zero-copy TCP])
-		AC_MSG_RESULT(yes)
-	else
-		AC_MSG_RESULT([no (no kernel support)])
-	fi
+  enable_affinity_temp=""
+  AC_MSG_RESULT(no)
 fi
 
-AC_MSG_CHECKING([for CPU affinity support])
-AC_ARG_ENABLE([affinity],
-	AC_HELP_STRING([--disable-affinity],
-		       [disable process/irq affinity]),
-	[],[enable_affinity='yes'])
-if test x$enable_affinity = xno ; then
-	AC_MSG_RESULT([no (by request)])
+AC_MSG_CHECKING(if kernel has zero-copy TCP support)
+ZCCD="`grep -c zccd $LINUX/include/linux/skbuff.h`"
+if test "$ZCCD" != 0 ; then
+  enable_zerocopy_temp="-DSOCKNAL_ZC=1"
+  AC_MSG_RESULT(yes)
 else
-	SET_CPUS_ALLOW="`grep -c set_cpus_allowed $LINUX/kernel/softirq.c`"
-	if test "$SET_CPUS_ALLOW" != 0 ; then
-		AC_DEFINE(CPU_AFFINITY, 1, [kernel has cpu affinity support])
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no (no kernel support)])
-	fi
+  enable_zerocopy_temp=""
+  AC_MSG_RESULT(no)
 fi
 
+AC_ARG_ENABLE(zerocopy, [  --disable-zerocopy disable socknal zerocopy],enable_zerocopy="", enable_zerocopy=$enable_zerocopy_temp)
 
+AC_ARG_ENABLE(affinity, [  --disable-affinity disable process/irq affinity],enable_affinity="", enable_affinity=$enable_affinity_temp)
 #####################################
 
-AC_MSG_CHECKING([if quadrics kernel headers are present])
+AC_MSG_CHECKING(if quadrics kernel headers are present)
 if test -d $LINUX/drivers/net/qsnet ; then
-	AC_MSG_RESULT([yes])
-	QSWNAL="qswnal"
-	AC_MSG_CHECKING([for multirail EKC])
-	if test -f $LINUX/include/elan/epcomms.h; then
-		AC_MSG_RESULT([supported])
-		QSWCPPFLAGS="-DMULTIRAIL_EKC=1"
-	else
-		AC_MSG_RESULT([not supported])
-		if test -d $LINUX/drivers/net/qsnet/include; then
-			QSWCPPFLAGS="-I$LINUX/drivers/net/qsnet/include"
-		else
-			QSWCPPFLAGS="-I$LINUX/include/linux"
-		fi
-	fi
+  AC_MSG_RESULT(yes)
+  QSWNAL="qswnal"
+  AC_MSG_CHECKING(for multirail EKC)
+  if test -f $LINUX/include/elan/epcomms.h; then
+	AC_MSG_RESULT(supported)
+	with_quadrics="-DMULTIRAIL_EKC=1"
+  else
+	AC_MSG_RESULT(not supported)
+	with_quadrics="-I$LINUX/drivers/net/qsnet/include"
+  fi
+  :
 else
-	AC_MSG_RESULT([no])
-	QSWNAL=""
-	QSWCPPFLAGS=""
+  AC_MSG_RESULT(no)
+  QSWNAL=""
+  with_quadrics=""
+  :
 fi
-AC_SUBST(QSWCPPFLAGS)
+AC_SUBST(with_quadrics)
 AC_SUBST(QSWNAL)
-AM_CONDITIONAL(BUILD_QSWNAL, test x$QSWNAL = "xqswnal")
-
-AC_MSG_CHECKING([if gm support was requested])
-AC_ARG_WITH([gm],
-	AC_HELP_STRING([--with-gm=path],
-		       [build gmnal against path]),
-	[
-		case $with_gm in 
-			yes)
-				AC_MSG_RESULT([yes])
-				GMCPPFLAGS="-I/usr/local/gm/include"
-				GMNAL="gmnal"
-				;;
-			no)
-				AC_MSG_RESULT([no])
-				GMCPPFLAGS=""
-				GMNAL=""
-				;;
-			*)
-				AC_MSG_RESULT([yes])
-				GMCPPFLAGS="-I$with_gm/include -I$with_gm/drivers -I$with_gm/drivers/linux/gm"
-				GMNAL="gmnal"
-				;;
-		esac
-	],[
-		AC_MSG_RESULT([no])
-		GMCPPFLAGS=""
-		GMNAL=""
-	])
-AC_SUBST(GMCPPFLAGS)
+
+# R. Read 5/02
+GMNAL=""
+echo "checking with-gm=" ${with_gm}
+if test "${with_gm+set}" = set; then
+  if test "${with_gm}" = yes; then
+    with_gm="-I/usr/local/gm/include"
+  else
+    with_gm="-I$with_gm/include -I$with_gm/drivers -I$with_gm/drivers/linux/gm"
+  fi
+  GMNAL="gmnal"
+else
+# default case - no GM
+  with_gm=""
+fi
+AC_SUBST(with_gm)
 AC_SUBST(GMNAL)
-AM_CONDITIONAL(BUILD_GMNAL, test x$GMNAL = "xgmnal")
+
 
 #fixme: where are the default IB includes?
 default_ib_include_dir=/usr/local/ib/include
 an_ib_include_file=vapi.h
 
-AC_MSG_CHECKING([if ib nal support was requested])
-AC_ARG_WITH([ib],
-	AC_HELP_STRING([--with-ib=yes/no/path],
-		       [Path to IB includes]),
-	[
-		case $with_ib in
-			yes)
-				AC_MSG_RESULT([yes])
-				IBCPPFLAGS="-I/usr/local/ib/include"
-				IBNAL="ibnal"
-				;;
-			no)
-				AC_MSG_RESULT([no])
-				IBCPPFLAGS=""
-				IBNAL=""
-				;;
-			*)
-				AC_MSG_RESULT([yes])
-				IBCPPFLAGS="-I$with_ib"
-				IBNAL=""
-				;;
-		esac
-	],[
-		AC_MSG_RESULT([no])
-		IBFLAGS=""
-		IBNAL=""
-	])
+AC_ARG_WITH(ib, [  --with-ib=[yes/no/path] Path to IB includes], with_ib=$withval, with_ib=$default_ib)
+AC_MSG_CHECKING(if IB headers are present)
+if test "$with_ib" = yes; then
+    with_ib=$default_ib_include_dir
+fi
+if test "$with_ib" != no -a -f ${with_ib}/${an_ib_include_file}; then
+    AC_MSG_RESULT(yes)
+    IBNAL="ibnal"
+    with_ib="-I${with_ib}"
+else
+    AC_MSG_RESULT(no)
+    IBNAL=""
+    with_ib=""
+fi
 AC_SUBST(IBNAL)
-AC_SUBST(IBCPPFLAGS)
-AM_CONDITIONAL(BUILD_IBNAL, test x$IBNAL = "xibnal")
+AC_SUBST(with_ib)
+
 
+def_scamac=/opt/scali/include
+AC_ARG_WITH(scamac, [  --with-scamac=[yes/no/path] Path to ScaMAC includes (default=/opt/scali/include)], with_scamac=$withval, with_scamac=$def_scamac)
+AC_MSG_CHECKING(if ScaMAC headers are present)
+if test "$with_scamac" = yes; then
+  with_scamac=$def_scamac
+fi
+if test "$with_scamac" != no -a -f ${with_scamac}/scamac.h; then
+  AC_MSG_RESULT(yes)
+  SCIMACNAL="scimacnal"
+  with_scamac="-I${with_scamac} -I${with_scamac}/icm"
+else
+  AC_MSG_RESULT(no)
+  SCIMACNAL=""
+  with_scamac=""
+fi
+
+AC_SUBST(with_scamac)
+AC_SUBST(SCIMACNAL)
+
+CFLAGS="$KCFLAGS"
+CPPFLAGS="$KINCFLAGS $KCPPFLAGS $MFLAGS $enable_zerocopy $enable_affinity $with_quadrics $with_gm $with_scamac $with_ib"
+
+AM_CONDITIONAL(LIBLUSTRE, test x$host_cpu = xlib)
 AC_SUBST(MOD_LINK)
 AC_SUBST(LINUX25)
+AM_CONDITIONAL(LIBLUSTRE, test x$host_cpu = xlib)
 
 # ---------- Red Hat 2.4.18 has iobuf->dovary --------------
 # But other kernels don't
 
 AC_MSG_CHECKING([if struct kiobuf has a dovary field])
-LUSTRE_MODULE_TRY_COMPILE(
-	[
-		#include <linux/iobuf.h>
-	],[
-		struct kiobuf iobuf;
-		iobuf.dovary = 1;
-	],[
-		AC_MSG_RESULT([yes])
-		AC_DEFINE(HAVE_KIOBUF_DOVARY, 1, [struct kiobuf has a dovary field])
-	],[
-		AC_MSG_RESULT([no])
-	])
-
-# ----------- 2.6.4 no longer has page->list ---------------
-AC_MSG_CHECKING([if struct page has a list field])
-LUSTRE_MODULE_TRY_COMPILE(
-	[
-		#include <linux/mm.h>
-	],[
-		struct page page;
-		&page.list;
-	],[
-		AC_MSG_RESULT([yes])
-		AC_DEFINE(HAVE_PAGE_LIST, 1, [struct page has a list field])
-	],[
-		AC_MSG_RESULT([no])
-	])
+AC_TRY_COMPILE([#define __KERNEL__
+		#include <linux/iobuf.h>],
+	       [struct kiobuf iobuf;
+		iobuf.dovary = 1;],
+	       [AC_MSG_RESULT([yes])
+                CPPFLAGS="$CPPFLAGS -DHAVE_KIOBUF_DOVARY"],
+	       [AC_MSG_RESULT([no])])
 
 # ---------- Red Hat 2.4.20 backports some 2.5 bits --------
 # This needs to run after we've defined the KCPPFLAGS
 
-AC_MSG_CHECKING([for kernel version])
-LUSTRE_MODULE_TRY_COMPILE(
-	[
-		#include <linux/sched.h>
-	],[
-		struct task_struct p;
-		p.sighand = NULL;
-	],[
-		AC_DEFINE(CONFIG_RH_2_4_20, 1, [this kernel contains Red Hat 2.4.20 patches])
-		AC_MSG_RESULT([redhat-2.4.20])
-	],[
-		AC_MSG_RESULT([$LINUXRELEASE])
-	])
+AC_MSG_CHECKING(for kernel version)
+AC_TRY_COMPILE([#define __KERNEL__
+             #include <linux/sched.h>],
+            [struct task_struct p;
+             p.sighand = NULL;],
+            [RH_2_4_20=1],
+            [RH_2_4_20=0])
+
+if test $RH_2_4_20 = 1; then
+	AC_MSG_RESULT(redhat-2.4.20)
+	CPPFLAGS="$CPPFLAGS -DCONFIG_RH_2_4_20"
+else
+	AC_MSG_RESULT($LINUXRELEASE)
+fi 
 
 # ---------- Red Hat 2.4.21 backports some more 2.5 bits --------
 
-AC_MSG_CHECKING([if kernel defines PDE])
+AC_MSG_CHECKING(if kernel defines PDE)
 HAVE_PDE="`grep -c 'proc_dir_entry..PDE' $LINUX/include/linux/proc_fs.h`"
 if test "$HAVE_PDE" != 0 ; then
-	AC_DEFINE(HAVE_PDE, 1, [the kernel defines PDE])
-	AC_MSG_RESULT([yes])
+  CPPFLAGS="$CPPFLAGS -DHAVE_PDE"
+  AC_MSG_RESULT(yes)
 else
-	AC_MSG_RESULT([no])
+  AC_MSG_RESULT(no)
 fi
 
-AC_MSG_CHECKING([if kernel passes struct file to direct_IO])
+AC_MSG_CHECKING(if kernel passes struct file to direct_IO)
 HAVE_DIO_FILE="`grep -c 'direct_IO.*struct file' $LINUX/include/linux/fs.h`"
 if test "$HAVE_DIO_FILE" != 0 ; then
-	AC_DEFINE(HAVE_DIO_FILE, 1, [the kernel passes struct file to direct_IO])
-	AC_MSG_RESULT(yes)
+  CPPFLAGS="$CPPFLAGS -DHAVE_DIO_FILE"
+  AC_MSG_RESULT(yes)
 else
-	AC_MSG_RESULT(no)
-fi
-
-if test x$enable_modules != xno ; then
-	# ---------- modules? ------------------------
-	AC_MSG_CHECKING([for module support])
-	LUSTRE_MODULE_TRY_COMPILE(
-		[
-			#include <linux/config.h>
-		],[
-			#ifndef CONFIG_MODULES
-			#error CONFIG_MODULES not #defined
-			#endif
-		],[
-			AC_MSG_RESULT([yes])
-		],[
-			AC_MSG_RESULT([no])
-			AC_MSG_ERROR([module support is required to build Lustre kernel modules.])
-		])
-
-	# ---------- modversions? --------------------
-	AC_MSG_CHECKING([for MODVERSIONS])
-	LUSTRE_MODULE_TRY_COMPILE(
-		[
-			#include <linux/config.h>
-		],[
-			#ifndef CONFIG_MODVERSIONS
-			#error CONFIG_MODVERSIONS not #defined
-			#endif
-		],[
-			AC_MSG_RESULT([yes])
-		],[
-			AC_MSG_RESULT([no])
-		])
-
-	# ------------ preempt -----------------------
-	AC_MSG_CHECKING([if preempt is enabled])
-	LUSTRE_MODULE_TRY_COMPILE(
-		[
-			#include <linux/config.h>
-		],[
-			#ifndef CONFIG_PREEMPT
-			#error CONFIG_PREEMPT is not #defined
-			#endif
-		],[
-			AC_MSG_RESULT([yes])
-			AC_MSG_ERROR([Lustre does not support kernels with preempt enabled.])
-		],[
-			AC_MSG_RESULT([no])
-		])
-
-	if test $BACKINGFS = 'ext3' ; then
-		# --- Check that ext3 and ext3 xattr are enabled in the kernel
-		AC_MSG_CHECKING([that ext3 is enabled in the kernel])
-		LUSTRE_MODULE_TRY_COMPILE(
-			[
-				#include <linux/config.h>
-			],[
-				#ifndef CONFIG_EXT3_FS
-				#ifndef CONFIG_EXT3_FS_MODULE
-				#error CONFIG_EXT3_FS not #defined
-				#endif
-				#endif
-			],[
-				AC_MSG_RESULT([yes])
-			],[
-				AC_MSG_RESULT([no])
-				AC_MSG_ERROR([Lustre requires that ext3 is enabled in the kernel (CONFIG_EXT3_FS)])
-			])
-
-		AC_MSG_CHECKING([that extended attributes for ext3 are enabled in the kernel])
-		LUSTRE_MODULE_TRY_COMPILE(
-			[
-				#include <linux/config.h>
-			],[
-				#ifndef CONFIG_EXT3_FS_XATTR
-				#error CONFIG_EXT3_FS_XATTR not #defined
-				#endif
-			],[
-				AC_MSG_RESULT([yes])
-			],[
-				AC_MSG_RESULT([no])
-				AC_MSG_WARN([Lustre requires that extended attributes for ext3 are enabled in the kernel (CONFIG_EXT3_FS_XATTR.)])
-				AC_MSG_WARN([This build may fail.])
-			])
-	fi # BACKINGFS = ext3
+  AC_MSG_RESULT(no)
 fi
-
-CPPFLAGS="-include \$(top_builddir)/include/config.h $CPPFLAGS"
-EXTRA_KCFLAGS="-include $PWD/include/config.h $EXTRA_KCFLAGS"
-AC_SUBST(EXTRA_KCFLAGS)
-
-#echo "KCPPFLAGS: $KCPPFLAGS"
-#echo "KCFLAGS: $KCFLAGS"
-#echo "LLCPPFLAGS: $LLCPPFLAGS"
-#echo "LLCFLAGS: $LLCFLAGS"
-#echo "MOD_LINK: $MOD_LINK"
-#echo "CFLAGS: $CFLAGS"
-#echo "CPPFLAGS: $CPPFLAGS"
diff --git a/lnet/build.m4 b/lnet/build.m4
index 93a370f..8c55b20 100644
--- a/lnet/build.m4
+++ b/lnet/build.m4
@@ -1,9 +1,5 @@
 # ----------  other tests and settings ---------
 
-AC_CHECK_TYPE([spinlock_t],
-	[AC_DEFINE(HAVE_SPINLOCK_T, 1, [spinlock_t is defined])],
-	[],
-	[#include <linux/spinlock.h>])
 
 # ---------  unsigned long long sane? -------
 
@@ -32,9 +28,6 @@ pkgexampledir='${prefix}/usr/lib/$(PACKAGE)/examples'
 AC_SUBST(pkgexampledir)
 pymoddir='${prefix}/usr/lib/${PACKAGE}/python/Lustre'
 AC_SUBST(pymoddir)
-# for substitution in lconf
-PYMOD_DIR="/usr/lib/$PACKAGE/python"
-AC_SUBST(PYMOD_DIR)
 modulenetdir='$(moduledir)/net/$(PACKAGE)'
 AC_SUBST(modulenetdir)
 
@@ -42,15 +35,14 @@ AC_SUBST(modulenetdir)
 # ----------  BAD gcc? ------------
 AC_PROG_RANLIB
 AC_PROG_CC
-AC_MSG_CHECKING([for buggy compiler])
+AC_MSG_CHECKING(for buggy compiler)
 CC_VERSION=`$CC -v 2>&1 | grep "^gcc version"`
 bad_cc() {
-	AC_MSG_RESULT([buggy compiler found!])
 	echo
 	echo "   '$CC_VERSION'"
 	echo "  has been known to generate bad code, "
 	echo "  please get an updated compiler."
-	AC_MSG_ERROR([sorry])
+	AC_MSG_ERROR(sorry)
 }
 TMP_VERSION=`echo $CC_VERSION | cut -c 1-16`
 if test "$TMP_VERSION" = "gcc version 2.95"; then
@@ -69,7 +61,7 @@ case "$CC_VERSION" in
 		bad_cc
 		;;
 	*)
-		AC_MSG_RESULT([no known problems])
+		AC_MSG_RESULT(no known problems)
 		;;
 esac
 # end ------  BAD gcc? ------------
@@ -78,30 +70,29 @@ esac
 
 # this doesn't seem to work on older autoconf
 # AC_CHECK_LIB(readline, readline,,)
-AC_MSG_CHECKING([for readline support])
-AC_ARG_ENABLE(readline,
-	AC_HELP_STRING([--disable-readline],
-			[do not use readline library]),
-	[],[enable_readline='yes'])
-AC_MSG_RESULT([$enable_readline]) 
-if test x$enable_readline = xyes ; then
-	LIBREADLINE="-lreadline -lncurses"
-	AC_DEFINE(HAVE_LIBREADLINE, 1, [readline library is available])
+AC_ARG_ENABLE(readline,	[  --enable-readline  use readline library],,
+			enable_readline="yes")
+ 
+if test "$enable_readline" = "yes" ; then
+   LIBREADLINE="-lreadline -lncurses"
+   HAVE_LIBREADLINE="-DHAVE_LIBREADLINE=1"
 else 
-	LIBREADLINE=""
+   LIBREADLINE=""
+   HAVE_LIBREADLINE=""
 fi
 AC_SUBST(LIBREADLINE)
+AC_SUBST(HAVE_LIBREADLINE)
 
-AC_MSG_CHECKING([if efence debugging support is requested])
-AC_ARG_ENABLE(efence,
-	AC_HELP_STRING([--enable-efence],
-			[use efence library]),
-	[],[enable_efence='no'])
-AC_MSG_RESULT([$enable_efence])
+AC_ARG_ENABLE(efence,  [  --enable-efence  use efence library],,
+			enable_efence="no")
+ 
 if test "$enable_efence" = "yes" ; then
-	LIBEFENCE="-lefence"
-	AC_DEFINE(HAVE_LIBEFENCE, 1, [libefence support is requested])
+   LIBEFENCE="-lefence"
+   HAVE_LIBEFENCE="-DHAVE_LIBEFENCE=1"
 else 
-	LIBEFENCE=""
+   LIBEFENCE=""
+   HAVE_LIBEFENCE=""
 fi
 AC_SUBST(LIBEFENCE)
+AC_SUBST(HAVE_LIBEFENCE)
+
diff --git a/lustre/portals/knals/autoMakefile.am b/lnet/include/Makefile.am
similarity index 66%
rename from lustre/portals/knals/autoMakefile.am
rename to lnet/include/Makefile.am
index 9d04a46..2cf7f99 100644
--- a/lustre/portals/knals/autoMakefile.am
+++ b/lnet/include/Makefile.am
@@ -3,4 +3,6 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
-SUBDIRS = gmnal ibnal qswnal socknal
+SUBDIRS = portals linux
+EXTRA_DIST = config.h.in
+include $(top_srcdir)/Rules
diff --git a/lnet/include/linux/Makefile.am b/lnet/include/linux/Makefile.am
new file mode 100644
index 0000000..6a65cb5
--- /dev/null
+++ b/lnet/include/linux/Makefile.am
@@ -0,0 +1,10 @@
+# Copyright (C) 2001  Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+include $(top_srcdir)/Rules
+
+linuxincludedir = $(includedir)/linux
+
+linuxinclude_HEADERS=kp30.h portals_lib.h
diff --git a/lnet/include/linux/kp30.h b/lnet/include/linux/kp30.h
index c55dd37..9e7e7c2 100644
--- a/lnet/include/linux/kp30.h
+++ b/lnet/include/linux/kp30.h
@@ -8,7 +8,7 @@
 #define PORTAL_DEBUG
 
 #ifndef offsetof
-# define offsetof(typ,memb)     ((unsigned long)((char *)&(((typ *)0)->memb)))
+# define offsetof(typ,memb)     ((int)((char *)&(((typ *)0)->memb)))
 #endif
 
 #define LOWEST_BIT_SET(x)       ((x) & ~((x) - 1))
@@ -301,7 +301,6 @@ extern void kportal_blockallsigs (void);
 #endif
 # include <unistd.h>
 # include <time.h>
-# include <limits.h>
 # include <asm/types.h>
 # ifndef DEBUG_SUBSYSTEM
 #  define DEBUG_SUBSYSTEM S_UNDEFINED
@@ -310,12 +309,7 @@ extern void kportal_blockallsigs (void);
 #  undef NDEBUG
 #  include <assert.h>
 #  define LASSERT(e)     assert(e)
-#  define LASSERTF(cond, args...)                                              \
-do {                                                                           \
-          if (!(cond))                                                         \
-                CERROR(args);                                                  \
-          assert(cond);                                                        \
-} while (0)
+#  define LASSERTF(cond, args...)     assert(cond)
 # else
 #  define LASSERT(e)
 #  define LASSERTF(cond, args...) do { } while (0)
@@ -323,7 +317,6 @@ do {                                                                           \
 # define printk(format, args...) printf (format, ## args)
 # define PORTAL_ALLOC(ptr, size) do { (ptr) = malloc(size); } while (0);
 # define PORTAL_FREE(a, b) do { free(a); } while (0);
-void portals_debug_dumplog(void);
 # define portals_debug_msg(subsys, mask, file, fn, line, stack, format, a...) \
     printf("%02x:%06x (@%lu %s:%s,l. %d %d %lu): " format,                    \
            (subsys), (mask), (long)time(0), file, fn, line,                   \
@@ -440,6 +433,40 @@ struct portals_device_userstate
  * USER LEVEL STUFF BELOW
  */
 
+#define PORTALS_CFG_VERSION 0x00010001;
+
+struct portals_cfg {
+        __u32 pcfg_version;
+        __u32 pcfg_command;
+
+        __u32 pcfg_nal;
+        __u32 pcfg_flags;
+
+        __u32 pcfg_gw_nal;
+        __u64 pcfg_nid;
+        __u64 pcfg_nid2;
+        __u64 pcfg_nid3;
+        __u32 pcfg_id;
+        __u32 pcfg_misc;
+        __u32 pcfg_fd;
+        __u32 pcfg_count;
+        __u32 pcfg_size;
+        __u32 pcfg_wait;
+
+        __u32 pcfg_plen1; /* buffers in userspace */
+        char *pcfg_pbuf1;
+        __u32 pcfg_plen2; /* buffers in userspace */
+        char *pcfg_pbuf2;
+};
+
+#define PCFG_INIT(pcfg, cmd)                            \
+do {                                                    \
+        memset(&pcfg, 0, sizeof(pcfg));                 \
+        pcfg.pcfg_version = PORTALS_CFG_VERSION;        \
+        pcfg.pcfg_command = (cmd);                      \
+                                                        \
+} while (0)
+
 #define PORTAL_IOCTL_VERSION 0x00010007
 #define PING_SYNC       0
 #define PING_ASYNC      1
@@ -645,13 +672,21 @@ enum {
         GMNAL     = 3,
         /*          4 unused */
         TCPNAL    = 5,
-        ROUTER    = 6,
-        IBNAL     = 7,
-        CRAY_KB_ERNAL = 8,
+        SCIMACNAL = 6,
+        ROUTER    = 7,
+        IBNAL     = 8,
         NAL_ENUM_END_MARKER
 };
 
-#define PTL_NALFMT_SIZE               26 /* %u:%u.%u.%u.%u (10+4+4+4+3+1) */
+#ifdef __KERNEL__
+extern ptl_handle_ni_t  kqswnal_ni;
+extern ptl_handle_ni_t  ksocknal_ni;
+extern ptl_handle_ni_t  kgmnal_ni;
+extern ptl_handle_ni_t  kibnal_ni;
+extern ptl_handle_ni_t  kscimacnal_ni;
+#endif
+
+#define PTL_NALFMT_SIZE         16
 
 #define NAL_MAX_NR (NAL_ENUM_END_MARKER - 1)
 
@@ -676,6 +711,10 @@ enum {
         DEBUG_DAEMON_CONTINUE    =  4,
 };
 
+/* module.c */
+typedef int (*nal_cmd_handler_t)(struct portals_cfg *, void * private);
+int kportal_nal_register(int nal, nal_cmd_handler_t handler, void * private);
+int kportal_nal_unregister(int nal);
 
 enum cfg_record_type {
         PORTALS_CFG_TYPE = 1,
@@ -683,6 +722,10 @@ enum cfg_record_type {
 };
 
 typedef int (*cfg_record_cb_t)(enum cfg_record_type, int len, void *data);
+int kportal_nal_cmd(struct portals_cfg *);
+
+ptl_handle_ni_t *kportal_get_ni (int nal);
+void kportal_put_ni (int nal);
 
 #ifdef __CYGWIN__
 # ifndef BITS_PER_LONG
@@ -694,16 +737,6 @@ typedef int (*cfg_record_cb_t)(enum cfg_record_type, int len, void *data);
 # endif
 #endif
 
-#if BITS_PER_LONG > 32
-# define LI_POISON ((int)0x5a5a5a5a5a5a5a5a)
-# define LL_POISON ((long)0x5a5a5a5a5a5a5a5a)
-# define LP_POISON ((void *)(long)0x5a5a5a5a5a5a5a5a)
-#else
-# define LI_POISON ((int)0x5a5a5a5a)
-# define LL_POISON ((long)0x5a5a5a5a)
-# define LP_POISON ((void *)(long)0x5a5a5a5a)
-#endif
-
 #if defined(__x86_64__)
 # define LPU64 "%Lu"
 # define LPD64 "%Ld"
diff --git a/lnet/include/linux/kpr.h b/lnet/include/linux/kpr.h
index 51d2d2f..45b58fe 100644
--- a/lnet/include/linux/kpr.h
+++ b/lnet/include/linux/kpr.h
@@ -81,6 +81,21 @@ typedef struct {
         void                    *kpr_arg;
 } kpr_router_t;
 
+/* Router's control interface (Kernel Portals Routing Control Interface) */
+typedef const struct {
+        int     (*kprci_add_route)(int gateway_nal, ptl_nid_t gateway_nid,
+                                   ptl_nid_t lo_nid, ptl_nid_t hi_nid);
+        int     (*kprci_del_route)(int gateway_nal, ptl_nid_t gateway_nid,
+                                   ptl_nid_t lo_nid, ptl_nid_t hi_nid);
+        int     (*kprci_get_route)(int index, int *gateway_nal,
+                                   ptl_nid_t *gateway,
+                                   ptl_nid_t *lo_nid, ptl_nid_t *hi_nid,
+                                   int *alive);
+        int     (*kprci_notify)(int gateway_nal, ptl_nid_t gateway_nid,
+                                int alive, time_t when);
+} kpr_control_interface_t;
+
+extern kpr_control_interface_t  kpr_control_interface;
 extern kpr_router_interface_t   kpr_router_interface;
 
 static inline int
diff --git a/lnet/include/linux/libcfs.h b/lnet/include/linux/libcfs.h
index 1d27768..3ebf935 100644
--- a/lnet/include/linux/libcfs.h
+++ b/lnet/include/linux/libcfs.h
@@ -6,43 +6,8 @@
 
 #define PORTAL_DEBUG
 
-/* I think this beast is just trying to get cycles_t and get_cycles().
- * this should be in its own header. */
-#ifdef __linux__
-# include <asm/types.h>
-# if defined(__powerpc__) && !defined(__KERNEL__)
-#  define __KERNEL__
-#  include <asm/timex.h>
-#  undef __KERNEL__
-# else
-#  if defined(__KERNEL__)
-#   include <asm/timex.h>
-#  else
-#   include <sys/time.h>
-#   define cycles_t unsigned long
-static inline cycles_t get_cycles(void) 
-{
-        struct timeval tv;
-        gettimeofday(&tv, NULL);
-        return (tv.tv_sec * 100000) + tv.tv_usec;
-}
-#  endif
-# endif
-#else
-# include <sys/types.h>
-typedef u_int32_t __u32;
-typedef u_int64_t __u64;
-#endif
-
-#ifdef __KERNEL__
-# include <linux/time.h>
-#else
-# include <sys/time.h>
-# define do_gettimeofday(tv) gettimeofday(tv, NULL);
-#endif
-
 #ifndef offsetof
-# define offsetof(typ,memb)     ((unsigned long)((char *)&(((typ *)0)->memb)))
+# define offsetof(typ,memb)     ((int)((char *)&(((typ *)0)->memb)))
 #endif
 
 #define LOWEST_BIT_SET(x)       ((x) & ~((x) - 1))
@@ -79,7 +44,7 @@ extern unsigned int portal_cerror;
 #define S_PTLROUTER   0x00100000
 #define S_COBD        0x00200000
 #define S_IBNAL       0x00400000
-#define S_SM          0x00800000
+#define S_LMV         0x00800000
 
 /* If you change these values, please keep portals/utils/debug.c
  * up to date! */
@@ -200,45 +165,6 @@ do {                                                                    \
 #define EXIT                            do { } while (0)
 #endif
 
-#define PORTALS_CFG_VERSION 0x00010001;
-
-struct portals_cfg {
-        __u32 pcfg_version;
-        __u32 pcfg_command;
-
-        __u32 pcfg_nal;
-        __u32 pcfg_flags;
-
-        __u32 pcfg_gw_nal;
-        __u64 pcfg_nid;
-        __u64 pcfg_nid2;
-        __u64 pcfg_nid3;
-        __u32 pcfg_id;
-        __u32 pcfg_misc;
-        __u32 pcfg_fd;
-        __u32 pcfg_count;
-        __u32 pcfg_size;
-        __u32 pcfg_wait;
-
-        __u32 pcfg_plen1; /* buffers in userspace */
-        char *pcfg_pbuf1;
-        __u32 pcfg_plen2; /* buffers in userspace */
-        char *pcfg_pbuf2;
-};
-
-#define PCFG_INIT(pcfg, cmd)                            \
-do {                                                    \
-        memset(&pcfg, 0, sizeof(pcfg));                 \
-        pcfg.pcfg_version = PORTALS_CFG_VERSION;        \
-        pcfg.pcfg_command = (cmd);                      \
-                                                        \
-} while (0)
-
-typedef int (nal_cmd_handler_fn)(struct portals_cfg *, void *);
-int libcfs_nal_cmd_register(int nal, nal_cmd_handler_fn *handler, void *arg);
-int libcfs_nal_cmd(struct portals_cfg *pcfg);
-void libcfs_nal_cmd_unregister(int nal);
-
 struct portal_ioctl_data {
         __u32 ioc_len;
         __u32 ioc_version;
@@ -271,7 +197,6 @@ struct portal_ioctl_data {
         char ioc_bulk[0];
 };
 
-
 #ifdef __KERNEL__
 
 #include <linux/list.h>
diff --git a/lnet/include/linux/portals_compat25.h b/lnet/include/linux/portals_compat25.h
index 9ab4020..43618589 100644
--- a/lnet/include/linux/portals_compat25.h
+++ b/lnet/include/linux/portals_compat25.h
@@ -40,9 +40,6 @@
 # define RECALC_SIGPENDING         recalc_sigpending()
 # define CURRENT_SECONDS           CURRENT_TIME
 
-# define kernel_text_address(addr) is_kernel_text_address(addr)
-extern int is_kernel_text_address(unsigned long addr);
-
 #else /* 2.4.x */
 
 # define SIGNAL_MASK_LOCK(task, flags)                                  \
@@ -54,30 +51,17 @@ extern int is_kernel_text_address(unsigned long addr);
 # define RECALC_SIGPENDING         recalc_sigpending(current)
 # define CURRENT_SECONDS           CURRENT_TIME
 
-# define kernel_text_address(addr) is_kernel_text_address(addr)
-extern int is_kernel_text_address(unsigned long addr);
-
 #endif
 
 #if defined(__arch_um__) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,20))
-# define THREAD_NAME(comm, len, fmt, a...)                              \
-        snprintf(comm, len, fmt "|%d", ## a, current->thread.extern_pid)
+# define THREAD_NAME(comm, fmt, a...)                                   \
+        sprintf(comm, fmt "|%d", ## a, current->thread.extern_pid)
 #elif defined(__arch_um__) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-# define THREAD_NAME(comm, len, fmt, a...)                              \
-        snprintf(comm, len,fmt"|%d", ## a,current->thread.mode.tt.extern_pid)
-#else
-# define THREAD_NAME(comm, len, fmt, a...)                              \
-        snprintf(comm, len, fmt, ## a)
-#endif
-
-#ifdef HAVE_PAGE_LIST
-/* 2.4 alloc_page users can use page->list */
-#define PAGE_LIST_ENTRY list
-#define PAGE_LIST(page) ((page)->list)
+# define THREAD_NAME(comm, fmt, a...)                                   \
+        sprintf(comm, fmt "|%d", ## a, current->thread.mode.tt.extern_pid)
 #else
-/* 2.6 alloc_page users can use page->lru */
-#define PAGE_LIST_ENTRY lru
-#define PAGE_LIST(page) ((page)->lru)
+# define THREAD_NAME(comm, fmt, a...)                                   \
+        sprintf(comm, fmt, ## a)
 #endif
 
 #endif /* _PORTALS_COMPAT_H */
diff --git a/lnet/include/lnet/Makefile.am b/lnet/include/lnet/Makefile.am
new file mode 100644
index 0000000..c61b084
--- /dev/null
+++ b/lnet/include/lnet/Makefile.am
@@ -0,0 +1,10 @@
+# Copyright (C) 2001  Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+SUBDIRS = base
+include $(top_srcdir)/Rules
+
+pkginclude_HEADERS=api-support.h api.h arg-blocks.h defines.h errno.h internal.h lib-dispatch.h lib-nal.h lib-p30.h lib-types.h myrnal.h nal.h p30.h ppid.h ptlctl.h stringtab.h types.h nalids.h list.h bridge.h ipmap.h procbridge.h lltrace.h
+
diff --git a/lnet/include/lnet/api-support.h b/lnet/include/lnet/api-support.h
index cfae78c..db83ae7 100644
--- a/lnet/include/lnet/api-support.h
+++ b/lnet/include/lnet/api-support.h
@@ -1,3 +1,5 @@
+# define DEBUG_SUBSYSTEM S_PORTALS
+# define PORTAL_DEBUG
 
 #include "build_check.h"
 
diff --git a/lnet/include/lnet/api.h b/lnet/include/lnet/api.h
index 6d382bb..69fa339 100644
--- a/lnet/include/lnet/api.h
+++ b/lnet/include/lnet/api.h
@@ -9,9 +9,9 @@
 int PtlInit(int *);
 void PtlFini(void);
 
-int PtlNIInit(ptl_interface_t interface, ptl_pid_t requested_pid,
-	      ptl_ni_limits_t *desired_limits, ptl_ni_limits_t *actual_limits,
-              ptl_handle_ni_t *interface_out);
+int PtlNIInit(ptl_interface_t interface, ptl_pt_index_t ptl_size_in,
+              ptl_ac_index_t acl_size_in, ptl_pid_t requested_pid,
+              ptl_handle_ni_t * interface_out);
 
 int PtlNIInitialized(ptl_interface_t);
 
@@ -37,6 +37,17 @@ int PtlNIHandle(ptl_handle_any_t handle_in, ptl_handle_ni_t * interface_out);
 #endif
 
 
+/*
+ * PtlNIDebug: 
+ *
+ * This is not an official Portals 3 API call.  It is provided
+ * by the reference implementation to allow the maintainers an
+ * easy way to turn on and off debugging information in the
+ * library.  Do not use it in code that is not intended for use
+ * with any version other than the portable reference library.
+ */
+unsigned int PtlNIDebug(ptl_handle_ni_t ni, unsigned int mask_in);
+
 /* 
  * PtlNIFailNid
  *
@@ -112,8 +123,8 @@ int PtlMDUpdate_internal(ptl_handle_md_t md_in, ptl_md_t * old_inout,
 
 /* These should be called by users */
 int PtlEQAlloc(ptl_handle_ni_t ni_in, ptl_size_t count_in,
-               ptl_eq_handler_t handler,
-               ptl_handle_eq_t *handle_out);
+               int (*callback) (ptl_event_t * event),
+               ptl_handle_eq_t * handle_out);
 int PtlEQFree(ptl_handle_eq_t eventq_in);
 
 int PtlEQCount(ptl_handle_eq_t eventq_in, ptl_size_t * count_out);
diff --git a/lnet/include/lnet/arg-blocks.h b/lnet/include/lnet/arg-blocks.h
index 21e30d5..0be8a3d 100644
--- a/lnet/include/lnet/arg-blocks.h
+++ b/lnet/include/lnet/arg-blocks.h
@@ -18,7 +18,7 @@
 #define PTL_GETID     1
 #define PTL_NISTATUS  2
 #define PTL_NIDIST    3
-// #define PTL_NIDEBUG   4
+#define PTL_NIDEBUG   4
 #define PTL_MEATTACH  5
 #define PTL_MEINSERT  6
 // #define PTL_MEPREPEND 7
@@ -205,7 +205,7 @@ typedef struct PtlEQAlloc_in {
         ptl_size_t count_in;
         void *base_in;
         int len_in;
-        ptl_eq_handler_t callback_in;
+        int (*callback_in) (ptl_event_t * event);
 } PtlEQAlloc_in;
 
 typedef struct PtlEQAlloc_out {
diff --git a/lnet/include/lnet/errno.h b/lnet/include/lnet/errno.h
index a98bfd9..499f32b 100644
--- a/lnet/include/lnet/errno.h
+++ b/lnet/include/lnet/errno.h
@@ -37,11 +37,12 @@ typedef enum {
         PTL_MD_NO_UPDATE	= 18,
         PTL_FAIL		= 19,
 
-        PTL_IOV_INVALID 	= 20,
+        PTL_IOV_TOO_MANY	= 20,
+        PTL_IOV_TOO_SMALL	= 21,
 
-	PTL_EQ_IN_USE		= 21,
+	PTL_EQ_IN_USE		= 22,
 
-        PTL_MAX_ERRNO		= 22
+        PTL_MAX_ERRNO		= 23
 } ptl_err_t;
 /* If you change these, you must update the string table in api-errno.c */
 
diff --git a/lnet/include/lnet/internal.h b/lnet/include/lnet/internal.h
index 25778e4..94f4f48 100644
--- a/lnet/include/lnet/internal.h
+++ b/lnet/include/lnet/internal.h
@@ -11,10 +11,25 @@
 
 #include <portals/p30.h>
 
-extern int ptl_init;		/* Has the library been initialized */
+extern int ptl_init;		/* Has the library be initialized */
 
 extern int ptl_ni_init(void);
+extern int ptl_me_init(void);
+extern int ptl_md_init(void);
+extern int ptl_eq_init(void);
+
+extern int ptl_me_ni_init(nal_t * nal);
+extern int ptl_md_ni_init(nal_t * nal);
+extern int ptl_eq_ni_init(nal_t * nal);
+
 extern void ptl_ni_fini(void);
+extern void ptl_me_fini(void);
+extern void ptl_md_fini(void);
+extern void ptl_eq_fini(void);
+
+extern void ptl_me_ni_fini(nal_t * nal);
+extern void ptl_md_ni_fini(nal_t * nal);
+extern void ptl_eq_ni_fini(nal_t * nal);
 
 static inline ptl_eq_t *
 ptl_handle2usereq (ptl_handle_eq_t *handle)
diff --git a/lnet/include/lnet/lib-dispatch.h b/lnet/include/lnet/lib-dispatch.h
index 610c776..90ed4f5 100644
--- a/lnet/include/lnet/lib-dispatch.h
+++ b/lnet/include/lnet/lib-dispatch.h
@@ -18,6 +18,7 @@
 extern int do_PtlGetId(nal_cb_t * nal, void *private, void *args, void *ret);
 extern int do_PtlNIStatus(nal_cb_t * nal, void *private, void *args, void *ret);
 extern int do_PtlNIDist(nal_cb_t * nal, void *private, void *args, void *ret);
+extern int do_PtlNIDebug(nal_cb_t * nal, void *private, void *args, void *ret);
 extern int do_PtlMEAttach(nal_cb_t * nal, void *private, void *args, void *ret);
 extern int do_PtlMEInsert(nal_cb_t * nal, void *private, void *args, void *ret);
 extern int do_PtlMEPrepend(nal_cb_t * nal, void *private, void *args,
diff --git a/lnet/include/lnet/lib-lnet.h b/lnet/include/lnet/lib-lnet.h
index efa929c..350447e 100644
--- a/lnet/include/lnet/lib-lnet.h
+++ b/lnet/include/lnet/lib-lnet.h
@@ -194,11 +194,11 @@ lib_md_alloc (nal_cb_t *nal, ptl_md_t *umd)
         int       niov;
 
         if ((umd->options & PTL_MD_KIOV) != 0) {
-                niov = umd->length;
+                niov = umd->niov;
                 size = offsetof(lib_md_t, md_iov.kiov[niov]);
         } else {
                 niov = ((umd->options & PTL_MD_IOVEC) != 0) ?
-                       umd->length : 1;
+                       umd->niov : 1;
                 size = offsetof(lib_md_t, md_iov.iov[niov]);
         }
 
@@ -346,9 +346,8 @@ ptl_handle2me (ptl_handle_me_t *handle, nal_cb_t *nal)
         return (lh_entry (lh, lib_me_t, me_lh));
 }
 
-extern int lib_init(nal_cb_t *cb, ptl_process_id_t pid,
-                    ptl_ni_limits_t *desired_limits, 
-                    ptl_ni_limits_t *actual_limits);
+extern int lib_init(nal_cb_t * cb, ptl_nid_t nid, ptl_pid_t pid, int gsize,
+                    ptl_pt_index_t tbl_size, ptl_ac_index_t ac_size);
 extern int lib_fini(nal_cb_t * cb);
 extern void lib_dispatch(nal_cb_t * cb, void *private, int index,
                          void *arg_block, void *ret_block);
diff --git a/lnet/include/lnet/lib-p30.h b/lnet/include/lnet/lib-p30.h
index efa929c..350447e 100644
--- a/lnet/include/lnet/lib-p30.h
+++ b/lnet/include/lnet/lib-p30.h
@@ -194,11 +194,11 @@ lib_md_alloc (nal_cb_t *nal, ptl_md_t *umd)
         int       niov;
 
         if ((umd->options & PTL_MD_KIOV) != 0) {
-                niov = umd->length;
+                niov = umd->niov;
                 size = offsetof(lib_md_t, md_iov.kiov[niov]);
         } else {
                 niov = ((umd->options & PTL_MD_IOVEC) != 0) ?
-                       umd->length : 1;
+                       umd->niov : 1;
                 size = offsetof(lib_md_t, md_iov.iov[niov]);
         }
 
@@ -346,9 +346,8 @@ ptl_handle2me (ptl_handle_me_t *handle, nal_cb_t *nal)
         return (lh_entry (lh, lib_me_t, me_lh));
 }
 
-extern int lib_init(nal_cb_t *cb, ptl_process_id_t pid,
-                    ptl_ni_limits_t *desired_limits, 
-                    ptl_ni_limits_t *actual_limits);
+extern int lib_init(nal_cb_t * cb, ptl_nid_t nid, ptl_pid_t pid, int gsize,
+                    ptl_pt_index_t tbl_size, ptl_ac_index_t ac_size);
 extern int lib_fini(nal_cb_t * cb);
 extern void lib_dispatch(nal_cb_t * cb, void *private, int index,
                          void *arg_block, void *ret_block);
diff --git a/lnet/include/lnet/lib-types.h b/lnet/include/lnet/lib-types.h
index ef618c7..40776a6 100644
--- a/lnet/include/lnet/lib-types.h
+++ b/lnet/include/lnet/lib-types.h
@@ -169,7 +169,7 @@ struct lib_eq_t {
         ptl_size_t        size;
         ptl_event_t      *base;
         int               eq_refcount;
-        ptl_eq_handler_t  event_callback;
+        int (*event_callback) (ptl_event_t * event);
         void             *eq_addrkey;
 };
 
@@ -245,11 +245,15 @@ typedef struct {
  * extracted by masking with (PTL_COOKIE_TYPES - 1) */
 
 typedef struct {
+        int up;
+        int refcnt;
         ptl_nid_t nid;
         ptl_pid_t pid;
+        int num_nodes;
+        unsigned int debug;
         lib_ptl_t tbl;
+        lib_ac_t ac;
         lib_counters_t counters;
-        ptl_ni_limits_t actual_limits;
 
         int               ni_lh_hash_size;      /* size of lib handle hash table */
         struct list_head *ni_lh_hash_table;     /* all extant lib handles, this interface */
diff --git a/lnet/include/lnet/lnet.h b/lnet/include/lnet/lnet.h
index 4b8631d..577ffab 100644
--- a/lnet/include/lnet/lnet.h
+++ b/lnet/include/lnet/lnet.h
@@ -21,6 +21,45 @@
 #endif
 
 #include <portals/types.h>
+#include <portals/nal.h>
 #include <portals/api.h>
+#include <portals/nalids.h>
+
+/*
+ * Debugging flags reserved for the Portals reference library.
+ * These are not part of the API as described in the SAND report
+ * but are for the use of the maintainers of the reference implementation.
+ *
+ * It is not expected that the real implementations will export
+ * this functionality.
+ */
+#define PTL_DEBUG_NONE          0ul
+#define PTL_DEBUG_ALL           (0x0FFFul)	/* Only the Portals flags */
+
+#define __bit(x)                ((unsigned long) 1<<(x))
+#define PTL_DEBUG_PUT           __bit(0)
+#define PTL_DEBUG_GET           __bit(1)
+#define PTL_DEBUG_REPLY         __bit(2)
+#define PTL_DEBUG_ACK           __bit(3)
+#define PTL_DEBUG_DROP          __bit(4)
+#define PTL_DEBUG_REQUEST       __bit(5)
+#define PTL_DEBUG_DELIVERY      __bit(6)
+#define PTL_DEBUG_UNLINK        __bit(7)
+#define PTL_DEBUG_THRESHOLD     __bit(8)
+#define PTL_DEBUG_API           __bit(9)
+
+/*
+ * These eight are reserved for the NAL to define
+ * It should probably give them better names...
+ */
+#define PTL_DEBUG_NI_ALL        (0xF000ul)	/* Only the NAL flags */
+#define PTL_DEBUG_NI0           __bit(24)
+#define PTL_DEBUG_NI1           __bit(25)
+#define PTL_DEBUG_NI2           __bit(26)
+#define PTL_DEBUG_NI3           __bit(27)
+#define PTL_DEBUG_NI4           __bit(28)
+#define PTL_DEBUG_NI5           __bit(29)
+#define PTL_DEBUG_NI6           __bit(30)
+#define PTL_DEBUG_NI7           __bit(31)
 
 #endif
diff --git a/lnet/include/lnet/lnetctl.h b/lnet/include/lnet/lnetctl.h
index 2af336e..12ef47a 100644
--- a/lnet/include/lnet/lnetctl.h
+++ b/lnet/include/lnet/lnetctl.h
@@ -23,10 +23,6 @@
 #ifndef _PTLCTL_H_
 #define _PTLCTL_H_
 
-#include <portals/types.h>
-#include <linux/kp30.h>
-#include <linux/libcfs.h>
-
 #define PORTALS_DEV_ID 0
 #define PORTALS_DEV_PATH "/dev/portals"
 #define OBD_DEV_ID 1
@@ -80,15 +76,13 @@ int jt_dbg_panic(int argc, char **argv);
 int ptl_set_cfg_record_cb(cfg_record_cb_t cb);
 
 /* l_ioctl.c */
-typedef int (ioc_handler_t)(int dev_id, unsigned int opc, void *buf);
+typedef int (ioc_handler_t)(int dev_id, int opc, void *buf);
 void set_ioc_handler(ioc_handler_t *handler);
 int register_ioc_dev(int dev_id, const char * dev_name);
 void unregister_ioc_dev(int dev_id);
 int set_ioctl_dump(char * file);
-int l_ioctl(int dev_id, unsigned int opc, void *buf);
-int parse_dump(char * dump_file, ioc_handler_t ioc_func);
+int l_ioctl(int dev_id, int opc, void *buf);
+int parse_dump(char * dump_file, int (*ioc_func)(int dev_id, int opc, void *));
 int jt_ioc_dump(int argc, char **argv);
-extern char *dump_filename;
-int dump(int dev_id, unsigned int opc, void *buf);
 
 #endif
diff --git a/lnet/include/lnet/nal.h b/lnet/include/lnet/nal.h
index 1f925c1..5b72046 100644
--- a/lnet/include/lnet/nal.h
+++ b/lnet/include/lnet/nal.h
@@ -18,29 +18,32 @@
 typedef struct nal_t nal_t;
 
 struct nal_t {
-	int              nal_refct;
-	void            *nal_data;
+	ptl_ni_t ni;
+	int refct;
+	void *nal_data;
+	int *timeout;		/* for libp30api users */
+	int (*forward) (nal_t * nal, int index,	/* Function ID */
+			void *args, size_t arg_len, void *ret, size_t ret_len);
 
-	int (*startup) (nal_t *nal, ptl_pid_t requested_pid,
-			ptl_ni_limits_t *req, ptl_ni_limits_t *actual);
-	
-	void (*shutdown) (nal_t *nal);
+	int (*shutdown) (nal_t * nal, int interface);
 
-	int (*forward) (nal_t *nal, int index,	/* Function ID */
-			void *args, size_t arg_len, void *ret, size_t ret_len);
+	int (*validate) (nal_t * nal, void *base, size_t extent);
 
-	int (*yield) (nal_t *nal, unsigned long *flags, int milliseconds);
+	int (*yield) (nal_t * nal, unsigned long *flags, int milliseconds);
 
-	void (*lock) (nal_t *nal, unsigned long *flags);
+	void (*lock) (nal_t * nal, unsigned long *flags);
 
-	void (*unlock) (nal_t *nal, unsigned long *flags);
+	void (*unlock) (nal_t * nal, unsigned long *flags);
 };
 
+typedef nal_t *(ptl_interface_t) (int, ptl_pt_index_t, ptl_ac_index_t, ptl_pid_t requested_pid);
+extern nal_t *PTL_IFACE_IP(int, ptl_pt_index_t, ptl_ac_index_t, ptl_pid_t requested_pid);
+extern nal_t *PTL_IFACE_MYR(int, ptl_pt_index_t, ptl_ac_index_t, ptl_pid_t requested_pid);
+
 extern nal_t *ptl_hndl2nal(ptl_handle_any_t * any);
 
-#ifdef __KERNEL__
-extern int ptl_register_nal(ptl_interface_t interface, nal_t *nal);
-extern void ptl_unregister_nal(ptl_interface_t interface);
+#ifndef PTL_IFACE_DEFAULT
+#define PTL_IFACE_DEFAULT (PTL_IFACE_IP)
 #endif
 
 #endif
diff --git a/lnet/include/lnet/nalids.h b/lnet/include/lnet/nalids.h
index 55a991b..1568593 100644
--- a/lnet/include/lnet/nalids.h
+++ b/lnet/include/lnet/nalids.h
@@ -1,2 +1,6 @@
 #include "build_check.h"
 
+#define PTL_IFACE_TCP 1
+#define PTL_IFACE_ER 2
+#define PTL_IFACE_SS 3
+#define PTL_IFACE_MAX 4
diff --git a/lnet/include/lnet/p30.h b/lnet/include/lnet/p30.h
index 4b8631d..577ffab 100644
--- a/lnet/include/lnet/p30.h
+++ b/lnet/include/lnet/p30.h
@@ -21,6 +21,45 @@
 #endif
 
 #include <portals/types.h>
+#include <portals/nal.h>
 #include <portals/api.h>
+#include <portals/nalids.h>
+
+/*
+ * Debugging flags reserved for the Portals reference library.
+ * These are not part of the API as described in the SAND report
+ * but are for the use of the maintainers of the reference implementation.
+ *
+ * It is not expected that the real implementations will export
+ * this functionality.
+ */
+#define PTL_DEBUG_NONE          0ul
+#define PTL_DEBUG_ALL           (0x0FFFul)	/* Only the Portals flags */
+
+#define __bit(x)                ((unsigned long) 1<<(x))
+#define PTL_DEBUG_PUT           __bit(0)
+#define PTL_DEBUG_GET           __bit(1)
+#define PTL_DEBUG_REPLY         __bit(2)
+#define PTL_DEBUG_ACK           __bit(3)
+#define PTL_DEBUG_DROP          __bit(4)
+#define PTL_DEBUG_REQUEST       __bit(5)
+#define PTL_DEBUG_DELIVERY      __bit(6)
+#define PTL_DEBUG_UNLINK        __bit(7)
+#define PTL_DEBUG_THRESHOLD     __bit(8)
+#define PTL_DEBUG_API           __bit(9)
+
+/*
+ * These eight are reserved for the NAL to define
+ * It should probably give them better names...
+ */
+#define PTL_DEBUG_NI_ALL        (0xF000ul)	/* Only the NAL flags */
+#define PTL_DEBUG_NI0           __bit(24)
+#define PTL_DEBUG_NI1           __bit(25)
+#define PTL_DEBUG_NI2           __bit(26)
+#define PTL_DEBUG_NI3           __bit(27)
+#define PTL_DEBUG_NI4           __bit(28)
+#define PTL_DEBUG_NI5           __bit(29)
+#define PTL_DEBUG_NI6           __bit(30)
+#define PTL_DEBUG_NI7           __bit(31)
 
 #endif
diff --git a/lnet/include/lnet/ptlctl.h b/lnet/include/lnet/ptlctl.h
index 2af336e..12ef47a 100644
--- a/lnet/include/lnet/ptlctl.h
+++ b/lnet/include/lnet/ptlctl.h
@@ -23,10 +23,6 @@
 #ifndef _PTLCTL_H_
 #define _PTLCTL_H_
 
-#include <portals/types.h>
-#include <linux/kp30.h>
-#include <linux/libcfs.h>
-
 #define PORTALS_DEV_ID 0
 #define PORTALS_DEV_PATH "/dev/portals"
 #define OBD_DEV_ID 1
@@ -80,15 +76,13 @@ int jt_dbg_panic(int argc, char **argv);
 int ptl_set_cfg_record_cb(cfg_record_cb_t cb);
 
 /* l_ioctl.c */
-typedef int (ioc_handler_t)(int dev_id, unsigned int opc, void *buf);
+typedef int (ioc_handler_t)(int dev_id, int opc, void *buf);
 void set_ioc_handler(ioc_handler_t *handler);
 int register_ioc_dev(int dev_id, const char * dev_name);
 void unregister_ioc_dev(int dev_id);
 int set_ioctl_dump(char * file);
-int l_ioctl(int dev_id, unsigned int opc, void *buf);
-int parse_dump(char * dump_file, ioc_handler_t ioc_func);
+int l_ioctl(int dev_id, int opc, void *buf);
+int parse_dump(char * dump_file, int (*ioc_func)(int dev_id, int opc, void *));
 int jt_ioc_dump(int argc, char **argv);
-extern char *dump_filename;
-int dump(int dev_id, unsigned int opc, void *buf);
 
 #endif
diff --git a/lnet/include/lnet/types.h b/lnet/include/lnet/types.h
index ef2712b..902db76 100644
--- a/lnet/include/lnet/types.h
+++ b/lnet/include/lnet/types.h
@@ -3,7 +3,28 @@
 
 #include "build_check.h"
 
-#include <linux/libcfs.h>
+#ifdef __linux__
+# include <asm/types.h>
+# if defined(__powerpc__) && !defined(__KERNEL__)
+#  define __KERNEL__
+#  include <asm/timex.h>
+#  undef __KERNEL__
+# else
+#  include <asm/timex.h>
+# endif
+#else
+# include <sys/types.h>
+typedef u_int32_t __u32;
+typedef u_int64_t __u64;
+#endif
+
+#ifdef __KERNEL__
+# include <linux/time.h>
+#else
+# include <sys/time.h>
+# define do_gettimeofday(tv) gettimeofday(tv, NULL);
+#endif
+
 #include <portals/errno.h>
 
 /* This implementation uses the same type for API function return codes and
@@ -20,6 +41,7 @@ typedef __u64 ptl_hdr_data_t;
 typedef __u32 ptl_size_t;
 
 #define PTL_TIME_FOREVER    (-1)
+#define PTL_EQ_HANDLER_NONE NULL
 
 typedef struct {
         unsigned long nal_idx;			/* which network interface */
@@ -59,6 +81,12 @@ typedef enum {
 } ptl_ins_pos_t;
 
 typedef struct {
+	struct page     *kiov_page;
+	unsigned int     kiov_len;
+	unsigned int     kiov_offset;
+} ptl_kiov_t;
+
+typedef struct {
         void            *start;
         ptl_size_t       length;
         int              threshold;
@@ -66,6 +94,7 @@ typedef struct {
         unsigned int     options;
         void            *user_ptr;
         ptl_handle_eq_t  eventq;
+	unsigned int     niov;
 } ptl_md_t;
 
 /* Options for the MD structure */
@@ -83,19 +112,9 @@ typedef struct {
 
 /* For compatibility with Cray Portals */
 #define PTL_MD_LUSTRE_COMPLETION_SEMANTICS  0
-#define PTL_MD_PHYS                         0
 
 #define PTL_MD_THRESH_INF       (-1)
 
-/* NB lustre portals uses struct iovec internally! */
-typedef struct iovec ptl_md_iovec_t;
-
-typedef struct {
-	struct page     *kiov_page;
-	unsigned int     kiov_len;
-	unsigned int     kiov_offset;
-} ptl_kiov_t;
-
 typedef enum {
         PTL_EVENT_GET_START,
         PTL_EVENT_GET_END,
@@ -149,9 +168,6 @@ typedef enum {
         PTL_NOACK_REQ
 } ptl_ack_req_t;
 
-typedef void (*ptl_eq_handler_t)(ptl_event_t *event);
-#define PTL_EQ_HANDLER_NONE NULL
-
 typedef struct {
         volatile ptl_seq_t sequence;
         ptl_size_t size;
@@ -164,14 +180,11 @@ typedef struct {
 } ptl_ni_t;
 
 typedef struct {
-	int max_mes;
-	int max_mds;
-	int max_eqs;
-	int max_ac_index;
-	int max_pt_index;
-	int max_md_iovecs;
-	int max_me_list;
-	int max_getput_md;
+        int max_match_entries;    /* max number of match entries */
+        int max_mem_descriptors;  /* max number of memory descriptors */
+        int max_event_queues;     /* max number of event queues */
+        int max_atable_index;     /* maximum access control list table index */
+        int max_ptable_index;     /* maximum portals table index */
 } ptl_ni_limits_t;
 
 /*
@@ -189,7 +202,4 @@ typedef enum {
 
 typedef int ptl_sr_value_t;
 
-typedef int ptl_interface_t;
-#define PTL_IFACE_DEFAULT    (-1)
-
 #endif
diff --git a/lnet/klnds/.cvsignore b/lnet/klnds/.cvsignore
index f5fd0b0..89a4aa6 100644
--- a/lnet/klnds/.cvsignore
+++ b/lnet/klnds/.cvsignore
@@ -1,5 +1,3 @@
 Makefile
-autoMakefile
-autoMakefile.in
-.*.cmd
-.depend
+Makefile.in
+.*.o.cmd
diff --git a/lustre/include/lustre/Makefile.am b/lnet/klnds/Makefile.am
similarity index 59%
rename from lustre/include/lustre/Makefile.am
rename to lnet/klnds/Makefile.am
index a785ada..df6ee5c 100644
--- a/lustre/include/lustre/Makefile.am
+++ b/lnet/klnds/Makefile.am
@@ -3,7 +3,5 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
-
-pkginclude_HEADERS = lustre_user.h liblustreapi.h
-
-EXTRA_DIST = $(pkginclude_HEADERS)
+DIST_SUBDIRS= socknal qswnal gmnal scimacnal ibnal
+SUBDIRS= socknal @QSWNAL@ @GMNAL@ @SCIMACNAL@ @IBNAL@
diff --git a/lnet/klnds/Makefile.in b/lnet/klnds/Makefile.in
deleted file mode 100644
index b5ed168..0000000
--- a/lnet/klnds/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-@BUILD_GMNAL_TRUE@subdir-m += gmnal
-@BUILD_IBNAL_TRUE@subdir-m += ibnal
-@BUILD_QSWNAL_TRUE@subdir-m += qswnal
-subdir-m += socknal
-
-@INCLUDE_RULES@
diff --git a/lnet/klnds/gmlnd/.cvsignore b/lnet/klnds/gmlnd/.cvsignore
index 642e2e6..e995588 100644
--- a/lnet/klnds/gmlnd/.cvsignore
+++ b/lnet/klnds/gmlnd/.cvsignore
@@ -1,10 +1,3 @@
 .deps
 Makefile
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.cmd
-.*.flags
-.tmp_versions
-.depend
+Makefile.in
diff --git a/lnet/klnds/gmlnd/Makefile.am b/lnet/klnds/gmlnd/Makefile.am
new file mode 100644
index 0000000..bac4680
--- /dev/null
+++ b/lnet/klnds/gmlnd/Makefile.am
@@ -0,0 +1,13 @@
+# Copyright (C) 2001  Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+include ../../Rules.linux
+
+MODULE = kgmnal
+modulenet_DATA = kgmnal.o
+EXTRA_PROGRAMS = kgmnal
+
+DEFS = -DGM_KERNEL
+kgmnal_SOURCES = gmnal.h gmnal_api.c gmnal_cb.c gmnal_comm.c gmnal_utils.c gmnal_module.c
diff --git a/lnet/klnds/gmlnd/Makefile.in b/lnet/klnds/gmlnd/Makefile.in
deleted file mode 100644
index 89ea361..0000000
--- a/lnet/klnds/gmlnd/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-MODULES := kgmnal
-kgmnal-objs := gmnal_api.o gmnal_cb.o gmnal_comm.o gmnal_utils.o gmnal_module.o
-
-EXTRA_PRE_CFLAGS := @GMCPPFLAGS@
-
-@INCLUDE_RULES@
diff --git a/lnet/klnds/gmlnd/autoMakefile.am b/lnet/klnds/gmlnd/autoMakefile.am
deleted file mode 100644
index d8b9edb..0000000
--- a/lnet/klnds/gmlnd/autoMakefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (C) 2001  Cluster File Systems, Inc.
-#
-# This code is issued under the GNU General Public License.
-# See the file COPYING in this distribution
-
-if MODULES
-if BUILD_GMNAL
-if !CRAY_PORTALS
-modulenet_DATA = kgmnal$(KMODEXT)
-endif
-endif
-endif
-
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-DIST_SOURCES = $(kgmnal-objs:%.o=%.c) gmnal.h
diff --git a/lnet/klnds/gmlnd/gmlnd.h b/lnet/klnds/gmlnd/gmlnd.h
index e48552e..9955599 100644
--- a/lnet/klnds/gmlnd/gmlnd.h
+++ b/lnet/klnds/gmlnd/gmlnd.h
@@ -190,6 +190,7 @@ typedef struct _gmnal_rxtwe {
 #define NRXTHREADS 10 /* max number of receiver threads */
 
 typedef struct _gmnal_data_t {
+	int		refcnt;
 	spinlock_t	cb_lock;
 	spinlock_t 	stxd_lock;
 	struct semaphore stxd_token;
@@ -308,12 +309,9 @@ extern gmnal_data_t	*global_nal_data;
 /*
  *	API NAL
  */
-int gmnal_api_startup(nal_t *, ptl_pid_t, 
-                      ptl_ni_limits_t *, ptl_ni_limits_t *);
-
 int gmnal_api_forward(nal_t *, int, void *, size_t, void *, size_t);
 
-void gmnal_api_shutdown(nal_t *);
+int gmnal_api_shutdown(nal_t *, int);
 
 int gmnal_api_validate(nal_t *, void *, size_t);
 
@@ -325,13 +323,14 @@ void gmnal_api_unlock(nal_t *, unsigned long *);
 
 
 #define GMNAL_INIT_NAL(a)	do { 	\
-                                a->startup = gmnal_api_startup; \
 				a->forward = gmnal_api_forward; \
 				a->shutdown = gmnal_api_shutdown; \
+				a->validate = NULL; \
 				a->yield = gmnal_api_yield; \
 				a->lock = gmnal_api_lock; \
 				a->unlock = gmnal_api_unlock; \
 				a->timeout = NULL; \
+				a->refct = 1; \
 				a->nal_data = NULL; \
 				} while (0)
 
@@ -374,7 +373,7 @@ void gmnal_cb_sti(nal_cb_t *, unsigned long *);
 
 int gmnal_cb_dist(nal_cb_t *, ptl_nid_t, unsigned long *);
 
-int gmnal_init(void);
+nal_t *gmnal_init(int, ptl_pt_index_t, ptl_ac_index_t, ptl_pid_t rpid);
 
 void  gmnal_fini(void);
 
diff --git a/lnet/klnds/gmlnd/gmlnd_api.c b/lnet/klnds/gmlnd/gmlnd_api.c
index 7c94f93..338d75c 100644
--- a/lnet/klnds/gmlnd/gmlnd_api.c
+++ b/lnet/klnds/gmlnd/gmlnd_api.c
@@ -123,51 +123,18 @@ gmnal_api_forward(nal_t *nal, int index, void *args, size_t arg_len,
 
 /*
  *	gmnal_api_shutdown
- *      nal_refct == 0 => called on last matching PtlNIFini()
  *	Close down this interface and free any resources associated with it
  *	nal_t	nal	our nal to shutdown
  */
-void
+int
 gmnal_api_shutdown(nal_t *nal, int interface)
 {
-	gmnal_data_t	*nal_data;
-	nal_cb_t	*nal_cb;
-
-        if (nal->nal_refct != 0)
-                return;
-        
-	CDEBUG(D_TRACE, "gmnal_api_shutdown: nal_data [%p]\n", nal_data);
-
-        LASSERT(nal == global_nal_data->nal);
-        nal_data = nal->nal_data;
-        LASSERT(nal_data == global_nal_data);
-        nal_cb = nal_data->nal_cb;
-
-        /* Stop portals calling our ioctl handler */
-        libcfs_nal_cmd_unregister(GMNAL);
 
-        /* XXX for shutdown "under fire" we probably need to set a shutdown
-         * flag so when lib calls us we fail immediately and dont queue any
-         * more work but our threads can still call into lib OK.  THEN
-         * shutdown our threads, THEN lib_fini() */
-        lib_fini(nal_cb);
+	gmnal_data_t	*nal_data = nal->nal_data;
 
-	gmnal_stop_rxthread(nal_data);
-	gmnal_stop_ctthread(nal_data);
-	gmnal_free_txd(nal_data);
-	gmnal_free_srxd(nal_data);
-	GMNAL_GM_LOCK(nal_data);
-	gm_close(nal_data->gm_port);
-	gm_finalize();
-	GMNAL_GM_UNLOCK(nal_data);
-        if (nal_data->sysctl)
-                unregister_sysctl_table (nal_data->sysctl);
-	PORTAL_FREE(nal, sizeof(nal_t));	
-	PORTAL_FREE(nal_data, sizeof(gmnal_data_t));	
-	PORTAL_FREE(nal_cb, sizeof(nal_cb_t));
+	CDEBUG(D_TRACE, "gmnal_api_shutdown: nal_data [%p]\n", nal_data);
 
-        global_nal_data = NULL;
-        PORTAL_MODULE_UNUSE;
+	return(PTL_OK);
 }
 
 
@@ -243,54 +210,57 @@ gmnal_api_unlock(nal_t *nal, unsigned long *flags)
 }
 
 
-int
-gmnal_api_startup(nal_t *nal, ptl_pid_t requested_pid,
-                  ptl_ni_limits_t *requested_limits,
-                  ptl_ni_limits_t *actual_limits)
+nal_t *
+gmnal_init(int interface, ptl_pt_index_t ptl_size, ptl_ac_index_t ac_size, 
+	    ptl_pid_t rpid)
 {
 
+	nal_t		*nal = NULL;
 	nal_cb_t	*nal_cb = NULL;
 	gmnal_data_t	*nal_data = NULL;
 	gmnal_srxd_t	*srxd = NULL;
 	gm_status_t	gm_status;
 	unsigned int	local_nid = 0, global_nid = 0;
-        ptl_process_id_t process_id;
-
-        if (nal->nal_refct != 0) {
-                if (actual_limits != NULL) {
-                        nal_data = (gmnal_data_t *)nal->nal_data;
-                        nal_cb = nal_data->nal_cb;
-                        *actual_limits = nal->_cb->ni.actual_limits;
-                return (PTL_OK);
-        }
+	ptl_nid_t	portals_nid;
+	ptl_pid_t	portals_pid = 0;
 
-        /* Called on first PtlNIInit() */
 
-	CDEBUG(D_TRACE, "startup\n");
+	CDEBUG(D_TRACE, "gmnal_init : interface [%d], ptl_size [%d], "
+	       "ac_size[%d]\n", interface, ptl_size, ac_size);
 
-        LASSERT(global_nal_data == NULL);
 
 	PORTAL_ALLOC(nal_data, sizeof(gmnal_data_t));
 	if (!nal_data) {
 		CDEBUG(D_ERROR, "can't get memory\n");
-		return(PTL_NO_SPACE);
+		return(NULL);
 	}	
 	memset(nal_data, 0, sizeof(gmnal_data_t));
 	/*
  	 *	set the small message buffer size 
 	 */
+	nal_data->refcnt = 1;
 
 	CDEBUG(D_INFO, "Allocd and reset nal_data[%p]\n", nal_data);
 	CDEBUG(D_INFO, "small_msg_size is [%d]\n", nal_data->small_msg_size);
 
+	PORTAL_ALLOC(nal, sizeof(nal_t));
+	if (!nal) {
+		PORTAL_FREE(nal_data, sizeof(gmnal_data_t));
+		return(NULL);
+	}
+	memset(nal, 0, sizeof(nal_t));
+	CDEBUG(D_INFO, "Allocd and reset nal[%p]\n", nal);
+
 	PORTAL_ALLOC(nal_cb, sizeof(nal_cb_t));
 	if (!nal_cb) {
+		PORTAL_FREE(nal, sizeof(nal_t));
 		PORTAL_FREE(nal_data, sizeof(gmnal_data_t));
-		return(PTL_NO_SPACE);
+		return(NULL);
 	}
 	memset(nal_cb, 0, sizeof(nal_cb_t));
 	CDEBUG(D_INFO, "Allocd and reset nal_cb[%p]\n", nal_cb);
 
+	GMNAL_INIT_NAL(nal);
 	GMNAL_INIT_NAL_CB(nal_cb);
 	/*
 	 *	String them all together
@@ -310,9 +280,10 @@ gmnal_api_startup(nal_t *nal, ptl_pid_t requested_pid,
 	CDEBUG(D_INFO, "Calling gm_init\n");
 	if (gm_init() != GM_SUCCESS) {
 		CDEBUG(D_ERROR, "call to gm_init failed\n");
+		PORTAL_FREE(nal, sizeof(nal_t));	
 		PORTAL_FREE(nal_data, sizeof(gmnal_data_t));	
 		PORTAL_FREE(nal_cb, sizeof(nal_cb_t));
-		return(PTL_FAIL);
+		return(NULL);
 	}
 
 
@@ -355,9 +326,10 @@ gmnal_api_startup(nal_t *nal, ptl_pid_t requested_pid,
 		GMNAL_GM_LOCK(nal_data);
 		gm_finalize();
 		GMNAL_GM_UNLOCK(nal_data);
+		PORTAL_FREE(nal, sizeof(nal_t));	
 		PORTAL_FREE(nal_data, sizeof(gmnal_data_t));	
 		PORTAL_FREE(nal_cb, sizeof(nal_cb_t));
-		return(PTL_FAIL);
+		return(NULL);
 	}
 
 	
@@ -372,9 +344,10 @@ gmnal_api_startup(nal_t *nal, ptl_pid_t requested_pid,
 		gm_close(nal_data->gm_port);
 		gm_finalize();
 		GMNAL_GM_UNLOCK(nal_data);
+		PORTAL_FREE(nal, sizeof(nal_t));	
 		PORTAL_FREE(nal_data, sizeof(gmnal_data_t));	
 		PORTAL_FREE(nal_cb, sizeof(nal_cb_t));
-		return(PTL_FAIL);
+		return(NULL);
 	}
 
 
@@ -401,9 +374,10 @@ gmnal_api_startup(nal_t *nal, ptl_pid_t requested_pid,
 		gm_close(nal_data->gm_port);
 		gm_finalize();
 		GMNAL_GM_UNLOCK(nal_data);
+		PORTAL_FREE(nal, sizeof(nal_t));	
 		PORTAL_FREE(nal_data, sizeof(gmnal_data_t));	
 		PORTAL_FREE(nal_cb, sizeof(nal_cb_t));
-		return(PTL_FAIL);
+		return(NULL);
 	}
 
 	gmnal_start_kernel_threads(nal_data);
@@ -433,9 +407,10 @@ gmnal_api_startup(nal_t *nal, ptl_pid_t requested_pid,
 		gm_close(nal_data->gm_port);
 		gm_finalize();
 		GMNAL_GM_UNLOCK(nal_data);
+		PORTAL_FREE(nal, sizeof(nal_t));	
 		PORTAL_FREE(nal_data, sizeof(gmnal_data_t));	
 		PORTAL_FREE(nal_cb, sizeof(nal_cb_t));
-		return(PTL_FAIL);
+		return(NULL);
 	}
 	nal_data->gm_local_nid = local_nid;
 	CDEBUG(D_INFO, "Local node id is [%u]\n", local_nid);
@@ -453,9 +428,10 @@ gmnal_api_startup(nal_t *nal, ptl_pid_t requested_pid,
 		gm_close(nal_data->gm_port);
 		gm_finalize();
 		GMNAL_GM_UNLOCK(nal_data);
+		PORTAL_FREE(nal, sizeof(nal_t));	
 		PORTAL_FREE(nal_data, sizeof(gmnal_data_t));	
 		PORTAL_FREE(nal_cb, sizeof(nal_cb_t));
-		return(PTL_FAIL);
+		return(NULL);
 	}
 	CDEBUG(D_INFO, "Global node id is [%u]\n", global_nid);
 	nal_data->gm_global_nid = global_nid;
@@ -464,15 +440,13 @@ gmnal_api_startup(nal_t *nal, ptl_pid_t requested_pid,
 /*
 	pid = gm_getpid();
 */
-        process_id.pid = 0;
-        process_id.nid = global_nid;
-        
-	CDEBUG(D_INFO, "portals_pid is [%u]\n", process_id.pid);
-	CDEBUG(D_INFO, "portals_nid is ["LPU64"]\n", process_id.nid);
+	CDEBUG(D_INFO, "portals_pid is [%u]\n", portals_pid);
+	portals_nid = (unsigned long)global_nid;
+	CDEBUG(D_INFO, "portals_nid is ["LPU64"]\n", portals_nid);
 	
 	CDEBUG(D_PORTALS, "calling lib_init\n");
-	if (lib_init(nal_cb, process_id, 
-                     requested_limits, actual_limits) != PTL_OK) {
+	if (lib_init(nal_cb, portals_nid, portals_pid, 1024, ptl_size, 
+		     ac_size) != PTL_OK) {
 		CDEBUG(D_ERROR, "lib_init failed\n");
 		gmnal_stop_rxthread(nal_data);
 		gmnal_stop_ctthread(nal_data);
@@ -482,68 +456,22 @@ gmnal_api_startup(nal_t *nal, ptl_pid_t requested_pid,
 		gm_close(nal_data->gm_port);
 		gm_finalize();
 		GMNAL_GM_UNLOCK(nal_data);
+		PORTAL_FREE(nal, sizeof(nal_t));	
 		PORTAL_FREE(nal_data, sizeof(gmnal_data_t));	
 		PORTAL_FREE(nal_cb, sizeof(nal_cb_t));
-		return(PTL_FAIL);
+		return(NULL);
 		
 	}
-
-	if (libcfs_nal_cmd_register(GMNAL, &gmnal_cmd, nal->nal_data) != 0) {
-		CDEBUG(D_INFO, "libcfs_nal_cmd_register failed\n");
-
-                /* XXX these cleanup cases should be restructured to
-                 * minimise duplication... */
-                lib_fini(nal_cb);
-                
-		gmnal_stop_rxthread(nal_data);
-		gmnal_stop_ctthread(nal_data);
-		gmnal_free_txd(nal_data);
-		gmnal_free_srxd(nal_data);
-		GMNAL_GM_LOCK(nal_data);
-		gm_close(nal_data->gm_port);
-		gm_finalize();
-		GMNAL_GM_UNLOCK(nal_data);
-		PORTAL_FREE(nal_data, sizeof(gmnal_data_t));	
-		PORTAL_FREE(nal_cb, sizeof(nal_cb_t));
-		return(PTL_FAIL);
-        }
-
-        /* might be better to initialise this at module load rather than in
-         * NAL startup */
         nal_data->sysctl = NULL;
         nal_data->sysctl = register_sysctl_table (gmnalnal_top_sysctl_table, 0);
 
 	
 	CDEBUG(D_INFO, "gmnal_init finished\n");
 	global_nal_data = nal->nal_data;
-
-        /* no unload now until shutdown */
-        PORTAL_MODULE_USE;
-        
-	return(PTL_OK);
+	return(nal);
 }
 
-nal_t the_gm_nal;
-
-/* 
- *        Called when module loaded
- */
-int gmnal_init(void)
-{
-        int    rc;
-
-	memset(&the_gm_nal, 0, sizeof(nal_t));
-	CDEBUG(D_INFO, "reset nal[%p]\n", &the_gm_nal);
-	GMNAL_INIT_NAL(&the_gm_nal);
 
-        rc = ptl_register_nal(GMNAL, &the_gm_nal);
-        if (rc != PTL_OK)
-                CERROR("Can't register GMNAL: %d\n", rc);
-
-        return (rc);
-}
-
-                
 
 /*
  *	Called when module removed
@@ -556,7 +484,20 @@ void gmnal_fini()
 
 	CDEBUG(D_TRACE, "gmnal_fini\n");
 
-        LASSERT(global_nal_data == NULL);
+	PtlNIFini(kgmnal_ni);
+	lib_fini(nal_cb);
 
-        ptl_unregister_nal(GMNAL);
+	gmnal_stop_rxthread(nal_data);
+	gmnal_stop_ctthread(nal_data);
+	gmnal_free_txd(nal_data);
+	gmnal_free_srxd(nal_data);
+	GMNAL_GM_LOCK(nal_data);
+	gm_close(nal_data->gm_port);
+	gm_finalize();
+	GMNAL_GM_UNLOCK(nal_data);
+        if (nal_data->sysctl)
+                unregister_sysctl_table (nal_data->sysctl);
+	PORTAL_FREE(nal, sizeof(nal_t));	
+	PORTAL_FREE(nal_data, sizeof(gmnal_data_t));	
+	PORTAL_FREE(nal_cb, sizeof(nal_cb_t));
 }
diff --git a/lnet/klnds/gmlnd/gmlnd_module.c b/lnet/klnds/gmlnd/gmlnd_module.c
index 278230e..31f6819 100644
--- a/lnet/klnds/gmlnd/gmlnd_module.c
+++ b/lnet/klnds/gmlnd/gmlnd_module.c
@@ -32,6 +32,9 @@ int num_rx_threads = -1;
 int num_stxds = 5;
 int gm_port = 4;
 
+ptl_handle_ni_t	kgmnal_ni;
+
+
 int 
 gmnal_cmd(struct portals_cfg *pcfg, void *private)
 {
@@ -89,15 +92,26 @@ gmnal_load(void)
 
 
 	CDEBUG(D_INFO, "Calling gmnal_init\n");
-        statud = gmnal_init();
+	status = PtlNIInit(gmnal_init, 32, 4, 0, &kgmnal_ni);
 	if (status == PTL_OK) {
-		CDEBUG(D_INFO, "Portals GMNAL initialised ok\n");
+		CDEBUG(D_INFO, "Portals GMNAL initialised ok kgmnal_ni\n");
 	} else {
 		CDEBUG(D_INFO, "Portals GMNAL Failed to initialise\n");
-		return(-ENODEV);
+		return(1);
 		
 	}
 
+	CDEBUG(D_INFO, "Calling kportal_nal_register\n");
+	/*
+ 	 *	global_nal_data is set by gmnal_init
+	 */
+	if (kportal_nal_register(GMNAL, &gmnal_cmd, global_nal_data) != 0) {
+		CDEBUG(D_INFO, "kportal_nal_register failed\n");
+		return(1);
+	}
+
+	CDEBUG(D_INFO, "Calling PORTAL_SYMBOL_REGISTER\n");
+	PORTAL_SYMBOL_REGISTER(kgmnal_ni);
 	CDEBUG(D_INFO, "This is the end of the gmnal init routine");
 
 
@@ -108,7 +122,11 @@ gmnal_load(void)
 static void __exit
 gmnal_unload(void)
 {
+
+	kportal_nal_unregister(GMNAL);
+	PORTAL_SYMBOL_UNREGISTER(kgmnal_ni);
 	gmnal_fini();
+	global_nal_data = NULL;
 	return;
 }
 
@@ -117,6 +135,8 @@ module_init(gmnal_load);
 
 module_exit(gmnal_unload);
 
+EXPORT_SYMBOL(kgmnal_ni);
+
 MODULE_PARM(gmnal_small_msg_size, "i");
 MODULE_PARM(num_rx_threads, "i");
 MODULE_PARM(num_stxds, "i");
diff --git a/lnet/klnds/iblnd/.cvsignore b/lnet/klnds/iblnd/.cvsignore
index 48b17e9..e995588 100644
--- a/lnet/klnds/iblnd/.cvsignore
+++ b/lnet/klnds/iblnd/.cvsignore
@@ -1,10 +1,3 @@
 .deps
 Makefile
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.*.cmd
-.tmp_versions
-.depend
+Makefile.in
diff --git a/lnet/klnds/iblnd/Makefile.am b/lnet/klnds/iblnd/Makefile.am
new file mode 100644
index 0000000..84818dc
--- /dev/null
+++ b/lnet/klnds/iblnd/Makefile.am
@@ -0,0 +1,10 @@
+include ../../Rules.linux
+
+MODULE = kibnal
+modulenet_DATA = kibnal.o
+EXTRA_PROGRAMS = kibnal
+
+
+DEFS =
+CPPFLAGS=@CPPFLAGS@ @with_ib@
+kibnal_SOURCES = ibnal.h ibnal.c ibnal_cb.c
diff --git a/lnet/klnds/iblnd/Makefile.in b/lnet/klnds/iblnd/Makefile.in
deleted file mode 100644
index e180b3e..0000000
--- a/lnet/klnds/iblnd/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-MODULES := kibnal
-kibnal-objs := ibnal.o ibnal_cb.o
-
-EXTRA_PRE_CFLAGS := @IBCPPFLAGS@
-
-@INCLUDE_RULES@
diff --git a/lnet/klnds/iblnd/autoMakefile.am b/lnet/klnds/iblnd/autoMakefile.am
deleted file mode 100644
index ffe084c..0000000
--- a/lnet/klnds/iblnd/autoMakefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-if MODULES
-if !CRAY_PORTALS
-if BUILD_IBNAL
-modulenet_DATA = kibnal$(KMODEXT)
-endif
-endif
-endif
-
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-DIST_SOURCES = $(kibnal-objs:%.o=%.c) ibnal.h
diff --git a/lnet/klnds/iblnd/ibnal.c b/lnet/klnds/iblnd/ibnal.c
index 86c2a63..02beca7 100644
--- a/lnet/klnds/iblnd/ibnal.c
+++ b/lnet/klnds/iblnd/ibnal.c
@@ -235,6 +235,11 @@ kibnal_init(int             interface, // no use here
   kibnal_data_t *nal_data  = NULL;
   int            rc;
 
+  unsigned int nnids = 1; // number of nids 
+                          // do we know how many nodes are in this
+                          // system related to this kib_nid  
+                          //
+
   CDEBUG(D_NET, "kibnal_init:calling lib_init with nid 0x%u\n",
                   kibnal_data.kib_nid);
 
@@ -247,6 +252,7 @@ kibnal_init(int             interface, // no use here
   rc = lib_init(&kibnal_lib, 
                 kibnal_data.kib_nid, 
                 0, // process id is set as 0  
+                nnids,
                 ptl_size, 
                 ac_size);
 
@@ -2028,13 +2034,16 @@ kibnal_initialize(void)
    CDEBUG(D_PORTALS, "kibnal_initialize: Enter kibnal_initialize\n");
 
    // set api functional pointers 
-   kibnal_api.startup    = kibnal_startup;
    kibnal_api.forward    = kibnal_forward;
    kibnal_api.shutdown   = kibnal_shutdown;
    kibnal_api.yield      = kibnal_yield;
+   kibnal_api.validate   = NULL; /* our api validate is a NOOP */
    kibnal_api.lock       = kibnal_lock;
    kibnal_api.unlock     = kibnal_unlock;
    kibnal_api.nal_data   = &kibnal_data; // this is so called private data 
+   kibnal_api.refct      = 1;
+   kibnal_api.timeout    = NULL;
+   kibnal_lib.nal_data   = &kibnal_data;
   
    memset(&kibnal_data, 0, sizeof(kibnal_data));
 
diff --git a/lnet/klnds/qswlnd/.cvsignore b/lnet/klnds/qswlnd/.cvsignore
index 48b17e9..e995588 100644
--- a/lnet/klnds/qswlnd/.cvsignore
+++ b/lnet/klnds/qswlnd/.cvsignore
@@ -1,10 +1,3 @@
 .deps
 Makefile
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.*.cmd
-.tmp_versions
-.depend
+Makefile.in
diff --git a/lnet/klnds/qswlnd/Makefile.am b/lnet/klnds/qswlnd/Makefile.am
new file mode 100644
index 0000000..3eb4dd5
--- /dev/null
+++ b/lnet/klnds/qswlnd/Makefile.am
@@ -0,0 +1,17 @@
+# Copyright (C) 2001  Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+include ../../Rules.linux
+
+MODULE = kqswnal
+modulenet_DATA = kqswnal.o
+EXTRA_PROGRAMS = kqswnal
+
+
+#CFLAGS:= @KCFLAGS@ 
+#CPPFLAGS:=@KCPPFLAGS@
+DEFS =
+CPPFLAGS=@CPPFLAGS@ @with_quadrics@
+kqswnal_SOURCES = qswnal.c qswnal_cb.c qswnal.h
diff --git a/lnet/klnds/qswlnd/Makefile.in b/lnet/klnds/qswlnd/Makefile.in
deleted file mode 100644
index d27240c..0000000
--- a/lnet/klnds/qswlnd/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-MODULES := kqswnal
-kqswnal-objs := qswnal.o qswnal_cb.o
-
-EXTRA_POST_CFLAGS := @QSWCPPFLAGS@ -I/usr/include
-
-@INCLUDE_RULES@
diff --git a/lnet/klnds/qswlnd/autoMakefile.am b/lnet/klnds/qswlnd/autoMakefile.am
deleted file mode 100644
index b5b2e07..0000000
--- a/lnet/klnds/qswlnd/autoMakefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (C) 2001  Cluster File Systems, Inc.
-#
-# This code is issued under the GNU General Public License.
-# See the file COPYING in this distribution
-
-if MODULES
-if !CRAY_PORTALS
-if BUILD_QSWNAL
-modulenet_DATA = kqswnal$(KMODEXT)
-endif
-endif
-endif
-
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-DIST_SOURCES = $(kqswnal-objs:%.o=%.c) qswnal.h
diff --git a/lnet/klnds/qswlnd/qswlnd.c b/lnet/klnds/qswlnd/qswlnd.c
index f4005de..a386eef 100644
--- a/lnet/klnds/qswlnd/qswlnd.c
+++ b/lnet/klnds/qswlnd/qswlnd.c
@@ -24,10 +24,9 @@
 
 #include "qswnal.h"
 
+ptl_handle_ni_t		kqswnal_ni;
 nal_t			kqswnal_api;
 kqswnal_data_t		kqswnal_data;
-ptl_handle_ni_t         kqswnal_ni;
-kqswnal_tunables_t      kqswnal_tunables;
 
 kpr_nal_interface_t kqswnal_router_interface = {
 	kprni_nalid:	QSWNAL,
@@ -44,7 +43,10 @@ kpr_nal_interface_t kqswnal_router_interface = {
 
 static ctl_table kqswnal_ctl_table[] = {
 	{QSWNAL_SYSCTL_OPTIMIZED_GETS, "optimized_gets",
-	 &kqswnal_tunables.kqn_optimized_gets, sizeof (int),
+	 &kqswnal_data.kqn_optimized_gets, sizeof (int),
+	 0644, NULL, &proc_dointvec},
+	{QSWNAL_SYSCTL_COPY_SMALL_FWD, "copy_small_fwd",
+	 &kqswnal_data.kqn_copy_small_fwd, sizeof (int),
 	 0644, NULL, &proc_dointvec},
 	{0}
 };
@@ -99,6 +101,15 @@ kqswnal_unlock(nal_t *nal, unsigned long *flags)
 }
 
 static int
+kqswnal_shutdown(nal_t *nal, int ni)
+{
+	CDEBUG (D_NET, "shutdown\n");
+
+	LASSERT (nal == &kqswnal_api);
+	return (0);
+}
+
+static int
 kqswnal_yield(nal_t *nal, unsigned long *flags, int milliseconds)
 {
 	/* NB called holding statelock */
@@ -108,7 +119,7 @@ kqswnal_yield(nal_t *nal, unsigned long *flags, int milliseconds)
 	CDEBUG (D_NET, "yield\n");
 
 	if (milliseconds == 0) {
-		if (need_resched())
+		if (current->need_resched)
 			schedule();
 		return 0;
 	}
@@ -137,6 +148,20 @@ kqswnal_yield(nal_t *nal, unsigned long *flags, int milliseconds)
 	return (milliseconds);
 }
 
+static nal_t *
+kqswnal_init(int interface, ptl_pt_index_t ptl_size, ptl_ac_index_t ac_size,
+	     ptl_pid_t requested_pid)
+{
+	ptl_nid_t mynid = kqswnal_elanid2nid (kqswnal_data.kqn_elanid);
+	int       nnids = kqswnal_data.kqn_nnodes;
+
+        CDEBUG(D_NET, "calling lib_init with nid "LPX64" of %d\n", mynid, nnids);
+
+	lib_init(&kqswnal_lib, mynid, 0, nnids, ptl_size, ac_size);
+
+	return (&kqswnal_api);
+}
+
 int
 kqswnal_get_tx_desc (struct portals_cfg *pcfg)
 {
@@ -194,32 +219,26 @@ kqswnal_cmd (struct portals_cfg *pcfg, void *private)
 	}
 }
 
-static void
-kqswnal_shutdown(nal_t *nal)
+void __exit
+kqswnal_finalise (void)
 {
-	unsigned long flags;
-	int           do_lib_fini = 0;
-
-	/* NB The first ref was this module! */
-	if (nal->nal_refct != 0) {
-		PORTAL_MODULE_UNUSE;
-		return;
-	}
-
-	CDEBUG (D_NET, "shutdown\n");
-	LASSERT (nal == &kqswnal_api);
-
 	switch (kqswnal_data.kqn_init)
 	{
 	default:
 		LASSERT (0);
 
 	case KQN_INIT_ALL:
-                libcfs_nal_cmd_unregister(QSWNAL);
+#if CONFIG_SYSCTL
+                if (kqswnal_data.kqn_sysctl != NULL)
+                        unregister_sysctl_table (kqswnal_data.kqn_sysctl);
+#endif		
+		PORTAL_SYMBOL_UNREGISTER (kqswnal_ni);
+                kportal_nal_unregister(QSWNAL);
 		/* fall through */
 
-	case KQN_INIT_LIB:
-		do_lib_fini = 1;
+	case KQN_INIT_PTL:
+		PtlNIFini (kqswnal_ni);
+		lib_fini (&kqswnal_lib);
 		/* fall through */
 
 	case KQN_INIT_DATA:
@@ -230,24 +249,18 @@ kqswnal_shutdown(nal_t *nal)
 	}
 
 	/**********************************************************************/
-	/* Tell router we're shutting down.  Any router calls my threads
-	 * make will now fail immediately and the router will stop calling
-	 * into me. */
+	/* Make router stop her calling me and fail any more call-ins */
 	kpr_shutdown (&kqswnal_data.kqn_router);
-	
+
 	/**********************************************************************/
-	/* Signal the start of shutdown... */
-	spin_lock_irqsave(&kqswnal_data.kqn_idletxd_lock, flags);
-	kqswnal_data.kqn_shuttingdown = 1;
-	spin_unlock_irqrestore(&kqswnal_data.kqn_idletxd_lock, flags);
+	/* flag threads we've started to terminate and wait for all to ack */
 
-	wake_up_all(&kqswnal_data.kqn_idletxd_waitq);
+	kqswnal_data.kqn_shuttingdown = 1;
+	wake_up_all (&kqswnal_data.kqn_sched_waitq);
 
-	/**********************************************************************/
-	/* wait for sends that have allocated a tx desc to launch or give up */
-	while (atomic_read (&kqswnal_data.kqn_pending_txs) != 0) {
-		CDEBUG(D_NET, "waiting for %d pending sends\n",
-		       atomic_read (&kqswnal_data.kqn_pending_txs));
+	while (atomic_read (&kqswnal_data.kqn_nthreads_running) != 0) {
+		CDEBUG(D_NET, "waiting for %d threads to start shutting down\n",
+		       atomic_read (&kqswnal_data.kqn_nthreads_running));
 		set_current_state (TASK_UNINTERRUPTIBLE);
 		schedule_timeout (HZ);
 	}
@@ -255,27 +268,18 @@ kqswnal_shutdown(nal_t *nal)
 	/**********************************************************************/
 	/* close elan comms */
 #if MULTIRAIL_EKC
-	/* Shut down receivers first; rx callbacks might try sending... */
 	if (kqswnal_data.kqn_eprx_small != NULL)
 		ep_free_rcvr (kqswnal_data.kqn_eprx_small);
 
 	if (kqswnal_data.kqn_eprx_large != NULL)
 		ep_free_rcvr (kqswnal_data.kqn_eprx_large);
 
-	/* NB ep_free_rcvr() returns only after we've freed off all receive
-	 * buffers (see shutdown handling in kqswnal_requeue_rx()).  This
-	 * means we must have completed any messages we passed to
-	 * lib_parse() or kpr_fwd_start(). */
-
 	if (kqswnal_data.kqn_eptx != NULL)
 		ep_free_xmtr (kqswnal_data.kqn_eptx);
 
-	/* NB ep_free_xmtr() returns only after all outstanding transmits
-	 * have called their callback... */
+	/* freeing the xmtr completes all txs pdq */
 	LASSERT(list_empty(&kqswnal_data.kqn_activetxds));
 #else
-	/* "Old" EKC just pretends to shutdown cleanly but actually
-	 * provides no guarantees */
 	if (kqswnal_data.kqn_eprx_small != NULL)
 		ep_remove_large_rcvr (kqswnal_data.kqn_eprx_small);
 
@@ -294,6 +298,7 @@ kqswnal_shutdown(nal_t *nal)
 #endif
 	/**********************************************************************/
 	/* flag threads to terminate, wake them and wait for them to die */
+
 	kqswnal_data.kqn_shuttingdown = 2;
 	wake_up_all (&kqswnal_data.kqn_sched_waitq);
 
@@ -311,12 +316,10 @@ kqswnal_shutdown(nal_t *nal)
 
 #if MULTIRAIL_EKC
 	LASSERT (list_empty (&kqswnal_data.kqn_readyrxds));
-	LASSERT (list_empty (&kqswnal_data.kqn_delayedtxds));
-	LASSERT (list_empty (&kqswnal_data.kqn_delayedfwds));
 #endif
 
 	/**********************************************************************/
-	/* Complete any blocked forwarding packets, with error
+	/* Complete any blocked forwarding packets with error
 	 */
 
 	while (!list_empty (&kqswnal_data.kqn_idletxd_fwdq))
@@ -324,16 +327,23 @@ kqswnal_shutdown(nal_t *nal)
 		kpr_fwd_desc_t *fwd = list_entry (kqswnal_data.kqn_idletxd_fwdq.next,
 						  kpr_fwd_desc_t, kprfd_list);
 		list_del (&fwd->kprfd_list);
-		kpr_fwd_done (&kqswnal_data.kqn_router, fwd, -ESHUTDOWN);
+		kpr_fwd_done (&kqswnal_data.kqn_router, fwd, -EHOSTUNREACH);
+	}
+
+	while (!list_empty (&kqswnal_data.kqn_delayedfwds))
+	{
+		kpr_fwd_desc_t *fwd = list_entry (kqswnal_data.kqn_delayedfwds.next,
+						  kpr_fwd_desc_t, kprfd_list);
+		list_del (&fwd->kprfd_list);
+		kpr_fwd_done (&kqswnal_data.kqn_router, fwd, -EHOSTUNREACH);
 	}
 
 	/**********************************************************************/
-	/* finalise router and portals lib */
+	/* Wait for router to complete any packets I sent her
+	 */
 
 	kpr_deregister (&kqswnal_data.kqn_router);
 
-	if (do_lib_fini)
-		lib_fini (&kqswnal_lib);
 
 	/**********************************************************************/
 	/* Unmap message buffers and free all descriptors and buffers
@@ -454,9 +464,7 @@ kqswnal_shutdown(nal_t *nal)
 }
 
 static int __init
-kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
-		 ptl_ni_limits_t *requested_limits, 
-		 ptl_ni_limits_t *actual_limits)
+kqswnal_initialise (void)
 {
 #if MULTIRAIL_EKC
 	EP_RAILMASK       all_rails = EP_RAILMASK_ALL;
@@ -466,21 +474,22 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 	int               rc;
 	int               i;
 	int               elan_page_idx;
-	ptl_process_id_t  my_process_id;
 	int               pkmem = atomic_read(&portal_kmemory);
 
-	if (nal->nal_refct != 0) {
-		if (actual_limits != NULL)
-			*actual_limits = kqswnal_lib.ni.actual_limits;
-		/* This module got the first ref */
-		PORTAL_MODULE_USE;
-		return (PTL_OK);
-	}
-
 	LASSERT (kqswnal_data.kqn_init == KQN_INIT_NOTHING);
 
 	CDEBUG (D_MALLOC, "start kmem %d\n", atomic_read(&portal_kmemory));
 
+	kqswnal_api.forward  = kqswnal_forward;
+	kqswnal_api.shutdown = kqswnal_shutdown;
+	kqswnal_api.yield    = kqswnal_yield;
+	kqswnal_api.validate = NULL;		/* our api validate is a NOOP */
+	kqswnal_api.lock     = kqswnal_lock;
+	kqswnal_api.unlock   = kqswnal_unlock;
+	kqswnal_api.nal_data = &kqswnal_data;
+
+	kqswnal_lib.nal_data = &kqswnal_data;
+
 	memset(&kqswnal_rpc_success, 0, sizeof(kqswnal_rpc_success));
 	memset(&kqswnal_rpc_failed, 0, sizeof(kqswnal_rpc_failed));
 #if MULTIRAIL_EKC
@@ -491,6 +500,9 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 	/* ensure all pointers NULL etc */
 	memset (&kqswnal_data, 0, sizeof (kqswnal_data));
 
+	kqswnal_data.kqn_optimized_gets = KQSW_OPTIMIZED_GETS;
+	kqswnal_data.kqn_copy_small_fwd = KQSW_COPY_SMALL_FWD;
+
 	kqswnal_data.kqn_cb = &kqswnal_lib;
 
 	INIT_LIST_HEAD (&kqswnal_data.kqn_idletxds);
@@ -512,19 +524,18 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 
 	/* pointers/lists/locks initialised */
 	kqswnal_data.kqn_init = KQN_INIT_DATA;
-	
+
 #if MULTIRAIL_EKC
 	kqswnal_data.kqn_ep = ep_system();
 	if (kqswnal_data.kqn_ep == NULL) {
 		CERROR("Can't initialise EKC\n");
-		kqswnal_shutdown(&kqswnal_api);
-		return (PTL_IFACE_INVALID);
+		return (-ENODEV);
 	}
 
 	if (ep_waitfor_nodeid(kqswnal_data.kqn_ep) == ELAN_INVALID_NODE) {
 		CERROR("Can't get elan ID\n");
-		kqswnal_shutdown(&kqswnal_api);
-		return (PTL_IFACE_INVALID);
+		kqswnal_finalise();
+		return (-ENODEV);
 	}
 #else
 	/**********************************************************************/
@@ -534,8 +545,7 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 	if (kqswnal_data.kqn_ep == NULL)
 	{
 		CERROR ("Can't get elan device 0\n");
-		kqswnal_shutdown(&kqswnal_api);
-		return (PTL_IFACE_INVALID);
+		return (-ENODEV);
 	}
 #endif
 
@@ -550,8 +560,8 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 	if (kqswnal_data.kqn_eptx == NULL)
 	{
 		CERROR ("Can't allocate transmitter\n");
-		kqswnal_shutdown (&kqswnal_api);
-		return (PTL_NO_SPACE);
+		kqswnal_finalise ();
+		return (-ENOMEM);
 	}
 
 	/**********************************************************************/
@@ -563,8 +573,8 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 	if (kqswnal_data.kqn_eprx_small == NULL)
 	{
 		CERROR ("Can't install small msg receiver\n");
-		kqswnal_shutdown (&kqswnal_api);
-		return (PTL_NO_SPACE);
+		kqswnal_finalise ();
+		return (-ENOMEM);
 	}
 
 	kqswnal_data.kqn_eprx_large = ep_alloc_rcvr (kqswnal_data.kqn_ep,
@@ -573,8 +583,8 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 	if (kqswnal_data.kqn_eprx_large == NULL)
 	{
 		CERROR ("Can't install large msg receiver\n");
-		kqswnal_shutdown (&kqswnal_api);
-		return (PTL_NO_SPACE);
+		kqswnal_finalise ();
+		return (-ENOMEM);
 	}
 
 	/**********************************************************************/
@@ -588,8 +598,8 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 				EP_PERM_WRITE);
 	if (kqswnal_data.kqn_ep_tx_nmh == NULL) {
 		CERROR("Can't reserve tx dma space\n");
-		kqswnal_shutdown(&kqswnal_api);
-		return (PTL_NO_SPACE);
+		kqswnal_finalise();
+		return (-ENOMEM);
 	}
 #else
         dmareq.Waitfn   = DDI_DMA_SLEEP;
@@ -603,8 +613,8 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 	if (rc != DDI_SUCCESS)
 	{
 		CERROR ("Can't reserve rx dma space\n");
-		kqswnal_shutdown (&kqswnal_api);
-		return (PTL_NO_SPACE);
+		kqswnal_finalise ();
+		return (-ENOMEM);
 	}
 #endif
 	/**********************************************************************/
@@ -617,8 +627,8 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 				EP_PERM_WRITE);
 	if (kqswnal_data.kqn_ep_tx_nmh == NULL) {
 		CERROR("Can't reserve rx dma space\n");
-		kqswnal_shutdown(&kqswnal_api);
-		return (PTL_NO_SPACE);
+		kqswnal_finalise();
+		return (-ENOMEM);
 	}
 #else
         dmareq.Waitfn   = DDI_DMA_SLEEP;
@@ -633,8 +643,8 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 	if (rc != DDI_SUCCESS)
 	{
 		CERROR ("Can't reserve rx dma space\n");
-		kqswnal_shutdown (&kqswnal_api);
-		return (PTL_NO_SPACE);
+		kqswnal_finalise ();
+		return (-ENOMEM);
 	}
 #endif
 	/**********************************************************************/
@@ -644,8 +654,8 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 		     sizeof(kqswnal_tx_t) * (KQSW_NTXMSGS + KQSW_NNBLK_TXMSGS));
 	if (kqswnal_data.kqn_txds == NULL)
 	{
-		kqswnal_shutdown (&kqswnal_api);
-		return (PTL_NO_SPACE);
+		kqswnal_finalise ();
+		return (-ENOMEM);
 	}
 
 	/* clear flags, null pointers etc */
@@ -660,8 +670,8 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 		PORTAL_ALLOC (ktx->ktx_buffer, KQSW_TX_BUFFER_SIZE);
 		if (ktx->ktx_buffer == NULL)
 		{
-			kqswnal_shutdown (&kqswnal_api);
-			return (PTL_NO_SPACE);
+			kqswnal_finalise ();
+			return (-ENOMEM);
 		}
 
 		/* Map pre-allocated buffer NOW, to save latency on transmit */
@@ -697,8 +707,8 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 		      sizeof (kqswnal_rx_t) * (KQSW_NRXMSGS_SMALL + KQSW_NRXMSGS_LARGE));
 	if (kqswnal_data.kqn_rxds == NULL)
 	{
-		kqswnal_shutdown (&kqswnal_api);
-		return (PTL_NO_SPACE);
+		kqswnal_finalise ();
+		return (-ENOMEM);
 	}
 
 	memset(kqswnal_data.kqn_rxds, 0, /* clear flags, null pointers etc */
@@ -732,8 +742,8 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 			struct page *page = alloc_page(GFP_KERNEL);
 			
 			if (page == NULL) {
-				kqswnal_shutdown (&kqswnal_api);
-				return (PTL_NO_SPACE);
+				kqswnal_finalise ();
+				return (-ENOMEM);
 			}
 
 			krx->krx_kiov[j].kiov_page = page;
@@ -777,19 +787,15 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 	/**********************************************************************/
 	/* Network interface ready to initialise */
 
-	my_process_id.nid = kqswnal_elanid2nid(kqswnal_data.kqn_elanid);
-	my_process_id.pid = 0;
-
-	rc = lib_init(&kqswnal_lib, my_process_id,
-		      requested_limits, actual_limits);
-        if (rc != PTL_OK)
+        rc = PtlNIInit(kqswnal_init, 32, 4, 0, &kqswnal_ni);
+        if (rc != 0)
 	{
-		CERROR ("lib_init failed %d\n", rc);
-		kqswnal_shutdown (&kqswnal_api);
-		return (rc);
+		CERROR ("PtlNIInit failed %d\n", rc);
+		kqswnal_finalise ();
+		return (-ENOMEM);
 	}
 
-	kqswnal_data.kqn_init = KQN_INIT_LIB;
+	kqswnal_data.kqn_init = KQN_INIT_PTL;
 
 	/**********************************************************************/
 	/* Queue receives, now that it's OK to run their completion callbacks */
@@ -810,20 +816,21 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 		if (rc != EP_SUCCESS)
 		{
 			CERROR ("failed ep_queue_receive %d\n", rc);
-			kqswnal_shutdown (&kqswnal_api);
-			return (PTL_FAIL);
+			kqswnal_finalise ();
+			return (-ENOMEM);
 		}
 	}
 
 	/**********************************************************************/
 	/* Spawn scheduling threads */
-	for (i = 0; i < num_online_cpus(); i++) {
+	for (i = 0; i < smp_num_cpus; i++)
+	{
 		rc = kqswnal_thread_start (kqswnal_scheduler, NULL);
 		if (rc != 0)
 		{
 			CERROR ("failed to spawn scheduling thread: %d\n", rc);
-			kqswnal_shutdown (&kqswnal_api);
-			return (PTL_FAIL);
+			kqswnal_finalise ();
+			return (rc);
 		}
 	}
 
@@ -832,13 +839,19 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 	rc = kpr_register (&kqswnal_data.kqn_router, &kqswnal_router_interface);
 	CDEBUG(D_NET, "Can't initialise routing interface (rc = %d): not routing\n",rc);
 
-	rc = libcfs_nal_cmd_register (QSWNAL, &kqswnal_cmd, NULL);
+	rc = kportal_nal_register (QSWNAL, &kqswnal_cmd, NULL);
 	if (rc != 0) {
 		CERROR ("Can't initialise command interface (rc = %d)\n", rc);
-		kqswnal_shutdown (&kqswnal_api);
-		return (PTL_FAIL);
+		kqswnal_finalise ();
+		return (rc);
 	}
 
+#if CONFIG_SYSCTL
+        /* Press on regardless even if registering sysctl doesn't work */
+        kqswnal_data.kqn_sysctl = register_sysctl_table (kqswnal_top_ctl_table, 0);
+#endif
+
+	PORTAL_SYMBOL_REGISTER(kqswnal_ni);
 	kqswnal_data.kqn_init = KQN_INIT_ALL;
 
 	printk(KERN_INFO "Lustre: Routing QSW NAL loaded on node %d of %d "
@@ -847,65 +860,15 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 	       kpr_routing (&kqswnal_data.kqn_router) ? "enabled" : "disabled",
 	       pkmem);
 
-	return (PTL_OK);
-}
-
-void __exit
-kqswnal_finalise (void)
-{
-#if CONFIG_SYSCTL
-	if (kqswnal_tunables.kqn_sysctl != NULL)
-		unregister_sysctl_table (kqswnal_tunables.kqn_sysctl);
-#endif
-	PtlNIFini(kqswnal_ni);
-
-	ptl_unregister_nal(QSWNAL);
-}
-
-static int __init
-kqswnal_initialise (void)
-{
-	int   rc;
-
-	kqswnal_api.startup  = kqswnal_startup;
-	kqswnal_api.shutdown = kqswnal_shutdown;
-	kqswnal_api.forward  = kqswnal_forward;
-	kqswnal_api.yield    = kqswnal_yield;
-	kqswnal_api.lock     = kqswnal_lock;
-	kqswnal_api.unlock   = kqswnal_unlock;
-	kqswnal_api.nal_data = &kqswnal_data;
-
-	kqswnal_lib.nal_data = &kqswnal_data;
-
-	/* Initialise dynamic tunables to defaults once only */
-	kqswnal_tunables.kqn_optimized_gets = KQSW_OPTIMIZED_GETS;
-	
-	rc = ptl_register_nal(QSWNAL, &kqswnal_api);
-	if (rc != PTL_OK) {
-		CERROR("Can't register QSWNAL: %d\n", rc);
-		return (-ENOMEM);		/* or something... */
-	}
-
-	/* Pure gateways, and the workaround for 'EKC blocks forever until
-	 * the service is active' want the NAL started up at module load
-	 * time... */
-	rc = PtlNIInit(QSWNAL, 0, NULL, NULL, &kqswnal_ni);
-	if (rc != PTL_OK && rc != PTL_IFACE_DUP) {
-		ptl_unregister_nal(QSWNAL);
-		return (-ENODEV);
-	}
-
-#if CONFIG_SYSCTL
-        /* Press on regardless even if registering sysctl doesn't work */
-        kqswnal_tunables.kqn_sysctl = 
-		register_sysctl_table (kqswnal_top_ctl_table, 0);
-#endif
 	return (0);
 }
 
+
 MODULE_AUTHOR("Cluster File Systems, Inc. <info@clusterfs.com>");
 MODULE_DESCRIPTION("Kernel Quadrics/Elan NAL v1.01");
 MODULE_LICENSE("GPL");
 
 module_init (kqswnal_initialise);
 module_exit (kqswnal_finalise);
+
+EXPORT_SYMBOL (kqswnal_ni);
diff --git a/lnet/klnds/qswlnd/qswlnd.h b/lnet/klnds/qswlnd/qswlnd.h
index 6978aa0..5e32887 100644
--- a/lnet/klnds/qswlnd/qswlnd.h
+++ b/lnet/klnds/qswlnd/qswlnd.h
@@ -53,11 +53,7 @@
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-#include <linux/locks.h>        /* wait_on_buffer */
-#else
-#include <linux/buffer_head.h>  /* wait_on_buffer */
-#endif
+#include <linux/locks.h>
 #include <linux/unistd.h>
 #include <net/sock.h>
 #include <linux/uio.h>
@@ -78,7 +74,6 @@
 #include <linux/kpr.h>
 #include <portals/p30.h>
 #include <portals/lib-p30.h>
-#include <portals/nal.h>
 
 #define KQSW_CHECKSUM   0
 #if KQSW_CHECKSUM
@@ -199,19 +194,17 @@ typedef struct
 
 typedef struct
 {
-        /* dynamic tunables... */
-        int                      kqn_optimized_gets;  /* optimized GETs? */
-#if CONFIG_SYSCTL
-        struct ctl_table_header *kqn_sysctl;          /* sysctl interface */
-#endif        
-} kqswnal_tunables_t;
-
-typedef struct
-{
         char               kqn_init;            /* what's been initialised */
         char               kqn_shuttingdown;    /* I'm trying to shut down */
-        atomic_t           kqn_nthreads;        /* # threads running */
+        atomic_t           kqn_nthreads;        /* # threads not terminated */
+        atomic_t           kqn_nthreads_running;/* # threads still running */
+
+        int                kqn_optimized_gets;  /* optimized GETs? */
+        int                kqn_copy_small_fwd;  /* fwd small msgs from pre-allocated buffer? */
 
+#if CONFIG_SYSCTL
+        struct ctl_table_header *kqn_sysctl;    /* sysctl interface */
+#endif        
         kqswnal_rx_t      *kqn_rxds;            /* all the receive descriptors */
         kqswnal_tx_t      *kqn_txds;            /* all the transmit descriptors */
 
@@ -221,7 +214,6 @@ typedef struct
         spinlock_t         kqn_idletxd_lock;    /* serialise idle txd access */
         wait_queue_head_t  kqn_idletxd_waitq;   /* sender blocks here waiting for idle txd */
         struct list_head   kqn_idletxd_fwdq;    /* forwarded packets block here waiting for idle txd */
-        atomic_t           kqn_pending_txs;     /* # transmits being prepped */
         
         spinlock_t         kqn_sched_lock;      /* serialise packet schedulers */
         wait_queue_head_t  kqn_sched_waitq;     /* scheduler blocks here */
@@ -255,13 +247,12 @@ typedef struct
 /* kqn_init state */
 #define KQN_INIT_NOTHING        0               /* MUST BE ZERO so zeroed state is initialised OK */
 #define KQN_INIT_DATA           1
-#define KQN_INIT_LIB            2
+#define KQN_INIT_PTL            2
 #define KQN_INIT_ALL            3
 
-extern nal_cb_t            kqswnal_lib;
-extern nal_t               kqswnal_api;
-extern kqswnal_tunables_t  kqswnal_tunables;
-extern kqswnal_data_t      kqswnal_data;
+extern nal_cb_t        kqswnal_lib;
+extern nal_t           kqswnal_api;
+extern kqswnal_data_t  kqswnal_data;
 
 /* global pre-prepared replies to keep off the stack */
 extern EP_STATUSBLK    kqswnal_rpc_success;
diff --git a/lnet/klnds/qswlnd/qswlnd_cb.c b/lnet/klnds/qswlnd/qswlnd_cb.c
index 2bcb853..61c88f6 100644
--- a/lnet/klnds/qswlnd/qswlnd_cb.c
+++ b/lnet/klnds/qswlnd/qswlnd_cb.c
@@ -426,8 +426,7 @@ kqswnal_put_idle_tx (kqswnal_tx_t *ktx)
         list_add (&ktx->ktx_list, &kqswnal_data.kqn_idletxds);
 
         /* anything blocking for a tx descriptor? */
-        if (!kqswnal_data.kqn_shuttingdown &&
-            !list_empty(&kqswnal_data.kqn_idletxd_fwdq)) /* forwarded packet? */
+        if (!list_empty(&kqswnal_data.kqn_idletxd_fwdq)) /* forwarded packet? */
         {
                 CDEBUG(D_NET,"wakeup fwd\n");
 
@@ -461,9 +460,6 @@ kqswnal_get_idle_tx (kpr_fwd_desc_t *fwd, int may_block)
         for (;;) {
                 spin_lock_irqsave (&kqswnal_data.kqn_idletxd_lock, flags);
 
-                if (kqswnal_data.kqn_shuttingdown)
-                        break;
-
                 /* "normal" descriptor is free */
                 if (!list_empty (&kqswnal_data.kqn_idletxds)) {
                         ktx = list_entry (kqswnal_data.kqn_idletxds.next,
@@ -471,8 +467,14 @@ kqswnal_get_idle_tx (kpr_fwd_desc_t *fwd, int may_block)
                         break;
                 }
 
-                if (fwd != NULL)                /* forwarded packet? */
+                /* "normal" descriptor pool is empty */
+
+                if (fwd != NULL) { /* forwarded packet => queue for idle txd */
+                        CDEBUG (D_NET, "blocked fwd [%p]\n", fwd);
+                        list_add_tail (&fwd->kprfd_list,
+                                       &kqswnal_data.kqn_idletxd_fwdq);
                         break;
+                }
 
                 /* doing a local transmit */
                 if (!may_block) {
@@ -492,20 +494,13 @@ kqswnal_get_idle_tx (kpr_fwd_desc_t *fwd, int may_block)
 
                 CDEBUG (D_NET, "blocking for tx desc\n");
                 wait_event (kqswnal_data.kqn_idletxd_waitq,
-                            !list_empty (&kqswnal_data.kqn_idletxds) ||
-                            kqswnal_data.kqn_shuttingdown);
+                            !list_empty (&kqswnal_data.kqn_idletxds));
         }
 
         if (ktx != NULL) {
                 list_del (&ktx->ktx_list);
                 list_add (&ktx->ktx_list, &kqswnal_data.kqn_activetxds);
                 ktx->ktx_launcher = current->pid;
-                atomic_inc(&kqswnal_data.kqn_pending_txs);
-        } else if (fwd != NULL) {
-                /* queue forwarded packet until idle txd available */
-                CDEBUG (D_NET, "blocked fwd [%p]\n", fwd);
-                list_add_tail (&fwd->kprfd_list,
-                               &kqswnal_data.kqn_idletxd_fwdq);
         }
 
         spin_unlock_irqrestore (&kqswnal_data.kqn_idletxd_lock, flags);
@@ -606,9 +601,6 @@ kqswnal_launch (kqswnal_tx_t *ktx)
 
         ktx->ktx_launchtime = jiffies;
 
-        if (kqswnal_data.kqn_shuttingdown)
-                return (-ESHUTDOWN);
-
         LASSERT (dest >= 0);                    /* must be a peer */
         if (ktx->ktx_state == KTX_GETTING) {
                 /* NB ktx_frag[0] is the GET hdr + kqswnal_remotemd_t.  The
@@ -643,6 +635,8 @@ kqswnal_launch (kqswnal_tx_t *ktx)
                 return (0);
 
         case EP_ENOMEM: /* can't allocate ep txd => queue for later */
+                LASSERT (in_interrupt());
+
                 spin_lock_irqsave (&kqswnal_data.kqn_sched_lock, flags);
 
                 list_add_tail (&ktx->ktx_delayed_list, &kqswnal_data.kqn_delayedtxds);
@@ -927,7 +921,7 @@ kqswnal_sendmsg (nal_cb_t     *nal,
         LASSERT (payload_kiov == NULL || !in_interrupt ());
         /* payload is either all vaddrs or all pages */
         LASSERT (!(payload_kiov != NULL && payload_iov != NULL));
-
+        
         if (payload_nob > KQSW_MAXPAYLOAD) {
                 CERROR ("request exceeds MTU size "LPSZ" (max %u).\n",
                         payload_nob, KQSW_MAXPAYLOAD);
@@ -973,17 +967,19 @@ kqswnal_sendmsg (nal_cb_t     *nal,
                                "nid "LPX64" via "LPX64" elanID %d\n",
                                nid, targetnid,
                                ep_rxd_node(((kqswnal_rx_t *)private)->krx_rxd));
-                        rc = -EINVAL;
-                        goto out;
+                        return (PTL_FAIL);
                 }
 
                 /* peer expects RPC completion with GET data */
                 rc = kqswnal_dma_reply (ktx, payload_niov, 
                                         payload_iov, payload_kiov, 
                                         payload_offset, payload_nob);
-                if (rc != 0)
-                        CERROR ("Can't DMA reply to "LPX64": %d\n", nid, rc);
-                goto out;
+                if (rc == 0)
+                        return (PTL_OK);
+                
+                CERROR ("Can't DMA reply to "LPX64": %d\n", nid, rc);
+                kqswnal_put_idle_tx (ktx);
+                return (PTL_FAIL);
         }
 
         memcpy (ktx->ktx_buffer, hdr, sizeof (*hdr)); /* copy hdr from caller's stack */
@@ -1027,7 +1023,7 @@ kqswnal_sendmsg (nal_cb_t     *nal,
         memcpy(ktx->ktx_buffer + sizeof(*hdr) + sizeof(csum), &csum, sizeof(csum));
 #endif
 
-        if (kqswnal_tunables.kqn_optimized_gets &&
+        if (kqswnal_data.kqn_optimized_gets &&
             type == PTL_MSG_GET &&              /* doing a GET */
             nid == targetnid) {                 /* not forwarding */
                 lib_md_t           *md = libmsg->md;
@@ -1056,8 +1052,11 @@ kqswnal_sendmsg (nal_cb_t     *nal,
                 else
                         rc = kqswnal_map_tx_iov (ktx, 0, md->length,
                                                  md->md_niov, md->md_iov.iov);
-                if (rc != 0)
-                        goto out;
+
+                if (rc < 0) {
+                        kqswnal_put_idle_tx (ktx);
+                        return (PTL_FAIL);
+                }
 
                 rmd->kqrmd_nfrag = ktx->ktx_nfrag - 1;
 
@@ -1120,26 +1119,25 @@ kqswnal_sendmsg (nal_cb_t     *nal,
                 else
                         rc = kqswnal_map_tx_iov (ktx, payload_offset, payload_nob,
                                                  payload_niov, payload_iov);
-                if (rc != 0)
-                        goto out;
+                if (rc != 0) {
+                        kqswnal_put_idle_tx (ktx);
+                        return (PTL_FAIL);
+                }
         }
         
         ktx->ktx_port = (payload_nob <= KQSW_SMALLPAYLOAD) ?
                         EP_MSG_SVC_PORTALS_SMALL : EP_MSG_SVC_PORTALS_LARGE;
 
         rc = kqswnal_launch (ktx);
-
- out:
-        CDEBUG(rc == 0 ? D_NET : D_ERROR, 
-               "%s "LPSZ" bytes to "LPX64" via "LPX64": rc %d\n", 
-               rc == 0 ? "Sent" : "Failed to send",
-               payload_nob, nid, targetnid, rc);
-
-        if (rc != 0)
+        if (rc != 0) {                    /* failed? */
+                CERROR ("Failed to send packet to "LPX64": %d\n", targetnid, rc);
                 kqswnal_put_idle_tx (ktx);
+                return (PTL_FAIL);
+        }
 
-        atomic_dec(&kqswnal_data.kqn_pending_txs);
-        return (rc == 0 ? PTL_OK : PTL_FAIL);
+        CDEBUG(D_NET, "sent "LPSZ" bytes to "LPX64" via "LPX64"\n", 
+               payload_nob, nid, targetnid);
+        return (PTL_OK);
 }
 
 static ptl_err_t
@@ -1206,7 +1204,7 @@ kqswnal_fwd_packet (void *arg, kpr_fwd_desc_t *fwd)
         if (kqswnal_nid2elanid (nid) < 0) {
                 CERROR("Can't forward [%p] to "LPX64": not a peer\n", fwd, nid);
                 rc = -EHOSTUNREACH;
-                goto out;
+                goto failed;
         }
 
         /* copy hdr into pre-mapped buffer */
@@ -1246,20 +1244,20 @@ kqswnal_fwd_packet (void *arg, kpr_fwd_desc_t *fwd)
 #endif
                 rc = kqswnal_map_tx_kiov (ktx, 0, nob, niov, kiov);
                 if (rc != 0)
-                        goto out;
+                        goto failed;
         }
 
         rc = kqswnal_launch (ktx);
- out:
-        if (rc != 0) {
-                CERROR ("Failed to forward [%p] to "LPX64": %d\n", fwd, nid, rc);
+        if (rc == 0)
+                return;
 
-                kqswnal_put_idle_tx (ktx);
-                /* complete now (with failure) */
-                kpr_fwd_done (&kqswnal_data.kqn_router, fwd, rc);
-        }
+ failed:
+        LASSERT (rc != 0);
+        CERROR ("Failed to forward [%p] to "LPX64": %d\n", fwd, nid, rc);
 
-        atomic_dec(&kqswnal_data.kqn_pending_txs);
+        kqswnal_put_idle_tx (ktx);
+        /* complete now (with failure) */
+        kpr_fwd_done (&kqswnal_data.kqn_router, fwd, rc);
 }
 
 void
@@ -1729,6 +1727,7 @@ kqswnal_thread_start (int (*fn)(void *arg), void *arg)
                 return ((int)pid);
 
         atomic_inc (&kqswnal_data.kqn_nthreads);
+        atomic_inc (&kqswnal_data.kqn_nthreads_running);
         return (0);
 }
 
@@ -1747,6 +1746,7 @@ kqswnal_scheduler (void *arg)
         long             flags;
         int              rc;
         int              counter = 0;
+        int              shuttingdown = 0;
         int              did_something;
 
         kportal_daemonize ("kqswnal_sched");
@@ -1756,6 +1756,18 @@ kqswnal_scheduler (void *arg)
 
         for (;;)
         {
+                if (kqswnal_data.kqn_shuttingdown != shuttingdown) {
+
+                        if (kqswnal_data.kqn_shuttingdown == 2)
+                                break;
+                
+                        /* During stage 1 of shutdown we are still responsive
+                         * to receives */
+
+                        atomic_dec (&kqswnal_data.kqn_nthreads_running);
+                        shuttingdown = kqswnal_data.kqn_shuttingdown;
+                }
+
                 did_something = 0;
 
                 if (!list_empty (&kqswnal_data.kqn_readyrxds))
@@ -1772,7 +1784,8 @@ kqswnal_scheduler (void *arg)
                         spin_lock_irqsave(&kqswnal_data.kqn_sched_lock, flags);
                 }
 
-                if (!list_empty (&kqswnal_data.kqn_delayedtxds))
+                if (!shuttingdown &&
+                    !list_empty (&kqswnal_data.kqn_delayedtxds))
                 {
                         ktx = list_entry(kqswnal_data.kqn_delayedtxds.next,
                                          kqswnal_tx_t, ktx_list);
@@ -1781,31 +1794,31 @@ kqswnal_scheduler (void *arg)
                                                flags);
 
                         rc = kqswnal_launch (ktx);
-                        if (rc != 0) {
+                        if (rc != 0)          /* failed: ktx_nid down? */
+                        {
                                 CERROR("Failed delayed transmit to "LPX64
                                        ": %d\n", ktx->ktx_nid, rc);
                                 kqswnal_tx_done (ktx, rc);
                         }
-                        atomic_dec (&kqswnal_data.kqn_pending_txs);
 
                         did_something = 1;
                         spin_lock_irqsave (&kqswnal_data.kqn_sched_lock, flags);
                 }
 
-                if (!list_empty (&kqswnal_data.kqn_delayedfwds))
+                if (!shuttingdown &
+                    !list_empty (&kqswnal_data.kqn_delayedfwds))
                 {
                         fwd = list_entry (kqswnal_data.kqn_delayedfwds.next, kpr_fwd_desc_t, kprfd_list);
                         list_del (&fwd->kprfd_list);
                         spin_unlock_irqrestore (&kqswnal_data.kqn_sched_lock, flags);
 
-                        /* If we're shutting down, this will just requeue fwd on kqn_idletxd_fwdq */
                         kqswnal_fwd_packet (NULL, fwd);
 
                         did_something = 1;
                         spin_lock_irqsave (&kqswnal_data.kqn_sched_lock, flags);
                 }
 
-                /* nothing to do or hogging CPU */
+                    /* nothing to do or hogging CPU */
                 if (!did_something || counter++ == KQSW_RESCHED) {
                         spin_unlock_irqrestore(&kqswnal_data.kqn_sched_lock,
                                                flags);
@@ -1813,24 +1826,21 @@ kqswnal_scheduler (void *arg)
                         counter = 0;
 
                         if (!did_something) {
-                                if (kqswnal_data.kqn_shuttingdown == 2) {
-                                        /* We only exit in stage 2 of shutdown when 
-                                         * there's nothing left to do */
-                                        break;
-                                }
                                 rc = wait_event_interruptible (kqswnal_data.kqn_sched_waitq,
-                                                               kqswnal_data.kqn_shuttingdown == 2 ||
+                                                               kqswnal_data.kqn_shuttingdown != shuttingdown ||
                                                                !list_empty(&kqswnal_data.kqn_readyrxds) ||
                                                                !list_empty(&kqswnal_data.kqn_delayedtxds) ||
                                                                !list_empty(&kqswnal_data.kqn_delayedfwds));
                                 LASSERT (rc == 0);
-                        } else if (need_resched())
+                        } else if (current->need_resched)
                                 schedule ();
 
                         spin_lock_irqsave (&kqswnal_data.kqn_sched_lock, flags);
                 }
         }
 
+        spin_unlock_irqrestore (&kqswnal_data.kqn_sched_lock, flags);
+
         kqswnal_thread_fini ();
         return (0);
 }
diff --git a/lnet/klnds/scimaclnd/.cvsignore b/lnet/klnds/scimaclnd/.cvsignore
index 48b17e9..e995588 100644
--- a/lnet/klnds/scimaclnd/.cvsignore
+++ b/lnet/klnds/scimaclnd/.cvsignore
@@ -1,10 +1,3 @@
 .deps
 Makefile
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.*.cmd
-.tmp_versions
-.depend
+Makefile.in
diff --git a/lnet/klnds/scimaclnd/Makefile.am b/lnet/klnds/scimaclnd/Makefile.am
new file mode 100644
index 0000000..6da31f0
--- /dev/null
+++ b/lnet/klnds/scimaclnd/Makefile.am
@@ -0,0 +1,11 @@
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+include ../../Rules.linux
+
+MODULE = kscimacnal
+modulenet_DATA = kscimacnal.o
+EXTRA_PROGRAMS = kscimacnal
+
+DEFS =
+kscimacnal_SOURCES = scimacnal.c scimacnal_cb.c scimacnal.h
diff --git a/lnet/klnds/scimaclnd/Makefile.in b/lnet/klnds/scimaclnd/Makefile.in
deleted file mode 100644
index c7eb4ac..0000000
--- a/lnet/klnds/scimaclnd/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-MODULES := kscimacnal
-kscimacnal-objs := scimacnal.o scimacnal_cb.o
-
-EXTRA_PRE_CFLAGS += @SCIMACCPPFLAGS@
-
-@INCLUDE_RULES@
diff --git a/lnet/klnds/scimaclnd/autoMakefile.am b/lnet/klnds/scimaclnd/autoMakefile.am
deleted file mode 100644
index 47433cd..0000000
--- a/lnet/klnds/scimaclnd/autoMakefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-# This code is issued under the GNU General Public License.
-# See the file COPYING in this distribution
-
-if MODULES
-if !CRAY_PORTALS
-if BUILD_SCIMACNAL
-modulenet_DATA = kscimacnal$(KMODEXT)
-endif
-endif
-endif
-
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-DIST_SOURCES = $(ksimacnal-objs:%.o=%.c) scimacnal.h
diff --git a/lnet/klnds/scimaclnd/scimacnal.c b/lnet/klnds/scimaclnd/scimacnal.c
index e77bd8e..35de6eb 100644
--- a/lnet/klnds/scimaclnd/scimacnal.c
+++ b/lnet/klnds/scimaclnd/scimacnal.c
@@ -26,6 +26,7 @@
 
 #include "scimacnal.h"
 
+ptl_handle_ni_t kscimacnal_ni;
 nal_t  kscimacnal_api;
 
 kscimacnal_data_t kscimacnal_data;
@@ -100,34 +101,10 @@ static void kscimacnal_unlock(nal_t *nal, unsigned long *flags)
 }
 
 
-static void kscimacnal_shutdown(nal_t *nal, int ni)
+static int kscimacnal_shutdown(nal_t *nal, int ni)
 {
         LASSERT (nal == &kscimacnal_api);
-        LASSERT (kscimacnal_data.ksci_init);
-
-        if (nal->nal_refct != 0)
-                return;
-
-        /* Called on last matching PtlNIFini() */
-
-        /* FIXME: How should the shutdown procedure really look? 
-         */
-        kscimacnal_data.ksci_shuttingdown=1;
-
-        /* Stop handling ioctls */
-        libcfs_nal_cmd_unregister(SCIMACNAL);
-
-        mac_finish(kscimacnal_data.ksci_machandle);
-
-        /* finalise lib after net shuts up */
-        lib_fini(&kscimacnal_lib);
-
-        kscimacnal_data.ksci_init = 0;
-
-        /* Allow unload */
-        PORTAL_MODULE_UNUSE;
-
-        return;
+        return 0;
 }
 
 
@@ -146,26 +123,56 @@ static void kscimacnal_yield( nal_t *nal, unsigned long *flags, int milliseconds
 }
 
 
-static int kscimacnal_startup(nal_t *nal, ptl_pid_t requested_pid,
-                              ptl_ni_limits_t *requested_limits,
-                              ptl_ni_limits_t *actual_limits)
+static nal_t *kscimacnal_init(int interface, ptl_pt_index_t  ptl_size,
+                ptl_ac_index_t  ac_size, ptl_pid_t requested_pid)
+{
+        int     nnids = 512; /* FIXME: Need ScaMac funktion to get #nodes */
+
+        CDEBUG(D_NET, "calling lib_init with nid "LPX64" nnids %d\n", kscimacnal_data.ksci_nid, nnids);
+        lib_init(&kscimacnal_lib, kscimacnal_data.ksci_nid, 0, nnids,ptl_size, ac_size); 
+        return &kscimacnal_api;
+}
+
+
+/* Called by kernel at module unload time */
+static void /*__exit*/ 
+kscimacnal_finalize(void)
+{
+        /* FIXME: How should the shutdown procedure really look? */
+        kscimacnal_data.ksci_shuttingdown=1;
+
+        PORTAL_SYMBOL_UNREGISTER(kscimacnal_ni);
+
+        PtlNIFini(kscimacnal_ni);
+        lib_fini(&kscimacnal_lib);
+
+        mac_finish(kscimacnal_data.ksci_machandle);
+
+        CDEBUG (D_MALLOC, "done kmem %d\n", atomic_read (&portal_kmemory));
+
+        return;
+}
+
+
+/* Called by kernel at module insertion time */
+static int __init
+kscimacnal_initialize(void)
 {
         int rc;
-        mac_physaddr_t   mac_physaddr;
-        ptl_process_id_t process_id;
+        unsigned long     nid=0;
         mac_handle_t    *machandle = NULL;
 
-        if (nal->nal_refct != 0) {
-                if (actual_limits != NULL)
-                        *actual_limits = kscimacnal_lib.ni.actual_limits;
-                return (PTL_OK);
-        }
 
-        /* Called on first PtlNIInit(SCIMACNAL) */
+        CDEBUG (D_MALLOC, "start kmem %d\n", atomic_read (&portal_kmemory));
+
+        kscimacnal_api.forward = kscimacnal_forward;
+        kscimacnal_api.shutdown = kscimacnal_shutdown;
+        kscimacnal_api.yield = kscimacnal_yield;
+        kscimacnal_api.validate = NULL;         /* our api validate is a NOOP */
+        kscimacnal_api.lock= kscimacnal_lock;
+        kscimacnal_api.unlock= kscimacnal_unlock;
+        kscimacnal_api.nal_data = &kscimacnal_data;
 
-        LASSERT (nal == kscimacnal_api);
-        LASSERT (!kscimacnal_data.ksci_init);
-        
         kscimacnal_lib.nal_data = &kscimacnal_data;
 
         memset(&kscimacnal_data, 0, sizeof(kscimacnal_data));
@@ -181,7 +188,7 @@ static int kscimacnal_startup(nal_t *nal, ptl_pid_t requested_pid,
 
         if(!machandle) {
                 CERROR("mac_init() failed\n");
-                return PTL_FAIL;
+                return -1;
         }
 
         kscimacnal_data.ksci_machandle = machandle;
@@ -192,88 +199,45 @@ static int kscimacnal_startup(nal_t *nal, ptl_pid_t requested_pid,
                                 mac_get_mtusize(machandle), SCIMACNAL_MTU);
                 CERROR("Consult README.scimacnal for more information\n");
                 mac_finish(machandle);
-                return PTL_FAIL;
+                return -1;
         }
 
         /* Get the node ID */
         /* mac_get_physaddrlen() is a function instead of define, sigh */
-        LASSERT(mac_get_physaddrlen(machandle) <= sizeof(mac_physaddr));
-        if(mac_get_physaddr(machandle, &mac_physaddr)) {
+        LASSERT(mac_get_physaddrlen(machandle) <= sizeof(nid));
+        if(mac_get_physaddr(machandle, (mac_physaddr_t *) &nid)) {
                 CERROR("mac_get_physaddr() failed\n");
                 mac_finish(machandle);
-                return PTL_FAIL;
+                return -1;
         }
-        kscimacnal_data.ksci_nid = (ptl_nid_t)(ntohl(mac_physaddr));
+        nid = ntohl(nid);
+        kscimacnal_data.ksci_nid = nid;
 
-        process_id.pid = 0;
-        process_id.nid = kscimacnal_data.ksci_nid;
 
-        CDEBUG(D_NET, "calling lib_init with nid "LPX64"\n",
-               kscimacnal_data.ksci_nid);
-
-        rc = lib_init(&kscimacnal_lib, process_id,
-                      requested_limits, actual_limits);
-        if (rc != PTL_OK) {
+        /* Initialize Network Interface */
+        /* FIXME: What do the magic numbers mean? Documentation anyone? */
+        rc = PtlNIInit(kscimacnal_init, 32, 4, 0, &kscimacnal_ni);
+        if (rc) {
                 CERROR("PtlNIInit failed %d\n", rc);
                 mac_finish(machandle);
-                return (rc);
+                return (-ENOMEM);
         }
 
         /* Init command interface */
-        rc = libcfs_nal_cmd_register (SCIMACNAL, &kscimacnal_cmd, NULL);
+        rc = kportal_nal_register (SCIMACNAL, &kscimacnal_cmd, NULL);
         if (rc != 0) {
                 CERROR ("Can't initialise command interface (rc = %d)\n", rc);
-                lib_fini(&kscimacnal_lib);
+                PtlNIFini(kscimacnal_ni);
                 mac_finish(machandle);
-                return (PTL_FAIL);
+                return (rc);
         }
 
-        /* We're done now, it's OK for the RX callback to do stuff */
-        kscimacnal_data.ksci_init = 1;
 
-        /* Prevent unload before matching PtlNIFini() */
-        PORTAL_MODULE_USE;
-        
-        return (PTL_OK);
-}
-
-
-/* Called by kernel at module unload time */
-static void /*__exit*/ 
-kscimacnal_finalize(void)
-{
-        LASSERT (!kscimacnal_data.ksci_init);
-        
-        ptl_unregister_nal(SCIMACNAL);
+        PORTAL_SYMBOL_REGISTER(kscimacnal_ni);
 
-        CDEBUG (D_MALLOC, "done kmem %d\n", atomic_read (&portal_kmemory));
-
-        return;
-}
-
-
-/* Called by kernel at module insertion time */
-static int __init
-kscimacnal_initialize(void)
-{
-        int rc;
-
-        CDEBUG (D_MALLOC, "start kmem %d\n", atomic_read (&portal_kmemory));
-
-        kscimacnal_api.startup = kscimacnal_startup;
-        kscimacnal_api.forward = kscimacnal_forward;
-        kscimacnal_api.shutdown = kscimacnal_shutdown;
-        kscimacnal_api.yield = kscimacnal_yield;
-        kscimacnal_api.lock= kscimacnal_lock;
-        kscimacnal_api.unlock= kscimacnal_unlock;
-        kscimacnal_api.nal_data = &kscimacnal_data;
+        /* We're done now, it's OK for the RX callback to do stuff */
+        kscimacnal_data.ksci_init = 1;
 
-        rc = ptl_register_nal(SCIMACNAL, &kscimacnal_api);
-        if (rc != PTL_OK) {
-                CERROR("Can't register SCIMACNAL: %d\n", rc);
-                return (-ENODEV);
-        }
-        
         return 0;
 }
 
diff --git a/lnet/klnds/socklnd/.cvsignore b/lnet/klnds/socklnd/.cvsignore
index 5ed596b..95973d6 100644
--- a/lnet/klnds/socklnd/.cvsignore
+++ b/lnet/klnds/socklnd/.cvsignore
@@ -1,10 +1,4 @@
 .deps
 Makefile
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+Makefile.in
+.*.o.cmd
diff --git a/lnet/klnds/socklnd/Makefile.am b/lnet/klnds/socklnd/Makefile.am
new file mode 100644
index 0000000..acdba5e
--- /dev/null
+++ b/lnet/klnds/socklnd/Makefile.am
@@ -0,0 +1,17 @@
+# Copyright (C) 2001  Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+include ../../Rules.linux
+
+MODULE = ksocknal
+modulenet_DATA = ksocknal.o
+EXTRA_PROGRAMS = ksocknal
+
+# If you don't build with -O2, your modules won't insert, becahse htonl is
+# just special that way.
+AM_CFLAGS = -O2
+
+DEFS =
+ksocknal_SOURCES = socknal.c socknal_cb.c socknal.h
diff --git a/lnet/klnds/socklnd/Makefile.in b/lnet/klnds/socklnd/Makefile.in
deleted file mode 100644
index 633b455..0000000
--- a/lnet/klnds/socklnd/Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
-MODULES := ksocknal
-ksocknal-objs := socknal.o socknal_cb.o
-
-# If you don't build with -O2, your modules won't insert, becahse htonl is
-# just special that way.
-EXTRA_POST_CFLAGS := -O2
-
-@INCLUDE_RULES@
diff --git a/lnet/klnds/socklnd/autoMakefile.am b/lnet/klnds/socklnd/autoMakefile.am
deleted file mode 100644
index 070b649..0000000
--- a/lnet/klnds/socklnd/autoMakefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (C) 2001  Cluster File Systems, Inc.
-#
-# This code is issued under the GNU General Public License.
-# See the file COPYING in this distribution
-
-if MODULES
-if !CRAY_PORTALS
-modulenet_DATA = ksocknal$(KMODEXT)
-endif
-endif
-
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-DIST_SOURCES = $(ksocknal-objs:%.o=%.c) socknal.h
diff --git a/lnet/klnds/socklnd/socklnd.c b/lnet/klnds/socklnd/socklnd.c
index 32bbbec..d874a6c 100644
--- a/lnet/klnds/socklnd/socklnd.c
+++ b/lnet/klnds/socklnd/socklnd.c
@@ -25,10 +25,13 @@
 
 #include "socknal.h"
 
-nal_t                   ksocknal_api;
-ksock_nal_data_t        ksocknal_data;
 ptl_handle_ni_t         ksocknal_ni;
-ksock_tunables_t        ksocknal_tunables;
+static nal_t            ksocknal_api;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
+ksock_nal_data_t ksocknal_data;
+#else
+static ksock_nal_data_t ksocknal_data;
+#endif
 
 kpr_nal_interface_t ksocknal_router_interface = {
         kprni_nalid:      SOCKNAL,
@@ -37,7 +40,6 @@ kpr_nal_interface_t ksocknal_router_interface = {
         kprni_notify:     ksocknal_notify,
 };
 
-#ifdef CONFIG_SYSCTL
 #define SOCKNAL_SYSCTL	200
 
 #define SOCKNAL_SYSCTL_TIMEOUT     1
@@ -48,21 +50,21 @@ kpr_nal_interface_t ksocknal_router_interface = {
 
 static ctl_table ksocknal_ctl_table[] = {
         {SOCKNAL_SYSCTL_TIMEOUT, "timeout", 
-         &ksocknal_tunables.ksnd_io_timeout, sizeof (int),
+         &ksocknal_data.ksnd_io_timeout, sizeof (int),
          0644, NULL, &proc_dointvec},
         {SOCKNAL_SYSCTL_EAGER_ACK, "eager_ack", 
-         &ksocknal_tunables.ksnd_eager_ack, sizeof (int),
+         &ksocknal_data.ksnd_eager_ack, sizeof (int),
          0644, NULL, &proc_dointvec},
 #if SOCKNAL_ZC
         {SOCKNAL_SYSCTL_ZERO_COPY, "zero_copy", 
-         &ksocknal_tunables.ksnd_zc_min_frag, sizeof (int),
+         &ksocknal_data.ksnd_zc_min_frag, sizeof (int),
          0644, NULL, &proc_dointvec},
 #endif
         {SOCKNAL_SYSCTL_TYPED, "typed", 
-         &ksocknal_tunables.ksnd_typed_conns, sizeof (int),
+         &ksocknal_data.ksnd_typed_conns, sizeof (int),
          0644, NULL, &proc_dointvec},
         {SOCKNAL_SYSCTL_MIN_BULK, "min_bulk", 
-         &ksocknal_tunables.ksnd_min_bulk, sizeof (int),
+         &ksocknal_data.ksnd_min_bulk, sizeof (int),
          0644, NULL, &proc_dointvec},
         { 0 }
 };
@@ -71,7 +73,6 @@ static ctl_table ksocknal_top_ctl_table[] = {
         {SOCKNAL_SYSCTL, "socknal", NULL, 0, 0555, ksocknal_ctl_table},
         { 0 }
 };
-#endif
 
 int
 ksocknal_api_forward(nal_t *nal, int id, void *args, size_t args_len,
@@ -87,6 +88,12 @@ ksocknal_api_forward(nal_t *nal, int id, void *args, size_t args_len,
         return PTL_OK;
 }
 
+int
+ksocknal_api_shutdown(nal_t *nal, int ni)
+{
+        return PTL_OK;
+}
+
 void
 ksocknal_api_lock(nal_t *nal, unsigned long *flags)
 {
@@ -147,6 +154,19 @@ ksocknal_api_yield(nal_t *nal, unsigned long *flags, int milliseconds)
 	return (milliseconds);
 }
 
+nal_t *
+ksocknal_init(int interface, ptl_pt_index_t ptl_size,
+              ptl_ac_index_t ac_size, ptl_pid_t requested_pid)
+{
+        CDEBUG(D_NET, "calling lib_init with nid "LPX64"\n", (ptl_nid_t)0);
+        lib_init(&ksocknal_lib, (ptl_nid_t)0, 0, 10, ptl_size, ac_size);
+        return (&ksocknal_api);
+}
+
+/*
+ *  EXTRA functions follow
+ */
+
 int
 ksocknal_set_mynid(ptl_nid_t nid)
 {
@@ -812,7 +832,7 @@ ksocknal_create_conn (ksock_route_t *route, struct socket *sock,
 
         /* Set the deadline for the outgoing HELLO to drain */
         conn->ksnc_tx_deadline = jiffies +
-                                 ksocknal_tunables.ksnd_io_timeout * HZ;
+                                 ksocknal_data.ksnd_io_timeout * HZ;
 
         list_add (&conn->ksnc_list, &peer->ksnp_conns);
         atomic_inc (&conn->ksnc_refcount);
@@ -1446,34 +1466,30 @@ ksocknal_free_buffers (void)
 }
 
 void
-ksocknal_api_shutdown (nal_t *nal)
+ksocknal_module_fini (void)
 {
         int   i;
 
-        if (nal->nal_refct != 0) {
-                /* This module got the first ref */
-                PORTAL_MODULE_UNUSE;
-                return;
-        }
-
         CDEBUG(D_MALLOC, "before NAL cleanup: kmem %d\n",
                atomic_read (&portal_kmemory));
 
-        LASSERT(nal == &ksocknal_api);
-
         switch (ksocknal_data.ksnd_init) {
         default:
                 LASSERT (0);
 
         case SOCKNAL_INIT_ALL:
-                libcfs_nal_cmd_unregister(SOCKNAL);
-
-                ksocknal_data.ksnd_init = SOCKNAL_INIT_LIB;
+#if CONFIG_SYSCTL
+                if (ksocknal_data.ksnd_sysctl != NULL)
+                        unregister_sysctl_table (ksocknal_data.ksnd_sysctl);
+#endif
+                kportal_nal_unregister(SOCKNAL);
+                PORTAL_SYMBOL_UNREGISTER (ksocknal_ni);
                 /* fall through */
 
-        case SOCKNAL_INIT_LIB:
+        case SOCKNAL_INIT_PTL:
                 /* No more calls to ksocknal_cmd() to create new
                  * autoroutes/connections since we're being unloaded. */
+                PtlNIFini(ksocknal_ni);
 
                 /* Delete all autoroute entries */
                 ksocknal_del_route(PTL_NID_ANY, 0, 0, 0);
@@ -1494,8 +1510,6 @@ ksocknal_api_shutdown (nal_t *nal)
 
                 /* Tell lib we've stopped calling into her. */
                 lib_fini(&ksocknal_lib);
-
-                ksocknal_data.ksnd_init = SOCKNAL_INIT_DATA;
                 /* fall through */
 
         case SOCKNAL_INIT_DATA:
@@ -1543,8 +1557,6 @@ ksocknal_api_shutdown (nal_t *nal)
                 kpr_deregister (&ksocknal_data.ksnd_router);
 
                 ksocknal_free_buffers();
-
-                ksocknal_data.ksnd_init = SOCKNAL_INIT_NOTHING;
                 /* fall through */
 
         case SOCKNAL_INIT_NOTHING:
@@ -1559,7 +1571,7 @@ ksocknal_api_shutdown (nal_t *nal)
 }
 
 
-void
+void __init
 ksocknal_init_incarnation (void)
 {
         struct timeval tv;
@@ -1575,31 +1587,42 @@ ksocknal_init_incarnation (void)
                 (((__u64)tv.tv_sec) * 1000000) + tv.tv_usec;
 }
 
-int
-ksocknal_api_startup (nal_t *nal, ptl_pid_t requested_pid,
-                      ptl_ni_limits_t *requested_limits,
-                      ptl_ni_limits_t *actual_limits)
+int __init
+ksocknal_module_init (void)
 {
-        ptl_process_id_t  process_id;
-        int               pkmem = atomic_read(&portal_kmemory);
-        int               rc;
-        int               i;
-        int               j;
+        int   pkmem = atomic_read(&portal_kmemory);
+        int   rc;
+        int   i;
+        int   j;
 
-        LASSERT (nal == &ksocknal_api);
+        /* packet descriptor must fit in a router descriptor's scratchpad */
+        LASSERT(sizeof (ksock_tx_t) <= sizeof (kprfd_scratch_t));
+        /* the following must be sizeof(int) for proc_dointvec() */
+        LASSERT(sizeof (ksocknal_data.ksnd_io_timeout) == sizeof (int));
+        LASSERT(sizeof (ksocknal_data.ksnd_eager_ack) == sizeof (int));
+        /* check ksnr_connected/connecting field large enough */
+        LASSERT(SOCKNAL_CONN_NTYPES <= 4);
+        
+        LASSERT (ksocknal_data.ksnd_init == SOCKNAL_INIT_NOTHING);
 
-        if (nal->nal_refct != 0) {
-                if (actual_limits != NULL)
-                        *actual_limits = ksocknal_lib.ni.actual_limits;
-                /* This module got the first ref */
-                PORTAL_MODULE_USE;
-                return (PTL_OK);
-        }
+        ksocknal_api.forward  = ksocknal_api_forward;
+        ksocknal_api.shutdown = ksocknal_api_shutdown;
+        ksocknal_api.validate = NULL;           /* our api validate is a NOOP */
+        ksocknal_api.lock     = ksocknal_api_lock;
+        ksocknal_api.unlock   = ksocknal_api_unlock;
+        ksocknal_api.nal_data = &ksocknal_data;
 
-        LASSERT (ksocknal_data.ksnd_init == SOCKNAL_INIT_NOTHING);
+        ksocknal_lib.nal_data = &ksocknal_data;
 
         memset (&ksocknal_data, 0, sizeof (ksocknal_data)); /* zero pointers */
 
+        ksocknal_data.ksnd_io_timeout = SOCKNAL_IO_TIMEOUT;
+        ksocknal_data.ksnd_eager_ack  = SOCKNAL_EAGER_ACK;
+        ksocknal_data.ksnd_typed_conns = SOCKNAL_TYPED_CONNS;
+        ksocknal_data.ksnd_min_bulk   = SOCKNAL_MIN_BULK;
+#if SOCKNAL_ZC
+        ksocknal_data.ksnd_zc_min_frag = SOCKNAL_ZC_MIN_FRAG;
+#endif
         ksocknal_init_incarnation();
         
         ksocknal_data.ksnd_peer_hash_size = SOCKNAL_PEER_HASH_SIZE;
@@ -1646,7 +1669,7 @@ ksocknal_api_startup (nal_t *nal, ptl_pid_t requested_pid,
         PORTAL_ALLOC(ksocknal_data.ksnd_schedulers,
                      sizeof(ksock_sched_t) * SOCKNAL_N_SCHED);
         if (ksocknal_data.ksnd_schedulers == NULL) {
-                ksocknal_api_shutdown (&ksocknal_api);
+                ksocknal_module_fini ();
                 return (-ENOMEM);
         }
 
@@ -1662,19 +1685,15 @@ ksocknal_api_startup (nal_t *nal, ptl_pid_t requested_pid,
                 init_waitqueue_head (&kss->kss_waitq);
         }
 
-        /* NB we have to wait to be told our true NID... */
-        process_id.pid = 0;
-        process_id.nid = 0;
-        
-        rc = lib_init(&ksocknal_lib, process_id,
-                      requested_limits, actual_limits);
-        if (rc != PTL_OK) {
-                CERROR("lib_init failed: error %d\n", rc);
-                ksocknal_api_shutdown (&ksocknal_api);
+        rc = PtlNIInit(ksocknal_init, 32, 4, 0, &ksocknal_ni);
+        if (rc != 0) {
+                CERROR("ksocknal: PtlNIInit failed: error %d\n", rc);
+                ksocknal_module_fini ();
                 return (rc);
         }
+        PtlNIDebug(ksocknal_ni, ~0);
 
-        ksocknal_data.ksnd_init = SOCKNAL_INIT_LIB; // flag lib_init() called
+        ksocknal_data.ksnd_init = SOCKNAL_INIT_PTL; // flag PtlNIInit() called
 
         for (i = 0; i < SOCKNAL_N_SCHED; i++) {
                 rc = ksocknal_thread_start (ksocknal_scheduler,
@@ -1682,7 +1701,7 @@ ksocknal_api_startup (nal_t *nal, ptl_pid_t requested_pid,
                 if (rc != 0) {
                         CERROR("Can't spawn socknal scheduler[%d]: %d\n",
                                i, rc);
-                        ksocknal_api_shutdown (&ksocknal_api);
+                        ksocknal_module_fini ();
                         return (rc);
                 }
         }
@@ -1691,7 +1710,7 @@ ksocknal_api_startup (nal_t *nal, ptl_pid_t requested_pid,
                 rc = ksocknal_thread_start (ksocknal_autoconnectd, (void *)((long)i));
                 if (rc != 0) {
                         CERROR("Can't spawn socknal autoconnectd: %d\n", rc);
-                        ksocknal_api_shutdown (&ksocknal_api);
+                        ksocknal_module_fini ();
                         return (rc);
                 }
         }
@@ -1699,7 +1718,7 @@ ksocknal_api_startup (nal_t *nal, ptl_pid_t requested_pid,
         rc = ksocknal_thread_start (ksocknal_reaper, NULL);
         if (rc != 0) {
                 CERROR ("Can't spawn socknal reaper: %d\n", rc);
-                ksocknal_api_shutdown (&ksocknal_api);
+                ksocknal_module_fini ();
                 return (rc);
         }
 
@@ -1709,7 +1728,7 @@ ksocknal_api_startup (nal_t *nal, ptl_pid_t requested_pid,
                 CDEBUG(D_NET, "Can't initialise routing interface "
                        "(rc = %d): not routing\n", rc);
         } else {
-                /* Only allocate forwarding buffers if there's a router */
+                /* Only allocate forwarding buffers if I'm on a gateway */
 
                 for (i = 0; i < (SOCKNAL_SMALL_FWD_NMSGS +
                                  SOCKNAL_LARGE_FWD_NMSGS); i++) {
@@ -1725,7 +1744,7 @@ ksocknal_api_startup (nal_t *nal, ptl_pid_t requested_pid,
                         PORTAL_ALLOC(fmb, offsetof(ksock_fmb_t, 
                                                    fmb_kiov[pool->fmp_buff_pages]));
                         if (fmb == NULL) {
-                                ksocknal_api_shutdown(&ksocknal_api);
+                                ksocknal_module_fini();
                                 return (-ENOMEM);
                         }
 
@@ -1735,7 +1754,7 @@ ksocknal_api_startup (nal_t *nal, ptl_pid_t requested_pid,
                                 fmb->fmb_kiov[j].kiov_page = alloc_page(GFP_KERNEL);
 
                                 if (fmb->fmb_kiov[j].kiov_page == NULL) {
-                                        ksocknal_api_shutdown (&ksocknal_api);
+                                        ksocknal_module_fini ();
                                         return (-ENOMEM);
                                 }
 
@@ -1746,13 +1765,19 @@ ksocknal_api_startup (nal_t *nal, ptl_pid_t requested_pid,
                 }
         }
 
-        rc = libcfs_nal_cmd_register(SOCKNAL, &ksocknal_cmd, NULL);
+        rc = kportal_nal_register(SOCKNAL, &ksocknal_cmd, NULL);
         if (rc != 0) {
                 CERROR ("Can't initialise command interface (rc = %d)\n", rc);
-                ksocknal_api_shutdown (&ksocknal_api);
+                ksocknal_module_fini ();
                 return (rc);
         }
 
+        PORTAL_SYMBOL_REGISTER(ksocknal_ni);
+
+#ifdef CONFIG_SYSCTL
+        /* Press on regardless even if registering sysctl doesn't work */
+        ksocknal_data.ksnd_sysctl = register_sysctl_table (ksocknal_top_ctl_table, 0);
+#endif
         /* flag everything initialised */
         ksocknal_data.ksnd_init = SOCKNAL_INIT_ALL;
 
@@ -1764,75 +1789,6 @@ ksocknal_api_startup (nal_t *nal, ptl_pid_t requested_pid,
         return (0);
 }
 
-void __exit
-ksocknal_module_fini (void)
-{
-#ifdef CONFIG_SYSCTL
-        if (ksocknal_tunables.ksnd_sysctl != NULL)
-                unregister_sysctl_table (ksocknal_tunables.ksnd_sysctl);
-#endif
-        PtlNIFini(ksocknal_ni);
-
-        ptl_unregister_nal(SOCKNAL);
-}
-
-int __init
-ksocknal_module_init (void)
-{
-        int    rc;
-
-        /* packet descriptor must fit in a router descriptor's scratchpad */
-        LASSERT(sizeof (ksock_tx_t) <= sizeof (kprfd_scratch_t));
-        /* the following must be sizeof(int) for proc_dointvec() */
-        LASSERT(sizeof (ksocknal_tunables.ksnd_io_timeout) == sizeof (int));
-        LASSERT(sizeof (ksocknal_tunables.ksnd_eager_ack) == sizeof (int));
-        LASSERT(sizeof (ksocknal_tunables.ksnd_typed_conns) == sizeof (int));
-        LASSERT(sizeof (ksocknal_tunables.ksnd_min_bulk) == sizeof (int));
-#if SOCKNAL_ZC
-        LASSERT(sizeof (ksocknal_tunables.ksnd_zc_min_frag) == sizeof (int));
-#endif
-        /* check ksnr_connected/connecting field large enough */
-        LASSERT(SOCKNAL_CONN_NTYPES <= 4);
-        
-        ksocknal_api.startup  = ksocknal_api_startup;
-        ksocknal_api.forward  = ksocknal_api_forward;
-        ksocknal_api.shutdown = ksocknal_api_shutdown;
-        ksocknal_api.lock     = ksocknal_api_lock;
-        ksocknal_api.unlock   = ksocknal_api_unlock;
-        ksocknal_api.nal_data = &ksocknal_data;
-
-        ksocknal_lib.nal_data = &ksocknal_data;
-
-        /* Initialise dynamic tunables to defaults once only */
-        ksocknal_tunables.ksnd_io_timeout = SOCKNAL_IO_TIMEOUT;
-        ksocknal_tunables.ksnd_eager_ack  = SOCKNAL_EAGER_ACK;
-        ksocknal_tunables.ksnd_typed_conns = SOCKNAL_TYPED_CONNS;
-        ksocknal_tunables.ksnd_min_bulk   = SOCKNAL_MIN_BULK;
-#if SOCKNAL_ZC
-        ksocknal_tunables.ksnd_zc_min_frag = SOCKNAL_ZC_MIN_FRAG;
-#endif
-
-        rc = ptl_register_nal(SOCKNAL, &ksocknal_api);
-        if (rc != PTL_OK) {
-                CERROR("Can't register SOCKNAL: %d\n", rc);
-                return (-ENOMEM);               /* or something... */
-        }
-
-        /* Pure gateways want the NAL started up at module load time... */
-        rc = PtlNIInit(SOCKNAL, 0, NULL, NULL, &ksocknal_ni);
-        if (rc != PTL_OK && rc != PTL_IFACE_DUP) {
-                ptl_unregister_nal(SOCKNAL);
-                return (-ENODEV);
-        }
-        
-#ifdef CONFIG_SYSCTL
-        /* Press on regardless even if registering sysctl doesn't work */
-        ksocknal_tunables.ksnd_sysctl = 
-                register_sysctl_table (ksocknal_top_ctl_table, 0);
-#endif
-        return (0);
-}
-
 MODULE_AUTHOR("Cluster File Systems, Inc. <info@clusterfs.com>");
 MODULE_DESCRIPTION("Kernel TCP Socket NAL v0.01");
 MODULE_LICENSE("GPL");
@@ -1840,3 +1796,4 @@ MODULE_LICENSE("GPL");
 module_init(ksocknal_module_init);
 module_exit(ksocknal_module_fini);
 
+EXPORT_SYMBOL (ksocknal_ni);
diff --git a/lnet/klnds/socklnd/socklnd.h b/lnet/klnds/socklnd/socklnd.h
index e1e3aac..bd3c1fb 100644
--- a/lnet/klnds/socklnd/socklnd.h
+++ b/lnet/klnds/socklnd/socklnd.h
@@ -64,7 +64,6 @@
 #include <linux/kpr.h>
 #include <portals/p30.h>
 #include <portals/lib-p30.h>
-#include <portals/nal.h>
 #include <portals/socknal.h>
 
 #if CONFIG_SMP
@@ -142,6 +141,7 @@ typedef struct {
 } ksock_irqinfo_t;
 
 typedef struct {
+        int               ksnd_init;            /* initialisation state */
         int               ksnd_io_timeout;      /* "stuck" socket timeout (seconds) */
         int               ksnd_eager_ack;       /* make TCP ack eagerly? */
         int               ksnd_typed_conns;     /* drive sockets by type? */
@@ -150,10 +150,6 @@ typedef struct {
         unsigned int      ksnd_zc_min_frag;     /* minimum zero copy frag size */
 #endif
         struct ctl_table_header *ksnd_sysctl;   /* sysctl interface */
-} ksock_tunables_t;
-
-typedef struct {
-        int               ksnd_init;            /* initialisation state */
         __u64             ksnd_incarnation;     /* my epoch */
         
         rwlock_t          ksnd_global_lock;     /* stabilize peer/conn ops */
@@ -198,7 +194,7 @@ typedef struct {
 
 #define SOCKNAL_INIT_NOTHING    0
 #define SOCKNAL_INIT_DATA       1
-#define SOCKNAL_INIT_LIB        2
+#define SOCKNAL_INIT_PTL        2
 #define SOCKNAL_INIT_ALL        3
 
 /* A packet just assembled for transmission is represented by 1 or more
@@ -366,7 +362,6 @@ typedef struct ksock_peer
 
 extern nal_cb_t         ksocknal_lib;
 extern ksock_nal_data_t ksocknal_data;
-extern ksock_tunables_t ksocknal_tunables;
 
 static inline struct list_head *
 ksocknal_nid2peerlist (ptl_nid_t nid) 
diff --git a/lnet/klnds/socklnd/socklnd_cb.c b/lnet/klnds/socklnd/socklnd_cb.c
index 21e0abe..ebb32da 100644
--- a/lnet/klnds/socklnd/socklnd_cb.c
+++ b/lnet/klnds/socklnd/socklnd_cb.c
@@ -24,9 +24,6 @@
  */
 
 #include "socknal.h"
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-# include <linux/syscalls.h>
-#endif
 
 /*
  *  LIB functions follow
@@ -265,7 +262,7 @@ ksocknal_send_kiov (ksock_conn_t *conn, ksock_tx_t *tx)
         LASSERT (tx->tx_nkiov > 0);
 
 #if SOCKNAL_ZC
-        if (fragsize >= ksocknal_tunables.ksnd_zc_min_frag &&
+        if (fragsize >= ksocknal_data.ksnd_zc_min_frag &&
             (sock->sk->route_caps & NETIF_F_SG) &&
             (sock->sk->route_caps & (NETIF_F_IP_CSUM | NETIF_F_NO_CSUM | NETIF_F_HW_CSUM))) {
 
@@ -384,7 +381,7 @@ ksocknal_transmit (ksock_conn_t *conn, ksock_tx_t *tx)
                  * is set.  Instead, we presume peer death has occurred if
                  * the socket doesn't drain within a timout */
                 conn->ksnc_tx_deadline = jiffies + 
-                                         ksocknal_tunables.ksnd_io_timeout * HZ;
+                                         ksocknal_data.ksnd_io_timeout * HZ;
                 conn->ksnc_peer->ksnp_last_alive = jiffies;
 
         } while (tx->tx_resid != 0);
@@ -447,7 +444,7 @@ ksocknal_recv_iov (ksock_conn_t *conn)
         /* received something... */
         conn->ksnc_peer->ksnp_last_alive = jiffies;
         conn->ksnc_rx_deadline = jiffies + 
-                                 ksocknal_tunables.ksnd_io_timeout * HZ;
+                                 ksocknal_data.ksnd_io_timeout * HZ;
         mb();                           /* order with setting rx_started */
         conn->ksnc_rx_started = 1;
 
@@ -506,7 +503,7 @@ ksocknal_recv_kiov (ksock_conn_t *conn)
         /* received something... */
         conn->ksnc_peer->ksnp_last_alive = jiffies;
         conn->ksnc_rx_deadline = jiffies + 
-                                 ksocknal_tunables.ksnd_io_timeout * HZ;
+                                 ksocknal_data.ksnd_io_timeout * HZ;
         mb();                           /* order with setting rx_started */
         conn->ksnc_rx_started = 1;
 
@@ -565,7 +562,7 @@ ksocknal_receive (ksock_conn_t *conn)
 
                 if (conn->ksnc_rx_nob_wanted == 0) {
                         /* Completed a message segment (header or payload) */
-                        if ((ksocknal_tunables.ksnd_eager_ack & conn->ksnc_type) != 0 &&
+                        if ((ksocknal_data.ksnd_eager_ack & conn->ksnc_type) != 0 &&
                             (conn->ksnc_rx_state ==  SOCKNAL_RX_BODY ||
                              conn->ksnc_rx_state == SOCKNAL_RX_BODY_FWD)) {
                                 /* Remind the socket to ack eagerly... */
@@ -726,7 +723,7 @@ ksocknal_launch_autoconnect_locked (ksock_route_t *route)
         LASSERT ((route->ksnr_connected & KSNR_TYPED_ROUTES) != KSNR_TYPED_ROUTES);
         LASSERT (!route->ksnr_connecting);
         
-        if (ksocknal_tunables.ksnd_typed_conns)
+        if (ksocknal_data.ksnd_typed_conns)
                 route->ksnr_connecting = 
                         KSNR_TYPED_ROUTES & ~route->ksnr_connected;
         else
@@ -800,7 +797,7 @@ ksocknal_find_conn_locked (ksock_tx_t *tx, ksock_peer_t *peer)
                         fnob     = nob;
                 }
 
-                if (!ksocknal_tunables.ksnd_typed_conns)
+                if (!ksocknal_data.ksnd_typed_conns)
                         continue;
 
                 switch (c->ksnc_type) {
@@ -811,11 +808,11 @@ ksocknal_find_conn_locked (ksock_tx_t *tx, ksock_peer_t *peer)
                 case SOCKNAL_CONN_BULK_IN:
                         continue;
                 case SOCKNAL_CONN_BULK_OUT:
-                        if (tx->tx_nob < ksocknal_tunables.ksnd_min_bulk)
+                        if (tx->tx_nob < ksocknal_data.ksnd_min_bulk)
                                 continue;
                         break;
                 case SOCKNAL_CONN_CONTROL:
-                        if (tx->tx_nob >= ksocknal_tunables.ksnd_min_bulk)
+                        if (tx->tx_nob >= ksocknal_data.ksnd_min_bulk)
                                 continue;
                         break;
                 }
@@ -859,7 +856,7 @@ ksocknal_queue_tx_locked (ksock_tx_t *tx, ksock_conn_t *conn)
         spin_lock_irqsave (&sched->kss_lock, flags);
 
         conn->ksnc_tx_deadline = jiffies + 
-                                 ksocknal_tunables.ksnd_io_timeout * HZ;
+                                 ksocknal_data.ksnd_io_timeout * HZ;
         mb();                                   /* order with list_add_tail */
 
         list_add_tail (&tx->tx_list, &conn->ksnc_tx_queue);
@@ -2185,7 +2182,7 @@ ksocknal_setup_sock (struct socket *sock)
         /* Keepalives: If 3/4 of the timeout elapses, start probing every
          * second until the timeout elapses. */
 
-        option = (ksocknal_tunables.ksnd_io_timeout * 3) / 4;
+        option = (ksocknal_data.ksnd_io_timeout * 3) / 4;
         set_fs (KERNEL_DS);
         rc = sock->ops->setsockopt (sock, SOL_TCP, TCP_KEEPIDLE,
                                     (char *)&option, sizeof (option));
@@ -2205,7 +2202,7 @@ ksocknal_setup_sock (struct socket *sock)
                 return (rc);
         }
         
-        option = ksocknal_tunables.ksnd_io_timeout / 4;
+        option = ksocknal_data.ksnd_io_timeout / 4;
         set_fs (KERNEL_DS);
         rc = sock->ops->setsockopt (sock, SOL_TCP, TCP_KEEPCNT,
                                     (char *)&option, sizeof (option));
@@ -2262,7 +2259,7 @@ ksocknal_connect_peer (ksock_route_t *route, int type)
 
         /* Set the socket timeouts, so our connection attempt completes in
          * finite time */
-        tv.tv_sec = ksocknal_tunables.ksnd_io_timeout;
+        tv.tv_sec = ksocknal_data.ksnd_io_timeout;
         tv.tv_usec = 0;
 
         set_fs (KERNEL_DS);
@@ -2271,7 +2268,7 @@ ksocknal_connect_peer (ksock_route_t *route, int type)
         set_fs (oldmm);
         if (rc != 0) {
                 CERROR ("Can't set send timeout %d: %d\n", 
-                        ksocknal_tunables.ksnd_io_timeout, rc);
+                        ksocknal_data.ksnd_io_timeout, rc);
                 goto out;
         }
         
@@ -2281,7 +2278,7 @@ ksocknal_connect_peer (ksock_route_t *route, int type)
         set_fs (oldmm);
         if (rc != 0) {
                 CERROR ("Can't set receive timeout %d: %d\n",
-                        ksocknal_tunables.ksnd_io_timeout, rc);
+                        ksocknal_data.ksnd_io_timeout, rc);
                 goto out;
         }
 
@@ -2655,9 +2652,9 @@ ksocknal_reaper (void *arg)
                          * timeout on any connection within (n+1)/n times the
                          * timeout interval. */
 
-                        if (ksocknal_tunables.ksnd_io_timeout > n * p)
+                        if (ksocknal_data.ksnd_io_timeout > n * p)
                                 chunk = (chunk * n * p) / 
-                                        ksocknal_tunables.ksnd_io_timeout;
+                                        ksocknal_data.ksnd_io_timeout;
                         if (chunk == 0)
                                 chunk = 1;
 
diff --git a/lnet/libcfs/.cvsignore b/lnet/libcfs/.cvsignore
index c6f0aa4..7fa686f 100644
--- a/lnet/libcfs/.cvsignore
+++ b/lnet/libcfs/.cvsignore
@@ -1,11 +1,5 @@
 .deps
 Makefile
+Makefile.in
 link-stamp
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+.*.o.cmd
diff --git a/lnet/libcfs/Makefile.am b/lnet/libcfs/Makefile.am
new file mode 100644
index 0000000..4f0b303
--- /dev/null
+++ b/lnet/libcfs/Makefile.am
@@ -0,0 +1,20 @@
+# Copyright (C) 2001, 2002 Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+
+MODULE = libcfs
+modulenet_DATA = libcfs.o
+EXTRA_PROGRAMS = libcfs
+
+DISTCLEANFILES = *.orig *.rej
+
+DEFS =
+libcfs_SOURCES = module.c proc.c debug.c lwt.c
+
+# Don't distribute any patched files.
+dist-hook:
+	list='$(EXT2C)'; for f in $$list; do rm -f $(distdir)/$$f; done
+
+include ../Rules.linux
diff --git a/lnet/libcfs/Makefile.in b/lnet/libcfs/Makefile.in
deleted file mode 100644
index 6f9c981..0000000
--- a/lnet/libcfs/Makefile.in
+++ /dev/null
@@ -1,4 +0,0 @@
-MODULES = libcfs
-libcfs-objs := debug.o lwt.o module.o proc.o
-
-@INCLUDE_RULES@
diff --git a/lnet/libcfs/autoMakefile.am b/lnet/libcfs/autoMakefile.am
deleted file mode 100644
index 192c3ef..0000000
--- a/lnet/libcfs/autoMakefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (C) 2001, 2002 Cluster File Systems, Inc.
-#
-# This code is issued under the GNU General Public License.
-# See the file COPYING in this distribution
-
-if MODULES
-modulenet_DATA := libcfs$(KMODEXT)
-endif
-
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-DIST_SOURCES = $(libcfs-objs:%.o=%.c)
diff --git a/lnet/libcfs/debug.c b/lnet/libcfs/debug.c
index 2fb06dd..be117b8 100644
--- a/lnet/libcfs/debug.c
+++ b/lnet/libcfs/debug.c
@@ -45,7 +45,6 @@
 #include <asm/uaccess.h>
 #include <asm/segment.h>
 #include <linux/miscdevice.h>
-#include <linux/version.h>
 
 # define DEBUG_SUBSYSTEM S_PORTALS
 
@@ -53,16 +52,12 @@
 #include <linux/portals_compat25.h>
 #include <linux/libcfs.h>
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-#include <linux/kallsyms.h>
-#endif
-
 unsigned int portal_subsystem_debug = ~0 - (S_PORTALS | S_QSWNAL | S_SOCKNAL |
                                             S_GMNAL | S_IBNAL);
 EXPORT_SYMBOL(portal_subsystem_debug);
 
 unsigned int portal_debug = (D_WARNING | D_DLMTRACE | D_ERROR | D_EMERG | D_HA |
-                             D_RPCTRACE | D_VFSTRACE);
+                             D_RPCTRACE | D_VFSTRACE | 0xffffffff);
 EXPORT_SYMBOL(portal_debug);
 
 unsigned int portal_cerror = 1;
@@ -84,7 +79,7 @@ static char *debug_buf = NULL;
 static unsigned long debug_size = 0;
 static atomic_t debug_off_a = ATOMIC_INIT(0);
 static int debug_wrapped;
-static DECLARE_WAIT_QUEUE_HEAD(debug_ctlwq);
+wait_queue_head_t debug_ctlwq;
 #define DAEMON_SND_SIZE      (64 << 10)
 
 /*
@@ -271,7 +266,7 @@ int portals_do_debug_dumplog(void *arg)
                        PTR_ERR(file));
                 GOTO(out, PTR_ERR(file));
         } else {
-                printk(KERN_ALERT "LustreError: dumping log to %s ...\n",
+                printk(KERN_ALERT "LustreError: dumping log to %s ... writing ...\n",
                        debug_file_name);
         }
 
@@ -444,26 +439,18 @@ void portals_debug_print(void)
 void portals_debug_dumplog(void)
 {
         int rc;
-        DECLARE_WAITQUEUE(wait, current);
         ENTRY;
 
-        /* we're being careful to ensure that the kernel thread is
-         * able to set our state to running as it exits before we
-         * get to schedule() */
-        set_current_state(TASK_INTERRUPTIBLE);
-        add_wait_queue(&debug_ctlwq, &wait);
+        init_waitqueue_head(&debug_ctlwq);
 
         rc = kernel_thread(portals_do_debug_dumplog,
                            NULL, CLONE_VM | CLONE_FS | CLONE_FILES);
-        if (rc < 0)
+        if (rc < 0) {
                 printk(KERN_ERR "LustreError: cannot start log dump thread: "
                        "%d\n", rc);
-        else
-                schedule();
-
-        /* be sure to teardown if kernel_thread() failed */
-        remove_wait_queue(&debug_ctlwq, &wait);
-        set_current_state(TASK_RUNNING);
+                return;
+        }
+        sleep_on(&debug_ctlwq);
 }
 
 int portals_debug_daemon_start(char *file, unsigned int size)
@@ -605,7 +592,7 @@ int portals_debug_init(unsigned long bufsize)
         debug_buf = vmalloc(bufsize + DEBUG_OVERFLOW);
         if (debug_buf == NULL)
                 return -ENOMEM;
-        memset(debug_buf, 0, bufsize + DEBUG_OVERFLOW);
+        memset(debug_buf, 0, debug_size);
         debug_wrapped = 0;
 
         //printk(KERN_INFO "Portals: allocated %lu byte debug buffer at %p.\n",
@@ -699,7 +686,7 @@ __s32 portals_debug_copy_to_user(char *buf, unsigned long len)
                         rc = -ENOMEM;
                         goto cleanup;
                 }
-                list_add(&PAGE_LIST(page), &my_pages);
+                list_add(&page->list, &my_pages);
         }
 
         spin_lock_irqsave(&portals_debug_lock, flags);
@@ -724,7 +711,7 @@ __s32 portals_debug_copy_to_user(char *buf, unsigned long len)
                 unsigned long to_copy;
                 void *addr;
 
-                page = list_entry(pos, struct page, PAGE_LIST_ENTRY);
+                page = list_entry(pos, struct page, list);
                 to_copy = min(total - off, PAGE_SIZE);
                 if (to_copy == 0) {
                         off = 0;
@@ -753,7 +740,7 @@ finish_partial:
         off = 0;
         list_for_each(pos, &my_pages) {
                 unsigned long to_copy;
-                page = list_entry(pos, struct page, PAGE_LIST_ENTRY);
+                page = list_entry(pos, struct page, list);
 
                 to_copy = min(copied - off, PAGE_SIZE);
                 rc = copy_to_user(buf + off, kmap(page), to_copy);
@@ -770,8 +757,8 @@ finish_partial:
 
 cleanup:
         list_for_each_safe(pos, n, &my_pages) {
-                page = list_entry(pos, struct page, PAGE_LIST_ENTRY);
-                list_del(&PAGE_LIST(page));
+                page = list_entry(pos, struct page, list);
+                list_del(&page->list);
                 __free_page(page);
         }
         return rc;
@@ -962,26 +949,23 @@ void portals_run_lbug_upcall(char *file, const char *fn, const int line)
 char *portals_nid2str(int nal, ptl_nid_t nid, char *str)
 {
         switch(nal){
-/* XXX this could be a nal method of some sort, 'cept it's config
- * dependent whether (say) socknal NIDs are actually IP addresses... */
+/* XXX this should be a nal method of some sort */
 #ifndef CRAY_PORTALS 
         case TCPNAL:
                 /* userspace NAL */
         case SOCKNAL:
-                snprintf(str, PTL_NALFMT_SIZE - 1, "%u:%u.%u.%u.%u",
-                         (__u32)(nid >> 32), HIPQUAD(nid));
+                sprintf(str, "%u:%d.%d.%d.%d", (__u32)(nid >> 32),
+                        HIPQUAD(nid));
                 break;
         case QSWNAL:
         case GMNAL:
         case IBNAL:
-                snprintf(str, PTL_NALFMT_SIZE - 1, "%u:%u",
-                         (__u32)(nid >> 32), (__u32)nid);
+        case SCIMACNAL:
+                sprintf(str, "%u:%u", (__u32)(nid >> 32), (__u32)nid);
                 break;
 #endif
         default:
-                snprintf(str, PTL_NALFMT_SIZE - 1, "?%d? %llx",
-                         nal, (long long)nid);
-                break;
+                snprintf(str, PTL_NALFMT_SIZE-1, "(?%llx)", (long long)nid);
         }
         return str;
 }
@@ -992,6 +976,8 @@ spinlock_t stack_backtrace_lock = SPIN_LOCK_UNLOCKED;
 
 #if defined(__arch_um__)
 
+extern int is_kernel_text_address(unsigned long addr);
+
 char *portals_debug_dumpstack(void)
 {
         asm("int $3");
@@ -1000,45 +986,33 @@ char *portals_debug_dumpstack(void)
 
 #elif defined(__i386__)
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
+extern int is_kernel_text_address(unsigned long addr);
 extern int lookup_symbol(unsigned long address, char *buf, int buflen);
-const char *kallsyms_lookup(unsigned long addr,
-                            unsigned long *symbolsize,
-                            unsigned long *offset,
-                            char **modname, char *namebuf)
-{
-        int rc = lookup_symbol(addr, namebuf, 128);
-        if (rc == -ENOSYS)
-                return NULL;
-        return namebuf;
-}
-#endif
 
 char *portals_debug_dumpstack(void)
 {
-        unsigned long esp = current->thread.esp, addr;
+        unsigned long esp = current->thread.esp;
         unsigned long *stack = (unsigned long *)&esp;
-        char *buf = stack_backtrace, *pbuf = buf;
         int size;
+        unsigned long addr;
+        char *buf = stack_backtrace;
+        char *pbuf = buf;
+        static char buffer[512];
+        int rc = 0;
 
         /* User space on another CPU? */
-        if ((esp ^ (unsigned long)current) & (PAGE_MASK << 1)){
+        if ((esp ^ (unsigned long)current) & (PAGE_MASK<<1)){
                 buf[0] = '\0';
                 goto out;
         }
 
         size = sprintf(pbuf, " Call Trace: ");
         pbuf += size;
-        while (((long) stack & (THREAD_SIZE - 1)) != 0) {
+        while (((long) stack & (THREAD_SIZE-1)) != 0) {
                 addr = *stack++;
-                if (kernel_text_address(addr)) {
-                        const char *sym_name;
-                        char *modname, buffer[128];
-                        unsigned long junk, offset;
-
-                        sym_name = kallsyms_lookup(addr, &junk, &offset,
-                                                   &modname, buffer);
-                        if (sym_name == NULL) {
+                if (is_kernel_text_address(addr)) {
+                        rc = lookup_symbol(addr, buffer, 512);
+                        if (rc == -ENOSYS) {
                                 if (buf + LUSTRE_TRACE_SIZE <= pbuf + 12)
                                         break;
                                 size = sprintf(pbuf, "[<%08lx>] ", addr);
@@ -1048,7 +1022,7 @@ char *portals_debug_dumpstack(void)
                                     <= pbuf + strlen(buffer) + 28 + 1)
                                         break;
                                 size = sprintf(pbuf, "([<%08lx>] %s (0x%p)) ",
-                                               addr, buffer, stack - 1);
+                                               addr, buffer, stack-1);
                         }
                         pbuf += size;
                 }
diff --git a/lnet/libcfs/module.c b/lnet/libcfs/module.c
index 4e63c86..9daa8e0 100644
--- a/lnet/libcfs/module.c
+++ b/lnet/libcfs/module.c
@@ -51,13 +51,7 @@
 
 #define PORTAL_MINOR 240
 
-struct nal_cmd_handler {
-        nal_cmd_handler_fn  *nch_handler;
-        void                *nch_private;
-};
-
-static struct nal_cmd_handler nal_cmd[NAL_MAX_NR + 1];
-static DECLARE_MUTEX(nal_cmd_sem);
+extern void (kping_client)(struct portal_ioctl_data *);
 
 #ifdef PORTAL_DEBUG
 void kportal_assertion_failed(char *expr, char *file, const char *func,
@@ -245,62 +239,6 @@ static inline void freedata(void *data, int len)
         PORTAL_FREE(data, len);
 }
 
-int
-libcfs_nal_cmd_register(int nal, nal_cmd_handler_fn *handler, void *private)
-{
-        int rc = 0;
-
-        CDEBUG(D_IOCTL, "Register NAL %d, handler: %p\n", nal, handler);
-
-        if (nal > 0  && nal <= NAL_MAX_NR) {
-                down(&nal_cmd_sem);
-                if (nal_cmd[nal].nch_handler != NULL)
-                        rc = -EBUSY;
-                else {
-                        nal_cmd[nal].nch_handler = handler;
-                        nal_cmd[nal].nch_private = private;
-                }
-                up(&nal_cmd_sem);
-        }
-        return rc;
-}
-EXPORT_SYMBOL(libcfs_nal_cmd_register);
-
-void
-libcfs_nal_cmd_unregister(int nal)
-{
-        CDEBUG(D_IOCTL, "Unregister NAL %d\n", nal);
-
-        LASSERT(nal > 0 && nal <= NAL_MAX_NR);
-        LASSERT(nal_cmd[nal].nch_handler != NULL);
-
-        down(&nal_cmd_sem);
-        nal_cmd[nal].nch_handler = NULL;
-        nal_cmd[nal].nch_private = NULL;
-        up(&nal_cmd_sem);
-}
-EXPORT_SYMBOL(libcfs_nal_cmd_unregister);
-
-int
-libcfs_nal_cmd(struct portals_cfg *pcfg)
-{
-        __u32 nal = pcfg->pcfg_nal;
-        int   rc = -EINVAL;
-        ENTRY;
-
-        down(&nal_cmd_sem);
-        if (nal > 0 && nal <= NAL_MAX_NR && 
-            nal_cmd[nal].nch_handler != NULL) {
-                CDEBUG(D_IOCTL, "calling handler nal: %d, cmd: %d\n", nal, 
-                       pcfg->pcfg_command);
-                rc = nal_cmd[nal].nch_handler(pcfg, nal_cmd[nal].nch_private);
-        }
-        up(&nal_cmd_sem);
-
-        RETURN(rc);
-}
-EXPORT_SYMBOL(libcfs_nal_cmd);
-
 static DECLARE_RWSEM(ioctl_list_sem);
 static LIST_HEAD(ioctl_list);
 
@@ -401,22 +339,14 @@ static int libcfs_ioctl(struct inode *inode, struct file *file,
                 err = lwt_control (data->ioc_flags, data->ioc_misc);
                 break;
                 
-        case IOC_PORTAL_LWT_SNAPSHOT: {
-                cycles_t   now;
-                int        ncpu;
-                int        total_size;
-                
-                err = lwt_snapshot (&now, &ncpu, &total_size,
+        case IOC_PORTAL_LWT_SNAPSHOT:
+                err = lwt_snapshot (&data->ioc_nid,
+                                    &data->ioc_count, &data->ioc_misc,
                                     data->ioc_pbuf1, data->ioc_plen1);
-                data->ioc_nid = now;
-                data->ioc_count = ncpu;
-                data->ioc_misc = total_size;
-
                 if (err == 0 &&
                     copy_to_user((char *)arg, data, sizeof (*data)))
                         err = -EFAULT;
                 break;
-        }
                 
         case IOC_PORTAL_LWT_LOOKUP_STRING:
                 err = lwt_lookup_string (&data->ioc_count, data->ioc_pbuf1,
@@ -426,33 +356,6 @@ static int libcfs_ioctl(struct inode *inode, struct file *file,
                         err = -EFAULT;
                 break;
 #endif
-        case IOC_PORTAL_NAL_CMD: {
-                struct portals_cfg pcfg;
-
-                if (data->ioc_plen1 != sizeof(pcfg)) {
-                        CERROR("Bad ioc_plen1 %d (wanted %d)\n",
-                               data->ioc_plen1, sizeof(pcfg));
-                        err = -EINVAL;
-                        break;
-                }
-
-                if (copy_from_user(&pcfg, (void *)data->ioc_pbuf1, 
-                                   sizeof(pcfg))) {
-                        err = -EFAULT;
-                        break;
-                }
-
-                CDEBUG (D_IOCTL, "nal command nal %d cmd %d\n", pcfg.pcfg_nal,
-                        pcfg.pcfg_command);
-                err = libcfs_nal_cmd(&pcfg);
-
-                if (err == 0 &&
-                    copy_to_user((char *)data->ioc_pbuf1, &pcfg, 
-                                 sizeof (pcfg)))
-                        err = -EFAULT;
-                break;
-        }
-
         case IOC_PORTAL_MEMHOG:
                 if (!capable (CAP_SYS_ADMIN))
                         err = -EPERM;
diff --git a/lnet/libcfs/proc.c b/lnet/libcfs/proc.c
index c850f69..c1b2aec 100644
--- a/lnet/libcfs/proc.c
+++ b/lnet/libcfs/proc.c
@@ -62,18 +62,16 @@ extern char debug_daemon_file_path[1024];
 extern char portals_upcall[1024];
 
 #define PSDEV_PORTALS  (0x100)
-enum {
-        PSDEV_DEBUG = 1,          /* control debugging */
-        PSDEV_SUBSYSTEM_DEBUG,    /* control debugging */
-        PSDEV_PRINTK,             /* force all errors to console */
-        PSDEV_CONSOLE,            /* allow _any_ messages to console */
-        PSDEV_DEBUG_PATH,         /* crashdump log location */
-        PSDEV_DEBUG_DUMP_PATH,    /* crashdump tracelog location */
-        PSDEV_PORTALS_UPCALL,     /* User mode upcall script  */
-        PSDEV_PORTALS_MEMUSED,    /* bytes currently PORTAL_ALLOCated */
-};
-
-static struct ctl_table portals_table[] = {
+#define PSDEV_DEBUG           1   /* control debugging */
+#define PSDEV_SUBSYSTEM_DEBUG 2   /* control debugging */
+#define PSDEV_PRINTK          3   /* force all errors to console */
+#define PSDEV_CONSOLE         4   /* allow _any_ messages to console */
+#define PSDEV_DEBUG_PATH      5   /* crashdump log location */
+#define PSDEV_DEBUG_DUMP_PATH 6   /* crashdump tracelog location */
+#define PSDEV_PORTALS_UPCALL  7   /* User mode upcall script  */
+
+#define PORTALS_PRIMARY_CTLCNT 7
+static struct ctl_table portals_table[PORTALS_PRIMARY_CTLCNT + 1] = {
         {PSDEV_DEBUG, "debug", &portal_debug, sizeof(int), 0644, NULL,
          &proc_dointvec},
         {PSDEV_SUBSYSTEM_DEBUG, "subsystem_debug", &portal_subsystem_debug,
@@ -90,8 +88,6 @@ static struct ctl_table portals_table[] = {
         {PSDEV_PORTALS_UPCALL, "upcall", portals_upcall,
          sizeof(portals_upcall), 0644, NULL, &proc_dostring,
          &sysctl_string},
-        {PSDEV_PORTALS_MEMUSED, "memused", (int *)&portal_kmemory.counter,
-         sizeof(int), 0644, NULL, &proc_dointvec},
         {0}
 };
 
diff --git a/lnet/lnet/.cvsignore b/lnet/lnet/.cvsignore
index 5ed596b..95973d6 100644
--- a/lnet/lnet/.cvsignore
+++ b/lnet/lnet/.cvsignore
@@ -1,10 +1,4 @@
 .deps
 Makefile
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+Makefile.in
+.*.o.cmd
diff --git a/lnet/lnet/autoMakefile.am b/lnet/lnet/Makefile.am
similarity index 57%
rename from lnet/lnet/autoMakefile.am
rename to lnet/lnet/Makefile.am
index bf7a107..59f9dd9 100644
--- a/lnet/lnet/autoMakefile.am
+++ b/lnet/lnet/Makefile.am
@@ -3,24 +3,30 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
+DEFS =
+
 my_sources = api-eq.c api-init.c api-me.c api-errno.c api-ni.c api-wrap.c \
 		lib-dispatch.c lib-init.c lib-me.c lib-msg.c lib-eq.c \
 		lib-md.c lib-move.c lib-ni.c lib-pid.c
 
-if !CRAY_PORTALS
-
-if LIBLUSTRE
 noinst_LIBRARIES= libportals.a
 libportals_a_SOURCES= $(my_sources)
-libportals_a_CPPFLAGS = $(LLCPPFLAGS)
-libportals_a_CFLAGS = $(LLCFLAGS)
-endif
 
-if MODULES
-modulenet_DATA = portals$(KMODEXT)
-endif # MODULES
+if LIBLUSTRE
+libportals_a_CFLAGS= -fPIC
+else
 
-endif # CRAY_PORTALS
+MODULE = portals
+modulenet_DATA = portals.o
+EXTRA_PROGRAMS = portals
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-DIST_SOURCES = $(portals-objs:%.o=%.c)
+DISTCLEANFILES = *.orig *.rej
+
+portals_SOURCES= module.c $(my_sources)
+
+# Don't distribute any patched files.
+dist-hook:
+	list='$(EXT2C)'; for f in $$list; do rm -f $(distdir)/$$f; done
+
+include ../Rules.linux
+endif
diff --git a/lnet/lnet/Makefile.in b/lnet/lnet/Makefile.in
deleted file mode 100644
index 6ce334b..0000000
--- a/lnet/lnet/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-MODULES := portals
-portals-objs := api-eq.o api-init.o api-me.o api-errno.o api-ni.o api-wrap.o
-portals-objs += lib-dispatch.o lib-init.o lib-me.o lib-msg.o lib-eq.o lib-md.o
-portals-objs += lib-move.o lib-ni.o lib-pid.o module.o
-
-@INCLUDE_RULES@
diff --git a/lnet/lnet/api-eq.c b/lnet/lnet/api-eq.c
index 0306043..390156a 100644
--- a/lnet/lnet/api-eq.c
+++ b/lnet/lnet/api-eq.c
@@ -23,9 +23,30 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#define DEBUG_SUBSYSTEM S_PORTALS
 #include <portals/api-support.h>
 
+int ptl_eq_init(void)
+{
+        /* Nothing to do anymore... */
+        return PTL_OK;
+}
+
+void ptl_eq_fini(void)
+{
+        /* Nothing to do anymore... */
+}
+
+int ptl_eq_ni_init(nal_t * nal)
+{
+        /* Nothing to do anymore... */
+        return PTL_OK;
+}
+
+void ptl_eq_ni_fini(nal_t * nal)
+{
+        /* Nothing to do anymore... */
+}
+
 int ptl_get_event (ptl_eq_t *eq, ptl_event_t *ev)
 {
         int          new_index = eq->sequence & (eq->size - 1);
diff --git a/lnet/lnet/api-errno.c b/lnet/lnet/api-errno.c
index 1c01c88..0e155da 100644
--- a/lnet/lnet/api-errno.c
+++ b/lnet/lnet/api-errno.c
@@ -36,7 +36,8 @@ const char *ptl_err_str[] = {
         "PTL_MD_NO_UPDATE",
         "PTL_FAIL",
 
-        "PTL_IOV_INVALID",
+        "PTL_IOV_TOO_MANY",
+        "PTL_IOV_TOO_SMALL",
 
         "PTL_EQ_IN_USE",
 
diff --git a/lnet/lnet/api-init.c b/lnet/lnet/api-init.c
index 9a98714..e41bad8 100644
--- a/lnet/lnet/api-init.c
+++ b/lnet/lnet/api-init.c
@@ -23,23 +23,43 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#define DEBUG_SUBSYSTEM S_PORTALS
 #include <portals/api-support.h>
 
+int ptl_init;
+
+int __p30_initialized;
+int __p30_myr_initialized;
+int __p30_ip_initialized;
+ptl_handle_ni_t __myr_ni_handle;
+ptl_handle_ni_t __ip_ni_handle;
+
 int PtlInit(int *max_interfaces)
 {
         if (max_interfaces != NULL)
-                *max_interfaces = NAL_MAX_NR;
+                *max_interfaces = NAL_ENUM_END_MARKER;
+
+        if (ptl_init)
+                return PTL_OK;
 
         LASSERT(!strcmp(ptl_err_str[PTL_MAX_ERRNO], "PTL_MAX_ERRNO"));
 
-        return ptl_ni_init();
+        ptl_ni_init();
+        ptl_me_init();
+        ptl_eq_init();
+        ptl_init = 1;
+
+        return PTL_OK;
 }
 
 
 void PtlFini(void)
 {
+
+        /* Reverse order of initialization */
+        ptl_eq_fini();
+        ptl_me_fini();
         ptl_ni_fini();
+        ptl_init = 0;
 }
 
 
diff --git a/lnet/lnet/api-me.c b/lnet/lnet/api-me.c
index 37f0150..e724e58 100644
--- a/lnet/lnet/api-me.c
+++ b/lnet/lnet/api-me.c
@@ -23,6 +23,20 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#define DEBUG_SUBSYSTEM S_PORTALS
 #include <portals/api-support.h>
 
+int ptl_me_init(void)
+{
+        return PTL_OK;
+}
+void ptl_me_fini(void)
+{                                /* Nothing to do */
+}
+int ptl_me_ni_init(nal_t * nal)
+{
+        return PTL_OK;
+}
+
+void ptl_me_ni_fini(nal_t * nal)
+{                                /* Nothing to do... */
+}
diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c
index 4f37d13..02082c6 100644
--- a/lnet/lnet/api-ni.c
+++ b/lnet/lnet/api-ni.c
@@ -23,39 +23,15 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#define DEBUG_SUBSYSTEM S_PORTALS
 #include <portals/api-support.h>
 
-int ptl_init;
-
 /* Put some magic in the NI handle so uninitialised/zeroed handles are easy
  * to spot */
 #define NI_HANDLE_MAGIC  0xebc0de00
 #define NI_HANDLE_MASK   0x000000ff
-
-static struct nal_t *ptl_nal_table[NAL_MAX_NR];
-
-#ifdef __KERNEL__
-DECLARE_MUTEX(ptl_mutex);
-
-static void ptl_mutex_enter (void) 
-{
-        down (&ptl_mutex);
-}
-
-static void ptl_mutex_exit (void)
-{
-        up (&ptl_mutex);
-}
-#else
-static void ptl_mutex_enter (void)
-{
-}
-
-static void ptl_mutex_exit (void) 
-{
-}
-#endif
+#define MAX_NIS          8         
+static nal_t *ptl_interfaces[MAX_NIS];
+int ptl_num_interfaces = 0;
 
 nal_t *ptl_hndl2nal(ptl_handle_any_t *handle)
 {
@@ -70,188 +46,147 @@ nal_t *ptl_hndl2nal(ptl_handle_any_t *handle)
                 return NULL;
 
         idx &= NI_HANDLE_MASK;
-        
-        if (idx >= NAL_MAX_NR ||
-            ptl_nal_table[idx] == NULL ||
-            ptl_nal_table[idx]->nal_refct == 0)
-                return NULL;
+        if (idx < MAX_NIS)
+                return ptl_interfaces[idx];
 
-        return ptl_nal_table[idx];
+        return NULL;
 }
 
-int ptl_register_nal (ptl_interface_t interface, nal_t *nal)
+int ptl_ni_init(void)
 {
-        int    rc;
-        
-        ptl_mutex_enter();
+        int i;
+
+        LASSERT (MAX_NIS <= (NI_HANDLE_MASK + 1));
         
-        if (interface < 0 || interface >= NAL_MAX_NR)
-                rc = PTL_IFACE_INVALID;
-        else if (ptl_nal_table[interface] != NULL)
-                rc = PTL_IFACE_DUP;
-        else {
-                rc = PTL_OK;
-                ptl_nal_table[interface] = nal;
-                LASSERT(nal->nal_refct == 0);
-        }
+        for (i = 0; i < MAX_NIS; i++)
+                ptl_interfaces[i] = NULL;
 
-        ptl_mutex_exit();
-        return (rc);
+        return PTL_OK;
 }
 
-void ptl_unregister_nal (ptl_interface_t interface)
+void ptl_ni_fini(void)
 {
-        LASSERT(interface >= 0 && interface < NAL_MAX_NR);
-        LASSERT(ptl_nal_table[interface] != NULL);
-        LASSERT(ptl_nal_table[interface]->nal_refct == 0);
-        
-        ptl_mutex_enter();
-        
-        ptl_nal_table[interface] = NULL;
+        int i;
 
-        ptl_mutex_exit();
+        for (i = 0; i < MAX_NIS; i++) {
+                nal_t *nal = ptl_interfaces[i];
+                if (!nal)
+                        continue;
+
+                if (nal->shutdown)
+                        nal->shutdown(nal, i);
+        }
 }
 
-int ptl_ni_init(void)
+#ifdef __KERNEL__
+DECLARE_MUTEX(ptl_ni_init_mutex);
+
+static void ptl_ni_init_mutex_enter (void) 
 {
-        /* If this assertion fails, we need more bits in NI_HANDLE_MASK and
-         * to shift NI_HANDLE_MAGIC left appropriately */
-        LASSERT (NAL_MAX_NR <= (NI_HANDLE_MASK + 1));
-        
-        ptl_mutex_enter();
-
-        if (!ptl_init) {
-                /* NULL pointers, clear flags */
-                memset(ptl_nal_table, 0, sizeof(ptl_nal_table));
-#ifndef __KERNEL__
-                /* Kernel NALs register themselves when their module loads,
-                 * and unregister themselves when their module is unloaded.
-                 * Userspace NALs, are plugged in explicitly here... */
-                {
-                        extern nal_t procapi_nal;
-
-                        /* XXX pretend it's socknal to keep liblustre happy... */
-                        ptl_nal_table[SOCKNAL] = &procapi_nal;
-                        LASSERT (procapi_nal.nal_refct == 0);
-                }
-#endif
-                ptl_init = 1;
-        }
+        down (&ptl_ni_init_mutex);
+}
 
-        ptl_mutex_exit();
-        
-        return PTL_OK;
+static void ptl_ni_init_mutex_exit (void)
+{
+        up (&ptl_ni_init_mutex);
 }
 
-void ptl_ni_fini(void)
+#else
+static void ptl_ni_init_mutex_enter (void)
 {
-        nal_t  *nal;
-        int     i;
-
-        ptl_mutex_enter();
-
-        if (ptl_init) {
-                for (i = 0; i < NAL_MAX_NR; i++) {
-
-                        nal = ptl_nal_table[i];
-                        if (nal == NULL)
-                                continue;
-                        
-                        if (nal->nal_refct != 0) {
-                                CWARN("NAL %d has outstanding refcount %d\n",
-                                      i, nal->nal_refct);
-                                nal->shutdown(nal);
-                        }
-                        
-                        ptl_nal_table[i] = NULL;
-                }
+}
 
-                ptl_init = 0;
-        }
-        
-        ptl_mutex_exit();
+static void ptl_ni_init_mutex_exit (void) 
+{
 }
 
-int PtlNIInit(ptl_interface_t interface, ptl_pid_t requested_pid,
-              ptl_ni_limits_t *desired_limits, ptl_ni_limits_t *actual_limits,
-              ptl_handle_ni_t *handle)
+#endif
+
+int PtlNIInit(ptl_interface_t interface, ptl_pt_index_t ptl_size,
+              ptl_ac_index_t acl_size, ptl_pid_t requested_pid,
+              ptl_handle_ni_t * handle)
 {
         nal_t *nal;
-        int    i;
-        int    rc;
+        int i;
 
         if (!ptl_init)
                 return PTL_NO_INIT;
 
-        ptl_mutex_enter ();
+        ptl_ni_init_mutex_enter ();
 
-        if (interface == PTL_IFACE_DEFAULT) {
-                for (i = 0; i < NAL_MAX_NR; i++)
-                        if (ptl_nal_table[i] != NULL) {
-                                interface = i;
-                                break;
-                        }
-                /* NB if no interfaces are registered, 'interface' will
-                 * fail the valid test below */
+        nal = interface(ptl_num_interfaces, ptl_size, acl_size, requested_pid);
+
+        if (!nal) {
+                ptl_ni_init_mutex_exit ();
+                return PTL_NAL_FAILED;
         }
-        
-        if (interface < 0 || 
-            interface >= NAL_MAX_NR ||
-            ptl_nal_table[interface] == NULL) {
-                GOTO(out, rc = PTL_IFACE_INVALID);
+
+        for (i = 0; i < ptl_num_interfaces; i++) {
+                if (ptl_interfaces[i] == nal) {
+                        nal->refct++;
+                        handle->nal_idx = (NI_HANDLE_MAGIC & ~NI_HANDLE_MASK) | i;
+                        CDEBUG(D_OTHER, "Returning existing NAL (%d)\n", i);
+                        ptl_ni_init_mutex_exit ();
+                        return PTL_OK;
+                }
         }
+        nal->refct = 1;
 
-        nal = ptl_nal_table[interface];
+        if (ptl_num_interfaces >= MAX_NIS) {
+                if (nal->shutdown)
+                        nal->shutdown (nal, ptl_num_interfaces);
+                ptl_ni_init_mutex_exit ();
+                return PTL_NO_SPACE;
+        }
 
-        CDEBUG(D_OTHER, "Starting up NAL (%d) refs %d\n", interface, nal->nal_refct);
-        rc = nal->startup(nal, requested_pid, desired_limits, actual_limits);
+        handle->nal_idx = (NI_HANDLE_MAGIC & ~NI_HANDLE_MASK) | ptl_num_interfaces;
+        ptl_interfaces[ptl_num_interfaces++] = nal;
 
-        if (rc != PTL_OK) {
-                CERROR("Error %d starting up NAL %d, refs %d\n", rc,
-                       interface, nal->nal_refct);
-                GOTO(out, rc);
-        }
-        
-        if (nal->nal_refct != 0) {
-                /* Caller gets to know if this was the first ref or not */
-                rc = PTL_IFACE_DUP;
-        }
-        
-        nal->nal_refct++;
-        handle->nal_idx = (NI_HANDLE_MAGIC & ~NI_HANDLE_MASK) | interface;
+        ptl_eq_ni_init(nal);
+        ptl_me_ni_init(nal);
 
- out:
-        ptl_mutex_exit ();
-        return rc;
+        ptl_ni_init_mutex_exit ();
+        return PTL_OK;
 }
 
+
 int PtlNIFini(ptl_handle_ni_t ni)
 {
         nal_t *nal;
-        int    idx;
+        int idx;
+        int rc;
 
         if (!ptl_init)
                 return PTL_NO_INIT;
 
-        ptl_mutex_enter ();
+        ptl_ni_init_mutex_enter ();
 
         nal = ptl_hndl2nal (&ni);
         if (nal == NULL) {
-                ptl_mutex_exit ();
+                ptl_ni_init_mutex_exit ();
                 return PTL_HANDLE_INVALID;
         }
 
         idx = ni.nal_idx & NI_HANDLE_MASK;
 
-        LASSERT(nal->nal_refct > 0);
+        nal->refct--;
+        if (nal->refct > 0) {
+                ptl_ni_init_mutex_exit ();
+                return PTL_OK;
+        }
 
-        nal->nal_refct--;
+        ptl_me_ni_fini(nal);
+        ptl_eq_ni_fini(nal);
 
-        /* nal_refct == 0 tells nal->shutdown to really shut down */
-        nal->shutdown(nal);
+        rc = PTL_OK;
+        if (nal->shutdown)
+                rc = nal->shutdown(nal, idx);
 
-        ptl_mutex_exit ();
-        return PTL_OK;
+        ptl_interfaces[idx] = NULL;
+        ptl_num_interfaces--;
+
+        ptl_ni_init_mutex_exit ();
+        return rc;
 }
 
 int PtlNIHandle(ptl_handle_any_t handle_in, ptl_handle_ni_t * ni_out)
diff --git a/lnet/lnet/api-wrap.c b/lnet/lnet/api-wrap.c
index 3e6f9ce..9c82c30 100644
--- a/lnet/lnet/api-wrap.c
+++ b/lnet/lnet/api-wrap.c
@@ -124,6 +124,25 @@ int PtlNIDist(ptl_handle_ni_t interface_in, ptl_process_id_t process_in,
         return ret.rc;
 }
 
+
+
+unsigned int PtlNIDebug(ptl_handle_ni_t ni, unsigned int mask_in)
+{
+        PtlNIDebug_in args;
+        PtlNIDebug_out ret;
+        int rc;
+
+        args.mask_in = mask_in;
+
+        rc = do_forward(ni, PTL_NIDEBUG, &args, sizeof(args), &ret,
+                        sizeof(ret));
+
+        if (rc != PTL_OK)
+                return rc;
+
+        return ret.rc;
+}
+
 int PtlMEAttach(ptl_handle_ni_t interface_in, ptl_pt_index_t index_in,
                 ptl_process_id_t match_id_in, ptl_match_bits_t match_bits_in,
                 ptl_match_bits_t ignore_bits_in, ptl_unlink_t unlink_in,
@@ -236,6 +255,45 @@ int PtlMEDump(ptl_handle_me_t current_in)
         return ret.rc;
 }
 
+static int validate_md(ptl_handle_any_t current_in, ptl_md_t md_in)
+{
+        nal_t *nal;
+        int rc;
+        int i;
+
+        if (!ptl_init) {
+                CERROR("PtlMDAttach/Bind/Update: Not initialized\n");
+                return PTL_NO_INIT;
+        }
+
+        nal = ptl_hndl2nal(&current_in);
+        if (!nal)
+                return PTL_HANDLE_INVALID;
+
+        if (nal->validate != NULL)                /* nal->validate not a NOOP */
+        {
+                if ((md_in.options & PTL_MD_IOVEC) == 0) /* contiguous */
+                {
+                        rc = nal->validate (nal, md_in.start, md_in.length);
+                        if (rc)
+                                return (PTL_SEGV);
+                }
+                else
+                {
+                        struct iovec *iov = (struct iovec *)md_in.start;
+
+                        for (i = 0; i < md_in.niov; i++, iov++)
+                        {
+                                rc = nal->validate (nal, iov->iov_base, iov->iov_len);
+                                if (rc)
+                                        return (PTL_SEGV);
+                        }
+                }
+        }
+
+        return 0;
+}
+
 static ptl_handle_eq_t md2eq (ptl_md_t *md)
 {
         if (PtlHandleIsEqual (md->eventq, PTL_EQ_NONE))
@@ -252,13 +310,16 @@ int PtlMDAttach(ptl_handle_me_t me_in, ptl_md_t md_in,
         PtlMDAttach_out ret;
         int rc;
 
-        args.eq_in = md2eq(&md_in);
-        args.me_in = me_in;
-        args.md_in = md_in;
-        args.unlink_in = unlink_in;
+        rc = validate_md(me_in, md_in);
+        if (rc == PTL_OK) {
+                args.eq_in = md2eq(&md_in);
+                args.me_in = me_in;
+                args.md_in = md_in;
+                args.unlink_in = unlink_in;
                 
-        rc = do_forward(me_in, PTL_MDATTACH, 
-                        &args, sizeof(args), &ret, sizeof(ret));
+                rc = do_forward(me_in, PTL_MDATTACH, 
+                                &args, sizeof(args), &ret, sizeof(ret));
+        }
 
         if (rc != PTL_OK)
                 return (rc == PTL_HANDLE_INVALID) ? PTL_ME_INVALID : rc;
@@ -279,6 +340,10 @@ int PtlMDBind(ptl_handle_ni_t ni_in, ptl_md_t md_in,
         PtlMDBind_out ret;
         int rc;
 
+        rc = validate_md(ni_in, md_in);
+        if (rc != PTL_OK)
+                return rc;
+
         args.eq_in = md2eq(&md_in);
         args.ni_in = ni_in;
         args.md_in = md_in;
@@ -313,6 +378,9 @@ int PtlMDUpdate(ptl_handle_md_t md_in, ptl_md_t *old_inout,
                 args.old_inout_valid = 0;
 
         if (new_inout) {
+                rc = validate_md (md_in, *new_inout);
+                if (rc != PTL_OK)
+                        return (rc == PTL_HANDLE_INVALID) ? PTL_MD_INVALID : rc;
                 args.new_inout = *new_inout;
                 args.new_inout_valid = 1;
         } else
@@ -355,7 +423,7 @@ int PtlMDUnlink(ptl_handle_md_t md_in)
 }
 
 int PtlEQAlloc(ptl_handle_ni_t interface, ptl_size_t count,
-               ptl_eq_handler_t callback,
+               int (*callback) (ptl_event_t * event),
                ptl_handle_eq_t * handle_out)
 {
         ptl_eq_t *eq = NULL;
@@ -390,6 +458,12 @@ int PtlEQAlloc(ptl_handle_ni_t interface, ptl_size_t count,
         for (i = 0; i < count; i++)
                 ev[i].sequence = 0;
 
+        if (nal->validate != NULL) {
+                rc = nal->validate(nal, ev, count * sizeof(ptl_event_t));
+                if (rc != PTL_OK)
+                        goto fail;
+        }
+
         args.ni_in = interface;
         args.count_in = count;
         args.base_in = ev;
diff --git a/lnet/lnet/lib-dispatch.c b/lnet/lnet/lib-dispatch.c
index 798e117..13036c7 100644
--- a/lnet/lnet/lib-dispatch.c
+++ b/lnet/lnet/lib-dispatch.c
@@ -35,6 +35,7 @@ static dispatch_table_t dispatch_table[] = {
         [PTL_GETID] {do_PtlGetId, "PtlGetId"},
         [PTL_NISTATUS] {do_PtlNIStatus, "PtlNIStatus"},
         [PTL_NIDIST] {do_PtlNIDist, "PtlNIDist"},
+        [PTL_NIDEBUG] {do_PtlNIDebug, "PtlNIDebug"},
         [PTL_MEATTACH] {do_PtlMEAttach, "PtlMEAttach"},
         [PTL_MEINSERT] {do_PtlMEInsert, "PtlMEInsert"},
         [PTL_MEUNLINK] {do_PtlMEUnlink, "PtlMEUnlink"},
diff --git a/lnet/lnet/lib-init.c b/lnet/lnet/lib-init.c
index c62dbc2..61ef465 100644
--- a/lnet/lnet/lib-init.c
+++ b/lnet/lnet/lib-init.c
@@ -41,15 +41,8 @@
 #ifndef PTL_USE_LIB_FREELIST
 
 int
-kportal_descriptor_setup (nal_cb_t *nal,
-                          ptl_ni_limits_t *requested_limits,
-                          ptl_ni_limits_t *actual_limits)
+kportal_descriptor_setup (nal_cb_t *nal)
 {
-        /* Ignore requested limits! */
-        actual_limits->max_mes = INT_MAX;
-        actual_limits->max_mds = INT_MAX;
-        actual_limits->max_eqs = INT_MAX;
-
         return PTL_OK;
 }
 
@@ -107,9 +100,7 @@ lib_freelist_fini (nal_cb_t *nal, lib_freelist_t *fl)
 }
 
 int
-kportal_descriptor_setup (nal_cb_t *nal,
-                          ptl_ni_limits_t *requested_limits,
-                          ptl_ni_limits_t *actual_limits)
+kportal_descriptor_setup (nal_cb_t *nal)
 {
         /* NB on failure caller must still call kportal_descriptor_cleanup */
         /*               ******                                            */
@@ -120,13 +111,6 @@ kportal_descriptor_setup (nal_cb_t *nal,
         memset (&nal->ni.ni_free_mds,  0, sizeof (nal->ni.ni_free_mds));
         memset (&nal->ni.ni_free_eqs,  0, sizeof (nal->ni.ni_free_eqs));
 
-        /* Ignore requested limits! */
-        actual_limits->max_mes = MAX_MES;
-        actual_limits->max_mds = MAX_MDS;
-        actual_limits->max_eqs = MAX_EQS;
-        /* Hahahah what a load of bollocks.  There's nowhere to
-         * specify the max # messages in-flight */
-
         rc = lib_freelist_init (nal, &nal->ni.ni_free_mes,
                                 MAX_MES, sizeof (lib_me_t));
         if (rc != PTL_OK)
@@ -264,18 +248,21 @@ lib_invalidate_handle (nal_cb_t *nal, lib_handle_t *lh)
 }
 
 int
-lib_init(nal_cb_t *nal, ptl_process_id_t process_id,
-         ptl_ni_limits_t *requested_limits,
-         ptl_ni_limits_t *actual_limits)
+lib_init(nal_cb_t * nal, ptl_nid_t nid, ptl_pid_t pid, int gsize,
+         ptl_pt_index_t ptl_size, ptl_ac_index_t acl_size)
 {
         int       rc = PTL_OK;
         lib_ni_t *ni = &nal->ni;
-        int ptl_size;
         int i;
         ENTRY;
 
         /* NB serialised in PtlNIInit() */
 
+        if (ni->refcnt != 0) {                       /* already initialised */
+                ni->refcnt++;
+                goto out;
+        }
+
         lib_assert_wire_constants ();
         
         /*
@@ -284,8 +271,7 @@ lib_init(nal_cb_t *nal, ptl_process_id_t process_id,
          */
         memset(&ni->counters, 0, sizeof(lib_counters_t));
 
-        rc = kportal_descriptor_setup (nal, requested_limits, 
-                                       &ni->actual_limits);
+        rc = kportal_descriptor_setup (nal);
         if (rc != PTL_OK)
                 goto out;
 
@@ -301,15 +287,12 @@ lib_init(nal_cb_t *nal, ptl_process_id_t process_id,
         if (rc != PTL_OK)
                 goto out;
         
-        ni->nid = process_id.nid;
-        ni->pid = process_id.pid;
-
-        if (requested_limits != NULL)
-                ptl_size = requested_limits->max_pt_index + 1;
-        else
-                ptl_size = 64;
+        ni->nid = nid;
+        ni->pid = pid;
 
+        ni->num_nodes = gsize;
         ni->tbl.size = ptl_size;
+
         ni->tbl.tbl = nal->cb_malloc(nal, sizeof(struct list_head) * ptl_size);
         if (ni->tbl.tbl == NULL) {
                 rc = PTL_NO_SPACE;
@@ -319,20 +302,9 @@ lib_init(nal_cb_t *nal, ptl_process_id_t process_id,
         for (i = 0; i < ptl_size; i++)
                 INIT_LIST_HEAD(&(ni->tbl.tbl[i]));
 
-        /* max_{mes,mds,eqs} set in kportal_descriptor_setup */
-
-        /* We don't have an access control table! */
-        ni->actual_limits.max_ac_index = -1;
-
-        ni->actual_limits.max_pt_index = ptl_size - 1;
-        ni->actual_limits.max_md_iovecs = PTL_MD_MAX_IOV;
-        ni->actual_limits.max_me_list = INT_MAX;
-
-        /* We don't support PtlGetPut! */
-        ni->actual_limits.max_getput_md = 0;
-
-        if (actual_limits != NULL)
-                *actual_limits = ni->actual_limits;
+        ni->debug = PTL_DEBUG_NONE;
+        ni->up = 1;
+        ni->refcnt++;
 
  out:
         if (rc != PTL_OK) {
@@ -349,7 +321,12 @@ lib_fini(nal_cb_t * nal)
         lib_ni_t *ni = &nal->ni;
         int       idx;
 
-        /* NB no state_lock() since this is the last reference.  The NAL
+        ni->refcnt--;
+
+        if (ni->refcnt != 0)
+                goto out;
+
+        /* NB no stat_lock() since this is the last reference.  The NAL
          * should have shut down already, so it should be safe to unlink
          * and free all descriptors, even those that appear committed to a
          * network op (eg MD with non-zero pending count)
@@ -393,9 +370,11 @@ lib_fini(nal_cb_t * nal)
         }
 
         nal->cb_free(nal, ni->tbl.tbl, sizeof(struct list_head) * ni->tbl.size);
+        ni->up = 0;
 
         lib_cleanup_handle_hash (nal);
         kportal_descriptor_cleanup (nal);
 
+ out:
         return (PTL_OK);
 }
diff --git a/lnet/lnet/lib-md.c b/lnet/lnet/lib-md.c
index 64a55b9..9a391cd 100644
--- a/lnet/lnet/lib-md.c
+++ b/lnet/lnet/lib-md.c
@@ -86,7 +86,6 @@ static int lib_md_build(nal_cb_t *nal, lib_md_t *new, void *private,
         lib_eq_t     *eq = NULL;
         int           rc;
         int           i;
-        int           niov;
 
         /* NB we are passed an allocated, but uninitialised/active md.
          * if we return success, caller may lib_md_unlink() it.
@@ -102,7 +101,7 @@ static int lib_md_build(nal_cb_t *nal, lib_md_t *new, void *private,
         /* Must check this _before_ allocation.  Also, note that non-iov
          * MDs must set md_niov to 0. */
         LASSERT((md->options & (PTL_MD_IOVEC | PTL_MD_KIOV)) == 0 ||
-                md->length <= PTL_MD_MAX_IOV);
+                md->niov <= PTL_MD_MAX_IOV);
 
         /* This implementation doesn't know how to create START events or
          * disable END events.  Best to LASSERT our caller is compliant so
@@ -117,6 +116,7 @@ static int lib_md_build(nal_cb_t *nal, lib_md_t *new, void *private,
 
         new->me = NULL;
         new->start = md->start;
+        new->length = md->length;
         new->offset = 0;
         new->max_size = md->max_size;
         new->options = md->options;
@@ -132,13 +132,13 @@ static int lib_md_build(nal_cb_t *nal, lib_md_t *new, void *private,
                 if ((md->options & PTL_MD_KIOV) != 0) /* Can't specify both */
                         return PTL_MD_INVALID; 
 
-                new->md_niov = niov = md->length;
+                new->md_niov = md->niov;
                 
                 if (nal->cb_read (nal, private, new->md_iov.iov, md->start,
-                                  niov * sizeof (new->md_iov.iov[0])))
+                                  md->niov * sizeof (new->md_iov.iov[0])))
                         return PTL_SEGV;
 
-                for (i = 0; i < niov; i++) {
+                for (i = 0; i < new->md_niov; i++) {
                         /* We take the base address on trust */
                         if (new->md_iov.iov[i].iov_len <= 0) /* invalid length */
                                 return PTL_VAL_FAILED;
@@ -146,10 +146,11 @@ static int lib_md_build(nal_cb_t *nal, lib_md_t *new, void *private,
                         total_length += new->md_iov.iov[i].iov_len;
                 }
 
-                new->length = total_length;
-
+                if (md->length > total_length)
+                        return PTL_IOV_TOO_SMALL;
+                
                 if (nal->cb_map != NULL) {
-                        rc = nal->cb_map (nal, niov, new->md_iov.iov, 
+                        rc = nal->cb_map (nal, new->md_niov, new->md_iov.iov, 
                                           &new->md_addrkey);
                         if (rc != PTL_OK)
                                 return (rc);
@@ -165,13 +166,13 @@ static int lib_md_build(nal_cb_t *nal, lib_md_t *new, void *private,
                     nal->cb_recv_pages == NULL)
                         return PTL_MD_INVALID;
 
-                new->md_niov = niov = md->length;
+                new->md_niov = md->niov;
 
                 if (nal->cb_read (nal, private, new->md_iov.kiov, md->start,
-                                  niov * sizeof (new->md_iov.kiov[0])))
+                                  md->niov * sizeof (new->md_iov.kiov[0])))
                         return PTL_SEGV;
                 
-                for (i = 0; i < niov; i++) {
+                for (i = 0; i < new->md_niov; i++) {
                         /* We take the page pointer on trust */
                         if (new->md_iov.kiov[i].kiov_offset + 
                             new->md_iov.kiov[i].kiov_len > PAGE_SIZE )
@@ -180,23 +181,23 @@ static int lib_md_build(nal_cb_t *nal, lib_md_t *new, void *private,
                         total_length += new->md_iov.kiov[i].kiov_len;
                 }
 
-                new->length = total_length;
+                if (md->length > total_length)
+                        return PTL_IOV_TOO_SMALL;
 
                 if (nal->cb_map_pages != NULL) {
-                        rc = nal->cb_map_pages (nal, niov, new->md_iov.kiov, 
+                        rc = nal->cb_map_pages (nal, new->md_niov, new->md_iov.kiov, 
                                                 &new->md_addrkey);
                         if (rc != PTL_OK)
                                 return (rc);
                 }
 #endif
         } else {   /* contiguous */
-                new->length = md->length;
-                new->md_niov = niov = 1;
+                new->md_niov = 1;
                 new->md_iov.iov[0].iov_base = md->start;
                 new->md_iov.iov[0].iov_len = md->length;
 
                 if (nal->cb_map != NULL) {
-                        rc = nal->cb_map (nal, niov, new->md_iov.iov, 
+                        rc = nal->cb_map (nal, new->md_niov, new->md_iov.iov, 
                                           &new->md_addrkey);
                         if (rc != PTL_OK)
                                 return (rc);
@@ -222,13 +223,13 @@ void lib_md_deconstruct(nal_cb_t * nal, lib_md_t * md, ptl_md_t * new)
          * and that's all.
          */
         new->start = md->start;
-        new->length = ((md->options & (PTL_MD_IOVEC | PTL_MD_KIOV)) == 0) ?
-                      md->length : md->md_niov;
+        new->length = md->length;
         new->threshold = md->threshold;
         new->max_size = md->max_size;
         new->options = md->options;
         new->user_ptr = md->user_ptr;
         ptl_eq2handle(&new->eventq, md->eq);
+        new->niov = ((md->options & (PTL_MD_IOVEC | PTL_MD_KIOV)) == 0) ? 0 : md->md_niov;
 }
 
 int do_PtlMDAttach(nal_cb_t * nal, void *private, void *v_args, void *v_ret)
@@ -250,8 +251,8 @@ int do_PtlMDAttach(nal_cb_t * nal, void *private, void *v_args, void *v_ret)
         unsigned long flags;
 
         if ((args->md_in.options & (PTL_MD_KIOV | PTL_MD_IOVEC)) != 0 &&
-            args->md_in.length > PTL_MD_MAX_IOV) /* too many fragments */
-                return (ret->rc = PTL_IOV_INVALID);
+            args->md_in.niov > PTL_MD_MAX_IOV) /* too many fragments */
+                return (ret->rc = PTL_IOV_TOO_MANY);
 
         md = lib_md_alloc(nal, &args->md_in);
         if (md == NULL)
@@ -302,8 +303,8 @@ int do_PtlMDBind(nal_cb_t * nal, void *private, void *v_args, void *v_ret)
         unsigned long flags;
 
         if ((args->md_in.options & (PTL_MD_KIOV | PTL_MD_IOVEC)) != 0 &&
-            args->md_in.length > PTL_MD_MAX_IOV) /* too many fragments */
-                return (ret->rc = PTL_IOV_INVALID);
+            args->md_in.niov > PTL_MD_MAX_IOV) /* too many fragments */
+                return (ret->rc = PTL_IOV_TOO_MANY);
 
         md = lib_md_alloc(nal, &args->md_in);
         if (md == NULL)
@@ -406,16 +407,23 @@ int do_PtlMDUpdate_internal(nal_cb_t * nal, void *private, void *v_args,
                 goto out;
         }
 
-        /* XXX fttb, the new MD must be the same "shape" wrt fragmentation,
-         * since we simply overwrite the old lib-md */
-        if ((((new->options ^ md->options) & 
-              (PTL_MD_IOVEC | PTL_MD_KIOV)) != 0) ||
-            ((new->options & (PTL_MD_IOVEC | PTL_MD_KIOV)) != 0 && 
-             new->length != md->md_niov)) {
-                ret->rc = PTL_IOV_INVALID;
+        /* XXX fttb, the new MD must be the same type wrt fragmentation */
+        if (((new->options ^ md->options) & 
+             (PTL_MD_IOVEC | PTL_MD_KIOV)) != 0) {
+                ret->rc = PTL_MD_INVALID;
+                goto out;
+        }
+
+        if (new->niov > md->md_niov) {
+                ret->rc = PTL_IOV_TOO_MANY;
                 goto out;
         } 
 
+        if (new->niov < md->md_niov) {
+                ret->rc = PTL_IOV_TOO_SMALL;
+                goto out;
+        }
+
         if (!PtlHandleIsEqual (args->testq_in, PTL_EQ_NONE)) {
                 test_eq = ptl_handle2eq(&args->testq_in, nal);
                 if (test_eq == NULL) {
diff --git a/lnet/lnet/lib-me.c b/lnet/lnet/lib-me.c
index 271fc82..e3c46ea 100644
--- a/lnet/lnet/lib-me.c
+++ b/lnet/lnet/lib-me.c
@@ -146,6 +146,13 @@ int do_PtlMEUnlink(nal_cb_t * nal, void *private, void *v_args, void *v_ret)
 /* call with state_lock please */
 void lib_me_unlink(nal_cb_t *nal, lib_me_t *me)
 {
+        lib_ni_t *ni = &nal->ni;
+
+        if (ni->debug & PTL_DEBUG_UNLINK) {
+                ptl_handle_any_t handle;
+                ptl_me2handle(&handle, me);
+        }
+
         list_del (&me->me_list);
 
         if (me->md) {
diff --git a/lnet/lnet/lib-msg.c b/lnet/lnet/lib-msg.c
index 1b69533..869c9d6 100644
--- a/lnet/lnet/lib-msg.c
+++ b/lnet/lnet/lib-msg.c
@@ -89,6 +89,10 @@ lib_finalize(nal_cb_t *nal, void *private, lib_msg_t *msg, ptl_err_t status)
         int           rc;
         ptl_hdr_t     ack;
 
+        /* ni went down while processing this message */
+        if (nal->ni.up == 0)
+                return;
+
         if (msg == NULL)
                 return;
 
diff --git a/lnet/lnet/lib-ni.c b/lnet/lnet/lib-ni.c
index aa959fc..296bc4a 100644
--- a/lnet/lnet/lib-ni.c
+++ b/lnet/lnet/lib-ni.c
@@ -29,6 +29,18 @@
 
 #define MAX_DIST 18446744073709551615ULL
 
+int do_PtlNIDebug(nal_cb_t * nal, void *private, void *v_args, void *v_ret)
+{
+        PtlNIDebug_in *args = v_args;
+        PtlNIDebug_out *ret = v_ret;
+        lib_ni_t *ni = &nal->ni;
+
+        ret->rc = ni->debug;
+        ni->debug = args->mask_in;
+
+        return 0;
+}
+
 int do_PtlNIStatus(nal_cb_t * nal, void *private, void *v_args, void *v_ret)
 {
         /*
diff --git a/lnet/lnet/module.c b/lnet/lnet/module.c
index 40e9da4..012d3d9 100644
--- a/lnet/lnet/module.c
+++ b/lnet/lnet/module.c
@@ -46,17 +46,273 @@
 
 #include <portals/lib-p30.h>
 #include <portals/p30.h>
-#include <portals/nal.h>
 #include <linux/kp30.h>
 #include <linux/kpr.h>
 #include <linux/portals_compat25.h>
 
 extern void (kping_client)(struct portal_ioctl_data *);
 
+struct nal_cmd_handler {
+        nal_cmd_handler_t nch_handler;
+        void * nch_private;
+};
+
+static struct nal_cmd_handler nal_cmd[NAL_MAX_NR + 1];
+static DECLARE_MUTEX(nal_cmd_sem);
+
+
+static int
+kportal_add_route(int gateway_nalid, ptl_nid_t gateway_nid, 
+                  ptl_nid_t lo_nid, ptl_nid_t hi_nid)
+{
+        int rc;
+        kpr_control_interface_t *ci;
+
+        ci = (kpr_control_interface_t *) PORTAL_SYMBOL_GET (kpr_control_interface);
+        if (ci == NULL)
+                return (-ENODEV);
+
+        rc = ci->kprci_add_route (gateway_nalid, gateway_nid, lo_nid, hi_nid);
+
+        PORTAL_SYMBOL_PUT(kpr_control_interface);
+        return (rc);
+}
+
+static int
+kportal_del_route(int gw_nalid, ptl_nid_t gw_nid, 
+                  ptl_nid_t lo, ptl_nid_t hi)
+{
+        int rc;
+        kpr_control_interface_t *ci;
+
+        ci = (kpr_control_interface_t *)PORTAL_SYMBOL_GET(kpr_control_interface);
+        if (ci == NULL)
+                return (-ENODEV);
+
+        rc = ci->kprci_del_route (gw_nalid, gw_nid, lo, hi);
+
+        PORTAL_SYMBOL_PUT(kpr_control_interface);
+        return (rc);
+}
+
+static int
+kportal_notify_router (int gw_nalid, ptl_nid_t gw_nid,
+                       int alive, time_t when)
+{
+        int rc;
+        kpr_control_interface_t *ci;
+
+        /* No error if router not preset.  Sysadmin is allowed to notify
+         * _everywhere_ when a NID boots or crashes, even if they know
+         * nothing of the peer. */
+        ci = (kpr_control_interface_t *)PORTAL_SYMBOL_GET(kpr_control_interface);
+        if (ci == NULL)
+                return (0);
+
+        rc = ci->kprci_notify (gw_nalid, gw_nid, alive, when);
+
+        PORTAL_SYMBOL_PUT(kpr_control_interface);
+        return (rc);
+}
+
+static int
+kportal_get_route(int index, __u32 *gateway_nalidp, ptl_nid_t *gateway_nidp,
+                  ptl_nid_t *lo_nidp, ptl_nid_t *hi_nidp, int *alivep)
+{
+        int       gateway_nalid;
+        ptl_nid_t gateway_nid;
+        ptl_nid_t lo_nid;
+        ptl_nid_t hi_nid;
+        int       alive;
+        int       rc;
+        kpr_control_interface_t *ci;
+
+        ci = (kpr_control_interface_t *) PORTAL_SYMBOL_GET(kpr_control_interface);
+        if (ci == NULL)
+                return (-ENODEV);
+
+        rc = ci->kprci_get_route(index, &gateway_nalid, &gateway_nid,
+                                 &lo_nid, &hi_nid, &alive);
+
+        if (rc == 0) {
+                CDEBUG(D_IOCTL, "got route [%d] %d "LPX64":"LPX64" - "LPX64", %s\n",
+                       index, gateway_nalid, gateway_nid, lo_nid, hi_nid,
+                       alive ? "up" : "down");
+
+                *gateway_nalidp = (__u32)gateway_nalid;
+                *gateway_nidp   = gateway_nid;
+                *lo_nidp        = lo_nid;
+                *hi_nidp        = hi_nid;
+                *alivep         = alive;
+        }
+
+        PORTAL_SYMBOL_PUT (kpr_control_interface);
+        return (rc);
+}
+
+static int 
+kportal_router_cmd(struct portals_cfg *pcfg, void * private)
+{
+        int err = -EINVAL;
+        ENTRY;
+
+        switch(pcfg->pcfg_command) {
+        default:
+                CDEBUG(D_IOCTL, "Inappropriate cmd: %d\n", pcfg->pcfg_command);
+                break;
+                
+        case NAL_CMD_ADD_ROUTE:
+                CDEBUG(D_IOCTL, "Adding route: [%d] "LPU64" : "LPU64" - "LPU64"\n",
+                       pcfg->pcfg_nal, pcfg->pcfg_nid, 
+                       pcfg->pcfg_nid2, pcfg->pcfg_nid3);
+                err = kportal_add_route(pcfg->pcfg_gw_nal, pcfg->pcfg_nid,
+                                        pcfg->pcfg_nid2, pcfg->pcfg_nid3);
+                break;
+
+        case NAL_CMD_DEL_ROUTE:
+                CDEBUG (D_IOCTL, "Removing routes via [%d] "LPU64" : "LPU64" - "LPU64"\n",
+                        pcfg->pcfg_gw_nal, pcfg->pcfg_nid, 
+                        pcfg->pcfg_nid2, pcfg->pcfg_nid3);
+                err = kportal_del_route (pcfg->pcfg_gw_nal, pcfg->pcfg_nid,
+                                         pcfg->pcfg_nid2, pcfg->pcfg_nid3);
+                break;
+
+        case NAL_CMD_NOTIFY_ROUTER: {
+                CDEBUG (D_IOCTL, "Notifying peer [%d] "LPU64" %s @ %ld\n",
+                        pcfg->pcfg_gw_nal, pcfg->pcfg_nid,
+                        pcfg->pcfg_flags ? "Enabling" : "Disabling",
+                        (time_t)pcfg->pcfg_nid3);
+                
+                err = kportal_notify_router (pcfg->pcfg_gw_nal, pcfg->pcfg_nid,
+                                             pcfg->pcfg_flags, 
+                                             (time_t)pcfg->pcfg_nid3);
+                break;
+        }
+                
+        case NAL_CMD_GET_ROUTE:
+                CDEBUG (D_IOCTL, "Getting route [%d]\n", pcfg->pcfg_count);
+                err = kportal_get_route(pcfg->pcfg_count, &pcfg->pcfg_gw_nal,
+                                        &pcfg->pcfg_nid, 
+                                        &pcfg->pcfg_nid2, &pcfg->pcfg_nid3,
+                                        &pcfg->pcfg_flags);
+                break;
+        }
+        RETURN(err);
+}
+
+int
+kportal_nal_cmd(struct portals_cfg *pcfg)
+{
+        __u32 nal = pcfg->pcfg_nal;
+        int rc = -EINVAL;
+
+        ENTRY;
+
+        down(&nal_cmd_sem);
+        if (nal > 0 && nal <= NAL_MAX_NR && nal_cmd[nal].nch_handler) {
+                CDEBUG(D_IOCTL, "calling handler nal: %d, cmd: %d\n", nal, 
+                       pcfg->pcfg_command);
+                rc = nal_cmd[nal].nch_handler(pcfg, nal_cmd[nal].nch_private);
+        }
+        up(&nal_cmd_sem);
+        RETURN(rc);
+}
+
+ptl_handle_ni_t *
+kportal_get_ni (int nal)
+{
+
+        switch (nal)
+        {
+        case QSWNAL:
+                return (PORTAL_SYMBOL_GET(kqswnal_ni));
+        case SOCKNAL:
+                return (PORTAL_SYMBOL_GET(ksocknal_ni));
+        case GMNAL:
+                return  (PORTAL_SYMBOL_GET(kgmnal_ni));
+        case IBNAL:
+                return  (PORTAL_SYMBOL_GET(kibnal_ni));
+        case TCPNAL:
+                /* userspace NAL */
+                return (NULL);
+        case SCIMACNAL:
+                return  (PORTAL_SYMBOL_GET(kscimacnal_ni));
+        default:
+                /* A warning to a naive caller */
+                CERROR ("unknown nal: %d\n", nal);
+                return (NULL);
+        }
+}
+
+void
+kportal_put_ni (int nal)
+{
+
+        switch (nal)
+        {
+        case QSWNAL:
+                PORTAL_SYMBOL_PUT(kqswnal_ni);
+                break;
+        case SOCKNAL:
+                PORTAL_SYMBOL_PUT(ksocknal_ni);
+                break;
+        case GMNAL:
+                PORTAL_SYMBOL_PUT(kgmnal_ni);
+                break;
+        case IBNAL:
+                PORTAL_SYMBOL_PUT(kibnal_ni);
+                break;
+        case TCPNAL:
+                /* A lesson to a malicious caller */
+                LBUG ();
+        case SCIMACNAL:
+                PORTAL_SYMBOL_PUT(kscimacnal_ni);
+                break;
+        default:
+                CERROR ("unknown nal: %d\n", nal);
+        }
+}
+
+int
+kportal_nal_register(int nal, nal_cmd_handler_t handler, void * private)
+{
+        int rc = 0;
+
+        CDEBUG(D_IOCTL, "Register NAL %d, handler: %p\n", nal, handler);
+
+        if (nal > 0  && nal <= NAL_MAX_NR) {
+                down(&nal_cmd_sem);
+                if (nal_cmd[nal].nch_handler != NULL)
+                        rc = -EBUSY;
+                else {
+                        nal_cmd[nal].nch_handler = handler;
+                        nal_cmd[nal].nch_private = private;
+                }
+                up(&nal_cmd_sem);
+        }
+        return rc;
+}
+
+int
+kportal_nal_unregister(int nal)
+{
+        int rc = 0;
+
+        CDEBUG(D_IOCTL, "Unregister NAL %d\n", nal);
+
+        if (nal > 0  && nal <= NAL_MAX_NR) {
+                down(&nal_cmd_sem);
+                nal_cmd[nal].nch_handler = NULL;
+                nal_cmd[nal].nch_private = NULL;
+                up(&nal_cmd_sem);
+        }
+        return rc;
+}
+
 static int kportal_ioctl(struct portal_ioctl_data *data, 
                          unsigned int cmd, unsigned long arg)
 {
-        int err;
+        int err = 0;
         char str[PTL_NALFMT_SIZE];
         ENTRY;
 
@@ -78,53 +334,68 @@ static int kportal_ioctl(struct portal_ioctl_data *data,
         }
 
         case IOC_PORTAL_GET_NID: {
-                ptl_handle_ni_t    nih;
-                ptl_process_id_t   pid;
+                const ptl_handle_ni_t *nip;
+                ptl_process_id_t       pid;
 
                 CDEBUG (D_IOCTL, "Getting nid for nal [%d]\n", data->ioc_nal);
 
-                err = PtlNIInit(data->ioc_nal, 0, NULL, NULL, &nih);
-                if (!(err == PTL_OK || err == PTL_IFACE_DUP))
+                nip = kportal_get_ni (data->ioc_nal);
+                if (nip == NULL)
                         RETURN (-EINVAL);
 
-                err = PtlGetId (nih, &pid);
+                err = PtlGetId (*nip, &pid);
                 LASSERT (err == PTL_OK);
-
-                PtlNIFini(nih);
+                kportal_put_ni (data->ioc_nal);
 
                 data->ioc_nid = pid.nid;
                 if (copy_to_user ((char *)arg, data, sizeof (*data)))
-                        RETURN (-EFAULT);
-                RETURN(0);
+                        err = -EFAULT;
+                break;
         }
 
+        case IOC_PORTAL_NAL_CMD: {
+                struct portals_cfg pcfg;
+
+                LASSERT (data->ioc_plen1 == sizeof(pcfg));
+                err = copy_from_user(&pcfg, (void *)data->ioc_pbuf1, 
+                                     sizeof(pcfg));
+                if ( err ) {
+                        EXIT;
+                        return err;
+                }
+
+                CDEBUG (D_IOCTL, "nal command nal %d cmd %d\n", pcfg.pcfg_nal,
+                        pcfg.pcfg_command);
+                err = kportal_nal_cmd(&pcfg);
+                if (err == 0) {
+                        if (copy_to_user((char *)data->ioc_pbuf1, &pcfg, 
+                                         sizeof (pcfg)))
+                                err = -EFAULT;
+                        if (copy_to_user((char *)arg, data, sizeof (*data)))
+                                err = -EFAULT;
+                }
+                break;
+        }
         case IOC_PORTAL_FAIL_NID: {
-                ptl_handle_ni_t    nih;
+                const ptl_handle_ni_t *nip;
 
                 CDEBUG (D_IOCTL, "fail nid: [%d] "LPU64" count %d\n",
                         data->ioc_nal, data->ioc_nid, data->ioc_count);
 
-                err = PtlNIInit(data->ioc_nal, 0, NULL, NULL, &nih);
-                if (!(err == PTL_OK || err == PTL_IFACE_DUP))
+                nip = kportal_get_ni (data->ioc_nal);
+                if (nip == NULL)
                         return (-EINVAL);
 
-                if (err == PTL_OK) {
-                        /* There's no point in failing an interface that
-                         * came into existance just for this */
-                        err = -EINVAL;
-                } else {
-                        err = PtlFailNid (nih, data->ioc_nid, data->ioc_count);
-                        if (err != PTL_OK)
-                                err = -EINVAL;
-                }
-
-                PtlNIFini(nih);
-                RETURN (err);
+                err = PtlFailNid (*nip, data->ioc_nid, data->ioc_count);
+                kportal_put_ni (data->ioc_nal);
+                break;
         }
         default:
-                RETURN(-EINVAL);
+                err = -EINVAL;
+                break;
         }
-        /* Not Reached */
+
+        RETURN(err);
 }
 
 DECLARE_IOCTL_HANDLER(kportal_ioctl_handler, kportal_ioctl);
@@ -140,24 +411,30 @@ static int init_kportals_module(void)
                 RETURN(rc);
         }
 
-        rc = libcfs_register_ioctl(&kportal_ioctl_handler);
-        LASSERT (rc == 0);
+        rc = kportal_nal_register(ROUTER, kportal_router_cmd, NULL);
+        if (rc) {
+                PtlFini();
+                CERROR("kportal_nal_registre: ROUTER error %d\n", rc);
+        }
+
+        if (rc == 0)
+                libcfs_register_ioctl(&kportal_ioctl_handler);
 
         RETURN(rc);
 }
 
 static void exit_kportals_module(void)
 {
-        int rc;
-
-        rc = libcfs_deregister_ioctl(&kportal_ioctl_handler);
-        LASSERT (rc == 0);
-
+        libcfs_deregister_ioctl(&kportal_ioctl_handler);
+        kportal_nal_unregister(ROUTER);
         PtlFini();
 }
 
-EXPORT_SYMBOL(ptl_register_nal);
-EXPORT_SYMBOL(ptl_unregister_nal);
+EXPORT_SYMBOL(kportal_nal_register);
+EXPORT_SYMBOL(kportal_nal_unregister);
+EXPORT_SYMBOL(kportal_get_ni);
+EXPORT_SYMBOL(kportal_put_ni);
+EXPORT_SYMBOL(kportal_nal_cmd);
 
 EXPORT_SYMBOL(ptl_err_str);
 EXPORT_SYMBOL(lib_dispatch);
@@ -169,6 +446,7 @@ EXPORT_SYMBOL(PtlMDAttach);
 EXPORT_SYMBOL(PtlMDUnlink);
 EXPORT_SYMBOL(PtlNIInit);
 EXPORT_SYMBOL(PtlNIFini);
+EXPORT_SYMBOL(PtlNIDebug);
 EXPORT_SYMBOL(PtlInit);
 EXPORT_SYMBOL(PtlFini);
 EXPORT_SYMBOL(PtlSnprintHandle);
diff --git a/lnet/router/.cvsignore b/lnet/router/.cvsignore
index 5ed596b..95973d6 100644
--- a/lnet/router/.cvsignore
+++ b/lnet/router/.cvsignore
@@ -1,10 +1,4 @@
 .deps
 Makefile
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+Makefile.in
+.*.o.cmd
diff --git a/lnet/router/Makefile.am b/lnet/router/Makefile.am
new file mode 100644
index 0000000..1c8087b
--- /dev/null
+++ b/lnet/router/Makefile.am
@@ -0,0 +1,16 @@
+# Copyright (C) 2001  Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+include ../Rules.linux
+
+MODULE = kptlrouter
+modulenet_DATA = kptlrouter.o
+EXTRA_PROGRAMS = kptlrouter
+
+
+#CFLAGS:= @KCFLAGS@ 
+#CPPFLAGS:=@KCPPFLAGS@
+DEFS =
+kptlrouter_SOURCES = router.c proc.c router.h
diff --git a/lnet/router/Makefile.in b/lnet/router/Makefile.in
deleted file mode 100644
index 3bb6cf7..0000000
--- a/lnet/router/Makefile.in
+++ /dev/null
@@ -1,4 +0,0 @@
-MODULES := kptlrouter
-kptlrouter-objs := router.o proc.o
-
-@INCLUDE_RULES@
diff --git a/lnet/router/autoMakefile.am b/lnet/router/autoMakefile.am
deleted file mode 100644
index fa11e8c..0000000
--- a/lnet/router/autoMakefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (C) 2001  Cluster File Systems, Inc.
-#
-# This code is issued under the GNU General Public License.
-# See the file COPYING in this distribution
-
-if MODULES
-if !CRAY_PORTALS
-modulenet_DATA = kptlrouter$(KMODEXT)
-endif
-endif
-
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-DIST_SOURCES = $(kptlrouter-objs:%.o=%.c) router.h
diff --git a/lnet/router/router.c b/lnet/router/router.c
index 9fb6afe..d0dbf0a 100644
--- a/lnet/router/router.c
+++ b/lnet/router/router.c
@@ -48,6 +48,13 @@ kpr_router_interface_t kpr_router_interface = {
 	kprri_deregister:	kpr_deregister_nal,
 };
 
+kpr_control_interface_t kpr_control_interface = {
+	kprci_add_route:	kpr_add_route,
+	kprci_del_route:        kpr_del_route,
+	kprci_get_route:        kpr_get_route,
+	kprci_notify:           kpr_sys_notify,
+};
+
 int
 kpr_register_nal (kpr_nal_interface_t *nalif, void **argp)
 {
@@ -282,9 +289,18 @@ kpr_shutdown_nal (void *arg)
 	LASSERT (!ne->kpne_shutdown);
 	LASSERT (!in_interrupt());
 
-	write_lock_irqsave (&kpr_rwlock, flags);
+	write_lock_irqsave (&kpr_rwlock, flags); /* locking a bit spurious... */
 	ne->kpne_shutdown = 1;
-	write_unlock_irqrestore (&kpr_rwlock, flags);
+	write_unlock_irqrestore (&kpr_rwlock, flags); /* except it's a memory barrier */
+
+	while (atomic_read (&ne->kpne_refcount) != 0)
+	{
+		CDEBUG (D_NET, "Waiting for refcount on NAL %d to reach zero (%d)\n",
+			ne->kpne_interface.kprni_nalid, atomic_read (&ne->kpne_refcount));
+
+		set_current_state (TASK_UNINTERRUPTIBLE);
+		schedule_timeout (HZ);
+	}
 }
 
 void
@@ -296,21 +312,14 @@ kpr_deregister_nal (void *arg)
         CDEBUG (D_NET, "Deregister NAL %d\n", ne->kpne_interface.kprni_nalid);
 
 	LASSERT (ne->kpne_shutdown);		/* caller must have issued shutdown already */
+	LASSERT (atomic_read (&ne->kpne_refcount) == 0); /* can't be busy */
 	LASSERT (!in_interrupt());
 
 	write_lock_irqsave (&kpr_rwlock, flags);
-	list_del (&ne->kpne_list);
-	write_unlock_irqrestore (&kpr_rwlock, flags);
 
-        /* Wait until all outstanding messages/notifications have completed */
-	while (atomic_read (&ne->kpne_refcount) != 0)
-	{
-		CDEBUG (D_NET, "Waiting for refcount on NAL %d to reach zero (%d)\n",
-			ne->kpne_interface.kprni_nalid, atomic_read (&ne->kpne_refcount));
+	list_del (&ne->kpne_list);
 
-		set_current_state (TASK_UNINTERRUPTIBLE);
-		schedule_timeout (HZ);
-	}
+	write_unlock_irqrestore (&kpr_rwlock, flags);
 
 	PORTAL_FREE (ne, sizeof (*ne));
         PORTAL_MODULE_UNUSE;
@@ -368,14 +377,11 @@ kpr_lookup_target (void *arg, ptl_nid_t target_nid, int nob,
 
         CDEBUG (D_NET, "lookup "LPX64" from NAL %d\n", target_nid, 
                 ne->kpne_interface.kprni_nalid);
-        LASSERT (!in_interrupt());
-
-	read_lock (&kpr_rwlock);
 
-	if (ne->kpne_shutdown) {	/* caller is shutting down */
-                read_unlock (&kpr_rwlock);
+	if (ne->kpne_shutdown)		/* caller is shutting down */
 		return (-ENOENT);
-        }
+
+	read_lock (&kpr_rwlock);
 
 	/* Search routes for one that has a gateway to target_nid on the callers network */
 
@@ -446,26 +452,25 @@ kpr_forward_packet (void *arg, kpr_fwd_desc_t *fwd)
 	struct list_head    *e;
         kpr_route_entry_t   *re;
         kpr_nal_entry_t     *tmp_ne;
-        int                  rc;
 
         CDEBUG (D_NET, "forward [%p] "LPX64" from NAL %d\n", fwd,
                 target_nid, src_ne->kpne_interface.kprni_nalid);
 
         LASSERT (nob == lib_kiov_nob (fwd->kprfd_niov, fwd->kprfd_kiov));
-        LASSERT (!in_interrupt());
-
-	read_lock (&kpr_rwlock);
+        
+        atomic_inc (&kpr_queue_depth);
+	atomic_inc (&src_ne->kpne_refcount); /* source nal is busy until fwd completes */
 
         kpr_fwd_packets++;                   /* (loose) stats accounting */
         kpr_fwd_bytes += nob + sizeof(ptl_hdr_t);
 
-	if (src_ne->kpne_shutdown) {         /* caller is shutting down */
-                rc = -ESHUTDOWN;
+	if (src_ne->kpne_shutdown)           /* caller is shutting down */
 		goto out;
-        }
 
 	fwd->kprfd_router_arg = src_ne;      /* stash caller's nal entry */
 
+	read_lock (&kpr_rwlock);
+
 	/* Search routes for one that has a gateway to target_nid NOT on the caller's network */
 
         list_for_each (e, &kpr_routes) {
@@ -502,9 +507,7 @@ kpr_forward_packet (void *arg, kpr_fwd_desc_t *fwd)
                 kpr_update_weight (ge, nob);
 
                 fwd->kprfd_gateway_nid = ge->kpge_nid;
-                atomic_inc (&src_ne->kpne_refcount); /* source and dest nals are */
-                atomic_inc (&dst_ne->kpne_refcount); /* busy until fwd completes */
-                atomic_inc (&kpr_queue_depth);
+                atomic_inc (&dst_ne->kpne_refcount); /* dest nal is busy until fwd completes */
 
                 read_unlock (&kpr_rwlock);
 
@@ -517,16 +520,18 @@ kpr_forward_packet (void *arg, kpr_fwd_desc_t *fwd)
                 return;
 	}
 
-        rc = -EHOSTUNREACH;
+        read_unlock (&kpr_rwlock);
  out:
         kpr_fwd_errors++;
 
-        CDEBUG (D_NET, "Failed to forward [%p] "LPX64" from NAL %d: %d\n", 
-                fwd, target_nid, src_ne->kpne_interface.kprni_nalid, rc);
+        CDEBUG (D_NET, "Failed to forward [%p] "LPX64" from NAL %d\n", fwd,
+                target_nid, src_ne->kpne_interface.kprni_nalid);
 
-	(fwd->kprfd_callback)(fwd->kprfd_callback_arg, rc);
+	/* Can't find anywhere to forward to */
+	(fwd->kprfd_callback)(fwd->kprfd_callback_arg, -EHOSTUNREACH);
 
-        read_unlock (&kpr_rwlock);
+        atomic_dec (&kpr_queue_depth);
+	atomic_dec (&src_ne->kpne_refcount);
 }
 
 void
@@ -630,7 +635,7 @@ kpr_add_route (int gateway_nalid, ptl_nid_t gateway_nid,
 
 int
 kpr_sys_notify (int gateway_nalid, ptl_nid_t gateway_nid,
-                int alive, time_t when)
+            int alive, time_t when)
 {
         return (kpr_do_notify (0, gateway_nalid, gateway_nid, alive, when));
 }
@@ -689,12 +694,11 @@ kpr_del_route (int gw_nalid, ptl_nid_t gw_nid,
 }
 
 int
-kpr_get_route (int idx, __u32 *gateway_nalid, ptl_nid_t *gateway_nid,
-               ptl_nid_t *lo_nid, ptl_nid_t *hi_nid, __u32 *alive)
+kpr_get_route (int idx, int *gateway_nalid, ptl_nid_t *gateway_nid,
+               ptl_nid_t *lo_nid, ptl_nid_t *hi_nid, int *alive)
 {
 	struct list_head  *e;
 
-        LASSERT (!in_interrupt());
 	read_lock(&kpr_rwlock);
 
         for (e = kpr_routes.next; e != &kpr_routes; e = e->next) {
@@ -718,67 +722,11 @@ kpr_get_route (int idx, __u32 *gateway_nalid, ptl_nid_t *gateway_nid,
         return (-ENOENT);
 }
 
-static int 
-kpr_nal_cmd(struct portals_cfg *pcfg, void * private)
-{
-        int err = -EINVAL;
-        ENTRY;
-
-        switch(pcfg->pcfg_command) {
-        default:
-                CDEBUG(D_IOCTL, "Inappropriate cmd: %d\n", pcfg->pcfg_command);
-                break;
-                
-        case NAL_CMD_ADD_ROUTE:
-                CDEBUG(D_IOCTL, "Adding route: [%d] "LPU64" : "LPU64" - "LPU64"\n",
-                       pcfg->pcfg_nal, pcfg->pcfg_nid, 
-                       pcfg->pcfg_nid2, pcfg->pcfg_nid3);
-                err = kpr_add_route(pcfg->pcfg_gw_nal, pcfg->pcfg_nid,
-                                    pcfg->pcfg_nid2, pcfg->pcfg_nid3);
-                break;
-
-        case NAL_CMD_DEL_ROUTE:
-                CDEBUG (D_IOCTL, "Removing routes via [%d] "LPU64" : "LPU64" - "LPU64"\n",
-                        pcfg->pcfg_gw_nal, pcfg->pcfg_nid, 
-                        pcfg->pcfg_nid2, pcfg->pcfg_nid3);
-                err = kpr_del_route (pcfg->pcfg_gw_nal, pcfg->pcfg_nid,
-                                     pcfg->pcfg_nid2, pcfg->pcfg_nid3);
-                break;
-
-        case NAL_CMD_NOTIFY_ROUTER: {
-                CDEBUG (D_IOCTL, "Notifying peer [%d] "LPU64" %s @ %ld\n",
-                        pcfg->pcfg_gw_nal, pcfg->pcfg_nid,
-                        pcfg->pcfg_flags ? "Enabling" : "Disabling",
-                        (time_t)pcfg->pcfg_nid3);
-                
-                err = kpr_sys_notify (pcfg->pcfg_gw_nal, pcfg->pcfg_nid,
-                                      pcfg->pcfg_flags, (time_t)pcfg->pcfg_nid3);
-                break;
-        }
-                
-        case NAL_CMD_GET_ROUTE:
-                CDEBUG (D_IOCTL, "Getting route [%d]\n", pcfg->pcfg_count);
-                err = kpr_get_route(pcfg->pcfg_count, &pcfg->pcfg_gw_nal,
-                                    &pcfg->pcfg_nid, 
-                                    &pcfg->pcfg_nid2, &pcfg->pcfg_nid3,
-                                    &pcfg->pcfg_flags);
-                break;
-        }
-        RETURN(err);
-}
-
-
 static void /*__exit*/
 kpr_finalise (void)
 {
         LASSERT (list_empty (&kpr_nals));
 
-        libcfs_nal_cmd_unregister(ROUTER);
-
-        PORTAL_SYMBOL_UNREGISTER(kpr_router_interface);
-
-        kpr_proc_fini();
-
         while (!list_empty (&kpr_routes)) {
                 kpr_route_entry_t *re = list_entry(kpr_routes.next,
                                                    kpr_route_entry_t,
@@ -788,6 +736,11 @@ kpr_finalise (void)
                 PORTAL_FREE(re, sizeof (*re));
         }
 
+        kpr_proc_fini();
+
+        PORTAL_SYMBOL_UNREGISTER(kpr_router_interface);
+        PORTAL_SYMBOL_UNREGISTER(kpr_control_interface);
+
         CDEBUG(D_MALLOC, "kpr_finalise: kmem back to %d\n",
                atomic_read(&portal_kmemory));
 }
@@ -795,20 +748,13 @@ kpr_finalise (void)
 static int __init
 kpr_initialise (void)
 {
-        int     rc;
-        
         CDEBUG(D_MALLOC, "kpr_initialise: kmem %d\n",
                atomic_read(&portal_kmemory));
 
         kpr_proc_init();
 
-        rc = libcfs_nal_cmd_register(ROUTER, kpr_nal_cmd, NULL);
-        if (rc != 0) {
-                CERROR("Can't register nal cmd handler\n");
-                return (rc);
-        }
-        
         PORTAL_SYMBOL_REGISTER(kpr_router_interface);
+        PORTAL_SYMBOL_REGISTER(kpr_control_interface);
         return (0);
 }
 
@@ -819,4 +765,5 @@ MODULE_LICENSE("GPL");
 module_init (kpr_initialise);
 module_exit (kpr_finalise);
 
+EXPORT_SYMBOL (kpr_control_interface);
 EXPORT_SYMBOL (kpr_router_interface);
diff --git a/lnet/router/router.h b/lnet/router/router.h
index 0787064..309025b3 100644
--- a/lnet/router/router.h
+++ b/lnet/router/router.h
@@ -93,6 +93,15 @@ extern void kpr_deregister_nal (void *arg);
 extern void kpr_proc_init (void);
 extern void kpr_proc_fini (void);
 
+extern int kpr_add_route (int gateway_nal, ptl_nid_t gateway_nid, 
+                          ptl_nid_t lo_nid, ptl_nid_t hi_nid);
+extern int kpr_del_route (int gw_nal, ptl_nid_t gw_nid,
+                          ptl_nid_t lo, ptl_nid_t hi);
+extern int kpr_get_route (int idx, int *gateway_nal, ptl_nid_t *gateway_nid, 
+                          ptl_nid_t *lo_nid, ptl_nid_t *hi_nid, int *alive);
+extern int kpr_sys_notify (int gw_nalid, ptl_nid_t gw_nid,
+                           int alive, time_t when);
+
 extern unsigned long long kpr_fwd_bytes;
 extern unsigned long      kpr_fwd_packets;
 extern unsigned long      kpr_fwd_errors;
diff --git a/lnet/tests/.cvsignore b/lnet/tests/.cvsignore
index e034130..d0c4c88 100644
--- a/lnet/tests/.cvsignore
+++ b/lnet/tests/.cvsignore
@@ -1,10 +1,4 @@
 Makefile
+Makefile.in
 .deps
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+.*.o.cmd
diff --git a/lnet/tests/Makefile.am b/lnet/tests/Makefile.am
new file mode 100644
index 0000000..7b47ae0
--- /dev/null
+++ b/lnet/tests/Makefile.am
@@ -0,0 +1,23 @@
+# Copyright (C) 2001  Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+include ../Rules.linux
+
+LDFLAGS = -m "`$(LD) --help | awk '/supported emulations/ {print $$4}'`" -r
+LINK = $(LD) $(LDFLAGS) -o $@
+DEFS =
+LIBS =
+MODULE = $(basename)
+EXTRA_DIST = startserver.sh startclient.sh stopserver.sh stopclient.sh
+
+noinst_PROGRAMS = pingsrv.o pingcli.o spingsrv.o spingcli.o 
+
+pingsrv_o_SOURCES = ping_srv.c ping.h
+
+pingcli_o_SOURCES = ping_cli.c ping.h
+
+spingsrv_o_SOURCES = sping_srv.c ping.h
+
+spingcli_o_SOURCES = sping_cli.c ping.h
diff --git a/lnet/tests/Makefile.in b/lnet/tests/Makefile.in
deleted file mode 100644
index c309db0..0000000
--- a/lnet/tests/Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-MODULES := pingsrv pingcli spingsrv spingcli
-pingsrv-objs := ping_srv.o
-
-ifeq ($(PATCHLEVEL),6)
-pingcli-objs := ping_cli.o
-spingsrv-objs := sping_srv.o
-spingcli-objs := sping_cli.o
-else
-ping%.c: ping_%.c
-	ln -sf $< $@
-
-sping%.c: sping_%.c
-	ln -sf $< $@
-endif
-
-@INCLUDE_RULES@
diff --git a/lnet/tests/autoMakefile.am b/lnet/tests/autoMakefile.am
deleted file mode 100644
index 5f81b93..0000000
--- a/lnet/tests/autoMakefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright (C) 2001  Cluster File Systems, Inc.
-#
-# This code is issued under the GNU General Public License.
-# See the file COPYING in this distribution
-
-if MODULES
-if !CRAY_PORTALS
-if TESTS
-noinst_DATA := pingsrv$(KMODEXT) pingcli$(KMODEXT)
-noinst_DATA += spingsrv$(KMODEXT) spingcli$(KMODEXT)
-endif
-endif
-endif
-
-MOSTLYCLEANFILES = *.o *.ko *.mod.c pingsrv.c pingcli.c spingsrv.c spingcli.c
-DIST_SOURCES = ping_srv.c ping_cli.c sping_srv.c sping_cli.c ping.h
diff --git a/lnet/tests/ping_cli.c b/lnet/tests/ping_cli.c
index b216df1..9977f20 100644
--- a/lnet/tests/ping_cli.c
+++ b/lnet/tests/ping_cli.c
@@ -46,7 +46,7 @@ static struct pingcli_data *client = NULL;
 static int count = 0;
 
 static void
-pingcli_shutdown(ptl_handle_ni_t nih, int err)
+pingcli_shutdown(int err)
 {
         int rc;
 
@@ -70,7 +70,7 @@ pingcli_shutdown(ptl_handle_ni_t nih, int err)
                         if ((rc = PtlMEUnlink (client->me)))
                                 PDEBUG ("PtlMEUnlink", rc);
                 case 3:
-                        PtlNIFini(nih);
+                        kportal_put_ni (client->args->ioc_nal);
 
                 case 4:
                         /* Free our buffers */
@@ -84,7 +84,7 @@ pingcli_shutdown(ptl_handle_ni_t nih, int err)
         CDEBUG (D_OTHER, "ping client released resources\n");
 } /* pingcli_shutdown() */
 
-static void pingcli_callback(ptl_event_t *ev)
+static int pingcli_callback(ptl_event_t *ev)
 {
         int i, magic;
         i = *(int *)(ev->mem_desc.start + ev->offset + sizeof(unsigned));
@@ -92,19 +92,21 @@ static void pingcli_callback(ptl_event_t *ev)
 
         if(magic != 0xcafebabe) {
                 printk ("LustreError: Unexpected response \n");
+                return 1;
         }
 
         if((i == count) || !count)
                 wake_up_process (client->tsk);
         else
                 printk ("LustreError: Received response after timeout for %d\n",i);
+        return 1;
 }
 
 
 static struct pingcli_data *
 pingcli_start(struct portal_ioctl_data *args)
 {
-        ptl_handle_ni_t nih = PTL_INVALID_HANDLE;
+        ptl_handle_ni_t *nip;
         unsigned ping_head_magic = PING_HEADER_MAGIC;
         unsigned ping_bulk_magic = PING_BULK_MAGIC;
         int rc;
@@ -125,7 +127,7 @@ pingcli_start(struct portal_ioctl_data *args)
         if (client->outbuf == NULL)
         {
                 CERROR ("Unable to allocate out_buf ("LPSZ" bytes)\n", STDSIZE);
-                pingcli_shutdown (nih, 4);
+                pingcli_shutdown (4);
                 return (NULL);
         }
 
@@ -134,24 +136,23 @@ pingcli_start(struct portal_ioctl_data *args)
         if (client->inbuf == NULL)
         {
                 CERROR ("Unable to allocate out_buf ("LPSZ" bytes)\n", STDSIZE);
-                pingcli_shutdown (nih, 4);
+                pingcli_shutdown (4);
                 return (NULL);
         }
 
         /* Aquire and initialize the proper nal for portals. */
-        rc = PtlNIInit(args->ioc_nal, 0, NULL, NULL, &nih);
-        if (rc != PTL_OK || rc != PTL_IFACE_DUP)
+        if ((nip = kportal_get_ni (args->ioc_nal)) == NULL)
         {
                 CERROR ("NAL %d not loaded\n", args->ioc_nal);
-                pingcli_shutdown (nih, 4);
+                pingcli_shutdown (4);
                 return (NULL);
         }
 
         /* Based on the initialization aquire our unique portal ID. */
-        if ((rc = PtlGetId (nih, &client->myid)))
+        if ((rc = PtlGetId (*nip, &client->myid)))
         {
                 CERROR ("PtlGetId error %d\n", rc);
-                pingcli_shutdown (nih, 2);
+                pingcli_shutdown (2);
                 return (NULL);
         }
 
@@ -163,20 +164,20 @@ pingcli_start(struct portal_ioctl_data *args)
         client->id_remote.nid = args->ioc_nid;
         client->id_remote.pid = 0;
 
-        if ((rc = PtlMEAttach (nih, PTL_PING_CLIENT,
+        if ((rc = PtlMEAttach (*nip, PTL_PING_CLIENT,
                    client->id_local, 0, ~0, PTL_RETAIN,
                    PTL_INS_AFTER, &client->me)))
         {
                 CERROR ("PtlMEAttach error %d\n", rc);
-                pingcli_shutdown (nih, 2);
+                pingcli_shutdown (2);
                 return (NULL);
         }
 
         /* Allocate the event queue for this network interface */
-        if ((rc = PtlEQAlloc (nih, 64, pingcli_callback, &client->eq)))
+        if ((rc = PtlEQAlloc (*nip, 64, pingcli_callback, &client->eq)))
         {
                 CERROR ("PtlEQAlloc error %d\n", rc);
-                pingcli_shutdown (nih, 2);
+                pingcli_shutdown (2);
                 return (NULL);
         }
 
@@ -195,7 +196,7 @@ pingcli_start(struct portal_ioctl_data *args)
         if ((rc = PtlMDAttach (client->me, client->md_in_head,
                               PTL_UNLINK, &client->md_in_head_h))) {
                 CERROR ("PtlMDAttach error %d\n", rc);
-                pingcli_shutdown (nih, 1);
+                pingcli_shutdown (1);
                 return (NULL);
         }
         /* Setup the outgoing ping header */
@@ -211,10 +212,10 @@ pingcli_start(struct portal_ioctl_data *args)
         count = 0;
 
         /* Bind the outgoing ping header */
-        if ((rc=PtlMDBind (nih, client->md_out_head,
+        if ((rc=PtlMDBind (*nip, client->md_out_head,
                            PTL_UNLINK, &client->md_out_head_h))) {
                 CERROR ("PtlMDBind error %d\n", rc);
-                pingcli_shutdown (nih, 1);
+                pingcli_shutdown (1);
                 return NULL;
         }
         while ((args->ioc_count - count)) {
@@ -229,7 +230,7 @@ pingcli_start(struct portal_ioctl_data *args)
                 if((rc = PtlPut (client->md_out_head_h, PTL_NOACK_REQ,
                           client->id_remote, PTL_PING_SERVER, 0, 0, 0, 0))) {
                          PDEBUG ("PtlPut (header)", rc);
-                         pingcli_shutdown (nih, 1);
+                         pingcli_shutdown (1);
                          return NULL;
                 }
                 printk ("Lustre: sent msg no %d", count);
@@ -254,7 +255,7 @@ pingcli_start(struct portal_ioctl_data *args)
                 PORTAL_FREE (client->inbuf,
                                (args->ioc_size + STDSIZE) * args->ioc_count);
 
-        pingcli_shutdown (nih, 2);
+        pingcli_shutdown (2);
 
         /* Success! */
         return NULL;
diff --git a/lnet/tests/ping_srv.c b/lnet/tests/ping_srv.c
index 188ba98..0aa1ea7 100644
--- a/lnet/tests/ping_srv.c
+++ b/lnet/tests/ping_srv.c
@@ -81,7 +81,7 @@ static void *pingsrv_shutdown(int err)
                                         PDEBUG ("PtlMEUnlink", rc);
 
                 case 3:
-                        PtlNIFini (server->ni);
+                        kportal_put_ni (nal);
 
                 case 4:
                         
@@ -167,18 +167,19 @@ int pingsrv_thread(void *arg)
         return 0;    
 }
 
-static void pingsrv_packet(ptl_event_t *ev)
+static int pingsrv_packet(ptl_event_t *ev)
 {
         atomic_inc (&pkt);
         wake_up_process (server->tsk);
+        return 1;
 } /* pingsrv_head() */
 
-static void pingsrv_callback(ptl_event_t *ev)
+static int pingsrv_callback(ptl_event_t *ev)
 {
         
         if (ev == NULL) {
                 CERROR ("null in callback, ev=%p\n", ev);
-                return;
+                return 0;
         }
         server->evnt = *ev;
         
@@ -192,24 +193,23 @@ static void pingsrv_callback(ptl_event_t *ev)
         
         packets_valid++;
 
-        pingsrv_packet(ev);
+        return pingsrv_packet(ev);
         
 } /* pingsrv_callback() */
 
 
 static struct pingsrv_data *pingsrv_setup(void)
 {
+        ptl_handle_ni_t *nip;
         int rc;
 
-        server->ni = PTL_INVALID_HANDLE;
-
        /* Aquire and initialize the proper nal for portals. */
-        rc = PtlNIInit(nal, 0, NULL, NULL, &server->ni);
-        if (!(rc == PTL_OK || rc == PTL_IFACE_DUP)) {
+        if ((nip = kportal_get_ni (nal)) == NULL) {
                 CDEBUG (D_OTHER, "NAL %d not loaded\n", nal);
                 return pingsrv_shutdown (4);
         }
 
+        server->ni= *nip;
 
         /* Based on the initialization aquire our unique portal ID. */
         if ((rc = PtlGetId (server->ni, &server->my_id))) {
@@ -229,7 +229,7 @@ static struct pingsrv_data *pingsrv_setup(void)
         }
 
 
-        if ((rc = PtlEQAlloc (server->ni, 1024, &pingsrv_callback,
+        if ((rc = PtlEQAlloc (server->ni, 1024, pingsrv_callback,
                                         &server->eq))) {
                 PDEBUG ("PtlEQAlloc (callback)", rc);
                 return pingsrv_shutdown (2);
@@ -298,7 +298,7 @@ static void /*__exit*/ pingsrv_cleanup(void)
 
 MODULE_PARM(nal, "i");
 MODULE_PARM_DESC(nal, "Use the specified NAL "
-                "(2-ksocknal, 1-kqswnal)");
+                "(6-kscimacnal, 2-ksocknal, 1-kqswnal)");
  
 MODULE_AUTHOR("Brian Behlendorf (LLNL)");
 MODULE_DESCRIPTION("A kernel space ping server for portals testing");
diff --git a/lnet/tests/sping_cli.c b/lnet/tests/sping_cli.c
index 8e86491..663da4e 100644
--- a/lnet/tests/sping_cli.c
+++ b/lnet/tests/sping_cli.c
@@ -51,7 +51,7 @@ static struct pingcli_data *client = NULL;
 static int count = 0;
 
 static void
-pingcli_shutdown(ptl_handle_ni_t nih, int err)
+pingcli_shutdown(int err)
 {
         int rc;
 
@@ -72,7 +72,7 @@ pingcli_shutdown(ptl_handle_ni_t nih, int err)
                         if ((rc = PtlMEUnlink (client->me)))
                                 PDEBUG ("PtlMEUnlink", rc);
                 case 3:
-                        PtlNIFini (nih);
+                        kportal_put_ni (client->args->ioc_nal);
 
                 case 4:
                         /* Free our buffers */
@@ -92,16 +92,17 @@ pingcli_shutdown(ptl_handle_ni_t nih, int err)
         CDEBUG (D_OTHER, "ping client released resources\n");
 } /* pingcli_shutdown() */
 
-static void pingcli_callback(ptl_event_t *ev)
+static int pingcli_callback(ptl_event_t *ev)
 {
-        wake_up_process (client->tsk);
+                wake_up_process (client->tsk);
+        return 1;
 }
 
 
 static struct pingcli_data *
 pingcli_start(struct portal_ioctl_data *args)
 {
-        ptl_handle_ni_t nih = PTL_INVALID_HANDLE;
+        const ptl_handle_ni_t *nip;
         unsigned ping_head_magic = PING_HEADER_MAGIC;
         char str[PTL_NALFMT_SIZE];
         int rc;
@@ -121,7 +122,7 @@ pingcli_start(struct portal_ioctl_data *args)
         if (client->outbuf == NULL)
         {
                 CERROR ("Unable to allocate out_buf ("LPSZ" bytes)\n", STDSIZE);
-                pingcli_shutdown (nih, 4);
+                pingcli_shutdown (4);
                 return (NULL);
         }
 
@@ -130,24 +131,23 @@ pingcli_start(struct portal_ioctl_data *args)
         if (client->inbuf == NULL)
         {
                 CERROR ("Unable to allocate out_buf ("LPSZ" bytes)\n", STDSIZE);
-                pingcli_shutdown (nih, 4);
+                pingcli_shutdown (4);
                 return (NULL);
         }
 
         /* Aquire and initialize the proper nal for portals. */
-        rc = PtlNIInit(args->ioc_nal, 0, NULL, NULL, &nih);
-        if (rc != PTL_OK && rc != PTL_IFACE_DUP)
+        if ((nip = kportal_get_ni (args->ioc_nal)) == NULL)
         {
                 CERROR ("NAL %d not loaded.\n", args->ioc_nal);
-                pingcli_shutdown (nih, 4);
+                pingcli_shutdown (4);
                 return (NULL);
         }
 
         /* Based on the initialization aquire our unique portal ID. */
-        if ((rc = PtlGetId (nih, &client->myid)))
+        if ((rc = PtlGetId (*nip, &client->myid)))
         {
                 CERROR ("PtlGetId error %d\n", rc);
-                pingcli_shutdown (nih, 2);
+                pingcli_shutdown (2);
                 return (NULL);
         }
 
@@ -159,20 +159,20 @@ pingcli_start(struct portal_ioctl_data *args)
         client->id_remote.nid = args->ioc_nid;
         client->id_remote.pid = 0;
 
-        if ((rc = PtlMEAttach (nih, PTL_PING_CLIENT,
+        if ((rc = PtlMEAttach (*nip, PTL_PING_CLIENT,
                    client->id_local, 0, ~0, PTL_RETAIN,
                    PTL_INS_AFTER, &client->me)))
         {
                 CERROR ("PtlMEAttach error %d\n", rc);
-                pingcli_shutdown (nih, 2);
+                pingcli_shutdown (2);
                 return (NULL);
         }
 
         /* Allocate the event queue for this network interface */
-        if ((rc = PtlEQAlloc (nih, 64, pingcli_callback, &client->eq)))
+        if ((rc = PtlEQAlloc (*nip, 64, pingcli_callback, &client->eq)))
         {
                 CERROR ("PtlEQAlloc error %d\n", rc);
-                pingcli_shutdown (nih, 2);
+                pingcli_shutdown (2);
                 return (NULL);
         }
 
@@ -189,7 +189,7 @@ pingcli_start(struct portal_ioctl_data *args)
         if ((rc = PtlMDAttach (client->me, client->md_in_head,
                               PTL_UNLINK, &client->md_in_head_h))) {
                 CERROR ("PtlMDAttach error %d\n", rc);
-                pingcli_shutdown (nih, 1);
+                pingcli_shutdown (1);
                 return (NULL);
         }
 
@@ -204,17 +204,17 @@ pingcli_start(struct portal_ioctl_data *args)
         memcpy (client->outbuf, &ping_head_magic, sizeof(ping_head_magic));
 
         /* Bind the outgoing ping header */
-        if ((rc=PtlMDBind (nih, client->md_out_head,
+        if ((rc=PtlMDBind (*nip, client->md_out_head,
                            PTL_UNLINK, &client->md_out_head_h))) {
                 CERROR ("PtlMDBind error %d\n", rc);
-                pingcli_shutdown (nih, 1);
+                pingcli_shutdown (1);
                 return (NULL);
         }
         /* Put the ping packet */
         if((rc = PtlPut (client->md_out_head_h, PTL_NOACK_REQ,
                          client->id_remote, PTL_PING_SERVER, 0, 0, 0, 0))) {
                 PDEBUG ("PtlPut (header)", rc);
-                pingcli_shutdown (nih, 1);
+                pingcli_shutdown (1);
                 return NULL;
         }
 
@@ -223,13 +223,13 @@ pingcli_start(struct portal_ioctl_data *args)
         rc = schedule_timeout (20 * args->ioc_timeout);
         if (rc == 0) {
                 printk ("LustreError: Time out on the server\n");
-                pingcli_shutdown (nih, 2);
+                pingcli_shutdown (2);
                 return NULL;
         } else
                 printk("Lustre: Received respose from the server \n");
 
 
-        pingcli_shutdown (nih, 2);
+        pingcli_shutdown (2);
 
         /* Success! */
         return NULL;
diff --git a/lnet/tests/sping_srv.c b/lnet/tests/sping_srv.c
index d840ddd..e8fb470 100644
--- a/lnet/tests/sping_srv.c
+++ b/lnet/tests/sping_srv.c
@@ -53,7 +53,7 @@
 
 #define STDSIZE (sizeof(int) + sizeof(int) + 4)
 
-static int nal  = PTL_IFACE_DEFAULT;            // Your NAL,
+static int nal  = 0;                            // Your NAL,
 static unsigned long packets_valid = 0;         // Valid packets 
 static int running = 1;
 atomic_t pkt;
@@ -86,7 +86,7 @@ static void *pingsrv_shutdown(int err)
                                         PDEBUG ("PtlMEUnlink", rc);
 
                 case 3:
-                        PtlNIFini(server->ni);
+                        kportal_put_ni (nal);
 
                 case 4:
                         
@@ -159,18 +159,19 @@ int pingsrv_thread(void *arg)
         return 0;    
 }
 
-static void pingsrv_packet(ptl_event_t *ev)
+static int pingsrv_packet(ptl_event_t *ev)
 {
         atomic_inc (&pkt);
         wake_up_process (server->tsk);
+        return 1;
 } /* pingsrv_head() */
 
-static void pingsrv_callback(ptl_event_t *ev)
+static int pingsrv_callback(ptl_event_t *ev)
 {
         
         if (ev == NULL) {
                 CERROR ("null in callback, ev=%p\n", ev);
-                return;
+                return 0;
         }
         server->evnt = *ev;
         
@@ -181,24 +182,24 @@ static void pingsrv_callback(ptl_event_t *ev)
         
         packets_valid++;
 
-        pingsrv_packet(ev);
+        return pingsrv_packet(ev);
         
 } /* pingsrv_callback() */
 
 
 static struct pingsrv_data *pingsrv_setup(void)
 {
+        ptl_handle_ni_t *nip;
         int rc;
 
        /* Aquire and initialize the proper nal for portals. */
-        server->ni = PTL_INVALID_HANDLE;
-
-        rc = PtlNIInit(nal, 0, NULL, NULL, &server->ni);
-        if (rc != PTL_OK && rc != PTL_IFACE_DUP) {
+        if ((nip = kportal_get_ni (nal)) == NULL) {
                 CDEBUG (D_OTHER, "Nal %d not loaded.\n", nal);
                 return pingsrv_shutdown (4);
         }
 
+        server->ni= *nip;
+
         /* Based on the initialization aquire our unique portal ID. */
         if ((rc = PtlGetId (server->ni, &server->my_id))) {
                 PDEBUG ("PtlGetId", rc);
@@ -284,7 +285,7 @@ static void /*__exit*/ pingsrv_cleanup(void)
 
 MODULE_PARM(nal, "i");
 MODULE_PARM_DESC(nal, "Use the specified NAL "
-                "(2-ksocknal, 1-kqswnal)");
+                "(6-kscimacnal, 2-ksocknal, 1-kqswnal)");
  
 MODULE_AUTHOR("Brian Behlendorf (LLNL)");
 MODULE_DESCRIPTION("A kernel space ping server for portals testing");
diff --git a/lnet/ulnds/Makefile.am b/lnet/ulnds/Makefile.am
index 1681250..6035ca1 100644
--- a/lnet/ulnds/Makefile.am
+++ b/lnet/ulnds/Makefile.am
@@ -1,10 +1,9 @@
-if LIBLUSTRE
+CPPFLAGS=
+INCLUDES=-I$(top_srcdir)/portals/include -I$(top_srcdir)/include -I$(srcdir)
 noinst_LIBRARIES = libtcpnal.a
-endif
-
-if !CRAY_PORTALS
 pkginclude_HEADERS =  pqtimer.h dispatch.h table.h timer.h connection.h ipmap.h bridge.h procbridge.h
 libtcpnal_a_SOURCES = debug.c pqtimer.c select.c table.c pqtimer.h dispatch.h table.h timer.h address.c procapi.c proclib.c connection.c tcpnal.c connection.h
-libtcpnal_a_CPPFLAGS = $(LLCPPFLAGS)
-libtcpnal_a_CFLAGS = $(LLCFLAGS)
-endif
\ No newline at end of file
+
+if LIBLUSTRE
+libtcpnal_a_CFLAGS = -fPIC
+endif
diff --git a/lnet/ulnds/bridge.h b/lnet/ulnds/bridge.h
index 90ce324..9a90ab8 100644
--- a/lnet/ulnds/bridge.h
+++ b/lnet/ulnds/bridge.h
@@ -10,12 +10,6 @@
 #define TCPNAL_PROCBRIDGE_H
 
 #include <portals/lib-p30.h>
-#include <portals/nal.h>
-
-#define PTL_IFACE_TCP 1
-#define PTL_IFACE_ER 2
-#define PTL_IFACE_SS 3
-#define PTL_IFACE_MAX 4
 
 typedef struct bridge {
     int alive;
@@ -28,6 +22,12 @@ typedef struct bridge {
 } *bridge;
 
 
+nal_t *bridge_init(ptl_interface_t nal,
+                   ptl_pid_t pid_request,
+                   ptl_ni_limits_t *desired,
+                   ptl_ni_limits_t *actual,
+                   int *rc);
+
 typedef int (*nal_initialize)(bridge);
 extern nal_initialize nal_table[PTL_IFACE_MAX];
 
diff --git a/lnet/ulnds/connection.c b/lnet/ulnds/connection.c
index 3448460..ca6999a 100644
--- a/lnet/ulnds/connection.c
+++ b/lnet/ulnds/connection.c
@@ -229,7 +229,7 @@ tcpnal_hello (int sockfd, ptl_nid_t *nid, int type, __u64 incarnation)
         hdr.type    = __cpu_to_le32 (PTL_MSG_HELLO);
 
         hdr.msg.hello.type = __cpu_to_le32 (type);
-        hdr.msg.hello.incarnation = __cpu_to_le64(incarnation);
+        hdr.msg.hello.incarnation = 0;
 
         /* Assume sufficient socket buffering for this message */
         rc = syscall(SYS_write, sockfd, &hdr, sizeof(hdr));
@@ -315,8 +315,6 @@ connection force_tcp_connection(manager m,
     connection conn;
     struct sockaddr_in addr;
     unsigned int id[2];
-    struct timeval tv;
-    __u64 incarnation;
 
     port = tcpnal_acceptor_port;
 
@@ -355,11 +353,8 @@ connection force_tcp_connection(manager m,
         setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &option, sizeof(option));
 #endif
    
-        gettimeofday(&tv, NULL);
-        incarnation = (((__u64)tv.tv_sec) * 1000000) + tv.tv_usec;
-
         /* say hello */
-        if (tcpnal_hello(fd, &peernid, SOCKNAL_CONN_ANY, incarnation))
+        if (tcpnal_hello(fd, &peernid, SOCKNAL_CONN_ANY, 0))
             exit(-1);
 
         conn = allocate_connection(m, ip, port, fd);
diff --git a/lnet/ulnds/procapi.c b/lnet/ulnds/procapi.c
index e40c4b9..00a7ae4 100644
--- a/lnet/ulnds/procapi.c
+++ b/lnet/ulnds/procapi.c
@@ -95,7 +95,7 @@ static int procbridge_forward(nal_t *n, int id, void *args, size_t args_len,
  * cleanup nal state, reclaim the lower side thread and
  *   its state using PTL_FINI codepoint
  */
-static void procbridge_shutdown(nal_t *n)
+static int procbridge_shutdown(nal_t *n, int ni)
 {
     bridge b=(bridge)n->nal_data;
     procbridge p=(procbridge)b->local;
@@ -114,6 +114,16 @@ static void procbridge_shutdown(nal_t *n)
     } while (1);
 
     free(p);
+    return(0);
+}
+
+
+/* Function: validate
+ *    useless stub
+ */
+static int procbridge_validate(nal_t *nal, void *base, size_t extent)
+{
+    return(0);
 }
 
 
@@ -177,20 +187,18 @@ static int procbridge_yield(nal_t *n, unsigned long *flags, int milliseconds)
     return (milliseconds);
 }
 
-/* forward decl */
-extern int procbridge_startup (nal_t *, ptl_pid_t,
-                               ptl_ni_limits_t *, ptl_ni_limits_t *);
 
 /* api_nal
  *  the interface vector to allow the generic code to access
  *  this nal. this is seperate from the library side nal_cb.
  *  TODO: should be dyanmically allocated
  */
-nal_t procapi_nal = {
+static nal_t api_nal = {
+    ni:       {0},
     nal_data: NULL,
-    startup:  procbridge_startup,
-    shutdown: procbridge_shutdown,
     forward:  procbridge_forward,
+    shutdown: procbridge_shutdown,
+    validate: procbridge_validate,
     yield:    procbridge_yield,
     lock:     procbridge_lock,
     unlock:   procbridge_unlock
@@ -198,7 +206,7 @@ nal_t procapi_nal = {
 
 ptl_nid_t tcpnal_mynid;
 
-/* Function: procbridge_startup
+/* Function: procbridge_interface
  *
  * Arguments:  pid: requested process id (port offset)
  *                  PTL_ID_ANY not supported.
@@ -206,34 +214,40 @@ ptl_nid_t tcpnal_mynid;
  *                      and effectively ignored
  *             actual:  limits actually allocated and returned
  *
- * Returns: portals rc
+ * Returns: a pointer to my statically allocated top side NAL
+ *          structure
  *
  * initializes the tcp nal. we define unix_failure as an
  * error wrapper to cut down clutter.
  */
-int procbridge_startup (nal_t *nal, ptl_pid_t requested_pid,
-                        ptl_ni_limits_t *requested_limits,
-                        ptl_ni_limits_t *actual_limits)
+nal_t *procbridge_interface(int num_interface,
+                            ptl_pt_index_t ptl_size,
+                            ptl_ac_index_t acl_size,
+                            ptl_pid_t requested_pid)
 {
     nal_init_args_t args;
-
     procbridge p;
     bridge b;
-    /* XXX nal_type is purely private to tcpnal here */
+    static int initialized=0;
+    ptl_ni_limits_t limits = {-1,-1,-1,-1,-1};
     int nal_type = PTL_IFACE_TCP;/* PTL_IFACE_DEFAULT FIXME hack */
 
-    LASSERT(nal == &procapi_nal);
+    if(initialized) return (&api_nal);
 
     init_unix_timer();
 
     b=(bridge)malloc(sizeof(struct bridge));
     p=(procbridge)malloc(sizeof(struct procbridge));
-    nal->nal_data=b;
+    api_nal.nal_data=b;
     b->local=p;
 
+    if (ptl_size)
+	    limits.max_ptable_index = ptl_size;
+    if (acl_size)
+	    limits.max_atable_index = acl_size;
+
     args.nia_requested_pid = requested_pid;
-    args.nia_requested_limits = requested_limits;
-    args.nia_actual_limits = actual_limits;
+    args.nia_limits = &limits;
     args.nia_nal_type = nal_type;
     args.nia_bridge = b;
 
@@ -245,19 +259,19 @@ int procbridge_startup (nal_t *nal, ptl_pid_t requested_pid,
     /* initialize notifier */
     if (socketpair(AF_UNIX, SOCK_STREAM, 0, p->notifier)) {
         perror("socketpair failed");
-        return PTL_FAIL;
+        return NULL;
     }
 
     if (!register_io_handler(p->notifier[1], READ_HANDLER,
                 procbridge_notifier_handler, p)) {
         perror("fail to register notifier handler");
-        return PTL_FAIL;
+        return NULL;
     }
 
     /* create nal thread */
     if (pthread_create(&p->t, NULL, nal_thread, &args)) {
         perror("nal_init: pthread_create");
-        return PTL_FAIL;
+        return(NULL);
     }
 
     do {
@@ -271,9 +285,10 @@ int procbridge_startup (nal_t *nal, ptl_pid_t requested_pid,
     } while (1);
 
     if (p->nal_flags & NAL_FLAG_STOPPED)
-        return PTL_FAIL;
+        return (NULL);
 
     b->nal_cb->ni.nid = tcpnal_mynid;
+    initialized = 1;
 
-    return PTL_OK;
+    return (&api_nal);
 }
diff --git a/lnet/ulnds/procbridge.h b/lnet/ulnds/procbridge.h
index 1c8e7dd..965f83d 100644
--- a/lnet/ulnds/procbridge.h
+++ b/lnet/ulnds/procbridge.h
@@ -35,8 +35,7 @@ typedef struct procbridge {
 
 typedef struct nal_init_args {
     ptl_pid_t        nia_requested_pid;
-    ptl_ni_limits_t *nia_requested_limits;
-    ptl_ni_limits_t *nia_actual_limits;
+    ptl_ni_limits_t *nia_limits;
     int              nia_nal_type;
     bridge           nia_bridge;
 } nal_init_args_t;
@@ -51,6 +50,10 @@ extern void *nal_thread(void *);
 #define MAX_PTLS        128
 
 extern void set_address(bridge t,ptl_pid_t pidrequest);
+extern nal_t *procbridge_interface(int num_interface,
+                                   ptl_pt_index_t ptl_size,
+                                   ptl_ac_index_t acl_size,
+                                   ptl_pid_t requested_pid);
 extern void procbridge_wakeup_nal(procbridge p);
 
 #endif
diff --git a/lnet/ulnds/proclib.c b/lnet/ulnds/proclib.c
index af0745b..1cfb233 100644
--- a/lnet/ulnds/proclib.c
+++ b/lnet/ulnds/proclib.c
@@ -157,6 +157,9 @@ static void check_stopping(void *z)
  *  We define a limit macro to place a ceiling on limits
  *   for syntactic convenience
  */
+#define LIMIT(x,y,max)\
+     if ((unsigned int)x > max) y = max;
+
 extern int tcpnal_init(bridge);
 
 nal_initialize nal_table[PTL_IFACE_MAX]={0,tcpnal_init,0};
@@ -167,8 +170,10 @@ void *nal_thread(void *z)
     bridge b = args->nia_bridge;
     procbridge p=b->local;
     int rc;
-    ptl_process_id_t process_id;
+    ptl_pid_t pid_request;
     int nal_type;
+    ptl_ni_limits_t desired;
+    ptl_ni_limits_t actual;
     
     b->nal_cb=(nal_cb_t *)malloc(sizeof(nal_cb_t));
     b->nal_cb->nal_data=b;
@@ -184,21 +189,28 @@ void *nal_thread(void *z)
     b->nal_cb->cb_callback=nal_callback;
     b->nal_cb->cb_dist=nal_dist;
 
+    pid_request = args->nia_requested_pid;
+    desired = *args->nia_limits;
     nal_type = args->nia_nal_type;
 
-    /* Wierd, but this sets b->nal_cb->ni.{nid,pid}, which lib_init() is
-     * about to do from the process_id passed to it...*/
-    set_address(b,args->nia_requested_pid);
+    actual = desired;
+    LIMIT(desired.max_match_entries,actual.max_match_entries,MAX_MES);
+    LIMIT(desired.max_mem_descriptors,actual.max_mem_descriptors,MAX_MDS);
+    LIMIT(desired.max_event_queues,actual.max_event_queues,MAX_EQS);
+    LIMIT(desired.max_atable_index,actual.max_atable_index,MAX_ACLS);
+    LIMIT(desired.max_ptable_index,actual.max_ptable_index,MAX_PTLS);
+
+    set_address(b,pid_request);
 
-    process_id.pid = b->nal_cb->ni.pid;
-    process_id.nid = b->nal_cb->ni.nid;
-    
     if (nal_table[nal_type]) rc=(*nal_table[nal_type])(b);
     /* initialize the generic 'library' level code */
 
-    rc = lib_init(b->nal_cb, process_id, 
-                  args->nia_requested_limits, 
-                  args->nia_actual_limits);
+    rc = lib_init(b->nal_cb, 
+                  b->nal_cb->ni.nid,
+                  b->nal_cb->ni.pid,
+		  10,
+		  actual.max_ptable_index,
+		  actual.max_atable_index);
 
     /*
      * Whatever the initialization returned is passed back to the
@@ -207,11 +219,11 @@ void *nal_thread(void *z)
      */
     /* this should perform error checking */
     pthread_mutex_lock(&p->mutex);
-    p->nal_flags |= (rc != PTL_OK) ? NAL_FLAG_STOPPED : NAL_FLAG_RUNNING;
+    p->nal_flags |= rc ? NAL_FLAG_STOPPED : NAL_FLAG_RUNNING;
     pthread_cond_broadcast(&p->cond);
     pthread_mutex_unlock(&p->mutex);
 
-    if (rc == PTL_OK) {
+    if (!rc) {
         /* the thunk function is called each time the timer loop
            performs an operation and returns to blocking mode. we
            overload this function to inform the api side that
@@ -221,3 +233,4 @@ void *nal_thread(void *z)
     }
     return(0);
 }
+#undef LIMIT
diff --git a/lnet/ulnds/socklnd/Makefile.am b/lnet/ulnds/socklnd/Makefile.am
index 1681250..6035ca1 100644
--- a/lnet/ulnds/socklnd/Makefile.am
+++ b/lnet/ulnds/socklnd/Makefile.am
@@ -1,10 +1,9 @@
-if LIBLUSTRE
+CPPFLAGS=
+INCLUDES=-I$(top_srcdir)/portals/include -I$(top_srcdir)/include -I$(srcdir)
 noinst_LIBRARIES = libtcpnal.a
-endif
-
-if !CRAY_PORTALS
 pkginclude_HEADERS =  pqtimer.h dispatch.h table.h timer.h connection.h ipmap.h bridge.h procbridge.h
 libtcpnal_a_SOURCES = debug.c pqtimer.c select.c table.c pqtimer.h dispatch.h table.h timer.h address.c procapi.c proclib.c connection.c tcpnal.c connection.h
-libtcpnal_a_CPPFLAGS = $(LLCPPFLAGS)
-libtcpnal_a_CFLAGS = $(LLCFLAGS)
-endif
\ No newline at end of file
+
+if LIBLUSTRE
+libtcpnal_a_CFLAGS = -fPIC
+endif
diff --git a/lnet/ulnds/socklnd/bridge.h b/lnet/ulnds/socklnd/bridge.h
index 90ce324..9a90ab8 100644
--- a/lnet/ulnds/socklnd/bridge.h
+++ b/lnet/ulnds/socklnd/bridge.h
@@ -10,12 +10,6 @@
 #define TCPNAL_PROCBRIDGE_H
 
 #include <portals/lib-p30.h>
-#include <portals/nal.h>
-
-#define PTL_IFACE_TCP 1
-#define PTL_IFACE_ER 2
-#define PTL_IFACE_SS 3
-#define PTL_IFACE_MAX 4
 
 typedef struct bridge {
     int alive;
@@ -28,6 +22,12 @@ typedef struct bridge {
 } *bridge;
 
 
+nal_t *bridge_init(ptl_interface_t nal,
+                   ptl_pid_t pid_request,
+                   ptl_ni_limits_t *desired,
+                   ptl_ni_limits_t *actual,
+                   int *rc);
+
 typedef int (*nal_initialize)(bridge);
 extern nal_initialize nal_table[PTL_IFACE_MAX];
 
diff --git a/lnet/ulnds/socklnd/connection.c b/lnet/ulnds/socklnd/connection.c
index 3448460..ca6999a 100644
--- a/lnet/ulnds/socklnd/connection.c
+++ b/lnet/ulnds/socklnd/connection.c
@@ -229,7 +229,7 @@ tcpnal_hello (int sockfd, ptl_nid_t *nid, int type, __u64 incarnation)
         hdr.type    = __cpu_to_le32 (PTL_MSG_HELLO);
 
         hdr.msg.hello.type = __cpu_to_le32 (type);
-        hdr.msg.hello.incarnation = __cpu_to_le64(incarnation);
+        hdr.msg.hello.incarnation = 0;
 
         /* Assume sufficient socket buffering for this message */
         rc = syscall(SYS_write, sockfd, &hdr, sizeof(hdr));
@@ -315,8 +315,6 @@ connection force_tcp_connection(manager m,
     connection conn;
     struct sockaddr_in addr;
     unsigned int id[2];
-    struct timeval tv;
-    __u64 incarnation;
 
     port = tcpnal_acceptor_port;
 
@@ -355,11 +353,8 @@ connection force_tcp_connection(manager m,
         setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &option, sizeof(option));
 #endif
    
-        gettimeofday(&tv, NULL);
-        incarnation = (((__u64)tv.tv_sec) * 1000000) + tv.tv_usec;
-
         /* say hello */
-        if (tcpnal_hello(fd, &peernid, SOCKNAL_CONN_ANY, incarnation))
+        if (tcpnal_hello(fd, &peernid, SOCKNAL_CONN_ANY, 0))
             exit(-1);
 
         conn = allocate_connection(m, ip, port, fd);
diff --git a/lnet/ulnds/socklnd/procapi.c b/lnet/ulnds/socklnd/procapi.c
index e40c4b9..00a7ae4 100644
--- a/lnet/ulnds/socklnd/procapi.c
+++ b/lnet/ulnds/socklnd/procapi.c
@@ -95,7 +95,7 @@ static int procbridge_forward(nal_t *n, int id, void *args, size_t args_len,
  * cleanup nal state, reclaim the lower side thread and
  *   its state using PTL_FINI codepoint
  */
-static void procbridge_shutdown(nal_t *n)
+static int procbridge_shutdown(nal_t *n, int ni)
 {
     bridge b=(bridge)n->nal_data;
     procbridge p=(procbridge)b->local;
@@ -114,6 +114,16 @@ static void procbridge_shutdown(nal_t *n)
     } while (1);
 
     free(p);
+    return(0);
+}
+
+
+/* Function: validate
+ *    useless stub
+ */
+static int procbridge_validate(nal_t *nal, void *base, size_t extent)
+{
+    return(0);
 }
 
 
@@ -177,20 +187,18 @@ static int procbridge_yield(nal_t *n, unsigned long *flags, int milliseconds)
     return (milliseconds);
 }
 
-/* forward decl */
-extern int procbridge_startup (nal_t *, ptl_pid_t,
-                               ptl_ni_limits_t *, ptl_ni_limits_t *);
 
 /* api_nal
  *  the interface vector to allow the generic code to access
  *  this nal. this is seperate from the library side nal_cb.
  *  TODO: should be dyanmically allocated
  */
-nal_t procapi_nal = {
+static nal_t api_nal = {
+    ni:       {0},
     nal_data: NULL,
-    startup:  procbridge_startup,
-    shutdown: procbridge_shutdown,
     forward:  procbridge_forward,
+    shutdown: procbridge_shutdown,
+    validate: procbridge_validate,
     yield:    procbridge_yield,
     lock:     procbridge_lock,
     unlock:   procbridge_unlock
@@ -198,7 +206,7 @@ nal_t procapi_nal = {
 
 ptl_nid_t tcpnal_mynid;
 
-/* Function: procbridge_startup
+/* Function: procbridge_interface
  *
  * Arguments:  pid: requested process id (port offset)
  *                  PTL_ID_ANY not supported.
@@ -206,34 +214,40 @@ ptl_nid_t tcpnal_mynid;
  *                      and effectively ignored
  *             actual:  limits actually allocated and returned
  *
- * Returns: portals rc
+ * Returns: a pointer to my statically allocated top side NAL
+ *          structure
  *
  * initializes the tcp nal. we define unix_failure as an
  * error wrapper to cut down clutter.
  */
-int procbridge_startup (nal_t *nal, ptl_pid_t requested_pid,
-                        ptl_ni_limits_t *requested_limits,
-                        ptl_ni_limits_t *actual_limits)
+nal_t *procbridge_interface(int num_interface,
+                            ptl_pt_index_t ptl_size,
+                            ptl_ac_index_t acl_size,
+                            ptl_pid_t requested_pid)
 {
     nal_init_args_t args;
-
     procbridge p;
     bridge b;
-    /* XXX nal_type is purely private to tcpnal here */
+    static int initialized=0;
+    ptl_ni_limits_t limits = {-1,-1,-1,-1,-1};
     int nal_type = PTL_IFACE_TCP;/* PTL_IFACE_DEFAULT FIXME hack */
 
-    LASSERT(nal == &procapi_nal);
+    if(initialized) return (&api_nal);
 
     init_unix_timer();
 
     b=(bridge)malloc(sizeof(struct bridge));
     p=(procbridge)malloc(sizeof(struct procbridge));
-    nal->nal_data=b;
+    api_nal.nal_data=b;
     b->local=p;
 
+    if (ptl_size)
+	    limits.max_ptable_index = ptl_size;
+    if (acl_size)
+	    limits.max_atable_index = acl_size;
+
     args.nia_requested_pid = requested_pid;
-    args.nia_requested_limits = requested_limits;
-    args.nia_actual_limits = actual_limits;
+    args.nia_limits = &limits;
     args.nia_nal_type = nal_type;
     args.nia_bridge = b;
 
@@ -245,19 +259,19 @@ int procbridge_startup (nal_t *nal, ptl_pid_t requested_pid,
     /* initialize notifier */
     if (socketpair(AF_UNIX, SOCK_STREAM, 0, p->notifier)) {
         perror("socketpair failed");
-        return PTL_FAIL;
+        return NULL;
     }
 
     if (!register_io_handler(p->notifier[1], READ_HANDLER,
                 procbridge_notifier_handler, p)) {
         perror("fail to register notifier handler");
-        return PTL_FAIL;
+        return NULL;
     }
 
     /* create nal thread */
     if (pthread_create(&p->t, NULL, nal_thread, &args)) {
         perror("nal_init: pthread_create");
-        return PTL_FAIL;
+        return(NULL);
     }
 
     do {
@@ -271,9 +285,10 @@ int procbridge_startup (nal_t *nal, ptl_pid_t requested_pid,
     } while (1);
 
     if (p->nal_flags & NAL_FLAG_STOPPED)
-        return PTL_FAIL;
+        return (NULL);
 
     b->nal_cb->ni.nid = tcpnal_mynid;
+    initialized = 1;
 
-    return PTL_OK;
+    return (&api_nal);
 }
diff --git a/lnet/ulnds/socklnd/procbridge.h b/lnet/ulnds/socklnd/procbridge.h
index 1c8e7dd..965f83d 100644
--- a/lnet/ulnds/socklnd/procbridge.h
+++ b/lnet/ulnds/socklnd/procbridge.h
@@ -35,8 +35,7 @@ typedef struct procbridge {
 
 typedef struct nal_init_args {
     ptl_pid_t        nia_requested_pid;
-    ptl_ni_limits_t *nia_requested_limits;
-    ptl_ni_limits_t *nia_actual_limits;
+    ptl_ni_limits_t *nia_limits;
     int              nia_nal_type;
     bridge           nia_bridge;
 } nal_init_args_t;
@@ -51,6 +50,10 @@ extern void *nal_thread(void *);
 #define MAX_PTLS        128
 
 extern void set_address(bridge t,ptl_pid_t pidrequest);
+extern nal_t *procbridge_interface(int num_interface,
+                                   ptl_pt_index_t ptl_size,
+                                   ptl_ac_index_t acl_size,
+                                   ptl_pid_t requested_pid);
 extern void procbridge_wakeup_nal(procbridge p);
 
 #endif
diff --git a/lnet/ulnds/socklnd/proclib.c b/lnet/ulnds/socklnd/proclib.c
index af0745b..1cfb233 100644
--- a/lnet/ulnds/socklnd/proclib.c
+++ b/lnet/ulnds/socklnd/proclib.c
@@ -157,6 +157,9 @@ static void check_stopping(void *z)
  *  We define a limit macro to place a ceiling on limits
  *   for syntactic convenience
  */
+#define LIMIT(x,y,max)\
+     if ((unsigned int)x > max) y = max;
+
 extern int tcpnal_init(bridge);
 
 nal_initialize nal_table[PTL_IFACE_MAX]={0,tcpnal_init,0};
@@ -167,8 +170,10 @@ void *nal_thread(void *z)
     bridge b = args->nia_bridge;
     procbridge p=b->local;
     int rc;
-    ptl_process_id_t process_id;
+    ptl_pid_t pid_request;
     int nal_type;
+    ptl_ni_limits_t desired;
+    ptl_ni_limits_t actual;
     
     b->nal_cb=(nal_cb_t *)malloc(sizeof(nal_cb_t));
     b->nal_cb->nal_data=b;
@@ -184,21 +189,28 @@ void *nal_thread(void *z)
     b->nal_cb->cb_callback=nal_callback;
     b->nal_cb->cb_dist=nal_dist;
 
+    pid_request = args->nia_requested_pid;
+    desired = *args->nia_limits;
     nal_type = args->nia_nal_type;
 
-    /* Wierd, but this sets b->nal_cb->ni.{nid,pid}, which lib_init() is
-     * about to do from the process_id passed to it...*/
-    set_address(b,args->nia_requested_pid);
+    actual = desired;
+    LIMIT(desired.max_match_entries,actual.max_match_entries,MAX_MES);
+    LIMIT(desired.max_mem_descriptors,actual.max_mem_descriptors,MAX_MDS);
+    LIMIT(desired.max_event_queues,actual.max_event_queues,MAX_EQS);
+    LIMIT(desired.max_atable_index,actual.max_atable_index,MAX_ACLS);
+    LIMIT(desired.max_ptable_index,actual.max_ptable_index,MAX_PTLS);
+
+    set_address(b,pid_request);
 
-    process_id.pid = b->nal_cb->ni.pid;
-    process_id.nid = b->nal_cb->ni.nid;
-    
     if (nal_table[nal_type]) rc=(*nal_table[nal_type])(b);
     /* initialize the generic 'library' level code */
 
-    rc = lib_init(b->nal_cb, process_id, 
-                  args->nia_requested_limits, 
-                  args->nia_actual_limits);
+    rc = lib_init(b->nal_cb, 
+                  b->nal_cb->ni.nid,
+                  b->nal_cb->ni.pid,
+		  10,
+		  actual.max_ptable_index,
+		  actual.max_atable_index);
 
     /*
      * Whatever the initialization returned is passed back to the
@@ -207,11 +219,11 @@ void *nal_thread(void *z)
      */
     /* this should perform error checking */
     pthread_mutex_lock(&p->mutex);
-    p->nal_flags |= (rc != PTL_OK) ? NAL_FLAG_STOPPED : NAL_FLAG_RUNNING;
+    p->nal_flags |= rc ? NAL_FLAG_STOPPED : NAL_FLAG_RUNNING;
     pthread_cond_broadcast(&p->cond);
     pthread_mutex_unlock(&p->mutex);
 
-    if (rc == PTL_OK) {
+    if (!rc) {
         /* the thunk function is called each time the timer loop
            performs an operation and returns to blocking mode. we
            overload this function to inform the api side that
@@ -221,3 +233,4 @@ void *nal_thread(void *z)
     }
     return(0);
 }
+#undef LIMIT
diff --git a/lnet/utils/Makefile.am b/lnet/utils/Makefile.am
index a14df1c..e871d9a 100644
--- a/lnet/utils/Makefile.am
+++ b/lnet/utils/Makefile.am
@@ -3,40 +3,36 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
-## $(srcdir)/../ for <portals/*.h>, ../../ for generated <config.h>
-#COMPILE = $(CC) -Wall -g -I$(srcdir)/../include -I../../include
-#LINK = $(CC) -o $@
+# ../ for <portals/*.h>, ../../ for <config.h>
+COMPILE = $(CC) -Wall -g -I$(srcdir)/../include -I$(srcdir)/../../include
+LINK = $(CC) -o $@
 
 if LIBLUSTRE
+
 noinst_LIBRARIES = libuptlctl.a
-libuptlctl_a_SOURCES = portals.c debug.c l_ioctl.c
-libuptlctl_a_CPPFLAGS = $(LLCPPFLAGS)
-libuptlctl_a_CFLAGS = $(LLCFLAGS)
-endif
+libuptlctl_a_SOURCES = portals.c debug.c l_ioctl.c parser.c parser.h
+libuptlctl_a_CFLAGS = -fPIC
 
-sbin_PROGRAMS = debugctl
+else
 
+sbin_PROGRAMS = acceptor ptlctl debugctl routerstat wirecheck gmnalnid
 lib_LIBRARIES = libptlctl.a
 
-libptlctl_a_SOURCES = portals.c debug.c l_ioctl.c parser.c parser.h
-
-if !CRAY_PORTALS
-sbin_PROGRAMS += acceptor ptlctl routerstat wirecheck gmnalnid
-
-acceptor_SOURCES = acceptor.c
+acceptor_SOURCES = acceptor.c # -lefence
 
 wirecheck_SOURCES = wirecheck.c
 
+libptlctl_a_SOURCES = portals.c debug.c l_ioctl.c parser.c parser.h
+
 gmnalnid_SOURCES = gmnalnid.c
 
 ptlctl_SOURCES = ptlctl.c
 ptlctl_LDADD =  -L. -lptlctl $(LIBREADLINE) $(LIBEFENCE)
 ptlctl_DEPENDENCIES = libptlctl.a
 
-routerstat_SOURCES = routerstat.c
-endif
-
 debugctl_SOURCES = debugctl.c
 debugctl_LDADD = -L. -lptlctl $(LIBREADLINE) $(LIBEFENCE)
 debugctl_DEPENDENCIES = libptlctl.a
 
+routerstat_SOURCES = routerstat.c
+endif
diff --git a/lnet/utils/acceptor.c b/lnet/utils/acceptor.c
index f6367d4..29b8d1e 100644
--- a/lnet/utils/acceptor.c
+++ b/lnet/utils/acceptor.c
@@ -11,7 +11,9 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
+#include <asm/byteorder.h>
 #include <syslog.h>
+
 #include <errno.h>
 
 #include <portals/api-support.h>
diff --git a/lnet/utils/debug.c b/lnet/utils/debug.c
index b6bfec0..00a6102 100644
--- a/lnet/utils/debug.c
+++ b/lnet/utils/debug.c
@@ -65,9 +65,9 @@ static int debug_mask = ~0;
 
 static const char *portal_debug_subsystems[] =
         {"undefined", "mdc", "mds", "osc", "ost", "class", "log", "llite",
-         "rpc", "mgmt", "portals", "libcfs", "socknal", "qswnal", "pinger",
-         "filter", "ptlbd", "echo", "ldlm", "lov", "gmnal", "router", "cobd",
-         "ibnal", NULL};
+         "rpc", "mgmt", "portals", "socknal", "qswnal", "pinger", "filter",
+         "ptlbd", "echo", "ldlm", "lov", "gmnal", "router", "cobd", "ibnal",
+         "lmv", NULL};
 static const char *portal_debug_masks[] =
         {"trace", "inode", "super", "ext2", "malloc", "cache", "info", "ioctl",
          "blocks", "net", "warning", "buffs", "other", "dentry", "portals",
@@ -183,6 +183,9 @@ static int applymask(char* procpath, int value)
         return 0;
 }
 
+extern char *dump_filename;
+extern int dump(int dev_id, int opc, void *buf);
+
 static void applymask_all(unsigned int subs_mask, unsigned int debug_mask)
 {
         if (!dump_filename) {
@@ -538,7 +541,6 @@ static struct mod_paths {
         {"mds", "lustre/mds"},
         {"mdc", "lustre/mdc"},
         {"llite", "lustre/llite"},
-        {"smfs", "lustre/smfs"},
         {"obdecho", "lustre/obdecho"},
         {"ldlm", "lustre/ldlm"},
         {"obdfilter", "lustre/obdfilter"},
@@ -547,13 +549,13 @@ static struct mod_paths {
         {"fsfilt_ext3", "lustre/lvfs"},
         {"fsfilt_extN", "lustre/lvfs"},
         {"fsfilt_reiserfs", "lustre/lvfs"},
-        {"fsfilt_smfs", "lustre/lvfs"},
         {"mds_ext2", "lustre/mds"},
         {"mds_ext3", "lustre/mds"},
         {"mds_extN", "lustre/mds"},
         {"ptlbd", "lustre/ptlbd"},
         {"mgmt_svc", "lustre/mgmt"},
         {"mgmt_cli", "lustre/mgmt"},
+        {"lmv", "lustre/lmv"},
         {NULL, NULL}
 };
 
diff --git a/lnet/utils/gmlndnid.c b/lnet/utils/gmlndnid.c
index e45fae4..ff6631c 100644
--- a/lnet/utils/gmlndnid.c
+++ b/lnet/utils/gmlndnid.c
@@ -29,7 +29,9 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
+#include <asm/byteorder.h>
 #include <syslog.h>
+
 #include <errno.h>
 
 #include <portals/api-support.h>
diff --git a/lnet/utils/l_ioctl.c b/lnet/utils/l_ioctl.c
index 0671c24..1adcc8e 100644
--- a/lnet/utils/l_ioctl.c
+++ b/lnet/utils/l_ioctl.c
@@ -56,7 +56,7 @@ static struct ioc_dev ioc_dev_list[10];
 struct dump_hdr {
 	int magic;
 	int dev_id;
-        unsigned int opc;
+	int opc;
 };
 
 char *dump_filename;
@@ -101,7 +101,7 @@ open_ioc_dev(int dev_id)
 
 
 static int 
-do_ioctl(int dev_id, unsigned int opc, void *buf)
+do_ioctl(int dev_id, int opc, void *buf)
 {
 	int fd, rc;
 	
@@ -131,7 +131,7 @@ get_dump_file()
  * used, but for now it will assumed whatever app reads the file will
  * know what to do. */
 int 
-dump(int dev_id, unsigned int opc, void *buf)
+dump(int dev_id, int opc, void *buf)
 {
 	FILE *fp;
 	struct dump_hdr dump_hdr;
@@ -212,7 +212,7 @@ set_ioctl_dump(char * file)
 }
 
 int
-l_ioctl(int dev_id, unsigned int opc, void *buf)
+l_ioctl(int dev_id, int opc, void *buf)
 {
         return current_ioc_handler(dev_id, opc, buf);
 }
@@ -226,7 +226,7 @@ l_ioctl(int dev_id, unsigned int opc, void *buf)
  * each device used in the dump.
  */
 int 
-parse_dump(char * dump_file, ioc_handler_t ioc_func)
+parse_dump(char * dump_file, int (*ioc_func)(int dev_id, int opc, void *))
 {
 	int line =0;
 	struct stat st;
diff --git a/lnet/utils/parser.c b/lnet/utils/parser.c
index b91295b..db5292d 100644
--- a/lnet/utils/parser.c
+++ b/lnet/utils/parser.c
@@ -28,16 +28,12 @@
 #include <sys/param.h>
 #include <assert.h>
 
+#include <config.h>
 #ifdef HAVE_LIBREADLINE
 #define	READLINE_LIBRARY
 #include <readline/readline.h>
-
-/* completion_matches() is #if 0-ed out in modern glibc */
-#ifndef completion_matches
-#  define completion_matches rl_completion_matches
-#endif
 #endif
-
+//extern char **completion_matches __P((char *, rl_compentry_func_t *));
 extern void using_history(void);
 extern void stifle_history(int);
 extern void add_history(char *);
@@ -225,15 +221,14 @@ static char **command_completion(char * text, int start, int end)
     char	* pos;
 
     match_tbl = top_level;
-    
     for (table = find_cmd(rl_line_buffer, match_tbl, &pos);
-	 table; table = find_cmd(pos, match_tbl, &pos)) 
-    {
+	 table;
+	 table = find_cmd(pos, match_tbl, &pos)) {
 
 	if (*(pos - 1) == ' ') match_tbl = table->pc_sub_cmd;
     }
 
-    return completion_matches(text, command_generator);
+    return(completion_matches(text, command_generator));
 }
 #endif
 
@@ -642,6 +637,68 @@ int Parser_arg2int(const char *inp, long *result, int base)
                 return 1;
 }
 
+/* Convert human readable size string to and int; "1k" -> 1000 */
+int Parser_size (int *sizep, char *str) {
+        int size;
+        char mod[32];
+
+        switch (sscanf (str, "%d%1[gGmMkK]", &size, mod)) {
+        default:
+                return (-1);
+
+        case 1:
+                *sizep = size;
+                return (0);
+
+        case 2:
+                switch (*mod) {
+                case 'g':
+                case 'G':
+                        *sizep = size << 30;
+                        return (0);
+
+                case 'm':
+                case 'M':
+                        *sizep = size << 20;
+                        return (0);
+
+                case 'k':
+                case 'K':
+                        *sizep = size << 10;
+                        return (0);
+
+                default:
+                        *sizep = size;
+                        return (0);
+                }
+        }
+}
+
+/* Convert a string boolean to an int; "enable" -> 1 */
+int Parser_bool (int *b, char *str) {
+        if (!strcasecmp (str, "no") ||
+            !strcasecmp (str, "n") ||
+            !strcasecmp (str, "off") ||
+            !strcasecmp (str, "down") ||
+            !strcasecmp (str, "disable"))
+        {
+                *b = 0;
+                return (0);
+        }
+        
+        if (!strcasecmp (str, "yes") ||
+            !strcasecmp (str, "y") ||
+            !strcasecmp (str, "on") ||
+            !strcasecmp (str, "up") ||
+            !strcasecmp (str, "enable"))
+        {
+                *b = 1;
+                return (0);
+        }
+        
+        return (-1);
+}
+
 int Parser_quit(int argc, char **argv)
 {
         argc = argc;
diff --git a/lnet/utils/parser.h b/lnet/utils/parser.h
index 9e7e95a..44e8f2a 100644
--- a/lnet/utils/parser.h
+++ b/lnet/utils/parser.h
@@ -64,4 +64,10 @@ char *Parser_strarg(char *inp, const char *prompt, const char *deft,
 /* Extracts an integer from a string  with a base */
 int Parser_arg2int(const char *inp, long *result, int base);
 
+/* Convert human readable size string to and int; "1k" -> 1000 */
+int Parser_size(int *sizep, char *str);
+
+/* Convert a string boolean to an int; "enable" -> 1 */
+int Parser_bool(int *b, char *str);
+
 #endif
diff --git a/lnet/utils/portals.c b/lnet/utils/portals.c
index f8107d8..fb031ae 100644
--- a/lnet/utils/portals.c
+++ b/lnet/utils/portals.c
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #include <time.h>
 #include <stdarg.h>
-#include <endian.h>
+#include <asm/byteorder.h>
 
 #ifdef __CYGWIN__
 
@@ -61,7 +61,7 @@
 unsigned int portal_debug;
 unsigned int portal_printk;
 unsigned int portal_stack;
-unsigned int portal_cerror = 1;
+unsigned int portal_cerror;
 
 static unsigned int g_nal = 0;
 
@@ -81,73 +81,12 @@ static name2num_t nalnames[] = {
         {"elan",	QSWNAL},
         {"gm",	        GMNAL},
         {"ib",	        IBNAL},
+        {"scimac",      SCIMACNAL},
         {NULL,		-1}
 };
 
 static cfg_record_cb_t g_record_cb;
 
-/* Convert a string boolean to an int; "enable" -> 1 */
-int ptl_parse_bool (int *b, char *str) {
-        if (!strcasecmp (str, "no") ||
-            !strcasecmp (str, "n") ||
-            !strcasecmp (str, "off") ||
-            !strcasecmp (str, "down") ||
-            !strcasecmp (str, "disable"))
-        {
-                *b = 0;
-                return (0);
-        }
-        
-        if (!strcasecmp (str, "yes") ||
-            !strcasecmp (str, "y") ||
-            !strcasecmp (str, "on") ||
-            !strcasecmp (str, "up") ||
-            !strcasecmp (str, "enable"))
-        {
-                *b = 1;
-                return (0);
-        }
-        
-        return (-1);
-}
-
-/* Convert human readable size string to and int; "1k" -> 1000 */
-int ptl_parse_size (int *sizep, char *str) {
-        int size;
-        char mod[32];
-
-        switch (sscanf (str, "%d%1[gGmMkK]", &size, mod)) {
-        default:
-                return (-1);
-
-        case 1:
-                *sizep = size;
-                return (0);
-
-        case 2:
-                switch (*mod) {
-                case 'g':
-                case 'G':
-                        *sizep = size << 30;
-                        return (0);
-
-                case 'm':
-                case 'M':
-                        *sizep = size << 20;
-                        return (0);
-
-                case 'k':
-                case 'K':
-                        *sizep = size << 10;
-                        return (0);
-
-                default:
-                        *sizep = size;
-                        return (0);
-                }
-        }
-}
-
 int 
 ptl_set_cfg_record_cb(cfg_record_cb_t cb)
 {
@@ -364,40 +303,16 @@ ptl_parse_nid (ptl_nid_t *nidp, char *str)
         return (-1);
 }
 
-__u64 ptl_nid2u64(ptl_nid_t nid)
-{
-        switch (sizeof (nid)) {
-        case 8:
-                return (nid);
-        case 4:
-                return ((__u32)nid);
-        default:
-                fprintf(stderr, "Unexpected sizeof(ptl_nid_t) == %u\n", sizeof(nid));
-                abort();
-                /* notreached */
-                return (-1);
-        }
-}
-
 char *
 ptl_nid2str (char *buffer, ptl_nid_t nid)
 {
-        __u64           nid64 = ptl_nid2u64(nid);
-        struct hostent *he;
-
-        if ((nid64 & ~((__u64)((__u32)-1))) != 0) {
-                /* top bits set */
-                he = NULL;
-        } else {
-                __u32 addr = htonl((__u32)nid); /* back to NETWORK byte order */
-
-                he = gethostbyaddr ((const char *)&addr, sizeof (addr), AF_INET);
-        }
+        __u32           addr = htonl((__u32)nid); /* back to NETWORK byte order */
+        struct hostent *he = gethostbyaddr ((const char *)&addr, sizeof (addr), AF_INET);
 
         if (he != NULL)
                 strcpy (buffer, he->h_name);
         else
-                sprintf (buffer, LPX64, nid64);
+                sprintf (buffer, LPX64, nid);
         
         return (buffer);
 }
@@ -1093,7 +1008,7 @@ int jt_ptl_mynid(int argc, char **argv)
         char *nidstr;
         struct portals_cfg pcfg;
         ptl_nid_t mynid;
-
+        
         if (argc > 2) {
                 fprintf(stderr, "usage: %s [NID]\n", argv[0]);
                 fprintf(stderr, "NID defaults to the primary IP address of the machine.\n");
@@ -1127,8 +1042,7 @@ int jt_ptl_mynid(int argc, char **argv)
                 fprintf(stderr, "setting my NID failed: %s\n",
                        strerror(errno));
         else
-                printf("registered my nid "LPX64" (%s)\n", 
-                       ptl_nid2u64(mynid), hostname);
+                printf("registered my nid "LPX64" (%s)\n", mynid, hostname);
         return 0;
 }
 
@@ -1186,7 +1100,7 @@ jt_ptl_rxmem (int argc, char **argv)
         
         if (argc > 1)
         {
-                if (ptl_parse_size (&size, argv[1]) != 0 || size < 0)
+                if (Parser_size (&size, argv[1]) != 0 || size < 0)
                 {
                         fprintf (stderr, "Can't parse size %s\n", argv[1]);
                         return (0);
@@ -1205,7 +1119,7 @@ jt_ptl_txmem (int argc, char **argv)
         
         if (argc > 1)
         {
-                if (ptl_parse_size (&size, argv[1]) != 0 || size < 0)
+                if (Parser_size (&size, argv[1]) != 0 || size < 0)
                 {
                         fprintf (stderr, "Can't parse size %s\n", argv[1]);
                         return (0);
@@ -1223,7 +1137,7 @@ jt_ptl_nagle (int argc, char **argv)
 
         if (argc > 1)
         {
-                if (ptl_parse_bool (&enable, argv[1]) != 0)
+                if (Parser_bool (&enable, argv[1]) != 0)
                 {
                         fprintf (stderr, "Can't parse boolean %s\n", argv[1]);
                         return (-1);
@@ -1346,8 +1260,7 @@ jt_ptl_del_route (int argc, char **argv)
         rc = pcfg_ioctl(&pcfg);
         if (rc != 0) 
         {
-                fprintf (stderr, "NAL_CMD_DEL_ROUTE ("LPX64") failed: %s\n", 
-                         ptl_nid2u64(nid), strerror (errno));
+                fprintf (stderr, "NAL_CMD_DEL_ROUTE ("LPX64") failed: %s\n", nid, strerror (errno));
                 return (-1);
         }
         
@@ -1377,7 +1290,7 @@ jt_ptl_notify_router (int argc, char **argv)
                 return (-1);
         }
 
-        if (ptl_parse_bool (&enable, argv[2]) != 0) {
+        if (Parser_bool (&enable, argv[2]) != 0) {
                 fprintf (stderr, "Can't parse boolean %s\n", argv[2]);
                 return (-1);
         }
@@ -1409,7 +1322,7 @@ jt_ptl_notify_router (int argc, char **argv)
         if (rc != 0) 
         {
                 fprintf (stderr, "NAL_CMD_NOTIFY_ROUTER ("LPX64") failed: %s\n",
-                         ptl_nid2u64(nid), strerror (errno));
+                         nid, strerror (errno));
                 return (-1);
         }
         
@@ -1565,11 +1478,14 @@ lwt_put_string(char *ustr)
 static int
 lwt_print(FILE *f, cycles_t t0, cycles_t tlast, double mhz, int cpu, lwt_event_t *e)
 {
+        char            whenstr[32];
         char           *where = lwt_get_string(e->lwte_where);
 
         if (where == NULL)
                 return (-1);
 
+        sprintf(whenstr, LPD64, e->lwte_when - t0);
+
         fprintf(f, "%#010lx %#010lx %#010lx %#010lx: %#010lx %1d %10.6f %10.2f %s\n",
                 e->lwte_p1, e->lwte_p2, e->lwte_p3, e->lwte_p4,
                 (long)e->lwte_task, cpu, (e->lwte_when - t0) / (mhz * 1000000.0),
@@ -1621,7 +1537,6 @@ jt_ptl_lwt(int argc, char **argv)
         cycles_t        tnow;
         struct timeval  tvnow;
         int             printed_date = 0;
-        int             nlines = 0;
         FILE           *f = stdout;
 
         if (argc < 2 ||
@@ -1771,12 +1686,6 @@ jt_ptl_lwt(int argc, char **argv)
                         rc = lwt_print(f, t0, tlast, mhz, cpu, next_event[cpu]);
                         if (rc != 0)
                                 break;
-
-                        if (++nlines % 10000 == 0 && f != stdout) {
-                                /* show some activity... */
-                                printf(".");
-                                fflush (stdout);
-                        }
                 }
 
                 tlast = next_event[cpu]->lwte_when;
@@ -1790,10 +1699,8 @@ jt_ptl_lwt(int argc, char **argv)
                         next_event[cpu] = NULL;
         }
 
-        if (f != stdout) {
-                printf("\n");
+        if (f != stdout)
                 fclose(f);
-        }
 
         free(events);
         return (0);
diff --git a/lnet/utils/wirecheck.c b/lnet/utils/wirecheck.c
index 6316290..a73a5217 100644
--- a/lnet/utils/wirecheck.c
+++ b/lnet/utils/wirecheck.c
@@ -34,7 +34,7 @@ do {                                                    \
 
 #define CHECK_MEMBER_OFFSET(s,m)                \
 do {                                            \
-        CHECK_VALUE((int)offsetof(s, m));       \
+        CHECK_VALUE(offsetof(s, m));            \
 } while (0)
 
 #define CHECK_MEMBER_SIZEOF(s,m)                \
diff --git a/lustre/.cvsignore b/lustre/.cvsignore
index 07a5c92..f37e59b 100644
--- a/lustre/.cvsignore
+++ b/lustre/.cvsignore
@@ -4,12 +4,9 @@ aclocal.m4
 config.log
 config.status
 config.cache
-config.guess
-config.sub
 configure
 Makefile
-autoMakefile
-autoMakefile.in
+Makefile.in
 .deps
 tags
 TAGS
@@ -18,13 +15,5 @@ cscope.files
 cscope.out
 autom4te-2.53.cache
 autom4te.cache
-depcomp
-compile
-.*.cmd
+.*.o.cmd
 .mergeinfo-*
-Rules
-missing
-mkinstalldirs
-install-sh
-.depend
-.tmp_versions
diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 1b957a3..0eb3b7f 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -1,59 +1,9 @@
 tbd  Cluster File Systems, Inc. <info@clusterfs.com>
-       * version 1.2.x
-       * bug fixes
-	- clear page cache after eviction (2766)
-	- don't dereference NULL peer_ni in ldlm_handle_ast_error (3258)
-	- don't allow unlinking open directory if it isn't empty (2904)
-	- handle partial page writes in filter; fix 512b direct IO (3138)
-	- handle page cache pages in cleanup path for 2.6 (3335)
-	- leave liblustre's partial write handling to filter (3274)
-	- chose better nal ids in liblustre (3292)
-	- initialize liblustre with uid/group membership (2862)
-       * miscellania
-	- drop scimac NAL (unmaintained)
+	* version 1.2.x
+	* Bug fixes
+ 	- clear page cache after eviction  (2766)
 
 tbd  Cluster File Systems, Inc. <info@clusterfs.com>
-       * version 1.2.2
-       * bug fixes
-	- don't copy lvb into (possibly NULL) reply on error (2983)
-	- don't deref dentry after dput, don't free lvb on error (2922)
-	- use the kms to determine writeback rpc length (2947)
-	- increment oti_logcookies when osc is inactive (2948)
-	- update client's i_blocks count via lvb messages (2543)
-	- handle intent open/close of special files properly (1557)
-	- mount MDS with errors=remount-ro, like obdfilter (2009)
-	- initialize lock handle to avoid ASSERT on error cleanup (3057)
-	- don't use cancelling-locks' kms values (2947)
-	- use highest lock extent for kms, not last one (2925)
-	- don't dereference ERR_PTR() dentry in error handling path (3107)
-	- fix thread race in portals_debug_dumplog() (3122)
-	- create lprocfs device entries at setup instead of at attach (1519)
-	- common AST error handler, don't evict client on completion race (3145)
-	- zero nameidata in detach_mnt in 2.6 (3118)
-	- verify d_inode after revalidate_special is valid in 2.6 (3116)
-	- use lustre_put_super() to handle zconf unmounts in 2.6 (3064)
-	- initialize RPC timeout timer earlier for 2.6 (3219)
-	- don't dereference NULL reply buffer if mdc_close was never sent (2410)
-	- print nal/nid for unknown nid (3258)
-	- additional checks for oscc recovery before doing precreate (3284)
-	- fix ll_extent_lock() error return code for 64-bit systems (3043)
-	- don't crash in mdc_close for bad permissions on open (3285)
-	- zero i_rdev for non-device files (3147)
-	- clear page->private before handing to FS, better assertion (3119)
-	- fix incorrect decref of invalidated dentry (2350)
-	- don't hold journal transaction open across create RPC (3313)
-	- update atime on MDS at close time (3265)
-	- close LDAP connection when recovering to avoid server load (3315)
-	- update iopen-2.6 patch with fixes from 2399,2517,2904 (3301)
-	- don't leak open file on MDS after open resend (3325)
-	- serialize filter_precreate and filter_destroy_precreated (3329)
-       * miscellania
-	- allow default OST striping configuration per directory (1414)
-	- fix compilation for qswnal for 2.6 kernels (3125)
-	- increase maximum number of MDS request buffers for large systems
-	- change liblustreapi to be useful for external progs like lfsck (3098)
-
-2004-03-22  Cluster File Systems, Inc. <info@clusterfs.com>
        * version 1.2.1
        * bug fixes
 	- fixes for glimpse AST timeouts / incorrectly 0-sized files (2818)
@@ -75,8 +25,6 @@ tbd  Cluster File Systems, Inc. <info@clusterfs.com>
 	- don't evict page beyond end of stripe extent (2925)
 	- don't oops on a deleted current working directory (2399)
 	- handle hard links to targets without a parent properly (2517)
-	- don't dereference NULL lock when racing during eviction (2867)
-	- don't grow lock extents when lots of conflicting locks (2919)
 
 2004-03-04  Cluster File Systems, Inc. <info@clusterfs.com>
        * version 1.2.0
diff --git a/lustre/Makefile.am b/lustre/Makefile.am
new file mode 100644
index 0000000..2d4192e
--- /dev/null
+++ b/lustre/Makefile.am
@@ -0,0 +1,66 @@
+# Copyright (C) 2001  Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+AUTOMAKE_OPTIONS = foreign
+
+if LINUX25
+DIRS24 = 
+else
+DIRS24 = ptlbd
+endif
+
+# just until things are farther along
+if CRAY_PORTALS
+UTILS_TESTS = 
+else
+UTILS_TESTS = utils tests
+endif
+
+if LIBLUSTRE
+SUBDIRS = portals obdclass lov ptlrpc obdecho osc utils mdc lvfs liblustre lmv
+else
+SUBDIRS = lvfs portals obdclass include $(DIRS24) mds obdfilter mdc osc ost 
+SUBDIRS+= llite obdecho lov cobd doc scripts conf ptlrpc lmv $(UTILS_TESTS)
+endif
+
+
+if SNAPFS
+SUBDIRS+= snapfs
+endif
+
+if SMFS 
+SUBDIRS += smfs
+endif
+DIST_SUBDIRS = $(SUBDIRS) liblustre snapfs smfs
+EXTRA_DIST = BUGS FDL Rules kernel_patches
+
+# We get the version from the spec file.
+CONFIGURE_DEPENDENCIES = scripts/lustre.spec.in
+
+dist-hook:
+	find $(distdir) -name .deps | xargs rm -rf
+	find $(distdir) -name CVS | xargs rm -rf
+
+include $(top_srcdir)/Rules
+
+rpms: dist Makefile
+	rpmbuild -ta $(distdir).tar.gz
+
+CSTK=/tmp/checkstack
+CSTKO=/tmp/checkstack.orig
+
+checkstack:
+	[ -f ${CSTK} -a ! -s ${CSTKO} ] && mv ${CSTK} ${CSTKO} || true
+	for i in ${SUBDIRS} portals/knals/*; do				     \
+		MOD=$$i/`basename $$i`.o;				     \
+		[ -f $$MOD ] && objdump -d $$MOD | perl tests/checkstack.pl; \
+	done | sort -nr > ${CSTK}
+	[ -f ${CSTKO} ] && ! diff -u ${CSTKO} ${CSTK} || head -30 ${CSTK}
+
+checkstack-update:
+	[ -f ${CSTK} ] && mv ${CSTK} ${CSTKO}
+
+checkstack-clean:
+	rm -f ${CSTK} ${CSTKO}
diff --git a/lustre/Makefile.in b/lustre/Makefile.in
deleted file mode 100644
index 59849db..0000000
--- a/lustre/Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
-subdir-m += portals
-
-@LDISKFS_TRUE@subdir-m  += ldiskfs
-
-subdir-m += lvfs
-subdir-m += obdclass
-subdir-m += lov
-subdir-m += ptlrpc
-subdir-m += obdecho
-subdir-m += osc
-subdir-m += mdc
-subdir-m += mds
-subdir-m += obdfilter
-subdir-m += ost
-subdir-m += llite
-subdir-m += cobd
-
-ifeq ($(PATCHLEVEL),4)
-subdir-m += ptlbd
-endif # PATCHLEVEL = 4
-
-@SNAPFS_TRUE@subdir-m += snapfs
-@SMFS_TRUE@subdir-m += smfs
-
-@INCLUDE_RULES@
diff --git a/lustre/README.kernel-source b/lustre/README.kernel-source
deleted file mode 100644
index 0b88efe1..0000000
--- a/lustre/README.kernel-source
+++ /dev/null
@@ -1,74 +0,0 @@
-Lustre can currently build against Red Hat 2.4-style kernel-source
-RPMs.  All other kernel-source RPMs are *unsupported* at this time.
-
-Note that a Lustre-patched kernel is required for building Lustre; in
-most cases a kernel-source RPM from your Linux vendor will not contain
-the necessary patches.
-
-1.  kernel.h
-
-Building against a kernel-source RPM requires a special header.  On
-Red Hat systems, this file should be automatically created at boot
-time, and saved in /boot/kernel.h.
-
- *** If you are not running Red Hat Linux, or are not booted into the
- *** kernel you are trying to build against, you need to create this
- *** file manually.
-
- *** If you do not, the Lustre build may fail, or may fail to build
- *** modules that work with your kernel.
-
-Here is an example /boot/kernel.h file.  If you are building on
-x86_64, the first defines should be __MODULE_KERNEL_x86_64, etc.  The
-other defines should be simple to figure out.
-
-/* This file is automatically generated at boot time. */
-#ifndef __BOOT_KERNEL_H_
-#define __BOOT_KERNEL_H_
-
-/* Kernel type i686-smp */
-
-#ifndef __MODULE_KERNEL_i686
-#define __MODULE_KERNEL_i686 1
-#endif
-
-#ifndef __BOOT_KERNEL_ENTERPRISE
-#define __BOOT_KERNEL_ENTERPRISE 0
-#endif
-
-#ifndef __BOOT_KERNEL_BIGMEM
-#define __BOOT_KERNEL_BIGMEM 0
-#endif
-
-#ifndef __BOOT_KERNEL_HUGEMEM
-#define __BOOT_KERNEL_HUGEMEM 0
-#endif
-
-#ifndef __BOOT_KERNEL_SMP
-#define __BOOT_KERNEL_SMP 1
-#endif
-
-#ifndef __BOOT_KERNEL_UP
-#define __BOOT_KERNEL_UP 0
-#endif
-
-#endif
-
-You should save this somewhere, and pass the location of this file to
-./configure using the --with-kernel-source-header option.
-
-2.  .config
-
-You will also need to tell Lustre about the .config file for your
-kernel.  The two likely locations of this file are
-/boot/config-$(uname -r), and /usr/src/linux-2.4/configs/.  You should
-pass the location of this file to Lustre using the --with-linux-config
-option.
-
-3.  An Example
-
-Here is an example for configuring Lustre:
-
-./configure --with-linux=/usr/src/linux-2.4.20-28.9_lustre.1.0.3 \
---with-kernel-source-header=/boot/kernel.h \
---with-linux-config=/boot/config-2.4.20-28.9_lustre.1.0.3smp
diff --git a/lustre/Rules b/lustre/Rules
new file mode 100644
index 0000000..8846e3b
--- /dev/null
+++ b/lustre/Rules
@@ -0,0 +1,49 @@
+# Copyright (C) 2001  Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+# Build a kernel module, name.o, and install it in $(moduledir) by:
+#  MODULE = name
+#  module_DATA = name.o
+#  EXTRA_PROGRAMS = name
+#  name_SOURCES = my.c files.c
+#  include $(top_srcdir)/Rules
+
+if LINUX25
+
+# FIXME
+# need to be rewritten:
+# - bad hacking in lvfs/Makefile.am obdclass/Makefile.am
+# - .o -> .ko
+#
+basename=$(shell echo $< | sed -e 's/\.c//g' | sed -e 's/-//g' | sed -e 's/\.o//g' | sed -e 's/^.*\///g')
+AM_CPPFLAGS=-I$(top_builddir)/include -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2  -DKBUILD_MODNAME=$(MODULE) -DKBUILD_BASENAME=$(basename)
+
+$(MODULE).o: $($(MODULE)_OBJECTS) $($(MODULE)_DEPENDENCIES)
+	$(LD) -m $(MOD_LINK) -r -o $(MODULE)_tmp.o $($(MODULE)_OBJECTS)
+	rm -f $(MODULE)_tmp.c
+	$(LINUX)/scripts/modpost $(LINUX)/vmlinux $(MODULE)_tmp.o
+	$(COMPILE) -UKBUILD_BASENAME -DKBUILD_BASENAME=$(MODULE) -c $(MODULE)_tmp.mod.c
+	$(LD) -m $(MOD_LINK) -r -o $(MODULE).o $(MODULE)_tmp.o $(MODULE)_tmp.mod.o
+
+else
+
+AM_CPPFLAGS=-I$(top_builddir)/include
+$(MODULE).o: $($(MODULE)_OBJECTS) $($(MODULE)_DEPENDENCIES)
+	$(LD) -m "`$(LD) --help | awk '/supported emulations/ {print $$4}'`" -r -o $(MODULE).o $($(MODULE)_OBJECTS)
+
+endif
+
+
+tags:
+	rm -f $(top_srcdir)/TAGS
+	ETAGSF=`etags --version | grep -iq exuberant && \
+		echo "-I __initdata,__exitdata,EXPORT_SYMBOL"`; \
+	find $(top_srcdir) -name '*.[hc]' | xargs etags $$ETAGSF -a
+
+	rm -f $(top_srcdir)/tags
+	CTAGSF=`ctags --version | grep -iq exuberant && \
+		echo "-I __initdata,__exitdata,EXPORT_SYMBOL"`; \
+	find $(top_srcdir) -name '*.[hc]' | xargs ctags $$CTAGSF -a
+
diff --git a/lustre/Rules.in b/lustre/Rules.in
deleted file mode 100644
index 293ff3c..0000000
--- a/lustre/Rules.in
+++ /dev/null
@@ -1,46 +0,0 @@
-# Directories building kernel modules should have two files:
-#
-# Makefile.in:
-#
-# MODULES := <module-name>
-# <module-name>-objs := file1.o file2.o file3.o
-# @INCLUDE_RULES@
-#
-# and autoMakefile.am:
-#
-# if LIBLUSTRE
-# <liblustre rules>
-# endif
-#
-# if MODULES
-# modulefs_DATA = <module-name>$(KMODEXT)
-# endif
-#
-# DIST_SOURCES = $(<module-name>-objs:.o=.c) <other sources>
-# MOSTLYCLEANFILES = *.o *.ko *.mod.c
-
-ifeq ($(PATCHLEVEL),)
-
-include autoMakefile
-
-else
-
-include @LINUX_CONFIG@
-
-EXTRA_CFLAGS := $(EXTRA_PRE_CFLAGS)
-EXTRA_CFLAGS += @EXTRA_KCFLAGS@ @UML_CFLAGS@
-EXTRA_CFLAGS += $(EXTRA_POST_CFLAGS)
-
-obj-m := $(patsubst %,%.o,$(MODULES))
-
-ifeq ($(PATCHLEVEL),4)
-# 2.4 rules
-O_TARGET := $(firstword $(obj-m))
-obj-y := $($(firstword $(MODULES))-objs)
-export-objs := $(obj-y) $(filter-out $(O_TARGET),$(obj-m))
-include $(TOPDIR)/Rules.make
-$(MODINCL)/%.ver: %.c
-	@true
-endif # PATCHLEVEL
-
-endif # KERNELRELEASE
diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
deleted file mode 100644
index 385ddcb..0000000
--- a/lustre/autoMakefile.am
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright (C) 2001  Cluster File Systems, Inc.
-#
-# This code is issued under the GNU General Public License.
-# See the file COPYING in this distribution
-
-AUTOMAKE_OPTIONS = foreign
-
-SUBDIRS = . include portals ldiskfs lvfs obdclass lov ldlm ptlrpc      \
-	obdecho osc mdc mds obdfilter ost llite cobd ptlbd snapfs smfs \
-	liblustre doc utils tests conf scripts
-
-EXTRA_DIST = BUGS FDL Rules.in kernel_patches kernel-tests/Makefile	\
-	README.kernel-source
-
-# these empty rules are needed so that automake doesn't add its own
-# recursive rules
-etags-recursive:
-
-ctags-recursive:
-
-tags-recursive:
-
-TAGS:
-
-tags:
-	rm -f $(top_srcdir)/TAGS
-	ETAGSF=`etags --version | grep -iq exuberant && \
-		echo "-I __initdata,__exitdata,EXPORT_SYMBOL"`; \
-	find $(top_srcdir) -name '*.[hc]' | xargs etags $$ETAGSF -a
-
-	rm -f $(top_srcdir)/tags
-	CTAGSF=`ctags --version | grep -iq exuberant && \
-		echo "-I __initdata,__exitdata,EXPORT_SYMBOL"`; \
-	find $(top_srcdir) -name '*.[hc]' | xargs ctags $$CTAGSF -a
-
-if MODULES
-all-am: modules
-
-if !LINUX25
-DEP = dep
-dep: .depend
-
-.depend:
-	$(MAKE) $(ARCH_UM) -C $(LINUX) -f $(PWD)/kernel-tests/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) -o scripts -o include/config/MARKER _sfdep_$(PWD) _FASTDEP_ALL_SUB_DIRS="$(PWD)"
-endif
-
-if LDISKFS
-LDISKFS = ldiskfs-sources
-ldiskfs-sources:
-	$(MAKE) sources -C ldiskfs
-endif
-
-lvfs-sources:
-	$(MAKE) sources -C lvfs
-
-modules: lustre_build_version $(DEP) $(LDISKFS) lvfs-sources
-	$(MAKE) $(ARCH_UM) -C $(LINUX) -f $(PWD)/kernel-tests/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) SUBDIRS=$(PWD) -o tmp_include_depends -o scripts -o include/config/MARKER $@
-
-lustre_build_version:
-	perl $(top_builddir)/scripts/version_tag.pl $(top_srcdir) $(top_builddir) > tmpver
-	echo "#define LUSTRE_RELEASE @RELEASE@" >> tmpver
-	cmp -s $(top_builddir)/include/linux/lustre_build_version.h tmpver \
-                2> /dev/null &&                                            \
-                $(RM) tmpver ||                                            \
-                mv tmpver $(top_builddir)/include/linux/lustre_build_version.h
-
-endif # MODULES
-
-dist-hook:
-	find $(distdir) -name .deps | xargs rm -rf
-	find $(distdir) -name CVS | xargs rm -rf
-
-rpms: dist Makefile
-	rpmbuild -ta $(distdir).tar.gz
-
-CSTK=/tmp/checkstack
-CSTKO=/tmp/checkstack.orig
-
-checkstack:
-	[ -f ${CSTK} -a ! -s ${CSTKO} ] && mv ${CSTK} ${CSTKO} || true
-	for i in ${SUBDIRS} portals/knals/*; do				     \
-		MOD=$$i/`basename $$i`.o;				     \
-		[ -f $$MOD ] && objdump -d $$MOD | perl tests/checkstack.pl; \
-	done | sort -nr > ${CSTK}
-	[ -f ${CSTKO} ] && ! diff -u ${CSTKO} ${CSTK} || head -30 ${CSTK}
-
-checkstack-update:
-	[ -f ${CSTK} ] && mv ${CSTK} ${CSTKO}
-
-checkstack-clean:
-	rm -f ${CSTK} ${CSTKO}
diff --git a/lustre/autogen.sh b/lustre/autogen.sh
index 004852e..be0d42d 100644
--- a/lustre/autogen.sh
+++ b/lustre/autogen.sh
@@ -1,88 +1,5 @@
-#!/bin/bash
-
-# taken from gnome-common/macros2/autogen.sh
-compare_versions() {
-    ch_min_version=$1
-    ch_actual_version=$2
-    ch_status=0
-    IFS="${IFS=         }"; ch_save_IFS="$IFS"; IFS="."
-    set $ch_actual_version
-    for ch_min in $ch_min_version; do
-        ch_cur=`echo $1 | sed 's/[^0-9].*$//'`; shift # remove letter suffixes
-        if [ -z "$ch_min" ]; then break; fi
-        if [ -z "$ch_cur" ]; then ch_status=1; break; fi
-        if [ $ch_cur -gt $ch_min ]; then break; fi
-        if [ $ch_cur -lt $ch_min ]; then ch_status=1; break; fi
-    done
-    IFS="$ch_save_IFS"
-    return $ch_status
-}
-
-error_msg() {
-	echo "$cmd is $1.  version $required is required to build Lustre."
-
-	if [ -e /usr/lib/autolustre/bin/$cmd ]; then
-		cat >&2 <<-EOF
-		You apparently already have Lustre-specific autoconf/make RPMs
-		installed on your system at /usr/lib/autolustre/share/$cmd.
-		Please set your PATH to point to those versions:
-
-		export PATH="/usr/lib/autolustre/bin:\$PATH"
-		EOF
-	else
-		cat >&2 <<-EOF
-		CFS provides RPMs which can be installed alongside your
-		existing autoconf/make RPMs, if you are nervous about
-		upgrading.  See
-
-		ftp://ftp.lustre.org/pub/other/autolustre/README.autolustre
-
-		You may be able to download newer version from:
-
-		http://ftp.gnu.org/gnu/$cmd/$cmd-$required.tar.gz
-	EOF
-	fi
-	[ "$cmd" = "autoconf" -a "$required" = "2.57" ] && cat >&2 <<EOF
-
-or for RH9 systems you can use:
-
-ftp://fr2.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/autoconf-2.57-3.noarch.rpm
-EOF
-	[ "$cmd" = "automake" -a "$required" = "1.7.8" ] && cat >&2 <<EOF
-
-or for RH9 systems you can use:
-
-ftp://fr2.rpmfind.net/linux/fedora/core/1/i386/os/Fedora/RPMS/automake-1.7.8-1.noarch.rpm
-EOF
-	exit 1
-}
-
-check_version() {
-    local cmd
-    local required
-    local version
-
-    cmd=$1
-    required=$2
-    echo -n "checking for $cmd $required... "
-    if ! $cmd --version >/dev/null ; then
-	error_msg "missing"
-    fi
-    version=$($cmd --version | awk "BEGIN { IGNORECASE=1 } /$cmd \(GNU $cmd\)/ { print \$4 }")
-    echo "found $version"
-    if ! compare_versions "$required" "$version" ; then
-	error_msg "too old"
-    fi
-}
-
-check_version automake "1.7.8"
-check_version autoconf "2.57"
-echo "Running aclocal..."
-aclocal
-echo "Running autoheader..."
-autoheader
-echo "Running automake..."
-automake -a -c
-echo "Running autoconf..."
-autoconf
+#!/bin/sh
 
+aclocal &&
+${AUTOMAKE:-automake} --add-missing &&
+${AUTOCONF:-autoconf}
diff --git a/lustre/cobd/.cvsignore b/lustre/cobd/.cvsignore
index 642e2e6..e995588 100644
--- a/lustre/cobd/.cvsignore
+++ b/lustre/cobd/.cvsignore
@@ -1,10 +1,3 @@
 .deps
 Makefile
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.cmd
-.*.flags
-.tmp_versions
-.depend
+Makefile.in
diff --git a/lustre/cobd/autoMakefile.am b/lustre/cobd/Makefile.am
similarity index 50%
rename from lustre/cobd/autoMakefile.am
rename to lustre/cobd/Makefile.am
index ab8b4db..781c6ce 100644
--- a/lustre/cobd/autoMakefile.am
+++ b/lustre/cobd/Makefile.am
@@ -3,9 +3,13 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
-if MODULES
-modulefs_DATA := cobd$(KMODEXT)
-endif
+DEFS=
 
-DIST_SOURCES = $(cobd-objs:.o=.c)
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+MODULE = cobd
+modulefs_DATA = cobd.o
+EXTRA_PROGRAMS = cobd
+LINX=
+
+cobd_SOURCES = cache_obd.c lproc_cache.c $(LINX)
+
+include $(top_srcdir)/Rules
diff --git a/lustre/cobd/Makefile.in b/lustre/cobd/Makefile.in
deleted file mode 100644
index 4f10283..0000000
--- a/lustre/cobd/Makefile.in
+++ /dev/null
@@ -1,4 +0,0 @@
-MODULES := cobd
-cobd-objs := cache_obd.o lproc_cache.o
-
-@INCLUDE_RULES@
diff --git a/lustre/cobd/cache_obd.c b/lustre/cobd/cache_obd.c
index c42dab1..0a27122 100644
--- a/lustre/cobd/cache_obd.c
+++ b/lustre/cobd/cache_obd.c
@@ -30,19 +30,33 @@
 #include <linux/obd_class.h>
 #include <linux/obd_cache.h>
 
-static int cobd_setup (struct obd_device *obd, obd_count len, void *buf)
+static int cobd_attach(struct obd_device *dev, obd_count len, void *data)
+{
+        struct lprocfs_static_vars lvars;
+
+        lprocfs_init_vars(cobd, &lvars);
+        return lprocfs_obd_attach(dev, lvars.obd_vars);
+}
+
+static int cobd_detach(struct obd_device *dev)
+{
+        return lprocfs_obd_detach(dev);
+}
+
+static int
+cobd_setup (struct obd_device *dev, obd_count len, void *buf)
 {
         struct lustre_cfg *lcfg = (struct lustre_cfg *)buf;
-        struct cache_obd  *cobd = &obd->u.cobd;
+        struct cache_obd  *cobd = &dev->u.cobd;
         struct obd_device *target;
         struct obd_device *cache;
         struct obd_uuid target_uuid;
         struct obd_uuid cache_uuid;
         struct lustre_handle target_conn = {0,}, cache_conn = {0,};
-        struct lprocfs_static_vars lvars;
         int                rc;
 
-        if (lcfg->lcfg_inlbuf1 == NULL || lcfg->lcfg_inlbuf2 == NULL)
+        if (lcfg->lcfg_inlbuf1 == NULL ||
+            lcfg->lcfg_inlbuf2 == NULL)
                 return (-EINVAL);
 
         obd_str2uuid(&target_uuid, lcfg->lcfg_inlbuf1);
@@ -68,29 +82,24 @@ static int cobd_setup (struct obd_device *obd, obd_count len, void *buf)
         }
         cobd->cobd_cache_exp = class_conn2export(&cache_conn);
 
-        lprocfs_init_vars(cobd, &lvars);
-        lprocfs_obd_setup(obd, lvars.obd_vars);
-
-        return 0;
+        return rc;
 }
 
-static int cobd_cleanup(struct obd_device *obd, int flags)
+static int cobd_cleanup(struct obd_device *dev, int flags)
 {
-        struct cache_obd  *cobd = &obd->u.cobd;
+        struct cache_obd  *cobd = &dev->u.cobd;
         int                rc;
 
-        if (!list_empty(&obd->obd_exports))
+        if (!list_empty(&dev->obd_exports))
                 return (-EBUSY);
 
-        lprocfs_obd_cleanup(obd);
-
         rc = obd_disconnect(cobd->cobd_cache_exp, flags);
         if (rc != 0)
-                CERROR("error %d disconnecting cache\n", rc);
+                CERROR ("error %d disconnecting cache\n", rc);
 
         rc = obd_disconnect(cobd->cobd_target_exp, flags);
         if (rc != 0)
-                CERROR("error %d disconnecting target\n", rc);
+                CERROR ("error %d disconnecting target\n", rc);
 
         return (0);
 }
@@ -234,22 +243,24 @@ static int cobd_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
 }
 
 static struct obd_ops cobd_ops = {
-        .o_owner                = THIS_MODULE,
+        o_owner:                THIS_MODULE,
+        o_attach:               cobd_attach,
+        o_detach:               cobd_detach,
 
-        .o_setup                = cobd_setup,
-        .o_cleanup              = cobd_cleanup,
+        o_setup:                cobd_setup,
+        o_cleanup:              cobd_cleanup,
 
-        .o_connect              = cobd_connect,
-        .o_disconnect           = cobd_disconnect,
+        o_connect:              cobd_connect,
+        o_disconnect:           cobd_disconnect,
 
-        .o_get_info             = cobd_get_info,
-        .o_statfs               = cobd_statfs,
+        o_get_info:             cobd_get_info,
+        o_statfs:               cobd_statfs,
 
-        .o_getattr              = cobd_getattr,
-        .o_preprw               = cobd_preprw,
-        .o_commitrw             = cobd_commitrw,
-        .o_brw                  = cobd_brw,
-        .o_iocontrol            = cobd_iocontrol,
+        o_getattr:              cobd_getattr,
+        o_preprw:               cobd_preprw,
+        o_commitrw:             cobd_commitrw,
+        o_brw:                  cobd_brw,
+        o_iocontrol:            cobd_iocontrol,
 };
 
 static int __init cobd_init(void)
@@ -260,7 +271,7 @@ static int __init cobd_init(void)
         printk(KERN_INFO "Lustre: Caching OBD driver; info@clusterfs.com\n");
 
         lprocfs_init_vars(cobd, &lvars);
-        RETURN(class_register_type(&cobd_ops, lvars.module_vars,
+        RETURN(class_register_type(&cobd_ops, NULL, lvars.module_vars,
                                    OBD_CACHE_DEVICENAME));
 }
 
diff --git a/lustre/conf/Makefile.am b/lustre/conf/Makefile.am
index 6e3666b..a205d10 100644
--- a/lustre/conf/Makefile.am
+++ b/lustre/conf/Makefile.am
@@ -10,3 +10,6 @@ ldapconf_SCRIPTS = slapd-lustre.conf
 ldapschema_SCRIPTS = lustre.schema
 pkglibdir = '${exec_prefix}/usr/lib/$(PACKAGE)'
 pkglib_DATA = top.ldif lustre2ldif.xsl
+
+include $(top_srcdir)/Rules
+
diff --git a/lustre/conf/lustre.dtd b/lustre/conf/lustre.dtd
index 8fd57d8..96fdc8e 100644
--- a/lustre/conf/lustre.dtd
+++ b/lustre/conf/lustre.dtd
@@ -21,12 +21,12 @@
                
 <!ELEMENT network (nid | port | route_tbl | sendmem | recvmem)*>
 <!ATTLIST network %object.attr;
-                  nettype (tcp | elan | gm) 'tcp'>
+                  nettype (tcp | elan | gm | scimac) 'tcp'>
 
 <!ELEMENT routetbl (route)*>
 <!ATTLIST routetbl %object.attr;>
 <!ELEMENT route %object.content;>
-<!ATTLIST route type (elan | tcp | gm) #REQUIRED
+<!ATTLIST route type (elan | tcp | gm | scimac) #REQUIRED
                 gw CDATA #REQUIRED
                 lo CDATA #REQUIRED
                 hi CDATA #IMPLIED >
diff --git a/lustre/configure.in b/lustre/configure.in
index 61d4844..bff0966 100644
--- a/lustre/configure.in
+++ b/lustre/configure.in
@@ -5,156 +5,60 @@
 
 AC_INIT
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(lustre, HEAD)
-# AM_MAINTAINER_MODE
-
-# Four main targets: lustre kernel modules, utilities, tests, and liblustre
-AC_MSG_CHECKING([whether to build kernel modules])
-AC_ARG_ENABLE([modules],
-	AC_HELP_STRING([--disable-modules],
-			[disable building of Lustre kernel modules]),
-	[],[enable_modules='yes'])
-AC_MSG_RESULT([$enable_modules])
-AM_CONDITIONAL(MODULES, test x$enable_modules = xyes)
-
-AC_MSG_CHECKING([whether to build Lustre library])
-AC_ARG_ENABLE([liblustre],
-	AC_HELP_STRING([--disable-liblustre],
-			[disable building of Lustre library]),
-	[],[enable_liblustre='yes'])
-AC_MSG_RESULT([$enable_liblustre])
-AM_CONDITIONAL(LIBLUSTRE, test x$enable_liblustre = xyes)
-
-AC_MSG_CHECKING([whether to build utilities])
-AC_ARG_ENABLE([utils],
-	AC_HELP_STRING([--disable-utils],
-			[disable building of Lustre utility programs]),
-	[],[enable_utils='yes'])
-AC_MSG_RESULT([$enable_utils])
-
-AC_MSG_CHECKING([whether to build Lustre tests])
-AC_ARG_ENABLE([tests],
-	AC_HELP_STRING([--disable-tests],
-			[disable building of Lustre tests]),
-	[],[enable_tests='yes'])
-AC_MSG_RESULT([$enable_tests])
 
-# specify wether to build doc or not
-AC_MSG_CHECKING([whether to build docs])
-AC_ARG_ENABLE(doc,
-	AC_HELP_STRING([--disable-doc],
-			[skip creation of pdf documentation]),
-	[
-		if test x$enable_doc = xyes ; then
-		    ENABLE_DOC=1	   
-		else
-		    ENABLE_DOC=0
-		fi
-	],[
-		ENABLE_DOC=0
-		enable_doc='no'
-	])
-AC_MSG_RESULT([$enable_doc])
-AM_CONDITIONAL(DOC, test x$ENABLE_DOC = x1)
-AC_SUBST(ENABLE_DOC)
-
-# default backing fs is ext3
-BACKINGFS='ext3'
+# Automake variables.  Steal the version number from lustre.spec.in.
+AM_INIT_AUTOMAKE(lustre, builtin([esyscmd], [sed -ne '/^%define version /{ s/.*version //; p; q; }' scripts/lustre.spec.in]))
+#AM_MAINTAINER_MODE
 
 # LLNL patches their ext3 and calls it extN
-AC_MSG_CHECKING([whether to use extN])
-AC_ARG_ENABLE([extN],
-	AC_HELP_STRING([--enable-extN],
-			[use extN instead of ext3 for lustre backend]),
-	[BACKINGFS='extN'],[enable_extN='no'])
-AC_MSG_RESULT([$enable_extN])
+AC_ARG_ENABLE(extN, [  --enable-extN use extN instead of ext3 for lustre backend])
 AM_CONDITIONAL(EXTN, test x$enable_extN = xyes)
 
-# SuSE gets ldiskfs
-AC_MSG_CHECKING([whether to enable ldiskfs])
-AC_ARG_ENABLE([ldiskfs],
-	AC_HELP_STRING([--enable-ldiskfs],
-			[use ldiskfs for the Lustre backing FS]),
-	[BACKINGFS='ldiskfs'],[enable_ldiskfs='no'])
-AC_MSG_RESULT([$enable_ldiskfs])
-AM_CONDITIONAL(LDISKFS, test x$enable_ldiskfs = xyes)
-
-AC_MSG_CHECKING([which backing filesystem to use])
-AC_MSG_RESULT([$BACKINGFS])
-AC_SUBST(BACKINGFS)
+# specify wether to build doc or not
+AC_ARG_ENABLE(doc, [  --disable-doc skip creation of pdf documentation],
+		   [
+			if test x$enable_doc = xyes ; then
+			    ENABLE_DOC=1	   
+			else
+			    ENABLE_DOC=0
+			fi
+		   ],
+		   [ ENABLE_DOC=0 ])
+AM_CONDITIONAL(DOC, test x$ENABLE_DOC = x1)
+AC_SUBST(ENABLE_DOC)
 
 # the pinger is temporary, until we have the recovery node in place
-AC_MSG_CHECKING([whether to enable pinger support])
-AC_ARG_ENABLE([pinger],
-	AC_HELP_STRING([--disable-pinger],
-			[disable recovery pinger support]),
-	[],[enable_pinger='yes'])
-AC_MSG_RESULT([$enable_pinger])
+AC_ARG_ENABLE(pinger, [  --disable-pinger disable recovery pinger support])
 if test x$enable_pinger != xno ; then
   AC_DEFINE(ENABLE_PINGER, 1, Use the Pinger)
 fi
 
-AC_MSG_CHECKING([maximum OBD ioctl size])
-AC_ARG_WITH([obd-buffer-size],
-	AC_HELP_STRING([--with-obd-buffer-size=[size]],
-			[set lctl ioctl maximum bytes (default=8192)]),
-	[
-		OBD_BUFFER_SIZE=$with_obd_buffer_size
-	],[
-		OBD_BUFFER_SIZE=8192
-	])
-AC_MSG_RESULT([$OBD_BUFFER_SIZE bytes])
+AC_ARG_WITH(obd-buffer-size, [  --with-obd-buffer-size=[size] set lctl ioctl maximum bytes (default=8192)],OBD_BUFFER_SIZE=$with_obd_buffer_size,OBD_BUFFER_SIZE=8192)
 AC_DEFINE_UNQUOTED(OBD_MAX_IOCTL_BUFFER, $OBD_BUFFER_SIZE, [IOCTL Buffer Size])
 
 # specify location of libsysio tree
-AC_MSG_CHECKING([location of libsysio])
-AC_ARG_WITH([sysio],
-	AC_HELP_STRING([--with-sysio=[path]],
-			[set path to libsysio source (default=../libsysio)]),
-	[
-		SYSIO=$with_sysio
-		SYSIO_PATH=$SYSIO
-	],[
-		SYSIO='$(top_srcdir)/../libsysio'
-		SYSIO_PATH='../libsysio'
-	])
-AC_MSG_RESULT([$SYSIO_PATH])
-
-AC_CHECK_FILE([$SYSIO_PATH/src/libsysio.a],[],
-	[
-		if test x$enable_liblustre = xyes ; then
-		   AC_MSG_ERROR([A built libsysio tree is required for building liblustre.])
-	   	fi
-	])
+AC_ARG_WITH(sysio, [  --with-sysio=[path] set path to libsysio source (default=../libsysio)], sysiodir=$withval)
+if test x$sysiodir = x; then
+	SYSIO='$(top_srcdir)/../libsysio'
+else
+	SYSIO=$sysiodir
+fi
 AC_SUBST(SYSIO)
 
 #build mpi-tests 
-AC_MSG_CHECKING([whether to build mpitests])
-AC_ARG_ENABLE([mpitests],
-	AC_HELP_STRING([--enable-mpitests],
-			[build liblustre mpi tests]),
-	[],[enable_mpitests=no])
-AC_MSG_RESULT([$enable_mpitests])
+AC_ARG_ENABLE(mpitests, [  --enable-mpitests build liblustre mpi tests])
 AM_CONDITIONAL(MPITESTS, test x$enable_mpitests = xyes, Build MPI Tests)
 
-# snap compilation
-AC_MSG_CHECKING([whether to enable snapfs support])
-AC_ARG_ENABLE([snapfs],
-	AC_HELP_STRING([--enable-snapfs],
-			[build snapfs]),
-	[],[enable_snapfs='no'])
-AC_MSG_RESULT([$enable_snapfs])
+# snap compilation 
+AC_ARG_ENABLE(snapfs, [  --enable-snapfs build snapfs])
 AM_CONDITIONAL(SNAPFS, test x$enable_snapfs = xyes)
 
-# smfs compilation
-AC_MSG_CHECKING([whether to enable smfs support])
-AC_ARG_ENABLE([smfs],
-	AC_HELP_STRING([--enable-smfs],
-			[build smfs]),
-	[],[enable_smfs='no'])
-AC_MSG_RESULT([$enable_smfs])
+# smfs compilation 
+AC_ARG_ENABLE(smfs, [  --enable-smfs build smfs])
 AM_CONDITIONAL(SMFS, test x$enable_smfs = xyes)
 
+
+
 sinclude(portals/build.m4)
 sinclude(portals/archdep.m4)
 
@@ -163,93 +67,20 @@ if test x$enable_inkernel = xyes ; then
 		sh -e -x -c '(cp -f $0.mk $0.in)'
 fi
 
-# we need to pass a full path here for kernel makefiles
-INCLUDE_RULES="include $PWD/Rules"
-AC_SUBST(INCLUDE_RULES)
-
-# ptlrpc kernel build requires this
-LUSTRE="$PWD"
-AC_SUBST(LUSTRE)
-
-#
-AM_CONDITIONAL(UTILS, test x$enable_utils = xyes)
-AM_CONDITIONAL(TESTS, test x$enable_tests = xyes)
-
 AM_CONFIG_HEADER(include/config.h)
 
-AC_OUTPUT([
-Makefile
-Rules
-autoMakefile
-cobd/Makefile
-cobd/autoMakefile
-conf/Makefile
-doc/Makefile
-include/Makefile
-include/linux/Makefile
-include/lustre/Makefile
-ldiskfs/Makefile
-ldiskfs/autoMakefile
-ldlm/Makefile
-liblustre/Makefile
-liblustre/tests/Makefile
-llite/Makefile
-llite/autoMakefile
-lov/Makefile
-lov/autoMakefile
-lvfs/Makefile
-lvfs/autoMakefile
-mdc/Makefile
-mdc/autoMakefile
-mds/Makefile
-mds/autoMakefile
-obdclass/Makefile
-obdclass/autoMakefile
-obdecho/Makefile
-obdecho/autoMakefile
-obdfilter/Makefile
-obdfilter/autoMakefile
-osc/Makefile
-osc/autoMakefile
-ost/Makefile
-ost/autoMakefile
-portals/Kernelenv
-portals/Makefile
-portals/autoMakefile
-portals/doc/Makefile
-portals/knals/Makefile
-portals/knals/autoMakefile
-portals/knals/gmnal/Makefile
-portals/knals/gmnal/autoMakefile
-portals/knals/ibnal/Makefile
-portals/knals/ibnal/autoMakefile
-portals/knals/qswnal/Makefile
-portals/knals/qswnal/autoMakefile
-portals/knals/socknal/Makefile
-portals/knals/socknal/autoMakefile
-portals/libcfs/Makefile
-portals/libcfs/autoMakefile
-portals/portals/Makefile
-portals/portals/autoMakefile
-portals/router/Makefile
-portals/router/autoMakefile
-portals/tests/Makefile
-portals/tests/autoMakefile
-portals/unals/Makefile
-portals/utils/Makefile
-ptlbd/Makefile
-ptlbd/autoMakefile
-ptlrpc/Makefile
-ptlrpc/autoMakefile
-scripts/Makefile
-scripts/lustre.spec
-scripts/version_tag.pl
-smfs/Makefile
-smfs/autoMakefile
-snapfs/Makefile
-snapfs/autoMakefile
-snapfs/utils/Makefile
-tests/Makefile
-utils/Lustre/Makefile
-utils/Makefile
-])
+AC_OUTPUT([Makefile lvfs/Makefile portals/Makefile portals/Kernelenv \
+          portals/libcfs/Makefile portals/portals/Makefile \
+          portals/unals/Makefile portals/knals/Makefile \
+          portals/router/Makefile portals/knals/socknal/Makefile \
+          portals/knals/gmnal/Makefile portals/knals/qswnal/Makefile \
+	  portals/knals/scimacnal/Makefile \
+	  portals/knals/ibnal/Makefile \
+          portals/utils/Makefile portals/tests/Makefile portals/doc/Makefile \
+          obdecho/Makefile ptlrpc/Makefile liblustre/Makefile liblustre/tests/Makefile \
+	  lov/Makefile osc/Makefile mdc/Makefile mds/Makefile ost/Makefile \
+	  cobd/Makefile ptlbd/Makefile conf/Makefile  tests/Makefile \
+	  utils/Makefile utils/Lustre/Makefile obdfilter/Makefile lmv/Makefile \
+          obdclass/Makefile smfs/Makefile snapfs/Makefile snapfs/utils/Makefile \
+	  include/Makefile include/linux/Makefile llite/Makefile doc/Makefile scripts/Makefile \
+	  scripts/lustre.spec])
diff --git a/lustre/doc/Makefile.am b/lustre/doc/Makefile.am
index a47d5e7..dbffef4 100644
--- a/lustre/doc/Makefile.am
+++ b/lustre/doc/Makefile.am
@@ -122,3 +122,5 @@ doc.old/lustre.lin:
 
 dist-hook:
 	rm -rf $(distdir)/figs/CVS
+
+include $(top_srcdir)/Rules
diff --git a/lustre/doc/lmc.1 b/lustre/doc/lmc.1
index 28f51ad..c3345e8 100644
--- a/lustre/doc/lmc.1
+++ b/lustre/doc/lmc.1
@@ -59,7 +59,7 @@ The arguments required are:
 This will create a new node with the given name if not already present. This is also used to specify a specific node for other elements.
 .TP
 --nettype <type> 
-This can be tcp, elan, or gm.
+This can be tcp, elan, gm, scimac.
 .TP
 --nid nid 
 The network id, e.g. ElanID or IP address as used by Portals. If nid is '*', then the local address of the interface with specified nettype is will be substituted when the node is configured with lconf. An nid of '*' should be used only for the generic client configuration.
diff --git a/lustre/doc/lmc.lyx b/lustre/doc/lmc.lyx
index bb6ca2b..fb14d0e 100644
--- a/lustre/doc/lmc.lyx
+++ b/lustre/doc/lmc.lyx
@@ -197,7 +197,7 @@ The arguments required are:
 --nettype\SpecialChar ~
 <type> This can be 
 \series bold 
-tcp, elan, gm.
+tcp, elan, gm, scimac.
 \layout Description
 
 --nid\SpecialChar ~
diff --git a/lustre/include/.cvsignore b/lustre/include/.cvsignore
index a8dd680..7b78c04 100644
--- a/lustre/include/.cvsignore
+++ b/lustre/include/.cvsignore
@@ -3,7 +3,6 @@ config.log
 config.status
 configure
 config.h
-config.h.in
 stamp-h
 stamp-h1
 stamp-h.in
diff --git a/lustre/include/Makefile.am b/lustre/include/Makefile.am
index 2a3f201..d532ab5 100644
--- a/lustre/include/Makefile.am
+++ b/lustre/include/Makefile.am
@@ -4,6 +4,6 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
-SUBDIRS = linux lustre
+SUBDIRS = linux
 EXTRA_DIST = config.h.in ioctl.h liblustre.h 
-
+include $(top_srcdir)/Rules
diff --git a/lustre/include/config.h.in b/lustre/include/config.h.in
new file mode 100644
index 0000000..eca8fdd
--- /dev/null
+++ b/lustre/include/config.h.in
@@ -0,0 +1,61 @@
+/* include/config.h.in.  Generated from configure.in by autoheader.  */
+
+/* Use the Pinger */
+#undef ENABLE_PINGER
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* IOCTL Buffer Size */
+#undef OBD_MAX_IOCTL_BUFFER
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* The size of a `unsigned long long', as computed by sizeof. */
+#undef SIZEOF_UNSIGNED_LONG_LONG
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Version number of package */
+#undef VERSION
diff --git a/lustre/include/liblustre.h b/lustre/include/liblustre.h
index da6cc8a..460d86e 100644
--- a/lustre/include/liblustre.h
+++ b/lustre/include/liblustre.h
@@ -24,8 +24,8 @@
 #ifndef LIBLUSTRE_H__
 #define LIBLUSTRE_H__
 
-#include <sys/mman.h>
 #include <asm/byteorder.h>
+#include <sys/mman.h>
 #ifndef  __CYGWIN__
 #include <stdint.h>
 #include <asm/page.h>
@@ -52,7 +52,7 @@
 #define PAGE_SHIFT 12
 #define PAGE_SIZE (1UL << PAGE_SHIFT)
 #define PAGE_MASK (~(PAGE_SIZE-1))
-#define loff_t long long
+#define loff_t __u64
 #define ERESTART 2001
 typedef unsigned short umode_t;
 
@@ -116,6 +116,9 @@ static inline void *kmalloc(int size, int prot)
 #define PTR_ERR(a) ((long)(a))
 #define ERR_PTR(a) ((void*)((long)(a)))
 
+#define capable(foo) 1
+#define CAP_SYS_ADMIN 1
+
 typedef struct {
         void *cwd;
 }mm_segment_t;
@@ -139,7 +142,7 @@ typedef int (write_proc_t)(struct file *file, const char *buffer,
         ((unsigned char *)&addr)[1], \
         ((unsigned char *)&addr)[2], \
         ((unsigned char *)&addr)[3]
-
+                                                                                                                        
 #if defined(__LITTLE_ENDIAN)
 #define HIPQUAD(addr) \
         ((unsigned char *)&addr)[3], \
@@ -237,18 +240,8 @@ static inline int request_module(char *name)
 #define __MOD_DEC_USE_COUNT(m)  do {} while (0)
 #define MOD_INC_USE_COUNT       do {} while (0)
 #define MOD_DEC_USE_COUNT       do {} while (0)
-static inline void __module_get(struct module *module)
-{
-}
-
-static inline int try_module_get(struct module *module)
-{
-        return 1;
-}
-
-static inline void module_put(struct module *module)
-{
-}
+#define try_module_get          __MOD_INC_USE_COUNT
+#define module_put              __MOD_DEC_USE_COUNT
 
 /* module initialization */
 extern int init_obdclass(void);
@@ -262,13 +255,14 @@ extern int echo_client_init(void);
 
 
 /* general stuff */
+#define jiffies 0
 
 #define EXPORT_SYMBOL(S)
 
-typedef struct { } spinlock_t;
+typedef int spinlock_t;
 typedef __u64 kdev_t;
 
-#define SPIN_LOCK_UNLOCKED (spinlock_t) { }
+#define SPIN_LOCK_UNLOCKED 0
 #define LASSERT_SPIN_LOCKED(lock) do {} while(0)
 
 static inline void spin_lock(spinlock_t *l) {return;}
@@ -302,7 +296,14 @@ static inline void spin_unlock_irqrestore(spinlock_t *a, unsigned long b) {}
 
 /* random */
 
-void get_random_bytes(void *ptr, int size);
+static inline void get_random_bytes(void *ptr, int size)
+{
+        int *p = (int *)ptr;
+        int i, count = size/sizeof(int);
+
+        for (i = 0; i< count; i++)
+                *p++ = rand();
+}
 
 /* memory */
 
@@ -356,6 +357,11 @@ static inline int kmem_cache_destroy(kmem_cache_t *a)
 #define PAGE_CACHE_SHIFT 12
 #define PAGE_CACHE_MASK PAGE_MASK
 
+/* XXX
+ * for this moment, liblusre will not rely OST for non-page-aligned write
+ */
+#define LIBLUSTRE_HANDLE_UNALIGNED_PAGE
+
 struct page {
         void   *addr;
         unsigned long index;
@@ -365,12 +371,11 @@ struct page {
         /* internally used by liblustre file i/o */
         int     _offset;
         int     _count;
+#ifdef LIBLUSTRE_HANDLE_UNALIGNED_PAGE
+        int     _managed;
+#endif
 };
 
-/* 2.4 defines */
-#define PAGE_LIST_ENTRY list
-#define PAGE_LIST(page) ((page)->list)
-
 #define kmap(page) (page)->addr
 #define kunmap(a) do {} while (0)
 
@@ -518,15 +523,14 @@ struct semaphore {
         int count;
 };
 
-/* use the macro's argument to avoid unused warnings */
-#define down(a) do { (void)a; } while (0)
-#define up(a) do { (void)a; } while (0)
-#define down_read(a) do { (void)a; } while (0)
-#define up_read(a) do { (void)a; } while (0)
-#define down_write(a) do { (void)a; } while (0)
-#define up_write(a) do { (void)a; } while (0)
-#define sema_init(a,b) do { (void)a; } while (0)
-#define init_rwsem(a) do { (void)a; } while (0)
+#define down(a) do {} while (0)
+#define up(a) do {} while (0)
+#define down_read(a) do {} while (0)
+#define up_read(a) do {} while (0)
+#define down_write(a) do {} while (0)
+#define up_write(a) do {} while (0)
+#define sema_init(a,b) do {} while (0)
+#define init_rwsem(a) do {} while (0)
 #define DECLARE_MUTEX(name)     \
         struct semaphore name = { 1 }
 static inline void init_MUTEX (struct semaphore *sem)
@@ -560,23 +564,12 @@ struct task_struct {
         int pid;
         int fsuid;
         int fsgid;
-        int max_groups;
-        int ngroups;
-        gid_t *groups;
         __u32 cap_effective;
-
-        struct fs_struct __fs;
 };
 
 extern struct task_struct *current;
-int in_group_p(gid_t gid);
-static inline int capable(int cap)
-{
-        if (current->cap_effective & (1 << cap))
-                return 1;
-        else
-                return 0;
-}
+
+#define in_group_p(a) 0 /* FIXME */
 
 #define set_current_state(foo) do { current->state = foo; } while (0)
 
@@ -625,20 +618,6 @@ static inline int schedule_timeout(signed long t)
 #define SIGNAL_MASK_ASSERT()
 #define KERN_INFO
 
-#include <sys/time.h>
-#if HZ != 1
-#error "liblustre's jiffies currently expects HZ to be 1"
-#endif
-#define jiffies                                 \
-({                                              \
-        unsigned long _ret = 0;                 \
-        struct timeval tv;                      \
-        if (gettimeofday(&tv, NULL) == 0)       \
-                _ret = tv.tv_sec;               \
-        _ret;                                   \
-})
-#define time_after(a, b) ((long)(b) - (long)(a) > 0)
-#define time_before(a, b) time_after(b,a)
 
 struct timer_list {
         struct list_head tl_list;
@@ -671,6 +650,11 @@ static inline void del_timer(struct timer_list *l)
         free(l);
 }
 
+#define time_after(a, b)                                        \
+({                                                              \
+        1;                                                      \
+})
+
 typedef struct { volatile int counter; } atomic_t;
 
 #define atomic_read(a) ((a)->counter)
@@ -688,33 +672,6 @@ typedef struct { volatile int counter; } atomic_t;
 #define unlikely(exp) (exp)
 #endif
 
-/* FIXME sys/capability will finally included linux/fs.h thus
- * cause numerous trouble on x86-64. as temporary solution for
- * build broken at cary, we copy definition we need from capability.h
- * FIXME
- */
-struct _cap_struct;
-typedef struct _cap_struct *cap_t;
-typedef int cap_value_t;
-typedef enum {
-    CAP_EFFECTIVE=0,
-    CAP_PERMITTED=1,
-    CAP_INHERITABLE=2
-} cap_flag_t;
-typedef enum {
-    CAP_CLEAR=0,
-    CAP_SET=1
-} cap_flag_value_t;
-
-#define CAP_FOWNER      3
-#define CAP_FSETID      4
-#define CAP_SYS_ADMIN   21
-
-cap_t   cap_get_proc(void);
-int     cap_get_flag(cap_t, cap_value_t, cap_flag_t, cap_flag_value_t *);
-
-
-
 /* log related */
 static inline int llog_init_commit_master(void) { return 0; }
 static inline int llog_cleanup_commit_master(int force) { return 0; }
diff --git a/lustre/include/linux/Makefile.am b/lustre/include/linux/Makefile.am
index b170c5c..cd614f9 100644
--- a/lustre/include/linux/Makefile.am
+++ b/lustre/include/linux/Makefile.am
@@ -3,9 +3,12 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
+
+pkginclude_HEADERS = lustre_user.h
+
 EXTRA_DIST = lprocfs_status.h lustre_debug.h lustre_ha.h lustre_lib.h \
   lustre_mgmt.h obd_cache.h obd_lov.h lustre_dlm.h lustre_handles.h \
   lustre_net.h obd_class.h obd_ost.h obd_support.h lustre_commit_confd.h \
   lustre_export.h lustre_log.h obd_echo.h obd_ptlbd.h obd_trace.h \
   lustre_compat25.h lustre_fsfilt.h lustre_import.h lustre_mds.h obd.h \
-  lvfs.h lvfs_linux.h lustre_cfg.h lustre_lite.h  lustre_idl.h lustre_smfs.h 
+  lvfs.h lvfs_linux.h lustre_cfg.h lustre_lite.h  lustre_idl.h
diff --git a/lustre/include/linux/lprocfs_status.h b/lustre/include/linux/lprocfs_status.h
index b79b574..3a7ac42 100644
--- a/lustre/include/linux/lprocfs_status.h
+++ b/lustre/include/linux/lprocfs_status.h
@@ -182,6 +182,17 @@ extern void lprocfs_free_obd_stats(struct obd_device *obddev);
 extern int lprocfs_register_stats(struct proc_dir_entry *root, const char *name,
                                   struct lprocfs_stats *stats);
 
+#define LPROCFS_INIT_MULTI_VARS(array, size)                              \
+void lprocfs_init_multi_vars(unsigned int idx,                            \
+                             struct lprocfs_static_vars *x)               \
+{                                                                         \
+   struct lprocfs_static_vars *glob = (struct lprocfs_static_vars*)array; \
+   LASSERT(glob != 0);                                                    \
+   LASSERT(idx < (unsigned int)(size));                                   \
+   x->module_vars = glob[idx].module_vars;                                \
+   x->obd_vars = glob[idx].obd_vars;                                      \
+}                                                                         \
+
 #define LPROCFS_INIT_VARS(name, vclass, vinstance)           \
 void lprocfs_##name##_init_vars(struct lprocfs_static_vars *x)  \
 {                                                      \
@@ -194,6 +205,8 @@ do {      \
         extern void lprocfs_##NAME##_init_vars(struct lprocfs_static_vars *);  \
         lprocfs_##NAME##_init_vars(VAR);                                       \
 } while (0)
+extern void lprocfs_init_multi_vars(unsigned int idx,
+                                    struct lprocfs_static_vars *var);
 /* lprocfs_status.c */
 extern int lprocfs_add_vars(struct proc_dir_entry *root,
                             struct lprocfs_vars *var,
@@ -209,8 +222,8 @@ extern void lprocfs_remove(struct proc_dir_entry *root);
 extern struct proc_dir_entry *lprocfs_srch(struct proc_dir_entry *root,
                                            const char *name);
 
-extern int lprocfs_obd_setup(struct obd_device *obd, struct lprocfs_vars *list);
-extern int lprocfs_obd_cleanup(struct obd_device *obd);
+extern int lprocfs_obd_attach(struct obd_device *dev, struct lprocfs_vars *list);
+extern int lprocfs_obd_detach(struct obd_device *dev);
 
 /* Generic callbacks */
 
@@ -226,8 +239,6 @@ extern int lprocfs_rd_server_uuid(char *page, char **start, off_t off,
                                   int count, int *eof, void *data);
 extern int lprocfs_rd_conn_uuid(char *page, char **start, off_t off,
                                 int count, int *eof, void *data);
-extern int lprocfs_rd_num_exports(char *page, char **start, off_t off,
-                                  int count, int *eof, void *data);
 extern int lprocfs_rd_numrefs(char *page, char **start, off_t off,
                               int count, int *eof, void *data);
 
@@ -293,6 +304,9 @@ static inline void lprocfs_free_obd_stats(struct obd_device *obddev)
 static inline struct proc_dir_entry *
 lprocfs_register(const char *name, struct proc_dir_entry *parent,
                  struct lprocfs_vars *list, void *data) { return NULL; }
+#define LPROCFS_INIT_MULTI_VARS(array, size) do {} while (0)
+static inline void lprocfs_init_multi_vars(unsigned int idx,
+                                           struct lprocfs_static_vars *x) { return; }
 #define LPROCFS_INIT_VARS(name, vclass, vinstance) do {} while (0)
 #define lprocfs_init_vars(...) do {} while (0)
 static inline int lprocfs_add_vars(struct proc_dir_entry *root,
@@ -301,9 +315,9 @@ static inline int lprocfs_add_vars(struct proc_dir_entry *root,
 static inline void lprocfs_remove(struct proc_dir_entry *root) {};
 static inline struct proc_dir_entry *lprocfs_srch(struct proc_dir_entry *head,
                                     const char *name) {return 0;}
-static inline int lprocfs_obd_setup(struct obd_device *dev,
-                                    struct lprocfs_vars *list) { return 0; }
-static inline int lprocfs_obd_cleanup(struct obd_device *dev)  { return 0; }
+static inline int lprocfs_obd_attach(struct obd_device *dev,
+                                     struct lprocfs_vars *list) { return 0; }
+static inline int lprocfs_obd_detach(struct obd_device *dev)  { return 0; }
 static inline int lprocfs_rd_u64(char *page, char **start, off_t off,
                                  int count, int *eof, void *data) { return 0; }
 static inline int lprocfs_rd_uuid(char *page, char **start, off_t off,
@@ -311,14 +325,9 @@ static inline int lprocfs_rd_uuid(char *page, char **start, off_t off,
 static inline int lprocfs_rd_name(char *page, char **start, off_t off,
                                   int count, int *eof, void *data) { return 0; }
 static inline int lprocfs_rd_server_uuid(char *page, char **start, off_t off,
-                                         int count, int *eof, void *data)
-{ return 0; }
+                                         int count, int *eof, void *data) { return 0; }
 static inline int lprocfs_rd_conn_uuid(char *page, char **start, off_t off,
-                                       int count, int *eof, void *data)
-{ return 0; }
-static inline int lprocfs_rd_num_exports(char *page, char **start, off_t off,
-                                         int count, int *eof, void *data)
-{ return 0; }
+                                       int count, int *eof, void *data) { return 0; }
 static inline int lprocfs_rd_numrefs(char *page, char **start, off_t off,
                                      int count, int *eof, void *data) { return 0; }
 
diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h
index 120e996..4a4e3a0 100644
--- a/lustre/include/linux/lustre_compat25.h
+++ b/lustre/include/linux/lustre_compat25.h
@@ -52,7 +52,7 @@
 
 #define LTIME_S(time)                   (time.tv_sec)
 #define ll_path_lookup                  path_lookup
-#define ll_permission(inode,mask,nd)    permission(inode,mask,nd)
+#define ll_permission                   permission
 
 #define ll_pgcache_lock(mapping)          spin_lock(&mapping->page_lock)
 #define ll_pgcache_unlock(mapping)        spin_unlock(&mapping->page_lock)
@@ -111,7 +111,7 @@ static inline int cleanup_group_info(void)
 #else /* 2.4.. */
 
 #define ll_vfs_create(a,b,c,d)              vfs_create(a,b,c)
-#define ll_permission(inode,mask,nd)        permission(inode,mask)
+#define ll_permission(a,b,c)                permission(a,b)
 #define ILOOKUP(sb, ino, test, data)        ilookup4(sb, ino, test, data);
 #define DCACHE_DISCONNECTED                 DCACHE_NFSD_DISCONNECTED
 #define ll_dev_t                            int
@@ -144,15 +144,15 @@ static inline void clear_page_dirty(struct page *page)
 #define cpu_online(cpu)                 (cpu_online_map & (1<<cpu))
 #endif
 
-static inline int ll_path_lookup(const char *path, unsigned flags,
-                                 struct nameidata *nd)
+static inline int ll_path_lookup(const char *path, unsigned flags, 
+                              struct nameidata *nd)
 {
         int error = 0;
         if (path_init(path, flags, nd))
                 error = path_walk(path, nd);
         return error;
 }
-#define ll_permission(inode,mask,nd)    permission(inode,mask)
+#define ll_permission(a,b,c)  permission(a,b)
 typedef long sector_t;
 
 #define ll_pgcache_lock(mapping)        spin_lock(&pagecache_lock)
@@ -194,42 +194,5 @@ static inline int cleanup_group_info(void)
 
 #endif /* end of 2.4 compat macros */
 
-#ifdef HAVE_PAGE_LIST
-static inline int mapping_has_pages(struct address_space *mapping)
-{
-        int rc = 1;
-
-        ll_pgcache_lock(mapping);
-        if (list_empty(&mapping->dirty_pages) &&
-            list_empty(&mapping->clean_pages) &&
-            list_empty(&mapping->locked_pages)) {
-                rc = 0;
-        }
-        ll_pgcache_unlock(mapping);
-
-        return rc;
-}
-
-static inline int clear_page_dirty_for_io(struct page *page)
-{
-        struct address_space *mapping = page->mapping;
-
-        if (page->mapping && PageDirty(page)) {
-                ClearPageDirty(page);
-                ll_pgcache_lock(mapping);
-                list_del(&page->list);
-                list_add(&page->list, &mapping->locked_pages);
-                ll_pgcache_unlock(mapping);
-                return 1;
-        }
-        return 0;
-}
-#else
-static inline int mapping_has_pages(struct address_space *mapping)
-{
-        return mapping->nrpages > 0;
-}
-#endif
-
 #endif /* __KERNEL__ */
 #endif /* _COMPAT25_H */
diff --git a/lustre/include/linux/lustre_dlm.h b/lustre/include/linux/lustre_dlm.h
index 3bd524d..48c26ac 100644
--- a/lustre/include/linux/lustre_dlm.h
+++ b/lustre/include/linux/lustre_dlm.h
@@ -90,14 +90,6 @@ typedef enum {
  * pretty high-risk, though, and would need a lot more testing. */
 #define LDLM_FL_CAN_MATCH      0x100000
 
-/* A lock contributes to the kms calculation until it has finished the part
- * of it's cancelation that performs write back on its dirty pages.  It
- * can remain on the granted list during this whole time.  Threads racing
- * to update the kms after performing their writeback need to know to
- * exclude each others locks from the calculation as they walk the granted
- * list. */
-#define LDLM_FL_KMS_IGNORE     0x200000
-
 /* The blocking callback is overloaded to perform two functions.  These flags
  * indicate which operation should be performed. */
 #define LDLM_CB_BLOCKING    1
@@ -110,7 +102,6 @@ typedef enum {
 #define LCK_COMPAT_CW  (LCK_COMPAT_PW | LCK_CW)
 #define LCK_COMPAT_CR  (LCK_COMPAT_CW | LCK_PR | LCK_PW)
 #define LCK_COMPAT_NL  (LCK_COMPAT_CR | LCK_EX)
-#define LCK_COMPAT_GROUP  (LCK_GROUP | LCK_NL)
 
 static ldlm_mode_t lck_compat_array[] = {
         [LCK_EX] LCK_COMPAT_EX,
@@ -118,13 +109,12 @@ static ldlm_mode_t lck_compat_array[] = {
         [LCK_PR] LCK_COMPAT_PR,
         [LCK_CW] LCK_COMPAT_CW,
         [LCK_CR] LCK_COMPAT_CR,
-        [LCK_NL] LCK_COMPAT_NL,
-        [LCK_GROUP] LCK_COMPAT_GROUP
+        [LCK_NL] LCK_COMPAT_NL
 };
 
 static inline void lockmode_verify(ldlm_mode_t mode)
 {
-       LASSERT(mode >= LCK_EX && mode <= LCK_GROUP);
+       LASSERT(mode >= LCK_EX && mode <= LCK_NL);
 }
 
 static inline int lockmode_compat(ldlm_mode_t exist, ldlm_mode_t new)
@@ -389,7 +379,7 @@ do {                                                                          \
         {                                                                     \
                 CDEBUG(level, "### " format                                   \
                        " ns: %s lock: %p/"LPX64" lrc: %d/%d,%d mode: %s/%s "  \
-                       "res: "LPU64"/"LPU64" rrc: %d type: %s "               \
+                       "res: "LPU64"/"LPU64"/"LPU64"/"LPU64" rrc: %d type: %s "\
                        "flags: %x remote: "LPX64" expref: %d\n" , ## a,       \
                        lock->l_resource->lr_namespace->ns_name,               \
                        lock, lock->l_handle.h_cookie,                         \
@@ -399,6 +389,8 @@ do {                                                                          \
                        ldlm_lockname[lock->l_req_mode],                       \
                        lock->l_resource->lr_name.name[0],                     \
                        lock->l_resource->lr_name.name[1],                     \
+                       lock->l_resource->lr_name.name[2],                     \
+                       lock->l_resource->lr_name.name[3],                     \
                        atomic_read(&lock->l_resource->lr_refcount),           \
                        ldlm_typename[lock->l_resource->lr_type],              \
                        lock->l_flags, lock->l_remote_handle.cookie,           \
@@ -457,6 +449,11 @@ int ldlm_handle_cancel(struct ptlrpc_request *req);
 int ldlm_del_waiting_lock(struct ldlm_lock *lock);
 int ldlm_get_ref(void);
 void ldlm_put_ref(int force);
+#ifndef __KERNEL__
+void liblustre_ldlm_handle_bl_callback(struct ldlm_namespace *ns,
+                                       struct ldlm_lock_desc *ld,
+                                       struct ldlm_lock *lock);
+#endif
 
 /* ldlm_lock.c */
 ldlm_processing_policy ldlm_get_processing_policy(struct ldlm_resource *res);
diff --git a/lustre/include/linux/lustre_export.h b/lustre/include/linux/lustre_export.h
index 9be781f..5570094 100644
--- a/lustre/include/linux/lustre_export.h
+++ b/lustre/include/linux/lustre_export.h
@@ -29,6 +29,7 @@ struct osc_creator {
         struct obd_device       *oscc_obd;
         obd_id                  oscc_last_id;//last available pre-created object
         obd_id                  oscc_next_id;// what object id to give out next
+        obd_id                  oscc_gr;
         int                     oscc_initial_create_count;
         int                     oscc_grow_count;
         int                     oscc_kick_barrier;
@@ -48,8 +49,10 @@ struct ec_export_data { /* echo client */
 
 /* In-memory access to client data from OST struct */
 struct filter_client_data;
+struct obd_llogs;
 struct filter_export_data {
         spinlock_t                 fed_lock;      /* protects fed_open_head */
+        __u32                      fed_group;
         struct filter_client_data *fed_fcd;
         loff_t                     fed_lr_off;
         int                        fed_lr_idx;
diff --git a/lustre/include/linux/lustre_fsfilt.h b/lustre/include/linux/lustre_fsfilt.h
index d83e149..8b9b235 100644
--- a/lustre/include/linux/lustre_fsfilt.h
+++ b/lustre/include/linux/lustre_fsfilt.h
@@ -1,7 +1,7 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- *  Copyright (C) 2001-2004 Cluster File Systems, Inc. <info@clusterfs.com>
+ *  Copyright (C) 2001 Cluster File Systems, Inc. <info@clusterfs.com>
  *
  *   This file is part of Lustre, http://www.lustre.org.
  *
@@ -28,7 +28,6 @@
 #ifdef __KERNEL__
 
 #include <linux/obd.h>
-#include <linux/lustre_log.h>
 #include <linux/obd_class.h>
 
 typedef void (*fsfilt_cb_t)(struct obd_device *obd, __u64 last_rcvd,
@@ -59,43 +58,27 @@ struct fsfilt_operations {
         int     (* fs_set_md)(struct inode *inode, void *handle, void *md,
                               int size);
         int     (* fs_get_md)(struct inode *inode, void *md, int size);
-
-        /* this method is needed to make IO operation fsfilt nature depend. */
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-        int     (* fs_send_bio)(struct inode *inode, struct bio *bio);
-#else
-        int     (* fs_send_bio)(struct inode *inode, struct kiobuf *bio);
-#endif
-
-        /* methods for getting page from backing fs and putting page there
-         * during IO. Used on OST. */
-        int (* fs_putpage)(struct inode *inode, struct page *page);
-        struct page *(* fs_getpage)(struct inode *inode, long int index);
-
         ssize_t (* fs_readpage)(struct file *file, char *buf, size_t count,
                                 loff_t *offset);
-        int     (* fs_add_journal_cb)(struct obd_device *obd, struct super_block *sb,
-                                      __u64 last_rcvd, void *handle, fsfilt_cb_t cb_func,
+        int     (* fs_add_journal_cb)(struct obd_device *obd, __u64 last_rcvd,
+                                      void *handle, fsfilt_cb_t cb_func,
                                       void *cb_data);
         int     (* fs_statfs)(struct super_block *sb, struct obd_statfs *osfs);
         int     (* fs_sync)(struct super_block *sb);
-        int     (* fs_map_inode_pages)(struct inode *inode, struct page **page,
-                                       int pages, unsigned long *blocks,
-                                       int *created, int create,
-                                       struct semaphore *sem);
+        int     (* fs_map_inode_page)(struct inode *inode, struct page *page,
+                                      unsigned long *blocks, int *created,
+                                      int create);
         int     (* fs_prep_san_write)(struct inode *inode, long *blocks,
                                       int nblocks, loff_t newsize);
         int     (* fs_write_record)(struct file *, void *, int size, loff_t *,
                                     int force_sync);
         int     (* fs_read_record)(struct file *, void *, int size, loff_t *);
-        int     (* fs_setup)(struct super_block *sb);
-
-        int     (* fs_set_xattr)(struct inode *inode, void *handle, char *name,
-                                 void *buffer, int buffer_size);
-        int     (* fs_get_xattr)(struct inode *inode, char *name,
-                                 void *buffer, int buffer_size);
-
+        int     (* fs_setup)(struct obd_device *, struct super_block *);
         int     (* fs_get_op_len)(int, struct fsfilt_objinfo *, int);
+        int     (* fs_add_dir_entry)(struct obd_device *, struct dentry *,
+                                     char *, int, unsigned long, unsigned long,
+                                     unsigned);
+        int     (* fs_del_dir_entry)(struct obd_device *, struct dentry *);
 };
 
 extern int fsfilt_register_ops(struct fsfilt_operations *fs_ops);
@@ -113,45 +96,14 @@ extern void fsfilt_put_ops(struct fsfilt_operations *fs_ops);
 #define FSFILT_OP_SETATTR        8
 #define FSFILT_OP_LINK           9
 #define FSFILT_OP_CANCEL_UNLINK 10
-#define FSFILT_OP_NOOP          15
-
-/* XXX BUG 3188 -- must return to one set of opcodes */
-#define KML_UNLINK              0x11
-#define KML_RMDIR               0x12
-#define KML_RENAME              0x13
-#define KML_CREATE              0x14
-#define KML_MKDIR               0x15
-#define KML_SYMLINK             0x16
-#define KML_MKNOD               0x17
-#define KML_LINK                0x19
-
-#define CACHE_UNLINK            0x21
-#define CACHE_RMDIR             0x22
-#define CACHE_RENAME            0x23
-#define CACHE_CREATE            0x24
-#define CACHE_MKDIR             0x25
-#define CACHE_SYMLINK           0x26
-#define CACHE_MKNOD             0x27
-#define CACHE_LINK              0x29
-#define CACHE_NOOP              0x2f
-
-#define KML_CACHE_UNLINK        0x31
-#define KML_CACHE_RMDIR         0x32
-#define KML_CACHE_RENAME        0x33
-#define KML_CACHE_CREATE        0x34
-#define KML_CACHE_MKDIR         0x35
-#define KML_CACHE_SYMLINK       0x36
-#define KML_CACHE_MKNOD         0x37
-#define KML_CACHE_LINK          0x39
-#define KML_CACHE_NOOP          0x3f
-
-static inline void *
-fsfilt_start_ops(struct fsfilt_operations *ops, struct inode *inode,
-                 int op, struct obd_trans_info *oti, int logs)
+
+static inline void *fsfilt_start_log(struct obd_device *obd,
+                                     struct inode *inode, int op,
+                                     struct obd_trans_info *oti, int logs)
 {
         unsigned long now = jiffies;
         void *parent_handle = oti ? oti->oti_handle : NULL;
-        void *handle = ops->fs_start(inode, op, parent_handle, logs);
+        void *handle = obd->obd_fsops->fs_start(inode, op, parent_handle, logs);
         CDEBUG(D_HA, "started handle %p (%p)\n", handle, parent_handle);
 
         if (oti != NULL) {
@@ -168,60 +120,17 @@ fsfilt_start_ops(struct fsfilt_operations *ops, struct inode *inode,
         return handle;
 }
 
-static inline void *
-fsfilt_start_log(struct obd_device *obd, struct inode *inode,
-                 int op, struct obd_trans_info *oti, int logs)
-{
-        return fsfilt_start_ops(obd->obd_fsops, inode, op, oti, logs);
-}
-
-static inline void *
-fsfilt_start(struct obd_device *obd, struct inode *inode,
-             int op, struct obd_trans_info *oti)
-{
-        return fsfilt_start_ops(obd->obd_fsops, inode, op, oti, 0);
-}
-
-static inline void *
-llog_fsfilt_start(struct llog_ctxt *ctxt, struct inode *inode,
-                  int op, struct obd_trans_info *oti)
-{
-        return fsfilt_start_ops(ctxt->loc_fsops, inode, op, oti, 1);
-}
-
-static inline int
-fsfilt_commit_ops(struct fsfilt_operations *ops, struct inode *inode,
-                  void *handle, int force_sync)
-{
-        unsigned long now = jiffies;
-        int rc = ops->fs_commit(inode, handle, force_sync);
-        CDEBUG(D_HA, "committing handle %p\n", handle);
-
-        if (time_after(jiffies, now + 15 * HZ))
-                CERROR("long journal start time %lus\n", (jiffies - now) / HZ);
-
-        return rc;
-}
-
-static inline int
-fsfilt_commit(struct obd_device *obd, struct inode *inode,
-              void *handle, int force_sync)
+static inline void *fsfilt_start(struct obd_device *obd, struct inode *inode,
+                                 int op, struct obd_trans_info *oti)
 {
-        return fsfilt_commit_ops(obd->obd_fsops, inode, handle, force_sync);
+        return fsfilt_start_log(obd, inode, op, oti, 0);
 }
 
-static inline int
-llog_fsfilt_commit(struct llog_ctxt *ctxt, struct inode *inode,
-                   void *handle, int force_sync)
-{
-        return fsfilt_commit_ops(ctxt->loc_fsops, inode, handle, force_sync);
-}
-
-static inline void *
-fsfilt_brw_start_log(struct obd_device *obd, int objcount,
-                     struct fsfilt_objinfo *fso, int niocount,
-                     struct niobuf_local *nb, struct obd_trans_info *oti,
-                     int logs)
+static inline void *fsfilt_brw_start_log(struct obd_device *obd,
+                                         int objcount,
+                                         struct fsfilt_objinfo *fso,
+                                         int niocount, struct niobuf_local *nb,
+                                         struct obd_trans_info *oti, int logs)
 {
         unsigned long now = jiffies;
         void *parent_handle = oti ? oti->oti_handle : NULL;
@@ -244,17 +153,30 @@ fsfilt_brw_start_log(struct obd_device *obd, int objcount,
         return handle;
 }
 
-static inline void *
-fsfilt_brw_start(struct obd_device *obd, int objcount,
-                 struct fsfilt_objinfo *fso, int niocount,
-                 struct niobuf_local *nb, struct obd_trans_info *oti)
+static inline void *fsfilt_brw_start(struct obd_device *obd, int objcount,
+                                     struct fsfilt_objinfo *fso, int niocount,
+                                     struct niobuf_local *nb,
+                                     struct obd_trans_info *oti)
 {
         return fsfilt_brw_start_log(obd, objcount, fso, niocount, nb, oti, 0);
 }
 
-static inline int
-fsfilt_commit_async(struct obd_device *obd, struct inode *inode,
-                    void *handle, void **wait_handle)
+static inline int fsfilt_commit(struct obd_device *obd, struct inode *inode,
+                                void *handle, int force_sync)
+{
+        unsigned long now = jiffies;
+        int rc = obd->obd_fsops->fs_commit(inode, handle, force_sync);
+        CDEBUG(D_HA, "committing handle %p\n", handle);
+
+        if (time_after(jiffies, now + 15 * HZ))
+                CERROR("long journal start time %lus\n", (jiffies - now) / HZ);
+
+        return rc;
+}
+
+static inline int fsfilt_commit_async(struct obd_device *obd,
+                                      struct inode *inode, void *handle,
+                                      void **wait_handle)
 {
         unsigned long now = jiffies;
         int rc = obd->obd_fsops->fs_commit_async(inode, handle, wait_handle);
@@ -266,8 +188,8 @@ fsfilt_commit_async(struct obd_device *obd, struct inode *inode,
         return rc;
 }
 
-static inline int
-fsfilt_commit_wait(struct obd_device *obd, struct inode *inode, void *handle)
+static inline int fsfilt_commit_wait(struct obd_device *obd,
+                                     struct inode *inode, void *handle)
 {
         unsigned long now = jiffies;
         int rc = obd->obd_fsops->fs_commit_wait(inode, handle);
@@ -277,9 +199,8 @@ fsfilt_commit_wait(struct obd_device *obd, struct inode *inode, void *handle)
         return rc;
 }
 
-static inline int
-fsfilt_setattr(struct obd_device *obd, struct dentry *dentry,
-               void *handle, struct iattr *iattr, int do_trunc)
+static inline int fsfilt_setattr(struct obd_device *obd, struct dentry *dentry,
+                                 void *handle, struct iattr *iattr,int do_trunc)
 {
         unsigned long now = jiffies;
         int rc;
@@ -289,120 +210,43 @@ fsfilt_setattr(struct obd_device *obd, struct dentry *dentry,
         return rc;
 }
 
-static inline int
-fsfilt_iocontrol(struct obd_device *obd, struct inode *inode,
-                 struct file *file, unsigned int cmd,
-                 unsigned long arg)
+static inline int fsfilt_iocontrol(struct obd_device *obd, struct inode *inode,
+                                   struct file *file, unsigned int cmd,
+                                   unsigned long arg)
 {
         return obd->obd_fsops->fs_iocontrol(inode, file, cmd, arg);
 }
 
-static inline int fsfilt_setup(struct obd_device *obd,
-                               struct super_block *fs)
-{
-        if (obd->obd_fsops->fs_setup)
-                return obd->obd_fsops->fs_setup(fs);
-
-        return 0;
-}
-
-static inline int
-fsfilt_set_md(struct obd_device *obd, struct inode *inode,
-              void *handle, void *md, int size)
+static inline int fsfilt_set_md(struct obd_device *obd, struct inode *inode,
+                                void *handle, void *md, int size)
 {
         return obd->obd_fsops->fs_set_md(inode, handle, md, size);
 }
 
-static inline int
-fsfilt_get_md(struct obd_device *obd, struct inode *inode,
-              void *md, int size)
+static inline int fsfilt_get_md(struct obd_device *obd, struct inode *inode,
+                                void *md, int size)
 {
         return obd->obd_fsops->fs_get_md(inode, md, size);
 }
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-static inline int
-fsfilt_send_bio(struct obd_device *obd, struct inode *inode,
-                struct bio *bio)
-#else
-static inline int
-fsfilt_send_bio(struct obd_device *obd, struct inode *inode,
-                struct kiobuf *bio)
-#endif
-{
-        return obd->obd_fsops->fs_send_bio(inode, bio);
-}
-
-static inline int
-fsfilt_putpage(struct obd_device *obd, struct inode *inode,
-               struct page *page)
-{
-        int rc = 0;
-        struct filter_obd *filter;
-        unsigned long now = jiffies;
-
-        LASSERT(obd != NULL);
-        LASSERT(inode != NULL);
-        LASSERT(page != NULL);
-
-        filter = &obd->u.filter;
-
-        if (!obd->obd_fsops->fs_putpage)
-                return -ENOSYS;
-
-        CDEBUG(D_INFO, "putpage %lx\n", page->index);
-
-        rc = obd->obd_fsops->fs_putpage(inode, page);
-
-        if (time_after(jiffies, now + 15 * HZ))
-                CERROR("long putpage time %lus\n", (jiffies - now) / HZ);
-
-        return rc;
-}
-
-static inline struct page *
-fsfilt_getpage(struct obd_device *obd, struct inode *inode,
-               unsigned long index)
-{
-        struct page *page;
-        unsigned long now = jiffies;
-
-        LASSERT(obd != NULL);
-        LASSERT(inode != NULL);
-
-        if (!obd->obd_fsops->fs_getpage)
-                return ERR_PTR(-ENOSYS);
-
-        CDEBUG(D_INFO, "getpage %lx\n", index);
-
-        page = obd->obd_fsops->fs_getpage(inode, index);
-
-        if (time_after(jiffies, now + 15 * HZ))
-                CERROR("long getpage time %lus\n", (jiffies - now) / HZ);
-
-        return page;
-}
-
-static inline ssize_t
-fsfilt_readpage(struct obd_device *obd, struct file *file, char *buf,
-                size_t count, loff_t *offset)
+static inline ssize_t fsfilt_readpage(struct obd_device *obd,
+                                      struct file *file, char *buf,
+                                      size_t count, loff_t *offset)
 {
         return obd->obd_fsops->fs_readpage(file, buf, count, offset);
 }
 
-static inline int
-fsfilt_add_journal_cb(struct obd_device *obd, struct super_block *sb,
-                      __u64 last_rcvd, void *handle, fsfilt_cb_t cb_func,
-                      void *cb_data)
+static inline int fsfilt_add_journal_cb(struct obd_device *obd, __u64 last_rcvd,
+                                        void *handle, fsfilt_cb_t cb_func,
+                                        void *cb_data)
 {
-        return obd->obd_fsops->fs_add_journal_cb(obd, sb, last_rcvd, handle,
-                                                 cb_func, cb_data);
+        return obd->obd_fsops->fs_add_journal_cb(obd, last_rcvd,
+                                                 handle, cb_func, cb_data);
 }
 
 /* very similar to obd_statfs(), but caller already holds obd_osfs_lock */
-static inline int
-fsfilt_statfs(struct obd_device *obd, struct super_block *sb,
-              unsigned long max_age)
+static inline int fsfilt_statfs(struct obd_device *obd, struct super_block *sb,
+                                unsigned long max_age)
 {
         int rc = 0;
 
@@ -418,59 +262,67 @@ fsfilt_statfs(struct obd_device *obd, struct super_block *sb,
         return rc;
 }
 
-static inline int
-fsfilt_sync(struct obd_device *obd, struct super_block *sb)
+static inline int fsfilt_sync(struct obd_device *obd, struct super_block *sb)
 {
         return obd->obd_fsops->fs_sync(sb);
 }
 
-static inline int fsfilt_map_inode_pages(struct obd_device *obd,
-                                         struct inode *inode,
-                                         struct page **page, int pages,
-                                         unsigned long *blocks, int *created,
-                                         int create, struct semaphore *sem)
+static inline int fsfilt_map_inode_page(struct obd_device *obd,
+                                        struct inode *inode, struct page *page,
+                                        unsigned long *blocks, int *created,
+                                        int create)
 {
-        return obd->obd_fsops->fs_map_inode_pages(inode, page, pages, blocks,
-                                                  created, create, sem);
+        return obd->obd_fsops->fs_map_inode_page(inode, page, blocks, created,
+                                                 create);
 }
 
-static inline int
-fs_prep_san_write(struct obd_device *obd, struct inode *inode,
-                  long *blocks, int nblocks, loff_t newsize)
+static inline int fs_prep_san_write(struct obd_device *obd,
+                                    struct inode *inode,
+                                    long *blocks,
+                                    int nblocks,
+                                    loff_t newsize)
 {
         return obd->obd_fsops->fs_prep_san_write(inode, blocks,
                                                  nblocks, newsize);
 }
 
-static inline int
-fsfilt_read_record(struct obd_device *obd, struct file *file,
-                   void *buf, loff_t size, loff_t *offs)
+static inline int fsfilt_read_record(struct obd_device *obd, struct file *file,
+                                     void *buf, loff_t size, loff_t *offs)
 {
         return obd->obd_fsops->fs_read_record(file, buf, size, offs);
 }
 
-static inline int
-fsfilt_write_record(struct obd_device *obd, struct file *file,
-                    void *buf, loff_t size, loff_t *offs, int force_sync)
+static inline int fsfilt_write_record(struct obd_device *obd, struct file *file,
+                                      void *buf, loff_t size, loff_t *offs,
+                                      int force_sync)
 {
-        return obd->obd_fsops->fs_write_record(file, buf, size, offs,
-                                               force_sync);
+        return obd->obd_fsops->fs_write_record(file, buf, size,offs,force_sync);
+}
+
+static inline int fsfilt_setup(struct obd_device *obd, struct super_block *fs)
+{
+        if (obd->obd_fsops->fs_setup)
+                return obd->obd_fsops->fs_setup(obd, fs);
+        return 0;
 }
 
-static inline int
-llog_fsfilt_write_record(struct llog_ctxt *ctxt, struct file *file,
-                         void *buf, loff_t size, loff_t *offs,
-                         int force_sync)
+static inline int fsfilt_add_dir_entry(struct obd_device *obd,
+                                        struct dentry *dir,
+                                        char *name, int namelen,
+                                        unsigned long ino,
+                                        unsigned long generation,
+                                        unsigned mds)
 {
-        return ctxt->loc_fsops->fs_write_record(file, buf, size, offs,
-                                                force_sync);
+        LASSERT(obd->obd_fsops->fs_add_dir_entry);
+        return obd->obd_fsops->fs_add_dir_entry(obd, dir, name,
+                                                namelen, ino, generation, mds);
 }
 
-static inline int
-llog_fsfilt_read_record(struct llog_ctxt *ctxt, struct file *file,
-                        void *buf, loff_t size, loff_t *offs)
+static inline int fsfilt_del_dir_entry(struct obd_device *obd,
+                                        struct dentry *dentry)
 {
-        return ctxt->loc_fsops->fs_read_record(file, buf, size, offs);
+        LASSERT(obd->obd_fsops->fs_del_dir_entry);
+        return obd->obd_fsops->fs_del_dir_entry(obd, dentry);
 }
 
 #endif /* __KERNEL__ */
diff --git a/lustre/include/linux/lustre_idl.h b/lustre/include/linux/lustre_idl.h
index a56b143..16639d7eb 100644
--- a/lustre/include/linux/lustre_idl.h
+++ b/lustre/include/linux/lustre_idl.h
@@ -54,7 +54,8 @@
 # include <linux/types.h>
 # include <linux/list.h>
 # include <linux/string.h> /* for strncpy, below */
-# include <linux/fs.h>     /* to check for FMODE_EXEC, dev_t, lest we redefine */
+# include <asm/byteorder.h>
+# include <linux/fs.h> /* to check for FMODE_EXEC, lest we redefine */
 #else
 #ifdef __CYGWIN__
 # include <sys/types.h>
@@ -67,7 +68,7 @@
 #endif
 
 /* Defn's shared with user-space. */
-#include <lustre/lustre_user.h>
+#include <linux/lustre_user.h>
 
 /*
  * this file contains all data structures used in Lustre interfaces:
@@ -80,6 +81,21 @@
 /*
  *  GENERAL STUFF
  */
+struct obd_uuid {
+        __u8 uuid[40];
+};
+
+static inline int obd_uuid_equals(struct obd_uuid *u1, struct obd_uuid *u2)
+{
+        return strcmp(u1->uuid, u2->uuid) == 0;
+}
+
+static inline void obd_str2uuid(struct obd_uuid *uuid, char *tmp)
+{
+        strncpy(uuid->uuid, tmp, sizeof(*uuid));
+        uuid->uuid[sizeof(*uuid) - 1] = '\0';
+}
+
 /* FOO_REQUEST_PORTAL is for incoming requests on the FOO
  * FOO_REPLY_PORTAL   is for incoming replies on the FOO
  * FOO_BULK_PORTAL    is for incoming bulk on the FOO
@@ -283,6 +299,7 @@ struct obdo {
         obd_flag                o_valid;        /* hot fields in this obdo */
         obd_count               o_misc;
         __u32                   o_easize;       /* epoch in ost writes */
+        __u32                   o_mds;
         char                    o_inline[OBD_INLINESZ]; /* fid in ost writes */
 };
 
@@ -363,10 +380,11 @@ struct lov_mds_md_v0 {            /* LOV EA mds/wire data (little-endian) */
 #define OBD_MD_FLIFID   (0x02000000)    /* ->ost write inline fid */
 #define OBD_MD_FLEPOCH  (0x04000000)    /* ->ost write easize is epoch */
 #define OBD_MD_FLGRANT  (0x08000000)    /* ost preallocation space grant */
-#define OBD_MD_FLDIREA  (0x10000000)    /* dir's extended attribute data */
+#define OBD_MD_MDS      (0x10000000)    /* where an inode lives on */
 #define OBD_MD_FLNOTOBD (~(OBD_MD_FLBLOCKS | OBD_MD_LINKNAME|\
                            OBD_MD_FLEASIZE | OBD_MD_FLHANDLE | OBD_MD_FLCKSUM|\
-                           OBD_MD_FLQOS | OBD_MD_FLOSCOPQ | OBD_MD_FLCOOKIE))
+                           OBD_MD_FLQOS | OBD_MD_FLOSCOPQ | OBD_MD_FLCOOKIE|\
+                           OBD_MD_MDS))
 
 
 static inline struct lustre_handle *obdo_handle(struct obdo *oa)
@@ -472,22 +490,19 @@ typedef enum {
         MDS_DONE_WRITING = 45,
         MDS_LAST_OPC
 } mds_cmd_t;
-
 #define MDS_FIRST_OPC    MDS_GETATTR
 
 /*
  * Do not exceed 63
  */
 
-#define REINT_SETATTR    1
-#define REINT_CREATE     2
-#define REINT_LINK       3
-#define REINT_UNLINK     4
-#define REINT_RENAME     5
-#define REINT_OPEN       6
-#define REINT_CLOSE      7
-#define REINT_WRITE      8
-#define REINT_MAX        8
+#define REINT_SETATTR  1
+#define REINT_CREATE   2
+#define REINT_LINK     3
+#define REINT_UNLINK   4
+#define REINT_RENAME   5
+#define REINT_OPEN     6
+#define REINT_MAX      6
 
 /* the disposition of the intent outlines what was executed */
 #define DISP_IT_EXECD   1
@@ -508,6 +523,19 @@ struct ll_fid {
         __u64 id;
         __u32 generation;
         __u32 f_type;
+        __u32 mds;
+        __u32 padding;
+};
+
+struct mea {
+        __u32 mea_count;
+        __u32 mea_master;
+        struct ll_fid mea_fids[0];
+};
+
+struct ll_recreate_obj {
+        __u64 lrc_id;
+        __u32 lrc_ost_idx;
 };
 
 extern void lustre_swab_ll_fid (struct ll_fid *fid);
@@ -548,12 +576,18 @@ struct mds_body {
         __u32          generation;
         __u32          suppgid;
         __u32          eadatasize;
-        __u32          packing;
+        __u32          mds;
 };
 
 extern void lustre_swab_mds_body (struct mds_body *b);
 
 
+/* MDS update records */
+
+//struct mds_update_record_hdr {
+//        __u32 ur_opcode;
+//};
+
 struct mds_rec_setattr {
         __u32           sa_opcode;
         __u32           sa_fsuid;
@@ -675,6 +709,11 @@ struct lov_desc {
         struct obd_uuid ld_uuid;
 };
 
+struct lmv_desc {
+        __u32 ld_count;                    /* how many MDS's */
+        struct obd_uuid ld_uuid;
+};
+
 extern void lustre_swab_lov_desc (struct lov_desc *ld);
 
 /*
@@ -706,8 +745,7 @@ typedef enum {
         LCK_PR = 4,
         LCK_CW = 8,
         LCK_CR = 16,
-        LCK_NL = 32,
-        LCK_GROUP = 64
+        LCK_NL = 32
 } ldlm_mode_t;
 
 struct ldlm_extent {
@@ -875,8 +913,6 @@ typedef enum {
         LLOG_GEN_REC     = 0x10640000,
         LLOG_HDR_MAGIC   = 0x10645539,
         LLOG_LOGID_MAGIC = 0x1064553b,
-        SMFS_UPDATE_REC  = 0x10650000,
-        CACHE_LRU_REC    = 0x10660000,
 } llog_op_type;
 
 /* Log record header - stored in little endian order.
@@ -938,21 +974,13 @@ struct llog_size_change_rec {
 struct llog_gen {
         __u64 mnt_cnt;
         __u64 conn_cnt;
-};
+} __attribute__((packed));
 
 struct llog_gen_rec {
         struct llog_rec_hdr     lgr_hdr;
         struct llog_gen         lgr_gen;
         struct llog_rec_tail    lgr_tail;
-} __attribute__((packed));
-
-struct llog_lru_rec {
-        struct llog_rec_hdr     llr_hdr;
-        struct ll_fid           llr_cfid;
-        struct ll_fid           llr_pfid;
-        struct llog_rec_tail    llr_tail;
-} __attribute__((packed));
-
+};
 /* On-disk header structure of each log object, stored in little endian order */
 #define LLOG_CHUNK_SIZE         8192
 #define LLOG_HEADER_SIZE        (96)
@@ -973,7 +1001,7 @@ struct llog_log_hdr {
         __u32                   llh_size;
         __u32                   llh_flags;
         __u32                   llh_cat_idx;
-        /* for a catalog the first plain slot is next to it */
+        /* for a catlog the first plain slot is next to it */
         struct obd_uuid         llh_tgtuuid;
         __u32                   llh_reserved[LLOG_HEADER_SIZE/sizeof(__u32) - 23];
         __u32                   llh_bitmap[LLOG_BITMAP_BYTES/sizeof(__u32)];
@@ -997,7 +1025,6 @@ enum llogd_rpc_ops {
         LLOG_ORIGIN_HANDLE_CLOSE        = 505,
         LLOG_ORIGIN_CONNECT             = 506,
         LLOG_CATINFO                    = 507,  /* for lfs catinfo */
-        LLOG_ORIGIN_HANDLE_PREV_BLOCK   = 508,
 };
 
 struct llogd_body {
diff --git a/lustre/include/linux/lustre_lib.h b/lustre/include/linux/lustre_lib.h
index a529860..24ad8fb 100644
--- a/lustre/include/linux/lustre_lib.h
+++ b/lustre/include/linux/lustre_lib.h
@@ -25,6 +25,8 @@
 #ifndef _LUSTRE_LIB_H
 #define _LUSTRE_LIB_H
 
+#include <config.h>
+
 #ifndef __KERNEL__
 # include <string.h>
 # include <sys/types.h>
@@ -40,18 +42,6 @@
 #include <linux/lustre_idl.h>
 #include <linux/lustre_cfg.h>
 
-#ifndef LP_POISON
-#if BITS_PER_LONG > 32
-# define LI_POISON ((int)0x5a5a5a5a5a5a5a5a)
-# define LL_POISON ((long)0x5a5a5a5a5a5a5a5a)
-# define LP_POISON ((void *)(long)0x5a5a5a5a5a5a5a5a)
-#else
-# define LI_POISON ((int)0x5a5a5a5a)
-# define LL_POISON ((long)0x5a5a5a5a)
-# define LP_POISON ((void *)(long)0x5a5a5a5a)
-#endif
-#endif
-
 #ifndef LPU64
 /* x86_64 has 64bit longs and defines u64 as long long */
 #if BITS_PER_LONG > 32 && !defined(__x86_64__)
diff --git a/lustre/include/linux/lustre_lite.h b/lustre/include/linux/lustre_lite.h
index 1c66b53..ea9a076 100644
--- a/lustre/include/linux/lustre_lite.h
+++ b/lustre/include/linux/lustre_lite.h
@@ -76,11 +76,13 @@ extern struct file_operations ll_pgcache_seq_fops;
 #define LLI_F_PREFER_EXTENDED_SIZE      2
 struct ll_inode_info {
         struct lov_stripe_md   *lli_smd;
+        struct mea             *lli_mea;
         char                   *lli_symlink_name;
         struct semaphore        lli_open_sem;
         __u64                   lli_maxbytes;
         __u64                   lli_io_epoch;
         unsigned long           lli_flags;
+        __u32                   lli_mds;
 
         /* this lock protects s_d_w and p_w_ll */
         spinlock_t              lli_lock;
@@ -88,11 +90,6 @@ struct ll_inode_info {
         struct list_head        lli_pending_write_llaps;
 
         struct list_head        lli_close_item;
-
-        struct file_operations *ll_save_ifop;
-        struct file_operations *ll_save_ffop;
-        struct file_operations *ll_save_wfop;
-        struct file_operations *ll_save_wrfop;
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
         struct inode            lli_vfs_inode;
 #endif
@@ -147,6 +144,6 @@ enum {
 #include <linux/lustre_idl.h>
 #endif /* __KERNEL__ */
 
-#include <lustre/lustre_user.h>
+#include <linux/lustre_user.h>
 
 #endif
diff --git a/lustre/include/linux/lustre_log.h b/lustre/include/linux/lustre_log.h
index fe94cff5..56e2198 100644
--- a/lustre/include/linux/lustre_log.h
+++ b/lustre/include/linux/lustre_log.h
@@ -40,7 +40,8 @@
 
 #define LOG_NAME_LIMIT(logname, name)                   \
         snprintf(logname, sizeof(logname), "LOGS/%s", name)
-#define LLOG_EEMPTY 4711
+
+struct obd_llogs;
 
 struct plain_handle_data {
         struct list_head    phd_entry;
@@ -68,49 +69,18 @@ struct llog_handle {
         } u;
 };
 
-/* got from mds_update_record.
- * FIXME: maybe some attribute in reint_record and update_record will be
- * changed later. */
-/* XXX BUG 3188 -- must return to one set of structures. */
-/* XXX use fixed-sized fields (__u32) instead of dev_t and iattr->gid_t, etc */
-
-struct update_record {
-        __u32 ur_opcode;
-        __u32 ur_fsuid;
-        __u32 ur_fsgid;
-        dev_t ur_rdev;
-        struct iattr ur_iattr;
-        struct iattr ur_pattr;
-        __u32 ur_flags;
-        __u32 ur_len;
-};
-
-struct reint_record {
-       struct update_record u_rec;
-       char *rec_data1;
-       int rec1_size;
-       char *rec_data2;
-       int rec2_size;
-};
-
-struct llog_smfs_rec {
-        struct llog_rec_hdr     lsr_hdr;
-        struct update_record    lsr_rec;
-        struct llog_rec_tail    lsr_tail;
-};
+#define LLOG_EEMPTY 4711
 
 /* llog.c  -  general API */
 typedef int (*llog_cb_t)(struct llog_handle *, struct llog_rec_hdr *, void *);
-struct llog_handle *llog_alloc_handle(void);
-void llog_free_handle(struct llog_handle *handle);
-int llog_cancel_rec(struct llog_handle *loghandle, int index);
 int llog_init_handle(struct llog_handle *handle, int flags,
                      struct obd_uuid *uuid);
-int llog_close(struct llog_handle *cathandle);
 int llog_process(struct llog_handle *loghandle, llog_cb_t cb,
                  void *data, void *catdata);
-int llog_reverse_process(struct llog_handle *loghandle, llog_cb_t cb,
-                         void *data, void *catdata);
+extern struct llog_handle *llog_alloc_handle(void);
+extern void llog_free_handle(struct llog_handle *handle);
+extern int llog_close(struct llog_handle *cathandle);
+extern int llog_cancel_rec(struct llog_handle *loghandle, int index);
 
 /* llog_cat.c   -  catalog api */
 struct llog_process_data {
@@ -121,53 +91,44 @@ struct llog_process_data {
 struct llog_process_cat_data {
         int     first_idx;
         int     last_idx;
-        /* to process catalog across zero record */
+        /* to process catlog across zero record */
 };
 
-int llog_cat_id2handle(struct llog_handle *cathandle, struct llog_handle **res,
-                       struct llog_logid *logid);
 int llog_cat_put(struct llog_handle *cathandle);
 int llog_cat_add_rec(struct llog_handle *cathandle, struct llog_rec_hdr *rec,
                      struct llog_cookie *reccookie, void *buf);
 int llog_cat_cancel_records(struct llog_handle *cathandle, int count,
                             struct llog_cookie *cookies);
 int llog_cat_process(struct llog_handle *cat_llh, llog_cb_t cb, void *data);
-int llog_cat_reverse_process(struct llog_handle *cat_llh, llog_cb_t cb, void *data);
 int llog_cat_set_first_idx(struct llog_handle *cathandle, int index);
 
-int llog_catalog_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec,
-                     void *buf, struct llog_cookie *reccookie, int, void *data);
-int llog_catalog_cancel(struct llog_ctxt *ctxt, int count, struct llog_cookie *,
-                        int flags, void *data);
-int llog_catalog_setup(struct llog_ctxt **res, char *name, struct lvfs_run_ctxt *,
-                       struct fsfilt_operations *fsops, struct dentry *logs_de,
-                       struct dentry *objects_de);
-int llog_catalog_cleanup(struct llog_ctxt *ctxt);
-int llog_cat_half_bottom(struct llog_cookie *, struct llog_handle *);
-
-/* llog_lvfs.c */
-int llog_get_cat_list(struct lvfs_run_ctxt *, struct fsfilt_operations *,
-                      char *name, int count, struct llog_catid *idarray);
-int llog_put_cat_list(struct lvfs_run_ctxt *, struct fsfilt_operations *, 
-                      char *name, int count, struct llog_catid *idarray);
-extern struct llog_operations llog_lvfs_ops;
-
-/* llog_obd.c - obd llog api */
-int obd_llog_setup(struct obd_device *obd, int index, struct obd_device *disk_obd,
-                   int count,  struct llog_logid *logid,struct llog_operations *op);
-int obd_llog_cleanup(struct llog_ctxt *);
-int llog_obd_origin_setup(struct obd_device *obd, int index,
-                          struct obd_device *disk_obd, int count,
-                          struct llog_logid *logid);
-int obd_llog_cat_initialize(struct obd_device *obd, int count, char *name);
-int obd_llog_init(struct obd_device *obd, struct obd_device *disk_obd,
-                  int count, struct llog_catid *logid);
-
-int obd_llog_finish(struct obd_device *obd, int count);
+/* llog_obd.c */
+int llog_setup(struct obd_device *, struct obd_llogs *, int, struct obd_device *,
+               int, struct llog_logid *, struct llog_operations *);
+int llog_cleanup(struct llog_ctxt *);
+int llog_sync(struct llog_ctxt *ctxt, struct obd_export *exp);
+int llog_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec,
+             struct lov_stripe_md *lsm, struct llog_cookie *logcookies,
+             int numcookies);
+int llog_cancel(struct llog_ctxt *, struct lov_stripe_md *lsm,
+                int count, struct llog_cookie *cookies, int flags);
+
+int llog_obd_origin_setup(struct obd_device *, struct obd_llogs *, int,
+                          struct obd_device *, int, struct llog_logid *);
+int llog_obd_origin_cleanup(struct llog_ctxt *ctxt);
+int llog_obd_origin_add(struct llog_ctxt *ctxt,
+                        struct llog_rec_hdr *rec, struct lov_stripe_md *lsm,
+                        struct llog_cookie *logcookies, int numcookies);
+
+int llog_cat_initialize(struct obd_device *, struct obd_llogs *, int);
+int obd_llog_init(struct obd_device *, struct obd_llogs *, struct obd_device *,
+                  int, struct llog_catid *);
+
+int obd_llog_finish(struct obd_device *, struct obd_llogs *, int);
 
 /* llog_ioctl.c */
 int llog_ioctl(struct llog_ctxt *ctxt, int cmd, struct obd_ioctl_data *data);
-int llog_catalog_list(struct obd_device *obd, int count,
+int llog_catlog_list(struct obd_device *obd, int count,
                      struct obd_ioctl_data *data);
 
 /* llog_net.c */
@@ -179,65 +140,60 @@ int llog_origin_connect(struct llog_ctxt *ctxt, int count,
 int llog_handle_connect(struct ptlrpc_request *req);
 
 /* recov_thread.c */
-int llog_obd_repl_cancel(struct llog_ctxt *ctxt, int count,
-                         struct llog_cookie *cookies, int flags, void *data);
-                         
+int llog_obd_repl_cancel(struct llog_ctxt *ctxt,
+                         struct lov_stripe_md *lsm, int count,
+                         struct llog_cookie *cookies, int flags);
 int llog_obd_repl_sync(struct llog_ctxt *ctxt, struct obd_export *exp);
 int llog_repl_connect(struct llog_ctxt *ctxt, int count,
                       struct llog_logid *logid, struct llog_gen *gen,
                       struct obd_uuid *uuid);
 
 struct llog_operations {
-        int (*lop_setup)(struct obd_device *obd, int ctxt_idx,
-                         struct obd_device *disk_obd, int count,
-                         struct llog_logid *logid);
-        int (*lop_cleanup)(struct llog_ctxt *ctxt);
-        int (*lop_create)(struct llog_ctxt *ctxt, struct llog_handle **,
-                          struct llog_logid *logid, char *name);
-        int (*lop_destroy)(struct llog_handle *handle);
-        int (*lop_close)(struct llog_handle *handle);
-
-        int (*lop_read_header)(struct llog_handle *handle);
-        int (*lop_add)(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec,
-                       void *buf, struct llog_cookie *logcookies,
-                       int numcookies, void *data);
-        int (*lop_cancel)(struct llog_ctxt *ctxt, int count,
-                          struct llog_cookie *cookies, int flags, void *data);
         int (*lop_write_rec)(struct llog_handle *loghandle,
                              struct llog_rec_hdr *rec,
                              struct llog_cookie *logcookies, int numcookies,
                              void *, int idx);
+        int (*lop_destroy)(struct llog_handle *handle);
         int (*lop_next_block)(struct llog_handle *h, int *curr_idx,
                               int next_idx, __u64 *offset, void *buf, int len);
-        int (*lop_prev_block)(struct llog_handle *h,
-                              int prev_idx, void *buf, int len);
+        int (*lop_create)(struct llog_ctxt *ctxt, struct llog_handle **,
+                          struct llog_logid *logid, char *name);
+        int (*lop_close)(struct llog_handle *handle);
+        int (*lop_read_header)(struct llog_handle *handle);
 
-        /* XXX add 2 more: commit callbacks and llog recovery functions */
+        int (*lop_setup)(struct obd_device *, struct obd_llogs *, int,
+                         struct obd_device *, int, struct llog_logid *);
         int (*lop_sync)(struct llog_ctxt *ctxt, struct obd_export *exp);
+        int (*lop_cleanup)(struct llog_ctxt *ctxt);
+        int (*lop_add)(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec,
+                       struct lov_stripe_md *lsm,
+                       struct llog_cookie *logcookies, int numcookies);
+        int (*lop_cancel)(struct llog_ctxt *ctxt, struct lov_stripe_md *lsm,
+                          int count, struct llog_cookie *cookies, int flags);
         int (*lop_connect)(struct llog_ctxt *ctxt, int count,
                            struct llog_logid *logid, struct llog_gen *gen,
                            struct obd_uuid *uuid);
+        /* XXX add 2 more: commit callbacks and llog recovery functions */
 };
 
-struct llog_ctxt {
-        /* needed for lvfs based log */
-        struct llog_handle      *loc_handle;
-        struct llog_operations  *loc_logops;
-        struct fsfilt_operations *loc_fsops;
-        struct dentry           *loc_logs_dir;
-        struct dentry           *loc_objects_dir;
-        struct lvfs_run_ctxt    *loc_lvfs_ctxt;
+/* llog_lvfs.c */
+extern struct llog_operations llog_lvfs_ops;
+int llog_get_cat_list(struct obd_device *obd, struct obd_device *disk_obd,
+                      char *name, int count, struct llog_catid *idarray);
 
-        struct obd_device       *loc_obd; /* points back to the containing obd*/
-        struct llog_gen          loc_gen;
+struct llog_ctxt {
         int                      loc_idx; /* my index the obd array of ctxt's */
-
+        struct llog_gen          loc_gen;
+        struct obd_device       *loc_obd; /* points back to the containing obd*/
         struct obd_export       *loc_exp;
         struct obd_import       *loc_imp; /* to use in RPC's: can be backward
                                              pointing import */
+        struct llog_operations  *loc_logops;
+        struct llog_handle      *loc_handle;
         struct llog_canceld_ctxt *loc_llcd;
         struct semaphore         loc_sem; /* protects loc_llcd */
-        void                    *loc_proc_cb; /* cb for recovery */
+        void                    *llog_proc_cb;
+        struct obd_llogs        *loc_llogs;
 };
 
 static inline void llog_gen_init(struct llog_ctxt *ctxt)
@@ -264,10 +220,10 @@ static inline int llog_gen_lt(struct llog_gen a, struct llog_gen b)
 #define LLOG_GEN_INC(gen)  ((gen).conn_cnt) ++
 #define LLOG_PROC_BREAK 0x0001
 
-static inline int llog_ctxt2ops(struct llog_ctxt *ctxt,
+static inline int llog_obd2ops(struct llog_ctxt *ctxt,
                                struct llog_operations **lop)
 {
-        if (ctxt == NULL)
+       if (ctxt == NULL)
                 return -ENOTCONN;
 
         *lop = ctxt->loc_logops;
@@ -283,7 +239,7 @@ static inline int llog_handle2ops(struct llog_handle *loghandle,
         if (loghandle == NULL)
                 return -EINVAL;
 
-        return llog_ctxt2ops(loghandle->lgh_ctxt, lop);
+        return llog_obd2ops(loghandle->lgh_ctxt, lop);
 }
 
 static inline int llog_data_len(int len)
@@ -291,45 +247,38 @@ static inline int llog_data_len(int len)
         return size_round(len);
 }
 
-static inline struct llog_ctxt *llog_get_context(struct obd_device *obd,
+static inline struct llog_ctxt *llog_get_context(struct obd_llogs *llogs,
                                                  int index)
 {
         if (index < 0 || index >= LLOG_MAX_CTXTS)
                 return NULL;
 
-        return obd->obd_llog_ctxt[index];
+        return llogs->llog_ctxt[index];
 }
 
-static inline int llog_create(struct llog_ctxt *ctxt, struct llog_handle **res,
-                              struct llog_logid *logid, char *name)
-{
-        struct llog_operations *lop;
-        int rc;
-        ENTRY;
-
-        rc = llog_ctxt2ops(ctxt, &lop);
-        if (rc)
-                RETURN(rc);
-        if (lop->lop_create == NULL)
-                RETURN(-EOPNOTSUPP);
-
-        rc = lop->lop_create(ctxt, res, logid, name);
-        RETURN(rc);
-}
-
-static inline int llog_destroy(struct llog_handle *handle)
+static inline int llog_write_rec(struct llog_handle *handle,
+                                 struct llog_rec_hdr *rec,
+                                 struct llog_cookie *logcookies,
+                                 int numcookies, void *buf, int idx)
 {
         struct llog_operations *lop;
-        int rc;
+        int rc, buflen;
         ENTRY;
 
         rc = llog_handle2ops(handle, &lop);
         if (rc)
                 RETURN(rc);
-        if (lop->lop_destroy == NULL)
+        if (lop->lop_write_rec == NULL)
                 RETURN(-EOPNOTSUPP);
 
-        rc = lop->lop_destroy(handle);
+        if (buf)
+                buflen = rec->lrh_len + sizeof(struct llog_rec_hdr)
+                                + sizeof(struct llog_rec_tail);
+        else
+                buflen = rec->lrh_len;
+        LASSERT(size_round(buflen) == buflen);
+
+        rc = lop->lop_write_rec(handle, rec, logcookies, numcookies, buf, idx);
         RETURN(rc);
 }
 
@@ -349,69 +298,44 @@ static inline int llog_read_header(struct llog_handle *handle)
         RETURN(rc);
 }
 
-static inline int llog_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec,
-                           void *buf, struct llog_cookie *logcookies,
-                           int numcookies, void *data)
+static inline int llog_destroy(struct llog_handle *handle)
 {
         struct llog_operations *lop;
         int rc;
         ENTRY;
 
-        rc = llog_ctxt2ops(ctxt, &lop);
+        rc = llog_handle2ops(handle, &lop);
         if (rc)
                 RETURN(rc);
-        if (lop->lop_add == NULL)
+        if (lop->lop_destroy == NULL)
                 RETURN(-EOPNOTSUPP);
 
-        rc = lop->lop_add(ctxt, rec, buf, logcookies, numcookies, data);
+        rc = lop->lop_destroy(handle);
         RETURN(rc);
 }
 
-static inline int llog_cancel(struct llog_ctxt *ctxt, int count,
-                              struct llog_cookie *cookies, int flags, void *data)
+#if 0
+static inline int llog_cancel(struct obd_export *exp,
+                              struct lov_stripe_md *lsm, int count,
+                              struct llog_cookie *cookies, int flags)
 {
         struct llog_operations *lop;
         int rc;
         ENTRY;
 
-        rc = llog_ctxt2ops(ctxt, &lop);
+        rc = llog_handle2ops(loghandle, &lop);
         if (rc)
                 RETURN(rc);
         if (lop->lop_cancel == NULL)
                 RETURN(-EOPNOTSUPP);
 
-        rc = lop->lop_cancel(ctxt, count, cookies, flags, data);
-        RETURN(rc);
-}
-
-static inline int llog_write_rec(struct llog_handle *handle,
-                                 struct llog_rec_hdr *rec,
-                                 struct llog_cookie *logcookies,
-                                 int numcookies, void *buf, int idx)
-{
-        struct llog_operations *lop;
-        int rc, buflen;
-        ENTRY;
-
-        rc = llog_handle2ops(handle, &lop);
-        if (rc)
-                RETURN(rc);
-        if (lop->lop_write_rec == NULL)
-                RETURN(-EOPNOTSUPP);
-
-        if (buf)
-                buflen = le32_to_cpu(rec->lrh_len) + sizeof(struct llog_rec_hdr)
-                                + sizeof(struct llog_rec_tail);
-        else
-                buflen = le32_to_cpu(rec->lrh_len);
-        LASSERT(size_round(buflen) == buflen);
-
-        rc = lop->lop_write_rec(handle, rec, logcookies, numcookies, buf, idx);
+        rc = lop->lop_cancel(exp, lsm, count, cookies, flags);
         RETURN(rc);
 }
+#endif
 
-static inline int llog_next_block(struct llog_handle *loghandle, int *curr_idx,
-                                  int next_idx, __u64 *curr_offset, void *buf,
+static inline int llog_next_block(struct llog_handle *loghandle, int *cur_idx,
+                                  int next_idx, __u64 *cur_offset, void *buf,
                                   int len)
 {
         struct llog_operations *lop;
@@ -424,25 +348,25 @@ static inline int llog_next_block(struct llog_handle *loghandle, int *curr_idx,
         if (lop->lop_next_block == NULL)
                 RETURN(-EOPNOTSUPP);
 
-        rc = lop->lop_next_block(loghandle, curr_idx, next_idx, curr_offset, buf,
+        rc = lop->lop_next_block(loghandle, cur_idx, next_idx, cur_offset, buf,
                                  len);
         RETURN(rc);
 }
 
-static inline int llog_prev_block(struct llog_handle *loghandle,
-                                  int prev_idx, void *buf, int len)
+static inline int llog_create(struct llog_ctxt *ctxt, struct llog_handle **res,
+                              struct llog_logid *logid, char *name)
 {
         struct llog_operations *lop;
         int rc;
         ENTRY;
 
-        rc = llog_handle2ops(loghandle, &lop);
+        rc = llog_obd2ops(ctxt, &lop);
         if (rc)
                 RETURN(rc);
-        if (lop->lop_prev_block == NULL)
+        if (lop->lop_create == NULL)
                 RETURN(-EOPNOTSUPP);
 
-        rc = lop->lop_prev_block(loghandle, prev_idx, buf, len);
+        rc = lop->lop_create(ctxt, res, logid, name);
         RETURN(rc);
 }
 
@@ -454,7 +378,7 @@ static inline int llog_connect(struct llog_ctxt *ctxt, int count,
         int rc;
         ENTRY;
 
-        rc = llog_ctxt2ops(ctxt, &lop);
+        rc = llog_obd2ops(ctxt, &lop);
         if (rc)
                 RETURN(rc);
         if (lop->lop_connect == NULL)
@@ -464,20 +388,4 @@ static inline int llog_connect(struct llog_ctxt *ctxt, int count,
         RETURN(rc);
 }
 
-static inline int llog_sync(struct llog_ctxt *ctxt, struct obd_export *exp)
-{
-        struct llog_operations *lop;
-        int rc;
-        ENTRY;
-
-        rc = llog_ctxt2ops(ctxt, &lop);
-        if (rc)
-                RETURN(rc);
-        if (lop->lop_sync == NULL)
-                RETURN(-EOPNOTSUPP);
-
-        rc = lop->lop_sync(ctxt, exp);
-        RETURN(rc);
-}
-
 #endif
diff --git a/lustre/include/linux/lustre_mds.h b/lustre/include/linux/lustre_mds.h
index 20e2771..c4f82dd 100644
--- a/lustre/include/linux/lustre_mds.h
+++ b/lustre/include/linux/lustre_mds.h
@@ -54,6 +54,7 @@ struct ll_file_data;
 struct lustre_md {
         struct mds_body *body;
         struct lov_stripe_md *lsm;
+        struct mea *mea;
 };
 
 struct ll_uctxt {
@@ -69,6 +70,8 @@ struct mdc_op_data {
         const char *name;
         int namelen;
         __u32 create_mode;
+        struct mea *mea1;       /* mea of inode1 */
+        struct mea *mea2;       /* mea of inode2 */
 };
 
 struct mds_update_record {
@@ -84,18 +87,18 @@ struct mds_update_record {
         int ur_cookielen;
         struct llog_cookie *ur_logcookies;
         struct iattr ur_iattr;
-        struct lvfs_ucred ur_uc;
+        struct obd_ucred ur_uc;
         __u64 ur_rdev;
         __u32 ur_mode;
         __u64 ur_time;
         __u32 ur_flags;
 };
 
-#define ur_fsuid    ur_uc.luc_fsuid
-#define ur_fsgid    ur_uc.luc_fsgid
-#define ur_cap      ur_uc.luc_cap
-#define ur_suppgid1 ur_uc.luc_suppgid1
-#define ur_suppgid2 ur_uc.luc_suppgid2
+#define ur_fsuid    ur_uc.ouc_fsuid
+#define ur_fsgid    ur_uc.ouc_fsgid
+#define ur_cap      ur_uc.ouc_cap
+#define ur_suppgid1 ur_uc.ouc_suppgid1
+#define ur_suppgid2 ur_uc.ouc_suppgid2
 
 /* i_attr_flags holds the open count in the inode in 2.4 */
 //XXX Alex implement on 2.4 with i_attr_flags and find soln for 2.5 please
@@ -218,9 +221,9 @@ int mdc_enqueue(struct obd_export *exp,
                 void *cb_data);
 
 /* mdc/mdc_request.c */
-int mdc_init_ea_size(struct obd_device *obd, char *lov_name);
 int mdc_req2lustre_md(struct ptlrpc_request *req, int offset,
-                      struct obd_export *exp,
+                      struct obd_export *exp_osc,
+                      struct obd_export *exp_mdc,
                       struct lustre_md *md);
 int mdc_getstatus(struct obd_export *exp, struct ll_fid *rootfid);
 int mdc_getattr(struct obd_export *exp, struct ll_fid *fid,
@@ -241,8 +244,8 @@ void mdc_set_open_replay_data(struct obd_client_handle *och,
 void mdc_clear_open_replay_data(struct obd_client_handle *och);
 int mdc_close(struct obd_export *, struct obdo *, struct obd_client_handle *,
               struct ptlrpc_request **);
-int mdc_readpage(struct obd_export *exp, struct ll_fid *mdc_fid, __u64 offset,
-                 struct page *, struct ptlrpc_request **);
+int mdc_readpage(struct obd_export *exp, struct ll_fid *mdc_fid,
+                 __u64, struct page *, struct ptlrpc_request **);
 int mdc_create(struct obd_export *exp, struct mdc_op_data *op_data,
                const void *data, int datalen, int mode, __u32 uid, __u32 gid,
                __u64 rdev, struct ptlrpc_request **request);
diff --git a/lustre/include/linux/lustre_net.h b/lustre/include/linux/lustre_net.h
index 8370ad5..8c5e54d 100644
--- a/lustre/include/linux/lustre_net.h
+++ b/lustre/include/linux/lustre_net.h
@@ -35,6 +35,7 @@
 #include <linux/kp30.h>
 // #include <linux/obd.h>
 #include <portals/p30.h>
+#include <portals/lib-types.h>                  /* FIXME (for PTL_MD_MAX_IOV) */
 #include <linux/lustre_idl.h>
 #include <linux/lustre_ha.h>
 #include <linux/lustre_import.h>
@@ -44,43 +45,26 @@
 #define PTLRPC_MD_OPTIONS  (PTL_MD_EVENT_START_DISABLE | \
                             PTL_MD_LUSTRE_COMPLETION_SEMANTICS)
 
-/* Define some large-ish maxima for bulk I/O 
- * CAVEAT EMPTOR, with multinet (i.e. gateways forwarding between networks)
- * these limits are system wide and not interface-local. */
-#define PTLRPC_MAX_BRW_SIZE     (1 << 20)
-#define PTLRPC_MAX_BRW_PAGES    512
-
-/* ...reduce to fit... */
-
-#if CRAY_PORTALS
-/* include a cray header here if relevant
- * NB liblustre SIZE/PAGES is affected too, but it merges contiguous
- * chunks, so FTTB, it always used contiguous MDs */
+/* Define some large-ish defaults for MTU and MAX_IOV if portals ones
+ * aren't defined (i.e. no limits) or too large */
+#if (defined(PTL_MTU) && (PTL_MTU <= (1 << 20)))
+# define PTLRPC_MTU  PTL_MTU
 #else
-# include <portals/lib-types.h>
-#endif
-
-#if (defined(PTL_MTU) && (PTL_MTU < PTLRPC_MAX_BRW_SIZE))
-# undef  PTLRPC_MAX_BRW_SIZE
-# define PTLRPC_MAX_BRW_SIZE  PTL_MTU
-#endif
-#if (defined(PTL_MD_MAX_IOV) && (PTL_MD_MAX_IOV < PTLRPC_MAX_BRW_PAGES ))
-# undef  PTLRPC_MAX_BRW_PAGES
-# define PTLRPC_MAX_BRW_PAGES PTL_MD_MAX_IOV
+# define PTLRPC_MTU  (1 << 20)
 #endif
-
-/* ...and make consistent... */
-
-#if (PTLRPC_MAX_BRW_SIZE > PTLRPC_MAX_BRW_PAGES * PAGE_SIZE)
-# undef  PTLRPC_MAX_BRW_SIZE
-# define PTLRPC_MAX_BRW_SIZE   (PTLRPC_MAX_BRW_PAGES * PAGE_SIZE)
+#if (defined(PTL_MAX_IOV) && (PTL_MAX_IOV <= 512))
+# define PTLRPC_MAX_IOV PTL_MAX_IOV
 #else
-# undef  PTLRPC_MAX_BRW_PAGES
-# define PTLRPC_MAX_BRW_PAGES  (PTLRPC_MAX_BRW_SIZE / PAGE_SIZE)
+# define PTLRPC_MAX_IOV 512
 #endif
 
-#if ((PTLRPC_MAX_BRW_PAGES & (PTLRPC_MAX_BRW_PAGES - 1)) != 0)
-#error "PTLRPC_MAX_BRW_PAGES isn't a power of two"
+/* Define consistent max bulk size/pages */
+#if (PTLRPC_MTU > PTLRPC_MAX_IOV * PAGE_SIZE)
+# define PTLRPC_MAX_BRW_PAGES   PTLRPC_MAX_IOV
+# define PTLRPC_MAX_BRW_SIZE   (PTLRPC_MAX_IOV * PAGE_SIZE)
+#else
+# define PTLRPC_MAX_BRW_PAGES  (PTLRPC_MTU / PAGE_SIZE)
+# define PTLRPC_MAX_BRW_SIZE    PTLRPC_MTU
 #endif
 
 /* Size over which to OBD_VMALLOC() rather than OBD_ALLOC() service request
@@ -103,7 +87,7 @@
  */
 
 #define LDLM_NUM_THREADS        min(smp_num_cpus * smp_num_cpus * 8, 64)
-#define LDLM_NBUF_MAX   512UL
+#define LDLM_NBUF_MAX   256UL
 #define LDLM_BUFSIZE    (8 * 1024)
 #define LDLM_MAXREQSIZE (5 * 1024)
 #define LDLM_MAXMEM      (num_physpages*(PAGE_SIZE/1024))
@@ -112,7 +96,7 @@
 #define MDT_MAX_THREADS 32UL
 #define MDT_NUM_THREADS max(min_t(unsigned long, num_physpages / 8192, \
                                   MDT_MAX_THREADS), 2UL)
-#define MDS_NBUF_MAX    4096UL
+#define MDS_NBUF_MAX    512UL
 #define MDS_BUFSIZE     (8 * 1024)
 /* Assume file name length = FNAME_MAX = 256 (true for extN).
  *        path name length = PATH_MAX = 4096
@@ -287,7 +271,7 @@ struct ptlrpc_request {
         unsigned int rq_intr:1, rq_replied:1, rq_err:1,
                 rq_timedout:1, rq_resend:1, rq_restart:1, rq_replay:1,
                 rq_no_resend:1, rq_waiting:1, rq_receiving_reply:1,
-                rq_no_delay:1, rq_net_err:1;
+                rq_no_delay:1;
         int rq_phase;
         /* client-side refcount for SENT race */
         atomic_t rq_refcount;
@@ -359,6 +343,8 @@ struct ptlrpc_request {
 /* Spare the preprocessor, spoil the bugs. */
 #define FLAG(field, str) (field ? str : "")
 
+#define PTLRPC_REQUEST_COMPLETE(req) ((req)->rq_phase > RQ_PHASE_RPC)
+
 #define DEBUG_REQ_FLAGS(req)                                                    \
         ((req->rq_phase == RQ_PHASE_NEW) ? "New" :                              \
          (req->rq_phase == RQ_PHASE_RPC) ? "Rpc" :                              \
@@ -430,7 +416,7 @@ struct ptlrpc_bulk_desc {
 #if (!CRAY_PORTALS && defined(__KERNEL__))
         ptl_kiov_t             bd_iov[0];
 #else
-        ptl_md_iovec_t         bd_iov[0];
+        struct iovec           bd_iov[0];
 #endif
 };
 
@@ -510,12 +496,6 @@ struct ptlrpc_service {
         struct ptlrpc_srv_ni srv_interfaces[0];
 };
 
-static inline char *ptlrpc_peernid2str(struct ptlrpc_peer *p, char *str)
-{
-        LASSERT(p->peer_ni != NULL);
-        return (portals_nid2str(p->peer_ni->pni_number, p->peer_nid, str));
-}
-
 /* ptlrpc/events.c */
 extern struct ptlrpc_ni ptlrpc_interfaces[];
 extern int              ptlrpc_ninterfaces;
@@ -526,7 +506,6 @@ extern void client_bulk_callback (ptl_event_t *ev);
 extern void request_in_callback(ptl_event_t *ev);
 extern void reply_out_callback(ptl_event_t *ev);
 extern void server_bulk_callback (ptl_event_t *ev);
-extern int ptlrpc_default_nal(void);
 
 /* ptlrpc/connection.c */
 void ptlrpc_dump_connections(void);
@@ -711,7 +690,6 @@ void ptlrpc_lprocfs_unregister_obd(struct obd_device *obddev);
 
 /* ptlrpc/llog_server.c */
 int llog_origin_handle_create(struct ptlrpc_request *req);
-int llog_origin_handle_prev_block(struct ptlrpc_request *req);
 int llog_origin_handle_next_block(struct ptlrpc_request *req);
 int llog_origin_handle_read_header(struct ptlrpc_request *req);
 int llog_origin_handle_close(struct ptlrpc_request *req);
diff --git a/lustre/include/linux/lustre_smfs.h b/lustre/include/linux/lustre_smfs.h
deleted file mode 100644
index 2cb6774..0000000
--- a/lustre/include/linux/lustre_smfs.h
+++ /dev/null
@@ -1,274 +0,0 @@
-#ifndef __LUSTRE_SMFS_H
-#define __LUSTRE_SMFS_H
-
-struct smfs_inode_info {
-	struct inode *smi_inode;
-	__u32  smi_flags;
-};
-
-struct journal_operations {
-        void *(*tr_start)(struct inode *, int op);
-        void (*tr_commit)(void *handle);
-};
-
-struct sm_operations {
-        /* operations on the file store */
-        struct super_operations sm_sb_ops;
-        struct inode_operations sm_dir_iops;
-        struct inode_operations sm_file_iops;
-        struct inode_operations sm_sym_iops;
-        struct file_operations sm_dir_fops;
-        struct file_operations sm_file_fops;
-        struct file_operations sm_sym_fops;
-        struct dentry_operations sm_dentry_ops;
-	struct journal_operations sm_journal_ops;
-};
-
-struct smfs_super_info {
-	struct super_block 	 *smsi_sb;
-        struct vfsmount 	 *smsi_mnt;         /* mount the cache kern with
-						     * kern_do_mount (like MDS) */
-	struct fsfilt_operations *sm_cache_fsfilt;  /* fsfilt operations */
-	struct fsfilt_operations *sm_fsfilt;	    /* fsfilt operations */
-	struct sm_operations     *sm_ops;           /* cache ops for set cache
-						     * inode ops */
-
-	struct lvfs_run_ctxt	 *smsi_ctxt;	
-	struct llog_ctxt	 *smsi_rec_log;	    /* smfs kml llog */ 
-	struct dentry 		 *smsi_logs_dir;
-	struct dentry		 *smsi_objects_dir;
-	struct dentry		 *smsi_delete_dir;  /* for delete inode dir */
-	char   			 *cache_fs_type;    /* cache file system type */
-	char   			 *fs_type;	    /* file system type */
-	__u32 			 flags;		    /* flags */
-	__u32 			 ops_check;
-};
-
-#define SMFS_FILE_TYPE "smfs"
-#define SMFS_FILE_MAGIC	0x19760218
-
-struct smfs_file_info {
-	struct file	*c_file;
-	int 		magic;
-};
-
-struct smfs_record_extents {
-	size_t	sre_count;
-	loff_t  sre_off; 
-};
-
-#define I2SMI(inode)  ((struct smfs_inode_info *) (&(inode->u.generic_ip)))
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-#define S2SMI(sb)   ((struct smfs_super_info *) (&(sb->u.generic_sbp)))
-#define S2CSB(sb)   (((struct smfs_super_info *) (&(sb->u.generic_sbp)))->smsi_sb)
-#else
-#define S2SMI(sb)   ((struct smfs_super_info *) (sb->s_fs_info))
-#define S2CSB(sb)   (((struct smfs_super_info *) (sb->s_fs_info))->smsi_sb)
-#endif
-
-#define I2CI(inode) (((struct smfs_inode_info*) (&(inode->u.generic_ip)))->smi_inode)
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-#define I2CSB(inode) ((struct smfs_super_info *) (&(inode->i_sb->u.generic_sbp)))
-#else
-#define I2CSB(inode) ((struct smfs_super_info *) (inode->i_sb->s_fs_info))
-#endif
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-#define I2FOPS(inode) (((struct smfs_super_info *) \
-			(&(inode->i_sb->u.generic_sbp)))->sm_cache_fsfilt)
-#else
-#define I2FOPS(inode) (((struct smfs_super_info *) \
-			(inode->i_sb->s_fs_info))->sm_cache_fsfilt)
-#endif
-
-#define F2SMFI(file) ((struct smfs_file_info *)((file->private_data)))
-#define F2CF(file) (((struct smfs_file_info *) ((file->private_data)))->c_file)
-
-#define SM_DO_REC		0x1
-#define SM_INIT_REC		0x2
-#define SM_CACHE_HOOK		0x4
-
-#define SMFS_DO_REC(smfs_info) (smfs_info->flags & SM_DO_REC)
-#define SMFS_SET_REC(smfs_info) (smfs_info->flags |= SM_DO_REC)
-#define SMFS_CLEAN_REC(smfs_info) (smfs_info->flags &= ~SM_DO_REC)
-
-#define SMFS_INIT_REC(smfs_info) (smfs_info->flags & SM_INIT_REC)
-#define SMFS_SET_INIT_REC(smfs_info) (smfs_info->flags |= SM_INIT_REC)
-#define SMFS_CLEAN_INIT_REC(smfs_info) (smfs_info->flags &= ~SM_INIT_REC)
-
-#define SMFS_SET_INODE_REC(inode) (I2SMI(inode)->smi_flags |= SM_DO_REC)
-#define SMFS_DO_INODE_REC(inode) (I2SMI(inode)->smi_flags & SM_DO_REC)
-#define SMFS_CLEAN_INODE_REC(inode) (I2SMI(inode)->smi_flags &= ~SM_DO_REC)
-
-#define SMFS_CACHE_HOOK(smfs_info) (smfs_info->flags & SM_CACHE_HOOK)
-#define SMFS_SET_CACHE_HOOK(smfs_info) (smfs_info->flags |= SM_CACHE_HOOK)
-#define SMFS_CLEAN_CACHE_HOOK(smfs_info) (smfs_info->flags &= ~SM_CACHE_HOOK)
-
-#define SMFS_INODE_CACHE_HOOK(inode) (I2SMI(inode)->smi_flags & SM_CACHE_HOOK)
-#define SMFS_SET_INODE_CACHE_HOOK(inode) (I2SMI(inode)->smi_flags |= SM_CACHE_HOOK)
-#define SMFS_CLEAN_INODE_CACHE_HOOK(inode) (I2SMI(inode)->smi_flags &= ~SM_CACHE_HOOK)
-
-#define LVFS_SMFS_BACK_ATTR "lvfs_back_attr"
-
-
-#define REC_COUNT_BIT 0
-#define REC_COUNT_MASK 0x01 /*0001*/
-#define REC_OP_BIT  1
-#define REC_OP_MASK 0x06 /*0110*/
-#define REC_WRITE_KML_BIT 3
-#define REC_WRITE_KML_MASK 0x08 /*1000*/
-#define REC_DEC_LINK_BIT    4
-#define REC_DEC_LINK_MASK   0x10 /*10000* different with unlink*/
-
-
-#define SET_REC_COUNT_FLAGS(flag, count_flag) \
-		(flag |= count_flag << REC_COUNT_BIT)
-#define GET_REC_COUNT_FLAGS(flag) \
-		((flag & REC_COUNT_MASK) >> REC_COUNT_BIT)
-
-#define SET_REC_OP_FLAGS(flag, op_flag) \
-		(flag |= op_flag << REC_OP_BIT) 
-#define GET_REC_OP_FLAGS(flag) \
-		((flag & REC_OP_MASK) >> REC_OP_BIT)
-
-#define SET_REC_WRITE_KML_FLAGS(flag, op_flag) \
-		(flag |= op_flag << REC_OP_BIT) 
-#define GET_REC_WRITE_KML_FLAGS(flag) \
-		((flag & REC_WRITE_KML_MASK) >> REC_WRITE_KML_BIT)
-
-#define SET_REC_DEC_LINK_FLAGS(flag, op_flag) \
-		(flag |= op_flag << REC_DEC_LINK_BIT) 
-#define GET_REC_DEC_LINK_FLAGS(flag) \
-		((flag & REC_DEC_LINK_MASK) >> REC_DEC_LINK_BIT)
-
-#define SMFS_REC_ALL		0x1
-#define SMFS_REC_BY_COUNT	0x0
-
-#define SMFS_REINT_REC		0x1
-#define SMFS_UNDO_REC		0x2
-
-#define SMFS_WRITE_KML		0x1
-
-#define SMFS_DEC_LINK		0x1
-
-#define SMFS_DO_REINT_REC(flag) \
-	 (GET_REC_OP_FLAGS(flag) == SMFS_REINT_REC)
-#define SMFS_DO_UNDO_REC(flag) \
-	 (GET_REC_OP_FLAGS(flag) == SMFS_UNDO_REC)
-#define SMFS_DO_REC_ALL(flag) \
-	(GET_REC_COUNT_FLAGS(flag) == SMFS_REC_ALL)
-#define SMFS_DO_REC_BY_COUNT(flag) \
-	(GET_REC_COUNT_FLAGS(flag) == SMFS_REC_BY_COUNT)
-#define SMFS_DO_WRITE_KML(flag) \
-	(GET_REC_WRITE_KML_FLAGS(flag) == SMFS_WRITE_KML)
-#define SMFS_DO_DEC_LINK(flag) \
-	(GET_REC_DEC_LINK_FLAGS(flag) == SMFS_DEC_LINK)
-
-static inline void duplicate_inode(struct inode *dst_inode, 
-		    		   struct inode *src_inode) 
-{
-	dst_inode->i_mode = src_inode->i_mode;
-	dst_inode->i_uid = src_inode->i_uid;
-	dst_inode->i_gid = src_inode->i_gid;
-	dst_inode->i_nlink = src_inode->i_nlink;
-	dst_inode->i_size = src_inode->i_size;
-	dst_inode->i_atime = src_inode->i_atime;
-	dst_inode->i_ctime = src_inode->i_ctime;
-	dst_inode->i_mtime = src_inode->i_mtime;
-	dst_inode->i_blksize = src_inode->i_blksize;  
-	dst_inode->i_version = src_inode->i_version;
-	dst_inode->i_state = src_inode->i_state;
-	dst_inode->i_generation = src_inode->i_generation;
-
-	/* This is to make creating special files working. */
-	dst_inode->i_rdev = src_inode->i_rdev;
-}
-
-static inline void post_smfs_inode(struct inode *inode, 
-		    		   struct inode *cache_inode)
-{
-	if (inode && cache_inode) {
-		duplicate_inode(inode, cache_inode);
-		/*Here we must release the cache_inode,
-		 *Otherwise we will have no chance to
-		 *do it
-		 */
-		cache_inode->i_state &=~I_LOCK;	
-		inode->i_blocks = cache_inode->i_blocks;
-	}
-}
-
-static inline void pre_smfs_inode(struct inode *inode,
-				  struct inode *cache_inode)
-{
-	if (inode && cache_inode)
-		duplicate_inode(cache_inode, inode);
-}
-
-/* instantiate a file handle to the cache file */
-static inline void duplicate_file(struct file *dst_file,
-			    	  struct file *src_file) 
-{
-	dst_file->f_pos = src_file->f_pos;
-        dst_file->f_mode = src_file->f_mode;
-        dst_file->f_flags = src_file->f_flags;
-        dst_file->f_owner  = src_file->f_owner;
-	dst_file->f_vfsmnt = src_file->f_vfsmnt;
-	
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-	dst_file->f_reada = src_file->f_reada;
-	dst_file->f_ramax = src_file->f_ramax;
-	dst_file->f_raend = src_file->f_raend;
-	dst_file->f_ralen = src_file->f_ralen;
-	dst_file->f_rawin = src_file->f_rawin;
-#else
-	dst_file->f_ra = src_file->f_ra;
-#endif
-}
-
-static inline void duplicate_sb(struct super_block *dst_sb, 
-			 	struct super_block *src_sb)
-{
-	dst_sb->s_blocksize = src_sb->s_blocksize;
-	dst_sb->s_magic = src_sb->s_magic;
-	dst_sb->s_blocksize_bits = src_sb->s_blocksize_bits;
-	dst_sb->s_maxbytes = src_sb->s_maxbytes;
-}
-
-static inline void d_unalloc(struct dentry *dentry)
-{
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-	list_del(&dentry->d_hash);
-	INIT_LIST_HEAD(&dentry->d_hash);
-#else
-	hlist_del_init(&dentry->d_hash);
-#endif
-	dput(dentry); /* this will free the dentry memory */
-}
-
-static inline struct dentry *pre_smfs_dentry(struct dentry *parent_dentry, 
-				   	     struct inode *cache_inode,
-					     struct dentry *dentry)
-{
-	struct dentry *cache_dentry = NULL;
-
-	cache_dentry = d_alloc(parent_dentry, &dentry->d_name);	
-	if (!cache_dentry)
-		RETURN(NULL);
-	if (!parent_dentry)
-		cache_dentry->d_parent = cache_dentry;
-	if (cache_inode)
-		d_add(cache_dentry, cache_inode);
-	RETURN(cache_dentry);
-}
-
-static inline void post_smfs_dentry(struct dentry *cache_dentry)
-{
-	if (!cache_dentry)
-		return;
-	if (cache_dentry->d_inode)
-		igrab(cache_dentry->d_inode);
-	d_unalloc(cache_dentry);	
-}
-#endif /* _LUSTRE_SMFS_H */
diff --git a/lustre/include/lustre/lustre_user.h b/lustre/include/linux/lustre_user.h
similarity index 75%
rename from lustre/include/lustre/lustre_user.h
rename to lustre/include/linux/lustre_user.h
index f0a839a..c380fe9 100644
--- a/lustre/include/lustre/lustre_user.h
+++ b/lustre/include/linux/lustre_user.h
@@ -24,11 +24,9 @@
 #ifndef _LUSTRE_USER_H
 #define _LUSTRE_USER_H
 #include <asm/types.h>
-#ifdef __KERNEL__
-#include <linux/string.h>
-#else
-#include <string.h>
-#endif
+
+#define IOC_MDC_TYPE         'i'
+#define IOC_MDC_GETSTRIPE    _IOWR(IOC_MDC_TYPE, 21, struct lov_mds_md *)
 
 #define LL_IOC_GETFLAGS                 _IOR ('f', 151, long)
 #define LL_IOC_SETFLAGS                 _IOW ('f', 152, long)
@@ -37,16 +35,14 @@
 #define LL_IOC_LOV_GETSTRIPE            _IOW ('f', 155, long)
 #define LL_IOC_LOV_SETEA                _IOW ('f', 156, long)
 #define LL_IOC_RECREATE_OBJ             _IOW ('f', 157, long)
-#define LL_IOC_GROUP_LOCK               _IOW ('f', 158, long)
-#define LL_IOC_GROUP_UNLOCK             _IOW ('f', 159, long)
-
-#define IOC_MDC_TYPE            'i'
-#define IOC_MDC_GETSTRIPE       _IOWR(IOC_MDC_TYPE, 21, struct lov_mds_md *)
+#define LL_IOC_CW_LOCK                  _IOW ('f', 158, long)
+#define LL_IOC_CW_UNLOCK                _IOW ('f', 159, long)
+#define LL_IOC_MDC_MKDIRSTRIPE          _IOW ('f', 160, long)
 
 #define O_LOV_DELAY_CREATE 0100000000  /* hopefully this does not conflict */
 
 #define LL_FILE_IGNORE_LOCK             0x00000001
-#define LL_FILE_GROUP_LOCKED            0x00000002
+#define LL_FILE_CW_LOCKED               0x00000002
 
 #define LOV_USER_MAGIC_V1 0x0BD10BD0
 #define LOV_USER_MAGIC    LOV_USER_MAGIC_V1
@@ -59,8 +55,9 @@
 struct lov_user_ost_data_v1 {     /* per-stripe data structure */
         __u64 l_object_id;	  /* OST object ID */
         __u64 l_object_gr;        /* OST object group (creating MDS number) */
-        __u32 l_ost_gen;          /* generation of this OST index */
-        __u32 l_ost_idx;          /* OST index in LOV */
+        __u32 l_ost_generation;   /* generation of this OST index */
+        __u16 l_ost_idx;          /* OST index in LOV */
+        __u16 l_reserved2;
 } __attribute__((packed));
 
 #define lov_user_md lov_user_md_v1
@@ -75,24 +72,16 @@ struct lov_user_md_v1 {           /* LOV EA user data (host-endian) */
         struct lov_user_ost_data_v1 lmm_objects[0]; /* per-stripe data */
 } __attribute__((packed));
 
-struct ll_recreate_obj {
-        __u64 lrc_id;
-        __u32 lrc_ost_idx;
+struct ll_user_mkdir_stripe {
+        int lums_namelen;
+        char *lums_name;
+        mode_t lums_mode;
+        int lums_nstripes;
 };
 
-struct obd_uuid {
-        __u8 uuid[40];
-};
-
-static inline int obd_uuid_equals(struct obd_uuid *u1, struct obd_uuid *u2)
-{
-        return strcmp(u1->uuid, u2->uuid) == 0;
-}
-
-static inline void obd_str2uuid(struct obd_uuid *uuid, char *tmp)
-{
-        strncpy(uuid->uuid, tmp, sizeof(*uuid));
-        uuid->uuid[sizeof(*uuid) - 1] = '\0';
-}
+extern int op_create_file(char *name, long stripe_size, int stripe_offset,
+                          int stripe_count);
+extern int op_create_dir(char *name, int stripe_count);
+extern int get_file_stripe(char *path, struct lov_user_md *lum);
 
 #endif /* _LUSTRE_USER_H */
diff --git a/lustre/include/linux/lvfs.h b/lustre/include/linux/lvfs.h
index f51cf73..b18769f 100644
--- a/lustre/include/linux/lvfs.h
+++ b/lustre/include/linux/lvfs.h
@@ -14,12 +14,12 @@
 #endif
 
 /* simple.c */
-struct lvfs_ucred {
-        __u32 luc_fsuid;
-        __u32 luc_fsgid;
-        __u32 luc_cap;
-        __u32 luc_suppgid1;
-        __u32 luc_suppgid2;
+struct obd_ucred {
+        __u32 ouc_fsuid;
+        __u32 ouc_fsgid;
+        __u32 ouc_cap;
+        __u32 ouc_suppgid1;
+        __u32 ouc_suppgid2;
 };
 
 struct lvfs_callback_ops {
@@ -28,11 +28,11 @@ struct lvfs_callback_ops {
 
 #define OBD_RUN_CTXT_MAGIC      0xC0FFEEAA
 #define OBD_CTXT_DEBUG          /* development-only debugging */
-struct lvfs_run_ctxt {
+struct obd_run_ctxt {
         struct vfsmount *pwdmnt;
         struct dentry   *pwd;
         mm_segment_t     fs;
-        struct lvfs_ucred luc;
+        struct obd_ucred ouc;
         int              ngroups;
         struct lvfs_callback_ops cb_ops;
 #ifdef OBD_CTXT_DEBUG
@@ -47,16 +47,15 @@ struct lvfs_run_ctxt {
 #endif
 
 /* lvfs_common.c */
-struct dentry *lvfs_fid2dentry(struct lvfs_run_ctxt *, __u64, __u32, __u64 ,void *data);
+struct dentry *lvfs_fid2dentry(struct obd_run_ctxt *, __u64, __u32, __u64 ,void *data);
 
-void push_ctxt(struct lvfs_run_ctxt *save, struct lvfs_run_ctxt *new_ctx,
-               struct lvfs_ucred *cred);
-void pop_ctxt(struct lvfs_run_ctxt *saved, struct lvfs_run_ctxt *new_ctx,
-              struct lvfs_ucred *cred);
+void push_ctxt(struct obd_run_ctxt *save, struct obd_run_ctxt *new_ctx,
+               struct obd_ucred *cred);
+void pop_ctxt(struct obd_run_ctxt *saved, struct obd_run_ctxt *new_ctx,
+              struct obd_ucred *cred);
 
 #ifdef __KERNEL__
-int lvfs_reint(struct super_block *sb, void *r_rec);
-int lvfs_undo(struct super_block *sb, void *r_rec);
+
 struct dentry *simple_mkdir(struct dentry *dir, char *name, int mode, int fix);
 struct dentry *simple_mknod(struct dentry *dir, char *name, int mode, int fix);
 int lustre_fread(struct file *file, void *buf, int len, loff_t *off);
diff --git a/lustre/include/linux/lvfs_linux.h b/lustre/include/linux/lvfs_linux.h
index 5e125a0..71fc431 100644
--- a/lustre/include/linux/lvfs_linux.h
+++ b/lustre/include/linux/lvfs_linux.h
@@ -20,8 +20,8 @@
 
 #define l_filp_open filp_open
 
-struct lvfs_run_ctxt;
-struct l_file *l_dentry_open(struct lvfs_run_ctxt *, struct l_dentry *,
+struct obd_run_ctxt;
+struct l_file *l_dentry_open(struct obd_run_ctxt *, struct l_dentry *,
                              int flags);
 
 struct l_linux_dirent {
diff --git a/lustre/include/linux/obd.h b/lustre/include/linux/obd.h
index 1edd574..12cf9fb 100644
--- a/lustre/include/linux/obd.h
+++ b/lustre/include/linux/obd.h
@@ -18,8 +18,6 @@
 #define IOC_MDC_TYPE         'i'
 #define IOC_MDC_MIN_NR       20
 #define IOC_MDC_LOOKUP       _IOWR(IOC_MDC_TYPE, 20, struct obd_device *)
-/* Moved to lustre_user.h
-#define IOC_MDC_GETSTRIPE    _IOWR(IOC_MDC_TYPE, 21, struct lov_mds_md *) */
 #define IOC_MDC_MAX_NR       50
 
 #ifdef __KERNEL__
@@ -32,7 +30,6 @@
 # include <linux/mount.h>
 #endif
 
-#include <linux/lvfs.h>
 #include <linux/lustre_lib.h>
 #include <linux/lustre_idl.h>
 #include <linux/lustre_export.h>
@@ -60,10 +57,9 @@ struct lov_oinfo {                 /* per-stripe data structure */
         struct list_head loi_read_item;
 
         int loi_kms_valid:1;
-        __u64 loi_kms;             /* known minimum size */
-        __u64 loi_rss;             /* recently seen size */
-        __u64 loi_mtime;           /* recently seen mtime */
-        __u64 loi_blocks;          /* recently seen blocks */
+        __u64 loi_kms; /* known minimum size */
+        __u64 loi_rss; /* recently seen size */
+        __u64 loi_mtime; /* recently seen mtime */
 };
 
 static inline void loi_init(struct lov_oinfo *loi)
@@ -97,14 +93,14 @@ struct lov_stripe_md {
 struct obd_type {
         struct list_head typ_chain;
         struct obd_ops *typ_ops;
+        struct md_ops *typ_md_ops;
         struct proc_dir_entry *typ_procroot;
         char *typ_name;
         int  typ_refcnt;
 };
 
 struct brw_page {
-        obd_off disk_offset; /* modulo PAGE_SIZE */
-        obd_off page_offset; /* modulo PAGE_SIZE (obviously) */
+        obd_off  off;
         struct page *pg;
         int count;
         obd_flag flag;
@@ -127,7 +123,7 @@ struct obd_async_page_ops {
         int  (*ap_make_ready)(void *data, int cmd);
         int  (*ap_refresh_count)(void *data, int cmd);
         void (*ap_fill_obdo)(void *data, int cmd, struct obdo *oa);
-        void (*ap_completion)(void *data, int cmd, struct obdo *oa, int rc);
+        void (*ap_completion)(void *data, int cmd, int rc);
 };
 
 /* the `oig' is passed down from a caller of obd rw methods.  the callee
@@ -163,13 +159,34 @@ struct obd_histogram {
 
 struct ost_server_data;
 
+#define FILTER_SUBDIR_COUNT      32            /* set to zero for no subdirs */
+
+#define FILTER_GROUP_LLOG 1
+#define FILTER_GROUP_ECHO 2
+#define FILTER_GROUP_FIRST_MDS 3
+
+struct filter_subdirs {
+        struct dentry *dentry[FILTER_SUBDIR_COUNT];
+};
+
+struct filter_group_llog {
+        struct list_head list;
+        int group;
+        struct obd_llogs *llogs;
+};
+
 struct filter_obd {
         const char          *fo_fstype;
         struct super_block  *fo_sb;
         struct vfsmount     *fo_vfsmnt;
-        struct dentry       *fo_dentry_O;
-        struct dentry      **fo_dentry_O_groups;
-        struct dentry      **fo_dentry_O_sub;
+
+        int                    fo_group_count;
+        struct dentry         *fo_dentry_O; /* the "O"bject directory dentry */
+        struct dentry        **fo_groups;   /* dentries for each group dir */
+        struct filter_subdirs *fo_subdirs;  /* subdir array per group */
+        __u64                 *fo_last_objids; // per-group last created objid
+        struct file          **fo_last_objid_files;
+
         spinlock_t           fo_objidlock; /* protect fo_lastobjid increment */
         spinlock_t           fo_translock; /* protect fsd_last_rcvd increment */
         struct file         *fo_rcvd_filp;
@@ -177,9 +194,6 @@ struct filter_obd {
         unsigned long       *fo_last_rcvd_slots;
         __u64                fo_mount_count;
 
-        unsigned int         fo_destroy_in_progress:1;
-        struct semaphore     fo_create_lock;
-
         struct file_operations *fo_fop;
         struct inode_operations *fo_iop;
         struct address_space_operations *fo_aops;
@@ -196,11 +210,6 @@ struct filter_obd {
         struct obd_import   *fo_mdc_imp;
         struct obd_uuid      fo_mdc_uuid;
         struct lustre_handle fo_mdc_conn;
-#if 0
-        struct ptlrpc_client fo_mdc_client;
-#endif
-        struct file        **fo_last_objid_files;
-        __u64               *fo_last_objids; /* last created objid for groups */
 
         struct semaphore     fo_alloc_lock;
 
@@ -210,6 +219,9 @@ struct filter_obd {
         struct obd_histogram     fo_w_discont_pages;
         struct obd_histogram     fo_r_discont_blocks;
         struct obd_histogram     fo_w_discont_blocks;
+
+        struct list_head         fo_llog_list;
+        spinlock_t               fo_llog_list_lock;
 };
 
 struct mds_server_data;
@@ -313,6 +325,15 @@ struct mds_obd {
         struct semaphore                 mds_orphan_recovery_sem;
 
         atomic_t                         mds_open_count;
+
+        char                            *mds_lmv_name;
+        int                              mds_num;        /* number in cluster */
+        struct obd_device               *mds_lmv_obd; /* XXX lmv_obd */
+        struct obd_export               *mds_lmv_exp; /* XXX lov_exp */
+        struct ptlrpc_service           *mds_create_service;
+        atomic_t                         mds_real_clients;
+        struct obd_uuid                  mds_lmv_uuid;
+        struct dentry                   *mds_fids_dir;
 };
 
 struct echo_obd {
@@ -389,6 +410,23 @@ struct lov_obd {
         struct lov_tgt_desc *tgts;
 };
 
+struct lmv_tgt_desc {
+        struct obd_uuid         uuid;
+        struct obd_export       *exp;
+};
+
+struct lmv_obd {
+        int                     count;
+        int                     bufsize;
+        int                     refcount;
+        struct lmv_tgt_desc     *tgts;
+        struct obd_uuid         cluuid;
+        struct obd_export       *exp;
+        int                     connected;
+        int                     max_easize;
+        int                     max_cookiesize;
+};
+
 struct niobuf_local {
         __u64 offset;
         __u32 len;
@@ -462,6 +500,9 @@ enum llog_ctxt_id {
         LLOG_MAX_CTXTS
 };
 
+struct obd_llogs {
+        struct llog_ctxt        *llog_ctxt[LLOG_MAX_CTXTS];
+};
 
 /* corresponds to one of the obd's */
 struct obd_device {
@@ -472,9 +513,9 @@ struct obd_device {
         struct obd_uuid obd_uuid;
 
         int obd_minor;
-        unsigned int obd_attached:1, obd_set_up:1, obd_recovering:1,
-                obd_abort_recovery:1, obd_replayable:1, obd_no_transno:1,
-                obd_no_recov:1, obd_stopping:1;
+        int obd_attached:1, obd_set_up:1, obd_recovering:1,
+            obd_abort_recovery:1, obd_replayable:1, obd_no_transno:1,
+            obd_no_recov:1, obd_stopping:1;
         atomic_t obd_refcount;
         wait_queue_head_t obd_refcount_waitq;
         struct proc_dir_entry *obd_proc_entry;
@@ -489,9 +530,8 @@ struct obd_device {
         spinlock_t              obd_osfs_lock;
         struct obd_statfs       obd_osfs;
         unsigned long           obd_osfs_age;
-        struct lvfs_run_ctxt    obd_lvfs_ctxt;
-        struct llog_ctxt        *obd_llog_ctxt[LLOG_MAX_CTXTS];
-
+        struct obd_run_ctxt     obd_ctxt;
+        struct obd_llogs        obd_llogs;
         struct obd_device       *obd_observer;
         struct obd_export       *obd_self_export;
 
@@ -524,6 +564,7 @@ struct obd_device {
                 struct cache_obd cobd;
                 struct ptlbd_obd ptlbd;
                 struct mgmtcli_obd mgmtcli;
+                struct lmv_obd lmv;
         } u;
        /* Fields used by LProcFS */
         unsigned int           obd_cntr_base;
@@ -534,9 +575,12 @@ struct obd_device {
 
 #define OBD_OPT_FORCE           0x0001
 #define OBD_OPT_FAILOVER        0x0002
+#define OBD_OPT_REAL_CLIENT     0x0004
 
 #define OBD_LLOG_FL_SENDNOW     0x0001
 
+struct mdc_op_data;
+
 struct obd_ops {
         struct module *o_owner;
         int (*o_iocontrol)(unsigned int cmd, struct obd_export *exp, int len,
@@ -653,9 +697,10 @@ struct obd_ops {
         int (*o_destroy_export)(struct obd_export *exp);
 
         /* llog related obd_methods */
-        int (*o_llog_init)(struct obd_device *obd, struct obd_device *disk_obd,
-                           int count, struct llog_catid *logid);
-        int (*o_llog_finish)(struct obd_device *obd, int count);
+        int (*o_llog_init)(struct obd_device *, struct obd_llogs *,
+                           struct obd_device *, int, struct llog_catid *);
+        int (*o_llog_finish)(struct obd_device *, struct obd_llogs *, int);
+        int (*o_llog_connect)(struct obd_device *, struct llogd_conn_body *);
 
         /* metadata-only methods */
         int (*o_pin)(struct obd_export *, obd_id ino, __u32 gen, int type,
@@ -667,6 +712,8 @@ struct obd_ops {
 
         int (*o_notify)(struct obd_device *obd, struct obd_device *watched,
                         int active);
+        int (*o_init_ea_size)(struct obd_export *, int, int);
+
         /* 
          * NOTE: If adding ops, add another LPROCFS_OBD_OP_INIT() line
          * to lprocfs_alloc_obd_stats() in obdclass/lprocfs_status.c.
@@ -674,6 +721,56 @@ struct obd_ops {
          */
 };
 
+struct ll_uctxt;
+
+struct md_ops {
+        int (*m_getstatus)(struct obd_export *, struct ll_fid *);
+        int (*m_change_cbdata)(struct obd_export *, struct ll_fid *,
+                               ldlm_iterator_t, void *);
+        int (*m_change_cbdata_name)(struct obd_export *, struct ll_fid *,
+                                    char *, int, struct ll_fid *,
+                                    ldlm_iterator_t, void *);
+        int (*m_close)(struct obd_export *, struct obdo *,
+                       struct obd_client_handle *,
+                       struct ptlrpc_request **);
+        int (*m_create)(struct obd_export *, struct mdc_op_data *,
+                        const void *, int, int, __u32, __u32,
+                        __u64, struct ptlrpc_request **);
+        int (*m_done_writing)(struct obd_export *, struct obdo *);
+        int (*m_enqueue)(struct obd_export *, int, struct lookup_intent *,
+                         int, struct mdc_op_data *, struct lustre_handle *,
+                         void *, int, ldlm_completion_callback,
+                         ldlm_blocking_callback, void *);
+        int (*m_getattr)(struct obd_export *, struct ll_fid *,
+                         unsigned long, unsigned int,
+                         struct ptlrpc_request **);
+        int (*m_getattr_name)(struct obd_export *, struct ll_fid *,
+                              char *, int, unsigned long,
+                              unsigned int, struct ptlrpc_request **);
+        int (*m_intent_lock)(struct obd_export *, struct ll_uctxt *,
+                             struct ll_fid *, const char *, int,
+                             void *, int, struct ll_fid *,
+                             struct lookup_intent *, int,
+                             struct ptlrpc_request **,
+                             ldlm_blocking_callback);
+        int (*m_link)(struct obd_export *, struct mdc_op_data *,
+                      struct ptlrpc_request **);
+        int (*m_rename)(struct obd_export *, struct mdc_op_data *,
+                        const char *, int, const char *, int,
+                        struct ptlrpc_request **);
+        int (*m_setattr)(struct obd_export *, struct mdc_op_data *,
+                         struct iattr *, void *, int , void *, int,
+                         struct ptlrpc_request **);
+        int (*m_sync)(struct obd_export *, struct ll_fid *,
+                      struct ptlrpc_request **);
+        int (*m_readpage)(struct obd_export *, struct ll_fid *,
+                          __u64, struct page *, struct ptlrpc_request **);
+        int (*m_unlink)(struct obd_export *, struct mdc_op_data *,
+                        struct ptlrpc_request **);
+        int (*m_valid_attrs)(struct obd_export *, struct ll_fid *);
+        struct obd_device * (*m_get_real_obd)(struct obd_export *,
+                                              char *name, int len);
+};
 
 static inline void obd_transno_commit_cb(struct obd_device *obd, __u64 transno,
                                          int error)
diff --git a/lustre/include/linux/obd_class.h b/lustre/include/linux/obd_class.h
index cc508c3..98bb2d3 100644
--- a/lustre/include/linux/obd_class.h
+++ b/lustre/include/linux/obd_class.h
@@ -42,6 +42,7 @@
 #include <linux/lustre_lib.h>
 #include <linux/lustre_idl.h>
 #include <linux/lprocfs_status.h>
+#include <linux/lustre_mds.h>
 
 /* OBD Device Declarations */
 #define MAX_OBD_DEVICES 256
@@ -53,7 +54,8 @@ extern struct obd_device *class_exp2obd(struct obd_export *);
 
 /* genops.c */
 struct obd_export *class_conn2export(struct lustre_handle *);
-int class_register_type(struct obd_ops *ops, struct lprocfs_vars *, char *nm);
+int class_register_type(struct obd_ops *ops, struct md_ops *md_ops,
+                        struct lprocfs_vars *, char *nm);
 int class_unregister_type(char *nm);
 
 struct obd_device *class_newdev(int *dev);
@@ -193,6 +195,7 @@ static inline int obd_check_conn(struct lustre_handle *conn)
 
 #define OBT(dev)        (dev)->obd_type
 #define OBP(dev, op)    (dev)->obd_type->typ_ops->o_ ## op
+#define MDP(dev, op)    (dev)->obd_type->typ_md_ops->m_ ## op
 #define CTXTP(ctxt, op) (ctxt)->loc_logops->lop_##op
 
 /* Ensure obd_setup: used for disconnect which might be called while
@@ -292,11 +295,41 @@ do {                                                            \
                 LASSERT(coffset < obd->obd_stats->ls_num);      \
                 lprocfs_counter_incr(obd->obd_stats, coffset);  \
         }
+/* FIXME: real accounting here */
+#define MD_COUNTER_INCREMENT(obd, op)
 #else
 #define OBD_COUNTER_OFFSET(op)
 #define OBD_COUNTER_INCREMENT(obd, op)
+#define MD_COUNTER_INCREMENT(obd, op)
 #endif
 
+#define OBD_CHECK_MD_OP(obd, op, err)                           \
+do {                                                            \
+        if (!OBT(obd) || !MDP((obd), op)) {\
+                if (err)                                        \
+                        CERROR("obd_md" #op ": dev %d no operation\n",    \
+                               obd->obd_minor);                 \
+                RETURN(err);                                    \
+        }                                                       \
+} while (0)
+
+#define EXP_CHECK_MD_OP(exp, op)                                \
+do {                                                            \
+        if ((exp) == NULL) {                                    \
+                CERROR("obd_" #op ": NULL export\n");           \
+                RETURN(-ENODEV);                                \
+        }                                                       \
+        if ((exp)->exp_obd == NULL || !OBT((exp)->exp_obd)) {   \
+                CERROR("obd_" #op ": cleaned up obd\n");        \
+                RETURN(-EOPNOTSUPP);                            \
+        }                                                       \
+        if (!OBT((exp)->exp_obd) || !MDP((exp)->exp_obd, op)) { \
+                CERROR("obd_" #op ": dev %d no operation\n",    \
+                       (exp)->exp_obd->obd_minor);              \
+                RETURN(-EOPNOTSUPP);                            \
+        }                                                       \
+} while (0)
+
 #define OBD_CHECK_OP(obd, op, err)                              \
 do {                                                            \
         if (!OBT(obd) || !OBP((obd), op)) {\
@@ -600,7 +633,7 @@ obd_lvfs_fid2dentry(struct obd_export *exp, __u64 id_ino, __u32 gen, __u64 gr)
 {
         LASSERT(exp->exp_obd);
 
-        return lvfs_fid2dentry(&exp->exp_obd->obd_lvfs_ctxt, id_ino, gen, gr,
+        return lvfs_fid2dentry(&exp->exp_obd->obd_ctxt, id_ino, gen, gr,
                                exp->exp_obd);
 }
 
@@ -608,9 +641,6 @@ obd_lvfs_fid2dentry(struct obd_export *exp, __u64 id_ino, __u32 gen, __u64 gr)
 #define time_before(t1, t2) ((long)t2 - (long)t1 > 0)
 #endif
 
-/* @max_age is the oldest time in jiffies that we accept using a cached data.
- * If the cache is older than @max_age we will get a new value from the
- * target.  Use a value of "jiffies + HZ" to guarantee freshness. */
 static inline int obd_statfs(struct obd_device *obd, struct obd_statfs *osfs,
                              unsigned long max_age)
 {
@@ -626,12 +656,10 @@ static inline int obd_statfs(struct obd_device *obd, struct obd_statfs *osfs,
         CDEBUG(D_SUPER, "osfs %lu, max_age %lu\n", obd->obd_osfs_age, max_age);
         if (time_before(obd->obd_osfs_age, max_age)) {
                 rc = OBP(obd, statfs)(obd, osfs, max_age);
-                if (rc == 0) {
-                        spin_lock(&obd->obd_osfs_lock);
-                        memcpy(&obd->obd_osfs, osfs, sizeof(obd->obd_osfs));
-                        obd->obd_osfs_age = jiffies;
-                        spin_unlock(&obd->obd_osfs_lock);
-                }
+                spin_lock(&obd->obd_osfs_lock);
+                memcpy(&obd->obd_osfs, osfs, sizeof(obd->obd_osfs));
+                obd->obd_osfs_age = jiffies;
+                spin_unlock(&obd->obd_osfs_lock);
         } else {
                 CDEBUG(D_SUPER, "using cached obd_statfs data\n");
                 spin_lock(&obd->obd_osfs_lock);
@@ -985,6 +1013,23 @@ static inline void obd_import_event(struct obd_device *obd,
         }
 }
 
+static inline int obd_llog_connect(struct obd_device *obd,
+                                        struct llogd_conn_body *body)
+{
+        ENTRY;
+        if (!obd->obd_set_up) {
+                CERROR("obd %s not set up\n", obd->obd_name);
+                return -EINVAL;
+        }
+
+        if (!OBP(obd, llog_connect)) {
+                CERROR("obd %s has no llog_connect handler\n", obd->obd_name);
+                return -ENOSYS;
+        }
+
+        return OBP(obd, llog_connect)(obd, body);
+}
+
 static inline int obd_notify(struct obd_device *obd,
                              struct obd_device *watched,
                              int active)
@@ -1013,6 +1058,241 @@ static inline int obd_register_observer(struct obd_device *obd,
         RETURN(0);
 }
 
+static inline int obd_init_ea_size(struct obd_export *exp, int size, int size2)
+{
+        int rc;
+        ENTRY;
+        LASSERT(OBP(exp->exp_obd, init_ea_size) != NULL);
+        OBD_COUNTER_INCREMENT(exp->exp_obd, init_ea_size);
+        rc = OBP(exp->exp_obd, init_ea_size)(exp, size, size2);
+        RETURN(rc);
+}
+
+static inline int md_getstatus(struct obd_export *exp, struct ll_fid *fid)
+{
+        int rc;
+
+        EXP_CHECK_MD_OP(exp, getstatus);
+        MD_COUNTER_INCREMENT(exp->exp_obd, getstatus);
+        rc = MDP(exp->exp_obd, getstatus)(exp, fid);
+        RETURN(rc);
+}
+
+static inline int md_getattr(struct obd_export *exp, struct ll_fid *fid,
+                                  unsigned long valid, unsigned int ea_size,
+                                  struct ptlrpc_request **request)
+{
+        int rc;
+        EXP_CHECK_MD_OP(exp, getattr);
+        MD_COUNTER_INCREMENT(exp->exp_obd, getattr);
+        rc = MDP(exp->exp_obd, getattr)(exp, fid, valid, ea_size, request);
+        RETURN(rc);
+}
+
+static inline int md_change_cbdata(struct obd_export *exp, struct ll_fid *fid,
+                                   ldlm_iterator_t it, void *data)
+{
+        int rc;
+        ENTRY;
+        EXP_CHECK_MD_OP(exp, change_cbdata);
+        MD_COUNTER_INCREMENT(exp->exp_obd, change_cbdata);
+        rc = MDP(exp->exp_obd, change_cbdata)(exp, fid, it, data);
+        RETURN(rc);
+}
+
+static inline int md_change_cbdata_name(struct obd_export *exp,
+                                        struct ll_fid *fid, char *name,
+                                        int namelen, struct ll_fid *fid2,
+                                        ldlm_iterator_t it, void *data)
+{
+        int rc;
+        ENTRY;
+        EXP_CHECK_MD_OP(exp, change_cbdata_name);
+        MD_COUNTER_INCREMENT(exp->exp_obd, change_cbdata_name);
+        rc = MDP(exp->exp_obd, change_cbdata_name)(exp, fid, name, namelen,
+                                                   fid2, it, data);
+        RETURN(rc);
+}
+
+static inline int md_close(struct obd_export *exp, struct obdo *obdo,
+                                struct obd_client_handle *och,
+                                struct ptlrpc_request **request)
+{
+        int rc;
+        ENTRY;
+        EXP_CHECK_MD_OP(exp, close);
+        MD_COUNTER_INCREMENT(exp->exp_obd, close);
+        rc = MDP(exp->exp_obd, close)(exp, obdo, och, request);
+        RETURN(rc);
+}
+
+static inline int md_create(struct obd_export *exp, struct mdc_op_data *op_data,
+                            const void *data, int datalen, int mode,
+                            __u32 uid, __u32 gid, __u64 rdev,
+                            struct ptlrpc_request **request)
+{
+        int rc;
+        ENTRY;
+        EXP_CHECK_MD_OP(exp, create);
+        MD_COUNTER_INCREMENT(exp->exp_obd, create);
+        rc = MDP(exp->exp_obd, create)(exp, op_data, data, datalen, mode,
+                                       uid, gid, rdev, request);
+        RETURN(rc);
+}
+
+static inline int md_done_writing(struct obd_export *exp, struct obdo *obdo)
+{
+        int rc;
+        ENTRY;
+        EXP_CHECK_MD_OP(exp, done_writing);
+        MD_COUNTER_INCREMENT(exp->exp_obd, done_writing);
+        rc = MDP(exp->exp_obd, done_writing)(exp, obdo);
+        RETURN(rc);
+}
+
+static inline int md_enqueue(struct obd_export *exp, int lock_type,
+                             struct lookup_intent *it, int lock_mode,
+                             struct mdc_op_data *data,
+                             struct lustre_handle *lockh,
+                             void *lmm, int lmmsize,
+                             ldlm_completion_callback cb_completion,
+                             ldlm_blocking_callback cb_blocking,
+                             void *cb_data)
+{
+        int rc;
+        ENTRY;
+        EXP_CHECK_MD_OP(exp, enqueue);
+        MD_COUNTER_INCREMENT(exp->exp_obd, enqueue);
+        rc = MDP(exp->exp_obd, enqueue)(exp, lock_type, it, lock_mode,
+                                            data, lockh, lmm, lmmsize,
+                                            cb_completion, cb_blocking,
+                                            cb_data);
+        RETURN(rc);
+}
+
+static inline int md_getattr_name(struct obd_export *exp, struct ll_fid *fid,
+                                  char *filename, int namelen,
+                                  unsigned long valid, unsigned int ea_size,
+                                  struct ptlrpc_request **request)
+{
+        int rc;
+        ENTRY;
+        EXP_CHECK_MD_OP(exp, getattr_name);
+        MD_COUNTER_INCREMENT(exp->exp_obd, getattr_name);
+        rc = MDP(exp->exp_obd, getattr_name)(exp, fid, filename, namelen,
+                                             valid, ea_size, request);
+        RETURN(rc);
+}
+
+static inline int md_intent_lock(struct obd_export *exp, struct ll_uctxt *uctxt,
+                                 struct ll_fid *pfid, const char *name,
+                                 int len, void *lmm, int lmmsize,
+                                 struct ll_fid *cfid, struct lookup_intent *it,
+                                 int flags, struct ptlrpc_request **reqp,
+                                 ldlm_blocking_callback cb_blocking)
+{
+        int rc;
+        ENTRY;
+        EXP_CHECK_MD_OP(exp, intent_lock);
+        MD_COUNTER_INCREMENT(exp->exp_obd, intent_lock);
+        rc = MDP(exp->exp_obd, intent_lock)(exp, uctxt, pfid, name, len,
+                                            lmm, lmmsize, cfid, it, flags,
+                                            reqp, cb_blocking);
+        RETURN(rc);
+}
+
+static inline int md_link(struct obd_export *exp, struct mdc_op_data *data,
+                               struct ptlrpc_request **request)
+{
+        int rc;
+        ENTRY;
+        EXP_CHECK_MD_OP(exp, link);
+        MD_COUNTER_INCREMENT(exp->exp_obd, link);
+        rc = MDP(exp->exp_obd, link)(exp, data, request);
+        RETURN(rc);
+}
+
+static inline int md_rename(struct obd_export *exp,
+                                 struct mdc_op_data *data,
+                                 const char *old, int oldlen,
+                                 const char *new, int newlen,
+                                 struct ptlrpc_request **request)
+{
+        int rc;
+        ENTRY;
+        EXP_CHECK_MD_OP(exp, rename);
+        MD_COUNTER_INCREMENT(exp->exp_obd, rename);
+        rc = MDP(exp->exp_obd, rename)(exp, data, old, oldlen, new,
+                                       newlen, request);
+        RETURN(rc);
+}
+
+static inline int md_setattr(struct obd_export *exp, struct mdc_op_data *data,
+                             struct iattr *iattr, void *ea, int ealen,
+                             void *ea2, int ea2len,
+                             struct ptlrpc_request **request)
+{
+        int rc;
+        ENTRY;
+        EXP_CHECK_MD_OP(exp, setattr);
+        MD_COUNTER_INCREMENT(exp->exp_obd, setattr);
+        rc = MDP(exp->exp_obd, setattr)(exp, data, iattr, ea, ealen,
+                                        ea2, ea2len, request);
+        RETURN(rc);
+}
+
+static inline int md_sync(struct obd_export *exp, struct ll_fid *fid,
+                               struct ptlrpc_request **request)
+{
+        int rc;
+        ENTRY;
+        EXP_CHECK_MD_OP(exp, sync);
+        MD_COUNTER_INCREMENT(exp->exp_obd, sync);
+        rc = MDP(exp->exp_obd, sync)(exp, fid, request);
+        RETURN(rc);
+}
+
+static inline int md_readpage(struct obd_export *exp, struct ll_fid *fid,
+                              __u64 offset, struct page *page,
+                              struct ptlrpc_request **request)
+{
+        int rc;
+        ENTRY;
+        EXP_CHECK_MD_OP(exp, readpage);
+        MD_COUNTER_INCREMENT(exp->exp_obd, readpage);
+        rc = MDP(exp->exp_obd, readpage)(exp, fid, offset, page, request);
+        RETURN(rc);
+}
+
+static inline int md_unlink(struct obd_export *exp, struct mdc_op_data *data,
+                            struct ptlrpc_request **request)
+{
+        int rc;
+        ENTRY;
+        EXP_CHECK_MD_OP(exp, unlink);
+        MD_COUNTER_INCREMENT(exp->exp_obd, unlink);
+        rc = MDP(exp->exp_obd, unlink)(exp, data, request);
+        RETURN(rc);
+}
+
+static inline struct obd_device * md_get_real_obd(struct obd_export *exp,
+                                                  char *name, int len)
+{
+        ENTRY;
+        if (MDP(exp->exp_obd, get_real_obd) == NULL)
+                return exp->exp_obd;
+        MD_COUNTER_INCREMENT(exp->exp_obd, get_real_obd);
+        return MDP(exp->exp_obd, get_real_obd)(exp, name, len);
+}
+
+static inline int md_valid_attrs(struct obd_export *exp, struct ll_fid *fid)
+{
+        ENTRY;
+        EXP_CHECK_MD_OP(exp, valid_attrs);
+        MD_COUNTER_INCREMENT(exp->exp_obd, valid_attrs);
+        return MDP(exp->exp_obd, valid_attrs)(exp, fid);
+}
+
 /* OBD Metadata Support */
 
 extern int obd_init_caches(void);
@@ -1063,9 +1343,13 @@ typedef __u8 class_uuid_t[16];
 void class_uuid_unparse(class_uuid_t in, struct obd_uuid *out);
 
 /* lustre_peer.c    */
-int lustre_uuid_to_peer(char *uuid, __u32 *peer_nal, ptl_nid_t *peer_nid);
+int lustre_uuid_to_peer(char *uuid, ptl_handle_ni_t *peer_ni, ptl_nid_t *peer_nid);
 int class_add_uuid(char *uuid, __u64 nid, __u32 nal);
 int class_del_uuid (char *uuid);
 void class_init_uuidlist(void);
 void class_exit_uuidlist(void);
+
+/* mea.c */
+int mea_name2idx(struct mea *mea, char *name, int namelen);
+
 #endif /* __LINUX_OBD_CLASS_H */
diff --git a/lustre/include/linux/obd_lmv.h b/lustre/include/linux/obd_lmv.h
new file mode 100644
index 0000000..a3dc652
--- /dev/null
+++ b/lustre/include/linux/obd_lmv.h
@@ -0,0 +1,11 @@
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
+ */
+
+#ifndef _OBD_LMV_H__
+#define _OBD_LMV_H__
+
+#define OBD_LMV_DEVICENAME "lmv"
+
+
+#endif
diff --git a/lustre/include/linux/obd_support.h b/lustre/include/linux/obd_support.h
index 9d7957e..a186aa3 100644
--- a/lustre/include/linux/obd_support.h
+++ b/lustre/include/linux/obd_support.h
@@ -113,8 +113,6 @@ extern wait_queue_head_t obd_race_waitq;
 #define OBD_FAIL_LDLM_BL_CALLBACK        0x305
 #define OBD_FAIL_LDLM_CP_CALLBACK        0x306
 #define OBD_FAIL_LDLM_GL_CALLBACK        0x307
-#define OBD_FAIL_LDLM_ENQUEUE_EXTENT_ERR 0x308
-#define OBD_FAIL_LDLM_ENQUEUE_INTENT_ERR 0x309
 
 #define OBD_FAIL_OSC                     0x400
 #define OBD_FAIL_OSC_BRW_READ_BULK       0x401
diff --git a/lustre/include/lustre/liblustreapi.h b/lustre/include/lustre/liblustreapi.h
deleted file mode 100644
index 350bd09..0000000
--- a/lustre/include/lustre/liblustreapi.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
- *  Copyright (C) 2002 Cluster File Systems, Inc.
- *   Author: Peter J. Braam <braam@clusterfs.com>
- *   Author: Phil Schwan <phil@clusterfs.com>
- *   Author: Brian Behlendorf <behlendorf1@llnl.gov> 
- *   Author: Robert Read <rread@clusterfs.com> 
- *
- *   This file is part of Lustre, http://www.lustre.org.
- *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
- *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-#ifndef _LIBLUSTREAPI_H_
-#define _LIBLUSTREAPI_H_
-
-#include <lustre/lustre_user.h>
-
-/* liblustreapi.c */
-extern int llapi_file_create(char *name, long stripe_size, int stripe_offset,
-                             int stripe_count, int stripe_pattern);
-extern int llapi_file_get_stripe(char *path, struct lov_user_md *lum);
-extern int llapi_find(char *path, struct obd_uuid *obduuid, int recursive,
-                      int verbose, int quiet);
-extern int llapi_target_check(int num_types, char **obd_types, char *dir);
-extern int llapi_catinfo(char *dir, char *keyword, char *node_name);
-extern int llapi_lov_get_uuids(int fd, struct obd_uuid *uuidp, int *ost_count);
-extern int llapi_is_lustre_mnttype(char *type);
-
-#endif
diff --git a/lustre/install-sh b/lustre/install-sh
new file mode 100755
index 0000000..e9de238
--- /dev/null
+++ b/lustre/install-sh
@@ -0,0 +1,251 @@
+#!/bin/sh
+#
+# install - install a program, script, or datafile
+# This comes from X11R5 (mit/util/scripts/install.sh).
+#
+# Copyright 1991 by the Massachusetts Institute of Technology
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of M.I.T. not be used in advertising or
+# publicity pertaining to distribution of the software without specific,
+# written prior permission.  M.I.T. makes no representations about the
+# suitability of this software for any purpose.  It is provided "as is"
+# without express or implied warranty.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+transformbasename=""
+transform_arg=""
+instcmd="$mvprog"
+chmodcmd="$chmodprog 0755"
+chowncmd=""
+chgrpcmd=""
+stripcmd=""
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=""
+dst=""
+dir_arg=""
+
+while [ x"$1" != x ]; do
+    case $1 in
+	-c) instcmd="$cpprog"
+	    shift
+	    continue;;
+
+	-d) dir_arg=true
+	    shift
+	    continue;;
+
+	-m) chmodcmd="$chmodprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-o) chowncmd="$chownprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-g) chgrpcmd="$chgrpprog $2"
+	    shift
+	    shift
+	    continue;;
+
+	-s) stripcmd="$stripprog"
+	    shift
+	    continue;;
+
+	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+	    shift
+	    continue;;
+
+	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+	    shift
+	    continue;;
+
+	*)  if [ x"$src" = x ]
+	    then
+		src=$1
+	    else
+		# this colon is to work around a 386BSD /bin/sh bug
+		:
+		dst=$1
+	    fi
+	    shift
+	    continue;;
+    esac
+done
+
+if [ x"$src" = x ]
+then
+	echo "install:	no input file specified"
+	exit 1
+else
+	true
+fi
+
+if [ x"$dir_arg" != x ]; then
+	dst=$src
+	src=""
+	
+	if [ -d $dst ]; then
+		instcmd=:
+		chmodcmd=""
+	else
+		instcmd=mkdir
+	fi
+else
+
+# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+# might cause directories to be created, which would be especially bad 
+# if $src (and thus $dsttmp) contains '*'.
+
+	if [ -f $src -o -d $src ]
+	then
+		true
+	else
+		echo "install:  $src does not exist"
+		exit 1
+	fi
+	
+	if [ x"$dst" = x ]
+	then
+		echo "install:	no destination specified"
+		exit 1
+	else
+		true
+	fi
+
+# If destination is a directory, append the input filename; if your system
+# does not like double slashes in filenames, you may need to add some logic
+
+	if [ -d $dst ]
+	then
+		dst="$dst"/`basename $src`
+	else
+		true
+	fi
+fi
+
+## this sed command emulates the dirname command
+dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+
+# Make sure that the destination directory exists.
+#  this part is taken from Noah Friedman's mkinstalldirs script
+
+# Skip lots of stat calls in the usual case.
+if [ ! -d "$dstdir" ]; then
+defaultIFS='	
+'
+IFS="${IFS-${defaultIFS}}"
+
+oIFS="${IFS}"
+# Some sh's can't handle IFS=/ for some reason.
+IFS='%'
+set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
+IFS="${oIFS}"
+
+pathcomp=''
+
+while [ $# -ne 0 ] ; do
+	pathcomp="${pathcomp}${1}"
+	shift
+
+	if [ ! -d "${pathcomp}" ] ;
+        then
+		$mkdirprog "${pathcomp}"
+	else
+		true
+	fi
+
+	pathcomp="${pathcomp}/"
+done
+fi
+
+if [ x"$dir_arg" != x ]
+then
+	$doit $instcmd $dst &&
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+else
+
+# If we're going to rename the final executable, determine the name now.
+
+	if [ x"$transformarg" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		dstfile=`basename $dst $transformbasename | 
+			sed $transformarg`$transformbasename
+	fi
+
+# don't allow the sed command to completely eliminate the filename
+
+	if [ x"$dstfile" = x ] 
+	then
+		dstfile=`basename $dst`
+	else
+		true
+	fi
+
+# Make a temp file name in the proper directory.
+
+	dsttmp=$dstdir/#inst.$$#
+
+# Move or copy the file name to the temp name
+
+	$doit $instcmd $src $dsttmp &&
+
+	trap "rm -f ${dsttmp}" 0 &&
+
+# and set any options; do chmod last to preserve setuid bits
+
+# If any of these fail, we abort the whole thing.  If we want to
+# ignore errors from any of these, just make sure not to ignore
+# errors from the above "$doit $instcmd $src $dsttmp" command.
+
+	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
+	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+
+# Now rename the file to the real destination.
+
+	$doit $rmcmd -f $dstdir/$dstfile &&
+	$doit $mvcmd $dsttmp $dstdir/$dstfile 
+
+fi &&
+
+
+exit 0
diff --git a/lustre/kernel-tests/.cvsignore b/lustre/kernel-tests/.cvsignore
deleted file mode 100644
index 124a2771..0000000
--- a/lustre/kernel-tests/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.*.cmd
-.*.flags
-*.ko
-*.c
-.tmp_versions
diff --git a/lustre/kernel-tests/Makefile b/lustre/kernel-tests/Makefile
deleted file mode 100644
index 7360935..0000000
--- a/lustre/kernel-tests/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-ifeq ($(PATCHLEVEL),)
-
-ifneq ($(LUSTRE_LINUX_CONFIG),)
-include $(LUSTRE_LINUX_CONFIG)
-endif
-include Makefile
-
-else
-
-ifneq ($(LUSTRE_KERNEL_TEST),)
-ifeq ($(PATCHLEVEL),4)
-all: $(LUSTRE_KERNEL_TEST)
-else
-extra-y = $(LUSTRE_KERNEL_TEST)
-endif
-endif
-
-obj-m := conftest.o
-
-ifeq ($(PATCHLEVEL),4)
-include $(TOPDIR)/Rules.make
-endif
-
-endif
diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.18-chaos-2.4.18-i686-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.18-chaos-2.4.18-i686-smp.config
deleted file mode 100644
index db8f485..0000000
--- a/lustre/kernel_patches/kernel_configs/kernel-2.4.18-chaos-2.4.18-i686-smp.config
+++ /dev/null
@@ -1,1103 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-CONFIG_X86=y
-CONFIG_ISA=y
-# CONFIG_SBUS is not set
-CONFIG_UID16=y
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-CONFIG_MODVERSIONS=y
-CONFIG_KMOD=y
-
-#
-# Processor type and features
-#
-CONFIG_LOLAT=y
-# CONFIG_LOLAT_SYSCTL is not set
-# CONFIG_M386 is not set
-# CONFIG_M486 is not set
-# CONFIG_M586 is not set
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-# CONFIG_M686 is not set
-# CONFIG_MPENTIUMIII is not set
-CONFIG_MPENTIUM4=y
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MELAN is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP2 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MCYRIXIII is not set
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_INVLPG=y
-CONFIG_X86_CMPXCHG=y
-CONFIG_X86_XADD=y
-CONFIG_X86_BSWAP=y
-CONFIG_X86_POPAD_OK=y
-# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_X86_L1_CACHE_SHIFT=7
-CONFIG_X86_TSC=y
-CONFIG_X86_GOOD_APIC=y
-CONFIG_X86_PGE=y
-CONFIG_X86_USE_PPRO_CHECKSUM=y
-CONFIG_X86_MCE=y
-# CONFIG_CPU_FREQ is not set
-# CONFIG_USE_IRQ_STACKS is not set
-# CONFIG_TOSHIBA is not set
-# CONFIG_I8K is not set
-CONFIG_MICROCODE=m
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-# CONFIG_E820_PROC is not set
-# CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
-CONFIG_HIGHMEM=y
-CONFIG_HIGHIO=y
-# CONFIG_MATH_EMULATION is not set
-CONFIG_MTRR=y
-CONFIG_SMP=y
-# CONFIG_MULTIQUAD is not set
-CONFIG_HAVE_DEC_LOCK=y
-
-#
-# General setup
-#
-CONFIG_HZ=100
-CONFIG_NET=y
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_PCI=y
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GODIRECT is not set
-CONFIG_PCI_GOANY=y
-CONFIG_PCI_BIOS=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_NAMES=y
-
-#
-# Performance-monitoring counters support
-#
-CONFIG_PERFCTR=m
-CONFIG_KPERFCTR=y
-# CONFIG_PERFCTR_DEBUG is not set
-# CONFIG_PERFCTR_INIT_TESTS is not set
-CONFIG_PERFCTR_VIRTUAL=y
-CONFIG_PERFCTR_GLOBAL=y
-# CONFIG_EISA is not set
-# CONFIG_MCA is not set
-# CONFIG_HOTPLUG is not set
-# CONFIG_PCMCIA is not set
-# CONFIG_HOTPLUG_PCI is not set
-CONFIG_SYSVIPC=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_SYSCTL=y
-CONFIG_KCORE_ELF=y
-# CONFIG_KCORE_AOUT is not set
-CONFIG_BINFMT_AOUT=m
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_MISC=m
-# CONFIG_IKCONFIG is not set
-CONFIG_PM=y
-
-#
-# Additional device driver support
-#
-# CONFIG_CIPE is not set
-# CONFIG_CRYPTO_AEP is not set
-# CONFIG_MEGARAC is not set
-CONFIG_FC_QLA2200=m
-CONFIG_FC_QLA2300=m
-# CONFIG_SCSI_ISCSI is not set
-CONFIG_IBMASM=m
-CONFIG_IBMSER=m
-CONFIG_NEW_DIGI_EPCA=m
-CONFIG_NVIDIA=m
-# CONFIG_ACPI is not set
-CONFIG_APM=y
-CONFIG_APM_IGNORE_USER_SUSPEND=y
-# CONFIG_APM_DO_ENABLE is not set
-# CONFIG_APM_CPU_IDLE is not set
-# CONFIG_APM_DISPLAY_BLANK is not set
-CONFIG_APM_RTC_IS_GMT=y
-# CONFIG_APM_ALLOW_INTS is not set
-# CONFIG_APM_REAL_MODE_POWER_OFF is not set
-
-#
-# Binary emulation of other systems
-#
-# CONFIG_ABI is not set
-# CONFIG_ABI_SVR4 is not set
-
-#
-# Support for foreign binary formats
-#
-# CONFIG_BINFMT_COFF is not set
-# CONFIG_BINFMT_XOUT is not set
-# CONFIG_BINFMT_XOUT_X286 is not set
-
-#
-# Memory Technology Devices (MTD)
-#
-CONFIG_MTD=y
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_PARTITIONS is not set
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_CMDLINE_PARTS is not set
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=m
-# CONFIG_MTD_BLOCK is not set
-# CONFIG_MTD_BLOCK_RO is not set
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-# CONFIG_MTD_CFI is not set
-CONFIG_MTD_JEDECPROBE=y
-CONFIG_MTD_GEN_PROBE=y
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_GEOMETRY=y
-CONFIG_MTD_CFI_B1=y
-# CONFIG_MTD_CFI_B2 is not set
-# CONFIG_MTD_CFI_B4 is not set
-# CONFIG_MTD_CFI_B8 is not set
-CONFIG_MTD_CFI_I1=y
-# CONFIG_MTD_CFI_I2 is not set
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_CFI_AMDSTD=y
-# CONFIG_MTD_RAM is not set
-CONFIG_MTD_ROM=y
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
-# CONFIG_MTD_AMDSTD is not set
-# CONFIG_MTD_SHARP is not set
-# CONFIG_MTD_JEDEC is not set
-
-#
-# Mapping drivers for chip access
-#
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PNC2000 is not set
-# CONFIG_MTD_SC520CDP is not set
-# CONFIG_MTD_NETSC520 is not set
-# CONFIG_MTD_SBC_GXX is not set
-# CONFIG_MTD_ELAN_104NC is not set
-# CONFIG_MTD_DILNETPC is not set
-# CONFIG_MTD_MIXMEM is not set
-# CONFIG_MTD_OCTAGON is not set
-# CONFIG_MTD_VMAX is not set
-# CONFIG_MTD_L440GX is not set
-# CONFIG_MTD_AMD766ROM is not set
-CONFIG_MTD_ICH2ROM=m
-# CONFIG_MTD_PCI is not set
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLKMTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOC1000 is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOCPROBE is not set
-
-#
-# NAND Flash Device Drivers
-#
-# CONFIG_MTD_NAND is not set
-
-#
-# Parallel port support
-#
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_PC_CML1=m
-# CONFIG_PARPORT_SERIAL is not set
-# CONFIG_PARPORT_PC_FIFO is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-# CONFIG_PARPORT_AMIGA is not set
-# CONFIG_PARPORT_MFC3 is not set
-# CONFIG_PARPORT_ATARI is not set
-# CONFIG_PARPORT_GSC is not set
-# CONFIG_PARPORT_SUNBPP is not set
-# CONFIG_PARPORT_OTHER is not set
-CONFIG_PARPORT_1284=y
-
-#
-# Plug and Play configuration
-#
-CONFIG_PNP=y
-CONFIG_ISAPNP=y
-# CONFIG_PNPBIOS is not set
-
-#
-# Block devices
-#
-CONFIG_BLK_DEV_FD=y
-# CONFIG_BLK_DEV_XD is not set
-# CONFIG_PARIDE is not set
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_CISS_SCSI_TAPE is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_NBD=m
-# CONFIG_BLK_DEV_ENBD is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_INITRD=y
-
-#
-# Multi-device support (RAID and LVM)
-#
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-# CONFIG_MD_LINEAR is not set
-# CONFIG_MD_RAID0 is not set
-# CONFIG_MD_RAID1 is not set
-# CONFIG_MD_RAID5 is not set
-# CONFIG_MD_MULTIPATH is not set
-CONFIG_BLK_DEV_LVM=m
-
-#
-# Cryptography support (CryptoAPI)
-#
-# CONFIG_CRYPTO is not set
-# CONFIG_CIPHERS is not set
-# CONFIG_CRYPTODEV is not set
-# CONFIG_CRYPTOLOOP is not set
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_NETLINK_DEV=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_FILTER=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-# CONFIG_TUX is not set
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_FWMARK=y
-CONFIG_IP_ROUTE_NAT=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_TOS=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_LARGE_TABLES=y
-# CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
-# CONFIG_INET_ECN is not set
-CONFIG_SYN_COOKIES=y
-
-#
-#   IP: Netfilter Configuration
-#
-CONFIG_IP_NF_CONNTRACK=m
-# CONFIG_IP_NF_FTP is not set
-# CONFIG_IP_NF_IRC is not set
-# CONFIG_IP_NF_QUEUE is not set
-CONFIG_IP_NF_IPTABLES=m
-# CONFIG_IP_NF_MATCH_LIMIT is not set
-# CONFIG_IP_NF_MATCH_MAC is not set
-# CONFIG_IP_NF_MATCH_MARK is not set
-# CONFIG_IP_NF_MATCH_MULTIPORT is not set
-# CONFIG_IP_NF_MATCH_TOS is not set
-# CONFIG_IP_NF_MATCH_AH_ESP is not set
-# CONFIG_IP_NF_MATCH_LENGTH is not set
-# CONFIG_IP_NF_MATCH_TTL is not set
-# CONFIG_IP_NF_MATCH_TCPMSS is not set
-CONFIG_IP_NF_MATCH_STATE=m
-# CONFIG_IP_NF_MATCH_UNCLEAN is not set
-CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_FILTER=m
-# CONFIG_IP_NF_TARGET_REJECT is not set
-# CONFIG_IP_NF_TARGET_MIRROR is not set
-# CONFIG_IP_NF_NAT is not set
-# CONFIG_IP_NF_MANGLE is not set
-CONFIG_IP_NF_TARGET_LOG=m
-# CONFIG_IP_NF_TARGET_ULOG is not set
-# CONFIG_IP_NF_TARGET_TCPMSS is not set
-# CONFIG_IP_NF_ARPTABLES is not set
-# CONFIG_IP_NF_COMPAT_IPCHAINS is not set
-# CONFIG_IP_NF_COMPAT_IPFWADM is not set
-
-#
-#   IP: Virtual Server Configuration
-#
-# CONFIG_IP_VS is not set
-# CONFIG_IPV6 is not set
-CONFIG_KHTTPD=m
-# CONFIG_ATM is not set
-# CONFIG_VLAN_8021Q is not set
-
-#
-#  
-#
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-
-#
-# Appletalk devices
-#
-# CONFIG_DEV_APPLETALK is not set
-# CONFIG_DECNET is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_LLC is not set
-# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_NET_FASTROUTE is not set
-# CONFIG_NET_HW_FLOWCONTROL is not set
-
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-
-#
-# Network testing
-#
-CONFIG_NET_PKTGEN=m
-
-#
-# Telephony Support
-#
-# CONFIG_PHONE is not set
-# CONFIG_PHONE_IXJ is not set
-# CONFIG_PHONE_IXJ_PCMCIA is not set
-
-#
-# ATA/IDE/MFM/RLL support
-#
-CONFIG_IDE=y
-
-#
-# IDE, ATA and ATAPI Block devices
-#
-CONFIG_BLK_DEV_IDE=y
-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_HD_IDE is not set
-# CONFIG_BLK_DEV_HD is not set
-CONFIG_BLK_DEV_IDEDISK=y
-CONFIG_IDEDISK_MULTI_MODE=y
-# CONFIG_IDEDISK_STROKE is not set
-# CONFIG_BLK_DEV_IDEDISK_VENDOR is not set
-# CONFIG_BLK_DEV_IDEDISK_FUJITSU is not set
-# CONFIG_BLK_DEV_IDEDISK_IBM is not set
-# CONFIG_BLK_DEV_IDEDISK_MAXTOR is not set
-# CONFIG_BLK_DEV_IDEDISK_QUANTUM is not set
-# CONFIG_BLK_DEV_IDEDISK_SEAGATE is not set
-# CONFIG_BLK_DEV_IDEDISK_WD is not set
-# CONFIG_BLK_DEV_COMMERIAL is not set
-# CONFIG_BLK_DEV_TIVO is not set
-# CONFIG_BLK_DEV_IDECS is not set
-CONFIG_BLK_DEV_IDECD=m
-# CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_BLK_DEV_IDEFLOPPY=y
-# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-
-#
-# IDE chipset support/bugfixes
-#
-# CONFIG_BLK_DEV_CMD640 is not set
-# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-CONFIG_BLK_DEV_ISAPNP=y
-# CONFIG_BLK_DEV_RZ1000 is not set
-CONFIG_BLK_DEV_IDEPCI=y
-CONFIG_IDEPCI_SHARE_IRQ=y
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-CONFIG_IDEDMA_PCI_AUTO=y
-# CONFIG_IDEDMA_ONLYDISK is not set
-CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_IDEDMA_PCI_WIP is not set
-# CONFIG_BLK_DEV_IDEDMA_TIMEOUT is not set
-# CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set
-CONFIG_BLK_DEV_ADMA=y
-CONFIG_BLK_DEV_AEC62XX=y
-CONFIG_AEC62XX_TUNING=y
-CONFIG_BLK_DEV_ALI15X3=y
-# CONFIG_WDC_ALI15X3 is not set
-CONFIG_BLK_DEV_AMD74XX=y
-# CONFIG_AMD74XX_OVERRIDE is not set
-CONFIG_BLK_DEV_CMD64X=y
-CONFIG_BLK_DEV_CMD680=y
-CONFIG_BLK_DEV_CY82C693=y
-CONFIG_BLK_DEV_CS5530=y
-CONFIG_BLK_DEV_HPT34X=y
-# CONFIG_HPT34X_AUTODMA is not set
-CONFIG_BLK_DEV_HPT366=y
-CONFIG_BLK_DEV_PIIX=y
-CONFIG_PIIX_TUNING=y
-# CONFIG_BLK_DEV_NS87415 is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-# CONFIG_BLK_DEV_ADMA100 is not set
-CONFIG_BLK_DEV_PDC202XX=y
-# CONFIG_PDC202XX_BURST is not set
-# CONFIG_PDC202XX_FORCE is not set
-CONFIG_BLK_DEV_SVWKS=y
-CONFIG_BLK_DEV_SIS5513=y
-CONFIG_BLK_DEV_SLC90E66=y
-# CONFIG_BLK_DEV_TRM290 is not set
-CONFIG_BLK_DEV_VIA82CXXX=y
-CONFIG_BLK_DEV_CENATEK=y
-# CONFIG_IDE_CHIPSETS is not set
-# CONFIG_BLK_DEV_ELEVATOR_NOOP is not set
-CONFIG_IDEDMA_AUTO=y
-# CONFIG_IDEDMA_IVB is not set
-# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
-# CONFIG_BLK_DEV_ATARAID is not set
-# CONFIG_BLK_DEV_ATARAID_PDC is not set
-# CONFIG_BLK_DEV_ATARAID_HPT is not set
-
-#
-# SCSI support
-#
-CONFIG_SCSI=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-CONFIG_SD_EXTRA_DEVS=40
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_CHR_DEV_OSST is not set
-CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_SR_EXTRA_DEVS=4
-CONFIG_CHR_DEV_SG=m
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
-# CONFIG_SCSI_DEBUG_QUEUES is not set
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-
-#
-# SCSI low-level drivers
-#
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_SCSI_7000FASST is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AHA1542 is not set
-# CONFIG_SCSI_AHA1740 is not set
-# CONFIG_SCSI_AACRAID is not set
-CONFIG_SCSI_AIC7XXX=y
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=253
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_PROBE_EISA_VL is not set
-# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
-# CONFIG_SCSI_AIC79XX is not set
-CONFIG_SCSI_DPT_I2O=y
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_IN2000 is not set
-# CONFIG_SCSI_AM53C974 is not set
-# CONFIG_SCSI_MEGARAID is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_CPQFCTS is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_EATA_DMA is not set
-# CONFIG_SCSI_EATA_PIO is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_PPA is not set
-# CONFIG_SCSI_IMM is not set
-# CONFIG_SCSI_NCR53C406A is not set
-# CONFIG_SCSI_NCR53C7xx is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_NCR53C8XX is not set
-# CONFIG_SCSI_SYM53C8XX is not set
-# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_PCI2000 is not set
-# CONFIG_SCSI_PCI2220I is not set
-# CONFIG_SCSI_PSI240I is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_QLOGIC_ISP is not set
-# CONFIG_SCSI_QLOGIC_FC is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_NEWISP is not set
-# CONFIG_SCSI_SEAGATE is not set
-# CONFIG_SCSI_SIM710 is not set
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_ULTRASTOR is not set
-CONFIG_SCSI_DEBUG=m
-
-#
-# Fusion MPT device support
-#
-CONFIG_FUSION=y
-CONFIG_FUSION_BOOT=y
-CONFIG_FUSION_ISENSE=m
-CONFIG_FUSION_CTL=m
-# CONFIG_FUSION_LAN is not set
-
-#
-# IEEE 1394 (FireWire) support (EXPERIMENTAL)
-#
-# CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
-# CONFIG_I2O is not set
-# CONFIG_I2O_PCI is not set
-# CONFIG_I2O_BLOCK is not set
-# CONFIG_I2O_LAN is not set
-# CONFIG_I2O_SCSI is not set
-# CONFIG_I2O_PROC is not set
-
-#
-# Network device support
-#
-CONFIG_NETDEVICES=y
-
-#
-# ARCnet devices
-#
-# CONFIG_ARCNET is not set
-CONFIG_DUMMY=m
-# CONFIG_BONDING is not set
-# CONFIG_EQUALIZER is not set
-CONFIG_TUN=m
-# CONFIG_ETHERTAP is not set
-# CONFIG_NET_SB1000 is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-# CONFIG_SUNLANCE is not set
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_SUNBMAC is not set
-# CONFIG_SUNQE is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_LANCE is not set
-# CONFIG_NET_VENDOR_SMC is not set
-# CONFIG_NET_VENDOR_RACAL is not set
-# CONFIG_AT1700 is not set
-# CONFIG_DEPCA is not set
-# CONFIG_HP100 is not set
-# CONFIG_NET_ISA is not set
-CONFIG_NET_PCI=y
-# CONFIG_PCNET32 is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_AC3200 is not set
-# CONFIG_APRICOT is not set
-# CONFIG_CS89x0 is not set
-CONFIG_TULIP=m
-# CONFIG_TC35815 is not set
-# CONFIG_TULIP_MWI is not set
-CONFIG_TULIP_MMIO=y
-CONFIG_DE4X5=m
-# CONFIG_DGRS is not set
-# CONFIG_DM9102 is not set
-CONFIG_EEPRO100=m
-CONFIG_NET_E100=m
-# CONFIG_LNE390 is not set
-# CONFIG_FEALNX is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_NE3210 is not set
-# CONFIG_ES3210 is not set
-# CONFIG_8139CP is not set
-# CONFIG_8139TOO is not set
-# CONFIG_8139TOO_PIO is not set
-# CONFIG_8139TOO_TUNE_TWISTER is not set
-# CONFIG_8139TOO_8129 is not set
-# CONFIG_8139_NEW_RX_RESET is not set
-# CONFIG_SIS900 is not set
-# CONFIG_SIS900_OLD is not set
-# CONFIG_EPIC100 is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_TLAN is not set
-# CONFIG_VIA_RHINE is not set
-# CONFIG_VIA_RHINE_MMIO is not set
-# CONFIG_WINBOND_840 is not set
-# CONFIG_NET_POCKET is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-# CONFIG_DL2K is not set
-# CONFIG_MYRI_SBUS is not set
-CONFIG_NS83820=m
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_SK98LIN is not set
-CONFIG_NET_BROADCOM=m
-CONFIG_TIGON3=m
-CONFIG_NET_E1000=m
-# CONFIG_FDDI is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_HIPPI is not set
-# CONFIG_PLIP is not set
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Token Ring devices
-#
-# CONFIG_TR is not set
-# CONFIG_NET_FC is not set
-# CONFIG_RCPCI is not set
-# CONFIG_SHAPER is not set
-
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-
-#
-# Quadrics Supercomputers
-#
-
-#
-# QsNet
-#
-CONFIG_QUADRICS=y
-CONFIG_QSNETMOD=m
-CONFIG_ELAN3MOD=m
-CONFIG_EPMOD=m
-CONFIG_EIPMOD=m
-CONFIG_RMSMOD=m
-CONFIG_JTAG=m
-
-#
-# QsNet II
-#
-
-#
-# Amateur Radio support
-#
-# CONFIG_HAMRADIO is not set
-
-#
-# IrDA (infrared) support
-#
-# CONFIG_IRDA is not set
-
-#
-# ISDN subsystem
-#
-# CONFIG_ISDN is not set
-CONFIG_KALLSYMS=y
-
-#
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
-# CONFIG_CD_NO_IDESCSI is not set
-
-#
-# Input core support
-#
-# CONFIG_INPUT is not set
-# CONFIG_INPUT_KEYBDEV is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-
-#
-# Character devices
-#
-CONFIG_ECC=m
-CONFIG_CHAOSTEST=m
-CONFIG_P4THERM=m
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_SERIAL=y
-CONFIG_SERIAL_CONSOLE=y
-CONFIG_SERIAL_EXTENDED=y
-# CONFIG_SERIAL_MANY_PORTS is not set
-CONFIG_SERIAL_SHARE_IRQ=y
-# CONFIG_SERIAL_DETECT_IRQ is not set
-# CONFIG_SERIAL_MULTIPORT is not set
-# CONFIG_HUB6 is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX98_PTY_COUNT=2048
-# CONFIG_PRINTER is not set
-# CONFIG_PPDEV is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=y
-# CONFIG_I2C_ALGOBIT is not set
-# CONFIG_I2C_ALGOPCF is not set
-CONFIG_I2C_MAINBOARD=y
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_HYDRA is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_TSUNAMI is not set
-CONFIG_I2C_I801=m
-# CONFIG_I2C_I810 is not set
-# CONFIG_I2C_PIIX4 is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-# CONFIG_I2C_VOODOO3 is not set
-CONFIG_I2C_ISA=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_PROC=y
-
-#
-# Hardware sensors support
-#
-CONFIG_SENSORS=y
-CONFIG_SENSORS_ADM1021=m
-# CONFIG_SENSORS_ADM1024 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_FSCPOS is not set
-# CONFIG_SENSORS_FSCSCY is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_MAXILIFE is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_MTP008 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-CONFIG_SENSORS_LM87=m
-# CONFIG_SENSORS_SIS5595 is not set
-# CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_VIA686A is not set
-CONFIG_SENSORS_W83781D=y
-# CONFIG_SENSORS_OTHER is not set
-
-#
-# Mice
-#
-# CONFIG_BUSMOUSE is not set
-CONFIG_MOUSE=y
-CONFIG_PSMOUSE=y
-# CONFIG_82C710_MOUSE is not set
-# CONFIG_PC110_PAD is not set
-# CONFIG_MK712_MOUSE is not set
-
-#
-# Joysticks
-#
-# CONFIG_INPUT_GAMEPORT is not set
-
-#
-# Input core support is needed for gameports
-#
-
-#
-# Input core support is needed for joysticks
-#
-# CONFIG_QIC02_TAPE is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-# CONFIG_AMD_RNG is not set
-# CONFIG_INTEL_RNG is not set
-# CONFIG_AMD_PM768 is not set
-# CONFIG_NVRAM is not set
-CONFIG_RTC=y
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-# CONFIG_APPLICOM is not set
-# CONFIG_SONYPI is not set
-
-#
-# Ftape, the floppy tape device driver
-#
-# CONFIG_FTAPE is not set
-CONFIG_AGP=m
-CONFIG_AGP_INTEL=y
-# CONFIG_AGP_I810 is not set
-# CONFIG_AGP_VIA is not set
-# CONFIG_AGP_AMD is not set
-# CONFIG_AGP_SIS is not set
-# CONFIG_AGP_ALI is not set
-# CONFIG_AGP_SWORKS is not set
-# CONFIG_DRM is not set
-# CONFIG_MWAVE is not set
-# CONFIG_BATTERY_GERICOM is not set
-
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-
-#
-# Crypto Hardware support
-#
-# CONFIG_CRYPTO is not set
-
-#
-# File systems
-#
-# CONFIG_QUOTA is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFS_FS is not set
-# CONFIG_ADFS_FS_RW is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BEFS_DEBUG is not set
-# CONFIG_BFS_FS is not set
-CONFIG_EXT3_FS=y
-CONFIG_JBD=y
-CONFIG_JBD_DEBUG=y
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_UMSDOS_FS=m
-CONFIG_VFAT_FS=m
-# CONFIG_EFS_FS is not set
-# CONFIG_JFFS_FS is not set
-# CONFIG_JFFS2_FS is not set
-CONFIG_CRAMFS=y
-CONFIG_TMPFS=y
-CONFIG_RAMFS=y
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-# CONFIG_JFS_FS is not set
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
-# CONFIG_HPFS_FS is not set
-CONFIG_PROC_FS=y
-# CONFIG_DEVFS_FS is not set
-# CONFIG_DEVFS_MOUNT is not set
-# CONFIG_DEVFS_DEBUG is not set
-CONFIG_DEVPTS_FS=y
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX4FS_RW is not set
-CONFIG_ROMFS_FS=m
-CONFIG_EXT2_FS=y
-# CONFIG_SYSV_FS is not set
-# CONFIG_UDF_FS is not set
-# CONFIG_UDF_RW is not set
-# CONFIG_UFS_FS is not set
-# CONFIG_UFS_FS_WRITE is not set
-
-#
-# Network File Systems
-#
-# CONFIG_CODA_FS is not set
-# CONFIG_INTERMEZZO_FS is not set
-CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
-# CONFIG_ROOT_NFS is not set
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_TCP=y
-CONFIG_SUNRPC=m
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-# CONFIG_SMB_FS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_NCPFS_PACKET_SIGNING is not set
-# CONFIG_NCPFS_IOCTL_LOCKING is not set
-# CONFIG_NCPFS_STRONG is not set
-# CONFIG_NCPFS_NFS_NS is not set
-# CONFIG_NCPFS_OS2_NS is not set
-# CONFIG_NCPFS_SMALLDOS is not set
-# CONFIG_NCPFS_NLS is not set
-# CONFIG_NCPFS_EXTRAS is not set
-CONFIG_PFS_FS=m
-CONFIG_PFS_DIRECTIO=m
-CONFIG_ZISOFS_FS=y
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-CONFIG_OSF_PARTITION=y
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_UNIXWARE_DISKLABEL=y
-# CONFIG_LDM_PARTITION is not set
-CONFIG_SGI_PARTITION=y
-# CONFIG_ULTRIX_PARTITION is not set
-CONFIG_SUN_PARTITION=y
-# CONFIG_SMB_NLS is not set
-CONFIG_NLS=y
-
-#
-# Native Language Support
-#
-CONFIG_NLS_DEFAULT="iso8859-1"
-CONFIG_NLS_CODEPAGE_437=m
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-CONFIG_NLS_CODEPAGE_850=m
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-CONFIG_NLS_ISO8859_1=m
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
-
-#
-# Console drivers
-#
-CONFIG_VGA_CONSOLE=y
-CONFIG_VIDEO_SELECT=y
-# CONFIG_VIDEO_IGNORE_BAD_MODE is not set
-# CONFIG_MDA_CONSOLE is not set
-
-#
-# Frame-buffer support
-#
-# CONFIG_FB is not set
-# CONFIG_SPEAKUP is not set
-
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-
-#
-# USB support
-#
-# CONFIG_USB is not set
-
-#
-# Bluetooth support
-#
-# CONFIG_BLUEZ is not set
-
-#
-# Kernel hacking
-#
-CONFIG_DEBUG_KERNEL=y
-CONFIG_FRAME_POINTER=y
-CONFIG_STACK_TRACE_SCAN=y
-CONFIG_STACK_TRACE_FPTR=y
-CONFIG_STACK_TRACE_PARAM_COUNT=4
-# CONFIG_DEBUG_HIGHMEM is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_IOVIRT is not set
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_SPINLOCK=y
-CONFIG_MCL_COREDUMP=y
-CONFIG_BOOTIMG=y
-# CONFIG_OPROFILE is not set
-# CONFIG_NOBIGSTACK is not set
-CONFIG_STACK_SIZE_16KB=y
-# CONFIG_STACK_SIZE_32KB is not set
-# CONFIG_STACK_SIZE_64KB is not set
-CONFIG_STACK_SIZE_SHIFT=2
-
-#
-# Library routines
-#
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.18-chaos-2.4.18-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.18-chaos-2.4.18-i686.config
deleted file mode 100644
index db8f485..0000000
--- a/lustre/kernel_patches/kernel_configs/kernel-2.4.18-chaos-2.4.18-i686.config
+++ /dev/null
@@ -1,1103 +0,0 @@
-#
-# Automatically generated make config: don't edit
-#
-CONFIG_X86=y
-CONFIG_ISA=y
-# CONFIG_SBUS is not set
-CONFIG_UID16=y
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-CONFIG_MODVERSIONS=y
-CONFIG_KMOD=y
-
-#
-# Processor type and features
-#
-CONFIG_LOLAT=y
-# CONFIG_LOLAT_SYSCTL is not set
-# CONFIG_M386 is not set
-# CONFIG_M486 is not set
-# CONFIG_M586 is not set
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-# CONFIG_M686 is not set
-# CONFIG_MPENTIUMIII is not set
-CONFIG_MPENTIUM4=y
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MELAN is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP2 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MCYRIXIII is not set
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_INVLPG=y
-CONFIG_X86_CMPXCHG=y
-CONFIG_X86_XADD=y
-CONFIG_X86_BSWAP=y
-CONFIG_X86_POPAD_OK=y
-# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_X86_L1_CACHE_SHIFT=7
-CONFIG_X86_TSC=y
-CONFIG_X86_GOOD_APIC=y
-CONFIG_X86_PGE=y
-CONFIG_X86_USE_PPRO_CHECKSUM=y
-CONFIG_X86_MCE=y
-# CONFIG_CPU_FREQ is not set
-# CONFIG_USE_IRQ_STACKS is not set
-# CONFIG_TOSHIBA is not set
-# CONFIG_I8K is not set
-CONFIG_MICROCODE=m
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-# CONFIG_E820_PROC is not set
-# CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
-CONFIG_HIGHMEM=y
-CONFIG_HIGHIO=y
-# CONFIG_MATH_EMULATION is not set
-CONFIG_MTRR=y
-CONFIG_SMP=y
-# CONFIG_MULTIQUAD is not set
-CONFIG_HAVE_DEC_LOCK=y
-
-#
-# General setup
-#
-CONFIG_HZ=100
-CONFIG_NET=y
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_PCI=y
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GODIRECT is not set
-CONFIG_PCI_GOANY=y
-CONFIG_PCI_BIOS=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_NAMES=y
-
-#
-# Performance-monitoring counters support
-#
-CONFIG_PERFCTR=m
-CONFIG_KPERFCTR=y
-# CONFIG_PERFCTR_DEBUG is not set
-# CONFIG_PERFCTR_INIT_TESTS is not set
-CONFIG_PERFCTR_VIRTUAL=y
-CONFIG_PERFCTR_GLOBAL=y
-# CONFIG_EISA is not set
-# CONFIG_MCA is not set
-# CONFIG_HOTPLUG is not set
-# CONFIG_PCMCIA is not set
-# CONFIG_HOTPLUG_PCI is not set
-CONFIG_SYSVIPC=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_SYSCTL=y
-CONFIG_KCORE_ELF=y
-# CONFIG_KCORE_AOUT is not set
-CONFIG_BINFMT_AOUT=m
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_MISC=m
-# CONFIG_IKCONFIG is not set
-CONFIG_PM=y
-
-#
-# Additional device driver support
-#
-# CONFIG_CIPE is not set
-# CONFIG_CRYPTO_AEP is not set
-# CONFIG_MEGARAC is not set
-CONFIG_FC_QLA2200=m
-CONFIG_FC_QLA2300=m
-# CONFIG_SCSI_ISCSI is not set
-CONFIG_IBMASM=m
-CONFIG_IBMSER=m
-CONFIG_NEW_DIGI_EPCA=m
-CONFIG_NVIDIA=m
-# CONFIG_ACPI is not set
-CONFIG_APM=y
-CONFIG_APM_IGNORE_USER_SUSPEND=y
-# CONFIG_APM_DO_ENABLE is not set
-# CONFIG_APM_CPU_IDLE is not set
-# CONFIG_APM_DISPLAY_BLANK is not set
-CONFIG_APM_RTC_IS_GMT=y
-# CONFIG_APM_ALLOW_INTS is not set
-# CONFIG_APM_REAL_MODE_POWER_OFF is not set
-
-#
-# Binary emulation of other systems
-#
-# CONFIG_ABI is not set
-# CONFIG_ABI_SVR4 is not set
-
-#
-# Support for foreign binary formats
-#
-# CONFIG_BINFMT_COFF is not set
-# CONFIG_BINFMT_XOUT is not set
-# CONFIG_BINFMT_XOUT_X286 is not set
-
-#
-# Memory Technology Devices (MTD)
-#
-CONFIG_MTD=y
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_PARTITIONS is not set
-# CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_CMDLINE_PARTS is not set
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=m
-# CONFIG_MTD_BLOCK is not set
-# CONFIG_MTD_BLOCK_RO is not set
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-# CONFIG_MTD_CFI is not set
-CONFIG_MTD_JEDECPROBE=y
-CONFIG_MTD_GEN_PROBE=y
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-CONFIG_MTD_CFI_GEOMETRY=y
-CONFIG_MTD_CFI_B1=y
-# CONFIG_MTD_CFI_B2 is not set
-# CONFIG_MTD_CFI_B4 is not set
-# CONFIG_MTD_CFI_B8 is not set
-CONFIG_MTD_CFI_I1=y
-# CONFIG_MTD_CFI_I2 is not set
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_CFI_AMDSTD=y
-# CONFIG_MTD_RAM is not set
-CONFIG_MTD_ROM=y
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_OBSOLETE_CHIPS is not set
-# CONFIG_MTD_AMDSTD is not set
-# CONFIG_MTD_SHARP is not set
-# CONFIG_MTD_JEDEC is not set
-
-#
-# Mapping drivers for chip access
-#
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_PNC2000 is not set
-# CONFIG_MTD_SC520CDP is not set
-# CONFIG_MTD_NETSC520 is not set
-# CONFIG_MTD_SBC_GXX is not set
-# CONFIG_MTD_ELAN_104NC is not set
-# CONFIG_MTD_DILNETPC is not set
-# CONFIG_MTD_MIXMEM is not set
-# CONFIG_MTD_OCTAGON is not set
-# CONFIG_MTD_VMAX is not set
-# CONFIG_MTD_L440GX is not set
-# CONFIG_MTD_AMD766ROM is not set
-CONFIG_MTD_ICH2ROM=m
-# CONFIG_MTD_PCI is not set
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLKMTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOC1000 is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOCPROBE is not set
-
-#
-# NAND Flash Device Drivers
-#
-# CONFIG_MTD_NAND is not set
-
-#
-# Parallel port support
-#
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_PC_CML1=m
-# CONFIG_PARPORT_SERIAL is not set
-# CONFIG_PARPORT_PC_FIFO is not set
-# CONFIG_PARPORT_PC_SUPERIO is not set
-# CONFIG_PARPORT_AMIGA is not set
-# CONFIG_PARPORT_MFC3 is not set
-# CONFIG_PARPORT_ATARI is not set
-# CONFIG_PARPORT_GSC is not set
-# CONFIG_PARPORT_SUNBPP is not set
-# CONFIG_PARPORT_OTHER is not set
-CONFIG_PARPORT_1284=y
-
-#
-# Plug and Play configuration
-#
-CONFIG_PNP=y
-CONFIG_ISAPNP=y
-# CONFIG_PNPBIOS is not set
-
-#
-# Block devices
-#
-CONFIG_BLK_DEV_FD=y
-# CONFIG_BLK_DEV_XD is not set
-# CONFIG_PARIDE is not set
-# CONFIG_BLK_CPQ_DA is not set
-# CONFIG_BLK_CPQ_CISS_DA is not set
-# CONFIG_CISS_SCSI_TAPE is not set
-# CONFIG_BLK_DEV_DAC960 is not set
-# CONFIG_BLK_DEV_UMEM is not set
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_NBD=m
-# CONFIG_BLK_DEV_ENBD is not set
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=4096
-CONFIG_BLK_DEV_INITRD=y
-
-#
-# Multi-device support (RAID and LVM)
-#
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-# CONFIG_MD_LINEAR is not set
-# CONFIG_MD_RAID0 is not set
-# CONFIG_MD_RAID1 is not set
-# CONFIG_MD_RAID5 is not set
-# CONFIG_MD_MULTIPATH is not set
-CONFIG_BLK_DEV_LVM=m
-
-#
-# Cryptography support (CryptoAPI)
-#
-# CONFIG_CRYPTO is not set
-# CONFIG_CIPHERS is not set
-# CONFIG_CRYPTODEV is not set
-# CONFIG_CRYPTOLOOP is not set
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_NETLINK_DEV=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_FILTER=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-# CONFIG_TUX is not set
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_FWMARK=y
-CONFIG_IP_ROUTE_NAT=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_TOS=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_LARGE_TABLES=y
-# CONFIG_IP_PNP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
-# CONFIG_INET_ECN is not set
-CONFIG_SYN_COOKIES=y
-
-#
-#   IP: Netfilter Configuration
-#
-CONFIG_IP_NF_CONNTRACK=m
-# CONFIG_IP_NF_FTP is not set
-# CONFIG_IP_NF_IRC is not set
-# CONFIG_IP_NF_QUEUE is not set
-CONFIG_IP_NF_IPTABLES=m
-# CONFIG_IP_NF_MATCH_LIMIT is not set
-# CONFIG_IP_NF_MATCH_MAC is not set
-# CONFIG_IP_NF_MATCH_MARK is not set
-# CONFIG_IP_NF_MATCH_MULTIPORT is not set
-# CONFIG_IP_NF_MATCH_TOS is not set
-# CONFIG_IP_NF_MATCH_AH_ESP is not set
-# CONFIG_IP_NF_MATCH_LENGTH is not set
-# CONFIG_IP_NF_MATCH_TTL is not set
-# CONFIG_IP_NF_MATCH_TCPMSS is not set
-CONFIG_IP_NF_MATCH_STATE=m
-# CONFIG_IP_NF_MATCH_UNCLEAN is not set
-CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_FILTER=m
-# CONFIG_IP_NF_TARGET_REJECT is not set
-# CONFIG_IP_NF_TARGET_MIRROR is not set
-# CONFIG_IP_NF_NAT is not set
-# CONFIG_IP_NF_MANGLE is not set
-CONFIG_IP_NF_TARGET_LOG=m
-# CONFIG_IP_NF_TARGET_ULOG is not set
-# CONFIG_IP_NF_TARGET_TCPMSS is not set
-# CONFIG_IP_NF_ARPTABLES is not set
-# CONFIG_IP_NF_COMPAT_IPCHAINS is not set
-# CONFIG_IP_NF_COMPAT_IPFWADM is not set
-
-#
-#   IP: Virtual Server Configuration
-#
-# CONFIG_IP_VS is not set
-# CONFIG_IPV6 is not set
-CONFIG_KHTTPD=m
-# CONFIG_ATM is not set
-# CONFIG_VLAN_8021Q is not set
-
-#
-#  
-#
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-
-#
-# Appletalk devices
-#
-# CONFIG_DEV_APPLETALK is not set
-# CONFIG_DECNET is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_LLC is not set
-# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-# CONFIG_NET_FASTROUTE is not set
-# CONFIG_NET_HW_FLOWCONTROL is not set
-
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-
-#
-# Network testing
-#
-CONFIG_NET_PKTGEN=m
-
-#
-# Telephony Support
-#
-# CONFIG_PHONE is not set
-# CONFIG_PHONE_IXJ is not set
-# CONFIG_PHONE_IXJ_PCMCIA is not set
-
-#
-# ATA/IDE/MFM/RLL support
-#
-CONFIG_IDE=y
-
-#
-# IDE, ATA and ATAPI Block devices
-#
-CONFIG_BLK_DEV_IDE=y
-
-#
-# Please see Documentation/ide.txt for help/info on IDE drives
-#
-# CONFIG_BLK_DEV_HD_IDE is not set
-# CONFIG_BLK_DEV_HD is not set
-CONFIG_BLK_DEV_IDEDISK=y
-CONFIG_IDEDISK_MULTI_MODE=y
-# CONFIG_IDEDISK_STROKE is not set
-# CONFIG_BLK_DEV_IDEDISK_VENDOR is not set
-# CONFIG_BLK_DEV_IDEDISK_FUJITSU is not set
-# CONFIG_BLK_DEV_IDEDISK_IBM is not set
-# CONFIG_BLK_DEV_IDEDISK_MAXTOR is not set
-# CONFIG_BLK_DEV_IDEDISK_QUANTUM is not set
-# CONFIG_BLK_DEV_IDEDISK_SEAGATE is not set
-# CONFIG_BLK_DEV_IDEDISK_WD is not set
-# CONFIG_BLK_DEV_COMMERIAL is not set
-# CONFIG_BLK_DEV_TIVO is not set
-# CONFIG_BLK_DEV_IDECS is not set
-CONFIG_BLK_DEV_IDECD=m
-# CONFIG_BLK_DEV_IDETAPE is not set
-CONFIG_BLK_DEV_IDEFLOPPY=y
-# CONFIG_BLK_DEV_IDESCSI is not set
-# CONFIG_IDE_TASK_IOCTL is not set
-
-#
-# IDE chipset support/bugfixes
-#
-# CONFIG_BLK_DEV_CMD640 is not set
-# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-CONFIG_BLK_DEV_ISAPNP=y
-# CONFIG_BLK_DEV_RZ1000 is not set
-CONFIG_BLK_DEV_IDEPCI=y
-CONFIG_IDEPCI_SHARE_IRQ=y
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-CONFIG_IDEDMA_PCI_AUTO=y
-# CONFIG_IDEDMA_ONLYDISK is not set
-CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_IDEDMA_PCI_WIP is not set
-# CONFIG_BLK_DEV_IDEDMA_TIMEOUT is not set
-# CONFIG_IDEDMA_NEW_DRIVE_LISTINGS is not set
-CONFIG_BLK_DEV_ADMA=y
-CONFIG_BLK_DEV_AEC62XX=y
-CONFIG_AEC62XX_TUNING=y
-CONFIG_BLK_DEV_ALI15X3=y
-# CONFIG_WDC_ALI15X3 is not set
-CONFIG_BLK_DEV_AMD74XX=y
-# CONFIG_AMD74XX_OVERRIDE is not set
-CONFIG_BLK_DEV_CMD64X=y
-CONFIG_BLK_DEV_CMD680=y
-CONFIG_BLK_DEV_CY82C693=y
-CONFIG_BLK_DEV_CS5530=y
-CONFIG_BLK_DEV_HPT34X=y
-# CONFIG_HPT34X_AUTODMA is not set
-CONFIG_BLK_DEV_HPT366=y
-CONFIG_BLK_DEV_PIIX=y
-CONFIG_PIIX_TUNING=y
-# CONFIG_BLK_DEV_NS87415 is not set
-# CONFIG_BLK_DEV_OPTI621 is not set
-# CONFIG_BLK_DEV_ADMA100 is not set
-CONFIG_BLK_DEV_PDC202XX=y
-# CONFIG_PDC202XX_BURST is not set
-# CONFIG_PDC202XX_FORCE is not set
-CONFIG_BLK_DEV_SVWKS=y
-CONFIG_BLK_DEV_SIS5513=y
-CONFIG_BLK_DEV_SLC90E66=y
-# CONFIG_BLK_DEV_TRM290 is not set
-CONFIG_BLK_DEV_VIA82CXXX=y
-CONFIG_BLK_DEV_CENATEK=y
-# CONFIG_IDE_CHIPSETS is not set
-# CONFIG_BLK_DEV_ELEVATOR_NOOP is not set
-CONFIG_IDEDMA_AUTO=y
-# CONFIG_IDEDMA_IVB is not set
-# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_IDE_MODES=y
-# CONFIG_BLK_DEV_ATARAID is not set
-# CONFIG_BLK_DEV_ATARAID_PDC is not set
-# CONFIG_BLK_DEV_ATARAID_HPT is not set
-
-#
-# SCSI support
-#
-CONFIG_SCSI=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=y
-CONFIG_SD_EXTRA_DEVS=40
-# CONFIG_CHR_DEV_ST is not set
-# CONFIG_CHR_DEV_OSST is not set
-CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_SR_EXTRA_DEVS=4
-CONFIG_CHR_DEV_SG=m
-
-#
-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
-#
-# CONFIG_SCSI_DEBUG_QUEUES is not set
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-
-#
-# SCSI low-level drivers
-#
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_SCSI_7000FASST is not set
-# CONFIG_SCSI_ACARD is not set
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AHA1542 is not set
-# CONFIG_SCSI_AHA1740 is not set
-# CONFIG_SCSI_AACRAID is not set
-CONFIG_SCSI_AIC7XXX=y
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=253
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_PROBE_EISA_VL is not set
-# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
-# CONFIG_SCSI_AIC79XX is not set
-CONFIG_SCSI_DPT_I2O=y
-# CONFIG_SCSI_ADVANSYS is not set
-# CONFIG_SCSI_IN2000 is not set
-# CONFIG_SCSI_AM53C974 is not set
-# CONFIG_SCSI_MEGARAID is not set
-# CONFIG_SCSI_BUSLOGIC is not set
-# CONFIG_SCSI_CPQFCTS is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_DTC3280 is not set
-# CONFIG_SCSI_EATA is not set
-# CONFIG_SCSI_EATA_DMA is not set
-# CONFIG_SCSI_EATA_PIO is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
-# CONFIG_SCSI_GENERIC_NCR5380 is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_PPA is not set
-# CONFIG_SCSI_IMM is not set
-# CONFIG_SCSI_NCR53C406A is not set
-# CONFIG_SCSI_NCR53C7xx is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_NCR53C8XX is not set
-# CONFIG_SCSI_SYM53C8XX is not set
-# CONFIG_SCSI_PAS16 is not set
-# CONFIG_SCSI_PCI2000 is not set
-# CONFIG_SCSI_PCI2220I is not set
-# CONFIG_SCSI_PSI240I is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
-# CONFIG_SCSI_QLOGIC_ISP is not set
-# CONFIG_SCSI_QLOGIC_FC is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_NEWISP is not set
-# CONFIG_SCSI_SEAGATE is not set
-# CONFIG_SCSI_SIM710 is not set
-# CONFIG_SCSI_SYM53C416 is not set
-# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_T128 is not set
-# CONFIG_SCSI_U14_34F is not set
-# CONFIG_SCSI_ULTRASTOR is not set
-CONFIG_SCSI_DEBUG=m
-
-#
-# Fusion MPT device support
-#
-CONFIG_FUSION=y
-CONFIG_FUSION_BOOT=y
-CONFIG_FUSION_ISENSE=m
-CONFIG_FUSION_CTL=m
-# CONFIG_FUSION_LAN is not set
-
-#
-# IEEE 1394 (FireWire) support (EXPERIMENTAL)
-#
-# CONFIG_IEEE1394 is not set
-
-#
-# I2O device support
-#
-# CONFIG_I2O is not set
-# CONFIG_I2O_PCI is not set
-# CONFIG_I2O_BLOCK is not set
-# CONFIG_I2O_LAN is not set
-# CONFIG_I2O_SCSI is not set
-# CONFIG_I2O_PROC is not set
-
-#
-# Network device support
-#
-CONFIG_NETDEVICES=y
-
-#
-# ARCnet devices
-#
-# CONFIG_ARCNET is not set
-CONFIG_DUMMY=m
-# CONFIG_BONDING is not set
-# CONFIG_EQUALIZER is not set
-CONFIG_TUN=m
-# CONFIG_ETHERTAP is not set
-# CONFIG_NET_SB1000 is not set
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-# CONFIG_SUNLANCE is not set
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_SUNBMAC is not set
-# CONFIG_SUNQE is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_LANCE is not set
-# CONFIG_NET_VENDOR_SMC is not set
-# CONFIG_NET_VENDOR_RACAL is not set
-# CONFIG_AT1700 is not set
-# CONFIG_DEPCA is not set
-# CONFIG_HP100 is not set
-# CONFIG_NET_ISA is not set
-CONFIG_NET_PCI=y
-# CONFIG_PCNET32 is not set
-# CONFIG_ADAPTEC_STARFIRE is not set
-# CONFIG_AC3200 is not set
-# CONFIG_APRICOT is not set
-# CONFIG_CS89x0 is not set
-CONFIG_TULIP=m
-# CONFIG_TC35815 is not set
-# CONFIG_TULIP_MWI is not set
-CONFIG_TULIP_MMIO=y
-CONFIG_DE4X5=m
-# CONFIG_DGRS is not set
-# CONFIG_DM9102 is not set
-CONFIG_EEPRO100=m
-CONFIG_NET_E100=m
-# CONFIG_LNE390 is not set
-# CONFIG_FEALNX is not set
-# CONFIG_NATSEMI is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_NE3210 is not set
-# CONFIG_ES3210 is not set
-# CONFIG_8139CP is not set
-# CONFIG_8139TOO is not set
-# CONFIG_8139TOO_PIO is not set
-# CONFIG_8139TOO_TUNE_TWISTER is not set
-# CONFIG_8139TOO_8129 is not set
-# CONFIG_8139_NEW_RX_RESET is not set
-# CONFIG_SIS900 is not set
-# CONFIG_SIS900_OLD is not set
-# CONFIG_EPIC100 is not set
-# CONFIG_SUNDANCE is not set
-# CONFIG_TLAN is not set
-# CONFIG_VIA_RHINE is not set
-# CONFIG_VIA_RHINE_MMIO is not set
-# CONFIG_WINBOND_840 is not set
-# CONFIG_NET_POCKET is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-# CONFIG_DL2K is not set
-# CONFIG_MYRI_SBUS is not set
-CONFIG_NS83820=m
-# CONFIG_HAMACHI is not set
-# CONFIG_YELLOWFIN is not set
-# CONFIG_SK98LIN is not set
-CONFIG_NET_BROADCOM=m
-CONFIG_TIGON3=m
-CONFIG_NET_E1000=m
-# CONFIG_FDDI is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_HIPPI is not set
-# CONFIG_PLIP is not set
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-
-#
-# Wireless LAN (non-hamradio)
-#
-# CONFIG_NET_RADIO is not set
-
-#
-# Token Ring devices
-#
-# CONFIG_TR is not set
-# CONFIG_NET_FC is not set
-# CONFIG_RCPCI is not set
-# CONFIG_SHAPER is not set
-
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-
-#
-# Quadrics Supercomputers
-#
-
-#
-# QsNet
-#
-CONFIG_QUADRICS=y
-CONFIG_QSNETMOD=m
-CONFIG_ELAN3MOD=m
-CONFIG_EPMOD=m
-CONFIG_EIPMOD=m
-CONFIG_RMSMOD=m
-CONFIG_JTAG=m
-
-#
-# QsNet II
-#
-
-#
-# Amateur Radio support
-#
-# CONFIG_HAMRADIO is not set
-
-#
-# IrDA (infrared) support
-#
-# CONFIG_IRDA is not set
-
-#
-# ISDN subsystem
-#
-# CONFIG_ISDN is not set
-CONFIG_KALLSYMS=y
-
-#
-# Old CD-ROM drivers (not SCSI, not IDE)
-#
-# CONFIG_CD_NO_IDESCSI is not set
-
-#
-# Input core support
-#
-# CONFIG_INPUT is not set
-# CONFIG_INPUT_KEYBDEV is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_JOYDEV is not set
-# CONFIG_INPUT_EVDEV is not set
-
-#
-# Character devices
-#
-CONFIG_ECC=m
-CONFIG_CHAOSTEST=m
-CONFIG_P4THERM=m
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_SERIAL=y
-CONFIG_SERIAL_CONSOLE=y
-CONFIG_SERIAL_EXTENDED=y
-# CONFIG_SERIAL_MANY_PORTS is not set
-CONFIG_SERIAL_SHARE_IRQ=y
-# CONFIG_SERIAL_DETECT_IRQ is not set
-# CONFIG_SERIAL_MULTIPORT is not set
-# CONFIG_HUB6 is not set
-# CONFIG_SERIAL_NONSTANDARD is not set
-CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX98_PTY_COUNT=2048
-# CONFIG_PRINTER is not set
-# CONFIG_PPDEV is not set
-
-#
-# I2C support
-#
-CONFIG_I2C=y
-# CONFIG_I2C_ALGOBIT is not set
-# CONFIG_I2C_ALGOPCF is not set
-CONFIG_I2C_MAINBOARD=y
-# CONFIG_I2C_ALI1535 is not set
-# CONFIG_I2C_ALI15X3 is not set
-# CONFIG_I2C_HYDRA is not set
-# CONFIG_I2C_AMD756 is not set
-# CONFIG_I2C_TSUNAMI is not set
-CONFIG_I2C_I801=m
-# CONFIG_I2C_I810 is not set
-# CONFIG_I2C_PIIX4 is not set
-# CONFIG_I2C_SIS5595 is not set
-# CONFIG_I2C_VIA is not set
-# CONFIG_I2C_VIAPRO is not set
-# CONFIG_I2C_VOODOO3 is not set
-CONFIG_I2C_ISA=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_PROC=y
-
-#
-# Hardware sensors support
-#
-CONFIG_SENSORS=y
-CONFIG_SENSORS_ADM1021=m
-# CONFIG_SENSORS_ADM1024 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_FSCPOS is not set
-# CONFIG_SENSORS_FSCSCY is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_MAXILIFE is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_MTP008 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-CONFIG_SENSORS_LM87=m
-# CONFIG_SENSORS_SIS5595 is not set
-# CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_VIA686A is not set
-CONFIG_SENSORS_W83781D=y
-# CONFIG_SENSORS_OTHER is not set
-
-#
-# Mice
-#
-# CONFIG_BUSMOUSE is not set
-CONFIG_MOUSE=y
-CONFIG_PSMOUSE=y
-# CONFIG_82C710_MOUSE is not set
-# CONFIG_PC110_PAD is not set
-# CONFIG_MK712_MOUSE is not set
-
-#
-# Joysticks
-#
-# CONFIG_INPUT_GAMEPORT is not set
-
-#
-# Input core support is needed for gameports
-#
-
-#
-# Input core support is needed for joysticks
-#
-# CONFIG_QIC02_TAPE is not set
-
-#
-# Watchdog Cards
-#
-# CONFIG_WATCHDOG is not set
-# CONFIG_AMD_RNG is not set
-# CONFIG_INTEL_RNG is not set
-# CONFIG_AMD_PM768 is not set
-# CONFIG_NVRAM is not set
-CONFIG_RTC=y
-# CONFIG_DTLK is not set
-# CONFIG_R3964 is not set
-# CONFIG_APPLICOM is not set
-# CONFIG_SONYPI is not set
-
-#
-# Ftape, the floppy tape device driver
-#
-# CONFIG_FTAPE is not set
-CONFIG_AGP=m
-CONFIG_AGP_INTEL=y
-# CONFIG_AGP_I810 is not set
-# CONFIG_AGP_VIA is not set
-# CONFIG_AGP_AMD is not set
-# CONFIG_AGP_SIS is not set
-# CONFIG_AGP_ALI is not set
-# CONFIG_AGP_SWORKS is not set
-# CONFIG_DRM is not set
-# CONFIG_MWAVE is not set
-# CONFIG_BATTERY_GERICOM is not set
-
-#
-# Multimedia devices
-#
-# CONFIG_VIDEO_DEV is not set
-
-#
-# Crypto Hardware support
-#
-# CONFIG_CRYPTO is not set
-
-#
-# File systems
-#
-# CONFIG_QUOTA is not set
-# CONFIG_AUTOFS_FS is not set
-# CONFIG_AUTOFS4_FS is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_REISERFS_CHECK is not set
-# CONFIG_REISERFS_PROC_INFO is not set
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFS_FS is not set
-# CONFIG_ADFS_FS_RW is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BEFS_DEBUG is not set
-# CONFIG_BFS_FS is not set
-CONFIG_EXT3_FS=y
-CONFIG_JBD=y
-CONFIG_JBD_DEBUG=y
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_UMSDOS_FS=m
-CONFIG_VFAT_FS=m
-# CONFIG_EFS_FS is not set
-# CONFIG_JFFS_FS is not set
-# CONFIG_JFFS2_FS is not set
-CONFIG_CRAMFS=y
-CONFIG_TMPFS=y
-CONFIG_RAMFS=y
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-# CONFIG_JFS_FS is not set
-# CONFIG_JFS_DEBUG is not set
-# CONFIG_JFS_STATISTICS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_RW is not set
-# CONFIG_HPFS_FS is not set
-CONFIG_PROC_FS=y
-# CONFIG_DEVFS_FS is not set
-# CONFIG_DEVFS_MOUNT is not set
-# CONFIG_DEVFS_DEBUG is not set
-CONFIG_DEVPTS_FS=y
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_QNX4FS_RW is not set
-CONFIG_ROMFS_FS=m
-CONFIG_EXT2_FS=y
-# CONFIG_SYSV_FS is not set
-# CONFIG_UDF_FS is not set
-# CONFIG_UDF_RW is not set
-# CONFIG_UFS_FS is not set
-# CONFIG_UFS_FS_WRITE is not set
-
-#
-# Network File Systems
-#
-# CONFIG_CODA_FS is not set
-# CONFIG_INTERMEZZO_FS is not set
-CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
-# CONFIG_ROOT_NFS is not set
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_TCP=y
-CONFIG_SUNRPC=m
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-# CONFIG_SMB_FS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_NCPFS_PACKET_SIGNING is not set
-# CONFIG_NCPFS_IOCTL_LOCKING is not set
-# CONFIG_NCPFS_STRONG is not set
-# CONFIG_NCPFS_NFS_NS is not set
-# CONFIG_NCPFS_OS2_NS is not set
-# CONFIG_NCPFS_SMALLDOS is not set
-# CONFIG_NCPFS_NLS is not set
-# CONFIG_NCPFS_EXTRAS is not set
-CONFIG_PFS_FS=m
-CONFIG_PFS_DIRECTIO=m
-CONFIG_ZISOFS_FS=y
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-CONFIG_OSF_PARTITION=y
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_MINIX_SUBPARTITION=y
-CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_UNIXWARE_DISKLABEL=y
-# CONFIG_LDM_PARTITION is not set
-CONFIG_SGI_PARTITION=y
-# CONFIG_ULTRIX_PARTITION is not set
-CONFIG_SUN_PARTITION=y
-# CONFIG_SMB_NLS is not set
-CONFIG_NLS=y
-
-#
-# Native Language Support
-#
-CONFIG_NLS_DEFAULT="iso8859-1"
-CONFIG_NLS_CODEPAGE_437=m
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-CONFIG_NLS_CODEPAGE_850=m
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-CONFIG_NLS_ISO8859_1=m
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
-
-#
-# Console drivers
-#
-CONFIG_VGA_CONSOLE=y
-CONFIG_VIDEO_SELECT=y
-# CONFIG_VIDEO_IGNORE_BAD_MODE is not set
-# CONFIG_MDA_CONSOLE is not set
-
-#
-# Frame-buffer support
-#
-# CONFIG_FB is not set
-# CONFIG_SPEAKUP is not set
-
-#
-# Sound
-#
-# CONFIG_SOUND is not set
-
-#
-# USB support
-#
-# CONFIG_USB is not set
-
-#
-# Bluetooth support
-#
-# CONFIG_BLUEZ is not set
-
-#
-# Kernel hacking
-#
-CONFIG_DEBUG_KERNEL=y
-CONFIG_FRAME_POINTER=y
-CONFIG_STACK_TRACE_SCAN=y
-CONFIG_STACK_TRACE_FPTR=y
-CONFIG_STACK_TRACE_PARAM_COUNT=4
-# CONFIG_DEBUG_HIGHMEM is not set
-# CONFIG_DEBUG_SLAB is not set
-# CONFIG_DEBUG_IOVIRT is not set
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_SPINLOCK=y
-CONFIG_MCL_COREDUMP=y
-CONFIG_BOOTIMG=y
-# CONFIG_OPROFILE is not set
-# CONFIG_NOBIGSTACK is not set
-CONFIG_STACK_SIZE_16KB=y
-# CONFIG_STACK_SIZE_32KB is not set
-# CONFIG_STACK_SIZE_64KB is not set
-CONFIG_STACK_SIZE_SHIFT=2
-
-#
-# Library routines
-#
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.20-rh-2.4-i686-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.20-rh-2.4-i586-smp.config
similarity index 100%
rename from lustre/kernel_patches/kernel_configs/kernel-2.4.20-rh-2.4-i686-smp.config
rename to lustre/kernel_patches/kernel_configs/kernel-2.4.20-rh-2.4-i586-smp.config
diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.20-rh-2.4-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.20-rh-2.4-i586.config
similarity index 100%
rename from lustre/kernel_patches/kernel_configs/kernel-2.4.20-rh-2.4-i686.config
rename to lustre/kernel_patches/kernel_configs/kernel-2.4.20-rh-2.4-i586.config
diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-suse-2.4.21-2-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-suse-2.4.21-2-x86_64.config
deleted file mode 100644
index eca7425..0000000
--- a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-suse-2.4.21-2-x86_64.config
+++ /dev/null
@@ -1,2036 +0,0 @@
-#
-# Automatically generated by make menuconfig: don't edit
-#
-CONFIG_X86_64=y
-CONFIG_X86=y
-# CONFIG_ISA is not set
-# CONFIG_SBUS is not set
-CONFIG_UID16=y
-CONFIG_X86_CMPXCHG=y
-CONFIG_EARLY_PRINTK=y
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-CONFIG_MODVERSIONS=y
-CONFIG_KMOD=y
-
-#
-# Processor type and features
-#
-CONFIG_MK8=y
-# CONFIG_GENERIC_CPU is not set
-CONFIG_X86_L1_CACHE_BYTES=64
-CONFIG_X86_L1_CACHE_SHIFT=6
-CONFIG_X86_TSC=y
-CONFIG_X86_GOOD_APIC=y
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=y
-CONFIG_CPU_FREQ_PROC_INTF=y
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
-CONFIG_CPU_FREQ_24_API=y
-CONFIG_X86_POWERNOW_K8=m
-# CONFIG_X86_POWERNOW_K8_DBG is not set
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-# CONFIG_MATH_EMULATION is not set
-# CONFIG_MCA is not set
-# CONFIG_EISA is not set
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_MTRR=y
-# CONFIG_SMP is not set
-CONFIG_HPET_TIMER=y
-CONFIG_GART_IOMMU=y
-CONFIG_X86_UP_IOAPIC=y
-CONFIG_MCE=y
-# CONFIG_K8_NUMA is not set
-
-#
-# General setup
-#
-# CONFIG_DESKTOP is not set
-CONFIG_NET=y
-CONFIG_EVLOG=y
-CONFIG_EVLOG_BUFSIZE=128
-CONFIG_EVLOG_FWPRINTK=y
-# CONFIG_EVLOG_PRINTKWLOC is not set
-CONFIG_PCI=y
-CONFIG_PCI_DIRECT=y
-# CONFIG_PCI_NAMES is not set
-CONFIG_HOTPLUG=y
-
-#
-# PCMCIA/CardBus support
-#
-CONFIG_PCMCIA=m
-CONFIG_CARDBUS=y
-CONFIG_TCIC=y
-CONFIG_I82092=y
-CONFIG_I82365=y
-
-#
-# PCI Hotplug Support
-#
-CONFIG_HOTPLUG_PCI=m
-# CONFIG_HOTPLUG_PCI_COMPAQ is not set
-# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-# CONFIG_HOTPLUG_PCI_IBM is not set
-CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_AMD=m
-CONFIG_SYSVIPC=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_SYSCTL=y
-CONFIG_MAX_USER_RT_PRIO=100
-CONFIG_MAX_RT_PRIO=0
-CONFIG_KCORE_ELF=y
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_MISC=m
-CONFIG_PM=y
-CONFIG_IA32_EMULATION=y
-
-#
-# ACPI Support
-#
-CONFIG_ACPI=y
-# CONFIG_ACPI_HT_ONLY is not set
-CONFIG_ACPI_INITRD=y
-CONFIG_ACPI_BOOT=y
-CONFIG_ACPI_BUS=y
-CONFIG_ACPI_INTERPRETER=y
-CONFIG_ACPI_EC=y
-CONFIG_ACPI_POWER=y
-CONFIG_ACPI_PCI=y
-CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_SYSTEM=y
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_ASUS=m
-CONFIG_ACPI_TOSHIBA=m
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_RELAXED_AML=y
-
-#
-# Memory Technology Devices (MTD)
-#
-CONFIG_MTD=m
-# CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_PARTITIONS=m
-CONFIG_MTD_CONCAT=m
-CONFIG_MTD_REDBOOT_PARTS=m
-CONFIG_MTD_CMDLINE_PARTS=m
-CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
-CONFIG_FTL=m
-CONFIG_NFTL=m
-# CONFIG_NFTL_RW is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=m
-CONFIG_MTD_JEDECPROBE=m
-CONFIG_MTD_GEN_PROBE=m
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_NOSWAP=y
-# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
-# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
-# CONFIG_MTD_CFI_GEOMETRY is not set
-CONFIG_MTD_CFI_INTELEXT=m
-CONFIG_MTD_CFI_AMDSTD=m
-CONFIG_MTD_CFI_STAA=m
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_ROM is not set
-CONFIG_MTD_ABSENT=m
-CONFIG_MTD_OBSOLETE_CHIPS=y
-CONFIG_MTD_AMDSTD=m
-CONFIG_MTD_SHARP=m
-CONFIG_MTD_JEDEC=m
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_PHYSMAP=m
-CONFIG_MTD_PHYSMAP_START=8000000
-CONFIG_MTD_PHYSMAP_LEN=4000000
-CONFIG_MTD_PHYSMAP_BUSWIDTH=2
-CONFIG_MTD_PNC2000=m
-CONFIG_MTD_SC520CDP=m
-CONFIG_MTD_NETSC520=m
-CONFIG_MTD_SBC_GXX=m
-CONFIG_MTD_ELAN_104NC=m
-CONFIG_MTD_DILNETPC=m
-CONFIG_MTD_DILNETPC_BOOTSIZE=80000
-CONFIG_MTD_MIXMEM=m
-CONFIG_MTD_OCTAGON=m
-CONFIG_MTD_VMAX=m
-CONFIG_MTD_SCx200_DOCFLASH=m
-CONFIG_MTD_L440GX=m
-# CONFIG_MTD_AMD76XROM is not set
-CONFIG_MTD_ICH2ROM=m
-CONFIG_MTD_NETtel=m
-# CONFIG_MTD_SCB2_FLASH is not set
-CONFIG_MTD_PCI=m
-CONFIG_MTD_PCMCIA=m
-
-#
-# Self-contained MTD device drivers
-#
-CONFIG_MTD_PMC551=m
-CONFIG_MTD_PMC551_BUGFIX=y
-# CONFIG_MTD_PMC551_DEBUG is not set
-CONFIG_MTD_SLRAM=m
-CONFIG_MTD_MTDRAM=m
-CONFIG_MTDRAM_TOTAL_SIZE=4096
-CONFIG_MTDRAM_ERASE_SIZE=128
-CONFIG_MTD_BLKMTD=m
-CONFIG_MTD_DOC1000=m
-CONFIG_MTD_DOC2000=m
-CONFIG_MTD_DOC2001=m
-CONFIG_MTD_DOCPROBE=m
-CONFIG_MTD_DOCPROBE_ADVANCED=y
-CONFIG_MTD_DOCPROBE_ADDRESS=0000
-CONFIG_MTD_DOCPROBE_HIGH=y
-CONFIG_MTD_DOCPROBE_55AA=y
-
-#
-# NAND Flash Device Drivers
-#
-CONFIG_MTD_NAND=m
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
-CONFIG_MTD_NAND_IDS=m
-
-#
-# Parallel port support
-#
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_PC_CML1=m
-CONFIG_PARPORT_SERIAL=m
-CONFIG_PARPORT_PC_FIFO=y
-CONFIG_PARPORT_PC_SUPERIO=y
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_AMIGA is not set
-# CONFIG_PARPORT_MFC3 is not set
-# CONFIG_PARPORT_ATARI is not set
-# CONFIG_PARPORT_GSC is not set
-# CONFIG_PARPORT_SUNBPP is not set
-CONFIG_PARPORT_OTHER=y
-CONFIG_PARPORT_1284=y
-
-#
-# Block devices
-#
-CONFIG_BLK_DEV_FD=y
-# CONFIG_BLK_DEV_XD is not set
-CONFIG_PARIDE=m
-CONFIG_PARIDE_PARPORT=m
-CONFIG_PARIDE_PD=m
-CONFIG_PARIDE_PCD=m
-CONFIG_PARIDE_PF=m
-CONFIG_PARIDE_PT=m
-CONFIG_PARIDE_PG=m
-CONFIG_PARIDE_ATEN=m
-CONFIG_PARIDE_BPCK=m
-CONFIG_PARIDE_BPCK6=m
-CONFIG_PARIDE_COMM=m
-CONFIG_PARIDE_DSTR=m
-CONFIG_PARIDE_FIT2=m
-CONFIG_PARIDE_FIT3=m
-CONFIG_PARIDE_EPAT=m
-CONFIG_PARIDE_EPATC8=y
-CONFIG_PARIDE_EPIA=m
-CONFIG_PARIDE_FRIQ=m
-CONFIG_PARIDE_FRPW=m
-CONFIG_PARIDE_KBIC=m
-CONFIG_PARIDE_KTTI=m
-CONFIG_PARIDE_ON20=m
-CONFIG_PARIDE_ON26=m
-CONFIG_BLK_CPQ_DA=m
-CONFIG_BLK_CPQ_CISS_DA=m
-CONFIG_CISS_SCSI_TAPE=y
-CONFIG_BLK_DEV_DAC960=m
-CONFIG_BLK_DEV_UMEM=m
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_CIPHER_TWOFISH=m
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=128000
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_BLK_STATS=y
-
-#
-# Multi-device support (RAID and LVM)
-#
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=y
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID5=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_BLK_DEV_LVM=m
-CONFIG_BLK_DEV_DM=m
-CONFIG_BLK_DEV_DM_MIRROR=m
-
-#
-# Cryptography support (CryptoAPI)
-#
-CONFIG_CRYPTO=y
-CONFIG_CIPHERS=y
-CONFIG_CIPHER_AES=m
-CONFIG_CIPHER_3DES=m
-CONFIG_CIPHER_NULL=m
-CONFIG_CIPHER_DES=m
-CONFIG_DIGESTS=y
-CONFIG_DIGEST_MD5=m
-CONFIG_DIGEST_SHA1=m
-CONFIG_CRYPTODEV=y
-CONFIG_CRYPTOLOOP=m
-CONFIG_CRYPTOLOOP_ATOMIC=y
-# CONFIG_CRYPTOLOOP_IV_HACK is not set
-# CONFIG_CRYPTOLOOP_DEBUG is not set
-
-#
-# Networking options
-#
-CONFIG_PACKET=m
-CONFIG_PACKET_MMAP=y
-CONFIG_NETLINK_DEV=m
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_FILTER=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IPSEC=m
-CONFIG_IPSEC_DEBUG=y
-CONFIG_IPSEC_DEBUG_DISABLE_DEFAULT=y
-CONFIG_IPSEC_TUNNEL=y
-CONFIG_TUX=m
-CONFIG_TUX_EXTCGI=y
-CONFIG_TUX_EXTENDED_LOG=y
-# CONFIG_TUX_DEBUG is not set
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_FWMARK=y
-CONFIG_IP_ROUTE_NAT=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_TOS=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_ROUTE_LARGE_TABLES=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE=m
-CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
-CONFIG_INET_ECN=y
-CONFIG_SYN_COOKIES=y
-CONFIG_IP_IPSEC=m
-
-#
-#   IP: Netfilter Configuration
-#
-CONFIG_IP_NF_CONNTRACK=m
-CONFIG_IP_NF_FTP=m
-CONFIG_IP_NF_AMANDA=m
-CONFIG_IP_NF_TFTP=m
-CONFIG_IP_NF_IRC=m
-CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_LIMIT=m
-CONFIG_IP_NF_MATCH_MAC=m
-CONFIG_IP_NF_MATCH_PKTTYPE=m
-CONFIG_IP_NF_MATCH_MARK=m
-CONFIG_IP_NF_MATCH_MULTIPORT=m
-CONFIG_IP_NF_MATCH_TOS=m
-CONFIG_IP_NF_MATCH_PSD=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_DSCP=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
-CONFIG_IP_NF_MATCH_LENGTH=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_MATCH_TCPMSS=m
-CONFIG_IP_NF_MATCH_HELPER=m
-CONFIG_IP_NF_MATCH_STATE=m
-CONFIG_IP_NF_MATCH_CONNTRACK=m
-CONFIG_IP_NF_MATCH_IPLIMIT=m
-CONFIG_IP_NF_MATCH_UNCLEAN=m
-CONFIG_IP_NF_MATCH_STRING=m
-CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_MIRROR=m
-CONFIG_IP_NF_NAT=m
-CONFIG_IP_NF_NAT_NEEDED=y
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_IP_NF_NAT_AMANDA=m
-# CONFIG_IP_NF_NAT_LOCAL is not set
-CONFIG_IP_NF_NAT_SNMP_BASIC=m
-CONFIG_IP_NF_NAT_IRC=m
-CONFIG_IP_NF_NAT_FTP=m
-CONFIG_IP_NF_NAT_TFTP=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_TOS=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_DSCP=m
-CONFIG_IP_NF_TARGET_MARK=m
-CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_TARGET_TCPMSS=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_COMPAT_IPCHAINS=m
-CONFIG_IP_NF_NAT_NEEDED=y
-CONFIG_IP_NF_COMPAT_IPFWADM=m
-CONFIG_IP_NF_NAT_NEEDED=y
-
-#
-#   IP: Virtual Server Configuration
-#
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-CONFIG_IP_VS_FTP=m
-CONFIG_IPV6=m
-# CONFIG_IPV6_DEBUG is not set
-CONFIG_IPV6_IM=y
-CONFIG_IPV6_MODULE_IP_GRE=y
-CONFIG_IPV6_ISATAP=y
-CONFIG_IPV6_PREFIXLIST=y
-CONFIG_IPV6_6TO4_NEXTHOP=y
-CONFIG_IPV6_PRIVACY=y
-CONFIG_IPV6_SUBTREES=y
-# CONFIG_IPV6_MLD6_ALL_DONE is not set
-# CONFIG_IPV6_NODEINFO is not set
-# CONFIG_IPV6_ZONE is not set
-CONFIG_IPV6_DROP_FAKE_V4MAPPED=y
-
-#
-#   IPv6: Netfilter Configuration
-#
-CONFIG_IP6_NF_QUEUE=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_LIMIT=m
-CONFIG_IP6_NF_MATCH_MAC=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_MULTIPORT=m
-CONFIG_IP6_NF_MATCH_OWNER=m
-CONFIG_IP6_NF_MATCH_MARK=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_AHESP=m
-CONFIG_IP6_NF_MATCH_LENGTH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_TARGET_LOG=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_TARGET_MARK=m
-CONFIG_IPV6_IPSEC=y
-CONFIG_IPV6_IPSEC_TUNNEL=y
-CONFIG_IPV6_IPV6_TUNNEL=m
-CONFIG_IPV6_MOBILITY=m
-CONFIG_IPV6_MOBILITY_CN=m
-CONFIG_IPV6_MOBILITY_MN=m
-CONFIG_IPV6_MOBILITY_HA=m
-# CONFIG_IPV6_MOBILITY_DEBUG is not set
-# CONFIG_SHARED_IPV6_CARDS is not set
-CONFIG_KHTTPD=m
-CONFIG_KHTTPD_IPV6=y
-# CONFIG_ATM is not set
-CONFIG_VLAN_8021Q=m
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-CONFIG_ATALK=m
-
-#
-# Appletalk devices
-#
-CONFIG_DEV_APPLETALK=y
-CONFIG_COPS_DAYNA=y
-CONFIG_COPS_TANGENT=y
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
-CONFIG_DECNET=m
-CONFIG_DECNET_SIOCGIFCONF=y
-# CONFIG_DECNET_ROUTER is not set
-CONFIG_BRIDGE=m
-CONFIG_X25=m
-CONFIG_LAPB=m
-# CONFIG_LLC is not set
-# CONFIG_NET_DIVERT is not set
-CONFIG_ECONET=m
-# CONFIG_ECONET_AUNUDP is not set
-# CONFIG_ECONET_NATIVE is not set
-CONFIG_WAN_ROUTER=m
-# CONFIG_NET_FASTROUTE is not set
-# CONFIG_NET_HW_FLOWCONTROL is not set
-
-#
-# QoS and/or fair queueing
-#
-CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_CSZ=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_QOS=y
-CONFIG_NET_ESTIMATOR=y
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_POLICE=y
-
-#
-# Network testing
-#
-CONFIG_NET_PKTGEN=m
-
-#
-# Telephony Support
-#
-CONFIG_PHONE=m
-CONFIG_PHONE_IXJ=m
-CONFIG_PHONE_IXJ_PCMCIA=m
-
-#
-# ATA/IDE/MFM/RLL support
-#
-CONFIG_IDE=y
-
-#
-# IDE, ATA and ATAPI Block devices
-#
-CONFIG_BLK_DEV_IDE=y
-# CONFIG_BLK_DEV_HD_IDE is not set
-# CONFIG_BLK_DEV_HD is not set
-CONFIG_BLK_DEV_IDEDISK=y
-CONFIG_IDEDISK_MULTI_MODE=y
-CONFIG_IDEDISK_STROKE=y
-CONFIG_BLK_DEV_IDECS=m
-CONFIG_BLK_DEV_IDECD=m
-CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_BLK_DEV_IDEFLOPPY=y
-CONFIG_BLK_DEV_IDESCSI=m
-# CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_BLK_DEV_CMD640=y
-CONFIG_BLK_DEV_CMD640_ENHANCED=y
-# CONFIG_BLK_DEV_ISAPNP is not set
-CONFIG_BLK_DEV_IDEPCI=y
-CONFIG_BLK_DEV_GENERIC=y
-CONFIG_IDEPCI_SHARE_IRQ=y
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-CONFIG_BLK_DEV_OFFBOARD=y
-# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
-CONFIG_IDEDMA_PCI_AUTO=y
-CONFIG_IDEDMA_ONLYDISK=y
-CONFIG_BLK_DEV_IDEDMA=y
-# CONFIG_IDEDMA_PCI_WIP is not set
-# CONFIG_BLK_DEV_ADMA100 is not set
-CONFIG_BLK_DEV_AEC62XX=y
-CONFIG_BLK_DEV_ALI15X3=y
-# CONFIG_WDC_ALI15X3 is not set
-CONFIG_BLK_DEV_AMD74XX=y
-# CONFIG_AMD74XX_OVERRIDE is not set
-CONFIG_BLK_DEV_CMD64X=y
-CONFIG_BLK_DEV_TRIFLEX=y
-CONFIG_BLK_DEV_CY82C693=y
-CONFIG_BLK_DEV_CS5530=y
-CONFIG_BLK_DEV_HPT34X=y
-# CONFIG_HPT34X_AUTODMA is not set
-CONFIG_BLK_DEV_HPT366=y
-# CONFIG_BLK_DEV_PIIX is not set
-CONFIG_BLK_DEV_NS87415=y
-# CONFIG_BLK_DEV_OPTI621 is not set
-CONFIG_BLK_DEV_PDC202XX_OLD=y
-CONFIG_PDC202XX_BURST=y
-CONFIG_BLK_DEV_PDC202XX_NEW=y
-CONFIG_PDC202XX_FORCE=y
-# CONFIG_BLK_DEV_RZ1000 is not set
-CONFIG_BLK_DEV_SC1200=y
-# CONFIG_BLK_DEV_SVWKS is not set
-CONFIG_BLK_DEV_SIIMAGE=y
-CONFIG_BLK_DEV_SIS5513=y
-CONFIG_BLK_DEV_SLC90E66=y
-CONFIG_BLK_DEV_TRM290=y
-CONFIG_BLK_DEV_VIA82CXXX=y
-CONFIG_BLK_DEV_CENATEK=y
-# CONFIG_IDE_CHIPSETS is not set
-CONFIG_IDEDMA_AUTO=y
-# CONFIG_IDEDMA_IVB is not set
-# CONFIG_DMA_NONPCI is not set
-CONFIG_BLK_DEV_PDC202XX=y
-CONFIG_BLK_DEV_IDE_MODES=y
-CONFIG_BLK_DEV_ATARAID=m
-CONFIG_BLK_DEV_ATARAID_PDC=m
-CONFIG_BLK_DEV_ATARAID_HPT=m
-CONFIG_BLK_DEV_ATARAID_SII=m
-
-#
-# SCSI support
-#
-CONFIG_SCSI=m
-CONFIG_BLK_DEV_SD=m
-CONFIG_SD_MAX_MAJORS=144
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=m
-# CONFIG_BLK_DEV_SR_VENDOR is not set
-CONFIG_SR_EXTRA_DEVS=4
-CONFIG_CHR_DEV_SCH=m
-CONFIG_CHR_DEV_SG=m
-# CONFIG_SCSI_DEBUG_QUEUES is not set
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_SCSI_LOGGING=y
-
-#
-# SCSI low-level drivers
-#
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-# CONFIG_SCSI_7000FASST is not set
-CONFIG_SCSI_ACARD=m
-# CONFIG_SCSI_AHA152X is not set
-# CONFIG_SCSI_AHA1542 is not set
-# CONFIG_SCSI_AHA1740 is not set
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-CONFIG_AIC7XXX_RESET_DELAY_MS=5000
-CONFIG_AIC7XXX_PROBE_EISA_VL=y
-# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_BUILD_FIRMWARE is not set
-# CONFIG_AIC79XX_ENABLE_RD_STRM is not set
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC7XXX_OLD=m
-CONFIG_AIC7XXX_OLD_TCQ_ON_BY_DEFAULT=y
-CONFIG_AIC7XXX_OLD_CMDS_PER_DEVICE=24
-CONFIG_AIC7XXX_OLD_PROC_STATS=y
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_IN2000=m
-CONFIG_SCSI_AM53C974=m
-CONFIG_SCSI_MEGARAID=m
-CONFIG_SCSI_MEGARAID2=m
-CONFIG_SCSI_BUSLOGIC=m
-# CONFIG_SCSI_OMIT_FLASHPOINT is not set
-CONFIG_SCSI_CPQFCTS=m
-CONFIG_SCSI_DMX3191D=m
-# CONFIG_SCSI_DTC3280 is not set
-CONFIG_SCSI_EATA=m
-CONFIG_SCSI_EATA_TAGGED_QUEUE=y
-CONFIG_SCSI_EATA_LINKED_COMMANDS=y
-CONFIG_SCSI_EATA_MAX_TAGS=16
-CONFIG_SCSI_EATA_DMA=m
-CONFIG_SCSI_EATA_PIO=m
-CONFIG_SCSI_LPFC=m
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_GENERIC_NCR5380=m
-CONFIG_SCSI_GENERIC_NCR53C400=y
-CONFIG_SCSI_G_NCR5380_PORT=y
-# CONFIG_SCSI_G_NCR5380_MEM is not set
-CONFIG_SCSI_IPS_OLD=m
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
-# CONFIG_SCSI_IZIP_SLOW_CTR is not set
-CONFIG_PPSCSI=m
-CONFIG_PPSCSI_T348=m
-CONFIG_PPSCSI_T358=m
-CONFIG_PPSCSI_VPI0=m
-CONFIG_PPSCSI_VPI2=m
-CONFIG_PPSCSI_ONSCSI=m
-CONFIG_PPSCSI_SPARCSI=m
-CONFIG_PPSCSI_EPSA2=m
-CONFIG_PPSCSI_EPST=m
-# CONFIG_SCSI_NCR53C406A is not set
-CONFIG_SCSI_NCR53C7xx=m
-# CONFIG_SCSI_NCR53C7xx_sync is not set
-CONFIG_SCSI_NCR53C7xx_FAST=y
-CONFIG_SCSI_NCR53C7xx_DISCONNECT=y
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
-CONFIG_SCSI_NCR53C8XX=m
-CONFIG_SCSI_SYM53C8XX=m
-CONFIG_SCSI_NCR53C8XX_DEFAULT_TAGS=8
-CONFIG_SCSI_NCR53C8XX_MAX_TAGS=32
-CONFIG_SCSI_NCR53C8XX_SYNC=80
-CONFIG_SCSI_NCR53C8XX_PROFILE=y
-# CONFIG_SCSI_NCR53C8XX_IOMAPPED is not set
-CONFIG_SCSI_NCR53C8XX_PQS_PDS=y
-# CONFIG_SCSI_NCR53C8XX_SYMBIOS_COMPAT is not set
-# CONFIG_SCSI_PAS16 is not set
-CONFIG_SCSI_PCI2000=m
-CONFIG_SCSI_PCI2220I=m
-# CONFIG_SCSI_PSI240I is not set
-# CONFIG_SCSI_QLOGIC_FAS is not set
-CONFIG_SCSI_QLOGIC_ISP=m
-CONFIG_SCSI_QLOGIC_FC=m
-CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLOGIC_QLA2XXX=y
-CONFIG_SCSI_QLOGIC_QLA2XXX_QLA2100=m
-CONFIG_SCSI_QLOGIC_QLA2XXX_QLA2200=m
-CONFIG_SCSI_QLOGIC_QLA2XXX_QLA2300=m
-CONFIG_SCSI_SEAGATE=m
-CONFIG_SCSI_SIM710=m
-CONFIG_SCSI_SYM53C416=m
-CONFIG_SCSI_DC395x_TRMS1040=m
-CONFIG_SCSI_DC390T=m
-# CONFIG_SCSI_DC390T_NOGENSUPP is not set
-# CONFIG_SCSI_T128 is not set
-CONFIG_SCSI_U14_34F=m
-CONFIG_SCSI_U14_34F_LINKED_COMMANDS=y
-CONFIG_SCSI_U14_34F_MAX_TAGS=8
-CONFIG_SCSI_ULTRASTOR=m
-CONFIG_SCSI_NSP32=m
-CONFIG_SCSI_DEBUG=m
-
-#
-# PCMCIA SCSI adapter support
-#
-CONFIG_SCSI_PCMCIA=y
-CONFIG_PCMCIA_AHA152X=m
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_PCMCIA_NINJA_SCSI=m
-CONFIG_PCMCIA_QLOGIC=m
-
-#
-# Fusion MPT device support
-#
-CONFIG_FUSION=m
-# CONFIG_FUSION_BOOT is not set
-CONFIG_FUSION_MAX_SGE=40
-CONFIG_FUSION_ISENSE=m
-CONFIG_FUSION_CTL=m
-CONFIG_FUSION_LAN=m
-CONFIG_NET_FC=y
-
-#
-# IEEE 1394 (FireWire) support (EXPERIMENTAL)
-#
-CONFIG_IEEE1394=m
-CONFIG_IEEE1394_PCILYNX=m
-CONFIG_IEEE1394_OHCI1394=m
-CONFIG_IEEE1394_VIDEO1394=m
-CONFIG_IEEE1394_SBP2=m
-# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
-CONFIG_IEEE1394_ETH1394=m
-CONFIG_IEEE1394_DV1394=m
-CONFIG_IEEE1394_RAWIO=m
-CONFIG_IEEE1394_CMP=m
-CONFIG_IEEE1394_AMDTP=m
-# CONFIG_IEEE1394_VERBOSEDEBUG is not set
-# CONFIG_IEEE1394_OUI_DB is not set
-
-#
-# Network device support
-#
-CONFIG_NETDEVICES=y
-
-#
-# ARCnet devices
-#
-CONFIG_ARCNET=m
-CONFIG_ARCNET_1201=m
-CONFIG_ARCNET_1051=m
-CONFIG_ARCNET_RAW=m
-CONFIG_ARCNET_COM90xx=m
-CONFIG_ARCNET_COM90xxIO=m
-CONFIG_ARCNET_RIM_I=m
-CONFIG_ARCNET_COM20020=m
-# CONFIG_ARCNET_COM20020_ISA is not set
-CONFIG_ARCNET_COM20020_PCI=m
-CONFIG_DUMMY=m
-CONFIG_BONDING=m
-CONFIG_EQUALIZER=m
-CONFIG_TUN=m
-CONFIG_ETHERTAP=m
-
-#
-# Ethernet (10 or 100Mbit)
-#
-CONFIG_NET_ETHERNET=y
-# CONFIG_SUNLANCE is not set
-CONFIG_HAPPYMEAL=m
-# CONFIG_SUNBMAC is not set
-# CONFIG_SUNQE is not set
-CONFIG_SUNGEM=m
-CONFIG_NET_VENDOR_3COM=y
-# CONFIG_EL1 is not set
-# CONFIG_EL2 is not set
-# CONFIG_ELPLUS is not set
-# CONFIG_EL16 is not set
-# CONFIG_ELMC is not set
-# CONFIG_ELMC_II is not set
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-# CONFIG_LANCE is not set
-CONFIG_NET_VENDOR_SMC=y
-# CONFIG_WD80x3 is not set
-# CONFIG_ULTRAMCA is not set
-# CONFIG_ULTRA is not set
-# CONFIG_ULTRA32 is not set
-# CONFIG_SMC9194 is not set
-CONFIG_NET_VENDOR_RACAL=y
-# CONFIG_NI5010 is not set
-# CONFIG_NI52 is not set
-# CONFIG_NI65 is not set
-CONFIG_HP100=m
-# CONFIG_NET_ISA is not set
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=m
-CONFIG_PCNET32_OLD=m
-CONFIG_AMD8111_ETH=m
-CONFIG_ADAPTEC_STARFIRE=m
-# CONFIG_APRICOT is not set
-CONFIG_NET_BCM4400=m
-# CONFIG_CS89x0 is not set
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-CONFIG_DE4X5=m
-CONFIG_DGRS=m
-CONFIG_DM9102=m
-CONFIG_EEPRO100=m
-# CONFIG_EEPRO100_PIO is not set
-CONFIG_E100=m
-# CONFIG_LNE390 is not set
-CONFIG_FEALNX=m
-CONFIG_NATSEMI=m
-CONFIG_NETGEAR_GA621=m
-CONFIG_NETGEAR_GA622=m
-CONFIG_NE2K_PCI=m
-# CONFIG_NE3210 is not set
-# CONFIG_ES3210 is not set
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-# CONFIG_8139TOO_PIO is not set
-# CONFIG_8139TOO_TUNE_TWISTER is not set
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_SIS900=m
-CONFIG_EPIC100=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_TLAN=m
-CONFIG_TC35815=m
-CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_WINBOND_840=m
-CONFIG_NET_POCKET=y
-# CONFIG_DE600 is not set
-# CONFIG_DE620 is not set
-
-#
-# Ethernet (1000 Mbit)
-#
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-# CONFIG_MYRI_SBUS is not set
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-CONFIG_SK98LIN=m
-CONFIG_SK98LIN_T1=y
-CONFIG_SK98LIN_T3=y
-CONFIG_SK98LIN_T8=y
-CONFIG_SK98LIN_T6=y
-CONFIG_SK98LIN_T9=y
-CONFIG_SK98LIN_T4=y
-CONFIG_SK98LIN_T7=y
-CONFIG_SK98LIN_T2=y
-CONFIG_SK98LIN_T5=y
-CONFIG_SK9DLIN=m
-CONFIG_TIGON3=m
-CONFIG_NET_BROADCOM=m
-CONFIG_FDDI=y
-CONFIG_DEFXX=m
-CONFIG_SKFP=m
-CONFIG_NETCONSOLE=m
-CONFIG_HIPPI=y
-CONFIG_ROADRUNNER=m
-CONFIG_ROADRUNNER_LARGE_RINGS=y
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPPOE=m
-CONFIG_SLIP=m
-CONFIG_SLIP_COMPRESSED=y
-CONFIG_SLIP_SMART=y
-CONFIG_SLIP_MODE_SLIP6=y
-
-#
-# Wireless LAN (non-hamradio)
-#
-CONFIG_NET_RADIO=y
-CONFIG_STRIP=m
-CONFIG_WAVELAN=m
-CONFIG_AIRONET4500=m
-CONFIG_AIRONET4500_NONCS=m
-CONFIG_AIRONET4500_PNP=y
-CONFIG_AIRONET4500_PCI=y
-CONFIG_AIRONET4500_ISA=y
-CONFIG_AIRONET4500_I365=y
-CONFIG_AIRONET4500_PROC=m
-CONFIG_AIRO=m
-CONFIG_HERMES=m
-CONFIG_PLX_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_AIRO_CS=m
-CONFIG_NET_WIRELESS=y
-
-#
-# Token Ring devices
-#
-# CONFIG_TR is not set
-CONFIG_NET_FC=y
-CONFIG_IPHASE5526=m
-CONFIG_RCPCI=m
-CONFIG_SHAPER=m
-
-#
-# Wan interfaces
-#
-# CONFIG_WAN is not set
-
-#
-# PCMCIA network device support
-#
-CONFIG_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_AXNET=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_ARCNET_COM20020_CS=m
-# CONFIG_PCMCIA_IBMTR is not set
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_PCMCIA_XIRTULIP=m
-CONFIG_NET_PCMCIA_RADIO=y
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_PCMCIA_NETWAVE=m
-CONFIG_PCMCIA_WAVELAN=m
-CONFIG_AIRONET4500_CS=m
-
-#
-# Amateur Radio support
-#
-CONFIG_HAMRADIO=y
-CONFIG_AX25=m
-CONFIG_AX25_DAMA_SLAVE=y
-CONFIG_NETROM=m
-CONFIG_ROSE=m
-
-#
-# AX.25 network device drivers
-#
-CONFIG_MKISS=m
-CONFIG_6PACK=m
-CONFIG_BPQETHER=m
-CONFIG_SCC_DELAY=y
-CONFIG_SCC_TRXECHO=y
-CONFIG_BAYCOM_SER_FDX=m
-CONFIG_BAYCOM_SER_HDX=m
-CONFIG_BAYCOM_PAR=m
-CONFIG_BAYCOM_EPP=m
-CONFIG_SOUNDMODEM=m
-CONFIG_SOUNDMODEM_SBC=y
-CONFIG_SOUNDMODEM_WSS=y
-CONFIG_SOUNDMODEM_AFSK1200=y
-CONFIG_SOUNDMODEM_AFSK2400_7=y
-CONFIG_SOUNDMODEM_AFSK2400_8=y
-CONFIG_SOUNDMODEM_AFSK2666=y
-CONFIG_SOUNDMODEM_HAPN4800=y
-CONFIG_SOUNDMODEM_PSK4800=y
-CONFIG_SOUNDMODEM_FSK9600=y
-CONFIG_YAM=m
-
-#
-# IrDA (infrared) support
-#
-CONFIG_IRDA=m
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-CONFIG_IRDA_ULTRA=y
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-# CONFIG_IRDA_FAST_RR is not set
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-CONFIG_IRTTY_SIR=m
-CONFIG_IRPORT_SIR=m
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_USB_IRDA=m
-CONFIG_NSC_FIR=m
-CONFIG_WINBOND_FIR=m
-# CONFIG_TOSHIBA_OLD is not set
-CONFIG_TOSHIBA_FIR=m
-CONFIG_SMC_IRCC_FIR=m
-CONFIG_ALI_FIR=m
-CONFIG_VLSI_FIR=m
-
-#
-# ISDN subsystem
-#
-CONFIG_ISDN=m
-CONFIG_ISDN_BOOL=y
-CONFIG_ISDN_PPP=y
-CONFIG_IPPP_FILTER=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_ISDN_PPP_BSDCOMP=m
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-CONFIG_ISDN_X25=y
-
-#
-# ISDN feature submodules
-#
-CONFIG_ISDN_DRV_LOOP=m
-CONFIG_ISDN_DIVERSION=m
-
-#
-# Passive ISDN cards
-#
-CONFIG_ISDN_DRV_HISAX=m
-CONFIG_ISDN_HISAX=y
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-# CONFIG_HISAX_NO_SENDCOMPLETE is not set
-# CONFIG_HISAX_NO_LLC is not set
-# CONFIG_HISAX_NO_KEYPAD is not set
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-CONFIG_HISAX_TELESPCI=y
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_NETJET=y
-CONFIG_HISAX_NETJET_U=y
-CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_HFC_PCI=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-CONFIG_HISAX_ENTERNOW_PCI=y
-# CONFIG_HISAX_DEBUG is not set
-# CONFIG_HISAX_TELES_CS is not set
-CONFIG_HISAX_SEDLBAUER_CS=m
-CONFIG_HISAX_ELSA_CS=m
-# CONFIG_HISAX_AVM_A1_CS is not set
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-CONFIG_USB_AUERISDN=m
-
-#
-# Active ISDN cards
-#
-CONFIG_ISDN_DRV_ICN=m
-CONFIG_ISDN_DRV_PCBIT=m
-CONFIG_ISDN_DRV_SC=m
-CONFIG_ISDN_DRV_ACT2000=m
-CONFIG_ISDN_DRV_EICON=y
-CONFIG_ISDN_DRV_EICON_DIVAS=m
-CONFIG_ISDN_DRV_EICON_OLD=m
-CONFIG_ISDN_DRV_EICON_PCI=y
-CONFIG_ISDN_DRV_EICON_ISA=y
-CONFIG_ISDN_DRV_TPAM=m
-CONFIG_ISDN_CAPI=m
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
-CONFIG_ISDN_CAPI_CAPIFS=m
-CONFIG_ISDN_CAPI_CAPIDRV=m
-# CONFIG_ISDN_DRV_AVMB1_B1ISA is not set
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-# CONFIG_ISDN_DRV_AVMB1_T1ISA is not set
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-
-#
-# Input core support
-#
-CONFIG_INPUT=m
-CONFIG_INPUT_KEYBDEV=m
-CONFIG_INPUT_MOUSEDEV=m
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_ECC=m
-CONFIG_VT_CONSOLE=y
-CONFIG_SERIAL=y
-CONFIG_SERIAL_CONSOLE=y
-CONFIG_SERIAL_EXTENDED=y
-CONFIG_SERIAL_MANY_PORTS=y
-CONFIG_SERIAL_SHARE_IRQ=y
-# CONFIG_SERIAL_DETECT_IRQ is not set
-CONFIG_SERIAL_MULTIPORT=y
-CONFIG_HUB6=y
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_COMPUTONE=m
-CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=m
-# CONFIG_CYZ_INTR is not set
-# CONFIG_ESPSERIAL is not set
-CONFIG_MOXA_INTELLIO=m
-CONFIG_MOXA_SMARTIO=m
-CONFIG_ISI=m
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-CONFIG_N_HDLC=m
-CONFIG_RISCOM8=m
-CONFIG_STALDRV=y
-CONFIG_STALLION=m
-CONFIG_ISTALLION=m
-CONFIG_UNIX98_PTYS=y
-CONFIG_UNIX98_PTY_COUNT=256
-CONFIG_PRINTER=m
-# CONFIG_LP_CONSOLE is not set
-CONFIG_PPDEV=m
-CONFIG_TIPAR=m
-
-#
-# I2C support
-#
-CONFIG_I2C=m
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_PHILIPSPAR=m
-# CONFIG_I2C_ELV is not set
-# CONFIG_I2C_VELLEMAN is not set
-CONFIG_SCx200_I2C=m
-CONFIG_SCx200_I2C_SCL=12
-CONFIG_SCx200_I2C_SDA=13
-CONFIG_SCx200_ACB=m
-CONFIG_I2C_ALGOPCF=m
-# CONFIG_I2C_ELEKTOR is not set
-CONFIG_I2C_MAINBOARD=y
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_HYDRA=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_I801=m
-# CONFIG_I2C_I810 is not set
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS645=m
-CONFIG_I2C_SAVAGE4=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-CONFIG_I2C_VOODOO3=m
-CONFIG_I2C_ISA=m
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_PROC=m
-
-#
-# Hardware sensors support
-#
-CONFIG_SENSORS=y
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1024=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_FSCPOS=m
-CONFIG_SENSORS_FSCSCY=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_MAXILIFE=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_MTP008=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-# CONFIG_SENSORS_LM92 is not set
-CONFIG_SENSORS_SIS5595=m
-# CONFIG_SENSORS_SMSC47M1 is not set
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_OTHER=y
-CONFIG_SENSORS_BT869=m
-CONFIG_SENSORS_DDCMON=m
-CONFIG_SENSORS_EEPROM=m
-CONFIG_SENSORS_MATORB=m
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-
-#
-# Mice
-#
-CONFIG_BUSMOUSE=m
-CONFIG_ATIXL_BUSMOUSE=m
-CONFIG_LOGIBUSMOUSE=m
-CONFIG_MS_BUSMOUSE=m
-CONFIG_MOUSE=y
-CONFIG_PSMOUSE=y
-CONFIG_82C710_MOUSE=y
-CONFIG_PC110_PAD=m
-CONFIG_MK712_MOUSE=m
-
-#
-# Joysticks
-#
-CONFIG_INPUT_GAMEPORT=m
-CONFIG_INPUT_NS558=m
-CONFIG_INPUT_LIGHTNING=m
-CONFIG_INPUT_PCIGAME=m
-CONFIG_INPUT_CS461X=m
-CONFIG_INPUT_EMU10K1=m
-CONFIG_INPUT_FM801=m
-CONFIG_INPUT_SERIO=m
-CONFIG_INPUT_SERPORT=m
-CONFIG_INPUT_ANALOG=m
-CONFIG_INPUT_A3D=m
-CONFIG_INPUT_ADI=m
-CONFIG_INPUT_COBRA=m
-CONFIG_INPUT_GF2K=m
-CONFIG_INPUT_GRIP=m
-CONFIG_INPUT_INTERACT=m
-CONFIG_INPUT_TMDC=m
-CONFIG_INPUT_SIDEWINDER=m
-CONFIG_INPUT_IFORCE_USB=m
-CONFIG_INPUT_IFORCE_232=m
-CONFIG_INPUT_WARRIOR=m
-CONFIG_INPUT_MAGELLAN=m
-CONFIG_INPUT_SPACEORB=m
-CONFIG_INPUT_SPACEBALL=m
-CONFIG_INPUT_STINGER=m
-CONFIG_INPUT_DB9=m
-CONFIG_INPUT_GAMECON=m
-CONFIG_INPUT_TURBOGRAFX=m
-CONFIG_QIC02_TAPE=m
-CONFIG_QIC02_DYNCONF=y
-CONFIG_IPMI_HANDLER=m
-CONFIG_IPMI_PANIC_EVENT=y
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_KCS=m
-CONFIG_IPMI_WATCHDOG=m
-
-#
-# Watchdog Cards
-#
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_NOWAYOUT=y
-CONFIG_ACQUIRE_WDT=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_SC520_WDT=m
-CONFIG_PCWATCHDOG=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_WAFER_WDT=m
-# CONFIG_I810_TCO is not set
-CONFIG_MIXCOMWD=m
-CONFIG_60XX_WDT=m
-CONFIG_SC1200_WDT=m
-CONFIG_SCx200_WDT=m
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_W83877F_WDT=m
-CONFIG_WDT=m
-CONFIG_WDTPCI=m
-CONFIG_WDT_501=y
-CONFIG_WDT_501_FAN=y
-CONFIG_MACHZ_WDT=m
-CONFIG_DEADMAN=m
-CONFIG_HANGCHECK_TIMER=m
-CONFIG_AMD7XX_TCO=m
-CONFIG_SCx200_GPIO=m
-CONFIG_AMD_RNG=m
-CONFIG_INTEL_RNG=m
-CONFIG_AMD_PM768=m
-CONFIG_NVRAM=m
-CONFIG_RTC=y
-CONFIG_DTLK=m
-CONFIG_R3964=m
-CONFIG_APPLICOM=m
-
-#
-# Ftape, the floppy tape device driver
-#
-CONFIG_FTAPE=m
-CONFIG_ZFTAPE=m
-CONFIG_ZFT_DFLT_BLK_SZ=10240
-CONFIG_ZFT_COMPRESSOR=m
-CONFIG_FT_NR_BUFFERS=3
-CONFIG_FT_PROC_FS=y
-CONFIG_FT_NORMAL_DEBUG=y
-# CONFIG_FT_FULL_DEBUG is not set
-# CONFIG_FT_NO_TRACE is not set
-# CONFIG_FT_NO_TRACE_AT_ALL is not set
-CONFIG_FT_STD_FDC=y
-# CONFIG_FT_MACH2 is not set
-# CONFIG_FT_PROBE_FC10 is not set
-# CONFIG_FT_ALT_FDC is not set
-CONFIG_FT_FDC_THR=8
-CONFIG_FT_FDC_MAX_RATE=2000
-CONFIG_FT_ALPHA_CLOCK=0
-CONFIG_AGP=y
-CONFIG_AGP_AMD_8151=y
-# CONFIG_AGP_INTEL is not set
-# CONFIG_AGP_I810 is not set
-# CONFIG_AGP_VIA is not set
-# CONFIG_AGP_AMD is not set
-# CONFIG_AGP_SIS is not set
-# CONFIG_AGP_ALI is not set
-# CONFIG_AGP_SWORKS is not set
-# CONFIG_AGP_NVIDIA is not set
-CONFIG_DRM=y
-# CONFIG_DRM_OLD is not set
-CONFIG_DRM_NEW=y
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_I810=m
-# CONFIG_DRM_I810_XFREE_41 is not set
-CONFIG_DRM_I830=m
-CONFIG_DRM_MGA=m
-# CONFIG_DRM_SIS is not set
-
-#
-# PCMCIA character devices
-#
-CONFIG_PCMCIA_SERIAL_CS=m
-CONFIG_SYNCLINK_CS=m
-CONFIG_MWAVE=m
-
-#
-# Multimedia devices
-#
-CONFIG_VIDEO_DEV=m
-
-#
-# Video For Linux
-#
-CONFIG_VIDEO_PROC_FS=y
-CONFIG_I2C_PARPORT=m
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_PMS=m
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_CPIA=m
-CONFIG_VIDEO_CPIA_PP=m
-CONFIG_VIDEO_CPIA_USB=m
-CONFIG_VIDEO_SAA5249=m
-CONFIG_TUNER_3036=m
-CONFIG_VIDEO_STRADIS=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZR36120=m
-# CONFIG_VIDEO_MEYE is not set
-
-#
-# Radio Adapters
-#
-CONFIG_RADIO_GEMTEK_PCI=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MAESTRO=m
-CONFIG_RADIO_MIROPCM20=m
-# CONFIG_DXR3 is not set
-
-#
-# File systems
-#
-CONFIG_QUOTA=y
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QIFACE_COMPAT=y
-# CONFIG_QIFACE_V1 is not set
-CONFIG_QIFACE_V2=y
-CONFIG_AUTOFS_FS=m
-CONFIG_AUTOFS4_FS=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_XATTR_USER=y
-CONFIG_REISERFS_FS_XATTR_TRUSTED=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_ADFS_FS=m
-# CONFIG_ADFS_FS_RW is not set
-CONFIG_AFFS_FS=m
-CONFIG_HFS_FS=m
-CONFIG_HFSPLUS_FS=m
-CONFIG_BEFS_FS=m
-# CONFIG_BEFS_DEBUG is not set
-CONFIG_BFS_FS=m
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT3_FS_XATTR_SHARING=y
-CONFIG_EXT3_FS_XATTR_USER=y
-CONFIG_EXT3_FS_XATTR_TRUSTED=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_JBD=y
-CONFIG_JBD_DEBUG=y
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_UMSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FATX_FS=m
-CONFIG_EFS_FS=m
-CONFIG_JFFS_FS=m
-CONFIG_JFFS_FS_VERBOSE=0
-CONFIG_JFFS_PROC_FS=y
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_CRAMFS=m
-CONFIG_TMPFS=y
-CONFIG_RAMFS=y
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-# CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_STATISTICS=y
-CONFIG_MINIX_FS=y
-CONFIG_VXFS_FS=m
-# CONFIG_NTFS_FS is not set
-# CONFIG_NTFS_DEBUG is not set
-# CONFIG_NTFS_RW is not set
-CONFIG_HPFS_FS=m
-CONFIG_PROC_FS=y
-CONFIG_PROC_CONFIG=y
-# CONFIG_DEVFS_FS is not set
-# CONFIG_DEVFS_MOUNT is not set
-# CONFIG_DEVFS_DEBUG is not set
-CONFIG_DEVPTS_FS=y
-CONFIG_QNX4FS_FS=m
-# CONFIG_QNX4FS_RW is not set
-CONFIG_ROMFS_FS=m
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_XATTR_SHARING=y
-CONFIG_EXT2_FS_XATTR_USER=y
-CONFIG_EXT2_FS_XATTR_TRUSTED=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_SYSV_FS=m
-CONFIG_UDF_FS=m
-CONFIG_UDF_RW=y
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-CONFIG_XFS_FS=m
-CONFIG_XFS_POSIX_ACL=y
-# CONFIG_XFS_RT is not set
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_DMAPI=y
-# CONFIG_XFS_DEBUG is not set
-# CONFIG_PAGEBUF_DEBUG is not set
-# CONFIG_OCFS_FS is not set
-
-#
-# Network File Systems
-#
-CONFIG_CODA_FS=m
-CONFIG_INTERMEZZO_FS=m
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_NFS_ACL=y
-CONFIG_NFS_DIRECTIO=y
-CONFIG_ROOT_NFS=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_ACL=y
-CONFIG_NFSD_TCP=y
-CONFIG_NFSD_FHALIAS=y
-CONFIG_SUNRPC=y
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_CIFS=m
-CONFIG_SMB_FS=m
-CONFIG_SMB_NLS_DEFAULT=y
-CONFIG_SMB_NLS_REMOTE="cp437"
-CONFIG_NCP_FS=m
-CONFIG_NCPFS_PACKET_SIGNING=y
-CONFIG_NCPFS_IOCTL_LOCKING=y
-CONFIG_NCPFS_STRONG=y
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_NLS=y
-CONFIG_NCPFS_EXTRAS=y
-CONFIG_ZISOFS_FS=y
-CONFIG_FS_MBCACHE=y
-CONFIG_FS_POSIX_ACL=y
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-CONFIG_OSF_PARTITION=y
-# CONFIG_AMIGA_PARTITION is not set
-CONFIG_ATARI_PARTITION=y
-CONFIG_MAC_PARTITION=y
-CONFIG_XBOX_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-# CONFIG_MINIX_SUBPARTITION is not set
-CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_UNIXWARE_DISKLABEL=y
-# CONFIG_LDM_PARTITION is not set
-CONFIG_SGI_PARTITION=y
-CONFIG_ULTRIX_PARTITION=y
-CONFIG_SUN_PARTITION=y
-CONFIG_EFI_PARTITION=y
-CONFIG_SMB_NLS=y
-CONFIG_NLS=y
-
-#
-# Native Language Support
-#
-CONFIG_NLS_DEFAULT="iso8859-1"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ISO8859_1=m
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_UTF8=m
-
-#
-# Console drivers
-#
-CONFIG_VGA_CONSOLE=y
-CONFIG_VIDEO_SELECT=y
-CONFIG_MDA_CONSOLE=m
-
-#
-# Frame-buffer support
-#
-CONFIG_FB=y
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FB_RIVA=m
-CONFIG_FB_CLGEN=m
-CONFIG_FB_PM2=m
-CONFIG_FB_PM2_FIFO_DISCONNECT=y
-CONFIG_FB_PM2_PCI=y
-CONFIG_FB_PM3=m
-# CONFIG_UNICON is not set
-# CONFIG_UNICON_GB is not set
-# CONFIG_UNICON_GBK is not set
-# CONFIG_UNICON_BIG5 is not set
-# CONFIG_UNICON_JIS is not set
-# CONFIG_UNICON_KSCM is not set
-CONFIG_FB_CYBER2000=m
-CONFIG_FB_VESA=y
-CONFIG_FB_VGA16=m
-CONFIG_FB_HGA=m
-CONFIG_VIDEO_SELECT=y
-CONFIG_FB_MATROX=m
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-CONFIG_FB_MATROX_G450=y
-CONFIG_FB_MATROX_G100=y
-CONFIG_FB_MATROX_I2C=m
-CONFIG_FB_MATROX_MAVEN=m
-CONFIG_FB_MATROX_PROC=m
-CONFIG_FB_MATROX_MULTIHEAD=y
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_GX=y
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_RADEON=m
-CONFIG_FB_ATY128=m
-# CONFIG_FB_INTEL is not set
-# CONFIG_FB_SIS is not set
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_VMWARE_SVGA=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_TRIDENT=m
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FBCON_SPLASHSCREEN=y
-CONFIG_FBCON_CFB16=y
-CONFIG_FBCON_ADVANCED=y
-CONFIG_FBCON_MFB=m
-CONFIG_FBCON_CFB2=m
-CONFIG_FBCON_CFB4=m
-CONFIG_FBCON_CFB8=y
-CONFIG_FBCON_CFB24=y
-CONFIG_FBCON_CFB32=y
-CONFIG_FBCON_AFB=m
-CONFIG_FBCON_ILBM=m
-CONFIG_FBCON_IPLAN2P2=m
-CONFIG_FBCON_IPLAN2P4=m
-CONFIG_FBCON_IPLAN2P8=m
-CONFIG_FBCON_MAC=m
-CONFIG_FBCON_VGA_PLANES=m
-CONFIG_FBCON_VGA=m
-CONFIG_FBCON_HGA=m
-# CONFIG_FBCON_FONTWIDTH8_ONLY is not set
-CONFIG_FBCON_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-
-#
-# Sound
-#
-CONFIG_SOUND=m
-CONFIG_SOUND_ALI5455=m
-CONFIG_SOUND_BT878=m
-CONFIG_SOUND_CMPCI=m
-CONFIG_SOUND_CMPCI_FM=y
-CONFIG_SOUND_CMPCI_FMIO=388
-CONFIG_SOUND_CMPCI_FMIO=388
-CONFIG_SOUND_CMPCI_MIDI=y
-CONFIG_SOUND_CMPCI_MPUIO=330
-CONFIG_SOUND_CMPCI_JOYSTICK=y
-CONFIG_SOUND_CMPCI_CM8738=y
-# CONFIG_SOUND_CMPCI_SPDIFINVERSE is not set
-CONFIG_SOUND_CMPCI_SPDIFLOOP=y
-CONFIG_SOUND_CMPCI_SPEAKERS=2
-CONFIG_SOUND_EMU10K1=m
-CONFIG_MIDI_EMU10K1=y
-CONFIG_SOUND_FUSION=m
-CONFIG_SOUND_CS4281=m
-CONFIG_SOUND_ES1370=m
-CONFIG_SOUND_ES1371=m
-CONFIG_SOUND_ESSSOLO1=m
-CONFIG_SOUND_MAESTRO=m
-CONFIG_SOUND_MAESTRO3=m
-CONFIG_SOUND_FORTE=m
-CONFIG_SOUND_ICH=m
-CONFIG_SOUND_RME96XX=m
-CONFIG_SOUND_SONICVIBES=m
-CONFIG_SOUND_TRIDENT=m
-# CONFIG_SOUND_MSNDCLAS is not set
-# CONFIG_SOUND_MSNDPIN is not set
-CONFIG_SOUND_VIA82CXXX=m
-CONFIG_MIDI_VIA82CXXX=y
-CONFIG_SOUND_OSS=m
-CONFIG_SOUND_TRACEINIT=y
-CONFIG_SOUND_DMAP=y
-CONFIG_SOUND_AD1816=m
-CONFIG_SOUND_AD1889=m
-CONFIG_SOUND_SGALAXY=m
-CONFIG_SOUND_ADLIB=m
-CONFIG_SOUND_ACI_MIXER=m
-CONFIG_SOUND_CS4232=m
-CONFIG_SOUND_SSCAPE=m
-CONFIG_SOUND_GUS=m
-# CONFIG_SOUND_GUS16 is not set
-CONFIG_SOUND_GUSMAX=y
-CONFIG_SOUND_VMIDI=m
-CONFIG_SOUND_TRIX=m
-CONFIG_SOUND_MSS=m
-CONFIG_SOUND_MPU401=m
-CONFIG_SOUND_NM256=m
-CONFIG_SOUND_MAD16=m
-CONFIG_MAD16_OLDCARD=y
-CONFIG_SOUND_PAS=m
-# CONFIG_PAS_JOYSTICK is not set
-CONFIG_SOUND_PSS=m
-CONFIG_PSS_MIXER=y
-# CONFIG_PSS_HAVE_BOOT is not set
-CONFIG_SOUND_SB=m
-CONFIG_SOUND_AWE32_SYNTH=m
-CONFIG_SOUND_KAHLUA=m
-CONFIG_SOUND_WAVEFRONT=m
-CONFIG_SOUND_MAUI=m
-CONFIG_SOUND_YM3812=m
-CONFIG_SOUND_OPL3SA1=m
-CONFIG_SOUND_OPL3SA2=m
-CONFIG_SOUND_YMFPCI=m
-CONFIG_SOUND_YMFPCI_LEGACY=y
-CONFIG_SOUND_UART6850=m
-CONFIG_SOUND_AEDSP16=m
-CONFIG_SC6600=y
-CONFIG_SC6600_JOY=y
-CONFIG_SC6600_CDROM=4
-CONFIG_SC6600_CDROMBASE=0
-CONFIG_AEDSP16_SBPRO=y
-CONFIG_AEDSP16_MPU401=y
-CONFIG_SOUND_TVMIXER=m
-
-#
-# Advanced Linux Sound Architecture
-#
-CONFIG_SND=m
-CONFIG_SND_BIT32_EMUL=m
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_VERBOSE_PRINTK=y
-CONFIG_SND_DEBUG=y
-CONFIG_SND_DEBUG_MEMORY=y
-# CONFIG_SND_DEBUG_DETECT is not set
-
-#
-# Generic devices
-#
-CONFIG_SND_DUMMY=m
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-CONFIG_SND_SERIALMIDI=m
-
-#
-# PCI devices
-#
-CONFIG_SND_ALI5451=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CS4281=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_PDPLUS=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_NM256=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_HDSP=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_FM801=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VX222=m
-CONFIG_SND_MIXART=m
-CONFIG_SND_AZT3328=m
-
-#
-# ALSA USB devices
-#
-CONFIG_SND_USB_AUDIO=m
-
-#
-# ALSA PCMCIA devices
-#
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_VXP440=m
-
-#
-# USB support
-#
-CONFIG_USB=m
-# CONFIG_USB_DEBUG is not set
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_BANDWIDTH is not set
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_UHCI=m
-CONFIG_USB_UHCI_ALT=m
-CONFIG_USB_OHCI=m
-CONFIG_USB_AUDIO=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_MIDI=m
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DATAFAB=y
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_ISD200=y
-CONFIG_USB_STORAGE_DPCM=y
-CONFIG_USB_STORAGE_HP8200e=y
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_HID=m
-CONFIG_USB_HIDINPUT=y
-CONFIG_USB_HIDDEV=y
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-CONFIG_USB_AIPTEK=m
-CONFIG_USB_WACOM=m
-CONFIG_USB_KBTAB=m
-CONFIG_USB_POWERMATE=m
-CONFIG_USB_DC2XX=m
-CONFIG_USB_MDC800=m
-CONFIG_USB_SCANNER=m
-CONFIG_USB_MICROTEK=m
-CONFIG_USB_HPUSBSCSI=m
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_KONICAWC=m
-CONFIG_USB_OV511=m
-CONFIG_USB_PWC=m
-CONFIG_USB_SE401=m
-CONFIG_USB_STV680=m
-CONFIG_USB_VICAM=m
-CONFIG_USB_DSBR=m
-CONFIG_USB_DABUSB=m
-# CONFIG_USB_LOGITECH_CAM is not set
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_CATC=m
-CONFIG_USB_AX8817X=m
-CONFIG_USB_CDCETHER=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_USBDNET=m
-CONFIG_USB_USBDNET_VENDOR=0000
-CONFIG_USB_USBDNET_PRODUCT=0000
-CONFIG_USB_USBDNET_CLASS=0000
-CONFIG_USB_USBDNET_SUBCLASS=0000
-CONFIG_USB_USS720=m
-
-#
-# USB Serial Converter support
-#
-CONFIG_USB_SERIAL=m
-# CONFIG_USB_SERIAL_DEBUG is not set
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_SAFE_PADDED=y
-CONFIG_USB_SAFE_SERIAL_VENDOR=0000
-CONFIG_USB_SAFE_SERIAL_PRODUCT=0000
-CONFIG_USB_RIO500=m
-CONFIG_USB_AUERSWALD=m
-CONFIG_USB_TIGL=m
-CONFIG_USB_BRLVGER=m
-CONFIG_USB_LCD=m
-# CONFIG_USB_SPEEDTOUCH is not set
-
-#
-# Bluetooth support
-#
-CONFIG_BLUEZ=m
-CONFIG_BLUEZ_L2CAP=m
-CONFIG_BLUEZ_SCO=m
-CONFIG_BLUEZ_RFCOMM=m
-CONFIG_BLUEZ_RFCOMM_TTY=y
-CONFIG_BLUEZ_BNEP=m
-CONFIG_BLUEZ_BNEP_MC_FILTER=y
-CONFIG_BLUEZ_BNEP_PROTO_FILTER=y
-CONFIG_BLUEZ_CMTP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BLUEZ_HCIUSB=m
-CONFIG_BLUEZ_USB_SCO=y
-# CONFIG_BLUEZ_USB_ZERO_PACKET is not set
-CONFIG_BLUEZ_HCIUART=m
-CONFIG_BLUEZ_HCIUART_H4=y
-CONFIG_BLUEZ_HCIUART_BCSP=y
-CONFIG_BLUEZ_HCIUART_BCSP_TXCRC=y
-CONFIG_BLUEZ_HCIBFUSB=m
-CONFIG_BLUEZ_HCIDTL1=m
-CONFIG_BLUEZ_HCIBT3C=m
-CONFIG_BLUEZ_HCIBLUECARD=m
-CONFIG_BLUEZ_HCIBTUART=m
-CONFIG_BLUEZ_HCIVHCI=m
-
-#
-# Kernel hacking
-#
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_SLAB is not set
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_CHECKING is not set
-# CONFIG_INIT_DEBUG is not set
-# CONFIG_X86_REMOTE_DEBUG is not set
-# CONFIG_IOMMU_DEBUG is not set
-# CONFIG_IOMMU_LEAK is not set
-CONFIG_DEBUG_STACKOVERFLOW=y
-CONFIG_KALLSYMS=y
-
-#
-# Library routines
-#
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_QSORT=y
-CONFIG_FW_LOADER=m
-
-#
-# Build options
-#
-CONFIG_SUSE_KERNEL=y
-CONFIG_CFGNAME="default"
-CONFIG_RELEASE=171
diff --git a/lustre/kernel_patches/patches/2.6.0-mm2.patch b/lustre/kernel_patches/patches/2.6.0-mm2.patch
new file mode 100644
index 0000000..d01f3c7
--- /dev/null
+++ b/lustre/kernel_patches/patches/2.6.0-mm2.patch
@@ -0,0 +1,203869 @@
+--- linux-2.6.0/arch/alpha/kernel/irq.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/alpha/kernel/irq.c	2003-12-28 23:22:10.000000000 -0800
+@@ -252,9 +252,11 @@ static int
+ irq_affinity_read_proc (char *page, char **start, off_t off,
+ 			int count, int *eof, void *data)
+ {
+-	if (count < HEX_DIGITS+1)
++	int len = cpumask_snprintf(page, count, irq_affinity[(long)data]);
++	if (count - len < 2)
+ 		return -EINVAL;
+-	return sprintf (page, "%016lx\n", irq_affinity[(long)data]);
++	len += sprintf(page + len, "\n");
++	return len;
+ }
+ 
+ static unsigned int
+@@ -331,10 +333,11 @@ static int
+ prof_cpu_mask_read_proc(char *page, char **start, off_t off,
+ 			int count, int *eof, void *data)
+ {
+-	unsigned long *mask = (unsigned long *) data;
+-	if (count < HEX_DIGITS+1)
++	int len = cpumask_snprintf(page, count, *(cpumask_t *)data);
++	if (count - len < 2)
+ 		return -EINVAL;
+-	return sprintf (page, "%016lx\n", *mask);
++	len += sprintf(page + len, "\n");
++	return len;
+ }
+ 
+ static int
+@@ -529,19 +532,21 @@ show_interrupts(struct seq_file *p, void
+ #ifdef CONFIG_SMP
+ 	int j;
+ #endif
+-	int i;
++	int i = *(loff_t *) v;
+ 	struct irqaction * action;
+ 	unsigned long flags;
+ 
+ #ifdef CONFIG_SMP
+-	seq_puts(p, "           ");
+-	for (i = 0; i < NR_CPUS; i++)
+-		if (cpu_online(i))
+-			seq_printf(p, "CPU%d       ", i);
+-	seq_putc(p, '\n');
++	if (i == 0) {
++		seq_puts(p, "           ");
++		for (i = 0; i < NR_CPUS; i++)
++			if (cpu_online(i))
++				seq_printf(p, "CPU%d       ", i);
++		seq_putc(p, '\n');
++	}
+ #endif
+ 
+-	for (i = 0; i < ACTUAL_NR_IRQS; i++) {
++	if (i < ACTUAL_NR_IRQS) {
+ 		spin_lock_irqsave(&irq_desc[i].lock, flags);
+ 		action = irq_desc[i].action;
+ 		if (!action) 
+@@ -568,15 +573,16 @@ show_interrupts(struct seq_file *p, void
+ 		seq_putc(p, '\n');
+ unlock:
+ 		spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+-	}
++	} else if (i == ACTUAL_NR_IRQS) {
+ #ifdef CONFIG_SMP
+-	seq_puts(p, "IPI: ");
+-	for (i = 0; i < NR_CPUS; i++)
+-		if (cpu_online(i))
+-			seq_printf(p, "%10lu ", cpu_data[i].ipi_count);
+-	seq_putc(p, '\n');
++		seq_puts(p, "IPI: ");
++		for (i = 0; i < NR_CPUS; i++)
++			if (cpu_online(i))
++				seq_printf(p, "%10lu ", cpu_data[i].ipi_count);
++		seq_putc(p, '\n');
+ #endif
+-	seq_printf(p, "ERR: %10lu\n", irq_err_count);
++		seq_printf(p, "ERR: %10lu\n", irq_err_count);
++	}
+ 	return 0;
+ }
+ 
+--- linux-2.6.0/arch/alpha/kernel/traps.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/alpha/kernel/traps.c	2003-12-28 23:22:11.000000000 -0800
+@@ -636,6 +636,7 @@ do_entUna(void * va, unsigned long opcod
+ 	lock_kernel();
+ 	printk("Bad unaligned kernel access at %016lx: %p %lx %ld\n",
+ 		pc, va, opcode, reg);
++	dump_stack();
+ 	do_exit(SIGSEGV);
+ 
+ got_exception:
+--- linux-2.6.0/arch/arm26/kernel/irq.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/arm26/kernel/irq.c	2003-12-28 23:22:06.000000000 -0800
+@@ -135,10 +135,10 @@ void enable_irq(unsigned int irq)
+ 
+ int show_interrupts(struct seq_file *p, void *v)
+ {
+-	int i;
++	int i = *(loff_t *) v;
+ 	struct irqaction * action;
+ 
+-	for (i = 0 ; i < NR_IRQS ; i++) {
++	if (i < NR_IRQS) {
+ 	    	action = irq_desc[i].action;
+ 		if (!action)
+ 			continue;
+@@ -148,10 +148,10 @@ int show_interrupts(struct seq_file *p, 
+ 			seq_printf(p, ", %s", action->name);
+ 		}
+ 		seq_putc(p, '\n');
++	} else if (i == NR_IRQS) {
++		show_fiq_list(p, v);
++		seq_printf(p, "Err: %10lu\n", irq_err_count);
+ 	}
+-
+-	show_fiq_list(p, v);
+-	seq_printf(p, "Err: %10lu\n", irq_err_count);
+ 	return 0;
+ }
+ 
+--- linux-2.6.0/arch/arm/kernel/irq.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/arm/kernel/irq.c	2003-12-28 23:22:06.000000000 -0800
+@@ -169,11 +169,11 @@ void disable_irq_wake(unsigned int irq)
+ 
+ int show_interrupts(struct seq_file *p, void *v)
+ {
+-	int i;
++	int i = *(loff_t *) v;
+ 	struct irqaction * action;
+ 	unsigned long flags;
+ 
+-	for (i = 0 ; i < NR_IRQS ; i++) {
++	if (i < NR_IRQS) {
+ 		spin_lock_irqsave(&irq_controller_lock, flags);
+ 	    	action = irq_desc[i].action;
+ 		if (!action)
+@@ -187,12 +187,12 @@ int show_interrupts(struct seq_file *p, 
+ 		seq_putc(p, '\n');
+ unlock:
+ 		spin_unlock_irqrestore(&irq_controller_lock, flags);
+-	}
+-
++	} else if (i == NR_IRQS) {
+ #ifdef CONFIG_ARCH_ACORN
+-	show_fiq_list(p, v);
++		show_fiq_list(p, v);
+ #endif
+-	seq_printf(p, "Err: %10lu\n", irq_err_count);
++		seq_printf(p, "Err: %10lu\n", irq_err_count);
++	}
+ 	return 0;
+ }
+ 
+--- linux-2.6.0/arch/arm/mach-sa1100/Kconfig	2003-06-14 12:18:52.000000000 -0700
++++ 25/arch/arm/mach-sa1100/Kconfig	2003-12-28 23:23:06.000000000 -0800
+@@ -304,7 +304,7 @@ config SA1100_YOPY
+ 	depends on ARCH_SA1100
+ 	help
+ 	  Say Y here to support the Yopy PDA.  Product information at
+-	  <http://www.yopy.com/>.  See Documentation/arm/SA110/Yopy
++	  <http://www.yopy.com/>.  See Documentation/arm/SA1100/Yopy
+ 	  for more.
+ 
+ config SA1100_STORK
+--- linux-2.6.0/arch/arm/Makefile	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/arm/Makefile	2003-12-28 23:21:55.000000000 -0800
+@@ -14,8 +14,6 @@ OBJCOPYFLAGS	:=-O binary -R .note -R .co
+ GZFLAGS		:=-9
+ #CFLAGS		+=-pipe
+ 
+-CFLAGS		:=$(CFLAGS:-O2=-Os)
+-
+ ifeq ($(CONFIG_FRAME_POINTER),y)
+ CFLAGS		+=-fno-omit-frame-pointer -mapcs -mno-sched-prolog
+ endif
+--- linux-2.6.0/arch/cris/kernel/irq.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/cris/kernel/irq.c	2003-12-28 23:22:06.000000000 -0800
+@@ -89,11 +89,11 @@ static struct irqaction *irq_action[NR_I
+ 
+ int show_interrupts(struct seq_file *p, void *v)
+ {
+-	int i;
++	int i = *(loff_t *) v;
+ 	struct irqaction * action;
+ 	unsigned long flags;
+ 
+-	for (i = 0; i < NR_IRQS; i++) {
++	if (i < NR_IRQS) {
+ 		local_irq_save(flags);
+ 		action = irq_action[i];
+ 		if (!action) 
+--- linux-2.6.0/arch/h8300/Kconfig	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/h8300/Kconfig	2003-12-28 23:21:55.000000000 -0800
+@@ -5,6 +5,10 @@
+ 
+ mainmenu "uClinux/h8300 (w/o MMU) Kernel Configuration"
+ 
++config H8300
++	bool
++	default y
++
+ config MMU
+ 	bool
+ 	default n
+--- linux-2.6.0/arch/h8300/Makefile	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/h8300/Makefile	2003-12-28 23:21:55.000000000 -0800
+@@ -34,7 +34,7 @@ cflags-$(CONFIG_CPU_H8S)	:= -ms
+ ldflags-$(CONFIG_CPU_H8S)	:= -mh8300self
+ 
+ CFLAGS += $(cflags-y)
+-CFLAGS += -mint32 -fno-builtin -Os
++CFLAGS += -mint32 -fno-builtin
+ CFLAGS += -g
+ CFLAGS += -D__linux__
+ CFLAGS += -DUTS_SYSNAME=\"uClinux\"
+--- linux-2.6.0/arch/h8300/platform/h8300h/ints.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/h8300/platform/h8300h/ints.c	2003-12-28 23:22:06.000000000 -0800
+@@ -228,9 +228,9 @@ asmlinkage void process_int(int vec, str
+ 
+ int show_interrupts(struct seq_file *p, void *v)
+ {
+-	int i;
++	int i = *(loff_t *) v;
+ 
+-	for (i = 0; i < NR_IRQS; i++) {
++	if (i < NR_IRQS) {
+ 		if (irq_list[i]) {
+ 			seq_printf(p, "%3d: %10u ",i,irq_list[i]->count);
+ 			seq_printf(p, "%s\n", irq_list[i]->devname);
+--- linux-2.6.0/arch/h8300/platform/h8s/ints.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/arch/h8300/platform/h8s/ints.c	2003-12-28 23:22:06.000000000 -0800
+@@ -280,9 +280,9 @@ asmlinkage void process_int(unsigned lon
+ 
+ int show_interrupts(struct seq_file *p, void *v)
+ {
+-	int i;
++	int i = *(loff_t *) v;
+ 
+-	for (i = 0; i < NR_IRQS; i++) {
++	if (i < NR_IRQS) {
+ 		if (irq_list[i]) {
+ 			seq_printf(p, "%3d: %10u ",i,irq_list[i]->count);
+ 			seq_printf(p, "%s\n", irq_list[i]->devname);
+--- linux-2.6.0/arch/i386/boot/setup.S	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/boot/setup.S	2003-12-28 23:26:36.000000000 -0800
+@@ -162,7 +162,7 @@ cmd_line_ptr:	.long 0			# (Header versio
+ 					# can be located anywhere in
+ 					# low memory 0x10000 or higher.
+ 
+-ramdisk_max:	.long MAXMEM-1		# (Header version 0x0203 or later)
++ramdisk_max:	.long __MAXMEM-1	# (Header version 0x0203 or later)
+ 					# The highest safe address for
+ 					# the contents of an initrd
+ 
+--- linux-2.6.0/arch/i386/Kconfig	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/Kconfig	2003-12-28 23:26:36.000000000 -0800
+@@ -115,10 +115,15 @@ config ACPI_SRAT
+ 	default y
+ 	depends on NUMA && (X86_SUMMIT || X86_GENERICARCH)
+ 
++config X86_SUMMIT_NUMA
++	bool
++	default y
++	depends on NUMA && (X86_SUMMIT || X86_GENERICARCH)
++
+ config X86_CYCLONE_TIMER
+-       bool 
+-       default y
+-       depends on X86_SUMMIT || X86_GENERICARCH
++	bool
++	default y
++	depends on X86_SUMMIT || X86_GENERICARCH
+ 
+ config ES7000_CLUSTERED_APIC
+ 	bool
+@@ -397,6 +402,54 @@ config X86_OOSTORE
+ 	depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6
+ 	default y
+ 
++config X86_4G
++	bool "4 GB kernel-space and 4 GB user-space virtual memory support"
++	help
++          This option is only useful for systems that have more than 1 GB
++          of RAM.
++
++          The default kernel VM layout leaves 1 GB of virtual memory for
++          kernel-space mappings, and 3 GB of VM for user-space applications.
++          This option ups both the kernel-space VM and the user-space VM to
++          4 GB.
++
++          The cost of this option is additional TLB flushes done at
++          system-entry points that transition from user-mode into kernel-mode.
++          I.e. system calls and page faults, and IRQs that interrupt user-mode
++          code. There's also additional overhead to kernel operations that copy
++          memory to/from user-space. The overhead from this is hard to tell and
++          depends on the workload - it can be anything from no visible overhead
++          to 20-30% overhead. A good rule of thumb is to count with a runtime
++          overhead of 20%.
++
++          The upside is the much increased kernel-space VM, which more than
++          quadruples the maximum amount of RAM supported. Kernels compiled with
++          this option boot on 64GB of RAM and still have more than 3.1 GB of
++          'lowmem' left. Another bonus is that highmem IO bouncing decreases,
++          if used with drivers that still use bounce-buffers.
++
++          There's also a 33% increase in user-space VM size - database
++          applications might see a boost from this.
++
++          But the cost of the TLB flushes and the runtime overhead has to be
++          weighed against the bonuses offered by the larger VM spaces. The
++          dividing line depends on the actual workload - there might be 4 GB
++          systems that benefit from this option. Systems with less than 4 GB
++          of RAM will rarely see a benefit from this option - but it's not
++          out of question, the exact circumstances have to be considered.
++
++config X86_SWITCH_PAGETABLES
++	def_bool X86_4G
++
++config X86_4G_VM_LAYOUT
++	def_bool X86_4G
++
++config X86_UACCESS_INDIRECT
++	def_bool X86_4G
++
++config X86_HIGH_ENTRY
++	def_bool X86_4G
++
+ config HPET_TIMER
+ 	bool "HPET Timer Support"
+ 	help
+@@ -784,6 +837,25 @@ config MTRR
+ 
+ 	  See <file:Documentation/mtrr.txt> for more information.
+ 
++config EFI
++	bool "Boot from EFI support (EXPERIMENTAL)"
++	depends on ACPI
++	default n
++	---help---
++
++	This enables the the kernel to boot on EFI platforms using
++	system configuration information passed to it from the firmware.
++	This also enables the kernel to use any EFI runtime services that are
++	available (such as the EFI variable services).
++
++	This option is only useful on systems that have EFI firmware
++	and will result in a kernel image that is ~8k larger.  In addition,
++	you must use the latest ELILO loader available at
++	ftp.hpl.hp.com/pub/linux-ia64/ in order to take advantage of kernel
++	initialization using EFI information (neither GRUB nor LILO know
++	anything about EFI).  However, even with this option, the resultant
++	kernel should continue to boot on existing non-EFI platforms.
++
+ config HAVE_DEC_LOCK
+ 	bool
+ 	depends on (SMP || PREEMPT) && X86_CMPXCHG
+@@ -793,7 +865,7 @@ config HAVE_DEC_LOCK
+ # Summit needs it only when NUMA is on
+ config BOOT_IOREMAP
+ 	bool
+-	depends on ((X86_SUMMIT || X86_GENERICARCH) && NUMA)
++	depends on (((X86_SUMMIT || X86_GENERICARCH) && NUMA) || (X86 && EFI))
+ 	default y
+ 
+ endmenu
+@@ -1030,6 +1102,25 @@ config PCI_DIRECT
+  	depends on PCI && ((PCI_GODIRECT || PCI_GOANY) || X86_VISWS)
+ 	default y
+ 
++config PCI_USE_VECTOR
++	bool "Vector-based interrupt indexing"
++	depends on X86_LOCAL_APIC
++	default n
++	help
++	   This replaces the current existing IRQ-based index interrupt scheme
++	   with the vector-base index scheme. The advantages of vector base
++	   over IRQ base are listed below:
++	   1) Support MSI implementation.
++	   2) Support future IOxAPIC hotplug
++
++	   Note that this enables MSI, Message Signaled Interrupt, on all
++	   MSI capable device functions detected if users also install the
++	   MSI patch. Message Signal Interrupt enables an MSI-capable
++	   hardware device to send an inbound Memory Write on its PCI bus
++	   instead of asserting IRQ signal on device IRQ pin.
++
++	   If you don't know what to do here, say N.
++
+ source "drivers/pci/Kconfig"
+ 
+ config ISA
+@@ -1187,6 +1278,15 @@ config DEBUG_PAGEALLOC
+ 	  This results in a large slowdown, but helps to find certain types
+ 	  of memory corruptions.
+ 
++config SPINLINE
++	bool "Spinlock inlining"
++	depends on DEBUG_KERNEL
++	help
++	  This will change spinlocks from out of line to inline, making them
++	  account cost to the callers in readprofile, rather than the lock
++	  itself (as ".text.lock.filename"). This can be helpful for finding
++	  the callers of locks.
++
+ config DEBUG_HIGHMEM
+ 	bool "Highmem debugging"
+ 	depends on DEBUG_KERNEL && HIGHMEM
+@@ -1203,20 +1303,208 @@ config DEBUG_INFO
+ 	  Say Y here only if you plan to use gdb to debug the kernel.
+ 	  If you don't debug the kernel, you can say N.
+ 	  
++config LOCKMETER
++	bool "Kernel lock metering"
++	depends on SMP
++	help
++	  Say Y to enable kernel lock metering, which adds overhead to SMP locks,
++	  but allows you to see various statistics using the lockstat command.
++
+ config DEBUG_SPINLOCK_SLEEP
+ 	bool "Sleep-inside-spinlock checking"
+ 	help
+ 	  If you say Y here, various routines which may sleep will become very
+ 	  noisy if they are called with a spinlock held.	
+ 
++config KGDB
++	bool "Include kgdb kernel debugger"
++	depends on DEBUG_KERNEL
++	help
++	  If you say Y here, the system will be compiled with the debug
++	  option (-g) and a debugging stub will be included in the
++	  kernel.  This stub communicates with gdb on another (host)
++	  computer via a serial port.  The host computer should have
++	  access to the kernel binary file (vmlinux) and a serial port
++	  that is connected to the target machine.  Gdb can be made to
++	  configure the serial port or you can use stty and setserial to
++	  do this. See the 'target' command in gdb. This option also
++	  configures in the ability to request a breakpoint early in the
++	  boot process.  To request the breakpoint just include 'kgdb'
++	  as a boot option when booting the target machine.  The system
++	  will then break as soon as it looks at the boot options.  This
++	  option also installs a breakpoint in panic and sends any
++	  kernel faults to the debugger. For more information see the
++	  Documentation/i386/kgdb.txt file.
++
++choice
++	depends on KGDB
++    	prompt "Debug serial port BAUD"
++	default KGDB_115200BAUD
++	help
++	  Gdb and the kernel stub need to agree on the baud rate to be
++	  used.  Some systems (x86 family at this writing) allow this to
++	  be configured.
++
++config KGDB_9600BAUD
++	bool "9600"
++
++config KGDB_19200BAUD
++	bool "19200"
++
++config KGDB_38400BAUD
++	bool "38400"
++
++config KGDB_57600BAUD
++	bool "57600"
++
++config KGDB_115200BAUD
++	bool "115200"
++endchoice
++
++config KGDB_PORT
++	hex "hex I/O port address of the debug serial port"
++	depends on KGDB
++	default  3f8
++	help
++	  Some systems (x86 family at this writing) allow the port
++	  address to be configured.  The number entered is assumed to be
++	  hex, don't put 0x in front of it.  The standard address are:
++	  COM1 3f8 , irq 4 and COM2 2f8 irq 3.  Setserial /dev/ttySx
++	  will tell you what you have.  It is good to test the serial
++	  connection with a live system before trying to debug.
++
++config KGDB_IRQ
++	int "IRQ of the debug serial port"
++	depends on KGDB
++	default 4
++	help
++	  This is the irq for the debug port.  If everything is working
++	  correctly and the kernel has interrupts on a control C to the
++	  port should cause a break into the kernel debug stub.
++
++config DEBUG_INFO
++	bool
++	depends on KGDB
++	default y
++
++config KGDB_MORE
++	bool "Add any additional compile options"
++	depends on KGDB
++	default n
++	help
++	  Saying yes here turns on the ability to enter additional
++	  compile options.
++
++
++config KGDB_OPTIONS
++	depends on KGDB_MORE
++	string "Additional compile arguments"
++	default "-O1"
++	help
++	  This option allows you enter additional compile options for
++	  the whole kernel compile.  Each platform will have a default
++	  that seems right for it.  For example on PPC "-ggdb -O1", and
++	  for i386 "-O1".  Note that by configuring KGDB "-g" is already
++	  turned on.  In addition, on i386 platforms
++	  "-fomit-frame-pointer" is deleted from the standard compile
++	  options.
++
++config NO_KGDB_CPUS
++	int "Number of CPUs"
++	depends on KGDB && SMP
++	default NR_CPUS
++	help
++
++	  This option sets the number of cpus for kgdb ONLY.  It is used
++	  to prune some internal structures so they look "nice" when
++	  displayed with gdb.  This is to overcome possibly larger
++	  numbers that may have been entered above.  Enter the real
++	  number to get nice clean kgdb_info displays.
++
++config KGDB_TS
++	bool "Enable kgdb time stamp macros?"
++	depends on KGDB
++	default n
++	help
++	  Kgdb event macros allow you to instrument your code with calls
++	  to the kgdb event recording function.  The event log may be
++	  examined with gdb at a break point.  Turning on this
++	  capability also allows you to choose how many events to
++	  keep. Kgdb always keeps the lastest events.
++
++choice
++	depends on KGDB_TS
++	prompt "Max number of time stamps to save?"
++	default KGDB_TS_128
++
++config KGDB_TS_64
++	bool "64"
++
++config KGDB_TS_128
++	bool "128"
++
++config KGDB_TS_256
++	bool "256"
++
++config KGDB_TS_512
++	bool "512"
++
++config KGDB_TS_1024
++	bool "1024"
++
++endchoice
++
++config STACK_OVERFLOW_TEST
++	bool "Turn on kernel stack overflow testing?"
++	depends on KGDB
++	default n
++	help
++	  This option enables code in the front line interrupt handlers
++	  to check for kernel stack overflow on interrupts and system
++	  calls.  This is part of the kgdb code on x86 systems.
++
++config KGDB_CONSOLE
++	bool "Enable serial console thru kgdb port"
++	depends on KGDB
++	default n
++	help
++	  This option enables the command line "console=kgdb" option.
++	  When the system is booted with this option in the command line
++	  all kernel printk output is sent to gdb (as well as to other
++	  consoles).  For this to work gdb must be connected.  For this
++	  reason, this command line option will generate a breakpoint if
++	  gdb has not yet connected.  After the gdb continue command is
++	  given all pent up console output will be printed by gdb on the
++	  host machine.  Neither this option, nor KGDB require the
++	  serial driver to be configured.
++
++config KGDB_SYSRQ
++	bool "Turn on SysRq 'G' command to do a break?"
++	depends on KGDB
++	default y
++	help
++	  This option includes an option in the SysRq code that allows
++	  you to enter SysRq G which generates a breakpoint to the KGDB
++	  stub.  This will work if the keyboard is alive and can
++	  interrupt the system.  Because of constraints on when the
++	  serial port interrupt can be enabled, this code may allow you
++	  to interrupt the system before the serial port control C is
++	  available.  Just say yes here.
++
+ config FRAME_POINTER
+ 	bool "Compile the kernel with frame pointers"
++	default KGDB
+ 	help
+ 	  If you say Y here the resulting kernel image will be slightly larger
+ 	  and slower, but it will give very useful debugging information.
+ 	  If you don't debug the kernel, you can say N, but we may not be able
+ 	  to solve problems without frame pointers.
+ 
++config MAGIC_SYSRQ
++	bool
++	depends on KGDB_SYSRQ
++	default y
++
+ config X86_EXTRA_IRQS
+ 	bool
+ 	depends on X86_LOCAL_APIC || X86_VOYAGER
+--- linux-2.6.0/arch/i386/kernel/acpi/boot.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/arch/i386/kernel/acpi/boot.c	2003-12-28 23:21:57.000000000 -0800
+@@ -26,6 +26,7 @@
+ #include <linux/init.h>
+ #include <linux/config.h>
+ #include <linux/acpi.h>
++#include <linux/efi.h>
+ #include <asm/pgalloc.h>
+ #include <asm/io_apic.h>
+ #include <asm/apic.h>
+@@ -40,9 +41,8 @@
+ 
+ #define PREFIX			"ACPI: "
+ 
+-extern int acpi_disabled;
+-extern int acpi_irq;
+-extern int acpi_ht;
++int acpi_noirq __initdata = 0;	/* skip ACPI IRQ initialization */
++int acpi_ht __initdata = 1;	/* enable HT */
+ 
+ int acpi_lapic = 0;
+ int acpi_ioapic = 0;
+@@ -249,29 +249,66 @@ acpi_parse_nmi_src (
+ 
+ #ifdef	CONFIG_ACPI_BUS
+ /*
+- * Set specified PIC IRQ to level triggered mode.
++ * "acpi_pic_sci=level" (current default)
++ * programs the PIC-mode SCI to Level Trigger.
++ * (NO-OP if the BIOS set Level Trigger already)
++ *
++ * If a PIC-mode SCI is not recogznied or gives spurious IRQ7's
++ * it may require Edge Trigger -- use "acpi_pic_sci=edge"
++ * (NO-OP if the BIOS set Edge Trigger already)
+  *
+  * Port 0x4d0-4d1 are ECLR1 and ECLR2, the Edge/Level Control Registers
+  * for the 8259 PIC.  bit[n] = 1 means irq[n] is Level, otherwise Edge.
+  * ECLR1 is IRQ's 0-7 (IRQ 0, 1, 2 must be 0)
+  * ECLR2 is IRQ's 8-15 (IRQ 8, 13 must be 0)
+- *
+- * As the BIOS should have done this for us,
+- * print a warning if the IRQ wasn't already set to level.
+  */
+ 
+-void acpi_pic_set_level_irq(unsigned int irq)
++static int __initdata	acpi_pic_sci_trigger;	/* 0: level, 1: edge */
++
++void __init
++acpi_pic_sci_set_trigger(unsigned int irq)
+ {
+ 	unsigned char mask = 1 << (irq & 7);
+ 	unsigned int port = 0x4d0 + (irq >> 3);
+ 	unsigned char val = inb(port);
+ 
++	
++	printk(PREFIX "IRQ%d SCI:", irq);
+ 	if (!(val & mask)) {
+-		printk(KERN_WARNING PREFIX "IRQ %d was Edge Triggered, "
+-			"setting to Level Triggerd\n", irq);
+-		outb(val | mask, port);
++		printk(" Edge");
++
++		if (!acpi_pic_sci_trigger) {
++			printk(" set to Level");
++			outb(val | mask, port);
++		}
++	} else {
++		printk(" Level");
++
++		if (acpi_pic_sci_trigger) {
++			printk(" set to Edge");
++			outb(val | mask, port);
++		}
++	}
++	printk(" Trigger.\n");
++}
++
++int __init
++acpi_pic_sci_setup(char *str)
++{
++	while (str && *str) {
++		if (strncmp(str, "level", 5) == 0)
++			acpi_pic_sci_trigger = 0;	/* force level trigger */
++		if (strncmp(str, "edge", 4) == 0)
++			acpi_pic_sci_trigger = 1;	/* force edge trigger */
++		str = strchr(str, ',');
++		if (str)
++			str += strspn(str, ", \t");
+ 	}
++	return 1;
+ }
++
++__setup("acpi_pic_sci=", acpi_pic_sci_setup);
++
+ #endif /* CONFIG_ACPI_BUS */
+ 
+ 
+@@ -326,11 +363,48 @@ static int __init acpi_parse_hpet(unsign
+ }
+ #endif
+ 
++/* detect the location of the ACPI PM Timer */
++#ifdef CONFIG_X86_PM_TIMER
++extern u32 pmtmr_ioport;
++
++static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
++{
++	struct fadt_descriptor_rev2 *fadt =0;
++
++	fadt = (struct fadt_descriptor_rev2*) __acpi_map_table(phys,size);
++	if(!fadt) {
++		printk(KERN_WARNING PREFIX "Unable to map FADT\n");
++		return 0;
++	}
++
++	if (fadt->revision >= FADT2_REVISION_ID) {
++		/* FADT rev. 2 */
++		if (fadt->xpm_tmr_blk.address_space_id != ACPI_ADR_SPACE_SYSTEM_IO)
++			return 0;
++
++		pmtmr_ioport = fadt->xpm_tmr_blk.address;
++	} else {
++		/* FADT rev. 1 */
++		pmtmr_ioport = fadt->V1_pm_tmr_blk;
++	}
++	if (pmtmr_ioport)
++		printk(KERN_INFO PREFIX "PM-Timer IO Port: %#x\n", pmtmr_ioport);
++	return 0;
++}
++#endif
++
++
+ unsigned long __init
+ acpi_find_rsdp (void)
+ {
+ 	unsigned long		rsdp_phys = 0;
+ 
++	if (efi_enabled) {
++		if (efi.acpi20)
++			return __pa(efi.acpi20);
++		else if (efi.acpi)
++			return __pa(efi.acpi);
++	}
+ 	/*
+ 	 * Scan memory looking for the RSDP signature. First search EBDA (low
+ 	 * memory) paragraphs and then search upper memory (E0000-FFFFF).
+@@ -380,8 +454,10 @@ acpi_boot_init (void)
+ 	 * Initialize the ACPI boot-time table parser.
+ 	 */
+ 	result = acpi_table_init();
+-	if (result)
++	if (result) {
++		acpi_disabled = 1;
+ 		return result;
++	}
+ 
+ 	result = acpi_blacklisted();
+ 	if (result) {
+@@ -462,7 +538,7 @@ acpi_boot_init (void)
+ 	 * If MPS is present, it will handle them,
+ 	 * otherwise the system will stay in PIC mode
+ 	 */
+-	if (acpi_disabled || !acpi_irq) {
++	if (acpi_disabled || acpi_noirq) {
+ 		return 1;
+         }
+ 
+@@ -504,6 +580,8 @@ acpi_boot_init (void)
+ 
+ 	acpi_irq_model = ACPI_IRQ_MODEL_IOAPIC;
+ 
++	acpi_irq_balance_set(NULL);
++
+ 	acpi_ioapic = 1;
+ 
+ #endif /* CONFIG_X86_IO_APIC && CONFIG_ACPI_INTERPRETER */
+@@ -519,5 +597,9 @@ acpi_boot_init (void)
+ 	acpi_table_parse(ACPI_HPET, acpi_parse_hpet);
+ #endif
+ 
++#ifdef CONFIG_X86_PM_TIMER
++	acpi_table_parse(ACPI_FADT, acpi_parse_fadt);
++#endif
++
+ 	return 0;
+ }
+--- linux-2.6.0/arch/i386/kernel/asm-offsets.c	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/kernel/asm-offsets.c	2003-12-28 23:26:36.000000000 -0800
+@@ -4,9 +4,11 @@
+  * to extract and format the required data.
+  */
+ 
++#include <linux/sched.h>
+ #include <linux/signal.h>
+ #include <asm/ucontext.h>
+ #include "sigframe.h"
++#include <asm/fixmap.h>
+ 
+ #define DEFINE(sym, val) \
+         asm volatile("\n->" #sym " %0 " #val : : "i" (val))
+@@ -28,4 +30,17 @@ void foo(void)
+ 
+ 	DEFINE(RT_SIGFRAME_sigcontext,
+ 	       offsetof (struct rt_sigframe, uc.uc_mcontext));
++	DEFINE(TI_task, offsetof (struct thread_info, task));
++	DEFINE(TI_exec_domain, offsetof (struct thread_info, exec_domain));
++	DEFINE(TI_flags, offsetof (struct thread_info, flags));
++	DEFINE(TI_preempt_count, offsetof (struct thread_info, preempt_count));
++	DEFINE(TI_addr_limit, offsetof (struct thread_info, addr_limit));
++	DEFINE(TI_real_stack, offsetof (struct thread_info, real_stack));
++	DEFINE(TI_virtual_stack, offsetof (struct thread_info, virtual_stack));
++	DEFINE(TI_user_pgd, offsetof (struct thread_info, user_pgd));
++
++	DEFINE(FIX_ENTRY_TRAMPOLINE_0_addr, __fix_to_virt(FIX_ENTRY_TRAMPOLINE_0));
++	DEFINE(FIX_VSYSCALL_addr, __fix_to_virt(FIX_VSYSCALL));
++	DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
++	DEFINE(task_thread_db7, offsetof (struct task_struct, thread.debugreg[7]));
+ }
+--- linux-2.6.0/arch/i386/kernel/cpu/common.c	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/kernel/cpu/common.c	2003-12-28 23:26:36.000000000 -0800
+@@ -510,16 +510,20 @@ void __init cpu_init (void)
+ 		BUG();
+ 	enter_lazy_tlb(&init_mm, current);
+ 
+-	load_esp0(t, thread->esp0);
++	load_esp0(t, thread);
+ 	set_tss_desc(cpu,t);
+ 	cpu_gdt_table[cpu][GDT_ENTRY_TSS].b &= 0xfffffdff;
+ 	load_TR_desc();
+-	load_LDT(&init_mm.context);
++	if (cpu)
++		load_LDT(&init_mm.context);
+ 
+ 	/* Set up doublefault TSS pointer in the GDT */
+ 	__set_tss_desc(cpu, GDT_ENTRY_DOUBLEFAULT_TSS, &doublefault_tss);
+ 	cpu_gdt_table[cpu][GDT_ENTRY_DOUBLEFAULT_TSS].b &= 0xfffffdff;
+ 
++	if (cpu)
++		trap_init_virtual_GDT();
++
+ 	/* Clear %fs and %gs. */
+ 	asm volatile ("xorl %eax, %eax; movl %eax, %fs; movl %eax, %gs");
+ 
+--- linux-2.6.0/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c	2003-09-08 13:58:55.000000000 -0700
++++ 25/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c	2003-12-28 23:22:07.000000000 -0800
+@@ -73,6 +73,16 @@ static struct cpufreq_frequency_table op
+ 	{ .frequency = CPUFREQ_TABLE_END }
+ };
+ 
++/* Ultra Low Voltage Intel Pentium M processor 1000MHz */
++static struct cpufreq_frequency_table op_1000[] =
++  {
++    OP(600,  844),
++    OP(800,  972),
++    OP(900, 988),
++    OP(1000, 1004),
++    { .frequency = CPUFREQ_TABLE_END }
++  };
++
+ /* Low Voltage Intel Pentium M processor 1.10GHz */
+ static struct cpufreq_frequency_table op_1100[] =
+ {
+@@ -165,6 +175,7 @@ static struct cpufreq_frequency_table op
+ static const struct cpu_model models[] = 
+ {
+        _CPU( 900, " 900"),
++       CPU(1000),
+ 	CPU(1100),
+ 	CPU(1200),
+ 	CPU(1300),
+--- linux-2.6.0/arch/i386/kernel/cpu/intel.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/arch/i386/kernel/cpu/intel.c	2003-12-28 23:26:36.000000000 -0800
+@@ -1,5 +1,7 @@
++#include <linux/config.h>
+ #include <linux/init.h>
+ #include <linux/kernel.h>
++
+ #include <linux/string.h>
+ #include <linux/bitops.h>
+ #include <linux/smp.h>
+@@ -8,10 +10,15 @@
+ #include <asm/processor.h>
+ #include <asm/msr.h>
+ #include <asm/uaccess.h>
++#include <asm/desc.h>
+ 
+ #include "cpu.h"
+ 
+-extern int trap_init_f00f_bug(void);
++#ifdef CONFIG_X86_LOCAL_APIC
++#include <asm/mpspec.h>
++#include <asm/apic.h>
++#include <mach_apic.h>
++#endif
+ 
+ #ifdef CONFIG_X86_INTEL_USERCOPY
+ /*
+@@ -157,7 +164,7 @@ static void __init init_intel(struct cpu
+ 
+ 		c->f00f_bug = 1;
+ 		if ( !f00f_workaround_enabled ) {
+-			trap_init_f00f_bug();
++			trap_init_virtual_IDT();
+ 			printk(KERN_NOTICE "Intel Pentium with F0 0F bug - workaround enabled.\n");
+ 			f00f_workaround_enabled = 1;
+ 		}
+@@ -240,6 +247,12 @@ static void __init init_intel(struct cpu
+ 	/* SEP CPUID bug: Pentium Pro reports SEP but doesn't have it until model 3 mask 3 */
+ 	if ((c->x86<<8 | c->x86_model<<4 | c->x86_mask) < 0x633)
+ 		clear_bit(X86_FEATURE_SEP, c->x86_capability);
++	/*
++	 * FIXME: SEP is disabled for 4G/4G for now:
++	 */
++#ifdef CONFIG_X86_HIGH_ENTRY
++	clear_bit(X86_FEATURE_SEP, c->x86_capability);
++#endif
+ 
+ 	/* Names for the Pentium II/Celeron processors 
+ 	   detectable only by also checking the cache size.
+@@ -277,6 +290,7 @@ static void __init init_intel(struct cpu
+ 		extern	int phys_proc_id[NR_CPUS];
+ 		
+ 		u32 	eax, ebx, ecx, edx;
++		int 	index_lsb, index_msb, tmp;
+ 		int 	cpu = smp_processor_id();
+ 
+ 		cpuid(1, &eax, &ebx, &ecx, &edx);
+@@ -285,6 +299,8 @@ static void __init init_intel(struct cpu
+ 		if (smp_num_siblings == 1) {
+ 			printk(KERN_INFO  "CPU: Hyper-Threading is disabled\n");
+ 		} else if (smp_num_siblings > 1 ) {
++			index_lsb = 0;
++			index_msb = 31;
+ 			/*
+ 			 * At this point we only support two siblings per
+ 			 * processor package.
+@@ -295,13 +311,19 @@ static void __init init_intel(struct cpu
+ 				smp_num_siblings = 1;
+ 				goto too_many_siblings;
+ 			}
+-			/* cpuid returns the value latched in the HW at reset,
+-			 * not the APIC ID register's value.  For any box
+-			 * whose BIOS changes APIC IDs, like clustered APIC
+-			 * systems, we must use hard_smp_processor_id.
+-			 * See Intel's IA-32 SW Dev's Manual Vol2 under CPUID.
+-			 */
+-			phys_proc_id[cpu] = hard_smp_processor_id() & ~(smp_num_siblings - 1);
++			tmp = smp_num_siblings;
++			while ((tmp & 1) == 0) {
++				tmp >>=1 ;
++				index_lsb++;
++			}
++			tmp = smp_num_siblings;
++			while ((tmp & 0x80000000 ) == 0) {
++				tmp <<=1 ;
++				index_msb--;
++			}
++			if (index_lsb != index_msb )
++				index_msb++;
++			phys_proc_id[cpu] = phys_pkg_id((ebx >> 24) & 0xFF, index_msb);
+ 
+ 			printk(KERN_INFO  "CPU: Physical Processor ID: %d\n",
+                                phys_proc_id[cpu]);
+--- linux-2.6.0/arch/i386/kernel/dmi_scan.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/i386/kernel/dmi_scan.c	2003-12-28 23:21:33.000000000 -0800
+@@ -6,6 +6,7 @@
+ #include <linux/module.h>
+ #include <linux/apm_bios.h>
+ #include <linux/slab.h>
++#include <asm/acpi.h>
+ #include <asm/io.h>
+ #include <linux/pm.h>
+ #include <asm/system.h>
+@@ -16,6 +17,7 @@ EXPORT_SYMBOL(dmi_broken);
+ 
+ int is_sony_vaio_laptop;
+ int is_unsafe_smbus;
++int es7000_plat = 0;
+ 
+ struct dmi_header
+ {
+@@ -504,6 +506,7 @@ static __init int print_if_true(struct d
+ }
+ 
+ 
++#ifdef	CONFIG_ACPI_BOOT
+ extern int acpi_disabled, acpi_force;
+ 
+ static __init __attribute__((unused)) int acpi_disable(struct dmi_blacklist *d) 
+@@ -518,8 +521,6 @@ static __init __attribute__((unused)) in
+ 	return 0;
+ } 
+ 
+-
+-#ifdef	CONFIG_ACPI_BOOT
+ extern int acpi_ht;
+ 
+ /*
+@@ -542,10 +543,8 @@ static __init __attribute__((unused)) in
+ #ifdef	CONFIG_ACPI_PCI
+ static __init int disable_acpi_pci(struct dmi_blacklist *d) 
+ { 
+-	extern __init void pci_disable_acpi(void) ;
+-
+ 	printk(KERN_NOTICE "%s detected: force use of pci=noacpi\n", d->ident); 	
+-	pci_disable_acpi();
++	acpi_noirq_set();
+ 	return 0;
+ } 
+ #endif
+@@ -1011,6 +1010,7 @@ static __init void dmi_check_blacklist(v
+ 				printk(KERN_NOTICE "ACPI disabled because your bios is from %s and too old\n", s);
+ 				printk(KERN_NOTICE "You can enable it with acpi=force\n");
+ 				acpi_disabled = 1; 
++				acpi_ht = 0;
+ 			} 
+ 		}
+ 	}
+--- linux-2.6.0/arch/i386/kernel/doublefault.c	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/kernel/doublefault.c	2003-12-28 23:26:36.000000000 -0800
+@@ -7,12 +7,13 @@
+ #include <asm/uaccess.h>
+ #include <asm/pgtable.h>
+ #include <asm/desc.h>
++#include <asm/fixmap.h>
+ 
+ #define DOUBLEFAULT_STACKSIZE (1024)
+ static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
+ #define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
+ 
+-#define ptr_ok(x) ((x) > 0xc0000000 && (x) < 0xc1000000)
++#define ptr_ok(x) (((x) > __PAGE_OFFSET && (x) < (__PAGE_OFFSET + 0x01000000)) || ((x) >= FIXADDR_START))
+ 
+ static void doublefault_fn(void)
+ {
+@@ -38,8 +39,8 @@ static void doublefault_fn(void)
+ 
+ 			printk("eax = %08lx, ebx = %08lx, ecx = %08lx, edx = %08lx\n",
+ 				t->eax, t->ebx, t->ecx, t->edx);
+-			printk("esi = %08lx, edi = %08lx\n",
+-				t->esi, t->edi);
++			printk("esi = %08lx, edi = %08lx, ebp = %08lx\n",
++				t->esi, t->edi, t->ebp);
+ 		}
+ 	}
+ 
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/arch/i386/kernel/efi.c	2003-12-28 23:21:45.000000000 -0800
+@@ -0,0 +1,645 @@
++/*
++ * Extensible Firmware Interface
++ *
++ * Based on Extensible Firmware Interface Specification version 1.0
++ *
++ * Copyright (C) 1999 VA Linux Systems
++ * Copyright (C) 1999 Walt Drummond <drummond@valinux.com>
++ * Copyright (C) 1999-2002 Hewlett-Packard Co.
++ *	David Mosberger-Tang <davidm@hpl.hp.com>
++ *	Stephane Eranian <eranian@hpl.hp.com>
++ *
++ * All EFI Runtime Services are not implemented yet as EFI only
++ * supports physical mode addressing on SoftSDV. This is to be fixed
++ * in a future version.  --drummond 1999-07-20
++ *
++ * Implemented EFI runtime services and virtual mode calls.  --davidm
++ *
++ * Goutham Rao: <goutham.rao@intel.com>
++ *	Skip non-WB memory and ignore empty memory ranges.
++ */
++
++#include <linux/config.h>
++#include <linux/kernel.h>
++#include <linux/init.h>
++#include <linux/mm.h>
++#include <linux/types.h>
++#include <linux/time.h>
++#include <linux/spinlock.h>
++#include <linux/bootmem.h>
++#include <linux/ioport.h>
++#include <linux/proc_fs.h>
++#include <linux/efi.h>
++
++#include <asm/setup.h>
++#include <asm/io.h>
++#include <asm/page.h>
++#include <asm/pgtable.h>
++#include <asm/processor.h>
++#include <asm/desc.h>
++#include <asm/pgalloc.h>
++#include <asm/tlbflush.h>
++
++#define EFI_DEBUG	0
++#define PFX 		"EFI: "
++
++extern efi_status_t asmlinkage efi_call_phys(void *, ...);
++
++struct efi efi;
++struct efi efi_phys __initdata;
++struct efi_memory_map memmap __initdata;
++
++/*
++ * We require an early boot_ioremap mapping mechanism initially
++ */
++extern void * boot_ioremap(unsigned long, unsigned long);
++
++/*
++ * efi_dir is allocated here, but the directory isn't created
++ * here, as proc_mkdir() doesn't work this early in the bootup
++ * process.  Therefore, each module, like efivars, must test for
++ *    if (!efi_dir) efi_dir = proc_mkdir("efi", NULL);
++ * prior to creating their own entries under /proc/efi.
++ */
++#ifdef CONFIG_PROC_FS
++struct proc_dir_entry *efi_dir;
++#endif
++
++
++/*
++ * To make EFI call EFI runtime service in physical addressing mode we need
++ * prelog/epilog before/after the invocation to disable interrupt, to
++ * claim EFI runtime service handler exclusively and to duplicate a memory in
++ * low memory space say 0 - 3G.
++ */
++
++static unsigned long efi_rt_eflags;
++static spinlock_t efi_rt_lock = SPIN_LOCK_UNLOCKED;
++static pgd_t efi_bak_pg_dir_pointer[2];
++
++static void efi_call_phys_prelog(void)
++{
++	unsigned long cr4;
++	unsigned long temp;
++
++	spin_lock(&efi_rt_lock);
++	local_irq_save(efi_rt_eflags);
++
++	/*
++	 * If I don't have PSE, I should just duplicate two entries in page
++	 * directory. If I have PSE, I just need to duplicate one entry in
++	 * page directory.
++	 */
++	__asm__ __volatile__("movl %%cr4, %0":"=r"(cr4));
++
++	if (cr4 & X86_CR4_PSE) {
++		efi_bak_pg_dir_pointer[0].pgd =
++		    swapper_pg_dir[pgd_index(0)].pgd;
++		swapper_pg_dir[0].pgd =
++		    swapper_pg_dir[pgd_index(PAGE_OFFSET)].pgd;
++	} else {
++		efi_bak_pg_dir_pointer[0].pgd =
++		    swapper_pg_dir[pgd_index(0)].pgd;
++		efi_bak_pg_dir_pointer[1].pgd =
++		    swapper_pg_dir[pgd_index(0x400000)].pgd;
++		swapper_pg_dir[pgd_index(0)].pgd =
++		    swapper_pg_dir[pgd_index(PAGE_OFFSET)].pgd;
++		temp = PAGE_OFFSET + 0x400000;
++		swapper_pg_dir[pgd_index(0x400000)].pgd =
++		    swapper_pg_dir[pgd_index(temp)].pgd;
++	}
++
++	/*
++	 * After the lock is released, the original page table is restored.
++	 */
++	local_flush_tlb();
++
++	cpu_gdt_descr[0].address = __pa(cpu_gdt_descr[0].address);
++	__asm__ __volatile__("lgdt %0":"=m"
++			    (*(struct Xgt_desc_struct *) __pa(&cpu_gdt_descr[0])));
++}
++
++static void efi_call_phys_epilog(void)
++{
++	unsigned long cr4;
++
++	cpu_gdt_descr[0].address =
++		(unsigned long) __va(cpu_gdt_descr[0].address);
++	__asm__ __volatile__("lgdt %0":"=m"(cpu_gdt_descr));
++	__asm__ __volatile__("movl %%cr4, %0":"=r"(cr4));
++
++	if (cr4 & X86_CR4_PSE) {
++		swapper_pg_dir[pgd_index(0)].pgd =
++		    efi_bak_pg_dir_pointer[0].pgd;
++	} else {
++		swapper_pg_dir[pgd_index(0)].pgd =
++		    efi_bak_pg_dir_pointer[0].pgd;
++		swapper_pg_dir[pgd_index(0x400000)].pgd =
++		    efi_bak_pg_dir_pointer[1].pgd;
++	}
++
++	/*
++	 * After the lock is released, the original page table is restored.
++	 */
++	local_flush_tlb();
++
++	local_irq_restore(efi_rt_eflags);
++	spin_unlock(&efi_rt_lock);
++}
++
++static efi_status_t
++phys_efi_set_virtual_address_map(unsigned long memory_map_size,
++				 unsigned long descriptor_size,
++				 u32 descriptor_version,
++				 efi_memory_desc_t *virtual_map)
++{
++	efi_status_t status;
++
++	efi_call_phys_prelog();
++	status = efi_call_phys(efi_phys.set_virtual_address_map,
++				     memory_map_size, descriptor_size,
++				     descriptor_version, virtual_map);
++	efi_call_phys_epilog();
++	return status;
++}
++
++efi_status_t
++phys_efi_get_time(efi_time_t *tm, efi_time_cap_t *tc)
++{
++	efi_status_t status;
++
++	efi_call_phys_prelog();
++	status = efi_call_phys(efi_phys.get_time, tm, tc);
++	efi_call_phys_epilog();
++	return status;
++}
++
++int inline efi_set_rtc_mmss(unsigned long nowtime)
++{
++	int real_seconds, real_minutes;
++	efi_status_t 	status;
++	efi_time_t 	eft;
++	efi_time_cap_t 	cap;
++
++	spin_lock(&efi_rt_lock);
++	status = efi.get_time(&eft, &cap);
++	spin_unlock(&efi_rt_lock);
++	if (status != EFI_SUCCESS)
++		panic("Ooops, efitime: can't read time!\n");
++	real_seconds = nowtime % 60;
++	real_minutes = nowtime / 60;
++
++	if (((abs(real_minutes - eft.minute) + 15)/30) & 1)
++		real_minutes += 30;
++	real_minutes %= 60;
++
++	eft.minute = real_minutes;
++	eft.second = real_seconds;
++
++	if (status != EFI_SUCCESS) {
++		printk("Ooops: efitime: can't read time!\n");
++		return -1;
++	}
++	return 0;
++}
++/*
++ * This should only be used during kernel init and before runtime
++ * services have been remapped, therefore, we'll need to call in physical
++ * mode.  Note, this call isn't used later, so mark it __init.
++ */
++unsigned long inline __init efi_get_time(void)
++{
++	efi_status_t status;
++	efi_time_t eft;
++	efi_time_cap_t cap;
++
++	status = phys_efi_get_time(&eft, &cap);
++	if (status != EFI_SUCCESS)
++		printk("Oops: efitime: can't read time status: 0x%lx\n",status);
++
++	return mktime(eft.year, eft.month, eft.day, eft.hour,
++			eft.minute, eft.second);
++}
++
++int is_available_memory(efi_memory_desc_t * md)
++{
++	if (!(md->attribute & EFI_MEMORY_WB))
++		return 0;
++
++	switch (md->type) {
++		case EFI_LOADER_CODE:
++		case EFI_LOADER_DATA:
++		case EFI_BOOT_SERVICES_CODE:
++		case EFI_BOOT_SERVICES_DATA:
++		case EFI_CONVENTIONAL_MEMORY:
++			return 1;
++	}
++	return 0;
++}
++
++/*
++ * We need to map the EFI memory map again after paging_init().
++ */
++void __init efi_map_memmap(void)
++{
++	memmap.map = NULL;
++
++	memmap.map = (efi_memory_desc_t *)
++		bt_ioremap((unsigned long) memmap.phys_map,
++			(memmap.nr_map * sizeof(efi_memory_desc_t)));
++
++	if (memmap.map == NULL)
++		printk(KERN_ERR PFX "Could not remap the EFI memmap!\n");
++}
++
++void __init print_efi_memmap(void)
++{
++	efi_memory_desc_t *md;
++	int i;
++
++	for (i = 0; i < memmap.nr_map; i++) {
++		md = &memmap.map[i];
++		printk(KERN_INFO "mem%02u: type=%u, attr=0x%llx, "
++			"range=[0x%016llx-0x%016llx) (%lluMB)\n",
++			i, md->type, md->attribute, md->phys_addr,
++			md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT),
++			(md->num_pages >> (20 - EFI_PAGE_SHIFT)));
++	}
++}
++
++/*
++ * Walks the EFI memory map and calls CALLBACK once for each EFI
++ * memory descriptor that has memory that is available for kernel use.
++ */
++void efi_memmap_walk(efi_freemem_callback_t callback, void *arg)
++{
++	int prev_valid = 0;
++	struct range {
++		unsigned long start;
++		unsigned long end;
++	} prev, curr;
++	efi_memory_desc_t *md;
++	unsigned long start, end;
++	int i;
++
++	for (i = 0; i < memmap.nr_map; i++) {
++		md = &memmap.map[i];
++
++		if ((md->num_pages == 0) || (!is_available_memory(md)))
++			continue;
++
++		curr.start = md->phys_addr;
++		curr.end = curr.start + (md->num_pages << EFI_PAGE_SHIFT);
++
++		if (!prev_valid) {
++			prev = curr;
++			prev_valid = 1;
++		} else {
++			if (curr.start < prev.start)
++				printk(KERN_INFO PFX "Unordered memory map\n");
++			if (prev.end == curr.start)
++				prev.end = curr.end;
++			else {
++				start =
++				    (unsigned long) (PAGE_ALIGN(prev.start));
++				end = (unsigned long) (prev.end & PAGE_MASK);
++				if ((end > start)
++				    && (*callback) (start, end, arg) < 0)
++					return;
++				prev = curr;
++			}
++		}
++	}
++	if (prev_valid) {
++		start = (unsigned long) PAGE_ALIGN(prev.start);
++		end = (unsigned long) (prev.end & PAGE_MASK);
++		if (end > start)
++			(*callback) (start, end, arg);
++	}
++}
++
++void __init efi_init(void)
++{
++	efi_config_table_t *config_tables;
++	efi_runtime_services_t *runtime;
++	efi_char16_t *c16;
++	char vendor[100] = "unknown";
++	unsigned long num_config_tables;
++	int i = 0;
++
++	memset(&efi, 0, sizeof(efi) );
++	memset(&efi_phys, 0, sizeof(efi_phys));
++
++	efi_phys.systab = EFI_SYSTAB;
++	memmap.phys_map = EFI_MEMMAP;
++	memmap.nr_map = EFI_MEMMAP_SIZE/EFI_MEMDESC_SIZE;
++	memmap.desc_version = EFI_MEMDESC_VERSION;
++
++	efi.systab = (efi_system_table_t *)
++		boot_ioremap((unsigned long) efi_phys.systab,
++			sizeof(efi_system_table_t));
++	/*
++	 * Verify the EFI Table
++	 */
++	if (efi.systab == NULL)
++		printk(KERN_ERR PFX "Woah! Couldn't map the EFI system table.\n");
++	if (efi.systab->hdr.signature != EFI_SYSTEM_TABLE_SIGNATURE)
++		printk(KERN_ERR PFX "Woah! EFI system table signature incorrect\n");
++	if ((efi.systab->hdr.revision ^ EFI_SYSTEM_TABLE_REVISION) >> 16 != 0)
++		printk(KERN_ERR PFX
++		       "Warning: EFI system table major version mismatch: "
++		       "got %d.%02d, expected %d.%02d\n",
++		       efi.systab->hdr.revision >> 16,
++		       efi.systab->hdr.revision & 0xffff,
++		       EFI_SYSTEM_TABLE_REVISION >> 16,
++		       EFI_SYSTEM_TABLE_REVISION & 0xffff);
++	/*
++	 * Grab some details from the system table
++	 */
++	num_config_tables = efi.systab->nr_tables;
++	config_tables = (efi_config_table_t *)efi.systab->tables;
++	runtime = efi.systab->runtime;
++
++	/*
++	 * Show what we know for posterity
++	 */
++	c16 = (efi_char16_t *) boot_ioremap(efi.systab->fw_vendor, 2);
++	if (c16) {
++		for (i = 0; i < sizeof(vendor) && *c16; ++i)
++			vendor[i] = *c16++;
++		vendor[i] = '\0';
++	} else
++		printk(KERN_ERR PFX "Could not map the firmware vendor!\n");
++
++	printk(KERN_INFO PFX "EFI v%u.%.02u by %s \n",
++	       efi.systab->hdr.revision >> 16,
++	       efi.systab->hdr.revision & 0xffff, vendor);
++
++	/*
++	 * Let's see what config tables the firmware passed to us.
++	 */
++	config_tables = (efi_config_table_t *)
++				boot_ioremap((unsigned long) config_tables,
++			        num_config_tables * sizeof(efi_config_table_t));
++
++	if (config_tables == NULL)
++		printk(KERN_ERR PFX "Could not map EFI Configuration Table!\n");
++
++	for (i = 0; i < num_config_tables; i++) {
++		if (efi_guidcmp(config_tables[i].guid, MPS_TABLE_GUID) == 0) {
++			efi.mps = (void *)config_tables[i].table;
++			printk(KERN_INFO " MPS=0x%lx ", config_tables[i].table);
++		} else
++		    if (efi_guidcmp(config_tables[i].guid, ACPI_20_TABLE_GUID) == 0) {
++			efi.acpi20 = __va(config_tables[i].table);
++			printk(KERN_INFO " ACPI 2.0=0x%lx ", config_tables[i].table);
++		} else
++		    if (efi_guidcmp(config_tables[i].guid, ACPI_TABLE_GUID) == 0) {
++			efi.acpi = __va(config_tables[i].table);
++			printk(KERN_INFO " ACPI=0x%lx ", config_tables[i].table);
++		} else
++		    if (efi_guidcmp(config_tables[i].guid, SMBIOS_TABLE_GUID) == 0) {
++			efi.smbios = (void *) config_tables[i].table;
++			printk(KERN_INFO " SMBIOS=0x%lx ", config_tables[i].table);
++		} else
++		    if (efi_guidcmp(config_tables[i].guid, HCDP_TABLE_GUID) == 0) {
++			efi.hcdp = (void *)config_tables[i].table;
++			printk(KERN_INFO " HCDP=0x%lx ", config_tables[i].table);
++		} else
++		    if (efi_guidcmp(config_tables[i].guid, UGA_IO_PROTOCOL_GUID) == 0) {
++			efi.uga = (void *)config_tables[i].table;
++			printk(KERN_INFO " UGA=0x%lx ", config_tables[i].table);
++		}
++	}
++	printk("\n");
++
++	/*
++	 * Check out the runtime services table. We need to map
++	 * the runtime services table so that we can grab the physical
++	 * address of several of the EFI runtime functions, needed to
++	 * set the firmware into virtual mode.
++	 */
++
++	runtime = (efi_runtime_services_t *) boot_ioremap((unsigned long)
++						runtime,
++				      		sizeof(efi_runtime_services_t));
++	if (runtime != NULL) {
++		/*
++	 	 * We will only need *early* access to the following
++		 * two EFI runtime services before set_virtual_address_map
++		 * is invoked.
++ 	 	 */
++		efi_phys.get_time = (efi_get_time_t *) runtime->get_time;
++		efi_phys.set_virtual_address_map =
++			(efi_set_virtual_address_map_t *)
++				runtime->set_virtual_address_map;
++	} else
++		printk(KERN_ERR PFX "Could not map the runtime service table!\n");
++
++	/* Map the EFI memory map for use until paging_init() */
++
++	memmap.map = (efi_memory_desc_t *)
++		boot_ioremap((unsigned long) EFI_MEMMAP, EFI_MEMMAP_SIZE);
++
++	if (memmap.map == NULL)
++		printk(KERN_ERR PFX "Could not map the EFI memory map!\n");
++
++	if (EFI_MEMDESC_SIZE != sizeof(efi_memory_desc_t)) {
++		printk(KERN_WARNING PFX "Warning! Kernel-defined memdesc doesn't "
++			   "match the one from EFI!\n");
++	}
++#if EFI_DEBUG
++	print_efi_memmap();
++#endif
++}
++
++/*
++ * This function will switch the EFI runtime services to virtual mode.
++ * Essentially, look through the EFI memmap and map every region that
++ * has the runtime attribute bit set in its memory descriptor and update
++ * that memory descriptor with the virtual address obtained from ioremap().
++ * This enables the runtime services to be called without having to
++ * thunk back into physical mode for every invocation.
++ */
++
++void __init efi_enter_virtual_mode(void)
++{
++	efi_memory_desc_t *md;
++	efi_status_t status;
++	int i;
++
++	efi.systab = NULL;
++
++	for (i = 0; i < memmap.nr_map; i++) {
++		md = &memmap.map[i];
++
++		if (md->attribute & EFI_MEMORY_RUNTIME) {
++			md->virt_addr =
++				(unsigned long)ioremap(md->phys_addr,
++					md->num_pages << EFI_PAGE_SHIFT);
++			if (!(unsigned long)md->virt_addr) {
++				printk(KERN_ERR PFX "ioremap of 0x%lX failed\n",
++					(unsigned long)md->phys_addr);
++			}
++
++			if (((unsigned long)md->phys_addr <=
++					(unsigned long)efi_phys.systab) &&
++				((unsigned long)efi_phys.systab <
++					md->phys_addr +
++					((unsigned long)md->num_pages <<
++						EFI_PAGE_SHIFT))) {
++				unsigned long addr;
++
++				addr = md->virt_addr - md->phys_addr +
++						(unsigned long)efi_phys.systab;
++				efi.systab = (efi_system_table_t *)addr;
++			}
++		}
++	}
++
++	if (!efi.systab)
++		BUG();
++
++	status = phys_efi_set_virtual_address_map(
++			sizeof(efi_memory_desc_t) * memmap.nr_map,
++			sizeof(efi_memory_desc_t),
++			memmap.desc_version,
++		       	memmap.phys_map);
++
++	if (status != EFI_SUCCESS) {
++		printk (KERN_ALERT "You are screwed! "
++			"Unable to switch EFI into virtual mode "
++			"(status=%lx)\n", status);
++		panic("EFI call to SetVirtualAddressMap() failed!");
++	}
++
++	/*
++	 * Now that EFI is in virtual mode, update the function
++	 * pointers in the runtime service table to the new virtual addresses.
++	 */
++
++	efi.get_time = (efi_get_time_t *) efi.systab->runtime->get_time;
++	efi.set_time = (efi_set_time_t *) efi.systab->runtime->set_time;
++	efi.get_wakeup_time = (efi_get_wakeup_time_t *)
++					efi.systab->runtime->get_wakeup_time;
++	efi.set_wakeup_time = (efi_set_wakeup_time_t *)
++					efi.systab->runtime->set_wakeup_time;
++	efi.get_variable = (efi_get_variable_t *)
++					efi.systab->runtime->get_variable;
++	efi.get_next_variable = (efi_get_next_variable_t *)
++					efi.systab->runtime->get_next_variable;
++	efi.set_variable = (efi_set_variable_t *)
++					efi.systab->runtime->set_variable;
++	efi.get_next_high_mono_count = (efi_get_next_high_mono_count_t *)
++					efi.systab->runtime->get_next_high_mono_count;
++	efi.reset_system = (efi_reset_system_t *)
++					efi.systab->runtime->reset_system;
++}
++
++void __init
++efi_initialize_iomem_resources(struct resource *code_resource,
++			       struct resource *data_resource)
++{
++	struct resource *res;
++	efi_memory_desc_t *md;
++	int i;
++
++	for (i = 0; i < memmap.nr_map; i++) {
++		md = &memmap.map[i];
++
++		if ((md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT)) >
++		    0x100000000ULL)
++			continue;
++		res = alloc_bootmem_low(sizeof(struct resource));
++		switch (md->type) {
++		case EFI_RESERVED_TYPE:
++			res->name = "Reserved Memory";
++			break;
++		case EFI_LOADER_CODE:
++			res->name = "Loader Code";
++			break;
++		case EFI_LOADER_DATA:
++			res->name = "Loader Data";
++			break;
++		case EFI_BOOT_SERVICES_DATA:
++			res->name = "BootServices Data";
++			break;
++		case EFI_BOOT_SERVICES_CODE:
++			res->name = "BootServices Code";
++			break;
++		case EFI_RUNTIME_SERVICES_CODE:
++			res->name = "Runtime Service Code";
++			break;
++		case EFI_RUNTIME_SERVICES_DATA:
++			res->name = "Runtime Service Data";
++			break;
++		case EFI_CONVENTIONAL_MEMORY:
++			res->name = "Conventional Memory";
++			break;
++		case EFI_UNUSABLE_MEMORY:
++			res->name = "Unusable Memory";
++			break;
++		case EFI_ACPI_RECLAIM_MEMORY:
++			res->name = "ACPI Reclaim";
++			break;
++		case EFI_ACPI_MEMORY_NVS:
++			res->name = "ACPI NVS";
++			break;
++		case EFI_MEMORY_MAPPED_IO:
++			res->name = "Memory Mapped IO";
++			break;
++		case EFI_MEMORY_MAPPED_IO_PORT_SPACE:
++			res->name = "Memory Mapped IO Port Space";
++			break;
++		default:
++			res->name = "Reserved";
++			break;
++		}
++		res->start = md->phys_addr;
++		res->end = res->start + ((md->num_pages << EFI_PAGE_SHIFT) - 1);
++		res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
++		if (request_resource(&iomem_resource, res) < 0)
++			printk(KERN_ERR PFX "Failed to allocate res %s : 0x%lx-0x%lx\n",
++				res->name, res->start, res->end);
++		/*
++		 * We don't know which region contains kernel data so we try
++		 * it repeatedly and let the resource manager test it.
++		 */
++		if (md->type == EFI_CONVENTIONAL_MEMORY) {
++			request_resource(res, code_resource);
++			request_resource(res, data_resource);
++		}
++	}
++}
++
++/*
++ * Convenience functions to obtain memory types and attributes
++ */
++
++u32 efi_mem_type(unsigned long phys_addr)
++{
++	efi_memory_desc_t *md;
++	int i;
++
++	for (i = 0; i < memmap.nr_map; i++) {
++		md = &memmap.map[i];
++		if ((md->phys_addr <= phys_addr) && (phys_addr <
++			(md->phys_addr + (md-> num_pages << EFI_PAGE_SHIFT)) ))
++			return md->type;
++	}
++	return 0;
++}
++
++u64 efi_mem_attributes(unsigned long phys_addr)
++{
++	efi_memory_desc_t *md;
++	int i;
++
++	for (i = 0; i < memmap.nr_map; i++) {
++		md = &memmap.map[i];
++		if ((md->phys_addr <= phys_addr) && (phys_addr <
++			(md->phys_addr + (md-> num_pages << EFI_PAGE_SHIFT)) ))
++			return md->attribute;
++	}
++	return 0;
++}
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/arch/i386/kernel/efi_stub.S	2003-12-28 23:21:45.000000000 -0800
+@@ -0,0 +1,124 @@
++/*
++ * EFI call stub for IA32.
++ *
++ * This stub allows us to make EFI calls in physical mode with interrupts
++ * turned off.
++ */
++
++#include <linux/config.h>
++#include <linux/linkage.h>
++#include <asm/page.h>
++#include <asm/pgtable.h>
++
++/*
++ * efi_call_phys(void *, ...) is a function with variable parameters.
++ * All the callers of this function assure that all the parameters are 4-bytes.
++ */
++
++/*
++ * In gcc calling convention, EBX, ESP, EBP, ESI and EDI are all callee save.
++ * So we'd better save all of them at the beginning of this function and restore
++ * at the end no matter how many we use, because we can not assure EFI runtime
++ * service functions will comply with gcc calling convention, too.
++ */
++
++.text
++ENTRY(efi_call_phys)
++	/*
++	 * 0. The function can only be called in Linux kernel. So CS has been
++	 * set to 0x0010, DS and SS have been set to 0x0018. In EFI, I found
++	 * the values of these registers are the same. And, the corresponding
++	 * GDT entries are identical. So I will do nothing about segment reg
++	 * and GDT, but change GDT base register in prelog and epilog.
++	 */
++
++	/*
++	 * 1. Now I am running with EIP = <physical address> + PAGE_OFFSET.
++	 * But to make it smoothly switch from virtual mode to flat mode.
++	 * The mapping of lower virtual memory has been created in prelog and
++	 * epilog.
++	 */
++	movl	$1f, %edx
++	subl	$__PAGE_OFFSET, %edx
++	jmp	*%edx
++1:
++
++	/*
++	 * 2. Now on the top of stack is the return
++	 * address in the caller of efi_call_phys(), then parameter 1,
++	 * parameter 2, ..., param n. To make things easy, we save the return
++	 * address of efi_call_phys in a global variable.
++	 */
++	popl	%edx
++	movl	%edx, saved_return_addr
++	/* get the function pointer into ECX*/
++	popl	%ecx
++	movl	%ecx, efi_rt_function_ptr
++	movl	$2f, %edx
++	subl	$__PAGE_OFFSET, %edx
++	pushl	%edx
++
++	/*
++	 * 3. Clear PG bit in %CR0.
++	 */
++	movl	%cr0, %edx
++	andl	$0x7fffffff, %edx
++	movl	%edx, %cr0
++	jmp	1f
++1:
++
++	/*
++	 * 4. Adjust stack pointer.
++	 */
++	subl	$__PAGE_OFFSET, %esp
++
++	/*
++	 * 5. Call the physical function.
++	 */
++	jmp	*%ecx
++
++2:
++	/*
++	 * 6. After EFI runtime service returns, control will return to
++	 * following instruction. We'd better readjust stack pointer first.
++	 */
++	addl	$__PAGE_OFFSET, %esp
++
++	/*
++	 * 7. Restore PG bit
++	 */
++	movl	%cr0, %edx
++	orl	$0x80000000, %edx
++	movl	%edx, %cr0
++	jmp	1f
++1:
++	/*
++	 * 8. Now restore the virtual mode from flat mode by
++	 * adding EIP with PAGE_OFFSET.
++	 */
++	movl	$1f, %edx
++	jmp	*%edx
++1:
++
++	/*
++	 * 9. Balance the stack. And because EAX contain the return value,
++	 * we'd better not clobber it.
++	 */
++	leal	efi_rt_function_ptr, %edx
++	movl	(%edx), %ecx
++	pushl	%ecx
++
++	/*
++	 * 10. Push the saved return address onto the stack and return.
++	 */
++	leal	saved_return_addr, %edx
++	movl	(%edx), %ecx
++	pushl	%ecx
++	ret
++.previous
++
++.data
++saved_return_addr:
++	.long 0
++efi_rt_function_ptr:
++	.long 0
+--- linux-2.6.0/arch/i386/kernel/entry.S	2003-11-23 19:03:00.000000000 -0800
++++ 25/arch/i386/kernel/entry.S	2003-12-28 23:26:36.000000000 -0800
+@@ -43,11 +43,25 @@
+ #include <linux/config.h>
+ #include <linux/linkage.h>
+ #include <asm/thread_info.h>
++#include <asm/asm_offsets.h>
+ #include <asm/errno.h>
+ #include <asm/segment.h>
++#include <asm/page.h>
+ #include <asm/smp.h>
+ #include <asm/page.h>
+ #include "irq_vectors.h"
++        /* We do not recover from a stack overflow, but at least
++         * we know it happened and should be able to track it down.
++         */
++#ifdef CONFIG_STACK_OVERFLOW_TEST
++#define STACK_OVERFLOW_TEST \
++        testl $7680,%esp;    \
++        jnz   10f;            \
++        call  stack_overflow; \
++10:
++#else
++#define STACK_OVERFLOW_TEST
++#endif
+ 
+ #define nr_syscalls ((syscall_table_size)/4)
+ 
+@@ -87,7 +101,102 @@ TSS_ESP0_OFFSET = (4 - 0x200)
+ #define resume_kernel		restore_all
+ #endif
+ 
+-#define SAVE_ALL \
++#ifdef CONFIG_X86_HIGH_ENTRY
++
++#ifdef CONFIG_X86_SWITCH_PAGETABLES
++
++#if defined(CONFIG_PREEMPT) && defined(CONFIG_SMP)
++/*
++ * If task is preempted in __SWITCH_KERNELSPACE, and moved to another cpu,
++ * __switch_to repoints %esp to the appropriate virtual stack; but %ebp is
++ * left stale, so we must check whether to repeat the real stack calculation.
++ */
++#define repeat_if_esp_changed				\
++	xorl %esp, %ebp;				\
++	testl $0xffffe000, %ebp;			\
++	jnz 0b
++#else
++#define repeat_if_esp_changed
++#endif
++
++/* clobbers ebx, edx and ebp */
++
++#define __SWITCH_KERNELSPACE				\
++	cmpl $0xff000000, %esp;				\
++	jb 1f;						\
++							\
++	/*						\
++	 * switch pagetables and load the real stack,	\
++	 * keep the stack offset:			\
++	 */						\
++							\
++	movl $swapper_pg_dir-__PAGE_OFFSET, %edx;	\
++							\
++	/* GET_THREAD_INFO(%ebp) intermixed */		\
++0:							\
++	movl %esp, %ebp;				\
++	movl %esp, %ebx;				\
++	andl $0xffffe000, %ebp;				\
++	andl $0x00001fff, %ebx;				\
++	orl TI_real_stack(%ebp), %ebx;			\
++	repeat_if_esp_changed;				\
++							\
++	movl %edx, %cr3;				\
++	movl %ebx, %esp;				\
++1:
++
++#endif
++
++
++#define __SWITCH_USERSPACE \
++	/* interrupted any of the user return paths? */	\
++							\
++	movl EIP(%esp), %eax;				\
++							\
++	cmpl $int80_ret_start_marker, %eax;		\
++	jb 33f; /* nope - continue with sysexit check */\
++	cmpl $int80_ret_end_marker, %eax;		\
++	jb 22f; /* yes - switch to virtual stack */	\
++33:							\
++	cmpl $sysexit_ret_start_marker, %eax;		\
++	jb 44f; /* nope - continue with user check */	\
++	cmpl $sysexit_ret_end_marker, %eax;		\
++	jb 22f; /* yes - switch to virtual stack */	\
++	/* return to userspace? */			\
++44:							\
++	movl EFLAGS(%esp),%ecx;				\
++	movb CS(%esp),%cl;				\
++	testl $(VM_MASK | 3),%ecx;			\
++	jz 2f;						\
++22:							\
++	/*						\
++	 * switch to the virtual stack, then switch to	\
++	 * the userspace pagetables.			\
++	 */						\
++							\
++	GET_THREAD_INFO(%ebp);				\
++	movl TI_virtual_stack(%ebp), %edx;		\
++	movl TI_user_pgd(%ebp), %ecx;			\
++							\
++	movl %esp, %ebx;				\
++	andl $0x1fff, %ebx;				\
++	orl %ebx, %edx;					\
++int80_ret_start_marker:					\
++	movl %edx, %esp; 				\
++	movl %ecx, %cr3;				\
++							\
++	__RESTORE_ALL;					\
++int80_ret_end_marker:					\
++2:
++
++#else /* !CONFIG_X86_HIGH_ENTRY */
++
++#define __SWITCH_KERNELSPACE
++#define __SWITCH_USERSPACE
++
++#endif
++
++#define __SAVE_ALL \
+ 	cld; \
+ 	pushl %es; \
+ 	pushl %ds; \
+@@ -102,7 +211,7 @@ TSS_ESP0_OFFSET = (4 - 0x200)
+ 	movl %edx, %ds; \
+ 	movl %edx, %es;
+ 
+-#define RESTORE_INT_REGS \
++#define __RESTORE_INT_REGS \
+ 	popl %ebx;	\
+ 	popl %ecx;	\
+ 	popl %edx;	\
+@@ -111,29 +220,28 @@ TSS_ESP0_OFFSET = (4 - 0x200)
+ 	popl %ebp;	\
+ 	popl %eax
+ 
+-#define RESTORE_REGS	\
+-	RESTORE_INT_REGS; \
+-1:	popl %ds;	\
+-2:	popl %es;	\
++#define __RESTORE_REGS	\
++	__RESTORE_INT_REGS; \
++111:	popl %ds;	\
++222:	popl %es;	\
+ .section .fixup,"ax";	\
+-3:	movl $0,(%esp);	\
+-	jmp 1b;		\
+-4:	movl $0,(%esp);	\
+-	jmp 2b;		\
++444:	movl $0,(%esp);	\
++	jmp 111b;	\
++555:	movl $0,(%esp);	\
++	jmp 222b;	\
+ .previous;		\
+ .section __ex_table,"a";\
+ 	.align 4;	\
+-	.long 1b,3b;	\
+-	.long 2b,4b;	\
++	.long 111b,444b;\
++	.long 222b,555b;\
+ .previous
+ 
+-
+-#define RESTORE_ALL	\
+-	RESTORE_REGS	\
++#define __RESTORE_ALL	\
++	__RESTORE_REGS	\
+ 	addl $4, %esp;	\
+-1:	iret;		\
++333:	iret;		\
+ .section .fixup,"ax";   \
+-2:	sti;		\
++666:	sti;		\
+ 	movl $(__USER_DS), %edx; \
+ 	movl %edx, %ds; \
+ 	movl %edx, %es; \
+@@ -142,10 +250,19 @@ TSS_ESP0_OFFSET = (4 - 0x200)
+ .previous;		\
+ .section __ex_table,"a";\
+ 	.align 4;	\
+-	.long 1b,2b;	\
++	.long 333b,666b;\
+ .previous
+ 
++#define SAVE_ALL \
++	__SAVE_ALL;					\
++	__SWITCH_KERNELSPACE;				\
++        STACK_OVERFLOW_TEST;
++
++#define RESTORE_ALL					\
++	__SWITCH_USERSPACE;				\
++	__RESTORE_ALL;
+ 
++.section .entry.text,"ax"
+ 
+ ENTRY(lcall7)
+ 	pushfl			# We get a different stack layout with call
+@@ -163,7 +280,7 @@ do_lcall:
+ 	movl %edx,EIP(%ebp)	# Now we move them to their "normal" places
+ 	movl %ecx,CS(%ebp)	#
+ 	andl $-8192, %ebp	# GET_THREAD_INFO
+-	movl TI_EXEC_DOMAIN(%ebp), %edx	# Get the execution domain
++	movl TI_exec_domain(%ebp), %edx	# Get the execution domain
+ 	call *4(%edx)		# Call the lcall7 handler for the domain
+ 	addl $4, %esp
+ 	popl %eax
+@@ -208,7 +325,7 @@ ENTRY(resume_userspace)
+  	cli				# make sure we don't miss an interrupt
+ 					# setting need_resched or sigpending
+ 					# between sampling and the iret
+-	movl TI_FLAGS(%ebp), %ecx
++	movl TI_flags(%ebp), %ecx
+ 	andl $_TIF_WORK_MASK, %ecx	# is there any work to be done on
+ 					# int/exception return?
+ 	jne work_pending
+@@ -216,18 +333,18 @@ ENTRY(resume_userspace)
+ 
+ #ifdef CONFIG_PREEMPT
+ ENTRY(resume_kernel)
+-	cmpl $0,TI_PRE_COUNT(%ebp)	# non-zero preempt_count ?
++	cmpl $0,TI_preempt_count(%ebp)	# non-zero preempt_count ?
+ 	jnz restore_all
+ need_resched:
+-	movl TI_FLAGS(%ebp), %ecx	# need_resched set ?
++	movl TI_flags(%ebp), %ecx	# need_resched set ?
+ 	testb $_TIF_NEED_RESCHED, %cl
+ 	jz restore_all
+ 	testl $IF_MASK,EFLAGS(%esp)     # interrupts off (exception path) ?
+ 	jz restore_all
+-	movl $PREEMPT_ACTIVE,TI_PRE_COUNT(%ebp)
++	movl $PREEMPT_ACTIVE,TI_preempt_count(%ebp)
+ 	sti
+ 	call schedule
+-	movl $0,TI_PRE_COUNT(%ebp)
++	movl $0,TI_preempt_count(%ebp)
+ 	cli
+ 	jmp need_resched
+ #endif
+@@ -246,37 +363,50 @@ sysenter_past_esp:
+ 	pushl $(__USER_CS)
+ 	pushl $SYSENTER_RETURN
+ 
+-/*
+- * Load the potential sixth argument from user stack.
+- * Careful about security.
+- */
+-	cmpl $__PAGE_OFFSET-3,%ebp
+-	jae syscall_fault
+-1:	movl (%ebp),%ebp
+-.section __ex_table,"a"
+-	.align 4
+-	.long 1b,syscall_fault
+-.previous
+-
+ 	pushl %eax
+ 	SAVE_ALL
+ 	GET_THREAD_INFO(%ebp)
+ 	cmpl $(nr_syscalls), %eax
+ 	jae syscall_badsys
+ 
+-	testb $_TIF_SYSCALL_TRACE,TI_FLAGS(%ebp)
++	testb $_TIF_SYSCALL_TRACE,TI_flags(%ebp)
+ 	jnz syscall_trace_entry
+ 	call *sys_call_table(,%eax,4)
+ 	movl %eax,EAX(%esp)
+ 	cli
+-	movl TI_FLAGS(%ebp), %ecx
++	movl TI_flags(%ebp), %ecx
+ 	testw $_TIF_ALLWORK_MASK, %cx
+ 	jne syscall_exit_work
++
++#ifdef CONFIG_X86_SWITCH_PAGETABLES
++
++	GET_THREAD_INFO(%ebp)
++	movl TI_virtual_stack(%ebp), %edx
++	movl TI_user_pgd(%ebp), %ecx
++	movl %esp, %ebx
++	andl $0x1fff, %ebx
++	orl %ebx, %edx
++sysexit_ret_start_marker:
++	movl %edx, %esp
++	movl %ecx, %cr3
++#endif
++	/*
++	 * only ebx is not restored by the userspace sysenter vsyscall
++	 * code, it assumes it to be callee-saved.
++	 */
++	movl EBX(%esp), %ebx
++
+ /* if something modifies registers it must also disable sysexit */
++
+ 	movl EIP(%esp), %edx
+ 	movl OLDESP(%esp), %ecx
++
+ 	sti
+ 	sysexit
++#ifdef CONFIG_X86_SWITCH_PAGETABLES
++sysexit_ret_end_marker:
++	nop
++#endif
+ 
+ 
+ 	# system call handler stub
+@@ -287,7 +417,7 @@ ENTRY(system_call)
+ 	cmpl $(nr_syscalls), %eax
+ 	jae syscall_badsys
+ 					# system call tracing in operation
+-	testb $_TIF_SYSCALL_TRACE,TI_FLAGS(%ebp)
++	testb $_TIF_SYSCALL_TRACE,TI_flags(%ebp)
+ 	jnz syscall_trace_entry
+ syscall_call:
+ 	call *sys_call_table(,%eax,4)
+@@ -296,10 +426,23 @@ syscall_exit:
+ 	cli				# make sure we don't miss an interrupt
+ 					# setting need_resched or sigpending
+ 					# between sampling and the iret
+-	movl TI_FLAGS(%ebp), %ecx
++	movl TI_flags(%ebp), %ecx
+ 	testw $_TIF_ALLWORK_MASK, %cx	# current->work
+ 	jne syscall_exit_work
+ restore_all:
++#ifdef CONFIG_TRAP_BAD_SYSCALL_EXITS
++	movl EFLAGS(%esp), %eax		# mix EFLAGS and CS
++	movb CS(%esp), %al
++	testl $(VM_MASK | 3), %eax
++	jz resume_kernelX		# returning to kernel or vm86-space
++
++	cmpl $0,TI_preempt_count(%ebp)	# non-zero preempt_count ?
++	jz resume_kernelX
++
++        int $3
++
++resume_kernelX:
++#endif
+ 	RESTORE_ALL
+ 
+ 	# perform work that needs to be done immediately before resumption
+@@ -312,7 +455,7 @@ work_resched:
+ 	cli				# make sure we don't miss an interrupt
+ 					# setting need_resched or sigpending
+ 					# between sampling and the iret
+-	movl TI_FLAGS(%ebp), %ecx
++	movl TI_flags(%ebp), %ecx
+ 	andl $_TIF_WORK_MASK, %ecx	# is there any work to be done other
+ 					# than syscall tracing?
+ 	jz restore_all
+@@ -327,6 +470,22 @@ work_notifysig:				# deal with pending s
+ 					# vm86-space
+ 	xorl %edx, %edx
+ 	call do_notify_resume
++
++#if CONFIG_X86_HIGH_ENTRY
++	/*
++	 * Reload db7 if necessary:
++	 */
++	movl TI_flags(%ebp), %ecx
++	testb $_TIF_DB7, %cl
++	jnz work_db7
++
++	jmp restore_all
++
++work_db7:
++	movl TI_task(%ebp), %edx;
++	movl task_thread_db7(%edx), %edx;
++	movl %edx, %db7;
++#endif
+ 	jmp restore_all
+ 
+ 	ALIGN
+@@ -382,7 +541,7 @@ syscall_badsys:
+  */
+ .data
+ ENTRY(interrupt)
+-.text
++.previous
+ 
+ vector=0
+ ENTRY(irq_entries_start)
+@@ -392,7 +551,7 @@ ENTRY(irq_entries_start)
+ 	jmp common_interrupt
+ .data
+ 	.long 1b
+-.text
++.previous
+ vector=vector+1
+ .endr
+ 
+@@ -433,12 +592,17 @@ error_code:
+ 	movl ES(%esp), %edi		# get the function address
+ 	movl %eax, ORIG_EAX(%esp)
+ 	movl %ecx, ES(%esp)
+-	movl %esp, %edx
+ 	pushl %esi			# push the error code
+-	pushl %edx			# push the pt_regs pointer
+ 	movl $(__USER_DS), %edx
+ 	movl %edx, %ds
+ 	movl %edx, %es
++
++/* clobbers edx, ebx and ebp */
++	__SWITCH_KERNELSPACE
++
++	leal 4(%esp), %edx		# prepare pt_regs
++	pushl %edx			# push pt_regs
++
+ 	call *%edi
+ 	addl $8, %esp
+ 	jmp ret_from_exception
+@@ -529,7 +693,7 @@ nmi_stack_correct:
+ 	pushl %edx
+ 	call do_nmi
+ 	addl $8, %esp
+-	RESTORE_ALL
++	jmp restore_all
+ 
+ nmi_stack_fixup:
+ 	FIX_STACK(12,nmi_stack_correct, 1)
+@@ -606,6 +770,8 @@ ENTRY(spurious_interrupt_bug)
+ 	pushl $do_spurious_interrupt_bug
+ 	jmp error_code
+ 
++.previous
++
+ .data
+ ENTRY(sys_call_table)
+ 	.long sys_restart_syscall	/* 0 - old "setup()" system call, used for restarting */
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/arch/i386/kernel/entry_trampoline.c	2003-12-28 23:26:36.000000000 -0800
+@@ -0,0 +1,75 @@
++/*
++ * linux/arch/i386/kernel/entry_trampoline.c
++ *
++ * (C) Copyright 2003 Ingo Molnar
++ *
++ * This file contains the needed support code for 4GB userspace
++ */
++
++#include <linux/init.h>
++#include <linux/smp.h>
++#include <linux/mm.h>
++#include <linux/sched.h>
++#include <linux/kernel.h>
++#include <linux/string.h>
++#include <linux/highmem.h>
++#include <asm/desc.h>
++#include <asm/atomic_kmap.h>
++
++extern char __entry_tramp_start, __entry_tramp_end, __start___entry_text;
++
++void __init init_entry_mappings(void)
++{
++#ifdef CONFIG_X86_HIGH_ENTRY
++	void *tramp;
++
++	/*
++	 * We need a high IDT and GDT for the 4G/4G split:
++	 */
++	trap_init_virtual_IDT();
++
++	__set_fixmap(FIX_ENTRY_TRAMPOLINE_0, __pa((unsigned long)&__entry_tramp_start), PAGE_KERNEL);
++	__set_fixmap(FIX_ENTRY_TRAMPOLINE_1, __pa((unsigned long)&__entry_tramp_start) + PAGE_SIZE, PAGE_KERNEL);
++	tramp = (void *)fix_to_virt(FIX_ENTRY_TRAMPOLINE_0);
++
++	printk("mapped 4G/4G trampoline to %p.\n", tramp);
++	BUG_ON((void *)&__start___entry_text != tramp);
++	/*
++	 * Virtual kernel stack:
++	 */
++	BUG_ON(__kmap_atomic_vaddr(KM_VSTACK0) & 8191);
++	BUG_ON(sizeof(struct desc_struct)*NR_CPUS*GDT_ENTRIES > 2*PAGE_SIZE);
++	BUG_ON((unsigned int)&__entry_tramp_end - (unsigned int)&__entry_tramp_start > 2*PAGE_SIZE);
++
++	/*
++	 * set up the initial thread's virtual stack related
++	 * fields:
++	 */
++	current->thread.stack_page0 = virt_to_page((char *)current->thread_info);
++	current->thread.stack_page1 = virt_to_page((char *)current->thread_info + PAGE_SIZE);
++	current->thread_info->virtual_stack = (void *)__kmap_atomic_vaddr(KM_VSTACK0);
++
++	__kunmap_atomic_type(KM_VSTACK0);
++	__kunmap_atomic_type(KM_VSTACK1);
++        __kmap_atomic(current->thread.stack_page0, KM_VSTACK0);
++        __kmap_atomic(current->thread.stack_page1, KM_VSTACK1);
++
++#endif
++	printk("current: %p\n", current);
++	printk("current->thread_info: %p\n", current->thread_info);
++	current->thread_info->real_stack = (void *)current->thread_info;
++	current->thread_info->user_pgd = NULL;
++	current->thread.esp0 = (unsigned long)current->thread_info->real_stack + THREAD_SIZE;
++}
++
++
++
++void __init entry_trampoline_setup(void)
++{
++	/*
++	 * old IRQ entries set up by the boot code will still hang
++	 * around - they are a sign of hw trouble anyway, now they'll
++	 * produce a double fault message.
++	 */
++	trap_init_virtual_GDT();
++}
+--- linux-2.6.0/arch/i386/kernel/head.S	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/kernel/head.S	2003-12-28 23:26:36.000000000 -0800
+@@ -16,6 +16,7 @@
+ #include <asm/pgtable.h>
+ #include <asm/desc.h>
+ #include <asm/cache.h>
++#include <asm/asm_offsets.h>
+ 
+ #define OLD_CL_MAGIC_ADDR	0x90020
+ #define OLD_CL_MAGIC		0xA33F
+@@ -330,7 +331,7 @@ ENTRY(stack_start)
+ 
+ /* This is the default interrupt "handler" :-) */
+ int_msg:
+-	.asciz "Unknown interrupt\n"
++	.asciz "Unknown interrupt or fault at EIP %p %p %p\n"
+ 	ALIGN
+ ignore_int:
+ 	cld
+@@ -342,9 +343,17 @@ ignore_int:
+ 	movl $(__KERNEL_DS),%eax
+ 	movl %eax,%ds
+ 	movl %eax,%es
++	pushl 16(%esp)
++	pushl 24(%esp)
++	pushl 32(%esp)
++	pushl 40(%esp)
+ 	pushl $int_msg
+ 	call printk
+ 	popl %eax
++	popl %eax
++	popl %eax
++	popl %eax
++	popl %eax
+ 	popl %ds
+ 	popl %es
+ 	popl %edx
+@@ -377,23 +386,27 @@ cpu_gdt_descr:
+ 	.fill NR_CPUS-1,8,0		# space for the other GDT descriptors
+ 
+ /*
+- * This is initialized to create an identity-mapping at 0-8M (for bootup
+- * purposes) and another mapping of the 0-8M area at virtual address
++ * This is initialized to create an identity-mapping at 0-16M (for bootup
++ * purposes) and another mapping of the 0-16M area at virtual address
+  * PAGE_OFFSET.
+  */
+ .org 0x1000
+ ENTRY(swapper_pg_dir)
+ 	.long 0x00102007
+ 	.long 0x00103007
+-	.fill BOOT_USER_PGD_PTRS-2,4,0
+-	/* default: 766 entries */
++	.long 0x00104007
++	.long 0x00105007
++	.fill BOOT_USER_PGD_PTRS-4,4,0
++	/* default: 764 entries */
+ 	.long 0x00102007
+ 	.long 0x00103007
+-	/* default: 254 entries */
+-	.fill BOOT_KERNEL_PGD_PTRS-2,4,0
++	.long 0x00104007
++	.long 0x00105007
++	/* default: 252 entries */
++	.fill BOOT_KERNEL_PGD_PTRS-4,4,0
+ 
+ /*
+- * The page tables are initialized to only 8MB here - the final page
++ * The page tables are initialized to only 16MB here - the final page
+  * tables are set up later depending on memory size.
+  */
+ .org 0x2000
+@@ -402,15 +415,21 @@ ENTRY(pg0)
+ .org 0x3000
+ ENTRY(pg1)
+ 
++.org 0x4000
++ENTRY(pg2)
++
++.org 0x5000
++ENTRY(pg3)
++
+ /*
+  * empty_zero_page must immediately follow the page tables ! (The
+  * initialization loop counts until empty_zero_page)
+  */
+ 
+-.org 0x4000
++.org 0x6000
+ ENTRY(empty_zero_page)
+ 
+-.org 0x5000
++.org 0x7000
+ 
+ /*
+  * Real beginning of normal "text" segment
+@@ -419,12 +438,12 @@ ENTRY(stext)
+ ENTRY(_stext)
+ 
+ /*
+- * This starts the data section. Note that the above is all
+- * in the text section because it has alignment requirements
+- * that we cannot fulfill any other way.
++ * This starts the data section.
+  */
+ .data
+ 
++.align PAGE_SIZE_asm
++
+ /*
+  * The Global Descriptor Table contains 28 quadwords, per-CPU.
+  */
+@@ -439,7 +458,9 @@ ENTRY(boot_gdt_table)
+ 	.quad 0x00cf9a000000ffff	/* kernel 4GB code at 0x00000000 */
+ 	.quad 0x00cf92000000ffff	/* kernel 4GB data at 0x00000000 */
+ #endif
+-	.align L1_CACHE_BYTES
++
++.align PAGE_SIZE_asm
++
+ ENTRY(cpu_gdt_table)
+ 	.quad 0x0000000000000000	/* NULL descriptor */
+ 	.quad 0x0000000000000000	/* 0x0b reserved */
+--- linux-2.6.0/arch/i386/kernel/i386_ksyms.c	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/kernel/i386_ksyms.c	2003-12-28 23:26:36.000000000 -0800
+@@ -98,7 +98,6 @@ EXPORT_SYMBOL_NOVERS(__down_failed_inter
+ EXPORT_SYMBOL_NOVERS(__down_failed_trylock);
+ EXPORT_SYMBOL_NOVERS(__up_wakeup);
+ /* Networking helper routines. */
+-EXPORT_SYMBOL(csum_partial_copy_generic);
+ /* Delay loops */
+ EXPORT_SYMBOL(__ndelay);
+ EXPORT_SYMBOL(__udelay);
+@@ -112,13 +111,17 @@ EXPORT_SYMBOL_NOVERS(__get_user_4);
+ EXPORT_SYMBOL(strpbrk);
+ EXPORT_SYMBOL(strstr);
+ 
++#if !defined(CONFIG_X86_UACCESS_INDIRECT)
+ EXPORT_SYMBOL(strncpy_from_user);
+-EXPORT_SYMBOL(__strncpy_from_user);
++EXPORT_SYMBOL(__direct_strncpy_from_user);
+ EXPORT_SYMBOL(clear_user);
+ EXPORT_SYMBOL(__clear_user);
+ EXPORT_SYMBOL(__copy_from_user_ll);
+ EXPORT_SYMBOL(__copy_to_user_ll);
+ EXPORT_SYMBOL(strnlen_user);
++#else /* CONFIG_X86_UACCESS_INDIRECT */
++EXPORT_SYMBOL(direct_csum_partial_copy_generic);
++#endif
+ 
+ EXPORT_SYMBOL(dma_alloc_coherent);
+ EXPORT_SYMBOL(dma_free_coherent);
+--- linux-2.6.0/arch/i386/kernel/i387.c	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/kernel/i387.c	2003-12-28 23:26:36.000000000 -0800
+@@ -218,6 +218,7 @@ void set_fpu_mxcsr( struct task_struct *
+ static int convert_fxsr_to_user( struct _fpstate __user *buf,
+ 					struct i387_fxsave_struct *fxsave )
+ {
++	struct _fpreg tmp[8]; /* 80 bytes scratch area */
+ 	unsigned long env[7];
+ 	struct _fpreg __user *to;
+ 	struct _fpxreg *from;
+@@ -234,23 +235,25 @@ static int convert_fxsr_to_user( struct 
+ 	if ( __copy_to_user( buf, env, 7 * sizeof(unsigned long) ) )
+ 		return 1;
+ 
+-	to = &buf->_st[0];
++	to = tmp;
+ 	from = (struct _fpxreg *) &fxsave->st_space[0];
+ 	for ( i = 0 ; i < 8 ; i++, to++, from++ ) {
+ 		unsigned long *t = (unsigned long *)to;
+ 		unsigned long *f = (unsigned long *)from;
+ 
+-		if (__put_user(*f, t) ||
+-				__put_user(*(f + 1), t + 1) ||
+-				__put_user(from->exponent, &to->exponent))
+-			return 1;
++		*t = *f;
++		*(t + 1) = *(f+1);
++		to->exponent = from->exponent;
+ 	}
++	if (copy_to_user(buf->_st, tmp, sizeof(struct _fpreg [8])))
++		return 1;
+ 	return 0;
+ }
+ 
+ static int convert_fxsr_from_user( struct i387_fxsave_struct *fxsave,
+ 					  struct _fpstate __user *buf )
+ {
++	struct _fpreg tmp[8]; /* 80 bytes scratch area */
+ 	unsigned long env[7];
+ 	struct _fpxreg *to;
+ 	struct _fpreg __user *from;
+@@ -258,6 +261,8 @@ static int convert_fxsr_from_user( struc
+ 
+ 	if ( __copy_from_user( env, buf, 7 * sizeof(long) ) )
+ 		return 1;
++	if (copy_from_user(tmp, buf->_st, sizeof(struct _fpreg [8])))
++		return 1;
+ 
+ 	fxsave->cwd = (unsigned short)(env[0] & 0xffff);
+ 	fxsave->swd = (unsigned short)(env[1] & 0xffff);
+@@ -269,15 +274,14 @@ static int convert_fxsr_from_user( struc
+ 	fxsave->fos = env[6];
+ 
+ 	to = (struct _fpxreg *) &fxsave->st_space[0];
+-	from = &buf->_st[0];
++	from = tmp;
+ 	for ( i = 0 ; i < 8 ; i++, to++, from++ ) {
+ 		unsigned long *t = (unsigned long *)to;
+ 		unsigned long *f = (unsigned long *)from;
+ 
+-		if (__get_user(*t, f) ||
+-				__get_user(*(t + 1), f + 1) ||
+-				__get_user(to->exponent, &from->exponent))
+-			return 1;
++		*t = *f;
++		*(t + 1) = *(f + 1);
++		to->exponent = from->exponent;
+ 	}
+ 	return 0;
+ }
+--- linux-2.6.0/arch/i386/kernel/i8259.c	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/kernel/i8259.c	2003-12-28 23:21:44.000000000 -0800
+@@ -419,8 +419,10 @@ void __init init_IRQ(void)
+ 	 * us. (some of these will be overridden and become
+ 	 * 'special' SMP interrupts)
+ 	 */
+-	for (i = 0; i < NR_IRQS; i++) {
++	for (i = 0; i < (NR_VECTORS - FIRST_EXTERNAL_VECTOR); i++) {
+ 		int vector = FIRST_EXTERNAL_VECTOR + i;
++		if (i >= NR_IRQS)
++			break;
+ 		if (vector != SYSCALL_VECTOR) 
+ 			set_intr_gate(vector, interrupt[i]);
+ 	}
+--- linux-2.6.0/arch/i386/kernel/init_task.c	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/kernel/init_task.c	2003-12-28 23:26:36.000000000 -0800
+@@ -26,7 +26,7 @@ EXPORT_SYMBOL(init_mm);
+  */
+ union thread_union init_thread_union 
+ 	__attribute__((__section__(".data.init_task"))) =
+-		{ INIT_THREAD_INFO(init_task) };
++		{ INIT_THREAD_INFO(init_task, init_thread_union) };
+ 
+ /*
+  * Initial task structure.
+@@ -44,5 +44,5 @@ EXPORT_SYMBOL(init_task);
+  * section. Since TSS's are completely CPU-local, we want them
+  * on exact cacheline boundaries, to eliminate cacheline ping-pong.
+  */ 
+-struct tss_struct init_tss[NR_CPUS] __cacheline_aligned = { [0 ... NR_CPUS-1] = INIT_TSS };
++struct tss_struct init_tss[NR_CPUS] __attribute__((__section__(".data.tss"))) = { [0 ... NR_CPUS-1] = INIT_TSS };
+ 
+--- linux-2.6.0/arch/i386/kernel/io_apic.c	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/kernel/io_apic.c	2003-12-28 23:21:44.000000000 -0800
+@@ -76,6 +76,14 @@ static struct irq_pin_list {
+ 	int apic, pin, next;
+ } irq_2_pin[PIN_MAP_SIZE];
+ 
++#ifdef CONFIG_PCI_USE_VECTOR
++int vector_irq[NR_IRQS] = { [0 ... NR_IRQS -1] = -1};
++#define vector_to_irq(vector) 	\
++	(platform_legacy_irq(vector) ? vector : vector_irq[vector])
++#else
++#define vector_to_irq(vector)	(vector)
++#endif
++
+ /*
+  * The common case is 1:1 IRQ<->pin mappings. Sometimes there are
+  * shared ISA-space IRQs, so we have to support them. We are super
+@@ -249,7 +257,7 @@ static void clear_IO_APIC (void)
+ 			clear_IO_APIC_pin(apic, pin);
+ }
+ 
+-static void set_ioapic_affinity(unsigned int irq, cpumask_t cpumask)
++static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t cpumask)
+ {
+ 	unsigned long flags;
+ 	int pin;
+@@ -288,7 +296,7 @@ static void set_ioapic_affinity(unsigned
+ 
+ extern cpumask_t irq_affinity[NR_IRQS];
+ 
+-static cpumask_t __cacheline_aligned pending_irq_balance_cpumask[NR_IRQS];
++cpumask_t __cacheline_aligned pending_irq_balance_cpumask[NR_IRQS];
+ 
+ #define IRQBALANCE_CHECK_ARCH -999
+ static int irqbalance_disabled = IRQBALANCE_CHECK_ARCH;
+@@ -670,13 +678,11 @@ static int __init irqbalance_disable(cha
+ 
+ __setup("noirqbalance", irqbalance_disable);
+ 
+-static void set_ioapic_affinity(unsigned int irq, cpumask_t mask);
+-
+ static inline void move_irq(int irq)
+ {
+ 	/* note - we hold the desc->lock */
+ 	if (unlikely(!cpus_empty(pending_irq_balance_cpumask[irq]))) {
+-		set_ioapic_affinity(irq, pending_irq_balance_cpumask[irq]);
++		set_ioapic_affinity_irq(irq, pending_irq_balance_cpumask[irq]);
+ 		cpus_clear(pending_irq_balance_cpumask[irq]);
+ 	}
+ }
+@@ -853,7 +859,7 @@ void __init setup_ioapic_dest(cpumask_t 
+ 			if (irq_entry == -1)
+ 				continue;
+ 			irq = pin_2_irq(irq_entry, ioapic, pin);
+-			set_ioapic_affinity(irq, mask);
++			set_ioapic_affinity_irq(irq, mask);
+ 		}
+ 
+ 	}
+@@ -1141,7 +1147,8 @@ static inline int IO_APIC_irq_trigger(in
+ /* irq_vectors is indexed by the sum of all RTEs in all I/O APICs. */
+ u8 irq_vector[NR_IRQ_VECTORS] = { FIRST_DEVICE_VECTOR , 0 };
+ 
+-static int __init assign_irq_vector(int irq)
++#ifndef CONFIG_PCI_USE_VECTOR
++int __init assign_irq_vector(int irq)
+ {
+ 	static int current_vector = FIRST_DEVICE_VECTOR, offset = 0;
+ 	BUG_ON(irq >= NR_IRQ_VECTORS);
+@@ -1158,11 +1165,36 @@ next:
+ 	}
+ 
+ 	IO_APIC_VECTOR(irq) = current_vector;
++
+ 	return current_vector;
+ }
++#endif
++
++static struct hw_interrupt_type ioapic_level_type;
++static struct hw_interrupt_type ioapic_edge_type;
+ 
+-static struct hw_interrupt_type ioapic_level_irq_type;
+-static struct hw_interrupt_type ioapic_edge_irq_type;
++#define IOAPIC_AUTO	-1
++#define IOAPIC_EDGE	0
++#define IOAPIC_LEVEL	1
++
++static inline void ioapic_register_intr(int irq, int vector, unsigned long trigger)
++{
++	if (use_pci_vector() && !platform_legacy_irq(irq)) {
++		if ((trigger == IOAPIC_AUTO && IO_APIC_irq_trigger(irq)) ||
++				trigger == IOAPIC_LEVEL)
++			irq_desc[vector].handler = &ioapic_level_type;
++		else
++			irq_desc[vector].handler = &ioapic_edge_type;
++		set_intr_gate(vector, interrupt[vector]);
++	} else	{
++		if ((trigger == IOAPIC_AUTO && IO_APIC_irq_trigger(irq)) ||
++				trigger == IOAPIC_LEVEL)
++			irq_desc[irq].handler = &ioapic_level_type;
++		else
++			irq_desc[irq].handler = &ioapic_edge_type;
++		set_intr_gate(vector, interrupt[irq]);
++	}
++}
+ 
+ void __init setup_IO_APIC_irqs(void)
+ {
+@@ -1220,13 +1252,7 @@ void __init setup_IO_APIC_irqs(void)
+ 		if (IO_APIC_IRQ(irq)) {
+ 			vector = assign_irq_vector(irq);
+ 			entry.vector = vector;
+-
+-			if (IO_APIC_irq_trigger(irq))
+-				irq_desc[irq].handler = &ioapic_level_irq_type;
+-			else
+-				irq_desc[irq].handler = &ioapic_edge_irq_type;
+-
+-			set_intr_gate(vector, interrupt[irq]);
++			ioapic_register_intr(irq, vector, IOAPIC_AUTO);
+ 		
+ 			if (!apic && (irq < 16))
+ 				disable_8259A_irq(irq);
+@@ -1273,7 +1299,7 @@ void __init setup_ExtINT_IRQ0_pin(unsign
+ 	 * The timer IRQ doesn't have to know that behind the
+ 	 * scene we have a 8259A-master in AEOI mode ...
+ 	 */
+-	irq_desc[0].handler = &ioapic_edge_irq_type;
++	irq_desc[0].handler = &ioapic_edge_type;
+ 
+ 	/*
+ 	 * Add it to the IO-APIC irq-routing table:
+@@ -1624,10 +1650,6 @@ static void __init setup_ioapic_ids_from
+ 	unsigned char old_id;
+ 	unsigned long flags;
+ 
+-	if (acpi_ioapic)
+-		/* This gets done during IOAPIC enumeration for ACPI. */
+-		return;
+-
+ 	/*
+ 	 * This is broken; anything with a real cpu count has to
+ 	 * circumvent this idiocy regardless.
+@@ -1763,9 +1785,6 @@ static int __init timer_irq_works(void)
+  * that was delayed but this is now handled in the device
+  * independent code.
+  */
+-#define enable_edge_ioapic_irq unmask_IO_APIC_irq
+-
+-static void disable_edge_ioapic_irq (unsigned int irq) { /* nothing */ }
+ 
+ /*
+  * Starting up a edge-triggered IO-APIC interrupt is
+@@ -1776,7 +1795,6 @@ static void disable_edge_ioapic_irq (uns
+  * This is not complete - we should be able to fake
+  * an edge even if it isn't on the 8259A...
+  */
+-
+ static unsigned int startup_edge_ioapic_irq(unsigned int irq)
+ {
+ 	int was_pending = 0;
+@@ -1794,8 +1812,6 @@ static unsigned int startup_edge_ioapic_
+ 	return was_pending;
+ }
+ 
+-#define shutdown_edge_ioapic_irq	disable_edge_ioapic_irq
+-
+ /*
+  * Once we have recorded IRQ_PENDING already, we can mask the
+  * interrupt for real. This prevents IRQ storms from unhandled
+@@ -1810,9 +1826,6 @@ static void ack_edge_ioapic_irq(unsigned
+ 	ack_APIC_irq();
+ }
+ 
+-static void end_edge_ioapic_irq (unsigned int i) { /* nothing */ }
+-
+-
+ /*
+  * Level triggered interrupts can just be masked,
+  * and shutting down and starting up the interrupt
+@@ -1834,10 +1847,6 @@ static unsigned int startup_level_ioapic
+ 	return 0; /* don't check for pending */
+ }
+ 
+-#define shutdown_level_ioapic_irq	mask_IO_APIC_irq
+-#define enable_level_ioapic_irq		unmask_IO_APIC_irq
+-#define disable_level_ioapic_irq	mask_IO_APIC_irq
+-
+ static void end_level_ioapic_irq (unsigned int irq)
+ {
+ 	unsigned long v;
+@@ -1864,6 +1873,7 @@ static void end_level_ioapic_irq (unsign
+  * The idea is from Manfred Spraul.  --macro
+  */
+ 	i = IO_APIC_VECTOR(irq);
++
+ 	v = apic_read(APIC_TMR + ((i & ~0x1f) >> 1));
+ 
+ 	ack_APIC_irq();
+@@ -1898,7 +1908,57 @@ static void end_level_ioapic_irq (unsign
+ 	}
+ }
+ 
+-static void mask_and_ack_level_ioapic_irq (unsigned int irq) { /* nothing */ }
++#ifdef CONFIG_PCI_USE_VECTOR
++static unsigned int startup_edge_ioapic_vector(unsigned int vector)
++{
++	int irq = vector_to_irq(vector);
++
++	return startup_edge_ioapic_irq(irq);
++}
++
++static void ack_edge_ioapic_vector(unsigned int vector)
++{
++	int irq = vector_to_irq(vector);
++
++	ack_edge_ioapic_irq(irq);
++}
++
++static unsigned int startup_level_ioapic_vector (unsigned int vector)
++{
++	int irq = vector_to_irq(vector);
++
++	return startup_level_ioapic_irq (irq);
++}
++
++static void end_level_ioapic_vector (unsigned int vector)
++{
++	int irq = vector_to_irq(vector);
++
++	end_level_ioapic_irq(irq);
++}
++
++static void mask_IO_APIC_vector (unsigned int vector)
++{
++	int irq = vector_to_irq(vector);
++
++	mask_IO_APIC_irq(irq);
++}
++
++static void unmask_IO_APIC_vector (unsigned int vector)
++{
++	int irq = vector_to_irq(vector);
++
++	unmask_IO_APIC_irq(irq);
++}
++
++static void set_ioapic_affinity_vector (unsigned int vector,
++					cpumask_t cpu_mask)
++{
++	int irq = vector_to_irq(vector);
++
++	set_ioapic_affinity_irq(irq, cpu_mask);
++}
++#endif
+ 
+ /*
+  * Level and edge triggered IO-APIC interrupts need different handling,
+@@ -1908,26 +1968,25 @@ static void mask_and_ack_level_ioapic_ir
+  * edge-triggered handler, without risking IRQ storms and other ugly
+  * races.
+  */
+-
+-static struct hw_interrupt_type ioapic_edge_irq_type = {
++static struct hw_interrupt_type ioapic_edge_type = {
+ 	.typename 	= "IO-APIC-edge",
+-	.startup 	= startup_edge_ioapic_irq,
+-	.shutdown 	= shutdown_edge_ioapic_irq,
+-	.enable 	= enable_edge_ioapic_irq,
+-	.disable 	= disable_edge_ioapic_irq,
+-	.ack 		= ack_edge_ioapic_irq,
+-	.end 		= end_edge_ioapic_irq,
++	.startup 	= startup_edge_ioapic,
++	.shutdown 	= shutdown_edge_ioapic,
++	.enable 	= enable_edge_ioapic,
++	.disable 	= disable_edge_ioapic,
++	.ack 		= ack_edge_ioapic,
++	.end 		= end_edge_ioapic,
+ 	.set_affinity 	= set_ioapic_affinity,
+ };
+ 
+-static struct hw_interrupt_type ioapic_level_irq_type = {
++static struct hw_interrupt_type ioapic_level_type = {
+ 	.typename 	= "IO-APIC-level",
+-	.startup 	= startup_level_ioapic_irq,
+-	.shutdown 	= shutdown_level_ioapic_irq,
+-	.enable 	= enable_level_ioapic_irq,
+-	.disable 	= disable_level_ioapic_irq,
+-	.ack 		= mask_and_ack_level_ioapic_irq,
+-	.end 		= end_level_ioapic_irq,
++	.startup 	= startup_level_ioapic,
++	.shutdown 	= shutdown_level_ioapic,
++	.enable 	= enable_level_ioapic,
++	.disable 	= disable_level_ioapic,
++	.ack 		= mask_and_ack_level_ioapic,
++	.end 		= end_level_ioapic,
+ 	.set_affinity 	= set_ioapic_affinity,
+ };
+ 
+@@ -1947,7 +2006,13 @@ static inline void init_IO_APIC_traps(vo
+ 	 * 0x80, because int 0x80 is hm, kind of importantish. ;)
+ 	 */
+ 	for (irq = 0; irq < NR_IRQS ; irq++) {
+-		if (IO_APIC_IRQ(irq) && !IO_APIC_VECTOR(irq)) {
++		int tmp = irq;
++		if (use_pci_vector()) {
++			if (!platform_legacy_irq(tmp))
++				if ((tmp = vector_to_irq(tmp)) == -1)
++					continue;
++		}
++		if (IO_APIC_IRQ(tmp) && !IO_APIC_VECTOR(tmp)) {
+ 			/*
+ 			 * Hmm.. We don't have an entry for this,
+ 			 * so default to an old-fashioned 8259
+@@ -2217,12 +2282,14 @@ void __init setup_IO_APIC(void)
+ 	/*
+ 	 * Set up IO-APIC IRQ routing.
+ 	 */
+-	setup_ioapic_ids_from_mpc();
++	if (!acpi_ioapic)
++		setup_ioapic_ids_from_mpc();
+ 	sync_Arb_IDs();
+ 	setup_IO_APIC_irqs();
+ 	init_IO_APIC_traps();
+ 	check_timer();
+-	print_IO_APIC();
++	if (!acpi_ioapic)
++		print_IO_APIC();
+ }
+ 
+ /*
+@@ -2379,10 +2446,12 @@ int io_apic_set_pci_routing (int ioapic,
+ 		"IRQ %d Mode:%i Active:%i)\n", ioapic, 
+ 		mp_ioapics[ioapic].mpc_apicid, pin, entry.vector, irq, edge_level, active_high_low);
+ 
++ 	if (use_pci_vector() && !platform_legacy_irq(irq))
++		irq = IO_APIC_VECTOR(irq);
+ 	if (edge_level) {
+-	irq_desc[irq].handler = &ioapic_level_irq_type;
++		irq_desc[irq].handler = &ioapic_level_type;
+ 	} else {
+-		irq_desc[irq].handler = &ioapic_edge_irq_type;
++		irq_desc[irq].handler = &ioapic_edge_type;
+ 	}
+ 
+ 	set_intr_gate(entry.vector, interrupt[irq]);
+--- linux-2.6.0/arch/i386/kernel/irq.c	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/kernel/irq.c	2003-12-28 23:22:10.000000000 -0800
+@@ -138,17 +138,19 @@ atomic_t irq_mis_count;
+ 
+ int show_interrupts(struct seq_file *p, void *v)
+ {
+-	int i, j;
++	int i = *(loff_t *) v, j;
+ 	struct irqaction * action;
+ 	unsigned long flags;
+ 
+-	seq_printf(p, "           ");
+-	for (j=0; j<NR_CPUS; j++)
+-		if (cpu_online(j))
+-			seq_printf(p, "CPU%d       ",j);
+-	seq_putc(p, '\n');
++	if (i == 0) {
++		seq_printf(p, "           ");
++		for (j=0; j<NR_CPUS; j++)
++			if (cpu_online(j))
++				seq_printf(p, "CPU%d       ",j);
++		seq_putc(p, '\n');
++	}
+ 
+-	for (i = 0 ; i < NR_IRQS ; i++) {
++	if (i < NR_IRQS) {
+ 		spin_lock_irqsave(&irq_desc[i].lock, flags);
+ 		action = irq_desc[i].action;
+ 		if (!action) 
+@@ -170,28 +172,32 @@ int show_interrupts(struct seq_file *p, 
+ 		seq_putc(p, '\n');
+ skip:
+ 		spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+-	}
+-	seq_printf(p, "NMI: ");
+-	for (j = 0; j < NR_CPUS; j++)
+-		if (cpu_online(j))
+-			seq_printf(p, "%10u ", nmi_count(j));
+-	seq_putc(p, '\n');
++	} else if (i == NR_IRQS) {
++		seq_printf(p, "NMI: ");
++		for (j = 0; j < NR_CPUS; j++)
++			if (cpu_online(j))
++				seq_printf(p, "%10u ", nmi_count(j));
++		seq_putc(p, '\n');
+ #ifdef CONFIG_X86_LOCAL_APIC
+-	seq_printf(p, "LOC: ");
+-	for (j = 0; j < NR_CPUS; j++)
+-		if (cpu_online(j))
+-			seq_printf(p, "%10u ", irq_stat[j].apic_timer_irqs);
+-	seq_putc(p, '\n');
++		seq_printf(p, "LOC: ");
++		for (j = 0; j < NR_CPUS; j++)
++			if (cpu_online(j))
++				seq_printf(p, "%10u ", irq_stat[j].apic_timer_irqs);
++		seq_putc(p, '\n');
+ #endif
+-	seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
++		seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
+ #ifdef CONFIG_X86_IO_APIC
+ #ifdef APIC_MISMATCH_DEBUG
+-	seq_printf(p, "MIS: %10u\n", atomic_read(&irq_mis_count));
++		seq_printf(p, "MIS: %10u\n", atomic_read(&irq_mis_count));
+ #endif
+ #endif
++	}
+ 	return 0;
+ }
+ 
++
++
++
+ #ifdef CONFIG_SMP
+ inline void synchronize_irq(unsigned int irq)
+ {
+@@ -502,6 +508,8 @@ out:
+ 
+ 	irq_exit();
+ 
++	kgdb_process_breakpoint();
++
+ 	return 1;
+ }
+ 
+@@ -898,48 +906,6 @@ int setup_irq(unsigned int irq, struct i
+ static struct proc_dir_entry * root_irq_dir;
+ static struct proc_dir_entry * irq_dir [NR_IRQS];
+ 
+-#define HEX_DIGITS (2*sizeof(cpumask_t))
+-
+-static unsigned int parse_hex_value(const char __user *buffer,
+-		unsigned long count, cpumask_t *ret)
+-{
+-	unsigned char hexnum[HEX_DIGITS];
+-	cpumask_t value = CPU_MASK_NONE;
+-	int i;
+-
+-	if (!count)
+-		return -EINVAL;
+-	if (count > HEX_DIGITS)
+-		count = HEX_DIGITS;
+-	if (copy_from_user(hexnum, buffer, count))
+-		return -EFAULT;
+-
+-	/*
+-	 * Parse the first HEX_DIGITS characters as a hex string, any non-hex char
+-	 * is end-of-string. '00e1', 'e1', '00E1', 'E1' are all the same.
+-	 */
+-
+-	for (i = 0; i < count; i++) {
+-		unsigned int c = hexnum[i];
+-		int k;
+-
+-		switch (c) {
+-			case '0' ... '9': c -= '0'; break;
+-			case 'a' ... 'f': c -= 'a'-10; break;
+-			case 'A' ... 'F': c -= 'A'-10; break;
+-		default:
+-			goto out;
+-		}
+-		cpus_shift_left(value, value, 4);
+-		for (k = 0; k < 4; ++k)
+-			if (test_bit(k, (unsigned long *)&c))
+-				cpu_set(k, value);
+-	}
+-out:
+-	*ret = value;
+-	return 0;
+-}
+-
+ #ifdef CONFIG_SMP
+ 
+ static struct proc_dir_entry *smp_affinity_entry[NR_IRQS];
+@@ -949,20 +915,10 @@ cpumask_t irq_affinity[NR_IRQS] = { [0 .
+ static int irq_affinity_read_proc(char *page, char **start, off_t off,
+ 			int count, int *eof, void *data)
+ {
+-	int k, len;
+-	cpumask_t tmp = irq_affinity[(long)data];
+-
+-	if (count < HEX_DIGITS+1)
++	int len = cpumask_snprintf(page, count, irq_affinity[(long)data]);
++	if (count - len < 2)
+ 		return -EINVAL;
+-
+-	len = 0;
+-	for (k = 0; k < sizeof(cpumask_t)/sizeof(u16); ++k) {
+-		int j = sprintf(page, "%04hx", (u16)cpus_coerce(tmp));
+-		len += j;
+-		page += j;
+-		cpus_shift_right(tmp, tmp, 16);
+-	}
+-	len += sprintf(page, "\n");
++	len += sprintf(page + len, "\n");
+ 	return len;
+ }
+ 
+@@ -975,7 +931,7 @@ static int irq_affinity_write_proc(struc
+ 	if (!irq_desc[irq].handler->set_affinity)
+ 		return -EIO;
+ 
+-	err = parse_hex_value(buffer, count, &new_value);
++	err = cpumask_parse(buffer, count, new_value);
+ 	if (err)
+ 		return err;
+ 
+@@ -1000,10 +956,11 @@ static int irq_affinity_write_proc(struc
+ static int prof_cpu_mask_read_proc (char *page, char **start, off_t off,
+ 			int count, int *eof, void *data)
+ {
+-	unsigned long *mask = (unsigned long *) data;
+-	if (count < HEX_DIGITS+1)
++	int len = cpumask_snprintf(page, count, *(cpumask_t *)data);
++	if (count - len < 2)
+ 		return -EINVAL;
+-	return sprintf (page, "%08lx\n", *mask);
++	len += sprintf(page + len, "\n");
++	return len;
+ }
+ 
+ static int prof_cpu_mask_write_proc (struct file *file, const char __user *buffer,
+@@ -1013,7 +970,7 @@ static int prof_cpu_mask_write_proc (str
+ 	unsigned long full_count = count, err;
+ 	cpumask_t new_value;
+ 
+-	err = parse_hex_value(buffer, count, &new_value);
++	err = cpumask_parse(buffer, count, new_value);
+ 	if (err)
+ 		return err;
+ 
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/arch/i386/kernel/kgdb_stub.c	2003-12-28 23:21:09.000000000 -0800
+@@ -0,0 +1,2457 @@
++/*
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
++ * General Public License for more details.
++ *
++ */
++
++/*
++ * Copyright (c) 2000 VERITAS Software Corporation.
++ *
++ */
++/****************************************************************************
++ *  Header: remcom.c,v 1.34 91/03/09 12:29:49 glenne Exp $
++ *
++ *  Module name: remcom.c $
++ *  Revision: 1.34 $
++ *  Date: 91/03/09 12:29:49 $
++ *  Contributor:     Lake Stevens Instrument Division$
++ *
++ *  Description:     low level support for gdb debugger. $
++ *
++ *  Considerations:  only works on target hardware $
++ *
++ *  Written by:	     Glenn Engel $
++ *  Updated by:	     David Grothe <dave@gcom.com>
++ *  Updated by:	     Robert Walsh <rjwalsh@durables.org>
++ *  Updated by:	     wangdi <wangdi@clusterfs.com>
++ *  ModuleState:     Experimental $
++ *
++ *  NOTES:	     See Below $
++ *
++ *  Modified for 386 by Jim Kingdon, Cygnus Support.
++ *  Compatibility with 2.1.xx kernel by David Grothe <dave@gcom.com>
++ *
++ *  Changes to allow auto initilization.  All that is needed is that it
++ *  be linked with the kernel and a break point (int 3) be executed.
++ *  The header file <asm/kgdb.h> defines BREAKPOINT to allow one to do
++ *  this. It should also be possible, once the interrupt system is up, to
++ *  call putDebugChar("+").  Once this is done, the remote debugger should
++ *  get our attention by sending a ^C in a packet. George Anzinger
++ *  <george@mvista.com>
++ *  Integrated into 2.2.5 kernel by Tigran Aivazian <tigran@sco.com>
++ *  Added thread support, support for multiple processors,
++ *	support for ia-32(x86) hardware debugging.
++ *	Amit S. Kale ( akale@veritas.com )
++ *
++ *  Modified to support debugging over ethernet by Robert Walsh
++ *  <rjwalsh@durables.org> and wangdi <wangdi@clusterfs.com>, based on
++ *  code by San Mehat.
++ *
++ *
++ *  To enable debugger support, two things need to happen.  One, a
++ *  call to set_debug_traps() is necessary in order to allow any breakpoints
++ *  or error conditions to be properly intercepted and reported to gdb.
++ *  Two, a breakpoint needs to be generated to begin communication.  This
++ *  is most easily accomplished by a call to breakpoint().  Breakpoint()
++ *  simulates a breakpoint by executing an int 3.
++ *
++ *************
++ *
++ *    The following gdb commands are supported:
++ *
++ * command	    function				   Return value
++ *
++ *    g		    return the value of the CPU registers  hex data or ENN
++ *    G		    set the value of the CPU registers	   OK or ENN
++ *
++ *    mAA..AA,LLLL  Read LLLL bytes at address AA..AA	   hex data or ENN
++ *    MAA..AA,LLLL: Write LLLL bytes at address AA.AA	   OK or ENN
++ *
++ *    c		    Resume at current address		   SNN	 ( signal NN)
++ *    cAA..AA	    Continue at address AA..AA		   SNN
++ *
++ *    s		    Step one instruction		   SNN
++ *    sAA..AA	    Step one instruction from AA..AA	   SNN
++ *
++ *    k		    kill
++ *
++ *    ?		    What was the last sigval ?		   SNN	 (signal NN)
++ *
++ * All commands and responses are sent with a packet which includes a
++ * checksum.  A packet consists of
++ *
++ * $<packet info>#<checksum>.
++ *
++ * where
++ * <packet info> :: <characters representing the command or response>
++ * <checksum>	 :: < two hex digits computed as modulo 256 sum of <packetinfo>>
++ *
++ * When a packet is received, it is first acknowledged with either '+' or '-'.
++ * '+' indicates a successful transfer.	 '-' indicates a failed transfer.
++ *
++ * Example:
++ *
++ * Host:		  Reply:
++ * $m0,10#2a		   +$00010203040506070809101112131415#42
++ *
++ ****************************************************************************/
++#define KGDB_VERSION "<20030915.1651.33>"
++#include <linux/config.h>
++#include <linux/types.h>
++#include <asm/string.h>		/* for strcpy */
++#include <linux/kernel.h>
++#include <linux/sched.h>
++#include <asm/vm86.h>
++#include <asm/system.h>
++#include <asm/ptrace.h>		/* for linux pt_regs struct */
++#include <asm/kgdb_local.h>
++#include <linux/list.h>
++#include <asm/atomic.h>
++#include <asm/processor.h>
++#include <linux/irq.h>
++#include <asm/desc.h>
++#include <linux/inet.h>
++#include <linux/netpoll.h>
++
++/************************************************************************
++ *
++ * external low-level support routines
++ */
++typedef void (*Function) (void);	/* pointer to a function */
++
++/* Thread reference */
++typedef unsigned char threadref[8];
++
++extern int tty_putDebugChar(int);     /* write a single character      */
++extern int tty_getDebugChar(void);    /* read and return a single char */
++extern void tty_flushDebugChar(void); /* flush pending characters      */
++extern int eth_putDebugChar(int);     /* write a single character      */
++extern int eth_getDebugChar(void);    /* read and return a single char */
++extern void eth_flushDebugChar(void); /* flush pending characters      */
++
++/************************************************************************/
++/* BUFMAX defines the maximum number of characters in inbound/outbound buffers*/
++/* at least NUMREGBYTES*2 are needed for register packets */
++/* Longer buffer is needed to list all threads */
++#define BUFMAX 400
++
++char *kgdb_version = KGDB_VERSION;
++
++/*  debug >  0 prints ill-formed commands in valid packets & checksum errors */
++int debug_regs = 0;		/* set to non-zero to print registers */
++
++/* filled in by an external module */
++char *gdb_module_offsets;
++
++static const char hexchars[] = "0123456789abcdef";
++
++/* Number of bytes of registers.  */
++#define NUMREGBYTES 64
++/*
++ * Note that this register image is in a different order than
++ * the register image that Linux produces at interrupt time.
++ *
++ * Linux's register image is defined by struct pt_regs in ptrace.h.
++ * Just why GDB uses a different order is a historical mystery.
++ */
++enum regnames { _EAX,		/* 0 */
++	_ECX,			/* 1 */
++	_EDX,			/* 2 */
++	_EBX,			/* 3 */
++	_ESP,			/* 4 */
++	_EBP,			/* 5 */
++	_ESI,			/* 6 */
++	_EDI,			/* 7 */
++	_PC /* 8 also known as eip */ ,
++	_PS /* 9 also known as eflags */ ,
++	_CS,			/* 10 */
++	_SS,			/* 11 */
++	_DS,			/* 12 */
++	_ES,			/* 13 */
++	_FS,			/* 14 */
++	_GS			/* 15 */
++};
++
++/***************************  ASSEMBLY CODE MACROS *************************/
++/*
++ * Put the error code here just in case the user cares.
++ * Likewise, the vector number here (since GDB only gets the signal
++ * number through the usual means, and that's not very specific).
++ * The called_from is the return address so he can tell how we entered kgdb.
++ * This will allow him to seperate out the various possible entries.
++ */
++#define REMOTE_DEBUG 0		/* set != to turn on printing (also available in info) */
++
++#define PID_MAX PID_MAX_DEFAULT
++
++#ifdef CONFIG_SMP
++void smp_send_nmi_allbutself(void);
++#define IF_SMP(x) x
++#undef MAX_NO_CPUS
++#ifndef CONFIG_NO_KGDB_CPUS
++#define CONFIG_NO_KGDB_CPUS 2
++#endif
++#if CONFIG_NO_KGDB_CPUS > NR_CPUS
++#define MAX_NO_CPUS NR_CPUS
++#else
++#define MAX_NO_CPUS CONFIG_NO_KGDB_CPUS
++#endif
++#define hold_init hold_on_sstep: 1,
++#define MAX_CPU_MASK (unsigned long)((1LL << MAX_NO_CPUS) - 1LL)
++#define NUM_CPUS num_online_cpus()
++#else
++#define IF_SMP(x)
++#define hold_init
++#undef MAX_NO_CPUS
++#define MAX_NO_CPUS 1
++#define NUM_CPUS 1
++#endif
++#define NOCPU (struct task_struct *)0xbad1fbad
++/* *INDENT-OFF*	 */
++struct kgdb_info {
++	int used_malloc;
++	void *called_from;
++	long long entry_tsc;
++	int errcode;
++	int vector;
++	int print_debug_info;
++#ifdef CONFIG_SMP
++	int hold_on_sstep;
++	struct {
++		volatile struct task_struct *task;
++		int pid;
++		int hold;
++		struct pt_regs *regs;
++	} cpus_waiting[MAX_NO_CPUS];
++#endif
++} kgdb_info = {hold_init print_debug_info:REMOTE_DEBUG, vector:-1};
++
++/* *INDENT-ON*	*/
++
++#define used_m kgdb_info.used_malloc
++/*
++ * This is little area we set aside to contain the stack we
++ * need to build to allow gdb to call functions.  We use one
++ * per cpu to avoid locking issues.  We will do all this work
++ * with interrupts off so that should take care of the protection
++ * issues.
++ */
++#define LOOKASIDE_SIZE 200	/* should be more than enough */
++#define MALLOC_MAX   200	/* Max malloc size */
++struct {
++	unsigned int esp;
++	int array[LOOKASIDE_SIZE];
++} fn_call_lookaside[MAX_NO_CPUS];
++
++static int trap_cpu;
++static unsigned int OLD_esp;
++
++#define END_OF_LOOKASIDE  &fn_call_lookaside[trap_cpu].array[LOOKASIDE_SIZE]
++#define IF_BIT 0x200
++#define TF_BIT 0x100
++
++#define MALLOC_ROUND 8-1
++
++static char malloc_array[MALLOC_MAX];
++IF_SMP(static void to_gdb(const char *mess));
++void *
++malloc(int size)
++{
++
++	if (size <= (MALLOC_MAX - used_m)) {
++		int old_used = used_m;
++		used_m += ((size + MALLOC_ROUND) & (~MALLOC_ROUND));
++		return &malloc_array[old_used];
++	} else {
++		return NULL;
++	}
++}
++
++/*
++ * I/O dispatch functions...
++ * Based upon kgdboe, either call the ethernet
++ * handler or the serial one..
++ */
++void
++putDebugChar(int c)
++{
++	if (!kgdboe) {
++		tty_putDebugChar(c);
++	} else {
++		eth_putDebugChar(c);
++	}
++}
++
++int
++getDebugChar(void)
++{
++	if (!kgdboe) {
++		return tty_getDebugChar();
++	} else {
++		return eth_getDebugChar();
++	}
++}
++
++void
++flushDebugChar(void)
++{
++	if (!kgdboe) {
++		tty_flushDebugChar();
++	} else {
++		eth_flushDebugChar();
++	}
++}
++
++/*
++ * Gdb calls functions by pushing agruments, including a return address
++ * on the stack and the adjusting EIP to point to the function.	 The
++ * whole assumption in GDB is that we are on a different stack than the
++ * one the "user" i.e. code that hit the break point, is on.  This, of
++ * course is not true in the kernel.  Thus various dodges are needed to
++ * do the call without directly messing with EIP (which we can not change
++ * as it is just a location and not a register.	 To adjust it would then
++ * require that we move every thing below EIP up or down as needed.  This
++ * will not work as we may well have stack relative pointer on the stack
++ * (such as the pointer to regs, for example).
++
++ * So here is what we do:
++ * We detect gdb attempting to store into the stack area and instead, store
++ * into the fn_call_lookaside.array at the same relative location as if it
++ * were the area ESP pointed at.  We also trap ESP modifications
++ * and uses these to adjust fn_call_lookaside.esp.  On entry
++ * fn_call_lookaside.esp will be set to point at the last entry in
++ * fn_call_lookaside.array.  This allows us to check if it has changed, and
++ * if so, on exit, we add the registers we will use to do the move and a
++ * trap/ interrupt return exit sequence.  We then adjust the eflags in the
++ * regs array (remember we now have a copy in the fn_call_lookaside.array) to
++ * kill the interrupt bit, AND we change EIP to point at our set up stub.
++ * As part of the register set up we preset the registers to point at the
++ * begining and end of the fn_call_lookaside.array, so all the stub needs to
++ * do is move words from the array to the stack until ESP= the desired value
++ * then do the rti.  This will then transfer to the desired function with
++ * all the correct registers.  Nifty huh?
++ */
++extern asmlinkage void fn_call_stub(void);
++extern asmlinkage void fn_rtn_stub(void);
++/*					   *INDENT-OFF*	 */
++__asm__("fn_rtn_stub:\n\t"
++	"movl %eax,%esp\n\t"
++	"fn_call_stub:\n\t"
++	"1:\n\t"
++	"addl $-4,%ebx\n\t"
++	"movl (%ebx), %eax\n\t"
++	"pushl %eax\n\t"
++	"cmpl %esp,%ecx\n\t"
++	"jne  1b\n\t"
++	"popl %eax\n\t"
++	"popl %ebx\n\t"
++	"popl %ecx\n\t"
++	"iret \n\t");
++/*					     *INDENT-ON*  */
++#define gdb_i386vector	kgdb_info.vector
++#define gdb_i386errcode kgdb_info.errcode
++#define waiting_cpus	kgdb_info.cpus_waiting
++#define remote_debug	kgdb_info.print_debug_info
++#define hold_cpu(cpu)	kgdb_info.cpus_waiting[cpu].hold
++/* gdb locks */
++
++#ifdef CONFIG_SMP
++static int in_kgdb_called;
++static spinlock_t waitlocks[MAX_NO_CPUS] =
++    {[0 ... MAX_NO_CPUS - 1] = SPIN_LOCK_UNLOCKED };
++/*
++ * The following array has the thread pointer of each of the "other"
++ * cpus.  We make it global so it can be seen by gdb.
++ */
++volatile int in_kgdb_entry_log[MAX_NO_CPUS];
++volatile struct pt_regs *in_kgdb_here_log[MAX_NO_CPUS];
++/*
++static spinlock_t continuelocks[MAX_NO_CPUS];
++*/
++spinlock_t kgdb_spinlock = SPIN_LOCK_UNLOCKED;
++/* waiters on our spinlock plus us */
++static atomic_t spinlock_waiters = ATOMIC_INIT(1);
++static int spinlock_count = 0;
++static int spinlock_cpu = 0;
++/*
++ * Note we use nested spin locks to account for the case where a break
++ * point is encountered when calling a function by user direction from
++ * kgdb. Also there is the memory exception recursion to account for.
++ * Well, yes, but this lets other cpus thru too.  Lets add a
++ * cpu id to the lock.
++ */
++#define KGDB_SPIN_LOCK(x) if( spinlock_count == 0 || \
++			      spinlock_cpu != smp_processor_id()){\
++				      atomic_inc(&spinlock_waiters); \
++				      while (! spin_trylock(x)) {\
++					    in_kgdb(&regs);\
++				      }\
++				      atomic_dec(&spinlock_waiters); \
++				      spinlock_count = 1; \
++				      spinlock_cpu = smp_processor_id(); \
++			  }else{  \
++				      spinlock_count++; \
++			  }
++#define KGDB_SPIN_UNLOCK(x) if( --spinlock_count == 0) spin_unlock(x)
++#else
++unsigned kgdb_spinlock = 0;
++#define KGDB_SPIN_LOCK(x) --*x
++#define KGDB_SPIN_UNLOCK(x) ++*x
++#endif
++
++int
++hex(char ch)
++{
++	if ((ch >= 'a') && (ch <= 'f'))
++		return (ch - 'a' + 10);
++	if ((ch >= '0') && (ch <= '9'))
++		return (ch - '0');
++	if ((ch >= 'A') && (ch <= 'F'))
++		return (ch - 'A' + 10);
++	return (-1);
++}
++
++/* scan for the sequence $<data>#<checksum>	*/
++void
++getpacket(char *buffer)
++{
++	unsigned char checksum;
++	unsigned char xmitcsum;
++	int i;
++	int count;
++	char ch;
++
++	do {
++		/* wait around for the start character, ignore all other characters */
++		while ((ch = (getDebugChar() & 0x7f)) != '$') ;
++		checksum = 0;
++		xmitcsum = -1;
++
++		count = 0;
++
++		/* now, read until a # or end of buffer is found */
++		while (count < BUFMAX) {
++			ch = getDebugChar() & 0x7f;
++			if (ch == '#')
++				break;
++			checksum = checksum + ch;
++			buffer[count] = ch;
++			count = count + 1;
++		}
++		buffer[count] = 0;
++
++		if (ch == '#') {
++			xmitcsum = hex(getDebugChar() & 0x7f) << 4;
++			xmitcsum += hex(getDebugChar() & 0x7f);
++			if ((remote_debug) && (checksum != xmitcsum)) {
++				printk
++				    ("bad checksum.	My count = 0x%x, sent=0x%x. buf=%s\n",
++				     checksum, xmitcsum, buffer);
++			}
++
++			if (checksum != xmitcsum)
++				putDebugChar('-');	/* failed checksum */
++			else {
++				putDebugChar('+');	/* successful transfer */
++				/* if a sequence char is present, reply the sequence ID */
++				if (buffer[2] == ':') {
++					putDebugChar(buffer[0]);
++					putDebugChar(buffer[1]);
++					/* remove sequence chars from buffer */
++					count = strlen(buffer);
++					for (i = 3; i <= count; i++)
++						buffer[i - 3] = buffer[i];
++				}
++			}
++		}
++	} while (checksum != xmitcsum);
++
++	if (remote_debug)
++		printk("R:%s\n", buffer);
++	flushDebugChar();
++}
++
++/* send the packet in buffer.  */
++
++void
++putpacket(char *buffer)
++{
++	unsigned char checksum;
++	int count;
++	char ch;
++
++	/*  $<packet info>#<checksum>. */
++
++	if (!kgdboe) {
++		do {
++			if (remote_debug)
++				printk("T:%s\n", buffer);
++			putDebugChar('$');
++			checksum = 0;
++			count = 0;
++
++			while ((ch = buffer[count])) {
++				putDebugChar(ch);
++				checksum += ch;
++				count += 1;
++			}
++
++			putDebugChar('#');
++			putDebugChar(hexchars[checksum >> 4]);
++			putDebugChar(hexchars[checksum % 16]);
++			flushDebugChar();
++
++		} while ((getDebugChar() & 0x7f) != '+');
++	} else {
++		/*
++		 * For udp, we can not transfer too much bytes once.
++		 * We only transfer MAX_SEND_COUNT size bytes each time
++		 */
++
++#define MAX_SEND_COUNT 30
++
++		int send_count = 0, i = 0;
++		char send_buf[MAX_SEND_COUNT];
++
++		do {
++			if (remote_debug)
++				printk("T:%s\n", buffer);
++			putDebugChar('$');
++			checksum = 0;
++			count = 0;
++			send_count = 0;
++			while ((ch = buffer[count])) {
++				if (send_count >= MAX_SEND_COUNT) {
++					for(i = 0; i < MAX_SEND_COUNT; i++) {
++						putDebugChar(send_buf[i]);
++					}
++					flushDebugChar();
++					send_count = 0;
++				} else {
++					send_buf[send_count] = ch;
++					checksum += ch;
++					count ++;
++					send_count++;
++				}
++			}
++			for(i = 0; i < send_count; i++)
++				putDebugChar(send_buf[i]);
++			putDebugChar('#');
++			putDebugChar(hexchars[checksum >> 4]);
++			putDebugChar(hexchars[checksum % 16]);
++			flushDebugChar();
++		} while ((getDebugChar() & 0x7f) != '+');
++	}
++}
++
++static char remcomInBuffer[BUFMAX];
++static char remcomOutBuffer[BUFMAX];
++static short error;
++
++void
++debug_error(char *format, char *parm)
++{
++	if (remote_debug)
++		printk(format, parm);
++}
++
++static void
++print_regs(struct pt_regs *regs)
++{
++	printk("EAX=%08lx ", regs->eax);
++	printk("EBX=%08lx ", regs->ebx);
++	printk("ECX=%08lx ", regs->ecx);
++	printk("EDX=%08lx ", regs->edx);
++	printk("\n");
++	printk("ESI=%08lx ", regs->esi);
++	printk("EDI=%08lx ", regs->edi);
++	printk("EBP=%08lx ", regs->ebp);
++	printk("ESP=%08lx ", (long) &regs->esp);
++	printk("\n");
++	printk(" DS=%08x ", regs->xds);
++	printk(" ES=%08x ", regs->xes);
++	printk(" SS=%08x ", __KERNEL_DS);
++	printk(" FL=%08lx ", regs->eflags);
++	printk("\n");
++	printk(" CS=%08x ", regs->xcs);
++	printk(" IP=%08lx ", regs->eip);
++#if 0
++	printk(" FS=%08x ", regs->fs);
++	printk(" GS=%08x ", regs->gs);
++#endif
++	printk("\n");
++
++}				/* print_regs */
++
++#define NEW_esp fn_call_lookaside[trap_cpu].esp
++
++static void
++regs_to_gdb_regs(int *gdb_regs, struct pt_regs *regs)
++{
++	gdb_regs[_EAX] = regs->eax;
++	gdb_regs[_EBX] = regs->ebx;
++	gdb_regs[_ECX] = regs->ecx;
++	gdb_regs[_EDX] = regs->edx;
++	gdb_regs[_ESI] = regs->esi;
++	gdb_regs[_EDI] = regs->edi;
++	gdb_regs[_EBP] = regs->ebp;
++	gdb_regs[_DS] = regs->xds;
++	gdb_regs[_ES] = regs->xes;
++	gdb_regs[_PS] = regs->eflags;
++	gdb_regs[_CS] = regs->xcs;
++	gdb_regs[_PC] = regs->eip;
++	/* Note, as we are a debugging the kernel, we will always
++	 * trap in kernel code, this means no priviledge change,
++	 * and so the pt_regs structure is not completely valid.  In a non
++	 * privilege change trap, only EFLAGS, CS and EIP are put on the stack,
++	 * SS and ESP are not stacked, this means that the last 2 elements of
++	 * pt_regs is not valid (they would normally refer to the user stack)
++	 * also, using regs+1 is no good because you end up will a value that is
++	 * 2 longs (8) too high.  This used to cause stepping over functions
++	 * to fail, so my fix is to use the address of regs->esp, which
++	 * should point at the end of the stack frame.	Note I have ignored
++	 * completely exceptions that cause an error code to be stacked, such
++	 * as double fault.  Stuart Hughes, Zentropix.
++	 * original code: gdb_regs[_ESP] =  (int) (regs + 1) ;
++
++	 * this is now done on entry and moved to OLD_esp (as well as NEW_esp).
++	 */
++	gdb_regs[_ESP] = NEW_esp;
++	gdb_regs[_SS] = __KERNEL_DS;
++	gdb_regs[_FS] = 0xFFFF;
++	gdb_regs[_GS] = 0xFFFF;
++}				/* regs_to_gdb_regs */
++
++static void
++gdb_regs_to_regs(int *gdb_regs, struct pt_regs *regs)
++{
++	regs->eax = gdb_regs[_EAX];
++	regs->ebx = gdb_regs[_EBX];
++	regs->ecx = gdb_regs[_ECX];
++	regs->edx = gdb_regs[_EDX];
++	regs->esi = gdb_regs[_ESI];
++	regs->edi = gdb_regs[_EDI];
++	regs->ebp = gdb_regs[_EBP];
++	regs->xds = gdb_regs[_DS];
++	regs->xes = gdb_regs[_ES];
++	regs->eflags = gdb_regs[_PS];
++	regs->xcs = gdb_regs[_CS];
++	regs->eip = gdb_regs[_PC];
++	NEW_esp = gdb_regs[_ESP];	/* keep the value */
++#if 0				/* can't change these */
++	regs->esp = gdb_regs[_ESP];
++	regs->xss = gdb_regs[_SS];
++	regs->fs = gdb_regs[_FS];
++	regs->gs = gdb_regs[_GS];
++#endif
++
++}				/* gdb_regs_to_regs */
++extern void scheduling_functions_start_here(void);
++extern void scheduling_functions_end_here(void);
++#define first_sched	((unsigned long) scheduling_functions_start_here)
++#define last_sched	((unsigned long) scheduling_functions_end_here)
++
++int thread_list = 0;
++
++void
++get_gdb_regs(struct task_struct *p, struct pt_regs *regs, int *gdb_regs)
++{
++	unsigned long stack_page;
++	int count = 0;
++	IF_SMP(int i);
++	if (!p || p == current) {
++		regs_to_gdb_regs(gdb_regs, regs);
++		return;
++	}
++#ifdef CONFIG_SMP
++	for (i = 0; i < MAX_NO_CPUS; i++) {
++		if (p == kgdb_info.cpus_waiting[i].task) {
++			regs_to_gdb_regs(gdb_regs,
++					 kgdb_info.cpus_waiting[i].regs);
++			gdb_regs[_ESP] =
++			    (int) &kgdb_info.cpus_waiting[i].regs->esp;
++
++			return;
++		}
++	}
++#endif
++	memset(gdb_regs, 0, NUMREGBYTES);
++	gdb_regs[_ESP] = p->thread.esp;
++	gdb_regs[_PC] = p->thread.eip;
++	gdb_regs[_EBP] = *(int *) gdb_regs[_ESP];
++	gdb_regs[_EDI] = *(int *) (gdb_regs[_ESP] + 4);
++	gdb_regs[_ESI] = *(int *) (gdb_regs[_ESP] + 8);
++
++/*
++ * This code is to give a more informative notion of where a process
++ * is waiting.	It is used only when the user asks for a thread info
++ * list.  If he then switches to the thread, s/he will find the task
++ * is in schedule, but a back trace should show the same info we come
++ * up with.  This code was shamelessly purloined from process.c.  It was
++ * then enhanced to provide more registers than simply the program
++ * counter.
++ */
++
++	if (!thread_list) {
++		return;
++	}
++
++	if (p->state == TASK_RUNNING)
++		return;
++	stack_page = (unsigned long) p->thread_info;
++	if (gdb_regs[_ESP] < stack_page || gdb_regs[_ESP] > 8188 + stack_page)
++		return;
++	/* include/asm-i386/system.h:switch_to() pushes ebp last. */
++	do {
++		if (gdb_regs[_EBP] < stack_page ||
++		    gdb_regs[_EBP] > 8184 + stack_page)
++			return;
++		gdb_regs[_PC] = *(unsigned long *) (gdb_regs[_EBP] + 4);
++		gdb_regs[_ESP] = gdb_regs[_EBP] + 8;
++		gdb_regs[_EBP] = *(unsigned long *) gdb_regs[_EBP];
++		if (gdb_regs[_PC] < first_sched || gdb_regs[_PC] >= last_sched)
++			return;
++	} while (count++ < 16);
++	return;
++}
++
++/* Indicate to caller of mem2hex or hex2mem that there has been an
++   error.  */
++static volatile int mem_err = 0;
++static volatile int mem_err_expected = 0;
++static volatile int mem_err_cnt = 0;
++static int garbage_loc = -1;
++
++int
++get_char(char *addr)
++{
++	return *addr;
++}
++
++void
++set_char(char *addr, int val, int may_fault)
++{
++	/*
++	 * This code traps references to the area mapped to the kernel
++	 * stack as given by the regs and, instead, stores to the
++	 * fn_call_lookaside[cpu].array
++	 */
++	if (may_fault &&
++	    (unsigned int) addr < OLD_esp &&
++	    ((unsigned int) addr > (OLD_esp - (unsigned int) LOOKASIDE_SIZE))) {
++		addr = (char *) END_OF_LOOKASIDE - ((char *) OLD_esp - addr);
++	}
++	*addr = val;
++}
++
++/* convert the memory pointed to by mem into hex, placing result in buf */
++/* return a pointer to the last char put in buf (null) */
++/* If MAY_FAULT is non-zero, then we should set mem_err in response to
++   a fault; if zero treat a fault like any other fault in the stub.  */
++char *
++mem2hex(char *mem, char *buf, int count, int may_fault)
++{
++	int i;
++	unsigned char ch;
++
++	if (may_fault) {
++		mem_err_expected = 1;
++		mem_err = 0;
++	}
++	for (i = 0; i < count; i++) {
++		/* printk("%lx = ", mem) ; */
++
++		ch = get_char(mem++);
++
++		/* printk("%02x\n", ch & 0xFF) ; */
++		if (may_fault && mem_err) {
++			if (remote_debug)
++				printk("Mem fault fetching from addr %lx\n",
++				       (long) (mem - 1));
++			*buf = 0;	/* truncate buffer */
++			return (buf);
++		}
++		*buf++ = hexchars[ch >> 4];
++		*buf++ = hexchars[ch % 16];
++	}
++	*buf = 0;
++	if (may_fault)
++		mem_err_expected = 0;
++	return (buf);
++}
++
++/* convert the hex array pointed to by buf into binary to be placed in mem */
++/* return a pointer to the character AFTER the last byte written */
++/* NOTE: We use the may fault flag to also indicate if the write is to
++ * the registers (0) or "other" memory (!=0)
++ */
++char *
++hex2mem(char *buf, char *mem, int count, int may_fault)
++{
++	int i;
++	unsigned char ch;
++
++	if (may_fault) {
++		mem_err_expected = 1;
++		mem_err = 0;
++	}
++	for (i = 0; i < count; i++) {
++		ch = hex(*buf++) << 4;
++		ch = ch + hex(*buf++);
++		set_char(mem++, ch, may_fault);
++
++		if (may_fault && mem_err) {
++			if (remote_debug)
++				printk("Mem fault storing to addr %lx\n",
++				       (long) (mem - 1));
++			return (mem);
++		}
++	}
++	if (may_fault)
++		mem_err_expected = 0;
++	return (mem);
++}
++
++/**********************************************/
++/* WHILE WE FIND NICE HEX CHARS, BUILD AN INT */
++/* RETURN NUMBER OF CHARS PROCESSED	      */
++/**********************************************/
++int
++hexToInt(char **ptr, int *intValue)
++{
++	int numChars = 0;
++	int hexValue;
++
++	*intValue = 0;
++
++	while (**ptr) {
++		hexValue = hex(**ptr);
++		if (hexValue >= 0) {
++			*intValue = (*intValue << 4) | hexValue;
++			numChars++;
++		} else
++			break;
++
++		(*ptr)++;
++	}
++
++	return (numChars);
++}
++
++#define stubhex(h) hex(h)
++#ifdef old_thread_list
++
++static int
++stub_unpack_int(char *buff, int fieldlength)
++{
++	int nibble;
++	int retval = 0;
++
++	while (fieldlength) {
++		nibble = stubhex(*buff++);
++		retval |= nibble;
++		fieldlength--;
++		if (fieldlength)
++			retval = retval << 4;
++	}
++	return retval;
++}
++#endif
++static char *
++pack_hex_byte(char *pkt, int byte)
++{
++	*pkt++ = hexchars[(byte >> 4) & 0xf];
++	*pkt++ = hexchars[(byte & 0xf)];
++	return pkt;
++}
++
++#define BUF_THREAD_ID_SIZE 16
++
++static char *
++pack_threadid(char *pkt, threadref * id)
++{
++	char *limit;
++	unsigned char *altid;
++
++	altid = (unsigned char *) id;
++	limit = pkt + BUF_THREAD_ID_SIZE;
++	while (pkt < limit)
++		pkt = pack_hex_byte(pkt, *altid++);
++	return pkt;
++}
++
++#ifdef old_thread_list
++static char *
++unpack_byte(char *buf, int *value)
++{
++	*value = stub_unpack_int(buf, 2);
++	return buf + 2;
++}
++
++static char *
++unpack_threadid(char *inbuf, threadref * id)
++{
++	char *altref;
++	char *limit = inbuf + BUF_THREAD_ID_SIZE;
++	int x, y;
++
++	altref = (char *) id;
++
++	while (inbuf < limit) {
++		x = stubhex(*inbuf++);
++		y = stubhex(*inbuf++);
++		*altref++ = (x << 4) | y;
++	}
++	return inbuf;
++}
++#endif
++void
++int_to_threadref(threadref * id, int value)
++{
++	unsigned char *scan;
++
++	scan = (unsigned char *) id;
++	{
++		int i = 4;
++		while (i--)
++			*scan++ = 0;
++	}
++	*scan++ = (value >> 24) & 0xff;
++	*scan++ = (value >> 16) & 0xff;
++	*scan++ = (value >> 8) & 0xff;
++	*scan++ = (value & 0xff);
++}
++int
++int_to_hex_v(unsigned char * id, int value)
++{
++	unsigned char *start = id;
++	int shift;
++	int ch;
++
++	for (shift = 28; shift >= 0; shift -= 4) {
++		if ((ch = (value >> shift) & 0xf) || (id != start)) {
++			*id = hexchars[ch];
++			id++;
++		}
++	}
++	if (id == start)
++		*id++ = '0';
++	return id - start;
++}
++#ifdef old_thread_list
++
++static int
++threadref_to_int(threadref * ref)
++{
++	int i, value = 0;
++	unsigned char *scan;
++
++	scan = (char *) ref;
++	scan += 4;
++	i = 4;
++	while (i-- > 0)
++		value = (value << 8) | ((*scan++) & 0xff);
++	return value;
++}
++#endif
++static int
++cmp_str(char *s1, char *s2, int count)
++{
++	while (count--) {
++		if (*s1++ != *s2++)
++			return 0;
++	}
++	return 1;
++}
++
++#if 1				/* this is a hold over from 2.4 where O(1) was "sometimes" */
++extern struct task_struct *kgdb_get_idle(int cpu);
++#define idle_task(cpu) kgdb_get_idle(cpu)
++#else
++#define idle_task(cpu) init_tasks[cpu]
++#endif
++
++extern int kgdb_pid_init_done;
++
++struct task_struct *
++getthread(int pid)
++{
++	struct task_struct *thread;
++	if (pid >= PID_MAX && pid <= (PID_MAX + MAX_NO_CPUS)) {
++
++		return idle_task(pid - PID_MAX);
++	} else {
++		/*
++		 * find_task_by_pid is relatively safe all the time
++		 * Other pid functions require lock downs which imply
++		 * that we may be interrupting them (as we get here
++		 * in the middle of most any lock down).
++		 * Still we don't want to call until the table exists!
++		 */
++		if (kgdb_pid_init_done){
++			thread = find_task_by_pid(pid);
++			if (thread) {
++				return thread;
++			}
++		}
++	}
++	return NULL;
++}
++/* *INDENT-OFF*	 */
++struct hw_breakpoint {
++	unsigned enabled;
++	unsigned type;
++	unsigned len;
++	unsigned addr;
++} breakinfo[4] = { {enabled:0},
++		   {enabled:0},
++		   {enabled:0},
++		   {enabled:0}};
++/* *INDENT-ON*	*/
++unsigned hw_breakpoint_status;
++void
++correct_hw_break(void)
++{
++	int breakno;
++	int correctit;
++	int breakbit;
++	unsigned dr7;
++
++	asm volatile ("movl %%db7, %0\n":"=r" (dr7)
++		      :);
++	/* *INDENT-OFF*	 */
++	do {
++		unsigned addr0, addr1, addr2, addr3;
++		asm volatile ("movl %%db0, %0\n"
++			      "movl %%db1, %1\n"
++			      "movl %%db2, %2\n"
++			      "movl %%db3, %3\n"
++			      :"=r" (addr0), "=r"(addr1),
++			      "=r"(addr2), "=r"(addr3)
++			      :);
++	} while (0);
++	/* *INDENT-ON*	*/
++	correctit = 0;
++	for (breakno = 0; breakno < 3; breakno++) {
++		breakbit = 2 << (breakno << 1);
++		if (!(dr7 & breakbit) && breakinfo[breakno].enabled) {
++			correctit = 1;
++			dr7 |= breakbit;
++			dr7 &= ~(0xf0000 << (breakno << 2));
++			dr7 |= (((breakinfo[breakno].len << 2) |
++				 breakinfo[breakno].type) << 16) <<
++			    (breakno << 2);
++			switch (breakno) {
++			case 0:
++				asm volatile ("movl %0, %%dr0\n"::"r"
++					      (breakinfo[breakno].addr));
++				break;
++
++			case 1:
++				asm volatile ("movl %0, %%dr1\n"::"r"
++					      (breakinfo[breakno].addr));
++				break;
++
++			case 2:
++				asm volatile ("movl %0, %%dr2\n"::"r"
++					      (breakinfo[breakno].addr));
++				break;
++
++			case 3:
++				asm volatile ("movl %0, %%dr3\n"::"r"
++					      (breakinfo[breakno].addr));
++				break;
++			}
++		} else if ((dr7 & breakbit) && !breakinfo[breakno].enabled) {
++			correctit = 1;
++			dr7 &= ~breakbit;
++			dr7 &= ~(0xf0000 << (breakno << 2));
++		}
++	}
++	if (correctit) {
++		asm volatile ("movl %0, %%db7\n"::"r" (dr7));
++	}
++}
++
++int
++remove_hw_break(unsigned breakno)
++{
++	if (!breakinfo[breakno].enabled) {
++		return -1;
++	}
++	breakinfo[breakno].enabled = 0;
++	return 0;
++}
++
++int
++set_hw_break(unsigned breakno, unsigned type, unsigned len, unsigned addr)
++{
++	if (breakinfo[breakno].enabled) {
++		return -1;
++	}
++	breakinfo[breakno].enabled = 1;
++	breakinfo[breakno].type = type;
++	breakinfo[breakno].len = len;
++	breakinfo[breakno].addr = addr;
++	return 0;
++}
++
++#ifdef CONFIG_SMP
++static int in_kgdb_console = 0;
++
++int
++in_kgdb(struct pt_regs *regs)
++{
++	unsigned flags;
++	int cpu = smp_processor_id();
++	in_kgdb_called = 1;
++	if (!spin_is_locked(&kgdb_spinlock)) {
++		if (in_kgdb_here_log[cpu] ||	/* we are holding this cpu */
++		    in_kgdb_console) {	/* or we are doing slow i/o */
++			return 1;
++		}
++		return 0;
++	}
++
++	/* As I see it the only reason not to let all cpus spin on
++	 * the same spin_lock is to allow selected ones to proceed.
++	 * This would be a good thing, so we leave it this way.
++	 * Maybe someday....  Done !
++
++	 * in_kgdb() is called from an NMI so we don't pretend
++	 * to have any resources, like printk() for example.
++	 */
++
++	kgdb_local_irq_save(flags);	/* only local here, to avoid hanging */
++	/*
++	 * log arival of this cpu
++	 * The NMI keeps on ticking.  Protect against recurring more
++	 * than once, and ignor the cpu that has the kgdb lock
++	 */
++	in_kgdb_entry_log[cpu]++;
++	in_kgdb_here_log[cpu] = regs;
++	if (cpu == spinlock_cpu || waiting_cpus[cpu].task)
++		goto exit_in_kgdb;
++
++	/*
++	 * For protection of the initilization of the spin locks by kgdb
++	 * it locks the kgdb spinlock before it gets the wait locks set
++	 * up.	We wait here for the wait lock to be taken.  If the
++	 * kgdb lock goes away first??	Well, it could be a slow exit
++	 * sequence where the wait lock is removed prior to the kgdb lock
++	 * so if kgdb gets unlocked, we just exit.
++	 */
++
++	while (spin_is_locked(&kgdb_spinlock) &&
++	       !spin_is_locked(waitlocks + cpu)) ;
++	if (!spin_is_locked(&kgdb_spinlock))
++		goto exit_in_kgdb;
++
++	waiting_cpus[cpu].task = current;
++	waiting_cpus[cpu].pid = (current->pid) ? : (PID_MAX + cpu);
++	waiting_cpus[cpu].regs = regs;
++
++	spin_unlock_wait(waitlocks + cpu);
++
++	/*
++	 * log departure of this cpu
++	 */
++	waiting_cpus[cpu].task = 0;
++	waiting_cpus[cpu].pid = 0;
++	waiting_cpus[cpu].regs = 0;
++	correct_hw_break();
++      exit_in_kgdb:
++	in_kgdb_here_log[cpu] = 0;
++	kgdb_local_irq_restore(flags);
++	return 1;
++	/*
++	   spin_unlock(continuelocks + smp_processor_id());
++	 */
++}
++
++void
++smp__in_kgdb(struct pt_regs regs)
++{
++	ack_APIC_irq();
++	in_kgdb(&regs);
++}
++#else
++int
++in_kgdb(struct pt_regs *regs)
++{
++	return (kgdb_spinlock);
++}
++#endif
++
++void
++printexceptioninfo(int exceptionNo, int errorcode, char *buffer)
++{
++	unsigned dr6;
++	int i;
++	switch (exceptionNo) {
++	case 1:		/* debug exception */
++		break;
++	case 3:		/* breakpoint */
++		sprintf(buffer, "Software breakpoint");
++		return;
++	default:
++		sprintf(buffer, "Details not available");
++		return;
++	}
++	asm volatile ("movl %%db6, %0\n":"=r" (dr6)
++		      :);
++	if (dr6 & 0x4000) {
++		sprintf(buffer, "Single step");
++		return;
++	}
++	for (i = 0; i < 4; ++i) {
++		if (dr6 & (1 << i)) {
++			sprintf(buffer, "Hardware breakpoint %d", i);
++			return;
++		}
++	}
++	sprintf(buffer, "Unknown trap");
++	return;
++}
++
++/*
++ * This function does all command procesing for interfacing to gdb.
++ *
++ * NOTE:  The INT nn instruction leaves the state of the interrupt
++ *	  enable flag UNCHANGED.  That means that when this routine
++ *	  is entered via a breakpoint (INT 3) instruction from code
++ *	  that has interrupts enabled, then interrupts will STILL BE
++ *	  enabled when this routine is entered.	 The first thing that
++ *	  we do here is disable interrupts so as to prevent recursive
++ *	  entries and bothersome serial interrupts while we are
++ *	  trying to run the serial port in polled mode.
++ *
++ * For kernel version 2.1.xx the kgdb_cli() actually gets a spin lock so
++ * it is always necessary to do a restore_flags before returning
++ * so as to let go of that lock.
++ */
++int
++kgdb_handle_exception(int exceptionVector,
++		      int signo, int err_code, struct pt_regs *linux_regs)
++{
++	struct task_struct *usethread = NULL;
++	struct task_struct *thread_list_start = 0, *thread = NULL;
++	int addr, length;
++	int breakno, breaktype;
++	char *ptr;
++	int newPC;
++	threadref thref;
++	int threadid;
++	int thread_min = PID_MAX + MAX_NO_CPUS;
++#ifdef old_thread_list
++	int maxthreads;
++#endif
++	int nothreads;
++	unsigned long flags;
++	int gdb_regs[NUMREGBYTES / 4];
++	int dr6;
++	IF_SMP(int entry_state = 0);	/* 0, ok, 1, no nmi, 2 sync failed */
++#define NO_NMI 1
++#define NO_SYNC 2
++#define	regs	(*linux_regs)
++#define NUMREGS NUMREGBYTES/4
++	/*
++	 * If the entry is not from the kernel then return to the Linux
++	 * trap handler and let it process the interrupt normally.
++	 */
++	if ((linux_regs->eflags & VM_MASK) || (3 & linux_regs->xcs)) {
++		printk("ignoring non-kernel exception\n");
++		print_regs(&regs);
++		return (0);
++	}
++	/*
++	 * If we're using eth mode, set the 'mode' in the netdevice.
++	 */
++
++	if (kgdboe)
++		netpoll_set_trap(1);
++
++	kgdb_local_irq_save(flags);
++
++	/* Get kgdb spinlock */
++
++	KGDB_SPIN_LOCK(&kgdb_spinlock);
++	rdtscll(kgdb_info.entry_tsc);
++	/*
++	 * We depend on this spinlock and the NMI watch dog to control the
++	 * other cpus.	They will arrive at "in_kgdb()" as a result of the
++	 * NMI and will wait there for the following spin locks to be
++	 * released.
++	 */
++#ifdef CONFIG_SMP
++
++#if 0
++	if (cpu_callout_map & ~MAX_CPU_MASK) {
++		printk("kgdb : too many cpus, possibly not mapped"
++		       " in contiguous space, change MAX_NO_CPUS"
++		       " in kgdb_stub and make new kernel.\n"
++		       " cpu_callout_map is %lx\n", cpu_callout_map);
++		goto exit_just_unlock;
++	}
++#endif
++	if (spinlock_count == 1) {
++		int time, end_time, dum;
++		int i;
++		int cpu_logged_in[MAX_NO_CPUS] = {[0 ... MAX_NO_CPUS - 1] = (0)
++		};
++		if (remote_debug) {
++			printk("kgdb : cpu %d entry, syncing others\n",
++			       smp_processor_id());
++		}
++		for (i = 0; i < MAX_NO_CPUS; i++) {
++			/*
++			 * Use trylock as we may already hold the lock if
++			 * we are holding the cpu.  Net result is all
++			 * locked.
++			 */
++			spin_trylock(&waitlocks[i]);
++		}
++		for (i = 0; i < MAX_NO_CPUS; i++)
++			cpu_logged_in[i] = 0;
++		/*
++		 * Wait for their arrival.  We know the watch dog is active if
++		 * in_kgdb() has ever been called, as it is always called on a
++		 * watchdog tick.
++		 */
++		rdtsc(dum, time);
++		end_time = time + 2;	/* Note: we use the High order bits! */
++		i = 1;
++		if (num_online_cpus() > 1) {
++			int me_in_kgdb = in_kgdb_entry_log[smp_processor_id()];
++			smp_send_nmi_allbutself();
++
++			while (i < num_online_cpus() && time != end_time) {
++				int j;
++				for (j = 0; j < MAX_NO_CPUS; j++) {
++					if (waiting_cpus[j].task &&
++					    waiting_cpus[j].task != NOCPU &&
++					    !cpu_logged_in[j]) {
++						i++;
++						cpu_logged_in[j] = 1;
++						if (remote_debug) {
++							printk
++							    ("kgdb : cpu %d arrived at kgdb\n",
++							     j);
++						}
++						break;
++					} else if (!waiting_cpus[j].task &&
++						   !cpu_online(j)) {
++						waiting_cpus[j].task = NOCPU;
++						cpu_logged_in[j] = 1;
++						waiting_cpus[j].hold = 1;
++						break;
++					}
++					if (!waiting_cpus[j].task &&
++					    in_kgdb_here_log[j]) {
++
++						int wait = 100000;
++						while (wait--) ;
++						if (!waiting_cpus[j].task &&
++						    in_kgdb_here_log[j]) {
++							printk
++							    ("kgdb : cpu %d stall"
++							     " in in_kgdb\n",
++							     j);
++							i++;
++							cpu_logged_in[j] = 1;
++							waiting_cpus[j].task =
++							    (struct task_struct
++							     *) 1;
++						}
++					}
++				}
++
++				if (in_kgdb_entry_log[smp_processor_id()] >
++				    (me_in_kgdb + 10)) {
++					break;
++				}
++
++				rdtsc(dum, time);
++			}
++			if (i < num_online_cpus()) {
++				printk
++				    ("kgdb : time out, proceeding without sync\n");
++#if 0
++				printk("kgdb : Waiting_cpus: 0 = %d, 1 = %d\n",
++				       waiting_cpus[0].task != 0,
++				       waiting_cpus[1].task != 0);
++				printk("kgdb : Cpu_logged in: 0 = %d, 1 = %d\n",
++				       cpu_logged_in[0], cpu_logged_in[1]);
++				printk
++				    ("kgdb : in_kgdb_here_log in: 0 = %d, 1 = %d\n",
++				     in_kgdb_here_log[0] != 0,
++				     in_kgdb_here_log[1] != 0);
++#endif
++				entry_state = NO_SYNC;
++			} else {
++#if 0
++				int ent =
++				    in_kgdb_entry_log[smp_processor_id()] -
++				    me_in_kgdb;
++				printk("kgdb : sync after %d entries\n", ent);
++#endif
++			}
++		} else {
++			if (remote_debug) {
++				printk
++				    ("kgdb : %d cpus, but watchdog not active\n"
++				     "proceeding without locking down other cpus\n",
++				     num_online_cpus());
++				entry_state = NO_NMI;
++			}
++		}
++	}
++#endif
++
++	if (remote_debug) {
++		unsigned long *lp = (unsigned long *) &linux_regs;
++
++		printk("handle_exception(exceptionVector=%d, "
++		       "signo=%d, err_code=%d, linux_regs=%p)\n",
++		       exceptionVector, signo, err_code, linux_regs);
++		if (debug_regs) {
++			print_regs(&regs);
++			printk("Stk: %8lx %8lx %8lx %8lx"
++			       "  %8lx %8lx %8lx %8lx\n",
++			       lp[0], lp[1], lp[2], lp[3],
++			       lp[4], lp[5], lp[6], lp[7]);
++			printk("     %8lx %8lx %8lx %8lx"
++			       "  %8lx %8lx %8lx %8lx\n",
++			       lp[8], lp[9], lp[10], lp[11],
++			       lp[12], lp[13], lp[14], lp[15]);
++			printk("     %8lx %8lx %8lx %8lx  "
++			       "%8lx %8lx %8lx %8lx\n",
++			       lp[16], lp[17], lp[18], lp[19],
++			       lp[20], lp[21], lp[22], lp[23]);
++			printk("     %8lx %8lx %8lx %8lx  "
++			       "%8lx %8lx %8lx %8lx\n",
++			       lp[24], lp[25], lp[26], lp[27],
++			       lp[28], lp[29], lp[30], lp[31]);
++		}
++	}
++
++	/* Disable hardware debugging while we are in kgdb */
++	/* Get the debug register status register */
++/*				       *INDENT-OFF*  */
++      __asm__("movl %0,%%db7"
++	      :	/* no output */
++	      :"r"(0));
++
++	asm volatile ("movl %%db6, %0\n"
++		      :"=r" (hw_breakpoint_status)
++		      :);
++
++/*				       *INDENT-ON*  */
++	switch (exceptionVector) {
++	case 0:		/* divide error */
++	case 1:		/* debug exception */
++	case 2:		/* NMI */
++	case 3:		/* breakpoint */
++	case 4:		/* overflow */
++	case 5:		/* bounds check */
++	case 6:		/* invalid opcode */
++	case 7:		/* device not available */
++	case 8:		/* double fault (errcode) */
++	case 10:		/* invalid TSS (errcode) */
++	case 12:		/* stack fault (errcode) */
++	case 16:		/* floating point error */
++	case 17:		/* alignment check (errcode) */
++	default:		/* any undocumented */
++		break;
++	case 11:		/* segment not present (errcode) */
++	case 13:		/* general protection (errcode) */
++	case 14:		/* page fault (special errcode) */
++	case 19:		/* cache flush denied */
++		if (mem_err_expected) {
++			/*
++			 * This fault occured because of the
++			 * get_char or set_char routines.  These
++			 * two routines use either eax of edx to
++			 * indirectly reference the location in
++			 * memory that they are working with.
++			 * For a page fault, when we return the
++			 * instruction will be retried, so we
++			 * have to make sure that these
++			 * registers point to valid memory.
++			 */
++			mem_err = 1;	/* set mem error flag */
++			mem_err_expected = 0;
++			mem_err_cnt++;	/* helps in debugging */
++			/* make valid address */
++			regs.eax = (long) &garbage_loc;
++			/* make valid address */
++			regs.edx = (long) &garbage_loc;
++			if (remote_debug)
++				printk("Return after memory error: "
++				       "mem_err_cnt=%d\n", mem_err_cnt);
++			if (debug_regs)
++				print_regs(&regs);
++			goto exit_kgdb;
++		}
++		break;
++	}
++	if (remote_debug)
++		printk("kgdb : entered kgdb on cpu %d\n", smp_processor_id());
++
++	gdb_i386vector = exceptionVector;
++	gdb_i386errcode = err_code;
++	kgdb_info.called_from = __builtin_return_address(0);
++#ifdef CONFIG_SMP
++	/*
++	 * OK, we can now communicate, lets tell gdb about the sync.
++	 * but only if we had a problem.
++	 */
++	switch (entry_state) {
++	case NO_NMI:
++		to_gdb("NMI not active, other cpus not stopped\n");
++		break;
++	case NO_SYNC:
++		to_gdb("Some cpus not stopped, see 'kgdb_info' for details\n");
++	default:;
++	}
++
++#endif
++/*
++ * Set up the gdb function call area.
++ */
++	trap_cpu = smp_processor_id();
++	OLD_esp = NEW_esp = (int) (&linux_regs->esp);
++
++      IF_SMP(once_again:)
++	    /* reply to host that an exception has occurred */
++	    remcomOutBuffer[0] = 'S';
++	remcomOutBuffer[1] = hexchars[signo >> 4];
++	remcomOutBuffer[2] = hexchars[signo % 16];
++	remcomOutBuffer[3] = 0;
++
++	putpacket(remcomOutBuffer);
++
++	while (1 == 1) {
++		error = 0;
++		remcomOutBuffer[0] = 0;
++		getpacket(remcomInBuffer);
++		switch (remcomInBuffer[0]) {
++		case '?':
++			remcomOutBuffer[0] = 'S';
++			remcomOutBuffer[1] = hexchars[signo >> 4];
++			remcomOutBuffer[2] = hexchars[signo % 16];
++			remcomOutBuffer[3] = 0;
++			break;
++		case 'd':
++			remote_debug = !(remote_debug);	/* toggle debug flag */
++			printk("Remote debug %s\n",
++			       remote_debug ? "on" : "off");
++			break;
++		case 'g':	/* return the value of the CPU registers */
++			get_gdb_regs(usethread, &regs, gdb_regs);
++			mem2hex((char *) gdb_regs,
++				remcomOutBuffer, NUMREGBYTES, 0);
++			break;
++		case 'G':	/* set the value of the CPU registers - return OK */
++			hex2mem(&remcomInBuffer[1],
++				(char *) gdb_regs, NUMREGBYTES, 0);
++			if (!usethread || usethread == current) {
++				gdb_regs_to_regs(gdb_regs, &regs);
++				strcpy(remcomOutBuffer, "OK");
++			} else {
++				strcpy(remcomOutBuffer, "E00");
++			}
++			break;
++
++		case 'P':{	/* set the value of a single CPU register -
++				   return OK */
++				/*
++				 * For some reason, gdb wants to talk about psudo
++				 * registers (greater than 15).	 These may have
++				 * meaning for ptrace, but for us it is safe to
++				 * ignor them.	We do this by dumping them into
++				 * _GS which we also ignor, but do have memory for.
++				 */
++				int regno;
++
++				ptr = &remcomInBuffer[1];
++				regs_to_gdb_regs(gdb_regs, &regs);
++				if ((!usethread || usethread == current) &&
++				    hexToInt(&ptr, &regno) &&
++				    *ptr++ == '=' && (regno >= 0)) {
++					regno =
++					    (regno >= NUMREGS ? _GS : regno);
++					hex2mem(ptr, (char *) &gdb_regs[regno],
++						4, 0);
++					gdb_regs_to_regs(gdb_regs, &regs);
++					strcpy(remcomOutBuffer, "OK");
++					break;
++				}
++				strcpy(remcomOutBuffer, "E01");
++				break;
++			}
++
++			/* mAA..AA,LLLL	 Read LLLL bytes at address AA..AA */
++		case 'm':
++			/* TRY TO READ %x,%x.  IF SUCCEED, SET PTR = 0 */
++			ptr = &remcomInBuffer[1];
++			if (hexToInt(&ptr, &addr) &&
++			    (*(ptr++) == ',') && (hexToInt(&ptr, &length))) {
++				ptr = 0;
++				/*
++				 * hex doubles the byte count
++				 */
++				if (length > (BUFMAX / 2))
++					length = BUFMAX / 2;
++				mem2hex((char *) addr,
++					remcomOutBuffer, length, 1);
++				if (mem_err) {
++					strcpy(remcomOutBuffer, "E03");
++					debug_error("memory fault\n", NULL);
++				}
++			}
++
++			if (ptr) {
++				strcpy(remcomOutBuffer, "E01");
++				debug_error
++				    ("malformed read memory command: %s\n",
++				     remcomInBuffer);
++			}
++			break;
++
++			/* MAA..AA,LLLL:
++			   Write LLLL bytes at address AA.AA return OK */
++		case 'M':
++			/* TRY TO READ '%x,%x:'.  IF SUCCEED, SET PTR = 0 */
++			ptr = &remcomInBuffer[1];
++			if (hexToInt(&ptr, &addr) &&
++			    (*(ptr++) == ',') &&
++			    (hexToInt(&ptr, &length)) && (*(ptr++) == ':')) {
++				hex2mem(ptr, (char *) addr, length, 1);
++
++				if (mem_err) {
++					strcpy(remcomOutBuffer, "E03");
++					debug_error("memory fault\n", NULL);
++				} else {
++					strcpy(remcomOutBuffer, "OK");
++				}
++
++				ptr = 0;
++			}
++			if (ptr) {
++				strcpy(remcomOutBuffer, "E02");
++				debug_error
++				    ("malformed write memory command: %s\n",
++				     remcomInBuffer);
++			}
++			break;
++		case 'S':
++			remcomInBuffer[0] = 's';
++		case 'C':
++			/* Csig;AA..AA where ;AA..AA is optional
++			 * continue with signal
++			 * Since signals are meaning less to us, delete that
++			 * part and then fall into the 'c' code.
++			 */
++			ptr = &remcomInBuffer[1];
++			length = 2;
++			while (*ptr && *ptr != ';') {
++				length++;
++				ptr++;
++			}
++			if (*ptr) {
++				do {
++					ptr++;
++					*(ptr - length++) = *ptr;
++				} while (*ptr);
++			} else {
++				remcomInBuffer[1] = 0;
++			}
++
++			/* cAA..AA  Continue at address AA..AA(optional) */
++			/* sAA..AA  Step one instruction from AA..AA(optional) */
++			/* D	    detach, reply OK and then continue */
++		case 'c':
++		case 's':
++		case 'D':
++
++			/* try to read optional parameter,
++			   pc unchanged if no parm */
++			ptr = &remcomInBuffer[1];
++			if (hexToInt(&ptr, &addr)) {
++				if (remote_debug)
++					printk("Changing EIP to 0x%x\n", addr);
++
++				regs.eip = addr;
++			}
++
++			newPC = regs.eip;
++
++			/* clear the trace bit */
++			regs.eflags &= 0xfffffeff;
++
++			/* set the trace bit if we're stepping */
++			if (remcomInBuffer[0] == 's')
++				regs.eflags |= 0x100;
++
++			/* detach is a friendly version of continue. Note that
++			   debugging is still enabled (e.g hit control C)
++			 */
++			if (remcomInBuffer[0] == 'D') {
++				strcpy(remcomOutBuffer, "OK");
++				putpacket(remcomOutBuffer);
++			}
++
++			if (remote_debug) {
++				printk("Resuming execution\n");
++				print_regs(&regs);
++			}
++			asm volatile ("movl %%db6, %0\n":"=r" (dr6)
++				      :);
++			if (!(dr6 & 0x4000)) {
++				for (breakno = 0; breakno < 4; ++breakno) {
++					if (dr6 & (1 << breakno) &&
++					    (breakinfo[breakno].type == 0)) {
++						/* Set restore flag */
++						regs.eflags |= 0x10000;
++						break;
++					}
++				}
++			}
++
++			if (kgdboe)
++				netpoll_set_trap(0);
++
++			correct_hw_break();
++			asm volatile ("movl %0, %%db6\n"::"r" (0));
++			goto exit_kgdb;
++
++			/* kill the program */
++		case 'k':	/* do nothing */
++			break;
++
++			/* query */
++		case 'q':
++			nothreads = 0;
++			switch (remcomInBuffer[1]) {
++			case 'f':
++				threadid = 1;
++				thread_list = 2;
++				thread_list_start = (usethread ? : current);
++			case 's':
++				if (!cmp_str(&remcomInBuffer[2],
++					     "ThreadInfo", 10))
++					break;
++
++				remcomOutBuffer[nothreads++] = 'm';
++				for (; threadid < PID_MAX + MAX_NO_CPUS;
++				     threadid++) {
++					thread = getthread(threadid);
++					if (thread) {
++						nothreads += int_to_hex_v(
++							&remcomOutBuffer[
++								nothreads],
++							threadid);
++						if (thread_min > threadid)
++							thread_min = threadid;
++						remcomOutBuffer[
++							nothreads] = ',';
++						nothreads++;
++						if (nothreads > BUFMAX - 10)
++							break;
++					}
++				}
++				if (remcomOutBuffer[nothreads - 1] == 'm') {
++					remcomOutBuffer[nothreads - 1] = 'l';
++				} else {
++					nothreads--;
++				}
++				remcomOutBuffer[nothreads] = 0;
++				break;
++
++#ifdef old_thread_list /* Old thread info request */
++			case 'L':
++				/* List threads */
++				thread_list = 2;
++				thread_list_start = (usethread ? : current);
++				unpack_byte(remcomInBuffer + 3, &maxthreads);
++				unpack_threadid(remcomInBuffer + 5, &thref);
++				do {
++					int buf_thread_limit =
++					    (BUFMAX - 22) / BUF_THREAD_ID_SIZE;
++					if (maxthreads > buf_thread_limit) {
++						maxthreads = buf_thread_limit;
++					}
++				} while (0);
++				remcomOutBuffer[0] = 'q';
++				remcomOutBuffer[1] = 'M';
++				remcomOutBuffer[4] = '0';
++				pack_threadid(remcomOutBuffer + 5, &thref);
++
++				threadid = threadref_to_int(&thref);
++				for (nothreads = 0;
++				     nothreads < maxthreads &&
++				     threadid < PID_MAX + MAX_NO_CPUS;
++				     threadid++) {
++					thread = getthread(threadid);
++					if (thread) {
++						int_to_threadref(&thref,
++								 threadid);
++						pack_threadid(remcomOutBuffer +
++							      21 +
++							      nothreads * 16,
++							      &thref);
++						nothreads++;
++						if (thread_min > threadid)
++							thread_min = threadid;
++					}
++				}
++
++				if (threadid == PID_MAX + MAX_NO_CPUS) {
++					remcomOutBuffer[4] = '1';
++				}
++				pack_hex_byte(remcomOutBuffer + 2, nothreads);
++				remcomOutBuffer[21 + nothreads * 16] = '\0';
++				break;
++#endif
++			case 'C':
++				/* Current thread id */
++				remcomOutBuffer[0] = 'Q';
++				remcomOutBuffer[1] = 'C';
++				threadid = current->pid;
++				if (!threadid) {
++					/*
++					 * idle thread
++					 */
++					for (threadid = PID_MAX;
++					     threadid < PID_MAX + MAX_NO_CPUS;
++					     threadid++) {
++						if (current ==
++						    idle_task(threadid -
++							      PID_MAX))
++							break;
++					}
++				}
++				int_to_threadref(&thref, threadid);
++				pack_threadid(remcomOutBuffer + 2, &thref);
++				remcomOutBuffer[18] = '\0';
++				break;
++
++			case 'E':
++				/* Print exception info */
++				printexceptioninfo(exceptionVector,
++						   err_code, remcomOutBuffer);
++				break;
++			case 'T':{
++				char * nptr;
++				/* Thread extra info */
++				if (!cmp_str(&remcomInBuffer[2],
++					    "hreadExtraInfo,", 15)) {
++					break;
++				}
++				ptr = &remcomInBuffer[17];
++				hexToInt(&ptr, &threadid);
++				thread = getthread(threadid);
++				nptr = &thread->comm[0];
++				length = 0;
++				ptr = &remcomOutBuffer[0];
++				do {
++					length++;
++					ptr = pack_hex_byte(ptr, *nptr++);
++				 } while (*nptr && length < 16);
++				/*
++				 * would like that 16 to be the size of
++				 * task_struct.comm but don't know the
++				 * syntax..
++				 */
++				*ptr = 0;
++			}
++			}
++			break;
++
++			/* task related */
++		case 'H':
++			switch (remcomInBuffer[1]) {
++			case 'g':
++				ptr = &remcomInBuffer[2];
++				hexToInt(&ptr, &threadid);
++				thread = getthread(threadid);
++				if (!thread) {
++					remcomOutBuffer[0] = 'E';
++					remcomOutBuffer[1] = '\0';
++					break;
++				}
++				/*
++				 * Just in case I forget what this is all about,
++				 * the "thread info" command to gdb causes it
++				 * to ask for a thread list.  It then switches
++				 * to each thread and asks for the registers.
++				 * For this (and only this) usage, we want to
++				 * fudge the registers of tasks not on the run
++				 * list (i.e. waiting) to show the routine that
++				 * called schedule. Also, gdb, is a minimalist
++				 * in that if the current thread is the last
++				 * it will not re-read the info when done.
++				 * This means that in this case we must show
++				 * the real registers. So here is how we do it:
++				 * Each entry we keep track of the min
++				 * thread in the list (the last that gdb will)
++				 * get info for.  We also keep track of the
++				 * starting thread.
++				 * "thread_list" is cleared when switching back
++				 * to the min thread if it is was current, or
++				 * if it was not current, thread_list is set
++				 * to 1.  When the switch to current comes,
++				 * if thread_list is 1, clear it, else do
++				 * nothing.
++				 */
++				usethread = thread;
++				if ((thread_list == 1) &&
++				    (thread == thread_list_start)) {
++					thread_list = 0;
++				}
++				if (thread_list && (threadid == thread_min)) {
++					if (thread == thread_list_start) {
++						thread_list = 0;
++					} else {
++						thread_list = 1;
++					}
++				}
++				/* follow through */
++			case 'c':
++				remcomOutBuffer[0] = 'O';
++				remcomOutBuffer[1] = 'K';
++				remcomOutBuffer[2] = '\0';
++				break;
++			}
++			break;
++
++			/* Query thread status */
++		case 'T':
++			ptr = &remcomInBuffer[1];
++			hexToInt(&ptr, &threadid);
++			thread = getthread(threadid);
++			if (thread) {
++				remcomOutBuffer[0] = 'O';
++				remcomOutBuffer[1] = 'K';
++				remcomOutBuffer[2] = '\0';
++				if (thread_min > threadid)
++					thread_min = threadid;
++			} else {
++				remcomOutBuffer[0] = 'E';
++				remcomOutBuffer[1] = '\0';
++			}
++			break;
++
++		case 'Y': /* set up a hardware breakpoint */
++			ptr = &remcomInBuffer[1];
++			hexToInt(&ptr, &breakno);
++			ptr++;
++			hexToInt(&ptr, &breaktype);
++			ptr++;
++			hexToInt(&ptr, &length);
++			ptr++;
++			hexToInt(&ptr, &addr);
++			if (set_hw_break(breakno & 0x3,
++					 breaktype & 0x3,
++					 length & 0x3, addr) == 0) {
++				strcpy(remcomOutBuffer, "OK");
++			} else {
++				strcpy(remcomOutBuffer, "ERROR");
++			}
++			break;
++
++			/* Remove hardware breakpoint */
++		case 'y':
++			ptr = &remcomInBuffer[1];
++			hexToInt(&ptr, &breakno);
++			if (remove_hw_break(breakno & 0x3) == 0) {
++				strcpy(remcomOutBuffer, "OK");
++			} else {
++				strcpy(remcomOutBuffer, "ERROR");
++			}
++			break;
++
++		case 'r':	/* reboot */
++			strcpy(remcomOutBuffer, "OK");
++			putpacket(remcomOutBuffer);
++			/*to_gdb("Rebooting\n"); */
++			/* triplefault	 no return from here */
++			{
++				static long no_idt[2];
++				__asm__ __volatile__("lidt %0"::"m"(no_idt[0]));
++				BREAKPOINT;
++			}
++
++		}		/* switch */
++
++		/* reply to the request */
++		putpacket(remcomOutBuffer);
++	}			/* while(1==1) */
++	/*
++	 *  reached by goto only.
++	 */
++      exit_kgdb:
++	/*
++	 * Here is where we set up to trap a gdb function call.	 NEW_esp
++	 * will be changed if we are trying to do this.	 We handle both
++	 * adding and subtracting, thus allowing gdb to put grung on
++	 * the stack which it removes later.
++	 */
++	if (NEW_esp != OLD_esp) {
++		int *ptr = END_OF_LOOKASIDE;
++		if (NEW_esp < OLD_esp)
++			ptr -= (OLD_esp - NEW_esp) / sizeof (int);
++		*--ptr = linux_regs->eflags;
++		*--ptr = linux_regs->xcs;
++		*--ptr = linux_regs->eip;
++		*--ptr = linux_regs->ecx;
++		*--ptr = linux_regs->ebx;
++		*--ptr = linux_regs->eax;
++		linux_regs->ecx = NEW_esp - (sizeof (int) * 6);
++		linux_regs->ebx = (unsigned int) END_OF_LOOKASIDE;
++		if (NEW_esp < OLD_esp) {
++			linux_regs->eip = (unsigned int) fn_call_stub;
++		} else {
++			linux_regs->eip = (unsigned int) fn_rtn_stub;
++			linux_regs->eax = NEW_esp;
++		}
++		linux_regs->eflags &= ~(IF_BIT | TF_BIT);
++	}
++#ifdef CONFIG_SMP
++	/*
++	 * Release gdb wait locks
++	 * Sanity check time.  Must have at least one cpu to run.  Also single
++	 * step must not be done if the current cpu is on hold.
++	 */
++	if (spinlock_count == 1) {
++		int ss_hold = (regs.eflags & 0x100) && kgdb_info.hold_on_sstep;
++		int cpu_avail = 0;
++		int i;
++
++		for (i = 0; i < MAX_NO_CPUS; i++) {
++			if (!cpu_online(i))
++				break;
++			if (!hold_cpu(i)) {
++				cpu_avail = 1;
++			}
++		}
++		/*
++		 * Early in the bring up there will be NO cpus on line...
++		 */
++		if (!cpu_avail && !cpus_empty(cpu_online_map)) {
++			to_gdb("No cpus unblocked, see 'kgdb_info.hold_cpu'\n");
++			goto once_again;
++		}
++		if (hold_cpu(smp_processor_id()) && (regs.eflags & 0x100)) {
++			to_gdb
++			    ("Current cpu must be unblocked to single step\n");
++			goto once_again;
++		}
++		if (!(ss_hold)) {
++			int i;
++			for (i = 0; i < MAX_NO_CPUS; i++) {
++				if (!hold_cpu(i)) {
++					spin_unlock(&waitlocks[i]);
++				}
++			}
++		} else {
++			spin_unlock(&waitlocks[smp_processor_id()]);
++		}
++		/* Release kgdb spinlock */
++		KGDB_SPIN_UNLOCK(&kgdb_spinlock);
++		/*
++		 * If this cpu is on hold, this is where we
++		 * do it.  Note, the NMI will pull us out of here,
++		 * but will return as the above lock is not held.
++		 * We will stay here till another cpu releases the lock for us.
++		 */
++		spin_unlock_wait(waitlocks + smp_processor_id());
++		kgdb_local_irq_restore(flags);
++		return (0);
++	}
++#if 0
++exit_just_unlock:
++#endif
++#endif
++	/* Release kgdb spinlock */
++	KGDB_SPIN_UNLOCK(&kgdb_spinlock);
++	kgdb_local_irq_restore(flags);
++	return (0);
++}
++
++/* this function is used to set up exception handlers for tracing and
++ * breakpoints.
++ * This function is not needed as the above line does all that is needed.
++ * We leave it for backward compatitability...
++ */
++void
++set_debug_traps(void)
++{
++	/*
++	 * linux_debug_hook is defined in traps.c.  We store a pointer
++	 * to our own exception handler into it.
++
++	 * But really folks, every hear of labeled common, an old Fortran
++	 * concept.  Lots of folks can reference it and it is define if
++	 * anyone does.	 Only one can initialize it at link time.  We do
++	 * this with the hook.	See the statement above.  No need for any
++	 * executable code and it is ready as soon as the kernel is
++	 * loaded.  Very desirable in kernel debugging.
++
++	 linux_debug_hook = handle_exception ;
++	 */
++
++	/* In case GDB is started before us, ack any packets (presumably
++	   "$?#xx") sitting there.
++	   putDebugChar ('+');
++
++	   initialized = 1;
++	 */
++}
++
++/* This function will generate a breakpoint exception.	It is used at the
++   beginning of a program to sync up with a debugger and can be used
++   otherwise as a quick means to stop program execution and "break" into
++   the debugger. */
++/* But really, just use the BREAKPOINT macro.  We will handle the int stuff
++ */
++
++#ifdef later
++/*
++ * possibly we should not go thru the traps.c code at all?  Someday.
++ */
++void
++do_kgdb_int3(struct pt_regs *regs, long error_code)
++{
++	kgdb_handle_exception(3, 5, error_code, regs);
++	return;
++}
++#endif
++#undef regs
++#ifdef CONFIG_TRAP_BAD_SYSCALL_EXITS
++asmlinkage void
++bad_sys_call_exit(int stuff)
++{
++	struct pt_regs *regs = (struct pt_regs *) &stuff;
++	printk("Sys call %d return with %x preempt_count\n",
++	       (int) regs->orig_eax, preempt_count());
++}
++#endif
++#ifdef CONFIG_STACK_OVERFLOW_TEST
++#include <asm/kgdb.h>
++asmlinkage void
++stack_overflow(void)
++{
++#ifdef BREAKPOINT
++	BREAKPOINT;
++#else
++	printk("Kernel stack overflow, looping forever\n");
++#endif
++	while (1) {
++	}
++}
++#endif
++
++#if defined(CONFIG_SMP) || defined(CONFIG_KGDB_CONSOLE)
++char gdbconbuf[BUFMAX];
++
++static void
++kgdb_gdb_message(const char *s, unsigned count)
++{
++	int i;
++	int wcount;
++	char *bufptr;
++	/*
++	 * This takes care of NMI while spining out chars to gdb
++	 */
++	IF_SMP(in_kgdb_console = 1);
++	gdbconbuf[0] = 'O';
++	bufptr = gdbconbuf + 1;
++	while (count > 0) {
++		if ((count << 1) > (BUFMAX - 2)) {
++			wcount = (BUFMAX - 2) >> 1;
++		} else {
++			wcount = count;
++		}
++		count -= wcount;
++		for (i = 0; i < wcount; i++) {
++			bufptr = pack_hex_byte(bufptr, s[i]);
++		}
++		*bufptr = '\0';
++		s += wcount;
++
++		putpacket(gdbconbuf);
++
++	}
++	IF_SMP(in_kgdb_console = 0);
++}
++#endif
++#ifdef CONFIG_SMP
++static void
++to_gdb(const char *s)
++{
++	int count = 0;
++	while (s[count] && (count++ < BUFMAX)) ;
++	kgdb_gdb_message(s, count);
++}
++#endif
++#ifdef CONFIG_KGDB_CONSOLE
++#include <linux/console.h>
++#include <linux/init.h>
++#include <linux/fs.h>
++#include <asm/uaccess.h>
++#include <asm/semaphore.h>
++
++void
++kgdb_console_write(struct console *co, const char *s, unsigned count)
++{
++
++	if (gdb_i386vector == -1) {
++		/*
++		 * We have not yet talked to gdb.  What to do...
++		 * lets break, on continue we can do the write.
++		 * But first tell him whats up. Uh, well no can do,
++		 * as this IS the console.  Oh well...
++		 * We do need to wait or the messages will be lost.
++		 * Other option would be to tell the above code to
++		 * ignore this breakpoint and do an auto return,
++		 * but that might confuse gdb.	Also this happens
++		 * early enough in boot up that we don't have the traps
++		 * set up yet, so...
++		 */
++		breakpoint();
++	}
++	kgdb_gdb_message(s, count);
++}
++
++/*
++ * ------------------------------------------------------------
++ * Serial KGDB driver
++ * ------------------------------------------------------------
++ */
++
++static struct console kgdbcons = {
++	name:"kgdb",
++	write:kgdb_console_write,
++#ifdef CONFIG_KGDB_USER_CONSOLE
++	device:kgdb_console_device,
++#endif
++	flags:CON_PRINTBUFFER | CON_ENABLED,
++	index:-1,
++};
++
++/*
++ * The trick here is that this file gets linked before printk.o
++ * That means we get to peer at the console info in the command
++ * line before it does.	 If we are up, we register, otherwise,
++ * do nothing.	By returning 0, we allow printk to look also.
++ */
++static int kgdb_console_enabled;
++
++int __init
++kgdb_console_init(char *str)
++{
++	if ((strncmp(str, "kgdb", 4) == 0) || (strncmp(str, "gdb", 3) == 0)) {
++		register_console(&kgdbcons);
++		kgdb_console_enabled = 1;
++	}
++	return 0;		/* let others look at the string */
++}
++
++__setup("console=", kgdb_console_init);
++
++#ifdef CONFIG_KGDB_USER_CONSOLE
++static kdev_t kgdb_console_device(struct console *c);
++/* This stuff sort of works, but it knocks out telnet devices
++ * we are leaving it here in case we (or you) find time to figure it out
++ * better..
++ */
++
++/*
++ * We need a real char device as well for when the console is opened for user
++ * space activities.
++ */
++
++static int
++kgdb_consdev_open(struct inode *inode, struct file *file)
++{
++	return 0;
++}
++
++static ssize_t
++kgdb_consdev_write(struct file *file, const char *buf,
++		   size_t count, loff_t * ppos)
++{
++	int size, ret = 0;
++	static char kbuf[128];
++	static DECLARE_MUTEX(sem);
++
++	/* We are not reentrant... */
++	if (down_interruptible(&sem))
++		return -ERESTARTSYS;
++
++	while (count > 0) {
++		/* need to copy the data from user space */
++		size = count;
++		if (size > sizeof (kbuf))
++			size = sizeof (kbuf);
++		if (copy_from_user(kbuf, buf, size)) {
++			ret = -EFAULT;
++			break;;
++		}
++		kgdb_console_write(&kgdbcons, kbuf, size);
++		count -= size;
++		ret += size;
++		buf += size;
++	}
++
++	up(&sem);
++
++	return ret;
++}
++
++struct file_operations kgdb_consdev_fops = {
++	open:kgdb_consdev_open,
++	write:kgdb_consdev_write
++};
++static kdev_t
++kgdb_console_device(struct console *c)
++{
++	return MKDEV(TTYAUX_MAJOR, 1);
++}
++
++/*
++ * This routine gets called from the serial stub in the i386/lib
++ * This is so it is done late in bring up (just before the console open).
++ */
++void
++kgdb_console_finit(void)
++{
++	if (kgdb_console_enabled) {
++		char *cptr = cdevname(MKDEV(TTYAUX_MAJOR, 1));
++		char *cp = cptr;
++		while (*cptr && *cptr != '(')
++			cptr++;
++		*cptr = 0;
++		unregister_chrdev(TTYAUX_MAJOR, cp);
++		register_chrdev(TTYAUX_MAJOR, "kgdb", &kgdb_consdev_fops);
++	}
++}
++#endif
++#endif
++#ifdef CONFIG_KGDB_TS
++#include <asm/msr.h>		/* time stamp code */
++#include <asm/hardirq.h>	/* in_interrupt */
++#ifdef CONFIG_KGDB_TS_64
++#define DATA_POINTS 64
++#endif
++#ifdef CONFIG_KGDB_TS_128
++#define DATA_POINTS 128
++#endif
++#ifdef CONFIG_KGDB_TS_256
++#define DATA_POINTS 256
++#endif
++#ifdef CONFIG_KGDB_TS_512
++#define DATA_POINTS 512
++#endif
++#ifdef CONFIG_KGDB_TS_1024
++#define DATA_POINTS 1024
++#endif
++#ifndef DATA_POINTS
++#define DATA_POINTS 128		/* must be a power of two */
++#endif
++#define INDEX_MASK (DATA_POINTS - 1)
++#if (INDEX_MASK & DATA_POINTS)
++#error "CONFIG_KGDB_TS_COUNT must be a power of 2"
++#endif
++struct kgdb_and_then_struct {
++#ifdef CONFIG_SMP
++	int on_cpu;
++#endif
++	struct task_struct *task;
++	long long at_time;
++	int from_ln;
++	char *in_src;
++	void *from;
++	int *with_shpf;
++	int data0;
++	int data1;
++};
++struct kgdb_and_then_struct2 {
++#ifdef CONFIG_SMP
++	int on_cpu;
++#endif
++	struct task_struct *task;
++	long long at_time;
++	int from_ln;
++	char *in_src;
++	void *from;
++	int *with_shpf;
++	struct task_struct *t1;
++	struct task_struct *t2;
++};
++struct kgdb_and_then_struct kgdb_data[DATA_POINTS];
++
++struct kgdb_and_then_struct *kgdb_and_then = &kgdb_data[0];
++int kgdb_and_then_count;
++
++void
++kgdb_tstamp(int line, char *source, int data0, int data1)
++{
++	static spinlock_t ts_spin = SPIN_LOCK_UNLOCKED;
++	int flags;
++	kgdb_local_irq_save(flags);
++	spin_lock(&ts_spin);
++	rdtscll(kgdb_and_then->at_time);
++#ifdef CONFIG_SMP
++	kgdb_and_then->on_cpu = smp_processor_id();
++#endif
++	kgdb_and_then->task = current;
++	kgdb_and_then->from_ln = line;
++	kgdb_and_then->in_src = source;
++	kgdb_and_then->from = __builtin_return_address(0);
++	kgdb_and_then->with_shpf = (int *) (((flags & IF_BIT) >> 9) |
++					    (preempt_count() << 8));
++	kgdb_and_then->data0 = data0;
++	kgdb_and_then->data1 = data1;
++	kgdb_and_then = &kgdb_data[++kgdb_and_then_count & INDEX_MASK];
++	spin_unlock(&ts_spin);
++	kgdb_local_irq_restore(flags);
++#ifdef CONFIG_PREEMPT
++
++#endif
++	return;
++}
++#endif
++typedef int gdb_debug_hook(int exceptionVector,
++			   int signo, int err_code, struct pt_regs *linux_regs);
++gdb_debug_hook *linux_debug_hook = &kgdb_handle_exception;	/* histerical reasons... */
++
++static int kgdb_need_breakpoint[NR_CPUS];
++
++void kgdb_schedule_breakpoint(void)
++{
++	kgdb_need_breakpoint[smp_processor_id()] = 1;
++}
++
++void kgdb_process_breakpoint(void)
++{
++	/*
++	 * Handle a breakpoint queued from inside network driver code
++         * to avoid reentrancy issues
++	 */
++	if (kgdb_need_breakpoint[smp_processor_id()]) {
++		kgdb_need_breakpoint[smp_processor_id()] = 0;
++		BREAKPOINT;
++	}
++}
++
+--- linux-2.6.0/arch/i386/kernel/ldt.c	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/kernel/ldt.c	2003-12-28 23:26:36.000000000 -0800
+@@ -2,7 +2,7 @@
+  * linux/kernel/ldt.c
+  *
+  * Copyright (C) 1992 Krishna Balasubramanian and Linus Torvalds
+- * Copyright (C) 1999 Ingo Molnar <mingo@redhat.com>
++ * Copyright (C) 1999, 2003 Ingo Molnar <mingo@redhat.com>
+  */
+ 
+ #include <linux/errno.h>
+@@ -18,6 +18,8 @@
+ #include <asm/system.h>
+ #include <asm/ldt.h>
+ #include <asm/desc.h>
++#include <linux/highmem.h>
++#include <asm/atomic_kmap.h>
+ 
+ #ifdef CONFIG_SMP /* avoids "defined but not used" warnig */
+ static void flush_ldt(void *null)
+@@ -29,34 +31,31 @@ static void flush_ldt(void *null)
+ 
+ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
+ {
+-	void *oldldt;
+-	void *newldt;
+-	int oldsize;
++	int oldsize, newsize, i;
+ 
+ 	if (mincount <= pc->size)
+ 		return 0;
++	/*
++	 * LDT got larger - reallocate if necessary.
++	 */
+ 	oldsize = pc->size;
+ 	mincount = (mincount+511)&(~511);
+-	if (mincount*LDT_ENTRY_SIZE > PAGE_SIZE)
+-		newldt = vmalloc(mincount*LDT_ENTRY_SIZE);
+-	else
+-		newldt = kmalloc(mincount*LDT_ENTRY_SIZE, GFP_KERNEL);
+-
+-	if (!newldt)
+-		return -ENOMEM;
+-
+-	if (oldsize)
+-		memcpy(newldt, pc->ldt, oldsize*LDT_ENTRY_SIZE);
+-	oldldt = pc->ldt;
+-	memset(newldt+oldsize*LDT_ENTRY_SIZE, 0, (mincount-oldsize)*LDT_ENTRY_SIZE);
+-	pc->ldt = newldt;
+-	wmb();
++	newsize = mincount*LDT_ENTRY_SIZE;
++	for (i = 0; i < newsize; i += PAGE_SIZE) {
++		int nr = i/PAGE_SIZE;
++		BUG_ON(i >= 64*1024);
++		if (!pc->ldt_pages[nr]) {
++			pc->ldt_pages[nr] = alloc_page(GFP_HIGHUSER);
++			if (!pc->ldt_pages[nr])
++				return -ENOMEM;
++			clear_highpage(pc->ldt_pages[nr]);
++		}
++	}
+ 	pc->size = mincount;
+-	wmb();
+-
+ 	if (reload) {
+ #ifdef CONFIG_SMP
+ 		cpumask_t mask;
++
+ 		preempt_disable();
+ 		load_LDT(pc);
+ 		mask = cpumask_of_cpu(smp_processor_id());
+@@ -67,21 +66,20 @@ static int alloc_ldt(mm_context_t *pc, i
+ 		load_LDT(pc);
+ #endif
+ 	}
+-	if (oldsize) {
+-		if (oldsize*LDT_ENTRY_SIZE > PAGE_SIZE)
+-			vfree(oldldt);
+-		else
+-			kfree(oldldt);
+-	}
+ 	return 0;
+ }
+ 
+ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
+ {
+-	int err = alloc_ldt(new, old->size, 0);
+-	if (err < 0)
++	int i, err, size = old->size, nr_pages = (size*LDT_ENTRY_SIZE + PAGE_SIZE-1)/PAGE_SIZE;
++
++	err = alloc_ldt(new, size, 0);
++	if (err < 0) {
++		new->size = 0;
+ 		return err;
+-	memcpy(new->ldt, old->ldt, old->size*LDT_ENTRY_SIZE);
++	}
++	for (i = 0; i < nr_pages; i++)
++		copy_user_highpage(new->ldt_pages[i], old->ldt_pages[i], 0);
+ 	return 0;
+ }
+ 
+@@ -96,6 +94,7 @@ int init_new_context(struct task_struct 
+ 
+ 	init_MUTEX(&mm->context.sem);
+ 	mm->context.size = 0;
++	memset(mm->context.ldt_pages, 0, sizeof(struct page *) * MAX_LDT_PAGES);
+ 	old_mm = current->mm;
+ 	if (old_mm && old_mm->context.size > 0) {
+ 		down(&old_mm->context.sem);
+@@ -107,23 +106,21 @@ int init_new_context(struct task_struct 
+ 
+ /*
+  * No need to lock the MM as we are the last user
++ * Do not touch the ldt register, we are already
++ * in the next thread.
+  */
+ void destroy_context(struct mm_struct *mm)
+ {
+-	if (mm->context.size) {
+-		if (mm == current->active_mm)
+-			clear_LDT();
+-		if (mm->context.size*LDT_ENTRY_SIZE > PAGE_SIZE)
+-			vfree(mm->context.ldt);
+-		else
+-			kfree(mm->context.ldt);
+-		mm->context.size = 0;
+-	}
++	int i, nr_pages = (mm->context.size*LDT_ENTRY_SIZE + PAGE_SIZE-1) / PAGE_SIZE;
++
++	for (i = 0; i < nr_pages; i++)
++		__free_page(mm->context.ldt_pages[i]);
++	mm->context.size = 0;
+ }
+ 
+ static int read_ldt(void __user * ptr, unsigned long bytecount)
+ {
+-	int err;
++	int err, i;
+ 	unsigned long size;
+ 	struct mm_struct * mm = current->mm;
+ 
+@@ -138,8 +135,25 @@ static int read_ldt(void __user * ptr, u
+ 		size = bytecount;
+ 
+ 	err = 0;
+-	if (copy_to_user(ptr, mm->context.ldt, size))
+-		err = -EFAULT;
++	/*
++	 * This is necessary just in case we got here straight from a
++	 * context-switch where the ptes were set but no tlb flush
++	 * was done yet. We rather avoid doing a TLB flush in the
++	 * context-switch path and do it here instead.
++	 */
++	__flush_tlb_global();
++
++	for (i = 0; i < size; i += PAGE_SIZE) {
++		int nr = i / PAGE_SIZE, bytes;
++		char *kaddr = kmap(mm->context.ldt_pages[nr]);
++
++		bytes = size - i;
++		if (bytes > PAGE_SIZE)
++			bytes = PAGE_SIZE;
++		if (copy_to_user(ptr + i, kaddr, size - i))
++			err = -EFAULT;
++		kunmap(mm->context.ldt_pages[nr]);
++	}
+ 	up(&mm->context.sem);
+ 	if (err < 0)
+ 		return err;
+@@ -158,7 +172,7 @@ static int read_default_ldt(void __user 
+ 
+ 	err = 0;
+ 	address = &default_ldt[0];
+-	size = 5*sizeof(struct desc_struct);
++	size = 5*LDT_ENTRY_SIZE;
+ 	if (size > bytecount)
+ 		size = bytecount;
+ 
+@@ -200,7 +214,15 @@ static int write_ldt(void __user * ptr, 
+ 			goto out_unlock;
+ 	}
+ 
+-	lp = (__u32 *) ((ldt_info.entry_number << 3) + (char *) mm->context.ldt);
++	/*
++	 * No rescheduling allowed from this point to the install.
++	 *
++	 * We do a TLB flush for the same reason as in the read_ldt() path.
++	 */
++	preempt_disable();
++	__flush_tlb_global();
++	lp = (__u32 *) ((ldt_info.entry_number << 3) +
++			(char *) __kmap_atomic_vaddr(KM_LDT_PAGE0));
+ 
+    	/* Allow LDTs to be cleared by the user. */
+    	if (ldt_info.base_addr == 0 && ldt_info.limit == 0) {
+@@ -221,6 +243,7 @@ install:
+ 	*lp	= entry_1;
+ 	*(lp+1)	= entry_2;
+ 	error = 0;
++	preempt_enable();
+ 
+ out_unlock:
+ 	up(&mm->context.sem);
+@@ -248,3 +271,26 @@ asmlinkage int sys_modify_ldt(int func, 
+ 	}
+ 	return ret;
+ }
++
++/*
++ * load one particular LDT into the current CPU
++ */
++void load_LDT_nolock(mm_context_t *pc, int cpu)
++{
++	struct page **pages = pc->ldt_pages;
++	int count = pc->size;
++	int nr_pages, i;
++
++	if (likely(!count)) {
++		pages = &default_ldt_page;
++		count = 5;
++	}
++       	nr_pages = (count*LDT_ENTRY_SIZE + PAGE_SIZE-1) / PAGE_SIZE;
++
++	for (i = 0; i < nr_pages; i++) {
++		__kunmap_atomic_type(KM_LDT_PAGE0 - i);
++		__kmap_atomic(pages[i], KM_LDT_PAGE0 - i);
++	}
++	set_ldt_desc(cpu, (void *)__kmap_atomic_vaddr(KM_LDT_PAGE0), count);
++	load_LDT_desc();
++}
+--- linux-2.6.0/arch/i386/kernel/Makefile	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/kernel/Makefile	2003-12-28 23:26:36.000000000 -0800
+@@ -7,13 +7,14 @@ extra-y := head.o init_task.o vmlinux.ld
+ obj-y	:= process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \
+ 		ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_i386.o \
+ 		pci-dma.o i386_ksyms.o i387.o dmi_scan.o bootflag.o \
+-		doublefault.o
++		doublefault.o entry_trampoline.o
+ 
+ obj-y				+= cpu/
+ obj-y				+= timers/
+ obj-$(CONFIG_ACPI_BOOT)		+= acpi/
+ obj-$(CONFIG_X86_BIOS_REBOOT)	+= reboot.o
+ obj-$(CONFIG_MCA)		+= mca.o
++obj-$(CONFIG_KGDB)		+= kgdb_stub.o
+ obj-$(CONFIG_X86_MSR)		+= msr.o
+ obj-$(CONFIG_X86_CPUID)		+= cpuid.o
+ obj-$(CONFIG_MICROCODE)		+= microcode.o
+@@ -24,12 +25,13 @@ obj-$(CONFIG_X86_MPPARSE)	+= mpparse.o
+ obj-$(CONFIG_X86_LOCAL_APIC)	+= apic.o nmi.o
+ obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o
+ obj-$(CONFIG_X86_NUMAQ)		+= numaq.o
+-obj-$(CONFIG_X86_SUMMIT)	+= summit.o
++obj-$(CONFIG_X86_SUMMIT_NUMA)	+= summit.o
+ obj-$(CONFIG_EDD)             	+= edd.o
+ obj-$(CONFIG_MODULES)		+= module.o
+ obj-y				+= sysenter.o vsyscall.o
+ obj-$(CONFIG_ACPI_SRAT) 	+= srat.o
+ obj-$(CONFIG_HPET_TIMER) 	+= time_hpet.o
++obj-$(CONFIG_EFI) 		+= efi.o efi_stub.o
+ 
+ EXTRA_AFLAGS   := -traditional
+ 
+--- linux-2.6.0/arch/i386/kernel/mpparse.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/arch/i386/kernel/mpparse.c	2003-12-28 23:26:36.000000000 -0800
+@@ -668,7 +668,7 @@ void __init get_smp_config (void)
+ 		 * Read the physical hardware table.  Anything here will
+ 		 * override the defaults.
+ 		 */
+-		if (!smp_read_mpc((void *)mpf->mpf_physptr)) {
++		if (!smp_read_mpc((void *)phys_to_virt(mpf->mpf_physptr))) {
+ 			smp_found_config = 0;
+ 			printk(KERN_ERR "BIOS bug, MP table errors detected!...\n");
+ 			printk(KERN_ERR "... disabling SMP support. (tell your hw vendor)\n");
+@@ -962,7 +962,8 @@ void __init mp_override_legacy_irq (
+ 	 */
+ 	for (i = 0; i < mp_irq_entries; i++) {
+ 		if ((mp_irqs[i].mpc_dstapic == intsrc.mpc_dstapic) 
+-			&& (mp_irqs[i].mpc_srcbusirq == intsrc.mpc_srcbusirq)) {
++			&& (mp_irqs[i].mpc_srcbusirq == intsrc.mpc_srcbusirq)
++			&& (mp_irqs[i].mpc_irqtype == intsrc.mpc_irqtype)) {
+ 			mp_irqs[i] = intsrc;
+ 			found = 1;
+ 			break;
+@@ -1081,8 +1082,14 @@ found:
+ 
+ 	ioapic_pin = irq - mp_ioapic_routing[ioapic].irq_start;
+ 
++	/*
++	 * MPS INTI flags:
++	 *  trigger: 0=default, 1=edge, 3=level
++	 *  polarity: 0=default, 1=high, 3=low
++	 * Per ACPI spec, default for SCI means level/low.
++	 */
+ 	io_apic_set_pci_routing(ioapic, ioapic_pin, irq, 
+-				(flags.trigger >> 1) , (flags.polarity >> 1));
++		(flags.trigger == 1 ? 0 : 1), (flags.polarity == 1 ? 0 : 1));
+ }
+ 
+ #ifdef CONFIG_ACPI_PCI
+@@ -1129,8 +1136,11 @@ void __init mp_parse_prt (void)
+ 			continue;
+ 		ioapic_pin = irq - mp_ioapic_routing[ioapic].irq_start;
+ 
+-		if (!ioapic && (irq < 16))
+-			irq += 16;
++		if (es7000_plat) {
++			if (!ioapic && (irq < 16))
++				irq += 16;
++		}
++
+ 		/* 
+ 		 * Avoid pin reprogramming.  PRTs typically include entries  
+ 		 * with redundant pin->irq mappings (but unique PCI devices);
+@@ -1147,21 +1157,29 @@ void __init mp_parse_prt (void)
+ 		if ((1<<bit) & mp_ioapic_routing[ioapic].pin_programmed[idx]) {
+ 			printk(KERN_DEBUG "Pin %d-%d already programmed\n",
+ 				mp_ioapic_routing[ioapic].apic_id, ioapic_pin);
+-			entry->irq = irq;
++ 			if (use_pci_vector() && !platform_legacy_irq(irq))
++ 				irq = IO_APIC_VECTOR(irq);
++ 			entry->irq = irq;
+ 			continue;
+ 		}
+ 
+ 		mp_ioapic_routing[ioapic].pin_programmed[idx] |= (1<<bit);
+ 
+-		if (!io_apic_set_pci_routing(ioapic, ioapic_pin, irq, edge_level, active_high_low))
+-			entry->irq = irq;
+-
++		if (!io_apic_set_pci_routing(ioapic, ioapic_pin, irq, edge_level, active_high_low)) {
++ 			if (use_pci_vector() && !platform_legacy_irq(irq))
++ 				irq = IO_APIC_VECTOR(irq);
++ 			entry->irq = irq;
++ 		}
+ 		printk(KERN_DEBUG "%02x:%02x:%02x[%c] -> %d-%d -> IRQ %d\n",
+ 			entry->id.segment, entry->id.bus, 
+ 			entry->id.device, ('A' + entry->pin), 
+ 			mp_ioapic_routing[ioapic].apic_id, ioapic_pin, 
+ 			entry->irq);
+ 	}
++
++	print_IO_APIC();
++
++	return;
+ }
+ 
+ #endif /*CONFIG_ACPI_PCI*/
+--- linux-2.6.0/arch/i386/kernel/nmi.c	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/kernel/nmi.c	2003-12-28 23:21:06.000000000 -0800
+@@ -31,7 +31,16 @@
+ #include <asm/mpspec.h>
+ #include <asm/nmi.h>
+ 
++#ifdef CONFIG_KGDB
++#include <asm/kgdb.h>
++#ifdef CONFIG_SMP
++unsigned int nmi_watchdog = NMI_IO_APIC;
++#else
++unsigned int nmi_watchdog = NMI_LOCAL_APIC;
++#endif
++#else
+ unsigned int nmi_watchdog = NMI_NONE;
++#endif
+ static unsigned int nmi_hz = HZ;
+ unsigned int nmi_perfctr_msr;	/* the MSR to reset in NMI handler */
+ extern void show_registers(struct pt_regs *regs);
+@@ -408,6 +417,9 @@ void touch_nmi_watchdog (void)
+ 	for (i = 0; i < NR_CPUS; i++)
+ 		alert_counter[i] = 0;
+ }
++#ifdef CONFIG_KGDB
++int tune_watchdog = 5*HZ;
++#endif
+ 
+ void nmi_watchdog_tick (struct pt_regs * regs)
+ {
+@@ -421,12 +433,24 @@ void nmi_watchdog_tick (struct pt_regs *
+ 
+ 	sum = irq_stat[cpu].apic_timer_irqs;
+ 
++#ifdef CONFIG_KGDB
++ 	if (! in_kgdb(regs) && last_irq_sums[cpu] == sum ) {
++
++#else
+ 	if (last_irq_sums[cpu] == sum) {
++#endif
+ 		/*
+ 		 * Ayiee, looks like this CPU is stuck ...
+ 		 * wait a few IRQs (5 seconds) before doing the oops ...
+ 		 */
+ 		alert_counter[cpu]++;
++#ifdef CONFIG_KGDB
++                if (alert_counter[cpu] == tune_watchdog) {
++                        kgdb_handle_exception(2, SIGPWR, 0, regs);
++                        last_irq_sums[cpu] = sum;
++                        alert_counter[cpu] = 0;
++                }
++#endif
+ 		if (alert_counter[cpu] == 5*nmi_hz) {
+ 			spin_lock(&nmi_print_lock);
+ 			/*
+--- linux-2.6.0/arch/i386/kernel/process.c	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/kernel/process.c	2003-12-28 23:26:36.000000000 -0800
+@@ -47,6 +47,7 @@
+ #include <asm/i387.h>
+ #include <asm/irq.h>
+ #include <asm/desc.h>
++#include <asm/atomic_kmap.h>
+ #ifdef CONFIG_MATH_EMULATION
+ #include <asm/math_emu.h>
+ #endif
+@@ -302,6 +303,9 @@ void flush_thread(void)
+ 	struct task_struct *tsk = current;
+ 
+ 	memset(tsk->thread.debugreg, 0, sizeof(unsigned long)*8);
++#ifdef CONFIG_X86_HIGH_ENTRY
++	clear_thread_flag(TIF_DB7);
++#endif
+ 	memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));	
+ 	/*
+ 	 * Forget coprocessor state..
+@@ -315,9 +319,8 @@ void release_thread(struct task_struct *
+ 	if (dead_task->mm) {
+ 		// temporary debugging check
+ 		if (dead_task->mm->context.size) {
+-			printk("WARNING: dead process %8s still has LDT? <%p/%d>\n",
++			printk("WARNING: dead process %8s still has LDT? <%d>\n",
+ 					dead_task->comm,
+-					dead_task->mm->context.ldt,
+ 					dead_task->mm->context.size);
+ 			BUG();
+ 		}
+@@ -352,7 +355,17 @@ int copy_thread(int nr, unsigned long cl
+ 	p->thread.esp = (unsigned long) childregs;
+ 	p->thread.esp0 = (unsigned long) (childregs+1);
+ 
++	/*
++	 * get the two stack pages, for the virtual stack.
++	 *
++	 * IMPORTANT: this code relies on the fact that the task
++	 * structure is an 8K aligned piece of physical memory.
++	 */
++	p->thread.stack_page0 = virt_to_page((unsigned long)p->thread_info);
++	p->thread.stack_page1 = virt_to_page((unsigned long)p->thread_info + PAGE_SIZE);
++
+ 	p->thread.eip = (unsigned long) ret_from_fork;
++	p->thread_info->real_stack = p->thread_info;
+ 
+ 	savesegment(fs,p->thread.fs);
+ 	savesegment(gs,p->thread.gs);
+@@ -504,10 +517,41 @@ struct task_struct * __switch_to(struct 
+ 
+ 	__unlazy_fpu(prev_p);
+ 
++#ifdef CONFIG_X86_HIGH_ENTRY
++	/*
++	 * Set the ptes of the virtual stack. (NOTE: a one-page TLB flush is
++	 * needed because otherwise NMIs could interrupt the
++	 * user-return code with a virtual stack and stale TLBs.)
++	 */
++	__kunmap_atomic_type(KM_VSTACK0);
++	__kunmap_atomic_type(KM_VSTACK1);
++	__kmap_atomic(next->stack_page0, KM_VSTACK0);
++	__kmap_atomic(next->stack_page1, KM_VSTACK1);
++
++	/*
++	 * NOTE: here we rely on the task being the stack as well
++	 */
++	next_p->thread_info->virtual_stack =
++			(void *)__kmap_atomic_vaddr(KM_VSTACK0);
++
++#if defined(CONFIG_PREEMPT) && defined(CONFIG_SMP)
++	/*
++	 * If next was preempted on entry from userspace to kernel,
++	 * and now it's on a different cpu, we need to adjust %esp.
++	 * This assumes that entry.S does not copy %esp while on the
++	 * virtual stack (with interrupts enabled): which is so,
++	 * except within __SWITCH_KERNELSPACE itself.
++	 */
++	if (unlikely(next->esp >= TASK_SIZE)) {
++		next->esp &= THREAD_SIZE - 1;
++		next->esp |= (unsigned long) next_p->thread_info->virtual_stack;
++	}
++#endif
++#endif
+ 	/*
+ 	 * Reload esp0, LDT and the page table pointer:
+ 	 */
+-	load_esp0(tss, next->esp0);
++	load_virtual_esp0(tss, next_p);
+ 
+ 	/*
+ 	 * Load the per-thread Thread-Local Storage descriptor.
+--- linux-2.6.0/arch/i386/kernel/reboot.c	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/kernel/reboot.c	2003-12-28 23:26:36.000000000 -0800
+@@ -8,6 +8,7 @@
+ #include <linux/init.h>
+ #include <linux/interrupt.h>
+ #include <linux/mc146818rtc.h>
++#include <linux/efi.h>
+ #include <asm/uaccess.h>
+ #include <asm/apic.h>
+ #include "mach_reboot.h"
+@@ -154,12 +155,11 @@ void machine_real_restart(unsigned char 
+ 	CMOS_WRITE(0x00, 0x8f);
+ 	spin_unlock_irqrestore(&rtc_lock, flags);
+ 
+-	/* Remap the kernel at virtual address zero, as well as offset zero
+-	   from the kernel segment.  This assumes the kernel segment starts at
+-	   virtual address PAGE_OFFSET. */
+-
+-	memcpy (swapper_pg_dir, swapper_pg_dir + USER_PGD_PTRS,
+-		sizeof (swapper_pg_dir [0]) * KERNEL_PGD_PTRS);
++	/*
++	 * Remap the first 16 MB of RAM (which includes the kernel image)
++	 * at virtual address zero:
++	 */
++	setup_identity_mappings(swapper_pg_dir, 0, 16*1024*1024);
+ 
+ 	/*
+ 	 * Use `swapper_pg_dir' as our page directory.
+@@ -263,7 +263,12 @@ void machine_restart(char * __unused)
+ 	disable_IO_APIC();
+ #endif
+ 
+-	if(!reboot_thru_bios) {
++	if (!reboot_thru_bios) {
++		if (efi_enabled) {
++			efi.reset_system(EFI_RESET_COLD, EFI_SUCCESS, 0, 0);
++			__asm__ __volatile__("lidt %0": :"m" (no_idt));
++			__asm__ __volatile__("int3");
++		}
+ 		/* rebooting needs to touch the page at absolute addr 0 */
+ 		*((unsigned short *)__va(0x472)) = reboot_mode;
+ 		for (;;) {
+@@ -273,6 +278,8 @@ void machine_restart(char * __unused)
+ 			__asm__ __volatile__("int3");
+ 		}
+ 	}
++	if (efi_enabled)
++		efi.reset_system(EFI_RESET_WARM, EFI_SUCCESS, 0, 0);
+ 
+ 	machine_real_restart(jump_to_bios, sizeof(jump_to_bios));
+ }
+@@ -287,6 +294,8 @@ EXPORT_SYMBOL(machine_halt);
+ 
+ void machine_power_off(void)
+ {
++	if (efi_enabled)
++		efi.reset_system(EFI_RESET_SHUTDOWN, EFI_SUCCESS, 0, 0);
+ 	if (pm_power_off)
+ 		pm_power_off();
+ }
+--- linux-2.6.0/arch/i386/kernel/setup.c	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/kernel/setup.c	2003-12-28 23:21:45.000000000 -0800
+@@ -36,6 +36,8 @@
+ #include <linux/root_dev.h>
+ #include <linux/highmem.h>
+ #include <linux/module.h>
++#include <linux/efi.h>
++#include <linux/init.h>
+ #include <video/edid.h>
+ #include <asm/e820.h>
+ #include <asm/mpspec.h>
+@@ -56,6 +58,10 @@ static inline char * __init machine_spec
+  * Machine setup..
+  */
+ 
++#ifdef CONFIG_EFI
++int efi_enabled = 0;
++#endif
++
+ /* cpu data as detected by the assembly code in head.S */
+ struct cpuinfo_x86 new_cpu_data __initdata = { 0, 0, 0, 0, -1, 1, 0, 0, -1 };
+ /* common cpu data for all cpus */
+@@ -72,13 +78,10 @@ EXPORT_SYMBOL_GPL(mmu_cr4_features);
+ EXPORT_SYMBOL(acpi_disabled);
+ 
+ #ifdef	CONFIG_ACPI_BOOT
+-	int acpi_irq __initdata = 1;	/* enable IRQ */
+-	int acpi_ht __initdata = 1;	/* enable HT */
++extern int __initdata acpi_ht;
++int __initdata acpi_force = 0;
+ #endif
+ 
+-int acpi_force __initdata = 0;
+-
+-
+ int MCA_bus;
+ /* for MCA, but anyone else can use it if they want */
+ unsigned int machine_id;
+@@ -144,6 +147,20 @@ static void __init limit_regions(unsigne
+ 	unsigned long long current_addr = 0;
+ 	int i;
+ 
++	if (efi_enabled) {
++		for (i = 0; i < memmap.nr_map; i++) {
++			current_addr = memmap.map[i].phys_addr +
++				       (memmap.map[i].num_pages << 12);
++			if (memmap.map[i].type == EFI_CONVENTIONAL_MEMORY) {
++				if (current_addr >= size) {
++					memmap.map[i].num_pages -=
++						(((current_addr-size) + PAGE_SIZE-1) >> PAGE_SHIFT);
++					memmap.nr_map = i + 1;
++					return;
++				}
++			}
++		}
++	}
+ 	for (i = 0; i < e820.nr_map; i++) {
+ 		if (e820.map[i].type == E820_RAM) {
+ 			current_addr = e820.map[i].addr + e820.map[i].size;
+@@ -159,17 +176,21 @@ static void __init limit_regions(unsigne
+ static void __init add_memory_region(unsigned long long start,
+                                   unsigned long long size, int type)
+ {
+-	int x = e820.nr_map;
++	int x;
+ 
+-	if (x == E820MAX) {
+-	    printk(KERN_ERR "Ooops! Too many entries in the memory map!\n");
+-	    return;
+-	}
++	if (!efi_enabled) {
++       		x = e820.nr_map;
++
++		if (x == E820MAX) {
++		    printk(KERN_ERR "Ooops! Too many entries in the memory map!\n");
++		    return;
++		}
+ 
+-	e820.map[x].addr = start;
+-	e820.map[x].size = size;
+-	e820.map[x].type = type;
+-	e820.nr_map++;
++		e820.map[x].addr = start;
++		e820.map[x].size = size;
++		e820.map[x].type = type;
++		e820.nr_map++;
++	}
+ } /* add_memory_region */
+ 
+ #define E820_DEBUG	1
+@@ -446,7 +467,6 @@ static inline void copy_edd(void)
+ static void __init setup_memory_region(void)
+ {
+ 	char *who = machine_specific_memory_setup();
+-
+ 	printk(KERN_INFO "BIOS-provided physical RAM map:\n");
+ 	print_memory_map(who);
+ } /* setup_memory_region */
+@@ -550,7 +570,7 @@ static void __init parse_cmdline_early (
+ 
+ 		/* "pci=noacpi" disables ACPI interrupt routing */
+ 		else if (!memcmp(from, "pci=noacpi", 10)) {
+-			acpi_irq = 0;
++			acpi_noirq_set();
+ 		}
+ 
+ #ifdef CONFIG_X86_LOCAL_APIC
+@@ -584,6 +604,23 @@ static void __init parse_cmdline_early (
+ }
+ 
+ /*
++ * Callback for efi_memory_walk.
++ */
++static int __init
++efi_find_max_pfn(unsigned long start, unsigned long end, void *arg)
++{
++	unsigned long *max_pfn = arg, pfn;
++
++	if (start < end) {
++		pfn = PFN_UP(end -1);
++		if (pfn > *max_pfn)
++			*max_pfn = pfn;
++	}
++	return 0;
++}
++
++
++/*
+  * Find the highest page frame number we have available
+  */
+ void __init find_max_pfn(void)
+@@ -591,6 +628,11 @@ void __init find_max_pfn(void)
+ 	int i;
+ 
+ 	max_pfn = 0;
++	if (efi_enabled) {
++		efi_memmap_walk(efi_find_max_pfn, &max_pfn);
++		return;
++	}
++
+ 	for (i = 0; i < e820.nr_map; i++) {
+ 		unsigned long start, end;
+ 		/* RAM? */
+@@ -665,6 +707,25 @@ unsigned long __init find_max_low_pfn(vo
+ }
+ 
+ #ifndef CONFIG_DISCONTIGMEM
++
++/*
++ * Free all available memory for boot time allocation.  Used
++ * as a callback function by efi_memory_walk()
++ */
++
++static int __init
++free_available_memory(unsigned long start, unsigned long end, void *arg)
++{
++	/* check max_low_pfn */
++	if (start >= ((max_low_pfn + 1) << PAGE_SHIFT))
++		return 0;
++	if (end >= ((max_low_pfn + 1) << PAGE_SHIFT))
++		end = (max_low_pfn + 1) << PAGE_SHIFT;
++	if (start < end)
++		free_bootmem(start, end - start);
++
++	return 0;
++}
+ /*
+  * Register fully available low RAM pages with the bootmem allocator.
+  */
+@@ -672,6 +733,10 @@ static void __init register_bootmem_low_
+ {
+ 	int i;
+ 
++	if (efi_enabled) {
++		efi_memmap_walk(free_available_memory, NULL);
++		return;
++	}
+ 	for (i = 0; i < e820.nr_map; i++) {
+ 		unsigned long curr_pfn, last_pfn, size;
+ 		/*
+@@ -799,9 +864,9 @@ extern unsigned long setup_memory(void);
+  * Request address space for all standard RAM and ROM resources
+  * and also for regions reported as reserved by the e820.
+  */
+-static void __init register_memory(unsigned long max_low_pfn)
++static void __init
++legacy_init_iomem_resources(struct resource *code_resource, struct resource *data_resource)
+ {
+-	unsigned long low_mem_size;
+ 	int i;
+ 
+ 	probe_roms();
+@@ -826,11 +891,26 @@ static void __init register_memory(unsig
+ 			 *  so we try it repeatedly and let the resource manager
+ 			 *  test it.
+ 			 */
+-			request_resource(res, &code_resource);
+-			request_resource(res, &data_resource);
++			request_resource(res, code_resource);
++			request_resource(res, data_resource);
+ 		}
+ 	}
++}
++
++/*
++ * Request address space for all standard resources
++ */
++static void __init register_memory(unsigned long max_low_pfn)
++{
++	unsigned long low_mem_size;
++	int i;
++
++	if (efi_enabled)
++		efi_initialize_iomem_resources(&code_resource, &data_resource);
++	else
++		legacy_init_iomem_resources(&code_resource, &data_resource);
+ 
++ 	 /* EFI systems may still have VGA */
+ 	request_graphics_resource();
+ 
+ 	/* request I/O space for devices used on all i[345]86 PCs */
+@@ -950,6 +1030,13 @@ static int __init noreplacement_setup(ch
+ 
+ __setup("noreplacement", noreplacement_setup); 
+ 
++/*
++ * Determine if we were loaded by an EFI loader.  If so, then we have also been
++ * passed the efi memmap, systab, etc., so we should use these data structures
++ * for initialization.  Note, the efi init code path is determined by the
++ * global efi_enabled. This allows the same kernel image to be used on existing
++ * systems (with a traditional BIOS) as well as on EFI systems.
++ */
+ void __init setup_arch(char **cmdline_p)
+ {
+ 	unsigned long max_low_pfn;
+@@ -958,6 +1045,18 @@ void __init setup_arch(char **cmdline_p)
+ 	pre_setup_arch_hook();
+ 	early_cpu_init();
+ 
++	/*
++	 * FIXME: This isn't an official loader_type right
++	 * now but does currently work with elilo.
++	 * If we were configured as an EFI kernel, check to make
++	 * sure that we were loaded correctly from elilo and that
++	 * the system table is valid.  If not, then initialize normally.
++	 */
++#ifdef CONFIG_EFI
++	if ((LOADER_TYPE == 0x50) && EFI_SYSTAB)
++		efi_enabled = 1;
++#endif
++
+  	ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
+  	drive_info = DRIVE_INFO;
+  	screen_info = SCREEN_INFO;
+@@ -979,7 +1078,11 @@ void __init setup_arch(char **cmdline_p)
+ 	rd_doload = ((RAMDISK_FLAGS & RAMDISK_LOAD_FLAG) != 0);
+ #endif
+ 	ARCH_SETUP
+-	setup_memory_region();
++	if (efi_enabled)
++		efi_init();
++	else
++		setup_memory_region();
++
+ 	copy_edd();
+ 
+ 	if (!MOUNT_ROOT_RDONLY)
+@@ -1013,6 +1116,8 @@ void __init setup_arch(char **cmdline_p)
+ #ifdef CONFIG_X86_GENERICARCH
+ 	generic_apic_probe(*cmdline_p);
+ #endif	
++	if (efi_enabled)
++		efi_map_memmap();
+ 
+ 	/*
+ 	 * Parse the ACPI tables for possible boot-time SMP configuration.
+@@ -1028,7 +1133,8 @@ void __init setup_arch(char **cmdline_p)
+ 
+ #ifdef CONFIG_VT
+ #if defined(CONFIG_VGA_CONSOLE)
+-	conswitchp = &vga_con;
++	if (!efi_enabled || (efi_mem_type(0xa0000) != EFI_CONVENTIONAL_MEMORY))
++		conswitchp = &vga_con;
+ #elif defined(CONFIG_DUMMY_CONSOLE)
+ 	conswitchp = &dummy_con;
+ #endif
+--- linux-2.6.0/arch/i386/kernel/signal.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/arch/i386/kernel/signal.c	2003-12-28 23:26:36.000000000 -0800
+@@ -128,28 +128,29 @@ sys_sigaltstack(const stack_t __user *us
+  */
+ 
+ static int
+-restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, int *peax)
++restore_sigcontext(struct pt_regs *regs,
++		struct sigcontext __user *__sc, int *peax)
+ {
+-	unsigned int err = 0;
++	struct sigcontext scratch; /* 88 bytes of scratch area */
+ 
+ 	/* Always make any pending restarted system calls return -EINTR */
+ 	current_thread_info()->restart_block.fn = do_no_restart_syscall;
+ 
+-#define COPY(x)		err |= __get_user(regs->x, &sc->x)
++	if (copy_from_user(&scratch, __sc, sizeof(scratch)))
++		return -EFAULT;
++
++#define COPY(x)		regs->x = scratch.x
+ 
+ #define COPY_SEG(seg)							\
+-	{ unsigned short tmp;						\
+-	  err |= __get_user(tmp, &sc->seg);				\
++	{ unsigned short tmp = scratch.seg;				\
+ 	  regs->x##seg = tmp; }
+ 
+ #define COPY_SEG_STRICT(seg)						\
+-	{ unsigned short tmp;						\
+-	  err |= __get_user(tmp, &sc->seg);				\
++	{ unsigned short tmp = scratch.seg;				\
+ 	  regs->x##seg = tmp|3; }
+ 
+ #define GET_SEG(seg)							\
+-	{ unsigned short tmp;						\
+-	  err |= __get_user(tmp, &sc->seg);				\
++	{ unsigned short tmp = scratch.seg;				\
+ 	  loadsegment(seg,tmp); }
+ 
+ 	GET_SEG(gs);
+@@ -168,27 +169,23 @@ restore_sigcontext(struct pt_regs *regs,
+ 	COPY_SEG_STRICT(ss);
+ 	
+ 	{
+-		unsigned int tmpflags;
+-		err |= __get_user(tmpflags, &sc->eflags);
++		unsigned int tmpflags = scratch.eflags;
+ 		regs->eflags = (regs->eflags & ~0x40DD5) | (tmpflags & 0x40DD5);
+ 		regs->orig_eax = -1;		/* disable syscall checks */
+ 	}
+ 
+ 	{
+-		struct _fpstate __user * buf;
+-		err |= __get_user(buf, &sc->fpstate);
++		struct _fpstate * buf = scratch.fpstate;
+ 		if (buf) {
+ 			if (verify_area(VERIFY_READ, buf, sizeof(*buf)))
+-				goto badframe;
+-			err |= restore_i387(buf);
++				return -EFAULT;
++			if (restore_i387(buf))
++				return -EFAULT;
+ 		}
+ 	}
+ 
+-	err |= __get_user(*peax, &sc->eax);
+-	return err;
+-
+-badframe:
+-	return 1;
++	*peax = scratch.eax;
++	return 0;
+ }
+ 
+ asmlinkage int sys_sigreturn(unsigned long __unused)
+@@ -266,46 +263,47 @@ badframe:
+  */
+ 
+ static int
+-setup_sigcontext(struct sigcontext __user *sc, struct _fpstate __user *fpstate,
++setup_sigcontext(struct sigcontext __user *__sc, struct _fpstate __user *fpstate,
+ 		 struct pt_regs *regs, unsigned long mask)
+ {
+-	int tmp, err = 0;
++	struct sigcontext sc; /* 88 bytes of scratch area */
++	int tmp;
+ 
+ 	tmp = 0;
+ 	__asm__("movl %%gs,%0" : "=r"(tmp): "0"(tmp));
+-	err |= __put_user(tmp, (unsigned int *)&sc->gs);
++	*(unsigned int *)&sc.gs = tmp;
+ 	__asm__("movl %%fs,%0" : "=r"(tmp): "0"(tmp));
+-	err |= __put_user(tmp, (unsigned int *)&sc->fs);
+-
+-	err |= __put_user(regs->xes, (unsigned int *)&sc->es);
+-	err |= __put_user(regs->xds, (unsigned int *)&sc->ds);
+-	err |= __put_user(regs->edi, &sc->edi);
+-	err |= __put_user(regs->esi, &sc->esi);
+-	err |= __put_user(regs->ebp, &sc->ebp);
+-	err |= __put_user(regs->esp, &sc->esp);
+-	err |= __put_user(regs->ebx, &sc->ebx);
+-	err |= __put_user(regs->edx, &sc->edx);
+-	err |= __put_user(regs->ecx, &sc->ecx);
+-	err |= __put_user(regs->eax, &sc->eax);
+-	err |= __put_user(current->thread.trap_no, &sc->trapno);
+-	err |= __put_user(current->thread.error_code, &sc->err);
+-	err |= __put_user(regs->eip, &sc->eip);
+-	err |= __put_user(regs->xcs, (unsigned int *)&sc->cs);
+-	err |= __put_user(regs->eflags, &sc->eflags);
+-	err |= __put_user(regs->esp, &sc->esp_at_signal);
+-	err |= __put_user(regs->xss, (unsigned int *)&sc->ss);
++	*(unsigned int *)&sc.fs = tmp;
++	*(unsigned int *)&sc.es = regs->xes;
++	*(unsigned int *)&sc.ds = regs->xds;
++	sc.edi = regs->edi;
++	sc.esi = regs->esi;
++	sc.ebp = regs->ebp;
++	sc.esp = regs->esp;
++	sc.ebx = regs->ebx;
++	sc.edx = regs->edx;
++	sc.ecx = regs->ecx;
++	sc.eax = regs->eax;
++	sc.trapno = current->thread.trap_no;
++	sc.err = current->thread.error_code;
++	sc.eip = regs->eip;
++	*(unsigned int *)&sc.cs = regs->xcs;
++	sc.eflags = regs->eflags;
++	sc.esp_at_signal = regs->esp;
++	*(unsigned int *)&sc.ss = regs->xss;
+ 
+ 	tmp = save_i387(fpstate);
+ 	if (tmp < 0)
+-	  err = 1;
+-	else
+-	  err |= __put_user(tmp ? fpstate : NULL, &sc->fpstate);
++		return 1;
++	sc.fpstate = tmp ? fpstate : NULL;
+ 
+ 	/* non-iBCS2 extensions.. */
+-	err |= __put_user(mask, &sc->oldmask);
+-	err |= __put_user(current->thread.cr2, &sc->cr2);
++	sc.oldmask = mask;
++	sc.cr2 = current->thread.cr2;
+ 
+-	return err;
++	if (copy_to_user(__sc, &sc, sizeof(sc)))
++		return 1;
++	return 0;
+ }
+ 
+ /*
+@@ -443,7 +441,7 @@ static void setup_rt_frame(int sig, stru
+ 	/* Create the ucontext.  */
+ 	err |= __put_user(0, &frame->uc.uc_flags);
+ 	err |= __put_user(0, &frame->uc.uc_link);
+-	err |= __put_user(current->sas_ss_sp, &frame->uc.uc_stack.ss_sp);
++	err |= __put_user(current->sas_ss_sp, (unsigned long *)&frame->uc.uc_stack.ss_sp);
+ 	err |= __put_user(sas_ss_flags(regs->esp),
+ 			  &frame->uc.uc_stack.ss_flags);
+ 	err |= __put_user(current->sas_ss_size, &frame->uc.uc_stack.ss_size);
+--- linux-2.6.0/arch/i386/kernel/smp.c	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/kernel/smp.c	2003-12-28 23:26:36.000000000 -0800
+@@ -327,10 +327,12 @@ asmlinkage void smp_invalidate_interrupt
+ 		 
+ 	if (flush_mm == cpu_tlbstate[cpu].active_mm) {
+ 		if (cpu_tlbstate[cpu].state == TLBSTATE_OK) {
++#ifndef CONFIG_X86_SWITCH_PAGETABLES
+ 			if (flush_va == FLUSH_ALL)
+ 				local_flush_tlb();
+ 			else
+ 				__flush_tlb_one(flush_va);
++#endif
+ 		} else
+ 			leave_mm(cpu);
+ 	}
+@@ -396,21 +398,6 @@ static void flush_tlb_others(cpumask_t c
+ 	spin_unlock(&tlbstate_lock);
+ }
+ 	
+-void flush_tlb_current_task(void)
+-{
+-	struct mm_struct *mm = current->mm;
+-	cpumask_t cpu_mask;
+-
+-	preempt_disable();
+-	cpu_mask = mm->cpu_vm_mask;
+-	cpu_clear(smp_processor_id(), cpu_mask);
+-
+-	local_flush_tlb();
+-	if (!cpus_empty(cpu_mask))
+-		flush_tlb_others(cpu_mask, mm, FLUSH_ALL);
+-	preempt_enable();
+-}
+-
+ void flush_tlb_mm (struct mm_struct * mm)
+ {
+ 	cpumask_t cpu_mask;
+@@ -442,7 +429,10 @@ void flush_tlb_page(struct vm_area_struc
+ 
+ 	if (current->active_mm == mm) {
+ 		if(current->mm)
+-			__flush_tlb_one(va);
++#ifndef CONFIG_X86_SWITCH_PAGETABLES
++			__flush_tlb_one(va)
++#endif
++				;
+ 		 else
+ 		 	leave_mm(smp_processor_id());
+ 	}
+@@ -466,7 +456,17 @@ void flush_tlb_all(void)
+ {
+ 	on_each_cpu(do_flush_tlb_all, 0, 1, 1);
+ }
+-
++#ifdef CONFIG_KGDB
++/*
++ * By using the NMI code instead of a vector we just sneak thru the
++ * word generator coming out with just what we want.  AND it does
++ * not matter if clustered_apic_mode is set or not.
++ */
++void smp_send_nmi_allbutself(void)
++{
++	send_IPI_allbutself(APIC_DM_NMI);
++}
++#endif
+ /*
+  * this function sends a 'reschedule' IPI to another CPU.
+  * it goes straight through and wastes no time serializing
+--- linux-2.6.0/arch/i386/kernel/summit.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/arch/i386/kernel/summit.c	2003-12-28 23:22:43.000000000 -0800
+@@ -29,86 +29,85 @@
+ #include <linux/mm.h>
+ #include <linux/init.h>
+ #include <asm/io.h>
+-#include <mach_mpparse.h>
++#include <asm/mach-summit/mach_mpparse.h>
+ 
+-#ifdef CONFIG_NUMA
+-static void __init setup_pci_node_map_for_wpeg(int wpeg_num, struct rio_table_hdr *rth, 
+-		struct scal_detail **scal_nodes, struct rio_detail **rio_nodes){
+-	int twst_num = 0, node = 0, first_bus = 0;
+-	int i, bus, num_busses;
+-
+-	for(i = 0; i < rth->num_rio_dev; i++){
+-		if (rio_nodes[i]->node_id == rio_nodes[wpeg_num]->owner_id){
+-			twst_num = rio_nodes[i]->owner_id;
++static struct rio_table_hdr *rio_table_hdr __initdata;
++static struct scal_detail   *scal_devs[MAX_NUMNODES] __initdata;
++static struct rio_detail    *rio_devs[MAX_NUMNODES*4] __initdata;
++
++static int __init setup_pci_node_map_for_wpeg(int wpeg_num, int last_bus)
++{
++	int twister = 0, node = 0;
++	int i, bus, num_buses;
++
++	for(i = 0; i < rio_table_hdr->num_rio_dev; i++){
++		if (rio_devs[i]->node_id == rio_devs[wpeg_num]->owner_id){
++			twister = rio_devs[i]->owner_id;
+ 			break;
+ 		}
+ 	}
+-	if (i == rth->num_rio_dev){
+-		printk("%s: Couldn't find owner Cyclone for Winnipeg!\n", __FUNCTION__);
+-		return;
++	if (i == rio_table_hdr->num_rio_dev){
++		printk(KERN_ERR "%s: Couldn't find owner Cyclone for Winnipeg!\n", __FUNCTION__);
++		return last_bus;
+ 	}
+ 
+-	for(i = 0; i < rth->num_scal_dev; i++){
+-		if (scal_nodes[i]->node_id == twst_num){
+-			node = scal_nodes[i]->node_id;
++	for(i = 0; i < rio_table_hdr->num_scal_dev; i++){
++		if (scal_devs[i]->node_id == twister){
++			node = scal_devs[i]->node_id;
+ 			break;
+ 		}
+ 	}
+-	if (i == rth->num_scal_dev){
+-		printk("%s: Couldn't find owner Twister for Cyclone!\n", __FUNCTION__);
+-		return;
++	if (i == rio_table_hdr->num_scal_dev){
++		printk(KERN_ERR "%s: Couldn't find owner Twister for Cyclone!\n", __FUNCTION__);
++		return last_bus;
+ 	}
+ 
+-	switch (rio_nodes[wpeg_num]->type){
++	switch (rio_devs[wpeg_num]->type){
+ 	case CompatWPEG:
+-		/* The Compatability Winnipeg controls the legacy busses
+-		   (busses 0 & 1), the 66MHz PCI bus [2 slots] (bus 2), 
+-		   and the "extra" busses in case a PCI-PCI bridge card is 
+-		   used in either slot (busses 3 & 4): total 5 busses. */
+-		num_busses = 5;
+-		/* The BIOS numbers the busses starting at 1, and in a 
+-		   slightly wierd manner.  You'll have to trust that 
+-		   the math used below to determine the number of the 
+-		   first bus works. */
+-		first_bus = (rio_nodes[wpeg_num]->first_slot - 1) * 2;
++		/* The Compatability Winnipeg controls the 2 legacy buses,
++		 * the 66MHz PCI bus [2 slots] and the 2 "extra" buses in case
++		 * a PCI-PCI bridge card is used in either slot: total 5 buses.
++		 */
++		num_buses = 5;
+ 		break;
+ 	case AltWPEG:
+-		/* The Alternate/Secondary Winnipeg controls the 1st 133MHz 
+-		   bus [1 slot] & its "extra" bus (busses 0 & 1), the 2nd 
+-		   133MHz bus [1 slot] & its "extra" bus (busses 2 & 3), the 
+-		   100MHz bus [2 slots] (bus 4), and the "extra" busses for 
+-		   the 2 100MHz slots (busses 5 & 6): total 7 busses. */
+-		num_busses = 7;
+-		first_bus = (rio_nodes[wpeg_num]->first_slot * 2) - 1;
++		/* The Alternate Winnipeg controls the 2 133MHz buses [1 slot
++		 * each], their 2 "extra" buses, the 100MHz bus [2 slots] and
++		 * the "extra" buses for each of those slots: total 7 buses.
++		 */
++		num_buses = 7;
+ 		break;
+ 	case LookOutAWPEG:
+ 	case LookOutBWPEG:
+-		printk("%s: LookOut Winnipegs not supported yet!\n", __FUNCTION__);
+-		return;
++		/* A Lookout Winnipeg controls 3 100MHz buses [2 slots each]
++		 * & the "extra" buses for each of those slots: total 9 buses.
++		 */
++		num_buses = 9;
++		break;
+ 	default:
+-		printk("%s: Unsupported Winnipeg type!\n", __FUNCTION__);
+-		return;
++		printk(KERN_INFO "%s: Unsupported Winnipeg type!\n", __FUNCTION__);
++		return last_bus;
+ 	}
+ 
+-	for(bus = first_bus; bus < first_bus + num_busses; bus++)
++	for(bus = last_bus; bus < last_bus + num_buses; bus++)
+ 		mp_bus_id_to_node[bus] = node;
++	return bus;
+ }
+ 
+-static int __init build_detail_arrays(struct rio_table_hdr *rth,
+-		struct scal_detail **sd, struct rio_detail **rd){
++static int __init build_detail_arrays(void)
++{
+ 	unsigned long ptr;
+ 	int i, scal_detail_size, rio_detail_size;
+ 
+-	if ((rth->num_scal_dev > MAX_NUMNODES) ||
+-	    (rth->num_rio_dev > MAX_NUMNODES * 2)){
+-		printk("%s: MAX_NUMNODES too low!  Defined as %d, but system has %d nodes.\n", __FUNCTION__, MAX_NUMNODES, rth->num_scal_dev);
+-		return 1;
++	if (rio_table_hdr->num_scal_dev > MAX_NUMNODES){
++		printk(KERN_WARNING "%s: MAX_NUMNODES too low!  Defined as %d, but system has %d nodes.\n", __FUNCTION__, MAX_NUMNODES, rio_table_hdr->num_scal_dev);
++		return 0;
+ 	}
+ 
+-	switch (rth->version){
++	switch (rio_table_hdr->version){
+ 	default:
+-		printk("%s: Bad Rio Grande Table Version: %d\n", __FUNCTION__, rth->version);
+-		return 1;
++		printk(KERN_WARNING "%s: Invalid Rio Grande Table Version: %d\n", __FUNCTION__, rio_table_hdr->version);
++		return 0;
+ 	case 2:
+ 		scal_detail_size = 11;
+ 		rio_detail_size = 13;
+@@ -119,32 +118,27 @@ static int __init build_detail_arrays(st
+ 		break;
+ 	}
+ 
+-	ptr = (unsigned long)rth + 3;
+-	for(i = 0; i < rth->num_scal_dev; i++)
+-		sd[i] = (struct scal_detail *)(ptr + (scal_detail_size * i));
+-
+-	ptr += scal_detail_size * rth->num_scal_dev;
+-	for(i = 0; i < rth->num_rio_dev; i++)
+-		rd[i] = (struct rio_detail *)(ptr + (rio_detail_size * i));
++	ptr = (unsigned long)rio_table_hdr + 3;
++	for(i = 0; i < rio_table_hdr->num_scal_dev; i++, ptr += scal_detail_size)
++		scal_devs[i] = (struct scal_detail *)ptr;
+ 
+-	return 0;
++	for(i = 0; i < rio_table_hdr->num_rio_dev; i++, ptr += rio_detail_size)
++		rio_devs[i] = (struct rio_detail *)ptr;
++
++	return 1;
+ }
+ 
+ void __init setup_summit(void)
+ {
+-	struct rio_table_hdr	*rio_table_hdr = NULL;
+-	struct scal_detail	*scal_devs[MAX_NUMNODES];
+-	struct rio_detail	*rio_devs[MAX_NUMNODES*2];
+ 	unsigned long		ptr;
+ 	unsigned short		offset;
+-	int			i;
+-
+-	memset(mp_bus_id_to_node, -1, sizeof(mp_bus_id_to_node));
++	int			i, next_wpeg, next_bus = 0;
+ 
+ 	/* The pointer to the EBDA is stored in the word @ phys 0x40E(40:0E) */
+ 	ptr = *(unsigned short *)phys_to_virt(0x40Eul);
+ 	ptr = (unsigned long)phys_to_virt(ptr << 4);
+ 
++	rio_table_hdr = NULL;
+ 	offset = 0x180;
+ 	while (offset){
+ 		/* The block id is stored in the 2nd word */
+@@ -157,16 +151,30 @@ void __init setup_summit(void)
+ 		offset = *((unsigned short *)(ptr + offset));
+ 	}
+ 	if (!rio_table_hdr){
+-		printk("%s: Unable to locate Rio Grande Table in EBDA - bailing!\n", __FUNCTION__);
++		printk(KERN_ERR "%s: Unable to locate Rio Grande Table in EBDA - bailing!\n", __FUNCTION__);
+ 		return;
+ 	}
+ 
+-	if (build_detail_arrays(rio_table_hdr, scal_devs, rio_devs))
++	if (!build_detail_arrays())
+ 		return;
+ 
+-	for(i = 0; i < rio_table_hdr->num_rio_dev; i++)
+-		if (is_WPEG(rio_devs[i]->type))
+-			/* It's a Winnipeg, it's got PCI Busses */
+-			setup_pci_node_map_for_wpeg(i, rio_table_hdr, scal_devs, rio_devs);
++	/* The first Winnipeg we're looking for has an index of 0 */
++	next_wpeg = 0;
++	do {
++		for(i = 0; i < rio_table_hdr->num_rio_dev; i++){
++			if (is_WPEG(rio_devs[i]) && rio_devs[i]->WP_index == next_wpeg){
++				/* It's the Winnipeg we're looking for! */
++				next_bus = setup_pci_node_map_for_wpeg(i, next_bus);
++				next_wpeg++;
++				break;
++			}
++		}
++		/*
++		 * If we go through all Rio devices and don't find one with
++		 * the next index, it means we've found all the Winnipegs,
++		 * and thus all the PCI buses.
++		 */
++		if (i == rio_table_hdr->num_rio_dev)
++			next_wpeg = 0;
++	} while (next_wpeg != 0);
+ }
+-#endif /* CONFIG_NUMA */
+--- linux-2.6.0/arch/i386/kernel/sysenter.c	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/kernel/sysenter.c	2003-12-28 23:26:36.000000000 -0800
+@@ -18,13 +18,18 @@
+ #include <asm/msr.h>
+ #include <asm/pgtable.h>
+ #include <asm/unistd.h>
++#include <linux/highmem.h>
+ 
+ extern asmlinkage void sysenter_entry(void);
+ 
+ void enable_sep_cpu(void *info)
+ {
+ 	int cpu = get_cpu();
++#ifdef CONFIG_X86_HIGH_ENTRY
++	struct tss_struct *tss = (struct tss_struct *) __fix_to_virt(FIX_TSS_0) + cpu;
++#else
+ 	struct tss_struct *tss = init_tss + cpu;
++#endif
+ 
+ 	tss->ss1 = __KERNEL_CS;
+ 	tss->esp1 = sizeof(struct tss_struct) + (unsigned long) tss;
+--- linux-2.6.0/arch/i386/kernel/time.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/arch/i386/kernel/time.c	2003-12-28 23:22:19.000000000 -0800
+@@ -44,6 +44,7 @@
+ #include <linux/module.h>
+ #include <linux/sysdev.h>
+ #include <linux/bcd.h>
++#include <linux/efi.h>
+ 
+ #include <asm/io.h>
+ #include <asm/smp.h>
+@@ -94,7 +95,7 @@ void do_gettimeofday(struct timeval *tv)
+ {
+ 	unsigned long seq;
+ 	unsigned long usec, sec;
+-	unsigned long max_ntp_tick = tick_usec - tickadj;
++	unsigned long max_ntp_tick;
+ 
+ 	do {
+ 		unsigned long lost;
+@@ -110,13 +111,14 @@ void do_gettimeofday(struct timeval *tv)
+ 		 * Better to lose some accuracy than have time go backwards..
+ 		 */
+ 		if (unlikely(time_adjust < 0)) {
++			max_ntp_tick = (USEC_PER_SEC / HZ) - tickadj;
+ 			usec = min(usec, max_ntp_tick);
+ 
+ 			if (lost)
+ 				usec += lost * max_ntp_tick;
+ 		}
+ 		else if (unlikely(lost))
+-			usec += lost * tick_usec;
++			usec += lost * (USEC_PER_SEC / HZ);
+ 
+ 		sec = xtime.tv_sec;
+ 		usec += (xtime.tv_nsec / 1000);
+@@ -174,7 +176,10 @@ static int set_rtc_mmss(unsigned long no
+ 
+ 	/* gets recalled with irq locally disabled */
+ 	spin_lock(&rtc_lock);
+-	retval = mach_set_rtc_mmss(nowtime);
++	if (efi_enabled)
++		retval = efi_set_rtc_mmss(nowtime);
++	else
++		retval = mach_set_rtc_mmss(nowtime);
+ 	spin_unlock(&rtc_lock);
+ 
+ 	return retval;
+@@ -232,7 +237,13 @@ static inline void do_timer_interrupt(in
+ 			>= USEC_AFTER - ((unsigned) TICK_SIZE) / 2 &&
+ 	    (xtime.tv_nsec / 1000)
+ 			<= USEC_BEFORE + ((unsigned) TICK_SIZE) / 2) {
+-		if (set_rtc_mmss(xtime.tv_sec) == 0)
++		/* horrible...FIXME */
++		if (efi_enabled) {
++	 		if (efi_set_rtc_mmss(xtime.tv_sec) == 0)
++				last_rtc_update = xtime.tv_sec;
++			else
++				last_rtc_update = xtime.tv_sec - 600;
++		} else if (set_rtc_mmss(xtime.tv_sec) == 0)
+ 			last_rtc_update = xtime.tv_sec;
+ 		else
+ 			last_rtc_update = xtime.tv_sec - 600; /* do it again in 60 s */
+@@ -286,7 +297,10 @@ unsigned long get_cmos_time(void)
+ 
+ 	spin_lock(&rtc_lock);
+ 
+-	retval = mach_get_cmos_time();
++	if (efi_enabled)
++		retval = efi_get_time();
++	else
++		retval = mach_get_cmos_time();
+ 
+ 	spin_unlock(&rtc_lock);
+ 
+@@ -297,6 +311,7 @@ static struct sysdev_class pit_sysclass 
+ 	set_kset_name("pit"),
+ };
+ 
++
+ /* XXX this driverfs stuff should probably go elsewhere later -john */
+ static struct sys_device device_i8253 = {
+ 	.id	= 0,
+@@ -328,6 +343,8 @@ void __init hpet_time_init(void)
+ 	}
+ 
+ 	cur_timer = select_timer();
++	printk(KERN_INFO "Using %s for high-res timesource\n",cur_timer->name);
++
+ 	time_init_hook();
+ }
+ #endif
+@@ -344,12 +361,13 @@ void __init time_init(void)
+ 		return;
+ 	}
+ #endif
+-
+ 	xtime.tv_sec = get_cmos_time();
+ 	wall_to_monotonic.tv_sec = -xtime.tv_sec;
+ 	xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ);
+ 	wall_to_monotonic.tv_nsec = -xtime.tv_nsec;
+ 
+ 	cur_timer = select_timer();
++	printk(KERN_INFO "Using %s for high-res timesource\n",cur_timer->name);
++
+ 	time_init_hook();
+ }
+--- linux-2.6.0/arch/i386/kernel/timers/common.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/i386/kernel/timers/common.c	2003-12-28 23:21:57.000000000 -0800
+@@ -137,3 +137,23 @@ bad_calibration:
+ }
+ #endif
+ 
++/* calculate cpu_khz */
++void __init init_cpu_khz(void)
++{
++	if (cpu_has_tsc) {
++		unsigned long tsc_quotient = calibrate_tsc();
++		if (tsc_quotient) {
++			/* report CPU clock rate in Hz.
++			 * The formula is (10^6 * 2^32) / (2^32 * 1 / (clocks/us)) =
++			 * clock/second. Our precision is about 100 ppm.
++			 */
++			{	unsigned long eax=0, edx=1000;
++				__asm__("divl %2"
++		       		:"=a" (cpu_khz), "=d" (edx)
++        	       		:"r" (tsc_quotient),
++	                	"0" (eax), "1" (edx));
++				printk("Detected %lu.%03lu MHz processor.\n", cpu_khz / 1000, cpu_khz % 1000);
++			}
++		}
++	}
++}
+--- linux-2.6.0/arch/i386/kernel/timers/Makefile	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/i386/kernel/timers/Makefile	2003-12-28 23:21:57.000000000 -0800
+@@ -6,3 +6,4 @@ obj-y := timer.o timer_none.o timer_tsc.
+ 
+ obj-$(CONFIG_X86_CYCLONE_TIMER)	+= timer_cyclone.o
+ obj-$(CONFIG_HPET_TIMER)	+= timer_hpet.o
++obj-$(CONFIG_X86_PM_TIMER)	+= timer_pm.o
+--- linux-2.6.0/arch/i386/kernel/timers/timer.c	2003-09-08 13:58:55.000000000 -0700
++++ 25/arch/i386/kernel/timers/timer.c	2003-12-28 23:21:57.000000000 -0800
+@@ -19,6 +19,9 @@ static struct timer_opts* timers[] = {
+ #ifdef CONFIG_HPET_TIMER
+ 	&timer_hpet,
+ #endif
++#ifdef CONFIG_X86_PM_TIMER
++	&timer_pmtmr,
++#endif
+ 	&timer_tsc,
+ 	&timer_pit,
+ 	NULL,
+--- linux-2.6.0/arch/i386/kernel/timers/timer_cyclone.c	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/kernel/timers/timer_cyclone.c	2003-12-28 23:22:29.000000000 -0800
+@@ -71,7 +71,7 @@ static void mark_offset_cyclone(void)
+ 	lost = delta/(1000000/HZ);
+ 	delay = delta%(1000000/HZ);
+ 	if (lost >= 2)
+-		jiffies += lost-1;
++		jiffies_64 += lost-1;
+ 	
+ 	/* update the monotonic base value */
+ 	this_offset = ((unsigned long long)last_cyclone_high<<32)|last_cyclone_low;
+@@ -88,7 +88,7 @@ static void mark_offset_cyclone(void)
+ 	 * usec delta is > 90% # of usecs/tick)
+ 	 */
+ 	if (lost && abs(delay - delay_at_last_interrupt) > (900000/HZ))
+-		jiffies++;
++		jiffies_64++;
+ }
+ 
+ static unsigned long get_offset_cyclone(void)
+@@ -212,26 +212,7 @@ static int __init init_cyclone(char* ove
+ 		}
+ 	}
+ 
+-	/* init cpu_khz.
+-	 * XXX - This should really be done elsewhere, 
+-	 * 		and in a more generic fashion. -johnstul@us.ibm.com
+-	 */
+-	if (cpu_has_tsc) {
+-		unsigned long tsc_quotient = calibrate_tsc();
+-		if (tsc_quotient) {
+-			/* report CPU clock rate in Hz.
+-			 * The formula is (10^6 * 2^32) / (2^32 * 1 / (clocks/us)) =
+-			 * clock/second. Our precision is about 100 ppm.
+-			 */
+-			{	unsigned long eax=0, edx=1000;
+-				__asm__("divl %2"
+-		       		:"=a" (cpu_khz), "=d" (edx)
+-        	       		:"r" (tsc_quotient),
+-	                	"0" (eax), "1" (edx));
+-				printk("Detected %lu.%03lu MHz processor.\n", cpu_khz / 1000, cpu_khz % 1000);
+-			}
+-		}
+-	}
++	init_cpu_khz();
+ 
+ 	/* Everything looks good! */
+ 	return 0;
+@@ -253,6 +234,7 @@ static void delay_cyclone(unsigned long 
+ 
+ /* cyclone timer_opts struct */
+ struct timer_opts timer_cyclone = {
++	.name = "cyclone",
+ 	.init = init_cyclone, 
+ 	.mark_offset = mark_offset_cyclone, 
+ 	.get_offset = get_offset_cyclone,
+--- linux-2.6.0/arch/i386/kernel/timers/timer_hpet.c	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/kernel/timers/timer_hpet.c	2003-12-28 23:22:29.000000000 -0800
+@@ -108,7 +108,7 @@ static void mark_offset_hpet(void)
+ 	offset = hpet_readl(HPET_T0_CMP) - hpet_tick;
+ 	if (unlikely(((offset - hpet_last) > hpet_tick) && (hpet_last != 0))) {
+ 		int lost_ticks = (offset - hpet_last) / hpet_tick;
+-		jiffies += lost_ticks;
++		jiffies_64 += lost_ticks;
+ 	}
+ 	hpet_last = offset;
+ 
+@@ -178,6 +178,7 @@ static int __init init_hpet(char* overri
+ 
+ /* tsc timer_opts struct */
+ struct timer_opts timer_hpet = {
++	.name = 		"hpet",
+ 	.init =			init_hpet,
+ 	.mark_offset =		mark_offset_hpet,
+ 	.get_offset =		get_offset_hpet,
+--- linux-2.6.0/arch/i386/kernel/timers/timer_none.c	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/kernel/timers/timer_none.c	2003-12-28 23:21:56.000000000 -0800
+@@ -36,6 +36,7 @@ static void delay_none(unsigned long loo
+ 
+ /* tsc timer_opts struct */
+ struct timer_opts timer_none = {
++	.name = 	"none",
+ 	.init =		init_none, 
+ 	.mark_offset =	mark_offset_none, 
+ 	.get_offset =	get_offset_none,
+--- linux-2.6.0/arch/i386/kernel/timers/timer_pit.c	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/kernel/timers/timer_pit.c	2003-12-28 23:21:56.000000000 -0800
+@@ -149,6 +149,7 @@ static unsigned long get_offset_pit(void
+ 
+ /* tsc timer_opts struct */
+ struct timer_opts timer_pit = {
++	.name = 	"pit",
+ 	.init =		init_pit, 
+ 	.mark_offset =	mark_offset_pit, 
+ 	.get_offset =	get_offset_pit,
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/arch/i386/kernel/timers/timer_pm.c	2003-12-28 23:21:57.000000000 -0800
+@@ -0,0 +1,203 @@
++/*
++ * (C) Dominik Brodowski <linux@brodo.de> 2003
++ *
++ * Driver to use the Power Management Timer (PMTMR) available in some
++ * southbridges as primary timing source for the Linux kernel.
++ *
++ * Based on parts of linux/drivers/acpi/hardware/hwtimer.c, timer_pit.c,
++ * timer_hpet.c, and on Arjan van de Ven's implementation for 2.4.
++ *
++ * This file is licensed under the GPL v2.
++ */
++
++
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/device.h>
++#include <linux/init.h>
++#include <asm/types.h>
++#include <asm/timer.h>
++#include <asm/smp.h>
++#include <asm/io.h>
++#include <asm/arch_hooks.h>
++
++
++/* The I/O port the PMTMR resides at.
++ * The location is detected during setup_arch(),
++ * in arch/i386/acpi/boot.c */
++u32 pmtmr_ioport = 0;
++
++
++/* value of the Power timer at last timer interrupt */
++static u32 offset_tick;
++static u32 offset_delay;
++
++static unsigned long long monotonic_base;
++static seqlock_t monotonic_lock = SEQLOCK_UNLOCKED;
++
++#define ACPI_PM_MASK 0xFFFFFF /* limit it to 24 bits */
++
++static int init_pmtmr(char* override)
++{
++	u32 value1, value2;
++	unsigned int i;
++
++ 	if (override[0] && strncmp(override,"pmtmr",5))
++		return -ENODEV;
++
++	if (!pmtmr_ioport)
++		return -ENODEV;
++
++	/* "verify" this timing source */
++	value1 = inl(pmtmr_ioport);
++	value1 &= ACPI_PM_MASK;
++	for (i=0; i < 10000; i++) {
++		value2 = inl(pmtmr_ioport);
++		value2 &= ACPI_PM_MASK;
++		if (value2 == value1)
++			continue;
++		if (value2 > value1)
++			goto pm_good;
++		if ((value2 < value1) && ((value2) < 0xFFF))
++			goto pm_good;
++		printk(KERN_INFO "PM-Timer had inconsistent results: 0x%#x, 0x%#x - aborting.\n", value1, value2);
++		return -EINVAL;
++	}
++	printk(KERN_INFO "PM-Timer had no reasonable result: 0x%#x - aborting.\n", value1);
++	return -ENODEV;
++
++pm_good:
++	init_cpu_khz();
++	return 0;
++}
++
++static inline u32 cyc2us(u32 cycles)
++{
++	/* The Power Management Timer ticks at 3.579545 ticks per microsecond.
++	 * 1 / PM_TIMER_FREQUENCY == 0.27936511 =~ 286/1024 [error: 0.024%]
++	 *
++	 * Even with HZ = 100, delta is at maximum 35796 ticks, so it can
++	 * easily be multiplied with 286 (=0x11E) without having to fear
++	 * u32 overflows.
++	 */
++	cycles *= 286;
++	return (cycles >> 10);
++}
++
++/*
++ * this gets called during each timer interrupt
++ *   - Called while holding the writer xtime_lock
++ */
++static void mark_offset_pmtmr(void)
++{
++	u32 lost, delta, last_offset;
++	static int first_run = 1;
++	last_offset = offset_tick;
++
++	write_seqlock(&monotonic_lock);
++
++	offset_tick = inl(pmtmr_ioport);
++	offset_tick &= ACPI_PM_MASK; /* limit it to 24 bits */
++
++	/* calculate tick interval */
++	delta = (offset_tick - last_offset) & ACPI_PM_MASK;
++
++	/* convert to usecs */
++	delta = cyc2us(delta);
++
++	/* update the monotonic base value */
++	monotonic_base += delta*NSEC_PER_USEC;
++	write_sequnlock(&monotonic_lock);
++
++	/* convert to ticks */
++	delta += offset_delay;
++	lost = delta/(USEC_PER_SEC/HZ);
++	offset_delay = delta%(USEC_PER_SEC/HZ);
++
++
++	/* compensate for lost ticks */
++	if (lost >= 2)
++		jiffies += lost - 1;
++
++	/* don't calculate delay for first run,
++	   or if we've got less then a tick */
++	if (first_run || (lost < 1)) {
++		first_run = 0;
++		offset_delay = 0;
++	}
++
++	return;
++}
++
++
++static unsigned long long monotonic_clock_pmtmr(void)
++{
++	u32 last_offset, this_offset;
++	unsigned long long base, ret;
++	unsigned seq;
++
++
++	/* atomically read monotonic base & last_offset */
++	do {
++		seq = read_seqbegin(&monotonic_lock);
++		last_offset = offset_tick;
++		base = monotonic_base;
++	} while (read_seqretry(&monotonic_lock, seq));
++
++	/* Read the pmtmr */
++	this_offset =  inl(pmtmr_ioport) & ACPI_PM_MASK;
++
++	/* convert to nanoseconds */
++	ret = (this_offset - last_offset) & ACPI_PM_MASK;
++	ret = base + (cyc2us(ret)*NSEC_PER_USEC);
++	return ret;
++}
++
++/*
++ * copied from delay_pit
++ */
++static void delay_pmtmr(unsigned long loops)
++{
++	int d0;
++	__asm__ __volatile__(
++		"\tjmp 1f\n"
++		".align 16\n"
++		"1:\tjmp 2f\n"
++		".align 16\n"
++		"2:\tdecl %0\n\tjns 2b"
++		:"=&a" (d0)
++		:"0" (loops));
++}
++
++
++/*
++ * get the offset (in microseconds) from the last call to mark_offset()
++ *	- Called holding a reader xtime_lock
++ */
++static unsigned long get_offset_pmtmr(void)
++{
++	u32 now, offset, delta = 0;
++
++	offset = offset_tick;
++	now = inl(pmtmr_ioport);
++	now &= ACPI_PM_MASK;
++	delta = (now - offset)&ACPI_PM_MASK;
++
++	return (unsigned long) offset_delay + cyc2us(delta);
++}
++
++
++/* acpi timer_opts struct */
++struct timer_opts timer_pmtmr = {
++	.name			= "acpi_pm_timer",
++	.init 			= init_pmtmr,
++	.mark_offset		= mark_offset_pmtmr,
++	.get_offset		= get_offset_pmtmr,
++	.monotonic_clock 	= monotonic_clock_pmtmr,
++	.delay 			= delay_pmtmr,
++};
++
++
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Dominik Brodowski <linux@brodo.de>");
++MODULE_DESCRIPTION("Power Management Timer (PMTMR) as primary timing source for x86");
+--- linux-2.6.0/arch/i386/kernel/timers/timer_tsc.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/arch/i386/kernel/timers/timer_tsc.c	2003-12-28 23:26:25.000000000 -0800
+@@ -30,7 +30,6 @@ struct timer_opts timer_tsc;
+ int tsc_disable __initdata = 0;
+ 
+ extern spinlock_t i8253_lock;
+-extern volatile unsigned long jiffies;
+ 
+ static int use_tsc;
+ /* Number of usecs that the last interrupt was delayed */
+@@ -141,6 +140,7 @@ unsigned long long sched_clock(void)
+ #ifndef CONFIG_NUMA
+ 	if (!use_tsc)
+ #endif
++		/* jiffies might overflow but this is not a big deal here */
+ 		return (unsigned long long)jiffies * (1000000000 / HZ);
+ 
+ 	/* Read the Time Stamp Counter */
+@@ -184,6 +184,18 @@ static void mark_offset_tsc(void)
+ 
+ 	count = inb_p(PIT_CH0);    /* read the latched count */
+ 	count |= inb(PIT_CH0) << 8;
++
++	/*
++	 * VIA686a test code... reset the latch if count > max + 1
++	 * from timer_pit.c - cjb
++	 */
++	if (count > LATCH) {
++		outb_p(0x34, PIT_MODE);
++		outb_p(LATCH & 0xff, PIT_CH0);
++		outb(LATCH >> 8, PIT_CH0);
++		count = LATCH - 1;
++	}
++
+ 	spin_unlock(&i8253_lock);
+ 
+ 	if (pit_latch_buggy) {
+@@ -215,7 +227,7 @@ static void mark_offset_tsc(void)
+ 	lost = delta/(1000000/HZ);
+ 	delay = delta%(1000000/HZ);
+ 	if (lost >= 2) {
+-		jiffies += lost-1;
++		jiffies_64 += lost-1;
+ 
+ 		/* sanity check to ensure we're not always losing ticks */
+ 		if (lost_count++ > 100) {
+@@ -241,7 +253,7 @@ static void mark_offset_tsc(void)
+ 	 * usec delta is > 90% # of usecs/tick)
+ 	 */
+ 	if (lost && abs(delay - delay_at_last_interrupt) > (900000/HZ))
+-		jiffies++;
++		jiffies_64++;
+ }
+ 
+ static void delay_tsc(unsigned long loops)
+@@ -283,7 +295,7 @@ static void mark_offset_tsc_hpet(void)
+ 	offset = hpet_readl(HPET_T0_CMP) - hpet_tick;
+ 	if (unlikely(((offset - hpet_last) > hpet_tick) && (hpet_last != 0))) {
+ 		int lost_ticks = (offset - hpet_last) / hpet_tick;
+-		jiffies += lost_ticks;
++		jiffies_64 += lost_ticks;
+ 	}
+ 	hpet_last = hpet_current;
+ 
+@@ -472,6 +484,7 @@ __setup("notsc", tsc_setup);
+ 
+ /* tsc timer_opts struct */
+ struct timer_opts timer_tsc = {
++	.name = 	"tsc",
+ 	.init =		init_tsc,
+ 	.mark_offset =	mark_offset_tsc, 
+ 	.get_offset =	get_offset_tsc,
+--- linux-2.6.0/arch/i386/kernel/traps.c	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/kernel/traps.c	2003-12-28 23:26:36.000000000 -0800
+@@ -54,12 +54,8 @@
+ 
+ #include "mach_traps.h"
+ 
+-asmlinkage int system_call(void);
+-asmlinkage void lcall7(void);
+-asmlinkage void lcall27(void);
+-
+-struct desc_struct default_ldt[] = { { 0, 0 }, { 0, 0 }, { 0, 0 },
+-		{ 0, 0 }, { 0, 0 } };
++struct desc_struct default_ldt[] __attribute__((__section__(".data.default_ldt"))) = { { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 } };
++struct page *default_ldt_page;
+ 
+ /* Do we ignore FPU interrupts ? */
+ char ignore_fpu_irq = 0;
+@@ -91,6 +87,43 @@ asmlinkage void alignment_check(void);
+ asmlinkage void spurious_interrupt_bug(void);
+ asmlinkage void machine_check(void);
+ 
++#ifdef CONFIG_KGDB
++extern void sysenter_entry(void);
++#include <asm/kgdb.h>
++#include <linux/init.h>
++extern void int3(void);
++extern void debug(void);
++void set_intr_gate(unsigned int n, void *addr);
++static void set_intr_usr_gate(unsigned int n, void *addr);
++/*
++ * Should be able to call this breakpoint() very early in
++ * bring up.  Just hard code the call where needed.
++ * The breakpoint() code is here because set_?_gate() functions
++ * are local (static) to trap.c.  They need be done only once,
++ * but it does not hurt to do them over.
++ */
++void breakpoint(void)
++{
++	init_entry_mappings();
++        set_intr_usr_gate(3,&int3); /* disable ints on trap */
++	set_intr_gate(1,&debug);
++	set_intr_gate(14,&page_fault);
++
++        BREAKPOINT;
++}
++#define	CHK_REMOTE_DEBUG(trapnr,signr,error_code,regs,after)		\
++    {									\
++	if (!user_mode(regs)  ) \
++	{								\
++		kgdb_handle_exception(trapnr, signr, error_code, regs);	\
++		after;							\
++	} else if ((trapnr == 3) && (regs->eflags &0x200)) local_irq_enable(); \
++    }
++#else
++#define	CHK_REMOTE_DEBUG(trapnr,signr,error_code,regs,after)
++#endif
++
++
+ static int kstack_depth_to_print = 24;
+ 
+ void show_trace(struct task_struct *task, unsigned long * stack)
+@@ -175,8 +208,9 @@ void show_registers(struct pt_regs *regs
+ 		ss = regs->xss & 0xffff;
+ 	}
+ 	print_modules();
+-	printk("CPU:    %d\nEIP:    %04x:[<%08lx>]    %s\nEFLAGS: %08lx\n",
+-		smp_processor_id(), 0xffff & regs->xcs, regs->eip, print_tainted(), regs->eflags);
++	printk("CPU:    %d\nEIP:    %04x:[<%08lx>]    %s VLI\nEFLAGS: %08lx\n",
++		smp_processor_id(), 0xffff & regs->xcs,
++		regs->eip, print_tainted(), regs->eflags);
+ 
+ 	print_symbol("EIP is at %s\n", regs->eip);
+ 	printk("eax: %08lx   ebx: %08lx   ecx: %08lx   edx: %08lx\n",
+@@ -192,23 +226,27 @@ void show_registers(struct pt_regs *regs
+ 	 * time of the fault..
+ 	 */
+ 	if (in_kernel) {
++		u8 *eip;
+ 
+ 		printk("\nStack: ");
+ 		show_stack(NULL, (unsigned long*)esp);
+ 
+ 		printk("Code: ");
+-		if(regs->eip < PAGE_OFFSET)
+-			goto bad;
+ 
+-		for(i=0;i<20;i++)
+-		{
+-			unsigned char c;
+-			if(__get_user(c, &((unsigned char*)regs->eip)[i])) {
+-bad:
++		eip = (u8 *)regs->eip - 43;
++		for (i = 0; i < 64; i++, eip++) {
++			unsigned char c = 0xff;
++
++			if ((user_mode(regs) && get_user(c, eip)) ||
++			    (!user_mode(regs) && __direct_get_user(c, eip))) {
++
+ 				printk(" Bad EIP value.");
+ 				break;
+ 			}
+-			printk("%02x ", c);
++			if (eip == (u8 *)regs->eip)
++				printk("<%02x> ", c);
++			else
++				printk("%02x ", c);
+ 		}
+ 	}
+ 	printk("\n");
+@@ -255,12 +293,36 @@ spinlock_t die_lock = SPIN_LOCK_UNLOCKED
+ void die(const char * str, struct pt_regs * regs, long err)
+ {
+ 	static int die_counter;
++	int nl = 0;
+ 
+ 	console_verbose();
+ 	spin_lock_irq(&die_lock);
+ 	bust_spinlocks(1);
+ 	handle_BUG(regs);
+ 	printk("%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter);
++#ifdef CONFIG_PREEMPT
++	printk("PREEMPT ");
++	nl = 1;
++#endif
++#ifdef CONFIG_SMP
++	printk("SMP ");
++	nl = 1;
++#endif
++#ifdef CONFIG_DEBUG_PAGEALLOC
++	printk("DEBUG_PAGEALLOC");
++	nl = 1;
++#endif
++	if (nl)
++		printk("\n");
++#ifdef CONFIG_KGDB
++	/* This is about the only place we want to go to kgdb even if in
++	 * user mode.  But we must go in via a trap so within kgdb we will
++	 * always be in kernel mode.
++	 */
++	if (user_mode(regs))
++		BREAKPOINT;
++#endif
++ 	CHK_REMOTE_DEBUG(0,SIGTRAP,err,regs,)
+ 	show_registers(regs);
+ 	bust_spinlocks(0);
+ 	spin_unlock_irq(&die_lock);
+@@ -330,6 +392,7 @@ static inline void do_trap(int trapnr, i
+ #define DO_ERROR(trapnr, signr, str, name) \
+ asmlinkage void do_##name(struct pt_regs * regs, long error_code) \
+ { \
++	CHK_REMOTE_DEBUG(trapnr,signr,error_code,regs,)\
+ 	do_trap(trapnr, signr, str, 0, regs, error_code, NULL); \
+ }
+ 
+@@ -347,7 +410,9 @@ asmlinkage void do_##name(struct pt_regs
+ #define DO_VM86_ERROR(trapnr, signr, str, name) \
+ asmlinkage void do_##name(struct pt_regs * regs, long error_code) \
+ { \
++	CHK_REMOTE_DEBUG(trapnr, signr, error_code,regs, return)\
+ 	do_trap(trapnr, signr, str, 1, regs, error_code, NULL); \
++	return; \
+ }
+ 
+ #define DO_VM86_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr) \
+@@ -394,8 +459,10 @@ gp_in_vm86:
+ 	return;
+ 
+ gp_in_kernel:
+-	if (!fixup_exception(regs))
++	if (!fixup_exception(regs)){
++ 		CHK_REMOTE_DEBUG(13,SIGSEGV,error_code,regs,)
+ 		die("general protection fault", regs, error_code);
++	}
+ }
+ 
+ static void mem_parity_error(unsigned char reason, struct pt_regs * regs)
+@@ -534,10 +601,18 @@ asmlinkage void do_debug(struct pt_regs 
+ 	if (regs->eflags & X86_EFLAGS_IF)
+ 		local_irq_enable();
+ 
+-	/* Mask out spurious debug traps due to lazy DR7 setting */
++	/*
++	 * Mask out spurious debug traps due to lazy DR7 setting or
++	 * due to 4G/4G kernel mode:
++	 */
+ 	if (condition & (DR_TRAP0|DR_TRAP1|DR_TRAP2|DR_TRAP3)) {
+ 		if (!tsk->thread.debugreg[7])
+ 			goto clear_dr7;
++		if (!user_mode(regs)) {
++			// restore upon return-to-userspace:
++			set_thread_flag(TIF_DB7);
++			goto clear_dr7;
++		}
+ 	}
+ 
+ 	if (regs->eflags & VM_MASK)
+@@ -557,8 +632,18 @@ asmlinkage void do_debug(struct pt_regs 
+ 		 * allowing programs to debug themselves without the ptrace()
+ 		 * interface.
+ 		 */
++#ifdef CONFIG_KGDB
++		/*
++		 * I think this is the only "real" case of a TF in the kernel
++		 * that really belongs to user space.  Others are
++		 * "Ours all ours!"
++		 */
++		if (((regs->xcs & 3) == 0) && ((void *)regs->eip == sysenter_entry))
++			goto clear_TF_reenable;
++#else
+ 		if ((regs->xcs & 3) == 0)
+ 			goto clear_TF_reenable;
++#endif
+ 		if ((tsk->ptrace & (PT_DTRACE|PT_PTRACED)) == PT_DTRACE)
+ 			goto clear_TF;
+ 	}
+@@ -570,6 +655,17 @@ asmlinkage void do_debug(struct pt_regs 
+ 	info.si_errno = 0;
+ 	info.si_code = TRAP_BRKPT;
+ 	
++#ifdef CONFIG_KGDB
++        /*
++	 * If this is a kernel mode trap, we need to reset db7 to allow us
++	 * to continue sanely ALSO skip the signal delivery
++         */
++	if ((regs->xcs & 3) == 0)
++		goto clear_dr7;
++
++        /* if not kernel, allow ints but only if they were on */
++       if ( regs->eflags & 0x200) local_irq_enable();
++#endif
+ 	/* If this is a kernel mode trap, save the user PC on entry to 
+ 	 * the kernel, that's what the debugger can make sense of.
+ 	 */
+@@ -584,6 +680,7 @@ clear_dr7:
+ 	__asm__("movl %0,%%db7"
+ 		: /* no output */
+ 		: "r" (0));
++	CHK_REMOTE_DEBUG(1,SIGTRAP,error_code,regs,)
+ 	return;
+ 
+ debug_vm86:
+@@ -779,19 +876,53 @@ asmlinkage void math_emulate(long arg)
+ 
+ #endif /* CONFIG_MATH_EMULATION */
+ 
+-#ifdef CONFIG_X86_F00F_BUG
+-void __init trap_init_f00f_bug(void)
++void __init trap_init_virtual_IDT(void)
+ {
+-	__set_fixmap(FIX_F00F_IDT, __pa(&idt_table), PAGE_KERNEL_RO);
+-
+ 	/*
+-	 * Update the IDT descriptor and reload the IDT so that
+-	 * it uses the read-only mapped virtual address.
++	 * "idt" is magic - it overlaps the idt_descr
++	 * variable so that updating idt will automatically
++	 * update the idt descriptor..
+ 	 */
+-	idt_descr.address = fix_to_virt(FIX_F00F_IDT);
++	__set_fixmap(FIX_IDT, __pa(&idt_table), PAGE_KERNEL_RO);
++	idt_descr.address = __fix_to_virt(FIX_IDT);
++
+ 	__asm__ __volatile__("lidt %0" : : "m" (idt_descr));
+ }
++
++void __init trap_init_virtual_GDT(void)
++{
++	int cpu = smp_processor_id();
++	struct Xgt_desc_struct *gdt_desc = cpu_gdt_descr + cpu;
++	struct Xgt_desc_struct tmp_desc = {0, 0};
++	struct tss_struct * t;
++
++	__asm__ __volatile__("sgdt %0": "=m" (tmp_desc): :"memory");
++
++#ifdef CONFIG_X86_HIGH_ENTRY
++	if (!cpu) {
++		__set_fixmap(FIX_GDT_0, __pa(cpu_gdt_table), PAGE_KERNEL);
++		__set_fixmap(FIX_GDT_1, __pa(cpu_gdt_table) + PAGE_SIZE, PAGE_KERNEL);
++		__set_fixmap(FIX_TSS_0, __pa(init_tss), PAGE_KERNEL);
++		__set_fixmap(FIX_TSS_1, __pa(init_tss) + 1*PAGE_SIZE, PAGE_KERNEL);
++		__set_fixmap(FIX_TSS_2, __pa(init_tss) + 2*PAGE_SIZE, PAGE_KERNEL);
++		__set_fixmap(FIX_TSS_3, __pa(init_tss) + 3*PAGE_SIZE, PAGE_KERNEL);
++	}
++
++	gdt_desc->address = __fix_to_virt(FIX_GDT_0) + sizeof(cpu_gdt_table[0]) * cpu;
++#else
++	gdt_desc->address = (unsigned long)cpu_gdt_table[cpu];
++#endif
++	__asm__ __volatile__("lgdt %0": "=m" (*gdt_desc));
++
++#ifdef CONFIG_X86_HIGH_ENTRY
++	t = (struct tss_struct *) __fix_to_virt(FIX_TSS_0) + cpu;
++#else
++	t = init_tss + cpu;
+ #endif
++	set_tss_desc(cpu, t);
++	cpu_gdt_table[cpu][GDT_ENTRY_TSS].b &= 0xfffffdff;
++	load_TR_desc();
++}
+ 
+ #define _set_gate(gate_addr,type,dpl,addr,seg) \
+ do { \
+@@ -818,20 +949,26 @@ void set_intr_gate(unsigned int n, void 
+ 	_set_gate(idt_table+n,14,0,addr,__KERNEL_CS);
+ }
+ 
+-static void __init set_trap_gate(unsigned int n, void *addr)
++void __init set_trap_gate(unsigned int n, void *addr)
+ {
+ 	_set_gate(idt_table+n,15,0,addr,__KERNEL_CS);
+ }
+ 
+-static void __init set_system_gate(unsigned int n, void *addr)
++void __init set_system_gate(unsigned int n, void *addr)
+ {
+ 	_set_gate(idt_table+n,15,3,addr,__KERNEL_CS);
+ }
+ 
+-static void __init set_call_gate(void *a, void *addr)
++void __init set_call_gate(void *a, void *addr)
+ {
+ 	_set_gate(a,12,3,addr,__KERNEL_CS);
+ }
++#ifdef CONFIG_KGDB
++void set_intr_usr_gate(unsigned int n, void *addr)
++{
++	_set_gate(idt_table+n,14,3,addr,__KERNEL_CS);
++}
++#endif
+ 
+ static void __init set_task_gate(unsigned int n, unsigned int gdt_entry)
+ {
+@@ -850,11 +987,16 @@ void __init trap_init(void)
+ #ifdef CONFIG_X86_LOCAL_APIC
+ 	init_apic_mappings();
+ #endif
++	init_entry_mappings();
+ 
+ 	set_trap_gate(0,&divide_error);
+ 	set_intr_gate(1,&debug);
+ 	set_intr_gate(2,&nmi);
++#ifndef CONFIG_KGDB
+ 	set_system_gate(3,&int3);	/* int3-5 can be called from all */
++#else
++	set_intr_usr_gate(3,&int3);	/* int3-5 can be called from all */
++#endif
+ 	set_system_gate(4,&overflow);
+ 	set_system_gate(5,&bounds);
+ 	set_trap_gate(6,&invalid_op);
+--- linux-2.6.0/arch/i386/kernel/vm86.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/arch/i386/kernel/vm86.c	2003-12-28 23:26:36.000000000 -0800
+@@ -124,7 +124,8 @@ struct pt_regs * save_v86_state(struct k
+ 
+ 	tss = init_tss + get_cpu();
+ 	current->thread.esp0 = current->thread.saved_esp0;
+-	load_esp0(tss, current->thread.esp0);
++	current->thread.sysenter_cs = __KERNEL_CS;
++	load_virtual_esp0(tss, current);
+ 	current->thread.saved_esp0 = 0;
+ 	put_cpu();
+ 
+@@ -301,8 +302,10 @@ static void do_sys_vm86(struct kernel_vm
+ 	asm volatile("movl %%gs,%0":"=m" (tsk->thread.saved_gs));
+ 
+ 	tss = init_tss + get_cpu();
+-	tss->esp0 = tsk->thread.esp0 = (unsigned long) &info->VM86_TSS_ESP0;
+-	disable_sysenter(tss);
++	tsk->thread.esp0 = (unsigned long) &info->VM86_TSS_ESP0;
++	if (cpu_has_sep)
++		tsk->thread.sysenter_cs = 0;
++	load_virtual_esp0(tss, tsk);
+ 	put_cpu();
+ 
+ 	tsk->thread.screen_bitmap = info->screen_bitmap;
+--- linux-2.6.0/arch/i386/kernel/vmlinux.lds.S	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/kernel/vmlinux.lds.S	2003-12-28 23:26:36.000000000 -0800
+@@ -3,6 +3,9 @@
+  */
+ 
+ #include <asm-generic/vmlinux.lds.h>
++#include <linux/config.h>
++#include <asm/page.h>
++#include <asm/asm_offsets.h>
+ 	
+ OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
+ OUTPUT_ARCH(i386)
+@@ -10,7 +13,7 @@ ENTRY(startup_32)
+ jiffies = jiffies_64;
+ SECTIONS
+ {
+-  . = 0xC0000000 + 0x100000;
++  . = __PAGE_OFFSET + 0x100000;
+   /* read-only */
+   _text = .;			/* Text and read-only data */
+   .text : {
+@@ -19,6 +22,19 @@ SECTIONS
+ 	*(.gnu.warning)
+ 	} = 0x9090
+ 
++#ifdef CONFIG_X86_4G
++  . = ALIGN(PAGE_SIZE_asm);
++  __entry_tramp_start = .;
++  . = FIX_ENTRY_TRAMPOLINE_0_addr;
++  __start___entry_text = .;
++  .entry.text : AT (__entry_tramp_start) { *(.entry.text) }
++  __entry_tramp_end = __entry_tramp_start + SIZEOF(.entry.text);
++  . = __entry_tramp_end;
++  . = ALIGN(PAGE_SIZE_asm);
++#else
++  .entry.text : { *(.entry.text) }
++#endif
++
+   _etext = .;			/* End of text section */
+ 
+   . = ALIGN(16);		/* Exception table */
+@@ -34,15 +50,12 @@ SECTIONS
+ 	CONSTRUCTORS
+ 	}
+ 
+-  . = ALIGN(4096);
++  . = ALIGN(PAGE_SIZE_asm);
+   __nosave_begin = .;
+   .data_nosave : { *(.data.nosave) }
+-  . = ALIGN(4096);
++  . = ALIGN(PAGE_SIZE_asm);
+   __nosave_end = .;
+ 
+-  . = ALIGN(4096);
+-  .data.page_aligned : { *(.data.idt) }
+-
+   . = ALIGN(32);
+   .data.cacheline_aligned : { *(.data.cacheline_aligned) }
+ 
+@@ -52,7 +65,7 @@ SECTIONS
+   .data.init_task : { *(.data.init_task) }
+ 
+   /* will be freed after init */
+-  . = ALIGN(4096);		/* Init code and data */
++  . = ALIGN(PAGE_SIZE_asm);		/* Init code and data */
+   __init_begin = .;
+   .init.text : { 
+ 	_sinittext = .;
+@@ -91,7 +104,7 @@ SECTIONS
+      from .altinstructions and .eh_frame */
+   .exit.text : { *(.exit.text) }
+   .exit.data : { *(.exit.data) }
+-  . = ALIGN(4096);
++  . = ALIGN(PAGE_SIZE_asm);
+   __initramfs_start = .;
+   .init.ramfs : { *(.init.ramfs) }
+   __initramfs_end = .;
+@@ -99,10 +112,22 @@ SECTIONS
+   __per_cpu_start = .;
+   .data.percpu  : { *(.data.percpu) }
+   __per_cpu_end = .;
+-  . = ALIGN(4096);
++  . = ALIGN(PAGE_SIZE_asm);
+   __init_end = .;
+   /* freed after init ends here */
+-	
++
++  . = ALIGN(PAGE_SIZE_asm);
++  .data.page_aligned_tss : { *(.data.tss) }
++
++  . = ALIGN(PAGE_SIZE_asm);
++  .data.page_aligned_default_ldt : { *(.data.default_ldt) }
++
++  . = ALIGN(PAGE_SIZE_asm);
++  .data.page_aligned_idt : { *(.data.idt) }
++
++  . = ALIGN(PAGE_SIZE_asm);
++  .data.page_aligned_gdt : { *(.data.gdt) }
++
+   __bss_start = .;		/* BSS */
+   .bss : { *(.bss) }
+   __bss_stop = .; 
+@@ -122,4 +147,6 @@ SECTIONS
+   .stab.index 0 : { *(.stab.index) }
+   .stab.indexstr 0 : { *(.stab.indexstr) }
+   .comment 0 : { *(.comment) }
++
++
+ }
+--- linux-2.6.0/arch/i386/kernel/vsyscall.lds	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/kernel/vsyscall.lds	2003-12-28 23:26:36.000000000 -0800
+@@ -5,7 +5,7 @@
+  */
+ 
+ /* This must match <asm/fixmap.h>.  */
+-VSYSCALL_BASE = 0xffffe000;
++VSYSCALL_BASE = 0xffffd000;
+ 
+ SECTIONS
+ {
+--- linux-2.6.0/arch/i386/kernel/vsyscall-sysenter.S	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/kernel/vsyscall-sysenter.S	2003-12-28 23:26:36.000000000 -0800
+@@ -7,6 +7,11 @@
+ 	.type __kernel_vsyscall,@function
+ __kernel_vsyscall:
+ .LSTART_vsyscall:
++	cmpl $192, %eax
++	jne 1f
++	int $0x80
++	ret
++1:
+ 	push %ecx
+ .Lpush_ecx:
+ 	push %edx
+--- linux-2.6.0/arch/i386/lib/checksum.S	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/lib/checksum.S	2003-12-28 23:26:36.000000000 -0800
+@@ -280,14 +280,14 @@ unsigned int csum_partial_copy_generic (
+ 	.previous
+ 
+ .align 4
+-.globl csum_partial_copy_generic
++.globl direct_csum_partial_copy_generic
+ 				
+ #ifndef CONFIG_X86_USE_PPRO_CHECKSUM
+ 
+ #define ARGBASE 16		
+ #define FP		12
+ 		
+-csum_partial_copy_generic:
++direct_csum_partial_copy_generic:
+ 	subl  $4,%esp	
+ 	pushl %edi
+ 	pushl %esi
+@@ -422,7 +422,7 @@ DST(	movb %cl, (%edi)	)
+ 
+ #define ARGBASE 12
+ 		
+-csum_partial_copy_generic:
++direct_csum_partial_copy_generic:
+ 	pushl %ebx
+ 	pushl %edi
+ 	pushl %esi
+--- linux-2.6.0/arch/i386/lib/dec_and_lock.c	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/lib/dec_and_lock.c	2003-12-28 23:26:33.000000000 -0800
+@@ -10,6 +10,7 @@
+ #include <linux/spinlock.h>
+ #include <asm/atomic.h>
+ 
++#ifndef ATOMIC_DEC_AND_LOCK
+ int atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock)
+ {
+ 	int counter;
+@@ -38,3 +39,5 @@ slow_path:
+ 	spin_unlock(lock);
+ 	return 0;
+ }
++#endif
++
+--- linux-2.6.0/arch/i386/lib/getuser.S	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/lib/getuser.S	2003-12-28 23:26:36.000000000 -0800
+@@ -9,6 +9,7 @@
+  * return value.
+  */
+ #include <asm/thread_info.h>
++#include <asm/asm_offsets.h>
+ 
+ 
+ /*
+@@ -28,7 +29,7 @@
+ .globl __get_user_1
+ __get_user_1:
+ 	GET_THREAD_INFO(%edx)
+-	cmpl TI_ADDR_LIMIT(%edx),%eax
++	cmpl TI_addr_limit(%edx),%eax
+ 	jae bad_get_user
+ 1:	movzbl (%eax),%edx
+ 	xorl %eax,%eax
+@@ -40,7 +41,7 @@ __get_user_2:
+ 	addl $1,%eax
+ 	jc bad_get_user
+ 	GET_THREAD_INFO(%edx)
+-	cmpl TI_ADDR_LIMIT(%edx),%eax
++	cmpl TI_addr_limit(%edx),%eax
+ 	jae bad_get_user
+ 2:	movzwl -1(%eax),%edx
+ 	xorl %eax,%eax
+@@ -52,7 +53,7 @@ __get_user_4:
+ 	addl $3,%eax
+ 	jc bad_get_user
+ 	GET_THREAD_INFO(%edx)
+-	cmpl TI_ADDR_LIMIT(%edx),%eax
++	cmpl TI_addr_limit(%edx),%eax
+ 	jae bad_get_user
+ 3:	movl -3(%eax),%edx
+ 	xorl %eax,%eax
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/arch/i386/lib/kgdb_serial.c	2003-12-28 23:21:09.000000000 -0800
+@@ -0,0 +1,499 @@
++/*
++ * Serial interface GDB stub
++ *
++ * Written (hacked together) by David Grothe (dave@gcom.com)
++ * Modified to allow invokation early in boot see also
++ * kgdb.h for instructions by George Anzinger(george@mvista.com)
++ * Modified to handle debugging over ethernet by Robert Walsh
++ * <rjwalsh@durables.org> and wangdi <wangdi@clusterfs.com>, based on
++ * code by San Mehat.
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/errno.h>
++#include <linux/signal.h>
++#include <linux/sched.h>
++#include <linux/timer.h>
++#include <linux/interrupt.h>
++#include <linux/tty.h>
++#include <linux/tty_flip.h>
++#include <linux/serial.h>
++#include <linux/serial_reg.h>
++#include <linux/config.h>
++#include <linux/major.h>
++#include <linux/string.h>
++#include <linux/fcntl.h>
++#include <linux/ptrace.h>
++#include <linux/ioport.h>
++#include <linux/mm.h>
++#include <linux/init.h>
++#include <linux/highmem.h>
++#include <asm/system.h>
++#include <asm/io.h>
++#include <asm/segment.h>
++#include <asm/bitops.h>
++#include <asm/system.h>
++#include <asm/kgdb_local.h>
++#ifdef CONFIG_KGDB_USER_CONSOLE
++extern void kgdb_console_finit(void);
++#endif
++#define PRNT_off
++#define TEST_EXISTANCE
++#ifdef PRNT
++#define dbprintk(s) printk s
++#else
++#define dbprintk(s)
++#endif
++#define TEST_INTERRUPT_off
++#ifdef TEST_INTERRUPT
++#define intprintk(s) printk s
++#else
++#define intprintk(s)
++#endif
++
++#define IRQ_T(info) ((info->flags & ASYNC_SHARE_IRQ) ? SA_SHIRQ : SA_INTERRUPT)
++
++#define	GDB_BUF_SIZE	512	/* power of 2, please */
++
++static char gdb_buf[GDB_BUF_SIZE];
++static int gdb_buf_in_inx;
++static atomic_t gdb_buf_in_cnt;
++static int gdb_buf_out_inx;
++
++struct async_struct *gdb_async_info;
++static int gdb_async_irq;
++
++#define outb_px(a,b) outb_p(b,a)
++
++static void program_uart(struct async_struct *info);
++static void write_char(struct async_struct *info, int chr);
++/*
++ * Get a byte from the hardware data buffer and return it
++ */
++static int
++read_data_bfr(struct async_struct *info)
++{
++	char it = inb_p(info->port + UART_LSR);
++
++	if (it & UART_LSR_DR)
++		return (inb_p(info->port + UART_RX));
++	/*
++	 * If we have a framing error assume somebody messed with
++	 * our uart.  Reprogram it and send '-' both ways...
++	 */
++	if (it & 0xc) {
++		program_uart(info);
++		write_char(info, '-');
++		return ('-');
++	}
++	return (-1);
++
++}				/* read_data_bfr */
++
++/*
++ * Get a char if available, return -1 if nothing available.
++ * Empty the receive buffer first, then look at the interface hardware.
++
++ * Locking here is a bit of a problem.	We MUST not lock out communication
++ * if we are trying to talk to gdb about a kgdb entry.	ON the other hand
++ * we can loose chars in the console pass thru if we don't lock.  It is also
++ * possible that we could hold the lock or be waiting for it when kgdb
++ * NEEDS to talk.  Since kgdb locks down the world, it does not need locks.
++ * We do, of course have possible issues with interrupting a uart operation,
++ * but we will just depend on the uart status to help keep that straight.
++
++ */
++static spinlock_t uart_interrupt_lock = SPIN_LOCK_UNLOCKED;
++#ifdef CONFIG_SMP
++extern spinlock_t kgdb_spinlock;
++#endif
++
++static int
++read_char(struct async_struct *info)
++{
++	int chr;
++	unsigned long flags;
++	local_irq_save(flags);
++#ifdef CONFIG_SMP
++	if (!spin_is_locked(&kgdb_spinlock)) {
++		spin_lock(&uart_interrupt_lock);
++	}
++#endif
++	if (atomic_read(&gdb_buf_in_cnt) != 0) {	/* intr routine has q'd chars */
++		chr = gdb_buf[gdb_buf_out_inx++];
++		gdb_buf_out_inx &= (GDB_BUF_SIZE - 1);
++		atomic_dec(&gdb_buf_in_cnt);
++	} else {
++		chr = read_data_bfr(info);
++	}
++#ifdef CONFIG_SMP
++	if (!spin_is_locked(&kgdb_spinlock)) {
++		spin_unlock(&uart_interrupt_lock);
++	}
++#endif
++	local_irq_restore(flags);
++	return (chr);
++}
++
++/*
++ * Wait until the interface can accept a char, then write it.
++ */
++static void
++write_char(struct async_struct *info, int chr)
++{
++	while (!(inb_p(info->port + UART_LSR) & UART_LSR_THRE)) ;
++
++	outb_p(chr, info->port + UART_TX);
++
++}				/* write_char */
++
++/*
++ * Mostly we don't need a spinlock, but since the console goes
++ * thru here with interrutps on, well, we need to catch those
++ * chars.
++ */
++/*
++ * This is the receiver interrupt routine for the GDB stub.
++ * It will receive a limited number of characters of input
++ * from the gdb  host machine and save them up in a buffer.
++ *
++ * When the gdb stub routine tty_getDebugChar() is called it
++ * draws characters out of the buffer until it is empty and
++ * then reads directly from the serial port.
++ *
++ * We do not attempt to write chars from the interrupt routine
++ * since the stubs do all of that via tty_putDebugChar() which
++ * writes one byte after waiting for the interface to become
++ * ready.
++ *
++ * The debug stubs like to run with interrupts disabled since,
++ * after all, they run as a consequence of a breakpoint in
++ * the kernel.
++ *
++ * Perhaps someone who knows more about the tty driver than I
++ * care to learn can make this work for any low level serial
++ * driver.
++ */
++static irqreturn_t
++gdb_interrupt(int irq, void *dev_id, struct pt_regs *regs)
++{
++	struct async_struct *info;
++	unsigned long flags;
++
++	info = gdb_async_info;
++	if (!info || !info->tty || irq != gdb_async_irq)
++		return IRQ_NONE;
++
++	local_irq_save(flags);
++	spin_lock(&uart_interrupt_lock);
++	do {
++		int chr = read_data_bfr(info);
++		intprintk(("Debug char on int: %x hex\n", chr));
++		if (chr < 0)
++			continue;
++
++		if (chr == 3) {	/* Ctrl-C means remote interrupt */
++			BREAKPOINT;
++			continue;
++		}
++
++		if (atomic_read(&gdb_buf_in_cnt) >= GDB_BUF_SIZE) {
++			/* buffer overflow tosses early char */
++			read_char(info);
++		}
++		gdb_buf[gdb_buf_in_inx++] = chr;
++		gdb_buf_in_inx &= (GDB_BUF_SIZE - 1);
++	} while (inb_p(info->port + UART_IIR) & UART_IIR_RDI);
++	spin_unlock(&uart_interrupt_lock);
++	local_irq_restore(flags);
++	return IRQ_HANDLED;
++}				/* gdb_interrupt */
++
++/*
++ * Just a NULL routine for testing.
++ */
++void
++gdb_null(void)
++{
++}				/* gdb_null */
++
++/* These structure are filled in with values defined in asm/kgdb_local.h
++ */
++static struct serial_state state = SB_STATE;
++static struct async_struct local_info = SB_INFO;
++static int ok_to_enable_ints = 0;
++static void kgdb_enable_ints_now(void);
++
++extern char *kgdb_version;
++/*
++ * Hook an IRQ for KGDB.
++ *
++ * This routine is called from tty_putDebugChar, below.
++ */
++static int ints_disabled = 1;
++int
++gdb_hook_interrupt(struct async_struct *info, int verb)
++{
++	struct serial_state *state = info->state;
++	unsigned long flags;
++	int port;
++#ifdef TEST_EXISTANCE
++	int scratch, scratch2;
++#endif
++
++	/* The above fails if memory managment is not set up yet.
++	 * Rather than fail the set up, just keep track of the fact
++	 * and pick up the interrupt thing later.
++	 */
++	gdb_async_info = info;
++	port = gdb_async_info->port;
++	gdb_async_irq = state->irq;
++	if (verb) {
++		printk("kgdb %s : port =%x, IRQ=%d, divisor =%d\n",
++		       kgdb_version,
++		       port,
++		       gdb_async_irq, gdb_async_info->state->custom_divisor);
++	}
++	local_irq_save(flags);
++#ifdef TEST_EXISTANCE
++	/* Existance test */
++	/* Should not need all this, but just in case.... */
++
++	scratch = inb_p(port + UART_IER);
++	outb_px(port + UART_IER, 0);
++	outb_px(0xff, 0x080);
++	scratch2 = inb_p(port + UART_IER);
++	outb_px(port + UART_IER, scratch);
++	if (scratch2) {
++		printk
++		    ("gdb_hook_interrupt: Could not clear IER, not a UART!\n");
++		local_irq_restore(flags);
++		return 1;	/* We failed; there's nothing here */
++	}
++	scratch2 = inb_p(port + UART_LCR);
++	outb_px(port + UART_LCR, 0xBF);	/* set up for StarTech test */
++	outb_px(port + UART_EFR, 0);	/* EFR is the same as FCR */
++	outb_px(port + UART_LCR, 0);
++	outb_px(port + UART_FCR, UART_FCR_ENABLE_FIFO);
++	scratch = inb_p(port + UART_IIR) >> 6;
++	if (scratch == 1) {
++		printk("gdb_hook_interrupt: Undefined UART type!"
++		       "  Not a UART! \n");
++		local_irq_restore(flags);
++		return 1;
++	} else {
++		dbprintk(("gdb_hook_interrupt: UART type "
++			  "is %d where 0=16450, 2=16550 3=16550A\n", scratch));
++	}
++	scratch = inb_p(port + UART_MCR);
++	outb_px(port + UART_MCR, UART_MCR_LOOP | scratch);
++	outb_px(port + UART_MCR, UART_MCR_LOOP | 0x0A);
++	scratch2 = inb_p(port + UART_MSR) & 0xF0;
++	outb_px(port + UART_MCR, scratch);
++	if (scratch2 != 0x90) {
++		printk("gdb_hook_interrupt: "
++		       "Loop back test failed! Not a UART!\n");
++		local_irq_restore(flags);
++		return scratch2 + 1000;	/* force 0 to fail */
++	}
++#endif				/* test existance */
++	program_uart(info);
++	local_irq_restore(flags);
++
++	return (0);
++
++}				/* gdb_hook_interrupt */
++
++static void
++program_uart(struct async_struct *info)
++{
++	int port = info->port;
++
++	(void) inb_p(port + UART_RX);
++	outb_px(port + UART_IER, 0);
++
++	(void) inb_p(port + UART_RX);	/* serial driver comments say */
++	(void) inb_p(port + UART_IIR);	/* this clears the interrupt regs */
++	(void) inb_p(port + UART_MSR);
++	outb_px(port + UART_LCR, UART_LCR_WLEN8 | UART_LCR_DLAB);
++	outb_px(port + UART_DLL, info->state->custom_divisor & 0xff);	/* LS */
++	outb_px(port + UART_DLM, info->state->custom_divisor >> 8);	/* MS  */
++	outb_px(port + UART_MCR, info->MCR);
++
++	outb_px(port + UART_FCR, UART_FCR_ENABLE_FIFO | UART_FCR_TRIGGER_1 | UART_FCR_CLEAR_XMIT | UART_FCR_CLEAR_RCVR);	/* set fcr */
++	outb_px(port + UART_LCR, UART_LCR_WLEN8);	/* reset DLAB */
++	outb_px(port + UART_FCR, UART_FCR_ENABLE_FIFO | UART_FCR_TRIGGER_1);	/* set fcr */
++	if (!ints_disabled) {
++		intprintk(("KGDB: Sending %d to port %x offset %d\n",
++			   gdb_async_info->IER,
++			   (int) gdb_async_info->port, UART_IER));
++		outb_px(gdb_async_info->port + UART_IER, gdb_async_info->IER);
++	}
++	return;
++}
++
++/*
++ * tty_getDebugChar
++ *
++ * This is a GDB stub routine.	It waits for a character from the
++ * serial interface and then returns it.  If there is no serial
++ * interface connection then it returns a bogus value which will
++ * almost certainly cause the system to hang.  In the
++ */
++int kgdb_in_isr = 0;
++int kgdb_in_lsr = 0;
++extern spinlock_t kgdb_spinlock;
++
++/* Caller takes needed protections */
++
++int
++tty_getDebugChar(void)
++{
++	volatile int chr, dum, time, end_time;
++
++	dbprintk(("tty_getDebugChar(port %x): ", gdb_async_info->port));
++
++	if (gdb_async_info == NULL) {
++		gdb_hook_interrupt(&local_info, 0);
++	}
++	/*
++	 * This trick says if we wait a very long time and get
++	 * no char, return the -1 and let the upper level deal
++	 * with it.
++	 */
++	rdtsc(dum, time);
++	end_time = time + 2;
++	while (((chr = read_char(gdb_async_info)) == -1) &&
++	       (end_time - time) > 0) {
++		rdtsc(dum, time);
++	};
++	/*
++	 * This covers our butts if some other code messes with
++	 * our uart, hay, it happens :o)
++	 */
++	if (chr == -1)
++		program_uart(gdb_async_info);
++
++	dbprintk(("%c\n", chr > ' ' && chr < 0x7F ? chr : ' '));
++	return (chr);
++
++}				/* tty_getDebugChar */
++
++static int count = 3;
++static spinlock_t one_at_atime = SPIN_LOCK_UNLOCKED;
++
++static int __init
++kgdb_enable_ints(void)
++{
++	if (kgdboe) {
++		return 0;
++	}
++	if (gdb_async_info == NULL) {
++		gdb_hook_interrupt(&local_info, 1);
++	}
++	ok_to_enable_ints = 1;
++	kgdb_enable_ints_now();
++#ifdef CONFIG_KGDB_USER_CONSOLE
++	kgdb_console_finit();
++#endif
++	return 0;
++}
++
++#ifdef CONFIG_SERIAL_8250
++void shutdown_for_kgdb(struct async_struct *gdb_async_info);
++#endif
++
++#ifdef CONFIG_DISCONTIGMEM
++static inline int kgdb_mem_init_done(void)
++{
++	return highmem_start_page != NULL;
++}
++#else
++static inline int kgdb_mem_init_done(void)
++{
++	return max_mapnr != 0;
++}
++#endif
++
++static void
++kgdb_enable_ints_now(void)
++{
++	if (!spin_trylock(&one_at_atime))
++		return;
++	if (!ints_disabled)
++		goto exit;
++	if (kgdb_mem_init_done() &&
++			ints_disabled) {	/* don't try till mem init */
++#ifdef CONFIG_SERIAL_8250
++		/*
++		 * The ifdef here allows the system to be configured
++		 * without the serial driver.
++		 * Don't make it a module, however, it will steal the port
++		 */
++		shutdown_for_kgdb(gdb_async_info);
++#endif
++		ints_disabled = request_irq(gdb_async_info->state->irq,
++					    gdb_interrupt,
++					    IRQ_T(gdb_async_info),
++					    "KGDB-stub", NULL);
++		intprintk(("KGDB: request_irq returned %d\n", ints_disabled));
++	}
++	if (!ints_disabled) {
++		intprintk(("KGDB: Sending %d to port %x offset %d\n",
++			   gdb_async_info->IER,
++			   (int) gdb_async_info->port, UART_IER));
++		outb_px(gdb_async_info->port + UART_IER, gdb_async_info->IER);
++	}
++      exit:
++	spin_unlock(&one_at_atime);
++}
++
++/*
++ * tty_putDebugChar
++ *
++ * This is a GDB stub routine.	It waits until the interface is ready
++ * to transmit a char and then sends it.  If there is no serial
++ * interface connection then it simply returns to its caller, having
++ * pretended to send the char.	Caller takes needed protections.
++ */
++void
++tty_putDebugChar(int chr)
++{
++	dbprintk(("tty_putDebugChar(port %x): chr=%02x '%c', ints_on=%d\n",
++		  gdb_async_info->port,
++		  chr,
++		  chr > ' ' && chr < 0x7F ? chr : ' ', ints_disabled ? 0 : 1));
++
++	if (gdb_async_info == NULL) {
++		gdb_hook_interrupt(&local_info, 0);
++	}
++
++	write_char(gdb_async_info, chr);	/* this routine will wait */
++	count = (chr == '#') ? 0 : count + 1;
++	if ((count == 2)) {	/* try to enable after */
++		if (ints_disabled & ok_to_enable_ints)
++			kgdb_enable_ints_now();	/* try to enable after */
++
++		/* We do this a lot because, well we really want to get these
++		 * interrupts.	The serial driver will clear these bits when it
++		 * initializes the chip.  Every thing else it does is ok,
++		 * but this.
++		 */
++		if (!ints_disabled) {
++			outb_px(gdb_async_info->port + UART_IER,
++				gdb_async_info->IER);
++		}
++	}
++
++}				/* tty_putDebugChar */
++
++/*
++ * This does nothing for the serial port, since it doesn't buffer.
++ */
++
++void tty_flushDebugChar(void)
++{
++}
++
++module_init(kgdb_enable_ints);
+--- linux-2.6.0/arch/i386/lib/Makefile	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/lib/Makefile	2003-12-28 23:21:06.000000000 -0800
+@@ -9,4 +9,5 @@ lib-y = checksum.o delay.o \
+ 
+ lib-$(CONFIG_X86_USE_3DNOW) += mmx.o
+ lib-$(CONFIG_HAVE_DEC_LOCK) += dec_and_lock.o
++lib-$(CONFIG_KGDB) += kgdb_serial.o
+ lib-$(CONFIG_DEBUG_IOVIRT)  += iodebug.o
+--- linux-2.6.0/arch/i386/lib/usercopy.c	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/lib/usercopy.c	2003-12-28 23:26:36.000000000 -0800
+@@ -76,7 +76,7 @@ do {									   \
+  * and returns @count.
+  */
+ long
+-__strncpy_from_user(char *dst, const char __user *src, long count)
++__direct_strncpy_from_user(char *dst, const char __user *src, long count)
+ {
+ 	long res;
+ 	__do_strncpy_from_user(dst, src, count, res);
+@@ -102,7 +102,7 @@ __strncpy_from_user(char *dst, const cha
+  * and returns @count.
+  */
+ long
+-strncpy_from_user(char *dst, const char __user *src, long count)
++direct_strncpy_from_user(char *dst, const char __user *src, long count)
+ {
+ 	long res = -EFAULT;
+ 	if (access_ok(VERIFY_READ, src, 1))
+@@ -147,7 +147,7 @@ do {									\
+  * On success, this will be zero.
+  */
+ unsigned long
+-clear_user(void __user *to, unsigned long n)
++direct_clear_user(void __user *to, unsigned long n)
+ {
+ 	might_sleep();
+ 	if (access_ok(VERIFY_WRITE, to, n))
+@@ -167,7 +167,7 @@ clear_user(void __user *to, unsigned lon
+  * On success, this will be zero.
+  */
+ unsigned long
+-__clear_user(void __user *to, unsigned long n)
++__direct_clear_user(void __user *to, unsigned long n)
+ {
+ 	__do_clear_user(to, n);
+ 	return n;
+@@ -184,7 +184,7 @@ __clear_user(void __user *to, unsigned l
+  * On exception, returns 0.
+  * If the string is too long, returns a value greater than @n.
+  */
+-long strnlen_user(const char __user *s, long n)
++long direct_strnlen_user(const char __user *s, long n)
+ {
+ 	unsigned long mask = -__addr_ok(s);
+ 	unsigned long res, tmp;
+@@ -541,8 +541,10 @@ survive:
+ 				goto survive;
+ 			}
+ 
+-			if (retval != 1)
++			if (retval != 1) {
++				up_read(&current->mm->mmap_sem);
+ 		       		break;
++			}
+ 
+ 			maddr = kmap_atomic(pg, KM_USER0);
+ 			memcpy(maddr + offset, from, len);
+@@ -573,3 +575,4 @@ unsigned long __copy_from_user_ll(void *
+ 		n = __copy_user_zeroing_intel(to, (const void *) from, n);
+ 	return n;
+ }
++
+--- linux-2.6.0/arch/i386/mach-es7000/es7000.c	2003-06-16 22:32:20.000000000 -0700
++++ 25/arch/i386/mach-es7000/es7000.c	2003-12-28 23:21:33.000000000 -0800
+@@ -51,8 +51,6 @@ struct mip_reg		*host_reg;
+ int 			mip_port;
+ unsigned long		mip_addr, host_addr;
+ 
+-static int		es7000_plat;
+-
+ /*
+  * Parse the OEM Table
+  */
+--- linux-2.6.0/arch/i386/Makefile	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/Makefile	2003-12-28 23:21:06.000000000 -0800
+@@ -84,6 +84,9 @@ mcore-$(CONFIG_X86_ES7000)	:= mach-es700
+ # default subarch .h files
+ mflags-y += -Iinclude/asm-i386/mach-default
+ 
++mflags-$(CONFIG_KGDB) += -gdwarf-2
++mflags-$(CONFIG_KGDB_MORE) += $(shell echo $(CONFIG_KGDB_OPTIONS) | sed -e 's/"//g')
++
+ head-y := arch/i386/kernel/head.o arch/i386/kernel/init_task.o
+ 
+ libs-y 					+= arch/i386/lib/
+--- linux-2.6.0/arch/i386/math-emu/fpu_system.h	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/math-emu/fpu_system.h	2003-12-28 23:26:36.000000000 -0800
+@@ -15,6 +15,7 @@
+ #include <linux/sched.h>
+ #include <linux/kernel.h>
+ #include <linux/mm.h>
++#include <asm/atomic_kmap.h>
+ 
+ /* This sets the pointer FPU_info to point to the argument part
+    of the stack frame of math_emulate() */
+@@ -22,7 +23,7 @@
+ 
+ /* s is always from a cpu register, and the cpu does bounds checking
+  * during register load --> no further bounds checks needed */
+-#define LDT_DESCRIPTOR(s)	(((struct desc_struct *)current->mm->context.ldt)[(s) >> 3])
++#define LDT_DESCRIPTOR(s)	(((struct desc_struct *)__kmap_atomic_vaddr(KM_LDT_PAGE0))[(s) >> 3])
+ #define SEG_D_SIZE(x)		((x).b & (3 << 21))
+ #define SEG_G_BIT(x)		((x).b & (1 << 23))
+ #define SEG_GRANULARITY(x)	(((x).b & (1 << 23)) ? 4096 : 1)
+--- linux-2.6.0/arch/i386/mm/extable.c	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/mm/extable.c	2003-12-28 23:26:36.000000000 -0800
+@@ -6,6 +6,52 @@
+ #include <linux/module.h>
+ #include <linux/spinlock.h>
+ #include <asm/uaccess.h>
++#include <asm/pgtable.h>
++
++extern struct exception_table_entry __start___ex_table[];
++extern struct exception_table_entry __stop___ex_table[];
++
++/*
++ * The exception table needs to be sorted because we use the macros
++ * which put things into the exception table in a variety of sections
++ * as well as the init section and the main kernel text section.
++ */
++static inline void
++sort_ex_table(struct exception_table_entry *start,
++	      struct exception_table_entry *finish)
++{
++	struct exception_table_entry el, *p, *q;
++
++	/* insertion sort */
++	for (p = start + 1; p < finish; ++p) {
++		/* start .. p-1 is sorted */
++		if (p[0].insn < p[-1].insn) {
++			/* move element p down to its right place */
++			el = *p;
++			q = p;
++			do {
++				/* el comes before q[-1], move q[-1] up one */
++				q[0] = q[-1];
++				--q;
++			} while (q > start && el.insn < q[-1].insn);
++			*q = el;
++		}
++	}
++}
++
++void fixup_sort_exception_table(void)
++{
++	struct exception_table_entry *p;
++
++	/*
++	 * Fix up the trampoline exception addresses:
++	 */
++	for (p = __start___ex_table; p < __stop___ex_table; p++) {
++		p->insn = (unsigned long)(void *)p->insn;
++		p->fixup = (unsigned long)(void *)p->fixup;
++	}
++	sort_ex_table(__start___ex_table, __stop___ex_table);
++}
+ 
+ /* Simple binary search */
+ const struct exception_table_entry *
+@@ -15,13 +61,15 @@ search_extable(const struct exception_ta
+ {
+         while (first <= last) {
+ 		const struct exception_table_entry *mid;
+-		long diff;
+ 
+ 		mid = (last - first) / 2 + first;
+-		diff = mid->insn - value;
+-                if (diff == 0)
++		/*
++		 * careful, the distance between entries can be
++		 * larger than 2GB:
++		 */
++                if (mid->insn == value)
+                         return mid;
+-                else if (diff < 0)
++                else if (mid->insn < value)
+                         first = mid+1;
+                 else
+                         last = mid-1;
+--- linux-2.6.0/arch/i386/mm/fault.c	2003-12-17 21:20:01.000000000 -0800
++++ 25/arch/i386/mm/fault.c	2003-12-28 23:26:36.000000000 -0800
+@@ -27,6 +27,7 @@
+ #include <asm/pgalloc.h>
+ #include <asm/hardirq.h>
+ #include <asm/desc.h>
++#include <asm/tlbflush.h>
+ 
+ extern void die(const char *,struct pt_regs *,long);
+ 
+@@ -104,8 +105,17 @@ static inline unsigned long get_segment_
+ 	if (seg & (1<<2)) {
+ 		/* Must lock the LDT while reading it. */
+ 		down(&current->mm->context.sem);
++#if 1
++		/* horrible hack for 4/4 disabled kernels.
++		   I'm not quite sure what the TLB flush is good for,
++		   it's mindlessly copied from the read_ldt code */
++		__flush_tlb_global();
++		desc = kmap(current->mm->context.ldt_pages[(seg&~7)/PAGE_SIZE]);
++		desc = (void *)desc + ((seg & ~7) % PAGE_SIZE);
++#else
+ 		desc = current->mm->context.ldt;
+ 		desc = (void *)desc + (seg & ~7);
++#endif
+ 	} else {
+ 		/* Must disable preemption while reading the GDT. */
+ 		desc = (u32 *)&cpu_gdt_table[get_cpu()];
+@@ -118,6 +128,9 @@ static inline unsigned long get_segment_
+ 		 (desc[1] & 0xff000000);
+ 
+ 	if (seg & (1<<2)) { 
++#if 1
++		kunmap((void *)((unsigned long)desc & PAGE_MASK));
++#endif
+ 		up(&current->mm->context.sem);
+ 	} else
+ 		put_cpu();
+@@ -243,6 +256,19 @@ asmlinkage void do_page_fault(struct pt_
+ 	 * (error_code & 4) == 0, and that the fault was not a
+ 	 * protection error (error_code & 1) == 0.
+ 	 */
++#ifdef CONFIG_X86_4G
++	/*
++	 * On 4/4 all kernels faults are either bugs, vmalloc or prefetch
++	 */
++	if (unlikely((regs->xcs & 3) == 0)) {
++		if (error_code & 3)
++			goto bad_area_nosemaphore;
++
++		/* If it's vm86 fall through */
++		if (!(regs->eflags & VM_MASK))
++			goto vmalloc_fault;
++	}
++#else
+ 	if (unlikely(address >= TASK_SIZE)) { 
+ 		if (!(error_code & 5))
+ 			goto vmalloc_fault;
+@@ -252,6 +278,7 @@ asmlinkage void do_page_fault(struct pt_
+ 		 */
+ 		goto bad_area_nosemaphore;
+ 	} 
++#endif
+ 
+ 	mm = tsk->mm;
+ 
+@@ -403,6 +430,12 @@ no_context:
+  * Oops. The kernel tried to access some bad page. We'll have to
+  * terminate things with extreme prejudice.
+  */
++#ifdef CONFIG_KGDB
++        if (!user_mode(regs)){
++                kgdb_handle_exception(14,SIGBUS, error_code, regs);
++                return;
++        }
++#endif
+ 
+ 	bust_spinlocks(1);
+ 
+--- linux-2.6.0/arch/i386/mm/highmem.c	2003-06-14 12:18:22.000000000 -0700
++++ 25/arch/i386/mm/highmem.c	2003-12-28 23:22:58.000000000 -0800
+@@ -30,6 +30,7 @@ void *kmap_atomic(struct page *page, enu
+ 	enum fixed_addresses idx;
+ 	unsigned long vaddr;
+ 
++	/* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */
+ 	inc_preempt_count();
+ 	if (page < highmem_start_page)
+ 		return page_address(page);
+@@ -54,6 +55,7 @@ void kunmap_atomic(void *kvaddr, enum km
+ 
+ 	if (vaddr < FIXADDR_START) { // FIXME
+ 		dec_preempt_count();
++		preempt_check_resched();
+ 		return;
+ 	}
+ 
+@@ -69,6 +71,7 @@ void kunmap_atomic(void *kvaddr, enum km
+ #endif
+ 
+ 	dec_preempt_count();
++	preempt_check_resched();
+ }
+ 
+ struct page *kmap_atomic_to_page(void *ptr)
+--- linux-2.6.0/arch/i386/mm/hugetlbpage.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/arch/i386/mm/hugetlbpage.c	2003-12-28 23:22:12.000000000 -0800
+@@ -534,7 +534,7 @@ int is_hugepage_mem_enough(size_t size)
+  * this far.
+  */
+ static struct page *hugetlb_nopage(struct vm_area_struct *vma,
+-				unsigned long address, int unused)
++				unsigned long address, int *unused)
+ {
+ 	BUG();
+ 	return NULL;
+--- linux-2.6.0/arch/i386/mm/init.c	2003-11-09 16:45:04.000000000 -0800
++++ 25/arch/i386/mm/init.c	2003-12-28 23:26:36.000000000 -0800
+@@ -26,6 +26,7 @@
+ #include <linux/bootmem.h>
+ #include <linux/slab.h>
+ #include <linux/proc_fs.h>
++#include <linux/efi.h>
+ 
+ #include <asm/processor.h>
+ #include <asm/system.h>
+@@ -39,125 +40,13 @@
+ #include <asm/tlb.h>
+ #include <asm/tlbflush.h>
+ #include <asm/sections.h>
++#include <asm/desc.h>
+ 
+ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
+ unsigned long highstart_pfn, highend_pfn;
+ 
+ static int do_test_wp_bit(void);
+ 
+-/*
+- * Creates a middle page table and puts a pointer to it in the
+- * given global directory entry. This only returns the gd entry
+- * in non-PAE compilation mode, since the middle layer is folded.
+- */
+-static pmd_t * __init one_md_table_init(pgd_t *pgd)
+-{
+-	pmd_t *pmd_table;
+-		
+-#ifdef CONFIG_X86_PAE
+-	pmd_table = (pmd_t *) alloc_bootmem_low_pages(PAGE_SIZE);
+-	set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
+-	if (pmd_table != pmd_offset(pgd, 0)) 
+-		BUG();
+-#else
+-	pmd_table = pmd_offset(pgd, 0);
+-#endif
+-
+-	return pmd_table;
+-}
+-
+-/*
+- * Create a page table and place a pointer to it in a middle page
+- * directory entry.
+- */
+-static pte_t * __init one_page_table_init(pmd_t *pmd)
+-{
+-	if (pmd_none(*pmd)) {
+-		pte_t *page_table = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE);
+-		set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
+-		if (page_table != pte_offset_kernel(pmd, 0))
+-			BUG();	
+-
+-		return page_table;
+-	}
+-	
+-	return pte_offset_kernel(pmd, 0);
+-}
+-
+-/*
+- * This function initializes a certain range of kernel virtual memory 
+- * with new bootmem page tables, everywhere page tables are missing in
+- * the given range.
+- */
+-
+-/*
+- * NOTE: The pagetables are allocated contiguous on the physical space 
+- * so we can cache the place of the first one and move around without 
+- * checking the pgd every time.
+- */
+-static void __init page_table_range_init (unsigned long start, unsigned long end, pgd_t *pgd_base)
+-{
+-	pgd_t *pgd;
+-	pmd_t *pmd;
+-	int pgd_idx, pmd_idx;
+-	unsigned long vaddr;
+-
+-	vaddr = start;
+-	pgd_idx = pgd_index(vaddr);
+-	pmd_idx = pmd_index(vaddr);
+-	pgd = pgd_base + pgd_idx;
+-
+-	for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
+-		if (pgd_none(*pgd)) 
+-			one_md_table_init(pgd);
+-
+-		pmd = pmd_offset(pgd, vaddr);
+-		for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end); pmd++, pmd_idx++) {
+-			if (pmd_none(*pmd)) 
+-				one_page_table_init(pmd);
+-
+-			vaddr += PMD_SIZE;
+-		}
+-		pmd_idx = 0;
+-	}
+-}
+-
+-/*
+- * This maps the physical memory to kernel virtual address space, a total 
+- * of max_low_pfn pages, by creating page tables starting from address 
+- * PAGE_OFFSET.
+- */
+-static void __init kernel_physical_mapping_init(pgd_t *pgd_base)
+-{
+-	unsigned long pfn;
+-	pgd_t *pgd;
+-	pmd_t *pmd;
+-	pte_t *pte;
+-	int pgd_idx, pmd_idx, pte_ofs;
+-
+-	pgd_idx = pgd_index(PAGE_OFFSET);
+-	pgd = pgd_base + pgd_idx;
+-	pfn = 0;
+-
+-	for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
+-		pmd = one_md_table_init(pgd);
+-		if (pfn >= max_low_pfn)
+-			continue;
+-		for (pmd_idx = 0; pmd_idx < PTRS_PER_PMD && pfn < max_low_pfn; pmd++, pmd_idx++) {
+-			/* Map with big pages if possible, otherwise create normal page tables. */
+-			if (cpu_has_pse) {
+-				set_pmd(pmd, pfn_pmd(pfn, PAGE_KERNEL_LARGE));
+-				pfn += PTRS_PER_PTE;
+-			} else {
+-				pte = one_page_table_init(pmd);
+-
+-				for (pte_ofs = 0; pte_ofs < PTRS_PER_PTE && pfn < max_low_pfn; pte++, pfn++, pte_ofs++)
+-					set_pte(pte, pfn_pte(pfn, PAGE_KERNEL));
+-			}
+-		}
+-	}	
+-}
+-
+ static inline int page_kills_ppro(unsigned long pagenr)
+ {
+ 	if (pagenr >= 0x70000 && pagenr <= 0x7003F)
+@@ -165,12 +54,30 @@ static inline int page_kills_ppro(unsign
+ 	return 0;
+ }
+ 
++extern int is_available_memory(efi_memory_desc_t *);
++
+ static inline int page_is_ram(unsigned long pagenr)
+ {
+ 	int i;
++	unsigned long addr, end;
++
++	if (efi_enabled) {
++		efi_memory_desc_t *md;
++
++		for (i = 0; i < memmap.nr_map; i++) {
++			md = &memmap.map[i];
++			if (!is_available_memory(md))
++				continue;
++			addr = (md->phys_addr+PAGE_SIZE-1) >> PAGE_SHIFT;
++			end = (md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT)) >> PAGE_SHIFT;
++
++			if ((pagenr >= addr) && (pagenr < end))
++				return 1;
++		}
++		return 0;
++	}
+ 
+ 	for (i = 0; i < e820.nr_map; i++) {
+-		unsigned long addr, end;
+ 
+ 		if (e820.map[i].type != E820_RAM)	/* not usable memory */
+ 			continue;
+@@ -187,11 +94,8 @@ static inline int page_is_ram(unsigned l
+ 	return 0;
+ }
+ 
+-#ifdef CONFIG_HIGHMEM
+ pte_t *kmap_pte;
+-pgprot_t kmap_prot;
+ 
+-EXPORT_SYMBOL(kmap_prot);
+ EXPORT_SYMBOL(kmap_pte);
+ 
+ #define kmap_get_fixmap_pte(vaddr)					\
+@@ -199,29 +103,7 @@ EXPORT_SYMBOL(kmap_pte);
+ 
+ void __init kmap_init(void)
+ {
+-	unsigned long kmap_vstart;
+-
+-	/* cache the first kmap pte */
+-	kmap_vstart = __fix_to_virt(FIX_KMAP_BEGIN);
+-	kmap_pte = kmap_get_fixmap_pte(kmap_vstart);
+-
+-	kmap_prot = PAGE_KERNEL;
+-}
+-
+-void __init permanent_kmaps_init(pgd_t *pgd_base)
+-{
+-	pgd_t *pgd;
+-	pmd_t *pmd;
+-	pte_t *pte;
+-	unsigned long vaddr;
+-
+-	vaddr = PKMAP_BASE;
+-	page_table_range_init(vaddr, vaddr + PAGE_SIZE*LAST_PKMAP, pgd_base);
+-
+-	pgd = swapper_pg_dir + pgd_index(vaddr);
+-	pmd = pmd_offset(pgd, vaddr);
+-	pte = pte_offset_kernel(pmd, vaddr);
+-	pkmap_page_table = pte;	
++	kmap_pte = kmap_get_fixmap_pte(__fix_to_virt(FIX_KMAP_BEGIN));
+ }
+ 
+ void __init one_highpage_init(struct page *page, int pfn, int bad_ppro)
+@@ -236,6 +118,8 @@ void __init one_highpage_init(struct pag
+ 		SetPageReserved(page);
+ }
+ 
++#ifdef CONFIG_HIGHMEM
++
+ #ifndef CONFIG_DISCONTIGMEM
+ void __init set_highmem_pages_init(int bad_ppro) 
+ {
+@@ -247,12 +131,9 @@ void __init set_highmem_pages_init(int b
+ #else
+ extern void set_highmem_pages_init(int);
+ #endif /* !CONFIG_DISCONTIGMEM */
+-
+ #else
+-#define kmap_init() do { } while (0)
+-#define permanent_kmaps_init(pgd_base) do { } while (0)
+-#define set_highmem_pages_init(bad_ppro) do { } while (0)
+-#endif /* CONFIG_HIGHMEM */
++# define set_highmem_pages_init(bad_ppro) do { } while (0)
++#endif
+ 
+ unsigned long __PAGE_KERNEL = _PAGE_KERNEL;
+ 
+@@ -262,30 +143,125 @@ unsigned long __PAGE_KERNEL = _PAGE_KERN
+ extern void __init remap_numa_kva(void);
+ #endif
+ 
+-static void __init pagetable_init (void)
++static __init void prepare_pagetables(pgd_t *pgd_base, unsigned long address)
++{
++	pgd_t *pgd;
++	pmd_t *pmd;
++	pte_t *pte;
++
++	pgd = pgd_base + pgd_index(address);
++	pmd = pmd_offset(pgd, address);
++	if (!pmd_present(*pmd)) {
++		pte = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE);
++		set_pmd(pmd, __pmd(_PAGE_TABLE + __pa(pte)));
++	}
++}
++
++static void __init fixrange_init (unsigned long start, unsigned long end, pgd_t *pgd_base)
++{
++	unsigned long vaddr;
++
++	for (vaddr = start; vaddr != end; vaddr += PAGE_SIZE)
++		prepare_pagetables(pgd_base, vaddr);
++}
++
++void setup_identity_mappings(pgd_t *pgd_base, unsigned long start, unsigned long end)
+ {
+ 	unsigned long vaddr;
+-	pgd_t *pgd_base = swapper_pg_dir;
++	pgd_t *pgd;
++	int i, j, k;
++	pmd_t *pmd;
++	pte_t *pte, *pte_base;
++
++	pgd = pgd_base;
++
++	for (i = 0; i < PTRS_PER_PGD; pgd++, i++) {
++		vaddr = i*PGDIR_SIZE;
++		if (end && (vaddr >= end))
++			break;
++		pmd = pmd_offset(pgd, 0);
++		for (j = 0; j < PTRS_PER_PMD; pmd++, j++) {
++			vaddr = i*PGDIR_SIZE + j*PMD_SIZE;
++			if (end && (vaddr >= end))
++				break;
++			if (vaddr < start)
++				continue;
++			if (cpu_has_pse) {
++				unsigned long __pe;
++
++				set_in_cr4(X86_CR4_PSE);
++				boot_cpu_data.wp_works_ok = 1;
++				__pe = _KERNPG_TABLE + _PAGE_PSE + vaddr - start;
++				/* Make it "global" too if supported */
++				if (cpu_has_pge) {
++					set_in_cr4(X86_CR4_PGE);
++#if !defined(CONFIG_X86_SWITCH_PAGETABLES)
++					__pe += _PAGE_GLOBAL;
++					__PAGE_KERNEL |= _PAGE_GLOBAL;
++#endif
++				}
++				set_pmd(pmd, __pmd(__pe));
++				continue;
++			}
++			if (!pmd_present(*pmd))
++				pte_base = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE);
++			else
++				pte_base = (pte_t *) page_address(pmd_page(*pmd));
++			pte = pte_base;
++			for (k = 0; k < PTRS_PER_PTE; pte++, k++) {
++				vaddr = i*PGDIR_SIZE + j*PMD_SIZE + k*PAGE_SIZE;
++				if (end && (vaddr >= end))
++					break;
++				if (vaddr < start)
++					continue;
++				*pte = mk_pte_phys(vaddr-start, PAGE_KERNEL);
++			}
++			set_pmd(pmd, __pmd(_KERNPG_TABLE + __pa(pte_base)));
++		}
++	}
++}
+ 
++static void __init pagetable_init (void)
++{
++	unsigned long vaddr, end;
++	pgd_t *pgd_base;
+ #ifdef CONFIG_X86_PAE
+ 	int i;
+-	/* Init entries of the first-level page table to the zero page */
+-	for (i = 0; i < PTRS_PER_PGD; i++)
+-		set_pgd(pgd_base + i, __pgd(__pa(empty_zero_page) | _PAGE_PRESENT));
+ #endif
+ 
+-	/* Enable PSE if available */
+-	if (cpu_has_pse) {
+-		set_in_cr4(X86_CR4_PSE);
+-	}
++	/*
++	 * This can be zero as well - no problem, in that case we exit
++	 * the loops anyway due to the PTRS_PER_* conditions.
++	 */
++	end = (unsigned long)__va(max_low_pfn*PAGE_SIZE);
+ 
+-	/* Enable PGE if available */
+-	if (cpu_has_pge) {
+-		set_in_cr4(X86_CR4_PGE);
+-		__PAGE_KERNEL |= _PAGE_GLOBAL;
++	pgd_base = swapper_pg_dir;
++#ifdef CONFIG_X86_PAE
++	/*
++	 * It causes too many problems if there's no proper pmd set up
++	 * for all 4 entries of the PGD - so we allocate all of them.
++	 * PAE systems will not miss this extra 4-8K anyway ...
++	 */
++	for (i = 0; i < PTRS_PER_PGD; i++) {
++		pmd_t *pmd = (pmd_t *) alloc_bootmem_low_pages(PAGE_SIZE);
++		set_pgd(pgd_base + i, __pgd(__pa(pmd) + 0x1));
+ 	}
++#endif
++	/*
++	 * Set up lowmem-sized identity mappings at PAGE_OFFSET:
++	 */
++	setup_identity_mappings(pgd_base, PAGE_OFFSET, end);
+ 
+-	kernel_physical_mapping_init(pgd_base);
++	/*
++	 * Add flat-mode identity-mappings - SMP needs it when
++	 * starting up on an AP from real-mode. (In the non-PAE
++	 * case we already have these mappings through head.S.)
++	 * All user-space mappings are explicitly cleared after
++	 * SMP startup.
++	 */
++#if CONFIG_SMP && CONFIG_X86_PAE
++	setup_identity_mappings(pgd_base, 0, 16*1024*1024);
++#endif
+ 	remap_numa_kva();
+ 
+ 	/*
+@@ -293,38 +269,64 @@ static void __init pagetable_init (void)
+ 	 * created - mappings will be set by set_fixmap():
+ 	 */
+ 	vaddr = __fix_to_virt(__end_of_fixed_addresses - 1) & PMD_MASK;
+-	page_table_range_init(vaddr, 0, pgd_base);
++	fixrange_init(vaddr, 0, pgd_base);
+ 
+-	permanent_kmaps_init(pgd_base);
++#if CONFIG_HIGHMEM
++	{
++		pgd_t *pgd;
++		pmd_t *pmd;
++		pte_t *pte;
+ 
+-#ifdef CONFIG_X86_PAE
+-	/*
+-	 * Add low memory identity-mappings - SMP needs it when
+-	 * starting up on an AP from real-mode. In the non-PAE
+-	 * case we already have these mappings through head.S.
+-	 * All user-space mappings are explicitly cleared after
+-	 * SMP startup.
+-	 */
+-	pgd_base[0] = pgd_base[USER_PTRS_PER_PGD];
++		/*
++		 * Permanent kmaps:
++		 */
++		vaddr = PKMAP_BASE;
++		fixrange_init(vaddr, vaddr + PAGE_SIZE*LAST_PKMAP, pgd_base);
++
++		pgd = swapper_pg_dir + pgd_index(vaddr);
++		pmd = pmd_offset(pgd, vaddr);
++		pte = pte_offset_kernel(pmd, vaddr);
++		pkmap_page_table = pte;
++	}
+ #endif
+ }
+ 
+-void zap_low_mappings (void)
++/*
++ * Clear kernel pagetables in a PMD_SIZE-aligned range.
++ */
++static void clear_mappings(pgd_t *pgd_base, unsigned long start, unsigned long end)
+ {
+-	int i;
++	unsigned long vaddr;
++	pgd_t *pgd;
++	pmd_t *pmd;
++	int i, j;
++
++	pgd = pgd_base;
++
++	for (i = 0; i < PTRS_PER_PGD; pgd++, i++) {
++		vaddr = i*PGDIR_SIZE;
++		if (end && (vaddr >= end))
++			break;
++		pmd = pmd_offset(pgd, 0);
++		for (j = 0; j < PTRS_PER_PMD; pmd++, j++) {
++			vaddr = i*PGDIR_SIZE + j*PMD_SIZE;
++			if (end && (vaddr >= end))
++				break;
++			if (vaddr < start)
++				continue;
++			pmd_clear(pmd);
++		}
++	}
++	flush_tlb_all();
++}
++
++void __init zap_low_mappings(void)
++{
++	printk("zapping low mappings.\n");
+ 	/*
+ 	 * Zap initial low-memory mappings.
+-	 *
+-	 * Note that "pgd_clear()" doesn't do it for
+-	 * us, because pgd_clear() is a no-op on i386.
+ 	 */
+-	for (i = 0; i < USER_PTRS_PER_PGD; i++)
+-#ifdef CONFIG_X86_PAE
+-		set_pgd(swapper_pg_dir+i, __pgd(1 + __pa(empty_zero_page)));
+-#else
+-		set_pgd(swapper_pg_dir+i, __pgd(0));
+-#endif
+-	flush_tlb_all();
++	clear_mappings(swapper_pg_dir, 0, 16*1024*1024);
+ }
+ 
+ #ifndef CONFIG_DISCONTIGMEM
+@@ -388,12 +390,6 @@ void __init paging_init(void)
+ 
+ void __init test_wp_bit(void)
+ {
+-	if (cpu_has_pse) {
+-		/* Ok, all PSE-capable CPUs are definitely handling the WP bit right. */
+-		boot_cpu_data.wp_works_ok = 1;
+-		return;
+-	}
+-
+ 	printk("Checking if this processor honours the WP bit even in supervisor mode... ");
+ 
+ 	/* Any page-aligned address will do, the test is non-destructive */
+@@ -428,6 +424,7 @@ extern void set_max_mapnr_init(void);
+ #endif /* !CONFIG_DISCONTIGMEM */
+ 
+ static struct kcore_list kcore_mem, kcore_vmalloc; 
++extern void fixup_sort_exception_table(void);
+ 
+ void __init mem_init(void)
+ {
+@@ -436,6 +433,8 @@ void __init mem_init(void)
+ 	int tmp;
+ 	int bad_ppro;
+ 
++	fixup_sort_exception_table();
++
+ #ifndef CONFIG_DISCONTIGMEM
+ 	if (!mem_map)
+ 		BUG();
+@@ -511,13 +510,18 @@ void __init mem_init(void)
+ #ifndef CONFIG_SMP
+ 	zap_low_mappings();
+ #endif
++	entry_trampoline_setup();
++	default_ldt_page = virt_to_page(default_ldt);
++	load_LDT(&init_mm.context);
+ }
+ 
+-kmem_cache_t *pgd_cache;
+-kmem_cache_t *pmd_cache;
++kmem_cache_t *pgd_cache, *pmd_cache, *kpmd_cache;
+ 
+ void __init pgtable_cache_init(void)
+ {
++	void (*ctor)(void *, kmem_cache_t *, unsigned long);
++	void (*dtor)(void *, kmem_cache_t *, unsigned long);
++
+ 	if (PTRS_PER_PMD > 1) {
+ 		pmd_cache = kmem_cache_create("pmd",
+ 					PTRS_PER_PMD*sizeof(pmd_t),
+@@ -527,13 +531,36 @@ void __init pgtable_cache_init(void)
+ 					NULL);
+ 		if (!pmd_cache)
+ 			panic("pgtable_cache_init(): cannot create pmd cache");
++
++		if (TASK_SIZE > PAGE_OFFSET) {
++			kpmd_cache = kmem_cache_create("kpmd",
++					PTRS_PER_PMD*sizeof(pmd_t),
++					0,
++					SLAB_HWCACHE_ALIGN | SLAB_MUST_HWCACHE_ALIGN,
++					kpmd_ctor,
++					NULL);
++			if (!kpmd_cache)
++				panic("pgtable_cache_init(): "
++						"cannot create kpmd cache");
++		}
+ 	}
++
++	if (PTRS_PER_PMD == 1 || TASK_SIZE <= PAGE_OFFSET)
++		ctor = pgd_ctor;
++	else
++		ctor = NULL;
++
++	if (PTRS_PER_PMD == 1 && TASK_SIZE <= PAGE_OFFSET)
++		dtor = pgd_dtor;
++	else
++		dtor = NULL;
++
+ 	pgd_cache = kmem_cache_create("pgd",
+ 				PTRS_PER_PGD*sizeof(pgd_t),
+ 				0,
+ 				SLAB_HWCACHE_ALIGN | SLAB_MUST_HWCACHE_ALIGN,
+-				pgd_ctor,
+-				PTRS_PER_PMD == 1 ? pgd_dtor : NULL);
++				ctor,
++				dtor);
+ 	if (!pgd_cache)
+ 		panic("pgtable_cache_init(): Cannot create pgd cache");
+ }
+--- linux-2.6.0/arch/i386/mm/pgtable.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/arch/i386/mm/pgtable.c	2003-12-28 23:26:36.000000000 -0800
+@@ -21,6 +21,7 @@
+ #include <asm/e820.h>
+ #include <asm/tlb.h>
+ #include <asm/tlbflush.h>
++#include <asm/atomic_kmap.h>
+ 
+ void show_mem(void)
+ {
+@@ -157,11 +158,20 @@ void pmd_ctor(void *pmd, kmem_cache_t *c
+ 	memset(pmd, 0, PTRS_PER_PMD*sizeof(pmd_t));
+ }
+ 
++void kpmd_ctor(void *__pmd, kmem_cache_t *cache, unsigned long flags)
++{
++	pmd_t *kpmd, *pmd;
++	kpmd = pmd_offset(&swapper_pg_dir[PTRS_PER_PGD-1],
++				(PTRS_PER_PMD - NR_SHARED_PMDS)*PMD_SIZE);
++	pmd = (pmd_t *)__pmd + (PTRS_PER_PMD - NR_SHARED_PMDS);
++
++	memset(__pmd, 0, (PTRS_PER_PMD - NR_SHARED_PMDS)*sizeof(pmd_t));
++	memcpy(pmd, kpmd, NR_SHARED_PMDS*sizeof(pmd_t));
++}
++
+ /*
+- * List of all pgd's needed for non-PAE so it can invalidate entries
+- * in both cached and uncached pgd's; not needed for PAE since the
+- * kernel pmd is shared. If PAE were not to share the pmd a similar
+- * tactic would be needed. This is essentially codepath-based locking
++ * List of all pgd's needed so it can invalidate entries in both cached
++ * and uncached pgd's. This is essentially codepath-based locking
+  * against pageattr.c; it is the unique case in which a valid change
+  * of kernel pagetables can't be lazily synchronized by vmalloc faults.
+  * vmalloc faults work because attached pagetables are never freed.
+@@ -170,30 +180,60 @@ void pmd_ctor(void *pmd, kmem_cache_t *c
+  * could be used. The locking scheme was chosen on the basis of
+  * manfred's recommendations and having no core impact whatsoever.
+  * -- wli
++ *
++ * The entire issue goes away when XKVA is configured.
+  */
+ spinlock_t pgd_lock = SPIN_LOCK_UNLOCKED;
+ LIST_HEAD(pgd_list);
+ 
+-void pgd_ctor(void *pgd, kmem_cache_t *cache, unsigned long unused)
++/*
++ * This is not that hard to figure out.
++ * (a) PTRS_PER_PMD == 1 means non-PAE.
++ * (b) PTRS_PER_PMD > 1 means PAE.
++ * (c) TASK_SIZE > PAGE_OFFSET means XKVA.
++ * (d) TASK_SIZE <= PAGE_OFFSET means non-XKVA.
++ *
++ * Do *NOT* back out the preconstruction like the patch I'm cleaning
++ * up after this very instant did, or at all, for that matter.
++ * This is never called when PTRS_PER_PMD > 1 && TASK_SIZE > PAGE_OFFSET.
++ * -- wli
++ */
++void pgd_ctor(void *__pgd, kmem_cache_t *cache, unsigned long unused)
+ {
++	pgd_t *pgd = (pgd_t *)__pgd;
+ 	unsigned long flags;
+ 
+-	if (PTRS_PER_PMD == 1)
+-		spin_lock_irqsave(&pgd_lock, flags);
++	if (PTRS_PER_PMD == 1) {
++		if (TASK_SIZE <= PAGE_OFFSET)
++			spin_lock_irqsave(&pgd_lock, flags);
++		else
++ 			memcpy(&pgd[PTRS_PER_PGD - NR_SHARED_PMDS],
++ 				&swapper_pg_dir[PTRS_PER_PGD - NR_SHARED_PMDS],
++ 				NR_SHARED_PMDS * sizeof(pgd_t));
++	}
+ 
+-	memcpy((pgd_t *)pgd + USER_PTRS_PER_PGD,
+-			swapper_pg_dir + USER_PTRS_PER_PGD,
+-			(PTRS_PER_PGD - USER_PTRS_PER_PGD) * sizeof(pgd_t));
++	if (TASK_SIZE <= PAGE_OFFSET)
++ 		memcpy(pgd + USER_PTRS_PER_PGD,
++ 			swapper_pg_dir + USER_PTRS_PER_PGD,
++ 			(PTRS_PER_PGD - USER_PTRS_PER_PGD) * sizeof(pgd_t));
+ 
+ 	if (PTRS_PER_PMD > 1)
+ 		return;
+ 
+-	list_add(&virt_to_page(pgd)->lru, &pgd_list);
+-	spin_unlock_irqrestore(&pgd_lock, flags);
+-	memset(pgd, 0, USER_PTRS_PER_PGD*sizeof(pgd_t));
++	if (TASK_SIZE > PAGE_OFFSET)
++		memset(pgd, 0, (PTRS_PER_PGD - NR_SHARED_PMDS)*sizeof(pgd_t));
++	else {
++		list_add(&virt_to_page(pgd)->lru, &pgd_list);
++		spin_unlock_irqrestore(&pgd_lock, flags);
++		memset(pgd, 0, USER_PTRS_PER_PGD*sizeof(pgd_t));
++	}
+ }
+ 
+-/* never called when PTRS_PER_PMD > 1 */
++/*
++ * Never called when PTRS_PER_PMD > 1 || TASK_SIZE > PAGE_OFFSET
++ * for with PAE we would list_del() multiple times, and for non-PAE
++ * with XKVA all the AGP pgd shootdown code is unnecessary.
++ */
+ void pgd_dtor(void *pgd, kmem_cache_t *cache, unsigned long unused)
+ {
+ 	unsigned long flags; /* can be called from interrupt context */
+@@ -203,6 +243,12 @@ void pgd_dtor(void *pgd, kmem_cache_t *c
+ 	spin_unlock_irqrestore(&pgd_lock, flags);
+ }
+ 
++/*
++ * See the comments above pgd_ctor() wrt. preconstruction.
++ * Do *NOT* memcpy() here. If you do, you back out important
++ * anti- cache pollution code.
++ *
++ */
+ pgd_t *pgd_alloc(struct mm_struct *mm)
+ {
+ 	int i;
+@@ -211,15 +257,33 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+ 	if (PTRS_PER_PMD == 1 || !pgd)
+ 		return pgd;
+ 
++	/*
++	 * In the 4G userspace case alias the top 16 MB virtual
++	 * memory range into the user mappings as well (these
++	 * include the trampoline and CPU data structures).
++	 */
+ 	for (i = 0; i < USER_PTRS_PER_PGD; ++i) {
+-		pmd_t *pmd = kmem_cache_alloc(pmd_cache, GFP_KERNEL);
++		kmem_cache_t *cache;
++		pmd_t *pmd;
++
++		if (TASK_SIZE > PAGE_OFFSET && i == USER_PTRS_PER_PGD - 1)
++			cache = kpmd_cache;
++		else
++			cache = pmd_cache;
++
++		pmd = kmem_cache_alloc(cache, GFP_KERNEL);
+ 		if (!pmd)
+ 			goto out_oom;
+ 		set_pgd(&pgd[i], __pgd(1 + __pa((u64)((u32)pmd))));
+ 	}
+-	return pgd;
+ 
++	return pgd;
+ out_oom:
++	/*
++	 * we don't have to handle the kpmd_cache here, since it's the
++	 * last allocation, and has either nothing to free or when it
++	 * succeeds the whole operation succeeds.
++	 */
+ 	for (i--; i >= 0; i--)
+ 		kmem_cache_free(pmd_cache, (void *)__va(pgd_val(pgd[i])-1));
+ 	kmem_cache_free(pgd_cache, pgd);
+@@ -230,10 +294,29 @@ void pgd_free(pgd_t *pgd)
+ {
+ 	int i;
+ 
+-	/* in the PAE case user pgd entries are overwritten before usage */
+-	if (PTRS_PER_PMD > 1)
+-		for (i = 0; i < USER_PTRS_PER_PGD; ++i)
+-			kmem_cache_free(pmd_cache, (void *)__va(pgd_val(pgd[i])-1));
+ 	/* in the non-PAE case, clear_page_tables() clears user pgd entries */
++	if (PTRS_PER_PMD == 1)
++		goto out_free;
++
++	/* in the PAE case user pgd entries are overwritten before usage */
++	for (i = 0; i < USER_PTRS_PER_PGD; ++i) {
++		kmem_cache_t *cache;
++		pmd_t *pmd = __va(pgd_val(pgd[i]) - 1);
++
++		/*
++		 * only userspace pmd's are cleared for us
++		 * by mm/memory.c; it's a slab cache invariant
++		 * that we must separate the kernel pmd slab
++		 * all times, else we'll have bad pmd's.
++		 */
++		if (TASK_SIZE > PAGE_OFFSET && i == USER_PTRS_PER_PGD - 1)
++			cache = kpmd_cache;
++		else
++			cache = pmd_cache;
++
++		kmem_cache_free(cache, pmd);
++	}
++out_free:
+ 	kmem_cache_free(pgd_cache, pgd);
+ }
++
+--- linux-2.6.0/arch/i386/pci/acpi.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/arch/i386/pci/acpi.c	2003-12-28 23:21:33.000000000 -0800
+@@ -18,7 +18,7 @@ static int __init pci_acpi_init(void)
+ 	if (pcibios_scanned)
+ 		return 0;
+ 
+-	if (!(pci_probe & PCI_NO_ACPI_ROUTING)) {
++	if (!acpi_noirq) {
+ 		if (!acpi_pci_irq_init()) {
+ 			printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n");
+ 			printk(KERN_INFO "PCI: if you experience problems, try using option 'pci=noacpi' or even 'acpi=off'\n");
+@@ -31,15 +31,4 @@ static int __init pci_acpi_init(void)
+ 
+ 	return 0;
+ }
+-
+-/*
+- * pci_disable_acpi()
+- * act like pci=noacpi seen on command line
+- * called by DMI blacklist code
+- */
+-__init void pci_disable_acpi(void)
+-{
+-        pci_probe |= PCI_NO_ACPI_ROUTING;
+-}
+-
+ subsys_initcall(pci_acpi_init);
+--- linux-2.6.0/arch/i386/pci/common.c	2003-09-08 13:58:55.000000000 -0700
++++ 25/arch/i386/pci/common.c	2003-12-28 23:21:33.000000000 -0800
+@@ -9,6 +9,7 @@
+ #include <linux/ioport.h>
+ #include <linux/init.h>
+ 
++#include <asm/acpi.h>
+ #include <asm/segment.h>
+ #include <asm/io.h>
+ #include <asm/smp.h>
+@@ -197,12 +198,10 @@ char * __devinit  pcibios_setup(char *st
+ 		return NULL;
+ 	}
+ #endif
+-#ifdef CONFIG_ACPI_PCI
+ 	else if (!strcmp(str, "noacpi")) {
+-		pci_probe |= PCI_NO_ACPI_ROUTING;
++		acpi_noirq_set();
+ 		return NULL;
+ 	}
+-#endif
+ #ifndef CONFIG_X86_VISWS
+ 	else if (!strcmp(str, "usepirqmask")) {
+ 		pci_probe |= PCI_USE_PIRQ_MASK;
+--- linux-2.6.0/arch/i386/pci/fixup.c	2003-08-08 22:55:10.000000000 -0700
++++ 25/arch/i386/pci/fixup.c	2003-12-28 23:26:29.000000000 -0800
+@@ -6,27 +6,52 @@
+ #include <linux/init.h>
+ #include "pci.h"
+ 
++static void __devinit i450nx_scan_bus(struct pci_bus *parent, u8 busnr)
++{
++	struct list_head *tmp;
++
++	pci_scan_bus(busnr, &pci_root_ops, NULL);
++
++	list_for_each(tmp, &parent->children) {
++		u8 childnr;
++		struct pci_dev *dev = pci_dev_b(tmp);
++
++		if (dev->hdr_type != PCI_HEADER_TYPE_BRIDGE)
++			continue;
++		pci_read_config_byte(dev, PCI_PRIMARY_BUS, &childnr);
++		if (childnr != busnr)
++			continue;
++
++		printk(KERN_WARNING "PCI: Removing fake PCI bridge %s\n",
++				pci_name(dev));
++		pci_remove_bus_device(dev);
++		break;
++	}
++}
+ 
+ static void __devinit pci_fixup_i450nx(struct pci_dev *d)
+ {
+ 	/*
+ 	 * i450NX -- Find and scan all secondary buses on all PXB's.
++	 * Some manufacturers added fake PCI-PCI bridges that also point
++	 * to the peer busses.  Look for them and delete them.
+ 	 */
+ 	int pxb, reg;
+ 	u8 busno, suba, subb;
+ 
+-	printk(KERN_WARNING "PCI: Searching for i450NX host bridges on %s\n", pci_name(d));
++	printk(KERN_NOTICE "PCI: Searching for i450NX host bridges on %s\n", pci_name(d));
+ 	reg = 0xd0;
+-	for(pxb=0; pxb<2; pxb++) {
++	for (pxb = 0; pxb < 2; pxb++) {
+ 		pci_read_config_byte(d, reg++, &busno);
+ 		pci_read_config_byte(d, reg++, &suba);
+ 		pci_read_config_byte(d, reg++, &subb);
+ 		DBG("i450NX PXB %d: %02x/%02x/%02x\n", pxb, busno, suba, subb);
+ 		if (busno)
+-			pci_scan_bus(busno, &pci_root_ops, NULL);	/* Bus A */
++			i450nx_scan_bus(d->bus, busno);		/* Bus A */
+ 		if (suba < subb)
+-			pci_scan_bus(suba+1, &pci_root_ops, NULL);	/* Bus B */
++			i450nx_scan_bus(d->bus, suba+1);	/* Bus B */
+ 	}
++
+ 	pcibios_last_bus = -1;
+ }
+ 
+@@ -187,6 +212,22 @@ static void __devinit pci_fixup_transpar
+ 		dev->transparent = 1;
+ }
+ 
++/*
++ * Halt Disconnect and Stop Grant Disconnect (bit 4 at offset 0x6F)
++ * must be disabled when APIC is used (or lockups will happen).
++ */
++static void __devinit pci_fixup_nforce2_disconnect(struct pci_dev *d)
++{
++	u8 t;
++
++	pci_read_config_byte(d, 0x6F, &t);
++	if (t & 0x10) {
++		printk(KERN_INFO "PCI: disabling nForce2 Halt Disconnect"
++				 " and Stop Grant Disconnect\n");
++		pci_write_config_byte(d, 0x6F, (t & 0xef));
++	}
++}
++
+ struct pci_fixup pcibios_fixups[] = {
+ 	{ PCI_FIXUP_HEADER,	PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82451NX,	pci_fixup_i450nx },
+ 	{ PCI_FIXUP_HEADER,	PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82454GX,	pci_fixup_i450gx },
+@@ -205,5 +246,6 @@ struct pci_fixup pcibios_fixups[] = {
+ 	{ PCI_FIXUP_HEADER,	PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_8367_0,	pci_fixup_via_northbridge_bug },
+ 	{ PCI_FIXUP_HEADER,	PCI_VENDOR_ID_NCR,	PCI_DEVICE_ID_NCR_53C810,	pci_fixup_ncr53c810 },
+ 	{ PCI_FIXUP_HEADER,	PCI_VENDOR_ID_INTEL,	PCI_ANY_ID,			pci_fixup_transparent_bridge },
++	{ PCI_FIXUP_HEADER,	PCI_VENDOR_ID_NVIDIA,	PCI_DEVICE_ID_NVIDIA_NFORCE2,	pci_fixup_nforce2_disconnect },
+ 	{ 0 }
+ };
+--- linux-2.6.0/arch/i386/pci/irq.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/arch/i386/pci/irq.c	2003-12-28 23:22:07.000000000 -0800
+@@ -455,7 +455,10 @@ static __init int intel_router_probe(str
+ #if 0 /* Let's see what chip this is supposed to be ... */
+ 	/* We must not touch 440GX even if we have tables. 440GX has
+ 	   different IRQ routing weirdness */
+-	if (pci_find_device(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82440GX, NULL))
++	if (	pci_find_device(PCI_VENDOR_ID_INTEL,
++				PCI_DEVICE_ID_INTEL_82443GX_0, NULL) ||
++		pci_find_device(PCI_VENDOR_ID_INTEL,
++				PCI_DEVICE_ID_INTEL_82443GX_2, NULL))
+ 		return 0;
+ #endif
+ 
+@@ -695,9 +698,10 @@ static struct irq_info *pirq_get_info(st
+ 	return NULL;
+ }
+ 
+-static irqreturn_t pcibios_test_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
++static irqreturn_t
++pcibios_test_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
+ {
+-	return IRQ_NONE;
++	return IRQ_HANDLED;
+ }
+ 
+ static int pcibios_lookup_irq(struct pci_dev *dev, int assign)
+@@ -813,8 +817,10 @@ static int pcibios_lookup_irq(struct pci
+ 		    	if ( dev2->irq && dev2->irq != irq && \
+ 			(!(pci_probe & PCI_USE_PIRQ_MASK) || \
+ 			((1 << dev2->irq) & mask)) ) {
++#ifndef CONFIG_PCI_USE_VECTOR
+ 		    		printk(KERN_INFO "IRQ routing conflict for %s, have irq %d, want irq %d\n",
+ 				       pci_name(dev2), dev2->irq, irq);
++#endif
+ 		    		continue;
+ 		    	}
+ 			dev2->irq = irq;
+@@ -878,6 +884,10 @@ static void __init pcibios_fixup_irqs(vo
+ 							bridge->bus->number, PCI_SLOT(bridge->devfn), pin, irq);
+ 				}
+ 				if (irq >= 0) {
++					if (use_pci_vector() &&
++						!platform_legacy_irq(irq))
++						irq = IO_APIC_VECTOR(irq);
++
+ 					printk(KERN_INFO "PCI->APIC IRQ transform: (B%d,I%d,P%d) -> %d\n",
+ 						dev->bus->number, PCI_SLOT(dev->devfn), pin, irq);
+ 					dev->irq = irq;
+--- linux-2.6.0/arch/i386/pci/pci.h	2003-06-22 12:04:43.000000000 -0700
++++ 25/arch/i386/pci/pci.h	2003-12-28 23:21:33.000000000 -0800
+@@ -22,7 +22,6 @@
+ #define PCI_ASSIGN_ROMS		0x1000
+ #define PCI_BIOS_IRQ_SCAN	0x2000
+ #define PCI_ASSIGN_ALL_BUSSES	0x4000
+-#define PCI_NO_ACPI_ROUTING	0x8000
+ 
+ extern unsigned int pci_probe;
+ 
+--- linux-2.6.0/arch/ia64/defconfig	2003-11-09 16:45:05.000000000 -0800
++++ 25/arch/ia64/defconfig	2003-12-28 23:21:45.000000000 -0800
+@@ -48,7 +48,6 @@ CONFIG_IA64_HP_ZX1=y
+ CONFIG_IA64_PAGE_SIZE_16KB=y
+ # CONFIG_IA64_PAGE_SIZE_64KB is not set
+ CONFIG_ACPI=y
+-CONFIG_ACPI_EFI=y
+ CONFIG_ACPI_INTERPRETER=y
+ CONFIG_ACPI_KERNEL_CONFIG=y
+ CONFIG_IA64_L1_CACHE_SHIFT=7
+@@ -76,6 +75,7 @@ CONFIG_IA32_SUPPORT=y
+ CONFIG_COMPAT=y
+ CONFIG_PERFMON=y
+ CONFIG_IA64_PALINFO=y
++CONFIG_EFI=y
+ CONFIG_EFI_VARS=y
+ CONFIG_NR_CPUS=16
+ CONFIG_BINFMT_ELF=y
+--- linux-2.6.0/arch/ia64/ia32/binfmt_elf32.c	2003-10-25 14:45:44.000000000 -0700
++++ 25/arch/ia64/ia32/binfmt_elf32.c	2003-12-28 23:22:12.000000000 -0800
+@@ -60,10 +60,12 @@ extern struct page *ia32_shared_page[];
+ extern unsigned long *ia32_gdt;
+ 
+ struct page *
+-ia32_install_shared_page (struct vm_area_struct *vma, unsigned long address, int no_share)
++ia32_install_shared_page (struct vm_area_struct *vma, unsigned long address, int *type)
+ {
+ 	struct page *pg = ia32_shared_page[smp_processor_id()];
+ 	get_page(pg);
++	if (type)
++		*type = VM_FAULT_MINOR;
+ 	return pg;
+ }
+ 
+--- linux-2.6.0/arch/ia64/Kconfig	2003-11-09 16:45:05.000000000 -0800
++++ 25/arch/ia64/Kconfig	2003-12-28 23:26:35.000000000 -0800
+@@ -164,11 +164,6 @@ config ACPI
+ 	  The ACPI Sourceforge project may also be of interest:
+ 	  <http://sf.net/projects/acpi/>
+ 
+-config ACPI_EFI
+-	bool
+-	depends on !IA64_HP_SIM
+-	default y
+-
+ config ACPI_INTERPRETER
+ 	bool
+ 	depends on !IA64_HP_SIM
+@@ -404,6 +399,11 @@ config IA64_SALINFO
+ 	  To use this option, you have to ensure that the "/proc file system
+ 	  support" (CONFIG_PROC_FS) is enabled, too.
+ 
++config EFI
++	bool
++	depends on !IA64_HP_SIM
++	default y
++
+ config EFI_VARS
+ 	tristate "/proc/efi/vars support"
+ 	help
+@@ -670,6 +670,13 @@ config DEBUG_INFO
+ 	  Say Y here only if you plan to use gdb to debug the kernel.
+ 	  If you don't debug the kernel, you can say N.
+ 	  
++config LOCKMETER
++       bool "Kernel lock metering"
++       depends on SMP
++       help
++         Say Y to enable kernel lock metering, which adds overhead to SMP locks,
++         but allows you to see various statistics using the lockstat command.
++
+ endmenu
+ 
+ source "security/Kconfig"
+--- linux-2.6.0/arch/ia64/kernel/irq.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/arch/ia64/kernel/irq.c	2003-12-28 23:22:10.000000000 -0800
+@@ -160,18 +160,20 @@ atomic_t irq_mis_count;
+ 
+ int show_interrupts(struct seq_file *p, void *v)
+ {
+-	int i, j;
++	int j, i = *(loff_t *) v;
+ 	struct irqaction * action;
+ 	irq_desc_t *idesc;
+ 	unsigned long flags;
+ 
+-	seq_puts(p, "           ");
+-	for (j=0; j<NR_CPUS; j++)
+-		if (cpu_online(j))
+-			seq_printf(p, "CPU%d       ",j);
+-	seq_putc(p, '\n');
++	if (i == 0) {
++		seq_puts(p, "           ");
++		for (j=0; j<NR_CPUS; j++)
++			if (cpu_online(j))
++				seq_printf(p, "CPU%d       ",j);
++		seq_putc(p, '\n');
++	}
+ 
+-	for (i = 0 ; i < NR_IRQS ; i++) {
++	if (i < NR_IRQS) {
+ 		idesc = irq_descp(i);
+ 		spin_lock_irqsave(&idesc->lock, flags);
+ 		action = idesc->action;
+@@ -194,25 +196,26 @@ int show_interrupts(struct seq_file *p, 
+ 		seq_putc(p, '\n');
+ skip:
+ 		spin_unlock_irqrestore(&idesc->lock, flags);
+-	}
+-	seq_puts(p, "NMI: ");
+-	for (j = 0; j < NR_CPUS; j++)
+-		if (cpu_online(j))
+-			seq_printf(p, "%10u ", nmi_count(j));
+-	seq_putc(p, '\n');
++	} else if (i == NR_IRQS) {
++		seq_puts(p, "NMI: ");
++		for (j = 0; j < NR_CPUS; j++)
++			if (cpu_online(j))
++				seq_printf(p, "%10u ", nmi_count(j));
++		seq_putc(p, '\n');
+ #ifdef CONFIG_X86_LOCAL_APIC
+-	seq_puts(p, "LOC: ");
+-	for (j = 0; j < NR_CPUS; j++)
+-		if (cpu_online(j))
+-			seq_printf(p, "%10u ", irq_stat[j].apic_timer_irqs);
+-	seq_putc(p, '\n');
++		seq_puts(p, "LOC: ");
++		for (j = 0; j < NR_CPUS; j++)
++			if (cpu_online(j))
++				seq_printf(p, "%10u ", irq_stat[j].apic_timer_irqs);
++		seq_putc(p, '\n');
+ #endif
+-	seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
++		seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
+ #ifdef CONFIG_X86_IO_APIC
+ #ifdef APIC_MISMATCH_DEBUG
+-	seq_printf(p, "MIS: %10u\n", atomic_read(&irq_mis_count));
++		seq_printf(p, "MIS: %10u\n", atomic_read(&irq_mis_count));
+ #endif
+ #endif
++	}
+ 	return 0;
+ }
+ 
+@@ -910,47 +913,6 @@ int setup_irq(unsigned int irq, struct i
+ static struct proc_dir_entry * root_irq_dir;
+ static struct proc_dir_entry * irq_dir [NR_IRQS];
+ 
+-#define HEX_DIGITS (2*sizeof(cpumask_t))
+-
+-static unsigned int parse_hex_value(const char *buffer,
+-		unsigned long count, cpumask_t *ret)
+-{
+-	unsigned char hexnum[HEX_DIGITS];
+-	cpumask_t value = CPU_MASK_NONE;
+-	unsigned long i;
+-
+-	if (!count)
+-		return -EINVAL;
+-	if (count > HEX_DIGITS)
+-		count = HEX_DIGITS;
+-	if (copy_from_user(hexnum, buffer, count))
+-		return -EFAULT;
+-
+-	/*
+-	 * Parse the first 8 characters as a hex string, any non-hex char
+-	 * is end-of-string. '00e1', 'e1', '00E1', 'E1' are all the same.
+-	 */
+-	for (i = 0; i < count; i++) {
+-		unsigned int c = hexnum[i];
+-		int k;
+-
+-		switch (c) {
+-			case '0' ... '9': c -= '0'; break;
+-			case 'a' ... 'f': c -= 'a'-10; break;
+-			case 'A' ... 'F': c -= 'A'-10; break;
+-		default:
+-			goto out;
+-		}
+-		cpus_shift_left(value, value, 4);
+-		for (k = 0; k < 4; ++k)
+-			if (test_bit(k, (unsigned long *)&c))
+-				cpu_set(k, value);
+-	}
+-out:
+-	*ret = value;
+-	return 0;
+-}
+-
+ #ifdef CONFIG_SMP
+ 
+ static struct proc_dir_entry * smp_affinity_entry [NR_IRQS];
+@@ -974,20 +936,10 @@ void set_irq_affinity_info (unsigned int
+ static int irq_affinity_read_proc (char *page, char **start, off_t off,
+ 			int count, int *eof, void *data)
+ {
+-	int k, len;
+-	cpumask_t tmp = irq_affinity[(long)data];
+-
+-	if (count < HEX_DIGITS+1)
++	int len = cpumask_snprintf(page, count, irq_affinity[(long)data]);
++	if (count - len < 2)
+ 		return -EINVAL;
+-
+-	len = 0;
+-	for (k = 0; k < sizeof(cpumask_t)/sizeof(u16); ++k) {
+-		int j = sprintf(page, "%04hx", (u16)cpus_coerce(tmp));
+-		len += j;
+-		page += j;
+-		cpus_shift_right(tmp, tmp, 16);
+-	}
+-	len += sprintf(page, "\n");
++	len += sprintf(page + len, "\n");
+ 	return len;
+ }
+ 
+@@ -1011,7 +963,7 @@ static int irq_affinity_write_proc (stru
+ 	} else
+ 		redir = 0;
+ 
+-	err = parse_hex_value(buf, count, &new_value);
++	err = cpumask_parse(buf, count - (buf-buffer), new_value);
+ 	if (err)
+ 		return err;
+ 
+@@ -1033,19 +985,10 @@ static int irq_affinity_write_proc (stru
+ static int prof_cpu_mask_read_proc (char *page, char **start, off_t off,
+ 			int count, int *eof, void *data)
+ {
+-	cpumask_t *mask = (cpumask_t *)data;
+-	int k, len = 0;
+-
+-	if (count < HEX_DIGITS+1)
++	int len = cpumask_snprintf(page, count, *(cpumask_t *)data);
++	if (count - len < 2)
+ 		return -EINVAL;
+-
+-	for (k = 0; k < sizeof(cpumask_t)/sizeof(u16); ++k) {
+-		int j = sprintf(page, "%04hx", (u16)cpus_coerce(*mask));
+-		len += j;
+-		page += j;
+-		cpus_shift_right(*mask, *mask, 16);
+-	}
+-	len += sprintf(page, "\n");
++	len += sprintf(page + len, "\n");
+ 	return len;
+ }
+ 
+@@ -1056,7 +999,7 @@ static int prof_cpu_mask_write_proc (str
+ 	unsigned long full_count = count, err;
+ 	cpumask_t new_value;
+ 
+-	err = parse_hex_value(buffer, count, &new_value);
++	err = cpumask_parse(buffer, count, new_value);
+ 	if (err)
+ 		return err;
+ 
+--- linux-2.6.0/arch/ia64/kernel/perfmon.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/arch/ia64/kernel/perfmon.c	2003-12-28 23:21:18.000000000 -0800
+@@ -2157,6 +2157,7 @@ pfm_alloc_fd(struct file **cfile)
+ 
+ 	d_add(file->f_dentry, inode);
+ 	file->f_vfsmnt = mntget(pfmfs_mnt);
++	file->f_mapping = inode->i_mapping;
+ 
+ 	file->f_op    = &pfm_file_ops;
+ 	file->f_mode  = FMODE_READ;
+--- linux-2.6.0/arch/ia64/kernel/setup.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/arch/ia64/kernel/setup.c	2003-12-28 23:21:45.000000000 -0800
+@@ -54,6 +54,10 @@
+ # error "struct cpuinfo_ia64 too big!"
+ #endif
+ 
++#ifdef CONFIG_EFI
++int efi_enabled = 1;
++#endif
++
+ #ifdef CONFIG_SMP
+ unsigned long __per_cpu_offset[NR_CPUS];
+ #endif
+--- linux-2.6.0/arch/ia64/mm/hugetlbpage.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/arch/ia64/mm/hugetlbpage.c	2003-12-28 23:22:12.000000000 -0800
+@@ -518,7 +518,7 @@ int is_hugepage_mem_enough(size_t size)
+ 	return 1;
+ }
+ 
+-static struct page *hugetlb_nopage(struct vm_area_struct * area, unsigned long address, int unused)
++static struct page *hugetlb_nopage(struct vm_area_struct * area, unsigned long address, int *unused)
+ {
+ 	BUG();
+ 	return NULL;
+--- linux-2.6.0/arch/m68k/Kconfig	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/m68k/Kconfig	2003-12-28 23:23:06.000000000 -0800
+@@ -1025,7 +1025,7 @@ config WATCHDOG
+ 	  implementation entirely in software (which can sometimes fail to
+ 	  reboot the machine) and a driver for hardware watchdog boards, which
+ 	  are more robust and can also keep track of the temperature inside
+-	  your computer. For details, read <file:Documentation/watchdog.txt>
++	  your computer. For details, read <file:Documentation/watchdog/watchdog.txt>
+ 	  in the kernel source.
+ 
+ 	  The watchdog is usually used together with the watchdog daemon
+--- linux-2.6.0/arch/m68k/kernel/ints.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/m68k/kernel/ints.c	2003-12-28 23:22:06.000000000 -0800
+@@ -253,19 +253,18 @@ asmlinkage void process_int(unsigned lon
+ 
+ int show_interrupts(struct seq_file *p, void *v)
+ {
+-	int i;
++	int i = *(loff_t *) v;
+ 
+ 	/* autovector interrupts */
+ 	if (mach_default_handler) {
+-		for (i = 0; i < SYS_IRQS; i++) {
++		if (i < SYS_IRQS) {
+ 			seq_printf(p, "auto %2d: %10u ", i,
+ 			               i ? kstat_cpu(0).irqs[i] : num_spurious);
+ 			seq_puts(p, "  ");
+ 			seq_printf(p, "%s\n", irq_list[i].devname);
+ 		}
+-	}
+-
+-	mach_get_irq_list(p, v);
++	} else if (i == SYS_IRQS)
++		mach_get_irq_list(p, v);
+ 	return 0;
+ }
+ 
+--- linux-2.6.0/arch/m68knommu/platform/5307/ints.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/m68knommu/platform/5307/ints.c	2003-12-28 23:22:06.000000000 -0800
+@@ -254,9 +254,9 @@ asmlinkage void process_int(unsigned lon
+ 
+ int show_interrupts(struct seq_file *p, void *v)
+ {
+-	int i;
++	int i = *(loff_t *) v;
+ 
+-	for (i = 0; i < NR_IRQS; i++) {
++	if (i < NR_IRQS) {
+ 		if (irq_list[i].flags & IRQ_FLG_STD)
+ 			continue;
+ 
+@@ -269,7 +269,7 @@ int show_interrupts(struct seq_file *p, 
+ 		seq_printf(p, "%s\n", irq_list[i].devname);
+ 	}
+ 
+-	if (mach_get_irq_list)
++	if (i == NR_IRQS && mach_get_irq_list)
+ 		mach_get_irq_list(p, v);
+ 	return(0);
+ }
+--- linux-2.6.0/arch/m68knommu/platform/68328/ints.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/m68knommu/platform/68328/ints.c	2003-12-28 23:22:06.000000000 -0800
+@@ -198,9 +198,9 @@ EXPORT_SYMBOL(free_irq);
+ 
+ int show_interrupts(struct seq_file *p, void *v)
+ {
+-	int i;
++	int i = *(loff_t *) v;
+ 
+-	for (i = 0; i < NR_IRQS; i++) {
++	if (i < NR_IRQS) {
+ 		if (int_irq_list[i].flags & IRQ_FLG_STD)
+ 			continue;
+ 
+@@ -211,7 +211,8 @@ int show_interrupts(struct seq_file *p, 
+ 			seq_printf(p, "  ");
+ 		seq_printf(p, "%s\n", int_irq_list[i].devname);
+ 	}
+-	seq_printf(p, "   : %10u   spurious\n", num_spurious);
++	if (i == NR_IRQS)
++		seq_printf(p, "   : %10u   spurious\n", num_spurious);
+ 
+ 	return 0;
+ }
+--- linux-2.6.0/arch/m68knommu/platform/68360/ints.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/m68knommu/platform/68360/ints.c	2003-12-28 23:22:06.000000000 -0800
+@@ -278,9 +278,9 @@ void M68360_disable_irq(unsigned int irq
+ 
+ int show_interrupts(struct seq_file *p, void *v)
+ {
+-	int i;
++	int i = *(loff_t *) v;
+ 
+-	for (i = 0; i < NR_IRQS; i++) {
++	if (i < NR_IRQS) {
+ 		if (int_irq_list[i].flags & IRQ_FLG_STD)
+ 			continue;
+ 
+@@ -291,7 +291,8 @@ int show_interrupts(struct seq_file *p, 
+ 			seq_printf(p, "  ");
+ 		seq_printf(p, "%s\n", int_irq_list[i].devname);
+ 	}
+-	seq_printf(p, "   : %10u   spurious\n", num_spurious);
++	if (i == NR_IRQS)
++		seq_printf(p, "   : %10u   spurious\n", num_spurious);
+ 
+ 	return 0;
+ }
+--- linux-2.6.0/arch/mips/Kconfig	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/mips/Kconfig	2003-12-28 23:23:06.000000000 -0800
+@@ -1261,8 +1261,8 @@ config SOUND
+ 	  You want to read the Sound-HOWTO, available from
+ 	  <http://www.tldp.org/docs.html#howto>. General information about
+ 	  the modular sound system is contained in the files
+-	  <file:Documentation/sound/Introduction>.  The file
+-	  <file:Documentation/sound/README.OSS> contains some slightly
++	  <file:Documentation/sound/oss/Introduction>.  The file
++	  <file:Documentation/sound/oss/README.OSS> contains some slightly
+ 	  outdated but still useful information as well.
+ 
+ 	  If you have a PnP sound card and you want to configure it at boot
+@@ -1270,7 +1270,7 @@ config SOUND
+ 	  <http://www.roestock.demon.co.uk/isapnptools/>), then you need to
+ 	  compile the sound card support as a module and load that module
+ 	  after the PnP configuration is finished. To do this, choose M here
+-	  and read <file:Documentation/sound/README.modules>; the module
++	  and read <file:Documentation/sound/oss/README.modules>; the module
+ 	  will be called soundcore.
+ 
+ 	  I'm told that even without a sound card, you can make your computer
+--- linux-2.6.0/arch/mips/kernel/irq.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/mips/kernel/irq.c	2003-12-28 23:22:10.000000000 -0800
+@@ -85,17 +85,19 @@ atomic_t irq_err_count;
+ 
+ int show_interrupts(struct seq_file *p, void *v)
+ {
+-	int i, j;
++	int i = *(loff_t *) v, j;
+ 	struct irqaction * action;
+ 	unsigned long flags;
+ 
+-	seq_printf(p, "           ");
+-	for (j=0; j<NR_CPUS; j++)
+-		if (cpu_online(j))
+-			seq_printf(p, "CPU%d       ",j);
+-	seq_putc(p, '\n');
++	if (i == 0) {
++		seq_printf(p, "           ");
++		for (j=0; j<NR_CPUS; j++)
++			if (cpu_online(j))
++				seq_printf(p, "CPU%d       ",j);
++		seq_putc(p, '\n');
++	}
+ 
+-	for (i = 0 ; i < NR_IRQS ; i++) {
++	if (i < NR_IRQS) {
+ 		spin_lock_irqsave(&irq_desc[i].lock, flags);
+ 		action = irq_desc[i].action;
+ 		if (!action) 
+@@ -117,10 +119,10 @@ int show_interrupts(struct seq_file *p, 
+ 		seq_putc(p, '\n');
+ skip:
+ 		spin_unlock_irqrestore(&irq_desc[i].lock, flags);
++	} else if (i == NR_IRQS) {
++		seq_putc(p, '\n');
++		seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
+ 	}
+-	seq_putc(p, '\n');
+-	seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
+-
+ 	return 0;
+ }
+ 
+@@ -825,45 +827,6 @@ EXPORT_SYMBOL(probe_irq_mask);
+ static struct proc_dir_entry * root_irq_dir;
+ static struct proc_dir_entry * irq_dir [NR_IRQS];
+ 
+-#define HEX_DIGITS 8
+-
+-static unsigned int parse_hex_value (const char *buffer,
+-		unsigned long count, unsigned long *ret)
+-{
+-	unsigned char hexnum [HEX_DIGITS];
+-	unsigned long value;
+-	int i;
+-
+-	if (!count)
+-		return -EINVAL;
+-	if (count > HEX_DIGITS)
+-		count = HEX_DIGITS;
+-	if (copy_from_user(hexnum, buffer, count))
+-		return -EFAULT;
+-
+-	/*
+-	 * Parse the first 8 characters as a hex string, any non-hex char
+-	 * is end-of-string. '00e1', 'e1', '00E1', 'E1' are all the same.
+-	 */
+-	value = 0;
+-
+-	for (i = 0; i < count; i++) {
+-		unsigned int c = hexnum[i];
+-
+-		switch (c) {
+-			case '0' ... '9': c -= '0'; break;
+-			case 'a' ... 'f': c -= 'a'-10; break;
+-			case 'A' ... 'F': c -= 'A'-10; break;
+-		default:
+-			goto out;
+-		}
+-		value = (value << 4) | c;
+-	}
+-out:
+-	*ret = value;
+-	return 0;
+-}
+-
+ #ifdef CONFIG_SMP
+ 
+ static struct proc_dir_entry * smp_affinity_entry [NR_IRQS];
+@@ -872,18 +835,10 @@ static cpumask_t irq_affinity [NR_IRQS] 
+ static int irq_affinity_read_proc (char *page, char **start, off_t off,
+ 			int count, int *eof, void *data)
+ {
+-	int len, k;
+-	cpumask_t tmp = irq_affinity[(long)data];
+-
+-	if (count < HEX_DIGITS+1)
++	int len = cpumask_snprintf(page, count, irq_affinity[(long)data]);
++	if (count - len < 2)
+ 		return -EINVAL;
+-	for (k = 0; k < sizeof(cpumask_t)/sizeof(u16); ++k) {
+-		int j = sprintf(page, "%04hx", cpus_coerce(tmp));
+-		len += j;
+-		page += j;
+-		cpus_shift_right(tmp, tmp, 16);
+-	}
+-	len += sprintf(page, "\n");
++	len += sprintf(page + len, "\n");
+ 	return len;
+ }
+ 
+@@ -896,7 +851,7 @@ static int irq_affinity_write_proc (stru
+ 	if (!irq_desc[irq].handler->set_affinity)
+ 		return -EIO;
+ 
+-	err = parse_hex_value(buffer, count, &new_value);
++	err = cpumask_parse(buffer, count, new_value);
+ 
+ 	/*
+ 	 * Do not allow disabling IRQs completely - it's a too easy
+@@ -918,20 +873,10 @@ static int irq_affinity_write_proc (stru
+ static int prof_cpu_mask_read_proc (char *page, char **start, off_t off,
+ 			int count, int *eof, void *data)
+ {
+-	int len, k;
+-	cpumask_t *mask = (cpumask_t *)data, tmp;
+-
+-	if (count < HEX_DIGITS+1)
++	int len = cpumask_snprintf(page, count, *(cpumask_t *)data);
++	if (count - len < 2)
+ 		return -EINVAL;
+-	tmp = *mask;
+-
+-	for (k = 0; k < sizeof(cpumask_t)/sizeof(u16); ++k) {
+-		int j = sprintf(page, "%04hx", cpus_coerce(tmp));
+-		len += j;
+-		page += j;
+-		cpus_shift_right(tmp, tmp, 16);
+-	}
+-	len += sprintf(page, "\n");
++	len += sprintf(page + len, "\n");
+ 	return len;
+ }
+ 
+@@ -941,7 +886,7 @@ static int prof_cpu_mask_write_proc (str
+ 	cpumask_t *mask = (cpumask_t *)data, new_value;
+ 	unsigned long full_count = count, err;
+ 
+-	err = parse_hex_value(buffer, count, &new_value);
++	err = cpumask_parse(buffer, count, new_value);
+ 	if (err)
+ 		return err;
+ 
+--- linux-2.6.0/arch/mips/mm/highmem.c	2003-07-02 14:53:13.000000000 -0700
++++ 25/arch/mips/mm/highmem.c	2003-12-28 23:22:58.000000000 -0800
+@@ -40,6 +40,7 @@ void *kmap_atomic(struct page *page, enu
+ 	enum fixed_addresses idx;
+ 	unsigned long vaddr;
+ 
++	/* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */
+ 	inc_preempt_count();
+ 	if (page < highmem_start_page)
+ 		return page_address(page);
+@@ -64,6 +65,7 @@ void kunmap_atomic(void *kvaddr, enum km
+ 
+ 	if (vaddr < FIXADDR_START) { // FIXME
+ 		dec_preempt_count();
++		preempt_check_resched();
+ 		return;
+ 	}
+ 
+@@ -79,6 +81,7 @@ void kunmap_atomic(void *kvaddr, enum km
+ #endif
+ 
+ 	dec_preempt_count();
++	preempt_check_resched();
+ }
+ 
+ struct page *kmap_atomic_to_page(void *ptr)
+--- linux-2.6.0/arch/parisc/kernel/irq.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/parisc/kernel/irq.c	2003-12-28 23:22:06.000000000 -0800
+@@ -215,29 +215,30 @@ EXPORT_SYMBOL(enable_irq);
+ int show_interrupts(struct seq_file *p, void *v)
+ {
+ #ifdef CONFIG_PROC_FS
+-	unsigned int regnr = 0;
++	unsigned int regnr = *(loff_t *) v, i;
+ 
+-	seq_puts(p, "     ");
++	if (regnr == 0) {
++		seq_puts(p, "     ");
+ #ifdef CONFIG_SMP
+-	for (regnr = 0; regnr < NR_CPUS; regnr++)
++		for (i = 0; i < NR_CPUS; i++)
+ #endif
+-		seq_printf(p, "      CPU%02d ", regnr);
++			seq_printf(p, "      CPU%02d ", i);
+ 
+ #ifdef PARISC_IRQ_CR16_COUNTS
+-	seq_printf(p, "[min/avg/max] (CPU cycle counts)");
++		seq_printf(p, "[min/avg/max] (CPU cycle counts)");
+ #endif
+-	seq_putc(p, '\n');
++		seq_putc(p, '\n');
++	}
+ 
+ 	/* We don't need *irqsave lock variants since this is
+ 	** only allowed to change while in the base context.
+ 	*/
+ 	spin_lock(&irq_lock);
+-	for (regnr = 0; regnr < NR_IRQ_REGS; regnr++) {
+-	    unsigned int i;
++	if (regnr < NR_IRQ_REGS) {
+ 	    struct irq_region *region = irq_region[regnr];
+ 
+             if (!region || !region->action)
+-		continue;
++		    goto skip;
+ 
+ 	    for (i = 0; i <= MAX_CPU_IRQ; i++) {
+ 		struct irqaction *action = &region->action[i];
+@@ -286,9 +287,9 @@ int show_interrupts(struct seq_file *p, 
+ 		seq_putc(p, '\n');
+ 	    }
+ 	}
++  skip:
+ 	spin_unlock(&irq_lock);
+ 
+-	seq_putc(p, '\n');
+ #endif	/* CONFIG_PROC_FS */
+ 	return 0;
+ }
+--- linux-2.6.0/arch/parisc/kernel/sys_parisc.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/arch/parisc/kernel/sys_parisc.c	2003-12-28 23:21:20.000000000 -0800
+@@ -93,17 +93,13 @@ static unsigned long get_shared_area(str
+ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
+ 		unsigned long len, unsigned long pgoff, unsigned long flags)
+ {
+-	struct inode *inode;
+-
+ 	if (len > TASK_SIZE)
+ 		return -ENOMEM;
+ 	if (!addr)
+ 		addr = TASK_UNMAPPED_BASE;
+ 
+-	inode = filp ? filp->f_dentry->d_inode : NULL;
+-
+-	if (inode && (flags & MAP_SHARED)) {
+-		addr = get_shared_area(inode->i_mapping, addr, len, pgoff);
++	if (filp && (flags & MAP_SHARED)) {
++		addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
+ 	} else {
+ 		addr = get_unshared_area(addr, len);
+ 	}
+--- linux-2.6.0/arch/ppc64/kernel/irq.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/arch/ppc64/kernel/irq.c	2003-12-28 23:22:10.000000000 -0800
+@@ -300,7 +300,7 @@ void enable_irq(unsigned int irq)
+ 	spin_lock_irqsave(&desc->lock, flags);
+ 	switch (desc->depth) {
+ 	case 1: {
+-		unsigned int status = desc->status & ~(IRQ_DISABLED | IRQ_INPROGRESS);
++		unsigned int status = desc->status & ~IRQ_DISABLED;
+ 		desc->status = status;
+ 		if ((status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
+ 			desc->status = status | IRQ_REPLAY;
+@@ -323,18 +323,20 @@ EXPORT_SYMBOL(enable_irq);
+ 
+ int show_interrupts(struct seq_file *p, void *v)
+ {
+-	int i, j;
++	int i = *(loff_t *) v, j;
+ 	struct irqaction * action;
+ 	unsigned long flags;
+ 
+-	seq_printf(p, "           ");
+-	for (j=0; j<NR_CPUS; j++) {
+-		if (cpu_online(j))
+-			seq_printf(p, "CPU%d       ",j);
++	if (i == 0) {
++		seq_printf(p, "           ");
++		for (j=0; j<NR_CPUS; j++) {
++			if (cpu_online(j))
++				seq_printf(p, "CPU%d       ",j);
++		}
++		seq_putc(p, '\n');
+ 	}
+-	seq_putc(p, '\n');
+ 
+-	for (i = 0 ; i < NR_IRQS ; i++) {
++	if (i < NR_IRQS) {
+ 		spin_lock_irqsave(&irq_desc[i].lock, flags);
+ 		action = irq_desc[i].action;
+ 		if (!action || !action->handler)
+@@ -359,8 +361,8 @@ int show_interrupts(struct seq_file *p, 
+ 		seq_putc(p, '\n');
+ skip:
+ 		spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+-	}
+-	seq_printf(p, "BAD: %10u\n", ppc_spurious_interrupts);
++	} else if (i == NR_IRQS)
++		seq_printf(p, "BAD: %10u\n", ppc_spurious_interrupts);
+ 	return 0;
+ }
+ 
+@@ -652,67 +654,16 @@ cpumask_t irq_affinity [NR_IRQS] = { [0 
+ cpumask_t irq_affinity [NR_IRQS] = { [0 ... NR_IRQS-1] = CPU_MASK_NONE };
+ #endif /* CONFIG_IRQ_ALL_CPUS */
+ 
+-#define HEX_DIGITS (2*sizeof(cpumask_t))
+-
+ static int irq_affinity_read_proc (char *page, char **start, off_t off,
+ 			int count, int *eof, void *data)
+ {
+-	int k, len;
+-	cpumask_t tmp = irq_affinity[(long)data];
+-
+-	if (count < HEX_DIGITS+1)
++	int len = cpumask_snprintf(page, count, irq_affinity[(long)data]);
++	if (count - len < 2)
+ 		return -EINVAL;
+-
+-	for (k = 0; k < sizeof(cpumask_t) / sizeof(u16); ++k) {
+-		int j = sprintf(page, "%04hx", (u16)cpus_coerce(tmp));
+-		len += j;
+-		page += j;
+-		cpus_shift_right(tmp, tmp, 16);
+-	}
+-	len += sprintf(page, "\n");
++	len += sprintf(page + len, "\n");
+ 	return len;
+ }
+ 
+-static unsigned int parse_hex_value (const char *buffer,
+-		unsigned long count, cpumask_t *ret)
+-{
+-	unsigned char hexnum[HEX_DIGITS];
+-	cpumask_t value = CPU_MASK_NONE;
+-	int i;
+-
+-	if (!count)
+-		return -EINVAL;
+-	if (count > HEX_DIGITS)
+-		count = HEX_DIGITS;
+-	if (copy_from_user(hexnum, buffer, count))
+-		return -EFAULT;
+-
+-	/*
+-	 * Parse the first HEX_DIGITS characters as a hex string, any non-hex char
+-	 * is end-of-string. '00e1', 'e1', '00E1', 'E1' are all the same.
+-	 */
+-
+-	for (i = 0; i < count; i++) {
+-		unsigned int c = hexnum[i];
+-		int k;
+-
+-		switch (c) {
+-			case '0' ... '9': c -= '0'; break;
+-			case 'a' ... 'f': c -= 'a'-10; break;
+-			case 'A' ... 'F': c -= 'A'-10; break;
+-		default:
+-			goto out;
+-		}
+-		cpus_shift_left(value, value, 4);
+-		for (k = 0; k < 4; ++k)
+-			if (test_bit(k, (unsigned long *)&c))
+-				cpu_set(k, value);
+-	}
+-out:
+-	*ret = value;
+-	return 0;
+-}
+-
+ static int irq_affinity_write_proc (struct file *file, const char *buffer,
+ 					unsigned long count, void *data)
+ {
+@@ -722,7 +673,7 @@ static int irq_affinity_write_proc (stru
+ 	if (!irq_desc[irq].handler->set_affinity)
+ 		return -EIO;
+ 
+-	err = parse_hex_value(buffer, count, &new_value);
++	err = cpumask_parse(buffer, count, new_value);
+ 	if (err)
+ 		return err;
+ 
+@@ -744,10 +695,11 @@ static int irq_affinity_write_proc (stru
+ static int prof_cpu_mask_read_proc (char *page, char **start, off_t off,
+ 			int count, int *eof, void *data)
+ {
+-	unsigned long *mask = (unsigned long *) data;
+-	if (count < HEX_DIGITS+1)
++	int len = cpumask_snprintf(page, count, *(cpumask_t *)data);
++	if (count - len < 2)
+ 		return -EINVAL;
+-	return sprintf (page, "%08lx\n", *mask);
++	len += sprintf(page + len, "\n");
++	return len;
+ }
+ 
+ static int prof_cpu_mask_write_proc (struct file *file, const char __user *buffer,
+@@ -757,7 +709,7 @@ static int prof_cpu_mask_write_proc (str
+ 	unsigned long full_count = count, err;
+ 	cpumask_t new_value;
+ 
+-	err = parse_hex_value(buffer, count, &new_value);
++	err = cpumask_parse(buffer, count, new_value);
+ 	if (err)
+ 		return err;
+ 
+--- linux-2.6.0/arch/ppc64/kernel/misc.S	2003-10-17 15:58:03.000000000 -0700
++++ 25/arch/ppc64/kernel/misc.S	2003-12-28 23:21:37.000000000 -0800
+@@ -843,15 +843,15 @@ _GLOBAL(sys_call_table32)
+ 	.llong .sys_ni_syscall
+ 	.llong .sys_ni_syscall
+ 	.llong .sys_ni_syscall
+-	.llong .sys_ni_syscall		/* 245 */
+-	.llong .sys_ni_syscall
+-	.llong .sys_ni_syscall
+-	.llong .sys_ni_syscall
+-	.llong .sys_ni_syscall
++	.llong .compat_clock_settime	/* 245 */
++	.llong .compat_clock_gettime
++	.llong .compat_clock_getres
++	.llong .compat_clock_nanosleep
++	.llong .sys_ni_syscall		/* 249 swapcontext */
+ 	.llong .sys32_tgkill		/* 250 */
+ 	.llong .sys32_utimes
+-	.llong .sys_statfs64
+-	.llong .sys_fstatfs64
++	.llong .compat_statfs64
++	.llong .compat_fstatfs64
+ 
+ 	.balign 8
+ _GLOBAL(sys_call_table)
+--- linux-2.6.0/arch/ppc64/kernel/time.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/ppc64/kernel/time.c	2003-12-28 23:21:36.000000000 -0800
+@@ -91,6 +91,9 @@ unsigned      tb_to_us;
+ unsigned long processor_freq;
+ spinlock_t rtc_lock = SPIN_LOCK_UNLOCKED;
+ 
++unsigned long tb_to_ns_scale;
++unsigned long tb_to_ns_shift;
++
+ struct gettimeofday_struct do_gtod;
+ 
+ extern unsigned long wall_jiffies;
+@@ -313,11 +316,13 @@ int timer_interrupt(struct pt_regs * reg
+ /*
+  * Scheduler clock - returns current time in nanosec units.
+  *
+- * This is wrong, but my CPUs run at 1GHz, so nyer nyer.
++ * Note: mulhdu(a, b) (multiply high double unsigned) returns
++ * the high 64 bits of a * b, i.e. (a * b) >> 64, where a and b
++ * are 64-bit unsigned numbers.
+  */
+ unsigned long long sched_clock(void)
+ {
+-	return get_tb();
++	return mulhdu(get_tb(), tb_to_ns_scale) << tb_to_ns_shift;
+ }
+ 
+ /*
+@@ -473,9 +478,30 @@ void __init time_init(void)
+ 	/* This function is only called on the boot processor */
+ 	unsigned long flags;
+ 	struct rtc_time tm;
++	struct div_result res;
++	unsigned long scale, shift;
+ 
+ 	ppc_md.calibrate_decr();
+ 
++	/*
++	 * Compute scale factor for sched_clock.
++	 * The calibrate_decr() function has set tb_ticks_per_sec,
++	 * which is the timebase frequency.
++	 * We compute 1e9 * 2^64 / tb_ticks_per_sec and interpret
++	 * the 128-bit result as a 64.64 fixed-point number.
++	 * We then shift that number right until it is less than 1.0,
++	 * giving us the scale factor and shift count to use in
++	 * sched_clock().
++	 */
++	div128_by_32(1000000000, 0, tb_ticks_per_sec, &res);
++	scale = res.result_low;
++	for (shift = 0; res.result_high != 0; ++shift) {
++		scale = (scale >> 1) | (res.result_high << 63);
++		res.result_high >>= 1;
++	}
++	tb_to_ns_scale = scale;
++	tb_to_ns_shift = shift;
++
+ #ifdef CONFIG_PPC_ISERIES
+ 	if (!piranha_simulator)
+ #endif
+--- linux-2.6.0/arch/ppc64/mm/hugetlbpage.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/arch/ppc64/mm/hugetlbpage.c	2003-12-28 23:22:12.000000000 -0800
+@@ -921,7 +921,7 @@ int is_hugepage_mem_enough(size_t size)
+  * this far.
+  */
+ static struct page *hugetlb_nopage(struct vm_area_struct *vma,
+-				unsigned long address, int unused)
++				unsigned long address, int *unused)
+ {
+ 	BUG();
+ 	return NULL;
+--- linux-2.6.0/arch/ppc64/mm/numa.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/arch/ppc64/mm/numa.c	2003-12-28 23:21:37.000000000 -0800
+@@ -108,7 +108,7 @@ static int __init parse_numa_properties(
+ 
+ 	for (memory = find_type_devices("memory"); memory;
+ 	     memory = memory->next) {
+-		int *tmp1, *tmp2;
++		unsigned int *tmp1, *tmp2;
+ 		unsigned long i;
+ 		unsigned long start = 0;
+ 		unsigned long size = 0;
+--- linux-2.6.0/arch/ppc/boot/ld.script	2003-11-09 16:45:05.000000000 -0800
++++ 25/arch/ppc/boot/ld.script	2003-12-28 23:26:37.000000000 -0800
+@@ -82,6 +82,7 @@ SECTIONS
+     *(__ksymtab)
+     *(__ksymtab_strings)
+     *(__bug_table)
++    *(__kcrctab)
+   }
+ 
+ }
+--- linux-2.6.0/arch/ppc/boot/simple/Makefile	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/ppc/boot/simple/Makefile	2003-12-28 23:22:26.000000000 -0800
+@@ -4,30 +4,38 @@
+ # Author: Tom Rini <trini@mvista.com>
+ #
+ # Notes:
+-# (1) For machine targets which produce more than one image, define
+-# ZNETBOOT and ZNETBOOTRD to the image which should be available for
+-# 'znetboot' and 'znetboot.initrd`
+-# (2) Also, for machine targets which just need to remove the ELF header,
+-# define END to be the machine name you want in the image.
+-# (3) For machine targets which use the mktree program, define END to be
+-# the machine name you want in the image, and you can optionally set
+-# ENTRYPOINT which the image should be loaded at.  The optimal setting
+-# for ENTRYPOINT is the link address.
++# (1) For machines that do not want to use the ELF image directly (including
++# stripping just the ELF header off), they must set the variables
++# zimage-$(CONFIG_MACHINE) and zimagerd-$(CONFIG_MACHINE) to the target
++# that produces the desired image and they must set end-$(CONFIG_MACHINE)
++# to what will be suffixed to the image filename.
++# (2) Regardless of (1), to have the resulting image be something other
++# than 'zImage.elf', set end-$(CONFIG_MACHINE) to be the suffix used for
++# the zImage, znetboot, and znetbootrd targets.
++# (3) For machine targets which use the mktree program, you can optionally
++# set entrypoint-$(CONFIG_MACHINE) to the location which the image should be
++# loaded at.  The optimal setting for entrypoint-$(CONFIG_MACHINE) is the link
++# address.
+ # (4) It is advisable to pass in the memory size using BI_MEMSIZE and
+ # get_mem_size(), which is memory controller dependent.  Add in the correct
+-# XXX_memory.o file for this to work, as well as editing the $(MISC) file.
+-
++# XXX_memory.o file for this to work, as well as editing the
++# misc-$(CONFIG_MACHINE) variable.
+ 
+ boot				:= arch/ppc/boot
+ common				:= $(boot)/common
+ utils				:= $(boot)/utils
+ bootlib				:= $(boot)/lib
+ images				:= $(boot)/images
++tftpboot			:= /tftpboot
+ 
+ # Normally, we use the 'misc.c' file for decompress_kernel and
+ # whatnot.  Sometimes we need to override this however.
+ misc-y	:= misc.o
+ 
++# Normally, we have our images end in .elf, but something we want to
++# change this.
++end-y := elf
++
+ # Additionally, we normally don't need to mess with the L2 / L3 caches
+ # if present on 'classic' PPC.
+ cacheflag-y	:= -DCLEAR_CACHES=""
+@@ -41,48 +49,43 @@ clear_L2_L3	:= $(boot)/simple/clear.S
+       zimage-$(CONFIG_IBM_OPENBIOS)	:= zImage-TREE
+ zimageinitrd-$(CONFIG_IBM_OPENBIOS)	:= zImage.initrd-TREE
+          end-$(CONFIG_IBM_OPENBIOS)	:= treeboot
+-   tftpimage-$(CONFIG_IBM_OPENBIOS)	:= /tftpboot/zImage.$(end-y)
+         misc-$(CONFIG_IBM_OPENBIOS)	:= misc-embedded.o
+ 
+-   tftpimage-$(CONFIG_EMBEDDEDBOOT)	:=  /tftpboot/zImage.embedded
++         end-$(CONFIG_EMBEDDEDBOOT)	:= embedded
+         misc-$(CONFIG_EMBEDDEDBOOT)	:= misc-embedded.o
+ 
+       zimage-$(CONFIG_EBONY)		:= zImage-TREE
+ zimageinitrd-$(CONFIG_EBONY)		:= zImage.initrd-TREE
+          end-$(CONFIG_EBONY)		:= ebony
+   entrypoint-$(CONFIG_EBONY)		:= 0x01000000
+-   tftpimage-$(CONFIG_EBONY)		:= /tftpboot/zImage.$(end-y)
+ 
+       zimage-$(CONFIG_OCOTEA)		:= zImage-TREE
+ zimageinitrd-$(CONFIG_OCOTEA)		:= zImage.initrd-TREE
+          end-$(CONFIG_OCOTEA)		:= ocotea
+   entrypoint-$(CONFIG_OCOTEA)		:= 0x01000000
+-   tftpimage-$(CONFIG_OCOTEA)		:= /tftpboot/zImage.$(end-y)
+ 
+      extra.o-$(CONFIG_EV64260)		:= direct.o misc-ev64260.o
+-   tftpimage-$(CONFIG_EV64260)		:= /tftpboot/zImage.ev64260
++         end-$(CONFIG_EV64260)		:= ev64260
+    cacheflag-$(CONFIG_EV64260)		:= -include $(clear_L2_L3)
+ 
+       zimage-$(CONFIG_GEMINI)		:= zImage-STRIPELF
+ zimageinitrd-$(CONFIG_GEMINI)		:= zImage.initrd-STRIPELF
+          end-$(CONFIG_GEMINI)		:= gemini
+-   tftpimage-$(CONFIG_GEMINI)		:= /tftpboot/zImage.$(end-y)
+ 
+      extra.o-$(CONFIG_K2)		:= legacy.o
+-   tftpimage-$(CONFIG_K2)		:= /tftpboot/zImage.k2
++         end-$(CONFIG_K2)		:= k2
+    cacheflag-$(CONFIG_K2)		:= -include $(clear_L2_L3)
+ 
+ # kconfig 'feature', only one of these will ever be 'y' at a time.
+ # The rest will be unset.
+ motorola := $(CONFIG_MCPN765)$(CONFIG_MVME5100)$(CONFIG_PRPMC750) \
+ $(CONFIG_PRPMC800)$(CONFIG_LOPEC)$(CONFIG_PPLUS)
++motorola := $(strip $(motorola))
+ pcore := $(CONFIG_PCORE)$(CONFIG_POWERPMC250)
+ 
+       zimage-$(motorola)		:= zImage-PPLUS
+ zimageinitrd-$(motorola)		:= zImage.initrd-PPLUS
+-   tftpimage-$(motorola)		:= /tftpboot/zImage.pplus
+-    znetboot-$(motorola)		:= zImage.pplus
+-  znetbootrd-$(motorola)		:= zImage.initrd.pplus
++         end-$(motorola)		:= pplus
+ 
+ # Overrides previous assingment
+      extra.o-$(CONFIG_PPLUS)		:= legacy.o
+@@ -91,10 +94,9 @@ zimageinitrd-$(motorola)		:= zImage.init
+ zimageinitrd-$(pcore)			:= zImage.initrd-STRIPELF
+      extra.o-$(pcore)			:= chrpmap.o
+          end-$(pcore)			:= pcore
+-   tftpimage-$(pcore)			:= /tftpboot/zImage.$(end-y)
+    cacheflag-$(pcore)			:= -include $(clear_L2_L3)
+ 
+-   tftpimage-$(CONFIG_SANDPOINT)	:= /tftpboot/zImage.sandpoint
++         end-$(CONFIG_SANDPOINT)	:= sandpoint
+    cacheflag-$(CONFIG_SANDPOINT)	:= -include $(clear_L2_L3)
+ 
+       zimage-$(CONFIG_SPRUCE)		:= zImage-TREE
+@@ -102,11 +104,9 @@ zimageinitrd-$(CONFIG_SPRUCE)		:= zImage
+          end-$(CONFIG_SPRUCE)		:= spruce
+   entrypoint-$(CONFIG_SPRUCE)		:= 0x00800000
+         misc-$(CONFIG_SPRUCE)		:= misc-spruce.o
+-   tftpimage-$(CONFIG_SPRUCE)		:= /tftpboot/zImage.$(end-y)
+-
+ 
+-# tftp image is prefixed with .smp if compiled for SMP
+-tftpimage-$(CONFIG_SMP)	+= .smp
++# SMP images should have a '.smp' suffix.
++         end-$(CONFIG_SMP)		+= .smp
+ 
+ # This is a treeboot that needs init functions until the
+ # boot rom is sorted out (i.e. this is short lived)
+@@ -180,18 +180,10 @@ zImage.initrd: $(images)/$(zimageinitrd-
+ 	rm -f $(obj)/zvmlinux.initrd
+ 
+ znetboot: zImage
+-ifneq ($(ZNETBOOT),)
+-	cp $(images)/$(ZNETBOOT) $(tftpimage-y)
+-else
+-	cp $(images)/zImage.* $(tftpimage-y)
+-endif
++	cp $(images)/zImage.$(end-y) $(tftpboot)/zImage.$(end-y)
+ 
+ znetboot.initrd: zImage.initrd
+-ifneq ($(znetbootrd-y),)
+-	cp $(images)/$(znetbootrd-y) $(tftpimage-y)
+-else
+-	cp $(images)/zImage.* $(tftpimage-y)
+-endif
++	cp $(images)/zImage.initrd.$(end-y) $(tftpboot)/zImage.initrd.$(end-y)
+ 
+ $(images)/zImage-STRIPELF: $(obj)/zvmlinux
+ 	dd if=$(obj)/zvmlinux of=$(images)/zImage.$(end-y) skip=64 bs=1k
+--- linux-2.6.0/arch/ppc/boot/utils/mkprep.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/ppc/boot/utils/mkprep.c	2003-12-28 23:22:26.000000000 -0800
+@@ -12,12 +12,14 @@
+  *                  -- Cort
+  *
+  * Modified for x86 hosted builds by Matt Porter <porter@neta.com>
++ * Modified for Sparc hosted builds by Peter Wahl <PeterWahl@web.de>
+  */
+ 
+ #include <fcntl.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <strings.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+ 
+@@ -147,7 +149,7 @@ int main(int argc, char *argv[])
+ void write_prep_partition(int in, int out)
+ {
+   unsigned char block[512];
+-  partition_entry_t *pe = (partition_entry_t *)&block[0x1BE];
++  partition_entry_t pe;
+   dword_t *entry  = (dword_t *)&block[0];
+   dword_t *length = (dword_t *)&block[sizeof(long)];
+   struct stat info;
+@@ -177,8 +179,8 @@ void write_prep_partition(int in, int ou
+    * Build a "PReP" partition table entry in the boot record
+    *  - "PReP" may only look at the system_indicator
+    */
+-  pe->boot_indicator   = BootActive;
+-  pe->system_indicator = SystemPrep;
++  pe.boot_indicator   = BootActive;
++  pe.system_indicator = SystemPrep;
+   /*
+    * The first block of the diskette is used by this "boot record" which
+    * actually contains the partition table. (The first block of the
+@@ -186,12 +188,12 @@ void write_prep_partition(int in, int ou
+    * one partition on the diskette and it shall contain the rest of the
+    * diskette.
+    */
+-  pe->starting_head     = 0;	/* zero-based			     */
+-  pe->starting_sector   = 2;	/* one-based			     */
+-  pe->starting_cylinder = 0;	/* zero-based			     */
+-  pe->ending_head       = 1;	/* assumes two heads		     */
+-  pe->ending_sector     = 18;	/* assumes 18 sectors/track	     */
+-  pe->ending_cylinder   = 79;	/* assumes 80 cylinders/diskette     */
++  pe.starting_head     = 0;	/* zero-based			     */
++  pe.starting_sector   = 2;	/* one-based			     */
++  pe.starting_cylinder = 0;	/* zero-based			     */
++  pe.ending_head       = 1;	/* assumes two heads		     */
++  pe.ending_sector     = 18;	/* assumes 18 sectors/track	     */
++  pe.ending_cylinder   = 79;	/* assumes 80 cylinders/diskette     */
+ 
+   /*
+    * The "PReP" software ignores the above fields and just looks at
+@@ -201,20 +203,20 @@ void write_prep_partition(int in, int ou
+    *   - unlike the above sector numbers, the beginning sector is zero-based!
+    */
+ #if 0
+-  pe->beginning_sector  = cpu_to_le32(1);
++  pe.beginning_sector  = cpu_to_le32(1);
+ #else
+   /* This has to be 0 on the PowerStack? */
+ #ifdef __i386__
+-  pe->beginning_sector  = 0;
++  pe.beginning_sector  = 0;
+ #else
+-  pe->beginning_sector  = cpu_to_le32(0);
++  pe.beginning_sector  = cpu_to_le32(0);
+ #endif /* __i386__ */
+ #endif
+ 
+ #ifdef __i386__
+-  pe->number_of_sectors = 2*18*80-1;
++  pe.number_of_sectors = 2*18*80-1;
+ #else
+-  pe->number_of_sectors = cpu_to_le32(2*18*80-1);
++  pe.number_of_sectors = cpu_to_le32(2*18*80-1);
+ #endif /* __i386__ */
+ 
+   write( out, block, sizeof(block) );
+--- linux-2.6.0/arch/ppc/kernel/irq.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/ppc/kernel/irq.c	2003-12-28 23:22:10.000000000 -0800
+@@ -346,17 +346,19 @@ void enable_irq(unsigned int irq)
+ 
+ int show_interrupts(struct seq_file *p, void *v)
+ {
+-	int i, j;
++	int i = *(loff_t *) v, j;
+ 	struct irqaction * action;
+ 	unsigned long flags;
+ 
+-	seq_puts(p, "           ");
+-	for (j=0; j<NR_CPUS; j++)
+-		if (cpu_online(j))
+-			seq_printf(p, "CPU%d       ", j);
+-	seq_putc(p, '\n');
++	if (i == 0) {
++		seq_puts(p, "           ");
++		for (j=0; j<NR_CPUS; j++)
++			if (cpu_online(j))
++				seq_printf(p, "CPU%d       ", j);
++		seq_putc(p, '\n');
++	}
+ 
+-	for (i = 0 ; i < NR_IRQS ; i++) {
++	if (i < NR_IRQS) {
+ 		spin_lock_irqsave(&irq_desc[i].lock, flags);
+ 		action = irq_desc[i].action;
+ 		if ( !action || !action->handler )
+@@ -381,22 +383,23 @@ int show_interrupts(struct seq_file *p, 
+ 		seq_putc(p, '\n');
+ skip:
+ 		spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+-	}
++	} else if (i == NR_IRQS) {
+ #ifdef CONFIG_TAU_INT
+-	if (tau_initialized){
+-		seq_puts(p, "TAU: ");
+-		for (j = 0; j < NR_CPUS; j++)
+-			if (cpu_online(j))
+-				seq_printf(p, "%10u ", tau_interrupts(j));
+-		seq_puts(p, "  PowerPC             Thermal Assist (cpu temp)\n");
+-	}
++		if (tau_initialized){
++			seq_puts(p, "TAU: ");
++			for (j = 0; j < NR_CPUS; j++)
++				if (cpu_online(j))
++					seq_printf(p, "%10u ", tau_interrupts(j));
++			seq_puts(p, "  PowerPC             Thermal Assist (cpu temp)\n");
++		}
+ #endif
+ #ifdef CONFIG_SMP
+-	/* should this be per processor send/receive? */
+-	seq_printf(p, "IPI (recv/sent): %10u/%u\n",
+-		   atomic_read(&ipi_recv), atomic_read(&ipi_sent));
++		/* should this be per processor send/receive? */
++		seq_printf(p, "IPI (recv/sent): %10u/%u\n",
++				atomic_read(&ipi_recv), atomic_read(&ipi_sent));
+ #endif
+-	seq_printf(p, "BAD: %10u\n", ppc_spurious_interrupts);
++		seq_printf(p, "BAD: %10u\n", ppc_spurious_interrupts);
++	}
+ 	return 0;
+ }
+ 
+@@ -569,67 +572,16 @@ static struct proc_dir_entry *smp_affini
+ 
+ cpumask_t irq_affinity [NR_IRQS];
+ 
+-#define HEX_DIGITS (2*sizeof(cpumask_t))
+-
+ static int irq_affinity_read_proc (char *page, char **start, off_t off,
+ 			int count, int *eof, void *data)
+ {
+-	cpumask_t tmp = irq_affinity[(long)data];
+-	int k, len = 0;
+-
+-	if (count < HEX_DIGITS+1)
++	int len = cpumask_snprintf(page, count, irq_affinity[(long)data]);
++	if (count - len < 2)
+ 		return -EINVAL;
+-
+-	for (k = 0; k < sizeof(cpumask_t)/sizeof(u16); ++k) {
+-		int j = sprintf(page, "%04hx", (u16)cpus_coerce(tmp));
+-		len += j;
+-		page += j;
+-		cpus_shift_right(tmp, tmp, 16);
+-	}
+-
+-	len += sprintf(page, "\n");
++	len += sprintf(page + len, "\n");
+ 	return len;
+ }
+ 
+-static unsigned int parse_hex_value (const char __user *buffer,
+-		unsigned long count, cpumask_t *ret)
+-{
+-	unsigned char hexnum [HEX_DIGITS];
+-	cpumask_t value = CPU_MASK_NONE;
+-	int i;
+-
+-	if (!count)
+-		return -EINVAL;
+-	if (count > HEX_DIGITS)
+-		count = HEX_DIGITS;
+-	if (copy_from_user(hexnum, buffer, count))
+-		return -EFAULT;
+-
+-	/*
+-	 * Parse the first 8 characters as a hex string, any non-hex char
+-	 * is end-of-string. '00e1', 'e1', '00E1', 'E1' are all the same.
+-	 */
+-	for (i = 0; i < count; i++) {
+-		unsigned int c = hexnum[i];
+-		int k;
+-
+-		switch (c) {
+-			case '0' ... '9': c -= '0'; break;
+-			case 'a' ... 'f': c -= 'a'-10; break;
+-			case 'A' ... 'F': c -= 'A'-10; break;
+-		default:
+-			goto out;
+-		}
+-		cpus_shift_left(value, value, 4);
+-		for (k = 0; k < 4; ++k)
+-			if (c & (1 << k))
+-				cpu_set(k, value);
+-	}
+-out:
+-	*ret = value;
+-	return 0;
+-}
+-
+ static int irq_affinity_write_proc (struct file *file, const char __user *buffer,
+ 					unsigned long count, void *data)
+ {
+@@ -639,7 +591,7 @@ static int irq_affinity_write_proc (stru
+ 	if (!irq_desc[irq].handler->set_affinity)
+ 		return -EIO;
+ 
+-	err = parse_hex_value(buffer, count, &new_value);
++	err = cpumask_parse(buffer, count, new_value);
+ 
+ 	/*
+ 	 * Do not allow disabling IRQs completely - it's a too easy
+@@ -664,19 +616,10 @@ static int irq_affinity_write_proc (stru
+ static int prof_cpu_mask_read_proc (char *page, char **start, off_t off,
+ 			int count, int *eof, void *data)
+ {
+-	cpumask_t mask = *(cpumask_t *)data;
+-	int k, len = 0;
+-
+-	if (count < HEX_DIGITS+1)
++	int len = cpumask_snprintf(page, count, *(cpumask_t *)data);
++	if (count - len < 2)
+ 		return -EINVAL;
+-
+-	for (k = 0; k < sizeof(cpumask_t)/sizeof(u16); ++k) {
+-		int j = sprintf(page, "%04hx", (u16)cpus_coerce(mask));
+-		len += j;
+-		page += j;
+-		cpus_shift_right(mask, mask, 16);
+-	}
+-	len += sprintf(page, "\n");
++	len += sprintf(page + len, "\n");
+ 	return len;
+ }
+ 
+@@ -686,7 +629,7 @@ static int prof_cpu_mask_write_proc (str
+ 	cpumask_t *mask = (cpumask_t *)data, full_count = count, err;
+ 	cpumask_t new_value;
+ 
+-	err = parse_hex_value(buffer, count, &new_value);
++	err = cpumask_parse(buffer, count, new_value);
+ 	if (err)
+ 		return err;
+ 
+--- linux-2.6.0/arch/ppc/kernel/Makefile	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/ppc/kernel/Makefile	2003-12-28 23:22:27.000000000 -0800
+@@ -9,8 +9,7 @@ ifdef CONFIG_4xx
+ EXTRA_AFLAGS		:= -Wa,-m405
+ endif
+ 
+-# Start off with 'head.o', change as needed.
+-extra-y				:= head.o
++extra-$(CONFIG_PPC_STD_MMU)	:= head.o
+ extra-$(CONFIG_40x)		:= head_4xx.o
+ extra-$(CONFIG_44x)		:= head_44x.o
+ extra-$(CONFIG_8xx)		:= head_8xx.o
+--- linux-2.6.0/arch/ppc/kernel/ppc_ksyms.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/arch/ppc/kernel/ppc_ksyms.c	2003-12-28 23:22:27.000000000 -0800
+@@ -92,7 +92,7 @@ EXPORT_SYMBOL(disable_irq_nosync);
+ EXPORT_SYMBOL(probe_irq_mask);
+ 
+ EXPORT_SYMBOL(ISA_DMA_THRESHOLD);
+-EXPORT_SYMBOL_NOVERS(DMA_MODE_READ);
++EXPORT_SYMBOL(DMA_MODE_READ);
+ EXPORT_SYMBOL(DMA_MODE_WRITE);
+ #if defined(CONFIG_PPC_PREP)
+ EXPORT_SYMBOL(_prep_type);
+@@ -167,9 +167,9 @@ EXPORT_SYMBOL(ppc_ide_md);
+ #endif
+ 
+ #ifdef CONFIG_PCI
+-EXPORT_SYMBOL_NOVERS(isa_io_base);
+-EXPORT_SYMBOL_NOVERS(isa_mem_base);
+-EXPORT_SYMBOL_NOVERS(pci_dram_offset);
++EXPORT_SYMBOL(isa_io_base);
++EXPORT_SYMBOL(isa_mem_base);
++EXPORT_SYMBOL(pci_dram_offset);
+ EXPORT_SYMBOL(pci_alloc_consistent);
+ EXPORT_SYMBOL(pci_free_consistent);
+ EXPORT_SYMBOL(pci_bus_io_base);
+@@ -246,7 +246,7 @@ EXPORT_SYMBOL(register_backlight_control
+ EXPORT_SYMBOL(_machine);
+ #endif
+ #ifdef CONFIG_PPC_PMAC
+-EXPORT_SYMBOL_NOVERS(sys_ctrler);
++EXPORT_SYMBOL(sys_ctrler);
+ EXPORT_SYMBOL(pmac_newworld);
+ #endif
+ #ifdef CONFIG_PPC_OF
+@@ -294,15 +294,15 @@ EXPORT_SYMBOL(to_tm);
+ 
+ EXPORT_SYMBOL(pm_power_off);
+ 
+-EXPORT_SYMBOL_NOVERS(__ashrdi3);
+-EXPORT_SYMBOL_NOVERS(__ashldi3);
+-EXPORT_SYMBOL_NOVERS(__lshrdi3);
+-EXPORT_SYMBOL_NOVERS(memcpy);
+-EXPORT_SYMBOL_NOVERS(memset);
+-EXPORT_SYMBOL_NOVERS(memmove);
+-EXPORT_SYMBOL_NOVERS(memscan);
+-EXPORT_SYMBOL_NOVERS(memcmp);
+-EXPORT_SYMBOL_NOVERS(memchr);
++EXPORT_SYMBOL(__ashrdi3);
++EXPORT_SYMBOL(__ashldi3);
++EXPORT_SYMBOL(__lshrdi3);
++EXPORT_SYMBOL(memcpy);
++EXPORT_SYMBOL(memset);
++EXPORT_SYMBOL(memmove);
++EXPORT_SYMBOL(memscan);
++EXPORT_SYMBOL(memcmp);
++EXPORT_SYMBOL(memchr);
+ 
+ EXPORT_SYMBOL(abs);
+ 
+@@ -366,10 +366,10 @@ EXPORT_SYMBOL(request_8xxirq);
+ EXPORT_SYMBOL(next_mmu_context);
+ EXPORT_SYMBOL(set_context);
+ EXPORT_SYMBOL(handle_mm_fault); /* For MOL */
+-EXPORT_SYMBOL_NOVERS(disarm_decr);
++EXPORT_SYMBOL(disarm_decr);
++#ifdef CONFIG_PPC_STD_MMU
+ extern long mol_trampoline;
+ EXPORT_SYMBOL(mol_trampoline); /* For MOL */
+-#ifdef CONFIG_PPC_STD_MMU
+ EXPORT_SYMBOL(flush_hash_pages); /* For MOL */
+ #ifdef CONFIG_SMP
+ extern int mmu_hash_lock;
+@@ -381,5 +381,5 @@ EXPORT_SYMBOL(intercept_table);
+ EXPORT_SYMBOL(cur_cpu_spec);
+ #ifdef CONFIG_PPC_PMAC
+ extern unsigned long agp_special_page;
+-EXPORT_SYMBOL_NOVERS(agp_special_page);
++EXPORT_SYMBOL(agp_special_page);
+ #endif
+--- linux-2.6.0/arch/ppc/mm/cachemap.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/ppc/mm/cachemap.c	2003-12-28 23:22:26.000000000 -0800
+@@ -170,3 +170,5 @@ void consistent_sync_page(struct page *p
+ 	start = (unsigned long)page_address(page) + offset;
+ 	consistent_sync((void *)start, size, direction);
+ }
++
++EXPORT_SYMBOL(consistent_sync_page);
+--- linux-2.6.0/arch/ppc/platforms/mpc82xx.h	2003-09-27 18:57:43.000000000 -0700
++++ /dev/null	2002-08-30 16:31:37.000000000 -0700
+@@ -1,42 +0,0 @@
+-/*
+- * arch/ppc/platforms/mpc82xx.h
+- *
+- * Board specific support for various 82xx platforms.
+- *
+- * Author: Allen Curtis <acurtis@onz.com>
+- *
+- * Copyright 2002 Ones and Zeros, Inc.
+- *
+- * This program is free software; you can redistribute  it and/or modify it
+- * under  the terms of  the GNU General  Public License as published by the
+- * Free Software Foundation;  either version 2 of the  License, or (at your
+- * option) any later version.
+- */
+-#ifndef __CONFIG_82XX_PLATFORMS
+-#define __CONFIG_82XX_PLATFORMS
+-
+-#ifdef CONFIG_8260
+-
+-#ifdef CONFIG_EST8260
+-#include <platforms/est8260.h>
+-#endif
+-
+-#ifdef CONFIG_SBS8260
+-#include <platforms/sbs8260.h>
+-#endif
+-
+-#ifdef CONFIG_RPX6
+-#include <platforms/rpxsuper.h>
+-#endif
+-
+-#ifdef CONFIG_WILLOW
+-#include <platforms/willow.h>
+-#endif
+-
+-#ifdef CONFIG_TQM8260
+-#include <platforms/tqm8260.h>
+-#endif
+-
+-#endif	/* CONFIG_8260 */
+-
+-#endif
+--- linux-2.6.0/arch/s390/kernel/compat_wrapper.S	2003-06-14 12:18:51.000000000 -0700
++++ 25/arch/s390/kernel/compat_wrapper.S	2003-12-28 23:21:47.000000000 -0800
+@@ -5,6 +5,7 @@
+ *  S390 version
+ *    Copyright (C) 2000 IBM Deutschland Entwicklung GmbH, IBM Corporation
+ *    Author(s): Gerhard Tonn (ton@de.ibm.com),
++*               Thomas Spatzier (tspat@de.ibm.com)
+ */ 
+ 
+ 	.globl  sys32_exit_wrapper 
+@@ -1230,3 +1231,37 @@ sys_epoll_wait_wrapper:
+ 	lgfr	%r4,%r4			# int
+ 	lgfr	%r5,%r5			# int
+ 	jg	sys_epoll_wait		# branch to system call
++
++	.globl	sys32_io_setup_wrapper
++sys32_io_setup_wrapper:
++	llgfr	%r2,%r2			# unsigned int
++	llgtr	%r3,%r3			# u32 *
++	jg	compat_sys_io_setup
++
++	.globl	sys32_io_destroy_wrapper
++sys32_io_destroy_wrapper:
++	llgfr	%r2,%r2			# (aio_context_t) u32
++	jg	sys_io_destroy
++
++	.globl	sys32_io_getevents_wrapper
++sys32_io_getevents_wrapper:
++	llgfr	%r2,%r2			# (aio_context_t) u32
++	lgfr	%r3,%r3			# long
++	lgfr	%r4,%r4			# long
++	llgtr	%r5,%r5			# struct io_event *
++	llgtr	%r6,%r6			# struct compat_timespec *
++	jg	compat_sys_io_getevents
++
++	.globl	sys32_io_submit_wrapper
++sys32_io_submit_wrapper:
++	llgfr	%r2,%r2			# (aio_context_t) u32
++	lgfr	%r3,%r3			# long
++	llgtr	%r4,%r4			# struct iocb **
++	jg	compat_sys_io_submit
++
++	.globl	sys32_io_cancel_wrapper
++sys32_io_cancel_wrapper:
++	llgfr	%r2,%r2			# (aio_context_t) u32
++	llgtr	%r3,%r3			# struct iocb *
++	llgtr	%r4,%r4			# struct io_event *
++	jg	sys_io_cancel
+--- linux-2.6.0/arch/s390/kernel/setup.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/s390/kernel/setup.c	2003-12-28 23:22:06.000000000 -0800
+@@ -617,17 +617,17 @@ static const char *intrclass_names[] = {
+ 
+ int show_interrupts(struct seq_file *p, void *v)
+ {
+-        int i, j;
++        int i = *(loff_t *) v, j;
+ 	
+-        seq_puts(p, "           ");
+-	
+-        for (j=0; j<NR_CPUS; j++)
+-                if (cpu_online(j))
+-                        seq_printf(p, "CPU%d       ",j);
+-	
+-        seq_putc(p, '\n');
++	if (i == 0) {
++		seq_puts(p, "           ");
++		for (j=0; j<NR_CPUS; j++)
++			if (cpu_online(j))
++				seq_printf(p, "CPU%d       ",j);
++		seq_putc(p, '\n');
++	}
+ 	
+-        for (i = 0 ; i < NR_IRQS ; i++) {
++	if (i < NR_IRQS) {
+ 		seq_printf(p, "%s: ", intrclass_names[i]);
+ #ifndef CONFIG_SMP
+ 		seq_printf(p, "%10u ", kstat_irqs(i));
+--- linux-2.6.0/arch/s390/kernel/syscalls.S	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/s390/kernel/syscalls.S	2003-12-28 23:21:47.000000000 -0800
+@@ -251,11 +251,11 @@ SYSCALL(sys_sched_setaffinity,sys_sched_
+ SYSCALL(sys_sched_getaffinity,sys_sched_getaffinity,sys32_sched_getaffinity_wrapper)	/* 240 */
+ SYSCALL(sys_tgkill,sys_tgkill,sys_tgkill)
+ NI_SYSCALL							/* reserved for TUX */
+-SYSCALL(sys_io_setup,sys_io_setup,sys_ni_syscall)
+-SYSCALL(sys_io_destroy,sys_io_destroy,sys_ni_syscall)
+-SYSCALL(sys_io_getevents,sys_io_getevents,sys_ni_syscall)	/* 245 */
+-SYSCALL(sys_io_submit,sys_io_submit,sys_ni_syscall)
+-SYSCALL(sys_io_cancel,sys_io_cancel,sys_ni_syscall)
++SYSCALL(sys_io_setup,sys_io_setup,sys32_io_setup_wrapper)
++SYSCALL(sys_io_destroy,sys_io_destroy,sys32_io_destroy_wrapper)
++SYSCALL(sys_io_getevents,sys_io_getevents,sys32_io_getevents_wrapper)	/* 245 */
++SYSCALL(sys_io_submit,sys_io_submit,sys32_io_submit_wrapper)
++SYSCALL(sys_io_cancel,sys_io_cancel,sys32_io_cancel_wrapper)
+ SYSCALL(sys_exit_group,sys_exit_group,sys32_exit_group_wrapper)
+ SYSCALL(sys_epoll_create,sys_epoll_create,sys_epoll_create_wrapper)
+ SYSCALL(sys_epoll_ctl,sys_epoll_ctl,sys_epoll_ctl_wrapper)	/* 250 */
+--- linux-2.6.0/arch/sh/Kconfig	2003-09-27 18:57:44.000000000 -0700
++++ 25/arch/sh/Kconfig	2003-12-28 23:23:06.000000000 -0800
+@@ -1053,7 +1053,7 @@ config WATCHDOG
+ 	  implementation entirely in software (which can sometimes fail to
+ 	  reboot the machine) and a driver for hardware watchdog boards, which
+ 	  are more robust and can also keep track of the temperature inside
+-	  your computer. For details, read <file:Documentation/watchdog.txt>
++	  your computer. For details, read <file:Documentation/watchdog/watchdog.txt>
+ 	  in the kernel source.
+ 
+ 	  The watchdog is usually used together with the watchdog daemon
+--- linux-2.6.0/arch/sh/kernel/irq.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/sh/kernel/irq.c	2003-12-28 23:22:06.000000000 -0800
+@@ -93,17 +93,19 @@ struct hw_interrupt_type no_irq_type = {
+ #if defined(CONFIG_PROC_FS)
+ int show_interrupts(struct seq_file *p, void *v)
+ {
+-	int i, j;
++	int i = *(loff_t *) v, j;
+ 	struct irqaction * action;
+ 	unsigned long flags;
+ 
+-	seq_puts(p, "           ");
+-	for (j=0; j<NR_CPUS; j++)
+-		if (cpu_online(j))
+-			seq_printf(p, "CPU%d       ",j);
+-	seq_putc(p, '\n');
++	if (i == 0) {
++		seq_puts(p, "           ");
++		for (j=0; j<NR_CPUS; j++)
++			if (cpu_online(j))
++				seq_printf(p, "CPU%d       ",j);
++		seq_putc(p, '\n');
++	}
+ 
+-	for (i = 0 ; i < ACTUAL_NR_IRQS ; i++) {
++	if (i < ACTUAL_NR_IRQS) {
+ 		spin_lock_irqsave(&irq_desc[i].lock, flags);
+ 		action = irq_desc[i].action;
+ 		if (!action)
+--- linux-2.6.0/arch/sparc64/Kconfig	2003-11-23 19:03:00.000000000 -0800
++++ 25/arch/sparc64/Kconfig	2003-12-28 23:26:33.000000000 -0800
+@@ -808,12 +808,19 @@ config DEBUG_SPINLOCK
+ 	  best used in conjunction with the NMI watchdog so that spinlock
+ 	  deadlocks are also debuggable.
+ 
++config LOCKMETER
++	bool "Kernel lock metering"
++	depends on SMP && !PREEMPT
++	help
++	  Say Y to enable kernel lock metering, which adds overhead to SMP locks,
++	  but allows you to see various statistics using the lockstat command.
++
+ # We have a custom atomic_dec_and_lock() implementation but it's not
+ # compatible with spinlock debugging so we need to fall back on
+ # the generic version in that case.
+ config HAVE_DEC_LOCK
+ 	bool
+-	depends on SMP && !DEBUG_SPINLOCK
++	depends on SMP && !DEBUG_SPINLOCK && !LOCKMETER
+ 	default y
+ 
+ config DEBUG_SPINLOCK_SLEEP
+--- linux-2.6.0/arch/sparc64/kernel/irq.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/sparc64/kernel/irq.c	2003-12-28 23:22:10.000000000 -0800
+@@ -128,14 +128,14 @@ static void register_irq_proc (unsigned 
+ int show_interrupts(struct seq_file *p, void *v)
+ {
+ 	unsigned long flags;
+-	int i;
++	int i = *(loff_t *) v;
+ 	struct irqaction *action;
+ #ifdef CONFIG_SMP
+ 	int j;
+ #endif
+ 
+ 	spin_lock_irqsave(&irq_action_lock, flags);
+-	for (i = 0; i < (NR_IRQS + 1); i++) {
++	if (i <= NR_IRQS) {
+ 		if (!(action = *(i + irq_action)))
+ 			continue;
+ 		seq_printf(p, "%3d: ", i);
+@@ -1204,11 +1204,17 @@ static int irq_affinity_read_proc (char 
+ {
+ 	struct ino_bucket *bp = ivector_table + (long)data;
+ 	struct irqaction *ap = bp->irq_info;
+-	unsigned long mask = get_smpaff_in_irqaction(ap);
++	cpumask_t mask = get_smpaff_in_irqaction(ap);
++	int len;
++
++	if (cpus_empty(mask))
++		mask = cpu_online_map;
+ 
+-	if (count < HEX_DIGITS+1)
++	len = cpumask_snprintf(page, count, mask);
++	if (count - len < 2)
+ 		return -EINVAL;
+-	return sprintf (page, "%016lx\n", mask == 0 ? ~0UL : mask);
++	len += sprintf(page + len, "\n");
++	return len;
+ }
+ 
+ static inline void set_intr_affinity(int irq, unsigned long hw_aff)
+--- linux-2.6.0/arch/sparc64/kernel/systbls.S	2003-11-23 19:03:00.000000000 -0800
++++ 25/arch/sparc64/kernel/systbls.S	2003-12-28 23:21:47.000000000 -0800
+@@ -72,8 +72,8 @@ sys_call_table32:
+ /*250*/	.word sys32_mremap, sys32_sysctl, sys_getsid, sys_fdatasync, sys32_nfsservctl
+ 	.word sys_ni_syscall, compat_clock_settime, compat_clock_gettime, compat_clock_getres, compat_clock_nanosleep
+ /*260*/	.word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, compat_timer_settime, compat_timer_gettime, sys_timer_getoverrun
+-	.word sys_timer_delete, sys32_timer_create, sys_ni_syscall, sys_ni_syscall, sys_ni_syscall
+-/*270*/	.word sys_ni_syscall, sys_ni_syscall, sys_ni_syscall, sys_ni_syscall
++	.word sys_timer_delete, sys32_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy
++/*270*/	.word compat_sys_io_submit, sys_io_cancel, compat_sys_io_getevents, sys_ni_syscall
+ 
+ 	/* Now the 64-bit native Linux syscall table. */
+ 
+--- linux-2.6.0/arch/sparc64/lib/rwlock.S	2003-11-23 19:03:00.000000000 -0800
++++ 25/arch/sparc64/lib/rwlock.S	2003-12-28 23:26:34.000000000 -0800
+@@ -85,5 +85,20 @@ __write_trylock_succeed:
+ __write_trylock_fail:
+ 	retl
+ 	 mov		0, %o0
++
++	.globl	__read_trylock
++__read_trylock: /* %o0 = lock_ptr */
++	ldsw		[%o0], %g5
++	brlz,pn		%g5, 100f
++	add		%g5, 1, %g7
++	cas		[%o0], %g5, %g7
++	cmp		%g5, %g7
++	bne,pn		%icc, __read_trylock
++	 membar		#StoreLoad | #StoreStore
++	retl
++	mov		1, %o0
++100:	retl
++	mov		0, %o0
++
+ rwlock_impl_end:
+ 
+--- linux-2.6.0/arch/sparc64/mm/hugetlbpage.c	2003-10-25 14:45:44.000000000 -0700
++++ 25/arch/sparc64/mm/hugetlbpage.c	2003-12-28 23:22:12.000000000 -0800
+@@ -504,7 +504,7 @@ int is_hugepage_mem_enough(size_t size)
+  * this far.
+  */
+ static struct page *hugetlb_nopage(struct vm_area_struct *vma,
+-				   unsigned long address, int unused)
++				   unsigned long address, int *unused)
+ {
+ 	BUG();
+ 	return NULL;
+--- linux-2.6.0/arch/sparc/kernel/irq.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/sparc/kernel/irq.c	2003-12-28 23:22:06.000000000 -0800
+@@ -102,7 +102,7 @@ struct irqaction *irq_action[NR_IRQS] = 
+ 
+ int show_interrupts(struct seq_file *p, void *v)
+ {
+-	int i;
++	int i = *(loff_t *) v;
+ 	struct irqaction * action;
+ 	unsigned long flags;
+ #ifdef CONFIG_SMP
+@@ -114,7 +114,7 @@ int show_interrupts(struct seq_file *p, 
+ 		
+ 		return show_sun4d_interrupts(p, v);
+ 	}
+-	for (i = 0 ; i < NR_IRQS ; i++) {
++	if (i < NR_IRQS) {
+ 		local_irq_save(flags);
+ 	        action = *(i + irq_action);
+ 		if (!action) 
+--- linux-2.6.0/arch/sparc/kernel/sun4d_irq.c	2003-06-14 12:17:55.000000000 -0700
++++ 25/arch/sparc/kernel/sun4d_irq.c	2003-12-28 23:22:06.000000000 -0800
+@@ -75,13 +75,13 @@ spinlock_t sun4d_imsk_lock = SPIN_LOCK_U
+ 
+ int show_sun4d_interrupts(struct seq_file *p, void *v)
+ {
+-	int i, j = 0, k = 0, sbusl;
++	int i = *(loff_t *) v, j = 0, k = 0, sbusl;
+ 	struct irqaction * action;
+ #ifdef CONFIG_SMP
+ 	int x;
+ #endif
+ 
+-	for (i = 0 ; i < NR_IRQS ; i++) {
++	if (i < NR_IRQS) {
+ 		sbusl = pil_to_sbus[i];
+ 		if (!sbusl) {
+ 	 		action = *(i + irq_action);
+--- linux-2.6.0/arch/sparc/mm/highmem.c	2003-06-14 12:18:04.000000000 -0700
++++ 25/arch/sparc/mm/highmem.c	2003-12-28 23:22:58.000000000 -0800
+@@ -33,6 +33,7 @@ void *kmap_atomic(struct page *page, enu
+ 	unsigned long idx;
+ 	unsigned long vaddr;
+ 
++	/* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */
+ 	inc_preempt_count();
+ 	if (page < highmem_start_page)
+ 		return page_address(page);
+@@ -69,6 +70,7 @@ void kunmap_atomic(void *kvaddr, enum km
+ 
+ 	if (vaddr < fix_kmap_begin) { // FIXME
+ 		dec_preempt_count();
++		preempt_check_resched();
+ 		return;
+ 	}
+ 
+@@ -96,4 +98,5 @@ void kunmap_atomic(void *kvaddr, enum km
+ #endif
+ #endif
+ 	dec_preempt_count();
++	preempt_check_resched();
+ }
+--- linux-2.6.0/arch/um/drivers/ubd_kern.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/arch/um/drivers/ubd_kern.c	2003-12-28 23:21:17.000000000 -0800
+@@ -49,9 +49,9 @@ static spinlock_t ubd_lock = SPIN_LOCK_U
+ 
+ static void (*do_ubd)(void);
+ 
+-static int ubd_open(struct inode * inode, struct file * filp);
+-static int ubd_release(struct inode * inode, struct file * file);
+-static int ubd_ioctl(struct inode * inode, struct file * file,
++static int ubd_open(struct block_device *bdev, struct file * filp);
++static int ubd_release(struct gendisk *disk);
++static int ubd_ioctl(struct block_device *bdev, struct file * file,
+ 		     unsigned int cmd, unsigned long arg);
+ 
+ #define MAX_DEV (8)
+@@ -710,9 +710,9 @@ int ubd_driver_init(void){
+ 
+ device_initcall(ubd_driver_init);
+ 
+-static int ubd_open(struct inode *inode, struct file *filp)
++static int ubd_open(struct block_device *bdev, struct file *filp)
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
++	struct gendisk *disk = bdev->bd_disk;
+ 	struct ubd *dev = disk->private_data;
+ 	int err = -EISDIR;
+ 
+@@ -739,9 +739,8 @@ static int ubd_open(struct inode *inode,
+ 	return(err);
+ }
+ 
+-static int ubd_release(struct inode * inode, struct file * file)
++static int ubd_release(struct gendisk *disk)
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
+ 	struct ubd *dev = disk->private_data;
+ 
+ 	if(--dev->count == 0)
+@@ -865,11 +864,11 @@ static void do_ubd_request(request_queue
+ 	}
+ }
+ 
+-static int ubd_ioctl(struct inode * inode, struct file * file,
++static int ubd_ioctl(struct block_device *bdev, struct file * file,
+ 		     unsigned int cmd, unsigned long arg)
+ {
+ 	struct hd_geometry *loc = (struct hd_geometry *) arg;
+-	struct ubd *dev = inode->i_bdev->bd_disk->private_data;
++	struct ubd *dev = bdev->bd_disk->private_data;
+ 	int err;
+ 	struct hd_driveid ubd_id = {
+ 		.cyls		= 0,
+@@ -890,7 +889,7 @@ static int ubd_ioctl(struct inode * inod
+ 
+ 	case HDIO_SET_UNMASKINTR:
+ 		if(!capable(CAP_SYS_ADMIN)) return(-EACCES);
+-		if((arg > 1) || (inode->i_bdev->bd_contains != inode->i_bdev))
++		if((arg > 1) || (bdev->bd_contains != bdev))
+ 			return(-EINVAL);
+ 		return(0);
+ 
+@@ -910,7 +909,7 @@ static int ubd_ioctl(struct inode * inod
+ 
+ 	case HDIO_SET_MULTCOUNT:
+ 		if(!capable(CAP_SYS_ADMIN)) return(-EACCES);
+-		if(inode->i_bdev->bd_contains != inode->i_bdev)
++		if(bdev->bd_contains != bdev)
+ 			return(-EINVAL);
+ 		return(0);
+ 
+--- linux-2.6.0/arch/um/kernel/irq.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/um/kernel/irq.c	2003-12-28 23:22:10.000000000 -0800
+@@ -572,53 +572,14 @@ static struct proc_dir_entry * smp_affin
+  */
+ static cpumask_t irq_affinity [NR_IRQS] = { [0 ... NR_IRQS-1] = CPU_MASK_ALL };
+ 
+-#define HEX_DIGITS (2*sizeof(cpumask_t))
+-
+ static int irq_affinity_read_proc (char *page, char **start, off_t off,
+ 			int count, int *eof, void *data)
+ {
+-	if (count < HEX_DIGITS+1)
+-		return -EINVAL;
+-	return sprintf (page, "%08lx\n", irq_affinity[(long)data]);
+-}
+-
+-static unsigned int parse_hex_value (const char *buffer,
+-		unsigned long count, cpumask_t *ret)
+-{
+-	unsigned char hexnum [HEX_DIGITS];
+-	cpumask_t value = CPU_MASK_NONE;
+-	int i;
+-
+-	if (!count)
++	int len = cpumask_snprintf(page, count, irq_affinity[(long)data]);
++	if (count - len < 2)
+ 		return -EINVAL;
+-	if (count > HEX_DIGITS)
+-		count = HEX_DIGITS;
+-	if (copy_from_user(hexnum, buffer, count))
+-		return -EFAULT;
+-
+-	/*
+-	 * Parse the first 8 characters as a hex string, any non-hex char
+-	 * is end-of-string. '00e1', 'e1', '00E1', 'E1' are all the same.
+-	 */
+-
+-	for (i = 0; i < count; i++) {
+-		unsigned int k, c = hexnum[i];
+-
+-		switch (c) {
+-			case '0' ... '9': c -= '0'; break;
+-			case 'a' ... 'f': c -= 'a'-10; break;
+-			case 'A' ... 'F': c -= 'A'-10; break;
+-		default:
+-			goto out;
+-		}
+-		cpus_shift_left(value, value, 16);
+-		for (k = 0; k < 4; ++k)
+-			if (c & (1 << k))
+-				cpu_set(k, value);
+-	}
+-out:
+-	*ret = value;
+-	return 0;
++	len += sprintf(page + len, "\n");
++	return len;
+ }
+ 
+ static int irq_affinity_write_proc (struct file *file, const char *buffer,
+@@ -630,7 +591,7 @@ static int irq_affinity_write_proc (stru
+ 	if (!irq_desc[irq].handler->set_affinity)
+ 		return -EIO;
+ 
+-	err = parse_hex_value(buffer, count, &new_value);
++	err = cpumask_parse(buffer, count, new_value);
+ 
+ #ifdef CONFIG_SMP
+ 	/*
+@@ -652,19 +613,10 @@ static int irq_affinity_write_proc (stru
+ static int prof_cpu_mask_read_proc (char *page, char **start, off_t off,
+ 			int count, int *eof, void *data)
+ {
+-	cpumask_t tmp, *mask = (cpumask_t *) data;
+-	int k, len = 0;
+-
+-	if (count < HEX_DIGITS+1)
++	int len = cpumask_snprintf(page, count, *(cpumask_t *)data);
++	if (count - len < 2)
+ 		return -EINVAL;
+-	tmp = *mask;
+-	for (k = 0; k < sizeof(cpumask_t)/sizeof(u16); ++k) {
+-		int j = sprintf(page, "%04hx", cpus_coerce(tmp));
+-		len += j;
+-		page += j;
+-		cpus_shift_right(tmp, tmp, 16);
+-	}
+-	len += sprintf(page, "\n");
++	len += sprintf(page + len, "\n");
+ 	return len;
+ }
+ 
+@@ -674,7 +626,7 @@ static int prof_cpu_mask_write_proc (str
+ 	cpumask_t *mask = (cpumask_t *)data, new_value;
+ 	unsigned long full_count = count, err;
+ 
+-	err = parse_hex_value(buffer, count, &new_value);
++	err = cpumask_parse(buffer, count, new_value);
+ 	if (err)
+ 		return err;
+ 
+--- linux-2.6.0/arch/v850/kernel/irq.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/v850/kernel/irq.c	2003-12-28 23:22:06.000000000 -0800
+@@ -81,16 +81,18 @@ volatile unsigned long irq_err_count, sp
+ 
+ int show_interrupts(struct seq_file *p, void *v)
+ {
+-	int i;
++	int i = *(loff_t *) v;
+ 	struct irqaction * action;
+ 	unsigned long flags;
+ 
+-	seq_puts(p, "           ");
+-	for (i=0; i < 1 /*smp_num_cpus*/; i++)
+-		seq_printf(p, "CPU%d       ", i);
+-	seq_putc(p, '\n');
++	if (i == 0) {
++		seq_puts(p, "           ");
++		for (i=0; i < 1 /*smp_num_cpus*/; i++)
++			seq_printf(p, "CPU%d       ", i);
++		seq_putc(p, '\n');
++	}
+ 
+-	for (i = 0 ; i < NR_IRQS ; i++) {
++	if (i < NR_IRQS) {
+ 		int j, count, num;
+ 		const char *type_name = irq_desc[i].handler->typename;
+ 		spin_lock_irqsave(&irq_desc[j].lock, flags);
+@@ -121,8 +123,8 @@ int show_interrupts(struct seq_file *p, 
+ 		seq_putc(p, '\n');
+ skip:
+ 		spin_unlock_irqrestore(&irq_desc[j].lock, flags);
+-	}
+-	seq_printf(p, "ERR: %10lu\n", irq_err_count);
++	} else if (i == NR_IRQS)
++		seq_printf(p, "ERR: %10lu\n", irq_err_count);
+ 	return 0;
+ }
+ 
+--- linux-2.6.0/arch/x86_64/boot/compressed/head.S	2003-11-09 16:45:05.000000000 -0800
++++ 25/arch/x86_64/boot/compressed/head.S	2003-12-28 23:21:09.000000000 -0800
+@@ -26,6 +26,7 @@
+ .code32
+ .text
+ 
++#define IN_BOOTLOADER
+ #include <linux/linkage.h>
+ #include <asm/segment.h>
+ 
+--- linux-2.6.0/arch/x86_64/boot/compressed/misc.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/arch/x86_64/boot/compressed/misc.c	2003-12-28 23:21:09.000000000 -0800
+@@ -9,6 +9,7 @@
+  * High loaded stuff by Hans Lermen & Werner Almesberger, Feb. 1996
+  */
+ 
++#define IN_BOOTLOADER
+ #include "miscsetup.h"
+ #include <asm/io.h>
+ 
+--- linux-2.6.0/arch/x86_64/defconfig	2003-09-27 18:57:44.000000000 -0700
++++ 25/arch/x86_64/defconfig	2003-12-28 23:26:30.000000000 -0800
+@@ -743,7 +743,7 @@ CONFIG_MAGIC_SYSRQ=y
+ # CONFIG_INIT_DEBUG is not set
+ # CONFIG_DEBUG_INFO is not set
+ # CONFIG_FRAME_POINTER is not set
+-CONFIG_IOMMU_DEBUG=y
++# CONFIG_IOMMU_DEBUG is not set
+ CONFIG_IOMMU_LEAK=y
+ CONFIG_MCE_DEBUG=y
+ 
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/arch/x86_64/ia32/ia32_aout.c	2003-12-28 23:22:16.000000000 -0800
+@@ -0,0 +1,506 @@
++/*
++ *  a.out loader for x86-64
++ *
++ *  Copyright (C) 1991, 1992, 1996  Linus Torvalds
++ *  Hacked together by Andi Kleen
++ */
++
++#include <linux/module.h>
++
++#include <linux/time.h>
++#include <linux/kernel.h>
++#include <linux/mm.h>
++#include <linux/mman.h>
++#include <linux/a.out.h>
++#include <linux/errno.h>
++#include <linux/signal.h>
++#include <linux/string.h>
++#include <linux/fs.h>
++#include <linux/file.h>
++#include <linux/stat.h>
++#include <linux/fcntl.h>
++#include <linux/ptrace.h>
++#include <linux/user.h>
++#include <linux/slab.h>
++#include <linux/binfmts.h>
++#include <linux/personality.h>
++#include <linux/init.h>
++
++#include <asm/system.h>
++#include <asm/uaccess.h>
++#include <asm/pgalloc.h>
++#include <asm/cacheflush.h>
++#include <asm/user32.h>
++
++#undef WARN_OLD
++
++extern int ia32_setup_arg_pages(struct linux_binprm *bprm);
++
++static int load_aout_binary(struct linux_binprm *, struct pt_regs * regs);
++static int load_aout_library(struct file*);
++static int aout_core_dump(long signr, struct pt_regs * regs, struct file *file);
++
++/*
++ * fill in the user structure for a core dump..
++ */
++static void dump_thread32(struct pt_regs * regs, struct user32 * dump)
++{
++	u32 fs,gs;
++
++/* changed the size calculations - should hopefully work better. lbt */
++	dump->magic = CMAGIC;
++	dump->start_code = 0;
++	dump->start_stack = regs->rsp & ~(PAGE_SIZE - 1);
++	dump->u_tsize = ((unsigned long) current->mm->end_code) >> PAGE_SHIFT;
++	dump->u_dsize = ((unsigned long) (current->mm->brk + (PAGE_SIZE-1))) >> PAGE_SHIFT;
++	dump->u_dsize -= dump->u_tsize;
++	dump->u_ssize = 0;
++	dump->u_debugreg[0] = current->thread.debugreg0;  
++	dump->u_debugreg[1] = current->thread.debugreg1;  
++	dump->u_debugreg[2] = current->thread.debugreg2;  
++	dump->u_debugreg[3] = current->thread.debugreg3;  
++	dump->u_debugreg[4] = 0;  
++	dump->u_debugreg[5] = 0;  
++	dump->u_debugreg[6] = current->thread.debugreg6;  
++	dump->u_debugreg[7] = current->thread.debugreg7;  
++
++	if (dump->start_stack < 0xc0000000)
++		dump->u_ssize = ((unsigned long) (0xc0000000 - dump->start_stack)) >> PAGE_SHIFT;
++
++	dump->regs.ebx = regs->rbx;
++	dump->regs.ecx = regs->rcx;
++	dump->regs.edx = regs->rdx;
++	dump->regs.esi = regs->rsi;
++	dump->regs.edi = regs->rdi;
++	dump->regs.ebp = regs->rbp;
++	dump->regs.eax = regs->rax;
++	dump->regs.ds = current->thread.ds;
++	dump->regs.es = current->thread.es;
++	asm("movl %%fs,%0" : "=r" (fs)); dump->regs.fs = fs;
++	asm("movl %%gs,%0" : "=r" (gs)); dump->regs.gs = gs; 
++	dump->regs.orig_eax = regs->orig_rax;
++	dump->regs.eip = regs->rip;
++	dump->regs.cs = regs->cs;
++	dump->regs.eflags = regs->eflags;
++	dump->regs.esp = regs->rsp;
++	dump->regs.ss = regs->ss;
++
++#if 1 /* FIXME */
++	dump->u_fpvalid = 0;
++#else
++	dump->u_fpvalid = dump_fpu (regs, &dump->i387);
++#endif
++}
++
++static struct linux_binfmt aout_format = {
++	.module		= THIS_MODULE,
++	.load_binary	= load_aout_binary,
++	.load_shlib	= load_aout_library,
++	.core_dump	= aout_core_dump,
++	.min_coredump	= PAGE_SIZE
++};
++
++static void set_brk(unsigned long start, unsigned long end)
++{
++	start = PAGE_ALIGN(start);
++	end = PAGE_ALIGN(end);
++	if (end <= start)
++		return;
++	do_brk(start, end - start);
++}
++
++/*
++ * These are the only things you should do on a core-file: use only these
++ * macros to write out all the necessary info.
++ */
++
++static int dump_write(struct file *file, const void *addr, int nr)
++{
++	return file->f_op->write(file, addr, nr, &file->f_pos) == nr;
++}
++
++#define DUMP_WRITE(addr, nr)	\
++	if (!dump_write(file, (void *)(addr), (nr))) \
++		goto end_coredump;
++
++#define DUMP_SEEK(offset) \
++if (file->f_op->llseek) { \
++	if (file->f_op->llseek(file,(offset),0) != (offset)) \
++ 		goto end_coredump; \
++} else file->f_pos = (offset)
++
++/*
++ * Routine writes a core dump image in the current directory.
++ * Currently only a stub-function.
++ *
++ * Note that setuid/setgid files won't make a core-dump if the uid/gid
++ * changed due to the set[u|g]id. It's enforced by the "current->mm->dumpable"
++ * field, which also makes sure the core-dumps won't be recursive if the
++ * dumping of the process results in another error..
++ */
++
++static int aout_core_dump(long signr, struct pt_regs * regs, struct file *file)
++{
++	mm_segment_t fs;
++	int has_dumped = 0;
++	unsigned long dump_start, dump_size;
++	struct user32 dump;
++#       define START_DATA(u)	(u.u_tsize << PAGE_SHIFT)
++#       define START_STACK(u)   (u.start_stack)
++
++	fs = get_fs();
++	set_fs(KERNEL_DS);
++	has_dumped = 1;
++	current->flags |= PF_DUMPCORE;
++       	strncpy(dump.u_comm, current->comm, sizeof(current->comm));
++	dump.u_ar0 = (u32)(((unsigned long)(&dump.regs)) - ((unsigned long)(&dump)));
++	dump.signal = signr;
++	dump_thread32(regs, &dump);
++
++/* If the size of the dump file exceeds the rlimit, then see what would happen
++   if we wrote the stack, but not the data area.  */
++	if ((dump.u_dsize+dump.u_ssize+1) * PAGE_SIZE >
++	    current->rlim[RLIMIT_CORE].rlim_cur)
++		dump.u_dsize = 0;
++
++/* Make sure we have enough room to write the stack and data areas. */
++	if ((dump.u_ssize+1) * PAGE_SIZE >
++	    current->rlim[RLIMIT_CORE].rlim_cur)
++		dump.u_ssize = 0;
++
++/* make sure we actually have a data and stack area to dump */
++	set_fs(USER_DS);
++	if (verify_area(VERIFY_READ, (void *) (unsigned long)START_DATA(dump), dump.u_dsize << PAGE_SHIFT))
++		dump.u_dsize = 0;
++	if (verify_area(VERIFY_READ, (void *) (unsigned long)START_STACK(dump), dump.u_ssize << PAGE_SHIFT))
++		dump.u_ssize = 0;
++
++	set_fs(KERNEL_DS);
++/* struct user */
++	DUMP_WRITE(&dump,sizeof(dump));
++/* Now dump all of the user data.  Include malloced stuff as well */
++	DUMP_SEEK(PAGE_SIZE);
++/* now we start writing out the user space info */
++	set_fs(USER_DS);
++/* Dump the data area */
++	if (dump.u_dsize != 0) {
++		dump_start = START_DATA(dump);
++		dump_size = dump.u_dsize << PAGE_SHIFT;
++		DUMP_WRITE(dump_start,dump_size);
++	}
++/* Now prepare to dump the stack area */
++	if (dump.u_ssize != 0) {
++		dump_start = START_STACK(dump);
++		dump_size = dump.u_ssize << PAGE_SHIFT;
++		DUMP_WRITE(dump_start,dump_size);
++	}
++/* Finally dump the task struct.  Not be used by gdb, but could be useful */
++	set_fs(KERNEL_DS);
++	DUMP_WRITE(current,sizeof(*current));
++end_coredump:
++	set_fs(fs);
++	return has_dumped;
++}
++
++/*
++ * create_aout_tables() parses the env- and arg-strings in new user
++ * memory and creates the pointer tables from them, and puts their
++ * addresses on the "stack", returning the new stack pointer value.
++ */
++static u32 * create_aout_tables(char * p, struct linux_binprm * bprm)
++{
++	u32 *argv, *envp;
++	u32 * sp;
++	int argc = bprm->argc;
++	int envc = bprm->envc;
++
++	sp = (u32 *) ((-(unsigned long)sizeof(u32)) & (unsigned long) p);
++	sp -= envc+1;
++	envp = (u32 *) sp;
++	sp -= argc+1;
++	argv = (u32 *) sp;
++	put_user((unsigned long) envp,--sp);
++	put_user((unsigned long) argv,--sp);
++	put_user(argc,--sp);
++	current->mm->arg_start = (unsigned long) p;
++	while (argc-->0) {
++		char c;
++		put_user((u32)(unsigned long)p,argv++);
++		do {
++			get_user(c,p++);
++		} while (c);
++	}
++	put_user(NULL,argv);
++	current->mm->arg_end = current->mm->env_start = (unsigned long) p;
++	while (envc-->0) {
++		char c;
++		put_user((u32)(unsigned long)p,envp++);
++		do {
++			get_user(c,p++);
++		} while (c);
++	}
++	put_user(NULL,envp);
++	current->mm->env_end = (unsigned long) p;
++	return sp;
++}
++
++/*
++ * These are the functions used to load a.out style executables and shared
++ * libraries.  There is no binary dependent code anywhere else.
++ */
++
++static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
++{
++	struct exec ex;
++	unsigned long error;
++	unsigned long fd_offset;
++	unsigned long rlim;
++	int retval;
++
++	ex = *((struct exec *) bprm->buf);		/* exec-header */
++	if ((N_MAGIC(ex) != ZMAGIC && N_MAGIC(ex) != OMAGIC &&
++	     N_MAGIC(ex) != QMAGIC && N_MAGIC(ex) != NMAGIC) ||
++	    N_TRSIZE(ex) || N_DRSIZE(ex) ||
++	    i_size_read(bprm->file->f_dentry->d_inode) < ex.a_text+ex.a_data+N_SYMSIZE(ex)+N_TXTOFF(ex)) {
++		return -ENOEXEC;
++	}
++
++	fd_offset = N_TXTOFF(ex);
++
++	/* Check initial limits. This avoids letting people circumvent
++	 * size limits imposed on them by creating programs with large
++	 * arrays in the data or bss.
++	 */
++	rlim = current->rlim[RLIMIT_DATA].rlim_cur;
++	if (rlim >= RLIM_INFINITY)
++		rlim = ~0;
++	if (ex.a_data + ex.a_bss > rlim)
++		return -ENOMEM;
++
++	/* Flush all traces of the currently running executable */
++	retval = flush_old_exec(bprm);
++	if (retval)
++		return retval;
++
++	regs->cs = __USER32_CS; 
++	regs->r8 = regs->r9 = regs->r10 = regs->r11 = regs->r12 =
++		regs->r13 = regs->r14 = regs->r15 = 0;
++	set_thread_flag(TIF_IA32); 
++
++	/* OK, This is the point of no return */
++	set_personality(PER_LINUX);
++
++	current->mm->end_code = ex.a_text +
++		(current->mm->start_code = N_TXTADDR(ex));
++	current->mm->end_data = ex.a_data +
++		(current->mm->start_data = N_DATADDR(ex));
++	current->mm->brk = ex.a_bss +
++		(current->mm->start_brk = N_BSSADDR(ex));
++	current->mm->free_area_cache = TASK_UNMAPPED_BASE;
++
++	current->mm->rss = 0;
++	current->mm->mmap = NULL;
++	compute_creds(bprm);
++ 	current->flags &= ~PF_FORKNOEXEC;
++
++	if (N_MAGIC(ex) == OMAGIC) {
++		unsigned long text_addr, map_size;
++		loff_t pos;
++
++		text_addr = N_TXTADDR(ex);
++
++		pos = 32;
++		map_size = ex.a_text+ex.a_data;
++
++		error = do_brk(text_addr & PAGE_MASK, map_size);
++		if (error != (text_addr & PAGE_MASK)) {
++			send_sig(SIGKILL, current, 0);
++			return error;
++		}
++
++		error = bprm->file->f_op->read(bprm->file, (char *)text_addr,
++			  ex.a_text+ex.a_data, &pos);
++		if ((signed long)error < 0) {
++			send_sig(SIGKILL, current, 0);
++			return error;
++		}
++			 
++		flush_icache_range(text_addr, text_addr+ex.a_text+ex.a_data);
++	} else {
++#ifdef WARN_OLD
++		static unsigned long error_time, error_time2;
++		if ((ex.a_text & 0xfff || ex.a_data & 0xfff) &&
++		    (N_MAGIC(ex) != NMAGIC) && (jiffies-error_time2) > 5*HZ)
++		{
++			printk(KERN_NOTICE "executable not page aligned\n");
++			error_time2 = jiffies;
++		}
++
++		if ((fd_offset & ~PAGE_MASK) != 0 &&
++		    (jiffies-error_time) > 5*HZ)
++		{
++			printk(KERN_WARNING 
++			       "fd_offset is not page aligned. Please convert program: %s\n",
++			       bprm->file->f_dentry->d_name.name);
++			error_time = jiffies;
++		}
++#endif
++
++		if (!bprm->file->f_op->mmap||((fd_offset & ~PAGE_MASK) != 0)) {
++			loff_t pos = fd_offset;
++			do_brk(N_TXTADDR(ex), ex.a_text+ex.a_data);
++			bprm->file->f_op->read(bprm->file,(char *)N_TXTADDR(ex),
++					ex.a_text+ex.a_data, &pos);
++			flush_icache_range((unsigned long) N_TXTADDR(ex),
++					   (unsigned long) N_TXTADDR(ex) +
++					   ex.a_text+ex.a_data);
++			goto beyond_if;
++		}
++
++		down_write(&current->mm->mmap_sem);
++		error = do_mmap(bprm->file, N_TXTADDR(ex), ex.a_text,
++			PROT_READ | PROT_EXEC,
++			MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE | MAP_32BIT,
++			fd_offset);
++		up_write(&current->mm->mmap_sem);
++
++		if (error != N_TXTADDR(ex)) {
++			send_sig(SIGKILL, current, 0);
++			return error;
++		}
++
++		down_write(&current->mm->mmap_sem);
++ 		error = do_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
++				PROT_READ | PROT_WRITE | PROT_EXEC,
++				MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE | MAP_32BIT,
++				fd_offset + ex.a_text);
++		up_write(&current->mm->mmap_sem);
++		if (error != N_DATADDR(ex)) {
++			send_sig(SIGKILL, current, 0);
++			return error;
++		}
++	}
++beyond_if:
++	set_binfmt(&aout_format);
++
++	set_brk(current->mm->start_brk, current->mm->brk);
++
++	retval = ia32_setup_arg_pages(bprm); 
++	if (retval < 0) { 
++		/* Someone check-me: is this error path enough? */ 
++		send_sig(SIGKILL, current, 0); 
++		return retval;
++	}
++
++	current->mm->start_stack =
++		(unsigned long) create_aout_tables((char *) bprm->p, bprm);
++	/* start thread */
++	asm volatile("movl %0,%%fs" :: "r" (0)); \
++	asm volatile("movl %0,%%es; movl %0,%%ds": :"r" (__USER32_DS));
++	load_gs_index(0); 
++	(regs)->rip = ex.a_entry;
++	(regs)->rsp = current->mm->start_stack;
++	(regs)->eflags = 0x200;
++	(regs)->cs = __USER32_CS;
++	(regs)->ss = __USER32_DS;
++	set_fs(USER_DS);
++	if (unlikely(current->ptrace & PT_PTRACED)) {
++		if (current->ptrace & PT_TRACE_EXEC)
++			ptrace_notify ((PTRACE_EVENT_EXEC << 8) | SIGTRAP);
++		else
++			send_sig(SIGTRAP, current, 0);
++	}
++	return 0;
++}
++
++static int load_aout_library(struct file *file)
++{
++	struct inode * inode;
++	unsigned long bss, start_addr, len;
++	unsigned long error;
++	int retval;
++	struct exec ex;
++
++	inode = file->f_dentry->d_inode;
++
++	retval = -ENOEXEC;
++	error = kernel_read(file, 0, (char *) &ex, sizeof(ex));
++	if (error != sizeof(ex))
++		goto out;
++
++	/* We come in here for the regular a.out style of shared libraries */
++	if ((N_MAGIC(ex) != ZMAGIC && N_MAGIC(ex) != QMAGIC) || N_TRSIZE(ex) ||
++	    N_DRSIZE(ex) || ((ex.a_entry & 0xfff) && N_MAGIC(ex) == ZMAGIC) ||
++	    i_size_read(inode) < ex.a_text+ex.a_data+N_SYMSIZE(ex)+N_TXTOFF(ex)) {
++		goto out;
++	}
++
++	if (N_FLAGS(ex))
++		goto out;
++
++	/* For  QMAGIC, the starting address is 0x20 into the page.  We mask
++	   this off to get the starting address for the page */
++
++	start_addr =  ex.a_entry & 0xfffff000;
++
++	if ((N_TXTOFF(ex) & ~PAGE_MASK) != 0) {
++		loff_t pos = N_TXTOFF(ex);
++
++#ifdef WARN_OLD
++		static unsigned long error_time;
++		if ((jiffies-error_time) > 5*HZ)
++		{
++			printk(KERN_WARNING 
++			       "N_TXTOFF is not page aligned. Please convert library: %s\n",
++			       file->f_dentry->d_name.name);
++			error_time = jiffies;
++		}
++#endif
++
++		do_brk(start_addr, ex.a_text + ex.a_data + ex.a_bss);
++		
++		file->f_op->read(file, (char *)start_addr,
++			ex.a_text + ex.a_data, &pos);
++		flush_icache_range((unsigned long) start_addr,
++				   (unsigned long) start_addr + ex.a_text + ex.a_data);
++
++		retval = 0;
++		goto out;
++	}
++	/* Now use mmap to map the library into memory. */
++	down_write(&current->mm->mmap_sem);
++	error = do_mmap(file, start_addr, ex.a_text + ex.a_data,
++			PROT_READ | PROT_WRITE | PROT_EXEC,
++			MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_32BIT,
++			N_TXTOFF(ex));
++	up_write(&current->mm->mmap_sem);
++	retval = error;
++	if (error != start_addr)
++		goto out;
++
++	len = PAGE_ALIGN(ex.a_text + ex.a_data);
++	bss = ex.a_text + ex.a_data + ex.a_bss;
++	if (bss > len) {
++		error = do_brk(start_addr + len, bss - len);
++		retval = error;
++		if (error != start_addr + len)
++			goto out;
++	}
++	retval = 0;
++out:
++	return retval;
++}
++
++static int __init init_aout_binfmt(void)
++{
++	return register_binfmt(&aout_format);
++}
++
++static void __exit exit_aout_binfmt(void)
++{
++	unregister_binfmt(&aout_format);
++}
++
++module_init(init_aout_binfmt);
++module_exit(exit_aout_binfmt);
++MODULE_LICENSE("GPL");
+--- linux-2.6.0/arch/x86_64/ia32/ia32entry.S	2003-09-08 13:58:56.000000000 -0700
++++ 25/arch/x86_64/ia32/ia32entry.S	2003-12-28 23:26:31.000000000 -0800
+@@ -221,7 +221,7 @@ ia32_sys_call_table:
+ 	.quad sys_chmod		/* 15 */
+ 	.quad sys_lchown16
+ 	.quad ni_syscall			/* old break syscall holder */
+-	.quad ni_syscall	/* (old)stat */ 
++	.quad sys_stat
+ 	.quad sys32_lseek
+ 	.quad sys_getpid		/* 20 */
+ 	.quad sys_mount	/* mount  */
+@@ -231,7 +231,7 @@ ia32_sys_call_table:
+ 	.quad sys_stime		/* stime */		/* 25 */
+ 	.quad sys32_ptrace	/* ptrace */
+ 	.quad sys_alarm		/* XXX sign extension??? */ 
+-	.quad ni_syscall	/* (old)fstat */
++	.quad sys_fstat	/* (old)fstat */
+ 	.quad sys_pause
+ 	.quad compat_sys_utime	/* 30 */
+ 	.quad ni_syscall	/* old stty syscall holder */
+@@ -287,7 +287,7 @@ ia32_sys_call_table:
+ 	.quad sys_setgroups16
+ 	.quad sys32_old_select
+ 	.quad sys_symlink
+-	.quad ni_syscall	/* (old)lstat */
++	.quad sys_lstat
+ 	.quad sys_readlink		/* 85 */
+ 	.quad sys_uselib
+ 	.quad sys_swapon
+@@ -396,8 +396,8 @@ ia32_sys_call_table:
+ 	.quad stub32_vfork            /* 190 */
+ 	.quad compat_sys_getrlimit
+ 	.quad sys32_mmap2
+-	.quad sys_truncate
+-	.quad sys_ftruncate
++	.quad sys32_truncate64
++	.quad sys32_ftruncate64
+ 	.quad sys32_stat64		/* 195 */
+ 	.quad sys32_lstat64
+ 	.quad sys32_fstat64
+--- linux-2.6.0/arch/x86_64/ia32/ia32_signal.c	2003-09-08 13:58:56.000000000 -0700
++++ 25/arch/x86_64/ia32/ia32_signal.c	2003-12-28 23:26:32.000000000 -0800
+@@ -46,25 +46,25 @@ void signal_fault(struct pt_regs *regs, 
+ 
+ static int ia32_copy_siginfo_to_user(siginfo_t32 *to, siginfo_t *from)
+ {
++	int err;
+ 	if (!access_ok (VERIFY_WRITE, to, sizeof(siginfo_t)))
+ 		return -EFAULT;
+-	if (from->si_code < 0) { 
+-		/* the only field that's different is the alignment
+-		   of the pointer in sigval_t. Move that 4 bytes down including
+-		   padding. */
+-		memmove(&((siginfo_t32 *)&from)->si_int,
+-			&from->si_int, 
+-			sizeof(siginfo_t) - offsetof(siginfo_t, si_int));
+-		/* last 4 bytes stay the same */
+-		return __copy_to_user(to, from, sizeof(siginfo_t32));
+-	} else {
+-		int err;
+ 
+-		/* If you change siginfo_t structure, please be sure
++	/* If you change siginfo_t structure, please make sure that
+ 		   this code is fixed accordingly.
+ 		   It should never copy any pad contained in the structure
+ 		   to avoid security leaks, but must copy the generic
+ 		   3 ints plus the relevant union member.  */
++
++	if (from->si_code < 0) {
++		err = __put_user(from->si_signo, &to->si_signo);
++		err |= __put_user(from->si_errno, &to->si_errno);
++		err |= __put_user(from->si_code, &to->si_code);
++		err |= __put_user(from->_sifields._rt._pid, &to->_sifields._rt._pid);
++		err |= __put_user(from->_sifields._rt._uid, &to->_sifields._rt._uid);
++		err |= __put_user((u32)(u64)from->_sifields._rt._sigval.sival_ptr,
++				  &to->_sifields._rt._sigval.sival_ptr);
++	} else {
+ 		err = __put_user(from->si_signo, &to->si_signo);
+ 		err |= __put_user(from->si_errno, &to->si_errno);
+ 		err |= __put_user(from->si_code, &to->si_code);
+@@ -86,8 +86,8 @@ static int ia32_copy_siginfo_to_user(sig
+ 			break;
+ 		/* case __SI_RT: This is not generated by the kernel as of now.  */
+ 		}
+-		return err;
+ 	}
++	return err;
+ }
+ 
+ asmlinkage long
+@@ -173,6 +173,9 @@ ia32_restore_sigcontext(struct pt_regs *
+ {
+ 	unsigned int err = 0;
+ 	
++	/* Always make any pending restarted system calls return -EINTR */
++	current_thread_info()->restart_block.fn = do_no_restart_syscall;
++
+ #if DEBUG_SIG
+ 	printk("SIG restore_sigcontext: sc=%p err(%x) eip(%x) cs(%x) flg(%x)\n",
+ 		sc, sc->err, sc->eip, sc->cs, sc->eflags);
+--- linux-2.6.0/arch/x86_64/ia32/Makefile	2003-09-27 18:57:44.000000000 -0700
++++ 25/arch/x86_64/ia32/Makefile	2003-12-28 23:22:16.000000000 -0800
+@@ -6,6 +6,8 @@ obj-$(CONFIG_IA32_EMULATION) := ia32entr
+ 	ia32_signal.o tls32.o \
+ 	ia32_binfmt.o fpu32.o ptrace32.o ipc32.o syscall32.o
+ 
++obj-$(CONFIG_IA32_AOUT) += ia32_aout.o
++
+ $(obj)/syscall32.o: $(src)/syscall32.c $(obj)/vsyscall.so
+ 
+ # Teach kbuild about targets
+--- linux-2.6.0/arch/x86_64/ia32/sys_ia32.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/x86_64/ia32/sys_ia32.c	2003-12-28 23:26:31.000000000 -0800
+@@ -110,6 +110,21 @@ int cp_compat_stat(struct kstat *kbuf, s
+ 	return 0;
+ }
+ 
++extern long sys_truncate(char *, loff_t);
++extern long sys_ftruncate(int, loff_t);
++
++asmlinkage long
++sys32_truncate64(char * filename, unsigned long offset_low, unsigned long offset_high)
++{
++       return sys_truncate(filename, ((loff_t) offset_high << 32) | offset_low);
++}
++
++asmlinkage long
++sys32_ftruncate64(unsigned int fd, unsigned long offset_low, unsigned long offset_high)
++{
++       return sys_ftruncate(fd, ((loff_t) offset_high << 32) | offset_low);
++}
++
+ /* Another set for IA32/LFS -- x86_64 struct stat is different due to 
+    support for 64bit inode numbers. */
+ 
+--- linux-2.6.0/arch/x86_64/Kconfig	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/x86_64/Kconfig	2003-12-28 23:26:30.000000000 -0800
+@@ -314,7 +314,7 @@ config SOFTWARE_SUSPEND
+ 	  This option is close to getting stable. However there is still some
+ 	  absence of features.
+ 
+-	  For more information take a look at Documentation/swsusp.txt.
++	  For more information take a look at Documentation/power/swsusp.txt.
+ 
+ source "drivers/acpi/Kconfig"
+ 
+@@ -371,6 +371,12 @@ config IA32_EMULATION
+ 	  turn this on, unless you're 100% sure that you don't have any 32-bit programs
+ 	  left.
+ 
++config IA32_AOUT
++       bool "IA32 a.out support"
++       depends on IA32_EMULATION
++       help
++         Support old a.out binaries in the 32bit emulation.
++
+ config COMPAT
+ 	bool
+ 	depends on IA32_EMULATION
+@@ -505,6 +511,7 @@ config FRAME_POINTER
+ 	 Normally you should say N.
+ 
+ config IOMMU_DEBUG
++       depends on GART_IOMMU && DEBUG_KERNEL
+        bool "Force IOMMU to on" 
+        help
+          Force the IOMMU to on even when you have less than 4GB of memory and add 
+--- linux-2.6.0/arch/x86_64/kernel/acpi/boot.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/arch/x86_64/kernel/acpi/boot.c	2003-12-28 23:21:33.000000000 -0800
+@@ -46,11 +46,13 @@
+ #include <asm/proto.h>
+ #include <asm/tlbflush.h>
+ 
+-int acpi_lapic = 0;
+-int acpi_ioapic = 0;
+-
+ #define PREFIX			"ACPI: "
+ 
++int acpi_noirq __initdata = 0;	/* skip ACPI IRQ initialization */
++int acpi_ht __initdata = 1;	/* enable HT */
++
++int acpi_lapic = 0;
++int acpi_ioapic = 0;
+ 
+ /* --------------------------------------------------------------------------
+                               Boot-time Configuration
+@@ -253,29 +255,66 @@ acpi_parse_hpet (
+ 
+ #ifdef CONFIG_ACPI_BUS
+ /*
+- * Set specified PIC IRQ to level triggered mode.
++ * "acpi_pic_sci=level" (current default)
++ * programs the PIC-mode SCI to Level Trigger.
++ * (NO-OP if the BIOS set Level Trigger already)
++ *
++ * If a PIC-mode SCI is not recogznied or gives spurious IRQ7's
++ * it may require Edge Trigger -- use "acpi_pic_sci=edge"
++ * (NO-OP if the BIOS set Edge Trigger already)
+  *
+  * Port 0x4d0-4d1 are ECLR1 and ECLR2, the Edge/Level Control Registers
+  * for the 8259 PIC.  bit[n] = 1 means irq[n] is Level, otherwise Edge.
+  * ECLR1 is IRQ's 0-7 (IRQ 0, 1, 2 must be 0)
+  * ECLR2 is IRQ's 8-15 (IRQ 8, 13 must be 0)
+- *
+- * As the BIOS should have done this for us,
+- * print a warning if the IRQ wasn't already set to level.
+  */
+ 
+-void acpi_pic_set_level_irq(unsigned int irq)
++static int __initdata	acpi_pic_sci_trigger;	/* 0: level, 1: edge */
++
++void __init
++acpi_pic_sci_set_trigger(unsigned int irq)
+ {
+ 	unsigned char mask = 1 << (irq & 7);
+ 	unsigned int port = 0x4d0 + (irq >> 3);
+ 	unsigned char val = inb(port);
+ 
++	
++	printk(PREFIX "IRQ%d SCI:", irq);
+ 	if (!(val & mask)) {
+-		printk(KERN_WARNING PREFIX "IRQ %d was Edge Triggered, "
+-			"setting to Level Triggerd\n", irq);
+-		outb(val | mask, port);
++		printk(" Edge");
++
++		if (!acpi_pic_sci_trigger) {
++			printk(" set to Level");
++			outb(val | mask, port);
++		}
++	} else {
++		printk(" Level");
++
++		if (acpi_pic_sci_trigger) {
++			printk(" set to Edge");
++			outb(val | mask, port);
++		}
+ 	}
++	printk(" Trigger.\n");
+ }
++
++int __init
++acpi_pic_sci_setup(char *str)
++{
++	while (str && *str) {
++		if (strncmp(str, "level", 5) == 0)
++			acpi_pic_sci_trigger = 0;	/* force level trigger */
++		if (strncmp(str, "edge", 4) == 0)
++			acpi_pic_sci_trigger = 1;	/* force edge trigger */
++		str = strchr(str, ',');
++		if (str)
++			str += strspn(str, ", \t");
++	}
++	return 1;
++}
++
++__setup("acpi_pic_sci=", acpi_pic_sci_setup);
++
+ #endif /* CONFIG_ACPI_BUS */
+ 
+ static unsigned long __init
+@@ -354,8 +393,10 @@ acpi_boot_init (void)
+ 	 * Initialize the ACPI boot-time table parser.
+ 	 */
+ 	result = acpi_table_init();
+-	if (result)
++	if (result) {
++		acpi_disabled = 1;
+ 		return result;
++	}
+ 
+ 	result = acpi_blacklisted();
+ 	if (result) {
+@@ -442,7 +483,7 @@ acpi_boot_init (void)
+         * If MPS is present, it will handle them,
+         * otherwise the system will stay in PIC mode
+         */
+-        if (acpi_disabled) {
++        if (acpi_disabled || acpi_noirq) {
+                return 1;
+ 	}
+ 
+@@ -484,6 +525,8 @@ acpi_boot_init (void)
+ 
+ 	acpi_irq_model = ACPI_IRQ_MODEL_IOAPIC;
+ 
++	acpi_irq_balance_set(NULL);
++
+ 	acpi_ioapic = 1;
+ 
+ #endif /*CONFIG_X86_IO_APIC*/
+--- linux-2.6.0/arch/x86_64/kernel/io_apic.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/arch/x86_64/kernel/io_apic.c	2003-12-28 23:21:33.000000000 -0800
+@@ -1087,8 +1087,6 @@ static void __init setup_ioapic_ids_from
+ 	unsigned char old_id;
+ 	unsigned long flags;
+ 
+-	if (acpi_ioapic) return; /* ACPI does that already */
+-
+ 	/*
+ 	 * Set the IOAPIC ID to the value stored in the MPC table.
+ 	 */
+@@ -1673,12 +1671,14 @@ void __init setup_IO_APIC(void)
+ 	/*
+ 	 * Set up the IO-APIC IRQ routing table.
+ 	 */
+-	setup_ioapic_ids_from_mpc();
++	if (!acpi_ioapic)
++		setup_ioapic_ids_from_mpc();
+ 	sync_Arb_IDs();
+ 	setup_IO_APIC_irqs();
+ 	init_IO_APIC_traps();
+ 	check_timer();
+-	print_IO_APIC();
++	if (!acpi_ioapic)
++		print_IO_APIC();
+ }
+ 
+ /* Ensure the ACPI SCI interrupt level is active low, edge-triggered */
+--- linux-2.6.0/arch/x86_64/kernel/irq.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/x86_64/kernel/irq.c	2003-12-28 23:22:10.000000000 -0800
+@@ -138,17 +138,19 @@ atomic_t irq_mis_count;
+ 
+ int show_interrupts(struct seq_file *p, void *v)
+ {
+-	int i, j;
++	int i = *(loff_t *) v, j;
+ 	struct irqaction * action;
+ 	unsigned long flags;
+ 
+-	seq_printf(p, "           ");
+-	for (j=0; j<NR_CPUS; j++)
+-		if (cpu_online(j))
+-		seq_printf(p, "CPU%d       ",j);
+-	seq_putc(p, '\n');
++	if (i == 0) {
++		seq_printf(p, "           ");
++		for (j=0; j<NR_CPUS; j++)
++			if (cpu_online(j))
++				seq_printf(p, "CPU%d       ",j);
++		seq_putc(p, '\n');
++	}
+ 
+-	for (i = 0 ; i < NR_IRQS ; i++) {
++	if (i < NR_IRQS) {
+ 		spin_lock_irqsave(&irq_desc[i].lock, flags);
+ 		action = irq_desc[i].action;
+ 		if (!action) 
+@@ -170,25 +172,26 @@ int show_interrupts(struct seq_file *p, 
+ 		seq_putc(p, '\n');
+ skip:
+ 		spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+-	}
+-	seq_printf(p, "NMI: ");
+-	for (j = 0; j < NR_CPUS; j++)
+-		if (cpu_online(j))
+-		seq_printf(p, "%10u ", cpu_pda[j].__nmi_count);
+-	seq_putc(p, '\n');
++	} else if (i == NR_IRQS) {
++		seq_printf(p, "NMI: ");
++		for (j = 0; j < NR_CPUS; j++)
++			if (cpu_online(j))
++				seq_printf(p, "%10u ", cpu_pda[j].__nmi_count);
++		seq_putc(p, '\n');
+ #ifdef CONFIG_X86_LOCAL_APIC
+-	seq_printf(p, "LOC: ");
+-	for (j = 0; j < NR_CPUS; j++)
+-		if (cpu_online(j))
+-		seq_printf(p, "%10u ", cpu_pda[j].apic_timer_irqs);
+-	seq_putc(p, '\n');
++		seq_printf(p, "LOC: ");
++		for (j = 0; j < NR_CPUS; j++)
++			if (cpu_online(j))
++				seq_printf(p, "%10u ", cpu_pda[j].apic_timer_irqs);
++		seq_putc(p, '\n');
+ #endif
+-	seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
++		seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));
+ #ifdef CONFIG_X86_IO_APIC
+ #ifdef APIC_MISMATCH_DEBUG
+-	seq_printf(p, "MIS: %10u\n", atomic_read(&irq_mis_count));
++		seq_printf(p, "MIS: %10u\n", atomic_read(&irq_mis_count));
+ #endif
+ #endif
++	}
+ 	return 0;
+ }
+ 
+@@ -801,47 +804,6 @@ int setup_irq(unsigned int irq, struct i
+ static struct proc_dir_entry * root_irq_dir;
+ static struct proc_dir_entry * irq_dir [NR_IRQS];
+ 
+-#define HEX_DIGITS (2*sizeof(cpumask_t))
+-
+-static unsigned int parse_hex_value (const char *buffer,
+-		unsigned long count, cpumask_t *ret)
+-{
+-	unsigned char hexnum [HEX_DIGITS];
+-	cpumask_t value = CPU_MASK_NONE;
+-	unsigned i;
+-
+-	if (!count)
+-		return -EINVAL;
+-	if (count > HEX_DIGITS)
+-		count = HEX_DIGITS;
+-	if (copy_from_user(hexnum, buffer, count))
+-		return -EFAULT;
+-
+-	/*
+-	 * Parse the first 8 characters as a hex string, any non-hex char
+-	 * is end-of-string. '00e1', 'e1', '00E1', 'E1' are all the same.
+-	 */
+-
+-	for (i = 0; i < count; i++) {
+-		unsigned int k, c = hexnum[i];
+-
+-		switch (c) {
+-			case '0' ... '9': c -= '0'; break;
+-			case 'a' ... 'f': c -= 'a'-10; break;
+-			case 'A' ... 'F': c -= 'A'-10; break;
+-		default:
+-			goto out;
+-		}
+-		cpus_shift_left(value, value, 4);
+-		for (k = 0; k < 4; ++k)
+-			if (c & (1 << k))
+-				cpu_set(k, value);
+-	}
+-out:
+-	*ret = value;
+-	return 0;
+-}
+-
+ #ifdef CONFIG_SMP
+ 
+ static struct proc_dir_entry * smp_affinity_entry [NR_IRQS];
+@@ -850,19 +812,10 @@ static cpumask_t irq_affinity [NR_IRQS] 
+ static int irq_affinity_read_proc (char *page, char **start, off_t off,
+ 			int count, int *eof, void *data)
+ {
+-	int k, len;
+-	cpumask_t tmp = irq_affinity[(long)data];
+-
+-	if (count < HEX_DIGITS+1)
++	int len = cpumask_snprintf(page, count, irq_affinity[(long)data]);
++	if (count - len < 2)
+ 		return -EINVAL;
+-
+-	for (k = len = 0; k < sizeof(cpumask_t)/sizeof(u16); ++k) {
+-		int j = sprintf(page, "%04hx", (u16)cpus_coerce(tmp));
+-		len += j;
+-		page += j;
+-		cpus_shift_right(tmp, tmp, 16);
+-	}
+-	len += sprintf(page, "\n");
++	len += sprintf(page + len, "\n");
+ 	return len;
+ }
+ 
+@@ -875,7 +828,7 @@ static int irq_affinity_write_proc (stru
+ 	if (!irq_desc[irq].handler->set_affinity)
+ 		return -EIO;
+ 
+-	err = parse_hex_value(buffer, count, &new_value);
++	err = cpumask_parse(buffer, count, new_value);
+ 
+ 	/*
+ 	 * Do not allow disabling IRQs completely - it's a too easy
+@@ -897,20 +850,10 @@ static int irq_affinity_write_proc (stru
+ static int prof_cpu_mask_read_proc (char *page, char **start, off_t off,
+ 			int count, int *eof, void *data)
+ {
+-	cpumask_t tmp, *mask = (cpumask_t *) data;
+-	int k, len;
+-
+-	if (count < HEX_DIGITS+1)
++	int len = cpumask_snprintf(page, count, *(cpumask_t *)data);
++	if (count - len < 2)
+ 		return -EINVAL;
+-
+-	tmp = *mask;
+-	for (k = len = 0; k < sizeof(cpumask_t)/sizeof(u16); ++k) {
+-		int j = sprintf(page, "%04hx", (u16)cpus_coerce(tmp));
+-		len += j;
+-		page += j;
+-		cpus_shift_right(tmp, tmp, 16);
+-	}
+-	len += sprintf(page, "\n");
++	len += sprintf(page + len, "\n");
+ 	return len;
+ }
+ 
+@@ -920,7 +863,7 @@ static int prof_cpu_mask_write_proc (str
+ 	unsigned long full_count = count, err;
+ 	cpumask_t new_value, *mask = (cpumask_t *)data;
+ 
+-	err = parse_hex_value(buffer, count, &new_value);
++	err = cpumask_parse(buffer, count, new_value);
+ 	if (err)
+ 		return err;
+ 
+--- linux-2.6.0/arch/x86_64/kernel/Makefile	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/x86_64/kernel/Makefile	2003-12-28 23:26:30.000000000 -0800
+@@ -25,6 +25,6 @@ obj-$(CONFIG_DUMMY_IOMMU)	+= pci-nommu.o
+ obj-$(CONFIG_MODULES)		+= module.o
+ 
+ bootflag-y			+= ../../i386/kernel/bootflag.o
+-cpuid-$(CONFIG_X86_CPUID)	+= ../../i386/kernel/cpuid.o
++cpuid-$(subst m,y,$(CONFIG_X86_CPUID))  += ../../i386/kernel/cpuid.o
+ 
+ obj-$(CONFIG_CPU_FREQ)	+=	cpufreq/
+--- linux-2.6.0/arch/x86_64/kernel/mpparse.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/arch/x86_64/kernel/mpparse.c	2003-12-28 23:26:32.000000000 -0800
+@@ -226,7 +226,7 @@ static int __init smp_read_mpc(struct mp
+ 	unsigned char *mpt=((unsigned char *)mpc)+count;
+ 
+ 	if (memcmp(mpc->mpc_signature,MPC_SIGNATURE,4)) {
+-		panic("SMP mptable: bad signature [%c%c%c%c]!\n",
++		printk("SMP mptable: bad signature [%c%c%c%c]!\n",
+ 			mpc->mpc_signature[0],
+ 			mpc->mpc_signature[1],
+ 			mpc->mpc_signature[2],
+@@ -234,7 +234,7 @@ static int __init smp_read_mpc(struct mp
+ 		return 0;
+ 	}
+ 	if (mpf_checksum((unsigned char *)mpc,mpc->mpc_length)) {
+-		panic("SMP mptable: checksum error!\n");
++		printk("SMP mptable: checksum error!\n");
+ 		return 0;
+ 	}
+ 	if (mpc->mpc_spec!=0x01 && mpc->mpc_spec!=0x04) {
+@@ -950,6 +950,8 @@ void __init mp_parse_prt (void)
+ 			entry->irq);
+ 	}
+ 	
++	print_IO_APIC();
++
+ 	return;
+ }
+ 
+--- linux-2.6.0/arch/x86_64/kernel/pci-gart.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/arch/x86_64/kernel/pci-gart.c	2003-12-28 23:26:30.000000000 -0800
+@@ -44,12 +44,13 @@ static int no_agp; 
+ #ifdef CONFIG_IOMMU_DEBUG
+ int panic_on_overflow = 1; 
+ int force_iommu = 1;
+-int sac_force_size = 0; 
+ #else
+-int panic_on_overflow = 1; /* for testing */
++int panic_on_overflow = 0;
+ int force_iommu = 0;
+-int sac_force_size = 256*1024*1024;
+ #endif
++int iommu_merge = 0; 
++int iommu_sac_force = 0; 
++int iommu_fullflush = 1;
+ 
+ /* Allocation bitmap for the remapping area */ 
+ static spinlock_t iommu_bitmap_lock = SPIN_LOCK_UNLOCKED;
+@@ -125,7 +126,7 @@ static void free_iommu(unsigned long off
+ /* 
+  * Use global flush state to avoid races with multiple flushers.
+  */
+-static void __flush_gart(struct pci_dev *dev)
++static void flush_gart(struct pci_dev *dev)
+ { 
+ 	unsigned long flags;
+ 	int bus = dev ? dev->bus->number : -1;
+@@ -134,13 +135,17 @@ static void __flush_gart(struct pci_dev 
+ 	int i;
+ 
+ 	spin_lock_irqsave(&iommu_bitmap_lock, flags);
+-	/* recheck flush count inside lock */
+-	if (need_flush) { 
++	if (need_flush || iommu_fullflush) { 
+ 		for (i = 0; northbridges[i]; i++) {
++			u32 w;
+ 			if (bus >= 0 && !(cpu_isset_const(i, bus_cpumask)))
+ 				continue;
+ 			pci_write_config_dword(northbridges[i], 0x9c, 
+ 					       northbridge_flush_word[i] | 1); 
++			/* Make sure the hardware actually executed the flush. */
++			do { 
++				pci_read_config_dword(northbridges[i], 0x9c, &w);
++			} while (w & 1);
+ 			flushed++;
+ 		} 
+ 		if (!flushed) 
+@@ -150,12 +155,6 @@ static void __flush_gart(struct pci_dev 
+ 	spin_unlock_irqrestore(&iommu_bitmap_lock, flags);
+ } 
+ 
+-static inline void flush_gart(struct pci_dev *dev)
+-{ 
+-	if (need_flush)
+-		__flush_gart(dev);
+-} 
+-
+ /* 
+  * Allocate memory for a consistent mapping.
+  * All mappings are consistent here, so this is just a wrapper around
+@@ -174,11 +173,16 @@ void *pci_alloc_consistent(struct pci_de
+ 	} else {
+ 		dma_mask = hwdev->consistent_dma_mask; 
+ 	}
++
+ 	if (dma_mask == 0) 
+ 		dma_mask = 0xffffffff; 
+ 	if (dma_mask < 0xffffffff || no_iommu)
+ 		gfp |= GFP_DMA;
+ 
++	/* Kludge to make it bug-to-bug compatible with i386. i386
++	   uses the normal dma_mask for alloc_consistent. */
++	dma_mask &= hwdev->dma_mask;
++
+ 	memory = (void *)__get_free_pages(gfp, get_order(size));
+ 	if (memory == NULL) {
+ 		return NULL; 
+@@ -394,7 +398,9 @@ static int __pci_map_cont(struct scatter
+ 	
+ 	for (i = start; i < stopat; i++) {
+ 		struct scatterlist *s = &sg[i];
+-		unsigned long start_addr = s->dma_address;
++		unsigned long pages, addr;
++		unsigned long phys_addr = s->dma_address;
++		
+ 		BUG_ON(i > start && s->offset);
+ 		if (i == start) {
+ 			*sout = *s; 
+@@ -403,8 +409,10 @@ static int __pci_map_cont(struct scatter
+ 		} else { 
+ 			sout->length += s->length; 
+ 		}
+-		unsigned long addr = start_addr;
+-		while (addr < start_addr + s->length) { 
++
++		addr = phys_addr;
++		pages = to_pages(s->offset, s->length); 
++		while (pages--) { 
+ 			iommu_gatt_base[iommu_page] = GPTE_ENCODE(addr); 
+ 			SET_LEAK(iommu_page);
+ 			addr += PAGE_SIZE;
+@@ -437,7 +445,7 @@ int pci_map_sg(struct pci_dev *dev, stru
+ 	int out;
+ 	int start;
+ 	unsigned long pages = 0;
+-	int need = 0;
++	int need = 0, nextneed;
+ 
+ 	unsigned long size = 0; 
+ 
+@@ -453,13 +461,14 @@ int pci_map_sg(struct pci_dev *dev, stru
+ 		BUG_ON(s->length == 0); 
+ 
+ 		size += s->length; 
++		nextneed = need_iommu(dev, addr, s->length); 
+ 
+ 		/* Handle the previous not yet processed entries */
+ 		if (i > start) {
+ 			struct scatterlist *ps = &sg[i-1];
+ 			/* Can only merge when the last chunk ends on a page 
+-			   boundary. */
+-			if (!force_iommu || !need || (i-1 > start && ps->offset) ||
++			   boundary and the new one doesn't have an offset. */
++			if (!iommu_merge || !nextneed || !need || s->offset ||
+ 			    (ps->offset + ps->length) % PAGE_SIZE) { 
+ 				if (pci_map_cont(sg, start, i, sg+out, pages, 
+ 						 need) < 0)
+@@ -470,7 +479,7 @@ int pci_map_sg(struct pci_dev *dev, stru
+ 			}
+ 	}
+ 
+-		need = need_iommu(dev, addr, s->length); 
++		need = nextneed;
+ 		pages += to_pages(s->offset, s->length);
+ 	}
+ 	if (pci_map_cont(sg, start, i, sg+out, pages, need) < 0)
+@@ -544,14 +553,12 @@ int pci_dma_supported(struct pci_dev *de
+ 
+ 	   Problem with this is that if we overflow the IOMMU area
+ 	   and return DAC as fallback address the device may not handle it correctly.
+-	   As a compromise we only do this if the IOMMU area is >= 256MB 
+-	   which should make overflow unlikely enough.
+ 	   
+ 	   As a special case some controllers have a 39bit address mode 
+ 	   that is as efficient as 32bit (aic79xx). Don't force SAC for these.
+ 	   Assume all masks <= 40 bits are of this type. Normally this doesn't
+ 	   make any difference, but gives more gentle handling of IOMMU overflow. */
+-	if (force_iommu && (mask > 0xffffffffffULL) && (iommu_size >= sac_force_size)){ 
++	if (iommu_sac_force && (mask >= 0xffffffffffULL)) { 
+ 		printk(KERN_INFO "%s: Force SAC with mask %Lx\n", dev->slot_name,mask);
+ 		return 0; 
+ 	}
+@@ -680,7 +687,7 @@ static int __init pci_iommu_init(void)
+ 	unsigned long iommu_start;
+ 	struct pci_dev *dev;
+ 		
+-#ifndef CONFIG_AGP_AMD_8151
++#ifndef CONFIG_AGP_AMD64
+ 	no_agp = 1; 
+ #else
+ 	/* Makefile puts PCI initialization via subsys_initcall first. */
+--- linux-2.6.0/arch/x86_64/kernel/pci-nommu.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/arch/x86_64/kernel/pci-nommu.c	2003-12-28 23:26:30.000000000 -0800
+@@ -4,6 +4,8 @@
+ #include <linux/string.h>
+ #include <asm/proto.h>
+ 
++int iommu_merge = 0;
++
+ /* 
+  * Dummy IO MMU functions
+  */
+--- linux-2.6.0/arch/x86_64/kernel/setup.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/arch/x86_64/kernel/setup.c	2003-12-28 23:21:33.000000000 -0800
+@@ -65,7 +65,11 @@ unsigned long mmu_cr4_features;
+ EXPORT_SYMBOL_GPL(mmu_cr4_features);
+ 
+ int acpi_disabled = 0;
+-int acpi_ht = 0;
++
++#ifdef	CONFIG_ACPI_BOOT
++extern int __initdata acpi_ht;
++/* int __initdata acpi_force = 0; */
++#endif
+ 
+ /* For PCI or other memory-mapped resources */
+ unsigned long pci_mem_start = 0x10000000;
+@@ -195,6 +199,7 @@ static __init void parse_cmdline_early (
+ 		if (c != ' ') 
+ 			goto next_char; 
+  
++#ifdef CONFIG_ACPI_BOOT
+ 		/* "acpi=off" disables both ACPI table parsing and interpreter init */
+ 		if (!memcmp(from, "acpi=off", 8))
+ 			acpi_disabled = 1;
+@@ -210,6 +215,7 @@ static __init void parse_cmdline_early (
+ 		if (!memcmp(from, "acpi=ht", 7)) { 
+ 			acpi_ht = 1; 
+ 		}
++#endif
+ 
+ 		if (!memcmp(from, "nolapic", 7) ||
+ 		    !memcmp(from, "disableapic", 11))
+--- linux-2.6.0/arch/x86_64/kernel/signal.c	2003-06-16 22:32:20.000000000 -0700
++++ 25/arch/x86_64/kernel/signal.c	2003-12-28 23:26:31.000000000 -0800
+@@ -93,6 +93,8 @@ restore_sigcontext(struct pt_regs *regs,
+ {
+ 	unsigned int err = 0;
+ 
++	/* Always make any pending restarted system calls return -EINTR */
++	current_thread_info()->restart_block.fn = do_no_restart_syscall;
+ 
+ #define COPY(x)		err |= __get_user(regs->x, &sc->x)
+ 
+@@ -355,8 +357,6 @@ handle_signal(unsigned long sig, siginfo
+ 		/* If so, check system call restarting.. */
+ 		switch (regs->rax) {
+ 		        case -ERESTART_RESTARTBLOCK:
+-				current_thread_info()->restart_block.fn = do_no_restart_syscall;
+-				/* FALL THROUGH */
+ 			case -ERESTARTNOHAND:
+ 				regs->rax = -EINTR;
+ 				break;
+@@ -371,10 +371,6 @@ handle_signal(unsigned long sig, siginfo
+ 				regs->rax = regs->orig_rax;
+ 				regs->rip -= 2;
+ 		}
+-		if (regs->rax == (unsigned long)-ERESTART_RESTARTBLOCK){
+-			regs->rax = __NR_restart_syscall;
+- 			regs->rip -= 2;
+- 		}		
+ 	}
+ 
+ #ifdef CONFIG_IA32_EMULATION
+@@ -453,6 +449,10 @@ int do_signal(struct pt_regs *regs, sigs
+ 			regs->rax = regs->orig_rax;
+ 			regs->rip -= 2;
+ 		}
++		if (regs->rax == (unsigned long)-ERESTART_RESTARTBLOCK) {
++			regs->rax = __NR_restart_syscall;
++			regs->rip -= 2;
++		}
+ 	}
+ 	return 0;
+ }
+--- linux-2.6.0/arch/x86_64/kernel/traps.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/arch/x86_64/kernel/traps.c	2003-12-28 23:26:30.000000000 -0800
+@@ -218,8 +218,12 @@ void show_stack(struct task_struct *tsk,
+ 	// debugging aid: "show_stack(NULL, NULL);" prints the
+ 	// back trace for this cpu.
+ 
+-	if(rsp==NULL)
+-		rsp=(unsigned long*)&rsp;
++	if (rsp == NULL) {
++		if (tsk)
++			rsp = (unsigned long *)tsk->thread.rsp;
++		else
++			rsp = (unsigned long *)&rsp;
++	}
+ 
+ 	stack = rsp;
+ 	for(i=0; i < kstack_depth_to_print; i++) {
+--- linux-2.6.0/arch/x86_64/mm/fault.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/arch/x86_64/mm/fault.c	2003-12-28 23:26:31.000000000 -0800
+@@ -73,6 +73,9 @@ static int is_prefetch(struct pt_regs *r
+ 	if (regs->cs & (1<<2))
+ 		return 0;
+ 
++	if ((regs->cs & 3) != 0 && regs->rip >= TASK_SIZE)
++		return 0;
++
+ 	while (scan_more && instr < max_instr) { 
+ 		unsigned char opcode;
+ 		unsigned char instr_hi;
+@@ -337,7 +340,8 @@ bad_area_nosemaphore:
+ 		}
+        
+ 		tsk->thread.cr2 = address;
+-		tsk->thread.error_code = error_code;
++		/* Kernel addresses are always protection faults */
++		tsk->thread.error_code = error_code | (address >= TASK_SIZE);
+ 		tsk->thread.trap_no = 14;
+ 		info.si_signo = SIGSEGV;
+ 		info.si_errno = 0;
+--- linux-2.6.0/crypto/tcrypt.c	2003-09-08 13:58:56.000000000 -0700
++++ 25/crypto/tcrypt.c	2003-12-28 23:22:31.000000000 -0800
+@@ -6,2384 +6,409 @@
+  *
+  * Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
+  * Copyright (c) 2002 Jean-Francois Dive <jef@linuxbe.org>
+- * 
+- * This program is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License as published by the Free
+- * Software Foundation; either version 2 of the License, or (at your option) 
+- * any later version.
+- *
+- */
+-#include <linux/init.h>
+-#include <linux/module.h>
+-#include <linux/mm.h>
+-#include <linux/slab.h>
+-#include <asm/scatterlist.h>
+-#include <linux/string.h>
+-#include <linux/crypto.h>
+-#include <linux/highmem.h>
+-#include "tcrypt.h"
+-
+-/*
+- * Need to kmalloc() memory for testing kmap().
+- */
+-#define TVMEMSIZE	4096
+-#define XBUFSIZE	32768
+-
+-/*
+- * Indexes into the xbuf to simulate cross-page access.
+- */
+-#define IDX1		37
+-#define IDX2		32400
+-#define IDX3		1
+-#define IDX4		8193
+-#define IDX5		22222
+-#define IDX6		17101
+-#define IDX7		27333
+-#define IDX8		3000
+-
+-static int mode;
+-static char *xbuf;
+-static char *tvmem;
+-
+-static char *check[] = {
+-	"des", "md5", "des3_ede", "rot13", "sha1", "sha256", "blowfish",
+-	"twofish", "serpent", "sha384", "sha512", "md4", "aes", "cast6", 
+-	"deflate", NULL
+-};
+-
+-static void
+-hexdump(unsigned char *buf, unsigned int len)
+-{
+-	while (len--)
+-		printk("%02x", *buf++);
+-
+-	printk("\n");
+-}
+-
+-static void
+-test_md5(void)
+-{
+-	char *p;
+-	unsigned int i;
+-	struct scatterlist sg[2];
+-	char result[128];
+-	struct crypto_tfm *tfm;
+-	struct md5_testvec *md5_tv;
+-	unsigned int tsize;
+-
+-	printk("\ntesting md5\n");
+-
+-	tsize = sizeof (md5_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
+-		return;
+-	}
+-
+-	memcpy(tvmem, md5_tv_template, tsize);
+-	md5_tv = (void *) tvmem;
+-
+-	tfm = crypto_alloc_tfm("md5", 0);
+-	if (tfm == NULL) {
+-		printk("failed to load transform for md5\n");
+-		return;
+-	}
+-
+-	for (i = 0; i < MD5_TEST_VECTORS; i++) {
+-		printk("test %u:\n", i + 1);
+-		memset(result, 0, sizeof (result));
+-
+-		p = md5_tv[i].plaintext;
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = offset_in_page(p);
+-		sg[0].length = strlen(md5_tv[i].plaintext);
+-
+-		crypto_digest_init(tfm);
+-		crypto_digest_update(tfm, sg, 1);
+-		crypto_digest_final(tfm, result);
+-
+-		hexdump(result, crypto_tfm_alg_digestsize(tfm));
+-		printk("%s\n",
+-		       memcmp(result, md5_tv[i].digest,
+-			      crypto_tfm_alg_digestsize(tfm)) ? "fail" :
+-		       "pass");
+-	}
+-
+-	printk("\ntesting md5 across pages\n");
+-
+-	/* setup the dummy buffer first */
+-	memset(xbuf, 0, XBUFSIZE);
+-	memcpy(&xbuf[IDX1], "abcdefghijklm", 13);
+-	memcpy(&xbuf[IDX2], "nopqrstuvwxyz", 13);
+-
+-	p = &xbuf[IDX1];
+-	sg[0].page = virt_to_page(p);
+-	sg[0].offset = offset_in_page(p);
+-	sg[0].length = 13;
+-
+-	p = &xbuf[IDX2];
+-	sg[1].page = virt_to_page(p);
+-	sg[1].offset = offset_in_page(p);
+-	sg[1].length = 13;
+-
+-	memset(result, 0, sizeof (result));
+-	crypto_digest_digest(tfm, sg, 2, result);
+-	hexdump(result, crypto_tfm_alg_digestsize(tfm));
+-
+-	printk("%s\n",
+-	       memcmp(result, md5_tv[4].digest,
+-		      crypto_tfm_alg_digestsize(tfm)) ? "fail" : "pass");
+-	crypto_free_tfm(tfm);
+-}
+-
+-#ifdef CONFIG_CRYPTO_HMAC
+-static void
+-test_hmac_md5(void)
+-{
+-	char *p;
+-	unsigned int i, klen;
+-	struct scatterlist sg[2];
+-	char result[128];
+-	struct crypto_tfm *tfm;
+-	struct hmac_md5_testvec *hmac_md5_tv;
+-	unsigned int tsize;
+-
+-	tfm = crypto_alloc_tfm("md5", 0);
+-	if (tfm == NULL) {
+-		printk("failed to load transform for md5\n");
+-		return;
+-	}
+-
+-	printk("\ntesting hmac_md5\n");
+-	
+-	tsize = sizeof (hmac_md5_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
+-		goto out;
+-	}
+-
+-	memcpy(tvmem, hmac_md5_tv_template, tsize);
+-	hmac_md5_tv = (void *) tvmem;
+-
+-	for (i = 0; i < HMAC_MD5_TEST_VECTORS; i++) {
+-		printk("test %u:\n", i + 1);
+-		memset(result, 0, sizeof (result));
+-
+-		p = hmac_md5_tv[i].plaintext;
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = offset_in_page(p);
+-		sg[0].length = strlen(hmac_md5_tv[i].plaintext);
+-
+-		klen = strlen(hmac_md5_tv[i].key);
+-		crypto_hmac(tfm, hmac_md5_tv[i].key, &klen, sg, 1, result);
+-
+-		hexdump(result, crypto_tfm_alg_digestsize(tfm));
+-		printk("%s\n",
+-		       memcmp(result, hmac_md5_tv[i].digest,
+-			      crypto_tfm_alg_digestsize(tfm)) ? "fail" :
+-		       "pass");
+-	}
+-
+-	printk("\ntesting hmac_md5 across pages\n");
+-
+-	memset(xbuf, 0, XBUFSIZE);
+-
+-	memcpy(&xbuf[IDX1], "what do ya want ", 16);
+-	memcpy(&xbuf[IDX2], "for nothing?", 12);
+-
+-	p = &xbuf[IDX1];
+-	sg[0].page = virt_to_page(p);
+-	sg[0].offset = offset_in_page(p);
+-	sg[0].length = 16;
+-
+-	p = &xbuf[IDX2];
+-	sg[1].page = virt_to_page(p);
+-	sg[1].offset = offset_in_page(p);
+-	sg[1].length = 12;
+-
+-	memset(result, 0, sizeof (result));
+-	klen = strlen(hmac_md5_tv[7].key);
+-	crypto_hmac(tfm, hmac_md5_tv[7].key, &klen, sg, 2, result);
+-	hexdump(result, crypto_tfm_alg_digestsize(tfm));
+-
+-	printk("%s\n",
+-	       memcmp(result, hmac_md5_tv[7].digest,
+-		      crypto_tfm_alg_digestsize(tfm)) ? "fail" : "pass");
+-out:
+-	crypto_free_tfm(tfm);
+-}
+-
+-static void
+-test_hmac_sha1(void)
+-{
+-	char *p;
+-	unsigned int i, klen;
+-	struct crypto_tfm *tfm;
+-	struct hmac_sha1_testvec *hmac_sha1_tv;
+-	struct scatterlist sg[2];
+-	unsigned int tsize;
+-	char result[SHA1_DIGEST_SIZE];
+-
+-	tfm = crypto_alloc_tfm("sha1", 0);
+-	if (tfm == NULL) {
+-		printk("failed to load transform for sha1\n");
+-		return;
+-	}
+-
+-	printk("\ntesting hmac_sha1\n");
+-
+-	tsize = sizeof (hmac_sha1_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
+-		goto out;
+-	}
+-
+-	memcpy(tvmem, hmac_sha1_tv_template, tsize);
+-	hmac_sha1_tv = (void *) tvmem;
+-
+-	for (i = 0; i < HMAC_SHA1_TEST_VECTORS; i++) {
+-		printk("test %u:\n", i + 1);
+-		memset(result, 0, sizeof (result));
+-
+-		p = hmac_sha1_tv[i].plaintext;
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = offset_in_page(p);
+-		sg[0].length = strlen(hmac_sha1_tv[i].plaintext);
+-
+-		klen = strlen(hmac_sha1_tv[i].key);
+-		
+-		crypto_hmac(tfm, hmac_sha1_tv[i].key, &klen, sg, 1, result);
+-
+-		hexdump(result, sizeof (result));
+-		printk("%s\n",
+-		       memcmp(result, hmac_sha1_tv[i].digest,
+-			      crypto_tfm_alg_digestsize(tfm)) ? "fail" :
+-		       "pass");
+-	}
+-
+-	printk("\ntesting hmac_sha1 across pages\n");
+-
+-	/* setup the dummy buffer first */
+-	memset(xbuf, 0, XBUFSIZE);
+-
+-	memcpy(&xbuf[IDX1], "what do ya want ", 16);
+-	memcpy(&xbuf[IDX2], "for nothing?", 12);
+-
+-	p = &xbuf[IDX1];
+-	sg[0].page = virt_to_page(p);
+-	sg[0].offset = offset_in_page(p);
+-	sg[0].length = 16;
+-
+-	p = &xbuf[IDX2];
+-	sg[1].page = virt_to_page(p);
+-	sg[1].offset = offset_in_page(p);
+-	sg[1].length = 12;
+-
+-	memset(result, 0, sizeof (result));
+-	klen = strlen(hmac_sha1_tv[7].key);
+-	crypto_hmac(tfm, hmac_sha1_tv[7].key, &klen, sg, 2, result);
+-	hexdump(result, crypto_tfm_alg_digestsize(tfm));
+-
+-	printk("%s\n",
+-	       memcmp(result, hmac_sha1_tv[7].digest,
+-		      crypto_tfm_alg_digestsize(tfm)) ? "fail" : "pass");
+-out:
+-	crypto_free_tfm(tfm);
+-}
+-
+-static void
+-test_hmac_sha256(void)
+-{
+-	char *p;
+-	unsigned int i, klen;
+-	struct crypto_tfm *tfm;
+-	struct hmac_sha256_testvec *hmac_sha256_tv;
+-	struct scatterlist sg[2];
+-	unsigned int tsize;
+-	char result[SHA256_DIGEST_SIZE];
+-
+-	tfm = crypto_alloc_tfm("sha256", 0);
+-	if (tfm == NULL) {
+-		printk("failed to load transform for sha256\n");
+-		return;
+-	}
+-
+-	printk("\ntesting hmac_sha256\n");
+-
+-	tsize = sizeof (hmac_sha256_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
+-		goto out;
+-	}
+-
+-	memcpy(tvmem, hmac_sha256_tv_template, tsize);
+-	hmac_sha256_tv = (void *) tvmem;
+-
+-	for (i = 0; i < HMAC_SHA256_TEST_VECTORS; i++) {
+-		printk("test %u:\n", i + 1);
+-		memset(result, 0, sizeof (result));
+-
+-		p = hmac_sha256_tv[i].plaintext;
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = offset_in_page(p);
+-		sg[0].length = strlen(hmac_sha256_tv[i].plaintext);
+-
+-		klen = strlen(hmac_sha256_tv[i].key);
+-	
+-		hexdump(hmac_sha256_tv[i].key, strlen(hmac_sha256_tv[i].key));
+-		crypto_hmac(tfm, hmac_sha256_tv[i].key, &klen, sg, 1, result);
+-		hexdump(result, crypto_tfm_alg_digestsize(tfm));
+-		printk("%s\n",
+-		       memcmp(result, hmac_sha256_tv[i].digest,
+-		       crypto_tfm_alg_digestsize(tfm)) ? "fail" : "pass");
+-	}
+-
+-out:
+-	crypto_free_tfm(tfm);
+-}
+-
+-#endif	/* CONFIG_CRYPTO_HMAC */
+-
+-static void
+-test_md4(void)
+-{
+-	char *p;
+-	unsigned int i;
+-	struct scatterlist sg[1];
+-	char result[128];
+-	struct crypto_tfm *tfm;
+-	struct md4_testvec *md4_tv;
+-	unsigned int tsize;
+-
+-	printk("\ntesting md4\n");
+-
+-	tsize = sizeof (md4_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
+-		return;
+-	}
+-
+-	memcpy(tvmem, md4_tv_template, tsize);
+-	md4_tv = (void *) tvmem;
+-
+-	tfm = crypto_alloc_tfm("md4", 0);
+-	if (tfm == NULL) {
+-		printk("failed to load transform for md4\n");
+-		return;
+-	}
+-
+-	for (i = 0; i < MD4_TEST_VECTORS; i++) {
+-		printk("test %u:\n", i + 1);
+-		memset(result, 0, sizeof (result));
+-
+-		p = md4_tv[i].plaintext;
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = offset_in_page(p);
+-		sg[0].length = strlen(md4_tv[i].plaintext);
+-
+-		crypto_digest_digest(tfm, sg, 1, result);
+-
+-		hexdump(result, crypto_tfm_alg_digestsize(tfm));
+-		printk("%s\n",
+-		       memcmp(result, md4_tv[i].digest,
+-			      crypto_tfm_alg_digestsize(tfm)) ? "fail" :
+-		       "pass");
+-	}
+-
+-	crypto_free_tfm(tfm);
+-}
+-
+-static void
+-test_sha1(void)
+-{
+-	char *p;
+-	unsigned int i;
+-	struct crypto_tfm *tfm;
+-	struct sha1_testvec *sha1_tv;
+-	struct scatterlist sg[2];
+-	unsigned int tsize;
+-	char result[SHA1_DIGEST_SIZE];
+-
+-	printk("\ntesting sha1\n");
+-
+-	tsize = sizeof (sha1_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
+-		return;
+-	}
+-
+-	memcpy(tvmem, sha1_tv_template, tsize);
+-	sha1_tv = (void *) tvmem;
+-
+-	tfm = crypto_alloc_tfm("sha1", 0);
+-	if (tfm == NULL) {
+-		printk("failed to load transform for sha1\n");
+-		return;
+-	}
+-
+-	for (i = 0; i < SHA1_TEST_VECTORS; i++) {
+-		printk("test %u:\n", i + 1);
+-		memset(result, 0, sizeof (result));
+-
+-		p = sha1_tv[i].plaintext;
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = offset_in_page(p);
+-		sg[0].length = strlen(sha1_tv[i].plaintext);
+-
+-		crypto_digest_init(tfm);
+-		crypto_digest_update(tfm, sg, 1);
+-		crypto_digest_final(tfm, result);
+-
+-		hexdump(result, crypto_tfm_alg_digestsize(tfm));
+-		printk("%s\n",
+-		       memcmp(result, sha1_tv[i].digest,
+-			      crypto_tfm_alg_digestsize(tfm)) ? "fail" :
+-		       "pass");
+-	}
+-
+-	printk("\ntesting sha1 across pages\n");
+-
+-	/* setup the dummy buffer first */
+-	memset(xbuf, 0, XBUFSIZE);
+-	memcpy(&xbuf[IDX1], "abcdbcdecdefdefgefghfghighij", 28);
+-	memcpy(&xbuf[IDX2], "hijkijkljklmklmnlmnomnopnopq", 28);
+-
+-	p = &xbuf[IDX1];
+-	sg[0].page = virt_to_page(p);
+-	sg[0].offset = offset_in_page(p);
+-	sg[0].length = 28;
+-
+-	p = &xbuf[IDX2];
+-	sg[1].page = virt_to_page(p);
+-	sg[1].offset = offset_in_page(p);
+-	sg[1].length = 28;
+-
+-	memset(result, 0, sizeof (result));
+-	crypto_digest_digest(tfm, sg, 2, result);
+-	hexdump(result, crypto_tfm_alg_digestsize(tfm));
+-	printk("%s\n",
+-	       memcmp(result, sha1_tv[1].digest,
+-		      crypto_tfm_alg_digestsize(tfm)) ? "fail" : "pass");
+-	crypto_free_tfm(tfm);
+-}
+-
+-static void
+-test_sha256(void)
+-{
+-	char *p;
+-	unsigned int i;
+-	struct crypto_tfm *tfm;
+-	struct sha256_testvec *sha256_tv;
+-	struct scatterlist sg[2];
+-	unsigned int tsize;
+-	char result[SHA256_DIGEST_SIZE];
+-
+-	printk("\ntesting sha256\n");
+-
+-	tsize = sizeof (sha256_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
+-		return;
+-	}
+-
+-	memcpy(tvmem, sha256_tv_template, tsize);
+-	sha256_tv = (void *) tvmem;
+-
+-	tfm = crypto_alloc_tfm("sha256", 0);
+-	if (tfm == NULL) {
+-		printk("failed to load transform for sha256\n");
+-		return;
+-	}
+-
+-	for (i = 0; i < SHA256_TEST_VECTORS; i++) {
+-		printk("test %u:\n", i + 1);
+-		memset(result, 0, sizeof (result));
+-
+-		p = sha256_tv[i].plaintext;
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = offset_in_page(p);
+-		sg[0].length = strlen(sha256_tv[i].plaintext);
+-
+-		crypto_digest_init(tfm);
+-		crypto_digest_update(tfm, sg, 1);
+-		crypto_digest_final(tfm, result);
+-
+-		hexdump(result, crypto_tfm_alg_digestsize(tfm));
+-		printk("%s\n",
+-		       memcmp(result, sha256_tv[i].digest,
+-			      crypto_tfm_alg_digestsize(tfm)) ? "fail" :
+-		       "pass");
+-	}
+-
+-	printk("\ntesting sha256 across pages\n");
+-
+-	/* setup the dummy buffer first */
+-	memset(xbuf, 0, XBUFSIZE);
+-	memcpy(&xbuf[IDX1], "abcdbcdecdefdefgefghfghighij", 28);
+-	memcpy(&xbuf[IDX2], "hijkijkljklmklmnlmnomnopnopq", 28);
+-
+-	p = &xbuf[IDX1];
+-	sg[0].page = virt_to_page(p);
+-	sg[0].offset = offset_in_page(p);
+-	sg[0].length = 28;
+-
+-	p = &xbuf[IDX2];
+-	sg[1].page = virt_to_page(p);
+-	sg[1].offset = offset_in_page(p);
+-	sg[1].length = 28;
+-
+-	memset(result, 0, sizeof (result));
+-	crypto_digest_digest(tfm, sg, 2, result);
+-	hexdump(result, crypto_tfm_alg_digestsize(tfm));
+-	printk("%s\n",
+-	       memcmp(result, sha256_tv[1].digest,
+-		      crypto_tfm_alg_digestsize(tfm)) ? "fail" : "pass");
+-		     
+-	crypto_free_tfm(tfm);
+-}
+-
+-static void
+-test_sha384(void)
+-{
+-	char *p;
+-	unsigned int i;
+-	struct crypto_tfm *tfm;
+-	struct sha384_testvec *sha384_tv;
+-	struct scatterlist sg[2];
+-	unsigned int tsize;
+-	char result[SHA384_DIGEST_SIZE];
+-
+-	printk("\ntesting sha384\n");
+-
+-	tsize = sizeof (sha384_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
+-		return;
+-	}
+-
+-	memcpy(tvmem, sha384_tv_template, tsize);
+-	sha384_tv = (void *) tvmem;
+-
+-	tfm = crypto_alloc_tfm("sha384", 0);
+-	if (tfm == NULL) {
+-		printk("failed to load transform for sha384\n");
+-		return;
+-	}
+-
+-	for (i = 0; i < SHA384_TEST_VECTORS; i++) {
+-		printk("test %u:\n", i + 1);
+-		memset(result, 0, sizeof (result));
+-
+-		p = sha384_tv[i].plaintext;
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = offset_in_page(p);
+-		sg[0].length = strlen(sha384_tv[i].plaintext);
+-
+-		crypto_digest_init(tfm);
+-		crypto_digest_update(tfm, sg, 1);
+-		crypto_digest_final(tfm, result);
+-
+-		hexdump(result, crypto_tfm_alg_digestsize(tfm));
+-		printk("%s\n",
+-		       memcmp(result, sha384_tv[i].digest,
+-			      crypto_tfm_alg_digestsize(tfm)) ? "fail" :
+-		       "pass");
+-	}
+-
+-	crypto_free_tfm(tfm);
+-}
+-
+-static void
+-test_sha512(void)
+-{
+-	char *p;
+-	unsigned int i;
+-	struct crypto_tfm *tfm;
+-	struct sha512_testvec *sha512_tv;
+-	struct scatterlist sg[2];
+-	unsigned int tsize;
+-	char result[SHA512_DIGEST_SIZE];
+-
+-	printk("\ntesting sha512\n");
+-
+-	tsize = sizeof (sha512_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
+-		return;
+-	}
+-
+-	memcpy(tvmem, sha512_tv_template, tsize);
+-	sha512_tv = (void *) tvmem;
+-
+-	tfm = crypto_alloc_tfm("sha512", 0);
+-	if (tfm == NULL) {
+-		printk("failed to load transform for sha512\n");
+-		return;
+-	}
+-
+-	for (i = 0; i < SHA512_TEST_VECTORS; i++) {
+-		printk("test %u:\n", i + 1);
+-		memset(result, 0, sizeof (result));
+-
+-		p = sha512_tv[i].plaintext;
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = offset_in_page(p);
+-		sg[0].length = strlen(sha512_tv[i].plaintext);
+-
+-		crypto_digest_init(tfm);
+-		crypto_digest_update(tfm, sg, 1);
+-		crypto_digest_final(tfm, result);
+-
+-		hexdump(result, crypto_tfm_alg_digestsize(tfm));
+-		printk("%s\n",
+-		       memcmp(result, sha512_tv[i].digest,
+-			      crypto_tfm_alg_digestsize(tfm)) ? "fail" :
+-		       "pass");
+-	}
+-
+-	crypto_free_tfm(tfm);
+-}
+-
+-void
+-test_des(void)
+-{
+-	unsigned int ret, i, len;
+-	unsigned int tsize;
+-	char *p, *q;
+-	struct crypto_tfm *tfm;
+-	char *key;
+-	char res[8];
+-	struct des_tv *des_tv;
+-	struct scatterlist sg[8];
+-
+-	printk("\ntesting des encryption\n");
+-
+-	tsize = sizeof (des_enc_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
+-		return;
+-	}
+-
+-	memcpy(tvmem, des_enc_tv_template, tsize);
+-	des_tv = (void *) tvmem;
+-
+-	tfm = crypto_alloc_tfm("des", 0);
+-	if (tfm == NULL) {
+-		printk("failed to load transform for des (default ecb)\n");
+-		return;
+-	}
+-
+-	for (i = 0; i < DES_ENC_TEST_VECTORS; i++) {
+-		printk("test %u:\n", i + 1);
+-
+-		key = des_tv[i].key;
+-		tfm->crt_flags |= CRYPTO_TFM_REQ_WEAK_KEY;
+-
+-		ret = crypto_cipher_setkey(tfm, key, 8);
+-		if (ret) {
+-			printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-
+-			if (!des_tv[i].fail)
+-				goto out;
+-		}
+-
+-		len = des_tv[i].len;
+-
+-		p = des_tv[i].plaintext;
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = offset_in_page(p);
+-		sg[0].length = len;
+-		ret = crypto_cipher_encrypt(tfm, sg, sg, len);
+-		if (ret) {
+-			printk("encrypt() failed flags=%x\n", tfm->crt_flags);
+-			goto out;
+-		}
+-
+-		q = kmap(sg[0].page) + sg[0].offset;
+-		hexdump(q, len);
+-
+-		printk("%s\n",
+-		       memcmp(q, des_tv[i].result, len) ? "fail" : "pass");
+-
+-	}
+-
+-	printk("\ntesting des ecb encryption across pages\n");
+-
+-	i = 5;
+-	key = des_tv[i].key;
+-	tfm->crt_flags = 0;
+-
+-	hexdump(key, 8);
+-
+-	ret = crypto_cipher_setkey(tfm, key, 8);
+-	if (ret) {
+-		printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-		goto out;
+-	}
+-
+-	/* setup the dummy buffer first */
+-	memset(xbuf, 0, sizeof (xbuf));
+-	memcpy(&xbuf[IDX1], des_tv[i].plaintext, 8);
+-	memcpy(&xbuf[IDX2], des_tv[i].plaintext + 8, 8);
+-
+-	p = &xbuf[IDX1];
+-	sg[0].page = virt_to_page(p);
+-	sg[0].offset = offset_in_page(p);
+-	sg[0].length = 8;
+-
+-	p = &xbuf[IDX2];
+-	sg[1].page = virt_to_page(p);
+-	sg[1].offset = offset_in_page(p);
+-	sg[1].length = 8;
+-
+-	ret = crypto_cipher_encrypt(tfm, sg, sg, 16);
+-	if (ret) {
+-		printk("encrypt() failed flags=%x\n", tfm->crt_flags);
+-		goto out;
+-	}
+-
+-	printk("page 1\n");
+-	q = kmap(sg[0].page) + sg[0].offset;
+-	hexdump(q, 8);
+-	printk("%s\n", memcmp(q, des_tv[i].result, 8) ? "fail" : "pass");
+-
+-	printk("page 2\n");
+-	q = kmap(sg[1].page) + sg[1].offset;
+-	hexdump(q, 8);
+-	printk("%s\n", memcmp(q, des_tv[i].result + 8, 8) ? "fail" : "pass");
+-
+-	printk("\ntesting des ecb encryption chunking scenario A\n");
+-
+-	/*
+-	 * Scenario A:
+-	 * 
+-	 *  F1       F2      F3
+-	 *  [8 + 6]  [2 + 8] [8]
+-	 *       ^^^^^^   ^
+-	 *       a    b   c
+-	 *
+-	 * Chunking should begin at a, then end with b, and
+-	 * continue encrypting at an offset of 2 until c.
+-	 *
+-	 */
+-	i = 7;
+-
+-	key = des_tv[i].key;
+-	tfm->crt_flags = 0;
+-
+-	ret = crypto_cipher_setkey(tfm, key, 8);
+-	if (ret) {
+-		printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-		goto out;
+-	}
+-
+-	/* setup the dummy buffer first */
+-	memset(xbuf, 0, sizeof (xbuf));
+-
+-	/* Frag 1: 8 + 6 */
+-	memcpy(&xbuf[IDX3], des_tv[i].plaintext, 14);
+-
+-	/* Frag 2: 2 + 8 */
+-	memcpy(&xbuf[IDX4], des_tv[i].plaintext + 14, 10);
+-
+-	/* Frag 3: 8 */
+-	memcpy(&xbuf[IDX5], des_tv[i].plaintext + 24, 8);
+-
+-	p = &xbuf[IDX3];
+-	sg[0].page = virt_to_page(p);
+-	sg[0].offset = offset_in_page(p);
+-	sg[0].length = 14;
+-
+-	p = &xbuf[IDX4];
+-	sg[1].page = virt_to_page(p);
+-	sg[1].offset = offset_in_page(p);
+-	sg[1].length = 10;
+-
+-	p = &xbuf[IDX5];
+-	sg[2].page = virt_to_page(p);
+-	sg[2].offset = offset_in_page(p);
+-	sg[2].length = 8;
+-
+-	ret = crypto_cipher_encrypt(tfm, sg, sg, 32);
+-
+-	if (ret) {
+-		printk("decrypt() failed flags=%x\n", tfm->crt_flags);
+-		goto out;
+-	}
+-
+-	printk("page 1\n");
+-	q = kmap(sg[0].page) + sg[0].offset;
+-	hexdump(q, 14);
+-	printk("%s\n", memcmp(q, des_tv[i].result, 14) ? "fail" : "pass");
+-
+-	printk("page 2\n");
+-	q = kmap(sg[1].page) + sg[1].offset;
+-	hexdump(q, 10);
+-	printk("%s\n", memcmp(q, des_tv[i].result + 14, 10) ? "fail" : "pass");
+-
+-	printk("page 3\n");
+-	q = kmap(sg[2].page) + sg[2].offset;
+-	hexdump(q, 8);
+-	printk("%s\n", memcmp(q, des_tv[i].result + 24, 8) ? "fail" : "pass");
+-
+-	printk("\ntesting des ecb encryption chunking scenario B\n");
+-
+-	/*
+-	 * Scenario B:
+-	 * 
+-	 *  F1  F2  F3  F4
+-	 *  [2] [1] [3] [2 + 8 + 8]
+-	 */
+-	i = 7;
+-
+-	key = des_tv[i].key;
+-	tfm->crt_flags = 0;
+-
+-	ret = crypto_cipher_setkey(tfm, key, 8);
+-	if (ret) {
+-		printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-		goto out;
+-	}
+-
+-	/* setup the dummy buffer first */
+-	memset(xbuf, 0, sizeof (xbuf));
+-
+-	/* Frag 1: 2 */
+-	memcpy(&xbuf[IDX3], des_tv[i].plaintext, 2);
+-
+-	/* Frag 2: 1 */
+-	memcpy(&xbuf[IDX4], des_tv[i].plaintext + 2, 1);
+-
+-	/* Frag 3: 3 */
+-	memcpy(&xbuf[IDX5], des_tv[i].plaintext + 3, 3);
+-
+-	/* Frag 4: 2 + 8 + 8 */
+-	memcpy(&xbuf[IDX6], des_tv[i].plaintext + 6, 18);
+-
+-	p = &xbuf[IDX3];
+-	sg[0].page = virt_to_page(p);
+-	sg[0].offset = offset_in_page(p);
+-	sg[0].length = 2;
+-
+-	p = &xbuf[IDX4];
+-	sg[1].page = virt_to_page(p);
+-	sg[1].offset = offset_in_page(p);
+-	sg[1].length = 1;
+-
+-	p = &xbuf[IDX5];
+-	sg[2].page = virt_to_page(p);
+-	sg[2].offset = offset_in_page(p);
+-	sg[2].length = 3;
+-
+-	p = &xbuf[IDX6];
+-	sg[3].page = virt_to_page(p);
+-	sg[3].offset = offset_in_page(p);
+-	sg[3].length = 18;
+-
+-	ret = crypto_cipher_encrypt(tfm, sg, sg, 24);
+-
+-	if (ret) {
+-		printk("encrypt() failed flags=%x\n", tfm->crt_flags);
+-		goto out;
+-	}
+-
+-	printk("page 1\n");
+-	q = kmap(sg[0].page) + sg[0].offset;
+-	hexdump(q, 2);
+-	printk("%s\n", memcmp(q, des_tv[i].result, 2) ? "fail" : "pass");
+-
+-	printk("page 2\n");
+-	q = kmap(sg[1].page) + sg[1].offset;
+-	hexdump(q, 1);
+-	printk("%s\n", memcmp(q, des_tv[i].result + 2, 1) ? "fail" : "pass");
+-
+-	printk("page 3\n");
+-	q = kmap(sg[2].page) + sg[2].offset;
+-	hexdump(q, 3);
+-	printk("%s\n", memcmp(q, des_tv[i].result + 3, 3) ? "fail" : "pass");
+-
+-	printk("page 4\n");
+-	q = kmap(sg[3].page) + sg[3].offset;
+-	hexdump(q, 18);
+-	printk("%s\n", memcmp(q, des_tv[i].result + 6, 18) ? "fail" : "pass");
+-
+-	printk("\ntesting des ecb encryption chunking scenario C\n");
+-
+-	/*
+-	 * Scenario B:
+-	 * 
+-	 *  F1  F2  F3  F4  F5
+-	 *  [2] [2] [2] [2] [8]
+-	 */
+-	i = 7;
+-
+-	key = des_tv[i].key;
+-	tfm->crt_flags = 0;
+-
+-	ret = crypto_cipher_setkey(tfm, key, 8);
+-	if (ret) {
+-		printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-		goto out;
+-	}
+-
+-	/* setup the dummy buffer first */
+-	memset(xbuf, 0, sizeof (xbuf));
+-
+-	/* Frag 1: 2 */
+-	memcpy(&xbuf[IDX3], des_tv[i].plaintext, 2);
+-
+-	/* Frag 2: 2 */
+-	memcpy(&xbuf[IDX4], des_tv[i].plaintext + 2, 2);
+-
+-	/* Frag 3: 2 */
+-	memcpy(&xbuf[IDX5], des_tv[i].plaintext + 4, 2);
+-
+-	/* Frag 4: 2 */
+-	memcpy(&xbuf[IDX6], des_tv[i].plaintext + 6, 2);
+-
+-	/* Frag 5: 8 */
+-	memcpy(&xbuf[IDX7], des_tv[i].plaintext + 8, 8);
+-
+-	p = &xbuf[IDX3];
+-	sg[0].page = virt_to_page(p);
+-	sg[0].offset = offset_in_page(p);
+-	sg[0].length = 2;
+-
+-	p = &xbuf[IDX4];
+-	sg[1].page = virt_to_page(p);
+-	sg[1].offset = offset_in_page(p);
+-	sg[1].length = 2;
+-
+-	p = &xbuf[IDX5];
+-	sg[2].page = virt_to_page(p);
+-	sg[2].offset = offset_in_page(p);
+-	sg[2].length = 2;
+-
+-	p = &xbuf[IDX6];
+-	sg[3].page = virt_to_page(p);
+-	sg[3].offset = offset_in_page(p);
+-	sg[3].length = 2;
+-
+-	p = &xbuf[IDX7];
+-	sg[4].page = virt_to_page(p);
+-	sg[4].offset = offset_in_page(p);
+-	sg[4].length = 8;
+-
+-	ret = crypto_cipher_encrypt(tfm, sg, sg, 16);
+-
+-	if (ret) {
+-		printk("encrypt() failed flags=%x\n", tfm->crt_flags);
+-		goto out;
+-	}
+-
+-	printk("page 1\n");
+-	q = kmap(sg[0].page) + sg[0].offset;
+-	hexdump(q, 2);
+-	printk("%s\n", memcmp(q, des_tv[i].result, 2) ? "fail" : "pass");
+-
+-	printk("page 2\n");
+-	q = kmap(sg[1].page) + sg[1].offset;
+-	hexdump(q, 2);
+-	printk("%s\n", memcmp(q, des_tv[i].result + 2, 2) ? "fail" : "pass");
+-
+-	printk("page 3\n");
+-	q = kmap(sg[2].page) + sg[2].offset;
+-	hexdump(q, 2);
+-	printk("%s\n", memcmp(q, des_tv[i].result + 4, 2) ? "fail" : "pass");
+-
+-	printk("page 4\n");
+-	q = kmap(sg[3].page) + sg[3].offset;
+-	hexdump(q, 2);
+-	printk("%s\n", memcmp(q, des_tv[i].result + 6, 2) ? "fail" : "pass");
+-
+-	printk("page 5\n");
+-	q = kmap(sg[4].page) + sg[4].offset;
+-	hexdump(q, 8);
+-	printk("%s\n", memcmp(q, des_tv[i].result + 8, 8) ? "fail" : "pass");
+-
+-	printk("\ntesting des ecb encryption chunking scenario D\n");
+-
+-	/*
+-	 * Scenario D, torture test, one byte per frag.
+-	 */
+-	i = 7;
+-	key = des_tv[i].key;
+-	tfm->crt_flags = 0;
+-
+-	ret = crypto_cipher_setkey(tfm, key, 8);
+-	if (ret) {
+-		printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-		goto out;
+-	}
+-
+-	/* setup the dummy buffer first */
+-	memset(xbuf, 0, XBUFSIZE);
+-
+-	xbuf[IDX1] = des_tv[i].plaintext[0];
+-	xbuf[IDX2] = des_tv[i].plaintext[1];
+-	xbuf[IDX3] = des_tv[i].plaintext[2];
+-	xbuf[IDX4] = des_tv[i].plaintext[3];
+-	xbuf[IDX5] = des_tv[i].plaintext[4];
+-	xbuf[IDX6] = des_tv[i].plaintext[5];
+-	xbuf[IDX7] = des_tv[i].plaintext[6];
+-	xbuf[IDX8] = des_tv[i].plaintext[7];
+-
+-	p = &xbuf[IDX1];
+-	sg[0].page = virt_to_page(p);
+-	sg[0].offset = offset_in_page(p);
+-	sg[0].length = 1;
+-
+-	p = &xbuf[IDX2];
+-	sg[1].page = virt_to_page(p);
+-	sg[1].offset = offset_in_page(p);
+-	sg[1].length = 1;
+-
+-	p = &xbuf[IDX3];
+-	sg[2].page = virt_to_page(p);
+-	sg[2].offset = offset_in_page(p);
+-	sg[2].length = 1;
+-
+-	p = &xbuf[IDX4];
+-	sg[3].page = virt_to_page(p);
+-	sg[3].offset = offset_in_page(p);
+-	sg[3].length = 1;
+-
+-	p = &xbuf[IDX5];
+-	sg[4].page = virt_to_page(p);
+-	sg[4].offset = offset_in_page(p);
+-	sg[4].length = 1;
+-
+-	p = &xbuf[IDX6];
+-	sg[5].page = virt_to_page(p);
+-	sg[5].offset = offset_in_page(p);
+-	sg[5].length = 1;
+-
+-	p = &xbuf[IDX7];
+-	sg[6].page = virt_to_page(p);
+-	sg[6].offset = offset_in_page(p);
+-	sg[6].length = 1;
+-
+-	p = &xbuf[IDX8];
+-	sg[7].page = virt_to_page(p);
+-	sg[7].offset = offset_in_page(p);
+-	sg[7].length = 1;
+-
+-	ret = crypto_cipher_encrypt(tfm, sg, sg, 8);
+-	if (ret) {
+-		printk("encrypt() failed flags=%x\n", tfm->crt_flags);
+-		goto out;
+-	}
+-
+-	for (i = 0; i < 8; i++)
+-		res[i] = *(char *) (kmap(sg[i].page) + sg[i].offset);
+-
+-	hexdump(res, 8);
+-	printk("%s\n", memcmp(res, des_tv[7].result, 8) ? "fail" : "pass");
+-
+-	printk("\ntesting des decryption\n");
+-
+-	tsize = sizeof (des_dec_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
+-		return;
+-	}
+-	memcpy(tvmem, des_dec_tv_template, tsize);
+-	des_tv = (void *) tvmem;
+-
+-	for (i = 0; i < DES_DEC_TEST_VECTORS; i++) {
+-		printk("test %u:\n", i + 1);
+-
+-		key = des_tv[i].key;
+-
+-		tfm->crt_flags = 0;
+-		ret = crypto_cipher_setkey(tfm, key, 8);
+-		if (ret) {
+-			printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-			goto out;
+-		}
+-
+-		len = des_tv[i].len;
+-
+-		p = des_tv[i].plaintext;
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = offset_in_page(p);
+-		sg[0].length = len;
+-
+-		ret = crypto_cipher_decrypt(tfm, sg, sg, sg[0].length);
+-		if (ret) {
+-			printk("des_decrypt() failed flags=%x\n",
+-			       tfm->crt_flags);
+-			goto out;
+-		}
+-
+-		q = kmap(sg[0].page) + sg[0].offset;
+-		hexdump(q, len);
+-
+-		printk("%s\n",
+-		       memcmp(q, des_tv[i].result, len) ? "fail" : "pass");
+-
+-	}
+-
+-	printk("\ntesting des ecb decryption across pages\n");
+-
+-	i = 6;
+-
+-	key = des_tv[i].key;
+-	tfm->crt_flags = 0;
+-
+-	ret = crypto_cipher_setkey(tfm, key, 8);
+-	if (ret) {
+-		printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-		goto out;
+-	}
+-
+-	/* setup the dummy buffer first */
+-	memset(xbuf, 0, sizeof (xbuf));
+-	memcpy(&xbuf[IDX1], des_tv[i].plaintext, 8);
+-	memcpy(&xbuf[IDX2], des_tv[i].plaintext + 8, 8);
+-
+-	p = &xbuf[IDX1];
+-	sg[0].page = virt_to_page(p);
+-	sg[0].offset = offset_in_page(p);
+-	sg[0].length = 8;
+-
+-	p = &xbuf[IDX2];
+-	sg[1].page = virt_to_page(p);
+-	sg[1].offset = offset_in_page(p);
+-	sg[1].length = 8;
+-
+-	ret = crypto_cipher_decrypt(tfm, sg, sg, 16);
+-	if (ret) {
+-		printk("decrypt() failed flags=%x\n", tfm->crt_flags);
+-		goto out;
+-	}
+-
+-	printk("page 1\n");
+-	q = kmap(sg[0].page) + sg[0].offset;
+-	hexdump(q, 8);
+-	printk("%s\n", memcmp(q, des_tv[i].result, 8) ? "fail" : "pass");
+-
+-	printk("page 2\n");
+-	q = kmap(sg[1].page) + sg[1].offset;
+-	hexdump(q, 8);
+-	printk("%s\n", memcmp(q, des_tv[i].result + 8, 8) ? "fail" : "pass");
+-
+-	/*
+-	 * Scenario E:
+-	 * 
+-	 *  F1   F2      F3
+-	 *  [3]  [5 + 7] [1]
+-	 *
+-	 */
+-	printk("\ntesting des ecb decryption chunking scenario E\n");
+-	i = 2;
+-
+-	key = des_tv[i].key;
+-	tfm->crt_flags = 0;
+-
+-	ret = crypto_cipher_setkey(tfm, key, 8);
+-	if (ret) {
+-		printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-		goto out;
+-	}
+-
+-	/* setup the dummy buffer first */
+-	memset(xbuf, 0, sizeof (xbuf));
+-
+-	memcpy(&xbuf[IDX1], des_tv[i].plaintext, 3);
+-	memcpy(&xbuf[IDX2], des_tv[i].plaintext + 3, 12);
+-	memcpy(&xbuf[IDX3], des_tv[i].plaintext + 15, 1);
+-
+-	p = &xbuf[IDX1];
+-	sg[0].page = virt_to_page(p);
+-	sg[0].offset = offset_in_page(p);
+-	sg[0].length = 3;
+-
+-	p = &xbuf[IDX2];
+-	sg[1].page = virt_to_page(p);
+-	sg[1].offset = offset_in_page(p);
+-	sg[1].length = 12;
+-
+-	p = &xbuf[IDX3];
+-	sg[2].page = virt_to_page(p);
+-	sg[2].offset = offset_in_page(p);
+-	sg[2].length = 1;
+-
+-	ret = crypto_cipher_decrypt(tfm, sg, sg, 16);
+-
+-	if (ret) {
+-		printk("decrypt() failed flags=%x\n", tfm->crt_flags);
+-		goto out;
+-	}
+-
+-	printk("page 1\n");
+-	q = kmap(sg[0].page) + sg[0].offset;
+-	hexdump(q, 3);
+-	printk("%s\n", memcmp(q, des_tv[i].result, 3) ? "fail" : "pass");
+-
+-	printk("page 2\n");
+-	q = kmap(sg[1].page) + sg[1].offset;
+-	hexdump(q, 12);
+-	printk("%s\n", memcmp(q, des_tv[i].result + 3, 12) ? "fail" : "pass");
+-
+-	printk("page 3\n");
+-	q = kmap(sg[2].page) + sg[2].offset;
+-	hexdump(q, 1);
+-	printk("%s\n", memcmp(q, des_tv[i].result + 15, 1) ? "fail" : "pass");
+-
+-	crypto_free_tfm(tfm);
+-
+-	tfm = crypto_alloc_tfm("des", CRYPTO_TFM_MODE_CBC);
+-	if (tfm == NULL) {
+-		printk("failed to load transform for des cbc\n");
+-		return;
+-	}
+-
+-	printk("\ntesting des cbc encryption\n");
+-
+-	tsize = sizeof (des_cbc_enc_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
+-		return;
+-	}
+-	memcpy(tvmem, des_cbc_enc_tv_template, tsize);
+-	des_tv = (void *) tvmem;
+-
+-	crypto_cipher_set_iv(tfm, des_tv[i].iv, crypto_tfm_alg_ivsize(tfm));
+-	crypto_cipher_get_iv(tfm, res, crypto_tfm_alg_ivsize(tfm));
+-	
+-	if (memcmp(res, des_tv[i].iv, sizeof(res))) {
+-		printk("crypto_cipher_[set|get]_iv() failed\n");
+-		goto out;
+-	}
+-	
+-	for (i = 0; i < DES_CBC_ENC_TEST_VECTORS; i++) {
+-		printk("test %u:\n", i + 1);
+-
+-		key = des_tv[i].key;
+-
+-		ret = crypto_cipher_setkey(tfm, key, 8);
+-		if (ret) {
+-			printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-			goto out;
+-		}
+-
+-		len = des_tv[i].len;
+-		p = des_tv[i].plaintext;
+-
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = offset_in_page(p);
+-		sg[0].length = len;
+-
+-		crypto_cipher_set_iv(tfm, des_tv[i].iv,
+-				     crypto_tfm_alg_ivsize(tfm));
+-
+-		ret = crypto_cipher_encrypt(tfm, sg, sg, len);
+-		if (ret) {
+-			printk("des_cbc_encrypt() failed flags=%x\n",
+-			       tfm->crt_flags);
+-			goto out;
+-		}
+-
+-		q = kmap(sg[0].page) + sg[0].offset;
+-		hexdump(q, len);
+-
+-		printk("%s\n",
+-		       memcmp(q, des_tv[i].result, len) ? "fail" : "pass");
+-	}
+-
+-	crypto_free_tfm(tfm);
+-
+-	/*
+-	 * Scenario F:
+-	 * 
+-	 *  F1       F2      
+-	 *  [8 + 5]  [3 + 8]
+-	 *
+-	 */
+-	printk("\ntesting des cbc encryption chunking scenario F\n");
+-	i = 4;
+-
+-	tfm = crypto_alloc_tfm("des", CRYPTO_TFM_MODE_CBC);
+-	if (tfm == NULL) {
+-		printk("failed to load transform for CRYPTO_ALG_DES_CCB\n");
+-		return;
+-	}
+-
+-	tfm->crt_flags = 0;
+-	key = des_tv[i].key;
+-
+-	ret = crypto_cipher_setkey(tfm, key, 8);
+-	if (ret) {
+-		printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-		goto out;
+-	}
+-
+-	/* setup the dummy buffer first */
+-	memset(xbuf, 0, sizeof (xbuf));
+-
+-	memcpy(&xbuf[IDX1], des_tv[i].plaintext, 13);
+-	memcpy(&xbuf[IDX2], des_tv[i].plaintext + 13, 11);
+-
+-	p = &xbuf[IDX1];
+-	sg[0].page = virt_to_page(p);
+-	sg[0].offset = offset_in_page(p);
+-	sg[0].length = 13;
+-
+-	p = &xbuf[IDX2];
+-	sg[1].page = virt_to_page(p);
+-	sg[1].offset = offset_in_page(p);
+-	sg[1].length = 11;
+-
+-	crypto_cipher_set_iv(tfm, des_tv[i].iv, crypto_tfm_alg_ivsize(tfm));
+-
+-	ret = crypto_cipher_encrypt(tfm, sg, sg, 24);
+-	if (ret) {
+-		printk("des_cbc_decrypt() failed flags=%x\n", tfm->crt_flags);
+-		goto out;
+-	}
+-
+-	printk("page 1\n");
+-	q = kmap(sg[0].page) + sg[0].offset;
+-	hexdump(q, 13);
+-	printk("%s\n", memcmp(q, des_tv[i].result, 13) ? "fail" : "pass");
+-
+-	printk("page 2\n");
+-	q = kmap(sg[1].page) + sg[1].offset;
+-	hexdump(q, 11);
+-	printk("%s\n", memcmp(q, des_tv[i].result + 13, 11) ? "fail" : "pass");
+-
+-	tsize = sizeof (des_cbc_dec_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
+-		return;
+-	}
+-	memcpy(tvmem, des_cbc_dec_tv_template, tsize);
+-	des_tv = (void *) tvmem;
+-
+-	printk("\ntesting des cbc decryption\n");
+-
+-	for (i = 0; i < DES_CBC_DEC_TEST_VECTORS; i++) {
+-		printk("test %u:\n", i + 1);
+-
+-		tfm->crt_flags = 0;
+-		key = des_tv[i].key;
+-
+-		ret = crypto_cipher_setkey(tfm, key, 8);
+-		if (ret) {
+-			printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-			goto out;
+-		}
+-
+-		len = des_tv[i].len;
+-		p = des_tv[i].plaintext;
+-
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = offset_in_page(p);
+-		sg[0].length = len;
+-
+-		crypto_cipher_set_iv(tfm, des_tv[i].iv,
+-				      crypto_tfm_alg_blocksize(tfm));
+-
+-		ret = crypto_cipher_decrypt(tfm, sg, sg, len);
+-		if (ret) {
+-			printk("des_cbc_decrypt() failed flags=%x\n",
+-			       tfm->crt_flags);
+-			goto out;
+-		}
+-
+-		hexdump(tfm->crt_cipher.cit_iv, 8);
+-
+-		q = kmap(sg[0].page) + sg[0].offset;
+-		hexdump(q, len);
+-
+-		printk("%s\n",
+-		       memcmp(q, des_tv[i].result, len) ? "fail" : "pass");
+-	}
+-
+-	/*
+-	 * Scenario G:
+-	 * 
+-	 *  F1   F2      
+-	 *  [4]  [4]
+-	 *
+-	 */
+-	printk("\ntesting des cbc decryption chunking scenario G\n");
+-	i = 3;
+-
+-	tfm->crt_flags = 0;
+-	key = des_tv[i].key;
+-
+-	ret = crypto_cipher_setkey(tfm, key, 8);
+-	if (ret) {
+-		printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-		goto out;
+-	}
+-
+-	/* setup the dummy buffer first */
+-	memset(xbuf, 0, sizeof (xbuf));
+-	memcpy(&xbuf[IDX1], des_tv[i].plaintext, 4);
+-	memcpy(&xbuf[IDX2], des_tv[i].plaintext + 4, 4);
+-
+-	p = &xbuf[IDX1];
+-	sg[0].page = virt_to_page(p);
+-	sg[0].offset = offset_in_page(p);
+-	sg[0].length = 4;
+-
+-	p = &xbuf[IDX2];
+-	sg[1].page = virt_to_page(p);
+-	sg[1].offset = offset_in_page(p);
+-	sg[1].length = 4;
+-
+-	crypto_cipher_set_iv(tfm, des_tv[i].iv, crypto_tfm_alg_ivsize(tfm));
+-
+-	ret = crypto_cipher_decrypt(tfm, sg, sg, 8);
+-	if (ret) {
+-		printk("des_cbc_decrypt() failed flags=%x\n", tfm->crt_flags);
+-		goto out;
+-	}
+-
+-	printk("page 1\n");
+-	q = kmap(sg[0].page) + sg[0].offset;
+-	hexdump(q, 4);
+-	printk("%s\n", memcmp(q, des_tv[i].result, 4) ? "fail" : "pass");
+-
+-	printk("page 2\n");
+-	q = kmap(sg[1].page) + sg[1].offset;
+-	hexdump(q, 4);
+-	printk("%s\n", memcmp(q, des_tv[i].result + 4, 4) ? "fail" : "pass");
+-
+-      out:
+-	crypto_free_tfm(tfm);
+-}
+-
+-void
+-test_des3_ede(void)
+-{
+-	unsigned int ret, i, len;
+-	unsigned int tsize;
+-	char *p, *q;
+-	struct crypto_tfm *tfm;
+-	char *key;
+-	/*char res[8]; */
+-	struct des_tv *des_tv;
+-	struct scatterlist sg[8];
+-
+-	printk("\ntesting des3 ede encryption\n");
+-
+-	tsize = sizeof (des3_ede_enc_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
+-		return;
+-	}
+-
+-	memcpy(tvmem, des3_ede_enc_tv_template, tsize);
+-	des_tv = (void *) tvmem;
+-
+-	tfm = crypto_alloc_tfm("des3_ede", CRYPTO_TFM_MODE_ECB);
+-	if (tfm == NULL) {
+-		printk("failed to load transform for 3des ecb\n");
+-		return;
+-	}
+-
+-	for (i = 0; i < DES3_EDE_ENC_TEST_VECTORS; i++) {
+-		printk("test %u:\n", i + 1);
+-
+-		key = des_tv[i].key;
+-		ret = crypto_cipher_setkey(tfm, key, 24);
+-		if (ret) {
+-			printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-
+-			if (!des_tv[i].fail)
+-				goto out;
+-		}
+-
+-		len = des_tv[i].len;
+-
+-		p = des_tv[i].plaintext;
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = offset_in_page(p);
+-		sg[0].length = len;
+-		ret = crypto_cipher_encrypt(tfm, sg, sg, len);
+-		if (ret) {
+-			printk("encrypt() failed flags=%x\n", tfm->crt_flags);
+-			goto out;
+-		}
+-
+-		q = kmap(sg[0].page) + sg[0].offset;
+-		hexdump(q, len);
+-
+-		printk("%s\n",
+-		       memcmp(q, des_tv[i].result, len) ? "fail" : "pass");
+-	}
+-
+-	printk("\ntesting des3 ede decryption\n");
+-
+-	tsize = sizeof (des3_ede_dec_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
+-		return;
+-	}
+-
+-	memcpy(tvmem, des3_ede_dec_tv_template, tsize);
+-	des_tv = (void *) tvmem;
+-
+-	for (i = 0; i < DES3_EDE_DEC_TEST_VECTORS; i++) {
+-		printk("test %u:\n", i + 1);
+-
+-		key = des_tv[i].key;
+-		ret = crypto_cipher_setkey(tfm, key, 24);
+-		if (ret) {
+-			printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-
+-			if (!des_tv[i].fail)
+-				goto out;
+-		}
+-
+-		len = des_tv[i].len;
+-
+-		p = des_tv[i].plaintext;
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = offset_in_page(p);
+-		sg[0].length = len;
+-		ret = crypto_cipher_decrypt(tfm, sg, sg, len);
+-		if (ret) {
+-			printk("decrypt() failed flags=%x\n", tfm->crt_flags);
+-			goto out;
+-		}
+-
+-		q = kmap(sg[0].page) + sg[0].offset;
+-		hexdump(q, len);
+-
+-		printk("%s\n",
+-		       memcmp(q, des_tv[i].result, len) ? "fail" : "pass");
+-	}
+-
+-      out:
+-	crypto_free_tfm(tfm);
+-}
+-
+-void
+-test_blowfish(void)
+-{
+-	unsigned int ret, i;
+-	unsigned int tsize;
+-	char *p, *q;
+-	struct crypto_tfm *tfm;
+-	char *key;
+-	struct bf_tv *bf_tv;
+-	struct scatterlist sg[1];
+-
+-	printk("\ntesting blowfish encryption\n");
+-
+-	tsize = sizeof (bf_enc_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
+-		return;
+-	}
+-
+-	memcpy(tvmem, bf_enc_tv_template, tsize);
+-	bf_tv = (void *) tvmem;
+-
+-	tfm = crypto_alloc_tfm("blowfish", 0);
+-	if (tfm == NULL) {
+-		printk("failed to load transform for blowfish (default ecb)\n");
+-		return;
+-	}
+-
+-	for (i = 0; i < BF_ENC_TEST_VECTORS; i++) {
+-		printk("test %u (%d bit key):\n",
+-			i + 1, bf_tv[i].keylen * 8);
+-		key = bf_tv[i].key;
+-
+-		ret = crypto_cipher_setkey(tfm, key, bf_tv[i].keylen);
+-		if (ret) {
+-			printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-
+-			if (!bf_tv[i].fail)
+-				goto out;
+-		}
+-
+-		p = bf_tv[i].plaintext;
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = offset_in_page(p);
+-		sg[0].length = bf_tv[i].plen;
+-		ret = crypto_cipher_encrypt(tfm, sg, sg, sg[0].length);
+-		if (ret) {
+-			printk("encrypt() failed flags=%x\n", tfm->crt_flags);
+-			goto out;
+-		}
+-
+-		q = kmap(sg[0].page) + sg[0].offset;
+-		hexdump(q, bf_tv[i].rlen);
+-
+-		printk("%s\n", memcmp(q, bf_tv[i].result, bf_tv[i].rlen) ?
+-			"fail" : "pass");
+-	}
+-
+-	printk("\ntesting blowfish decryption\n");
+-
+-	tsize = sizeof (bf_dec_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
+-		return;
+-	}
+-
+-	memcpy(tvmem, bf_dec_tv_template, tsize);
+-	bf_tv = (void *) tvmem;
+-
+-	for (i = 0; i < BF_DEC_TEST_VECTORS; i++) {
+-		printk("test %u (%d bit key):\n",
+-			i + 1, bf_tv[i].keylen * 8);
+-		key = bf_tv[i].key;
+-
+-		ret = crypto_cipher_setkey(tfm, key, bf_tv[i].keylen);
+-		if (ret) {
+-			printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-
+-			if (!bf_tv[i].fail)
+-				goto out;
+-		}
+-
+-		p = bf_tv[i].plaintext;
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = offset_in_page(p);
+-		sg[0].length = bf_tv[i].plen;
+-		ret = crypto_cipher_decrypt(tfm, sg, sg, sg[0].length);
+-		if (ret) {
+-			printk("decrypt() failed flags=%x\n", tfm->crt_flags);
+-			goto out;
+-		}
+-
+-		q = kmap(sg[0].page) + sg[0].offset;
+-		hexdump(q, bf_tv[i].rlen);
+-
+-		printk("%s\n", memcmp(q, bf_tv[i].result, bf_tv[i].rlen) ?
+-			"fail" : "pass");
+-	}
+-	
+-	crypto_free_tfm(tfm);
+-	
+-	tfm = crypto_alloc_tfm("blowfish", CRYPTO_TFM_MODE_CBC);
+-	if (tfm == NULL) {
+-		printk("failed to load transform for blowfish cbc\n");
+-		return;
+-	}
+-
+-	printk("\ntesting blowfish cbc encryption\n");
+-
+-	tsize = sizeof (bf_cbc_enc_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
+-		goto out;
+-	}
+-	memcpy(tvmem, bf_cbc_enc_tv_template, tsize);
+-	bf_tv = (void *) tvmem;
+-
+-	for (i = 0; i < BF_CBC_ENC_TEST_VECTORS; i++) {
+-		printk("test %u (%d bit key):\n",
+-			i + 1, bf_tv[i].keylen * 8);
+-
+-		key = bf_tv[i].key;
+-
+-		ret = crypto_cipher_setkey(tfm, key, bf_tv[i].keylen);
+-		if (ret) {
+-			printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-			goto out;
+-		}
+-
+-		p = bf_tv[i].plaintext;
+-
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = offset_in_page(p);
+-		sg[0].length =  bf_tv[i].plen;
+-
+-		crypto_cipher_set_iv(tfm, bf_tv[i].iv,
+-				     crypto_tfm_alg_ivsize(tfm));
+-
+-		ret = crypto_cipher_encrypt(tfm, sg, sg, sg[0].length);
+-		if (ret) {
+-			printk("blowfish_cbc_encrypt() failed flags=%x\n",
+-			       tfm->crt_flags);
+-			goto out;
+-		}
+-
+-		q = kmap(sg[0].page) + sg[0].offset;
+-		hexdump(q, bf_tv[i].rlen);
+-
+-		printk("%s\n", memcmp(q, bf_tv[i].result, bf_tv[i].rlen)
+-			? "fail" : "pass");
+-	}
+-
+-	printk("\ntesting blowfish cbc decryption\n");
+-
+-	tsize = sizeof (bf_cbc_dec_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
+-		goto out;
+-	}
+-	memcpy(tvmem, bf_cbc_dec_tv_template, tsize);
+-	bf_tv = (void *) tvmem;
+-
+-	for (i = 0; i < BF_CBC_ENC_TEST_VECTORS; i++) {
+-		printk("test %u (%d bit key):\n",
+-			i + 1, bf_tv[i].keylen * 8);
+-		key = bf_tv[i].key;
+-
+-		ret = crypto_cipher_setkey(tfm, key, bf_tv[i].keylen);
+-		if (ret) {
+-			printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-			goto out;
+-		}
+-
+-		p = bf_tv[i].plaintext;
+-
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = offset_in_page(p);
+-		sg[0].length =  bf_tv[i].plen;
+-
+-		crypto_cipher_set_iv(tfm, bf_tv[i].iv,
+-				     crypto_tfm_alg_ivsize(tfm));
+-
+-		ret = crypto_cipher_decrypt(tfm, sg, sg, sg[0].length);
+-		if (ret) {
+-			printk("blowfish_cbc_decrypt() failed flags=%x\n",
+-			       tfm->crt_flags);
+-			goto out;
+-		}
+-
+-		q = kmap(sg[0].page) + sg[0].offset;
+-		hexdump(q, bf_tv[i].rlen);
+-
+-		printk("%s\n", memcmp(q, bf_tv[i].result, bf_tv[i].rlen)
+-			? "fail" : "pass");
+-	}
+-
+-out:
+-	crypto_free_tfm(tfm);
+-}
+-
+-
+-void
+-test_twofish(void)
+-{
+-	unsigned int ret, i;
+-	unsigned int tsize;
+-	char *p, *q;
+-	struct crypto_tfm *tfm;
+-	char *key;
+-	struct tf_tv *tf_tv;
+-	struct scatterlist sg[1];
+-
+-	printk("\ntesting twofish encryption\n");
+-
+-	tsize = sizeof (tf_enc_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
+-		return;
+-	}
+-
+-	memcpy(tvmem, tf_enc_tv_template, tsize);
+-	tf_tv = (void *) tvmem;
+-
+-	tfm = crypto_alloc_tfm("twofish", 0);
+-	if (tfm == NULL) {
+-		printk("failed to load transform for blowfish (default ecb)\n");
+-		return;
+-	}
+-
+-	for (i = 0; i < TF_ENC_TEST_VECTORS; i++) {
+-		printk("test %u (%d bit key):\n",
+-			i + 1, tf_tv[i].keylen * 8);
+-		key = tf_tv[i].key;
+-
+-		ret = crypto_cipher_setkey(tfm, key, tf_tv[i].keylen);
+-		if (ret) {
+-			printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-
+-			if (!tf_tv[i].fail)
+-				goto out;
+-		}
+-
+-		p = tf_tv[i].plaintext;
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = offset_in_page(p);
+-		sg[0].length = tf_tv[i].plen;
+-		ret = crypto_cipher_encrypt(tfm, sg, sg, sg[0].length);
+-		if (ret) {
+-			printk("encrypt() failed flags=%x\n", tfm->crt_flags);
+-			goto out;
+-		}
+-
+-		q = kmap(sg[0].page) + sg[0].offset;
+-		hexdump(q, tf_tv[i].rlen);
+-
+-		printk("%s\n", memcmp(q, tf_tv[i].result, tf_tv[i].rlen) ?
+-			"fail" : "pass");
+-	}
+-
+-	printk("\ntesting twofish decryption\n");
+-
+-	tsize = sizeof (tf_dec_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
+-		return;
+-	}
+-
+-	memcpy(tvmem, tf_dec_tv_template, tsize);
+-	tf_tv = (void *) tvmem;
+-
+-	for (i = 0; i < TF_DEC_TEST_VECTORS; i++) {
+-		printk("test %u (%d bit key):\n",
+-			i + 1, tf_tv[i].keylen * 8);
+-		key = tf_tv[i].key;
+-
+-		ret = crypto_cipher_setkey(tfm, key, tf_tv[i].keylen);
+-		if (ret) {
+-			printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-
+-			if (!tf_tv[i].fail)
+-				goto out;
+-		}
+-
+-		p = tf_tv[i].plaintext;
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = offset_in_page(p);
+-		sg[0].length = tf_tv[i].plen;
+-		ret = crypto_cipher_decrypt(tfm, sg, sg, sg[0].length);
+-		if (ret) {
+-			printk("decrypt() failed flags=%x\n", tfm->crt_flags);
+-			goto out;
+-		}
+-
+-		q = kmap(sg[0].page) + sg[0].offset;
+-		hexdump(q, tf_tv[i].rlen);
+-
+-		printk("%s\n", memcmp(q, tf_tv[i].result, tf_tv[i].rlen) ?
+-			"fail" : "pass");
+-	}
+-
+-	crypto_free_tfm(tfm);
+-	
+-	tfm = crypto_alloc_tfm("twofish", CRYPTO_TFM_MODE_CBC);
+-	if (tfm == NULL) {
+-		printk("failed to load transform for twofish cbc\n");
+-		return;
+-	}
+-
+-	printk("\ntesting twofish cbc encryption\n");
+-
+-	tsize = sizeof (tf_cbc_enc_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
+-		goto out;
+-	}
+-	memcpy(tvmem, tf_cbc_enc_tv_template, tsize);
+-	tf_tv = (void *) tvmem;
+-
+-	for (i = 0; i < TF_CBC_ENC_TEST_VECTORS; i++) {
+-		printk("test %u (%d bit key):\n",
+-			i + 1, tf_tv[i].keylen * 8);
+-
+-		key = tf_tv[i].key;
+-
+-		ret = crypto_cipher_setkey(tfm, key, tf_tv[i].keylen);
+-		if (ret) {
+-			printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-			goto out;
+-		}
+-
+-		p = tf_tv[i].plaintext;
+-
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = offset_in_page(p);
+-		sg[0].length =  tf_tv[i].plen;
+-
+-		crypto_cipher_set_iv(tfm, tf_tv[i].iv,
+-				     crypto_tfm_alg_ivsize(tfm));
+-
+-		ret = crypto_cipher_encrypt(tfm, sg, sg, sg[0].length);
+-		if (ret) {
+-			printk("blowfish_cbc_encrypt() failed flags=%x\n",
+-			       tfm->crt_flags);
+-			goto out;
+-		}
+-
+-		q = kmap(sg[0].page) + sg[0].offset;
+-		hexdump(q, tf_tv[i].rlen);
+-
+-		printk("%s\n", memcmp(q, tf_tv[i].result, tf_tv[i].rlen)
+-			? "fail" : "pass");
+-	}
+-
+-	printk("\ntesting twofish cbc decryption\n");
+-
+-	tsize = sizeof (tf_cbc_dec_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
+-		goto out;
+-	}
+-	memcpy(tvmem, tf_cbc_dec_tv_template, tsize);
+-	tf_tv = (void *) tvmem;
+-
+-	for (i = 0; i < TF_CBC_DEC_TEST_VECTORS; i++) {
+-		printk("test %u (%d bit key):\n",
+-			i + 1, tf_tv[i].keylen * 8);
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the Free
++ * Software Foundation; either version 2 of the License, or (at your option) 
++ * any later version.
++ *
++ * 14 - 09 - 2003 
++ *	Rewritten by Kartikey Mahendra Bhatt
++ */
+ 
+-		key = tf_tv[i].key;
++#include <linux/init.h>
++#include <linux/module.h>
++#include <linux/mm.h>
++#include <linux/slab.h>
++#include <asm/scatterlist.h>
++#include <linux/string.h>
++#include <linux/crypto.h>
++#include <linux/highmem.h>
++#include "tcrypt.h"
+ 
+-		ret = crypto_cipher_setkey(tfm, key, tf_tv[i].keylen);
+-		if (ret) {
+-			printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-			goto out;
+-		}
++/*
++ * Need to kmalloc() memory for testing kmap().
++ */
++#define TVMEMSIZE	4096
++#define XBUFSIZE	32768
+ 
+-		p = tf_tv[i].plaintext;
++/*
++ * Indexes into the xbuf to simulate cross-page access.
++ */
++#define IDX1		37
++#define IDX2		32400
++#define IDX3		1
++#define IDX4		8193
++#define IDX5		22222
++#define IDX6		17101
++#define IDX7		27333
++#define IDX8		3000
+ 
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = offset_in_page(p);
+-		sg[0].length =  tf_tv[i].plen;
++/*
++* Used by test_cipher()
++*/
++#define ENCRYPT 1
++#define DECRYPT 0
++#define MODE_ECB 1
++#define MODE_CBC 0
+ 
+-		crypto_cipher_set_iv(tfm, tf_tv[i].iv,
+-				     crypto_tfm_alg_ivsize(tfm));
++static unsigned int IDX[8] = { IDX1, IDX2, IDX3, IDX4, IDX5, IDX6, IDX7, IDX8 };
+ 
+-		ret = crypto_cipher_decrypt(tfm, sg, sg, sg[0].length);
+-		if (ret) {
+-			printk("blowfish_cbc_decrypt() failed flags=%x\n",
+-			       tfm->crt_flags);
+-			goto out;
+-		}
++static int mode;
++static char *xbuf;
++static char *tvmem;
+ 
+-		q = kmap(sg[0].page) + sg[0].offset;
+-		hexdump(q, tf_tv[i].rlen);
++static char *check[] = {
++	"des", "md5", "des3_ede", "rot13", "sha1", "sha256", "blowfish",
++	"twofish", "serpent", "sha384", "sha512", "md4", "aes", "cast6", 
++	"deflate", NULL
++};
+ 
+-		printk("%s\n", memcmp(q, tf_tv[i].result, tf_tv[i].rlen)
+-			? "fail" : "pass");
+-	}
++static void
++hexdump(unsigned char *buf, unsigned int len)
++{
++	while (len--)
++		printk("%02x", *buf++);
+ 
+-out:	
+-	crypto_free_tfm(tfm);
++	printk("\n");
+ }
+ 
+-void
+-test_serpent(void)
++static void 
++test_hash (char * algo, struct hash_testvec * template, unsigned int tcount)
+ {
+-	unsigned int ret, i, tsize;
+-	u8 *p, *q, *key;
+-	struct crypto_tfm *tfm;
+-	struct serpent_tv *serp_tv;
+-	struct scatterlist sg[1];
+-
+-	printk("\ntesting serpent encryption\n");
++	char *p; 
++        unsigned int i, j, k, temp;
++        struct scatterlist sg[8];
++        char result[64];
++        struct crypto_tfm *tfm;
++        struct hash_testvec *hash_tv;
++        unsigned int tsize;
++	 
++        printk("\ntesting %s\n", algo);
+ 
+-	tfm = crypto_alloc_tfm("serpent", 0);
+-	if (tfm == NULL) {
+-		printk("failed to load transform for serpent (default ecb)\n");
++	tsize = sizeof (struct hash_testvec);
++	tsize *= tcount;
++	
++	if (tsize > TVMEMSIZE) {
++		printk("template (%u) too big for tvmem (%u)\n", tsize, TVMEMSIZE);
+ 		return;
+ 	}
+ 
+-	tsize = sizeof (serpent_enc_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
++	memcpy(tvmem, template, tsize);
++	hash_tv = (void *) tvmem;
++	tfm = crypto_alloc_tfm(algo, 0);
++	if (tfm == NULL) {
++		printk("failed to load transform for %s\n", algo);
+ 		return;
+ 	}
+ 
+-	memcpy(tvmem, serpent_enc_tv_template, tsize);
+-	serp_tv = (void *) tvmem;
+-	for (i = 0; i < SERPENT_ENC_TEST_VECTORS; i++) {
+-		printk("test %u (%d bit key):\n", i + 1, serp_tv[i].keylen * 8);
+-		key = serp_tv[i].key;
+-
+-		ret = crypto_cipher_setkey(tfm, key, serp_tv[i].keylen);
+-		if (ret) {
+-			printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-
+-			if (!serp_tv[i].fail)
+-				goto out;
+-		}
++	for (i = 0; i < tcount; i++) {
++		printk ("test %u:\n", i + 1);
++		memset (result, 0, 64);
+ 
+-		p = serp_tv[i].plaintext;
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = offset_in_page(p);
+-		sg[0].length = sizeof(serp_tv[i].plaintext);
+-		ret = crypto_cipher_encrypt(tfm, sg, sg, sg[0].length);
+-		if (ret) {
+-			printk("encrypt() failed flags=%x\n", tfm->crt_flags);
+-			goto out;
+-		}
++		p = hash_tv[i].plaintext;
++		sg[0].page = virt_to_page (p);
++		sg[0].offset = offset_in_page (p);
++		sg[0].length = hash_tv[i].psize;
+ 
+-		q = kmap(sg[0].page) + sg[0].offset;
+-		hexdump(q, sizeof(serp_tv[i].result));
++		crypto_digest_init (tfm);
++		crypto_digest_update (tfm, sg, 1);
++		crypto_digest_final (tfm, result);
+ 
+-		printk("%s\n", memcmp(q, serp_tv[i].result,
+-			sizeof(serp_tv[i].result)) ? "fail" : "pass");
++		hexdump (result, crypto_tfm_alg_digestsize (tfm));
++		printk("%s\n",
++			memcmp(result, hash_tv[i].digest,
++				crypto_tfm_alg_digestsize(tfm)) ? "fail" :
++			"pass");
+ 	}
+ 
+-	printk("\ntesting serpent decryption\n");
+-
+-	tsize = sizeof (serpent_dec_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
+-		return;
+-	}
++	printk ("testing %s across pages\n", algo);
+ 
+-	memcpy(tvmem, serpent_dec_tv_template, tsize);
+-	serp_tv = (void *) tvmem;
+-	for (i = 0; i < SERPENT_DEC_TEST_VECTORS; i++) {
+-		printk("test %u (%d bit key):\n", i + 1, serp_tv[i].keylen * 8);
+-		key = serp_tv[i].key;
++	/* setup the dummy buffer first */
++        memset(xbuf, 0, XBUFSIZE);
+ 
+-		ret = crypto_cipher_setkey(tfm, key, serp_tv[i].keylen);
+-		if (ret) {
+-			printk("setkey() failed flags=%x\n", tfm->crt_flags);
++	j = 0;
++	for (i = 0; i < tcount; i++) {
++		if (hash_tv[i].np) {
++			j++;
++			printk ("test %u:\n", j);
++			memset (result, 0, 64);
+ 
+-			if (!serp_tv[i].fail)
+-				goto out;
+-		}
++			temp = 0;
++			for (k = 0; k < hash_tv[i].np; k++) {
++				memcpy (&xbuf[IDX[k]], hash_tv[i].plaintext + temp, 
++						hash_tv[i].tap[k]);	
++				temp += hash_tv[i].tap[k];
++				p = &xbuf[IDX[k]];
++				sg[k].page = virt_to_page (p);
++				sg[k].offset = offset_in_page (p);
++				sg[k].length = hash_tv[i].tap[k];
++			}
+ 
+-		p = serp_tv[i].plaintext;
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = offset_in_page(p);
+-		sg[0].length = sizeof(serp_tv[i].plaintext);
+-		ret = crypto_cipher_decrypt(tfm, sg, sg, sg[0].length);
+-		if (ret) {
+-			printk("decrypt() failed flags=%x\n", tfm->crt_flags);
+-			goto out;
++			crypto_digest_digest (tfm, sg, hash_tv[i].np, result);
++			
++			hexdump (result, crypto_tfm_alg_digestsize (tfm));
++			printk("%s\n",
++				memcmp(result, hash_tv[i].digest,
++					crypto_tfm_alg_digestsize(tfm)) ? "fail" :
++				"pass");
+ 		}
+-
+-		q = kmap(sg[0].page) + sg[0].offset;
+-		hexdump(q, sizeof(serp_tv[i].result));
+-
+-		printk("%s\n", memcmp(q, serp_tv[i].result,
+-			sizeof(serp_tv[i].result)) ? "fail" : "pass");
+ 	}
+-
+-out:
+-	crypto_free_tfm(tfm);
++	
++	crypto_free_tfm (tfm);
+ }
+ 
++
++#ifdef CONFIG_CRYPTO_HMAC
++
+ static void
+-test_cast6(void)
++test_hmac(char *algo, struct hmac_testvec * template, unsigned int tcount)
+ {
+-	unsigned int ret, i, tsize;
+-	u8 *p, *q, *key;
++	char *p;
++	unsigned int i, j, k, temp;
++	struct scatterlist sg[8];
++	char result[64];
+ 	struct crypto_tfm *tfm;
+-	struct cast6_tv *cast_tv;
+-	struct scatterlist sg[1];
++	struct hmac_testvec *hmac_tv;
++	unsigned int tsize, klen;
+ 
+-	printk("\ntesting cast6 encryption\n");
+-
+-	tfm = crypto_alloc_tfm("cast6", 0);
++	tfm = crypto_alloc_tfm(algo, 0);
+ 	if (tfm == NULL) {
+-		printk("failed to load transform for cast6 (default ecb)\n");
++		printk("failed to load transform for %s\n", algo);
+ 		return;
+ 	}
+ 
+-	tsize = sizeof (cast6_enc_tv_template);
++	printk("\ntesting hmac_%s\n", algo);
++	
++	tsize = sizeof (struct hmac_testvec);
++	tsize *= tcount;
+ 	if (tsize > TVMEMSIZE) {
+ 		printk("template (%u) too big for tvmem (%u)\n", tsize,
+ 		       TVMEMSIZE);
+-		return;
++		goto out;
+ 	}
+ 
+-	memcpy(tvmem, cast6_enc_tv_template, tsize);
+-	cast_tv = (void *) tvmem;
+-	for (i = 0; i < CAST6_ENC_TEST_VECTORS; i++) {
+-		printk("test %u (%d bit key):\n", i + 1, cast_tv[i].keylen * 8);
+-		key = cast_tv[i].key;
++	memcpy(tvmem, template, tsize);
++	hmac_tv = (void *) tvmem;
+ 
+-		ret = crypto_cipher_setkey(tfm, key, cast_tv[i].keylen);
+-		if (ret) {
+-			printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-
+-			if (!cast_tv[i].fail)
+-				goto out;
+-		}
++	for (i = 0; i < tcount; i++) {
++		printk("test %u:\n", i + 1);
++		memset(result, 0, sizeof (result));
+ 
+-		p = cast_tv[i].plaintext;
++		p = hmac_tv[i].plaintext;
++		klen = hmac_tv[i].ksize;
+ 		sg[0].page = virt_to_page(p);
+-		sg[0].offset = ((long) p & ~PAGE_MASK);
+-		sg[0].length = sizeof(cast_tv[i].plaintext);
+-		ret = crypto_cipher_encrypt(tfm, sg, sg, sg[0].length);
+-		if (ret) {
+-			printk("encrypt() failed flags=%x\n", tfm->crt_flags);
+-			goto out;
+-		}
+-
+-		q = kmap(sg[0].page) + sg[0].offset;
+-		hexdump(q, sizeof(cast_tv[i].result));
+-
+-		printk("%s\n", memcmp(q, cast_tv[i].result,
+-			sizeof(cast_tv[i].result)) ? "fail" : "pass");
+-	}
++		sg[0].offset = offset_in_page(p);
++		sg[0].length = hmac_tv[i].psize;
+ 
+-	printk("\ntesting cast6 decryption\n");
++		crypto_hmac(tfm, hmac_tv[i].key, &klen, sg, 1, result);
+ 
+-	tsize = sizeof (cast6_dec_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
+-		return;
++		hexdump(result, crypto_tfm_alg_digestsize(tfm));
++		printk("%s\n",
++		       memcmp(result, hmac_tv[i].digest,
++			      crypto_tfm_alg_digestsize(tfm)) ? "fail" :
++		       "pass");
+ 	}
+ 
+-	memcpy(tvmem, cast6_dec_tv_template, tsize);
+-	cast_tv = (void *) tvmem;
+-	for (i = 0; i < CAST6_DEC_TEST_VECTORS; i++) {
+-		printk("test %u (%d bit key):\n", i + 1, cast_tv[i].keylen * 8);
+-		key = cast_tv[i].key;
++	printk("\ntesting hmac_%s across pages\n", algo);
+ 
+-		ret = crypto_cipher_setkey(tfm, key, cast_tv[i].keylen);
+-		if (ret) {
+-			printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-
+-			if (!cast_tv[i].fail)
+-				goto out;
+-		}
+-
+-		p = cast_tv[i].plaintext;
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = ((long) p & ~PAGE_MASK);
+-		sg[0].length = sizeof(cast_tv[i].plaintext);
+-		ret = crypto_cipher_decrypt(tfm, sg, sg, sg[0].length);
+-		if (ret) {
+-			printk("decrypt() failed flags=%x\n", tfm->crt_flags);
+-			goto out;
++	memset(xbuf, 0, XBUFSIZE);
++	
++	j = 0;
++	for (i = 0; i < tcount; i++) {
++		if (hmac_tv[i].np) {
++			j++;
++			printk ("test %u:\n",j);
++			memset (result, 0, 64);
++
++			temp = 0;
++			klen = hmac_tv[i].ksize;
++			for (k = 0; k < hmac_tv[i].np; k++) {
++				memcpy (&xbuf[IDX[k]], hmac_tv[i].plaintext + temp, 
++						hmac_tv[i].tap[k]);	
++				temp += hmac_tv[i].tap[k];
++				p = &xbuf[IDX[k]];
++				sg[k].page = virt_to_page (p);
++				sg[k].offset = offset_in_page (p);
++				sg[k].length = hmac_tv[i].tap[k];
++			}
++
++			crypto_hmac(tfm, hmac_tv[i].key, &klen, sg, hmac_tv[i].np, 
++					result);
++			hexdump(result, crypto_tfm_alg_digestsize(tfm));
++			
++			printk("%s\n",
++				memcmp(result, hmac_tv[i].digest,
++					crypto_tfm_alg_digestsize(tfm)) ? "fail" : 
++				"pass");
+ 		}
+-
+-		q = kmap(sg[0].page) + sg[0].offset;
+-		hexdump(q, sizeof(cast_tv[i].result));
+-
+-		printk("%s\n", memcmp(q, cast_tv[i].result,
+-			sizeof(cast_tv[i].result)) ? "fail" : "pass");
+ 	}
+-
+ out:
+ 	crypto_free_tfm(tfm);
+ }
+ 
++#endif	/* CONFIG_CRYPTO_HMAC */
++
+ void
+-test_aes(void)
++test_cipher(char * algo, int mode, int enc, struct cipher_testvec * template, unsigned int tcount)
+ {
+-	unsigned int ret, i;
++	unsigned int ret, i, j, k, temp;
+ 	unsigned int tsize;
+ 	char *p, *q;
+ 	struct crypto_tfm *tfm;
+ 	char *key;
+-	struct aes_tv *aes_tv;
+-	struct scatterlist sg[1];
+-
+-	printk("\ntesting aes encryption\n");
+-
+-	tsize = sizeof (aes_enc_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
+-		return;
+-	}
+-
+-	memcpy(tvmem, aes_enc_tv_template, tsize);
+-	aes_tv = (void *) tvmem;
+-
+-	tfm = crypto_alloc_tfm("aes", 0);
+-	if (tfm == NULL) {
+-		printk("failed to load transform for aes (default ecb)\n");
+-		return;
+-	}
+-
+-	for (i = 0; i < AES_ENC_TEST_VECTORS; i++) {
+-		printk("test %u (%d bit key):\n",
+-			i + 1, aes_tv[i].keylen * 8);
+-		key = aes_tv[i].key;
+-
+-		ret = crypto_cipher_setkey(tfm, key, aes_tv[i].keylen);
+-		if (ret) {
+-			printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-
+-			if (!aes_tv[i].fail)
+-				goto out;
+-		}
++	struct cipher_testvec *cipher_tv;
++	struct scatterlist sg[8];
++	char e[11], m[4];
+ 
+-		p = aes_tv[i].plaintext;
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = offset_in_page(p);
+-		sg[0].length = aes_tv[i].plen;
+-		ret = crypto_cipher_encrypt(tfm, sg, sg, sg[0].length);
+-		if (ret) {
+-			printk("encrypt() failed flags=%x\n", tfm->crt_flags);
+-			goto out;
+-		}
++	if (enc == ENCRYPT)
++	        strncpy(e, "encryption", 11);
++	else
++        	strncpy(e, "decryption", 11);
++	if (mode == MODE_ECB)
++        	strncpy(m, "ECB", 4);
++	else
++        	strncpy(m, "CBC", 4);
+ 
+-		q = kmap(sg[0].page) + sg[0].offset;
+-		hexdump(q, aes_tv[i].rlen);
++	printk("\ntesting %s %s %s \n", algo, m, e);
+ 
+-		printk("%s\n", memcmp(q, aes_tv[i].result, aes_tv[i].rlen) ?
+-			"fail" : "pass");
+-	}
++	tsize = sizeof (struct cipher_testvec);	
++	tsize *= tcount;
+ 	
+-	printk("\ntesting aes decryption\n");
+-
+-	tsize = sizeof (aes_dec_tv_template);
+ 	if (tsize > TVMEMSIZE) {
+ 		printk("template (%u) too big for tvmem (%u)\n", tsize,
+ 		       TVMEMSIZE);
+ 		return;
+ 	}
+ 
+-	memcpy(tvmem, aes_dec_tv_template, tsize);
+-	aes_tv = (void *) tvmem;
+-
+-	for (i = 0; i < AES_DEC_TEST_VECTORS; i++) {
+-		printk("test %u (%d bit key):\n",
+-			i + 1, aes_tv[i].keylen * 8);
+-		key = aes_tv[i].key;
+-
+-		ret = crypto_cipher_setkey(tfm, key, aes_tv[i].keylen);
+-		if (ret) {
+-			printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-
+-			if (!aes_tv[i].fail)
+-				goto out;
+-		}
+-
+-		p = aes_tv[i].plaintext;
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = offset_in_page(p);
+-		sg[0].length = aes_tv[i].plen;
+-		ret = crypto_cipher_decrypt(tfm, sg, sg, sg[0].length);
+-		if (ret) {
+-			printk("decrypt() failed flags=%x\n", tfm->crt_flags);
+-			goto out;
+-		}
+-
+-		q = kmap(sg[0].page) + sg[0].offset;
+-		hexdump(q, aes_tv[i].rlen);
+-
+-		printk("%s\n", memcmp(q, aes_tv[i].result, aes_tv[i].rlen) ?
+-			"fail" : "pass");
+-	}
+-
+-out:
+-	crypto_free_tfm(tfm);
+-}
+-
+-void
+-test_cast5(void)
+-{
+-	unsigned int ret, i, tsize;
+-	u8 *p, *q, *key;
+-	struct crypto_tfm *tfm;
+-	struct cast5_tv *c5_tv;
+-	struct scatterlist sg[1];
+-
+-	printk("\ntesting cast5 encryption\n");
++	memcpy(tvmem, template, tsize);
++	cipher_tv = (void *) tvmem;
+ 
+-	tfm = crypto_alloc_tfm("cast5", 0);
++	if (mode) 
++		tfm = crypto_alloc_tfm (algo, 0);
++	else 
++		tfm = crypto_alloc_tfm (algo, CRYPTO_TFM_MODE_CBC);
++	
+ 	if (tfm == NULL) {
+-		printk("failed to load transform for cast5 (default ecb)\n");
+-		return;
+-	}
+-
+-	tsize = sizeof (cast5_enc_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
++		printk("failed to load transform for %s %s\n", algo, m);
+ 		return;
+ 	}
++	
++	j = 0;
++	for (i = 0; i < tcount; i++) {
++		if (!(cipher_tv[i].np)) {
++			j++;	
++			printk("test %u (%d bit key):\n",
++			j, cipher_tv[i].klen * 8);
+ 
+-	memcpy(tvmem, cast5_enc_tv_template, tsize);
+-	c5_tv = (void *) tvmem;
+-	for (i = 0; i < CAST5_ENC_TEST_VECTORS; i++) {
+-		printk("test %u (%d bit key):\n", i + 1, c5_tv[i].keylen * 8);
+-		key = c5_tv[i].key;
+-
+-		ret = crypto_cipher_setkey(tfm, key, c5_tv[i].keylen);
+-		if (ret) {
+-			printk("setkey() failed flags=%x\n", tfm->crt_flags);
++			tfm->crt_flags = 0;
++			if (cipher_tv[i].wk) 
++				tfm->crt_flags |= CRYPTO_TFM_REQ_WEAK_KEY;
++			key = cipher_tv[i].key;
++	
++			ret = crypto_cipher_setkey(tfm, key, cipher_tv[i].klen);
++			if (ret) {
++				printk("setkey() failed flags=%x\n", tfm->crt_flags);
++	
++				if (!cipher_tv[i].fail)
++					goto out;
++			}	
+ 
+-			if (!c5_tv[i].fail)
++			p = cipher_tv[i].input;
++			sg[0].page = virt_to_page(p);
++			sg[0].offset = offset_in_page(p);
++			sg[0].length = cipher_tv[i].ilen;
++	
++			if (!mode) {
++				crypto_cipher_set_iv(tfm, cipher_tv[i].iv,
++					crypto_tfm_alg_ivsize (tfm));
++			}
++		
++			if (enc)
++				ret = crypto_cipher_encrypt(tfm, sg, sg, cipher_tv[i].ilen);
++			else
++				ret = crypto_cipher_decrypt(tfm, sg, sg, cipher_tv[i].ilen);
++			
++				
++			if (ret) {
++				printk("%s () failed flags=%x\n", e, tfm->crt_flags);
+ 				goto out;
++			}	
++	
++			q = kmap(sg[0].page) + sg[0].offset;
++			hexdump(q, cipher_tv[i].rlen);
++	
++			printk("%s\n", 
++				memcmp(q, cipher_tv[i].result, cipher_tv[i].rlen) ? "fail" : 
++			"pass");
+ 		}
+-
+-		p = c5_tv[i].plaintext;
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = ((long) p & ~PAGE_MASK);
+-		sg[0].length = sizeof(c5_tv[i].plaintext);
+-		ret = crypto_cipher_encrypt(tfm, sg, sg, sg[0].length);
+-		if (ret) {
+-			printk("encrypt() failed flags=%x\n", tfm->crt_flags);
+-			goto out;
+-		}
+-
+-		q = kmap(sg[0].page) + sg[0].offset;
+-		hexdump(q, sizeof(c5_tv[i].ciphertext));
+-
+-		printk("%s\n", memcmp(q, c5_tv[i].ciphertext,
+-			sizeof(c5_tv[i].ciphertext)) ? "fail" : "pass");
+ 	}
+ 	
+-	tsize = sizeof (cast5_dec_tv_template);
+-	if (tsize > TVMEMSIZE) {
+-		printk("template (%u) too big for tvmem (%u)\n", tsize,
+-		       TVMEMSIZE);
+-		return;
+-	}
+-
+-	memcpy(tvmem, cast5_dec_tv_template, tsize);
+-	c5_tv = (void *) tvmem;
+-	for (i = 0; i < CAST5_DEC_TEST_VECTORS; i++) {
+-		printk("test %u (%d bit key):\n", i + 1, c5_tv[i].keylen * 8);
+-		key = c5_tv[i].key;
+-
+-		ret = crypto_cipher_setkey(tfm, key, c5_tv[i].keylen);
+-		if (ret) {
+-			printk("setkey() failed flags=%x\n", tfm->crt_flags);
+-
+-			if (!c5_tv[i].fail)
+-				goto out;
+-		}
+-
+-		p = c5_tv[i].plaintext;
+-		sg[0].page = virt_to_page(p);
+-		sg[0].offset = ((long) p & ~PAGE_MASK);
+-		sg[0].length = sizeof(c5_tv[i].plaintext);
+-		ret = crypto_cipher_decrypt(tfm, sg, sg, sg[0].length);
+-		if (ret) {
+-			printk("decrypt() failed flags=%x\n", tfm->crt_flags);
+-			goto out;
++	printk("\ntesting %s %s %s across pages (chunking) \n", algo, m, e);
++	memset(xbuf, 0, XBUFSIZE);
++	
++	j = 0;
++	for (i = 0; i < tcount; i++) {
++		if (cipher_tv[i].np) {
++			j++;				
++			printk("test %u (%d bit key):\n",
++			j, cipher_tv[i].klen * 8);
++
++			tfm->crt_flags = 0;			
++			if (cipher_tv[i].wk) 
++				tfm->crt_flags |= CRYPTO_TFM_REQ_WEAK_KEY;
++			key = cipher_tv[i].key;
++			
++			ret = crypto_cipher_setkey(tfm, key, cipher_tv[i].klen);		
++			if (ret) {
++				printk("setkey() failed flags=%x\n", tfm->crt_flags);
++				
++				if (!cipher_tv[i].fail)
++					goto out;
++			}
++
++			temp = 0;
++			for (k = 0; k < cipher_tv[i].np; k++) {
++				memcpy (&xbuf[IDX[k]], cipher_tv[i].input + temp, 
++						cipher_tv[i].tap[k]);	
++				temp += cipher_tv[i].tap[k];
++				p = &xbuf[IDX[k]];
++				sg[k].page = virt_to_page (p);
++				sg[k].offset = offset_in_page (p);
++				sg[k].length = cipher_tv[i].tap[k];
++			}
++			
++			if (!mode) {
++				crypto_cipher_set_iv(tfm, cipher_tv[i].iv,
++						crypto_tfm_alg_ivsize (tfm));
++			}
++			
++			if (enc)
++				ret = crypto_cipher_encrypt(tfm, sg, sg, cipher_tv[i].ilen);
++			else
++				ret = crypto_cipher_decrypt(tfm, sg, sg, cipher_tv[i].ilen);
++			
++			if (ret) {
++				printk("%s () failed flags=%x\n", e, tfm->crt_flags);
++				goto out;
++			}
++
++			temp = 0;
++			for (k = 0; k < cipher_tv[i].np; k++) {
++				printk("page %u\n", k);
++				q = kmap(sg[k].page) + sg[k].offset;
++				hexdump(q, cipher_tv[i].tap[k]);
++				printk("%s\n", 
++					memcmp(q, cipher_tv[i].result + temp, 
++						cipher_tv[i].tap[k]) ? "fail" : 
++					"pass");
++				temp += cipher_tv[i].tap[k];
++			}
+ 		}
+-
+-		q = kmap(sg[0].page) + sg[0].offset;
+-		hexdump(q, sizeof(c5_tv[i].ciphertext));
+-
+-		printk("%s\n", memcmp(q, c5_tv[i].ciphertext,
+-			sizeof(c5_tv[i].ciphertext)) ? "fail" : "pass");
+ 	}
++
+ out:
+-	crypto_free_tfm (tfm);
++	crypto_free_tfm(tfm);
+ }
+ 
+ static void
+@@ -2485,75 +510,118 @@ do_test(void)
+ 	switch (mode) {
+ 
+ 	case 0:
+-		test_md5();
+-		test_sha1();
+-		test_des();
+-		test_des3_ede();
+-		test_md4();
+-		test_sha256();
+-		test_blowfish();
+-		test_twofish();
+-		test_serpent();
+-		test_cast6();
+-		test_aes();
+-		test_sha384();
+-		test_sha512();
+-		test_deflate();
+-		test_cast5();
+-		test_cast6();
++		test_hash("md5", md5_tv_template, MD5_TEST_VECTORS);
++		
++		test_hash("sha1", sha1_tv_template, SHA1_TEST_VECTORS);
++		
++		//DES
++		test_cipher ("des", MODE_ECB, ENCRYPT, des_enc_tv_template, DES_ENC_TEST_VECTORS);
++                test_cipher ("des", MODE_ECB, DECRYPT, des_dec_tv_template, DES_DEC_TEST_VECTORS);
++                test_cipher ("des", MODE_CBC, ENCRYPT, des_cbc_enc_tv_template, DES_CBC_ENC_TEST_VECTORS);
++                test_cipher ("des", MODE_CBC, DECRYPT, des_cbc_dec_tv_template, DES_CBC_DEC_TEST_VECTORS);
++	
++		//DES3_EDE
++		test_cipher ("des3_ede", MODE_ECB, ENCRYPT, des3_ede_enc_tv_template, DES3_EDE_ENC_TEST_VECTORS);
++                test_cipher ("des3_ede", MODE_ECB, DECRYPT, des3_ede_dec_tv_template, DES3_EDE_DEC_TEST_VECTORS);
++		
++		test_hash("md4", md4_tv_template, MD4_TEST_VECTORS);
++		
++		test_hash("sha256", sha256_tv_template, SHA256_TEST_VECTORS);
++		
++		//BLOWFISH
++		test_cipher ("blowfish", MODE_ECB, ENCRYPT, bf_enc_tv_template, BF_ENC_TEST_VECTORS);
++		test_cipher ("blowfish", MODE_ECB, DECRYPT, bf_dec_tv_template, BF_DEC_TEST_VECTORS);
++		test_cipher ("blowfish", MODE_CBC, ENCRYPT, bf_cbc_enc_tv_template, BF_CBC_ENC_TEST_VECTORS);
++		test_cipher ("blowfish", MODE_CBC, DECRYPT, bf_cbc_dec_tv_template, BF_CBC_DEC_TEST_VECTORS);
++		
++		//TWOFISH
++		test_cipher ("twofish", MODE_ECB, ENCRYPT, tf_enc_tv_template, TF_ENC_TEST_VECTORS);
++		test_cipher ("twofish", MODE_ECB, DECRYPT, tf_dec_tv_template, TF_DEC_TEST_VECTORS);
++		test_cipher ("twofish", MODE_CBC, ENCRYPT, tf_cbc_enc_tv_template, TF_CBC_ENC_TEST_VECTORS);
++		test_cipher ("twofish", MODE_CBC, DECRYPT, tf_cbc_dec_tv_template, TF_CBC_DEC_TEST_VECTORS);
++		
++		//SERPENT
++		test_cipher ("serpent", MODE_ECB, ENCRYPT, serpent_enc_tv_template, SERPENT_ENC_TEST_VECTORS);
++		test_cipher ("serpent", MODE_ECB, DECRYPT, serpent_dec_tv_template, SERPENT_DEC_TEST_VECTORS);
++		
++		//AES
++		test_cipher ("aes", MODE_ECB, ENCRYPT, aes_enc_tv_template, AES_ENC_TEST_VECTORS);
++		test_cipher ("aes", MODE_ECB, DECRYPT, aes_dec_tv_template, AES_DEC_TEST_VECTORS);
++
++		//CAST5
++		test_cipher ("cast5", MODE_ECB, ENCRYPT, cast5_enc_tv_template, CAST5_ENC_TEST_VECTORS);
++		test_cipher ("cast5", MODE_ECB, DECRYPT, cast5_dec_tv_template, CAST5_DEC_TEST_VECTORS);
++		
++		//CAST6
++		test_cipher ("cast6", MODE_ECB, ENCRYPT, cast6_enc_tv_template, CAST6_ENC_TEST_VECTORS);
++		test_cipher ("cast6", MODE_ECB, DECRYPT, cast6_dec_tv_template, CAST6_DEC_TEST_VECTORS);
++
++		test_hash("sha384", sha384_tv_template, SHA384_TEST_VECTORS);
++		test_hash("sha512", sha512_tv_template, SHA512_TEST_VECTORS);
++		test_deflate();		
+ #ifdef CONFIG_CRYPTO_HMAC
+-		test_hmac_md5();
+-		test_hmac_sha1();
+-		test_hmac_sha256();
++		test_hmac("md5", hmac_md5_tv_template, HMAC_MD5_TEST_VECTORS);
++		test_hmac("sha1", hmac_sha1_tv_template, HMAC_SHA1_TEST_VECTORS);		
++		test_hmac("sha256", hmac_sha256_tv_template, HMAC_SHA256_TEST_VECTORS);
+ #endif		
+ 		break;
+ 
+ 	case 1:
+-		test_md5();
++		test_hash("md5", md5_tv_template, MD5_TEST_VECTORS);
+ 		break;
+ 
+ 	case 2:
+-		test_sha1();
++		test_hash("sha1", sha1_tv_template, SHA1_TEST_VECTORS);
+ 		break;
+ 
+ 	case 3:
+-		test_des();
++		test_cipher ("des", MODE_ECB, ENCRYPT, des_enc_tv_template, DES_ENC_TEST_VECTORS);
++		test_cipher ("des", MODE_ECB, DECRYPT, des_dec_tv_template, DES_DEC_TEST_VECTORS);
++		test_cipher ("des", MODE_CBC, ENCRYPT, des_cbc_enc_tv_template, DES_CBC_ENC_TEST_VECTORS);
++		test_cipher ("des", MODE_CBC, DECRYPT, des_cbc_dec_tv_template, DES_CBC_DEC_TEST_VECTORS);
+ 		break;
+ 
+ 	case 4:
+-		test_des3_ede();
++		test_cipher ("des3_ede", MODE_ECB, ENCRYPT, des3_ede_enc_tv_template, DES3_EDE_ENC_TEST_VECTORS);
++                test_cipher ("des3_ede", MODE_ECB, DECRYPT, des3_ede_dec_tv_template, DES3_EDE_DEC_TEST_VECTORS);
+ 		break;
+ 
+ 	case 5:
+-		test_md4();
++		test_hash("md4", md4_tv_template, MD4_TEST_VECTORS);
+ 		break;
+ 		
+ 	case 6:
+-		test_sha256();
++		test_hash("sha256", sha256_tv_template, SHA256_TEST_VECTORS);
+ 		break;
+ 	
+ 	case 7:
+-		test_blowfish();
++		test_cipher ("blowfish", MODE_ECB, ENCRYPT, bf_enc_tv_template, BF_ENC_TEST_VECTORS);
++		test_cipher ("blowfish", MODE_ECB, DECRYPT, bf_dec_tv_template, BF_DEC_TEST_VECTORS);
++		test_cipher ("blowfish", MODE_CBC, ENCRYPT, bf_cbc_enc_tv_template, BF_CBC_ENC_TEST_VECTORS);
++		test_cipher ("blowfish", MODE_CBC, DECRYPT, bf_cbc_dec_tv_template, BF_CBC_DEC_TEST_VECTORS);
+ 		break;
+ 
+ 	case 8:
+-		test_twofish();
++		test_cipher ("twofish", MODE_ECB, ENCRYPT, tf_enc_tv_template, TF_ENC_TEST_VECTORS);
++		test_cipher ("twofish", MODE_ECB, DECRYPT, tf_dec_tv_template, TF_DEC_TEST_VECTORS);
++		test_cipher ("twofish", MODE_CBC, ENCRYPT, tf_cbc_enc_tv_template, TF_CBC_ENC_TEST_VECTORS);
++		test_cipher ("twofish", MODE_CBC, DECRYPT, tf_cbc_dec_tv_template, TF_CBC_DEC_TEST_VECTORS);
+ 		break;
+-
++		
+ 	case 9:
+-		test_serpent();
+ 		break;
+ 
+ 	case 10:
+-		test_aes();
++		test_cipher ("aes", MODE_ECB, ENCRYPT, aes_enc_tv_template, AES_ENC_TEST_VECTORS);
++		test_cipher ("aes", MODE_ECB, DECRYPT, aes_dec_tv_template, AES_DEC_TEST_VECTORS);	
+ 		break;
+ 
+ 	case 11:
+-		test_sha384();
++		test_hash("sha384", sha384_tv_template, SHA384_TEST_VECTORS);
+ 		break;
+ 		
+ 	case 12:
+-		test_sha512();
++		test_hash("sha512", sha512_tv_template, SHA512_TEST_VECTORS);
+ 		break;
+ 
+ 	case 13:
+@@ -2561,24 +629,26 @@ do_test(void)
+ 		break;
+ 
+ 	case 14:
+-		test_cast5();
++		test_cipher ("cast5", MODE_ECB, ENCRYPT, cast5_enc_tv_template, CAST5_ENC_TEST_VECTORS);
++		test_cipher ("cast5", MODE_ECB, DECRYPT, cast5_dec_tv_template, CAST5_DEC_TEST_VECTORS);
+ 		break;
+ 
+ 	case 15:
+-		test_cast6();
++		test_cipher ("cast6", MODE_ECB, ENCRYPT, cast6_enc_tv_template, CAST6_ENC_TEST_VECTORS);
++		test_cipher ("cast6", MODE_ECB, DECRYPT, cast6_dec_tv_template, CAST6_DEC_TEST_VECTORS);
+ 		break;
+ 
+ #ifdef CONFIG_CRYPTO_HMAC
+ 	case 100:
+-		test_hmac_md5();
++		test_hmac("md5", hmac_md5_tv_template, HMAC_MD5_TEST_VECTORS);
+ 		break;
+ 		
+ 	case 101:
+-		test_hmac_sha1();
++		test_hmac("sha1", hmac_sha1_tv_template, HMAC_SHA1_TEST_VECTORS);		
+ 		break;
+ 	
+ 	case 102:
+-		test_hmac_sha256();
++		test_hmac("sha256", hmac_sha256_tv_template, HMAC_SHA256_TEST_VECTORS);
+ 		break;
+ 
+ #endif
+@@ -2614,7 +684,14 @@ init(void)
+ 	return 0;
+ }
+ 
++/*
++ * If an init function is provided, an exit function must also be provided
++ * to allow module unload.
++ */
++static void __exit fini(void) { }
++
+ module_init(init);
++module_exit(fini);
+ 
+ MODULE_PARM(mode, "i");
+ 
+--- linux-2.6.0/crypto/tcrypt.h	2003-08-22 19:23:40.000000000 -0700
++++ 25/crypto/tcrypt.h	2003-12-28 23:22:31.000000000 -0800
+@@ -1,4 +1,4 @@
+-/* 
++/*
+  * Quick & dirty crypto testing module.
+  *
+  * This will only exist until we have a better testing mechanism
+@@ -6,565 +6,165 @@
+  *
+  * Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
+  * Copyright (c) 2002 Jean-Francois Dive <jef@linuxbe.org>
+- * 
++ *
+  * This program is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU General Public License as published by the Free
+  * Software Foundation; either version 2 of the License, or (at your option) 
+  * any later version.
+  *
++ * 14 - 09 - 2003 Changes by Kartikey Mahendra Bhatt
++ *
+  */
+ #ifndef _CRYPTO_TCRYPT_H
+ #define _CRYPTO_TCRYPT_H
+ 
+-#define MD5_DIGEST_SIZE		16
+-#define MD4_DIGEST_SIZE		16
+-#define SHA1_DIGEST_SIZE	20
+-#define SHA256_DIGEST_SIZE	32
+-#define SHA384_DIGEST_SIZE	48
+-#define SHA512_DIGEST_SIZE	64
+-
+-/*
+- * MD4 test vectors from RFC1320
+- */
+-#define MD4_TEST_VECTORS	7
+-
+-struct md4_testvec {
+-	char plaintext[128];
+-	char digest[MD4_DIGEST_SIZE];
+-} md4_tv_template[] = {
+-	{ "",
+-		{ 0x31, 0xd6, 0xcf, 0xe0, 0xd1, 0x6a, 0xe9, 0x31,
+-		  0xb7, 0x3c, 0x59, 0xd7, 0xe0, 0xc0, 0x89, 0xc0 }
+-	},
+-	
+-	{ "a",
+-		{ 0xbd, 0xe5, 0x2c, 0xb3, 0x1d, 0xe3, 0x3e, 0x46,
+-		  0x24, 0x5e, 0x05, 0xfb, 0xdb, 0xd6, 0xfb, 0x24 }
+-	},
+-
+-	{ "abc",
+-		{ 0xa4, 0x48, 0x01, 0x7a, 0xaf, 0x21, 0xd8, 0x52,
+-		  0x5f, 0xc1, 0x0a, 0xe8, 0x7a, 0xa6, 0x72, 0x9d }
+-	},
+-	
+-	{ "message digest",
+-		{ 0xd9, 0x13, 0x0a, 0x81, 0x64, 0x54, 0x9f, 0xe8,
+-		  0x18, 0x87, 0x48, 0x06, 0xe1, 0xc7, 0x01, 0x4b }
+-	},
+-	
+-	{ "abcdefghijklmnopqrstuvwxyz",
+-		{ 0xd7, 0x9e, 0x1c, 0x30, 0x8a, 0xa5, 0xbb, 0xcd,
+-		  0xee, 0xa8, 0xed, 0x63, 0xdf, 0x41, 0x2d, 0xa9 }
+-	},
+-		
+-	{ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
+-		{ 0x04, 0x3f, 0x85, 0x82, 0xf2, 0x41, 0xdb, 0x35,
+-		  0x1c, 0xe6, 0x27, 0xe1, 0x53, 0xe7, 0xf0, 0xe4 }
+-	},
+-	
+-	{ "123456789012345678901234567890123456789012345678901234567890123"
+-	  "45678901234567890",
+-		{ 0xe3, 0x3b, 0x4d, 0xdc, 0x9c, 0x38, 0xf2, 0x19,
+-		  0x9c, 0x3e, 0x7b, 0x16, 0x4f, 0xcc, 0x05, 0x36 }
+-	},
+-};
++#define MAX_DIGEST_SIZE		64
++#define MAX_TAP			8
+ 
+-/*
+- * MD5 test vectors from RFC1321
+- */
+-#define MD5_TEST_VECTORS	7
++#define MAX_KEYLEN		56
++#define MAX_IVLEN		32
+ 
+-struct md5_testvec {
++struct hash_testvec {
+ 	char plaintext[128];
+-	char digest[MD5_DIGEST_SIZE];
+-} md5_tv_template[] = {
+-	{ "",
+-		{ 0xd4, 0x1d, 0x8c, 0xd9, 0x8f, 0x00, 0xb2, 0x04,
+-		  0xe9, 0x80, 0x09, 0x98, 0xec, 0xf8, 0x42, 0x7e } },
+-	        	
+-	{ "a",
+-		{ 0x0c, 0xc1, 0x75, 0xb9, 0xc0, 0xf1, 0xb6, 0xa8,
+-		  0x31, 0xc3, 0x99, 0xe2, 0x69, 0x77, 0x26, 0x61 } },
+-		  
+-	{ "abc",
+-		{ 0x90, 0x01, 0x50, 0x98, 0x3c, 0xd2, 0x4f, 0xb0,
+-		  0xd6, 0x96, 0x3f, 0x7d, 0x28, 0xe1, 0x7f, 0x72 } }, 
+-		  
+-	{ "message digest",
+-		{ 0xf9, 0x6b, 0x69, 0x7d, 0x7c, 0xb7, 0x93, 0x8d,
+-		  0x52, 0x5a, 0x2f, 0x31, 0xaa, 0xf1, 0x61, 0xd0 } },
+-		  
+-	{ "abcdefghijklmnopqrstuvwxyz",
+-		{ 0xc3, 0xfc, 0xd3, 0xd7, 0x61, 0x92, 0xe4, 0x00,
+-		  0x7d, 0xfb, 0x49, 0x6c, 0xca, 0x67, 0xe1, 0x3b } },
+-		  
+-	{ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
+-		{ 0xd1, 0x74, 0xab, 0x98, 0xd2, 0x77, 0xd9, 0xf5,
+-		  0xa5, 0x61, 0x1c, 0x2c, 0x9f, 0x41, 0x9d, 0x9f } },
+-		  
+-	{ "12345678901234567890123456789012345678901234567890123456789012"
+-	  "345678901234567890",
+-		{ 0x57, 0xed, 0xf4, 0xa2, 0x2b, 0xe3, 0xc9, 0x55,
+-		  0xac, 0x49, 0xda, 0x2e, 0x21, 0x07, 0xb6, 0x7a } }
++	unsigned char psize;
++	char digest[MAX_DIGEST_SIZE];
++	unsigned char np;
++	unsigned char tap[MAX_TAP];		
+ };
+ 
+-#ifdef CONFIG_CRYPTO_HMAC
+-/*
+- * HMAC-MD5 test vectors from RFC2202
+- * (These need to be fixed to not use strlen).
+- */
+-#define HMAC_MD5_TEST_VECTORS	7
+-
+-struct hmac_md5_testvec {
++struct hmac_testvec {	
+ 	char key[128];
++	unsigned char ksize;
+ 	char plaintext[128];
+-	char digest[MD5_DIGEST_SIZE];
++	unsigned char psize;
++	char digest[MAX_DIGEST_SIZE];
++	unsigned char np;
++	unsigned char tap[MAX_TAP];		
+ };
+ 
+-struct hmac_md5_testvec hmac_md5_tv_template[] =
+-{
+-	
+-	{
+-		{ 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+-		  0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x00},
+-		  
+-		"Hi There",
+-		
+-		{ 0x92, 0x94, 0x72, 0x7a, 0x36, 0x38, 0xbb, 0x1c,
+-		  0x13, 0xf4, 0x8e, 0xf8, 0x15, 0x8b, 0xfc, 0x9d }
+-	},
+-	    
+-	{
+-		{ 'J', 'e', 'f', 'e', 0 },
+-		
+-		"what do ya want for nothing?",
+-		
+-		{ 0x75, 0x0c, 0x78, 0x3e, 0x6a, 0xb0, 0xb5, 0x03,
+-		  0xea, 0xa8, 0x6e, 0x31, 0x0a, 0x5d, 0xb7, 0x38 }
+-	},
+-	
+-	{
+-		{ 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x00 },
+-		  
+-		{ 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+-		  0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+-		  0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+-		  0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+-		  0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+-		  0x00 },
+-		  
+-		{ 0x56, 0xbe, 0x34, 0x52, 0x1d, 0x14, 0x4c, 0x88,
+-		  0xdb, 0xb8, 0xc7, 0x33, 0xf0, 0xe8, 0xb3, 0xf6 }
+-	},
+-	
+-	{
+-		{ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+-		  0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 
+-		  0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x00 },
+-		  
+-		{ 
+-		  0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+-		  0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+-		  0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+-		  0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+-		  0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+-		  0x00 },
+-		  
+-		{ 0x69, 0x7e, 0xaf, 0x0a, 0xca, 0x3a, 0x3a, 0xea,
+-		  0x3a, 0x75, 0x16, 0x47, 0x46, 0xff, 0xaa, 0x79 }
+-	},
+-	
+-	{
+-		{ 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+-		  0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x00 },
+-		  
+-		"Test With Truncation",
+-		
+-		{ 0x56, 0x46, 0x1e, 0xf2, 0x34, 0x2e, 0xdc, 0x00,
+-		  0xf9, 0xba, 0xb9, 0x95, 0x69, 0x0e, 0xfd, 0x4c }
+-	},
+-	
+-	{
+-		{ 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0x00 },
+-		  
+-		"Test Using Larger Than Block-Size Key - Hash Key First",
+-		
+-		{ 0x6b, 0x1a, 0xb7, 0xfe, 0x4b, 0xd7, 0xbf, 0x8f,
+-		  0x0b, 0x62, 0xe6, 0xce, 0x61, 0xb9, 0xd0, 0xcd }
+-	},
+-	
+-	{
+-		{ 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0x00 },
+-		
+-		"Test Using Larger Than Block-Size Key and Larger Than One "
+-		"Block-Size Data",
+-		
+-		{ 0x6f, 0x63, 0x0f, 0xad, 0x67, 0xcd, 0xa0, 0xee,
+-		  0x1f, 0xb1, 0xf5, 0x62, 0xdb, 0x3a, 0xa5, 0x3e }
+-	},
+-	
+-	/* cross page test, need to retain key */
+-	
+-	{
+-		{ 'J', 'e', 'f', 'e', 0 },
+-		
+-		"what do ya want for nothing?",
+-		
+-		{ 0x75, 0x0c, 0x78, 0x3e, 0x6a, 0xb0, 0xb5, 0x03,
+-		  0xea, 0xa8, 0x6e, 0x31, 0x0a, 0x5d, 0xb7, 0x38 }
+-	},
+-	
++struct cipher_testvec {
++	unsigned char fail;
++	unsigned char wk; /* weak key flag */
++	char key[MAX_KEYLEN];
++	unsigned char klen;
++	char iv[MAX_IVLEN];
++	char input[48];
++	unsigned char ilen;
++	char result[48];
++	unsigned char rlen;
++	int np;
++	unsigned char tap[MAX_TAP];	
+ };
+ 
+-	
+ /*
+- * HMAC-SHA1 test vectors from RFC2202
++ * MD4 test vectors from RFC1320
+  */
++#define MD4_TEST_VECTORS	7
+ 
+-#define HMAC_SHA1_TEST_VECTORS	7
+-
+-struct hmac_sha1_testvec {
+-	char key[128];
+-	char plaintext[128];
+-	char digest[SHA1_DIGEST_SIZE];
+-} hmac_sha1_tv_template[] = {
+-	
+-	{
+-		{ 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+-		  0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+-		  0x00},
+-		  
+-		"Hi There",
+-
+-		{ 0xb6, 0x17, 0x31, 0x86, 0x55, 0x05, 0x72, 0x64,
+-                  0xe2, 0x8b, 0xc0, 0xb6, 0xfb ,0x37, 0x8c, 0x8e, 0xf1,
+-                  0x46, 0xbe, 0x00 }
+-	},
+-	    
+-	{
+-		{ 'J', 'e', 'f', 'e', 0 },
+-		
+-		"what do ya want for nothing?",
+-
+-		{ 0xef, 0xfc, 0xdf, 0x6a, 0xe5, 0xeb, 0x2f, 0xa2, 0xd2, 0x74, 
+-		  0x16, 0xd5, 0xf1, 0x84, 0xdf, 0x9c, 0x25, 0x9a, 0x7c, 0x79 }
+-
+-	},
+-	
+-	{
+-		{ 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0x00},
+-
+-		  
+-		{ 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+-		  0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+-		  0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+-		  0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+-		  0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+-		  0x00 },
+-		  
+-		{ 0x12, 0x5d, 0x73, 0x42, 0xb9, 0xac, 0x11, 0xcd, 0x91, 0xa3, 
+-		  0x9a, 0xf4, 0x8a, 0xa1, 0x7b, 0x4f, 0x63, 0xf1, 0x75, 0xd3 }
+-
+-	},
+-	
+-	{
+-		{ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+-		  0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 
+-		  0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x00 },
+-		  
+-		{ 
+-		  0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+-		  0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+-		  0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+-		  0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+-		  0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+-		  0x00 },
+-		  
+-		{ 0x4c, 0x90, 0x07, 0xf4, 0x02, 0x62, 0x50, 0xc6, 0xbc, 0x84, 
+-		  0x14, 0xf9, 0xbf, 0x50, 0xc8, 0x6c, 0x2d, 0x72, 0x35, 0xda }
+-
+-	},
+-	
+-	{
+-		{ 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+-		  0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+-		  0x00 },
+-		  
+-		"Test With Truncation",
+-		
+-		{ 0x4c, 0x1a, 0x03, 0x42, 0x4b, 0x55, 0xe0, 0x7f, 0xe7, 0xf2, 
+-  		  0x7b, 0xe1, 0xd5, 0x8b, 0xb9, 0x32, 0x4a, 0x9a, 0x5a, 0x04 }
+-
+-	},
+-	
+-	{
+-		{ 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0x00 },
+-		  
+-		"Test Using Larger Than Block-Size Key - Hash Key First",
+-		
+-		{ 0xaa, 0x4a, 0xe5, 0xe1, 0x52, 0x72, 0xd0, 0x0e, 0x95, 0x70, 
+-  		  0x56, 0x37, 0xce, 0x8a, 0x3b, 0x55, 0xed, 0x40, 0x21, 0x12 }
+-
+-	},
+-	
++struct hash_testvec md4_tv_template [] = {
+ 	{
+-		{ 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0x00 },
+-		
+-		"Test Using Larger Than Block-Size Key and Larger Than One "
+-		"Block-Size Data",
+-		
+-		{ 0xe8, 0xe9, 0x9d, 0x0f, 0x45, 0x23, 0x7d, 0x78, 0x6d, 0x6b, 
+-		  0xba, 0xa7, 0x96, 0x5c, 0x78, 0x08, 0xbb, 0xff, 0x1a, 0x91 }
++		.plaintext = "",
++		.digest	= { 0x31, 0xd6, 0xcf, 0xe0, 0xd1, 0x6a, 0xe9, 0x31,
++			    0xb7, 0x3c, 0x59, 0xd7, 0xe0, 0xc0, 0x89, 0xc0 },
++	}, {
++		.plaintext = "a",
++		.psize	= 1,
++		.digest	= { 0xbd, 0xe5, 0x2c, 0xb3, 0x1d, 0xe3, 0x3e, 0x46,
++			    0x24, 0x5e, 0x05, 0xfb, 0xdb, 0xd6, 0xfb, 0x24 },
++	}, {
++		.plaintext = "abc",
++		.psize	= 3,
++		.digest	= { 0xa4, 0x48, 0x01, 0x7a, 0xaf, 0x21, 0xd8, 0x52,
++			    0x5f, 0xc1, 0x0a, 0xe8, 0x7a, 0xa6, 0x72, 0x9d },
++	}, {
++		.plaintext = "message digest",
++		.psize	= 14,
++		.digest	= { 0xd9, 0x13, 0x0a, 0x81, 0x64, 0x54, 0x9f, 0xe8,
++			    0x18, 0x87, 0x48, 0x06, 0xe1, 0xc7, 0x01, 0x4b },
++	}, {
++		.plaintext = "abcdefghijklmnopqrstuvwxyz",
++		.psize	= 26,
++		.digest	= { 0xd7, 0x9e, 0x1c, 0x30, 0x8a, 0xa5, 0xbb, 0xcd,
++			    0xee, 0xa8, 0xed, 0x63, 0xdf, 0x41, 0x2d, 0xa9 },
++		.np	= 2,
++		.tap	= { 13, 13 },
++	}, {
++		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
++		.psize	= 62,
++		.digest	= { 0x04, 0x3f, 0x85, 0x82, 0xf2, 0x41, 0xdb, 0x35,
++			    0x1c, 0xe6, 0x27, 0xe1, 0x53, 0xe7, 0xf0, 0xe4 },
++	}, {
++		.plaintext = "123456789012345678901234567890123456789012345678901234567890123"
++			     "45678901234567890",
++		.psize	= 80,
++		.digest	= { 0xe3, 0x3b, 0x4d, 0xdc, 0x9c, 0x38, 0xf2, 0x19,
++			    0x9c, 0x3e, 0x7b, 0x16, 0x4f, 0xcc, 0x05, 0x36 },
+ 	},
+-	
+-	/* cross page test */
+-	{
+-		{ 'J', 'e', 'f', 'e', 0 },
+-		
+-		"what do ya want for nothing?",
+-
+-		{ 0xef, 0xfc, 0xdf, 0x6a, 0xe5, 0xeb, 0x2f, 0xa2, 0xd2, 0x74, 
+-		  0x16, 0xd5, 0xf1, 0x84, 0xdf, 0x9c, 0x25, 0x9a, 0x7c, 0x79 }
+-
+-	},
+-
+ };
+ 
+ /*
+- * HMAC-SHA256 test vectors from
+- * draft-ietf-ipsec-ciph-sha-256-01.txt
++ * MD5 test vectors from RFC1321
+  */
+-#define HMAC_SHA256_TEST_VECTORS	10
+-
+-struct hmac_sha256_testvec {
+-	char key[128];
+-	char plaintext[128];
+-	char digest[SHA256_DIGEST_SIZE];
+-} hmac_sha256_tv_template[] = {
+-
+-	{
+-		{ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+-		  0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10,
+-		  0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
+-		  0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x00 },
+-		  
+-	
+-		{ "abc" },
+-		
+-		{ 0xa2, 0x1b, 0x1f, 0x5d, 0x4c, 0xf4, 0xf7, 0x3a,
+-		  0x4d, 0xd9, 0x39, 0x75, 0x0f, 0x7a, 0x06, 0x6a,
+-		  0x7f, 0x98, 0xcc, 0x13, 0x1c, 0xb1, 0x6a, 0x66,
+-		  0x92, 0x75, 0x90, 0x21, 0xcf, 0xab, 0x81, 0x81 },
+-
+-	},
+-	
+-	{
+-		{ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+-		  0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10,
+-		  0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
+-		   0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x00 },
+-		
+-		{ "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" },
+-		
+-		{ 0x10, 0x4f, 0xdc, 0x12, 0x57, 0x32, 0x8f, 0x08,
+-		  0x18, 0x4b, 0xa7, 0x31, 0x31, 0xc5, 0x3c, 0xae,
+-		  0xe6, 0x98, 0xe3, 0x61, 0x19, 0x42, 0x11, 0x49,
+-		  0xea, 0x8c, 0x71, 0x24, 0x56, 0x69, 0x7d, 0x30 }
+-	},
+-
+-	{
+-		{ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+-		  0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10,
+-		  0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
+-		  0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x00 },
+-		
+-		{ "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
+-		  "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" },
+-		
+-		{ 0x47, 0x03, 0x05, 0xfc, 0x7e, 0x40, 0xfe, 0x34,
+-		  0xd3, 0xee, 0xb3, 0xe7, 0x73, 0xd9, 0x5a, 0xab,
+-		  0x73, 0xac, 0xf0, 0xfd, 0x06, 0x04, 0x47, 0xa5,
+-		  0xeb, 0x45, 0x95, 0xbf, 0x33, 0xa9, 0xd1, 0xa3 }
+-	},
+-
+-	{
+-		{ 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+-		  0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+-		  0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
+-		  0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x00 },
+-		
+-		{ "Hi There" },
+-		
+-		{ 0x19, 0x8a, 0x60, 0x7e, 0xb4, 0x4b, 0xfb, 0xc6,
+-		  0x99, 0x03, 0xa0, 0xf1, 0xcf, 0x2b, 0xbd, 0xc5,
+-		  0xba, 0x0a, 0xa3, 0xf3, 0xd9, 0xae, 0x3c, 0x1c,
+-		  0x7a, 0x3b, 0x16, 0x96, 0xa0, 0xb6, 0x8c, 0xf7 }
+-	},
+-
+-	{
+-		{ "Jefe" },
+-		
+-		{ "what do ya want for nothing?" },
+-		
+-		{ 0x5b, 0xdc, 0xc1, 0x46, 0xbf, 0x60, 0x75, 0x4e,
+-		  0x6a, 0x04, 0x24, 0x26, 0x08, 0x95, 0x75, 0xc7,
+-		  0x5a, 0x00, 0x3f, 0x08, 0x9d, 0x27, 0x39, 0x83,
+-		  0x9d, 0xec, 0x58, 0xb9, 0x64, 0xec, 0x38, 0x43 }
+-	},
+-
+-	{
+-		{ 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x00 },
+-		
+-		{ 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+-		  0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+-		  0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+-		  0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+-		  0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+-		  0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
+-		  0xdd, 0xdd, 0x00 },
+-		
+-		{ 0xcd, 0xcb, 0x12, 0x20, 0xd1, 0xec, 0xcc, 0xea,
+-		  0x91, 0xe5, 0x3a, 0xba, 0x30, 0x92, 0xf9, 0x62,
+-		  0xe5, 0x49, 0xfe, 0x6c, 0xe9, 0xed, 0x7f, 0xdc,
+-		  0x43, 0x19, 0x1f, 0xbd, 0xe4, 0x5c, 0x30, 0xb0 }
+-	},
+-
+-	{
+-		{ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+-		  0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10,
+-		  0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
+-		  0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,
+-		  0x21, 0x22, 0x23, 0x24, 0x25, 0x00 },
+-		
+-		{ 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+-		  0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+-		  0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+-		  0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+-		  0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+-		  0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
+-		  0xcd, 0xcd, 0x00 },
+-		
+-		{ 0xd4, 0x63, 0x3c, 0x17, 0xf6, 0xfb, 0x8d, 0x74,
+-		  0x4c, 0x66, 0xde, 0xe0, 0xf8, 0xf0, 0x74, 0x55,
+-		  0x6e, 0xc4, 0xaf, 0x55, 0xef, 0x07, 0x99, 0x85,
+-		  0x41, 0x46, 0x8e, 0xb4, 0x9b, 0xd2, 0xe9, 0x17 }
+-	},
+-
+-	{
+-		{ 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+-		  0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+-		  0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+-		  0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x00 },
+-		
+-		{ "Test With Truncation" },
+-		
+-		{ 0x75, 0x46, 0xaf, 0x01, 0x84, 0x1f, 0xc0, 0x9b,
+-		  0x1a, 0xb9, 0xc3, 0x74, 0x9a, 0x5f, 0x1c, 0x17,
+-		  0xd4, 0xf5, 0x89, 0x66, 0x8a, 0x58, 0x7b, 0x27,
+-		  0x00, 0xa9, 0xc9, 0x7c, 0x11, 0x93, 0xcf, 0x42 }
+-	},
+-	
+-	{
+-		{ 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x00 },
+-		
+-		{ "Test Using Larger Than Block-Size Key - Hash Key First" },
+-		
+-		{ 0x69, 0x53, 0x02, 0x5e, 0xd9, 0x6f, 0x0c, 0x09,
+-		  0xf8, 0x0a, 0x96, 0xf7, 0x8e, 0x65, 0x38, 0xdb,
+-		  0xe2, 0xe7, 0xb8, 0x20, 0xe3, 0xdd, 0x97, 0x0e,
+-		  0x7d, 0xdd, 0x39, 0x09, 0x1b, 0x32, 0x35, 0x2f }
+-	},
++#define MD5_TEST_VECTORS	7
+ 
++struct hash_testvec md5_tv_template[] = {
+ 	{
+-		{ 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+-		  0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0x00 },
+-		
+-		{ "Test Using Larger Than Block-Size Key and Larger Than "
+-		  "One Block-Size Data" },
+-		
+-		{ 0x63, 0x55, 0xac, 0x22, 0xe8, 0x90, 0xd0, 0xa3,
+-		  0xc8, 0x48, 0x1a, 0x5c, 0xa4, 0x82, 0x5b, 0xc8,
+-		  0x84, 0xd3, 0xe7, 0xa1, 0xff, 0x98, 0xa2, 0xfc,
+-		  0x2a, 0xc7, 0xd8, 0xe0, 0x64, 0xc3, 0xb2, 0xe6 }
+-	},
++		.digest	= { 0xd4, 0x1d, 0x8c, 0xd9, 0x8f, 0x00, 0xb2, 0x04,
++			    0xe9, 0x80, 0x09, 0x98, 0xec, 0xf8, 0x42, 0x7e },
++	}, {
++		.plaintext = "a",
++		.psize	= 1,
++		.digest	= { 0x0c, 0xc1, 0x75, 0xb9, 0xc0, 0xf1, 0xb6, 0xa8,
++			    0x31, 0xc3, 0x99, 0xe2, 0x69, 0x77, 0x26, 0x61 },
++	}, {
++		.plaintext = "abc",
++		.psize	= 3,
++		.digest	= { 0x90, 0x01, 0x50, 0x98, 0x3c, 0xd2, 0x4f, 0xb0,
++			    0xd6, 0x96, 0x3f, 0x7d, 0x28, 0xe1, 0x7f, 0x72 },
++	}, {
++		.plaintext = "message digest",
++		.psize	= 14,
++		.digest	= { 0xf9, 0x6b, 0x69, 0x7d, 0x7c, 0xb7, 0x93, 0x8d,
++			    0x52, 0x5a, 0x2f, 0x31, 0xaa, 0xf1, 0x61, 0xd0 },
++	}, {
++		.plaintext = "abcdefghijklmnopqrstuvwxyz",
++		.psize	= 26,
++		.digest	= { 0xc3, 0xfc, 0xd3, 0xd7, 0x61, 0x92, 0xe4, 0x00,
++			    0x7d, 0xfb, 0x49, 0x6c, 0xca, 0x67, 0xe1, 0x3b },
++		.np	= 2,
++		.tap	= {13, 13}
++	}, {
++		.plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
++		.psize	= 62,
++		.digest	= { 0xd1, 0x74, 0xab, 0x98, 0xd2, 0x77, 0xd9, 0xf5,
++			    0xa5, 0x61, 0x1c, 0x2c, 0x9f, 0x41, 0x9d, 0x9f },
++	}, {
++		.plaintext = "12345678901234567890123456789012345678901234567890123456789012"
++			     "345678901234567890",
++		.psize	= 80,
++		.digest	= { 0x57, 0xed, 0xf4, 0xa2, 0x2b, 0xe3, 0xc9, 0x55,
++			    0xac, 0x49, 0xda, 0x2e, 0x21, 0x07, 0xb6, 0x7a },
++	}
+ };
+ 
+-
+-#endif	/* CONFIG_CRYPTO_HMAC */
+-
+ /*
+  * SHA1 test vectors  from from FIPS PUB 180-1
+  */
+ #define SHA1_TEST_VECTORS	2
+ 
+-struct sha1_testvec {
+-	char plaintext[128];
+-	char digest[SHA1_DIGEST_SIZE];
+-} sha1_tv_template[] = {
+-	{ "abc",
+-	  { 0xA9, 0x99, 0x3E, 0x36, 0x47, 0x06, 0x81, 0x6A, 0xBA, 0x3E, 
+-	    0x25, 0x71, 0x78, 0x50, 0xC2, 0x6C ,0x9C, 0xD0, 0xD8, 0x9D }
+-	},
+-	        	
+-	{ "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
+-
+-	  { 0x84, 0x98, 0x3E, 0x44, 0x1C, 0x3B, 0xD2, 0x6E ,0xBA, 0xAE,
+-	    0x4A, 0xA1, 0xF9, 0x51, 0x29, 0xE5, 0xE5, 0x46, 0x70, 0xF1 }
++struct hash_testvec sha1_tv_template[] = {
++	{ 
++		.plaintext = "abc",
++		.psize	= 3,
++		.digest	= { 0xa9, 0x99, 0x3e, 0x36, 0x47, 0x06, 0x81, 0x6a, 0xba, 0x3e,
++			    0x25, 0x71, 0x78, 0x50, 0xc2, 0x6c, 0x9c, 0xd0, 0xd8, 0x9d },
++	}, {
++		.plaintext = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
++		.psize	= 56,
++		.digest	= { 0x84, 0x98, 0x3e, 0x44, 0x1c, 0x3b, 0xd2, 0x6e, 0xba, 0xae,
++			    0x4a, 0xa1, 0xf9, 0x51, 0x29, 0xe5, 0xe5, 0x46, 0x70, 0xf1 },
++		.np	= 2,
++		.tap	= { 28, 28 }
+ 	}
+ };
+ 
+@@ -573,22 +173,23 @@ struct sha1_testvec {
+  */
+ #define SHA256_TEST_VECTORS	2
+ 
+-struct sha256_testvec {
+-	char plaintext[128];
+-	char digest[SHA256_DIGEST_SIZE];
+-} sha256_tv_template[] = {
+-	{ "abc",
+-	  { 0xba, 0x78, 0x16, 0xbf, 0x8f, 0x01, 0xcf, 0xea,
+-	    0x41, 0x41, 0x40, 0xde, 0x5d, 0xae, 0x22, 0x23,
+-	    0xb0, 0x03, 0x61, 0xa3, 0x96, 0x17, 0x7a, 0x9c,
+-	    0xb4, 0x10, 0xff, 0x61, 0xf2, 0x00, 0x15, 0xad }
+-	},
+-	        	
+-	{ "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
+-	  { 0x24, 0x8d, 0x6a, 0x61, 0xd2, 0x06, 0x38, 0xb8,
+-	    0xe5, 0xc0, 0x26, 0x93, 0x0c, 0x3e, 0x60, 0x39,
+-	    0xa3, 0x3c, 0xe4, 0x59, 0x64, 0xff, 0x21, 0x67,
+-	    0xf6, 0xec, 0xed, 0xd4, 0x19, 0xdb, 0x06, 0xc1 }
++struct hash_testvec sha256_tv_template[] = {	
++	{ 
++		.plaintext = "abc",
++		.psize	= 3,
++		.digest	= { 0xba, 0x78, 0x16, 0xbf, 0x8f, 0x01, 0xcf, 0xea,
++			    0x41, 0x41, 0x40, 0xde, 0x5d, 0xae, 0x22, 0x23,
++			    0xb0, 0x03, 0x61, 0xa3, 0x96, 0x17, 0x7a, 0x9c,
++			    0xb4, 0x10, 0xff, 0x61, 0xf2, 0x00, 0x15, 0xad },
++	}, {
++		.plaintext = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
++		.psize	= 56,
++		.digest	= { 0x24, 0x8d, 0x6a, 0x61, 0xd2, 0x06, 0x38, 0xb8,
++			    0xe5, 0xc0, 0x26, 0x93, 0x0c, 0x3e, 0x60, 0x39,
++			    0xa3, 0x3c, 0xe4, 0x59, 0x64, 0xff, 0x21, 0x67,
++			    0xf6, 0xec, 0xed, 0xd4, 0x19, 0xdb, 0x06, 0xc1 },
++		.np	= 2,
++		.tap	= { 28, 28 }
+ 	},
+ };
+ 
+@@ -597,47 +198,47 @@ struct sha256_testvec {
+  */
+ #define SHA384_TEST_VECTORS	4
+ 
+-struct sha384_testvec {
+-	char plaintext[128];
+-	char digest[SHA384_DIGEST_SIZE];
+-} sha384_tv_template[] = {
+-
+-	{ "abc",
+-	  { 0xcb, 0x00, 0x75, 0x3f, 0x45, 0xa3, 0x5e, 0x8b,
+-	    0xb5, 0xa0, 0x3d, 0x69, 0x9a, 0xc6, 0x50, 0x07,
+-	    0x27, 0x2c, 0x32, 0xab, 0x0e, 0xde, 0xd1, 0x63,
+-	    0x1a, 0x8b, 0x60, 0x5a, 0x43, 0xff, 0x5b, 0xed,
+-	    0x80, 0x86, 0x07, 0x2b, 0xa1, 0xe7, 0xcc, 0x23,
+-	    0x58, 0xba, 0xec, 0xa1, 0x34, 0xc8, 0x25, 0xa7 }
+-	},
+-	
+-	{ "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
+-	  { 0x33, 0x91, 0xfd, 0xdd, 0xfc, 0x8d, 0xc7, 0x39,
+-	    0x37, 0x07, 0xa6, 0x5b, 0x1b, 0x47, 0x09, 0x39,
+-	    0x7c, 0xf8, 0xb1, 0xd1, 0x62, 0xaf, 0x05, 0xab,
+-	    0xfe, 0x8f, 0x45, 0x0d, 0xe5, 0xf3, 0x6b, 0xc6,
+-	    0xb0, 0x45, 0x5a, 0x85, 0x20, 0xbc, 0x4e, 0x6f,
+-	    0x5f, 0xe9, 0x5b, 0x1f, 0xe3, 0xc8, 0x45, 0x2b  }
+-	},
+-	
+-	{ "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"
+-	  "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu",
+-	  { 0x09, 0x33, 0x0c, 0x33, 0xf7, 0x11, 0x47, 0xe8,
+-	    0x3d, 0x19, 0x2f, 0xc7, 0x82, 0xcd, 0x1b, 0x47,
+-	    0x53, 0x11, 0x1b, 0x17, 0x3b, 0x3b, 0x05, 0xd2,
+-	    0x2f, 0xa0, 0x80, 0x86, 0xe3, 0xb0, 0xf7, 0x12,
+-	    0xfc, 0xc7, 0xc7, 0x1a, 0x55, 0x7e, 0x2d, 0xb9,
+-	    0x66, 0xc3, 0xe9, 0xfa, 0x91, 0x74, 0x60, 0x39  }
+-	},
+-	
+-	{ "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcd"
+-	  "efghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz",
+-	  { 0x3d, 0x20, 0x89, 0x73, 0xab, 0x35, 0x08, 0xdb,
+-	    0xbd, 0x7e, 0x2c, 0x28, 0x62, 0xba, 0x29, 0x0a,
+-	    0xd3, 0x01, 0x0e, 0x49, 0x78, 0xc1, 0x98, 0xdc,
+-	    0x4d, 0x8f, 0xd0, 0x14, 0xe5, 0x82, 0x82, 0x3a,
+-	    0x89, 0xe1, 0x6f, 0x9b, 0x2a, 0x7b, 0xbc, 0x1a,
+-	    0xc9, 0x38, 0xe2, 0xd1, 0x99, 0xe8, 0xbe, 0xa4 }
++struct hash_testvec sha384_tv_template[] = {
++	{ 
++		.plaintext= "abc",
++		.psize	= 3,
++		.digest	= { 0xcb, 0x00, 0x75, 0x3f, 0x45, 0xa3, 0x5e, 0x8b,
++			    0xb5, 0xa0, 0x3d, 0x69, 0x9a, 0xc6, 0x50, 0x07,
++			    0x27, 0x2c, 0x32, 0xab, 0x0e, 0xde, 0xd1, 0x63,
++			    0x1a, 0x8b, 0x60, 0x5a, 0x43, 0xff, 0x5b, 0xed,
++			    0x80, 0x86, 0x07, 0x2b, 0xa1, 0xe7, 0xcc, 0x23,
++			    0x58, 0xba, 0xec, 0xa1, 0x34, 0xc8, 0x25, 0xa7 },
++	}, {
++		.plaintext = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
++		.psize	= 56,
++		.digest	= { 0x33, 0x91, 0xfd, 0xdd, 0xfc, 0x8d, 0xc7, 0x39,
++			    0x37, 0x07, 0xa6, 0x5b, 0x1b, 0x47, 0x09, 0x39,
++			    0x7c, 0xf8, 0xb1, 0xd1, 0x62, 0xaf, 0x05, 0xab,
++			    0xfe, 0x8f, 0x45, 0x0d, 0xe5, 0xf3, 0x6b, 0xc6,
++			    0xb0, 0x45, 0x5a, 0x85, 0x20, 0xbc, 0x4e, 0x6f,
++			    0x5f, 0xe9, 0x5b, 0x1f, 0xe3, 0xc8, 0x45, 0x2b},
++	}, {
++		.plaintext = "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"
++ 			     "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu",
++		.psize	= 112,
++		.digest	= { 0x09, 0x33, 0x0c, 0x33, 0xf7, 0x11, 0x47, 0xe8,
++			    0x3d, 0x19, 0x2f, 0xc7, 0x82, 0xcd, 0x1b, 0x47,
++			    0x53, 0x11, 0x1b, 0x17, 0x3b, 0x3b, 0x05, 0xd2,
++			    0x2f, 0xa0, 0x80, 0x86, 0xe3, 0xb0, 0xf7, 0x12,
++			    0xfc, 0xc7, 0xc7, 0x1a, 0x55, 0x7e, 0x2d, 0xb9,
++			    0x66, 0xc3, 0xe9, 0xfa, 0x91, 0x74, 0x60, 0x39  },
++	}, {
++		.plaintext = "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcd"
++			     "efghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz",
++		.psize	= 104,
++		.digest	= { 0x3d, 0x20, 0x89, 0x73, 0xab, 0x35, 0x08, 0xdb,
++			    0xbd, 0x7e, 0x2c, 0x28, 0x62, 0xba, 0x29, 0x0a,
++			    0xd3, 0x01, 0x0e, 0x49, 0x78, 0xc1, 0x98, 0xdc,
++			    0x4d, 0x8f, 0xd0, 0x14, 0xe5, 0x82, 0x82, 0x3a,
++			    0x89, 0xe1, 0x6f, 0x9b, 0x2a, 0x7b, 0xbc, 0x1a,
++			    0xc9, 0x38, 0xe2, 0xd1, 0x99, 0xe8, 0xbe, 0xa4 },
++		.np	= 4,
++		.tap	= { 26, 26, 26, 26 }
+ 	},
+ };
+ 
+@@ -646,439 +247,616 @@ struct sha384_testvec {
+  */
+ #define SHA512_TEST_VECTORS	4
+ 
+-struct sha512_testvec {
+-	char plaintext[128];
+-	char digest[SHA512_DIGEST_SIZE];
+-} sha512_tv_template[] = {
+-
+-	{ "abc",
+-	  { 0xdd, 0xaf, 0x35, 0xa1, 0x93, 0x61, 0x7a, 0xba,
+-	    0xcc, 0x41, 0x73, 0x49, 0xae, 0x20, 0x41, 0x31,
+-	    0x12, 0xe6, 0xfa, 0x4e, 0x89, 0xa9, 0x7e, 0xa2,
+-	    0x0a, 0x9e, 0xee, 0xe6, 0x4b, 0x55, 0xd3, 0x9a,
+-	    0x21, 0x92, 0x99, 0x2a, 0x27, 0x4f, 0xc1, 0xa8,
+-	    0x36, 0xba, 0x3c, 0x23, 0xa3, 0xfe, 0xeb, 0xbd,
+-	    0x45, 0x4d, 0x44, 0x23, 0x64, 0x3c, 0xe8, 0x0e,
+-	    0x2a, 0x9a, 0xc9, 0x4f, 0xa5, 0x4c, 0xa4, 0x9f }
+-	},
+-	
+-	{ "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
+-	  { 0x20, 0x4a, 0x8f, 0xc6, 0xdd, 0xa8, 0x2f, 0x0a,
+-	    0x0c, 0xed, 0x7b, 0xeb, 0x8e, 0x08, 0xa4, 0x16,
+-	    0x57, 0xc1, 0x6e, 0xf4, 0x68, 0xb2, 0x28, 0xa8,
+-	    0x27, 0x9b, 0xe3, 0x31, 0xa7, 0x03, 0xc3, 0x35,
+-	    0x96, 0xfd, 0x15, 0xc1, 0x3b, 0x1b, 0x07, 0xf9,
+-	    0xaa, 0x1d, 0x3b, 0xea, 0x57, 0x78, 0x9c, 0xa0,
+-	    0x31, 0xad, 0x85, 0xc7, 0xa7, 0x1d, 0xd7, 0x03,
+-	    0x54, 0xec, 0x63, 0x12, 0x38, 0xca, 0x34, 0x45 }
+-	},
+-	
+-	{ "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"
+-	  "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu",
+-	  { 0x8e, 0x95, 0x9b, 0x75, 0xda, 0xe3, 0x13, 0xda,
+-	    0x8c, 0xf4, 0xf7, 0x28, 0x14, 0xfc, 0x14, 0x3f,
+-	    0x8f, 0x77, 0x79, 0xc6, 0xeb, 0x9f, 0x7f, 0xa1,
+-	    0x72, 0x99, 0xae, 0xad, 0xb6, 0x88, 0x90, 0x18,
+-	    0x50, 0x1d, 0x28, 0x9e, 0x49, 0x00, 0xf7, 0xe4,
+-	    0x33, 0x1b, 0x99, 0xde, 0xc4, 0xb5, 0x43, 0x3a,
+-	    0xc7, 0xd3, 0x29, 0xee, 0xb6, 0xdd, 0x26, 0x54,
+-	    0x5e, 0x96, 0xe5, 0x5b, 0x87, 0x4b, 0xe9, 0x09 }
+-	},
+-	
+-	{ "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcd"
+-	  "efghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz",
+-	  { 0x93, 0x0d, 0x0c, 0xef, 0xcb, 0x30, 0xff, 0x11,
+-	    0x33, 0xb6, 0x89, 0x81, 0x21, 0xf1, 0xcf, 0x3d,
+-	    0x27, 0x57, 0x8a, 0xfc, 0xaf, 0xe8, 0x67, 0x7c,
+-	    0x52, 0x57, 0xcf, 0x06, 0x99, 0x11, 0xf7, 0x5d,
+-	    0x8f, 0x58, 0x31, 0xb5, 0x6e, 0xbf, 0xda, 0x67,
+-	    0xb2, 0x78, 0xe6, 0x6d, 0xff, 0x8b, 0x84, 0xfe,
+-	    0x2b, 0x28, 0x70, 0xf7, 0x42, 0xa5, 0x80, 0xd8,
+-	    0xed, 0xb4, 0x19, 0x87, 0x23, 0x28, 0x50, 0xc9
+-	  }
++struct hash_testvec sha512_tv_template[] = {
++	{ 
++		.plaintext = "abc",
++		.psize	= 3,
++		.digest	= { 0xdd, 0xaf, 0x35, 0xa1, 0x93, 0x61, 0x7a, 0xba,
++			    0xcc, 0x41, 0x73, 0x49, 0xae, 0x20, 0x41, 0x31,
++			    0x12, 0xe6, 0xfa, 0x4e, 0x89, 0xa9, 0x7e, 0xa2,
++			    0x0a, 0x9e, 0xee, 0xe6, 0x4b, 0x55, 0xd3, 0x9a,
++			    0x21, 0x92, 0x99, 0x2a, 0x27, 0x4f, 0xc1, 0xa8,
++			    0x36, 0xba, 0x3c, 0x23, 0xa3, 0xfe, 0xeb, 0xbd,
++			    0x45, 0x4d, 0x44, 0x23, 0x64, 0x3c, 0xe8, 0x0e,
++			    0x2a, 0x9a, 0xc9, 0x4f, 0xa5, 0x4c, 0xa4, 0x9f },
++	}, {
++		.plaintext = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
++		.psize	= 56,
++		.digest	= { 0x20, 0x4a, 0x8f, 0xc6, 0xdd, 0xa8, 0x2f, 0x0a,
++			    0x0c, 0xed, 0x7b, 0xeb, 0x8e, 0x08, 0xa4, 0x16,
++			    0x57, 0xc1, 0x6e, 0xf4, 0x68, 0xb2, 0x28, 0xa8,
++			    0x27, 0x9b, 0xe3, 0x31, 0xa7, 0x03, 0xc3, 0x35,
++			    0x96, 0xfd, 0x15, 0xc1, 0x3b, 0x1b, 0x07, 0xf9,
++			    0xaa, 0x1d, 0x3b, 0xea, 0x57, 0x78, 0x9c, 0xa0,
++			    0x31, 0xad, 0x85, 0xc7, 0xa7, 0x1d, 0xd7, 0x03,
++			    0x54, 0xec, 0x63, 0x12, 0x38, 0xca, 0x34, 0x45 },
++	}, {
++		.plaintext = "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"
++			     "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu",
++		.psize	= 112,
++		.digest	= { 0x8e, 0x95, 0x9b, 0x75, 0xda, 0xe3, 0x13, 0xda,
++			    0x8c, 0xf4, 0xf7, 0x28, 0x14, 0xfc, 0x14, 0x3f,
++			    0x8f, 0x77, 0x79, 0xc6, 0xeb, 0x9f, 0x7f, 0xa1,
++			    0x72, 0x99, 0xae, 0xad, 0xb6, 0x88, 0x90, 0x18,
++			    0x50, 0x1d, 0x28, 0x9e, 0x49, 0x00, 0xf7, 0xe4,
++			    0x33, 0x1b, 0x99, 0xde, 0xc4, 0xb5, 0x43, 0x3a,
++			    0xc7, 0xd3, 0x29, 0xee, 0xb6, 0xdd, 0x26, 0x54,
++			    0x5e, 0x96, 0xe5, 0x5b, 0x87, 0x4b, 0xe9, 0x09 },
++	}, {
++		.plaintext = "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcd"
++			     "efghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz",
++		.psize	= 104,
++		.digest	= { 0x93, 0x0d, 0x0c, 0xef, 0xcb, 0x30, 0xff, 0x11,
++			    0x33, 0xb6, 0x89, 0x81, 0x21, 0xf1, 0xcf, 0x3d,
++			    0x27, 0x57, 0x8a, 0xfc, 0xaf, 0xe8, 0x67, 0x7c,
++			    0x52, 0x57, 0xcf, 0x06, 0x99, 0x11, 0xf7, 0x5d,
++			    0x8f, 0x58, 0x31, 0xb5, 0x6e, 0xbf, 0xda, 0x67,
++			    0xb2, 0x78, 0xe6, 0x6d, 0xff, 0x8b, 0x84, 0xfe,
++			    0x2b, 0x28, 0x70, 0xf7, 0x42, 0xa5, 0x80, 0xd8,
++			    0xed, 0xb4, 0x19, 0x87, 0x23, 0x28, 0x50, 0xc9 },
++		.np	= 4,
++		.tap	= { 26, 26, 26, 26 }
+ 	},
+ };
+ 
++#ifdef CONFIG_CRYPTO_HMAC
+ /*
+- * DES test vectors.
++ * HMAC-MD5 test vectors from RFC2202
++ * (These need to be fixed to not use strlen).
+  */
+-#define DES_ENC_TEST_VECTORS		5
+-#define DES_DEC_TEST_VECTORS		2
+-#define DES_CBC_ENC_TEST_VECTORS	4
+-#define DES_CBC_DEC_TEST_VECTORS	3
+-#define DES3_EDE_ENC_TEST_VECTORS	3
+-#define DES3_EDE_DEC_TEST_VECTORS	3
+-
+-struct des_tv {
+-	unsigned int len;
+-	int fail;
+-	char key[24];
+-	char iv[8];
+-	char plaintext[128];
+-	char result[128];
+-};
+-
+-struct des_tv des_enc_tv_template[] = {
+-
+-	/* From Applied Cryptography */
+-	{
+-		8, 0,
+-		
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
+-		{ 0 },
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xe7 },
+-		{ 0xc9, 0x57, 0x44, 0x25, 0x6a, 0x5e, 0xd3, 0x1d }
+-	},
+-	
+-	/* Same key, different plaintext block */
+-	{
+-		8, 0,
+-		
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
+-		{ 0 },
+-		{ 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99 },
+-		{ 0xf7, 0x9c, 0x89, 0x2a, 0x33, 0x8f, 0x4a, 0x8b }
+-	},
+-	
+-	/* Sbox test from NBS */
+-	{
+-		8, 0,
+-		
+-		{ 0x7C, 0xA1, 0x10, 0x45, 0x4A, 0x1A, 0x6E, 0x57 },
+-		{ 0 },
+-		{ 0x01, 0xA1, 0xD6, 0xD0, 0x39, 0x77, 0x67, 0x42 },
+-		{ 0x69, 0x0F, 0x5B, 0x0D, 0x9A, 0x26, 0x93, 0x9B }
+-	},
+-	
+-	/* Three blocks */
+-	{
+-		24, 0,
+-		
+-		
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
+-		
+-		{ 0 },
+-		
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xe7,
+-		  0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99,
+-		  0xca, 0xfe, 0xba, 0xbe, 0xfe, 0xed, 0xbe, 0xef },
+-
+-		{ 0xc9, 0x57, 0x44, 0x25, 0x6a, 0x5e, 0xd3, 0x1d,
+-		  0xf7, 0x9c, 0x89, 0x2a, 0x33, 0x8f, 0x4a, 0x8b,
+-		  0xb4, 0x99, 0x26, 0xf7, 0x1f, 0xe1, 0xd4, 0x90 },		  
+-	},
+-	
+-	/* Weak key */
+-	{
+-		8, 1,
+-		
+-		{ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 },
+-		{ 0 },
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xe7 },
+-		{ 0xc9, 0x57, 0x44, 0x25, 0x6a, 0x5e, 0xd3, 0x1d }
+-	},
+-	
+-	/* Two blocks -- for testing encryption across pages */
+-	{
+-		16, 0,
+-		
+-		
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
+-		
+-		{ 0 },
+-		
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xe7,
+-		  0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99 },
+-
+-		{ 0xc9, 0x57, 0x44, 0x25, 0x6a, 0x5e, 0xd3, 0x1d,
+-		  0xf7, 0x9c, 0x89, 0x2a, 0x33, 0x8f, 0x4a, 0x8b }
+-	},
++#define HMAC_MD5_TEST_VECTORS	7
+ 
+-	/* Two blocks -- for testing decryption across pages */
+-	{
+-		16, 0,
+-		
+-		
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
+-		
+-		{ 0 },
+-		
+-		{ 0xc9, 0x57, 0x44, 0x25, 0x6a, 0x5e, 0xd3, 0x1d,
+-		  0xf7, 0x9c, 0x89, 0x2a, 0x33, 0x8f, 0x4a, 0x8b },
+-		  
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xe7,
+-		  0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99 },
+-	},
+-	
+-	/* Four blocks -- for testing encryption with chunking */
++struct hmac_testvec hmac_md5_tv_template[] =
++{	
+ 	{
+-		24, 0,
+-		
+-		
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
+-		
+-		{ 0 },
+-		
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xe7,
+-		  0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99,
+-		  0xca, 0xfe, 0xba, 0xbe, 0xfe, 0xed, 0xbe, 0xef,
+-		  0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99 },
+-
+-		{ 0xc9, 0x57, 0x44, 0x25, 0x6a, 0x5e, 0xd3, 0x1d,
+-		  0xf7, 0x9c, 0x89, 0x2a, 0x33, 0x8f, 0x4a, 0x8b,
+-		  0xb4, 0x99, 0x26, 0xf7, 0x1f, 0xe1, 0xd4, 0x90,
+-		  0xf7, 0x9c, 0x89, 0x2a, 0x33, 0x8f, 0x4a, 0x8b },
++		.key	= { [0 ... 15] =  0x0b },
++		.ksize	= 16,
++		.plaintext = "Hi There",
++		.psize	= 8,
++		.digest	= { 0x92, 0x94, 0x72, 0x7a, 0x36, 0x38, 0xbb, 0x1c,
++			    0x13, 0xf4, 0x8e, 0xf8, 0x15, 0x8b, 0xfc, 0x9d },
++	}, {
++		.key	= { 'J', 'e', 'f', 'e' },
++		.ksize	= 4,
++		.plaintext = "what do ya want for nothing?",
++		.psize	= 28,
++		.digest	= { 0x75, 0x0c, 0x78, 0x3e, 0x6a, 0xb0, 0xb5, 0x03,
++			    0xea, 0xa8, 0x6e, 0x31, 0x0a, 0x5d, 0xb7, 0x38 },
++		.np	= 2,
++		.tap	= {14, 14}
++	}, {
++		.key	= { [0 ... 15] = 0xaa },
++		.ksize	= 16,
++		.plaintext = { [0 ... 49] =  0xdd },
++		.psize	= 50,
++		.digest	= { 0x56, 0xbe, 0x34, 0x52, 0x1d, 0x14, 0x4c, 0x88,
++			    0xdb, 0xb8, 0xc7, 0x33, 0xf0, 0xe8, 0xb3, 0xf6 },
++	}, {
++		.key	= { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
++			    0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10,
++			    0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, },
++		.ksize	= 25,
++		.plaintext = { [0 ... 49] =  0xcd },
++		.psize	= 50,
++		.digest	= { 0x69, 0x7e, 0xaf, 0x0a, 0xca, 0x3a, 0x3a, 0xea,
++			    0x3a, 0x75, 0x16, 0x47, 0x46, 0xff, 0xaa, 0x79 },
++	}, {
++		.key	= { [0 ... 15] = 0x0c },
++		.ksize	= 16,
++		.plaintext = "Test With Truncation",
++		.psize	= 20,
++		.digest	= { 0x56, 0x46, 0x1e, 0xf2, 0x34, 0x2e, 0xdc, 0x00,
++			    0xf9, 0xba, 0xb9, 0x95, 0x69, 0x0e, 0xfd, 0x4c },
++	}, {
++		.key	= { [0 ... 79] =  0xaa },
++		.ksize	= 80,
++		.plaintext = "Test Using Larger Than Block-Size Key - Hash Key First",
++		.psize	= 54,
++		.digest	= { 0x6b, 0x1a, 0xb7, 0xfe, 0x4b, 0xd7, 0xbf, 0x8f,
++			    0x0b, 0x62, 0xe6, 0xce, 0x61, 0xb9, 0xd0, 0xcd },
++	}, {
++		.key	= { [0 ... 79] =  0xaa },
++		.ksize	= 80,
++		.plaintext = "Test Using Larger Than Block-Size Key and Larger Than One "
++			     "Block-Size Data",
++		.psize	= 73,
++		.digest	= { 0x6f, 0x63, 0x0f, 0xad, 0x67, 0xcd, 0xa0, 0xee,
++			    0x1f, 0xb1, 0xf5, 0x62, 0xdb, 0x3a, 0xa5, 0x3e },
+ 	},
+-	
+ };
+ 
+-struct des_tv des_dec_tv_template[] = {
+-
+-	/* From Applied Cryptography */
+-	{
+-		8, 0,
+-		
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
+-		{ 0 },
+-		{ 0xc9, 0x57, 0x44, 0x25, 0x6a, 0x5e, 0xd3, 0x1d },
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xe7 },
+-	},
+-	
+-	/* Sbox test from NBS */
+-	{
+-		8, 0,
++/*
++ * HMAC-SHA1 test vectors from RFC2202
++ */
++#define HMAC_SHA1_TEST_VECTORS	7
+ 
+-		{ 0x7C, 0xA1, 0x10, 0x45, 0x4A, 0x1A, 0x6E, 0x57 },
+-		{ 0 },
+-		{ 0x69, 0x0F, 0x5B, 0x0D, 0x9A, 0x26, 0x93, 0x9B },
+-		{ 0x01, 0xA1, 0xD6, 0xD0, 0x39, 0x77, 0x67, 0x42 }
+-	},
+-	
+-	/* Two blocks, for chunking test */
++struct hmac_testvec hmac_sha1_tv_template[] = {	
+ 	{
+-		16, 0,
+-		
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
+-		{ 0 },
+-		
+-		{ 0xc9, 0x57, 0x44, 0x25, 0x6a, 0x5e, 0xd3, 0x1d,
+-		  0x69, 0x0F, 0x5B, 0x0D, 0x9A, 0x26, 0x93, 0x9B },
+-		  
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xe7,
+-		  0xa3, 0x99, 0x7b, 0xca, 0xaf, 0x69, 0xa0, 0xf5 }
++		.key	= { [0 ... 19] = 0x0b },
++		.ksize	= 20,
++		.plaintext = "Hi There",
++		.psize	= 8,
++		.digest	= { 0xb6, 0x17, 0x31, 0x86, 0x55, 0x05, 0x72, 0x64,
++			    0xe2, 0x8b, 0xc0, 0xb6, 0xfb, 0x37, 0x8c, 0x8e, 0xf1,
++			    0x46, 0xbe },
++	}, {
++		.key	= { 'J', 'e', 'f', 'e' },		
++		.ksize	= 4,
++		.plaintext = "what do ya want for nothing?",
++		.psize	= 28,
++		.digest	= { 0xef, 0xfc, 0xdf, 0x6a, 0xe5, 0xeb, 0x2f, 0xa2, 0xd2, 0x74, 
++			    0x16, 0xd5, 0xf1, 0x84, 0xdf, 0x9c, 0x25, 0x9a, 0x7c, 0x79 },
++		.np	= 2,
++		.tap	= { 14, 14 }
++	}, {
++		.key	= { [0 ... 19] = 0xaa },
++		.ksize	= 20,
++		.plaintext = { [0 ... 49] = 0xdd },
++		.psize	= 50,
++		.digest	= { 0x12, 0x5d, 0x73, 0x42, 0xb9, 0xac, 0x11, 0xcd, 0x91, 0xa3, 
++			    0x9a, 0xf4, 0x8a, 0xa1, 0x7b, 0x4f, 0x63, 0xf1, 0x75, 0xd3 },
++	}, {
++		.key	= { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
++			    0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 
++			    0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19 },
++		.ksize	= 25,
++		.plaintext = { [0 ... 49] = 0xcd },
++		.psize	= 50,
++		.digest	= { 0x4c, 0x90, 0x07, 0xf4, 0x02, 0x62, 0x50, 0xc6, 0xbc, 0x84, 
++			    0x14, 0xf9, 0xbf, 0x50, 0xc8, 0x6c, 0x2d, 0x72, 0x35, 0xda },
++	}, {
++		.key	= { [0 ... 19] = 0x0c },
++		.ksize	= 20,
++		.plaintext = "Test With Truncation",
++		.psize	= 20,
++		.digest	= { 0x4c, 0x1a, 0x03, 0x42, 0x4b, 0x55, 0xe0, 0x7f, 0xe7, 0xf2, 
++			    0x7b, 0xe1, 0xd5, 0x8b, 0xb9, 0x32, 0x4a, 0x9a, 0x5a, 0x04 },
++	}, {
++		.key	= { [0 ... 79] = 0xaa },
++		.ksize	= 80,
++		.plaintext = "Test Using Larger Than Block-Size Key - Hash Key First",
++		.psize	= 54,
++		.digest	= { 0xaa, 0x4a, 0xe5, 0xe1, 0x52, 0x72, 0xd0, 0x0e, 0x95, 0x70, 
++			    0x56, 0x37, 0xce, 0x8a, 0x3b, 0x55, 0xed, 0x40, 0x21, 0x12 },
++	}, {
++		.key	= { [0 ... 79] = 0xaa },
++		.ksize	= 80,
++		.plaintext = "Test Using Larger Than Block-Size Key and Larger Than One "
++			     "Block-Size Data",
++		.psize	= 73,
++		.digest	= { 0xe8, 0xe9, 0x9d, 0x0f, 0x45, 0x23, 0x7d, 0x78, 0x6d, 0x6b, 
++			    0xba, 0xa7, 0x96, 0x5c, 0x78, 0x08, 0xbb, 0xff, 0x1a, 0x91 },
+ 	},
+-
+ };
+ 
+-struct des_tv des_cbc_enc_tv_template[] = {
+-	/* From OpenSSL */
+-	{
+-		24, 0,
+-		
+-		{0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef},
+-		{0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10},
+-		
+-		{ 0x37, 0x36, 0x35, 0x34, 0x33, 0x32, 0x31, 0x20, 
+-		  0x4E, 0x6F, 0x77, 0x20, 0x69, 0x73, 0x20, 0x74, 
+-		  0x68, 0x65, 0x20, 0x74, 0x69, 0x6D, 0x65, 0x20, 
+-		  0x66, 0x6F, 0x72, 0x20, 0x00, 0x31, 0x00, 0x00 },
+-		  
+-		{ 0xcc, 0xd1, 0x73, 0xff, 0xab, 0x20, 0x39, 0xf4, 
+-		  0xac, 0xd8, 0xae, 0xfd, 0xdf, 0xd8, 0xa1, 0xeb, 
+-		  0x46, 0x8e, 0x91, 0x15, 0x78, 0x88, 0xba, 0x68, 
+-		  0x1d, 0x26, 0x93, 0x97, 0xf7, 0xfe, 0x62, 0xb4 }
+-	},
++/*
++ * HMAC-SHA256 test vectors from
++ * draft-ietf-ipsec-ciph-sha-256-01.txt
++ */
++#define HMAC_SHA256_TEST_VECTORS	10
+ 
+-	/* FIPS Pub 81 */
+-	{
+-		8, 0,
+-		
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
+-		{ 0x12, 0x34, 0x56, 0x78, 0x90, 0xab, 0xcd, 0xef },
+-		{ 0x4e, 0x6f, 0x77, 0x20, 0x69, 0x73, 0x20, 0x74 },
+-		{ 0xe5, 0xc7, 0xcd, 0xde, 0x87, 0x2b, 0xf2, 0x7c },
+-		
+-	},
+-	
++struct hmac_testvec hmac_sha256_tv_template[] = {
+ 	{
+-		8, 0,
+-		
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
+-		{ 0xe5, 0xc7, 0xcd, 0xde, 0x87, 0x2b, 0xf2, 0x7c },
+-		{ 0x68, 0x65, 0x20, 0x74, 0x69, 0x6d, 0x65, 0x20 },
+-		{ 0x43, 0xe9, 0x34, 0x00, 0x8c, 0x38, 0x9c, 0x0f },
+-	},
+-	
+-	{	
+-		8, 0,
+-		
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
+-		{ 0x43, 0xe9, 0x34, 0x00, 0x8c, 0x38, 0x9c, 0x0f },
+-		{ 0x66, 0x6f, 0x72, 0x20, 0x61, 0x6c, 0x6c, 0x20 },
+-		{ 0x68, 0x37, 0x88, 0x49, 0x9a, 0x7c, 0x05, 0xf6 },
+-	},
+-	
+-	/* Copy of openssl vector for chunk testing */
+-	
+-	/* From OpenSSL */
+-	{
+-		24, 0,
+-		
+-		{0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef},
+-		{0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10},
+-		
+-		{ 0x37, 0x36, 0x35, 0x34, 0x33, 0x32, 0x31, 0x20, 
+-		  0x4E, 0x6F, 0x77, 0x20, 0x69, 0x73, 0x20, 0x74, 
+-		  0x68, 0x65, 0x20, 0x74, 0x69, 0x6D, 0x65, 0x20, 
+-		  0x66, 0x6F, 0x72, 0x20, 0x00, 0x31, 0x00, 0x00 },
+-		  
+-		{ 0xcc, 0xd1, 0x73, 0xff, 0xab, 0x20, 0x39, 0xf4, 
+-		  0xac, 0xd8, 0xae, 0xfd, 0xdf, 0xd8, 0xa1, 0xeb, 
+-		  0x46, 0x8e, 0x91, 0x15, 0x78, 0x88, 0xba, 0x68, 
+-		  0x1d, 0x26, 0x93, 0x97, 0xf7, 0xfe, 0x62, 0xb4 }
++		.key	= { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
++			    0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10,
++			    0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
++			    0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20},
++		.ksize	= 32,
++		.plaintext = "abc",
++		.psize	= 3,
++		.digest	= { 0xa2, 0x1b, 0x1f, 0x5d, 0x4c, 0xf4, 0xf7, 0x3a,
++			    0x4d, 0xd9, 0x39, 0x75, 0x0f, 0x7a, 0x06, 0x6a,
++			    0x7f, 0x98, 0xcc, 0x13, 0x1c, 0xb1, 0x6a, 0x66,
++			    0x92, 0x75, 0x90, 0x21, 0xcf, 0xab, 0x81, 0x81 },
++	}, {
++		.key	= { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
++			    0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10,
++			    0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
++			    0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20 },
++		.ksize	= 32,
++		.plaintext = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
++		.psize	= 56,
++		.digest	= { 0x10, 0x4f, 0xdc, 0x12, 0x57, 0x32, 0x8f, 0x08,
++			    0x18, 0x4b, 0xa7, 0x31, 0x31, 0xc5, 0x3c, 0xae,
++			    0xe6, 0x98, 0xe3, 0x61, 0x19, 0x42, 0x11, 0x49,
++			    0xea, 0x8c, 0x71, 0x24, 0x56, 0x69, 0x7d, 0x30 },
++	}, {
++		.key	= { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
++			    0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10,
++			    0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
++			    0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20 },
++		.ksize	= 32,
++		.plaintext = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
++			     "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
++		.psize	= 112,
++		.digest	= { 0x47, 0x03, 0x05, 0xfc, 0x7e, 0x40, 0xfe, 0x34,
++			    0xd3, 0xee, 0xb3, 0xe7, 0x73, 0xd9, 0x5a, 0xab,
++			    0x73, 0xac, 0xf0, 0xfd, 0x06, 0x04, 0x47, 0xa5,
++			    0xeb, 0x45, 0x95, 0xbf, 0x33, 0xa9, 0xd1, 0xa3 },
++	}, {
++		.key	= { [0 ... 31] = 0x0b },
++		.ksize	= 32,
++		.plaintext = "Hi There",
++		.psize	= 8,
++		.digest	= { 0x19, 0x8a, 0x60, 0x7e, 0xb4, 0x4b, 0xfb, 0xc6,
++			    0x99, 0x03, 0xa0, 0xf1, 0xcf, 0x2b, 0xbd, 0xc5,
++			    0xba, 0x0a, 0xa3, 0xf3, 0xd9, 0xae, 0x3c, 0x1c,
++			    0x7a, 0x3b, 0x16, 0x96, 0xa0, 0xb6, 0x8c, 0xf7 },
++	}, {
++		.key	= "Jefe",
++		.ksize	= 4,
++		.plaintext = "what do ya want for nothing?",
++		.psize	= 28,
++		.digest	= { 0x5b, 0xdc, 0xc1, 0x46, 0xbf, 0x60, 0x75, 0x4e,
++			    0x6a, 0x04, 0x24, 0x26, 0x08, 0x95, 0x75, 0xc7,
++			    0x5a, 0x00, 0x3f, 0x08, 0x9d, 0x27, 0x39, 0x83,
++			    0x9d, 0xec, 0x58, 0xb9, 0x64, 0xec, 0x38, 0x43 },
++		.np	= 2,
++		.tap	= { 14, 14 }
++	}, {
++		.key	= { [0 ... 31] = 0xaa },
++		.ksize	= 32,
++		.plaintext = { [0 ... 49] = 0xdd },
++		.psize	= 50,
++		.digest	= { 0xcd, 0xcb, 0x12, 0x20, 0xd1, 0xec, 0xcc, 0xea,
++			    0x91, 0xe5, 0x3a, 0xba, 0x30, 0x92, 0xf9, 0x62,
++			    0xe5, 0x49, 0xfe, 0x6c, 0xe9, 0xed, 0x7f, 0xdc,
++			    0x43, 0x19, 0x1f, 0xbd, 0xe4, 0x5c, 0x30, 0xb0 },
++	}, {
++		.key	= { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
++			    0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10,
++			    0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
++			    0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,
++			    0x21, 0x22, 0x23, 0x24, 0x25 },
++		.ksize	= 37,
++		.plaintext = { [0 ... 49] = 0xcd },
++		.psize	= 50,
++		.digest	= { 0xd4, 0x63, 0x3c, 0x17, 0xf6, 0xfb, 0x8d, 0x74,
++			    0x4c, 0x66, 0xde, 0xe0, 0xf8, 0xf0, 0x74, 0x55,
++			    0x6e, 0xc4, 0xaf, 0x55, 0xef, 0x07, 0x99, 0x85,
++			    0x41, 0x46, 0x8e, 0xb4, 0x9b, 0xd2, 0xe9, 0x17 },
++	}, {
++		.key	= { [0 ... 31] = 0x0c },
++		.ksize	= 32,
++		.plaintext = "Test With Truncation",
++		.psize	= 20,
++		.digest	= { 0x75, 0x46, 0xaf, 0x01, 0x84, 0x1f, 0xc0, 0x9b,
++			    0x1a, 0xb9, 0xc3, 0x74, 0x9a, 0x5f, 0x1c, 0x17,
++			    0xd4, 0xf5, 0x89, 0x66, 0x8a, 0x58, 0x7b, 0x27,
++			    0x00, 0xa9, 0xc9, 0x7c, 0x11, 0x93, 0xcf, 0x42 },
++	}, {
++		.key	= { [0 ... 79] = 0xaa },
++		.ksize	= 80,
++		.plaintext = "Test Using Larger Than Block-Size Key - Hash Key First",
++		.psize	= 54,
++		.digest	= { 0x69, 0x53, 0x02, 0x5e, 0xd9, 0x6f, 0x0c, 0x09,
++			    0xf8, 0x0a, 0x96, 0xf7, 0x8e, 0x65, 0x38, 0xdb,
++			    0xe2, 0xe7, 0xb8, 0x20, 0xe3, 0xdd, 0x97, 0x0e,
++			    0x7d, 0xdd, 0x39, 0x09, 0x1b, 0x32, 0x35, 0x2f },
++	}, {
++		.key	= { [0 ... 79] = 0xaa },
++		.ksize	= 80,
++		.plaintext = "Test Using Larger Than Block-Size Key and Larger Than "
++			     "One Block-Size Data",
++		.psize	= 73,
++		.digest	= { 0x63, 0x55, 0xac, 0x22, 0xe8, 0x90, 0xd0, 0xa3,
++			    0xc8, 0x48, 0x1a, 0x5c, 0xa4, 0x82, 0x5b, 0xc8,
++			    0x84, 0xd3, 0xe7, 0xa1, 0xff, 0x98, 0xa2, 0xfc,
++			    0x2a, 0xc7, 0xd8, 0xe0, 0x64, 0xc3, 0xb2, 0xe6 },
+ 	},
+-
+-	
+ };
+ 
+-struct des_tv des_cbc_dec_tv_template[] = {
++#endif	/* CONFIG_CRYPTO_HMAC */
+ 
+-	/* FIPS Pub 81 */
+-	{
+-		8, 0,
+-		
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
+-		{ 0x12, 0x34, 0x56, 0x78, 0x90, 0xab, 0xcd, 0xef },
+-		{ 0xe5, 0xc7, 0xcd, 0xde, 0x87, 0x2b, 0xf2, 0x7c },
+-		{ 0x4e, 0x6f, 0x77, 0x20, 0x69, 0x73, 0x20, 0x74 },
+-	},
+-	
+-	{
+-		8, 0,
+-		
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
+-		{ 0xe5, 0xc7, 0xcd, 0xde, 0x87, 0x2b, 0xf2, 0x7c },
+-		{ 0x43, 0xe9, 0x34, 0x00, 0x8c, 0x38, 0x9c, 0x0f },
+-		{ 0x68, 0x65, 0x20, 0x74, 0x69, 0x6d, 0x65, 0x20 }, 
+-	},
+-	
+-	{
+-		8, 0,
+-		
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
+-		{ 0x43, 0xe9, 0x34, 0x00, 0x8c, 0x38, 0x9c, 0x0f },
+-		{ 0x68, 0x37, 0x88, 0x49, 0x9a, 0x7c, 0x05, 0xf6 }, 
+-		{ 0x66, 0x6f, 0x72, 0x20, 0x61, 0x6c, 0x6c, 0x20 },
+-	},
+-	
+-	/* Copy of above, for chunk testing */
+-	
+-	{
+-		8, 0,
+-		
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
+-		{ 0x43, 0xe9, 0x34, 0x00, 0x8c, 0x38, 0x9c, 0x0f },
+-		{ 0x68, 0x37, 0x88, 0x49, 0x9a, 0x7c, 0x05, 0xf6 }, 
+-		{ 0x66, 0x6f, 0x72, 0x20, 0x61, 0x6c, 0x6c, 0x20 },
++/*
++ * DES test vectors.
++ */
++#define DES_ENC_TEST_VECTORS		10
++#define DES_DEC_TEST_VECTORS		4
++#define DES_CBC_ENC_TEST_VECTORS	5
++#define DES_CBC_DEC_TEST_VECTORS	4
++#define DES3_EDE_ENC_TEST_VECTORS	3
++#define DES3_EDE_DEC_TEST_VECTORS	3
++
++struct cipher_testvec des_enc_tv_template[] = {
++	{ /* From Applied Cryptography */
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
++		.klen	= 8,
++		.input	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xe7 },
++		.ilen	= 8,
++		.result	= { 0xc9, 0x57, 0x44, 0x25, 0x6a, 0x5e, 0xd3, 0x1d },
++		.rlen	= 8,
++	}, { /* Same key, different plaintext block */
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
++		.klen	= 8,
++		.input	= { 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99 },
++		.ilen	= 8,
++		.result	= { 0xf7, 0x9c, 0x89, 0x2a, 0x33, 0x8f, 0x4a, 0x8b },
++		.rlen	= 8,
++	}, { /* Sbox test from NBS */
++		.key	= { 0x7c, 0xa1, 0x10, 0x45, 0x4a, 0x1a, 0x6e, 0x57 },
++		.klen	= 8,
++		.input	= { 0x01, 0xa1, 0xd6, 0xd0, 0x39, 0x77, 0x67, 0x42 },
++		.ilen	= 8,
++		.result	= { 0x69, 0x0f, 0x5b, 0x0d, 0x9a, 0x26, 0x93, 0x9b },
++		.rlen	= 8,
++	}, { /* Three blocks */
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
++		.klen	= 8,
++		.input	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xe7,
++			    0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99,
++			    0xca, 0xfe, 0xba, 0xbe, 0xfe, 0xed, 0xbe, 0xef },
++		.ilen	= 24,
++		.result	= { 0xc9, 0x57, 0x44, 0x25, 0x6a, 0x5e, 0xd3, 0x1d,
++			    0xf7, 0x9c, 0x89, 0x2a, 0x33, 0x8f, 0x4a, 0x8b,
++			    0xb4, 0x99, 0x26, 0xf7, 0x1f, 0xe1, 0xd4, 0x90 },
++		.rlen	= 24,
++	}, { /* Weak key */
++		.fail	= 1,
++		.wk	= 1,
++		.key	= { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 },
++		.klen	= 8,
++		.input	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xe7 },
++		.ilen	= 8,
++		.result	= { 0xc9, 0x57, 0x44, 0x25, 0x6a, 0x5e, 0xd3, 0x1d },
++		.rlen	= 8,
++	}, { /* Two blocks -- for testing encryption across pages */
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
++		.klen	= 8,
++		.input	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xe7,
++			    0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99 },
++		.ilen	= 16,
++		.result	= { 0xc9, 0x57, 0x44, 0x25, 0x6a, 0x5e, 0xd3, 0x1d,
++			    0xf7, 0x9c, 0x89, 0x2a, 0x33, 0x8f, 0x4a, 0x8b },
++		.rlen	= 16,
++		.np	= 2,
++		.tap	= { 8, 8 }
++	}, { /* Four blocks -- for testing encryption with chunking */
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
++		.klen	= 8,
++		.input	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xe7,
++			    0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99,
++			    0xca, 0xfe, 0xba, 0xbe, 0xfe, 0xed, 0xbe, 0xef,
++			    0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99 },
++		.ilen	= 32,
++		.result	= { 0xc9, 0x57, 0x44, 0x25, 0x6a, 0x5e, 0xd3, 0x1d,
++			    0xf7, 0x9c, 0x89, 0x2a, 0x33, 0x8f, 0x4a, 0x8b,
++			    0xb4, 0x99, 0x26, 0xf7, 0x1f, 0xe1, 0xd4, 0x90,
++			    0xf7, 0x9c, 0x89, 0x2a, 0x33, 0x8f, 0x4a, 0x8b },
++		.rlen	= 32,
++		.np	= 3,
++		.tap	= { 14, 10, 8 } 
++	}, {
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
++		.klen	= 8,
++		.input	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xe7,
++			    0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99,
++			    0xca, 0xfe, 0xba, 0xbe, 0xfe, 0xed, 0xbe, 0xef },
++		.ilen	= 24,
++		.result	= { 0xc9, 0x57, 0x44, 0x25, 0x6a, 0x5e, 0xd3, 0x1d,
++			    0xf7, 0x9c, 0x89, 0x2a, 0x33, 0x8f, 0x4a, 0x8b,
++			    0xb4, 0x99, 0x26, 0xf7, 0x1f, 0xe1, 0xd4, 0x90 },
++		.rlen	= 24,
++		.np	= 4,
++		.tap	= { 2, 1, 3, 18 } 
++	}, {
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
++		.klen	= 8,
++		.input	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xe7,
++			    0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99 },
++		.ilen	= 16,
++		.result	= { 0xc9, 0x57, 0x44, 0x25, 0x6a, 0x5e, 0xd3, 0x1d,
++			    0xf7, 0x9c, 0x89, 0x2a, 0x33, 0x8f, 0x4a, 0x8b },
++		.rlen	= 16,
++		.np	= 5,
++		.tap	= { 2, 2, 2, 2, 8 } 
++	}, {
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
++		.klen	= 8,
++		.input	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xe7 },
++		.ilen	= 8,
++		.result	= { 0xc9, 0x57, 0x44, 0x25, 0x6a, 0x5e, 0xd3, 0x1d },
++		.rlen	= 8,
++		.np	= 8,
++		.tap	= { 1, 1, 1, 1, 1, 1, 1, 1 } 
++	},
++};
++
++struct cipher_testvec des_dec_tv_template[] = {
++	{ /* From Applied Cryptography */
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
++		.klen	= 8,
++		.input	= { 0xc9, 0x57, 0x44, 0x25, 0x6a, 0x5e, 0xd3, 0x1d },
++		.ilen	= 8,
++		.result	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xe7 },
++		.rlen	= 8,
++	}, { /* Sbox test from NBS */
++		.key	= { 0x7c, 0xa1, 0x10, 0x45, 0x4a, 0x1a, 0x6e, 0x57 },		
++		.klen	= 8,
++		.input	= { 0x69, 0x0f, 0x5b, 0x0d, 0x9a, 0x26, 0x93, 0x9b },
++		.ilen	= 8,
++		.result	= { 0x01, 0xa1, 0xd6, 0xd0, 0x39, 0x77, 0x67, 0x42 },
++		.rlen	= 8,
++	}, { /* Two blocks, for chunking test */
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
++		.klen	= 8,
++		.input	= { 0xc9, 0x57, 0x44, 0x25, 0x6a, 0x5e, 0xd3, 0x1d,
++			    0x69, 0x0f, 0x5b, 0x0d, 0x9a, 0x26, 0x93, 0x9b },
++		.ilen	= 16,
++		.result	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xe7,
++			    0xa3, 0x99, 0x7b, 0xca, 0xaf, 0x69, 0xa0, 0xf5 },
++		.rlen	= 16,
++		.np	= 2,
++		.tap	= { 8, 8 }
++	}, {
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
++		.klen	= 8,
++		.input	= { 0xc9, 0x57, 0x44, 0x25, 0x6a, 0x5e, 0xd3, 0x1d,
++			    0x69, 0x0f, 0x5b, 0x0d, 0x9a, 0x26, 0x93, 0x9b },
++		.ilen	= 16,
++		.result	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xe7,
++			    0xa3, 0x99, 0x7b, 0xca, 0xaf, 0x69, 0xa0, 0xf5 },
++		.rlen	= 16,
++		.np	= 3,
++		.tap	= { 3, 12, 1 }
++	},
++};
++
++struct cipher_testvec des_cbc_enc_tv_template[] = {
++	{ /* From OpenSSL */
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef},
++		.klen	= 8,
++		.iv	= { 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10},		
++		.input	= { 0x37, 0x36, 0x35, 0x34, 0x33, 0x32, 0x31, 0x20, 
++			    0x4e, 0x6f, 0x77, 0x20, 0x69, 0x73, 0x20, 0x74, 
++			    0x68, 0x65, 0x20, 0x74, 0x69, 0x6d, 0x65, 0x20 }, 
++		.ilen	= 24,
++		.result	= { 0xcc, 0xd1, 0x73, 0xff, 0xab, 0x20, 0x39, 0xf4, 
++			    0xac, 0xd8, 0xae, 0xfd, 0xdf, 0xd8, 0xa1, 0xeb, 
++			    0x46, 0x8e, 0x91, 0x15, 0x78, 0x88, 0xba, 0x68 }, 
++		.rlen	= 24,
++	}, { /* FIPS Pub 81 */
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
++		.klen	= 8,
++		.iv	= { 0x12, 0x34, 0x56, 0x78, 0x90, 0xab, 0xcd, 0xef },		
++		.input	= { 0x4e, 0x6f, 0x77, 0x20, 0x69, 0x73, 0x20, 0x74 },
++		.ilen	= 8,
++		.result	= { 0xe5, 0xc7, 0xcd, 0xde, 0x87, 0x2b, 0xf2, 0x7c },
++		.rlen	= 8,
++	}, {
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
++		.klen	= 8,
++		.iv	= { 0xe5, 0xc7, 0xcd, 0xde, 0x87, 0x2b, 0xf2, 0x7c },
++		.input	= { 0x68, 0x65, 0x20, 0x74, 0x69, 0x6d, 0x65, 0x20 },
++		.ilen	= 8,
++		.result	= { 0x43, 0xe9, 0x34, 0x00, 0x8c, 0x38, 0x9c, 0x0f },
++		.rlen	= 8,
++	}, {	
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
++		.klen	= 8,
++		.iv	= { 0x43, 0xe9, 0x34, 0x00, 0x8c, 0x38, 0x9c, 0x0f },
++		.input	= { 0x66, 0x6f, 0x72, 0x20, 0x61, 0x6c, 0x6c, 0x20 },
++		.ilen	= 8,
++		.result	= { 0x68, 0x37, 0x88, 0x49, 0x9a, 0x7c, 0x05, 0xf6 },
++		.rlen	= 8,
++	}, { /* Copy of openssl vector for chunk testing */	
++	     /* From OpenSSL */
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef},
++		.klen	= 8,
++		.iv	= { 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10},		
++		.input	= { 0x37, 0x36, 0x35, 0x34, 0x33, 0x32, 0x31, 0x20, 
++			    0x4e, 0x6f, 0x77, 0x20, 0x69, 0x73, 0x20, 0x74, 
++			    0x68, 0x65, 0x20, 0x74, 0x69, 0x6d, 0x65, 0x20 }, 
++		.ilen	= 24,
++		.result	= { 0xcc, 0xd1, 0x73, 0xff, 0xab, 0x20, 0x39, 0xf4, 
++			    0xac, 0xd8, 0xae, 0xfd, 0xdf, 0xd8, 0xa1, 0xeb, 
++			    0x46, 0x8e, 0x91, 0x15, 0x78, 0x88, 0xba, 0x68 }, 
++		.rlen	= 24,
++		.np	= 2,
++		.tap	= { 13, 11 }
++	},
++};
++
++struct cipher_testvec des_cbc_dec_tv_template[] = {
++	{ /* FIPS Pub 81 */
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
++		.klen	= 8,
++		.iv	= { 0x12, 0x34, 0x56, 0x78, 0x90, 0xab, 0xcd, 0xef },
++		.input	= { 0xe5, 0xc7, 0xcd, 0xde, 0x87, 0x2b, 0xf2, 0x7c },
++		.ilen	= 8,
++		.result	= { 0x4e, 0x6f, 0x77, 0x20, 0x69, 0x73, 0x20, 0x74 },
++		.rlen	= 8,
++	}, {
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
++		.klen	= 8,
++		.iv	= { 0xe5, 0xc7, 0xcd, 0xde, 0x87, 0x2b, 0xf2, 0x7c },		
++		.input	= { 0x43, 0xe9, 0x34, 0x00, 0x8c, 0x38, 0x9c, 0x0f },
++		.ilen	= 8,
++		.result	= { 0x68, 0x65, 0x20, 0x74, 0x69, 0x6d, 0x65, 0x20 }, 
++		.rlen	= 8,
++	}, {
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
++		.klen	= 8,
++		.iv	= { 0x43, 0xe9, 0x34, 0x00, 0x8c, 0x38, 0x9c, 0x0f },
++		.input	= { 0x68, 0x37, 0x88, 0x49, 0x9a, 0x7c, 0x05, 0xf6 }, 
++		.ilen	= 8,
++		.result	= { 0x66, 0x6f, 0x72, 0x20, 0x61, 0x6c, 0x6c, 0x20 },
++		.rlen	= 8,
++	}, { /* Copy of above, for chunk testing */	
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
++		.klen	= 8,
++		.iv	= { 0x43, 0xe9, 0x34, 0x00, 0x8c, 0x38, 0x9c, 0x0f },
++		.input	= { 0x68, 0x37, 0x88, 0x49, 0x9a, 0x7c, 0x05, 0xf6 }, 
++		.ilen	= 8,
++		.result	= { 0x66, 0x6f, 0x72, 0x20, 0x61, 0x6c, 0x6c, 0x20 },
++		.rlen	= 8,
++		.np	= 2,
++		.tap	= { 4, 4 }
+ 	},
+ };
+ 
+ /*
+  * We really need some more test vectors, especially for DES3 CBC.
+  */
+-struct des_tv des3_ede_enc_tv_template[] = {
+-
+-	/* These are from openssl */
+-	{
+-		8, 0,
+-		
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF,
+-		  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+-		  0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10},
+-		  
+-		{ 0 },
+-		
+-		{ 0x73, 0x6F, 0x6D, 0x65, 0x64, 0x61, 0x74, 0x61  },
+-		
+-		{ 0x18, 0xd7, 0x48, 0xe5, 0x63, 0x62, 0x05, 0x72 },
+-	},
+-	
+-	{
+-		8, 0,
+-		
+-		{ 0x03,0x52,0x02,0x07,0x67,0x20,0x82,0x17,
+-		  0x86,0x02,0x87,0x66,0x59,0x08,0x21,0x98,
+-		  0x64,0x05,0x6A,0xBD,0xFE,0xA9,0x34,0x57  },
+-		 
+-		{ 0 },
+-		
+-		{ 0x73,0x71,0x75,0x69,0x67,0x67,0x6C,0x65  },
+-		
+-		{ 0xc0,0x7d,0x2a,0x0f,0xa5,0x66,0xfa,0x30  }
+-	},
+-	
+-
+-	{
+-		8, 0,
+-		
+-		{ 0x10,0x46,0x10,0x34,0x89,0x98,0x80,0x20,
+-		  0x91,0x07,0xD0,0x15,0x89,0x19,0x01,0x01,
+-		  0x19,0x07,0x92,0x10,0x98,0x1A,0x01,0x01  },
+-		  
+-		{ 0 },
+-			  
+-		{ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00  },
+-		
+-		{ 0xe1,0xef,0x62,0xc3,0x32,0xfe,0x82,0x5b  }	
++struct cipher_testvec des3_ede_enc_tv_template[] = {
++	{ /* These are from openssl */
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
++			    0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
++			    0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10},
++		.klen	= 24,
++		.input	= { 0x73, 0x6f, 0x6d, 0x65, 0x64, 0x61, 0x74, 0x61 },
++		.ilen	= 8,
++		.result	= { 0x18, 0xd7, 0x48, 0xe5, 0x63, 0x62, 0x05, 0x72 },
++		.rlen	= 8,
++	}, {
++		.key	= { 0x03, 0x52, 0x02, 0x07, 0x67, 0x20, 0x82, 0x17,
++			    0x86, 0x02, 0x87, 0x66, 0x59, 0x08, 0x21, 0x98,
++			    0x64, 0x05, 0x6a, 0xbd, 0xfe, 0xa9, 0x34, 0x57 },
++		.klen	= 24,
++		.input	= { 0x73, 0x71, 0x75, 0x69, 0x67, 0x67, 0x6c, 0x65 },
++		.ilen	= 8,
++		.result	= { 0xc0, 0x7d, 0x2a, 0x0f, 0xa5, 0x66, 0xfa, 0x30 },
++		.rlen	= 8,
++	}, {
++		.key	= { 0x10, 0x46, 0x10, 0x34, 0x89, 0x98, 0x80, 0x20,
++			    0x91, 0x07, 0xd0, 0x15, 0x89, 0x19, 0x01, 0x01,
++			    0x19, 0x07, 0x92, 0x10, 0x98, 0x1a, 0x01, 0x01 },
++		.klen	= 24,
++		.input	= { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
++		.ilen	= 8,
++		.result	= { 0xe1, 0xef, 0x62, 0xc3, 0x32, 0xfe, 0x82, 0x5b },
++		.rlen	= 8,
+ 	},
+ };
+ 
+-struct des_tv des3_ede_dec_tv_template[] = {
+-
+-	/* These are from openssl */
+-	{
+-		8, 0,
+-		
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF,
+-		  0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
+-		  0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10},
+-		  
+-		{ 0 },
+-		
+-		
+-		{ 0x18, 0xd7, 0x48, 0xe5, 0x63, 0x62, 0x05, 0x72 },
+-		
+-		{ 0x73, 0x6F, 0x6D, 0x65, 0x64, 0x61, 0x74, 0x61  },
+-	},
+-	
+-	{
+-		8, 0,
+-		
+-		{ 0x03,0x52,0x02,0x07,0x67,0x20,0x82,0x17,
+-		  0x86,0x02,0x87,0x66,0x59,0x08,0x21,0x98,
+-		  0x64,0x05,0x6A,0xBD,0xFE,0xA9,0x34,0x57  },
+-		 
+-		{ 0 },
+-		
+-		{ 0xc0,0x7d,0x2a,0x0f,0xa5,0x66,0xfa,0x30  },
+-		
+-		{ 0x73,0x71,0x75,0x69,0x67,0x67,0x6C,0x65  },
+-		
+-	},
+-	
+-
+-	{
+-		8, 0,
+-		
+-		{ 0x10,0x46,0x10,0x34,0x89,0x98,0x80,0x20,
+-		  0x91,0x07,0xD0,0x15,0x89,0x19,0x01,0x01,
+-		  0x19,0x07,0x92,0x10,0x98,0x1A,0x01,0x01  },
+-		  
+-		{ 0 },
+-			  
+-		{ 0xe1,0xef,0x62,0xc3,0x32,0xfe,0x82,0x5b  },
+-		
+-		{ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00  },
++struct cipher_testvec des3_ede_dec_tv_template[] = {
++	{ /* These are from openssl */
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
++			    0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
++			    0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10},
++		.klen	= 24,
++		.input	= { 0x18, 0xd7, 0x48, 0xe5, 0x63, 0x62, 0x05, 0x72 },
++		.ilen	= 8,
++		.result	= { 0x73, 0x6f, 0x6d, 0x65, 0x64, 0x61, 0x74, 0x61 },
++		.rlen	= 8,
++	}, {
++		.key	= { 0x03, 0x52, 0x02, 0x07, 0x67, 0x20, 0x82, 0x17,
++			    0x86, 0x02, 0x87, 0x66, 0x59, 0x08, 0x21, 0x98,
++			    0x64, 0x05, 0x6a, 0xbd, 0xfe, 0xa9, 0x34, 0x57 },
++		.klen	= 24,
++		.input	= { 0xc0, 0x7d, 0x2a, 0x0f, 0xa5, 0x66, 0xfa, 0x30 },
++		.ilen	= 8,
++		.result	= { 0x73, 0x71, 0x75, 0x69, 0x67, 0x67, 0x6c, 0x65 },
++		.rlen	= 8,
++	}, {
++		.key	= { 0x10, 0x46, 0x10, 0x34, 0x89, 0x98, 0x80, 0x20,
++			    0x91, 0x07, 0xd0, 0x15, 0x89, 0x19, 0x01, 0x01,
++			    0x19, 0x07, 0x92, 0x10, 0x98, 0x1a, 0x01, 0x01 },
++		.klen	= 24,
++		.input	= { 0xe1, 0xef, 0x62, 0xc3, 0x32, 0xfe, 0x82, 0x5b },
++		.ilen	= 8,
++		.result	= { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
++		.rlen	= 8,
+ 	},
+ };
+ 
+@@ -1090,189 +868,151 @@ struct des_tv des3_ede_dec_tv_template[]
+ #define BF_CBC_ENC_TEST_VECTORS	1
+ #define BF_CBC_DEC_TEST_VECTORS	1
+ 
+-struct bf_tv {
+-	unsigned int keylen;
+-	unsigned int plen;
+-	unsigned int rlen;
+-	int fail;
+-	char key[56];
+-	char iv[8];
+-	char plaintext[32];
+-	char result[32];
+-};
+-
+-struct bf_tv bf_enc_tv_template[] = {
+-
+-	/* DES test vectors from OpenSSL */
+-	{
+-		8, 8, 8, 0,
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, },
+-		{ 0 },
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-		{ 0x4E, 0xF9, 0x97, 0x45, 0x61, 0x98, 0xDD, 0x78 },
+-	},
+-	
+-	{
+-		8, 8, 8, 0,
+-		{ 0x1F, 0x1F, 0x1F, 0x1F, 0x0E, 0x0E, 0x0E, 0x0E,  },
+-		{ 0 },
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF },
+-		{ 0xA7, 0x90, 0x79, 0x51, 0x08, 0xEA, 0x3C, 0xAE },
+-	},
+-	
+-	{
+-		8, 8, 8, 0,
+-		{ 0xF0, 0xE1, 0xD2, 0xC3, 0xB4, 0xA5, 0x96, 0x87, },
+-		{ 0 },
+-		{ 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10 },
+-		{ 0xE8, 0x7A, 0x24, 0x4E, 0x2C, 0xC8, 0x5E, 0x82 }
+-	},
+-	
+-	/* Vary the keylength... */
+-	
+-	{
+-		16, 8, 8, 0,
+-		{ 0xF0, 0xE1, 0xD2, 0xC3, 0xB4, 0xA5, 0x96, 0x87,
+-		  0x78, 0x69, 0x5A, 0x4B, 0x3C, 0x2D, 0x1E, 0x0F },
+-		{ 0 },
+-		{ 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10 },
+-		{ 0x93, 0x14, 0x28, 0x87, 0xEE, 0x3B, 0xE1, 0x5C }
+-	},
+-	
+-	{
+-		21, 8, 8, 0,
+-		{ 0xF0, 0xE1, 0xD2, 0xC3, 0xB4, 0xA5, 0x96, 0x87,
+-		  0x78, 0x69, 0x5A, 0x4B, 0x3C, 0x2D, 0x1E, 0x0F,
+-		  0x00, 0x11, 0x22, 0x33, 0x44 },
+-		{ 0 },
+-		{ 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10 },
+-		{ 0xE6, 0xF5, 0x1E, 0xD7, 0x9B, 0x9D, 0xB2, 0x1F }
+-	},
+-	
+-	/* Generated with bf488 */
+-	{
+-		56, 8, 8, 0,
+-		{ 0xF0, 0xE1, 0xD2, 0xC3, 0xB4, 0xA5, 0x96, 0x87,
+-		  0x78, 0x69, 0x5A, 0x4B, 0x3C, 0x2D, 0x1E, 0x0F,
+-		  0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
+-		  0x04, 0x68, 0x91, 0x04, 0xC2, 0xFD, 0x3B, 0x2F, 
+-		  0x58, 0x40, 0x23, 0x64, 0x1A, 0xBA, 0x61, 0x76, 
+-		  0x1F, 0x1F, 0x1F, 0x1F, 0x0E, 0x0E, 0x0E, 0x0E, 
+-		  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF },
+-		  { 0 },
+-		  { 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10 },
+-		  { 0xc0, 0x45, 0x04, 0x01, 0x2e, 0x4e, 0x1f, 0x53 }
+-	}
+-	
+-};
+-
+-struct bf_tv bf_dec_tv_template[] = {
+-
+-	/* DES test vectors from OpenSSL */
+-	{
+-		8, 8, 8, 0,
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, },
+-		{ 0 },
+-		{ 0x4E, 0xF9, 0x97, 0x45, 0x61, 0x98, 0xDD, 0x78 },
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }
+-	},
+-	
+-	{
+-		8, 8, 8, 0,
+-		{ 0x1F, 0x1F, 0x1F, 0x1F, 0x0E, 0x0E, 0x0E, 0x0E,  },
+-		{ 0 },
+-		{ 0xA7, 0x90, 0x79, 0x51, 0x08, 0xEA, 0x3C, 0xAE },
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF }
+-	},
+-	
+-	{
+-		8, 8, 8, 0,
+-		{ 0xF0, 0xE1, 0xD2, 0xC3, 0xB4, 0xA5, 0x96, 0x87, },
+-		{ 0 },
+-		{ 0xE8, 0x7A, 0x24, 0x4E, 0x2C, 0xC8, 0x5E, 0x82 },
+-		{ 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10 }
+-	},
+-	
+-	/* Vary the keylength... */
+-	
+-	{
+-		16, 8, 8, 0,
+-		{ 0xF0, 0xE1, 0xD2, 0xC3, 0xB4, 0xA5, 0x96, 0x87,
+-		  0x78, 0x69, 0x5A, 0x4B, 0x3C, 0x2D, 0x1E, 0x0F },
+-		{ 0 },
+-		{ 0x93, 0x14, 0x28, 0x87, 0xEE, 0x3B, 0xE1, 0x5C },
+-		{ 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10 }
+-	},
+-	
+-	{
+-		21, 8, 8, 0,
+-		{ 0xF0, 0xE1, 0xD2, 0xC3, 0xB4, 0xA5, 0x96, 0x87,
+-		  0x78, 0x69, 0x5A, 0x4B, 0x3C, 0x2D, 0x1E, 0x0F,
+-		  0x00, 0x11, 0x22, 0x33, 0x44 },
+-		{ 0 },
+-		{ 0xE6, 0xF5, 0x1E, 0xD7, 0x9B, 0x9D, 0xB2, 0x1F },
+-		{ 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10 }
+-	},
+-	
+-	/* Generated with bf488, using OpenSSL, Libgcrypt and Nettle */
+-	{
+-		56, 8, 8, 0,
+-		{ 0xF0, 0xE1, 0xD2, 0xC3, 0xB4, 0xA5, 0x96, 0x87,
+-		  0x78, 0x69, 0x5A, 0x4B, 0x3C, 0x2D, 0x1E, 0x0F,
+-		  0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
+-		  0x04, 0x68, 0x91, 0x04, 0xC2, 0xFD, 0x3B, 0x2F, 
+-		  0x58, 0x40, 0x23, 0x64, 0x1A, 0xBA, 0x61, 0x76, 
+-		  0x1F, 0x1F, 0x1F, 0x1F, 0x0E, 0x0E, 0x0E, 0x0E, 
+-		  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF },
+-		{ 0 },
+-		{ 0xc0, 0x45, 0x04, 0x01, 0x2e, 0x4e, 0x1f, 0x53 },
+-		{ 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10 }
+-	}
+-};
+-
+-struct bf_tv bf_cbc_enc_tv_template[] = {
+-
+-	/* From OpenSSL */
+-	{
+-		16, 32, 32, 0,
+-		
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF,
+-		  0xF0, 0xE1, 0xD2, 0xC3, 0xB4, 0xA5, 0x96, 0x87 },
+-		  
+-		{ 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10 },
+-		
+-		{ 0x37, 0x36, 0x35, 0x34, 0x33, 0x32, 0x31, 0x20,
+-		  0x4E, 0x6F, 0x77, 0x20, 0x69, 0x73, 0x20, 0x74,
+-		  0x68, 0x65, 0x20, 0x74, 0x69, 0x6D, 0x65, 0x20,
+-		  0x66, 0x6F, 0x72, 0x20, 0x00, 0x00, 0x00, 0x00 },
+-		  
+-		{ 0x6B, 0x77, 0xB4, 0xD6, 0x30, 0x06, 0xDE, 0xE6,
+-		  0x05, 0xB1, 0x56, 0xE2, 0x74, 0x03, 0x97, 0x93,
+-		  0x58, 0xDE, 0xB9, 0xE7, 0x15, 0x46, 0x16, 0xD9,
+-		  0x59, 0xF1, 0x65, 0x2B, 0xD5, 0xFF, 0x92, 0xCC }
+-	},
+-};
+-
+-struct bf_tv bf_cbc_dec_tv_template[] = {
+-
+-	/* From OpenSSL */
+-	{
+-		16, 32, 32, 0,
+-		
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF,
+-		  0xF0, 0xE1, 0xD2, 0xC3, 0xB4, 0xA5, 0x96, 0x87 },
+-		  
+-		{ 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10 },
+-		
+-		{ 0x6B, 0x77, 0xB4, 0xD6, 0x30, 0x06, 0xDE, 0xE6,
+-		  0x05, 0xB1, 0x56, 0xE2, 0x74, 0x03, 0x97, 0x93,
+-		  0x58, 0xDE, 0xB9, 0xE7, 0x15, 0x46, 0x16, 0xD9,
+-		  0x59, 0xF1, 0x65, 0x2B, 0xD5, 0xFF, 0x92, 0xCC },
+-		  
+-		{ 0x37, 0x36, 0x35, 0x34, 0x33, 0x32, 0x31, 0x20,
+-		  0x4E, 0x6F, 0x77, 0x20, 0x69, 0x73, 0x20, 0x74,
+-		  0x68, 0x65, 0x20, 0x74, 0x69, 0x6D, 0x65, 0x20,
+-		  0x66, 0x6F, 0x72, 0x20, 0x00, 0x00, 0x00, 0x00 }
++struct cipher_testvec bf_enc_tv_template[] = {
++	{ /* DES test vectors from OpenSSL */
++		.key	= { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, },
++		.klen	= 8,
++		.input	= { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
++		.ilen	= 8,
++		.result	= { 0x4e, 0xf9, 0x97, 0x45, 0x61, 0x98, 0xdd, 0x78 },
++		.rlen	= 8,
++	}, {
++		.key	= { 0x1f, 0x1f, 0x1f, 0x1f, 0x0e, 0x0e, 0x0e, 0x0e },
++		.klen	= 8,
++		.input	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
++		.ilen	= 8,
++		.result	= { 0xa7, 0x90, 0x79, 0x51, 0x08, 0xea, 0x3c, 0xae },
++		.rlen	= 8,
++	}, {
++		.key	= { 0xf0, 0xe1, 0xd2, 0xc3, 0xb4, 0xa5, 0x96, 0x87 },
++		.klen	= 8,
++		.input	= { 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10 },
++		.ilen	= 8,
++		.result	= { 0xe8, 0x7a, 0x24, 0x4e, 0x2c, 0xc8, 0x5e, 0x82 },
++		.rlen	= 8,
++	}, { /* Vary the keylength... */	
++		.key	= { 0xf0, 0xe1, 0xd2, 0xc3, 0xb4, 0xa5, 0x96, 0x87,
++			    0x78, 0x69, 0x5a, 0x4b, 0x3c, 0x2d, 0x1e, 0x0f },
++		.klen	= 16,
++		.input	= { 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10 },
++		.ilen	= 8,
++		.result	= { 0x93, 0x14, 0x28, 0x87, 0xee, 0x3b, 0xe1, 0x5c },
++		.rlen	= 8,
++	}, {
++		.key	= { 0xf0, 0xe1, 0xd2, 0xc3, 0xb4, 0xa5, 0x96, 0x87,
++			    0x78, 0x69, 0x5a, 0x4b, 0x3c, 0x2d, 0x1e, 0x0f,
++			    0x00, 0x11, 0x22, 0x33, 0x44 },
++		.klen	= 21,
++		.input	= { 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10 },
++		.ilen	= 8,
++		.result	= { 0xe6, 0xf5, 0x1e, 0xd7, 0x9b, 0x9d, 0xb2, 0x1f },
++		.rlen	= 8,
++	}, { /* Generated with bf488 */
++		.key	= { 0xf0, 0xe1, 0xd2, 0xc3, 0xb4, 0xa5, 0x96, 0x87,
++			    0x78, 0x69, 0x5a, 0x4b, 0x3c, 0x2d, 0x1e, 0x0f,
++			    0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
++			    0x04, 0x68, 0x91, 0x04, 0xc2, 0xfd, 0x3b, 0x2f, 
++			    0x58, 0x40, 0x23, 0x64, 0x1a, 0xba, 0x61, 0x76, 
++			    0x1f, 0x1f, 0x1f, 0x1f, 0x0e, 0x0e, 0x0e, 0x0e, 
++			    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
++		.klen	= 56,
++		.input	= { 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10 },
++		.ilen	= 8,
++		.result	= { 0xc0, 0x45, 0x04, 0x01, 0x2e, 0x4e, 0x1f, 0x53 },
++		.rlen	= 8,
++	},
++};
++
++struct cipher_testvec bf_dec_tv_template[] = {
++	{ /* DES test vectors from OpenSSL */
++		.key	= { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
++		.klen	= 8,
++		.input	= { 0x4e, 0xf9, 0x97, 0x45, 0x61, 0x98, 0xdd, 0x78 },
++		.ilen	= 8,
++		.result	= { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
++		.rlen	= 8,
++	}, {
++		.key	= { 0x1f, 0x1f, 0x1f, 0x1f, 0x0e, 0x0e, 0x0e, 0x0e },
++		.klen	= 8,
++		.input	= { 0xa7, 0x90, 0x79, 0x51, 0x08, 0xea, 0x3c, 0xae },
++		.ilen	= 8,
++		.result	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
++		.rlen	= 8,
++	}, {
++		.key	= { 0xf0, 0xe1, 0xd2, 0xc3, 0xb4, 0xa5, 0x96, 0x87 },
++		.klen	= 8,
++		.input	= { 0xe8, 0x7a, 0x24, 0x4e, 0x2c, 0xc8, 0x5e, 0x82 },
++		.ilen	= 8,
++		.result	= { 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10 },
++		.rlen	= 8,
++	}, { /* Vary the keylength... */	
++		.key	= { 0xf0, 0xe1, 0xd2, 0xc3, 0xb4, 0xa5, 0x96, 0x87,
++			    0x78, 0x69, 0x5a, 0x4b, 0x3c, 0x2d, 0x1e, 0x0f },
++		.klen	= 16,
++		.input	= { 0x93, 0x14, 0x28, 0x87, 0xee, 0x3b, 0xe1, 0x5c },
++		.ilen	= 8,
++		.result	= { 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10 },
++		.rlen	= 8,
++	}, {
++		.key	= { 0xf0, 0xe1, 0xd2, 0xc3, 0xb4, 0xa5, 0x96, 0x87,
++			    0x78, 0x69, 0x5a, 0x4b, 0x3c, 0x2d, 0x1e, 0x0f,
++			    0x00, 0x11, 0x22, 0x33, 0x44 },
++		.klen	= 21,
++		.input	= { 0xe6, 0xf5, 0x1e, 0xd7, 0x9b, 0x9d, 0xb2, 0x1f },
++		.ilen	= 8,
++		.result	= { 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10 },
++		.rlen	= 8,
++	}, { /* Generated with bf488, using OpenSSL, Libgcrypt and Nettle */
++		.key	= { 0xf0, 0xe1, 0xd2, 0xc3, 0xb4, 0xa5, 0x96, 0x87,
++			    0x78, 0x69, 0x5a, 0x4b, 0x3c, 0x2d, 0x1e, 0x0f,
++			    0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
++			    0x04, 0x68, 0x91, 0x04, 0xc2, 0xfd, 0x3b, 0x2f, 
++			    0x58, 0x40, 0x23, 0x64, 0x1a, 0xba, 0x61, 0x76, 
++			    0x1f, 0x1f, 0x1f, 0x1f, 0x0e, 0x0e, 0x0e, 0x0e, 
++			    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff },
++		.klen	= 56,
++		.input	= { 0xc0, 0x45, 0x04, 0x01, 0x2e, 0x4e, 0x1f, 0x53 },
++		.ilen	= 8,
++		.result	= { 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10 },
++		.rlen	= 8,
++	},
++};
++
++struct cipher_testvec bf_cbc_enc_tv_template[] = {
++	{ /* From OpenSSL */
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
++			    0xf0, 0xe1, 0xd2, 0xc3, 0xb4, 0xa5, 0x96, 0x87 },
++		.klen	= 16,
++		.iv	= { 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10 },		
++		.input	= { 0x37, 0x36, 0x35, 0x34, 0x33, 0x32, 0x31, 0x20,
++			    0x4e, 0x6f, 0x77, 0x20, 0x69, 0x73, 0x20, 0x74,
++			    0x68, 0x65, 0x20, 0x74, 0x69, 0x6d, 0x65, 0x20,
++			    0x66, 0x6f, 0x72, 0x20, 0x00, 0x00, 0x00, 0x00 },
++		.ilen	= 32,
++		.result	= { 0x6b, 0x77, 0xb4, 0xd6, 0x30, 0x06, 0xde, 0xe6,
++			    0x05, 0xb1, 0x56, 0xe2, 0x74, 0x03, 0x97, 0x93,
++			    0x58, 0xde, 0xb9, 0xe7, 0x15, 0x46, 0x16, 0xd9,
++			    0x59, 0xf1, 0x65, 0x2b, 0xd5, 0xff, 0x92, 0xcc },
++		.rlen	= 32,
++	},
++};
++
++struct cipher_testvec bf_cbc_dec_tv_template[] = {
++	{ /* From OpenSSL */
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
++			    0xf0, 0xe1, 0xd2, 0xc3, 0xb4, 0xa5, 0x96, 0x87 },
++		.klen	= 16,
++		.iv	= { 0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10 },		
++		.input	= { 0x6b, 0x77, 0xb4, 0xd6, 0x30, 0x06, 0xde, 0xe6,
++			    0x05, 0xb1, 0x56, 0xe2, 0x74, 0x03, 0x97, 0x93,
++			    0x58, 0xde, 0xb9, 0xe7, 0x15, 0x46, 0x16, 0xd9,
++			    0x59, 0xf1, 0x65, 0x2b, 0xd5, 0xff, 0x92, 0xcc },
++		.ilen	= 32,
++		.result	= { 0x37, 0x36, 0x35, 0x34, 0x33, 0x32, 0x31, 0x20,
++			    0x4e, 0x6f, 0x77, 0x20, 0x69, 0x73, 0x20, 0x74,
++			    0x68, 0x65, 0x20, 0x74, 0x69, 0x6d, 0x65, 0x20,
++			    0x66, 0x6f, 0x72, 0x20, 0x00, 0x00, 0x00, 0x00 },
++		.rlen	= 32,
+ 	},
+ };
+ 
+@@ -1284,212 +1024,161 @@ struct bf_tv bf_cbc_dec_tv_template[] = 
+ #define TF_CBC_ENC_TEST_VECTORS		4
+ #define TF_CBC_DEC_TEST_VECTORS		4
+ 
+-struct tf_tv {
+-	unsigned int keylen;
+-	unsigned int plen;
+-	unsigned int rlen;
+-	int fail;
+-	char key[32];
+-	char iv[16];
+-	char plaintext[48];
+-	char result[48];
+-};
+-
+-struct tf_tv tf_enc_tv_template[] = {
+-	{
+-		16, 16, 16, 0,
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-		{ 0 },
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-		{ 0x9F, 0x58, 0x9F, 0x5C, 0xF6, 0x12, 0x2C, 0x32,
+-		  0xB6, 0xBF, 0xEC, 0x2F, 0x2A, 0xE8, 0xC3, 0x5A }
+-	},
+-	{
+-		24, 16, 16, 0,
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF,
+-		  0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10,
+-		  0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77 },
+-		{ 0 },
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-		{ 0xCF, 0xD1, 0xD2, 0xE5, 0xA9, 0xBE, 0x9C, 0xDF,
+-		  0x50, 0x1F, 0x13, 0xB8, 0x92, 0xBD, 0x22, 0x48 }
+-	},
+-	{	
+-		32, 16, 16, 0,
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF,
+-		  0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10,
+-		  0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
+-		  0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF },
+-		{ 0 },
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-		{ 0x37, 0x52, 0x7B, 0xE0, 0x05, 0x23, 0x34, 0xB8,
+-		  0x9F, 0x0C, 0xFC, 0xCA, 0xE8, 0x7C, 0xFA, 0x20 }
+-	},
+-};
+-
+-struct tf_tv tf_dec_tv_template[] = {
+-	{
+-		16, 16, 16, 0,
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-		{ 0 },
+-		{ 0x9F, 0x58, 0x9F, 0x5C, 0xF6, 0x12, 0x2C, 0x32,
+-		  0xB6, 0xBF, 0xEC, 0x2F, 0x2A, 0xE8, 0xC3, 0x5A },
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },  
+-	},
+-	{
+-		24, 16, 16, 0,
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF,
+-		  0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10,
+-		  0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77 },
+-		{ 0 },
+-		{ 0xCF, 0xD1, 0xD2, 0xE5, 0xA9, 0xBE, 0x9C, 0xDF,
+-		  0x50, 0x1F, 0x13, 0xB8, 0x92, 0xBD, 0x22, 0x48 },
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-	},
+-	{	
+-		32, 16, 16, 0,
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF,
+-		  0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10,
+-		  0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
+-		  0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF },
+-		{ 0 },
+-		{ 0x37, 0x52, 0x7B, 0xE0, 0x05, 0x23, 0x34, 0xB8,
+-		  0x9F, 0x0C, 0xFC, 0xCA, 0xE8, 0x7C, 0xFA, 0x20 },
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-	},
+-};
+-
+-struct tf_tv tf_cbc_enc_tv_template[] = {
+-	/* Generated with Nettle */
+-	{
+-		16, 16, 16, 0,
+-		
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-		{ 0x9f, 0x58, 0x9f, 0x5c, 0xf6, 0x12, 0x2c, 0x32,
+-		  0xb6, 0xbf, 0xec, 0x2f, 0x2a, 0xe8, 0xc3, 0x5a },
+-	},
+-	
+-	{
+-		16, 16, 16, 0,
+-		
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-		{ 0x9f, 0x58, 0x9f, 0x5c, 0xf6, 0x12, 0x2c, 0x32,
+-		  0xb6, 0xbf, 0xec, 0x2f, 0x2a, 0xe8, 0xc3, 0x5a },
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-		{ 0xd4, 0x91, 0xdb, 0x16, 0xe7, 0xb1, 0xc3, 0x9e,
+-		  0x86, 0xcb, 0x08, 0x6b, 0x78, 0x9f, 0x54, 0x19 },
+-	},
+-	
+-	{
+-		16, 16, 16, 0,
+-		
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-		{ 0xd4, 0x91, 0xdb, 0x16, 0xe7, 0xb1, 0xc3, 0x9e,
+-		  0x86, 0xcb, 0x08, 0x6b, 0x78, 0x9f, 0x54, 0x19 },
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-		{ 0x05, 0xef, 0x8c, 0x61, 0xa8, 0x11, 0x58, 0x26,
+-		  0x34, 0xba, 0x5c, 0xb7, 0x10, 0x6a, 0xa6, 0x41 },
+-	},
+-	
+-	{
+-		16, 48, 48, 0,
+-		
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-		{ 0x9f, 0x58, 0x9f, 0x5c, 0xf6, 0x12, 0x2c, 0x32,
+-		  0xb6, 0xbf, 0xec, 0x2f, 0x2a, 0xe8, 0xc3, 0x5a,
+-		  0xd4, 0x91, 0xdb, 0x16, 0xe7, 0xb1, 0xc3, 0x9e,
+-		  0x86, 0xcb, 0x08, 0x6b, 0x78, 0x9f, 0x54, 0x19,
+-		  0x05, 0xef, 0x8c, 0x61, 0xa8, 0x11, 0x58, 0x26,
+-		  0x34, 0xba, 0x5c, 0xb7, 0x10, 0x6a, 0xa6, 0x41 },
+-	},
+-};
+-
+-struct tf_tv tf_cbc_dec_tv_template[] = {
+-	/* Reverse of the first four above */
+-	{
+-		16, 16, 16, 0,
+-		
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-		{ 0x9f, 0x58, 0x9f, 0x5c, 0xf6, 0x12, 0x2c, 0x32,
+-		  0xb6, 0xbf, 0xec, 0x2f, 0x2a, 0xe8, 0xc3, 0x5a },		  
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-	},
+-	
+-	{
+-		16, 16, 16, 0,
+-		
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-		{ 0x9f, 0x58, 0x9f, 0x5c, 0xf6, 0x12, 0x2c, 0x32,
+-		  0xb6, 0xbf, 0xec, 0x2f, 0x2a, 0xe8, 0xc3, 0x5a },
+-		{ 0xd4, 0x91, 0xdb, 0x16, 0xe7, 0xb1, 0xc3, 0x9e,
+-		  0x86, 0xcb, 0x08, 0x6b, 0x78, 0x9f, 0x54, 0x19 },
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },  
+-	},
+-	
+-	{
+-		16, 16, 16, 0,
+-		
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-		{ 0xd4, 0x91, 0xdb, 0x16, 0xe7, 0xb1, 0xc3, 0x9e,
+-		  0x86, 0xcb, 0x08, 0x6b, 0x78, 0x9f, 0x54, 0x19 },
+-		{ 0x05, 0xef, 0x8c, 0x61, 0xa8, 0x11, 0x58, 0x26,
+-		  0x34, 0xba, 0x5c, 0xb7, 0x10, 0x6a, 0xa6, 0x41 },
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },  
+-	},
+-	
++struct cipher_testvec tf_enc_tv_template[] = {
+ 	{
+-		16, 48, 48, 0,
+-		
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-		{ 0x9f, 0x58, 0x9f, 0x5c, 0xf6, 0x12, 0x2c, 0x32,
+-		  0xb6, 0xbf, 0xec, 0x2f, 0x2a, 0xe8, 0xc3, 0x5a,
+-		  0xd4, 0x91, 0xdb, 0x16, 0xe7, 0xb1, 0xc3, 0x9e,
+-		  0x86, 0xcb, 0x08, 0x6b, 0x78, 0x9f, 0x54, 0x19,
+-		  0x05, 0xef, 0x8c, 0x61, 0xa8, 0x11, 0x58, 0x26,
+-		  0x34, 0xba, 0x5c, 0xb7, 0x10, 0x6a, 0xa6, 0x41 },
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
++		.key	= { [0 ... 15] = 0x00 },
++		.klen	= 16,
++		.input	= { [0 ... 15] = 0x00 },
++		.ilen	= 16,
++		.result	= { 0x9f, 0x58, 0x9f, 0x5c, 0xf6, 0x12, 0x2c, 0x32,
++			    0xb6, 0xbf, 0xec, 0x2f, 0x2a, 0xe8, 0xc3, 0x5a },
++		.rlen	= 16,
++	}, {
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
++			    0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10,
++			    0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77 },
++		.klen	= 24,
++		.input	= { [0 ... 15] = 0x00 },
++		.ilen	= 16,
++		.result	= { 0xcf, 0xd1, 0xd2, 0xe5, 0xa9, 0xbe, 0x9c, 0xdf,
++			    0x50, 0x1f, 0x13, 0xb8, 0x92, 0xbd, 0x22, 0x48 },
++		.rlen	= 16,
++	}, {
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
++			    0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10,
++			    0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
++			    0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff },
++		.klen	= 32,
++		.input	= { [0 ... 15] = 0x00 },
++		.ilen	= 16,
++		.result	= { 0x37, 0x52, 0x7b, 0xe0, 0x05, 0x23, 0x34, 0xb8,
++			    0x9f, 0x0c, 0xfc, 0xca, 0xe8, 0x7c, 0xfa, 0x20 },
++		.rlen	= 16,
++	},
++};
++
++struct cipher_testvec tf_dec_tv_template[] = {
++	{
++		.key	= { [0 ... 15] = 0x00 },
++		.klen	= 16,
++		.input	= { 0x9f, 0x58, 0x9f, 0x5c, 0xf6, 0x12, 0x2c, 0x32,
++			    0xb6, 0xbf, 0xec, 0x2f, 0x2a, 0xe8, 0xc3, 0x5a },
++		.ilen	= 16,
++		.result	= { [0 ... 15] = 0x00 },
++		.rlen	= 16,
++	}, {
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
++			    0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10,
++			    0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77 },
++		.klen	= 24,
++		.input	= { 0xcf, 0xd1, 0xd2, 0xe5, 0xa9, 0xbe, 0x9c, 0xdf,
++			    0x50, 0x1f, 0x13, 0xb8, 0x92, 0xbd, 0x22, 0x48 },
++		.ilen	= 16,
++		.result	= { [0 ... 15] = 0x00 },
++		.rlen	= 16,
++	}, {
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef,
++			    0xfe, 0xdc, 0xba, 0x98, 0x76, 0x54, 0x32, 0x10,
++			    0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
++			    0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff },
++		.klen	= 32,
++		.input	= { 0x37, 0x52, 0x7b, 0xe0, 0x05, 0x23, 0x34, 0xb8,
++			    0x9f, 0x0c, 0xfc, 0xca, 0xe8, 0x7c, 0xfa, 0x20 },
++		.ilen	= 16,
++		.result	= { [0 ... 15] = 0x00 },
++		.rlen	= 16,
++	},
++};
++
++struct cipher_testvec tf_cbc_enc_tv_template[] = {
++	{ /* Generated with Nettle */
++		.key	= { [0 ... 15] = 0x00 },
++		.klen	= 16,
++		.iv	= { [0 ... 15] = 0x00 },
++		.input	= { [0 ... 15] = 0x00 },
++		.ilen	= 16,
++		.result	= { 0x9f, 0x58, 0x9f, 0x5c, 0xf6, 0x12, 0x2c, 0x32,
++			    0xb6, 0xbf, 0xec, 0x2f, 0x2a, 0xe8, 0xc3, 0x5a },
++		.rlen	= 16,
++	}, {
++		.key	= { [0 ... 15] = 0x00 },
++		.klen	= 16,
++		.iv	= { 0x9f, 0x58, 0x9f, 0x5c, 0xf6, 0x12, 0x2c, 0x32,
++			    0xb6, 0xbf, 0xec, 0x2f, 0x2a, 0xe8, 0xc3, 0x5a },		
++		.input	= { [0 ... 15] = 0x00 },
++		.ilen	= 16,
++		.result	= { 0xd4, 0x91, 0xdb, 0x16, 0xe7, 0xb1, 0xc3, 0x9e,
++			    0x86, 0xcb, 0x08, 0x6b, 0x78, 0x9f, 0x54, 0x19 },
++		.rlen	= 16,
++	}, {
++		.key	= { [0 ... 15] = 0x00 },
++		.klen	= 16,
++		.iv	= { 0xd4, 0x91, 0xdb, 0x16, 0xe7, 0xb1, 0xc3, 0x9e,
++			    0x86, 0xcb, 0x08, 0x6b, 0x78, 0x9f, 0x54, 0x19 },
++		.input	= { [0 ... 15] = 0x00 },
++		.ilen	= 16,
++		.result	= { 0x05, 0xef, 0x8c, 0x61, 0xa8, 0x11, 0x58, 0x26,
++			    0x34, 0xba, 0x5c, 0xb7, 0x10, 0x6a, 0xa6, 0x41 },
++		.rlen	= 16,
++	}, {
++		.key	= { [0 ... 15] = 0x00 },
++		.klen	= 16,
++		.iv	= { [0 ... 15] = 0x00 },
++		.input	= { [0 ... 47] = 0x00 },
++		.ilen	= 48,
++		.result	= { 0x9f, 0x58, 0x9f, 0x5c, 0xf6, 0x12, 0x2c, 0x32,
++			    0xb6, 0xbf, 0xec, 0x2f, 0x2a, 0xe8, 0xc3, 0x5a,
++			    0xd4, 0x91, 0xdb, 0x16, 0xe7, 0xb1, 0xc3, 0x9e,
++			    0x86, 0xcb, 0x08, 0x6b, 0x78, 0x9f, 0x54, 0x19,
++			    0x05, 0xef, 0x8c, 0x61, 0xa8, 0x11, 0x58, 0x26,
++			    0x34, 0xba, 0x5c, 0xb7, 0x10, 0x6a, 0xa6, 0x41 },
++		.rlen	= 48,
++	},
++};
++
++struct cipher_testvec tf_cbc_dec_tv_template[] = {
++	{ /* Reverse of the first four above */
++		.key	= { [0 ... 15] = 0x00 },
++		.klen	= 16,
++		.iv	= { [0 ... 15] = 0x00 },
++		.input	= { 0x9f, 0x58, 0x9f, 0x5c, 0xf6, 0x12, 0x2c, 0x32,
++			    0xb6, 0xbf, 0xec, 0x2f, 0x2a, 0xe8, 0xc3, 0x5a },		  
++		.ilen	= 16,
++		.result	= { [0 ... 15] = 0x00 },
++		.rlen	= 16,
++	}, {
++		.key	= { [0 ... 15] = 0x00 },
++		.klen	= 16,
++		.iv	= { 0x9f, 0x58, 0x9f, 0x5c, 0xf6, 0x12, 0x2c, 0x32,
++			    0xb6, 0xbf, 0xec, 0x2f, 0x2a, 0xe8, 0xc3, 0x5a },
++		.input	= { 0xd4, 0x91, 0xdb, 0x16, 0xe7, 0xb1, 0xc3, 0x9e,
++			    0x86, 0xcb, 0x08, 0x6b, 0x78, 0x9f, 0x54, 0x19 },
++		.ilen	= 16,
++		.result	= { [0 ... 15] = 0x00 },
++		.rlen	= 16,
++	}, {
++		.key	= { [0 ... 15] = 0x00 },
++		.klen	= 16,
++		.iv	= { 0xd4, 0x91, 0xdb, 0x16, 0xe7, 0xb1, 0xc3, 0x9e,
++			    0x86, 0xcb, 0x08, 0x6b, 0x78, 0x9f, 0x54, 0x19 },
++		.input	= { 0x05, 0xef, 0x8c, 0x61, 0xa8, 0x11, 0x58, 0x26,
++			    0x34, 0xba, 0x5c, 0xb7, 0x10, 0x6a, 0xa6, 0x41 },
++		.ilen	= 16,
++		.result	= { [0 ... 15] = 0x00 },
++		.rlen	= 16,
++	}, {
++		.key	= { [0 ... 15] = 0x00 },
++		.klen	= 16,
++		.iv	= { [0 ... 15] = 0x00 },
++		.input	= { 0x9f, 0x58, 0x9f, 0x5c, 0xf6, 0x12, 0x2c, 0x32,
++			    0xb6, 0xbf, 0xec, 0x2f, 0x2a, 0xe8, 0xc3, 0x5a,
++			    0xd4, 0x91, 0xdb, 0x16, 0xe7, 0xb1, 0xc3, 0x9e,
++			    0x86, 0xcb, 0x08, 0x6b, 0x78, 0x9f, 0x54, 0x19,
++			    0x05, 0xef, 0x8c, 0x61, 0xa8, 0x11, 0x58, 0x26,
++			    0x34, 0xba, 0x5c, 0xb7, 0x10, 0x6a, 0xa6, 0x41 },
++		.ilen	= 48,
++		.result	= { [0 ... 47] = 0x00 },
++		.rlen	= 48,
+ 	},
+ };
+ 
+@@ -1500,179 +1189,162 @@ struct tf_tv tf_cbc_dec_tv_template[] = 
+ #define SERPENT_ENC_TEST_VECTORS	4
+ #define SERPENT_DEC_TEST_VECTORS	4
+ 
+-struct serpent_tv {
+-	unsigned int keylen, fail;
+-	u8 key[32], plaintext[16], result[16];
+-};
+-
+-struct serpent_tv serpent_enc_tv_template[] = 
++struct cipher_testvec serpent_enc_tv_template[] = 
+ {
+ 	{
+-		0, 0,
+-		{ 0 },
+-		{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+-		  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
+-		{ 0x12, 0x07, 0xfc, 0xce, 0x9b, 0xd0, 0xd6, 0x47,
+-		  0x6a, 0xe9, 0x8f, 0xbe, 0xd1, 0x43, 0xa0, 0xe2 }
++		.input	= { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
++			    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
++		.ilen	= 16,
++		.result	= { 0x12, 0x07, 0xfc, 0xce, 0x9b, 0xd0, 0xd6, 0x47,
++			    0x6a, 0xe9, 0x8f, 0xbe, 0xd1, 0x43, 0xa0, 0xe2 },
++		.rlen	= 16,
++	}, {
++		.key	= { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
++			    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
++		.klen	= 16,
++		.input	= { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
++			    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
++		.ilen	= 16,
++		.result	= { 0x4c, 0x7d, 0x8a, 0x32, 0x80, 0x72, 0xa2, 0x2c,
++			    0x82, 0x3e, 0x4a, 0x1f, 0x3a, 0xcd, 0xa1, 0x6d },
++		.rlen	= 16,
++	}, {
++		.key	= { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
++			    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
++			    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
++			    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f },
++		.klen	= 32,
++		.input	= { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
++			    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
++		.ilen	= 16,
++		.result	= { 0xde, 0x26, 0x9f, 0xf8, 0x33, 0xe4, 0x32, 0xb8,
++			    0x5b, 0x2e, 0x88, 0xd2, 0x70, 0x1c, 0xe7, 0x5c },
++		.rlen	= 16,
++	}, {
++		.key	= { [15] = 0x80 },
++		.klen	= 16,
++		.input	= { [0 ... 15] = 0x00 },
++		.ilen	= 16,
++		.result	= { 0xdd, 0xd2, 0x6b, 0x98, 0xa5, 0xff, 0xd8, 0x2c,
++			    0x05, 0x34, 0x5a, 0x9d, 0xad, 0xbf, 0xaf, 0x49},
++		.rlen	= 16,
+ 	},
+-	{
+-		16, 0,
+-		{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+-		  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
+-		{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+-		  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
+-		{ 0x4c, 0x7d, 0x8a, 0x32, 0x80, 0x72, 0xa2, 0x2c,
+-		  0x82, 0x3e, 0x4a, 0x1f, 0x3a, 0xcd, 0xa1, 0x6d }
+-	},
+-	{
+-		32, 0,
+-		{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+-		  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+-		  0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+-		  0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f },
+-		{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+-		  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
+-		{ 0xde, 0x26, 0x9f, 0xf8, 0x33, 0xe4, 0x32, 0xb8,
+-		  0x5b, 0x2e, 0x88, 0xd2, 0x70, 0x1c, 0xe7, 0x5c }
+-	},
+-	{
+-		16, 0,
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80 },
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-		{ 0xdd, 0xd2, 0x6b, 0x98, 0xa5, 0xff, 0xd8, 0x2c,
+-		  0x05, 0x34, 0x5a, 0x9d, 0xad, 0xbf, 0xaf, 0x49}
+-	}
+ };
+ 
+-struct serpent_tv serpent_dec_tv_template[] = 
++struct cipher_testvec serpent_dec_tv_template[] = 
+ {
+ 	{
+-		0, 0,
+-		{ 0 },
+-		{ 0x12, 0x07, 0xfc, 0xce, 0x9b, 0xd0, 0xd6, 0x47,
+-		  0x6a, 0xe9, 0x8f, 0xbe, 0xd1, 0x43, 0xa0, 0xe2 },
+-		{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+-		  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
+-
+-	},
+-	{
+-		16, 0,
+-		{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+-		  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
+-		{ 0x4c, 0x7d, 0x8a, 0x32, 0x80, 0x72, 0xa2, 0x2c,
+-		  0x82, 0x3e, 0x4a, 0x1f, 0x3a, 0xcd, 0xa1, 0x6d },
+-		{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+-		  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
+-	},
+-	{
+-		32, 0,
+-		{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+-		  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+-		  0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+-		  0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f },
+-
+-		{ 0xde, 0x26, 0x9f, 0xf8, 0x33, 0xe4, 0x32, 0xb8,
+-		  0x5b, 0x2e, 0x88, 0xd2, 0x70, 0x1c, 0xe7, 0x5c },
+-		{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+-		  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
++		.input	= { 0x12, 0x07, 0xfc, 0xce, 0x9b, 0xd0, 0xd6, 0x47,
++			    0x6a, 0xe9, 0x8f, 0xbe, 0xd1, 0x43, 0xa0, 0xe2 },
++		.ilen	= 16,
++		.result	= { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
++			    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
++		.rlen	= 16,
++	}, {
++		.key	= { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
++			    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
++		.klen	= 16,
++		.input	= { 0x4c, 0x7d, 0x8a, 0x32, 0x80, 0x72, 0xa2, 0x2c,
++			    0x82, 0x3e, 0x4a, 0x1f, 0x3a, 0xcd, 0xa1, 0x6d },
++		.ilen	= 16,
++		.result	= { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
++			    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
++		.rlen	= 16,
++	}, {
++		.key	= { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
++			    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
++			    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
++			    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f },
++		.klen	= 32,
++		.input	= { 0xde, 0x26, 0x9f, 0xf8, 0x33, 0xe4, 0x32, 0xb8,
++			    0x5b, 0x2e, 0x88, 0xd2, 0x70, 0x1c, 0xe7, 0x5c },
++		.ilen	= 16,
++		.result	= { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
++			    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
++		.rlen	= 16,
++	}, {
++		.key	= { [15] = 0x80 },
++		.klen	= 16,
++		.input	= { 0xdd, 0xd2, 0x6b, 0x98, 0xa5, 0xff, 0xd8, 0x2c,
++			    0x05, 0x34, 0x5a, 0x9d, 0xad, 0xbf, 0xaf, 0x49},
++		.ilen	= 16,
++		.result	= { [0 ... 15] = 0x00 },
++		.rlen	= 16,
+ 	},
+-	{
+-		16, 0,
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80 },
+-		{ 0xdd, 0xd2, 0x6b, 0x98, 0xa5, 0xff, 0xd8, 0x2c,
+-		  0x05, 0x34, 0x5a, 0x9d, 0xad, 0xbf, 0xaf, 0x49},
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },  
+-	}
+ };
+ 
+ /* Cast6 test vectors from RFC 2612 */
+ #define CAST6_ENC_TEST_VECTORS	3
+ #define CAST6_DEC_TEST_VECTORS  3
+ 
+-struct cast6_tv {
+-	unsigned keylen;
+-	unsigned fail;
+-	u8 key[32];
+-	u8 plaintext[16];
+-	u8 result[16];
+-};
+-
+-struct cast6_tv cast6_enc_tv_template[] = 
++struct cipher_testvec cast6_enc_tv_template[] = 
+ {
+ 	{
+-		16, 
+-		0,
+-		{ 0x23, 0x42, 0xbb, 0x9e, 0xfa, 0x38, 0x54, 0x2c, 
+-		  0x0a, 0xf7, 0x56, 0x47, 0xf2, 0x9f, 0x61, 0x5d },
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-		{ 0xc8, 0x42, 0xa0, 0x89, 0x72, 0xb4, 0x3d, 0x20, 
+-		  0x83, 0x6c, 0x91, 0xd1, 0xb7, 0x53, 0x0f, 0x6b },
++		.key	= { 0x23, 0x42, 0xbb, 0x9e, 0xfa, 0x38, 0x54, 0x2c, 
++			    0x0a, 0xf7, 0x56, 0x47, 0xf2, 0x9f, 0x61, 0x5d },
++		.klen	= 16,
++		.input	= { [0 ... 15] = 0x00 },
++		.ilen	= 16,
++		.result	= { 0xc8, 0x42, 0xa0, 0x89, 0x72, 0xb4, 0x3d, 0x20, 
++			    0x83, 0x6c, 0x91, 0xd1, 0xb7, 0x53, 0x0f, 0x6b },
++		.rlen	= 16,
++	}, {
++		.key	= { 0x23, 0x42, 0xbb, 0x9e, 0xfa, 0x38, 0x54, 0x2c, 
++			    0xbe, 0xd0, 0xac, 0x83, 0x94, 0x0a, 0xc2, 0x98, 
++			    0xba, 0xc7, 0x7a, 0x77, 0x17, 0x94, 0x28, 0x63 },
++		.klen	= 24,
++		.input	= { [0 ... 15] = 0x00 },
++		.ilen	= 16,
++		.result	= { 0x1b, 0x38, 0x6c, 0x02, 0x10, 0xdc, 0xad, 0xcb, 
++			    0xdd, 0x0e, 0x41, 0xaa, 0x08, 0xa7, 0xa7, 0xe8 },
++		.rlen	= 16,
++	}, {
++		.key	= { 0x23, 0x42, 0xbb, 0x9e, 0xfa, 0x38, 0x54, 0x2c,
++			    0xbe, 0xd0, 0xac, 0x83, 0x94, 0x0a, 0xc2, 0x98,
++			    0x8d, 0x7c, 0x47, 0xce, 0x26, 0x49, 0x08, 0x46,
++			    0x1c, 0xc1, 0xb5, 0x13, 0x7a, 0xe6, 0xb6, 0x04 },				  
++		.klen	= 32,
++		.input	= { [0 ... 15] = 0x00 },
++		.ilen	= 16,
++		.result	= { 0x4f, 0x6a, 0x20, 0x38, 0x28, 0x68, 0x97, 0xb9, 
++			    0xc9, 0x87, 0x01, 0x36, 0x55, 0x33, 0x17, 0xfa },
++		.rlen	= 16,
+ 	},
+-	{
+-		24, 
+-		0,
+-		{ 0x23, 0x42, 0xbb, 0x9e, 0xfa, 0x38, 0x54, 0x2c, 
+-		  0xbe, 0xd0, 0xac, 0x83, 0x94, 0x0a, 0xc2, 0x98, 
+-		  0xba, 0xc7, 0x7a, 0x77, 0x17, 0x94, 0x28, 0x63 },
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-		{ 0x1b, 0x38, 0x6c, 0x02, 0x10, 0xdc, 0xad, 0xcb, 
+-		  0xdd, 0x0e, 0x41, 0xaa, 0x08, 0xa7, 0xa7, 0xe8 },
+-	},
+-	{
+-		32, 
+-		0,
+-		{ 0x23, 0x42, 0xbb, 0x9e, 0xfa, 0x38, 0x54, 0x2c,
+-                  0xbe, 0xd0, 0xac, 0x83, 0x94, 0x0a, 0xc2, 0x98,
+-		  0x8d, 0x7c, 0x47, 0xce, 0x26, 0x49, 0x08, 0x46,
+-		  0x1c, 0xc1, 0xb5, 0x13, 0x7a, 0xe6, 0xb6, 0x04 },				  
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-		{ 0x4f, 0x6a, 0x20, 0x38, 0x28, 0x68, 0x97, 0xb9, 
+-		  0xc9, 0x87, 0x01, 0x36, 0x55, 0x33, 0x17, 0xfa },
+-	}
+ };
+ 
+-struct cast6_tv cast6_dec_tv_template[] = 
++struct cipher_testvec cast6_dec_tv_template[] = 
+ {
+ 	{
+-		16, 
+-		0,
+-		{ 0x23, 0x42, 0xbb, 0x9e, 0xfa, 0x38, 0x54, 0x2c, 
+-		  0x0a, 0xf7, 0x56, 0x47, 0xf2, 0x9f, 0x61, 0x5d },
+-		{ 0xc8, 0x42, 0xa0, 0x89, 0x72, 0xb4, 0x3d, 0x20, 
+-		  0x83, 0x6c, 0x91, 0xd1, 0xb7, 0x53, 0x0f, 0x6b },
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-	},
+-	{
+-		24, 
+-		0,
+-		{ 0x23, 0x42, 0xbb, 0x9e, 0xfa, 0x38, 0x54, 0x2c, 
+-		  0xbe, 0xd0, 0xac, 0x83, 0x94, 0x0a, 0xc2, 0x98, 
+-		  0xba, 0xc7, 0x7a, 0x77, 0x17, 0x94, 0x28, 0x63 },
+-		{ 0x1b, 0x38, 0x6c, 0x02, 0x10, 0xdc, 0xad, 0xcb, 
+-		  0xdd, 0x0e, 0x41, 0xaa, 0x08, 0xa7, 0xa7, 0xe8 },
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
++		.key	= { 0x23, 0x42, 0xbb, 0x9e, 0xfa, 0x38, 0x54, 0x2c, 
++			    0x0a, 0xf7, 0x56, 0x47, 0xf2, 0x9f, 0x61, 0x5d },
++		.klen	= 16,
++		.input	= { 0xc8, 0x42, 0xa0, 0x89, 0x72, 0xb4, 0x3d, 0x20, 
++			    0x83, 0x6c, 0x91, 0xd1, 0xb7, 0x53, 0x0f, 0x6b },
++		.ilen	= 16,
++		.result	= { [0 ... 15] = 0x00 },
++		.rlen	= 16,
++	}, {
++		.key	= { 0x23, 0x42, 0xbb, 0x9e, 0xfa, 0x38, 0x54, 0x2c, 
++			    0xbe, 0xd0, 0xac, 0x83, 0x94, 0x0a, 0xc2, 0x98, 
++			    0xba, 0xc7, 0x7a, 0x77, 0x17, 0x94, 0x28, 0x63 },
++		.klen	= 24,
++		.input	= { 0x1b, 0x38, 0x6c, 0x02, 0x10, 0xdc, 0xad, 0xcb, 
++			    0xdd, 0x0e, 0x41, 0xaa, 0x08, 0xa7, 0xa7, 0xe8 },
++		.ilen	= 16,
++		.result	= { [0 ... 15] = 0x00 },
++		.rlen	= 16,
++	}, {
++		.key	= { 0x23, 0x42, 0xbb, 0x9e, 0xfa, 0x38, 0x54, 0x2c,
++			    0xbe, 0xd0, 0xac, 0x83, 0x94, 0x0a, 0xc2, 0x98,
++			    0x8d, 0x7c, 0x47, 0xce, 0x26, 0x49, 0x08, 0x46,
++			    0x1c, 0xc1, 0xb5, 0x13, 0x7a, 0xe6, 0xb6, 0x04 },				  
++		.klen	= 32,
++		.input	= { 0x4f, 0x6a, 0x20, 0x38, 0x28, 0x68, 0x97, 0xb9, 
++			    0xc9, 0x87, 0x01, 0x36, 0x55, 0x33, 0x17, 0xfa },
++		.ilen	= 16,
++		.result	= { [0 ... 15] = 0x00 },
++		.rlen	= 16,
+ 	},
+-	{
+-		32, 
+-		0,
+-		{ 0x23, 0x42, 0xbb, 0x9e, 0xfa, 0x38, 0x54, 0x2c,
+-                  0xbe, 0xd0, 0xac, 0x83, 0x94, 0x0a, 0xc2, 0x98,
+-		  0x8d, 0x7c, 0x47, 0xce, 0x26, 0x49, 0x08, 0x46,
+-		  0x1c, 0xc1, 0xb5, 0x13, 0x7a, 0xe6, 0xb6, 0x04 },				  
+-		{ 0x4f, 0x6a, 0x20, 0x38, 0x28, 0x68, 0x97, 0xb9, 
+-		  0xc9, 0x87, 0x01, 0x36, 0x55, 0x33, 0x17, 0xfa },
+-		{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+-		  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },
+-	}
+ };
+ 
+ 
+@@ -1682,90 +1354,77 @@ struct cast6_tv cast6_dec_tv_template[] 
+ #define AES_ENC_TEST_VECTORS 3
+ #define AES_DEC_TEST_VECTORS 3
+ 
+-struct aes_tv {
+-	unsigned int keylen;
+-	unsigned int plen;
+-	unsigned int rlen;
+-	int fail;
+-	char key[32];
+-	char iv[8];
+-	char plaintext[16];
+-	char result[16];
+-};
+-
+-struct aes_tv aes_enc_tv_template[] = { 
+-	/* From FIPS-197 */
+-	{
+-		16, 16, 16, 0,
+-		{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 
+-		  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
+-		{ 0 },
+-		{ 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
+-		  0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff },
+-		{ 0x69, 0xc4, 0xe0, 0xd8, 0x6a, 0x7b, 0x04, 0x30,
+-		  0xd8, 0xcd, 0xb7, 0x80, 0x70, 0xb4, 0xc5, 0x5a },
+-	},
+-	{
+-		24, 16, 16, 0,
+-		{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+-		  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+-		  0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17 },
+-		{ 0 },
+-		{ 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 
+-		  0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff },
+-		{ 0xdd, 0xa9, 0x7c, 0xa4, 0x86, 0x4c, 0xdf, 0xe0,
+-		  0x6e, 0xaf, 0x70, 0xa0, 0xec, 0x0d, 0x71, 0x91 },
+-	},
+-	{
+-		32, 16, 16, 0,
+-		{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+-		  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+-		  0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+-		  0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f },
+-		{ 0 },
+-		{ 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 
+-		  0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff },
+-		{ 0x8e, 0xa2, 0xb7, 0xca, 0x51, 0x67, 0x45, 0xbf,
+-		  0xea, 0xfc, 0x49, 0x90, 0x4b, 0x49, 0x60, 0x89 },
+-	},
+-};
+-
+-struct aes_tv aes_dec_tv_template[] = { 
+-	/* From FIPS-197 */
+-	{
+-		16, 16, 16, 0,
+-		
+-		{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 
+-		  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
+-		{ 0 },
+-		{ 0x69, 0xc4, 0xe0, 0xd8, 0x6a, 0x7b, 0x04, 0x30,
+-		  0xd8, 0xcd, 0xb7, 0x80, 0x70, 0xb4, 0xc5, 0x5a },
+-		{ 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
+-		  0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff },
+-	},
+-	
+-	{
+-		24, 16, 16, 0,
+-		{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+-		  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+-		  0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17 },
+-		{ 0 },
+-		{ 0xdd, 0xa9, 0x7c, 0xa4, 0x86, 0x4c, 0xdf, 0xe0,
+-		  0x6e, 0xaf, 0x70, 0xa0, 0xec, 0x0d, 0x71, 0x91 },
+-		{ 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 
+-		  0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff },  
+-	},
+-	{
+-		32, 16, 16, 0,
+-		{ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+-		  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+-		  0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+-		  0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f },
+-		{ 0 },
+-		{ 0x8e, 0xa2, 0xb7, 0xca, 0x51, 0x67, 0x45, 0xbf,
+-		  0xea, 0xfc, 0x49, 0x90, 0x4b, 0x49, 0x60, 0x89 },
+-		{ 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 
+-		  0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff },
++struct cipher_testvec aes_enc_tv_template[] = { 
++	{ /* From FIPS-197 */
++		.key	= { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 
++			    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
++		.klen	= 16,
++		.input	= { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
++			    0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff },
++		.ilen	= 16,
++		.result	= { 0x69, 0xc4, 0xe0, 0xd8, 0x6a, 0x7b, 0x04, 0x30,
++			    0xd8, 0xcd, 0xb7, 0x80, 0x70, 0xb4, 0xc5, 0x5a },
++		.rlen	= 16,
++	}, {
++		.key	= { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
++			    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
++			    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17 },
++		.klen	= 24,
++		.input	= { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 
++			    0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff },
++		.ilen	= 16,
++		.result	= { 0xdd, 0xa9, 0x7c, 0xa4, 0x86, 0x4c, 0xdf, 0xe0,
++			    0x6e, 0xaf, 0x70, 0xa0, 0xec, 0x0d, 0x71, 0x91 },
++		.rlen	= 16,
++	}, {
++		.key	= { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
++			    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
++			    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
++			    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f },
++		.klen	= 32,
++		.input	= { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 
++			    0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff },
++		.ilen	= 16,
++		.result	= { 0x8e, 0xa2, 0xb7, 0xca, 0x51, 0x67, 0x45, 0xbf,
++			    0xea, 0xfc, 0x49, 0x90, 0x4b, 0x49, 0x60, 0x89 },
++		.rlen	= 16,
++	},
++};
++
++struct cipher_testvec aes_dec_tv_template[] = { 
++	{ /* From FIPS-197 */
++		.key	= { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 
++			    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f },
++		.klen	= 16,
++		.input	= { 0x69, 0xc4, 0xe0, 0xd8, 0x6a, 0x7b, 0x04, 0x30,
++			    0xd8, 0xcd, 0xb7, 0x80, 0x70, 0xb4, 0xc5, 0x5a },
++		.ilen	= 16,
++		.result	= { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
++			    0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff },
++		.rlen	= 16,
++	}, {
++		.key	= { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
++			    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
++			    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17 },
++		.klen	= 24,
++		.input	= { 0xdd, 0xa9, 0x7c, 0xa4, 0x86, 0x4c, 0xdf, 0xe0,
++			    0x6e, 0xaf, 0x70, 0xa0, 0xec, 0x0d, 0x71, 0x91 },
++		.ilen	= 16,
++		.result	= { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 
++			    0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff },  
++		.rlen	= 16,
++	}, {
++		.key	= { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
++			    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
++			    0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
++			    0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f },
++		.klen	= 32,
++		.input	= { 0x8e, 0xa2, 0xb7, 0xca, 0x51, 0x67, 0x45, 0xbf,
++			    0xea, 0xfc, 0x49, 0x90, 0x4b, 0x49, 0x60, 0x89 },
++		.ilen	= 16,
++		.result	= { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 
++			    0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff },
++		.rlen	= 16,
+ 	},
+ };
+ 
+@@ -1773,68 +1432,60 @@ struct aes_tv aes_dec_tv_template[] = { 
+ #define CAST5_ENC_TEST_VECTORS	3
+ #define CAST5_DEC_TEST_VECTORS	3
+ 
+-struct cast5_tv {
+-	unsigned keylen;
+-	unsigned fail;
+-	u8 key[16];
+-	u8 plaintext[8];
+-	u8 ciphertext[8];
+-};
+-
+-struct cast5_tv cast5_enc_tv_template[] =
++struct cipher_testvec cast5_enc_tv_template[] =
+ {
+ 	{
+-		16,
+-		0,
+-		{ 0x01, 0x23, 0x45, 0x67, 0x12, 0x34, 0x56, 0x78,
+-		  0x23, 0x45, 0x67, 0x89, 0x34, 0x56, 0x78, 0x9A },
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
+-		{ 0x23, 0x8b, 0x4f, 0xe5, 0x84, 0x7e, 0x44, 0xb2 },
+-
+-	},
+-	{
+-		10,
+-		0,
+-		{ 0x01, 0x23, 0x45, 0x67, 0x12, 0x34, 0x56, 0x78,
+-		  0x23, 0x45 },
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
+-		{ 0xeb, 0x6a, 0x71, 0x1a, 0x2c, 0x02, 0x27, 0x1b },
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x12, 0x34, 0x56, 0x78,
++			    0x23, 0x45, 0x67, 0x89, 0x34, 0x56, 0x78, 0x9a },
++		.klen	= 16,
++		.input	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
++		.ilen	= 8,
++		.result	= { 0x23, 0x8b, 0x4f, 0xe5, 0x84, 0x7e, 0x44, 0xb2 },
++		.rlen	= 8,
++	}, {
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x12, 0x34, 0x56, 0x78,
++			    0x23, 0x45 },
++		.klen	= 10,
++		.input	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
++		.ilen	= 8,
++		.result	= { 0xeb, 0x6a, 0x71, 0x1a, 0x2c, 0x02, 0x27, 0x1b },
++		.rlen	= 8,
++	}, {
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x12 },
++		.klen	= 5,
++		.input	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
++		.ilen	= 8,
++		.result	= { 0x7a, 0xc8, 0x16, 0xd1, 0x6e, 0x9b, 0x30, 0x2e },
++		.rlen	= 8,
+ 	},
+-	{
+-		5,
+-		0,
+-		{ 0x01, 0x23, 0x45, 0x67, 0x12 },
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
+-		{ 0x7a, 0xc8, 0x16, 0xd1, 0x6e, 0x9b, 0x30, 0x2e },
+-	}
+ };
+ 
+-struct cast5_tv cast5_dec_tv_template[] =
++struct cipher_testvec cast5_dec_tv_template[] =
+ {
+ 	{
+-		16,
+-		0,
+-		{ 0x01, 0x23, 0x45, 0x67, 0x12, 0x34, 0x56, 0x78,
+-		  0x23, 0x45, 0x67, 0x89, 0x34, 0x56, 0x78, 0x9A },
+-		{ 0x23, 0x8b, 0x4f, 0xe5, 0x84, 0x7e, 0x44, 0xb2 },
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
+-
+-	},
+-	{
+-		10,
+-		0,
+-		{ 0x01, 0x23, 0x45, 0x67, 0x12, 0x34, 0x56, 0x78,
+-		  0x23, 0x45 },
+-		{ 0xeb, 0x6a, 0x71, 0x1a, 0x2c, 0x02, 0x27, 0x1b },
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x12, 0x34, 0x56, 0x78,
++			    0x23, 0x45, 0x67, 0x89, 0x34, 0x56, 0x78, 0x9a },
++		.klen	= 16,
++		.input	= { 0x23, 0x8b, 0x4f, 0xe5, 0x84, 0x7e, 0x44, 0xb2 },
++		.ilen	= 8,
++		.result	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
++		.rlen	= 8,
++	}, {
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x12, 0x34, 0x56, 0x78,
++			    0x23, 0x45 },
++		.klen	= 10,
++		.input	= { 0xeb, 0x6a, 0x71, 0x1a, 0x2c, 0x02, 0x27, 0x1b },
++		.ilen	= 8,
++		.result	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
++		.rlen	= 8,
++	}, {
++		.key	= { 0x01, 0x23, 0x45, 0x67, 0x12 },
++		.klen	= 5,
++		.input	= { 0x7a, 0xc8, 0x16, 0xd1, 0x6e, 0x9b, 0x30, 0x2e },
++		.ilen	= 8,
++		.result	= { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
++		.rlen	= 8,
+ 	},
+-	{
+-		5,
+-		0,
+-		{ 0x01, 0x23, 0x45, 0x67, 0x12 },
+-		{ 0x7a, 0xc8, 0x16, 0xd1, 0x6e, 0x9b, 0x30, 0x2e },
+-		{ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef },
+-	}
+ };
+ 
+ /*
+@@ -1857,83 +1508,73 @@ struct comp_testvec {
+ 
+ struct comp_testvec deflate_comp_tv_template[] = {
+ 	{
+-	  70, 38,
+-	  
+-	  "Join us now and share the software "
+-	  "Join us now and share the software ",
+-
+-          { 0xf3, 0xca, 0xcf, 0xcc, 0x53, 0x28, 0x2d, 0x56,
+-            0xc8, 0xcb, 0x2f, 0x57, 0x48, 0xcc, 0x4b, 0x51,
+-            0x28, 0xce, 0x48, 0x2c, 0x4a, 0x55, 0x28, 0xc9,
+-            0x48, 0x55, 0x28, 0xce, 0x4f, 0x2b, 0x29, 0x07,
+-            0x71, 0xbc, 0x08, 0x2b, 0x01, 0x00 
+-          },
+-	},
+-	  
+-	{
+-	  191, 122,
+-	  
+-	  "This document describes a compression method based on the DEFLATE"
+-	  "compression algorithm.  This document defines the application of "
+-	  "the DEFLATE algorithm to the IP Payload Compression Protocol.",
+-	  
+-	  { 0x5d, 0x8d, 0x31, 0x0e, 0xc2, 0x30, 0x10, 0x04,
+-	    0xbf, 0xb2, 0x2f, 0xc8, 0x1f, 0x10, 0x04, 0x09,
+-	    0x89, 0xc2, 0x85, 0x3f, 0x70, 0xb1, 0x2f, 0xf8,
+-	    0x24, 0xdb, 0x67, 0xd9, 0x47, 0xc1, 0xef, 0x49,
+-	    0x68, 0x12, 0x51, 0xae, 0x76, 0x67, 0xd6, 0x27,
+-	    0x19, 0x88, 0x1a, 0xde, 0x85, 0xab, 0x21, 0xf2,
+-	    0x08, 0x5d, 0x16, 0x1e, 0x20, 0x04, 0x2d, 0xad,
+-	    0xf3, 0x18, 0xa2, 0x15, 0x85, 0x2d, 0x69, 0xc4,
+-	    0x42, 0x83, 0x23, 0xb6, 0x6c, 0x89, 0x71, 0x9b,
+-	    0xef, 0xcf, 0x8b, 0x9f, 0xcf, 0x33, 0xca, 0x2f,
+-	    0xed, 0x62, 0xa9, 0x4c, 0x80, 0xff, 0x13, 0xaf,
+-	    0x52, 0x37, 0xed, 0x0e, 0x52, 0x6b, 0x59, 0x02,
+-	    0xd9, 0x4e, 0xe8, 0x7a, 0x76, 0x1d, 0x02, 0x98,
+-	    0xfe, 0x8a, 0x87, 0x83, 0xa3, 0x4f, 0x56, 0x8a,
+-	    0xb8, 0x9e, 0x8e, 0x5c, 0x57, 0xd3, 0xa0, 0x79,
+-	    0xfa, 0x02 },
++		.inlen	= 70,
++		.outlen	= 38,
++	  	.input	= "Join us now and share the software "
++			  "Join us now and share the software ",
++		.output	= { 0xf3, 0xca, 0xcf, 0xcc, 0x53, 0x28, 0x2d, 0x56,
++			    0xc8, 0xcb, 0x2f, 0x57, 0x48, 0xcc, 0x4b, 0x51,
++			    0x28, 0xce, 0x48, 0x2c, 0x4a, 0x55, 0x28, 0xc9,
++			    0x48, 0x55, 0x28, 0xce, 0x4f, 0x2b, 0x29, 0x07,
++			    0x71, 0xbc, 0x08, 0x2b, 0x01, 0x00 },
++	}, {
++		.inlen	= 191,
++		.outlen	= 122,
++		.input	= "This document describes a compression method based on the DEFLATE"
++			  "compression algorithm.  This document defines the application of "
++			  "the DEFLATE algorithm to the IP Payload Compression Protocol.",
++		.output	= { 0x5d, 0x8d, 0x31, 0x0e, 0xc2, 0x30, 0x10, 0x04,
++			    0xbf, 0xb2, 0x2f, 0xc8, 0x1f, 0x10, 0x04, 0x09,
++			    0x89, 0xc2, 0x85, 0x3f, 0x70, 0xb1, 0x2f, 0xf8,
++			    0x24, 0xdb, 0x67, 0xd9, 0x47, 0xc1, 0xef, 0x49,
++			    0x68, 0x12, 0x51, 0xae, 0x76, 0x67, 0xd6, 0x27,
++			    0x19, 0x88, 0x1a, 0xde, 0x85, 0xab, 0x21, 0xf2,
++			    0x08, 0x5d, 0x16, 0x1e, 0x20, 0x04, 0x2d, 0xad,
++			    0xf3, 0x18, 0xa2, 0x15, 0x85, 0x2d, 0x69, 0xc4,
++			    0x42, 0x83, 0x23, 0xb6, 0x6c, 0x89, 0x71, 0x9b,
++			    0xef, 0xcf, 0x8b, 0x9f, 0xcf, 0x33, 0xca, 0x2f,
++			    0xed, 0x62, 0xa9, 0x4c, 0x80, 0xff, 0x13, 0xaf,
++			    0x52, 0x37, 0xed, 0x0e, 0x52, 0x6b, 0x59, 0x02,
++			    0xd9, 0x4e, 0xe8, 0x7a, 0x76, 0x1d, 0x02, 0x98,
++			    0xfe, 0x8a, 0x87, 0x83, 0xa3, 0x4f, 0x56, 0x8a,
++			    0xb8, 0x9e, 0x8e, 0x5c, 0x57, 0xd3, 0xa0, 0x79,
++			    0xfa, 0x02 },
+ 	},
+ };
+ 
+ struct comp_testvec deflate_decomp_tv_template[] = {
+ 	{
+-	  122, 191,
+-	  
+-	  { 0x5d, 0x8d, 0x31, 0x0e, 0xc2, 0x30, 0x10, 0x04,
+-	    0xbf, 0xb2, 0x2f, 0xc8, 0x1f, 0x10, 0x04, 0x09,
+-	    0x89, 0xc2, 0x85, 0x3f, 0x70, 0xb1, 0x2f, 0xf8,
+-	    0x24, 0xdb, 0x67, 0xd9, 0x47, 0xc1, 0xef, 0x49,
+-	    0x68, 0x12, 0x51, 0xae, 0x76, 0x67, 0xd6, 0x27,
+-	    0x19, 0x88, 0x1a, 0xde, 0x85, 0xab, 0x21, 0xf2,
+-	    0x08, 0x5d, 0x16, 0x1e, 0x20, 0x04, 0x2d, 0xad,
+-	    0xf3, 0x18, 0xa2, 0x15, 0x85, 0x2d, 0x69, 0xc4,
+-	    0x42, 0x83, 0x23, 0xb6, 0x6c, 0x89, 0x71, 0x9b,
+-	    0xef, 0xcf, 0x8b, 0x9f, 0xcf, 0x33, 0xca, 0x2f,
+-	    0xed, 0x62, 0xa9, 0x4c, 0x80, 0xff, 0x13, 0xaf,
+-	    0x52, 0x37, 0xed, 0x0e, 0x52, 0x6b, 0x59, 0x02,
+-	    0xd9, 0x4e, 0xe8, 0x7a, 0x76, 0x1d, 0x02, 0x98,
+-	    0xfe, 0x8a, 0x87, 0x83, 0xa3, 0x4f, 0x56, 0x8a,
+-	    0xb8, 0x9e, 0x8e, 0x5c, 0x57, 0xd3, 0xa0, 0x79,
+-	    0xfa, 0x02 },
+-	    
+-	    "This document describes a compression method based on the DEFLATE"
+-	    "compression algorithm.  This document defines the application of "
+-	    "the DEFLATE algorithm to the IP Payload Compression Protocol.",
+-	},
+-	
+-	{
+-	  38, 70,
+-	  
+-          { 0xf3, 0xca, 0xcf, 0xcc, 0x53, 0x28, 0x2d, 0x56,
+-            0xc8, 0xcb, 0x2f, 0x57, 0x48, 0xcc, 0x4b, 0x51,
+-            0x28, 0xce, 0x48, 0x2c, 0x4a, 0x55, 0x28, 0xc9,
+-            0x48, 0x55, 0x28, 0xce, 0x4f, 0x2b, 0x29, 0x07,
+-            0x71, 0xbc, 0x08, 0x2b, 0x01, 0x00
+-          },
+-          
+-          "Join us now and share the software "
+-	  "Join us now and share the software ",
++		.inlen	= 122,
++		.outlen	= 191,
++		.input	= { 0x5d, 0x8d, 0x31, 0x0e, 0xc2, 0x30, 0x10, 0x04,
++			    0xbf, 0xb2, 0x2f, 0xc8, 0x1f, 0x10, 0x04, 0x09,
++			    0x89, 0xc2, 0x85, 0x3f, 0x70, 0xb1, 0x2f, 0xf8,
++			    0x24, 0xdb, 0x67, 0xd9, 0x47, 0xc1, 0xef, 0x49,
++			    0x68, 0x12, 0x51, 0xae, 0x76, 0x67, 0xd6, 0x27,
++			    0x19, 0x88, 0x1a, 0xde, 0x85, 0xab, 0x21, 0xf2,
++			    0x08, 0x5d, 0x16, 0x1e, 0x20, 0x04, 0x2d, 0xad,
++			    0xf3, 0x18, 0xa2, 0x15, 0x85, 0x2d, 0x69, 0xc4,
++			    0x42, 0x83, 0x23, 0xb6, 0x6c, 0x89, 0x71, 0x9b,
++			    0xef, 0xcf, 0x8b, 0x9f, 0xcf, 0x33, 0xca, 0x2f,
++			    0xed, 0x62, 0xa9, 0x4c, 0x80, 0xff, 0x13, 0xaf,
++			    0x52, 0x37, 0xed, 0x0e, 0x52, 0x6b, 0x59, 0x02,
++			    0xd9, 0x4e, 0xe8, 0x7a, 0x76, 0x1d, 0x02, 0x98,
++			    0xfe, 0x8a, 0x87, 0x83, 0xa3, 0x4f, 0x56, 0x8a,
++			    0xb8, 0x9e, 0x8e, 0x5c, 0x57, 0xd3, 0xa0, 0x79,
++			    0xfa, 0x02 },
++		.output	= "This document describes a compression method based on the DEFLATE"
++			  "compression algorithm.  This document defines the application of "
++			  "the DEFLATE algorithm to the IP Payload Compression Protocol.",
++	}, {
++		.inlen	= 38,
++		.outlen	= 70,
++		.input	= { 0xf3, 0xca, 0xcf, 0xcc, 0x53, 0x28, 0x2d, 0x56,
++			    0xc8, 0xcb, 0x2f, 0x57, 0x48, 0xcc, 0x4b, 0x51,
++			    0x28, 0xce, 0x48, 0x2c, 0x4a, 0x55, 0x28, 0xc9,
++			    0x48, 0x55, 0x28, 0xce, 0x4f, 0x2b, 0x29, 0x07,
++			    0x71, 0xbc, 0x08, 0x2b, 0x01, 0x00 },
++		.output	= "Join us now and share the software "
++			  "Join us now and share the software ",
+ 	},
+ };
+ 
+--- linux-2.6.0/Documentation/block/biodoc.txt	2003-09-27 18:57:43.000000000 -0700
++++ 25/Documentation/block/biodoc.txt	2003-12-28 23:23:06.000000000 -0800
+@@ -323,7 +323,7 @@ involved. In the latter case, the driver
+ request->buffer, request->sector and request->nr_sectors or
+ request->current_nr_sectors fields itself rather than using the block layer
+ end_request or end_that_request_first completion interfaces.
+-(See 2.3 or Documentation/bio/request.txt for a brief explanation of
++(See 2.3 or Documentation/block/request.txt for a brief explanation of
+ the request structure fields)
+ 
+ [TBD: end_that_request_last should be usable even in this case;
+@@ -517,7 +517,7 @@ request structure.
+ Only some relevant fields (mainly those which changed or may be referred
+ to in some of the discussion here) are listed below, not necessarily in
+ the order in which they occur in the structure (see include/linux/blkdev.h)
+-Refer to Documentation/bio/request.txt for details about all the request
++Refer to Documentation/block/request.txt for details about all the request
+ structure fields and a quick reference about the layers which are
+ supposed to use or modify those fields.
+ 
+--- linux-2.6.0/Documentation/Changes	2003-10-08 15:07:08.000000000 -0700
++++ 25/Documentation/Changes	2003-12-28 23:22:28.000000000 -0800
+@@ -56,7 +56,7 @@ o  module-init-tools      0.9.10        
+ o  e2fsprogs              1.29                    # tune2fs
+ o  jfsutils               1.1.3                   # fsck.jfs -V
+ o  reiserfsprogs          3.6.3                   # reiserfsck -V 2>&1|grep reiserfsprogs
+-o  xfsprogs               2.1.0                   # xfs_db -V
++o  xfsprogs               2.6.0                   # xfs_db -V
+ o  pcmcia-cs              3.1.21                  # cardmgr -V
+ o  quota-tools            3.09                    # quota -V
+ o  PPP                    2.4.0                   # pppd --version
+@@ -183,9 +183,8 @@ Xfsprogs
+ The latest version of xfsprogs contains mkfs.xfs, xfs_db, and the
+ xfs_repair utilities, among others, for the XFS filesystem.  It is
+ architecture independent and any version from 2.0.0 onward should
+-work correctly with this version of the XFS kernel code.  For the new
+-(v2) log format that has better support for stripe-size aligning on
+-LVM and MD devices at least xfsprogs 2.1.0 is needed.
++work correctly with this version of the XFS kernel code (2.6.0 or
++later is recommended, due to some significant improvements).
+ 
+ 
+ Pcmcia-cs
+@@ -359,7 +358,7 @@ o  <http://www.namesys.com/pub/reiserfsp
+ 
+ Xfsprogs
+ --------
+-o  <ftp://oss.sgi.com/projects/xfs/download/cmd_tars/xfsprogs-2.1.0.src.tar.gz>
++o  <ftp://oss.sgi.com/projects/xfs/download/>
+ 
+ Pcmcia-cs
+ ---------
+--- linux-2.6.0/Documentation/DocBook/kernel-locking.tmpl	2003-09-27 18:57:43.000000000 -0700
++++ 25/Documentation/DocBook/kernel-locking.tmpl	2003-12-28 23:22:34.000000000 -0800
+@@ -6,8 +6,7 @@
+   
+   <authorgroup>
+    <author>
+-    <firstname>Paul</firstname>
+-    <othername>Rusty</othername>
++    <firstname>Rusty</firstname>
+     <surname>Russell</surname>
+     <affiliation>
+      <address>
+@@ -18,8 +17,8 @@
+   </authorgroup>
+ 
+   <copyright>
+-   <year>2000</year>
+-   <holder>Paul Russell</holder>
++   <year>2003</year>
++   <holder>Rusty Russell</holder>
+   </copyright>
+ 
+   <legalnotice>
+@@ -58,16 +57,17 @@
+    <para>
+      Welcome, to Rusty's Remarkably Unreliable Guide to Kernel
+      Locking issues.  This document describes the locking systems in
+-     the Linux Kernel as we approach 2.4.
++     the Linux Kernel in 2.6.
+    </para>
+    <para>
+-     It looks like <firstterm linkend="gloss-smp"><acronym>SMP</acronym>
+-     </firstterm> is here to stay; so everyone hacking on the kernel 
+-     these days needs to know the fundamentals of concurrency and locking 
+-     for SMP.
++     With the wide availability of HyperThreading, and <firstterm
++     linkend="gloss-preemption">preemption </firstterm> in the Linux
++     Kernel, everyone hacking on the kernel needs to know the
++     fundamentals of concurrency and locking for
++     <firstterm linkend="gloss-smp"><acronym>SMP</acronym></firstterm>.
+    </para>
+ 
+-   <sect1 id="races">
++   <chapter id="races">
+     <title>The Problem With Concurrency</title>
+     <para>
+       (Skip this if you know what a Race Condition is).
+@@ -169,15 +169,23 @@
+      </tgroup>
+     </table>
+ 
++    <sect1 id="race-condition">
++    <title>Race Conditions and Critical Regions</title>
+     <para>
+-      This overlap, where what actually happens depends on the
+-      relative timing of multiple tasks, is called a race condition.
++      This overlap, where the result depends on the
++      relative timing of multiple tasks, is called a <firstterm>race condition</firstterm>.
+       The piece of code containing the concurrency issue is called a
+-      critical region.  And especially since Linux starting running
++      <firstterm>critical region</firstterm>.  And especially since Linux starting running
+       on SMP machines, they became one of the major issues in kernel
+       design and implementation.
+     </para>
+     <para>
++      Preemption can have the same effect, even if there is only one
++      CPU: by preempting one task during the critical region, we have
++      exactly the same race condition.  In this case the thread which
++      preempts might run the critical region itself.
++    </para>
++    <para>
+       The solution is to recognize when these simultaneous accesses
+       occur, and use locks to make sure that only one instance can
+       enter the critical region at any time.  There are many
+@@ -185,10 +193,28 @@
+       And then there are the unfriendly primitives, but I'll pretend
+       they don't exist.
+     </para>
+-   </sect1>
+   </chapter>
+ 
+   <chapter id="locks">
++   <title>Locking in the Linux Kernel</title>
++
++   <para>
++     If I could give you one piece of advice: never sleep with anyone
++     crazier than yourself.  But if I had to give you advice on
++     locking: <emphasis>keep it simple</emphasis>.
++   </para>
++
++   <para>
++     Be reluctant to introduce new locks.
++   </para>
++
++   <para>
++     Strangely enough, this last one is the exact reverse of my advice when
++     you <emphasis>have</emphasis> slept with someone crazier than yourself.
++     And you should think about getting a big dog.
++   </para>
++
++   <sect1 id="lock-intro">
+    <title>Two Main Types of Kernel Locks: Spinlocks and Semaphores</title>
+ 
+    <para>
+@@ -213,23 +239,32 @@
+    </para>
+    <para>
+      Neither type of lock is recursive: see
+-     <xref linkend="techniques-deadlocks">.
++     <xref linkend="deadlock">.
+    </para>
++   </sect1>
+  
+    <sect1 id="uniprocessor">
+     <title>Locks and Uniprocessor Kernels</title>
+ 
+     <para>
+-      For kernels compiled without <symbol>CONFIG_SMP</symbol>, spinlocks 
+-      do not exist at all.  This is an excellent design decision: when
+-      no-one else can run at the same time, there is no reason to
+-      have a lock at all.
++      For kernels compiled without <symbol>CONFIG_SMP</symbol>, and
++      without <symbol>CONFIG_PREEMPT</symbol> spinlocks do not exist at
++      all.  This is an excellent design decision: when no-one else can
++      run at the same time, there is no reason to have a lock.
++    </para>
++
++    <para>
++      If the kernel is compiled without <symbol>CONFIG_SMP</symbol>,
++      but <symbol>CONFIG_PREEMPT</symbol> is set, then spinlocks
++      simply disable preemption, which is sufficient to prevent any
++      races.  For most purposes, we can think of preemption as
++      equivalent to SMP, and not worry about it separately.
+     </para>
+ 
+     <para>
+       You should always test your locking code with <symbol>CONFIG_SMP</symbol>
+-      enabled, even if you don't have an SMP test box, because it
+-      will still catch some (simple) kinds of deadlock.
++      and <symbol>CONFIG_PREEMPT</symbol> enabled, even if you don't have an SMP test box, because it
++      will still catch some kinds of locking bugs.
+     </para>
+ 
+     <para>
+@@ -239,25 +274,6 @@
+     </para>
+    </sect1>
+ 
+-   <sect1 id="rwlocks">
+-    <title>Read/Write Lock Variants</title>
+-
+-    <para>
+-      Both spinlocks and semaphores have read/write variants:
+-      <type>rwlock_t</type> and <structname>struct rw_semaphore</structname>. 
+-      These divide users into two classes: the readers and the writers.  If 
+-      you are only reading the data, you can get a read lock, but to write to 
+-      the data you need the write lock.  Many people can hold a read lock,
+-      but a writer must be sole holder.
+-    </para>
+-
+-    <para>
+-      This means much smoother locking if your code divides up
+-      neatly along reader/writer lines.  All the discussions below
+-      also apply to read/write variants.
+-    </para>
+-   </sect1>
+-
+     <sect1 id="usercontextlocking">
+      <title>Locking Only In User Context</title>
+ 
+@@ -289,17 +305,26 @@
+    </sect1>
+ 
+    <sect1 id="lock-user-bh">
+-    <title>Locking Between User Context and BHs</title>
++    <title>Locking Between User Context and Softirqs</title>
+ 
+     <para>
+-      If a <firstterm linkend="gloss-bh">bottom half</firstterm> shares 
++      If a <firstterm linkend="gloss-softirq">softirq</firstterm> shares
+       data with user context, you have two problems.  Firstly, the current 
+-      user context can be interrupted by a bottom half, and secondly, the 
++      user context can be interrupted by a softirq, and secondly, the
+       critical region could be entered from another CPU.  This is where
+       <function>spin_lock_bh()</function> 
+       (<filename class=headerfile>include/linux/spinlock.h</filename>) is 
+-      used.  It disables bottom halves on that CPU, then grabs the lock.
+-      <function>spin_unlock_bh()</function> does the reverse.
++      used.  It disables softirqs on that CPU, then grabs the lock.
++      <function>spin_unlock_bh()</function> does the reverse.  (The
++      '_bh' suffix is a historical reference to "Bottom Halves", the
++      old name for software interrupts.  It should really be
++      called spin_lock_softirq()' in a perfect world).
++    </para>
++
++    <para>
++      Note that you can also use <function>spin_lock_irq()</function>
++      or <function>spin_lock_irqsave()</function> here, which stop
++      hardware interrupts as well: see <xref linkend="hardirq-context">.
+     </para>
+ 
+     <para>
+@@ -307,70 +332,41 @@
+       </acronym></firstterm> as well: the spin lock vanishes, and this macro 
+       simply becomes <function>local_bh_disable()</function>
+       (<filename class=headerfile>include/linux/interrupt.h</filename>), which
+-      protects you from the bottom half being run.
++      protects you from the softirq being run.
+     </para>
+    </sect1>
+ 
+    <sect1 id="lock-user-tasklet">
+-    <title>Locking Between User Context and Tasklets/Soft IRQs</title>
++    <title>Locking Between User Context and Tasklets</title>
+ 
+     <para>
+-      This is exactly the same as above, because
+-      <function>local_bh_disable()</function> actually disables all 
+-      softirqs and <firstterm linkend="gloss-tasklet">tasklets</firstterm>
+-      on that CPU as well.  It should really be 
+-      called `local_softirq_disable()', but the name has been preserved 
+-      for historical reasons.  Similarly,
+-      <function>spin_lock_bh()</function> would now be called 
+-      spin_lock_softirq() in a perfect world.
++      This is exactly the same as above, because <firstterm
++      linkend="gloss-tasklet">tasklets</firstterm> are actually run
++      from a softirq.
+     </para>
+    </sect1>
+ 
+-   <sect1 id="lock-bh">
+-    <title>Locking Between Bottom Halves</title>
++   <sect1 id="lock-user-timers">
++    <title>Locking Between User Context and Timers</title>
+ 
+     <para>
+-      Sometimes a bottom half might want to share data with
+-      another bottom half (especially remember that timers are run
+-      off a bottom half).
++      This, too, is exactly the same as above, because <firstterm
++      linkend="gloss-timers">timers</firstterm> are actually run from
++      a softirq.  From a locking point of view, tasklets and timers
++      are identical.
+     </para>
+-
+-    <sect2 id="lock-bh-same">
+-     <title>The Same BH</title>
+-
+-     <para>
+-       Since a bottom half is never run on two CPUs at once, you
+-       don't need to worry about your bottom half being run twice
+-       at once, even on SMP.
+-     </para>
+-    </sect2>
+-
+-    <sect2 id="lock-bh-different">
+-     <title>Different BHs</title>
+-
+-     <para>
+-       Since only one bottom half ever runs at a time once, you
+-       don't need to worry about race conditions with other bottom
+-       halves.  Beware that things might change under you, however,
+-       if someone changes your bottom half to a tasklet.  If you
+-       want to make your code future-proof, pretend you're already
+-       running from a tasklet (see below), and doing the extra
+-       locking.  Of course, if it's five years before that happens,
+-       you're gonna look like a damn fool.
+-     </para>
+-    </sect2>
+    </sect1>
+ 
+    <sect1 id="lock-tasklets">
+-    <title>Locking Between Tasklets</title>
++    <title>Locking Between Tasklets/Timers</title>
+ 
+     <para>
+-      Sometimes a tasklet might want to share data with another
+-      tasklet, or a bottom half.
++      Sometimes a tasklet or timer might want to share data with
++      another tasklet or timer.
+     </para>
+ 
+     <sect2 id="lock-tasklets-same">
+-     <title>The Same Tasklet</title>
++     <title>The Same Tasklet/Timer</title>
+      <para>
+        Since a tasklet is never run on two CPUs at once, you don't
+        need to worry about your tasklet being reentrant (running
+@@ -379,10 +375,10 @@
+     </sect2>
+ 
+     <sect2 id="lock-tasklets-different">
+-     <title>Different Tasklets</title>
++     <title>Different Tasklets/Timers</title>
+      <para>
+-       If another tasklet (or bottom half, such as a timer) wants
+-       to share data with your tasklet, you will both need to use
++       If another tasklet/timer wants
++       to share data with your tasklet or timer , you will both need to use
+        <function>spin_lock()</function> and
+        <function>spin_unlock()</function> calls.  
+        <function>spin_lock_bh()</function> is
+@@ -396,8 +392,8 @@
+     <title>Locking Between Softirqs</title>
+ 
+     <para>
+-      Often a <firstterm linkend="gloss-softirq">softirq</firstterm> might 
+-      want to share data with itself, a tasklet, or a bottom half.
++      Often a softirq might
++      want to share data with itself or a tasklet/timer.
+     </para>
+ 
+     <sect2 id="lock-softirqs-same">
+@@ -421,10 +417,10 @@
+      <title>Different Softirqs</title>
+ 
+      <para>
+-       You'll need to use <function>spin_lock()</function> and 
+-       <function>spin_unlock()</function> for shared data, whether it 
+-       be a timer (which can be running on a different CPU), bottom half, 
+-       tasklet or the same or another softirq.
++       You'll need to use <function>spin_lock()</function> and
++       <function>spin_unlock()</function> for shared data, whether it
++       be a timer, tasklet, different softirq or the same or another
++       softirq: any of them could be running on a different CPU.
+      </para>
+     </sect2>
+    </sect1>
+@@ -434,13 +430,13 @@
+    <title>Hard IRQ Context</title>
+ 
+    <para>
+-     Hardware interrupts usually communicate with a bottom half,
++     Hardware interrupts usually communicate with a
+      tasklet or softirq.  Frequently this involves putting work in a
+-     queue, which the BH/softirq will take out.
++     queue, which the softirq will take out.
+    </para>
+ 
+    <sect1 id="hardirq-softirq">
+-    <title>Locking Between Hard IRQ and Softirqs/Tasklets/BHs</title>
++    <title>Locking Between Hard IRQ and Softirqs/Tasklets</title>
+ 
+     <para>
+       If a hardware irq handler shares data with a softirq, you have
+@@ -453,6 +449,16 @@
+     </para>
+ 
+     <para>
++      The irq handler does not to use
++      <function>spin_lock_irq()</function>, because the softirq cannot
++      run while the irq handler is running: it can use
++      <function>spin_lock()</function>, which is slightly faster.  The
++      only exception would be if a different hardware irq handler uses
++      the same lock: <function>spin_lock_irq()</function> will stop
++      that from interrupting us.
++    </para>
++
++    <para>
+       This works perfectly for UP as well: the spin lock vanishes,
+       and this macro simply becomes <function>local_irq_disable()</function>
+       (<filename class=headerfile>include/asm/smp.h</filename>), which 
+@@ -468,60 +474,766 @@
+       interrupts are already off) and in softirqs (where the irq
+       disabling is required).
+     </para>
++
++    <para>
++      Note that softirqs (and hence tasklets and timers) are run on
++      return from hardware interrupts, so
++      <function>spin_lock_irq()</function> also stops these.  In that
++      sense, <function>spin_lock_irqsave()</function> is the most
++      general and powerful locking function.
++    </para>
++
++   </sect1>
++   <sect1 id="hardirq-hardirq">
++    <title>Locking Between Two Hard IRQ Handlers</title>
++    <para>
++      It is rare to have to share data between two IRQ handlers, but
++      if you do, <function>spin_lock_irqsave()</function> should be
++      used: it is architecture-specific whether all interrupts are
++      disabled inside irq handlers themselves.
++    </para>
+    </sect1>
+-  </chapter>
+ 
+-  <chapter id="common-techniques">
+-   <title>Common Techniques</title>
++  </chapter>
+ 
++  <chapter id="cheatsheet">
++   <title>Cheat Sheet For Locking</title>
+    <para>
+-     This section lists some common dilemmas and the standard
+-     solutions used in the Linux kernel code.  If you use these,
+-     people will find your code simpler to understand.
++     Pete Zaitcev gives the following summary:
+    </para>
++   <itemizedlist>
++      <listitem>
++	<para>
++          If you are in a process context (any syscall) and want to
++	lock other process out, use a semaphore.  You can take a semaphore
++	and sleep (<function>copy_from_user*(</function> or
++	<function>kmalloc(x,GFP_KERNEL)</function>).
++      </para>
++      </listitem>
++      <listitem>
++	<para>
++	Otherwise (== data can be touched in an interrupt), use
++	<function>spin_lock_irqsave()</function> and
++	<function>spin_unlock_irqrestore()</function>.
++	</para>
++      </listitem>
++      <listitem>
++	<para>
++	Avoid holding spinlock for more than 5 lines of code and
++	across any function call (except accessors like
++	<function>readb</function>).
++	</para>
++      </listitem>
++    </itemizedlist>
+ 
+-   <para>
+-     If I could give you one piece of advice: never sleep with anyone
+-     crazier than yourself.  But if I had to give you advice on
+-     locking: <emphasis>keep it simple</emphasis>.
+-   </para>
++   <sect1 id="minimum-lock-reqirements">
++   <title>Table of Minimum Requirements</title>
+ 
+-   <para>
+-     Lock data, not code.
++   <para> The following table lists the <emphasis>minimum</emphasis>
++	locking requirements between various contexts.  In some cases,
++	the same context can only be running on one CPU at a time, so
++	no locking is required for that context (eg. a particular
++	thread can only run on one CPU at a time, but if it needs
++	shares data with another thread, locking is required).
+    </para>
+-
+    <para>
+-     Be reluctant to introduce new locks.
++	Remember the advice above: you can always use
++	<function>spin_lock_irqsave()</function>, which is a superset
++	of all other spinlock primitives.
+    </para>
++   <table>
++<title>Table of Locking Requirements</title>
++<TGROUP COLS=11>
++<TBODY>
++<ROW>
++<ENTRY></ENTRY>
++<ENTRY>IRQ Handler A</ENTRY>
++<ENTRY>IRQ Handler B</ENTRY>
++<ENTRY>Softirq A</ENTRY>
++<ENTRY>Softirq B</ENTRY>
++<ENTRY>Tasklet A</ENTRY>
++<ENTRY>Tasklet B</ENTRY>
++<ENTRY>Timer A</ENTRY>
++<ENTRY>Timer B</ENTRY>
++<ENTRY>User Context A</ENTRY>
++<ENTRY>User Context B</ENTRY>
++</ROW>
++
++<ROW>
++<ENTRY>IRQ Handler A</ENTRY>
++<ENTRY>None</ENTRY>
++</ROW>
++
++<ROW>
++<ENTRY>IRQ Handler B</ENTRY>
++<ENTRY>spin_lock_irqsave</ENTRY>
++<ENTRY>None</ENTRY>
++</ROW>
++
++<ROW>
++<ENTRY>Softirq A</ENTRY>
++<ENTRY>spin_lock_irq</ENTRY>
++<ENTRY>spin_lock_irq</ENTRY>
++<ENTRY>spin_lock</ENTRY>
++</ROW>
++
++<ROW>
++<ENTRY>Softirq B</ENTRY>
++<ENTRY>spin_lock_irq</ENTRY>
++<ENTRY>spin_lock_irq</ENTRY>
++<ENTRY>spin_lock</ENTRY>
++<ENTRY>spin_lock</ENTRY>
++</ROW>
++
++<ROW>
++<ENTRY>Tasklet A</ENTRY>
++<ENTRY>spin_lock_irq</ENTRY>
++<ENTRY>spin_lock_irq</ENTRY>
++<ENTRY>spin_lock</ENTRY>
++<ENTRY>spin_lock</ENTRY>
++<ENTRY>None</ENTRY>
++</ROW>
++
++<ROW>
++<ENTRY>Tasklet B</ENTRY>
++<ENTRY>spin_lock_irq</ENTRY>
++<ENTRY>spin_lock_irq</ENTRY>
++<ENTRY>spin_lock</ENTRY>
++<ENTRY>spin_lock</ENTRY>
++<ENTRY>spin_lock</ENTRY>
++<ENTRY>None</ENTRY>
++</ROW>
++
++<ROW>
++<ENTRY>Timer A</ENTRY>
++<ENTRY>spin_lock_irq</ENTRY>
++<ENTRY>spin_lock_irq</ENTRY>
++<ENTRY>spin_lock</ENTRY>
++<ENTRY>spin_lock</ENTRY>
++<ENTRY>spin_lock</ENTRY>
++<ENTRY>spin_lock</ENTRY>
++<ENTRY>None</ENTRY>
++</ROW>
++
++<ROW>
++<ENTRY>Timer B</ENTRY>
++<ENTRY>spin_lock_irq</ENTRY>
++<ENTRY>spin_lock_irq</ENTRY>
++<ENTRY>spin_lock</ENTRY>
++<ENTRY>spin_lock</ENTRY>
++<ENTRY>spin_lock</ENTRY>
++<ENTRY>spin_lock</ENTRY>
++<ENTRY>spin_lock</ENTRY>
++<ENTRY>None</ENTRY>
++</ROW>
++
++<ROW>
++<ENTRY>User Context A</ENTRY>
++<ENTRY>spin_lock_irq</ENTRY>
++<ENTRY>spin_lock_irq</ENTRY>
++<ENTRY>spin_lock_bh</ENTRY>
++<ENTRY>spin_lock_bh</ENTRY>
++<ENTRY>spin_lock_bh</ENTRY>
++<ENTRY>spin_lock_bh</ENTRY>
++<ENTRY>spin_lock_bh</ENTRY>
++<ENTRY>spin_lock_bh</ENTRY>
++<ENTRY>None</ENTRY>
++</ROW>
++
++<ROW>
++<ENTRY>User Context B</ENTRY>
++<ENTRY>spin_lock_irq</ENTRY>
++<ENTRY>spin_lock_irq</ENTRY>
++<ENTRY>spin_lock_bh</ENTRY>
++<ENTRY>spin_lock_bh</ENTRY>
++<ENTRY>spin_lock_bh</ENTRY>
++<ENTRY>spin_lock_bh</ENTRY>
++<ENTRY>spin_lock_bh</ENTRY>
++<ENTRY>spin_lock_bh</ENTRY>
++<ENTRY>down_interruptible</ENTRY>
++<ENTRY>None</ENTRY>
++</ROW>
++
++</TBODY>
++</TGROUP>
++</TABLE>
++</chapter>
++
++  <chapter id="Examples">
++   <title>Common Examples</title>
++    <para>
++Let's step through a simple example: a cache of number to name
++mappings.  The cache keeps a count of how often each of the objects is
++used, and when it gets full, throws out the least used one.
++
++    </para>
++
++   <sect1 id="examples-usercontext">
++    <title>All In User Context</title>
++    <para>
++For our first example, we assume that all operations are in user
++context (ie. from system calls), so we can sleep.  This means we can
++use a semaphore to protect the cache and all the objects within
++it.  Here's the code:
++    </para>
+ 
+-   <para>
+-     Strangely enough, this is the exact reverse of my advice when
+-     you <emphasis>have</emphasis> slept with someone crazier than yourself.
+-   </para>
++    <programlisting>
++#include &lt;linux/list.h&gt;
++#include &lt;linux/slab.h&gt;
++#include &lt;linux/string.h&gt;
++#include &lt;asm/semaphore.h&gt;
++#include &lt;asm/errno.h&gt;
++
++struct object
++{
++        struct list_head list;
++        int id;
++        char name[32];
++        int popularity;
++};
++
++/* Protects the cache, cache_num, and the objects within it */
++static DECLARE_MUTEX(cache_lock);
++static LIST_HEAD(cache);
++static unsigned int cache_num = 0;
++#define MAX_CACHE_SIZE 10
++
++/* Must be holding cache_lock */
++static struct object *__cache_find(int id)
++{
++        struct object *i;
++
++        list_for_each_entry(i, &amp;cache, list)
++                if (i-&gt;id == id) {
++                        i-&gt;popularity++;
++                        return i;
++                }
++        return NULL;
++}
+ 
+-   <sect1 id="techniques-no-writers">
+-    <title>No Writers in Interrupt Context</title>
++/* Must be holding cache_lock */
++static void __cache_delete(struct object *obj)
++{
++        BUG_ON(!obj);
++        list_del(&amp;obj-&gt;list);
++        kfree(obj);
++        cache_num--;
++}
++
++/* Must be holding cache_lock */
++static void __cache_add(struct object *obj)
++{
++        list_add(&amp;obj-&gt;list, &amp;cache);
++        if (++cache_num > MAX_CACHE_SIZE) {
++                struct object *i, *outcast = NULL;
++                list_for_each_entry(i, &amp;cache, list) {
++                        if (!outcast || i-&gt;popularity &lt; outcast-&gt;popularity)
++                                outcast = i;
++                }
++                __cache_delete(outcast);
++        }
++}
+ 
+-    <para>
+-      There is a fairly common case where an interrupt handler needs
+-      access to a critical region, but does not need write access.
+-      In this case, you do not need to use
+-      <function>read_lock_irq()</function>, but only
+-      <function>read_lock()</function> everywhere (since if an interrupt 
+-      occurs, the irq handler will only try to grab a read lock, which 
+-      won't deadlock).  You will still need to use 
+-      <function>write_lock_irq()</function>.
++int cache_add(int id, const char *name)
++{
++        struct object *obj;
++
++        if ((obj = kmalloc(sizeof(*obj), GFP_KERNEL)) == NULL)
++                return -ENOMEM;
++
++        strlcpy(obj-&gt;name, name, sizeof(obj-&gt;name));
++        obj-&gt;id = id;
++        obj-&gt;popularity = 0;
++
++        down(&amp;cache_lock);
++        __cache_add(obj);
++        up(&amp;cache_lock);
++        return 0;
++}
++
++void cache_delete(int id)
++{
++        down(&amp;cache_lock);
++        __cache_delete(__cache_find(id));
++        up(&amp;cache_lock);
++}
++
++int cache_find(int id, char *name)
++{
++        struct object *obj;
++        int ret = -ENOENT;
++
++        down(&amp;cache_lock);
++        obj = __cache_find(id);
++        if (obj) {
++                ret = 0;
++                strcpy(name, obj-&gt;name);
++        }
++        up(&amp;cache_lock);
++        return ret;
++}
++</programlisting>
++
++    <para>
++Note that we always make sure we have the cache_lock when we add,
++delete, or look up the cache: both the cache infrastructure itself and
++the contents of the objects are protected by the lock.  In this case
++it's easy, since we copy the data for the user, and never let them
++access the objects directly.
++    </para>
++    <para>
++There is a slight (and common) optimization here: in
++<function>cache_add</function> we set up the fields of the object
++before grabbing the lock.  This is safe, as no-one else can access it
++until we put it in cache.
++    </para>
++    </sect1>
++
++   <sect1 id="examples-interrupt">
++    <title>Accessing From Interrupt Context</title>
++    <para>
++Now consider the case where <function>cache_find</function> can be
++called from interrupt context: either a hardware interrupt or a
++softirq.  An example would be a timer which deletes object from the
++cache.
++    </para>
++    <para>
++The change is shown below, in standard patch format: the
++<symbol>-</symbol> are lines which are taken away, and the
++<symbol>+</symbol> are lines which are added.
++    </para>
++<programlisting>
++--- cache.c.usercontext	2003-12-09 13:58:54.000000000 +1100
+++++ cache.c.interrupt	2003-12-09 14:07:49.000000000 +1100
++@@ -12,7 +12,7 @@
++         int popularity;
++ };
++
++-static DECLARE_MUTEX(cache_lock);
+++static spinlock_t cache_lock = SPIN_LOCK_UNLOCKED;
++ static LIST_HEAD(cache);
++ static unsigned int cache_num = 0;
++ #define MAX_CACHE_SIZE 10
++@@ -55,6 +55,7 @@
++ int cache_add(int id, const char *name)
++ {
++         struct object *obj;
+++        unsigned long flags;
++
++         if ((obj = kmalloc(sizeof(*obj), GFP_KERNEL)) == NULL)
++                 return -ENOMEM;
++@@ -63,30 +64,33 @@
++         obj-&gt;id = id;
++         obj-&gt;popularity = 0;
++
++-        down(&amp;cache_lock);
+++        spin_lock_irqsave(&amp;cache_lock, flags);
++         __cache_add(obj);
++-        up(&amp;cache_lock);
+++        spin_unlock_irqrestore(&amp;cache_lock, flags);
++         return 0;
++ }
++
++ void cache_delete(int id)
++ {
++-        down(&amp;cache_lock);
+++        unsigned long flags;
+++
+++        spin_lock_irqsave(&amp;cache_lock, flags);
++         __cache_delete(__cache_find(id));
++-        up(&amp;cache_lock);
+++        spin_unlock_irqrestore(&amp;cache_lock, flags);
++ }
++
++ int cache_find(int id, char *name)
++ {
++         struct object *obj;
++         int ret = -ENOENT;
+++        unsigned long flags;
++
++-        down(&amp;cache_lock);
+++        spin_lock_irqsave(&amp;cache_lock, flags);
++         obj = __cache_find(id);
++         if (obj) {
++                 ret = 0;
++                 strcpy(name, obj-&gt;name);
++         }
++-        up(&amp;cache_lock);
+++        spin_unlock_irqrestore(&amp;cache_lock, flags);
++         return ret;
++ }
++</programlisting>
++
++    <para>
++Note that the <function>spin_lock_irqsave</function> will turn off
++interrupts if they are on, otherwise does nothing (if we are already
++in an interrupt handler), hence these functions are safe to call from
++any context.
++    </para>
++    <para>
++Unfortunately, <function>cache_add</function> calls
++<function>kmalloc</function> with the <symbol>GFP_KERNEL</symbol>
++flag, which is only legal in user context.  I have assumed that
++<function>cache_add</function> is still only called in user context,
++otherwise this should become a parameter to
++<function>cache_add</function>.
++    </para>
++  </sect1>
++   <sect1 id="examples-refcnt">
++    <title>Exposing Objects Outside This File</title>
++    <para>
++If our objects contained more information, it might not be sufficient
++to copy the information in and out: other parts of the code might want
++to keep pointers to these objects, for example, rather than looking up
++the id every time.  This produces two problems.
++    </para>
++    <para>
++The first problem is that we use the <symbol>cache_lock</symbol> to
++protect objects: we'd need to make this non-static so the rest of the
++code can use it.  This makes locking trickier, as it is no longer all
++in one place.
++    </para>
++    <para>
++The second problem is the lifetime problem: if another structure keeps
++a pointer to an object, it presumably expects that pointer to remain
++valid.  Unfortunately, this is only guaranteed while you hold the
++lock, otherwise someone might call <function>cache_delete</function>
++and even worse, add another object, re-using the same address.
++    </para>
++    <para>
++As there is only one lock, you can't hold it forever: no-one else would
++get any work done.
++    </para>
++    <para>
++The solution to this problem is to use a reference count: everyone who
++has a pointer to the object increases it when they first get the
++object, and drops the reference count when they're finished with it.
++Whoever drops it to zero knows it is unused, and can actually delete it.
++    </para>
++    <para>
++Here is the code:
++    </para>
++
++<programlisting>
++--- cache.c.interrupt	2003-12-09 14:25:43.000000000 +1100
+++++ cache.c.refcnt	2003-12-09 14:33:05.000000000 +1100
++@@ -7,6 +7,7 @@
++ struct object
++ {
++         struct list_head list;
+++        unsigned int refcnt;
++         int id;
++         char name[32];
++         int popularity;
++@@ -17,6 +18,35 @@
++ static unsigned int cache_num = 0;
++ #define MAX_CACHE_SIZE 10
++
+++static void __object_put(struct object *obj)
+++{
+++        if (--obj-&gt;refcnt == 0)
+++                kfree(obj);
+++}
+++
+++static void __object_get(struct object *obj)
+++{
+++        obj-&gt;refcnt++;
+++}
+++
+++void object_put(struct object *obj)
+++{
+++        unsigned long flags;
+++
+++        spin_lock_irqsave(&amp;cache_lock, flags);
+++        __object_put(obj);
+++        spin_unlock_irqrestore(&amp;cache_lock, flags);
+++}
+++
+++void object_get(struct object *obj)
+++{
+++        unsigned long flags;
+++
+++        spin_lock_irqsave(&amp;cache_lock, flags);
+++        __object_get(obj);
+++        spin_unlock_irqrestore(&amp;cache_lock, flags);
+++}
+++
++ /* Must be holding cache_lock */
++ static struct object *__cache_find(int id)
++ {
++@@ -35,6 +65,7 @@
++ {
++         BUG_ON(!obj);
++         list_del(&amp;obj-&gt;list);
+++        __object_put(obj);
++         cache_num--;
++ }
++
++@@ -63,6 +94,7 @@
++         strlcpy(obj-&gt;name, name, sizeof(obj-&gt;name));
++         obj-&gt;id = id;
++         obj-&gt;popularity = 0;
+++        obj-&gt;refcnt = 1; /* The cache holds a reference */
++
++         spin_lock_irqsave(&amp;cache_lock, flags);
++         __cache_add(obj);
++@@ -79,18 +111,15 @@
++         spin_unlock_irqrestore(&amp;cache_lock, flags);
++ }
++
++-int cache_find(int id, char *name)
+++struct object *cache_find(int id)
++ {
++         struct object *obj;
++-        int ret = -ENOENT;
++         unsigned long flags;
++
++         spin_lock_irqsave(&amp;cache_lock, flags);
++         obj = __cache_find(id);
++-        if (obj) {
++-                ret = 0;
++-                strcpy(name, obj-&gt;name);
++-        }
+++        if (obj)
+++                __object_get(obj);
++         spin_unlock_irqrestore(&amp;cache_lock, flags);
++-        return ret;
+++        return obj;
++ }
++</programlisting>
++
++<para>
++We encapsulate the reference counting in the standard 'get' and 'put'
++functions.  Now we can return the object itself from
++<function>cache_find</function> which has the advantage that the user
++can now sleep holding the object (eg. to
++<function>copy_to_user</function> to name to userspace).
++</para>
++<para>
++The other point to note is that I said a reference should be held for
++every pointer to the object: thus the reference count is 1 when first
++inserted into the cache.  In some versions the framework does not hold
++a reference count, but they are more complicated.
++</para>
++
++   <sect2 id="examples-refcnt-atomic">
++    <title>Using Atomic Operations For The Reference Count</title>
++<para>
++In practice, <type>atomic_t</type> would usually be used for
++<structfield>refcnt</structfield>.  There are a number of atomic
++operations defined in
++
++<filename class=headerfile>include/asm/atomic.h</filename>: these are
++guaranteed to be seen atomically from all CPUs in the system, so no
++lock is required.  In this case, it is simpler than using spinlocks,
++although for anything non-trivial using spinlocks is clearer.  The
++<function>atomic_inc</function> and
++<function>atomic_dec_and_test</function> are used instead of the
++standard increment and decrement operators, and the lock is no longer
++used to protect the reference count itself.
++</para>
++
++<programlisting>
++--- cache.c.refcnt	2003-12-09 15:00:35.000000000 +1100
+++++ cache.c.refcnt-atomic	2003-12-11 15:49:42.000000000 +1100
++@@ -7,7 +7,7 @@
++ struct object
++ {
++         struct list_head list;
++-        unsigned int refcnt;
+++        atomic_t refcnt;
++         int id;
++         char name[32];
++         int popularity;
++@@ -18,33 +18,15 @@
++ static unsigned int cache_num = 0;
++ #define MAX_CACHE_SIZE 10
++
++-static void __object_put(struct object *obj)
++-{
++-        if (--obj-&gt;refcnt == 0)
++-                kfree(obj);
++-}
++-
++-static void __object_get(struct object *obj)
++-{
++-        obj-&gt;refcnt++;
++-}
++-
++ void object_put(struct object *obj)
++ {
++-        unsigned long flags;
++-
++-        spin_lock_irqsave(&amp;cache_lock, flags);
++-        __object_put(obj);
++-        spin_unlock_irqrestore(&amp;cache_lock, flags);
+++        if (atomic_dec_and_test(&amp;obj-&gt;refcnt))
+++                kfree(obj);
++ }
++
++ void object_get(struct object *obj)
++ {
++-        unsigned long flags;
++-
++-        spin_lock_irqsave(&amp;cache_lock, flags);
++-        __object_get(obj);
++-        spin_unlock_irqrestore(&amp;cache_lock, flags);
+++        atomic_inc(&amp;obj-&gt;refcnt);
++ }
++
++ /* Must be holding cache_lock */
++@@ -65,7 +47,7 @@
++ {
++         BUG_ON(!obj);
++         list_del(&amp;obj-&gt;list);
++-        __object_put(obj);
+++        object_put(obj);
++         cache_num--;
++ }
++
++@@ -94,7 +76,7 @@
++         strlcpy(obj-&gt;name, name, sizeof(obj-&gt;name));
++         obj-&gt;id = id;
++         obj-&gt;popularity = 0;
++-        obj-&gt;refcnt = 1; /* The cache holds a reference */
+++        atomic_set(&amp;obj-&gt;refcnt, 1); /* The cache holds a reference */
++
++         spin_lock_irqsave(&amp;cache_lock, flags);
++         __cache_add(obj);
++@@ -119,7 +101,7 @@
++         spin_lock_irqsave(&amp;cache_lock, flags);
++         obj = __cache_find(id);
++         if (obj)
++-                __object_get(obj);
+++                object_get(obj);
++         spin_unlock_irqrestore(&amp;cache_lock, flags);
++         return obj;
++ }
++</programlisting>
++</sect1>
++
++   <sect1 id="examples-lock-per-obj">
++    <title>Protecting The Objects Themselves</title>
++    <para>
++In these examples, we assumed that the objects (except the reference
++counts) never changed once they are created.  If we wanted to allow
++the name to change, there are three possibilities:
+     </para>
++    <itemizedlist>
++      <listitem>
++	<para>
++You can make <symbol>cache_lock</symbol> non-static, and tell people
++to grab that lock before changing the name in any object.
++        </para>
++      </listitem>
++      <listitem>
++        <para>
++You can provide a <function>cache_obj_rename</function> which grabs
++this lock and changes the name for the caller, and tell everyone to
++use that function.
++        </para>
++      </listitem>
++      <listitem>
++        <para>
++You can make the <symbol>cache_lock</symbol> protect only the cache
++itself, and use another lock to protect the name.
++        </para>
++      </listitem>
++    </itemizedlist>
+ 
+-    <para>
+-      Similar logic applies to locking between softirqs/tasklets/BHs
+-      which never need a write lock, and user context: 
+-      <function>read_lock()</function> and
+-      <function>write_lock_bh()</function>.
+-    </para>
+-   </sect1>
++      <para>
++Theoretically, you can make the locks as fine-grained as one lock for
++every field, for every object.  In practice, the most common variants
++are:
++</para>
++    <itemizedlist>
++      <listitem>
++	<para>
++One lock which protects the infrastructure (the <symbol>cache</symbol>
++list in this example) and all the objects.  This is what we have done
++so far.
++	</para>
++      </listitem>
++      <listitem>
++        <para>
++One lock which protects the infrastructure (including the list
++pointers inside the objects), and one lock inside the object which
++protects the rest of that object.
++        </para>
++      </listitem>
++      <listitem>
++        <para>
++Multiple locks to protect the infrastructure (eg. one lock per hash
++chain), possibly with a separate per-object lock.
++        </para>
++      </listitem>
++    </itemizedlist>
+ 
+-   <sect1 id="techniques-deadlocks">
++<para>
++Here is the "lock-per-object" implementation:
++</para>
++<programlisting>
++--- cache.c.refcnt-atomic	2003-12-11 15:50:54.000000000 +1100
+++++ cache.c.perobjectlock	2003-12-11 17:15:03.000000000 +1100
++@@ -6,11 +6,17 @@
++
++ struct object
++ {
+++        /* These two protected by cache_lock. */
++         struct list_head list;
+++        int popularity;
+++
++         atomic_t refcnt;
+++
+++        /* Doesn't change once created. */
++         int id;
+++
+++        spinlock_t lock; /* Protects the name */
++         char name[32];
++-        int popularity;
++ };
++
++ static spinlock_t cache_lock = SPIN_LOCK_UNLOCKED;
++@@ -77,6 +84,7 @@
++         obj-&gt;id = id;
++         obj-&gt;popularity = 0;
++         atomic_set(&amp;obj-&gt;refcnt, 1); /* The cache holds a reference */
+++        spin_lock_init(&amp;obj-&gt;lock);
++
++         spin_lock_irqsave(&amp;cache_lock, flags);
++         __cache_add(obj);
++</programlisting>
++
++<para>
++Note that I decide that the <structfield>popularity</structfield>
++count should be protected by the <symbol>cache_lock</symbol> rather
++than the per-object lock: this is because it (like the
++<structname>struct list_head</structname> inside the object) is
++logically part of the infrastructure.  This way, I don't need to grab
++the lock of every object in <function>__cache_add</function> when
++seeking the least popular.
++</para>
++
++<para>
++I also decided that the <structfield>id</structfield> member is
++unchangeable, so I don't need to grab each object lock in
++<function>__cache_find()</function> to examine the
++<structfield>id</structfield>: the object lock is only used by a
++caller who wants to read or write the <structfield>name</structfield>
++field.
++</para>
++
++<para>
++Note also that I added a comment describing what data was protected by
++which locks.  This is extremely important, as it describes the runtime
++behavior of the code, and can be hard to gain from just reading.  And
++as Alan Cox says, <quote>Lock data, not code</quote>.
++</para>
++</chapter>
++
++   <chapter id="common-problems">
++    <title>Common Problems</title>
++    <sect1 id="deadlock">
+     <title>Deadlock: Simple and Advanced</title>
+ 
+     <para>
+@@ -535,10 +1247,10 @@
+ 
+     <para>
+       For a slightly more complex case, imagine you have a region
+-      shared by a bottom half and user context.  If you use a
++      shared by a softirq and user context.  If you use a
+       <function>spin_lock()</function> call to protect it, it is 
+-      possible that the user context will be interrupted by the bottom 
+-      half while it holds the lock, and the bottom half will then spin 
++      possible that the user context will be interrupted by the softirq
++      while it holds the lock, and the softirq will then spin
+       forever trying to get the same lock.
+     </para>
+ 
+@@ -558,7 +1270,7 @@
+     </para>
+ 
+     <para>
+-      A more complex problem is the so-called `deadly embrace',
++      A more complex problem is the so-called 'deadly embrace',
+       involving two or more locks.  Say you have a hash table: each
+       entry in the table is a spinlock, and a chain of hashed
+       objects.  Inside a softirq handler, you sometimes want to
+@@ -606,7 +1318,7 @@
+       their lock.  It will look, smell, and feel like a crash.
+     </para>
+ 
+-    <sect2 id="techs-deadlock-prevent">
++    <sect1 id="techs-deadlock-prevent">
+      <title>Preventing Deadlock</title>
+ 
+      <para>
+@@ -634,7 +1346,6 @@
+        will do?).  Remember, the other programmers are out to get
+        you, so don't do this.
+      </para>
+-    </sect2>
+ 
+     <sect2 id="techs-deadlock-overprevent">
+      <title>Overzealous Prevention Of Deadlocks</title>
+@@ -650,266 +1361,481 @@
+        If you don't see why, please stay the fuck away from my code.
+      </para>
+     </sect2>
+-   </sect1>
++    </sect1>
+ 
+-   <sect1 id="per-cpu">
+-    <title>Per-CPU Data</title>
+-      
+-    <para>
+-      A great technique for avoiding locking which is used fairly
+-      widely is to duplicate information for each CPU.  For example,
+-      if you wanted to keep a count of a common condition, you could
+-      use a spin lock and a single counter.  Nice and simple.
+-    </para>
++   <sect1 id="racing-timers">
++    <title>Racing Timers: A Kernel Pastime</title>
+ 
+     <para>
+-      If that was too slow [it's probably not], you could instead
+-      use a counter for each CPU [don't], then none of them need an
+-      exclusive lock [you're wasting your time here].  To make sure
+-      the CPUs don't have to synchronize caches all the time, align
+-      the counters to cache boundaries by appending
+-      `__cacheline_aligned' to the declaration
+-      (<filename class=headerfile>include/linux/cache.h</filename>). 
+-      [Can't you think of anything better to do?]
++      Timers can produce their own special problems with races.
++      Consider a collection of objects (list, hash, etc) where each
++      object has a timer which is due to destroy it.
+     </para>
+ 
+     <para>
+-      They will need a read lock to access their own counters,
+-      however.  That way you can use a write lock to grant exclusive
+-      access to all of them at once, to tally them up.
++      If you want to destroy the entire collection (say on module
++      removal), you might do the following:
+     </para>
+-   </sect1>
+ 
+-   <sect1 id="brlock">
+-    <title>Big Reader Locks</title>
++    <programlisting>
++        /* THIS CODE BAD BAD BAD BAD: IF IT WAS ANY WORSE IT WOULD USE
++           HUNGARIAN NOTATION */
++        spin_lock_bh(&amp;list_lock);
+ 
+-    <para>
+-      A classic example of per-CPU information is Ingo's `big
+-      reader' locks 
+-      (<filename class=headerfile>linux/include/brlock.h</filename>).  These 
+-      use the Per-CPU Data techniques described above to create a lock which 
+-      is very fast to get a read lock, but agonizingly slow for a write
+-      lock.
+-    </para>
++        while (list) {
++                struct foo *next = list-&gt;next;
++                del_timer(&amp;list-&gt;timer);
++                kfree(list);
++                list = next;
++        }
++
++        spin_unlock_bh(&amp;list_lock);
++    </programlisting>
+ 
+     <para>
+-      Fortunately, there are a limited number of these locks
+-      available: you have to go through a strict interview process
+-      to get one.
++      Sooner or later, this will crash on SMP, because a timer can
++      have just gone off before the <function>spin_lock_bh()</function>,
++      and it will only get the lock after we
++      <function>spin_unlock_bh()</function>, and then try to free
++      the element (which has already been freed!).
+     </para>
+-   </sect1>
+-
+-   <sect1 id="lock-avoidance-rw">
+-    <title>Avoiding Locks: Read And Write Ordering</title>
+ 
+     <para>
+-      Sometimes it is possible to avoid locking.  Consider the
+-      following case from the 2.2 firewall code, which inserted an
+-      element into a single linked list in user context:
++      This can be avoided by checking the result of
++      <function>del_timer()</function>: if it returns
++      <returnvalue>1</returnvalue>, the timer has been deleted.
++      If <returnvalue>0</returnvalue>, it means (in this
++      case) that it is currently running, so we can do:
+     </para>
+ 
+     <programlisting>
+-        new-&gt;next = i-&gt;next;
+-        i-&gt;next = new;
+-    </programlisting>
++        retry:
++                spin_lock_bh(&amp;list_lock);
+ 
+-    <para>
+-      Here the author (Alan Cox, who knows what he's doing) assumes
+-      that the pointer assignments are atomic.  This is important,
+-      because networking packets would traverse this list on bottom
+-      halves without a lock.  Depending on their exact timing, they
+-      would either see the new element in the list with a valid 
+-      <structfield>next</structfield> pointer, or it would not be in the 
+-      list yet.  A lock is still required against other CPUs inserting
+-      or deleting from the list, of course.
+-    </para>
++                while (list) {
++                        struct foo *next = list-&gt;next;
++                        if (!del_timer(&amp;list-&gt;timer)) {
++                                /* Give timer a chance to delete this */
++                                spin_unlock_bh(&amp;list_lock);
++                                goto retry;
++                        }
++                        kfree(list);
++                        list = next;
++                }
+ 
+-    <para>
+-      Of course, the writes <emphasis>must</emphasis> be in this
+-      order, otherwise the new element appears in the list with an
+-      invalid <structfield>next</structfield> pointer, and any other 
+-      CPU iterating at the wrong time will jump through it into garbage.  
+-      Because modern CPUs reorder, Alan's code actually read as follows:
+-    </para>
+-      
+-    <programlisting>
+-        new-&gt;next = i-&gt;next;
+-        wmb();
+-        i-&gt;next = new;
++                spin_unlock_bh(&amp;list_lock);
+     </programlisting>
+ 
+     <para>
+-      The <function>wmb()</function> is a write memory barrier 
+-      (<filename class=headerfile>include/asm/system.h</filename>): neither 
+-      the compiler nor the CPU will allow any writes to memory after the 
+-      <function>wmb()</function> to be visible to other hardware
+-      before any of the writes before the <function>wmb()</function>.
++      Another common problem is deleting timers which restart
++      themselves (by calling <function>add_timer()</function> at the end
++      of their timer function).  Because this is a fairly common case
++      which is prone to races, you should use <function>del_timer_sync()</function>
++      (<filename class=headerfile>include/linux/timer.h</filename>)
++      to handle this case.  It returns the number of times the timer
++      had to be deleted before we finally stopped it from adding itself back
++      in.
+     </para>
++   </sect1>
+ 
+-    <para>
+-      As i386 does not do write reordering, this bug would never
+-      show up on that platform.  On other SMP platforms, however, it
+-      will.
+-    </para>
++   <sect1 id="sparc">
++    <title>The Fucked Up Sparc</title>
+ 
+     <para>
+-      There is also <function>rmb()</function> for read ordering: to ensure 
+-      any previous variable reads occur before following reads.  The simple
+-      <function>mb()</function> macro combines both 
+-      <function>rmb()</function> and <function>wmb()</function>.
++      Alan Cox says <quote>the irq disable/enable is in the register
++      window on a sparc</quote>.  Andi Kleen says <quote>when you do
++      restore_flags in a different function you mess up all the
++      register windows</quote>.
+     </para>
+ 
+     <para>
+-      Some atomic operations are defined to act as a memory barrier
+-      (ie. as per the <function>mb()</function> macro, but if in
+-      doubt, be explicit.
+-      <!-- Rusty Russell 2 May 2001, 2.4.4 -->
+-      Also,
+-      spinlock operations act as partial barriers: operations after
+-      gaining a spinlock will never be moved to precede the
+-      <function>spin_lock()</function> call, and operations before
+-      releasing a spinlock will never be moved after the
+-      <function>spin_unlock()</function> call.
+-      <!-- Manfred Spraul <manfreds@colorfullife.com>
+-           24 May 2000 2.3.99-pre9 -->
++      So never pass the flags word set by
++      <function>spin_lock_irqsave()</function> and brethren to another
++      function (unless it's declared <type>inline</type>).  Usually no-one
++      does this, but now you've been warned.  Dave Miller can never do
++      anything in a straightforward manner (I can say that, because I have
++      pictures of him and a certain PowerPC maintainer in a compromising
++      position).
+     </para>
+    </sect1>
+ 
+-   <sect1 id="lock-avoidance-atomic-ops">
+-    <title>Avoiding Locks: Atomic Operations</title>
++  </chapter>
++
++ <chapter id="Efficiency">
++    <title>Locking Speed</title>
+ 
+     <para>
+-      There are a number of atomic operations defined in
+-      <filename class=headerfile>include/asm/atomic.h</filename>: these 
+-      are guaranteed to be seen atomically from all CPUs in the system, thus 
+-      avoiding races. If your shared data consists of a single counter, say, 
+-      these operations might be simpler than using spinlocks (although for
+-      anything non-trivial using spinlocks is clearer).
++There are three main things to worry about when considering speed of
++some code which does locking.  First is concurrency: how many things
++are going to be waiting while someone else is holding a lock.  Second
++is the time taken to actually acquire and release an uncontended lock.
++Third is using fewer, or smarter locks.  I'm assuming that the lock is
++used fairly often: otherwise, you wouldn't be concerned about
++efficiency.
++</para>
++    <para>
++Concurrency depends on how long the lock is usually held: you should
++hold the lock for as long as needed, but no longer.  In the cache
++example, we always create the object without the lock held, and then
++grab the lock only when we are ready to insert it in the list.
++</para>
++    <para>
++Acquisition times depend on how much damage the lock operations do to
++the pipeline (pipeline stalls) and how likely it is that this CPU was
++the last one to grab the lock (ie. is the lock cache-hot for this
++CPU): on a machine with more CPUs, this likelihood drops fast.
++Consider a 700MHz Intel Pentium III: an instruction takes about 0.7ns,
++an atomic increment takes about 58ns, a lock which is cache-hot on
++this CPU takes 160ns, and a cacheline transfer from another CPU takes
++an additional 170 to 360ns.  (These figures from Paul McKenney's
++<ulink url="http://www.linuxjournal.com/article.php?sid=6993"> Linux
++Journal RCU article</ulink>).
++</para>
++    <para>
++These two aims conflict: holding a lock for a short time might be done
++by splitting locks into parts (such as in our final per-object-lock
++example), but this increases the number of lock acquisitions, and the
++results are often slower than having a single lock.  This is another
++reason to advocate locking simplicity.
++</para>
++    <para>
++The third concern is addressed below: there are some methods to reduce
++the amount of locking which needs to be done.
++</para>
++
++  <sect1 id="efficiency-rwlocks">
++   <title>Read/Write Lock Variants</title>
++
++   <para>
++      Both spinlocks and semaphores have read/write variants:
++      <type>rwlock_t</type> and <structname>struct rw_semaphore</structname>.
++      These divide users into two classes: the readers and the writers.  If
++      you are only reading the data, you can get a read lock, but to write to
++      the data you need the write lock.  Many people can hold a read lock,
++      but a writer must be sole holder.
+     </para>
+ 
+-    <para>
+-      Note that the atomic operations do in general not act as memory
+-      barriers. Instead you can insert a memory barrier before or
+-      after <function>atomic_inc()</function> or
+-      <function>atomic_dec()</function> by inserting
+-      <function>smp_mb__before_atomic_inc()</function>,
+-      <function>smp_mb__after_atomic_inc()</function>,
+-      <function>smp_mb__before_atomic_dec()</function> or
+-      <function>smp_mb__after_atomic_dec()</function>
+-      respectively. The advantage of using those macros instead of
+-      <function>smp_mb()</function> is, that they are cheaper on some
+-      platforms.    
+-      <!-- Sebastian Wilhelmi <seppi@seppi.de> 2002-03-04 -->
++   <para>
++      If your code divides neatly along reader/writer lines (as our
++      cache code does), and the lock is held by readers for
++      significant lengths of time, using these locks can help.  They
++      are slightly slower than the normal locks though, so in practice
++      <type>rwlock_t</type> is not usually worthwhile.
+     </para>
+    </sect1>
+ 
+-   <sect1 id="ref-counts">
+-    <title>Protecting A Collection of Objects: Reference Counts</title>
++   <sect1 id="efficiency-read-copy-update">
++    <title>Avoiding Locks: Read Copy Update</title>
+ 
+     <para>
+-      Locking a collection of objects is fairly easy: you get a
+-      single spinlock, and you make sure you grab it before
+-      searching, adding or deleting an object.
++      There is a special method of read/write locking called Read Copy
++      Update.  Using RCU, the readers can avoid taking a lock
++      altogether: as we expect our cache to be read more often than
++      updated (otherwise the cache is a waste of time), it is a
++      candidate for this optimization.
+     </para>
+ 
+     <para>
+-      The purpose of this lock is not to protect the individual
+-      objects: you might have a separate lock inside each one for
+-      that.  It is to protect the <emphasis>data structure
+-      containing the objects</emphasis> from race conditions.  Often
+-      the same lock is used to protect the contents of all the
+-      objects as well, for simplicity, but they are inherently
+-      orthogonal (and many other big words designed to confuse).
++      How do we get rid of read locks?  Getting rid of read locks
++      means that writers may be changing the list underneath the
++      readers.  That is actually quite simple: we can read a linked
++      list while an element is being added if the writer adds the
++      element very carefully.  For example, adding
++      <symbol>new</symbol> to a single linked list called
++      <symbol>list</symbol>:
+     </para>
+ 
++    <programlisting>
++        new-&gt;next = list-&gt;next;
++        wmb();
++        list-&gt;next = new;
++    </programlisting>
++
+     <para>
+-      Changing this to a read-write lock will often help markedly if
+-      reads are far more common that writes.  If not, there is
+-      another approach you can use to reduce the time the lock is
+-      held: reference counts.
++      The <function>wmb()</function> is a write memory barrier.  It
++      ensures that the first operation (setting the new element's
++      <symbol>next</symbol> pointer) is complete and will be seen by
++      all CPUs, before the second operation is (putting the new
++      element into the list).  This is important, since modern
++      compilers and modern CPUs can both reorder instructions unless
++      told otherwise: we want a reader to either not see the new
++      element at all, or see the new element with the
++      <symbol>next</symbol> pointer correctly pointing at the rest of
++      the list.
++    </para>
++    <para>
++      Fortunately, there is a function to do this for standard
++      <structname>struct list_head</structname> lists:
++      <function>list_add_rcu()</function>
++      (<filename>include/linux/list.h</filename>).
++    </para>
++    <para>
++      Removing an element from the list is even simpler: we replace
++      the pointer to the old element with a pointer to its successor,
++      and readers will either see it, or skip over it.
+     </para>
++    <programlisting>
++        list-&gt;next = old-&gt;next;
++    </programlisting>
++    <para>
++      There is <function>list_del_rcu()</function>
++      (<filename>include/linux/list.h</filename>) which does this (the
++      normal version poisons the old object, which we don't want).
++    </para>
++    <para>
++      The reader must also be careful: some CPUs can look through the
++      <symbol>next</symbol> pointer to start reading the contents of
++      the next element early, but don't realize that the pre-fetched
++      contents is wrong when the <symbol>next</symbol> pointer changes
++      underneath them.  Once again, there is a
++      <function>list_for_each_entry_rcu()</function>
++      (<filename>include/linux/list.h</filename>) to help you.  Of
++      course, writers can just use
++      <function>list_for_each_entry()</function>, since there cannot
++      be two simultaneous writers.
++    </para>
++    <para>
++      Our final dilemma is this: when can we actually destroy the
++      removed element?  Remember, a reader might be stepping through
++      this element in the list right now: it we free this element and
++      the <symbol>next</symbol> pointer changes, the reader will jump
++      off into garbage and crash.  We need to wait until we know that
++      all the readers who were traversing the list when we deleted the
++      element are finished.  We use <function>call_rcu()</function> to
++      register a callback which will actually destroy the object once
++      the readers are finished.
++    </para>
++    <para>
++      But how does Read Copy Update know when the readers are
++      finished?  The method is this: firstly, the readers always
++      traverse the list inside
++      <function>rcu_read_lock()</function>/<function>rcu_read_unlock()</function>
++      pairs: these simply disable preemption so the reader won't go to
++      sleep while reading the list.
++    </para>
++    <para>
++      RCU then waits until every other CPU has slept at least once:
++      since readers cannot sleep, we know that any readers which were
++      traversing the list during the deletion are finished, and the
++      callback is triggered.  The real Read Copy Update code is a
++      little more optimized than this, but this is the fundamental
++      idea.
++    </para>
++
++<programlisting>
++--- cache.c.perobjectlock	2003-12-11 17:15:03.000000000 +1100
+++++ cache.c.rcupdate	2003-12-11 17:55:14.000000000 +1100
++@@ -1,15 +1,18 @@
++ #include &lt;linux/list.h&gt;
++ #include &lt;linux/slab.h&gt;
++ #include &lt;linux/string.h&gt;
+++#include &lt;linux/rcupdate.h&gt;
++ #include &lt;asm/semaphore.h&gt;
++ #include &lt;asm/errno.h&gt;
++
++ struct object
++ {
++-        /* These two protected by cache_lock. */
+++        /* This is protected by RCU */
++         struct list_head list;
++         int popularity;
++
+++        struct rcu_head rcu;
+++
++         atomic_t refcnt;
++
++         /* Doesn't change once created. */
++@@ -40,7 +43,7 @@
++ {
++         struct object *i;
++
++-        list_for_each_entry(i, &amp;cache, list) {
+++        list_for_each_entry_rcu(i, &amp;cache, list) {
++                 if (i-&gt;id == id) {
++                         i-&gt;popularity++;
++                         return i;
++@@ -49,19 +52,25 @@
++         return NULL;
++ }
++
+++/* Final discard done once we know no readers are looking. */
+++static void cache_delete_rcu(void *arg)
+++{
+++        object_put(arg);
+++}
+++
++ /* Must be holding cache_lock */
++ static void __cache_delete(struct object *obj)
++ {
++         BUG_ON(!obj);
++-        list_del(&amp;obj-&gt;list);
++-        object_put(obj);
+++        list_del_rcu(&amp;obj-&gt;list);
++         cache_num--;
+++        call_rcu(&amp;obj-&gt;rcu, cache_delete_rcu, obj);
++ }
++
++ /* Must be holding cache_lock */
++ static void __cache_add(struct object *obj)
++ {
++-        list_add(&amp;obj-&gt;list, &amp;cache);
+++        list_add_rcu(&amp;obj-&gt;list, &amp;cache);
++         if (++cache_num > MAX_CACHE_SIZE) {
++                 struct object *i, *outcast = NULL;
++                 list_for_each_entry(i, &amp;cache, list) {
++@@ -85,6 +94,7 @@
++         obj-&gt;popularity = 0;
++         atomic_set(&amp;obj-&gt;refcnt, 1); /* The cache holds a reference */
++         spin_lock_init(&amp;obj-&gt;lock);
+++        INIT_RCU_HEAD(&amp;obj-&gt;rcu);
++
++         spin_lock_irqsave(&amp;cache_lock, flags);
++         __cache_add(obj);
++@@ -104,12 +114,11 @@
++ struct object *cache_find(int id)
++ {
++         struct object *obj;
++-        unsigned long flags;
++
++-        spin_lock_irqsave(&amp;cache_lock, flags);
+++        rcu_read_lock();
++         obj = __cache_find(id);
++         if (obj)
++                 object_get(obj);
++-        spin_unlock_irqrestore(&amp;cache_lock, flags);
+++        rcu_read_unlock();
++         return obj;
++ }
++</programlisting>
++
++<para>
++Note that the reader will alter the
++<structfield>popularity</structfield> member in
++<function>__cache_find()</function>, and now it doesn't hold a lock.
++One solution would be to make it an <type>atomic_t</type>, but for
++this usage, we don't really care about races: an approximate result is
++good enough, so I didn't change it.
++</para>
++
++<para>
++The result is that <function>cache_find()</function> requires no
++synchronization with any other functions, so is almost as fast on SMP
++as it would be on UP.
++</para>
++
++<para>
++There is a furthur optimization possible here: remember our original
++cache code, where there were no reference counts and the caller simply
++held the lock whenever using the object?  This is still possible: if
++you hold the lock, noone can delete the object, so you don't need to
++get and put the reference count.
++</para>
++
++<para>
++Now, because the 'read lock' in RCU is simply disabling preemption, a
++caller which always has preemption disabled between calling
++<function>cache_find()</function> and
++<function>object_put()</function> does not need to actually get and
++put the reference count: we could expose
++<function>__cache_find()</function> by making it non-static, and
++such callers could simply call that.
++</para>
++<para>
++The benefit here is that the reference count is not written to: the
++object is not altered in any way, which is much faster on SMP
++machines due to caching.
++</para>
++  </sect1>
++
++   <sect1 id="per-cpu">
++    <title>Per-CPU Data</title>
+ 
+     <para>
+-      In this approach, an object has an owner, who sets the
+-      reference count to one.  Whenever you get a pointer to the
+-      object, you increment the reference count (a `get' operation).
+-      Whenever you relinquish a pointer, you decrement the reference
+-      count (a `put' operation).  When the owner wants to destroy
+-      it, they mark it dead, and do a put.
++      Another technique for avoiding locking which is used fairly
++      widely is to duplicate information for each CPU.  For example,
++      if you wanted to keep a count of a common condition, you could
++      use a spin lock and a single counter.  Nice and simple.
+     </para>
+ 
+     <para>
+-      Whoever drops the reference count to zero (usually implemented
+-      with <function>atomic_dec_and_test()</function>) actually cleans 
+-      up and frees the object.
++      If that was too slow (it's usually not, but if you've got a
++      really big machine to test on and can show that it is), you
++      could instead use a counter for each CPU, then none of them need
++      an exclusive lock.  See <function>DEFINE_PER_CPU()</function>,
++      <function>get_cpu_var()</function> and
++      <function>put_cpu_var()</function>
++      (<filename class=headerfile>include/linux/percpu.h</filename>).
+     </para>
+ 
+     <para>
+-      This means that you are guaranteed that the object won't
+-      vanish underneath you, even though you no longer have a lock
+-      for the collection.
++      Of particular use for simple per-cpu counters is the
++      <type>local_t</type> type, and the
++      <function>cpu_local_inc()</function> and related functions,
++      which are more efficient than simple code on some architectures
++      (<filename class=headerfile>include/asm/local.h</filename>).
+     </para>
+ 
+     <para>
+-      Here's some skeleton code:
++      Note that there is no simple, reliable way of getting an exact
++      value of such a counter, without introducing more locks.  This
++      is not a problem for some uses.
+     </para>
++   </sect1>
+ 
+-    <programlisting>
+-        void create_foo(struct foo *x)
+-        {
+-                atomic_set(&amp;x-&gt;use, 1);
+-                spin_lock_bh(&amp;list_lock);
+-                ... insert in list ...
+-                spin_unlock_bh(&amp;list_lock);
+-        }
+-
+-        struct foo *get_foo(int desc)
+-        {
+-                struct foo *ret;
+-
+-                spin_lock_bh(&amp;list_lock);
+-                ... find in list ...
+-                if (ret) atomic_inc(&amp;ret-&gt;use);
+-                spin_unlock_bh(&amp;list_lock);
+-
+-                return ret;
+-        }
++   <sect1 id="mostly-hardirq">
++    <title>Data Which Mostly Used By An IRQ Handler</title>
+ 
+-        void put_foo(struct foo *x)
+-        {
+-                if (atomic_dec_and_test(&amp;x-&gt;use))
+-                        kfree(foo);
+-        }
++    <para>
++      If data is always accessed from within the same IRQ handler, you
++      don't need a lock at all: the kernel already guarantees that the
++      irq handler will not run simultaneously on multiple CPUs.
++    </para>
++    <para>
++      Manfred Spraul points out that you can still do this, even if
++      the data is very occasionally accessed in user context or
++      softirqs/tasklets.  The irq handler doesn't use a lock, and
++      all other accesses are done as so:
++    </para>
++
++<programlisting>
++	spin_lock(&amp;lock);
++	disable_irq(irq);
++	...
++	enable_irq(irq);
++	spin_unlock(&amp;lock);
++</programlisting>
++    <para>
++      The <function>disable_irq()</function> prevents the irq handler
++      from running (and waits for it to finish if it's currently
++      running on other CPUs).  The spinlock prevents any other
++      accesses happening at the same time.  Naturally, this is slower
++      than just a <function>spin_lock_irq()</function> call, so it
++      only makes sense if this type of access happens extremely
++      rarely.
++    </para>
++   </sect1>
++  </chapter>
+ 
+-        void destroy_foo(struct foo *x)
+-        {
+-                spin_lock_bh(&amp;list_lock);
+-                ... remove from list ...
+-                spin_unlock_bh(&amp;list_lock);
++ <chapter id="sleeping-things">
++    <title>What Functions Are Safe To Call From Interrupts?</title>
+ 
+-                put_foo(x);
+-        }
+-    </programlisting>
++    <para>
++      Many functions in the kernel sleep (ie. call schedule())
++      directly or indirectly: you can never call them while holding a
++      spinlock, or with preemption disabled.  This also means you need
++      to be in user context: calling them from an interrupt is illegal.
++    </para>
+ 
+-    <sect2 id="helpful-macros">
+-     <title>Macros To Help You</title>
+-     <para>
+-       There are a set of debugging macros tucked inside
+-       <filename class=headerfile>include/linux/netfilter_ipv4/lockhelp.h</filename>
+-       and <filename class=headerfile>listhelp.h</filename>: these are very
+-       useful for ensuring that locks are held in the right places to protect
+-       infrastructure.
+-     </para>
+-    </sect2>
+-   </sect1>
+-   
+-   <sect1 id="sleeping-things">
+-    <title>Things Which Sleep</title>
++   <sect1 id="sleeping">
++    <title>Some Functions Which Sleep</title>
+ 
+     <para>
+-      You can never call the following routines while holding a
+-      spinlock, as they may sleep.  This also means you need to be in
+-      user context.
++      The most common ones are listed below, but you usually have to
++      read the code to find out if other calls are safe.  If everyone
++      else who calls it can sleep, you probably need to be able to
++      sleep, too.  In particular, registration and deregistration
++      functions usually expect to be called from user context, and can
++      sleep.
+     </para>
+ 
+     <itemizedlist>
+@@ -961,106 +1887,31 @@
+      </listitem>
+     </itemizedlist>
+ 
+-    <para>
+-     <function>printk()</function> can be called in
+-     <emphasis>any</emphasis> context, interestingly enough.
+-    </para>
+-   </sect1>
+-
+-   <sect1 id="sparc">
+-    <title>The Fucked Up Sparc</title>
++   <sect1 id="dont-sleep">
++    <title>Some Functions Which Don't Sleep</title>
+ 
+     <para>
+-      Alan Cox says <quote>the irq disable/enable is in the register
+-      window on a sparc</quote>.  Andi Kleen says <quote>when you do
+-      restore_flags in a different function you mess up all the
+-      register windows</quote>.
+-    </para>
+-
+-    <para>
+-      So never pass the flags word set by 
+-      <function>spin_lock_irqsave()</function> and brethren to another 
+-      function (unless it's declared <type>inline</type>.  Usually no-one 
+-      does this, but now you've been warned.  Dave Miller can never do 
+-      anything in a straightforward manner (I can say that, because I have
+-      pictures of him and a certain PowerPC maintainer in a compromising 
+-      position).
+-    </para>
+-   </sect1>
+-
+-   <sect1 id="racing-timers">
+-    <title>Racing Timers: A Kernel Pastime</title>
+-
+-    <para>
+-      Timers can produce their own special problems with races.
+-      Consider a collection of objects (list, hash, etc) where each
+-      object has a timer which is due to destroy it.
++     Some functions are safe to call from any context, or holding
++     almost any lock.
+     </para>
+ 
+-    <para>
+-      If you want to destroy the entire collection (say on module
+-      removal), you might do the following:
+-    </para>
+-
+-    <programlisting>
+-        /* THIS CODE BAD BAD BAD BAD: IF IT WAS ANY WORSE IT WOULD USE
+-           HUNGARIAN NOTATION */
+-        spin_lock_bh(&amp;list_lock);
+-
+-        while (list) {
+-                struct foo *next = list-&gt;next;
+-                del_timer(&amp;list-&gt;timer);
+-                kfree(list);
+-                list = next;
+-        }
+-
+-        spin_unlock_bh(&amp;list_lock);
+-    </programlisting>
+-
+-    <para>
+-      Sooner or later, this will crash on SMP, because a timer can
+-      have just gone off before the <function>spin_lock_bh()</function>, 
+-      and it will only get the lock after we 
+-      <function>spin_unlock_bh()</function>, and then try to free
+-      the element (which has already been freed!).
+-    </para>
+-
+-    <para>
+-      This can be avoided by checking the result of 
+-      <function>del_timer()</function>: if it returns
+-      <returnvalue>1</returnvalue>, the timer has been deleted.  
+-      If <returnvalue>0</returnvalue>, it means (in this
+-      case) that it is currently running, so we can do:
+-    </para>
+-
+-    <programlisting>
+-        retry:  
+-                spin_lock_bh(&amp;list_lock);
+-
+-                while (list) {
+-                        struct foo *next = list-&gt;next;
+-                        if (!del_timer(&amp;list-&gt;timer)) {
+-                                /* Give timer a chance to delete this */
+-                                spin_unlock_bh(&amp;list_lock);
+-                                goto retry;
+-                        }
+-                        kfree(list);
+-                        list = next;
+-                }
+-
+-                spin_unlock_bh(&amp;list_lock);
+-    </programlisting>
+-
+-    <para>
+-      Another common problem is deleting timers which restart
+-      themselves (by calling <function>add_timer()</function> at the end 
+-      of their timer function).  Because this is a fairly common case 
+-      which is prone to races, you should use <function>del_timer_sync()</function> 
+-      (<filename class=headerfile>include/linux/timer.h</filename>) 
+-      to handle this case.  It returns the number of times the timer 
+-      had to be deleted before we finally stopped it from adding itself back 
+-      in.
+-    </para>
++    <itemizedlist>
++     <listitem>
++      <para>
++	<function>printk()</function>
++      </para>
++     </listitem>
++     <listitem>
++      <para>
++        <function>kfree()</function>
++      </para>
++     </listitem>
++     <listitem>
++      <para>
++	<function>add_timer()</function> and <function>del_timer()</function>
++      </para>
++     </listitem>
++    </itemizedlist>
+    </sect1>
+   </chapter>
+ 
+@@ -1101,8 +1952,9 @@
+ 
+     <para>
+       Thanks to Martin Pool, Philipp Rumpf, Stephen Rothwell, Paul
+-      Mackerras, Ruedi Aschwanden, Alan Cox, Manfred Spraul and Tim
+-      Waugh for proofreading, correcting, flaming, commenting.
++      Mackerras, Ruedi Aschwanden, Alan Cox, Manfred Spraul, Tim
++      Waugh, Pete Zaitcev, James Morris, Robert Love, Paul McKenney,
++      John Ashby for proofreading, correcting, flaming, commenting.
+     </para>
+ 
+     <para>
+@@ -1113,12 +1965,27 @@
+   <glossary id="glossary">
+    <title>Glossary</title>
+ 
++   <glossentry id="gloss-preemption">
++    <glossterm>preemption</glossterm>
++     <glossdef>
++      <para>
++        Prior to 2.5, or when <symbol>CONFIG_PREEMPT</symbol> is
++        unset, processes in user context inside the kernel would not
++        preempt each other (ie. you had that CPU until you have it up,
++        except for interrupts).  With the addition of
++        <symbol>CONFIG_PREEMPT</symbol> in 2.5.4, this changed: when
++        in user context, higher priority tasks can "cut in": spinlocks
++        were changed to disable preemption, even on UP.
++     </para>
++    </glossdef>
++   </glossentry>
++
+    <glossentry id="gloss-bh">
+     <glossterm>bh</glossterm>
+      <glossdef>
+       <para>
+         Bottom Half: for historical reasons, functions with
+-        `_bh' in them often now refer to any software interrupt, e.g.
++        '_bh' in them often now refer to any software interrupt, e.g.
+         <function>spin_lock_bh()</function> blocks any software interrupt 
+         on the current CPU.  Bottom halves are deprecated, and will 
+         eventually be replaced by tasklets.  Only one bottom half will be 
+@@ -1132,8 +1999,7 @@
+     <glossdef>
+      <para>
+        Hardware interrupt request.  <function>in_irq()</function> returns 
+-       <returnvalue>true</returnvalue> in a hardware interrupt handler (it 
+-       also returns true when interrupts are blocked).
++       <returnvalue>true</returnvalue> in a hardware interrupt handler.
+      </para>
+     </glossdef>
+    </glossentry>
+@@ -1144,8 +2010,7 @@
+      <para>
+        Not user context: processing a hardware irq or software irq.
+        Indicated by the <function>in_interrupt()</function> macro 
+-       returning <returnvalue>true</returnvalue> (although it also
+-       returns true when interrupts or BHs are blocked).
++       returning <returnvalue>true</returnvalue>.
+      </para>
+     </glossdef>
+    </glossentry>
+@@ -1161,35 +2026,40 @@
+    </glossentry>
+ 
+    <glossentry id="gloss-softirq">
+-    <glossterm>softirq</glossterm>
++    <glossterm>Software Interrupt / softirq</glossterm>
+     <glossdef>
+      <para>
+-       Strictly speaking, one of up to 32 enumerated software
++       Software interrupt handler.  <function>in_irq()</function> returns
++       <returnvalue>false</returnvalue>; <function>in_softirq()</function>
++       returns <returnvalue>true</returnvalue>.  Tasklets and softirqs
++	both fall into the category of 'software interrupts'.
++     </para>
++     <para>
++       Strictly speaking a softirq is one of up to 32 enumerated software
+        interrupts which can run on multiple CPUs at once.
+-       Sometimes used to refer to tasklets and bottom halves as
++       Sometimes used to refer to tasklets as
+        well (ie. all software interrupts).
+      </para>
+     </glossdef>
+    </glossentry>
+ 
+-   <glossentry id="gloss-swinterrupt">
+-    <glossterm>Software Interrupt / Software IRQ</glossterm>
++   <glossentry id="gloss-tasklet">
++    <glossterm>tasklet</glossterm>
+     <glossdef>
+      <para>
+-       Software interrupt handler.  <function>in_irq()</function> returns 
+-       <returnvalue>false</returnvalue>; <function>in_softirq()</function>
+-       returns <returnvalue>true</returnvalue>.  Tasklets, softirqs and 
+-       bottom halves all fall into the category of `software interrupts'.
++       A dynamically-registrable software interrupt,
++       which is guaranteed to only run on one CPU at a time.
+      </para>
+     </glossdef>
+    </glossentry>
+ 
+-   <glossentry id="gloss-tasklet">
+-    <glossterm>tasklet</glossterm>
++   <glossentry id="gloss-timers">
++    <glossterm>timer</glossterm>
+     <glossdef>
+      <para>
+-       A dynamically-registrable software interrupt,
+-       which is guaranteed to only run on one CPU at a time.
++       A dynamically-registrable software interrupt, which is run at
++       (or close to) a given time.  When running, it is just like a
++       tasklet (in fact, they are called from the TIMER_SOFTIRQ).
+      </para>
+     </glossdef>
+    </glossentry>
+@@ -1207,10 +2077,11 @@
+     <glossterm>User Context</glossterm>
+     <glossdef>
+      <para>
+-       The kernel executing on behalf of a particular
+-       process or kernel thread (given by the <function>current()</function>
+-       macro.)  Not to be confused with userspace.  Can be interrupted by 
+-       software  or hardware interrupts.
++       The kernel executing on behalf of a particular process (ie. a
++       system call or trap) or kernel thread.  You can tell which
++       process with the <symbol>current</symbol> macro.)  Not to
++       be confused with userspace.  Can be interrupted by software or
++       hardware interrupts.
+      </para>
+     </glossdef>
+    </glossentry>
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/dvb/cards.txt	2003-12-28 23:22:41.000000000 -0800
+@@ -0,0 +1,63 @@
++Hardware supported by the linuxtv.org DVB drivers
++=================================================
++
++  Generally, the DVB hardware manufacturers frequently change the
++  frontends (i.e. tuner / demodulator units) used, usually without
++  changing the product name, revision number or specs. Some cards
++  are also available in versions with different frontends for
++  DVB-S/DVB-C/DVB-T. Thus the frontend drivers are listed seperately.
++
++  Note 1: There is no guarantee that every frontend driver works
++  out-of-the box with every card, because of different wiring.
++
++  Note 2: The demodulator chips can be used with a variety of
++  tuner/PLL chips, and not all combinations are supported. Often
++  the demodulator and tuner/PLL chip are inside a metal box for
++  shielding, and the whole metal box has its own part number.
++
++
++o Frontends drivers: 
++  - dvb_dummy_fe: for testing...
++  DVB-S:
++   - alps_bsrv2		: Alps BSRV2 (ves1893 demodulator)
++   - cx24110		: Conexant HM1221/HM1811 (cx24110 or cx24106 demod, cx24108 PLL)
++   - grundig_29504-491	: Grundig 29504-491 (Philips TDA8083 demodulator), tsa5522 PLL
++   - mt312		: Zarlink mt312 or Mitel vp310 demodulator, sl1935 or tsa5059 PLL
++   - stv0299		: Alps BSRU6 (tsa5059 PLL), LG TDQB-S00x (tsa5059 PLL),
++   			  LG TDQF-S001F (sl1935 PLL), Philips SU1278 (tua6100 PLL), 
++			  Philips SU1278SH (tsa5059 PLL)
++  DVB-C:
++   - ves1820		: various (ves1820 demodulator, sp5659c or spXXXX PLL)
++   - at76c651		: Atmel AT76c651(B) with DAT7021 PLL
++  DVB-T:
++   - alps_tdlb7		: Alps TDLB7 (sp8870 demodulator, sp5659 PLL)
++   - alps_tdmb7		: Alps TDMB7 (cx22700 demodulator)
++   - grundig_29504-401	: Grundig 29504-401 (LSI L64781 demodulator), tsa5060 PLL
++   - tda1004x		: Philips tda10045h (td1344 or tdm1316l PLL)
++   - nxt6000 		: Alps TDME7 (MITEL SP5659 PLL), Alps TDED4 (TI ALP510 PLL),
++               		  Comtech DVBT-6k07 (SP5730 PLL)
++               		  (NxtWave Communications NXT6000 demodulator)
++
++
++o Cards based on the Phillips saa7146 multimedia PCI bridge chip:
++  - TI AV7110 based cards (i.e. with hardware MPEG decoder):
++    - Siemens/Technotrend/Hauppauge PCI DVB card revision 1.1, 1.3, 1.5, 1.6, 2.1
++      (aka Hauppauge Nexus)
++  - "budget" cards (i.e. without hardware MPEG decoder):
++    - Technotrend Budget / Hauppauge WinTV-Nova PCI Cards
++    - SATELCO Multimedia PCI
++    - KNC1 DVB-S
++
++o Cards based on the B2C2 Inc. FlexCopII:
++  - Technisat SkyStar2 PCI DVB
++
++o Cards based on the Conexant Bt8xx PCI bridge:
++  - Pinnacle PCTV Sat DVB
++  - Nebula Electronics DigiTV
++
++o Technotrend / Hauppauge DVB USB devices:
++  - Nova USB
++  - DEC 2000-T
++
++o Preliminary support for the analog module of the Siemens DVB-C PCI card
++
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/dvb/contributors.txt	2003-12-28 23:22:41.000000000 -0800
+@@ -0,0 +1,54 @@
++Thanks go to the following people for patches and contributions:
++
++Michael Hunold <m.hunold@gmx.de>
++  for the initial saa7146 driver and it's recent overhaul
++
++Christian Theiss
++  for his work on the initial Linux DVB driver
++
++Marcus Metzler <mocm@metzlerbros.de>
++Ralph Metzler <rjkm@metzlerbros.de>
++  for their contining work on the DVB driver
++
++Michael Holzt <kju@debian.org>
++  for his contributions to the dvb-net driver
++
++Diego Picciani <d.picciani@novacomp.it>
++  for CyberLogin for Linux which allows logging onto EON
++  (in case you are wondering where CyberLogin is, EON changed its login 
++  procedure and CyberLogin is no longer used.)
++
++Martin Schaller <martin@smurf.franken.de>
++  for patching the cable card decoder driver
++
++Klaus Schmidinger <Klaus.Schmidinger@cadsoft.de>
++  for various fixes regarding tuning, OSD and CI stuff and his work on VDR
++
++Steve Brown <sbrown@cortland.com>
++  for his AFC kernel thread
++
++Christoph Martin <martin@uni-mainz.de>
++  for his LIRC infrared handler
++
++Andreas Oberritter <andreas@oberritter.de>
++Florian Schirmer <jolt@tuxbox.org>
++...and all the other dBox2 people
++  for many bugfixes in the generic DVB Core and their work on the 
++  dBox2 port of the DVB driver
++
++Oliver Endriss <o.endriss@gmx.de>
++  for many bugfixes
++
++Andrew de Quincey <adq_dvb@lidskialf.net>
++  for the tda1004x frontend driver, and various bugfixes
++
++Peter Schildmann <peter.schildmann@web.de>
++  for the driver for the Technisat SkyStar2 PCI DVB card
++
++Vadim Catana <skystar@moldova.cc>
++Roberto Ragusa <r.ragusa@libero.it>
++Augusto Cardoso <augusto@carhil.net>
++  for all the work for the FlexCopII chipset by B2C2,Inc.
++
++(If you think you should be in this list, but you are not, drop a
++ line to the DVB mailing list)
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/dvb/faq.txt	2003-12-28 23:22:41.000000000 -0800
+@@ -0,0 +1,109 @@
++Some very frequently asked questions about linuxtv-dvb
++
++1. The signal seems to die a few seconds after tuning.
++
++	It's not a bug, it's a feature. Because the frontends have
++	significant power requirements (and hence get very hot), they
++	are powered down if they are unused (i.e. if the frontend device
++	is closed). The dvb-core.o module paramter "dvb_shutdown_timeout"
++	allow you to change the timeout (default 5 seconds). Setting the
++	timeout to 0 disables the timeout feature.
++
++2. How can I watch TV?
++
++	The driver distribution includes some simple utilities which
++	are mainly intended for testing and to demonstrate how the
++	DVB API works.
++
++	Depending on whether you have a DVB-S, DVB-C or DVB-T card, use
++	apps/szap/szap, czap or tzap. You must supply a channel list
++	in ~/.[sct]zap/channels.conf. If you are lucky you can just copy
++	one of the supplied channel lists, or you can create a new one
++	by running apps/scan/scan. If you run scan on an unknown network
++	you might have to supply some start data in apps/scan/initial.h.
++
++	If you have a card with a built-in hardware MPEG-decoder the
++	drivers create a video4linux device (/dev/v4l/video0) which
++	you can use to watch TV with any v4l application. xawtv is known
++	to work. Note that you cannot change channels with xawtv, you
++	have to zap using [sct]zap. If you want a nice application for
++	TV watching and record/playback, have a look at VDR.
++
++	If your card does not have a hardware MPEG decoder you need
++	a software MPEG decoder. Mplayer or xine are known to work.
++	Newsflash: MythTV also has DVB support now.
++	Note: Only very recent versions of Mplayer and xine can decode.
++	MPEG2 transport streams (TS) directly. Then, run
++	'[sct]zap channelname -r' in one xterm, and keep it running,
++	and start 'mplayer - < /dev/dvb/adapter0/dvr0' or 
++	'xine stdin://mpeg2 < /dev/dvb/adapter0/dvr0' in a second xterm.
++	That's all far from perfect, but it seems no one has written
++	a nice DVB application which includes a builtin software MPEG
++	decoder yet.
++
++	Newsflash: Newest xine directly supports DVB. Just copy your
++	channels.conf to ~/.xine and start 'xine dvb://', or select
++	the DVB button in the xine GUI. Channel switching works using the
++	numpad pgup/pgdown (NP9 / NP3) keys to scroll through the channel osd
++	menu and pressing numpad-enter to switch to the selected channel.
++
++	Note: Older versions of xine and mplayer understand MPEG program
++	streams (PS) only, and can be used in conjunction with the
++	ts2ps tool from the Metzler Brother's dvb-mpegtools package.
++
++3. Which other DVB applications exist?
++
++	http://www.cadsoft.de/people/kls/vdr/
++		Klaus Schmidinger's Video Disk Recorder
++
++	http://www.metzlerbros.org/dvb/
++		Metzler Bros. DVB development; alternate drivers and
++		DVB utilities, include dvb-mpegtools and tuxzap.
++
++	http://www.linuxstb.org/
++	http://sourceforge.net/projects/dvbtools/
++		Dave Chapman's dvbtools package, including
++		dvbstream and dvbtune
++
++	http://www.linuxdvb.tv/
++		Henning Holtschneider's site with many interesting
++		links and docs
++
++	http://www.dbox2.info/
++		LinuxDVB on the dBox2
++
++	http://www.tuxbox.org/
++	http://cvs.tuxbox.org/
++		the TuxBox CVS many interesting DVB applications and the dBox2
++		DVB source
++
++	http://sourceforge.net/projects/dvbsak/
++		DVB Swiss Army Knife library and utilities
++
++	http://www.nenie.org/misc/mpsys/
++		MPSYS: a MPEG2 system library and tools
++
++	http://mplayerhq.hu/
++		mplayer
++
++	http://xine.sourceforge.net/
++	http://xinehq.de/
++		xine
++
++	http://www.mythtv.org/
++		MythTV - analog TV PVR, but now with DVB support, too
++		(with software MPEG decode)
++
++4. Can't get a signal tuned correctly
++
++	If you are using a Technotrend/Hauppauge DVB-C card *without* analog
++	module, you might have to use module parameter adac=-1 (dvb-ttpci.o).
++
++5. The dvb_net device doesn't give me any multicast packets
++
++	Check your routes if they include the multicast address range.
++	Additionally make sure that "source validation by reversed path
++	lookup" is disabled:
++	  $ "echo 0 > /proc/sys/net/ipv4/conf/dvb0/rp_filter"
++
++eof
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/dvb/firmware.txt	2003-12-28 23:22:41.000000000 -0800
+@@ -0,0 +1,116 @@
++Some DVB cards and many newer frontends require proprietary,
++binary-only firmware.
++
++The DVB drivers will be converted to use the request_firmware()
++hotplug interface (see linux/Documentation/firmware_class/).
++(CONFIG_FW_LOADER)
++
++The firmware can be loaded automatically via the hotplug manager
++or manually with the steps described below.
++
++Currently the drivers still use various different methods
++to load their firmwares, so here's just a short list of the
++current state:
++
++- dvb-ttpci: driver uses firmware hotplug interface
++- ttusb-budget: firmware is compiled in (dvb-ttusb-dspbootcode.h)
++- sp887x: firmware is compiled in (sp887x_firm.h)
++- alps_tdlb7: firmware is loaded from path specified by
++		"mcfile" module parameter; the binary must be
++		extracted from the Windows driver (Sc_main.mc).
++- tda1004x: firmware is loaded from path specified in
++		DVB_TDA1004X_FIRMWARE_FILE kernel config
++		variable (default /etc/dvb/tda1004x.bin); the
++		firmware binary must be extracted from the windows
++		driver
++- ttusb-dec: see "ttusb-dec.txt" for details
++
++1) Automatic firmware loading
++
++You need to install recent hotplug scripts if your distribution did not do it
++for you already, especially the  /etc/hotplug/firmware.agent.
++http://linux-hotplug.sourceforge.net/ (Call /sbin/hotplug without arguments
++to find out if the firmware agent is installed.)
++
++The firmware.agent script expects firmware binaries in
++/usr/lib/hotplug/firmware/. To avoid naming and versioning
++conflicts we propose the following naming scheme:
++
++  /usr/lib/hotplug/firmware/dvb-{driver}-{ver}.fw	for MPEG decoders etc.
++  /usr/lib/hotplug/firmware/dvb-fe-{driver}-{ver}.fw	for frontends
++
++  {driver} name is the basename of the driver kernel module (e.g. dvb-ttpci)
++  {ver} is a version number/name that should change only when the
++  driver/firmware internal API changes (so users are free to install the
++  latest firmware compatible with the driver).
++
++2) Manually loading the firmware into a driver
++   (currently only the dvb-ttpci / av7110 driver supports this)
++   
++Step a) Mount sysfs-filesystem.
++
++Sysfs provides a means to export kernel data structures, their attributes,
++and the linkages between them to userspace. 
++
++For detailed informations have a look at Documentation/filesystems/sysfs.txt 
++All you need to know at the moment is that firmware loading only works through
++sysfs.
++
++> mkdir /sys
++> mount -t sysfs sysfs /sys
++
++Step b) Exploring the firmware loading facilities
++
++Firmware_class support is located in
++/sys/class/firmware
++
++> dir /sys/class/firmware
++
++The "timeout" values specifies the amount of time that is waited before the
++firmware upload  process is cancelled. The default values is 10 seconds. If
++you use a hotplug script for the firmware upload, this is sufficient. If
++you want to upload the firmware by hand, however, this might be too fast.
++
++> echo "180" > /sys/class/firmware/timeout
++
++Step c) Getting a usable firmware file for the dvb-ttpci driver/av7110 card.
++
++You can download the firmware files from
++http://www.linuxtv.org/download/dvb/
++
++Please note that in case of the dvb-ttpci driver this is *not* the "Root"
++file you probably know from the 2.4 DVB releases driver.
++
++> wget http://www.linuxtv.org/download/dvb/dvb-ttpci-01.fw
++gets you the version 01 of the firmware fot the ttpci driver.
++
++Step d) Loading the dvb-ttpci driver and loading the firmware
++
++"modprobe" will take care that every needed module will be loaded
++automatically (except the frontend driver)
++
++> modprobe dvb-ttpci
++
++The "modprobe" process will hang until
++a) you upload the firmware or
++b) the timeout occurs.
++
++Change to another terminal and have a look at 
++
++> dir /sys/class/firmware/
++
++total 0
++drwxr-xr-x    2 root     root            0 Jul 29 11:00 0000:03:05.0
++-rw-r--r--    1 root     root            0 Jul 29 10:41 timeout
++
++"0000:03:05.0" is the id for my dvb-c card. It depends on the pci slot,
++so it changes if you plug the card to different slots.
++
++You can upload the firmware like that:
++
++> export DEVDIR=/sys/class/firmware/0000\:03\:05.0
++> echo 1 > $DEVDIR/loading
++> cat dvb-ttpci-01.fw > $DEVDIR/data
++> echo 0 > $DEVDIR/loading
++
++That's it. The driver should be up and running now.
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/dvb/readme.txt	2003-12-28 23:22:41.000000000 -0800
+@@ -0,0 +1,39 @@
++Linux Digital Video Broadcast (DVB) subsystem
++=============================================
++
++The main development site and CVS repository for these
++drivers is http://linuxtv.org/.
++
++The developer mailing list linux-dvb is also hosted there,
++see http://linuxtv.org/mailinglists.xml. Please check
++the archive http://linuxtv.org/mailinglists/linux-dvb/
++before asking newbie questions on the list.
++
++API documentation, utilities and test/example programs
++are available as part of the old driver package for Linux 2.4
++(linuxtv-dvb-1.0.x.tar.gz), or from CVS (module DVB).
++We plan to split this into separate packages, but it's not
++been done yet.
++
++http://linuxtv.org/download/dvb/
++
++What's inside this directory:
++
++"cards.txt" 
++contains a list of supported hardware.
++
++"contributors.txt"
++is the who-is-who of DVB development
++
++"faq.txt"
++contains frequently asked questions and their answers.
++
++"firmware.txt" 
++contains informations for required external firmware
++files and where to get them.
++
++"ttusb-dec.txt"
++contains detailed informations about the
++TT DEC2000/DEC3000 USB DVB hardware.
++
++Good luck and have fun!
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/dvb/ttusb-dec.txt	2003-12-28 23:22:41.000000000 -0800
+@@ -0,0 +1,52 @@
++TechnoTrend/Hauppauge DEC USB Driver
++====================================
++
++Driver Status
++-------------
++
++Supported:
++	DEC2000-t
++	Linux Kernels 2.4 and 2.6
++	Video Streaming
++	Audio Streaming
++	Channel Zapping
++	Hotplug firmware loader under 2.6 kernels
++
++In Progress:
++	DEC3000-s
++
++To Do:
++	Section data
++	Teletext streams
++	Tuner status information
++	DVB network interface
++	Streaming video PC->DEC
++
++Note:	Since section data can not be retreived yet, scan apps will not work.
++
++Getting the Firmware
++--------------------
++Currently, the driver only works with v2.15a of the firmware.  The firmwares
++can be obtained in this way:
++
++wget http://hauppauge.lightpath.net/de/dec215a.exe
++unzip -j dec215a.exe Software/Oem/STB/App/Boot/STB_PC_T.bin
++unzip -j dec215a.exe Software/Oem/STB/App/Boot/STB_PC_S.bin
++
++
++Compilation Notes for 2.4 kernels
++---------------------------------
++For 2.4 kernels the firmware for the DECs is compiled into the driver itself.
++The firmwares are expected to be in /etc/dvb at compilation time.
++
++mv STB_PC_T.bin /etc/dvb/dec2000t.bin
++mv STB_PC_S.bin /etc/dvb/dec3000s.bin
++
++
++Hotplug Firmware Loading for 2.6 kernels
++----------------------------------------
++For 2.6 kernels the firmware is loaded at the point that the driver module is
++loaded.  See linux/Documentation/dvb/FIRMWARE for more information.
++
++mv STB_PC_T.bin /usr/lib/hotplug/firmware/dec2000t.bin
++mv STB_PC_S.bin /usr/lib/hotplug/firmware/dec3000s.bin
+--- linux-2.6.0/Documentation/fb/aty128fb.txt	2003-06-14 12:17:56.000000000 -0700
++++ 25/Documentation/fb/aty128fb.txt	2003-12-28 23:23:06.000000000 -0800
+@@ -32,7 +32,7 @@ resolutions.
+ You should compile in both vgacon (to boot if you remove your Rage128 from
+ box) and aty128fb (for graphics mode). You should not compile-in vesafb
+ unless you have primary display on non-Rage128 VBE2.0 device (see 
+-Documentation/vesafb.txt for details).
++Documentation/fb/vesafb.txt for details).
+ 
+ 
+ X11
+--- linux-2.6.0/Documentation/fb/matroxfb.txt	2003-06-14 12:18:30.000000000 -0700
++++ 25/Documentation/fb/matroxfb.txt	2003-12-28 23:23:06.000000000 -0800
+@@ -31,7 +31,7 @@ pass to the kernel this command line: "v
+ You should compile in both vgacon (to boot if you remove you Matrox from
+ box) and matroxfb (for graphics mode). You should not compile-in vesafb
+ unless you have primary display on non-Matrox VBE2.0 device (see 
+-Documentation/vesafb.txt for details).
++Documentation/fb/vesafb.txt for details).
+ 
+ Currently supported video modes are (through vesa:... interface, PowerMac
+ has [as addon] compatibility code):
+--- linux-2.6.0/Documentation/filesystems/Locking	2003-08-22 19:23:39.000000000 -0700
++++ 25/Documentation/filesystems/Locking	2003-12-28 23:22:12.000000000 -0800
+@@ -420,7 +420,7 @@ transfer:	no
+ prototypes:
+ 	void (*open)(struct vm_area_struct*);
+ 	void (*close)(struct vm_area_struct*);
+-	struct page *(*nopage)(struct vm_area_struct*, unsigned long, int);
++	struct page *(*nopage)(struct vm_area_struct*, unsigned long, int *);
+ 
+ locking rules:
+ 		BKL	mmap_sem
+--- linux-2.6.0/Documentation/filesystems/proc.txt	2003-11-09 16:45:05.000000000 -0800
++++ 25/Documentation/filesystems/proc.txt	2003-12-28 23:26:39.000000000 -0800
+@@ -900,6 +900,15 @@ super-nr shows the number of currently a
+ Every mounted file system needs a super block, so if you plan to mount lots of
+ file systems, you may want to increase these numbers.
+ 
++aio-nr and aio-max-nr
++---------------------
++
++aio-nr is the running total of the number of events specified on the
++io_setup system call for all currently active aio contexts.  If aio-nr
++reaches aio-max-nr then io_setup will fail with EAGAIN.  Note that
++raising aio-max-nr does not result in the pre-allocation or re-sizing
++of any kernel data structures.
++
+ 2.2 /proc/sys/fs/binfmt_misc - Miscellaneous binary formats
+ -----------------------------------------------------------
+ 
+--- linux-2.6.0/Documentation/filesystems/xfs.txt	2003-10-17 15:58:03.000000000 -0700
++++ 25/Documentation/filesystems/xfs.txt	2003-12-28 23:22:28.000000000 -0800
+@@ -29,10 +29,11 @@ When mounting an XFS filesystem, the fol
+ 	The preferred buffered I/O size can also be altered on an
+ 	individual file basis using the ioctl(2) system call.
+ 
+-  ikeep
++  ikeep/noikeep
+ 	When inode clusters are emptied of inodes, keep them around
+-	on the disk, this is the old XFS behavior. Default is now to
+-	return the inode cluster to the free space pool.
++	on the disk (ikeep) - this is the traditional XFS behaviour
++	and is still the default for now.  Using the noikeep option,
++	inode clusters are returned to the free space pool.
+ 
+   logbufs=value
+ 	Set the number of in-memory log buffers.  Valid numbers range
+@@ -75,6 +76,10 @@ When mounting an XFS filesystem, the fol
+ 	Filesystems mounted "norecovery" must be mounted read-only or
+ 	the mount will fail.
+ 
++  nouuid
++	Don't check for double mounted file systems using the file system uuid.
++	This is useful to mount LVM snapshot volumes.
++
+   osyncisosync
+ 	Make O_SYNC writes implement true O_SYNC.  WITHOUT this option,
+ 	Linux XFS behaves as if an "osyncisdsync" option is used,
+@@ -108,10 +113,6 @@ When mounting an XFS filesystem, the fol
+ 	The "swidth" option is required if the "sunit" option has been
+ 	specified, and must be a multiple of the "sunit" value.
+ 
+-  nouuid
+-        Don't check for double mounted file systems using the file system uuid.
+-        This is useful to mount LVM snapshot volumes.
+-
+ sysctls
+ =======
+ 
+@@ -139,14 +140,14 @@ The following sysctls are available for 
+ 	Causes certain error conditions to call BUG(). Value is a bitmask; 
+ 	AND together the tags which represent errors which should cause panics:
+ 	
+-		XFS_NO_PTAG                     0LL
+-		XFS_PTAG_IFLUSH                 0x0000000000000001LL
+-		XFS_PTAG_LOGRES                 0x0000000000000002LL
+-		XFS_PTAG_AILDELETE              0x0000000000000004LL
+-		XFS_PTAG_ERROR_REPORT           0x0000000000000008LL
+-		XFS_PTAG_SHUTDOWN_CORRUPT       0x0000000000000010LL
+-		XFS_PTAG_SHUTDOWN_IOERROR       0x0000000000000020LL
+-		XFS_PTAG_SHUTDOWN_LOGERROR      0x0000000000000040LL
++		XFS_NO_PTAG                     0
++		XFS_PTAG_IFLUSH                 0x00000001
++		XFS_PTAG_LOGRES                 0x00000002
++		XFS_PTAG_AILDELETE              0x00000004
++		XFS_PTAG_ERROR_REPORT           0x00000008
++		XFS_PTAG_SHUTDOWN_CORRUPT       0x00000010
++		XFS_PTAG_SHUTDOWN_IOERROR       0x00000020
++		XFS_PTAG_SHUTDOWN_LOGERROR      0x00000040
+ 
+ 	This option is intended for debugging only.		
+ 
+@@ -165,6 +166,21 @@ The following sysctls are available for 
+   	Controls whether unprivileged users can use chown to "give away"
+ 	a file to another user.
+ 
++  fs.xfs.inherit_sync		(Min: 0  Default: 1  Max 1)
++	Setting this to "1" will cause the "sync" flag set
++	by the chattr(1) command on a directory to be
++	inherited by files in that directory.
++
++  fs.xfs.inherit_nodump		(Min: 0  Default: 1  Max 1)
++	Setting this to "1" will cause the "nodump" flag set
++	by the chattr(1) command on a directory to be
++	inherited by files in that directory.
++
++  fs.xfs.inherit_noatime	(Min: 0  Default: 1  Max 1)
++	Setting this to "1" will cause the "noatime" flag set
++	by the chattr(1) command on a directory to be
++	inherited by files in that directory.
++
+   vm.pagebuf.stats_clear	(Min: 0  Default: 0  Max: 1)
+ 	Setting this to "1" clears accumulated pagebuf statistics 
+ 	in /proc/fs/pagebuf/stat.  It then immediately reset to "0".
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/i386/kgdb/andthen	2003-12-28 23:21:06.000000000 -0800
+@@ -0,0 +1,100 @@
++
++define	set_andthen
++	set var $thp=0
++	set var $thp=(struct kgdb_and_then_struct *)&kgdb_data[0]
++	set var $at_size = (sizeof kgdb_data)/(sizeof *$thp)
++	set var $at_oc=kgdb_and_then_count
++	set var $at_cc=$at_oc
++end
++
++define andthen_next
++	set var $at_cc=$arg0
++end
++
++define andthen
++	andthen_set_edge
++	if ($at_cc >= $at_oc)
++		printf "Outside window.  Window size is %d\n",($at_oc-$at_low)
++	else
++		printf "%d: ",$at_cc
++		output *($thp+($at_cc++ % $at_size ))
++		printf "\n"
++	end
++end
++define andthen_set_edge
++	set var $at_oc=kgdb_and_then_count
++	set var $at_low = $at_oc - $at_size
++	if ($at_low < 0 )
++		set var $at_low = 0
++	end
++	if (( $at_cc > $at_oc) || ($at_cc < $at_low))
++		printf "Count outside of window, setting count to "
++		if ($at_cc >= $at_oc)
++			set var $at_cc = $at_oc
++		else
++			set var $at_cc = $at_low
++		end
++		printf "%d\n",$at_cc
++	end
++end
++
++define beforethat
++	andthen_set_edge
++	if ($at_cc <= $at_low)
++		printf "Outside window.  Window size is %d\n",($at_oc-$at_low)
++	else
++		printf "%d: ",$at_cc-1
++		output *($thp+(--$at_cc % $at_size ))
++		printf "\n"
++	end
++end
++
++document andthen_next
++	andthen_next <count>
++	.	sets the number of the event to display next. If this event
++	.	is not in the event pool, either andthen or beforethat will
++	.	correct it to the nearest event pool edge.  The event pool
++	.	ends at the last event recorded and begins <number of events>
++	.	prior to that.  If beforethat is used next, it will display
++	.	event <count> -1.
++.
++	andthen commands are: set_andthen, andthen_next, andthen and beforethat
++end
++
++
++document andthen
++	andthen
++.	displays the next event in the list.  <set_andthen> sets up to display
++.	the oldest saved event first.
++.	<count> (optional) count of the event to display.
++.	note the number of events saved is specified at configure time.
++.	if events are saved between calls to andthen the index will change
++.	but the displayed event will be the next one (unless the event buffer
++.	is overrun).
++.
++.	andthen commands are: set_andthen, andthen_next, andthen and beforethat
++end
++
++document set_andthen
++	set_andthen
++.	sets up to use the <andthen> and <beforethat> commands.
++.		if you have defined your own struct, use the above and
++.		then enter the following:
++.		p $thp=(struct kgdb_and_then_structX *)&kgdb_data[0]
++.		where <kgdb_and_then_structX> is the name of your structure.
++.
++.	andthen commands are: set_andthen, andthen_next, andthen and beforethat
++end
++
++document beforethat
++	beforethat
++.	displays the next prior event in the list. <set_andthen> sets up to
++.	display the last occuring event first.
++.
++.	note the number of events saved is specified at configure time.
++.	if events are saved between calls to beforethat the index will change
++.	but the displayed event will be the next one (unless the event buffer
++.	is overrun).
++.
++.	andthen commands are: set_andthen, andthen_next, andthen and beforethat
++end
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/i386/kgdb/debug-nmi.txt	2003-12-28 23:21:06.000000000 -0800
+@@ -0,0 +1,37 @@
++Subject: Debugging with NMI
++Date: Mon, 12 Jul 1999 11:28:31 -0500
++From: David Grothe <dave@gcom.com>
++Organization: Gcom, Inc
++To: David Grothe <dave@gcom.com>
++
++Kernel hackers:
++
++Maybe this is old hat, but it is new to me --
++
++On an ISA bus machine, if you short out the A1 and B1 pins of an ISA
++slot you will generate an NMI to the CPU.  This interrupts even a
++machine that is hung in a loop with interrupts disabled.  Used in
++conjunction with kgdb <
++ftp://ftp.gcom.com/pub/linux/src/kgdb-2.3.35/kgdb-2.3.35.tgz > you can
++gain debugger control of a machine that is hung in the kernel!  Even
++without kgdb the kernel will print a stack trace so you can find out
++where it was hung.
++
++The A1/B1 pins are directly opposite one another and the farthest pins
++towards the bracket end of the ISA bus socket.  You can stick a paper
++clip or multi-meter probe between them to short them out.
++
++I had a spare ISA bus to PC104 bus adapter around.  The PC104 end of the
++board consists of two rows of wire wrap pins.  So I wired a push button
++between the A1/B1 pins and now have an ISA board that I can stick into
++any ISA bus slot for debugger entry.
++
++Microsoft has a circuit diagram of a PCI card at
++http://www.microsoft.com/hwdev/DEBUGGING/DMPSW.HTM.  If you want to
++build one you will have to mail them and ask for the PAL equations.
++Nobody makes one comercially.
++
++[THIS TIP COMES WITH NO WARRANTY WHATSOEVER.  It works for me, but if
++your machine catches fire, it is your problem, not mine.]
++
++-- Dave (the kgdb guy)
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/i386/kgdb/gdb-globals.txt	2003-12-28 23:21:07.000000000 -0800
+@@ -0,0 +1,71 @@
++Sender: akale@veritas.com
++Date: Fri, 23 Jun 2000 19:26:35 +0530
++From: "Amit S. Kale" <akale@veritas.com>
++Organization: Veritas Software (India)
++To: Dave Grothe <dave@gcom.com>, linux-kernel@vger.rutgers.edu
++CC: David Milburn <dmilburn@wirespeed.com>,
++        "Edouard G. Parmelan" <Edouard.Parmelan@quadratec.fr>,
++        ezannoni@cygnus.com, Keith Owens <kaos@ocs.com.au>
++Subject: Re: Module debugging using kgdb
++
++Dave Grothe wrote:
++>
++> Amit:
++>
++> There is a 2.4.0 version of kgdb on our ftp site:
++> ftp://ftp.gcom.com/pub/linux/src/kgdb.  I mirrored your version of gdb
++> and loadmodule.sh there.
++>
++> Have a look at the README file and see if I go it right.  If not, send
++> me some corrections and I will update it.
++>
++> Does your version of gdb solve the global variable problem?
++
++Yes.
++Thanks to Elena Zanoni, gdb (developement version) can now calculate
++correctly addresses  of dynamically loaded object files. I have not been
++following gdb developement for sometime and am not sure when symbol
++address calculation fix is going to appear in a gdb stable version.
++
++Elena, any idea when the fix will make it to a prebuilt gdb from a
++redhat release?
++
++For the time being I have built a gdb developement version. It can be
++used for module debugging with loadmodule.sh script.
++
++The problem with calculating of module addresses with previous versions
++of gdb was as follows:
++gdb did not use base address of a section while calculating address of
++a symbol in the section in an object file loaded via 'add-symbol-file'.
++It used address of .text segment instead. Due to this addresses of
++symbols in .data, .bss etc. (e.g. global variables) were calculated incorrectly.
++
++Above mentioned fix allow gdb to use base address of a segment while
++calculating address of a symbol in it. It adds a parameter '-s' to
++'add-symbol-file' command for specifying base address of a segment.
++
++loadmodule.sh script works as follows.
++
++1. Copy a module file to target machine.
++2. Load the module on the target machine using insmod with -m parameter.
++insmod produces a module load map which contains base addresses of all
++sections in the module and addresses of symbols in the module file.
++3. Find all sections and their base addresses in the module from
++the module map.
++4. Generate a script that loads the module file. The script uses
++'add-symbol-file' and specifies address of text segment followed by
++addresses of all segments in the module.
++
++Here is an example gdb script produced by loadmodule.sh script.
++
++add-symbol-file foo 0xd082c060 -s .text.lock 0xd08cbfb5
++-s .fixup 0xd08cfbdf -s .rodata 0xd08cfde0 -s __ex_table 0xd08e3b38
++-s .data 0xd08e3d00 -s .bss 0xd08ec8c0 -s __ksymtab 0xd08ee838
++
++With this command gdb can calculate addresses of symbols in ANY segment
++in a module file.
++
++Regards.
++--
++Amit Kale
++Veritas Software ( http://www.veritas.com )
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/i386/kgdb/gdbinit	2003-12-28 23:21:07.000000000 -0800
+@@ -0,0 +1,14 @@
++shell echo -e "\003" >/dev/ttyS0
++set remotebaud 38400
++target remote /dev/ttyS0
++define si
++stepi
++printf "EAX=%08x EBX=%08x ECX=%08x EDX=%08x\n", $eax, $ebx, $ecx, $edx
++printf "ESI=%08x EDI=%08x EBP=%08x ESP=%08x\n", $esi, $edi, $ebp, $esp
++x/i $eip
++end
++define ni
++nexti
++printf "EAX=%08x EBX=%08x ECX=%08x EDX=%08x\n", $eax, $ebx, $ecx, $edx
++printf "ESI=%08x EDI=%08x EBP=%08x ESP=%08x\n", $esi, $edi, $ebp, $esp
++x/i $eip
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/i386/kgdb/gdbinit.hw	2003-12-28 23:21:07.000000000 -0800
+@@ -0,0 +1,117 @@
++
++#Using ia-32 hardware breakpoints.
++#
++#4 hardware breakpoints are available in ia-32 processors. These breakpoints
++#do not need code modification. They are set using debug registers.
++#
++#Each hardware breakpoint can be of one of the
++#three types: execution, write, access.
++#1. An Execution breakpoint is triggered when code at the breakpoint address is
++#executed.
++#2. A write breakpoint ( aka watchpoints ) is triggered when memory location
++#at the breakpoint address is written.
++#3. An access breakpoint is triggered when memory location at the breakpoint
++#address is either read or written.
++#
++#As hardware breakpoints are available in limited number, use software
++#breakpoints ( br command in gdb ) instead of execution hardware breakpoints.
++#
++#Length of an access or a write breakpoint defines length of the datatype to
++#be watched. Length is 1 for char, 2 short , 3 int.
++#
++#For placing execution, write and access breakpoints, use commands
++#hwebrk, hwwbrk, hwabrk
++#To remove a breakpoint use hwrmbrk command.
++#
++#These commands take following types of arguments. For arguments associated
++#with each command, use help command.
++#1. breakpointno: 0 to 3
++#2. length: 1 to 3
++#3. address: Memory location in hex ( without 0x ) e.g c015e9bc
++#
++#Use the command exinfo to find which hardware breakpoint occured.
++
++#hwebrk breakpointno address
++define hwebrk
++	maintenance packet Y$arg0,0,0,$arg1
++end
++document hwebrk
++	hwebrk <breakpointno> <address>
++	Places a hardware execution breakpoint
++	<breakpointno> = 0 - 3
++	<address> = Hex digits without leading "0x".
++end
++
++#hwwbrk breakpointno length address
++define hwwbrk
++	maintenance packet Y$arg0,1,$arg1,$arg2
++end
++document hwwbrk
++	hwwbrk <breakpointno> <length> <address>
++	Places a hardware write breakpoint
++	<breakpointno> = 0 - 3
++	<length> = 1 (1 byte), 2 (2 byte), 3 (4 byte)
++	<address> = Hex digits without leading "0x".
++end
++
++#hwabrk breakpointno length address
++define hwabrk
++	maintenance packet Y$arg0,1,$arg1,$arg2
++end
++document hwabrk
++	hwabrk <breakpointno> <length> <address>
++	Places a hardware access breakpoint
++	<breakpointno> = 0 - 3
++	<length> = 1 (1 byte), 2 (2 byte), 3 (4 byte)
++	<address> = Hex digits without leading "0x".
++end
++
++#hwrmbrk breakpointno
++define hwrmbrk
++	maintenance packet y$arg0
++end
++document hwrmbrk
++	hwrmbrk <breakpointno>
++	<breakpointno> = 0 - 3
++	Removes a hardware breakpoint
++end
++
++define reboot
++        maintenance packet r
++end
++#exinfo
++define exinfo
++	maintenance packet qE
++end
++document exinfo
++	exinfo
++	Gives information about a breakpoint.
++end
++define get_th
++	p $th=(struct thread_info *)((int)$esp & ~8191)
++end
++document get_th
++	get_tu
++	Gets and prints the current thread_info pointer, Defines th to be it.
++end
++define get_cu
++	p $cu=((struct thread_info *)((int)$esp & ~8191))->task
++end
++document get_cu
++	get_cu
++	Gets and print the "current" value.  Defines $cu to be it.
++end
++define int_off
++	set var $flags=$eflags
++	set $eflags=$eflags&~0x200
++	end
++define int_on
++	set var $eflags|=$flags&0x200
++	end
++document int_off
++	saves the current interrupt state and clears the processor interrupt
++	flag.  Use int_on to restore the saved flag.
++end
++document int_on
++	Restores the interrupt flag saved by int_off.
++end
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/i386/kgdb/gdbinit-modules	2003-12-28 23:21:07.000000000 -0800
+@@ -0,0 +1,146 @@
++#
++# Usefull GDB user-command to debug Linux Kernel Modules with gdbstub.
++#
++# This don't work for Linux-2.0 or older.
++#
++# Author Edouard G. Parmelan <Edouard.Parmelan@quadratec.fr>
++#
++#
++# Fri Apr 30 20:33:29 CEST 1999
++#   First public release.
++#
++#   Major cleanup after experiment Linux-2.0 kernel without success.
++#   Symbols of a module are not in the correct order, I can't explain
++#   why :(
++#
++# Fri Mar 19 15:41:40 CET 1999
++#   Initial version.
++#
++# Thu Jan  6 16:29:03 CST 2000
++#   A little fixing by Dave Grothe <dave@gcom.com>
++#
++# Mon Jun 19 09:33:13 CDT 2000
++#   Alignment changes from Edouard Parmelan
++#
++# The basic idea is to find where insmod load the module and inform
++# GDB to load the symbol table of the module with the GDB command
++# ``add-symbol-file <object> <address>''.
++#
++# The Linux kernel holds the list of all loaded modules in module_list,
++# this list end with &kernel_module (exactly with module->next == NULL,
++# but the last module is not a real module).
++#
++# Insmod allocates the struct module before the object file.  Since
++# Linux-2.1, this structure contain his size.  The real address of
++# the object file is then (char*)module + module->size_of_struct.
++#
++# You can use three user functions ``mod-list'', ``mod-print-symbols''
++# and ``add-module-symbols''.
++#
++# mod-list list all loaded modules with the format:
++#    <module-address> <module-name>
++#
++# As soon as you have found the address of your module, you can
++# print its exported symbols (mod-print-symbols) or inform GDB to add
++# symbols from your module file (mod-add-symbols).
++#
++# The argument that you give to mod-print-symbols or mod-add-symbols
++# is the <module-address> from the mod-list command.
++#
++# When using the mod-add-symbols command you must also give the full
++# pathname of the modules object code file.
++#
++# The command mod-add-lis is an example of how to make this easier.
++# You can edit this macro to contain the path name of your own
++# favorite module and then use it as a shorthand to load it.  You
++# still need the module-address, however.
++#
++# The internal function ``mod-validate'' set the GDB variable $mod
++# as a ``struct module*'' if the kernel known the module otherwise
++# $mod is set to NULL.  This ensure to not add symbols for a wrong
++# address.
++#
++# Have a nice hacking day !
++#
++#
++define mod-list
++    set $mod = (struct module*)module_list
++    # the last module is the kernel, ignore it
++    while $mod != &kernel_module
++    	printf "%p\t%s\n", (long)$mod, ($mod)->name
++	set $mod = $mod->next
++    end
++end
++document mod-list
++List all modules in the form: <module-address> <module-name>
++Use the <module-address> as the argument for the other
++mod-commands: mod-print-symbols, mod-add-symbols.
++end
++
++define mod-validate
++    set $mod = (struct module*)module_list
++    while ($mod != $arg0) && ($mod != &kernel_module)
++    	set $mod = $mod->next
++    end
++    if $mod == &kernel_module
++	set $mod = 0
++    	printf "%p is not a module\n", $arg0
++    end
++end
++document mod-validate
++mod-validate <module-address>
++Internal user-command used to validate the module parameter.
++If <module> is a real loaded module, set $mod to it otherwise set $mod to 0.
++end
++
++
++define mod-print-symbols
++    mod-validate $arg0
++    if $mod != 0
++	set $i = 0
++	while $i < $mod->nsyms
++	    set $sym = $mod->syms[$i]
++	    printf "%p\t%s\n", $sym->value, $sym->name
++	    set $i = $i + 1
++	end
++    end
++end
++document mod-print-symbols
++mod-print-symbols <module-address>
++Print all exported symbols of the module.  see mod-list
++end
++
++
++define mod-add-symbols-align
++    mod-validate $arg0
++    if $mod != 0
++	set $mod_base = ($mod->size_of_struct + (long)$mod)
++	if ($arg2 != 0) && (($mod_base & ($arg2 - 1)) != 0)
++	    set $mod_base = ($mod_base | ($arg2 - 1)) + 1
++	end
++	add-symbol-file $arg1 $mod_base
++    end
++end
++document mod-add-symbols-align
++mod-add-symbols-align <module-address> <object file path name> <align>
++Load the symbols table of the module from the object file where
++first section aligment is <align>.
++To retreive alignment, use `objdump -h <object file path name>'.
++end
++
++define mod-add-symbols
++    mod-add-symbols-align $arg0 $arg1 sizeof(long)
++end
++document mod-add-symbols
++mod-add-symbols <module-address> <object file path name>
++Load the symbols table of the module from the object file.
++Default alignment is 4.  See mod-add-symbols-align.
++end
++
++define mod-add-lis
++    mod-add-symbols-align $arg0 /usr/src/LiS/streams.o 16
++end
++document mod-add-lis
++mod-add-lis <module-address>
++Does mod-add-symbols <module-address> /usr/src/LiS/streams.o
++end
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/i386/kgdb/kgdbeth.txt	2003-12-28 23:21:09.000000000 -0800
+@@ -0,0 +1,92 @@
++KGDB over ethernet
++==================
++
++Authors
++-------
++
++Robert Walsh <rjwalsh@durables.org>  (2.6 port)
++wangdi <wangdi@clusterfs.com>        (2.6 port)
++Matt Mackall <mpm@selenic.com>       (netpoll api)
++San Mehat                            (original 2.4 code)
++
++
++Introduction
++------------
++
++KGDB supports debugging over ethernet (kgdboe) via polling of a given
++network interface. Most cards should be supported automatically.
++Debugging facilities are available as soon as the network driver and
++kgdboe have initialized. Unfortunately, this is too late in the boot
++process for debugging some issues, but works quite well for many
++others. This should not interfere with normal network usage and
++doesn't require a dedicated NIC.
++
++Terminology
++-----------
++
++This document uses the following terms:
++
++  TARGET: the machine being debugged.
++  HOST:   the machine running gdb.
++
++
++Usage
++-----
++
++You need to use the following command-line option on the TARGET kernel:
++
++  kgdboe=[tgt-port]@<tgt-ip>/[dev],[host-port]@<host-ip>/[host-macaddr]
++
++    where
++        tgt-port      source for UDP packets (defaults to 6443)
++        tgt-ip        source IP to use (interface address)
++        dev           network interface (eth0)
++        host-port     HOST UDP port (6442) (not really used)
++        host-ip       IP address for HOST machine
++        host-macaddr  ethernet MAC address for HOST (ff:ff:ff:ff:ff:ff)
++
++  examples:
++
++    kgdboe=7000@192.168.0.1/eth1,7001@192.168.0.2/00:05:3C:04:47:5D
++        this machine is 192.168.0.1 on eth1
++        remote machine is 192.168.0.2 with MAC address 00:05:3C:04:47:5D
++        listen for gdb packets on port 7000
++        send unsolicited gdb packets to port 7001
++
++    kgdboe=@192.168.0.1/,@192.168.0.2/
++        this machine is 192.168.0.1 on default interface eth0
++        remote machine is 192.168.0.2, use default broadcast MAC address
++        listen for gdb packets on default port 6443
++        send unsolicited gdb packets to port 6442
++
++Only packets originating from the configured HOST IP address will be
++accepted by the debugger.
++
++On the HOST side, run gdb as normal and use a remote UDP host as the
++target:
++
++   % gdb ./vmlinux
++   GNU gdb Red Hat Linux (5.3post-0.20021129.18rh)
++   Copyright 2003 Free Software Foundation, Inc.
++   GDB is free software, covered by the GNU General Public License, and you are
++   welcome to change it and/or distribute copies of it under certain conditions.
++   Type "show copying" to see the conditions.
++   There is absolutely no warranty for GDB.  Type "show warranty" for details.
++   This GDB was configured as "i386-redhat-linux-gnu"...
++   (gdb) target remote udp:HOSTNAME:6443
++
++You can now continue as if you were debugging over a serial line.
++
++Limitations
++-----------
++
++The current release of this code is exclusive of using kgdb on a
++serial interface, so you must boot without the kgdboe option to use
++serial debugging. Trying to debug the network driver while using it
++will prove interesting.
++
++Bug reports
++-----------
++
++Send bug reports to Robert Walsh <rjwalsh@durables.org> and Matt
++Mackall <mpm@selenic.com>.
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/i386/kgdb/kgdb.txt	2003-12-28 23:21:07.000000000 -0800
+@@ -0,0 +1,775 @@
++Last edit: <20030806.1637.12>
++This file has information specific to the i386 kgdb option.  Other
++platforms with the kgdb option may behave in a similar fashion.
++
++New features:
++============
++20030806.1557.37
++This version was made against the 2.6.0-test2 kernel. We have made the
++following changes:
++
++- The getthread() code in the stub calls find_task_by_pid().  It fails
++  if we are early in the bring up such that the pid arrays have yet to
++  be allocated.  We have added a line to kernel/pid.c to make
++  "kgdb_pid_init_done" true once the arrays are allocated.  This way the
++  getthread() code knows not to call.  This is only used by the thread
++  debugging stuff and threads will not yet exist at this point in the
++  boot.
++
++- For some reason, gdb was not asking for a new thread list when the
++  "info thread" command was given.  We changed to the newer version of
++  the thread info command and gdb now seems to ask when needed.  Result,
++  we now get all threads in the thread list.
++
++- We now respond to the ThreadExtraInfo request from gdb with the thread
++  name from task_struct .comm.  This then appears in the thread list.
++  Thoughts on additional options for this are welcome.  Things such as
++  "has BKL" and "Preempted" come to mind.  I think we could have a flag
++  word that could enable different bits of info here.
++
++- We now honor, sort of, the C and S commands.  These are continue and
++  single set after delivering a signal.  We ignore the signal and do the
++  requested action.  This only happens when we told gdb that a signal
++  was the reason for entry, which is only done on memory faults.  The
++  result is that you can now continue into the Oops.
++
++- We changed the -g to -gdwarf-2.  This seems to be the same as -ggdb,
++  but it is more exact on what language to use.
++
++- We added two dwarf2 include files and a bit of code at the end of
++  entry.S.  This does not yet work, so it is disabled.  Still we want to
++  keep track of the code and "maybe" someone out there can fix it.
++
++- Randy Dunlap sent some fix ups for this file which are now merged.
++
++- Hugh Dickins sent a fix to a bit of code in traps.c that prevents a
++  compiler warning if CONFIG_KGDB is off (now who would do that :).
++
++- Andrew Morton sent a fix for the serial driver which is now merged.
++
++- Andrew also sent a change to the stub around the cpu managment code
++  which is also merged.
++
++- Andrew also sent a patch to make "f" as well as "g" work as SysRq
++  commands to enter kgdb, merged.
++
++- If CONFIG_KGDB and CONFIG_DEBUG_SPINLOCKS are both set we added a
++  "who" field to the spinlock data struct.  This is filled with
++  "current" when ever the spinlock suceeds.  Useful if you want to know
++  who has the lock.
++
++_ And last, but not least, we fixed the "get_cu" macro to properly get
++  the current value of "current".
++
++New features:
++============
++20030505.1827.27
++We are starting to align with the sourceforge version, at least in
++commands.  To this end, the boot command string to start kgdb at
++boot time has been changed from "kgdb" to "gdb".
++
++Andrew Morton sent a couple of patches which are now included as follows:
++1.) We now return a flag to the interrupt handler.
++2.) We no longer use smp_num_cpus (a conflict with the lock meter).
++3.) And from William Lee Irwin III <wli@holomorphy.com> code to make
++    sure high-mem is set up before we attempt to register our interrupt
++    handler.
++We now include asm/kgdb.h from config.h so you will most likely never
++have to include it.  It also 'NULLS' the kgdb macros you might have in
++your code when CONFIG_KGDB is not defined.  This allows you to just
++turn off CONFIG_KGDB to turn off all the kgdb_ts() calls and such.
++This include is conditioned on the machine being an x86 so as to not
++mess with other archs.
++
++20020801.1129.03
++This is currently the version for the 2.4.18 (and beyond?) kernel.
++
++We have several new "features" beginning with this version:
++
++1.) Kgdb now syncs the "other" CPUs with a cross-CPU NMI.  No more
++    waiting and it will pull that guy out of an IRQ off spin lock :)
++
++2.) We doctored up the code that tells where a task is waiting and
++    included it so that the "info thread" command will show a bit more
++    than "schedule()".  Try it...
++
++3.) Added the ability to call a function from gdb.  All the standard gdb
++    issues apply, i.e. if you hit a breakpoint in the function, you are
++    not allowed to call another (gdb limitation, not kgdb).  To help
++    this capability we added a memory allocation function.  Gdb does not
++    return this memory (it is used for strings that you pass to that function
++    you are calling from gdb) so we fixed up a way to allow you to
++    manually return the memory (see below).
++
++4.) Kgdb time stamps (kgdb_ts()) are enhanced to expand what was the
++    interrupt flag to now also include the preemption count and the
++    "in_interrupt" info.  The flag is now called "with_pif" to indicate
++    the order, preempt_count, in_interrupt, flag.  The preempt_count is
++    shifted left by 4 bits so you can read the count in hex by dropping
++    the low order digit.  In_interrupt is in bit 1, and the flag is in
++    bit 0.
++
++5.) The command: "p kgdb_info" is now expanded and prints something
++    like:
++(gdb) p kgdb_info
++$2 = {used_malloc = 0, called_from = 0xc0107506, entry_tsc = 67468627259,
++  errcode = 0, vector = 3, print_debug_info = 0, hold_on_sstep = 1,
++  cpus_waiting = {{task = 0xc027a000, pid = 32768, hold = 0,
++      regs = 0xc027bf84}, {task = 0x0, pid = 0, hold = 0, regs = 0x0}}}
++
++    Things to note here: a.) used_malloc is the amount of memory that
++    has been malloc'ed to do calls from gdb.  You can reclaim this
++    memory like this: "p kgdb_info.used_malloc=0" Cool, huh?  b.)
++    cpus_waiting is now "sized" by the number of CPUs you enter at
++    configure time in the kgdb configure section.  This is NOT used
++    anywhere else in the system, but it is "nice" here.  c.)  The task's
++    "pid" is now in the structure.  This is the pid you will need to use
++    to decode to the thread id to get gdb to look at that thread.
++    Remember that the "info thread" command prints a list of threads
++    wherein it numbers each thread with its reference number followed
++    by the thread's pid.  Note that the per-CPU idle threads actually
++    have pids of 0 (yes, there is more than one pid 0 in an SMP system).
++    To avoid confusion, kgdb numbers these threads with numbers beyond
++    the MAX_PID.  That is why you see 32768 and above.
++
++6.) A subtle change, we now provide the complete register set for tasks
++    that are active on the other CPUs.  This allows better trace back on
++    those tasks.
++
++    And, let's mention what we could not fix.  Back-trace from all but the
++    thread that we trapped will, most likely, have a bogus entry in it.
++    The problem is that gdb does not recognize the entry code for
++    functions that use "current" near (at all?) the entry.  The compiler
++    is putting the "current" decode as the first two instructions of the
++    function where gdb expects to find %ebp changing code.  Back trace
++    also has trouble with interrupt frames.  I am talking with Daniel
++    Jacobowitz about some way to fix this, but don't hold your breath.
++
++20011220.0050.35
++Major enhancement with this version is the ability to hold one or more
++CPUs in an SMP system while allowing the others to continue.  Also, by
++default only the current CPU is enabled on single-step commands (please
++note that gdb issues single-step commands at times other than when you
++use the si command).
++
++Another change is to collect some useful information in
++a global structure called "kgdb_info".  You should be able to just:
++
++p kgdb_info
++
++although I have seen cases where the first time this is done gdb just
++prints the first member but prints the whole structure if you then enter
++CR (carriage return or enter).  This also works:
++
++p *&kgdb_info
++
++Here is a sample:
++(gdb) p kgdb_info
++$4 = {called_from = 0xc010732c, entry_tsc = 32804123790856, errcode = 0,
++  vector = 3, print_debug_info = 0}
++
++"Called_from" is the return address from the current entry into kgdb.
++Sometimes it is useful to know why you are in kgdb, for example, was
++it an NMI or a real breakpoint?  The simple way to interrogate this
++return address is:
++
++l *0xc010732c
++
++which will print the surrounding few lines of source code.
++
++"Entry_tsc" is the CPU TSC on entry to kgdb (useful to compare to the
++kgdb_ts entries).
++
++"errcode" and "vector" are other entry parameters which may be helpful on
++some traps.
++
++"print_debug_info" is the internal debugging kgdb print enable flag.  Yes,
++you can modify it.
++
++In SMP systems kgdb_info also includes the "cpus_waiting" structure and
++"hold_on_step":
++
++(gdb) p kgdb_info
++$7 = {called_from = 0xc0112739, entry_tsc = 1034936624074, errcode = 0,
++  vector = 2, print_debug_info = 0, hold_on_sstep = 1, cpus_waiting = {{
++      task = 0x0, hold = 0, regs = 0x0}, {task = 0xc71b8000, hold = 0,
++      regs = 0xc71b9f70}, {task = 0x0, hold = 0, regs = 0x0}, {task = 0x0,
++      hold = 0, regs = 0x0}, {task = 0x0, hold = 0, regs = 0x0}, {task = 0x0,
++      hold = 0, regs = 0x0}, {task = 0x0, hold = 0, regs = 0x0}, {task = 0x0,
++      hold = 0, regs = 0x0}}}
++
++"Cpus_waiting" has an entry for each CPU other than the current one that
++has been stopped.  Each entry contains the task_struct address for that
++CPU, the address of the regs for that task and a hold flag.  All these
++have the proper typing so that, for example:
++
++p *kgdb_info.cpus_waiting[1].regs
++
++will print the registers for CPU 1.
++
++"Hold_on_sstep" is a new feature with this version and comes up set or
++true.  What this means is that whenever kgdb is asked to single-step all
++other CPUs are held (i.e. not allowed to execute).  The flag applies to
++all but the current CPU and, again, can be changed:
++
++p kgdb_info.hold_on_sstep=0
++
++restores the old behavior of letting all CPUs run during single-stepping.
++
++Likewise, each CPU has a "hold" flag, which if set, locks that CPU out
++of execution.  Note that this has some risk in cases where the CPUs need
++to communicate with each other.  If kgdb finds no CPU available on exit,
++it will push a message thru gdb and stay in kgdb.  Note that it is legal
++to hold the current CPU as long as at least one CPU can execute.
++
++20010621.1117.09
++This version implements an event queue.  Events are signaled by calling
++a function in the kgdb stub and may be examined from gdb.  See EVENTS
++below for details.  This version also tightens up the interrupt and SMP
++handling to not allow interrupts on the way to kgdb from a breakpoint
++trap.  It is fine to allow these interrupts for user code, but not
++system debugging.
++
++Version
++=======
++
++This version of the kgdb package was developed and tested on
++kernel version 2.4.16.  It will not install on any earlier kernels.
++It is possible that it will continue to work on later versions
++of 2.4 and then versions of 2.5 (I hope).
++
++
++Debugging Setup
++===============
++
++Designate one machine as the "development" machine.  This is the
++machine on which you run your compiles and which has your source
++code for the kernel.  Designate a second machine as the "target"
++machine.  This is the machine that will run your experimental
++kernel.
++
++The two machines will be connected together via a serial line out
++one or the other of the COM ports of the PC.  You will need the
++appropriate modem eliminator (null modem) cable(s) for this.
++
++Decide on which tty port you want the machines to communicate, then
++connect them up back-to-back using the null modem cable.  COM1 is
++/dev/ttyS0 and COM2 is /dev/ttyS1. You should test this connection
++with the two machines prior to trying to debug a kernel.  Once you
++have it working, on the TARGET machine, enter:
++
++setserial /dev/ttyS0 (or what ever tty you are using)
++
++and record the port address and the IRQ number.
++
++On the DEVELOPMENT machine you need to apply the patch for the kgdb
++hooks.  You have probably already done that if you are reading this
++file.
++
++On your DEVELOPMENT machine, go to your kernel source directory and do
++"make Xconfig" where X is one of "x", "menu", or "".  If you are
++configuring in the standard serial driver, it must not be a module.
++Either yes or no is ok, but making the serial driver a module means it
++will initialize after kgdb has set up the UART interrupt code and may
++cause a failure of the control-C option discussed below.  The configure
++question for the serial driver is under the "Character devices" heading
++and is:
++
++"Standard/generic (8250/16550 and compatible UARTs) serial support"
++
++Go down to the kernel debugging menu item and open it up.  Enable the
++kernel kgdb stub code by selecting that item.  You can also choose to
++turn on the "-ggdb -O1" compile options.  The -ggdb causes the compiler
++to put more debug info (like local symbols) in the object file.  On the
++i386 -g and -ggdb are the same so this option just reduces to "O1".  The
++-O1 reduces the optimization level.  This may be helpful in some cases,
++be aware, however, that this may also mask the problem you are looking
++for.
++
++The baud rate.  Default is 115200.  What ever you choose be sure that
++the host machine is set to the same speed.  I recommend the default.
++
++The port.  This is the I/O address of the serial UART that you should
++have gotten using setserial as described above.  The standard COM1 port
++(3f8) using IRQ 4 is default.  COM2 is 2f8 which by convention uses IRQ
++3.
++
++The port IRQ (see above).
++
++Stack overflow test.  This option makes a minor change in the trap,
++system call and interrupt code to detect stack overflow and transfer
++control to kgdb if it happens.  (Some platforms have this in the
++baseline code, but the i386 does not.)
++
++You can also configure the system to recognize the boot option
++"console=kgdb" which if given will cause all console output during
++booting to be put thru gdb as well as other consoles.  This option
++requires that gdb and kgdb be connected prior to sending console output
++so, if they are not, a breakpoint is executed to force the connection.
++This will happen before any kernel output (it is going thru gdb, right),
++and will stall the boot until the connection is made.
++
++You can also configure in a patch to SysRq to enable the kGdb SysRq.
++This request generates a breakpoint.  Since the serial port IRQ line is
++set up after any serial drivers, it is possible that this command will
++work when the control-C will not.
++
++Save and exit the Xconfig program.  Then do "make clean" , "make dep"
++and "make bzImage" (or whatever target you want to make).  This gets the
++kernel compiled with the "-g" option set -- necessary for debugging.
++
++You have just built the kernel on your DEVELOPMENT machine that you
++intend to run on your TARGET machine.
++
++To install this new kernel, use the following installation procedure.
++Remember, you are on the DEVELOPMENT machine patching the kernel source
++for the kernel that you intend to run on the TARGET machine.
++
++Copy this kernel to your target machine using your usual procedures.  I
++usually arrange to copy development:
++/usr/src/linux/arch/i386/boot/bzImage to /vmlinuz on the TARGET machine
++via a LAN based NFS access.  That is, I run the cp command on the target
++and copy from the development machine via the LAN.  Run Lilo (see "man
++lilo" for details on how to set this up) on the new kernel on the target
++machine so that it will boot!  Then boot the kernel on the target
++machine.
++
++On the DEVELOPMENT machine, create a file called .gdbinit in the
++directory /usr/src/linux.  An example .gdbinit file looks like this:
++
++shell echo -e "\003" >/dev/ttyS0
++set remotebaud 38400 (or what ever speed you have chosen)
++target remote /dev/ttyS0
++
++
++Change the "echo" and "target" definition so that it specifies the tty
++port that you intend to use.  Change the "remotebaud" definition to
++match the data rate that you are going to use for the com line.
++
++You are now ready to try it out.
++
++Boot your target machine with "kgdb" in the boot command i.e. something
++like:
++
++lilo> test kgdb
++
++or if you also want console output thru gdb:
++
++lilo> test kgdb console=kgdb
++
++You should see the lilo message saying it has loaded the kernel and then
++all output stops.  The kgdb stub is trying to connect with gdb.  Start
++gdb something like this:
++
++
++On your DEVELOPMENT machine, cd /usr/src/linux and enter "gdb vmlinux".
++When gdb gets the symbols loaded it will read your .gdbinit file and, if
++everything is working correctly, you should see gdb print out a few
++lines indicating that a breakpoint has been taken.  It will actually
++show a line of code in the target kernel inside the kgdb activation
++code.
++
++The gdb interaction should look something like this:
++
++    linux-dev:/usr/src/linux# gdb vmlinux
++    GDB is free software and you are welcome to distribute copies of it
++     under certain conditions; type "show copying" to see the conditions.
++    There is absolutely no warranty for GDB; type "show warranty" for details.
++    GDB 4.15.1 (i486-slackware-linux),
++    Copyright 1995 Free Software Foundation, Inc...
++    breakpoint () at i386-stub.c:750
++    750     }
++    (gdb)
++
++You can now use whatever gdb commands you like to set breakpoints.
++Enter "continue" to start your target machine executing again.  At this
++point the target system will run at full speed until it encounters
++your breakpoint or gets a segment violation in the kernel, or whatever.
++
++If you have the kgdb console enabled when you continue, gdb will print
++out all the console messages.
++
++The above example caused a breakpoint relatively early in the boot
++process.  For the i386 kgdb it is possible to code a break instruction
++as the first C-language point in init/main.c, i.e. as the first instruction
++in start_kernel().  This could be done as follows:
++
++#include <asm/kgdb.h>
++	 breakpoint();
++
++This breakpoint() is really a function that sets up the breakpoint and
++single-step hardware trap cells and then executes a breakpoint.  Any
++early hard coded breakpoint will need to use this function.  Once the
++trap cells are set up they need not be set again, but doing it again
++does not hurt anything, so you don't need to be concerned about which
++breakpoint is hit first.  Once the trap cells are set up (and the kernel
++sets them up in due course even if breakpoint() is never called) the
++macro:
++
++BREAKPOINT;
++
++will generate an inline breakpoint.  This may be more useful as it stops
++the processor at the instruction instead of in a function a step removed
++from the location of interest.  In either case <asm/kgdb.h> must be
++included to define both breakpoint() and BREAKPOINT.
++
++Triggering kgdbstub at other times
++==================================
++
++Often you don't need to enter the debugger until much later in the boot
++or even after the machine has been running for some time.  Once the
++kernel is booted and interrupts are on, you can force the system to
++enter the debugger by sending a control-C to the debug port. This is
++what the first line of the recommended .gdbinit file does.  This allows
++you to start gdb any time after the system is up as well as when the
++system is already at a breakpoint.  (In the case where the system is
++already at a breakpoint the control-C is not needed, however, it will
++be ignored by the target so no harm is done.  Also note the the echo
++command assumes that the port speed is already set.  This will be true
++once gdb has connected, but it is best to set the port speed before you
++run gdb.)
++
++Another simple way to do this is to put the following file in you ~/bin
++directory:
++
++#!/bin/bash
++echo  -e "\003"  > /dev/ttyS0
++
++Here, the ttyS0 should be replaced with what ever port you are using.
++The "\003" is control-C.  Once you are connected with gdb, you can enter
++control-C at the command prompt.
++
++An alternative way to get control to the debugger is to enable the kGdb
++SysRq command.  Then you would enter Alt-SysRq-g (all three keys at the
++same time, but push them down in the order given).  To refresh your
++memory of the available SysRq commands try Alt-SysRq-=.  Actually any
++undefined command could replace the "=", but I like to KNOW that what I
++am pushing will never be defined.
++
++Debugging hints
++===============
++
++You can break into the target machine at any time from the development
++machine by typing ^C (see above paragraph).  If the target machine has
++interrupts enabled this will stop it in the kernel and enter the
++debugger.
++
++There is unfortunately no way of breaking into the kernel if it is
++in a loop with interrupts disabled, so if this happens to you then
++you need to place exploratory breakpoints or printk's into the kernel
++to find out where it is looping.  The exploratory breakpoints can be
++entered either thru gdb or hard coded into the source.  This is very
++handy if you do something like:
++
++if (<it hurts>) BREAKPOINT;
++
++
++There is a copy of an e-mail in the Documentation/i386/kgdb/ directory
++(debug-nmi.txt) which describes how to create an NMI on an ISA bus
++machine using a paper clip.  I have a sophisticated version of this made
++by wiring a push button switch into a PC104/ISA bus adapter card.  The
++adapter card nicely furnishes wire wrap pins for all the ISA bus
++signals.
++
++When you are done debugging the kernel on the target machine it is a
++good idea to leave it in a running state.  This makes reboots faster,
++bypassing the fsck.  So do a gdb "continue" as the last gdb command if
++this is possible.  To terminate gdb itself on the development machine
++and leave the target machine running, first clear all breakpoints and
++continue, then type ^Z to suspend gdb and then kill it with "kill %1" or
++something similar.
++
++If gdbstub Does Not Work
++========================
++
++If it doesn't work, you will have to troubleshoot it.  Do the easy
++things first like double checking your cabling and data rates.  You
++might try some non-kernel based programs to see if the back-to-back
++connection works properly.  Just something simple like cat /etc/hosts
++>/dev/ttyS0 on one machine and cat /dev/ttyS0 on the other will tell you
++if you can send data from one machine to the other.  Make sure it works
++in both directions.  There is no point in tearing out your hair in the
++kernel if the line doesn't work.
++
++All of the real action takes place in the file
++/usr/src/linux/arch/i386/kernel/kgdb_stub.c.  That is the code on the target
++machine that interacts with gdb on the development machine.  In gdb you can
++turn on a debug switch with the following command:
++
++	set remotedebug
++
++This will print out the protocol messages that gdb is exchanging with
++the target machine.
++
++Another place to look is /usr/src/arch/i386/lib/kgdb_serial.c. This is
++the code that talks to the serial port on the target side.  There might
++be a problem there.  In particular there is a section of this code that
++tests the UART which will tell you what UART you have if you define
++"PRNT" (just remove "_off" from the #define PRNT_off).  To view this
++report you will need to boot the system without any beakpoints.  This
++allows the kernel to run to the point where it calls kgdb to set up
++interrupts.  At this time kgdb will test the UART and print out the type
++it finds.  (You need to wait so that the printks are actually being
++printed.  Early in the boot they are cached, waiting for the console to
++be enabled.  Also, if kgdb is entered thru a breakpoint it is possible
++to cause a dead lock by calling printk when the console is locked.  The
++stub thus avoids doing printks from breakpoints, especially in the
++serial code.)  At this time, if the UART fails to do the expected thing,
++kgdb will print out (using printk) information on what failed.  (These
++messages will be buried in all the other boot up messages.  Look for
++lines that start with "gdb_hook_interrupt:".  You may want to use dmesg
++once the system is up to view the log.  If this fails or if you still
++don't connect, review your answers for the port address.  Use:
++
++setserial /dev/ttyS0
++
++to get the current port and IRQ information.  This command will also
++tell you what the system found for the UART type. The stub recognizes
++the following UART types:
++
++16450, 16550, and 16550A
++
++If you are really desperate you can use printk debugging in the
++kgdbstub code in the target kernel until you get it working.  In particular,
++there is a global variable in /usr/src/linux/arch/i386/kernel/kgdb_stub.c
++named "remote_debug".  Compile your kernel with this set to 1, rather
++than 0 and the debug stub will print out lots of stuff as it does
++what it does.  Likewise there are debug printks in the kgdb_serial.c
++code that can be turned on with simple changes in the macro defines.
++
++
++Debugging Loadable Modules
++==========================
++
++This technique comes courtesy of Edouard Parmelan
++<Edouard.Parmelan@quadratec.fr>
++
++When you run gdb, enter the command
++
++source gdbinit-modules
++
++This will read in a file of gdb macros that was installed in your
++kernel source directory when kgdb was installed.  This file implements
++the following commands:
++
++mod-list
++    Lists the loaded modules in the form <module-address> <module-name>
++
++mod-print-symbols <module-address>
++    Prints all the symbols in the indicated module.
++
++mod-add-symbols <module-address> <object-file-path-name>
++    Loads the symbols from the object file and associates them
++    with the indicated module.
++
++After you have loaded the module that you want to debug, use the command
++mod-list to find the <module-address> of your module.  Then use that
++address in the mod-add-symbols command to load your module's symbols.
++From that point onward you can debug your module as if it were a part
++of the kernel.
++
++The file gdbinit-modules also contains a command named mod-add-lis as
++an example of how to construct a command of your own to load your
++favorite module.  The idea is to "can" the pathname of the module
++in the command so you don't have to type so much.
++
++Threads
++=======
++
++Each process in a target machine is seen as a gdb thread. gdb thread
++related commands (info threads, thread n) can be used.
++
++ia-32 hardware breakpoints
++==========================
++
++kgdb stub contains support for hardware breakpoints using debugging features
++of ia-32(x86) processors. These breakpoints do not need code modification.
++They use debugging registers. 4 hardware breakpoints are available in ia-32
++processors.
++
++Each hardware breakpoint can be of one of the following three types.
++
++1. Execution breakpoint - An Execution breakpoint is triggered when code
++	at the breakpoint address is executed.
++
++	As limited number of hardware breakpoints are available, it is
++	advisable to use software breakpoints ( break command ) instead
++	of execution hardware breakpoints, unless modification of code
++	is to be avoided.
++
++2. Write breakpoint - A write breakpoint is triggered when memory
++	location at the breakpoint address is written.
++
++	A write or can be placed for data of variable length. Length of
++	a write breakpoint indicates length of the datatype to be
++	watched. Length is 1 for 1 byte data , 2 for 2 byte data, 3 for
++	4 byte data.
++
++3. Access breakpoint - An access breakpoint is triggered when memory
++	location at the breakpoint address is either read or written.
++
++	Access breakpoints also have lengths similar to write breakpoints.
++
++IO breakpoints in ia-32 are not supported.
++
++Since gdb stub at present does not use the protocol used by gdb for hardware
++breakpoints, hardware breakpoints are accessed through gdb macros. gdb macros
++for hardware breakpoints are described below.
++
++hwebrk	- Places an execution breakpoint
++	hwebrk breakpointno address
++hwwbrk	- Places a write breakpoint
++	hwwbrk breakpointno length address
++hwabrk	- Places an access breakpoint
++	hwabrk breakpointno length address
++hwrmbrk	- Removes a breakpoint
++	hwrmbrk breakpointno
++exinfo	- Tells whether a software or hardware breakpoint has occurred.
++	Prints number of the hardware breakpoint if a hardware breakpoint has
++	occurred.
++
++Arguments required by these commands are as follows
++breakpointno	- 0 to 3
++length		- 1 to 3
++address		- Memory location in hex digits ( without 0x ) e.g c015e9bc
++
++SMP support
++==========
++
++When a breakpoint occurs or user issues a break ( Ctrl + C ) to gdb
++client, all the processors are forced to enter the debugger. Current
++thread corresponds to the thread running on the processor where
++breakpoint occurred.  Threads running on other processor(s) appear
++similar to other non-running threads in the 'info threads' output.
++Within the kgdb stub there is a structure "waiting_cpus" in which kgdb
++records the values of "current" and "regs" for each CPU other than the
++one that hit the breakpoint.  "current" is a pointer to the task
++structure for the task that CPU is running, while "regs" points to the
++saved registers for the task.  This structure can be examined with the
++gdb "p" command.
++
++ia-32 hardware debugging registers on all processors are set to same
++values.  Hence any hardware breakpoints may occur on any processor.
++
++gdb troubleshooting
++===================
++
++1. gdb hangs
++Kill it. restart gdb. Connect to target machine.
++
++2. gdb cannot connect to target machine (after killing a gdb and
++restarting another) If the target machine was not inside debugger when
++you killed gdb, gdb cannot connect because the target machine won't
++respond.  In this case echo "Ctrl+C"(ASCII 3) to the serial line.
++e.g. echo -e "\003" > /dev/ttyS1
++This forces that target machine into the debugger, after which you
++can connect.
++
++3. gdb cannot connect even after echoing Ctrl+C into serial line
++Try changing serial line settings min to 1 and time to 0
++e.g. stty min 1 time 0 < /dev/ttyS1
++Try echoing again
++
++Check serial line speed and set it to correct value if required
++e.g. stty ispeed 115200 ospeed 115200 < /dev/ttyS1
++
++EVENTS
++======
++
++Ever want to know the order of things happening?  Which CPU did what and
++when?  How did the spinlock get the way it is?  Then events are for
++you.  Events are defined by calls to an event collection interface and
++saved for later examination.  In this case, kgdb events are saved by a
++very fast bit of code in kgdb which is fully SMP and interrupt protected
++and they are examined by using gdb to display them.  Kgdb keeps only
++the last N events, where N must be a power of two and is defined at
++configure time.
++
++
++Events are signaled to kgdb by calling:
++
++kgdb_ts(data0,data1)
++
++For each call kgdb records each call in an array along with other info.
++Here is the array definition:
++
++struct kgdb_and_then_struct {
++#ifdef CONFIG_SMP
++	int	on_cpu;
++#endif
++	long long at_time;
++	int  	from_ln;
++	char	* in_src;
++	void	*from;
++        int     with_if;
++	int	data0;
++	int	data1;
++};
++
++For SMP machines the CPU is recorded, for all machines the TSC is
++recorded (gets a time stamp) as well as the line number and source file
++the call was made from.  The address of the (from), the "if" (interrupt
++flag) and the two data items are also recorded.  The macro kgdb_ts casts
++the types to int, so you can put any 32-bit values here.  There is a
++configure option to select the number of events you want to keep.  A
++nice number might be 128, but you can keep up to 1024 if you want.  The
++number must be a power of two.  An "andthen" macro library is provided
++for gdb to help you look at these events.  It is also possible to define
++a different structure for the event storage and cast the data to this
++structure.  For example the following structure is defined in kgdb:
++
++struct kgdb_and_then_struct2 {
++#ifdef CONFIG_SMP
++	int	on_cpu;
++#endif
++	long long at_time;
++	int  	from_ln;
++	char	* in_src;
++	void	*from;
++        int     with_if;
++	struct task_struct *t1;
++	struct task_struct *t2;
++};
++
++If you use this for display, the data elements will be displayed as
++pointers to task_struct entries.  You may want to define your own
++structure to use in casting.  You should only change the last two items
++and you must keep the structure size the same.  Kgdb will handle these
++as 32-bit ints, but within that constraint you can define a structure to
++cast to any 32-bit quantity.  This need only be available to gdb and is
++only used for casting in the display code.
++
++Final Items
++===========
++
++I picked up this code from Amit S. Kale and enhanced it.
++
++If you make some really cool modification to this stuff, or if you
++fix a bug, please let me know.
++
++George Anzinger
++<george@mvista.com>
++
++Amit S. Kale
++<akale@veritas.com>
++
++(First kgdb by David Grothe <dave@gcom.com>)
++
++(modified by Tigran Aivazian <tigran@sco.com>)
++    Putting gdbstub into the kernel config menu.
++
++(modified by Scott Foehner <sfoehner@engr.sgi.com>)
++    Hooks for entering gdbstub at boot time.
++
++(modified by Amit S. Kale <akale@veritas.com>)
++    Threads, ia-32 hw debugging, mp support, console support,
++    nmi watchdog handling.
++
++(modified by George Anzinger <george@mvista.com>)
++    Extended threads to include the idle threads.
++    Enhancements to allow breakpoint() at first C code.
++    Use of module_init() and __setup() to automate the configure.
++    Enhanced the cpu "collection" code to work in early bring-up.
++    Added ability to call functions from gdb
++    Print info thread stuff without going back to schedule()
++    Now collect the "other" cpus with an IPI/ NMI.
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/i386/kgdb/loadmodule.sh	2003-12-28 23:21:07.000000000 -0800
+@@ -0,0 +1,78 @@
++#/bin/sh
++# This script loads a module on a target machine and generates a gdb script.
++# source generated gdb script to load the module file at appropriate addresses
++# in gdb.
++#
++# Usage:
++# Loading the module on target machine and generating gdb script)
++#	[foo]$ loadmodule.sh <modulename>
++#
++# Loading the module file into gdb
++#	(gdb) source <gdbscriptpath>
++#
++# Modify following variables according to your setup.
++#	TESTMACHINE - Name of the target machine
++#	GDBSCRIPTS - The directory where a gdb script will be generated
++#
++# Author: Amit S. Kale (akale@veritas.com).
++#
++# If you run into problems, please check files pointed to by following
++# variables.
++#	ERRFILE - /tmp/<modulename>.errs contains stderr output of insmod
++#	MAPFILE - /tmp/<modulename>.map contains stdout output of insmod
++#	GDBSCRIPT - $GDBSCRIPTS/load<modulename> gdb script.
++
++TESTMACHINE=foo
++GDBSCRIPTS=/home/bar
++
++if [ $# -lt 1 ] ; then {
++	echo Usage: $0 modulefile
++	exit
++} ; fi
++
++MODULEFILE=$1
++MODULEFILEBASENAME=`basename $1`
++
++if [ $MODULEFILE = $MODULEFILEBASENAME ] ; then {
++	MODULEFILE=`pwd`/$MODULEFILE
++} fi
++
++ERRFILE=/tmp/$MODULEFILEBASENAME.errs
++MAPFILE=/tmp/$MODULEFILEBASENAME.map
++GDBSCRIPT=$GDBSCRIPTS/load$MODULEFILEBASENAME
++
++function findaddr() {
++	local ADDR=0x$(echo "$SEGMENTS" | \
++		grep "$1" | sed 's/^[^ ]*[ ]*[^ ]*[ ]*//' | \
++		sed 's/[ ]*[^ ]*$//')
++	echo $ADDR
++}
++
++function checkerrs() {
++	if [ "`cat $ERRFILE`" != "" ] ; then {
++		cat $ERRFILE
++		exit
++	} fi
++}
++
++#load the module
++echo Copying $MODULEFILE to $TESTMACHINE
++rcp $MODULEFILE root@${TESTMACHINE}:
++
++echo Loading module $MODULEFILE
++rsh -l root $TESTMACHINE  /sbin/insmod -m ./`basename $MODULEFILE` \
++	> $MAPFILE 2> $ERRFILE
++checkerrs
++
++SEGMENTS=`head -n 11 $MAPFILE | tail -n 10`
++TEXTADDR=$(findaddr "\\.text[^.]")
++LOADSTRING="add-symbol-file $MODULEFILE $TEXTADDR"
++SEGADDRS=`echo "$SEGMENTS" | awk '//{
++	if ($1 != ".text" && $1 != ".this" &&
++	    $1 != ".kstrtab" && $1 != ".kmodtab") {
++		print " -s " $1 " 0x" $3 " "
++	}
++}'`
++LOADSTRING="$LOADSTRING $SEGADDRS"
++echo Generating script $GDBSCRIPT
++echo $LOADSTRING > $GDBSCRIPT
+--- linux-2.6.0/Documentation/i386/zero-page.txt	2003-06-14 12:18:07.000000000 -0700
++++ 25/Documentation/i386/zero-page.txt	2003-12-28 23:22:56.000000000 -0800
+@@ -22,6 +22,7 @@ Offset	Type		Description
+ 			  0x90000 + contents of CL_OFFSET
+ 			(only taken, when CL_MAGIC = 0xA33F)
+  0x40	20 bytes	struct apm_bios_info, APM_BIOS_INFO
++ 0x60	16 bytes	Intel SpeedStep (IST) BIOS support information
+  0x80	16 bytes	hd0-disk-parameter from intvector 0x41
+  0x90	16 bytes	hd1-disk-parameter from intvector 0x46
+ 
+--- linux-2.6.0/Documentation/input/input.txt	2003-06-14 12:18:02.000000000 -0700
++++ 25/Documentation/input/input.txt	2003-12-28 23:23:06.000000000 -0800
+@@ -255,7 +255,7 @@ driver. 
+ is also emulated, characters should appear if you move it.
+ 
+   You can test the joystick emulation with the 'jstest' utility,
+-available in the joystick package (see Documentation/joystick.txt).
++available in the joystick package (see Documentation/input/joystick.txt).
+ 
+   You can test the event devices with the 'evtest' utility available
+ in the LinuxConsole project CVS archive (see the URL below).
+--- linux-2.6.0/Documentation/kbuild/kconfig-language.txt	2003-10-08 15:07:08.000000000 -0700
++++ 25/Documentation/kbuild/kconfig-language.txt	2003-12-28 23:23:04.000000000 -0800
+@@ -141,8 +141,8 @@ Expressions are listed in decreasing ord
+     otherwise 'y'.
+ (4) Returns the value of the expression. Used to override precedence.
+ (5) Returns the result of (2-/expr/).
+-(6) Returns the result of max(/expr/, /expr/).
+-(7) Returns the result of min(/expr/, /expr/).
++(6) Returns the result of min(/expr/, /expr/).
++(7) Returns the result of max(/expr/, /expr/).
+ 
+ An expression can have a value of 'n', 'm' or 'y' (or 0, 1, 2
+ respectively for calculations). A menu entry becomes visible when it's
+--- linux-2.6.0/Documentation/kbuild/modules.txt	2003-09-27 18:57:43.000000000 -0700
++++ 25/Documentation/kbuild/modules.txt	2003-12-28 23:23:06.000000000 -0800
+@@ -1,4 +1,4 @@
+-For now this is a raw copy from the old Documentation/modules.txt,
++For now this is a raw copy from the old Documentation/kbuild/modules.txt,
+ which was removed in 2.6.0-test5.
+ The information herein is correct but not complete.
+ 
+--- linux-2.6.0/Documentation/kernel-parameters.txt	2003-10-08 15:07:08.000000000 -0700
++++ 25/Documentation/kernel-parameters.txt	2003-12-28 23:23:06.000000000 -0800
+@@ -24,6 +24,7 @@ restrictions referred to are that the re
+ 	HW	Appropriate hardware is enabled.
+ 	IA-32	IA-32 aka i386 architecture is enabled.
+ 	IA-64	IA-64 architecture is enabled.
++	IOSCHED	More than one I/O scheduler is enabled.
+ 	IP_PNP	IP DCHP, BOOTP, or RARP is enabled.
+ 	ISAPNP	ISA PnP code is enabled.
+ 	ISDN	Appropriate ISDN support is enabled.
+@@ -91,6 +92,23 @@ running once the system is up.
+ 			ht -- run only enough ACPI to enable Hyper Threading
+ 			See also Documentation/pm.txt.
+  
++	acpi_pic_sci=	[HW,ACPI] ACPI System Control Interrupt trigger mode
++			Format: { level | edge }
++			level   Force PIC-mode SCI to Level Trigger (default)
++			edge    Force PIC-mode SCI to Edge Trigge
++
++	acpi_irq_balance	[HW,ACPI] ACPI will balance active IRQs
++				default in APIC mode
++
++	acpi_irq_nobalance	[HW,ACPI] ACPI will not move active IRQs (default)
++				default in PIC mode
++
++	acpi_irq_pci=	[HW,ACPI] If irq_balance, Clear listed IRQs for use by PCI
++			Format: <irq>,<irq>...
++
++	acpi_irq_isa=	[HW,ACPI] If irq_balance, Mark listed IRQs used by ISA
++			Format: <irq>,<irq>...
++
+ 	ad1816=		[HW,OSS]
+ 			Format: <io>,<irq>,<dma>,<dma2>
+ 			See also Documentation/sound/oss/AD1816.
+@@ -214,7 +232,7 @@ running once the system is up.
+ 			Forces specified timesource (if avaliable) to be used
+ 			when calculating gettimeofday(). If specicified timesource
+ 			is not avalible, it defaults to PIT. 
+-			Format: { pit | tsc | cyclone | ... }
++			Format: { pit | tsc | cyclone | pmtmr }
+ 
+ 	hpet=		[IA-32,HPET] option to disable HPET and use PIT.
+ 			Format: disable
+@@ -303,6 +321,10 @@ running once the system is up.
+ 			See comment before function elanfreq_setup() in
+ 			arch/i386/kernel/cpu/cpufreq/elanfreq.c.
+ 
++	elevator=	[IOSCHED]
++			Format: {"as"|"cfq"|"deadline"|"noop"}
++			See Documentation/as-iosched.txt for details
++
+ 	es1370=		[HW,OSS]
+ 			Format: <lineout>[,<micbias>]
+ 			See also header of sound/oss/es1370.c.
+@@ -790,7 +812,8 @@ running once the system is up.
+ 			before loading.
+ 			See Documentation/ramdisk.txt.
+ 
+-	psmouse_noext	[HW,MOUSE] Disable probing for PS2 mouse protocol extensions
++	psmouse_proto=  [HW,MOUSE] Highest PS2 mouse protocol extension to
++			probe for (bare|imps|exps).
+ 
+ 	psmouse_resetafter=
+ 			[HW,MOUSE] Try to reset Synaptics Touchpad after so many
+@@ -1144,7 +1167,7 @@ running once the system is up.
+ 			See header of drivers/scsi/wd7000.c.
+ 
+ 	wdt=		[WDT] Watchdog
+-			See Documentation/watchdog.txt.
++			See Documentation/watchdog/watchdog.txt.
+ 
+ 	xd=		[HW,XT] Original XT pre-IDE (RLL encoded) disks.
+ 	xd_geo=		See header of drivers/block/xd.c.
+--- linux-2.6.0/Documentation/kobject.txt	2003-09-08 13:58:55.000000000 -0700
++++ 25/Documentation/kobject.txt	2003-12-28 23:22:05.000000000 -0800
+@@ -2,7 +2,7 @@ The kobject Infrastructure
+ 
+ Patrick Mochel <mochel@osdl.org>
+ 
+-Updated: 3 June 2003
++Updated: 12 November 2003
+ 
+ 
+ Copyright (c)  2003 Patrick Mochel
+@@ -128,7 +128,33 @@ reference count or do other wacky things
+ (like the networking layer). 
+ 
+ 
+-1.4 sysfs
++1.4 Order dependencies
++
++Fields in a kobject must be initialized before they are used, as
++indicated in this table:
++
++	k_name		Before kobject_add() (1)
++	name		Before kobject_add() (1)
++	refcount	Before kobject_init() (2)
++	entry		Set by kobject_init()
++	parent		Before kobject_add() (3)
++	kset		Before kobject_init() (4)
++	ktype		Before kobject_add() (4)
++	dentry		Set by kobject_add()
++
++(1) If k_name isn't already set when kobject_add() is called,
++it will be set to name.
++
++(2) Although kobject_init() sets refcount to 1, a warning will be logged
++if refcount is not equal to 0 beforehand.
++
++(3) If parent isn't already set when kobject_add() is called,
++it will be set to kset's embedded kobject.
++
++(4) kset and ktype are optional. If they are used, they should be set
++at the times indicated.
++
++1.5 sysfs
+ 
+ Each kobject receives a directory in sysfs. This directory is created
+ under the kobject's parent directory. 
+@@ -210,7 +236,25 @@ kset_find_obj() may be used to locate a 
+ name. The kobject, if found, is returned. 
+ 
+ 
+-2.3 sysfs
++2.3 Order dependencies
++
++Fields in a kset must be initialized before they are used, as indicated
++in this table:
++
++	subsys		Before kset_add()
++	ktype		Before kset_add() (1)
++	list		Set by kset_init()
++	kobj		Before kset_init() (2)
++	hotplug_ops	Before kset_add() (1)
++
++(1) ktype and hotplug_ops are optional. If they are used, they should
++be set at the times indicated.
++
++(2) kobj is passed to kobject_init() during kset_init() and to
++kobject_add() during kset_add(); it must initialized accordingly.
++
++
++2.4 sysfs
+ 
+ ksets are represented in sysfs when their embedded kobjects are
+ registered. They follow the same rules of parenting, with one
+@@ -352,7 +396,21 @@ subsys_set_kset(obj,subsys)
+ - Sets obj->subsys.kset.kobj.kset to the subsystem's embedded kset.
+ 
+ 
+-4.4 sysfs
++4.4 Order dependencies
++
++Fields in a subsystem must be initialized before they are used,
++as indicated in this table:
++
++	kset		Before subsystem_register() (1)
++	rwsem		Set by subsystem_register()
++
++(1) kset is minimally initialized by the decl_subsys macro. It is
++passed to kset_init() and kset_add() by subsystem_register(). If its
++subsys member isn't already set, subsystem_register() sets it to the
++containing subsystem.
++
++
++4.5 sysfs
+ 
+ subsystems are represented in sysfs via their embedded kobjects. They
+ follow the same rules as previously mentioned with no exceptions. They
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/MSI-HOWTO.txt	2003-12-28 23:21:44.000000000 -0800
+@@ -0,0 +1,321 @@
++		The MSI Driver Guide HOWTO
++	Tom L Nguyen tom.l.nguyen@intel.com
++			10/03/2003
++
++1. About this guide
++
++This guide describes the basics of Message Signaled Interrupts(MSI), the
++advantages of using MSI over traditional interrupt mechanisms, and how
++to enable your driver to use MSI or MSI-X. Also included is a Frequently
++Asked Questions.
++
++2. Copyright 2003 Intel Corporation
++
++3. What is MSI/MSI-X?
++
++Message Signaled Interrupt (MSI), as described in the PCI Local Bus
++Specification Revision 2.3 or latest, is an optional feature, and a
++required feature for PCI Express devices. MSI enables a device function
++to request service by sending an Inbound Memory Write on its PCI bus to
++the FSB as a Message Signal Interrupt transaction. Because MSI is
++generated in the form of a Memory Write, all transaction conditions,
++such as a Retry, Master-Abort, Target-Abort or normal completion, are
++supported.
++
++A PCI device that supports MSI must also support pin IRQ assertion
++interrupt mechanism to provide backward compatibility for systems that
++do not support MSI. In Systems, which support MSI, the bus driver is
++responsible for initializing the message address and message data of
++the device function's MSI/MSI-X capability structure during device
++initial configuration.
++
++An MSI capable device function indicates MSI support by implementing
++the MSI/MSI-X capability structure in its PCI capability list. The
++device function may implement both the MSI capability structure and
++the MSI-X capability structure; however, the bus driver should not
++enable both, but instead enable only the MSI-X capability structure.
++
++The MSI capability structure contains Message Control register,
++Message Address register and Message Data register. These registers
++provide the bus driver control over MSI. The Message Control register
++indicates the MSI capability supported by the device. The Message
++Address register specifies the target address and the Message Data
++register specifies the characteristics of the message. To request
++service, the device function writes the content of the Message Data
++register to the target address. The device and its software driver
++are prohibited from writing to these registers.
++
++The MSI-X capability structure is an optional extension to MSI. It
++uses an independent and separate capability structure. There are
++some key advantages to implementing the MSI-X capability structure
++over the MSI capability structure as described below.
++
++	- Support a larger maximum number of vectors per function.
++
++	- Provide the ability for system software to configure
++	each vector with an independent message address and message
++	data, specified by a table that resides in Memory Space.
++
++        - MSI and MSI-X both support per-vector masking. Per-vector
++	masking is an optional extension of MSI but a required
++	feature for MSI-X. Per-vector masking provides the kernel
++	the ability to mask/unmask MSI when servicing its software
++	interrupt service routing handler. If per-vector masking is
++	not supported, then the device driver should provide the
++	hardware/software synchronization to ensure that the device
++	generates MSI when the driver wants it to do so.
++
++4. Why use MSI?
++
++As a benefit the simplification of board design, MSI allows board
++designers to remove out of band interrupt routing. MSI is another
++step towards a legacy-free environment.
++
++Due to increasing pressure on chipset and processor packages to
++reduce pin count, the need for interrupt pins is expected to
++diminish over time. Devices, due to pin constraints, may implement
++messages to increase performance.
++
++PCI Express endpoints uses INTx emulation (in-band messages) instead
++of IRQ pin assertion. Using INTx emulation requires interrupt
++sharing among devices connected to the same node (PCI bridge) while
++MSI is unique (non-shared) and does not require BIOS configuration
++support. As a result, the PCI Express technology requires MSI
++support for better interrupt performance.
++
++Using MSI enables the device functions to support two or more
++vectors, which can be configure to target different CPU's to
++increase scalability.
++
++5. Configuring a driver to use MSI/MSI-X
++
++By default, the kernel will not enable MSI/MSI-X on all devices that
++support this capability once the patch is installed. A kernel
++configuration option must be selected to enable MSI/MSI-X support.
++
++5.1 Including MSI support into the kernel
++
++To include MSI support into the kernel requires users to patch the
++VECTOR-base patch first and then the MSI patch because the MSI
++support needs VECTOR based scheme. Once these patches are installed,
++setting CONFIG_PCI_USE_VECTOR enables the VECTOR based scheme and
++the option for MSI-capable device drivers to selectively enable MSI
++(using pci_enable_msi as desribed below).
++
++Since the target of the inbound message is the local APIC, providing
++CONFIG_PCI_USE_VECTOR is dependent on whether CONFIG_X86_LOCAL_APIC
++is enabled or not.
++
++int pci_enable_msi(struct pci_dev *)
++
++With this new API, any existing device driver, which like to have
++MSI enabled on its device function, must call this explicitly. A
++successful call will initialize the MSI/MSI-X capability structure
++with ONE vector, regardless of whether the device function is
++capable of supporting multiple messages. This vector replaces the
++pre-assigned dev->irq with a new MSI vector. To avoid the conflict
++of new assigned vector with existing pre-assigned vector requires
++the device driver to call this API before calling request_irq(...).
++
++The below diagram shows the events, which switches the interrupt
++mode on the MSI-capable device function between MSI mode and
++PIN-IRQ assertion mode.
++
++	 ------------   pci_enable_msi 	 ------------------------
++	|	     | <===============	| 			 |
++	| MSI MODE   |	  	     	| PIN-IRQ ASSERTION MODE |
++	| 	     | ===============>	|			 |
++ 	 ------------	free_irq      	 ------------------------
++
++5.2 Configuring for MSI support
++
++Due to the non-contiguous fashion in vector assignment of the
++existing Linux kernel, this patch does not support multiple
++messages regardless of the device function is capable of supporting
++more than one vector. The bus driver initializes only entry 0 of
++this capability if pci_enable_msi(...) is called successfully by
++the device driver.
++
++5.3 Configuring for MSI-X support
++
++Both the MSI capability structure and the MSI-X capability structure
++share the same above semantics; however, due to the ability of the
++system software to configure each vector of the MSI-X capability
++structure with an independent message address and message data, the
++non-contiguous fashion in vector assignment of the existing Linux
++kernel has no impact on supporting multiple messages on an MSI-X
++capable device functions. By default, as mentioned above, ONE vector
++should be always allocated to the MSI-X capability structure at
++entry 0. The bus driver does not initialize other entries of the
++MSI-X table.
++
++Note that the PCI subsystem should have full control of a MSI-X
++table that resides in Memory Space. The software device driver
++should not access this table.
++
++To request for additional vectors, the device software driver should
++call function msi_alloc_vectors(). It is recommended that the
++software driver should call this function once during the
++initialization phase of the device driver.
++
++The function msi_alloc_vectors(), once invoked, enables either
++all or nothing, depending on the current availability of vector
++resources. If no vector resources are available, the device function
++still works with ONE vector. If the vector resources are available
++for the number of vectors requested by the driver, this function
++will reconfigure the MSI-X capability structure of the device with
++additional messages, starting from entry 1. To emphasize this
++reason, for example, the device may be capable for supporting the
++maximum of 32 vectors while its software driver usually may request
++4 vectors.
++
++For each vector, after this successful call, the device driver is
++responsible to call other functions like request_irq(), enable_irq(),
++etc. to enable this vector with its corresponding interrupt service
++handler. It is the device driver's choice to have all vectors shared
++the same interrupt service handler or each vector with a unique
++interrupt service handler.
++
++In addition to the function msi_alloc_vectors(), another function
++msi_free_vectors() is provided to allow the software driver to
++release a number of vectors back to the vector resources. Once
++invoked, the PCI subsystem disables (masks) each vector released.
++These vectors are no longer valid for the hardware device and its
++software driver to use. Like free_irq, it recommends that the
++device driver should also call msi_free_vectors to release all
++additional vectors previously requested.
++
++int msi_alloc_vectors(struct pci_dev *dev, int *vector, int nvec)
++
++This API enables the software driver to request the PCI subsystem
++for additional messages. Depending on the number of vectors
++available, the PCI subsystem enables either all or nothing.
++
++Argument dev points to the device (pci_dev) structure.
++Argument vector is a pointer of integer type. The number of
++elements is indicated in argument nvec.
++Argument nvec is an integer indicating the number of messages
++requested.
++A return of zero indicates that the number of allocated vector is
++successfully allocated. Otherwise, indicate resources not
++available.
++
++int msi_free_vectors(struct pci_dev* dev, int *vector, int nvec)
++
++This API enables the software driver to inform the PCI subsystem
++that it is willing to release a number of vectors back to the
++MSI resource pool. Once invoked, the PCI subsystem disables each
++MSI-X entry associated with each vector stored in the argument 2.
++These vectors are no longer valid for the hardware device and
++its software driver to use.
++
++Argument dev points to the device (pci_dev) structure.
++Argument vector is a pointer of integer type. The number of
++elements is indicated in argument nvec.
++Argument nvec is an integer indicating the number of messages
++released.
++A return of zero indicates that the number of allocated vectors
++is successfully released. Otherwise, indicates a failure.
++
++5.4 Hardware requirements for MSI support
++MSI support requires support from both system hardware and
++individual hardware device functions.
++
++5.4.1 System hardware support
++Since the target of MSI address is the local APIC CPU, enabling
++MSI support in Linux kernel is dependent on whether existing
++system hardware supports local APIC. Users should verify their
++system whether it runs when CONFIG_X86_LOCAL_APIC=y.
++
++In SMP environment, CONFIG_X86_LOCAL_APIC is automatically set;
++however, in UP environment, users must manually set
++CONFIG_X86_LOCAL_APIC. Once CONFIG_X86_LOCAL_APIC=y, setting
++CONFIG_PCI_USE_VECTOR enables the VECTOR based scheme and
++the option for MSI-capable device drivers to selectively enable
++MSI (using pci_enable_msi as desribed below).
++
++Note that CONFIG_X86_IO_APIC setting is irrelevant because MSI
++vector is allocated new during runtime and MSI support does not
++depend on BIOS support. This key independency enables MSI support
++on future IOxAPIC free platform.
++
++5.4.2 Device hardware support
++The hardware device function supports MSI by indicating the
++MSI/MSI-X capability structure on its PCI capability list. By
++default, this capability structure will not be initialized by
++the kernel to enable MSI during the system boot. In other words,
++the device function is running on its default pin assertion mode.
++Note that in many cases the hardware supporting MSI have bugs,
++which may result in system hang. The software driver of specific
++MSI-capable hardware is responsible for whether calling
++pci_enable_msi or not. A return of zero indicates the kernel
++successfully initializes the MSI/MSI-X capability structure of the
++device funtion. The device function is now running on MSI mode.
++
++5.5 How to tell whether MSI is enabled on device function
++
++At the driver level, a return of zero from pci_enable_msi(...)
++indicates to the device driver that its device function is
++initialized successfully and ready to run in MSI mode.
++
++At the user level, users can use command 'cat /proc/interrupts'
++to display the vector allocated for the device and its interrupt
++mode, as shown below.
++
++           CPU0       CPU1
++  0:     324639          0    IO-APIC-edge  timer
++  1:       1186          0    IO-APIC-edge  i8042
++  2:          0          0          XT-PIC  cascade
++ 12:       2797          0    IO-APIC-edge  i8042
++ 14:       6543          0    IO-APIC-edge  ide0
++ 15:          1          0    IO-APIC-edge  ide1
++169:          0          0   IO-APIC-level  uhci-hcd
++185:          0          0   IO-APIC-level  uhci-hcd
++193:        138         10         PCI MSI  aic79xx
++201:         30          0         PCI MSI  aic79xx
++225:         30          0   IO-APIC-level  aic7xxx
++233:         30          0   IO-APIC-level  aic7xxx
++NMI:          0          0
++LOC:     324553     325068
++ERR:          0
++MIS:          0
++
++6. FAQ
++
++Q1. Are there any limitations on using the MSI?
++
++A1. If the PCI device supports MSI and conforms to the
++specification and the platform supports the APIC local bus,
++then using MSI should work.
++
++Q2. Will it work on all the Pentium processors (P3, P4, Xeon,
++AMD processors)? In P3 IPI's are transmitted on the APIC local
++bus and in P4 and Xeon they are transmitted on the system
++bus. Are there any implications with this?
++
++A2. MSI support enables a PCI device sending an inbound
++memory write (0xfeexxxxx as target address) on its PCI bus
++directly to the FSB. Since the message address has a
++redirection hint bit cleared, it should work.
++
++Q3. The target address 0xfeexxxxx will be translated by the
++Host Bridge into an interrupt message. Are there any
++limitations on the chipsets such as Intel 8xx, Intel e7xxx,
++or VIA?
++
++A3. If these chipsets support an inbound memory write with
++target address set as 0xfeexxxxx, as conformed to PCI
++specification 2.3 or latest, then it should work.
++
++Q4. From the driver point of view, if the MSI is lost because
++of the errors occur during inbound memory write, then it may
++wait for ever. Is there a mechanism for it to recover?
++
++A4. Since the target of the transaction is an inbound memory
++write, all transaction termination conditions (Retry,
++Master-Abort, Target-Abort, or normal completion) are
++supported. A device sending an MSI must abide by all the PCI
++rules and conditions regarding that inbound memory write. So,
++if a retry is signaled it must retry, etc... We believe that
++the recommendation for Abort is also a retry (refer to PCI
++specification 2.3 or latest).
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/must-fix.txt	2003-12-28 23:21:10.000000000 -0800
+@@ -0,0 +1,288 @@
++
++Must-fix bugs
++=============
++
++drivers/char/
++~~~~~~~~~~~~~
++
++o TTY locking is broken.
++
++  o see FIXME in do_tty_hangup().  This causes ppp BUGs in local_bh_enable()
++
++  o Other problems: aviro, dipankar, Alan have details.
++
++  o somebody will have to document the tty driver and ldisc API
++
++drivers/tty
++~~~~~~~~~~~
++
++o viro: tty_driver refcounting, tty/misc/upper levels of sound still not
++  completely fixed.
++
++drivers/block/
++~~~~~~~~~~~~~~
++
++o loop.c: Concurrent write access on block devices might cause a deadlock
++  of the complete system. See:
++  http://marc.theaimsgroup.com/?l=linux-kernel&m=106275365925769&w==
++  http://bugzilla.kernel.org/show_bug.cgi?id=1198
++  Thread of possible fix:
++  http://www.kerneli.org/pipermail/cryptoapi-devel/2003-October/000676.html
++
++  (Fruhwirth Clemens)
++
++o ideraid hasn't been ported to 2.5 at all yet.
++
++  We need to understand whether the proposed BIO split code will suffice
++  for this.
++
++drivers/input/
++~~~~~~~~~~~~~~
++
++o rmk: unconverted keyboard/mouse drivers (there's a deadline of 2.6.0
++  currently on these remaining in my/Linus' tree.)
++
++o viro: large absence of locking.
++
++o viro: parport is nearly as bad as that and there the code is more hairy.
++  IMO parport is more of "figure out what API changes are needed for its
++  users, get them done ASAP, then fix generic layer at leisure"
++
++o (Albert Cahalan) Lots of people (check Google) get this message from the
++  kernel:
++
++  psmouse.c: Lost synchronization, throwing 2 bytes away.
++
++  (the number of bytes will be 1, 2, or 3)
++
++  At work, I get it when there is heavy NFS traffic.  The mouse goes crazy,
++  jumping around and doing random cut-and-paste all over everything.  This
++  is with a decently fast and modern PC.
++
++o There seem to be too many reports of keyboards and mice failing or acting
++  strangely.
++
++
++drivers/misc/
++~~~~~~~~~~~~~
++
++o rmk: UCB1[23]00 drivers, currently sitting in drivers/misc in the ARM
++  tree.  (touchscreen, audio, gpio, type device.)
++
++  These need to be moved out of drivers/misc/ and into real places
++
++o viro: actually, misc.c has a good chance to die.  With cdev-cidr that's
++  trivial.
++
++drivers/net/
++~~~~~~~~~~~~
++
++drivers/net/irda/
++~~~~~~~~~~~~~~~~~
++
++  (Jean Tourrilhes)
++
++o irport need to be converted to sir-kthread
++
++o dongle drivers need to be converted to sir-dev (in progress)
++
++o new drivers (irtty-sir/smsc-ircc2/donauboe) need more testing (in progress)
++
++
++drivers/pci/
++~~~~~~~~~~~~
++
++o alan: Some cardbus crashes the system
++
++  (bugzilla, please?)
++
++drivers/pcmcia/
++~~~~~~~~~~~~~~~
++
++o alan: This is a locking disaster.
++
++  (rmk, brodo: in progress)
++
++drivers/pld/
++~~~~~~~~~~~~
++
++o rmk: EPXA (ARM platform) PLD hotswap drivers (drivers/pld)
++
++  (rmk: will work out what to do here.  maybe drivers/arm/)
++
++drivers/video/
++~~~~~~~~~~~~~~
++
++o Lots of drivers don't compile, others do but don't work.
++
++drivers/scsi/
++~~~~~~~~~~~~~
++
++o Convert am53c974, dpt_i2o, initio and pci2220i to DMA-mapping
++
++o Make inia100, cpqfc, pci2000 and dc390t compile
++
++o Convert
++
++   wd33c99 based: a2091 a3000 gpv11 mvme174 sgiwd93
++
++   53c7xx based: amiga7xxx bvme6000 mvme16x initio am53c974 pci2000
++   pci2220i dc390t
++
++  To new error handling
++
++  It also might be possible to shift the 53c7xx based drivers over to
++  53c700 which does the new EH stuff, but I don't have the hardware to check
++  such a shift.
++
++  For the non-compiling stuff, I've probably missed a few that just aren't
++  compilable on my platforms, so any updates would be welcome.  Also, are
++  some of our non-compiling or unconverted drivers obsolete?
++
++fs/
++~~~
++
++o AIO/direct-IO writes can race with truncate and wreck filesystems.
++  (Badari has a patch)
++
++o viro: fs/char_dev.c needs removal of aeb stuff and merge of cdev-cidr.
++  In progress.
++
++o forward-port sct's O_DIRECT fixes (Badari has a patch)
++
++o viro: there is some generic stuff for namei/namespace/super, but that's a
++  slow-merge and can go in 2.6 just fine
++
++o trond: NFS has a mmap-versus-truncate problem (fixed? needs testing)
++
++o trond: NFSv4 client, bugs in lockd, RPSEC_GSS for NFSv[23], some atomic open
++  bits. more info: http://www.fys.uio.no/~trondmy/src/Linux-2.6.x/2.6.0-test11/
++
++kernel/sched.c
++~~~~~~~~~~~~~~
++
++o Starvation, general interactivity need close monitoring.
++
++o SMT aware scheduler (Ingo, Rusty, Nick have implementations)
++
++kernel/
++~~~~~~~
++
++o Alan: 32bit uid support is *still* broken for process accounting.
++
++  Create a 32bit uid, turn accounting on.  Shock horror it doesn't work
++  because the field is 16bit.  We need an acct structure flag day for 2.6
++  IMHO
++
++  (alan has patch)
++
++o viro: core sysctl code is racy.  And its interaction wiuth sysfs
++
++o (ingo) rwsems (on x86) are limited to 32766 waiting processes.  This
++  means that setting pid_max to above 32K is unsafe :-(
++
++  An option is to use CONFIG_RWSEM_GENERIC_SPINLOCK variant all the time,
++  for all archs, and not inline any part of the ops.
++
++lib/kobject.c
++~~~~~~~~~~~~~
++
++o kobject refcounting (comments from Al Viro):
++
++  _anything_ can grab a temporary reference to kobject.  IOW, if kobject is
++  embedded into something that could be freed - it _MUST_ have a destructor
++  and that destructor _MUST_ be the destructor for containing object.
++
++  Any violation of the above (and we already have a bunch of those) is a
++  user-triggerable memory corruption.
++
++  We can tolerate it for a while in 2.5 (e.g.  during work on susbsystem we
++  can decide to switch to that way of handling objects and have subsystem
++  vulnerable for a while), but all such windows must be closed before 2.6
++  and during 2.6 we can't open them at all.
++
++o All block drivers which control multiple gendisks with a single
++  request_queue are broken, due to one-to-one assumptions in the request
++  queue sysfs hookup.
++
++mm/
++~~~
++
++o GFP_DMA32 (or something like that).  Lots of ideas.  jejb, zaitcev,
++  willy, arjan, wli.
++
++  Specifically, 64-bit systems need to be able to enforce 32-bit addressing
++  limits for device metadata like network cards' ring buffers and SCSI
++  command descriptors.
++
++o access_process_vm() doesn't flush right.  We probably need new flushing
++  primitives to do this (davem?)
++
++
++modules
++~~~~~~~
++
++  (Rusty)
++
++net/
++~~~~
++
++  (davem)
++
++o UDP apps can in theory deadlock, because the ip_append_data path can end
++  up sleeping while the socket lock is held.
++
++  It is OK to sleep with the socket held held, normally.  But in this case
++  the sleep happens while waiting for socket memory/space to become
++  available, if another context needs to take the socket lock to free up the
++  space we could hang.
++
++  I sent a rough patch on how to fix this to Alexey, and he is analyzing
++  the situation.  I expect a final fix from him next week or so.
++
++o Semantics for IPSEC during operations such as TCP connect suck currently.
++
++  When we first try to connect to a destination, we may need to ask the
++  IPSEC key management daemon to resolve the IPSEC routes for us.  For the
++  purposes of what the kernel needs to do, you can think of it like ARP.  We
++  can't send the packet out properly until we resolve the path.
++
++  What happens now for IPSEC is basically this:
++
++  O_NONBLOCK: returns -EAGAIN over and over until route is resolved
++
++  !O_NONBLOCK: Sleeps until route is resolved
++
++  These semantics are total crap.  The solution, which Alexey is working
++  on, is to allow incomplete routes to exist.  These "incomplete" routes
++  merely put the packet onto a "resolution queue", and once the key manager
++  does it's thing we finish the output of the packet.  This is precisely how
++  ARP works.
++
++  I don't know when Alexey will be done with this.
++
++net/*/netfilter/
++~~~~~~~~~~~~~~~~
++
++  (Rusty)
++
++sound/
++~~~~~~
++
++global
++~~~~~~
++
++o viro: 64-bit dev_t (not a mustfix for 2.6.0). 32-bit dev_t is done, 64-bit
++  means extra work on nfsd/raid/etc.
++
++o alan: Forward port 2.4 fixes
++  - Chris Wright: Security fixes including execve holes, execve vs proc races
++
++o There are about 60 or 70 security related checks that need doing
++  (copy_user etc) from Stanford tools.  (badari is looking into this, and
++  hollisb)
++
++o A couple of hundred real looking bugzilla bugs
++
++o viro: cdev rework. Mostly done.
++
+--- linux-2.6.0/Documentation/networking/8139too.txt	2003-08-22 19:23:39.000000000 -0700
++++ /dev/null	2002-08-30 16:31:37.000000000 -0700
+@@ -1,449 +0,0 @@
+-
+-		"8139too" Fast Ethernet driver for Linux
+-	 RTL-8139, -8129, and -8130 10/100 Fast Ethernet adapters
+-
+-	Copyright 2000,2001 Jeff Garzik <jgarzik@pobox.com>
+-
+-                http://sourceforge.net/projects/gkernel/
+-
+-
+-	      Architectures supported (all PCI platforms):
+-		    x86, Alpha AXP, PowerPC, Sparc64
+-
+-		    Kernel versions supported: 2.4.x
+-
+-
+-
+-Disclaimer
+-----------
+-
+-DO NOT CONTACT DONALD BECKER FOR SUPPORT OF THIS DRIVER, his driver is
+-completely different and maintained independently of the 8139too code base.
+-
+-
+-
+-Requirements
+-------------
+-Kernel 2.4.3 or later.
+-A Fast Ethernet adapter containing an RTL8139-based chip.
+-
+-
+-
+-Introduction
+-------------
+-
+-The "8139too" Fast Ethernet driver for Linux 2.4.0 is a substantial
+-modification of the experimental rtl8139 driver from Donald Becker,
+-some versions of which appeared in 2.2.x and 2.3.x kernels.  The
+-RTL-8139 is a very low-cost Fast Ethernet chip, which makes it very
+-popular.
+-
+-The step from 2.2.x to 2.4.x kernels brings many new features to Linux
+-device drivers.  Features for MMIO resources, a standard hot-plug API,
+-and other interfaces are now becoming requirements, as drivers move
+-off the x86 platform.  With that in mind, I have begun updating the
+-RTL-8139 driver to current 2.3.x (2.4) kernel standards and APIs, and
+-fixing the problems that users have been encountering.
+-
+-
+-
+-Features of 8139too
+--------------------
+-[note - this list intended for people familiar with kernel drivers]
+-
+-** 100% MMIO, for full speed operation.  All users (so far) have
+-reported performance increases over their existing RTL drivers.
+-
+-** Multi-platform support:  x86, Alpha, PPC, ...
+-
+-** Use proper SMP spinlocking, fixing SMP interrupt bugs, making the
+-driver portable to non-x86 SMP platforms in the process.
+-
+-** Use new PCI driver API for seamless, low-maintenance hot-plug support
+-
+-** Several bugs fixes from original rtl8139 1.08r (October 5, 1999),
+-including the very common "transmit timeout" problem.
+-
+-* Use new resource allocation API, required for hot-plug support
+-* Use new register read/write macros
+-* initcall support (module_init/exit)
+-* vastly improved debug tracing support
+-* code formatting in many places for readability
+-* use new init_etherdev() facilities
+-
+-...and probably some other less important changes which I forgot.
+-
+-
+-
+-Installation
+-------------
+-
+-OPTION 1: Build inside kernel tree (into kernel image, or as module)
+-
+-	(overwrite 8139too driver in kernel tree with different version)
+-	1) cp 8139too.c $my_source_tree/drivers/net/8139too.c
+-
+-OPTION 2: Build outside kernel tree
+-
+-	Use the included Makefile.
+-
+-
+-
+-Tested Adapters
+----------------
+-AOpen ALN-325C
+-AT-2500TX 10/100 PCI Fast Ethernet Network Adapter Card
+-D-Link DFE-530TX
+-Cnet CNF401 'SinglePoint' 10/100 Base-TX
+-Genius GF 100TXR4 Fast Ethernet 10/100M PCI Network Card
+-KTI KF-230TX
+-KTI KF-230TX/2
+-Lantech FastNet TX
+-Ovislink Fast Ethernet
+-Planet ENW-9504 (V.4) 10/100
+-SDT Jeoun Fast PCI-TX
+-SMC EZNET 10/100
+-UNEX NexNIC ND012C
+-
+-(please add your adapter model to this list)
+-
+-
+-
+-Status of Platform Support
+---------------------------
+-
+-(see errata below for details)
+-
+-x86:		tested, stable
+-Alpha AXP:	tested, stable
+-PowerPC:	tested, unstable
+-Sparc64:	not tested
+-
+-
+-
+-Special Thanks
+---------------
+-The following people contributed invaluable testing time, feedback
+-and/or patches during the development of this driver.  Thanks to all
+-of them.
+-
+-Donald Becker, Alan Cox, Richard Stallman, Linus Torvalds - inspiration
+-
+-Alan Cox, Gerard Roudier - insight on posted MMIO writes
+-
+-Martin Mares - code review
+-
+-Tigran Aivazian - testing, code review, and a bug fix
+-
+-Chmouel Boudjnah, Alexander Dietrich, Oleg Drokin,
+-James Fidell, Taso Hatzi, Peter K - intrepid test team
+-
+-And thanks to every supporter free software.
+-
+-(see top of 8139too.c for further credits and kudos)
+-
+-
+-
+-Submitting Bug Reports
+-----------------------
+-Obtain and compile the modified rtl8139-diag source code from the
+-8139too driver Web site, http://sourceforge.net/projects/gkernel/
+-This diagnostics programs, originally from Donald Becker, has been
+-modified to display all registers on your RTL8139 chip, not just the
+-first 0x80.
+-
+-If possible, send the output of a working and broken driver with
+-	rtl8139-diag -mmaaavvveefN > my-output-file.txt
+-
+-Send "lspci -vvv" or "cat /proc/pci" output for PCI information.
+-
+-
+-
+-Known Bugs / Errata / To-Do
+----------------------------
+-The following issues are known, and are actively being pursued.  Patches
+-to resolve these issues is welcome.  If a problem occurs which is not in
+-the list, please report it.  That's why we do beta releases, after all...
+-
+-
+-
+-1) Work with Donald to merge fixes and updates into his driver.
+-
+-2) ETHTOOL_SSET support
+-
+-3) PPC platform has stability problems. (XXX: verify this is still true)
+-
+-4) Sparc64 platform not tested at all.
+-
+-8) Much improved command line / module parameter setup.  (patches and
+-suggestions welcome)  (WIP)
+-
+-9) Better documentation.  (patches welcome)
+-
+-12) 10base-T support flaky or slow (todo: verify this is still true)
+-
+-
+-
+-
+-Change History
+---------------
+-
+-Version 0.9.26 - August 9, 2002
+-
+-* Fix MII ioctl phy id corruption.
+-* Fix big-endian multicast bug.
+-* Support register dumps via ethtool.
+-* Fix several uses of 'len' after potential skb free, in dev->hard_start_xmit
+-* Replace several "magic numbers" with their proper representation
+-  constants in linux/mii.h.
+-* Support ethtool media interface via generic kernel MII API
+-* Export NIC-specific statistics via ethtool.
+-* Proper support for RTL8139 rev K. (can be disabled via
+-  compile-time conditional)
+-* Add PCI ids for new 8139 boards.
+-* Use ethernet crc via generic linux/crc32.h kernel API.
+-* Better RX reset.  Old rx-reset method still available via
+-  a compile-time conditional.
+-* Only account specific RX errors if rx_status is !OK
+-
+-
+-Version 0.9.22 - November 8, 2001
+-
+-* Additional retries before aborting Tx
+-* Do not write other TxConfig bits when writing clear-abort bit.
+-* Ack TxErr intr status after each Tx abort, too.
+-* Fix oops in interface restart
+-
+-
+-Version 0.9.21 - November 1, 2001
+-
+-* Disable early Rx, it hurts performance and creates races.
+-* Remove DPRINTK macro function tracing.
+-* Better interrupt sharing behavior.
+-* Acknowledge PCI errors.
+-* Remove early-Rx acknowledgement, unnecessary
+-* Remove code for uncommon case where Tx packets are
+-  properly aligned, and do not need to be copied.
+-  Tx packets are now always copied into a static DMA buffer,
+-  which is allocated at interface open.
+-* Fix problems with kernel thread exit.
+-
+-
+-Version 0.9.20 - October 18, 2001
+-
+-* Print out notice when 8139C+ chip is detected
+-* Add id for D-Link DFE690TXD pcmcia cardbus card (Gert Dewit)
+-
+-
+-Version 0.9.19 - October 9, 2001
+-
+-* Eliminate buffer copy for unaligned Tx's (manfred)
+-* Better RX error recovery (manfred)
+-* Wake-On-LAN and ETHTOOL_GSET support (Kalle Niemitalo)
+-* Fix assertion in PIO mode (various)
+-
+-
+-Version 0.9.18 - July 6, 2001
+-
+-* Fix race leading to crashes on some machines.
+-* Minimize race leading to low performance.
+-* Correct interrupt acknowledgement to cover all three
+-  relevant Rx events.
+-* Add ethtool driver info support.
+-* Collect additional driver-internal statistics.
+-* Add descriptions for module parameters.
+-* Support new SIOCxMIIxxx ioctls added in kernel 2.4.6.
+-* Multicast filter big endian fix.
+-* Support new PCI PM API added in kernel 2.4.6.
+-
+-
+-Version 0.9.17 - May 7, 2001
+-
+-* Fix chipset wakeup bug which prevent media connection for 8139B
+-* Print out "media is unconnected..." instead of
+-  "partner ability 0000"
+-
+-
+-Version 0.9.16 - April 14, 2001
+-
+-* Complete MMIO audit, disable read-after-every-write
+-* Update Rx interrupt handling
+-* Enable Early Rx thresholds, highly recommended to reduce
+-  Rx FIFO overflow
+-* Make 8129 support conditional
+-* Support for new 2.4.3 kernel APIs
+-* More correct PIO/MMIO PCI BAR region size checking
+-* Add check for totally dead/missing hardware
+-* Disable media timer code to "set full duplex"
+-* s/spin_lock_irq/spin_lock_irqsave/
+-* Only set AcceptMulticast if more than one mc address
+-* Only set rx_mode if changed, in set_rx_mode
+-* Only suspend/resume if interface is up
+-* Always print out version upon module load, even if no devices found
+-
+-
+-Version 0.9.15 - February 20, 2001
+-
+-* Call pci_enable_device to wake up/assign resource to device,
+-  before actually using it.
+-* Support wacky clone PCI ids (report from Norival Toniato Junior)
+-* Text spelling corrections
+-* Make sure tp->phys[] is signed
+-* Always wake queue after hw restart, in tx_timeout
+-* Record time of last received packet
+-
+-
+-Version 0.9.14 - January 11, 2001
+-
+-* Merge some changes from Becker version 1.13:
+-	* Add DFE 538TX PCI id
+-	* MII read/write functions updated
+-	* Cfg93[45]6 lock/unlock fix
+-	* RTL-8129 (MII) support
+-* Clean up spinlocking
+-
+-
+-Version 0.9.13 - December, 2000
+-
+-* Clear blocked signals, avoid buffer overrun setting current->comm
+-* Remove bogus PCI BAR length assertions
+-* Remove unused 'debug' module parameter
+-
+-
+-Version 0.9.12 - November 23, 2000
+-
+-* Kill major Tx stop/wake queue race
+-* Use SET_MODULE_OWNER and fix module unload race
+-* Fix cable length ("Twister") tuning
+-* Proper media[] array length checking
+-* Replace timer with kernel thread for twister tuning state machine
+-  and media checking.  Fixes mdio_xxx locking, now mdio_xxx is always
+-  protected by rtnl_lock semaphore.
+-* Correct some sledgehammer a.k.a. overzealous spin-locks
+-* Performance: Eliminate atomic_t for Tx counters, we don't need it
+-* Performance: Don't copy Tx buffer if the rare case occurs where it
+-  is aligned perfectly for us.
+-* Eliminate needless casting of dev->priv
+-* PIO mode selection and Twister tuning are now CONFIG_xxx options
+-  (though purposefully not in net/Config.in... yet)
+-
+-
+-Version 0.9.11 - October 28, 2000
+-
+-* Do not fail when PIO and MMIO region lengths do not match.
+-  (They don't on some CardBus models, at least)
+-* Sanity check Rx packet status and size (Tobias)
+-* When handling a Tx timeout, disable Tx ASAP if not already.
+-* Do not inline Tx interrupt handler (better register usage)
+-* Handle dirty_tx signed integer wrap
+-* Do not abort Rx processing on lack of memory, keep going
+-  until the current Rx ring is completely handling. (Tobias)
+-* Clean up rtl8139_close
+-* Whitespace correction for dev_kfree_skb_irq call
+-
+-
+-Version 0.9.10 - September 12, 2000
+-
+-* Never wrap an Rx packet (faster Rx interrupt handling)
+-* Clear all TxAborted conditions (bug fix)
+-* Correct copyright
+-* More credits
+-* Update NWay doc URL
+-* Clean up commonly used ifdef switches
+-* Reorg info displayed at bootup/modprobe time
+-* Remove some unneeded spinlocks
+-* Misc cosmetic code cleanup
+-* Always print interrupt status for abnormal interrupts
+-* Use RealTek-recommended FIFO and DMA burst settings (1024 bytes)
+-
+-
+-Version 0.9.9 - September 9, 2000
+-
+-* Fix oops-able bug in Rx ring wrap calculation (David Ford)
+-* Use PIO instead of MMIO when USE_IO_OPS is defined
+-* Move Rx error handling out of Rx interrupt handler, resulting in
+-  tighter Rx interrupt processing
+-
+-
+-Version 0.9.8 - September 7, 2000
+-
+-* Propagate request_irq error value (andrew morton)
+-* Correct potential oops bug in PCI DMA unmap code
+-* Fix bugs related to counting/discounting of 32-bit CRC in each Rx packet
+-* Fix 16/32-bit bug in interrupt status check
+-* Timer cleanups (andrew morton)
+-
+-
+-Version 0.9.7 - June 11, 2000
+-
+-* Fix support for older chips (RTL8139 early chips should now work again)
+-
+-
+-Version 0.9.6 - May 30, 2000
+-
+-* Fix 4-extra-bytes bug
+-  (thanks to Markus Westergren, via Santiago Garcia Mantinan)
+-* Yet more improved chip recognition
+-
+-
+-Version 0.9.5 - May 17, 2000
+-
+-* Improved chip version recognition
+-* Continue banging away at receiver hang problem
+-* Use spin_lock_irq in another spot
+-* Don't print anything on pci_enable_device, it does so for us
+-* Disable buggy NWay code
+-* Define TxConfig bitmasks
+-
+-
+-Version 0.9.4.1 - April 27, 2000 - third public beta release
+-
+-* Replace several "magic numbers" with symbolic constants
+-* Differentiate between board-specific info and chip-specific info
+-  (allows for easier support of specific boards or chips)
+-* Move some of the transmit side outside of the spinlock
+-  by using atomic variables.  Use spin_lock_irq instead of
+-  spin_lock_irq{save,restore} in select places, for better performance.
+-* New module option "media" for forcing media selection.  Functions the
+-  same as "options" in other drivers, and will soon be renamed
+-  'options' to be homogeneous.
+-* New power management wake-up code
+-* Slightly more verbose chip id messages in kernel log
+-* Add/correct chip register constant list
+-* New chipset wake up (open) logic
+-* No longer locks CONFIGx updates
+-* Do not set Interfame Gap (IFG) bits in TxConfig
+-* Better Rx reset logic in case of Rx FIFO Overflow
+-* For chips which support it, enable bit to automatically clear Rx
+-  FIFO overflow
+-* No longer enable and disable interrupts in interrupt handler
+-  (technique borrowed from BSD driver, appears to have problems
+-   with some chips)
+-* H/W spinlock now protects ioctl
+-* Chipset-dependent RxConfig settings
+-
+-
+-Version 0.9.3.3.2 - Feb 22, 2000 - second public beta release
+-
+-* Begin integration of Daniel Kobras' MMIO flush patch (disabled for now)
+-* Softnet logic updates to fix bugs and improve performance
+-* Dynamic sizing of I/O resources (0x80 for older chips, 0xFF for newer ones)
+-* Remove bogus SiS entries from PCI probe table
+-* Add support for cards
+-	"Delta Electronics 8139 10/100BaseTX"
+-	"Addtron Technolgy 8139 10/100BaseTX"
+-* Fix major bug with rx ring buffer size (also present in rtl8139.c 1.08r)
+-* PCI DMA mapping by Dave Miller
+-* Complete rewrite of SMP locking logic
+-* Hotplug support
+-* Call rtl8139_hw_start from rtl8139_open, and remove duplicated code
+-  from rtl8139_open
+-* Reset NWay registers to sane defaults on rtl8139_open/hw_start
+-* Miscellaneous code cleanup
+-
+-
+-Version 0.7.0 - Feb 7, 2000 - first public beta release
+-* Initial public version, derived from Donald Becker's rtl8139.c v1.08r
+-
+-[EOF]
+-
+--- linux-2.6.0/Documentation/networking/bonding.txt	2003-09-27 18:57:43.000000000 -0700
++++ 25/Documentation/networking/bonding.txt	2003-12-28 23:21:00.000000000 -0800
+@@ -21,7 +21,7 @@ userspace tools, please follow the links
+ 
+ Table of Contents
+ =================
+- 
++
+ Installation
+ Bond Configuration
+ Module Parameters
+@@ -66,7 +66,7 @@ of the -I option on the ifenslave compil
+ /usr/include/linux.
+ 
+ To install ifenslave.c, do:
+-    # gcc -Wall -Wstrict-prototypes -O -I/usr/src/linux/include ifenslave.c -o ifenslave 
++    # gcc -Wall -Wstrict-prototypes -O -I/usr/src/linux/include ifenslave.c -o ifenslave
+     # cp ifenslave /sbin/ifenslave
+ 
+ 
+@@ -74,10 +74,10 @@ Bond Configuration
+ ==================
+ 
+ You will need to add at least the following line to /etc/modules.conf
+-so the bonding driver will automatically load when the bond0 interface is 
+-configured. Refer to the modules.conf manual page for specific modules.conf 
+-syntax details. The Module Parameters section of this document describes each 
+-bonding driver parameter. 
++so the bonding driver will automatically load when the bond0 interface is
++configured. Refer to the modules.conf manual page for specific modules.conf
++syntax details. The Module Parameters section of this document describes each
++bonding driver parameter.
+ 
+ 	alias bond0 bonding
+ 
+@@ -113,7 +113,7 @@ bonding interface (bond1), use MASTER=bo
+ network interface be a slave of bond1.
+ 
+ Restart the networking subsystem or just bring up the bonding device if your
+-administration tools allow it. Otherwise, reboot. On Red Hat distros you can 
++administration tools allow it. Otherwise, reboot. On Red Hat distros you can
+ issue `ifup bond0' or `/etc/rc.d/init.d/network restart'.
+ 
+ If the administration tools of your distribution do not support
+@@ -128,30 +128,30 @@ manually configure the bonding device wi
+ 
+ (use appropriate values for your network above)
+ 
+-You can then create a script containing these commands and place it in the 
++You can then create a script containing these commands and place it in the
+ appropriate rc directory.
+ 
+ If you specifically need all network drivers loaded before the bonding driver,
+-adding the following line to modules.conf will cause the network driver for 
++adding the following line to modules.conf will cause the network driver for
+ eth0 and eth1 to be loaded before the bonding driver.
+ 
+ probeall bond0 eth0 eth1 bonding
+ 
+-Be careful not to reference bond0 itself at the end of the line, or modprobe 
++Be careful not to reference bond0 itself at the end of the line, or modprobe
+ will die in an endless recursive loop.
+ 
+-To have device characteristics (such as MTU size) propagate to slave devices, 
+-set the bond characteristics before enslaving the device.  The characteristics 
++To have device characteristics (such as MTU size) propagate to slave devices,
++set the bond characteristics before enslaving the device.  The characteristics
+ are propagated during the enslave process.
+ 
+-If running SNMP agents, the bonding driver should be loaded before any network 
+-drivers participating in a bond. This requirement is due to the the interface 
+-index (ipAdEntIfIndex) being associated to the first interface found with a 
+-given IP address. That is, there is only one ipAdEntIfIndex for each IP 
+-address. For example, if eth0 and eth1 are slaves of bond0 and the driver for 
+-eth0 is loaded before the bonding driver, the interface for the IP address 
+-will be associated with the eth0 interface. This configuration is shown below, 
+-the IP address 192.168.1.1 has an interface index of 2 which indexes to eth0 
++If running SNMP agents, the bonding driver should be loaded before any network
++drivers participating in a bond. This requirement is due to the the interface
++index (ipAdEntIfIndex) being associated to the first interface found with a
++given IP address. That is, there is only one ipAdEntIfIndex for each IP
++address. For example, if eth0 and eth1 are slaves of bond0 and the driver for
++eth0 is loaded before the bonding driver, the interface for the IP address
++will be associated with the eth0 interface. This configuration is shown below,
++the IP address 192.168.1.1 has an interface index of 2 which indexes to eth0
+ in the ifDescr table (ifDescr.2).
+ 
+      interfaces.ifTable.ifEntry.ifDescr.1 = lo
+@@ -189,10 +189,10 @@ functions such as Interface_Scan_Next wi
+ Module Parameters
+ =================
+ 
+-Optional parameters for the bonding driver can be supplied as command line 
+-arguments to the insmod command. Typically, these parameters are specified in 
+-the file /etc/modules.conf (see the manual page for modules.conf). The 
+-available bonding driver parameters are listed below. If a parameter is not 
++Optional parameters for the bonding driver can be supplied as command line
++arguments to the insmod command. Typically, these parameters are specified in
++the file /etc/modules.conf (see the manual page for modules.conf). The
++available bonding driver parameters are listed below. If a parameter is not
+ specified the default value is used. When initially configuring a bond, it
+ is recommended "tail -f /var/log/messages" be run in a separate window to
+ watch for bonding driver error messages.
+@@ -202,19 +202,19 @@ parameters be specified, otherwise serio
+ during link failures.
+ 
+ arp_interval
+- 
+-        Specifies the ARP monitoring frequency in milli-seconds. 
+-        If ARP monitoring is used in a load-balancing mode (mode 0 or 2), the 
+-        switch should be configured in a mode that evenly distributes packets 
+-        across all links - such as round-robin. If the switch is configured to 
+-        distribute the packets in an XOR fashion, all replies from the ARP 
+-        targets will be received on the same link which could cause the other 
++
++        Specifies the ARP monitoring frequency in milli-seconds.
++        If ARP monitoring is used in a load-balancing mode (mode 0 or 2), the
++        switch should be configured in a mode that evenly distributes packets
++        across all links - such as round-robin. If the switch is configured to
++        distribute the packets in an XOR fashion, all replies from the ARP
++        targets will be received on the same link which could cause the other
+         team members to fail. ARP monitoring should not be used in conjunction
+-        with miimon. A value of 0 disables ARP monitoring. The default value 
++        with miimon. A value of 0 disables ARP monitoring. The default value
+         is 0.
+- 
++
+ arp_ip_target
+- 
++
+ 	Specifies the ip addresses to use when arp_interval is > 0. These
+ 	are the targets of the ARP request sent to determine the health of
+ 	the link to the targets. Specify these values in ddd.ddd.ddd.ddd
+@@ -223,8 +223,8 @@ arp_ip_target
+ 	maximum number of targets that can be specified is set at 16.
+ 
+ downdelay
+- 
+-        Specifies the delay time in milli-seconds to disable a link after a 
++
++        Specifies the delay time in milli-seconds to disable a link after a
+         link failure has been detected. This should be a multiple of miimon
+         value, otherwise the value will be rounded. The default value is 0.
+ 
+@@ -247,7 +247,7 @@ max_bonds
+ 	and bond2 will be created.  The default value is 1.
+ 
+ miimon
+- 
++
+         Specifies the frequency in milli-seconds that MII link monitoring
+         will occur. A value of zero disables MII link monitoring. A value
+         of 100 is a good starting point. See High Availability section for
+@@ -258,7 +258,7 @@ mode
+ 	Specifies one of the bonding policies. The default is
+ 	round-robin (balance-rr).  Possible values are (you can use
+ 	either the text or numeric option):
+- 
++
+ 	balance-rr or 0
+ 
+ 		Round-robin policy: Transmit in a sequential order
+@@ -273,7 +273,7 @@ mode
+ 		externally visible on only one port (network adapter)
+ 		to avoid confusing the switch.  This mode provides
+ 		fault tolerance.
+- 
++
+ 	balance-xor or 2
+ 
+ 		XOR policy: Transmit based on [(source MAC address
+@@ -293,7 +293,7 @@ mode
+ 		groups that share the same speed and duplex settings.
+ 		Transmits and receives on all slaves in the active
+ 		aggregator.
+- 
++
+ 		Pre-requisites:
+ 
+ 		1. Ethtool support in the base drivers for retrieving the
+@@ -317,7 +317,7 @@ mode
+ 		Ethtool support in the base drivers for retrieving the
+ 		speed of each slave.
+ 
+-	balance-alb or 6 
++	balance-alb or 6
+ 
+ 		Adaptive load balancing: includes balance-tlb + receive
+ 		load balancing (rlb) for IPV4 traffic and does not require
+@@ -327,7 +327,7 @@ mode
+ 		overwrites the src hw address with the unique hw address of
+ 		one of the slaves in the bond such that different clients
+ 		use different hw addresses for the server.
+-		
++
+ 		Receive traffic from connections created by the server is
+ 		also balanced. When the server sends an ARP Request the
+ 		bonding driver copies and saves the client's IP information
+@@ -363,25 +363,11 @@ mode
+ 		2. Base driver support for setting the hw address of a
+ 		device also when it is open. This is required so that there
+ 		will always be one slave in the team using the bond hw
+-		address (the current_slave) while having a unique hw
+-		address for each slave in the bond. If the current_slave
+-		fails it's hw address is swapped with the new current_slave
++		address (the curr_active_slave) while having a unique hw
++		address for each slave in the bond. If the curr_active_slave
++		fails it's hw address is swapped with the new curr_active_slave
+ 		that was chosen.
+ 
+-multicast
+-
+-        Option specifying the mode of operation for multicast support.
+-        Possible values are:
+-
+-	disabled or 0
+-		Disabled (no multicast support)
+-
+-        active or 1
+-		Enabled on active slave only, useful in active-backup mode
+-
+-	all or 2
+-		Enabled on all slaves, this is the default
+-
+ primary
+ 
+         A string (eth0, eth2, etc) to equate to a primary device. If this
+@@ -397,11 +383,11 @@ primary
+         primary is only valid in active-backup mode.
+ 
+ updelay
+- 
+-        Specifies the delay time in milli-seconds to enable a link after a 
++
++        Specifies the delay time in milli-seconds to enable a link after a
+         link up status has been detected. This should be a multiple of miimon
+         value, otherwise the value will be rounded. The default value is 0.
+- 
++
+ use_carrier
+ 
+         Specifies whether or not miimon should use MII or ETHTOOL
+@@ -529,20 +515,20 @@ Verifying Bond Configuration
+ ----------------------------
+ The bonding driver information files reside in the /proc/net/bonding directory.
+ 
+-Sample contents of /proc/net/bonding/bond0 after the driver is loaded with 
++Sample contents of /proc/net/bonding/bond0 after the driver is loaded with
+ parameters of mode=0 and miimon=1000 is shown below.
+- 
++
+         Bonding Mode: load balancing (round-robin)
+         Currently Active Slave: eth0
+         MII Status: up
+         MII Polling Interval (ms): 1000
+         Up Delay (ms): 0
+         Down Delay (ms): 0
+- 
++
+         Slave Interface: eth1
+         MII Status: up
+         Link Failure Count: 1
+- 
++
+         Slave Interface: eth0
+         MII Status: up
+         Link Failure Count: 1
+@@ -550,34 +536,34 @@ parameters of mode=0 and miimon=1000 is 
+ 2) Network verification
+ -----------------------
+ The network configuration can be verified using the ifconfig command. In
+-the example below, the bond0 interface is the master (MASTER) while eth0 and 
+-eth1 are slaves (SLAVE). Notice all slaves of bond0 have the same MAC address 
++the example below, the bond0 interface is the master (MASTER) while eth0 and
++eth1 are slaves (SLAVE). Notice all slaves of bond0 have the same MAC address
+ (HWaddr) as bond0 for all modes except TLB and ALB that require a unique MAC
+ address for each slave.
+ 
+ [root]# /sbin/ifconfig
+-bond0     Link encap:Ethernet  HWaddr 00:C0:F0:1F:37:B4  
++bond0     Link encap:Ethernet  HWaddr 00:C0:F0:1F:37:B4
+           inet addr:XXX.XXX.XXX.YYY  Bcast:XXX.XXX.XXX.255  Mask:255.255.252.0
+           UP BROADCAST RUNNING MASTER MULTICAST  MTU:1500  Metric:1
+           RX packets:7224794 errors:0 dropped:0 overruns:0 frame:0
+           TX packets:3286647 errors:1 dropped:0 overruns:1 carrier:0
+-          collisions:0 txqueuelen:0 
++          collisions:0 txqueuelen:0
+ 
+-eth0      Link encap:Ethernet  HWaddr 00:C0:F0:1F:37:B4  
++eth0      Link encap:Ethernet  HWaddr 00:C0:F0:1F:37:B4
+           inet addr:XXX.XXX.XXX.YYY  Bcast:XXX.XXX.XXX.255  Mask:255.255.252.0
+           UP BROADCAST RUNNING SLAVE MULTICAST  MTU:1500  Metric:1
+           RX packets:3573025 errors:0 dropped:0 overruns:0 frame:0
+           TX packets:1643167 errors:1 dropped:0 overruns:1 carrier:0
+-          collisions:0 txqueuelen:100 
+-          Interrupt:10 Base address:0x1080 
++          collisions:0 txqueuelen:100
++          Interrupt:10 Base address:0x1080
+ 
+-eth1      Link encap:Ethernet  HWaddr 00:C0:F0:1F:37:B4  
++eth1      Link encap:Ethernet  HWaddr 00:C0:F0:1F:37:B4
+           inet addr:XXX.XXX.XXX.YYY  Bcast:XXX.XXX.XXX.255  Mask:255.255.252.0
+           UP BROADCAST RUNNING SLAVE MULTICAST  MTU:1500  Metric:1
+           RX packets:3651769 errors:0 dropped:0 overruns:0 frame:0
+           TX packets:1643480 errors:0 dropped:0 overruns:0 carrier:0
+-          collisions:0 txqueuelen:100 
+-          Interrupt:9 Base address:0x1400 
++          collisions:0 txqueuelen:100
++          Interrupt:9 Base address:0x1400
+ 
+ 
+ Frequently Asked Questions
+@@ -605,9 +591,9 @@ Frequently Asked Questions
+ 
+ 5.  What happens when a slave link dies?
+ 
+-	If your ethernet cards support MII or ETHTOOL link status monitoring 
+-        and the MII monitoring has been enabled in the driver (see description 
+-        of module parameters), there will be no adverse consequences. This 
++	If your ethernet cards support MII or ETHTOOL link status monitoring
++        and the MII monitoring has been enabled in the driver (see description
++        of module parameters), there will be no adverse consequences. This
+         release of the bonding driver knows how to get the MII information and
+ 	enables or disables its slaves according to their link status.
+ 	See section on High Availability for additional information.
+@@ -622,8 +608,8 @@ Frequently Asked Questions
+         slave.
+ 
+ 	If neither mii_monitor and arp_interval is configured, the bonding
+-	driver will not handle this situation very well. The driver will 
+-	continue to send packets but some packets will be lost. Retransmits 
++	driver will not handle this situation very well. The driver will
++	continue to send packets but some packets will be lost. Retransmits
+ 	will cause serious degradation of performance (in the case when one
+ 	of two slave links fails, 50% packets will be lost, which is a serious
+ 	problem for both TCP and UDP).
+@@ -636,9 +622,9 @@ Frequently Asked Questions
+ 
+ 7.  Which switches/systems does it work with?
+ 
+-	In round-robin and XOR mode, it works with systems that support 
++	In round-robin and XOR mode, it works with systems that support
+ 	trunking:
+-	
++
+ 	* Many Cisco switches and routers (look for EtherChannel support).
+ 	* SunTrunking software.
+ 	* Alteon AceDirector switches / WebOS (use Trunks).
+@@ -646,7 +632,7 @@ Frequently Asked Questions
+ 	  models (450) can define trunks between ports on different physical
+ 	  units.
+ 	* Linux bonding, of course !
+-	
++
+ 	In 802.3ad mode, it works with with systems that support IEEE 802.3ad
+ 	Dynamic Link Aggregation:
+ 
+@@ -667,21 +653,21 @@ Frequently Asked Questions
+ 	is then passed to all following slaves and remains persistent (even if
+ 	the the first slave is removed) until the bonding device is brought
+ 	down or reconfigured.
+-	
++
+ 	If you wish to change the MAC address, you can set it with ifconfig:
+ 
+ 	  # ifconfig bond0 hw ether 00:11:22:33:44:55
+ 
+ 	The MAC address can be also changed by bringing down/up the device
+ 	and then changing its slaves (or their order):
+-	
++
+ 	  # ifconfig bond0 down ; modprobe -r bonding
+ 	  # ifconfig bond0 .... up
+ 	  # ifenslave bond0 eth...
+ 
+ 	This method will automatically take the address from the next slave
+ 	that will be added.
+-	
++
+ 	To restore your slaves' MAC addresses, you need to detach them
+ 	from the bond (`ifenslave -d bond0 eth0'), set them down
+ 	(`ifconfig eth0 down'), unload the drivers (`rmmod 3c59x', for
+@@ -729,27 +715,27 @@ High Availability
+ =================
+ 
+ To implement high availability using the bonding driver, the driver needs to be
+-compiled as a module, because currently it is the only way to pass parameters 
++compiled as a module, because currently it is the only way to pass parameters
+ to the driver. This may change in the future.
+ 
+-High availability is achieved by using MII or ETHTOOL status reporting. You 
+-need to verify that all your interfaces support MII or ETHTOOL link status 
+-reporting.  On Linux kernel 2.2.17, all the 100 Mbps capable drivers and 
+-yellowfin gigabit driver support MII. To determine if ETHTOOL link reporting 
+-is available for interface eth0, type "ethtool eth0" and the "Link detected:" 
+-line should contain the correct link status. If your system has an interface 
+-that does not support MII or ETHTOOL status reporting, a failure of its link 
+-will not be detected! A message indicating MII and ETHTOOL is not supported by 
+-a network driver is logged when the bonding driver is loaded with a non-zero 
++High availability is achieved by using MII or ETHTOOL status reporting. You
++need to verify that all your interfaces support MII or ETHTOOL link status
++reporting.  On Linux kernel 2.2.17, all the 100 Mbps capable drivers and
++yellowfin gigabit driver support MII. To determine if ETHTOOL link reporting
++is available for interface eth0, type "ethtool eth0" and the "Link detected:"
++line should contain the correct link status. If your system has an interface
++that does not support MII or ETHTOOL status reporting, a failure of its link
++will not be detected! A message indicating MII and ETHTOOL is not supported by
++a network driver is logged when the bonding driver is loaded with a non-zero
+ miimon value.
+ 
+ The bonding driver can regularly check all its slaves links using the ETHTOOL
+-IOCTL (ETHTOOL_GLINK command) or by checking the MII status registers. The 
+-check interval is specified by the module argument "miimon" (MII monitoring). 
+-It takes an integer that represents the checking time in milliseconds. It 
+-should not come to close to (1000/HZ) (10 milli-seconds on i386) because it 
+-may then reduce the system interactivity. A value of 100 seems to be a good 
+-starting point. It means that a dead link will be detected at most 100 
++IOCTL (ETHTOOL_GLINK command) or by checking the MII status registers. The
++check interval is specified by the module argument "miimon" (MII monitoring).
++It takes an integer that represents the checking time in milliseconds. It
++should not come to close to (1000/HZ) (10 milli-seconds on i386) because it
++may then reduce the system interactivity. A value of 100 seems to be a good
++starting point. It means that a dead link will be detected at most 100
+ milli-seconds after it goes down.
+ 
+ Example:
+@@ -761,7 +747,7 @@ Or, put the following lines in /etc/modu
+    alias bond0 bonding
+    options bond0 miimon=100
+ 
+-There are currently two policies for high availability. They are dependent on 
++There are currently two policies for high availability. They are dependent on
+ whether:
+ 
+    a) hosts are connected to a single host or switch that support trunking
+@@ -811,7 +797,7 @@ Example 2 : host to switch at twice the 
+      # ifenslave bond0 eth0 eth1
+ 
+ 
+-2) High Availability on two or more switches (or a single switch without 
++2) High Availability on two or more switches (or a single switch without
+    trunking support)
+ ---------------------------------------------------------------------------
+ This mode is more problematic because it relies on the fact that there
+@@ -870,10 +856,10 @@ by another external mechanism, it is goo
+ connected to one switch and host2's to the other. Such system will survive
+ a failure of a single host, cable, or switch. The worst thing that may happen
+ in the case of a switch failure is that half of the hosts will be temporarily
+-unreachable until the other switch expires its tables. 
++unreachable until the other switch expires its tables.
+ 
+ Example 2: Using multiple ethernet cards connected to a switch to configure
+-           NIC failover (switch is not required to support trunking). 
++           NIC failover (switch is not required to support trunking).
+ 
+ 
+           +----------+                          +----------+
+@@ -957,7 +943,7 @@ The main limitations are :
+     servers, but may be useful when the front switches send multicast
+     information on their links (e.g. VRRP), or even health-check the servers.
+     Use the arp_interval/arp_ip_target parameters to count incoming/outgoing
+-    frames.  
++    frames.
+ 
+ 
+ 
+@@ -973,13 +959,12 @@ Donald Becker's Ethernet Drivers and dia
+ You will also find a lot of information regarding Ethernet, NWay, MII, etc. at
+ www.scyld.com.
+ 
+-For new versions of the driver, patches for older kernels and the updated
+-userspace tools, take a look at Willy Tarreau's site :
++Patches for 2.2 kernels are at Willy Tarreau's site :
+  - http://wtarreau.free.fr/pub/bonding/
+- - http://www-miaif.lip6.fr/willy/pub/bonding/
++ - http://www-miaif.lip6.fr/~tarreau/pub/bonding/
+ 
+ To get latest informations about Linux Kernel development, please consult
+ the Linux Kernel Mailing List Archives at :
+-   http://boudicca.tux.org/hypermail/linux-kernel/latest/
++   http://www.ussg.iu.edu/hypermail/linux/kernel/
+ 
+ -- END --
+--- linux-2.6.0/Documentation/networking/ifenslave.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/Documentation/networking/ifenslave.c	2003-12-28 23:21:00.000000000 -0800
+@@ -4,8 +4,6 @@
+  *	This program controls the Linux implementation of running multiple
+  *	network interfaces in parallel.
+  *
+- * Usage:	ifenslave [-v] master-interface < slave-interface [metric <N>] > ...
+- *
+  * Author:	Donald Becker <becker@cesdis.gsfc.nasa.gov>
+  *		Copyright 1994-1996 Donald Becker
+  *
+@@ -90,24 +88,30 @@
+  * 	 - For opt_c: slave should not be set to the master's setting
+  *	   while it is running. It was already set during enslave. To
+  *	   simplify things, it is now handeled separately.
++ *
++ *    - 2003/09/24 - Shmulik Hen <shmulik.hen at intel dot com>
++ *	 - Code cleanup and style changes
++ *	   set version to 1.1.0
+  */
+ 
+-#define APP_VERSION	"1.0.12"
+-#define APP_RELDATE	"June 30, 2003"
++#define APP_VERSION	"1.1.0"
++#define APP_RELDATE	"Septemer 24, 2003"
+ #define APP_NAME	"ifenslave"
+ 
+ static char *version =
+-APP_NAME ".c:v" APP_VERSION " (" APP_RELDATE ") "  "\nDonald Becker (becker@cesdis.gsfc.nasa.gov).\n"
+-"detach support added on 2000/10/02 by Willy Tarreau (willy at meta-x.org).\n"
+-"2.4 kernel support added on 2001/02/16 by Chad N. Tindel (ctindel at ieee dot org.\n";
++APP_NAME ".c:v" APP_VERSION " (" APP_RELDATE ")\n"
++"o Donald Becker (becker@cesdis.gsfc.nasa.gov).\n"
++"o Detach support added on 2000/10/02 by Willy Tarreau (willy at meta-x.org).\n"
++"o 2.4 kernel support added on 2001/02/16 by Chad N. Tindel\n"
++"  (ctindel at ieee dot org).\n";
+ 
+ static const char *usage_msg =
+-"Usage: ifenslave [-adfrvVh] <master-interface> < <slave-if> [metric <N>] > ...\n"
+-"       ifenslave -c master-interface slave-if\n";
++"Usage: ifenslave [-f] <master-if> <slave-if> [<slave-if>...]\n"
++"       ifenslave -d   <master-if> <slave-if> [<slave-if>...]\n"
++"       ifenslave -c   <master-if> <slave-if>\n"
++"       ifenslave --help\n";
+ 
+-static const char *howto_msg =
+-"Usage: ifenslave [-adfrvVh] <master-interface> < <slave-if> [metric <N>] > ...\n"
+-"       ifenslave -c master-interface slave-if\n"
++static const char *help_msg =
+ "\n"
+ "       To create a bond device, simply follow these three steps :\n"
+ "       - ensure that the required drivers are properly loaded :\n"
+@@ -115,18 +119,32 @@ static const char *howto_msg =
+ "       - assign an IP address to the bond device :\n"
+ "         # ifconfig bond0 <addr> netmask <mask> broadcast <bcast>\n"
+ "       - attach all the interfaces you need to the bond device :\n"
+-"         # ifenslave bond0 eth0 eth1 eth2\n"
++"         # ifenslave [{-f|--force}] bond0 eth0 [eth1 [eth2]...]\n"
+ "         If bond0 didn't have a MAC address, it will take eth0's. Then, all\n"
+ "         interfaces attached AFTER this assignment will get the same MAC addr.\n"
+-"\n"
+-"       To detach a dead interface without setting the bond device down :\n"
+-"         # ifenslave -d bond0 eth1\n"
++"         (except for ALB/TLB modes)\n"
+ "\n"
+ "       To set the bond device down and automatically release all the slaves :\n"
+ "         # ifconfig bond0 down\n"
+ "\n"
++"       To detach a dead interface without setting the bond device down :\n"
++"         # ifenslave {-d|--detach} bond0 eth0 [eth1 [eth2]...]\n"
++"\n"
+ "       To change active slave :\n"
+-"         # ifenslave -c bond0 eth0\n"
++"         # ifenslave {-c|--change-active} bond0 eth0\n"
++"\n"
++"       To show master interface info\n"
++"         # ifenslave bond0\n"
++"\n"
++"       To show all interfaces info\n"
++"       # ifenslave {-a|--all-interfaces}\n"
++"\n"
++"       To be more verbose\n"
++"       # ifenslave {-v|--verbose} ...\n"
++"\n"
++"       # ifenslave {-u|--usage}   Show usage\n"
++"       # ifenslave {-V|--version} Show version\n"
++"       # ifenslave {-h|--help}    This message\n"
+ "\n";
+ 
+ #include <unistd.h>
+@@ -153,476 +171,332 @@ typedef __uint8_t u8;		/* ditto */
+ #include <linux/ethtool.h>
+ 
+ struct option longopts[] = {
+- /* { name  has_arg  *flag  val } */
+-    {"all-interfaces", 0, 0, 'a'},	/* Show all interfaces. */
+-    {"force",       0, 0, 'f'},		/* Force the operation. */
+-    {"help", 		0, 0, '?'},		/* Give help */
+-	{"howto",       0, 0, 'h'},     /* Give some more help */
+-    {"receive-slave", 0, 0, 'r'},	/* Make a receive-only slave.  */
+-    {"verbose", 	0, 0, 'v'},		/* Report each action taken.  */
+-    {"version", 	0, 0, 'V'},		/* Emit version information.  */
+-    {"detach",       0, 0, 'd'},	/* Detach a slave interface. */
+-    {"change-active", 0, 0, 'c'},	/* Change the active slave.  */
+-    { 0, 0, 0, 0 }
++	/* { name  has_arg  *flag  val } */
++	{"all-interfaces",	0, 0, 'a'},	/* Show all interfaces. */
++	{"change-active",	0, 0, 'c'},	/* Change the active slave.  */
++	{"detach",		0, 0, 'd'},	/* Detach a slave interface. */
++	{"force",		0, 0, 'f'},	/* Force the operation. */
++	{"help",		0, 0, 'h'},	/* Give help */
++	{"usage",		0, 0, 'u'},	/* Give usage */
++	{"verbose",		0, 0, 'v'},	/* Report each action taken. */
++	{"version",		0, 0, 'V'},	/* Emit version information. */
++	{ 0, 0, 0, 0}
+ };
+ 
+ /* Command-line flags. */
+ unsigned int
+-opt_a = 0,					/* Show-all-interfaces flag. */
+-opt_f = 0,					/* Force the operation. */
+-opt_r = 0,					/* Set up a Rx-only slave. */
+-opt_d = 0,					/* detach a slave interface. */
+-opt_c = 0,					/* change-active-slave flag. */
+-verbose = 0,					/* Verbose flag. */
+-opt_version = 0,
+-opt_howto = 0;
+-int skfd = -1;					/* AF_INET socket for ioctl() calls.	*/
++opt_a = 0,	/* Show-all-interfaces flag. */
++opt_c = 0,	/* Change-active-slave flag. */
++opt_d = 0,	/* Detach a slave interface. */
++opt_f = 0,	/* Force the operation. */
++opt_h = 0,	/* Help */
++opt_u = 0,	/* Usage */
++opt_v = 0,	/* Verbose flag. */
++opt_V = 0;	/* Version */
++
++int skfd = -1;		/* AF_INET socket for ioctl() calls.*/
++int abi_ver = 0;	/* userland - kernel ABI version */
++int hwaddr_set = 0;	/* Master's hwaddr is set */
++int saved_errno;
++
++struct ifreq master_mtu, master_flags, master_hwaddr;
++struct ifreq slave_mtu, slave_flags, slave_hwaddr;
++
++struct dev_ifr {
++	struct ifreq *req_ifr;
++	char *req_name;
++	int req_type;
++};
++
++struct dev_ifr master_ifra[] = {
++	{&master_mtu,     "SIOCGIFMTU",     SIOCGIFMTU},
++	{&master_flags,   "SIOCGIFFLAGS",   SIOCGIFFLAGS},
++	{&master_hwaddr,  "SIOCGIFHWADDR",  SIOCGIFHWADDR},
++	{NULL, "", 0}
++};
++
++struct dev_ifr slave_ifra[] = {
++	{&slave_mtu,     "SIOCGIFMTU",     SIOCGIFMTU},
++	{&slave_flags,   "SIOCGIFFLAGS",   SIOCGIFFLAGS},
++	{&slave_hwaddr,  "SIOCGIFHWADDR",  SIOCGIFHWADDR},
++	{NULL, "", 0}
++};
+ 
+ static void if_print(char *ifname);
+-static int get_abi_ver(char *master_ifname);
++static int get_drv_info(char *master_ifname);
++static int get_if_settings(char *ifname, struct dev_ifr ifra[]);
++static int get_slave_flags(char *slave_ifname);
++static int set_master_hwaddr(char *master_ifname, struct sockaddr *hwaddr);
++static int set_slave_hwaddr(char *slave_ifname, struct sockaddr *hwaddr);
++static int set_slave_mtu(char *slave_ifname, int mtu);
++static int set_if_flags(char *ifname, short flags);
++static int set_if_up(char *ifname, short flags);
++static int set_if_down(char *ifname, short flags);
++static int clear_if_addr(char *ifname);
++static int set_if_addr(char *master_ifname, char *slave_ifname);
++static int change_active(char *master_ifname, char *slave_ifname);
++static int enslave(char *master_ifname, char *slave_ifname);
++static int release(char *master_ifname, char *slave_ifname);
++#define v_print(fmt, args...)	\
++	if (opt_v)		\
++		fprintf(stderr, fmt, ## args )
+ 
+-int
+-main(int argc, char **argv)
++int main(int argc, char *argv[])
+ {
+-	struct ifreq  ifr2, if_hwaddr, if_ipaddr, if_metric, if_mtu, if_dstaddr;
+-	struct ifreq  if_netmask, if_brdaddr, if_flags;
+-	int rv, goterr = 0;
+-	int c, errflag = 0;
+-	sa_family_t master_family;
+ 	char **spp, *master_ifname, *slave_ifname;
+-	int hwaddr_notset;
+-	int abi_ver = 0;
++	int c, i, rv;
++	int res = 0;
++	int exclusive = 0;
+ 
+-	while ((c = getopt_long(argc, argv, "acdfrvV?h", longopts, 0)) != EOF)
++	while ((c = getopt_long(argc, argv, "acdfhuvV", longopts, 0)) != EOF) {
+ 		switch (c) {
+-		case 'a': opt_a++; break;
+-		case 'f': opt_f++; break;
+-		case 'r': opt_r++; break;
+-		case 'd': opt_d++; break;
+-		case 'c': opt_c++; break;
+-		case 'v': verbose++;		break;
+-		case 'V': opt_version++;	break;
+-		case 'h': opt_howto++;	break;
+-		case '?': errflag++;
+-		}
++		case 'a': opt_a++; exclusive++; break;
++		case 'c': opt_c++; exclusive++; break;
++		case 'd': opt_d++; exclusive++; break;
++		case 'f': opt_f++; exclusive++; break;
++		case 'h': opt_h++; exclusive++; break;
++		case 'u': opt_u++; exclusive++; break;
++		case 'v': opt_v++; break;
++		case 'V': opt_V++; exclusive++; break;
+ 
+-	/* option check */
+-	if (opt_c)
+-		if(opt_a || opt_f || opt_r || opt_d || verbose || opt_version ||
+-		   opt_howto || errflag ) {
++		case '?':
+ 			fprintf(stderr, usage_msg);
+-			return 2;
++			res = 2;
++			goto out;
+ 		}
++	}
+ 
+-	if (errflag) {
++	/* options check */
++	if (exclusive > 1) {
+ 		fprintf(stderr, usage_msg);
+-		return 2;
++		res = 2;
++		goto out;
+ 	}
+ 
+-	if (opt_howto) {
+-		fprintf(stderr, howto_msg);
+-		return 0;
++	if (opt_v || opt_V) {
++		printf(version);
++		if (opt_V) {
++			res = 0;
++			goto out;
++		}
+ 	}
+ 
+-	if (verbose || opt_version) {
+-		printf(version);
+-		if (opt_version)
+-			exit(0);
++	if (opt_u) {
++		printf(usage_msg);
++		res = 0;
++		goto out;
+ 	}
+ 
+-	/* Open a basic socket. */
+-	if ((skfd = socket(AF_INET, SOCK_DGRAM,0)) < 0) {
+-		perror("socket");
+-		exit(-1);
++	if (opt_h) {
++		printf(usage_msg);
++		printf(help_msg);
++		res = 0;
++		goto out;
+ 	}
+ 
+-	if (verbose)
+-		fprintf(stderr, "DEBUG: argc=%d, optind=%d and argv[optind] is %s.\n",
+-				argc, optind, argv[optind]);
++	/* Open a basic socket */
++	if ((skfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
++		perror("socket");
++		res = 1;
++		goto out;
++	}
+ 
+-	/* No remaining args means show all interfaces. */
+-	if (optind == argc) {
+-		if_print((char *)NULL);
+-		(void) close(skfd);
+-		exit(0);
++	if (opt_a) {
++		if (optind == argc) {
++			/* No remaining args */
++			/* show all interfaces */
++			if_print((char *)NULL);
++			goto out;
++		} else {
++			/* Just show usage */
++			fprintf(stderr, usage_msg);
++			res = 2;
++			goto out;
++		}
+ 	}
+ 
+-	/* Copy the interface name. */
++	/* Copy the interface name */
+ 	spp = argv + optind;
+ 	master_ifname = *spp++;
+-	slave_ifname = *spp++;
+ 
+-	/* Check command line. */
+-	if (opt_c) {
+-		char **tempp = spp;
+-		if ((master_ifname == NULL)||(slave_ifname == NULL)||(*tempp++ != NULL)) {
+-			fprintf(stderr, usage_msg);
+-			(void) close(skfd);
+-			return 2;
+-		}
++	if (master_ifname == NULL) {
++		fprintf(stderr, usage_msg);
++		res = 2;
++		goto out;
+ 	}
+ 
+-	/* A single args means show the configuration for this interface. */
+-	if (slave_ifname == NULL) {
+-		if_print(master_ifname);
+-		(void) close(skfd);
+-		exit(0);
++	/* exchange abi version with bonding module */
++	res = get_drv_info(master_ifname);
++	if (res) {
++		fprintf(stderr,
++			"Master '%s': Error: handshake with driver failed. "
++			"Aborting\n",
++			master_ifname);
++		goto out;
+ 	}
+ 
+-	/* exchange abi version with bonding driver */
+-	abi_ver = get_abi_ver(master_ifname);
+-	if (abi_ver < 0) {
+-		(void) close(skfd);
+-		exit(1);
+-	}
+-
+-	/* Get the vitals from the master interface. */
+-	{
+-		struct ifreq *ifra[7] = { &if_ipaddr, &if_mtu, &if_dstaddr,
+-								  &if_brdaddr, &if_netmask, &if_flags,
+-								  &if_hwaddr };
+-		const char *req_name[7] = {
+-			"IP address", "MTU", "destination address",
+-			"broadcast address", "netmask", "status flags",
+-			"hardware address" };
+-		const int ioctl_req_type[7] = {
+-			SIOCGIFADDR, SIOCGIFMTU, SIOCGIFDSTADDR,
+-			SIOCGIFBRDADDR, SIOCGIFNETMASK, SIOCGIFFLAGS,
+-			SIOCGIFHWADDR };
+-		int i;
+-
+-		for (i = 0; i < 7; i++) {
+-			strncpy(ifra[i]->ifr_name, master_ifname, IFNAMSIZ);
+-			if (ioctl(skfd, ioctl_req_type[i], ifra[i]) < 0) {
+-				fprintf(stderr,
+-						"Something broke getting the master's %s: %s.\n",
+-						req_name[i], strerror(errno));
+-			}
+-		}
+-
+-		/* check if master is up; if not then fail any operation */
+-		if (!(if_flags.ifr_flags & IFF_UP)) {
+-			fprintf(stderr, "Illegal operation; the specified master interface '%s' is not up.\n", master_ifname);
+-			(void) close(skfd);
+-			exit (1);
+-		}
++	slave_ifname = *spp++;
+ 
+-		hwaddr_notset = 1; /* assume master's address not set yet */
+-		for (i = 0; hwaddr_notset && (i < 6); i++) {
+-			hwaddr_notset &= ((unsigned char *)if_hwaddr.ifr_hwaddr.sa_data)[i] == 0;
++	if (slave_ifname == NULL) {
++		if (opt_d || opt_c) {
++			fprintf(stderr, usage_msg);
++			res = 2;
++			goto out;
+ 		}
+ 
+-		/* The family '1' is ARPHRD_ETHER for ethernet. */
+-		if (if_hwaddr.ifr_hwaddr.sa_family != 1 && !opt_f) {
+-			fprintf(stderr, "The specified master interface '%s' is not"
+-					" ethernet-like.\n  This program is designed to work"
+-					" with ethernet-like network interfaces.\n"
+-					" Use the '-f' option to force the operation.\n",
+-					master_ifname);
+-			(void) close(skfd);
+-			exit (1);
+-		}
+-		master_family = if_hwaddr.ifr_hwaddr.sa_family;
+-		if (verbose) {
+-			unsigned char *hwaddr = (unsigned char *)if_hwaddr.ifr_hwaddr.sa_data;
+-			printf("The current hardware address (SIOCGIFHWADDR) of %s is type %d  "
+-				   "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x.\n", master_ifname,
+-				   if_hwaddr.ifr_hwaddr.sa_family, hwaddr[0], hwaddr[1],
+-				   hwaddr[2], hwaddr[3], hwaddr[4], hwaddr[5]);
+-		}
++		/* A single arg means show the
++		 * configuration for this interface
++		 */
++		if_print(master_ifname);
++		goto out;
+ 	}
+ 
++	res = get_if_settings(master_ifname, master_ifra);
++	if (res) {
++		/* Probably a good reason not to go on */
++		fprintf(stderr,
++			"Master '%s': Error: get settings failed: %s. "
++			"Aborting\n",
++			master_ifname, strerror(res));
++		goto out;
++	}
+ 
+-	/* do this when enslaving interfaces */
+-	do {
+-		if (opt_d) {  /* detach a slave interface from the master */
+-			strncpy(if_flags.ifr_name, master_ifname, IFNAMSIZ);
+-			strncpy(if_flags.ifr_slave, slave_ifname, IFNAMSIZ);
+-			if ((ioctl(skfd, SIOCBONDRELEASE, &if_flags) < 0) &&
+-				(ioctl(skfd, BOND_RELEASE_OLD, &if_flags) < 0)) {
+-					fprintf(stderr,	"SIOCBONDRELEASE: cannot detach %s from %s. errno=%s.\n",
+-							slave_ifname, master_ifname, strerror(errno));
+-			}
+-			else if (abi_ver < 1) {
+-			      	/* The driver is using an old ABI, so we'll set the interface
+-				 * down to avoid any conflicts due to same IP/MAC
+-				 */
+-				strncpy(ifr2.ifr_name, slave_ifname, IFNAMSIZ);
+-				if (ioctl(skfd, SIOCGIFFLAGS, &ifr2) < 0) {
+-					int saved_errno = errno;
+-					fprintf(stderr, "SIOCGIFFLAGS on %s failed: %s\n", slave_ifname,
+-						strerror(saved_errno));
+-				}
+-				else {
+-					ifr2.ifr_flags &= ~(IFF_UP | IFF_RUNNING);
+-					if (ioctl(skfd, SIOCSIFFLAGS, &ifr2) < 0) {
+-						int saved_errno = errno;
+-						fprintf(stderr, "Shutting down interface %s failed: %s\n",
+-							slave_ifname, strerror(saved_errno));
+-					}
+-				}
+-			}
+-		} else if (opt_c) { /* change primary slave */
+-			strncpy(if_flags.ifr_name, master_ifname, IFNAMSIZ);
+-			strncpy(if_flags.ifr_slave, slave_ifname, IFNAMSIZ);
+-			if ((ioctl(skfd, SIOCBONDCHANGEACTIVE, &if_flags) < 0) &&
+-			    (ioctl(skfd, BOND_CHANGE_ACTIVE_OLD, &if_flags) < 0)) {
+-				fprintf(stderr,	"SIOCBONDCHANGEACTIVE: %s.\n", strerror(errno));
+-			}
+-		} else {  /* attach a slave interface to the master */
+-
+-			strncpy(ifr2.ifr_name, slave_ifname, IFNAMSIZ);
+-			if (ioctl(skfd, SIOCGIFFLAGS, &ifr2) < 0) {
+-				int saved_errno = errno;
+-				fprintf(stderr, "SIOCGIFFLAGS on %s failed: %s\n", slave_ifname,
+-						strerror(saved_errno));
+-				(void) close(skfd);
+-				return 1;
+-			}
+-
+-			if ((ifr2.ifr_flags & IFF_SLAVE) && !opt_r) {
+-				fprintf(stderr, "%s is already a slave\n", slave_ifname);
+-				(void) close(skfd);
+-				return 1;
+-			}
+-
+-			/* if hwaddr_notset, assign the slave hw address to the master */
+-			if (hwaddr_notset) {
+-				/* assign the slave hw address to the
+-				 * master since it currently does not
+-				 * have one; otherwise, slaves may
+-				 * have different hw addresses in
+-				 * active-backup mode as seen when enslaving
+-				 * using "ifenslave bond0 eth0 eth1" because
+-				 * hwaddr_notset is set outside this loop.
+-				 * TODO: put this and the "else" portion in
+-				 *       a function.
+-				 */
+-				/* get the slaves MAC address */
+-				strncpy(if_hwaddr.ifr_name, slave_ifname,
+-					IFNAMSIZ);
+-				rv = ioctl(skfd, SIOCGIFHWADDR, &if_hwaddr);
+-				if (-1 == rv) {
+-					fprintf(stderr, "Could not get MAC "
+-						"address of %s: %s\n",
+-						slave_ifname,
+-						strerror(errno));
+-					strncpy(if_hwaddr.ifr_name,
+-						master_ifname, IFNAMSIZ);
+-					goterr = 1;
+-				}
+-
+-				if (!goterr) {
+-					if (abi_ver < 1) {
+-						/* In ABI versions older than 1, the
+-						 * master's set_mac routine couldn't
+-						 * work if it was up, because it
+-						 * used the default ethernet set_mac
+-						 * function.
+-						 */
+-						/* bring master down */
+-						if_flags.ifr_flags &= ~IFF_UP;
+-						if (ioctl(skfd, SIOCSIFFLAGS,
+-								&if_flags) < 0) {
+-							goterr = 1;
+-							fprintf(stderr,
+-								"Shutting down "
+-								"interface %s failed: "
+-								"%s\n",
+-								master_ifname,
+-								strerror(errno));
+-						}
+-					}
+-
+-					strncpy(if_hwaddr.ifr_name,
+-						master_ifname, IFNAMSIZ);
+-					if (ioctl(skfd, SIOCSIFHWADDR,
+-							&if_hwaddr) < 0) {
+-						fprintf(stderr,
+-							"Could not set MAC "
+-							"address of %s: %s\n",
+-							master_ifname,
+-							strerror(errno));
+-						goterr=1;
+-					} else {
+-						hwaddr_notset = 0;
+-					}
+-
+-					if (abi_ver < 1) {
+-						/* bring master back up */
+-						if_flags.ifr_flags |= IFF_UP;
+-						if (ioctl(skfd, SIOCSIFFLAGS,
+-							  &if_flags) < 0) {
+-							fprintf(stderr,
+-								"Bringing up interface "
+-								"%s failed: %s\n",
+-								master_ifname,
+-								strerror(errno));
+-						}
+-					}
+-				}
+-			} else if (abi_ver < 1) { /* if (hwaddr_notset) */
+-
+-			      	/* The driver is using an old ABI, so we'll set the interface
+-				 * down and assign the master's hwaddr to it
+-				 */
+-				if (ifr2.ifr_flags & IFF_UP) {
+-					ifr2.ifr_flags &= ~IFF_UP;
+-					if (ioctl(skfd, SIOCSIFFLAGS, &ifr2) < 0) {
+-						int saved_errno = errno;
+-						fprintf(stderr, "Shutting down interface %s failed: %s\n",
+-							slave_ifname, strerror(saved_errno));
+-					}
+-				}
+-
+-				strncpy(if_hwaddr.ifr_name, slave_ifname, IFNAMSIZ);
+-				if (ioctl(skfd, SIOCSIFHWADDR, &if_hwaddr) < 0) {
+-					int saved_errno = errno;
+-					fprintf(stderr, "SIOCSIFHWADDR on %s failed: %s\n", if_hwaddr.ifr_name,
+-						strerror(saved_errno));
+-					if (saved_errno == EBUSY)
+-						fprintf(stderr, "  The slave device %s is busy: it must be"
+-							" idle before running this command.\n", slave_ifname);
+-					else if (saved_errno == EOPNOTSUPP)
+-						fprintf(stderr, "  The slave device you specified does not support"
+-							" setting the MAC address.\n  Your kernel likely does not"
+-							" support slave devices.\n");
+-					else if (saved_errno == EINVAL)
+-						fprintf(stderr, "  The slave device's address type does not match"
+-							" the master's address type.\n");
+-				} else {
+-					if (verbose) {
+-						unsigned char *hwaddr = if_hwaddr.ifr_hwaddr.sa_data;
+-						printf("Slave's (%s) hardware address set to "
+-							   "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x.\n", slave_ifname,
+-							   hwaddr[0], hwaddr[1], hwaddr[2], hwaddr[3], hwaddr[4], hwaddr[5]);
+-					}
+-				}
+-			}
++	/* check if master is indeed a master;
++	 * if not then fail any operation
++	 */
++	if (!(master_flags.ifr_flags & IFF_MASTER)) {
++		fprintf(stderr,
++			"Illegal operation; the specified interface '%s' "
++			"is not a master. Aborting\n",
++			master_ifname);
++		res = 1;
++		goto out;
++	}
+ 
+-			if (*spp  &&  !strcmp(*spp, "metric")) {
+-				if (*++spp == NULL) {
+-					fprintf(stderr, usage_msg);
+-					(void) close(skfd);
+-					exit(2);
+-				}
+-				if_metric.ifr_metric = atoi(*spp);
+-				strncpy(if_metric.ifr_name, slave_ifname, IFNAMSIZ);
+-				if (ioctl(skfd, SIOCSIFMETRIC, &if_metric) < 0) {
+-					fprintf(stderr, "SIOCSIFMETRIC on %s: %s\n", slave_ifname,
+-							strerror(errno));
+-					goterr = 1;
+-				}
+-				spp++;
+-			}
++	/* check if master is up; if not then fail any operation */
++	if (!(master_flags.ifr_flags & IFF_UP)) {
++		fprintf(stderr,
++			"Illegal operation; the specified master interface "
++			"'%s' is not up.\n",
++			master_ifname);
++		res = 1;
++		goto out;
++	}
+ 
+-			if (strncpy(if_ipaddr.ifr_name, slave_ifname, IFNAMSIZ) <= 0
+-				|| ioctl(skfd, SIOCSIFADDR, &if_ipaddr) < 0) {
+-				fprintf(stderr,
+-						"Something broke setting the slave's address: %s.\n",
+-						strerror(errno));
+-			} else {
+-				if (verbose) {
+-					unsigned char *ipaddr = if_ipaddr.ifr_addr.sa_data;
+-					printf("Set the slave's (%s) IP address to %d.%d.%d.%d.\n",
+-						   slave_ifname, ipaddr[0], ipaddr[1], ipaddr[2], ipaddr[3]);
+-				}
+-			}
++	/* Only for enslaving */
++	if (!opt_c && !opt_d) {
++		sa_family_t master_family = master_hwaddr.ifr_hwaddr.sa_family;
++		unsigned char *hwaddr =
++			(unsigned char *)master_hwaddr.ifr_hwaddr.sa_data;
+ 
+-			if (strncpy(if_mtu.ifr_name, slave_ifname, IFNAMSIZ) <= 0
+-				|| ioctl(skfd, SIOCSIFMTU, &if_mtu) < 0) {
+-				fprintf(stderr, "Something broke setting the slave MTU: %s.\n",
+-						strerror(errno));
+-			} else {
+-				if (verbose)
+-					printf("Set the slave's (%s) MTU to %d.\n", slave_ifname, if_mtu.ifr_mtu);
+-			}
++		/* The family '1' is ARPHRD_ETHER for ethernet. */
++		if (master_family != 1 && !opt_f) {
++			fprintf(stderr,
++				"Illegal operation: The specified master "
++				"interface '%s' is not ethernet-like.\n "
++				"This program is designed to work with "
++				"ethernet-like network interfaces.\n "
++				"Use the '-f' option to force the "
++				"operation.\n",
++				master_ifname);
++			res = 1;
++			goto out;
++		}
+ 
+-			if (strncpy(if_dstaddr.ifr_name, slave_ifname, IFNAMSIZ) <= 0
+-				|| ioctl(skfd, SIOCSIFDSTADDR, &if_dstaddr) < 0) {
+-				fprintf(stderr, "Error setting the slave (%s) with SIOCSIFDSTADDR: %s.\n",
+-						slave_ifname, strerror(errno));
+-			} else {
+-				if (verbose) {
+-					unsigned char *ipaddr = if_dstaddr.ifr_dstaddr.sa_data;
+-					printf("Set the slave's (%s) destination address to %d.%d.%d.%d.\n",
+-						   slave_ifname, ipaddr[0], ipaddr[1], ipaddr[2], ipaddr[3]);
+-				}
++		/* Check master's hw addr */
++		for (i = 0; i < 6; i++) {
++			if (hwaddr[i] != 0) {
++				hwaddr_set = 1;
++				break;
+ 			}
++		}
+ 
+-			if (strncpy(if_brdaddr.ifr_name, slave_ifname, IFNAMSIZ) <= 0
+-				|| ioctl(skfd, SIOCSIFBRDADDR, &if_brdaddr) < 0) {
+-				fprintf(stderr,
+-						"Something broke setting the slave (%s) broadcast address: %s.\n",
+-						slave_ifname, strerror(errno));
+-			} else {
+-				if (verbose) {
+-					unsigned char *ipaddr = if_brdaddr.ifr_broadaddr.sa_data;
+-					printf("Set the slave's (%s) broadcast address to %d.%d.%d.%d.\n",
+-						   slave_ifname, ipaddr[0], ipaddr[1], ipaddr[2], ipaddr[3]);
+-				}
+-			}
++		if (hwaddr_set) {
++			v_print("current hardware address of master '%s' "
++				"is %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x, "
++				"type %d\n",
++				master_ifname,
++				hwaddr[0], hwaddr[1],
++				hwaddr[2], hwaddr[3],
++				hwaddr[4], hwaddr[5],
++				master_family);
++		}
++	}
+ 
+-			if (strncpy(if_netmask.ifr_name, slave_ifname, IFNAMSIZ) <= 0
+-				|| ioctl(skfd, SIOCSIFNETMASK, &if_netmask) < 0) {
+-				fprintf(stderr,
+-						"Something broke setting the slave (%s) netmask: %s.\n",
+-						slave_ifname, strerror(errno));
+-			} else {
+-				if (verbose) {
+-					unsigned char *ipaddr = if_netmask.ifr_netmask.sa_data;
+-					printf("Set the slave's (%s) netmask to %d.%d.%d.%d.\n",
+-						   slave_ifname, ipaddr[0], ipaddr[1], ipaddr[2], ipaddr[3]);
++	/* Accepts only one slave */
++	if (opt_c) {
++		/* change active slave */
++		res = get_slave_flags(slave_ifname);
++		if (res) {
++			fprintf(stderr,
++				"Slave '%s': Error: get flags failed. "
++				"Aborting\n",
++				slave_ifname);
++			goto out;
++		}
++		res = change_active(master_ifname, slave_ifname);
++		if (res) {
++			fprintf(stderr,
++				"Master '%s', Slave '%s': Error: "
++				"Change active failed\n",
++				master_ifname, slave_ifname);
++		}
++	} else {
++		/* Accept multiple slaves */
++		do {
++			if (opt_d) {
++				/* detach a slave interface from the master */
++				rv = get_slave_flags(slave_ifname);
++				if (rv) {
++					/* Can't work with this slave. */
++					/* remember the error and skip it*/
++					fprintf(stderr,
++						"Slave '%s': Error: get flags "
++						"failed. Skipping\n",
++						slave_ifname);
++					res = rv;
++					continue;
+ 				}
+-			}
+-
+-			if (abi_ver < 1) {
+-
+-			      	/* The driver is using an old ABI, so we'll set the interface
+-				 * up before enslaving it
+-				 */
+-				ifr2.ifr_flags |= IFF_UP;
+-				if ((ifr2.ifr_flags &= ~(IFF_SLAVE | IFF_MASTER)) == 0
+-					|| strncpy(ifr2.ifr_name, slave_ifname, IFNAMSIZ) <= 0
+-					|| ioctl(skfd, SIOCSIFFLAGS, &ifr2) < 0) {
+-						fprintf(stderr,
+-							"Something broke setting the slave (%s) flags: %s.\n",
+-							slave_ifname, strerror(errno));
+-				} else {
+-					if (verbose)
+-						printf("Set the slave's (%s) flags %4.4x.\n",
+-							slave_ifname, if_flags.ifr_flags);
++				rv = release(master_ifname, slave_ifname);
++				if (rv) {
++					fprintf(stderr,
++						"Master '%s', Slave '%s': Error: "
++						"Release failed\n",
++						master_ifname, slave_ifname);
++					res = rv;
+ 				}
+ 			} else {
+-				/* the bonding module takes care of setting the slave's mac address
+-			 	 * and opening its interface
+-			 	 */
+-				if (ifr2.ifr_flags & IFF_UP) { /* the interface will need to be down */
+-					ifr2.ifr_flags &= ~IFF_UP;
+-					if (ioctl(skfd, SIOCSIFFLAGS, &ifr2) < 0) {
+-						int saved_errno = errno;
+-						fprintf(stderr, "Shutting down interface %s failed: %s\n",
+-							slave_ifname, strerror(saved_errno));
+-					}
++				/* attach a slave interface to the master */
++				rv = get_if_settings(slave_ifname, slave_ifra);
++				if (rv) {
++					/* Can't work with this slave. */
++					/* remember the error and skip it*/
++					fprintf(stderr,
++						"Slave '%s': Error: get "
++						"settings failed: %s. "
++						"Skipping\n",
++						slave_ifname, strerror(rv));
++					res = rv;
++					continue;
+ 				}
+-			}
+-
+-			/* Do the real thing */
+-			if (!opt_r) {
+-				strncpy(if_flags.ifr_name, master_ifname, IFNAMSIZ);
+-				strncpy(if_flags.ifr_slave, slave_ifname, IFNAMSIZ);
+-				if ((ioctl(skfd, SIOCBONDENSLAVE, &if_flags) < 0) &&
+-				    (ioctl(skfd, BOND_ENSLAVE_OLD, &if_flags) < 0)) {
+-					fprintf(stderr,	"SIOCBONDENSLAVE: %s.\n", strerror(errno));
++				rv = enslave(master_ifname, slave_ifname);
++				if (rv) {
++					fprintf(stderr,
++						"Master '%s', Slave '%s': Error: "
++						"Enslave failed\n",
++						master_ifname, slave_ifname);
++					res = rv;
+ 				}
+ 			}
+-		}
+-	} while ( (slave_ifname = *spp++) != NULL);
++		} while ((slave_ifname = *spp++) != NULL);
++	}
+ 
+-	/* Close the socket. */
+-	(void) close(skfd);
++out:
++	if (skfd >= 0) {
++		close(skfd);
++	}
+ 
+-	return(goterr);
++	return res;
+ }
+ 
+ static short mif_flags;
+@@ -631,35 +505,34 @@ static short mif_flags;
+ static int if_getconfig(char *ifname)
+ {
+ 	struct ifreq ifr;
+-	int metric, mtu;			/* Parameters of the master interface. */
++	int metric, mtu;	/* Parameters of the master interface. */
+ 	struct sockaddr dstaddr, broadaddr, netmask;
++	unsigned char *hwaddr;
+ 
+ 	strcpy(ifr.ifr_name, ifname);
+ 	if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0)
+ 		return -1;
+ 	mif_flags = ifr.ifr_flags;
+ 	printf("The result of SIOCGIFFLAGS on %s is %x.\n",
+-		   ifname, ifr.ifr_flags);
++	       ifname, ifr.ifr_flags);
+ 
+ 	strcpy(ifr.ifr_name, ifname);
+ 	if (ioctl(skfd, SIOCGIFADDR, &ifr) < 0)
+ 		return -1;
+ 	printf("The result of SIOCGIFADDR is %2.2x.%2.2x.%2.2x.%2.2x.\n",
+-		   ifr.ifr_addr.sa_data[0], ifr.ifr_addr.sa_data[1],
+-		   ifr.ifr_addr.sa_data[2], ifr.ifr_addr.sa_data[3]);
++	       ifr.ifr_addr.sa_data[0], ifr.ifr_addr.sa_data[1],
++	       ifr.ifr_addr.sa_data[2], ifr.ifr_addr.sa_data[3]);
+ 
+ 	strcpy(ifr.ifr_name, ifname);
+ 	if (ioctl(skfd, SIOCGIFHWADDR, &ifr) < 0)
+ 		return -1;
+ 
+-	{
+-		/* Gotta convert from 'char' to unsigned for printf().  */
+-		unsigned char *hwaddr = (unsigned char *)ifr.ifr_hwaddr.sa_data;
+-		printf("The result of SIOCGIFHWADDR is type %d  "
+-			   "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x.\n",
+-			   ifr.ifr_hwaddr.sa_family, hwaddr[0], hwaddr[1],
+-			   hwaddr[2], hwaddr[3], hwaddr[4], hwaddr[5]);
+-	}
++	/* Gotta convert from 'char' to unsigned for printf(). */
++	hwaddr = (unsigned char *)ifr.ifr_hwaddr.sa_data;
++	printf("The result of SIOCGIFHWADDR is type %d  "
++	       "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x.\n",
++	       ifr.ifr_hwaddr.sa_family, hwaddr[0], hwaddr[1],
++	       hwaddr[2], hwaddr[3], hwaddr[4], hwaddr[5]);
+ 
+ 	strcpy(ifr.ifr_name, ifname);
+ 	if (ioctl(skfd, SIOCGIFMETRIC, &ifr) < 0) {
+@@ -691,7 +564,7 @@ static int if_getconfig(char *ifname)
+ 	} else
+ 		netmask = ifr.ifr_netmask;
+ 
+-	return(0);
++	return 0;
+ }
+ 
+ static void if_print(char *ifname)
+@@ -705,15 +578,16 @@ static void if_print(char *ifname)
+ 		ifc.ifc_len = sizeof(buff);
+ 		ifc.ifc_buf = buff;
+ 		if (ioctl(skfd, SIOCGIFCONF, &ifc) < 0) {
+-			fprintf(stderr, "SIOCGIFCONF: %s\n", strerror(errno));
++			perror("SIOCGIFCONF failed");
+ 			return;
+ 		}
+ 
+ 		ifr = ifc.ifc_req;
+ 		for (i = ifc.ifc_len / sizeof(struct ifreq); --i >= 0; ifr++) {
+ 			if (if_getconfig(ifr->ifr_name) < 0) {
+-				fprintf(stderr, "%s: unknown interface.\n",
+-						ifr->ifr_name);
++				fprintf(stderr,
++					"%s: unknown interface.\n",
++					ifr->ifr_name);
+ 				continue;
+ 			}
+ 
+@@ -721,16 +595,18 @@ static void if_print(char *ifname)
+ 			/*ife_print(&ife);*/
+ 		}
+ 	} else {
+-		if (if_getconfig(ifname) < 0)
+-			fprintf(stderr, "%s: unknown interface.\n", ifname);
++		if (if_getconfig(ifname) < 0) {
++			fprintf(stderr,
++				"%s: unknown interface.\n", ifname);
++		}
+ 	}
+ }
+ 
+-static int get_abi_ver(char *master_ifname)
++static int get_drv_info(char *master_ifname)
+ {
+ 	struct ifreq ifr;
+ 	struct ethtool_drvinfo info;
+-	int abi_ver = 0;
++	char *endptr;
+ 
+ 	memset(&ifr, 0, sizeof(ifr));
+ 	strncpy(ifr.ifr_name, master_ifname, IFNAMSIZ);
+@@ -739,24 +615,487 @@ static int get_abi_ver(char *master_ifna
+ 	info.cmd = ETHTOOL_GDRVINFO;
+ 	strncpy(info.driver, "ifenslave", 32);
+ 	snprintf(info.fw_version, 32, "%d", BOND_ABI_VERSION);
+-	if (ioctl(skfd, SIOCETHTOOL, &ifr) >= 0) {
+-		char *endptr;
+ 
+-		abi_ver = strtoul(info.fw_version, &endptr, 0);
+-		if (*endptr) {
+-			fprintf(stderr, "Error: got invalid string as an ABI "
+-				"version from the bonding module\n");
+-			return -1;
++	if (ioctl(skfd, SIOCETHTOOL, &ifr) < 0) {
++		if (errno == EOPNOTSUPP) {
++			goto out;
+ 		}
++
++		saved_errno = errno;
++		v_print("Master '%s': Error: get bonding info failed %s\n",
++			master_ifname, strerror(saved_errno));
++		return 1;
+ 	}
+ 
+-	if (verbose) {
+-        	printf("ABI ver is %d\n", abi_ver);
++	abi_ver = strtoul(info.fw_version, &endptr, 0);
++	if (*endptr) {
++                v_print("Master '%s': Error: got invalid string as an ABI "
++			"version from the bonding module\n",
++			master_ifname);
++		return 1;
+ 	}
+-	return abi_ver;
++
++out:
++	v_print("ABI ver is %d\n", abi_ver);
++
++	return 0;
+ }
+ 
++static int change_active(char *master_ifname, char *slave_ifname)
++{
++	struct ifreq ifr;
++	int res = 0;
+ 
++	if (!(slave_flags.ifr_flags & IFF_SLAVE)) {
++		fprintf(stderr,
++			"Illegal operation: The specified slave interface "
++			"'%s' is not a slave\n",
++			slave_ifname);
++		return 1;
++	}
++
++	strncpy(ifr.ifr_name, master_ifname, IFNAMSIZ);
++	strncpy(ifr.ifr_slave, slave_ifname, IFNAMSIZ);
++	if ((ioctl(skfd, SIOCBONDCHANGEACTIVE, &ifr) < 0) &&
++	    (ioctl(skfd, BOND_CHANGE_ACTIVE_OLD, &ifr) < 0)) {
++		saved_errno = errno;
++		v_print("Master '%s': Error: SIOCBONDCHANGEACTIVE failed: "
++			"%s\n",
++			master_ifname, strerror(saved_errno));
++		res = 1;
++	}
++
++	return res;
++}
++
++static int enslave(char *master_ifname, char *slave_ifname)
++{
++	struct ifreq ifr;
++	int res = 0;
++
++	if (slave_flags.ifr_flags & IFF_SLAVE) {
++		fprintf(stderr,
++			"Illegal operation: The specified slave interface "
++			"'%s' is already a slave\n",
++			slave_ifname);
++		return 1;
++	}
++
++	res = set_if_down(slave_ifname, slave_flags.ifr_flags);
++	if (res) {
++		fprintf(stderr,
++			"Slave '%s': Error: bring interface down failed\n",
++			slave_ifname);
++		return res;
++	}
++
++	if (abi_ver < 2) {
++		/* Older bonding versions would panic if the slave has no IP
++		 * address, so get the IP setting from the master.
++		 */
++		res = set_if_addr(master_ifname, slave_ifname);
++		if (res) {
++			fprintf(stderr,
++				"Slave '%s': Error: set address failed\n",
++				slave_ifname);
++			return res;
++		}
++	} else {
++		res = clear_if_addr(slave_ifname);
++		if (res) {
++			fprintf(stderr,
++				"Slave '%s': Error: clear address failed\n",
++				slave_ifname);
++			return res;
++		}
++	}
++
++	if (master_mtu.ifr_mtu != slave_mtu.ifr_mtu) {
++		res = set_slave_mtu(slave_ifname, master_mtu.ifr_mtu);
++		if (res) {
++			fprintf(stderr,
++				"Slave '%s': Error: set MTU failed\n",
++				slave_ifname);
++			return res;
++		}
++	}
++
++	if (hwaddr_set) {
++		/* Master already has an hwaddr
++		 * so set it's hwaddr to the slave
++		 */
++		if (abi_ver < 1) {
++			/* The driver is using an old ABI, so
++			 * the application sets the slave's
++			 * hwaddr
++			 */
++			res = set_slave_hwaddr(slave_ifname,
++					       &(master_hwaddr.ifr_hwaddr));
++			if (res) {
++				fprintf(stderr,
++					"Slave '%s': Error: set hw address "
++					"failed\n",
++					slave_ifname);
++				goto undo_mtu;
++			}
++
++			/* For old ABI the application needs to bring the
++			 * slave back up
++			 */
++			res = set_if_up(slave_ifname, slave_flags.ifr_flags);
++			if (res) {
++				fprintf(stderr,
++					"Slave '%s': Error: bring interface "
++					"down failed\n",
++					slave_ifname);
++				goto undo_slave_mac;
++			}
++		}
++		/* The driver is using a new ABI,
++		 * so the driver takes care of setting
++		 * the slave's hwaddr and bringing
++		 * it up again
++		 */
++	} else {
++		/* No hwaddr for master yet, so
++		 * set the slave's hwaddr to it
++		 */
++		if (abi_ver < 1) {
++			/* For old ABI, the master needs to be
++			 * down before setting it's hwaddr
++			 */
++			res = set_if_down(master_ifname, master_flags.ifr_flags);
++			if (res) {
++				fprintf(stderr,
++					"Master '%s': Error: bring interface "
++					"down failed\n",
++					master_ifname);
++				goto undo_mtu;
++			}
++		}
++
++		res = set_master_hwaddr(master_ifname,
++					&(slave_hwaddr.ifr_hwaddr));
++		if (res) {
++			fprintf(stderr,
++				"Master '%s': Error: set hw address "
++				"failed\n",
++				master_ifname);
++			goto undo_mtu;
++		}
++
++		if (abi_ver < 1) {
++			/* For old ABI, bring the master
++			 * back up
++			 */
++			res = set_if_up(master_ifname, master_flags.ifr_flags);
++			if (res) {
++				fprintf(stderr,
++					"Master '%s': Error: bring interface "
++					"up failed\n",
++					master_ifname);
++				goto undo_master_mac;
++			}
++		}
++
++		hwaddr_set = 1;
++	}
++
++	/* Do the real thing */
++	strncpy(ifr.ifr_name, master_ifname, IFNAMSIZ);
++	strncpy(ifr.ifr_slave, slave_ifname, IFNAMSIZ);
++	if ((ioctl(skfd, SIOCBONDENSLAVE, &ifr) < 0) &&
++	    (ioctl(skfd, BOND_ENSLAVE_OLD, &ifr) < 0)) {
++		saved_errno = errno;
++		v_print("Master '%s': Error: SIOCBONDENSLAVE failed: %s\n",
++			master_ifname, strerror(saved_errno));
++		res = 1;
++	}
++
++	if (res) {
++		goto undo_master_mac;
++	}
++
++	return 0;
++
++/* rollback (best effort) */
++undo_master_mac:
++	set_master_hwaddr(master_ifname, &(master_hwaddr.ifr_hwaddr));
++	hwaddr_set = 0;
++	goto undo_mtu;
++undo_slave_mac:
++	set_slave_hwaddr(slave_ifname, &(slave_hwaddr.ifr_hwaddr));
++undo_mtu:
++	set_slave_mtu(slave_ifname, slave_mtu.ifr_mtu);
++	return res;
++}
++
++static int release(char *master_ifname, char *slave_ifname)
++{
++	struct ifreq ifr;
++	int res = 0;
++
++	if (!(slave_flags.ifr_flags & IFF_SLAVE)) {
++		fprintf(stderr,
++			"Illegal operation: The specified slave interface "
++			"'%s' is not a slave\n",
++			slave_ifname);
++		return 1;
++	}
++
++	strncpy(ifr.ifr_name, master_ifname, IFNAMSIZ);
++	strncpy(ifr.ifr_slave, slave_ifname, IFNAMSIZ);
++	if ((ioctl(skfd, SIOCBONDRELEASE, &ifr) < 0) &&
++	    (ioctl(skfd, BOND_RELEASE_OLD, &ifr) < 0)) {
++		saved_errno = errno;
++		v_print("Master '%s': Error: SIOCBONDRELEASE failed: %s\n",
++			master_ifname, strerror(saved_errno));
++		return 1;
++	} else if (abi_ver < 1) {
++		/* The driver is using an old ABI, so we'll set the interface
++		 * down to avoid any conflicts due to same MAC/IP
++		 */
++		res = set_if_down(slave_ifname, slave_flags.ifr_flags);
++		if (res) {
++			fprintf(stderr,
++				"Slave '%s': Error: bring interface "
++				"down failed\n",
++				slave_ifname);
++		}
++	}
++
++	/* set to default mtu */
++	set_slave_mtu(slave_ifname, 1500);
++
++	return res;
++}
++
++static int get_if_settings(char *ifname, struct dev_ifr ifra[])
++{
++	int i;
++	int res = 0;
++
++	for (i = 0; ifra[i].req_ifr; i++) {
++		strncpy(ifra[i].req_ifr->ifr_name, ifname, IFNAMSIZ);
++		res = ioctl(skfd, ifra[i].req_type, ifra[i].req_ifr);
++		if (res < 0) {
++			saved_errno = errno;
++			v_print("Interface '%s': Error: %s failed: %s\n",
++				ifname, ifra[i].req_name,
++				strerror(saved_errno));
++
++			return saved_errno;
++		}
++	}
++
++	return 0;
++}
++
++static int get_slave_flags(char *slave_ifname)
++{
++	int res = 0;
++
++	strncpy(slave_flags.ifr_name, slave_ifname, IFNAMSIZ);
++	res = ioctl(skfd, SIOCGIFFLAGS, &slave_flags);
++	if (res < 0) {
++		saved_errno = errno;
++		v_print("Slave '%s': Error: SIOCGIFFLAGS failed: %s\n",
++			slave_ifname, strerror(saved_errno));
++	} else {
++		v_print("Slave %s: flags %04X.\n",
++			slave_ifname, slave_flags.ifr_flags);
++	}
++
++	return res;
++}
++
++static int set_master_hwaddr(char *master_ifname, struct sockaddr *hwaddr)
++{
++	unsigned char *addr = (unsigned char *)hwaddr->sa_data;
++	struct ifreq ifr;
++	int res = 0;
++
++	strncpy(ifr.ifr_name, master_ifname, IFNAMSIZ);
++	memcpy(&(ifr.ifr_hwaddr), hwaddr, sizeof(struct sockaddr));
++	res = ioctl(skfd, SIOCSIFHWADDR, &ifr);
++	if (res < 0) {
++		saved_errno = errno;
++		v_print("Master '%s': Error: SIOCSIFHWADDR failed: %s\n",
++			master_ifname, strerror(saved_errno));
++		return res;
++	} else {
++		v_print("Master '%s': hardware address set to "
++			"%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x.\n",
++			master_ifname, addr[0], addr[1], addr[2],
++			addr[3], addr[4], addr[5]);
++	}
++
++	return res;
++}
++
++static int set_slave_hwaddr(char *slave_ifname, struct sockaddr *hwaddr)
++{
++	unsigned char *addr = (unsigned char *)hwaddr->sa_data;
++	struct ifreq ifr;
++	int res = 0;
++
++	strncpy(ifr.ifr_name, slave_ifname, IFNAMSIZ);
++	memcpy(&(ifr.ifr_hwaddr), hwaddr, sizeof(struct sockaddr));
++	res = ioctl(skfd, SIOCSIFHWADDR, &ifr);
++	if (res < 0) {
++		saved_errno = errno;
++
++		v_print("Slave '%s': Error: SIOCSIFHWADDR failed: %s\n",
++			slave_ifname, strerror(saved_errno));
++
++		if (saved_errno == EBUSY) {
++			v_print("  The device is busy: it must be idle "
++				"before running this command.\n");
++		} else if (saved_errno == EOPNOTSUPP) {
++			v_print("  The device does not support setting "
++				"the MAC address.\n"
++				"  Your kernel likely does not support slave "
++				"devices.\n");
++		} else if (saved_errno == EINVAL) {
++			v_print("  The device's address type does not match "
++				"the master's address type.\n");
++		}
++		return res;
++	} else {
++		v_print("Slave '%s': hardware address set to "
++			"%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x.\n",
++			slave_ifname, addr[0], addr[1], addr[2],
++			addr[3], addr[4], addr[5]);
++	}
++
++	return res;
++}
++
++static int set_slave_mtu(char *slave_ifname, int mtu)
++{
++	struct ifreq ifr;
++	int res = 0;
++
++	ifr.ifr_mtu = mtu;
++	strncpy(ifr.ifr_name, slave_ifname, IFNAMSIZ);
++
++	res = ioctl(skfd, SIOCSIFMTU, &ifr);
++	if (res < 0) {
++		saved_errno = errno;
++		v_print("Slave '%s': Error: SIOCSIFMTU failed: %s\n",
++			slave_ifname, strerror(saved_errno));
++	} else {
++		v_print("Slave '%s': MTU set to %d.\n", slave_ifname, mtu);
++	}
++
++	return res;
++}
++
++static int set_if_flags(char *ifname, short flags)
++{
++	struct ifreq ifr;
++	int res = 0;
++
++	ifr.ifr_flags = flags;
++	strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
++
++	res = ioctl(skfd, SIOCSIFFLAGS, &ifr);
++	if (res < 0) {
++		saved_errno = errno;
++		v_print("Interface '%s': Error: SIOCSIFFLAGS failed: %s\n",
++			ifname, strerror(saved_errno));
++	} else {
++		v_print("Interface '%s': flags set to %04X.\n", ifname, flags);
++	}
++
++	return res;
++}
++
++static int set_if_up(char *ifname, short flags)
++{
++	return set_if_flags(ifname, flags | IFF_UP);
++}
++
++static int set_if_down(char *ifname, short flags)
++{
++	return set_if_flags(ifname, flags & ~IFF_UP);
++}
++
++static int clear_if_addr(char *ifname)
++{
++	struct ifreq ifr;
++	int res = 0;
++
++	strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
++	ifr.ifr_addr.sa_family = AF_INET;
++	memset(ifr.ifr_addr.sa_data, 0, sizeof(ifr.ifr_addr.sa_data));
++
++	res = ioctl(skfd, SIOCSIFADDR, &ifr);
++	if (res < 0) {
++		saved_errno = errno;
++		v_print("Interface '%s': Error: SIOCSIFADDR failed: %s\n",
++			ifname, strerror(saved_errno));
++	} else {
++		v_print("Interface '%s': address cleared\n", ifname);
++	}
++
++	return res;
++}
++
++static int set_if_addr(char *master_ifname, char *slave_ifname)
++{
++	struct ifreq ifr;
++	int res;
++	unsigned char *ipaddr;
++	int i;
++	struct {
++		char *req_name;
++		char *desc;
++		int g_ioctl;
++		int s_ioctl;
++	} ifra[] = {
++		{"IFADDR", "addr", SIOCGIFADDR, SIOCSIFADDR},
++		{"DSTADDR", "destination addr", SIOCGIFDSTADDR, SIOCSIFDSTADDR},
++		{"BRDADDR", "broadcast addr", SIOCGIFBRDADDR, SIOCSIFBRDADDR},
++		{"NETMASK", "netmask", SIOCGIFNETMASK, SIOCSIFNETMASK},
++		{NULL, NULL, 0, 0},
++	};
++
++	for (i = 0; ifra[i].req_name; i++) {
++		strncpy(ifr.ifr_name, master_ifname, IFNAMSIZ);
++		res = ioctl(skfd, ifra[i].g_ioctl, &ifr);
++		if (res < 0) {
++			int saved_errno = errno;
++
++			v_print("Interface '%s': Error: SIOCG%s failed: %s\n",
++				master_ifname, ifra[i].req_name,
++				strerror(saved_errno));
++
++			ifr.ifr_addr.sa_family = AF_INET;
++			memset(ifr.ifr_addr.sa_data, 0,
++			       sizeof(ifr.ifr_addr.sa_data));
++		}
++
++		strncpy(ifr.ifr_name, slave_ifname, IFNAMSIZ);
++		res = ioctl(skfd, ifra[i].s_ioctl, &ifr);
++		if (res < 0) {
++			int saved_errno = errno;
++
++			v_print("Interface '%s': Error: SIOCS%s failed: %s\n",
++				slave_ifname, ifra[i].req_name,
++				strerror(saved_errno));
++
++			return res;
++		}
++
++		ipaddr = ifr.ifr_addr.sa_data;
++		v_print("Interface '%s': set IP %s to %d.%d.%d.%d\n",
++			slave_ifname, ifra[i].desc,
++			ipaddr[0], ipaddr[1], ipaddr[2], ipaddr[3]);
++	}
++
++	return 0;
++}
+ 
+ /*
+  * Local variables:
+@@ -768,3 +1107,4 @@ static int get_abi_ver(char *master_ifna
+  *  compile-command: "gcc -Wall -Wstrict-prototypes -O -I/usr/src/linux/include ifenslave.c -o ifenslave"
+  * End:
+  */
++
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/networking/netconsole.txt	2003-12-28 23:21:00.000000000 -0800
+@@ -0,0 +1,57 @@
++
++started by Ingo Molnar <mingo@redhat.com>, 2001.09.17
++2.6 port and netpoll api by Matt Mackall <mpm@selenic.com>, Sep 9 2003
++
++Please send bug reports to Matt Mackall <mpm@selenic.com>
++
++This module logs kernel printk messages over UDP allowing debugging of
++problem where disk logging fails and serial consoles are impractical.
++
++It can be used either built-in or as a module. As a built-in,
++netconsole initializes immediately after NIC cards and will bring up
++the specified interface as soon as possible. While this doesn't allow
++capture of early kernel panics, it does capture most of the boot
++process.
++
++It takes a string configuration parameter "netconsole" in the
++following format:
++
++ netconsole=[src-port]@[src-ip]/[<dev>],[tgt-port]@<tgt-ip>/[tgt-macaddr]
++
++   where
++        src-port      source for UDP packets (defaults to 6665)
++        src-ip        source IP to use (interface address)
++        dev           network interface (eth0)
++        tgt-port      port for logging agent (6666)
++        tgt-ip        IP address for logging agent
++        tgt-macaddr   ethernet MAC address for logging agent (broadcast)
++
++Examples:
++
++ linux netconsole=4444@10.0.0.1/eth1,9353@10.0.0.2/12:34:56:78:9a:bc
++
++  or
++
++ insmod netconsole netconsole=@/,@10.0.0.2/
++
++Built-in netconsole starts immediately after the TCP stack is
++initialized and attempts to bring up the supplied dev at the supplied
++address.
++
++The remote host can run either 'netcat -u -l -p <port>' or syslogd.
++
++WARNING: the default target ethernet setting uses the broadcast
++ethernet address to send packets, which can cause increased load on
++other systems on the same ethernet segment.
++
++NOTE: the network device (eth1 in the above case) can run any kind
++of other network traffic, netconsole is not intrusive. Netconsole
++might cause slight delays in other traffic if the volume of kernel
++messages is high, but should have no other impact.
++
++Netconsole was designed to be as instantaneous as possible, to
++enable the logging of even the most critical kernel bugs. It works
++from IRQ contexts as well, and does not enable interrupts while
++sending packets. Due to these unique needs, configuration can not
++be more automatic, and some fundamental limitations will remain:
++only IP networks, UDP packets and ethernet devices are supported.
+--- linux-2.6.0/Documentation/networking/sk98lin.txt	2003-09-27 18:57:43.000000000 -0700
++++ 25/Documentation/networking/sk98lin.txt	2003-12-28 23:21:00.000000000 -0800
+@@ -2,9 +2,9 @@
+ All rights reserved
+ ===========================================================================
+ 
+-sk98lin.txt created 23-Sep-2003
++sk98lin.txt created 15-Dec-2003
+ 
+-Readme File for sk98lin v6.18
++Readme File for sk98lin v6.21
+ Marvell Yukon/SysKonnect SK-98xx Gigabit Ethernet Adapter family driver for LINUX
+ 
+ This file contains
+@@ -466,7 +466,7 @@ The Marvell Yukon/SysKonnect Linux drive
+ Link Aggregation according to IEEE standards 802.1, 802.1q, and 802.3ad. 
+ These features are only available after installation of open source 
+ modules available on the Internet:
+-For VLAN go to: http://scry.wanfear.com/~greear/vlan.html
++For VLAN go to: http://www.candelatech.com/~greear/vlan.html
+ For Link Aggregation go to: http://www.st.rim.or.jp/~yumo
+ 
+ NOTE: SysKonnect GmbH does not offer any support for these open source 
+--- linux-2.6.0/Documentation/scsi/aic79xx.txt	2003-06-14 12:18:29.000000000 -0700
++++ 25/Documentation/scsi/aic79xx.txt	2003-12-28 23:21:39.000000000 -0800
+@@ -1,5 +1,5 @@
+ ====================================================================
+-=             Adaptec Ultra320 Family Manager Set v1.3.0           =
++=             Adaptec Ultra320 Family Manager Set v2.0.5           =
+ =                                                                  =
+ =                            README for                            =
+ =                    The Linux Operating System                    =
+@@ -19,57 +19,274 @@ The following information is available i
+    The following Adaptec SCSI Host Adapters are supported by this 
+    driver set. 
+ 
+-   Ultra320 Adapters         Description
++   Ultra320 ASIC              Description
+    ----------------------------------------------------------------
+-   Adaptec SCSI Card 39320   Dual Channel 64-bit PCI-X 133MHz to
+-                             Ultra320 SCSI Card (one external 
+-                             68-pin, two internal 68-pin)
+-   Adaptec SCSI Card 39320D  Dual Channel 64-bit PCI-X 133MHz to
+-                             Ultra320 SCSI Card (two external VHDC
+-                             and one internal 68-pin)
+-   Adaptec SCSI Card 39320D  Dual Channel 64-bit PCI-X 133MHz to
+-                             Ultra320 SCSI Card (two external VHDC
+-                             and one internal 68-pin) based on the
+-                             AIC-7902B ASIC
+-   Adaptec SCSI Card 29320   Single Channel 64-bit PCI-X 133MHz to
+-                             Ultra320 SCSI Card (one external 
+-                             68-pin, two internal 68-pin, one
+-                             internal 50-pin)
+-   Adaptec SCSI Card 29320LP Single Channel 64-bit Low Profile
+-                             PCI-X 133MHz to Ultra320 SCSI Card
+-                             (One external VHDC, one internal
+-                             68-pin)
+-   AIC-7901A                 Single Channel 64-bit PCI-X 133MHz to 
+-                             Ultra320 SCSI ASIC
+-   AIC-7902A4                Dual Channel 64-bit PCI-X 133MHz to 
+-                             Ultra320 SCSI ASIC
+-   AIC-7902B                 Dual Channel 64-bit PCI-X 133MHz to
+-                             Ultra320 SCSI ASIC
+-
++   AIC-7901A                  Single Channel 64-bit PCI-X 133MHz to 
++                              Ultra320 SCSI ASIC
++   AIC-7901B                  Single Channel 64-bit PCI-X 133MHz to 
++                              Ultra320 SCSI ASIC with Retained Training
++   AIC-7902A4                 Dual Channel 64-bit PCI-X 133MHz to 
++                              Ultra320 SCSI ASIC
++   AIC-7902B                  Dual Channel 64-bit PCI-X 133MHz to
++                              Ultra320 SCSI ASIC with Retained Training
++
++   Ultra320 Adapters          Description                              ASIC
++   --------------------------------------------------------------------------
++   Adaptec SCSI Card 39320    Dual Channel 64-bit PCI-X 133MHz to   7902A4/7902B
++                              Ultra320 SCSI Card (one external 
++                              68-pin, two internal 68-pin)
++   Adaptec SCSI Card 39320A   Dual Channel 64-bit PCI-X 133MHz to      7902B
++                              Ultra320 SCSI Card (one external 
++                              68-pin, two internal 68-pin)
++   Adaptec SCSI Card 39320D   Dual Channel 64-bit PCI-X 133MHz to      7902A4
++                              Ultra320 SCSI Card (two external VHDC
++                              and one internal 68-pin)
++   Adaptec SCSI Card 39320D   Dual Channel 64-bit PCI-X 133MHz to      7902A4
++                              Ultra320 SCSI Card (two external VHDC
++                              and one internal 68-pin) based on the
++                              AIC-7902B ASIC
++   Adaptec SCSI Card 29320    Single Channel 64-bit PCI-X 133MHz to    7901A
++                              Ultra320 SCSI Card (one external 
++                              68-pin, two internal 68-pin, one
++                              internal 50-pin)
++   Adaptec SCSI Card 29320A   Single Channel 64-bit PCI-X 133MHz to    7901B
++                              Ultra320 SCSI Card (one external 
++                              68-pin, two internal 68-pin, one
++                              internal 50-pin)
++   Adaptec SCSI Card 29320LP  Single Channel 64-bit Low Profile        7901A
++                              PCI-X 133MHz to Ultra320 SCSI Card
++                              (One external VHDC, one internal
++                              68-pin)
++   Adaptec SCSI Card 29320ALP Single Channel 64-bit Low Profile        7901B
++                              PCI-X 133MHz to Ultra320 SCSI Card
++                              (One external VHDC, one internal
++                              68-pin)
+ 2. Version History
+ 
+-   (V1.3.0, January 2003) Full regression testing for all U320 products
+-   completed.
+-
+-   (V1.3.0 ALPHA, November 2002) Initial Alpha release.
+-   Added abort and target/lun reset error recovery handler and
+-   interrupt coalessing.
+-
+-   (V1.2.0, November 2002) Added support for Domain Validation and
+-   Hewlett-Packard version of the 39320D and AIC-7902 adapters.
+-   Support for previous adapters has not been fully tested and should
+-   only be used at the customer's own risk.
+-
+-   (V1.1.1, September 2002) Added support for the Linux 2.5.X kernel series
+-
+-   (V1.1.0, August 2002) Added support for four additional SCSI
+-   products: ASC-39320, ASC-29320, ASC-29320LP, AIC-7901.
+-
+-   (V1.1, August 2002) Added support for four additional SCSI
+-   products: ASC-39320, ASC-29320, ASC-29320LP, AIC-7901.
++   2.0.5 (December 22nd, 2003)
++        - Correct a bug preventing the driver from renegotiating
++          during auto-request operations when a check condition
++          occurred for a zero length command.
++        - Sniff sense information returned by targets for unit
++          attention errors that may indicate that the device has
++          been changed.  If we see such status for non Domain
++          Validation related commands, start a DV scan for the
++          target.  In the past, DV would only occur for hot-plugged
++          devices if no target had been previously probed for a
++          particular ID.  This change guarantees that the DV process
++          will occur even if the user swaps devices without any
++          interveining I/O to tell us that a device has gone missing.
++          The old behavior, among other things, would fail to spin up
++          drives that were hot-plugged since the Linux mid-layer
++          will only spin-up drives on initial attach.
++        - Correct several issues in the rundown of the good status
++          FIFO during error recovery.  The typical failure scenario
++          evidenced by this defect was the loss of several commands
++          under high load when	 several queue full conditions occured
++          back to back.
++
++   2.0.4 (November 6th, 2003)
++        - Support the 2.6.0-test9 kernel
++        - Fix rare deadlock caused by using del_timer_sync from within
++          a timer handler.
++
++   2.0.3 (October 21st, 2003)
++        - On 7902A4 hardware, use the slow slew rate for transfer
++          rates slower than U320.  This behavior matches the Windows
++          driver.
++        - Fix some issues with the ahd_flush_qoutfifo() routine.
++        - Add a delay in the loop waiting for selection activity
++          to cease.  Otherwise we may exhaust the loop counter too
++          quickly on fast machines.
++        - Return to processing bad status completions through the
++          qoutfifo.  This reduces the amount of time the controller
++          is paused for these kinds of errors.
++        - Move additional common routines to the aiclib OSM library
++          to reduce code duplication.
++        - Leave removal of softcs from the global list of softcs to
++          the OSM.  This allows us to avoid holding the list_lock during
++          device destruction.
++        - Enforce a bus settle delay for bus resets that the
++          driver initiates.
++        - Fall back to basic DV for U160 devices that lack an
++          echo buffer.
++
++   2.0.2 (September 4th, 2003)
++        - Move additional common routines to the aiclib OSM library
++          to reduce code duplication.
++        - Avoid an inadvertant reset of the controller during the
++          memory mapped I/O test should the controller be left in
++          the reset state prior to driver initialization.  On some
++          systems, this extra reset resulted in a system hang due
++          to a chip access that occurred too soon after reset.
++        - Correct an endian bug in ahd_swap_with_next_hscb.  This
++          corrects strong-arm support.
++        - Reset the bus for transactions that timeout waiting for
++          the bus to go free after a disconnect or command complete
++          message.
++
++   2.0.1 (August 26th, 2003)
++        - Add magic sysrq handler that causes a card dump to be output
++          to the console for each controller.
++        - Avoid waking the mid-layer's error recovery handler during
++          timeout recovery by returning DID_ERROR instead of DID_TIMEOUT
++          for timed-out commands that have been aborted.
++        - Move additional common routines to the aiclib OSM library
++          to reduce code duplication.
++
++   2.0.0 (August 20th, 2003)
++        - Remove MMAPIO definition and allow memory mapped
++          I/O for any platform that supports PCI.
++        - Avoid clearing ENBUSFREE during single stepping to avoid
++          spurious "unexpected busfree while idle" messages.
++        - Correct deadlock in ahd_run_qoutfifo() processing.
++        - Optimize support for the 7901B.
++        - Correct a few cases where an explicit flush of pending
++          register writes was required to ensure acuracy in delays.
++        - Correct problems in manually flushing completed commands
++          on the controller.  The FIFOs are now flushed to ensure
++          that completed commands that are still draining to the
++          host are completed correctly.
++        - Correct incomplete CDB delivery detection on the 790XB.
++        - Ignore the cmd->underflow field since userland applications
++          using the legacy command pass-thru interface do not set
++          it correctly.  Honoring this field led to spurious errors
++          when users used the "scsi_unique_id" program.
++        - Perform timeout recovery within the driver instead of relying
++          on the Linux SCSI mid-layer to perform this function.  The
++          mid-layer does not know the full state of the SCSI bus and
++          is therefore prone to looping for several minutes to effect
++          recovery.  The new scheme recovers within 15 seconds of the
++          failure.
++        - Correct support for manual termination settings.
++        - Increase maximum wait time for serial eeprom writes allowing
++          writes to function correctly.
++
++   1.3.12 (August 11, 2003)
++        - Implement new error recovery thread that supercedes the existing
++          Linux SCSI error recovery code.
++        - Fix termination logic for 29320ALP.
++        - Fix SEEPROM delay to compensate for write ops taking longer.
++
++   1.3.11 (July 11, 2003)
++        - Fix several deadlock issues.
++        - Add 29320ALP and 39320B Id's.
++
++   1.3.10 (June 3rd, 2003)
++        - Align the SCB_TAG field on a 16byte boundary.  This avoids
++          SCB corruption on some PCI-33 busses.
++        - Correct non-zero luns on Rev B. hardware.
++        - Update for change in 2.5.X SCSI proc FS interface.
++        - When negotiation async via an 8bit WDTR message, send
++          an SDTR with an offset of 0 to be sure the target
++          knows we are async.  This works around a firmware defect
++          in the Quantum Atlas 10K.
++        - Implement controller susupend and resume.
++        - Clear PCI error state during driver attach so that we
++          don't disable memory mapped I/O due to a stray write
++          by some other driver probe that occurred before we
++          claimed the controller.
++
++   1.3.9 (May 22nd, 2003)
++        - Fix compiler errors.
++        - Remove S/G splitting for segments that cross a 4GB boundary.
++          This is guaranteed not to happen in Linux.
++        - Add support for scsi_report_device_reset() found in
++          2.5.X kernels.
++        - Add 7901B support.
++        - Simplify handling of the packtized lun Rev A workaround.
++        - Correct and simplify handling of the ignore wide residue
++          message.  The previous code would fail to report a residual
++          if the transaction data length was even and we received
++          an IWR message.
++
++   1.3.8 (April 29th, 2003)
++        - Fix types accessed via the command line interface code.
++        - Perform a few firmware optimizations.
++        - Fix "Unexpected PKT busfree" errors.
++        - Use a sequencer interrupt to notify the host of
++          commands with bad status.  We defer the notification
++          until there are no outstanding selections to ensure
++          that the host is interrupted for as short a time as
++          possible.
++        - Remove pre-2.2.X support.
++        - Add support for new 2.5.X interrupt API.
++        - Correct big-endian architecture support.
++
++   1.3.7 (April 16th, 2003)
++        - Use del_timer_sync() to ensure that no timeouts
++          are pending during controller shutdown.
++        - For pre-2.5.X kernels, carefully adjust our segment
++          list size to avoid SCSI malloc pool fragmentation.
++        - Cleanup channel display in our /proc output.
++        - Workaround duplicate device entries in the mid-layer
++          devlice list during add-single-device.
++
++   1.3.6 (March 28th, 2003)
++        - Correct a double free in the Domain Validation code.
++        - Correct a reference to free'ed memory during controller
++          shutdown.
++        - Reset the bus on an SE->LVD change.  This is required
++          to reset our transcievers.
++
++   1.3.5 (March 24th, 2003)
++        - Fix a few register window mode bugs.
++        - Include read streaming in the PPR flags we display in
++          diagnostics as well as /proc.
++        - Add PCI hot plug support for 2.5.X kernels.
++        - Correct default precompensation value for RevA hardware.
++        - Fix Domain Validation thread shutdown.
++        - Add a firmware workaround to make the LED blink
++          brighter during packetized operations on the H2A4.
++        - Correct /proc display of user read streaming settings.
++        - Simplify driver locking by releasing the io_request_lock
++          upon driver entry from the mid-layer.
++        - Cleanup command line parsing and move much of this code
++          to aiclib.
++
++   1.3.4 (February 28th, 2003)
++        - Correct a race condition in our error recovery handler.
++        - Allow Test Unit Ready commands to take a full 5 seconds
++          during Domain Validation.
++
++   1.3.2 (February 19th, 2003)
++        - Correct a Rev B. regression due to the GEM318
++          compatibility fix included in 1.3.1.
++          
++   1.3.1 (February 11th, 2003)
++        - Add support for the 39320A.
++        - Improve recovery for certain PCI-X errors.
++        - Fix handling of LQ/DATA/LQ/DATA for the
++          same write transaction that can occur without
++          interveining training.
++        - Correct compatibility issues with the GEM318
++          enclosure services device.
++        - Correct data corruption issue that occurred under
++          high tag depth write loads.
++        - Adapt to a change in the 2.5.X daemonize() API.
++        - Correct a "Missing case in ahd_handle_scsiint" panic.
++
++   1.3.0 (January 21st, 2003)
++        - Full regression testing for all U320 products completed.
++        - Added abort and target/lun reset error recovery handler and
++          interrupt coalessing.
++
++   1.2.0 (November 14th, 2002)
++        - Added support for Domain Validation
++        - Add support for the Hewlett-Packard version of the 39320D
++          and AIC-7902 adapters.
++        Support for previous adapters has not been fully tested and should
++        only be used at the customer's own risk.
++
++   1.1.1 (September 24th, 2002)
++        - Added support for the Linux 2.5.X kernel series
++
++   1.1.0 (September 17th, 2002)
++        - Added support for four additional SCSI products:
++          ASC-39320, ASC-29320, ASC-29320LP, AIC-7901.
+ 
+-   (V1.0, May 2002) This is the initial release of the 
+-   Ultra320 FMS.  The following is a list of supported features:
++   1.0.0 (May 30th, 2002)
++        - Initial driver release.
+ 
+    2.1. Software/Hardware Features
+         - Support for the SPI-4 "Ultra320" standard:
+@@ -82,6 +299,7 @@ The following information is available i
+           supported)
+         - Support for the PCI-X standard up to 133MHz
+         - Support for the PCI v2.2 standard
++	- Domain Validation
+ 
+    2.2. Operating System Support:
+         - Redhat Linux 7.2, 7.3, 8.0, Advanced Server 2.1
+--- linux-2.6.0/Documentation/scsi/aic7xxx.txt	2003-06-14 12:18:05.000000000 -0700
++++ 25/Documentation/scsi/aic7xxx.txt	2003-12-28 23:21:39.000000000 -0800
+@@ -1,5 +1,5 @@
+ ====================================================================
+-=    Adaptec Aic7xxx Fast -> Ultra160 Family Manager Set v6.2.28   =
++=    Adaptec Aic7xxx Fast -> Ultra160 Family Manager Set v6.3.4    =
+ =                            README for                            =
+ =                     The Linux Operating System                   =
+ ====================================================================
+@@ -132,26 +132,127 @@ The following information is available i
+ 
+ 2. Version History
+ 
+-        6.2.34 - Fix locking regression instroduced in 6.2.29 that
+-                 could cuase a lock order reversal between the io_request_lock
+-                 and our per-softc lock.  This was only possible on RH9,
+-                 SuSE, and kernel.org 2.4.X kernels.
+-
+-        6.2.33 - Dynamically disable PCI parity error reporting after
+-		 10 errors are reported to the user.  These errors are
+-		 the result of some other device issuing PCI transactions
+-		 with bad parity.  Once the user has been informed of the
+-		 problem, continuing to report the errors just degrades
+-		 our performance.
+-
+-        6.2.32 - Dynamically sized S/G lists to avoid SCSI malloc
+-		 pool fragmentation and SCSI mid-layer deadlock.
+-
+-        6.2.28 - Domain Validation Fixes
+-                 PCI parity error disable
+-                 Enhanced Memory Mapped I/O probe
++   6.3.4 (December 22nd, 2003)
++        - Provide a better description string for the 2915/30LP.
++        - Sniff sense information returned by targets for unit
++          attention errors that may indicate that the device has
++          been changed.  If we see such status for non Domain
++          Validation related commands, start a DV scan for the
++          target.  In the past, DV would only occur for hot-plugged
++          devices if no target had been previously probed for a
++          particular ID.  This change guarantees that the DV process
++          will occur even if the user swaps devices without any
++          interveining I/O to tell us that a device has gone missing.
++          The old behavior, among other things, would fail to spin up
++          drives that were hot-plugged since the Linux mid-layer
++          will only spin-up drives on initial attach.
++
++   6.3.3 (November 6th, 2003)
++        - Support the 2.6.0-test9 kernel
++        - Fix rare deadlock caused by using del_timer_sync from within
++          a timer handler.
++
++   6.3.2 (October 28th, 2003)
++        - Enforce a bus settle delay for bus resets that the
++          driver initiates.
++        - Fall back to basic DV for U160 devices that lack an
++          echo buffer.
++        - Correctly detect that left over BIOS data has not
++          been initialized when the CHPRST status bit is set
++          during driver initialization.
++
++   6.3.1 (October 21st, 2003)
++        - Fix a compiler error when building with only EISA or PCI
++          support compiled into the kernel.
++        - Add chained dependencies to both the driver and aicasm Makefiles
++          to avoid problems with parallel builds.
++        - Move additional common routines to the aiclib OSM library
++          to reduce code duplication.
++        - Fix a bug in the testing of the AHC_TMODE_WIDEODD_BUG that
++          could cause target mode operations to hang.
++        - Leave removal of softcs from the global list of softcs to
++          the OSM.  This allows us to avoid holding the list_lock during
++          device destruction.
++
++   6.3.0 (September 8th, 2003)
++        - Move additional common routines to the aiclib OSM library
++          to reduce code duplication.
++        - Bump minor number to reflect change in error recovery strategy.
++
++   6.2.38 (August 31st, 2003)
++        - Avoid an inadvertant reset of the controller during the
++          memory mapped I/O test should the controller be left in
++          the reset state prior to driver initialization.  On some
++          systems, this extra reset resulted in a system hang due
++          to a chip access that occurred too soon after reset.
++        - Move additional common routines to the aiclib OSM library
++          to reduce code duplication.
++        - Add magic sysrq handler that causes a card dump to be output
++          to the console for each controller.
++
++   6.2.37 (August 12th, 2003)
++        - Perform timeout recovery within the driver instead of relying
++          on the Linux SCSI mid-layer to perform this function.  The
++          mid-layer does not know the full state of the SCSI bus and
++          is therefore prone to looping for several minutes to effect
++          recovery.  The new scheme recovers within 15 seconds of the
++          failure.
++        - Support writing 93c56/66 SEEPROM on newer cards.
++	- Avoid clearing ENBUSFREE during single stepping to avoid
++          spurious "unexpected busfree while idle" messages.
++        - Enable the use of the "Auto-Access-Pause" feature on the
++          aic7880 and aic7870 chips.  It was disabled due to an
++          oversight.  Using this feature drastically reduces command
++          delivery latency.
++
++   6.2.36 (June 3rd, 2003)
++        - Correct code that disables PCI parity error checking.
++        - Correct and simplify handling of the ignore wide residue
++          message.  The previous code would fail to report a residual
++          if the transaction data length was even and we received
++          an IWR message.
++        - Add support for the 2.5.X EISA framework.
++        - Update for change in 2.5.X SCSI proc FS interface.
++        - Correct Domain Validation command-line option parsing.
++        - When negotiation async via an 8bit WDTR message, send
++          an SDTR with an offset of 0 to be sure the target
++          knows we are async.  This works around a firmware defect
++          in the Quantum Atlas 10K.
++        - Clear PCI error state during driver attach so that we
++          don't disable memory mapped I/O due to a stray write
++          by some other driver probe that occurred before we
++          claimed the controller.
++
++   6.2.35 (May 14th, 2003)
++        - Fix a few GCC 3.3 compiler warnings.
++        - Correct operation on EISA Twin Channel controller.
++        - Add support for 2.5.X's scsi_report_device_reset().
++
++   6.2.34 (May 5th, 2003)
++        - Fix locking regression instroduced in 6.2.29 that
++          could cuase a lock order reversal between the io_request_lock
++          and our per-softc lock.  This was only possible on RH9,
++          SuSE, and kernel.org 2.4.X kernels.
++
++   6.2.33 (April 30th, 2003)
++        - Dynamically disable PCI parity error reporting after
++          10 errors are reported to the user.  These errors are
++          the result of some other device issuing PCI transactions
++          with bad parity.  Once the user has been informed of the
++          problem, continuing to report the errors just degrades
++          our performance.
++
++   6.2.32 (March 28th, 2003)
++        - Dynamically sized S/G lists to avoid SCSI malloc
++          pool fragmentation and SCSI mid-layer deadlock.
++
++   6.2.28 (January 20th, 2003)
++        - Domain Validation Fixes
++        - Add ability to disable PCI parity error checking.
++        - Enhanced Memory Mapped I/O probe
+ 
+-        6.2.20 - Added Domain Validation
++   6.2.20 (November 7th, 2002)
++        - Added Domain Validation.
+ 
+ 3. Command Line Options
+ 
+--- linux-2.6.0/Documentation/scsi/BusLogic.txt	2003-08-08 22:55:10.000000000 -0700
++++ 25/Documentation/scsi/BusLogic.txt	2003-12-28 23:22:18.000000000 -0800
+@@ -577,7 +577,7 @@ LILO Linux Boot Loader (in /etc/lilo.con
+ INSMOD Loadable Kernel Module Installation Facility:
+ 
+   insmod BusLogic.o \
+-      'BusLogic_Options="QueueDepth:[,7,15];QueueDepth:31,BusSettleTime:30"'
++      'BusLogic="QueueDepth:[,7,15];QueueDepth:31,BusSettleTime:30"'
+ 
+ NOTE: Module Utilities 2.1.71 or later is required for correct parsing
+       of driver options containing commas.
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/should-fix.txt	2003-12-28 23:21:10.000000000 -0800
+@@ -0,0 +1,545 @@
++Not-ready features and speedups
++===============================
++
++Legend:
++
++PRI1:	We're totally lame if this doesn't get in
++PRI2:	Would be nice
++PRI3:	Not very important
++
++drivers/block/
++~~~~~~~~~~~~~~
++
++o viro: paride drivers need a big cleanup. Partially done, but ATAPI drivers
++  need serious work and bug fixing.
++
++  PRI2
++
++drivers/char/rtc/
++~~~~~~~~~~~~~~~~~
++
++o rmk, trini: add support for alarms to the existing generic rtc driver.
++
++  PRI2
++
++console drivers
++~~~~~~~~~~~~~~~
++  (Pavel Machek <pavel@ucw.cz>)
++
++o There are few must-fix bugs in cursor handling.
++
++o Play with gpm selection for a while and your cursor gets corrupted with
++  random dots. Ouch.
++
++device mapper
++~~~~~~~~~~~~~
++
++o ioctl interface cleanup patch is ready (redo the structure layouts)
++
++  PRI1
++
++o A port of the 2.4 snapshot and mirror targets is in progress
++
++  PRI1
++
++o the fs interface to dm needs to be redone.  gregkh was going to work on
++  this.  viro is interested in seeing work thus-far.
++
++  PRI2
++
++drivers/net/wireless/
++~~~~~~~~~~~~~~~~~~~~~
++
++  (Jean Tourrilhes <jt@bougret.hpl.hp.com>)
++
++o get HostAP driver in the kernel.  No consolidation of the 802.11
++  management across driver can happen until this one is in (which is probably
++  2.7.X material).  I think Jouni is mostly ready but didn't find time for
++  it.
++
++  PRI2
++
++o get more wireless drivers into the kernel.  The most "integrable" drivers
++  at this point seem the NWN driver, Pavel's Spectrum driver.
++
++  PRI1
++
++drivers/usb/gadget/
++~~~~~~~~~~~~~~~~~~~
++
++o rmk: SA11xx USB client/gadget code (David B has been doing some work on
++  this, and keeps trying to prod me, but unfortunately I haven't had the time
++  to look at his work, sorry David.)
++
++  PRI3
++
++fs/
++~~~
++
++o ext3 and ext2 block allocators have serious failure modes - interleaved
++  allocations.
++
++  PRI3
++
++o Integrate Chris Mason's 2.4 reiserfs ordered data and data journaling
++  patches.  They make reiserfs a lot safer.
++
++  Ordered: PRI2
++  data journalled: PRI3
++
++o viro: convert more filesystems to use lib/parser.c for options.
++
++  PRI2
++
++o aio: fs IO isn't async at present.  suparna has restart patches, they're
++  in -mm.  Need to get Ben to review/comment.
++
++  PRI1.
++
++o drepper: various filesystems use ->pid wrongly
++
++  PRI1
++
++o hch: devfs: there's a fundamental lookup vs devfsd race that's only
++  fixable by introducing a lookup vs devfs deadlock.  I can't see how this is
++  fixable without getting rid of the current devfsd design.  Mandrake seems
++  to have a workaround for this so this is at least not triggered so easily,
++  but that's not what I'd consider a fix..
++
++  PRI2
++
++kernel/
++~~~~~~~
++
++o rusty: Zippel's Reference count simplification.  Tricky code, but cuts
++  about 120 lines from module.c.  Patch exists, needs stressing.
++
++  PRI3
++
++o rusty: Fix module-failed-init races by starting module "disabled".  Patch
++  exists, requires some subsystems (ie.  add_partition) to explicitly say
++  "make module live now".  Without patch we are no worse off than 2.4 etc.
++
++  PRI1
++
++o Integrate userspace irq balancing daemon.
++
++  PRI2
++
++o kexec.  Seems to work, was in -mm.
++
++  PRI3
++
++o rmk: lib/inflate.c must not use static variables (causes these to be
++  referenced via GOTOFF relocations in PIC decompressor.  We have a PIC
++  decompressor to avoid having to hard code a per platform zImage link
++  address into the makefiles.)
++
++  PRI2
++
++o klibc merge?
++
++  PRI2
++
++mm/
++~~~
++
++o dropbehind for large files
++
++  PRI2
++
++net/
++~~~~
++
++  (davem)
++
++o Real serious use of IPSEC is hampered by lack of MPLS support.  MPLS is a
++  switching technology that works by switching based upon fixed length labels
++  prepended to packets.  Many people use this and IPSEC to implement VPNs
++  over public networks, it is also used for things like traffic engineering.
++
++  A good reference site is:
++
++	http://www.mplsrc.com/
++
++  Anyways, an existing (crappy) implementation exists.  I've almost
++  completed a rewrite, I should have something in the tree next week.
++
++  PRI1
++
++o Sometimes we generate IP fragments when it truly isn't necessary.
++
++  The way IP fragmentation is specified, each fragment must be modulo 8
++  bytes in length.  So suppose the device has an MTU that is not 0 modulo 8,
++  ethernet even classifies in this way.  1500 == (8 * 187) + 4
++
++  Our IP fragmenting engine can fragment on packets that are sized within
++  the last modulo 8 bytes of the MTU.  This happens in obscure cases, but it
++  does happen.
++
++  I've proposed a fix to Alexey, whereby very late in the output path we
++  check the packet, if we fragmented but the data length would fit into the
++  MTU we unfragment the packet.
++
++  This is low priority, because technically it creates suboptimal behavior
++  rather than mis-operation.
++
++  PRI1
++
++net/*/netfilter/
++~~~~~~~~~~~~~~~~
++
++o Lots of misc. cleanups, which are happening slowly.
++
++  PRI2
++
++power management
++~~~~~~~~~~~~~~~~
++
++o Pat and Pavel disagree over swsusp. Need to sort that out.
++
++  PRI2
++
++o Frame buffer restore codepaths (that requires some deep PCI magic)
++
++  PRI2
++
++o XFree86 hooks
++
++  PRI2
++
++o AGP restoration
++
++  PRI2
++
++o DRI restoration
++
++  (davej/Alan: not super-critical, can crash laptop on restore.  davej
++  looking into it.)
++
++  PRI2
++
++o IDE suspend/resume without races (Ben is looking at this a little)
++
++  PRI2
++
++o Pat: There are already CPU device structures; MTRRs should be a
++  dynamically registered interface of CPUs, which implies there needs
++  to be some other glue to know that there are MTRRs that need to be
++  saved/restored.
++
++  PRI1
++
++global
++~~~~~~
++
++o We need a kernel side API for reporting error events to userspace (could
++  be async to 2.6 itself)
++
++  (Prototype core based on netlink exists)
++
++  PRI2
++
++o Kai: Introduce a sane, easy and standard way to build external modules
++  - make clean and make modules_install are both broken
++
++  PRI2
++
++drivers
++~~~~~~~
++
++o Alan: Cardbus/PCMCIA requires all Russell's stuff is merged to do
++  multiheader right and so on
++
++  PRI1
++
++drivers/acpi/
++~~~~~~~~~~~~~
++
++o Fix acpi for all newer IBM Thinkpads see
++  http://bugme.osdl.org/show_bug.cgi?id=1038 for more information
++
++o alan: VIA APIC stuff is one bit of this, there are also some other
++  reports that were caused by ACPI not setting level v edge trigger some
++  times
++
++  PRI1
++
++o mochel: it seems the acpi irq routing code could use a serious rewrite.
++
++  grover: The problem is the ACPI irq routing code is trying to piggyback
++  on the existing MPS-specific data structures, and it's generally a hack.
++  So yes mochel is right, but it is also purging MPS-ities from common code
++  as well.  I've done some preliminary work in this area and it doesn't seem
++  to break anything (yet) but a rewrite in this area imho should not be
++  rushed out the door.  And, I think the above bugs can be fixed w/o the
++  rewrite.
++
++  PRI2
++
++o mochel: ACPI suspend doesn't work.  Important, not cricital.  Pat is
++  working it.
++
++  PRI2
++
++drivers/block/
++~~~~~~~~~~~~~~
++
++o More testing of floppy
++
++  PRI3
++
++drivers/char/
++~~~~~~~~~~~~~
++
++
++drivers/ide/
++~~~~~~~~~~~~
++
++  (Alan)
++
++o IDE PIO has occasional unexplained PIO disk eating reports
++
++  PRI1
++
++o IDE has multiple zillions of races/hangs in 2.5 still
++
++  PRI1
++
++o IDE scsi needs rewriting
++
++  PRI2
++
++o IDE needs significant reworking to handle Simplex right
++
++  PRI2
++
++o IDE hotplug handling for 2.5 is completely broken still
++
++  PRI2
++
++o There are lots of other IDE bugs that wont go away until the taskfile
++  stuff is included, the locking bugs that allow any user to hang the IDE
++  layer in 2.5, and some other updates are forward ported.  (esp.  HPT372N).
++
++  PRI1
++
++drivers/isdn/
++~~~~~~~~~~~~~
++
++  (Kai, rmk)
++
++o isdn_tty locking is completely broken (cli() and friends)
++
++  PRI2
++
++o fix other drivers
++
++  PRI2
++
++o lots more cleanups, adaption to recent APIs etc
++
++  PRI3
++
++o fixup tty-based ISDN drivers which provide TIOCM* ioctls (see my recent
++  3-set patch for serial stuff)
++
++  Alternatively, we could re-introduce the fallback to driver ioctl parsing
++  for these if not enough drivers get updated.
++
++  PRI3
++
++drivers/net/
++~~~~~~~~~~~~
++
++o davej: Either Wireless network drivers or PCMCIA broke somewhen.  A
++  configuration that worked fine under 2.4 doesn't receive any packets.  Need
++  to look into this more to make sure I don't have any misconfiguration that
++  just 'happened to work' under 2.4
++
++  PRI1
++
++drivers/scsi/
++~~~~~~~~~~~~~
++
++o jejb: qlogic -
++
++  o Merge the feral driver.  It covers all qlogic chips: 1020 all the way
++    up to 23xxx. http://linux-scsi.bkbits.net/scsi-isp-2.5
++
++  o qla2xxx: only for FC chips.  Has significant build issues.  hch
++    promises to send me a "must fix" list for this.
++    http://linux-scsi.bkbits.net/scsi-qla2xxx-2.5
++
++  PRI2
++
++o hch, Mike Anderson, Badari Pulavarty: scsi locking issues
++
++  o there are lots of members of struct Scsi_Host/scsi_device/scsi_cmnd
++    with very unclear locking, many of them probably want to become
++    atomic_t's or bitmaps (for the 1bit bitfields).
++
++  o there's lots of volatile abuse in the scsi code that needs to be
++    thought about.
++
++  o there's some global variables incremented without any locks
++
++  PRI2
++
++sound/
++~~~~~~
++
++o rmk: several OSS drivers for SA11xx-based hardware in need of
++  ALSA-ification and L3 bus support code for these.
++
++o rmk: need to complete ALSA-ification of the WaveArtist driver for both
++  NetWinder and other stuff (there's some fairly fundamental differences in
++  the way the mixer needs to be handled for the NetWinder.)
++
++  (Issues with forward-porting 2.4 bugfixes.)
++  (Killing off OSS is 2.7 material)
++
++PRI2
++
++arch/i386/
++~~~~~~~~~~
++
++o Also PC9800 merge needs finishing to the point we want for 2.6 (not all).
++
++  PRI3
++
++o davej: PAT support (for mtrr exhaustion w/ AGP)
++
++  PRI2
++
++o 2.5.x won't boot on some 440GX
++
++  alan: Problem understood now, feasible fix in 2.4/2.4-ac.  (440GX has two
++  IRQ routers, we use the $PIR table with the PIIX, but the 440GX doesnt use
++  the PIIX for its IRQ routing).  Fall back to BIOS for 440GX works and Intel
++  concurs.
++
++  PRI1
++
++o 2.5.x doesn't handle VIA APIC right yet.
++
++  1. We must write the PCI_INTERRUPT_LINE
++
++  2. We have quirk handlers that seem to trash it.
++
++  PRI1
++
++o ECC driver questions are not yet sorted (DaveJ is working on this) (Dan
++  Hollis)
++
++  alan: ECC - I have some test bits from Dan's stuff - they need no kernel
++  core changes for most platforms.  That means we can treat it as a random
++  driver merge.
++
++  PRI3
++
++o alan: 2.4 has some fixes for tsc handling bugs.  One where some bioses in
++  SMM mode mess up our toggle on the time high/low or mangle the counter and
++  one where a few chips need religious use of _p for timer access and we
++  don't do that.  This is forward porting little bits of fixup.
++
++  ACPI HZ stuff we can't trap - a lot of ACPI is implemented as outb's
++  triggering SMM traps
++
++  PRI1
++
++arch/x86_64/
++~~~~~~~~~~~~
++
++  (Andi)
++
++o time handling is broken. Need to move up 2.4 time.c code.
++
++  PRI1
++
++o NMI watchdog seems to tick too fast
++
++  PRI2
++
++o need to coredump 64bit vsyscall code with dwarf2
++
++  PRI2
++
++o move 64bit signal trampolines into vsyscall code and add dwarf2 for it.
++  (in progress)
++
++  PRI1
++
++o describe kernel assembly with dwarf2 annotations for kgdb
++
++  PRI3
++
++arch/alpha/
++~~~~~~~~~~~
++
++o rth: Ptrace writes are broken.  This means we can't (reliably) set
++  breakpoints or modify variables from gdb.
++
++  PRI1
++
++arch/arm/
++~~~~~~~~~
++
++o rmk: missing raw keyboard translation tables for all ARM machines.
++  Haven't even looked into this at all.  This could be messy since there
++  isn't an ARM architecture standard.  I'm presently hoping that it won't be
++  an issue.  If it does, I guess we'll see drivers/char/keyboard.c explode.
++
++  PRI2
++
++arch/others/
++~~~~~~~~~~~~
++
++o SH needs resyncing, as do some other ports. SH64 needs merging.
++  No impact on mainstream platforms hopefully.
++
++  PRI2
++
++arch/s390/
++~~~~~~~~~
++
++o A nastly memory management problem causes random crashes.  These appear
++  to be fixed/hidden by the objrmap patch, more investigation is needed.
++
++  PRI1
++
++drivers/s390/
++~~~~~~~~~~~~~
++
++o Early userspace and 64 bit dev_t will allow the removal of most of
++  dasd_devmap.c and dasd_genhd.c.
++
++  PRI2
++
++o The 3270 console driver needs to be replaced with a working one
++  (prototype is there, needs to be finished).
++
++  PRI2
++
++o Minor interface changes are pending in cio/ when the z990 machines are
++  out.
++
++  PRI2
++
++o Jan Glauber is working on a fix for the timer issues related to running
++  on virtualized CPUs (wall-clock vs.  cpu time).
++
++  PRI1
++
++o a block device driver for ramdisks shared among virtual machines
++
++  PRI3
++
++o driver for crypto hardware
++
++  PRI3
++
++o 'claw' network device driver
++
++  PRI3
++
+--- linux-2.6.0/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl	2003-08-22 19:23:39.000000000 -0700
++++ 25/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl	2003-12-28 23:23:06.000000000 -0800
+@@ -3623,7 +3623,7 @@ struct _snd_pcm_runtime {
+ 
+         <para>
+           More precise information can be found in
+-        <filename>alsa-kernel/Documentation/ControlNames.txt</filename>.
++        <filename>alsa-kernel/Documentation/sound/alsa/ControlNames.txt</filename>.
+         </para>
+       </section>
+     </section>
+--- linux-2.6.0/Documentation/sound/oss/CMI8330	2003-06-14 12:17:57.000000000 -0700
++++ 25/Documentation/sound/oss/CMI8330	2003-12-28 23:23:06.000000000 -0800
+@@ -2,7 +2,7 @@ Documentation for CMI 8330 (SoundPRO) 
+ -------------------------------------
+ Alessandro Zummo <azummo@ita.flashnet.it>
+ 
+-( Be sure to read Documentation/sound/SoundPro too )
++( Be sure to read Documentation/sound/oss/SoundPro too )
+ 
+ 
+ This adapter is now directly supported by the sb driver.
+--- linux-2.6.0/Documentation/sound/oss/INSTALL.awe	2003-06-14 12:18:29.000000000 -0700
++++ 25/Documentation/sound/oss/INSTALL.awe	2003-12-28 23:23:06.000000000 -0800
+@@ -114,7 +114,7 @@ See INSTALL.RH for more details.
+ 		# insmod awe_wave
+ 		(Be sure to load awe_wave after sb!)
+ 
+-		See /usr/src/linux/Documentation/sound/AWE32 for
++		See /usr/src/linux/Documentation/sound/oss/AWE32 for
+ 		more details.
+ 
+   9. (only for obsolete systems) If you don't have /dev/sequencer
+--- linux-2.6.0/Documentation/sound/oss/Introduction	2003-10-08 15:07:08.000000000 -0700
++++ 25/Documentation/sound/oss/Introduction	2003-12-28 23:23:06.000000000 -0800
+@@ -24,7 +24,7 @@ History:
+ ========
+ 0.1.0  11/20/1998  First version, draft
+ 1.0.0  11/1998     Alan Cox changes, incorporation in 2.2.0
+-                   as /usr/src/linux/Documentation/sound/Introduction
++                   as /usr/src/linux/Documentation/sound/oss/Introduction
+ 1.1.0  6/30/1999   Second version, added notes on making the drivers,
+                    added info on multiple sound cards of similar types,]
+                    added more diagnostics info, added ijfo about esd.
+--- linux-2.6.0/Documentation/sound/oss/PAS16	2003-06-14 12:18:34.000000000 -0700
++++ 25/Documentation/sound/oss/PAS16	2003-12-28 23:23:06.000000000 -0800
+@@ -9,7 +9,7 @@ and others whose names I could not find.
+ This documentation is relevant for the PAS16 driver (pas2_card.c and
+ friends) under kernel version 2.3.99 and later.  If you are
+ unfamiliar with configuring sound under Linux, please read the
+-Sound-HOWTO, linux/Documentation/sound/Introduction and other 
++Sound-HOWTO, linux/Documentation/sound/oss/Introduction and other
+ relevant docs first.
+ 
+ The following information is relevant information from README.OSS
+@@ -73,8 +73,8 @@ CONFIG_SOUND
+   You want to read the Sound-HOWTO, available from
+   http://www.tldp.org/docs.html#howto . General information
+   about the modular sound system is contained in the files
+-  Documentation/sound/Introduction. The file
+-  Documentation/sound/README.OSS contains some slightly outdated but
++  Documentation/sound/oss/Introduction. The file
++  Documentation/sound/oss/README.OSS contains some slightly outdated but
+   still useful information as well.
+ 
+ OSS sound modules
+@@ -119,7 +119,7 @@ CONFIG_SOUND_YM3812
+   cards may have software (TSR) FM emulation. Enabling FM support with
+   these cards may cause trouble (I don't currently know of any such
+   cards, however).
+-  Please read the file Documentation/sound/OPL3 if your card has an
++  Please read the file Documentation/sound/oss/OPL3 if your card has an
+   OPL3 chip.
+   If you compile the driver into the kernel, you have to add
+   "opl3=<io>" to the kernel command line.
+--- linux-2.6.0/Documentation/sound/oss/SoundPro	2003-06-14 12:18:51.000000000 -0700
++++ 25/Documentation/sound/oss/SoundPro	2003-12-28 23:23:06.000000000 -0800
+@@ -1,7 +1,7 @@
+ Documentation for the SoundPro CMI8330 extensions in the WSS driver (ad1848.o)
+ ------------------------------------------------------------------------------
+ 
+-( Be sure to read Documentation/sound/CMI8330 too )
++( Be sure to read Documentation/sound/oss/CMI8330 too )
+ 
+ Ion Badulescu, ionut@cs.columbia.edu
+ February 24, 1999
+--- linux-2.6.0/Documentation/sound/oss/Wavefront	2003-08-08 22:55:10.000000000 -0700
++++ 25/Documentation/sound/oss/Wavefront	2003-12-28 23:23:06.000000000 -0800
+@@ -105,7 +105,7 @@ design and implementation of the driver.
+    drivers/sound/wf_midi.c              -- the "uart401" driver 
+    				              to support virtual MIDI mode.
+    include/wavefront.h                  -- the header file
+-   Documentation/sound/Tropez+          -- short docs on configuration
++   Documentation/sound/oss/Tropez+          -- short docs on configuration
+ 
+ **********************************************************************
+ 4) How do I compile/install/use it ?
+--- linux-2.6.0/Documentation/SubmittingDrivers	2003-07-10 18:50:30.000000000 -0700
++++ 25/Documentation/SubmittingDrivers	2003-12-28 23:22:58.000000000 -0800
+@@ -34,14 +34,13 @@ Linux 2.2:
+ 	maintainer then please contact Alan Cox <alan@lxorguk.ukuu.org.uk>
+ 
+ Linux 2.4:
+-	The same rules apply as 2.2 but this kernel tree is under active
+-	development. The final contact point for Linux 2.4 submissions is
+-	Marcelo Tosatti <marcelo@conectiva.com.br>.
++	The same rules apply as 2.2. The final contact point for Linux 2.4
++	submissions is Marcelo Tosatti <marcelo.tosatti@cyclades.com>.
+ 
+-Linux 2.5:
++Linux 2.6:
+ 	The same rules apply as 2.4 except that you should follow linux-kernel
+-	to track changes in API's. The final contact point for Linux 2.5
+-	submissions is Linus Torvalds <torvalds@osdl.org>.
++	to track changes in API's. The final contact point for Linux 2.6
++	submissions is Andrew Morton <akpm@osdl.org>.
+ 
+ What Criteria Determine Acceptance
+ ----------------------------------
+--- linux-2.6.0/Documentation/SubmittingPatches	2003-07-10 18:50:30.000000000 -0700
++++ 25/Documentation/SubmittingPatches	2003-12-28 23:21:00.000000000 -0800
+@@ -239,7 +239,7 @@ Let the compiler optimize away the "no-o
+ 
+ Simple example, of poor code:
+ 
+-	dev = init_etherdev (NULL, 0);
++	dev = alloc_etherdev (sizeof(struct funky_private));
+ 	if (!dev)
+ 		return -ENODEV;
+ 	#ifdef CONFIG_NET_FUNKINESS
+@@ -254,7 +254,7 @@ Cleaned-up example:
+ 	#endif
+ 
+ (in the code itself)
+-	dev = init_etherdev (NULL, 0);
++	dev = alloc_etherdev (sizeof(struct funky_private));
+ 	if (!dev)
+ 		return -ENODEV;
+ 	init_funky_net(dev);
+--- linux-2.6.0/Documentation/sysctl/fs.txt	2003-11-09 16:45:05.000000000 -0800
++++ 25/Documentation/sysctl/fs.txt	2003-12-28 23:26:39.000000000 -0800
+@@ -138,3 +138,13 @@ thus the maximum number of mounted files
+ can have. You only need to increase super-max if you need to
+ mount more filesystems than the current value in super-max
+ allows you to.
++
++==============================================================
++
++aio-nr & aio-max-nr:
++
++aio-nr shows the current system-wide number of asynchronous io
++requests.  aio-max-nr allows you to change the maximum value
++aio-nr can grow to.
++
++==============================================================
+--- linux-2.6.0/Documentation/watchdog/watchdog-api.txt	2003-09-08 13:58:55.000000000 -0700
++++ 25/Documentation/watchdog/watchdog-api.txt	2003-12-28 23:22:31.000000000 -0800
+@@ -358,6 +358,15 @@ w83877f_wdt.c -- W83877F Computer
+ 
+ 	No bits set in GETSUPPORT
+ 
++w83627hf_wdt.c -- w83627hf watchdog
++
++	Timeout that defaults to 60 seconds, supports SETTIMEOUT.
++
++	Supports CONFIG_WATCHDOG_NOWAYOUT
++
++	GETSUPPORT returns WDIOF_KEEPALIVEPING and WDIOF_SETTIMEOUT.
++	The GETSTATUS call returns if the device is open or not.
++
+ wdt.c -- ICS WDT500/501 ISA and
+ wdt_pci.c -- ICS WDT500/501 PCI
+ 
+--- linux-2.6.0/drivers/acorn/block/fd1772.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/acorn/block/fd1772.c	2003-12-28 23:21:17.000000000 -0800
+@@ -365,13 +365,12 @@ static void finish_fdc_done(int dummy);
+ static void floppy_off(unsigned int nr);
+ static void setup_req_params(int drive);
+ static void redo_fd_request(void);
+-static int fd_ioctl(struct inode *inode, struct file *filp, unsigned int
++static int fd_ioctl(struct block_device *bdev, struct file *filp, unsigned int
+ 		    cmd, unsigned long param);
+ static void fd_probe(int drive);
+ static int fd_test_drive_present(int drive);
+ static void config_types(void);
+-static int floppy_open(struct inode *inode, struct file *filp);
+-static int floppy_release(struct inode *inode, struct file *filp);
++static int floppy_open(struct block_device *bdev, struct file *filp);
+ static void do_fd_request(request_queue_t *);
+ 
+ /************************* End of Prototypes **************************/
+@@ -1309,11 +1308,9 @@ static int invalidate_drive(struct block
+ 	return 0;
+ }
+ 
+-static int fd_ioctl(struct inode *inode, struct file *filp,
++static int fd_ioctl(struct block_device *bdev, struct file *filp,
+ 		    unsigned int cmd, unsigned long param)
+ {
+-	struct block_device *bdev = inode->i_bdev;
+-
+ 	switch (cmd) {
+ 	case FDFMTEND:
+ 	case FDFLUSH:
+@@ -1453,10 +1450,11 @@ static void config_types(void)
+  * drive with different device numbers.
+  */
+ 
+-static int floppy_open(struct inode *inode, struct file *filp)
++static int floppy_open(struct block_device *bdev, struct file *filp)
+ {
+-	int drive = iminor(inode) & 3;
+-	int type =  iminor(inode) >> 2;
++	struct archy_floppy_struct *p = bdev->bd_disk->private_data;
++	int drive = p - unit;
++	int type =  MINOR(bdev->bd_dev) >> 2;
+ 	int old_dev = fd_device[drive];
+ 
+ 	if (fd_ref[drive] && old_dev != type)
+@@ -1476,10 +1474,13 @@ static int floppy_open(struct inode *ino
+ 		return 0;
+ 
+ 	if (filp->f_mode & 3) {
+-		check_disk_change(inode->i_bdev);
++		check_disk_change(bdev);
+ 		if (filp->f_mode & 2) {
+-			if (unit[drive].wpstat) {
+-				floppy_release(inode, filp);
++			if (p->wpstat) {
++				if (fd_ref[drive] < 0)
++					fd_ref[drive] = 0;
++				else
++					fd_ref[drive]--;
+ 				return -EROFS;
+ 			}
+ 		}
+@@ -1487,10 +1488,10 @@ static int floppy_open(struct inode *ino
+ 	return 0;
+ }
+ 
+-
+-static int floppy_release(struct inode *inode, struct file *filp)
++static int floppy_release(struct gendisk *disk)
+ {
+-	int drive = iminor(inode) & 3;
++	struct archy_floppy_struct *p = disk->private_data;
++	int drive = p - unit;
+ 
+ 	if (fd_ref[drive] < 0)
+ 		fd_ref[drive] = 0;
+--- linux-2.6.0/drivers/acorn/block/mfmhd.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/acorn/block/mfmhd.c	2003-12-28 23:21:12.000000000 -0800
+@@ -1153,9 +1153,9 @@ static int mfm_initdrives(void)
+  * The 'front' end of the mfm driver follows...
+  */
+ 
+-static int mfm_ioctl(struct inode *inode, struct file *file, u_int cmd, u_long arg)
++static int mfm_ioctl(struct block_device *bdev, struct file *file, u_int cmd, u_long arg)
+ {
+-	struct mfm_info *p = inode->i_bdev->bd_disk->private_data;
++	struct mfm_info *p = bdev->bd_disk->private_data;
+ 	struct hd_geometry *geo = (struct hd_geometry *) arg;
+ 	if (cmd != HDIO_GETGEO)
+ 		return -EINVAL;
+@@ -1167,7 +1167,7 @@ static int mfm_ioctl(struct inode *inode
+ 		return -EFAULT;
+ 	if (put_user (p->cylinders, &geo->cylinders))
+ 		return -EFAULT;
+-	if (put_user (get_start_sect(inode->i_bdev), &geo->start))
++	if (put_user (get_start_sect(bdev), &geo->start))
+ 		return -EFAULT;
+ 	return 0;
+ }
+--- linux-2.6.0/drivers/acpi/bus.c	2003-10-25 14:45:44.000000000 -0700
++++ 25/drivers/acpi/bus.c	2003-12-28 23:21:33.000000000 -0800
+@@ -39,7 +39,7 @@
+ #define _COMPONENT		ACPI_BUS_COMPONENT
+ ACPI_MODULE_NAME		("acpi_bus")
+ 
+-extern void acpi_pic_set_level_irq(unsigned int irq);
++extern void __init acpi_pic_sci_set_trigger(unsigned int irq);
+ 
+ FADT_DESCRIPTOR			acpi_fadt;
+ struct acpi_device		*acpi_root;
+@@ -615,7 +615,7 @@ acpi_bus_init (void)
+ 	if (acpi_ioapic)
+ 		mp_config_ioapic_for_sci(acpi_fadt.sci_int);
+ 	else
+-		acpi_pic_set_level_irq(acpi_fadt.sci_int);
++		acpi_pic_sci_set_trigger(acpi_fadt.sci_int);
+ #endif
+ 
+ 	status = acpi_enable_subsystem(ACPI_FULL_INITIALIZATION);
+--- linux-2.6.0/drivers/acpi/dispatcher/dsinit.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/drivers/acpi/dispatcher/dsinit.c	2003-12-28 23:21:33.000000000 -0800
+@@ -106,7 +106,7 @@ acpi_ds_init_one_object (
+ 		status = acpi_ds_initialize_region (obj_handle);
+ 		if (ACPI_FAILURE (status)) {
+ 			ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Region %p [%4.4s] - Init failure, %s\n",
+-				obj_handle, ((struct acpi_namespace_node *) obj_handle)->name.ascii,
++				obj_handle, acpi_ut_get_node_name (obj_handle),
+ 				acpi_format_exception (status)));
+ 		}
+ 
+@@ -141,7 +141,7 @@ acpi_ds_init_one_object (
+ 		status = acpi_ds_parse_method (obj_handle);
+ 		if (ACPI_FAILURE (status)) {
+ 			ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Method %p [%4.4s] - parse failure, %s\n",
+-				obj_handle, ((struct acpi_namespace_node *) obj_handle)->name.ascii,
++				obj_handle, acpi_ut_get_node_name (obj_handle),
+ 				acpi_format_exception (status)));
+ 
+ 			/* This parse failed, but we will continue parsing more methods */
+--- linux-2.6.0/drivers/acpi/dispatcher/dsmethod.c	2003-06-14 12:18:21.000000000 -0700
++++ 25/drivers/acpi/dispatcher/dsmethod.c	2003-12-28 23:21:33.000000000 -0800
+@@ -94,7 +94,7 @@ acpi_ds_parse_method (
+ 	}
+ 
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "**** Parsing [%4.4s] **** named_obj=%p\n",
+-		((struct acpi_namespace_node *) obj_handle)->name.ascii, obj_handle));
++		acpi_ut_get_node_name (obj_handle), obj_handle));
+ 
+ 	/* Extract the method object from the method Node */
+ 
+@@ -169,7 +169,7 @@ acpi_ds_parse_method (
+ 
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_PARSE,
+ 		"**** [%4.4s] Parsed **** named_obj=%p Op=%p\n",
+-		((struct acpi_namespace_node *) obj_handle)->name.ascii, obj_handle, op));
++		acpi_ut_get_node_name (obj_handle), obj_handle, op));
+ 
+ 	acpi_ps_delete_parse_tree (op);
+ 	return_ACPI_STATUS (status);
+--- linux-2.6.0/drivers/acpi/dispatcher/dsmthdat.c	2003-06-22 12:04:44.000000000 -0700
++++ 25/drivers/acpi/dispatcher/dsmthdat.c	2003-12-28 23:21:35.000000000 -0800
+@@ -567,13 +567,13 @@ acpi_ds_store_object_to_local (
+ 	acpi_status                     status;
+ 	struct acpi_namespace_node      *node;
+ 	union acpi_operand_object       *current_obj_desc;
++	union acpi_operand_object       *new_obj_desc;
+ 
+ 
+ 	ACPI_FUNCTION_TRACE ("ds_store_object_to_local");
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Opcode=%d Idx=%d Obj=%p\n",
+ 		opcode, index, obj_desc));
+ 
+-
+ 	/* Parameter validation */
+ 
+ 	if (!obj_desc) {
+@@ -595,6 +595,18 @@ acpi_ds_store_object_to_local (
+ 	}
+ 
+ 	/*
++	 * If the reference count on the object is more than one, we must
++	 * take a copy of the object before we store.
++	 */
++	new_obj_desc = obj_desc;
++	if (obj_desc->common.reference_count > 1) {
++		status = acpi_ut_copy_iobject_to_iobject (obj_desc, &new_obj_desc, walk_state);
++		if (ACPI_FAILURE (status)) {
++			return_ACPI_STATUS (status);
++		}
++	}
++
++	/*
+ 	 * If there is an object already in this slot, we either
+ 	 * have to delete it, or if this is an argument and there
+ 	 * is an object reference stored there, we have to do
+@@ -624,8 +636,8 @@ acpi_ds_store_object_to_local (
+ 			 * operand objects of type Reference.
+ 			 */
+ 			if (ACPI_GET_DESCRIPTOR_TYPE (current_obj_desc) != ACPI_DESC_TYPE_OPERAND) {
+-				ACPI_REPORT_ERROR (("Invalid descriptor type while storing to method arg: %X\n",
+-					current_obj_desc->common.type));
++				ACPI_REPORT_ERROR (("Invalid descriptor type while storing to method arg: [%s]\n",
++						acpi_ut_get_descriptor_name (current_obj_desc)));
+ 				return_ACPI_STATUS (AE_AML_INTERNAL);
+ 			}
+ 
+@@ -636,15 +648,21 @@ acpi_ds_store_object_to_local (
+ 			if ((current_obj_desc->common.type == ACPI_TYPE_LOCAL_REFERENCE) &&
+ 				(current_obj_desc->reference.opcode == AML_REF_OF_OP)) {
+ 				ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
+-					"Arg (%p) is an obj_ref(Node), storing in node %p\n",
+-					obj_desc, current_obj_desc));
++						"Arg (%p) is an obj_ref(Node), storing in node %p\n",
++						new_obj_desc, current_obj_desc));
+ 
+ 				/*
+ 				 * Store this object to the Node
+ 				 * (perform the indirect store)
+ 				 */
+-				status = acpi_ex_store_object_to_node (obj_desc,
++				status = acpi_ex_store_object_to_node (new_obj_desc,
+ 						 current_obj_desc->reference.object, walk_state);
++
++				/* Remove local reference if we copied the object above */
++
++				if (new_obj_desc != obj_desc) {
++					acpi_ut_remove_reference (new_obj_desc);
++				}
+ 				return_ACPI_STATUS (status);
+ 			}
+ 		}
+@@ -657,12 +675,18 @@ acpi_ds_store_object_to_local (
+ 	}
+ 
+ 	/*
+-	 * Install the obj_stack descriptor (*obj_desc) into
++	 * Install the Obj descriptor (*new_obj_desc) into
+ 	 * the descriptor for the Arg or Local.
+-	 * Install the new object in the stack entry
+ 	 * (increments the object reference count by one)
+ 	 */
+-	status = acpi_ds_method_data_set_value (opcode, index, obj_desc, walk_state);
++	status = acpi_ds_method_data_set_value (opcode, index, new_obj_desc, walk_state);
++
++	/* Remove local reference if we copied the object above */
++
++	if (new_obj_desc != obj_desc) {
++		acpi_ut_remove_reference (new_obj_desc);
++	}
++
+ 	return_ACPI_STATUS (status);
+ }
+ 
+--- linux-2.6.0/drivers/acpi/dispatcher/dsopcode.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/acpi/dispatcher/dsopcode.c	2003-12-28 23:21:33.000000000 -0800
+@@ -201,7 +201,7 @@ acpi_ds_get_buffer_field_arguments (
+ 
+ 	ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname (ACPI_TYPE_BUFFER_FIELD, node, NULL));
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "[%4.4s] buffer_field Arg Init\n",
+-		node->name.ascii));
++		acpi_ut_get_node_name (node)));
+ 
+ 	/* Execute the AML code for the term_arg arguments */
+ 
+@@ -346,7 +346,7 @@ acpi_ds_get_region_arguments (
+ 	ACPI_DEBUG_EXEC (acpi_ut_display_init_pathname (ACPI_TYPE_REGION, node, NULL));
+ 
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "[%4.4s] op_region Arg Init at AML %p\n",
+-		node->name.ascii, extra_desc->extra.aml_start));
++		acpi_ut_get_node_name (node), extra_desc->extra.aml_start));
+ 
+ 	/* Execute the argument AML */
+ 
+@@ -438,8 +438,8 @@ acpi_ds_init_buffer_field (
+ 	 * after resolution in acpi_ex_resolve_operands().
+ 	 */
+ 	if (ACPI_GET_DESCRIPTOR_TYPE (result_desc) != ACPI_DESC_TYPE_NAMED) {
+-		ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "(%s) destination must be a NS Node\n",
+-			acpi_ps_get_opcode_name (aml_opcode)));
++		ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "(%s) destination not a NS Node [%s]\n",
++				acpi_ps_get_opcode_name (aml_opcode), acpi_ut_get_descriptor_name (result_desc)));
+ 
+ 		status = AE_AML_OPERAND_TYPE;
+ 		goto cleanup;
+@@ -514,14 +514,16 @@ acpi_ds_init_buffer_field (
+ 		goto cleanup;
+ 	}
+ 
+-
+ 	/* Entire field must fit within the current length of the buffer */
+ 
+ 	if ((bit_offset + bit_count) >
+ 		(8 * (u32) buffer_desc->buffer.length)) {
+ 		ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
+-			"Field size %d exceeds Buffer size %d (bits)\n",
+-			 bit_offset + bit_count, 8 * (u32) buffer_desc->buffer.length));
++			"Field [%4.4s] size %d exceeds Buffer [%4.4s] size %d (bits)\n",
++			 acpi_ut_get_node_name (result_desc),
++			 bit_offset + bit_count,
++			 acpi_ut_get_node_name (buffer_desc->buffer.node),
++			 8 * (u32) buffer_desc->buffer.length));
+ 		status = AE_AML_BUFFER_LIMIT;
+ 		goto cleanup;
+ 	}
+@@ -742,7 +744,7 @@ acpi_ds_eval_region_operands (
+ 
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "rgn_obj %p Addr %8.8X%8.8X Len %X\n",
+ 		obj_desc,
+-		ACPI_HIDWORD (obj_desc->region.address), ACPI_LODWORD (obj_desc->region.address),
++		ACPI_FORMAT_UINT64 (obj_desc->region.address),
+ 		obj_desc->region.length));
+ 
+ 	/* Now the address and length are valid for this opregion */
+--- linux-2.6.0/drivers/acpi/dispatcher/dswexec.c	2003-06-14 12:18:35.000000000 -0700
++++ 25/drivers/acpi/dispatcher/dswexec.c	2003-12-28 23:21:33.000000000 -0800
+@@ -416,10 +416,24 @@ acpi_ds_exec_end_op (
+ 			status = acpi_gbl_op_type_dispatch [op_type] (walk_state);
+ 		}
+ 		else {
+-			ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
+-				"[%s]: Could not resolve operands, %s\n",
+-				acpi_ps_get_opcode_name (walk_state->opcode),
+-				acpi_format_exception (status)));
++			/*
++			 * Treat constructs of the form "Store(local_x,local_x)" as noops when the
++			 * Local is uninitialized.
++			 */
++			if  ((status == AE_AML_UNINITIALIZED_LOCAL) &&
++				(walk_state->opcode == AML_STORE_OP) &&
++				(walk_state->operands[0]->common.type == ACPI_TYPE_LOCAL_REFERENCE) &&
++				(walk_state->operands[1]->common.type == ACPI_TYPE_LOCAL_REFERENCE) &&
++				(walk_state->operands[0]->reference.opcode ==
++				 walk_state->operands[1]->reference.opcode)) {
++				status = AE_OK;
++			}
++			else {
++				ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
++					"[%s]: Could not resolve operands, %s\n",
++					acpi_ps_get_opcode_name (walk_state->opcode),
++					acpi_format_exception (status)));
++			}
+ 		}
+ 
+ 		/* Always delete the argument objects and clear the operand stack */
+--- linux-2.6.0/drivers/acpi/dispatcher/dswload.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/drivers/acpi/dispatcher/dswload.c	2003-12-28 23:21:33.000000000 -0800
+@@ -167,7 +167,7 @@ acpi_ds_load1_begin_op (
+ 	object_type = walk_state->op_info->object_type;
+ 
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH,
+-		"State=%p Op=%p [%s] ", walk_state, op, acpi_ut_get_type_name (object_type)));
++		"State=%p Op=%p [%s]\n", walk_state, op, acpi_ut_get_type_name (object_type)));
+ 
+ 	switch (walk_state->opcode) {
+ 	case AML_SCOPE_OP:
+@@ -260,10 +260,12 @@ acpi_ds_load1_begin_op (
+ 		if ((walk_state->opcode != AML_SCOPE_OP) &&
+ 			(!(walk_state->parse_flags & ACPI_PARSE_DEFERRED_OP))) {
+ 			flags |= ACPI_NS_ERROR_IF_FOUND;
+-			ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DISPATCH, "Cannot already exist\n"));
++			ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "[%s] Cannot already exist\n",
++					acpi_ut_get_type_name (object_type)));
+ 		}
+ 		else {
+-			ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DISPATCH, "Both Find or Create allowed\n"));
++			ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "[%s] Both Find or Create allowed\n",
++					acpi_ut_get_type_name (object_type)));
+ 		}
+ 
+ 		/*
+--- linux-2.6.0/drivers/acpi/dispatcher/dswscope.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/drivers/acpi/dispatcher/dswscope.c	2003-12-28 23:21:33.000000000 -0800
+@@ -146,7 +146,7 @@ acpi_ds_scope_stack_push (
+ 	if (old_scope_info) {
+ 		ACPI_DEBUG_PRINT_RAW ((ACPI_DB_EXEC,
+ 			"[%4.4s] (%s)",
+-			old_scope_info->scope.node->name.ascii,
++			acpi_ut_get_node_name (old_scope_info->scope.node),
+ 			acpi_ut_get_type_name (old_scope_info->common.value)));
+ 	}
+ 	else {
+@@ -156,7 +156,7 @@ acpi_ds_scope_stack_push (
+ 
+ 	ACPI_DEBUG_PRINT_RAW ((ACPI_DB_EXEC,
+ 		", New scope -> [%4.4s] (%s)\n",
+-		scope_info->scope.node->name.ascii,
++		acpi_ut_get_node_name (scope_info->scope.node),
+ 		acpi_ut_get_type_name (scope_info->common.value)));
+ 
+ 	/* Push new scope object onto stack */
+@@ -207,14 +207,14 @@ acpi_ds_scope_stack_pop (
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
+ 		"[%.2d] Popped scope [%4.4s] (%s), New scope -> ",
+ 		(u32) walk_state->scope_depth,
+-		scope_info->scope.node->name.ascii,
++		acpi_ut_get_node_name (scope_info->scope.node),
+ 		acpi_ut_get_type_name (scope_info->common.value)));
+ 
+ 	new_scope_info = walk_state->scope_info;
+ 	if (new_scope_info) {
+ 		ACPI_DEBUG_PRINT_RAW ((ACPI_DB_EXEC,
+ 			"[%4.4s] (%s)\n",
+-			new_scope_info->scope.node->name.ascii,
++			acpi_ut_get_node_name (new_scope_info->scope.node),
+ 			acpi_ut_get_type_name (new_scope_info->common.value)));
+ 	}
+ 	else {
+--- linux-2.6.0/drivers/acpi/events/evgpeblk.c	2003-06-22 12:04:44.000000000 -0700
++++ 25/drivers/acpi/events/evgpeblk.c	2003-12-28 23:21:33.000000000 -0800
+@@ -477,7 +477,7 @@ unlock_and_exit:
+  *
+  * RETURN:      Status
+  *
+- * DESCRIPTION: Install new GPE block with mutex support
++ * DESCRIPTION: Remove a GPE block
+  *
+  ******************************************************************************/
+ 
+@@ -743,8 +743,7 @@ acpi_ev_create_gpe_block (
+ 				((gpe_block->register_count * ACPI_GPE_REGISTER_WIDTH) -1)),
+ 		gpe_device->name.ascii,
+ 		gpe_block->register_count,
+-		ACPI_HIDWORD (gpe_block->block_address.address),
+-		ACPI_LODWORD (gpe_block->block_address.address),
++		ACPI_FORMAT_UINT64 (gpe_block->block_address.address),
+ 		interrupt_level));
+ 
+ 	/* Find all GPE methods (_Lxx, _Exx) for this block */
+--- linux-2.6.0/drivers/acpi/events/evgpe.c	2003-10-25 14:45:44.000000000 -0700
++++ 25/drivers/acpi/events/evgpe.c	2003-12-28 23:21:33.000000000 -0800
+@@ -139,12 +139,10 @@ acpi_ev_gpe_detect (
+ {
+ 	u32                             int_status = ACPI_INTERRUPT_NOT_HANDLED;
+ 	u8                              enabled_status_byte;
+-	u8                              bit_mask;
+ 	struct acpi_gpe_register_info   *gpe_register_info;
+ 	u32                             in_value;
+ 	acpi_status                     status;
+ 	struct acpi_gpe_block_info      *gpe_block;
+-	u32                             gpe_number;
+ 	u32                             i;
+ 	u32                             j;
+ 
+@@ -187,11 +185,9 @@ acpi_ev_gpe_detect (
+ 
+ 			ACPI_DEBUG_PRINT ((ACPI_DB_INTERRUPTS,
+ 				"GPE pair: Status %8.8X%8.8X = %02X, Enable %8.8X%8.8X = %02X\n",
+-				ACPI_HIDWORD (gpe_register_info->status_address.address),
+-				ACPI_LODWORD (gpe_register_info->status_address.address),
++				ACPI_FORMAT_UINT64 (gpe_register_info->status_address.address),
+ 				gpe_register_info->status,
+-				ACPI_HIDWORD (gpe_register_info->enable_address.address),
+-				ACPI_LODWORD (gpe_register_info->enable_address.address),
++				ACPI_FORMAT_UINT64 (gpe_register_info->enable_address.address),
+ 				gpe_register_info->enable));
+ 
+ 			/* First check if there is anything active at all in this register */
+@@ -206,19 +202,17 @@ acpi_ev_gpe_detect (
+ 
+ 			/* Now look at the individual GPEs in this byte register */
+ 
+-			for (j = 0, bit_mask = 1; j < ACPI_GPE_REGISTER_WIDTH; j++, bit_mask <<= 1) {
++			for (j = 0; j < ACPI_GPE_REGISTER_WIDTH; j++) {
+ 				/* Examine one GPE bit */
+ 
+-				if (enabled_status_byte & bit_mask) {
++				if (enabled_status_byte & acpi_gbl_decode_to8bit[j]) {
+ 					/*
+ 					 * Found an active GPE. Dispatch the event to a handler
+ 					 * or method.
+ 					 */
+-					gpe_number = (i * ACPI_GPE_REGISTER_WIDTH) + j;
+-
+ 					int_status |= acpi_ev_gpe_dispatch (
+-							&gpe_block->event_info[gpe_number],
+-							j + gpe_register_info->base_gpe_number);
++							  &gpe_block->event_info[(i * ACPI_GPE_REGISTER_WIDTH) + j],
++							  j + gpe_register_info->base_gpe_number);
+ 				}
+ 			}
+ 		}
+@@ -294,7 +288,7 @@ acpi_ev_asynch_execute_gpe_method (
+ 		if (ACPI_FAILURE (status)) {
+ 			ACPI_REPORT_ERROR (("%s while evaluating method [%4.4s] for GPE[%2X]\n",
+ 				acpi_format_exception (status),
+-				local_gpe_event_info.method_node->name.ascii, gpe_number));
++				acpi_ut_get_node_name (local_gpe_event_info.method_node), gpe_number));
+ 		}
+ 	}
+ 
+@@ -367,6 +361,18 @@ acpi_ev_gpe_dispatch (
+ 		/* Invoke the installed handler (at interrupt level) */
+ 
+ 		gpe_event_info->handler (gpe_event_info->context);
++
++		/* It is now safe to clear level-triggered events. */
++
++		if (gpe_event_info->flags & ACPI_EVENT_LEVEL_TRIGGERED) {
++			status = acpi_hw_clear_gpe (gpe_event_info);
++			if (ACPI_FAILURE (status)) {
++				ACPI_REPORT_ERROR ((
++					"acpi_ev_gpe_dispatch: Unable to clear GPE[%2X]\n",
++					gpe_number));
++				return_VALUE (ACPI_INTERRUPT_NOT_HANDLED);
++			}
++		}
+ 	}
+ 	else if (gpe_event_info->method_node) {
+ 		/*
+@@ -375,13 +381,16 @@ acpi_ev_gpe_dispatch (
+ 		 */
+ 		status = acpi_hw_disable_gpe (gpe_event_info);
+ 		if (ACPI_FAILURE (status)) {
+-			ACPI_REPORT_ERROR (("acpi_ev_gpe_dispatch: Unable to disable GPE[%2X]\n",
++			ACPI_REPORT_ERROR ((
++				"acpi_ev_gpe_dispatch: Unable to disable GPE[%2X]\n",
+ 				gpe_number));
+ 			return_VALUE (ACPI_INTERRUPT_NOT_HANDLED);
+ 		}
+ 
+-		/* Execute the method associated with the GPE. */
+-
++		/*
++		 * Execute the method associated with the GPE
++		 * NOTE: Level-triggered GPEs are cleared after the method completes.
++		 */
+ 		if (ACPI_FAILURE (acpi_os_queue_for_execution (OSD_PRIORITY_GPE,
+ 				 acpi_ev_asynch_execute_gpe_method,
+ 				 gpe_event_info))) {
+@@ -399,22 +408,12 @@ acpi_ev_gpe_dispatch (
+ 
+ 		/*
+ 		 * Disable the GPE.  The GPE will remain disabled until the ACPI
+-		 * Core Subsystem is restarted, or the handler is reinstalled.
++		 * Core Subsystem is restarted, or a handler is installed.
+ 		 */
+ 		status = acpi_hw_disable_gpe (gpe_event_info);
+ 		if (ACPI_FAILURE (status)) {
+-			ACPI_REPORT_ERROR (("acpi_ev_gpe_dispatch: Unable to disable GPE[%2X]\n",
+-				gpe_number));
+-			return_VALUE (ACPI_INTERRUPT_NOT_HANDLED);
+-		}
+-	}
+-
+-	/* It is now safe to clear level-triggered events. */
+-
+-	if (gpe_event_info->flags & ACPI_EVENT_LEVEL_TRIGGERED) {
+-		status = acpi_hw_clear_gpe (gpe_event_info);
+-		if (ACPI_FAILURE (status)) {
+-			ACPI_REPORT_ERROR (("acpi_ev_gpe_dispatch: Unable to clear GPE[%2X]\n",
++			ACPI_REPORT_ERROR ((
++				"acpi_ev_gpe_dispatch: Unable to disable GPE[%2X]\n",
+ 				gpe_number));
+ 			return_VALUE (ACPI_INTERRUPT_NOT_HANDLED);
+ 		}
+--- linux-2.6.0/drivers/acpi/events/evmisc.c	2003-06-14 12:18:23.000000000 -0700
++++ 25/drivers/acpi/events/evmisc.c	2003-12-28 23:21:33.000000000 -0800
+@@ -195,7 +195,8 @@ acpi_ev_queue_notify_request (
+ 		/* There is no per-device notify handler for this device */
+ 
+ 		ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
+-			"No notify handler for [%4.4s] node %p\n", node->name.ascii, node));
++			"No notify handler for [%4.4s] node %p\n",
++			acpi_ut_get_node_name (node), node));
+ 	}
+ 
+ 	return (status);
+--- linux-2.6.0/drivers/acpi/events/evregion.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/drivers/acpi/events/evregion.c	2003-12-28 23:21:33.000000000 -0800
+@@ -136,7 +136,7 @@ acpi_ev_init_address_spaces (
+  *
+  ******************************************************************************/
+ 
+-static acpi_status
++acpi_status
+ acpi_ev_execute_reg_method (
+ 	union acpi_operand_object      *region_obj,
+ 	u32                             function)
+@@ -202,7 +202,7 @@ cleanup:
+  *
+  * FUNCTION:    acpi_ev_address_space_dispatch
+  *
+- * PARAMETERS:  region_obj          - internal region object
++ * PARAMETERS:  region_obj          - Internal region object
+  *              space_id            - ID of the address space (0-255)
+  *              Function            - Read or Write operation
+  *              Address             - Where in the space to read or write
+@@ -243,9 +243,11 @@ acpi_ev_address_space_dispatch (
+ 
+ 	/* Ensure that there is a handler associated with this region */
+ 
+-	handler_desc = region_obj->region.address_space;
++	handler_desc = region_obj->region.handler;
+ 	if (!handler_desc) {
+-		ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "no handler for region(%p) [%s]\n",
++		ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
++			"No handler for Region [%4.4s] (%p) [%s]\n",
++			acpi_ut_get_node_name (region_obj->region.node),
+ 			region_obj, acpi_ut_get_region_name (region_obj->region.space_id)));
+ 
+ 		return_ACPI_STATUS (AE_NOT_EXIST);
+@@ -320,8 +322,8 @@ acpi_ev_address_space_dispatch (
+ 
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_OPREGION,
+ 		"Handler %p (@%p) Address %8.8X%8.8X [%s]\n",
+-		&region_obj->region.address_space->address_space, handler,
+-		ACPI_HIDWORD (address), ACPI_LODWORD (address),
++		&region_obj->region.handler->address_space, handler,
++		ACPI_FORMAT_UINT64 (address),
+ 		acpi_ut_get_region_name (region_obj->region.space_id)));
+ 
+ 	if (!(handler_desc->address_space.flags & ACPI_ADDR_HANDLER_DEFAULT_INSTALLED)) {
+@@ -359,6 +361,7 @@ acpi_ev_address_space_dispatch (
+ 	return_ACPI_STATUS (status);
+ }
+ 
++
+ /*******************************************************************************
+  *
+  * FUNCTION:    acpi_ev_detach_region
+@@ -398,7 +401,7 @@ acpi_ev_detach_region(
+ 
+ 	/* Get the address handler from the region object */
+ 
+-	handler_obj = region_obj->region.address_space;
++	handler_obj = region_obj->region.handler;
+ 	if (!handler_obj) {
+ 		/* This region has no handler, all done */
+ 
+@@ -472,7 +475,7 @@ acpi_ev_detach_region(
+ 			 * If the region is on the handler's list
+ 			 * this better be the region's handler
+ 			 */
+-			region_obj->region.address_space = NULL;
++			region_obj->region.handler = NULL;
+ 			acpi_ut_remove_reference (handler_obj);
+ 
+ 			return_VOID;
+@@ -515,17 +518,15 @@ acpi_ev_attach_region (
+ 	union acpi_operand_object       *region_obj,
+ 	u8                              acpi_ns_is_locked)
+ {
+-	acpi_status                     status;
+-	acpi_status                     status2;
+-
+ 
+ 	ACPI_FUNCTION_TRACE ("ev_attach_region");
+ 
+ 
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_OPREGION,
+-		"Adding Region %p to address handler %p [%s]\n",
+-		region_obj, handler_obj, acpi_ut_get_region_name (region_obj->region.space_id)));
+-
++		"Adding Region [%4.4s] %p to address handler %p [%s]\n",
++		acpi_ut_get_node_name (region_obj->region.node),
++		region_obj, handler_obj,
++		acpi_ut_get_region_name (region_obj->region.space_id)));
+ 
+ 	/* Link this region to the front of the handler's list */
+ 
+@@ -534,34 +535,14 @@ acpi_ev_attach_region (
+ 
+ 	/* Install the region's handler */
+ 
+-	if (region_obj->region.address_space) {
++	if (region_obj->region.handler) {
+ 		return_ACPI_STATUS (AE_ALREADY_EXISTS);
+ 	}
+ 
+-	region_obj->region.address_space = handler_obj;
++	region_obj->region.handler = handler_obj;
+ 	acpi_ut_add_reference (handler_obj);
+ 
+-	/*
+-	 * Tell all users that this region is usable by running the _REG
+-	 * method
+-	 */
+-	if (acpi_ns_is_locked) {
+-		status2 = acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
+-		if (ACPI_FAILURE (status2)) {
+-			return_ACPI_STATUS (status2);
+-		}
+-	}
+-
+-	status = acpi_ev_execute_reg_method (region_obj, 1);
+-
+-	if (acpi_ns_is_locked) {
+-		status2 = acpi_ut_acquire_mutex (ACPI_MTX_NAMESPACE);
+-		if (ACPI_FAILURE (status2)) {
+-			return_ACPI_STATUS (status2);
+-		}
+-	}
+-
+-	return_ACPI_STATUS (status);
++	return_ACPI_STATUS (AE_OK);
+ }
+ 
+ 
+@@ -569,9 +550,7 @@ acpi_ev_attach_region (
+  *
+  * FUNCTION:    acpi_ev_install_handler
+  *
+- * PARAMETERS:  Handle              - Node to be dumped
+- *              Level               - Nesting level of the handle
+- *              Context             - Passed into acpi_ns_walk_namespace
++ * PARAMETERS:  walk_namespace callback
+  *
+  * DESCRIPTION: This routine installs an address handler into objects that are
+  *              of type Region or Device.
+@@ -640,7 +619,7 @@ acpi_ev_install_handler (
+ 	if (ACPI_GET_OBJECT_TYPE (obj_desc) == ACPI_TYPE_DEVICE) {
+ 		/* Check if this Device already has a handler for this address space */
+ 
+-		next_handler_obj = obj_desc->device.address_space;
++		next_handler_obj = obj_desc->device.handler;
+ 		while (next_handler_obj) {
+ 			/* Found a handler, is it for the same address space? */
+ 
+@@ -697,4 +676,77 @@ acpi_ev_install_handler (
+ 	return (status);
+ }
+ 
++/*******************************************************************************
++ *
++ * FUNCTION:    acpi_ev_reg_run
++ *
++ * PARAMETERS:  walk_namespace callback
++ *
++ * DESCRIPTION: Run _REg method for region objects of the requested space_iD
++ *
++ ******************************************************************************/
++
++acpi_status
++acpi_ev_reg_run (
++	acpi_handle                     obj_handle,
++	u32                             level,
++	void                            *context,
++	void                            **return_value)
++{
++	union acpi_operand_object       *handler_obj;
++	union acpi_operand_object       *obj_desc;
++	struct acpi_namespace_node      *node;
++	acpi_status                     status;
++
++
++	ACPI_FUNCTION_NAME ("ev_reg_run");
++
++
++	handler_obj = (union acpi_operand_object   *) context;
++
++	/* Parameter validation */
++
++	if (!handler_obj) {
++		return (AE_OK);
++	}
++
++	/* Convert and validate the device handle */
++
++	node = acpi_ns_map_handle_to_node (obj_handle);
++	if (!node) {
++		return (AE_BAD_PARAMETER);
++	}
++
++	/*
++	 * We only care about regions.and objects
++	 * that are allowed to have address space handlers
++	 */
++	if ((node->type != ACPI_TYPE_REGION) &&
++		(node != acpi_gbl_root_node)) {
++		return (AE_OK);
++	}
++
++	/* Check for an existing internal object */
++
++	obj_desc = acpi_ns_get_attached_object (node);
++	if (!obj_desc) {
++		/* No object, just exit */
++
++		return (AE_OK);
++	}
++
++
++	/* Object is a Region */
++
++	if (obj_desc->region.space_id != handler_obj->address_space.space_id) {
++		/*
++		 * This region is for a different address space
++		 * -- just ignore it
++		 */
++		return (AE_OK);
++	}
++
++	status = acpi_ev_execute_reg_method (obj_desc, 1);
++	return (status);
++}
+ 
+--- linux-2.6.0/drivers/acpi/events/evrgnini.c	2003-06-14 12:17:57.000000000 -0700
++++ 25/drivers/acpi/events/evrgnini.c	2003-12-28 23:21:33.000000000 -0800
+@@ -177,7 +177,7 @@ acpi_ev_pci_config_region_setup (
+ 	ACPI_FUNCTION_TRACE ("ev_pci_config_region_setup");
+ 
+ 
+-	handler_obj = region_obj->region.address_space;
++	handler_obj = region_obj->region.handler;
+ 	if (!handler_obj) {
+ 		/*
+ 		 * No installed handler. This shouldn't happen because the dispatch
+@@ -239,7 +239,7 @@ acpi_ev_pci_config_region_setup (
+ 						else {
+ 							ACPI_REPORT_ERROR ((
+ 								"Could not install pci_config handler for Root Bridge %4.4s, %s\n",
+-								pci_root_node->name.ascii, acpi_format_exception (status)));
++								acpi_ut_get_node_name (pci_root_node), acpi_format_exception (status)));
+ 						}
+ 					}
+ 					break;
+@@ -469,7 +469,7 @@ acpi_ev_initialize_region (
+ 
+ 	/* Setup defaults */
+ 
+-	region_obj->region.address_space = NULL;
++	region_obj->region.handler = NULL;
+ 	region_obj2->extra.method_REG = NULL;
+ 	region_obj->common.flags &= ~(AOPOBJ_SETUP_COMPLETE);
+ 	region_obj->common.flags |= AOPOBJ_OBJECT_INITIALIZED;
+@@ -502,17 +502,17 @@ acpi_ev_initialize_region (
+ 			switch (node->type) {
+ 			case ACPI_TYPE_DEVICE:
+ 
+-				handler_obj = obj_desc->device.address_space;
++				handler_obj = obj_desc->device.handler;
+ 				break;
+ 
+ 			case ACPI_TYPE_PROCESSOR:
+ 
+-				handler_obj = obj_desc->processor.address_space;
++				handler_obj = obj_desc->processor.handler;
+ 				break;
+ 
+ 			case ACPI_TYPE_THERMAL:
+ 
+-				handler_obj = obj_desc->thermal_zone.address_space;
++				handler_obj = obj_desc->thermal_zone.handler;
+ 				break;
+ 
+ 			default:
+@@ -533,6 +533,26 @@ acpi_ev_initialize_region (
+ 					status = acpi_ev_attach_region (handler_obj, region_obj,
+ 							 acpi_ns_locked);
+ 
++					/*
++					 * Tell all users that this region is usable by running the _REG
++					 * method
++					 */
++					if (acpi_ns_locked) {
++						status = acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
++						if (ACPI_FAILURE (status)) {
++							return_ACPI_STATUS (status);
++						}
++					}
++
++					status = acpi_ev_execute_reg_method (region_obj, 1);
++
++					if (acpi_ns_locked) {
++						status = acpi_ut_acquire_mutex (ACPI_MTX_NAMESPACE);
++						if (ACPI_FAILURE (status)) {
++							return_ACPI_STATUS (status);
++						}
++					}
++
+ 					return_ACPI_STATUS (AE_OK);
+ 				}
+ 
+--- linux-2.6.0/drivers/acpi/events/evxfregn.c	2003-06-14 12:17:59.000000000 -0700
++++ 25/drivers/acpi/events/evxfregn.c	2003-12-28 23:21:33.000000000 -0800
+@@ -173,7 +173,7 @@ acpi_install_address_space_handler (
+ 		 * The attached device object already exists.
+ 		 * Make sure the handler is not already installed.
+ 		 */
+-		handler_obj = obj_desc->device.address_space;
++		handler_obj = obj_desc->device.handler;
+ 
+ 		/* Walk the handler list for this device */
+ 
+@@ -240,7 +240,8 @@ acpi_install_address_space_handler (
+ 
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_OPREGION,
+ 		"Installing address handler for region %s(%X) on Device %4.4s %p(%p)\n",
+-		acpi_ut_get_region_name (space_id), space_id, node->name.ascii, node, obj_desc));
++		acpi_ut_get_region_name (space_id), space_id,
++		acpi_ut_get_node_name (node), node, obj_desc));
+ 
+ 	/*
+ 	 * Install the handler
+@@ -267,13 +268,13 @@ acpi_install_address_space_handler (
+ 
+ 	/* Install at head of Device.address_space list */
+ 
+-	handler_obj->address_space.next      = obj_desc->device.address_space;
++	handler_obj->address_space.next      = obj_desc->device.handler;
+ 
+ 	/*
+ 	 * The Device object is the first reference on the handler_obj.
+ 	 * Each region that uses the handler adds a reference.
+ 	 */
+-	obj_desc->device.address_space = handler_obj;
++	obj_desc->device.handler = handler_obj;
+ 
+ 	/*
+ 	 * Walk the namespace finding all of the regions this
+@@ -291,6 +292,17 @@ acpi_install_address_space_handler (
+ 			  ACPI_NS_WALK_UNLOCK, acpi_ev_install_handler,
+ 			  handler_obj, NULL);
+ 
++	/*
++	 * Now we can run the _REG methods for all Regions for this
++	 * space ID.  This is a separate walk in order to handle any
++	 * interdependencies between regions and _REG methods.  (i.e. handlers
++	 * must be installed for all regions of this Space ID before we
++	 * can run any _REG methods.
++	 */
++	status = acpi_ns_walk_namespace (ACPI_TYPE_ANY, device, ACPI_UINT32_MAX,
++			  ACPI_NS_WALK_UNLOCK, acpi_ev_reg_run,
++			  handler_obj, NULL);
++
+ unlock_and_exit:
+ 	(void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
+ 	return_ACPI_STATUS (status);
+@@ -357,8 +369,8 @@ acpi_remove_address_space_handler (
+ 
+ 	/* Find the address handler the user requested */
+ 
+-	handler_obj = obj_desc->device.address_space;
+-	last_obj_ptr = &obj_desc->device.address_space;
++	handler_obj = obj_desc->device.handler;
++	last_obj_ptr = &obj_desc->device.handler;
+ 	while (handler_obj) {
+ 		/* We have a handler, see if user requested this one */
+ 
+--- linux-2.6.0/drivers/acpi/executer/exdump.c	2003-06-14 12:17:57.000000000 -0700
++++ 25/drivers/acpi/executer/exdump.c	2003-12-28 23:21:33.000000000 -0800
+@@ -89,27 +89,27 @@ acpi_ex_dump_operand (
+ 
+ 	if (!obj_desc) {
+ 		/*
+-		 * This usually indicates that something serious is wrong --
+-		 * since most (if not all)
+-		 * code that dumps the stack expects something to be there!
++		 * This usually indicates that something serious is wrong
+ 		 */
+-		acpi_os_printf ("Null stack entry ptr\n");
++		acpi_os_printf ("Null Object Descriptor\n");
+ 		return;
+ 	}
+ 
+ 	if (ACPI_GET_DESCRIPTOR_TYPE (obj_desc) == ACPI_DESC_TYPE_NAMED) {
+-		ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%p NS Node: ", obj_desc));
++		ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%p is a NS Node: ", obj_desc));
+ 		ACPI_DUMP_ENTRY (obj_desc, ACPI_LV_EXEC);
+ 		return;
+ 	}
+ 
+ 	if (ACPI_GET_DESCRIPTOR_TYPE (obj_desc) != ACPI_DESC_TYPE_OPERAND) {
+-		ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%p is not a local object\n", obj_desc));
++		ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
++				"%p is not a node or operand object: [%s]\n",
++				obj_desc, acpi_ut_get_descriptor_name (obj_desc)));
+ 		ACPI_DUMP_BUFFER (obj_desc, sizeof (union acpi_operand_object));
+ 		return;
+ 	}
+ 
+-	/*  obj_desc is a valid object */
++	/* obj_desc is a valid object */
+ 
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%p ", obj_desc));
+ 
+@@ -151,11 +151,10 @@ acpi_ex_dump_operand (
+ 					 obj_desc->reference.offset);
+ 
+ 			if (ACPI_GET_OBJECT_TYPE (obj_desc) == ACPI_TYPE_INTEGER) {
+-				/* Value is a Number */
++				/* Value is an Integer */
+ 
+ 				acpi_os_printf (" value is [%8.8X%8.8x]",
+-						 ACPI_HIDWORD(obj_desc->integer.value),
+-						 ACPI_LODWORD(obj_desc->integer.value));
++						 ACPI_FORMAT_UINT64 (obj_desc->integer.value));
+ 			}
+ 
+ 			acpi_os_printf ("\n");
+@@ -169,11 +168,10 @@ acpi_ex_dump_operand (
+ 
+ 			if (ACPI_GET_OBJECT_TYPE (obj_desc) == ACPI_TYPE_INTEGER) {
+ 
+-				/* Value is a Number */
++				/* Value is an Integer */
+ 
+ 				acpi_os_printf (" value is [%8.8X%8.8x]",
+-						 ACPI_HIDWORD(obj_desc->integer.value),
+-						 ACPI_LODWORD(obj_desc->integer.value));
++						 ACPI_FORMAT_UINT64 (obj_desc->integer.value));
+ 			}
+ 
+ 			acpi_os_printf ("\n");
+@@ -189,7 +187,7 @@ acpi_ex_dump_operand (
+ 
+ 		default:
+ 
+-			/*  unknown opcode  */
++			/* Unknown opcode */
+ 
+ 			acpi_os_printf ("Unknown Reference opcode=%X\n",
+ 				obj_desc->reference.opcode);
+@@ -229,8 +227,7 @@ acpi_ex_dump_operand (
+ 	case ACPI_TYPE_INTEGER:
+ 
+ 		acpi_os_printf ("Integer %8.8X%8.8X\n",
+-				 ACPI_HIDWORD (obj_desc->integer.value),
+-				 ACPI_LODWORD (obj_desc->integer.value));
++				 ACPI_FORMAT_UINT64 (obj_desc->integer.value));
+ 		break;
+ 
+ 
+@@ -271,8 +268,7 @@ acpi_ex_dump_operand (
+ 		}
+ 		else {
+ 			acpi_os_printf (" base %8.8X%8.8X Length %X\n",
+-				ACPI_HIDWORD (obj_desc->region.address),
+-				ACPI_LODWORD (obj_desc->region.address),
++				ACPI_FORMAT_UINT64 (obj_desc->region.address),
+ 				obj_desc->region.length);
+ 		}
+ 		break;
+@@ -494,7 +490,7 @@ acpi_ex_out_address (
+ 	acpi_os_printf ("%20s : %p\n", title, value);
+ #else
+ 	acpi_os_printf ("%20s : %8.8X%8.8X\n", title,
+-			 ACPI_HIDWORD (value), ACPI_LODWORD (value));
++			 ACPI_FORMAT_UINT64 (value));
+ #endif
+ }
+ 
+@@ -525,7 +521,7 @@ acpi_ex_dump_node (
+ 		}
+ 	}
+ 
+-	acpi_os_printf ("%20s : %4.4s\n",     "Name", node->name.ascii);
++	acpi_os_printf ("%20s : %4.4s\n",     "Name", acpi_ut_get_node_name (node));
+ 	acpi_ex_out_string ("Type",           acpi_ut_get_type_name (node->type));
+ 	acpi_ex_out_integer ("Flags",         node->flags);
+ 	acpi_ex_out_integer ("Owner Id",      node->owner_id);
+@@ -573,7 +569,8 @@ acpi_ex_dump_object_descriptor (
+ 	}
+ 
+ 	if (ACPI_GET_DESCRIPTOR_TYPE (obj_desc) != ACPI_DESC_TYPE_OPERAND) {
+-		acpi_os_printf ("ex_dump_object_descriptor: %p is not a valid ACPI object\n", obj_desc);
++		acpi_os_printf ("ex_dump_object_descriptor: %p is not an ACPI operand object: [%s]\n",
++				obj_desc, acpi_ut_get_descriptor_name (obj_desc));
+ 		return_VOID;
+ 	}
+ 
+@@ -589,8 +586,7 @@ acpi_ex_dump_object_descriptor (
+ 	case ACPI_TYPE_INTEGER:
+ 
+ 		acpi_os_printf ("%20s : %8.8X%8.8X\n", "Value",
+-				  ACPI_HIDWORD (obj_desc->integer.value),
+-				  ACPI_LODWORD (obj_desc->integer.value));
++				ACPI_FORMAT_UINT64 (obj_desc->integer.value));
+ 		break;
+ 
+ 
+@@ -635,7 +631,7 @@ acpi_ex_dump_object_descriptor (
+ 
+ 	case ACPI_TYPE_DEVICE:
+ 
+-		acpi_ex_out_pointer ("address_space", obj_desc->device.address_space);
++		acpi_ex_out_pointer ("Handler",     obj_desc->device.handler);
+ 		acpi_ex_out_pointer ("system_notify", obj_desc->device.system_notify);
+ 		acpi_ex_out_pointer ("device_notify", obj_desc->device.device_notify);
+ 		break;
+@@ -673,7 +669,7 @@ acpi_ex_dump_object_descriptor (
+ 		acpi_ex_out_integer ("Flags",        obj_desc->region.flags);
+ 		acpi_ex_out_address ("Address",      obj_desc->region.address);
+ 		acpi_ex_out_integer ("Length",       obj_desc->region.length);
+-		acpi_ex_out_pointer ("address_space", obj_desc->region.address_space);
++		acpi_ex_out_pointer ("Handler",      obj_desc->region.handler);
+ 		acpi_ex_out_pointer ("Next",         obj_desc->region.next);
+ 		break;
+ 
+@@ -694,7 +690,7 @@ acpi_ex_dump_object_descriptor (
+ 		acpi_ex_out_address ("Address",      (acpi_physical_address) obj_desc->processor.address);
+ 		acpi_ex_out_pointer ("system_notify", obj_desc->processor.system_notify);
+ 		acpi_ex_out_pointer ("device_notify", obj_desc->processor.device_notify);
+-		acpi_ex_out_pointer ("address_space", obj_desc->processor.address_space);
++		acpi_ex_out_pointer ("Handler",      obj_desc->processor.handler);
+ 		break;
+ 
+ 
+@@ -702,7 +698,7 @@ acpi_ex_dump_object_descriptor (
+ 
+ 		acpi_ex_out_pointer ("system_notify", obj_desc->thermal_zone.system_notify);
+ 		acpi_ex_out_pointer ("device_notify", obj_desc->thermal_zone.device_notify);
+-		acpi_ex_out_pointer ("address_space", obj_desc->thermal_zone.address_space);
++		acpi_ex_out_pointer ("Handler",      obj_desc->thermal_zone.handler);
+ 		break;
+ 
+ 
+--- linux-2.6.0/drivers/acpi/executer/exfldio.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/acpi/executer/exfldio.c	2003-12-28 23:21:33.000000000 -0800
+@@ -138,8 +138,9 @@ acpi_ex_setup_region (
+ 			 */
+ 			ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
+ 				"Field [%4.4s] access width (%d bytes) too large for region [%4.4s] (length %X)\n",
+-				obj_desc->common_field.node->name.ascii, obj_desc->common_field.access_byte_width,
+-				rgn_desc->region.node->name.ascii, rgn_desc->region.length));
++				acpi_ut_get_node_name (obj_desc->common_field.node),
++				obj_desc->common_field.access_byte_width,
++				acpi_ut_get_node_name (rgn_desc->region.node), rgn_desc->region.length));
+ 		}
+ 
+ 		/*
+@@ -148,9 +149,10 @@ acpi_ex_setup_region (
+ 		 */
+ 		ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
+ 			"Field [%4.4s] Base+Offset+Width %X+%X+%X is beyond end of region [%4.4s] (length %X)\n",
+-			obj_desc->common_field.node->name.ascii, obj_desc->common_field.base_byte_offset,
++			acpi_ut_get_node_name (obj_desc->common_field.node),
++			obj_desc->common_field.base_byte_offset,
+ 			field_datum_byte_offset, obj_desc->common_field.access_byte_width,
+-			rgn_desc->region.node->name.ascii, rgn_desc->region.length));
++			acpi_ut_get_node_name (rgn_desc->region.node), rgn_desc->region.length));
+ 
+ 		#ifdef CONFIG_ACPI_RELAXED_AML
+ 		{
+@@ -261,7 +263,7 @@ acpi_ex_access_region (
+ 		obj_desc->common_field.access_byte_width,
+ 		obj_desc->common_field.base_byte_offset,
+ 		field_datum_byte_offset,
+-		ACPI_HIDWORD (address), ACPI_LODWORD (address)));
++		ACPI_FORMAT_UINT64 (address)));
+ 
+ 	/* Invoke the appropriate address_space/op_region handler */
+ 
+@@ -514,12 +516,12 @@ acpi_ex_field_datum_io (
+ 	if (ACPI_SUCCESS (status)) {
+ 		if (read_write == ACPI_READ) {
+ 			ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD, "Value Read %8.8X%8.8X, Width %d\n",
+-					   ACPI_HIDWORD (*value), ACPI_LODWORD (*value),
++					   ACPI_FORMAT_UINT64 (*value),
+ 					   obj_desc->common_field.access_byte_width));
+ 		}
+ 		else {
+ 			ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD, "Value Written %8.8X%8.8X, Width %d\n",
+-					   ACPI_HIDWORD (*value), ACPI_LODWORD (*value),
++					   ACPI_FORMAT_UINT64 (*value),
+ 					   obj_desc->common_field.access_byte_width));
+ 		}
+ 	}
+@@ -612,11 +614,11 @@ acpi_ex_write_with_update_rule (
+ 
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD,
+ 		"Mask %8.8X%8.8X, datum_offset %X, Width %X, Value %8.8X%8.8X, merged_value %8.8X%8.8X\n",
+-		ACPI_HIDWORD (mask), ACPI_LODWORD (mask),
++		ACPI_FORMAT_UINT64 (mask),
+ 		field_datum_byte_offset,
+ 		obj_desc->common_field.access_byte_width,
+-		ACPI_HIDWORD (field_value), ACPI_LODWORD (field_value),
+-		ACPI_HIDWORD (merged_value),ACPI_LODWORD (merged_value)));
++		ACPI_FORMAT_UINT64 (field_value),
++		ACPI_FORMAT_UINT64 (merged_value)));
+ 
+ 	/* Write the merged value */
+ 
+@@ -784,12 +786,13 @@ acpi_ex_extract_from_field (
+ {
+ 	acpi_status                     status;
+ 	u32                             field_datum_byte_offset;
+-	u32                             datum_offset;
+-	acpi_integer                    previous_raw_datum;
++	u32                             buffer_datum_offset;
++	acpi_integer                    previous_raw_datum = 0;
+ 	acpi_integer                    this_raw_datum = 0;
+ 	acpi_integer                    merged_datum = 0;
+ 	u32                             byte_field_length;
+ 	u32                             datum_count;
++	u32                             i;
+ 
+ 
+ 	ACPI_FUNCTION_TRACE ("ex_extract_from_field");
+@@ -812,77 +815,74 @@ acpi_ex_extract_from_field (
+ 	datum_count = ACPI_ROUND_UP_TO (byte_field_length,
+ 			   obj_desc->common_field.access_byte_width);
+ 
++	/*
++	 * If the field is not aligned on a datum boundary and does not
++	 * fit within a single datum, we must read an extra datum.
++	 *
++	 * We could just split the aligned and non-aligned cases since the
++	 * aligned case is so very simple, but this would require more code.
++	 */
++	if ((obj_desc->common_field.end_field_valid_bits != 0)    &&
++		(!(obj_desc->common_field.flags & AOPOBJ_SINGLE_DATUM))) {
++		datum_count++;
++	}
++
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD,
+ 		"byte_len %X, datum_len %X, byte_gran %X\n",
+ 		byte_field_length, datum_count,obj_desc->common_field.access_byte_width));
+ 
+ 	/*
+ 	 * Clear the caller's buffer (the whole buffer length as given)
+-	 * This is very important, especially in the cases where a byte is read,
+-	 * but the buffer is really a u32 (4 bytes).
++	 * This is very important, especially in the cases where the buffer
++	 * is longer than the size of the field.
+ 	 */
+ 	ACPI_MEMSET (buffer, 0, buffer_length);
+ 
+-	/* Read the first raw datum to prime the loop */
+-
+ 	field_datum_byte_offset = 0;
+-	datum_offset= 0;
+-
+-	status = acpi_ex_field_datum_io (obj_desc, field_datum_byte_offset,
+-			  &previous_raw_datum, ACPI_READ);
+-	if (ACPI_FAILURE (status)) {
+-		return_ACPI_STATUS (status);
+-	}
+-
++	buffer_datum_offset= 0;
+ 
+-	/* We might actually be done if the request fits in one datum */
++	/* Read the entire field */
+ 
+-	if ((datum_count == 1) &&
+-		(obj_desc->common_field.flags & AOPOBJ_SINGLE_DATUM)) {
+-		/* 1) Shift the valid data bits down to start at bit 0 */
++	for (i = 0; i < datum_count; i++) {
++		status = acpi_ex_field_datum_io (obj_desc, field_datum_byte_offset,
++				  &this_raw_datum, ACPI_READ);
++		if (ACPI_FAILURE (status)) {
++			return_ACPI_STATUS (status);
++		}
+ 
+-		merged_datum = (previous_raw_datum >> obj_desc->common_field.start_field_bit_offset);
++		/* We might actually be done if the request fits in one datum */
+ 
+-		/* 2) Mask off any upper unused bits (bits not part of the field) */
++		if ((datum_count == 1) &&
++			(obj_desc->common_field.flags & AOPOBJ_SINGLE_DATUM)) {
++			/* 1) Shift the valid data bits down to start at bit 0 */
+ 
+-		if (obj_desc->common_field.end_buffer_valid_bits) {
+-			merged_datum &= ACPI_MASK_BITS_ABOVE (obj_desc->common_field.end_buffer_valid_bits);
+-		}
++			merged_datum = (this_raw_datum >> obj_desc->common_field.start_field_bit_offset);
+ 
+-		/* Store the datum to the caller buffer */
++			/* 2) Mask off any upper unused bits (bits not part of the field) */
+ 
+-		acpi_ex_set_buffer_datum (merged_datum, buffer, buffer_length,
+-				obj_desc->common_field.access_byte_width, datum_offset);
++			if (obj_desc->common_field.end_buffer_valid_bits) {
++				merged_datum &= ACPI_MASK_BITS_ABOVE (obj_desc->common_field.end_buffer_valid_bits);
++			}
+ 
+-		return_ACPI_STATUS (AE_OK);
+-	}
++			/* Store the datum to the caller buffer */
+ 
++			acpi_ex_set_buffer_datum (merged_datum, buffer, buffer_length,
++					obj_desc->common_field.access_byte_width, buffer_datum_offset);
+ 
+-	/* We need to get more raw data to complete one or more field data */
++			return_ACPI_STATUS (AE_OK);
++		}
+ 
+-	while (datum_offset < datum_count) {
+-		field_datum_byte_offset += obj_desc->common_field.access_byte_width;
++		/* Special handling for the last datum to ignore extra bits */
+ 
+-		/*
+-		 * If the field is aligned on a byte boundary, we don't want
+-		 * to perform a final read, since this would potentially read
+-		 * past the end of the region.
+-		 *
+-		 * We could just split the aligned and non-aligned cases since the
+-		 * aligned case is so very simple, but this would require more code.
+-		 */
+-		if ((obj_desc->common_field.start_field_bit_offset != 0) ||
+-			((obj_desc->common_field.start_field_bit_offset == 0) &&
+-			(datum_offset < (datum_count -1)))) {
++		if ((i >= (datum_count -1))          &&
++			(obj_desc->common_field.end_field_valid_bits)) {
+ 			/*
+-			 * Get the next raw datum, it contains some or all bits
+-			 * of the current field datum
++			 * This is the last iteration of the loop.  We need to clear
++			 * any unused bits (bits that are not part of this field) before
++			 * we store the final merged datum into the caller buffer.
+ 			 */
+-			status = acpi_ex_field_datum_io (obj_desc, field_datum_byte_offset,
+-					  &this_raw_datum, ACPI_READ);
+-			if (ACPI_FAILURE (status)) {
+-				return_ACPI_STATUS (status);
+-			}
++			this_raw_datum &=
++				ACPI_MASK_BITS_ABOVE (obj_desc->common_field.end_field_valid_bits);
+ 		}
+ 
+ 		/*
+@@ -891,48 +891,48 @@ acpi_ex_extract_from_field (
+ 		if (obj_desc->common_field.start_field_bit_offset == 0) {
+ 			/* Field is not skewed and we can just copy the datum */
+ 
+-			merged_datum = previous_raw_datum;
++			acpi_ex_set_buffer_datum (this_raw_datum, buffer, buffer_length,
++					obj_desc->common_field.access_byte_width, buffer_datum_offset);
++			buffer_datum_offset++;
+ 		}
+ 		else {
+-			/*
+-			 * Put together the appropriate bits of the two raw data to make a
+-			 * single complete field datum
+-			 *
+-			 * 1) Normalize the first datum down to bit 0
+-			 */
+-			merged_datum = (previous_raw_datum >> obj_desc->common_field.start_field_bit_offset);
+-
+-			/* 2) Insert the second datum "above" the first datum */
++			/* Not aligned -- on the first iteration, just save the datum */
+ 
+-			merged_datum |= (this_raw_datum << obj_desc->common_field.datum_valid_bits);
+-
+-			if ((datum_offset >= (datum_count -1))) {
++			if (i != 0) {
+ 				/*
+-				 * This is the last iteration of the loop.  We need to clear
+-				 * any unused bits (bits that are not part of this field) that
+-				 * came from the last raw datum before we store the final
+-				 * merged datum into the caller buffer.
++				 * Put together the appropriate bits of the two raw data to make a
++				 * single complete field datum
++				 *
++				 * 1) Normalize the first datum down to bit 0
+ 				 */
+-				if (obj_desc->common_field.end_buffer_valid_bits) {
+-					merged_datum &=
+-						ACPI_MASK_BITS_ABOVE (obj_desc->common_field.end_buffer_valid_bits);
+-				}
++				merged_datum = (previous_raw_datum >> obj_desc->common_field.start_field_bit_offset);
++
++				/* 2) Insert the second datum "above" the first datum */
++
++				merged_datum |= (this_raw_datum << obj_desc->common_field.datum_valid_bits);
++
++				acpi_ex_set_buffer_datum (merged_datum, buffer, buffer_length,
++						obj_desc->common_field.access_byte_width, buffer_datum_offset);
++				buffer_datum_offset++;
+ 			}
++
++			/*
++			 * Save the raw datum that was just acquired since it may contain bits
++			 * of the *next* field datum
++			 */
++			previous_raw_datum = this_raw_datum;
+ 		}
+ 
+-		/*
+-		 * Store the merged field datum in the caller's buffer, according to
+-		 * the granularity of the field (size of each datum).
+-		 */
+-		acpi_ex_set_buffer_datum (merged_datum, buffer, buffer_length,
+-				obj_desc->common_field.access_byte_width, datum_offset);
++		field_datum_byte_offset += obj_desc->common_field.access_byte_width;
++	}
+ 
+-		/*
+-		 * Save the raw datum that was just acquired since it may contain bits
+-		 * of the *next* field datum.  Update offsets
+-		 */
+-		previous_raw_datum = this_raw_datum;
+-		datum_offset++;
++	/* For non-aligned case, there is one last datum to insert */
++
++	if (obj_desc->common_field.start_field_bit_offset != 0) {
++		merged_datum = (this_raw_datum >> obj_desc->common_field.start_field_bit_offset);
++
++		acpi_ex_set_buffer_datum (merged_datum, buffer, buffer_length,
++				obj_desc->common_field.access_byte_width, buffer_datum_offset);
+ 	}
+ 
+ 	return_ACPI_STATUS (AE_OK);
+--- linux-2.6.0/drivers/acpi/executer/exmisc.c	2003-06-14 12:18:30.000000000 -0700
++++ 25/drivers/acpi/executer/exmisc.c	2003-12-28 23:21:33.000000000 -0800
+@@ -121,8 +121,8 @@ acpi_ex_get_object_reference (
+ 
+ 	default:
+ 
+-		ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Invalid descriptor type %X in %p\n",
+-			ACPI_GET_DESCRIPTOR_TYPE (obj_desc), obj_desc));
++		ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "%p has invalid descriptor [%s]\n",
++				obj_desc, acpi_ut_get_descriptor_name (obj_desc)));
+ 		return_ACPI_STATUS (AE_TYPE);
+ 	}
+ 
+@@ -139,7 +139,7 @@ acpi_ex_get_object_reference (
+ 	*return_desc = reference_obj;
+ 
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Object %p Type [%s], returning Reference %p\n",
+-		obj_desc, acpi_ut_get_object_type_name (obj_desc), *return_desc));
++			obj_desc, acpi_ut_get_object_type_name (obj_desc), *return_desc));
+ 
+ 	return_ACPI_STATUS (AE_OK);
+ }
+--- linux-2.6.0/drivers/acpi/executer/exmutex.c	2003-06-14 12:18:30.000000000 -0700
++++ 25/drivers/acpi/executer/exmutex.c	2003-12-28 23:21:33.000000000 -0800
+@@ -159,7 +159,7 @@ acpi_ex_acquire_mutex (
+ 
+ 	if (!walk_state->thread) {
+ 		ACPI_REPORT_ERROR (("Cannot acquire Mutex [%4.4s], null thread info\n",
+-				obj_desc->mutex.node->name.ascii));
++				acpi_ut_get_node_name (obj_desc->mutex.node)));
+ 		return_ACPI_STATUS (AE_AML_INTERNAL);
+ 	}
+ 
+@@ -169,7 +169,7 @@ acpi_ex_acquire_mutex (
+ 	 */
+ 	if (walk_state->thread->current_sync_level > obj_desc->mutex.sync_level) {
+ 		ACPI_REPORT_ERROR (("Cannot acquire Mutex [%4.4s], incorrect sync_level\n",
+-				obj_desc->mutex.node->name.ascii));
++				acpi_ut_get_node_name (obj_desc->mutex.node)));
+ 		return_ACPI_STATUS (AE_AML_MUTEX_ORDER);
+ 	}
+ 
+@@ -242,7 +242,7 @@ acpi_ex_release_mutex (
+ 
+ 	if (!obj_desc->mutex.owner_thread) {
+ 		ACPI_REPORT_ERROR (("Cannot release Mutex [%4.4s], not acquired\n",
+-				obj_desc->mutex.node->name.ascii));
++				acpi_ut_get_node_name (obj_desc->mutex.node)));
+ 		return_ACPI_STATUS (AE_AML_MUTEX_NOT_ACQUIRED);
+ 	}
+ 
+@@ -250,7 +250,7 @@ acpi_ex_release_mutex (
+ 
+ 	if (!walk_state->thread) {
+ 		ACPI_REPORT_ERROR (("Cannot release Mutex [%4.4s], null thread info\n",
+-				obj_desc->mutex.node->name.ascii));
++				acpi_ut_get_node_name (obj_desc->mutex.node)));
+ 		return_ACPI_STATUS (AE_AML_INTERNAL);
+ 	}
+ 
+@@ -260,7 +260,7 @@ acpi_ex_release_mutex (
+ 		ACPI_REPORT_ERROR ((
+ 			"Thread %X cannot release Mutex [%4.4s] acquired by thread %X\n",
+ 			walk_state->thread->thread_id,
+-			obj_desc->mutex.node->name.ascii,
++			acpi_ut_get_node_name (obj_desc->mutex.node),
+ 			obj_desc->mutex.owner_thread->thread_id));
+ 		return_ACPI_STATUS (AE_AML_NOT_OWNER);
+ 	}
+@@ -271,7 +271,7 @@ acpi_ex_release_mutex (
+ 	 */
+ 	if (obj_desc->mutex.sync_level > walk_state->thread->current_sync_level) {
+ 		ACPI_REPORT_ERROR (("Cannot release Mutex [%4.4s], incorrect sync_level\n",
+-				obj_desc->mutex.node->name.ascii));
++				acpi_ut_get_node_name (obj_desc->mutex.node)));
+ 		return_ACPI_STATUS (AE_AML_MUTEX_ORDER);
+ 	}
+ 
+--- linux-2.6.0/drivers/acpi/executer/exoparg1.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/acpi/executer/exoparg1.c	2003-12-28 23:21:33.000000000 -0800
+@@ -351,8 +351,7 @@ acpi_ex_opcode_1A_1T_1R (
+ 
+ 			if (digit > 0) {
+ 				ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Integer too large to convert to BCD: %8.8X%8.8X\n",
+-					ACPI_HIDWORD(operand[0]->integer.value),
+-					ACPI_LODWORD(operand[0]->integer.value)));
++						ACPI_FORMAT_UINT64 (operand[0]->integer.value)));
+ 				status = AE_AML_NUMERIC_OVERFLOW;
+ 				goto cleanup;
+ 			}
+--- linux-2.6.0/drivers/acpi/executer/exoparg3.c	2003-06-14 12:17:56.000000000 -0700
++++ 25/drivers/acpi/executer/exoparg3.c	2003-12-28 23:21:33.000000000 -0800
+@@ -101,15 +101,14 @@ acpi_ex_opcode_3A_0T_0R (
+ 
+ 
+ 	switch (walk_state->opcode) {
+-
+ 	case AML_FATAL_OP:          /* Fatal (fatal_type fatal_code fatal_arg)   */
+ 
+ 		ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
+ 			"fatal_op: Type %X Code %X Arg %X <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n",
+-			(u32) operand[0]->integer.value, (u32) operand[1]->integer.value,
++			(u32) operand[0]->integer.value,
++			(u32) operand[1]->integer.value,
+ 			(u32) operand[2]->integer.value));
+ 
+-
+ 		fatal = ACPI_MEM_ALLOCATE (sizeof (struct acpi_signal_fatal_info));
+ 		if (fatal) {
+ 			fatal->type     = (u32) operand[0]->integer.value;
+--- linux-2.6.0/drivers/acpi/executer/exprep.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/acpi/executer/exprep.c	2003-12-28 23:21:33.000000000 -0800
+@@ -351,7 +351,7 @@ acpi_ex_prep_common_field_object (
+ 	 */
+ 	nearest_byte_address =
+ 			ACPI_ROUND_BITS_DOWN_TO_BYTES (field_bit_position);
+-	obj_desc->common_field.base_byte_offset =
++	obj_desc->common_field.base_byte_offset = (u32)
+ 			ACPI_ROUND_DOWN (nearest_byte_address, byte_alignment);
+ 
+ 	/*
+@@ -539,7 +539,7 @@ acpi_ex_prep_field_value (
+ 			  acpi_ns_get_type (info->field_node));
+ 
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD, "Set named_obj %p [%4.4s], obj_desc %p\n",
+-			info->field_node, info->field_node->name.ascii, obj_desc));
++			info->field_node, acpi_ut_get_node_name (info->field_node), obj_desc));
+ 
+ 	/* Remove local reference to the object */
+ 
+--- linux-2.6.0/drivers/acpi/executer/exregion.c	2003-06-14 12:17:58.000000000 -0700
++++ 25/drivers/acpi/executer/exregion.c	2003-12-28 23:21:33.000000000 -0800
+@@ -161,7 +161,7 @@ acpi_ex_system_memory_space_handler (
+ 				  (void **) &mem_info->mapped_logical_address);
+ 		if (ACPI_FAILURE (status)) {
+ 			ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Could not map memory at %8.8X%8.8X, size %X\n",
+-				ACPI_HIDWORD (address), ACPI_LODWORD (address), (u32) window_size));
++					ACPI_FORMAT_UINT64 (address), (u32) window_size));
+ 			mem_info->mapped_length = 0;
+ 			return_ACPI_STATUS (status);
+ 		}
+@@ -180,8 +180,8 @@ acpi_ex_system_memory_space_handler (
+ 			  ((acpi_integer) address - (acpi_integer) mem_info->mapped_physical_address);
+ 
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
+-		"system_memory %d (%d width) Address=%8.8X%8.8X\n", function, bit_width,
+-		ACPI_HIDWORD (address), ACPI_LODWORD (address)));
++			"system_memory %d (%d width) Address=%8.8X%8.8X\n", function, bit_width,
++			ACPI_FORMAT_UINT64 (address)));
+ 
+    /*
+ 	* Perform the memory read or write
+@@ -290,8 +290,8 @@ acpi_ex_system_io_space_handler (
+ 
+ 
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
+-		"system_iO %d (%d width) Address=%8.8X%8.8X\n", function, bit_width,
+-		ACPI_HIDWORD (address), ACPI_LODWORD (address)));
++			"system_iO %d (%d width) Address=%8.8X%8.8X\n", function, bit_width,
++			ACPI_FORMAT_UINT64 (address)));
+ 
+ 	/* Decode the function parameter */
+ 
+--- linux-2.6.0/drivers/acpi/executer/exresolv.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/acpi/executer/exresolv.c	2003-12-28 23:21:33.000000000 -0800
+@@ -349,6 +349,8 @@ acpi_ex_resolve_multiple (
+ 			/* All "References" point to a NS node */
+ 
+ 			if (ACPI_GET_DESCRIPTOR_TYPE (node) != ACPI_DESC_TYPE_NAMED) {
++				ACPI_REPORT_ERROR (("acpi_ex_resolve_multiple: Not a NS node %p [%s]\n",
++						node, acpi_ut_get_descriptor_name (node)));
+ 				return_ACPI_STATUS (AE_AML_INTERNAL);
+ 			}
+ 
+@@ -399,7 +401,9 @@ acpi_ex_resolve_multiple (
+ 			/* All "References" point to a NS node */
+ 
+ 			if (ACPI_GET_DESCRIPTOR_TYPE (node) != ACPI_DESC_TYPE_NAMED) {
+-				return_ACPI_STATUS (AE_AML_INTERNAL);
++				ACPI_REPORT_ERROR (("acpi_ex_resolve_multiple: Not a NS node %p [%s]\n",
++						node, acpi_ut_get_descriptor_name (node)));
++			   return_ACPI_STATUS (AE_AML_INTERNAL);
+ 			}
+ 
+ 			/* Get the attached object */
+--- linux-2.6.0/drivers/acpi/executer/exresop.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/acpi/executer/exresop.c	2003-12-28 23:21:33.000000000 -0800
+@@ -247,8 +247,8 @@ acpi_ex_resolve_operands (
+ 			/* Invalid descriptor */
+ 
+ 			ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
+-				"Bad descriptor type %X in Obj %p\n",
+-				ACPI_GET_DESCRIPTOR_TYPE (obj_desc), obj_desc));
++					"Invalid descriptor %p [%s]\n",
++					obj_desc, acpi_ut_get_descriptor_name (obj_desc)));
+ 
+ 			return_ACPI_STATUS (AE_AML_OPERAND_TYPE);
+ 		}
+--- linux-2.6.0/drivers/acpi/executer/exstore.c	2003-06-22 12:04:44.000000000 -0700
++++ 25/drivers/acpi/executer/exstore.c	2003-12-28 23:21:33.000000000 -0800
+@@ -190,8 +190,7 @@ acpi_ex_store (
+ 		case ACPI_TYPE_INTEGER:
+ 
+ 			ACPI_DEBUG_PRINT_RAW ((ACPI_DB_DEBUG_OBJECT, "%8.8X%8.8X\n",
+-					ACPI_HIDWORD (source_desc->integer.value),
+-					ACPI_LODWORD (source_desc->integer.value)));
++					ACPI_FORMAT_UINT64 (source_desc->integer.value)));
+ 			break;
+ 
+ 
+--- linux-2.6.0/drivers/acpi/executer/exsystem.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/acpi/executer/exsystem.c	2003-12-28 23:21:33.000000000 -0800
+@@ -111,11 +111,16 @@ acpi_ex_system_wait_semaphore (
+  *
+  * FUNCTION:    acpi_ex_system_do_stall
+  *
+- * PARAMETERS:  how_long            - The amount of time to stall
++ * PARAMETERS:  how_long            - The amount of time to stall,
++ *                                    in microseconds
+  *
+  * RETURN:      Status
+  *
+  * DESCRIPTION: Suspend running thread for specified amount of time.
++ *              Note: ACPI specification requires that Stall() does not
++ *              relinquish the processor, and delays longer than 100 usec
++ *              should use Sleep() instead.  We allow stalls up to 255 usec
++ *              for compatibility with other interpreters and existing BIOSs.
+  *
+  ******************************************************************************/
+ 
+@@ -129,12 +134,15 @@ acpi_ex_system_do_stall (
+ 	ACPI_FUNCTION_ENTRY ();
+ 
+ 
+-	if (how_long > 100) /* 100 microseconds */ {
++	if (how_long > 255) /* 255 microseconds */ {
+ 		/*
+-		 * Longer than 100 usec, use sleep instead
+-		 * (according to ACPI specification)
++		 * Longer than 255 usec, this is an error
++		 *
++		 * (ACPI specifies 100 usec as max, but this gives some slack in
++		 * order to support existing BIOSs)
+ 		 */
+-		status = acpi_ex_system_do_suspend ((how_long / 1000) + 1);
++		ACPI_REPORT_ERROR (("Stall: Time parameter is too large (%d)\n", how_long));
++		status = AE_AML_OPERAND_VALUE;
+ 	}
+ 	else {
+ 		acpi_os_stall (how_long);
+@@ -148,7 +156,8 @@ acpi_ex_system_do_stall (
+  *
+  * FUNCTION:    acpi_ex_system_do_suspend
+  *
+- * PARAMETERS:  how_long            - The amount of time to suspend
++ * PARAMETERS:  how_long            - The amount of time to suspend,
++ *                                    in milliseconds
+  *
+  * RETURN:      None
+  *
+--- linux-2.6.0/drivers/acpi/hardware/hwacpi.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/acpi/hardware/hwacpi.c	2003-12-28 23:21:33.000000000 -0800
+@@ -119,7 +119,7 @@ acpi_hw_set_mode (
+ 	 * system does not support mode transition.
+ 	 */
+ 	if (!acpi_gbl_FADT->smi_cmd) {
+-		ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "No SMI_CMD in FADT, mode transition failed.\n"));
++		ACPI_REPORT_ERROR (("No SMI_CMD in FADT, mode transition failed.\n"));
+ 		return_ACPI_STATUS (AE_NO_HARDWARE_RESPONSE);
+ 	}
+ 
+@@ -131,7 +131,7 @@ acpi_hw_set_mode (
+ 	 * transitions are not supported.
+ 	 */
+ 	if (!acpi_gbl_FADT->acpi_enable && !acpi_gbl_FADT->acpi_disable) {
+-		ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "No mode transition supported in this system.\n"));
++		ACPI_REPORT_ERROR (("No ACPI mode transition supported in this system (enable/disable both zero)\n"));
+ 		return_ACPI_STATUS (AE_OK);
+ 	}
+ 
+@@ -162,6 +162,7 @@ acpi_hw_set_mode (
+ 	}
+ 
+ 	if (ACPI_FAILURE (status)) {
++		ACPI_REPORT_ERROR (("Could not write mode change, %s\n", acpi_format_exception (status)));
+ 		return_ACPI_STATUS (status);
+ 	}
+ 
+@@ -171,18 +172,16 @@ acpi_hw_set_mode (
+ 	 */
+ 	retry = 3000;
+ 	while (retry) {
+-		status = AE_NO_HARDWARE_RESPONSE;
+-
+ 		if (acpi_hw_get_mode() == mode) {
+ 			ACPI_DEBUG_PRINT ((ACPI_DB_INFO, "Mode %X successfully enabled\n", mode));
+-			status = AE_OK;
+-			break;
++			return_ACPI_STATUS (AE_OK);
+ 		}
+ 		acpi_os_stall(1000);
+ 		retry--;
+ 	}
+ 
+-	return_ACPI_STATUS (status);
++	ACPI_REPORT_ERROR (("Hardware never changed modes\n"));
++	return_ACPI_STATUS (AE_NO_HARDWARE_RESPONSE);
+ }
+ 
+ 
+--- linux-2.6.0/drivers/acpi/hardware/hwregs.c	2003-07-27 12:14:38.000000000 -0700
++++ 25/drivers/acpi/hardware/hwregs.c	2003-12-28 23:21:33.000000000 -0800
+@@ -418,16 +418,14 @@ acpi_set_register (
+ 
+ 		ACPI_DEBUG_PRINT ((ACPI_DB_IO, "PM2 control: Read %X from %8.8X%8.8X\n",
+ 			register_value,
+-			ACPI_HIDWORD (acpi_gbl_FADT->xpm2_cnt_blk.address),
+-			ACPI_LODWORD (acpi_gbl_FADT->xpm2_cnt_blk.address)));
++			ACPI_FORMAT_UINT64 (acpi_gbl_FADT->xpm2_cnt_blk.address)));
+ 
+ 		ACPI_REGISTER_INSERT_VALUE (register_value, bit_reg_info->bit_position,
+ 				bit_reg_info->access_bit_mask, value);
+ 
+ 		ACPI_DEBUG_PRINT ((ACPI_DB_IO, "About to write %4.4X to %8.8X%8.8X\n",
+ 			register_value,
+-			ACPI_HIDWORD (acpi_gbl_FADT->xpm2_cnt_blk.address),
+-			ACPI_LODWORD (acpi_gbl_FADT->xpm2_cnt_blk.address)));
++			ACPI_FORMAT_UINT64 (acpi_gbl_FADT->xpm2_cnt_blk.address)));
+ 
+ 		status = acpi_hw_register_write (ACPI_MTX_DO_NOT_LOCK,
+ 				   ACPI_REGISTER_PM2_CONTROL, (u8) (register_value));
+@@ -763,8 +761,7 @@ acpi_hw_low_level_read (
+ 
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_IO, "Read:  %8.8X width %2d from %8.8X%8.8X (%s)\n",
+ 			*value, width,
+-			ACPI_HIDWORD (reg->address),
+-			ACPI_LODWORD (reg->address),
++			ACPI_FORMAT_UINT64 (reg->address),
+ 			acpi_ut_get_region_name (reg->address_space_id)));
+ 
+ 	return (status);
+@@ -850,8 +847,7 @@ acpi_hw_low_level_write (
+ 
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_IO, "Wrote: %8.8X width %2d   to %8.8X%8.8X (%s)\n",
+ 			value, width,
+-			ACPI_HIDWORD (reg->address),
+-			ACPI_LODWORD (reg->address),
++			ACPI_FORMAT_UINT64 (reg->address),
+ 			acpi_ut_get_region_name (reg->address_space_id)));
+ 
+ 	return (status);
+--- linux-2.6.0/drivers/acpi/hardware/hwsleep.c	2003-06-22 12:04:44.000000000 -0700
++++ 25/drivers/acpi/hardware/hwsleep.c	2003-12-28 23:21:33.000000000 -0800
+@@ -181,6 +181,13 @@ acpi_enter_sleep_state_prep (
+ 		return_ACPI_STATUS (status);
+ 	}
+ 
++	/* Set the system indicators to show the desired sleep state. */
++
++	status = acpi_evaluate_object (NULL, "\\_SI._SST", &arg_list, NULL);
++	if (ACPI_FAILURE (status) && status != AE_NOT_FOUND) {
++		 ACPI_REPORT_ERROR (("Method _SST failed, %s\n", acpi_format_exception (status)));
++	}
++
+ 	return_ACPI_STATUS (AE_OK);
+ }
+ 
+@@ -220,27 +227,28 @@ acpi_enter_sleep_state (
+ 		return_ACPI_STATUS (AE_AML_OPERAND_VALUE);
+ 	}
+ 
+-
+ 	sleep_type_reg_info = acpi_hw_get_bit_register_info (ACPI_BITREG_SLEEP_TYPE_A);
+ 	sleep_enable_reg_info = acpi_hw_get_bit_register_info (ACPI_BITREG_SLEEP_ENABLE);
+ 
+-	/* Clear wake status */
++	if (sleep_state != ACPI_STATE_S5) {
++		/* Clear wake status */
+ 
+-	status = acpi_set_register (ACPI_BITREG_WAKE_STATUS, 1, ACPI_MTX_DO_NOT_LOCK);
+-	if (ACPI_FAILURE (status)) {
+-		return_ACPI_STATUS (status);
+-	}
++		status = acpi_set_register (ACPI_BITREG_WAKE_STATUS, 1, ACPI_MTX_DO_NOT_LOCK);
++		if (ACPI_FAILURE (status)) {
++			return_ACPI_STATUS (status);
++		}
+ 
+-	status = acpi_hw_clear_acpi_status(ACPI_MTX_DO_NOT_LOCK);
+-	if (ACPI_FAILURE (status)) {
+-		return_ACPI_STATUS (status);
+-	}
++		status = acpi_hw_clear_acpi_status (ACPI_MTX_DO_NOT_LOCK);
++		if (ACPI_FAILURE (status)) {
++			return_ACPI_STATUS (status);
++		}
+ 
+-	/* Disable BM arbitration */
++		/* Disable BM arbitration */
+ 
+-	status = acpi_set_register (ACPI_BITREG_ARB_DISABLE, 1, ACPI_MTX_DO_NOT_LOCK);
+-	if (ACPI_FAILURE (status)) {
+-		return_ACPI_STATUS (status);
++		status = acpi_set_register (ACPI_BITREG_ARB_DISABLE, 1, ACPI_MTX_DO_NOT_LOCK);
++		if (ACPI_FAILURE (status)) {
++			return_ACPI_STATUS (status);
++		}
+ 	}
+ 
+ 	status = acpi_hw_disable_non_wakeup_gpes();
+@@ -297,11 +305,13 @@ acpi_enter_sleep_state (
+ 		return_ACPI_STATUS (status);
+ 	}
+ 
+-	/*
+-	 * Wait a second, then try again. This is to get S4/5 to work on all machines.
+-	 */
+ 	if (sleep_state > ACPI_STATE_S3) {
+ 		/*
++		 * We wanted to sleep > S3, but it didn't happen (by virtue of the fact that
++		 * we are still executing!)
++		 *
++		 * Wait ten seconds, then try again. This is to get S4/S5 to work on all machines.
++		 *
+ 		 * We wait so long to allow chipsets that poll this reg very slowly to
+ 		 * still read the right value. Ideally, this entire block would go
+ 		 * away entirely.
+@@ -354,6 +364,7 @@ acpi_enter_sleep_state_s4bios (
+ 
+ 	ACPI_FUNCTION_TRACE ("acpi_enter_sleep_state_s4bios");
+ 
++
+ 	acpi_set_register (ACPI_BITREG_WAKE_STATUS, 1, ACPI_MTX_DO_NOT_LOCK);
+ 	acpi_hw_clear_acpi_status(ACPI_MTX_DO_NOT_LOCK);
+ 
+@@ -389,15 +400,38 @@ acpi_enter_sleep_state_s4bios (
+ 
+ acpi_status
+ acpi_leave_sleep_state (
+-	u8                          sleep_state)
++	u8                              sleep_state)
+ {
+-	struct acpi_object_list     arg_list;
+-	union acpi_object           arg;
+-	acpi_status                 status;
++	struct acpi_object_list         arg_list;
++	union acpi_object               arg;
++	acpi_status                     status;
++	struct acpi_bit_register_info   *sleep_type_reg_info;
++	struct acpi_bit_register_info   *sleep_enable_reg_info;
++	u32                             pm1x_control;
+ 
+ 
+ 	ACPI_FUNCTION_TRACE ("acpi_leave_sleep_state");
+ 
++	/* Some machines require SLP_TYPE and SLP_EN to be cleared */
++
++	sleep_type_reg_info = acpi_hw_get_bit_register_info (ACPI_BITREG_SLEEP_TYPE_A);
++	sleep_enable_reg_info = acpi_hw_get_bit_register_info (ACPI_BITREG_SLEEP_ENABLE);
++
++	/* Get current value of PM1A control */
++
++	status = acpi_hw_register_read (ACPI_MTX_DO_NOT_LOCK,
++			 ACPI_REGISTER_PM1_CONTROL, &pm1x_control);
++	if (ACPI_SUCCESS (status)) {
++		/* Clear SLP_TYP and SLP_EN */
++
++		pm1x_control &= ~(sleep_type_reg_info->access_bit_mask |
++				   sleep_enable_reg_info->access_bit_mask);
++
++		acpi_hw_register_write (ACPI_MTX_DO_NOT_LOCK,
++				ACPI_REGISTER_PM1A_CONTROL, pm1x_control);
++		acpi_hw_register_write (ACPI_MTX_DO_NOT_LOCK,
++				ACPI_REGISTER_PM1B_CONTROL, pm1x_control);
++	}
+ 
+ 	/* Ensure enter_sleep_state_prep -> enter_sleep_state ordering */
+ 
+@@ -407,12 +441,17 @@ acpi_leave_sleep_state (
+ 
+ 	arg_list.count = 1;
+ 	arg_list.pointer = &arg;
+-
+ 	arg.type = ACPI_TYPE_INTEGER;
+-	arg.integer.value = sleep_state;
+ 
+ 	/* Ignore any errors from these methods */
+ 
++	arg.integer.value = 0;
++	status = acpi_evaluate_object (NULL, "\\_SI._SST", &arg_list, NULL);
++	if (ACPI_FAILURE (status) && status != AE_NOT_FOUND) {
++		ACPI_REPORT_ERROR (("Method _SST failed, %s\n", acpi_format_exception (status)));
++	}
++
++	arg.integer.value = sleep_state;
+ 	status = acpi_evaluate_object (NULL, "\\_BFS", &arg_list, NULL);
+ 	if (ACPI_FAILURE (status) && status != AE_NOT_FOUND) {
+ 		ACPI_REPORT_ERROR (("Method _BFS failed, %s\n", acpi_format_exception (status)));
+@@ -430,8 +469,8 @@ acpi_leave_sleep_state (
+ 		return_ACPI_STATUS (status);
+ 	}
+ 
+-	/* Disable BM arbitration */
+-	status = acpi_set_register (ACPI_BITREG_ARB_DISABLE, 0, ACPI_MTX_LOCK);
++	/* Enable BM arbitration */
+ 
++	status = acpi_set_register (ACPI_BITREG_ARB_DISABLE, 0, ACPI_MTX_LOCK);
+ 	return_ACPI_STATUS (status);
+ }
+--- linux-2.6.0/drivers/acpi/Kconfig	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/acpi/Kconfig	2003-12-28 23:21:57.000000000 -0800
+@@ -251,12 +251,6 @@ config ACPI_SYSTEM
+ 	  This driver will enable your system to shut down using ACPI, and
+ 	  dump your ACPI DSDT table using /proc/acpi/dsdt.
+ 
+-config ACPI_EFI
+-	bool
+-	depends on ACPI_INTERPRETER
+-	depends on IA64
+-	default y
+-
+ config ACPI_RELAXED_AML
+ 	bool "Relaxed AML"
+ 	depends on ACPI_INTERPRETER
+@@ -269,5 +263,23 @@ config ACPI_RELAXED_AML
+ 	  particular, many Toshiba laptops require this for correct operation
+ 	  of the AC module.
+ 
++config X86_PM_TIMER
++	bool "Power Management Timer Support"
++	depends on X86 && ACPI
++	depends on ACPI_BOOT && EXPERIMENTAL
++	default n
++	help
++	  The Power Management Timer is available on all ACPI-capable,
++	  in most cases even if ACPI is unusable or blacklisted.
++
++	  This timing source is not affected by powermanagement features
++	  like aggressive processor idling, throttling, frequency and/or
++	  voltage scaling, unlike the commonly used Time Stamp Counter
++	  (TSC) timing source.
++
++	  So, if you see messages like 'Losing too many ticks!' in the
++	  kernel logs, and/or you are using a this on a notebook which
++	  does not yet have an HPET, you should say "Y" here.
++
+ endmenu
+ 
+--- linux-2.6.0/drivers/acpi/namespace/nsaccess.c	2003-06-14 12:18:34.000000000 -0700
++++ 25/drivers/acpi/namespace/nsaccess.c	2003-12-28 23:21:33.000000000 -0800
+@@ -314,8 +314,8 @@ acpi_ns_lookup (
+ 	else {
+ 		prefix_node = scope_info->scope.node;
+ 		if (ACPI_GET_DESCRIPTOR_TYPE (prefix_node) != ACPI_DESC_TYPE_NAMED) {
+-			ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "[%p] Not a namespace node\n",
+-				prefix_node));
++			ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "%p Not a namespace node [%s]\n",
++					prefix_node, acpi_ut_get_descriptor_name (prefix_node)));
+ 			return_ACPI_STATUS (AE_AML_INTERNAL);
+ 		}
+ 
+@@ -379,7 +379,7 @@ acpi_ns_lookup (
+ 
+ 			ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
+ 				"Searching relative to prefix scope [%4.4s] (%p)\n",
+-				prefix_node->name.ascii, prefix_node));
++				acpi_ut_get_node_name (prefix_node), prefix_node));
+ 
+ 			/*
+ 			 * Handle multiple Parent Prefixes (carat) by just getting
+@@ -413,7 +413,7 @@ acpi_ns_lookup (
+ 			if (search_parent_flag == ACPI_NS_NO_UPSEARCH) {
+ 				ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
+ 					"Search scope is [%4.4s], path has %d carat(s)\n",
+-					this_node->name.ascii, num_carats));
++					acpi_ut_get_node_name (this_node), num_carats));
+ 			}
+ 		}
+ 
+--- linux-2.6.0/drivers/acpi/namespace/nsalloc.c	2003-06-14 12:18:21.000000000 -0700
++++ 25/drivers/acpi/namespace/nsalloc.c	2003-12-28 23:21:33.000000000 -0800
+@@ -271,7 +271,7 @@ acpi_ns_install_node (
+ 		 * alphabetic placement.
+ 		 */
+ 		previous_child_node = NULL;
+-		while (acpi_ns_compare_names (child_node->name.ascii, node->name.ascii) < 0) {
++		while (acpi_ns_compare_names (acpi_ut_get_node_name (child_node), acpi_ut_get_node_name (node)) < 0) {
+ 			if (child_node->flags & ANOBJ_END_OF_PEER_LIST) {
+ 				/* Last peer;  Clear end-of-list flag */
+ 
+@@ -335,8 +335,9 @@ acpi_ns_install_node (
+ 	node->type = (u8) type;
+ 
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "%4.4s (%s) added to %4.4s (%s) %p at %p\n",
+-		node->name.ascii, acpi_ut_get_type_name (node->type),
+-		parent_node->name.ascii, acpi_ut_get_type_name (parent_node->type), parent_node, node));
++		acpi_ut_get_node_name (node), acpi_ut_get_type_name (node->type),
++		acpi_ut_get_node_name (parent_node), acpi_ut_get_type_name (parent_node->type),
++		parent_node, node));
+ 
+ 	/*
+ 	 * Increment the reference count(s) of all parents up to
+--- linux-2.6.0/drivers/acpi/namespace/nsdump.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/drivers/acpi/namespace/nsdump.c	2003-12-28 23:21:33.000000000 -0800
+@@ -50,8 +50,8 @@
+ #define _COMPONENT          ACPI_NAMESPACE
+ 	 ACPI_MODULE_NAME    ("nsdump")
+ 
+-#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
+ 
++#if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
+ 
+ /*******************************************************************************
+  *
+@@ -76,7 +76,7 @@ acpi_ns_print_pathname (
+ 		return;
+ 	}
+ 
+-		/* Print the entire name */
++	/* Print the entire name */
+ 
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "["));
+ 
+@@ -205,7 +205,7 @@ acpi_ns_dump_one_object (
+ 	 * Now we can print out the pertinent information
+ 	 */
+ 	acpi_os_printf ("%4.4s %-12s %p ",
+-			this_node->name.ascii, acpi_ut_get_type_name (type), this_node);
++			acpi_ut_get_node_name (this_node), acpi_ut_get_type_name (type), this_node);
+ 
+ 	dbg_level = acpi_dbg_level;
+ 	acpi_dbg_level = 0;
+@@ -250,8 +250,7 @@ acpi_ns_dump_one_object (
+ 		case ACPI_TYPE_INTEGER:
+ 
+ 			acpi_os_printf ("= %8.8X%8.8X\n",
+-					 ACPI_HIDWORD (obj_desc->integer.value),
+-					 ACPI_LODWORD (obj_desc->integer.value));
++					 ACPI_FORMAT_UINT64 (obj_desc->integer.value));
+ 			break;
+ 
+ 
+@@ -302,8 +301,7 @@ acpi_ns_dump_one_object (
+ 			acpi_os_printf ("[%s]", acpi_ut_get_region_name (obj_desc->region.space_id));
+ 			if (obj_desc->region.flags & AOPOBJ_DATA_VALID) {
+ 				acpi_os_printf (" Addr %8.8X%8.8X Len %.4X\n",
+-						 ACPI_HIDWORD (obj_desc->region.address),
+-						 ACPI_LODWORD (obj_desc->region.address),
++						 ACPI_FORMAT_UINT64 (obj_desc->region.address),
+ 						 obj_desc->region.length);
+ 			}
+ 			else {
+@@ -324,7 +322,7 @@ acpi_ns_dump_one_object (
+ 			if (obj_desc->buffer_field.buffer_obj &&
+ 				obj_desc->buffer_field.buffer_obj->buffer.node) {
+ 				acpi_os_printf ("Buf [%4.4s]",
+-						obj_desc->buffer_field.buffer_obj->buffer.node->name.ascii);
++						acpi_ut_get_node_name (obj_desc->buffer_field.buffer_obj->buffer.node));
+ 			}
+ 			break;
+ 
+@@ -332,29 +330,29 @@ acpi_ns_dump_one_object (
+ 		case ACPI_TYPE_LOCAL_REGION_FIELD:
+ 
+ 			acpi_os_printf ("Rgn [%4.4s]",
+-					obj_desc->common_field.region_obj->region.node->name.ascii);
++					acpi_ut_get_node_name (obj_desc->common_field.region_obj->region.node));
+ 			break;
+ 
+ 
+ 		case ACPI_TYPE_LOCAL_BANK_FIELD:
+ 
+ 			acpi_os_printf ("Rgn [%4.4s] Bnk [%4.4s]",
+-					obj_desc->common_field.region_obj->region.node->name.ascii,
+-					obj_desc->bank_field.bank_obj->common_field.node->name.ascii);
++					acpi_ut_get_node_name (obj_desc->common_field.region_obj->region.node),
++					acpi_ut_get_node_name (obj_desc->bank_field.bank_obj->common_field.node));
+ 			break;
+ 
+ 
+ 		case ACPI_TYPE_LOCAL_INDEX_FIELD:
+ 
+ 			acpi_os_printf ("Idx [%4.4s] Dat [%4.4s]",
+-					obj_desc->index_field.index_obj->common_field.node->name.ascii,
+-					obj_desc->index_field.data_obj->common_field.node->name.ascii);
++					acpi_ut_get_node_name (obj_desc->index_field.index_obj->common_field.node),
++					acpi_ut_get_node_name (obj_desc->index_field.data_obj->common_field.node));
+ 			break;
+ 
+ 
+ 		case ACPI_TYPE_LOCAL_ALIAS:
+ 
+-			acpi_os_printf ("Target %4.4s (%p)\n", ((struct acpi_namespace_node *) obj_desc)->name.ascii, obj_desc);
++			acpi_os_printf ("Target %4.4s (%p)\n", acpi_ut_get_node_name (obj_desc), obj_desc);
+ 			break;
+ 
+ 		default:
+@@ -371,7 +369,7 @@ acpi_ns_dump_one_object (
+ 		case ACPI_TYPE_LOCAL_BANK_FIELD:
+ 		case ACPI_TYPE_LOCAL_INDEX_FIELD:
+ 
+-			acpi_os_printf ("Off %.2X Len %.2X Acc %.2hd\n",
++			acpi_os_printf (" Off %.3X Len %.2X Acc %.2hd\n",
+ 					(obj_desc->common_field.base_byte_offset * 8)
+ 						+ obj_desc->common_field.start_field_bit_offset,
+ 					obj_desc->common_field.bit_length,
+@@ -408,8 +406,8 @@ acpi_ns_dump_one_object (
+ 
+ 		case ACPI_TYPE_INTEGER:
+ 
+-			acpi_os_printf (" N:%X%X\n", ACPI_HIDWORD(obj_desc->integer.value),
+-					 ACPI_LODWORD(obj_desc->integer.value));
++			acpi_os_printf (" I:%8.8X8.8%X\n",
++					ACPI_FORMAT_UINT64 (obj_desc->integer.value));
+ 			break;
+ 
+ 		case ACPI_TYPE_STRING:
+@@ -485,7 +483,8 @@ acpi_ns_dump_one_object (
+ 
+ 		default:
+ 
+-			acpi_os_printf ("(String or Buffer ptr - not an object descriptor)\n");
++			acpi_os_printf ("(String or Buffer ptr - not an object descriptor) [%s]\n",
++					acpi_ut_get_descriptor_name (obj_desc));
+ 			bytes_to_dump = 16;
+ 			break;
+ 		}
+@@ -581,7 +580,6 @@ acpi_ns_dump_objects (
+ 	info.owner_id = owner_id;
+ 	info.display_type = display_type;
+ 
+-
+ 	(void) acpi_ns_walk_namespace (type, start_handle, max_depth,
+ 			 ACPI_NS_WALK_NO_UNLOCK, acpi_ns_dump_one_object,
+ 			 (void *) &info, NULL);
+@@ -628,7 +626,6 @@ acpi_ns_dump_tables (
+ 		ACPI_DEBUG_PRINT ((ACPI_DB_TABLES, "\\\n"));
+ 	}
+ 
+-
+ 	acpi_ns_dump_objects (ACPI_TYPE_ANY, ACPI_DISPLAY_OBJECTS, max_depth,
+ 			ACPI_UINT32_MAX, search_handle);
+ 	return_VOID;
+--- linux-2.6.0/drivers/acpi/namespace/nsdumpdv.c	2003-06-14 12:17:56.000000000 -0700
++++ 25/drivers/acpi/namespace/nsdumpdv.c	2003-12-28 23:21:33.000000000 -0800
+@@ -93,7 +93,7 @@ acpi_ns_dump_one_device (
+ 
+ 		ACPI_DEBUG_PRINT_RAW ((ACPI_DB_TABLES, "    HID: %s, ADR: %8.8X%8.8X, Status: %X\n",
+ 				  info->hardware_id.value,
+-				  ACPI_HIDWORD (info->address), ACPI_LODWORD (info->address),
++				  ACPI_FORMAT_UINT64 (info->address),
+ 				  info->current_status));
+ 		ACPI_MEM_FREE (info);
+ 	}
+--- linux-2.6.0/drivers/acpi/namespace/nsinit.c	2003-06-14 12:18:07.000000000 -0700
++++ 25/drivers/acpi/namespace/nsinit.c	2003-12-28 23:21:33.000000000 -0800
+@@ -144,10 +144,17 @@ acpi_ns_initialize_devices (
+ 
+ 	ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INIT, "Executing all Device _STA and_INI methods:"));
+ 
+-	/* Walk namespace for all objects of type Device */
++	status = acpi_ut_acquire_mutex (ACPI_MTX_NAMESPACE);
++	if (ACPI_FAILURE (status)) {
++		return_ACPI_STATUS (status);
++	}
++
++	/* Walk namespace for all objects of type Device or Processor */
+ 
+-	status = acpi_ns_walk_namespace (ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
+-			  ACPI_UINT32_MAX, FALSE, acpi_ns_init_one_device, &info, NULL);
++	status = acpi_ns_walk_namespace (ACPI_TYPE_ANY, ACPI_ROOT_OBJECT,
++			  ACPI_UINT32_MAX, TRUE, acpi_ns_init_one_device, &info, NULL);
++
++	(void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
+ 
+ 	if (ACPI_FAILURE (status)) {
+ 		ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "walk_namespace failed! %s\n",
+@@ -290,7 +297,8 @@ acpi_ns_init_one_object (
+ 		ACPI_DEBUG_PRINT_RAW ((ACPI_DB_ERROR, "\n"));
+ 		ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
+ 				"Could not execute arguments for [%4.4s] (%s), %s\n",
+-				node->name.ascii, acpi_ut_get_type_name (type), acpi_format_exception (status)));
++				acpi_ut_get_node_name (node), acpi_ut_get_type_name (type),
++				acpi_format_exception (status)));
+ 	}
+ 
+ 	/* Print a dot for each object unless we are going to print the entire pathname */
+@@ -338,45 +346,48 @@ acpi_ns_init_one_device (
+ 	ACPI_FUNCTION_TRACE ("ns_init_one_device");
+ 
+ 
+-	if ((acpi_dbg_level <= ACPI_LV_ALL_EXCEPTIONS) && (!(acpi_dbg_level & ACPI_LV_INFO))) {
+-		ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INIT, "."));
+-	}
+-
+-	info->device_count++;
+-
+-	status = acpi_ut_acquire_mutex (ACPI_MTX_NAMESPACE);
+-	if (ACPI_FAILURE (status)) {
+-		return_ACPI_STATUS (status);
+-	}
+-
+ 	node = acpi_ns_map_handle_to_node (obj_handle);
+ 	if (!node) {
+-		(void) acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
+ 		return_ACPI_STATUS (AE_BAD_PARAMETER);
+ 	}
+ 
+-	status = acpi_ut_release_mutex (ACPI_MTX_NAMESPACE);
+-	if (ACPI_FAILURE (status)) {
+-		return_ACPI_STATUS (status);
++	/*
++	 * We will run _STA/_INI on Devices and Processors only
++	 */
++	if ((node->type != ACPI_TYPE_DEVICE) &&
++		(node->type != ACPI_TYPE_PROCESSOR)) {
++		return_ACPI_STATUS (AE_OK);
+ 	}
+ 
++	if ((acpi_dbg_level <= ACPI_LV_ALL_EXCEPTIONS) && (!(acpi_dbg_level & ACPI_LV_INFO))) {
++		ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INIT, "."));
++	}
++
++	info->device_count++;
++
+ 	/*
+ 	 * Run _STA to determine if we can run _INI on the device.
+ 	 */
+ 	ACPI_DEBUG_EXEC (acpi_ut_display_init_pathname (ACPI_TYPE_METHOD, node, "_STA"));
+ 	status = acpi_ut_execute_STA (node, &flags);
++
+ 	if (ACPI_FAILURE (status)) {
+-		/* Ignore error and move on to next device */
++		if (node->type == ACPI_TYPE_DEVICE) {
++			/* Ignore error and move on to next device */
+ 
+-		return_ACPI_STATUS (AE_OK);
+-	}
++			return_ACPI_STATUS (AE_OK);
++		}
+ 
+-	info->num_STA++;
++		/* _STA is not required for Processor objects */
++	}
++	else {
++		info->num_STA++;
+ 
+-	if (!(flags & 0x01)) {
+-		/* don't look at children of a not present device */
++		if (!(flags & 0x01)) {
++			/* Don't look at children of a not present device */
+ 
+-		return_ACPI_STATUS(AE_CTRL_DEPTH);
++			return_ACPI_STATUS(AE_CTRL_DEPTH);
++		}
+ 	}
+ 
+ 	/*
+--- linux-2.6.0/drivers/acpi/namespace/nsobject.c	2003-06-14 12:18:07.000000000 -0700
++++ 25/drivers/acpi/namespace/nsobject.c	2003-12-28 23:21:33.000000000 -0800
+@@ -104,7 +104,8 @@ acpi_ns_attach_object (
+ 	if (ACPI_GET_DESCRIPTOR_TYPE (node) != ACPI_DESC_TYPE_NAMED) {
+ 		/* Not a name handle */
+ 
+-		ACPI_REPORT_ERROR (("ns_attach_object: Invalid handle\n"));
++		ACPI_REPORT_ERROR (("ns_attach_object: Invalid handle %p [%s]\n",
++				node, acpi_ut_get_descriptor_name (node)));
+ 		return_ACPI_STATUS (AE_BAD_PARAMETER);
+ 	}
+ 
+@@ -151,7 +152,7 @@ acpi_ns_attach_object (
+ 	}
+ 
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Installing %p into Node %p [%4.4s]\n",
+-		obj_desc, node, node->name.ascii));
++		obj_desc, node, acpi_ut_get_node_name (node)));
+ 
+ 	/* Detach an existing attached object if present */
+ 
+@@ -234,7 +235,7 @@ acpi_ns_detach_object (
+ 	node->type = ACPI_TYPE_ANY;
+ 
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "Node %p [%4.4s] Object %p\n",
+-		node, node->name.ascii, obj_desc));
++		node, acpi_ut_get_node_name (node), obj_desc));
+ 
+ 	/* Remove one reference on the object (and all subobjects) */
+ 
+--- linux-2.6.0/drivers/acpi/namespace/nssearch.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/drivers/acpi/namespace/nssearch.c	2003-12-28 23:21:33.000000000 -0800
+@@ -119,7 +119,7 @@ acpi_ns_search_node (
+ 			ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
+ 				"Name [%4.4s] (%s) %p found in scope [%4.4s] %p\n",
+ 				(char *) &target_name, acpi_ut_get_type_name (next_node->type),
+-				next_node, node->name.ascii, node));
++				next_node, acpi_ut_get_node_name (node), node));
+ 
+ 			*return_node = next_node;
+ 			return_ACPI_STATUS (AE_OK);
+@@ -145,7 +145,7 @@ acpi_ns_search_node (
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
+ 		"Name [%4.4s] (%s) not found in search in scope [%4.4s] %p first child %p\n",
+ 		(char *) &target_name, acpi_ut_get_type_name (type),
+-		node->name.ascii, node, node->child));
++		acpi_ut_get_node_name (node), node, node->child));
+ 
+ 	return_ACPI_STATUS (AE_NOT_FOUND);
+ }
+--- linux-2.6.0/drivers/acpi/namespace/nsutils.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/drivers/acpi/namespace/nsutils.c	2003-12-28 23:21:33.000000000 -0800
+@@ -977,8 +977,8 @@ acpi_ns_find_parent_name (
+ 		parent_node = acpi_ns_get_parent_node (child_node);
+ 		if (parent_node) {
+ 			ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Parent of %p [%4.4s] is %p [%4.4s]\n",
+-				child_node, child_node->name.ascii,
+-				parent_node, parent_node->name.ascii));
++				child_node, acpi_ut_get_node_name (child_node),
++				parent_node, acpi_ut_get_node_name (parent_node)));
+ 
+ 			if (parent_node->name.integer) {
+ 				return_VALUE ((acpi_name) parent_node->name.integer);
+@@ -986,7 +986,7 @@ acpi_ns_find_parent_name (
+ 		}
+ 
+ 		ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "unable to find parent of %p (%4.4s)\n",
+-			child_node, child_node->name.ascii));
++			child_node, acpi_ut_get_node_name (child_node)));
+ 	}
+ 
+ 	return_VALUE (ACPI_UNKNOWN_NAME);
+--- linux-2.6.0/drivers/acpi/namespace/nsxfname.c	2003-06-14 12:18:03.000000000 -0700
++++ 25/drivers/acpi/namespace/nsxfname.c	2003-12-28 23:21:33.000000000 -0800
+@@ -199,7 +199,7 @@ acpi_get_name (
+ 
+ 	/* Just copy the ACPI name from the Node and zero terminate it */
+ 
+-	ACPI_STRNCPY (buffer->pointer, node->name.ascii,
++	ACPI_STRNCPY (buffer->pointer, acpi_ut_get_node_name (node),
+ 			 ACPI_NAME_SIZE);
+ 	((char *) buffer->pointer) [ACPI_NAME_SIZE] = 0;
+ 	status = AE_OK;
+--- linux-2.6.0/drivers/acpi/osl.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/acpi/osl.c	2003-12-28 23:21:45.000000000 -0800
+@@ -41,10 +41,7 @@
+ #include <acpi/acpi_bus.h>
+ #include <asm/uaccess.h>
+ 
+-#ifdef CONFIG_ACPI_EFI
+ #include <linux/efi.h>
+-u64 efi_mem_attributes (u64 phys_addr);
+-#endif
+ 
+ 
+ #define _COMPONENT		ACPI_OS_SERVICES
+@@ -140,22 +137,24 @@ acpi_os_free(void *ptr)
+ acpi_status
+ acpi_os_get_root_pointer(u32 flags, struct acpi_pointer *addr)
+ {
+-#ifdef CONFIG_ACPI_EFI
+-	addr->pointer_type = ACPI_PHYSICAL_POINTER;
+-	if (efi.acpi20)
+-		addr->pointer.physical = (acpi_physical_address) virt_to_phys(efi.acpi20);
+-	else if (efi.acpi)
+-		addr->pointer.physical = (acpi_physical_address) virt_to_phys(efi.acpi);
+-	else {
+-		printk(KERN_ERR PREFIX "System description tables not found\n");
+-		return AE_NOT_FOUND;
+-	}
+-#else
+-	if (ACPI_FAILURE(acpi_find_root_pointer(flags, addr))) {
+-		printk(KERN_ERR PREFIX "System description tables not found\n");
+-		return AE_NOT_FOUND;
++	if (efi_enabled) {
++		addr->pointer_type = ACPI_PHYSICAL_POINTER;
++		if (efi.acpi20)
++			addr->pointer.physical =
++				(acpi_physical_address) virt_to_phys(efi.acpi20);
++		else if (efi.acpi)
++			addr->pointer.physical =
++				(acpi_physical_address) virt_to_phys(efi.acpi);
++		else {
++			printk(KERN_ERR PREFIX "System description tables not found\n");
++			return AE_NOT_FOUND;
++		}
++	} else {
++		if (ACPI_FAILURE(acpi_find_root_pointer(flags, addr))) {
++			printk(KERN_ERR PREFIX "System description tables not found\n");
++			return AE_NOT_FOUND;
++		}
+ 	}
+-#endif /*CONFIG_ACPI_EFI*/
+ 
+ 	return AE_OK;
+ }
+@@ -163,22 +162,22 @@ acpi_os_get_root_pointer(u32 flags, stru
+ acpi_status
+ acpi_os_map_memory(acpi_physical_address phys, acpi_size size, void **virt)
+ {
+-#ifdef CONFIG_ACPI_EFI
+-	if (EFI_MEMORY_WB & efi_mem_attributes(phys)) {
+-		*virt = phys_to_virt(phys);
++	if (efi_enabled) {
++		if (EFI_MEMORY_WB & efi_mem_attributes(phys)) {
++			*virt = phys_to_virt(phys);
++		} else {
++			*virt = ioremap(phys, size);
++		}
+ 	} else {
+-		*virt = ioremap(phys, size);
+-	}
+-#else
+-	if (phys > ULONG_MAX) {
+-		printk(KERN_ERR PREFIX "Cannot map memory that high\n");
+-		return AE_BAD_PARAMETER;
++		if (phys > ULONG_MAX) {
++			printk(KERN_ERR PREFIX "Cannot map memory that high\n");
++			return AE_BAD_PARAMETER;
++		}
++		/*
++	 	 * ioremap checks to ensure this is in reserved space
++	 	 */
++		*virt = ioremap((unsigned long) phys, size);
+ 	}
+-	/*
+-	 * ioremap checks to ensure this is in reserved space
+-	 */
+-	*virt = ioremap((unsigned long) phys, size);
+-#endif
+ 
+ 	if (!*virt)
+ 		return AE_NO_MEMORY;
+@@ -369,19 +368,17 @@ acpi_os_read_memory(
+ {
+ 	u32			dummy;
+ 	void			*virt_addr;
+-
+-#ifdef CONFIG_ACPI_EFI
+ 	int			iomem = 0;
+ 
+-	if (EFI_MEMORY_WB & efi_mem_attributes(phys_addr)) {
++	if (efi_enabled) {
++		if (EFI_MEMORY_WB & efi_mem_attributes(phys_addr)) {
++			virt_addr = phys_to_virt(phys_addr);
++		} else {
++			iomem = 1;
++			virt_addr = ioremap(phys_addr, width);
++		}
++	} else
+ 		virt_addr = phys_to_virt(phys_addr);
+-	} else {
+-		iomem = 1;
+-		virt_addr = ioremap(phys_addr, width);
+-	}
+-#else
+-	virt_addr = phys_to_virt(phys_addr);
+-#endif
+ 	if (!value)
+ 		value = &dummy;
+ 
+@@ -399,10 +396,10 @@ acpi_os_read_memory(
+ 		BUG();
+ 	}
+ 
+-#ifdef CONFIG_ACPI_EFI
+-	if (iomem)
+-		iounmap(virt_addr);
+-#endif
++	if (efi_enabled) {
++		if (iomem)
++			iounmap(virt_addr);
++	}
+ 
+ 	return AE_OK;
+ }
+@@ -414,19 +411,17 @@ acpi_os_write_memory(
+ 	u32			width)
+ {
+ 	void			*virt_addr;
+-
+-#ifdef CONFIG_ACPI_EFI
+ 	int			iomem = 0;
+ 
+-	if (EFI_MEMORY_WB & efi_mem_attributes(phys_addr)) {
++	if (efi_enabled) {
++		if (EFI_MEMORY_WB & efi_mem_attributes(phys_addr)) {
++			virt_addr = phys_to_virt(phys_addr);
++		} else {
++			iomem = 1;
++			virt_addr = ioremap(phys_addr, width);
++		}
++	} else
+ 		virt_addr = phys_to_virt(phys_addr);
+-	} else {
+-		iomem = 1;
+-		virt_addr = ioremap(phys_addr, width);
+-	}
+-#else
+-	virt_addr = phys_to_virt(phys_addr);
+-#endif
+ 
+ 	switch (width) {
+ 	case 8:
+@@ -442,10 +437,8 @@ acpi_os_write_memory(
+ 		BUG();
+ 	}
+ 
+-#ifdef CONFIG_ACPI_EFI
+ 	if (iomem)
+ 		iounmap(virt_addr);
+-#endif
+ 
+ 	return AE_OK;
+ }
+--- linux-2.6.0/drivers/acpi/parser/psargs.c	2003-06-14 12:18:06.000000000 -0700
++++ 25/drivers/acpi/parser/psargs.c	2003-12-28 23:21:33.000000000 -0800
+@@ -490,7 +490,7 @@ union acpi_parse_object *
+ acpi_ps_get_next_field (
+ 	struct acpi_parse_state         *parser_state)
+ {
+-	u32                             aml_offset = ACPI_PTR_DIFF (parser_state->aml,
++	u32                             aml_offset = (u32) ACPI_PTR_DIFF (parser_state->aml,
+ 			 parser_state->aml_start);
+ 	union acpi_parse_object         *field;
+ 	u16                             opcode;
+@@ -677,7 +677,7 @@ acpi_ps_get_next_arg (
+ 
+ 			/* Fill in bytelist data */
+ 
+-			arg->common.value.size = ACPI_PTR_DIFF (parser_state->pkg_end,
++			arg->common.value.size = (u32) ACPI_PTR_DIFF (parser_state->pkg_end,
+ 					  parser_state->aml);
+ 			arg->named.data = parser_state->aml;
+ 
+--- linux-2.6.0/drivers/acpi/parser/psparse.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/drivers/acpi/parser/psparse.c	2003-12-28 23:21:33.000000000 -0800
+@@ -498,7 +498,7 @@ acpi_ps_parse_loop (
+ 		if (!op) {
+ 			/* Get the next opcode from the AML stream */
+ 
+-			walk_state->aml_offset = ACPI_PTR_DIFF (parser_state->aml,
++			walk_state->aml_offset = (u32) ACPI_PTR_DIFF (parser_state->aml,
+ 					   parser_state->aml_start);
+ 			walk_state->opcode   = acpi_ps_peek_opcode (parser_state);
+ 
+@@ -710,7 +710,7 @@ acpi_ps_parse_loop (
+ 
+ 				while (GET_CURRENT_ARG_TYPE (walk_state->arg_types) &&
+ 						!walk_state->arg_count) {
+-					walk_state->aml_offset = ACPI_PTR_DIFF (parser_state->aml,
++					walk_state->aml_offset = (u32) ACPI_PTR_DIFF (parser_state->aml,
+ 							   parser_state->aml_start);
+ 					status = acpi_ps_get_next_arg (walk_state, parser_state,
+ 							 GET_CURRENT_ARG_TYPE (walk_state->arg_types), &arg);
+--- linux-2.6.0/drivers/acpi/parser/psxface.c	2003-06-14 12:18:30.000000000 -0700
++++ 25/drivers/acpi/parser/psxface.c	2003-12-28 23:21:33.000000000 -0800
+@@ -127,7 +127,8 @@ acpi_psx_execute (
+ 
+ 	op = acpi_ps_create_scope_op ();
+ 	if (!op) {
+-		return_ACPI_STATUS (AE_NO_MEMORY);
++		status = AE_NO_MEMORY;
++		goto cleanup1;
+ 	}
+ 
+ 	/*
+@@ -142,20 +143,24 @@ acpi_psx_execute (
+ 	walk_state = acpi_ds_create_walk_state (obj_desc->method.owning_id,
+ 			   NULL, NULL, NULL);
+ 	if (!walk_state) {
+-		return_ACPI_STATUS (AE_NO_MEMORY);
++		status = AE_NO_MEMORY;
++		goto cleanup2;
+ 	}
+ 
+ 	status = acpi_ds_init_aml_walk (walk_state, op, method_node, obj_desc->method.aml_start,
+ 			  obj_desc->method.aml_length, NULL, NULL, 1);
+ 	if (ACPI_FAILURE (status)) {
+-		acpi_ds_delete_walk_state (walk_state);
+-		return_ACPI_STATUS (status);
++		goto cleanup3;
+ 	}
+ 
+ 	/* Parse the AML */
+ 
+ 	status = acpi_ps_parse_aml (walk_state);
+ 	acpi_ps_delete_parse_tree (op);
++	if (ACPI_FAILURE (status)) {
++		goto cleanup1; /* Walk state is already deleted */
++
++	}
+ 
+ 	/*
+ 	 * 2) Execute the method.  Performs second pass parse simultaneously
+@@ -168,7 +173,8 @@ acpi_psx_execute (
+ 
+ 	op = acpi_ps_create_scope_op ();
+ 	if (!op) {
+-		return_ACPI_STATUS (AE_NO_MEMORY);
++		status = AE_NO_MEMORY;
++		goto cleanup1;
+ 	}
+ 
+ 	/* Init new op with the method name and pointer back to the NS node */
+@@ -180,22 +186,30 @@ acpi_psx_execute (
+ 
+ 	walk_state = acpi_ds_create_walk_state (0, NULL, NULL, NULL);
+ 	if (!walk_state) {
+-		return_ACPI_STATUS (AE_NO_MEMORY);
++		status = AE_NO_MEMORY;
++		goto cleanup2;
+ 	}
+ 
+ 	status = acpi_ds_init_aml_walk (walk_state, op, method_node, obj_desc->method.aml_start,
+ 			  obj_desc->method.aml_length, params, return_obj_desc, 3);
+ 	if (ACPI_FAILURE (status)) {
+-		acpi_ds_delete_walk_state (walk_state);
+-		return_ACPI_STATUS (status);
++		goto cleanup3;
+ 	}
+ 
+ 	/*
+ 	 * The walk of the parse tree is where we actually execute the method
+ 	 */
+ 	status = acpi_ps_parse_aml (walk_state);
++	goto cleanup2; /* Walk state already deleted */
++
++
++cleanup3:
++	acpi_ds_delete_walk_state (walk_state);
++
++cleanup2:
+ 	acpi_ps_delete_parse_tree (op);
+ 
++cleanup1:
+ 	if (params) {
+ 		/* Take away the extra reference that we gave the parameters above */
+ 
+@@ -206,6 +220,10 @@ acpi_psx_execute (
+ 		}
+ 	}
+ 
++	if (ACPI_FAILURE (status)) {
++		return_ACPI_STATUS (status);
++	}
++
+ 	/*
+ 	 * If the method has returned an object, signal this to the caller with
+ 	 * a control exception code
+--- linux-2.6.0/drivers/acpi/pci_irq.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/acpi/pci_irq.c	2003-12-28 23:21:44.000000000 -0800
+@@ -237,7 +237,7 @@ acpi_pci_irq_add_prt (
+                           PCI Interrupt Routing Support
+    -------------------------------------------------------------------------- */
+ 
+-static int
++int
+ acpi_pci_irq_lookup (struct pci_bus *bus, int device, int pin)
+ {
+ 	struct acpi_prt_entry	*entry = NULL;
+--- linux-2.6.0/drivers/acpi/pci_link.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/drivers/acpi/pci_link.c	2003-12-28 23:21:33.000000000 -0800
+@@ -99,7 +99,7 @@ acpi_pci_link_check_possible (
+ 	void			*context)
+ {
+ 	struct acpi_pci_link	*link = (struct acpi_pci_link *) context;
+-	int			i = 0;
++	u32			i = 0;
+ 
+ 	ACPI_FUNCTION_TRACE("acpi_pci_link_check_possible");
+ 
+@@ -294,7 +294,10 @@ acpi_pci_link_try_get_current (
+ 
+ 	if (!link->irq.active) {
+ 		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "No active IRQ resource found\n"));
+-		printk(KERN_WARNING "_CRS returns NULL! Using IRQ %d for device (%s [%s]).\n", irq, acpi_device_name(link->device), acpi_device_bid(link->device));
++		printk(KERN_WARNING "_CRS returns NULL! Using IRQ %d for"
++			"device (%s [%s]).\n", irq,
++			acpi_device_name(link->device),
++			acpi_device_bid(link->device));
+ 		link->irq.active = irq;
+ 	}
+ 	
+@@ -429,30 +432,67 @@ retry_programming:
+                             PCI Link IRQ Management
+    -------------------------------------------------------------------------- */
+ 
+-#define ACPI_MAX_IRQS		256
+-#define ACPI_MAX_ISA_IRQ	16
+-
+ /*
+- * IRQ penalties are used to promote PCI IRQ balancing.  We set each ISA-
+- * possible IRQ (0-15) with a default penalty relative to its feasibility
+- * for PCI's use:
++ * "acpi_irq_balance" (default in APIC mode) enables ACPI to use PIC Interrupt
++ * Link Devices to move the PIRQs around to minimize sharing.
++ * 
++ * "acpi_irq_nobalance" (default in PIC mode) tells ACPI not to move any PIC IRQs
++ * that the BIOS has already set to active.  This is necessary because
++ * ACPI has no automatic means of knowing what ISA IRQs are used.  Note that
++ * if the BIOS doesn't set a Link Device active, ACPI needs to program it
++ * even if acpi_irq_nobalance is set.
++ *
++ * A tables of penalties avoids directing PCI interrupts to well known
++ * ISA IRQs. Boot params are available to over-ride the default table:
+  *
+- *   Never use:		0, 1, 2 (timer, keyboard, and cascade)
+- *   Avoid using:	13, 14, and 15 (FP error and IDE)
+- *   Penalize:		3, 4, 6, 7, 12 (known ISA uses)
++ * List interrupts that are free for PCI use.
++ * acpi_irq_pci=n[,m]
+  *
+- * Thus we're left with IRQs 5, 9, 10, 11, and everything above 15 (IO[S]APIC)
+- * as 'best bets' for PCI use.
++ * List interrupts that should not be used for PCI:
++ * acpi_irq_isa=n[,m]
++ *
++ * Note that PCI IRQ routers have a list of possible IRQs,
++ * which may not include the IRQs this table says are available.
++ * 
++ * Since this heuristic can't tell the difference between a link
++ * that no device will attach to, vs. a link which may be shared
++ * by multiple active devices -- it is not optimal.
++ *
++ * If interrupt performance is that important, get an IO-APIC system
++ * with a pin dedicated to each device.  Or for that matter, an MSI
++ * enabled system.
+  */
+ 
++#define ACPI_MAX_IRQS		256
++#define ACPI_MAX_ISA_IRQ	16
++
++#define PIRQ_PENALTY_PCI_AVAILABLE	(0)
++#define PIRQ_PENALTY_PCI_POSSIBLE	(16*16)
++#define PIRQ_PENALTY_PCI_USING		(16*16*16)
++#define PIRQ_PENALTY_ISA_TYPICAL	(16*16*16*16)
++#define PIRQ_PENALTY_ISA_USED		(16*16*16*16*16)
++#define PIRQ_PENALTY_ISA_ALWAYS		(16*16*16*16*16*16)
++
+ static int acpi_irq_penalty[ACPI_MAX_IRQS] = {
+-	1000000,  1000000,  1000000,    10000, 
+-	  10000,        0,    10000,    10000,
+-	  10000,        0,        0,        0, 
+-	  10000,   100000,   100000,   100000,
++	PIRQ_PENALTY_ISA_ALWAYS,	/* IRQ0 timer */
++	PIRQ_PENALTY_ISA_ALWAYS,	/* IRQ1 keyboard */
++	PIRQ_PENALTY_ISA_ALWAYS,	/* IRQ2 cascade */
++	PIRQ_PENALTY_ISA_TYPICAL,	/* IRQ3	serial */
++	PIRQ_PENALTY_ISA_TYPICAL,	/* IRQ4	serial */
++	PIRQ_PENALTY_ISA_TYPICAL,	/* IRQ5 sometimes SoundBlaster */
++	PIRQ_PENALTY_ISA_TYPICAL,	/* IRQ6 */
++	PIRQ_PENALTY_ISA_TYPICAL,	/* IRQ7 parallel, spurious */
++	PIRQ_PENALTY_ISA_TYPICAL,	/* IRQ8 rtc, sometimes */
++	PIRQ_PENALTY_PCI_AVAILABLE,	/* IRQ9  PCI, often acpi */
++	PIRQ_PENALTY_PCI_AVAILABLE,	/* IRQ10 PCI */
++	PIRQ_PENALTY_PCI_AVAILABLE,	/* IRQ11 PCI */
++	PIRQ_PENALTY_ISA_TYPICAL,	/* IRQ12 mouse */
++	PIRQ_PENALTY_ISA_USED,	/* IRQ13 fpe, sometimes */
++	PIRQ_PENALTY_ISA_USED,	/* IRQ14 ide0 */
++	PIRQ_PENALTY_ISA_USED,	/* IRQ15 ide1 */
++			/* >IRQ15 */
+ };
+ 
+-
+ int
+ acpi_pci_link_check (void)
+ {
+@@ -473,20 +513,30 @@ acpi_pci_link_check (void)
+ 			continue;
+ 		}
+ 
+-		if (link->irq.active)
+-			acpi_irq_penalty[link->irq.active] += 100;
+-		else if (link->irq.possible_count) {
+-			int penalty = 100 / link->irq.possible_count;
+-			for (i=0; i<link->irq.possible_count; i++) {
++		/*
++		 * reflect the possible and active irqs in the penalty table --
++		 * useful for breaking ties.
++		 */
++		if (link->irq.possible_count) {
++			int penalty = PIRQ_PENALTY_PCI_POSSIBLE / link->irq.possible_count;
++
++			for (i = 0; i < link->irq.possible_count; i++) {
+ 				if (link->irq.possible[i] < ACPI_MAX_ISA_IRQ)
+ 					acpi_irq_penalty[link->irq.possible[i]] += penalty;
+ 			}
++
++		} else if (link->irq.active) {
++			acpi_irq_penalty[link->irq.active] += PIRQ_PENALTY_PCI_POSSIBLE;
+ 		}
+ 	}
++	/* Add a penalty for the SCI */
++	acpi_irq_penalty[acpi_fadt.sci_int] += PIRQ_PENALTY_PCI_USING;
+ 
+ 	return_VALUE(0);
+ }
+ 
++static int acpi_irq_balance;	/* 0: static, 1: balance */
++
+ static int acpi_pci_link_allocate(struct acpi_pci_link* link) {
+ 	int irq;
+ 	int i;
+@@ -500,12 +550,14 @@ static int acpi_pci_link_allocate(struct
+ 		irq = link->irq.active;
+ 	} else {
+ 		irq = link->irq.possible[0];
++	}
+ 
++	if (acpi_irq_balance || !link->irq.active) {
+ 		/*
+ 		 * Select the best IRQ.  This is done in reverse to promote
+ 		 * the use of IRQs 9, 10, 11, and >15.
+ 		 */
+-		for (i=(link->irq.possible_count-1); i>0; i--) {
++		for (i = (link->irq.possible_count - 1); i >= 0; i--) {
+ 			if (acpi_irq_penalty[irq] > acpi_irq_penalty[link->irq.possible[i]])
+ 				irq = link->irq.possible[i];
+ 		}
+@@ -518,13 +570,14 @@ static int acpi_pci_link_allocate(struct
+ 			acpi_device_bid(link->device));
+ 		return_VALUE(-ENODEV);
+ 	} else {
+-		acpi_irq_penalty[link->irq.active] += 100;
++		acpi_irq_penalty[link->irq.active] += PIRQ_PENALTY_PCI_USING;
+ 		printk(PREFIX "%s [%s] enabled at IRQ %d\n", 
+ 			acpi_device_name(link->device),
+ 			acpi_device_bid(link->device), link->irq.active);
+ 	}
+ 
+ 	link->irq.setonboot = 1;
++
+ 	return_VALUE(0);
+ }
+ 
+@@ -607,9 +660,12 @@ acpi_pci_link_add (
+ 	if (result)
+ 		goto end;
+ 
++	/* query and set link->irq.active */
+ 	acpi_pci_link_get_current(link);
+ 
+-	printk(PREFIX "%s [%s] (IRQs", acpi_device_name(device), acpi_device_bid(device));
++//#ifdef CONFIG_ACPI_DEBUG
++	printk(PREFIX "%s [%s] (IRQs", acpi_device_name(device),
++		acpi_device_bid(device));
+ 	for (i = 0; i < link->irq.possible_count; i++) {
+ 		if (link->irq.active == link->irq.possible[i]) {
+ 			printk(" *%d", link->irq.possible[i]);
+@@ -619,6 +675,7 @@ acpi_pci_link_add (
+ 			printk(" %d", link->irq.possible[i]);
+ 	}
+ 	printk(")\n");
++//#endif /* CONFIG_ACPI_DEBUG */
+ 
+ 	/* TBD: Acquire/release lock */
+ 	list_add_tail(&link->node, &acpi_link.entries);
+@@ -654,6 +711,77 @@ acpi_pci_link_remove (
+ 	return_VALUE(0);
+ }
+ 
++/*
++ * modify acpi_irq_penalty[] from cmdline
++ */
++static int __init acpi_irq_penalty_update(char *str, int used)
++{
++	int i;
++
++	for (i = 0; i < 16; i++) {
++		int retval;
++		int irq;
++
++		retval = get_option(&str,&irq);
++
++		if (!retval)
++			break;	/* no number found */
++
++		if (irq < 0)
++			continue;
++		
++		if (irq >= ACPI_MAX_IRQS)
++			continue;
++
++		if (used)
++			acpi_irq_penalty[irq] += PIRQ_PENALTY_ISA_USED;
++		else
++			acpi_irq_penalty[irq] = PIRQ_PENALTY_PCI_AVAILABLE;
++
++		if (retval != 2)	/* no next number */
++			break;
++	}
++	return 1;
++}
++
++/*
++ * Over-ride default table to reserve additional IRQs for use by ISA
++ * e.g. acpi_irq_isa=5
++ * Useful for telling ACPI how not to interfere with your ISA sound card.
++ */
++static int __init acpi_irq_isa(char *str)
++{
++	return(acpi_irq_penalty_update(str, 1));
++}
++__setup("acpi_irq_isa=", acpi_irq_isa);
++
++/*
++ * Over-ride default table to free additional IRQs for use by PCI
++ * e.g. acpi_irq_pci=7,15
++ * Used for acpi_irq_balance to free up IRQs to reduce PCI IRQ sharing.
++ */
++static int __init acpi_irq_pci(char *str)
++{
++	return(acpi_irq_penalty_update(str, 0));
++}
++__setup("acpi_irq_pci=", acpi_irq_pci);
++
++static int __init acpi_irq_nobalance_set(char *str)
++{
++printk("ACPI STATIC SET\n");
++	acpi_irq_balance = 0;
++	return(1);
++}
++__setup("acpi_irq_nobalance", acpi_irq_nobalance_set);
++
++int __init acpi_irq_balance_set(char *str)
++{
++printk("ACPI BALANCE SET\n");
++	acpi_irq_balance = 1;
++	return(1);
++}
++__setup("acpi_irq_balance", acpi_irq_balance_set);
++
+ 
+ static int __init acpi_pci_link_init (void)
+ {
+--- linux-2.6.0/drivers/acpi/pci_root.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/acpi/pci_root.c	2003-12-28 23:21:33.000000000 -0800
+@@ -62,8 +62,6 @@ struct acpi_pci_root {
+ 	acpi_handle		handle;
+ 	struct acpi_pci_id	id;
+ 	struct pci_bus		*bus;
+-	u64			mem_tra;
+-	u64			io_tra;
+ };
+ 
+ static LIST_HEAD(acpi_pci_roots);
+@@ -115,97 +113,6 @@ void acpi_pci_unregister_driver(struct a
+ 	}
+ }
+ 
+-void
+-acpi_pci_get_translations (
+-	struct acpi_pci_id	*id,
+-	u64			*mem_tra,
+-	u64			*io_tra)
+-{
+-	struct list_head	*node = NULL;
+-	struct acpi_pci_root	*entry;
+-
+-	/* TBD: Locking */
+-	list_for_each(node, &acpi_pci_roots) {
+-		entry = list_entry(node, struct acpi_pci_root, node);
+-		if ((id->segment == entry->id.segment)
+-			&& (id->bus == entry->id.bus)) {
+-			*mem_tra = entry->mem_tra;
+-			*io_tra = entry->io_tra;
+-			return;
+-		}
+-	}
+-
+-	*mem_tra = 0;
+-	*io_tra = 0;
+-}
+-
+-
+-static u64
+-acpi_pci_root_bus_tra (
+-       struct acpi_resource	*resource,
+-       int			type)
+-{
+-	struct acpi_resource_address16 *address16;
+-	struct acpi_resource_address32 *address32;
+-	struct acpi_resource_address64 *address64;
+-
+-	while (1) {
+-		switch (resource->id) {
+-		case ACPI_RSTYPE_END_TAG:
+-			return 0;
+-
+-		case ACPI_RSTYPE_ADDRESS16:
+-			address16 = (struct acpi_resource_address16 *) &resource->data;
+-			if (type == address16->resource_type) {
+-				return address16->address_translation_offset;
+-			}
+-			break;
+-
+-		case ACPI_RSTYPE_ADDRESS32:
+-			address32 = (struct acpi_resource_address32 *) &resource->data;
+-			if (type == address32->resource_type) {
+-				return address32->address_translation_offset;
+-			}
+-			break;
+-
+-		case ACPI_RSTYPE_ADDRESS64:
+-			address64 = (struct acpi_resource_address64 *) &resource->data;
+-			if (type == address64->resource_type) {
+-				return address64->address_translation_offset;
+-			}
+-			break;
+-		}
+-		resource = ACPI_PTR_ADD (struct acpi_resource,
+-				resource, resource->length);
+-	}
+-
+-	return 0;
+-}
+-
+-
+-static int
+-acpi_pci_evaluate_crs (
+-	struct acpi_pci_root	*root)
+-{
+-	acpi_status		status;
+-	struct acpi_buffer	buffer = {ACPI_ALLOCATE_BUFFER, NULL};
+-
+-	ACPI_FUNCTION_TRACE("acpi_pci_evaluate_crs");
+-
+-	status = acpi_get_current_resources (root->handle, &buffer);
+-	if (ACPI_FAILURE(status))
+-		return_VALUE(-ENODEV);
+-
+-	root->io_tra = acpi_pci_root_bus_tra ((struct acpi_resource *)
+-			buffer.pointer, ACPI_IO_RANGE);
+-	root->mem_tra = acpi_pci_root_bus_tra ((struct acpi_resource *)
+-			buffer.pointer, ACPI_MEMORY_RANGE);
+-
+-	acpi_os_free(buffer.pointer);
+-	return_VALUE(0);
+-}
+-
+-
+ static int
+ acpi_pci_root_add (
+ 	struct acpi_device	*device)
+@@ -288,10 +195,8 @@ acpi_pci_root_add (
+ 	root->id.function = device->pnp.bus_address & 0xFFFF;
+ 
+ 	/*
+-	 * Evaluate _CRS to get root bridge resources
+ 	 * TBD: Need PCI interface for enumeration/configuration of roots.
+ 	 */
+- 	acpi_pci_evaluate_crs(root);
+ 
+  	/* TBD: Locking */
+  	list_add_tail(&root->node, &acpi_pci_roots);
+--- linux-2.6.0/drivers/acpi/resources/rscalc.c	2003-06-14 12:18:22.000000000 -0700
++++ 25/drivers/acpi/resources/rscalc.c	2003-12-28 23:21:33.000000000 -0800
+@@ -696,7 +696,7 @@ acpi_rs_get_list_length (
+ 		default:
+ 			/*
+ 			 * If we get here, everything is out of sync,
+-			 *  so exit with an error
++			 * exit with an error
+ 			 */
+ 			return_ACPI_STATUS (AE_AML_INVALID_RESOURCE_TYPE);
+ 		}
+@@ -704,7 +704,7 @@ acpi_rs_get_list_length (
+ 		/*
+ 		 * Update the return value and counter
+ 		 */
+-		buffer_size += ACPI_ALIGN_RESOURCE_SIZE(structure_size);
++		buffer_size += (u32) ACPI_ALIGN_RESOURCE_SIZE (structure_size);
+ 		bytes_parsed += bytes_consumed;
+ 
+ 		/*
+--- linux-2.6.0/drivers/acpi/resources/rscreate.c	2003-06-14 12:18:07.000000000 -0700
++++ 25/drivers/acpi/resources/rscreate.c	2003-12-28 23:21:33.000000000 -0800
+@@ -331,7 +331,7 @@ acpi_rs_create_pci_routing_table (
+ 
+ 		/* Now align the current length */
+ 
+-		user_prt->length = ACPI_ROUND_UP_to_64_bITS (user_prt->length);
++		user_prt->length = (u32) ACPI_ROUND_UP_to_64_bITS (user_prt->length);
+ 
+ 		/*
+ 		 * 4) Fourth subobject: Dereference the PRT.source_index
+--- linux-2.6.0/drivers/acpi/resources/rsdump.c	2003-06-14 12:18:22.000000000 -0700
++++ 25/drivers/acpi/resources/rsdump.c	2003-12-28 23:21:33.000000000 -0800
+@@ -899,24 +899,19 @@ acpi_rs_dump_address64 (
+ 			 "" : "not ");
+ 
+ 	acpi_os_printf ("  Granularity: %8.8X%8.8X\n",
+-			 ACPI_HIDWORD (address64_data->granularity),
+-			 ACPI_LODWORD (address64_data->granularity));
++			 ACPI_FORMAT_UINT64 (address64_data->granularity));
+ 
+ 	acpi_os_printf ("  Address range min: %8.8X%8.8X\n",
+-			 ACPI_HIDWORD (address64_data->min_address_range),
+-			 ACPI_HIDWORD (address64_data->min_address_range));
++			 ACPI_FORMAT_UINT64 (address64_data->min_address_range));
+ 
+ 	acpi_os_printf ("  Address range max: %8.8X%8.8X\n",
+-			 ACPI_HIDWORD (address64_data->max_address_range),
+-			 ACPI_HIDWORD (address64_data->max_address_range));
++			 ACPI_FORMAT_UINT64 (address64_data->max_address_range));
+ 
+ 	acpi_os_printf ("  Address translation offset: %8.8X%8.8X\n",
+-			 ACPI_HIDWORD (address64_data->address_translation_offset),
+-			 ACPI_HIDWORD (address64_data->address_translation_offset));
++			 ACPI_FORMAT_UINT64 (address64_data->address_translation_offset));
+ 
+ 	acpi_os_printf ("  Address Length: %8.8X%8.8X\n",
+-			 ACPI_HIDWORD (address64_data->address_length),
+-			 ACPI_HIDWORD (address64_data->address_length));
++			 ACPI_FORMAT_UINT64 (address64_data->address_length));
+ 
+ 	if(0xFF != address64_data->resource_source.index) {
+ 		acpi_os_printf ("  Resource Source Index: %X\n",
+@@ -1126,8 +1121,7 @@ acpi_rs_dump_irq_list (
+ 			acpi_os_printf ("PCI IRQ Routing Table structure %X.\n", count++);
+ 
+ 			acpi_os_printf ("  Address: %8.8X%8.8X\n",
+-					 ACPI_HIDWORD (prt_element->address),
+-					 ACPI_LODWORD (prt_element->address));
++					 ACPI_FORMAT_UINT64 (prt_element->address));
+ 
+ 			acpi_os_printf ("  Pin: %X\n", prt_element->pin);
+ 
+--- linux-2.6.0/drivers/acpi/resources/rsirq.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/acpi/resources/rsirq.c	2003-12-28 23:21:33.000000000 -0800
+@@ -132,26 +132,28 @@ acpi_rs_irq_resource (
+ 		temp8 = *buffer;
+ 
+ 		/*
+-		 * Check for HE, LL or HL
++		 * Check for HE, LL interrupts
+ 		 */
+-		if (temp8 & 0x01) {
++		switch (temp8 & 0x09) {
++		case 0x01: /* HE */
+ 			output_struct->data.irq.edge_level = ACPI_EDGE_SENSITIVE;
+ 			output_struct->data.irq.active_high_low = ACPI_ACTIVE_HIGH;
+-		}
+-		else {
+-			if (temp8 & 0x8) {
+-				output_struct->data.irq.edge_level = ACPI_LEVEL_SENSITIVE;
+-				output_struct->data.irq.active_high_low = ACPI_ACTIVE_LOW;
+-			}
+-			else {
+-				/*
+-				 * Only _LL and _HE polarity/trigger interrupts
+-				 * are allowed (ACPI spec v1.0b ection 6.4.2.1),
+-				 * so an error will occur if we reach this point
+-				 */
+-				ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "Invalid interrupt polarity/trigger in resource list\n"));
+-				return_ACPI_STATUS (AE_BAD_DATA);
+-			}
++			break;
++
++		case 0x08: /* LL */
++			output_struct->data.irq.edge_level = ACPI_LEVEL_SENSITIVE;
++			output_struct->data.irq.active_high_low = ACPI_ACTIVE_LOW;
++			break;
++
++		default:
++			/*
++			 * Only _LL and _HE polarity/trigger interrupts
++			 * are allowed (ACPI spec, section "IRQ Format")
++			 * so 0x00 and 0x09 are illegal.
++			 */
++			ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
++				"Invalid interrupt polarity/trigger in resource list, %X\n", temp8));
++			return_ACPI_STATUS (AE_BAD_DATA);
+ 		}
+ 
+ 		/*
+@@ -419,7 +421,7 @@ acpi_rs_extended_irq_resource (
+ 		 * Point the String pointer to the end of this structure.
+ 		 */
+ 		output_struct->data.extended_irq.resource_source.string_ptr =
+-				(char *)(output_struct + struct_size);
++				(char *)((char *) output_struct + struct_size);
+ 
+ 		temp_ptr = (u8 *) output_struct->data.extended_irq.resource_source.string_ptr;
+ 
+--- linux-2.6.0/drivers/acpi/resources/rslist.c	2003-06-14 12:18:51.000000000 -0700
++++ 25/drivers/acpi/resources/rslist.c	2003-12-28 23:21:33.000000000 -0800
+@@ -312,8 +312,8 @@ acpi_rs_byte_stream_to_list (
+ 		 * Set the Buffer to the next structure
+ 		 */
+ 		resource = ACPI_CAST_PTR (struct acpi_resource, buffer);
+-		resource->length = ACPI_ALIGN_RESOURCE_SIZE(resource->length);
+-		buffer += ACPI_ALIGN_RESOURCE_SIZE(structure_size);
++		resource->length = (u32) ACPI_ALIGN_RESOURCE_SIZE (resource->length);
++		buffer += ACPI_ALIGN_RESOURCE_SIZE (structure_size);
+ 
+ 	} /*  end while */
+ 
+--- linux-2.6.0/drivers/acpi/scan.c	2003-06-14 12:18:08.000000000 -0700
++++ 25/drivers/acpi/scan.c	2003-12-28 23:21:33.000000000 -0800
+@@ -336,6 +336,9 @@ acpi_bus_register_driver (
+ 
+ 	ACPI_FUNCTION_TRACE("acpi_bus_register_driver");
+ 
++	if (acpi_disabled)
++		return_VALUE(-ENODEV);
++
+ 	if (driver) {
+ 		spin_lock(&acpi_device_lock);
+ 		list_add_tail(&driver->node, &acpi_bus_drivers);
+--- linux-2.6.0/drivers/acpi/sleep/proc.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/acpi/sleep/proc.c	2003-12-28 23:21:33.000000000 -0800
+@@ -374,6 +374,9 @@ static int acpi_sleep_proc_init(void)
+ {
+ 	struct proc_dir_entry	*entry = NULL;
+ 
++	if (acpi_disabled)
++		return 0;
++ 
+ 	/* 'sleep' [R/W]*/
+ 	entry = create_proc_entry(ACPI_SYSTEM_FILE_SLEEP,
+ 				  S_IFREG|S_IRUGO|S_IWUSR, acpi_root_dir);
+--- linux-2.6.0/drivers/acpi/tables.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/drivers/acpi/tables.c	2003-12-28 23:21:33.000000000 -0800
+@@ -60,6 +60,9 @@ static char *acpi_table_signatures[ACPI_
+ 	[ACPI_HPET]		= "HPET",
+ };
+ 
++static char *mps_inti_flags_polarity[] = { "dfl", "high", "res", "low" };
++static char *mps_inti_flags_trigger[] = { "dfl", "edge", "res", "level" };
++
+ /* System Description Table (RSDT/XSDT) */
+ struct acpi_table_sdt {
+ 	unsigned long		pa;
+@@ -136,8 +139,14 @@ acpi_table_print_madt_entry (
+ 	{
+ 		struct acpi_table_int_src_ovr *p =
+ 			(struct acpi_table_int_src_ovr*) header;
+-		printk(KERN_INFO PREFIX "INT_SRC_OVR (bus[%d] irq[0x%x] global_irq[0x%x] polarity[0x%x] trigger[0x%x])\n",
+-			p->bus, p->bus_irq, p->global_irq, p->flags.polarity, p->flags.trigger);
++		printk(KERN_INFO PREFIX "INT_SRC_OVR (bus %d bus_irq %d global_irq %d %s %s)\n",
++			p->bus, p->bus_irq, p->global_irq,
++			mps_inti_flags_polarity[p->flags.polarity],
++			mps_inti_flags_trigger[p->flags.trigger]);
++		if(p->flags.reserved)
++			printk(KERN_INFO PREFIX "INT_SRC_OVR unexpected reserved flags: 0x%x\n",
++				p->flags.reserved);
++
+ 	}
+ 		break;
+ 
+@@ -145,8 +154,9 @@ acpi_table_print_madt_entry (
+ 	{
+ 		struct acpi_table_nmi_src *p =
+ 			(struct acpi_table_nmi_src*) header;
+-		printk(KERN_INFO PREFIX "NMI_SRC (polarity[0x%x] trigger[0x%x] global_irq[0x%x])\n",
+-			p->flags.polarity, p->flags.trigger, p->global_irq);
++		printk(KERN_INFO PREFIX "NMI_SRC (%s %s global_irq %d)\n",
++			mps_inti_flags_polarity[p->flags.polarity],
++			mps_inti_flags_trigger[p->flags.trigger], p->global_irq);
+ 	}
+ 		break;
+ 
+@@ -154,8 +164,10 @@ acpi_table_print_madt_entry (
+ 	{
+ 		struct acpi_table_lapic_nmi *p =
+ 			(struct acpi_table_lapic_nmi*) header;
+-		printk(KERN_INFO PREFIX "LAPIC_NMI (acpi_id[0x%02x] polarity[0x%x] trigger[0x%x] lint[0x%x])\n",
+-			p->acpi_id, p->flags.polarity, p->flags.trigger, p->lint);
++		printk(KERN_INFO PREFIX "LAPIC_NMI (acpi_id[0x%02x] %s %s lint[0x%x])\n",
++			p->acpi_id,
++			mps_inti_flags_polarity[p->flags.polarity],
++			mps_inti_flags_trigger[p->flags.trigger], p->lint);
+ 	}
+ 		break;
+ 
+@@ -190,8 +202,10 @@ acpi_table_print_madt_entry (
+ 	{
+ 		struct acpi_table_plat_int_src *p =
+ 			(struct acpi_table_plat_int_src*) header;
+-		printk(KERN_INFO PREFIX "PLAT_INT_SRC (polarity[0x%x] trigger[0x%x] type[0x%x] id[0x%04x] eid[0x%x] iosapic_vector[0x%x] global_irq[0x%x]\n",
+-			p->flags.polarity, p->flags.trigger, p->type, p->id, p->eid, p->iosapic_vector, p->global_irq);
++		printk(KERN_INFO PREFIX "PLAT_INT_SRC (%s %s type[0x%x] id[0x%04x] eid[0x%x] iosapic_vector[0x%x] global_irq[0x%x]\n",
++			mps_inti_flags_polarity[p->flags.polarity],
++			mps_inti_flags_trigger[p->flags.trigger],
++			p->type, p->id, p->eid, p->iosapic_vector, p->global_irq);
+ 	}
+ 		break;
+ 
+--- linux-2.6.0/drivers/acpi/tables/tbgetall.c	2003-06-14 12:18:29.000000000 -0700
++++ 25/drivers/acpi/tables/tbgetall.c	2003-12-28 23:21:33.000000000 -0800
+@@ -240,8 +240,7 @@ acpi_tb_get_required_tables (
+ 		if ((status != AE_OK) && (status != AE_TABLE_NOT_SUPPORTED)) {
+ 			ACPI_REPORT_WARNING (("%s, while getting table at %8.8X%8.8X\n",
+ 				acpi_format_exception (status),
+-				ACPI_HIDWORD (address.pointer.value),
+-				ACPI_LODWORD (address.pointer.value)));
++				ACPI_FORMAT_UINT64 (address.pointer.value)));
+ 		}
+ 	}
+ 
+--- linux-2.6.0/drivers/acpi/tables/tbget.c	2003-07-27 12:14:38.000000000 -0700
++++ 25/drivers/acpi/tables/tbget.c	2003-12-28 23:21:33.000000000 -0800
+@@ -148,8 +148,7 @@ acpi_tb_get_table_header (
+ 				  (void *) &header);
+ 		if (ACPI_FAILURE (status)) {
+ 			ACPI_REPORT_ERROR (("Could not map memory at %8.8X%8.8X for length %X\n",
+-				ACPI_HIDWORD (address->pointer.physical),
+-				ACPI_LODWORD (address->pointer.physical),
++				ACPI_FORMAT_UINT64 (address->pointer.physical),
+ 				sizeof (struct acpi_table_header)));
+ 			return_ACPI_STATUS (status);
+ 		}
+@@ -365,8 +364,7 @@ acpi_tb_get_this_table (
+ 		if (ACPI_FAILURE (status)) {
+ 			ACPI_REPORT_ERROR (("Could not map memory for table [%4.4s] at %8.8X%8.8X for length %X\n",
+ 				header->signature,
+-				ACPI_HIDWORD (address->pointer.physical),
+-				ACPI_LODWORD (address->pointer.physical), header->length));
++				ACPI_FORMAT_UINT64 (address->pointer.physical), header->length));
+ 			return (status);
+ 		}
+ 
+@@ -408,8 +406,7 @@ acpi_tb_get_this_table (
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
+ 		"Found table [%4.4s] at %8.8X%8.8X, mapped/copied to %p\n",
+ 		full_table->signature,
+-		ACPI_HIDWORD (address->pointer.physical),
+-		ACPI_LODWORD (address->pointer.physical), full_table));
++		ACPI_FORMAT_UINT64 (address->pointer.physical), full_table));
+ 
+ 	return_ACPI_STATUS (status);
+ }
+@@ -458,6 +455,7 @@ acpi_tb_get_table_ptr (
+ 	if (instance == 1) {
+ 		/* Get the first */
+ 
++		*table_ptr_loc = NULL;
+ 		if (acpi_gbl_table_lists[table_type].next) {
+ 			*table_ptr_loc = acpi_gbl_table_lists[table_type].next->pointer;
+ 		}
+--- linux-2.6.0/drivers/acpi/tables/tbrsdt.c	2003-07-27 12:14:38.000000000 -0700
++++ 25/drivers/acpi/tables/tbrsdt.c	2003-12-28 23:21:33.000000000 -0800
+@@ -278,8 +278,7 @@ acpi_tb_get_table_rsdt (
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
+ 		"RSDP located at %p, points to RSDT physical=%8.8X%8.8X \n",
+ 		acpi_gbl_RSDP,
+-		ACPI_HIDWORD (address.pointer.value),
+-		ACPI_LODWORD (address.pointer.value)));
++		ACPI_FORMAT_UINT64 (address.pointer.value)));
+ 
+ 	/* Check the RSDT or XSDT signature */
+ 
+--- linux-2.6.0/drivers/acpi/tables/tbxface.c	2003-06-14 12:18:33.000000000 -0700
++++ 25/drivers/acpi/tables/tbxface.c	2003-12-28 23:21:33.000000000 -0800
+@@ -251,7 +251,7 @@ acpi_unload_table (
+ 	/* Find all tables of the requested type */
+ 
+ 	table_desc = acpi_gbl_table_lists[table_type].next;
+-	while (table_desc); {
++	while (table_desc) {
+ 		/*
+ 		 * Delete all namespace entries owned by this table.  Note that these
+ 		 * entries can appear anywhere in the namespace by virtue of the AML
+--- linux-2.6.0/drivers/acpi/tables/tbxfroot.c	2003-07-27 12:14:38.000000000 -0700
++++ 25/drivers/acpi/tables/tbxfroot.c	2003-12-28 23:21:33.000000000 -0800
+@@ -211,8 +211,7 @@ acpi_get_firmware_table (
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
+ 		"RSDP located at %p, RSDT physical=%8.8X%8.8X \n",
+ 		acpi_gbl_RSDP,
+-		ACPI_HIDWORD (address.pointer.value),
+-		ACPI_LODWORD (address.pointer.value)));
++		ACPI_FORMAT_UINT64 (address.pointer.value)));
+ 
+ 	/* Insert processor_mode flags */
+ 
+--- linux-2.6.0/drivers/acpi/thermal.c	2003-07-27 12:14:38.000000000 -0700
++++ 25/drivers/acpi/thermal.c	2003-12-28 23:21:33.000000000 -0800
+@@ -467,6 +467,7 @@ acpi_thermal_critical (
+ 	if (result)
+ 		return_VALUE(result);
+ 
++	printk(KERN_EMERG "Critical temperature reached (%ld C), shutting down.\n", KELVIN_TO_CELSIUS(tz->temperature));
+ 	acpi_bus_generate_event(device, ACPI_THERMAL_NOTIFY_CRITICAL, tz->trips.critical.flags.enabled);
+ 
+ 	acpi_thermal_call_usermode(ACPI_THERMAL_PATH_POWEROFF);
+--- linux-2.6.0/drivers/acpi/utilities/utalloc.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/acpi/utilities/utalloc.c	2003-12-28 23:21:33.000000000 -0800
+@@ -902,71 +902,30 @@ acpi_ut_dump_allocations (
+ 
+ 			descriptor = ACPI_CAST_PTR (union acpi_descriptor, &element->user_space);
+ 			if (descriptor->descriptor_id != ACPI_DESC_TYPE_CACHED) {
+-				acpi_os_printf ("%p Len %04X %9.9s-%d ",
++				acpi_os_printf ("%p Len %04X %9.9s-%d [%s] ",
+ 						 descriptor, element->size, element->module,
+-						 element->line);
++						 element->line, acpi_ut_get_descriptor_name (descriptor));
+ 
+-				/* Most of the elements will be internal objects. */
++				/* Most of the elements will be Operand objects. */
+ 
+ 				switch (ACPI_GET_DESCRIPTOR_TYPE (descriptor)) {
+ 				case ACPI_DESC_TYPE_OPERAND:
+-					acpi_os_printf ("obj_type %12.12s R%hd",
++					acpi_os_printf ("%12.12s R%hd",
+ 							acpi_ut_get_type_name (descriptor->object.common.type),
+ 							descriptor->object.common.reference_count);
+ 					break;
+ 
+ 				case ACPI_DESC_TYPE_PARSER:
+-					acpi_os_printf ("parse_obj aml_opcode %04hX",
++					acpi_os_printf ("aml_opcode %04hX",
+ 							descriptor->op.asl.aml_opcode);
+ 					break;
+ 
+ 				case ACPI_DESC_TYPE_NAMED:
+-					acpi_os_printf ("Node %4.4s",
+-							descriptor->node.name.ascii);
+-					break;
+-
+-				case ACPI_DESC_TYPE_STATE:
+-					acpi_os_printf ("Untyped state_obj");
+-					break;
+-
+-				case ACPI_DESC_TYPE_STATE_UPDATE:
+-					acpi_os_printf ("UPDATE state_obj");
+-					break;
+-
+-				case ACPI_DESC_TYPE_STATE_PACKAGE:
+-					acpi_os_printf ("PACKAGE state_obj");
+-					break;
+-
+-				case ACPI_DESC_TYPE_STATE_CONTROL:
+-					acpi_os_printf ("CONTROL state_obj");
+-					break;
+-
+-				case ACPI_DESC_TYPE_STATE_RPSCOPE:
+-					acpi_os_printf ("ROOT-PARSE-SCOPE state_obj");
+-					break;
+-
+-				case ACPI_DESC_TYPE_STATE_PSCOPE:
+-					acpi_os_printf ("PARSE-SCOPE state_obj");
+-					break;
+-
+-				case ACPI_DESC_TYPE_STATE_WSCOPE:
+-					acpi_os_printf ("WALK-SCOPE state_obj");
+-					break;
+-
+-				case ACPI_DESC_TYPE_STATE_RESULT:
+-					acpi_os_printf ("RESULT state_obj");
+-					break;
+-
+-				case ACPI_DESC_TYPE_STATE_NOTIFY:
+-					acpi_os_printf ("NOTIFY state_obj");
+-					break;
+-
+-				case ACPI_DESC_TYPE_STATE_THREAD:
+-					acpi_os_printf ("THREAD state_obj");
++					acpi_os_printf ("%4.4s",
++							acpi_ut_get_node_name (&descriptor->node));
+ 					break;
+ 
+ 				default:
+-					/* All types should appear above */
+ 					break;
+ 				}
+ 
+--- linux-2.6.0/drivers/acpi/utilities/utdebug.c	2003-06-14 12:18:24.000000000 -0700
++++ 25/drivers/acpi/utilities/utdebug.c	2003-12-28 23:21:33.000000000 -0800
+@@ -447,7 +447,7 @@ acpi_ut_value_exit (
+ 
+ 	acpi_ut_debug_print (ACPI_LV_FUNCTIONS, line_number, dbg_info,
+ 			"%s %8.8X%8.8X\n", acpi_gbl_fn_exit_str,
+-			ACPI_HIDWORD (value), ACPI_LODWORD (value));
++			ACPI_FORMAT_UINT64 (value));
+ 
+ 	acpi_gbl_nesting_level--;
+ }
+--- linux-2.6.0/drivers/acpi/utilities/utdelete.c	2003-10-25 14:45:44.000000000 -0700
++++ 25/drivers/acpi/utilities/utdelete.c	2003-12-28 23:21:33.000000000 -0800
+@@ -140,7 +140,7 @@ acpi_ut_delete_internal_obj (
+ 
+ 		/* Walk the handler list for this device */
+ 
+-		handler_desc = object->device.address_space;
++		handler_desc = object->device.handler;
+ 		while (handler_desc) {
+ 			next_desc = handler_desc->address_space.next;
+ 			acpi_ut_remove_reference (handler_desc);
+@@ -193,7 +193,7 @@ acpi_ut_delete_internal_obj (
+ 			 * default handlers -- and therefore, we created the context object
+ 			 * locally, it was not created by an external caller.
+ 			 */
+-			handler_desc = object->region.address_space;
++			handler_desc = object->region.handler;
+ 			if (handler_desc) {
+ 				if (handler_desc->address_space.hflags & ACPI_ADDR_HANDLER_DEFAULT_INSTALLED) {
+ 					obj_pointer = second_desc->extra.region_context;
+--- linux-2.6.0/drivers/acpi/utilities/uteval.c	2003-06-14 12:17:57.000000000 -0700
++++ 25/drivers/acpi/utilities/uteval.c	2003-12-28 23:21:33.000000000 -0800
+@@ -91,7 +91,7 @@ acpi_ut_evaluate_object (
+ 	if (ACPI_FAILURE (status)) {
+ 		if (status == AE_NOT_FOUND) {
+ 			ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "[%4.4s.%s] was not found\n",
+-				prefix_node->name.ascii, path));
++				acpi_ut_get_node_name (prefix_node), path));
+ 		}
+ 		else {
+ 			ACPI_REPORT_METHOD_ERROR ("Method execution failed",
+@@ -544,7 +544,7 @@ acpi_ut_execute_STA (
+ 		if (AE_NOT_FOUND == status) {
+ 			ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
+ 				"_STA on %4.4s was not found, assuming device is present\n",
+-				device_node->name.ascii));
++				acpi_ut_get_node_name (device_node)));
+ 
+ 			*flags = 0x0F;
+ 			status = AE_OK;
+--- linux-2.6.0/drivers/acpi/utilities/utglobal.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/acpi/utilities/utglobal.c	2003-12-28 23:21:33.000000000 -0800
+@@ -358,7 +358,7 @@ struct acpi_fixed_event_info        acpi
+ 	/* ACPI_EVENT_GLOBAL        */  {ACPI_BITREG_GLOBAL_LOCK_STATUS,    ACPI_BITREG_GLOBAL_LOCK_ENABLE,  ACPI_BITMASK_GLOBAL_LOCK_STATUS,    ACPI_BITMASK_GLOBAL_LOCK_ENABLE},
+ 	/* ACPI_EVENT_POWER_BUTTON  */  {ACPI_BITREG_POWER_BUTTON_STATUS,   ACPI_BITREG_POWER_BUTTON_ENABLE, ACPI_BITMASK_POWER_BUTTON_STATUS,   ACPI_BITMASK_POWER_BUTTON_ENABLE},
+ 	/* ACPI_EVENT_SLEEP_BUTTON  */  {ACPI_BITREG_SLEEP_BUTTON_STATUS,   ACPI_BITREG_SLEEP_BUTTON_ENABLE, ACPI_BITMASK_SLEEP_BUTTON_STATUS,   ACPI_BITMASK_SLEEP_BUTTON_ENABLE},
+-	/* ACPI_EVENT_RTC           */  {ACPI_BITREG_RT_CLOCK_STATUS,       ACPI_BITREG_RT_CLOCK_ENABLE,     0,                                  0},
++	/* ACPI_EVENT_RTC           */  {ACPI_BITREG_RT_CLOCK_STATUS,       ACPI_BITREG_RT_CLOCK_ENABLE,     ACPI_BITMASK_RT_CLOCK_STATUS,       ACPI_BITMASK_RT_CLOCK_ENABLE},
+ };
+ 
+ /*****************************************************************************
+@@ -534,6 +534,99 @@ acpi_ut_get_object_type_name (
+ }
+ 
+ 
++/*****************************************************************************
++ *
++ * FUNCTION:    acpi_ut_get_node_name
++ *
++ * PARAMETERS:  Object               - A namespace node
++ *
++ * RETURN:      Pointer to a string
++ *
++ * DESCRIPTION: Validate the node and return the node's ACPI name.
++ *
++ ****************************************************************************/
++
++char *
++acpi_ut_get_node_name (
++	void                            *object)
++{
++	struct acpi_namespace_node      *node;
++
++
++	if (!object)
++	{
++		return ("NULL NODE");
++	}
++
++	node = (struct acpi_namespace_node *) object;
++
++	if (node->descriptor != ACPI_DESC_TYPE_NAMED)
++	{
++		return ("****");
++	}
++
++	if (!acpi_ut_valid_acpi_name (* (u32 *) node->name.ascii))
++	{
++		return ("----");
++	}
++
++	return (node->name.ascii);
++}
++
++
++/*****************************************************************************
++ *
++ * FUNCTION:    acpi_ut_get_descriptor_name
++ *
++ * PARAMETERS:  Object               - An ACPI object
++ *
++ * RETURN:      Pointer to a string
++ *
++ * DESCRIPTION: Validate object and return the descriptor type
++ *
++ ****************************************************************************/
++
++static const char                   *acpi_gbl_desc_type_names[] = /* printable names of descriptor types */
++{
++	/* 00 */ "Invalid",
++	/* 01 */ "Cached",
++	/* 02 */ "State-Generic",
++	/* 03 */ "State-Update",
++	/* 04 */ "State-Package",
++	/* 05 */ "State-Control",
++	/* 06 */ "State-root_parse_scope",
++	/* 07 */ "State-parse_scope",
++	/* 08 */ "State-walk_scope",
++	/* 09 */ "State-Result",
++	/* 10 */ "State-Notify",
++	/* 11 */ "State-Thread",
++	/* 12 */ "Walk",
++	/* 13 */ "Parser",
++	/* 14 */ "Operand",
++	/* 15 */ "Node"
++};
++
++
++char *
++acpi_ut_get_descriptor_name (
++	void                            *object)
++{
++
++	if (!object)
++	{
++		return ("NULL OBJECT");
++	}
++
++	if (ACPI_GET_DESCRIPTOR_TYPE (object) > ACPI_DESC_TYPE_MAX)
++	{
++		return ((char *) acpi_gbl_bad_type);
++	}
++
++	return ((char *) acpi_gbl_desc_type_names[ACPI_GET_DESCRIPTOR_TYPE (object)]);
++
++}
++
++
+ #if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
+ /*
+  * Strings and procedures used for debug only
+--- linux-2.6.0/drivers/acpi/utilities/utobject.c	2003-06-14 12:18:24.000000000 -0700
++++ 25/drivers/acpi/utilities/utobject.c	2003-12-28 23:21:33.000000000 -0800
+@@ -223,29 +223,10 @@ acpi_ut_valid_internal_object (
+ 
+ 		return (TRUE);
+ 
+-	case ACPI_DESC_TYPE_NAMED:
+-
+-		ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
+-			"**** Obj %p is a named obj, not ACPI obj\n", object));
+-		break;
+-
+-	case ACPI_DESC_TYPE_PARSER:
+-
+-		ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
+-			"**** Obj %p is a parser obj, not ACPI obj\n", object));
+-		break;
+-
+-	case ACPI_DESC_TYPE_CACHED:
+-
+-		ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
+-			"**** Obj %p has already been released to internal cache\n", object));
+-		break;
+-
+ 	default:
+-
+-		ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
+-			"**** Obj %p has unknown descriptor type %X\n", object,
+-			ACPI_GET_DESCRIPTOR_TYPE (object)));
++		ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
++				"%p is not not an ACPI operand obj [%s]\n",
++				object, acpi_ut_get_descriptor_name (object)));
+ 		break;
+ 	}
+ 
+@@ -322,7 +303,8 @@ acpi_ut_delete_object_desc (
+ 
+ 	if (ACPI_GET_DESCRIPTOR_TYPE (object) != ACPI_DESC_TYPE_OPERAND) {
+ 		ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
+-			"Obj %p is not an ACPI object\n", object));
++				"%p is not an ACPI Operand object [%s]\n", object,
++				acpi_ut_get_descriptor_name (object)));
+ 		return_VOID;
+ 	}
+ 
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/base/class_simple.c	2003-12-28 23:22:59.000000000 -0800
+@@ -0,0 +1,123 @@
++/*
++ * class_simple.c - basic char device support
++ *
++ * Copyright (c) 2003 Greg Kroah-Hartman <greg@kroah.com>
++ * Copyright (c) 2003 IBM Corp.
++ *
++ * This file is released under the GPLv2
++ *
++ */
++
++#undef DEBUG
++
++#include <linux/device.h>
++#include <linux/kdev_t.h>
++#include <linux/err.h>
++
++struct simple_dev {
++	struct list_head node;
++	dev_t dev;
++	struct class_device class_dev;
++};
++#define to_simple_dev(d) container_of(d, struct simple_dev, class_dev)
++
++static LIST_HEAD(simple_dev_list);
++static spinlock_t simple_dev_list_lock = SPIN_LOCK_UNLOCKED;
++
++static void release_simple_dev(struct class_device *class_dev)
++{
++	struct simple_dev *s_dev = to_simple_dev(class_dev);
++	kfree(s_dev);
++}
++
++static ssize_t show_dev(struct class_device *class_dev, char *buf)
++{
++	struct simple_dev *s_dev = to_simple_dev(class_dev);
++	return print_dev_t(buf, s_dev->dev);
++}
++static CLASS_DEVICE_ATTR(dev, S_IRUGO, show_dev, NULL);
++
++/**
++ * simple_add_class_device - adds a class device to sysfs for a character driver
++ * @class: pointer to the struct class that this device should be registered to.
++ * @dev: the dev_t for the device to be added.
++ * @device: a pointer to a struct device that is assiociated with this class device.
++ * @fmt: string for the class device's name
++ *
++ * This function can be used by simple char device classes that do not
++ * implement their own class device registration.  A struct class_device will
++ * be created in sysfs, registered to the specified class.  A "dev" file will
++ * be created, showing the dev_t for the device.  The pointer to the struct
++ * class_device will be returned from the call.  Any further sysfs files that
++ * might be required can be created using this pointer.
++ * Note: the struct class passed to this function must have previously been
++ * registered with a call to register_class().
++ */
++struct class_device *simple_add_class_device(struct class *class, dev_t dev, struct device *device, const char *fmt, ...)
++{
++	va_list args;
++	struct simple_dev *s_dev;
++	int retval;
++
++	s_dev = kmalloc(sizeof(*s_dev), GFP_KERNEL);
++	if (!s_dev) {
++		retval = -ENOMEM;
++		goto error;
++	}
++	memset(s_dev, 0x00, sizeof(*s_dev));
++
++	class->release = &release_simple_dev;
++	s_dev->dev = dev;
++	s_dev->class_dev.dev = device;
++	s_dev->class_dev.class = class;
++
++	va_start(args,fmt);
++	vsnprintf(s_dev->class_dev.class_id, BUS_ID_SIZE, fmt, args);
++	va_end(args);
++	retval = class_device_register(&s_dev->class_dev);
++	if (retval)
++		goto error;
++	class_device_create_file(&s_dev->class_dev, &class_device_attr_dev);
++	spin_lock(&simple_dev_list_lock);
++	list_add(&s_dev->node, &simple_dev_list);
++	spin_unlock(&simple_dev_list_lock);
++
++	return &s_dev->class_dev;
++
++error:
++	kfree(s_dev);
++	return ERR_PTR(retval);
++}
++EXPORT_SYMBOL(simple_add_class_device);
++
++/**
++ * simple_remove_class_device - removes a class device that was created with simple_add_class_device()
++ * @dev: the dev_t of the device that was previously registered.
++ *
++ * This call unregisters and cleans up a class device that was created with a
++ * call to simple_add_class_device()
++ */
++void simple_remove_class_device(dev_t dev)
++{
++	struct simple_dev *s_dev = NULL;
++	struct list_head *tmp;
++	int found = 0;
++
++	spin_lock(&simple_dev_list_lock);
++	list_for_each(tmp, &simple_dev_list) {
++		s_dev = list_entry(tmp, struct simple_dev, node);
++		if (s_dev->dev == dev) {
++			found = 1;
++			break;
++		}
++	}
++	if (found) {
++		list_del(&s_dev->node);
++		spin_unlock(&simple_dev_list_lock);
++		class_device_unregister(&s_dev->class_dev);
++	} else {
++		spin_unlock(&simple_dev_list_lock);
++	}
++}
++EXPORT_SYMBOL(simple_remove_class_device);
++
+--- linux-2.6.0/drivers/base/firmware_class.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/base/firmware_class.c	2003-12-28 23:22:41.000000000 -0800
+@@ -415,18 +415,22 @@ struct firmware_work {
+ 	void (*cont)(const struct firmware *fw, void *context);
+ };
+ 
+-static void
++static int
+ request_firmware_work_func(void *arg)
+ {
+ 	struct firmware_work *fw_work = arg;
+ 	const struct firmware *fw;
+-	if (!arg)
+-		return;
++	if (!arg) {
++		WARN_ON(1);
++		return 0;
++	}
++	daemonize("%s/%s", "firmware", fw_work->name);
+ 	request_firmware(&fw, fw_work->name, fw_work->device);
+ 	fw_work->cont(fw, fw_work->context);
+ 	release_firmware(fw);
+ 	module_put(fw_work->module);
+ 	kfree(fw_work);
++	return 0;
+ }
+ 
+ /**
+@@ -451,6 +455,8 @@ request_firmware_nowait(
+ {
+ 	struct firmware_work *fw_work = kmalloc(sizeof (struct firmware_work),
+ 						GFP_ATOMIC);
++	int ret;
++
+ 	if (!fw_work)
+ 		return -ENOMEM;
+ 	if (!try_module_get(module)) {
+@@ -465,9 +471,14 @@ request_firmware_nowait(
+ 		.context = context,
+ 		.cont = cont,
+ 	};
+-	INIT_WORK(&fw_work->work, request_firmware_work_func, fw_work);
+ 
+-	schedule_work(&fw_work->work);
++	ret = kernel_thread(request_firmware_work_func, fw_work,
++			    CLONE_FS | CLONE_FILES);
++	
++	if (ret < 0) {
++		fw_work->cont(NULL, fw_work->context);
++		return ret;
++	}
+ 	return 0;
+ }
+ 
+--- linux-2.6.0/drivers/base/Makefile	2003-08-22 19:23:40.000000000 -0700
++++ 25/drivers/base/Makefile	2003-12-28 23:22:59.000000000 -0800
+@@ -1,7 +1,7 @@
+ # Makefile for the Linux device tree
+ 
+ obj-y			:= core.o sys.o interface.o bus.o \
+-			   driver.o class.o platform.o \
++			   driver.o class.o class_simple.o platform.o \
+ 			   cpu.o firmware.o init.o map.o
+ obj-y			+= power/
+ obj-$(CONFIG_FW_LOADER)	+= firmware_class.o
+--- linux-2.6.0/drivers/base/node.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/drivers/base/node.c	2003-12-28 23:22:10.000000000 -0800
+@@ -18,18 +18,16 @@ static struct sysdev_class node_class = 
+ static ssize_t node_read_cpumap(struct sys_device * dev, char * buf)
+ {
+ 	struct node *node_dev = to_node(dev);
+-	cpumask_t tmp = node_dev->cpumap;
+-	int k, len = 0;
++	cpumask_t mask = node_dev->cpumap;
++	int len;
+ 
+-	for (k = 0; k < sizeof(cpumask_t)/sizeof(u16); ++k) {
+-		int j = sprintf(buf, "%04hx", (u16)cpus_coerce(tmp));
+-		len += j;
+-		buf += j;
+-		cpus_shift_right(tmp, tmp, 16);
+-	}
+-        len += sprintf(buf, "\n");
++	/* FIXME - someone should pass us a buffer size (count) or
++	 * use seq_file or something to avoid buffer overrun risk. */
++	len = cpumask_snprintf(buf, 99 /* XXX FIXME */, mask);
++	len += sprintf(buf + len, "\n");
+ 	return len;
+ }
++
+ static SYSDEV_ATTR(cpumap,S_IRUGO,node_read_cpumap,NULL);
+ 
+ #define K(x) ((x) << (PAGE_SHIFT - 10))
+--- linux-2.6.0/drivers/base/platform.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/base/platform.c	2003-12-28 23:22:30.000000000 -0800
+@@ -14,8 +14,8 @@
+ #include <linux/module.h>
+ #include <linux/init.h>
+ 
+-struct device legacy_bus = {
+-	.bus_id		= "legacy",
++struct device platform_bus = {
++	.bus_id		= "platform",
+ };
+ 
+ /**
+@@ -29,7 +29,7 @@ int platform_device_register(struct plat
+ 		return -EINVAL;
+ 
+ 	if (!pdev->dev.parent)
+-		pdev->dev.parent = &legacy_bus;
++		pdev->dev.parent = &platform_bus;
+ 
+ 	pdev->dev.bus = &platform_bus_type;
+ 	
+@@ -105,11 +105,11 @@ struct bus_type platform_bus_type = {
+ 
+ int __init platform_bus_init(void)
+ {
+-	device_register(&legacy_bus);
++	device_register(&platform_bus);
+ 	return bus_register(&platform_bus_type);
+ }
+ 
+-EXPORT_SYMBOL(legacy_bus);
++EXPORT_SYMBOL(platform_bus);
+ EXPORT_SYMBOL(platform_bus_type);
+ EXPORT_SYMBOL(platform_device_register);
+ EXPORT_SYMBOL(platform_device_unregister);
+--- linux-2.6.0/drivers/block/acsi.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/block/acsi.c	2003-12-28 23:21:17.000000000 -0800
+@@ -359,10 +359,9 @@ static void copy_from_acsibuffer( void )
+ static void do_end_requests( void );
+ static void do_acsi_request( request_queue_t * );
+ static void redo_acsi_request( void );
+-static int acsi_ioctl( struct inode *inode, struct file *file, unsigned int
++static int acsi_ioctl(struct block_device *bdev, struct file *file, unsigned int
+                        cmd, unsigned long arg );
+-static int acsi_open( struct inode * inode, struct file * filp );
+-static int acsi_release( struct inode * inode, struct file * file );
++static int acsi_open(struct block_device *bdev, struct file *filp);
+ static void acsi_prevent_removal(struct acsi_info_struct *aip, int flag );
+ static int acsi_change_blk_size( int target, int lun);
+ static int acsi_mode_sense( int target, int lun, SENSE_DATA *sd );
+@@ -1081,10 +1080,10 @@ static void redo_acsi_request( void )
+  ***********************************************************************/
+ 
+ 
+-static int acsi_ioctl( struct inode *inode, struct file *file,
+-					   unsigned int cmd, unsigned long arg )
++static int acsi_ioctl(struct block_device *bdev, struct file *file,
++		      unsigned int cmd, unsigned long arg )
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
++	struct gendisk *disk = bdev->bd_disk;
+ 	struct acsi_info_struct *aip = disk->private_data;
+ 	switch (cmd) {
+ 	  case HDIO_GETGEO:
+@@ -1096,7 +1095,7 @@ static int acsi_ioctl( struct inode *ino
+ 	    put_user( 64, &geo->heads );
+ 	    put_user( 32, &geo->sectors );
+ 	    put_user( aip->size >> 11, &geo->cylinders );
+-		put_user(get_start_sect(inode->i_bdev), &geo->start);
++		put_user(get_start_sect(bdev), &geo->start);
+ 		return 0;
+ 	  }
+ 	  case SCSI_IOCTL_GET_IDLUN:
+@@ -1126,16 +1125,16 @@ static int acsi_ioctl( struct inode *ino
+  *
+  */
+ 
+-static int acsi_open( struct inode * inode, struct file * filp )
++static int acsi_open(struct block_device *bdev, struct file *filp)
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
++	struct gendisk *disk = bdev->bd_disk;
+ 	struct acsi_info_struct *aip = disk->private_data;
+ 
+ 	if (aip->access_count == 0 && aip->removable) {
+ #if 0
+ 		aip->changed = 1;	/* safety first */
+ #endif
+-		check_disk_change( inode->i_bdev );
++		check_disk_change(bdev);
+ 		if (aip->changed)	/* revalidate was not successful (no medium) */
+ 			return -ENXIO;
+ 		acsi_prevent_removal(aip, 1);
+@@ -1143,10 +1142,11 @@ static int acsi_open( struct inode * ino
+ 	aip->access_count++;
+ 
+ 	if (filp && filp->f_mode) {
+-		check_disk_change( inode->i_bdev );
++		check_disk_change(bdev);
+ 		if (filp->f_mode & 2) {
+ 			if (aip->read_only) {
+-				acsi_release( inode, filp );
++				if (--aip->access_count == 0 && aip->removable)
++					acsi_prevent_removal(aip, 0);
+ 				return -EROFS;
+ 			}
+ 		}
+@@ -1160,9 +1160,8 @@ static int acsi_open( struct inode * ino
+  * be forgotten about...
+  */
+ 
+-static int acsi_release( struct inode * inode, struct file * file )
++static int acsi_release(struct gendisk *disk)
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
+ 	struct acsi_info_struct *aip = disk->private_data;
+ 	if (--aip->access_count == 0 && aip->removable)
+ 		acsi_prevent_removal(aip, 0);
+@@ -1328,8 +1327,6 @@ static int acsi_mode_sense( int target, 
+  ********************************************************************/
+ 
+ 
+-extern struct block_device_operations acsi_fops;
+-
+ static struct gendisk *acsi_gendisk[MAX_DEV];
+ 
+ #define MAX_SCSI_DEVICE_CODE 10
+--- linux-2.6.0/drivers/block/amiflop.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/block/amiflop.c	2003-12-28 23:21:17.000000000 -0800
+@@ -1434,10 +1434,11 @@ static void do_fd_request(request_queue_
+ 	redo_fd_request();
+ }
+ 
+-static int fd_ioctl(struct inode *inode, struct file *filp,
++static int fd_ioctl(struct block_device *bdev, struct file *filp,
+ 		    unsigned int cmd, unsigned long param)
+ {
+-	int drive = iminor(inode) & 3;
++	struct amiga_floppy_struct *floppy = bdev->bd_disk->private_data;
++	int drive = floppy - unit;
+ 	static struct floppy_struct getprm;
+ 
+ 	switch(cmd){
+@@ -1459,7 +1460,7 @@ static int fd_ioctl(struct inode *inode,
+ 			rel_fdc();
+ 			return -EBUSY;
+ 		}
+-		fsync_bdev(inode->i_bdev);
++		fsync_bdev(bdev);
+ 		if (fd_motor_on(drive) == 0) {
+ 			rel_fdc();
+ 			return -ENODEV;
+@@ -1488,7 +1489,7 @@ static int fd_ioctl(struct inode *inode,
+ 		break;
+ 	case FDFMTEND:
+ 		floppy_off(drive);
+-		invalidate_bdev(inode->i_bdev, 0);
++		invalidate_bdev(bdev, 0);
+ 		break;
+ 	case FDGETPRM:
+ 		memset((void *)&getprm, 0, sizeof (getprm));
+@@ -1559,10 +1560,11 @@ static void fd_probe(int dev)
+  * /dev/PS0 etc), and disallows simultaneous access to the same
+  * drive with different device numbers.
+  */
+-static int floppy_open(struct inode *inode, struct file *filp)
++static int floppy_open(struct block_device *bdev, struct file *filp)
+ {
+-	int drive = iminor(inode) & 3;
+-	int system =  (iminor(inode) & 4) >> 2;
++	struct amiga_floppy_struct *p = bdev->bd_disk->private_data;
++	int drive = p - unit;
++	int system =  (MINOR(bdev->bd_dev) & 4) >> 2;
+ 	int old_dev;
+ 	unsigned long flags;
+ 
+@@ -1572,7 +1574,7 @@ static int floppy_open(struct inode *ino
+ 		return -EBUSY;
+ 
+ 	if (filp && filp->f_mode & 3) {
+-		check_disk_change(inode->i_bdev);
++		check_disk_change(bdev);
+ 		if (filp->f_mode & 2 ) {
+ 			int wrprot;
+ 
+@@ -1607,9 +1609,10 @@ static int floppy_open(struct inode *ino
+ 	return 0;
+ }
+ 
+-static int floppy_release(struct inode * inode, struct file * filp)
++static int floppy_release(struct gendisk *disk)
+ {
+-	int drive = iminor(inode) & 3;
++	struct amiga_floppy_struct *p = disk->private_data;
++	int drive = p - unit;
+ 
+ 	if (unit[drive].dirty == 1) {
+ 		del_timer (flush_track_timer + drive);
+--- linux-2.6.0/drivers/block/as-iosched.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/block/as-iosched.c	2003-12-28 23:21:59.000000000 -0800
+@@ -70,6 +70,7 @@
+ /* Bits in as_io_context.state */
+ enum as_io_states {
+ 	AS_TASK_RUNNING=0,	/* Process has not exitted */
++	AS_TASK_IOSTARTED,	/* Process has started some IO */
+ 	AS_TASK_IORUNNING,	/* Process has completed some IO */
+ };
+ 
+@@ -99,7 +100,14 @@ struct as_data {
+ 	sector_t last_sector[2];	/* last REQ_SYNC & REQ_ASYNC sectors */
+ 	struct list_head *dispatch;	/* driver dispatch queue */
+ 	struct list_head *hash;		/* request hash */
+-	unsigned long new_success; /* anticipation success on new proc */
++
++	unsigned long exit_prob;	/* probability a task will exit while
++					   being waited on */
++	unsigned long new_ttime_total; 	/* mean thinktime on new proc */
++	unsigned long new_ttime_mean;
++	u64 new_seek_total;		/* mean seek on new proc */
++	sector_t new_seek_mean;
++
+ 	unsigned long current_batch_expires;
+ 	unsigned long last_check_fifo[2];
+ 	int changed_batch;		/* 1: waiting for old batch to end */
+@@ -137,6 +145,10 @@ enum arq_state {
+ 				   scheduler */
+ 	AS_RQ_DISPATCHED,	/* On the dispatch list. It belongs to the
+ 				   driver now */
++	AS_RQ_PRESCHED,		/* Debug poisoning for requests being used */
++	AS_RQ_REMOVED,
++	AS_RQ_MERGED,
++	AS_RQ_POSTSCHED,	/* when they shouldn't be */
+ };
+ 
+ struct as_rq {
+@@ -183,6 +195,7 @@ static void free_as_io_context(struct as
+ /* Called when the task exits */
+ static void exit_as_io_context(struct as_io_context *aic)
+ {
++	WARN_ON(!test_bit(AS_TASK_RUNNING, &aic->state));
+ 	clear_bit(AS_TASK_RUNNING, &aic->state);
+ }
+ 
+@@ -585,18 +598,11 @@ static void as_antic_stop(struct as_data
+ 	int status = ad->antic_status;
+ 
+ 	if (status == ANTIC_WAIT_REQ || status == ANTIC_WAIT_NEXT) {
+-		struct as_io_context *aic;
+-
+ 		if (status == ANTIC_WAIT_NEXT)
+ 			del_timer(&ad->antic_timer);
+ 		ad->antic_status = ANTIC_FINISHED;
+ 		/* see as_work_handler */
+ 		kblockd_schedule_work(&ad->antic_work);
+-
+-		aic = ad->io_context->aic;
+-		if (aic->seek_samples == 0)
+-			/* new process */
+-			ad->new_success = (ad->new_success * 3) / 4 + 256;
+ 	}
+ }
+ 
+@@ -612,14 +618,15 @@ static void as_antic_timeout(unsigned lo
+ 	spin_lock_irqsave(q->queue_lock, flags);
+ 	if (ad->antic_status == ANTIC_WAIT_REQ
+ 			|| ad->antic_status == ANTIC_WAIT_NEXT) {
+-		struct as_io_context *aic;
++		struct as_io_context *aic = ad->io_context->aic;
++
+ 		ad->antic_status = ANTIC_FINISHED;
+ 		kblockd_schedule_work(&ad->antic_work);
+ 
+-		aic = ad->io_context->aic;
+-		if (aic->seek_samples == 0)
+-			/* new process */
+-			ad->new_success = (ad->new_success * 3) / 4;
++		if (aic->ttime_samples == 0) {
++			/* process anticipated on has exitted or timed out*/
++			ad->exit_prob = (7*ad->exit_prob + 256)/8;
++		}
+ 	}
+ 	spin_unlock_irqrestore(q->queue_lock, flags);
+ }
+@@ -633,7 +640,7 @@ static int as_close_req(struct as_data *
+ 	unsigned long delay;	/* milliseconds */
+ 	sector_t last = ad->last_sector[ad->batch_data_dir];
+ 	sector_t next = arq->request->sector;
+-	sector_t delta;	/* acceptable close offset (in sectors) */
++	sector_t delta; /* acceptable close offset (in sectors) */
+ 
+ 	if (ad->antic_status == ANTIC_OFF || !ad->ioc_finished)
+ 		delay = 0;
+@@ -650,6 +657,7 @@ static int as_close_req(struct as_data *
+ 	return (last - (delta>>1) <= next) && (next <= last + delta);
+ }
+ 
++static void as_update_thinktime(struct as_data *ad, struct as_io_context *aic, unsigned long ttime);
+ /*
+  * as_can_break_anticipation returns true if we have been anticipating this
+  * request.
+@@ -667,9 +675,27 @@ static int as_can_break_anticipation(str
+ {
+ 	struct io_context *ioc;
+ 	struct as_io_context *aic;
++	sector_t s;
++
++	ioc = ad->io_context;
++	BUG_ON(!ioc);
++
++	if (arq && ioc == arq->io_context) {
++		/* request from same process */
++		return 1;
++	}
+ 
+ 	if (arq && arq->is_sync == REQ_SYNC && as_close_req(ad, arq)) {
+ 		/* close request */
++		struct as_io_context *aic = ioc->aic;
++		if (aic) {
++			unsigned long thinktime;
++			spin_lock(&aic->lock);
++			thinktime = jiffies - aic->last_end_request;
++			aic->last_end_request = jiffies;
++			as_update_thinktime(ad, aic, thinktime);
++			spin_unlock(&aic->lock);
++		}
+ 		return 1;
+ 	}
+ 
+@@ -681,20 +707,14 @@ static int as_can_break_anticipation(str
+ 		return 1;
+ 	}
+ 
+-	ioc = ad->io_context;
+-	BUG_ON(!ioc);
+-
+-	if (arq && ioc == arq->io_context) {
+-		/* request from same process */
+-		return 1;
+-	}
+-
+ 	aic = ioc->aic;
+ 	if (!aic)
+ 		return 0;
+ 
+ 	if (!test_bit(AS_TASK_RUNNING, &aic->state)) {
+ 		/* process anticipated on has exitted */
++		if (aic->ttime_samples == 0)
++			ad->exit_prob = (7*ad->exit_prob + 256)/8;
+ 		return 1;
+ 	}
+ 
+@@ -708,28 +728,36 @@ static int as_can_break_anticipation(str
+ 		return 1;
+ 	}
+ 
+-	if (ad->new_success < 256 &&
+-			(aic->seek_samples == 0 || aic->ttime_samples == 0)) {
+-		/*
+-		 * Process has just started IO and we have a bad history of
+-		 * success anticipating on new processes!
+-		 */
+-		return 1;
+-	}
+-
+-	if (aic->ttime_mean > ad->antic_expire) {
++	if (aic->ttime_samples == 0) {
++		if (ad->new_ttime_mean > ad->antic_expire)
++			return 1;
++		if (ad->exit_prob > 128)
++			return 1;
++	} else if (aic->ttime_mean > ad->antic_expire) {
+ 		/* the process thinks too much between requests */
+ 		return 1;
+ 	}
+ 
+-	if (arq && aic->seek_samples) {
+-		sector_t s;
+-		if (ad->last_sector[REQ_SYNC] < arq->request->sector)
+-			s = arq->request->sector - ad->last_sector[REQ_SYNC];
+-		else
+-			s = ad->last_sector[REQ_SYNC] - arq->request->sector;
++	if (!arq)
++		return 0;
++
++	if (ad->last_sector[REQ_SYNC] < arq->request->sector)
++		s = arq->request->sector - ad->last_sector[REQ_SYNC];
++	else
++		s = ad->last_sector[REQ_SYNC] - arq->request->sector;
++
++	if (aic->seek_samples == 0) {
++		/*
++		 * Process has just started IO. Use past statistics to
++		 * guage success possibility
++		 */
++		if (ad->new_seek_mean/2 > s) {
++			/* this request is better than what we're expecting */
++			return 1;
++		}
+ 
+-		if (aic->seek_mean > (s>>1)) {
++	} else {
++		if (aic->seek_mean/2 > s) {
+ 			/* this request is better than what we're expecting */
+ 			return 1;
+ 		}
+@@ -774,12 +802,51 @@ static int as_can_anticipate(struct as_d
+ 	return 1;
+ }
+ 
++static void as_update_thinktime(struct as_data *ad, struct as_io_context *aic, unsigned long ttime)
++{
++	/* fixed point: 1.0 == 1<<8 */
++	if (aic->ttime_samples == 0) {
++		ad->new_ttime_total = (7*ad->new_ttime_total + 256*ttime) / 8;
++		ad->new_ttime_mean = ad->new_ttime_total / 256;
++
++		ad->exit_prob = (7*ad->exit_prob)/8;
++	}
++	aic->ttime_samples = (7*aic->ttime_samples + 256) / 8;
++	aic->ttime_total = (7*aic->ttime_total + 256*ttime) / 8;
++	aic->ttime_mean = (aic->ttime_total + 128) / aic->ttime_samples;
++}
++
++static void as_update_seekdist(struct as_data *ad, struct as_io_context *aic, sector_t sdist)
++{
++	u64 total;
++
++	if (aic->seek_samples == 0) {
++		ad->new_seek_total = (7*ad->new_seek_total + 256*(u64)sdist)/8;
++		ad->new_seek_mean = ad->new_seek_total / 256;
++	}
++
++	/*
++	 * Don't allow the seek distance to get too large from the
++	 * odd fragment, pagein, etc
++	 */
++	if (aic->seek_samples <= 60) /* second&third seek */
++		sdist = min(sdist, (aic->seek_mean * 4) + 2*1024*1024);
++	else
++		sdist = min(sdist, (aic->seek_mean * 4)	+ 2*1024*64);
++
++	aic->seek_samples = (7*aic->seek_samples + 256) / 8;
++	aic->seek_total = (7*aic->seek_total + (u64)256*sdist) / 8;
++	total = aic->seek_total + (aic->seek_samples/2);
++	do_div(total, aic->seek_samples);
++	aic->seek_mean = (sector_t)total;
++}
++
+ /*
+  * as_update_iohist keeps a decaying histogram of IO thinktimes, and
+  * updates @aic->ttime_mean based on that. It is called when a new
+  * request is queued.
+  */
+-static void as_update_iohist(struct as_io_context *aic, struct request *rq)
++static void as_update_iohist(struct as_data *ad, struct as_io_context *aic, struct request *rq)
+ {
+ 	struct as_rq *arq = RQ_DATA(rq);
+ 	int data_dir = arq->is_sync;
+@@ -790,60 +857,29 @@ static void as_update_iohist(struct as_i
+ 		return;
+ 
+ 	if (data_dir == REQ_SYNC) {
++		unsigned long in_flight = atomic_read(&aic->nr_queued)
++					+ atomic_read(&aic->nr_dispatched);
+ 		spin_lock(&aic->lock);
+-
+-		if (test_bit(AS_TASK_IORUNNING, &aic->state)
+-				&& !atomic_read(&aic->nr_queued)
+-				&& !atomic_read(&aic->nr_dispatched)) {
++		if (test_bit(AS_TASK_IORUNNING, &aic->state) ||
++			test_bit(AS_TASK_IOSTARTED, &aic->state)) {
+ 			/* Calculate read -> read thinktime */
+-			thinktime = jiffies - aic->last_end_request;
+-			thinktime = min(thinktime, MAX_THINKTIME-1);
+-			/* fixed point: 1.0 == 1<<8 */
+-			aic->ttime_samples += 256;
+-			aic->ttime_total += 256*thinktime;
+-			if (aic->ttime_samples)
+-				/* fixed point factor is cancelled here */
+-				aic->ttime_mean = (aic->ttime_total + 128)
+-							/ aic->ttime_samples;
+-			aic->ttime_samples = (aic->ttime_samples>>1)
+-						+ (aic->ttime_samples>>2);
+-			aic->ttime_total = (aic->ttime_total>>1)
+-						+ (aic->ttime_total>>2);
+-		}
+-
+-		/* Calculate read -> read seek distance */
+-		if (!aic->seek_samples)
+-			seek_dist = 0;
+-		else if (aic->last_request_pos < rq->sector)
+-			seek_dist = rq->sector - aic->last_request_pos;
+-		else
+-			seek_dist = aic->last_request_pos - rq->sector;
+-
++			if (test_bit(AS_TASK_IORUNNING, &aic->state)
++							&& in_flight == 0) {
++				thinktime = jiffies - aic->last_end_request;
++				thinktime = min(thinktime, MAX_THINKTIME-1);
++			} else
++				thinktime = 0;
++			as_update_thinktime(ad, aic, thinktime);
++
++			/* Calculate read -> read seek distance */
++			if (aic->last_request_pos < rq->sector)
++				seek_dist = rq->sector - aic->last_request_pos;
++			else
++				seek_dist = aic->last_request_pos - rq->sector;
++			as_update_seekdist(ad, aic, seek_dist);
++		}
+ 		aic->last_request_pos = rq->sector + rq->nr_sectors;
+-
+-		/*
+-		 * Don't allow the seek distance to get too large from the
+-		 * odd fragment, pagein, etc
+-		 */
+-		if (aic->seek_samples < 400) /* second&third seek */
+-			seek_dist = min(seek_dist, (aic->seek_mean * 4)
+-							+ 2*1024*1024);
+-		else
+-			seek_dist = min(seek_dist, (aic->seek_mean * 4)
+-							+ 2*1024*64);
+-
+-		aic->seek_samples += 256;
+-		aic->seek_total += (u64)256*seek_dist;
+-		if (aic->seek_samples) {
+-			u64 total = aic->seek_total + (aic->seek_samples>>1);
+-			do_div(total, aic->seek_samples);
+-			aic->seek_mean = (sector_t)total;
+-		}
+-		aic->seek_samples = (aic->seek_samples>>1)
+-					+ (aic->seek_samples>>2);
+-		aic->seek_total = (aic->seek_total>>1)
+-					+ (aic->seek_total>>2);
+-
++		set_bit(AS_TASK_IOSTARTED, &aic->state);
+ 		spin_unlock(&aic->lock);
+ 	}
+ }
+@@ -908,15 +944,25 @@ static void as_completed_request(request
+ {
+ 	struct as_data *ad = q->elevator.elevator_data;
+ 	struct as_rq *arq = RQ_DATA(rq);
+-	struct as_io_context *aic;
+ 
+ 	WARN_ON(!list_empty(&rq->queuelist));
+ 
+-	if (unlikely(arq->state != AS_RQ_DISPATCHED))
+-		return;
++	if (arq->state == AS_RQ_PRESCHED) {
++		WARN_ON(arq->io_context);
++		goto out;
++	}
++
++	if (arq->state == AS_RQ_MERGED)
++		goto out_ioc;
++
++	if (arq->state != AS_RQ_REMOVED) {
++		printk("arq->state %d\n", arq->state);
++		WARN_ON(1);
++		goto out;
++	}
+ 
+ 	if (!blk_fs_request(rq))
+-		return;
++		goto out;
+ 
+ 	if (ad->changed_batch && ad->nr_dispatched == 1) {
+ 		kblockd_schedule_work(&ad->antic_work);
+@@ -940,10 +986,7 @@ static void as_completed_request(request
+ 		ad->new_batch = 0;
+ 	}
+ 
+-	if (!arq->io_context)
+-		return;
+-
+-	if (ad->io_context == arq->io_context) {
++	if (ad->io_context == arq->io_context && ad->io_context) {
+ 		ad->antic_start = jiffies;
+ 		ad->ioc_finished = 1;
+ 		if (ad->antic_status == ANTIC_WAIT_REQ) {
+@@ -955,18 +998,23 @@ static void as_completed_request(request
+ 		}
+ 	}
+ 
+-	aic = arq->io_context->aic;
+-	if (!aic)
+-		return;
++out_ioc:
++	if (!arq->io_context)
++		goto out;
+ 
+-	spin_lock(&aic->lock);
+ 	if (arq->is_sync == REQ_SYNC) {
+-		set_bit(AS_TASK_IORUNNING, &aic->state);
+-		aic->last_end_request = jiffies;
++		struct as_io_context *aic = arq->io_context->aic;
++		if (aic) {
++			spin_lock(&aic->lock);
++			set_bit(AS_TASK_IORUNNING, &aic->state);
++			aic->last_end_request = jiffies;
++			spin_unlock(&aic->lock);
++		}
+ 	}
+-	spin_unlock(&aic->lock);
+ 
+ 	put_io_context(arq->io_context);
++out:
++	arq->state = AS_RQ_POSTSCHED;
+ }
+ 
+ /*
+@@ -1035,14 +1083,14 @@ static void as_remove_request(request_qu
+ 	struct as_rq *arq = RQ_DATA(rq);
+ 
+ 	if (unlikely(arq->state == AS_RQ_NEW))
+-		return;
+-
+-	if (!arq) {
+-		WARN_ON(1);
+-		return;
+-	}
++		goto out;
+ 
+ 	if (ON_RB(&arq->rb_node)) {
++		if (arq->state != AS_RQ_QUEUED) {
++			printk("arq->state %d\n", arq->state);
++			WARN_ON(1);
++			goto out;
++		}
+ 		/*
+ 		 * We'll lose the aliased request(s) here. I don't think this
+ 		 * will ever happen, but if it does, hopefully someone will
+@@ -1050,8 +1098,16 @@ static void as_remove_request(request_qu
+ 		 */
+ 		WARN_ON(!list_empty(&rq->queuelist));
+ 		as_remove_queued_request(q, rq);
+-	} else
++	} else {
++		if (arq->state != AS_RQ_DISPATCHED) {
++			printk("arq->state %d\n", arq->state);
++			WARN_ON(1);
++			goto out;
++		}
+ 		as_remove_dispatched_request(q, rq);
++	}
++out:
++	arq->state = AS_RQ_REMOVED;
+ }
+ 
+ /*
+@@ -1229,9 +1285,9 @@ static int as_dispatch_request(struct as
+ 			 */
+ 			goto dispatch_writes;
+ 
+- 		if (ad->batch_data_dir == REQ_ASYNC) {
++		if (ad->batch_data_dir == REQ_ASYNC) {
+ 			WARN_ON(ad->new_batch);
+- 			ad->changed_batch = 1;
++			ad->changed_batch = 1;
+ 		}
+ 		ad->batch_data_dir = REQ_SYNC;
+ 		arq = list_entry_fifo(ad->fifo_list[ad->batch_data_dir].next);
+@@ -1247,8 +1303,8 @@ static int as_dispatch_request(struct as
+ dispatch_writes:
+ 		BUG_ON(RB_EMPTY(&ad->sort_list[REQ_ASYNC]));
+ 
+- 		if (ad->batch_data_dir == REQ_SYNC) {
+- 			ad->changed_batch = 1;
++		if (ad->batch_data_dir == REQ_SYNC) {
++			ad->changed_batch = 1;
+ 
+ 			/*
+ 			 * new_batch might be 1 when the queue runs out of
+@@ -1291,8 +1347,6 @@ fifo_expired:
+ 			ad->new_batch = 1;
+ 
+ 		ad->changed_batch = 0;
+-
+-		arq->request->flags |= REQ_SOFTBARRIER;
+ 	}
+ 
+ 	/*
+@@ -1369,8 +1423,8 @@ static void as_add_request(struct as_dat
+ 	arq->io_context = as_get_io_context();
+ 
+ 	if (arq->io_context) {
++		as_update_iohist(ad, arq->io_context->aic, arq->request);
+ 		atomic_inc(&arq->io_context->aic->nr_queued);
+-		as_update_iohist(arq->io_context->aic, arq->request);
+ 	}
+ 
+ 	alias = as_add_arq_rb(ad, arq);
+@@ -1391,6 +1445,7 @@ static void as_add_request(struct as_dat
+ 
+ 	} else {
+ 		as_add_aliased_request(ad, arq, alias);
++
+ 		/*
+ 		 * have we been anticipating this request?
+ 		 * or does it come from the same process as the one we are
+@@ -1416,6 +1471,11 @@ static void as_requeue_request(request_q
+ 	struct as_rq *arq = RQ_DATA(rq);
+ 
+ 	if (arq) {
++		if (arq->state != AS_RQ_REMOVED) {
++			printk("arq->state %d\n", arq->state);
++			WARN_ON(1);
++		}
++
+ 		arq->state = AS_RQ_DISPATCHED;
+ 		if (arq->io_context && arq->io_context->aic)
+ 			atomic_inc(&arq->io_context->aic->nr_dispatched);
+@@ -1427,8 +1487,6 @@ static void as_requeue_request(request_q
+ 
+ 	/* Stop anticipating - let this request get through */
+ 	as_antic_stop(ad);
+-
+-	return;
+ }
+ 
+ static void
+@@ -1437,10 +1495,20 @@ as_insert_request(request_queue_t *q, st
+ 	struct as_data *ad = q->elevator.elevator_data;
+ 	struct as_rq *arq = RQ_DATA(rq);
+ 
++	if (arq) {
++		if (arq->state != AS_RQ_PRESCHED) {
++			printk("arq->state: %d\n", arq->state);
++			WARN_ON(1);
++		}
++		arq->state = AS_RQ_NEW;
++	}
++
+ 	/* barriers must flush the reorder queue */
+ 	if (unlikely(rq->flags & (REQ_SOFTBARRIER | REQ_HARDBARRIER)
+-			&& where == ELEVATOR_INSERT_SORT))
++			&& where == ELEVATOR_INSERT_SORT)) {
++		WARN_ON(1);
+ 		where = ELEVATOR_INSERT_BACK;
++	}
+ 
+ 	switch (where) {
+ 		case ELEVATOR_INSERT_BACK:
+@@ -1675,7 +1743,8 @@ as_merged_requests(request_queue_t *q, s
+ 	 * kill knowledge of next, this one is a goner
+ 	 */
+ 	as_remove_queued_request(q, next);
+-	put_io_context(anext->io_context);
++
++	anext->state = AS_RQ_MERGED;
+ }
+ 
+ /*
+@@ -1708,6 +1777,11 @@ static void as_put_request(request_queue
+ 		return;
+ 	}
+ 
++	if (arq->state != AS_RQ_POSTSCHED && arq->state != AS_RQ_PRESCHED) {
++		printk("arq->state %d\n", arq->state);
++		WARN_ON(1);
++	}
++
+ 	mempool_free(arq, ad->arq_pool);
+ 	rq->elevator_private = NULL;
+ }
+@@ -1721,7 +1795,7 @@ static int as_set_request(request_queue_
+ 		memset(arq, 0, sizeof(*arq));
+ 		RB_CLEAR(&arq->rb_node);
+ 		arq->request = rq;
+-		arq->state = AS_RQ_NEW;
++		arq->state = AS_RQ_PRESCHED;
+ 		arq->io_context = NULL;
+ 		INIT_LIST_HEAD(&arq->hash);
+ 		arq->on_hash = 0;
+@@ -1823,8 +1897,6 @@ static int as_init(request_queue_t *q, e
+ 	if (ad->write_batch_count < 2)
+ 		ad->write_batch_count = 2;
+ 
+-	ad->new_success = 512;
+-
+ 	return 0;
+ }
+ 
+@@ -1860,6 +1932,17 @@ as_var_store(unsigned long *var, const c
+ 	return count;
+ }
+ 
++static ssize_t as_est_show(struct as_data *ad, char *page)
++{
++	int pos = 0;
++
++	pos += sprintf(page+pos, "%lu %% exit probability\n", 100*ad->exit_prob/256);
++	pos += sprintf(page+pos, "%lu ms new thinktime\n", ad->new_ttime_mean);
++	pos += sprintf(page+pos, "%llu sectors new seek distance\n", (unsigned long long)ad->new_seek_mean);
++
++	return pos;
++}
++
+ #define SHOW_FUNCTION(__FUNC, __VAR)					\
+ static ssize_t __FUNC(struct as_data *ad, char *page)		\
+ {									\
+@@ -1891,6 +1974,10 @@ STORE_FUNCTION(as_write_batchexpire_stor
+ 			&ad->batch_expire[REQ_ASYNC], 0, INT_MAX);
+ #undef STORE_FUNCTION
+ 
++static struct as_fs_entry as_est_entry = {
++	.attr = {.name = "est_time", .mode = S_IRUGO },
++	.show = as_est_show,
++};
+ static struct as_fs_entry as_readexpire_entry = {
+ 	.attr = {.name = "read_expire", .mode = S_IRUGO | S_IWUSR },
+ 	.show = as_readexpire_show,
+@@ -1918,6 +2005,7 @@ static struct as_fs_entry as_write_batch
+ };
+ 
+ static struct attribute *default_attrs[] = {
++	&as_est_entry.attr,
+ 	&as_readexpire_entry.attr,
+ 	&as_writeexpire_entry.attr,
+ 	&as_anticexpire_entry.attr,
+--- linux-2.6.0/drivers/block/ataflop.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/block/ataflop.c	2003-12-28 23:21:17.000000000 -0800
+@@ -364,13 +364,12 @@ static void finish_fdc_done( int dummy )
+ static __inline__ void copy_buffer( void *from, void *to);
+ static void setup_req_params( int drive );
+ static void redo_fd_request( void);
+-static int fd_ioctl( struct inode *inode, struct file *filp, unsigned int
++static int fd_ioctl(struct block_device *bdev, struct file *filp, unsigned int
+                      cmd, unsigned long param);
+ static void fd_probe( int drive );
+ static int fd_test_drive_present( int drive );
+ static void config_types( void );
+-static int floppy_open( struct inode *inode, struct file *filp );
+-static int floppy_release( struct inode * inode, struct file * filp );
++static int floppy_open(struct block_device *bdev, struct file *filp );
+ 
+ /************************* End of Prototypes **************************/
+ 
+@@ -1496,10 +1495,10 @@ void do_fd_request(request_queue_t * q)
+ 	atari_enable_irq( IRQ_MFP_FDC );
+ }
+ 
+-static int fd_ioctl(struct inode *inode, struct file *filp,
++static int fd_ioctl(struct block_device *bdev, struct file *filp,
+ 		    unsigned int cmd, unsigned long param)
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
++	struct gendisk *disk = bdev->bd_disk;
+ 	struct atari_floppy_struct *floppy = disk->private_data;
+ 	int drive = floppy - unit;
+ 	int type = floppy->type;
+@@ -1673,7 +1672,7 @@ static int fd_ioctl(struct inode *inode,
+ 		/* invalidate the buffer track to force a reread */
+ 		BufferDrive = -1;
+ 		set_bit(drive, &fake_change);
+-		check_disk_change(inode->i_bdev);
++		check_disk_change(bdev);
+ 		return 0;
+ 	default:
+ 		return -EINVAL;
+@@ -1816,10 +1815,10 @@ static void __init config_types( void )
+  * drive with different device numbers.
+  */
+ 
+-static int floppy_open( struct inode *inode, struct file *filp )
++static int floppy_open(struct block_device *bdev, struct file *filp )
+ {
+-	struct atari_floppy_struct *p = inode->i_bdev->bd_disk->private_data;
+-	int type  = iminor(inode) >> 2;
++	struct atari_floppy_struct *p = bdev->bd_disk->private_data;
++	int type  = MINOR(bdev->bd_dev) >> 2;
+ 
+ 	DPRINT(("fd_open: type=%d\n",type));
+ 	if (p->ref && p->type != type)
+@@ -1839,14 +1838,13 @@ static int floppy_open( struct inode *in
+ 		return 0;
+ 
+ 	if (filp->f_mode & 3) {
+-		check_disk_change(inode->i_bdev);
++		check_disk_change(bdev);
+ 		if (filp->f_mode & 2) {
+ 			if (p->wpstat) {
+ 				if (p->ref < 0)
+ 					p->ref = 0;
+ 				else
+ 					p->ref--;
+-				floppy_release(inode, filp);
+ 				return -EROFS;
+ 			}
+ 		}
+@@ -1855,9 +1853,9 @@ static int floppy_open( struct inode *in
+ }
+ 
+ 
+-static int floppy_release( struct inode * inode, struct file * filp )
++static int floppy_release(struct gendisk *disk)
+ {
+-	struct atari_floppy_struct *p = inode->i_bdev->bd_disk->private_data;
++	struct atari_floppy_struct *p = disk->private_data;
+ 	if (p->ref < 0)
+ 		p->ref = 0;
+ 	else if (!p->ref--) {
+--- linux-2.6.0/drivers/block/cciss.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/block/cciss.c	2003-12-28 23:21:17.000000000 -0800
+@@ -112,9 +112,9 @@ static struct board_type products[] = {
+ static ctlr_info_t *hba[MAX_CTLR];
+ 
+ static void do_cciss_request(request_queue_t *q);
+-static int cciss_open(struct inode *inode, struct file *filep);
+-static int cciss_release(struct inode *inode, struct file *filep);
+-static int cciss_ioctl(struct inode *inode, struct file *filep, 
++static int cciss_open(struct block_device *bdev, struct file *filep);
++static int cciss_release(struct gendisk *disk);
++static int cciss_ioctl(struct block_device *bdev, struct file *filep,
+ 		unsigned int cmd, unsigned long arg);
+ 
+ static int revalidate_allvol(ctlr_info_t *host);
+@@ -362,13 +362,13 @@ static inline drive_info_struct *get_drv
+ /*
+  * Open.  Make sure the device is really there.
+  */
+-static int cciss_open(struct inode *inode, struct file *filep)
++static int cciss_open(struct block_device *bdev, struct file *filep)
+ {
+-	ctlr_info_t *host = get_host(inode->i_bdev->bd_disk);
+-	drive_info_struct *drv = get_drv(inode->i_bdev->bd_disk);
++	ctlr_info_t *host = get_host(bdev->bd_disk);
++	drive_info_struct *drv = get_drv(bdev->bd_disk);
+ 
+ #ifdef CCISS_DEBUG
+-	printk(KERN_DEBUG "cciss_open %s\n", inode->i_bdev->bd_disk->disk_name);
++	printk(KERN_DEBUG "cciss_open %s\n", bdev->bd_disk->disk_name);
+ #endif /* CCISS_DEBUG */ 
+ 
+ 	/*
+@@ -378,7 +378,7 @@ static int cciss_open(struct inode *inod
+ 	 * for "raw controller".
+ 	 */
+ 	if (drv->nr_blocks == 0) {
+-		if (iminor(inode) != 0)
++		if (bdev != bdev->bd_contains || drv != host->drv)
+ 			return -ENXIO;
+ 		if (!capable(CAP_SYS_ADMIN))
+ 			return -EPERM;
+@@ -390,13 +390,13 @@ static int cciss_open(struct inode *inod
+ /*
+  * Close.  Sync first.
+  */
+-static int cciss_release(struct inode *inode, struct file *filep)
++static int cciss_release(struct gendisk *disk)
+ {
+-	ctlr_info_t *host = get_host(inode->i_bdev->bd_disk);
+-	drive_info_struct *drv = get_drv(inode->i_bdev->bd_disk);
++	ctlr_info_t *host = get_host(disk);
++	drive_info_struct *drv = get_drv(disk);
+ 
+ #ifdef CCISS_DEBUG
+-	printk(KERN_DEBUG "cciss_release %s\n", inode->i_bdev->bd_disk->disk_name);
++	printk(KERN_DEBUG "cciss_release %s\n", disk->disk_name);
+ #endif /* CCISS_DEBUG */
+ 
+ 	drv->usage_count--;
+@@ -407,10 +407,9 @@ static int cciss_release(struct inode *i
+ /*
+  * ioctl 
+  */
+-static int cciss_ioctl(struct inode *inode, struct file *filep, 
++static int cciss_ioctl(struct block_device *bdev, struct file *filep,
+ 		unsigned int cmd, unsigned long arg)
+ {
+-	struct block_device *bdev = inode->i_bdev;
+ 	struct gendisk *disk = bdev->bd_disk;
+ 	ctlr_info_t *host = get_host(disk);
+ 	drive_info_struct *drv = get_drv(disk);
+@@ -433,7 +432,7 @@ static int cciss_ioctl(struct inode *ino
+                         driver_geo.sectors = 0x3f;
+                         driver_geo.cylinders = (int)drv->nr_blocks / (0xff*0x3f);
+                 }
+-                driver_geo.start= get_start_sect(inode->i_bdev);
++                driver_geo.start= get_start_sect(bdev);
+                 if (copy_to_user((void *) arg, &driver_geo,
+                                 sizeof( struct hd_geometry)))
+                         return  -EFAULT;
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/block/cfq-iosched.c	2003-12-28 23:21:35.000000000 -0800
+@@ -0,0 +1,707 @@
++/*
++ *  linux/drivers/block/cfq-iosched.c
++ *
++ *  CFQ, or complete fairness queueing, disk scheduler.
++ *
++ *  Based on ideas from a previously unfinished io
++ *  scheduler (round robin per-process disk scheduling) and Andrea Arcangeli.
++ *
++ *  Copyright (C) 2003 Jens Axboe <axboe@suse.de>
++ */
++#include <linux/kernel.h>
++#include <linux/fs.h>
++#include <linux/blkdev.h>
++#include <linux/elevator.h>
++#include <linux/bio.h>
++#include <linux/config.h>
++#include <linux/module.h>
++#include <linux/slab.h>
++#include <linux/init.h>
++#include <linux/compiler.h>
++#include <linux/hash.h>
++#include <linux/rbtree.h>
++#include <linux/mempool.h>
++
++/*
++ * tunables
++ */
++static int cfq_quantum = 4;
++static int cfq_queued = 8;
++
++#define CFQ_QHASH_SHIFT		6
++#define CFQ_QHASH_ENTRIES	(1 << CFQ_QHASH_SHIFT)
++#define list_entry_qhash(entry)	list_entry((entry), struct cfq_queue, cfq_hash)
++
++#define CFQ_MHASH_SHIFT		8
++#define CFQ_MHASH_BLOCK(sec)	((sec) >> 3)
++#define CFQ_MHASH_ENTRIES	(1 << CFQ_MHASH_SHIFT)
++#define CFQ_MHASH_FN(sec)	(hash_long(CFQ_MHASH_BLOCK((sec)),CFQ_MHASH_SHIFT))
++#define ON_MHASH(crq)		!list_empty(&(crq)->hash)
++#define rq_hash_key(rq)		((rq)->sector + (rq)->nr_sectors)
++#define list_entry_hash(ptr)	list_entry((ptr), struct cfq_rq, hash)
++
++#define list_entry_cfqq(ptr)	list_entry((ptr), struct cfq_queue, cfq_list)
++
++#define RQ_DATA(rq)		((struct cfq_rq *) (rq)->elevator_private)
++
++static kmem_cache_t *crq_pool;
++static kmem_cache_t *cfq_pool;
++static mempool_t *cfq_mpool;
++
++struct cfq_data {
++	struct list_head rr_list;
++	struct list_head *dispatch;
++	struct list_head *cfq_hash;
++
++	struct list_head *crq_hash;
++
++	unsigned int busy_queues;
++	unsigned int max_queued;
++
++	mempool_t *crq_pool;
++};
++
++struct cfq_queue {
++	struct list_head cfq_hash;
++	struct list_head cfq_list;
++	struct rb_root sort_list;
++	int pid;
++	int queued[2];
++#if 0
++	/*
++	 * with a simple addition like this, we can do io priorities. almost.
++	 * does need a split request free list, too.
++	 */
++	int io_prio
++#endif
++};
++
++struct cfq_rq {
++	struct rb_node rb_node;
++	sector_t rb_key;
++
++	struct request *request;
++
++	struct cfq_queue *cfq_queue;
++
++	struct list_head hash;
++};
++
++static void cfq_put_queue(struct cfq_data *cfqd, struct cfq_queue *cfqq);
++static struct cfq_queue *cfq_find_cfq_hash(struct cfq_data *cfqd, int pid);
++static void cfq_dispatch_sort(struct list_head *head, struct cfq_rq *crq);
++
++/*
++ * lots of deadline iosched dupes, can be abstracted later...
++ */
++static inline void __cfq_del_crq_hash(struct cfq_rq *crq)
++{
++	list_del_init(&crq->hash);
++}
++
++static inline void cfq_del_crq_hash(struct cfq_rq *crq)
++{
++	if (ON_MHASH(crq))
++		__cfq_del_crq_hash(crq);
++}
++
++static void cfq_remove_merge_hints(request_queue_t *q, struct cfq_rq *crq)
++{
++	cfq_del_crq_hash(crq);
++
++	if (q->last_merge == crq->request)
++		q->last_merge = NULL;
++}
++
++static inline void cfq_add_crq_hash(struct cfq_data *cfqd, struct cfq_rq *crq)
++{
++	struct request *rq = crq->request;
++
++	BUG_ON(ON_MHASH(crq));
++
++	list_add(&crq->hash, &cfqd->crq_hash[CFQ_MHASH_FN(rq_hash_key(rq))]);
++}
++
++static struct request *cfq_find_rq_hash(struct cfq_data *cfqd, sector_t offset)
++{
++	struct list_head *hash_list = &cfqd->crq_hash[CFQ_MHASH_FN(offset)];
++	struct list_head *entry, *next = hash_list->next;
++
++	while ((entry = next) != hash_list) {
++		struct cfq_rq *crq = list_entry_hash(entry);
++		struct request *__rq = crq->request;
++
++		next = entry->next;
++
++		BUG_ON(!ON_MHASH(crq));
++
++		if (!rq_mergeable(__rq)) {
++			__cfq_del_crq_hash(crq);
++			continue;
++		}
++
++		if (rq_hash_key(__rq) == offset)
++			return __rq;
++	}
++
++	return NULL;
++}
++
++/*
++ * rb tree support functions
++ */
++#define RB_NONE		(2)
++#define RB_EMPTY(node)	((node)->rb_node == NULL)
++#define RB_CLEAR(node)	((node)->rb_color = RB_NONE)
++#define RB_CLEAR_ROOT(root)	((root)->rb_node = NULL)
++#define ON_RB(node)	((node)->rb_color != RB_NONE)
++#define rb_entry_crq(node)	rb_entry((node), struct cfq_rq, rb_node)
++#define rq_rb_key(rq)		(rq)->sector
++
++static inline void cfq_del_crq_rb(struct cfq_queue *cfqq, struct cfq_rq *crq)
++{
++	if (ON_RB(&crq->rb_node)) {
++		cfqq->queued[rq_data_dir(crq->request)]--;
++		rb_erase(&crq->rb_node, &cfqq->sort_list);
++		crq->cfq_queue = NULL;
++	}
++}
++
++static struct cfq_rq *
++__cfq_add_crq_rb(struct cfq_queue *cfqq, struct cfq_rq *crq)
++{
++	struct rb_node **p = &cfqq->sort_list.rb_node;
++	struct rb_node *parent = NULL;
++	struct cfq_rq *__crq;
++
++	while (*p) {
++		parent = *p;
++		__crq = rb_entry_crq(parent);
++
++		if (crq->rb_key < __crq->rb_key)
++			p = &(*p)->rb_left;
++		else if (crq->rb_key > __crq->rb_key)
++			p = &(*p)->rb_right;
++		else
++			return __crq;
++	}
++
++	rb_link_node(&crq->rb_node, parent, p);
++	return 0;
++}
++
++static void
++cfq_add_crq_rb(struct cfq_data *cfqd, struct cfq_queue *cfqq,struct cfq_rq *crq)
++{
++	struct request *rq = crq->request;
++	struct cfq_rq *__alias;
++
++	crq->rb_key = rq_rb_key(rq);
++	cfqq->queued[rq_data_dir(rq)]++;
++retry:
++	__alias = __cfq_add_crq_rb(cfqq, crq);
++	if (!__alias) {
++		rb_insert_color(&crq->rb_node, &cfqq->sort_list);
++		crq->cfq_queue = cfqq;
++		return;
++	}
++
++	cfq_del_crq_rb(cfqq, __alias);
++	cfq_dispatch_sort(cfqd->dispatch, __alias);
++	goto retry;
++}
++
++static struct request *
++cfq_find_rq_rb(struct cfq_data *cfqd, sector_t sector)
++{
++	struct cfq_queue *cfqq = cfq_find_cfq_hash(cfqd, current->tgid);
++	struct rb_node *n;
++
++	if (!cfqq)
++		goto out;
++
++	n = cfqq->sort_list.rb_node;
++	while (n) {
++		struct cfq_rq *crq = rb_entry_crq(n);
++
++		if (sector < crq->rb_key)
++			n = n->rb_left;
++		else if (sector > crq->rb_key)
++			n = n->rb_right;
++		else
++			return crq->request;
++	}
++
++out:
++	return NULL;
++}
++
++static void cfq_remove_request(request_queue_t *q, struct request *rq)
++{
++	struct cfq_data *cfqd = q->elevator.elevator_data;
++	struct cfq_rq *crq = RQ_DATA(rq);
++
++	if (crq) {
++		struct cfq_queue *cfqq = crq->cfq_queue;
++
++		cfq_remove_merge_hints(q, crq);
++		list_del_init(&rq->queuelist);
++
++		if (cfqq) {
++			cfq_del_crq_rb(cfqq, crq);
++
++			if (RB_EMPTY(&cfqq->sort_list))
++				cfq_put_queue(cfqd, cfqq);
++		}
++	}
++}
++
++static int
++cfq_merge(request_queue_t *q, struct request **req, struct bio *bio)
++{
++	struct cfq_data *cfqd = q->elevator.elevator_data;
++	struct request *__rq;
++	int ret;
++
++	ret = elv_try_last_merge(q, bio);
++	if (ret != ELEVATOR_NO_MERGE) {
++		__rq = q->last_merge;
++		goto out_insert;
++	}
++
++	__rq = cfq_find_rq_hash(cfqd, bio->bi_sector);
++	if (__rq) {
++		BUG_ON(__rq->sector + __rq->nr_sectors != bio->bi_sector);
++
++		if (elv_rq_merge_ok(__rq, bio)) {
++			ret = ELEVATOR_BACK_MERGE;
++			goto out;
++		}
++	}
++
++	__rq = cfq_find_rq_rb(cfqd, bio->bi_sector + bio_sectors(bio));
++	if (__rq) {
++		if (elv_rq_merge_ok(__rq, bio)) {
++			ret = ELEVATOR_FRONT_MERGE;
++			goto out;
++		}
++	}
++
++	return ELEVATOR_NO_MERGE;
++out:
++	q->last_merge = __rq;
++out_insert:
++	*req = __rq;
++	return ret;
++}
++
++static void cfq_merged_request(request_queue_t *q, struct request *req)
++{
++	struct cfq_data *cfqd = q->elevator.elevator_data;
++	struct cfq_rq *crq = RQ_DATA(req);
++
++	cfq_del_crq_hash(crq);
++	cfq_add_crq_hash(cfqd, crq);
++
++	if (ON_RB(&crq->rb_node) && (rq_rb_key(req) != crq->rb_key)) {
++		struct cfq_queue *cfqq = crq->cfq_queue;
++
++		cfq_del_crq_rb(cfqq, crq);
++		cfq_add_crq_rb(cfqd, cfqq, crq);
++	}
++
++	q->last_merge = req;
++}
++
++static void
++cfq_merged_requests(request_queue_t *q, struct request *req,
++		    struct request *next)
++{
++	cfq_merged_request(q, req);
++	cfq_remove_request(q, next);
++}
++
++static void cfq_dispatch_sort(struct list_head *head, struct cfq_rq *crq)
++{
++	struct list_head *entry = head;
++	struct request *__rq;
++
++	if (!list_empty(head)) {
++		__rq = list_entry_rq(head->next);
++
++		if (crq->request->sector < __rq->sector) {
++			entry = head->prev;
++			goto link;
++		}
++	}
++
++	while ((entry = entry->prev) != head) {
++		__rq = list_entry_rq(entry);
++
++		if (crq->request->sector <= __rq->sector)
++			break;
++	}
++
++link:
++	list_add_tail(&crq->request->queuelist, entry);
++}
++
++static inline void
++__cfq_dispatch_requests(request_queue_t *q, struct cfq_data *cfqd,
++			struct cfq_queue *cfqq)
++{
++	struct cfq_rq *crq = rb_entry_crq(rb_first(&cfqq->sort_list));
++
++	cfq_del_crq_rb(cfqq, crq);
++	cfq_remove_merge_hints(q, crq);
++	cfq_dispatch_sort(cfqd->dispatch, crq);
++}
++
++static int cfq_dispatch_requests(request_queue_t *q, struct cfq_data *cfqd)
++{
++	struct cfq_queue *cfqq;
++	struct list_head *entry, *tmp;
++	int ret, queued, good_queues;
++
++	if (list_empty(&cfqd->rr_list))
++		return 0;
++
++	queued = ret = 0;
++restart:
++	good_queues = 0;
++	list_for_each_safe(entry, tmp, &cfqd->rr_list) {
++		cfqq = list_entry_cfqq(cfqd->rr_list.next);
++
++		BUG_ON(RB_EMPTY(&cfqq->sort_list));
++
++		__cfq_dispatch_requests(q, cfqd, cfqq);
++
++		if (RB_EMPTY(&cfqq->sort_list))
++			cfq_put_queue(cfqd, cfqq);
++		else
++			good_queues++;
++
++		queued++;
++		ret = 1;
++	}
++
++	if ((queued < cfq_quantum) && good_queues)
++		goto restart;
++
++	return ret;
++}
++
++static struct request *cfq_next_request(request_queue_t *q)
++{
++	struct cfq_data *cfqd = q->elevator.elevator_data;
++	struct request *rq;
++
++	if (!list_empty(cfqd->dispatch)) {
++		struct cfq_rq *crq;
++dispatch:
++		rq = list_entry_rq(cfqd->dispatch->next);
++
++		BUG_ON(q->last_merge == rq);
++		crq = RQ_DATA(rq);
++		if (crq)
++			BUG_ON(ON_MHASH(crq));
++
++		return rq;
++	}
++
++	if (cfq_dispatch_requests(q, cfqd))
++		goto dispatch;
++
++	return NULL;
++}
++
++static inline struct cfq_queue *
++__cfq_find_cfq_hash(struct cfq_data *cfqd, int pid, const int hashval)
++{
++	struct list_head *hash_list = &cfqd->cfq_hash[hashval];
++	struct list_head *entry;
++
++	list_for_each(entry, hash_list) {
++		struct cfq_queue *__cfqq = list_entry_qhash(entry);
++
++		if (__cfqq->pid == pid)
++			return __cfqq;
++	}
++
++	return NULL;
++}
++
++static struct cfq_queue *cfq_find_cfq_hash(struct cfq_data *cfqd, int pid)
++{
++	const int hashval = hash_long(current->tgid, CFQ_QHASH_SHIFT);
++
++	return __cfq_find_cfq_hash(cfqd, pid, hashval);
++}
++
++static void cfq_put_queue(struct cfq_data *cfqd, struct cfq_queue *cfqq)
++{
++	cfqd->busy_queues--;
++	list_del(&cfqq->cfq_list);
++	list_del(&cfqq->cfq_hash);
++	mempool_free(cfqq, cfq_mpool);
++}
++
++static struct cfq_queue *cfq_get_queue(struct cfq_data *cfqd, int pid)
++{
++	const int hashval = hash_long(current->tgid, CFQ_QHASH_SHIFT);
++	struct cfq_queue *cfqq = __cfq_find_cfq_hash(cfqd, pid, hashval);
++
++	if (!cfqq) {
++		cfqq = mempool_alloc(cfq_mpool, GFP_NOIO);
++
++		INIT_LIST_HEAD(&cfqq->cfq_hash);
++		INIT_LIST_HEAD(&cfqq->cfq_list);
++		RB_CLEAR_ROOT(&cfqq->sort_list);
++
++		cfqq->pid = pid;
++		cfqq->queued[0] = cfqq->queued[1] = 0;
++		list_add(&cfqq->cfq_hash, &cfqd->cfq_hash[hashval]);
++	}
++
++	return cfqq;
++}
++
++static void cfq_enqueue(struct cfq_data *cfqd, struct cfq_rq *crq)
++{
++	struct cfq_queue *cfqq;
++
++	cfqq = cfq_get_queue(cfqd, current->tgid);
++
++	cfq_add_crq_rb(cfqd, cfqq, crq);
++
++	if (list_empty(&cfqq->cfq_list)) {
++		list_add(&cfqq->cfq_list, &cfqd->rr_list);
++		cfqd->busy_queues++;
++	}
++}
++
++static void
++cfq_insert_request(request_queue_t *q, struct request *rq, int where)
++{
++	struct cfq_data *cfqd = q->elevator.elevator_data;
++	struct cfq_rq *crq = RQ_DATA(rq);
++
++	switch (where) {
++		case ELEVATOR_INSERT_BACK:
++			while (cfq_dispatch_requests(q, cfqd))
++				;
++			list_add_tail(&rq->queuelist, cfqd->dispatch);
++			break;
++		case ELEVATOR_INSERT_FRONT:
++			list_add(&rq->queuelist, cfqd->dispatch);
++			break;
++		case ELEVATOR_INSERT_SORT:
++			BUG_ON(!blk_fs_request(rq));
++			cfq_enqueue(cfqd, crq);
++			break;
++		default:
++			printk("%s: bad insert point %d\n", __FUNCTION__,where);
++			return;
++	}
++
++	if (rq_mergeable(rq)) {
++		cfq_add_crq_hash(cfqd, crq);
++
++		if (!q->last_merge)
++			q->last_merge = rq;
++	}
++}
++
++static int cfq_queue_empty(request_queue_t *q)
++{
++	struct cfq_data *cfqd = q->elevator.elevator_data;
++
++	if (list_empty(cfqd->dispatch) && list_empty(&cfqd->rr_list))
++		return 1;
++
++	return 0;
++}
++
++static struct request *
++cfq_former_request(request_queue_t *q, struct request *rq)
++{
++	struct cfq_rq *crq = RQ_DATA(rq);
++	struct rb_node *rbprev = rb_prev(&crq->rb_node);
++
++	if (rbprev)
++		return rb_entry_crq(rbprev)->request;
++
++	return NULL;
++}
++
++static struct request *
++cfq_latter_request(request_queue_t *q, struct request *rq)
++{
++	struct cfq_rq *crq = RQ_DATA(rq);
++	struct rb_node *rbnext = rb_next(&crq->rb_node);
++
++	if (rbnext)
++		return rb_entry_crq(rbnext)->request;
++
++	return NULL;
++}
++
++static int cfq_may_queue(request_queue_t *q, int rw)
++{
++	struct cfq_data *cfqd = q->elevator.elevator_data;
++	struct cfq_queue *cfqq;
++	int ret = 1;
++
++	if (!cfqd->busy_queues)
++		goto out;
++
++	cfqq = cfq_find_cfq_hash(cfqd, current->tgid);
++	if (cfqq) {
++		int limit = (q->nr_requests - cfq_queued) / cfqd->busy_queues;
++
++		if (limit < 3)
++			limit = 3;
++		else if (limit > cfqd->max_queued)
++			limit = cfqd->max_queued;
++
++		if (cfqq->queued[rw] > limit)
++			ret = 0;
++	}
++out:
++	return ret;
++}
++
++static void cfq_put_request(request_queue_t *q, struct request *rq)
++{
++	struct cfq_data *cfqd = q->elevator.elevator_data;
++	struct cfq_rq *crq = RQ_DATA(rq);
++
++	if (crq) {
++		BUG_ON(q->last_merge == rq);
++		BUG_ON(ON_MHASH(crq));
++
++		mempool_free(crq, cfqd->crq_pool);
++		rq->elevator_private = NULL;
++	}
++}
++
++static int cfq_set_request(request_queue_t *q, struct request *rq, int gfp_mask)
++{
++	struct cfq_data *cfqd = q->elevator.elevator_data;
++	struct cfq_rq *crq = mempool_alloc(cfqd->crq_pool, gfp_mask);
++
++	if (crq) {
++		RB_CLEAR(&crq->rb_node);
++		crq->request = rq;
++		crq->cfq_queue = NULL;
++		INIT_LIST_HEAD(&crq->hash);
++		rq->elevator_private = crq;
++		return 0;
++	}
++
++	return 1;
++}
++
++static void cfq_exit(request_queue_t *q, elevator_t *e)
++{
++	struct cfq_data *cfqd = e->elevator_data;
++
++	e->elevator_data = NULL;
++	mempool_destroy(cfqd->crq_pool);
++	kfree(cfqd->crq_hash);
++	kfree(cfqd->cfq_hash);
++	kfree(cfqd);
++}
++
++static int cfq_init(request_queue_t *q, elevator_t *e)
++{
++	struct cfq_data *cfqd;
++	int i;
++
++	cfqd = kmalloc(sizeof(*cfqd), GFP_KERNEL);
++	if (!cfqd)
++		return -ENOMEM;
++
++	memset(cfqd, 0, sizeof(*cfqd));
++	INIT_LIST_HEAD(&cfqd->rr_list);
++
++	cfqd->crq_hash = kmalloc(sizeof(struct list_head) * CFQ_MHASH_ENTRIES, GFP_KERNEL);
++	if (!cfqd->crq_hash)
++		goto out_crqhash;
++
++	cfqd->cfq_hash = kmalloc(sizeof(struct list_head) * CFQ_QHASH_ENTRIES, GFP_KERNEL);
++	if (!cfqd->cfq_hash)
++		goto out_cfqhash;
++
++	cfqd->crq_pool = mempool_create(BLKDEV_MIN_RQ, mempool_alloc_slab, mempool_free_slab, crq_pool);
++	if (!cfqd->crq_pool)
++		goto out_crqpool;
++
++	for (i = 0; i < CFQ_MHASH_ENTRIES; i++)
++		INIT_LIST_HEAD(&cfqd->crq_hash[i]);
++	for (i = 0; i < CFQ_QHASH_ENTRIES; i++)
++		INIT_LIST_HEAD(&cfqd->cfq_hash[i]);
++
++	cfqd->dispatch = &q->queue_head;
++	e->elevator_data = cfqd;
++
++	/*
++	 * just set it to some high value, we want anyone to be able to queue
++	 * some requests. fairness is handled differently
++	 */
++	cfqd->max_queued = q->nr_requests;
++	q->nr_requests = 8192;
++
++	return 0;
++out_crqpool:
++	kfree(cfqd->cfq_hash);
++out_cfqhash:
++	kfree(cfqd->crq_hash);
++out_crqhash:
++	kfree(cfqd);
++	return -ENOMEM;
++}
++
++static int __init cfq_slab_setup(void)
++{
++	crq_pool = kmem_cache_create("crq_pool", sizeof(struct cfq_rq), 0, 0,
++					NULL, NULL);
++
++	if (!crq_pool)
++		panic("cfq_iosched: can't init crq pool\n");
++
++	cfq_pool = kmem_cache_create("cfq_pool", sizeof(struct cfq_queue), 0, 0,
++					NULL, NULL);
++
++	if (!cfq_pool)
++		panic("cfq_iosched: can't init cfq pool\n");
++
++	cfq_mpool = mempool_create(64, mempool_alloc_slab, mempool_free_slab, cfq_pool);
++
++	if (!cfq_mpool)
++		panic("cfq_iosched: can't init cfq mpool\n");
++
++	return 0;
++}
++
++subsys_initcall(cfq_slab_setup);
++
++elevator_t iosched_cfq = {
++	.elevator_name =		"cfq",
++	.elevator_merge_fn = 		cfq_merge,
++	.elevator_merged_fn =		cfq_merged_request,
++	.elevator_merge_req_fn =	cfq_merged_requests,
++	.elevator_next_req_fn =		cfq_next_request,
++	.elevator_add_req_fn =		cfq_insert_request,
++	.elevator_remove_req_fn =	cfq_remove_request,
++	.elevator_queue_empty_fn =	cfq_queue_empty,
++	.elevator_former_req_fn =	cfq_former_request,
++	.elevator_latter_req_fn =	cfq_latter_request,
++	.elevator_set_req_fn =		cfq_set_request,
++	.elevator_put_req_fn =		cfq_put_request,
++	.elevator_may_queue_fn =	cfq_may_queue,
++	.elevator_init_fn =		cfq_init,
++	.elevator_exit_fn =		cfq_exit,
++};
++
++EXPORT_SYMBOL(iosched_cfq);
+--- linux-2.6.0/drivers/block/cpqarray.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/block/cpqarray.c	2003-12-28 23:21:17.000000000 -0800
+@@ -128,9 +128,9 @@ static int sendcmd(
+ 	unsigned int blkcnt,
+ 	unsigned int log_unit );
+ 
+-static int ida_open(struct inode *inode, struct file *filep);
+-static int ida_release(struct inode *inode, struct file *filep);
+-static int ida_ioctl(struct inode *inode, struct file *filep, unsigned int cmd, unsigned long arg);
++static int ida_open(struct block_device *bdev, struct file *filep);
++static int ida_release(struct gendisk *disk);
++static int ida_ioctl(struct block_device *bdev, struct file *filep, unsigned int cmd, unsigned long arg);
+ static int ida_ctlr_ioctl(ctlr_info_t *h, int dsk, ida_ioctl_t *io);
+ 
+ static void do_ida_request(request_queue_t *q);
+@@ -715,12 +715,12 @@ DBGINFO(
+ /*
+  * Open.  Make sure the device is really there.
+  */
+-static int ida_open(struct inode *inode, struct file *filep)
++static int ida_open(struct block_device *bdev, struct file *filep)
+ {
+-	drv_info_t *drv = get_drv(inode->i_bdev->bd_disk);
+-	ctlr_info_t *host = get_host(inode->i_bdev->bd_disk);
++	drv_info_t *drv = get_drv(bdev->bd_disk);
++	ctlr_info_t *host = get_host(bdev->bd_disk);
+ 
+-	DBGINFO(printk("ida_open %s\n", inode->i_bdev->bd_disk->disk_name));
++	DBGINFO(printk("ida_open %s\n", bdev->bd_disk->disk_name));
+ 	/*
+ 	 * Root is allowed to open raw volume zero even if it's not configured
+ 	 * so array config can still work.  I don't think I really like this,
+@@ -740,9 +740,9 @@ static int ida_open(struct inode *inode,
+ /*
+  * Close.  Sync first.
+  */
+-static int ida_release(struct inode *inode, struct file *filep)
++static int ida_release(struct gendisk *disk)
+ {
+-	ctlr_info_t *host = get_host(inode->i_bdev->bd_disk);
++	ctlr_info_t *host = get_host(disk);
+ 	host->usage_count--;
+ 	return 0;
+ }
+@@ -1022,10 +1022,10 @@ static void ida_timer(unsigned long tdat
+  *  ida_ioctl does some miscellaneous stuff like reporting drive geometry,
+  *  setting readahead and submitting commands from userspace to the controller.
+  */
+-static int ida_ioctl(struct inode *inode, struct file *filep, unsigned int cmd, unsigned long arg)
++static int ida_ioctl(struct block_device *bdev, struct file *filep, unsigned int cmd, unsigned long arg)
+ {
+-	drv_info_t *drv = get_drv(inode->i_bdev->bd_disk);
+-	ctlr_info_t *host = get_host(inode->i_bdev->bd_disk);
++	drv_info_t *drv = get_drv(bdev->bd_disk);
++	ctlr_info_t *host = get_host(bdev->bd_disk);
+ 	int error;
+ 	int diskinfo[4];
+ 	struct hd_geometry *geo = (struct hd_geometry *)arg;
+@@ -1046,7 +1046,7 @@ static int ida_ioctl(struct inode *inode
+ 		put_user(diskinfo[0], &geo->heads);
+ 		put_user(diskinfo[1], &geo->sectors);
+ 		put_user(diskinfo[2], &geo->cylinders);
+-		put_user(get_start_sect(inode->i_bdev), &geo->start);
++		put_user(get_start_sect(bdev), &geo->start);
+ 		return 0;
+ 	case IDAGETDRVINFO:
+ 		if (copy_to_user(&io->c.drv, drv, sizeof(drv_info_t)))
+@@ -1076,7 +1076,7 @@ out_passthru:
+ 		put_user(host->ctlr_sig, (int*)arg);
+ 		return 0;
+ 	case IDAREVALIDATEVOLS:
+-		if (iminor(inode) != 0)
++		if (bdev != bdev->bd_contains || drv != host->drv)
+ 			return -ENXIO;
+ 		return revalidate_allvol(host);
+ 	case IDADRIVERVERSION:
+--- linux-2.6.0/drivers/block/cryptoloop.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/block/cryptoloop.c	2003-12-28 23:21:53.000000000 -0800
+@@ -87,43 +87,49 @@ typedef int (*encdec_ecb_t)(struct crypt
+ 
+ 
+ static int
+-cryptoloop_transfer_ecb(struct loop_device *lo, int cmd, char *raw_buf,
+-		     char *loop_buf, int size, sector_t IV)
++cryptoloop_transfer_ecb(struct loop_device *lo, int cmd,
++			struct page *raw_page, unsigned raw_off,
++			struct page *loop_page, unsigned loop_off,
++			int size, sector_t IV)
+ {
+ 	struct crypto_tfm *tfm = (struct crypto_tfm *) lo->key_data;
+ 	struct scatterlist sg_out = { 0, };
+ 	struct scatterlist sg_in = { 0, };
+ 
+ 	encdec_ecb_t encdecfunc;
+-	char const *in;
+-	char *out;
++	struct page *in_page, *out_page;
++	unsigned in_offs, out_offs;
+ 
+ 	if (cmd == READ) {
+-		in = raw_buf;
+-		out = loop_buf;
++		in_page = raw_page;
++		in_offs = raw_off;
++		out_page = loop_page;
++		out_offs = loop_off;
+ 		encdecfunc = tfm->crt_u.cipher.cit_decrypt;
+ 	} else {
+-		in = loop_buf;
+-		out = raw_buf;
++		in_page = loop_page;
++		in_offs = loop_off;
++		out_page = raw_page;
++		out_offs = raw_off;
+ 		encdecfunc = tfm->crt_u.cipher.cit_encrypt;
+ 	}
+ 
+ 	while (size > 0) {
+ 		const int sz = min(size, LOOP_IV_SECTOR_SIZE);
+ 
+-		sg_in.page = virt_to_page(in);
+-		sg_in.offset = (unsigned long)in & ~PAGE_MASK;
++		sg_in.page = in_page;
++		sg_in.offset = in_offs;
+ 		sg_in.length = sz;
+ 
+-		sg_out.page = virt_to_page(out);
+-		sg_out.offset = (unsigned long)out & ~PAGE_MASK;
++		sg_out.page = out_page;
++		sg_out.offset = out_offs;
+ 		sg_out.length = sz;
+ 
+ 		encdecfunc(tfm, &sg_out, &sg_in, sz);
+ 
+ 		size -= sz;
+-		in += sz;
+-		out += sz;
++		in_offs += sz;
++		out_offs += sz;
+ 	}
+ 
+ 	return 0;
+@@ -135,24 +141,30 @@ typedef int (*encdec_cbc_t)(struct crypt
+ 			unsigned int nsg, u8 *iv);
+ 
+ static int
+-cryptoloop_transfer_cbc(struct loop_device *lo, int cmd, char *raw_buf,
+-		     char *loop_buf, int size, sector_t IV)
++cryptoloop_transfer_cbc(struct loop_device *lo, int cmd,
++			struct page *raw_page, unsigned raw_off,
++			struct page *loop_page, unsigned loop_off,
++			int size, sector_t IV)
+ {
+ 	struct crypto_tfm *tfm = (struct crypto_tfm *) lo->key_data;
+ 	struct scatterlist sg_out = { 0, };
+ 	struct scatterlist sg_in = { 0, };
+ 
+ 	encdec_cbc_t encdecfunc;
+-	char const *in;
+-	char *out;
++	struct page *in_page, *out_page;
++	unsigned in_offs, out_offs;
+ 
+ 	if (cmd == READ) {
+-		in = raw_buf;
+-		out = loop_buf;
++		in_page = raw_page;
++		in_offs = raw_off;
++		out_page = loop_page;
++		out_offs = loop_off;
+ 		encdecfunc = tfm->crt_u.cipher.cit_decrypt_iv;
+ 	} else {
+-		in = loop_buf;
+-		out = raw_buf;
++		in_page = loop_page;
++		in_offs = loop_off;
++		out_page = raw_page;
++		out_offs = raw_off;
+ 		encdecfunc = tfm->crt_u.cipher.cit_encrypt_iv;
+ 	}
+ 
+@@ -161,39 +173,43 @@ cryptoloop_transfer_cbc(struct loop_devi
+ 		u32 iv[4] = { 0, };
+ 		iv[0] = cpu_to_le32(IV & 0xffffffff);
+ 
+-		sg_in.page = virt_to_page(in);
+-		sg_in.offset = offset_in_page(in);
++		sg_in.page = in_page;
++		sg_in.offset = in_offs;
+ 		sg_in.length = sz;
+ 
+-		sg_out.page = virt_to_page(out);
+-		sg_out.offset = offset_in_page(out);
++		sg_out.page = out_page;
++		sg_out.offset = out_offs;
+ 		sg_out.length = sz;
+ 
+ 		encdecfunc(tfm, &sg_out, &sg_in, sz, (u8 *)iv);
+ 
+ 		IV++;
+ 		size -= sz;
+-		in += sz;
+-		out += sz;
++		in_offs += sz;
++		out_offs += sz;
+ 	}
+ 
+ 	return 0;
+ }
+ 
+ static int
+-cryptoloop_transfer(struct loop_device *lo, int cmd, char *raw_buf,
+-		     char *loop_buf, int size, sector_t IV)
++cryptoloop_transfer(struct loop_device *lo, int cmd,
++		    struct page *raw_page, unsigned raw_off,
++		    struct page *loop_page, unsigned loop_off,
++		    int size, sector_t IV)
+ {
+ 	struct crypto_tfm *tfm = (struct crypto_tfm *) lo->key_data;
+ 	if(tfm->crt_cipher.cit_mode == CRYPTO_TFM_MODE_ECB)
+ 	{
+ 		lo->transfer = cryptoloop_transfer_ecb;
+-		return cryptoloop_transfer_ecb(lo, cmd, raw_buf, loop_buf, size, IV);
++		return cryptoloop_transfer_ecb(lo, cmd, raw_page, raw_off,
++					       loop_page, loop_off, size, IV);
+ 	}	
+ 	if(tfm->crt_cipher.cit_mode == CRYPTO_TFM_MODE_CBC)
+ 	{	
+ 		lo->transfer = cryptoloop_transfer_cbc;
+-		return cryptoloop_transfer_cbc(lo, cmd, raw_buf, loop_buf, size, IV);
++		return cryptoloop_transfer_cbc(lo, cmd, raw_page, raw_off,
++					       loop_page, loop_off, size, IV);
+ 	}
+ 	
+ 	/*  This is not supposed to happen */
+--- linux-2.6.0/drivers/block/DAC960.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/block/DAC960.c	2003-12-28 23:22:28.000000000 -0800
+@@ -67,9 +67,9 @@ static long disk_size(DAC960_Controller_
+ 	}
+ }
+ 
+-static int DAC960_open(struct inode *inode, struct file *file)
++static int DAC960_open(struct block_device *bdev, struct file *file)
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
++	struct gendisk *disk = bdev->bd_disk;
+ 	DAC960_Controller_T *p = disk->queue->queuedata;
+ 	int drive_nr = (long)disk->private_data;
+ 
+@@ -84,17 +84,17 @@ static int DAC960_open(struct inode *ino
+ 			return -ENXIO;
+ 	}
+ 
+-	check_disk_change(inode->i_bdev);
++	check_disk_change(bdev);
+ 
+ 	if (!get_capacity(p->disks[drive_nr]))
+ 		return -ENXIO;
+ 	return 0;
+ }
+ 
+-static int DAC960_ioctl(struct inode *inode, struct file *file,
++static int DAC960_ioctl(struct block_device *bdev, struct file *file,
+ 			unsigned int cmd, unsigned long arg)
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
++	struct gendisk *disk = bdev->bd_disk;
+ 	DAC960_Controller_T *p = disk->queue->queuedata;
+ 	int drive_nr = (long)disk->private_data;
+ 	struct hd_geometry g, *loc = (struct hd_geometry *)arg;
+@@ -128,7 +128,7 @@ static int DAC960_ioctl(struct inode *in
+ 		g.cylinders = i->ConfigurableDeviceSize / (g.heads * g.sectors);
+ 	}
+ 	
+-	g.start = get_start_sect(inode->i_bdev);
++	g.start = get_start_sect(bdev);
+ 
+ 	return copy_to_user(loc, &g, sizeof g) ? -EFAULT : 0; 
+ }
+@@ -2474,7 +2474,6 @@ static boolean DAC960_V2_ReportDeviceCon
+ static boolean DAC960_RegisterBlockDevice(DAC960_Controller_T *Controller)
+ {
+   int MajorNumber = DAC960_MAJOR + Controller->ControllerNumber;
+-  struct request_queue *RequestQueue;
+   int n;
+ 
+   /*
+@@ -2483,26 +2482,22 @@ static boolean DAC960_RegisterBlockDevic
+   if (register_blkdev(MajorNumber, "dac960") < 0)
+       return false;
+ 
+-  /*
+-    Initialize the I/O Request Queue.
+-  */
+-  RequestQueue = blk_init_queue(DAC960_RequestFunction,&Controller->queue_lock);
+-  if (!RequestQueue) {
+-      unregister_blkdev(MajorNumber, "dac960");
+-      return false;
+-  }
+-  Controller->RequestQueue = RequestQueue;
+-  blk_queue_bounce_limit(RequestQueue, Controller->BounceBufferLimit);
+-  RequestQueue->queuedata = Controller;
+-  blk_queue_max_hw_segments(RequestQueue,
+-			    Controller->DriverScatterGatherLimit);
+-  blk_queue_max_phys_segments(RequestQueue,
+-		 	    Controller->DriverScatterGatherLimit);
+-  blk_queue_max_sectors(RequestQueue, Controller->MaxBlocksPerCommand);
+-
+   for (n = 0; n < DAC960_MaxLogicalDrives; n++) {
+ 	struct gendisk *disk = Controller->disks[n];
++  	struct request_queue *RequestQueue;
+ 
++	/* for now, let all request queues share controller's lock */
++  	RequestQueue = blk_init_queue(DAC960_RequestFunction,&Controller->queue_lock);
++  	if (!RequestQueue) {
++		printk("DAC960: failure to allocate request queue\n");
++		continue;
++  	}
++  	Controller->RequestQueue[n] = RequestQueue;
++  	blk_queue_bounce_limit(RequestQueue, Controller->BounceBufferLimit);
++  	RequestQueue->queuedata = Controller;
++  	blk_queue_max_hw_segments(RequestQueue, Controller->DriverScatterGatherLimit);
++	blk_queue_max_phys_segments(RequestQueue, Controller->DriverScatterGatherLimit);
++	blk_queue_max_sectors(RequestQueue, Controller->MaxBlocksPerCommand);
+ 	disk->queue = RequestQueue;
+ 	sprintf(disk->disk_name, "rd/c%dd%d", Controller->ControllerNumber, n);
+ 	sprintf(disk->devfs_name, "rd/host%d/target%d", Controller->ControllerNumber, n);
+@@ -2527,17 +2522,17 @@ static void DAC960_UnregisterBlockDevice
+   int MajorNumber = DAC960_MAJOR + Controller->ControllerNumber;
+   int disk;
+ 
+-  for (disk = 0; disk < DAC960_MaxLogicalDrives; disk++)
+-	  del_gendisk(Controller->disks[disk]);
++  /* does order matter when deleting gendisk and cleanup in request queue? */
++  for (disk = 0; disk < DAC960_MaxLogicalDrives; disk++) {
++	del_gendisk(Controller->disks[disk]);
++	blk_cleanup_queue(Controller->RequestQueue[disk]);
++	Controller->RequestQueue[disk] = NULL;
++  }
+ 
+   /*
+     Unregister the Block Device Major Number for this DAC960 Controller.
+   */
+   unregister_blkdev(MajorNumber, "dac960");
+-  /*
+-    Remove the I/O Request Queue.
+-  */
+-  blk_cleanup_queue(Controller->RequestQueue);
+ }
+ 
+ /*
+@@ -3253,58 +3248,83 @@ static void DAC960_V2_QueueReadWriteComm
+ }
+ 
+ 
++static int DAC960_process_queue(DAC960_Controller_T *Controller, struct request_queue *req_q)
++{
++	struct request *Request;
++	DAC960_Command_T *Command;
++
++   while(1) {
++	Request = elv_next_request(req_q);
++	if (!Request)
++		return 1;
++
++	Command = DAC960_AllocateCommand(Controller);
++	if (Command == NULL)
++		return 0;
++
++	if (rq_data_dir(Request) == READ) {
++		Command->DmaDirection = PCI_DMA_FROMDEVICE;
++		Command->CommandType = DAC960_ReadCommand;
++	} else {
++		Command->DmaDirection = PCI_DMA_TODEVICE;
++		Command->CommandType = DAC960_WriteCommand;
++	}
++	Command->Completion = Request->waiting;
++	Command->LogicalDriveNumber = (long)Request->rq_disk->private_data;
++	Command->BlockNumber = Request->sector;
++	Command->BlockCount = Request->nr_sectors;
++	Command->Request = Request;
++	blkdev_dequeue_request(Request);
++	Command->SegmentCount = blk_rq_map_sg(req_q,
++		  Command->Request, Command->cmd_sglist);
++	/* pci_map_sg MAY change the value of SegCount */
++	Command->SegmentCount = pci_map_sg(Controller->PCIDevice, Command->cmd_sglist,
++		 Command->SegmentCount, Command->DmaDirection);
++
++	DAC960_QueueReadWriteCommand(Command);
++  }
++}
++
+ /*
+   DAC960_ProcessRequest attempts to remove one I/O Request from Controller's
+   I/O Request Queue and queues it to the Controller.  WaitForCommand is true if
+   this function should wait for a Command to become available if necessary.
+   This function returns true if an I/O Request was queued and false otherwise.
+ */
+-
+-static boolean DAC960_ProcessRequest(DAC960_Controller_T *Controller,
+-				     boolean WaitForCommand)
++static void DAC960_ProcessRequest(DAC960_Controller_T *controller)
+ {
+-  struct request_queue *RequestQueue = Controller->RequestQueue;
+-  struct request *Request;
+-  DAC960_Command_T *Command;
++	int i;
+ 
+-  if (!Controller->ControllerInitialized)
+-     return false;
++	if (!controller->ControllerInitialized)
++		return;
+ 
+-  while (true) {
+-      Request = elv_next_request(RequestQueue);
+-      if (!Request)
+-	      return false;
++	/* Do this better later! */
++	for (i = controller->req_q_index; i < DAC960_MaxLogicalDrives; i++) {
++		struct request_queue *req_q = controller->RequestQueue[i];
+ 
+-      Command = DAC960_AllocateCommand(Controller);
+-      if (Command != NULL)
+-          break;
++		if (req_q == NULL)
++			continue;
+ 
+-      if (!WaitForCommand)
+-          return false;
++		if (!DAC960_process_queue(controller, req_q)) {
++			controller->req_q_index = i;
++			return;
++		}
++	}
+ 
+-      DAC960_WaitForCommand(Controller);
+-  }
+-  if (rq_data_dir(Request) == READ) {
+-    Command->DmaDirection = PCI_DMA_FROMDEVICE;
+-    Command->CommandType = DAC960_ReadCommand;
+-  } else {
+-    Command->DmaDirection = PCI_DMA_TODEVICE;
+-    Command->CommandType = DAC960_WriteCommand;
+-  }
+-  Command->Completion = Request->waiting;
+-  Command->LogicalDriveNumber = (long)Request->rq_disk->private_data;
+-  Command->BlockNumber = Request->sector;
+-  Command->BlockCount = Request->nr_sectors;
+-  Command->Request = Request;
+-  blkdev_dequeue_request(Request);
+-  Command->SegmentCount = blk_rq_map_sg(Controller->RequestQueue,
+-		  Command->Request, Command->cmd_sglist);
+-  /* pci_map_sg MAY change the value of SegCount */
+-  Command->SegmentCount = pci_map_sg(Controller->PCIDevice, Command->cmd_sglist,
+-		 Command->SegmentCount, Command->DmaDirection);
++	if (controller->req_q_index == 0)
++		return;
+ 
+-  DAC960_QueueReadWriteCommand(Command);
+-  return true;
++	for (i = 0; i < controller->req_q_index; i++) {
++		struct request_queue *req_q = controller->RequestQueue[i];
++
++		if (req_q == NULL)
++			continue;
++
++		if (!DAC960_process_queue(controller, req_q)) {
++			controller->req_q_index = i;
++			return;
++		}
++	}
+ }
+ 
+ 
+@@ -3321,6 +3341,7 @@ static void DAC960_queue_partial_rw(DAC9
+ {
+   DAC960_Controller_T *Controller = Command->Controller;
+   struct request *Request = Command->Request;
++  struct request_queue *req_q = Controller->RequestQueue[Command->LogicalDriveNumber];
+ 
+   if (Command->DmaDirection == PCI_DMA_FROMDEVICE)
+     Command->CommandType = DAC960_ReadRetryCommand;
+@@ -3333,11 +3354,9 @@ static void DAC960_queue_partial_rw(DAC9
+    * code should almost never be called, just go with a
+    * simple coding.
+    */
+-  (void)blk_rq_map_sg(Controller->RequestQueue, Command->Request,
+-                                        Command->cmd_sglist);
++  (void)blk_rq_map_sg(req_q, Command->Request, Command->cmd_sglist);
+ 
+-  (void)pci_map_sg(Controller->PCIDevice, Command->cmd_sglist, 1,
+-		                        Command->DmaDirection);
++  (void)pci_map_sg(Controller->PCIDevice, Command->cmd_sglist, 1, Command->DmaDirection);
+   /*
+    * Resubmitting the request sector at a time is really tedious.
+    * But, this should almost never happen.  So, we're willing to pay
+@@ -3357,9 +3376,7 @@ static void DAC960_queue_partial_rw(DAC9
+ 
+ static void DAC960_RequestFunction(struct request_queue *RequestQueue)
+ {
+-	int i = 0;
+-	while (DAC960_ProcessRequest(RequestQueue->queuedata, (i++ == 0)))
+-		;
++	DAC960_ProcessRequest(RequestQueue->queuedata);
+ }
+ 
+ /*
+@@ -5205,8 +5222,7 @@ static irqreturn_t DAC960_BA_InterruptHa
+     Attempt to remove additional I/O Requests from the Controller's
+     I/O Request Queue and queue them to the Controller.
+   */
+-  while (DAC960_ProcessRequest(Controller, false))
+-	  ;
++  DAC960_ProcessRequest(Controller);
+   spin_unlock_irqrestore(&Controller->queue_lock, flags);
+   return IRQ_HANDLED;
+ }
+@@ -5249,8 +5265,7 @@ static irqreturn_t DAC960_LP_InterruptHa
+     Attempt to remove additional I/O Requests from the Controller's
+     I/O Request Queue and queue them to the Controller.
+   */
+-  while (DAC960_ProcessRequest(Controller, false))
+-	  ;
++  DAC960_ProcessRequest(Controller);
+   spin_unlock_irqrestore(&Controller->queue_lock, flags);
+   return IRQ_HANDLED;
+ }
+@@ -5289,8 +5304,7 @@ static irqreturn_t DAC960_LA_InterruptHa
+     Attempt to remove additional I/O Requests from the Controller's
+     I/O Request Queue and queue them to the Controller.
+   */
+-  while (DAC960_ProcessRequest(Controller, false))
+-	  ;
++  DAC960_ProcessRequest(Controller);
+   spin_unlock_irqrestore(&Controller->queue_lock, flags);
+   return IRQ_HANDLED;
+ }
+@@ -5329,8 +5343,7 @@ static irqreturn_t DAC960_PG_InterruptHa
+     Attempt to remove additional I/O Requests from the Controller's
+     I/O Request Queue and queue them to the Controller.
+   */
+-  while (DAC960_ProcessRequest(Controller, false))
+-	  ;
++  DAC960_ProcessRequest(Controller);
+   spin_unlock_irqrestore(&Controller->queue_lock, flags);
+   return IRQ_HANDLED;
+ }
+@@ -5365,8 +5378,7 @@ static irqreturn_t DAC960_PD_InterruptHa
+     Attempt to remove additional I/O Requests from the Controller's
+     I/O Request Queue and queue them to the Controller.
+   */
+-  while (DAC960_ProcessRequest(Controller, false))
+-	  ;
++  DAC960_ProcessRequest(Controller);
+   spin_unlock_irqrestore(&Controller->queue_lock, flags);
+   return IRQ_HANDLED;
+ }
+@@ -5440,8 +5452,7 @@ static irqreturn_t DAC960_P_InterruptHan
+     Attempt to remove additional I/O Requests from the Controller's
+     I/O Request Queue and queue them to the Controller.
+   */
+-  while (DAC960_ProcessRequest(Controller, false))
+-	  ;
++  DAC960_ProcessRequest(Controller);
+   spin_unlock_irqrestore(&Controller->queue_lock, flags);
+   return IRQ_HANDLED;
+ }
+--- linux-2.6.0/drivers/block/DAC960.h	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/block/DAC960.h	2003-12-28 23:22:28.000000000 -0800
+@@ -2333,7 +2333,8 @@ typedef struct DAC960_Controller
+   DAC960_Command_T *FreeCommands;
+   unsigned char *CombinedStatusBuffer;
+   unsigned char *CurrentStatusBuffer;
+-  struct request_queue *RequestQueue;
++  struct request_queue *RequestQueue[DAC960_MaxLogicalDrives];
++  int req_q_index;
+   spinlock_t queue_lock;
+   wait_queue_head_t CommandWaitQueue;
+   wait_queue_head_t HealthStatusWaitQueue;
+--- linux-2.6.0/drivers/block/floppy98.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/block/floppy98.c	2003-12-28 23:22:57.000000000 -0800
+@@ -2594,7 +2594,7 @@ static void copy_buffer(int ssize, int m
+ 			       current_count_sectors);
+ 			if (CT(COMMAND) == FD_READ)
+ 				printk("read\n");
+-			if (CT(COMMAND) == FD_READ)
++			if (CT(COMMAND) == FD_WRITE)
+ 				printk("write\n");
+ 			break;
+ 		}
+@@ -2925,7 +2925,7 @@ static int make_raw_rw_request(void)
+ 			       current_count_sectors);
+ 			if (CT(COMMAND) == FD_READ)
+ 				printk("read\n");
+-			if (CT(COMMAND) == FD_READ)
++			if (CT(COMMAND) == FD_WRITE)
+ 				printk("write\n");
+ 			return 0;
+ 		}
+@@ -3484,14 +3484,14 @@ static int get_floppy_geometry(int drive
+ 	return 0;
+ }
+ 
+-static int fd_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
++static int fd_ioctl(struct block_device *bdev, struct file *filp, unsigned int cmd,
+ 		    unsigned long param)
+ {
+ #define FD_IOCTL_ALLOWED ((filp) && (filp)->private_data)
+ #define OUT(c,x) case c: outparam = (const char *) (x); break
+ #define IN(c,x,tag) case c: *(x) = inparam. tag ; return 0
+ 
+-	int drive = (long)inode->i_bdev->bd_disk->private_data;
++	int drive = (long)bdev->bd_disk->private_data;
+ 	int i, type = ITYPE(UDRS->fd_device);
+ 	int ret;
+ 	int size;
+@@ -3566,11 +3566,11 @@ static int fd_ioctl(struct inode *inode,
+ 			current_type[drive] = NULL;
+ 			floppy_sizes[drive] = MAX_DISK_SIZE << 1;
+ 			UDRS->keep_data = 0;
+-			return invalidate_drive(inode->i_bdev);
++			return invalidate_drive(bdev);
+ 		case FDSETPRM:
+ 		case FDDEFPRM:
+ 			return set_geometry(cmd, & inparam.g,
+-					    drive, type, inode->i_bdev);
++					    drive, type, bdev);
+ 		case FDGETPRM:
+ 			ECALL(get_floppy_geometry(drive, type, 
+ 						  (struct floppy_struct**)
+@@ -3625,7 +3625,7 @@ static int fd_ioctl(struct inode *inode,
+ 		case FDFMTEND:
+ 		case FDFLUSH:
+ 			LOCK_FDC(drive,1);
+-			return invalidate_drive(inode->i_bdev);
++			return invalidate_drive(bdev);
+ 
+ 		case FDSETEMSGTRESH:
+ 			UDP->max_errors.reporting =
+@@ -3735,9 +3735,9 @@ static void __init config_types(void)
+ 		printk("\n");
+ }
+ 
+-static int floppy_release(struct inode * inode, struct file * filp)
++static int floppy_release(struct gendisk *disk)
+ {
+-	int drive = (long)inode->i_bdev->bd_disk->private_data;
++	int drive = (long)disk->private_data;
+ 
+ 	down(&open_lock);
+ 	if (UDRS->fd_ref < 0)
+@@ -3758,11 +3758,10 @@ static int floppy_release(struct inode *
+  * /dev/PS0 etc), and disallows simultaneous access to the same
+  * drive with different device numbers.
+  */
+-#define RETERR(x) do{floppy_release(inode,filp); return -(x);}while(0)
+ 
+-static int floppy_open(struct inode * inode, struct file * filp)
++static int floppy_open(struct block_device *bdev, struct file *filp)
+ {
+-	int drive = (long)inode->i_bdev->bd_disk->private_data;
++	int drive = (long)bdev->bd_disk->private_data;
+ 	int old_dev;
+ 	int try;
+ 	int res = -EBUSY;
+@@ -3789,7 +3788,7 @@ static int floppy_open(struct inode * in
+ 
+ 	down(&open_lock);
+ 	old_dev = UDRS->fd_device;
+-	if (opened_bdev[drive] && opened_bdev[drive] != inode->i_bdev)
++	if (opened_bdev[drive] && opened_bdev[drive] != bdev)
+ 		goto out2;
+ 
+ 	if (!UDRS->fd_ref && (UDP->flags & FD_BROKEN_DCL)){
+@@ -3809,7 +3808,7 @@ static int floppy_open(struct inode * in
+ 	else
+ 		UDRS->fd_ref++;
+ 
+-	opened_bdev[drive] = inode->i_bdev;
++	opened_bdev[drive] = bdev;
+ 
+ 	res = -ENXIO;
+ 
+@@ -3844,9 +3843,9 @@ static int floppy_open(struct inode * in
+ 		}
+ 	}
+ 
+-	UDRS->fd_device = iminor(inode);
+-	set_capacity(disks[drive], floppy_sizes[iminor(inode)]);
+-	if (old_dev != -1 && old_dev != iminor(inode)) {
++	UDRS->fd_device = MINOR(bdev->bd_dev);
++	set_capacity(disks[drive], floppy_sizes[MINOR(bdev->bd_dev)]);
++	if (old_dev != -1 && old_dev != MINOR(bdev->bd_dev)) {
+ 		if (buffer_drive == drive)
+ 			buffer_track = -1;
+ 	}
+@@ -3859,8 +3858,7 @@ static int floppy_open(struct inode * in
+ 	/* Allow ioctls if we have write-permissions even if read-only open.
+ 	 * Needed so that programs such as fdrawcmd still can work on write
+ 	 * protected disks */
+-	if ((filp->f_mode & 2) || 
+-	    (inode->i_sb && (permission(inode,2) == 0)))
++	if ((filp->f_mode & 2) || permission(filp->f_dentry->d_inode,2) == 0)
+ 	    filp->private_data = (void*) 8;
+ 
+ 	if (UFDCS->rawcmd == 1)
+@@ -3873,7 +3871,7 @@ static int floppy_open(struct inode * in
+ 	if (!(filp->f_flags & O_NDELAY)) {
+ 		if (filp->f_mode & 3) {
+ 			UDRS->last_checked = 0;
+-			check_disk_change(inode->i_bdev);
++			check_disk_change(bdev);
+ 			if (UTESTF(FD_DISK_CHANGED))
+ 				goto out;
+ 		}
+--- linux-2.6.0/drivers/block/floppy.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/block/floppy.c	2003-12-28 23:22:57.000000000 -0800
+@@ -2563,7 +2563,7 @@ static void copy_buffer(int ssize, int m
+ 			       current_count_sectors);
+ 			if (CT(COMMAND) == FD_READ)
+ 				printk("read\n");
+-			if (CT(COMMAND) == FD_READ)
++			if (CT(COMMAND) == FD_WRITE)
+ 				printk("write\n");
+ 			break;
+ 		}
+@@ -2894,7 +2894,7 @@ static int make_raw_rw_request(void)
+ 			       current_count_sectors);
+ 			if (CT(COMMAND) == FD_READ)
+ 				printk("read\n");
+-			if (CT(COMMAND) == FD_READ)
++			if (CT(COMMAND) == FD_WRITE)
+ 				printk("write\n");
+ 			return 0;
+ 		}
+@@ -3456,14 +3456,14 @@ static int get_floppy_geometry(int drive
+ 	return 0;
+ }
+ 
+-static int fd_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
++static int fd_ioctl(struct block_device *bdev, struct file *filp, unsigned int cmd,
+ 		    unsigned long param)
+ {
+ #define FD_IOCTL_ALLOWED ((filp) && (filp)->private_data)
+ #define OUT(c,x) case c: outparam = (const char *) (x); break
+ #define IN(c,x,tag) case c: *(x) = inparam. tag ; return 0
+ 
+-	int drive = (long)inode->i_bdev->bd_disk->private_data;
++	int drive = (long)bdev->bd_disk->private_data;
+ 	int i, type = ITYPE(UDRS->fd_device);
+ 	int ret;
+ 	int size;
+@@ -3539,11 +3539,11 @@ static int fd_ioctl(struct inode *inode,
+ 			current_type[drive] = NULL;
+ 			floppy_sizes[drive] = MAX_DISK_SIZE << 1;
+ 			UDRS->keep_data = 0;
+-			return invalidate_drive(inode->i_bdev);
++			return invalidate_drive(bdev);
+ 		case FDSETPRM:
+ 		case FDDEFPRM:
+ 			return set_geometry(cmd, & inparam.g,
+-					    drive, type, inode->i_bdev);
++					    drive, type, bdev);
+ 		case FDGETPRM:
+ 			ECALL(get_floppy_geometry(drive, type, 
+ 						  (struct floppy_struct**)
+@@ -3574,7 +3574,7 @@ static int fd_ioctl(struct inode *inode,
+ 		case FDFMTEND:
+ 		case FDFLUSH:
+ 			LOCK_FDC(drive,1);
+-			return invalidate_drive(inode->i_bdev);
++			return invalidate_drive(bdev);
+ 
+ 		case FDSETEMSGTRESH:
+ 			UDP->max_errors.reporting =
+@@ -3685,9 +3685,9 @@ static void __init config_types(void)
+ 		printk("\n");
+ }
+ 
+-static int floppy_release(struct inode * inode, struct file * filp)
++static int floppy_release(struct gendisk *disk)
+ {
+-	int drive = (long)inode->i_bdev->bd_disk->private_data;
++	int drive = (long)disk->private_data;
+ 
+ 	down(&open_lock);
+ 	if (UDRS->fd_ref < 0)
+@@ -3708,9 +3708,9 @@ static int floppy_release(struct inode *
+  * /dev/PS0 etc), and disallows simultaneous access to the same
+  * drive with different device numbers.
+  */
+-static int floppy_open(struct inode * inode, struct file * filp)
++static int floppy_open(struct block_device *bdev, struct file * filp)
+ {
+-	int drive = (long)inode->i_bdev->bd_disk->private_data;
++	int drive = (long)bdev->bd_disk->private_data;
+ 	int old_dev;
+ 	int try;
+ 	int res = -EBUSY;
+@@ -3719,7 +3719,7 @@ static int floppy_open(struct inode * in
+ 	filp->private_data = (void*) 0;
+ 	down(&open_lock);
+ 	old_dev = UDRS->fd_device;
+-	if (opened_bdev[drive] && opened_bdev[drive] != inode->i_bdev)
++	if (opened_bdev[drive] && opened_bdev[drive] != bdev)
+ 		goto out2;
+ 
+ 	if (!UDRS->fd_ref && (UDP->flags & FD_BROKEN_DCL)){
+@@ -3739,7 +3739,7 @@ static int floppy_open(struct inode * in
+ 	else
+ 		UDRS->fd_ref++;
+ 
+-	opened_bdev[drive] = inode->i_bdev;
++	opened_bdev[drive] = bdev;
+ 
+ 	res = -ENXIO;
+ 
+@@ -3774,9 +3774,9 @@ static int floppy_open(struct inode * in
+ 		}
+ 	}
+ 
+-	UDRS->fd_device = iminor(inode);
+-	set_capacity(disks[drive], floppy_sizes[iminor(inode)]);
+-	if (old_dev != -1 && old_dev != iminor(inode)) {
++	UDRS->fd_device = MINOR(bdev->bd_dev);
++	set_capacity(disks[drive], floppy_sizes[MINOR(bdev->bd_dev)]);
++	if (old_dev != -1 && old_dev != MINOR(bdev->bd_dev)) {
+ 		if (buffer_drive == drive)
+ 			buffer_track = -1;
+ 	}
+@@ -3784,8 +3784,7 @@ static int floppy_open(struct inode * in
+ 	/* Allow ioctls if we have write-permissions even if read-only open.
+ 	 * Needed so that programs such as fdrawcmd still can work on write
+ 	 * protected disks */
+-	if ((filp->f_mode & 2) || 
+-	    (inode->i_sb && (permission(inode,2, NULL) == 0)))
++	if ((filp->f_mode & 2) || permission(filp->f_dentry->d_inode,2,NULL) == 0)
+ 	    filp->private_data = (void*) 8;
+ 
+ 	if (UFDCS->rawcmd == 1)
+@@ -3794,7 +3793,7 @@ static int floppy_open(struct inode * in
+ 	if (!(filp->f_flags & O_NDELAY)) {
+ 		if (filp->f_mode & 3) {
+ 			UDRS->last_checked = 0;
+-			check_disk_change(inode->i_bdev);
++			check_disk_change(bdev);
+ 			if (UTESTF(FD_DISK_CHANGED))
+ 				goto out;
+ 		}
+--- linux-2.6.0/drivers/block/genhd.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/block/genhd.c	2003-12-28 23:21:42.000000000 -0800
+@@ -296,7 +296,9 @@ extern int blk_dev_init(void);
+ 
+ static struct kobject *base_probe(dev_t dev, int *part, void *data)
+ {
+-	request_module("block-major-%d", MAJOR(dev));
++	if (request_module("block-major-%d-%d", MAJOR(dev), MINOR(dev)) > 0)
++		/* Make old-style 2.4 aliases work */
++		request_module("block-major-%d", MAJOR(dev));
+ 	return NULL;
+ }
+ 
+--- linux-2.6.0/drivers/block/ioctl.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/block/ioctl.c	2003-12-28 23:21:22.000000000 -0800
+@@ -132,10 +132,9 @@ static int put_u64(unsigned long arg, u6
+ 	return put_user(val, (u64 *)arg);
+ }
+ 
+-int blkdev_ioctl(struct inode *inode, struct file *file, unsigned cmd,
++int blkdev_ioctl(struct block_device *bdev, struct file *file, unsigned cmd,
+ 			unsigned long arg)
+ {
+-	struct block_device *bdev = inode->i_bdev;
+ 	struct gendisk *disk = bdev->bd_disk;
+ 	struct backing_dev_info *bdi;
+ 	int holder;
+@@ -194,7 +193,7 @@ int blkdev_ioctl(struct inode *inode, st
+ 		if (!capable(CAP_SYS_ADMIN))
+ 			return -EACCES;
+ 		if (disk->fops->ioctl) {
+-			ret = disk->fops->ioctl(inode, file, cmd, arg);
++			ret = disk->fops->ioctl(bdev, file, cmd, arg);
+ 			if (ret != -EINVAL)
+ 				return ret;
+ 		}
+@@ -203,7 +202,7 @@ int blkdev_ioctl(struct inode *inode, st
+ 		return 0;
+ 	case BLKROSET:
+ 		if (disk->fops->ioctl) {
+-			ret = disk->fops->ioctl(inode, file, cmd, arg);
++			ret = disk->fops->ioctl(bdev, file, cmd, arg);
+ 			if (ret != -EINVAL)
+ 				return ret;
+ 		}
+@@ -215,7 +214,7 @@ int blkdev_ioctl(struct inode *inode, st
+ 		return 0;
+ 	default:
+ 		if (disk->fops->ioctl)
+-			return disk->fops->ioctl(inode, file, cmd, arg);
++			return disk->fops->ioctl(bdev, file, cmd, arg);
+ 	}
+ 	return -ENOTTY;
+ }
+--- linux-2.6.0/drivers/block/Kconfig.iosched	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/block/Kconfig.iosched	2003-12-28 23:21:35.000000000 -0800
+@@ -27,3 +27,10 @@ config IOSCHED_DEADLINE
+ 	  a disk at any one time, its behaviour is almost identical to the
+ 	  anticipatory I/O scheduler and so is a good choice.
+ 
++config IOSCHED_CFQ
++	bool "CFQ I/O scheduler" if EMBEDDED
++	default y
++	---help---
++	  The CFQ I/O scheduler tries to distribute bandwidth equally
++	  among all processes in the system. It should provide a fair
++	  working environment, suitable for desktop systems.
+--- linux-2.6.0/drivers/block/ll_rw_blk.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/block/ll_rw_blk.c	2003-12-28 23:26:41.000000000 -0800
+@@ -517,10 +517,10 @@ init_tag_map(request_queue_t *q, struct 
+ {
+ 	int bits, i;
+ 
+-	if (depth > q->nr_requests * 2) {
+-		depth = q->nr_requests * 2;
+-		printk(KERN_ERR "%s: adjusted depth to %d\n",
+-				__FUNCTION__, depth);
++	if (depth > q->nr_requests / 2) {
++		q->nr_requests = depth * 2;
++		printk(KERN_INFO "%s: large TCQ depth: adjusted nr_requests "
++				 "to %lu\n", __FUNCTION__, q->nr_requests);
+ 	}
+ 
+ 	tags->tag_index = kmalloc(depth * sizeof(struct request *), GFP_ATOMIC);
+@@ -780,11 +780,6 @@ static char *rq_flags[] = {
+ 	"REQ_PM_SUSPEND",
+ 	"REQ_PM_RESUME",
+ 	"REQ_PM_SHUTDOWN",
+-	"REQ_IDETAPE_PC1",
+-	"REQ_IDETAPE_PC2",
+-	"REQ_IDETAPE_READ",
+-	"REQ_IDETAPE_WRITE",
+-	"REQ_IDETAPE_READ_BUFFER",
+ };
+ 
+ void blk_dump_rq_flags(struct request *rq, char *msg)
+@@ -1335,6 +1330,8 @@ static elevator_t *chosen_elevator =
+ 	&iosched_as;
+ #elif defined(CONFIG_IOSCHED_DEADLINE)
+ 	&iosched_deadline;
++#elif defined(CONFIG_IOSCHED_CFQ)
++	&iosched_cfq;
+ #elif defined(CONFIG_IOSCHED_NOOP)
+ 	&elevator_noop;
+ #else
+@@ -1353,6 +1350,10 @@ static int __init elevator_setup(char *s
+ 	if (!strcmp(str, "as"))
+ 		chosen_elevator = &iosched_as;
+ #endif
++#ifdef CONFIG_IOSCHED_CFQ
++	if (!strcmp(str, "cfq"))
++		chosen_elevator = &iosched_cfq;
++#endif
+ #ifdef CONFIG_IOSCHED_NOOP
+ 	if (!strcmp(str, "noop"))
+ 		chosen_elevator = &elevator_noop;
+@@ -1875,29 +1876,52 @@ void blk_put_request(struct request *req
+ 		spin_unlock_irqrestore(q->queue_lock, flags);
+ 	}
+ }
+-
+ EXPORT_SYMBOL(blk_put_request);
+ 
+ /**
+- * blk_congestion_wait - wait for a queue to become uncongested
++ * blk_congestion_wait_wq - wait for a queue to become uncongested,
+  * @rw: READ or WRITE
+  * @timeout: timeout in jiffies
++ * @wait : wait queue entry to use for waiting or async notification
++ * (NULL defaults to synchronous behaviour)
+  *
+  * Waits for up to @timeout jiffies for a queue (any queue) to exit congestion.
+  * If no queues are congested then just wait for the next request to be
+  * returned.
++ *
++ * If the wait queue parameter specifies an async i/o callback,
++ * then instead of blocking, just register the callback on the wait
++ * queue for async notification when the queue gets uncongested.
+  */
+-void blk_congestion_wait(int rw, long timeout)
++int blk_congestion_wait_wq(int rw, long timeout, wait_queue_t *wait)
+ {
+-	DEFINE_WAIT(wait);
+ 	wait_queue_head_t *wqh = &congestion_wqh[rw];
++	DEFINE_WAIT(local_wait);
++
++	if (!wait)
++		wait = &local_wait;
+ 
+ 	blk_run_queues();
+-	prepare_to_wait(wqh, &wait, TASK_UNINTERRUPTIBLE);
++	prepare_to_wait(wqh, wait, TASK_UNINTERRUPTIBLE);
++	if (!is_sync_wait(wait)) {
++		/*
++		 * if we've queued an async wait queue
++		 * callback do not block; just tell the
++		 * caller to return and retry later when
++		 * the callback is notified
++		 */
++		return -EIOCBRETRY;
++	}
+ 	io_schedule_timeout(timeout);
+-	finish_wait(wqh, &wait);
++	finish_wait(wqh, wait);
++	return 0;
+ }
++EXPORT_SYMBOL(blk_congestion_wait_wq);
+ 
++void blk_congestion_wait(int rw, long timeout)
++{
++	blk_congestion_wait_wq(rw, timeout, NULL);
++}
+ EXPORT_SYMBOL(blk_congestion_wait);
+ 
+ /*
+--- linux-2.6.0/drivers/block/loop.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/block/loop.c	2003-12-28 23:21:54.000000000 -0800
+@@ -55,6 +55,7 @@
+ #include <linux/errno.h>
+ #include <linux/major.h>
+ #include <linux/wait.h>
++#include <linux/blkdev.h>
+ #include <linux/blkpg.h>
+ #include <linux/init.h>
+ #include <linux/devfs_fs_kernel.h>
+@@ -75,24 +76,34 @@ static struct gendisk **disks;
+ /*
+  * Transfer functions
+  */
+-static int transfer_none(struct loop_device *lo, int cmd, char *raw_buf,
+-			 char *loop_buf, int size, sector_t real_block)
++static int transfer_none(struct loop_device *lo, int cmd,
++			 struct page *raw_page, unsigned raw_off,
++			 struct page *loop_page, unsigned loop_off,
++			 int size, sector_t real_block)
+ {
+-	if (raw_buf != loop_buf) {
+-		if (cmd == READ)
+-			memcpy(loop_buf, raw_buf, size);
+-		else
+-			memcpy(raw_buf, loop_buf, size);
+-	}
++	char *raw_buf = kmap_atomic(raw_page, KM_USER0) + raw_off;
++	char *loop_buf = kmap_atomic(loop_page, KM_USER1) + loop_off;
++
++	if (cmd == READ)
++		memcpy(loop_buf, raw_buf, size);
++	else
++		memcpy(raw_buf, loop_buf, size);
+ 
++	kunmap_atomic(raw_buf, KM_USER0);
++	kunmap_atomic(loop_buf, KM_USER1);
++	cond_resched();
+ 	return 0;
+ }
+ 
+-static int transfer_xor(struct loop_device *lo, int cmd, char *raw_buf,
+-			char *loop_buf, int size, sector_t real_block)
+-{
+-	char	*in, *out, *key;
+-	int	i, keysize;
++static int transfer_xor(struct loop_device *lo, int cmd,
++			struct page *raw_page, unsigned raw_off,
++			struct page *loop_page, unsigned loop_off,
++			int size, sector_t real_block)
++{
++	char *raw_buf = kmap_atomic(raw_page, KM_USER0) + raw_off;
++	char *loop_buf = kmap_atomic(loop_page, KM_USER1) + loop_off;
++	char *in, *out, *key;
++	int i, keysize;
+ 
+ 	if (cmd == READ) {
+ 		in = raw_buf;
+@@ -106,6 +117,10 @@ static int transfer_xor(struct loop_devi
+ 	keysize = lo->lo_encrypt_key_size;
+ 	for (i = 0; i < size; i++)
+ 		*out++ = *in++ ^ key[(i & 511) % keysize];
++
++	kunmap_atomic(raw_buf, KM_USER0);
++	kunmap_atomic(loop_buf, KM_USER1);
++	cond_resched();
+ 	return 0;
+ }
+ 
+@@ -140,8 +155,7 @@ figure_loop_size(struct loop_device *lo)
+ 	sector_t x;
+ 
+ 	/* Compute loopsize in bytes */
+-	size = i_size_read(lo->lo_backing_file->f_dentry->
+-				d_inode->i_mapping->host);
++	size = i_size_read(lo->lo_backing_file->f_mapping->host);
+ 	offset = lo->lo_offset;
+ 	loopsize = size - offset;
+ 	if (lo->lo_sizelimit > 0 && lo->lo_sizelimit < loopsize)
+@@ -162,32 +176,33 @@ figure_loop_size(struct loop_device *lo)
+ }
+ 
+ static inline int
+-lo_do_transfer(struct loop_device *lo, int cmd, char *rbuf,
+-	       char *lbuf, int size, sector_t rblock)
++lo_do_transfer(struct loop_device *lo, int cmd,
++	       struct page *rpage, unsigned roffs,
++	       struct page *lpage, unsigned loffs,
++	       int size, sector_t rblock)
+ {
+ 	if (!lo->transfer)
+ 		return 0;
+ 
+-	return lo->transfer(lo, cmd, rbuf, lbuf, size, rblock);
++	return lo->transfer(lo, cmd, rpage, roffs, lpage, loffs, size, rblock);
+ }
+ 
+ static int
+ do_lo_send(struct loop_device *lo, struct bio_vec *bvec, int bsize, loff_t pos)
+ {
+ 	struct file *file = lo->lo_backing_file; /* kudos to NFsckingS */
+-	struct address_space *mapping = file->f_dentry->d_inode->i_mapping;
++	struct address_space *mapping = file->f_mapping;
+ 	struct address_space_operations *aops = mapping->a_ops;
+ 	struct page *page;
+-	char *kaddr, *data;
+ 	pgoff_t index;
+-	unsigned size, offset;
++	unsigned size, offset, bv_offs;
+ 	int len;
+ 	int ret = 0;
+ 
+ 	down(&mapping->host->i_sem);
+ 	index = pos >> PAGE_CACHE_SHIFT;
+ 	offset = pos & ((pgoff_t)PAGE_CACHE_SIZE - 1);
+-	data = kmap(bvec->bv_page) + bvec->bv_offset;
++	bv_offs = bvec->bv_offset;
+ 	len = bvec->bv_len;
+ 	while (len > 0) {
+ 		sector_t IV;
+@@ -204,25 +219,28 @@ do_lo_send(struct loop_device *lo, struc
+ 			goto fail;
+ 		if (aops->prepare_write(file, page, offset, offset+size))
+ 			goto unlock;
+-		kaddr = kmap(page);
+-		transfer_result = lo_do_transfer(lo, WRITE, kaddr + offset,
+-						 data, size, IV);
++		transfer_result = lo_do_transfer(lo, WRITE, page, offset,
++						 bvec->bv_page, bv_offs,
++						 size, IV);
+ 		if (transfer_result) {
++			char *kaddr;
++
+ 			/*
+ 			 * The transfer failed, but we still write the data to
+ 			 * keep prepare/commit calls balanced.
+ 			 */
+ 			printk(KERN_ERR "loop: transfer error block %llu\n",
+ 			       (unsigned long long)index);
++			kaddr = kmap_atomic(page, KM_USER0);
+ 			memset(kaddr + offset, 0, size);
++			kunmap_atomic(kaddr, KM_USER0);
+ 		}
+ 		flush_dcache_page(page);
+-		kunmap(page);
+ 		if (aops->commit_write(file, page, offset, offset+size))
+ 			goto unlock;
+ 		if (transfer_result)
+ 			goto unlock;
+-		data += size;
++		bv_offs += size;
+ 		len -= size;
+ 		offset = 0;
+ 		index++;
+@@ -232,7 +250,6 @@ do_lo_send(struct loop_device *lo, struc
+ 	}
+ 	up(&mapping->host->i_sem);
+ out:
+-	kunmap(bvec->bv_page);
+ 	return ret;
+ 
+ unlock:
+@@ -247,12 +264,10 @@ fail:
+ static int
+ lo_send(struct loop_device *lo, struct bio *bio, int bsize, loff_t pos)
+ {
+-	unsigned vecnr;
+-	int ret = 0;
+-
+-	for (vecnr = 0; vecnr < bio->bi_vcnt; vecnr++) {
+-		struct bio_vec *bvec = &bio->bi_io_vec[vecnr];
++	struct bio_vec *bvec;
++	int i, ret = 0;
+ 
++	bio_for_each_segment(bvec, bio, i) {
+ 		ret = do_lo_send(lo, bvec, bsize, pos);
+ 		if (ret < 0)
+ 			break;
+@@ -263,7 +278,8 @@ lo_send(struct loop_device *lo, struct b
+ 
+ struct lo_read_data {
+ 	struct loop_device *lo;
+-	char *data;
++	struct page *page;
++	unsigned offset;
+ 	int bsize;
+ };
+ 
+@@ -271,7 +287,6 @@ static int
+ lo_read_actor(read_descriptor_t *desc, struct page *page,
+ 	      unsigned long offset, unsigned long size)
+ {
+-	char *kaddr;
+ 	unsigned long count = desc->count;
+ 	struct lo_read_data *p = (struct lo_read_data*)desc->buf;
+ 	struct loop_device *lo = p->lo;
+@@ -282,18 +297,16 @@ lo_read_actor(read_descriptor_t *desc, s
+ 	if (size > count)
+ 		size = count;
+ 
+-	kaddr = kmap(page);
+-	if (lo_do_transfer(lo, READ, kaddr + offset, p->data, size, IV)) {
++	if (lo_do_transfer(lo, READ, page, offset, p->page, p->offset, size, IV)) {
+ 		size = 0;
+ 		printk(KERN_ERR "loop: transfer error block %ld\n",
+ 		       page->index);
+ 		desc->error = -EINVAL;
+ 	}
+-	kunmap(page);
+ 	
+ 	desc->count = count - size;
+ 	desc->written += size;
+-	p->data += size;
++	p->offset += size;
+ 	return size;
+ }
+ 
+@@ -306,24 +319,22 @@ do_lo_receive(struct loop_device *lo,
+ 	int retval;
+ 
+ 	cookie.lo = lo;
+-	cookie.data = kmap(bvec->bv_page) + bvec->bv_offset;
++	cookie.page = bvec->bv_page;
++	cookie.offset = bvec->bv_offset;
+ 	cookie.bsize = bsize;
+ 	file = lo->lo_backing_file;
+ 	retval = file->f_op->sendfile(file, &pos, bvec->bv_len,
+ 			lo_read_actor, &cookie);
+-	kunmap(bvec->bv_page);
+ 	return (retval < 0)? retval: 0;
+ }
+ 
+ static int
+ lo_receive(struct loop_device *lo, struct bio *bio, int bsize, loff_t pos)
+ {
+-	unsigned vecnr;
+-	int ret = 0;
+-
+-	for (vecnr = 0; vecnr < bio->bi_vcnt; vecnr++) {
+-		struct bio_vec *bvec = &bio->bi_io_vec[vecnr];
++	struct bio_vec *bvec;
++	int i, ret = 0;
+ 
++	bio_for_each_segment(bvec, bio, i) {
+ 		ret = do_lo_receive(lo, bvec, bsize, pos);
+ 		if (ret < 0)
+ 			break;
+@@ -345,23 +356,6 @@ static int do_bio_filebacked(struct loop
+ 	return ret;
+ }
+ 
+-static int loop_end_io_transfer(struct bio *, unsigned int, int);
+-
+-static void loop_put_buffer(struct bio *bio)
+-{
+-	/*
+-	 * check bi_end_io, may just be a remapped bio
+-	 */
+-	if (bio && bio->bi_end_io == loop_end_io_transfer) {
+-		int i;
+-
+-		for (i = 0; i < bio->bi_vcnt; i++)
+-			__free_page(bio->bi_io_vec[i].bv_page);
+-
+-		bio_put(bio);
+-	}
+-}
+-
+ /*
+  * Add bio to back of pending list
+  */
+@@ -399,129 +393,8 @@ static struct bio *loop_get_bio(struct l
+ 	return bio;
+ }
+ 
+-/*
+- * if this was a WRITE lo->transfer stuff has already been done. for READs,
+- * queue it for the loop thread and let it do the transfer out of
+- * bi_end_io context (we don't want to do decrypt of a page with irqs
+- * disabled)
+- */
+-static int loop_end_io_transfer(struct bio *bio, unsigned int bytes_done, int err)
+-{
+-	struct bio *rbh = bio->bi_private;
+-	struct loop_device *lo = rbh->bi_bdev->bd_disk->private_data;
+-
+-	if (bio->bi_size)
+-		return 1;
+-
+-	if (err || bio_rw(bio) == WRITE) {
+-		bio_endio(rbh, rbh->bi_size, err);
+-		if (atomic_dec_and_test(&lo->lo_pending))
+-			up(&lo->lo_bh_mutex);
+-		loop_put_buffer(bio);
+-	} else
+-		loop_add_bio(lo, bio);
+-
+-	return 0;
+-}
+-
+-static struct bio *loop_copy_bio(struct bio *rbh)
+-{
+-	struct bio *bio;
+-	struct bio_vec *bv;
+-	int i;
+-
+-	bio = bio_alloc(__GFP_NOWARN, rbh->bi_vcnt);
+-	if (!bio)
+-		return NULL;
+-
+-	/*
+-	 * iterate iovec list and alloc pages
+-	 */
+-	__bio_for_each_segment(bv, rbh, i, 0) {
+-		struct bio_vec *bbv = &bio->bi_io_vec[i];
+-
+-		bbv->bv_page = alloc_page(__GFP_NOWARN|__GFP_HIGHMEM);
+-		if (bbv->bv_page == NULL)
+-			goto oom;
+-
+-		bbv->bv_len = bv->bv_len;
+-		bbv->bv_offset = bv->bv_offset;
+-	}
+-
+-	bio->bi_vcnt = rbh->bi_vcnt;
+-	bio->bi_size = rbh->bi_size;
+-
+-	return bio;
+-
+-oom:
+-	while (--i >= 0)
+-		__free_page(bio->bi_io_vec[i].bv_page);
+-
+-	bio_put(bio);
+-	return NULL;
+-}
+-
+-static struct bio *loop_get_buffer(struct loop_device *lo, struct bio *rbh)
+-{
+-	struct bio *bio;
+-
+-	/*
+-	 * When called on the page reclaim -> writepage path, this code can
+-	 * trivially consume all memory.  So we drop PF_MEMALLOC to avoid
+-	 * stealing all the page reserves and throttle to the writeout rate.
+-	 * pdflush will have been woken by page reclaim.  Let it do its work.
+-	 */
+-	do {
+-		int flags = current->flags;
+-
+-		current->flags &= ~PF_MEMALLOC;
+-		bio = loop_copy_bio(rbh);
+-		if (flags & PF_MEMALLOC)
+-			current->flags |= PF_MEMALLOC;
+-
+-		if (bio == NULL)
+-			blk_congestion_wait(WRITE, HZ/10);
+-	} while (bio == NULL);
+-
+-	bio->bi_end_io = loop_end_io_transfer;
+-	bio->bi_private = rbh;
+-	bio->bi_sector = rbh->bi_sector + (lo->lo_offset >> 9);
+-	bio->bi_rw = rbh->bi_rw;
+-	bio->bi_bdev = lo->lo_device;
+-
+-	return bio;
+-}
+-
+-static int loop_transfer_bio(struct loop_device *lo,
+-			     struct bio *to_bio, struct bio *from_bio)
+-{
+-	sector_t IV;
+-	struct bio_vec *from_bvec, *to_bvec;
+-	char *vto, *vfrom;
+-	int ret = 0, i;
+-
+-	IV = from_bio->bi_sector + (lo->lo_offset >> 9);
+-
+-	__bio_for_each_segment(from_bvec, from_bio, i, 0) {
+-		to_bvec = &to_bio->bi_io_vec[i];
+-
+-		kmap(from_bvec->bv_page);
+-		kmap(to_bvec->bv_page);
+-		vfrom = page_address(from_bvec->bv_page) + from_bvec->bv_offset;
+-		vto = page_address(to_bvec->bv_page) + to_bvec->bv_offset;
+-		ret |= lo_do_transfer(lo, bio_data_dir(to_bio), vto, vfrom,
+-					from_bvec->bv_len, IV);
+-		kunmap(from_bvec->bv_page);
+-		kunmap(to_bvec->bv_page);
+-		IV += from_bvec->bv_len >> 9;
+-	}
+-
+-	return ret;
+-}
+-		
+ static int loop_make_request(request_queue_t *q, struct bio *old_bio)
+ {
+-	struct bio *new_bio = NULL;
+ 	struct loop_device *lo = q->queuedata;
+ 	int rw = bio_rw(old_bio);
+ 
+@@ -543,31 +416,11 @@ static int loop_make_request(request_que
+ 		printk(KERN_ERR "loop: unknown command (%x)\n", rw);
+ 		goto err;
+ 	}
+-
+-	/*
+-	 * file backed, queue for loop_thread to handle
+-	 */
+-	if (lo->lo_flags & LO_FLAGS_DO_BMAP) {
+-		loop_add_bio(lo, old_bio);
+-		return 0;
+-	}
+-
+-	/*
+-	 * piggy old buffer on original, and submit for I/O
+-	 */
+-	new_bio = loop_get_buffer(lo, old_bio);
+-	if (rw == WRITE) {
+-		if (loop_transfer_bio(lo, new_bio, old_bio))
+-			goto err;
+-	}
+-
+-	generic_make_request(new_bio);
++	loop_add_bio(lo, old_bio);
+ 	return 0;
+-
+ err:
+ 	if (atomic_dec_and_test(&lo->lo_pending))
+ 		up(&lo->lo_bh_mutex);
+-	loop_put_buffer(new_bio);
+ out:
+ 	bio_io_error(old_bio, old_bio->bi_size);
+ 	return 0;
+@@ -580,20 +433,8 @@ static inline void loop_handle_bio(struc
+ {
+ 	int ret;
+ 
+-	/*
+-	 * For block backed loop, we know this is a READ
+-	 */
+-	if (lo->lo_flags & LO_FLAGS_DO_BMAP) {
+-		ret = do_bio_filebacked(lo, bio);
+-		bio_endio(bio, bio->bi_size, ret);
+-	} else {
+-		struct bio *rbh = bio->bi_private;
+-
+-		ret = loop_transfer_bio(lo, bio, rbh);
+-
+-		bio_endio(rbh, rbh->bi_size, ret);
+-		loop_put_buffer(bio);
+-	}
++	ret = do_bio_filebacked(lo, bio);
++	bio_endio(bio, bio->bi_size, ret);
+ }
+ 
+ /*
+@@ -660,6 +501,7 @@ static int loop_set_fd(struct loop_devic
+ 	struct file	*file;
+ 	struct inode	*inode;
+ 	struct block_device *lo_device = NULL;
++	struct address_space *mapping;
+ 	unsigned lo_blocksize;
+ 	int		lo_flags = 0;
+ 	int		error;
+@@ -676,35 +518,27 @@ static int loop_set_fd(struct loop_devic
+ 	if (!file)
+ 		goto out;
+ 
+-	error = -EINVAL;
+-	inode = file->f_dentry->d_inode;
++	mapping = file->f_mapping;
++	inode = mapping->host;
+ 
+ 	if (!(file->f_mode & FMODE_WRITE))
+ 		lo_flags |= LO_FLAGS_READ_ONLY;
+ 
+-	if (S_ISBLK(inode->i_mode)) {
+-		lo_device = inode->i_bdev;
+-		if (lo_device == bdev) {
+-			error = -EBUSY;
+-			goto out;
+-		}
+-		lo_blocksize = block_size(lo_device);
+-		if (bdev_read_only(lo_device))
+-			lo_flags |= LO_FLAGS_READ_ONLY;
+-	} else if (S_ISREG(inode->i_mode)) {
+-		struct address_space_operations *aops = inode->i_mapping->a_ops;
++	error = -EINVAL;
++
++	if (S_ISREG(inode->i_mode) || S_ISBLK(inode->i_mode)) {
++		struct address_space_operations *aops = mapping->a_ops;
+ 		/*
+ 		 * If we can't read - sorry. If we only can't write - well,
+ 		 * it's going to be read-only.
+ 		 */
+-		if (!inode->i_fop->sendfile)
++		if (!lo_file->f_op->sendfile)
+ 			goto out_putf;
+ 
+ 		if (!aops->prepare_write || !aops->commit_write)
+ 			lo_flags |= LO_FLAGS_READ_ONLY;
+ 
+ 		lo_blocksize = inode->i_blksize;
+-		lo_flags |= LO_FLAGS_DO_BMAP;
+ 		error = 0;
+ 	} else
+ 		goto out_putf;
+@@ -728,9 +562,8 @@ static int loop_set_fd(struct loop_devic
+ 		fput(file);
+ 		goto out_putf;
+ 	}
+-	lo->old_gfp_mask = mapping_gfp_mask(inode->i_mapping);
+-	mapping_set_gfp_mask(inode->i_mapping,
+-			     lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));
++	lo->old_gfp_mask = mapping_gfp_mask(mapping);
++	mapping_set_gfp_mask(mapping, lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));
+ 
+ 	set_blocksize(bdev, lo_blocksize);
+ 
+@@ -743,20 +576,6 @@ static int loop_set_fd(struct loop_devic
+ 	blk_queue_make_request(lo->lo_queue, loop_make_request);
+ 	lo->lo_queue->queuedata = lo;
+ 
+-	/*
+-	 * we remap to a block device, make sure we correctly stack limits
+-	 */
+-	if (S_ISBLK(inode->i_mode)) {
+-		request_queue_t *q = bdev_get_queue(lo_device);
+-
+-		blk_queue_max_sectors(lo->lo_queue, q->max_sectors);
+-		blk_queue_max_phys_segments(lo->lo_queue,q->max_phys_segments);
+-		blk_queue_max_hw_segments(lo->lo_queue, q->max_hw_segments);
+-		blk_queue_max_segment_size(lo->lo_queue, q->max_segment_size);
+-		blk_queue_segment_boundary(lo->lo_queue, q->seg_boundary_mask);
+-		blk_queue_merge_bvec(lo->lo_queue, q->merge_bvec_fn);
+-	}
+-
+ 	kernel_thread(loop_thread, lo, CLONE_KERNEL);
+ 	down(&lo->lo_sem);
+ 
+@@ -846,7 +665,7 @@ static int loop_clr_fd(struct loop_devic
+ 	memset(lo->lo_file_name, 0, LO_NAME_SIZE);
+ 	invalidate_bdev(bdev, 0);
+ 	set_capacity(disks[lo->lo_number], 0);
+-	mapping_set_gfp_mask(filp->f_dentry->d_inode->i_mapping, gfp);
++	mapping_set_gfp_mask(filp->f_mapping, gfp);
+ 	lo->lo_state = Lo_unbound;
+ 	fput(filp);
+ 	/* This is safe: open() is still holding a reference. */
+@@ -1056,19 +875,19 @@ loop_get_status64(struct loop_device *lo
+ 	return err;
+ }
+ 
+-static int lo_ioctl(struct inode * inode, struct file * file,
++static int lo_ioctl(struct block_device *bdev, struct file *file,
+ 	unsigned int cmd, unsigned long arg)
+ {
+-	struct loop_device *lo = inode->i_bdev->bd_disk->private_data;
++	struct loop_device *lo = bdev->bd_disk->private_data;
+ 	int err;
+ 
+ 	down(&lo->lo_ctl_mutex);
+ 	switch (cmd) {
+ 	case LOOP_SET_FD:
+-		err = loop_set_fd(lo, file, inode->i_bdev, arg);
++		err = loop_set_fd(lo, file, bdev, arg);
+ 		break;
+ 	case LOOP_CLR_FD:
+-		err = loop_clr_fd(lo, inode->i_bdev);
++		err = loop_clr_fd(lo, bdev);
+ 		break;
+ 	case LOOP_SET_STATUS:
+ 		err = loop_set_status_old(lo, (struct loop_info *) arg);
+@@ -1089,9 +908,9 @@ static int lo_ioctl(struct inode * inode
+ 	return err;
+ }
+ 
+-static int lo_open(struct inode *inode, struct file *file)
++static int lo_open(struct block_device *bdev, struct file *file)
+ {
+-	struct loop_device *lo = inode->i_bdev->bd_disk->private_data;
++	struct loop_device *lo = bdev->bd_disk->private_data;
+ 
+ 	down(&lo->lo_ctl_mutex);
+ 	lo->lo_refcnt++;
+@@ -1100,9 +919,9 @@ static int lo_open(struct inode *inode, 
+ 	return 0;
+ }
+ 
+-static int lo_release(struct inode *inode, struct file *file)
++static int lo_release(struct gendisk *disk)
+ {
+-	struct loop_device *lo = inode->i_bdev->bd_disk->private_data;
++	struct loop_device *lo = disk->private_data;
+ 
+ 	down(&lo->lo_ctl_mutex);
+ 	--lo->lo_refcnt;
+@@ -1124,6 +943,7 @@ static struct block_device_operations lo
+ MODULE_PARM(max_loop, "i");
+ MODULE_PARM_DESC(max_loop, "Maximum number of loop devices (1-256)");
+ MODULE_LICENSE("GPL");
++MODULE_ALIAS_BLOCKDEV_MAJOR(LOOP_MAJOR);
+ 
+ int loop_register_transfer(struct loop_func_table *funcs)
+ {
+@@ -1212,14 +1032,18 @@ int __init loop_init(void)
+ 		sprintf(disk->devfs_name, "loop/%d", i);
+ 		disk->private_data = lo;
+ 		disk->queue = lo->lo_queue;
+-		add_disk(disk);
+ 	}
++
++	/* We cannot fail after we call this, so another loop!*/
++	for (i = 0; i < max_loop; i++)
++		add_disk(disks[i]);
+ 	printk(KERN_INFO "loop: loaded (max %d devices)\n", max_loop);
+ 	return 0;
+ 
+ out_mem4:
+ 	while (i--)
+ 		blk_put_queue(loop_dev[i].lo_queue);
++	devfs_remove("loop");
+ 	i = max_loop;
+ out_mem3:
+ 	while (i--)
+--- linux-2.6.0/drivers/block/Makefile	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/block/Makefile	2003-12-28 23:21:35.000000000 -0800
+@@ -18,6 +18,7 @@ obj-y	:= elevator.o ll_rw_blk.o ioctl.o 
+ obj-$(CONFIG_IOSCHED_NOOP)	+= noop-iosched.o
+ obj-$(CONFIG_IOSCHED_AS)	+= as-iosched.o
+ obj-$(CONFIG_IOSCHED_DEADLINE)	+= deadline-iosched.o
++obj-$(CONFIG_IOSCHED_CFQ)	+= cfq-iosched.o
+ obj-$(CONFIG_MAC_FLOPPY)	+= swim3.o
+ obj-$(CONFIG_BLK_DEV_FD)	+= floppy.o
+ obj-$(CONFIG_BLK_DEV_FD98)	+= floppy98.o
+--- linux-2.6.0/drivers/block/nbd.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/block/nbd.c	2003-12-28 23:21:12.000000000 -0800
+@@ -535,10 +535,10 @@ static void do_nbd_request(request_queue
+ 	return;
+ }
+ 
+-static int nbd_ioctl(struct inode *inode, struct file *file,
++static int nbd_ioctl(struct block_device *bdev, struct file *file,
+ 		     unsigned int cmd, unsigned long arg)
+ {
+-	struct nbd_device *lo = inode->i_bdev->bd_disk->private_data;
++	struct nbd_device *lo = bdev->bd_disk->private_data;
+ 	int error;
+ 	struct request sreq ;
+ 
+@@ -593,7 +593,7 @@ static int nbd_ioctl(struct inode *inode
+ 		error = -EINVAL;
+ 		file = fget(arg);
+ 		if (file) {
+-			inode = file->f_dentry->d_inode;
++			struct inode *inode = file->f_dentry->d_inode;
+ 			if (inode->i_sock) {
+ 				lo->file = file;
+ 				lo->sock = SOCKET_I(inode);
+@@ -606,20 +606,20 @@ static int nbd_ioctl(struct inode *inode
+ 	case NBD_SET_BLKSIZE:
+ 		lo->blksize = arg;
+ 		lo->bytesize &= ~(lo->blksize-1);
+-		inode->i_bdev->bd_inode->i_size = lo->bytesize;
+-		set_blocksize(inode->i_bdev, lo->blksize);
++		bdev->bd_inode->i_size = lo->bytesize;
++		set_blocksize(bdev, lo->blksize);
+ 		set_capacity(lo->disk, lo->bytesize >> 9);
+ 		return 0;
+ 	case NBD_SET_SIZE:
+ 		lo->bytesize = arg & ~(lo->blksize-1);
+-		inode->i_bdev->bd_inode->i_size = lo->bytesize;
+-		set_blocksize(inode->i_bdev, lo->blksize);
++		bdev->bd_inode->i_size = lo->bytesize;
++		set_blocksize(bdev, lo->blksize);
+ 		set_capacity(lo->disk, lo->bytesize >> 9);
+ 		return 0;
+ 	case NBD_SET_SIZE_BLOCKS:
+ 		lo->bytesize = ((u64) arg) * lo->blksize;
+-		inode->i_bdev->bd_inode->i_size = lo->bytesize;
+-		set_blocksize(inode->i_bdev, lo->blksize);
++		bdev->bd_inode->i_size = lo->bytesize;
++		set_blocksize(bdev, lo->blksize);
+ 		set_capacity(lo->disk, lo->bytesize >> 9);
+ 		return 0;
+ 	case NBD_DO_IT:
+@@ -664,11 +664,11 @@ static int nbd_ioctl(struct inode *inode
+ 	case NBD_PRINT_DEBUG:
+ #ifdef PARANOIA
+ 		printk(KERN_INFO "%s: next = %p, prev = %p. Global: in %d, out %d\n",
+-			inode->i_bdev->bd_disk->disk_name, lo->queue_head.next,
++			bdev->bd_disk->disk_name, lo->queue_head.next,
+ 			lo->queue_head.prev, requests_in, requests_out);
+ #else
+ 		printk(KERN_INFO "%s: next = %p, prev = %p\n",
+-			inode->i_bdev->bd_disk->disk_name,
++			bdev->bd_disk->disk_name,
+ 			lo->queue_head.next, lo->queue_head.prev);
+ #endif
+ 		return 0;
+--- linux-2.6.0/drivers/block/paride/pcd.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/block/paride/pcd.c	2003-12-28 23:21:17.000000000 -0800
+@@ -243,23 +243,23 @@ static int pcd_warned;		/* Have we logge
+ 
+ /* kernel glue structures */
+ 
+-static int pcd_block_open(struct inode *inode, struct file *file)
++static int pcd_block_open(struct block_device *bdev, struct file *file)
+ {
+-	struct pcd_unit *cd = inode->i_bdev->bd_disk->private_data;
+-	return cdrom_open(&cd->info, inode, file);
++	struct pcd_unit *cd = bdev->bd_disk->private_data;
++	return cdrom_open(&cd->info, bdev, file);
+ }
+ 
+-static int pcd_block_release(struct inode *inode, struct file *file)
++static int pcd_block_release(struct gendisk *disk)
+ {
+-	struct pcd_unit *cd = inode->i_bdev->bd_disk->private_data;
+-	return cdrom_release(&cd->info, file);
++	struct pcd_unit *cd = disk->private_data;
++	return cdrom_release(&cd->info);
+ }
+ 
+-static int pcd_block_ioctl(struct inode *inode, struct file *file,
++static int pcd_block_ioctl(struct block_device *bdev, struct file *file,
+ 				unsigned cmd, unsigned long arg)
+ {
+-	struct pcd_unit *cd = inode->i_bdev->bd_disk->private_data;
+-	return cdrom_ioctl(&cd->info, inode, cmd, arg);
++	struct pcd_unit *cd = bdev->bd_disk->private_data;
++	return cdrom_ioctl(&cd->info, bdev, cmd, arg);
+ }
+ 
+ static int pcd_block_media_changed(struct gendisk *disk)
+--- linux-2.6.0/drivers/block/paride/pd.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/block/paride/pd.c	2003-12-28 23:21:17.000000000 -0800
+@@ -236,11 +236,11 @@ MODULE_PARM(drive3, "1-8i");
+ #define IDE_EJECT		0xed
+ 
+ void pd_setup(char *str, int *ints);
+-static int pd_open(struct inode *inode, struct file *file);
++static int pd_open(struct block_device *bdev, struct file *file);
+ static void do_pd_request(request_queue_t * q);
+-static int pd_ioctl(struct inode *inode, struct file *file,
++static int pd_ioctl(struct block_device *bdev, struct file *file,
+ 		    unsigned int cmd, unsigned long arg);
+-static int pd_release(struct inode *inode, struct file *file);
++static int pd_release(struct gendisk *disk);
+ static int pd_revalidate(struct gendisk *p);
+ static int pd_detect(void);
+ static void do_pd_read(void);
+@@ -304,8 +304,6 @@ static char *pd_errs[17] = { "ERR", "IND
+ 
+ /* kernel glue structures */
+ 
+-extern struct block_device_operations pd_fops;
+-
+ static struct block_device_operations pd_fops = {
+ 	.owner		= THIS_MODULE,
+ 	.open		= pd_open,
+@@ -337,9 +335,9 @@ static void pd_init_units(void)
+ 	}
+ }
+ 
+-static int pd_open(struct inode *inode, struct file *file)
++static int pd_open(struct block_device *bdev, struct file *file)
+ {
+-	struct pd_unit *disk = inode->i_bdev->bd_disk->private_data;
++	struct pd_unit *disk = bdev->bd_disk->private_data;
+ 
+ 	disk->access++;
+ 
+@@ -350,10 +348,10 @@ static int pd_open(struct inode *inode, 
+ 	return 0;
+ }
+ 
+-static int pd_ioctl(struct inode *inode, struct file *file,
++static int pd_ioctl(struct block_device *bdev, struct file *file,
+ 	 unsigned int cmd, unsigned long arg)
+ {
+-	struct pd_unit *disk = inode->i_bdev->bd_disk->private_data;
++	struct pd_unit *disk = bdev->bd_disk->private_data;
+ 	struct hd_geometry *geo = (struct hd_geometry *) arg;
+ 	struct hd_geometry g;
+ 
+@@ -372,7 +370,7 @@ static int pd_ioctl(struct inode *inode,
+ 			g.sectors = disk->sectors;
+ 			g.cylinders = disk->cylinders;
+ 		}
+-		g.start = get_start_sect(inode->i_bdev);
++		g.start = get_start_sect(bdev);
+ 		if (copy_to_user(geo, &g, sizeof(struct hd_geometry)))
+ 			return -EFAULT;
+ 		return 0;
+@@ -381,9 +379,9 @@ static int pd_ioctl(struct inode *inode,
+ 	}
+ }
+ 
+-static int pd_release(struct inode *inode, struct file *file)
++static int pd_release(struct gendisk *p)
+ {
+-	struct pd_unit *disk = inode->i_bdev->bd_disk->private_data;
++	struct pd_unit *disk = p->private_data;
+ 
+ 	if (!--disk->access && disk->removable)
+ 		pd_doorlock(disk, IDE_DOORUNLOCK);
+--- linux-2.6.0/drivers/block/paride/pf.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/block/paride/pf.c	2003-12-28 23:21:17.000000000 -0800
+@@ -222,12 +222,12 @@ MODULE_PARM(drive3, "1-7i");
+ #define ATAPI_READ_10		0x28
+ #define ATAPI_WRITE_10		0x2a
+ 
+-static int pf_open(struct inode *inode, struct file *file);
++static int pf_open(struct block_device *bdev, struct file *file);
+ static void do_pf_request(request_queue_t * q);
+-static int pf_ioctl(struct inode *inode, struct file *file,
++static int pf_ioctl(struct block_device *bdev, struct file *file,
+ 		    unsigned int cmd, unsigned long arg);
+ 
+-static int pf_release(struct inode *inode, struct file *file);
++static int pf_release(struct gendisk *disk);
+ 
+ static int pf_detect(void);
+ static void do_pf_read(void);
+@@ -315,9 +315,9 @@ void pf_init_units(void)
+ 	}
+ }
+ 
+-static int pf_open(struct inode *inode, struct file *file)
++static int pf_open(struct block_device *bdev, struct file *file)
+ {
+-	struct pf_unit *pf = inode->i_bdev->bd_disk->private_data;
++	struct pf_unit *pf = bdev->bd_disk->private_data;
+ 
+ 	pf_identify(pf);
+ 
+@@ -334,9 +334,9 @@ static int pf_open(struct inode *inode, 
+ 	return 0;
+ }
+ 
+-static int pf_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
++static int pf_ioctl(struct block_device *bdev, struct file *file, unsigned int cmd, unsigned long arg)
+ {
+-	struct pf_unit *pf = inode->i_bdev->bd_disk->private_data;
++	struct pf_unit *pf = bdev->bd_disk->private_data;
+ 	struct hd_geometry *geo = (struct hd_geometry *) arg;
+ 	struct hd_geometry g;
+ 	sector_t capacity;
+@@ -365,9 +365,9 @@ static int pf_ioctl(struct inode *inode,
+ 	return 0;
+ }
+ 
+-static int pf_release(struct inode *inode, struct file *file)
++static int pf_release(struct gendisk *disk)
+ {
+-	struct pf_unit *pf = inode->i_bdev->bd_disk->private_data;
++	struct pf_unit *pf = disk->private_data;
+ 
+ 	if (pf->access <= 0)
+ 		return -EINVAL;
+--- linux-2.6.0/drivers/block/ps2esdi.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/block/ps2esdi.c	2003-12-28 23:21:12.000000000 -0800
+@@ -81,7 +81,7 @@ static void (*current_int_handler) (u_in
+ static void ps2esdi_normal_interrupt_handler(u_int);
+ static void ps2esdi_initial_reset_int_handler(u_int);
+ static void ps2esdi_geometry_int_handler(u_int);
+-static int ps2esdi_ioctl(struct inode *inode, struct file *file,
++static int ps2esdi_ioctl(struct block_device *bdev, struct file *file,
+ 			 u_int cmd, u_long arg);
+ 
+ static int ps2esdi_read_status_words(int num_words, int max_words, u_short * buffer);
+@@ -1059,10 +1059,10 @@ static void dump_cmd_complete_status(u_i
+ 
+ }
+ 
+-static int ps2esdi_ioctl(struct inode *inode,
++static int ps2esdi_ioctl(struct block_device *bdev,
+ 			 struct file *file, u_int cmd, u_long arg)
+ {
+-	struct ps2esdi_i_struct *p = inode->i_bdev->bd_disk->private_data;
++	struct ps2esdi_i_struct *p = bdev->bd_disk->private_data;
+ 	struct ps2esdi_geometry *geometry = (struct ps2esdi_geometry *) arg;
+ 	int err;
+ 
+@@ -1073,7 +1073,7 @@ static int ps2esdi_ioctl(struct inode *i
+ 	put_user(p->head, (char *) &geometry->heads);
+ 	put_user(p->sect, (char *) &geometry->sectors);
+ 	put_user(p->cyl, (short *) &geometry->cylinders);
+-	put_user(get_start_sect(inode->i_bdev), (long *) &geometry->start);
++	put_user(get_start_sect(bdev), (long *) &geometry->start);
+ 	return 0;
+ }
+ 
+--- linux-2.6.0/drivers/block/rd.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/block/rd.c	2003-12-28 23:21:41.000000000 -0800
+@@ -1,15 +1,15 @@
+ /*
+  * ramdisk.c - Multiple RAM disk driver - gzip-loading version - v. 0.8 beta.
+- * 
+- * (C) Chad Page, Theodore Ts'o, et. al, 1995. 
++ *
++ * (C) Chad Page, Theodore Ts'o, et. al, 1995.
+  *
+  * This RAM disk is designed to have filesystems created on it and mounted
+- * just like a regular floppy disk.  
+- *  
++ * just like a regular floppy disk.
++ *
+  * It also does something suggested by Linus: use the buffer cache as the
+  * RAM disk data.  This makes it possible to dynamically allocate the RAM disk
+- * buffer - with some consequences I have to deal with as I write this. 
+- * 
++ * buffer - with some consequences I have to deal with as I write this.
++ *
+  * This code is based on the original ramdisk.c, written mostly by
+  * Theodore Ts'o (TYT) in 1991.  The code was largely rewritten by
+  * Chad Page to use the buffer cache to store the RAM disk data in
+@@ -33,7 +33,7 @@
+  *
+  *  Added initrd: Werner Almesberger & Hans Lermen, Feb '96
+  *
+- * 4/25/96 : Made RAM disk size a parameter (default is now 4 MB) 
++ * 4/25/96 : Made RAM disk size a parameter (default is now 4 MB)
+  *		- Chad Page
+  *
+  * Add support for fs images split across >1 disk, Paul Gortmaker, Mar '98
+@@ -60,7 +60,7 @@
+ #include <asm/uaccess.h>
+ 
+ /* The RAM disk size is now a parameter */
+-#define NUM_RAMDISKS 16		/* This cannot be overridden (yet) */ 
++#define NUM_RAMDISKS 16		/* This cannot be overridden (yet) */
+ 
+ /* Various static variables go here.  Most are used only in the RAM disk code.
+  */
+@@ -73,7 +73,7 @@ static struct request_queue *rd_queue[NU
+  * Parameters for the boot-loading of the RAM disk.  These are set by
+  * init/main.c (from arguments to the kernel command line) or from the
+  * architecture-specific setup routine (from the stored boot sector
+- * information). 
++ * information).
+  */
+ int rd_size = CONFIG_BLK_DEV_RAM_SIZE;		/* Size of the RAM disks */
+ /*
+@@ -94,7 +94,7 @@ int rd_blocksize = BLOCK_SIZE;			/* bloc
+  *               2000 Transmeta Corp.
+  * aops copied from ramfs.
+  */
+-static int ramdisk_readpage(struct file *file, struct page * page)
++static int ramdisk_readpage(struct file *file, struct page *page)
+ {
+ 	if (!PageUptodate(page)) {
+ 		void *kaddr = kmap_atomic(page, KM_USER0);
+@@ -108,7 +108,8 @@ static int ramdisk_readpage(struct file 
+ 	return 0;
+ }
+ 
+-static int ramdisk_prepare_write(struct file *file, struct page *page, unsigned offset, unsigned to)
++static int ramdisk_prepare_write(struct file *file, struct page *page,
++				unsigned offset, unsigned to)
+ {
+ 	if (!PageUptodate(page)) {
+ 		void *kaddr = kmap_atomic(page, KM_USER0);
+@@ -122,7 +123,8 @@ static int ramdisk_prepare_write(struct 
+ 	return 0;
+ }
+ 
+-static int ramdisk_commit_write(struct file *file, struct page *page, unsigned offset, unsigned to)
++static int ramdisk_commit_write(struct file *file, struct page *page,
++				unsigned offset, unsigned to)
+ {
+ 	return 0;
+ }
+@@ -212,7 +214,7 @@ static int rd_blkdev_pagecache_IO(int rw
+  * 19-JAN-1998  Richard Gooch <rgooch@atnf.csiro.au>  Added devfs support
+  *
+  */
+-static int rd_make_request(request_queue_t * q, struct bio *bio)
++static int rd_make_request(request_queue_t *q, struct bio *bio)
+ {
+ 	struct block_device *bdev = bio->bi_bdev;
+ 	struct address_space * mapping = bdev->bd_inode->i_mapping;
+@@ -242,17 +244,19 @@ fail:
+ 	return 0;
+ } 
+ 
+-static int rd_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
++static int rd_ioctl(struct block_device *bdev, struct file *file,
++			unsigned int cmd, unsigned long arg)
+ {
+ 	int error;
+-	struct block_device *bdev = inode->i_bdev;
+ 
+ 	if (cmd != BLKFLSBUF)
+ 		return -EINVAL;
+ 
+-	/* special: we want to release the ramdisk memory,
+-	   it's not like with the other blockdevices where
+-	   this ioctl only flushes away the buffer cache. */
++	/*
++	 * special: we want to release the ramdisk memory, it's not like with
++	 * the other blockdevices where this ioctl only flushes away the buffer
++	 * cache
++	 */
+ 	error = -EBUSY;
+ 	down(&bdev->bd_sem);
+ 	if (bdev->bd_openers <= 2) {
+@@ -268,16 +272,15 @@ static struct backing_dev_info rd_backin
+ 	.memory_backed	= 1,	/* Does not contribute to dirty memory */
+ };
+ 
+-static int rd_open(struct inode * inode, struct file * filp)
++static int rd_open(struct block_device *bdev, struct file *filp)
+ {
+-	unsigned unit = iminor(inode);
++	unsigned unit = MINOR(bdev->bd_dev);
+ 
+ 	/*
+ 	 * Immunize device against invalidate_buffers() and prune_icache().
+ 	 */
+ 	if (rd_bdev[unit] == NULL) {
+-		struct block_device *bdev = inode->i_bdev;
+-		inode = igrab(bdev->bd_inode);
++		struct inode *inode = igrab(bdev->bd_inode);
+ 		rd_bdev[unit] = bdev;
+ 		bdev->bd_openers++;
+ 		bdev->bd_block_size = rd_blocksize;
+@@ -295,12 +298,14 @@ static struct block_device_operations rd
+ 	.ioctl =	rd_ioctl,
+ };
+ 
+-/* Before freeing the module, invalidate all of the protected buffers! */
+-static void __exit rd_cleanup (void)
++/*
++ * Before freeing the module, invalidate all of the protected buffers!
++ */
++static void __exit rd_cleanup(void)
+ {
+ 	int i;
+ 
+-	for (i = 0 ; i < NUM_RAMDISKS; i++) {
++	for (i = 0; i < NUM_RAMDISKS; i++) {
+ 		struct block_device *bdev = rd_bdev[i];
+ 		rd_bdev[i] = NULL;
+ 		if (bdev) {
+@@ -311,17 +316,19 @@ static void __exit rd_cleanup (void)
+ 		put_disk(rd_disks[i]);
+ 	}
+ 	devfs_remove("rd");
+-	unregister_blkdev(RAMDISK_MAJOR, "ramdisk" );
++	unregister_blkdev(RAMDISK_MAJOR, "ramdisk");
+ }
+ 
+-/* This is the registration and initialization section of the RAM disk driver */
+-static int __init rd_init (void)
++/*
++ * This is the registration and initialization section of the RAM disk driver
++ */
++static int __init rd_init(void)
+ {
+ 	int i;
+ 	int err = -ENOMEM;
+ 
+ 	if (rd_blocksize > PAGE_SIZE || rd_blocksize < 512 ||
+-	    (rd_blocksize & (rd_blocksize-1))) {
++			(rd_blocksize & (rd_blocksize-1))) {
+ 		printk("RAMDISK: wrong blocksize %d, reverting to defaults\n",
+ 		       rd_blocksize);
+ 		rd_blocksize = BLOCK_SIZE;
+@@ -362,8 +369,8 @@ static int __init rd_init (void)
+ 
+ 	/* rd_size is given in kB */
+ 	printk("RAMDISK driver initialized: "
+-	       "%d RAM disks of %dK size %d blocksize\n",
+-	       NUM_RAMDISKS, rd_size, rd_blocksize);
++		"%d RAM disks of %dK size %d blocksize\n",
++		NUM_RAMDISKS, rd_size, rd_blocksize);
+ 
+ 	return 0;
+ out_queue:
+--- linux-2.6.0/drivers/block/scsi_ioctl.c	2003-12-17 21:20:02.000000000 -0800
++++ 25/drivers/block/scsi_ioctl.c	2003-12-28 23:26:36.000000000 -0800
+@@ -312,7 +312,7 @@ static int sg_scsi_ioctl(request_queue_t
+ 		return -EFAULT;
+ 	if (in_len > PAGE_SIZE || out_len > PAGE_SIZE)
+ 		return -EINVAL;
+-	if (get_user(opcode, sic->data))
++	if (get_user(opcode, (int *)sic->data))
+ 		return -EFAULT;
+ 
+ 	bytes = max(in_len, out_len);
+--- linux-2.6.0/drivers/block/swim3.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/block/swim3.c	2003-12-28 23:21:17.000000000 -0800
+@@ -239,10 +239,9 @@ static int grab_drive(struct floppy_stat
+ 		      int interruptible);
+ static void release_drive(struct floppy_state *fs);
+ static int fd_eject(struct floppy_state *fs);
+-static int floppy_ioctl(struct inode *inode, struct file *filp,
++static int floppy_ioctl(struct block_device *bdev, struct file *filp,
+ 			unsigned int cmd, unsigned long param);
+-static int floppy_open(struct inode *inode, struct file *filp);
+-static int floppy_release(struct inode *inode, struct file *filp);
++static int floppy_open(struct block_device *bdev, struct file *filp);
+ static int floppy_check_change(struct gendisk *disk);
+ static int floppy_revalidate(struct gendisk *disk);
+ static int swim3_add_device(struct device_node *swims);
+@@ -811,10 +810,10 @@ static int fd_eject(struct floppy_state 
+ static struct floppy_struct floppy_type =
+ 	{ 2880,18,2,80,0,0x1B,0x00,0xCF,0x6C,NULL };	/*  7 1.44MB 3.5"   */
+ 
+-static int floppy_ioctl(struct inode *inode, struct file *filp,
++static int floppy_ioctl(struct block_device *bdev, struct file *filp,
+ 			unsigned int cmd, unsigned long param)
+ {
+-	struct floppy_state *fs = inode->i_bdev->bd_disk->private_data;
++	struct floppy_state *fs = bdev->bd_disk->private_data;
+ 	int err;
+ 		
+ 	if ((cmd & 0x80) && !capable(CAP_SYS_ADMIN))
+@@ -838,9 +837,9 @@ static int floppy_ioctl(struct inode *in
+ 	return -ENOTTY;
+ }
+ 
+-static int floppy_open(struct inode *inode, struct file *filp)
++static int floppy_open(struct block_device *bdev, struct file *filp)
+ {
+-	struct floppy_state *fs = inode->i_bdev->bd_disk->private_data;
++	struct floppy_state *fs = bdev->bd_disk->private_data;
+ 	volatile struct swim3 *sw = fs->swim3;
+ 	int n, err = 0;
+ 
+@@ -876,7 +875,7 @@ static int floppy_open(struct inode *ino
+ 
+ 	if (err == 0 && (filp->f_flags & O_NDELAY) == 0
+ 	    && (filp->f_mode & 3)) {
+-		check_disk_change(inode->i_bdev);
++		check_disk_change(bdev);
+ 		if (fs->ejected)
+ 			err = -ENXIO;
+ 	}
+@@ -904,9 +903,9 @@ static int floppy_open(struct inode *ino
+ 	return 0;
+ }
+ 
+-static int floppy_release(struct inode *inode, struct file *filp)
++static int floppy_release(struct gendisk *disk)
+ {
+-	struct floppy_state *fs = inode->i_bdev->bd_disk->private_data;
++	struct floppy_state *fs = disk->private_data;
+ 	volatile struct swim3 *sw = fs->swim3;
+ 	if (fs->ref_count > 0 && --fs->ref_count == 0) {
+ 		swim3_action(fs, MOTOR_OFF);
+--- linux-2.6.0/drivers/block/swim_iop.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/block/swim_iop.c	2003-12-28 23:21:17.000000000 -0800
+@@ -98,10 +98,10 @@ static void swimiop_receive(struct iop_m
+ static void swimiop_status_update(int, struct swim_drvstatus *);
+ static int swimiop_eject(struct floppy_state *fs);
+ 
+-static int floppy_ioctl(struct inode *inode, struct file *filp,
++static int floppy_ioctl(struct block_device *bdev, struct file *filp,
+ 			unsigned int cmd, unsigned long param);
+-static int floppy_open(struct inode *inode, struct file *filp);
+-static int floppy_release(struct inode *inode, struct file *filp);
++static int floppy_open(struct block_device *bdev, struct file *filp);
++static int floppy_release(struct gendisk *disk);
+ static int floppy_check_change(struct gendisk *disk);
+ static int floppy_revalidate(struct gendisk *disk);
+ static int grab_drive(struct floppy_state *fs, enum swim_state state,
+@@ -348,10 +348,10 @@ static int swimiop_eject(struct floppy_s
+ static struct floppy_struct floppy_type =
+ 	{ 2880,18,2,80,0,0x1B,0x00,0xCF,0x6C,NULL };	/*  7 1.44MB 3.5"   */
+ 
+-static int floppy_ioctl(struct inode *inode, struct file *filp,
++static int floppy_ioctl(struct block_device *bdev, struct file *filp,
+ 			unsigned int cmd, unsigned long param)
+ {
+-	struct floppy_state *fs = inode->i_bdev->bd_disk->private_data;
++	struct floppy_state *fs = bdev->bd_disk->private_data;
+ 	int err;
+ 
+ 	if ((cmd & 0x80) && !capable(CAP_SYS_ADMIN))
+@@ -372,15 +372,15 @@ static int floppy_ioctl(struct inode *in
+ 	return -ENOTTY;
+ }
+ 
+-static int floppy_open(struct inode *inode, struct file *filp)
++static int floppy_open(struct block_device *bdev, struct file *filp)
+ {
+-	struct floppy_state *fs = inode->i_bdev->bd_disk->private_data;
++	struct floppy_state *fs = bdev->bd_disk->private_data;
+ 
+ 	if (fs->ref_count == -1 || filp->f_flags & O_EXCL)
+ 		return -EBUSY;
+ 
+ 	if ((filp->f_flags & O_NDELAY) == 0 && (filp->f_mode & 3)) {
+-		check_disk_change(inode->i_bdev);
++		check_disk_change(bdev);
+ 		if (fs->ejected)
+ 			return -ENXIO;
+ 	}
+@@ -396,9 +396,9 @@ static int floppy_open(struct inode *ino
+ 	return 0;
+ }
+ 
+-static int floppy_release(struct inode *inode, struct file *filp)
++static int floppy_release(struct gendisk *disk)
+ {
+-	struct floppy_state *fs = inode->i_bdev->bd_disk->private_data;
++	struct floppy_state *fs = disk->private_data;
+ 	if (fs->ref_count > 0)
+ 		fs->ref_count--;
+ 	return 0;
+--- linux-2.6.0/drivers/block/umem.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/block/umem.c	2003-12-28 23:21:14.000000000 -0800
+@@ -153,7 +153,6 @@ struct cardinfo {
+ };
+ 
+ static struct cardinfo cards[MM_MAXCARDS];
+-static struct block_device_operations mm_fops;
+ static struct timer_list battery_timer;
+ 
+ static int num_cards = 0;
+@@ -818,10 +817,10 @@ static int mm_revalidate(struct gendisk 
+ --                            mm_ioctl
+ -----------------------------------------------------------------------------------
+ */
+-static int mm_ioctl(struct inode *i, struct file *f, unsigned int cmd, unsigned long arg)
++static int mm_ioctl(struct block_device *bdev, struct file *f, unsigned int cmd, unsigned long arg)
+ {
+ 	if (cmd == HDIO_GETGEO) {
+-		struct cardinfo *card = i->i_bdev->bd_disk->private_data;
++		struct cardinfo *card = bdev->bd_disk->private_data;
+ 		int size = card->mm_size * (1024 / MM_HARDSECT);
+ 		struct hd_geometry geo;
+ 		/*
+@@ -831,7 +830,7 @@ static int mm_ioctl(struct inode *i, str
+ 		 */
+ 		geo.heads     = 64;
+ 		geo.sectors   = 32;
+-		geo.start     = get_start_sect(i->i_bdev);
++		geo.start     = get_start_sect(bdev);
+ 		geo.cylinders = size / (geo.heads * geo.sectors);
+ 
+ 		if (copy_to_user((void *) arg, &geo, sizeof(geo)))
+--- linux-2.6.0/drivers/block/xd.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/block/xd.c	2003-12-28 23:21:12.000000000 -0800
+@@ -322,9 +322,9 @@ static void do_xd_request (request_queue
+ }
+ 
+ /* xd_ioctl: handle device ioctl's */
+-static int xd_ioctl (struct inode *inode,struct file *file,u_int cmd,u_long arg)
++static int xd_ioctl (struct block_device *bdev,struct file *file,u_int cmd,u_long arg)
+ {
+-	XD_INFO *p = inode->i_bdev->bd_disk->private_data;
++	XD_INFO *p = bdev->bd_disk->private_data;
+ 
+ 	switch (cmd) {
+ 		case HDIO_GETGEO:
+@@ -334,7 +334,7 @@ static int xd_ioctl (struct inode *inode
+ 			g.heads = p->heads;
+ 			g.sectors = p->sectors;
+ 			g.cylinders = p->cylinders;
+-			g.start = get_start_sect(inode->i_bdev);
++			g.start = get_start_sect(bdev);
+ 			return copy_to_user(geometry, &g, sizeof g) ? -EFAULT : 0;
+ 		}
+ 		case HDIO_SET_DMA:
+--- linux-2.6.0/drivers/block/xd.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/block/xd.h	2003-12-28 23:21:12.000000000 -0800
+@@ -105,7 +105,7 @@ static u_char xd_detect (u_char *control
+ static u_char xd_initdrives (void (*init_drive)(u_char drive));
+ 
+ static void do_xd_request (request_queue_t * q);
+-static int xd_ioctl (struct inode *inode,struct file *file,unsigned int cmd,unsigned long arg);
++static int xd_ioctl (struct block_device *bdev,struct file *file,unsigned int cmd,unsigned long arg);
+ static int xd_readwrite (u_char operation,XD_INFO *disk,char *buffer,u_int block,u_int count);
+ static void xd_recalibrate (u_char drive);
+ 
+--- linux-2.6.0/drivers/block/z2ram.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/block/z2ram.c	2003-12-28 23:21:17.000000000 -0800
+@@ -67,7 +67,6 @@ static int current_device   = -1;
+ 
+ static spinlock_t z2ram_lock = SPIN_LOCK_UNLOCKED;
+ 
+-static struct block_device_operations z2_fops;
+ static struct gendisk *z2ram_gendisk;
+ 
+ static void do_z2_request(request_queue_t *q)
+@@ -141,7 +140,7 @@ get_chipram( void )
+ }
+ 
+ static int
+-z2_open( struct inode *inode, struct file *filp )
++z2_open( struct block_device *bdev, struct file *filp )
+ {
+     int device;
+     int max_z2_map = ( Z2RAM_SIZE / Z2RAM_CHUNKSIZE ) *
+@@ -150,7 +149,7 @@ z2_open( struct inode *inode, struct fil
+ 	sizeof( z2ram_map[0] );
+     int rc = -ENOMEM;
+ 
+-    device = iminor(inode);
++    device = MINOR(bdev->bd_dev);
+ 
+     if ( current_device != -1 && current_device != device )
+     {
+@@ -301,8 +300,7 @@ err_out:
+     return rc;
+ }
+ 
+-static int
+-z2_release( struct inode *inode, struct file *filp )
++static int z2_release(struct gendisk *disk)
+ {
+     if ( current_device == -1 )
+ 	return 0;     
+--- linux-2.6.0/drivers/bluetooth/bluecard_cs.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/drivers/bluetooth/bluecard_cs.c	2003-12-28 23:22:54.000000000 -0800
+@@ -869,7 +869,7 @@ dev_link_t *bluecard_attach(void)
+ 	client_reg.Version = 0x0210;
+ 	client_reg.event_callback_args.client_data = link;
+ 
+-	ret = CardServices(RegisterClient, &link->handle, &client_reg);
++	ret = pcmcia_register_client(&link->handle, &client_reg);
+ 	if (ret != CS_SUCCESS) {
+ 		cs_error(link->handle, RegisterClient, ret);
+ 		bluecard_detach(link);
+@@ -898,7 +898,7 @@ void bluecard_detach(dev_link_t *link)
+ 		bluecard_release(link);
+ 
+ 	if (link->handle) {
+-		ret = CardServices(DeregisterClient, link->handle);
++		ret = pcmcia_deregister_client(link->handle);
+ 		if (ret != CS_SUCCESS)
+ 			cs_error(link->handle, DeregisterClient, ret);
+ 	}
+@@ -910,25 +910,21 @@ void bluecard_detach(dev_link_t *link)
+ }
+ 
+ 
+-static int get_tuple(int fn, client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
++static int first_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
+ {
+ 	int i;
+ 
+-	i = CardServices(fn, handle, tuple);
++	i = pcmcia_get_first_tuple(handle, tuple);
+ 	if (i != CS_SUCCESS)
+ 		return CS_NO_MORE_ITEMS;
+ 
+-	i = CardServices(GetTupleData, handle, tuple);
++	i = pcmcia_get_tuple_data(handle, tuple);
+ 	if (i != CS_SUCCESS)
+ 		return i;
+ 
+-	return CardServices(ParseTuple, handle, tuple, parse);
++	return pcmcia_parse_tuple(handle, tuple, parse);
+ }
+ 
+-
+-#define first_tuple(a, b, c) get_tuple(GetFirstTuple, a, b, c)
+-#define next_tuple(a, b, c) get_tuple(GetNextTuple, a, b, c)
+-
+ void bluecard_config(dev_link_t *link)
+ {
+ 	client_handle_t handle = link->handle;
+@@ -956,7 +952,7 @@ void bluecard_config(dev_link_t *link)
+ 
+ 	/* Configure card */
+ 	link->state |= DEV_CONFIG;
+-	i = CardServices(GetConfigurationInfo, handle, &config);
++	i = pcmcia_get_configuration_info(handle, &config);
+ 	link->conf.Vcc = config.Vcc;
+ 
+ 	link->conf.ConfigIndex = 0x20;
+@@ -965,7 +961,7 @@ void bluecard_config(dev_link_t *link)
+ 
+ 	for (n = 0; n < 0x400; n += 0x40) {
+ 		link->io.BasePort1 = n ^ 0x300;
+-		i = CardServices(RequestIO, link->handle, &link->io);
++		i = pcmcia_request_io(link->handle, &link->io);
+ 		if (i == CS_SUCCESS)
+ 			break;
+ 	}
+@@ -975,13 +971,13 @@ void bluecard_config(dev_link_t *link)
+ 		goto failed;
+ 	}
+ 
+-	i = CardServices(RequestIRQ, link->handle, &link->irq);
++	i = pcmcia_request_irq(link->handle, &link->irq);
+ 	if (i != CS_SUCCESS) {
+ 		cs_error(link->handle, RequestIRQ, i);
+ 		link->irq.AssignedIRQ = 0;
+ 	}
+ 
+-	i = CardServices(RequestConfiguration, link->handle, &link->conf);
++	i = pcmcia_request_configuration(link->handle, &link->conf);
+ 	if (i != CS_SUCCESS) {
+ 		cs_error(link->handle, RequestConfiguration, i);
+ 		goto failed;
+@@ -1013,9 +1009,9 @@ void bluecard_release(dev_link_t *link)
+ 
+ 	link->dev = NULL;
+ 
+-	CardServices(ReleaseConfiguration, link->handle);
+-	CardServices(ReleaseIO, link->handle, &link->io);
+-	CardServices(ReleaseIRQ, link->handle, &link->irq);
++	pcmcia_release_configuration(link->handle);
++	pcmcia_release_io(link->handle, &link->io);
++	pcmcia_release_irq(link->handle, &link->irq);
+ 
+ 	link->state &= ~DEV_CONFIG;
+ }
+@@ -1043,14 +1039,14 @@ int bluecard_event(event_t event, int pr
+ 		/* Fall through... */
+ 	case CS_EVENT_RESET_PHYSICAL:
+ 		if (link->state & DEV_CONFIG)
+-			CardServices(ReleaseConfiguration, link->handle);
++			pcmcia_release_configuration(link->handle);
+ 		break;
+ 	case CS_EVENT_PM_RESUME:
+ 		link->state &= ~DEV_SUSPEND;
+ 		/* Fall through... */
+ 	case CS_EVENT_CARD_RESET:
+ 		if (DEV_OK(link))
+-			CardServices(RequestConfiguration, link->handle, &link->conf);
++			pcmcia_request_configuration(link->handle, &link->conf);
+ 		break;
+ 	}
+ 
+--- linux-2.6.0/drivers/bluetooth/bt3c_cs.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/drivers/bluetooth/bt3c_cs.c	2003-12-28 23:22:54.000000000 -0800
+@@ -615,7 +615,7 @@ dev_link_t *bt3c_attach(void)
+ 	client_reg.Version = 0x0210;
+ 	client_reg.event_callback_args.client_data = link;
+ 
+-	ret = CardServices(RegisterClient, &link->handle, &client_reg);
++	ret = pcmcia_register_client(&link->handle, &client_reg);
+ 	if (ret != CS_SUCCESS) {
+ 		cs_error(link->handle, RegisterClient, ret);
+ 		bt3c_detach(link);
+@@ -644,7 +644,7 @@ void bt3c_detach(dev_link_t *link)
+ 		bt3c_release(link);
+ 
+ 	if (link->handle) {
+-		ret = CardServices(DeregisterClient, link->handle);
++		ret = pcmcia_deregister_client(link->handle);
+ 		if (ret != CS_SUCCESS)
+ 			cs_error(link->handle, DeregisterClient, ret);
+ 	}
+@@ -655,25 +655,30 @@ void bt3c_detach(dev_link_t *link)
+ 	kfree(info);
+ }
+ 
+-
+-static int get_tuple(int fn, client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
++static int get_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
+ {
+ 	int i;
+ 
+-	i = CardServices(fn, handle, tuple);
+-	if (i != CS_SUCCESS)
+-		return CS_NO_MORE_ITEMS;
+-
+-	i = CardServices(GetTupleData, handle, tuple);
++	i = pcmcia_get_tuple_data(handle, tuple);
+ 	if (i != CS_SUCCESS)
+ 		return i;
+ 
+-	return CardServices(ParseTuple, handle, tuple, parse);
++	return pcmcia_parse_tuple(handle, tuple, parse);
+ }
+ 
++static int first_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
++{
++	if (pcmcia_get_first_tuple(handle, tuple) != CS_SUCCESS)
++		return CS_NO_MORE_ITEMS;
++	return get_tuple(handle, tuple, parse);
++}
+ 
+-#define first_tuple(a, b, c) get_tuple(GetFirstTuple, a, b, c)
+-#define next_tuple(a, b, c) get_tuple(GetNextTuple, a, b, c)
++static int next_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
++{
++	if (pcmcia_get_next_tuple(handle, tuple) != CS_SUCCESS)
++		return CS_NO_MORE_ITEMS;
++	return get_tuple(handle, tuple, parse);
++}
+ 
+ void bt3c_config(dev_link_t *link)
+ {
+@@ -704,7 +709,7 @@ void bt3c_config(dev_link_t *link)
+ 
+ 	/* Configure card */
+ 	link->state |= DEV_CONFIG;
+-	i = CardServices(GetConfigurationInfo, handle, &config);
++	i = pcmcia_get_configuration_info(handle, &config);
+ 	link->conf.Vcc = config.Vcc;
+ 
+ 	/* First pass: look for a config entry that looks normal. */
+@@ -725,7 +730,7 @@ void bt3c_config(dev_link_t *link)
+ 				link->conf.ConfigIndex = cf->index;
+ 				link->io.BasePort1 = cf->io.win[0].base;
+ 				link->io.IOAddrLines = (try == 0) ? 16 : cf->io.flags & CISTPL_IO_LINES_MASK;
+-				i = CardServices(RequestIO, link->handle, &link->io);
++				i = pcmcia_request_io(link->handle, &link->io);
+ 				if (i == CS_SUCCESS)
+ 					goto found_port;
+ 			}
+@@ -744,7 +749,7 @@ next_entry:
+ 			for (j = 0; j < 5; j++) {
+ 				link->io.BasePort1 = base[j];
+ 				link->io.IOAddrLines = base[j] ? 16 : 3;
+-				i = CardServices(RequestIO, link->handle, &link->io);
++				i = pcmcia_request_io(link->handle, &link->io);
+ 				if (i == CS_SUCCESS)
+ 					goto found_port;
+ 			}
+@@ -759,13 +764,13 @@ found_port:
+ 		goto failed;
+ 	}
+ 
+-	i = CardServices(RequestIRQ, link->handle, &link->irq);
++	i = pcmcia_request_irq(link->handle, &link->irq);
+ 	if (i != CS_SUCCESS) {
+ 		cs_error(link->handle, RequestIRQ, i);
+ 		link->irq.AssignedIRQ = 0;
+ 	}
+ 
+-	i = CardServices(RequestConfiguration, link->handle, &link->conf);
++	i = pcmcia_request_configuration(link->handle, &link->conf);
+ 	if (i != CS_SUCCESS) {
+ 		cs_error(link->handle, RequestConfiguration, i);
+ 		goto failed;
+@@ -797,9 +802,9 @@ void bt3c_release(dev_link_t *link)
+ 
+ 	link->dev = NULL;
+ 
+-	CardServices(ReleaseConfiguration, link->handle);
+-	CardServices(ReleaseIO, link->handle, &link->io);
+-	CardServices(ReleaseIRQ, link->handle, &link->irq);
++	pcmcia_release_configuration(link->handle);
++	pcmcia_release_io(link->handle, &link->io);
++	pcmcia_release_irq(link->handle, &link->irq);
+ 
+ 	link->state &= ~DEV_CONFIG;
+ }
+@@ -827,14 +832,14 @@ int bt3c_event(event_t event, int priori
+ 		/* Fall through... */
+ 	case CS_EVENT_RESET_PHYSICAL:
+ 		if (link->state & DEV_CONFIG)
+-			CardServices(ReleaseConfiguration, link->handle);
++			pcmcia_release_configuration(link->handle);
+ 		break;
+ 	case CS_EVENT_PM_RESUME:
+ 		link->state &= ~DEV_SUSPEND;
+ 		/* Fall through... */
+ 	case CS_EVENT_CARD_RESET:
+ 		if (DEV_OK(link))
+-			CardServices(RequestConfiguration, link->handle, &link->conf);
++			pcmcia_request_configuration(link->handle, &link->conf);
+ 		break;
+ 	}
+ 
+--- linux-2.6.0/drivers/bluetooth/btuart_cs.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/drivers/bluetooth/btuart_cs.c	2003-12-28 23:22:54.000000000 -0800
+@@ -622,7 +622,7 @@ dev_link_t *btuart_attach(void)
+ 	client_reg.Version = 0x0210;
+ 	client_reg.event_callback_args.client_data = link;
+ 
+-	ret = CardServices(RegisterClient, &link->handle, &client_reg);
++	ret = pcmcia_register_client(&link->handle, &client_reg);
+ 	if (ret != CS_SUCCESS) {
+ 		cs_error(link->handle, RegisterClient, ret);
+ 		btuart_detach(link);
+@@ -651,7 +651,7 @@ void btuart_detach(dev_link_t *link)
+ 		btuart_release(link);
+ 
+ 	if (link->handle) {
+-		ret = CardServices(DeregisterClient, link->handle);
++		ret = pcmcia_deregister_client(link->handle);
+ 		if (ret != CS_SUCCESS)
+ 			cs_error(link->handle, DeregisterClient, ret);
+ 	}
+@@ -662,25 +662,30 @@ void btuart_detach(dev_link_t *link)
+ 	kfree(info);
+ }
+ 
+-
+-static int get_tuple(int fn, client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
++static int get_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
+ {
+ 	int i;
+ 
+-	i = CardServices(fn, handle, tuple);
+-	if (i != CS_SUCCESS)
+-		return CS_NO_MORE_ITEMS;
+-
+-	i = CardServices(GetTupleData, handle, tuple);
++	i = pcmcia_get_tuple_data(handle, tuple);
+ 	if (i != CS_SUCCESS)
+ 		return i;
+ 
+-	return CardServices(ParseTuple, handle, tuple, parse);
++	return pcmcia_parse_tuple(handle, tuple, parse);
+ }
+ 
++static int first_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
++{
++	if (pcmcia_get_first_tuple(handle, tuple) != CS_SUCCESS)
++		return CS_NO_MORE_ITEMS;
++	return get_tuple(handle, tuple, parse);
++}
+ 
+-#define first_tuple(a, b, c) get_tuple(GetFirstTuple, a, b, c)
+-#define next_tuple(a, b, c) get_tuple(GetNextTuple, a, b, c)
++static int next_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
++{
++	if (pcmcia_get_next_tuple(handle, tuple) != CS_SUCCESS)
++		return CS_NO_MORE_ITEMS;
++	return get_tuple(handle, tuple, parse);
++}
+ 
+ void btuart_config(dev_link_t *link)
+ {
+@@ -711,7 +716,7 @@ void btuart_config(dev_link_t *link)
+ 
+ 	/* Configure card */
+ 	link->state |= DEV_CONFIG;
+-	i = CardServices(GetConfigurationInfo, handle, &config);
++	i = pcmcia_get_configuration_info(handle, &config);
+ 	link->conf.Vcc = config.Vcc;
+ 
+ 	/* First pass: look for a config entry that looks normal. */
+@@ -732,7 +737,7 @@ void btuart_config(dev_link_t *link)
+ 				link->conf.ConfigIndex = cf->index;
+ 				link->io.BasePort1 = cf->io.win[0].base;
+ 				link->io.IOAddrLines = (try == 0) ? 16 : cf->io.flags & CISTPL_IO_LINES_MASK;
+-				i = CardServices(RequestIO, link->handle, &link->io);
++				i = pcmcia_request_io(link->handle, &link->io);
+ 				if (i == CS_SUCCESS)
+ 					goto found_port;
+ 			}
+@@ -752,7 +757,7 @@ next_entry:
+ 			for (j = 0; j < 5; j++) {
+ 				link->io.BasePort1 = base[j];
+ 				link->io.IOAddrLines = base[j] ? 16 : 3;
+-				i = CardServices(RequestIO, link->handle, &link->io);
++				i = pcmcia_request_io(link->handle, &link->io);
+ 				if (i == CS_SUCCESS)
+ 					goto found_port;
+ 			}
+@@ -767,13 +772,13 @@ found_port:
+ 		goto failed;
+ 	}
+ 
+-	i = CardServices(RequestIRQ, link->handle, &link->irq);
++	i = pcmcia_request_irq(link->handle, &link->irq);
+ 	if (i != CS_SUCCESS) {
+ 		cs_error(link->handle, RequestIRQ, i);
+ 		link->irq.AssignedIRQ = 0;
+ 	}
+ 
+-	i = CardServices(RequestConfiguration, link->handle, &link->conf);
++	i = pcmcia_request_configuration(link->handle, &link->conf);
+ 	if (i != CS_SUCCESS) {
+ 		cs_error(link->handle, RequestConfiguration, i);
+ 		goto failed;
+@@ -805,9 +810,9 @@ void btuart_release(dev_link_t *link)
+ 
+ 	link->dev = NULL;
+ 
+-	CardServices(ReleaseConfiguration, link->handle);
+-	CardServices(ReleaseIO, link->handle, &link->io);
+-	CardServices(ReleaseIRQ, link->handle, &link->irq);
++	pcmcia_release_configuration(link->handle);
++	pcmcia_release_io(link->handle, &link->io);
++	pcmcia_release_irq(link->handle, &link->irq);
+ 
+ 	link->state &= ~DEV_CONFIG;
+ }
+@@ -835,14 +840,14 @@ int btuart_event(event_t event, int prio
+ 		/* Fall through... */
+ 	case CS_EVENT_RESET_PHYSICAL:
+ 		if (link->state & DEV_CONFIG)
+-			CardServices(ReleaseConfiguration, link->handle);
++			pcmcia_release_configuration(link->handle);
+ 		break;
+ 	case CS_EVENT_PM_RESUME:
+ 		link->state &= ~DEV_SUSPEND;
+ 		/* Fall through... */
+ 	case CS_EVENT_CARD_RESET:
+ 		if (DEV_OK(link))
+-			CardServices(RequestConfiguration, link->handle, &link->conf);
++			pcmcia_request_configuration(link->handle, &link->conf);
+ 		break;
+ 	}
+ 
+--- linux-2.6.0/drivers/bluetooth/dtl1_cs.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/drivers/bluetooth/dtl1_cs.c	2003-12-28 23:22:54.000000000 -0800
+@@ -601,7 +601,7 @@ dev_link_t *dtl1_attach(void)
+ 	client_reg.Version = 0x0210;
+ 	client_reg.event_callback_args.client_data = link;
+ 
+-	ret = CardServices(RegisterClient, &link->handle, &client_reg);
++	ret = pcmcia_register_client(&link->handle, &client_reg);
+ 	if (ret != CS_SUCCESS) {
+ 		cs_error(link->handle, RegisterClient, ret);
+ 		dtl1_detach(link);
+@@ -630,7 +630,7 @@ void dtl1_detach(dev_link_t *link)
+ 		dtl1_release(link);
+ 
+ 	if (link->handle) {
+-		ret = CardServices(DeregisterClient, link->handle);
++		ret = pcmcia_deregister_client(link->handle);
+ 		if (ret != CS_SUCCESS)
+ 			cs_error(link->handle, DeregisterClient, ret);
+ 	}
+@@ -641,25 +641,30 @@ void dtl1_detach(dev_link_t *link)
+ 	kfree(info);
+ }
+ 
+-
+-static int get_tuple(int fn, client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
++static int get_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
+ {
+ 	int i;
+ 
+-	i = CardServices(fn, handle, tuple);
+-	if (i != CS_SUCCESS)
+-		return CS_NO_MORE_ITEMS;
+-
+-	i = CardServices(GetTupleData, handle, tuple);
++	i = pcmcia_get_tuple_data(handle, tuple);
+ 	if (i != CS_SUCCESS)
+ 		return i;
+ 
+-	return CardServices(ParseTuple, handle, tuple, parse);
++	return pcmcia_parse_tuple(handle, tuple, parse);
+ }
+ 
++static int first_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
++{
++	if (pcmcia_get_first_tuple(handle, tuple) != CS_SUCCESS)
++		return CS_NO_MORE_ITEMS;
++	return get_tuple(handle, tuple, parse);
++}
+ 
+-#define first_tuple(a, b, c) get_tuple(GetFirstTuple, a, b, c)
+-#define next_tuple(a, b, c) get_tuple(GetNextTuple, a, b, c)
++static int next_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
++{
++	if (pcmcia_get_next_tuple(handle, tuple) != CS_SUCCESS)
++		return CS_NO_MORE_ITEMS;
++	return get_tuple(handle, tuple, parse);
++}
+ 
+ void dtl1_config(dev_link_t *link)
+ {
+@@ -689,7 +694,7 @@ void dtl1_config(dev_link_t *link)
+ 
+ 	/* Configure card */
+ 	link->state |= DEV_CONFIG;
+-	i = CardServices(GetConfigurationInfo, handle, &config);
++	i = pcmcia_get_configuration_info(handle, &config);
+ 	link->conf.Vcc = config.Vcc;
+ 
+ 	tuple.TupleData = (cisdata_t *)buf;
+@@ -707,7 +712,7 @@ void dtl1_config(dev_link_t *link)
+ 			link->io.BasePort1 = cf->io.win[0].base;
+ 			link->io.NumPorts1 = cf->io.win[0].len;	/*yo */
+ 			link->io.IOAddrLines = cf->io.flags & CISTPL_IO_LINES_MASK;
+-			i = CardServices(RequestIO, link->handle, &link->io);
++			i = pcmcia_request_io(link->handle, &link->io);
+ 			if (i == CS_SUCCESS)
+ 				break;
+ 		}
+@@ -719,13 +724,13 @@ void dtl1_config(dev_link_t *link)
+ 		goto failed;
+ 	}
+ 
+-	i = CardServices(RequestIRQ, link->handle, &link->irq);
++	i = pcmcia_request_irq(link->handle, &link->irq);
+ 	if (i != CS_SUCCESS) {
+ 		cs_error(link->handle, RequestIRQ, i);
+ 		link->irq.AssignedIRQ = 0;
+ 	}
+ 
+-	i = CardServices(RequestConfiguration, link->handle, &link->conf);
++	i = pcmcia_request_configuration(link->handle, &link->conf);
+ 	if (i != CS_SUCCESS) {
+ 		cs_error(link->handle, RequestConfiguration, i);
+ 		goto failed;
+@@ -757,9 +762,9 @@ void dtl1_release(dev_link_t *link)
+ 
+ 	link->dev = NULL;
+ 
+-	CardServices(ReleaseConfiguration, link->handle);
+-	CardServices(ReleaseIO, link->handle, &link->io);
+-	CardServices(ReleaseIRQ, link->handle, &link->irq);
++	pcmcia_release_configuration(link->handle);
++	pcmcia_release_io(link->handle, &link->io);
++	pcmcia_release_irq(link->handle, &link->irq);
+ 
+ 	link->state &= ~DEV_CONFIG;
+ }
+@@ -787,14 +792,14 @@ int dtl1_event(event_t event, int priori
+ 		/* Fall through... */
+ 	case CS_EVENT_RESET_PHYSICAL:
+ 		if (link->state & DEV_CONFIG)
+-			CardServices(ReleaseConfiguration, link->handle);
++			pcmcia_release_configuration(link->handle);
+ 		break;
+ 	case CS_EVENT_PM_RESUME:
+ 		link->state &= ~DEV_SUSPEND;
+ 		/* Fall through... */
+ 	case CS_EVENT_CARD_RESET:
+ 		if (DEV_OK(link))
+-			CardServices(RequestConfiguration, link->handle, &link->conf);
++			pcmcia_request_configuration(link->handle, &link->conf);
+ 		break;
+ 	}
+ 
+--- linux-2.6.0/drivers/cdrom/aztcd.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/cdrom/aztcd.c	2003-12-28 23:21:17.000000000 -0800
+@@ -330,10 +330,10 @@ static int aztGetToc(int multi);
+ 
+ /* Kernel Interface Functions */
+ static int check_aztcd_media_change(struct gendisk *disk);
+-static int aztcd_ioctl(struct inode *ip, struct file *fp, unsigned int cmd,
++static int aztcd_ioctl(struct block_device *bdev, struct file *fp, unsigned int cmd,
+ 		       unsigned long arg);
+-static int aztcd_open(struct inode *ip, struct file *fp);
+-static int aztcd_release(struct inode *inode, struct file *file);
++static int aztcd_open(struct block_device *bdev, struct file *fp);
++static int aztcd_release(struct gendisk *disk);
+ 
+ static struct block_device_operations azt_fops = {
+ 	.owner		= THIS_MODULE,
+@@ -1153,7 +1153,7 @@ static int check_aztcd_media_change(stru
+ /*
+  * Kernel IO-controls
+ */
+-static int aztcd_ioctl(struct inode *ip, struct file *fp, unsigned int cmd,
++static int aztcd_ioctl(struct block_device *bdev, struct file *fp, unsigned int cmd,
+ 		       unsigned long arg)
+ {
+ 	int i;
+@@ -1171,8 +1171,6 @@ static int aztcd_ioctl(struct inode *ip,
+ 	       cmd, jiffies);
+ 	printk("aztcd Status %x\n", getAztStatus());
+ #endif
+-	if (!ip)
+-		RETURNM("aztcd_ioctl 1", -EINVAL);
+ 	if (getAztStatus() < 0)
+ 		RETURNM("aztcd_ioctl 2", -EIO);
+ 	if ((!aztTocUpToDate) || (aztDiskChanged)) {
+@@ -1624,7 +1622,7 @@ static void azt_invalidate_buffers(void)
+ /*
+  * Open the device special file.  Check that a disk is in.
+  */
+-static int aztcd_open(struct inode *ip, struct file *fp)
++static int aztcd_open(struct block_device *bdev, struct file *fp)
+ {
+ 	int st;
+ 
+@@ -1673,12 +1671,11 @@ static int aztcd_open(struct inode *ip, 
+ /*
+  * On close, we flush all azt blocks from the buffer cache.
+  */
+-static int aztcd_release(struct inode *inode, struct file *file)
++static int aztcd_release(struct gendisk *disk)
+ {
+ #ifdef AZT_DEBUG
+ 	printk("aztcd: executing aztcd_release\n");
+-	printk("inode: %p, device: %s    file: %p\n", inode,
+-	       inode->i_bdev->bd_disk->disk_name, file);
++	printk("disk: %p, device: %s\n", disk, disk->disk_name);
+ #endif
+ 	if (!--azt_open_count) {
+ 		azt_invalidate_buffers();
+--- linux-2.6.0/drivers/cdrom/cdrom.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/cdrom/cdrom.c	2003-12-28 23:22:35.000000000 -0800
+@@ -228,10 +228,16 @@
+    3.12 Oct 18, 2000 - Jens Axboe <axboe@suse.de>
+   -- Use quiet bit on packet commands not known to work
+ 
++   3.20 Dec 17, 2003 - Jens Axboe <axboe@suse.de>
++  -- Various fixes and lots of cleanups not listed :-)
++  -- Locking fixes
++  -- Mt Rainier support
++  -- DVD-RAM write open fixes
++
+ -------------------------------------------------------------------------*/
+ 
+-#define REVISION "Revision: 3.12"
+-#define VERSION "Id: cdrom.c 3.12 2000/10/18"
++#define REVISION "Revision: 3.20"
++#define VERSION "Id: cdrom.c 3.20 2003/12/17"
+ 
+ /* I use an error-log mask to give fine grain control over the type of
+    messages dumped to the system logs.  The available masks include: */
+@@ -282,11 +288,25 @@ static int autoeject;
+ static int lockdoor = 1;
+ /* will we ever get to use this... sigh. */
+ static int check_media_type;
++/* automatically restart mrw format */
++static int mrw_format_restart = 1;
+ MODULE_PARM(debug, "i");
+ MODULE_PARM(autoclose, "i");
+ MODULE_PARM(autoeject, "i");
+ MODULE_PARM(lockdoor, "i");
+ MODULE_PARM(check_media_type, "i");
++MODULE_PARM(mrw_format_restart, "i");
++
++static spinlock_t cdrom_lock = SPIN_LOCK_UNLOCKED;
++
++static const char *mrw_format_status[] = {
++	"not mrw",
++	"bgformat inactive",
++	"bgformat active",
++	"mrw complete",
++};
++
++static const char *mrw_address_space[] = { "DMA", "GAA" };
+ 
+ #if (ERRLOGMASK!=CD_NOTHING)
+ #define cdinfo(type, fmt, args...) \
+@@ -325,6 +345,10 @@ int cdrom_get_last_written(struct cdrom_
+ static int cdrom_get_next_writable(struct cdrom_device_info *, long *);
+ static void cdrom_count_tracks(struct cdrom_device_info *, tracktype*);
+ 
++static int cdrom_mrw_exit(struct cdrom_device_info *cdi);
++
++static int cdrom_get_disc_info(struct cdrom_device_info *cdi, disc_information *di);
++
+ #ifdef CONFIG_SYSCTL
+ static void cdrom_sysctl_register(void);
+ #endif /* CONFIG_SYSCTL */ 
+@@ -347,13 +371,14 @@ int register_cdrom(struct cdrom_device_i
+ 
+ 	if (cdo->open == NULL || cdo->release == NULL)
+ 		return -2;
+-	if ( !banner_printed ) {
++	if (!banner_printed) {
+ 		printk(KERN_INFO "Uniform CD-ROM driver " REVISION "\n");
+ 		banner_printed = 1;
+ #ifdef CONFIG_SYSCTL
+ 		cdrom_sysctl_register();
+ #endif /* CONFIG_SYSCTL */ 
+ 	}
++
+ 	ENSURE(drive_status, CDC_DRIVE_STATUS );
+ 	ENSURE(media_changed, CDC_MEDIA_CHANGED);
+ 	ENSURE(tray_move, CDC_CLOSE_TRAY | CDC_OPEN_TRAY);
+@@ -367,6 +392,7 @@ int register_cdrom(struct cdrom_device_i
+ 	ENSURE(generic_packet, CDC_GENERIC_PACKET);
+ 	cdi->mc_flags = 0;
+ 	cdo->n_minors = 0;
++	cdi->for_data = 0;
+         cdi->options = CDO_USE_FFLAGS;
+ 	
+ 	if (autoclose==1 && CDROM_CAN(CDC_CLOSE_TRAY))
+@@ -378,9 +404,14 @@ int register_cdrom(struct cdrom_device_i
+ 	if (check_media_type==1)
+ 		cdi->options |= (int) CDO_CHECK_TYPE;
+ 
++	if (CDROM_CAN(CDC_MRW_W))
++		cdi->exit = cdrom_mrw_exit;
++
+ 	cdinfo(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);
++	spin_lock(&cdrom_lock);
+ 	cdi->next = topCdromPtr; 	
+ 	topCdromPtr = cdi;
++	spin_unlock(&cdrom_lock);
+ 	return 0;
+ }
+ #undef ENSURE
+@@ -391,23 +422,310 @@ int unregister_cdrom(struct cdrom_device
+ 	cdinfo(CD_OPEN, "entering unregister_cdrom\n"); 
+ 
+ 	prev = NULL;
++	spin_lock(&cdrom_lock);
+ 	cdi = topCdromPtr;
+ 	while (cdi && cdi != unreg) {
+ 		prev = cdi;
+ 		cdi = cdi->next;
+ 	}
+ 
+-	if (cdi == NULL)
++	if (cdi == NULL) {
++		spin_unlock(&cdrom_lock);
+ 		return -2;
++	}
+ 	if (prev)
+ 		prev->next = cdi->next;
+ 	else
+ 		topCdromPtr = cdi->next;
++
++	spin_unlock(&cdrom_lock);
++
++	if (cdi->exit)
++		cdi->exit(cdi);
++
+ 	cdi->ops->n_minors--;
+ 	cdinfo(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
+ 	return 0;
+ }
+ 
++int cdrom_get_media_event(struct cdrom_device_info *cdi,
++			  struct media_event_desc *med)
++{
++	struct cdrom_generic_command cgc;
++	unsigned char buffer[8];
++	struct event_header *eh = (struct event_header *) buffer;
++
++	init_cdrom_command(&cgc, buffer, sizeof(buffer), CGC_DATA_READ);
++	cgc.cmd[0] = GPCMD_GET_EVENT_STATUS_NOTIFICATION;
++	cgc.cmd[1] = 1;		/* IMMED */
++	cgc.cmd[4] = 1 << 4;	/* media event */
++	cgc.cmd[8] = sizeof(buffer);
++	cgc.quiet = 1;
++
++	if (cdi->ops->generic_packet(cdi, &cgc))
++		return 1;
++
++	if (be16_to_cpu(eh->data_len) < sizeof(*med))
++		return 1;
++
++	memcpy(med, &buffer[sizeof(*eh)], sizeof(*med));
++	return 0;
++}
++
++/*
++ * the first prototypes used 0x2c as the page code for the mrw mode page,
++ * subsequently this was changed to 0x03. probe the one used by this drive
++ */
++int cdrom_mrw_probe_pc(struct cdrom_device_info *cdi)
++{
++	struct cdrom_generic_command cgc;
++	char buffer[16];
++
++	init_cdrom_command(&cgc, buffer, sizeof(buffer), CGC_DATA_READ);
++
++	cgc.timeout = HZ;
++	cgc.quiet = 1;
++
++	if (!cdrom_mode_sense(cdi, &cgc, MRW_MODE_PC, 0)) {
++		cdi->mrw_mode_page = MRW_MODE_PC;
++		return 0;
++	} else if (!cdrom_mode_sense(cdi, &cgc, MRW_MODE_PC_PRE1, 0)) {
++		cdi->mrw_mode_page = MRW_MODE_PC_PRE1;
++		return 0;
++	}
++
++	printk(KERN_ERR "cdrom: %s: unknown mrw mode page\n", cdi->name);
++	return 1;
++}
++
++int cdrom_is_mrw(struct cdrom_device_info *cdi, int *write)
++{
++	struct cdrom_generic_command cgc;
++	struct mrw_feature_desc *mfd;
++	unsigned char buffer[16];
++	int ret;
++
++	init_cdrom_command(&cgc, buffer, sizeof(buffer), CGC_DATA_READ);
++
++	cgc.cmd[0] = GPCMD_GET_CONFIGURATION;
++	cgc.cmd[3] = CDF_MRW;
++	cgc.cmd[8] = sizeof(buffer);
++	cgc.quiet = 1;
++
++	if ((ret = cdi->ops->generic_packet(cdi, &cgc)))
++		return ret;
++
++	mfd = (struct mrw_feature_desc *)&buffer[sizeof(struct feature_header)];
++	*write = mfd->write;
++
++	if ((ret = cdrom_mrw_probe_pc(cdi)))
++		return ret;
++
++	return 0;
++}
++
++static int cdrom_mrw_bgformat(struct cdrom_device_info *cdi, int cont)
++{
++	struct cdrom_generic_command cgc;
++	unsigned char buffer[12];
++	int ret;
++
++	printk(KERN_INFO "cdrom: %sstarting format\n", cont ? "Re" : "");
++
++	/*
++	 * FmtData bit set (bit 4), format type is 1
++	 */
++	init_cdrom_command(&cgc, buffer, sizeof(buffer), CGC_DATA_WRITE);
++	cgc.cmd[0] = GPCMD_FORMAT_UNIT;
++	cgc.cmd[1] = (1 << 4) | 1;
++
++	cgc.timeout = 5 * 60 * HZ;
++
++	/*
++	 * 4 byte format list header, 8 byte format list descriptor
++	 */
++	buffer[1] = 1 << 1;
++	buffer[3] = 8;
++
++	/*
++	 * nr_blocks field
++	 */
++	buffer[4] = 0xff;
++	buffer[5] = 0xff;
++	buffer[6] = 0xff;
++	buffer[7] = 0xff;
++
++	buffer[8] = 0x24 << 2;
++	buffer[11] = cont;
++
++	ret = cdi->ops->generic_packet(cdi, &cgc);
++	if (ret)
++		printk(KERN_INFO "cdrom: bgformat failed\n");
++
++	return ret;
++}
++
++static int cdrom_mrw_bgformat_susp(struct cdrom_device_info *cdi, int immed)
++{
++	struct cdrom_generic_command cgc;
++
++	init_cdrom_command(&cgc, NULL, 0, CGC_DATA_NONE);
++	cgc.cmd[0] = GPCMD_CLOSE_TRACK;
++
++	/*
++	 * Session = 1, Track = 0
++	 */
++	cgc.cmd[1] = !!immed;
++	cgc.cmd[2] = 1 << 1;
++
++	cgc.timeout = 5 * 60 * HZ;
++
++	return cdi->ops->generic_packet(cdi, &cgc);
++}
++
++static int cdrom_flush_cache(struct cdrom_device_info *cdi)
++{
++	struct cdrom_generic_command cgc;
++
++	init_cdrom_command(&cgc, NULL, 0, CGC_DATA_NONE);
++	cgc.cmd[0] = GPCMD_FLUSH_CACHE;
++
++	cgc.timeout = 5 * 60 * HZ;
++
++	return cdi->ops->generic_packet(cdi, &cgc);
++}
++
++static int cdrom_mrw_exit(struct cdrom_device_info *cdi)
++{
++	disc_information di;
++	int ret = 0;
++
++	if (cdrom_get_disc_info(cdi, &di))
++		return 1;
++
++	if (di.mrw_status == CDM_MRW_BGFORMAT_ACTIVE) {
++		printk(KERN_INFO "cdrom: issuing MRW back ground format suspend\n");
++		ret = cdrom_mrw_bgformat_susp(cdi, 0);
++	}
++
++	if (!ret)
++		ret = cdrom_flush_cache(cdi);
++
++	return ret;
++}
++
++static int cdrom_mrw_set_lba_space(struct cdrom_device_info *cdi, int space)
++{
++	struct cdrom_generic_command cgc;
++	struct mode_page_header *mph;
++	char buffer[16];
++	int ret, offset, size;
++
++	init_cdrom_command(&cgc, buffer, sizeof(buffer), CGC_DATA_READ);
++
++	cgc.buffer = buffer;
++	cgc.buflen = sizeof(buffer);
++
++	if ((ret = cdrom_mode_sense(cdi, &cgc, cdi->mrw_mode_page, 0)))
++		return ret;
++
++	mph = (struct mode_page_header *) buffer;
++	offset = be16_to_cpu(mph->desc_length);
++	size = be16_to_cpu(mph->mode_data_length) + 2;
++
++	buffer[offset + 3] = space;
++	cgc.buflen = size;
++
++	if ((ret = cdrom_mode_select(cdi, &cgc)))
++		return ret;
++
++	printk(KERN_INFO "cdrom: %s: mrw address space %s selected\n", cdi->name, mrw_address_space[space]);
++	return 0;
++}
++
++static int cdrom_media_erasable(struct cdrom_device_info *cdi)
++{
++	disc_information di;
++
++	if (cdrom_get_disc_info(cdi, &di))
++		return 0;
++
++	return di.erasable;
++}
++
++/*
++ * FIXME: check RO bit
++ */
++static int cdrom_dvdram_open_write(struct cdrom_device_info *cdi)
++{
++	return !cdrom_media_erasable(cdi);
++}
++
++static int cdrom_mrw_open_write(struct cdrom_device_info *cdi)
++{
++	disc_information di;
++	int ret;
++
++	/*
++	 * always reset to DMA lba space on open
++	 */
++	if (cdrom_mrw_set_lba_space(cdi, MRW_LBA_DMA)) {
++		printk(KERN_ERR "cdrom: failed setting lba address space\n");
++		return 1;
++	}
++
++	if (cdrom_get_disc_info(cdi, &di))
++		return 1;
++
++	if (!di.erasable)
++		return 1;
++
++	/*
++	 * mrw_status
++	 * 0	-	not MRW formatted
++	 * 1	-	MRW bgformat started, but not running or complete
++	 * 2	-	MRW bgformat in progress
++	 * 3	-	MRW formatting complete
++	 */
++	ret = 0;
++	printk(KERN_INFO "cdrom open: mrw_status '%s'\n", mrw_format_status[di.mrw_status]);
++	if (!di.mrw_status)
++		ret = 1;
++	else if (di.mrw_status == CDM_MRW_BGFORMAT_INACTIVE && mrw_format_restart)
++		ret = cdrom_mrw_bgformat(cdi, 1);
++
++	return ret;
++}
++
++/*
++ * returns 0 for ok to open write, non-0 to disallow
++ */
++static int cdrom_open_write(struct cdrom_device_info *cdi)
++{
++	int ret = 1;
++
++	if (CDROM_CAN(CDC_MRW_W))
++		ret = cdrom_mrw_open_write(cdi);
++	else if (CDROM_CAN(CDC_DVD_RAM))
++		ret = cdrom_dvdram_open_write(cdi);
++	/*
++	 * needs to really check whether media is writeable
++	 */
++	else if (CDROM_CAN(CDC_MO_DRIVE))
++		ret = 0;
++
++	return ret;
++}
++
++static int cdrom_close_write(struct cdrom_device_info *cdi)
++{
++#if 0
++	return cdrom_flush_cache(cdi);
++#else
++	return 0;
++#endif
++}
++
+ /* We use the open-option O_NONBLOCK to indicate that the
+  * purpose of opening is only for subsequent ioctl() calls; no device
+  * integrity checks are performed.
+@@ -416,28 +734,34 @@ int unregister_cdrom(struct cdrom_device
+  * is in their own interest: device control becomes a lot easier
+  * this way.
+  */
+-int cdrom_open(struct cdrom_device_info *cdi, struct inode *ip, struct file *fp)
++int cdrom_open(struct cdrom_device_info *cdi, struct block_device *bdev, struct file *fp)
+ {
+ 	int ret;
+ 
+ 	cdinfo(CD_OPEN, "entering cdrom_open\n"); 
++	cdi->use_count++;
++	ret = -EROFS;
++	if (fp->f_mode & FMODE_WRITE) {
++		if (!CDROM_CAN(CDC_RAM))
++			goto out;
++		if (cdrom_open_write(cdi))
++			goto out;
++	}
++
+ 	/* if this was a O_NONBLOCK open and we should honor the flags,
+ 	 * do a quick open without drive/disc integrity checks. */
+ 	if ((fp->f_flags & O_NONBLOCK) && (cdi->options & CDO_USE_FFLAGS))
+ 		ret = cdi->ops->open(cdi, 1);
+-	else {
+-		if ((fp->f_mode & FMODE_WRITE) && !CDROM_CAN(CDC_DVD_RAM))
+-			return -EROFS;
+-
++	else
+ 		ret = open_for_data(cdi);
+-	}
+-
+-	if (!ret) cdi->use_count++;
+ 
+ 	cdinfo(CD_OPEN, "Use count for \"/dev/%s\" now %d\n", cdi->name, cdi->use_count);
+ 	/* Do this on open.  Don't wait for mount, because they might
+ 	    not be mounting, but opening with O_NONBLOCK */
+-	check_disk_change(ip->i_bdev);
++	check_disk_change(bdev);
++out:
++	if (ret)
++		cdi->use_count--;
+ 	return ret;
+ }
+ 
+@@ -525,11 +849,12 @@ int open_for_data(struct cdrom_device_in
+ 		cdinfo(CD_OPEN, "open device failed.\n"); 
+ 		goto clean_up_and_return;
+ 	}
+-	if (CDROM_CAN(CDC_LOCK) && cdi->options & CDO_LOCK) {
++	if (CDROM_CAN(CDC_LOCK) && (cdi->options & CDO_LOCK)) {
+ 			cdo->lock_door(cdi, 1);
+ 			cdinfo(CD_OPEN, "door locked.\n");
+ 	}
+ 	cdinfo(CD_OPEN, "device opened successfully.\n"); 
++	cdi->for_data = 1;
+ 	return ret;
+ 
+ 	/* Something failed.  Try to unlock the drive, because some drivers
+@@ -603,32 +928,39 @@ int check_for_audio_disc(struct cdrom_de
+ 	return 0;
+ }
+ 
+-
+ /* Admittedly, the logic below could be performed in a nicer way. */
+-int cdrom_release(struct cdrom_device_info *cdi, struct file *fp)
++int cdrom_release(struct cdrom_device_info *cdi)
+ {
+ 	struct cdrom_device_ops *cdo = cdi->ops;
+-	int opened_for_data;
+ 
+ 	cdinfo(CD_CLOSE, "entering cdrom_release\n"); 
+ 
+ 	if (cdi->use_count > 0)
+ 		cdi->use_count--;
+-	if (cdi->use_count == 0)
+-		cdinfo(CD_CLOSE, "Use count for \"/dev/%s\" now zero\n", cdi->name);
+-	if (cdi->use_count == 0 &&
+-	    cdo->capability & CDC_LOCK && !keeplocked) {
++
++	if (cdi->use_count) {
++		cdo->release(cdi);
++		return 0;
++	}
++
++	cdinfo(CD_CLOSE, "Use count for \"/dev/%s\" now zero\n", cdi->name);
++	if ((cdo->capability & CDC_LOCK) && !keeplocked) {
+ 		cdinfo(CD_CLOSE, "Unlocking door!\n");
+ 		cdo->lock_door(cdi, 0);
+ 	}
+-	opened_for_data = !(cdi->options & CDO_USE_FFLAGS) ||
+-		!(fp && fp->f_flags & O_NONBLOCK);
++
++	/*
++	 * flush cache on last write release
++	 */
++	if (CDROM_CAN(CDC_RAM) && !cdi->use_count && cdi->for_data)
++		cdrom_close_write(cdi);
++
+ 	cdo->release(cdi);
+-	if (cdi->use_count == 0) {      /* last process that closes dev*/
+-		if (opened_for_data &&
+-		    cdi->options & CDO_AUTO_EJECT && CDROM_CAN(CDC_OPEN_TRAY))
+-			cdo->tray_move(cdi, 1);
+-	}
++	if (cdi->for_data &&
++	    cdi->options & CDO_AUTO_EJECT && CDROM_CAN(CDC_OPEN_TRAY))
++		cdo->tray_move(cdi, 1);
++
++	cdi->for_data = 0;
+ 	return 0;
+ }
+ 
+@@ -1433,14 +1765,14 @@ static int cdrom_read_block(struct cdrom
+  * these days. ATAPI / SCSI specific code now mainly resides in
+  * mmc_ioct().
+  */
+-int cdrom_ioctl(struct cdrom_device_info *cdi, struct inode *ip,
++int cdrom_ioctl(struct cdrom_device_info *cdi, struct block_device *bdev,
+ 		unsigned int cmd, unsigned long arg)
+ {
+ 	struct cdrom_device_ops *cdo = cdi->ops;
+ 	int ret;
+ 
+ 	/* Try the generic SCSI command ioctl's first.. */
+-	ret = scsi_cmd_ioctl(ip->i_bdev, cmd, arg);
++	ret = scsi_cmd_ioctl(bdev, cmd, arg);
+ 	if (ret != -ENOTTY)
+ 		return ret;
+ 
+@@ -1593,7 +1925,7 @@ int cdrom_ioctl(struct cdrom_device_info
+ 		cdinfo(CD_DO_IOCTL, "entering CDROM_RESET\n");
+ 		if (!CDROM_CAN(CDC_RESET))
+ 			return -ENOSYS;
+-		invalidate_bdev(ip->i_bdev, 0);
++		invalidate_bdev(bdev, 0);
+ 		return cdo->reset(cdi);
+ 		}
+ 
+@@ -2203,7 +2535,6 @@ static int cdrom_get_disc_info(struct cd
+ 	return cdo->generic_packet(cdi, &cgc);
+ }
+ 
+-
+ /* return the last written block on the CD-R media. this is for the udf
+    file system. */
+ int cdrom_get_last_written(struct cdrom_device_info *cdi, long *last_written)
+@@ -2310,6 +2641,8 @@ EXPORT_SYMBOL(cdrom_number_of_slots);
+ EXPORT_SYMBOL(cdrom_mode_select);
+ EXPORT_SYMBOL(cdrom_mode_sense);
+ EXPORT_SYMBOL(init_cdrom_command);
++EXPORT_SYMBOL(cdrom_get_media_event);
++EXPORT_SYMBOL(cdrom_is_mrw);
+ 
+ #ifdef CONFIG_SYSCTL
+ 
+@@ -2406,6 +2739,14 @@ int cdrom_sysctl_info(ctl_table *ctl, in
+ 	for (cdi=topCdromPtr;cdi!=NULL;cdi=cdi->next)
+ 	    pos += sprintf(info+pos, "\t%d", CDROM_CAN(CDC_DVD_RAM) != 0);
+ 
++	pos += sprintf(info+pos, "\nCan read MRW:");
++	for (cdi=topCdromPtr;cdi!=NULL;cdi=cdi->next)
++	    pos += sprintf(info+pos, "\t\t%d", CDROM_CAN(CDC_MRW) != 0);
++
++	pos += sprintf(info+pos, "\nCan write MRW:");
++	for (cdi=topCdromPtr;cdi!=NULL;cdi=cdi->next)
++	    pos += sprintf(info+pos, "\t\t%d", CDROM_CAN(CDC_MRW_W) != 0);
++
+ 	strcpy(info+pos,"\n\n");
+ 		
+         return proc_dostring(ctl, write, filp, buffer, lenp);
+--- linux-2.6.0/drivers/cdrom/cdu31a.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/cdrom/cdu31a.c	2003-12-28 23:21:17.000000000 -0800
+@@ -3167,20 +3167,20 @@ static struct cdrom_device_info scd_info
+ 	.name		= "cdu31a"
+ };
+ 
+-static int scd_block_open(struct inode *inode, struct file *file)
++static int scd_block_open(struct block_device *bdev, struct file *file)
+ {
+-	return cdrom_open(&scd_info, inode, file);
++	return cdrom_open(&scd_info, bdev, file);
+ }
+ 
+-static int scd_block_release(struct inode *inode, struct file *file)
++static int scd_block_release(struct gendisk *disk)
+ {
+-	return cdrom_release(&scd_info, file);
++	return cdrom_release(&scd_info);
+ }
+ 
+-static int scd_block_ioctl(struct inode *inode, struct file *file,
++static int scd_block_ioctl(struct block_device *bdev, struct file *file,
+ 				unsigned cmd, unsigned long arg)
+ {
+-	return cdrom_ioctl(&scd_info, inode, cmd, arg);
++	return cdrom_ioctl(&scd_info, bdev, cmd, arg);
+ }
+ 
+ static int scd_block_media_changed(struct gendisk *disk)
+--- linux-2.6.0/drivers/cdrom/cm206.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/cdrom/cm206.c	2003-12-28 23:21:17.000000000 -0800
+@@ -1350,20 +1350,20 @@ static struct cdrom_device_info cm206_in
+ 	.name		= "cm206",
+ };
+ 
+-static int cm206_block_open(struct inode *inode, struct file *file)
++static int cm206_block_open(struct block_device *bdev, struct file *file)
+ {
+-	return cdrom_open(&cm206_info, inode, file);
++	return cdrom_open(&cm206_info, bdev, file);
+ }
+ 
+-static int cm206_block_release(struct inode *inode, struct file *file)
++static int cm206_block_release(struct gendisk *disk)
+ {
+-	return cdrom_release(&cm206_info, file);
++	return cdrom_release(&cm206_info);
+ }
+ 
+-static int cm206_block_ioctl(struct inode *inode, struct file *file,
++static int cm206_block_ioctl(struct block_device *bdev, struct file *file,
+ 				unsigned cmd, unsigned long arg)
+ {
+-	return cdrom_ioctl(&cm206_info, inode, cmd, arg);
++	return cdrom_ioctl(&cm206_info, bdev, cmd, arg);
+ }
+ 
+ static int cm206_block_media_changed(struct gendisk *disk)
+--- linux-2.6.0/drivers/cdrom/gscd.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/cdrom/gscd.c	2003-12-28 23:21:17.000000000 -0800
+@@ -91,10 +91,10 @@ static void gscd_bin2bcd(unsigned char *
+ /* Schnittstellen zum Kern/FS */
+ 
+ static void __do_gscd_request(unsigned long dummy);
+-static int gscd_ioctl(struct inode *, struct file *, unsigned int,
++static int gscd_ioctl(struct block_device *, struct file *, unsigned int,
+ 		      unsigned long);
+-static int gscd_open(struct inode *, struct file *);
+-static int gscd_release(struct inode *, struct file *);
++static int gscd_open(struct block_device *, struct file *);
++static int gscd_release(struct gendisk *disk);
+ static int check_gscd_med_chg(struct gendisk *disk);
+ 
+ /*      GoldStar Funktionen    */
+@@ -190,8 +190,8 @@ __setup("gscd=", gscd_setup);
+ 
+ #endif
+ 
+-static int gscd_ioctl(struct inode *ip, struct file *fp, unsigned int cmd,
+-		      unsigned long arg)
++static int gscd_ioctl(struct block_device *bdev, struct file *fp,
++			unsigned int cmd, unsigned long arg)
+ {
+ 	unsigned char to_do[10];
+ 	unsigned char dummy;
+@@ -338,7 +338,7 @@ static void gscd_read_cmd(struct request
+  * Open the device special file.  Check that a disk is in.
+  */
+ 
+-static int gscd_open(struct inode *ip, struct file *fp)
++static int gscd_open(struct block_device *bdev, struct file *fp)
+ {
+ 	int st;
+ 
+@@ -368,7 +368,7 @@ static int gscd_open(struct inode *ip, s
+  * On close, we flush all gscd blocks from the buffer cache.
+  */
+ 
+-static int gscd_release(struct inode *inode, struct file *file)
++static int gscd_release(struct gendisk *disk)
+ {
+ 
+ #ifdef GSCD_DEBUG
+--- linux-2.6.0/drivers/cdrom/mcd.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/cdrom/mcd.c	2003-12-28 23:21:17.000000000 -0800
+@@ -214,20 +214,20 @@ static struct cdrom_device_info mcd_info
+ 	.name		= "mcd",
+ };
+ 
+-static int mcd_block_open(struct inode *inode, struct file *file)
++static int mcd_block_open(struct block_device *bdev, struct file *file)
+ {
+-	return cdrom_open(&mcd_info, inode, file);
++	return cdrom_open(&mcd_info, bdev, file);
+ }
+ 
+-static int mcd_block_release(struct inode *inode, struct file *file)
++static int mcd_block_release(struct gendisk *disk)
+ {
+-	return cdrom_release(&mcd_info, file);
++	return cdrom_release(&mcd_info);
+ }
+ 
+-static int mcd_block_ioctl(struct inode *inode, struct file *file,
++static int mcd_block_ioctl(struct block_device *bdev, struct file *file,
+ 				unsigned cmd, unsigned long arg)
+ {
+-	return cdrom_ioctl(&mcd_info, inode, cmd, arg);
++	return cdrom_ioctl(&mcd_info, bdev, cmd, arg);
+ }
+ 
+ static int mcd_block_media_changed(struct gendisk *disk)
+--- linux-2.6.0/drivers/cdrom/mcdx.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/cdrom/mcdx.c	2003-12-28 23:21:17.000000000 -0800
+@@ -221,23 +221,23 @@ struct s_drive_stuff {
+ int mcdx_init(void);
+ void do_mcdx_request(request_queue_t * q);
+ 
+-static int mcdx_block_open(struct inode *inode, struct file *file)
++static int mcdx_block_open(struct block_device *bdev, struct file *file)
+ {
+-	struct s_drive_stuff *p = inode->i_bdev->bd_disk->private_data;
+-	return cdrom_open(&p->info, inode, file);
++	struct s_drive_stuff *p = bdev->bd_disk->private_data;
++	return cdrom_open(&p->info, bdev, file);
+ }
+ 
+-static int mcdx_block_release(struct inode *inode, struct file *file)
++static int mcdx_block_release(struct gendisk *disk)
+ {
+-	struct s_drive_stuff *p = inode->i_bdev->bd_disk->private_data;
+-	return cdrom_release(&p->info, file);
++	struct s_drive_stuff *p = disk->private_data;
++	return cdrom_release(&p->info);
+ }
+ 
+-static int mcdx_block_ioctl(struct inode *inode, struct file *file,
++static int mcdx_block_ioctl(struct block_device *bdev, struct file *file,
+ 				unsigned cmd, unsigned long arg)
+ {
+-	struct s_drive_stuff *p = inode->i_bdev->bd_disk->private_data;
+-	return cdrom_ioctl(&p->info, inode, cmd, arg);
++	struct s_drive_stuff *p = bdev->bd_disk->private_data;
++	return cdrom_ioctl(&p->info, bdev, cmd, arg);
+ }
+ 
+ static int mcdx_block_media_changed(struct gendisk *disk)
+--- linux-2.6.0/drivers/cdrom/optcd.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/cdrom/optcd.c	2003-12-28 23:21:17.000000000 -0800
+@@ -1713,16 +1713,13 @@ static int cdromreset(void)
+ /* VFS calls */
+ 
+ 
+-static int opt_ioctl(struct inode *ip, struct file *fp,
++static int opt_ioctl(struct block_device *bdev, struct file *fp,
+                      unsigned int cmd, unsigned long arg)
+ {
+ 	int status, err, retval = 0;
+ 
+ 	DEBUG((DEBUG_VFS, "starting opt_ioctl"));
+ 
+-	if (!ip)
+-		return -EINVAL;
+-
+ 	if (cmd == CDROMRESET)
+ 		return cdromreset();
+ 
+@@ -1844,7 +1841,7 @@ static int opt_ioctl(struct inode *ip, s
+ static int open_count = 0;
+ 
+ /* Open device special file; check that a disk is in. */
+-static int opt_open(struct inode *ip, struct file *fp)
++static int opt_open(struct block_device *bdev, struct file *fp)
+ {
+ 	DEBUG((DEBUG_VFS, "starting opt_open"));
+ 
+@@ -1904,13 +1901,12 @@ err_out:
+ 
+ 
+ /* Release device special file; flush all blocks from the buffer cache */
+-static int opt_release(struct inode *ip, struct file *fp)
++static int opt_release(struct gendisk *disk)
+ {
+ 	int status;
+ 
+ 	DEBUG((DEBUG_VFS, "executing opt_release"));
+-	DEBUG((DEBUG_VFS, "inode: %p, device: %s, file: %p\n",
+-		ip, ip->i_bdev->bd_disk->disk_name, fp));
++	DEBUG((DEBUG_VFS, "disk: %p, device: %s\n", disk, disk->disk_name));
+ 
+ 	if (!--open_count) {
+ 		toc_uptodate = 0;
+--- linux-2.6.0/drivers/cdrom/sbpcd.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/cdrom/sbpcd.c	2003-12-28 23:21:17.000000000 -0800
+@@ -5356,23 +5356,23 @@ static int sbp_data(struct request *req)
+ }
+ /*==========================================================================*/
+ 
+-static int sbpcd_block_open(struct inode *inode, struct file *file)
++static int sbpcd_block_open(struct block_device *bdev, struct file *file)
+ {
+-	struct sbpcd_drive *p = inode->i_bdev->bd_disk->private_data;
+-	return cdrom_open(p->sbpcd_infop, inode, file);
++	struct sbpcd_drive *p = bdev->bd_disk->private_data;
++	return cdrom_open(p->sbpcd_infop, bdev, file);
+ }
+ 
+-static int sbpcd_block_release(struct inode *inode, struct file *file)
++static int sbpcd_block_release(struct gendisk *disk)
+ {
+-	struct sbpcd_drive *p = inode->i_bdev->bd_disk->private_data;
+-	return cdrom_release(p->sbpcd_infop, file);
++	struct sbpcd_drive *p = disk->private_data;
++	return cdrom_release(p->sbpcd_infop);
+ }
+ 
+-static int sbpcd_block_ioctl(struct inode *inode, struct file *file,
++static int sbpcd_block_ioctl(struct block_device *bdev, struct file *file,
+ 				unsigned cmd, unsigned long arg)
+ {
+-	struct sbpcd_drive *p = inode->i_bdev->bd_disk->private_data;
+-	return cdrom_ioctl(p->sbpcd_infop, inode, cmd, arg);
++	struct sbpcd_drive *p = bdev->bd_disk->private_data;
++	return cdrom_ioctl(p->sbpcd_infop, bdev, cmd, arg);
+ }
+ 
+ static int sbpcd_block_media_changed(struct gendisk *disk)
+--- linux-2.6.0/drivers/cdrom/sjcd.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/cdrom/sjcd.c	2003-12-28 23:21:17.000000000 -0800
+@@ -713,16 +713,13 @@ static int sjcd_tray_open(void)
+ /*
+  * Do some user commands.
+  */
+-static int sjcd_ioctl(struct inode *ip, struct file *fp,
++static int sjcd_ioctl(struct block_device *bdev, struct file *fp,
+ 		      unsigned int cmd, unsigned long arg)
+ {
+ #if defined( SJCD_TRACE )
+ 	printk("SJCD:ioctl\n");
+ #endif
+ 
+-	if (ip == NULL)
+-		return (-EINVAL);
+-
+ 	sjcd_get_status();
+ 	if (!sjcd_status_valid)
+ 		return (-EIO);
+@@ -1526,7 +1523,7 @@ static void do_sjcd_request(request_queu
+ /*
+  * Open the device special file. Check disk is in.
+  */
+-static int sjcd_open(struct inode *ip, struct file *fp)
++static int sjcd_open(struct block_device *bdev, struct file *fp)
+ {
+ 	/*
+ 	 * Check the presence of device.
+@@ -1611,7 +1608,7 @@ static int sjcd_open(struct inode *ip, s
+ /*
+  * On close, we flush all sjcd blocks from the buffer cache.
+  */
+-static int sjcd_release(struct inode *inode, struct file *file)
++static int sjcd_release(struct gendisk *disk)
+ {
+ 	int s;
+ 
+--- linux-2.6.0/drivers/cdrom/sonycd535.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/cdrom/sonycd535.c	2003-12-28 23:21:17.000000000 -0800
+@@ -201,7 +201,7 @@
+ 
+ static int read_subcode(void);
+ static void sony_get_toc(void);
+-static int cdu_open(struct inode *inode, struct file *filp);
++static int cdu_open(struct block_device *bdev, struct file *filp);
+ static inline unsigned int int_to_bcd(unsigned int val);
+ static unsigned int bcd_to_int(unsigned int bcd);
+ static int do_sony_cmd(Byte * cmd, int nCmd, Byte status[2],
+@@ -1061,7 +1061,7 @@ sony_get_subchnl_info(long arg)
+  * The big ugly ioctl handler.
+  */
+ static int
+-cdu_ioctl(struct inode *inode,
++cdu_ioctl(struct block_device *bdev,
+ 		  struct file *file,
+ 		  unsigned int cmd,
+ 		  unsigned long arg)
+@@ -1360,9 +1360,7 @@ cdu_ioctl(struct inode *inode,
+  * Open the drive for operations.  Spin the drive up and read the table of
+  * contents if these have not already been done.
+  */
+-static int
+-cdu_open(struct inode *inode,
+-		 struct file *filp)
++static int cdu_open(struct block_device *bdev, struct file *filp)
+ {
+ 	Byte status[2], cmd_buff[2];
+ 
+@@ -1385,7 +1383,7 @@ cdu_open(struct inode *inode,
+ 		sony_inuse = 0;
+ 		return -EIO;
+ 	}
+-	check_disk_change(inode->i_bdev);
++	check_disk_change(bdev);
+ 	sony_usage++;
+ 
+ #ifdef LOCK_DOORS
+@@ -1402,9 +1400,7 @@ cdu_open(struct inode *inode,
+  * Close the drive.  Spin it down if no task is using it.  The spin
+  * down will fail if playing audio, so audio play is OK.
+  */
+-static int
+-cdu_release(struct inode *inode,
+-			struct file *filp)
++static int cdu_release(struct gendisk *disk)
+ {
+ 	Byte status[2], cmd_no;
+ 
+--- linux-2.6.0/drivers/char/agp/alpha-agp.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/char/agp/alpha-agp.c	2003-12-28 23:22:12.000000000 -0800
+@@ -13,7 +13,7 @@
+ 
+ static struct page *alpha_core_agp_vm_nopage(struct vm_area_struct *vma,
+ 					     unsigned long address,
+-					     int write_access)
++					     int *type)
+ {
+ 	alpha_agp_info *agp = agp_bridge->dev_private_data;
+ 	dma_addr_t dma_addr;
+@@ -30,6 +30,8 @@ static struct page *alpha_core_agp_vm_no
+ 	 */
+ 	page = virt_to_page(__va(pa));
+ 	get_page(page);
++	if (type)
++		*type = VM_FAULT_MINOR;
+ 	return page;
+ }
+ 
+--- linux-2.6.0/drivers/char/drm/drmP.h	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/char/drm/drmP.h	2003-12-28 23:22:12.000000000 -0800
+@@ -760,16 +760,16 @@ extern int	     DRM(fasync)(int fd, stru
+ 				/* Mapping support (drm_vm.h) */
+ extern struct page *DRM(vm_nopage)(struct vm_area_struct *vma,
+ 				   unsigned long address,
+-				   int write_access);
++				   int *type);
+ extern struct page *DRM(vm_shm_nopage)(struct vm_area_struct *vma,
+ 				       unsigned long address,
+-				       int write_access);
++				       int *type);
+ extern struct page *DRM(vm_dma_nopage)(struct vm_area_struct *vma,
+ 				       unsigned long address,
+-				       int write_access);
++				       int *type);
+ extern struct page *DRM(vm_sg_nopage)(struct vm_area_struct *vma,
+ 				      unsigned long address,
+-				      int write_access);
++				      int *type);
+ extern void	     DRM(vm_open)(struct vm_area_struct *vma);
+ extern void	     DRM(vm_close)(struct vm_area_struct *vma);
+ extern void	     DRM(vm_shm_close)(struct vm_area_struct *vma);
+--- linux-2.6.0/drivers/char/drm/drm_vm.h	2003-07-13 21:44:34.000000000 -0700
++++ 25/drivers/char/drm/drm_vm.h	2003-12-28 23:22:12.000000000 -0800
+@@ -76,7 +76,7 @@ struct vm_operations_struct   DRM(vm_sg_
+  */
+ struct page *DRM(vm_nopage)(struct vm_area_struct *vma,
+ 			    unsigned long address,
+-			    int write_access)
++			    int *type)
+ {
+ #if __REALLY_HAVE_AGP
+ 	drm_file_t *priv  = vma->vm_file->private_data;
+@@ -133,6 +133,8 @@ struct page *DRM(vm_nopage)(struct vm_ar
+ 			  baddr, __va(agpmem->memory->memory[offset]), offset,
+ 			  atomic_read(&page->count));
+ 
++		if (type)
++			*type = VM_FAULT_MINOR;
+ 		return page;
+         }
+ vm_nopage_error:
+@@ -154,7 +156,7 @@ vm_nopage_error:
+  */
+ struct page *DRM(vm_shm_nopage)(struct vm_area_struct *vma,
+ 				unsigned long address,
+-				int write_access)
++				int *type)
+ {
+ 	drm_map_t	 *map	 = (drm_map_t *)vma->vm_private_data;
+ 	unsigned long	 offset;
+@@ -170,6 +172,8 @@ struct page *DRM(vm_shm_nopage)(struct v
+ 	if (!page)
+ 		return NOPAGE_OOM;
+ 	get_page(page);
++	if (type)
++		*type = VM_FAULT_MINOR;
+ 
+ 	DRM_DEBUG("shm_nopage 0x%lx\n", address);
+ 	return page;
+@@ -268,7 +272,7 @@ void DRM(vm_shm_close)(struct vm_area_st
+  */
+ struct page *DRM(vm_dma_nopage)(struct vm_area_struct *vma,
+ 				unsigned long address,
+-				int write_access)
++				int *type)
+ {
+ 	drm_file_t	 *priv	 = vma->vm_file->private_data;
+ 	drm_device_t	 *dev	 = priv->dev;
+@@ -287,6 +291,8 @@ struct page *DRM(vm_dma_nopage)(struct v
+ 			     (offset & (~PAGE_MASK))));
+ 
+ 	get_page(page);
++	if (type)
++		*type = VM_FAULT_MINOR;
+ 
+ 	DRM_DEBUG("dma_nopage 0x%lx (page %lu)\n", address, page_nr);
+ 	return page;
+@@ -304,7 +310,7 @@ struct page *DRM(vm_dma_nopage)(struct v
+  */
+ struct page *DRM(vm_sg_nopage)(struct vm_area_struct *vma,
+ 			       unsigned long address,
+-			       int write_access)
++			       int *type)
+ {
+ 	drm_map_t        *map    = (drm_map_t *)vma->vm_private_data;
+ 	drm_file_t *priv = vma->vm_file->private_data;
+@@ -325,6 +331,8 @@ struct page *DRM(vm_sg_nopage)(struct vm
+ 	page_offset = (offset >> PAGE_SHIFT) + (map_offset >> PAGE_SHIFT);
+ 	page = entry->pagelist[page_offset];
+ 	get_page(page);
++	if (type)
++		*type = VM_FAULT_MINOR;
+ 
+ 	return page;
+ }
+--- linux-2.6.0/drivers/char/keyboard.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/char/keyboard.c	2003-12-28 23:21:28.000000000 -0800
+@@ -941,16 +941,16 @@ static unsigned short x86_keycodes[256] 
+ 	 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+ 	 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+ 	 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+-	 80, 81, 82, 83, 43, 85, 86, 87, 88,115,119,120,121,375,123, 90,
+-	284,285,309,298,312, 91,327,328,329,331,333,335,336,337,338,339,
+-	367,288,302,304,350, 92,334,512,116,377,109,111,373,347,348,349,
+-	360, 93, 94, 95, 98,376,100,101,321,316,354,286,289,102,351,355,
++	 80, 81, 82, 83, 84, 93, 86, 87, 88, 94, 95, 85,259,375,260, 90,
++	284,285,309,311,312, 91,327,328,329,331,333,335,336,337,338,339,
++	367,288,302,304,350, 89,334,326,116,377,109,111,126,347,348,349,
++	360,261,262,263,298,376,100,101,321,316,373,286,289,102,351,355,
+ 	103,104,105,275,287,279,306,106,274,107,294,364,358,363,362,361,
+-	291,108,381,281,290,272,292,305,280, 99,112,257,258,359,270,114,
+-	118,117,125,374,379,115,112,125,121,123,264,265,266,267,268,269,
+-	271,273,276,277,278,282,283,295,296,297,299,300,301,293,303,307,
+-	308,310,313,314,315,317,318,319,320,357,322,323,324,325,326,330,
+-	332,340,365,342,343,344,345,346,356,113,341,368,369,370,371,372 };
++	291,108,381,281,290,272,292,305,280, 99,112,257,258,359,113,114,
++	264,117,271,374,379,115,125,273,121,123, 92,265,266,267,268,269,
++	120,119,118,277,278,282,283,295,296,297,299,300,301,293,303,307,
++	308,310,313,314,315,317,318,319,320,357,322,323,324,325,276,330,
++	332,340,365,342,343,344,345,346,356,270,341,368,369,370,371,372 };
+ 
+ #ifdef CONFIG_MAC_EMUMOUSEBTN
+ extern int mac_hid_mouse_emulate_buttons(int, int, int);
+@@ -972,11 +972,18 @@ static int emulate_raw(struct vc_data *v
+ 	if (keycode > 255 || !x86_keycodes[keycode])
+ 		return -1; 
+ 
+-	if (keycode == KEY_PAUSE) {
+-		put_queue(vc, 0xe1);
+-		put_queue(vc, 0x1d | up_flag);
+-		put_queue(vc, 0x45 | up_flag);
+-		return 0;
++	switch (keycode) {
++		case KEY_PAUSE:
++			put_queue(vc, 0xe1);
++			put_queue(vc, 0x1d | up_flag);
++			put_queue(vc, 0x45 | up_flag);
++			return 0;
++		case KEY_LANG1:
++			if (!up_flag) put_queue(vc, 0xf1);
++			return 0;
++		case KEY_LANG2:
++			if (!up_flag) put_queue(vc, 0xf2);
++			return 0;
+ 	} 
+ 
+ 	if (keycode == KEY_SYSRQ && sysrq_alt) {
+@@ -1052,6 +1059,9 @@ void kbd_keycode(unsigned int keycode, i
+ 	}
+ 	if (sysrq_down && down && !rep) {
+ 		handle_sysrq(kbd_sysrq_xlate[keycode], regs, tty);
++#ifdef CONFIG_KGDB_SYSRQ
++                sysrq_down = 0;        /* in case we miss the "up" event */
++#endif
+ 		return;
+ 	}
+ #endif
+--- linux-2.6.0/drivers/char/mem.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/char/mem.c	2003-12-28 23:22:59.000000000 -0800
+@@ -24,6 +24,7 @@
+ #include <linux/smp_lock.h>
+ #include <linux/devfs_fs_kernel.h>
+ #include <linux/ptrace.h>
++#include <linux/device.h>
+ 
+ #include <asm/uaccess.h>
+ #include <asm/io.h>
+@@ -40,6 +41,7 @@ extern void fbmem_init(void);
+ extern void tapechar_init(void);
+ #endif
+ 
++#ifdef pgprot_noncached
+ /*
+  * Architectures vary in how they handle caching for addresses
+  * outside of main memory.
+@@ -65,19 +67,21 @@ static inline int uncached_access(struct
+ 	  && addr >= __pa(high_memory);
+ #elif defined(CONFIG_IA64)
+ 	/*
+-	 * On ia64, we ignore O_SYNC because we cannot tolerate memory attribute aliases.
++	 * On ia64, we ignore O_SYNC because we cannot tolerate memory
++	 * attribute aliases.
+ 	 */
+ 	return !(efi_mem_attributes(addr) & EFI_MEMORY_WB);
+ #else
+ 	/*
+-	 * Accessing memory above the top the kernel knows about or through a file pointer
+-	 * that was marked O_SYNC will be done non-cached.
++	 * Accessing memory above the top the kernel knows about or through a
++	 * file pointer that was marked O_SYNC will be done non-cached.
+ 	 */
+ 	if (file->f_flags & O_SYNC)
+ 		return 1;
+ 	return addr >= __pa(high_memory);
+ #endif
+ }
++#endif		/* pgprot_noncached */
+ 
+ #ifndef ARCH_HAS_VALID_PHYS_ADDR_RANGE
+ static inline int valid_phys_addr_range(unsigned long addr, size_t *count)
+@@ -167,28 +171,24 @@ static ssize_t write_mem(struct file * f
+ 	return do_write_mem(file, __va(p), p, buf, count, ppos);
+ }
+ 
+-static int mmap_mem(struct file * file, struct vm_area_struct * vma)
++static int mmap_mem(struct file *file, struct vm_area_struct *vma)
+ {
+ 	unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
+-	int uncached;
+ 
+-	uncached = uncached_access(file, offset);
+ #ifdef pgprot_noncached
+-	if (uncached)
++	if (uncached_access(file, offset))
+ 		vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+ #endif
+ 
+-	/* Don't try to swap out physical pages.. */
+-	vma->vm_flags |= VM_RESERVED;
+-
+ 	/*
+-	 * Don't dump addresses that are not real memory to a core file.
++	 * Don't try to swap out physical pages..
++	 * And treat /dev/mem mappings as "IO" regions: they may not
++	 * describe valid pageframes.
+ 	 */
+-	if (uncached)
+-		vma->vm_flags |= VM_IO;
++	vma->vm_flags |= VM_RESERVED|VM_IO;
+ 
+-	if (remap_page_range(vma, vma->vm_start, offset, vma->vm_end-vma->vm_start,
+-			     vma->vm_page_prot))
++	if (remap_page_range(vma, vma->vm_start, offset,
++			vma->vm_end-vma->vm_start, vma->vm_page_prot))
+ 		return -EAGAIN;
+ 	return 0;
+ }
+@@ -676,6 +676,10 @@ static const struct {
+ 	{11,"kmsg",    S_IRUGO | S_IWUSR,           &kmsg_fops},
+ };
+ 
++static struct class mem_class = {
++	.name	= "mem",
++};
++
+ static int __init chr_dev_init(void)
+ {
+ 	int i;
+@@ -683,7 +687,11 @@ static int __init chr_dev_init(void)
+ 	if (register_chrdev(MEM_MAJOR,"mem",&memory_fops))
+ 		printk("unable to get major %d for memory devs\n", MEM_MAJOR);
+ 
++	class_register(&mem_class);
+ 	for (i = 0; i < ARRAY_SIZE(devlist); i++) {
++		simple_add_class_device(&mem_class,
++					MKDEV(MEM_MAJOR, devlist[i].minor),
++					NULL, devlist[i].name);
+ 		devfs_mk_cdev(MKDEV(MEM_MAJOR, devlist[i].minor),
+ 				S_IFCHR | devlist[i].mode, devlist[i].name);
+ 	}
+--- linux-2.6.0/drivers/char/misc.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/drivers/char/misc.c	2003-12-28 23:23:00.000000000 -0800
+@@ -47,7 +47,7 @@
+ #include <linux/devfs_fs_kernel.h>
+ #include <linux/stat.h>
+ #include <linux/init.h>
+-
++#include <linux/device.h>
+ #include <linux/tty.h>
+ #include <linux/kmod.h>
+ 
+@@ -180,6 +180,15 @@ fail:
+ 	return err;
+ }
+ 
++/*
++ * TODO for 2.7:
++ *  - add a struct class_device to struct miscdevice and make all usages of
++ *    them dynamic.
++ */
++static struct class misc_class = {
++	.name	= "misc",
++};
++
+ static struct file_operations misc_fops = {
+ 	.owner		= THIS_MODULE,
+ 	.open		= misc_open,
+@@ -234,6 +243,8 @@ int misc_register(struct miscdevice * mi
+ 				"misc/%s", misc->name);
+ 	}
+ 
++	simple_add_class_device(&misc_class, MKDEV(MISC_MAJOR, misc->minor),
++				misc->dev, misc->name);
+ 	devfs_mk_cdev(MKDEV(MISC_MAJOR, misc->minor),
+ 			S_IFCHR|S_IRUSR|S_IWUSR|S_IRGRP, misc->devfs_name);
+ 
+@@ -265,6 +276,7 @@ int misc_deregister(struct miscdevice * 
+ 
+ 	down(&misc_sem);
+ 	list_del(&misc->list);
++	simple_remove_class_device(MKDEV(MISC_MAJOR, misc->minor));
+ 	devfs_remove(misc->devfs_name);
+ 	if (i < DYNAMIC_MINORS && i>0) {
+ 		misc_minors[i>>3] &= ~(1 << (misc->minor & 7));
+@@ -285,6 +297,7 @@ static int __init misc_init(void)
+ 	if (ent)
+ 		ent->proc_fops = &misc_proc_fops;
+ #endif
++	class_register(&misc_class);
+ #ifdef CONFIG_MVME16x
+ 	rtc_MK48T08_init();
+ #endif
+@@ -319,4 +332,4 @@ static int __init misc_init(void)
+ 	}
+ 	return 0;
+ }
+-module_init(misc_init);
++subsys_initcall(misc_init);
+--- linux-2.6.0/drivers/char/pcmcia/synclink_cs.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/char/pcmcia/synclink_cs.c	2003-12-28 23:22:54.000000000 -0800
+@@ -244,7 +244,6 @@ typedef struct _mgslpc_info {
+ 	char netname[10];
+ 	struct net_device *netdev;
+ 	struct net_device_stats netstats;
+-	struct net_device netdevice;
+ #endif
+ } MGSLPC_INFO;
+ 
+@@ -592,7 +591,7 @@ static dev_link_t *mgslpc_attach(void)
+     client_reg.Version = 0x0210;
+     client_reg.event_callback_args.client_data = link;
+ 
+-    ret = CardServices(RegisterClient, &link->handle, &client_reg);
++    ret = pcmcia_register_client(&link->handle, &client_reg);
+     if (ret != CS_SUCCESS) {
+ 	    cs_error(link->handle, RegisterClient, ret);
+ 	    mgslpc_detach(link);
+@@ -607,8 +606,8 @@ static dev_link_t *mgslpc_attach(void)
+ /* Card has been inserted.
+  */
+ 
+-#define CS_CHECK(fn, args...) \
+-while ((last_ret=CardServices(last_fn=(fn),args))!=0) goto cs_failed
++#define CS_CHECK(fn, ret) \
++do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+ 
+ static void mgslpc_config(dev_link_t *link)
+ {
+@@ -631,9 +630,9 @@ static void mgslpc_config(dev_link_t *li
+     tuple.TupleData = buf;
+     tuple.TupleDataMax = sizeof(buf);
+     tuple.TupleOffset = 0;
+-    CS_CHECK(GetFirstTuple, handle, &tuple);
+-    CS_CHECK(GetTupleData, handle, &tuple);
+-    CS_CHECK(ParseTuple, handle, &tuple, &parse);
++    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
++    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
++    CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+     link->conf.ConfigBase = parse.config.base;
+     link->conf.Present = parse.config.rmask[0];
+     
+@@ -641,17 +640,17 @@ static void mgslpc_config(dev_link_t *li
+     link->state |= DEV_CONFIG;
+ 
+     /* Look up the current Vcc */
+-    CS_CHECK(GetConfigurationInfo, handle, &conf);
++    CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(handle, &conf));
+     link->conf.Vcc = conf.Vcc;
+ 
+     /* get CIS configuration entry */
+ 
+     tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+-    CS_CHECK(GetFirstTuple, handle, &tuple);
++    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+ 
+     cfg = &(parse.cftable_entry);
+-    CS_CHECK(GetTupleData, handle, &tuple);
+-    CS_CHECK(ParseTuple, handle, &tuple, &parse);
++    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
++    CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+ 
+     if (cfg->flags & CISTPL_CFTABLE_DEFAULT) dflt = *cfg;
+     if (cfg->index == 0)
+@@ -672,7 +671,7 @@ static void mgslpc_config(dev_link_t *li
+ 	    link->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
+ 	    link->io.BasePort1 = io->win[0].base;
+ 	    link->io.NumPorts1 = io->win[0].len;
+-	    CS_CHECK(RequestIO, link->handle, &link->io);
++	    CS_CHECK(RequestIO, pcmcia_request_io(link->handle, &link->io));
+     }
+ 
+     link->conf.Attributes = CONF_ENABLE_IRQ;
+@@ -684,9 +683,9 @@ static void mgslpc_config(dev_link_t *li
+     link->irq.Attributes |= IRQ_HANDLE_PRESENT;
+     link->irq.Handler     = mgslpc_isr;
+     link->irq.Instance    = info;
+-    CS_CHECK(RequestIRQ, link->handle, &link->irq);
++    CS_CHECK(RequestIRQ, pcmcia_request_irq(link->handle, &link->irq));
+ 
+-    CS_CHECK(RequestConfiguration, link->handle, &link->conf);
++    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link->handle, &link->conf));
+ 
+     info->io_base = link->io.BasePort1;
+     info->irq_level = link->irq.AssignedIRQ;
+@@ -728,11 +727,11 @@ static void mgslpc_release(u_long arg)
+     link->dev = NULL;
+     link->state &= ~DEV_CONFIG;
+ 
+-    CardServices(ReleaseConfiguration, link->handle);
++    pcmcia_release_configuration(link->handle);
+     if (link->io.NumPorts1)
+-	    CardServices(ReleaseIO, link->handle, &link->io);
++	    pcmcia_release_io(link->handle, &link->io);
+     if (link->irq.AssignedIRQ)
+-	    CardServices(ReleaseIRQ, link->handle, &link->irq);
++	    pcmcia_release_irq(link->handle, &link->irq);
+     if (link->state & DEV_STALE_LINK)
+ 	    mgslpc_detach(link);
+ }
+@@ -763,7 +762,7 @@ static void mgslpc_detach(dev_link_t *li
+ 
+     /* Break the link with Card Services */
+     if (link->handle)
+-	    CardServices(DeregisterClient, link->handle);
++	    pcmcia_deregister_client(link->handle);
+     
+     /* Unlink device structure, and free it */
+     *linkp = link->next;
+@@ -798,14 +797,14 @@ static int mgslpc_event(event_t event, i
+ 	    /* Mark the device as stopped, to block IO until later */
+ 	    info->stop = 1;
+ 	    if (link->state & DEV_CONFIG)
+-		    CardServices(ReleaseConfiguration, link->handle);
++		    pcmcia_release_configuration(link->handle);
+ 	    break;
+     case CS_EVENT_PM_RESUME:
+ 	    link->state &= ~DEV_SUSPEND;
+ 	    /* Fall through... */
+     case CS_EVENT_CARD_RESET:
+ 	    if (link->state & DEV_CONFIG)
+-		    CardServices(RequestConfiguration, link->handle, &link->conf);
++		    pcmcia_request_configuration(link->handle, &link->conf);
+ 	    info->stop = 0;
+ 	    break;
+     }
+@@ -4206,35 +4205,46 @@ void tx_timeout(unsigned long context)
+ #ifdef CONFIG_SYNCLINK_SYNCPPP
+ /* syncppp net device routines
+  */
++ 
++static void mgslpc_setup(struct net_device *dev)
++{
++	dev->open = mgslpc_sppp_open;
++	dev->stop = mgslpc_sppp_close;
++	dev->hard_start_xmit = mgslpc_sppp_tx;
++	dev->do_ioctl = mgslpc_sppp_ioctl;
++	dev->get_stats = mgslpc_net_stats;
++	dev->tx_timeout = mgslpc_sppp_tx_timeout;
++	dev->watchdog_timeo = 10*HZ;
++}
+ 
+ void mgslpc_sppp_init(MGSLPC_INFO *info)
+ {
+ 	struct net_device *d;
+ 
+ 	sprintf(info->netname,"mgslp%d",info->line);
++ 
++	d = alloc_netdev(0, info->netname, mgslpc_setup);
++	if (!d) {
++		printk(KERN_WARNING "%s: alloc_netdev failed.\n",
++						info->netname);
++		return;
++	}
+ 
+ 	info->if_ptr = &info->pppdev;
+-	info->netdev = info->pppdev.dev = &info->netdevice;
++	info->netdev = info->pppdev.dev = d;
+ 
+ 	sppp_attach(&info->pppdev);
+ 
+-	d = info->netdev;
+-	strcpy(d->name,info->netname);
+ 	d->base_addr = info->io_base;
+ 	d->irq = info->irq_level;
+ 	d->priv = info;
+-	d->init = NULL;
+-	d->open = mgslpc_sppp_open;
+-	d->stop = mgslpc_sppp_close;
+-	d->hard_start_xmit = mgslpc_sppp_tx;
+-	d->do_ioctl = mgslpc_sppp_ioctl;
+-	d->get_stats = mgslpc_net_stats;
+-	d->tx_timeout = mgslpc_sppp_tx_timeout;
+-	d->watchdog_timeo = 10*HZ;
+ 
+ 	if (register_netdev(d)) {
+ 		printk(KERN_WARNING "%s: register_netdev failed.\n", d->name);
+ 		sppp_detach(info->netdev);
++		info->netdev = NULL;
++		info->pppdev.dev = NULL;
++		free_netdev(d);
+ 		return;
+ 	}
+ 
+@@ -4246,8 +4256,11 @@ void mgslpc_sppp_delete(MGSLPC_INFO *inf
+ {
+ 	if (debug_level >= DEBUG_LEVEL_INFO)
+ 		printk("mgslpc_sppp_delete(%s)\n",info->netname);	
+-	sppp_detach(info->netdev);
+ 	unregister_netdev(info->netdev);
++	sppp_detach(info->netdev);
++	free_netdev(info->netdev);
++	info->netdev = NULL;
++	info->pppdev.dev = NULL;
+ }
+ 
+ int mgslpc_sppp_open(struct net_device *d)
+--- linux-2.6.0/drivers/char/ppdev.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/char/ppdev.c	2003-12-28 23:22:57.000000000 -0800
+@@ -67,6 +67,7 @@
+ #include <asm/uaccess.h>
+ #include <linux/ppdev.h>
+ #include <linux/smp_lock.h>
++#include <linux/device.h>
+ 
+ #define PP_VERSION "ppdev: user-space parallel port driver"
+ #define CHRDEV "ppdev"
+@@ -782,4 +783,4 @@ module_init(ppdev_init);
+ module_exit(ppdev_cleanup);
+ 
+ MODULE_LICENSE("GPL");
+-
++MODULE_ALIAS_CHARDEV_MAJOR(PP_MAJOR);
+--- linux-2.6.0/drivers/char/raw.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/char/raw.c	2003-12-28 23:21:18.000000000 -0800
+@@ -74,6 +74,7 @@ static int raw_open(struct inode *inode,
+ 			goto out;
+ 		}
+ 		filp->f_flags |= O_DIRECT;
++		filp->f_mapping = bdev->bd_inode->i_mapping;
+ 		if (++raw_devices[minor].inuse == 1)
+ 			filp->f_dentry->d_inode->i_mapping =
+ 				bdev->bd_inode->i_mapping;
+--- linux-2.6.0/drivers/char/sn_serial.c	2003-10-25 14:45:44.000000000 -0700
++++ 25/drivers/char/sn_serial.c	2003-12-28 23:21:38.000000000 -0800
+@@ -21,8 +21,9 @@
+ #include <linux/sysrq.h>
+ #include <linux/circ_buf.h>
+ #include <linux/serial_reg.h>
++#include <asm/uaccess.h>
+ #include <asm/sn/sn_sal.h>
+-#include <asm/sn/pci/pciio.h>		/* this is needed for get_console_nasid */
++#include <asm/sn/pci/pciio.h>
+ #include <asm/sn/simulator.h>
+ #include <asm/sn/sn2/sn_private.h>
+ 
+@@ -771,7 +772,7 @@ sn_sal_read_proc(char *page, char **star
+ 	off_t	begin = 0;
+ 
+ 	len += sprintf(page, "sn_serial: nasid:%d irq:%d tx:%d rx:%d\n",
+-		       get_console_nasid(), sn_sal_irq,
++		       ia64_sn_get_console_nasid(), sn_sal_irq,
+ 		       sn_total_tx_count, sn_total_rx_count);
+ 	*eof = 1;
+ 
+@@ -813,6 +814,9 @@ sn_sal_switch_to_asynch(void)
+ {
+ 	unsigned long flags;
+ 
++	if (sn_sal_is_asynch)
++		return;
++
+ 	sn_debug_printf("sn_serial: about to switch to asynchronous console\n");
+ 
+ 	/* without early_printk, we may be invoked late enough to race
+--- linux-2.6.0/drivers/char/sx.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/drivers/char/sx.c	2003-12-28 23:22:46.000000000 -0800
+@@ -509,13 +509,13 @@ static int sx_busy_wait_eq (struct sx_bo
+ 
+ 	func_enter ();
+ 
+-	for (i=0; i < TIMEOUT_1 > 0;i++) 
++	for (i=0; i < TIMEOUT_1 ;i++)
+ 		if ((read_sx_byte (board, offset) & mask) == correctval) {
+ 			func_exit ();
+ 			return 1;
+ 		}
+ 
+-	for (i=0; i < TIMEOUT_2 > 0;i++) {
++	for (i=0; i < TIMEOUT_2 ;i++) {
+ 		if ((read_sx_byte (board, offset) & mask) == correctval) {
+ 			func_exit ();
+ 			return 1;
+@@ -535,13 +535,13 @@ static int sx_busy_wait_neq (struct sx_b
+ 
+ 	func_enter ();
+ 
+-	for (i=0; i < TIMEOUT_1 > 0;i++) 
++	for (i=0; i < TIMEOUT_1 ;i++)
+ 		if ((read_sx_byte (board, offset) & mask) != badval) {
+ 			func_exit ();
+ 			return 1;
+ 		}
+ 
+-	for (i=0; i < TIMEOUT_2 > 0;i++) {
++	for (i=0; i < TIMEOUT_2 ;i++) {
+ 		if ((read_sx_byte (board, offset) & mask) != badval) {
+ 			func_exit ();
+ 			return 1;
+--- linux-2.6.0/drivers/char/synclink.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/char/synclink.c	2003-12-28 23:21:00.000000000 -0800
+@@ -327,7 +327,6 @@ struct mgsl_struct {
+ 	char netname[10];
+ 	struct net_device *netdev;
+ 	struct net_device_stats netstats;
+-	struct net_device netdevice;
+ #endif
+ };
+ 
+@@ -737,8 +736,8 @@ int mgsl_ioctl_common(struct mgsl_struct
+ 
+ #ifdef CONFIG_SYNCLINK_SYNCPPP
+ /* SPPP/HDLC stuff */
+-void mgsl_sppp_init(struct mgsl_struct *info);
+-void mgsl_sppp_delete(struct mgsl_struct *info);
++static void mgsl_sppp_init(struct mgsl_struct *info);
++static void mgsl_sppp_delete(struct mgsl_struct *info);
+ int mgsl_sppp_open(struct net_device *d);
+ int mgsl_sppp_close(struct net_device *d);
+ void mgsl_sppp_tx_timeout(struct net_device *d);
+@@ -7820,36 +7819,45 @@ int usc_loopmode_send_active( struct mgs
+ #ifdef CONFIG_SYNCLINK_SYNCPPP
+ /* syncppp net device routines
+  */
++static void mgsl_setup(struct net_device *dev)
++{
++	dev->open = mgsl_sppp_open;
++	dev->stop = mgsl_sppp_close;
++	dev->hard_start_xmit = mgsl_sppp_tx;
++	dev->do_ioctl = mgsl_sppp_ioctl;
++	dev->get_stats = mgsl_net_stats;
++	dev->tx_timeout = mgsl_sppp_tx_timeout;
++	dev->watchdog_timeo = 10*HZ;
++}
+ 
+-void mgsl_sppp_init(struct mgsl_struct *info)
++static void mgsl_sppp_init(struct mgsl_struct *info)
+ {
+ 	struct net_device *d;
+ 
+ 	sprintf(info->netname,"mgsl%d",info->line);
+ 
++	d = alloc_netdev(0, info->netname, mgsl_setup);
++	if (!d) {
++		printk(KERN_WARNING "%s: alloc_netdev failed.\n",
++						info->netname);
++		return;
++	}
++
+ 	info->if_ptr = &info->pppdev;
+-	info->netdev = info->pppdev.dev = &info->netdevice;
++	info->netdev = info->pppdev.dev = d;
+ 
+ 	sppp_attach(&info->pppdev);
+ 
+-	d = info->netdev;
+-	strcpy(d->name,info->netname);
+ 	d->base_addr = info->io_base;
+ 	d->irq = info->irq_level;
+ 	d->dma = info->dma_level;
+ 	d->priv = info;
+-	d->init = NULL;
+-	d->open = mgsl_sppp_open;
+-	d->stop = mgsl_sppp_close;
+-	d->hard_start_xmit = mgsl_sppp_tx;
+-	d->do_ioctl = mgsl_sppp_ioctl;
+-	d->get_stats = mgsl_net_stats;
+-	d->tx_timeout = mgsl_sppp_tx_timeout;
+-	d->watchdog_timeo = 10*HZ;
+ 
+ 	if (register_netdev(d)) {
+ 		printk(KERN_WARNING "%s: register_netdev failed.\n", d->name);
+ 		sppp_detach(info->netdev);
++		info->netdev = NULL;
++		free_netdev(d);
+ 		return;
+ 	}
+ 
+@@ -7861,8 +7869,11 @@ void mgsl_sppp_delete(struct mgsl_struct
+ {
+ 	if (debug_level >= DEBUG_LEVEL_INFO)
+ 		printk("mgsl_sppp_delete(%s)\n",info->netname);	
+-	sppp_detach(info->netdev);
+ 	unregister_netdev(info->netdev);
++	sppp_detach(info->netdev);
++	free_netdev(info->netdev);
++	info->netdev = NULL;
++	info->pppdev.dev = NULL;
+ }
+ 
+ int mgsl_sppp_open(struct net_device *d)
+--- linux-2.6.0/drivers/char/synclinkmp.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/char/synclinkmp.c	2003-12-28 23:21:00.000000000 -0800
+@@ -289,7 +289,6 @@ typedef struct _synclinkmp_info {
+ 	char netname[10];
+ 	struct net_device *netdev;
+ 	struct net_device_stats netstats;
+-	struct net_device netdevice;
+ #endif
+ } SLMP_INFO;
+ 
+@@ -1627,35 +1626,44 @@ static void set_break(struct tty_struct 
+ 
+ /* syncppp support and callbacks */
+ 
++static void cb_setup(struct net_device *dev)
++{
++	dev->open = sppp_cb_open;
++	dev->stop = sppp_cb_close;
++	dev->hard_start_xmit = sppp_cb_tx;
++	dev->do_ioctl = sppp_cb_ioctl;
++	dev->get_stats = sppp_cb_net_stats;
++	dev->tx_timeout = sppp_cb_tx_timeout;
++	dev->watchdog_timeo = 10*HZ;
++}
++
+ static void sppp_init(SLMP_INFO *info)
+ {
+ 	struct net_device *d;
+ 
+ 	sprintf(info->netname,"mgslm%dp%d",info->adapter_num,info->port_num);
+ 
++	d = alloc_netdev(0, info->netname, cb_setup);
++	if (!d) {
++		printk(KERN_WARNING "%s: alloc_netdev failed.\n",
++						info->netname);
++		return;
++	}
++
+ 	info->if_ptr = &info->pppdev;
+-	info->netdev = info->pppdev.dev = &info->netdevice;
++	info->netdev = info->pppdev.dev = d;
+ 
+ 	sppp_attach(&info->pppdev);
+ 
+-	d = info->netdev;
+-	strcpy(d->name,info->netname);
+-	d->base_addr = 0;
+ 	d->irq = info->irq_level;
+-	d->dma = 0;
+ 	d->priv = info;
+-	d->init = NULL;
+-	d->open = sppp_cb_open;
+-	d->stop = sppp_cb_close;
+-	d->hard_start_xmit = sppp_cb_tx;
+-	d->do_ioctl = sppp_cb_ioctl;
+-	d->get_stats = sppp_cb_net_stats;
+-	d->tx_timeout = sppp_cb_tx_timeout;
+-	d->watchdog_timeo = 10*HZ;
+ 
+ 	if (register_netdev(d)) {
+ 		printk(KERN_WARNING "%s: register_netdev failed.\n", d->name);
+ 		sppp_detach(info->netdev);
++		info->netdev = NULL;
++		info->pppdev.dev = NULL;
++		free_netdev(d);
+ 		return;
+ 	}
+ 
+@@ -1667,8 +1675,11 @@ static void sppp_delete(SLMP_INFO *info)
+ {
+ 	if (debug_level >= DEBUG_LEVEL_INFO)
+ 		printk("sppp_delete(%s)\n",info->netname);
+-	sppp_detach(info->netdev);
+ 	unregister_netdev(info->netdev);
++	sppp_detach(info->netdev);
++	free_netdev(info->netdev);
++	info->netdev = NULL;
++	info->pppdev.dev = NULL;
+ }
+ 
+ static int sppp_cb_open(struct net_device *d)
+--- linux-2.6.0/drivers/char/sysrq.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/char/sysrq.c	2003-12-28 23:21:07.000000000 -0800
+@@ -35,6 +35,25 @@
+ #include <linux/spinlock.h>
+ 
+ #include <asm/ptrace.h>
++#ifdef CONFIG_KGDB_SYSRQ
++
++#define  GDB_OP &kgdb_op
++static void kgdb_sysrq(int key, struct pt_regs *pt_regs, struct tty_struct *tty)
++{
++	printk("kgdb sysrq\n");
++	breakpoint();
++}
++
++static struct sysrq_key_op kgdb_op = {
++	.handler	= kgdb_sysrq,
++	.help_msg	= "kGdb|Fgdb",
++	.action_msg	= "Debug breakpoint\n",
++};
++
++#else
++#define  GDB_OP NULL
++#endif
++
+ 
+ extern void reset_vc(unsigned int);
+ 
+@@ -238,8 +257,8 @@ static struct sysrq_key_op *sysrq_key_ta
+ /* c */ NULL,
+ /* d */	NULL,
+ /* e */	&sysrq_term_op,
+-/* f */	NULL,
+-/* g */	NULL,
++/* f */	GDB_OP,
++/* g */	GDB_OP,
+ /* h */	NULL,
+ /* i */	&sysrq_kill_op,
+ /* j */	NULL,
+--- linux-2.6.0/drivers/char/tty_io.c	2003-10-25 14:45:44.000000000 -0700
++++ 25/drivers/char/tty_io.c	2003-12-28 23:22:59.000000000 -0800
+@@ -2069,80 +2069,10 @@ static void tty_default_put_char(struct 
+ 	tty->driver->write(tty, 0, &ch, 1);
+ }
+ 
+-struct tty_dev {
+-	struct list_head node;
+-	dev_t dev;
+-	struct class_device class_dev;
+-};
+-#define to_tty_dev(d) container_of(d, struct tty_dev, class_dev)
+-
+-static void release_tty_dev(struct class_device *class_dev)
+-{
+-	struct tty_dev *tty_dev = to_tty_dev(class_dev);
+-	kfree(tty_dev);
+-}
+-
+ static struct class tty_class = {
+-	.name		= "tty",
+-	.release	= &release_tty_dev,
++	.name	= "tty",
+ };
+ 
+-static LIST_HEAD(tty_dev_list);
+-static spinlock_t tty_dev_list_lock = SPIN_LOCK_UNLOCKED;
+-
+-static ssize_t show_dev(struct class_device *class_dev, char *buf)
+-{
+-	struct tty_dev *tty_dev = to_tty_dev(class_dev);
+-	return print_dev_t(buf, tty_dev->dev);
+-}
+-static CLASS_DEVICE_ATTR(dev, S_IRUGO, show_dev, NULL);
+-
+-static void tty_add_class_device(char *name, dev_t dev, struct device *device)
+-{
+-	struct tty_dev *tty_dev = NULL;
+-	int retval;
+-
+-	tty_dev = kmalloc(sizeof(*tty_dev), GFP_KERNEL);
+-	if (!tty_dev)
+-		return;
+-	memset(tty_dev, 0x00, sizeof(*tty_dev));
+-
+-	tty_dev->class_dev.dev = device;
+-	tty_dev->class_dev.class = &tty_class;
+-	snprintf(tty_dev->class_dev.class_id, BUS_ID_SIZE, "%s", name);
+-	retval = class_device_register(&tty_dev->class_dev);
+-	if (retval)
+-		goto error;
+-	class_device_create_file (&tty_dev->class_dev, &class_device_attr_dev);
+-	tty_dev->dev = dev;
+-	spin_lock(&tty_dev_list_lock);
+-	list_add(&tty_dev->node, &tty_dev_list);
+-	spin_unlock(&tty_dev_list_lock);
+-	return;
+-error:
+-	kfree(tty_dev);
+-}
+-
+-static void tty_remove_class_device(dev_t dev)
+-{
+-	struct tty_dev *tty_dev = NULL;
+-	struct list_head *tmp;
+-	int found = 0;
+-
+-	spin_lock(&tty_dev_list_lock);
+-	list_for_each (tmp, &tty_dev_list) {
+-		tty_dev = list_entry(tmp, struct tty_dev, node);
+-		if (tty_dev->dev == dev) {
+-			list_del(&tty_dev->node);
+-			found = 1;
+-			break;
+-		}
+-	}
+-	spin_unlock(&tty_dev_list_lock);
+-	if (found)
+-		class_device_unregister(&tty_dev->class_dev);
+-}
+-
+ /**
+  * tty_register_device - register a tty device
+  * @driver: the tty driver that describes the tty device
+@@ -2174,7 +2104,7 @@ void tty_register_device(struct tty_driv
+ 	if (driver->type != TTY_DRIVER_TYPE_PTY) {
+ 		char name[64];
+ 		tty_line_name(driver, index, name);
+-		tty_add_class_device(name, dev, device);
++		simple_add_class_device(&tty_class, dev, device, name);
+ 	}
+ }
+ 
+@@ -2189,7 +2119,7 @@ void tty_register_device(struct tty_driv
+ void tty_unregister_device(struct tty_driver *driver, unsigned index)
+ {
+ 	devfs_remove("%s%d", driver->devfs_name, index + driver->name_base);
+-	tty_remove_class_device(MKDEV(driver->major, driver->minor_start) + index);
++	simple_remove_class_device(MKDEV(driver->major, driver->minor_start) + index);
+ }
+ 
+ EXPORT_SYMBOL(tty_register_device);
+@@ -2431,7 +2361,7 @@ static int __init tty_init(void)
+ 	    register_chrdev_region(MKDEV(TTYAUX_MAJOR, 0), 1, "/dev/tty") < 0)
+ 		panic("Couldn't register /dev/tty driver\n");
+ 	devfs_mk_cdev(MKDEV(TTYAUX_MAJOR, 0), S_IFCHR|S_IRUGO|S_IWUGO, "tty");
+-	tty_add_class_device ("tty", MKDEV(TTYAUX_MAJOR, 0), NULL);
++	simple_add_class_device(&tty_class, MKDEV(TTYAUX_MAJOR, 0), NULL, "tty");
+ 
+ 	strcpy(console_cdev.kobj.name, "dev.console");
+ 	cdev_init(&console_cdev, &console_fops);
+@@ -2439,7 +2369,7 @@ static int __init tty_init(void)
+ 	    register_chrdev_region(MKDEV(TTYAUX_MAJOR, 1), 1, "/dev/console") < 0)
+ 		panic("Couldn't register /dev/console driver\n");
+ 	devfs_mk_cdev(MKDEV(TTYAUX_MAJOR, 1), S_IFCHR|S_IRUSR|S_IWUSR, "console");
+-	tty_add_class_device ("console", MKDEV(TTYAUX_MAJOR, 1), NULL);
++	simple_add_class_device(&tty_class, MKDEV(TTYAUX_MAJOR, 1), NULL, "console");
+ 
+ 	tty_kobj.kset = tty_cdev.kobj.kset;
+ 	kobject_register(&tty_kobj);
+@@ -2451,7 +2381,7 @@ static int __init tty_init(void)
+ 	    register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
+ 		panic("Couldn't register /dev/ptmx driver\n");
+ 	devfs_mk_cdev(MKDEV(TTYAUX_MAJOR, 2), S_IFCHR|S_IRUGO|S_IWUGO, "ptmx");
+-	tty_add_class_device ("ptmx", MKDEV(TTYAUX_MAJOR, 2), NULL);
++	simple_add_class_device(&tty_class, MKDEV(TTYAUX_MAJOR, 2), NULL, "ptmx");
+ #endif
+ 	
+ #ifdef CONFIG_VT
+@@ -2461,7 +2391,7 @@ static int __init tty_init(void)
+ 	    register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0)
+ 		panic("Couldn't register /dev/tty0 driver\n");
+ 	devfs_mk_cdev(MKDEV(TTY_MAJOR, 0), S_IFCHR|S_IRUSR|S_IWUSR, "vc/0");
+-	tty_add_class_device ("tty0", MKDEV(TTY_MAJOR, 0), NULL);
++	simple_add_class_device(&tty_class, MKDEV(TTY_MAJOR, 0), NULL, "tty0");
+ 
+ 	vty_init();
+ #endif
+--- linux-2.6.0/drivers/char/vt_ioctl.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/char/vt_ioctl.c	2003-12-28 23:22:23.000000000 -0800
+@@ -332,7 +332,7 @@ do_fontx_ioctl(int cmd, struct consolefo
+ }
+ 
+ static inline int 
+-do_unimap_ioctl(int cmd, struct unimapdesc *user_ud,int perm)
++do_unimap_ioctl(int cmd, struct unimapdesc *user_ud, int perm, unsigned int console)
+ {
+ 	struct unimapdesc tmp;
+ 	int i = 0; 
+@@ -348,9 +348,11 @@ do_unimap_ioctl(int cmd, struct unimapde
+ 	case PIO_UNIMAP:
+ 		if (!perm)
+ 			return -EPERM;
+-		return con_set_unimap(fg_console, tmp.entry_ct, tmp.entries);
++		return con_set_unimap(console, tmp.entry_ct, tmp.entries);
+ 	case GIO_UNIMAP:
+-		return con_get_unimap(fg_console, tmp.entry_ct, &(user_ud->entry_ct), tmp.entries);
++		if (!perm && fg_console != console)
++			return -EPERM;
++		return con_get_unimap(console, tmp.entry_ct, &(user_ud->entry_ct), tmp.entries);
+ 	}
+ 	return 0;
+ }
+@@ -966,13 +968,13 @@ int vt_ioctl(struct tty_struct *tty, str
+ 			return -EPERM;
+ 		i = copy_from_user(&ui, (void *)arg, sizeof(struct unimapinit));
+ 		if (i) return -EFAULT;
+-		con_clear_unimap(fg_console, &ui);
++		con_clear_unimap(console, &ui);
+ 		return 0;
+ 	      }
+ 
+ 	case PIO_UNIMAP:
+ 	case GIO_UNIMAP:
+-		return do_unimap_ioctl(cmd, (struct unimapdesc *)arg, perm);
++		return do_unimap_ioctl(cmd, (struct unimapdesc *)arg, perm, console);
+ 
+ 	case VT_LOCKSWITCH:
+ 		if (!capable(CAP_SYS_TTY_CONFIG))
+--- linux-2.6.0/drivers/char/watchdog/i810-tco.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/char/watchdog/i810-tco.c	2003-12-28 23:22:09.000000000 -0800
+@@ -232,9 +232,8 @@ static ssize_t i810tco_write (struct fil
+ 
+ 		/* someone wrote to us, we should reload the timer */
+ 		tco_timer_reload ();
+-		return 1;
+ 	}
+-	return 0;
++	return len;
+ }
+ 
+ static int i810tco_ioctl (struct inode *inode, struct file *file,
+--- linux-2.6.0/drivers/char/watchdog/ib700wdt.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/char/watchdog/ib700wdt.c	2003-12-28 23:22:09.000000000 -0800
+@@ -161,9 +161,8 @@ ibwdt_write(struct file *file, const cha
+ 			}
+ 		}
+ 		ibwdt_ping();
+-		return 1;
+ 	}
+-	return 0;
++	return count;
+ }
+ 
+ static int
+--- linux-2.6.0/drivers/char/watchdog/indydog.c	2003-08-08 22:55:11.000000000 -0700
++++ 25/drivers/char/watchdog/indydog.c	2003-12-28 23:22:09.000000000 -0800
+@@ -113,9 +113,8 @@ static ssize_t indydog_write(struct file
+ 			}
+ 		}
+ 		indydog_ping();
+-		return 1;
+ 	}
+-	return 0;
++	return len;
+ }
+ 
+ static int indydog_ioctl(struct inode *inode, struct file *file,
+--- linux-2.6.0/drivers/char/watchdog/Kconfig	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/char/watchdog/Kconfig	2003-12-28 23:23:06.000000000 -0800
+@@ -17,7 +17,7 @@ config WATCHDOG
+ 	  implementation entirely in software (which can sometimes fail to
+ 	  reboot the machine) and a driver for hardware watchdog boards, which
+ 	  are more robust and can also keep track of the temperature inside
+-	  your computer. For details, read <file:Documentation/watchdog.txt>
++	  your computer. For details, read <file:Documentation/watchdog/watchdog.txt>
+ 	  in the kernel source.
+ 
+ 	  The watchdog is usually used together with the watchdog daemon
+@@ -114,7 +114,7 @@ config PCWATCHDOG
+ 	  This card simply watches your kernel to make sure it doesn't freeze,
+ 	  and if it does, it reboots your computer after a certain amount of
+ 	  time. This driver is like the WDT501 driver but for different
+-	  hardware. Please read <file:Documentation/pcwd-watchdog.txt>. The PC
++	  hardware. Please read <file:Documentation/watchdog/pcwd-watchdog.txt>. The PC
+ 	  watchdog cards can be ordered from <http://www.berkprod.com/>.
+ 
+ 	  To compile this driver as a module, choose M here: the
+@@ -276,6 +276,21 @@ config W83877F_WDT
+ 
+ 	  Most people will say N.
+ 
++config W83627HF_WDT
++	tristate "W83627HF Watchdog Timer"
++	depends on WATCHDOG
++	---help---
++	  This is the driver for the hardware watchdog on the W83627HF chipset
++	  as used in Advantech PC-9578 and Tyan S2721-533 motherboards
++	  (and likely others).  This watchdog simply watches your kernel to
++	  make sure it doesn't freeze, and if it does, it reboots your computer
++	  after a certain amount of time.
++
++	  To compile this driver as a module, choose M here: the
++	  module will be called w83627hf_wdt.
++
++	  Most people will say N.
++
+ config MACHZ_WDT
+ 	tristate "ZF MachZ Watchdog"
+ 	depends on WATCHDOG
+--- linux-2.6.0/drivers/char/watchdog/machzwd.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/char/watchdog/machzwd.c	2003-12-28 23:22:09.000000000 -0800
+@@ -343,10 +343,9 @@ static ssize_t zf_write(struct file *fil
+ 		next_heartbeat = jiffies + ZF_USER_TIMEO;
+ 		dprintk("user ping at %ld\n", jiffies);
+ 		
+-		return 1;
+ 	}
+ 
+-	return 0;
++	return count;
+ }
+ 
+ static int zf_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
+--- linux-2.6.0/drivers/char/watchdog/Makefile	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/char/watchdog/Makefile	2003-12-28 23:22:31.000000000 -0800
+@@ -25,6 +25,7 @@ obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_
+ obj-$(CONFIG_EUROTECH_WDT) += eurotechwdt.o
+ obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
+ obj-$(CONFIG_W83877F_WDT) += w83877f_wdt.o
++obj-$(CONFIG_W83627HF_WDT) += w83627hf_wdt.o
+ obj-$(CONFIG_SC520_WDT) += sc520_wdt.o
+ obj-$(CONFIG_ALIM7101_WDT) += alim7101_wdt.o
+ obj-$(CONFIG_ALIM1535_WDT) += alim1535_wdt.o
+--- linux-2.6.0/drivers/char/watchdog/mixcomwd.c	2003-08-08 22:55:11.000000000 -0700
++++ 25/drivers/char/watchdog/mixcomwd.c	2003-12-28 23:22:09.000000000 -0800
+@@ -156,9 +156,8 @@ static ssize_t mixcomwd_write(struct fil
+ 			}
+ 		}
+ 		mixcomwd_ping();
+-		return 1;
+ 	}
+-	return 0;
++	return len;
+ }
+ 
+ static int mixcomwd_ioctl(struct inode *inode, struct file *file,
+--- linux-2.6.0/drivers/char/watchdog/pcwd.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/char/watchdog/pcwd.c	2003-12-28 23:22:09.000000000 -0800
+@@ -419,9 +419,8 @@ static ssize_t pcwd_write(struct file *f
+ 			}
+ 		}
+ 		pcwd_send_heartbeat();
+-		return 1;
+ 	}
+-	return 0;
++	return len;
+ }
+ 
+ static int pcwd_open(struct inode *ino, struct file *filep)
+--- linux-2.6.0/drivers/char/watchdog/sa1100_wdt.c	2003-08-08 22:55:11.000000000 -0700
++++ 25/drivers/char/watchdog/sa1100_wdt.c	2003-12-28 23:22:09.000000000 -0800
+@@ -106,7 +106,7 @@ static ssize_t sa1100dog_write(struct fi
+ 		OSMR3 = OSCR + pre_margin;
+ 	}
+ 
+-	return len ? 1 : 0;
++	return len;
+ }
+ 
+ static struct watchdog_info ident = {
+--- linux-2.6.0/drivers/char/watchdog/softdog.c	2003-08-08 22:55:11.000000000 -0700
++++ 25/drivers/char/watchdog/softdog.c	2003-12-28 23:22:09.000000000 -0800
+@@ -155,9 +155,8 @@ static ssize_t softdog_write(struct file
+ 			}
+ 		}
+ 		mod_timer(&watchdog_ticktock, jiffies+(soft_margin*HZ));
+-		return 1;
+ 	}
+-	return 0;
++	return len;
+ }
+ 
+ static int softdog_ioctl(struct inode *inode, struct file *file,
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/char/watchdog/w83627hf_wdt.c	2003-12-28 23:22:31.000000000 -0800
+@@ -0,0 +1,324 @@
++/*
++ *	w83627hf WDT driver
++ *
++ *	(c) Copyright 2003 Pádraig Brady <P@draigBrady.com>
++ *
++ *	Based on advantechwdt.c which is based on wdt.c.
++ *	Original copyright messages:
++ *
++ *	(c) Copyright 2000-2001 Marek Michalkiewicz <marekm@linux.org.pl>
++ *
++ *	(c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
++ *				http://www.redhat.com
++ *
++ *	This program is free software; you can redistribute it and/or
++ *	modify it under the terms of the GNU General Public License
++ *	as published by the Free Software Foundation; either version
++ *	2 of the License, or (at your option) any later version.
++ *
++ *	Neither Alan Cox nor CymruNet Ltd. admit liability nor provide
++ *	warranty for any of this software. This material is provided
++ *	"AS-IS" and at no charge.
++ *
++ *	(c) Copyright 1995    Alan Cox <alan@redhat.com>
++ */
++
++#include <linux/module.h>
++#include <linux/moduleparam.h>
++#include <linux/types.h>
++#include <linux/miscdevice.h>
++#include <linux/watchdog.h>
++#include <linux/fs.h>
++#include <linux/ioport.h>
++#include <linux/notifier.h>
++#include <linux/reboot.h>
++#include <linux/init.h>
++
++#include <asm/io.h>
++#include <asm/uaccess.h>
++#include <asm/system.h>
++
++#define WATCHDOG_NAME "w83627hf WDT"
++#define PFX WATCHDOG_NAME ": "
++#define WATCHDOG_TIMEOUT 60		/* 60 sec default timeout */
++
++static unsigned long wdt_is_open;
++static char expect_close;
++
++/* You must set this - there is no sane way to probe for this board. */
++static int wdt_io = 0x2E;
++module_param(wdt_io, int, 0);
++MODULE_PARM_DESC(wdt_io, "w83627hf WDT io port (default 0x2E)");
++
++static int timeout = WATCHDOG_TIMEOUT;	/* in seconds */
++module_param(timeout, int, 0);
++MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1<= timeout <=63, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ".");
++
++#ifdef CONFIG_WATCHDOG_NOWAYOUT
++static int nowayout = 1;
++#else
++static int nowayout = 0;
++#endif
++
++module_param(nowayout, int, 0);
++MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
++
++/*
++ *	Kernel methods.
++ */
++
++#define WDT_EFER (wdt_io+0)   /* Extended Function Enable Registers */
++#define WDT_EFIR (wdt_io+0)   /* Extended Function Index Register (same as EFER) */
++#define WDT_EFDR (WDT_EFIR+1) /* Extended Function Data Register */
++
++static void
++wdt_ctrl(int timeout)
++{
++	outb_p(0x87, WDT_EFER); /* Enter extended function mode */
++	outb_p(0x87, WDT_EFER); /* Again according to manual */
++
++	outb_p(0x07, WDT_EFER); /* point to logical device number reg */
++	outb_p(0x08, WDT_EFDR); /* select logical device 8 (GPIO2) */
++	outb_p(0x30, WDT_EFER); /* select CR30 */
++	outb_p(0x01, WDT_EFDR); /* set bit 0 to activate GPIO2 */
++
++	outb_p(0xF6, WDT_EFER);    /* Select CRF6 */
++	outb_p(timeout, WDT_EFDR); /* Write Timeout counter to CRF6 */
++
++	outb_p(0xAA, WDT_EFER); /* Leave extended function mode */
++}
++
++static void
++wdt_ping(void)
++{
++	wdt_ctrl(timeout);
++}
++
++static void
++wdt_disable(void)
++{
++	wdt_ctrl(0);
++}
++
++static ssize_t
++wdt_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
++{
++	/*  Can't seek (pwrite) on this device  */
++	if (ppos != &file->f_pos)
++		return -ESPIPE;
++
++	if (count) {
++		if (!nowayout) {
++			size_t i;
++
++			expect_close = 0;
++
++			for (i = 0; i != count; i++) {
++				char c;
++				if (get_user(c, buf+i))
++					return -EFAULT;
++				if (c == 'V')
++					expect_close = 42;
++			}
++		}
++		wdt_ping();
++	}
++	return count;
++}
++
++static int
++wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
++	  unsigned long arg)
++{
++	int new_timeout;
++	static struct watchdog_info ident = {
++		.options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE,
++		.firmware_version = 1,
++		.identity = "Advantech WDT",
++	};
++
++	switch (cmd) {
++	case WDIOC_GETSUPPORT:
++	  if (copy_to_user((struct watchdog_info *)arg, &ident, sizeof(ident)))
++	    return -EFAULT;
++	  break;
++
++	case WDIOC_GETSTATUS:
++	case WDIOC_GETBOOTSTATUS:
++	  return put_user(0, (int *)arg);
++
++	case WDIOC_KEEPALIVE:
++	  wdt_ping();
++	  break;
++
++	case WDIOC_SETTIMEOUT:
++	  if (get_user(new_timeout, (int *)arg))
++		  return -EFAULT;
++	  if ((new_timeout < 1) || (new_timeout > 63))
++		  return -EINVAL;
++	  timeout = new_timeout;
++	  wdt_ping();
++	  /* Fall */
++
++	case WDIOC_GETTIMEOUT:
++	  return put_user(timeout, (int *)arg);
++
++	case WDIOC_SETOPTIONS:
++	{
++	  int options, retval = -EINVAL;
++
++	  if (get_user(options, (int *)arg))
++	    return -EFAULT;
++
++	  if (options & WDIOS_DISABLECARD) {
++	    wdt_disable();
++	    retval = 0;
++	  }
++
++	  if (options & WDIOS_ENABLECARD) {
++	    wdt_ping();
++	    retval = 0;
++	  }
++
++	  return retval;
++	}
++
++	default:
++	  return -ENOTTY;
++	}
++	return 0;
++}
++
++static int
++wdt_open(struct inode *inode, struct file *file)
++{
++	if (test_and_set_bit(0, &wdt_is_open))
++		return -EBUSY;
++	/*
++	 *	Activate
++	 */
++
++	wdt_ping();
++	return 0;
++}
++
++static int
++wdt_close(struct inode *inode, struct file *file)
++{
++	if (expect_close == 42) {
++		wdt_disable();
++	} else {
++		printk(KERN_CRIT PFX "Unexpected close, not stopping watchdog!\n");
++		wdt_ping();
++	}
++	clear_bit(0, &wdt_is_open);
++	expect_close = 0;
++	return 0;
++}
++
++/*
++ *	Notifier for system down
++ */
++
++static int
++wdt_notify_sys(struct notifier_block *this, unsigned long code,
++	void *unused)
++{
++	if (code == SYS_DOWN || code == SYS_HALT) {
++		/* Turn the WDT off */
++		wdt_disable();
++	}
++	return NOTIFY_DONE;
++}
++
++/*
++ *	Kernel Interfaces
++ */
++
++static struct file_operations wdt_fops = {
++	.owner		= THIS_MODULE,
++	.llseek		= no_llseek,
++	.write		= wdt_write,
++	.ioctl		= wdt_ioctl,
++	.open		= wdt_open,
++	.release	= wdt_close,
++};
++
++static struct miscdevice wdt_miscdev = {
++	.minor = WATCHDOG_MINOR,
++	.name = "watchdog",
++	.fops = &wdt_fops,
++};
++
++/*
++ *	The WDT needs to learn about soft shutdowns in order to
++ *	turn the timebomb registers off.
++ */
++
++static struct notifier_block wdt_notifier = {
++	.notifier_call = wdt_notify_sys,
++	.next = NULL,
++	.priority = 0,
++};
++
++static int __init
++wdt_init(void)
++{
++	int ret;
++
++	printk(KERN_INFO "WDT driver for Advantech single board computer initialising.\n");
++
++	if (timeout < 1 || timeout > 63) {
++		timeout = WATCHDOG_TIMEOUT;
++		printk (KERN_INFO PFX "timeout value must be 1<=x<=63, using %d\n",
++			timeout);
++	}
++
++	if (!request_region(wdt_io, 1, WATCHDOG_NAME)) {
++		printk (KERN_ERR PFX "I/O address 0x%04x already in use\n",
++			wdt_io);
++		ret = -EIO;
++		goto out;
++	}
++
++	ret = register_reboot_notifier(&wdt_notifier);
++	if (ret != 0) {
++		printk (KERN_ERR PFX "cannot register reboot notifier (err=%d)\n",
++			ret);
++		goto unreg_regions;
++	}
++
++	ret = misc_register(&wdt_miscdev);
++	if (ret != 0) {
++		printk (KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",
++			WATCHDOG_MINOR, ret);
++		goto unreg_reboot;
++	}
++
++	printk (KERN_INFO PFX "initialized. timeout=%d sec (nowayout=%d)\n",
++		timeout, nowayout);
++
++out:
++	return ret;
++unreg_reboot:
++	unregister_reboot_notifier(&wdt_notifier);
++unreg_regions:
++	release_region(wdt_io, 1);
++	goto out;
++}
++
++static void __exit
++wdt_exit(void)
++{
++	misc_deregister(&wdt_miscdev);
++	unregister_reboot_notifier(&wdt_notifier);
++	release_region(wdt_io,1);
++}
++
++module_init(wdt_init);
++module_exit(wdt_exit);
++
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Pádraig Brady <P@draigBrady.com>");
++MODULE_DESCRIPTION("w38627hf WDT driver");
++
+--- linux-2.6.0/drivers/char/watchdog/wdt.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/char/watchdog/wdt.c	2003-12-28 23:22:09.000000000 -0800
+@@ -265,9 +265,8 @@ static ssize_t wdt_write(struct file *fi
+ 			}
+ 		}
+ 		wdt_ping();
+-		return 1;
+ 	}
+-	return 0;
++	return count;
+ }
+ 
+ /**
+--- linux-2.6.0/drivers/i2c/i2c-core.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/i2c/i2c-core.c	2003-12-28 23:22:30.000000000 -0800
+@@ -136,10 +136,10 @@ int i2c_add_adapter(struct i2c_adapter *
+ 
+ 	/* Add the adapter to the driver core.
+ 	 * If the parent pointer is not set up,
+-	 * we add this adapter to the legacy bus.
++	 * we add this adapter to the host bus.
+ 	 */
+ 	if (adap->dev.parent == NULL)
+-		adap->dev.parent = &legacy_bus;
++		adap->dev.parent = &platform_bus;
+ 	sprintf(adap->dev.bus_id, "i2c-%d", adap->nr);
+ 	adap->dev.driver = &i2c_adapter_driver;
+ 	adap->dev.release = &i2c_adapter_dev_release;
+--- linux-2.6.0/drivers/i2c/i2c-dev.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/i2c/i2c-dev.c	2003-12-28 23:22:30.000000000 -0800
+@@ -223,7 +223,7 @@ int i2cdev_ioctl (struct inode *inode, s
+ 
+ 		/* Put an arbritrary limit on the number of messages that can
+ 		 * be sent at once */
+-		if (rdwr_arg.nmsgs > 42)
++		if (rdwr_arg.nmsgs > I2C_RDRW_IOCTL_MAX_MSGS)
+ 			return -EINVAL;
+ 		
+ 		rdwr_pa = (struct i2c_msg *)
+@@ -447,7 +447,7 @@ static int i2cdev_attach_adapter(struct 
+ 
+ 	/* register this i2c device with the driver core */
+ 	i2c_dev->adap = adap;
+-	if (adap->dev.parent == &legacy_bus)
++	if (adap->dev.parent == &platform_bus)
+ 		i2c_dev->class_dev.dev = &adap->dev;
+ 	else
+ 		i2c_dev->class_dev.dev = adap->dev.parent;
+--- linux-2.6.0/drivers/ide/arm/icside.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/ide/arm/icside.c	2003-12-28 23:21:46.000000000 -0800
+@@ -214,7 +214,7 @@ static void icside_maskproc(ide_drive_t 
+ #define NR_ENTRIES 256
+ #define TABLE_SIZE (NR_ENTRIES * 8)
+ 
+-static void ide_build_sglist(ide_drive_t *drive, struct request *rq)
++static void icside_build_sglist(ide_drive_t *drive, struct request *rq)
+ {
+ 	ide_hwif_t *hwif = drive->hwif;
+ 	struct icside_state *state = hwif->hwif_data;
+@@ -543,7 +543,7 @@ icside_dma_common(ide_drive_t *drive, st
+ 	BUG_ON(hwif->sg_dma_active);
+ 	BUG_ON(dma_channel_active(hwif->hw.dma));
+ 
+-	ide_build_sglist(drive, rq);
++	icside_build_sglist(drive, rq);
+ 
+ 	/*
+ 	 * Ensure that we have the right interrupt routed.
+--- linux-2.6.0/drivers/ide/ide.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/ide/ide.c	2003-12-28 23:22:32.000000000 -0800
+@@ -458,7 +458,7 @@ void ide_probe_module (void)
+ 
+ EXPORT_SYMBOL(ide_probe_module);
+ 
+-static int ide_open (struct inode * inode, struct file * filp)
++static int ide_open (struct block_device *bdev, struct file * filp)
+ {
+ 	return -ENXIO;
+ }
+@@ -1632,12 +1632,12 @@ int generic_ide_ioctl(struct block_devic
+ #endif /* CONFIG_IDE_TASK_IOCTL */
+ 
+ 		case HDIO_DRIVE_CMD:
+-			if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO))
++			if (!capable(CAP_SYS_RAWIO))
+ 				return -EACCES;
+ 			return ide_cmd_ioctl(drive, cmd, arg);
+ 
+ 		case HDIO_DRIVE_TASK:
+-			if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SYS_RAWIO))
++			if (!capable(CAP_SYS_RAWIO))
+ 				return -EACCES;
+ 			return ide_task_ioctl(drive, cmd, arg);
+ 
+--- linux-2.6.0/drivers/ide/ide-cd.c	2003-12-17 21:20:02.000000000 -0800
++++ 25/drivers/ide/ide-cd.c	2003-12-28 23:22:35.000000000 -0800
+@@ -291,10 +291,13 @@
+  *			- Use extended sense on drives that support it for
+  *			  correctly reporting tray status -- from
+  *			  Michael D Johnson <johnsom@orst.edu>
++ * 4.60  Dec 17, 2003	- Add mt rainier support
++ *			- Bump timeout for packet commands, matches sr
++ *			- Odd stuff
+  *
+  *************************************************************************/
+  
+-#define IDECD_VERSION "4.59-ac1"
++#define IDECD_VERSION "4.60"
+ 
+ #include <linux/config.h>
+ #include <linux/module.h>
+@@ -774,11 +777,36 @@ static int cdrom_decode_status(ide_drive
+ 
+ 		if (sense_key == NOT_READY) {
+ 			/* Tray open. */
+-			cdrom_saw_media_change (drive);
++			if (rq_data_dir(rq) == READ) {
++				cdrom_saw_media_change (drive);
+ 
+-			/* Fail the request. */
+-			printk ("%s: tray open\n", drive->name);
+-			do_end_request = 1;
++				/* Fail the request. */
++				printk ("%s: tray open\n", drive->name);
++				do_end_request = 1;
++			} else {
++				struct cdrom_info *info = drive->driver_data;
++
++				/* allow the drive 5 seconds to recover, some
++				 * devices will return this error while flushing
++				 * data from cache */
++				if (!rq->errors)
++					info->write_timeout = jiffies + ATAPI_WAIT_WRITE_BUSY;
++				rq->errors = 1;
++				if (time_after(jiffies, info->write_timeout))
++					do_end_request = 1;
++				else {
++					unsigned long flags;
++
++					/*
++					 * take a breather relying on the
++					 * unplug timer to kick us again
++					 */
++					spin_lock_irqsave(&ide_lock, flags);
++					blk_plug_device(drive->queue);
++					spin_unlock_irqrestore(&ide_lock,flags);
++					return 1;
++				}
++			}
+ 		} else if (sense_key == UNIT_ATTENTION) {
+ 			/* Media change. */
+ 			cdrom_saw_media_change (drive);
+@@ -844,9 +872,13 @@ static int cdrom_timer_expiry(ide_drive_
+ 		case GPCMD_BLANK:
+ 		case GPCMD_FORMAT_UNIT:
+ 		case GPCMD_RESERVE_RZONE_TRACK:
+-			wait = WAIT_CMD;
++		case GPCMD_CLOSE_TRACK:
++		case GPCMD_FLUSH_CACHE:
++			wait = ATAPI_WAIT_PC;
+ 			break;
+ 		default:
++			if (!(rq->flags & REQ_QUIET))
++				printk(KERN_INFO "ide-cd: cmd 0x%x timed out\n", rq->cmd[0]);
+ 			wait = 0;
+ 			break;
+ 	}
+@@ -894,7 +926,7 @@ static ide_startstop_t cdrom_start_packe
+  
+ 	if (CDROM_CONFIG_FLAGS (drive)->drq_interrupt) {
+ 		/* packet command */
+-		ide_execute_command(drive, WIN_PACKETCMD, handler, WAIT_CMD, cdrom_timer_expiry);
++		ide_execute_command(drive, WIN_PACKETCMD, handler, ATAPI_WAIT_PC, cdrom_timer_expiry);
+ 		return ide_started;
+ 	} else {
+ 		/* packet command */
+@@ -1167,7 +1199,7 @@ static ide_startstop_t cdrom_read_intr (
+ 	}
+ 
+ 	/* Done moving data!  Wait for another interrupt. */
+-	ide_set_handler(drive, &cdrom_read_intr, WAIT_CMD, NULL);
++	ide_set_handler(drive, &cdrom_read_intr, ATAPI_WAIT_PC, NULL);
+ 	return ide_started;
+ }
+ 
+@@ -1277,7 +1309,7 @@ static ide_startstop_t cdrom_start_read_
+ 		(65534 / CD_FRAMESIZE) : 65535);
+ 
+ 	/* Set up the command */
+-	rq->timeout = WAIT_CMD;
++	rq->timeout = ATAPI_WAIT_PC;
+ 
+ 	/* Send the command to the drive and return. */
+ 	return cdrom_transfer_packet_command(drive, rq, &cdrom_read_intr);
+@@ -1286,7 +1318,7 @@ static ide_startstop_t cdrom_start_read_
+ 
+ #define IDECD_SEEK_THRESHOLD	(1000)			/* 1000 blocks */
+ #define IDECD_SEEK_TIMER	(5 * WAIT_MIN_SLEEP)	/* 100 ms */
+-#define IDECD_SEEK_TIMEOUT     WAIT_CMD			/* 10 sec */
++#define IDECD_SEEK_TIMEOUT	(2 * ATAPI_WAIT_PC)	/* 20 sec */
+ 
+ static ide_startstop_t cdrom_seek_intr (ide_drive_t *drive)
+ {
+@@ -1326,7 +1358,7 @@ static ide_startstop_t cdrom_start_seek_
+ 	rq->cmd[0] = GPCMD_SEEK;
+ 	put_unaligned(cpu_to_be32(frame), (unsigned int *) &rq->cmd[2]);
+ 
+-	rq->timeout = WAIT_CMD;
++	rq->timeout = ATAPI_WAIT_PC;
+ 	return cdrom_transfer_packet_command(drive, rq, &cdrom_seek_intr);
+ }
+ 
+@@ -1502,7 +1534,7 @@ confused:
+ 	}
+ 
+ 	/* Now we wait for another interrupt. */
+-	ide_set_handler(drive, &cdrom_pc_intr, WAIT_CMD, cdrom_timer_expiry);
++	ide_set_handler(drive, &cdrom_pc_intr, ATAPI_WAIT_PC, cdrom_timer_expiry);
+ 	return ide_started;
+ }
+ 
+@@ -1511,7 +1543,7 @@ static ide_startstop_t cdrom_do_pc_conti
+ 	struct request *rq = HWGROUP(drive)->rq;
+ 
+ 	if (!rq->timeout)
+-		rq->timeout = WAIT_CMD;
++		rq->timeout = ATAPI_WAIT_PC;
+ 
+ 	/* Send the command to the drive and return. */
+ 	return cdrom_transfer_packet_command(drive, rq, &cdrom_pc_intr);
+@@ -1716,11 +1748,8 @@ static ide_startstop_t cdrom_newpc_intr(
+ 	/*
+ 	 * If DRQ is clear, the command has completed.
+ 	 */
+-	if ((stat & DRQ_STAT) == 0) {
+-		if (rq->data_len)
+-			printk("%s: %u residual after xfer\n", __FUNCTION__, rq->data_len);
++	if ((stat & DRQ_STAT) == 0)
+ 		goto end_request;
+-	}
+ 
+ 	/*
+ 	 * check which way to transfer data
+@@ -1826,10 +1855,8 @@ static ide_startstop_t cdrom_write_intr(
+ 		}
+ 	}
+ 
+-	if (cdrom_decode_status(drive, 0, &stat)) {
+-		printk("ide-cd: write_intr decode_status bad\n");
++	if (cdrom_decode_status(drive, 0, &stat))
+ 		return ide_stopped;
+-	}
+ 
+ 	/*
+ 	 * using dma, transfer is complete now
+@@ -1904,7 +1931,7 @@ static ide_startstop_t cdrom_write_intr(
+ 	}
+ 
+ 	/* re-arm handler */
+-	ide_set_handler(drive, &cdrom_write_intr, 5 * WAIT_CMD, NULL);
++	ide_set_handler(drive, &cdrom_write_intr, ATAPI_WAIT_PC, NULL);
+ 	return ide_started;
+ }
+ 
+@@ -1915,7 +1942,7 @@ static ide_startstop_t cdrom_start_write
+ #if 0	/* the immediate bit */
+ 	rq->cmd[1] = 1 << 3;
+ #endif
+-	rq->timeout = 2 * WAIT_CMD;
++	rq->timeout = ATAPI_WAIT_PC;
+ 
+ 	return cdrom_transfer_packet_command(drive, rq, cdrom_write_intr);
+ }
+@@ -1956,7 +1983,7 @@ static ide_startstop_t cdrom_do_newpc_co
+ 	struct request *rq = HWGROUP(drive)->rq;
+ 
+ 	if (!rq->timeout)
+-		rq->timeout = WAIT_CMD;
++		rq->timeout = ATAPI_WAIT_PC;
+ 
+ 	return cdrom_transfer_packet_command(drive, rq, cdrom_newpc_intr);
+ }
+@@ -2242,6 +2269,7 @@ static int cdrom_read_toc(ide_drive_t *d
+ 		struct atapi_toc_header hdr;
+ 		struct atapi_toc_entry  ent;
+ 	} ms_tmp;
++	long last_written;
+ 
+ 	if (toc == NULL) {
+ 		/* Try to allocate space. */
+@@ -2261,6 +2289,13 @@ static int cdrom_read_toc(ide_drive_t *d
+ 	if (CDROM_STATE_FLAGS(drive)->toc_valid)
+ 		return 0;
+ 
++	/* Try to get the total cdrom capacity. */
++	stat = cdrom_read_capacity(drive, &toc->capacity, sense);
++	if (stat)
++		toc->capacity = 0x1fffff;
++
++	set_capacity(drive->disk, toc->capacity * SECTORS_PER_FRAME);
++
+ 	/* First read just the header, so we know how long the TOC is. */
+ 	stat = cdrom_read_tocentry(drive, 0, 1, 0, (char *) &toc->hdr,
+ 				    sizeof(struct atapi_toc_header), sense);
+@@ -2368,13 +2403,11 @@ static int cdrom_read_toc(ide_drive_t *d
+ 	toc->xa_flag = (ms_tmp.hdr.first_track != ms_tmp.hdr.last_track);
+ 
+ 	/* Now try to get the total cdrom capacity. */
+-	stat = cdrom_get_last_written(cdi, (long *) &toc->capacity);
+-	if (stat || !toc->capacity)
+-		stat = cdrom_read_capacity(drive, &toc->capacity, sense);
+-	if (stat)
+-		toc->capacity = 0x1fffff;
+-
+-	set_capacity(drive->disk, toc->capacity * SECTORS_PER_FRAME);
++	stat = cdrom_get_last_written(cdi, &last_written);
++	if (!stat && last_written) {
++		toc->capacity = last_written;
++		set_capacity(drive->disk, toc->capacity * SECTORS_PER_FRAME);
++	}
+ 
+ 	/* Remember that we've read this stuff. */
+ 	CDROM_STATE_FLAGS(drive)->toc_valid = 1;
+@@ -2483,7 +2516,7 @@ static int ide_cdrom_packet(struct cdrom
+ 	ide_drive_t *drive = (ide_drive_t*) cdi->handle;
+ 
+ 	if (cgc->timeout <= 0)
+-		cgc->timeout = WAIT_CMD;
++		cgc->timeout = ATAPI_WAIT_PC;
+ 
+ 	/* here we queue the commands from the uniform CD-ROM
+ 	   layer. the packet must be complete, as we do not
+@@ -2688,37 +2721,49 @@ int ide_cdrom_select_speed (struct cdrom
+         return 0;
+ }
+ 
++/*
++ * add logic to try GET_EVENT command first to check for media and tray
++ * status. this should be supported by newer cd-r/w and all DVD etc
++ * drives
++ */
+ static
+ int ide_cdrom_drive_status (struct cdrom_device_info *cdi, int slot_nr)
+ {
+ 	ide_drive_t *drive = (ide_drive_t*) cdi->handle;
++	struct media_event_desc med;
++	struct request_sense sense;
++	int stat;
+ 
+-	if (slot_nr == CDSL_CURRENT) {
+-		struct request_sense sense;
+-		int stat = cdrom_check_status(drive, &sense);
+-		if (stat == 0 || sense.sense_key == UNIT_ATTENTION)
+-			return CDS_DISC_OK;
++	if (slot_nr != CDSL_CURRENT)
++		return -EINVAL;
+ 
+-		if (sense.sense_key == NOT_READY && sense.asc == 0x04 &&
+-		    sense.ascq == 0x04)
+-			return CDS_DISC_OK;
++	stat = cdrom_check_status(drive, &sense);
++	if (!stat || sense.sense_key == UNIT_ATTENTION)
++		return CDS_DISC_OK;
+ 
++	if (!cdrom_get_media_event(cdi, &med)) {
++		if (med.media_present)
++			return CDS_DISC_OK;
++		if (med.door_open)
++			return CDS_TRAY_OPEN;
++	}
+ 
+-		/*
+-		 * If not using Mt Fuji extended media tray reports,
+-		 * just return TRAY_OPEN since ATAPI doesn't provide
+-		 * any other way to detect this...
+-		 */
+-		if (sense.sense_key == NOT_READY) {
+-			if (sense.asc == 0x3a && sense.ascq == 1)
+-				return CDS_NO_DISC;
+-			else
+-				return CDS_TRAY_OPEN;
+-		}
++	if (sense.sense_key == NOT_READY && sense.asc == 0x04 && sense.ascq == 0x04)
++		return CDS_DISC_OK;
+ 
+-		return CDS_DRIVE_NOT_READY;
++	/*
++	 * If not using Mt Fuji extended media tray reports,
++	 * just return TRAY_OPEN since ATAPI doesn't provide
++	 * any other way to detect this...
++	 */
++	if (sense.sense_key == NOT_READY) {
++		if (sense.asc == 0x3a && sense.ascq == 1)
++			return CDS_NO_DISC;
++		else
++			return CDS_TRAY_OPEN;
+ 	}
+-	return -EINVAL;
++
++	return CDS_DRIVE_NOT_READY;
+ }
+ 
+ static
+@@ -2826,7 +2871,8 @@ static struct cdrom_device_ops ide_cdrom
+ 				CDC_MEDIA_CHANGED | CDC_PLAY_AUDIO | CDC_RESET |
+ 				CDC_IOCTLS | CDC_DRIVE_STATUS | CDC_CD_R |
+ 				CDC_CD_RW | CDC_DVD | CDC_DVD_R| CDC_DVD_RAM |
+-				CDC_GENERIC_PACKET | CDC_MO_DRIVE,
++				CDC_GENERIC_PACKET | CDC_MO_DRIVE | CDC_MRW |
++				CDC_MRW_W | CDC_RAM,
+ 	.generic_packet		= ide_cdrom_packet,
+ };
+ 
+@@ -2861,6 +2907,10 @@ static int ide_cdrom_register (ide_drive
+ 		devinfo->mask |= CDC_CLOSE_TRAY;
+ 	if (!CDROM_CONFIG_FLAGS(drive)->mo_drive)
+ 		devinfo->mask |= CDC_MO_DRIVE;
++	if (!CDROM_CONFIG_FLAGS(drive)->mrw)
++		devinfo->mask |= CDC_MRW;
++	if (!CDROM_CONFIG_FLAGS(drive)->mrw_w)
++		devinfo->mask |= CDC_MRW_W;
+ 
+ 	return register_cdrom(devinfo);
+ }
+@@ -2881,14 +2931,6 @@ int ide_cdrom_get_capabilities(ide_drive
+ 	    !strcmp(drive->id->model, "WPI CDS-32X")))
+ 		size -= sizeof(cap->pad);
+ 
+-	/* we have to cheat a little here. the packet will eventually
+-	 * be queued with ide_cdrom_packet(), which extracts the
+-	 * drive from cdi->handle. Since this device hasn't been
+-	 * registered with the Uniform layer yet, it can't do this.
+-	 * Same goes for cdi->ops.
+-	 */
+-	cdi->handle = (ide_drive_t *) drive;
+-	cdi->ops = &ide_cdrom_dops;
+ 	init_cdrom_command(&cgc, cap, size, CGC_DATA_UNKNOWN);
+ 	do { /* we seem to get stat=0x01,err=0x00 the first time (??) */
+ 		stat = cdrom_mode_sense(cdi, &cgc, GPMODE_CAPABILITIES_PAGE, 0);
+@@ -2904,23 +2946,43 @@ int ide_cdrom_probe_capabilities (ide_dr
+ 	struct cdrom_info *info = drive->driver_data;
+ 	struct cdrom_device_info *cdi = &info->devinfo;
+ 	struct atapi_capabilities_page cap;
+-	int nslots = 1;
++	int nslots = 1, mrw_write = 0;
+ 
+ 	if (drive->media == ide_optical) {
+ 		CDROM_CONFIG_FLAGS(drive)->mo_drive = 1;
++		CDROM_CONFIG_FLAGS(drive)->ram = 1;
+ 		printk("%s: ATAPI magneto-optical drive\n", drive->name);
+ 		return nslots;
+ 	}
+ 
+-	if (CDROM_CONFIG_FLAGS(drive)->nec260) {
+-		CDROM_CONFIG_FLAGS(drive)->no_eject = 0;                       
+-		CDROM_CONFIG_FLAGS(drive)->audio_play = 1;       
++	if (CDROM_CONFIG_FLAGS(drive)->nec260 ||
++	    !strcmp(drive->id->model,"STINGRAY 8422 IDE 8X CD-ROM 7-27-95")) {
++		CDROM_CONFIG_FLAGS(drive)->no_eject = 0;
++		CDROM_CONFIG_FLAGS(drive)->audio_play = 1;
+ 		return nslots;
+ 	}
+ 
++	/*
++	 * we have to cheat a little here. the packet will eventually
++	 * be queued with ide_cdrom_packet(), which extracts the
++	 * drive from cdi->handle. Since this device hasn't been
++	 * registered with the Uniform layer yet, it can't do this.
++	 * Same goes for cdi->ops.
++	 */
++	cdi->handle = (ide_drive_t *) drive;
++	cdi->ops = &ide_cdrom_dops;
++
+ 	if (ide_cdrom_get_capabilities(drive, &cap))
+ 		return 0;
+ 
++	if (!cdrom_is_mrw(cdi, &mrw_write)) {
++		CDROM_CONFIG_FLAGS(drive)->mrw = 1;
++		if (mrw_write) {
++			CDROM_CONFIG_FLAGS(drive)->mrw_w = 1;
++			CDROM_CONFIG_FLAGS(drive)->ram = 1;
++		}
++	}
++
+ 	if (cap.lock == 0)
+ 		CDROM_CONFIG_FLAGS(drive)->no_doorlock = 1;
+ 	if (cap.eject)
+@@ -2933,8 +2995,10 @@ int ide_cdrom_probe_capabilities (ide_dr
+ 		CDROM_CONFIG_FLAGS(drive)->test_write = 1;
+ 	if (cap.dvd_ram_read || cap.dvd_r_read || cap.dvd_rom)
+ 		CDROM_CONFIG_FLAGS(drive)->dvd = 1;
+-	if (cap.dvd_ram_write)
++	if (cap.dvd_ram_write) {
+ 		CDROM_CONFIG_FLAGS(drive)->dvd_ram = 1;
++		CDROM_CONFIG_FLAGS(drive)->ram = 1;
++	}
+ 	if (cap.dvd_r_write)
+ 		CDROM_CONFIG_FLAGS(drive)->dvd_r = 1;
+ 	if (cap.audio_play)
+@@ -2998,6 +3062,9 @@ int ide_cdrom_probe_capabilities (ide_dr
+         	(CDROM_CONFIG_FLAGS(drive)->cd_r)? "-R" : "", 
+         	(CDROM_CONFIG_FLAGS(drive)->cd_rw)? "/RW" : "");
+ 
++	if (CDROM_CONFIG_FLAGS(drive)->mrw || CDROM_CONFIG_FLAGS(drive)->mrw_w)
++		printk(" CD-MR%s", CDROM_CONFIG_FLAGS(drive)->mrw_w ? "W" : "");
++
+         if (CDROM_CONFIG_FLAGS(drive)->is_changer) 
+         	printk(" changer w/%d slots", nslots);
+         else 	
+@@ -3105,14 +3172,11 @@ int ide_cdrom_setup (ide_drive_t *drive)
+ 	struct cdrom_device_info *cdi = &info->devinfo;
+ 	int nslots;
+ 
+-	/*
+-	 * default to read-only always and fix latter at the bottom
+-	 */
+-	set_disk_ro(drive->disk, 1);
+-	blk_queue_hardsect_size(drive->queue, CD_FRAMESIZE);
+-
+ 	blk_queue_prep_rq(drive->queue, ide_cdrom_prep_fn);
+ 	blk_queue_dma_alignment(drive->queue, 3);
++	drive->queue->unplug_delay = (1 * HZ) / 1000;
++	if (!drive->queue->unplug_delay)
++		drive->queue->unplug_delay = 1;
+ 
+ 	drive->special.all	= 0;
+ 	drive->ready_stat	= 0;
+@@ -3215,8 +3279,11 @@ int ide_cdrom_setup (ide_drive_t *drive)
+ 
+ 	nslots = ide_cdrom_probe_capabilities (drive);
+ 
+-	if (CDROM_CONFIG_FLAGS(drive)->dvd_ram)
+-		set_disk_ro(drive->disk, 0);
++	/*
++	 * set correct block size and read-only for non-ram media
++	 */
++	set_disk_ro(drive->disk, !CDROM_CONFIG_FLAGS(drive)->ram);
++	blk_queue_hardsect_size(drive->queue, CD_FRAMESIZE);
+ 
+ #if 0
+ 	drive->dsc_overlap = (HWIF(drive)->no_dsc) ? 0 : 1;
+@@ -3335,39 +3402,39 @@ static ide_driver_t ide_cdrom_driver = {
+ 	.complete_power_step	= ide_cdrom_complete_power_step,
+ };
+ 
+-static int idecd_open(struct inode * inode, struct file * file)
++static int idecd_open(struct block_device *bdev, struct file * file)
+ {
+-	ide_drive_t *drive = inode->i_bdev->bd_disk->private_data;
++	ide_drive_t *drive = bdev->bd_disk->private_data;
+ 	struct cdrom_info *info = drive->driver_data;
+ 	int rc = -ENOMEM;
+ 	drive->usage++;
+ 
+ 	if (!info->buffer)
+-		info->buffer = (char *) kmalloc(SECTOR_BUFFER_SIZE, GFP_KERNEL);
+-        if (!info->buffer || (rc = cdrom_open(&info->devinfo, inode, file)))
++		info->buffer = kmalloc(SECTOR_BUFFER_SIZE,
++					GFP_KERNEL|__GFP_REPEAT);
++        if (!info->buffer || (rc = cdrom_open(&info->devinfo, bdev, file)))
+ 		drive->usage--;
+ 	return rc;
+ }
+ 
+-static int idecd_release(struct inode * inode, struct file * file)
++static int idecd_release(struct gendisk *disk)
+ {
+-	ide_drive_t *drive = inode->i_bdev->bd_disk->private_data;
++	ide_drive_t *drive = disk->private_data;
+ 	struct cdrom_info *info = drive->driver_data;
+ 
+-	cdrom_release (&info->devinfo, file);
++	cdrom_release(&info->devinfo);
+ 	drive->usage--;
+ 	return 0;
+ }
+ 
+-static int idecd_ioctl (struct inode *inode, struct file *file,
++static int idecd_ioctl (struct block_device *bdev, struct file *file,
+ 			unsigned int cmd, unsigned long arg)
+ {
+-	struct block_device *bdev = inode->i_bdev;
+ 	ide_drive_t *drive = bdev->bd_disk->private_data;
+ 	int err = generic_ide_ioctl(bdev, cmd, arg);
+ 	if (err == -EINVAL) {
+ 		struct cdrom_info *info = drive->driver_data;
+-		err = cdrom_ioctl(&info->devinfo, inode, cmd, arg);
++		err = cdrom_ioctl(&info->devinfo, bdev, cmd, arg);
+ 	}
+ 	return err;
+ }
+--- linux-2.6.0/drivers/ide/ide-cd.h	2003-12-17 21:20:02.000000000 -0800
++++ 25/drivers/ide/ide-cd.h	2003-12-28 23:22:35.000000000 -0800
+@@ -35,6 +35,12 @@
+ #define NO_DOOR_LOCKING 0
+ #endif
+ 
++/*
++ * typical timeout for packet command
++ */
++#define ATAPI_WAIT_PC		(60 * HZ)
++#define ATAPI_WAIT_WRITE_BUSY	(10 * HZ)
++
+ /************************************************************************/
+ 
+ #define SECTOR_BITS 		9
+@@ -75,6 +81,9 @@ struct ide_cd_config_flags {
+ 	__u8 dvd		: 1; /* Drive is a DVD-ROM */
+ 	__u8 dvd_r		: 1; /* Drive can write DVD-R */
+ 	__u8 dvd_ram		: 1; /* Drive can write DVD-RAM */
++	__u8 mrw		: 1; /* drive can read mrw */
++	__u8 mrw_w		: 1; /* drive can write mrw */
++	__u8 ram		: 1; /* generic WRITE (dvd-ram/mrw) */
+ 	__u8 test_write		: 1; /* Drive can fake writes */
+ 	__u8 supp_disc_present	: 1; /* Changer can report exact contents
+ 					of slots. */
+@@ -482,6 +491,8 @@ struct cdrom_info {
+ 
+         /* Per-device info needed by cdrom.c generic driver. */
+         struct cdrom_device_info devinfo;
++
++	unsigned long write_timeout;
+ };
+ 
+ /****************************************************************************
+--- linux-2.6.0/drivers/ide/ide-disk.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/ide/ide-disk.c	2003-12-28 23:21:17.000000000 -0800
+@@ -1734,9 +1734,9 @@ static ide_driver_t idedisk_driver = {
+ 	.complete_power_step	= idedisk_complete_power_step,
+ };
+ 
+-static int idedisk_open(struct inode *inode, struct file *filp)
++static int idedisk_open(struct block_device *bdev, struct file *filp)
+ {
+-	ide_drive_t *drive = inode->i_bdev->bd_disk->private_data;
++	ide_drive_t *drive = bdev->bd_disk->private_data;
+ 	drive->usage++;
+ 	if (drive->removable && drive->usage == 1) {
+ 		ide_task_t args;
+@@ -1744,7 +1744,7 @@ static int idedisk_open(struct inode *in
+ 		memset(&args, 0, sizeof(ide_task_t));
+ 		args.tfRegister[IDE_COMMAND_OFFSET] = WIN_DOORLOCK;
+ 		args.command_type = ide_cmd_type_parser(&args);
+-		check_disk_change(inode->i_bdev);
++		check_disk_change(bdev);
+ 		/*
+ 		 * Ignore the return code from door_lock,
+ 		 * since the open() has already succeeded,
+@@ -1782,9 +1782,9 @@ static int ide_cacheflush_p(ide_drive_t 
+ 	return 0;
+ }
+ 
+-static int idedisk_release(struct inode *inode, struct file *filp)
++static int idedisk_release(struct gendisk *disk)
+ {
+-	ide_drive_t *drive = inode->i_bdev->bd_disk->private_data;
++	ide_drive_t *drive = disk->private_data;
+ 	if (drive->removable && drive->usage == 1) {
+ 		ide_task_t args;
+ 		memset(&args, 0, sizeof(ide_task_t));
+@@ -1798,10 +1798,9 @@ static int idedisk_release(struct inode 
+ 	return 0;
+ }
+ 
+-static int idedisk_ioctl(struct inode *inode, struct file *file,
++static int idedisk_ioctl(struct block_device *bdev, struct file *file,
+ 			unsigned int cmd, unsigned long arg)
+ {
+-	struct block_device *bdev = inode->i_bdev;
+ 	return generic_ide_ioctl(bdev, cmd, arg);
+ }
+ 
+--- linux-2.6.0/drivers/ide/ide-dma.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/ide/ide-dma.c	2003-12-28 23:22:33.000000000 -0800
+@@ -200,8 +200,8 @@ EXPORT_SYMBOL_GPL(ide_dma_intr);
+  *	kernel provide the necessary cache management so that we can
+  *	operate in a portable fashion
+  */
+- 
+-static int ide_build_sglist (ide_drive_t *drive, struct request *rq)
++
++int ide_build_sglist(ide_drive_t *drive, struct request *rq)
+ {
+ 	ide_hwif_t *hwif = HWIF(drive);
+ 	struct scatterlist *sg = hwif->sg_table;
+@@ -220,6 +220,8 @@ static int ide_build_sglist (ide_drive_t
+ 	return pci_map_sg(hwif->pci_dev, sg, nents, hwif->sg_dma_direction);
+ }
+ 
++EXPORT_SYMBOL_GPL(ide_build_sglist);
++
+ /**
+  *	ide_raw_build_sglist	-	map IDE scatter gather for DMA
+  *	@drive: the drive to build the DMA table for
+@@ -230,8 +232,8 @@ static int ide_build_sglist (ide_drive_t
+  *	of the  kernel provide the necessary cache management so that we can
+  *	operate in a portable fashion
+  */
+- 
+-static int ide_raw_build_sglist (ide_drive_t *drive, struct request *rq)
++
++int ide_raw_build_sglist(ide_drive_t *drive, struct request *rq)
+ {
+ 	ide_hwif_t *hwif = HWIF(drive);
+ 	struct scatterlist *sg = hwif->sg_table;
+@@ -270,6 +272,8 @@ static int ide_raw_build_sglist (ide_dri
+ 	return pci_map_sg(hwif->pci_dev, sg, nents, hwif->sg_dma_direction);
+ }
+ 
++EXPORT_SYMBOL_GPL(ide_raw_build_sglist);
++
+ /**
+  *	ide_build_dmatable	-	build IDE DMA table
+  *
+@@ -925,11 +929,13 @@ int ide_release_iomio_dma (ide_hwif_t *h
+  */
+ int ide_release_dma (ide_hwif_t *hwif)
+ {
++	if (hwif->mmio == 2)
++		return 1;
+ 	if (hwif->chipset == ide_etrax100)
+ 		return 1;
+ 
+ 	ide_release_dma_engine(hwif);
+-	if (hwif->mmio)
++	if (hwif->mmio == 1)
+ 		return ide_release_mmio_dma(hwif);
+ 	return ide_release_iomio_dma(hwif);
+ }
+@@ -986,6 +992,21 @@ fail:
+ 	return 1;
+ }
+ 
++int ide_mapped_mmio_dma (ide_hwif_t *hwif, unsigned long base, unsigned int ports)
++{
++	printk(KERN_INFO "    %s: MMIO-DMA ", hwif->name);
++
++	hwif->dma_base = base;
++	if (hwif->cds->extra && hwif->channel == 0)
++		hwif->dma_extra = hwif->cds->extra;
++
++	if(hwif->mate)
++		hwif->dma_master = (hwif->channel) ? hwif->mate->dma_base : base;
++	else
++		hwif->dma_master = base;
++	return 0;
++}
++
+ int ide_iomio_dma (ide_hwif_t *hwif, unsigned long base, unsigned int ports)
+ {
+ 	printk(KERN_INFO "    %s: BM-DMA at 0x%04lx-0x%04lx",
+@@ -1020,7 +1041,9 @@ int ide_iomio_dma (ide_hwif_t *hwif, uns
+  */
+ int ide_dma_iobase (ide_hwif_t *hwif, unsigned long base, unsigned int ports)
+ {
+-	if (hwif->mmio)
++	if (hwif->mmio == 2)
++		return ide_mapped_mmio_dma(hwif, base,ports);
++	if (hwif->mmio == 1)
+ 		return ide_mmio_dma(hwif, base, ports);
+ 	return ide_iomio_dma(hwif, base, ports);
+ }
+--- linux-2.6.0/drivers/ide/ide-floppy.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/ide/ide-floppy.c	2003-12-28 23:21:17.000000000 -0800
+@@ -1866,9 +1866,9 @@ static ide_driver_t idefloppy_driver = {
+ 	.drives			= LIST_HEAD_INIT(idefloppy_driver.drives),
+ };
+ 
+-static int idefloppy_open(struct inode *inode, struct file *filp)
++static int idefloppy_open(struct block_device *bdev, struct file *filp)
+ {
+-	ide_drive_t *drive = inode->i_bdev->bd_disk->private_data;
++	ide_drive_t *drive = bdev->bd_disk->private_data;
+ 	idefloppy_floppy_t *floppy = drive->driver_data;
+ 	idefloppy_pc_t pc;
+ 
+@@ -1908,7 +1908,7 @@ static int idefloppy_open(struct inode *
+ 			idefloppy_create_prevent_cmd(&pc, 1);
+ 			(void) idefloppy_queue_pc_tail(drive, &pc);
+ 		}
+-		check_disk_change(inode->i_bdev);
++		check_disk_change(bdev);
+ 	} else if (test_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, &floppy->flags)) {
+ 		drive->usage--;
+ 		return -EBUSY;
+@@ -1916,9 +1916,9 @@ static int idefloppy_open(struct inode *
+ 	return 0;
+ }
+ 
+-static int idefloppy_release(struct inode *inode, struct file *filp)
++static int idefloppy_release(struct gendisk *disk)
+ {
+-	ide_drive_t *drive = inode->i_bdev->bd_disk->private_data;
++	ide_drive_t *drive = disk->private_data;
+ 	idefloppy_pc_t pc;
+ 	
+ 	debug_log(KERN_INFO "Reached idefloppy_release\n");
+@@ -1938,10 +1938,9 @@ static int idefloppy_release(struct inod
+ 	return 0;
+ }
+ 
+-static int idefloppy_ioctl(struct inode *inode, struct file *file,
++static int idefloppy_ioctl(struct block_device *bdev, struct file *file,
+ 			unsigned int cmd, unsigned long arg)
+ {
+-	struct block_device *bdev = inode->i_bdev;
+ 	ide_drive_t *drive = bdev->bd_disk->private_data;
+ 	idefloppy_floppy_t *floppy = drive->driver_data;
+ 	int err = generic_ide_ioctl(bdev, cmd, arg);
+--- linux-2.6.0/drivers/ide/ide-io.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/ide/ide-io.c	2003-12-28 23:26:29.000000000 -0800
+@@ -54,37 +54,6 @@
+ #include <asm/io.h>
+ #include <asm/bitops.h>
+ 
+-#if (DISK_RECOVERY_TIME > 0)
+-
+-#error So the User Has To Fix the Compilation And Stop Hacking Port 0x43. Does anyone ever use this anyway ??
+-
+-/*
+- * For really screwy hardware (hey, at least it *can* be used with Linux)
+- * we can enforce a minimum delay time between successive operations.
+- */
+-static unsigned long read_timer (ide_hwif_t *hwif)
+-{
+-	unsigned long t, flags;
+-	int i;
+-	
+-	/* FIXME this is completely unsafe! */
+-	local_irq_save(flags);
+-	t = jiffies * 11932;
+-	outb_p(0, 0x43);
+-	i = inb_p(0x40);
+-	i |= inb_p(0x40) << 8;
+-	local_irq_restore(flags);
+-	return (t - i);
+-}
+-#endif /* DISK_RECOVERY_TIME */
+-
+-static inline void set_recovery_timer (ide_hwif_t *hwif)
+-{
+-#if (DISK_RECOVERY_TIME > 0)
+-	hwif->last_time = read_timer(hwif);
+-#endif /* DISK_RECOVERY_TIME */
+-}
+-
+ /**
+  *	ide_end_request		-	complete an IDE I/O
+  *	@drive: IDE device for the I/O
+@@ -653,10 +622,6 @@ ide_startstop_t start_request (ide_drive
+ 	if (block == 0 && drive->remap_0_to_1 == 1)
+ 		block = 1;  /* redirect MBR access to EZ-Drive partn table */
+ 
+-#if (DISK_RECOVERY_TIME > 0)
+-	while ((read_timer() - HWIF(drive)->last_time) < DISK_RECOVERY_TIME);
+-#endif
+-
+ 	if (blk_pm_suspend_request(rq) &&
+ 	    rq->pm->pm_step == ide_pm_state_start_suspend)
+ 		/* Mark drive blocked when starting the suspend sequence. */
+@@ -1116,7 +1081,6 @@ void ide_timer_expiry (unsigned long dat
+ 					startstop =
+ 					DRIVER(drive)->error(drive, "irq timeout", hwif->INB(IDE_STATUS_REG));
+ 			}
+-			set_recovery_timer(hwif);
+ 			drive->service_time = jiffies - drive->service_start;
+ 			spin_lock_irq(&ide_lock);
+ 			enable_irq(hwif->irq);
+@@ -1313,7 +1277,6 @@ irqreturn_t ide_intr (int irq, void *dev
+ 	 * same irq as is currently being serviced here, and Linux
+ 	 * won't allow another of the same (on any CPU) until we return.
+ 	 */
+-	set_recovery_timer(HWIF(drive));
+ 	drive->service_time = jiffies - drive->service_start;
+ 	if (startstop == ide_stopped) {
+ 		if (hwgroup->handler == NULL) {	/* paranoia */
+--- linux-2.6.0/drivers/ide/ide-tape.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/ide/ide-tape.c	2003-12-28 23:26:27.000000000 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * linux/drivers/ide/ide-tape.c		Version 1.17b	Oct, 2002
++ * linux/drivers/ide/ide-tape.c		Version 1.19	Nov, 2003
+  *
+  * Copyright (C) 1995 - 1999 Gadi Oxman <gadio@netvision.net.il>
+  *
+@@ -422,7 +422,7 @@
+  *		sharing a (fast) ATA-2 disk with any (slow) new ATAPI device.
+  */
+ 
+-#define IDETAPE_VERSION "1.17b-ac1"
++#define IDETAPE_VERSION "1.19"
+ 
+ #include <linux/config.h>
+ #include <linux/module.h>
+@@ -450,9 +450,6 @@
+ #include <asm/unaligned.h>
+ #include <asm/bitops.h>
+ 
+-
+-#define NO_LONGER_REQUIRED	(1)
+-
+ /*
+  *	OnStream support
+  */
+@@ -652,9 +649,11 @@ typedef struct {
+ #define IDETAPE_PC_STACK		(10 + IDETAPE_MAX_PC_RETRIES)
+ 
+ /*
+- *	Some tape drives require a long irq timeout
++ * Some drives (for example, Seagate STT3401A Travan) require a very long
++ * timeout, because they don't return an interrupt or clear their busy bit
++ * until after the command completes (even retension commands).
+  */
+-#define IDETAPE_WAIT_CMD		(60*HZ)
++#define IDETAPE_WAIT_CMD		(900*HZ)
+ 
+ /*
+  *	The following parameter is used to select the point in the internal
+@@ -1032,6 +1031,10 @@ typedef struct {
+ 
+ 	/* the door is currently locked */
+ 	int door_locked;
++	/* the tape hardware is write protected */
++	char drv_write_prot;
++	/* the tape is write protected (hardware or opened as read-only) */
++	char write_prot;
+ 
+ 	/*
+ 	 * OnStream flags
+@@ -1164,6 +1167,8 @@ typedef struct {
+ #define IDETAPE_DRQ_INTERRUPT		6	/* DRQ interrupt device */
+ #define IDETAPE_READ_ERROR		7
+ #define IDETAPE_PIPELINE_ACTIVE		8	/* pipeline active */
++/* 0 = no tape is loaded, so we don't rewind after ejecting */
++#define IDETAPE_MEDIUM_PRESENT		9
+ 
+ /*
+  *	Supported ATAPI tape drives packet commands
+@@ -1211,10 +1216,14 @@ typedef struct {
+  *	requests to the tail of our block device request queue and wait
+  *	for their completion.
+  */
+-#define idetape_request(rq) \
+-	((rq)->flags & (REQ_IDETAPE_PC1 | REQ_IDETAPE_PC2 | \
+-			REQ_IDETAPE_READ | REQ_IDETAPE_WRITE | \
+-			REQ_IDETAPE_READ_BUFFER))
++
++enum {
++	REQ_IDETAPE_PC1		= (1 << 0), /* packet command (first stage) */
++	REQ_IDETAPE_PC2		= (1 << 1), /* packet command (second stage) */
++	REQ_IDETAPE_READ	= (1 << 2),
++	REQ_IDETAPE_WRITE	= (1 << 3),
++	REQ_IDETAPE_READ_BUFFER	= (1 << 4),
++};
+ 
+ /*
+  *	Error codes which are returned in rq->errors to the higher part
+@@ -1665,6 +1674,20 @@ static void idetape_analyze_error (ide_d
+ 		idetape_update_buffers(pc);
+ 	}
+ 
++	/*
++	 * If error was the result of a zero-length read or write command,
++	 * with sense key=5, asc=0x22, ascq=0, let it slide.  Some drives
++	 * (i.e. Seagate STT3401A Travan) don't support 0-length read/writes.
++	 */
++	if ((pc->c[0] == IDETAPE_READ_CMD || pc->c[0] == IDETAPE_WRITE_CMD)
++	    && pc->c[4] == 0 && pc->c[3] == 0 && pc->c[2] == 0) { /* length==0 */
++		if (result->sense_key == 5) {
++			/* don't report an error, everything's ok */
++			pc->error = 0;
++			/* don't retry read/write */
++			set_bit(PC_ABORT, &pc->flags);
++		}
++	}
+ 	if (pc->c[0] == IDETAPE_READ_CMD && result->filemark) {
+ 		pc->error = IDETAPE_ERROR_FILEMARK;
+ 		set_bit(PC_ABORT, &pc->flags);
+@@ -1805,10 +1828,15 @@ static void idetape_remove_stage_head (i
+ 	}
+ }
+ 
+-static void idetape_abort_pipeline (ide_drive_t *drive, idetape_stage_t *last_stage)
++/*
++ * This will free all the pipeline stages starting from new_last_stage->next
++ * to the end of the list, and point tape->last_stage to new_last_stage.
++ */
++static void idetape_abort_pipeline(ide_drive_t *drive,
++				   idetape_stage_t *new_last_stage)
+ {
+ 	idetape_tape_t *tape = drive->driver_data;
+-	idetape_stage_t *stage = tape->next_stage;
++	idetape_stage_t *stage = new_last_stage->next;
+ 	idetape_stage_t *nstage;
+ 
+ #if IDETAPE_DEBUG_LOG
+@@ -1822,9 +1850,9 @@ static void idetape_abort_pipeline (ide_
+ 		--tape->nr_pending_stages;
+ 		stage = nstage;
+ 	}
+-	tape->last_stage = last_stage;
+-	if (last_stage)
+-		last_stage->next = NULL;
++	if (new_last_stage)
++		new_last_stage->next = NULL;
++	tape->last_stage = new_last_stage;
+ 	tape->next_stage = NULL;
+ }
+ 
+@@ -1868,7 +1896,7 @@ static int idetape_end_request(ide_drive
+ 		tape->active_stage = NULL;
+ 		tape->active_data_request = NULL;
+ 		tape->nr_pending_stages--;
+-		if (rq->flags & REQ_IDETAPE_WRITE) {
++		if (rq->cmd[0] & REQ_IDETAPE_WRITE) {
+ #if ONSTREAM_DEBUG
+ 			if (tape->debug_level >= 2) {
+ 				if (tape->onstream) {
+@@ -1914,7 +1942,7 @@ static int idetape_end_request(ide_drive
+ 					}
+ 				}
+ 			}
+-		} else if (rq->flags & REQ_IDETAPE_READ) {
++		} else if (rq->cmd[0] & REQ_IDETAPE_READ) {
+ 			if (error == IDETAPE_ERROR_EOD) {
+ 				set_bit(IDETAPE_PIPELINE_ERROR, &tape->flags);
+ 				idetape_abort_pipeline(drive, active_stage);
+@@ -1972,6 +2000,13 @@ static void idetape_create_request_sense
+ 	pc->callback = &idetape_request_sense_callback;
+ }
+ 
++static void idetape_init_rq(struct request *rq, u8 cmd)
++{
++	memset(rq, 0, sizeof(*rq));
++	rq->flags = REQ_SPECIAL;
++	rq->cmd[0] = cmd;
++}
++
+ /*
+  *	idetape_queue_pc_head generates a new packet command request in front
+  *	of the request queue, before the current request, so that it will be
+@@ -1993,8 +2028,7 @@ static void idetape_create_request_sense
+  */
+ static void idetape_queue_pc_head (ide_drive_t *drive, idetape_pc_t *pc,struct request *rq)
+ {
+-	memset(rq, 0, sizeof(*rq));
+-	rq->flags = REQ_IDETAPE_PC1;
++	idetape_init_rq(rq, REQ_IDETAPE_PC1);
+ 	rq->buffer = (char *) pc;
+ 	(void) ide_do_drive_cmd(drive, rq, ide_preempt);
+ }
+@@ -2430,7 +2464,14 @@ static void idetape_create_mode_sense_cm
+ 	if (page_code != IDETAPE_BLOCK_DESCRIPTOR)
+ 		pc->c[1] = 8;	/* DBD = 1 - Don't return block descriptors */
+ 	pc->c[2] = page_code;
+-	pc->c[3] = 255;		/* Don't limit the returned information */
++	/*
++	 * Changed pc->c[3] to 0 (255 will at best return unused info).
++	 *
++	 * For SCSI this byte is defined as subpage instead of high byte
++	 * of length and some IDE drives seem to interpret it this way
++	 * and return an error when 255 is used.
++	 */
++	pc->c[3] = 0;
+ 	pc->c[4] = 255;		/* (We will just discard data in that case) */
+ 	if (page_code == IDETAPE_BLOCK_DESCRIPTOR)
+ 		pc->request_transfer = 12;
+@@ -2544,8 +2585,9 @@ static ide_startstop_t idetape_media_acc
+ 	if (status.b.dsc) {
+ 		if (status.b.check) {
+ 			/* Error detected */
+-			printk(KERN_ERR "ide-tape: %s: I/O error, ",tape->name);
+-
++			if (pc->c[0] != IDETAPE_TEST_UNIT_READY_CMD)
++				printk(KERN_ERR "ide-tape: %s: I/O error, ",
++						tape->name);
+ 			/* Retry operation */
+ 			return idetape_retry_pc(drive);
+ 		}
+@@ -2697,7 +2739,7 @@ static ide_startstop_t idetape_do_reques
+ 	if (tape->debug_level >= 5)
+ 		printk(KERN_INFO "ide-tape: rq_status: %d, "
+ 			"dev: %s, cmd: %ld, errors: %d\n", rq->rq_status,
+-			 rq->rq_disk->disk_name, rq->flags, rq->errors);
++			 rq->rq_disk->disk_name, rq->cmd[0], rq->errors);
+ #endif
+ 	if (tape->debug_level >= 2)
+ 		printk(KERN_INFO "ide-tape: sector: %ld, "
+@@ -2705,11 +2747,11 @@ static ide_startstop_t idetape_do_reques
+ 			rq->sector, rq->nr_sectors, rq->current_nr_sectors);
+ #endif /* IDETAPE_DEBUG_LOG */
+ 
+-	if (!idetape_request(rq)) {
++	if ((rq->flags & REQ_SPECIAL) == 0) {
+ 		/*
+ 		 * We do not support buffer cache originated requests.
+ 		 */
+-		printk(KERN_NOTICE "ide-tape: %s: Unsupported command in "
++		printk(KERN_NOTICE "ide-tape: %s: Unsupported request in "
+ 			"request queue (%ld)\n", drive->name, rq->flags);
+ 		ide_end_request(drive, 0, 0);
+ 		return ide_stopped;
+@@ -2746,7 +2788,7 @@ static ide_startstop_t idetape_do_reques
+ 	 */
+ 	if (tape->onstream)
+ 		status.b.dsc = 1;
+-	if (!drive->dsc_overlap && !(rq->flags & REQ_IDETAPE_PC2))
++	if (!drive->dsc_overlap && !(rq->cmd[0] & REQ_IDETAPE_PC2))
+ 		set_bit(IDETAPE_IGNORE_DSC, &tape->flags);
+ 
+ 	/*
+@@ -2760,7 +2802,7 @@ static ide_startstop_t idetape_do_reques
+ 	if (tape->tape_still_time > 100 && tape->tape_still_time < 200)
+ 		tape->measure_insert_time = 1;
+ 	if (tape->req_buffer_fill &&
+-	    (rq->flags & (REQ_IDETAPE_WRITE | REQ_IDETAPE_READ))) {
++	    (rq->cmd[0] & (REQ_IDETAPE_WRITE | REQ_IDETAPE_READ))) {
+ 		tape->req_buffer_fill = 0;
+ 		tape->writes_since_buffer_fill = 0;
+ 		tape->reads_since_buffer_fill = 0;
+@@ -2774,12 +2816,12 @@ static ide_startstop_t idetape_do_reques
+ 		tape->insert_speed = tape->insert_size / 1024 * HZ / (jiffies - tape->insert_time);
+ 	calculate_speeds(drive);
+ 	if (tape->onstream && tape->max_frames &&
+-	    (((rq->flags & REQ_IDETAPE_WRITE) &&
++	    (((rq->cmd[0] & REQ_IDETAPE_WRITE) &&
+               ( tape->cur_frames == tape->max_frames ||
+                 ( tape->speed_control && tape->cur_frames > 5 &&
+                        (tape->insert_speed > tape->max_insert_speed ||
+                         (0 /* tape->cur_frames > 30 && tape->tape_still_time > 200 */) ) ) ) ) ||
+-	     ((rq->flags & REQ_IDETAPE_READ) &&
++	     ((rq->cmd[0] & REQ_IDETAPE_READ) &&
+ 	      ( tape->cur_frames == 0 ||
+ 		( tape->speed_control && (tape->cur_frames < tape->max_frames - 5) &&
+ 			tape->insert_speed > tape->max_insert_speed ) ) && rq->nr_sectors) ) ) {
+@@ -2787,7 +2829,7 @@ static ide_startstop_t idetape_do_reques
+ 		if (tape->debug_level >= 4)
+ 			printk(KERN_INFO "ide-tape: postponing request, "
+ 					"cmd %ld, cur %d, max %d\n",
+-				rq->flags, tape->cur_frames, tape->max_frames);
++				rq->cmd[0], tape->cur_frames, tape->max_frames);
+ #endif
+ 		if (tape->postpone_cnt++ < 500) {
+ 			status.b.dsc = 0;
+@@ -2808,7 +2850,7 @@ static ide_startstop_t idetape_do_reques
+ 		} else if ((signed long) (jiffies - tape->dsc_timeout) > 0) {
+ 			printk(KERN_ERR "ide-tape: %s: DSC timeout\n",
+ 				tape->name);
+-			if (rq->flags & REQ_IDETAPE_PC2) {
++			if (rq->cmd[0] & REQ_IDETAPE_PC2) {
+ 				idetape_media_access_finished(drive);
+ 				return ide_stopped;
+ 			} else {
+@@ -2819,7 +2861,7 @@ static ide_startstop_t idetape_do_reques
+ 		idetape_postpone_request(drive);
+ 		return ide_stopped;
+ 	}
+-	if (rq->flags & REQ_IDETAPE_READ) {
++	if (rq->cmd[0] & REQ_IDETAPE_READ) {
+ 		tape->buffer_head++;
+ #if USE_IOTRACE
+ 		IO_trace(IO_IDETAPE_FIFO, tape->pipeline_head, tape->buffer_head, tape->tape_head, tape->minor);
+@@ -2836,7 +2878,7 @@ static ide_startstop_t idetape_do_reques
+ 		idetape_create_read_cmd(tape, pc, rq->current_nr_sectors, (struct idetape_bh *)rq->special);
+ 		goto out;
+ 	}
+-	if (rq->flags & REQ_IDETAPE_WRITE) {
++	if (rq->cmd[0] & REQ_IDETAPE_WRITE) {
+ 		tape->buffer_head++;
+ #if USE_IOTRACE
+ 		IO_trace(IO_IDETAPE_FIFO, tape->pipeline_head, tape->buffer_head, tape->tape_head, tape->minor);
+@@ -2854,19 +2896,19 @@ static ide_startstop_t idetape_do_reques
+ 		idetape_create_write_cmd(tape, pc, rq->current_nr_sectors, (struct idetape_bh *)rq->special);
+ 		goto out;
+ 	}
+-	if (rq->flags & REQ_IDETAPE_READ_BUFFER) {
++	if (rq->cmd[0] & REQ_IDETAPE_READ_BUFFER) {
+ 		tape->postpone_cnt = 0;
+ 		pc = idetape_next_pc_storage(drive);
+ 		idetape_create_read_buffer_cmd(tape, pc, rq->current_nr_sectors, (struct idetape_bh *)rq->special);
+ 		goto out;
+ 	}
+-	if (rq->flags & REQ_IDETAPE_PC1) {
++	if (rq->cmd[0] & REQ_IDETAPE_PC1) {
+ 		pc = (idetape_pc_t *) rq->buffer;
+-		rq->flags &= ~(REQ_IDETAPE_PC1);
+-		rq->flags |= REQ_IDETAPE_PC2;
++		rq->cmd[0] &= ~(REQ_IDETAPE_PC1);
++		rq->cmd[0] |= REQ_IDETAPE_PC2;
+ 		goto out;
+ 	}
+-	if (rq->flags & REQ_IDETAPE_PC2) {
++	if (rq->cmd[0] & REQ_IDETAPE_PC2) {
+ 		idetape_media_access_finished(drive);
+ 		return ide_stopped;
+ 	}
+@@ -3163,7 +3205,7 @@ static void idetape_wait_for_request (id
+ 	idetape_tape_t *tape = drive->driver_data;
+ 
+ #if IDETAPE_DEBUG_BUGS
+-	if (rq == NULL || !idetape_request(rq)) {
++	if (rq == NULL || (rq->flags & REQ_SPECIAL) == 0) {
+ 		printk (KERN_ERR "ide-tape: bug: Trying to sleep on non-valid request\n");
+ 		return;
+ 	}
+@@ -3269,8 +3311,7 @@ static int __idetape_queue_pc_tail (ide_
+ {
+ 	struct request rq;
+ 
+-	memset(&rq, 0, sizeof(rq));
+-	rq.flags = REQ_IDETAPE_PC1;
++	idetape_init_rq(&rq, REQ_IDETAPE_PC1);
+ 	rq.buffer = (char *) pc;
+ 	return ide_do_drive_cmd(drive, &rq, ide_wait);
+ }
+@@ -3295,25 +3336,28 @@ static int idetape_wait_ready(ide_drive_
+ {
+ 	idetape_tape_t *tape = drive->driver_data;
+ 	idetape_pc_t pc;
++	int load_attempted = 0;
+ 
+ 	/*
+ 	 * Wait for the tape to become ready
+ 	 */
++	set_bit(IDETAPE_MEDIUM_PRESENT, &tape->flags);
+ 	timeout += jiffies;
+ 	while (time_before(jiffies, timeout)) {
+ 		idetape_create_test_unit_ready_cmd(&pc);
+ 		if (!__idetape_queue_pc_tail(drive, &pc))
+ 			return 0;
+-		if (tape->sense_key == 2 && tape->asc == 4 && tape->ascq == 2) {
++		if ((tape->sense_key == 2 && tape->asc == 4 && tape->ascq == 2)
++		    || (tape->asc == 0x3A)) {	/* no media */
++			if (load_attempted)
++				return -ENOMEDIUM;
+ 			idetape_create_load_unload_cmd(drive, &pc, IDETAPE_LU_LOAD_MASK);
+ 			__idetape_queue_pc_tail(drive, &pc);
+-			idetape_create_test_unit_ready_cmd(&pc);
+-			if (!__idetape_queue_pc_tail(drive, &pc))
+-				return 0;
+-		}
+-		if (!(tape->sense_key == 2 && tape->asc == 4 &&
+-		      (tape->ascq == 1 || tape->ascq == 8)))
+-			break;
++			load_attempted = 1;
++		/* not about to be ready */
++		} else if (!(tape->sense_key == 2 && tape->asc == 4 &&
++			     (tape->ascq == 1 || tape->ascq == 8)))
++			return -EIO;
+ 		current->state = TASK_INTERRUPTIBLE;
+   		schedule_timeout(HZ / 10);
+ 	}
+@@ -3369,25 +3413,10 @@ static int idetape_read_position (ide_dr
+ 		printk(KERN_INFO "ide-tape: Reached idetape_read_position\n");
+ #endif /* IDETAPE_DEBUG_LOG */
+ 
+-#ifdef NO_LONGER_REQUIRED
+-	idetape_flush_tape_buffers(drive);
+-#endif
+ 	idetape_create_read_position_cmd(&pc);
+ 	if (idetape_queue_pc_tail(drive, &pc))
+ 		return -1;
+ 	position = tape->first_frame_position;
+-#ifdef NO_LONGER_REQUIRED
+-	if (tape->onstream) {
+-		if ((position != tape->last_frame_position - tape->blocks_in_buffer) &&
+-		    (position != tape->last_frame_position + tape->blocks_in_buffer)) {
+-			if (tape->blocks_in_buffer == 0) {
+-				printk("ide-tape: %s: correcting read position %d, %d, %d\n", tape->name, position, tape->last_frame_position, tape->blocks_in_buffer);
+-				position = tape->last_frame_position;
+-				tape->first_frame_position = position;
+-			}
+-		}
+-	}
+-#endif
+ 	return position;
+ }
+ 
+@@ -3436,6 +3465,8 @@ static int __idetape_discard_read_pipeli
+ 
+ 	if (tape->chrdev_direction != idetape_direction_read)
+ 		return 0;
++
++	/* Remove merge stage. */
+ 	cnt = tape->merge_stage_size / tape->tape_block_size;
+ 	if (test_and_clear_bit(IDETAPE_FILEMARK, &tape->flags))
+ 		++cnt;		/* Filemarks count as 1 sector */
+@@ -3444,9 +3475,12 @@ static int __idetape_discard_read_pipeli
+ 		__idetape_kfree_stage(tape->merge_stage);
+ 		tape->merge_stage = NULL;
+ 	}
++
++	/* Clear pipeline flags. */
+ 	clear_bit(IDETAPE_PIPELINE_ERROR, &tape->flags);
+ 	tape->chrdev_direction = idetape_direction_none;
+-	
++
++	/* Remove pipeline stages. */
+ 	if (tape->first_stage == NULL)
+ 		return 0;
+ 
+@@ -3546,8 +3580,7 @@ static int idetape_queue_rw_tail(ide_dri
+ 	}
+ #endif /* IDETAPE_DEBUG_BUGS */	
+ 
+-	memset(&rq, 0, sizeof(rq));
+-	rq.flags = cmd;
++	idetape_init_rq(&rq, cmd);
+ 	rq.special = (void *)bh;
+ 	rq.sector = tape->first_frame_position;
+ 	rq.nr_sectors = rq.current_nr_sectors = blocks;
+@@ -3596,8 +3629,7 @@ static void idetape_onstream_read_back_b
+ 			printk(KERN_INFO "ide-tape: %s: read back logical block %d, data %x %x %x %x\n", tape->name, logical_blk_num, *p++, *p++, *p++, *p++);
+ #endif
+ 		rq = &stage->rq;
+-		memset(rq, 0, sizeof(*rq));
+-		rq->flags = REQ_IDETAPE_WRITE;
++		idetape_init_rq(rq, REQ_IDETAPE_WRITE);
+ 		rq->sector = tape->first_frame_position;
+ 		rq->nr_sectors = rq->current_nr_sectors = tape->capabilities.ctl;
+ 		idetape_init_stage(drive, stage, OS_FRAME_TYPE_DATA, logical_blk_num++);
+@@ -3871,8 +3903,7 @@ static int idetape_add_chrdev_write_requ
+ 		}
+ 	}
+ 	rq = &new_stage->rq;
+-	memset(rq, 0, sizeof(*rq));
+-	rq->flags = REQ_IDETAPE_WRITE;
++	idetape_init_rq(rq, REQ_IDETAPE_WRITE);
+ 	/* Doesn't actually matter - We always assume sequential access */
+ 	rq->sector = tape->first_frame_position;
+ 	rq->nr_sectors = rq->current_nr_sectors = blocks;
+@@ -4059,19 +4090,22 @@ static int idetape_initiate_read (ide_dr
+ 		 *	Issue a read 0 command to ensure that DSC handshake
+ 		 *	is switched from completion mode to buffer available
+ 		 *	mode.
++		 *	No point in issuing this if DSC overlap isn't supported,
++		 *	some drives (Seagate STT3401A) will return an error.
+ 		 */
+-		bytes_read = idetape_queue_rw_tail(drive, REQ_IDETAPE_READ, 0, tape->merge_stage->bh);
+-		if (bytes_read < 0) {
+-			__idetape_kfree_stage(tape->merge_stage);
+-			tape->merge_stage = NULL;
+-			tape->chrdev_direction = idetape_direction_none;
+-			return bytes_read;
++		if (drive->dsc_overlap) {
++			bytes_read = idetape_queue_rw_tail(drive, REQ_IDETAPE_READ, 0, tape->merge_stage->bh);
++			if (bytes_read < 0) {
++				__idetape_kfree_stage(tape->merge_stage);
++				tape->merge_stage = NULL;
++				tape->chrdev_direction = idetape_direction_none;
++				return bytes_read;
++			}
+ 		}
+ 	}
+ 	if (tape->restart_speed_control_req)
+ 		idetape_restart_speed_control(drive);
+-	memset(&rq, 0, sizeof(rq));
+-	rq.flags = REQ_IDETAPE_READ;
++	idetape_init_rq(&rq, REQ_IDETAPE_READ);
+ 	rq.sector = tape->first_frame_position;
+ 	rq.nr_sectors = rq.current_nr_sectors = blocks;
+ 	if (!test_bit(IDETAPE_PIPELINE_ERROR, &tape->flags) &&
+@@ -4898,6 +4932,10 @@ static ssize_t idetape_chrdev_write (str
+ 		return -ENXIO;
+ 	}
+ 
++	/* The drive is write protected. */
++	if (tape->write_prot)
++		return -EACCES;
++
+ #if IDETAPE_DEBUG_LOG
+ 	if (tape->debug_level >= 3)
+ 		printk(KERN_INFO "ide-tape: Reached idetape_chrdev_write, "
+@@ -4979,13 +5017,17 @@ static ssize_t idetape_chrdev_write (str
+ 		 *	Issue a write 0 command to ensure that DSC handshake
+ 		 *	is switched from completion mode to buffer available
+ 		 *	mode.
++		 *	No point in issuing this if DSC overlap isn't supported,
++		 *	some drives (Seagate STT3401A) will return an error.
+ 		 */
+-		retval = idetape_queue_rw_tail(drive, REQ_IDETAPE_WRITE, 0, tape->merge_stage->bh);
+-		if (retval < 0) {
+-			__idetape_kfree_stage(tape->merge_stage);
+-			tape->merge_stage = NULL;
+-			tape->chrdev_direction = idetape_direction_none;
+-			return retval;
++		if (drive->dsc_overlap) {
++			retval = idetape_queue_rw_tail(drive, REQ_IDETAPE_WRITE, 0, tape->merge_stage->bh);
++			if (retval < 0) {
++				__idetape_kfree_stage(tape->merge_stage);
++				tape->merge_stage = NULL;
++				tape->chrdev_direction = idetape_direction_none;
++				return retval;
++			}
+ 		}
+ #if ONSTREAM_DEBUG
+ 		if (tape->debug_level >= 2)
+@@ -5141,7 +5183,7 @@ ok:
+  *	Note:
+  *
+  *		MTBSF and MTBSFM are not supported when the tape doesn't
+- *		supports spacing over filemarks in the reverse direction.
++ *		support spacing over filemarks in the reverse direction.
+  *		In this case, MTFSFM is also usually not supported (it is
+  *		supported in the rare case in which we crossed the filemark
+  *		during our read-ahead pipelined operation mode).
+@@ -5211,6 +5253,8 @@ static int idetape_mtioctop (ide_drive_t
+ 	}
+ 	switch (mt_op) {
+ 		case MTWEOF:
++			if (tape->write_prot)
++				return -EACCES;
+ 			idetape_discard_read_pipeline(drive, 1);
+ 			for (i = 0; i < mt_count; i++) {
+ 				retval = idetape_write_filemark(drive);
+@@ -5231,9 +5275,21 @@ static int idetape_mtioctop (ide_drive_t
+ 			return (idetape_queue_pc_tail(drive, &pc));
+ 		case MTUNLOAD:
+ 		case MTOFFL:
++			/*
++			 * If door is locked, attempt to unlock before
++			 * attempting to eject.
++			 */
++			if (tape->door_locked) {
++				if (idetape_create_prevent_cmd(drive, &pc, 0))
++					if (!idetape_queue_pc_tail(drive, &pc))
++						tape->door_locked = DOOR_UNLOCKED;
++			}
+ 			idetape_discard_read_pipeline(drive, 0);
+ 			idetape_create_load_unload_cmd(drive, &pc,!IDETAPE_LU_LOAD_MASK);
+-			return (idetape_queue_pc_tail(drive, &pc));
++			retval = idetape_queue_pc_tail(drive, &pc);
++			if (!retval)
++				clear_bit(IDETAPE_MEDIUM_PRESENT, &tape->flags);
++			return retval;
+ 		case MTNOP:
+ 			idetape_discard_read_pipeline(drive, 0);
+ 			return (idetape_flush_tape_buffers(drive));
+@@ -5409,6 +5465,8 @@ static int idetape_chrdev_ioctl (struct 
+ 					mtget.mt_gstat |= GMT_EOD(0xffffffff);
+ 				if (position <= OS_DATA_STARTFRAME1)
+ 					mtget.mt_gstat |= GMT_BOT(0xffffffff);
++			} else if (tape->drv_write_prot) {
++				mtget.mt_gstat |= GMT_WR_PROT(0xffffffff);
+ 			}
+ 			if (copy_to_user((char *) arg,(char *) &mtget, sizeof(struct mtget)))
+ 				return -EFAULT;
+@@ -5530,6 +5588,8 @@ ok:
+ 	return 1;
+ }
+ 
++static void idetape_get_blocksize_from_block_descriptor(ide_drive_t *drive);
++
+ /*
+  *	Our character device open function.
+  */
+@@ -5539,7 +5599,8 @@ static int idetape_chrdev_open (struct i
+ 	ide_drive_t *drive;
+ 	idetape_tape_t *tape;
+ 	idetape_pc_t pc;
+-			
++	int retval;
++
+ #if IDETAPE_DEBUG_LOG
+ 	printk(KERN_INFO "ide-tape: Reached idetape_chrdev_open\n");
+ #endif /* IDETAPE_DEBUG_LOG */
+@@ -5552,11 +5613,7 @@ static int idetape_chrdev_open (struct i
+ 
+ 	if (test_and_set_bit(IDETAPE_BUSY, &tape->flags))
+ 		return -EBUSY;
+-	if (!tape->onstream) {	
+-		idetape_read_position(drive);
+-		if (!test_bit(IDETAPE_ADDRESS_VALID, &tape->flags))
+-			(void) idetape_rewind_tape(drive);
+-	} else {
++	if (tape->onstream) {
+ 		if (minor & 64) {
+ 			tape->tape_block_size = tape->stage_size = 32768 + 512;
+ 			tape->raw = 1;
+@@ -5566,16 +5623,42 @@ static int idetape_chrdev_open (struct i
+ 		}
+                 idetape_onstream_mode_sense_tape_parameter_page(drive, tape->debug_level);
+ 	}
+-	if (idetape_wait_ready(drive, 60 * HZ)) {
++	retval = idetape_wait_ready(drive, 60 * HZ);
++	if (retval) {
+ 		clear_bit(IDETAPE_BUSY, &tape->flags);
+ 		printk(KERN_ERR "ide-tape: %s: drive not ready\n", tape->name);
+-		return -EBUSY;
++		return retval;
+ 	}
+-	if (tape->onstream)
+-		idetape_read_position(drive);
++
++	idetape_read_position(drive);
++	if (!test_bit(IDETAPE_ADDRESS_VALID, &tape->flags))
++		(void)idetape_rewind_tape(drive);
++
+ 	if (tape->chrdev_direction != idetape_direction_read)
+ 		clear_bit(IDETAPE_PIPELINE_ERROR, &tape->flags);
+ 
++	/* Read block size and write protect status from drive. */
++	idetape_get_blocksize_from_block_descriptor(drive);
++
++	/* Set write protect flag if device is opened as read-only. */
++	if ((filp->f_flags & O_ACCMODE) == O_RDONLY)
++		tape->write_prot = 1;
++	else
++		tape->write_prot = tape->drv_write_prot;
++
++	/* Make sure drive isn't write protected if user wants to write. */
++	if (tape->write_prot) {
++		if ((filp->f_flags & O_ACCMODE) == O_WRONLY ||
++		    (filp->f_flags & O_ACCMODE) == O_RDWR) {
++			clear_bit(IDETAPE_BUSY, &tape->flags);
++			return -EROFS;
++		}
++	}
++
++	/*
++	 * Lock the tape drive door so user can't eject.
++	 * Analyze headers for OnStream drives.
++	 */
+ 	if (tape->chrdev_direction == idetape_direction_none) {
+ 		if (idetape_create_prevent_cmd(drive, &pc, 1)) {
+ 			if (!idetape_queue_pc_tail(drive, &pc)) {
+@@ -5638,7 +5721,7 @@ static int idetape_chrdev_release (struc
+ 		__idetape_kfree_stage(tape->cache_stage);
+ 		tape->cache_stage = NULL;
+ 	}
+-	if (minor < 128)
++	if (minor < 128 && test_bit(IDETAPE_MEDIUM_PRESENT, &tape->flags))
+ 		(void) idetape_rewind_tape(drive);
+ 	if (tape->chrdev_direction == idetape_direction_none) {
+ 		if (tape->door_locked == DOOR_LOCKED) {
+@@ -6059,6 +6142,8 @@ static void idetape_get_blocksize_from_b
+ 	header = (idetape_mode_parameter_header_t *) pc.buffer;
+ 	block_descrp = (idetape_parameter_block_descriptor_t *) (pc.buffer + sizeof(idetape_mode_parameter_header_t));
+ 	tape->tape_block_size =( block_descrp->length[0]<<16) + (block_descrp->length[1]<<8) + block_descrp->length[2];
++	tape->drv_write_prot = (header->dsp & 0x80) >> 7;
++
+ #if IDETAPE_DEBUG_INFO
+ 	printk(KERN_INFO "ide-tape: Adjusted block size - %d\n", tape->tape_block_size);
+ #endif /* IDETAPE_DEBUG_INFO */
+@@ -6139,6 +6224,9 @@ static void idetape_setup (ide_drive_t *
+ 		}
+ 	}
+ #endif /* CONFIG_BLK_DEV_IDEPCI */
++	/* Seagate Travan drives do not support DSC overlap. */
++	if (strstr(drive->id->model, "Seagate STT3401"))
++		drive->dsc_overlap = 0;
+ 	tape->drive = drive;
+ 	tape->minor = minor;
+ 	tape->name[0] = 'h';
+@@ -6306,24 +6394,23 @@ static struct file_operations idetape_fo
+ 	.release	= idetape_chrdev_release,
+ };
+ 
+-static int idetape_open(struct inode *inode, struct file *filp)
++static int idetape_open(struct block_device *bdev, struct file *filp)
+ {
+-	ide_drive_t *drive = inode->i_bdev->bd_disk->private_data;
++	ide_drive_t *drive = bdev->bd_disk->private_data;
+ 	drive->usage++;
+ 	return 0;
+ }
+ 
+-static int idetape_release(struct inode *inode, struct file *filp)
++static int idetape_release(struct gendisk *disk)
+ {
+-	ide_drive_t *drive = inode->i_bdev->bd_disk->private_data;
++	ide_drive_t *drive = disk->private_data;
+ 	drive->usage--;
+ 	return 0;
+ }
+ 
+-static int idetape_ioctl(struct inode *inode, struct file *file,
++static int idetape_ioctl(struct block_device *bdev, struct file *file,
+ 			unsigned int cmd, unsigned long arg)
+ {
+-	struct block_device *bdev = inode->i_bdev;
+ 	ide_drive_t *drive = bdev->bd_disk->private_data;
+ 	int err = generic_ide_ioctl(bdev, cmd, arg);
+ 	if (err == -EINVAL)
+--- linux-2.6.0/drivers/ide/Kconfig	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/ide/Kconfig	2003-12-28 23:21:46.000000000 -0800
+@@ -745,6 +745,14 @@ config BLK_DEV_SVWKS
+ 	  This driver adds PIO/(U)DMA support for the ServerWorks OSB4/CSB5
+ 	  chipsets.
+ 
++config BLK_DEV_SGIIOC4
++	tristate "Silicon Graphics IOC4 chipset support"
++	depends on IA64_SGI_SN2
++	help
++	  This driver adds PIO & MultiMode DMA-2 support for the SGI IOC4
++	  chipset, which has one channel and can support two devices.
++	  Please say Y here if you have an Altix System from SGI.
++
+ config BLK_DEV_SIIMAGE
+ 	tristate "Silicon Image chipset support"
+ 	help
+--- linux-2.6.0/drivers/ide/legacy/hd98.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/ide/legacy/hd98.c	2003-12-28 23:21:12.000000000 -0800
+@@ -652,10 +652,10 @@ static void do_hd_request (request_queue
+ 	enable_irq(HD_IRQ);
+ }
+ 
+-static int hd_ioctl(struct inode * inode, struct file * file,
++static int hd_ioctl(struct block_device *bdev, struct file *file,
+ 	unsigned int cmd, unsigned long arg)
+ {
+-	struct hd_i_struct *disk = inode->i_bdev->bd_disk->private_data;
++	struct hd_i_struct *disk = bdev->bd_disk->private_data;
+ 	struct hd_geometry *loc = (struct hd_geometry *) arg;
+ 	struct hd_geometry g; 
+ 
+@@ -666,7 +666,7 @@ static int hd_ioctl(struct inode * inode
+ 	g.heads = disk->head;
+ 	g.sectors = disk->sect;
+ 	g.cylinders = disk->cyl;
+-	g.start = get_start_sect(inode->i_bdev);
++	g.start = get_start_sect(bdev);
+ 	return copy_to_user(loc, &g, sizeof g) ? -EFAULT : 0; 
+ }
+ 
+--- linux-2.6.0/drivers/ide/legacy/hd.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/ide/legacy/hd.c	2003-12-28 23:21:12.000000000 -0800
+@@ -656,10 +656,10 @@ static void do_hd_request (request_queue
+ 	enable_irq(HD_IRQ);
+ }
+ 
+-static int hd_ioctl(struct inode * inode, struct file * file,
++static int hd_ioctl(struct block_device *bdev, struct file *file,
+ 	unsigned int cmd, unsigned long arg)
+ {
+-	struct hd_i_struct *disk = inode->i_bdev->bd_disk->private_data;
++	struct hd_i_struct *disk = bdev->bd_disk->private_data;
+ 	struct hd_geometry *loc = (struct hd_geometry *) arg;
+ 	struct hd_geometry g; 
+ 
+@@ -670,7 +670,7 @@ static int hd_ioctl(struct inode * inode
+ 	g.heads = disk->head;
+ 	g.sectors = disk->sect;
+ 	g.cylinders = disk->cyl;
+-	g.start = get_start_sect(inode->i_bdev);
++	g.start = get_start_sect(bdev);
+ 	return copy_to_user(loc, &g, sizeof g) ? -EFAULT : 0; 
+ }
+ 
+--- linux-2.6.0/drivers/ide/legacy/ide-cs.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/drivers/ide/legacy/ide-cs.c	2003-12-28 23:22:53.000000000 -0800
+@@ -152,7 +152,7 @@ static dev_link_t *ide_attach(void)
+     client_reg.event_handler = &ide_event;
+     client_reg.Version = 0x0210;
+     client_reg.event_callback_args.client_data = link;
+-    ret = CardServices(RegisterClient, &link->handle, &client_reg);
++    ret = pcmcia_register_client(&link->handle, &client_reg);
+     if (ret != CS_SUCCESS) {
+ 	cs_error(link->handle, RegisterClient, ret);
+ 	ide_detach(link);
+@@ -188,7 +188,7 @@ static void ide_detach(dev_link_t *link)
+ 	ide_release(link);
+     
+     if (link->handle) {
+-	ret = CardServices(DeregisterClient, link->handle);
++	ret = pcmcia_deregister_client(link->handle);
+ 	if (ret != CS_SUCCESS)
+ 	    cs_error(link->handle, DeregisterClient, ret);
+     }
+@@ -207,11 +207,8 @@ static void ide_detach(dev_link_t *link)
+ 
+ ======================================================================*/
+ 
+-#define CS_CHECK(fn, args...) \
+-while ((last_ret=CardServices(last_fn=(fn), args))!=0) goto cs_failed
+-
+-#define CFG_CHECK(fn, args...) \
+-if (CardServices(fn, args) != 0) goto next_entry
++#define CS_CHECK(fn, ret) \
++do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+ 
+ static int idecs_register(unsigned long io, unsigned long ctl, unsigned long irq)
+ {
+@@ -241,16 +238,16 @@ void ide_config(dev_link_t *link)
+     tuple.TupleOffset = 0; tuple.TupleDataMax = 255;
+     tuple.Attributes = 0;
+     tuple.DesiredTuple = CISTPL_CONFIG;
+-    CS_CHECK(GetFirstTuple, handle, &tuple);
+-    CS_CHECK(GetTupleData, handle, &tuple);
+-    CS_CHECK(ParseTuple, handle, &tuple, &parse);
++    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
++    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
++    CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+     link->conf.ConfigBase = parse.config.base;
+     link->conf.Present = parse.config.rmask[0];
+ 
+     tuple.DesiredTuple = CISTPL_MANFID;
+-    if (!CardServices(GetFirstTuple, handle, &tuple) &&
+-	!CardServices(GetTupleData, handle, &tuple) &&
+-	!CardServices(ParseTuple, handle, &tuple, &parse))
++    if (!pcmcia_get_first_tuple(handle, &tuple) &&
++	!pcmcia_get_tuple_data(handle, &tuple) &&
++	!pcmcia_parse_tuple(handle, &tuple, &parse))
+ 	is_kme = ((parse.manfid.manf == MANFID_KME) &&
+ 		  ((parse.manfid.card == PRODID_KME_KXLC005_A) ||
+ 		   (parse.manfid.card == PRODID_KME_KXLC005_B)));
+@@ -259,16 +256,16 @@ void ide_config(dev_link_t *link)
+     link->state |= DEV_CONFIG;
+ 
+     /* Not sure if this is right... look up the current Vcc */
+-    CS_CHECK(GetConfigurationInfo, handle, &conf);
++    CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(handle, &conf));
+     link->conf.Vcc = conf.Vcc;
+     
+     pass = io_base = ctl_base = 0;
+     tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+     tuple.Attributes = 0;
+-    CS_CHECK(GetFirstTuple, handle, &tuple);
++    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+     while (1) {
+-	CFG_CHECK(GetTupleData, handle, &tuple);
+-	CFG_CHECK(ParseTuple, handle, &tuple, &parse);
++    	if (pcmcia_get_tuple_data(handle, &tuple) != 0) goto next_entry;
++	if (pcmcia_parse_tuple(handle, &tuple, &parse) != 0) goto next_entry;
+ 
+ 	/* Check for matching Vcc, unless we're desperate */
+ 	if (!pass) {
+@@ -299,13 +296,15 @@ void ide_config(dev_link_t *link)
+ 		link->io.NumPorts1 = 8;
+ 		link->io.BasePort2 = io->win[1].base;
+ 		link->io.NumPorts2 = (is_kme) ? 2 : 1;
+-		CFG_CHECK(RequestIO, link->handle, &link->io);
++		if (pcmcia_request_io(link->handle, &link->io) != 0)
++			goto next_entry;
+ 		io_base = link->io.BasePort1;
+ 		ctl_base = link->io.BasePort2;
+ 	    } else if ((io->nwin == 1) && (io->win[0].len >= 16)) {
+ 		link->io.NumPorts1 = io->win[0].len;
+ 		link->io.NumPorts2 = 0;
+-		CFG_CHECK(RequestIO, link->handle, &link->io);
++		if (pcmcia_request_io(link->handle, &link->io) != 0)
++			goto next_entry;
+ 		io_base = link->io.BasePort1;
+ 		ctl_base = link->io.BasePort1+0x0e;
+ 	    } else goto next_entry;
+@@ -316,16 +315,16 @@ void ide_config(dev_link_t *link)
+     next_entry:
+ 	if (cfg->flags & CISTPL_CFTABLE_DEFAULT) dflt = *cfg;
+ 	if (pass) {
+-	    CS_CHECK(GetNextTuple, handle, &tuple);
+-	} else if (CardServices(GetNextTuple, handle, &tuple) != 0) {
+-	    CS_CHECK(GetFirstTuple, handle, &tuple);
++	    CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(handle, &tuple));
++	} else if (pcmcia_get_next_tuple(handle, &tuple) != 0) {
++	    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+ 	    memset(&dflt, 0, sizeof(dflt));
+ 	    pass++;
+ 	}
+     }
+     
+-    CS_CHECK(RequestIRQ, handle, &link->irq);
+-    CS_CHECK(RequestConfiguration, handle, &link->conf);
++    CS_CHECK(RequestIRQ, pcmcia_request_irq(handle, &link->irq));
++    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(handle, &link->conf));
+ 
+     /* deal with brain dead IDE resource management */
+     release_region(link->io.BasePort1, link->io.NumPorts1);
+@@ -413,9 +412,9 @@ void ide_release(dev_link_t *link)
+     info->ndev = 0;
+     link->dev = NULL;
+     
+-    CardServices(ReleaseConfiguration, link->handle);
+-    CardServices(ReleaseIO, link->handle, &link->io);
+-    CardServices(ReleaseIRQ, link->handle, &link->irq);
++    pcmcia_release_configuration(link->handle);
++    pcmcia_release_io(link->handle, &link->io);
++    pcmcia_release_irq(link->handle, &link->irq);
+     
+     link->state &= ~DEV_CONFIG;
+ 
+@@ -452,14 +451,14 @@ int ide_event(event_t event, int priorit
+ 	/* Fall through... */
+     case CS_EVENT_RESET_PHYSICAL:
+ 	if (link->state & DEV_CONFIG)
+-	    CardServices(ReleaseConfiguration, link->handle);
++	    pcmcia_release_configuration(link->handle);
+ 	break;
+     case CS_EVENT_PM_RESUME:
+ 	link->state &= ~DEV_SUSPEND;
+ 	/* Fall through... */
+     case CS_EVENT_CARD_RESET:
+ 	if (DEV_OK(link))
+-	    CardServices(RequestConfiguration, link->handle, &link->conf);
++	    pcmcia_request_configuration(link->handle, &link->conf);
+ 	break;
+     }
+     return 0;
+--- linux-2.6.0/drivers/ide/pci/cmd640.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ide/pci/cmd640.c	2003-12-28 23:26:28.000000000 -0800
+@@ -213,13 +213,13 @@ static unsigned int cmd640_chip_version;
+ 
+ static void put_cmd640_reg_pci1 (u16 reg, u8 val)
+ {
+-	outb_p((reg & 0xfc) | cmd640_key, 0xcf8);
++	outl_p((reg & 0xfc) | cmd640_key, 0xcf8);
+ 	outb_p(val, (reg & 3) | 0xcfc);
+ }
+ 
+ static u8 get_cmd640_reg_pci1 (u16 reg)
+ {
+-	outb_p((reg & 0xfc) | cmd640_key, 0xcf8);
++	outl_p((reg & 0xfc) | cmd640_key, 0xcf8);
+ 	return inb_p((reg & 3) | 0xcfc);
+ }
+ 
+--- linux-2.6.0/drivers/ide/pci/Makefile	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/ide/pci/Makefile	2003-12-28 23:21:46.000000000 -0800
+@@ -21,6 +21,7 @@ obj-$(CONFIG_BLK_DEV_PDC202XX_NEW)	+= pd
+ obj-$(CONFIG_BLK_DEV_PIIX)		+= piix.o
+ obj-$(CONFIG_BLK_DEV_RZ1000)		+= rz1000.o
+ obj-$(CONFIG_BLK_DEV_SVWKS)		+= serverworks.o
++obj-$(CONFIG_BLK_DEV_SGIIOC4)		+= sgiioc4.o
+ obj-$(CONFIG_BLK_DEV_SIIMAGE)		+= siimage.o
+ obj-$(CONFIG_BLK_DEV_SIS5513)		+= sis5513.o
+ obj-$(CONFIG_BLK_DEV_SL82C105)		+= sl82c105.o
+--- linux-2.6.0/drivers/ide/pci/pdc202xx_new.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/ide/pci/pdc202xx_new.c	2003-12-28 23:26:29.000000000 -0800
+@@ -36,60 +36,20 @@
+ 
+ #define PDC202_DEBUG_CABLE	0
+ 
+-#if defined(DISPLAY_PDC202XX_TIMINGS) && defined(CONFIG_PROC_FS)
+-#include <linux/stat.h>
+-#include <linux/proc_fs.h>
+-
+-static u8 pdcnew_proc = 0;
+-#define PDC202_MAX_DEVS		5
+-static struct pci_dev *pdc202_devs[PDC202_MAX_DEVS];
+-static int n_pdc202_devs;
+-
+-static char * pdcnew_info(char *buf, struct pci_dev *dev)
+-{
+-	char *p = buf;
+-
+-	p += sprintf(p, "\n                                ");
+-	switch(dev->device) {
+-		case PCI_DEVICE_ID_PROMISE_20277:
+-			p += sprintf(p, "SBFastTrak 133 Lite"); break;
+-		case PCI_DEVICE_ID_PROMISE_20276:
+-			p += sprintf(p, "MBFastTrak 133 Lite"); break;
+-		case PCI_DEVICE_ID_PROMISE_20275:
+-			p += sprintf(p, "MBUltra133"); break;
+-		case PCI_DEVICE_ID_PROMISE_20271:
+-			p += sprintf(p, "FastTrak TX2000"); break;
+-		case PCI_DEVICE_ID_PROMISE_20270:
+-			p += sprintf(p, "FastTrak LP/TX2/TX4"); break;
+-		case PCI_DEVICE_ID_PROMISE_20269:
+-			p += sprintf(p, "Ultra133 TX2"); break;
+-		case PCI_DEVICE_ID_PROMISE_20268:
+-			p += sprintf(p, "Ultra100 TX2"); break;
+-		default:
+-			p += sprintf(p, "Ultra series"); break;
+-			break;
+-	}
+-	p += sprintf(p, " Chipset.\n");
+-	return (char *)p;
+-}
+-
+-static int pdcnew_get_info (char *buffer, char **addr, off_t offset, int count)
+-{
+-	char *p = buffer;
+-	int i, len;
+-
+-	for (i = 0; i < n_pdc202_devs; i++) {
+-		struct pci_dev *dev	= pdc202_devs[i];
+-		p = pdcnew_info(buffer, dev);
+-	}
+-	/* p - buffer must be less than 4k! */
+-	len = (p - buffer) - offset;
+-	*addr = buffer + offset;
+-	
+-	return len > count ? count : len;
+-}
+-#endif  /* defined(DISPLAY_PDC202XX_TIMINGS) && defined(CONFIG_PROC_FS) */
++struct pdcnew_name {
++	u16 dev_id;
++	const char *name;
++};
+ 
++static struct pdcnew_name __initdata pdcnew_names[] = {
++	{ PCI_DEVICE_ID_PROMISE_20277, "SBFastTrak 133 Lite" },
++	{ PCI_DEVICE_ID_PROMISE_20276, "MBFastTrak 133 Lite" },
++	{ PCI_DEVICE_ID_PROMISE_20275, "MBUltra133", },
++	{ PCI_DEVICE_ID_PROMISE_20271, "FastTrak TX2000", },
++	{ PCI_DEVICE_ID_PROMISE_20270, "FastTrak LP/TX2/TX4", },
++	{ PCI_DEVICE_ID_PROMISE_20269, "Ultra133 TX2" },
++	{ PCI_DEVICE_ID_PROMISE_20268, "Ultra100 TX2" },
++};
+ 
+ static u8 pdcnew_ratemask (ide_drive_t *drive)
+ {
+@@ -515,6 +475,15 @@ void pdcnew_reset (ide_drive_t *drive)
+ 
+ static unsigned int __init init_chipset_pdcnew (struct pci_dev *dev, const char *name)
+ {
++	unsigned int i;
++
++	for (i = 0; i < ARRAY_SIZE(pdcnew_names); i++)
++		if (pdcnew_names[i].dev_id == dev->device) {
++			printk(KERN_INFO "%s: %s on pci%s\n", name,
++					 pdcnew_names[i].name, pci_name(dev));
++			break;
++		}
++
+ 	if (dev->resource[PCI_ROM_RESOURCE].start) {
+ 		pci_write_config_dword(dev, PCI_ROM_ADDRESS,
+ 			dev->resource[PCI_ROM_RESOURCE].start | PCI_ROM_ADDRESS_ENABLE);
+@@ -522,15 +491,6 @@ static unsigned int __init init_chipset_
+ 			name, dev->resource[PCI_ROM_RESOURCE].start);
+ 	}
+ 
+-#if defined(DISPLAY_PDC202XX_TIMINGS) && defined(CONFIG_PROC_FS)
+-	pdc202_devs[n_pdc202_devs++] = dev;
+-
+-	if (!pdcnew_proc) {
+-		pdcnew_proc = 1;
+-		ide_pci_register_host_proc(&pdcnew_procs[0]);
+-	}
+-#endif /* DISPLAY_PDC202XX_TIMINGS && CONFIG_PROC_FS */
+-
+ 	return dev->irq;
+ }
+ 
+--- linux-2.6.0/drivers/ide/pci/pdc202xx_new.h	2003-10-08 15:07:08.000000000 -0700
++++ 25/drivers/ide/pci/pdc202xx_new.h	2003-12-28 23:26:29.000000000 -0800
+@@ -5,8 +5,6 @@
+ #include <linux/pci.h>
+ #include <linux/ide.h>
+ 
+-#define DISPLAY_PDC202XX_TIMINGS
+-
+ #ifndef SPLIT_BYTE
+ #define SPLIT_BYTE(B,H,L)	((H)=(B>>4), (L)=(B-((B>>4)<<4)))
+ #endif
+@@ -162,27 +160,6 @@ static void decode_registers (u8 registe
+ 		set_2regs(0x13,(c));			\
+ 	} while(0)
+ 
+-#define DISPLAY_PDC202XX_TIMINGS
+-
+-#if defined(DISPLAY_PDC202XX_TIMINGS) && defined(CONFIG_PROC_FS)
+-#include <linux/stat.h>
+-#include <linux/proc_fs.h>
+-
+-static u8 pdcnew_proc;
+-
+-static int pdcnew_get_info(char *, char **, off_t, int);
+-
+-static ide_pci_host_proc_t pdcnew_procs[] __initdata = {
+-	{
+-		.name		= "pdcnew",
+-		.set		= 1,
+-		.get_info	= pdcnew_get_info,
+-		.parent		= NULL,
+-	},
+-};
+-#endif /* DISPLAY_PDC202XX_TIMINGS && CONFIG_PROC_FS */
+-
+-
+ static void init_setup_pdcnew(struct pci_dev *, ide_pci_device_t *);
+ static void init_setup_pdc20270(struct pci_dev *, ide_pci_device_t *);
+ static void init_setup_pdc20276(struct pci_dev *dev, ide_pci_device_t *d);
+--- linux-2.6.0/drivers/ide/pci/pdc202xx_old.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/ide/pci/pdc202xx_old.c	2003-12-28 23:26:28.000000000 -0800
+@@ -361,16 +361,38 @@ static u8 pdc202xx_old_cable_detect (ide
+ 	return ((u8)(CIS & mask));
+ }
+ 
++/*
++ * Set the control register to use the 66MHz system
++ * clock for UDMA 3/4/5 mode operation when necessary.
++ *
++ * It may also be possible to leave the 66MHz clock on
++ * and readjust the timing parameters.
++ */
++static void pdc_old_enable_66MHz_clock(ide_hwif_t *hwif)
++{
++	unsigned long clock_reg = hwif->dma_master + 0x11;
++	u8 clock = hwif->INB(clock_reg);
++
++	hwif->OUTB(clock | (hwif->channel ? 0x08 : 0x02), clock_reg);
++}
++
++static void pdc_old_disable_66MHz_clock(ide_hwif_t *hwif)
++{
++	unsigned long clock_reg = hwif->dma_master + 0x11;
++	u8 clock = hwif->INB(clock_reg);
++
++	hwif->OUTB(clock & ~(hwif->channel ? 0x08 : 0x02), clock_reg);
++}
++
+ static int config_chipset_for_dma (ide_drive_t *drive)
+ {
+ 	struct hd_driveid *id	= drive->id;
+ 	ide_hwif_t *hwif	= HWIF(drive);
+ 	struct pci_dev *dev	= hwif->pci_dev;
+ 	u32 drive_conf		= 0;
+-	u8 mask			= hwif->channel ? 0x08 : 0x02;
+ 	u8 drive_pci		= 0x60 + (drive->dn << 2);
+ 	u8 test1 = 0, test2 = 0, speed = -1;
+-	u8 AP = 0, CLKSPD = 0, cable = 0;
++	u8 AP = 0, cable = 0;
+ 
+ 	u8 ultra_66		= ((id->dma_ultra & 0x0010) ||
+ 				   (id->dma_ultra & 0x0008)) ? 1 : 0;
+@@ -394,21 +416,6 @@ static int config_chipset_for_dma (ide_d
+ 			BUG();
+ 	}
+ 
+-	CLKSPD = hwif->INB(hwif->dma_master + 0x11);
+-
+-	/*
+-	 * Set the control register to use the 66Mhz system
+-	 * clock for UDMA 3/4 mode operation. If one drive on
+-	 * a channel is U66 capable but the other isn't we
+-	 * fall back to U33 mode. The BIOS INT 13 hooks turn
+-	 * the clock on then off for each read/write issued. I don't
+-	 * do that here because it would require modifying the
+-	 * kernel, separating the fop routines from the kernel or
+-	 * somehow hooking the fops calls. It may also be possible to
+-	 * leave the 66Mhz clock on and readjust the timing
+-	 * parameters.
+-	 */
+-
+ 	if ((ultra_66) && (cable)) {
+ #ifdef DEBUG
+ 		printk(KERN_DEBUG "ULTRA 66/100/133: %s channel of Ultra 66/100/133 "
+@@ -416,29 +423,12 @@ static int config_chipset_for_dma (ide_d
+ 			hwif->channel ? "Secondary" : "Primary");
+ 		printk(KERN_DEBUG "         Switching to Ultra33 mode.\n");
+ #endif /* DEBUG */
+-		/* Primary   : zero out second bit */
+-		/* Secondary : zero out fourth bit */
+-		hwif->OUTB(CLKSPD & ~mask, (hwif->dma_master + 0x11));
+ 		printk(KERN_WARNING "Warning: %s channel requires an 80-pin cable for operation.\n", hwif->channel ? "Secondary":"Primary");
+ 		printk(KERN_WARNING "%s reduced to Ultra33 mode.\n", drive->name);
+-	} else {
+-		if (ultra_66) {
+-			/*
+-			 * check to make sure drive on same channel
+-			 * is u66 capable
+-			 */
+-			if (hwif->drives[!(drive->dn%2)].id) {
+-				if (hwif->drives[!(drive->dn%2)].id->dma_ultra & 0x0078) {
+-					hwif->OUTB(CLKSPD | mask, (hwif->dma_master + 0x11));
+-				} else {
+-					hwif->OUTB(CLKSPD & ~mask, (hwif->dma_master + 0x11));
+-				}
+-			} else { /* udma4 drive by itself */
+-				hwif->OUTB(CLKSPD | mask, (hwif->dma_master + 0x11));
+-			}
+-		}
+ 	}
+ 
++	pdc_old_disable_66MHz_clock(drive->hwif);
++
+ 	drive_pci = 0x60 + (drive->dn << 2);
+ 	pci_read_config_dword(dev, drive_pci, &drive_conf);
+ 	if ((drive_conf != 0x004ff304) && (drive_conf != 0x004ff3c4))
+@@ -536,6 +526,8 @@ static int pdc202xx_quirkproc (ide_drive
+ 
+ static int pdc202xx_old_ide_dma_begin(ide_drive_t *drive)
+ {
++	if (drive->current_speed > XFER_UDMA_2)
++		pdc_old_enable_66MHz_clock(drive->hwif);
+ 	if (drive->addressing == 1) {
+ 		struct request *rq	= HWGROUP(drive)->rq;
+ 		ide_hwif_t *hwif	= HWIF(drive);
+@@ -569,6 +561,8 @@ static int pdc202xx_old_ide_dma_end(ide_
+ 		clock = hwif->INB(high_16 + 0x11);
+ 		hwif->OUTB(clock & ~(hwif->channel ? 0x08:0x02), high_16+0x11);
+ 	}
++	if (drive->current_speed > XFER_UDMA_2)
++		pdc_old_disable_66MHz_clock(drive->hwif);
+ 	return __ide_dma_end(drive);
+ }
+ 
+@@ -757,10 +751,7 @@ static void __init init_hwif_pdc202xx (i
+ 
+ 	hwif->speedproc = &pdc202xx_tune_chipset;
+ 
+-	if (!hwif->dma_base) {
+-		hwif->drives[0].autotune = hwif->drives[1].autotune = 1;
+-		return;
+-	}
++	hwif->drives[0].autotune = hwif->drives[1].autotune = 1;
+ 
+ 	hwif->ultra_mask = 0x3f;
+ 	hwif->mwdma_mask = 0x07;
+--- linux-2.6.0/drivers/ide/pci/piix.c	2003-10-25 14:45:44.000000000 -0700
++++ 25/drivers/ide/pci/piix.c	2003-12-28 23:22:14.000000000 -0800
+@@ -768,8 +768,8 @@ static void __init piix_check_450nx(void
+ 		/* Only on the original revision: IDE DMA can hang */
+ 		if(rev == 0x00)
+ 			no_piix_dma = 1;
+-		/* On all revisions PXB bus lock must be disabled for IDE */
+-		else if(cfg & (1<<14))
++		/* On all revisions below 5 PXB bus lock must be disabled for IDE */
++		else if(cfg & (1<<14) && rev < 5)
+ 			no_piix_dma = 2;
+ 	}
+ 	if(no_piix_dma)
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/ide/pci/sgiioc4.c	2003-12-28 23:21:46.000000000 -0800
+@@ -0,0 +1,833 @@
++/*
++ * Copyright (c) 2003 Silicon Graphics, Inc.  All Rights Reserved.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of version 2 of the GNU General Public License
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it would be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++ *
++ * You should have received a copy of the GNU General Public
++ * License along with this program; if not, write the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
++ *
++ * Contact information:  Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
++ * Mountain View, CA  94043, or:
++ *
++ * http://www.sgi.com
++ *
++ * For further information regarding this notice, see:
++ *
++ * http://oss.sgi.com/projects/GenInfo/NoticeExplan
++ */
++
++#include <linux/config.h>
++#include <linux/module.h>
++#include <linux/types.h>
++#include <linux/pci.h>
++#include <linux/delay.h>
++#include <linux/hdreg.h>
++#include <linux/init.h>
++#include <linux/kernel.h>
++#include <linux/timer.h>
++#include <linux/mm.h>
++#include <linux/ioport.h>
++#include <linux/blkdev.h>
++#include <asm/io.h>
++
++#include <linux/ide.h>
++
++/* IOC4 Specific Definitions */
++#define IOC4_CMD_OFFSET		0x100
++#define IOC4_CTRL_OFFSET	0x120
++#define IOC4_DMA_OFFSET		0x140
++#define IOC4_INTR_OFFSET	0x0
++
++#define IOC4_TIMING		0x00
++#define IOC4_DMA_PTR_L		0x01
++#define IOC4_DMA_PTR_H		0x02
++#define IOC4_DMA_ADDR_L		0x03
++#define IOC4_DMA_ADDR_H		0x04
++#define IOC4_BC_DEV		0x05
++#define IOC4_BC_MEM		0x06
++#define	IOC4_DMA_CTRL		0x07
++#define	IOC4_DMA_END_ADDR	0x08
++
++/* Bits in the IOC4 Control/Status Register */
++#define	IOC4_S_DMA_START	0x01
++#define	IOC4_S_DMA_STOP		0x02
++#define	IOC4_S_DMA_DIR		0x04
++#define	IOC4_S_DMA_ACTIVE	0x08
++#define	IOC4_S_DMA_ERROR	0x10
++#define	IOC4_ATA_MEMERR		0x02
++
++/* Read/Write Directions */
++#define	IOC4_DMA_WRITE		0x04
++#define	IOC4_DMA_READ		0x00
++
++/* Interrupt Register Offsets */
++#define IOC4_INTR_REG		0x03
++#define	IOC4_INTR_SET		0x05
++#define	IOC4_INTR_CLEAR		0x07
++
++#define IOC4_IDE_CACHELINE_SIZE	128
++#define IOC4_CMD_CTL_BLK_SIZE	0x20
++#define IOC4_SUPPORTED_FIRMWARE_REV 46
++
++typedef struct {
++	u32 timing_reg0;
++	u32 timing_reg1;
++	u32 low_mem_ptr;
++	u32 high_mem_ptr;
++	u32 low_mem_addr;
++	u32 high_mem_addr;
++	u32 dev_byte_count;
++	u32 mem_byte_count;
++	u32 status;
++} ioc4_dma_regs_t;
++
++/* Each Physical Region Descriptor Entry size is 16 bytes (2 * 64 bits) */
++/* IOC4 has only 1 IDE channel */
++#define IOC4_PRD_BYTES       16
++#define IOC4_PRD_ENTRIES     (PAGE_SIZE /(4*IOC4_PRD_BYTES))
++
++
++static void
++sgiioc4_init_hwif_ports(hw_regs_t * hw, unsigned long data_port,
++			unsigned long ctrl_port, unsigned long irq_port)
++{
++	unsigned long reg = data_port;
++	int i;
++
++	/* Registers are word (32 bit) aligned */
++	for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++)
++		hw->io_ports[i] = reg + i * 4;
++
++	if (ctrl_port)
++		hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port;
++
++	if (irq_port)
++		hw->io_ports[IDE_IRQ_OFFSET] = irq_port;
++}
++
++static void
++sgiioc4_maskproc(ide_drive_t * drive, int mask)
++{
++	ide_hwif_t *hwif = HWIF(drive);
++	hwif->OUTB(mask ? (drive->ctl | 2) : (drive->ctl & ~2),
++		   IDE_CONTROL_REG);
++}
++
++
++static int
++sgiioc4_checkirq(ide_hwif_t * hwif)
++{
++	u8 intr_reg =
++	    hwif->INL(hwif->io_ports[IDE_IRQ_OFFSET] + IOC4_INTR_REG * 4);
++
++	if (intr_reg & 0x03)
++		return 1;
++
++	return 0;
++}
++
++
++static int
++sgiioc4_clearirq(ide_drive_t * drive)
++{
++	u32 intr_reg;
++	ide_hwif_t *hwif = HWIF(drive);
++	unsigned long other_ir =
++	    hwif->io_ports[IDE_IRQ_OFFSET] + (IOC4_INTR_REG << 2);
++
++	/* Code to check for PCI error conditions */
++	intr_reg = hwif->INL(other_ir);
++	if (intr_reg & 0x03) { /* Valid IOC4-IDE interrupt */
++		/*
++		 * Using hwif->INB to read the IDE_STATUS_REG has a side effect
++		 * of clearing the interrupt.  The first read should clear it
++		 * if it is set.  The second read should return a "clear" status
++		 * if it got cleared.  If not, then spin for a bit trying to
++		 * clear it.
++		 */
++		u8 stat = hwif->INB(IDE_STATUS_REG);
++		int count = 0;
++		stat = hwif->INB(IDE_STATUS_REG);
++		while ((stat & 0x80) && (count++ < 100)) {
++			udelay(1);
++			stat = hwif->INB(IDE_STATUS_REG);
++		}
++
++		if (intr_reg & 0x02) {
++			/* Error when transferring DMA data on PCI bus */
++			u32 pci_err_addr_low, pci_err_addr_high,
++			    pci_stat_cmd_reg;
++
++			pci_err_addr_low =
++				hwif->INL(hwif->io_ports[IDE_IRQ_OFFSET]);
++			pci_err_addr_high =
++				hwif->INL(hwif->io_ports[IDE_IRQ_OFFSET] + 4);
++			pci_read_config_dword(hwif->pci_dev, PCI_COMMAND,
++					      &pci_stat_cmd_reg);
++			printk(KERN_ERR
++			       "%s(%s) : PCI Bus Error when doing DMA:"
++				   " status-cmd reg is 0x%x\n",
++			       __FUNCTION__, drive->name, pci_stat_cmd_reg);
++			printk(KERN_ERR
++			       "%s(%s) : PCI Error Address is 0x%x%x\n",
++			       __FUNCTION__, drive->name,
++			       pci_err_addr_high, pci_err_addr_low);
++			/* Clear the PCI Error indicator */
++			pci_write_config_dword(hwif->pci_dev, PCI_COMMAND,
++					       0x00000146);
++		}
++
++		/* Clear the Interrupt, Error bits on the IOC4 */
++		hwif->OUTL(0x03, other_ir);
++
++		intr_reg = hwif->INL(other_ir);
++	}
++
++	return intr_reg & 3;
++}
++
++static int
++sgiioc4_ide_dma_begin(ide_drive_t * drive)
++{
++	ide_hwif_t *hwif = HWIF(drive);
++	unsigned int reg = hwif->INL(hwif->dma_base + IOC4_DMA_CTRL * 4);
++	unsigned int temp_reg = reg | IOC4_S_DMA_START;
++
++	hwif->OUTL(temp_reg, hwif->dma_base + IOC4_DMA_CTRL * 4);
++
++	return 0;
++}
++
++static u32
++sgiioc4_ide_dma_stop(ide_hwif_t *hwif, u64 dma_base)
++{
++	u32	ioc4_dma;
++	int	count;
++
++	count = 0;
++	ioc4_dma = hwif->INL(dma_base + IOC4_DMA_CTRL * 4);
++	while ((ioc4_dma & IOC4_S_DMA_STOP) && (count++ < 200)) {
++		udelay(1);
++		ioc4_dma = hwif->INL(dma_base + IOC4_DMA_CTRL * 4);
++	}
++	return ioc4_dma;
++}
++
++/* Stops the IOC4 DMA Engine */
++static int
++sgiioc4_ide_dma_end(ide_drive_t * drive)
++{
++	u32 ioc4_dma, bc_dev, bc_mem, num, valid = 0, cnt = 0;
++	ide_hwif_t *hwif = HWIF(drive);
++	u64 dma_base = hwif->dma_base;
++	int dma_stat = 0;
++	unsigned long *ending_dma = (unsigned long *) hwif->dma_base2;
++
++	hwif->OUTL(IOC4_S_DMA_STOP, dma_base + IOC4_DMA_CTRL * 4);
++
++	ioc4_dma = sgiioc4_ide_dma_stop(hwif, dma_base);
++
++	if (ioc4_dma & IOC4_S_DMA_STOP) {
++		printk(KERN_ERR
++		       "%s(%s): IOC4 DMA STOP bit is still 1 :"
++		       "ioc4_dma_reg 0x%x\n",
++		       __FUNCTION__, drive->name, ioc4_dma);
++		dma_stat = 1;
++	}
++
++	/*
++	 * The IOC4 will DMA 1's to the ending dma area to indicate that
++	 * previous data DMA is complete.  This is necessary because of relaxed
++	 * ordering between register reads and DMA writes on the Altix.
++	 */
++	while ((cnt++ < 200) && (!valid)) {
++		for (num = 0; num < 16; num++) {
++			if (ending_dma[num]) {
++				valid = 1;
++				break;
++			}
++		}
++		udelay(1);
++	}
++	if (!valid) {
++		printk(KERN_ERR "%s(%s) : DMA incomplete\n", __FUNCTION__,
++		       drive->name);
++		dma_stat = 1;
++	}
++
++	bc_dev = hwif->INL(dma_base + IOC4_BC_DEV * 4);
++	bc_mem = hwif->INL(dma_base + IOC4_BC_MEM * 4);
++
++	if ((bc_dev & 0x01FF) || (bc_mem & 0x1FF)) {
++		if (bc_dev > bc_mem + 8) {
++			printk(KERN_ERR
++			       "%s(%s): WARNING!! byte_count_dev %d "
++			       "!= byte_count_mem %d\n",
++			       __FUNCTION__, drive->name, bc_dev, bc_mem);
++		}
++	}
++
++	drive->waiting_for_dma = 0;
++	ide_destroy_dmatable(drive);
++
++	return dma_stat;
++}
++
++static int
++sgiioc4_ide_dma_check(ide_drive_t * drive)
++{
++	if (ide_config_drive_speed(drive, XFER_MW_DMA_2) != 0) {
++		printk(KERN_INFO
++		       "Couldnot set %s in Multimode-2 DMA mode | "
++			   "Drive %s using PIO instead\n",
++		       drive->name, drive->name);
++		drive->using_dma = 0;
++	} else
++		drive->using_dma = 1;
++
++	return 0;
++}
++
++static int
++sgiioc4_ide_dma_on(ide_drive_t * drive)
++{
++	drive->using_dma = 1;
++
++	return HWIF(drive)->ide_dma_host_on(drive);
++}
++
++static int
++sgiioc4_ide_dma_off(ide_drive_t * drive)
++{
++	printk(KERN_INFO "%s: DMA disabled\n", drive->name);
++
++	return HWIF(drive)->ide_dma_off_quietly(drive);
++}
++
++static int
++sgiioc4_ide_dma_off_quietly(ide_drive_t * drive)
++{
++	drive->using_dma = 0;
++
++	return HWIF(drive)->ide_dma_host_off(drive);
++}
++
++/* returns 1 if dma irq issued, 0 otherwise */
++static int
++sgiioc4_ide_dma_test_irq(ide_drive_t * drive)
++{
++	return sgiioc4_checkirq(HWIF(drive));
++}
++
++static int
++sgiioc4_ide_dma_host_on(ide_drive_t * drive)
++{
++	if (drive->using_dma)
++		return 0;
++
++	return 1;
++}
++
++static int
++sgiioc4_ide_dma_host_off(ide_drive_t * drive)
++{
++	sgiioc4_clearirq(drive);
++
++	return 0;
++}
++
++static int
++sgiioc4_ide_dma_verbose(ide_drive_t * drive)
++{
++	if (drive->using_dma == 1)
++		printk(", UDMA(16)");
++	else
++		printk(", PIO");
++
++	return 1;
++}
++
++static int
++sgiioc4_ide_dma_lostirq(ide_drive_t * drive)
++{
++	HWIF(drive)->resetproc(drive);
++
++	return __ide_dma_lostirq(drive);
++}
++
++static void
++sgiioc4_resetproc(ide_drive_t * drive)
++{
++	sgiioc4_ide_dma_end(drive);
++	sgiioc4_clearirq(drive);
++}
++
++static u8
++sgiioc4_INB(unsigned long port)
++{
++	u8 reg = (u8) inb(port);
++
++	if ((port & 0xFFF) == 0x11C) {	/* Status register of IOC4 */
++		if (reg & 0x51) {	/* Not busy...check for interrupt */
++			unsigned long other_ir = port - 0x110;
++			unsigned int intr_reg = (u32) inl(other_ir);
++
++			/* Clear the Interrupt, Error bits on the IOC4 */
++			if (intr_reg & 0x03) {
++				outl(0x03, other_ir);
++				intr_reg = (u32) inl(other_ir);
++			}
++		}
++	}
++
++	return reg;
++}
++
++/* Creates a dma map for the scatter-gather list entries */
++static void __init
++ide_dma_sgiioc4(ide_hwif_t * hwif, unsigned long dma_base)
++{
++	int num_ports = sizeof (ioc4_dma_regs_t);
++
++	printk(KERN_INFO "%s: BM-DMA at 0x%04lx-0x%04lx\n", hwif->name,
++	       dma_base, dma_base + num_ports - 1);
++
++	if (!request_region(dma_base, num_ports, hwif->name)) {
++		printk(KERN_ERR
++		       "%s(%s) -- ERROR, Addresses 0x%p to 0x%p "
++		       "ALREADY in use\n",
++		       __FUNCTION__, hwif->name, (void *) dma_base,
++		       (void *) dma_base + num_ports - 1);
++		goto dma_alloc_failure;
++	}
++
++	hwif->dma_base = dma_base;
++	hwif->dmatable_cpu = pci_alloc_consistent(hwif->pci_dev,
++					  IOC4_PRD_ENTRIES * IOC4_PRD_BYTES,
++					  &hwif->dmatable_dma);
++
++	if (!hwif->dmatable_cpu)
++		goto dma_alloc_failure;
++
++	hwif->sg_table =
++	    kmalloc(sizeof (struct scatterlist) * IOC4_PRD_ENTRIES, GFP_KERNEL);
++
++	if (!hwif->sg_table)
++		goto dma_sgalloc_failure;
++
++	hwif->dma_base2 = (unsigned long)
++		pci_alloc_consistent(hwif->pci_dev,
++				     IOC4_IDE_CACHELINE_SIZE,
++				     (dma_addr_t *) &(hwif->dma_status));
++
++	if (!hwif->dma_base2)
++		goto dma_base2alloc_failure;
++
++	return;
++
++dma_base2alloc_failure:
++	kfree(hwif->sg_table);
++
++dma_sgalloc_failure:
++	pci_free_consistent(hwif->pci_dev,
++			    IOC4_PRD_ENTRIES * IOC4_PRD_BYTES,
++			    hwif->dmatable_cpu, hwif->dmatable_dma);
++	printk(KERN_INFO
++	       "%s() -- Error! Unable to allocate DMA Maps for drive %s\n",
++	       __FUNCTION__, hwif->name);
++	printk(KERN_INFO
++	       "Changing from DMA to PIO mode for Drive %s\n", hwif->name);
++
++dma_alloc_failure:
++	/* Disable DMA because we couldnot allocate any DMA maps */
++	hwif->autodma = 0;
++	hwif->atapi_dma = 0;
++}
++
++/* Initializes the IOC4 DMA Engine */
++static void
++sgiioc4_configure_for_dma(int dma_direction, ide_drive_t * drive)
++{
++	u32 ioc4_dma;
++	ide_hwif_t *hwif = HWIF(drive);
++	u64 dma_base = hwif->dma_base;
++	u32 dma_addr, ending_dma_addr;
++
++	ioc4_dma = hwif->INL(dma_base + IOC4_DMA_CTRL * 4);
++
++	if (ioc4_dma & IOC4_S_DMA_ACTIVE) {
++		printk(KERN_WARNING
++			"%s(%s):Warning!! DMA from previous transfer was still active\n",
++		       __FUNCTION__, drive->name);
++		hwif->OUTL(IOC4_S_DMA_STOP, dma_base + IOC4_DMA_CTRL * 4);
++		ioc4_dma = sgiioc4_ide_dma_stop(hwif, dma_base);
++
++		if (ioc4_dma & IOC4_S_DMA_STOP)
++			printk(KERN_ERR
++			       "%s(%s) : IOC4 Dma STOP bit is still 1\n",
++			       __FUNCTION__, drive->name);
++	}
++
++	ioc4_dma = hwif->INL(dma_base + IOC4_DMA_CTRL * 4);
++	if (ioc4_dma & IOC4_S_DMA_ERROR) {
++		printk(KERN_WARNING
++		       "%s(%s) : Warning!! - DMA Error during Previous"
++		       " transfer | status 0x%x\n",
++		       __FUNCTION__, drive->name, ioc4_dma);
++		hwif->OUTL(IOC4_S_DMA_STOP, dma_base + IOC4_DMA_CTRL * 4);
++		ioc4_dma = sgiioc4_ide_dma_stop(hwif, dma_base);
++
++		if (ioc4_dma & IOC4_S_DMA_STOP)
++			printk(KERN_ERR
++			       "%s(%s) : IOC4 DMA STOP bit is still 1\n",
++			       __FUNCTION__, drive->name);
++	}
++
++	/* Address of the Scatter Gather List */
++	dma_addr = cpu_to_le32(hwif->dmatable_dma);
++	hwif->OUTL(dma_addr, dma_base + IOC4_DMA_PTR_L * 4);
++
++	/* Address of the Ending DMA */
++	memset((unsigned int *) hwif->dma_base2, 0, IOC4_IDE_CACHELINE_SIZE);
++	ending_dma_addr = cpu_to_le32(hwif->dma_status);
++	hwif->OUTL(ending_dma_addr, dma_base + IOC4_DMA_END_ADDR * 4);
++
++	hwif->OUTL(dma_direction, dma_base + IOC4_DMA_CTRL * 4);
++	drive->waiting_for_dma = 1;
++}
++
++/* IOC4 Scatter Gather list Format 					 */
++/* 128 Bit entries to support 64 bit addresses in the future		 */
++/* The Scatter Gather list Entry should be in the BIG-ENDIAN Format	 */
++/* --------------------------------------------------------------------- */
++/* | Upper 32 bits - Zero           |	 	Lower 32 bits- address | */
++/* --------------------------------------------------------------------- */
++/* | Upper 32 bits - Zero	    |EOL| 15 unused     | 16 Bit Length| */
++/* --------------------------------------------------------------------- */
++/* Creates the scatter gather list, DMA Table */
++static unsigned int
++sgiioc4_build_dma_table(ide_drive_t * drive, struct request *rq, int ddir)
++{
++	ide_hwif_t *hwif = HWIF(drive);
++	unsigned int *table = hwif->dmatable_cpu;
++	unsigned int count = 0, i = 1;
++	struct scatterlist *sg;
++
++	if (HWGROUP(drive)->rq->flags & REQ_DRIVE_TASKFILE)
++		hwif->sg_nents = i = ide_raw_build_sglist(drive, rq);
++	else
++		hwif->sg_nents = i = ide_build_sglist(drive, rq);
++
++	if (!i)
++		return 0;	/* sglist of length Zero */
++
++	sg = hwif->sg_table;
++	while (i && sg_dma_len(sg)) {
++		dma_addr_t cur_addr;
++		int cur_len;
++		cur_addr = sg_dma_address(sg);
++		cur_len = sg_dma_len(sg);
++
++		while (cur_len) {
++			if (count++ >= IOC4_PRD_ENTRIES) {
++				printk(KERN_WARNING
++				       "%s: DMA table too small\n",
++				       drive->name);
++				goto use_pio_instead;
++			} else {
++				u32 xcount, bcount =
++				    0x10000 - (cur_addr & 0xffff);
++
++				if (bcount > cur_len)
++					bcount = cur_len;
++
++				/* put the addr, length in
++				 * the IOC4 dma-table format */
++				*table = 0x0;
++				table++;
++				*table = cpu_to_be32(cur_addr);
++				table++;
++				*table = 0x0;
++				table++;
++
++				xcount = bcount & 0xffff;
++				*table = cpu_to_be32(xcount);
++				table++;
++
++				cur_addr += bcount;
++				cur_len -= bcount;
++			}
++		}
++
++		sg++;
++		i--;
++	}
++
++	if (count) {
++		table--;
++		*table |= cpu_to_be32(0x80000000);
++		return count;
++	}
++
++use_pio_instead:
++	pci_unmap_sg(hwif->pci_dev, hwif->sg_table, hwif->sg_nents,
++		     hwif->sg_dma_direction);
++	hwif->sg_dma_active = 0;
++
++	return 0;		/* revert to PIO for this request */
++}
++
++static int
++sgiioc4_ide_dma_read(ide_drive_t * drive)
++{
++	struct request *rq = HWGROUP(drive)->rq;
++	unsigned int count = 0;
++
++	if (!(count = sgiioc4_build_dma_table(drive, rq, PCI_DMA_FROMDEVICE))) {
++		/* try PIO instead of DMA */
++		return 1;
++	}
++	/* Writes FROM the IOC4 TO Main Memory */
++	sgiioc4_configure_for_dma(IOC4_DMA_WRITE, drive);
++
++	return 0;
++}
++
++static int
++sgiioc4_ide_dma_write(ide_drive_t * drive)
++{
++	struct request *rq = HWGROUP(drive)->rq;
++	unsigned int count = 0;
++
++	if (!(count = sgiioc4_build_dma_table(drive, rq, PCI_DMA_TODEVICE))) {
++		/* try PIO instead of DMA */
++		return 1;
++	}
++
++	sgiioc4_configure_for_dma(IOC4_DMA_READ, drive);
++	/* Writes TO the IOC4 FROM Main Memory */
++
++	return 0;
++}
++
++static void __init
++ide_init_sgiioc4(ide_hwif_t * hwif)
++{
++	hwif->mmio = 2;
++	hwif->autodma = 1;
++	hwif->atapi_dma = 1;
++	hwif->ultra_mask = 0x0;	/* Disable Ultra DMA */
++	hwif->mwdma_mask = 0x2;	/* Multimode-2 DMA  */
++	hwif->swdma_mask = 0x2;
++	hwif->identify = NULL;
++	hwif->tuneproc = NULL;	/* Sets timing for PIO mode */
++	hwif->speedproc = NULL;	/* Sets timing for DMA &/or PIO modes */
++	hwif->selectproc = NULL;/* Use the default routine to select drive */
++	hwif->reset_poll = NULL;/* No HBA specific reset_poll needed */
++	hwif->pre_reset = NULL;	/* No HBA specific pre_set needed */
++	hwif->resetproc = &sgiioc4_resetproc;/* Reset DMA engine,
++						clear interrupts */
++	hwif->intrproc = NULL;	/* Enable or Disable interrupt from drive */
++	hwif->maskproc = &sgiioc4_maskproc;	/* Mask on/off NIEN register */
++	hwif->quirkproc = NULL;
++	hwif->busproc = NULL;
++
++	hwif->ide_dma_read = &sgiioc4_ide_dma_read;
++	hwif->ide_dma_write = &sgiioc4_ide_dma_write;
++	hwif->ide_dma_begin = &sgiioc4_ide_dma_begin;
++	hwif->ide_dma_end = &sgiioc4_ide_dma_end;
++	hwif->ide_dma_check = &sgiioc4_ide_dma_check;
++	hwif->ide_dma_on = &sgiioc4_ide_dma_on;
++	hwif->ide_dma_off = &sgiioc4_ide_dma_off;
++	hwif->ide_dma_off_quietly = &sgiioc4_ide_dma_off_quietly;
++	hwif->ide_dma_test_irq = &sgiioc4_ide_dma_test_irq;
++	hwif->ide_dma_host_on = &sgiioc4_ide_dma_host_on;
++	hwif->ide_dma_host_off = &sgiioc4_ide_dma_host_off;
++	hwif->ide_dma_bad_drive = &__ide_dma_bad_drive;
++	hwif->ide_dma_good_drive = &__ide_dma_good_drive;
++	hwif->ide_dma_count = &__ide_dma_count;
++	hwif->ide_dma_verbose = &sgiioc4_ide_dma_verbose;
++	hwif->ide_dma_retune = &__ide_dma_retune;
++	hwif->ide_dma_lostirq = &sgiioc4_ide_dma_lostirq;
++	hwif->ide_dma_timeout = &__ide_dma_timeout;
++	hwif->INB = &sgiioc4_INB;
++}
++
++static int __init
++sgiioc4_ide_setup_pci_device(struct pci_dev *dev, ide_pci_device_t * d)
++{
++	unsigned long base, ctl, dma_base, irqport;
++	ide_hwif_t *hwif;
++	int h;
++
++	for (h = 0; h < MAX_HWIFS; ++h) {
++		hwif = &ide_hwifs[h];
++		/* Find an empty HWIF */
++		if (hwif->chipset == ide_unknown)
++			break;
++	}
++
++	/*  Get the CmdBlk and CtrlBlk Base Registers */
++	base = pci_resource_start(dev, 0) + IOC4_CMD_OFFSET;
++	ctl = pci_resource_start(dev, 0) + IOC4_CTRL_OFFSET;
++	irqport = pci_resource_start(dev, 0) + IOC4_INTR_OFFSET;
++	dma_base = pci_resource_start(dev, 0) + IOC4_DMA_OFFSET;
++
++	if (!request_region(base, IOC4_CMD_CTL_BLK_SIZE, hwif->name)) {
++		printk(KERN_ERR
++			"%s : %s -- ERROR, Port Addresses "
++			"0x%p to 0x%p ALREADY in use\n",
++		       __FUNCTION__, hwif->name, (void *) base,
++		       (void *) base + IOC4_CMD_CTL_BLK_SIZE);
++		return 1;
++	}
++
++	if (hwif->io_ports[IDE_DATA_OFFSET] != base) {
++		/* Initialize the IO registers */
++		sgiioc4_init_hwif_ports(&hwif->hw, base, ctl, irqport);
++		memcpy(hwif->io_ports, hwif->hw.io_ports,
++		       sizeof (hwif->io_ports));
++		hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET];
++	}
++
++	hwif->irq = dev->irq;
++	hwif->chipset = ide_pci;
++	hwif->pci_dev = dev;
++	hwif->channel = 0;	/* Single Channel chip */
++	hwif->cds = (struct ide_pci_device_s *) d;
++	hwif->gendev.parent = &dev->dev;/* setup proper ancestral information */
++
++	/* Initializing chipset IRQ Registers */
++	hwif->OUTL(0x03, irqport + IOC4_INTR_SET * 4);
++
++	ide_init_sgiioc4(hwif);
++
++	if (dma_base)
++		ide_dma_sgiioc4(hwif, dma_base);
++	else
++		printk(KERN_INFO "%s: %s Bus-Master DMA disabled\n",
++		       hwif->name, d->name);
++
++	probe_hwif_init(hwif);
++	return 0;
++}
++
++/* This ensures that we can build this for generic kernels without
++ * having all the SN2 code sync'd and merged.
++ */
++typedef enum pciio_endian_e {
++	PCIDMA_ENDIAN_BIG,
++	PCIDMA_ENDIAN_LITTLE
++} pciio_endian_t;
++pciio_endian_t __attribute__ ((weak)) snia_pciio_endian_set(struct pci_dev
++					    *pci_dev, pciio_endian_t device_end,
++					    pciio_endian_t desired_end);
++
++static unsigned int __init
++pci_init_sgiioc4(struct pci_dev *dev, ide_pci_device_t * d)
++{
++	unsigned int class_rev;
++
++	if (pci_enable_device(dev)) {
++		printk(KERN_ERR
++		       "Failed to enable device %s at slot %s\n",
++		       d->name, dev->slot_name);
++		return 1;
++	}
++	pci_set_master(dev);
++
++	pci_read_config_dword(dev, PCI_CLASS_REVISION, &class_rev);
++	class_rev &= 0xff;
++	printk(KERN_INFO "%s: IDE controller at PCI slot %s, revision %d\n",
++			d->name, dev->slot_name, class_rev);
++	if (class_rev < IOC4_SUPPORTED_FIRMWARE_REV) {
++		printk(KERN_ERR "Skipping %s IDE controller in slot %s: "
++			"firmware is obsolete - please upgrade to revision"
++			"46 or higher\n", d->name, dev->slot_name);
++		return 1;
++	}
++
++	/* Enable Byte Swapping in the PIC... */
++	if (snia_pciio_endian_set) {
++		snia_pciio_endian_set(dev, PCIDMA_ENDIAN_LITTLE,
++				      PCIDMA_ENDIAN_BIG);
++	} else {
++		printk(KERN_ERR
++		       "Failed to set endianness for device %s at slot %s\n",
++		       d->name, dev->slot_name);
++		return 1;
++	}
++
++	return sgiioc4_ide_setup_pci_device(dev, d);
++}
++
++static ide_pci_device_t sgiioc4_chipsets[] __devinitdata = {
++	{
++	 /* Channel 0 */
++	 .vendor = PCI_VENDOR_ID_SGI,
++	 .device = PCI_DEVICE_ID_SGI_IOC4,
++	 .name = "SGIIOC4",
++	 .init_hwif = ide_init_sgiioc4,
++	 .init_dma = ide_dma_sgiioc4,
++	 .channels = 1,
++	 .autodma = AUTODMA,
++	 /* SGI IOC4 doesn't have enablebits. */
++	 .bootable = ON_BOARD,
++	}
++};
++
++static int __devinit
++sgiioc4_init_one(struct pci_dev *dev, const struct pci_device_id *id)
++{
++	ide_pci_device_t *d = &sgiioc4_chipsets[id->driver_data];
++	if (dev->device != d->device) {
++		printk(KERN_ERR "Error in %s(dev 0x%p | id 0x%p )\n",
++		       __FUNCTION__, (void *) dev, (void *) id);
++		BUG();
++	}
++
++	if (pci_init_sgiioc4(dev, d))
++		return 0;
++
++	MOD_INC_USE_COUNT;
++
++	return 0;
++}
++
++static struct pci_device_id sgiioc4_pci_tbl[] = {
++	{PCI_VENDOR_ID_SGI, PCI_DEVICE_ID_SGI_IOC4, PCI_ANY_ID,
++	 PCI_ANY_ID, 0x0b4000, 0xFFFFFF, 0},
++	{0}
++};
++
++static struct pci_driver driver = {
++	.name = "SGI-IOC4 IDE",
++	.id_table = sgiioc4_pci_tbl,
++	.probe = sgiioc4_init_one,
++};
++
++static int
++sgiioc4_ide_init(void)
++{
++	return ide_pci_register_driver(&driver);
++}
++
++static void
++sgiioc4_ide_exit(void)
++{
++	ide_pci_unregister_driver(&driver);
++}
++
++module_init(sgiioc4_ide_init);
++module_exit(sgiioc4_ide_exit);
++
++MODULE_AUTHOR("Aniket Malatpure - Silicon Graphics Inc. (SGI)");
++MODULE_DESCRIPTION("PCI driver module for SGI IOC4 Base-IO Card");
++MODULE_LICENSE("GPL");
+--- linux-2.6.0/drivers/ide/pci/siimage.c	2003-10-25 14:45:44.000000000 -0700
++++ 25/drivers/ide/pci/siimage.c	2003-12-28 23:26:27.000000000 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * linux/drivers/ide/pci/siimage.c		Version 1.06	June 11, 2003
++ * linux/drivers/ide/pci/siimage.c		Version 1.09	Dec 7, 2003
+  *
+  * Copyright (C) 2001-2002	Andre Hedrick <andre@linux-ide.org>
+  * Copyright (C) 2003		Red Hat <alan@redhat.com>
+@@ -56,6 +56,7 @@ static int pdev_is_sata(struct pci_dev *
+ 	{
+ 		case PCI_DEVICE_ID_SII_3112:
+ 		case PCI_DEVICE_ID_SII_1210SA:
++		case PCI_DEVICE_ID_SII_3114:
+ 			return 1;
+ 		case PCI_DEVICE_ID_SII_680:
+ 			return 0;
+@@ -266,7 +267,7 @@ static byte siimage_taskfile_timing (ide
+ static void siimage_tuneproc (ide_drive_t *drive, byte mode_wanted)
+ {
+ 	ide_hwif_t *hwif	= HWIF(drive);
+-	u32 speedt		= 0;
++	u16 speedt		= 0;
+ 	u16 speedp		= 0;
+ 	unsigned long addr	= siimage_seldev(drive, 0x04);
+ 	unsigned long tfaddr	= siimage_selreg(hwif, 0x02);
+@@ -1047,6 +1048,27 @@ static void __init init_mmio_iops_siimag
+ 	hwif->mmio			= 2;
+ }
+ 
++static int is_dev_seagate_sata(ide_drive_t *drive)
++{
++	const char *s = &drive->id->model[0];
++	unsigned len;
++
++	if (!drive->present)
++		return 0;
++
++	len = strnlen(s, sizeof(drive->id->model));
++
++	if ((len > 4) && (!memcmp(s, "ST", 2))) {
++		if ((!memcmp(s + len - 2, "AS", 2)) ||
++		    (!memcmp(s + len - 3, "ASL", 3))) {
++			printk(KERN_INFO "%s: applying pessimistic Seagate "
++					 "errata fix\n", drive->name);
++			return 1;
++		}
++	}
++	return 0;
++}
++
+ /**
+  *	init_iops_siimage	-	set up iops
+  *	@hwif: interface to set up
+@@ -1068,7 +1090,7 @@ static void __init init_iops_siimage (id
+ 	hwif->hwif_data = 0;
+ 
+ 	hwif->rqsize = 128;
+-	if (is_sata(hwif))
++	if (is_sata(hwif) && is_dev_seagate_sata(&hwif->drives[0]))
+ 		hwif->rqsize = 15;
+ 
+ 	if (pci_get_drvdata(dev) == NULL)
+@@ -1179,6 +1201,7 @@ static struct pci_device_id siimage_pci_
+ 	{ PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_SII_680,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ 	{ PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_SII_3112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
+ 	{ PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_SII_1210SA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2},
++	{ PCI_VENDOR_ID_CMD, PCI_DEVICE_ID_SII_3114, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3},
+ 	{ 0, },
+ };
+ 
+--- linux-2.6.0/drivers/ide/pci/siimage.h	2003-10-08 15:07:08.000000000 -0700
++++ 25/drivers/ide/pci/siimage.h	2003-12-28 23:26:27.000000000 -0800
+@@ -82,6 +82,16 @@ static ide_pci_device_t siimage_chipsets
+ 		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+ 		.bootable	= ON_BOARD,
+ 		.extra		= 0,
++	},{	/* 3 */
++		.vendor		= PCI_VENDOR_ID_CMD,
++		.device		= PCI_DEVICE_ID_SII_3114,
++		.name		= "SiI3114 Serial ATA",
++		.init_chipset	= init_chipset_siimage,
++		.init_iops	= init_iops_siimage,
++		.init_hwif	= init_hwif_siimage,
++		.channels	= 2,
++		.autodma	= AUTODMA,
++		.bootable	= ON_BOARD,
+ 	},{
+ 		.vendor		= 0,
+ 		.device		= 0,
+--- linux-2.6.0/drivers/ide/setup-pci.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/ide/setup-pci.c	2003-12-28 23:22:14.000000000 -0800
+@@ -474,6 +474,11 @@ fixup_address:
+  *	state
+  */
+  
++#ifndef CONFIG_BLK_DEV_IDEDMA_PCI
++static void ide_hwif_setup_dma(struct pci_dev *dev, ide_pci_device_t *d, ide_hwif_t *hwif)
++{
++}
++#else
+ static void ide_hwif_setup_dma(struct pci_dev *dev, ide_pci_device_t *d, ide_hwif_t *hwif)
+ {
+ 	u16 pcicmd;
+@@ -516,6 +521,7 @@ static void ide_hwif_setup_dma(struct pc
+ 		}
+ 	}
+ }
++#endif /* CONFIG_BLK_DEV_IDEDMA_PCI*/
+ 
+ /**
+  *	ide_setup_pci_controller	-	set up IDE PCI
+--- linux-2.6.0/drivers/ieee1394/dma.c	2003-07-27 12:14:38.000000000 -0700
++++ 25/drivers/ieee1394/dma.c	2003-12-28 23:22:12.000000000 -0800
+@@ -187,7 +187,7 @@ void dma_region_sync(struct dma_region *
+ /* nopage() handler for mmap access */
+ 
+ static struct page*
+-dma_region_pagefault(struct vm_area_struct *area, unsigned long address, int write_access)
++dma_region_pagefault(struct vm_area_struct *area, unsigned long address, int *type)
+ {
+ 	unsigned long offset;
+ 	unsigned long kernel_virt_addr;
+@@ -202,6 +202,8 @@ dma_region_pagefault(struct vm_area_stru
+ 	    (address > (unsigned long) area->vm_start + (PAGE_SIZE * dma->n_pages)) )
+ 		goto out;
+ 
++	if (type)
++		*type = VM_FAULT_MINOR;
+ 	offset = address - area->vm_start;
+ 	kernel_virt_addr = (unsigned long) dma->kvirt + offset;
+ 	ret = vmalloc_to_page((void*) kernel_virt_addr);
+--- linux-2.6.0/drivers/ieee1394/eth1394.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ieee1394/eth1394.c	2003-12-28 23:23:03.000000000 -0800
+@@ -89,7 +89,7 @@
+ #define TRACE() printk(KERN_ERR "%s:%s[%d] ---- TRACE\n", driver_name, __FUNCTION__, __LINE__)
+ 
+ static char version[] __devinitdata =
+-	"$Rev: 1043 $ Ben Collins <bcollins@debian.org>";
++	"$Rev: 1079 $ Ben Collins <bcollins@debian.org>";
+ 
+ struct fragment_info {
+ 	struct list_head list;
+@@ -220,7 +220,7 @@ static int ether1394_init_bc(struct net_
+ 
+ 			priv->iso = hpsb_iso_recv_init(priv->host, 16 * 4096,
+ 						       16, priv->broadcast_channel,
+-						       1, ether1394_iso);
++						       HPSB_ISO_DMA_PACKET_PER_BUFFER, 1, ether1394_iso);
+ 			if (priv->iso == NULL) {
+ 				ETH1394_PRINT(KERN_ERR, dev->name,
+ 					      "failed to change broadcast "
+@@ -375,8 +375,8 @@ static void ether1394_reset_priv (struct
+ 	}
+ }
+ 
+-/* This function is called by register_netdev */
+-static int ether1394_init_dev (struct net_device *dev)
++/* This function is called right before register_netdev */
++static void ether1394_init_dev (struct net_device *dev)
+ {
+ 	/* Our functions */
+ 	dev->open		= ether1394_open;
+@@ -403,8 +403,6 @@ static int ether1394_init_dev (struct ne
+ 	dev->type		= ARPHRD_IEEE1394;
+ 
+ 	ether1394_reset_priv (dev, 1);
+-
+-	return 0;
+ }
+ 
+ /*
+@@ -437,8 +435,6 @@ static void ether1394_add_host (struct h
+ 
+ 	SET_MODULE_OWNER(dev);
+ 
+-	dev->init = ether1394_init_dev;
+-
+ 	priv = (struct eth1394_priv *)dev->priv;
+ 
+ 	spin_lock_init(&priv->lock);
+@@ -459,6 +455,8 @@ static void ether1394_add_host (struct h
+ 		goto out;
+         }
+ 
++	ether1394_init_dev(dev);
++
+ 	if (register_netdev (dev)) {
+ 		ETH1394_PRINT (KERN_ERR, dev->name, "Error registering network driver\n");
+ 		goto out;
+@@ -475,7 +473,7 @@ static void ether1394_add_host (struct h
+ 	priv->broadcast_channel = host->csr.broadcast_channel & 0x3f;
+ 
+ 	priv->iso = hpsb_iso_recv_init(host, 16 * 4096, 16, priv->broadcast_channel,
+-				       1, ether1394_iso);
++					HPSB_ISO_DMA_PACKET_PER_BUFFER, 1, ether1394_iso);
+ 	if (priv->iso == NULL) {
+ 		priv->bc_state = ETHER1394_BC_CLOSED;
+ 	}
+@@ -483,7 +481,7 @@ static void ether1394_add_host (struct h
+ 
+ out:
+ 	if (dev != NULL)
+-		kfree(dev);
++		free_netdev(dev);
+ 	if (hi)
+ 		hpsb_destroy_hostinfo(&eth1394_highlevel, host);
+ 
+@@ -1258,7 +1256,7 @@ static inline struct hpsb_packet *ether1
+ {
+ 	struct hpsb_packet *p;
+ 
+-	p = alloc_hpsb_packet(0);
++	p = hpsb_alloc_packet(0);
+ 	if (p) {
+ 		p->host = host;
+ 		p->data = NULL;
+@@ -1327,7 +1325,7 @@ static inline void ether1394_free_packet
+ 	if (packet->tcode != TCODE_STREAM_DATA)
+ 		hpsb_free_tlabel(packet);
+ 	packet->data = NULL;
+-	free_hpsb_packet(packet);
++	hpsb_free_packet(packet);
+ }
+ 
+ static void ether1394_complete_cb(void *__ptask);
+@@ -1349,7 +1347,7 @@ static int ether1394_send_packet(struct 
+ 					       ptask->dest_node,
+ 					       ptask->addr, ptask->skb->data,
+ 					       tx_len)) {
+-		free_hpsb_packet(packet);
++		hpsb_free_packet(packet);
+ 		return -1;
+ 	}
+ 
+@@ -1357,7 +1355,7 @@ static int ether1394_send_packet(struct 
+ 	hpsb_set_packet_complete_task(ptask->packet, ether1394_complete_cb,
+ 				      ptask);
+ 
+-	if (!hpsb_send_packet(packet)) {
++	if (hpsb_send_packet(packet) < 0) {
+ 		ether1394_free_packet(packet);
+ 		return -1;
+ 	}
+@@ -1599,7 +1597,7 @@ static int ether1394_ethtool_ioctl(struc
+ 		case ETHTOOL_GDRVINFO: {
+ 			struct ethtool_drvinfo info = { ETHTOOL_GDRVINFO };
+ 			strcpy (info.driver, driver_name);
+-			strcpy (info.version, "$Rev: 1043 $");
++			strcpy (info.version, "$Rev: 1079 $");
+ 			/* FIXME XXX provide sane businfo */
+ 			strcpy (info.bus_info, "ieee1394");
+ 			if (copy_to_user (useraddr, &info, sizeof (info)))
+--- linux-2.6.0/drivers/ieee1394/highlevel.c	2003-11-26 13:53:35.000000000 -0800
++++ 25/drivers/ieee1394/highlevel.c	2003-12-28 23:23:03.000000000 -0800
+@@ -26,6 +26,7 @@
+ #include "hosts.h"
+ #include "ieee1394_core.h"
+ #include "highlevel.h"
++#include "nodemgr.h"
+ 
+ 
+ struct hl_host_info {
+@@ -227,10 +228,17 @@ struct hpsb_host *hpsb_get_host_bykey(st
+ 	return host;
+ }
+ 
++static int highlevel_for_each_host_reg(struct hpsb_host *host, void *__data)
++{
++	struct hpsb_highlevel *hl = __data;
++
++	hl->add_host(host);
++
++	return 0;
++}
+ 
+ void hpsb_register_highlevel(struct hpsb_highlevel *hl)
+ {
+-	struct list_head *lh;
+ 	unsigned long flags;
+ 
+         INIT_LIST_HEAD(&hl->addr_list);
+@@ -242,21 +250,25 @@ void hpsb_register_highlevel(struct hpsb
+         list_add_tail(&hl->hl_list, &hl_drivers);
+ 	write_unlock_irqrestore(&hl_drivers_lock, flags);
+ 
+-	if (hl->add_host) {
+-		down(&hpsb_hosts_lock);
+-		list_for_each (lh, &hpsb_hosts) {
+-			struct hpsb_host *host = list_entry(lh, struct hpsb_host, host_list);
+-			hl->add_host(host);
+-		}
+-		up(&hpsb_hosts_lock);
+-	}
++	if (hl->add_host)
++		nodemgr_for_each_host(hl, highlevel_for_each_host_reg);
+ 
+         return;
+ }
+ 
++static int highlevel_for_each_host_unreg(struct hpsb_host *host, void *__data)
++{
++	struct hpsb_highlevel *hl = __data;
++
++	hl->remove_host(host);
++	hpsb_destroy_hostinfo(hl, host);
++
++	return 0;
++}
++
+ void hpsb_unregister_highlevel(struct hpsb_highlevel *hl)
+ {
+-        struct list_head *lh, *next;
++	struct list_head *lh, *next;
+         struct hpsb_address_serve *as;
+ 	unsigned long flags;
+ 
+@@ -272,16 +284,8 @@ void hpsb_unregister_highlevel(struct hp
+         list_del(&hl->hl_list);
+ 	write_unlock_irqrestore(&hl_drivers_lock, flags);
+ 
+-        if (hl->remove_host) {
+-		down(&hpsb_hosts_lock);
+-		list_for_each(lh, &hpsb_hosts) {
+-			struct hpsb_host *host = list_entry(lh, struct hpsb_host, host_list);
+-
+-			hl->remove_host(host);
+-			hpsb_destroy_hostinfo(hl, host);
+-		}
+-		up(&hpsb_hosts_lock);
+-	}
++        if (hl->remove_host)
++		nodemgr_for_each_host(hl, highlevel_for_each_host_unreg);
+ }
+ 
+ int hpsb_register_addrspace(struct hpsb_highlevel *hl,
+--- linux-2.6.0/drivers/ieee1394/highlevel.h	2003-08-08 22:55:11.000000000 -0700
++++ 25/drivers/ieee1394/highlevel.h	2003-12-28 23:23:03.000000000 -0800
+@@ -92,8 +92,6 @@ struct hpsb_address_ops {
+ };
+ 
+ 
+-void init_hpsb_highlevel(void);
+-
+ void highlevel_add_host(struct hpsb_host *host);
+ void highlevel_remove_host(struct hpsb_host *host);
+ void highlevel_host_reset(struct hpsb_host *host);
+@@ -180,4 +178,7 @@ int hpsb_set_hostinfo(struct hpsb_highle
+ /* Retrieve hpsb_host using a highlevel handle and a key */
+ struct hpsb_host *hpsb_get_host_bykey(struct hpsb_highlevel *hl, unsigned long key);
+ 
++/* Initialize the highlevel system */
++void init_hpsb_highlevel(void);
++
+ #endif /* IEEE1394_HIGHLEVEL_H */
+--- linux-2.6.0/drivers/ieee1394/hosts.c	2003-11-26 13:53:35.000000000 -0800
++++ 25/drivers/ieee1394/hosts.c	2003-12-28 23:23:03.000000000 -0800
+@@ -16,14 +16,14 @@
+ #include <linux/list.h>
+ #include <linux/init.h>
+ #include <linux/slab.h>
++#include <linux/pci.h>
+ 
+ #include "ieee1394_types.h"
+ #include "hosts.h"
+ #include "ieee1394_core.h"
+ #include "highlevel.h"
++#include "nodemgr.h"
+ 
+-LIST_HEAD(hpsb_hosts);
+-DECLARE_MUTEX(hpsb_hosts_lock);
+ 
+ static int dummy_transmit_packet(struct hpsb_host *h, struct hpsb_packet *p)
+ {
+@@ -46,54 +46,14 @@ static struct hpsb_host_driver dummy_dri
+ 	.isoctl =          dummy_isoctl
+ };
+ 
+-/**
+- * hpsb_ref_host - increase reference count for host controller.
+- * @host: the host controller
+- *
+- * Increase the reference count for the specified host controller.
+- * When holding a reference to a host, the memory allocated for the
+- * host struct will not be freed and the host is guaranteed to be in a
+- * consistent state.  The driver may be unloaded or the controller may
+- * be removed (PCMCIA), but the host struct will remain valid.
+- */
+-
+-int hpsb_ref_host(struct hpsb_host *host)
++static int alloc_hostnum_cb(struct hpsb_host *host, void *__data)
+ {
+-        struct list_head *lh;
+-        int retval = 0;
+-
+-	down(&hpsb_hosts_lock);
+-        list_for_each(lh, &hpsb_hosts) {
+-                if (host == list_entry(lh, struct hpsb_host, host_list)) {
+-			if (try_module_get(host->driver->owner)) {
+-				atomic_inc(&host->refcount);
+-				retval = 1;
+-			}
+-			break;
+-        	}
+-        }
+-	up(&hpsb_hosts_lock);
+-
+-        return retval;
+-}
++	int *hostnum = __data;
+ 
+-/**
+- * hpsb_unref_host - decrease reference count for host controller.
+- * @host: the host controller
+- *
+- * Decrease the reference count for the specified host controller.
+- * When the reference count reaches zero, the memory allocated for the
+- * &hpsb_host will be freed.
+- */
+-
+-void hpsb_unref_host(struct hpsb_host *host)
+-{
+-	module_put(host->driver->owner);
++	if (host->id == *hostnum)
++		return 1;
+ 
+-	down(&hpsb_hosts_lock);
+-        if (atomic_dec_and_test(&host->refcount) && host->is_shutdown)
+-		device_unregister(&host->device);
+-	up(&hpsb_hosts_lock);
++	return 0;
+ }
+ 
+ /**
+@@ -108,19 +68,16 @@ void hpsb_unref_host(struct hpsb_host *h
+  * driver specific parts, enable the controller and make it available
+  * to the general subsystem using hpsb_add_host().
+  *
+- * The &hpsb_host is allocated with an single initial reference
+- * belonging to the driver.  Once the driver is done with the struct,
+- * for example, when the driver is unloaded, it should release this
+- * reference using hpsb_unref_host().
+- *
+  * Return Value: a pointer to the &hpsb_host if succesful, %NULL if
+  * no memory was available.
+  */
+ 
+-struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra)
++struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra,
++				  struct device *dev)
+ {
+         struct hpsb_host *h;
+ 	int i;
++	int hostnum = 0;
+ 
+         h = kmalloc(sizeof(struct hpsb_host) + extra, SLAB_KERNEL);
+         if (!h) return NULL;
+@@ -128,7 +85,6 @@ struct hpsb_host *hpsb_alloc_host(struct
+ 
+ 	h->hostdata = h + 1;
+         h->driver = drv;
+-	atomic_set(&h->refcount, 1);
+ 
+         INIT_LIST_HEAD(&h->pending_packets);
+         spin_lock_init(&h->pending_pkt_lock);
+@@ -146,53 +102,35 @@ struct hpsb_host *hpsb_alloc_host(struct
+         h->topology_map = h->csr.topology_map + 3;
+         h->speed_map = (u8 *)(h->csr.speed_map + 2);
+ 
+-	return h;
+-}
+-
+-static int alloc_hostnum(void)
+-{
+-	int hostnum = 0;
+-
+ 	while (1) {
+-		struct list_head *lh;
+-		int found = 0;
+-
+-		list_for_each(lh, &hpsb_hosts) {
+-			struct hpsb_host *host = list_entry(lh, struct hpsb_host, host_list);
+-
+-			if (host->id == hostnum) {
+-				found = 1;
+-				break;
+-			}
++		if (!nodemgr_for_each_host(&hostnum, alloc_hostnum_cb)) {
++			h->id = hostnum;
++			break;
+ 		}
+ 
+-		if (!found)
+-			return hostnum;
+-
+ 		hostnum++;
+ 	}
+ 
+-	return 0;
++	memcpy(&h->device, &nodemgr_dev_template_host, sizeof(h->device));
++	h->device.parent = dev;
++	snprintf(h->device.bus_id, BUS_ID_SIZE, "fw-host%d", h->id);
++	device_register(&h->device);
++
++	return h;
+ }
+ 
+ void hpsb_add_host(struct hpsb_host *host)
+ {
+-	down(&hpsb_hosts_lock);
+-	host->id = alloc_hostnum();
+-        list_add_tail(&host->host_list, &hpsb_hosts);
+-	up(&hpsb_hosts_lock);
+-
+         highlevel_add_host(host);
+         host->driver->devctl(host, RESET_BUS, LONG_RESET);
+ }
+ 
+ void hpsb_remove_host(struct hpsb_host *host)
+ {
+-	down(&hpsb_hosts_lock);
+         host->is_shutdown = 1;
+         host->driver = &dummy_driver;
+-	list_del(&host->host_list);
+-	up(&hpsb_hosts_lock);
+ 
+         highlevel_remove_host(host);
++
++	device_unregister(&host->device);
+ }
+--- linux-2.6.0/drivers/ieee1394/hosts.h	2003-07-27 12:14:38.000000000 -0700
++++ 25/drivers/ieee1394/hosts.h	2003-12-28 23:23:03.000000000 -0800
+@@ -29,8 +29,6 @@ struct hpsb_host {
+ 
+         atomic_t generation;
+ 
+-	atomic_t refcount;
+-
+         struct list_head pending_packets;
+         spinlock_t pending_pkt_lock;
+ 	struct timer_list timeout;
+@@ -165,7 +163,7 @@ struct hpsb_host_driver {
+          * packet->type == raw) and do byte-swapping as necessary or instruct
+          * the hardware to do so.  It can return immediately after the packet
+          * was queued for sending.  After sending, hpsb_sent_packet() has to be
+-         * called.  Return 0 for failure.
++         * called.  Return 0 on success, negative errno on failure.
+          * NOTE: The function must be callable in interrupt context.
+          */
+         int (*transmit_packet) (struct hpsb_host *host, 
+@@ -195,22 +193,8 @@ struct hpsb_host_driver {
+ };
+ 
+ 
+-extern struct list_head hpsb_hosts;
+-extern struct semaphore hpsb_hosts_lock;
+-
+-
+-/*
+- * In order to prevent hosts from unloading, use hpsb_ref_host().  This prevents
+- * the host from going away (e.g. makes module unloading of the driver
+- * impossible), but still can not guarantee it (e.g. PC-Card being pulled by the
+- * user).  hpsb_ref_host() returns false if host could not be locked.  If it is
+- * successful, host is valid as a pointer until hpsb_unref_host() (not just
+- * until after remove_host).
+- */
+-int hpsb_ref_host(struct hpsb_host *host);
+-void hpsb_unref_host(struct hpsb_host *host);
+-
+-struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra);
++struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra,
++				  struct device *dev);
+ void hpsb_add_host(struct hpsb_host *host);
+ void hpsb_remove_host(struct hpsb_host *h);
+ 
+--- linux-2.6.0/drivers/ieee1394/ieee1394_core.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ieee1394/ieee1394_core.c	2003-12-28 23:23:03.000000000 -0800
+@@ -109,7 +109,7 @@ void hpsb_set_packet_complete_task(struc
+ }
+ 
+ /**
+- * alloc_hpsb_packet - allocate new packet structure
++ * hpsb_alloc_packet - allocate new packet structure
+  * @data_size: size of the data block to be allocated
+  *
+  * This function allocates, initializes and returns a new &struct hpsb_packet.
+@@ -128,7 +128,7 @@ void hpsb_set_packet_complete_task(struc
+  * Return value: A pointer to a &struct hpsb_packet or NULL on allocation
+  * failure.
+  */
+-struct hpsb_packet *alloc_hpsb_packet(size_t data_size)
++struct hpsb_packet *hpsb_alloc_packet(size_t data_size)
+ {
+         struct hpsb_packet *packet = NULL;
+         void *data = NULL;
+@@ -152,25 +152,23 @@ struct hpsb_packet *alloc_hpsb_packet(si
+         }
+ 
+         INIT_LIST_HEAD(&packet->list);
+-        sema_init(&packet->state_change, 0);
+ 	packet->complete_routine = NULL;
+ 	packet->complete_data = NULL;
+         packet->state = hpsb_unused;
+         packet->generation = -1;
+-        packet->data_be = 1;
+ 
+         return packet;
+ }
+ 
+ 
+ /**
+- * free_hpsb_packet - free packet and data associated with it
++ * hpsb_free_packet - free packet and data associated with it
+  * @packet: packet to free (is NULL safe)
+  *
+  * This function will free packet->data, packet->header and finally the packet
+  * itself.
+  */
+-void free_hpsb_packet(struct hpsb_packet *packet)
++void hpsb_free_packet(struct hpsb_packet *packet)
+ {
+         if (!packet) return;
+ 
+@@ -420,14 +418,12 @@ void hpsb_packet_sent(struct hpsb_host *
+ 
+         if (packet->no_waiter) {
+                 /* must not have a tlabel allocated */
+-                free_hpsb_packet(packet);
++                hpsb_free_packet(packet);
+                 return;
+         }
+ 
+         if (ackcode != ACK_PENDING || !packet->expect_response) {
+                 packet->state = hpsb_complete;
+-                up(&packet->state_change);
+-                up(&packet->state_change);
+                 run_packet_complete(packet);
+                 return;
+         }
+@@ -439,7 +435,6 @@ void hpsb_packet_sent(struct hpsb_host *
+         list_add_tail(&packet->list, &host->pending_packets);
+         spin_unlock_irqrestore(&host->pending_pkt_lock, flags);
+ 
+-        up(&packet->state_change);
+ 	mod_timer(&host->timeout, jiffies + host->timeout_interval);
+ }
+ 
+@@ -465,7 +460,7 @@ int hpsb_send_phy_config(struct hpsb_hos
+ 		return -EINVAL;
+ 	}
+ 
+-	packet = alloc_hpsb_packet(0);
++	packet = hpsb_alloc_packet(0);
+ 	if (!packet)
+ 		return -ENOMEM;
+ 
+@@ -485,16 +480,8 @@ int hpsb_send_phy_config(struct hpsb_hos
+ 
+ 	packet->generation = get_hpsb_generation(host);
+ 
+-	if (!hpsb_send_packet(packet)) {
+-		retval = -EINVAL;
+-		goto fail;
+-	}
+-
+-	down(&packet->state_change);
+-	down(&packet->state_change);
+-
+-fail:
+-	free_hpsb_packet(packet);
++	retval = hpsb_send_packet_and_wait(packet);
++	hpsb_free_packet(packet);
+ 
+ 	return retval;
+ }
+@@ -504,23 +491,24 @@ fail:
+  * @packet: packet to send
+  *
+  * The packet is sent through the host specified in the packet->host field.
+- * Before sending, the packet's transmit speed is automatically determined using
+- * the local speed map when it is an async, non-broadcast packet.
++ * Before sending, the packet's transmit speed is automatically determined
++ * using the local speed map when it is an async, non-broadcast packet.
+  *
+  * Possibilities for failure are that host is either not initialized, in bus
+  * reset, the packet's generation number doesn't match the current generation
+  * number or the host reports a transmit error.
+  *
+- * Return value: False (0) on failure, true (1) otherwise.
++ * Return value: 0 on success, negative errno on failure.
+  */
+ int hpsb_send_packet(struct hpsb_packet *packet)
+ {
+         struct hpsb_host *host = packet->host;
+ 
+-        if (host->is_shutdown || host->in_bus_reset
+-            || (packet->generation != get_hpsb_generation(host))) {
+-                return 0;
+-        }
++        if (host->is_shutdown)
++		return -EINVAL;
++	if (host->in_bus_reset ||
++	    (packet->generation != get_hpsb_generation(host)))
++                return -EAGAIN;
+ 
+         packet->state = hpsb_queued;
+ 
+@@ -532,23 +520,13 @@ int hpsb_send_packet(struct hpsb_packet 
+                 data = kmalloc(packet->header_size + packet->data_size, GFP_ATOMIC);
+                 if (!data) {
+                         HPSB_ERR("unable to allocate memory for concatenating header and data");
+-                        return 0;
++                        return -ENOMEM;
+                 }
+ 
+                 memcpy(data, packet->header, packet->header_size);
+ 
+                 if (packet->data_size)
+-                {
+-                        if (packet->data_be) {
+-                                memcpy(((u8*)data)+packet->header_size, packet->data, packet->data_size);
+-                        } else {
+-                                int i;
+-                                quadlet_t *my_data=(quadlet_t*) ((u8*) data + packet->data_size);
+-                                for (i=0; i < packet->data_size/4; i++) {
+-                                        my_data[i] = cpu_to_be32(packet->data[i]);
+-                                }
+-                        }
+-                }
++			memcpy(((u8*)data)+packet->header_size, packet->data, packet->data_size);
+ 
+                 dump_packet("send packet local:", packet->header,
+                             packet->header_size);
+@@ -558,7 +536,7 @@ int hpsb_send_packet(struct hpsb_packet 
+ 
+                 kfree(data);
+ 
+-                return 1;
++                return 0;
+         }
+ 
+         if (packet->type == hpsb_async && packet->node_id != ALL_NODES) {
+@@ -584,10 +562,33 @@ int hpsb_send_packet(struct hpsb_packet 
+         return host->driver->transmit_packet(host, packet);
+ }
+ 
++/* We could just use complete() directly as the packet complete
++ * callback, but this is more typesafe, in the sense that we get a
++ * compiler error if the prototype for complete() changes. */
++
++static void complete_packet(void *data)
++{
++	complete((struct completion *) data);
++}
++
++int hpsb_send_packet_and_wait(struct hpsb_packet *packet)
++{
++	struct completion done;
++	int retval;
++
++	init_completion(&done);
++	hpsb_set_packet_complete_task(packet, complete_packet, &done);
++	retval = hpsb_send_packet(packet);
++	if (retval == 0)
++		wait_for_completion(&done);
++
++	return retval;
++}
++
+ static void send_packet_nocare(struct hpsb_packet *packet)
+ {
+-        if (!hpsb_send_packet(packet)) {
+-                free_hpsb_packet(packet);
++        if (hpsb_send_packet(packet) < 0) {
++                hpsb_free_packet(packet);
+         }
+ }
+ 
+@@ -668,7 +669,6 @@ void handle_packet_response(struct hpsb_
+         }
+ 
+         packet->state = hpsb_complete;
+-        up(&packet->state_change);
+ 	run_packet_complete(packet);
+ }
+ 
+@@ -680,7 +680,7 @@ static struct hpsb_packet *create_reply_
+ 
+         dsize += (dsize % 4 ? 4 - (dsize % 4) : 0);
+ 
+-        p = alloc_hpsb_packet(dsize);
++        p = hpsb_alloc_packet(dsize);
+         if (p == NULL) {
+                 /* FIXME - send data_error response */
+                 return NULL;
+@@ -820,6 +820,8 @@ static void handle_incoming_packet(struc
+                 if (rcode >= 0) {
+                         fill_async_readblock_resp(packet, rcode, length);
+                         send_packet_nocare(packet);
++                } else {
++                        hpsb_free_packet(packet);
+                 }
+                 break;
+ 
+@@ -874,7 +876,7 @@ static void handle_incoming_packet(struc
+                 if (rcode >= 0) {
+                         send_packet_nocare(packet);
+                 } else {
+-                        free_hpsb_packet(packet);
++                        hpsb_free_packet(packet);
+                 }
+                 break;
+         }
+@@ -949,7 +951,6 @@ void abort_requests(struct hpsb_host *ho
+                 list_del(&packet->list);
+                 packet->state = hpsb_complete;
+                 packet->ack_code = ACKX_ABORTED;
+-                up(&packet->state_change);
+ 		run_packet_complete(packet);
+         }
+ }
+@@ -987,7 +988,6 @@ void abort_timedouts(unsigned long __opa
+                 list_del(&packet->list);
+                 packet->state = hpsb_complete;
+                 packet->ack_code = ACKX_TIMEOUT;
+-                up(&packet->state_change);
+ 		run_packet_complete(packet);
+         }
+ }
+@@ -1171,19 +1171,22 @@ static int ieee1394_dispatch_open(struct
+ 
+ static int __init ieee1394_init(void)
+ {
+-	hpsb_packet_cache = kmem_cache_create("hpsb_packet", sizeof(struct hpsb_packet),
+-					      0, 0, NULL, NULL);
+-
+ 	devfs_mk_dir("ieee1394");
+-
+ 	if (register_chrdev(IEEE1394_MAJOR, "ieee1394", &ieee1394_chardev_ops)) {
+ 		HPSB_ERR("unable to register character device major %d!\n", IEEE1394_MAJOR);
+-		devfs_remove("ieee1394");
+ 		return -ENODEV;
+ 	}
+ 
++	devfs_mk_dir("ieee1394");
++
++	hpsb_packet_cache = kmem_cache_create("hpsb_packet", sizeof(struct hpsb_packet),
++					      0, 0, NULL, NULL);
++
++	bus_register(&ieee1394_bus_type);
++
+ 	init_hpsb_highlevel();
+ 	init_csr();
++
+ 	if (!disable_nodemgr)
+ 		init_ieee1394_nodemgr();
+ 	else
+@@ -1198,6 +1201,9 @@ static void __exit ieee1394_cleanup(void
+ 		cleanup_ieee1394_nodemgr();
+ 
+ 	cleanup_csr();
++
++	bus_unregister(&ieee1394_bus_type);
++
+ 	kmem_cache_destroy(hpsb_packet_cache);
+ 
+ 	unregister_chrdev(IEEE1394_MAJOR, "ieee1394");
+@@ -1213,16 +1219,15 @@ module_exit(ieee1394_cleanup);
+ EXPORT_SYMBOL(hpsb_alloc_host);
+ EXPORT_SYMBOL(hpsb_add_host);
+ EXPORT_SYMBOL(hpsb_remove_host);
+-EXPORT_SYMBOL(hpsb_ref_host);
+-EXPORT_SYMBOL(hpsb_unref_host);
+ 
+ /** ieee1394_core.c **/
+ EXPORT_SYMBOL(hpsb_speedto_str);
+ EXPORT_SYMBOL(hpsb_set_packet_complete_task);
+-EXPORT_SYMBOL(alloc_hpsb_packet);
+-EXPORT_SYMBOL(free_hpsb_packet);
++EXPORT_SYMBOL(hpsb_alloc_packet);
++EXPORT_SYMBOL(hpsb_free_packet);
+ EXPORT_SYMBOL(hpsb_send_phy_config);
+ EXPORT_SYMBOL(hpsb_send_packet);
++EXPORT_SYMBOL(hpsb_send_packet_and_wait);
+ EXPORT_SYMBOL(hpsb_reset_bus);
+ EXPORT_SYMBOL(hpsb_bus_reset);
+ EXPORT_SYMBOL(hpsb_selfid_received);
+@@ -1282,6 +1287,7 @@ EXPORT_SYMBOL(hpsb_node_lock);
+ EXPORT_SYMBOL(hpsb_register_protocol);
+ EXPORT_SYMBOL(hpsb_unregister_protocol);
+ EXPORT_SYMBOL(ieee1394_bus_type);
++EXPORT_SYMBOL(nodemgr_for_each_host);
+ 
+ /** csr.c **/
+ EXPORT_SYMBOL(hpsb_update_config_rom);
+--- linux-2.6.0/drivers/ieee1394/ieee1394_core.h	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ieee1394/ieee1394_core.h	2003-12-28 23:23:03.000000000 -0800
+@@ -40,11 +40,6 @@ struct hpsb_packet {
+         unsigned expect_response:1;
+         unsigned no_waiter:1;
+ 
+-        /* Data big endianness flag - may vary from request to request.  The
+-         * header is always in machine byte order.
+-         * Not really used currently.  */
+-        unsigned data_be:1;
+-
+         /* Speed to transmit with: 0 = 100Mbps, 1 = 200Mbps, 2 = 400Mbps */
+         unsigned speed_code:2;
+ 
+@@ -64,9 +59,6 @@ struct hpsb_packet {
+         struct hpsb_host *host;
+         unsigned int generation;
+ 
+-        /* Very core internal, don't care. */
+-        struct semaphore state_change;
+-
+ 	/* Function (and possible data to pass to it) to call when this
+ 	 * packet is completed.  */
+ 	void (*complete_routine)(void *);
+@@ -90,8 +82,8 @@ static inline struct hpsb_packet *driver
+ void abort_timedouts(unsigned long __opaque);
+ void abort_requests(struct hpsb_host *host);
+ 
+-struct hpsb_packet *alloc_hpsb_packet(size_t data_size);
+-void free_hpsb_packet(struct hpsb_packet *packet);
++struct hpsb_packet *hpsb_alloc_packet(size_t data_size);
++void hpsb_free_packet(struct hpsb_packet *packet);
+ 
+ 
+ /*
+@@ -108,15 +100,23 @@ static inline unsigned int get_hpsb_gene
+ }
+ 
+ /*
+- * Send a PHY configuration packet.
++ * Send a PHY configuration packet, return 0 on success, negative
++ * errno on failure.
+  */
+ int hpsb_send_phy_config(struct hpsb_host *host, int rootid, int gapcnt);
+ 
+ /*
+- * Queue packet for transmitting, return 0 for failure.
++ * Queue packet for transmitting, return 0 on success, negative errno
++ * on failure.
+  */
+ int hpsb_send_packet(struct hpsb_packet *packet);
+ 
++/*
++ * Queue packet for transmitting, and block until the transaction
++ * completes. Return 0 on success, negative errno on failure.
++ */
++int hpsb_send_packet_and_wait(struct hpsb_packet *packet);
++
+ /* Initiate bus reset on the given host.  Returns 1 if bus reset already in
+  * progress, 0 otherwise. */
+ int hpsb_reset_bus(struct hpsb_host *host, int type);
+--- linux-2.6.0/drivers/ieee1394/ieee1394_transactions.c	2003-11-26 13:53:35.000000000 -0800
++++ 25/drivers/ieee1394/ieee1394_transactions.c	2003-12-28 23:23:03.000000000 -0800
+@@ -263,7 +263,7 @@ struct hpsb_packet *hpsb_make_readpacket
+ 	if (length == 0)
+ 		return NULL;
+ 
+-	packet = alloc_hpsb_packet(length + (length % 4 ? 4 - (length % 4) : 0));
++	packet = hpsb_alloc_packet(length + (length % 4 ? 4 - (length % 4) : 0));
+ 	if (!packet)
+ 		return NULL;
+ 
+@@ -271,7 +271,7 @@ struct hpsb_packet *hpsb_make_readpacket
+ 	packet->node_id = node;
+ 
+ 	if (hpsb_get_tlabel(packet)) {
+-		free_hpsb_packet(packet);
++		hpsb_free_packet(packet);
+ 		return NULL;
+ 	}
+ 
+@@ -291,7 +291,7 @@ struct hpsb_packet *hpsb_make_writepacke
+ 	if (length == 0)
+ 		return NULL;
+ 
+-	packet = alloc_hpsb_packet(length + (length % 4 ? 4 - (length % 4) : 0));
++	packet = hpsb_alloc_packet(length + (length % 4 ? 4 - (length % 4) : 0));
+ 	if (!packet)
+ 		return NULL;
+ 
+@@ -302,7 +302,7 @@ struct hpsb_packet *hpsb_make_writepacke
+ 	packet->node_id = node;
+ 
+ 	if (hpsb_get_tlabel(packet)) {
+-		free_hpsb_packet(packet);
++		hpsb_free_packet(packet);
+ 		return NULL;
+ 	}
+ 
+@@ -325,7 +325,7 @@ struct hpsb_packet *hpsb_make_streampack
+ 	if (length == 0)
+ 		return NULL;
+ 
+-	packet = alloc_hpsb_packet(length + (length % 4 ? 4 - (length % 4) : 0));
++	packet = hpsb_alloc_packet(length + (length % 4 ? 4 - (length % 4) : 0));
+ 	if (!packet)
+ 		return NULL;
+ 
+@@ -335,7 +335,7 @@ struct hpsb_packet *hpsb_make_streampack
+ 	packet->host = host;
+     
+ 	if (hpsb_get_tlabel(packet)) {
+-		free_hpsb_packet(packet);
++		hpsb_free_packet(packet);
+ 		return NULL;
+ 	}
+ 
+@@ -353,13 +353,13 @@ struct hpsb_packet *hpsb_make_lockpacket
+ 	struct hpsb_packet *p;
+ 	u32 length;
+ 
+-	p = alloc_hpsb_packet(8);
++	p = hpsb_alloc_packet(8);
+ 	if (!p) return NULL;
+ 
+ 	p->host = host;
+ 	p->node_id = node;
+ 	if (hpsb_get_tlabel(p)) {
+-		free_hpsb_packet(p);
++		hpsb_free_packet(p);
+ 		return NULL;
+ 	}
+ 
+@@ -390,13 +390,13 @@ struct hpsb_packet *hpsb_make_lock64pack
+ 	struct hpsb_packet *p;
+ 	u32 length;
+ 
+-	p = alloc_hpsb_packet(16);
++	p = hpsb_alloc_packet(16);
+ 	if (!p) return NULL;
+ 
+ 	p->host = host;
+ 	p->node_id = node;
+ 	if (hpsb_get_tlabel(p)) {
+-		free_hpsb_packet(p);
++		hpsb_free_packet(p);
+ 		return NULL;
+ 	}
+ 
+@@ -429,7 +429,7 @@ struct hpsb_packet *hpsb_make_phypacket(
+ {
+         struct hpsb_packet *p; 
+ 
+-        p = alloc_hpsb_packet(0); 
++        p = hpsb_alloc_packet(0); 
+         if (!p) return NULL; 
+ 
+         p->host = host; 
+@@ -444,7 +444,7 @@ struct hpsb_packet *hpsb_make_isopacket(
+ {
+ 	struct hpsb_packet *p;
+ 
+-	p = alloc_hpsb_packet(length);
++	p = hpsb_alloc_packet(length);
+ 	if (!p) return NULL;
+ 
+ 	p->host = host;
+@@ -478,13 +478,10 @@ int hpsb_read(struct hpsb_host *host, no
+         }
+ 
+ 	packet->generation = generation;
+-        if (!hpsb_send_packet(packet)) {
+-		retval = -EINVAL;
++        retval = hpsb_send_packet_and_wait(packet);
++	if (retval < 0)
+ 		goto hpsb_read_fail;
+-	}
+ 
+-        down(&packet->state_change);
+-        down(&packet->state_change);
+         retval = hpsb_packet_success(packet);
+ 
+         if (retval == 0) {
+@@ -497,7 +494,7 @@ int hpsb_read(struct hpsb_host *host, no
+ 
+ hpsb_read_fail:
+         hpsb_free_tlabel(packet);
+-        free_hpsb_packet(packet);
++        hpsb_free_packet(packet);
+ 
+         return retval;
+ }
+@@ -520,18 +517,15 @@ int hpsb_write(struct hpsb_host *host, n
+ 		return -ENOMEM;
+ 
+ 	packet->generation = generation;
+-        if (!hpsb_send_packet(packet)) {
+-		retval = -EINVAL;
++        retval = hpsb_send_packet_and_wait(packet);
++	if (retval < 0)
+ 		goto hpsb_write_fail;
+-	}
+ 
+-        down(&packet->state_change);
+-        down(&packet->state_change);
+         retval = hpsb_packet_success(packet);
+ 
+ hpsb_write_fail:
+         hpsb_free_tlabel(packet);
+-        free_hpsb_packet(packet);
++        hpsb_free_packet(packet);
+ 
+         return retval;
+ }
+@@ -550,12 +544,10 @@ int hpsb_lock(struct hpsb_host *host, no
+                 return -ENOMEM;
+ 
+ 	packet->generation = generation;
+-        if (!hpsb_send_packet(packet)) {
+-		retval = -EINVAL;
++        retval = hpsb_send_packet_and_wait(packet);
++	if (retval < 0)
+ 		goto hpsb_lock_fail;
+-	}
+-        down(&packet->state_change);
+-        down(&packet->state_change);
++
+         retval = hpsb_packet_success(packet);
+ 
+         if (retval == 0) {
+@@ -564,7 +556,7 @@ int hpsb_lock(struct hpsb_host *host, no
+ 
+ hpsb_lock_fail:
+         hpsb_free_tlabel(packet);
+-        free_hpsb_packet(packet);
++        hpsb_free_packet(packet);
+ 
+         return retval;
+ }
+@@ -582,12 +574,10 @@ int hpsb_lock64(struct hpsb_host *host, 
+ 		return -ENOMEM;
+ 
+ 	packet->generation = generation;
+-	if (!hpsb_send_packet(packet)) {
+-		retval = -EINVAL;
++	retval = hpsb_send_packet_and_wait(packet);
++	if (retval < 0)
+ 		goto hpsb_lock64_fail;
+-	}
+-	down(&packet->state_change);
+-	down(&packet->state_change);
++
+ 	retval = hpsb_packet_success(packet);
+ 
+ 	if (retval == 0)
+@@ -595,7 +585,7 @@ int hpsb_lock64(struct hpsb_host *host, 
+ 
+ hpsb_lock64_fail:
+ 	hpsb_free_tlabel(packet);
+-	free_hpsb_packet(packet);
++	hpsb_free_packet(packet);
+ 
+         return retval;
+ }
+@@ -626,10 +616,9 @@ int hpsb_send_gasp(struct hpsb_host *hos
+ 
+ 	packet->no_waiter = 1;
+ 
+-	if (!hpsb_send_packet(packet)) {
+-		free_hpsb_packet(packet);
+-		retval = -EINVAL;
+-	}
++	retval = hpsb_send_packet(packet);
++	if (retval < 0)
++		hpsb_free_packet(packet);
+ 
+ 	return retval;
+ }
+--- linux-2.6.0/drivers/ieee1394/iso.c	2003-07-27 12:14:38.000000000 -0700
++++ 25/drivers/ieee1394/iso.c	2003-12-28 23:23:03.000000000 -0800
+@@ -40,6 +40,7 @@ static struct hpsb_iso* hpsb_iso_common_
+ 					     unsigned int data_buf_size,
+ 					     unsigned int buf_packets,
+ 					     int channel,
++					     int dma_mode,
+ 					     int irq_interval,
+ 					     void (*callback)(struct hpsb_iso*))
+ {
+@@ -58,8 +59,13 @@ static struct hpsb_iso* hpsb_iso_common_
+ 	if (buf_packets < 2)
+ 		buf_packets = 2;
+ 
+-	if (irq_interval < 1 || irq_interval > buf_packets / 2)
+-		irq_interval = buf_packets / 2;
++	if ((dma_mode < HPSB_ISO_DMA_DEFAULT) || (dma_mode > HPSB_ISO_DMA_PACKET_PER_BUFFER))
++		dma_mode=HPSB_ISO_DMA_DEFAULT;
++
++	if (irq_interval == 0)     /* really interrupt for each packet*/
++		irq_interval = 1;
++	else if ((irq_interval < 0) || (irq_interval > buf_packets / 4))
++ 		irq_interval = buf_packets / 4;
+ 
+ 	if (channel < -1 || channel >= 64)
+ 		return NULL;
+@@ -83,6 +89,7 @@ static struct hpsb_iso* hpsb_iso_common_
+ 	init_waitqueue_head(&iso->waitq);
+ 	iso->channel = channel;
+ 	iso->irq_interval = irq_interval;
++	iso->dma_mode = dma_mode;
+ 	dma_region_init(&iso->data_buf);
+ 	iso->buf_size = round_up_to_page(data_buf_size);
+ 	iso->buf_packets = buf_packets;
+@@ -136,7 +143,7 @@ struct hpsb_iso* hpsb_iso_xmit_init(stru
+ {
+ 	struct hpsb_iso *iso = hpsb_iso_common_init(host, HPSB_ISO_XMIT,
+ 						    data_buf_size, buf_packets,
+-						    channel, irq_interval, callback);
++						    channel, HPSB_ISO_DMA_DEFAULT, irq_interval, callback);
+ 	if (!iso)
+ 		return NULL;
+ 
+@@ -158,12 +165,13 @@ struct hpsb_iso* hpsb_iso_recv_init(stru
+ 				    unsigned int data_buf_size,
+ 				    unsigned int buf_packets,
+ 				    int channel,
++				    int dma_mode,
+ 				    int irq_interval,
+ 				    void (*callback)(struct hpsb_iso*))
+ {
+ 	struct hpsb_iso *iso = hpsb_iso_common_init(host, HPSB_ISO_RECV,
+ 						    data_buf_size, buf_packets,
+-						    channel, irq_interval, callback);
++						    channel, dma_mode, irq_interval, callback);
+ 	if (!iso)
+ 		return NULL;
+ 
+--- linux-2.6.0/drivers/ieee1394/iso.h	2003-07-27 12:14:38.000000000 -0700
++++ 25/drivers/ieee1394/iso.h	2003-12-28 23:23:03.000000000 -0800
+@@ -51,6 +51,14 @@ struct hpsb_iso_packet_info {
+ 
+ enum hpsb_iso_type { HPSB_ISO_RECV = 0, HPSB_ISO_XMIT = 1 };
+ 
++/* The mode of the dma when receiving iso data. Must be supported by chip */
++enum raw1394_iso_dma_recv_mode {
++	HPSB_ISO_DMA_DEFAULT = -1,
++	HPSB_ISO_DMA_OLD_ABI = 0,
++	HPSB_ISO_DMA_BUFFERFILL = 1,
++	HPSB_ISO_DMA_PACKET_PER_BUFFER = 2
++};
++
+ struct hpsb_iso {
+ 	enum hpsb_iso_type type;
+ 
+@@ -68,6 +76,8 @@ struct hpsb_iso {
+ 
+ 	int speed; /* IEEE1394_SPEED_100, 200, or 400 */
+ 	int channel; /* -1 if multichannel */
++	int dma_mode; /* dma receive mode */
++
+ 
+ 	/* greatest # of packets between interrupts - controls
+ 	   the maximum latency of the buffer */
+@@ -139,6 +149,7 @@ struct hpsb_iso* hpsb_iso_recv_init(stru
+ 				    unsigned int data_buf_size,
+ 				    unsigned int buf_packets,
+ 				    int channel,
++				    int dma_mode,
+ 				    int irq_interval,
+ 				    void (*callback)(struct hpsb_iso*));
+ 
+--- linux-2.6.0/drivers/ieee1394/Kconfig	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/ieee1394/Kconfig	2003-12-28 23:23:03.000000000 -0800
+@@ -1,7 +1,7 @@
+ # -*- shell-script -*-
+ 
+ menu "IEEE 1394 (FireWire) support (EXPERIMENTAL)"
+-	depends on PCI && EXPERIMENTAL
++	depends on EXPERIMENTAL
+ 
+ config IEEE1394
+ 	tristate "IEEE 1394 (FireWire) support (EXPERIMENTAL)"
+@@ -15,7 +15,7 @@ config IEEE1394
+ 	  is the core support only, you will also need to select a driver for
+ 	  your IEEE 1394 adapter.
+ 
+-	  To compile this driver as a module, choose M here: the
++	  To compile this driver as a module, say M here: the
+ 	  module will be called ieee1394.
+ 
+ comment "Subsystem Options"
+@@ -56,13 +56,13 @@ comment "Texas Instruments PCILynx requi
+ 
+ config IEEE1394_PCILYNX
+ 	tristate "Texas Instruments PCILynx support"
+-	depends on IEEE1394 && I2C_ALGOBIT
++	depends on PCI && IEEE1394 && I2C_ALGOBIT
+ 	help
+ 	  Say Y here if you have an IEEE-1394 controller with the Texas
+ 	  Instruments PCILynx chip.  Note: this driver is written for revision
+ 	  2 of this chip and may not work with revision 0.
+ 
+-	  To compile this driver as a module, choose M here: the
++	  To compile this driver as a module, say M here: the
+ 	  module will be called pcilynx.
+ 
+ # Non-maintained pcilynx options
+@@ -72,7 +72,7 @@ config IEEE1394_PCILYNX
+ # fi
+ config IEEE1394_OHCI1394
+ 	tristate "OHCI-1394 support"
+-	depends on IEEE1394
++	depends on PCI && IEEE1394
+ 	help
+ 	  Enable this driver if you have an IEEE 1394 controller based on the
+ 	  OHCI-1394 specification. The current driver is only tested with OHCI
+@@ -80,7 +80,7 @@ config IEEE1394_OHCI1394
+ 	  use one of these chipsets.  It should work with any OHCI-1394
+ 	  compliant card, however.
+ 
+-	  To compile this driver as a module, choose M here: the
++	  To compile this driver as a module, say M here: the
+ 	  module will be called ohci1394.
+ 
+ comment "Protocol Drivers"
+@@ -122,7 +122,7 @@ config IEEE1394_DV1394
+ 
+ 	  The user-space API for dv1394 is documented in dv1394.h.
+ 
+-	  To compile this driver as a module, choose M here: the
++	  To compile this driver as a module, say M here: the
+ 	  module will be called dv1394.
+ 
+ config IEEE1394_RAWIO
+@@ -134,7 +134,7 @@ config IEEE1394_RAWIO
+ 	  direct communication of user programs with the IEEE 1394 bus and
+ 	  thus with the attached peripherals.
+ 
+-	  To compile this driver as a module, choose M here: the
++	  To compile this driver as a module, say M here: the
+ 	  module will be called raw1394.
+ 
+ config IEEE1394_CMP
+@@ -144,7 +144,7 @@ config IEEE1394_CMP
+ 	  This option enables the Connection Management Procedures
+ 	  (IEC61883-1) driver, which implements input and output plugs.
+ 
+-	  To compile this driver as a module, choose M here: the
++	  To compile this driver as a module, say M here: the
+ 	  module will be called cmp.
+ 
+ config IEEE1394_AMDTP
+@@ -157,7 +157,7 @@ config IEEE1394_AMDTP
+ 
+ 	  The userspace interface is documented in amdtp.h.
+ 
+-	  To compile this driver as a module, choose M here: the
++	  To compile this driver as a module, say M here: the
+ 	  module will be called amdtp.
+ 
+ endmenu
+--- linux-2.6.0/drivers/ieee1394/nodemgr.c	2003-11-26 13:53:35.000000000 -0800
++++ 25/drivers/ieee1394/nodemgr.c	2003-12-28 23:23:03.000000000 -0800
+@@ -516,8 +516,7 @@ static struct device nodemgr_dev_templat
+ 	.driver_data	= &nodemgr_driverdata_ne,
+ };
+ 
+-
+-static struct device nodemgr_dev_template_host = {
++struct device nodemgr_dev_template_host = {
+ 	.bus		= &ieee1394_bus_type,
+ 	.release	= nodemgr_release_host,
+ 	.driver		= &nodemgr_driver_host,
+@@ -1255,36 +1254,6 @@ void hpsb_unregister_protocol(struct hps
+ }
+ 
+ 
+-/* Searches the list of ud's that match a ne as the parent. If the ud has
+- * a driver associated with it, we call that driver's update function
+- * with the ud as the argument. */
+-static int nodemgr_driver_search_cb(struct device *dev, void *__data)
+-{
+-	struct node_entry *ne = __data;
+-	struct unit_directory *ud;
+-
+-	if (dev->driver_data == &nodemgr_driverdata_ne ||
+-	    dev->driver_data == &nodemgr_driverdata_host)
+-		return 0;
+-
+-	ud = container_of(dev, struct unit_directory, device);
+-
+-	if (&ne->device != ud->device.parent)
+-		return 0;
+-
+-	if (ud->device.driver) {
+-		struct hpsb_protocol_driver *pdrv;
+-
+-		pdrv = container_of(ud->device.driver,
+-				struct hpsb_protocol_driver, driver);
+-
+-		if (pdrv->update)
+-			pdrv->update(ud);
+-	}
+-
+-	return 0;
+-}
+-
+ /*
+  * This function updates nodes that were present on the bus before the
+  * reset and still are after the reset.  The nodeid and the config rom
+@@ -1480,9 +1449,24 @@ static int nodemgr_probe_ne_cb(struct de
+ 		ne->needs_probe = 0;
+ 		return 1;
+ 	} else {
++		struct list_head *lh;
++
+ 		/* Update unit_dirs with attached drivers */
+-		bus_for_each_dev(&ieee1394_bus_type, NULL, ne,
+-				 nodemgr_driver_search_cb);
++		list_for_each(lh, &dev->children) {
++			struct unit_directory *ud;
++			
++			ud = container_of(list_to_dev(lh), struct unit_directory, device);
++
++			if (ud->device.driver) {
++				struct hpsb_protocol_driver *pdrv;
++
++				pdrv = container_of(ud->device.driver,
++						    struct hpsb_protocol_driver, driver);
++
++				if (pdrv->update)
++					pdrv->update(ud);
++			}
++		}
+ 	}
+ 	return 0;
+ }
+@@ -1664,7 +1648,6 @@ static int nodemgr_host_thread(void *__h
+ 	allow_signal(SIGTERM);
+ 
+ 	/* Setup our device-model entries */
+-	device_register(&host->device);
+ 	nodemgr_create_host_dev_files(host);
+ 
+ 	/* Sit and wait for a signal to probe the nodes on the bus. This
+@@ -1753,6 +1736,34 @@ struct node_entry *hpsb_nodeid_get_entry
+ 	return ne;
+ }
+ 
++struct for_each_host_struct {
++	int (*cb)(struct hpsb_host *, void *);
++	void *data;
++};
++
++static int nodemgr_for_each_host_cb(struct device *dev, void *__data)
++{
++	struct for_each_host_struct *host_data = __data;
++	struct hpsb_host *host;
++
++	if (dev->driver_data != &nodemgr_driverdata_host)
++		return 0;
++
++	host = container_of(dev, struct hpsb_host, device);
++
++	return host_data->cb(host, host_data->data);
++}
++
++int nodemgr_for_each_host(void *__data, int (*cb)(struct hpsb_host *, void *))
++{
++	struct for_each_host_struct host_data;
++
++	host_data.cb = cb;
++	host_data.data = __data;
++
++	return bus_for_each_dev(&ieee1394_bus_type, NULL, &host_data, nodemgr_for_each_host_cb);
++}
++
+ /* The following four convenience functions use a struct node_entry
+  * for addressing a node on the bus.  They are intended for use by any
+  * process context, not just the nodemgr thread, so we need to be a
+@@ -1821,11 +1832,6 @@ static void nodemgr_add_host(struct hpsb
+ 	init_completion(&hi->exited);
+         sema_init(&hi->reset_sem, 0);
+ 
+-	memcpy(&host->device, &nodemgr_dev_template_host,
+-	       sizeof(host->device));
+-	host->device.parent = &host->pdev->dev;
+-	snprintf(host->device.bus_id, BUS_ID_SIZE, "fw-host%d", host->id);
+-
+ 	sprintf(hi->daemon_name, "knodemgrd_%d", host->id);
+ 
+ 	hi->pid = kernel_thread(nodemgr_host_thread, hi, CLONE_KERNEL);
+@@ -1879,7 +1885,6 @@ static struct hpsb_highlevel nodemgr_hig
+ 
+ void init_ieee1394_nodemgr(void)
+ {
+-	bus_register(&ieee1394_bus_type);
+ 	driver_register(&nodemgr_driver_host);
+ 	driver_register(&nodemgr_driver_ne);
+ 
+@@ -1892,5 +1897,4 @@ void cleanup_ieee1394_nodemgr(void)
+ 
+ 	driver_unregister(&nodemgr_driver_ne);
+ 	driver_unregister(&nodemgr_driver_host);
+-	bus_unregister(&ieee1394_bus_type);
+ }
+--- linux-2.6.0/drivers/ieee1394/nodemgr.h	2003-11-26 13:53:35.000000000 -0800
++++ 25/drivers/ieee1394/nodemgr.h	2003-12-28 23:23:03.000000000 -0800
+@@ -219,7 +219,16 @@ int hpsb_node_lock(struct node_entry *ne
+ 		   int extcode, quadlet_t *data, quadlet_t arg);
+ 
+ 
++/* Iterate the hosts, calling a given function with supplied data for each
++ * host. */
++int nodemgr_for_each_host(void *__data, int (*cb)(struct hpsb_host *, void *));
++
++
+ void init_ieee1394_nodemgr(void);
+ void cleanup_ieee1394_nodemgr(void);
+ 
++
++/* The template for a host device */
++extern struct device nodemgr_dev_template_host;
++
+ #endif /* _IEEE1394_NODEMGR_H */
+--- linux-2.6.0/drivers/ieee1394/ohci1394.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ieee1394/ohci1394.c	2003-12-28 23:23:03.000000000 -0800
+@@ -134,7 +134,7 @@
+ 
+ #ifdef OHCI1394_DEBUG
+ #define DBGMSG(card, fmt, args...) \
+-printk(KERN_INFO "%s_%d: " fmt "\n" , OHCI1394_DRIVER_NAME, card , ## args)
++printk(KERN_INFO "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, card , ## args)
+ #else
+ #define DBGMSG(card, fmt, args...)
+ #endif
+@@ -158,10 +158,10 @@ printk(level "%s: " fmt "\n" , OHCI1394_
+ 
+ /* print card specific information */
+ #define PRINT(level, card, fmt, args...) \
+-printk(level "%s_%d: " fmt "\n" , OHCI1394_DRIVER_NAME, card , ## args)
++printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, card , ## args)
+ 
+ static char version[] __devinitdata =
+-	"$Rev: 1045 $ Ben Collins <bcollins@debian.org>";
++	"$Rev: 1087 $ Ben Collins <bcollins@debian.org>";
+ 
+ /* Module Parameters */
+ static int phys_dma = 1;
+@@ -845,7 +845,7 @@ static int ohci_transmit(struct hpsb_hos
+ 		PRINT(KERN_ERR, ohci->id, 
+ 		      "Transmit packet size %Zd is too big",
+ 		      packet->data_size);
+-		return 0;
++		return -EOVERFLOW;
+ 	}
+ 
+ 	/* Decide whether we have an iso, a request, or a response packet */
+@@ -862,7 +862,7 @@ static int ohci_transmit(struct hpsb_hos
+ 			if (in_interrupt()) {
+ 				PRINT(KERN_ERR, ohci->id, 
+ 				      "legacy IT context cannot be initialized during interrupt");
+-				return 0;
++				return -EINVAL;
+ 			}
+ 
+ 			if (alloc_dma_trm_ctx(ohci, &ohci->it_legacy_context,
+@@ -870,7 +870,7 @@ static int ohci_transmit(struct hpsb_hos
+ 					      OHCI1394_IsoXmitContextBase) < 0) {
+ 				PRINT(KERN_ERR, ohci->id, 
+ 				      "error initializing legacy IT context");
+-				return 0;
++				return -ENOMEM;
+ 			}
+ 
+ 			initialize_dma_trm_ctx(&ohci->it_legacy_context);
+@@ -890,7 +890,7 @@ static int ohci_transmit(struct hpsb_hos
+ 
+ 	spin_unlock_irqrestore(&d->lock,flags);
+ 
+-	return 1;
++	return 0;
+ }
+ 
+ static int ohci_devctl(struct hpsb_host *host, enum devctl_cmd cmd, int arg)
+@@ -1113,8 +1113,8 @@ struct ohci_iso_recv {
+ 	struct ohci1394_iso_tasklet task;
+ 	int task_active;
+ 
+-	enum { BUFFER_FILL_MODE,
+-	       PACKET_PER_BUFFER_MODE } dma_mode;
++	enum { BUFFER_FILL_MODE = 0,
++	       PACKET_PER_BUFFER_MODE = 1 } dma_mode;
+ 
+ 	/* memory and PCI mapping for the DMA descriptors */
+ 	struct dma_prog_region prog;
+@@ -1175,7 +1175,8 @@ static int ohci_iso_recv_init(struct hps
+ 	/* use buffer-fill mode, unless irq_interval is 1
+ 	   (note: multichannel requires buffer-fill) */
+ 
+-	if (iso->irq_interval == 1 && iso->channel != -1) {
++	if (((iso->irq_interval == 1 && iso->dma_mode == HPSB_ISO_DMA_OLD_ABI) ||
++	     iso->dma_mode == HPSB_ISO_DMA_PACKET_PER_BUFFER) && iso->channel != -1) {
+ 		recv->dma_mode = PACKET_PER_BUFFER_MODE;
+ 	} else {
+ 		recv->dma_mode = BUFFER_FILL_MODE;
+@@ -1194,8 +1195,11 @@ static int ohci_iso_recv_init(struct hps
+ 		}
+ 
+ 		/* iso->irq_interval is in packets - translate that to blocks */
+-		/* (err, sort of... 1 is always the safest value) */
+-		recv->block_irq_interval = iso->irq_interval / recv->nblocks;
++		if (iso->irq_interval == 1)
++			recv->block_irq_interval = 1;			
++		else
++			recv->block_irq_interval = iso->irq_interval *
++							((recv->nblocks+1)/iso->buf_packets);
+ 		if (recv->block_irq_interval*4 > recv->nblocks)
+ 			recv->block_irq_interval = recv->nblocks/4;
+ 		if (recv->block_irq_interval < 1)
+@@ -1205,6 +1209,10 @@ static int ohci_iso_recv_init(struct hps
+ 		int max_packet_size;
+ 
+ 		recv->nblocks = iso->buf_packets;
++		recv->block_irq_interval = iso->irq_interval;
++		if (recv->block_irq_interval * 4 > iso->buf_packets)
++			recv->block_irq_interval = iso->buf_packets / 4;
++		if (recv->block_irq_interval < 1)
+ 		recv->block_irq_interval = 1;
+ 
+ 		/* choose a buffer stride */
+@@ -3271,7 +3279,6 @@ do {						\
+ static int __devinit ohci1394_pci_probe(struct pci_dev *dev,
+ 					const struct pci_device_id *ent)
+ {
+-	static unsigned int card_id_counter = 0;
+ 	static int version_printed = 0;
+ 
+ 	struct hpsb_host *host;
+@@ -3282,15 +3289,14 @@ static int __devinit ohci1394_pci_probe(
+ 		PRINT_G(KERN_INFO, "%s", version);
+ 
+         if (pci_enable_device(dev))
+-		FAIL(-ENXIO, "Failed to enable OHCI hardware %d",
+-		        card_id_counter++);
++		FAIL(-ENXIO, "Failed to enable OHCI hardware");
+         pci_set_master(dev);
+ 
+-	host = hpsb_alloc_host(&ohci1394_driver, sizeof(struct ti_ohci));
++	host = hpsb_alloc_host(&ohci1394_driver, sizeof(struct ti_ohci), &dev->dev);
+ 	if (!host) FAIL(-ENOMEM, "Failed to allocate host structure");
+ 
+ 	ohci = host->hostdata;
+-	ohci->id = card_id_counter++;
++	ohci->id = host->id;
+ 	ohci->dev = dev;
+ 	ohci->host = host;
+ 	ohci->init_state = OHCI_INIT_ALLOC_HOST;
+@@ -3462,11 +3468,14 @@ static int __devinit ohci1394_pci_probe(
+ static void ohci1394_pci_remove(struct pci_dev *pdev)
+ {
+ 	struct ti_ohci *ohci;
++	struct device *dev;
+ 
+ 	ohci = pci_get_drvdata(pdev);
+ 	if (!ohci)
+ 		return;
+ 
++	dev = get_device(&ohci->host->device);
++
+ 	switch (ohci->init_state) {
+ 	case OHCI_INIT_DONE:
+ 		hpsb_remove_host(ohci->host);
+@@ -3489,7 +3498,7 @@ static void ohci1394_pci_remove(struct p
+ 
+ 		/* Disable IRM Contender */
+ 		set_phy_reg(ohci, 4, ~0xc0 & get_phy_reg(ohci, 4));
+-		
++
+ 		/* Clear link control register */
+ 		reg_write(ohci, OHCI1394_LinkControlClear, 0xffffffff);
+ 
+@@ -3521,7 +3530,7 @@ static void ohci1394_pci_remove(struct p
+ 				    ohci->selfid_buf_cpu,
+ 				    ohci->selfid_buf_bus);
+ 		OHCI_DMA_FREE("consistent selfid_buf");
+-		
++
+ 	case OHCI_INIT_HAVE_CONFIG_ROM_BUFFER:
+ 		pci_free_consistent(ohci->dev, OHCI_CONFIG_ROM_LEN,
+ 				    ohci->csr_config_rom_cpu,
+@@ -3555,8 +3564,10 @@ static void ohci1394_pci_remove(struct p
+ 
+ 	case OHCI_INIT_ALLOC_HOST:
+ 		pci_set_drvdata(ohci->dev, NULL);
+-		hpsb_unref_host(ohci->host);
+ 	}
++
++	if (dev)
++		put_device(dev);
+ }
+ 
+ 
+--- linux-2.6.0/drivers/ieee1394/oui.db	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/ieee1394/oui.db	2003-12-28 23:23:03.000000000 -0800
+@@ -1612,7 +1612,7 @@
+ 000658 Helmut Fischer GmbH & Co. KG
+ 000659 EAL (Apeldoorn) B.V.
+ 00065A Strix Systems
+-00065B Dell Inc.
++00065B Dell Computer Corp.
+ 00065C Malachite Technologies, Inc.
+ 00065D Heidelberg Web Systems
+ 00065E Photuris, Inc.
+@@ -3965,7 +3965,7 @@
+ 00B0C2 Cisco Systems, Inc.
+ 00B0C7 Tellabs Operations, Inc.
+ 00B0CE TECHNOLOGY RESCUE
+-00B0D0 Dell Inc.
++00B0D0 Dell Computer Corp.
+ 00B0DB Nextcell, Inc.
+ 00B0DF Reliable Data Technology, Inc.
+ 00B0E7 British Federal Ltd.
+@@ -4054,7 +4054,7 @@
+ 00C04C DEPARTMENT OF FOREIGN AFFAIRS
+ 00C04D MITEC, INC.
+ 00C04E COMTROL CORPORATION
+-00C04F Dell Inc.
++00C04F DELL COMPUTER CORPORATION
+ 00C050 TOYO DENKI SEIZO K.K.
+ 00C051 ADVANCED INTEGRATION RESEARCH
+ 00C052 BURR-BROWN
+--- linux-2.6.0/drivers/ieee1394/pcilynx.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ieee1394/pcilynx.c	2003-12-28 23:23:03.000000000 -0800
+@@ -521,10 +521,6 @@ static void send_next(struct ti_lynx *ly
+                 break;
+         }                
+ 
+-        if (!packet->data_be) {
+-                pcl.buffer[1].control |= PCL_BIGENDIAN;
+-        }
+-
+         put_pcl(lynx, d->pcl, &pcl);
+         run_pcl(lynx, d->pcl_start, d->channel);
+ }
+@@ -540,7 +536,7 @@ static int lynx_transmit(struct hpsb_hos
+         if (packet->data_size >= 4096) {
+                 PRINT(KERN_ERR, lynx->id, "transmit packet data too big (%Zd)",
+                       packet->data_size);
+-                return 0;
++                return -EOVERFLOW;
+         }
+ 
+         switch (packet->type) {
+@@ -554,7 +550,7 @@ static int lynx_transmit(struct hpsb_hos
+         default:
+                 PRINT(KERN_ERR, lynx->id, "invalid packet type %d",
+                       packet->type);
+-                return 0;
++                return -EINVAL;
+         }
+ 
+         if (packet->tcode == TCODE_WRITEQ
+@@ -570,7 +566,7 @@ static int lynx_transmit(struct hpsb_hos
+ 
+         spin_unlock_irqrestore(&d->queue_lock, flags);
+ 
+-        return 1;
++        return 0;
+ }
+ 
+ 
+@@ -1120,7 +1116,7 @@ static ssize_t mem_read(struct file *fil
+         retval = copy_to_user(buffer, md->lynx->mem_dma_buffer, count);
+         up(&md->lynx->mem_dma_mutex);
+ 
+-        if (retval < 0) return retval;
++	if (retval) return -EFAULT;
+         *offset += count;
+         return count;
+ }
+@@ -1141,14 +1137,17 @@ static ssize_t mem_write(struct file *fi
+         /* FIXME: dereferencing pointers to PCI mem doesn't work everywhere */
+         switch (md->type) {
+         case aux:
+-                copy_from_user(md->lynx->aux_port+(*offset), buffer, count);
++		if (copy_from_user(md->lynx->aux_port+(*offset), buffer, count))
++			return -EFAULT;
+                 break;
+         case ram:
+-                copy_from_user(md->lynx->local_ram+(*offset), buffer, count);
++		if (copy_from_user(md->lynx->local_ram+(*offset), buffer, count))
++			return -EFAULT;
+                 break;
+         case rom:
+                 /* the ROM may be writeable */
+-                copy_from_user(md->lynx->local_rom+(*offset), buffer, count);
++		if (copy_from_user(md->lynx->local_rom+(*offset), buffer, count))
++			return -EFAULT;
+                 break;
+         }
+ 
+@@ -1443,12 +1442,15 @@ static void iso_rcv_bh(struct ti_lynx *l
+ static void remove_card(struct pci_dev *dev)
+ {
+         struct ti_lynx *lynx;
++	struct device *lynx_dev;
+         int i;
+ 
+         lynx = pci_get_drvdata(dev);
+         if (!lynx) return;
+         pci_set_drvdata(dev, NULL);
+ 
++	lynx_dev = get_device(&lynx->host->device);
++
+         switch (lynx->state) {
+         case is_host:
+                 reg_write(lynx, PCI_INT_ENABLE, 0);
+@@ -1498,7 +1500,9 @@ static void remove_card(struct pci_dev *
+         }
+ 
+ 	tasklet_kill(&lynx->iso_rcv.tq);
+-	hpsb_unref_host(lynx->host);
++
++	if (lynx_dev)
++		put_device(lynx_dev);
+ }
+ 
+ 
+@@ -1535,7 +1539,7 @@ static int __devinit add_card(struct pci
+ 
+         error = -ENOMEM;
+ 
+-	host = hpsb_alloc_host(&lynx_driver, sizeof(struct ti_lynx));
++	host = hpsb_alloc_host(&lynx_driver, sizeof(struct ti_lynx), &dev->dev);
+         if (!host) FAIL("failed to allocate control structure memory");
+ 
+         lynx = host->hostdata;
+--- linux-2.6.0/drivers/ieee1394/raw1394.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ieee1394/raw1394.c	2003-12-28 23:23:03.000000000 -0800
+@@ -128,7 +128,7 @@ static void free_pending_request(struct 
+         } else if (req->free_data) {
+                 kfree(req->data);
+         }
+-        free_hpsb_packet(req->packet);
++        hpsb_free_packet(req->packet);
+         kfree(req);
+ }
+ 
+@@ -558,7 +558,7 @@ static int state_initialized(struct file
+                                 lh = lh->next;
+                         }
+                         hi = list_entry(lh, struct host_info, list);
+-                        hpsb_ref_host(hi->host); // XXX Need to handle failure case
++			get_device(&hi->host->device); // XXX Need to handle failure case
+                         list_add_tail(&fi->list, &hi->file_info_list);
+                         fi->host = hi->host;
+                         fi->state = connected;
+@@ -782,7 +782,7 @@ static int handle_async_request(struct f
+ 
+ 	packet->generation = req->req.generation;
+ 
+-        if (!hpsb_send_packet(packet)) {
++        if (hpsb_send_packet(packet) < 0) {
+                 req->req.error = RAW1394_ERROR_SEND_ERROR;
+                 req->req.length = 0;
+                 hpsb_free_tlabel(packet);
+@@ -823,7 +823,7 @@ static int handle_iso_send(struct file_i
+ 	/* Update the generation of the packet just before sending. */
+ 	packet->generation = req->req.generation;
+ 
+-        if (!hpsb_send_packet(packet)) {
++        if (hpsb_send_packet(packet) < 0) {
+                 req->req.error = RAW1394_ERROR_SEND_ERROR;
+                 queue_complete_req(req);
+         }
+@@ -846,7 +846,7 @@ static int handle_async_send(struct file
+                 return sizeof(struct raw1394_request);
+         } 
+ 
+-        packet = alloc_hpsb_packet(req->req.length-header_length);
++        packet = hpsb_alloc_packet(req->req.length-header_length);
+         req->packet = packet;
+         if (!packet) return -ENOMEM;
+ 
+@@ -885,7 +885,7 @@ static int handle_async_send(struct file
+         /* Update the generation of the packet just before sending. */
+         packet->generation = req->req.generation;
+ 
+-        if (!hpsb_send_packet(packet)) {
++        if (hpsb_send_packet(packet) < 0) {
+                 req->req.error = RAW1394_ERROR_SEND_ERROR;
+                 queue_complete_req(req);
+         }
+@@ -1797,6 +1797,106 @@ static int arm_unregister(struct file_in
+         return sizeof(struct raw1394_request);
+ }
+ 
++/* Copy data from ARM buffer(s) to user buffer. */
++static int arm_get_buf(struct file_info *fi, struct pending_request *req)
++{
++	struct arm_addr  *arm_addr = NULL;
++	unsigned long flags;
++	unsigned long offset;
++
++	struct list_head *entry;
++
++	DBGMSG("arm_get_buf "
++	       "addr(Offset): %04X %08X length: %u",
++	       (u32) ((req->req.address >> 32) & 0xFFFF),
++	       (u32) (req->req.address & 0xFFFFFFFF),
++	       (u32) req->req.length);
++
++	spin_lock_irqsave(&host_info_lock, flags);
++	entry = fi->addr_list.next;
++	while (entry != &(fi->addr_list)) {
++		arm_addr = list_entry(entry, struct arm_addr, addr_list);
++		if ((arm_addr->start <= req->req.address) &&
++		    (arm_addr->end > req->req.address)) {
++			if (req->req.address + req->req.length <= arm_addr->end) {
++				offset = req->req.address - arm_addr->start;
++
++				DBGMSG("arm_get_buf copy_to_user( %08X, %08X, %u )",
++				       (u32) req->req.recvb,
++				       (u32) (arm_addr->addr_space_buffer+offset),
++				       (u32) req->req.length);
++
++				if (copy_to_user(int2ptr(req->req.recvb), arm_addr->addr_space_buffer+offset, req->req.length)) {
++					spin_unlock_irqrestore(&host_info_lock, flags);
++					return (-EFAULT);
++				}
++
++				spin_unlock_irqrestore(&host_info_lock, flags);
++				free_pending_request(req); /* we have to free the request, because we queue no response, and therefore nobody will free it */
++				return sizeof(struct raw1394_request);
++			} else {
++				DBGMSG("arm_get_buf request exceeded mapping");
++				spin_unlock_irqrestore(&host_info_lock, flags);
++				return (-EINVAL);
++			}
++		}
++		entry = entry->next;
++	}
++	spin_unlock_irqrestore(&host_info_lock, flags);
++	return (-EINVAL);
++}
++
++
++/* Copy data from user buffer to ARM buffer(s). */
++static int arm_set_buf(struct file_info *fi, struct pending_request *req)
++{
++	struct arm_addr  *arm_addr = NULL;
++	unsigned long flags;
++	unsigned long offset;
++
++	struct list_head *entry;
++
++	DBGMSG("arm_set_buf "
++	       "addr(Offset): %04X %08X length: %u",
++	       (u32) ((req->req.address >> 32) & 0xFFFF),
++	       (u32) (req->req.address & 0xFFFFFFFF),
++	       (u32) req->req.length);
++
++
++	spin_lock_irqsave(&host_info_lock, flags);
++	entry = fi->addr_list.next;
++	while (entry != &(fi->addr_list)) {
++		arm_addr = list_entry(entry, struct arm_addr, addr_list);
++		if ((arm_addr->start <= req->req.address) &&
++		    (arm_addr->end > req->req.address)) {
++			if (req->req.address + req->req.length <= arm_addr->end) {
++				offset = req->req.address - arm_addr->start;
++
++				DBGMSG("arm_set_buf copy_from_user( %08X, %08X, %u )",
++				       (u32) (arm_addr->addr_space_buffer+offset),
++				       (u32) req->req.sendb,
++				       (u32) req->req.length);
++
++				if (copy_from_user(arm_addr->addr_space_buffer+offset, int2ptr(req->req.sendb), req->req.length)) {
++					spin_unlock_irqrestore(&host_info_lock, flags);
++					return (-EFAULT);
++				}
++
++				spin_unlock_irqrestore(&host_info_lock, flags);
++				free_pending_request(req); /* we have to free the request, because we queue no response, and therefore nobody will free it */
++				return sizeof(struct raw1394_request);
++			} else {
++				DBGMSG("arm_set_buf request exceeded mapping");
++				spin_unlock_irqrestore(&host_info_lock, flags);
++				return (-EINVAL);
++			}
++		}
++		entry = entry->next;
++	}
++	spin_unlock_irqrestore(&host_info_lock, flags);
++	return (-EINVAL);
++}
++
+ static int reset_notification(struct file_info *fi, struct pending_request *req)
+ {
+         DBGMSG("reset_notification called - switch %s ",
+@@ -1829,9 +1929,8 @@ static int write_phypacket(struct file_i
+         spin_unlock_irq(&fi->reqlists_lock);
+         packet->generation = req->req.generation;
+         retval = hpsb_send_packet(packet);
+-        DBGMSG("write_phypacket send_packet called => retval: %d ",
+-                retval);
+-        if (! retval) {
++        DBGMSG("write_phypacket send_packet called => retval: %d ", retval);
++        if (retval < 0) {
+                 req->req.error = RAW1394_ERROR_SEND_ERROR;
+                 req->req.length = 0;
+                 queue_complete_req(req);
+@@ -1912,6 +2011,12 @@ static int state_connected(struct file_i
+         case RAW1394_REQ_ARM_UNREGISTER:
+                 return arm_unregister(fi, req);
+ 
++        case RAW1394_REQ_ARM_SET_BUF:
++                return arm_set_buf(fi, req);
++
++        case RAW1394_REQ_ARM_GET_BUF:
++                return arm_get_buf(fi, req);
++
+         case RAW1394_REQ_RESET_NOTIFY:
+                 return reset_notification(fi, req);
+ 
+@@ -2137,6 +2242,7 @@ static int raw1394_iso_recv_init(struct 
+ 					    stat.config.data_buf_size,
+ 					    stat.config.buf_packets,
+ 					    stat.config.channel,
++ 					    stat.config.dma_mode,
+ 					    stat.config.irq_interval,
+ 					    rawiso_activity_cb);
+ 	if (!fi->iso_handle)
+@@ -2489,7 +2595,7 @@ static int raw1394_release(struct inode 
+                 list_del(&fi->list);
+                 spin_unlock_irq(&host_info_lock);
+ 
+-                hpsb_unref_host(fi->host);
++		put_device(&fi->host->device);
+         }
+ 
+         kfree(fi);
+--- linux-2.6.0/drivers/ieee1394/raw1394.h	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ieee1394/raw1394.h	2003-12-28 23:23:03.000000000 -0800
+@@ -30,6 +30,8 @@
+ 
+ #define RAW1394_REQ_ARM_REGISTER    300
+ #define RAW1394_REQ_ARM_UNREGISTER  301
++#define RAW1394_REQ_ARM_SET_BUF     302
++#define RAW1394_REQ_ARM_GET_BUF     303
+ 
+ #define RAW1394_REQ_RESET_NOTIFY    400
+ 
+@@ -149,6 +151,9 @@ struct raw1394_iso_config {
+ 	/* xmit only - iso transmission speed */
+ 	__u8 speed;
+ 
++	/* The mode of the dma when receiving iso data. Must be supported by chip */
++	__u8 dma_mode;
++
+ 	/* max. latency of buffer, in packets (-1 if you don't care) */
+ 	__s32 irq_interval;
+ };
+--- linux-2.6.0/drivers/ieee1394/sbp2.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/ieee1394/sbp2.c	2003-12-28 23:23:03.000000000 -0800
+@@ -77,7 +77,7 @@
+ #include "sbp2.h"
+ 
+ static char version[] __devinitdata =
+-	"$Rev: 1034 $ Ben Collins <bcollins@debian.org>";
++	"$Rev: 1082 $ Ben Collins <bcollins@debian.org>";
+ 
+ /*
+  * Module load parameter definitions
+@@ -361,38 +361,34 @@ static int sbp2util_down_timeout(atomic_
+ static void sbp2_free_packet(struct hpsb_packet *packet)
+ {
+ 	hpsb_free_tlabel(packet);
+-	free_hpsb_packet(packet);
++	hpsb_free_packet(packet);
+ }
+ 
+-/*
+- * This function is called to retrieve a block write packet from our
+- * packet pool. This function is used in place of calling
+- * alloc_hpsb_packet (which costs us three kmallocs). Instead we just pull
+- * out a free request packet and re-initialize values in it. I'm sure this
+- * can still stand some more optimization.
++/* This is much like hpsb_node_write(), except it ignores the response
++ * subaction and returns immediately. Can be used from interrupts.
+  */
+-static struct hpsb_packet *
+-sbp2util_allocate_write_packet(struct sbp2scsi_host_info *hi,
+-			       struct node_entry *ne, u64 addr,
+-			       size_t data_size,
+-			       quadlet_t *data)
++int sbp2util_node_write_no_wait(struct node_entry *ne, u64 addr,
++				quadlet_t *buffer, size_t length)
+ {
+ 	struct hpsb_packet *packet;
+ 
+-	packet = hpsb_make_writepacket(hi->host, ne->nodeid,
+-				       addr, data, data_size);
+-
++	packet = hpsb_make_writepacket(ne->host, ne->nodeid,
++				       addr, buffer, length);
+         if (!packet)
+-                return NULL;
++                return -ENOMEM;
+ 
+ 	hpsb_set_packet_complete_task(packet, (void (*)(void*))sbp2_free_packet,
+ 				      packet);
+ 
+ 	hpsb_node_fill_packet(ne, packet);
+ 
+-	return packet;
+-}
++        if (hpsb_send_packet(packet) < 0) {
++		sbp2_free_packet(packet);
++		return -EIO;
++	}
+ 
++	return 0;
++}
+ 
+ /*
+  * This function is called to create a pool of command orbs used for
+@@ -1734,35 +1730,26 @@ static int sbp2_max_speed_and_size(struc
+  */
+ static int sbp2_agent_reset(struct scsi_id_instance_data *scsi_id, int wait) 
+ {
+-	struct sbp2scsi_host_info *hi = scsi_id->hi;
+-	struct hpsb_packet *packet;
+ 	quadlet_t data;
+-	
++	u64 addr;
++	int retval;
++
+ 	SBP2_DEBUG("sbp2_agent_reset");
+ 
+ 	/*
+ 	 * Ok, let's write to the target's management agent register
+ 	 */
+ 	data = ntohl(SBP2_AGENT_RESET_DATA);
+-	packet = sbp2util_allocate_write_packet(hi, scsi_id->ne,
+-						scsi_id->sbp2_command_block_agent_addr +
+-						SBP2_AGENT_RESET_OFFSET,
+-						4, &data);
+-
+-	if (!packet) {
+-		SBP2_ERR("sbp2util_allocate_write_packet failed");
+-		return(-ENOMEM);
+-	}
++	addr = scsi_id->sbp2_command_block_agent_addr + SBP2_AGENT_RESET_OFFSET;
+ 
+-	if (!hpsb_send_packet(packet)) {
+-		SBP2_ERR("hpsb_send_packet failed");
+-		sbp2_free_packet(packet); 
+-		return(-EIO);
+-	}
++	if (wait)
++		retval = hpsb_node_write(scsi_id->ne, addr, &data, 4);
++	else
++		retval = sbp2util_node_write_no_wait(scsi_id->ne, addr, &data, 4);
+ 
+-	if (wait) {
+-		down(&packet->state_change);
+-		down(&packet->state_change);
++	if (retval < 0) {
++		SBP2_ERR("hpsb_node_write failed.\n");
++		return -EIO;
+ 	}
+ 
+ 	/*
+@@ -2032,8 +2019,9 @@ static int sbp2_link_orb_command(struct 
+ 				 struct sbp2_command_info *command)
+ {
+ 	struct sbp2scsi_host_info *hi = scsi_id->hi;
+-        struct hpsb_packet *packet;
+ 	struct sbp2_command_orb *command_orb = &command->command_orb;
++	struct node_entry *ne = scsi_id->ne;
++	u64 addr;
+ 
+ 	outstanding_orb_incr;
+ 	SBP2_ORB_DEBUG("sending command orb %p, total orbs = %x",
+@@ -2049,40 +2037,30 @@ static int sbp2_link_orb_command(struct 
+ 	 * Check to see if there are any previous orbs to use
+ 	 */
+ 	if (scsi_id->last_orb == NULL) {
+-	
++		quadlet_t data[2];
++
+ 		/*
+ 		 * Ok, let's write to the target's management agent register
+ 		 */
+-		if (hpsb_node_entry_valid(scsi_id->ne)) {
+-
+-			packet = sbp2util_allocate_write_packet(hi, scsi_id->ne,
+-								scsi_id->sbp2_command_block_agent_addr +
+-								SBP2_ORB_POINTER_OFFSET, 8, NULL);
+-		
+-			if (!packet) {
+-				SBP2_ERR("sbp2util_allocate_write_packet failed");
+-				return(-ENOMEM);
+-			}
+-		
+-			packet->data[0] = ORB_SET_NODE_ID(hi->host->node_id);
+-			packet->data[1] = command->command_orb_dma;
+-			sbp2util_cpu_to_be32_buffer(packet->data, 8);
+-		
+-			SBP2_ORB_DEBUG("write command agent, command orb %p", command_orb);
++		addr = scsi_id->sbp2_command_block_agent_addr + SBP2_ORB_POINTER_OFFSET;
++		data[0] = ORB_SET_NODE_ID(hi->host->node_id);
++		data[1] = command->command_orb_dma;
++		sbp2util_cpu_to_be32_buffer(data, 8);
+ 
+-			if (!hpsb_send_packet(packet)) {
+-				SBP2_ERR("hpsb_send_packet failed");
+-				sbp2_free_packet(packet); 
+-				return(-EIO);
+-			}
++		SBP2_ORB_DEBUG("write command agent, command orb %p", command_orb);
+ 
+-			SBP2_ORB_DEBUG("write command agent complete");
++		if (sbp2util_node_write_no_wait(ne, addr, data, 8) < 0) {
++			SBP2_ERR("sbp2util_node_write_no_wait failed.\n");
++			return -EIO;
+ 		}
+ 
++		SBP2_ORB_DEBUG("write command agent complete");
++
+ 		scsi_id->last_orb = command_orb;
+ 		scsi_id->last_orb_dma = command->command_orb_dma;
+ 
+ 	} else {
++		quadlet_t data;
+ 
+ 		/*
+ 		 * We have an orb already sent (maybe or maybe not
+@@ -2102,25 +2080,14 @@ static int sbp2_link_orb_command(struct 
+ 		/*
+ 		 * Ring the doorbell
+ 		 */
+-		if (hpsb_node_entry_valid(scsi_id->ne)) {
+-			quadlet_t data = cpu_to_be32(command->command_orb_dma);
++		data = cpu_to_be32(command->command_orb_dma);
++		addr = scsi_id->sbp2_command_block_agent_addr + SBP2_DOORBELL_OFFSET;
+ 
+-			packet = sbp2util_allocate_write_packet(hi, scsi_id->ne,
+-					scsi_id->sbp2_command_block_agent_addr +
+-					SBP2_DOORBELL_OFFSET, 4, &data);
+-	
+-			if (!packet) {
+-				SBP2_ERR("sbp2util_allocate_write_packet failed");
+-				return(-ENOMEM);
+-			}
++		SBP2_ORB_DEBUG("ring doorbell, command orb %p", command_orb);
+ 
+-			SBP2_ORB_DEBUG("ring doorbell, command orb %p", command_orb);
+-
+-			if (!hpsb_send_packet(packet)) {
+-				SBP2_ERR("hpsb_send_packet failed");
+-				sbp2_free_packet(packet);
+-				return(-EIO);
+-			}
++		if (sbp2util_node_write_no_wait(ne, addr, &data, 4) < 0) {
++			SBP2_ERR("sbp2util_node_write_no_wait failed");
++			return(-EIO);
+ 		}
+ 
+ 		scsi_id->last_orb = command_orb;
+--- linux-2.6.0/drivers/input/gameport/Kconfig	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/input/gameport/Kconfig	2003-12-28 23:23:04.000000000 -0800
+@@ -19,6 +19,22 @@ config GAMEPORT
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called gameport.
+ 
++
++# Yes, SOUND_GAMEPORT looks a bit odd. Yes, it ends up being turned on
++# in every .config. Please don't touch it. It is here to handle an
++# unusual dependency between GAMEPORT and sound drivers.
++#
++# Some sound drivers call gameport functions. If GAMEPORT is
++# not selected, empty stubs are provided for the functions and all is
++# well.
++# If GAMEPORT is built in, everything is fine.
++# If GAMEPORT is a module, however, it would need to be loaded for the
++# sound driver to be able to link properly. Therefore, the sound
++# driver must be a module as well in that case. Since there's no way
++# to express that directly in Kconfig, we use SOUND_GAMEPORT to
++# express it. SOUND_GAMEPORT boils down to "if GAMEPORT is 'm',
++# anything that depends on SOUND_GAMEPORT must be 'm' as well. if
++# GAMEPORT is 'y' or 'n', it can be anything".
+ config SOUND_GAMEPORT
+ 	tristate
+ 	default y if GAMEPORT!=m
+--- linux-2.6.0/drivers/input/input.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/input/input.c	2003-12-28 23:21:26.000000000 -0800
+@@ -447,9 +447,10 @@ void input_register_device(struct input_
+ 	list_add_tail(&dev->node, &input_dev_list);
+ 
+ 	list_for_each_entry(handler, &input_handler_list, node)
+-		if ((id = input_match_device(handler->id_table, dev)))
+-			if ((handle = handler->connect(handler, dev, id)))
+-				input_link_handle(handle);
++		if (!handler->blacklist || !input_match_device(handler->blacklist, dev))
++			if ((id = input_match_device(handler->id_table, dev)))
++				if ((handle = handler->connect(handler, dev, id)))
++					input_link_handle(handle);
+ 
+ #ifdef CONFIG_HOTPLUG
+ 	input_call_hotplug("add", dev);
+@@ -507,9 +508,10 @@ void input_register_handler(struct input
+ 	list_add_tail(&handler->node, &input_handler_list);
+ 	
+ 	list_for_each_entry(dev, &input_dev_list, node)
+-		if ((id = input_match_device(handler->id_table, dev)))
+-			if ((handle = handler->connect(handler, dev, id)))
+-				input_link_handle(handle);
++		if (!handler->blacklist || !input_match_device(handler->blacklist, dev))
++			if ((id = input_match_device(handler->id_table, dev)))
++				if ((handle = handler->connect(handler, dev, id)))
++					input_link_handle(handle);
+ 
+ #ifdef CONFIG_PROC_FS
+ 	input_devices_state++;
+--- linux-2.6.0/drivers/input/joydev.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/input/joydev.c	2003-12-28 23:21:26.000000000 -0800
+@@ -380,10 +380,6 @@ static struct input_handle *joydev_conne
+ 	struct joydev *joydev;
+ 	int i, j, t, minor;
+ 
+-	/* Avoid tablets */
+-        if (test_bit(EV_KEY, dev->evbit) && test_bit(BTN_TOUCH, dev->keybit))
+-		return NULL;
+-
+ 	for (minor = 0; minor < JOYDEV_MINORS && joydev_table[minor]; minor++);
+ 	if (minor == JOYDEV_MINORS) {
+ 		printk(KERN_ERR "joydev: no more free joydev devices\n");
+@@ -464,6 +460,15 @@ static void joydev_disconnect(struct inp
+ 		joydev_free(joydev);
+ }
+ 
++static struct input_device_id joydev_blacklist[] = {
++	{
++		.flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT,
++		.evbit = { BIT(EV_KEY) },
++		.keybit = { [LONG(BTN_TOUCH)] = BIT(BTN_TOUCH) },
++	}, 	/* Avoid itouchpads, touchscreens and tablets */
++	{ }, 	/* Terminating entry */
++};
++
+ static struct input_device_id joydev_ids[] = {
+ 	{
+ 		.flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_ABSBIT,
+@@ -493,6 +498,7 @@ static struct input_handler joydev_handl
+ 	.minor =	JOYDEV_MINOR_BASE,
+ 	.name =		"joydev",
+ 	.id_table =	joydev_ids,
++	.blacklist = 	joydev_blacklist,
+ };
+ 
+ static int __init joydev_init(void)
+--- linux-2.6.0/drivers/input/keyboard/atkbd.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/input/keyboard/atkbd.c	2003-12-28 23:21:31.000000000 -0800
+@@ -48,33 +48,30 @@ static int atkbd_softrepeat;
+  */
+ 
+ static unsigned char atkbd_set2_keycode[512] = {
+-	  0, 67, 65, 63, 61, 59, 60, 88,  0, 68, 66, 64, 62, 15, 41, 85,
+-	  0, 56, 42,182, 29, 16,  2, 89,  0,  0, 44, 31, 30, 17,  3, 90,
+-	  0, 46, 45, 32, 18,  5,  4, 91, 90, 57, 47, 33, 20, 19,  6,  0,
+-	 91, 49, 48, 35, 34, 21,  7,  0,  0,  0, 50, 36, 22,  8,  9,  0,
++
++	  0, 67, 65, 63, 61, 59, 60, 88,  0, 68, 66, 64, 62, 15, 41,117,
++	  0, 56, 42,182, 29, 16,  2,  0,  0,  0, 44, 31, 30, 17,  3,  0,
++	  0, 46, 45, 32, 18,  5,  4,186,  0, 57, 47, 33, 20, 19,  6, 85,
++	  0, 49, 48, 35, 34, 21,  7, 89,  0,  0, 50, 36, 22,  8,  9, 90,
+ 	  0, 51, 37, 23, 24, 11, 10,  0,  0, 52, 53, 38, 39, 25, 12,  0,
+-	122, 89, 40,120, 26, 13,  0,  0, 58, 54, 28, 27,  0, 43,  0,  0,
+-	 85, 86, 90, 91, 92, 93, 14, 94, 95, 79,183, 75, 71,121,  0,123,
++	  0,181, 40,  0, 26, 13,  0,  0, 58, 54, 28, 27,  0, 43,  0,194,
++	  0, 86,193,192,184,  0, 14,185,  0, 79,182, 75, 71,124,  0,  0,
+ 	 82, 83, 80, 76, 77, 72,  1, 69, 87, 78, 81, 74, 55, 73, 70, 99,
+-	  0,  0,  0, 65, 99,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
++
+ 	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255,
+-	  0,  0, 92, 90, 85,  0,137,  0,  0,  0,  0, 91, 89,144,115,  0,
+-	217,100,255,  0, 97,165,164,  0,156,  0,  0,140,115,  0,  0,125,
+-	173,114,  0,113,152,163,151,126,128,166,  0,140,  0,147,  0,127,
+-	159,167,115,160,164,  0,  0,116,158,  0,150,166,  0,  0,  0,142,
+-	157,  0,114,166,168,  0,  0,213,155,  0, 98,113,  0,163,  0,138,
+-	226,  0,  0,  0,  0,  0,153,140,  0,255, 96,  0,  0,  0,143,  0,
+-	133,  0,116,  0,143,  0,174,133,  0,107,  0,105,102,  0,  0,112,
+-	110,111,108,112,106,103,  0,119,  0,118,109,  0, 99,104,119
++	217,100,255,  0, 97,165,  0,  0,156,  0,  0,  0,  0,  0,  0,125,
++	173,114,  0,113,  0,  0,  0,126,128,  0,  0,140,  0,  0,  0,127,
++	159,  0,115,  0,164,  0,  0,116,158,  0,150,166,  0,  0,  0,142,
++	157,  0,  0,  0,  0,  0,  0,  0,155,  0, 98,  0,  0,163,  0,  0,
++	226,  0,  0,  0,  0,  0,  0,  0,  0,255, 96,  0,  0,  0,143,  0,
++	  0,  0,  0,  0,  0,  0,  0,  0,  0,107,  0,105,102,  0,  0,112,
++	110,111,108,112,106,103,  0,119,  0,118,109,  0, 99,104,119,  0,
++
++	  0,  0,  0, 65, 99,
+ };
+ 
+ static unsigned char atkbd_set3_keycode[512] = {
++
+ 	  0,  0,  0,  0,  0,  0,  0, 59,  1,138,128,129,130, 15, 41, 60,
+ 	131, 29, 42, 86, 58, 16,  2, 61,133, 56, 44, 31, 30, 17,  3, 62,
+ 	134, 46, 45, 32, 18,  5,  4, 63,135, 57, 47, 33, 20, 19,  6, 64,
+@@ -83,25 +80,21 @@ static unsigned char atkbd_set3_keycode[
+ 	113,114, 40, 84, 26, 13, 87, 99, 97, 54, 28, 27, 43, 84, 88, 70,
+ 	108,105,119,103,111,107, 14,110,  0, 79,106, 75, 71,109,102,104,
+ 	 82, 83, 80, 76, 77, 72, 69, 98,  0, 96, 81,  0, 78, 73, 55, 85,
++
+ 	 89, 90, 91, 92, 74,185,184,182,  0,  0,  0,125,126,127,112,  0,
+ 	  0,139,150,163,165,115,152,150,166,140,160,154,113,114,167,168,
+-	148,149,147,140,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+-	  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,255
++	148,149,147,140
+ };
+ 
+ static unsigned char atkbd_unxlate_table[128] = {
+-	  0,118, 22, 30, 38, 37, 46, 54, 61, 62, 70, 69, 78, 85,102, 13,
+-	 21, 29, 36, 45, 44, 53, 60, 67, 68, 77, 84, 91, 90, 20, 28, 27,
+-	 35, 43, 52, 51, 59, 66, 75, 76, 82, 14, 18, 93, 26, 34, 33, 42,
+-	 50, 49, 58, 65, 73, 74, 89,124, 17, 41, 88,  5,  6,  4, 12,  3,
+-	 11,  2, 10,  1,  9,119,126,108,117,125,123,107,115,116,121,105,
+-	114,122,112,113,127, 96, 97,120,  7, 15, 23, 31, 39, 47, 55, 63,
+-	 71, 79, 86, 94,  8, 16, 24, 32, 40, 48, 56, 64, 72, 80, 87,111,
+-	 19, 25, 57, 81, 83, 92, 95, 98, 99,100,101,103,104,106,109,110
++          0,118, 22, 30, 38, 37, 46, 54, 61, 62, 70, 69, 78, 85,102, 13,
++         21, 29, 36, 45, 44, 53, 60, 67, 68, 77, 84, 91, 90, 20, 28, 27,
++         35, 43, 52, 51, 59, 66, 75, 76, 82, 14, 18, 93, 26, 34, 33, 42,
++         50, 49, 58, 65, 73, 74, 89,124, 17, 41, 88,  5,  6,  4, 12,  3,
++         11,  2, 10,  1,  9,119,126,108,117,125,123,107,115,116,121,105,
++        114,122,112,113,127, 96, 97,120,  7, 15, 23, 31, 39, 47, 55, 63,
++         71, 79, 86, 94,  8, 16, 24, 32, 40, 48, 56, 64, 72, 80, 87,111,
++         19, 25, 57, 81, 83, 92, 95, 98, 99,100,101,103,104,106,109,110
+ };
+ 
+ #define ATKBD_CMD_SETLEDS	0x10ed
+@@ -125,6 +118,9 @@ static unsigned char atkbd_unxlate_table
+ #define ATKBD_RET_EMULX		0x80
+ #define ATKBD_RET_EMUL1		0xe1
+ #define ATKBD_RET_RELEASE	0xf0
++#define ATKBD_RET_HANGUEL	0xf1
++#define ATKBD_RET_HANJA		0xf2
++#define ATKBD_RET_ERR		0xff
+ 
+ #define ATKBD_KEY_UNKNOWN	  0
+ #define ATKBD_KEY_NULL		255
+@@ -156,6 +152,17 @@ struct atkbd {
+ 	unsigned long time;
+ };
+ 
++static void atkbd_report_key(struct input_dev *dev, struct pt_regs *regs, int code, int value)
++{
++	input_regs(dev, regs);
++	if (value == 3) {
++		input_report_key(dev, code, 1);
++		input_report_key(dev, code, 0);
++	} else
++		input_event(dev, EV_KEY, code, value);
++	input_sync(dev);
++}
++
+ /*
+  * atkbd_interrupt(). Here takes place processing of data received from
+  * the keyboard into events.
+@@ -184,47 +191,37 @@ static irqreturn_t atkbd_interrupt(struc
+ 		atkbd->resend = 0;
+ #endif
+ 
+-	switch (code) {
+-		case ATKBD_RET_ACK:
+-			atkbd->ack = 1;
+-			goto out;
+-		case ATKBD_RET_NAK:
+-			atkbd->ack = -1;
+-			goto out;
+-	}
+-
+-	if (atkbd->translated) do {
+-
+-		if (atkbd->emul != 1) {
+-			if (code == ATKBD_RET_EMUL0 || code == ATKBD_RET_EMUL1)
+-				break;
+-			if (code == ATKBD_RET_BAT) {
+-				if (!atkbd->bat_xl)
+-					break;
+-				atkbd->bat_xl = 0;
+-			}
+-			if (code == (ATKBD_RET_BAT & 0x7f))
+-				atkbd->bat_xl = 1;
++	if (!atkbd->ack)
++		switch (code) {
++			case ATKBD_RET_ACK:
++				atkbd->ack = 1;
++				goto out;
++			case ATKBD_RET_NAK:
++				atkbd->ack = -1;
++				goto out;
+ 		}
+ 
+-		if (code < 0x80) {
+-			code = atkbd_unxlate_table[code];
+-			break;
+-		}
+-
+-		if (atkbd->cmdcnt)
+-			break;
+-
+-		code = atkbd_unxlate_table[code & 0x7f];
+-		atkbd->release = 1;
+-
+-	} while (0);
+-
+ 	if (atkbd->cmdcnt) {
+ 		atkbd->cmdbuf[--atkbd->cmdcnt] = code;
+ 		goto out;
+ 	}
+ 
++	if (atkbd->translated) {
++
++		if (atkbd->emul ||
++		    !(code == ATKBD_RET_EMUL0 || code == ATKBD_RET_EMUL1 ||
++		      code == ATKBD_RET_HANGUEL || code == ATKBD_RET_HANJA ||
++		      code == ATKBD_RET_ERR ||
++	             (code == ATKBD_RET_BAT && !atkbd->bat_xl))) {
++			atkbd->release = code >> 7;
++			code &= 0x7f;
++		}
++
++		if (!atkbd->emul &&
++		     (code & 0x7f) == (ATKBD_RET_BAT & 0x7f))
++			atkbd->bat_xl = !atkbd->release;
++	}
++
+ 	switch (code) {
+ 		case ATKBD_RET_BAT:
+ 			serio_rescan(atkbd->serio);
+@@ -238,22 +235,33 @@ static irqreturn_t atkbd_interrupt(struc
+ 		case ATKBD_RET_RELEASE:
+ 			atkbd->release = 1;
+ 			goto out;
++		case ATKBD_RET_HANGUEL:
++			atkbd_report_key(&atkbd->dev, regs, KEY_LANG1, 3);
++			goto out;
++		case ATKBD_RET_HANJA:
++			atkbd_report_key(&atkbd->dev, regs, KEY_LANG2, 3);
++			goto out;
++		case ATKBD_RET_ERR:
++			printk(KERN_WARNING "atkbd.c: Keyboard on %s reports too many keys pressed.\n", serio->phys);
++			goto out;
+ 	}
+ 
++	if (atkbd->set != 3)
++		code = (code & 0x7f) | ((code & 0x80) << 1);
+ 	if (atkbd->emul) {
+ 		if (--atkbd->emul)
+ 			goto out;
+-		code |= 0x100;
++		code |= (atkbd->set != 3) ? 0x80 : 0x100;
+ 	}
+ 
+ 	switch (atkbd->keycode[code]) {
+ 		case ATKBD_KEY_NULL:
+ 			break;
+ 		case ATKBD_KEY_UNKNOWN:
+-			printk(KERN_WARNING "atkbd.c: Unknown key %s (%s set %d, code %#x, data %#x, on %s).\n",
++			printk(KERN_WARNING "atkbd.c: Unknown key %s (%s set %d, code %#x on %s).\n",
+ 				atkbd->release ? "released" : "pressed",
+ 				atkbd->translated ? "translated" : "raw", 
+-				atkbd->set, code, data, serio->phys);
++				atkbd->set, code, serio->phys);
+ 			break;
+ 		default:
+ 			value = atkbd->release ? 0 :
+@@ -273,9 +281,7 @@ static irqreturn_t atkbd_interrupt(struc
+ 					break;
+ 			}
+ 
+-			input_regs(&atkbd->dev, regs);
+-			input_event(&atkbd->dev, EV_KEY, atkbd->keycode[code], value);
+-			input_sync(&atkbd->dev);
++			atkbd_report_key(&atkbd->dev, regs, atkbd->keycode[code], value);
+ 	}
+ 
+ 	atkbd->release = 0;
+@@ -369,10 +375,11 @@ static int atkbd_command(struct atkbd *a
+ static int atkbd_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
+ {
+ 	struct atkbd *atkbd = dev->private;
+-	struct { int p; u8 v; } period[] =	
+-		{ {30, 0x00}, {25, 0x02}, {20, 0x04}, {15, 0x08}, {10, 0x0c}, {7, 0x10}, {5, 0x14}, {0, 0x14} };
+-	struct { int d; u8 v; } delay[] =
+-        	{ {1000, 0x60}, {750, 0x40}, {500, 0x20}, {250, 0x00}, {0, 0x00} };
++	const short period[32] =
++		{ 33,  37,  42,  46,  50,  54,  58,  63,  67,  75,  83,  92, 100, 109, 116, 125,
++		 133, 149, 167, 182, 200, 217, 232, 250, 270, 303, 333, 370, 400, 435, 470, 500 };
++	const short delay[4] =
++		{ 250, 500, 750, 1000 };
+ 	char param[2];
+ 	int i, j;
+ 
+@@ -406,11 +413,11 @@ static int atkbd_event(struct input_dev 
+ 			if (atkbd_softrepeat) return 0;
+ 
+ 			i = j = 0;
+-			while (period[i].p > dev->rep[REP_PERIOD]) i++;
+-			while (delay[j].d > dev->rep[REP_DELAY]) j++;
+-			dev->rep[REP_PERIOD] = period[i].p;
+-			dev->rep[REP_DELAY] = delay[j].d;
+-			param[0] = period[i].v | delay[j].v;
++			while (i < 32 && period[i] < dev->rep[REP_PERIOD]) i++;
++			while (j < 4 && delay[j] < dev->rep[REP_DELAY]) j++;
++			dev->rep[REP_PERIOD] = period[i];
++			dev->rep[REP_DELAY] = delay[j];
++			param[0] = i | (j << 5);
+ 			atkbd_command(atkbd, param, ATKBD_CMD_SETREP);
+ 
+ 			return 0;
+@@ -578,6 +585,7 @@ static void atkbd_disconnect(struct seri
+ 	struct atkbd *atkbd = serio->private;
+ 	input_unregister_device(&atkbd->dev);
+ 	serio_close(serio);
++	serio->private = NULL;
+ 	kfree(atkbd);
+ }
+ 
+@@ -623,6 +631,7 @@ static void atkbd_connect(struct serio *
+ 		atkbd->dev.rep[REP_PERIOD] = 33;
+ 	}
+ 
++	atkbd->ack = 1;
+ 	atkbd->serio = serio;
+ 
+ 	init_input_dev(&atkbd->dev);
+@@ -636,6 +645,7 @@ static void atkbd_connect(struct serio *
+ 	serio->private = atkbd;
+ 
+ 	if (serio_open(serio, dev)) {
++		serio->private = NULL;
+ 		kfree(atkbd);
+ 		return;
+ 	}
+@@ -644,6 +654,7 @@ static void atkbd_connect(struct serio *
+ 
+ 		if (atkbd_probe(atkbd)) {
+ 			serio_close(serio);
++			serio->private = NULL;
+ 			kfree(atkbd);
+ 			return;
+ 		}
+@@ -665,16 +676,22 @@ static void atkbd_connect(struct serio *
+ 
+ 	sprintf(atkbd->phys, "%s/input0", serio->phys);
+ 
+-	if (atkbd->set == 3)
+-		memcpy(atkbd->keycode, atkbd_set3_keycode, sizeof(atkbd->keycode));
+-	else
++	if (atkbd->translated) {
++		for (i = 0; i < 128; i++) {
++			atkbd->keycode[i] = atkbd_set2_keycode[atkbd_unxlate_table[i]];
++			atkbd->keycode[i | 0x80] = atkbd_set2_keycode[atkbd_unxlate_table[i] | 0x80];
++		}
++	} else if (atkbd->set == 2) {
+ 		memcpy(atkbd->keycode, atkbd_set2_keycode, sizeof(atkbd->keycode));
++	} else {
++		memcpy(atkbd->keycode, atkbd_set3_keycode, sizeof(atkbd->keycode));
++	}
+ 
+ 	atkbd->dev.name = atkbd->name;
+ 	atkbd->dev.phys = atkbd->phys;
+ 	atkbd->dev.id.bustype = BUS_I8042;
+ 	atkbd->dev.id.vendor = 0x0001;
+-	atkbd->dev.id.product = atkbd->set;
++	atkbd->dev.id.product = atkbd->translated ? 1 : atkbd->set;
+ 	atkbd->dev.id.version = atkbd->id;
+ 
+ 	for (i = 0; i < 512; i++)
+@@ -686,10 +703,62 @@ static void atkbd_connect(struct serio *
+ 	printk(KERN_INFO "input: %s on %s\n", atkbd->name, serio->phys);
+ }
+ 
++/*
++ * atkbd_reconnect() tries to restore keyboard into a sane state and is
++ * most likely called on resume.
++ */
++
++static int atkbd_reconnect(struct serio *serio)
++{
++	struct atkbd *atkbd = serio->private;
++	struct serio_dev *dev = serio->dev;
++	int i;
++
++        if (!dev) {
++                printk(KERN_DEBUG "atkbd: reconnect request, but serio is disconnected, ignoring...\n");
++                return -1;
++        }
++
++	if (atkbd->write) {
++		if (atkbd_probe(atkbd))
++			return -1;
++
++		atkbd->set = atkbd_set_3(atkbd);
++		atkbd_enable(atkbd);
++	} else {
++		atkbd->set = 2;
++		atkbd->id = 0xab00;
++	}
++
++	/*
++	 * Here we probably should check if the keyboard has the same set that
++         * it had before and bail out if it's different. But this will most likely
++         * cause new keyboard device be created... and for the user it will look
++         * like keyboard is lost
++	 */
++
++	if (atkbd->translated) {
++		for (i = 0; i < 128; i++) {
++			atkbd->keycode[i] = atkbd_set2_keycode[atkbd_unxlate_table[i]];
++			atkbd->keycode[i | 0x80] = atkbd_set2_keycode[atkbd_unxlate_table[i] | 0x80];
++		}
++	} else if (atkbd->set == 2) {
++		memcpy(atkbd->keycode, atkbd_set2_keycode, sizeof(atkbd->keycode));
++	} else {
++		memcpy(atkbd->keycode, atkbd_set3_keycode, sizeof(atkbd->keycode));
++	}
++
++	for (i = 0; i < 512; i++)
++		if (atkbd->keycode[i] && atkbd->keycode[i] < 255)
++			set_bit(atkbd->keycode[i], atkbd->dev.keybit);
++
++	return 0;
++}
+ 
+ static struct serio_dev atkbd_dev = {
+ 	.interrupt =	atkbd_interrupt,
+ 	.connect =	atkbd_connect,
++	.reconnect = 	atkbd_reconnect,
+ 	.disconnect =	atkbd_disconnect,
+ 	.cleanup =	atkbd_cleanup,
+ };
+@@ -709,9 +778,17 @@ static int __init atkbd_setup_reset(char
+         if (ints[0] > 0) atkbd_reset = ints[1];
+         return 1;
+ }
++static int __init atkbd_setup_softrepeat(char *str)
++{
++        int ints[4];
++        str = get_options(str, ARRAY_SIZE(ints), ints);
++        if (ints[0] > 0) atkbd_softrepeat = ints[1];
++        return 1;
++}
+ 
+ __setup("atkbd_set=", atkbd_setup_set);
+ __setup("atkbd_reset", atkbd_setup_reset);
++__setup("atkbd_softrepeat=", atkbd_setup_softrepeat);
+ #endif
+ 
+ int __init atkbd_init(void)
+--- linux-2.6.0/drivers/input/mousedev.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/input/mousedev.c	2003-12-28 23:21:31.000000000 -0800
+@@ -53,12 +53,14 @@ struct mousedev_list {
+ 	struct fasync_struct *fasync;
+ 	struct mousedev *mousedev;
+ 	struct list_head node;
+-	int dx, dy, dz, oldx, oldy;
+-	signed char ps2[6];
++	int dx, dy, dz;
++	int old_x[4], old_y[4];
+ 	unsigned long buttons;
++	signed char ps2[6];
+ 	unsigned char ready, buffer, bufsiz;
+ 	unsigned char mode, imexseq, impsseq;
+-	int finger;
++	unsigned int pkt_count;
++	unsigned char touch;
+ };
+ 
+ #define MOUSEDEV_SEQ_LEN	6
+@@ -74,49 +76,49 @@ static struct mousedev mousedev_mix;
+ static int xres = CONFIG_INPUT_MOUSEDEV_SCREEN_X;
+ static int yres = CONFIG_INPUT_MOUSEDEV_SCREEN_Y;
+ 
++#define fx(i)  (list->old_x[(list->pkt_count - (i)) & 03])
++#define fy(i)  (list->old_y[(list->pkt_count - (i)) & 03])
++
+ static void mousedev_abs_event(struct input_handle *handle, struct mousedev_list *list, unsigned int code, int value)
+ {
+ 	int size;
++	int touchpad;
+ 
+ 	/* Ignore joysticks */
+ 	if (test_bit(BTN_TRIGGER, handle->dev->keybit))
+ 		return;
+ 
+-	/* Handle touchpad data */
+-	if (test_bit(BTN_TOOL_FINGER, handle->dev->keybit)) {
++	touchpad = test_bit(BTN_TOOL_FINGER, handle->dev->keybit);
+ 
+-		if (list->finger && list->finger < 3)
+-			list->finger++;
+-
+-		switch (code) {
+-			case ABS_X:
+-				if (list->finger == 3)
+-					list->dx += (value - list->oldx) / 8;
+-				list->oldx = value;
+-				return;
+-			case ABS_Y:
+-				if (list->finger == 3)
+-					list->dy -= (value - list->oldy) / 8;
+-				list->oldy = value;
+-				return;
+-		}
+-		return;
+-	}
+-
+-	/* Handle tablet data */
+ 	switch (code) {
+ 		case ABS_X:
+-			size = handle->dev->absmax[ABS_X] - handle->dev->absmin[ABS_X];
+-			if (size == 0) size = xres;
+-			list->dx += (value * xres - list->oldx) / size;
+-			list->oldx += list->dx * size;
+-			return;
++			if (touchpad) {
++				if (list->touch) {
++					fx(0) = value;
++					if (list->pkt_count >= 2)
++						list->dx = ((fx(0) - fx(1)) / 2 + (fx(1) - fx(2)) / 2) / 8;
++				}
++			} else {
++				size = handle->dev->absmax[ABS_X] - handle->dev->absmin[ABS_X];
++				if (size == 0) size = xres;
++				list->dx += (value * xres - list->old_x[0]) / size;
++				list->old_x[0] += list->dx * size;
++			}
++			break;
+ 		case ABS_Y:
+-			size = handle->dev->absmax[ABS_Y] - handle->dev->absmin[ABS_Y];
+-			if (size == 0) size = yres;
+-			list->dy -= (value * yres - list->oldy) / size;
+-			list->oldy -= list->dy * size;
+-			return;
++			if (touchpad) {
++				if (list->touch) {
++					fy(0) = value;
++					if (list->pkt_count >= 2)
++						list->dy = -((fy(0) - fy(1)) / 2 + (fy(1) - fy(2)) / 2) / 8;
++				}
++			} else {
++				size = handle->dev->absmax[ABS_Y] - handle->dev->absmin[ABS_Y];
++				if (size == 0) size = yres;
++				list->dy -= (value * yres - list->old_y[0]) / size;
++				list->old_y[0] -= list->dy * size;
++			}
++			break;
+ 	}
+ }
+ 
+@@ -146,12 +148,16 @@ static void mousedev_event(struct input_
+ 					break;
+ 
+ 				case EV_KEY:
++					if (code == BTN_TOUCH && test_bit(BTN_TOOL_FINGER, handle->dev->keybit)) {
++						/* Handle touchpad data */
++						list->touch = value;
++						if (!list->touch)
++							list->pkt_count = 0;
++						break;
++					}
++
+ 					switch (code) {
+-						case BTN_TOUCH: /* Handle touchpad data */
+-							if (test_bit(BTN_TOOL_FINGER, handle->dev->keybit)) {
+-								list->finger = value;
+-								return;
+-							}
++						case BTN_TOUCH:
+ 						case BTN_0:
+ 						case BTN_FORWARD:
+ 						case BTN_LEFT:   index = 0; break;
+@@ -178,6 +184,16 @@ static void mousedev_event(struct input_
+ 				case EV_SYN:
+ 					switch (code) {
+ 						case SYN_REPORT:
++							if (list->touch) {
++								list->pkt_count++;
++								/* Input system eats duplicate events,
++								 * but we need all of them to do correct
++								 * averaging so apply present one forward
++								 */
++								fx(0) = fx(1);
++								fy(0) = fy(1);
++							}
++
+ 							list->ready = 1;
+ 							kill_fasync(&list->fasync, SIGIO, POLL_IN);
+ 							wake = 1;
+--- linux-2.6.0/drivers/input/mouse/Kconfig	2003-10-08 15:07:08.000000000 -0700
++++ 25/drivers/input/mouse/Kconfig	2003-12-28 23:21:30.000000000 -0800
+@@ -23,27 +23,18 @@ config MOUSE_PS2
+ 	  mice with wheels and extra buttons, Microsoft, Logitech or Genius
+ 	  compatible.
+ 
++	  Synaptics TouchPad users might be interested in a specialized
++	  XFree86 driver at:
++		http://w1.894.telia.com/~u89404340/touchpad/index.html
++	  and a new verion of GPM at:
++		http://www.geocities.com/dt_or/gpm/gpm.html
++	  to take advantage of the advanced features of the touchpad.
++
+ 	  If unsure, say Y.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called psmouse.
+ 
+-config MOUSE_PS2_SYNAPTICS
+-	bool "Synaptics TouchPad"
+-	default n
+-	depends on INPUT && INPUT_MOUSE && MOUSE_PS2
+-	---help---
+-	  Say Y here if you have a Synaptics TouchPad connected to your system.
+-	  This touchpad is found on many modern laptop computers.
+-
+-	  Note that you also need a user space driver to interpret the data
+-	  generated by the kernel. A compatible driver for XFree86 is available
+-	  from http://w1.894.telia.com/~u89404340/touchpad/index.html
+-
+-	  The gpm program is not yet able to interpret the data from this
+-	  driver, so if you need to use the touchpad in the console, you have to
+-	  say N for now.
+-
+ config MOUSE_SERIAL
+ 	tristate "Serial mouse"
+ 	depends on INPUT && INPUT_MOUSE
+--- linux-2.6.0/drivers/input/mouse/logips2pp.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/input/mouse/logips2pp.c	2003-12-28 23:21:28.000000000 -0800
+@@ -10,6 +10,7 @@
+  */
+ 
+ #include <linux/input.h>
++#include <linux/serio.h>
+ #include "psmouse.h"
+ #include "logips2pp.h"
+ 
+@@ -142,7 +143,7 @@ void ps2pp_set_800dpi(struct psmouse *ps
+  * touchpad.
+  */
+ 
+-int ps2pp_detect_model(struct psmouse *psmouse, unsigned char *param)
++static int ps2pp_detect_model(struct psmouse *psmouse, unsigned char *param)
+ {
+ 	int i;
+ 	static int logitech_4btn[] = { 12, 40, 41, 42, 43, 52, 73, 80, -1 };
+@@ -226,3 +227,22 @@ int ps2pp_detect_model(struct psmouse *p
+ 
+ 	return 0;
+ }
++
++/*
++ * Logitech magic init.
++ */
++int ps2pp_detect(struct psmouse *psmouse)
++{
++	unsigned char param[4];
++
++	param[0] = 0;
++	psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES);
++	psmouse_command(psmouse,  NULL, PSMOUSE_CMD_SETSCALE11);
++	psmouse_command(psmouse,  NULL, PSMOUSE_CMD_SETSCALE11);
++	psmouse_command(psmouse,  NULL, PSMOUSE_CMD_SETSCALE11);
++	param[1] = 0;
++	psmouse_command(psmouse, param, PSMOUSE_CMD_GETINFO);
++
++	return param[1] != 0 ? ps2pp_detect_model(psmouse, param) : 0;
++}
++
+--- linux-2.6.0/drivers/input/mouse/logips2pp.h	2003-06-22 12:04:44.000000000 -0700
++++ 25/drivers/input/mouse/logips2pp.h	2003-12-28 23:21:28.000000000 -0800
+@@ -13,5 +13,5 @@
+ struct psmouse;
+ void ps2pp_process_packet(struct psmouse *psmouse);
+ void ps2pp_set_800dpi(struct psmouse *psmouse);
+-int ps2pp_detect_model(struct psmouse *psmouse, unsigned char *param);
++int ps2pp_detect(struct psmouse *psmouse);
+ #endif
+--- linux-2.6.0/drivers/input/mouse/psmouse-base.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/input/mouse/psmouse-base.c	2003-12-28 23:21:30.000000000 -0800
+@@ -12,35 +12,44 @@
+ 
+ #include <linux/delay.h>
+ #include <linux/module.h>
++#include <linux/moduleparam.h>
+ #include <linux/slab.h>
+ #include <linux/interrupt.h>
+ #include <linux/input.h>
+ #include <linux/serio.h>
+ #include <linux/init.h>
+-#include <linux/pm.h>
+ #include "psmouse.h"
+ #include "synaptics.h"
+ #include "logips2pp.h"
+ 
+ MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>");
+ MODULE_DESCRIPTION("PS/2 mouse driver");
+-MODULE_PARM(psmouse_noext, "1i");
+-MODULE_PARM_DESC(psmouse_noext, "Disable any protocol extensions. Useful for KVM switches.");
+-MODULE_PARM(psmouse_resolution, "i");
+-MODULE_PARM_DESC(psmouse_resolution, "Resolution, in dpi.");
+-MODULE_PARM(psmouse_rate, "i");
+-MODULE_PARM_DESC(psmouse_rate, "Report rate, in reports per second.");
+-MODULE_PARM(psmouse_smartscroll, "i");
+-MODULE_PARM_DESC(psmouse_smartscroll, "Logitech Smartscroll autorepeat, 1 = enabled (default), 0 = disabled.");
+-MODULE_PARM(psmouse_resetafter, "i");
+-MODULE_PARM_DESC(psmouse_resetafter, "Reset Synaptics Touchpad after so many bad packets (0 = never).");
+ MODULE_LICENSE("GPL");
+ 
+ static int psmouse_noext;
++module_param(psmouse_noext, int, 0);
++MODULE_PARM_DESC(psmouse_noext, "[DEPRECATED] Disable any protocol extensions. Useful for KVM switches.");
++
++static char *psmouse_proto;
++static unsigned int psmouse_max_proto = -1UL;
++module_param(psmouse_proto, charp, 0);
++MODULE_PARM_DESC(psmouse_proto, "Highest protocol extension to probe (bare, imps, exps). Useful for KVM switches.");
++
+ int psmouse_resolution = 200;
++module_param(psmouse_resolution, uint, 0);
++MODULE_PARM_DESC(psmouse_resolution, "Resolution, in dpi.");
++
+ unsigned int psmouse_rate = 100;
++module_param(psmouse_rate, uint, 0);
++MODULE_PARM_DESC(psmouse_rate, "Report rate, in reports per second.");
++
+ int psmouse_smartscroll = 1;
++module_param(psmouse_smartscroll, bool, 0);
++MODULE_PARM_DESC(psmouse_smartscroll, "Logitech Smartscroll autorepeat, 1 = enabled (default), 0 = disabled.");
++
+ unsigned int psmouse_resetafter;
++module_param(psmouse_resetafter, uint, 0);
++MODULE_PARM_DESC(psmouse_resetafter, "Reset Synaptics Touchpad after so many bad packets (0 = never).");
+ 
+ static char *psmouse_protocols[] = { "None", "PS/2", "PS2++", "PS2T++", "GenPS/2", "ImPS/2", "ImExPS/2", "SynPS/2"};
+ 
+@@ -139,7 +148,8 @@ static irqreturn_t psmouse_interrupt(str
+ 		goto out;
+ 	}
+ 
+-	if (psmouse->pktcnt && time_after(jiffies, psmouse->last + HZ/2)) {
++	if (psmouse->state == PSMOUSE_ACTIVATED &&
++	    psmouse->pktcnt && time_after(jiffies, psmouse->last + HZ/2)) {
+ 		printk(KERN_WARNING "psmouse.c: %s at %s lost synchronization, throwing %d bytes away.\n",
+ 		       psmouse->name, psmouse->phys, psmouse->pktcnt);
+ 		psmouse->pktcnt = 0;
+@@ -257,46 +267,12 @@ int psmouse_command(struct psmouse *psmo
+ }
+ 
+ /*
+- * psmouse_extensions() probes for any extensions to the basic PS/2 protocol
+- * the mouse may have.
++ * Genius NetMouse magic init.
+  */
+-
+-static int psmouse_extensions(struct psmouse *psmouse)
++static int genius_detect(struct psmouse *psmouse)
+ {
+ 	unsigned char param[4];
+ 
+-	param[0] = 0;
+-	psmouse->vendor = "Generic";
+-	psmouse->name = "Mouse";
+-	psmouse->model = 0;
+-
+-	if (psmouse_noext)
+-		return PSMOUSE_PS2;
+-
+-/*
+- * Try Synaptics TouchPad magic ID
+- */
+-
+-       param[0] = 0;
+-       psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES);
+-       psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES);
+-       psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES);
+-       psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES);
+-       psmouse_command(psmouse, param, PSMOUSE_CMD_GETINFO);
+-
+-       if (param[1] == 0x47) {
+-		psmouse->vendor = "Synaptics";
+-		psmouse->name = "TouchPad";
+-		if (!synaptics_init(psmouse))
+-			return PSMOUSE_SYNAPTICS;
+-		else
+-			return PSMOUSE_PS2;
+-       }
+-
+-/*
+- * Try Genius NetMouse magic init.
+- */
+-
+ 	param[0] = 3;
+ 	psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES);
+ 	psmouse_command(psmouse,  NULL, PSMOUSE_CMD_SETSCALE11);
+@@ -304,65 +280,99 @@ static int psmouse_extensions(struct psm
+ 	psmouse_command(psmouse,  NULL, PSMOUSE_CMD_SETSCALE11);
+ 	psmouse_command(psmouse, param, PSMOUSE_CMD_GETINFO);
+ 
+-	if (param[0] == 0x00 && param[1] == 0x33 && param[2] == 0x55) {
+-
+-		set_bit(BTN_EXTRA, psmouse->dev.keybit);
+-		set_bit(BTN_SIDE, psmouse->dev.keybit);
+-		set_bit(REL_WHEEL, psmouse->dev.relbit);
+-
+-		psmouse->vendor = "Genius";
+-		psmouse->name = "Wheel Mouse";
+-		return PSMOUSE_GENPS;
+-	}
++	return param[0] == 0x00 && param[1] == 0x33 && param[2] == 0x55;
++}
+ 
+ /*
+- * Try Logitech magic ID.
++ * IntelliMouse magic init.
+  */
++static int intellimouse_detect(struct psmouse *psmouse)
++{
++	unsigned char param[2];
+ 
+-	param[0] = 0;
+-	psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES);
+-	psmouse_command(psmouse,  NULL, PSMOUSE_CMD_SETSCALE11);
+-	psmouse_command(psmouse,  NULL, PSMOUSE_CMD_SETSCALE11);
+-	psmouse_command(psmouse,  NULL, PSMOUSE_CMD_SETSCALE11);
+-	param[1] = 0;
+-	psmouse_command(psmouse, param, PSMOUSE_CMD_GETINFO);
++	param[0] = 200;
++	psmouse_command(psmouse, param, PSMOUSE_CMD_SETRATE);
++	param[0] = 100;
++	psmouse_command(psmouse, param, PSMOUSE_CMD_SETRATE);
++	param[0] =  80;
++	psmouse_command(psmouse, param, PSMOUSE_CMD_SETRATE);
++	psmouse_command(psmouse, param, PSMOUSE_CMD_GETID);
+ 
+-	if (param[1]) {
+-		int type = ps2pp_detect_model(psmouse, param);
+-		if (type)
+-			return type;
+-	}
++	return param[0] == 3;
++}
+ 
+ /*
+- * Try IntelliMouse magic init.
++ * Try IntelliMouse/Explorer magic init.
+  */
++static int im_explorer_detect(struct psmouse *psmouse)
++{
++	unsigned char param[2];
+ 
+ 	param[0] = 200;
+ 	psmouse_command(psmouse, param, PSMOUSE_CMD_SETRATE);
+-	param[0] = 100;
++	param[0] = 200;
+ 	psmouse_command(psmouse, param, PSMOUSE_CMD_SETRATE);
+ 	param[0] =  80;
+ 	psmouse_command(psmouse, param, PSMOUSE_CMD_SETRATE);
+ 	psmouse_command(psmouse, param, PSMOUSE_CMD_GETID);
+-	
+-	if (param[0] == 3) {
+ 
+-		set_bit(REL_WHEEL, psmouse->dev.relbit);
++	return param[0] == 4;
++}
+ 
+ /*
+- * Try IntelliMouse/Explorer magic init.
++ * psmouse_extensions() probes for any extensions to the basic PS/2 protocol
++ * the mouse may have.
++ */
++
++static int psmouse_extensions(struct psmouse *psmouse)
++{
++	int synaptics_hardware = 0;
++
++	psmouse->vendor = "Generic";
++	psmouse->name = "Mouse";
++	psmouse->model = 0;
++
++/*
++ * Try Synaptics TouchPad
+  */
++	if (psmouse_max_proto > PSMOUSE_PS2 && synaptics_detect(psmouse)) {
++		synaptics_hardware = 1;
++		psmouse->vendor = "Synaptics";
++		psmouse->name = "TouchPad";
+ 
+-		param[0] = 200;
+-		psmouse_command(psmouse, param, PSMOUSE_CMD_SETRATE);
+-		param[0] = 200;
+-		psmouse_command(psmouse, param, PSMOUSE_CMD_SETRATE);
+-		param[0] =  80;
+-		psmouse_command(psmouse, param, PSMOUSE_CMD_SETRATE);
+-		psmouse_command(psmouse, param, PSMOUSE_CMD_GETID);
++		if (psmouse_max_proto > PSMOUSE_IMEX) {
++			if (synaptics_init(psmouse) == 0)
++				return PSMOUSE_SYNAPTICS;
++/*
++ * Some Synaptics touchpads can emulate extended protocols (like IMPS/2).
++ * Unfortunately Logitech/Genius probes confuse some firmware versions so
++ * we'll have to skip them.
++ */
++			psmouse_max_proto = PSMOUSE_IMEX;
++		}
++	}
+ 
+-		if (param[0] == 4) {
++	if (psmouse_max_proto > PSMOUSE_IMEX && genius_detect(psmouse)) {
++		set_bit(BTN_EXTRA, psmouse->dev.keybit);
++		set_bit(BTN_SIDE, psmouse->dev.keybit);
++		set_bit(REL_WHEEL, psmouse->dev.relbit);
+ 
++		psmouse->vendor = "Genius";
++		psmouse->name = "Wheel Mouse";
++		return PSMOUSE_GENPS;
++	}
++
++	if (psmouse_max_proto > PSMOUSE_IMEX) {
++		int type = ps2pp_detect(psmouse);
++		if (type)
++			return type;
++	}
++
++	if (psmouse_max_proto >= PSMOUSE_IMPS && intellimouse_detect(psmouse)) {
++		set_bit(REL_WHEEL, psmouse->dev.relbit);
++
++		if (psmouse_max_proto >= PSMOUSE_IMEX &&
++					im_explorer_detect(psmouse)) {
+ 			set_bit(BTN_SIDE, psmouse->dev.keybit);
+ 			set_bit(BTN_EXTRA, psmouse->dev.keybit);
+ 
+@@ -378,6 +388,15 @@ static int psmouse_extensions(struct psm
+  * Okay, all failed, we have a standard mouse here. The number of the buttons
+  * is still a question, though. We assume 3.
+  */
++	if (synaptics_hardware) {
++/*
++ * We detected Synaptics hardware but it did not respond to IMPS/2 probes.
++ * We need to reset the touchpad because if there is a track point on the
++ * pass through port it could get disabled while probing for protocol
++ * extensions.
++ */
++		psmouse_command(psmouse, NULL, PSMOUSE_CMD_RESET_DIS);
++	}
+ 
+ 	return PSMOUSE_PS2;
+ }
+@@ -468,7 +487,7 @@ static void psmouse_initialize(struct ps
+  * We set the mouse report rate, resolution and scaling.
+  */
+ 
+-	if (!psmouse_noext) {
++	if (psmouse_max_proto != PSMOUSE_PS2) {
+ 		psmouse_set_rate(psmouse);
+ 		psmouse_set_resolution(psmouse);
+ 		psmouse_command(psmouse,  NULL, PSMOUSE_CMD_SETSCALE11);
+@@ -513,45 +532,30 @@ static void psmouse_disconnect(struct se
+ 	struct psmouse *psmouse = serio->private;
+ 
+ 	psmouse->state = PSMOUSE_IGNORE;
+-	synaptics_disconnect(psmouse);
+-	input_unregister_device(&psmouse->dev);
+-	serio_close(serio);
+-	kfree(psmouse);
+-}
+-
+-/*
+- * Reinitialize mouse hardware after software suspend.
+- */
+-
+-static int psmouse_pm_callback(struct pm_dev *dev, pm_request_t request, void *data)
+-{
+-	struct psmouse *psmouse = dev->data;
+-	struct serio_dev *ser_dev = psmouse->serio->dev;
+-
+-	synaptics_disconnect(psmouse);
+ 
+-	/* We need to reopen the serio port to reinitialize the i8042 controller */
+-	serio_close(psmouse->serio);
+-	serio_open(psmouse->serio, ser_dev);
++	if (psmouse->ptport) {
++		if (psmouse->ptport->deactivate)
++			psmouse->ptport->deactivate(psmouse);
++		__serio_unregister_port(&psmouse->ptport->serio); /* we have serio_sem */
++		kfree(psmouse->ptport);
++		psmouse->ptport = NULL;
++	}
+ 
+-	/* Probe and re-initialize the mouse */
+-	psmouse_probe(psmouse);
+-	psmouse_initialize(psmouse);
+-	synaptics_pt_init(psmouse);
+-	psmouse_activate(psmouse);
++	if (psmouse->disconnect)
++		psmouse->disconnect(psmouse);
+ 
+-	return 0;
++	input_unregister_device(&psmouse->dev);
++	serio_close(serio);
++	kfree(psmouse);
+ }
+ 
+ /*
+  * psmouse_connect() is a callback from the serio module when
+  * an unhandled serio port is found.
+  */
+-
+ static void psmouse_connect(struct serio *serio, struct serio_dev *dev)
+ {
+ 	struct psmouse *psmouse;
+-	struct pm_dev *pmdev;
+ 	
+ 	if ((serio->type & SERIO_TYPE) != SERIO_8042 &&
+ 	    (serio->type & SERIO_TYPE) != SERIO_PS_PSTHRU)
+@@ -572,7 +576,6 @@ static void psmouse_connect(struct serio
+ 	psmouse->dev.private = psmouse;
+ 
+ 	serio->private = psmouse;
+-
+ 	if (serio_open(serio, dev)) {
+ 		kfree(psmouse);
+ 		return;
+@@ -584,12 +587,6 @@ static void psmouse_connect(struct serio
+ 		return;
+ 	}
+ 	
+-	pmdev = pm_register(PM_SYS_DEV, PM_SYS_UNKNOWN, psmouse_pm_callback);
+-	if (pmdev) {
+-		psmouse->dev.pm_dev = pmdev;
+-		pmdev->data = psmouse;
+-	}
+-
+ 	sprintf(psmouse->devname, "%s %s %s",
+ 		psmouse_protocols[psmouse->type], psmouse->vendor, psmouse->name);
+ 	sprintf(psmouse->phys, "%s/input0",
+@@ -608,59 +605,87 @@ static void psmouse_connect(struct serio
+ 
+ 	psmouse_initialize(psmouse);
+ 
+-	synaptics_pt_init(psmouse);
++	if (psmouse->ptport) {
++		printk(KERN_INFO "serio: %s port at %s\n", psmouse->ptport->serio.name, psmouse->phys);
++		__serio_register_port(&psmouse->ptport->serio); /* we have serio_sem */
++		if (psmouse->ptport->activate)
++			psmouse->ptport->activate(psmouse);
++	}
++
++	psmouse_activate(psmouse);
++}
++
++
++static int psmouse_reconnect(struct serio *serio)
++{
++	struct psmouse *psmouse = serio->private;
++	struct serio_dev *dev = serio->dev;
++	int old_type = psmouse->type;
++
++	if (!dev) {
++		printk(KERN_DEBUG "psmouse: reconnect request, but serio is disconnected, ignoring...\n");
++		return -1;
++	}
++
++	psmouse->state = PSMOUSE_NEW_DEVICE;
++	psmouse->type = psmouse->acking = psmouse->cmdcnt = psmouse->pktcnt = 0;
++	if (psmouse->reconnect) {
++	       if (psmouse->reconnect(psmouse))
++			return -1;
++	} else if (psmouse_probe(psmouse) != old_type)
++		return -1;
++
++	/* ok, the device type (and capabilities) match the old one,
++	 * we can continue using it, complete intialization
++	 */
++	psmouse->type = old_type;
++	psmouse_initialize(psmouse);
++
++	if (psmouse->ptport) {
++       		if (psmouse_reconnect(&psmouse->ptport->serio)) {
++			__serio_unregister_port(&psmouse->ptport->serio);
++			__serio_register_port(&psmouse->ptport->serio);
++			if (psmouse->ptport->activate)
++				psmouse->ptport->activate(psmouse);
++		}
++	}
+ 
+ 	psmouse_activate(psmouse);
++	return 0;
+ }
+ 
++
+ static struct serio_dev psmouse_dev = {
+ 	.interrupt =	psmouse_interrupt,
+ 	.connect =	psmouse_connect,
++	.reconnect =	psmouse_reconnect,
+ 	.disconnect =	psmouse_disconnect,
+ 	.cleanup =	psmouse_cleanup,
+ };
+ 
+-#ifndef MODULE
+-static int __init psmouse_noext_setup(char *str)
+-{
+-	psmouse_noext = 1;
+-	return 1;
+-}
+-
+-static int __init psmouse_resolution_setup(char *str)
+-{
+-	get_option(&str, &psmouse_resolution);
+-	return 1;
+-}
+-
+-static int __init psmouse_smartscroll_setup(char *str)
++static inline void psmouse_parse_proto(void)
+ {
+-	get_option(&str, &psmouse_smartscroll);
+-	return 1;
+-}
+-
+-static int __init psmouse_resetafter_setup(char *str)
+-{
+-	get_option(&str, &psmouse_resetafter);
+-	return 1;
+-}
++	if (psmouse_noext) {
++		printk(KERN_WARNING "psmouse: 'psmouse_noext' option is deprecated, please use 'psmouse_proto'\n");
++		psmouse_max_proto = PSMOUSE_PS2;
++	}
+ 
+-static int __init psmouse_rate_setup(char *str)
+-{
+-	get_option(&str, &psmouse_rate);
+-	return 1;
++	/* even is psmouse_noext is present psmouse_proto overrides it */
++	if (psmouse_proto) {
++		if (!strcmp(psmouse_proto, "bare"))
++			psmouse_max_proto = PSMOUSE_PS2;
++		else if (!strcmp(psmouse_proto, "imps"))
++			psmouse_max_proto = PSMOUSE_IMPS;
++		else if (!strcmp(psmouse_proto, "exps"))
++			psmouse_max_proto = PSMOUSE_IMEX;
++		else
++			printk(KERN_ERR "psmouse: unknown protocol type '%s'\n", psmouse_proto);
++	}
+ }
+ 
+-__setup("psmouse_noext", psmouse_noext_setup);
+-__setup("psmouse_resolution=", psmouse_resolution_setup);
+-__setup("psmouse_smartscroll=", psmouse_smartscroll_setup);
+-__setup("psmouse_resetafter=", psmouse_resetafter_setup);
+-__setup("psmouse_rate=", psmouse_rate_setup);
+-
+-#endif
+-
+ int __init psmouse_init(void)
+ {
++	psmouse_parse_proto();
+ 	serio_register_device(&psmouse_dev);
+ 	return 0;
+ }
+--- linux-2.6.0/drivers/input/mouse/psmouse.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/input/mouse/psmouse.h	2003-12-28 23:21:27.000000000 -0800
+@@ -22,10 +22,20 @@
+ #define PSMOUSE_ACTIVATED	1
+ #define PSMOUSE_IGNORE		2
+ 
++struct psmouse;
++
++struct psmouse_ptport {
++	struct serio serio;
++
++	void (*activate)(struct psmouse *parent);
++	void (*deactivate)(struct psmouse *parent);
++};
++
+ struct psmouse {
+ 	void *private;
+ 	struct input_dev dev;
+ 	struct serio *serio;
++	struct psmouse_ptport *ptport;
+ 	char *vendor;
+ 	char *name;
+ 	unsigned char cmdbuf[8];
+@@ -41,6 +51,9 @@ struct psmouse {
+ 	char error;
+ 	char devname[64];
+ 	char phys[32];
++
++	int (*reconnect)(struct psmouse *psmouse);
++	void (*disconnect)(struct psmouse *psmouse);
+ };
+ 
+ #define PSMOUSE_PS2		1
+--- linux-2.6.0/drivers/input/mouse/synaptics.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/input/mouse/synaptics.c	2003-12-28 23:21:31.000000000 -0800
+@@ -2,7 +2,8 @@
+  * Synaptics TouchPad PS/2 mouse driver
+  *
+  *   2003 Dmitry Torokhov <dtor@mail.ru>
+- *     Added support for pass-through port
++ *     Added support for pass-through port. Special thanks to Peter Berg Larsen
++ *     for explaining various Synaptics quirks.
+  *
+  *   2003 Peter Osterlund <petero2@telia.com>
+  *     Ported to 2.5 input device infrastructure.
+@@ -194,9 +195,7 @@ static void print_ident(struct synaptics
+ 
+ static int synaptics_query_hardware(struct psmouse *psmouse)
+ {
+-	struct synaptics_data *priv = psmouse->private;
+ 	int retries = 0;
+-	int mode;
+ 
+ 	while ((retries++ < 3) && synaptics_reset(psmouse))
+ 		printk(KERN_ERR "synaptics reset failed\n");
+@@ -208,7 +207,14 @@ static int synaptics_query_hardware(stru
+ 	if (synaptics_capability(psmouse))
+ 		return -1;
+ 
+-	mode = SYN_BIT_ABSOLUTE_MODE | SYN_BIT_HIGH_RATE;
++	return 0;
++}
++
++static int synaptics_set_mode(struct psmouse *psmouse, int mode)
++{
++	struct synaptics_data *priv = psmouse->private;
++
++	mode |= SYN_BIT_ABSOLUTE_MODE | SYN_BIT_HIGH_RATE;
+ 	if (SYN_ID_MAJOR(priv->identity) >= 4)
+ 		mode |= SYN_BIT_DISABLE_GESTURE;
+ 	if (SYN_CAP_EXTENDED(priv->capabilities))
+@@ -265,49 +271,38 @@ static void synaptics_pass_pt_packet(str
+ 	}
+ }
+ 
+-int synaptics_pt_init(struct psmouse *psmouse)
++static void synaptics_pt_activate(struct psmouse *psmouse)
+ {
+-	struct synaptics_data *priv = psmouse->private;
+-	struct serio *port;
+-	struct psmouse *child;
++	struct psmouse *child = psmouse->ptport->serio.private;
+ 
+-	if (psmouse->type != PSMOUSE_SYNAPTICS)
+-		return -1;
+-	if (!SYN_CAP_EXTENDED(priv->capabilities))
+-		return -1;
+-	if (!SYN_CAP_PASS_THROUGH(priv->capabilities))
+-		return -1;
++	/* adjust the touchpad to child's choice of protocol */
++	if (child && child->type >= PSMOUSE_GENPS) {
++		if (synaptics_set_mode(psmouse, SYN_BIT_FOUR_BYTE_CLIENT))
++			printk(KERN_INFO "synaptics: failed to enable 4-byte guest protocol\n");
++	}
++}
+ 
+-	priv->ptport = port = kmalloc(sizeof(struct serio), GFP_KERNEL);
++static void synaptics_pt_create(struct psmouse *psmouse)
++{
++	struct psmouse_ptport *port;
++
++	psmouse->ptport = port = kmalloc(sizeof(struct psmouse_ptport), GFP_KERNEL);
+ 	if (!port) {
+-		printk(KERN_ERR "synaptics: not enough memory to allocate serio port\n");
+-		return -1;
++		printk(KERN_ERR "synaptics: not enough memory to allocate pass-through port\n");
++		return;
+ 	}
+ 
+-	memset(port, 0, sizeof(struct serio));
+-	port->type = SERIO_PS_PSTHRU;
+-	port->name = "Synaptics pass-through";
+-	port->phys = "synaptics-pt/serio0";
+-	port->write = synaptics_pt_write;
+-	port->open = synaptics_pt_open;
+-	port->close = synaptics_pt_close;
+-	port->driver = psmouse;
++	memset(port, 0, sizeof(struct psmouse_ptport));
+ 
+-	printk(KERN_INFO "serio: %s port at %s\n", port->name, psmouse->phys);
+-	serio_register_slave_port(port);
++	port->serio.type = SERIO_PS_PSTHRU;
++	port->serio.name = "Synaptics pass-through";
++	port->serio.phys = "synaptics-pt/serio0";
++	port->serio.write = synaptics_pt_write;
++	port->serio.open = synaptics_pt_open;
++	port->serio.close = synaptics_pt_close;
++	port->serio.driver = psmouse;
+ 
+-	/* adjust the touchpad to child's choice of protocol */
+-	child = port->private;
+-	if (child && child->type >= PSMOUSE_GENPS) {
+-		if (synaptics_mode_cmd(psmouse, (SYN_BIT_ABSOLUTE_MODE |
+-					 	 SYN_BIT_HIGH_RATE |
+-					 	 SYN_BIT_DISABLE_GESTURE |
+-						 SYN_BIT_FOUR_BYTE_CLIENT |
+-					 	 SYN_BIT_W_MODE)))
+-			printk(KERN_INFO "synaptics: failed to enable 4-byte guest protocol\n");
+-	}
+-
+-	return 0;
++	port->activate = synaptics_pt_activate;
+ }
+ 
+ /*****************************************************************************
+@@ -371,27 +366,82 @@ static void set_input_params(struct inpu
+ 	clear_bit(REL_Y, dev->relbit);
+ }
+ 
++static void synaptics_disconnect(struct psmouse *psmouse)
++{
++	synaptics_mode_cmd(psmouse, 0);
++	kfree(psmouse->private);
++}
++
++static int synaptics_reconnect(struct psmouse *psmouse)
++{
++	struct synaptics_data *priv = psmouse->private;
++	struct synaptics_data old_priv = *priv;
++
++	if (!synaptics_detect(psmouse))
++		return -1;
++
++	if (synaptics_query_hardware(psmouse)) {
++		printk(KERN_ERR "Unable to query Synaptics hardware.\n");
++		return -1;
++	}
++
++	if (old_priv.identity != priv->identity ||
++	    old_priv.model_id != priv->model_id ||
++	    old_priv.capabilities != priv->capabilities ||
++    	    old_priv.ext_cap != priv->ext_cap)
++    		return -1;
++
++	if (synaptics_set_mode(psmouse, 0)) {
++		printk(KERN_ERR "Unable to initialize Synaptics hardware.\n");
++		return -1;
++	}
++
++	return 0;
++}
++
++int synaptics_detect(struct psmouse *psmouse)
++{
++	unsigned char param[4];
++
++	param[0] = 0;
++
++	psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES);
++	psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES);
++	psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES);
++	psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES);
++	psmouse_command(psmouse, param, PSMOUSE_CMD_GETINFO);
++
++	return param[1] == 0x47;
++}
++
+ int synaptics_init(struct psmouse *psmouse)
+ {
+ 	struct synaptics_data *priv;
+ 
+-#ifndef CONFIG_MOUSE_PS2_SYNAPTICS
+-	return -1;
+-#endif
+-
+ 	psmouse->private = priv = kmalloc(sizeof(struct synaptics_data), GFP_KERNEL);
+ 	if (!priv)
+ 		return -1;
+ 	memset(priv, 0, sizeof(struct synaptics_data));
+ 
+ 	if (synaptics_query_hardware(psmouse)) {
+-		printk(KERN_ERR "Unable to query/initialize Synaptics hardware.\n");
++		printk(KERN_ERR "Unable to query Synaptics hardware.\n");
+ 		goto init_fail;
+ 	}
+ 
++	if (synaptics_set_mode(psmouse, 0)) {
++		printk(KERN_ERR "Unable to initialize Synaptics hardware.\n");
++		goto init_fail;
++	}
++
++	if (SYN_CAP_EXTENDED(priv->capabilities) && SYN_CAP_PASS_THROUGH(priv->capabilities))
++       		synaptics_pt_create(psmouse);
++
+ 	print_ident(priv);
+ 	set_input_params(&psmouse->dev, priv);
+ 
++	psmouse->disconnect = synaptics_disconnect;
++	psmouse->reconnect = synaptics_reconnect;
++
+ 	return 0;
+ 
+  init_fail:
+@@ -399,36 +449,13 @@ int synaptics_init(struct psmouse *psmou
+ 	return -1;
+ }
+ 
+-void synaptics_disconnect(struct psmouse *psmouse)
+-{
+-	struct synaptics_data *priv = psmouse->private;
+-
+-	if (psmouse->type == PSMOUSE_SYNAPTICS && priv) {
+-		synaptics_mode_cmd(psmouse, 0);
+-		if (priv->ptport) {
+-			serio_unregister_slave_port(priv->ptport);
+-			kfree(priv->ptport);
+-		}
+-		kfree(priv);
+-	}
+-}
+-
+ /*****************************************************************************
+  *	Functions to interpret the absolute mode packets
+  ****************************************************************************/
+ 
+ static void synaptics_parse_hw_state(unsigned char buf[], struct synaptics_data *priv, struct synaptics_hw_state *hw)
+ {
+-	hw->up    = 0;
+-	hw->down  = 0;
+-	hw->b0    = 0;
+-	hw->b1    = 0;
+-	hw->b2    = 0;
+-	hw->b3    = 0;
+-	hw->b4    = 0;
+-	hw->b5    = 0;
+-	hw->b6    = 0;
+-	hw->b7    = 0;
++	memset(hw, 0, sizeof(struct synaptics_hw_state));
+ 
+ 	if (SYN_MODEL_NEWABS(priv->model_id)) {
+ 		hw->x = (((buf[3] & 0x10) << 8) |
+@@ -526,16 +553,19 @@ static void synaptics_process_packet(str
+ 		finger_width = 0;
+ 	}
+ 
+-	/* Post events */
++	/* Post events
++	 * BTN_TOUCH has to be first as mousedev relies on it when doing
++	 * absolute -> relative conversion
++	 */
++	if (hw.z > 30) input_report_key(dev, BTN_TOUCH, 1);
++	if (hw.z < 25) input_report_key(dev, BTN_TOUCH, 0);
++
+ 	if (hw.z > 0) {
+ 		input_report_abs(dev, ABS_X, hw.x);
+ 		input_report_abs(dev, ABS_Y, YMAX_NOMINAL + YMIN_NOMINAL - hw.y);
+ 	}
+ 	input_report_abs(dev, ABS_PRESSURE, hw.z);
+ 
+-	if (hw.z > 30) input_report_key(dev, BTN_TOUCH, 1);
+-	if (hw.z < 25) input_report_key(dev, BTN_TOUCH, 0);
+-
+ 	input_report_abs(dev, ABS_TOOL_WIDTH, finger_width);
+ 	input_report_key(dev, BTN_TOOL_FINGER, num_fingers == 1);
+ 	input_report_key(dev, BTN_TOOL_DOUBLETAP, num_fingers == 2);
+@@ -570,64 +600,47 @@ static void synaptics_process_packet(str
+ 	input_sync(dev);
+ }
+ 
++static int synaptics_validate_byte(struct psmouse *psmouse)
++{
++	static unsigned char newabs_mask[] = { 0xC0, 0x00, 0x00, 0xC0, 0x00 };
++	static unsigned char newabs_rslt[] = { 0x80, 0x00, 0x00, 0xC0, 0x00 };
++	static unsigned char oldabs_mask[] = { 0xC0, 0x60, 0x00, 0xC0, 0x60 };
++	static unsigned char oldabs_rslt[] = { 0xC0, 0x00, 0x00, 0x80, 0x00 };
++	struct synaptics_data *priv = psmouse->private;
++	int idx = psmouse->pktcnt - 1;
++
++	if (SYN_MODEL_NEWABS(priv->model_id))
++		return (psmouse->packet[idx] & newabs_mask[idx]) == newabs_rslt[idx];
++	else
++		return (psmouse->packet[idx] & oldabs_mask[idx]) == oldabs_rslt[idx];
++}
++
+ void synaptics_process_byte(struct psmouse *psmouse, struct pt_regs *regs)
+ {
+ 	struct input_dev *dev = &psmouse->dev;
+ 	struct synaptics_data *priv = psmouse->private;
+-	unsigned char data = psmouse->packet[psmouse->pktcnt - 1];
+-	int newabs = SYN_MODEL_NEWABS(priv->model_id);
+ 
+ 	input_regs(dev, regs);
+ 
+-	switch (psmouse->pktcnt) {
+-	case 1:
+-		if (newabs ? ((data & 0xC8) != 0x80) : ((data & 0xC0) != 0xC0)) {
+-			printk(KERN_WARNING "Synaptics driver lost sync at 1st byte\n");
+-			goto bad_sync;
+-		}
+-		break;
+-	case 2:
+-		if (!newabs && ((data & 0x60) != 0x00)) {
+-			printk(KERN_WARNING "Synaptics driver lost sync at 2nd byte\n");
+-			goto bad_sync;
+-		}
+-		break;
+-	case 4:
+-		if (newabs ? ((data & 0xC8) != 0xC0) : ((data & 0xC0) != 0x80)) {
+-			printk(KERN_WARNING "Synaptics driver lost sync at 4th byte\n");
+-			goto bad_sync;
+-		}
+-		break;
+-	case 5:
+-		if (!newabs && ((data & 0x60) != 0x00)) {
+-			printk(KERN_WARNING "Synaptics driver lost sync at 5th byte\n");
+-			goto bad_sync;
+-		}
+-		break;
+-	default:
+-		if (psmouse->pktcnt < 6)
+-			break;		    /* Wait for full packet */
+-
++	if (psmouse->pktcnt >= 6) { /* Full packet received */
+ 		if (priv->out_of_sync) {
+ 			priv->out_of_sync = 0;
+ 			printk(KERN_NOTICE "Synaptics driver resynced.\n");
+ 		}
+ 
+-		if (priv->ptport && synaptics_is_pt_packet(psmouse->packet))
+-			synaptics_pass_pt_packet(priv->ptport, psmouse->packet);
++		if (psmouse->ptport && psmouse->ptport->serio.dev && synaptics_is_pt_packet(psmouse->packet))
++			synaptics_pass_pt_packet(&psmouse->ptport->serio, psmouse->packet);
+ 		else
+ 			synaptics_process_packet(psmouse);
+-
+ 		psmouse->pktcnt = 0;
+-		break;
+-	}
+-	return;
+ 
+- bad_sync:
+-	priv->out_of_sync++;
+-	psmouse->pktcnt = 0;
+-	if (psmouse_resetafter > 0 && priv->out_of_sync	== psmouse_resetafter) {
+-		psmouse->state = PSMOUSE_IGNORE;
+-		serio_rescan(psmouse->serio);
++	} else if (psmouse->pktcnt && !synaptics_validate_byte(psmouse)) {
++		printk(KERN_WARNING "Synaptics driver lost sync at byte %d\n", psmouse->pktcnt);
++		psmouse->pktcnt = 0;
++		if (++priv->out_of_sync == psmouse_resetafter) {
++			psmouse->state = PSMOUSE_IGNORE;
++			printk(KERN_NOTICE "synaptics: issuing reconnect request\n");
++			serio_reconnect(psmouse->serio);
++		}
+ 	}
+ }
+--- linux-2.6.0/drivers/input/mouse/synaptics.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/input/mouse/synaptics.h	2003-12-28 23:21:27.000000000 -0800
+@@ -9,11 +9,9 @@
+ #ifndef _SYNAPTICS_H
+ #define _SYNAPTICS_H
+ 
+-
+ extern void synaptics_process_byte(struct psmouse *psmouse, struct pt_regs *regs);
++extern int synaptics_detect(struct psmouse *psmouse);
+ extern int synaptics_init(struct psmouse *psmouse);
+-extern int synaptics_pt_init(struct psmouse *psmouse);
+-extern void synaptics_disconnect(struct psmouse *psmouse);
+ 
+ /* synaptics queries */
+ #define SYN_QUE_IDENTIFY		0x00
+@@ -105,8 +103,6 @@ struct synaptics_data {
+ 	/* Data for normal processing */
+ 	unsigned int out_of_sync;		/* # of packets out of sync */
+ 	int old_w;				/* Previous w value */
+-	
+-	struct serio *ptport;			/* pass-through port */
+ };
+ 
+ #endif /* _SYNAPTICS_H */
+--- linux-2.6.0/drivers/input/serio/i8042.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/input/serio/i8042.c	2003-12-28 23:21:30.000000000 -0800
+@@ -12,11 +12,14 @@
+ 
+ #include <linux/delay.h>
+ #include <linux/module.h>
++#include <linux/moduleparam.h>
+ #include <linux/interrupt.h>
+ #include <linux/ioport.h>
+ #include <linux/config.h>
+ #include <linux/reboot.h>
+ #include <linux/init.h>
++#include <linux/sysdev.h>
++#include <linux/pm.h>
+ #include <linux/serio.h>
+ 
+ #include <asm/io.h>
+@@ -25,19 +28,23 @@ MODULE_AUTHOR("Vojtech Pavlik <vojtech@s
+ MODULE_DESCRIPTION("i8042 keyboard and mouse controller driver");
+ MODULE_LICENSE("GPL");
+ 
+-MODULE_PARM(i8042_noaux, "1i");
+-MODULE_PARM(i8042_nomux, "1i");
+-MODULE_PARM(i8042_unlock, "1i");
+-MODULE_PARM(i8042_reset, "1i");
+-MODULE_PARM(i8042_direct, "1i");
+-MODULE_PARM(i8042_dumbkbd, "1i");
+-
+-static int i8042_reset;
+-static int i8042_noaux;
+-static int i8042_nomux;
+-static int i8042_unlock;
+-static int i8042_direct;
+-static int i8042_dumbkbd;
++static unsigned int i8042_noaux;
++module_param(i8042_noaux, bool, 0);
++
++static unsigned int i8042_nomux;
++module_param(i8042_nomux, bool, 0);
++
++static unsigned int i8042_unlock;
++module_param(i8042_unlock, bool, 0);
++
++static unsigned int i8042_reset;
++module_param(i8042_reset, bool, 0);
++
++static unsigned int i8042_direct;
++module_param(i8042_direct, bool, 0);
++
++static unsigned int i8042_dumbkbd;
++module_param(i8042_dumbkbd, bool, 0);
+ 
+ #undef DEBUG
+ #include "i8042.h"
+@@ -59,6 +66,9 @@ static struct serio i8042_aux_port;
+ static unsigned char i8042_initial_ctr;
+ static unsigned char i8042_ctr;
+ static unsigned char i8042_mux_open;
++static unsigned char i8042_mux_present;
++static unsigned char i8042_sysdev_initialized;
++static struct pm_dev *i8042_pm_dev;
+ struct timer_list i8042_timer;
+ 
+ /*
+@@ -214,16 +224,41 @@ static int i8042_aux_write(struct serio 
+ }
+ 
+ /*
+- * i8042_open() is called when a port is open by the higher layer.
+- * It allocates the interrupt and enables it in the chip.
++ * i8042_activate_port() enables port on a chip.
+  */
+ 
+-static int i8042_open(struct serio *port)
++static int i8042_activate_port(struct serio *port)
+ {
+ 	struct i8042_values *values = port->driver;
+ 
+ 	i8042_flush();
+ 
++	/*
++	 * Enable port again here because it is disabled if we are
++	 * resuming (normally it is enabled already).
++	 */
++	i8042_ctr &= ~values->disable;
++
++	i8042_ctr |= values->irqen;
++
++	if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) {
++		i8042_ctr &= ~values->irqen;
++		return -1;
++	}
++
++	return 0;
++}
++
++
++/*
++ * i8042_open() is called when a port is open by the higher layer.
++ * It allocates the interrupt and calls i8042_enable_port.
++ */
++
++static int i8042_open(struct serio *port)
++{
++	struct i8042_values *values = port->driver;
++
+ 	if (values->mux != -1)
+ 		if (i8042_mux_open++)
+ 			return 0;
+@@ -231,21 +266,26 @@ static int i8042_open(struct serio *port
+ 	if (request_irq(values->irq, i8042_interrupt,
+ 			SA_SHIRQ, "i8042", i8042_request_irq_cookie)) {
+ 		printk(KERN_ERR "i8042.c: Can't get irq %d for %s, unregistering the port.\n", values->irq, values->name);
+-		values->exists = 0;
+-		serio_unregister_port(port);
+-		return -1;
++		goto irq_fail;
+ 	}
+ 
+-	i8042_ctr |= values->irqen;
+-
+-	if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) {
+-		printk(KERN_ERR "i8042.c: Can't write CTR while opening %s.\n", values->name);
+-		return -1;
++	if (i8042_activate_port(port)) {
++		printk(KERN_ERR "i8042.c: Can't activate %s, unregistering the port\n", values->name);
++		goto activate_fail;
+ 	}
+ 
+ 	i8042_interrupt(0, NULL, NULL);
+ 
+ 	return 0;
++
++activate_fail:
++	free_irq(values->irq, i8042_request_irq_cookie);
++
++irq_fail:
++	values->exists = 0;
++	serio_unregister_port_delayed(port);
++
++	return -1;
+ }
+ 
+ /*
+@@ -393,145 +433,78 @@ static irqreturn_t i8042_interrupt(int i
+ }
+ 
+ /*
+- * i8042_controller init initializes the i8042 controller, and,
+- * most importantly, sets it into non-xlated mode if that's
+- * desired.
++ * i8042_enable_mux_mode checks whether the controller has an active
++ * multiplexor and puts the chip into Multiplexed (as opposed to
++ * Legacy) mode.
+  */
+-	
+-static int __init i8042_controller_init(void)
++
++static int i8042_enable_mux_mode(struct i8042_values *values, unsigned char *mux_version)
+ {
+ 
++	unsigned char param;
+ /*
+- * Test the i8042. We need to know if it thinks it's working correctly
+- * before doing anything else.
++ * Get rid of bytes in the queue.
+  */
+ 
+ 	i8042_flush();
+ 
+-	if (i8042_reset) {
+-
+-		unsigned char param;
+-
+-		if (i8042_command(&param, I8042_CMD_CTL_TEST)) {
+-			printk(KERN_ERR "i8042.c: i8042 controller self test timeout.\n");
+-			return -1;
+-		}
+-
+-		if (param != I8042_RET_CTL_TEST) {
+-			printk(KERN_ERR "i8042.c: i8042 controller selftest failed. (%#x != %#x)\n",
+-				 param, I8042_RET_CTL_TEST);
+-			return -1;
+-		}
+-	}
+-
+ /*
+- * Save the CTR for restoral on unload / reboot.
++ * Internal loopback test - send three bytes, they should come back from the
++ * mouse interface, the last should be version. Note that we negate mouseport
++ * command responses for the i8042_check_aux() routine.
+  */
+ 
+-	if (i8042_command(&i8042_ctr, I8042_CMD_CTL_RCTR)) {
+-		printk(KERN_ERR "i8042.c: Can't read CTR while initializing i8042.\n");
++	param = 0xf0;
++	if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param != 0x0f)
+ 		return -1;
+-	}
+-
+-	i8042_initial_ctr = i8042_ctr;
+-
+-/*
+- * Disable the keyboard interface and interrupt. 
+- */
+-
+-	i8042_ctr |= I8042_CTR_KBDDIS;
+-	i8042_ctr &= ~I8042_CTR_KBDINT;
+-
+-/*
+- * Handle keylock.
+- */
+-
+-	if (~i8042_read_status() & I8042_STR_KEYLOCK) {
+-		if (i8042_unlock)
+-			i8042_ctr |= I8042_CTR_IGNKEYLOCK;
+-		 else
+-			printk(KERN_WARNING "i8042.c: Warning: Keylock active.\n");
+-	}
+-
+-/*
+- * If the chip is configured into nontranslated mode by the BIOS, don't
+- * bother enabling translating and be happy.
+- */
+-
+-	if (~i8042_ctr & I8042_CTR_XLATE)
+-		i8042_direct = 1;
+-
+-/*
+- * Set nontranslated mode for the kbd interface if requested by an option.
+- * After this the kbd interface becomes a simple serial in/out, like the aux
+- * interface is. We don't do this by default, since it can confuse notebook
+- * BIOSes.
+- */
+-
+-	if (i8042_direct) {
+-		i8042_ctr &= ~I8042_CTR_XLATE;
+-		i8042_kbd_port.type = SERIO_8042;
+-	}
+-
+-/*
+- * Write CTR back.
+- */
+-
+-	if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) {
+-		printk(KERN_ERR "i8042.c: Can't write CTR while initializing i8042.\n");
++	param = 0x56;
++	if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param != 0xa9)
+ 		return -1;
+-	}
++	param = 0xa4;
++	if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param == 0x5b)
++		return -1;
++
++	if (mux_version)
++		*mux_version = ~param;
+ 
+ 	return 0;
+ }
+ 
++
+ /*
+- * Here we try to reset everything back to a state in which the BIOS will be
+- * able to talk to the hardware when rebooting.
++ * i8042_enable_mux_ports enables 4 individual AUX ports after
++ * the controller has been switched into Multiplexed mode
+  */
+ 
+-void i8042_controller_cleanup(void)
++static int i8042_enable_mux_ports(struct i8042_values *values)
+ {
++	unsigned char param;
+ 	int i;
+-
+-	i8042_flush();
+-
+ /*
+- * Reset anything that is connected to the ports.
+- */
+-
+-	if (i8042_kbd_values.exists)
+-		serio_cleanup(&i8042_kbd_port);
+-
+-	if (i8042_aux_values.exists)
+-		serio_cleanup(&i8042_aux_port);
+-
+-	for (i = 0; i < 4; i++)
+-		if (i8042_mux_values[i].exists)
+-			serio_cleanup(i8042_mux_port + i);
+-
+-/*
+- * Reset the controller.
++ * Disable all muxed ports by disabling AUX.
+  */
+ 
+-	if (i8042_reset) {
+-		unsigned char param;
++	i8042_ctr |= I8042_CTR_AUXDIS;
++	i8042_ctr &= ~I8042_CTR_AUXINT;
+ 
+-		if (i8042_command(&param, I8042_CMD_CTL_TEST))
+-			printk(KERN_ERR "i8042.c: i8042 controller reset timeout.\n");
++	if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) {
++		printk(KERN_ERR "i8042.c: Failed to disable AUX port, can't use MUX.\n");
++		return -1;
+ 	}
+ 
+ /*
+- * Restore the original control register setting.
++ * Enable all muxed ports.
+  */
+ 
+-	i8042_ctr = i8042_initial_ctr;
+-
+-	if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR))
+-		printk(KERN_WARNING "i8042.c: Can't restore CTR.\n");
++	for (i = 0; i < 4; i++) {
++		i8042_command(&param, I8042_CMD_MUX_PFX + i);
++		i8042_command(&param, I8042_CMD_AUX_ENABLE);
++	}
+ 
++	return 0;
+ }
+ 
++
+ /*
+  * i8042_check_mux() checks whether the controller supports the PS/2 Active
+  * Multiplexing specification by Synaptics, Phoenix, Insyde and
+@@ -540,66 +513,31 @@ void i8042_controller_cleanup(void)
+ 
+ static int __init i8042_check_mux(struct i8042_values *values)
+ {
+-	unsigned char param;
+ 	static int i8042_check_mux_cookie;
+-	int i;
++	unsigned char mux_version;
+ 
+ /*
+  * Check if AUX irq is available.
+  */
+-
+ 	if (request_irq(values->irq, i8042_interrupt, SA_SHIRQ,
+ 				"i8042", &i8042_check_mux_cookie))
+                 return -1;
+ 	free_irq(values->irq, &i8042_check_mux_cookie);
+ 
+-/*
+- * Get rid of bytes in the queue.
+- */
+-
+-	i8042_flush();
+-
+-/*
+- * Internal loopback test - send three bytes, they should come back from the
+- * mouse interface, the last should be version. Note that we negate mouseport
+- * command responses for the i8042_check_aux() routine.
+- */
+-
+-	param = 0xf0;
+-	if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param != 0x0f)
+-		return -1;
+-	param = 0x56;
+-	if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param != 0xa9)
+-		return -1;
+-	param = 0xa4;
+-	if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param == 0x5b)
++	if (i8042_enable_mux_mode(values, &mux_version))
+ 		return -1;
+ 
+ 	printk(KERN_INFO "i8042.c: Detected active multiplexing controller, rev %d.%d.\n",
+-		(~param >> 4) & 0xf, ~param & 0xf);
+-
+-/*
+- * Disable all muxed ports by disabling AUX.
+- */
+-
+-	i8042_ctr |= I8042_CTR_AUXDIS;
+-	i8042_ctr &= ~I8042_CTR_AUXINT;
++		(mux_version >> 4) & 0xf, mux_version & 0xf);
+ 
+-	if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR))
++	if (i8042_enable_mux_ports(values))
+ 		return -1;
+ 
+-/*
+- * Enable all muxed ports.
+- */
+-
+-	for (i = 0; i < 4; i++) {
+-		i8042_command(&param, I8042_CMD_MUX_PFX + i);
+-		i8042_command(&param, I8042_CMD_AUX_ENABLE);
+-	}
+-
++	i8042_mux_present = 1;
+ 	return 0;
+ }
+ 
++
+ /*
+  * i8042_check_aux() applies as much paranoia as it can at detecting
+  * the presence of an AUX interface.
+@@ -675,6 +613,7 @@ static int __init i8042_check_aux(struct
+ 	return 0;
+ }
+ 
++
+ /*
+  * i8042_port_register() marks the device as existing,
+  * registers it, and reports to the user.
+@@ -691,63 +630,205 @@ static int __init i8042_port_register(st
+ 		return -1; 
+ 	}
+ 
+-	serio_register_port(port);
+-
+ 	printk(KERN_INFO "serio: i8042 %s port at %#lx,%#lx irq %d\n",
+ 	       values->name,
+ 	       (unsigned long) I8042_DATA_REG,
+ 	       (unsigned long) I8042_COMMAND_REG,
+ 	       values->irq);
+ 
++	serio_register_port(port);
++
+ 	return 0;
+ }
+ 
++
+ static void i8042_timer_func(unsigned long data)
+ {
+ 	i8042_interrupt(0, NULL, NULL);
+ 	mod_timer(&i8042_timer, jiffies + I8042_POLL_PERIOD);
+ }
+ 
+-#ifndef MODULE
+-static int __init i8042_setup_reset(char *str)
+-{
+-	i8042_reset = 1;
+-	return 1;
+-}
+-static int __init i8042_setup_noaux(char *str)
+-{
+-	i8042_noaux = 1;
+-	i8042_nomux = 1;
+-	return 1;
+-}
+-static int __init i8042_setup_nomux(char *str)
+-{
+-	i8042_nomux = 1;
+-	return 1;
+-}
+-static int __init i8042_setup_unlock(char *str)
++
++/*
++ * i8042_controller init initializes the i8042 controller, and,
++ * most importantly, sets it into non-xlated mode if that's
++ * desired.
++ */
++
++static int i8042_controller_init(void)
+ {
+-	i8042_unlock = 1;
+-	return 1;
++
++	if (i8042_noaux)
++		i8042_nomux = 1;
++/*
++ * Test the i8042. We need to know if it thinks it's working correctly
++ * before doing anything else.
++ */
++
++	i8042_flush();
++
++	if (i8042_reset) {
++
++		unsigned char param;
++
++		if (i8042_command(&param, I8042_CMD_CTL_TEST)) {
++			printk(KERN_ERR "i8042.c: i8042 controller self test timeout.\n");
++			return -1;
++		}
++
++		if (param != I8042_RET_CTL_TEST) {
++			printk(KERN_ERR "i8042.c: i8042 controller selftest failed. (%#x != %#x)\n",
++				 param, I8042_RET_CTL_TEST);
++			return -1;
++		}
++	}
++
++/*
++ * Save the CTR for restoral on unload / reboot.
++ */
++
++	if (i8042_command(&i8042_ctr, I8042_CMD_CTL_RCTR)) {
++		printk(KERN_ERR "i8042.c: Can't read CTR while initializing i8042.\n");
++		return -1;
++	}
++
++	i8042_initial_ctr = i8042_ctr;
++
++/*
++ * Disable the keyboard interface and interrupt.
++ */
++
++	i8042_ctr |= I8042_CTR_KBDDIS;
++	i8042_ctr &= ~I8042_CTR_KBDINT;
++
++/*
++ * Handle keylock.
++ */
++
++	if (~i8042_read_status() & I8042_STR_KEYLOCK) {
++		if (i8042_unlock)
++			i8042_ctr |= I8042_CTR_IGNKEYLOCK;
++		 else
++			printk(KERN_WARNING "i8042.c: Warning: Keylock active.\n");
++	}
++
++/*
++ * If the chip is configured into nontranslated mode by the BIOS, don't
++ * bother enabling translating and be happy.
++ */
++
++	if (~i8042_ctr & I8042_CTR_XLATE)
++		i8042_direct = 1;
++
++/*
++ * Set nontranslated mode for the kbd interface if requested by an option.
++ * After this the kbd interface becomes a simple serial in/out, like the aux
++ * interface is. We don't do this by default, since it can confuse notebook
++ * BIOSes.
++ */
++
++	if (i8042_direct) {
++		i8042_ctr &= ~I8042_CTR_XLATE;
++		i8042_kbd_port.type = SERIO_8042;
++	}
++
++/*
++ * Write CTR back.
++ */
++
++	if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) {
++		printk(KERN_ERR "i8042.c: Can't write CTR while initializing i8042.\n");
++		return -1;
++	}
++
++	return 0;
+ }
+-static int __init i8042_setup_direct(char *str)
++
++
++/*
++ * Here we try to reset everything back to a state in which the BIOS will be
++ * able to talk to the hardware when rebooting.
++ */
++
++void i8042_controller_cleanup(void)
+ {
+-	i8042_direct = 1;
+-	return 1;
++	int i;
++
++	i8042_flush();
++
++/*
++ * Reset anything that is connected to the ports.
++ */
++
++	if (i8042_kbd_values.exists)
++		serio_cleanup(&i8042_kbd_port);
++
++	if (i8042_aux_values.exists)
++		serio_cleanup(&i8042_aux_port);
++
++	for (i = 0; i < 4; i++)
++		if (i8042_mux_values[i].exists)
++			serio_cleanup(i8042_mux_port + i);
++
++/*
++ * Reset the controller.
++ */
++
++	if (i8042_reset) {
++		unsigned char param;
++
++		if (i8042_command(&param, I8042_CMD_CTL_TEST))
++			printk(KERN_ERR "i8042.c: i8042 controller reset timeout.\n");
++	}
++
++/*
++ * Restore the original control register setting.
++ */
++
++	i8042_ctr = i8042_initial_ctr;
++
++	if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR))
++		printk(KERN_WARNING "i8042.c: Can't restore CTR.\n");
++
+ }
+-static int __init i8042_setup_dumbkbd(char *str)
++
++
++/*
++ * Here we try to reset everything back to a state in which suspended
++ */
++
++static int i8042_controller_resume(void)
+ {
+-	i8042_dumbkbd = 1;
+-	return 1;
++	int i;
++
++	if (i8042_controller_init()) {
++		printk(KERN_ERR "i8042: resume failed\n");
++		return -1;
++	}
++
++	if (i8042_mux_present)
++		if (i8042_enable_mux_mode(&i8042_aux_values, NULL) ||
++		    i8042_enable_mux_ports(&i8042_aux_values)) {
++			printk(KERN_WARNING "i8042: failed to resume active multiplexor, mouse won't wotk.\n");
++		}
++
++/*
++ * Reconnect anything that was connected to the ports.
++ */
++
++	if (i8042_kbd_values.exists && i8042_activate_port(&i8042_kbd_port) == 0)
++		serio_reconnect(&i8042_kbd_port);
++
++	if (i8042_aux_values.exists && i8042_activate_port(&i8042_aux_port) == 0)
++		serio_reconnect(&i8042_aux_port);
++
++	for (i = 0; i < 4; i++)
++		if (i8042_mux_values[i].exists && i8042_activate_port(i8042_mux_port + i) == 0)
++			serio_reconnect(i8042_mux_port + i);
++
++	return 0;
+ }
+ 
+-__setup("i8042_reset", i8042_setup_reset);
+-__setup("i8042_noaux", i8042_setup_noaux);
+-__setup("i8042_nomux", i8042_setup_nomux);
+-__setup("i8042_unlock", i8042_setup_unlock);
+-__setup("i8042_direct", i8042_setup_direct);
+-__setup("i8042_dumbkbd", i8042_setup_dumbkbd);
+-#endif
+ 
+ /*
+  * We need to reset the 8042 back to original mode on system shutdown,
+@@ -769,6 +850,35 @@ static struct notifier_block i8042_notif
+         0
+ };
+ 
++/*
++ * Resume handler for the new PM scheme (driver model)
++ */
++static int i8042_resume(struct sys_device *dev)
++{
++	return i8042_controller_resume();
++}
++
++static struct sysdev_class kbc_sysclass = {
++       set_kset_name("i8042"),
++       .resume = i8042_resume,
++};
++
++static struct sys_device device_i8042 = {
++       .id     = 0,
++       .cls    = &kbc_sysclass,
++};
++
++/*
++ * Resume handler for the old PM scheme (APM)
++ */
++static int i8042_pm_callback(struct pm_dev *dev, pm_request_t request, void *dummy)
++{
++	if (request == PM_RESUME)
++		return i8042_controller_resume();
++
++	return 0;
++}
++
+ static void __init i8042_init_mux_values(struct i8042_values *values, struct serio *port, int index)
+ {
+ 	memcpy(port, &i8042_aux_port, sizeof(struct serio));
+@@ -817,6 +927,15 @@ int __init i8042_init(void)
+ 	i8042_timer.function = i8042_timer_func;
+ 	mod_timer(&i8042_timer, jiffies + I8042_POLL_PERIOD);
+ 
++        if (sysdev_class_register(&kbc_sysclass) == 0) {
++                if (sys_device_register(&device_i8042) == 0)
++			i8042_sysdev_initialized = 1;
++		else
++			sysdev_class_unregister(&kbc_sysclass);
++        }
++
++	i8042_pm_dev = pm_register(PM_SYS_DEV, PM_SYS_UNKNOWN, i8042_pm_callback);
++
+ 	register_reboot_notifier(&i8042_notifier);
+ 
+ 	return 0;
+@@ -828,6 +947,14 @@ void __exit i8042_exit(void)
+ 
+ 	unregister_reboot_notifier(&i8042_notifier);
+ 
++	if (i8042_pm_dev)
++		pm_unregister(i8042_pm_dev);
++
++	if (i8042_sysdev_initialized) {
++		sys_device_unregister(&device_i8042);
++		sysdev_class_unregister(&kbc_sysclass);
++	}
++
+ 	del_timer(&i8042_timer);
+ 
+ 	i8042_controller_cleanup();
+--- linux-2.6.0/drivers/input/serio/serio.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/input/serio/serio.c	2003-12-28 23:21:30.000000000 -0800
+@@ -49,14 +49,17 @@ MODULE_LICENSE("GPL");
+ 
+ EXPORT_SYMBOL(serio_interrupt);
+ EXPORT_SYMBOL(serio_register_port);
+-EXPORT_SYMBOL(serio_register_slave_port);
++EXPORT_SYMBOL(serio_register_port_delayed);
++EXPORT_SYMBOL(__serio_register_port);
+ EXPORT_SYMBOL(serio_unregister_port);
+-EXPORT_SYMBOL(serio_unregister_slave_port);
++EXPORT_SYMBOL(serio_unregister_port_delayed);
++EXPORT_SYMBOL(__serio_unregister_port);
+ EXPORT_SYMBOL(serio_register_device);
+ EXPORT_SYMBOL(serio_unregister_device);
+ EXPORT_SYMBOL(serio_open);
+ EXPORT_SYMBOL(serio_close);
+ EXPORT_SYMBOL(serio_rescan);
++EXPORT_SYMBOL(serio_reconnect);
+ 
+ struct serio_event {
+ 	int type;
+@@ -82,11 +85,23 @@ static void serio_find_dev(struct serio 
+ 	}
+ }
+ 
+-#define SERIO_RESCAN	1
++#define SERIO_RESCAN		1
++#define SERIO_RECONNECT		2
++#define SERIO_REGISTER_PORT	3
++#define SERIO_UNREGISTER_PORT	4
+ 
+ static DECLARE_WAIT_QUEUE_HEAD(serio_wait);
+ static DECLARE_COMPLETION(serio_exited);
+ 
++static void serio_invalidate_pending_events(struct serio *serio)
++{
++	struct serio_event *event;
++
++	list_for_each_entry(event, &serio_event_list, node)
++		if (event->serio == serio)
++			event->serio = NULL;
++}
++
+ void serio_handle_events(void)
+ {
+ 	struct list_head *node, *next;
+@@ -95,17 +110,35 @@ void serio_handle_events(void)
+ 	list_for_each_safe(node, next, &serio_event_list) {
+ 		event = container_of(node, struct serio_event, node);	
+ 
++		down(&serio_sem);
++		if (event->serio == NULL)
++			goto event_done;
++
+ 		switch (event->type) {
++			case SERIO_REGISTER_PORT :
++				__serio_register_port(event->serio);
++				break;
++
++			case SERIO_UNREGISTER_PORT :
++				__serio_unregister_port(event->serio);
++				break;
++
++			case SERIO_RECONNECT :
++				if (event->serio->dev && event->serio->dev->reconnect)
++					if (event->serio->dev->reconnect(event->serio) == 0)
++						break;
++				/* reconnect failed - fall through to rescan */
++
+ 			case SERIO_RESCAN :
+-				down(&serio_sem);
+ 				if (event->serio->dev && event->serio->dev->disconnect)
+ 					event->serio->dev->disconnect(event->serio);
+ 				serio_find_dev(event->serio);
+-				up(&serio_sem);
+ 				break;
+ 			default:
+ 				break;
+ 		}
++event_done:
++		up(&serio_sem);
+ 		list_del_init(node);
+ 		kfree(event);
+ 	}
+@@ -130,18 +163,27 @@ static int serio_thread(void *nothing)
+ 	complete_and_exit(&serio_exited, 0);
+ }
+ 
+-void serio_rescan(struct serio *serio)
++static void serio_queue_event(struct serio *serio, int event_type)
+ {
+ 	struct serio_event *event;
+ 
+-	if (!(event = kmalloc(sizeof(struct serio_event), GFP_ATOMIC)))
+-		return;
++	if ((event = kmalloc(sizeof(struct serio_event), GFP_ATOMIC))) {
++		event->type = event_type;
++		event->serio = serio;
++
++		list_add_tail(&event->node, &serio_event_list);
++		wake_up(&serio_wait);
++	}
++}
+ 
+-	event->type = SERIO_RESCAN;
+-	event->serio = serio;
++void serio_rescan(struct serio *serio)
++{
++	serio_queue_event(serio, SERIO_RESCAN);
++}
+ 
+-	list_add_tail(&event->node, &serio_event_list);
+-	wake_up(&serio_wait);
++void serio_reconnect(struct serio *serio)
++{
++	serio_queue_event(serio, SERIO_RECONNECT);
+ }
+ 
+ irqreturn_t serio_interrupt(struct serio *serio,
+@@ -163,17 +205,26 @@ irqreturn_t serio_interrupt(struct serio
+ void serio_register_port(struct serio *serio)
+ {
+ 	down(&serio_sem);
+-	list_add_tail(&serio->node, &serio_list);
+-	serio_find_dev(serio);
++	__serio_register_port(serio);
+ 	up(&serio_sem);
+ }
+ 
+ /*
+- * Same as serio_register_port but does not try to acquire serio_sem.
+- * Should be used when registering a serio from other input device's
++ * Submits register request to kseriod for subsequent execution.
++ * Can be used when it is not obvious whether the serio_sem is
++ * taken or not and when delayed execution is feasible.
++ */
++void serio_register_port_delayed(struct serio *serio)
++{
++	serio_queue_event(serio, SERIO_REGISTER_PORT);
++}
++
++/*
++ * Should only be called directly if serio_sem has already been taken,
++ * for example when unregistering a serio from other input device's
+  * connect() function.
+  */
+-void serio_register_slave_port(struct serio *serio)
++void __serio_register_port(struct serio *serio)
+ {
+ 	list_add_tail(&serio->node, &serio_list);
+ 	serio_find_dev(serio);
+@@ -182,19 +233,28 @@ void serio_register_slave_port(struct se
+ void serio_unregister_port(struct serio *serio)
+ {
+ 	down(&serio_sem);
+-	list_del_init(&serio->node);
+-	if (serio->dev && serio->dev->disconnect)
+-		serio->dev->disconnect(serio);
++	__serio_unregister_port(serio);
+ 	up(&serio_sem);
+ }
+ 
+ /*
+- * Same as serio_unregister_port but does not try to acquire serio_sem.
+- * Should be used when unregistering a serio from other input device's
++ * Submits unregister request to kseriod for subsequent execution.
++ * Can be used when it is not obvious whether the serio_sem is
++ * taken or not and when delayed execution is feasible.
++ */
++void serio_unregister_port_delayed(struct serio *serio)
++{
++	serio_queue_event(serio, SERIO_UNREGISTER_PORT);
++}
++
++/*
++ * Should only be called directly if serio_sem has already been taken,
++ * for example when unregistering a serio from other input device's
+  * disconnect() function.
+  */
+-void serio_unregister_slave_port(struct serio *serio)
++void __serio_unregister_port(struct serio *serio)
+ {
++	serio_invalidate_pending_events(serio);
+ 	list_del_init(&serio->node);
+ 	if (serio->dev && serio->dev->disconnect)
+ 		serio->dev->disconnect(serio);
+--- linux-2.6.0/drivers/isdn/eicon/eicon_mod.c	2003-06-14 12:17:58.000000000 -0700
++++ 25/drivers/isdn/eicon/eicon_mod.c	2003-12-28 23:22:43.000000000 -0800
+@@ -29,6 +29,7 @@
+ #include <linux/init.h>
+ #ifdef CONFIG_MCA
+ #include <linux/mca.h>
++#include <linux/mca-legacy.h>
+ #endif /* CONFIG_MCA */
+ 
+ #include "eicon.h"
+--- linux-2.6.0/drivers/isdn/eicon/Kconfig	2003-06-14 12:18:20.000000000 -0700
++++ 25/drivers/isdn/eicon/Kconfig	2003-12-28 23:22:04.000000000 -0800
+@@ -13,7 +13,7 @@ config ISDN_DRV_EICON
+ choice
+ 	prompt "Eicon active card support"
+ 	optional
+-	depends on ISDN_DRV_EICON && ISDN
++	depends on ISDN_DRV_EICON && ISDN && m
+ 
+ config ISDN_DRV_EICON_DIVAS
+ 	tristate "Eicon driver"
+--- linux-2.6.0/drivers/isdn/hardware/avm/avm_cs.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/isdn/hardware/avm/avm_cs.c	2003-12-28 23:22:54.000000000 -0800
+@@ -186,7 +186,7 @@ static dev_link_t *avmcs_attach(void)
+     client_reg.event_handler = &avmcs_event;
+     client_reg.Version = 0x0210;
+     client_reg.event_callback_args.client_data = link;
+-    ret = CardServices(RegisterClient, &link->handle, &client_reg);
++    ret = pcmcia_register_client(&link->handle, &client_reg);
+     if (ret != 0) {
+ 	cs_error(link->handle, RegisterClient, ret);
+ 	avmcs_detach(link);
+@@ -232,7 +232,7 @@ static void avmcs_detach(dev_link_t *lin
+ 
+     /* Break the link with Card Services */
+     if (link->handle)
+-	CardServices(DeregisterClient, link->handle);
++	pcmcia_deregister_client(link->handle);
+     
+     /* Unlink device structure, free pieces */
+     *linkp = link->next;
+@@ -251,19 +251,29 @@ static void avmcs_detach(dev_link_t *lin
+     
+ ======================================================================*/
+ 
+-static int get_tuple(int fn, client_handle_t handle, tuple_t *tuple,
++static int get_tuple(client_handle_t handle, tuple_t *tuple,
+ 		     cisparse_t *parse)
+ {
+-    int i;
+-    i = CardServices(fn, handle, tuple);
++    int i = pcmcia_get_tuple_data(handle, tuple);
+     if (i != CS_SUCCESS) return i;
+-    i = CardServices(GetTupleData, handle, tuple);
++    return pcmcia_parse_tuple(handle, tuple, parse);
++}
++
++static int first_tuple(client_handle_t handle, tuple_t *tuple,
++		     cisparse_t *parse)
++{
++    int i = pcmcia_get_first_tuple(handle, tuple);
+     if (i != CS_SUCCESS) return i;
+-    return CardServices(ParseTuple, handle, tuple, parse);
++    return get_tuple(handle, tuple, parse);
+ }
+ 
+-#define first_tuple(a, b, c) get_tuple(GetFirstTuple, a, b, c)
+-#define next_tuple(a, b, c) get_tuple(GetNextTuple, a, b, c)
++static int next_tuple(client_handle_t handle, tuple_t *tuple,
++		     cisparse_t *parse)
++{
++    int i = pcmcia_get_next_tuple(handle, tuple);
++    if (i != CS_SUCCESS) return i;
++    return get_tuple(handle, tuple, parse);
++}
+ 
+ static void avmcs_config(dev_link_t *link)
+ {
+@@ -287,14 +297,14 @@ static void avmcs_config(dev_link_t *lin
+     */
+     do {
+ 	tuple.DesiredTuple = CISTPL_CONFIG;
+-	i = CardServices(GetFirstTuple, handle, &tuple);
++	i = pcmcia_get_first_tuple(handle, &tuple);
+ 	if (i != CS_SUCCESS) break;
+ 	tuple.TupleData = buf;
+ 	tuple.TupleDataMax = 64;
+ 	tuple.TupleOffset = 0;
+-	i = CardServices(GetTupleData, handle, &tuple);
++	i = pcmcia_get_tuple_data(handle, &tuple);
+ 	if (i != CS_SUCCESS) break;
+-	i = CardServices(ParseTuple, handle, &tuple, &parse);
++	i = pcmcia_parse_tuple(handle, &tuple, &parse);
+ 	if (i != CS_SUCCESS) break;
+ 	link->conf.ConfigBase = parse.config.base;
+     } while (0);
+@@ -337,7 +347,7 @@ static void avmcs_config(dev_link_t *lin
+                 printk(KERN_INFO "avm_cs: testing i/o %#x-%#x\n",
+ 			link->io.BasePort1,
+ 		        link->io.BasePort1+link->io.NumPorts1-1);
+-		i = CardServices(RequestIO, link->handle, &link->io);
++		i = pcmcia_request_io(link->handle, &link->io);
+ 		if (i == CS_SUCCESS) goto found_port;
+ 	    }
+ 	    i = next_tuple(handle, &tuple, &parse);
+@@ -352,21 +362,21 @@ found_port:
+ 	/*
+ 	 * allocate an interrupt line
+ 	 */
+-	i = CardServices(RequestIRQ, link->handle, &link->irq);
++	i = pcmcia_request_irq(link->handle, &link->irq);
+ 	if (i != CS_SUCCESS) {
+ 	    cs_error(link->handle, RequestIRQ, i);
+-	    CardServices(ReleaseIO, link->handle, &link->io);
++	    pcmcia_release_io(link->handle, &link->io);
+ 	    break;
+ 	}
+ 	
+ 	/*
+          * configure the PCMCIA socket
+ 	  */
+-	i = CardServices(RequestConfiguration, link->handle, &link->conf);
++	i = pcmcia_request_configuration(link->handle, &link->conf);
+ 	if (i != CS_SUCCESS) {
+ 	    cs_error(link->handle, RequestConfiguration, i);
+-	    CardServices(ReleaseIO, link->handle, &link->io);
+-	    CardServices(ReleaseIRQ, link->handle, &link->irq);
++	    pcmcia_release_io(link->handle, &link->io);
++	    pcmcia_release_irq(link->handle, &link->irq);
+ 	    break;
+ 	}
+ 
+@@ -437,9 +447,9 @@ static void avmcs_release(dev_link_t *li
+     link->dev = NULL;
+     
+     /* Don't bother checking to see if these succeed or not */
+-    CardServices(ReleaseConfiguration, link->handle);
+-    CardServices(ReleaseIO, link->handle, &link->io);
+-    CardServices(ReleaseIRQ, link->handle, &link->irq);
++    pcmcia_release_configuration(link->handle);
++    pcmcia_release_io(link->handle, &link->io);
++    pcmcia_release_irq(link->handle, &link->irq);
+     link->state &= ~DEV_CONFIG;
+     
+     if (link->state & DEV_STALE_LINK)
+@@ -481,14 +491,14 @@ static int avmcs_event(event_t event, in
+ 	/* Fall through... */
+     case CS_EVENT_RESET_PHYSICAL:
+ 	if (link->state & DEV_CONFIG)
+-	    CardServices(ReleaseConfiguration, link->handle);
++	    pcmcia_release_configuration(link->handle);
+ 	break;
+     case CS_EVENT_PM_RESUME:
+ 	link->state &= ~DEV_SUSPEND;
+ 	/* Fall through... */
+     case CS_EVENT_CARD_RESET:
+ 	if (link->state & DEV_CONFIG)
+-	    CardServices(RequestConfiguration, link->handle, &link->conf);
++	    pcmcia_request_configuration(link->handle, &link->conf);
+ 	break;
+     }
+     return 0;
+--- linux-2.6.0/drivers/isdn/hisax/avma1_cs.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/isdn/hisax/avma1_cs.c	2003-12-28 23:22:54.000000000 -0800
+@@ -204,7 +204,7 @@ static dev_link_t *avma1cs_attach(void)
+     client_reg.event_handler = &avma1cs_event;
+     client_reg.Version = 0x0210;
+     client_reg.event_callback_args.client_data = link;
+-    ret = CardServices(RegisterClient, &link->handle, &client_reg);
++    ret = pcmcia_register_client(&link->handle, &client_reg);
+     if (ret != 0) {
+ 	cs_error(link->handle, RegisterClient, ret);
+ 	avma1cs_detach(link);
+@@ -252,7 +252,7 @@ static void avma1cs_detach(dev_link_t *l
+ 
+     /* Break the link with Card Services */
+     if (link->handle)
+-	CardServices(DeregisterClient, link->handle);
++	pcmcia_deregister_client(link->handle);
+     
+     /* Unlink device structure, free pieces */
+     *linkp = link->next;
+@@ -271,19 +271,29 @@ static void avma1cs_detach(dev_link_t *l
+     
+ ======================================================================*/
+ 
+-static int get_tuple(int fn, client_handle_t handle, tuple_t *tuple,
++static int get_tuple(client_handle_t handle, tuple_t *tuple,
+ 		     cisparse_t *parse)
+ {
+-    int i;
+-    i = CardServices(fn, handle, tuple);
++    int i = pcmcia_get_tuple_data(handle, tuple);
+     if (i != CS_SUCCESS) return i;
+-    i = CardServices(GetTupleData, handle, tuple);
++    return pcmcia_parse_tuple(handle, tuple, parse);
++}
++
++static int first_tuple(client_handle_t handle, tuple_t *tuple,
++		     cisparse_t *parse)
++{
++    int i = pcmcia_get_first_tuple(handle, tuple);
+     if (i != CS_SUCCESS) return i;
+-    return CardServices(ParseTuple, handle, tuple, parse);
++    return get_tuple(handle, tuple, parse);
+ }
+ 
+-#define first_tuple(a, b, c) get_tuple(GetFirstTuple, a, b, c)
+-#define next_tuple(a, b, c) get_tuple(GetNextTuple, a, b, c)
++static int next_tuple(client_handle_t handle, tuple_t *tuple,
++		     cisparse_t *parse)
++{
++    int i = pcmcia_get_next_tuple(handle, tuple);
++    if (i != CS_SUCCESS) return i;
++    return get_tuple(handle, tuple, parse);
++}
+ 
+ static void avma1cs_config(dev_link_t *link)
+ {
+@@ -308,14 +318,14 @@ static void avma1cs_config(dev_link_t *l
+     */
+     do {
+ 	tuple.DesiredTuple = CISTPL_CONFIG;
+-	i = CardServices(GetFirstTuple, handle, &tuple);
++	i = pcmcia_get_first_tuple(handle, &tuple);
+ 	if (i != CS_SUCCESS) break;
+ 	tuple.TupleData = buf;
+ 	tuple.TupleDataMax = 64;
+ 	tuple.TupleOffset = 0;
+-	i = CardServices(GetTupleData, handle, &tuple);
++	i = pcmcia_get_tuple_data(handle, &tuple);
+ 	if (i != CS_SUCCESS) break;
+-	i = CardServices(ParseTuple, handle, &tuple, &parse);
++	i = pcmcia_parse_tuple(handle, &tuple, &parse);
+ 	if (i != CS_SUCCESS) break;
+ 	link->conf.ConfigBase = parse.config.base;
+     } while (0);
+@@ -358,7 +368,7 @@ static void avma1cs_config(dev_link_t *l
+                 printk(KERN_INFO "avma1_cs: testing i/o %#x-%#x\n",
+ 			link->io.BasePort1,
+ 		        link->io.BasePort1+link->io.NumPorts1 - 1);
+-		i = CardServices(RequestIO, link->handle, &link->io);
++		i = pcmcia_request_io(link->handle, &link->io);
+ 		if (i == CS_SUCCESS) goto found_port;
+ 	    }
+ 	    i = next_tuple(handle, &tuple, &parse);
+@@ -373,21 +383,21 @@ found_port:
+ 	/*
+ 	 * allocate an interrupt line
+ 	 */
+-	i = CardServices(RequestIRQ, link->handle, &link->irq);
++	i = pcmcia_request_irq(link->handle, &link->irq);
+ 	if (i != CS_SUCCESS) {
+ 	    cs_error(link->handle, RequestIRQ, i);
+-	    CardServices(ReleaseIO, link->handle, &link->io);
++	    pcmcia_release_io(link->handle, &link->io);
+ 	    break;
+ 	}
+ 	
+ 	/*
+          * configure the PCMCIA socket
+ 	  */
+-	i = CardServices(RequestConfiguration, link->handle, &link->conf);
++	i = pcmcia_request_configuration(link->handle, &link->conf);
+ 	if (i != CS_SUCCESS) {
+ 	    cs_error(link->handle, RequestConfiguration, i);
+-	    CardServices(ReleaseIO, link->handle, &link->io);
+-	    CardServices(ReleaseIRQ, link->handle, &link->irq);
++	    pcmcia_release_io(link->handle, &link->io);
++	    pcmcia_release_irq(link->handle, &link->irq);
+ 	    break;
+ 	}
+ 
+@@ -445,9 +455,9 @@ static void avma1cs_release(dev_link_t *
+     link->dev = NULL;
+     
+     /* Don't bother checking to see if these succeed or not */
+-    CardServices(ReleaseConfiguration, link->handle);
+-    CardServices(ReleaseIO, link->handle, &link->io);
+-    CardServices(ReleaseIRQ, link->handle, &link->irq);
++    pcmcia_release_configuration(link->handle);
++    pcmcia_release_io(link->handle, &link->io);
++    pcmcia_release_irq(link->handle, &link->irq);
+     link->state &= ~DEV_CONFIG;
+     
+     if (link->state & DEV_STALE_LINK)
+@@ -490,14 +500,14 @@ static int avma1cs_event(event_t event, 
+ 	/* Fall through... */
+     case CS_EVENT_RESET_PHYSICAL:
+ 	if (link->state & DEV_CONFIG)
+-	    CardServices(ReleaseConfiguration, link->handle);
++	    pcmcia_release_configuration(link->handle);
+ 	break;
+     case CS_EVENT_PM_RESUME:
+ 	link->state &= ~DEV_SUSPEND;
+ 	/* Fall through... */
+     case CS_EVENT_CARD_RESET:
+ 	if (link->state & DEV_CONFIG)
+-	    CardServices(RequestConfiguration, link->handle, &link->conf);
++	    pcmcia_request_configuration(link->handle, &link->conf);
+ 	break;
+     }
+     return 0;
+--- linux-2.6.0/drivers/isdn/hisax/elsa_cs.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/isdn/hisax/elsa_cs.c	2003-12-28 23:22:54.000000000 -0800
+@@ -235,7 +235,7 @@ static dev_link_t *elsa_cs_attach(void)
+     client_reg.event_handler = &elsa_cs_event;
+     client_reg.Version = 0x0210;
+     client_reg.event_callback_args.client_data = link;
+-    ret = CardServices(RegisterClient, &link->handle, &client_reg);
++    ret = pcmcia_register_client(&link->handle, &client_reg);
+     if (ret != CS_SUCCESS) {
+         cs_error(link->handle, RegisterClient, ret);
+         elsa_cs_detach(link);
+@@ -286,7 +286,7 @@ static void elsa_cs_detach(dev_link_t *l
+ 
+     /* Break the link with Card Services */
+     if (link->handle) {
+-        ret = CardServices(DeregisterClient, link->handle);
++        ret = pcmcia_deregister_client(link->handle);
+ 	if (ret != CS_SUCCESS)
+ 	    cs_error(link->handle, DeregisterClient, ret);
+     }
+@@ -304,19 +304,29 @@ static void elsa_cs_detach(dev_link_t *l
+     device available to the system.
+ 
+ ======================================================================*/
+-static int get_tuple(int fn, client_handle_t handle, tuple_t *tuple,
++static int get_tuple(client_handle_t handle, tuple_t *tuple,
+                      cisparse_t *parse)
+ {
+-    int i;
+-    i = CardServices(fn, handle, tuple);
++    int i = pcmcia_get_tuple_data(handle, tuple);
+     if (i != CS_SUCCESS) return i;
+-    i = CardServices(GetTupleData, handle, tuple);
++    return pcmcia_parse_tuple(handle, tuple, parse);
++}
++
++static int first_tuple(client_handle_t handle, tuple_t *tuple,
++                     cisparse_t *parse)
++{
++    int i = pcmcia_get_first_tuple(handle, tuple);
+     if (i != CS_SUCCESS) return i;
+-    return CardServices(ParseTuple, handle, tuple, parse);
++    return get_tuple(handle, tuple, parse);
+ }
+ 
+-#define first_tuple(a, b, c) get_tuple(GetFirstTuple, a, b, c)
+-#define next_tuple(a, b, c) get_tuple(GetNextTuple, a, b, c)
++static int next_tuple(client_handle_t handle, tuple_t *tuple,
++                     cisparse_t *parse)
++{
++    int i = pcmcia_get_next_tuple(handle, tuple);
++    if (i != CS_SUCCESS) return i;
++    return get_tuple(handle, tuple, parse);
++}
+ 
+ static void elsa_cs_config(dev_link_t *link)
+ {
+@@ -362,14 +372,14 @@ static void elsa_cs_config(dev_link_t *l
+             printk(KERN_INFO "(elsa_cs: looks like the 96 model)\n");
+             link->conf.ConfigIndex = cf->index;
+             link->io.BasePort1 = cf->io.win[0].base;
+-            i = CardServices(RequestIO, link->handle, &link->io);
++            i = pcmcia_request_io(link->handle, &link->io);
+             if (i == CS_SUCCESS) break;
+         } else {
+           printk(KERN_INFO "(elsa_cs: looks like the 97 model)\n");
+           link->conf.ConfigIndex = cf->index;
+           for (i = 0, j = 0x2f0; j > 0x100; j -= 0x10) {
+             link->io.BasePort1 = j;
+-            i = CardServices(RequestIO, link->handle, &link->io);
++            i = pcmcia_request_io(link->handle, &link->io);
+             if (i == CS_SUCCESS) break;
+           }
+           break;
+@@ -382,14 +392,14 @@ static void elsa_cs_config(dev_link_t *l
+ 	goto cs_failed;
+     }
+ 
+-    i = CardServices(RequestIRQ, link->handle, &link->irq);
++    i = pcmcia_request_irq(link->handle, &link->irq);
+     if (i != CS_SUCCESS) {
+         link->irq.AssignedIRQ = 0;
+ 	last_fn = RequestIRQ;
+         goto cs_failed;
+     }
+ 
+-    i = CardServices(RequestConfiguration, link->handle, &link->conf);
++    i = pcmcia_request_configuration(link->handle, &link->conf);
+     if (i != CS_SUCCESS) {
+       last_fn = RequestConfiguration;
+       goto cs_failed;
+@@ -447,10 +457,10 @@ static void elsa_cs_release(dev_link_t *
+ 
+     /* Don't bother checking to see if these succeed or not */
+     if (link->win)
+-        CardServices(ReleaseWindow, link->win);
+-    CardServices(ReleaseConfiguration, link->handle);
+-    CardServices(ReleaseIO, link->handle, &link->io);
+-    CardServices(ReleaseIRQ, link->handle, &link->irq);
++        pcmcia_release_window(link->win);
++    pcmcia_release_configuration(link->handle);
++    pcmcia_release_io(link->handle, &link->io);
++    pcmcia_release_irq(link->handle, &link->irq);
+     link->state &= ~DEV_CONFIG;
+ 
+     if (link->state & DEV_STALE_LINK)
+@@ -499,14 +509,14 @@ static int elsa_cs_event(event_t event, 
+         /* Mark the device as stopped, to block IO until later */
+         dev->busy = 1;
+         if (link->state & DEV_CONFIG)
+-            CardServices(ReleaseConfiguration, link->handle);
++            pcmcia_release_configuration(link->handle);
+         break;
+     case CS_EVENT_PM_RESUME:
+         link->state &= ~DEV_SUSPEND;
+         /* Fall through... */
+     case CS_EVENT_CARD_RESET:
+         if (link->state & DEV_CONFIG)
+-            CardServices(RequestConfiguration, link->handle, &link->conf);
++            pcmcia_request_configuration(link->handle, &link->conf);
+         dev->busy = 0;
+         break;
+     }
+--- linux-2.6.0/drivers/isdn/hisax/sedlbauer_cs.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/isdn/hisax/sedlbauer_cs.c	2003-12-28 23:22:54.000000000 -0800
+@@ -247,7 +247,7 @@ static dev_link_t *sedlbauer_attach(void
+     client_reg.event_handler = &sedlbauer_event;
+     client_reg.Version = 0x0210;
+     client_reg.event_callback_args.client_data = link;
+-    ret = CardServices(RegisterClient, &link->handle, &client_reg);
++    ret = pcmcia_register_client(&link->handle, &client_reg);
+     if (ret != CS_SUCCESS) {
+ 	cs_error(link->handle, RegisterClient, ret);
+ 	sedlbauer_detach(link);
+@@ -295,7 +295,7 @@ static void sedlbauer_detach(dev_link_t 
+ 
+     /* Break the link with Card Services */
+     if (link->handle)
+-	CardServices(DeregisterClient, link->handle);
++	pcmcia_deregister_client(link->handle);
+     
+     /* Unlink device structure, and free it */
+     *linkp = link->next;
+@@ -310,12 +310,8 @@ static void sedlbauer_detach(dev_link_t 
+     device available to the system.
+     
+ ======================================================================*/
+-
+-#define CS_CHECK(fn, args...) \
+-while ((last_ret=CardServices(last_fn=(fn),args))!=0) goto cs_failed
+-
+-#define CFG_CHECK(fn, args...) \
+-if (CardServices(fn, args) != 0) goto next_entry
++#define CS_CHECK(fn, ret) \
++do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+ 
+ static void sedlbauer_config(dev_link_t *link)
+ {
+@@ -341,9 +337,9 @@ static void sedlbauer_config(dev_link_t 
+     tuple.TupleData = buf;
+     tuple.TupleDataMax = sizeof(buf);
+     tuple.TupleOffset = 0;
+-    CS_CHECK(GetFirstTuple, handle, &tuple);
+-    CS_CHECK(GetTupleData, handle, &tuple);
+-    CS_CHECK(ParseTuple, handle, &tuple, &parse);
++    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
++    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
++    CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+     link->conf.ConfigBase = parse.config.base;
+     link->conf.Present = parse.config.rmask[0];
+     
+@@ -351,7 +347,7 @@ static void sedlbauer_config(dev_link_t 
+     link->state |= DEV_CONFIG;
+ 
+     /* Look up the current Vcc */
+-    CS_CHECK(GetConfigurationInfo, handle, &conf);
++    CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(handle, &conf));
+     link->conf.Vcc = conf.Vcc;
+ 
+     /*
+@@ -367,12 +363,13 @@ static void sedlbauer_config(dev_link_t 
+       will only use the CIS to fill in implementation-defined details.
+     */
+     tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+-    CS_CHECK(GetFirstTuple, handle, &tuple);
++    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+     while (1) {
+ 	cistpl_cftable_entry_t dflt = { 0 };
+ 	cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
+-	CFG_CHECK(GetTupleData, handle, &tuple);
+-	CFG_CHECK(ParseTuple, handle, &tuple, &parse);
++	if (pcmcia_get_tuple_data(handle, &tuple) != 0 ||
++		pcmcia_parse_tuple(handle, &tuple, &parse) != 0)
++	    goto next_entry;
+ 
+ 	if (cfg->flags & CISTPL_CFTABLE_DEFAULT) dflt = *cfg;
+ 	if (cfg->index == 0) goto next_entry;
+@@ -425,7 +422,8 @@ static void sedlbauer_config(dev_link_t 
+ 		link->io.NumPorts2 = io->win[1].len;
+ 	    }
+ 	    /* This reserves IO space but doesn't actually enable it */
+-	    CFG_CHECK(RequestIO, link->handle, &link->io);
++	    if (pcmcia_request_io(link->handle, &link->io) != 0)
++		goto next_entry;
+ 	}
+ 
+ 	/*
+@@ -451,10 +449,11 @@ static void sedlbauer_config(dev_link_t 
+                 req.Size = 0x1000;
+ */
+ 	    req.AccessSpeed = 0;
+-	    link->win = (window_handle_t)link->handle;
+-	    CFG_CHECK(RequestWindow, &link->win, &req);
++	    if (pcmcia_request_window(&link->handle, &req, &link->win) != 0)
++		goto next_entry;
+ 	    map.Page = 0; map.CardOffset = mem->win[0].card_addr;
+-	    CFG_CHECK(MapMemPage, link->win, &map);
++	    if (pcmcia_map_mem_page(link->win, &map) != 0)
++		goto next_entry;
+ 	}
+ 	/* If we got this far, we're cool! */
+ 	break;
+@@ -462,9 +461,9 @@ static void sedlbauer_config(dev_link_t 
+     next_entry:
+ /* new in dummy.cs 2001/01/28 MN 
+         if (link->io.NumPorts1)
+-           CardServices(ReleaseIO, link->handle, &link->io);
++           pcmcia_release_io(link->handle, &link->io);
+ */
+-	CS_CHECK(GetNextTuple, handle, &tuple);
++	CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(handle, &tuple));
+     }
+     
+     /*
+@@ -473,14 +472,14 @@ static void sedlbauer_config(dev_link_t 
+        irq structure is initialized.
+     */
+     if (link->conf.Attributes & CONF_ENABLE_IRQ)
+-	CS_CHECK(RequestIRQ, link->handle, &link->irq);
++	CS_CHECK(RequestIRQ, pcmcia_request_irq(link->handle, &link->irq));
+ 	
+     /*
+        This actually configures the PCMCIA socket -- setting up
+        the I/O windows and the interrupt mapping, and putting the
+        card and host interface into "Memory and IO" mode.
+     */
+-    CS_CHECK(RequestConfiguration, link->handle, &link->conf);
++    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link->handle, &link->conf));
+ 
+     /*
+       At this point, the dev_node_t structure(s) need to be
+@@ -545,12 +544,12 @@ static void sedlbauer_release(dev_link_t
+     
+     /* Don't bother checking to see if these succeed or not */
+     if (link->win)
+-	CardServices(ReleaseWindow, link->win);
+-    CardServices(ReleaseConfiguration, link->handle);
++	pcmcia_release_window(link->win);
++    pcmcia_release_configuration(link->handle);
+     if (link->io.NumPorts1)
+-	CardServices(ReleaseIO, link->handle, &link->io);
++	pcmcia_release_io(link->handle, &link->io);
+     if (link->irq.AssignedIRQ)
+-	CardServices(ReleaseIRQ, link->handle, &link->irq);
++	pcmcia_release_irq(link->handle, &link->irq);
+     link->state &= ~DEV_CONFIG;
+     
+     if (link->state & DEV_STALE_LINK)
+@@ -597,14 +596,14 @@ static int sedlbauer_event(event_t event
+ 	/* Mark the device as stopped, to block IO until later */
+ 	dev->stop = 1;
+ 	if (link->state & DEV_CONFIG)
+-	    CardServices(ReleaseConfiguration, link->handle);
++	    pcmcia_release_configuration(link->handle);
+ 	break;
+     case CS_EVENT_PM_RESUME:
+ 	link->state &= ~DEV_SUSPEND;
+ 	/* Fall through... */
+     case CS_EVENT_CARD_RESET:
+ 	if (link->state & DEV_CONFIG)
+-	    CardServices(RequestConfiguration, link->handle, &link->conf);
++	    pcmcia_request_configuration(link->handle, &link->conf);
+ 	dev->stop = 0;
+ 	/*
+ 	  In a normal driver, additional code may go here to restore
+--- linux-2.6.0/drivers/isdn/i4l/isdn_ppp_ccp.c	2003-06-22 12:04:44.000000000 -0700
++++ 25/drivers/isdn/i4l/isdn_ppp_ccp.c	2003-12-28 23:22:27.000000000 -0800
+@@ -557,7 +557,7 @@ ippp_ccp_send_ccp(struct ippp_ccp *ccp, 
+ }
+ 
+ static LIST_HEAD(ipc_head);
+-static spinlock_t ipc_head_lock;
++static spinlock_t ipc_head_lock = SPIN_LOCK_UNLOCKED;
+ 
+ int
+ ippp_ccp_set_compressor(struct ippp_ccp *ccp, int unit,
+--- linux-2.6.0/drivers/md/dm.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/md/dm.c	2003-12-28 23:22:20.000000000 -0800
+@@ -160,20 +160,16 @@ static void __exit dm_exit(void)
+ /*
+  * Block device functions
+  */
+-static int dm_blk_open(struct inode *inode, struct file *file)
++static int dm_blk_open(struct block_device *bdev, struct file *file)
+ {
+-	struct mapped_device *md;
+-
+-	md = inode->i_bdev->bd_disk->private_data;
++	struct mapped_device *md = bdev->bd_disk->private_data;
+ 	dm_get(md);
+ 	return 0;
+ }
+ 
+-static int dm_blk_close(struct inode *inode, struct file *file)
++static int dm_blk_close(struct gendisk *disk)
+ {
+-	struct mapped_device *md;
+-
+-	md = inode->i_bdev->bd_disk->private_data;
++	struct mapped_device *md = disk->private_data;
+ 	dm_put(md);
+ 	return 0;
+ }
+@@ -666,6 +662,20 @@ static void event_callback(void *context
+ 	up_write(&md->lock);
+ }
+ 
++static void __set_size(struct gendisk *disk, sector_t size)
++{
++	struct block_device *bdev;
++
++	set_capacity(disk, size);
++	bdev = bdget_disk(disk, 0);
++	if (bdev) {
++		down(&bdev->bd_inode->i_sem);
++		i_size_write(bdev->bd_inode, size << SECTOR_SHIFT);
++		up(&bdev->bd_inode->i_sem);
++		bdput(bdev);
++	}
++}
++
+ static int __bind(struct mapped_device *md, struct dm_table *t)
+ {
+ 	request_queue_t *q = md->queue;
+@@ -673,7 +683,7 @@ static int __bind(struct mapped_device *
+ 	md->map = t;
+ 
+ 	size = dm_table_get_size(t);
+-	set_capacity(md->disk, size);
++	__set_size(md->disk, size);
+ 	if (size == 0)
+ 		return 0;
+ 
+@@ -692,7 +702,6 @@ static void __unbind(struct mapped_devic
+ 	dm_table_event_callback(md->map, NULL, NULL);
+ 	dm_table_put(md->map);
+ 	md->map = NULL;
+-	set_capacity(md->disk, 0);
+ }
+ 
+ /*
+--- linux-2.6.0/drivers/md/dm.h	2003-07-27 12:14:39.000000000 -0700
++++ 25/drivers/md/dm.h	2003-12-28 23:22:20.000000000 -0800
+@@ -95,7 +95,7 @@ int dm_suspended(struct mapped_device *m
+  * Functions for manipulating a table.  Tables are also reference
+  * counted.
+  *---------------------------------------------------------------*/
+-int dm_table_create(struct dm_table **result, int mode);
++int dm_table_create(struct dm_table **result, int mode, unsigned num_targets);
+ 
+ void dm_table_get(struct dm_table *t);
+ void dm_table_put(struct dm_table *t);
+--- linux-2.6.0/drivers/md/dm-ioctl-v1.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/md/dm-ioctl-v1.c	2003-12-28 23:22:20.000000000 -0800
+@@ -566,7 +566,7 @@ static int create(struct dm_ioctl *param
+ 	if (r)
+ 		return r;
+ 
+-	r = dm_table_create(&t, get_mode(param));
++	r = dm_table_create(&t, get_mode(param), param->target_count);
+ 	if (r)
+ 		return r;
+ 
+@@ -894,7 +894,7 @@ static int reload(struct dm_ioctl *param
+ 	struct mapped_device *md;
+ 	struct dm_table *t;
+ 
+-	r = dm_table_create(&t, get_mode(param));
++	r = dm_table_create(&t, get_mode(param), param->target_count);
+ 	if (r)
+ 		return r;
+ 
+--- linux-2.6.0/drivers/md/dm-ioctl-v4.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/md/dm-ioctl-v4.c	2003-12-28 23:22:20.000000000 -0800
+@@ -872,7 +872,7 @@ static int table_load(struct dm_ioctl *p
+ 	struct hash_cell *hc;
+ 	struct dm_table *t;
+ 
+-	r = dm_table_create(&t, get_mode(param));
++	r = dm_table_create(&t, get_mode(param), param->target_count);
+ 	if (r)
+ 		return r;
+ 
+--- linux-2.6.0/drivers/md/dm-table.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/md/dm-table.c	2003-12-28 23:22:21.000000000 -0800
+@@ -12,6 +12,7 @@
+ #include <linux/namei.h>
+ #include <linux/ctype.h>
+ #include <linux/slab.h>
++#include <linux/interrupt.h>
+ #include <asm/atomic.h>
+ 
+ #define MAX_DEPTH 16
+@@ -202,7 +203,7 @@ static int alloc_targets(struct dm_table
+ 	return 0;
+ }
+ 
+-int dm_table_create(struct dm_table **result, int mode)
++int dm_table_create(struct dm_table **result, int mode, unsigned num_targets)
+ {
+ 	struct dm_table *t = kmalloc(sizeof(*t), GFP_NOIO);
+ 
+@@ -213,8 +214,12 @@ int dm_table_create(struct dm_table **re
+ 	INIT_LIST_HEAD(&t->devices);
+ 	atomic_set(&t->holders, 1);
+ 
+-	/* allocate a single nodes worth of targets to begin with */
+-	if (alloc_targets(t, KEYS_PER_NODE)) {
++	if (!num_targets)
++		num_targets = KEYS_PER_NODE;
++
++	num_targets = dm_round_up(num_targets, KEYS_PER_NODE);
++
++	if (alloc_targets(t, num_targets)) {
+ 		kfree(t);
+ 		t = NULL;
+ 		return -ENOMEM;
+@@ -626,6 +631,16 @@ static int split_args(int *argc, char **
+ 	return 0;
+ }
+ 
++static void set_default_limits(struct io_restrictions *rs)
++{
++	rs->max_sectors = MAX_SECTORS;
++	rs->max_phys_segments = MAX_PHYS_SEGMENTS;
++	rs->max_hw_segments = MAX_HW_SEGMENTS;
++	rs->hardsect_size = 1 << SECTOR_SHIFT;
++	rs->max_segment_size = MAX_SEGMENT_SIZE;
++	rs->seg_boundary_mask = -1;
++}
++
+ int dm_table_add_target(struct dm_table *t, const char *type,
+ 			sector_t start, sector_t len, char *params)
+ {
+@@ -638,6 +653,7 @@ int dm_table_add_target(struct dm_table 
+ 
+ 	tgt = t->targets + t->num_targets;
+ 	memset(tgt, 0, sizeof(*tgt));
++	set_default_limits(&tgt->limits);
+ 
+ 	tgt->type = dm_get_target_type(type);
+ 	if (!tgt->type) {
+@@ -731,22 +747,28 @@ int dm_table_complete(struct dm_table *t
+ 	return r;
+ }
+ 
+-static spinlock_t _event_lock = SPIN_LOCK_UNLOCKED;
++static DECLARE_MUTEX(_event_lock);
+ void dm_table_event_callback(struct dm_table *t,
+ 			     void (*fn)(void *), void *context)
+ {
+-	spin_lock_irq(&_event_lock);
++	down(&_event_lock);
+ 	t->event_fn = fn;
+ 	t->event_context = context;
+-	spin_unlock_irq(&_event_lock);
++	up(&_event_lock);
+ }
+ 
+ void dm_table_event(struct dm_table *t)
+ {
+-	spin_lock(&_event_lock);
++	/*
++	 * You can no longer call dm_table_event() from interrupt
++	 * context, use a bottom half instead.
++	 */
++	BUG_ON(in_interrupt());
++
++	down(&_event_lock);
+ 	if (t->event_fn)
+ 		t->event_fn(t->event_context);
+-	spin_unlock(&_event_lock);
++	up(&_event_lock);
+ }
+ 
+ sector_t dm_table_get_size(struct dm_table *t)
+--- linux-2.6.0/drivers/md/Kconfig	2003-10-08 15:07:08.000000000 -0700
++++ 25/drivers/md/Kconfig	2003-12-28 23:22:20.000000000 -0800
+@@ -138,6 +138,7 @@ config BLK_DEV_DM
+ config DM_IOCTL_V4
+ 	bool "ioctl interface version 4"
+ 	depends on BLK_DEV_DM
++	default y
+ 	---help---
+ 	  Recent tools use a new version of the ioctl interface, only
+           select this option if you intend using such tools.
+--- linux-2.6.0/drivers/md/linear.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/md/linear.c	2003-12-28 23:22:19.000000000 -0800
+@@ -113,8 +113,17 @@ static int linear_run (mddev_t *mddev)
+ 		}
+ 
+ 		disk->rdev = rdev;
++
+ 		blk_queue_stack_limits(mddev->queue,
+ 				       rdev->bdev->bd_disk->queue);
++		/* as we don't honour merge_bvec_fn, we must never risk
++		 * violating it, so limit ->max_sector to one PAGE, as
++		 * a one page request is never in violation.
++		 */
++		if (rdev->bdev->bd_disk->queue->merge_bvec_fn &&
++		    mddev->queue->max_sectors > (PAGE_SIZE>>9))
++			mddev->queue->max_sectors = (PAGE_SIZE>>9);
++
+ 		disk->size = rdev->size;
+ 		mddev->array_size += rdev->size;
+ 
+--- linux-2.6.0/drivers/md/md.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/md/md.c	2003-12-28 23:21:17.000000000 -0800
+@@ -2360,11 +2360,10 @@ static int set_disk_faulty(mddev_t *mdde
+ 	return 1;
+ }
+ 
+-static int md_ioctl(struct inode *inode, struct file *file,
++static int md_ioctl(struct block_device *bdev, struct file *file,
+ 			unsigned int cmd, unsigned long arg)
+ {
+ 	char b[BDEVNAME_SIZE];
+-	unsigned int minor = iminor(inode);
+ 	int err = 0;
+ 	struct hd_geometry *loc = (struct hd_geometry *) arg;
+ 	mddev_t *mddev = NULL;
+@@ -2372,11 +2371,6 @@ static int md_ioctl(struct inode *inode,
+ 	if (!capable(CAP_SYS_ADMIN))
+ 		return -EACCES;
+ 
+-	if (minor >= MAX_MD_DEVS) {
+-		MD_BUG();
+-		return -EINVAL;
+-	}
+-
+ 	/*
+ 	 * Commands dealing with the RAID driver but not any
+ 	 * particular array:
+@@ -2405,7 +2399,7 @@ static int md_ioctl(struct inode *inode,
+ 	 * Commands creating/starting a new array:
+ 	 */
+ 
+-	mddev = inode->i_bdev->bd_inode->u.generic_ip;
++	mddev = bdev->bd_inode->u.generic_ip;
+ 
+ 	if (!mddev) {
+ 		BUG();
+@@ -2527,7 +2521,7 @@ static int md_ioctl(struct inode *inode,
+ 						(short *) &loc->cylinders);
+ 			if (err)
+ 				goto abort_unlock;
+-			err = put_user (get_start_sect(inode->i_bdev),
++			err = put_user (get_start_sect(bdev),
+ 						(long *) &loc->start);
+ 			goto done_unlock;
+ 	}
+@@ -2605,12 +2599,12 @@ abort:
+ 	return err;
+ }
+ 
+-static int md_open(struct inode *inode, struct file *file)
++static int md_open(struct block_device *bdev, struct file *file)
+ {
+ 	/*
+ 	 * Succeed if we can find or allocate a mddev structure.
+ 	 */
+-	mddev_t *mddev = mddev_find(iminor(inode));
++	mddev_t *mddev = mddev_find(MINOR(bdev->bd_dev));
+ 	int err = -ENOMEM;
+ 
+ 	if (!mddev)
+@@ -2621,16 +2615,16 @@ static int md_open(struct inode *inode, 
+ 
+ 	err = 0;
+ 	mddev_unlock(mddev);
+-	inode->i_bdev->bd_inode->u.generic_ip = mddev_get(mddev);
++	bdev->bd_inode->u.generic_ip = mddev_get(mddev);
+  put:
+ 	mddev_put(mddev);
+  out:
+ 	return err;
+ }
+ 
+-static int md_release(struct inode *inode, struct file * file)
++static int md_release(struct gendisk *disk)
+ {
+- 	mddev_t *mddev = inode->i_bdev->bd_inode->u.generic_ip;
++ 	mddev_t *mddev = disk->private_data;
+ 
+ 	if (!mddev)
+ 		BUG();
+--- linux-2.6.0/drivers/md/multipath.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/md/multipath.c	2003-12-28 23:22:19.000000000 -0800
+@@ -273,6 +273,17 @@ static int multipath_add_disk(mddev_t *m
+ 			p->rdev = rdev;
+ 			blk_queue_stack_limits(mddev->queue,
+ 					       rdev->bdev->bd_disk->queue);
++
++		/* as we don't honour merge_bvec_fn, we must never risk
++		 * violating it, so limit ->max_sector to one PAGE, as
++		 * a one page request is never in violation.
++		 * (Note: it is very unlikely that a device with
++		 * merge_bvec_fn will be involved in multipath.)
++		 */
++			if (rdev->bdev->bd_disk->queue->merge_bvec_fn &&
++			    mddev->queue->max_sectors > (PAGE_SIZE>>9))
++				mddev->queue->max_sectors = (PAGE_SIZE>>9);
++
+ 			conf->working_disks++;
+ 			rdev->raid_disk = path;
+ 			rdev->in_sync = 1;
+@@ -410,8 +421,16 @@ static int multipath_run (mddev_t *mddev
+ 
+ 		disk = conf->multipaths + disk_idx;
+ 		disk->rdev = rdev;
++
+ 		blk_queue_stack_limits(mddev->queue,
+ 				       rdev->bdev->bd_disk->queue);
++		/* as we don't honour merge_bvec_fn, we must never risk
++		 * violating it, not that we ever expect a device with
++		 * a merge_bvec_fn to be involved in multipath */
++		if (rdev->bdev->bd_disk->queue->merge_bvec_fn &&
++		    mddev->queue->max_sectors > (PAGE_SIZE>>9))
++			mddev->queue->max_sectors = (PAGE_SIZE>>9);
++
+ 		if (!rdev->faulty) 
+ 			conf->working_disks++;
+ 	}
+--- linux-2.6.0/drivers/md/raid0.c	2003-10-25 14:45:44.000000000 -0700
++++ 25/drivers/md/raid0.c	2003-12-28 23:22:19.000000000 -0800
+@@ -112,8 +112,18 @@ static int create_strip_zones (mddev_t *
+ 			goto abort;
+ 		}
+ 		zone->dev[j] = rdev1;
++
+ 		blk_queue_stack_limits(mddev->queue,
+ 				       rdev1->bdev->bd_disk->queue);
++		/* as we don't honour merge_bvec_fn, we must never risk
++		 * violating it, so limit ->max_sector to one PAGE, as
++		 * a one page request is never in violation.
++		 */
++
++		if (rdev1->bdev->bd_disk->queue->merge_bvec_fn &&
++		    mddev->queue->max_sectors > (PAGE_SIZE>>9))
++			mddev->queue->max_sectors = (PAGE_SIZE>>9);
++
+ 		if (!smallest || (rdev1->size <smallest->size))
+ 			smallest = rdev1;
+ 		cnt++;
+@@ -301,6 +311,22 @@ static int raid0_run (mddev_t *mddev)
+ 		conf->hash_spacing++;
+ 	}
+ 
++	/* calculate the max read-ahead size.
++	 * For read-ahead of large files to be effective, we need to
++	 * readahead at least a whole stripe. i.e. number of devices
++	 * multiplied by chunk size.
++	 * If an individual device has an ra_pages greater than the
++	 * chunk size, then we will not drive that device as hard as it
++	 * wants.  We consider this a configuration error: a larger
++	 * chunksize should be used in that case.
++	 */
++	{
++		int stripe = mddev->raid_disks * mddev->chunk_size / PAGE_CACHE_SIZE;
++		if (mddev->queue->backing_dev_info.ra_pages < stripe)
++			mddev->queue->backing_dev_info.ra_pages = stripe;
++	}
++
++
+ 	blk_queue_merge_bvec(mddev->queue, raid0_mergeable_bvec);
+ 	return 0;
+ 
+--- linux-2.6.0/drivers/md/raid1.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/md/raid1.c	2003-12-28 23:23:02.000000000 -0800
+@@ -56,7 +56,8 @@ static void r1bio_pool_free(void *r1_bio
+ 	kfree(r1_bio);
+ }
+ 
+-#define RESYNC_BLOCK_SIZE (64*1024)
++//#define RESYNC_BLOCK_SIZE (64*1024)
++#define RESYNC_BLOCK_SIZE PAGE_SIZE
+ #define RESYNC_SECTORS (RESYNC_BLOCK_SIZE >> 9)
+ #define RESYNC_PAGES ((RESYNC_BLOCK_SIZE + PAGE_SIZE-1) / PAGE_SIZE)
+ #define RESYNC_WINDOW (2048*1024)
+@@ -677,8 +678,17 @@ static int raid1_add_disk(mddev_t *mddev
+ 	for (mirror=0; mirror < mddev->raid_disks; mirror++)
+ 		if ( !(p=conf->mirrors+mirror)->rdev) {
+ 			p->rdev = rdev;
++
+ 			blk_queue_stack_limits(mddev->queue,
+ 					       rdev->bdev->bd_disk->queue);
++			/* as we don't honour merge_bvec_fn, we must never risk
++			 * violating it, so limit ->max_sector to one PAGE, as
++			 * a one page request is never in violation.
++			 */
++			if (rdev->bdev->bd_disk->queue->merge_bvec_fn &&
++			    mddev->queue->max_sectors > (PAGE_SIZE>>9))
++				mddev->queue->max_sectors = (PAGE_SIZE>>9);
++
+ 			p->head_position = 0;
+ 			rdev->raid_disk = mirror;
+ 			found = 1;
+@@ -1077,8 +1087,17 @@ static int run(mddev_t *mddev)
+ 		disk = conf->mirrors + disk_idx;
+ 
+ 		disk->rdev = rdev;
++
+ 		blk_queue_stack_limits(mddev->queue,
+ 				       rdev->bdev->bd_disk->queue);
++		/* as we don't honour merge_bvec_fn, we must never risk
++		 * violating it, so limit ->max_sector to one PAGE, as
++		 * a one page request is never in violation.
++		 */
++		if (rdev->bdev->bd_disk->queue->merge_bvec_fn &&
++		    mddev->queue->max_sectors > (PAGE_SIZE>>9))
++			mddev->queue->max_sectors = (PAGE_SIZE>>9);
++
+ 		disk->head_position = 0;
+ 		if (!rdev->faulty && rdev->in_sync)
+ 			conf->working_disks++;
+--- linux-2.6.0/drivers/md/raid5.c	2003-12-17 21:20:02.000000000 -0800
++++ 25/drivers/md/raid5.c	2003-12-28 23:22:19.000000000 -0800
+@@ -1587,6 +1587,16 @@ memory = conf->max_nr_stripes * (sizeof(
+ 
+ 	print_raid5_conf(conf);
+ 
++	/* read-ahead size must cover a whole stripe, which is
++	 * (n-1) * chunksize where 'n' is the number of raid devices
++	 */
++	{
++		int stripe = (mddev->raid_disks-1) * mddev->chunk_size
++			/ PAGE_CACHE_SIZE;
++		if (mddev->queue->backing_dev_info.ra_pages < stripe)
++			mddev->queue->backing_dev_info.ra_pages = stripe;
++	}
++
+ 	/* Ok, everything is just fine now */
+ 	mddev->array_size =  mddev->size * (mddev->raid_disks - 1);
+ 	return 0;
+--- linux-2.6.0/drivers/media/common/saa7146_core.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/drivers/media/common/saa7146_core.c	2003-12-28 23:22:37.000000000 -0800
+@@ -45,10 +45,65 @@ static void dump_registers(struct saa714
+ #endif
+ 
+ /****************************************************************************
++ * gpio and debi helper functions
++ ****************************************************************************/
++
++/* write "data" to the gpio-pin "pin" */
++void saa7146_set_gpio(struct saa7146_dev *dev, u8 pin, u8 data)
++{
++	u32 value = 0;
++
++	/* sanity check */
++	if(pin > 3)
++		return;
++
++	/* read old register contents */
++	value = saa7146_read(dev, GPIO_CTRL );
++	
++	value &= ~(0xff << (8*pin));
++	value |= (data << (8*pin));
++
++	saa7146_write(dev, GPIO_CTRL, value);
++}
++
++/* This DEBI code is based on the saa7146 Stradis driver by Nathan Laredo */
++int saa7146_wait_for_debi_done(struct saa7146_dev *dev)
++{
++	int start;
++
++	/* wait for registers to be programmed */
++	start = jiffies;
++	while (1) {
++                if (saa7146_read(dev, MC2) & 2)
++                        break;
++		if (jiffies-start > HZ/20) {
++			DEB_S(("timed out while waiting for registers getting programmed\n"));
++			return -ETIMEDOUT;
++		}
++	}
++
++	/* wait for transfer to complete */
++	start = jiffies;
++	while (1) {
++		if (!(saa7146_read(dev, PSR) & SPCI_DEBI_S))
++			break;
++		saa7146_read(dev, MC2);
++		if (jiffies-start > HZ/4) {
++			DEB_S(("timed out while waiting for transfer completion\n"));
++			return -ETIMEDOUT;
++		}
++	}
++
++	return 0;
++}
++
++/****************************************************************************
+  * general helper functions
+  ****************************************************************************/
+ 
+-/* this is videobuf_vmalloc_to_sg() from video-buf.c */
++/* this is videobuf_vmalloc_to_sg() from video-buf.c 
++   make sure virt has been allocated with vmalloc_32(), otherwise the BUG()
++   may be triggered on highmem machines */
+ static struct scatterlist* vmalloc_to_sg(unsigned char *virt, int nr_pages)
+ {
+ 	struct scatterlist *sglist;
+@@ -84,7 +139,7 @@ char *saa7146_vmalloc_build_pgtable(stru
+ {
+ 	struct scatterlist *slist = NULL;
+ 	int pages = (length+PAGE_SIZE-1)/PAGE_SIZE;
+-	char *mem = vmalloc(length);
++	char *mem = vmalloc_32(length);
+ 	int slen = 0;
+ 
+ 	if (NULL == mem) {
+@@ -103,7 +158,9 @@ char *saa7146_vmalloc_build_pgtable(stru
+ 	}
+ 	
+ 	slen = pci_map_sg(pci,slist,pages,PCI_DMA_FROMDEVICE);
+-	saa7146_pgtable_build_single(pci, pt, slist, slen);
++	if (0 != saa7146_pgtable_build_single(pci, pt, slist, slen)) {
++		return NULL;
++	}
+ 
+ 	/* fixme: here's a memory leak: slist never gets freed by any other
+ 	   function ...*/
+@@ -139,7 +196,7 @@ int saa7146_pgtable_alloc(struct pci_dev
+ 	return 0;
+ }
+ 
+-void saa7146_pgtable_build_single(struct pci_dev *pci, struct saa7146_pgtable *pt,
++int saa7146_pgtable_build_single(struct pci_dev *pci, struct saa7146_pgtable *pt,
+ 	struct scatterlist *list, int sglen  )
+ {
+ 	u32   *ptr, fill;
+@@ -148,6 +205,11 @@ void saa7146_pgtable_build_single(struct
+ 
+ 	BUG_ON( 0 == sglen);
+ 
++	if (list->offset > PAGE_SIZE) {
++		DEB_D(("offset > PAGE_SIZE. this should not happen."));
++		return -EINVAL;
++	}
++	
+ 	/* if we have a user buffer, the first page may not be
+ 	   aligned to a page boundary. */
+ 	pt->offset = list->offset;
+@@ -177,6 +239,7 @@ void saa7146_pgtable_build_single(struct
+ 		printk("ptr1 %d: 0x%08x\n",i,ptr[i]);
+ 	}
+ */
++	return 0;
+ }
+ 
+ /********************************************************************************/
+@@ -322,7 +385,7 @@ static int saa7146_init_one(struct pci_d
+ 	saa7146_write(dev, MC1, MASK_31);
+ */
+ 
+-	/* disable alle irqs */
++	/* disable all irqs */
+ 	saa7146_write(dev, IER, 0);
+ 
+ 	/* shut down all dma transfers */
+@@ -381,8 +444,8 @@ static int saa7146_init_one(struct pci_d
+ 	dev->module = THIS_MODULE;
+ 	init_waitqueue_head(&dev->i2c_wq);
+ 
+-	/* set some default values */
+-	saa7146_write(dev, BCS_CTRL, 0x80400040);
++	/* set some sane pci arbitrition values */
++	saa7146_write(dev, PCI_BT_V1, 0x1c00101f); 
+ 
+ 	if( 0 != ext->probe) {
+ 		if( 0 != ext->probe(dev) ) {
+@@ -508,6 +571,7 @@ EXPORT_SYMBOL_GPL(saa7146_pgtable_alloc)
+ EXPORT_SYMBOL_GPL(saa7146_pgtable_free);
+ EXPORT_SYMBOL_GPL(saa7146_pgtable_build_single);
+ EXPORT_SYMBOL_GPL(saa7146_vmalloc_build_pgtable);
++EXPORT_SYMBOL_GPL(saa7146_wait_for_debi_done);
+ 
+ EXPORT_SYMBOL_GPL(saa7146_setgpio);
+ 
+--- linux-2.6.0/drivers/media/common/saa7146_fops.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/media/common/saa7146_fops.c	2003-12-28 23:22:37.000000000 -0800
+@@ -86,7 +86,7 @@ void saa7146_buffer_next(struct saa7146_
+ 		return;
+ 	}
+ 
+-	DEB_EE(("dev:%p, dmaq:%p, vbi:%d\n", dev, q, vbi));
++	DEB_INT(("dev:%p, dmaq:%p, vbi:%d\n", dev, q, vbi));
+ 
+ #if DEBUG_SPINLOCKS
+ 	BUG_ON(!spin_is_locked(&dev->slock));
+@@ -98,10 +98,10 @@ void saa7146_buffer_next(struct saa7146_
+ 		if (!list_empty(&q->queue))
+ 			next = list_entry(q->queue.next,struct saa7146_buf, vb.queue);
+ 		q->curr = buf;
+-		DEB_D(("next buffer: buf:%p, prev:%p, next:%p\n", buf, q->queue.prev,q->queue.next));
++		DEB_INT(("next buffer: buf:%p, prev:%p, next:%p\n", buf, q->queue.prev,q->queue.next));
+ 		buf->activate(dev,buf,next);
+ 	} else {
+-		DEB_D(("no next buffer. stopping.\n"));
++		DEB_INT(("no next buffer. stopping.\n"));
+ 		if( 0 != vbi ) {
+ 			/* turn off video-dma3 */
+ 			saa7146_write(dev,MC1, MASK_20);
+@@ -229,10 +229,10 @@ static int fops_open(struct inode *inode
+ 
+ 	if( fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
+ 		DEB_S(("initializing vbi...\n"));
+-		saa7146_vbi_uops.open(dev,fh);
++		saa7146_vbi_uops.open(dev,file);
+ 	} else {
+ 		DEB_S(("initializing video...\n"));
+-		saa7146_video_uops.open(dev,fh);
++		saa7146_video_uops.open(dev,file);
+ 	}
+ 
+ 	result = 0;
+@@ -255,9 +255,9 @@ static int fops_release(struct inode *in
+ 		return -ERESTARTSYS;
+ 
+ 	if( fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) {
+-		saa7146_vbi_uops.release(dev,fh,file);
++		saa7146_vbi_uops.release(dev,file);
+ 	} else {
+-		saa7146_video_uops.release(dev,fh,file);
++		saa7146_video_uops.release(dev,file);
+ 	}
+ 
+ 	module_put(dev->ext->module);
+@@ -372,7 +372,7 @@ void vv_callback(struct saa7146_dev *dev
+ {
+ 	u32 isr = status;
+ 	
+-	DEB_EE(("dev:%p, isr:0x%08x\n",dev,(u32)status));
++	DEB_INT(("dev:%p, isr:0x%08x\n",dev,(u32)status));
+ 
+ 	if (0 != (isr & (MASK_27))) {
+ 		DEB_INT(("irq: RPS0 (0x%08x).\n",isr));
+@@ -410,6 +410,12 @@ int saa7146_vv_init(struct saa7146_dev* 
+ 
+ 	DEB_EE(("dev:%p\n",dev));
+ 	
++	/* set default values for video parts of the saa7146 */
++	saa7146_write(dev, BCS_CTRL, 0x80400040);
++
++	/* enable video-port pins */
++	saa7146_write(dev, MC1, (MASK_10 | MASK_26));
++
+ 	/* save per-device extension data (one extension can
+ 	   handle different devices that might need different
+ 	   configuration data) */
+--- linux-2.6.0/drivers/media/common/saa7146_hlp.c	2003-10-08 15:07:08.000000000 -0700
++++ 25/drivers/media/common/saa7146_hlp.c	2003-12-28 23:22:37.000000000 -0800
+@@ -660,24 +660,6 @@ void saa7146_set_hps_source_and_sync(str
+ 	vv->current_hps_sync = sync;
+ } 
+ 
+-/* write "data" to the gpio-pin "pin" */
+-void saa7146_set_gpio(struct saa7146_dev *dev, u8 pin, u8 data)
+-{
+-	u32 value = 0;
+-
+-	/* sanity check */
+-	if(pin > 3)
+-		return;
+-
+-	/* read old register contents */
+-	value = saa7146_read(dev, GPIO_CTRL );
+-	
+-	value &= ~(0xff << (8*pin));
+-	value |= (data << (8*pin));
+-
+-	saa7146_write(dev, GPIO_CTRL, value);
+-}
+-
+ /* reprogram hps, enable(1) / disable(0) video */
+ void saa7146_set_overlay(struct saa7146_dev *dev, struct saa7146_fh *fh, int v)
+ {
+@@ -710,13 +692,15 @@ void saa7146_write_out_dma(struct saa714
+ 	/* calculate starting address */
+ 	where  = (which-1)*0x18;
+ 
++/*
+ 	if( 0 != (dev->ext_vv_data->flags & SAA7146_EXT_SWAP_ODD_EVEN)) {
+ 		saa7146_write(dev, where, 	vdma->base_even);
+ 		saa7146_write(dev, where+0x04, 	vdma->base_odd);
+ 	} else {
++*/
+ 		saa7146_write(dev, where, 	vdma->base_odd);
+ 		saa7146_write(dev, where+0x04, 	vdma->base_even);
+-	}
++//	}
+ 	saa7146_write(dev, where+0x08, 	vdma->prot_addr);
+ 	saa7146_write(dev, where+0x0c, 	vdma->pitch);
+ 	saa7146_write(dev, where+0x10, 	vdma->base_page);
+@@ -971,12 +955,13 @@ static void program_capture_engine(struc
+ 	unsigned long e_wait = vv->current_hps_sync == SAA7146_HPS_SYNC_PORT_A ? CMD_E_FID_A : CMD_E_FID_B;
+ 	unsigned long o_wait = vv->current_hps_sync == SAA7146_HPS_SYNC_PORT_A ? CMD_O_FID_A : CMD_O_FID_B;
+ 
++/*
+ 	if( 0 != (dev->ext_vv_data->flags & SAA7146_EXT_SWAP_ODD_EVEN)) {
+ 		unsigned long tmp = e_wait;
+ 		e_wait = o_wait;
+ 		o_wait = tmp;
+ 	}
+-
++*/
+ 	/* wait for o_fid_a/b / e_fid_a/b toggle only if rps register 0 is not set*/
+ 	WRITE_RPS0(CMD_PAUSE | CMD_OAN | CMD_SIG0 | o_wait);
+ 	WRITE_RPS0(CMD_PAUSE | CMD_OAN | CMD_SIG0 | e_wait);
+--- linux-2.6.0/drivers/media/common/saa7146_i2c.c	2003-10-25 14:45:44.000000000 -0700
++++ 25/drivers/media/common/saa7146_i2c.c	2003-12-28 23:22:37.000000000 -0800
+@@ -186,7 +186,7 @@ static int saa7146_i2c_writeout(struct s
+ {
+ 	u32 status = 0, mc2 = 0;
+ 	int trial = 0;
+-	int timeout;
++	unsigned long timeout;
+ 
+ 	/* write out i2c-command */
+ 	DEB_I2C(("before: 0x%08x (status: 0x%08x), %d\n",*dword,saa7146_read(dev, I2C_STATUS), dev->i2c_op));
+@@ -218,7 +218,7 @@ static int saa7146_i2c_writeout(struct s
+ 			if( 0 != mc2 ) {
+ 				break;
+ 			}
+-			if (jiffies > timeout) {
++			if (time_after(jiffies,timeout)) {
+ 				printk(KERN_WARNING "saa7146_i2c_writeout: timed out waiting for MC2\n");
+ 				return -EIO;
+ 			}
+@@ -233,7 +233,7 @@ static int saa7146_i2c_writeout(struct s
+ 			status = saa7146_i2c_status(dev);
+ 			if ((status & 0x3) != 1)
+ 				break;
+-			if (jiffies > timeout) {
++			if (time_after(jiffies,timeout)) {
+ 				/* this is normal when probing the bus
+ 				 * (no answer from nonexisistant device...)
+ 				 */
+@@ -301,7 +301,8 @@ int saa7146_i2c_transfer(struct saa7146_
+ 		goto out;
+ 	}
+ 
+-        if (count > 3) short_delay = 1;
++	if ( count > 3 || 0 != (SAA7146_I2C_SHORT_DELAY & dev->ext->flags) )
++		short_delay = 1;
+   
+ 	do {
+ 		/* reset the i2c-device if necessary */
+@@ -403,19 +404,29 @@ int saa7146_i2c_adapter_prepare(struct s
+ {
+ 	DEB_EE(("bitrate: 0x%08x\n",bitrate));
+ 	
++	/* enable i2c-port pins */
++	saa7146_write(dev, MC1, (MASK_08 | MASK_24));
++
+ 	dev->i2c_bitrate = bitrate;
+ 	saa7146_i2c_reset(dev);
+ 
+ 	if( NULL != i2c_adapter ) {
+ 		memset(i2c_adapter,0,sizeof(struct i2c_adapter));
+ 		strcpy(i2c_adapter->name, dev->name);	
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
++		i2c_adapter->data = dev;
++#else
+ 		i2c_set_adapdata(i2c_adapter,dev);
+-		i2c_adapter->class	   = I2C_ADAP_CLASS_TV_ANALOG;
++#endif
+ 		i2c_adapter->algo	   = &saa7146_algo;
+ 		i2c_adapter->algo_data     = NULL;
+ 		i2c_adapter->id 	   = I2C_ALGO_SAA7146;
+ 		i2c_adapter->timeout = SAA7146_I2C_TIMEOUT;
+ 		i2c_adapter->retries = SAA7146_I2C_RETRIES;
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
++#else
++		i2c_adapter->class = I2C_ADAP_CLASS_TV_ANALOG;
++#endif
+ 	}
+ 	
+ 	return 0;
+--- linux-2.6.0/drivers/media/common/saa7146_vbi.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/media/common/saa7146_vbi.c	2003-12-28 23:22:37.000000000 -0800
+@@ -41,7 +41,11 @@ static int vbi_workaround(struct saa7146
+ 	/* wait for vbi_a or vbi_b*/
+ 	if ( 0 != (SAA7146_USE_PORT_B_FOR_VBI & dev->ext_vv_data->flags)) {
+ 		DEB_D(("...using port b\n"));
++		WRITE_RPS1(CMD_PAUSE | CMD_OAN | CMD_SIG1 | CMD_E_FID_B);
++		WRITE_RPS1(CMD_PAUSE | CMD_OAN | CMD_SIG1 | CMD_O_FID_B);
++/*
+ 		WRITE_RPS1(CMD_PAUSE | MASK_09);
++*/
+ 	} else {
+ 		DEB_D(("...using port a\n"));
+ 		WRITE_RPS1(CMD_PAUSE | MASK_10);
+@@ -137,10 +141,10 @@ void saa7146_set_vbi_capture(struct saa7
+ 	unsigned long o_wait = vv->current_hps_sync == SAA7146_HPS_SYNC_PORT_A ? CMD_O_FID_A : CMD_O_FID_B;
+ 
+ /*
+-	vdma3.base_even	= (u32)dev->ov_fb.base+2048*70;
+-	vdma3.base_odd	= (u32)dev->ov_fb.base;
+-	vdma3.prot_addr	= (u32)dev->ov_fb.base+2048*164;
+-	vdma3.pitch	= 2048;
++	vdma3.base_even	= 0xc8000000+2560*70;
++	vdma3.base_odd	= 0xc8000000;
++	vdma3.prot_addr	= 0xc8000000+2560*164;
++	vdma3.pitch	= 2560;
+ 	vdma3.base_page	= 0;
+ 	vdma3.num_line_byte = (64<<16)|((vbi_pixel_to_capture)<<0); // set above!
+ */
+@@ -244,7 +248,9 @@ static int buffer_prepare(struct file *f
+ 		err = videobuf_iolock(dev->pci,&buf->vb,NULL);
+ 		if (err)
+ 			goto oops;
+-		saa7146_pgtable_build_single(dev->pci, &buf->pt[2], buf->vb.dma.sglist, buf->vb.dma.sglen);
++		err = saa7146_pgtable_build_single(dev->pci, &buf->pt[2], buf->vb.dma.sglist, buf->vb.dma.sglen);
++		if (0 != err)
++			return err;
+ 	}
+ 	buf->vb.state = STATE_PREPARED;
+ 	buf->activate = buffer_activate;
+@@ -303,7 +309,7 @@ static struct videobuf_queue_ops vbi_qop
+ 
+ /* ------------------------------------------------------------------ */
+ 
+-static void vbi_stop(struct saa7146_fh *fh)
++static void vbi_stop(struct saa7146_fh *fh, struct file *file)
+ {
+ 	struct saa7146_dev *dev = fh->dev;
+ 	struct saa7146_vv *vv = dev->vv_data;
+@@ -321,23 +327,29 @@ static void vbi_stop(struct saa7146_fh *
+ 	/* shut down dma 3 transfers */
+ 	saa7146_write(dev, MC1, MASK_20);
+ 
++	if (vv->vbi_q.curr) {
++		saa7146_buffer_finish(dev,&vv->vbi_q,STATE_DONE);
++	}
++
++	videobuf_queue_cancel(file,&fh->vbi_q);
++
+ 	vv->vbi_streaming = NULL;
+ 
+ 	del_timer(&vv->vbi_q.timeout);
+ 	del_timer(&fh->vbi_read_timeout);
+ 
+-	DEB_VBI(("out\n"));
+ 	spin_unlock_irqrestore(&dev->slock, flags);
+ }
+ 
+ static void vbi_read_timeout(unsigned long data)
+ {
+-	struct saa7146_fh *fh = (struct saa7146_fh *)data;
++	struct file *file = (struct file*)data;
++	struct saa7146_fh *fh = file->private_data;
+ 	struct saa7146_dev *dev = fh->dev;
+ 	
+ 	DEB_VBI(("dev:%p, fh:%p\n",dev, fh));
+ 
+-	vbi_stop(fh);
++	vbi_stop(fh, file);
+ }
+ 
+ static void vbi_init(struct saa7146_dev *dev, struct saa7146_vv *vv)
+@@ -354,10 +366,21 @@ static void vbi_init(struct saa7146_dev 
+ 	init_waitqueue_head(&vv->vbi_wq);
+ }
+ 
+-static void vbi_open(struct saa7146_dev *dev, struct saa7146_fh *fh)
++static void vbi_open(struct saa7146_dev *dev, struct file *file)
+ {
++	struct saa7146_fh *fh = (struct saa7146_fh *)file->private_data;
++	
++	u32 arbtr_ctrl	= saa7146_read(dev, PCI_BT_V1);
++	int ret = 0;
++	
+ 	DEB_VBI(("dev:%p, fh:%p\n",dev,fh));
+ 
++	/* adjust arbitrition control for video dma 3 */
++	arbtr_ctrl &= ~0x1f0000;
++	arbtr_ctrl |=  0x1d0000;
++	saa7146_write(dev, PCI_BT_V1, arbtr_ctrl);
++	saa7146_write(dev, MC2, (MASK_04|MASK_20));		
++	
+ 	memset(&fh->vbi_fmt,0,sizeof(fh->vbi_fmt));
+ 
+ 	fh->vbi_fmt.sampling_rate	= 27000000;
+@@ -380,21 +403,32 @@ static void vbi_open(struct saa7146_dev 
+ 
+ 	init_timer(&fh->vbi_read_timeout);
+ 	fh->vbi_read_timeout.function = vbi_read_timeout;
+-	fh->vbi_read_timeout.data = (unsigned long)fh;
++	fh->vbi_read_timeout.data = (unsigned long)file;
+ 
+-	/* fixme: enable this again, if the dvb-c w/ analog module work properly */
+-/*
+-	vbi_workaround(dev);
+-*/
++	/* initialize the brs */
++	if ( 0 != (SAA7146_USE_PORT_B_FOR_VBI & dev->ext_vv_data->flags)) {
++		saa7146_write(dev, BRS_CTRL, MASK_30|MASK_29 | (7 << 19));
++	} else {
++		saa7146_write(dev, BRS_CTRL, 0x00000001);
++
++		if (0 != (ret = vbi_workaround(dev))) {
++			DEB_VBI(("vbi workaround failed!\n"));
++			/* return ret;*/
++		}
++	}
++
++	/* upload brs register */
++	saa7146_write(dev, MC2, (MASK_08|MASK_24));		
+ }
+ 
+-static void vbi_close(struct saa7146_dev *dev, struct saa7146_fh *fh, struct file *file)
++static void vbi_close(struct saa7146_dev *dev, struct file *file)
+ {
++	struct saa7146_fh *fh = (struct saa7146_fh *)file->private_data;
+ 	struct saa7146_vv *vv = dev->vv_data;
+ 	DEB_VBI(("dev:%p, fh:%p\n",dev,fh));
+ 
+ 	if( fh == vv->vbi_streaming ) {
+-		vbi_stop(fh);
++		vbi_stop(fh, file);
+ 	}
+ }
+ 
+--- linux-2.6.0/drivers/media/common/saa7146_video.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/media/common/saa7146_video.c	2003-12-28 23:22:37.000000000 -0800
+@@ -116,7 +116,7 @@ static int try_win(struct saa7146_dev *d
+ 		DEB_D(("no fb fmt set.\n"));
+ 		return -EINVAL;
+ 	}
+-	if (win->w.width < 64 || win->w.height <  64) {
++	if (win->w.width < 48 || win->w.height <  32) {
+ 		DEB_D(("min width/height. (%d,%d)\n",win->w.width,win->w.height));
+ 		return -EINVAL;
+ 	}
+@@ -661,7 +661,7 @@ static int saa7146_pgtable_build(struct 
+ */				
+ 	} else {
+ 		struct saa7146_pgtable *pt = &buf->pt[0];
+-		saa7146_pgtable_build_single(pci, pt, list, length);
++		return saa7146_pgtable_build_single(pci, pt, list, length);
+ 	}
+ 
+ 	return 0;
+@@ -704,7 +704,7 @@ static int video_begin(struct saa7146_fh
+ 	return 0;
+ }
+ 
+-static int video_end(struct saa7146_fh *fh)
++static int video_end(struct saa7146_fh *fh, struct file *file)
+ {
+ 	struct saa7146_dev *dev = fh->dev;
+ 	struct saa7146_vv *vv = dev->vv_data;
+@@ -735,82 +735,9 @@ static int video_end(struct saa7146_fh *
+ 	saa7146_write(dev, MC1, 0x00700000);
+ 
+ 	vv->streaming = NULL;
+-	spin_unlock_irqrestore(&dev->slock, flags);
+-	
+-	return 0;
+-}
+-
+-/* capturing to framebuffer */
+-
+-int overlay_reqbufs(struct saa7146_dev *dev, struct v4l2_requestbuffers *req)
+-{
+-/*	struct saa7146_fh *fh = file->private_data;
+-
+-	if (req->count > VIDEO_MAX_FRAME)
+-		req->count = VIDEO_MAX_FRAME;
+-
+-	*size = fh->video_fmt.sizeimage;
+-
+-*/
+-	return 0;
+-}
+-int overlay_querybuf(struct saa7146_dev *dev, struct v4l2_buffer *buf)
+-{
+-	return 0;
+-}
+-int overlay_qbuf(struct saa7146_dev *dev, struct v4l2_buffer *b)
+-{
+-/*	if (b->index < 0 || b->index >= VIDEO_MAX_FRAME) {
+-		DEB_D(("index %d out of bounds.\n",b->index));
+-		goto -EINVAL;
+-	}
+-	
+-	buf = q->bufs[b->index];
+-	if (NULL == buf) {
+-		printk("videobuf_qbuf: NULL == buf\n");
+-		goto done;
+-	}
+-	if (0 == buf->baddr) {
+-		printk("videobuf_qbuf: 0 == buf->baddr\n");
+-		goto done;
+-	}
+-	if (buf->state == STATE_QUEUED ||
+-	    buf->state == STATE_ACTIVE) {
+-		printk("videobuf_qbuf: already queued or activated.\n");
+-		goto done;
+-	}
+ 
+-	field = videobuf_next_field(q);
+-	retval = q->ops->buf_prepare(file,buf,field);
+-	if (0 != retval) {
+-		printk("videobuf_qbuf: buf_prepare() failed.\n");
+-		goto done;
+-	}
+-	
+-	list_add_tail(&buf->stream,&q->stream);
+-	if (q->streaming) {
+-		spin_lock_irqsave(q->irqlock,flags);
+-		q->ops->buf_queue(file,buf);
+-		spin_unlock_irqrestore(q->irqlock,flags);
+-	}
+-	retval = 0;
++	spin_unlock_irqrestore(&dev->slock, flags);
+ 	
+- done:
+-	up(&q->lock);
+-	return retval;
+-*/
+-	return 0;
+-}
+-int overlay_dqbuf(struct saa7146_dev *dev, struct v4l2_buffer *buf)
+-{
+-	return 0;
+-}
+-int overlay_streamon(struct saa7146_dev *dev)
+-{
+-	return 0;
+-}
+-int overlay_streamoff(struct saa7146_dev *dev)
+-{
+ 	return 0;
+ }
+ 
+@@ -818,7 +745,7 @@ int overlay_streamoff(struct saa7146_dev
+ /*
+  * This function is _not_ called directly, but from
+  * video_generic_ioctl (and maybe others).  userspace
+- * copying is done already, arg is a kernel fhinter.
++ * copying is done already, arg is a kernel pointer.
+  */
+ 
+ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int cmd, void *arg)
+@@ -1141,38 +1068,24 @@ int saa7146_video_do_ioctl(struct inode 
+ 	case VIDIOC_REQBUFS: {
+ 		struct v4l2_requestbuffers *req = arg;
+ 		DEB_D(("VIDIOC_REQBUFS, type:%d\n",req->type));
+-/*
+-		if( req->type == V4L2_BUF_TYPE_VIDEO_OVERLAY ) {
+-			return overlay_reqbufs(dev,req);
+-		} 
+-*/
+ 		return videobuf_reqbufs(file,q,req);
+ 	}
+ 	case VIDIOC_QUERYBUF: {
+ 		struct v4l2_buffer *buf = arg;
+ 		DEB_D(("VIDIOC_QUERYBUF, type:%d, offset:%d\n",buf->type,buf->m.offset));
+-/* 		if( buf->type == V4L2_BUF_TYPE_VIDEO_OVERLAY ) {
+-			return overlay_querybuf(dev,buf);
+-		} 
+- */		return videobuf_querybuf(q,buf);
++		return videobuf_querybuf(q,buf);
+ 	}
+ 	case VIDIOC_QBUF: {
+ 		struct v4l2_buffer *buf = arg;
+ 		int ret = 0;
+-/* 		if( buf->type == V4L2_BUF_TYPE_VIDEO_OVERLAY ) {
+-			return overlay_qbuf(dev,buf);
+-		} 
+- */		ret = videobuf_qbuf(file,q,buf);
++		ret = videobuf_qbuf(file,q,buf);
+ 		DEB_D(("VIDIOC_QBUF: ret:%d, index:%d\n",ret,buf->index));
+ 		return ret;
+ 	}
+ 	case VIDIOC_DQBUF: {
+ 		struct v4l2_buffer *buf = arg;
+ 		int ret = 0;
+-/* 		if( buf->type == V4L2_BUF_TYPE_VIDEO_OVERLAY ) {
+-			return overlay_dqbuf(dev,buf);
+-		} 
+- */		ret = videobuf_dqbuf(file,q,buf);
++		ret = videobuf_dqbuf(file,q,buf);
+ 		DEB_D(("VIDIOC_DQBUF: ret:%d, index:%d\n",ret,buf->index));
+ 		return ret;
+ 	}
+@@ -1180,29 +1093,18 @@ int saa7146_video_do_ioctl(struct inode 
+ 		int *type = arg;
+ 		DEB_D(("VIDIOC_STREAMON, type:%d\n",*type));
+ 
+-		if( 0 != ops->capture_begin ) {
+-			if( 0 != (err = ops->capture_begin(fh))) {
++		if( 0 != (err = video_begin(fh))) {
+ 				return err;
+ 			}
+-		}
+-/* 		if( *type == V4L2_BUF_TYPE_VIDEO_OVERLAY ) {
+-			err = overlay_streamon(dev);
+-		} else { */
+ 		err = videobuf_streamon(file,q);
+-/* 		} */
+ 		return err;
+ 	}
+ 	case VIDIOC_STREAMOFF: {
+ 		int *type = arg;
+ 
+ 		DEB_D(("VIDIOC_STREAMOFF, type:%d\n",*type));
+-		if( 0 != ops->capture_end ) {
+-			ops->capture_end(fh);
+-		}
+-/* 		if( *type == V4L2_BUF_TYPE_VIDEO_OVERLAY ) {
+-			return overlay_streamoff(dev);
+-		} 
+- */		err = videobuf_streamoff(file,q);
++		err = videobuf_streamoff(file,q);
++		video_end(fh, file);
+ 		return err;
+ 	}
+ 	case VIDIOCGMBUF:
+@@ -1267,8 +1169,8 @@ static int buffer_prepare(struct file *f
+ 	DEB_CAP(("vbuf:%p\n",vb));
+ 
+ 	/* sanity checks */
+-	if (fh->video_fmt.width  < 64 ||
+-	    fh->video_fmt.height < 64 ||
++	if (fh->video_fmt.width  < 48 ||
++	    fh->video_fmt.height < 32 ||
+ 	    fh->video_fmt.width  > vv->standard->h_max_out ||
+ 	    fh->video_fmt.height > vv->standard->v_max_out) {
+ 		DEB_D(("w (%d) / h (%d) out of bounds.\n",fh->video_fmt.width,fh->video_fmt.height));
+@@ -1407,8 +1309,9 @@ static void video_init(struct saa7146_de
+ }
+ 
+ 
+-static void video_open(struct saa7146_dev *dev, struct saa7146_fh *fh)
++static void video_open(struct saa7146_dev *dev, struct file *file)
+ {
++	struct saa7146_fh *fh = (struct saa7146_fh *)file->private_data;
+ 	struct saa7146_format *sfmt;
+ 
+ 	fh->video_fmt.width = 384;
+@@ -1429,8 +1332,9 @@ static void video_open(struct saa7146_de
+ }
+ 
+ 
+-static void video_close(struct saa7146_dev *dev, struct saa7146_fh *fh, struct file *file)
++static void video_close(struct saa7146_dev *dev, struct file *file)
+ {
++	struct saa7146_fh *fh = (struct saa7146_fh *)file->private_data;
+ 	struct saa7146_vv *vv = dev->vv_data;
+ 	unsigned long flags;
+ 	
+@@ -1443,10 +1347,8 @@ static void video_close(struct saa7146_d
+ 	}
+ 	
+ 	if( fh == vv->streaming ) {
+-		video_end(fh);		
++		video_end(fh, file);		
+ 	}
+-
+-	videobuf_queue_cancel(file,&fh->video_q);
+ }
+ 
+ 
+@@ -1489,7 +1391,7 @@ static ssize_t video_read(struct file *f
+ 		return -EAGAIN;
+ 	}
+ 	ret = videobuf_read_one(file,&fh->video_q , data, count, ppos);
+-	video_end(fh);
++	video_end(fh, file);
+ 
+ 	/* restart overlay if it was active before */
+ 	if( 0 != restart_overlay ) {
+@@ -1505,6 +1407,4 @@ struct saa7146_use_ops saa7146_video_uop
+ 	.release = video_close,
+ 	.irq_done = video_irq_done,
+ 	.read = video_read,
+-	.capture_begin = video_begin,
+-	.capture_end = video_end,
+ };
+--- linux-2.6.0/drivers/media/dvb/b2c2/skystar2.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/media/dvb/b2c2/skystar2.c	2003-12-28 23:22:38.000000000 -0800
+@@ -2,7 +2,19 @@
+  * skystar2.c - driver for the Technisat SkyStar2 PCI DVB card
+  *              based on the FlexCopII by B2C2,Inc.
+  *
+- * Copyright (C) 2003  V.C. , skystar@moldova.cc
++ * Copyright (C) 2003  Vadim Catana, skystar@moldova.cc
++ *
++ * FIX: DISEQC Tone Burst in flexcop_diseqc_ioctl()
++ * FIX: FULL soft DiSEqC for skystar2 (FlexCopII rev 130) VP310 equipped 
++ *     Vincenzo Di Massa, hawk.it at tiscalinet.it
++ * 	
++ * Converted to Linux coding style
++ * Misc reorganization, polishing, restyling
++ *     Roberto Ragusa, r.ragusa at libero.it
++ *       
++ * Added hardware filtering support, 
++ *     Niklas Peinecke, peinecke at gdv.uni-hannover.de
++ *
+  *
+  * This program is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public License
+@@ -27,7 +39,6 @@
+ 
+ #include "dvb_i2c.h"
+ #include "dvb_frontend.h"
+-#include "dvb_functions.h"
+ 
+ #include <linux/dvb/frontend.h>
+ #include <linux/dvb/dmx.h>
+@@ -38,14 +49,20 @@
+ #include "demux.h"
+ #include "dvb_net.h"
+ 
++#include "dvb_functions.h"
++
+ static int debug = 0;
+-#define dprintk(x...) do { if (debug) printk(x); } while (0)
++#define dprintk(x...)	do { if (debug>=1) printk(x); } while (0)
++#define ddprintk(x...)	do { if (debug>=2) printk(x); } while (0)
++static int enable_hw_filters = 2;
+ 
+-#define SizeOfBufDMA1	0x3AC00
+-#define SizeOfBufDMA2	0x758
++#define SIZE_OF_BUF_DMA1	0x3ac00
++#define SIZE_OF_BUF_DMA2	0x758
+ 
+-struct dmaq {
++#define MAX_N_HW_FILTERS	(6+32)
++#define N_PID_SLOTS		256
+ 
++struct dmaq {
+ 	u32 bus_addr;
+ 	u32 head;
+ 	u32 tail;
+@@ -53,31 +70,19 @@ struct dmaq {
+ 	u8 *buffer;
+ };
+ 
+-struct packet_header {
+-
+-	u32 sync_byte;
+-	u32 transport_error_indicator;
+-	u32 payload_unit_start_indicator;
+-	u32 transport_priority;
+-	u32 pid;
+-	u32 transport_scrambling_control;
+-	u32 adaptation_field_control;
+-	u32 continuity_counter;
+-};
+ 
+ struct adapter {
+-
+ 	struct pci_dev *pdev;
+ 
+ 	u8 card_revision;
+ 	u32 b2c2_revision;
+-	u32 PidFilterMax;
+-	u32 MacFilterMax;
++	u32 pid_filter_max;
++	u32 mac_filter_max;
+ 	u32 irq;
+ 	unsigned long io_mem;
+ 	unsigned long io_port;
+ 	u8 mac_addr[8];
+-	u32 dwSramType;
++	u32 dw_sram_type;
+ 
+ 	struct dvb_adapter *dvb_adapter;
+ 	struct dvb_demux demux;
+@@ -95,44 +100,42 @@ struct adapter {
+ 	u32 dma_ctrl;
+ 	u32 dma_status;
+ 
+-	u32 capturing;
++	int capturing;
+ 
+ 	spinlock_t lock;
+ 
+-	u16 pids[0x27];
++	int useable_hw_filters;
++	u16 hw_pids[MAX_N_HW_FILTERS];
++	u16 pid_list[N_PID_SLOTS];
++	int pid_rc[N_PID_SLOTS];	// ref counters for the pids
++	int pid_count;
++	int whole_bandwidth_count;
+ 	u32 mac_filter;
+ };
+ 
+-#define WriteRegDW(adapter,reg,value) writel(value, adapter->io_mem + reg)
+-#define ReadRegDW(adapter,reg) readl(adapter->io_mem + reg)
++#define write_reg_dw(adapter,reg,value) writel(value, adapter->io_mem + reg)
++#define read_reg_dw(adapter,reg) readl(adapter->io_mem + reg)
+ 
+-static void WriteRegOp(struct adapter *adapter, u32 reg, u32 operation, u32 andvalue, u32 orvalue)
++static void write_reg_bitfield(struct adapter *adapter, u32 reg, u32 zeromask, u32 orvalue)
+ {
+ 	u32 tmp;
+ 
+-	tmp = ReadRegDW(adapter, reg);
+-
+-	if (operation == 1)
+-		tmp = tmp | orvalue;
+-	if (operation == 2)
+-		tmp = tmp & andvalue;
+-	if (operation == 3)
+-		tmp = (tmp & andvalue) | orvalue;
+-
+-	WriteRegDW(adapter, reg, tmp);
++	tmp = read_reg_dw(adapter, reg);
++	tmp = (tmp & ~zeromask) | orvalue;
++	write_reg_dw(adapter, reg, tmp);
+ }
+ 
+ /* i2c functions */
+-static int i2cMainWriteForFlex2(struct adapter * adapter, u32 command, u8 * buf, u32 retries)
++static int i2c_main_write_for_flex2(struct adapter *adapter, u32 command, u8 *buf, int retries)
+ {
+-	u32 i;
++	int i;
+ 	u32 value;
+ 
+-	WriteRegDW(adapter, 0x100, 0);
+-	WriteRegDW(adapter, 0x100, command);
++	write_reg_dw(adapter, 0x100, 0);
++	write_reg_dw(adapter, 0x100, command);
+ 
+ 	for (i = 0; i < retries; i++) {
+-		value = ReadRegDW(adapter, 0x100);
++		value = read_reg_dw(adapter, 0x100);
+ 
+ 		if ((value & 0x40000000) == 0) {
+ 			if ((value & 0x81000000) == 0x80000000) {
+@@ -141,11 +144,9 @@ static int i2cMainWriteForFlex2(struct a
+ 
+ 				return 1;
+ 			}
+-
+ 		} else {
+-
+-			WriteRegDW(adapter, 0x100, 0);
+-			WriteRegDW(adapter, 0x100, command);
++			write_reg_dw(adapter, 0x100, 0);
++			write_reg_dw(adapter, 0x100, command);
+ 		}
+ 	}
+ 
+@@ -153,7 +154,7 @@ static int i2cMainWriteForFlex2(struct a
+ }
+ 
+ /* device = 0x10000000 for tuner, 0x20000000 for eeprom */
+-static void i2cMainSetup(u32 device, u32 chip_addr, u8 op, u8 addr, u32 value, u32 len, u32 *command)
++static void i2c_main_setup(u32 device, u32 chip_addr, u8 op, u8 addr, u32 value, u32 len, u32 *command)
+ {
+ 	*command = device | ((len - 1) << 26) | (value << 16) | (addr << 8) | chip_addr;
+ 
+@@ -163,20 +164,20 @@ static void i2cMainSetup(u32 device, u32
+ 		*command = *command | 0x01000000;
+ }
+ 
+-static int FlexI2cRead4(struct adapter * adapter, u32 device, u32 chip_addr, u16 addr, u8 * buf, u8 len)
++static int flex_i2c_read4(struct adapter *adapter, u32 device, u32 chip_addr, u16 addr, u8 *buf, u8 len)
+ {
+ 	u32 command;
+ 	u32 value;
+ 
+ 	int result, i;
+ 
+-	i2cMainSetup(device, chip_addr, 1, addr, 0, len, &command);
++	i2c_main_setup(device, chip_addr, 1, addr, 0, len, &command);
+ 
+-	result = i2cMainWriteForFlex2(adapter, command, buf, 100000);
++	result = i2c_main_write_for_flex2(adapter, command, buf, 100000);
+ 
+ 	if ((result & 0xff) != 0) {
+ 		if (len > 1) {
+-			value = ReadRegDW(adapter, 0x104);
++			value = read_reg_dw(adapter, 0x104);
+ 
+ 			for (i = 1; i < len; i++) {
+ 				buf[i] = value & 0xff;
+@@ -188,7 +189,7 @@ static int FlexI2cRead4(struct adapter *
+ 	return result;
+ }
+ 
+-static int FlexI2cWrite4(struct adapter * adapter, u32 device, u32 chip_addr, u32 addr, u8 * buf, u8 len)
++static int flex_i2c_write4(struct adapter *adapter, u32 device, u32 chip_addr, u32 addr, u8 *buf, u8 len)
+ {
+ 	u32 command;
+ 	u32 value;
+@@ -202,12 +203,12 @@ static int FlexI2cWrite4(struct adapter 
+ 			value = value | buf[i - 1];
+ 		}
+ 
+-		WriteRegDW(adapter, 0x104, value);
++		write_reg_dw(adapter, 0x104, value);
+ 	}
+ 
+-	i2cMainSetup(device, chip_addr, 0, addr, buf[0], len, &command);
++	i2c_main_setup(device, chip_addr, 0, addr, buf[0], len, &command);
+ 
+-	return i2cMainWriteForFlex2(adapter, command, 0, 100000);
++	return i2c_main_write_for_flex2(adapter, command, 0, 100000);
+ }
+ 
+ static void fixchipaddr(u32 device, u32 bus, u32 addr, u32 *ret)
+@@ -218,13 +219,13 @@ static void fixchipaddr(u32 device, u32 
+ 	*ret = bus;
+ }
+ 
+-static u32 FLEXI2C_read(struct adapter * adapter, u32 device, u32 bus, u32 addr, u8 * buf, u32 len)
++static u32 flex_i2c_read(struct adapter *adapter, u32 device, u32 bus, u32 addr, u8 *buf, u32 len)
+ {
+ 	u32 chipaddr;
+ 	u32 bytes_to_transfer;
+ 	u8 *start;
+ 
+-//  dprintk("%s:\n", __FUNCTION__);
++	ddprintk("%s:\n", __FUNCTION__);
+ 
+ 	start = buf;
+ 
+@@ -236,7 +237,7 @@ static u32 FLEXI2C_read(struct adapter *
+ 
+ 		fixchipaddr(device, bus, addr, &chipaddr);
+ 
+-		if (FlexI2cRead4(adapter, device, chipaddr, addr, buf, bytes_to_transfer) == 0)
++		if (flex_i2c_read4(adapter, device, chipaddr, addr, buf, bytes_to_transfer) == 0)
+ 			return buf - start;
+ 
+ 		buf = buf + bytes_to_transfer;
+@@ -247,13 +248,13 @@ static u32 FLEXI2C_read(struct adapter *
+ 	return buf - start;
+ }
+ 
+-static u32 FLEXI2C_write(struct adapter * adapter, u32 device, u32 bus, u32 addr, u8 * buf, u32 len)
++static u32 flex_i2c_write(struct adapter *adapter, u32 device, u32 bus, u32 addr, u8 *buf, u32 len)
+ {
+ 	u32 chipaddr;
+ 	u32 bytes_to_transfer;
+ 	u8 *start;
+ 
+-//  dprintk("%s:\n", __FUNCTION__);
++	ddprintk("%s:\n", __FUNCTION__);
+ 
+ 	start = buf;
+ 
+@@ -265,7 +266,7 @@ static u32 FLEXI2C_write(struct adapter 
+ 
+ 		fixchipaddr(device, bus, addr, &chipaddr);
+ 
+-		if (FlexI2cWrite4(adapter, device, chipaddr, addr, buf, bytes_to_transfer) == 0)
++		if (flex_i2c_write4(adapter, device, chipaddr, addr, buf, bytes_to_transfer) == 0)
+ 			return buf - start;
+ 
+ 		buf = buf + bytes_to_transfer;
+@@ -284,75 +285,81 @@ static int master_xfer(struct dvb_i2c_bu
+ 	if (down_interruptible(&tmp->i2c_sem))
+ 		return -ERESTARTSYS;
+ 
+-	if (0) {
+-		dprintk("%s:\n", __FUNCTION__);
++	ddprintk("%s: %d messages to transfer\n", __FUNCTION__, num);
+ 
+ 		for (i = 0; i < num; i++) {
+-			printk("message %d: flags=%x, addr=0x%04x, buf=%p, len=%d \n", i, msgs[i].flags, msgs[i].addr, msgs[i].buf, msgs[i].len);
+-		}
+-	}
++		ddprintk("message %d: flags=0x%x, addr=0x%x, buf=0x%x, len=%d \n", i,
++			 msgs[i].flags, msgs[i].addr, msgs[i].buf[0], msgs[i].len);
+ 	
+-	/* allow only the vp310 frontend to access the bus */
+-	if ((msgs[0].addr != 0x0E) && (msgs[0].addr != 0x61)) {
++		/* allow only the mt312 and stv0299 frontends to access the bus */
++		if ((msgs[i].addr != 0x0e) && (msgs[i].addr != 0x68) && (msgs[i].addr != 0x61)) {
+ 		up(&tmp->i2c_sem);
+ 
+ 		return -EREMOTEIO;
+ 	}
++	}
+ 
+-	if ((num == 1) && (msgs[0].buf != NULL)) {
+-		if (msgs[0].flags == I2C_M_RD) {
+-			ret = -EINVAL;
++	// read command
++	if ((num == 2) && (msgs[0].flags == 0) && (msgs[1].flags == I2C_M_RD) && (msgs[0].buf != NULL) && (msgs[1].buf != NULL)) {
+ 
+-		} else {
++		ret = flex_i2c_read(tmp, 0x10000000, msgs[0].addr, msgs[0].buf[0], msgs[1].buf, msgs[1].len);
+ 
+-			// single writes do have the reg addr in buf[0] and data in buf[1] to buf[n]
+-			ret = FLEXI2C_write(tmp, 0x10000000, msgs[0].addr, msgs[0].buf[0], &msgs[0].buf[1], msgs[0].len - 1);
++		up(&tmp->i2c_sem);
++
++		if (ret != msgs[1].len) {
++			printk("%s: read error !\n", __FUNCTION__);
++
++			for (i = 0; i < 2; i++) {
++				printk("message %d: flags=0x%x, addr=0x%x, buf=0x%x, len=%d \n", i,
++				       msgs[i].flags, msgs[i].addr, msgs[i].buf[0], msgs[i].len);
++		}
+ 
+-			if (ret != msgs[0].len - 1)
+-				ret = -EREMOTEIO;
+-			else
+-				ret = num;
++			return -EREMOTEIO;
+ 		}
+ 
+-	} else if ((num == 2) && (msgs[1].buf != NULL)) {
++		return num;
++	}
++	// write command
++	for (i = 0; i < num; i++) {
+ 
+-		// i2c reads consist of a reg addr _write_ followed by a data read, so msg[1].flags has to be examined
+-		if (msgs[1].flags == I2C_M_RD) {
+-			ret = FLEXI2C_read(tmp, 0x10000000, msgs[0].addr, msgs[0].buf[0], msgs[1].buf, msgs[1].len);
++		if ((msgs[i].flags != 0) || (msgs[i].buf == NULL) || (msgs[i].len < 2))
++			return -EINVAL;
+ 
+-		} else {
++		ret = flex_i2c_write(tmp, 0x10000000, msgs[i].addr, msgs[i].buf[0], &msgs[i].buf[1], msgs[i].len - 1);
+ 
+-			ret = FLEXI2C_write(tmp, 0x10000000, msgs[0].addr, msgs[0].buf[0], msgs[1].buf, msgs[1].len);
++		up(&tmp->i2c_sem);
++
++		if (ret != msgs[0].len - 1) {
++			printk("%s: write error %i !\n", __FUNCTION__, ret);
++
++			printk("message %d: flags=0x%x, addr=0x%x, buf[0]=0x%x, len=%d \n", i,
++			       msgs[i].flags, msgs[i].addr, msgs[i].buf[0], msgs[i].len);
++
++			return -EREMOTEIO;
+ 		}
+ 
+-		if (ret != msgs[1].len)
+-			ret = -EREMOTEIO;
+-		else
+-			ret = num;
++		return num;
+ 	}
+ 
+-	up(&tmp->i2c_sem);
++	printk("%s: unknown command format !\n", __FUNCTION__);
+ 
+-	/* master xfer functions always return the number of successfully
+-	   transmitted messages, not the number of transmitted bytes.
+-	   return -EREMOTEIO in case of failure. */
+-	return ret;
++	return -EINVAL;
+ }
+ 
+ /* SRAM (Skystar2 rev2.3 has one "ISSI IS61LV256" chip on board,
+    but it seems that FlexCopII can work with more than one chip) */
+-static void SRAMSetNetDest(struct adapter * adapter, u8 dest)
++static void sram_set_net_dest(struct adapter *adapter, u8 dest)
+ {
+ 	u32 tmp;
+ 
+ 	udelay(1000);
+ 
+-	tmp = (ReadRegDW(adapter, 0x714) & 0xFFFFFFFC) | (dest & 3);
++	tmp = (read_reg_dw(adapter, 0x714) & 0xfffffffc) | (dest & 3);
+ 
+ 	udelay(1000);
+ 
+-	WriteRegDW(adapter, 0x714, tmp);
+-	WriteRegDW(adapter, 0x714, tmp);
++	write_reg_dw(adapter, 0x714, tmp);
++	write_reg_dw(adapter, 0x714, tmp);
+ 
+ 	udelay(1000);
+ 
+@@ -360,19 +367,19 @@ static void SRAMSetNetDest(struct adapte
+ /*	return tmp; */
+ }
+ 
+-static void SRAMSetCaiDest(struct adapter * adapter, u8 dest)
++static void sram_set_cai_dest(struct adapter *adapter, u8 dest)
+ {
+ 	u32 tmp;
+ 
+ 	udelay(1000);
+ 
+-	tmp = (ReadRegDW(adapter, 0x714) & 0xFFFFFFF3) | ((dest & 3) << 2);
++	tmp = (read_reg_dw(adapter, 0x714) & 0xfffffff3) | ((dest & 3) << 2);
+ 
+ 	udelay(1000);
+ 	udelay(1000);
+ 
+-	WriteRegDW(adapter, 0x714, tmp);
+-	WriteRegDW(adapter, 0x714, tmp);
++	write_reg_dw(adapter, 0x714, tmp);
++	write_reg_dw(adapter, 0x714, tmp);
+ 
+ 	udelay(1000);
+ 
+@@ -380,19 +387,19 @@ static void SRAMSetCaiDest(struct adapte
+ /*	return tmp; */
+ }
+ 
+-static void SRAMSetCaoDest(struct adapter * adapter, u8 dest)
++static void sram_set_cao_dest(struct adapter *adapter, u8 dest)
+ {
+ 	u32 tmp;
+ 
+ 	udelay(1000);
+ 
+-	tmp = (ReadRegDW(adapter, 0x714) & 0xFFFFFFCF) | ((dest & 3) << 4);
++	tmp = (read_reg_dw(adapter, 0x714) & 0xffffffcf) | ((dest & 3) << 4);
+ 
+ 	udelay(1000);
+ 	udelay(1000);
+ 
+-	WriteRegDW(adapter, 0x714, tmp);
+-	WriteRegDW(adapter, 0x714, tmp);
++	write_reg_dw(adapter, 0x714, tmp);
++	write_reg_dw(adapter, 0x714, tmp);
+ 
+ 	udelay(1000);
+ 
+@@ -400,19 +407,19 @@ static void SRAMSetCaoDest(struct adapte
+ /*	return tmp; */
+ }
+ 
+-static void SRAMSetMediaDest(struct adapter * adapter, u8 dest)
++static void sram_set_media_dest(struct adapter *adapter, u8 dest)
+ {
+ 	u32 tmp;
+ 
+ 	udelay(1000);
+ 
+-	tmp = (ReadRegDW(adapter, 0x714) & 0xFFFFFF3F) | ((dest & 3) << 6);
++	tmp = (read_reg_dw(adapter, 0x714) & 0xffffff3f) | ((dest & 3) << 6);
+ 
+ 	udelay(1000);
+ 	udelay(1000);
+ 
+-	WriteRegDW(adapter, 0x714, tmp);
+-	WriteRegDW(adapter, 0x714, tmp);
++	write_reg_dw(adapter, 0x714, tmp);
++	write_reg_dw(adapter, 0x714, tmp);
+ 
+ 	udelay(1000);
+ 
+@@ -429,16 +436,17 @@ static void SRAMSetMediaDest(struct adap
+     bits 28-29 : memory bank selector
+     bit  31    : busy flag
+ */
+-static void FlexSramWrite(struct adapter *adapter, u32 bank, u32 addr, u8 * buf, u32 len)
++static void flex_sram_write(struct adapter *adapter, u32 bank, u32 addr, u8 *buf, u32 len)
+ {
+-	u32 i, command, retries;
++	int i, retries;
++	u32 command;
+ 
+ 	for (i = 0; i < len; i++) {
+ 		command = bank | addr | 0x04000000 | (*buf << 0x10);
+ 
+ 		retries = 2;
+ 
+-		while (((ReadRegDW(adapter, 0x700) & 0x80000000) != 0) && (retries > 0)) {
++		while (((read_reg_dw(adapter, 0x700) & 0x80000000) != 0) && (retries > 0)) {
+ 			mdelay(1);
+ 			retries--;
+ 		};
+@@ -446,23 +454,24 @@ static void FlexSramWrite(struct adapter
+ 		if (retries == 0)
+ 			printk("%s: SRAM timeout\n", __FUNCTION__);
+ 
+-		WriteRegDW(adapter, 0x700, command);
++		write_reg_dw(adapter, 0x700, command);
+ 
+ 		buf++;
+ 		addr++;
+ 	}
+ }
+ 
+-static void FlexSramRead(struct adapter *adapter, u32 bank, u32 addr, u8 * buf, u32 len)
++static void flex_sram_read(struct adapter *adapter, u32 bank, u32 addr, u8 *buf, u32 len)
+ {
+-	u32 i, command, value, retries;
++	int i, retries;
++	u32 command, value;
+ 
+ 	for (i = 0; i < len; i++) {
+ 		command = bank | addr | 0x04008000;
+ 
+ 		retries = 10000;
+ 
+-		while (((ReadRegDW(adapter, 0x700) & 0x80000000) != 0) && (retries > 0)) {
++		while (((read_reg_dw(adapter, 0x700) & 0x80000000) != 0) && (retries > 0)) {
+ 			mdelay(1);
+ 			retries--;
+ 		};
+@@ -470,11 +479,11 @@ static void FlexSramRead(struct adapter 
+ 		if (retries == 0)
+ 			printk("%s: SRAM timeout\n", __FUNCTION__);
+ 
+-		WriteRegDW(adapter, 0x700, command);
++		write_reg_dw(adapter, 0x700, command);
+ 
+ 		retries = 10000;
+ 
+-		while (((ReadRegDW(adapter, 0x700) & 0x80000000) != 0) && (retries > 0)) {
++		while (((read_reg_dw(adapter, 0x700) & 0x80000000) != 0) && (retries > 0)) {
+ 			mdelay(1);
+ 			retries--;
+ 		};
+@@ -482,7 +491,7 @@ static void FlexSramRead(struct adapter 
+ 		if (retries == 0)
+ 			printk("%s: SRAM timeout\n", __FUNCTION__);
+ 
+-		value = ReadRegDW(adapter, 0x700) >> 0x10;
++		value = read_reg_dw(adapter, 0x700) >> 0x10;
+ 
+ 		*buf = (value & 0xff);
+ 
+@@ -491,47 +500,47 @@ static void FlexSramRead(struct adapter 
+ 	}
+ }
+ 
+-static void SRAM_writeChunk(struct adapter *adapter, u32 addr, u8 * buf, u16 len)
++static void sram_writeChunk(struct adapter *adapter, u32 addr, u8 *buf, u16 len)
+ {
+ 	u32 bank;
+ 
+ 	bank = 0;
+ 
+-	if (adapter->dwSramType == 0x20000) {
+-		bank = (addr & 0x18000) << 0x0D;
++	if (adapter->dw_sram_type == 0x20000) {
++		bank = (addr & 0x18000) << 0x0d;
+ 	}
+ 
+-	if (adapter->dwSramType == 0x00000) {
+-		if ((addr >> 0x0F) == 0)
++	if (adapter->dw_sram_type == 0x00000) {
++		if ((addr >> 0x0f) == 0)
+ 			bank = 0x20000000;
+ 		else
+ 			bank = 0x10000000;
+ 	}
+ 
+-	FlexSramWrite(adapter, bank, addr & 0x7FFF, buf, len);
++	flex_sram_write(adapter, bank, addr & 0x7fff, buf, len);
+ }
+ 
+-static void SRAM_readChunk(struct adapter *adapter, u32 addr, u8 * buf, u16 len)
++static void sram_readChunk(struct adapter *adapter, u32 addr, u8 *buf, u16 len)
+ {
+ 	u32 bank;
+ 
+ 	bank = 0;
+ 
+-	if (adapter->dwSramType == 0x20000) {
+-		bank = (addr & 0x18000) << 0x0D;
++	if (adapter->dw_sram_type == 0x20000) {
++		bank = (addr & 0x18000) << 0x0d;
+ 	}
+ 
+-	if (adapter->dwSramType == 0x00000) {
+-		if ((addr >> 0x0F) == 0)
++	if (adapter->dw_sram_type == 0x00000) {
++		if ((addr >> 0x0f) == 0)
+ 			bank = 0x20000000;
+ 		else
+ 			bank = 0x10000000;
+ 	}
+ 
+-	FlexSramRead(adapter, bank, addr & 0x7FFF, buf, len);
++	flex_sram_read(adapter, bank, addr & 0x7fff, buf, len);
+ }
+ 
+-static void SRAM_read(struct adapter *adapter, u32 addr, u8 * buf, u32 len)
++static void sram_read(struct adapter *adapter, u32 addr, u8 *buf, u32 len)
+ {
+ 	u32 length;
+ 
+@@ -541,11 +550,11 @@ static void SRAM_read(struct adapter *ad
+ 		// check if the address range belongs to the same 
+ 		// 32K memory chip. If not, the data is read from 
+ 		// one chip at a time.
+-		if ((addr >> 0x0F) != ((addr + len - 1) >> 0x0F)) {
+-			length = (((addr >> 0x0F) + 1) << 0x0F) - addr;
++		if ((addr >> 0x0f) != ((addr + len - 1) >> 0x0f)) {
++			length = (((addr >> 0x0f) + 1) << 0x0f) - addr;
+ 		}
+ 
+-		SRAM_readChunk(adapter, addr, buf, length);
++		sram_readChunk(adapter, addr, buf, length);
+ 
+ 		addr = addr + length;
+ 		buf = buf + length;
+@@ -553,7 +562,7 @@ static void SRAM_read(struct adapter *ad
+ 	}
+ }
+ 
+-static void SRAM_write(struct adapter *adapter, u32 addr, u8 * buf, u32 len)
++static void sram_write(struct adapter *adapter, u32 addr, u8 *buf, u32 len)
+ {
+ 	u32 length;
+ 
+@@ -563,11 +572,11 @@ static void SRAM_write(struct adapter *a
+ 		// check if the address range belongs to the same 
+ 		// 32K memory chip. If not, the data is written to
+ 		// one chip at a time.
+-		if ((addr >> 0x0F) != ((addr + len - 1) >> 0x0F)) {
+-			length = (((addr >> 0x0F) + 1) << 0x0F) - addr;
++		if ((addr >> 0x0f) != ((addr + len - 1) >> 0x0f)) {
++			length = (((addr >> 0x0f) + 1) << 0x0f) - addr;
+ 		}
+ 
+-		SRAM_writeChunk(adapter, addr, buf, length);
++		sram_writeChunk(adapter, addr, buf, length);
+ 
+ 		addr = addr + length;
+ 		buf = buf + length;
+@@ -575,92 +584,92 @@ static void SRAM_write(struct adapter *a
+ 	}
+ }
+ 
+-static void SRAM_setSize(struct adapter *adapter, u32 mask)
++static void sram_set_size(struct adapter *adapter, u32 mask)
+ {
+-	WriteRegDW(adapter, 0x71C, (mask | (~0x30000 & ReadRegDW(adapter, 0x71C))));
++	write_reg_dw(adapter, 0x71c, (mask | (~0x30000 & read_reg_dw(adapter, 0x71c))));
+ }
+ 
+-static void SRAM_init(struct adapter *adapter)
++static void sram_init(struct adapter *adapter)
+ {
+ 	u32 tmp;
+ 
+-	tmp = ReadRegDW(adapter, 0x71C);
++	tmp = read_reg_dw(adapter, 0x71c);
+ 
+-	WriteRegDW(adapter, 0x71C, 1);
++	write_reg_dw(adapter, 0x71c, 1);
+ 
+-	if (ReadRegDW(adapter, 0x71C) != 0) {
+-		WriteRegDW(adapter, 0x71C, tmp);
++	if (read_reg_dw(adapter, 0x71c) != 0) {
++		write_reg_dw(adapter, 0x71c, tmp);
+ 
+-		adapter->dwSramType = tmp & 0x30000;
++		adapter->dw_sram_type = tmp & 0x30000;
+ 
+-		dprintk("%s: dwSramType = %x\n", __FUNCTION__, adapter->dwSramType);
++		ddprintk("%s: dw_sram_type = %x\n", __FUNCTION__, adapter->dw_sram_type);
+ 
+ 	} else {
+ 
+-		adapter->dwSramType = 0x10000;
++		adapter->dw_sram_type = 0x10000;
+ 
+-		dprintk("%s: dwSramType = %x\n", __FUNCTION__, adapter->dwSramType);
++		ddprintk("%s: dw_sram_type = %x\n", __FUNCTION__, adapter->dw_sram_type);
+ 	}
+ 
+ 	/* return value is never used? */
+-/*	return adapter->dwSramType; */
++/*	return adapter->dw_sram_type; */
+ }
+ 
+-static int SRAM_testLocation(struct adapter *adapter, u32 mask, u32 addr)
++static int sram_test_location(struct adapter *adapter, u32 mask, u32 addr)
+ {
+ 	u8 tmp1, tmp2;
+ 
+ 	dprintk("%s: mask = %x, addr = %x\n", __FUNCTION__, mask, addr);
+ 
+-	SRAM_setSize(adapter, mask);
+-	SRAM_init(adapter);
++	sram_set_size(adapter, mask);
++	sram_init(adapter);
+ 
+-	tmp2 = 0xA5;
+-	tmp1 = 0x4F;
++	tmp2 = 0xa5;
++	tmp1 = 0x4f;
+ 
+-	SRAM_write(adapter, addr, &tmp2, 1);
+-	SRAM_write(adapter, addr + 4, &tmp1, 1);
++	sram_write(adapter, addr, &tmp2, 1);
++	sram_write(adapter, addr + 4, &tmp1, 1);
+ 
+ 	tmp2 = 0;
+ 
+ 	mdelay(20);
+ 
+-	SRAM_read(adapter, addr, &tmp2, 1);
+-	SRAM_read(adapter, addr, &tmp2, 1);
++	sram_read(adapter, addr, &tmp2, 1);
++	sram_read(adapter, addr, &tmp2, 1);
+ 
+-	dprintk("%s: wrote 0xA5, read 0x%2x\n", __FUNCTION__, tmp2);
++	dprintk("%s: wrote 0xa5, read 0x%2x\n", __FUNCTION__, tmp2);
+ 
+-	if (tmp2 != 0xA5)
++	if (tmp2 != 0xa5)
+ 		return 0;
+ 
+-	tmp2 = 0x5A;
+-	tmp1 = 0xF4;
++	tmp2 = 0x5a;
++	tmp1 = 0xf4;
+ 
+-	SRAM_write(adapter, addr, &tmp2, 1);
+-	SRAM_write(adapter, addr + 4, &tmp1, 1);
++	sram_write(adapter, addr, &tmp2, 1);
++	sram_write(adapter, addr + 4, &tmp1, 1);
+ 
+ 	tmp2 = 0;
+ 
+ 	mdelay(20);
+ 
+-	SRAM_read(adapter, addr, &tmp2, 1);
+-	SRAM_read(adapter, addr, &tmp2, 1);
++	sram_read(adapter, addr, &tmp2, 1);
++	sram_read(adapter, addr, &tmp2, 1);
+ 
+-	dprintk("%s: wrote 0x5A, read 0x%2x\n", __FUNCTION__, tmp2);
++	dprintk("%s: wrote 0x5a, read 0x%2x\n", __FUNCTION__, tmp2);
+ 
+-	if (tmp2 != 0x5A)
++	if (tmp2 != 0x5a)
+ 		return 0;
+ 
+ 	return 1;
+ }
+ 
+-static u32 SRAM_length(struct adapter * adapter)
++static u32 sram_length(struct adapter *adapter)
+ {
+-	if (adapter->dwSramType == 0x10000)
++	if (adapter->dw_sram_type == 0x10000)
+ 		return 32768;	//  32K
+-	if (adapter->dwSramType == 0x00000)
++	if (adapter->dw_sram_type == 0x00000)
+ 		return 65536;	//  64K        
+-	if (adapter->dwSramType == 0x20000)
++	if (adapter->dw_sram_type == 0x20000)
+ 		return 131072;	// 128K
+ 
+ 	return 32768;		// 32K
+@@ -674,103 +683,104 @@ static u32 SRAM_length(struct adapter * 
+    FlexCop works only with one bank at a time. The bank is selected
+    by bits 28-29 of the 0x700 register.
+   
+-   bank 0 covers addresses 0x00000-0x07FFF
+-   bank 1 covers addresses 0x08000-0x0FFFF
+-   bank 2 covers addresses 0x10000-0x17FFF
+-   bank 3 covers addresses 0x18000-0x1FFFF
++   bank 0 covers addresses 0x00000-0x07fff
++   bank 1 covers addresses 0x08000-0x0ffff
++   bank 2 covers addresses 0x10000-0x17fff
++   bank 3 covers addresses 0x18000-0x1ffff
+ */
+-static int SramDetectForFlex2(struct adapter *adapter)
++static int sram_detect_for_flex2(struct adapter *adapter)
+ {
+ 	u32 tmp, tmp2, tmp3;
+ 
+ 	dprintk("%s:\n", __FUNCTION__);
+ 
+-	tmp = ReadRegDW(adapter, 0x208);
+-	WriteRegDW(adapter, 0x208, 0);
++	tmp = read_reg_dw(adapter, 0x208);
++	write_reg_dw(adapter, 0x208, 0);
+ 
+-	tmp2 = ReadRegDW(adapter, 0x71C);
++	tmp2 = read_reg_dw(adapter, 0x71c);
+ 
+ 	dprintk("%s: tmp2 = %x\n", __FUNCTION__, tmp2);
+ 
+-	WriteRegDW(adapter, 0x71C, 1);
++	write_reg_dw(adapter, 0x71c, 1);
+ 
+-	tmp3 = ReadRegDW(adapter, 0x71C);
++	tmp3 = read_reg_dw(adapter, 0x71c);
+ 
+ 	dprintk("%s: tmp3 = %x\n", __FUNCTION__, tmp3);
+ 
+-	WriteRegDW(adapter, 0x71C, tmp2);
++	write_reg_dw(adapter, 0x71c, tmp2);
+ 
+ 	// check for internal SRAM ???
+ 	tmp3--;
+ 	if (tmp3 != 0) {
+-		SRAM_setSize(adapter, 0x10000);
+-		SRAM_init(adapter);
+-		WriteRegDW(adapter, 0x208, tmp);
++		sram_set_size(adapter, 0x10000);
++		sram_init(adapter);
++		write_reg_dw(adapter, 0x208, tmp);
+ 
+ 		dprintk("%s: sram size = 32K\n", __FUNCTION__);
+ 
+ 		return 32;
+ 	}
+ 
+-	if (SRAM_testLocation(adapter, 0x20000, 0x18000) != 0) {
+-		SRAM_setSize(adapter, 0x20000);
+-		SRAM_init(adapter);
+-		WriteRegDW(adapter, 0x208, tmp);
++	if (sram_test_location(adapter, 0x20000, 0x18000) != 0) {
++		sram_set_size(adapter, 0x20000);
++		sram_init(adapter);
++		write_reg_dw(adapter, 0x208, tmp);
+ 
+ 		dprintk("%s: sram size = 128K\n", __FUNCTION__);
+ 
+ 		return 128;
+ 	}
+ 
+-	if (SRAM_testLocation(adapter, 0x00000, 0x10000) != 0) {
+-		SRAM_setSize(adapter, 0x00000);
+-		SRAM_init(adapter);
+-		WriteRegDW(adapter, 0x208, tmp);
++	if (sram_test_location(adapter, 0x00000, 0x10000) != 0) {
++		sram_set_size(adapter, 0x00000);
++		sram_init(adapter);
++		write_reg_dw(adapter, 0x208, tmp);
+ 
+ 		dprintk("%s: sram size = 64K\n", __FUNCTION__);
+ 
+ 		return 64;
+ 	}
+ 
+-	if (SRAM_testLocation(adapter, 0x10000, 0x00000) != 0) {
+-		SRAM_setSize(adapter, 0x10000);
+-		SRAM_init(adapter);
+-		WriteRegDW(adapter, 0x208, tmp);
++	if (sram_test_location(adapter, 0x10000, 0x00000) != 0) {
++		sram_set_size(adapter, 0x10000);
++		sram_init(adapter);
++		write_reg_dw(adapter, 0x208, tmp);
+ 
+ 		dprintk("%s: sram size = 32K\n", __FUNCTION__);
+ 
+ 		return 32;
+ 	}
+ 
+-	SRAM_setSize(adapter, 0x10000);
+-	SRAM_init(adapter);
+-	WriteRegDW(adapter, 0x208, tmp);
++	sram_set_size(adapter, 0x10000);
++	sram_init(adapter);
++	write_reg_dw(adapter, 0x208, tmp);
+ 
+ 	dprintk("%s: SRAM detection failed. Set to 32K \n", __FUNCTION__);
+ 
+ 	return 0;
+ }
+ 
+-static void SLL_detectSramSize(struct adapter *adapter)
++static void sll_detect_sram_size(struct adapter *adapter)
+ {
+-	SramDetectForFlex2(adapter);
++	sram_detect_for_flex2(adapter);
+ }
++
+ /* EEPROM (Skystar2 has one "24LC08B" chip on board) */
+ /*
+-static int EEPROM_write(struct adapter *adapter, u16 addr, u8 * buf, u16 len)
++static int eeprom_write(struct adapter *adapter, u16 addr, u8 *buf, u16 len)
+ {
+-	return FLEXI2C_write(adapter, 0x20000000, 0x50, addr, buf, len);
++	return flex_i2c_write(adapter, 0x20000000, 0x50, addr, buf, len);
+ }
+ */
+ 
+-static int EEPROM_read(struct adapter *adapter, u16 addr, u8 * buf, u16 len)
++static int eeprom_read(struct adapter *adapter, u16 addr, u8 *buf, u16 len)
+ {
+-	return FLEXI2C_read(adapter, 0x20000000, 0x50, addr, buf, len);
++	return flex_i2c_read(adapter, 0x20000000, 0x50, addr, buf, len);
+ }
+ 
+-u8 calc_LRC(u8 * buf, u32 len)
++u8 calc_lrc(u8 *buf, int len)
+ {
+-	u32 i;
++	int i;
+ 	u8 sum;
+ 
+ 	sum = 0;
+@@ -781,13 +791,13 @@ u8 calc_LRC(u8 * buf, u32 len)
+ 	return sum;
+ }
+ 
+-static int EEPROM_LRC_read(struct adapter *adapter, u32 addr, u32 len, u8 * buf, u32 retries)
++static int eeprom_lrc_read(struct adapter *adapter, u32 addr, u32 len, u8 *buf, int retries)
+ {
+ 	int i;
+ 
+ 	for (i = 0; i < retries; i++) {
+-		if (EEPROM_read(adapter, addr, buf, len) == len) {
+-			if (calc_LRC(buf, len - 1) == buf[len - 1])
++		if (eeprom_read(adapter, addr, buf, len) == len) {
++			if (calc_lrc(buf, len - 1) == buf[len - 1])
+ 				return 1;
+ 		}
+ 	}
+@@ -796,13 +806,13 @@ static int EEPROM_LRC_read(struct adapte
+ }
+ 
+ /*
+-static int EEPROM_LRC_write(struct adapter *adapter, u32 addr, u32 len, u8 * wbuf, u8 * rbuf, u32 retries)
++static int eeprom_lrc_write(struct adapter *adapter, u32 addr, u32 len, u8 *wbuf, u8 *rbuf, int retries)
+ {
+ 	int i;
+ 
+ 	for (i = 0; i < retries; i++) {
+-		if (EEPROM_write(adapter, addr, wbuf, len) == len) {
+-			if (EEPROM_LRC_read(adapter, addr, len, rbuf, retries) == 1)
++		if (eeprom_write(adapter, addr, wbuf, len) == len) {
++			if (eeprom_lrc_read(adapter, addr, len, rbuf, retries) == 1)
+ 				return 1;
+ 		}
+ 	}
+@@ -811,33 +821,11 @@ static int EEPROM_LRC_write(struct adapt
+ }
+ */
+ 
+-/* These functions could be called from the initialization routine 
+-   to unlock SkyStar2 cards, locked by "Europe On Line".
+-        
+-   in cards from "Europe On Line" the key is:
+-
+-       u8 key[20] = {
+- 	    0xB2, 0x01, 0x00, 0x00,
+- 	    0x00, 0x00, 0x00, 0x00,
+- 	    0x00, 0x00, 0x00, 0x00,
+- 	    0x00, 0x00, 0x00, 0x00,
+-       };
+-
+-       LRC = 0xB3;
+-
+-  in unlocked cards the key is:
+-
+-       u8 key[20] = {
+- 	    0xB2, 0x00, 0x00, 0x00,
+- 	    0x00, 0x00, 0x00, 0x00,
+- 	    0x00, 0x00, 0x00, 0x00,
+- 	    0x00, 0x00, 0x00, 0x00,
+-       };
+ 
+-      LRC = 0xB2;
+-*/
++/* These functions could be used to unlock SkyStar2 cards. */
++
+ /*
+-static int EEPROM_writeKey(struct adapter *adapter, u8 * key, u32 len)
++static int eeprom_writeKey(struct adapter *adapter, u8 *key, u32 len)
+ {
+ 	u8 rbuf[20];
+ 	u8 wbuf[20];
+@@ -850,37 +838,38 @@ static int EEPROM_writeKey(struct adapte
+ 	wbuf[16] = 0;
+ 	wbuf[17] = 0;
+ 	wbuf[18] = 0;
+-	wbuf[19] = calc_LRC(wbuf, 19);
++	wbuf[19] = calc_lrc(wbuf, 19);
+ 
+-	return EEPROM_LRC_write(adapter, 0x3E4, 20, wbuf, rbuf, 4);
++	return eeprom_lrc_write(adapter, 0x3e4, 20, wbuf, rbuf, 4);
+ }
+-*/
+-static int EEPROM_readKey(struct adapter *adapter, u8 * key, u32 len)
++
++static int eeprom_readKey(struct adapter *adapter, u8 *key, u32 len)
+ {
+ 	u8 buf[20];
+ 
+ 	if (len != 16)
+ 		return 0;
+ 
+-	if (EEPROM_LRC_read(adapter, 0x3E4, 20, buf, 4) == 0)
++	if (eeprom_lrc_read(adapter, 0x3e4, 20, buf, 4) == 0)
+ 		return 0;
+ 
+ 	memcpy(key, buf, len);
+ 
+ 	return 1;
+ }
++*/
+ 
+-static int EEPROM_getMacAddr(struct adapter *adapter, char type, u8 * mac)
++static int eeprom_get_mac_addr(struct adapter *adapter, char type, u8 *mac)
+ {
+ 	u8 tmp[8];
+ 
+-	if (EEPROM_LRC_read(adapter, 0x3F8, 8, tmp, 4) != 0) {
++	if (eeprom_lrc_read(adapter, 0x3f8, 8, tmp, 4) != 0) {
+ 		if (type != 0) {
+ 			mac[0] = tmp[0];
+ 			mac[1] = tmp[1];
+ 			mac[2] = tmp[2];
+-			mac[3] = 0xFE;
+-			mac[4] = 0xFF;
++			mac[3] = 0xfe;
++			mac[4] = 0xff;
+ 			mac[5] = tmp[3];
+ 			mac[6] = tmp[4];
+ 			mac[7] = tmp[5];
+@@ -912,7 +901,7 @@ static int EEPROM_getMacAddr(struct adap
+ }
+ 
+ /*
+-static char EEPROM_setMacAddr(struct adapter *adapter, char type, u8 * mac)
++static char eeprom_set_mac_addr(struct adapter *adapter, char type, u8 *mac)
+ {
+ 	u8 tmp[8];
+ 
+@@ -935,9 +924,9 @@ static char EEPROM_setMacAddr(struct ada
+ 	}
+ 
+ 	tmp[6] = 0;
+-	tmp[7] = calc_LRC(tmp, 7);
++	tmp[7] = calc_lrc(tmp, 7);
+ 
+-	if (EEPROM_write(adapter, 0x3F8, tmp, 8) == 8)
++	if (eeprom_write(adapter, 0x3f8, tmp, 8) == 8)
+ 		return 1;
+ 
+ 	return 0;
+@@ -945,529 +934,319 @@ static char EEPROM_setMacAddr(struct ada
+ */
+ 
+ /* PID filter */
+-static void FilterEnableStream1Filter(struct adapter *adapter, u32 op)
+-{
+-	dprintk("%s: op=%x\n", __FUNCTION__, op);
+-
+-	if (op == 0) {
+-		WriteRegOp(adapter, 0x208, 2, ~0x00000001, 0);
+-
+-	} else {
+ 
+-		WriteRegOp(adapter, 0x208, 1, 0, 0x00000001);
++/* every flexcop has 6 "lower" hw PID filters     */
++/* these are enabled by setting bits 0-5 of 0x208 */
++/* for the 32 additional filters we have to select one */
++/* of them through 0x310 and modify through 0x314 */
++/* op: 0=disable, 1=enable */
++static void filter_enable_hw_filter(struct adapter *adapter, int id, u8 op)
++{
++	dprintk("%s: id=%d op=%d\n", __FUNCTION__, id, op);
++	if (id <= 5) {
++		u32 mask = (0x00000001 << id);
++		write_reg_bitfield(adapter, 0x208, mask, op ? mask : 0);
++	} else {
++		/* select */
++		write_reg_bitfield(adapter, 0x310, 0x1f, (id - 6) & 0x1f);
++		/* modify */
++		write_reg_bitfield(adapter, 0x314, 0x00006000, op ? 0x00004000 : 0);
+ 	}
+ }
+ 
+-static void FilterEnableStream2Filter(struct adapter *adapter, u32 op)
+-{
+-	dprintk("%s: op=%x\n", __FUNCTION__, op);
+-
+-	if (op == 0) {
+-		WriteRegOp(adapter, 0x208, 2, ~0x00000002, 0);
+-
+-	} else {
+-
+-		WriteRegOp(adapter, 0x208, 1, 0, 0x00000002);
++/* this sets the PID that should pass the specified filter */
++static void pid_set_hw_pid(struct adapter *adapter, int id, u16 pid)
++{
++	dprintk("%s: id=%d  pid=%d\n", __FUNCTION__, id, pid);
++	if (id <= 5) {
++		u32 adr = 0x300 + ((id & 6) << 1);
++		int shift = (id & 1) ? 16 : 0;
++		dprintk("%s: id=%d  addr=%x %c  pid=%d\n", __FUNCTION__, id, adr, (id & 1) ? 'h' : 'l', pid);
++		write_reg_bitfield(adapter, adr, (0x7fff) << shift, (pid & 0x1fff) << shift);
++	} else {
++		/* select */
++		write_reg_bitfield(adapter, 0x310, 0x1f, (id - 6) & 0x1f);
++		/* modify */
++		write_reg_bitfield(adapter, 0x314, 0x1fff, pid & 0x1fff);
+ 	}
+ }
+ 
+-static void FilterEnablePcrFilter(struct adapter *adapter, u32 op)
+-{
+-	dprintk("%s: op=%x\n", __FUNCTION__, op);
+-
+-	if (op == 0) {
+-		WriteRegOp(adapter, 0x208, 2, ~0x00000004, 0);
+-
+-	} else {
+-
+-		WriteRegOp(adapter, 0x208, 1, 0, 0x00000004);
+-	}
+-}
+-
+-static void FilterEnablePmtFilter(struct adapter *adapter, u32 op)
+-{
+-	dprintk("%s: op=%x\n", __FUNCTION__, op);
+-
+-	if (op == 0) {
+-		WriteRegOp(adapter, 0x208, 2, ~0x00000008, 0);
+-
+-	} else {
+-
+-		WriteRegOp(adapter, 0x208, 1, 0, 0x00000008);
+-	}
+-}
+-
+-static void FilterEnableEmmFilter(struct adapter *adapter, u32 op)
+-{
+-	dprintk("%s: op=%x\n", __FUNCTION__, op);
+-
+-	if (op == 0) {
+-		WriteRegOp(adapter, 0x208, 2, ~0x00000010, 0);
+-
+-	} else {
+-
+-		WriteRegOp(adapter, 0x208, 1, 0, 0x00000010);
+-	}
+-}
+-
+-static void FilterEnableEcmFilter(struct adapter *adapter, u32 op)
+-{
+-	dprintk("%s: op=%x\n", __FUNCTION__, op);
+-
+-	if (op == 0) {
+-		WriteRegOp(adapter, 0x208, 2, ~0x00000020, 0);
+-
+-	} else {
+-
+-		WriteRegOp(adapter, 0x208, 1, 0, 0x00000020);
+-	}
+-}
+ 
+ /*
+-static void FilterEnableNullFilter(struct adapter *adapter, u32 op)
++static void filter_enable_null_filter(struct adapter *adapter, u32 op)
+ {
+ 	dprintk("%s: op=%x\n", __FUNCTION__, op);
+ 
+-	if (op == 0) {
+-		WriteRegOp(adapter, 0x208, 2, ~0x00000040, 0);
+-
+-	} else {
+-
+-		WriteRegOp(adapter, 0x208, 1, 0, 0x00000040);
+-	}
++	write_reg_bitfield(adapter, 0x208, 0x00000040, op?0x00000040:0);
+ }
+ */
+ 
+-static void FilterEnableMaskFilter(struct adapter *adapter, u32 op)
++static void filter_enable_mask_filter(struct adapter *adapter, u32 op)
+ {
+ 	dprintk("%s: op=%x\n", __FUNCTION__, op);
+ 
+-	if (op == 0) {
+-		WriteRegOp(adapter, 0x208, 2, ~0x00000080, 0);
+-
+-	} else {
+-
+-		WriteRegOp(adapter, 0x208, 1, 0, 0x00000080);
+-	}
++	write_reg_bitfield(adapter, 0x208, 0x00000080, op ? 0x00000080 : 0);
+ }
+ 
+ 
+-static void CtrlEnableMAC(struct adapter *adapter, u32 op)
++static void ctrl_enable_mac(struct adapter *adapter, u32 op)
+ {
+-	if (op == 0) {
+-		WriteRegOp(adapter, 0x208, 2, ~0x00004000, 0);
+-
+-	} else {
+-
+-		WriteRegOp(adapter, 0x208, 1, 0, 0x00004000);
+-	}
++	write_reg_bitfield(adapter, 0x208, 0x00004000, op ? 0x00004000 : 0);
+ }
+ 
+-static int CASetMacDstAddrFilter(struct adapter *adapter, u8 * mac)
++static int ca_set_mac_dst_addr_filter(struct adapter *adapter, u8 *mac)
+ {
+ 	u32 tmp1, tmp2;
+ 
+ 	tmp1 = (mac[3] << 0x18) | (mac[2] << 0x10) | (mac[1] << 0x08) | mac[0];
+ 	tmp2 = (mac[5] << 0x08) | mac[4];
+ 
+-	WriteRegDW(adapter, 0x418, tmp1);
+-	WriteRegDW(adapter, 0x41C, tmp2);
++	write_reg_dw(adapter, 0x418, tmp1);
++	write_reg_dw(adapter, 0x41c, tmp2);
+ 
+ 	return 0;
+ }
+ 
+ /*
+-static void SetIgnoreMACFilter(struct adapter *adapter, u8 op)
++static void set_ignore_mac_filter(struct adapter *adapter, u8 op)
+ {
+ 	if (op != 0) {
+-		WriteRegOp(adapter, 0x208, 2, ~0x00004000, 0);
+-
++		write_reg_bitfield(adapter, 0x208, 0x00004000, 0);
+ 		adapter->mac_filter = 1;
+-
+ 	} else {
+-
+ 		if (adapter->mac_filter != 0) {
+ 			adapter->mac_filter = 0;
+-
+-			WriteRegOp(adapter, 0x208, 1, 0, 0x00004000);
++			write_reg_bitfield(adapter, 0x208, 0x00004000, 0x00004000);
+ 		}
+ 	}
+ }
+ */
+ 
+ /*
+-static void CheckNullFilterEnable(struct adapter *adapter)
++static void check_null_filter_enable(struct adapter *adapter)
+ {
+-	FilterEnableNullFilter(adapter, 1);
+-	FilterEnableMaskFilter(adapter, 1);
++	filter_enable_null_filter(adapter, 1);
++	filter_enable_mask_filter(adapter, 1);
+ }
+ */
+ 
+-static void InitPIDsInfo(struct adapter *adapter)
+-{
+-	int i;
+-
+-	for (i = 0; i < 0x27; i++)
+-		adapter->pids[i] = 0x1FFF;
+-}
+-
+-static int CheckPID(struct adapter *adapter, u16 pid)
+-{
+-	u32 i;
+-
+-	if (pid == 0x1FFF)
+-		return 0;
+-
+-	for (i = 0; i < 0x27; i++) {
+-		if (adapter->pids[i] == pid)
+-			return 1;
+-	}
+-
+-	return 0;
+-}
+-
+-static void PidSetGroupPID(struct adapter * adapter, u32 pid)
++static void pid_set_group_pid(struct adapter *adapter, u16 pid)
+ {
+ 	u32 value;
+ 
+ 	dprintk("%s: pid=%x\n", __FUNCTION__, pid);
+-
+-	value = (pid & 0x3FFF) | (ReadRegDW(adapter, 0x30C) & 0xFFFF0000);
+-
+-	WriteRegDW(adapter, 0x30C, value);
+-
+-	/* return value is never used? */
+-/*	return value; */
++	value = (pid & 0x3fff) | (read_reg_dw(adapter, 0x30c) & 0xffff0000);
++	write_reg_dw(adapter, 0x30c, value);
+ }
+ 
+-static void PidSetGroupMASK(struct adapter * adapter, u32 pid)
++static void pid_set_group_mask(struct adapter *adapter, u16 pid)
+ {
+ 	u32 value;
+ 
+ 	dprintk("%s: pid=%x\n", __FUNCTION__, pid);
+-
+-	value = ((pid & 0x3FFF) << 0x10) | (ReadRegDW(adapter, 0x30C) & 0xFFFF);
+-
+-	WriteRegDW(adapter, 0x30C, value);
+-
+-	/* return value is never used? */
+-/*	return value; */
++	value = ((pid & 0x3fff) << 0x10) | (read_reg_dw(adapter, 0x30c) & 0xffff);
++	write_reg_dw(adapter, 0x30c, value);
+ }
+ 
+-static void PidSetStream1PID(struct adapter * adapter, u32 pid)
+-{
+-	u32 value;
+-
+-	dprintk("%s: pid=%x\n", __FUNCTION__, pid);
+-
+-	value = (pid & 0x3FFF) | (ReadRegDW(adapter, 0x300) & 0xFFFFC000);
+-
+-	WriteRegDW(adapter, 0x300, value);
+-
+-	/* return value is never used? */
+-/*	return value; */
+-}
+-
+-static void PidSetStream2PID(struct adapter * adapter, u32 pid)
+-{
+-	u32 value;
+-
+-	dprintk("%s: pid=%x\n", __FUNCTION__, pid);
+-
+-	value = ((pid & 0x3FFF) << 0x10) | (ReadRegDW(adapter, 0x300) & 0xFFFF);
+-
+-	WriteRegDW(adapter, 0x300, value);
+-
+-	/* return value is never used? */
+-/*	return value; */
+-}
+-
+-static void PidSetPcrPID(struct adapter * adapter, u32 pid)
++/*
++static int pid_get_group_pid(struct adapter *adapter)
+ {
+-	u32 value;
+-
+-	dprintk("%s: pid=%x\n", __FUNCTION__, pid);
+-
+-	value = (pid & 0x3FFF) | (ReadRegDW(adapter, 0x304) & 0xFFFFC000);
+-
+-	WriteRegDW(adapter, 0x304, value);
+-
+-	/* return value is never used? */
+-/*	return value; */
++	return read_reg_dw(adapter, 0x30c) & 0x00001fff;
+ }
+ 
+-static void PidSetPmtPID(struct adapter * adapter, u32 pid)
++static int pid_get_group_mask(struct adapter *adapter)
+ {
+-	u32 value;
+-
+-	dprintk("%s: pid=%x\n", __FUNCTION__, pid);
+-
+-	value = ((pid & 0x3FFF) << 0x10) | (ReadRegDW(adapter, 0x304) & 0x3FFF);
+-
+-	WriteRegDW(adapter, 0x304, value);
+-
+-	/* return value is never used? */
+-/*	return value; */
+-}
+-
+-static void PidSetEmmPID(struct adapter * adapter, u32 pid)
+-{
+-	u32 value;
+-
+-	dprintk("%s: pid=%x\n", __FUNCTION__, pid);
+-
+-	value = (pid & 0xFFFF) | (ReadRegDW(adapter, 0x308) & 0xFFFF0000);
+-
+-	WriteRegDW(adapter, 0x308, value);
+-
+-	/* return value is never used? */
+-/*	return value; */
++	return (read_reg_dw(adapter, 0x30c) >> 0x10)& 0x00001fff;
+ }
++*/
+ 
+-static void PidSetEcmPID(struct adapter * adapter, u32 pid)
++/*
++static void reset_hardware_pid_filter(struct adapter *adapter)
+ {
+-	u32 value;
++	pid_set_stream1_pid(adapter, 0x1fff);
+ 
+-	dprintk("%s: pid=%x\n", __FUNCTION__, pid);
+-
+-	value = (pid << 0x10) | (ReadRegDW(adapter, 0x308) & 0xFFFF);
++	pid_set_stream2_pid(adapter, 0x1fff);
++	filter_enable_stream2_filter(adapter, 0);
+ 
+-	WriteRegDW(adapter, 0x308, value);
++	pid_set_pcr_pid(adapter, 0x1fff);
++	filter_enable_pcr_filter(adapter, 0);
+ 
+-	/* return value is never used? */
+-/*	return value; */
+-}
++	pid_set_pmt_pid(adapter, 0x1fff);
++	filter_enable_pmt_filter(adapter, 0);
+ 
+-static int PidGetStream1PID(struct adapter * adapter)
+-{
+-	return ReadRegDW(adapter, 0x300) & 0x00001FFF;
+-}
++	pid_set_ecm_pid(adapter, 0x1fff);
++	filter_enable_ecm_filter(adapter, 0);
+ 
+-static int PidGetStream2PID(struct adapter * adapter)
+-{
+-	return (ReadRegDW(adapter, 0x300) >> 0x10)& 0x00001FFF;
++	pid_set_emm_pid(adapter, 0x1fff);
++	filter_enable_emm_filter(adapter, 0);
+ }
++*/
+ 
+-static int PidGetPcrPID(struct adapter * adapter)
++static void init_pids(struct adapter *adapter)
+ {
+-	return ReadRegDW(adapter, 0x304) & 0x00001FFF;
+-}
++	int i;
+ 
+-static int PidGetPmtPID(struct adapter * adapter)
+-{
+-	return (ReadRegDW(adapter, 0x304) >> 0x10)& 0x00001FFF;
++	adapter->pid_count = 0;
++	adapter->whole_bandwidth_count = 0;
++	for (i = 0; i < adapter->useable_hw_filters; i++) {
++		dprintk("%s: setting filter %d to 0x1fff\n", __FUNCTION__, i);
++		adapter->hw_pids[i] = 0x1fff;
++		pid_set_hw_pid(adapter, i, 0x1fff);
+ }
+ 
+-static int PidGetEmmPID(struct adapter * adapter)
+-{
+-	return ReadRegDW(adapter, 0x308) & 0x00001FFF;
++	pid_set_group_pid(adapter, 0);
++	pid_set_group_mask(adapter, 0x1fe0);
+ }
+ 
+-static int PidGetEcmPID(struct adapter * adapter)
++static void open_whole_bandwidth(struct adapter *adapter)
+ {
+-	return (ReadRegDW(adapter, 0x308) >> 0x10)& 0x00001FFF;
++	dprintk("%s:\n", __FUNCTION__);
++	pid_set_group_pid(adapter, 0);
++	pid_set_group_mask(adapter, 0);
++/*
++	filter_enable_mask_filter(adapter, 1);
++*/
+ }
+ 
+-static int PidGetGroupPID(struct adapter * adapter)
++static void close_whole_bandwidth(struct adapter *adapter)
+ {
+-	return ReadRegDW(adapter, 0x30C) & 0x00001FFF;
++	dprintk("%s:\n", __FUNCTION__);
++	pid_set_group_pid(adapter, 0);
++	pid_set_group_mask(adapter, 0x1fe0);
++/*
++	filter_enable_mask_filter(adapter, 1);
++*/
+ }
+ 
+-static int PidGetGroupMASK(struct adapter * adapter)
++static void whole_bandwidth_inc(struct adapter *adapter)
+ {
+-	return (ReadRegDW(adapter, 0x30C) >> 0x10)& 0x00001FFF;
++	if (adapter->whole_bandwidth_count++ == 0)
++		open_whole_bandwidth(adapter);
+ }
+ 
+-/*
+-static void ResetHardwarePIDFilter(struct adapter *adapter)
++static void whole_bandwidth_dec(struct adapter *adapter)
+ {
+-	PidSetStream1PID(adapter, 0x1FFF);
+-
+-	PidSetStream2PID(adapter, 0x1FFF);
+-	FilterEnableStream2Filter(adapter, 0);
+-
+-	PidSetPcrPID(adapter, 0x1FFF);
+-	FilterEnablePcrFilter(adapter, 0);
+-
+-	PidSetPmtPID(adapter, 0x1FFF);
+-	FilterEnablePmtFilter(adapter, 0);
+-
+-	PidSetEcmPID(adapter, 0x1FFF);
+-	FilterEnableEcmFilter(adapter, 0);
+-
+-	PidSetEmmPID(adapter, 0x1FFF);
+-	FilterEnableEmmFilter(adapter, 0);
++	if (--adapter->whole_bandwidth_count <= 0)
++		close_whole_bandwidth(adapter);
+ }
+-*/
+ 
+-static void OpenWholeBandwidth(struct adapter *adapter)
++/* The specified PID has to be let through the
++   hw filters.
++   We try to allocate an hardware filter and open whole
++   bandwidth when allocation is impossible.
++   All pids<=0x1f pass through the group filter.
++   Returns 1 on success, -1 on error */
++static int add_hw_pid(struct adapter *adapter, u16 pid)
+ {
+-	PidSetGroupPID(adapter, 0);
+-
+-	PidSetGroupMASK(adapter, 0);
+-
+-	FilterEnableMaskFilter(adapter, 1);
+-}
++	int i;
+ 
+-static int AddHwPID(struct adapter *adapter, u32 pid)
+-{
+ 	dprintk("%s: pid=%d\n", __FUNCTION__, pid);
+ 
+-	if (pid <= 0x1F)
++	if (pid <= 0x1f)
+ 		return 1;
+ 
+-	if ((PidGetGroupMASK(adapter) == 0) && (PidGetGroupPID(adapter) == 0))
+-		return 0;
+-
+-	if (PidGetStream1PID(adapter) == 0x1FFF) {
+-		PidSetStream1PID(adapter, pid & 0xFFFF);
+-
+-		FilterEnableStream1Filter(adapter, 1);
+-
+-		return 1;
+-	}
+-
+-	if (PidGetStream2PID(adapter) == 0x1FFF) {
+-		PidSetStream2PID(adapter, (pid & 0xFFFF));
+-
+-		FilterEnableStream2Filter(adapter, 1);
+-
+-		return 1;
+-	}
+-
+-	if (PidGetPcrPID(adapter) == 0x1FFF) {
+-		PidSetPcrPID(adapter, (pid & 0xFFFF));
+-
+-		FilterEnablePcrFilter(adapter, 1);
+-
++	/* we can't use a filter for 0x2000, so no search */
++	if (pid != 0x2000) {
++		/* find an unused hardware filter */
++		for (i = 0; i < adapter->useable_hw_filters; i++) {
++			dprintk("%s: pid=%d searching slot=%d\n", __FUNCTION__, pid, i);
++			if (adapter->hw_pids[i] == 0x1fff) {
++				dprintk("%s: pid=%d slot=%d\n", __FUNCTION__, pid, i);
++				adapter->hw_pids[i] = pid;
++				pid_set_hw_pid(adapter, i, pid);
++				filter_enable_hw_filter(adapter, i, 1);
+ 		return 1;
+ 	}
+-
+-	if ((PidGetPmtPID(adapter) & 0x1FFF) == 0x1FFF) {
+-		PidSetPmtPID(adapter, (pid & 0xFFFF));
+-
+-		FilterEnablePmtFilter(adapter, 1);
+-
+-		return 1;
+ 	}
+-
+-	if ((PidGetEmmPID(adapter) & 0x1FFF) == 0x1FFF) {
+-		PidSetEmmPID(adapter, (pid & 0xFFFF));
+-
+-		FilterEnableEmmFilter(adapter, 1);
+-
+-		return 1;
+ 	}
+-
+-	if ((PidGetEcmPID(adapter) & 0x1FFF) == 0x1FFF) {
+-		PidSetEcmPID(adapter, (pid & 0xFFFF));
+-
+-		FilterEnableEcmFilter(adapter, 1);
+-
++	/* if we have not used a filter, this pid depends on whole bandwidth */
++	dprintk("%s: pid=%d whole_bandwidth\n", __FUNCTION__, pid);
++	whole_bandwidth_inc(adapter);
+ 		return 1;
+ 	}
+ 
+-	return -1;
+-}
+-
+-static int RemoveHwPID(struct adapter *adapter, u32 pid)
++/* returns -1 if the pid was not present in the filters */
++static int remove_hw_pid(struct adapter *adapter, u16 pid)
+ {
++	int i;
++
+ 	dprintk("%s: pid=%d\n", __FUNCTION__, pid);
+ 
+-	if (pid <= 0x1F)
++	if (pid <= 0x1f)
+ 		return 1;
+ 
+-	if (PidGetStream1PID(adapter) == pid) {
+-		PidSetStream1PID(adapter, 0x1FFF);
+-
++	/* we can't use a filter for 0x2000, so no search */
++	if (pid != 0x2000) {
++		for (i = 0; i < adapter->useable_hw_filters; i++) {
++			dprintk("%s: pid=%d searching slot=%d\n", __FUNCTION__, pid, i);
++			if (adapter->hw_pids[i] == pid) {	// find the pid slot
++				dprintk("%s: pid=%d slot=%d\n", __FUNCTION__, pid, i);
++				adapter->hw_pids[i] = 0x1fff;
++				pid_set_hw_pid(adapter, i, 0x1fff);
++				filter_enable_hw_filter(adapter, i, 0);
+ 		return 1;
+ 	}
+-
+-	if (PidGetStream2PID(adapter) == pid) {
+-		PidSetStream2PID(adapter, 0x1FFF);
+-
+-		FilterEnableStream2Filter(adapter, 0);
+-
+-		return 1;
+ 	}
+-
+-	if (PidGetPcrPID(adapter) == pid) {
+-		PidSetPcrPID(adapter, 0x1FFF);
+-
+-		FilterEnablePcrFilter(adapter, 0);
+-
+-		return 1;
+ 	}
+-
+-	if (PidGetPmtPID(adapter) == pid) {
+-		PidSetPmtPID(adapter, 0x1FFF);
+-
+-		FilterEnablePmtFilter(adapter, 0);
+-
++	/* if we have not used a filter, this pid depended on whole bandwith */
++	dprintk("%s: pid=%d whole_bandwidth\n", __FUNCTION__, pid);
++	whole_bandwidth_dec(adapter);
+ 		return 1;
+ 	}
+ 
+-	if (PidGetEmmPID(adapter) == pid) {
+-		PidSetEmmPID(adapter, 0x1FFF);
+-
+-		FilterEnableEmmFilter(adapter, 0);
+-
+-		return 1;
+-	}
+-
+-	if (PidGetEcmPID(adapter) == pid) {
+-		PidSetEcmPID(adapter, 0x1FFF);
+-
+-		FilterEnableEcmFilter(adapter, 0);
+-
+-		return 1;
+-	}
+-
+-	return -1;
+-}
+-
+-static int AddPID(struct adapter *adapter, u32 pid)
++/* Adds a PID to the filters.
++   Adding a pid more than once is possible, we keep reference counts.
++   Whole stream available through pid==0x2000.
++   Returns 1 on success, -1 on error */
++static int add_pid(struct adapter *adapter, u16 pid)
+ {
+ 	int i;
+ 
+ 	dprintk("%s: pid=%d\n", __FUNCTION__, pid);
+ 
+-	if (pid > 0x1FFE)
++	if (pid > 0x1ffe && pid != 0x2000)
+ 		return -1;
+ 
+-	if (CheckPID(adapter, pid) == 1)
++	// check if the pid is already present
++	for (i = 0; i < adapter->pid_count; i++)
++		if (adapter->pid_list[i] == pid) {
++			adapter->pid_rc[i]++;	// increment ref counter
+ 		return 1;
++		}
+ 
+-	for (i = 0; i < 0x27; i++) {
+-		if (adapter->pids[i] == 0x1FFF)	// find free pid filter
+-		{
+-			adapter->pids[i] = pid;
+-
+-			if (AddHwPID(adapter, pid) < 0)
+-				OpenWholeBandwidth(adapter);
++	if (adapter->pid_count == N_PID_SLOTS)
++		return -1;	// no more pids can be added
++	adapter->pid_list[adapter->pid_count] = pid;	// register pid
++	adapter->pid_rc[adapter->pid_count] = 1;
++	adapter->pid_count++;
++	// hardware setting
++	add_hw_pid(adapter, pid);
+ 
+ 			return 1;
+ 		}
+-	}
+-
+-	return -1;
+-}
+ 
+-static int RemovePID(struct adapter *adapter, u32 pid)
++/* Removes a PID from the filters. */
++static int remove_pid(struct adapter *adapter, u16 pid)
+ {
+-	u32 i;
++	int i;
+ 
+ 	dprintk("%s: pid=%d\n", __FUNCTION__, pid);
+ 
+-	if (pid > 0x1FFE)
++	if (pid > 0x1ffe && pid != 0x2000)
+ 		return -1;
+ 
+-	for (i = 0; i < 0x27; i++) {
+-		if (adapter->pids[i] == pid) {
+-			adapter->pids[i] = 0x1FFF;
+-
+-			RemoveHwPID(adapter, pid);
+-
++	// check if the pid is present (it must be!)
++	for (i = 0; i < adapter->pid_count; i++) {
++		if (adapter->pid_list[i] == pid) {
++			adapter->pid_rc[i]--;
++			if (adapter->pid_rc[i] <= 0) {
++				// remove from the list
++				adapter->pid_count--;
++				adapter->pid_list[i]=adapter->pid_list[adapter->pid_count];
++				adapter->pid_rc[i] = adapter->pid_rc[adapter->pid_count];
++				// hardware setting
++				remove_hw_pid(adapter, pid);
++			}
+ 			return 1;
+ 		}
+ 	}
+@@ -1475,21 +1254,16 @@ static int RemovePID(struct adapter *ada
+ 	return -1;
+ }
+ 
++
+ /* dma & irq */
+-static void CtrlEnableSmc(struct adapter *adapter, u32 op)
++static void ctrl_enable_smc(struct adapter *adapter, u32 op)
+ {
+-	if (op == 0) {
+-		WriteRegOp(adapter, 0x208, 2, ~0x00000800, 0);
+-
+-	} else {
+-
+-		WriteRegOp(adapter, 0x208, 1, 0, 0x00000800);
+-	}
++	write_reg_bitfield(adapter, 0x208, 0x00000800, op ? 0x00000800 : 0);
+ }
+ 
+-static void DmaEnableDisableIrq(struct adapter *adapter, u32 flag1, u32 flag2, u32 flag3)
++static void dma_enable_disable_irq(struct adapter *adapter, u32 flag1, u32 flag2, u32 flag3)
+ {
+-	adapter->dma_ctrl = adapter->dma_ctrl & 0x000F0000;
++	adapter->dma_ctrl = adapter->dma_ctrl & 0x000f0000;
+ 
+ 	if (flag1 == 0) {
+ 		if (flag2 == 0)
+@@ -1516,16 +1290,16 @@ static void DmaEnableDisableIrq(struct a
+ 	}
+ }
+ 
+-static void IrqDmaEnableDisableIrq(struct adapter * adapter, u32 op)
++static void irq_dma_enable_disable_irq(struct adapter *adapter, u32 op)
+ {
+ 	u32 value;
+ 
+-	value = ReadRegDW(adapter, 0x208) & 0xFFF0FFFF;
++	value = read_reg_dw(adapter, 0x208) & 0xfff0ffff;
+ 
+ 	if (op != 0)
+-		value = value | (adapter->dma_ctrl & 0x000F0000);
++		value = value | (adapter->dma_ctrl & 0x000f0000);
+ 
+-	WriteRegDW(adapter, 0x208, value);
++	write_reg_dw(adapter, 0x208, value);
+ }
+ 
+ /* FlexCopII has 2 dma channels. DMA1 is used to transfer TS data to
+@@ -1544,7 +1318,7 @@ static void IrqDmaEnableDisableIrq(struc
+        subbuffer. The last 2 bits contain 0, when dma1 is disabled and 1,
+        when dma1 is enabled.
+ 
+-       the first 30 bits of register 0x00C contain the address of the second
++       the first 30 bits of register 0x00c contain the address of the second
+        subbuffer. the last 2 bits contain 1.
+ 
+        register 0x008 will contain the address of the subbuffer that was filled
+@@ -1559,13 +1333,13 @@ static void IrqDmaEnableDisableIrq(struc
+        subbuffer.  The last 2 bits contain 0, when dma1 is disabled and 1,
+        when dma1 is enabled.
+ 
+-       the first 30 bits of register 0x01C contain the address of the second
++       the first 30 bits of register 0x01c contain the address of the second
+        subbuffer. the last 2 bits contain 1.
+ 
+        register 0x018 contains the address of the subbuffer that was filled
+        with TS data, when FlexCopII generates an interrupt.
+ */
+-static int DmaInitDMA(struct adapter *adapter, u32 dma_channel)
++static int dma_init_dma(struct adapter *adapter, u32 dma_channel)
+ {
+ 	u32 subbuffers, subbufsize, subbuf0, subbuf1;
+ 
+@@ -1576,37 +1350,37 @@ static int DmaInitDMA(struct adapter *ad
+ 
+ 		subbufsize = (((adapter->dmaq1.buffer_size / 2) / 4) << 8) | subbuffers;
+ 
+-		subbuf0 = adapter->dmaq1.bus_addr & 0xFFFFFFFC;
++		subbuf0 = adapter->dmaq1.bus_addr & 0xfffffffc;
+ 
+-		subbuf1 = ((adapter->dmaq1.bus_addr + adapter->dmaq1.buffer_size / 2) & 0xFFFFFFFC) | 1;
++		subbuf1 = ((adapter->dmaq1.bus_addr + adapter->dmaq1.buffer_size / 2) & 0xfffffffc) | 1;
+ 
+ 		dprintk("%s: first subbuffer address = 0x%x\n", __FUNCTION__, subbuf0);
+ 		udelay(1000);
+-		WriteRegDW(adapter, 0x000, subbuf0);
++		write_reg_dw(adapter, 0x000, subbuf0);
+ 
+ 		dprintk("%s: subbuffer size = 0x%x\n", __FUNCTION__, (subbufsize >> 8) * 4);
+ 		udelay(1000);
+-		WriteRegDW(adapter, 0x004, subbufsize);
++		write_reg_dw(adapter, 0x004, subbufsize);
+ 
+ 		dprintk("%s: second subbuffer address = 0x%x\n", __FUNCTION__, subbuf1);
+ 		udelay(1000);
+-		WriteRegDW(adapter, 0x00C, subbuf1);
++		write_reg_dw(adapter, 0x00c, subbuf1);
+ 
+-		dprintk("%s: counter = 0x%x\n", __FUNCTION__, adapter->dmaq1.bus_addr & 0xFFFFFFFC);
+-		WriteRegDW(adapter, 0x008, adapter->dmaq1.bus_addr & 0xFFFFFFFC);
++		dprintk("%s: counter = 0x%x\n", __FUNCTION__, adapter->dmaq1.bus_addr & 0xfffffffc);
++		write_reg_dw(adapter, 0x008, adapter->dmaq1.bus_addr & 0xfffffffc);
+ 		udelay(1000);
+ 
+ 		if (subbuffers == 0)
+-			DmaEnableDisableIrq(adapter, 0, 1, 0);
++			dma_enable_disable_irq(adapter, 0, 1, 0);
+ 		else
+-			DmaEnableDisableIrq(adapter, 0, 1, 1);
++			dma_enable_disable_irq(adapter, 0, 1, 1);
+ 
+-		IrqDmaEnableDisableIrq(adapter, 1);
++		irq_dma_enable_disable_irq(adapter, 1);
+ 
+-		SRAMSetMediaDest(adapter, 1);
+-		SRAMSetNetDest(adapter, 1);
+-		SRAMSetCaiDest(adapter, 2);
+-		SRAMSetCaoDest(adapter, 2);
++		sram_set_media_dest(adapter, 1);
++		sram_set_net_dest(adapter, 1);
++		sram_set_cai_dest(adapter, 2);
++		sram_set_cao_dest(adapter, 2);
+ 	}
+ 
+ 	if (dma_channel == 1) {
+@@ -1616,39 +1390,35 @@ static int DmaInitDMA(struct adapter *ad
+ 
+ 		subbufsize = (((adapter->dmaq2.buffer_size / 2) / 4) << 8) | subbuffers;
+ 
+-		subbuf0 = adapter->dmaq2.bus_addr & 0xFFFFFFFC;
++		subbuf0 = adapter->dmaq2.bus_addr & 0xfffffffc;
+ 
+-		subbuf1 = ((adapter->dmaq2.bus_addr + adapter->dmaq2.buffer_size / 2) & 0xFFFFFFFC) | 1;
++		subbuf1 = ((adapter->dmaq2.bus_addr + adapter->dmaq2.buffer_size / 2) & 0xfffffffc) | 1;
+ 
+ 		dprintk("%s: first subbuffer address = 0x%x\n", __FUNCTION__, subbuf0);
+ 		udelay(1000);
+-		WriteRegDW(adapter, 0x010, subbuf0);
++		write_reg_dw(adapter, 0x010, subbuf0);
+ 
+ 		dprintk("%s: subbuffer size = 0x%x\n", __FUNCTION__, (subbufsize >> 8) * 4);
+ 		udelay(1000);
+-		WriteRegDW(adapter, 0x014, subbufsize);
++		write_reg_dw(adapter, 0x014, subbufsize);
+ 
+ 		dprintk("%s: second buffer address = 0x%x\n", __FUNCTION__, subbuf1);
+ 		udelay(1000);
+-		WriteRegDW(adapter, 0x01C, subbuf1);
++		write_reg_dw(adapter, 0x01c, subbuf1);
+ 
+-		SRAMSetCaiDest(adapter, 2);
++		sram_set_cai_dest(adapter, 2);
+ 	}
+ 
+ 	return 0;
+ }
+ 
+-static void CtrlEnableReceiveData(struct adapter *adapter, u32 op)
++static void ctrl_enable_receive_data(struct adapter *adapter, u32 op)
+ {
+ 	if (op == 0) {
+-		WriteRegOp(adapter, 0x208, 2, ~0x00008000, 0);
+-
++		write_reg_bitfield(adapter, 0x208, 0x00008000, 0);
+ 		adapter->dma_status = adapter->dma_status & ~0x00000004;
+-
+ 	} else {
+-
+-		WriteRegOp(adapter, 0x208, 1, 0, 0x00008000);
+-
++		write_reg_bitfield(adapter, 0x208, 0x00008000, 0x00008000);
+ 		adapter->dma_status = adapter->dma_status | 0x00000004;
+ 	}
+ }
+@@ -1656,7 +1426,7 @@ static void CtrlEnableReceiveData(struct
+ /* bit 0 of dma_mask is set to 1 if dma1 channel has to be enabled/disabled
+    bit 1 of dma_mask is set to 1 if dma2 channel has to be enabled/disabled
+ */
+-static void DmaStartStop0x2102(struct adapter *adapter, u32 dma_mask, u32 start_stop)
++static void dma_start_stop(struct adapter *adapter, u32 dma_mask, int start_stop)
+ {
+ 	u32 dma_enable, dma1_enable, dma2_enable;
+ 
+@@ -1679,83 +1449,82 @@ static void DmaStartStop0x2102(struct ad
+ 		}
+ 		// enable dma1 and dma2
+ 		if ((dma1_enable == 1) && (dma2_enable == 1)) {
+-			WriteRegDW(adapter, 0x000, adapter->dmaq1.bus_addr | 1);
+-			WriteRegDW(adapter, 0x00C, (adapter->dmaq1.bus_addr + adapter->dmaq1.buffer_size / 2) | 1);
+-			WriteRegDW(adapter, 0x010, adapter->dmaq2.bus_addr | 1);
++			write_reg_dw(adapter, 0x000, adapter->dmaq1.bus_addr | 1);
++			write_reg_dw(adapter, 0x00c, (adapter->dmaq1.bus_addr + adapter->dmaq1.buffer_size / 2) | 1);
++			write_reg_dw(adapter, 0x010, adapter->dmaq2.bus_addr | 1);
+ 
+-			CtrlEnableReceiveData(adapter, 1);
++			ctrl_enable_receive_data(adapter, 1);
+ 
+ 			return;
+ 		}
+ 		// enable dma1
+ 		if ((dma1_enable == 1) && (dma2_enable == 0)) {
+-			WriteRegDW(adapter, 0x000, adapter->dmaq1.bus_addr | 1);
+-			WriteRegDW(adapter, 0x00C, (adapter->dmaq1.bus_addr + adapter->dmaq1.buffer_size / 2) | 1);
++			write_reg_dw(adapter, 0x000, adapter->dmaq1.bus_addr | 1);
++			write_reg_dw(adapter, 0x00c, (adapter->dmaq1.bus_addr + adapter->dmaq1.buffer_size / 2) | 1);
+ 
+-			CtrlEnableReceiveData(adapter, 1);
++			ctrl_enable_receive_data(adapter, 1);
+ 
+ 			return;
+ 		}
+ 		// enable dma2
+ 		if ((dma1_enable == 0) && (dma2_enable == 1)) {
+-			WriteRegDW(adapter, 0x010, adapter->dmaq2.bus_addr | 1);
++			write_reg_dw(adapter, 0x010, adapter->dmaq2.bus_addr | 1);
+ 
+-			CtrlEnableReceiveData(adapter, 1);
++			ctrl_enable_receive_data(adapter, 1);
+ 
+ 			return;
+ 		}
+ 		// start dma
+ 		if ((dma1_enable == 0) && (dma2_enable == 0)) {
+-			CtrlEnableReceiveData(adapter, 1);
++			ctrl_enable_receive_data(adapter, 1);
+ 
+ 			return;
+ 		}
+ 
+ 	} else {
+ 
+-		dprintk("%s: stoping dma\n", __FUNCTION__);
++		dprintk("%s: stopping dma\n", __FUNCTION__);
+ 
+ 		dma_enable = adapter->dma_status & 0x00000003;
+ 
+ 		if (((dma_mask & 1) != 0) && ((adapter->dma_status & 1) != 0)) {
+-			dma_enable = dma_enable & 0xFFFFFFFE;
++			dma_enable = dma_enable & 0xfffffffe;
+ 		}
+ 
+ 		if (((dma_mask & 2) != 0) && ((adapter->dma_status & 2) != 0)) {
+-			dma_enable = dma_enable & 0xFFFFFFFD;
++			dma_enable = dma_enable & 0xfffffffd;
+ 		}
+ 		//stop dma
+ 		if ((dma_enable == 0) && ((adapter->dma_status & 4) != 0)) {
+-			CtrlEnableReceiveData(adapter, 0);
++			ctrl_enable_receive_data(adapter, 0);
+ 
+ 			udelay(3000);
+ 		}
+ 		//disable dma1
+ 		if (((dma_mask & 1) != 0) && ((adapter->dma_status & 1) != 0) && (adapter->dmaq1.bus_addr != 0)) {
+-			WriteRegDW(adapter, 0x000, adapter->dmaq1.bus_addr);
+-			WriteRegDW(adapter, 0x00C, (adapter->dmaq1.bus_addr + adapter->dmaq1.buffer_size / 2) | 1);
++			write_reg_dw(adapter, 0x000, adapter->dmaq1.bus_addr);
++			write_reg_dw(adapter, 0x00c, (adapter->dmaq1.bus_addr + adapter->dmaq1.buffer_size / 2) | 1);
+ 
+ 			adapter->dma_status = adapter->dma_status & ~0x00000001;
+ 		}
+ 		//disable dma2
+ 		if (((dma_mask & 2) != 0) && ((adapter->dma_status & 2) != 0) && (adapter->dmaq2.bus_addr != 0)) {
+-			WriteRegDW(adapter, 0x010, adapter->dmaq2.bus_addr);
++			write_reg_dw(adapter, 0x010, adapter->dmaq2.bus_addr);
+ 
+ 			adapter->dma_status = adapter->dma_status & ~0x00000002;
+ 		}
+ 	}
+ }
+ 
+-static void OpenStream(struct adapter *adapter, u32 pid)
++static void open_stream(struct adapter *adapter, u16 pid)
+ {
+ 	u32 dma_mask;
+ 
+-	if (adapter->capturing == 0)
+-		adapter->capturing = 1;
++	++adapter->capturing;
+ 
+-	FilterEnableMaskFilter(adapter, 1);
++	filter_enable_mask_filter(adapter, 1);
+ 
+-	AddPID(adapter, pid);
++	add_pid(adapter, pid);
+ 
+ 	dprintk("%s: adapter->dma_status=%x\n", __FUNCTION__, adapter->dma_status);
+ 
+@@ -1779,23 +1548,22 @@ static void OpenStream(struct adapter *a
+ 		}
+ 
+ 		if (dma_mask != 0) {
+-			IrqDmaEnableDisableIrq(adapter, 1);
++			irq_dma_enable_disable_irq(adapter, 1);
+ 
+-			DmaStartStop0x2102(adapter, dma_mask, 1);
++			dma_start_stop(adapter, dma_mask, 1);
+ 		}
+ 	}
+ }
+ 
+-static void CloseStream(struct adapter *adapter, u32 pid)
++static void close_stream(struct adapter *adapter, u16 pid)
+ {
+-	u32 dma_mask;
+-
+-	if (adapter->capturing != 0)
+-		adapter->capturing = 0;
++	if (adapter->capturing > 0)
++		--adapter->capturing;
+ 
+ 	dprintk("%s: dma_status=%x\n", __FUNCTION__, adapter->dma_status);
+ 
+-	dma_mask = 0;
++	if (adapter->capturing == 0) {
++		u32 dma_mask = 0;
+ 
+ 	if ((adapter->dma_status & 1) != 0)
+ 		dma_mask = dma_mask | 0x00000001;
+@@ -1803,94 +1571,76 @@ static void CloseStream(struct adapter *
+ 		dma_mask = dma_mask | 0x00000002;
+ 
+ 	if (dma_mask != 0) {
+-		DmaStartStop0x2102(adapter, dma_mask, 0);
++			dma_start_stop(adapter, dma_mask, 0);
+ 	}
+-
+-	RemovePID(adapter, pid);
++	}
++	remove_pid(adapter, pid);
+ }
+ 
+-static void InterruptServiceDMA1(struct adapter *adapter)
++static void interrupt_service_dma1(struct adapter *adapter)
+ {
+ 	struct dvb_demux *dvbdmx = &adapter->demux;
+-	struct packet_header packet_header;
+ 
+-	int nCurDmaCounter;
+-	u32 nNumBytesParsed;
+-	u32 nNumNewBytesTransferred;
+-	u32 dwDefaultPacketSize = 188;
+-	u8 gbTmpBuffer[188];
+-	u8 *pbDMABufCurPos;
++	int n_cur_dma_counter;
++	u32 n_num_bytes_parsed;
++	u32 n_num_new_bytes_transferred;
++	u32 dw_default_packet_size = 188;
++	u8 gb_tmp_buffer[188];
++	u8 *pb_dma_buf_cur_pos;
+ 
+-	nCurDmaCounter = readl(adapter->io_mem + 0x008) - adapter->dmaq1.bus_addr;
+-	nCurDmaCounter = (nCurDmaCounter / dwDefaultPacketSize) * dwDefaultPacketSize;
++	n_cur_dma_counter = readl(adapter->io_mem + 0x008) - adapter->dmaq1.bus_addr;
++	n_cur_dma_counter = (n_cur_dma_counter / dw_default_packet_size) * dw_default_packet_size;
+ 
+-	if ((nCurDmaCounter < 0) || (nCurDmaCounter > adapter->dmaq1.buffer_size)) {
++	if ((n_cur_dma_counter < 0) || (n_cur_dma_counter > adapter->dmaq1.buffer_size)) {
+ 		dprintk("%s: dma counter outside dma buffer\n", __FUNCTION__);
+ 		return;
+ 	}
+ 
+-	adapter->dmaq1.head = nCurDmaCounter;
++	adapter->dmaq1.head = n_cur_dma_counter;
+ 
+-	if (adapter->dmaq1.tail <= nCurDmaCounter) {
+-		nNumNewBytesTransferred = nCurDmaCounter - adapter->dmaq1.tail;
++	if (adapter->dmaq1.tail <= n_cur_dma_counter) {
++		n_num_new_bytes_transferred = n_cur_dma_counter - adapter->dmaq1.tail;
+ 
+ 	} else {
+ 
+-		nNumNewBytesTransferred = (adapter->dmaq1.buffer_size - adapter->dmaq1.tail) + nCurDmaCounter;
++		n_num_new_bytes_transferred = (adapter->dmaq1.buffer_size - adapter->dmaq1.tail) + n_cur_dma_counter;
+ 	}
+ 
+-//  dprintk("%s: nCurDmaCounter   = %d\n" , __FUNCTION__, nCurDmaCounter);
+-//	dprintk("%s: dmaq1.tail       = %d\n" , __FUNCTION__, adapter->dmaq1.tail):
+-//  dprintk("%s: BytesTransferred = %d\n" , __FUNCTION__, nNumNewBytesTransferred);
++	ddprintk("%s: n_cur_dma_counter = %d\n", __FUNCTION__, n_cur_dma_counter);
++	ddprintk("%s: dmaq1.tail        = %d\n", __FUNCTION__, adapter->dmaq1.tail);
++	ddprintk("%s: bytes_transferred = %d\n", __FUNCTION__, n_num_new_bytes_transferred);
+ 
+-	if (nNumNewBytesTransferred < dwDefaultPacketSize)
++	if (n_num_new_bytes_transferred < dw_default_packet_size)
+ 		return;
+ 
+-	nNumBytesParsed = 0;
++	n_num_bytes_parsed = 0;
+ 
+-	while (nNumBytesParsed < nNumNewBytesTransferred) {
+-		pbDMABufCurPos = adapter->dmaq1.buffer + adapter->dmaq1.tail;
++	while (n_num_bytes_parsed < n_num_new_bytes_transferred) {
++		pb_dma_buf_cur_pos = adapter->dmaq1.buffer + adapter->dmaq1.tail;
+ 
+ 		if (adapter->dmaq1.buffer + adapter->dmaq1.buffer_size < adapter->dmaq1.buffer + adapter->dmaq1.tail + 188) {
+-			memcpy(gbTmpBuffer, adapter->dmaq1.buffer + adapter->dmaq1.tail, adapter->dmaq1.buffer_size - adapter->dmaq1.tail);
+-			memcpy(gbTmpBuffer + (adapter->dmaq1.buffer_size - adapter->dmaq1.tail), adapter->dmaq1.buffer, (188 - (adapter->dmaq1.buffer_size - adapter->dmaq1.tail)));
++			memcpy(gb_tmp_buffer, adapter->dmaq1.buffer + adapter->dmaq1.tail,
++			       adapter->dmaq1.buffer_size - adapter->dmaq1.tail);
++			memcpy(gb_tmp_buffer + (adapter->dmaq1.buffer_size - adapter->dmaq1.tail), adapter->dmaq1.buffer,
++			       (188 - (adapter->dmaq1.buffer_size - adapter->dmaq1.tail)));
+ 
+-			pbDMABufCurPos = gbTmpBuffer;
++			pb_dma_buf_cur_pos = gb_tmp_buffer;
+ 		}
+ 
+ 		if (adapter->capturing != 0) {
+-			u32 *dq = (u32 *) pbDMABufCurPos;
+-
+-			packet_header.sync_byte = *dq & 0x000000FF;
+-			packet_header.transport_error_indicator = *dq & 0x00008000;
+-			packet_header.payload_unit_start_indicator = *dq & 0x00004000;
+-			packet_header.transport_priority = *dq & 0x00002000;
+-			packet_header.pid = ((*dq & 0x00FF0000) >> 0x10) | (*dq & 0x00001F00);
+-			packet_header.transport_scrambling_control = *dq >> 0x1E;
+-			packet_header.adaptation_field_control = (*dq & 0x30000000) >> 0x1C;
+-			packet_header.continuity_counter = (*dq & 0x0F000000) >> 0x18;
+-
+-			if ((packet_header.sync_byte == 0x47) && (packet_header.transport_error_indicator == 0) && (packet_header.pid != 0x1FFF)) {
+-				if (CheckPID(adapter, packet_header.pid & 0x0000FFFF) != 0) {
+-					dvb_dmx_swfilter_packets(dvbdmx, pbDMABufCurPos, dwDefaultPacketSize / 188);
+-
+-				} else {
+-
+-//                  dprintk("%s: pid=%x\n", __FUNCTION__, packet_header.pid);
+-				}
+-			}
++			dvb_dmx_swfilter_packets(dvbdmx, pb_dma_buf_cur_pos, dw_default_packet_size / 188);
+ 		}
+ 
+-		nNumBytesParsed = nNumBytesParsed + dwDefaultPacketSize;
++		n_num_bytes_parsed = n_num_bytes_parsed + dw_default_packet_size;
+ 
+-		adapter->dmaq1.tail = adapter->dmaq1.tail + dwDefaultPacketSize;
++		adapter->dmaq1.tail = adapter->dmaq1.tail + dw_default_packet_size;
+ 
+ 		if (adapter->dmaq1.tail >= adapter->dmaq1.buffer_size)
+ 			adapter->dmaq1.tail = adapter->dmaq1.tail - adapter->dmaq1.buffer_size;
+ 	};
+ }
+ 
+-static void InterruptServiceDMA2(struct adapter *adapter)
++static void interrupt_service_dma2(struct adapter *adapter)
+ {
+ 	printk("%s:\n", __FUNCTION__);
+ }
+@@ -1901,28 +1651,28 @@ static irqreturn_t isr(int irq, void *de
+ 
+ 	u32 value;
+ 
+-//  dprintk("%s:\n", __FUNCTION__);
++	ddprintk("%s:\n", __FUNCTION__);
+ 
+ 	spin_lock_irq(&tmp->lock);
+ 
+-	if (0 == ((value = ReadRegDW(tmp, 0x20C)) & 0x0F)) {
++	if (0 == ((value = read_reg_dw(tmp, 0x20c)) & 0x0f)) {
+ 		spin_unlock_irq(&tmp->lock);
+ 		return IRQ_NONE;
+ 	}
+ 	
+ 	while (value != 0) {
+ 		if ((value & 0x03) != 0)
+-			InterruptServiceDMA1(tmp);
+-		if ((value & 0x0C) != 0)
+-			InterruptServiceDMA2(tmp);
+-		value = ReadRegDW(tmp, 0x20C) & 0x0F;
++			interrupt_service_dma1(tmp);
++		if ((value & 0x0c) != 0)
++			interrupt_service_dma2(tmp);
++		value = read_reg_dw(tmp, 0x20c) & 0x0f;
+ 	}
+ 
+ 	spin_unlock_irq(&tmp->lock);
+ 	return IRQ_HANDLED;
+ }
+ 
+-static void Initdmaqueue(struct adapter *adapter)
++static void init_dma_queue(struct adapter *adapter)
+ {
+ 	dma_addr_t dma_addr;
+ 
+@@ -1933,19 +1683,19 @@ static void Initdmaqueue(struct adapter 
+ 	adapter->dmaq1.tail = 0;
+ 	adapter->dmaq1.buffer = 0;
+ 
+-	adapter->dmaq1.buffer = pci_alloc_consistent(adapter->pdev, SizeOfBufDMA1 + 0x80, &dma_addr);
++	adapter->dmaq1.buffer = pci_alloc_consistent(adapter->pdev, SIZE_OF_BUF_DMA1 + 0x80, &dma_addr);
+ 
+ 	if (adapter->dmaq1.buffer != 0) {
+-		memset(adapter->dmaq1.buffer, 0, SizeOfBufDMA1);
++		memset(adapter->dmaq1.buffer, 0, SIZE_OF_BUF_DMA1);
+ 
+ 		adapter->dmaq1.bus_addr = dma_addr;
+-		adapter->dmaq1.buffer_size = SizeOfBufDMA1;
++		adapter->dmaq1.buffer_size = SIZE_OF_BUF_DMA1;
+ 
+-		DmaInitDMA(adapter, 0);
++		dma_init_dma(adapter, 0);
+ 
+ 		adapter->dma_status = adapter->dma_status | 0x10000000;
+ 
+-		dprintk("%s: allocated dma buffer at 0x%p, length=%d\n", __FUNCTION__, adapter->dmaq1.buffer, SizeOfBufDMA1);
++		ddprintk("%s: allocated dma buffer at 0x%p, length=%d\n", __FUNCTION__, adapter->dmaq1.buffer, SIZE_OF_BUF_DMA1);
+ 
+ 	} else {
+ 
+@@ -1959,19 +1709,19 @@ static void Initdmaqueue(struct adapter 
+ 	adapter->dmaq2.tail = 0;
+ 	adapter->dmaq2.buffer = 0;
+ 
+-	adapter->dmaq2.buffer = pci_alloc_consistent(adapter->pdev, SizeOfBufDMA2 + 0x80, &dma_addr);
++	adapter->dmaq2.buffer = pci_alloc_consistent(adapter->pdev, SIZE_OF_BUF_DMA2 + 0x80, &dma_addr);
+ 
+ 	if (adapter->dmaq2.buffer != 0) {
+-		memset(adapter->dmaq2.buffer, 0, SizeOfBufDMA2);
++		memset(adapter->dmaq2.buffer, 0, SIZE_OF_BUF_DMA2);
+ 
+ 		adapter->dmaq2.bus_addr = dma_addr;
+-		adapter->dmaq2.buffer_size = SizeOfBufDMA2;
++		adapter->dmaq2.buffer_size = SIZE_OF_BUF_DMA2;
+ 
+-		DmaInitDMA(adapter, 1);
++		dma_init_dma(adapter, 1);
+ 
+ 		adapter->dma_status = adapter->dma_status | 0x20000000;
+ 
+-		dprintk("%s: allocated dma buffer at 0x%p, length=%d\n", __FUNCTION__, adapter->dmaq2.buffer, (int) SizeOfBufDMA2);
++		ddprintk("%s: allocated dma buffer at 0x%p, length=%d\n", __FUNCTION__, adapter->dmaq2.buffer, (int) SIZE_OF_BUF_DMA2);
+ 
+ 	} else {
+ 
+@@ -1979,10 +1729,10 @@ static void Initdmaqueue(struct adapter 
+ 	}
+ }
+ 
+-static void Freedmaqueue(struct adapter *adapter)
++static void free_dma_queue(struct adapter *adapter)
+ {
+ 	if (adapter->dmaq1.buffer != 0) {
+-		pci_free_consistent(adapter->pdev, SizeOfBufDMA1 + 0x80, adapter->dmaq1.buffer, adapter->dmaq1.bus_addr);
++		pci_free_consistent(adapter->pdev, SIZE_OF_BUF_DMA1 + 0x80, adapter->dmaq1.buffer, adapter->dmaq1.bus_addr);
+ 
+ 		adapter->dmaq1.bus_addr = 0;
+ 		adapter->dmaq1.head = 0;
+@@ -1992,7 +1742,7 @@ static void Freedmaqueue(struct adapter 
+ 	}
+ 
+ 	if (adapter->dmaq2.buffer != 0) {
+-		pci_free_consistent(adapter->pdev, SizeOfBufDMA2 + 0x80, adapter->dmaq2.buffer, adapter->dmaq2.bus_addr);
++		pci_free_consistent(adapter->pdev, SIZE_OF_BUF_DMA2 + 0x80, adapter->dmaq2.buffer, adapter->dmaq2.bus_addr);
+ 
+ 		adapter->dmaq2.bus_addr = 0;
+ 		adapter->dmaq2.head = 0;
+@@ -2002,16 +1752,16 @@ static void Freedmaqueue(struct adapter 
+ 	}
+ }
+ 
+-static void FreeAdapterObject(struct adapter *adapter)
++static void free_adapter_object(struct adapter *adapter)
+ {
+ 	dprintk("%s:\n", __FUNCTION__);
+ 
+-	CloseStream(adapter, 0);
++	close_stream(adapter, 0);
+ 
+ 	if (adapter->irq != 0)
+ 		free_irq(adapter->irq, adapter);
+ 
+-	Freedmaqueue(adapter);
++	free_dma_queue(adapter);
+ 
+ 	if (adapter->io_mem != 0)
+ 		iounmap((void *) adapter->io_mem);
+@@ -2022,7 +1772,7 @@ static void FreeAdapterObject(struct ada
+ 
+ static struct pci_driver skystar2_pci_driver;
+ 
+-static int ClaimAdapter(struct adapter *adapter)
++static int claim_adapter(struct adapter *adapter)
+ {
+ 	struct pci_dev *pdev = adapter->pdev;
+ 
+@@ -2062,20 +1812,58 @@ static int ClaimAdapter(struct adapter *
+ }
+ 
+ /*
+-static int SLL_reset_FlexCOP(struct adapter *adapter)
++static int sll_reset_flexcop(struct adapter *adapter)
+ {
+-	WriteRegDW(adapter, 0x208, 0);
+-	WriteRegDW(adapter, 0x210, 0xB2FF);
++	write_reg_dw(adapter, 0x208, 0);
++	write_reg_dw(adapter, 0x210, 0xb2ff);
+ 
+ 	return 0;
+ }
+ */
+ 
+-static int DriverInitialize(struct pci_dev * pdev)
++static void decide_how_many_hw_filters(struct adapter *adapter)
++{
++	int hw_filters;
++	int mod_option_hw_filters;
++
++	// FlexCop IIb & III have 6+32 hw filters    
++	// FlexCop II has 6 hw filters, every other should have at least 6
++	switch (adapter->b2c2_revision) {
++	case 0x82:		/* II */
++		hw_filters = 6;
++		break;
++	case 0xc3:		/* IIB */
++		hw_filters = 6 + 32;
++		break;
++	case 0xc0:		/* III */
++		hw_filters = 6 + 32;
++		break;
++	default:
++		hw_filters = 6;
++		break;
++	}
++	printk("%s: the chip has %i hardware filters", __FILE__, hw_filters);
++
++	mod_option_hw_filters = 0;
++	if (enable_hw_filters >= 1)
++		mod_option_hw_filters += 6;
++	if (enable_hw_filters >= 2)
++		mod_option_hw_filters += 32;
++
++	if (mod_option_hw_filters >= hw_filters) {
++		adapter->useable_hw_filters = hw_filters;
++	} else {
++		adapter->useable_hw_filters = mod_option_hw_filters;
++		printk(", but only %d will be used because of module option", mod_option_hw_filters);
++	}
++	printk("\n");
++	dprintk("%s: useable_hardware_filters set to %i\n", __FILE__, adapter->useable_hw_filters);
++}
++
++static int driver_initialize(struct pci_dev *pdev)
+ {
+ 	struct adapter *adapter;
+ 	u32 tmp;
+-	u8 key[16];
+ 
+ 	if (!(adapter = kmalloc(sizeof(struct adapter), GFP_KERNEL))) {
+ 		dprintk("%s: out of memory!\n", __FUNCTION__);
+@@ -2090,113 +1878,114 @@ static int DriverInitialize(struct pci_d
+ 	adapter->pdev = pdev;
+ 	adapter->irq = pdev->irq;
+ 
+-	if ((ClaimAdapter(adapter)) != 1) {
+-		FreeAdapterObject(adapter);
++	if ((claim_adapter(adapter)) != 1) {
++		free_adapter_object(adapter);
+ 
+ 		return -ENODEV;
+ 	}
+ 
+-	IrqDmaEnableDisableIrq(adapter, 0);
++	irq_dma_enable_disable_irq(adapter, 0);
+ 
+ 	if (request_irq(pdev->irq, isr, 0x4000000, "Skystar2", adapter) != 0) {
+ 		dprintk("%s: unable to allocate irq=%d !\n", __FUNCTION__, pdev->irq);
+ 
+-		FreeAdapterObject(adapter);
++		free_adapter_object(adapter);
+ 
+ 		return -ENODEV;
+ 	}
+ 
+-	ReadRegDW(adapter, 0x208);
+-	WriteRegDW(adapter, 0x208, 0);
+-	WriteRegDW(adapter, 0x210, 0xB2FF);
+-	WriteRegDW(adapter, 0x208, 0x40);
+-
+-	InitPIDsInfo(adapter);
+-
+-	PidSetGroupPID(adapter, 0);
+-	PidSetGroupMASK(adapter, 0x1FE0);
+-	PidSetStream1PID(adapter, 0x1FFF);
+-	PidSetStream2PID(adapter, 0x1FFF);
+-	PidSetPmtPID(adapter, 0x1FFF);
+-	PidSetPcrPID(adapter, 0x1FFF);
+-	PidSetEcmPID(adapter, 0x1FFF);
+-	PidSetEmmPID(adapter, 0x1FFF);
++	read_reg_dw(adapter, 0x208);
++	write_reg_dw(adapter, 0x208, 0);
++	write_reg_dw(adapter, 0x210, 0xb2ff);
++	write_reg_dw(adapter, 0x208, 0x40);
+ 
+-	Initdmaqueue(adapter);
++	init_dma_queue(adapter);
+ 
+ 	if ((adapter->dma_status & 0x30000000) == 0) {
+-		FreeAdapterObject(adapter);
++		free_adapter_object(adapter);
+ 
+ 		return -ENODEV;
+ 	}
+ 
+-	adapter->b2c2_revision = (ReadRegDW(adapter, 0x204) >> 0x18);
+-
+-	if ((adapter->b2c2_revision != 0x82) && (adapter->b2c2_revision != 0xC3))
+-		if (adapter->b2c2_revision != 0x82) {
+-			dprintk("%s: The revision of the FlexCopII chip on your card is - %d\n", __FUNCTION__, adapter->b2c2_revision);
+-			dprintk("%s: This driver works now only with FlexCopII(rev.130) and FlexCopIIB(rev.195).\n", __FUNCTION__);
+-
+-			FreeAdapterObject(adapter);
++	adapter->b2c2_revision = (read_reg_dw(adapter, 0x204) >> 0x18);
+ 
++	switch (adapter->b2c2_revision) {
++	case 0x82:
++		printk("%s: FlexCopII(rev.130) chip found\n", __FILE__);
++		break;
++	case 0xc3:
++		printk("%s: FlexCopIIB(rev.195) chip found\n", __FILE__);
++		break;
++	case 0xc0:
++		printk("%s: FlexCopIII(rev.192) chip found\n", __FILE__);
++		break;
++	default:
++		printk("%s: The revision of the FlexCop chip on your card is %d\n", __FILE__, adapter->b2c2_revision);
++		printk("%s: This driver works only with FlexCopII(rev.130), FlexCopIIB(rev.195) and FlexCopIII(rev.192).\n", __FILE__);
++		free_adapter_object(adapter);
++		pci_set_drvdata(pdev, NULL);
++		release_region(pci_resource_start(pdev, 1), pci_resource_len(pdev, 1));
++		release_mem_region(pci_resource_start(pdev, 0), pci_resource_len(pdev, 0));
+ 			return -ENODEV;
+ 		}
+ 
+-	tmp = ReadRegDW(adapter, 0x204);
++	decide_how_many_hw_filters(adapter);
++
++	init_pids(adapter);
++
++	tmp = read_reg_dw(adapter, 0x204);
+ 
+-	WriteRegDW(adapter, 0x204, 0);
++	write_reg_dw(adapter, 0x204, 0);
+ 	mdelay(20);
+ 
+-	WriteRegDW(adapter, 0x204, tmp);
++	write_reg_dw(adapter, 0x204, tmp);
+ 	mdelay(10);
+ 
+-	tmp = ReadRegDW(adapter, 0x308);
+-	WriteRegDW(adapter, 0x308, 0x4000 | tmp);
++	tmp = read_reg_dw(adapter, 0x308);
++	write_reg_dw(adapter, 0x308, 0x4000 | tmp);
+ 
+-	adapter->dwSramType = 0x10000;
++	adapter->dw_sram_type = 0x10000;
+ 
+-	SLL_detectSramSize(adapter);
++	sll_detect_sram_size(adapter);
+ 
+-	dprintk("%s sram length = %d, sram type= %x\n", __FUNCTION__, SRAM_length(adapter), adapter->dwSramType);
++	dprintk("%s sram length = %d, sram type= %x\n", __FUNCTION__, sram_length(adapter), adapter->dw_sram_type);
+ 
+-	SRAMSetMediaDest(adapter, 1);
+-	SRAMSetNetDest(adapter, 1);
++	sram_set_media_dest(adapter, 1);
++	sram_set_net_dest(adapter, 1);
+ 
+-	CtrlEnableSmc(adapter, 0);
++	ctrl_enable_smc(adapter, 0);
+ 
+-	SRAMSetCaiDest(adapter, 2);
+-	SRAMSetCaoDest(adapter, 2);
++	sram_set_cai_dest(adapter, 2);
++	sram_set_cao_dest(adapter, 2);
+ 
+-	DmaEnableDisableIrq(adapter, 1, 0, 0);
++	dma_enable_disable_irq(adapter, 1, 0, 0);
+ 
+-	if (EEPROM_getMacAddr(adapter, 0, adapter->mac_addr) != 0) {
+-		printk("%s MAC address = %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x \n", __FUNCTION__, adapter->mac_addr[0], adapter->mac_addr[1], adapter->mac_addr[2], adapter->mac_addr[3], adapter->mac_addr[4], adapter->mac_addr[5], adapter->mac_addr[6], adapter->mac_addr[7]
++	if (eeprom_get_mac_addr(adapter, 0, adapter->mac_addr) != 0) {
++		printk("%s MAC address = %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x \n", __FUNCTION__, adapter->mac_addr[0],
++		       adapter->mac_addr[1], adapter->mac_addr[2], adapter->mac_addr[3], adapter->mac_addr[4], adapter->mac_addr[5],
++		       adapter->mac_addr[6], adapter->mac_addr[7]
+ 		    );
+ 
+-		CASetMacDstAddrFilter(adapter, adapter->mac_addr);
+-		CtrlEnableMAC(adapter, 1);
++		ca_set_mac_dst_addr_filter(adapter, adapter->mac_addr);
++		ctrl_enable_mac(adapter, 1);
+ 	}
+ 
+-	EEPROM_readKey(adapter, key, 16);
+-
+-	printk("%s key = \n %02x %02x %02x %02x \n %02x %02x %02x %02x \n %02x %02x %02x %02x \n %02x %02x %02x %02x \n", __FUNCTION__, key[0], key[1], key[2], key[3], key[4], key[5], key[6], key[7], key[8], key[9], key[10], key[11], key[12], key[13], key[14], key[15]);
+-
+ 	adapter->lock = SPIN_LOCK_UNLOCKED;
+ 
+ 	return 0;
+ }
+ 
+-static void DriverHalt(struct pci_dev *pdev)
++static void driver_halt(struct pci_dev *pdev)
+ {
+ 	struct adapter *adapter;
+ 
+ 	adapter = pci_get_drvdata(pdev);
+ 
+-	IrqDmaEnableDisableIrq(adapter, 0);
++	irq_dma_enable_disable_irq(adapter, 0);
+ 
+-	CtrlEnableReceiveData(adapter, 0);
++	ctrl_enable_receive_data(adapter, 0);
+ 
+-	FreeAdapterObject(adapter);
++	free_adapter_object(adapter);
+ 
+ 	pci_set_drvdata(pdev, NULL);
+ 
+@@ -2212,7 +2001,7 @@ static int dvb_start_feed(struct dvb_dem
+ 
+ 	dprintk("%s: PID=%d, type=%d\n", __FUNCTION__, dvbdmxfeed->pid, dvbdmxfeed->type);
+ 
+-	OpenStream(adapter, dvbdmxfeed->pid);
++	open_stream(adapter, dvbdmxfeed->pid);
+ 
+ 	return 0;
+ }
+@@ -2224,7 +2013,7 @@ static int dvb_stop_feed(struct dvb_demu
+ 
+ 	dprintk("%s: PID=%d, type=%d\n", __FUNCTION__, dvbdmxfeed->pid, dvbdmxfeed->type);
+ 
+-	CloseStream(adapter, dvbdmxfeed->pid);
++	close_stream(adapter, dvbdmxfeed->pid);
+ 
+ 	return 0;
+ }
+@@ -2232,23 +2021,23 @@ static int dvb_stop_feed(struct dvb_demu
+ /* lnb control */
+ static void set_tuner_tone(struct adapter *adapter, u8 tone)
+ {
+-	u16 wzHalfPeriodFor45MHz[] = { 0x01FF, 0x0154, 0x00FF, 0x00CC };
++	u16 wz_half_period_for_45_mhz[] = { 0x01ff, 0x0154, 0x00ff, 0x00cc };
+ 	u16 ax;
+ 
+ 	dprintk("%s: %u\n", __FUNCTION__, tone);
+ 
+ 	switch (tone) {
+ 	case 1:
+-		ax = wzHalfPeriodFor45MHz[0];
++		ax = wz_half_period_for_45_mhz[0];
+ 		break;
+ 	case 2:
+-		ax = wzHalfPeriodFor45MHz[1];
++		ax = wz_half_period_for_45_mhz[1];
+ 		break;
+ 	case 3:
+-		ax = wzHalfPeriodFor45MHz[2];
++		ax = wz_half_period_for_45_mhz[2];
+ 		break;
+ 	case 4:
+-		ax = wzHalfPeriodFor45MHz[3];
++		ax = wz_half_period_for_45_mhz[3];
+ 		break;
+ 
+ 	default:
+@@ -2256,11 +2045,11 @@ static void set_tuner_tone(struct adapte
+ 	}
+ 
+ 	if (ax != 0) {
+-		WriteRegDW(adapter, 0x200, ((ax << 0x0F) + (ax & 0x7FFF)) | 0x40000000);
++		write_reg_dw(adapter, 0x200, ((ax << 0x0f) + (ax & 0x7fff)) | 0x40000000);
+ 
+ 	} else {
+ 
+-		WriteRegDW(adapter, 0x200, 0x40FF8000);
++		write_reg_dw(adapter, 0x200, 0x40ff8000);
+ 	}
+ }
+ 
+@@ -2270,7 +2059,7 @@ static void set_tuner_polarity(struct ad
+ 
+ 	dprintk("%s : polarity = %u \n", __FUNCTION__, polarity);
+ 
+-	var = ReadRegDW(adapter, 0x204);
++	var = read_reg_dw(adapter, 0x204);
+ 
+ 	if (polarity == 0) {
+ 		dprintk("%s: LNB power off\n", __FUNCTION__);
+@@ -2287,82 +2076,150 @@ static void set_tuner_polarity(struct ad
+ 		var = var | 4;
+ 	}
+ 
+-	WriteRegDW(adapter, 0x204, var);
++	write_reg_dw(adapter, 0x204, var);
+ }
+ 
+-static int flexcop_diseqc_ioctl(struct dvb_frontend *fe, unsigned int cmd, void *arg)
++static void diseqc_send_bit(struct adapter *adapter, int data)
+ {
+-	struct adapter *adapter = fe->before_after_data;
++	set_tuner_tone(adapter, 1);
++	udelay(data ? 500 : 1000);
++	set_tuner_tone(adapter, 0);
++	udelay(data ? 1000 : 500);
++}
+ 
+-	switch (cmd) {
+-	case FE_SLEEP:
++
++static void diseqc_send_byte(struct adapter *adapter, int data)
+ 		{
+-			printk("%s: FE_SLEEP\n", __FUNCTION__);
++	int i, par = 1, d;
+ 
+-			set_tuner_polarity(adapter, 0);
++	for (i = 7; i >= 0; i--) {
++		d = (data >> i) & 1;
++		par ^= d;
++		diseqc_send_bit(adapter, d);
++	}
+ 
+-			// return -EOPNOTSUPP, to make DVB core also send "FE_SLEEP" command to frontend.
+-			return -EOPNOTSUPP;
++	diseqc_send_bit(adapter, par);
+ 		}
+ 
+-	case FE_SET_VOLTAGE:
+-		{
+-			dprintk("%s: FE_SET_VOLTAGE\n", __FUNCTION__);
+ 
+-			switch ((fe_sec_voltage_t) arg) {
+-			case SEC_VOLTAGE_13:
++static int send_diseqc_msg(struct adapter *adapter, int len, u8 *msg, unsigned long burst)
++{
++	int i;
+ 
+-				printk("%s: SEC_VOLTAGE_13, %x\n", __FUNCTION__, SEC_VOLTAGE_13);
++	set_tuner_tone(adapter, 0);
++	mdelay(16);
+ 
+-				set_tuner_polarity(adapter, 1);
++	for (i = 0; i < len; i++)
++		diseqc_send_byte(adapter, msg[i]);
+ 
+-				break;
++	mdelay(16);
+ 
+-			case SEC_VOLTAGE_18:
++	if (burst != -1) {
++		if (burst)
++			diseqc_send_byte(adapter, 0xff);
++		else {
++			set_tuner_tone(adapter, 1);
++			udelay(12500);
++			set_tuner_tone(adapter, 0);
++		}
++		dvb_delay(20);
++	}
+ 
+-				printk("%s: SEC_VOLTAGE_18, %x\n", __FUNCTION__, SEC_VOLTAGE_18);
++	return 0;
++}
+ 
+-				set_tuner_polarity(adapter, 2);
+ 
++int soft_diseqc(struct adapter *adapter, unsigned int cmd, void *arg)
++{
++	switch (cmd) {
++	case FE_SET_TONE:
++		switch ((fe_sec_tone_mode_t) arg) {
++		case SEC_TONE_ON:
++			set_tuner_tone(adapter, 1);
++			break;
++		case SEC_TONE_OFF:
++			set_tuner_tone(adapter, 0);
+ 				break;
+-
+ 			default:
+-
+ 				return -EINVAL;
+ 			};
++		break;
+ 
++	case FE_DISEQC_SEND_MASTER_CMD:
++		{
++			struct dvb_diseqc_master_cmd *cmd = arg;
++
++			send_diseqc_msg(adapter, cmd->msg_len, cmd->msg, 0);
+ 			break;
+ 		}
+ 
+-	case FE_SET_TONE:
++	case FE_DISEQC_SEND_BURST:
++		send_diseqc_msg(adapter, 0, NULL, (unsigned long) arg);
++		break;
++
++	default:
++		return -EOPNOTSUPP;
++	};
++
++	return 0;
++}
++
++static int flexcop_diseqc_ioctl(struct dvb_frontend *fe, unsigned int cmd, void *arg)
+ 		{
+-			dprintk("%s: FE_SET_TONE\n", __FUNCTION__);
++	struct adapter *adapter = fe->before_after_data;
+ 
+-			switch ((fe_sec_tone_mode_t) arg) {
+-			case SEC_TONE_ON:
++	struct dvb_frontend_info info;
+ 
+-				printk("%s: SEC_TONE_ON, %x\n", __FUNCTION__, SEC_TONE_ON);
++	fe->ioctl(fe, FE_GET_INFO, &info);
+ 
+-				set_tuner_tone(adapter, 1);
++	// we must use different DiSEqC hw
+ 
+-				break;
++	if (strcmp(info.name, "Zarlink MT312") == 0) {
++		//VP310 using mt312 driver for tuning only: diseqc not wired
++		//use FCII instead
++		if (!soft_diseqc(adapter, cmd, arg))
++			return 0;
++	}
+ 
+-			case SEC_TONE_OFF:
++	switch (cmd) {
++	case FE_SLEEP:
++		{
++			dprintk("%s: FE_SLEEP\n", __FUNCTION__);
+ 
+-				printk("%s: SEC_TONE_OFF, %x\n", __FUNCTION__, SEC_TONE_OFF);
++			set_tuner_polarity(adapter, 0);
+ 
+-				set_tuner_tone(adapter, 0);
++			// return -EOPNOTSUPP, to make DVB core also send "FE_SLEEP" command to frontend.
++			return -EOPNOTSUPP;
++		}
+ 
+-				break;
++	case FE_SET_VOLTAGE:
++		{
++			dprintk("%s: FE_SET_VOLTAGE\n", __FUNCTION__);
++
++			switch ((fe_sec_voltage_t) arg) {
++			case SEC_VOLTAGE_13:
++
++				dprintk("%s: SEC_VOLTAGE_13, %x\n", __FUNCTION__, SEC_VOLTAGE_13);
++
++				set_tuner_polarity(adapter, 1);
++
++				return 0;
++
++			case SEC_VOLTAGE_18:
++
++				dprintk("%s: SEC_VOLTAGE_18, %x\n", __FUNCTION__, SEC_VOLTAGE_18);
++
++				set_tuner_polarity(adapter, 2);
++
++				return 0;
+ 
+ 			default:
+ 
+ 				return -EINVAL;
+ 			};
+-
+-			break;
+ 		}
+ 
++
+ 	default:
+ 
+ 		return -EOPNOTSUPP;
+@@ -2382,7 +2239,7 @@ static int skystar2_probe(struct pci_dev
+ 	if (pdev == NULL)
+ 		return -ENODEV;
+ 
+-	if (DriverInitialize(pdev) != 0)
++	if (driver_initialize(pdev) != 0)
+ 		return -ENODEV;
+ 
+ 	dvb_register_adapter(&dvb_adapter, skystar2_pci_driver.name);
+@@ -2390,7 +2247,7 @@ static int skystar2_probe(struct pci_dev
+ 	if (dvb_adapter == NULL) {
+ 		printk("%s: Error registering DVB adapter\n", __FUNCTION__);
+ 
+-		DriverHalt(pdev);
++		driver_halt(pdev);
+ 
+ 		return -ENODEV;
+ 	}
+@@ -2411,8 +2268,8 @@ static int skystar2_probe(struct pci_dev
+ 	dvbdemux = &adapter->demux;
+ 
+ 	dvbdemux->priv = (void *) adapter;
+-	dvbdemux->filternum = 32;
+-	dvbdemux->feednum = 32;
++	dvbdemux->filternum = N_PID_SLOTS;
++	dvbdemux->feednum = N_PID_SLOTS;
+ 	dvbdemux->start_feed = dvb_start_feed;
+ 	dvbdemux->stop_feed = dvb_stop_feed;
+ 	dvbdemux->write_to_decoder = 0;
+@@ -2422,7 +2279,7 @@ static int skystar2_probe(struct pci_dev
+ 
+ 	adapter->hw_frontend.source = DMX_FRONTEND_0;
+ 
+-	adapter->dmxdev.filternum = 32;
++	adapter->dmxdev.filternum = N_PID_SLOTS;
+ 	adapter->dmxdev.demux = &dvbdemux->dmx;
+ 	adapter->dmxdev.capabilities = 0;
+ 
+@@ -2475,13 +2332,13 @@ static void skystar2_remove(struct pci_d
+ 
+ 			dvb_unregister_adapter(adapter->dvb_adapter);
+ 		}
+-
+-		DriverHalt(pdev);
++		driver_halt(pdev);
+ 	}
+ }
+ 
+ static struct pci_device_id skystar2_pci_tbl[] = {
+-	{0x000013D0, 0x00002103, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000},
++	{0x000013d0, 0x00002103, 0xffffffff, 0xffffffff, 0x00000000, 0x00000000, 0x00000000},
++	{0x000013d0, 0x00002200, 0xffffffff, 0xffffffff, 0x00000000, 0x00000000, 0x00000000},	//FCIII
+ 	{0,},
+ };
+ 
+@@ -2505,5 +2362,10 @@ static void skystar2_cleanup(void)
+ module_init(skystar2_init);
+ module_exit(skystar2_cleanup);
+ 
++MODULE_PARM(debug, "i");
++MODULE_PARM_DESC(debug, "enable verbose debug messages: supported values: 1 and 2");
++MODULE_PARM(enable_hw_filters, "i");
++MODULE_PARM_DESC(enable_hw_filters, "enable hardware filters: supported values: 0 (none), 1, 2");
++
+ MODULE_DESCRIPTION("Technisat SkyStar2 DVB PCI Driver");
+ MODULE_LICENSE("GPL");
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/media/dvb/bt8xx/bt878.c	2003-12-28 23:22:40.000000000 -0800
+@@ -0,0 +1,614 @@
++/*
++ * bt878.c: part of the driver for the Pinnacle PCTV Sat DVB PCI card
++ *
++ * Copyright (C) 2002 Peter Hettkamp <peter.hettkamp@t-online.de>
++ *
++ * large parts based on the bttv driver
++ * Copyright (C) 1996,97,98 Ralph  Metzler (rjkm@thp.uni-koeln.de)
++ *                        & Marcus Metzler (mocm@thp.uni-koeln.de)
++ * (c) 1999,2000 Gerd Knorr <kraxel@goldbach.in-berlin.de>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ * 
++
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ * 
++
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
++ * 
++ */
++
++#include <linux/version.h>
++#include <linux/module.h>
++#include <linux/kernel.h>
++#include <linux/pci.h>
++#include <asm/io.h>
++#include <linux/ioport.h>
++#include <asm/pgtable.h>
++#include <asm/page.h>
++#include <linux/types.h>
++#include <linux/interrupt.h>
++#include <linux/kmod.h>
++#include <linux/vmalloc.h>
++#include <linux/init.h>
++
++#include "dmxdev.h"
++#include "dvbdev.h"
++#include "bt878.h"
++#include "dst-bt878.h"
++
++#include "dvb_functions.h"
++
++/**************************************/
++/* Miscellaneous utility  definitions */
++/**************************************/
++
++unsigned int bt878_verbose = 1;
++unsigned int bt878_debug = 0;
++MODULE_PARM(bt878_verbose, "i");
++MODULE_PARM_DESC(bt878_verbose,
++		 "verbose startup messages, default is 1 (yes)");
++MODULE_PARM(bt878_debug, "i");
++MODULE_PARM_DESC(bt878_debug, "debug messages, default is 0 (no)");
++MODULE_LICENSE("GPL");
++
++int bt878_num;
++struct bt878 bt878[BT878_MAX];
++
++EXPORT_SYMBOL(bt878_debug);
++EXPORT_SYMBOL(bt878_verbose);
++EXPORT_SYMBOL(bt878_num);
++EXPORT_SYMBOL(bt878);
++
++#define btwrite(dat,adr)    bmtwrite((dat), (bt->bt878_mem+(adr)))
++#define btread(adr)         bmtread(bt->bt878_mem+(adr))
++
++#define btand(dat,adr)      btwrite((dat) & btread(adr), adr)
++#define btor(dat,adr)       btwrite((dat) | btread(adr), adr)
++#define btaor(dat,mask,adr) btwrite((dat) | ((mask) & btread(adr)), adr)
++
++#if defined(dprintk)
++#undef dprintk
++#endif
++#define dprintk if(bt878_debug) printk
++
++static void bt878_mem_free(struct bt878 *bt)
++{
++	if (bt->buf_cpu) {
++		pci_free_consistent(bt->dev, bt->buf_size, bt->buf_cpu,
++				    bt->buf_dma);
++		bt->buf_cpu = NULL;
++	}
++
++	if (bt->risc_cpu) {
++		pci_free_consistent(bt->dev, bt->risc_size, bt->risc_cpu,
++				    bt->risc_dma);
++		bt->risc_cpu = NULL;
++	}
++}
++
++static int bt878_mem_alloc(struct bt878 *bt)
++{
++	if (!bt->buf_cpu) {
++		bt->buf_size = 128 * 1024;
++
++		bt->buf_cpu =
++		    pci_alloc_consistent(bt->dev, bt->buf_size,
++					 &bt->buf_dma);
++
++		if (!bt->buf_cpu)
++			return -ENOMEM;
++
++		memset(bt->buf_cpu, 0, bt->buf_size);
++	}
++
++	if (!bt->risc_cpu) {
++		bt->risc_size = PAGE_SIZE;
++		bt->risc_cpu =
++		    pci_alloc_consistent(bt->dev, bt->risc_size,
++					 &bt->risc_dma);
++
++		if (!bt->risc_cpu) {
++			bt878_mem_free(bt);
++			return -ENOMEM;
++		}
++
++		memset(bt->risc_cpu, 0, bt->risc_size);
++	}
++
++	return 0;
++}
++
++/* RISC instructions */
++#define RISC_WRITE        	(0x01 << 28)
++#define RISC_JUMP         	(0x07 << 28)
++#define RISC_SYNC         	(0x08 << 28)
++
++/* RISC bits */
++#define RISC_WR_SOL       	(1 << 27)
++#define RISC_WR_EOL       	(1 << 26)
++#define RISC_IRQ          	(1 << 24)
++#define RISC_STATUS(status)	((((~status) & 0x0F) << 20) | ((status & 0x0F) << 16))
++#define RISC_SYNC_RESYNC  	(1 << 15)
++#define RISC_SYNC_FM1     	0x06
++#define RISC_SYNC_VRO     	0x0C
++
++#define RISC_FLUSH()		bt->risc_pos = 0
++#define RISC_INSTR(instr) 	bt->risc_cpu[bt->risc_pos++] = cpu_to_le32(instr)
++
++static int bt878_make_risc(struct bt878 *bt)
++{
++	bt->block_bytes = bt->buf_size >> 4;
++	bt->block_count = 1 << 4;
++	bt->line_bytes = bt->block_bytes;
++	bt->line_count = bt->block_count;
++
++	while (bt->line_bytes > 4095) {
++		bt->line_bytes >>= 1;
++		bt->line_count <<= 1;
++	}
++
++	if (bt->line_count > 255) {
++		printk("bt878: buffer size error!\n");
++		return -EINVAL;
++	}
++	return 0;
++}
++
++
++static void bt878_risc_program(struct bt878 *bt, u32 op_sync_orin)
++{
++	u32 buf_pos = 0;
++	u32 line;
++
++	RISC_FLUSH();
++	RISC_INSTR(RISC_SYNC | RISC_SYNC_FM1 | op_sync_orin);
++	RISC_INSTR(0);
++
++	dprintk("bt878: risc len lines %u, bytes per line %u\n", 
++			bt->line_count, bt->line_bytes);
++	for (line = 0; line < bt->line_count; line++) {
++		// At the beginning of every block we issue an IRQ with previous (finished) block number set
++		if (!(buf_pos % bt->block_bytes))
++			RISC_INSTR(RISC_WRITE | RISC_WR_SOL | RISC_WR_EOL |
++				   RISC_IRQ |
++				   RISC_STATUS(((buf_pos /
++						 bt->block_bytes) +
++						(bt->block_count -
++						 1)) %
++					       bt->block_count) | bt->
++				   line_bytes);
++		else
++			RISC_INSTR(RISC_WRITE | RISC_WR_SOL | RISC_WR_EOL |
++				   bt->line_bytes);
++		RISC_INSTR(bt->buf_dma + buf_pos);
++		buf_pos += bt->line_bytes;
++	}
++
++	RISC_INSTR(RISC_SYNC | op_sync_orin | RISC_SYNC_VRO);
++	RISC_INSTR(0);
++
++	RISC_INSTR(RISC_JUMP);
++	RISC_INSTR(bt->risc_dma);
++
++	btwrite((bt->line_count << 16) | bt->line_bytes, BT878_APACK_LEN);
++}
++
++/*****************************/
++/* Start/Stop grabbing funcs */
++/*****************************/
++
++void bt878_start(struct bt878 *bt, u32 controlreg, u32 op_sync_orin,
++		u32 irq_err_ignore)
++{
++	u32 int_mask;
++
++	dprintk("bt878 debug: bt878_start (ctl=%8.8x)\n", controlreg);
++	/* complete the writing of the risc dma program now we have
++	 * the card specifics
++	 */
++	bt878_risc_program(bt, op_sync_orin);
++	controlreg &= ~0x1f;
++	controlreg |= 0x1b;
++
++	btwrite(cpu_to_le32(bt->risc_dma), BT878_ARISC_START);
++
++	/* original int mask had :
++	 *    6    2    8    4    0
++	 * 1111 1111 1000 0000 0000
++	 * SCERR|OCERR|PABORT|RIPERR|FDSR|FTRGT|FBUS|RISCI
++	 * Hacked for DST to:
++	 * SCERR | OCERR | FDSR | FTRGT | FBUS | RISCI
++	 */
++	int_mask = BT878_ASCERR | BT878_AOCERR | BT878_APABORT | 
++		BT878_ARIPERR | BT878_APPERR | BT878_AFDSR | BT878_AFTRGT | 
++		BT878_AFBUS | BT878_ARISCI;
++
++
++	/* ignore pesky bits */
++	int_mask &= ~irq_err_ignore;
++	
++	btwrite(int_mask, BT878_AINT_MASK);
++	btwrite(controlreg, BT878_AGPIO_DMA_CTL);
++}
++
++void bt878_stop(struct bt878 *bt)
++{
++	u32 stat;
++	int i = 0;
++
++	dprintk("bt878 debug: bt878_stop\n");
++
++	btwrite(0, BT878_AINT_MASK);
++	btand(~0x13, BT878_AGPIO_DMA_CTL);
++
++	do {
++		stat = btread(BT878_AINT_STAT);
++		if (!(stat & BT878_ARISC_EN))
++			break;
++		i++;
++	} while (i < 500);
++
++	dprintk("bt878(%d) debug: bt878_stop, i=%d, stat=0x%8.8x\n",
++		bt->nr, i, stat);
++}
++
++EXPORT_SYMBOL(bt878_start);
++EXPORT_SYMBOL(bt878_stop);
++
++/*****************************/
++/* Interrupt service routine */
++/*****************************/
++
++static irqreturn_t bt878_irq(int irq, void *dev_id, struct pt_regs *regs)
++{
++	u32 stat, astat, mask;
++	int count;
++	struct bt878 *bt;
++
++	bt = (struct bt878 *) dev_id;
++
++	count = 0;
++	while (1) {
++		stat = btread(BT878_AINT_STAT);
++		mask = btread(BT878_AINT_MASK);
++		if (!(astat = (stat & mask)))
++			return IRQ_NONE;	/* this interrupt is not for me */
++/*		dprintk("bt878(%d) debug: irq count %d, stat 0x%8.8x, mask 0x%8.8x\n",bt->nr,count,stat,mask); */
++		btwrite(astat, BT878_AINT_STAT);	/* try to clear interupt condition */
++
++
++		if (astat & (BT878_ASCERR | BT878_AOCERR)) {
++			if (bt878_verbose) {
++				printk("bt878(%d): irq%s%s risc_pc=%08x\n",
++				       bt->nr,
++				       (astat & BT878_ASCERR) ? " SCERR" :
++				       "",
++				       (astat & BT878_AOCERR) ? " OCERR" :
++				       "", btread(BT878_ARISC_PC));
++			}
++		}
++		if (astat & (BT878_APABORT | BT878_ARIPERR | BT878_APPERR)) {
++			if (bt878_verbose) {
++				printk
++				    ("bt878(%d): irq%s%s%s risc_pc=%08x\n",
++				     bt->nr,
++				     (astat & BT878_APABORT) ? " PABORT" :
++				     "",
++				     (astat & BT878_ARIPERR) ? " RIPERR" :
++				     "",
++				     (astat & BT878_APPERR) ? " PPERR" :
++				     "", btread(BT878_ARISC_PC));
++			}
++		}
++		if (astat & (BT878_AFDSR | BT878_AFTRGT | BT878_AFBUS)) {
++			if (bt878_verbose) {
++				printk
++				    ("bt878(%d): irq%s%s%s risc_pc=%08x\n",
++				     bt->nr,
++				     (astat & BT878_AFDSR) ? " FDSR" : "",
++				     (astat & BT878_AFTRGT) ? " FTRGT" :
++				     "",
++				     (astat & BT878_AFBUS) ? " FBUS" : "",
++				     btread(BT878_ARISC_PC));
++			}
++		}
++		if (astat & BT878_ARISCI) {
++			bt->finished_block = (stat & BT878_ARISCS) >> 28;
++			tasklet_schedule(&bt->tasklet);
++			break;
++		}
++		count++;
++		if (count > 20) {
++			btwrite(0, BT878_AINT_MASK);
++			printk(KERN_ERR
++			       "bt878(%d): IRQ lockup, cleared int mask\n",
++			       bt->nr);
++			break;
++		}
++	}
++	return IRQ_HANDLED;
++}
++
++extern int bttv_gpio_enable(unsigned int card, unsigned long mask, unsigned long data);
++extern int bttv_read_gpio(unsigned int card, unsigned long *data);
++extern int bttv_write_gpio(unsigned int card, unsigned long mask, unsigned long data);
++
++int
++bt878_device_control(struct bt878 *bt, unsigned int cmd, union dst_gpio_packet *mp)
++{
++	int retval;
++
++	retval = 0;
++	if (down_interruptible (&bt->gpio_lock))
++		return -ERESTARTSYS;
++	/* special gpio signal */
++	switch (cmd) {
++	    case DST_IG_ENABLE:
++		// dprintk("dvb_bt8xx: dst enable mask 0x%02x enb 0x%02x \n", mp->dstg.enb.mask, mp->dstg.enb.enable);
++		retval = bttv_gpio_enable(bt->bttv_nr,
++				mp->enb.mask,
++				mp->enb.enable);
++		break;
++	    case DST_IG_WRITE:
++		// dprintk("dvb_bt8xx: dst write gpio mask 0x%02x out 0x%02x\n", mp->dstg.outp.mask, mp->dstg.outp.highvals);
++		retval = bttv_write_gpio(bt->bttv_nr,
++				mp->outp.mask,
++				mp->outp.highvals);
++
++		break;
++	    case DST_IG_READ:
++		/* read */
++		retval =  bttv_read_gpio(bt->bttv_nr, &mp->rd.value);
++		// dprintk("dvb_bt8xx: dst read gpio 0x%02x\n", (unsigned)mp->dstg.rd.value);
++		break;
++	    case DST_IG_TS:
++		/* Set packet size */
++		bt->TS_Size = mp->psize;
++		break;
++
++	    default:
++		retval = -EINVAL;
++		break;
++	}
++	up(&bt->gpio_lock);
++	return retval;
++}
++
++EXPORT_SYMBOL(bt878_device_control);
++
++struct bt878 *bt878_find_by_dvb_adap(struct dvb_adapter *adap)
++{
++	unsigned int card_nr;
++	
++	printk("bt878 find by dvb adap: checking \"%s\"\n",adap->name);
++	for (card_nr = 0; card_nr < bt878_num; card_nr++) {
++		if (bt878[card_nr].adap_ptr == adap)
++			return &bt878[card_nr];
++	}
++	printk("bt878 find by dvb adap: NOT found \"%s\"\n",adap->name);
++	return NULL;
++}
++
++EXPORT_SYMBOL(bt878_find_by_dvb_adap);
++
++/***********************/
++/* PCI device handling */
++/***********************/
++
++static int __devinit bt878_probe(struct pci_dev *dev,
++				 const struct pci_device_id *pci_id)
++{
++	int result;
++	unsigned char lat;
++	struct bt878 *bt;
++#if defined(__powerpc__)
++	unsigned int cmd;
++#endif
++
++	printk(KERN_INFO "bt878: Bt878 AUDIO function found (%d).\n",
++	       bt878_num);
++
++	bt = &bt878[bt878_num];
++	bt->dev = dev;
++	bt->nr = bt878_num;
++	bt->shutdown = 0;
++
++	bt->id = dev->device;
++	bt->irq = dev->irq;
++	bt->bt878_adr = pci_resource_start(dev, 0);
++	if (pci_enable_device(dev))
++		return -EIO;
++	if (!request_mem_region(pci_resource_start(dev, 0),
++				pci_resource_len(dev, 0), "bt878")) {
++		return -EBUSY;
++	}
++
++	pci_read_config_byte(dev, PCI_CLASS_REVISION, &bt->revision);
++	pci_read_config_byte(dev, PCI_LATENCY_TIMER, &lat);
++	printk(KERN_INFO "bt878(%d): Bt%x (rev %d) at %02x:%02x.%x, ",
++	       bt878_num, bt->id, bt->revision, dev->bus->number,
++	       PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn));
++	printk("irq: %d, latency: %d, memory: 0x%lx\n",
++	       bt->irq, lat, bt->bt878_adr);
++
++
++#if defined(__powerpc__)
++	/* on OpenFirmware machines (PowerMac at least), PCI memory cycle */
++	/* response on cards with no firmware is not enabled by OF */
++	pci_read_config_dword(dev, PCI_COMMAND, &cmd);
++	cmd = (cmd | PCI_COMMAND_MEMORY);
++	pci_write_config_dword(dev, PCI_COMMAND, cmd);
++#endif
++
++#ifdef __sparc__
++	bt->bt878_mem = (unsigned char *) bt->bt878_adr;
++#else
++	bt->bt878_mem = ioremap(bt->bt878_adr, 0x1000);
++#endif
++
++	/* clear interrupt mask */
++	btwrite(0, BT848_INT_MASK);
++
++	result = request_irq(bt->irq, bt878_irq,
++			     SA_SHIRQ | SA_INTERRUPT, "bt878",
++			     (void *) bt);
++	if (result == -EINVAL) {
++		printk(KERN_ERR "bt878(%d): Bad irq number or handler\n",
++		       bt878_num);
++		goto fail1;
++	}
++	if (result == -EBUSY) {
++		printk(KERN_ERR
++		       "bt878(%d): IRQ %d busy, change your PnP config in BIOS\n",
++		       bt878_num, bt->irq);
++		goto fail1;
++	}
++	if (result < 0)
++		goto fail1;
++
++	pci_set_master(dev);
++	pci_set_drvdata(dev, bt);
++
++/*        if(init_bt878(btv) < 0) {
++                bt878_remove(dev);
++                return -EIO;
++        }
++*/
++
++	if ((result = bt878_mem_alloc(bt))) {
++		printk("bt878: failed to allocate memory!\n");
++		goto fail2;
++	}
++
++	bt878_make_risc(bt);
++	btwrite(0, BT878_AINT_MASK);
++	bt878_num++;
++
++	return 0;
++
++      fail2:
++	free_irq(bt->irq, bt);
++      fail1:
++	release_mem_region(pci_resource_start(bt->dev, 0),
++			   pci_resource_len(bt->dev, 0));
++	return result;
++}
++
++static void __devexit bt878_remove(struct pci_dev *pci_dev)
++{
++	u8 command;
++	struct bt878 *bt = pci_get_drvdata(pci_dev);
++
++	if (bt878_verbose)
++		printk("bt878(%d): unloading\n", bt->nr);
++
++	/* turn off all capturing, DMA and IRQs */
++	btand(~13, BT878_AGPIO_DMA_CTL);
++
++	/* first disable interrupts before unmapping the memory! */
++	btwrite(0, BT878_AINT_MASK);
++	btwrite(~0x0UL, BT878_AINT_STAT);
++
++	/* disable PCI bus-mastering */
++	pci_read_config_byte(bt->dev, PCI_COMMAND, &command);
++	/* Should this be &=~ ?? */
++	command &= ~PCI_COMMAND_MASTER;
++	pci_write_config_byte(bt->dev, PCI_COMMAND, command);
++
++	free_irq(bt->irq, bt);
++	printk(KERN_DEBUG "bt878_mem: 0x%p.\n", bt->bt878_mem);
++	if (bt->bt878_mem)
++		iounmap(bt->bt878_mem);
++
++	release_mem_region(pci_resource_start(bt->dev, 0),
++			   pci_resource_len(bt->dev, 0));
++	/* wake up any waiting processes
++	   because shutdown flag is set, no new processes (in this queue)
++	   are expected
++	 */
++	bt->shutdown = 1;
++	bt878_mem_free(bt);
++
++	pci_set_drvdata(pci_dev, NULL);
++	return;
++}
++
++static struct pci_device_id bt878_pci_tbl[] __devinitdata = {
++	{PCI_VENDOR_ID_BROOKTREE, PCI_DEVICE_ID_BROOKTREE_878,
++	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
++	{0,}
++};
++
++MODULE_DEVICE_TABLE(pci, bt878_pci_tbl);
++
++static struct pci_driver bt878_pci_driver = {
++      .name 	= "bt878",
++      .id_table = bt878_pci_tbl,
++      .probe 	= bt878_probe,
++      .remove 	= bt878_remove,
++};
++
++static int bt878_pci_driver_registered = 0;
++
++/* This will be used later by dvb-bt8xx to only use the audio
++ * dma of certain cards */
++int bt878_find_audio_dma(void)
++{
++	// pci_register_driver(&bt878_pci_driver);
++	bt878_pci_driver_registered = 1;
++	return 0;
++}
++
++EXPORT_SYMBOL(bt878_find_audio_dma);
++
++/*******************************/
++/* Module management functions */
++/*******************************/
++
++int bt878_init_module(void)
++{
++	bt878_num = 0;
++	bt878_pci_driver_registered = 0;
++
++	printk(KERN_INFO "bt878: AUDIO driver version %d.%d.%d loaded\n",
++	       (BT878_VERSION_CODE >> 16) & 0xff,
++	       (BT878_VERSION_CODE >> 8) & 0xff,
++	       BT878_VERSION_CODE & 0xff);
++/*
++        bt878_check_chipset();
++*/
++	/* later we register inside of bt878_find_audio_dma
++	 * because we may want to ignore certain cards */
++	bt878_pci_driver_registered = 1;
++	return pci_module_init(&bt878_pci_driver);
++}
++
++void bt878_cleanup_module(void)
++{
++	if (bt878_pci_driver_registered) {
++		bt878_pci_driver_registered = 0;
++		pci_unregister_driver(&bt878_pci_driver);
++	}
++	return;
++}
++
++EXPORT_SYMBOL(bt878_init_module);
++EXPORT_SYMBOL(bt878_cleanup_module);
++module_init(bt878_init_module);
++module_exit(bt878_cleanup_module);
++
++/*
++ * Local variables:
++ * c-basic-offset: 8
++ * End:
++ */
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/media/dvb/bt8xx/bt878.h	2003-12-28 23:22:37.000000000 -0800
+@@ -0,0 +1,145 @@
++/* 
++    bt878.h - Bt878 audio module (register offsets)
++
++    Copyright (C) 2002 Peter Hettkamp <peter.hettkamp@t-online.de>
++
++    This program is free software; you can redistribute it and/or modify
++    it under the terms of the GNU General Public License as published by
++    the Free Software Foundation; either version 2 of the License, or
++    (at your option) any later version.
++
++    This program is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++    GNU General Public License for more details.
++
++    You should have received a copy of the GNU General Public License
++    along with this program; if not, write to the Free Software
++    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++*/
++
++#ifndef _BT878_H_
++#define _BT878_H_
++
++#include <linux/interrupt.h>
++#include <linux/pci.h>
++#include <linux/sched.h>
++#include <linux/spinlock.h>
++#include "bt848.h"
++
++#define BT878_VERSION_CODE 0x000000
++
++#define BT878_AINT_STAT		0x100
++#define BT878_ARISCS		(0xf<<28)
++#define BT878_ARISC_EN		(1<<27)
++#define BT878_ASCERR		(1<<19)
++#define BT878_AOCERR		(1<<18)
++#define BT878_APABORT		(1<<17)
++#define BT878_ARIPERR		(1<<16)
++#define BT878_APPERR		(1<<15)
++#define BT878_AFDSR		(1<<14)
++#define BT878_AFTRGT		(1<<13)
++#define BT878_AFBUS		(1<<12)
++#define BT878_ARISCI		(1<<11)
++#define BT878_AOFLOW		(1<<3)
++
++#define BT878_AINT_MASK		0x104
++
++#define BT878_AGPIO_DMA_CTL	0x10c
++#define BT878_A_GAIN		(0xf<<28)
++#define BT878_A_G2X		(1<<27)
++#define BT878_A_PWRDN		(1<<26)
++#define BT878_A_SEL		(3<<24)
++#define BT878_DA_SCE		(1<<23)
++#define BT878_DA_LRI		(1<<22)
++#define BT878_DA_MLB		(1<<21)
++#define BT878_DA_LRD		(0x1f<<16)
++#define BT878_DA_DPM		(1<<15)
++#define BT878_DA_SBR		(1<<14)
++#define BT878_DA_ES2		(1<<13)
++#define BT878_DA_LMT		(1<<12)
++#define BT878_DA_SDR		(0xf<<8)
++#define BT878_DA_IOM		(3<<6)
++#define BT878_DA_APP		(1<<5)
++#define BT878_ACAP_EN		(1<<4)
++#define BT878_PKTP		(3<<2)
++#define BT878_RISC_EN		(1<<1)
++#define BT878_FIFO_EN		1
++
++#define BT878_APACK_LEN		0x110
++#define BT878_AFP_LEN		(0xff<<16)
++#define BT878_ALP_LEN		0xfff
++
++#define BT878_ARISC_START	0x114
++
++#define BT878_ARISC_PC		0x120
++
++/* BT878 FUNCTION 0 REGISTERS */
++#define BT878_GPIO_DMA_CTL	0x10c
++
++/* Interrupt register */
++#define BT878_INT_STAT		0x100
++#define BT878_INT_MASK		0x104
++#define BT878_I2CRACK		(1<<25)
++#define BT878_I2CDONE		(1<<8)
++
++#define BT878_MAX 4
++
++#define BT878_RISC_SYNC_MASK	(1 << 15)
++
++extern int bt878_num;
++extern struct bt878 bt878[BT878_MAX];
++
++struct bt878 {
++	struct semaphore  gpio_lock;
++	unsigned int nr;
++	unsigned int bttv_nr;
++	struct dvb_adapter *adap_ptr;
++	struct pci_dev *dev;
++	unsigned int id;
++	unsigned int TS_Size;
++	unsigned char revision;
++	unsigned int irq;
++	unsigned long bt878_adr;
++	unsigned char *bt878_mem; /* function 1 */
++
++	volatile u32 finished_block;
++	volatile u32 last_block;
++	u32 block_count;
++	u32 block_bytes;
++	u32 line_bytes;
++	u32 line_count;
++
++	u32 buf_size;
++	u8 *buf_cpu;
++	dma_addr_t buf_dma;
++
++	u32 risc_size;
++	u32 *risc_cpu;
++	dma_addr_t risc_dma;
++	u32 risc_pos;
++
++	struct tasklet_struct tasklet;
++	int shutdown;	
++};
++
++void bt878_start(struct bt878 *bt, u32 controlreg, u32 op_sync_orin,
++		u32 irq_err_ignore);
++void bt878_stop(struct bt878 *bt);	     
++
++#if defined(__powerpc__)	/* big-endian */
++extern __inline__ void io_st_le32(volatile unsigned *addr, unsigned val)
++{
++	__asm__ __volatile__("stwbrx %1,0,%2":"=m"(*addr):"r"(val),
++			     "r"(addr));
++	__asm__ __volatile__("eieio":::"memory");
++}
++
++#define bmtwrite(dat,adr)  io_st_le32((unsigned *)(adr),(dat))
++#define bmtread(adr)       ld_le32((unsigned *)(adr))
++#else
++#define bmtwrite(dat,adr)  writel((dat), (char *) (adr))
++#define bmtread(adr)       readl(adr)
++#endif
++
++#endif
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/media/dvb/bt8xx/dvb-bt8xx.c	2003-12-28 23:22:40.000000000 -0800
+@@ -0,0 +1,530 @@
++/*
++ * Bt8xx based DVB adapter driver 
++ *
++ * Copyright (C) 2002,2003 Florian Schirmer <schirmer@taytron.net>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ *
++ */
++
++#include <asm/bitops.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/delay.h>
++#include <linux/slab.h>
++#include <linux/i2c.h>
++
++#include "dmxdev.h"
++#include "dvbdev.h"
++#include "dvb_demux.h"
++#include "dvb_frontend.h"
++
++#include "dvb-bt8xx.h"
++
++#include "dvb_functions.h"
++
++#include "bt878.h"
++
++/* ID THAT MUST GO INTO i2c ids */
++#ifndef  I2C_DRIVERID_DVB_BT878A
++# define I2C_DRIVERID_DVB_BT878A I2C_DRIVERID_EXP0+10
++#endif
++
++
++#define dprintk if (debug) printk
++
++extern int bttv_get_cardinfo(unsigned int card, int *type, int *cardid);
++extern struct pci_dev* bttv_get_pcidev(unsigned int card);
++
++static LIST_HEAD(card_list);
++static int debug = 0;
++
++static void dvb_bt8xx_task(unsigned long data)
++{
++	struct dvb_bt8xx_card *card = (struct dvb_bt8xx_card *)data;
++
++	//printk("%d ", finished_block);
++
++	while (card->bt->last_block != card->bt->finished_block) {
++		(card->bt->TS_Size ? dvb_dmx_swfilter_204 : dvb_dmx_swfilter)(&card->demux, &card->bt->buf_cpu[card->bt->last_block * card->bt->block_bytes], card->bt->block_bytes);
++		card->bt->last_block = (card->bt->last_block + 1) % card->bt->block_count;
++	}
++}
++
++static int dvb_bt8xx_start_feed(struct dvb_demux_feed *dvbdmxfeed)
++{
++	struct dvb_demux *dvbdmx = dvbdmxfeed->demux;
++	struct dvb_bt8xx_card *card = dvbdmx->priv;
++
++	dprintk("dvb_bt8xx: start_feed\n");
++	
++	if (!dvbdmx->dmx.frontend)
++		return -EINVAL;
++
++	if (card->active)
++		return 0;
++		
++	card->active = 1;
++	
++//	bt878_start(card->bt, card->gpio_mode);
++
++	return 0;
++}
++
++static int dvb_bt8xx_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
++{
++	struct dvb_demux *dvbdmx = dvbdmxfeed->demux;
++	struct dvb_bt8xx_card *card = dvbdmx->priv;
++
++	dprintk("dvb_bt8xx: stop_feed\n");
++	
++	if (!dvbdmx->dmx.frontend)
++		return -EINVAL;
++		
++	if (!card->active)
++		return 0;
++
++//	bt878_stop(card->bt);
++
++	card->active = 0;
++
++	return 0;
++}
++
++static int master_xfer (struct dvb_i2c_bus *i2c, const struct i2c_msg msgs[], int num)
++{
++	struct dvb_bt8xx_card *card = i2c->data;
++	int retval;
++
++	if (down_interruptible (&card->bt->gpio_lock))
++		return -ERESTARTSYS;
++
++	retval = i2c_transfer(card->i2c_adapter,
++			      (struct i2c_msg*) msgs,
++			      num);
++
++	up(&card->bt->gpio_lock);
++
++	return retval;
++}
++
++static int is_pci_slot_eq(struct pci_dev* adev, struct pci_dev* bdev)
++{
++	if ((adev->subsystem_vendor == bdev->subsystem_vendor) &&
++		(adev->subsystem_device == bdev->subsystem_device) &&
++		(adev->bus->number == bdev->bus->number) &&
++		(PCI_SLOT(adev->devfn) == PCI_SLOT(bdev->devfn)))
++		return 1;
++	return 0;
++}
++
++static struct bt878 __init *dvb_bt8xx_878_match(unsigned int bttv_nr, struct pci_dev* bttv_pci_dev)
++{
++	unsigned int card_nr;
++	
++	/* Hmm, n squared. Hope n is small */
++	for (card_nr = 0; card_nr < bt878_num; card_nr++) {
++		if (is_pci_slot_eq(bt878[card_nr].dev, bttv_pci_dev))
++			return &bt878[card_nr];
++	}
++	return NULL;
++}
++
++static int __init dvb_bt8xx_card_match(unsigned int bttv_nr, char *card_name, u32 gpio_mode, u32 op_sync_orin, u32 irq_err_ignore)
++{
++	struct dvb_bt8xx_card *card;
++	struct pci_dev* bttv_pci_dev;
++
++	dprintk("dvb_bt8xx: identified card%d as %s\n", bttv_nr, card_name);
++			
++	if (!(card = kmalloc(sizeof(struct dvb_bt8xx_card), GFP_KERNEL)))
++		return -ENOMEM;
++
++	memset(card, 0, sizeof(*card));
++	card->bttv_nr = bttv_nr;
++	strncpy(card->card_name, card_name, sizeof(card_name) - 1);
++	
++	if (!(bttv_pci_dev = bttv_get_pcidev(bttv_nr))) {
++		printk("dvb_bt8xx: no pci device for card %d\n", card->bttv_nr);
++		kfree(card);
++		return -EFAULT;
++	}
++
++	if (!(card->bt = dvb_bt8xx_878_match(card->bttv_nr, bttv_pci_dev))) {
++		printk("dvb_bt8xx: unable to determine DMA core of card %d\n", card->bttv_nr);
++	
++		kfree(card);
++		return -EFAULT;
++		
++	}
++	init_MUTEX(&card->bt->gpio_lock);
++	card->bt->bttv_nr = bttv_nr;
++	card->gpio_mode = gpio_mode;
++	card->op_sync_orin = op_sync_orin;
++	card->irq_err_ignore = irq_err_ignore;
++	list_add_tail(&card->list, &card_list);
++
++	return 0;
++}
++
++static struct dvb_bt8xx_card *dvb_bt8xx_find_by_i2c_adap(struct i2c_adapter *adap)
++{
++	struct dvb_bt8xx_card *card;
++	struct list_head *item;
++	
++	printk("find by i2c adap: checking \"%s\"\n",adap->name);
++	list_for_each(item, &card_list) {
++		card = list_entry(item, struct dvb_bt8xx_card, list);
++		if (card->i2c_adapter == adap)
++			return card;
++	}
++	return NULL;
++}
++
++static struct dvb_bt8xx_card *dvb_bt8xx_find_by_pci(struct i2c_adapter *adap)
++{
++	struct dvb_bt8xx_card *card;
++	struct list_head *item;
++	struct device  *dev;
++	struct pci_dev *pci;
++	
++	printk("find by pci: checking \"%s\"\n",adap->name);
++	dev = adap->dev.parent;
++	if (NULL == dev) {
++		/* shoudn't happen with 2.6.0-test7 + newer */
++		printk("attach: Huh? i2c adapter not in sysfs tree?\n");
++		return 0;
++	}
++	pci = to_pci_dev(dev);
++	list_for_each(item, &card_list) {
++		card = list_entry(item, struct dvb_bt8xx_card, list);
++		if (is_pci_slot_eq(pci, card->bt->dev)) {
++			return card;
++		}
++	}
++	return NULL;
++}
++
++static int dvb_bt8xx_attach(struct i2c_adapter *adap)
++{
++	struct dvb_bt8xx_card *card;
++	
++	printk("attach: checking \"%s\"\n",adap->name);
++
++	/* looking for bt878 cards ... */
++	if (adap->id != (I2C_ALGO_BIT | I2C_HW_B_BT848))
++		return 0;
++	card = dvb_bt8xx_find_by_pci(adap);
++	if (!card)
++		return 0;
++	card->i2c_adapter = adap;
++	printk("attach: \"%s\", to card %d\n",
++	       adap->name, card->bttv_nr);
++	try_module_get(adap->owner);
++
++	return 0;
++}
++
++static void dvb_bt8xx_i2c_adap_free(struct i2c_adapter *adap)
++{
++	module_put(adap->owner);
++}
++
++static int dvb_bt8xx_detach(struct i2c_adapter *adap)
++{
++	struct dvb_bt8xx_card *card;
++
++	card = dvb_bt8xx_find_by_i2c_adap(adap);
++	if (!card)
++		return 0;
++
++	/* This should not happen. We have locked the module! */
++	printk("detach: \"%s\", for card %d removed\n",
++	       adap->name, card->bttv_nr);
++	return 0;
++}
++
++static struct i2c_driver dvb_bt8xx_driver = {
++	.owner           = THIS_MODULE,
++	.name            = "dvb_bt8xx",
++        .id              = I2C_DRIVERID_DVB_BT878A,
++	.flags           = I2C_DF_NOTIFY,
++        .attach_adapter  = dvb_bt8xx_attach,
++        .detach_adapter  = dvb_bt8xx_detach,
++};
++
++static void __init dvb_bt8xx_get_adaps(void)
++{
++	i2c_add_driver(&dvb_bt8xx_driver);
++}
++
++static void __exit dvb_bt8xx_exit_adaps(void)
++{
++	i2c_del_driver(&dvb_bt8xx_driver);
++}
++
++static int __init dvb_bt8xx_load_card( struct dvb_bt8xx_card *card)
++{
++	int result;
++
++	if (!card->i2c_adapter) {
++		printk("dvb_bt8xx: unable to determine i2c adaptor of card %d, deleting\n", card->bttv_nr);
++
++		return -EFAULT;
++	
++	}
++
++	if ((result = dvb_register_adapter(&card->dvb_adapter, card->card_name)) < 0) {
++	
++		printk("dvb_bt8xx: dvb_register_adapter failed (errno = %d)\n", result);
++		
++		dvb_bt8xx_i2c_adap_free(card->i2c_adapter);
++		return result;
++		
++	}
++	card->bt->adap_ptr = card->dvb_adapter;
++
++	if (!(dvb_register_i2c_bus(master_xfer, card, card->dvb_adapter, 0))) {
++		printk("dvb_bt8xx: dvb_register_i2c_bus of card%d failed\n", card->bttv_nr);
++
++		dvb_unregister_adapter(card->dvb_adapter);
++		dvb_bt8xx_i2c_adap_free(card->i2c_adapter);
++
++		return -EFAULT;
++	}
++
++	memset(&card->demux, 0, sizeof(struct dvb_demux));
++
++	card->demux.dmx.capabilities = DMX_TS_FILTERING | DMX_SECTION_FILTERING | DMX_MEMORY_BASED_FILTERING;
++
++	card->demux.priv = card;
++	card->demux.filternum = 256;
++	card->demux.feednum = 256;
++	card->demux.start_feed = dvb_bt8xx_start_feed;
++	card->demux.stop_feed = dvb_bt8xx_stop_feed;
++	card->demux.write_to_decoder = NULL;
++	
++	if ((result = dvb_dmx_init(&card->demux)) < 0) {
++		printk("dvb_bt8xx: dvb_dmx_init failed (errno = %d)\n", result);
++
++		dvb_unregister_i2c_bus(master_xfer, card->dvb_adapter, 0);
++		dvb_unregister_adapter(card->dvb_adapter);
++		dvb_bt8xx_i2c_adap_free(card->i2c_adapter);
++		
++		return result;
++	}
++
++	card->dmxdev.filternum = 256;
++	card->dmxdev.demux = &card->demux.dmx;
++	card->dmxdev.capabilities = 0;
++	
++	if ((result = dvb_dmxdev_init(&card->dmxdev, card->dvb_adapter)) < 0) {
++		printk("dvb_bt8xx: dvb_dmxdev_init failed (errno = %d)\n", result);
++
++		dvb_dmx_release(&card->demux);
++		dvb_unregister_i2c_bus(master_xfer, card->dvb_adapter, 0);
++		dvb_unregister_adapter(card->dvb_adapter);
++		dvb_bt8xx_i2c_adap_free(card->i2c_adapter);
++		
++		return result;
++	}
++
++	card->fe_hw.source = DMX_FRONTEND_0;
++
++	if ((result = card->demux.dmx.add_frontend(&card->demux.dmx, &card->fe_hw)) < 0) {
++		printk("dvb_bt8xx: dvb_dmx_init failed (errno = %d)\n", result);
++
++		dvb_dmxdev_release(&card->dmxdev);
++		dvb_dmx_release(&card->demux);
++		dvb_unregister_i2c_bus(master_xfer, card->dvb_adapter, 0);
++		dvb_unregister_adapter(card->dvb_adapter);
++		dvb_bt8xx_i2c_adap_free(card->i2c_adapter);
++		
++		return result;
++	}
++	
++	card->fe_mem.source = DMX_MEMORY_FE;
++
++	if ((result = card->demux.dmx.add_frontend(&card->demux.dmx, &card->fe_mem)) < 0) {
++		printk("dvb_bt8xx: dvb_dmx_init failed (errno = %d)\n", result);
++
++		card->demux.dmx.remove_frontend(&card->demux.dmx, &card->fe_hw);
++		dvb_dmxdev_release(&card->dmxdev);
++		dvb_dmx_release(&card->demux);
++		dvb_unregister_i2c_bus(master_xfer, card->dvb_adapter, 0);
++		dvb_unregister_adapter(card->dvb_adapter);
++		dvb_bt8xx_i2c_adap_free(card->i2c_adapter);
++		
++		return result;
++	}
++
++	if ((result = card->demux.dmx.connect_frontend(&card->demux.dmx, &card->fe_hw)) < 0) {
++		printk("dvb_bt8xx: dvb_dmx_init failed (errno = %d)\n", result);
++
++		card->demux.dmx.remove_frontend(&card->demux.dmx, &card->fe_mem);
++		card->demux.dmx.remove_frontend(&card->demux.dmx, &card->fe_hw);
++		dvb_dmxdev_release(&card->dmxdev);
++		dvb_dmx_release(&card->demux);
++		dvb_unregister_i2c_bus(master_xfer, card->dvb_adapter, 0);
++		dvb_unregister_adapter(card->dvb_adapter);
++		dvb_bt8xx_i2c_adap_free(card->i2c_adapter);
++		
++		return result;
++	}
++
++	dvb_net_init(card->dvb_adapter, &card->dvbnet, &card->demux.dmx);
++
++	tasklet_init(&card->bt->tasklet, dvb_bt8xx_task, (unsigned long) card);
++	
++	bt878_start(card->bt, card->gpio_mode, card->op_sync_orin, card->irq_err_ignore);
++
++	return 0;
++}
++
++static int __init dvb_bt8xx_load_all(void)
++{
++	struct dvb_bt8xx_card *card;
++	struct list_head *entry, *entry_safe;
++
++	list_for_each_safe(entry, entry_safe, &card_list) {
++		card = list_entry(entry, struct dvb_bt8xx_card, list);
++		if (dvb_bt8xx_load_card(card) < 0) {
++			list_del(&card->list);
++			kfree(card);
++			continue;
++		}
++	}
++	return 0;
++
++}
++
++#define BT878_NEBULA	0x68
++#define BT878_TWINHAN_DST 0x71
++
++static int __init dvb_bt8xx_init(void)
++{
++	unsigned int card_nr = 0;
++	int card_id;
++	int card_type;
++
++	dprintk("dvb_bt8xx: enumerating available bttv cards...\n");
++	
++	while (bttv_get_cardinfo(card_nr, &card_type, &card_id) == 0) {
++		switch(card_id) {
++			case 0x001C11BD:
++				dvb_bt8xx_card_match(card_nr, "Pinnacle PCTV DVB-S",
++					       0x0400C060, 0, 0);
++				/* 26, 15, 14, 6, 5 
++				 * A_G2X  DA_DPM DA_SBR DA_IOM_DA 
++				 * DA_APP(parallel) */
++				break;
++			case 0x01010071:
++nebula:
++				dvb_bt8xx_card_match(card_nr, "Nebula DigiTV DVB-T",
++					     (1 << 26) | (1 << 14) | (1 << 5),
++					     0, 0);
++				/* A_PWRDN DA_SBR DA_APP (high speed serial) */
++				break;
++			case 0x07611461:
++				dvb_bt8xx_card_match(card_nr, "Avermedia DVB-T",
++					     (1 << 26) | (1 << 14) | (1 << 5),
++					     0, 0);
++				/* A_PWRDN DA_SBR DA_APP (high speed serial) */
++				break;
++			case 0x0:
++				if (card_type == BT878_NEBULA ||
++					card_type == BT878_TWINHAN_DST)
++					goto dst;
++				goto unknown_card;
++			case 0x2611BD:
++			case 0x11822:
++dst:
++				dvb_bt8xx_card_match(card_nr, "DST DVB-S", 0x2204f2c,
++						BT878_RISC_SYNC_MASK,
++						BT878_APABORT | BT878_ARIPERR | BT878_APPERR | BT878_AFBUS);
++				/* 25,21,14,11,10,9,8,3,2 then
++				 * 0x33 = 5,4,1,0
++				 * A_SEL=SML, DA_MLB, DA_SBR, 
++				 * DA_SDR=f, fifo trigger = 32 DWORDS
++				 * IOM = 0 == audio A/D
++				 * DPM = 0 == digital audio mode
++				 * == async data parallel port
++				 * then 0x33 (13 is set by start_capture)
++				 * DA_APP = async data parallel port, 
++				 * ACAP_EN = 1,
++				 * RISC+FIFO ENABLE */
++				break;
++			default:
++unknown_card:
++				printk("%s: unknown card_id found %0X\n",
++					__FUNCTION__, card_id);
++				if (card_type == BT878_NEBULA) {
++					printk("%s: bttv type set to nebula\n",
++						__FUNCTION__);
++					goto nebula;
++				}
++				if (card_type == BT878_TWINHAN_DST) {
++					printk("%s: bttv type set to Twinhan DST\n",
++						__FUNCTION__);
++					goto dst;
++				}
++				printk("%s: unknown card_type found %0X, NOT LOADED\n",
++					__FUNCTION__, card_type);
++				printk("%s: unknown card_nr found %0X\n",
++					__FUNCTION__, card_nr);
++		}
++		card_nr++;
++	}
++	dvb_bt8xx_get_adaps();
++	dvb_bt8xx_load_all();
++
++	return 0;
++
++}
++
++static void __exit dvb_bt8xx_exit(void)
++{
++	struct dvb_bt8xx_card *card;
++	struct list_head *entry, *entry_safe;
++
++	dvb_bt8xx_exit_adaps();
++	list_for_each_safe(entry, entry_safe, &card_list) {
++		card = list_entry(entry, struct dvb_bt8xx_card, list);
++		
++		dprintk("dvb_bt8xx: unloading card%d\n", card->bttv_nr);
++
++		bt878_stop(card->bt);
++		tasklet_kill(&card->bt->tasklet);
++		dvb_net_release(&card->dvbnet);
++		card->demux.dmx.remove_frontend(&card->demux.dmx, &card->fe_mem);
++		card->demux.dmx.remove_frontend(&card->demux.dmx, &card->fe_hw);
++		dvb_dmxdev_release(&card->dmxdev);
++		dvb_dmx_release(&card->demux);
++		dvb_unregister_i2c_bus(master_xfer, card->dvb_adapter, 0);
++		dvb_bt8xx_i2c_adap_free(card->i2c_adapter);
++		dvb_unregister_adapter(card->dvb_adapter);
++		
++		list_del(&card->list);
++		kfree(card);
++	}
++
++}
++
++module_init(dvb_bt8xx_init);
++module_exit(dvb_bt8xx_exit);
++MODULE_DESCRIPTION("Bt8xx based DVB adapter driver");
++MODULE_AUTHOR("Florian Schirmer <schirmer@taytron.net>");
++MODULE_LICENSE("GPL");
++MODULE_PARM(debug, "i");
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/media/dvb/bt8xx/dvb-bt8xx.h	2003-12-28 23:22:37.000000000 -0800
+@@ -0,0 +1,47 @@
++/*
++ * Bt8xx based DVB adapter driver 
++ *
++ * Copyright (C) 2002,2003 Florian Schirmer <schirmer@taytron.net>
++ * Copyright (C) 2002 Peter Hettkamp <peter.hettkamp@t-online.de>
++ * Copyright (C) 1999-2001 Ralph  Metzler & Marcus Metzler for convergence integrated media GmbH
++ * Copyright (C) 1998,1999 Christian Theiss <mistert@rz.fh-augsburg.de>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ *
++ */
++
++#include <linux/i2c.h>
++#include "dvbdev.h"
++#include "dvb_net.h"
++
++struct dvb_bt8xx_card {
++
++	struct list_head list;
++	u8 active;
++	char card_name[32];
++	struct dvb_adapter *dvb_adapter;
++	struct bt878 *bt;
++	unsigned int bttv_nr;
++	struct dvb_demux demux;
++	struct dmxdev dmxdev;
++	struct dmx_frontend fe_hw;
++	struct dmx_frontend fe_mem;
++	u32 gpio_mode;
++	u32 op_sync_orin;
++	u32 irq_err_ignore;
++	struct i2c_adapter *i2c_adapter;
++	struct dvb_net dvbnet;
++				
++};
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/media/dvb/bt8xx/Kconfig	2003-12-28 23:22:37.000000000 -0800
+@@ -0,0 +1,13 @@
++config DVB_BT8XX
++	tristate "Nebula/Pinnacle PCTV PCI cards"
++	depends on DVB_CORE && PCI && VIDEO_BT848
++	help
++	  Support for PCI cards based on the Bt8xx PCI bridge. Examples are
++	  the Nebula cards, the Pinnacle PCTV cards, and Twinhan DST cards.
++
++          Since these cards have no MPEG decoder onboard, they transmit
++	  only compressed MPEG data over the PCI bus, so you need
++	  an external software decoder to watch TV on your computer.
++
++	  Say Y if you own such a device and want to use it.
++
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/media/dvb/bt8xx/Makefile	2003-12-28 23:22:40.000000000 -0800
+@@ -0,0 +1,5 @@
++
++obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o
++
++EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/video -Idrivers/media/dvb/frontends
++
+--- linux-2.6.0/drivers/media/dvb/dvb-core/demux.h	2003-10-08 15:07:08.000000000 -0700
++++ 25/drivers/media/dvb/dvb-core/demux.h	2003-12-28 23:22:38.000000000 -0800
+@@ -44,6 +44,15 @@
+ #endif 
+ 
+ /*
++ * DMX_MAX_SECFEED_SIZE: Maximum length (in bytes) of a private section feed filter.
++ */ 
++
++#ifndef DMX_MAX_SECFEED_SIZE 
++#define DMX_MAX_SECFEED_SIZE 4096
++#endif 
++
++
++/*
+  * enum dmx_success: Success codes for the Demux Callback API. 
+  */ 
+ 
+@@ -143,9 +152,9 @@ struct dmx_section_feed { 
+         int check_crc;
+ 	u32 crc_val;
+ 
+-        u8 secbuf[4096];
+-        int secbufp;
+-        int seclen;
++        u8 *secbuf;
++        u8 secbuf_base[DMX_MAX_SECFEED_SIZE];
++        u16 secbufp, seclen, tsfeedp;
+ 
+         int (*set) (struct dmx_section_feed* feed, 
+ 		    u16 pid, 
+--- linux-2.6.0/drivers/media/dvb/dvb-core/dvb_demux.c	2003-10-25 14:45:44.000000000 -0700
++++ 25/drivers/media/dvb/dvb-core/dvb_demux.c	2003-12-28 23:22:38.000000000 -0800
+@@ -34,6 +34,11 @@
+ #include "dvb_functions.h"
+ 
+ #define NOBUFS  
++/* 
++** #define DVB_DEMUX_SECTION_LOSS_LOG to monitor payload loss in the syslog
++*/
++// #define DVB_DEMUX_SECTION_LOSS_LOG
++
+ 
+ LIST_HEAD(dmx_muxs);
+ 
+@@ -87,7 +92,7 @@ static inline u16 ts_pid(const u8 *buf)
+ }
+ 
+ 
+-static inline int payload(const u8 *tsp)
++static inline u8 payload(const u8 *tsp)
+ {
+ 	if (!(tsp[3]&0x10)) // no payload?
+ 		return 0;
+@@ -188,9 +193,7 @@ static inline int dvb_dmx_swfilter_secti
+ 	struct dvb_demux_filter *f = feed->filter;
+ 	struct dmx_section_feed *sec = &feed->feed.sec;
+ 	u8 *buf = sec->secbuf;
+-
+-	if (sec->secbufp != sec->seclen)
+-		return -1;
++	int section_syntax_indicator;
+ 
+ 	if (!sec->is_filtering)
+ 		return 0;
+@@ -198,15 +201,19 @@ static inline int dvb_dmx_swfilter_secti
+ 	if (!f)
+ 		return 0;
+ 
+-	if (sec->check_crc && demux->check_crc32(feed, sec->secbuf, sec->seclen))
++	if (sec->check_crc) {
++		section_syntax_indicator = ((sec->secbuf[1] & 0x80) != 0);
++		if (section_syntax_indicator &&
++		    demux->check_crc32(feed, sec->secbuf, sec->seclen))
+ 		return -1;
++	}
+ 
+ 	do {
+ 		if (dvb_dmx_swfilter_sectionfilter(feed, f) < 0)
+ 			return -1;
+ 	} while ((f = f->next) && sec->is_filtering);
+ 
+-	sec->secbufp = sec->seclen = 0;
++	sec->seclen = 0;
+ 
+ 	memset(buf, 0, DVB_DEMUX_MASK_MAX);
+  
+@@ -214,128 +221,147 @@ static inline int dvb_dmx_swfilter_secti
+ }
+ 
+ 
+-static int dvb_dmx_swfilter_section_packet(struct dvb_demux_feed *feed, const u8 *buf) 
++static void dvb_dmx_swfilter_section_new(struct dvb_demux_feed *feed)
+ {
+-	struct dvb_demux *demux = feed->demux;
+ 	struct dmx_section_feed *sec = &feed->feed.sec;
+-	int p, count;
+-	int ccok, rest;
+-	u8 cc;
+-
+-	if (!(count = payload(buf)))
+-		return -1;
+-
+-	p = 188-count;
+-
+-	cc = buf[3] & 0x0f;
+-	ccok = ((feed->cc+1) & 0x0f) == cc ? 1 : 0;
+-	feed->cc = cc;
+-
+-	if (buf[1] & 0x40) { // PUSI set
+-		// offset to start of first section is in buf[p] 
+-		if (p+buf[p]>187) // trash if it points beyond packet
+-			return -1;
+-
+-		if (buf[p] && ccok) { // rest of previous section?
+-			// did we have enough data in last packet to calc length?
+-			int tmp = 3 - sec->secbufp;
+ 
+-			if (tmp > 0 && tmp != 3) {
+-				if (p + tmp >= 187)
+-					return -1;
+-
+-				demux->memcopy (feed, sec->secbuf+sec->secbufp,
+-					       buf+p+1, tmp);
+-
+-				sec->seclen = section_length(sec->secbuf);
+-
+-				if (sec->seclen > 4096) 
+-					return -1;
++#ifdef DVB_DEMUX_SECTION_LOSS_LOG
++	if(sec->secbufp < sec->tsfeedp)
++	{
++		int i, n = sec->tsfeedp - sec->secbufp;
++
++		/* section padding is done with 0xff bytes entirely.
++		** due to speed reasons, we won't check all of them
++		** but just first and last
++		*/
++		if(sec->secbuf[0] != 0xff || sec->secbuf[n-1] != 0xff)
++		{
++			printk("dvb_demux.c section ts padding loss: %d/%d\n", 
++			       n, sec->tsfeedp);
++			printk("dvb_demux.c pad data:");
++			for(i = 0; i < n; i++)
++				printk(" %02x", sec->secbuf[i]);
++			printk("\n");
+ 			}
+-
+-			rest = sec->seclen - sec->secbufp;
+-
+-			if (rest == buf[p] && sec->seclen) {
+-				demux->memcopy (feed, sec->secbuf + sec->secbufp,
+-					       buf+p+1, buf[p]);
+-				sec->secbufp += buf[p];
+-				dvb_dmx_swfilter_section_feed(feed);
+ 			}
+-		}
+-
+-		p += buf[p] + 1; 		// skip rest of last section
+-		count = 188 - p;
++#endif
+ 
+-		while (count) {
++	sec->tsfeedp = sec->secbufp = sec->seclen = 0;
++	sec->secbuf = sec->secbuf_base;
++		}
+ 
+-			sec->crc_val = ~0;
++/* 
++** Losless Section Demux 1.4 by Emard
++*/
++static int dvb_dmx_swfilter_section_copy_dump(struct dvb_demux_feed *feed, const u8 *buf, u8 len)
++{
++	struct dvb_demux *demux = feed->demux;
++	struct dmx_section_feed *sec = &feed->feed.sec;
++	u16 limit, seclen, n;
+ 
+-			if ((count>2) && // enough data to determine sec length?
+-			    ((sec->seclen = section_length(buf+p)) <= count)) {
+-				if (sec->seclen>4096) 
+-					return -1;
++	if(sec->tsfeedp >= DMX_MAX_SECFEED_SIZE)
++		return 0;
+ 
+-				demux->memcopy (feed, sec->secbuf, buf+p,
+-					       sec->seclen);
++	if(sec->tsfeedp + len > DMX_MAX_SECFEED_SIZE)
++	{
++#ifdef DVB_DEMUX_SECTION_LOSS_LOG
++		printk("dvb_demux.c section buffer full loss: %d/%d\n", 
++		       sec->tsfeedp + len - DMX_MAX_SECFEED_SIZE, DMX_MAX_SECFEED_SIZE);
++#endif
++		len = DMX_MAX_SECFEED_SIZE - sec->tsfeedp;
++	}
+ 
+-				sec->secbufp = sec->seclen;
+-				p += sec->seclen;
+-				count = 188 - p;
++	if(len <= 0)
++		return 0;
+ 
+-				dvb_dmx_swfilter_section_feed(feed);
++	demux->memcopy(feed, sec->secbuf_base + sec->tsfeedp, buf, len);
++	sec->tsfeedp += len;
+ 
+-				// filling bytes until packet end?
+-				if (count && buf[p]==0xff) 
+-					count=0;
++	/* -----------------------------------------------------
++	** Dump all the sections we can find in the data (Emard)
++	*/
+ 
+-			} else { // section continues to following TS packet
+-				demux->memcopy(feed, sec->secbuf, buf+p, count);
+-				sec->secbufp+=count;
+-				count=0;
+-			}
++	limit = sec->tsfeedp;
++	if(limit > DMX_MAX_SECFEED_SIZE)
++		return -1; /* internal error should never happen */
++
++	/* to be sure always set secbuf */
++	sec->secbuf = sec->secbuf_base + sec->secbufp;
++
++	for(n = 0; sec->secbufp + 2 < limit; n++)
++	{
++		seclen = section_length(sec->secbuf);
++		if(seclen <= 0 || seclen > DMX_MAX_SECFEED_SIZE 
++		   || seclen + sec->secbufp > limit)
++			return 0;
++		sec->seclen = seclen;
++		sec->crc_val = ~0;
++		/* dump [secbuf .. secbuf+seclen) */
++		dvb_dmx_swfilter_section_feed(feed);
++		sec->secbufp += seclen; /* secbufp and secbuf moving together is */
++		sec->secbuf += seclen; /* redundand but saves pointer arithmetic */
+ 		}
+ 
+ 		return 0;
+ 	}
+ 
+-	// section continued below
+-	if (!ccok)
+-		return -1;
+ 
+-	if (!sec->secbufp) // any data in last ts packet?
+-		return -1;
++static int dvb_dmx_swfilter_section_packet(struct dvb_demux_feed *feed, const u8 *buf) 
++{
++	u8 p, count;
++	int ccok;
++	u8 cc;
+ 
+-	// did we have enough data in last packet to calc section length?
+-	if (sec->secbufp < 3) {
+-		int tmp = 3 - sec->secbufp;
++	count = payload(buf);
+ 		
+-		if (tmp>count)
++	if (count == 0)  /* count == 0 if no payload or out of range */
+ 			return -1;
+ 
+-		sec->crc_val = ~0;
+-
+-		demux->memcopy (feed, sec->secbuf + sec->secbufp, buf+p, tmp);
++	p = 188-count; /* payload start */
+ 
+-		sec->seclen = section_length(sec->secbuf);
+-
+-		if (sec->seclen > 4096) 
+-			return -1;
++	cc = buf[3] & 0x0f;
++	ccok = ((feed->cc+1) & 0x0f) == cc ? 1 : 0;
++	feed->cc = cc;
++	if(ccok == 0)
++	{
++#ifdef DVB_DEMUX_SECTION_LOSS_LOG
++		printk("dvb_demux.c discontinuity detected %d bytes lost\n", count);
++		/* those bytes under sume circumstances will again be reported
++		** in the following dvb_dmx_swfilter_section_new
++		*/
++#endif
++		dvb_dmx_swfilter_section_new(feed);
++		return 0;
+ 	}
+ 
+-	rest = sec->seclen - sec->secbufp;
+-
+-	if (rest < 0)
+-		return -1;
+-
+-	if (rest <= count) {	// section completed in this TS packet
+-		demux->memcopy (feed, sec->secbuf + sec->secbufp, buf+p, rest);
+-		sec->secbufp += rest;
+-		dvb_dmx_swfilter_section_feed(feed);
+-	} else 	{	// section continues in following ts packet
+-		demux->memcopy (feed, sec->secbuf + sec->secbufp, buf+p, count);
+-		sec->secbufp += count;
++	if(buf[1] & 0x40)
++	{
++		// PUSI=1 (is set), section boundary is here
++		if(count > 1 && buf[p] < count)
++		{
++			const u8 *before = buf+p+1;
++			u8 before_len = buf[p];
++			const u8 *after = before+before_len;
++			u8 after_len = count-1-before_len;
++
++			dvb_dmx_swfilter_section_copy_dump(feed, before, before_len);
++			dvb_dmx_swfilter_section_new(feed);
++			dvb_dmx_swfilter_section_copy_dump(feed, after, after_len);
++		}
++#ifdef DVB_DEMUX_SECTION_LOSS_LOG
++		else
++			if(count > 0)
++				printk("dvb_demux.c PUSI=1 but %d bytes lost\n", count);
++#endif
+ 	}
++	else
++	{
++		// PUSI=0 (is not set), no section boundary
++		const u8 *entire = buf+p;
++		u8 entire_len = count;
+ 
++		dvb_dmx_swfilter_section_copy_dump(feed, entire, entire_len);
++	}
+ 	return 0;
+ }
+ 
+@@ -439,6 +465,50 @@ bailout:
+ 	spin_unlock(&demux->lock);
+ }
+ 
++void dvb_dmx_swfilter_204(struct dvb_demux *demux, const u8 *buf, size_t count)
++{
++	int p = 0,i, j;
++	u8 tmppack[188];
++	spin_lock(&demux->lock);
++
++	if ((i = demux->tsbufp)) {
++		if (count < (j=204-i)) {
++			memcpy(&demux->tsbuf[i], buf, count);
++			demux->tsbufp += count;
++			goto bailout;
++		}
++		memcpy(&demux->tsbuf[i], buf, j);
++		if ((demux->tsbuf[0] == 0x47)|(demux->tsbuf[0]==0xB8))  {
++			memcpy(tmppack, demux->tsbuf, 188);
++			if (tmppack[0] == 0xB8) tmppack[0] = 0x47;
++			dvb_dmx_swfilter_packet(demux, tmppack);
++		}
++		demux->tsbufp = 0;
++		p += j;
++	}
++
++	while (p < count) {
++		if ((buf[p] == 0x47)|(buf[p] == 0xB8)) {
++			if (count-p >= 204) {
++				memcpy(tmppack, buf+p, 188);
++				if (tmppack[0] == 0xB8) tmppack[0] = 0x47;
++				dvb_dmx_swfilter_packet(demux, tmppack);
++				p += 204;
++			} else {
++				i = count-p;
++				memcpy(demux->tsbuf, buf+p, i);
++				demux->tsbufp=i;
++				goto bailout;
++			}
++		} else { 
++			p++;
++		}
++	}
++
++bailout:
++	spin_unlock(&demux->lock);
++}
++
+ 
+ static struct dvb_demux_filter * dvb_dmx_filter_alloc(struct dvb_demux *demux)
+ {
+@@ -848,6 +918,9 @@ static int dmx_section_feed_start_filter
+ 		up(&dvbdmx->mutex);
+ 		return -EINVAL;
+ 	}
++
++	dvbdmxfeed->feed.sec.tsfeedp = 0;
++	dvbdmxfeed->feed.sec.secbuf = dvbdmxfeed->feed.sec.secbuf_base;
+ 	dvbdmxfeed->feed.sec.secbufp=0;
+ 	dvbdmxfeed->feed.sec.seclen=0;
+ 	
+@@ -946,7 +1019,9 @@ static int dvbdmx_allocate_section_feed(
+ 	dvbdmxfeed->cb.sec=callback;
+ 	dvbdmxfeed->demux=dvbdmx;
+ 	dvbdmxfeed->pid=0xffff;
+-	dvbdmxfeed->feed.sec.secbufp=0;
++	dvbdmxfeed->feed.sec.secbuf = dvbdmxfeed->feed.sec.secbuf_base;
++	dvbdmxfeed->feed.sec.secbufp = dvbdmxfeed->feed.sec.seclen = 0;
++	dvbdmxfeed->feed.sec.tsfeedp = 0;
+ 	dvbdmxfeed->filter=0;
+ 	dvbdmxfeed->buffer=0;
+ 
+--- linux-2.6.0/drivers/media/dvb/dvb-core/dvb_demux.h	2003-10-08 15:07:08.000000000 -0700
++++ 25/drivers/media/dvb/dvb-core/dvb_demux.h	2003-12-28 23:22:38.000000000 -0800
+@@ -127,7 +127,7 @@ struct dvb_demux {
+ 
+ #define DMX_MAX_PID 0x2000
+ 	struct list_head feed_list;
+-        u8 tsbuf[188];
++        u8 tsbuf[204];
+         int tsbufp;
+ 
+ 	struct semaphore mutex;
+@@ -140,6 +140,7 @@ int dvb_dmx_release(struct dvb_demux *dv
+ void dvb_dmx_swfilter_packet(struct dvb_demux *dvbdmx, const u8 *buf);
+ void dvb_dmx_swfilter_packets(struct dvb_demux *dvbdmx, const u8 *buf, size_t count);
+ void dvb_dmx_swfilter(struct dvb_demux *demux, const u8 *buf, size_t count);
++void dvb_dmx_swfilter_204(struct dvb_demux *demux, const u8 *buf, size_t count);
+ 
+ int dvbdmx_connect_frontend(struct dmx_demux *demux, struct dmx_frontend *frontend);
+ int dvbdmx_disconnect_frontend(struct dmx_demux *demux);
+--- linux-2.6.0/drivers/media/dvb/dvb-core/dvb_filter.c	2003-07-02 14:53:14.000000000 -0700
++++ 25/drivers/media/dvb/dvb-core/dvb_filter.c	2003-12-28 23:22:38.000000000 -0800
+@@ -564,14 +564,18 @@ void dvb_filter_pes2ts_init(struct dvb_f
+ 	p2ts->priv=priv;
+ }
+ 
+-int dvb_filter_pes2ts(struct dvb_filter_pes2ts *p2ts, unsigned char *pes, int len)
++int dvb_filter_pes2ts(struct dvb_filter_pes2ts *p2ts, unsigned char *pes,
++		      int len, int payload_start)
+ {
+ 	unsigned char *buf=p2ts->buf;
+ 	int ret=0, rest;
+ 	
+ 	//len=6+((pes[4]<<8)|pes[5]);
+ 
++	if (payload_start)
+ 	buf[1]|=0x40;
++	else
++		buf[1]&=~0x40;
+ 	while (len>=184) {
+ 		buf[3]=0x10|((p2ts->cc++)&0x0f);
+ 		memcpy(buf+4, pes, 184);
+--- linux-2.6.0/drivers/media/dvb/dvb-core/dvb_filter.h	2003-10-08 15:07:08.000000000 -0700
++++ 25/drivers/media/dvb/dvb-core/dvb_filter.h	2003-12-28 23:22:38.000000000 -0800
+@@ -37,7 +37,8 @@ struct dvb_filter_pes2ts {
+ void dvb_filter_pes2ts_init(struct dvb_filter_pes2ts *p2ts, unsigned short pid, 
+ 		 	    dvb_filter_pes2ts_cb_t *cb, void *priv);
+ 
+-int dvb_filter_pes2ts(struct dvb_filter_pes2ts *p2ts, unsigned char *pes, int len);
++int dvb_filter_pes2ts(struct dvb_filter_pes2ts *p2ts, unsigned char *pes,
++		      int len, int payload_start);
+ 
+ 
+ #define PROG_STREAM_MAP  0xBC
+--- linux-2.6.0/drivers/media/dvb/dvb-core/dvb_i2c.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/media/dvb/dvb-core/dvb_i2c.c	2003-12-28 23:22:38.000000000 -0800
+@@ -51,6 +51,7 @@ static int register_i2c_client (struct d
+ 
+ 	client->detach = dev->detach;
+ 	client->owner = dev->owner;
++	client->data = dev->data;
+ 
+ 	INIT_LIST_HEAD(&client->list_head);
+ 
+--- linux-2.6.0/drivers/media/dvb/dvb-core/dvb_ksyms.c	2003-07-02 14:53:14.000000000 -0700
++++ 25/drivers/media/dvb/dvb-core/dvb_ksyms.c	2003-12-28 23:22:38.000000000 -0800
+@@ -18,6 +18,7 @@ EXPORT_SYMBOL(dvb_dmx_release);
+ EXPORT_SYMBOL(dvb_dmx_swfilter_packet);
+ EXPORT_SYMBOL(dvb_dmx_swfilter_packets);
+ EXPORT_SYMBOL(dvb_dmx_swfilter);
++EXPORT_SYMBOL(dvb_dmx_swfilter_204);
+ EXPORT_SYMBOL(dvbdmx_connect_frontend);
+ EXPORT_SYMBOL(dvbdmx_disconnect_frontend);
+ 
+--- linux-2.6.0/drivers/media/dvb/dvb-core/dvb_ringbuffer.c	2003-07-02 14:53:14.000000000 -0700
++++ 25/drivers/media/dvb/dvb-core/dvb_ringbuffer.c	2003-12-28 23:22:38.000000000 -0800
+@@ -9,24 +9,18 @@
+  *                       & Marcus Metzler for convergence integrated media GmbH
+  *
+  * This program is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU General Public License
+- * as published by the Free Software Foundation; either version 2
++ * modify it under the terms of the GNU Lesser General Public License
++ * as published by the Free Software Foundation; either version 2.1
+  * of the License, or (at your option) any later version.
+  * 
+- *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- * 
++ * GNU Lesser General Public License for more details.
+  *
+- * You should have received a copy of the GNU General Public License
++ * You should have received a copy of the GNU Lesser General Public License
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+- * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
+- * 
+- *
+- * the project's page is at http://www.linuxtv.org/dvb/
+  */
+ 
+ 
+@@ -167,11 +161,11 @@ ssize_t dvb_ringbuffer_write(struct dvb_
+ }
+ 
+ 
+-EXPORT_SYMBOL_GPL(dvb_ringbuffer_init);
+-EXPORT_SYMBOL_GPL(dvb_ringbuffer_empty);
+-EXPORT_SYMBOL_GPL(dvb_ringbuffer_free);
+-EXPORT_SYMBOL_GPL(dvb_ringbuffer_avail);
+-EXPORT_SYMBOL_GPL(dvb_ringbuffer_flush);
+-EXPORT_SYMBOL_GPL(dvb_ringbuffer_flush_spinlock_wakeup);
+-EXPORT_SYMBOL_GPL(dvb_ringbuffer_read);
+-EXPORT_SYMBOL_GPL(dvb_ringbuffer_write);
++EXPORT_SYMBOL(dvb_ringbuffer_init);
++EXPORT_SYMBOL(dvb_ringbuffer_empty);
++EXPORT_SYMBOL(dvb_ringbuffer_free);
++EXPORT_SYMBOL(dvb_ringbuffer_avail);
++EXPORT_SYMBOL(dvb_ringbuffer_flush);
++EXPORT_SYMBOL(dvb_ringbuffer_flush_spinlock_wakeup);
++EXPORT_SYMBOL(dvb_ringbuffer_read);
++EXPORT_SYMBOL(dvb_ringbuffer_write);
+--- linux-2.6.0/drivers/media/dvb/dvb-core/dvb_ringbuffer.h	2003-10-08 15:07:08.000000000 -0700
++++ 25/drivers/media/dvb/dvb-core/dvb_ringbuffer.h	2003-12-28 23:22:38.000000000 -0800
+@@ -16,7 +16,7 @@
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
++ * GNU Lesser General Public License for more details.
+  * 
+  * You should have received a copy of the GNU Lesser General Public License
+  * along with this program; if not, write to the Free Software
+--- linux-2.6.0/drivers/media/dvb/frontends/alps_tdmb7.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/media/dvb/frontends/alps_tdmb7.c	2003-12-28 23:22:38.000000000 -0800
+@@ -159,7 +159,7 @@ static int cx22700_init (struct dvb_i2c_
+ 	cx22700_writereg (i2c, 0x00, 0x02);   /*  soft reset */
+ 	cx22700_writereg (i2c, 0x00, 0x00);
+ 
+-	dvb_delay (HZ/100);
++	dvb_delay(10);
+ 	
+ 	for (i=0; i<sizeof(init_tab); i+=2)
+ 		cx22700_writereg (i2c, init_tab[i], init_tab[i+1]);
+@@ -281,15 +281,15 @@ static int cx22700_get_tps (struct dvb_i
+ 
+ 	val = cx22700_readreg (i2c, 0x02);
+ 
+-	if ((val >> 3) > 4)
++	if (((val >> 3) & 0x07) > 4)
+ 		p->code_rate_HP = FEC_AUTO;
+ 	else
+-		p->code_rate_HP = fec_tab[val >> 3];
++		p->code_rate_HP = fec_tab[(val >> 3) & 0x07];
+ 
+-	if ((val & 0x7) > 4)
++	if ((val & 0x07) > 4)
+ 		p->code_rate_LP = FEC_AUTO;
+ 	else
+-		p->code_rate_LP = fec_tab[val >> 3];
++		p->code_rate_LP = fec_tab[val & 0x07];
+ 
+ 
+ 	val = cx22700_readreg (i2c, 0x03);
+@@ -333,7 +333,7 @@ static int tdmb7_ioctl (struct dvb_front
+ 		if (sync & 0x10)
+ 			*status |= FE_HAS_SYNC;
+ 
+-		if (sync & 0x10)
++		if (*status == 0x0f)
+ 			*status |= FE_HAS_LOCK;
+ 
+ 		break;
+--- linux-2.6.0/drivers/media/dvb/frontends/cx24110.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/media/dvb/frontends/cx24110.c	2003-12-28 23:22:38.000000000 -0800
+@@ -248,7 +248,7 @@ static int cx24108_set_tv_freq (struct d
+         cx24108_write(i2c,pll);
+         cx24110_writereg(i2c,0x56,0x7f);
+ 
+-	dvb_delay(HZ/10); /* wait a moment for the tuner pll to lock */
++	dvb_delay(10); /* wait a moment for the tuner pll to lock */
+ 
+ 	/* tuner pll lock can be monitored on GPIO pin 4 of cx24110 */
+         while (!(cx24110_readreg(i2c,0x66)&0x20)&&i<1000)
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/media/dvb/frontends/dst-bt878.h	2003-12-28 23:22:40.000000000 -0800
+@@ -0,0 +1,37 @@
++/*
++ * dst-bt878.h: part of the DST driver for the TwinHan DST Frontend
++ *
++ * Copyright (C) 2003 Jamie Honan
++ */
++
++struct dst_gpio_enable {
++	u32	mask;
++	u32	enable;
++};
++
++struct dst_gpio_output {
++	u32	mask;
++	u32	highvals;
++};
++
++struct dst_gpio_read {
++	unsigned long value;
++};
++
++union dst_gpio_packet {
++	struct dst_gpio_enable enb;
++	struct dst_gpio_output outp;
++	struct dst_gpio_read rd;
++	int    psize;
++};
++
++#define DST_IG_ENABLE	0
++#define DST_IG_WRITE	1
++#define DST_IG_READ	2
++#define DST_IG_TS       3
++
++struct bt878 ;
++
++int bt878_device_control(struct bt878 *bt, unsigned int cmd, union dst_gpio_packet *mp);
++
++struct bt878 *bt878_find_by_dvb_adap(struct dvb_adapter *adap);
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/media/dvb/frontends/dst.c	2003-12-28 23:22:37.000000000 -0800
+@@ -0,0 +1,1189 @@
++/* 
++    Frontend-driver for TwinHan DST Frontend
++
++    Copyright (C) 2003 Jamie Honan
++
++
++
++    This program is free software; you can redistribute it and/or modify
++    it under the terms of the GNU General Public License as published by
++    the Free Software Foundation; either version 2 of the License, or
++    (at your option) any later version.
++
++    This program is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++
++    GNU General Public License for more details.
++
++    You should have received a copy of the GNU General Public License
++    along with this program; if not, write to the Free Software
++    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++
++*/    
++
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/string.h>
++#include <linux/slab.h>
++#include <linux/vmalloc.h>
++#include <asm/div64.h>
++#include <asm/delay.h>
++
++#include "dvb_frontend.h"
++#include "dvb_functions.h"
++#include "dst-bt878.h"
++
++unsigned int dst_debug = 0;
++unsigned int dst_verbose = 0;
++
++MODULE_PARM(dst_verbose, "i");
++MODULE_PARM_DESC(dst_verbose,
++		 "verbose startup messages, default is 1 (yes)");
++MODULE_PARM(dst_debug, "i");
++MODULE_PARM_DESC(dst_debug, "debug messages, default is 0 (no)");
++
++unsigned int dst_type = (-1U);
++unsigned int dst_type_flags = (-1U);
++MODULE_PARM(dst_type, "i");
++MODULE_PARM_DESC(dst_type,
++		"Type of DST card, 0 Satellite, 1 terrestial TV, 2 Cable, default driver determined");
++MODULE_PARM(dst_type_flags, "i");
++MODULE_PARM_DESC(dst_type_flags,
++		"Type flags of DST card, bitfield 1=10 byte tuner, 2=TS is 204, 4=symdiv");
++
++#define dprintk	if (dst_debug) printk
++
++#define DST_TYPE_IS_SAT		0
++#define DST_TYPE_IS_TERR	1
++#define DST_TYPE_IS_CABLE	2
++
++#define DST_TYPE_HAS_NEWTUNE	1
++#define DST_TYPE_HAS_TS204	2
++#define DST_TYPE_HAS_SYMDIV	4
++
++#define HAS_LOCK	1
++#define ATTEMPT_TUNE	2
++#define HAS_POWER	4
++
++struct dst_data {
++	u8	tx_tuna[10];
++	u8	rx_tuna[10];
++	u8	rxbuffer[10];
++	u8	diseq_flags;
++	u8	dst_type;
++	u32	type_flags;
++	u32 frequency;     /* intermediate frequency in kHz for QPSK */
++        fe_spectral_inversion_t inversion;
++        u32   symbol_rate;  /* symbol rate in Symbols per second */
++	fe_code_rate_t  fec;
++	fe_sec_voltage_t voltage;
++	fe_sec_tone_mode_t tone;
++	u32 decode_freq;
++	u8  decode_lock;
++	u16 decode_strength;
++	u16 decode_snr;
++	unsigned long cur_jiff;
++	u8  k22;
++	fe_bandwidth_t bandwidth;
++	struct bt878 *bt;
++	struct dvb_i2c_bus *i2c;
++} ;
++
++static struct dvb_frontend_info dst_info_sat = {
++	.name 			= "DST SAT",
++	.type 			= FE_QPSK,
++	.frequency_min 		= 950000,
++	.frequency_max 		= 2150000,
++	.frequency_stepsize 	= 1000,           /* kHz for QPSK frontends */
++	.frequency_tolerance 	= 29500,
++	.symbol_rate_min	= 1000000,
++	.symbol_rate_max	= 45000000,
++/*     . symbol_rate_tolerance	= 	???,*/
++	.notifier_delay		= 50,                /* 1/20 s */
++	.caps = FE_CAN_INVERSION_AUTO |
++		FE_CAN_FEC_AUTO |
++		FE_CAN_QPSK
++};
++
++static struct dvb_frontend_info dst_info_cable = {
++	.name 			= "DST CABLE",
++	.type 			= FE_QAM,
++        .frequency_stepsize 	= 62500,
++	.frequency_min 		= 51000000,
++	.frequency_max 		= 858000000,
++	.symbol_rate_min	= 1000000,
++	.symbol_rate_max	= 45000000,
++/*     . symbol_rate_tolerance	= 	???,*/
++	.notifier_delay		= 50,                /* 1/20 s */
++	.caps = FE_CAN_INVERSION_AUTO |
++		FE_CAN_FEC_AUTO |
++		FE_CAN_QAM_AUTO
++};
++
++static struct dvb_frontend_info dst_info_tv = {
++	.name 			= "DST TERR",
++	.type 			= FE_OFDM,
++	.frequency_min 		= 137000000,
++	.frequency_max 		= 858000000,
++	.frequency_stepsize 	= 166667,
++	.caps = FE_CAN_INVERSION_AUTO |
++	    FE_CAN_FEC_AUTO |
++	    FE_CAN_QAM_AUTO |
++	    FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO
++};
++
++static void dst_packsize(struct dst_data *dst, int psize)
++{
++	union dst_gpio_packet bits;
++
++	bits.psize = psize;
++	bt878_device_control(dst->bt, DST_IG_TS, &bits);
++}
++
++static int dst_gpio_outb(struct dst_data *dst, u32 mask, u32 enbb, u32 outhigh)
++{
++	union dst_gpio_packet enb;
++	union dst_gpio_packet bits;
++	int err;
++
++	enb.enb.mask = mask;
++	enb.enb.enable = enbb;
++        if ((err = bt878_device_control(dst->bt, DST_IG_ENABLE, &enb)) < 0) {
++		dprintk ("%s: dst_gpio_enb error (err == %i, mask == 0x%02x, enb == 0x%02x)\n", __FUNCTION__, err, mask, enbb);
++		return -EREMOTEIO;
++	}
++
++	/* because complete disabling means no output, no need to do
++	 * output packet */
++	if (enbb == 0)
++		return 0;
++
++	bits.outp.mask = enbb;
++	bits.outp.highvals = outhigh;
++
++        if ((err = bt878_device_control(dst->bt, DST_IG_WRITE, &bits)) < 0) {
++		dprintk ("%s: dst_gpio_outb error (err == %i, enbb == 0x%02x, outhigh == 0x%02x)\n", __FUNCTION__, err, enbb, outhigh);
++		return -EREMOTEIO;
++	}
++        return 0;
++}
++
++static int dst_gpio_inb(struct dst_data *dst, u8 *result)
++{
++	union dst_gpio_packet rd_packet;
++	int err;
++
++	*result = 0;
++
++        if ((err = bt878_device_control(dst->bt, DST_IG_READ, &rd_packet)) < 0) {
++		dprintk ("%s: dst_gpio_inb error (err == %i)\n", __FUNCTION__, err);
++		return -EREMOTEIO;
++	}
++	*result = (u8)rd_packet.rd.value;
++        return 0;
++}
++
++#define DST_I2C_ENABLE	1
++#define DST_8820  	2
++
++static int
++dst_reset8820(struct dst_data *dst)
++{
++int retval;
++	/* pull 8820 gpio pin low, wait, high, wait, then low */
++	// dprintk ("%s: reset 8820\n", __FUNCTION__);
++	retval = dst_gpio_outb(dst, DST_8820, DST_8820, 0);
++	if (retval < 0)
++		return retval;
++	dvb_delay(10);
++	retval = dst_gpio_outb(dst, DST_8820, DST_8820, DST_8820);
++	if (retval < 0)
++		return retval;
++	/* wait for more feedback on what works here *
++	dvb_delay(10);
++	retval = dst_gpio_outb(dst, DST_8820, DST_8820, 0);
++	if (retval < 0)
++		return retval;
++	*/
++	return 0;
++}
++
++static int
++dst_i2c_enable(struct dst_data *dst)
++{
++int retval;
++	/* pull I2C enable gpio pin low, wait */
++	// dprintk ("%s: i2c enable\n", __FUNCTION__);
++	retval = dst_gpio_outb(dst, ~0, DST_I2C_ENABLE, 0);
++	if (retval < 0)
++		return retval;
++	// dprintk ("%s: i2c enable delay\n", __FUNCTION__);
++	dvb_delay(33);
++	return 0;
++}
++
++static int
++dst_i2c_disable(struct dst_data *dst)
++{
++int retval;
++	/* release I2C enable gpio pin, wait */
++	// dprintk ("%s: i2c disable\n", __FUNCTION__);
++	retval = dst_gpio_outb(dst, ~0, 0, 0);
++	if (retval < 0)
++		return retval;
++	// dprintk ("%s: i2c disable delay\n", __FUNCTION__);
++	dvb_delay(33);
++	return 0;
++}
++
++static int
++dst_wait_dst_ready(struct dst_data *dst)
++{
++u8 reply;
++int retval;
++int i;
++	for (i = 0; i < 200; i++) {
++		retval = dst_gpio_inb(dst, &reply);
++		if (retval < 0)
++			return retval;
++		if ((reply & DST_I2C_ENABLE) == 0) {
++			dprintk ("%s: dst wait ready after %d\n", __FUNCTION__, i);
++			return 1;
++		}
++		dvb_delay(5);
++	}
++	dprintk ("%s: dst wait NOT ready after %d\n", __FUNCTION__, i);
++	return 0;
++}
++
++#define DST_I2C_ADDR 0x55
++
++static int write_dst (struct dst_data *dst, u8 *data, u8 len)
++{
++	struct i2c_msg msg = {
++		.addr = DST_I2C_ADDR, .flags = 0, .buf = data, .len = len };
++	int err;
++	int cnt;
++
++	if (dst_debug && dst_verbose) {
++		u8 i;
++		dprintk("%s writing",__FUNCTION__);
++		for (i = 0 ; i < len ; i++) {
++			dprintk(" 0x%02x", data[i]);
++		}
++		dprintk("\n");
++	}
++	dvb_delay(30);
++	for (cnt = 0; cnt < 4; cnt++) {
++		if ((err = dst->i2c->xfer (dst->i2c, &msg, 1)) < 0) {
++			dprintk ("%s: write_dst error (err == %i, len == 0x%02x, b0 == 0x%02x)\n", __FUNCTION__, err, len, data[0]);
++			dst_i2c_disable(dst);
++			dvb_delay(500);
++			dst_i2c_enable(dst);
++			dvb_delay(500);
++			continue;
++		} else
++			break;
++	}
++	if (cnt >= 4)
++		return -EREMOTEIO;
++        return 0;
++}
++
++static int read_dst (struct dst_data *dst, u8 *ret, u8 len)
++{
++	struct i2c_msg msg = 
++		{ .addr = DST_I2C_ADDR, .flags = I2C_M_RD, .buf = ret, .len = len };
++	int err;
++	int cnt;
++
++	for (cnt = 0; cnt < 4; cnt++) {
++		if ((err = dst->i2c->xfer (dst->i2c, &msg, 1)) < 0) {
++			dprintk ("%s: read_dst error (err == %i, len == 0x%02x, b0 == 0x%02x)\n", __FUNCTION__, err, len, ret[0]);
++			dst_i2c_disable(dst);
++			dst_i2c_enable(dst);
++			continue;
++		} else
++			break;
++	}
++	if (cnt >= 4)
++		return -EREMOTEIO;
++	dprintk("%s reply is 0x%x\n", __FUNCTION__, ret[0]);
++	if (dst_debug && dst_verbose) {
++		for (err = 1; err < len; err++)
++			dprintk(" 0x%x", ret[err]);
++		if (err > 1)
++			dprintk("\n");
++	}
++	return 0;
++}
++
++static int dst_set_freq(struct dst_data *dst, u32 freq)
++{
++	u8 *val;
++
++	dst->frequency = freq;
++
++	// dprintk("%s: set frequency %u\n", __FUNCTION__, freq);
++	if (dst->dst_type == DST_TYPE_IS_SAT) {
++		freq = freq / 1000;
++		if (freq < 950 || freq > 2150)
++			return -EINVAL;
++		val = &dst->tx_tuna[0];
++		val[2] = (freq >> 8) & 0x7f;
++		val[3] = (u8)freq;
++		val[4] = 1;
++		val[8] &= ~4;
++		if (freq < 1531)
++			val[8] |= 4;
++	} else if (dst->dst_type == DST_TYPE_IS_TERR) {
++		freq = freq / 1000;
++		if (freq < 137000 || freq > 858000)
++			return -EINVAL;
++		val = &dst->tx_tuna[0];
++		val[2] = (freq >> 16) & 0xff;
++		val[3] = (freq >> 8) & 0xff;
++		val[4] = (u8)freq;
++		val[5] = 0;
++		switch (dst->bandwidth) {
++		case BANDWIDTH_6_MHZ:
++			val[6] = 6;
++			break;
++
++		case BANDWIDTH_7_MHZ:
++		case BANDWIDTH_AUTO:
++			val[6] = 7;
++			break;
++
++		case BANDWIDTH_8_MHZ:
++			val[6] = 8;
++			break;
++		}
++
++		val[7] = 0;
++		val[8] = 0;
++	} else if (dst->dst_type == DST_TYPE_IS_CABLE) {
++		/* guess till will get one */
++		freq = freq / 1000;
++		val = &dst->tx_tuna[0];
++		val[2] = (freq >> 16) & 0xff;
++		val[3] = (freq >> 8) & 0xff;
++		val[4] = (u8)freq;
++	} else
++		return -EINVAL;
++	return 0;
++}
++
++static int dst_set_bandwidth(struct dst_data *dst, fe_bandwidth_t bandwidth)
++{
++	u8 *val;
++
++	dst->bandwidth = bandwidth;
++
++	if (dst->dst_type != DST_TYPE_IS_TERR)
++		return 0;
++
++	val = &dst->tx_tuna[0];
++        switch (bandwidth) {
++	case BANDWIDTH_6_MHZ:
++		val[6] = 6;
++		break;
++
++	case BANDWIDTH_7_MHZ:
++		val[6] = 7;
++		break;
++
++	case BANDWIDTH_8_MHZ:
++		val[6] = 8;
++		break;
++
++	default:
++		return -EINVAL;
++	}
++	return 0;
++}
++
++static int dst_set_inversion (struct dst_data *dst, fe_spectral_inversion_t inversion)
++{
++	u8 *val;
++
++	dst->inversion = inversion;
++
++	val = &dst->tx_tuna[0];
++
++	val[8] &= ~0x80;
++
++	switch (inversion) {
++	case INVERSION_OFF:
++		break;
++	case INVERSION_ON:
++		val[8] |= 0x80;
++		break;
++	case INVERSION_AUTO:
++		break;
++	default:
++		return -EINVAL;
++	}
++	return 0;
++}
++
++
++static int dst_set_fec (struct dst_data *dst, fe_code_rate_t fec)
++{
++	dst->fec = fec;
++	return 0;
++}
++
++static fe_code_rate_t dst_get_fec (struct dst_data *dst)
++{
++	return dst->fec;
++}
++
++static int dst_set_symbolrate (struct dst_data *dst, u32 srate)
++{
++	u8 *val;
++	u32 symcalc;
++	u64 sval;
++
++	dst->symbol_rate = srate;
++
++	if (dst->dst_type == DST_TYPE_IS_TERR) {
++		return 0;
++	}
++
++	// dprintk("%s: set srate %u\n", __FUNCTION__, srate);
++	srate /= 1000;
++	val = &dst->tx_tuna[0];
++
++	if (dst->type_flags & DST_TYPE_HAS_SYMDIV) {
++		sval = srate;
++		sval <<= 20;
++		do_div(sval, 88000);
++	        symcalc = (u32)sval;
++		// dprintk("%s: set symcalc %u\n", __FUNCTION__, symcalc);
++		val[5] = (u8)(symcalc >> 12);
++		val[6] = (u8)(symcalc >> 4);
++		val[7] = (u8)(symcalc << 4);
++	} else {
++		val[5] = (u8)(srate >> 16) & 0x7f;
++		val[6] = (u8)(srate >> 8);
++		val[7] = (u8)srate;
++	}
++	val[8] &= ~0x20;
++	if (srate > 8000)
++		val[8] |= 0x20;
++	return 0;
++}
++
++
++static u8 dst_check_sum(u8 *buf, u32 len)
++{
++	u32 i;
++	u8  val = 0;
++	if (!len)
++		return 0;
++	for (i = 0; i < len; i++) {
++		val += buf[i];
++	}
++	return ((~val) + 1);
++}
++
++typedef struct dst_types {
++	char	*mstr;
++	int	offs;
++	u8	dst_type;
++	u32	type_flags;
++} DST_TYPES;
++
++struct dst_types dst_tlist[] = {
++	{ "DST-020", 0,  DST_TYPE_IS_SAT,    DST_TYPE_HAS_SYMDIV },
++	{ "DST-030", 0,  DST_TYPE_IS_SAT,    DST_TYPE_HAS_TS204|DST_TYPE_HAS_NEWTUNE },
++	{ "DST-03T", 0,  DST_TYPE_IS_SAT,    DST_TYPE_HAS_SYMDIV|DST_TYPE_HAS_TS204},
++	{ "DST-MOT", 0,  DST_TYPE_IS_SAT,    DST_TYPE_HAS_SYMDIV },
++	{ "DST-CI",  1,  DST_TYPE_IS_SAT,    DST_TYPE_HAS_TS204|DST_TYPE_HAS_NEWTUNE },
++	{ "DSTMCI",  1,  DST_TYPE_IS_SAT,    DST_TYPE_HAS_NEWTUNE },
++	{ "DSTFCI",  1,  DST_TYPE_IS_SAT,    DST_TYPE_HAS_NEWTUNE },
++	{ "DCTNEW",  1,  DST_TYPE_IS_CABLE,  DST_TYPE_HAS_NEWTUNE },
++	{ "DCT_CI",  1,  DST_TYPE_IS_CABLE,  DST_TYPE_HAS_NEWTUNE|DST_TYPE_HAS_TS204 },
++	{ "DTTDIG" , 1,  DST_TYPE_IS_TERR,   0} };
++/* DCTNEW and DCT-CI are guesses */
++
++static void dst_type_flags_print(u32 type_flags)
++{
++	printk("DST type flags :");
++	if (type_flags & DST_TYPE_HAS_NEWTUNE)
++		printk(" 0x%x newtuner", DST_TYPE_HAS_NEWTUNE);
++	if (type_flags & DST_TYPE_HAS_TS204)
++		printk(" 0x%x ts204", DST_TYPE_HAS_TS204);
++	if (type_flags & DST_TYPE_HAS_SYMDIV)
++		printk(" 0x%x symdiv", DST_TYPE_HAS_SYMDIV);
++	printk("\n");
++}
++
++static int dst_type_print(u8 type)
++{
++	char *otype;
++	switch (type) {
++		case DST_TYPE_IS_SAT:
++			otype = "satellite";
++			break;
++		case DST_TYPE_IS_TERR:
++			otype = "terrestial TV";
++			break;
++		case DST_TYPE_IS_CABLE:
++			otype = "terrestial TV";
++			break;
++		default:
++			printk("%s: invalid dst type %d\n",
++				__FUNCTION__, type);
++			return -EINVAL;
++	}
++	printk("DST type : %s\n", otype);
++	return 0;
++}
++
++static int dst_check_ci (struct dst_data *dst)
++{
++	u8 txbuf[8];
++	u8 rxbuf[8];
++	int retval;
++	int i;
++	struct dst_types *dsp;
++	u8 use_dst_type;
++	u32 use_type_flags;
++
++	memset(txbuf, 0, sizeof(txbuf));
++	txbuf[1] = 6;
++	txbuf[7] = dst_check_sum (txbuf, 7);
++ 
++	dst_i2c_enable(dst);
++	dst_reset8820(dst);
++	retval = write_dst (dst, txbuf, 8);
++	if (retval < 0) {
++		dst_i2c_disable(dst);
++		dprintk("%s: write not successful, maybe no card?\n", __FUNCTION__);
++		return retval;
++	}
++	dvb_delay(3);
++	retval = read_dst (dst, rxbuf, 1);
++	dst_i2c_disable(dst);
++	if (retval < 0) {
++		dprintk("%s: read not successful, maybe no card?\n", __FUNCTION__);
++		return retval;
++	}
++	if (rxbuf[0] != 0xff) {
++		dprintk("%s: write reply not 0xff, not ci (%02x)\n", __FUNCTION__, rxbuf[0]);
++		return retval;
++	}
++	if (!dst_wait_dst_ready(dst))
++		return 0;
++	// dst_i2c_enable(i2c); Dimitri
++	retval = read_dst (dst, rxbuf, 8);
++	dst_i2c_disable(dst);
++	if (retval < 0) {
++		dprintk("%s: read not successful\n", __FUNCTION__);
++		return retval;
++	}
++	if (rxbuf[7] != dst_check_sum (rxbuf, 7)) {
++		dprintk("%s: checksum failure\n", __FUNCTION__);
++		return retval;
++	}
++	rxbuf[7] = '\0';
++	for (i = 0, dsp = &dst_tlist[0]; i < sizeof(dst_tlist) / sizeof(dst_tlist[0]); i++, dsp++) {
++		if (!strncmp(&rxbuf[dsp->offs],
++				dsp->mstr,
++				strlen(dsp->mstr))) {
++			use_type_flags = dsp->type_flags;
++			use_dst_type = dsp->dst_type;
++			printk("%s: recognize %s\n", __FUNCTION__, dsp->mstr);
++			break;
++		}
++	}
++	if (i >= sizeof(dst_tlist) / sizeof(dst_tlist[0])) {
++		printk("%s: unable to recognize %s or %s\n", __FUNCTION__, &rxbuf[0], &rxbuf[1]);
++		printk("%s please email linux-dvb@linuxtv.org with this type in\n", __FUNCTION__);
++		use_dst_type = DST_TYPE_IS_SAT;
++		use_type_flags = DST_TYPE_HAS_SYMDIV;
++	}
++	switch (dst_type) {
++		case (-1U):
++			/* not used */
++			break;
++		case DST_TYPE_IS_SAT:
++		case DST_TYPE_IS_TERR:
++		case DST_TYPE_IS_CABLE:
++			use_dst_type = (u8)dst_type;
++			break;
++		default:
++			printk("%s: invalid user override dst type %d, not used\n",
++				__FUNCTION__, dst_type);
++			break;
++	}
++	dst_type_print(use_dst_type);
++	if (dst_type_flags != (-1U)) {
++		printk("%s: user override dst type flags 0x%x\n",
++				__FUNCTION__, dst_type_flags);
++		use_type_flags = dst_type_flags;
++	}
++	dst->type_flags = use_type_flags;
++	dst->dst_type= use_dst_type;
++	dst_type_flags_print(dst->type_flags);
++
++	if (dst->type_flags & DST_TYPE_HAS_TS204) {
++		dst_packsize(dst, 204);
++	}
++	return 0;
++}
++
++static int dst_command (struct dst_data *dst, u8 *data, u8 len)
++{
++	int retval;
++	u8 reply;
++
++	dst_i2c_enable(dst);
++	dst_reset8820(dst);
++	retval = write_dst (dst, data, len);
++	if (retval < 0) {
++		dst_i2c_disable(dst);
++		dprintk("%s: write not successful\n", __FUNCTION__);
++		return retval;
++	}
++	dvb_delay(33);
++	retval = read_dst (dst, &reply, 1);
++	dst_i2c_disable(dst);
++	if (retval < 0) {
++		dprintk("%s: read verify  not successful\n", __FUNCTION__);
++		return retval;
++	}
++	if (reply != 0xff) {
++		dprintk("%s: write reply not 0xff 0x%02x \n", __FUNCTION__, reply);
++		return 0;
++	}
++	if (len >= 2 && data[0] == 0 && (data[1] == 1 || data[1] == 3))
++		return 0;
++	if (!dst_wait_dst_ready(dst))
++		return 0;
++	// dst_i2c_enable(i2c); Per dimitri
++	retval = read_dst (dst, dst->rxbuffer, 8);
++	dst_i2c_disable(dst);
++	if (retval < 0) {
++		dprintk("%s: read not successful\n", __FUNCTION__);
++		return 0;
++	}
++	if (dst->rxbuffer[7] != dst_check_sum (dst->rxbuffer, 7)) {
++		dprintk("%s: checksum failure\n", __FUNCTION__);
++		return 0;
++	}
++	return 0;
++}
++
++static int dst_get_signal(struct dst_data *dst)
++{
++	int retval;
++	u8 get_signal[] = {0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfb};
++
++	if ((dst->diseq_flags & ATTEMPT_TUNE) == 0) {
++		dst->decode_lock = dst->decode_strength = dst->decode_snr = 0;
++		return 0;
++	}
++	if (0 == (dst->diseq_flags & HAS_LOCK)) {
++		dst->decode_lock = dst->decode_strength = dst->decode_snr = 0;
++		return 0;
++	}
++	if (time_after_eq(jiffies, dst->cur_jiff + (HZ/5))) {
++		retval =  dst_command(dst, get_signal, 8);
++		if (retval < 0)
++			return retval;
++		if (dst->dst_type == DST_TYPE_IS_SAT) {
++			dst->decode_lock = ((dst->rxbuffer[6] & 0x10) == 0) ?
++					1 : 0;
++			dst->decode_strength = dst->rxbuffer[5] << 8;
++			dst->decode_snr = dst->rxbuffer[2] << 8 |
++				dst->rxbuffer[3];
++		} else if ((dst->dst_type == DST_TYPE_IS_TERR) ||
++				(dst->dst_type == DST_TYPE_IS_CABLE)) {
++			dst->decode_lock = (dst->rxbuffer[1]) ?
++					1 : 0;
++			dst->decode_strength = dst->rxbuffer[4] << 8;
++			dst->decode_snr = dst->rxbuffer[3] << 8;
++		}
++		dst->cur_jiff = jiffies;
++	}
++	return 0;
++}
++
++/*
++ * line22k0    0x00, 0x09, 0x00, 0xff, 0x01, 0x00, 0x00, 0x00
++ * line22k1    0x00, 0x09, 0x01, 0xff, 0x01, 0x00, 0x00, 0x00
++ * line22k2    0x00, 0x09, 0x02, 0xff, 0x01, 0x00, 0x00, 0x00
++ * tone        0x00, 0x09, 0xff, 0x00, 0x01, 0x00, 0x00, 0x00
++ * data        0x00, 0x09, 0xff, 0x01, 0x01, 0x00, 0x00, 0x00
++ * power_off   0x00, 0x09, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00
++ * power_on    0x00, 0x09, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00
++ * Diseqc 1    0x00, 0x08, 0x04, 0xe0, 0x10, 0x38, 0xf0, 0xec
++ * Diseqc 2    0x00, 0x08, 0x04, 0xe0, 0x10, 0x38, 0xf4, 0xe8 
++ * Diseqc 3    0x00, 0x08, 0x04, 0xe0, 0x10, 0x38, 0xf8, 0xe4 
++ * Diseqc 4    0x00, 0x08, 0x04, 0xe0, 0x10, 0x38, 0xfc, 0xe0 
++ */
++
++static int dst_set_diseqc (struct dst_data *dst, u8 *cmd, u8 len)
++{
++	u8 paket[8] =  {0x00, 0x08, 0x04, 0xe0, 0x10, 0x38, 0xf0, 0xec };
++
++	if (dst->dst_type == DST_TYPE_IS_TERR)
++		return 0;
++
++	if (len == 0 || len > 4)
++		return -EINVAL;
++	memcpy(&paket[3], cmd, len);
++	paket[7] = dst_check_sum (&paket[0], 7);
++	dst_command(dst, paket, 8);
++	return 0;
++}
++
++static int dst_tone_power_cmd (struct dst_data *dst)
++{
++	u8 paket[8] =  {0x00, 0x09, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00};
++
++	if (dst->dst_type == DST_TYPE_IS_TERR)
++		return 0;
++
++	if (dst->voltage == SEC_VOLTAGE_OFF) 
++		paket[4] = 0;
++	else
++		paket[4] = 1;
++	if (dst->tone == SEC_TONE_ON)
++		paket[2] = dst->k22;
++	else
++		paket[2] = 0;
++	paket[7] = dst_check_sum (&paket[0], 7);
++	dst_command(dst, paket, 8);
++	return 0;
++}
++
++static int dst_set_voltage (struct dst_data *dst, fe_sec_voltage_t voltage)
++{
++	u8 *val;
++	int need_cmd;
++
++	dst->voltage = voltage;
++
++	if (dst->dst_type == DST_TYPE_IS_TERR)
++		return 0;
++
++	need_cmd = 0;
++	val = &dst->tx_tuna[0];
++	val[8] &= ~0x40;
++	switch (voltage) {
++	case SEC_VOLTAGE_13:
++		if ((dst->diseq_flags & HAS_POWER) == 0)
++			need_cmd = 1;
++		dst->diseq_flags |= HAS_POWER;
++		break;
++	case SEC_VOLTAGE_18:
++		if ((dst->diseq_flags & HAS_POWER) == 0)
++			need_cmd = 1;
++		dst->diseq_flags |= HAS_POWER;
++		val[8] |= 0x40;
++		break;
++	case SEC_VOLTAGE_OFF:
++		need_cmd = 1;
++		dst->diseq_flags &= ~(HAS_POWER|HAS_LOCK|ATTEMPT_TUNE);
++		break;
++	default:
++		return -EINVAL;
++	}
++	if (need_cmd) {
++		dst_tone_power_cmd(dst);
++	}
++	return 0;
++}
++
++
++static int dst_set_tone (struct dst_data *dst, fe_sec_tone_mode_t tone)
++{
++	u8 *val;
++
++	dst->tone = tone;
++
++	if (dst->dst_type == DST_TYPE_IS_TERR)
++		return 0;
++
++	val = &dst->tx_tuna[0];
++
++	val[8] &= ~0x1;
++
++	switch (tone) {
++	case SEC_TONE_OFF:
++		break;
++	case SEC_TONE_ON:
++		val[8] |= 1;
++		break;
++	default:
++		return -EINVAL;
++	}
++	dst_tone_power_cmd(dst);
++	return 0;
++}
++
++static int dst_get_tuna (struct dst_data *dst)
++{
++int retval;
++	if ((dst->diseq_flags & ATTEMPT_TUNE) == 0)
++		return 0;
++	dst->diseq_flags &= ~(HAS_LOCK);
++	if (!dst_wait_dst_ready(dst))
++		return 0;
++	if (dst->type_flags & DST_TYPE_HAS_NEWTUNE) {
++		/* how to get variable length reply ???? */
++		retval = read_dst (dst, dst->rx_tuna, 10);
++	} else {
++		retval = read_dst (dst, &dst->rx_tuna[2], 8);
++	}
++	if (retval < 0) {
++		dprintk("%s: read not successful\n", __FUNCTION__);
++		return 0;
++	}
++	if (dst->type_flags & DST_TYPE_HAS_NEWTUNE) {
++		if (dst->rx_tuna[9] != dst_check_sum (&dst->rx_tuna[0], 9)) {
++			dprintk("%s: checksum failure?\n", __FUNCTION__);
++			return 0;
++		}
++	} else {
++		if (dst->rx_tuna[9] != dst_check_sum (&dst->rx_tuna[2], 7)) {
++			dprintk("%s: checksum failure?\n", __FUNCTION__);
++			return 0;
++		}
++	}
++	if (dst->rx_tuna[2] == 0 && dst->rx_tuna[3] == 0)
++		return 0;
++	dst->decode_freq = ((dst->rx_tuna[2] & 0x7f) << 8) +  dst->rx_tuna[3];
++
++	dst->decode_lock = 1;
++	/*
++	dst->decode_n1 = (dst->rx_tuna[4] << 8) +  
++			(dst->rx_tuna[5]);
++
++	dst->decode_n2 = (dst->rx_tuna[8] << 8) +  
++			(dst->rx_tuna[7]);
++	*/
++	dst->diseq_flags |= HAS_LOCK;
++	/* dst->cur_jiff = jiffies; */
++	return 1;
++}
++
++static int dst_write_tuna (struct dst_data *dst)
++{
++	int retval;
++	u8 reply;
++
++	dprintk("%s: type_flags 0x%x \n", __FUNCTION__, dst->type_flags);
++	dst->decode_freq = 0;
++	dst->decode_lock = dst->decode_strength = dst->decode_snr = 0;
++	if (dst->dst_type == DST_TYPE_IS_SAT) {
++		if (!(dst->diseq_flags & HAS_POWER))
++			dst_set_voltage (dst, SEC_VOLTAGE_13);
++	}
++	dst->diseq_flags &= ~(HAS_LOCK|ATTEMPT_TUNE);
++	dst_i2c_enable(dst);
++	if (dst->type_flags & DST_TYPE_HAS_NEWTUNE) {
++		dst_reset8820(dst);
++		dst->tx_tuna[9] = dst_check_sum (&dst->tx_tuna[0], 9);
++		retval = write_dst (dst, &dst->tx_tuna[0], 10);
++	} else {
++		dst->tx_tuna[9] = dst_check_sum (&dst->tx_tuna[2], 7);
++		retval = write_dst (dst, &dst->tx_tuna[2], 8);
++	}
++	if (retval < 0) {
++		dst_i2c_disable(dst);
++		dprintk("%s: write not successful\n", __FUNCTION__);
++		return retval;
++	}
++	dvb_delay(3);
++	retval = read_dst (dst, &reply, 1);
++	dst_i2c_disable(dst);
++	if (retval < 0) {
++		dprintk("%s: read verify  not successful\n", __FUNCTION__);
++		return retval;
++	}
++	if (reply != 0xff) {
++		dprintk("%s: write reply not 0xff 0x%02x \n", __FUNCTION__, reply);
++		return 0;
++	}
++	dst->diseq_flags |= ATTEMPT_TUNE;
++	return dst_get_tuna(dst);
++}
++
++static void dst_init (struct dst_data *dst)
++{
++static u8 ini_satci_tuna[] = {  9, 0, 3, 0xb6, 1, 0,    0x73, 0x21, 0, 0 };
++static u8 ini_satfta_tuna[] = { 0, 0, 3, 0xb6, 1, 0x55, 0xbd, 0x50, 0, 0 };
++static u8 ini_tvfta_tuna[] = { 0, 0,  3, 0xb6, 1, 7,    0x0,   0x0, 0, 0 };
++static u8 ini_tvci_tuna[] = { 9, 0,  3, 0xb6, 1, 7,    0x0,   0x0, 0, 0 };
++static u8 ini_cabfta_tuna[] = { 0, 0,  3, 0xb6, 1, 7,    0x0,   0x0, 0, 0 };
++static u8 ini_cabci_tuna[] = { 9, 0,  3, 0xb6, 1, 7,    0x0,   0x0, 0, 0 };
++	dst->inversion = INVERSION_ON;
++	dst->voltage = SEC_VOLTAGE_13;
++	dst->tone = SEC_TONE_OFF;
++	dst->symbol_rate = 29473000;
++	dst->fec = FEC_AUTO;
++	dst->diseq_flags = 0;
++	dst->k22 = 0x02;
++	dst->bandwidth = BANDWIDTH_7_MHZ;
++	dst->cur_jiff = jiffies;
++	if (dst->dst_type == DST_TYPE_IS_SAT) {
++		dst->frequency = 950000;
++		memcpy(dst->tx_tuna, ((dst->type_flags &  DST_TYPE_HAS_NEWTUNE )? 
++					ini_satci_tuna : ini_satfta_tuna),
++				sizeof(ini_satfta_tuna));
++	} else if (dst->dst_type == DST_TYPE_IS_TERR) {
++		dst->frequency = 137000000;
++		memcpy(dst->tx_tuna, ((dst->type_flags &  DST_TYPE_HAS_NEWTUNE )? 
++					ini_tvci_tuna : ini_tvfta_tuna),
++				sizeof(ini_tvfta_tuna));
++	} else if (dst->dst_type == DST_TYPE_IS_CABLE) {
++		dst->frequency = 51000000;
++		memcpy(dst->tx_tuna, ((dst->type_flags &  DST_TYPE_HAS_NEWTUNE )? 
++					ini_cabci_tuna : ini_cabfta_tuna),
++				sizeof(ini_cabfta_tuna));
++	}
++}
++
++struct lkup {
++	unsigned int cmd;
++	char *desc;
++} looker[] = {
++	{FE_GET_INFO,                "FE_GET_INFO:"},
++	{FE_READ_STATUS,             "FE_READ_STATUS:" },
++	{FE_READ_BER,                "FE_READ_BER:" },
++	{FE_READ_SIGNAL_STRENGTH,    "FE_READ_SIGNAL_STRENGTH:" },
++	{FE_READ_SNR,                "FE_READ_SNR:" },
++	{FE_READ_UNCORRECTED_BLOCKS, "FE_READ_UNCORRECTED_BLOCKS:" },
++	{FE_SET_FRONTEND,            "FE_SET_FRONTEND:" },
++	{FE_GET_FRONTEND,            "FE_GET_FRONTEND:" },
++	{FE_SLEEP,                   "FE_SLEEP:" },
++	{FE_INIT,                    "FE_INIT:" },
++	{FE_RESET,                   "FE_RESET:" },
++	{FE_SET_TONE,                "FE_SET_TONE:" },
++	{FE_SET_VOLTAGE,             "FE_SET_VOLTAGE:" },
++	};
++
++static int dst_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
++{
++	struct dst_data *dst = fe->data;
++	int retval;
++	/*
++	char  *cc;
++                
++	cc = "FE_UNSUPP:";
++	for(retval = 0; retval < sizeof(looker) / sizeof(looker[0]); retval++) {
++		if (looker[retval].cmd == cmd) {
++			cc = looker[retval].desc;
++			break;
++		}
++	}
++	dprintk("%s cmd %s (0x%x)\n",__FUNCTION__, cc, cmd);
++	*/
++	// printk("%s: dst %8.8x bt %8.8x i2c %8.8x\n", __FUNCTION__, dst, dst->bt, dst->i2c);
++	/* should be set by attach, but just in case */
++	dst->i2c = fe->i2c;
++        switch (cmd) {
++        case FE_GET_INFO: 
++	{
++	     struct dvb_frontend_info *info;
++		info = &dst_info_sat;
++		if (dst->dst_type == DST_TYPE_IS_TERR)
++			info = &dst_info_tv;
++		else if (dst->dst_type == DST_TYPE_IS_CABLE)
++			info = &dst_info_cable;
++		memcpy (arg, info, sizeof(struct dvb_frontend_info));
++		break;
++	}
++        case FE_READ_STATUS:
++	{
++		fe_status_t *status = arg;
++
++		*status = 0;
++		if (dst->diseq_flags & HAS_LOCK) {
++			dst_get_signal(dst);
++			if (dst->decode_lock)
++				*status |= FE_HAS_LOCK 
++					| FE_HAS_SIGNAL 
++					| FE_HAS_CARRIER
++					| FE_HAS_SYNC
++					| FE_HAS_VITERBI;
++		}
++		break;
++	}
++
++        case FE_READ_BER:
++	{
++		/* guess */
++		// *(u32*) arg = dst->decode_n1;
++		*(u32*) arg = 0;
++		return -EOPNOTSUPP; 
++	}
++
++        case FE_READ_SIGNAL_STRENGTH:
++	{
++		dst_get_signal(dst);
++		*((u16*) arg) = dst->decode_strength;
++		break;
++	}
++
++        case FE_READ_SNR:
++	{
++		dst_get_signal(dst);
++		*((u16*) arg) = dst->decode_snr;
++		break;
++	}
++
++	case FE_READ_UNCORRECTED_BLOCKS: 
++	{
++		*((u32*) arg) = 0;    /* the stv0299 can't measure BER and */
++		return -EOPNOTSUPP;   /* errors at the same time.... */
++	}
++
++        case FE_SET_FRONTEND:
++        {
++		struct dvb_frontend_parameters *p = arg;
++
++		dst_set_freq (dst, p->frequency);
++		dst_set_inversion (dst, p->inversion);
++		if (dst->dst_type == DST_TYPE_IS_SAT) {
++			dst_set_fec (dst, p->u.qpsk.fec_inner);
++			dst_set_symbolrate (dst, p->u.qpsk.symbol_rate);
++		} else if (dst->dst_type == DST_TYPE_IS_TERR) {
++			dst_set_bandwidth(dst, p->u.ofdm.bandwidth);
++		} else if (dst->dst_type == DST_TYPE_IS_CABLE) {
++			dst_set_fec (dst, p->u.qam.fec_inner);
++			dst_set_symbolrate (dst, p->u.qam.symbol_rate);
++		}
++		dst_write_tuna (dst);
++
++                break;
++        }
++
++	case FE_GET_FRONTEND:
++	{
++		struct dvb_frontend_parameters *p = arg;
++
++
++		p->frequency = dst->decode_freq;
++		p->inversion = dst->inversion;
++		if (dst->dst_type == DST_TYPE_IS_SAT) {
++			p->u.qpsk.symbol_rate = dst->symbol_rate;
++			p->u.qpsk.fec_inner = dst_get_fec (dst);
++		} else if (dst->dst_type == DST_TYPE_IS_TERR) {
++			p->u.ofdm.bandwidth = dst->bandwidth;
++		} else if (dst->dst_type == DST_TYPE_IS_CABLE) {
++			p->u.qam.symbol_rate = dst->symbol_rate;
++			p->u.qam.fec_inner = dst_get_fec (dst);
++			p->u.qam.modulation = QAM_AUTO;
++		}
++		break;
++	}
++
++        case FE_SLEEP:
++		return 0;
++
++        case FE_INIT:
++		dst_init(dst);
++		break;
++
++	case FE_RESET:
++		break;
++
++	case FE_DISEQC_SEND_MASTER_CMD:
++	{
++		struct dvb_diseqc_master_cmd *cmd = (struct dvb_diseqc_master_cmd *)arg;
++		retval = dst_set_diseqc (dst, cmd->msg, cmd->msg_len);
++		if (retval < 0)
++			return retval;
++		break;
++	}
++	case FE_SET_TONE:
++		retval = dst_set_tone (dst, (fe_sec_tone_mode_t) arg);
++		if (retval < 0)
++			return retval;
++		break;
++	case FE_SET_VOLTAGE:
++		retval = dst_set_voltage (dst, (fe_sec_voltage_t) arg);
++		if (retval < 0)
++			return retval;
++		break;
++	default:
++		return -EOPNOTSUPP;
++        };
++        
++        return 0;
++} 
++
++
++static int dst_attach (struct dvb_i2c_bus *i2c, void **data)
++{
++	struct dst_data *dst;
++	struct bt878 *bt;
++	struct dvb_frontend_info *info;
++
++	dprintk("%s: check ci\n", __FUNCTION__);
++	bt = bt878_find_by_dvb_adap(i2c->adapter);
++	if (!bt)
++		return -ENODEV;
++	dst = kmalloc(sizeof(struct dst_data), GFP_KERNEL);
++	if (dst == NULL) {
++		printk(KERN_INFO "%s: Out of memory.\n", __FUNCTION__);
++		return -ENOMEM;
++	}
++	memset(dst, 0, sizeof(*dst));
++	*data = dst;
++	dst->bt = bt;
++	dst->i2c = i2c;
++	if (dst_check_ci(dst) < 0) {
++		kfree(dst);
++		return -ENODEV;
++	}
++
++	dst_init (dst);
++	dprintk("%s: register dst %8.8x bt %8.8x i2c %8.8x\n", __FUNCTION__, 
++			(u32)dst, (u32)(dst->bt), (u32)(dst->i2c));
++
++	info = &dst_info_sat;
++	if (dst->dst_type == DST_TYPE_IS_TERR)
++		info = &dst_info_tv;
++	else if (dst->dst_type == DST_TYPE_IS_CABLE)
++		info = &dst_info_cable;
++
++	dvb_register_frontend (dst_ioctl, i2c, dst, info);
++
++	return 0;
++}
++
++static void dst_detach (struct dvb_i2c_bus *i2c, void *data)
++{
++	dvb_unregister_frontend (dst_ioctl, i2c);
++	dprintk("%s: unregister dst %8.8x\n", __FUNCTION__, (u32)(data));
++	if (data)
++		kfree(data);
++}
++
++static int __init init_dst (void)
++{
++	return dvb_register_i2c_device (THIS_MODULE, dst_attach, dst_detach);
++}
++
++static void __exit exit_dst (void)
++{
++	dvb_unregister_i2c_device (dst_attach);
++}
++
++
++module_init(init_dst);
++module_exit(exit_dst);
++
++MODULE_DESCRIPTION("DST DVB-S Frontend");
++MODULE_AUTHOR("Jamie Honan");
++MODULE_LICENSE("GPL");
++
+--- linux-2.6.0/drivers/media/dvb/frontends/Kconfig	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/media/dvb/frontends/Kconfig	2003-12-28 23:22:37.000000000 -0800
+@@ -1,6 +1,17 @@
+ comment "Supported Frontend Modules"
+ 	depends on DVB
+ 
++config DVB_TWINHAN_DST
++	tristate "TWINHAN DST based DVB-S frontend (QPSK)"
++	depends on DVB_CORE
++	help
++	  Used in such cards as the VP-1020/1030, Twinhan DST,
++	  VVmer TV@SAT. Say Y when you want to support frontends 
++	  using this asic.
++
++	  This module requires the dvb-bt8xx driver and dvb bt878
++	  module.
++
+ config DVB_STV0299
+ 	tristate "STV0299 based DVB-S frontend (QPSK)"
+ 	depends on DVB_CORE
+@@ -145,3 +156,19 @@ config DVB_TDA1004X_FIRMWARE_FILE
+             wget http://www.technotrend.de/new/215/TTweb_215a_budget_20_05_2003.zip
+             unzip -j TTweb_215a_budget_20_05_2003.zip Software/Oem/PCI/App/ttlcdacc.dll
+             mv ttlcdacc.dll /etc/dvb/tda1004x.bin
++
++config DVB_SP887X_FIRMWARE_FILE
++        string "Full pathname of sp887x firmware file"
++        depends on DVB_SP887X
++        default "/etc/dvb/sc_main.mc"
++        help
++          This driver needs a copy of the Avermedia firmware. The version tested
++	  is part of the Avermedia DVB-T 1.3.26.3 Application. This can be downloaded
++	  from the Avermedia web site.
++	  If the software is installed in Windows the file will be in the
++	  /Program Files/AVerTV DVB-T/ directory and is called sc_main.mc.
++	  Alternatively it can "extracted" from the install cab files but this will have
++	  to be done in windows as I don't know of a linux version of extract.exe.
++	  Copy this file to /etc/dvb/sc_main.mc. With this version of the file the first
++	  10 bytes are discarded and the next 0x4000 loaded. This may change in future
++	  versions.
+--- linux-2.6.0/drivers/media/dvb/frontends/Makefile	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/media/dvb/frontends/Makefile	2003-12-28 23:22:37.000000000 -0800
+@@ -4,6 +4,7 @@
+ 
+ EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/
+ 
++obj-$(CONFIG_DVB_TWINHAN_DST) += dst.o
+ obj-$(CONFIG_DVB_STV0299) += stv0299.o
+ obj-$(CONFIG_DVB_ALPS_TDLB7) += alps_tdlb7.o
+ obj-$(CONFIG_DVB_ALPS_TDMB7) += alps_tdmb7.o
+--- linux-2.6.0/drivers/media/dvb/frontends/mt312.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/media/dvb/frontends/mt312.c	2003-12-28 23:22:38.000000000 -0800
+@@ -39,11 +39,19 @@
+ #define MT312_DEBUG		0
+ 
+ #define MT312_SYS_CLK		90000000UL	/* 90 MHz */
++#define MT312_LPOWER_SYS_CLK	60000000UL	/* 60 MHz */
+ #define MT312_PLL_CLK		10000000UL	/* 10 MHz */
+ 
+ /* number of active frontends */
+ static int mt312_count = 0;
+ 
++#if MT312_DEBUG == 0
++#define dprintk(x...)
++#else
++static int debug = 0;
++#define dprintk if(debug == 1) printk
++#endif
++
+ static struct dvb_frontend_info mt312_info = {
+ 	.name = "Zarlink MT312",
+ 	.type = FE_QPSK,
+@@ -86,7 +94,7 @@ static int mt312_read(struct dvb_i2c_bus
+ 		return -EREMOTEIO;
+ 	}
+ #if MT312_DEBUG
+-	{
++	if(debug) {
+ 		int i;
+ 		printk(KERN_INFO "R(%d):", reg & 0x7f);
+ 		for (i = 0; i < count; i++)
+@@ -107,7 +115,7 @@ static int mt312_write(struct dvb_i2c_bu
+ 	struct i2c_msg msg;
+ 
+ #if MT312_DEBUG
+-	{
++	if(debug) {
+ 		int i;
+ 		printk(KERN_INFO "W(%d):", reg & 0x7f);
+ 		for (i = 0; i < count; i++)
+@@ -205,7 +213,7 @@ static int sl1935_set_tv_freq(struct dvb
+ 	if (freq < 1550000)
+ 		buf[3] |= 0x10;
+ 
+-	printk(KERN_INFO "synth dword = %02x%02x%02x%02x\n", buf[0],
++	dprintk(KERN_INFO "synth dword = %02x%02x%02x%02x\n", buf[0],
+ 	       buf[1], buf[2], buf[3]);
+ 
+ 	return mt312_pll_write(i2c, I2C_ADDR_SL1935, buf, sizeof(buf));
+@@ -225,7 +233,7 @@ static int tsa5059_set_tv_freq(struct dv
+ 	if (freq < 1550000)
+ 		buf[3] |= 0x02;
+ 
+-	printk(KERN_INFO "synth dword = %02x%02x%02x%02x\n", buf[0],
++	dprintk(KERN_INFO "synth dword = %02x%02x%02x%02x\n", buf[0],
+ 	       buf[1], buf[2], buf[3]);
+ 
+ 	return mt312_pll_write(i2c, I2C_ADDR_TSA5059, buf, sizeof(buf));
+@@ -236,13 +244,13 @@ static int mt312_reset(struct dvb_i2c_bu
+ 	return mt312_writereg(i2c, RESET, full ? 0x80 : 0x40);
+ }
+ 
+-static int mt312_init(struct dvb_i2c_bus *i2c, const long id)
++static int mt312_init(struct dvb_i2c_bus *i2c, const long id, u8 pll)
+ {
+ 	int ret;
+ 	u8 buf[2];
+ 
+ 	/* wake up */
+-	if ((ret = mt312_writereg(i2c, CONFIG, 0x8c)) < 0)
++	if ((ret = mt312_writereg(i2c, CONFIG, (pll == 60 ? 0x88 : 0x8c))) < 0)
+ 		return ret;
+ 
+ 	/* wait at least 150 usec */
+@@ -252,8 +260,17 @@ static int mt312_init(struct dvb_i2c_bus
+ 	if ((ret = mt312_reset(i2c, 1)) < 0)
+ 		return ret;
+ 
++// Per datasheet, write correct values. 09/28/03 ACCJr.
++// If we don't do this, we won't get FE_HAS_VITERBI in the VP310.
++	{
++		u8 buf_def[8]={0x14, 0x12, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00};
++
++		if ((ret = mt312_write(i2c, VIT_SETUP, buf_def, sizeof(buf_def))) < 0)
++			return ret;
++	}
++
+ 	/* SYS_CLK */
+-	buf[0] = mt312_div(MT312_SYS_CLK * 2, 1000000);
++	buf[0] = mt312_div((pll == 60 ? MT312_LPOWER_SYS_CLK : MT312_SYS_CLK) * 2, 1000000);
+ 
+ 	/* DISEQC_RATIO */
+ 	buf[1] = mt312_div(MT312_PLL_CLK, 15000 * 4);
+@@ -370,16 +387,18 @@ static int mt312_set_voltage(struct dvb_
+ 	return mt312_writereg(i2c, DISEQC_MODE, volt_tab[v]);
+ }
+ 
+-static int mt312_read_status(struct dvb_i2c_bus *i2c, fe_status_t * s)
++static int mt312_read_status(struct dvb_i2c_bus *i2c, fe_status_t *s, const long id)
+ {
+ 	int ret;
+-	u8 status[3];
++	u8 status[3], vit_mode;
+ 
+ 	*s = 0;
+ 
+ 	if ((ret = mt312_read(i2c, QPSK_STAT_H, status, sizeof(status))) < 0)
+ 		return ret;
+ 
++	dprintk(KERN_DEBUG "QPSK_STAT_H: 0x%02x, QPSK_STAT_L: 0x%02x, FEC_STATUS: 0x%02x\n", status[0], status[1], status[2]);
++
+ 	if (status[0] & 0xc0)
+ 		*s |= FE_HAS_SIGNAL;	/* signal noise ratio */
+ 	if (status[0] & 0x04)
+@@ -390,6 +409,16 @@ static int mt312_read_status(struct dvb_
+ 		*s |= FE_HAS_SYNC;	/* byte align lock */
+ 	if (status[0] & 0x01)
+ 		*s |= FE_HAS_LOCK;	/* qpsk lock */
++	// VP310 doesn't have AUTO, so we "implement it here" ACCJr
++	if ((id == ID_VP310) && !(status[0] & 0x01)) {
++		if ((ret = mt312_readreg(i2c, VIT_MODE, &vit_mode)) < 0)
++			return ret;
++		vit_mode ^= 0x40;
++		if ((ret = mt312_writereg(i2c, VIT_MODE, vit_mode)) < 0)
++                	return ret;
++		if ((ret = mt312_writereg(i2c, GO, 0x01)) < 0)
++                	return ret;
++	}
+ 
+ 	return 0;
+ }
+@@ -422,7 +451,7 @@ static int mt312_read_agc(struct dvb_i2c
+ 
+ 	*signal_strength = agc;
+ 
+-	printk(KERN_DEBUG "agc=%08x err_db=%hd\n", agc, err_db);
++	dprintk(KERN_DEBUG "agc=%08x err_db=%hd\n", agc, err_db);
+ 
+ 	return 0;
+ }
+@@ -458,7 +487,7 @@ static int mt312_set_frontend(struct dvb
+ 			      const long id)
+ {
+ 	int ret;
+-	u8 buf[5];
++	u8 buf[5], config_val;
+ 	u16 sr;
+ 
+ 	const u8 fec_tab[10] =
+@@ -467,6 +496,8 @@ static int mt312_set_frontend(struct dvb
+ 
+ 	int (*set_tv_freq)(struct dvb_i2c_bus *i2c, u32 freq, u32 sr);
+ 
++	dprintk("%s: Freq %d\n", __FUNCTION__, p->frequency);
++
+ 	if ((p->frequency < mt312_info.frequency_min)
+ 	    || (p->frequency > mt312_info.frequency_max))
+ 		return -EINVAL;
+@@ -489,6 +520,22 @@ static int mt312_set_frontend(struct dvb
+ 
+ 	switch (id) {
+ 	case ID_VP310:
++	// For now we will do this only for the VP310.
++	// It should be better for the mt312 as well, but tunning will be slower. ACCJr 09/29/03
++		if ((ret = mt312_readreg(i2c, CONFIG, &config_val) < 0))
++			return ret;
++		if (p->u.qpsk.symbol_rate >= 30000000) //Note that 30MS/s should use 90MHz
++		{
++			if ((config_val & 0x0c) == 0x08) //We are running 60MHz
++				if ((ret = mt312_init(i2c, id, (u8) 90)) < 0)
++					return ret;
++		}
++		else
++		{
++			if ((config_val & 0x0c) == 0x0C) //We are running 90MHz
++				if ((ret = mt312_init(i2c, id, (u8) 60)) < 0)
++					return ret;
++		}
+ 		set_tv_freq = tsa5059_set_tv_freq;
+ 		break;
+ 	case ID_MT312:
+@@ -562,7 +609,7 @@ static int mt312_get_symbol_rate(struct 
+ 
+ 		monitor = (buf[0] << 8) | buf[1];
+ 
+-		printk(KERN_DEBUG "sr(auto) = %u\n",
++		dprintk(KERN_DEBUG "sr(auto) = %u\n",
+ 		       mt312_div(monitor * 15625, 4));
+ 	} else {
+ 		if ((ret = mt312_writereg(i2c, MON_CTRL, 0x05)) < 0)
+@@ -578,9 +625,9 @@ static int mt312_get_symbol_rate(struct 
+ 
+ 		sym_rat_op = (buf[0] << 8) | buf[1];
+ 
+-		printk(KERN_DEBUG "sym_rat_op=%d dec_ratio=%d\n",
++		dprintk(KERN_DEBUG "sym_rat_op=%d dec_ratio=%d\n",
+ 		       sym_rat_op, dec_ratio);
+-		printk(KERN_DEBUG "*sr(manual) = %lu\n",
++		dprintk(KERN_DEBUG "*sr(manual) = %lu\n",
+ 		       (((MT312_PLL_CLK * 8192) / (sym_rat_op + 8192)) *
+ 			2) - dec_ratio);
+ 	}
+@@ -675,7 +722,7 @@ static int mt312_ioctl(struct dvb_fronte
+ 		return -EOPNOTSUPP;
+ 
+ 	case FE_READ_STATUS:
+-		return mt312_read_status(i2c, arg);
++		return mt312_read_status(i2c, arg, (long) fe->data);
+ 
+ 	case FE_READ_BER:
+ 		return mt312_read_bercnt(i2c, arg);
+@@ -702,7 +749,12 @@ static int mt312_ioctl(struct dvb_fronte
+ 		return mt312_sleep(i2c);
+ 
+ 	case FE_INIT:
+-		return mt312_init(i2c, (long) fe->data);
++	//For the VP310 we should run at 60MHz when ever possible.
++	//It should be better to run the mt312 ar lower speed when ever possible, but tunning will be slower. ACCJr 09/29/03
++		if ((long)fe->data == ID_MT312)
++			return mt312_init(i2c, (long) fe->data, (u8) 90);
++		else
++			return mt312_init(i2c, (long) fe->data, (u8) 60);
+ 
+ 	case FE_RESET:
+ 		return mt312_reset(i2c, 0);
+@@ -755,6 +807,11 @@ static void __exit mt312_module_exit(voi
+ module_init(mt312_module_init);
+ module_exit(mt312_module_exit);
+ 
++#if MT312_DEBUG != 0
++MODULE_PARM(debug,"i");
++MODULE_PARM_DESC(debug, "enable verbose debug messages");
++#endif
++
+ MODULE_DESCRIPTION("MT312 Satellite Channel Decoder Driver");
+ MODULE_AUTHOR("Andreas Oberritter <obi@saftware.de>");
+ MODULE_LICENSE("GPL");
+--- linux-2.6.0/drivers/media/dvb/frontends/nxt6000.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/media/dvb/frontends/nxt6000.c	2003-12-28 23:22:38.000000000 -0800
+@@ -55,34 +55,21 @@ static struct dvb_frontend_info nxt6000_
+ 	.symbol_rate_max = 9360000,	/* FIXME */
+ 	.symbol_rate_tolerance = 4000,
+ 	.notifier_delay = 0,
+-	.caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
+-			FE_CAN_FEC_4_5 | FE_CAN_FEC_5_6 | FE_CAN_FEC_6_7 |
+-			FE_CAN_FEC_7_8 | FE_CAN_FEC_8_9 | FE_CAN_FEC_AUTO |
+-			FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |
+-			FE_CAN_TRANSMISSION_MODE_AUTO |
+-			FE_CAN_GUARD_INTERVAL_AUTO |
+-			FE_CAN_HIERARCHY_AUTO,
+-
++	.caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 | FE_CAN_FEC_4_5 | FE_CAN_FEC_5_6 | FE_CAN_FEC_6_7 | FE_CAN_FEC_7_8 | FE_CAN_FEC_8_9 | FE_CAN_FEC_AUTO | FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO | FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO | FE_CAN_HIERARCHY_AUTO,
+ };
+ 
+-#pragma pack(1)
+-
+ struct nxt6000_config {
+-
+ 	u8 demod_addr;
+ 	u8 tuner_addr;
+ 	u8 tuner_type;
+ 	u8 clock_inversion;
+-
+ };
+ 
+-#pragma pack()
+-
+ #define TUNER_TYPE_ALP510	0
+ #define TUNER_TYPE_SP5659	1
+ #define TUNER_TYPE_SP5730	2
+ 
+-#define FE2NXT(fe) ((struct nxt6000_config *)&(fe->data))
++#define FE2NXT(fe) ((struct nxt6000_config *)((fe)->data))
+ #define FREQ2DIV(freq) ((freq + 36166667) / 166667)
+ 
+ #define dprintk if (debug) printk
+@@ -116,8 +103,10 @@ static u8 nxt6000_read(struct dvb_i2c_bu
+ 	int ret;
+ 	u8 b0[] = {reg};
+ 	u8 b1[] = {0};
+-	struct i2c_msg msgs[] = {{.addr = addr >> 1, .flags = 0, .buf = b0, .len = 1},
+-							{.addr = addr >> 1, .flags = I2C_M_RD, .buf = b1, .len = 1}};
++	struct i2c_msg msgs[] = {
++		{.addr = addr >> 1,.flags = 0,.buf = b0,.len = 1},
++		{.addr = addr >> 1,.flags = I2C_M_RD,.buf = b1,.len = 1}
++	};
+ 
+ 	ret = i2c->xfer(i2c, msgs, 2);
+ 	
+@@ -394,7 +383,7 @@ static void nxt6000_setup(struct dvb_fro
+ 	nxt6000_writereg(fe, OFDM_ITB_FREQ_1, 0x06);
+ 	nxt6000_writereg(fe, OFDM_ITB_FREQ_2, 0x31);
+ 	nxt6000_writereg(fe, OFDM_CAS_CTL, (0x01 << 7) | (0x02 << 3) | 0x04);
+-	nxt6000_writereg(fe, CAS_FREQ, 0xBB);	// CHECKME
++	nxt6000_writereg(fe, CAS_FREQ, 0xBB);	/* CHECKME */
+ 	nxt6000_writereg(fe, OFDM_SYR_CTL, 1 << 2);
+ 	nxt6000_writereg(fe, OFDM_PPM_CTL_1, PPM256);
+ 	nxt6000_writereg(fe, OFDM_TRL_NOMINALRATE_1, 0x49);
+@@ -414,20 +403,20 @@ static void nxt6000_setup(struct dvb_fro
+ 
+ static void nxt6000_dump_status(struct dvb_frontend *fe)
+ {
+-
+ 	u8 val;
+ 
+-//	printk("RS_COR_STAT: 0x%02X\n", nxt6000_readreg(fe, RS_COR_STAT));
+-//	printk("VIT_SYNC_STATUS: 0x%02X\n", nxt6000_readreg(fe, VIT_SYNC_STATUS));
+-//	printk("OFDM_COR_STAT: 0x%02X\n", nxt6000_readreg(fe, OFDM_COR_STAT));
+-//	printk("OFDM_SYR_STAT: 0x%02X\n", nxt6000_readreg(fe, OFDM_SYR_STAT));
+-//	printk("OFDM_TPS_RCVD_1: 0x%02X\n", nxt6000_readreg(fe, OFDM_TPS_RCVD_1));
+-//	printk("OFDM_TPS_RCVD_2: 0x%02X\n", nxt6000_readreg(fe, OFDM_TPS_RCVD_2));
+-//	printk("OFDM_TPS_RCVD_3: 0x%02X\n", nxt6000_readreg(fe, OFDM_TPS_RCVD_3));
+-//	printk("OFDM_TPS_RCVD_4: 0x%02X\n", nxt6000_readreg(fe, OFDM_TPS_RCVD_4));
+-//	printk("OFDM_TPS_RESERVED_1: 0x%02X\n", nxt6000_readreg(fe, OFDM_TPS_RESERVED_1));
+-//	printk("OFDM_TPS_RESERVED_2: 0x%02X\n", nxt6000_readreg(fe, OFDM_TPS_RESERVED_2));
+-
++/*
++	printk("RS_COR_STAT: 0x%02X\n", nxt6000_readreg(fe, RS_COR_STAT));
++	printk("VIT_SYNC_STATUS: 0x%02X\n", nxt6000_readreg(fe, VIT_SYNC_STATUS));
++	printk("OFDM_COR_STAT: 0x%02X\n", nxt6000_readreg(fe, OFDM_COR_STAT));
++	printk("OFDM_SYR_STAT: 0x%02X\n", nxt6000_readreg(fe, OFDM_SYR_STAT));
++	printk("OFDM_TPS_RCVD_1: 0x%02X\n", nxt6000_readreg(fe, OFDM_TPS_RCVD_1));
++	printk("OFDM_TPS_RCVD_2: 0x%02X\n", nxt6000_readreg(fe, OFDM_TPS_RCVD_2));
++	printk("OFDM_TPS_RCVD_3: 0x%02X\n", nxt6000_readreg(fe, OFDM_TPS_RCVD_3));
++	printk("OFDM_TPS_RCVD_4: 0x%02X\n", nxt6000_readreg(fe, OFDM_TPS_RCVD_4));
++	printk("OFDM_TPS_RESERVED_1: 0x%02X\n", nxt6000_readreg(fe, OFDM_TPS_RESERVED_1));
++	printk("OFDM_TPS_RESERVED_2: 0x%02X\n", nxt6000_readreg(fe, OFDM_TPS_RESERVED_2));
++*/
+ 	printk("NXT6000 status:");
+ 
+ 	val = nxt6000_readreg(fe, RS_COR_STAT);
+@@ -460,13 +449,11 @@ static void nxt6000_dump_status(struct d
+ 			break;
+ 	
+ 		case 0x03: 
+-		
+ 			printk(" VITERBI CODERATE: 5/6,");
++		break;
+ 
+ 		case 0x04: 
+-		
+ 			printk(" VITERBI CODERATE: 7/8,");
+-			
+ 			break;
+ 
+ 		default: 
+@@ -503,13 +490,11 @@ static void nxt6000_dump_status(struct d
+ 			break;
+ 	
+ 		case 0x04:
+-		
+ 			printk(" CoreState: WAIT_PPM,");
++		break;
+ 
+ 		case 0x01:
+-		
+ 			printk(" CoreState: WAIT_TRL,");
+-			
+ 			break;
+ 
+ 		case 0x05:
+@@ -586,13 +571,11 @@ static void nxt6000_dump_status(struct d
+ 			break;
+ 	
+ 		case 0x03: 
+-		
+ 			printk(" TPSLP: 5/6,");
++		break;
+ 
+ 		case 0x04: 
+-		
+ 			printk(" TPSLP: 7/8,");
+-			
+ 			break;
+ 
+ 		default: 
+@@ -622,13 +605,11 @@ static void nxt6000_dump_status(struct d
+ 			break;
+ 	
+ 		case 0x03: 
+-		
+ 			printk(" TPSHP: 5/6,");
++		break;
+ 
+ 		case 0x04: 
+-		
+ 			printk(" TPSHP: 7/8,");
+-			
+ 			break;
+ 
+ 		default: 
+@@ -669,7 +650,7 @@ static void nxt6000_dump_status(struct d
+ 			
+ 	}
+ 	
+-	// Strange magic required to gain access to RF_AGC_STATUS
++	/* Strange magic required to gain access to RF_AGC_STATUS */
+ 	nxt6000_readreg(fe, RF_AGC_VAL_1);
+ 	val = nxt6000_readreg(fe, RF_AGC_STATUS);
+ 	val = nxt6000_readreg(fe, RF_AGC_STATUS);
+@@ -735,21 +716,23 @@ static int nxt6000_ioctl(struct dvb_fron
+ 	
+ 		case FE_READ_SIGNAL_STRENGTH:
+ 		{
+-//			s16 *signal = (s16 *)arg;
+-
+-//		*signal=(((signed char)readreg(client, 0x16))+128)<<8;
+-
++			s16 *signal = (s16 *) arg;
++/*
++			*signal=(((signed char)readreg(client, 0x16))+128)<<8;
++*/
++			*signal = 0;
+ 			return 0;
+ 			
+ 		}
+ 	
+ 		case FE_READ_SNR:
+ 		{
+-//			s16 *snr = (s16 *)arg;
+-
+-//		*snr=readreg(client, 0x24)<<8;
+-//		*snr|=readreg(client, 0x25);
+-
++			s16 *snr = (s16 *) arg;
++/*
++			*snr=readreg(client, 0x24)<<8;
++			*snr|=readreg(client, 0x25);
++*/
++			*snr = 0;
+ 			break;
+ 		}
+ 	
+@@ -831,70 +814,74 @@ static u8 demod_addr_tbl[] = {0x14, 0x18
+ 
+ static int nxt6000_attach(struct dvb_i2c_bus *i2c, void **data)
+ {
+-
+ 	u8 addr_nr;
+ 	u8 fe_count = 0;
+-	struct nxt6000_config nxt;
++	struct nxt6000_config *pnxt;
+ 
+ 	dprintk("nxt6000: attach\n");
+ 	
++	pnxt = kmalloc(sizeof(demod_addr_tbl)*sizeof(struct nxt6000_config), GFP_KERNEL);
++	if (NULL == pnxt) {
++		dprintk("nxt6000: no memory for private data.\n");
++		return -ENOMEM;
++	}
++	*data = pnxt;
++
+ 	for (addr_nr = 0; addr_nr < sizeof(demod_addr_tbl); addr_nr++) {
++		struct nxt6000_config *nxt = &pnxt[addr_nr];
+ 	
+ 		if (nxt6000_read(i2c, demod_addr_tbl[addr_nr], OFDM_MSC_REV) != NXT6000ASICDEVICE)
+ 			continue;
+ 
+ 		if (pll_write(i2c, demod_addr_tbl[addr_nr], 0xC0, NULL, 0) == 0) {
++			nxt->tuner_addr = 0xC0;
++			nxt->tuner_type = TUNER_TYPE_ALP510;
++			nxt->clock_inversion = 1;
+ 	
+-			nxt.tuner_addr = 0xC0;
+-			nxt.tuner_type = TUNER_TYPE_ALP510;
+-			nxt.clock_inversion = 1;
+-			
+-			dprintk("nxt6000: detected TI ALP510 tuner at 0x%02X\n", nxt.tuner_addr);
++			dprintk("nxt6000: detected TI ALP510 tuner at 0x%02X\n", nxt->tuner_addr);
+ 		
+ 		} else if (pll_write(i2c, demod_addr_tbl[addr_nr], 0xC2, NULL, 0) == 0) {
++			nxt->tuner_addr = 0xC2;
++			nxt->tuner_type = TUNER_TYPE_SP5659;
++			nxt->clock_inversion = 0;
+ 
+-			nxt.tuner_addr = 0xC2;
+-			nxt.tuner_type = TUNER_TYPE_SP5659;
+-			nxt.clock_inversion = 0;
+-	
+-			dprintk("nxt6000: detected MITEL SP5659 tuner at 0x%02X\n", nxt.tuner_addr);
++			dprintk("nxt6000: detected MITEL SP5659 tuner at 0x%02X\n", nxt->tuner_addr);
+ 		
+ 		} else if (pll_write(i2c, demod_addr_tbl[addr_nr], 0xC0, NULL, 0) == 0) {
++			nxt->tuner_addr = 0xC0;
++			nxt->tuner_type = TUNER_TYPE_SP5730;
++			nxt->clock_inversion = 0;
+ 
+-			nxt.tuner_addr = 0xC0;
+-			nxt.tuner_type = TUNER_TYPE_SP5730;
+-			nxt.clock_inversion = 0;
+-	
+-			dprintk("nxt6000: detected SP5730 tuner at 0x%02X\n", nxt.tuner_addr);
++			dprintk("nxt6000: detected SP5730 tuner at 0x%02X\n", nxt->tuner_addr);
+ 		
+ 		} else {
+-
+ 			printk("nxt6000: unable to detect tuner\n");
+-
+ 			continue;	
+-		
+ 		}
+ 		
+-		nxt.demod_addr = demod_addr_tbl[addr_nr];
++		nxt->demod_addr = demod_addr_tbl[addr_nr];
+ 	  
+ 		dprintk("nxt6000: attached at %d:%d\n", i2c->adapter->num, i2c->id);
+ 	
+-		dvb_register_frontend(nxt6000_ioctl, i2c, (void *)(*((u32 *)&nxt)), &nxt6000_info);
++		dvb_register_frontend(nxt6000_ioctl, i2c, (void *)nxt, &nxt6000_info);
+ 		
+ 		fe_count++;
+ 	}
+ 	
+-	return (fe_count > 0) ? 0 : -ENODEV;
++	if (fe_count == 0) {
++		kfree(pnxt);
++		return -ENODEV;
++	}
+ 	
++	return 0;
+ }
+ 
+ static void nxt6000_detach(struct dvb_i2c_bus *i2c, void *data)
+ {
+-
++	struct nxt6000_config *pnxt = (struct nxt6000_config *)data;
+ 	dprintk("nxt6000: detach\n");
+-
+ 	dvb_unregister_frontend(nxt6000_ioctl, i2c);
+-	
++	kfree(pnxt);
+ }
+ 
+ static __init int nxt6000_init(void)
+--- linux-2.6.0/drivers/media/dvb/frontends/nxt6000.h	2003-06-14 12:17:56.000000000 -0700
++++ 25/drivers/media/dvb/frontends/nxt6000.h	2003-12-28 23:22:38.000000000 -0800
+@@ -1,45 +1,10 @@
+-/**********************************************************************/
+- * DRV6000reg.H
++/*
+  * Public Include File for DRV6000 users
++ * (ie. NxtWave Communications - NXT6000 demodulator driver)
+  *
+  * Copyright (C) 2001 NxtWave Communications, Inc.
+  *
+- * $Log: nxt6000.h,v $
+- * Revision 1.2  2003/01/27 12:32:42  fschirmer
+- * Lots of bugfixes and new features
+- *
+- * Revision 1.1  2003/01/21 18:43:09  fschirmer
+- * Nxt6000 based frontend driver
+- *
+- * Revision 1.1  2003/01/03 02:25:45  obi
+- * alps tdme7 driver
+- *
+- * 
+- *    Rev 1.10   Jun 12 2002 11:28:02   dkoeger
+- * Updated for SA in GUi work
+- * 
+- *    Rev 1.9   Apr 01 2002 10:38:46   dkoeger
+- * Updated for 1.0.31 GUI
+- * 
+- *    Rev 1.8   Mar 11 2002 10:04:56   dkoeger
+- * Updated for 1.0.31 GUI version
+- * 
+- *    Rev 1.5   Dec 07 2001 14:40:40   dkoeger
+- * Updated for 1.0.28 GUI
+- * 
+- *    Rev 1.4   Nov 13 2001 11:09:00   dkoeger
+- * No change.
+- * 
+- *    Rev 1.3   Aug 23 2001 14:21:02   dkoeger
+- * Updated for driver version 2.1.9
+- * 
+- *    Rev 1.2   Jul 09 2001 09:20:04   dkoeger
+- * Updated for 1.0.18
+- * 
+- *    Rev 1.1   Jun 13 2001 16:14:24   dkoeger
+- * Updated to reflect NXT6000 GUI BETA 1.0.11 6/13/2001
+- **********************************************************************/
+-
++ */
+ 
+ /*  Nxt6000 Register Addresses and Bit Masks */
+ 
+--- linux-2.6.0/drivers/media/dvb/frontends/sp887x.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/media/dvb/frontends/sp887x.c	2003-12-28 23:22:38.000000000 -0800
+@@ -1,11 +1,39 @@
++/*
++   Driver for the Microtune 7202D Frontend
++*/
++
++/*
++   This driver needs a copy of the Avermedia firmware. The version tested
++   is part of the Avermedia DVB-T 1.3.26.3 Application. If the software is
++   installed in Windows the file will be in the /Program Files/AVerTV DVB-T/
++   directory and is called sc_main.mc. Alternatively it can "extracted" from
++   the install cab files. Copy this file to /etc/dvb/sc_main.mc.
++   With this version of the file the first 10 bytes are discarded and the
++   next 0x4000 loaded. This may change in future versions.
++ */
+ 
++#define __KERNEL_SYSCALLS__
++#include <linux/kernel.h>
++#include <linux/vmalloc.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
++#include <linux/string.h>
++#include <linux/slab.h>
++#include <linux/fs.h>
++#include <linux/unistd.h>
++#include <linux/fcntl.h>
++#include <linux/errno.h>
+ #include <linux/i2c.h>
+ 
++
+ #include "dvb_frontend.h"
+ #include "dvb_functions.h"
+ 
++#ifndef DVB_SP887X_FIRMWARE_FILE
++#define DVB_SP887X_FIRMWARE_FILE "/etc/dvb/sc_main.mc"
++#endif
++
++static char *sp887x_firmware = DVB_SP887X_FIRMWARE_FILE;
+ 
+ #if 0
+ #define dprintk(x...) printk(x)
+@@ -39,7 +67,7 @@ struct dvb_frontend_info sp887x_info = {
+ 		FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_RECOVER
+ };
+ 
+-
++static int errno;
+ 
+ static
+ int i2c_writebytes (struct dvb_frontend *fe, u8 addr, u8 *buf, u8 len)
+@@ -112,6 +140,7 @@ u16 sp887x_readreg (struct dvb_frontend 
+ static
+ void sp887x_microcontroller_stop (struct dvb_frontend *fe)
+ {
++	dprintk("%s\n", __FUNCTION__);
+ 	sp887x_writereg(fe, 0xf08, 0x000);
+ 	sp887x_writereg(fe, 0xf09, 0x000);		
+ 
+@@ -123,6 +152,7 @@ void sp887x_microcontroller_stop (struct
+ static
+ void sp887x_microcontroller_start (struct dvb_frontend *fe)
+ {
++	dprintk("%s\n", __FUNCTION__);
+ 	sp887x_writereg(fe, 0xf08, 0x000);
+ 	sp887x_writereg(fe, 0xf09, 0x000);		
+ 
+@@ -135,6 +165,7 @@ static
+ void sp887x_setup_agc (struct dvb_frontend *fe)
+ {
+ 	/* setup AGC parameters */
++	dprintk("%s\n", __FUNCTION__);
+ 	sp887x_writereg(fe, 0x33c, 0x054);
+ 	sp887x_writereg(fe, 0x33b, 0x04c);
+ 	sp887x_writereg(fe, 0x328, 0x000);
+@@ -152,8 +183,6 @@ void sp887x_setup_agc (struct dvb_fronte
+ }
+ 
+ 
+-#include "sp887x_firm.h"
+-
+ #define BLOCKSIZE 30
+ 
+ /**
+@@ -162,14 +191,63 @@ void sp887x_setup_agc (struct dvb_fronte
+ static
+ int sp887x_initial_setup (struct dvb_frontend *fe)
+ {
+-	u8 buf [BLOCKSIZE];
++	u8 buf [BLOCKSIZE+2];
++	unsigned char *firmware = NULL;
+ 	int i;
++	int fd;
++	int filesize;
++	int fw_size;
++	mm_segment_t fs;
++
++	dprintk("%s\n", __FUNCTION__);
+ 
+ 	/* soft reset */
+ 	sp887x_writereg(fe, 0xf1a, 0x000);
+ 
+ 	sp887x_microcontroller_stop (fe);
+ 
++	fs = get_fs();
++
++	// Load the firmware
++	set_fs(get_ds());
++	fd = open(sp887x_firmware, 0, 0);
++	if (fd < 0) {
++		printk(KERN_WARNING "%s: Unable to open firmware %s\n", __FUNCTION__,
++		       sp887x_firmware);
++		return -EIO;
++	}
++	filesize = lseek(fd, 0L, 2);
++	if (filesize <= 0) {
++		printk(KERN_WARNING "%s: Firmware %s is empty\n", __FUNCTION__,
++		       sp887x_firmware);
++		sys_close(fd);
++		return -EIO;
++	}
++
++	fw_size = 0x4000;
++
++	// allocate buffer for it
++	firmware = vmalloc(fw_size);
++	if (firmware == NULL) {
++		printk(KERN_WARNING "%s: Out of memory loading firmware\n",
++		       __FUNCTION__);
++		sys_close(fd);
++		return -EIO;
++	}
++
++	// read it!
++	// read the first 16384 bytes from the file
++	// ignore the first 10 bytes
++	lseek(fd, 10, 0);
++	if (read(fd, firmware, fw_size) != fw_size) {
++		printk(KERN_WARNING "%s: Failed to read firmware\n", __FUNCTION__);
++		vfree(firmware);
++		sys_close(fd);
++		return -EIO;
++	}
++	sys_close(fd);
++	set_fs(fs);
++
+ 	printk ("%s: firmware upload... ", __FUNCTION__);
+ 
+ 	/* setup write pointer to -1 (end of memory) */
+@@ -179,12 +257,12 @@ int sp887x_initial_setup (struct dvb_fro
+ 	/* dummy write (wrap around to start of memory) */
+ 	sp887x_writereg(fe, 0x8f0a, 0x0000);
+ 
+-	for (i=0; i<sizeof(sp887x_firm); i+=BLOCKSIZE) {
++	for (i=0; i<fw_size; i+=BLOCKSIZE) {
+ 		int c = BLOCKSIZE;
+ 		int err;
+ 
+-		if (i+c > sizeof(sp887x_firm))
+-			c = sizeof(sp887x_firm) - i;
++		if (i+c > fw_size)
++			c = fw_size - i;
+ 
+ 		/* bit 0x8000 in address is set to enable 13bit mode */
+ 		/* bit 0x4000 enables multibyte read/write transfers */
+@@ -192,15 +270,18 @@ int sp887x_initial_setup (struct dvb_fro
+ 		buf[0] = 0xcf;
+ 		buf[1] = 0x0a;
+ 
+-		memcpy(&buf[2], &sp887x_firm[i], c);
++		memcpy(&buf[2], firmware + i, c);
+ 
+ 		if ((err = i2c_writebytes (fe, 0x70, buf, c+2)) < 0) {
+ 			printk ("failed.\n");
+ 			printk ("%s: i2c error (err == %i)\n", __FUNCTION__, err);
++			vfree(firmware);
+ 			return err;
+ 		}
+ 	}
+ 
++	vfree(firmware);
++
+ 	/* don't write RS bytes between packets */
+ 	sp887x_writereg(fe, 0xc13, 0x001);
+ 
+--- linux-2.6.0/drivers/media/dvb/frontends/stv0299.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/media/dvb/frontends/stv0299.c	2003-12-28 23:22:38.000000000 -0800
+@@ -9,16 +9,23 @@
+ 	<holger@convergence.de>,
+ 	<js@convergence.de>
+     
++
+     Philips SU1278/SH
+ 
+-    Copyright (C) 2002 by Peter Schildmann
+-        <peter.schildmann@web.de>
++    Copyright (C) 2002 by Peter Schildmann <peter.schildmann@web.de>
++
+ 
+     LG TDQF-S001F
+ 
+     Copyright (C) 2002 Felix Domke <tmbinc@elitedvb.net>
+                      & Andreas Oberritter <andreas@oberritter.de>
+ 
++
++    Support for Samsung TBMU24112IMB used on Technisat SkyStar2 rev. 2.6B
++
++    Copyright (C) 2003 Vadim Catana <skystar@moldova.cc>:
++
++
+     This program is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 2 of the License, or
+@@ -39,6 +46,7 @@
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+ #include <linux/string.h>
++#include <asm/div64.h>
+ 
+ #include "dvb_frontend.h"
+ #include "dvb_functions.h"
+@@ -49,6 +57,11 @@
+ #define dprintk(x...)
+ #endif
+ 
++static int stv0299_status = 0;
++
++#define STATUS_BER 0
++#define STATUS_UCBLOCKS 1
++
+ 
+ /* frontend types */
+ #define UNKNOWN_FRONTEND  -1
+@@ -56,6 +69,7 @@
+ #define ALPS_BSRU6         1
+ #define LG_TDQF_S001F      2
+ #define PHILIPS_SU1278     3
++#define SAMSUNG_TBMU24112IMB    4
+ 
+ /* Master Clock = 88 MHz */
+ #define M_CLK (88000000UL) 
+@@ -142,6 +156,51 @@ static u8 init_tab [] = {
+ };
+ 
+ 
++static u8 init_tab_samsung [] = {
++	0x01, 0x15,
++	0x02, 0x00,
++	0x03, 0x00,
++	0x04, 0x7D,
++	0x05, 0x35,
++	0x06, 0x02,
++	0x07, 0x00,
++	0x08, 0xC3,
++	0x0C, 0x00,
++	0x0D, 0x81,
++	0x0E, 0x23,
++	0x0F, 0x12,
++	0x10, 0x7E,
++	0x11, 0x84,
++	0x12, 0xB9,
++	0x13, 0x88,
++	0x14, 0x89,
++	0x15, 0xC9,
++	0x16, 0x00,
++	0x17, 0x5C,
++	0x18, 0x00,
++	0x19, 0x00,
++	0x1A, 0x00,
++	0x1C, 0x00,
++	0x1D, 0x00,
++	0x1E, 0x00,
++	0x1F, 0x3A,
++	0x20, 0x2E,
++	0x21, 0x80,
++	0x22, 0xFF,
++	0x23, 0xC1,
++	0x28, 0x00,
++	0x29, 0x1E,
++	0x2A, 0x14,
++	0x2B, 0x0F,
++	0x2C, 0x09,
++	0x2D, 0x05,
++	0x31, 0x1F,
++	0x32, 0x19,
++	0x33, 0xFE,
++	0x34, 0x93
++};
++
++
+ static int stv0299_writereg (struct dvb_i2c_bus *i2c, u8 reg, u8 data)
+ {
+ 	int ret;
+@@ -169,7 +228,8 @@ static u8 stv0299_readreg (struct dvb_i2
+ 	ret = i2c->xfer (i2c, msg, 2);
+         
+ 	if (ret != 2) 
+-		dprintk("%s: readreg error (ret == %i)\n", __FUNCTION__, ret);
++		dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n",
++				__FUNCTION__, reg, ret);
+ 
+ 	return b1[0];
+ }
+@@ -193,18 +253,19 @@ static int stv0299_readregs (struct dvb_
+ static int pll_write (struct dvb_i2c_bus *i2c, u8 addr, u8 *data, int len)
+ {
+ 	int ret;
+-	u8 rpt1 [] = { 0x05, 0xb5 };  /*  enable i2c repeater on stv0299  */
+-	u8 rpt2 [] = { 0x05, 0x35 };  /*  disable i2c repeater on stv0299  */
+-	struct i2c_msg msg [] = {{ .addr = 0x68, .flags = 0, .buf = rpt1, .len = 2 },
+-			         { addr: addr, .flags = 0, .buf = data, .len = len },
+-				 { .addr = 0x68, .flags = 0, .buf = rpt2, .len = 2 }};
++	struct i2c_msg msg = { addr: addr, .flags = 0, .buf = data, .len = len };
+ 
+-	ret = i2c->xfer (i2c, msg, 3);
+ 
+-	if (ret != 3)
+-		printk("%s: i/o error (ret == %i)\n", __FUNCTION__, ret);
++	stv0299_writereg(i2c, 0x05, 0xb5);	/*  enable i2c repeater on stv0299  */
+ 
+-	return (ret != 3) ? ret : 0;
++	ret =  i2c->xfer (i2c, &msg, 1);
++
++	stv0299_writereg(i2c, 0x05, 0x35);	/*  disable i2c repeater on stv0299  */
++
++	if (ret != 1)
++		dprintk("%s: i/o error (ret == %i)\n", __FUNCTION__, ret);
++
++	return (ret != 1) ? -1 : 0;
+ }
+ 
+ 
+@@ -213,23 +274,16 @@ static int sl1935_set_tv_freq (struct dv
+ 	u8 buf[4];
+ 	u32 div;
+ 
+-	u32 ratios[] = { 2000, 1000, 500, 250, 125 };
+-	u8 ratio;
+-
+-	for (ratio = 4; ratio > 0; ratio--)
+-		if ((freq / ratios[ratio]) <= 0x3fff)
+-			break;
++	div = freq / 125;
+ 
+-	div = freq / ratios[ratio];
++	dprintk("%s : freq = %i, div = %i\n", __FUNCTION__, freq, div);
+ 
+-	buf[0] = (freq >> 8) & 0x7f;
+-	buf[1] = freq & 0xff;
+-	buf[2] = 0x80 | ratio;
++	buf[0] = (div >> 8) & 0x7f;
++	buf[1] = div & 0xff;
++	buf[2] = 0x84;	// 0xC4
++	buf[3] = 0x08;
+ 
+-	if (freq < 1531000)
+-		buf[3] = 0x10;
+-	else
+-		buf[3] = 0x00;
++	if (freq < 1500000) buf[3] |= 0x10;
+ 
+ 	return pll_write (i2c, 0x61, buf, sizeof(buf));
+ }
+@@ -238,21 +292,47 @@ static int sl1935_set_tv_freq (struct dv
+  *   set up the downconverter frequency divisor for a 
+  *   reference clock comparision frequency of 125 kHz.
+  */
+-static int tsa5059_set_tv_freq	(struct dvb_i2c_bus *i2c, u32 freq, int ftype)
++static int tsa5059_set_tv_freq	(struct dvb_i2c_bus *i2c, u32 freq, int ftype, int srate)
+ {
+-	u8 addr = (ftype == PHILIPS_SU1278SH) ? 0x60 : 0x61;
+-        u32 div = freq / 125;
+-	u8 buf[4] = { (div >> 8) & 0x7f, div & 0xff, 0x84 };
++	u8 addr;
++	u32 div;
++	u8 buf[4];
+ 
+ 	dprintk ("%s: freq %i, ftype %i\n", __FUNCTION__, freq, ftype);
+ 
+-	if (ftype == PHILIPS_SU1278SH)
+-		/* activate f_xtal/f_comp signal output */
+-		/* charge pump current C0/C1 = 00 */
+-		buf[3] = 0x20;
+-	else
+-		buf[3] = freq > 1530000 ? 0xc0 : 0xc4;
++	if ((freq < 950000) || (freq > 2150000)) return -EINVAL;
++
++	// setup frequency divisor
++	div = freq / 1000;
++	buf[0] = (div >> 8) & 0x7f;
++	buf[1] = div & 0xff;
++	buf[2] = 0x81 | ((div & 0x18000) >> 10);
++	buf[3] = 0;
++
++	// tuner-specific settings
++	switch(ftype) {
++	case PHILIPS_SU1278SH:
++		addr = 0x60;
++		buf[3] |= 0x20;
++
++		if (srate < 4000000) buf[3] |= 1;
++	   
++		if (freq <= 1250000) buf[3] |= 0;
++		else if (freq <= 1550000) buf[3] |= 0x40;
++		else if (freq <= 2050000) buf[3] |= 0x80;
++		else if (freq <= 2150000) buf[3] |= 0xC0;
++		break;
++
++	case ALPS_BSRU6:
++		addr = 0x61;
++		buf[3] |= 0xC0;
++	 	break;
++
++	default:
++		return -EINVAL;
++	}
+ 
++	// charge pump
+ 	return pll_write (i2c, addr, buf, sizeof(buf));
+ }
+ 
+@@ -385,12 +465,14 @@ static int tua6100_set_tv_freq	(struct d
+ 
+ static int pll_set_tv_freq (struct dvb_i2c_bus *i2c, u32 freq, int ftype, int srate)
+ {
+-	if (ftype == LG_TDQF_S001F)
++	if (ftype == SAMSUNG_TBMU24112IMB)
++		return sl1935_set_tv_freq(i2c, freq, ftype);
++	else if (ftype == LG_TDQF_S001F)
+ 		return sl1935_set_tv_freq(i2c, freq, ftype);
+ 	else if (ftype == PHILIPS_SU1278)
+ 		return tua6100_set_tv_freq(i2c, freq, ftype, srate);
+ 	else
+-		return tsa5059_set_tv_freq(i2c, freq, ftype);
++		return tsa5059_set_tv_freq(i2c, freq, ftype, srate);
+ }
+ 
+ #if 0
+@@ -421,6 +503,19 @@ static int stv0299_init (struct dvb_i2c_
+ 
+ 	dprintk("stv0299: init chip\n");
+ 
++	switch(ftype) {
++	case SAMSUNG_TBMU24112IMB:
++		dprintk("%s: init stv0299 chip for Samsung TBMU24112IMB\n", __FUNCTION__);
++
++		for (i=0; i<sizeof(init_tab_samsung); i+=2)
++		{
++			dprintk("%s: reg == 0x%02x, val == 0x%02x\n", __FUNCTION__, init_tab_samsung[i], init_tab_samsung[i+1]);
++
++			stv0299_writereg (i2c, init_tab_samsung[i], init_tab_samsung[i+1]);
++		}
++		break;
++
++	default:
+ 	stv0299_writereg (i2c, 0x01, 0x15);
+ 	stv0299_writereg (i2c, 0x02, ftype == PHILIPS_SU1278 ? 0x00 : 0x30);
+ 	stv0299_writereg (i2c, 0x03, 0x00);
+@@ -430,11 +525,23 @@ static int stv0299_init (struct dvb_i2c_
+ 
+         /* AGC1 reference register setup */
+ 	if (ftype == PHILIPS_SU1278SH)
+-	  stv0299_writereg (i2c, 0x0f, 0xd2);  /* Iagc = Inverse, m1 = 18 */
++		  stv0299_writereg (i2c, 0x0f, 0x92);  /* Iagc = Inverse, m1 = 18 */
+ 	else if (ftype == PHILIPS_SU1278)
+-	  stv0299_writereg (i2c, 0x0f, 0x94);  /* Iagc = Inverse, m1 = 18 */
++		  stv0299_writereg (i2c, 0x0f, 0x94);  /* Iagc = Inverse, m1 = 20 */
+ 	else
+ 	  stv0299_writereg (i2c, 0x0f, 0x52);  /* Iagc = Normal,  m1 = 18 */
++		break;
++	}
++	
++	switch(stv0299_status) {
++	case STATUS_BER:
++		stv0299_writereg(i2c, 0x34, 0x93);
++		break;
++	
++	case STATUS_UCBLOCKS:
++		stv0299_writereg(i2c, 0x34, 0xB3);
++		break;
++	}
+ 
+ 	return 0;
+ }
+@@ -448,6 +555,7 @@ static int stv0299_check_inversion (stru
+ 		dvb_delay(30);
+ 		if ((stv0299_readreg (i2c, 0x1b) & 0x98) != 0x98) {
+ 		u8 val = stv0299_readreg (i2c, 0x0c);
++			dprintk ("%s : changing inversion\n", __FUNCTION__);
+ 		return stv0299_writereg (i2c, 0x0c, val ^ 0x01);
+ 	}
+ 	}
+@@ -462,21 +570,42 @@ static int stv0299_set_FEC (struct dvb_i
+ 
+ 	switch (fec) {
+ 	case FEC_AUTO:
++	{
++		dprintk ("%s : FEC_AUTO\n", __FUNCTION__);
+ 		return stv0299_writereg (i2c, 0x31, 0x1f);
++	}
+ 	case FEC_1_2:
++	{
++		dprintk ("%s : FEC_1_2\n", __FUNCTION__);
+ 		return stv0299_writereg (i2c, 0x31, 0x01);
++	}
+ 	case FEC_2_3:
++	{
++		dprintk ("%s : FEC_2_3\n", __FUNCTION__);
+ 		return stv0299_writereg (i2c, 0x31, 0x02);
++	}
+ 	case FEC_3_4:
++	{
++		dprintk ("%s : FEC_3_4\n", __FUNCTION__);
+ 		return stv0299_writereg (i2c, 0x31, 0x04);
++	}
+ 	case FEC_5_6:
++	{
++		dprintk ("%s : FEC_5_6\n", __FUNCTION__);
+ 		return stv0299_writereg (i2c, 0x31, 0x08);
++	}
+ 	case FEC_7_8:
++	{
++		dprintk ("%s : FEC_7_8\n", __FUNCTION__);
+ 		return stv0299_writereg (i2c, 0x31, 0x10);
++	}
+ 	default:
++	{
++		dprintk ("%s : FEC invalid\n", __FUNCTION__);
+ 		return -EINVAL;
+ 	}
+ }
++}
+ 
+ 
+ static fe_code_rate_t stv0299_get_fec (struct dvb_i2c_bus *i2c)
+@@ -606,11 +735,20 @@ static int stv0299_set_tone (struct dvb_
+ 
+ 	switch (tone) {
+ 	case SEC_TONE_ON:
++	{
++	    	dprintk("%s: TONE_ON\n", __FUNCTION__);
+ 		return stv0299_writereg (i2c, 0x08, val | 0x3);
++	}	
+ 	case SEC_TONE_OFF:
++	{
++	    	dprintk("%s: TONE_OFF\n", __FUNCTION__);
+ 		return stv0299_writereg (i2c, 0x08, (val & ~0x3) | 0x02);
++	}
+ 	default:
++	{
++	    	dprintk("%s: TONE INVALID\n", __FUNCTION__);
+ 		return -EINVAL;
++	}
+ 	};
+ }
+ 
+@@ -651,39 +789,60 @@ static int stv0299_set_voltage (struct d
+ }
+ 
+ 
+-static int stv0299_set_symbolrate (struct dvb_i2c_bus *i2c, u32 srate)
++static int stv0299_set_symbolrate (struct dvb_i2c_bus *i2c, u32 srate, int tuner_type)
+ {
++	u64 big = srate;
+ 	u32 ratio;
+-	u32 tmp;
+-	u8 aclk = 0xb4, bclk = 0x51;
++	u8 aclk = 0;
++	u8 bclk = 0;
++	u8 m1;
++
++	if ((srate < 1000000) || (srate > 45000000)) return -EINVAL;
++	switch(tuner_type) {
++	case PHILIPS_SU1278SH:
++		aclk = 0xb5;
++		if (srate < 2000000) bclk = 0x86;
++		else if (srate < 5000000) bclk = 0x89;
++		else if (srate < 15000000) bclk = 0x8f;
++		else if (srate < 45000000) bclk = 0x95;
+ 
+-	if (srate > M_CLK)
+-		srate = M_CLK;
+-        if (srate < 500000)
+-		srate = 500000;
+-
+-	if (srate < 30000000) { aclk = 0xb6; bclk = 0x53; }
+-	if (srate < 14000000) { aclk = 0xb7; bclk = 0x53; }
+-	if (srate < 7000000) { aclk = 0xb7; bclk = 0x4f; }
+-	if (srate < 3000000) { aclk = 0xb7; bclk = 0x4b; }
+-	if (srate < 1500000) { aclk = 0xb7; bclk = 0x47; }
++		m1 = 0x14;
++		if (srate < 4000000) m1 = 0x10;
++		break;
+ 
+-#define FIN (M_CLK >> 4)
++	case ALPS_BSRU6:
++	default:
++		if (srate <= 1500000) { aclk = 0xb7; bclk = 0x87; }
++		else if (srate <= 3000000) { aclk = 0xb7; bclk = 0x8b; }
++		else if (srate <= 7000000) { aclk = 0xb7; bclk = 0x8f; }
++		else if (srate <= 14000000) { aclk = 0xb7; bclk = 0x93; }
++		else if (srate <= 30000000) { aclk = 0xb6; bclk = 0x93; }
++		else if (srate <= 45000000) { aclk = 0xb4; bclk = 0x91; }
+ 
+-	tmp = srate << 4;
+-	ratio = tmp / FIN;
++		m1 = 0x12;
++		break;   
++	}
+         
+-	tmp = (tmp % FIN) << 8;
+-	ratio = (ratio << 8) + tmp / FIN;
++	dprintk("%s : big = 0x%08x%08x\n", __FUNCTION__, (int) ((big>>32) & 0xffffffff),  (int) (big & 0xffffffff) );
+         
+-	tmp = (tmp % FIN) << 8;
+-	ratio = (ratio << 8) + tmp / FIN;
++	big = big << 20;
++
++	dprintk("%s : big = 0x%08x%08x\n", __FUNCTION__, (int) ((big>>32) & 0xffffffff),  (int) (big & 0xffffffff) );
++
++	do_div(big, M_CLK);
++
++	dprintk("%s : big = 0x%08x%08x\n", __FUNCTION__, (int) ((big>>32) & 0xffffffff),  (int) (big & 0xffffffff) );
++
++	ratio = big << 4;
++
++	dprintk("%s : ratio = %i\n", __FUNCTION__, ratio);
+   
+ 	stv0299_writereg (i2c, 0x13, aclk);
+ 	stv0299_writereg (i2c, 0x14, bclk);
+ 	stv0299_writereg (i2c, 0x1f, (ratio >> 16) & 0xff);
+ 	stv0299_writereg (i2c, 0x20, (ratio >>  8) & 0xff);
+ 	stv0299_writereg (i2c, 0x21, (ratio      ) & 0xf0);
++	stv0299_writereg (i2c, 0x0f, (stv0299_readreg(i2c, 0x0f) & 0xc0) | m1);
+ 
+ 	return 0;
+ }
+@@ -710,6 +869,9 @@ static int stv0299_get_symbolrate (struc
+ 	offset = (s32) rtf * (srate / 4096L);
+ 	offset /= 128;
+ 
++	dprintk ("%s : srate = %i\n", __FUNCTION__, srate);
++	dprintk ("%s : ofset = %i\n", __FUNCTION__, offset);
++
+ 	srate += offset;
+ 
+ 	srate += 1000;
+@@ -725,6 +887,8 @@ static int uni0299_ioctl (struct dvb_fro
+         int tuner_type = (long) fe->data;
+ 	struct dvb_i2c_bus *i2c = fe->i2c;
+ 
++	dprintk ("%s\n", __FUNCTION__);
++
+ 	switch (cmd) {
+ 	case FE_GET_INFO:
+ 		memcpy (arg, &uni0299_info, sizeof(struct dvb_frontend_info));
+@@ -736,7 +900,7 @@ static int uni0299_ioctl (struct dvb_fro
+ 		u8 signal = 0xff - stv0299_readreg (i2c, 0x18);
+ 		u8 sync = stv0299_readreg (i2c, 0x1b);
+ 
+-		dprintk ("VSTATUS: 0x%02x\n", sync);
++		dprintk ("%s : FE_READ_STATUS : VSTATUS: 0x%02x\n", __FUNCTION__, sync);
+ 
+ 		*status = 0;
+ 
+@@ -759,8 +923,12 @@ static int uni0299_ioctl (struct dvb_fro
+ 	}
+ 
+         case FE_READ_BER:
++		if (stv0299_status == STATUS_BER) {
+ 		*((u32*) arg) = (stv0299_readreg (i2c, 0x1d) << 8)
+ 			       | stv0299_readreg (i2c, 0x1e);
++		} else {
++			*((u32*) arg) = 0;
++		}
+ 		break;
+ 
+ 	case FE_READ_SIGNAL_STRENGTH:
+@@ -768,7 +936,7 @@ static int uni0299_ioctl (struct dvb_fro
+ 		s32 signal =  0xffff - ((stv0299_readreg (i2c, 0x18) << 8)
+ 			               | stv0299_readreg (i2c, 0x19));
+ 
+-		dprintk ("AGC2I: 0x%02x%02x, signal=0x%04x\n",
++		dprintk ("%s : FE_READ_SIGNAL_STRENGTH : AGC2I: 0x%02x%02x, signal=0x%04x\n", __FUNCTION__,
+ 			 stv0299_readreg (i2c, 0x18),
+ 			 stv0299_readreg (i2c, 0x19), (int) signal);
+ 
+@@ -787,18 +955,25 @@ static int uni0299_ioctl (struct dvb_fro
+ 		break;
+ 	}
+ 	case FE_READ_UNCORRECTED_BLOCKS: 
+-		*((u32*) arg) = 0;    /* the stv0299 can't measure BER and */
+-		return -EOPNOTSUPP;   /* errors at the same time.... */
++		if (stv0299_status == STATUS_UCBLOCKS) {
++			*((u32*) arg) = (stv0299_readreg (i2c, 0x1d) << 8)
++			               | stv0299_readreg (i2c, 0x1e);
++		} else {
++			*((u32*) arg) = 0;
++		}
++		break;
+ 
+         case FE_SET_FRONTEND:
+         {
+ 		struct dvb_frontend_parameters *p = arg;
+ 
++		dprintk ("%s : FE_SET_FRONTEND\n", __FUNCTION__);
++
+ 		pll_set_tv_freq (i2c, p->frequency, tuner_type,
+ 				 p->u.qpsk.symbol_rate);
+ 
+                 stv0299_set_FEC (i2c, p->u.qpsk.fec_inner);
+-                stv0299_set_symbolrate (i2c, p->u.qpsk.symbol_rate);
++                stv0299_set_symbolrate (i2c, p->u.qpsk.symbol_rate, tuner_type);
+ 		stv0299_writereg (i2c, 0x22, 0x00);
+ 		stv0299_writereg (i2c, 0x23, 0x00);
+ 		stv0299_readreg (i2c, 0x23);
+@@ -859,6 +1034,8 @@ static int uni0299_ioctl (struct dvb_fro
+ 
+ static long probe_tuner (struct dvb_i2c_bus *i2c)
+ {
++	struct dvb_adapter * adapter = (struct dvb_adapter *) i2c->adapter;
++
+         /* read the status register of TSA5059 */
+ 	u8 rpt[] = { 0x05, 0xb5 };
+         u8 stat [] = { 0 };
+@@ -875,6 +1052,17 @@ static long probe_tuner (struct dvb_i2c_
+ 	stv0299_writereg (i2c, 0x02, 0x30);
+ 	stv0299_writereg (i2c, 0x03, 0x00);
+ 
++
++	printk ("%s: try to attach to %s\n", __FUNCTION__, adapter->name);
++
++	if ( strcmp(adapter->name, "Technisat SkyStar2 driver") == 0 )
++	{
++	    printk ("%s: setup for tuner Samsung TBMU24112IMB\n", __FILE__);
++
++    	    return SAMSUNG_TBMU24112IMB;
++	}
++
++
+ 	if ((ret = i2c->xfer(i2c, msg1, 2)) == 2) {
+ 		printk ("%s: setup for tuner SU1278/SH\n", __FILE__);
+ 		return PHILIPS_SU1278SH;
+@@ -961,3 +1149,5 @@ MODULE_DESCRIPTION("Universal STV0299/TS
+ MODULE_AUTHOR("Ralph Metzler, Holger Waechtler, Peter Schildmann, Felix Domke, Andreas Oberritter");
+ MODULE_LICENSE("GPL");
+ 
++MODULE_PARM(stv0299_status, "i");
++MODULE_PARM_DESC(stv0299_status, "Which status value to support (0: BER, 1: UCBLOCKS)");
+--- linux-2.6.0/drivers/media/dvb/frontends/tda1004x.c	2003-10-25 14:45:44.000000000 -0700
++++ 25/drivers/media/dvb/frontends/tda1004x.c	2003-12-28 23:22:38.000000000 -0800
+@@ -108,7 +108,7 @@ static struct dvb_frontend_info tda10045
+ 	.frequency_min = 51000000,
+ 	.frequency_max = 858000000,
+ 	.frequency_stepsize = 166667,
+-	.caps = FE_CAN_INVERSION_AUTO |
++	.caps =
+ 	    FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
+ 	    FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
+ 	    FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |
+--- linux-2.6.0/drivers/media/dvb/frontends/ves1820.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/media/dvb/frontends/ves1820.c	2003-12-28 23:22:38.000000000 -0800
+@@ -19,6 +19,8 @@
+     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */    
+ 
++#include <linux/config.h>
++#include <linux/delay.h>
+ #include <linux/errno.h>
+ #include <linux/init.h>
+ #include <linux/kernel.h>
+@@ -70,7 +72,18 @@ static int verbose;
+ #define GET_TUNER(data) ((u8) (((long) data >> 16) & 0xff))
+ #define GET_DEMOD_ADDR(data) ((u8) (((long) data >> 24) & 0xff))
+ 
++#if defined(CONFIG_DBOX2)
++#define XIN 69600000UL
++#define DISABLE_INVERSION(reg0)		do { reg0 &= ~0x20; } while (0)
++#define ENABLE_INVERSION(reg0)		do { reg0 |= 0x20; } while (0)
++#define HAS_INVERSION(reg0)		(reg0 & 0x20)
++#else	/* PCI cards */
+ #define XIN 57840000UL
++#define DISABLE_INVERSION(reg0)		do { reg0 |= 0x20; } while (0)
++#define ENABLE_INVERSION(reg0)		do { reg0 &= ~0x20; } while (0)
++#define HAS_INVERSION(reg0)		(!(reg0 & 0x20))
++#endif
++
+ #define FIN (XIN >> 4)
+ 
+ 
+@@ -209,9 +222,9 @@ static int ves1820_setup_reg0 (struct dv
+ 	reg0 |= GET_REG0(fe->data) & 0x62;
+ 	
+ 	if (INVERSION_ON == inversion)
+-		reg0 &= ~0x20;
++		ENABLE_INVERSION(reg0);
+ 	else if (INVERSION_OFF == inversion)
+-		reg0 |= 0x20;
++		DISABLE_INVERSION(reg0);
+ 	
+ 	ves1820_writereg (fe, 0x00, reg0 & 0xfe);
+         ves1820_writereg (fe, 0x00, reg0 | 0x01);
+@@ -220,7 +233,7 @@ static int ves1820_setup_reg0 (struct dv
+ 	 *  check lock and toggle inversion bit if required...
+ 	 */
+ 	if (INVERSION_AUTO == inversion && !(ves1820_readreg (fe, 0x11) & 0x08)) {
+-		dvb_delay(10);
++		mdelay(30);
+ 		if (!(ves1820_readreg (fe, 0x11) & 0x08)) {
+ 			reg0 ^= 0x20;
+ 			ves1820_writereg (fe, 0x00, reg0 & 0xfe);
+@@ -242,6 +255,10 @@ static int ves1820_init (struct dvb_fron
+ 
+         ves1820_writereg (fe, 0, 0);
+ 
++#if defined(CONFIG_DBOX2)
++	ves1820_inittab[2] &= ~0x08;
++#endif
++
+ 	for (i=0; i<53; i++)
+                 ves1820_writereg (fe, i, ves1820_inittab[i]);
+ 
+@@ -330,6 +347,10 @@ static int ves1820_set_parameters (struc
+ 
+ 	ves1820_setup_reg0 (fe, reg0x00[real_qam], p->inversion);
+ 
++	/* yes, this speeds things up: userspace reports lock in about 8 ms
++	   instead of 500 to 1200 ms after calling FE_SET_FRONTEND. */
++	mdelay(30);
++
+ 	return 0;
+ }
+ 
+@@ -419,14 +440,14 @@ static int ves1820_ioctl (struct dvb_fro
+ 					fe->i2c->adapter->num, afc,
+ 				-((s32)(p->u.qam.symbol_rate >> 3) * afc >> 7));
+ 
+-		p->inversion = reg0 & 0x20 ? INVERSION_OFF : INVERSION_ON;
++		p->inversion = HAS_INVERSION(reg0) ? INVERSION_ON : INVERSION_OFF;
+ 		p->u.qam.modulation = ((reg0 >> 2) & 7) + QAM_16;
+ 
+ 		p->u.qam.fec_inner = FEC_NONE;
+ 
+ 		p->frequency = ((p->frequency + 31250) / 62500) * 62500;
+-		// To prevent overflow, shift symbol rate first a
+-		// couple of bits.
++		/* To prevent overflow, shift symbol rate first a
++		   couple of bits. */
+ 		p->frequency -= (s32)(p->u.qam.symbol_rate >> 3) * afc >> 7;
+ 		break;
+ 	}
+@@ -462,8 +483,6 @@ static long probe_tuner (struct dvb_i2c_
+ 		printk ("DVB: VES1820(%d): setup for tuner sp5659c\n", i2c->adapter->num);
+ 	} else {
+ 		type = -1;
+-		printk ("DVB: VES1820(%d): unknown PLL, "
+-			"please report to <linuxdvb@linuxtv.org>!!\n", i2c->adapter->num);
+ 	}
+ 
+ 	return type;
+@@ -477,13 +496,11 @@ static u8 read_pwm (struct dvb_i2c_bus *
+ 	struct i2c_msg msg [] = { { .addr = 0x50, .flags = 0, .buf = &b, .len = 1 },
+ 			 { .addr = 0x50, .flags = I2C_M_RD, .buf = &pwm, .len = 1 } };
+ 
+-	i2c->xfer (i2c, msg, 2);
++	if ((i2c->xfer(i2c, msg, 2) != 2) || (pwm == 0xff))
++		pwm = 0x48;
+ 
+ 	printk("DVB: VES1820(%d): pwm=0x%02x\n", i2c->adapter->num, pwm);
+ 
+-	if (pwm == 0xff)
+-		pwm = 0x48;
+-
+ 	return pwm;
+ }
+ 
+@@ -516,8 +533,7 @@ static int ves1820_attach (struct dvb_i2
+ 	if ((demod_addr = probe_demod_addr(i2c)) < 0)
+ 		return -ENODEV;
+ 
+-	if ((tuner_type = probe_tuner(i2c)) < 0)
+-		return -ENODEV;
++	tuner_type = probe_tuner(i2c);
+ 
+ 	if ((i2c->adapter->num < MAX_UNITS) && pwm[i2c->adapter->num] != -1) {
+ 		printk("DVB: VES1820(%d): pwm=0x%02x (user specified)\n",
+--- linux-2.6.0/drivers/media/dvb/Kconfig	2003-10-08 15:07:08.000000000 -0700
++++ 25/drivers/media/dvb/Kconfig	2003-12-28 23:22:37.000000000 -0800
+@@ -45,5 +45,9 @@ comment "Supported FlexCopII (B2C2) Adap
+ 	depends on DVB_CORE && PCI
+ source "drivers/media/dvb/b2c2/Kconfig"
+ 
++comment "Supported BT878 Adapters"
++	depends on DVB_CORE && PCI
++source "drivers/media/dvb/bt8xx/Kconfig"
++
+ endmenu
+ 
+--- linux-2.6.0/drivers/media/dvb/Makefile	2003-07-27 12:14:39.000000000 -0700
++++ 25/drivers/media/dvb/Makefile	2003-12-28 23:22:37.000000000 -0800
+@@ -2,5 +2,5 @@
+ # Makefile for the kernel multimedia device drivers.
+ #
+ 
+-obj-y        := dvb-core/ frontends/ ttpci/ ttusb-dec/ ttusb-budget/ b2c2/
++obj-y        := dvb-core/ frontends/ ttpci/ ttusb-dec/ ttusb-budget/ b2c2/ bt8xx/
+ 
+--- linux-2.6.0/drivers/media/dvb/ttpci/av7110.c	2003-10-25 14:45:44.000000000 -0700
++++ 25/drivers/media/dvb/ttpci/av7110.c	2003-12-28 23:22:39.000000000 -0800
+@@ -35,7 +35,6 @@
+ 
+ #define __KERNEL_SYSCALLS__
+ #include <linux/module.h>
+-#include <linux/init.h>
+ #include <linux/kmod.h>
+ #include <linux/delay.h>
+ #include <linux/fs.h>
+@@ -43,7 +42,6 @@
+ #include <linux/poll.h>
+ #include <linux/unistd.h>
+ #include <linux/byteorder/swabb.h>
+-#include <linux/slab.h>
+ #include <linux/smp_lock.h>
+ #include <stdarg.h>
+ 
+@@ -55,15 +53,15 @@
+ #include <linux/ptrace.h>
+ #include <linux/ioport.h>
+ #include <linux/in.h>
+-#include <linux/slab.h>
+ #include <linux/string.h>
+ #include <linux/pci.h>
+-#include <linux/init.h>
+ #include <linux/vmalloc.h>
+ #include <linux/netdevice.h>
+ #include <linux/inetdevice.h>
+ #include <linux/etherdevice.h>
+ #include <linux/skbuff.h>
++#include <linux/firmware.h>
++#include <linux/crc32.h>
+ 
+ #include <asm/system.h>
+ #include <asm/bitops.h>
+@@ -108,6 +106,7 @@ static int vidmode=CVBS_RGB_OUT;
+ static int pids_off;
+ static int adac=DVB_ADAC_TI;
+ static int hw_sections = 1;
++static int rgb_on = 0;
+ 
+ int av7110_num = 0;
+ 
+@@ -118,42 +117,12 @@ int av7110_num = 0;
+  * DEBI functions
+  ****************************************************************************/
+ 
++#define wait_for_debi_done(x) \
++       saa7146_wait_for_debi_done(x->dev) \
++
+ /* This DEBI code is based on the Stradis driver 
+    by Nathan Laredo <laredo@gnu.org> */
+ 
+-static int wait_for_debi_done(struct av7110 *av7110)
+-{
+-	struct saa7146_dev *dev = av7110->dev;
+-	int start;
+-
+-	/* wait for registers to be programmed */
+-	start = jiffies;
+-	while (1) {
+-                if (saa7146_read(dev, MC2) & 2)
+-                        break;
+-		if (jiffies-start > HZ/20) {
+-			printk ("%s: timed out while waiting for registers "
+-				"getting programmed\n", __FUNCTION__);
+-			return -ETIMEDOUT;
+-		}
+-	}
+-
+-	/* wait for transfer to complete */
+-	start = jiffies;
+-	while (1) {
+-		if (!(saa7146_read(dev, PSR) & SPCI_DEBI_S))
+-			break;
+-		saa7146_read(dev, MC2);
+-		if (jiffies-start > HZ/4) {
+-			printk ("%s: timed out while waiting for transfer "
+-				"completion\n", __FUNCTION__);
+-			return -ETIMEDOUT;
+-		}
+-	}
+-
+-	return 0;
+-}
+-
+ static int debiwrite(struct av7110 *av7110, u32 config, 
+                      int addr, u32 val, int count)
+ {
+@@ -375,7 +344,7 @@ static int record_cb(struct dvb_filter_p
+ {
+         struct dvb_demux_feed *dvbdmxfeed=(struct dvb_demux_feed *) p2t->priv;
+ 
+-	DEB_EE(("struct dvb_filter_pes2ts:%p\n",p2t));
++//	DEB_EE(("struct dvb_filter_pes2ts:%p\n",p2t));
+ 
+         if (!(dvbdmxfeed->ts_type & TS_PACKET)) 
+                 return 0;
+@@ -385,14 +354,14 @@ static int record_cb(struct dvb_filter_p
+                 return dvbdmxfeed->cb.ts(buf, len, 0, 0, 
+                                          &dvbdmxfeed->feed.ts, DMX_OK); 
+         else
+-                return dvb_filter_pes2ts(p2t, buf, len);
++                return dvb_filter_pes2ts(p2t, buf, len, 1);
+ }
+ 
+ static int dvb_filter_pes2ts_cb(void *priv, unsigned char *data)
+ {
+         struct dvb_demux_feed *dvbdmxfeed=(struct dvb_demux_feed *) priv;
+ 
+-	DEB_EE(("dvb_demux_feed:%p\n",dvbdmxfeed));
++//	DEB_EE(("dvb_demux_feed:%p\n",dvbdmxfeed));
+         
+         dvbdmxfeed->cb.ts(data, 188, 0, 0,
+                           &dvbdmxfeed->feed.ts,
+@@ -886,10 +855,10 @@ static void gpioirq (unsigned long data)
+         txbuf=irdebi(av7110, DEBINOSWAP, TX_BUFF, 0, 2);
+         len=(av7110->debilen+3)&(~3);
+ 
+-        DEB_D(("GPIO0 irq %d %d\n", av7110->debitype, av7110->debilen));
++//        DEB_D(("GPIO0 irq %d %d\n", av7110->debitype, av7110->debilen));
+         print_time("gpio");
+ 
+-        DEB_D(("GPIO0 irq %02x\n", av7110->debitype&0xff));        
++//       DEB_D(("GPIO0 irq %02x\n", av7110->debitype&0xff));        
+         switch (av7110->debitype&0xff) {
+ 
+         case DATA_TS_PLAY:
+@@ -2002,8 +1971,6 @@ static u8 bootcode[] = {
+         0x2c, 0x00, 0x03, 0xf8, 0x2c, 0x00, 0x04, 0x00,
+ };
+ 
+-#include "av7110_firm.h"
+-
+ static int bootarm(struct av7110 *av7110)
+ {
+ 	struct saa7146_dev *dev= av7110->dev;
+@@ -2056,7 +2023,7 @@ static int bootarm(struct av7110 *av7110
+         
+         DEB_D(("bootarm: load dram code\n"));
+ 
+-	if (load_dram(av7110, (u32 *)Root, sizeof(Root))<0)
++	if (load_dram(av7110, (u32 *)av7110->bin_root, av7110->size_root)<0)
+ 		return -1;
+ 
+ 	saa7146_setgpio(dev, RESET_LINE, SAA7146_GPIO_OUTLO);
+@@ -2064,7 +2031,7 @@ static int bootarm(struct av7110 *av7110
+         
+         DEB_D(("bootarm: load dpram code\n"));
+ 
+-	mwdebi(av7110, DEBISWAB, DPRAM_BASE, Dpram, sizeof(Dpram));
++	mwdebi(av7110, DEBISWAB, DPRAM_BASE, av7110->bin_dpram, av7110->size_dpram);
+ 
+ 	wait_for_debi_done(av7110);
+ 
+@@ -2706,9 +2673,9 @@ static int tuner_set_tv_freq (struct saa
+ 	buf[1] = div & 0xff;
+ 	buf[2] = 0x8e;
+ 
+-	if (freq < (u32) (16*168.25) ) 
++	if (freq < (u32) 16*168.25 )
+ 		config = 0xa0;
+-	else if (freq < (u32) (16*447.25)) 
++	else if (freq < (u32) 16*447.25)
+ 		config = 0x90;
+ 	else
+ 		config = 0x30;
+@@ -4294,8 +4261,10 @@ static void av7110_before_after_tune (fe
+                         av7110->pids[DMX_PES_TELETEXT], 0, 
+                         av7110->pids[DMX_PES_PCR]);
+         	outcom(av7110, COMTYPE_PIDFILTER, Scan, 0);
+-	} else 
++	} else {
+ 		SetPIDs(av7110, 0, 0, 0, 0, 0);
++        	outcom(av7110, COMTYPE_PIDFILTER, FlushTSQueue, 0);
++	}
+ 
+         up(&av7110->pid_mutex);
+ }
+@@ -4531,29 +4500,98 @@ static struct saa7146_ext_vv av7110_vv_d
+ 
+ static int av7110_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_data *pci_ext)
+ {
++	const struct firmware *fw;
+ 	struct av7110 *av7110 = NULL;
+ 	int ret = 0;
+-	
++	u32 crc = 0, len = 0;
++	unsigned char *ptr;
++		
++	DEB_EE(("dev: %p, av7110: %p\n",dev,av7110));
++
++	/* request the av7110 firmware, this will block until someone uploads it */
++	ret = request_firmware(&fw, "dvb-ttpci-01.fw", &dev->pci->dev);
++	if ( 0 != ret ) {
++		printk("dvb-ttpci: cannot request firmware!\n");
++		return -EINVAL;
++	}
++
++	if (fw->size <= 200000) {
++		printk("dvb-ttpci: this firmware is way too small.\n");
++		return -EINVAL;
++	}
++
++	/* prepare the av7110 device struct */
+ 	if (!(av7110 = kmalloc (sizeof (struct av7110), GFP_KERNEL))) {
+ 		printk ("%s: out of memory!\n", __FUNCTION__);
+ 		return -ENOMEM;
+ 	}
+-
+ 	memset(av7110, 0, sizeof(struct av7110));
++	
++	/* check if the firmware is available */
++	av7110->bin_fw = (unsigned char*)vmalloc(fw->size);
++	if (NULL == av7110->bin_fw) {
++		DEB_D(("out of memory\n"));
++		kfree(av7110);
++		return -ENOMEM;
++	}
++	memcpy(av7110->bin_fw, fw->data, fw->size);
++	av7110->size_fw = fw->size;
+ 
++	/* check for firmware magic */
++	ptr = av7110->bin_fw;
++	if (ptr[0] != 'A' || ptr[1] != 'V' || 
++	    ptr[2] != 'F' || ptr[3] != 'W') {
++		printk("dvb-ttpci: this is not an av7110 firmware\n");
++		goto fw_error;
++	}
++	ptr += 4;
++
++	/* check dpram file */
++	crc = ntohl(*(u32*)ptr);
++	ptr += 4;
++	len = ntohl(*(u32*)ptr);
++	ptr += 4;
++	if (len >= 512) {
++		printk("dvb-ttpci: dpram file is way to big.\n");
++		goto fw_error;
++	}
++	if( crc != crc32_le(0,ptr,len)) {
++		printk("dvb-ttpci: crc32 of dpram file does not match.\n");
++		goto fw_error;
++	}
++	av7110->bin_dpram = ptr;
++	av7110->size_dpram = len;
++	ptr += len;
++	
++	/* check root file */
++	crc = ntohl(*(u32*)ptr);
++	ptr += 4;
++	len = ntohl(*(u32*)ptr);
++	ptr += 4;
++	
++	if (len <= 200000 || len >= 300000 || len > ((av7110->bin_fw+av7110->size_fw)-ptr) ) {
++		printk("dvb-ttpci: root file has strange size (%d). aborting.\n",len);
++		goto fw_error;
++	}
++	if( crc != crc32_le(0,ptr,len)) {
++		printk("dvb-ttpci: crc32 of dpram file does not match.\n");
++		goto fw_error;
++	}
++	av7110->bin_root = ptr;
++	av7110->size_root = len;
++	
++	/* go on with regular device initialization */
+ 	av7110->card_name = (char*)pci_ext->ext_priv;
++	av7110->dev=(struct saa7146_dev *)dev;
+ 	(struct av7110*)dev->ext_priv = av7110;
+ 
+-	DEB_EE(("dev: %p, av7110: %p\n",dev,av7110));
+-
+-	av7110->dev=(struct saa7146_dev *)dev;
+ 	dvb_register_adapter(&av7110->dvb_adapter, av7110->card_name);
+ 
+ 	/* the Siemens DVB needs this if you want to have the i2c chips
+ 	   get recognized before the main driver is fully loaded */
+ 	saa7146_write(dev, GPIO_CTRL, 0x500000);
+ 
+-	saa7146_i2c_adapter_prepare(dev, NULL, SAA7146_I2C_BUS_BIT_RATE_3200);
++	saa7146_i2c_adapter_prepare(dev, NULL, SAA7146_I2C_BUS_BIT_RATE_120); /* 275 kHz */
+ 
+ 	av7110->i2c_bus = dvb_register_i2c_bus (master_xfer, dev,
+ 						av7110->dvb_adapter, 0);
+@@ -4571,7 +4609,7 @@ static int av7110_attach (struct saa7146
+ 
+ 	/* set dd1 stream a & b */
+       	saa7146_write(dev, DD1_STREAM_B, 0x00000000);
+-	saa7146_write(dev, DD1_INIT, 0x02000000);
++	saa7146_write(dev, DD1_INIT, 0x03000000);
+ 	saa7146_write(dev, MC2, (MASK_09 | MASK_25 | MASK_10 | MASK_26));
+ 
+ 	/* upload all */
+@@ -4729,7 +4767,7 @@ static int av7110_attach (struct saa7146
+ 		memcpy(standard,dvb_standard,sizeof(struct saa7146_standard)*2);
+ 		/* set dd1 stream a & b */
+       		saa7146_write(dev, DD1_STREAM_B, 0x00000000);
+-		saa7146_write(dev, DD1_INIT, 0x02000700);
++		saa7146_write(dev, DD1_INIT, 0x03000700);
+ 		saa7146_write(dev, MC2, (MASK_09 | MASK_25 | MASK_10 | MASK_26));
+ 	}
+ 	else if (dev->pci->subsystem_vendor == 0x110a) {
+@@ -4747,7 +4785,8 @@ static int av7110_attach (struct saa7146
+ 		// switch DVB SCART on
+ 		outcom(av7110, COMTYPE_AUDIODAC, MainSwitch, 1, 0);
+ 		outcom(av7110, COMTYPE_AUDIODAC, ADSwitch, 1, 1);
+-		//saa7146_setgpio(dev, 1, SAA7146_GPIO_OUTHI); // RGB on, SCART pin 16
++		if (rgb_on)
++			saa7146_setgpio(dev, 1, SAA7146_GPIO_OUTHI); // RGB on, SCART pin 16
+ 		//saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO); // SCARTpin 8
+ 	}
+ 	
+@@ -4786,6 +4825,7 @@ static int av7110_attach (struct saa7146
+ 	}	
+ 
+ 	printk(KERN_INFO "av7110: found av7110-%d.\n",av7110_num);
++	av7110->device_initialized = 1;
+ 	av7110_num++;
+         return 0;
+ 
+@@ -4809,12 +4849,20 @@ err:
+ 	dvb_unregister_adapter (av7110->dvb_adapter);
+ 
+ 	return ret;
++fw_error:
++	vfree(av7110->bin_fw);
++	kfree(av7110);
++	return -EINVAL;
+ }
+ 
+ static int av7110_detach (struct saa7146_dev* saa)
+ {
+ 	struct av7110 *av7110 = (struct av7110*)saa->ext_priv;
+ 	DEB_EE(("av7110: %p\n",av7110));
++	
++	if( 0 == av7110->device_initialized ) {
++		return 0;
++	}
+ 
+ 	saa7146_unregister_device(&av7110->v4l_dev, saa);
+ 	if (2 == av7110->has_analog_tuner) {
+@@ -4845,11 +4893,13 @@ static int av7110_detach (struct saa7146
+ 	dvb_unregister_i2c_bus (master_xfer,av7110->i2c_bus->adapter, av7110->i2c_bus->id);
+ 	dvb_unregister_adapter (av7110->dvb_adapter);
+ 
++	av7110_num--;
++	if (NULL != av7110->bin_fw ) {
++		vfree(av7110->bin_fw);
++	}
+ 	kfree (av7110);
+-
+ 	saa->ext_priv = NULL;
+-	av7110_num--;
+-	
++
+ 	return 0;
+ }
+ 
+@@ -4858,7 +4908,7 @@ static void av7110_irq(struct saa7146_de
+ {
+ 	struct av7110 *av7110 = (struct av7110*)dev->ext_priv;
+ 
+-	DEB_INT(("dev: %p, av7110: %p\n",dev,av7110));
++//	DEB_INT(("dev: %p, av7110: %p\n",dev,av7110));
+ 
+ 	if (*isr & MASK_19)
+ 		tasklet_schedule (&av7110->debi_tasklet);
+@@ -4887,7 +4937,7 @@ static struct saa7146_standard standard[
+ static struct saa7146_standard analog_standard[] = {
+ 	{
+ 		.name	= "PAL", 	.id		= V4L2_STD_PAL_BG,
+-		.v_offset	= 0x18,	.v_field 	= 288,		.v_calc	= 576,
++		.v_offset	= 0x18 /* 0 */ ,	.v_field 	= 288,		.v_calc	= 576,
+ 		.h_offset	= 0x08,	.h_pixels 	= 708,		.h_calc	= 709,
+ 		.v_max_out	= 576,	.h_max_out	= 768,
+ 	}, {
+@@ -4975,7 +5025,7 @@ static struct saa7146_ext_vv av7110_vv_d
+ 	.inputs		= 1,
+ 	.audios 	= 1,
+ 	.capabilities	= 0,
+-	.flags		= SAA7146_EXT_SWAP_ODD_EVEN,
++	.flags		= 0, 
+ 
+ 	.stds		= &standard[0],
+ 	.num_stds	= sizeof(standard)/sizeof(struct saa7146_standard),
+@@ -5002,6 +5052,7 @@ static struct saa7146_ext_vv av7110_vv_d
+ 
+ static struct saa7146_extension av7110_extension = {
+ 	.name		= "dvb\0",
++	.flags		= SAA7146_I2C_SHORT_DELAY,
+ 
+ 	.module		= THIS_MODULE,
+ 	.pci_tbl	= &pci_tbl[0],
+@@ -5054,4 +5105,6 @@ MODULE_PARM(adac,"i");
+ MODULE_PARM_DESC(adac,"audio DAC type: 0 TI, 1 CRYSTAL, 2 MSP (use if autodetection fails)");
+ MODULE_PARM(hw_sections, "i");
+ MODULE_PARM_DESC(hw_sections, "0 use software section filter, 1 use hardware");
+-
++MODULE_PARM(rgb_on, "i");
++MODULE_PARM_DESC(rgb_on, "For Siemens DVB-C cards only: Enable RGB control"
++		" signal on SCART pin 16 to switch SCART video mode from CVBS to RGB");
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/media/dvb/ttpci/av7110.c.orig	2003-12-28 23:22:39.000000000 -0800
+@@ -0,0 +1,5030 @@
++/*
++ * av7110.c: driver for the SAA7146 based AV110 cards (like the Fujitsu-Siemens DVB)
++ *
++ * Copyright (C) 1999-2002 Ralph  Metzler 
++ *                       & Marcus Metzler for convergence integrated media GmbH
++ *
++ * originally based on code by:
++ * Copyright (C) 1998,1999 Christian Theiss <mistert@rz.fh-augsburg.de>
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ * 
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ * 
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
++ * 
++ *
++ * the project's page is at http://www.linuxtv.org/dvb/
++ */
++
++#define NEW_CI 1
++
++/* for debugging ARM communication: */
++//#define COM_DEBUG
++
++#define __KERNEL_SYSCALLS__
++#include <linux/module.h>
++#include <linux/kmod.h>
++#include <linux/delay.h>
++#include <linux/fs.h>
++#include <linux/timer.h>
++#include <linux/poll.h>
++#include <linux/unistd.h>
++#include <linux/byteorder/swabb.h>
++#include <linux/smp_lock.h>
++#include <stdarg.h>
++
++#include <linux/kernel.h>
++#include <linux/sched.h>
++#include <linux/types.h>
++#include <linux/fcntl.h>
++#include <linux/interrupt.h>
++#include <linux/ptrace.h>
++#include <linux/ioport.h>
++#include <linux/in.h>
++#include <linux/string.h>
++#include <linux/pci.h>
++#include <linux/vmalloc.h>
++#include <linux/netdevice.h>
++#include <linux/inetdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/skbuff.h>
++
++#include <asm/system.h>
++#include <asm/bitops.h>
++#include <asm/io.h>
++#include <asm/dma.h>
++#include <asm/semaphore.h>
++
++#include <linux/dvb/frontend.h>
++
++#include "dvb_i2c.h"
++#include "dvb_frontend.h"
++#include "dvb_functions.h"
++
++
++#if 1 
++	#define DEBUG_VARIABLE av7110_debug
++#else
++	#define DEB_S(x) 
++	#define DEB_D(x) 
++	#define DEB_EE(x)
++#endif
++
++#include "ttpci-eeprom.h"
++#include "av7110.h"
++#include "av7110_ipack.h"
++
++static int AV_StartPlay(struct av7110 *av7110, int av);
++static void restart_feeds(struct av7110 *av7110);
++static int bootarm(struct av7110 *av7110);
++static inline int i2c_writereg(struct av7110 *av7110, u8 id, u8 reg, u8 val);
++static inline u8 i2c_readreg(struct av7110 *av7110, u8 id, u8 reg);
++static int  outcom(struct av7110 *av7110, int type, int com, int num, ...);
++static void SetMode(struct av7110 *av7110, int mode);
++static void dvb_video_add_event (struct av7110 *av7110, struct video_event *event);
++
++void pes_to_ts(u8 const *buf, long int length, u16 pid, struct av7110_p2t *p);
++void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter, struct dvb_demux_feed *feed);
++
++static int av7110_debug = 0;
++
++static int vidmode=CVBS_RGB_OUT;
++static int pids_off;
++static int adac=DVB_ADAC_TI;
++static int hw_sections = 1;
++static int rgb_on = 0;
++
++int av7110_num = 0;
++
++#define FW_CI_LL_SUPPORT(arm_app) ((arm_app) & 0x80000000)
++#define FW_VERSION(arm_app)       ((arm_app) & 0x0000FFFF)
++
++/****************************************************************************
++ * DEBI functions
++ ****************************************************************************/
++
++#define wait_for_debi_done(x) \
++       saa7146_wait_for_debi_done(x->dev) \
++
++/* This DEBI code is based on the Stradis driver 
++   by Nathan Laredo <laredo@gnu.org> */
++
++static int debiwrite(struct av7110 *av7110, u32 config, 
++                     int addr, u32 val, int count)
++{
++        struct saa7146_dev *dev = av7110->dev;
++	u32 cmd;
++
++	if (count <= 0 || count > 32764)
++		return -1;
++	if (wait_for_debi_done(av7110) < 0)
++		return -1;
++	saa7146_write(dev, DEBI_CONFIG, config);
++	if (count <= 4)		/* immediate transfer */
++		saa7146_write(dev, DEBI_AD, val );
++	else			/* block transfer */
++		saa7146_write(dev, DEBI_AD, av7110->debi_bus);
++	saa7146_write(dev, DEBI_COMMAND, (cmd = (count << 17) | (addr & 0xffff)));
++	saa7146_write(dev, MC2, (2 << 16) | 2);
++	return 0;
++}
++
++static u32 debiread(struct av7110 *av7110, u32 config, int addr, int count)
++{
++        struct saa7146_dev *dev = av7110->dev;
++	u32 result = 0;
++
++	if (count > 32764 || count <= 0)
++		return 0;
++	if (wait_for_debi_done(av7110) < 0)
++		return 0;
++	saa7146_write(dev, DEBI_AD, av7110->debi_bus);
++	saa7146_write(dev, DEBI_COMMAND, (count << 17) | 0x10000 | (addr & 0xffff));
++
++	saa7146_write(dev, DEBI_CONFIG, config);
++	saa7146_write(dev, MC2, (2 << 16) | 2);
++	if (count > 4)	
++		return count;
++	wait_for_debi_done(av7110);
++	result = saa7146_read(dev, DEBI_AD);
++        result &= (0xffffffffUL >> ((4-count)*8));
++	return result;
++}
++
++
++/* DEBI during interrupt */
++/* single word writes */
++static inline void iwdebi(struct av7110 *av7110, u32 config, int addr, u32 val, int count)
++{
++        debiwrite(av7110, config, addr, val, count);
++}
++
++/* buffer writes */
++static inline void mwdebi(struct av7110 *av7110, u32 config, int addr, char *val, int count)
++{
++	memcpy(av7110->debi_virt, val, count);
++        debiwrite(av7110, config, addr, 0, count);
++}
++
++
++static inline u32 irdebi(struct av7110 *av7110, u32 config, int addr, u32 val, int count)
++{
++        u32 res;
++
++        res=debiread(av7110, config, addr, count);
++        if (count<=4) 
++                memcpy(av7110->debi_virt, (char *) &res, count);
++        return res;
++}
++
++/* DEBI outside interrupts, only for count<=4! */
++
++static inline void wdebi(struct av7110 *av7110, u32 config, int addr, u32 val, int count)
++{
++        unsigned long flags;
++
++        spin_lock_irqsave(&av7110->debilock, flags);
++        debiwrite(av7110, config, addr, val, count);
++        spin_unlock_irqrestore(&av7110->debilock, flags);
++}
++
++static inline u32 rdebi(struct av7110 *av7110, u32 config, int addr, u32 val, int count)
++{
++        unsigned long flags;
++        u32 res;
++
++        spin_lock_irqsave(&av7110->debilock, flags);
++        res=debiread(av7110, config, addr, count);
++        spin_unlock_irqrestore(&av7110->debilock, flags);
++        return res;
++}
++
++
++static inline char chtrans(char c)
++{
++        if (c<32 || c>126)
++                c=0x20;
++        return c;
++}
++
++
++/* handle mailbox registers of the dual ported RAM */
++
++static inline void ARM_ResetMailBox(struct av7110 *av7110)
++{
++        unsigned long flags;
++
++	DEB_EE(("av7110: %p\n",av7110));
++
++        spin_lock_irqsave(&av7110->debilock, flags);
++        debiread(av7110, DEBINOSWAP, IRQ_RX, 2);
++        //printk("dvb: IRQ_RX=%d\n", debiread(av7110, DEBINOSWAP, IRQ_RX, 2));
++        debiwrite(av7110, DEBINOSWAP, IRQ_RX, 0, 2);
++        spin_unlock_irqrestore(&av7110->debilock, flags);
++}
++
++static inline void ARM_ClearMailBox(struct av7110 *av7110)
++{
++        iwdebi(av7110, DEBINOSWAP, IRQ_RX, 0, 2);
++}
++
++static inline void ARM_ClearIrq(struct av7110 *av7110)
++{
++	irdebi(av7110, DEBINOSWAP, IRQ_RX, 0, 2);
++}
++
++static void reset_arm(struct av7110 *av7110)
++{
++        saa7146_setgpio(av7110->dev, RESET_LINE, SAA7146_GPIO_OUTLO);
++
++        /* Disable DEBI and GPIO irq */
++	IER_DISABLE(av7110->dev, (MASK_19 | MASK_03));
++//        saa7146_write(av7110->dev, IER, 
++//                      saa7146_read(av7110->dev, IER) & ~(MASK_19 | MASK_03));
++        saa7146_write(av7110->dev, ISR, (MASK_19 | MASK_03));
++
++        mdelay(800);
++        saa7146_setgpio(av7110->dev, RESET_LINE, SAA7146_GPIO_OUTHI);
++        mdelay(800);
++
++        ARM_ResetMailBox(av7110); 
++
++        saa7146_write(av7110->dev, ISR, (MASK_19 | MASK_03));
++
++	IER_ENABLE(av7110->dev, MASK_03);
++//        saa7146_write(av7110->dev, IER, 
++//                      saa7146_read(av7110->dev, IER) | MASK_03 );
++
++        av7110->arm_ready=1;
++        printk("av7110: ARM RESET\n");
++}
++
++static void recover_arm(struct av7110 *av7110)
++{
++	DEB_EE(("av7110: %p\n",av7110));
++
++        if (current->files)
++                bootarm(av7110);
++        else {
++                printk("OOPS, no current->files\n");
++                reset_arm(av7110);
++        }
++
++        dvb_delay(100); 
++        restart_feeds(av7110);
++        outcom(av7110, COMTYPE_PIDFILTER, SetIR, 1, av7110->ir_config);
++}
++
++static void arm_error(struct av7110 *av7110)
++{
++	DEB_EE(("av7110: %p\n",av7110));
++
++        av7110->arm_errors++;
++        av7110->arm_ready=0;
++        recover_arm(av7110);
++}
++
++static int arm_thread(void *data)
++{
++	struct av7110 *av7110 = data;
++        u16 newloops = 0;
++
++	DEB_EE(("av7110: %p\n",av7110));
++	
++	dvb_kernel_thread_setup ("arm_mon");
++	av7110->arm_thread = current;
++
++	while (!av7110->arm_rmmod && !signal_pending(current)) {
++                interruptible_sleep_on_timeout(&av7110->arm_wait, 5*HZ);
++
++                if (!av7110->arm_ready)
++                        continue;
++
++                if (down_interruptible(&av7110->dcomlock))
++                        break;
++
++                newloops=rdebi(av7110, DEBINOSWAP, STATUS_LOOPS, 0, 2);
++                up(&av7110->dcomlock);
++
++                if (newloops==av7110->arm_loops) {
++                        printk(KERN_ERR "av7110%d: ARM crashed!\n",
++				av7110->dvb_adapter->num);
++
++			arm_error(av7110);
++
++                        if (down_interruptible(&av7110->dcomlock))
++                                break;
++
++                        newloops=rdebi(av7110, DEBINOSWAP, STATUS_LOOPS, 0, 2)-1;
++                        up(&av7110->dcomlock);
++                }
++                av7110->arm_loops=newloops;
++	}
++
++	av7110->arm_thread = NULL;
++	return 0;
++}
++
++
++static int record_cb(struct dvb_filter_pes2ts *p2t, u8 *buf, size_t len)
++{
++        struct dvb_demux_feed *dvbdmxfeed=(struct dvb_demux_feed *) p2t->priv;
++
++//	DEB_EE(("struct dvb_filter_pes2ts:%p\n",p2t));
++
++        if (!(dvbdmxfeed->ts_type & TS_PACKET)) 
++                return 0;
++	if (buf[3]==0xe0)        // video PES do not have a length in TS
++                buf[4]=buf[5]=0;
++        if (dvbdmxfeed->ts_type & TS_PAYLOAD_ONLY) 
++                return dvbdmxfeed->cb.ts(buf, len, 0, 0, 
++                                         &dvbdmxfeed->feed.ts, DMX_OK); 
++        else
++                return dvb_filter_pes2ts(p2t, buf, len, 1);
++}
++
++static int dvb_filter_pes2ts_cb(void *priv, unsigned char *data)
++{
++        struct dvb_demux_feed *dvbdmxfeed=(struct dvb_demux_feed *) priv;
++
++//	DEB_EE(("dvb_demux_feed:%p\n",dvbdmxfeed));
++        
++        dvbdmxfeed->cb.ts(data, 188, 0, 0,
++                          &dvbdmxfeed->feed.ts,
++                          DMX_OK); 
++        return 0;
++}
++
++static int AV_StartRecord(struct av7110 *av7110, int av,
++               struct dvb_demux_feed *dvbdmxfeed)
++{
++        struct dvb_demux *dvbdmx=dvbdmxfeed->demux;
++  
++	DEB_EE(("av7110: %p, dvb_demux_feed:%p\n",av7110,dvbdmxfeed));
++
++        if (av7110->playing||(av7110->rec_mode&av))
++                return -EBUSY;
++        outcom(av7110, COMTYPE_REC_PLAY, __Stop, 0);
++        dvbdmx->recording=1;
++        av7110->rec_mode|=av;
++
++        switch (av7110->rec_mode) {
++        case RP_AUDIO:
++                dvb_filter_pes2ts_init (&av7110->p2t[0],
++					dvbdmx->pesfilter[0]->pid,
++					dvb_filter_pes2ts_cb,
++					(void *)dvbdmx->pesfilter[0]);
++                outcom(av7110, COMTYPE_REC_PLAY, __Record, 2, AudioPES, 0);
++                break;
++
++	case RP_VIDEO:
++                dvb_filter_pes2ts_init (&av7110->p2t[1],
++					dvbdmx->pesfilter[1]->pid,
++					dvb_filter_pes2ts_cb,
++					(void *)dvbdmx->pesfilter[1]);
++                outcom(av7110, COMTYPE_REC_PLAY, __Record, 2, VideoPES, 0);
++                break;
++
++	case RP_AV:
++                dvb_filter_pes2ts_init (&av7110->p2t[0],
++					dvbdmx->pesfilter[0]->pid,
++					dvb_filter_pes2ts_cb,
++					(void *)dvbdmx->pesfilter[0]);
++                dvb_filter_pes2ts_init (&av7110->p2t[1],
++					dvbdmx->pesfilter[1]->pid,
++					dvb_filter_pes2ts_cb,
++					(void *)dvbdmx->pesfilter[1]);
++                outcom(av7110, COMTYPE_REC_PLAY, __Record, 2, AV_PES, 0);
++                break;
++        }
++        return 0;
++}
++
++static int AV_StartPlay(struct av7110 *av7110, int av)
++{
++	DEB_EE(("av7110: %p\n",av7110));
++	
++        if (av7110->rec_mode)
++                return -EBUSY;
++        if (av7110->playing&av)
++                return -EBUSY;
++
++        outcom(av7110, COMTYPE_REC_PLAY, __Stop, 0);
++
++        if (av7110->playing == RP_NONE) {
++                av7110_ipack_reset(&av7110->ipack[0]);
++                av7110_ipack_reset(&av7110->ipack[1]);
++        }
++
++        av7110->playing|=av;
++        switch (av7110->playing) {
++        case RP_AUDIO:
++                outcom(av7110, COMTYPE_REC_PLAY, __Play, 2, AudioPES, 0);
++                break;
++        case RP_VIDEO:
++                outcom(av7110, COMTYPE_REC_PLAY, __Play, 2, VideoPES, 0);
++                av7110->sinfo=0;
++                break;
++        case RP_AV:
++                av7110->sinfo=0;
++                outcom(av7110, COMTYPE_REC_PLAY, __Play, 2, AV_PES, 0);
++                break;
++        }
++        return av7110->playing;
++}
++
++static void AV_Stop(struct av7110 *av7110, int av)
++{
++	DEB_EE(("av7110: %p\n",av7110));
++
++	if (!(av7110->playing&av) && !(av7110->rec_mode&av))
++                return;
++
++        outcom(av7110, COMTYPE_REC_PLAY, __Stop, 0);
++        if (av7110->playing) {
++                av7110->playing&=~av;
++                switch (av7110->playing) {
++                case RP_AUDIO:
++                        outcom(av7110, COMTYPE_REC_PLAY, __Play, 2, AudioPES, 0);
++                        break;
++                case RP_VIDEO:
++                        outcom(av7110, COMTYPE_REC_PLAY, __Play, 2, VideoPES, 0);
++                        break;
++                case RP_NONE:
++                        SetMode(av7110, av7110->vidmode);
++                        break;
++                }
++        } else {
++                av7110->rec_mode&=~av;
++                switch (av7110->rec_mode) {
++                case RP_AUDIO:
++                        outcom(av7110, COMTYPE_REC_PLAY, __Record, 2, AudioPES, 0);
++                        break;
++                case RP_VIDEO:
++                        outcom(av7110, COMTYPE_REC_PLAY, __Record, 2, VideoPES, 0);
++                        break;
++                case RP_NONE:
++                        break;
++                }
++        }
++}
++
++/**
++ *  Hack! we save the last av7110 ptr. This should be ok, since
++ *  you rarely will use more then one IR control. 
++ *
++ *  If we want to support multiple controls we would have to do much more...
++ */
++void av7110_setup_irc_config (struct av7110 *av7110, u32 ir_config)
++{
++	static struct av7110 *last;
++
++	DEB_EE(("av7110: %p\n",av7110));
++
++	if (!av7110)
++		av7110 = last;
++	else
++		last = av7110;
++
++	if (av7110) {
++		outcom(av7110, COMTYPE_PIDFILTER, SetIR, 1, ir_config);
++		av7110->ir_config = ir_config;
++	}
++}
++
++static void (*irc_handler)(u32);
++
++void av7110_register_irc_handler(void (*func)(u32)) 
++{
++        //DEB_EE(("registering %08x\n",func));
++        irc_handler = func;
++}
++
++void av7110_unregister_irc_handler(void (*func)(u32)) 
++{
++        //DEB_EE(("unregistering %08x\n",func));
++        irc_handler = NULL;
++}
++
++void run_handlers(unsigned long ircom) 
++{
++        if (irc_handler != NULL)
++                (*irc_handler)((u32) ircom);
++}
++
++DECLARE_TASKLET(irtask,run_handlers,0);
++
++void IR_handle(struct av7110 *av7110, u32 ircom)
++{
++	DEB_S(("av7110: ircommand = %08x\n", ircom));
++        irtask.data = (unsigned long) ircom;
++        tasklet_schedule(&irtask);
++}
++
++/****************************************************************************
++ * IRQ handling
++ ****************************************************************************/
++
++void CI_handle(struct av7110 *av7110, u8 *data, u16 len) 
++{
++        //CI_out(av7110, data, len);
++
++	DEB_EE(("av7110: %p\n",av7110));
++
++        if (len<3)
++                return;
++        switch (data[0]) {
++        case CI_MSG_CI_INFO:
++                if (data[2]!=1 && data[2]!=2)
++                        break;
++                switch (data[1]) {
++                case 0:
++                        av7110->ci_slot[data[2]-1].flags=0;
++                        break;
++                case 1:
++                        av7110->ci_slot[data[2]-1].flags|=CA_CI_MODULE_PRESENT;
++                        break;
++                case 2:
++                        av7110->ci_slot[data[2]-1].flags|=CA_CI_MODULE_READY;
++                        break;
++                }
++                break;
++        case CI_SWITCH_PRG_REPLY:
++                //av7110->ci_stat=data[1];
++                break;
++        default:
++                break;
++        }
++
++}
++
++static inline int DvbDmxFilterCallback(u8 * buffer1, size_t buffer1_len,
++                     u8 * buffer2, size_t buffer2_len,
++                     struct dvb_demux_filter *dvbdmxfilter,
++                     enum dmx_success success,
++                     struct av7110 *av7110)
++{
++	DEB_INT(("av7110: %p\n",av7110));
++
++        if (!dvbdmxfilter->feed->demux->dmx.frontend)
++                return 0;
++        if (dvbdmxfilter->feed->demux->dmx.frontend->source==DMX_MEMORY_FE)
++                return 0;
++        
++        switch(dvbdmxfilter->type) {
++        case DMX_TYPE_SEC:
++                if ((((buffer1[1]<<8)|buffer1[2])&0xfff)+3!=buffer1_len)
++                        return 0;
++                if (dvbdmxfilter->doneq) {
++                        struct dmx_section_filter *filter=&dvbdmxfilter->filter;
++                        int i;
++                        u8 xor, neq=0;
++                        
++                        for (i=0; i<DVB_DEMUX_MASK_MAX; i++) {
++                                xor=filter->filter_value[i]^buffer1[i];
++                                neq|=dvbdmxfilter->maskandnotmode[i]&xor;
++                        }
++                        if (!neq)
++                                return 0;
++                }
++                return dvbdmxfilter->feed->cb.sec(buffer1, buffer1_len,
++						  buffer2, buffer2_len,
++						  &dvbdmxfilter->filter,
++						  DMX_OK); 
++        case DMX_TYPE_TS:
++                if (!(dvbdmxfilter->feed->ts_type & TS_PACKET)) 
++                        return 0;
++                if (dvbdmxfilter->feed->ts_type & TS_PAYLOAD_ONLY) 
++                        return dvbdmxfilter->feed->cb.ts(buffer1, buffer1_len,
++                                                         buffer2, buffer2_len,
++                                                         &dvbdmxfilter->feed->feed.ts,
++                                                         DMX_OK); 
++                else
++                        pes_to_ts(buffer1, buffer1_len, 
++                                  dvbdmxfilter->feed->pid, 
++                                  &av7110->p2t_filter[dvbdmxfilter->index]);
++	default:
++	        return 0;
++        }
++}
++
++
++u8 pshead[0x26] = {
++        0x00, 0x00, 0x01, 0xba, 0x5f, 0xff, 0xfe, 0xe6, 
++        0xc4, 0x01, 0x01, 0x89, 0xc3, 0xf8, 0x00, 0x00,
++        0x01, 0xbb, 0x00, 0x12, 0x80, 0xc4, 0xe1, 0x00,
++        0xe1, 0xff, 0xb9, 0xe0, 0xe8, 0xb8, 0xc0, 0x20,
++        0xbd, 0xe0, 0x44, 0xbf, 0xe0, 0x02,
++};								
++
++
++//#define DEBUG_TIMING
++static inline void print_time(char *s)
++{
++#ifdef DEBUG_TIMING
++        struct timeval tv;
++        do_gettimeofday(&tv);
++        printk("%s: %d.%d\n", s, (int)tv.tv_sec, (int)tv.tv_usec);
++#endif
++}
++
++static void ci_get_data(struct dvb_ringbuffer *cibuf, u8 *data, int len)
++{
++        if (dvb_ringbuffer_free(cibuf) < len+2)
++                return;
++
++        DVB_RINGBUFFER_WRITE_BYTE(cibuf,len>>8);
++        DVB_RINGBUFFER_WRITE_BYTE(cibuf,len&0xff);   
++
++        dvb_ringbuffer_write(cibuf,data,len,0);
++
++        wake_up_interruptible(&cibuf->queue);
++}
++
++static void debiirq (unsigned long data)
++{
++	struct av7110 *av7110 = (struct av7110*) data;
++        int type=av7110->debitype;
++        int handle=(type>>8)&0x1f;
++	
++//	DEB_EE(("av7110: %p\n",av7110));
++
++        print_time("debi");
++        saa7146_write(av7110->dev, IER, 
++                      saa7146_read(av7110->dev, IER) & ~MASK_19 );
++        saa7146_write(av7110->dev, ISR, MASK_19 );
++
++        if (type==-1) {
++                printk("DEBI irq oops @ %ld, psr:0x%08x, ssr:0x%08x\n",jiffies,saa7146_read(av7110->dev,PSR),saa7146_read(av7110->dev,SSR));
++		spin_lock(&av7110->debilock);
++                ARM_ClearMailBox(av7110);
++                ARM_ClearIrq(av7110);
++		spin_unlock(&av7110->debilock);
++                return;
++        }
++        av7110->debitype=-1;
++
++        switch (type&0xff) {
++
++        case DATA_TS_RECORD:
++                dvb_dmx_swfilter_packets(&av7110->demux, 
++                                      (const u8 *)av7110->debi_virt, 
++                                      av7110->debilen/188);
++                spin_lock(&av7110->debilock);
++                iwdebi(av7110, DEBINOSWAP, RX_BUFF, 0, 2);
++                ARM_ClearMailBox(av7110);
++                spin_unlock(&av7110->debilock);
++                return;
++
++        case DATA_PES_RECORD:
++                if (av7110->demux.recording) 
++                        record_cb(&av7110->p2t[handle], 
++                                  (u8 *)av7110->debi_virt,
++                                  av7110->debilen);
++                spin_lock(&av7110->debilock);
++                iwdebi(av7110, DEBINOSWAP, RX_BUFF, 0, 2);
++                ARM_ClearMailBox(av7110);
++                spin_unlock(&av7110->debilock);
++                return;
++
++        case DATA_IPMPE:
++        case DATA_FSECTION:
++        case DATA_PIPING:
++                if (av7110->handle2filter[handle]) 
++                        DvbDmxFilterCallback((u8 *)av7110->debi_virt, 
++                                             av7110->debilen, 0, 0, 
++                                             av7110->handle2filter[handle], 
++                                             DMX_OK, av7110); 
++                spin_lock(&av7110->debilock);
++                iwdebi(av7110, DEBINOSWAP, RX_BUFF, 0, 2);
++                ARM_ClearMailBox(av7110);
++                spin_unlock(&av7110->debilock);
++                return;
++
++        case DATA_CI_GET:
++        {
++                u8 *data=av7110->debi_virt;
++
++                if ((data[0]<2) && data[2]==0xff) {
++                        int flags=0;
++                        if (data[5]>0) 
++                                flags|=CA_CI_MODULE_PRESENT;
++                        if (data[5]>5) 
++                                flags|=CA_CI_MODULE_READY;
++                        av7110->ci_slot[data[0]].flags=flags;
++                } else
++                        ci_get_data(&av7110->ci_rbuffer, 
++                                    av7110->debi_virt, 
++                                    av7110->debilen);
++                spin_lock(&av7110->debilock);
++                iwdebi(av7110, DEBINOSWAP, RX_BUFF, 0, 2);
++                ARM_ClearMailBox(av7110);
++                spin_unlock(&av7110->debilock);
++                return;
++        }
++
++        case DATA_COMMON_INTERFACE:
++                CI_handle(av7110, (u8 *)av7110->debi_virt, av7110->debilen);
++#if 0
++        {
++                int i;
++
++                printk("av7110%d: ", av7110->num);
++                printk("%02x ", *(u8 *)av7110->debi_virt);
++                printk("%02x ", *(1+(u8 *)av7110->debi_virt));
++                for (i=2; i<av7110->debilen; i++)
++                  printk("%02x ", (*(i+(unsigned char *)av7110->debi_virt)));
++                for (i=2; i<av7110->debilen; i++)
++                  printk("%c", chtrans(*(i+(unsigned char *)av7110->debi_virt)));
++
++                printk("\n");
++        }
++#endif
++                spin_lock(&av7110->debilock);
++                iwdebi(av7110, DEBINOSWAP, RX_BUFF, 0, 2);
++                ARM_ClearMailBox(av7110);
++                spin_unlock(&av7110->debilock);
++                return;
++
++        case DATA_DEBUG_MESSAGE:
++                ((s8*)av7110->debi_virt)[Reserved_SIZE-1]=0;
++                printk("%s\n", (s8 *)av7110->debi_virt);
++                spin_lock(&av7110->debilock);
++                iwdebi(av7110, DEBINOSWAP, RX_BUFF, 0, 2);
++                ARM_ClearMailBox(av7110);
++                spin_unlock(&av7110->debilock);
++                return;
++
++        case DATA_CI_PUT:
++        case DATA_MPEG_PLAY:
++        case DATA_BMP_LOAD:
++                spin_lock(&av7110->debilock);
++                iwdebi(av7110, DEBINOSWAP, TX_BUFF, 0, 2);
++                ARM_ClearMailBox(av7110);
++                spin_unlock(&av7110->debilock);
++                return;
++        default:
++                break;
++        }
++        spin_lock(&av7110->debilock);
++        ARM_ClearMailBox(av7110);
++        spin_unlock(&av7110->debilock);
++}
++
++static int pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen)
++{
++        int len;
++        u32 sync;
++        u16 blen;
++
++	DEB_EE(("dvb_ring_buffer_t: %p\n",buf));
++
++        if (!dlen) {
++                wake_up(&buf->queue);
++                return -1;
++        }
++        while (1) {
++                if ((len=dvb_ringbuffer_avail(buf)) < 6)
++                        return -1;
++                sync= DVB_RINGBUFFER_PEEK(buf,0)<<24;
++                sync|=DVB_RINGBUFFER_PEEK(buf,1)<<16;
++                sync|=DVB_RINGBUFFER_PEEK(buf,2)<<8;
++                sync|=DVB_RINGBUFFER_PEEK(buf,3);
++                
++                if (((sync&~0x0f)==0x000001e0) ||
++                    ((sync&~0x1f)==0x000001c0) ||
++                    (sync==0x000001bd))
++                        break;
++                printk("resync\n");
++                DVB_RINGBUFFER_SKIP(buf,1);
++        }
++        blen= DVB_RINGBUFFER_PEEK(buf,4)<<8;
++        blen|=DVB_RINGBUFFER_PEEK(buf,5);
++        blen+=6;
++        if (len<blen || blen>dlen) {
++                //printk("buffer empty - avail %d blen %u dlen %d\n",len,blen,dlen);
++                wake_up(&buf->queue);
++                return -1;
++        }
++
++        (void)dvb_ringbuffer_read(buf,dest,(size_t)blen,0);
++
++        DEB_S(("pread=0x%08lx, pwrite=0x%08lx\n",(unsigned long)buf->pread, (unsigned long)buf->pwrite));
++        wake_up(&buf->queue);
++        return blen;
++}
++
++
++static void gpioirq (unsigned long data)
++{
++	struct av7110 *av7110 = (struct av7110*) data;
++        u32 rxbuf, txbuf;
++        int len;
++        
++        //printk("GPIO0 irq\n");        
++
++        if (av7110->debitype !=-1)
++                printk("GPIO0 irq oops @ %ld, psr:0x%08x, ssr:0x%08x\n",jiffies,saa7146_read(av7110->dev,PSR),saa7146_read(av7110->dev,SSR));
++       
++        spin_lock(&av7110->debilock);
++
++	ARM_ClearIrq(av7110);
++
++        saa7146_write(av7110->dev, IER, 
++                      saa7146_read(av7110->dev, IER) & ~MASK_19 );
++        saa7146_write(av7110->dev, ISR, MASK_19 );
++
++        av7110->debitype = irdebi(av7110, DEBINOSWAP, IRQ_STATE, 0, 2);
++        av7110->debilen  = irdebi(av7110, DEBINOSWAP, IRQ_STATE_EXT, 0, 2);
++        av7110->debibuf  = 0;
++        rxbuf=irdebi(av7110, DEBINOSWAP, RX_BUFF, 0, 2);
++        txbuf=irdebi(av7110, DEBINOSWAP, TX_BUFF, 0, 2);
++        len=(av7110->debilen+3)&(~3);
++
++//        DEB_D(("GPIO0 irq %d %d\n", av7110->debitype, av7110->debilen));
++        print_time("gpio");
++
++//       DEB_D(("GPIO0 irq %02x\n", av7110->debitype&0xff));        
++        switch (av7110->debitype&0xff) {
++
++        case DATA_TS_PLAY:
++        case DATA_PES_PLAY:
++                break;
++
++	case DATA_MPEG_VIDEO_EVENT:
++	{
++		u32 h_ar;
++		struct video_event event;
++
++                av7110->video_size.w = irdebi(av7110, DEBINOSWAP, STATUS_MPEG_WIDTH, 0, 2);
++                h_ar = irdebi(av7110, DEBINOSWAP, STATUS_MPEG_HEIGHT_AR, 0, 2);
++
++                iwdebi(av7110, DEBINOSWAP, IRQ_STATE_EXT, 0, 2);
++                iwdebi(av7110, DEBINOSWAP, RX_BUFF, 0, 2);
++
++		av7110->video_size.h = h_ar & 0xfff;
++		DEB_D(("GPIO0 irq: DATA_MPEG_VIDEO_EVENT: w/h/ar = %u/%u/%u\n",
++				av7110->video_size.w,
++				av7110->video_size.h,
++				av7110->video_size.aspect_ratio));
++
++		event.type = VIDEO_EVENT_SIZE_CHANGED;
++		event.u.size.w = av7110->video_size.w;
++		event.u.size.h = av7110->video_size.h;
++		switch ((h_ar >> 12) & 0xf)
++		{
++		case 3:
++			av7110->video_size.aspect_ratio = VIDEO_FORMAT_16_9;
++			event.u.size.aspect_ratio = VIDEO_FORMAT_16_9;
++			av7110->videostate.video_format = VIDEO_FORMAT_16_9;
++			break;
++		case 4:
++			av7110->video_size.aspect_ratio = VIDEO_FORMAT_221_1;
++			event.u.size.aspect_ratio = VIDEO_FORMAT_221_1;
++			av7110->videostate.video_format = VIDEO_FORMAT_221_1;
++			break;
++		default:
++			av7110->video_size.aspect_ratio = VIDEO_FORMAT_4_3;
++			event.u.size.aspect_ratio = VIDEO_FORMAT_4_3;
++			av7110->videostate.video_format = VIDEO_FORMAT_4_3;
++		}
++		dvb_video_add_event(av7110, &event);
++		break;
++	}
++
++        case DATA_CI_PUT:
++        {
++                int avail;
++                struct dvb_ringbuffer *cibuf=&av7110->ci_wbuffer;
++
++                avail=dvb_ringbuffer_avail(cibuf);
++                if (avail<=2) {
++                        iwdebi(av7110, DEBINOSWAP, IRQ_STATE_EXT, 0, 2);
++                        iwdebi(av7110, DEBINOSWAP, TX_LEN, 0, 2);
++                        iwdebi(av7110, DEBINOSWAP, TX_BUFF, 0, 2);
++                        break;
++                } 
++                len= DVB_RINGBUFFER_PEEK(cibuf,0)<<8;
++                len|=DVB_RINGBUFFER_PEEK(cibuf,1);
++                if (avail<len+2) {
++                        iwdebi(av7110, DEBINOSWAP, IRQ_STATE_EXT, 0, 2);
++                        iwdebi(av7110, DEBINOSWAP, TX_LEN, 0, 2);
++                        iwdebi(av7110, DEBINOSWAP, TX_BUFF, 0, 2);
++                        break;
++                } 
++                DVB_RINGBUFFER_SKIP(cibuf,2); 
++
++                dvb_ringbuffer_read(cibuf,av7110->debi_virt,len,0);
++
++                wake_up(&cibuf->queue);
++                iwdebi(av7110, DEBINOSWAP, TX_LEN, len, 2);
++                iwdebi(av7110, DEBINOSWAP, IRQ_STATE_EXT, len, 2);
++                wait_for_debi_done(av7110);
++                saa7146_write(av7110->dev, IER, 
++                              saa7146_read(av7110->dev, IER) | MASK_19 );
++                if (len<5) len=5; /* we want a real DEBI DMA */
++                iwdebi(av7110, DEBISWAB, DPRAM_BASE+txbuf, 0, (len+3)&~3);
++                spin_unlock(&av7110->debilock);
++                return;
++        }
++
++        case DATA_MPEG_PLAY:
++                if (!av7110->playing) {
++                        iwdebi(av7110, DEBINOSWAP, IRQ_STATE_EXT, 0, 2);
++                        iwdebi(av7110, DEBINOSWAP, TX_LEN, 0, 2);
++                        iwdebi(av7110, DEBINOSWAP, TX_BUFF, 0, 2);
++                        break;
++                }
++                len=0;
++                if (av7110->debitype&0x100) {
++                        spin_lock(&av7110->aout.lock);
++                        len=pes_play(av7110->debi_virt, &av7110->aout, 2048);
++                        spin_unlock(&av7110->aout.lock);
++                }
++                if (len<=0 && (av7110->debitype&0x200)
++                        &&av7110->videostate.play_state!=VIDEO_FREEZED) {
++                        spin_lock(&av7110->avout.lock);
++                        len=pes_play(av7110->debi_virt, &av7110->avout, 2048);
++                        spin_unlock(&av7110->avout.lock);
++                }
++                if (len<=0) {
++                        iwdebi(av7110, DEBINOSWAP, IRQ_STATE_EXT, 0, 2);
++                        iwdebi(av7110, DEBINOSWAP, TX_LEN, 0, 2);
++                        iwdebi(av7110, DEBINOSWAP, TX_BUFF, 0, 2);
++                        break;
++                } 
++                DEB_D(("GPIO0 PES_PLAY len=%04x\n", len));        
++                iwdebi(av7110, DEBINOSWAP, TX_LEN, len, 2);
++                iwdebi(av7110, DEBINOSWAP, IRQ_STATE_EXT, len, 2);
++                wait_for_debi_done(av7110);
++                saa7146_write(av7110->dev, IER, 
++                              saa7146_read(av7110->dev, IER) | MASK_19 );
++
++                iwdebi(av7110, DEBISWAB, DPRAM_BASE+txbuf, 0, (len+3)&~3);
++                spin_unlock(&av7110->debilock);
++                return;
++
++        case DATA_BMP_LOAD:
++                len=av7110->debilen;
++                if (!len) {
++                        av7110->bmp_state=BMP_LOADED;
++                        iwdebi(av7110, DEBINOSWAP, IRQ_STATE_EXT, 0, 2);
++                        iwdebi(av7110, DEBINOSWAP, TX_LEN, 0, 2);
++                        iwdebi(av7110, DEBINOSWAP, TX_BUFF, 0, 2);
++                        wake_up(&av7110->bmpq);
++                        break;
++                }
++                if (len>av7110->bmplen)
++                        len=av7110->bmplen;
++                if (len>2*1024)
++                        len=2*1024;
++                iwdebi(av7110, DEBINOSWAP, TX_LEN, len, 2);
++                iwdebi(av7110, DEBINOSWAP, IRQ_STATE_EXT, len, 2);
++                memcpy(av7110->debi_virt, av7110->bmpbuf+av7110->bmpp, len);
++                av7110->bmpp+=len;
++                av7110->bmplen-=len;
++                wait_for_debi_done(av7110);
++                saa7146_write(av7110->dev, IER, 
++                              saa7146_read(av7110->dev, IER) | MASK_19 );
++                if (len<5) len=5; /* we want a real DEBI DMA */
++                iwdebi(av7110, DEBISWAB, DPRAM_BASE+txbuf, 0, (len+3)&~3);
++                spin_unlock(&av7110->debilock);
++                return;
++
++        case DATA_CI_GET:
++        case DATA_COMMON_INTERFACE:
++        case DATA_FSECTION:
++        case DATA_IPMPE:
++        case DATA_PIPING:
++                if (!len || len>4*1024) {
++                        iwdebi(av7110, DEBINOSWAP, RX_BUFF, 0, 2);
++                        break;
++                }                  /* yes, fall through */
++        case DATA_TS_RECORD:
++        case DATA_PES_RECORD:
++                wait_for_debi_done(av7110);
++                saa7146_write(av7110->dev, IER, 
++                              saa7146_read(av7110->dev, IER) | MASK_19);
++                irdebi(av7110, DEBISWAB, DPRAM_BASE+rxbuf, 0, len);
++                spin_unlock(&av7110->debilock);
++                return;
++
++        case DATA_DEBUG_MESSAGE:
++                wait_for_debi_done(av7110);
++                if (!len || len>0xff) {
++                        iwdebi(av7110, DEBINOSWAP, RX_BUFF, 0, 2);
++                        break;
++                }
++                saa7146_write(av7110->dev, IER, 
++                              saa7146_read(av7110->dev, IER) | MASK_19);
++                irdebi(av7110, DEBISWAB, Reserved, 0, len);
++                spin_unlock(&av7110->debilock);
++                return;
++
++        case DATA_IRCOMMAND: 
++                IR_handle(av7110, 
++                          swahw32(irdebi(av7110, DEBINOSWAP, Reserved, 0, 4)));
++                iwdebi(av7110, DEBINOSWAP, RX_BUFF, 0, 2);
++                break;
++
++        default:
++                printk("gpioirq unknown type=%d len=%d\n", 
++                       av7110->debitype, av7110->debilen);
++                break;
++        }      
++        ARM_ClearMailBox(av7110);
++        av7110->debitype=-1;
++        spin_unlock(&av7110->debilock);
++}
++
++
++/****************************************************************************
++ * DEBI command polling 
++ ****************************************************************************/
++
++
++static int OutCommand(struct av7110 *av7110, u16* buf, int length)
++{
++        int i;
++        u32 start;
++#ifdef COM_DEBUG
++        u32 stat;
++#endif
++
++//	DEB_EE(("av7110: %p\n",av7110));
++
++	if (!av7110->arm_ready) {
++		DEB_D(("arm not ready.\n"));
++		return -1;
++	}
++
++        start = jiffies;
++        while ( rdebi(av7110, DEBINOSWAP, COMMAND, 0, 2 ) )
++        {
++                dvb_delay(1);
++                if ((jiffies - start) > ARM_WAIT_FREE) {
++			printk(KERN_ERR "%s: timeout waiting for COMMAND idle\n", __FUNCTION__);
++                        return -1;
++                }
++        }
++
++#ifndef _NOHANDSHAKE
++        start = jiffies;
++        while ( rdebi(av7110, DEBINOSWAP, HANDSHAKE_REG, 0, 2 ) )
++        {
++                dvb_delay(1);
++                if ((jiffies - start) > ARM_WAIT_SHAKE) {
++			printk(KERN_ERR "%s: timeout waiting for HANDSHAKE_REG\n", __FUNCTION__);
++                        return -1;
++                }
++        }
++#endif
++
++        start = jiffies;
++        while ( rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2) & OSDQFull )
++        {
++                dvb_delay(1);
++                if ((jiffies - start) > ARM_WAIT_OSD) {
++			printk(KERN_ERR "%s: timeout waiting for !OSDQFull\n", __FUNCTION__);
++			return -1;
++                }
++        }
++        for (i=2; i<length; i++)
++                wdebi(av7110, DEBINOSWAP, COMMAND + 2*i, (u32) buf[i], 2);
++
++        if (length)
++                wdebi(av7110, DEBINOSWAP, COMMAND + 2, (u32) buf[1], 2);
++        else
++                wdebi(av7110, DEBINOSWAP, COMMAND + 2, 0, 2);
++
++        wdebi(av7110, DEBINOSWAP, COMMAND, (u32) buf[0], 2);
++
++#ifdef COM_DEBUG
++        start = jiffies;
++        while ( rdebi(av7110, DEBINOSWAP, COMMAND, 0, 2 ) )
++        {
++                dvb_delay(1);
++                if ((jiffies - start) > ARM_WAIT_FREE) {
++                        printk(KERN_ERR "%s: timeout waiting for COMMAND to complete\n", __FUNCTION__);
++                        return -1;
++                }
++        }
++
++	stat = rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2);
++	if (stat & GPMQOver) {
++		printk(KERN_ERR "%s: GPMQOver\n", __FUNCTION__);
++		return -1;
++	}
++	else if (stat & OSDQOver) {
++		printk(KERN_ERR "%s: OSDQOver\n", __FUNCTION__);
++		return -1;
++	}
++#endif
++
++        return 0;
++}
++
++static inline int SOutCommand(struct av7110 *av7110, u16* buf, int length)
++{
++        int ret;
++        
++// 	DEB_EE(("av7110: %p\n",av7110));
++
++        if (!av7110->arm_ready) {
++		DEB_D(("arm not ready.\n"));
++		return -1;
++	}
++	
++        if (down_interruptible(&av7110->dcomlock))
++		return -ERESTARTSYS;
++
++        ret=OutCommand(av7110, buf, length);
++        up(&av7110->dcomlock);
++	if (ret)
++                printk("SOutCommand error\n");
++        return ret;
++}
++
++
++static int outcom(struct av7110 *av7110, int type, int com, int num, ...)
++{
++	va_list args;
++        u16 buf[num+2];
++        int i, ret;
++
++// 	DEB_EE(("av7110: %p\n",av7110));
++
++        buf[0]=(( type << 8 ) | com);
++        buf[1]=num;
++
++        if (num) {
++                va_start(args, num);
++                for (i=0; i<num; i++)
++                        buf[i+2]=va_arg(args, u32);
++                va_end(args);
++        }
++
++        ret = SOutCommand(av7110, buf, num+2);
++	if (ret)
++                printk("outcom error\n");
++	return ret;
++}
++
++int SendCICommand(struct av7110 *av7110, u8 subcom, u8 *Params, u8 ParamLen)
++{
++        int i, ret;
++        u16 CommandBuffer[18] = { ((COMTYPE_COMMON_IF << 8) + subcom),
++                                  16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
++        
++ 	DEB_EE(("av7110: %p\n",av7110));
++
++	for(i=0; (i<ParamLen)&&(i<32); i++)	
++	{
++		if(i%2 == 0)
++			CommandBuffer[(i/2)+2] = (u16)(Params[i]) << 8;
++		else
++			CommandBuffer[(i/2)+2] |= Params[i];
++	}
++
++        ret = SOutCommand(av7110, CommandBuffer, 18);
++	if (ret)
++                printk("SendCICommand error\n");
++	return ret;
++}
++
++
++static int CommandRequest(struct av7110 *av7110, u16 *Buff, int length, u16 *buf, int n)
++{
++	int err;
++        s16 i;
++        u32 start;
++#ifdef COM_DEBUG
++        u32 stat;
++#endif
++
++	DEB_EE(("av7110: %p\n",av7110));
++
++        if (!av7110->arm_ready) {
++		DEB_D(("arm not ready.\n"));
++		return -1;
++	}
++
++        if (down_interruptible(&av7110->dcomlock))
++		return -ERESTARTSYS;
++
++        if ((err = OutCommand(av7110, Buff, length)) < 0) {
++		up(&av7110->dcomlock);
++		printk("CommandRequest error\n");
++		return err;
++	}
++
++        start = jiffies;
++        while ( rdebi(av7110, DEBINOSWAP, COMMAND, 0, 2) )
++        {
++#ifdef _NOHANDSHAKE
++                dvb_delay(1);
++#endif
++                if ((jiffies - start) > ARM_WAIT_FREE) {
++			printk("%s: timeout waiting for COMMAND to complete\n", __FUNCTION__);
++                        up(&av7110->dcomlock);
++                        return -1;
++                }
++        }
++
++#ifndef _NOHANDSHAKE
++        start = jiffies;
++        while ( rdebi(av7110, DEBINOSWAP, HANDSHAKE_REG, 0, 2 ) ) {
++                dvb_delay(1);
++                if ((jiffies - start) > ARM_WAIT_SHAKE) {
++			printk(KERN_ERR "%s: timeout waiting for HANDSHAKE_REG\n", __FUNCTION__);
++                        up(&av7110->dcomlock);
++                        return -1;
++                }
++        }
++#endif
++
++#ifdef COM_DEBUG
++	stat = rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2);
++	if (stat & GPMQOver) {
++		printk(KERN_ERR "%s: GPMQOver\n", __FUNCTION__);
++                up(&av7110->dcomlock);
++		return -1;
++	}
++	else if (stat & OSDQOver) {
++		printk(KERN_ERR "%s: OSDQOver\n", __FUNCTION__);
++                up(&av7110->dcomlock);
++		return -1;
++	}
++#endif
++
++        for (i=0; i<n; i++)
++                buf[i] = rdebi(av7110, DEBINOSWAP, COM_BUFF + 2*i, 0, 2);
++
++	up(&av7110->dcomlock);
++        return 0;
++}
++
++
++static inline int  RequestParameter(struct av7110 *av7110, u16 tag, u16* Buff, s16 length)
++{
++	int ret;
++        ret = CommandRequest(av7110, &tag, 0, Buff, length);
++	if (ret)
++		printk("RequestParameter error\n");
++	return ret;
++}
++
++
++/****************************************************************************
++ * Firmware commands 
++ ****************************************************************************/
++
++/* msp3400 i2c subaddresses */
++#define MSP_WR_DEM 0x10
++#define MSP_RD_DEM 0x11
++#define MSP_WR_DSP 0x12
++#define MSP_RD_DSP 0x13
++
++static inline int msp_writereg(struct av7110 *av7110, u8 dev, u16 reg, u16 val)
++{
++        u8 msg[5]={ dev, reg>>8, reg&0xff, val>>8 , val&0xff }; 
++        struct dvb_i2c_bus *i2c = av7110->i2c_bus;
++        struct i2c_msg msgs = { .flags = 0, .addr = 0x40, .len = 5, .buf = msg};
++
++        if (i2c->xfer(i2c, &msgs, 1) != 1) {
++		printk("av7110(%d): %s(%u = %u) failed\n",
++				av7110->dvb_adapter->num, __FUNCTION__, reg, val);
++		return -EIO;
++	}
++	return 0;
++}
++
++static inline int msp_readreg(struct av7110 *av7110, u8 dev, u16 reg, u16 *val)
++{
++        u8 msg1[3]={ dev, reg>>8, reg&0xff };
++        u8 msg2[2];
++        struct dvb_i2c_bus *i2c = av7110->i2c_bus;
++        struct i2c_msg msgs[2] = {
++		{ .flags = 0,        .addr = 0x40, .len = 3, .buf = msg1},
++		{ .flags = I2C_M_RD, .addr = 0x40, .len = 2, .buf = msg2}
++	};
++
++        if (i2c->xfer(i2c, msgs, 2) != 2) {
++		printk("av7110(%d): %s(%u) failed\n",
++				av7110->dvb_adapter->num, __FUNCTION__, reg);
++		return -EIO;
++	}
++	*val = (msg2[0] << 8) | msg2[1];
++	return 0;
++}
++
++static inline int SendDAC(struct av7110 *av7110, u8 addr, u8 data)
++{
++// 	DEB_EE(("av7110: %p\n",av7110));
++
++        return outcom(av7110, COMTYPE_AUDIODAC, AudioDAC, 2, addr, data);
++}
++
++static int SetVolume(struct av7110 *av7110, int volleft, int volright)
++{
++        int err, vol, val, balance = 0;
++        
++ 	DEB_EE(("av7110: %p\n",av7110));
++
++        switch (av7110->adac_type) {
++        case DVB_ADAC_TI:
++                volleft = (volleft * 256) / 1036;
++                volright = (volright * 256) / 1036;
++                if (volleft > 0x3f)
++                        volleft = 0x3f;
++                if (volright > 0x3f)
++                        volright = 0x3f;
++                if ((err = SendDAC(av7110, 3, 0x80 + volleft)))
++                        return err;
++                return SendDAC(av7110, 4, volright);
++                
++        case DVB_ADAC_CRYSTAL:
++                volleft=127-volleft/2;
++                volright=127-volright/2;
++                i2c_writereg(av7110, 0x20, 0x03, volleft);
++                i2c_writereg(av7110, 0x20, 0x04, volright);
++                return 0;
++
++        case DVB_ADAC_MSP:
++                vol  = (volleft > volright) ? volleft : volright;
++		val     = (vol * 0x73 / 255) << 8;
++		if (vol > 0) {
++		       balance = ((volright-volleft) * 127) / vol;
++		}
++		msp_writereg(av7110, MSP_WR_DSP, 0x0001, balance << 8);
++		msp_writereg(av7110, MSP_WR_DSP, 0x0000, val); /* loudspeaker */
++		msp_writereg(av7110, MSP_WR_DSP, 0x0006, val); /* headphonesr */
++		return 0;
++        }
++        return 0;
++}
++
++#ifdef CONFIG_DVB_AV7110_OSD
++
++static inline int ResetBlend(struct av7110 *av7110, u8 windownr)
++{
++        return outcom(av7110, COMTYPE_OSD, SetNonBlend, 1, windownr);
++}
++
++static inline int SetColorBlend(struct av7110 *av7110, u8 windownr)
++{
++        return outcom(av7110, COMTYPE_OSD, SetCBlend, 1, windownr); 
++}
++
++static inline int SetWindowBlend(struct av7110 *av7110, u8 windownr, u8 blending)
++{
++        return outcom(av7110, COMTYPE_OSD, SetWBlend, 2, windownr, blending); 
++}
++
++static inline int SetBlend_(struct av7110 *av7110, u8 windownr,
++                     enum av7110_osd_palette_type colordepth, u16 index, u8 blending)
++{
++        return outcom(av7110, COMTYPE_OSD, SetBlend, 4,
++                      windownr, colordepth, index, blending);
++} 
++
++static inline int SetColor_(struct av7110 *av7110, u8 windownr,
++                     enum av7110_osd_palette_type colordepth, u16 index, u16 colorhi, u16 colorlo)
++{
++        return outcom(av7110, COMTYPE_OSD, SetColor, 5,
++                      windownr, colordepth, index, colorhi, colorlo);
++} 
++
++static inline int BringToTop(struct av7110 *av7110, u8 windownr)
++{
++        return outcom(av7110, COMTYPE_OSD, WTop, 1, windownr);
++} 
++
++static inline int SetFont(struct av7110 *av7110, u8 windownr, u8 fontsize,
++                   u16 colorfg, u16 colorbg)
++{
++        return outcom(av7110, COMTYPE_OSD, Set_Font, 4,
++                      windownr, fontsize, colorfg, colorbg);
++} 
++
++static int FlushText(struct av7110 *av7110)
++{
++        u32 start;
++
++        if (down_interruptible(&av7110->dcomlock))
++		return -ERESTARTSYS;
++        start = jiffies;
++        while ( rdebi(av7110, DEBINOSWAP, BUFF1_BASE, 0, 2 ) ) {
++                dvb_delay(1); 
++                if ((jiffies - start) > ARM_WAIT_OSD) {
++                        printk(KERN_ERR "%s: timeout waiting for BUFF1_BASE == 0\n", __FUNCTION__);
++                        up(&av7110->dcomlock);
++                        return -1;
++                }
++        }
++        up(&av7110->dcomlock);
++        return 0;
++}
++
++static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, u8* buf)
++{
++        int i, ret;
++        u32 start;
++        int length=strlen(buf)+1;
++        u16 cbuf[5] = { (COMTYPE_OSD<<8) + DText, 3, win, x, y };
++        
++        if (down_interruptible(&av7110->dcomlock))
++		return -ERESTARTSYS;
++
++        start = jiffies;
++        while ( rdebi(av7110, DEBINOSWAP, BUFF1_BASE, 0, 2 ) ) {
++                dvb_delay(1);
++                if ((jiffies - start) > ARM_WAIT_OSD) {
++                        printk(KERN_ERR "%s: timeout waiting for BUFF1_BASE == 0\n", __FUNCTION__);
++                        up(&av7110->dcomlock);
++                        return -1;
++                }
++        }
++#ifndef _NOHANDSHAKE
++        start = jiffies;
++        while ( rdebi(av7110, DEBINOSWAP, HANDSHAKE_REG, 0, 2 ) ) {
++                dvb_delay(1);
++                if ((jiffies - start) > ARM_WAIT_SHAKE) {
++                        printk(KERN_ERR "%s: timeout waiting for HANDSHAKE_REG\n", __FUNCTION__);
++                        up(&av7110->dcomlock);
++                        return -1;
++                }
++        }
++#endif
++        for (i=0; i<length/2; i++)
++                wdebi(av7110, DEBINOSWAP, BUFF1_BASE + i*2, 
++                      swab16(*(u16 *)(buf+2*i)), 2);
++        if (length&1)
++                wdebi(av7110, DEBINOSWAP, BUFF1_BASE + i*2, 0, 2);
++        ret=OutCommand(av7110, cbuf, 5);
++        up(&av7110->dcomlock);
++	if (ret)
++		printk("WriteText error\n");
++        return ret;
++}
++
++static inline int DrawLine(struct av7110 *av7110, u8 windownr, 
++                    u16 x, u16 y, u16 dx, u16 dy, u16 color)
++{
++        return outcom(av7110, COMTYPE_OSD, DLine, 6,
++                      windownr, x, y, dx, dy, color);
++} 
++
++static inline int DrawBlock(struct av7110 *av7110, u8 windownr, 
++                    u16 x, u16 y, u16 dx, u16 dy, u16 color)
++{
++        return outcom(av7110, COMTYPE_OSD, DBox, 6,
++                      windownr, x, y, dx, dy, color);
++} 
++
++static inline int HideWindow(struct av7110 *av7110, u8 windownr)
++{
++        return outcom(av7110, COMTYPE_OSD, WHide, 1, windownr);
++} 
++
++static inline int MoveWindowRel(struct av7110 *av7110, u8 windownr, u16 x, u16 y)
++{
++        return outcom(av7110, COMTYPE_OSD, WMoveD, 3, windownr, x, y);
++} 
++
++static inline int MoveWindowAbs(struct av7110 *av7110, u8 windownr, u16 x, u16 y)
++{
++        return outcom(av7110, COMTYPE_OSD, WMoveA, 3, windownr, x, y);
++} 
++
++static inline int DestroyOSDWindow(struct av7110 *av7110, u8 windownr)
++{
++        return outcom(av7110, COMTYPE_OSD, WDestroy, 1, windownr);
++} 
++
++#if 0
++static void DestroyOSDWindows(struct av7110 *av7110)
++{
++        int i;
++
++        for (i=1; i<7; i++)
++                outcom(av7110, COMTYPE_OSD, WDestroy, 1, i);
++} 
++#endif
++
++static inline int CreateOSDWindow(struct av7110 *av7110, u8 windownr,
++                           enum av7110_window_display_type disptype, u16 width, u16 height)
++{
++        return outcom(av7110, COMTYPE_OSD, WCreate, 4,
++                      windownr, disptype, width, height);
++} 
++
++
++static enum av7110_osd_palette_type bpp2pal[8]={Pal1Bit, Pal2Bit, 0, Pal4Bit, 0, 0, 0, Pal8Bit}; 
++static enum av7110_window_display_type   bpp2bit[8]={BITMAP1, BITMAP2, 0, BITMAP4, 0, 0, 0, BITMAP8}; 
++
++static inline int LoadBitmap(struct av7110 *av7110, u16 format, u16 dx, u16 dy, int inc, u8* data)
++{
++        int bpp;
++        int i;
++        int d, delta; 
++        u8 c;
++        DECLARE_WAITQUEUE(wait, current);
++        
++ 	DEB_EE(("av7110: %p\n",av7110));
++
++        if (av7110->bmp_state==BMP_LOADING) {
++                add_wait_queue(&av7110->bmpq, &wait);
++                while (1) {
++                        set_current_state(TASK_INTERRUPTIBLE);
++                        if (av7110->bmp_state!=BMP_LOADING
++                            || signal_pending(current))
++                                break;
++                        schedule();
++                }
++                set_current_state(TASK_RUNNING);
++                remove_wait_queue(&av7110->bmpq, &wait);
++        }
++        if (av7110->bmp_state==BMP_LOADING)
++                return -1;
++        av7110->bmp_state=BMP_LOADING;
++        if      (format==BITMAP8) { bpp=8; delta = 1; } 
++        else if (format==BITMAP4) { bpp=4; delta = 2; }
++        else if (format==BITMAP2) { bpp=2; delta = 4; }
++        else if (format==BITMAP1) { bpp=1; delta = 8; }
++        else {
++                av7110->bmp_state=BMP_NONE;
++                return -1;
++        }
++        av7110->bmplen= ((dx*dy*bpp+7)&~7)/8; 
++        av7110->bmpp=0;
++        if (av7110->bmplen>32768) {
++                av7110->bmp_state=BMP_NONE;
++                return -1;
++        }
++        for (i=0; i<dy; i++) {
++                if (copy_from_user(av7110->bmpbuf+1024+i*dx, data+i*inc, dx)) { 
++                        av7110->bmp_state=BMP_NONE;
++                        return -1;
++                }
++        }
++        if (format != BITMAP8) {
++                for (i=0; i<dx*dy/delta; i++) {
++                        c = ((u8 *)av7110->bmpbuf)[1024+i*delta+delta-1];
++                        for (d=delta-2; d>=0; d--) {
++                                c |= (((u8 *)av7110->bmpbuf)[1024+i*delta+d] 
++                                      << ((delta-d-1)*bpp));
++                                ((u8 *)av7110->bmpbuf)[1024+i] = c;
++                        }
++                }
++        }
++        av7110->bmplen+=1024;
++        return outcom(av7110, COMTYPE_OSD, LoadBmp, 3, format, dx, dy);
++} 
++
++static int BlitBitmap(struct av7110 *av7110, u16 win, u16 x, u16 y, u16 trans)
++{
++        DECLARE_WAITQUEUE(wait, current);
++        
++  	DEB_EE(("av7110: %p\n",av7110));
++
++       if (av7110->bmp_state==BMP_NONE)
++                return -1;
++        if (av7110->bmp_state==BMP_LOADING) {
++                add_wait_queue(&av7110->bmpq, &wait);
++                while (1) {
++                        set_current_state(TASK_INTERRUPTIBLE);
++                        if (av7110->bmp_state!=BMP_LOADING
++                            || signal_pending(current))
++                                break;
++                        schedule();
++                }
++                set_current_state(TASK_RUNNING);
++                remove_wait_queue(&av7110->bmpq, &wait);
++        }
++        if (av7110->bmp_state==BMP_LOADED)
++                return outcom(av7110, COMTYPE_OSD, BlitBmp, 4, win, x, y, trans);
++        return -1;
++} 
++
++static inline int  ReleaseBitmap(struct av7110 *av7110)
++{
++ 	DEB_EE(("av7110: %p\n",av7110));
++
++        if (av7110->bmp_state!=BMP_LOADED)
++                return -1;
++        av7110->bmp_state=BMP_NONE;
++        return outcom(av7110, COMTYPE_OSD, ReleaseBmp, 0);
++} 
++
++static u32 RGB2YUV(u16 R, u16 G, u16 B)
++{
++        u16 y, u, v;
++        u16 Y, Cr, Cb;
++
++        y = R * 77 + G * 150 + B * 29;  // Luma=0.299R+0.587G+0.114B 0..65535
++        u = 2048+B * 8 -(y>>5);    // Cr 0..4095
++        v = 2048+R * 8 -(y>>5);    // Cb 0..4095
++
++        Y=y/256;
++        Cb=u/16;
++        Cr=v/16;
++
++        return Cr|(Cb<<16)|(Y<<8);
++}
++
++static void OSDSetColor(struct av7110 *av7110, u8 color, u8 r, u8 g, u8 b, u8 blend)
++{
++        u16 ch, cl;
++        u32 yuv;
++
++        yuv=blend ? RGB2YUV(r,g,b) : 0;
++        cl=(yuv&0xffff);
++        ch=((yuv>>16)&0xffff);
++        SetColor_(av7110, av7110->osdwin, bpp2pal[av7110->osdbpp[av7110->osdwin]],
++                  color, ch, cl);
++        SetBlend_(av7110, av7110->osdwin, bpp2pal[av7110->osdbpp[av7110->osdwin]],
++                  color, ((blend>>4)&0x0f));
++}
++
++static int OSDSetPalette(struct av7110 *av7110, u32 *colors, u8 first, u8 last)
++{
++       int i;
++       int length = last - first + 1;
++
++       if (length * 4 > DATA_BUFF3_SIZE)
++               return -1;
++
++       for (i=0; i<length; i++) {
++               u32 blend = (colors[i] & 0xF0000000) >> 4;
++               u32 yuv = blend ? RGB2YUV(colors[i] & 0xFF, (colors[i] >> 8) & 0xFF, (colors[i] >> 16) & 0xFF) | blend : 0;
++               yuv = ((yuv & 0xFFFF0000) >> 16) | ((yuv & 0x0000FFFF) << 16); // TODO kls2003-06-15: not sure if this is endian-proof
++               wdebi(av7110, DEBINOSWAP, DATA_BUFF3_BASE + i*4, yuv, 4);
++       }
++       return outcom(av7110, COMTYPE_OSD, Set_Palette, 4,
++               av7110->osdwin, bpp2pal[av7110->osdbpp[av7110->osdwin]], first, last);
++}
++
++static int OSDSetBlock(struct av7110 *av7110, int x0, int y0, int x1, int y1, int inc, u8 *data)
++{
++        uint w, h, bpp, bpl, size, lpb, bnum, brest;
++        int i;
++
++        w=x1-x0+1; h=y1-y0+1;
++        if (inc<=0)
++                inc=w; 
++        if (w<=0 || w>720 || h<=0 || h>576) 
++                return -1;
++        bpp=av7110->osdbpp[av7110->osdwin]+1; 
++        bpl=((w*bpp+7)&~7)/8; 
++        size=h*bpl;
++        lpb=(32*1024)/bpl; 
++        bnum=size/(lpb*bpl);
++        brest=size-bnum*lpb*bpl;
++
++        for (i=0; i<bnum; i++) {
++                LoadBitmap(av7110, bpp2bit[av7110->osdbpp[av7110->osdwin]], w, lpb, inc, data); 
++                BlitBitmap(av7110, av7110->osdwin, x0, y0+i*lpb, 0);
++                data+=lpb*inc; 
++        }
++        if (brest) {
++                LoadBitmap(av7110, bpp2bit[av7110->osdbpp[av7110->osdwin]], w, brest/bpl, inc, data); 
++                BlitBitmap(av7110, av7110->osdwin, x0, y0+bnum*lpb, 0);
++        }
++        ReleaseBitmap(av7110);
++        return 0;
++}
++
++static int OSD_DrawCommand(struct av7110 *av7110, osd_cmd_t *dc)
++{
++        switch (dc->cmd) {
++        case OSD_Close:
++                DestroyOSDWindow(av7110, av7110->osdwin);
++                return 0;
++        case OSD_Open:
++                av7110->osdbpp[av7110->osdwin]=(dc->color-1)&7;
++                CreateOSDWindow(av7110, av7110->osdwin, bpp2bit[av7110->osdbpp[av7110->osdwin]],
++                                dc->x1-dc->x0+1, dc->y1-dc->y0+1);
++                if (!dc->data) {
++                        MoveWindowAbs(av7110, av7110->osdwin, dc->x0, dc->y0);
++                        SetColorBlend(av7110, av7110->osdwin);
++                }
++                return 0;
++        case OSD_Show:
++                MoveWindowRel(av7110, av7110->osdwin, 0, 0);
++                return 0;
++        case OSD_Hide:
++                HideWindow(av7110, av7110->osdwin);
++                return 0;
++        case OSD_Clear:
++                DrawBlock(av7110, av7110->osdwin, 0, 0, 720, 576, 0);
++                return 0;
++        case OSD_Fill:
++                DrawBlock(av7110, av7110->osdwin, 0, 0, 720, 576, dc->color);
++                return 0;
++        case OSD_SetColor:
++                OSDSetColor(av7110, dc->color, dc->x0, dc->y0, dc->x1, dc->y1); 
++                return 0;
++        case OSD_SetPalette:
++        {      
++                if (FW_VERSION(av7110->arm_app) >= 0x2618)
++                        OSDSetPalette(av7110, (u32 *)dc->data, dc->color, dc->x0);
++                else {
++                int i, len=dc->x0-dc->color+1;
++                u8 *colors=(u8 *)dc->data;
++
++                for (i=0; i<len; i++)
++                        OSDSetColor(av7110, dc->color+i,
++                                    colors[i*4]  , colors[i*4+1],
++                                    colors[i*4+2], colors[i*4+3]);
++                }
++                return 0;
++        }
++        case OSD_SetTrans: 
++                return 0;
++        case OSD_SetPixel:
++                DrawLine(av7110, av7110->osdwin,
++                         dc->x0, dc->y0, 0, 0,
++                         dc->color);
++                return 0;
++        case OSD_GetPixel: 
++                return 0;
++
++        case OSD_SetRow:   
++                dc->y1=dc->y0;
++        case OSD_SetBlock:
++                OSDSetBlock(av7110, dc->x0, dc->y0, dc->x1, dc->y1, dc->color, dc->data);
++                return 0;
++
++        case OSD_FillRow:
++                DrawBlock(av7110, av7110->osdwin, dc->x0, dc->y0,
++                          dc->x1-dc->x0+1, dc->y1,
++                          dc->color);
++                return 0;
++        case OSD_FillBlock:
++                DrawBlock(av7110, av7110->osdwin, dc->x0, dc->y0,
++                          dc->x1-dc->x0+1, dc->y1-dc->y0+1,
++                          dc->color);
++                return 0;
++        case OSD_Line:
++                DrawLine(av7110, av7110->osdwin,
++                         dc->x0, dc->y0, dc->x1-dc->x0, dc->y1-dc->y0,
++                         dc->color);
++                return 0;
++        case OSD_Query: 
++                return 0;
++        case OSD_Test:
++                return 0;
++        case OSD_Text:
++        {
++                char textbuf[240];
++                
++                if (strncpy_from_user(textbuf, dc->data, 240)<0)
++                        return -EFAULT;
++                textbuf[239]=0;
++                if (dc->x1>3) 
++                        dc->x1=3;
++                SetFont(av7110, av7110->osdwin, dc->x1,
++                        (u16) (dc->color&0xffff), (u16) (dc->color>>16));
++                FlushText(av7110);
++                WriteText(av7110, av7110->osdwin, dc->x0, dc->y0, textbuf);
++                return 0;
++        }
++        case OSD_SetWindow:
++                if (dc->x0<1 || dc->x0>7)
++                        return -EINVAL;
++                av7110->osdwin=dc->x0;
++                return 0;
++        case OSD_MoveWindow:
++                MoveWindowAbs(av7110, av7110->osdwin, dc->x0, dc->y0);
++                SetColorBlend(av7110, av7110->osdwin);
++                return 0;
++        default:
++                return -EINVAL;
++        }
++}
++
++
++static int dvb_osd_ioctl(struct inode *inode, struct file *file,
++            unsigned int cmd, void *parg)
++{
++	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
++        struct av7110 *av7110=(struct av7110 *) dvbdev->priv;
++
++ 	DEB_EE(("av7110: %p\n",av7110));
++
++        if (cmd==OSD_SEND_CMD)
++                return OSD_DrawCommand(av7110, (osd_cmd_t *)parg);
++
++	return -EINVAL;
++}
++
++
++static struct file_operations dvb_osd_fops = {
++	.owner		= THIS_MODULE,
++	.ioctl		= dvb_generic_ioctl,
++	.open		= dvb_generic_open,
++	.release	= dvb_generic_release,
++};
++
++static struct dvb_device dvbdev_osd = {
++	.priv		= 0,
++	.users		= 1,
++	.writers	= 1,
++	.fops		= &dvb_osd_fops,
++	.kernel_ioctl	= dvb_osd_ioctl,
++};
++
++#endif /* CONFIG_DVB_AV7110_OSD */
++
++
++/* get version of the firmware ROM, RTSL, video ucode and ARM application  */
++
++static void firmversion(struct av7110 *av7110)
++{
++        u16 buf[20];
++
++        u16 tag = ((COMTYPE_REQUEST << 8) + ReqVersion);
++        
++ 	DEB_EE(("av7110: %p\n",av7110));
++
++        RequestParameter(av7110, tag, buf, 16);
++        
++        av7110->arm_fw=(buf[0] << 16) + buf[1];
++        av7110->arm_rtsl=(buf[2] << 16) + buf[3];
++        av7110->arm_vid=(buf[4] << 16) + buf[5];
++        av7110->arm_app=(buf[6] << 16) + buf[7];
++        av7110->avtype=(buf[8] << 16) + buf[9];
++
++        printk ("DVB: AV711%d(%d) - firm %08x, rtsl %08x, vid %08x, app %08x\n",
++		av7110->avtype, av7110->dvb_adapter->num, av7110->arm_fw, 
++                av7110->arm_rtsl, av7110->arm_vid, av7110->arm_app);
++
++	/* print firmware capabilities */
++	if (FW_CI_LL_SUPPORT(av7110->arm_app))
++		printk ("DVB: AV711%d(%d) - firmware supports CI link layer interface\n",
++				av7110->avtype, av7110->dvb_adapter->num);
++	else
++		printk ("DVB: AV711%d(%d) - no firmware support for CI link layer interface\n",
++				av7110->avtype, av7110->dvb_adapter->num);
++
++        return;
++}
++
++static int waitdebi(struct av7110 *av7110, int adr, int state)
++{
++        int k;
++        
++ 	DEB_EE(("av7110: %p\n",av7110));
++
++        for (k=0; k<100; k++, udelay(500)) {
++                if (irdebi(av7110, DEBINOSWAP, adr, 0, 2) == state) 
++                        return 0;
++        }
++        return -1;
++}
++
++
++static int load_dram(struct av7110 *av7110, u32 *data, int len)
++{
++        int i;
++        int blocks, rest;
++        u32 base, bootblock=BOOT_BLOCK;
++        
++ 	DEB_EE(("av7110: %p\n",av7110));
++
++        blocks=len/BOOT_MAX_SIZE;
++        rest=len % BOOT_MAX_SIZE;
++        base=DRAM_START_CODE;
++        
++        for (i=0; i<blocks; i++) {
++                if (waitdebi(av7110, BOOT_STATE, BOOTSTATE_BUFFER_EMPTY) < 0)
++                        return -1;
++                DEB_D(("Writing DRAM block %d\n",i));
++                mwdebi(av7110, DEBISWAB, bootblock,
++                       ((char*)data) + i*(BOOT_MAX_SIZE),
++                       BOOT_MAX_SIZE);
++                bootblock^=0x1400;
++                iwdebi(av7110, DEBISWAB, BOOT_BASE, swab32(base), 4);
++                iwdebi(av7110, DEBINOSWAP, BOOT_SIZE, BOOT_MAX_SIZE, 2);
++                iwdebi(av7110, DEBINOSWAP, BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2);
++                base+=BOOT_MAX_SIZE;
++        }
++        
++        if (rest > 0) {
++                if (waitdebi(av7110, BOOT_STATE, BOOTSTATE_BUFFER_EMPTY) < 0)
++                        return -1;
++                if (rest>4)
++                        mwdebi(av7110, DEBISWAB, bootblock, ((char*)data) + i*(BOOT_MAX_SIZE), rest);
++                else
++                        mwdebi(av7110, DEBISWAB, bootblock, ((char*)data) + i*(BOOT_MAX_SIZE) - 4, rest+4);
++                
++                iwdebi(av7110, DEBISWAB, BOOT_BASE, swab32(base), 4);
++                iwdebi(av7110, DEBINOSWAP, BOOT_SIZE, rest, 2);
++                iwdebi(av7110, DEBINOSWAP, BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2);
++        }
++        if (waitdebi(av7110, BOOT_STATE, BOOTSTATE_BUFFER_EMPTY) < 0)
++                return -1;
++        iwdebi(av7110, DEBINOSWAP, BOOT_SIZE, 0, 2);
++        iwdebi(av7110, DEBINOSWAP, BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2);
++        if (waitdebi(av7110, BOOT_STATE, BOOTSTATE_BOOT_COMPLETE) < 0)
++                return -1;
++        return 0;
++}
++
++
++static u8 bootcode[] = {
++        0xea, 0x00, 0x00, 0x0e, 0xe1, 0xb0, 0xf0, 0x0e, /* 0x0000 */
++        0xe2, 0x5e, 0xf0, 0x04, 0xe2, 0x5e, 0xf0, 0x04,
++        0xe2, 0x5e, 0xf0, 0x08, 0xe2, 0x5e, 0xf0, 0x04,
++        0xe2, 0x5e, 0xf0, 0x04, 0xe2, 0x5e, 0xf0, 0x04,
++        0x2c, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x0c,
++        0x00, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x34,
++        0x00, 0x00, 0x00, 0x00, 0xa5, 0xa5, 0x5a, 0x5a,
++        0x00, 0x1f, 0x15, 0x55, 0x00, 0x00, 0x00, 0x09,
++        0xe5, 0x9f, 0xd0, 0x5c, 0xe5, 0x9f, 0x40, 0x54, /* 0x0040 */
++        0xe3, 0xa0, 0x00, 0x00, 0xe5, 0x84, 0x00, 0x00,
++        0xe5, 0x84, 0x00, 0x04, 0xe1, 0xd4, 0x10, 0xb0,
++        0xe3, 0x51, 0x00, 0x00, 0x0a, 0xff, 0xff, 0xfc,
++        0xe1, 0xa0, 0x10, 0x0d, 0xe5, 0x94, 0x30, 0x04,
++        0xe1, 0xd4, 0x20, 0xb2, 0xe2, 0x82, 0x20, 0x3f,
++        0xe1, 0xb0, 0x23, 0x22, 0x03, 0xa0, 0x00, 0x02,
++        0xe1, 0xc4, 0x00, 0xb0, 0x0a, 0xff, 0xff, 0xf4,
++        0xe8, 0xb1, 0x1f, 0xe0, 0xe8, 0xa3, 0x1f, 0xe0, /* 0x0080 */
++        0xe8, 0xb1, 0x1f, 0xe0, 0xe8, 0xa3, 0x1f, 0xe0,
++        0xe2, 0x52, 0x20, 0x01, 0x1a, 0xff, 0xff, 0xf9,
++        0xe2, 0x2d, 0xdb, 0x05, 0xea, 0xff, 0xff, 0xec,
++        0x2c, 0x00, 0x03, 0xf8, 0x2c, 0x00, 0x04, 0x00,
++};
++
++#include "av7110_firm.h"
++
++static int bootarm(struct av7110 *av7110)
++{
++	struct saa7146_dev *dev= av7110->dev;
++        u32 ret;
++        int i;
++
++ 	DEB_EE(("av7110: %p\n",av7110));
++
++        saa7146_setgpio(dev, RESET_LINE, SAA7146_GPIO_OUTLO);
++
++        /* Disable DEBI and GPIO irq */
++	IER_DISABLE(av7110->dev, MASK_03|MASK_19);
++/*
++        saa7146_write(av7110->dev, IER, 
++                      saa7146_read(av7110->dev, IER) & 
++                      ~(MASK_19 | MASK_03));
++*/
++        saa7146_write(av7110->dev, ISR, (MASK_19 | MASK_03));
++
++        /* enable DEBI */
++        saa7146_write(av7110->dev, MC1, 0x08800880);
++        saa7146_write(av7110->dev, DD1_STREAM_B, 0x00000000);
++        saa7146_write(av7110->dev, MC2, (MASK_09 | MASK_25 | MASK_10 | MASK_26));
++        
++        /* test DEBI */
++        iwdebi(av7110, DEBISWAP, DPRAM_BASE, 0x76543210, 4);
++        if ((ret=irdebi(av7110, DEBINOSWAP, DPRAM_BASE, 0, 4))!=0x10325476) {
++                printk(KERN_ERR "dvb: debi test in bootarm() failed: "
++                       "%08x != %08x\n", ret, 0x10325476);;
++                return -1;
++        }
++        for (i=0; i<8192; i+=4) 
++                iwdebi(av7110, DEBISWAP, DPRAM_BASE+i, 0x00, 4);
++        DEB_D(("bootarm: debi test OK\n"));
++
++        /* boot */
++        DEB_D(("bootarm: load boot code\n"));
++
++        saa7146_setgpio(dev, ARM_IRQ_LINE, SAA7146_GPIO_IRQLO);
++        //saa7146_setgpio(dev, DEBI_DONE_LINE, SAA7146_GPIO_INPUT);
++        //saa7146_setgpio(dev, 3, SAA7146_GPIO_INPUT);
++
++	mwdebi(av7110, DEBISWAB, DPRAM_BASE, bootcode, sizeof(bootcode));
++        iwdebi(av7110, DEBINOSWAP, BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2);
++        
++        wait_for_debi_done(av7110);
++        saa7146_setgpio(dev, RESET_LINE, SAA7146_GPIO_OUTHI);
++        set_current_state(TASK_INTERRUPTIBLE);
++        schedule_timeout(HZ);
++        
++        DEB_D(("bootarm: load dram code\n"));
++
++	if (load_dram(av7110, (u32 *)Root, sizeof(Root))<0)
++		return -1;
++
++	saa7146_setgpio(dev, RESET_LINE, SAA7146_GPIO_OUTLO);
++        mdelay(1);
++        
++        DEB_D(("bootarm: load dpram code\n"));
++
++	mwdebi(av7110, DEBISWAB, DPRAM_BASE, Dpram, sizeof(Dpram));
++
++	wait_for_debi_done(av7110);
++
++        saa7146_setgpio(dev, RESET_LINE, SAA7146_GPIO_OUTHI);
++        mdelay(800);
++
++        //ARM_ClearIrq(av7110); 
++        ARM_ResetMailBox(av7110); 
++        saa7146_write(av7110->dev, ISR, (MASK_19 | MASK_03));
++	IER_ENABLE(av7110->dev, MASK_03);
++//      saa7146_write(av7110->dev, IER, 
++//                      saa7146_read(av7110->dev, IER) | MASK_03 );
++
++        av7110->arm_errors=0;
++        av7110->arm_ready=1;
++        return 0;
++}
++
++static inline int SetPIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid, 
++        u16 subpid, u16 pcrpid)
++{
++ 	DEB_EE(("av7110: %p\n",av7110));
++
++	if (vpid == 0x1fff || apid == 0x1fff ||
++	    ttpid == 0x1fff || subpid == 0x1fff || pcrpid == 0x1fff) {
++		vpid = apid = ttpid = subpid = pcrpid = 0;
++		av7110->pids[DMX_PES_VIDEO] = 0;
++		av7110->pids[DMX_PES_AUDIO] = 0;
++		av7110->pids[DMX_PES_TELETEXT] = 0;
++		av7110->pids[DMX_PES_PCR] = 0;
++	}
++
++        return outcom(av7110, COMTYPE_PIDFILTER, MultiPID, 5, 
++                      pcrpid, vpid, apid, ttpid, subpid);
++}
++
++static void ChangePIDs(struct av7110 *av7110, u16 vpid, u16 apid, u16 ttpid, 
++        u16 subpid, u16 pcrpid)
++{
++ 	DEB_EE(("av7110: %p\n",av7110));
++
++        if (down_interruptible(&av7110->pid_mutex))
++		return;
++
++        if (!(vpid&0x8000))  av7110->pids[DMX_PES_VIDEO]=vpid;
++        if (!(apid&0x8000))  av7110->pids[DMX_PES_AUDIO]=apid;
++        if (!(ttpid&0x8000)) av7110->pids[DMX_PES_TELETEXT]=ttpid;
++        if (!(pcrpid&0x8000)) av7110->pids[DMX_PES_PCR]=pcrpid;
++
++        av7110->pids[DMX_PES_SUBTITLE]=0;
++
++        if (av7110->fe_synced) {
++                pcrpid = av7110->pids[DMX_PES_PCR];
++                SetPIDs(av7110, vpid, apid, ttpid, subpid, pcrpid);
++        }
++
++        up(&av7110->pid_mutex);
++}
++
++
++static void SetMode(struct av7110 *av7110, int mode)
++{
++ 	DEB_EE(("av7110: %p\n",av7110));
++
++        outcom(av7110, COMTYPE_ENCODER, LoadVidCode, 1, mode);
++        
++        if (!av7110->playing) {
++                ChangePIDs(av7110, av7110->pids[DMX_PES_VIDEO], 
++                           av7110->pids[DMX_PES_AUDIO], 
++                           av7110->pids[DMX_PES_TELETEXT],  
++                           0, av7110->pids[DMX_PES_PCR]);
++                outcom(av7110, COMTYPE_PIDFILTER, Scan, 0);
++        }
++}
++
++static inline void TestMode(struct av7110 *av7110, int mode)
++{
++//	DEB_EE(("av7110: %p\n",av7110));
++        outcom(av7110, COMTYPE_ENCODER, SetTestMode, 1, mode);
++}
++
++static inline void VidMode(struct av7110 *av7110, int mode)
++{
++// 	DEB_EE(("av7110: %p\n",av7110));
++        outcom(av7110, COMTYPE_ENCODER, SetVidMode, 1, mode);
++}
++           
++
++static int inline vidcom(struct av7110 *av7110, u32 com, u32 arg)
++{
++// 	DEB_EE(("av7110: %p\n",av7110));
++        return outcom(av7110, 0x80, 0x02, 4, 
++                      (com>>16), (com&0xffff), 
++                      (arg>>16), (arg&0xffff));
++}
++
++static int inline audcom(struct av7110 *av7110, u32 com)
++{
++//	DEB_EE(("av7110: %p\n",av7110));
++	return outcom(av7110, 0x80, 0x03, 4, 
++                      (com>>16), (com&0xffff));
++}
++
++static inline void Set22K(struct av7110 *av7110, int state)
++{
++ 	DEB_EE(("av7110: %p\n",av7110));
++	outcom(av7110, COMTYPE_AUDIODAC, (state ? ON22K : OFF22K), 0);
++}
++
++
++static int SendDiSEqCMsg(struct av7110 *av7110, int len, u8 *msg, unsigned long burst)
++{
++        int i;
++	u16 buf[18] = { ((COMTYPE_AUDIODAC << 8) + SendDiSEqC),
++                        16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
++
++ 	DEB_EE(("av7110: %p\n",av7110));
++
++	if (len>10)
++		len=10;
++
++	buf[1] = len+2;
++	buf[2] = len;
++
++	if (burst!=-1)
++		buf[3]=burst ? 0x01 : 0x00;
++	else
++		buf[3]=0xffff;
++
++	for (i=0; i<len; i++)
++		buf[i+4]=msg[i];
++
++	if (SOutCommand(av7110, buf, 18))
++		printk("SendDiSEqCMsg error\n");
++
++        return 0;
++}
++
++/****************************************************************************
++ * I2C client commands
++ ****************************************************************************/
++
++static inline int i2c_writereg(struct av7110 *av7110, u8 id, u8 reg, u8 val)
++{
++        u8 msg[2]={ reg, val }; 
++        struct dvb_i2c_bus *i2c = av7110->i2c_bus;
++        struct i2c_msg msgs;
++
++        msgs.flags=0;
++        msgs.addr=id/2;
++        msgs.len=2;
++        msgs.buf=msg;
++        return i2c->xfer (i2c, &msgs, 1);
++}
++
++static inline u8 i2c_readreg(struct av7110 *av7110, u8 id, u8 reg)
++{
++        struct dvb_i2c_bus *i2c = av7110->i2c_bus;
++        u8 mm1[] = {0x00};
++        u8 mm2[] = {0x00};
++        struct i2c_msg msgs[2];
++
++        msgs[0].flags=0;
++        msgs[1].flags=I2C_M_RD;
++        msgs[0].addr=msgs[1].addr=id/2;
++        mm1[0]=reg;
++        msgs[0].len=1; msgs[1].len=1;
++        msgs[0].buf=mm1; msgs[1].buf=mm2;
++        i2c->xfer(i2c, msgs, 2);
++
++        return mm2[0];
++}
++
++
++/****************************************************************************
++ * I/O buffer management and control
++ ****************************************************************************/
++
++static int sw2mode[16] = {
++        VIDEO_MODE_PAL, VIDEO_MODE_NTSC, VIDEO_MODE_NTSC, VIDEO_MODE_PAL,
++        VIDEO_MODE_NTSC, VIDEO_MODE_NTSC, VIDEO_MODE_PAL, VIDEO_MODE_NTSC,
++        VIDEO_MODE_PAL, VIDEO_MODE_PAL, VIDEO_MODE_PAL, VIDEO_MODE_PAL,
++        VIDEO_MODE_PAL, VIDEO_MODE_PAL, VIDEO_MODE_PAL, VIDEO_MODE_PAL,
++};
++
++static void get_video_format(struct av7110 *av7110, u8 *buf, int count)
++{
++        int i;
++	int hsize,vsize;
++        int sw;
++        u8 *p;
++
++ 	DEB_EE(("av7110: %p\n",av7110));
++
++        if (av7110->sinfo)
++                return;
++        for (i=7; i<count-10; i++) {
++                p=buf+i;
++                if (p[0] || p[1] || p[2]!=0x01 || p[3]!=0xb3)
++                        continue;
++                p+=4;
++                hsize = ((p[1] &0xF0) >> 4) | (p[0] << 4);
++                vsize = ((p[1] &0x0F) << 8) | (p[2]);
++                sw = (p[3]&0x0F);
++                SetMode(av7110, sw2mode[sw]);
++                DEB_S(("dvb: playback %dx%d fr=%d\n", hsize, vsize, sw));
++                av7110->sinfo=1;
++                break;
++        }
++}
++
++static inline long aux_ring_buffer_write(struct dvb_ringbuffer *rbuf, const char *buf, unsigned long count)
++{
++        unsigned long todo = count;
++        int free;
++    
++        while (todo > 0) {
++                if (dvb_ringbuffer_free(rbuf)<2048) {
++                        if (wait_event_interruptible(rbuf->queue,
++                                                     (dvb_ringbuffer_free(rbuf)>=2048)))
++                        	return count-todo;
++                }   
++                free = dvb_ringbuffer_free(rbuf);
++                if (free > todo)
++                        free = todo;
++                (void)dvb_ringbuffer_write(rbuf,buf,free,0);
++                todo -= free;
++                buf += free;
++        }
++
++	return count-todo;
++}
++
++static void play_video_cb(u8 *buf, int count, void *priv)
++{
++        struct av7110 *av7110=(struct av7110 *) priv;
++ 	DEB_EE(("av7110: %p\n",av7110));
++
++        if ((buf[3]&0xe0)==0xe0) {
++                get_video_format(av7110, buf, count);
++                aux_ring_buffer_write(&av7110->avout, buf, count);
++        } else
++                aux_ring_buffer_write(&av7110->aout, buf, count);
++}
++
++static void play_audio_cb(u8 *buf, int count, void *priv)
++{
++        struct av7110 *av7110=(struct av7110 *) priv;
++ 	DEB_EE(("av7110: %p\n",av7110));
++        
++        aux_ring_buffer_write(&av7110->aout, buf, count);
++}
++
++#define FREE_COND (dvb_ringbuffer_free(&av7110->avout)>=20*1024 && dvb_ringbuffer_free(&av7110->aout)>=20*1024)
++
++static ssize_t dvb_play(struct av7110 *av7110, const u8 *buf,
++         unsigned long count, int nonblock, int type, int umem)
++{
++        unsigned long todo = count, n;
++ 	DEB_EE(("av7110: %p\n",av7110));
++
++        if (!av7110->kbuf[type])
++                return -ENOBUFS;
++
++	if (nonblock && !FREE_COND)
++                return -EWOULDBLOCK;
++                
++        while (todo>0) {
++                if (!FREE_COND) {
++                        if (nonblock)
++                                return count-todo;
++                        if (wait_event_interruptible(av7110->avout.queue,
++                                                     FREE_COND))
++                        	return count-todo;
++                } 
++		n=todo;
++                if (n>IPACKS*2)
++                        n=IPACKS*2;
++                if (umem) {
++                        if (copy_from_user(av7110->kbuf[type], buf, n)) 
++                                return -EFAULT;
++                        av7110_ipack_instant_repack(av7110->kbuf[type], n,
++						    &av7110->ipack[type]);
++                } else {
++                        av7110_ipack_instant_repack(buf, n,
++						    &av7110->ipack[type]);
++		}
++                todo -= n;
++                buf += n;
++        }
++	return count-todo;
++}
++
++static ssize_t dvb_aplay(struct av7110 *av7110, const u8 *buf,
++         unsigned long count, int nonblock, int type)
++{
++        unsigned long todo = count, n;
++	DEB_EE(("av7110: %p\n",av7110));
++
++        if (!av7110->kbuf[type])
++                return -ENOBUFS;
++        if (nonblock && dvb_ringbuffer_free(&av7110->aout)<20*1024)
++                return -EWOULDBLOCK;
++                
++        while (todo>0) {
++                if (dvb_ringbuffer_free(&av7110->aout)<20*1024) {
++                        if (nonblock)
++                                return count-todo;
++                        if (wait_event_interruptible(av7110->aout.queue,
++                                                     (dvb_ringbuffer_free(&av7110->aout)>=
++                                                      20*1024)))
++                        	return count-todo;
++                } 
++		n=todo;
++                if (n>IPACKS*2)
++                        n=IPACKS*2;
++                if (copy_from_user(av7110->kbuf[type], buf, n)) 
++                        return -EFAULT;
++                av7110_ipack_instant_repack(av7110->kbuf[type], n,
++					    &av7110->ipack[type]);
++//                        memcpy(dvb->kbuf[type], buf, n); 
++                todo -= n;
++                buf += n;
++        }
++	return count-todo;
++}
++
++void init_p2t(struct av7110_p2t *p, struct dvb_demux_feed *feed)
++{
++	memset(p->pes,0,TS_SIZE);
++	p->counter = 0;
++	p->pos = 0;
++	p->frags = 0;
++	if (feed) p->feed = feed;
++}
++
++void clear_p2t(struct av7110_p2t *p)
++{
++	memset(p->pes,0,TS_SIZE);
++//	p->counter = 0;
++	p->pos = 0;
++	p->frags = 0;
++}
++
++
++long int find_pes_header(u8 const *buf, long int length, int *frags)
++{
++	int c = 0;
++	int found = 0;
++
++	*frags = 0;
++
++	while (c < length-3 && !found) {
++		if (buf[c] == 0x00 && buf[c+1] == 0x00 && 
++		    buf[c+2] == 0x01) {
++			switch ( buf[c+3] ) {
++				
++			case PROG_STREAM_MAP:
++			case PRIVATE_STREAM2:
++			case PROG_STREAM_DIR:
++			case ECM_STREAM     :
++			case EMM_STREAM     :
++			case PADDING_STREAM :
++			case DSM_CC_STREAM  :
++			case ISO13522_STREAM:
++			case PRIVATE_STREAM1:
++			case AUDIO_STREAM_S ... AUDIO_STREAM_E:
++			case VIDEO_STREAM_S ... VIDEO_STREAM_E:
++				found = 1;
++				break;
++				
++			default:
++				c++;
++				break;
++			}	
++		} else c++;
++	}
++	if (c == length-3 && !found){
++		if (buf[length-1] == 0x00) *frags = 1;
++		if (buf[length-2] == 0x00 &&
++		    buf[length-1] == 0x00) *frags = 2;
++		if (buf[length-3] == 0x00 &&
++		    buf[length-2] == 0x00 &&
++		    buf[length-1] == 0x01) *frags = 3;
++		return -1;
++	}
++
++	return c;
++}
++
++void pes_to_ts( u8 const *buf, long int length, u16 pid, struct av7110_p2t *p)
++{
++	int c,c2,l,add;
++	int check,rest;
++
++	c = 0;
++	c2 = 0;
++	if (p->frags){
++		check = 0;
++		switch(p->frags){
++		case 1:
++			if ( buf[c] == 0x00 && buf[c+1] == 0x01 ){
++				check = 1;
++				c += 2;
++			}
++			break;
++		case 2:
++			if ( buf[c] == 0x01 ){
++				check = 1;
++				c++;
++			}
++			break;
++		case 3:
++			check = 1;
++		}
++		if(check){
++			switch ( buf[c] ) {
++				
++			case PROG_STREAM_MAP:
++			case PRIVATE_STREAM2:
++			case PROG_STREAM_DIR:
++			case ECM_STREAM     :
++			case EMM_STREAM     :
++			case PADDING_STREAM :
++			case DSM_CC_STREAM  :
++			case ISO13522_STREAM:
++			case PRIVATE_STREAM1:
++			case AUDIO_STREAM_S ... AUDIO_STREAM_E:
++			case VIDEO_STREAM_S ... VIDEO_STREAM_E:
++				p->pes[0] = 0x00;
++				p->pes[1] = 0x00;
++				p->pes[2] = 0x01;
++				p->pes[3] = buf[c];
++				p->pos=4;
++				memcpy(p->pes+p->pos,buf+c,(TS_SIZE-4)-p->pos);
++				c += (TS_SIZE-4)-p->pos;
++				p_to_t(p->pes,(TS_SIZE-4),pid,&p->counter,
++				       p->feed);
++				clear_p2t(p);
++				break;
++				
++			default:
++				c=0;
++				break;
++			}
++		}
++		p->frags = 0;
++	}
++		
++	if (p->pos){
++		c2 = find_pes_header(buf+c,length-c,&p->frags);
++		if (c2 >= 0 && c2 < (TS_SIZE-4)-p->pos){
++			l = c2+c;
++		} else l = (TS_SIZE-4)-p->pos;
++		memcpy(p->pes+p->pos,buf,l);
++		c += l;
++		p->pos += l;
++		p_to_t(p->pes,p->pos,pid,&p->counter, p->feed);
++		clear_p2t(p);
++	}
++			
++	add = 0;
++	while (c < length){
++		c2 = find_pes_header(buf+c+add,length-c-add,&p->frags);
++		if (c2 >= 0) {
++			c2 += c+add;
++			if (c2 > c){
++				p_to_t(buf+c,c2-c,pid,&p->counter,
++				       p->feed);
++				c = c2;
++				clear_p2t(p);
++				add = 0;
++			} else add = 1;
++		} else {
++			l = length-c;
++			rest = l % (TS_SIZE-4);
++			l -= rest;
++			p_to_t(buf+c,l,pid,&p->counter,
++			       p->feed);
++			memcpy(p->pes,buf+c+l,rest);
++			p->pos = rest;
++			c = length;
++		}
++	}
++}
++
++
++int write_ts_header2(u16 pid, u8 *counter, int pes_start, u8 *buf, u8 length)
++{
++	int i;
++	int c = 0;
++	int fill;
++	u8 tshead[4] = { 0x47, 0x00, 0x00, 0x10}; 
++        
++	fill = (TS_SIZE-4)-length;
++        if (pes_start) tshead[1] = 0x40;
++	if (fill) tshead[3] = 0x30;
++        tshead[1] |= (u8)((pid & 0x1F00) >> 8);
++        tshead[2] |= (u8)(pid & 0x00FF);
++        tshead[3] |= ((*counter)++ & 0x0F) ;
++        memcpy(buf,tshead,4);
++	c+=4;
++
++
++	if (fill){
++		buf[4] = fill-1;
++		c++;
++		if (fill >1){
++			buf[5] = 0x00;
++			c++;
++		}
++		for ( i = 6; i < fill+4; i++){
++			buf[i] = 0xFF;
++			c++;
++		}
++	}
++
++        return c;
++}
++
++
++void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter, 
++            struct dvb_demux_feed *feed)
++{
++  
++	int l, pes_start;
++	u8 obuf[TS_SIZE];
++	long int c = 0;
++
++	pes_start = 0;
++	if ( length > 3 && 
++             buf[0] == 0x00 && buf[1] == 0x00 && buf[2] == 0x01 )
++		switch (buf[3]){
++			case PROG_STREAM_MAP:
++			case PRIVATE_STREAM2:
++			case PROG_STREAM_DIR:
++			case ECM_STREAM     :
++			case EMM_STREAM     :
++			case PADDING_STREAM :
++			case DSM_CC_STREAM  :
++			case ISO13522_STREAM:
++			case PRIVATE_STREAM1:
++			case AUDIO_STREAM_S ... AUDIO_STREAM_E:
++			case VIDEO_STREAM_S ... VIDEO_STREAM_E:
++				pes_start = 1;
++				break;
++				
++			default:
++				break;
++		}			
++
++	while ( c < length ){
++		memset(obuf,0,TS_SIZE);
++		if (length - c >= (TS_SIZE-4)){
++			l = write_ts_header2(pid, counter, pes_start
++					     , obuf, (TS_SIZE-4));
++			memcpy(obuf+l, buf+c, TS_SIZE-l);
++			c += TS_SIZE-l;
++		} else { 
++			l = write_ts_header2(pid, counter, pes_start
++					     , obuf, length-c);
++			memcpy(obuf+l, buf+c, TS_SIZE-l);
++			c = length;
++		}
++                feed->cb.ts(obuf, 188, 0, 0, &feed->feed.ts, DMX_OK); 
++		pes_start = 0;
++	}
++}
++
++/****************************************************************************
++ * V4L SECTION
++ ****************************************************************************/
++
++static struct v4l2_input inputs[2] = {
++	{	
++		.index 		= 0,
++		.name 		= "DVB",
++		.type		= V4L2_INPUT_TYPE_CAMERA,
++		.audioset 	= 1,
++		.tuner		= 0, /* ignored */
++		.std		= V4L2_STD_PAL_BG|V4L2_STD_NTSC_M,
++		.status		= 0,
++	}, { 
++		.index 		= 1,
++		.name 		= "Television",
++		.type		= V4L2_INPUT_TYPE_TUNER,
++		.audioset 	= 2,
++		.tuner		= 0,
++		.std		= V4L2_STD_PAL_BG|V4L2_STD_NTSC_M,
++		.status		= 0,
++	}
++};
++
++/* taken from ves1820.c */
++static int ves1820_writereg(struct saa7146_dev *dev, u8 reg, u8 data)
++{
++	u8 addr = 0x09;
++        u8 buf[] = { 0x00, reg, data };
++	struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = buf, .len = 3 };
++
++  	DEB_EE(("av7710: dev: %p\n",dev));
++
++	if( 1 != saa7146_i2c_transfer(dev, &msg, 1, 1)) {
++		return -1;
++	}
++	return 0;
++}
++
++static int tuner_write(struct saa7146_dev *dev, u8 addr, u8 data [4])
++{
++        struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = data, .len = 4 };
++
++  	DEB_EE(("av7710: dev: %p\n",dev));
++
++	if( 1 != saa7146_i2c_transfer(dev, &msg, 1, 1)) {
++		return -1;
++	}
++	return 0;
++}
++
++
++/**
++ *   set up the downconverter frequency divisor for a
++ *   reference clock comparision frequency of 62.5 kHz.
++ */
++static int tuner_set_tv_freq (struct saa7146_dev *dev, u32 freq)
++{
++        u32 div;
++	u8 config;
++        u8 buf [4];
++
++ 	DEB_EE(("av7710: freq: 0x%08x\n",freq));
++
++	/* magic number: 614. tuning with the frequency given by v4l2
++	   is always off by 614*62.5 = 38375 kHz...*/
++	div = freq + 614;
++
++	buf[0] = (div >> 8) & 0x7f;
++	buf[1] = div & 0xff;
++	buf[2] = 0x8e;
++
++	if (freq < (u32) 16*168.25 )
++		config = 0xa0;
++	else if (freq < (u32) 16*447.25)
++		config = 0x90;
++	else
++		config = 0x30;
++	config &= ~0x02;
++
++	buf[3] = config;
++
++        return tuner_write (dev, 0x61, buf);
++}
++
++static struct saa7146_standard analog_standard[];
++static struct saa7146_standard dvb_standard[];
++static struct saa7146_standard standard[];
++
++static struct v4l2_audio msp3400_v4l2_audio = {
++	.index = 0,
++	.name = "Television",
++	.capability = V4L2_AUDCAP_STEREO
++};
++
++int av7110_dvb_c_switch(struct saa7146_fh *fh)
++{
++	struct saa7146_dev *dev = fh->dev;
++	struct saa7146_vv *vv = dev->vv_data;
++	struct av7110 *av7110 = (struct av7110*)dev->ext_priv;
++	u16 adswitch;
++	u8 band = 0;
++	int source, sync;
++	struct saa7146_fh *ov_fh = NULL;
++	int restart_overlay = 0;
++
++	DEB_EE(("av7110: %p\n",av7110));
++
++	if( vv->ov_data != NULL ) {
++		ov_fh = vv->ov_data->fh;
++		saa7146_stop_preview(ov_fh);
++		restart_overlay = 1;
++	}
++
++	if( 0 != av7110->current_input ) {
++		adswitch = 1;
++		band = 0x68; /* analog band */
++		source = SAA7146_HPS_SOURCE_PORT_B;
++		sync = SAA7146_HPS_SYNC_PORT_B;
++		memcpy(standard,analog_standard,sizeof(struct saa7146_standard)*2);
++		printk("av7110: switching to analog TV\n");
++		msp_writereg(av7110, MSP_WR_DSP, 0x0008, 0x0000); // loudspeaker source
++		msp_writereg(av7110, MSP_WR_DSP, 0x0009, 0x0000); // headphone source
++		msp_writereg(av7110, MSP_WR_DSP, 0x000a, 0x0000); // SCART 1 source
++		msp_writereg(av7110, MSP_WR_DSP, 0x000e, 0x3000); // FM matrix, mono
++		msp_writereg(av7110, MSP_WR_DSP, 0x0000, 0x4f00); // loudspeaker + headphone
++		msp_writereg(av7110, MSP_WR_DSP, 0x0007, 0x4f00); // SCART 1 volume
++	} else {
++		adswitch = 0;
++		band = 0x28; /* digital band */	
++		source = SAA7146_HPS_SOURCE_PORT_A;
++		sync = SAA7146_HPS_SYNC_PORT_A;
++		memcpy(standard,dvb_standard,sizeof(struct saa7146_standard)*2);
++		printk("av7110: switching DVB mode\n");
++		msp_writereg(av7110, MSP_WR_DSP, 0x0008, 0x0220); // loudspeaker source
++		msp_writereg(av7110, MSP_WR_DSP, 0x0009, 0x0220); // headphone source
++		msp_writereg(av7110, MSP_WR_DSP, 0x000a, 0x0220); // SCART 1 source
++		msp_writereg(av7110, MSP_WR_DSP, 0x000e, 0x3000); // FM matrix, mono
++		msp_writereg(av7110, MSP_WR_DSP, 0x0000, 0x7f00); // loudspeaker + headphone
++		msp_writereg(av7110, MSP_WR_DSP, 0x0007, 0x7f00); // SCART 1 volume
++	}
++
++	/* hmm, this does not do anything!? */
++	if (outcom(av7110, COMTYPE_AUDIODAC, ADSwitch, 1, adswitch))
++		printk("ADSwitch error\n");
++
++	if( 0 != ves1820_writereg(dev, 0x0f, band )) {
++		printk("setting band in demodulator failed.\n");
++	}
++	saa7146_set_hps_source_and_sync(dev, source, sync);
++
++	/* restart overlay if it was active before */
++	if( 0 != restart_overlay ) {
++		saa7146_start_preview(ov_fh);
++	}
++
++	return 0;
++}
++
++int av7110_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg) 
++{
++	struct saa7146_dev *dev = fh->dev;
++	struct av7110 *av7110 = (struct av7110*)dev->ext_priv;
++ 	DEB_EE(("saa7146_dev: %p\n",dev));
++
++	switch(cmd) {
++	case VIDIOC_G_TUNER:
++	{
++		struct v4l2_tuner *t = arg;
++		u16 stereo_det;
++		s8 stereo;
++
++		DEB_EE(("VIDIOC_G_TUNER: %d\n", t->index));
++
++		if( 0 == av7110->has_analog_tuner || t->index != 0 ) {
++			return -EINVAL;
++		}
++
++		memset(t,0,sizeof(*t));
++		strcpy(t->name, "Television");
++
++		t->type = V4L2_TUNER_ANALOG_TV;
++		t->capability = V4L2_TUNER_CAP_NORM | V4L2_TUNER_CAP_STEREO |
++			V4L2_TUNER_CAP_LANG1 | V4L2_TUNER_CAP_LANG2 | V4L2_TUNER_CAP_SAP;
++		t->rangelow = 772;	/* 48.25 MHZ / 62.5 kHz = 772, see fi1216mk2-specs, page 2 */
++		t->rangehigh = 13684;	/* 855.25 MHz / 62.5 kHz = 13684 */
++		/* FIXME: add the real signal strength here */
++		t->signal = 0xffff;
++		t->afc = 0;		
++
++msp_readreg(av7110, MSP_RD_DEM, 0x007e, &stereo_det);
++printk("VIDIOC_G_TUNER: msp3400 TV standard detection: 0x%04x\n", stereo_det);
++
++		msp_readreg(av7110, MSP_RD_DSP, 0x0018, &stereo_det);
++		printk("VIDIOC_G_TUNER: msp3400 stereo detection: 0x%04x\n", stereo_det);
++		stereo = (s8)(stereo_det >> 8);
++		if (stereo > 0x10) {
++			/* stereo */
++		t->rxsubchans 	= V4L2_TUNER_SUB_STEREO | V4L2_TUNER_SUB_MONO;
++			t->audmode = V4L2_TUNER_MODE_STEREO;
++		}
++		else if (stereo < -0x10) {
++			/* bilingual*/
++			t->rxsubchans = V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2;
++			 t->audmode = V4L2_TUNER_MODE_LANG1;
++		}
++		else /* mono */
++			t->rxsubchans = V4L2_TUNER_SUB_MONO;
++
++		return 0;
++	}
++	case VIDIOC_S_TUNER:
++	{
++		struct v4l2_tuner *t = arg;
++		u16 fm_matrix, src;
++		DEB_EE(("VIDIOC_S_TUNER: %d\n", t->index));
++
++		if( 0 == av7110->has_analog_tuner || av7110->current_input != 1 ) {
++			return -EINVAL;
++		}
++
++
++		switch(t->audmode) {
++		case V4L2_TUNER_MODE_STEREO:
++				DEB_D(("VIDIOC_S_TUNER: V4L2_TUNER_MODE_STEREO\n"));
++			fm_matrix = 0x3001; // stereo
++			src = 0x0020;
++				break;
++		case V4L2_TUNER_MODE_LANG1:
++				DEB_D(("VIDIOC_S_TUNER: V4L2_TUNER_MODE_LANG1\n"));
++			fm_matrix = 0x3000; // mono
++			src = 0x0000;
++				break;
++		case V4L2_TUNER_MODE_LANG2:
++				DEB_D(("VIDIOC_S_TUNER: V4L2_TUNER_MODE_LANG2\n"));
++			fm_matrix = 0x3000; // mono
++			src = 0x0010;
++				break;
++		default: /* case V4L2_TUNER_MODE_MONO: {*/
++				DEB_D(("VIDIOC_S_TUNER: TDA9840_SET_MONO\n"));
++			fm_matrix = 0x3000; // mono
++			src = 0x0030;
++				break;
++			}
++		msp_writereg(av7110, MSP_WR_DSP, 0x000e, fm_matrix);
++		msp_writereg(av7110, MSP_WR_DSP, 0x0008, src);
++		msp_writereg(av7110, MSP_WR_DSP, 0x0009, src);
++		msp_writereg(av7110, MSP_WR_DSP, 0x000a, src);
++
++		return 0;
++	}
++	case VIDIOC_G_FREQUENCY:
++	{
++		struct v4l2_frequency *f = arg;
++
++		DEB_EE(("VIDIOC_G_FREQ: freq:0x%08x.\n", f->frequency));
++
++		if( 0 == av7110->has_analog_tuner || av7110->current_input != 1 ) {
++			return -EINVAL;
++		}
++
++		memset(f,0,sizeof(*f));
++		f->type = V4L2_TUNER_ANALOG_TV;
++		f->frequency =  av7110->current_freq;
++
++		return 0;
++	}
++	case VIDIOC_S_FREQUENCY:
++	{
++		struct v4l2_frequency *f = arg;
++
++		DEB_EE(("VIDIOC_S_FREQUENCY: freq:0x%08x.\n",f->frequency));
++
++		if( 0 == av7110->has_analog_tuner || av7110->current_input != 1 ) {
++			return -EINVAL;
++		}
++
++		if (V4L2_TUNER_ANALOG_TV != f->type)
++			return -EINVAL;
++
++		msp_writereg(av7110, MSP_WR_DSP, 0x0000, 0xffe0); // fast mute
++		msp_writereg(av7110, MSP_WR_DSP, 0x0007, 0xffe0);
++
++		/* tune in desired frequency */			
++		tuner_set_tv_freq(dev, f->frequency);
++		av7110->current_freq = f->frequency;
++
++		msp_writereg(av7110, MSP_WR_DSP, 0x0015, 0x003f); // start stereo detection
++		msp_writereg(av7110, MSP_WR_DSP, 0x0015, 0x0000);
++		msp_writereg(av7110, MSP_WR_DSP, 0x0000, 0x4f00); // loudspeaker + headphone
++		msp_writereg(av7110, MSP_WR_DSP, 0x0007, 0x4f00); // SCART 1 volume
++
++		return 0;
++	}
++	case VIDIOC_ENUMINPUT:
++	{
++		struct v4l2_input *i = arg;
++		
++		DEB_EE(("VIDIOC_ENUMINPUT: %d\n", i->index));
++
++		if( 0 != av7110->has_analog_tuner ) {
++			if( i->index < 0 || i->index >= 2) {
++				return -EINVAL;
++			}
++		} else {
++		if( i->index != 0 ) {
++			return -EINVAL;
++		}
++		}		
++
++		memcpy(i, &inputs[i->index], sizeof(struct v4l2_input));
++		
++		return 0;
++	}
++	case VIDIOC_G_INPUT:
++	{
++		int *input = (int *)arg;
++		*input = av7110->current_input;
++		DEB_EE(("VIDIOC_G_INPUT: %d\n", *input));
++		return 0;		
++	}	
++	case VIDIOC_S_INPUT:
++	{
++		int input = *(int *)arg;
++
++		DEB_EE(("VIDIOC_S_INPUT: %d\n", input));
++
++		if( 0 == av7110->has_analog_tuner ) {
++		return 0;		
++	}	
++		
++		if( input < 0 || input >= 2) {
++			return -EINVAL;
++		}
++		
++		/* fixme: switch inputs here */
++		av7110->current_input = input;
++		return av7110_dvb_c_switch(fh);
++	}	
++	case VIDIOC_G_AUDIO:
++	{
++		struct v4l2_audio *a = arg;
++
++		DEB_EE(("VIDIOC_G_AUDIO: %d\n", a->index));
++		if (a->index != 0)
++			return -EINVAL;
++		memcpy(a, &msp3400_v4l2_audio, sizeof(struct v4l2_audio));
++		break;
++	}
++	case VIDIOC_S_AUDIO:
++	{
++		struct v4l2_audio *a = arg;
++		DEB_EE(("VIDIOC_S_AUDIO: %d\n", a->index));
++		break;
++	}
++	default:
++		printk("no such ioctl\n");
++		return -ENOIOCTLCMD;
++	}
++	return 0;
++}	
++
++static unsigned int dvb_audio_poll(struct file *file, poll_table *wait)
++{
++	struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
++        struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
++        unsigned int mask = 0;
++
++	DEB_EE(("av7110: %p\n",av7110));
++
++	poll_wait(file, &av7110->aout.queue, wait);
++
++	if (av7110->playing) {
++                if (dvb_ringbuffer_free(&av7110->aout)>=20*1024)
++                        mask |= (POLLOUT | POLLWRNORM);
++        } else /* if not playing: may play if asked for */
++		mask = (POLLOUT | POLLWRNORM);
++
++	return mask;
++}
++
++
++/****************************************************************************
++ * END OF V4L SECTION
++ ****************************************************************************/
++
++
++/****************************************************************************
++ * DVB API SECTION
++ ****************************************************************************/
++
++
++/******************************************************************************
++ * hardware filter functions
++ ******************************************************************************/
++
++static int StartHWFilter(struct dvb_demux_filter *dvbdmxfilter)
++{
++        struct dvb_demux_feed *dvbdmxfeed=dvbdmxfilter->feed;
++        struct av7110 *av7110=(struct av7110 *) dvbdmxfeed->demux->priv;
++        u16 buf[20];
++        int ret, i;
++        u16 handle;
++//        u16 mode=0x0320;
++        u16 mode=0xb96a;
++        
++ 	DEB_EE(("av7110: %p\n",av7110));
++
++        if (dvbdmxfilter->type==DMX_TYPE_SEC) {
++		if (hw_sections) {
++	                buf[4]=(dvbdmxfilter->filter.filter_value[0]<<8)|
++        	                dvbdmxfilter->maskandmode[0];
++                	for (i=3; i<18; i++)
++                        	buf[i+4-2]=(dvbdmxfilter->filter.filter_value[i]<<8)|
++                                	dvbdmxfilter->maskandmode[i];
++	                mode=4;
++		}
++        } else
++        if ((dvbdmxfeed->ts_type & TS_PACKET) &&
++            !(dvbdmxfeed->ts_type & TS_PAYLOAD_ONLY)) 
++                init_p2t(&av7110->p2t_filter[dvbdmxfilter->index], dvbdmxfeed);
++
++        buf[0] = (COMTYPE_PID_FILTER << 8) + AddPIDFilter; 
++        buf[1] = 16;	
++        buf[2] = dvbdmxfeed->pid;
++        buf[3] = mode;
++
++        ret=CommandRequest(av7110, buf, 20, &handle, 1);          
++        if (ret<0) {
++		printk("StartHWFilter error\n");
++                return ret;
++	}
++
++        av7110->handle2filter[handle]=dvbdmxfilter;
++        dvbdmxfilter->hw_handle=handle;
++
++        return ret;
++}
++
++static int StopHWFilter(struct dvb_demux_filter *dvbdmxfilter)
++{
++        struct av7110 *av7110=(struct av7110 *) dvbdmxfilter->feed->demux->priv;
++        u16 buf[3];
++        u16 answ[2];
++        int ret;
++        u16 handle;
++                
++ 	DEB_EE(("av7110: %p\n",av7110));
++
++        handle=dvbdmxfilter->hw_handle;
++        if (handle>32) {
++                DEB_S(("dvb: StopHWFilter tried to stop invalid filter %d.\n",
++                       handle));
++                DEB_S(("dvb: filter type = %d\n",  dvbdmxfilter->type));
++                return 0;
++        }
++
++        av7110->handle2filter[handle]=NULL;
++
++        buf[0] = (COMTYPE_PID_FILTER << 8) + DelPIDFilter; 
++        buf[1] = 1;	
++        buf[2] = handle;
++        ret=CommandRequest(av7110, buf, 3, answ, 2);          
++	if (ret)
++		printk("StopHWFilter error\n");
++
++        if (answ[1] != handle) {
++                DEB_S(("dvb: filter %d shutdown error :%d\n", handle, answ[1]));
++                ret=-1;
++        }
++        return ret;
++}
++
++
++static int av7110_write_to_decoder(struct dvb_demux_feed *feed, const u8 *buf, size_t len)
++{
++        struct dvb_demux *demux = feed->demux;
++        struct av7110 *av7110 = (struct av7110 *) demux->priv;
++        struct ipack *ipack = &av7110->ipack[feed->pes_type];
++
++	DEB_EE(("av7110: %p\n",av7110));
++
++        switch (feed->pes_type) {
++        case 0:
++                if (av7110->audiostate.stream_source==AUDIO_SOURCE_MEMORY)
++                        return -EINVAL;
++                break;
++        case 1:
++                if (av7110->videostate.stream_source==VIDEO_SOURCE_MEMORY)
++                        return -EINVAL;
++                break;
++        default:
++                return -1;
++        }
++
++        if (!(buf[3] & 0x10)) { // no payload?
++                return -1;
++        }
++        if (buf[1] & 0x40)
++                av7110_ipack_flush(ipack);
++
++        if (buf[3] & 0x20) {  // adaptation field?
++                len -= buf[4]+1;
++                buf += buf[4]+1;
++                if (!len)
++                        return 0;
++        }
++        
++        av7110_ipack_instant_repack(buf+4, len-4, &av7110->ipack[feed->pes_type]);
++        return 0;
++}
++
++
++static void dvb_feed_start_pid(struct dvb_demux_feed *dvbdmxfeed)
++{
++        struct dvb_demux *dvbdmx=dvbdmxfeed->demux;
++        struct av7110 *av7110=(struct av7110 *) dvbdmx->priv;
++        u16 *pid=dvbdmx->pids, npids[5];
++        int i;
++        
++	DEB_EE(("av7110: %p\n",av7110));
++
++        npids[0]=npids[1]=npids[2]=npids[3]=0xffff;
++        npids[4]=0xffff;
++        i=dvbdmxfeed->pes_type;
++        npids[i]=(pid[i]&0x8000) ? 0 : pid[i];
++        if ((i==2) && npids[i] && (dvbdmxfeed->ts_type & TS_PACKET)) {
++                npids[i]=0;
++                ChangePIDs(av7110, npids[1], npids[0], npids[2], npids[3], npids[4]);
++                StartHWFilter(dvbdmxfeed->filter); 
++                return;
++        }
++        if (dvbdmxfeed->pes_type<=2 || dvbdmxfeed->pes_type==4)
++                ChangePIDs(av7110, npids[1], npids[0], npids[2], npids[3], npids[4]);
++
++        if (dvbdmxfeed->pes_type<2 && npids[0])
++                if (av7110->fe_synced) 
++                        outcom(av7110, COMTYPE_PIDFILTER, Scan, 0);
++
++        if ((dvbdmxfeed->ts_type & TS_PACKET)) { 
++                if (dvbdmxfeed->pes_type == 0 && 
++                    !(dvbdmx->pids[0]&0x8000))
++                        AV_StartRecord(av7110, RP_AUDIO, 
++                                       dvbdmxfeed);
++                if (dvbdmxfeed->pes_type == 1 && 
++                    !(dvbdmx->pids[1]&0x8000))
++                        AV_StartRecord(av7110, RP_VIDEO, 
++                                       dvbdmxfeed);
++        }
++}
++
++static void dvb_feed_stop_pid(struct dvb_demux_feed *dvbdmxfeed)
++{
++        struct dvb_demux *dvbdmx=dvbdmxfeed->demux;
++        struct av7110 *av7110=(struct av7110 *) dvbdmx->priv;
++        u16 *pid=dvbdmx->pids, npids[5];
++        int i;
++        
++	DEB_EE(("av7110: %p\n",av7110));
++
++        if (dvbdmxfeed->pes_type<=1) {
++                AV_Stop(av7110, dvbdmxfeed->pes_type ? 
++                        RP_VIDEO : RP_AUDIO);
++                if (!av7110->rec_mode)
++                        dvbdmx->recording=0;
++                if (!av7110->playing)
++                        dvbdmx->playing=0;
++        }
++        npids[0]=npids[1]=npids[2]=npids[3]=0xffff;
++        npids[4]=0xffff;
++        i=dvbdmxfeed->pes_type;
++        switch (i) {
++        case 2: //teletext
++                if (dvbdmxfeed->ts_type & TS_PACKET)
++                        StopHWFilter(dvbdmxfeed->filter); 
++                npids[2]=0;
++                break;
++        case 0:
++        case 1:
++        case 4:
++                if (!pids_off) 
++                        return;
++                npids[i]=(pid[i]&0x8000) ? 0 : pid[i];
++                break;
++        }
++        ChangePIDs(av7110, npids[1], npids[0], npids[2], npids[3], npids[4]);
++}
++
++static int av7110_start_feed(struct dvb_demux_feed *feed)
++{
++        struct dvb_demux *demux = feed->demux;
++        struct av7110 *av7110 = (struct av7110 *) demux->priv;
++
++	DEB_EE(("av7110: %p\n",av7110));
++
++        if (!demux->dmx.frontend)
++                return -EINVAL;
++
++        if (feed->pid > 0x1fff) 
++                return -EINVAL;
++
++        if (feed->type == DMX_TYPE_TS) {
++	        if ((feed->ts_type & TS_DECODER) &&
++		    (feed->pes_type < DMX_TS_PES_OTHER)) {
++		        switch (demux->dmx.frontend->source) {
++			case DMX_MEMORY_FE: 
++			        if (feed->ts_type & TS_DECODER)
++				       if (feed->pes_type < 2 && 
++                                           !(demux->pids[0] & 0x8000) &&
++					   !(demux->pids[1] & 0x8000)) {
++                                               dvb_ringbuffer_flush_spinlock_wakeup(&av7110->avout);
++                                               dvb_ringbuffer_flush_spinlock_wakeup(&av7110->aout);
++                                               AV_StartPlay(av7110,RP_AV);
++                                               demux->playing = 1;
++					}
++				break;
++			default:
++                                dvb_feed_start_pid(feed);
++				break;
++			}
++		} else
++		        if ((feed->ts_type & TS_PACKET) &&
++                            (demux->dmx.frontend->source!=DMX_MEMORY_FE))
++                                StartHWFilter(feed->filter); 
++        }
++        
++        if (feed->type == DMX_TYPE_SEC) {
++                int i;
++
++	        for (i=0; i<demux->filternum; i++) {
++		        if (demux->filter[i].state!=DMX_STATE_READY)
++			        continue;
++			if (demux->filter[i].type!=DMX_TYPE_SEC)
++			        continue;
++			if (demux->filter[i].filter.parent!=&feed->feed.sec)
++			        continue;
++			demux->filter[i].state=DMX_STATE_GO;
++                        if (demux->dmx.frontend->source!=DMX_MEMORY_FE)
++                                StartHWFilter(&demux->filter[i]); 
++                }
++	}
++
++        return 0;
++}
++
++
++static int av7110_stop_feed(struct dvb_demux_feed *feed)
++{
++        struct dvb_demux *demux = feed->demux;
++        struct av7110 *av7110 = (struct av7110 *) demux->priv;
++
++	DEB_EE(("av7110: %p\n",av7110));
++
++        if (feed->type == DMX_TYPE_TS) {
++                if (feed->ts_type & TS_DECODER) {
++                        if (feed->pes_type >= DMX_TS_PES_OTHER ||
++                            !demux->pesfilter[feed->pes_type]) 
++                                return -EINVAL;
++                        demux->pids[feed->pes_type]|=0x8000;
++                        demux->pesfilter[feed->pes_type]=0;
++                }
++                if (feed->ts_type & TS_DECODER &&
++		    feed->pes_type < DMX_TS_PES_OTHER) {
++                        dvb_feed_stop_pid(feed);
++                } else 
++                        if ((feed->ts_type & TS_PACKET) &&
++                            (demux->dmx.frontend->source != DMX_MEMORY_FE))
++                                StopHWFilter(feed->filter); 
++        }
++        
++        if (feed->type == DMX_TYPE_SEC) {
++                int i;
++
++	        for (i=0; i<demux->filternum; i++)
++		        if (demux->filter[i].state==DMX_STATE_GO && 
++			    demux->filter[i].filter.parent==&feed->feed.sec) {
++			        demux->filter[i].state=DMX_STATE_READY;
++                                if (demux->dmx.frontend->source!=DMX_MEMORY_FE)
++                                        StopHWFilter(&demux->filter[i]); 
++                }
++	}
++
++        return 0;
++}
++
++
++static void restart_feeds(struct av7110 *av7110)
++{
++        struct dvb_demux *dvbdmx=&av7110->demux;
++        struct dvb_demux_feed *feed;
++        int mode;
++        int i;
++
++	DEB_EE(("av7110: %p\n",av7110));
++
++        mode=av7110->playing;
++        av7110->playing=0;
++        av7110->rec_mode=0;
++
++        for (i=0; i<dvbdmx->filternum; i++) {
++                feed=&dvbdmx->feed[i];
++                if (feed->state==DMX_STATE_GO)
++                        av7110_start_feed(feed);
++        }
++
++        if (mode)
++                AV_StartPlay(av7110, mode);
++}
++
++static int dvb_get_stc(struct dmx_demux *demux, unsigned int num,
++		uint64_t *stc, unsigned int *base)
++{
++	int ret;
++        u16 fwstc[4];
++        u16 tag = ((COMTYPE_REQUEST << 8) + ReqSTC);
++	struct dvb_demux *dvbdemux;
++	struct av7110 *av7110;
++
++	/* pointer casting paranoia... */
++	if (!demux)
++		BUG();
++	dvbdemux = (struct dvb_demux *) demux->priv;
++	if (!dvbdemux)
++		BUG();
++	av7110 = (struct av7110 *) dvbdemux->priv;
++
++	DEB_EE(("av7110: %p\n",av7110));
++
++	if (num != 0)
++		return -EINVAL;
++
++        ret = CommandRequest(av7110, &tag, 0, fwstc, 4);
++	if (ret) {
++		printk(KERN_ERR "%s: CommandRequest error\n", __FUNCTION__);
++		return -EIO;
++	}
++	DEB_EE(("av7110: fwstc = %04hx %04hx %04hx %04hx\n",
++			fwstc[0], fwstc[1], fwstc[2], fwstc[3]));
++
++	*stc =  (((uint64_t) ((fwstc[3] & 0x8000) >> 15)) << 32) |
++		(((uint64_t)fwstc[1])     << 16) | ((uint64_t)fwstc[0]);
++	*base = 1;
++
++	DEB_EE(("av7110: stc = %lu\n", (unsigned long)*stc));
++
++	return 0;
++}
++
++
++/******************************************************************************
++ * SEC device file operations
++ ******************************************************************************/
++
++static int av7110_diseqc_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
++{
++	struct av7110 *av7110 = fe->before_after_data;
++
++	DEB_EE(("av7110: %p\n",av7110));
++
++	switch (cmd) {
++	case FE_SET_TONE:
++		switch ((fe_sec_tone_mode_t) arg) {
++		case SEC_TONE_ON:
++			Set22K (av7110, 1);
++			break;
++		case SEC_TONE_OFF:
++			Set22K (av7110, 0);
++			break;
++		default:
++			return -EINVAL;
++		};
++		break;
++
++	case FE_DISEQC_SEND_MASTER_CMD:
++	{
++		struct dvb_diseqc_master_cmd *cmd = arg;
++		SendDiSEqCMsg (av7110, cmd->msg_len, cmd->msg, -1);
++		break;
++	}
++
++	case FE_DISEQC_SEND_BURST:
++		SendDiSEqCMsg (av7110, 0, NULL, (unsigned long)arg);
++		break;
++
++	default:
++		return -EOPNOTSUPP;
++	};
++
++	return 0;
++}
++
++/******************************************************************************
++ * CI link layer file ops (FIXME: move this to separate module later)
++ ******************************************************************************/
++
++int ci_ll_init(struct dvb_ringbuffer *cirbuf, struct dvb_ringbuffer *ciwbuf, int size)
++{
++        dvb_ringbuffer_init(cirbuf, vmalloc(size), size);
++        dvb_ringbuffer_init(ciwbuf, vmalloc(size), size);
++        return 0;
++}
++
++void ci_ll_flush(struct dvb_ringbuffer *cirbuf, struct dvb_ringbuffer *ciwbuf)
++{
++        dvb_ringbuffer_flush_spinlock_wakeup(cirbuf);
++        dvb_ringbuffer_flush_spinlock_wakeup(ciwbuf);
++}
++
++void ci_ll_release(struct dvb_ringbuffer *cirbuf, struct dvb_ringbuffer *ciwbuf)
++{
++        vfree(cirbuf->data);
++        cirbuf->data=0;
++        vfree(ciwbuf->data);
++        ciwbuf->data=0;
++}
++
++
++int ci_ll_reset(struct dvb_ringbuffer *cibuf, struct file *file, 
++                int slots, ca_slot_info_t *slot)
++{
++	int i;
++	int len=0;
++	u8 msg[8]={0x00,0x06,0,0x00,0xff,0x02,0x00,0x00};
++
++	for (i=0; i<2; i++) {
++		if (slots & (1<<i)) 
++			len+=8;
++	}
++
++	if (dvb_ringbuffer_free(cibuf) < len)
++		return -EBUSY;
++
++	for (i=0; i<2; i++) {
++		if (slots & (1<<i)) {
++			msg[2]=i;
++			dvb_ringbuffer_write(cibuf,msg,8,0);
++			slot[i].flags=0;
++		}
++	}
++
++	return 0;
++}
++
++static ssize_t ci_ll_write(struct dvb_ringbuffer *cibuf, struct file *file, const char *buf, size_t count, loff_t *ppos)
++{
++        int free;
++        int non_blocking=file->f_flags&O_NONBLOCK;
++
++        if (count>2048)
++                return -EINVAL;
++        free=dvb_ringbuffer_free(cibuf);
++        if (count+2>free) { 
++                if (non_blocking)
++                        return -EWOULDBLOCK;
++                if (wait_event_interruptible(cibuf->queue,
++                                             (dvb_ringbuffer_free(cibuf)>=count+2)))
++                        return 0;
++        }
++
++        DVB_RINGBUFFER_WRITE_BYTE(cibuf,count>>8);   
++        DVB_RINGBUFFER_WRITE_BYTE(cibuf,count&0xff); 
++
++        return dvb_ringbuffer_write(cibuf,buf,count,1);
++}
++
++static ssize_t ci_ll_read(struct dvb_ringbuffer *cibuf, struct file *file, char *buf, size_t count, loff_t *ppos)
++{
++	int avail;
++	int non_blocking=file->f_flags&O_NONBLOCK;
++	ssize_t len;
++
++	if (!cibuf->data || !count)
++	        return 0;
++	if (non_blocking && (dvb_ringbuffer_empty(cibuf)))
++	        return -EWOULDBLOCK;
++	if (wait_event_interruptible(cibuf->queue, 
++				     !dvb_ringbuffer_empty(cibuf)))
++		return 0;
++	avail=dvb_ringbuffer_avail(cibuf);
++	if (avail<4) 
++		return 0;
++	len= DVB_RINGBUFFER_PEEK(cibuf,0)<<8;
++	len|=DVB_RINGBUFFER_PEEK(cibuf,1);
++	if (avail<len+2 || count<len) 
++		return -EINVAL;
++	DVB_RINGBUFFER_SKIP(cibuf,2);
++
++	return dvb_ringbuffer_read(cibuf,buf,len,1);
++}
++
++static int dvb_ca_open(struct inode *inode, struct file *file)
++{
++	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
++        struct av7110 *av7110=(struct av7110 *) dvbdev->priv;
++        int err=dvb_generic_open(inode, file);
++
++	DEB_EE(("av7110: %p\n",av7110));
++
++        if (err<0)
++                return err;
++        ci_ll_flush(&av7110->ci_rbuffer, &av7110->ci_wbuffer);
++        return 0;
++}
++
++static unsigned int dvb_ca_poll (struct file *file, poll_table *wait)
++{
++	struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
++        struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
++        struct dvb_ringbuffer *rbuf = &av7110->ci_rbuffer;
++        struct dvb_ringbuffer *wbuf = &av7110->ci_wbuffer;
++        unsigned int mask = 0;
++
++	DEB_EE(("av7110: %p\n",av7110));
++
++        poll_wait (file, &rbuf->queue, wait);
++        
++        if (!dvb_ringbuffer_empty(rbuf))
++                mask |= POLLIN;
++
++	if (dvb_ringbuffer_avail(wbuf)>1024)
++                mask |= POLLOUT;
++
++        return mask;
++}
++
++static int dvb_ca_ioctl(struct inode *inode, struct file *file, 
++                 unsigned int cmd, void *parg)
++{
++	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
++        struct av7110 *av7110=(struct av7110 *) dvbdev->priv;
++        unsigned long arg=(unsigned long) parg;
++
++	DEB_EE(("av7110: %p\n",av7110));
++
++        switch (cmd) {
++        case CA_RESET:
++#ifdef NEW_CI
++                
++                return ci_ll_reset(&av7110->ci_wbuffer, file, arg, &av7110->ci_slot[0]);
++#endif                        
++                break;
++                
++        case CA_GET_CAP:
++        {
++                ca_caps_t cap;
++                
++                cap.slot_num=2;
++#ifdef NEW_CI
++                cap.slot_type=(FW_CI_LL_SUPPORT(av7110->arm_app) ? CA_CI_LINK : CA_CI) | CA_DESCR;
++#else
++                cap.slot_type=CA_CI|CA_DESCR;
++#endif
++                cap.descr_num=16;
++                cap.descr_type=CA_ECD;
++                memcpy(parg, &cap, sizeof(cap));
++        }
++        break;
++
++        case CA_GET_SLOT_INFO:
++        {
++                ca_slot_info_t *info=(ca_slot_info_t *)parg;
++
++                if (info->num>1)
++                        return -EINVAL;
++                av7110->ci_slot[info->num].num = info->num;
++#ifdef NEW_CI
++                av7110->ci_slot[info->num].type = FW_CI_LL_SUPPORT(av7110->arm_app) ? CA_CI_LINK : CA_CI;
++#else
++                av7110->ci_slot[info->num].type = CA_CI;
++#endif
++                memcpy(info, &av7110->ci_slot[info->num], sizeof(ca_slot_info_t));
++        }
++        break;
++
++        case CA_GET_MSG:
++                break;
++
++        case CA_SEND_MSG:
++                break;
++                
++        case CA_GET_DESCR_INFO:
++        {
++                ca_descr_info_t info;
++
++                info.num=16;
++                info.type=CA_ECD;
++                memcpy (parg, &info, sizeof (info));
++        }
++        break;
++
++        case CA_SET_DESCR:
++        {
++                ca_descr_t *descr=(ca_descr_t*) parg;
++
++                if (descr->index>=16)
++                        return -EINVAL;
++                if (descr->parity>1)
++                        return -EINVAL;
++                outcom(av7110, COMTYPE_PIDFILTER, SetDescr, 5,
++                       (descr->index<<8)|descr->parity,
++                       (descr->cw[0]<<8)|descr->cw[1],
++                       (descr->cw[2]<<8)|descr->cw[3],
++                       (descr->cw[4]<<8)|descr->cw[5],
++                       (descr->cw[6]<<8)|descr->cw[7]);
++        }
++        break;
++
++        default:
++                return -EINVAL;
++        }
++        return 0;
++}
++
++static ssize_t dvb_ca_write(struct file *file, const char *buf, 
++             size_t count, loff_t *ppos)
++{
++	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
++        struct av7110 *av7110=(struct av7110 *) dvbdev->priv;
++        
++	DEB_EE(("av7110: %p\n",av7110));
++        return ci_ll_write(&av7110->ci_wbuffer, file, buf, count, ppos);
++}
++
++static ssize_t dvb_ca_read(struct file *file, char *buf, size_t count, loff_t *ppos)
++{
++	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
++        struct av7110 *av7110=(struct av7110 *) dvbdev->priv;
++
++	DEB_EE(("av7110: %p\n",av7110));
++        return ci_ll_read(&av7110->ci_rbuffer, file, buf, count, ppos);
++}
++
++
++
++/******************************************************************************
++ * Video MPEG decoder events
++ ******************************************************************************/
++static void dvb_video_add_event (struct av7110 *av7110, struct video_event *event)
++{
++	struct dvb_video_events *events = &av7110->video_events;
++	int wp;
++
++	DEB_D(("\n"));
++
++	spin_lock_bh(&events->lock);
++
++	wp = (events->eventw + 1) % MAX_VIDEO_EVENT;
++
++	if (wp == events->eventr) {
++		events->overflow = 1;
++		events->eventr = (events->eventr + 1) % MAX_VIDEO_EVENT;
++	}
++
++	//FIXME: timestamp?
++	memcpy(&events->events[events->eventw], event, sizeof(struct video_event));
++
++	events->eventw = wp;
++
++	spin_unlock_bh(&events->lock);
++
++	wake_up_interruptible (&events->wait_queue);
++}
++
++
++static int dvb_video_get_event (struct av7110 *av7110, struct video_event *event, int flags)
++{
++	struct dvb_video_events *events = &av7110->video_events;
++
++	DEB_D(("\n"));
++
++	if (events->overflow) {
++                events->overflow = 0;
++                return -EOVERFLOW;
++        }
++
++        if (events->eventw == events->eventr) {
++		int ret;
++
++                if (flags & O_NONBLOCK)
++                        return -EWOULDBLOCK;
++
++                ret = wait_event_interruptible (events->wait_queue,
++                                                events->eventw != events->eventr);
++                if (ret < 0)
++                        return ret;
++        }
++
++	spin_lock_bh(&events->lock);
++
++	memcpy (event, &events->events[events->eventr],
++		sizeof(struct video_event));
++
++        events->eventr = (events->eventr + 1) % MAX_VIDEO_EVENT;
++
++	spin_unlock_bh(&events->lock);
++
++        return 0;
++}
++
++
++/******************************************************************************
++ * DVB device file operations
++ ******************************************************************************/
++
++static unsigned int dvb_video_poll(struct file *file, poll_table *wait)
++{
++	struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
++        struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
++        unsigned int mask = 0;
++
++	DEB_EE(("av7110: %p\n",av7110));
++
++	if ((file->f_flags & O_ACCMODE) != O_RDONLY) {
++	poll_wait(file, &av7110->avout.queue, wait);
++	}
++	
++	poll_wait(file, &av7110->video_events.wait_queue, wait);
++
++	if (av7110->video_events.eventw != av7110->video_events.eventr)
++		mask = POLLPRI;
++
++	if ((file->f_flags & O_ACCMODE) != O_RDONLY) {
++	if (av7110->playing) {
++                if (FREE_COND)
++                        mask |= (POLLOUT | POLLWRNORM);
++        } else /* if not playing: may play if asked for */
++                mask |= (POLLOUT | POLLWRNORM);
++	}
++
++        return mask;
++}
++
++static ssize_t dvb_video_write(struct file *file, const char *buf, 
++                size_t count, loff_t *ppos)
++{
++	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
++        struct av7110 *av7110=(struct av7110 *) dvbdev->priv;
++
++	DEB_EE(("av7110: %p\n",av7110));
++
++	if ((file->f_flags & O_ACCMODE) == O_RDONLY) {
++		return -EPERM;
++	}
++
++        if (av7110->videostate.stream_source!=VIDEO_SOURCE_MEMORY) 
++                return -EPERM;
++
++	return dvb_play(av7110, buf, count, file->f_flags&O_NONBLOCK, 1, 1);
++}
++
++static ssize_t dvb_audio_write(struct file *file, const char *buf, 
++                size_t count, loff_t *ppos)
++{
++	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
++        struct av7110 *av7110=(struct av7110 *) dvbdev->priv;
++
++	DEB_EE(("av7110: %p\n",av7110));
++
++        if (av7110->audiostate.stream_source!=AUDIO_SOURCE_MEMORY) {
++                printk(KERN_ERR "not audio source memory\n");
++                return -EPERM;
++        }
++        return dvb_aplay(av7110, buf, count, file->f_flags&O_NONBLOCK, 0);
++}
++
++u8 iframe_header[] = { 0x00, 0x00, 0x01, 0xe0, 0x00, 0x00, 0x80, 0x00, 0x00 };
++
++#define MIN_IFRAME 400000
++
++static int play_iframe(struct av7110 *av7110, u8 *buf, unsigned int len, int nonblock)
++{
++        int i, n=1;
++       
++	DEB_EE(("av7110: %p\n",av7110));
++
++        if (!(av7110->playing&RP_VIDEO)) {
++                if (AV_StartPlay(av7110, RP_VIDEO) < 0)
++			return -EBUSY;
++                n=MIN_IFRAME/len+1;
++        }
++
++	/* setting n always > 1, fixes problems when playing stillframes
++	   consisting of I- and P-Frames */
++	n=MIN_IFRAME/len+1;
++	
++	/* FIXME: nonblock? */
++	dvb_play(av7110, iframe_header, sizeof(iframe_header), 0, 1, 0);
++
++	for (i=0; i<n; i++) 
++                dvb_play(av7110, buf, len, 0, 1, 1);
++
++	av7110_ipack_flush(&av7110->ipack[1]);
++	return 0;
++}
++
++
++static int dvb_video_ioctl(struct inode *inode, struct file *file,
++            unsigned int cmd, void *parg)
++{
++	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
++        struct av7110 *av7110=(struct av7110 *) dvbdev->priv;
++        unsigned long arg=(unsigned long) parg;
++        int ret=0;
++        
++	DEB_EE(("av7110: %p\n",av7110));
++
++        if ((file->f_flags&O_ACCMODE)==O_RDONLY) {
++		if ( cmd!=VIDEO_GET_STATUS && cmd!=VIDEO_GET_EVENT && 
++		     cmd!=VIDEO_GET_SIZE ) {
++                return -EPERM;
++		}
++	}
++        
++        switch (cmd) {
++        case VIDEO_STOP:
++                av7110->videostate.play_state=VIDEO_STOPPED;
++                if (av7110->videostate.stream_source==VIDEO_SOURCE_MEMORY)
++                        AV_Stop(av7110, RP_VIDEO);
++                else
++                        vidcom(av7110, 0x000e, 
++                               av7110->videostate.video_blank ? 0 : 1);
++                av7110->trickmode=TRICK_NONE;
++                break; 
++                
++        case VIDEO_PLAY:
++                av7110->trickmode=TRICK_NONE;
++                if (av7110->videostate.play_state==VIDEO_FREEZED) {
++                        av7110->videostate.play_state=VIDEO_PLAYING;
++                        vidcom(av7110, 0x000d, 0);
++                } 
++                
++                if (av7110->videostate.stream_source==VIDEO_SOURCE_MEMORY) {
++                        if (av7110->playing==RP_AV) {
++                                outcom(av7110, COMTYPE_REC_PLAY, __Stop, 0);
++                                av7110->playing&=~RP_VIDEO;
++                        }
++                        AV_StartPlay(av7110,RP_VIDEO);
++                        vidcom(av7110, 0x000d, 0);
++                } else {
++                        //AV_Stop(av7110, RP_VIDEO);
++                        vidcom(av7110, 0x000d, 0);
++                }
++                av7110->videostate.play_state=VIDEO_PLAYING;
++                break;
++                
++        case VIDEO_FREEZE:
++                av7110->videostate.play_state=VIDEO_FREEZED;
++                if (av7110->playing&RP_VIDEO) 
++                        outcom(av7110, COMTYPE_REC_PLAY, __Pause, 0);
++                else
++                        vidcom(av7110, 0x0102, 1);
++                av7110->trickmode=TRICK_FREEZE;
++                break;
++                
++        case VIDEO_CONTINUE:
++                if (av7110->playing&RP_VIDEO) 
++                        outcom(av7110, COMTYPE_REC_PLAY, __Continue, 0);
++                vidcom(av7110, 0x000d, 0);
++                av7110->videostate.play_state=VIDEO_PLAYING;
++                av7110->trickmode=TRICK_NONE;
++                break;
++                
++        case VIDEO_SELECT_SOURCE:
++                av7110->videostate.stream_source=(video_stream_source_t) arg;
++                break;
++                
++        case VIDEO_SET_BLANK:
++                av7110->videostate.video_blank=(int) arg;
++		break;
++                
++        case VIDEO_GET_STATUS:
++                memcpy(parg, &av7110->videostate, sizeof(struct video_status));
++                break;
++                
++        case VIDEO_GET_EVENT:
++                ret=dvb_video_get_event(av7110, parg, file->f_flags);
++		break;
++
++	case VIDEO_GET_SIZE:
++                memcpy(parg, &av7110->video_size, sizeof(video_size_t));
++		break;
++                
++        case VIDEO_SET_DISPLAY_FORMAT:
++        {
++                video_displayformat_t format=(video_displayformat_t) arg;
++                u16 val=0;
++                
++                switch(format) {
++                case VIDEO_PAN_SCAN:
++                        val=VID_PAN_SCAN_PREF;
++                        break;
++                        
++                case VIDEO_LETTER_BOX:
++                        val=VID_VC_AND_PS_PREF;
++                        break;
++                        
++                case VIDEO_CENTER_CUT_OUT:
++                        val=VID_CENTRE_CUT_PREF;
++                        break;
++                        
++                default:
++                        ret=-EINVAL;
++                        break;
++                }
++                if (ret<0)
++                        break;
++                av7110->videostate.video_format=format;
++                ret=outcom(av7110, COMTYPE_ENCODER, SetPanScanType, 
++                           1, (u16) val);
++                break;
++        }
++        
++        case VIDEO_SET_FORMAT:
++                if (arg>1) {
++                        ret=-EINVAL;
++                        break;
++                }
++                av7110->display_ar=arg;
++                ret=outcom(av7110, COMTYPE_ENCODER, SetMonitorType, 
++                           1, (u16) arg);
++                break;
++                
++        case VIDEO_STILLPICTURE:
++        { 
++                struct video_still_picture *pic=
++                        (struct video_still_picture *) parg;
++                av7110->videostate.stream_source = VIDEO_SOURCE_MEMORY;
++                dvb_ringbuffer_flush_spinlock_wakeup(&av7110->avout);
++                ret = play_iframe(av7110, pic->iFrame, pic->size,
++                            file->f_flags&O_NONBLOCK);
++                break;
++        }
++        
++        case VIDEO_FAST_FORWARD:
++                //note: arg is ignored by firmware
++                if (av7110->playing&RP_VIDEO) 
++                        outcom(av7110, COMTYPE_REC_PLAY, 
++                               __Scan_I, 2, AV_PES, 0);
++                else 
++                        vidcom(av7110, 0x16, arg); 
++                av7110->trickmode=TRICK_FAST;
++                av7110->videostate.play_state=VIDEO_PLAYING;
++                break;
++                
++        case VIDEO_SLOWMOTION:
++                if (av7110->playing&RP_VIDEO) {
++                        outcom(av7110, COMTYPE_REC_PLAY, __Slow, 2, 0, 0);
++                        vidcom(av7110, 0x22, arg);
++                } else {
++                        vidcom(av7110, 0x0d, 0);
++                        vidcom(av7110, 0x0e, 0);
++                        vidcom(av7110, 0x22, arg);
++                }
++                av7110->trickmode=TRICK_SLOW;
++                av7110->videostate.play_state=VIDEO_PLAYING;
++                break;
++                
++        case VIDEO_GET_CAPABILITIES:
++                *(int *)parg=VIDEO_CAP_MPEG1|
++                        VIDEO_CAP_MPEG2|
++                        VIDEO_CAP_SYS|
++                        VIDEO_CAP_PROG;
++                break;
++        
++        case VIDEO_CLEAR_BUFFER:
++                dvb_ringbuffer_flush_spinlock_wakeup(&av7110->avout);
++                av7110_ipack_reset(&av7110->ipack[1]);
++                
++                if (av7110->playing==RP_AV) {
++                        outcom(av7110, COMTYPE_REC_PLAY, 
++                               __Play, 2, AV_PES, 0);
++                        if (av7110->trickmode==TRICK_FAST)
++                                outcom(av7110, COMTYPE_REC_PLAY, 
++                                       __Scan_I, 2, AV_PES, 0);
++                        if (av7110->trickmode==TRICK_SLOW) {
++                                outcom(av7110, COMTYPE_REC_PLAY, __Slow, 2, 0, 0);
++                                vidcom(av7110, 0x22, arg);
++                        }
++                        if (av7110->trickmode==TRICK_FREEZE)
++                                vidcom(av7110, 0x000e, 1);
++                }
++                break;
++                
++        case VIDEO_SET_STREAMTYPE:
++                
++                break;
++                
++        default:
++                ret=-ENOIOCTLCMD;
++                break;
++        }
++        return ret;
++}
++
++static int dvb_audio_ioctl(struct inode *inode, struct file *file,
++            unsigned int cmd, void *parg)
++{
++	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
++        struct av7110 *av7110=(struct av7110 *) dvbdev->priv;
++        unsigned long arg=(unsigned long) parg;
++        int ret=0;
++
++	DEB_EE(("av7110: %p\n",av7110));
++
++        if (((file->f_flags&O_ACCMODE)==O_RDONLY) &&
++            (cmd!=AUDIO_GET_STATUS))
++                return -EPERM;
++        
++        switch (cmd) {
++        case AUDIO_STOP:
++                if (av7110->audiostate.stream_source==AUDIO_SOURCE_MEMORY)
++                        AV_Stop(av7110, RP_AUDIO);
++                else
++                        audcom(av7110, 1);
++                av7110->audiostate.play_state=AUDIO_STOPPED;
++                break;
++                
++        case AUDIO_PLAY:
++                if (av7110->audiostate.stream_source==AUDIO_SOURCE_MEMORY)
++                        AV_StartPlay(av7110, RP_AUDIO);
++                audcom(av7110, 2);
++                av7110->audiostate.play_state=AUDIO_PLAYING;
++                break;
++                
++        case AUDIO_PAUSE:
++                audcom(av7110, 1);
++                av7110->audiostate.play_state=AUDIO_PAUSED;
++                break;
++                
++        case AUDIO_CONTINUE:
++                if (av7110->audiostate.play_state==AUDIO_PAUSED) {
++                        av7110->audiostate.play_state=AUDIO_PLAYING;
++                        audcom(av7110, 0x12);
++                } 
++                break;
++                
++        case AUDIO_SELECT_SOURCE:
++                av7110->audiostate.stream_source=(audio_stream_source_t) arg;
++                break;
++                
++        case AUDIO_SET_MUTE:
++        {
++                audcom(av7110, arg ? 1 : 2);
++                av7110->audiostate.mute_state=(int) arg;
++                break;
++        }
++        
++        case AUDIO_SET_AV_SYNC:
++                av7110->audiostate.AV_sync_state=(int) arg;
++                audcom(av7110, arg ? 0x0f : 0x0e);
++                break;
++                
++        case AUDIO_SET_BYPASS_MODE:
++                ret=-EINVAL;
++                break;
++                
++        case AUDIO_CHANNEL_SELECT:
++                av7110->audiostate.channel_select=(audio_channel_select_t) arg;
++                
++                switch(av7110->audiostate.channel_select) {
++                case AUDIO_STEREO:
++                        audcom(av7110, 0x80);
++                        break;
++                        
++                case AUDIO_MONO_LEFT:
++                        audcom(av7110, 0x100);
++                        break;
++                        
++                case AUDIO_MONO_RIGHT:
++                        audcom(av7110, 0x200);
++                        break;
++                        
++                default:
++                        ret=-EINVAL;
++                        break;
++                }
++                break;
++                
++        case AUDIO_GET_STATUS:
++                memcpy(parg, &av7110->audiostate, sizeof(struct audio_status));
++                break;
++                
++        case AUDIO_GET_CAPABILITIES:
++                *(int *)parg=AUDIO_CAP_LPCM|
++                        AUDIO_CAP_MP1|
++                        AUDIO_CAP_MP2;
++                break;
++
++        case AUDIO_CLEAR_BUFFER:
++                dvb_ringbuffer_flush_spinlock_wakeup(&av7110->aout);
++                av7110_ipack_reset(&av7110->ipack[0]);
++                if (av7110->playing==RP_AV)
++                        outcom(av7110, COMTYPE_REC_PLAY, 
++                               __Play, 2, AV_PES, 0);
++                break;
++        case AUDIO_SET_ID:
++                
++                break;
++        case AUDIO_SET_MIXER:
++        {
++                struct audio_mixer *amix=(struct audio_mixer *)parg;
++
++                SetVolume(av7110, amix->volume_left, amix->volume_right);
++                break;
++        }
++        case AUDIO_SET_STREAMTYPE:
++                break;
++        default:
++                ret=-ENOIOCTLCMD;
++                break;
++        }
++        return ret;
++}
++
++
++static int dvb_video_open(struct inode *inode, struct file *file)
++{
++	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
++        struct av7110 *av7110=(struct av7110 *) dvbdev->priv;
++        int err;
++
++	DEB_EE(("av7110: %p\n",av7110));
++
++        if ((err=dvb_generic_open(inode, file))<0)
++                return err;
++
++	if ((file->f_flags & O_ACCMODE) != O_RDONLY) {
++        dvb_ringbuffer_flush_spinlock_wakeup(&av7110->aout);
++        dvb_ringbuffer_flush_spinlock_wakeup(&av7110->avout);
++        av7110->video_blank=1;
++        av7110->audiostate.AV_sync_state=1;
++        av7110->videostate.stream_source=VIDEO_SOURCE_DEMUX;
++
++		/*  empty event queue */
++		av7110->video_events.eventr = av7110->video_events.eventw = 0;
++	}
++
++        return 0;
++}
++
++static int dvb_video_release(struct inode *inode, struct file *file)
++{
++	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
++        struct av7110 *av7110=(struct av7110 *) dvbdev->priv;
++
++	DEB_EE(("av7110: %p\n",av7110));
++
++	if ((file->f_flags & O_ACCMODE) != O_RDONLY) {
++        AV_Stop(av7110, RP_VIDEO);
++	}
++
++        return dvb_generic_release(inode, file);
++}
++
++static int dvb_audio_open(struct inode *inode, struct file *file)
++{
++	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
++        struct av7110 *av7110=(struct av7110 *) dvbdev->priv;
++        int err=dvb_generic_open(inode, file);
++
++	DEB_EE(("av7110: %p\n",av7110));
++
++        if (err<0)
++                return err;
++        dvb_ringbuffer_flush_spinlock_wakeup(&av7110->aout);
++        av7110->audiostate.stream_source=AUDIO_SOURCE_DEMUX;
++        return 0;
++}
++
++static int dvb_audio_release(struct inode *inode, struct file *file)
++{
++	struct dvb_device *dvbdev=(struct dvb_device *) file->private_data;
++        struct av7110 *av7110=(struct av7110 *) dvbdev->priv;
++        
++	DEB_EE(("av7110: %p\n",av7110));
++
++        AV_Stop(av7110, RP_AUDIO);
++        return dvb_generic_release(inode, file);
++}
++
++
++
++/******************************************************************************
++ * driver registration 
++ ******************************************************************************/
++
++static struct file_operations dvb_video_fops = {
++	.owner		= THIS_MODULE,
++	.write		= dvb_video_write,
++	.ioctl		= dvb_generic_ioctl,
++	.open		= dvb_video_open,
++	.release	= dvb_video_release,
++	.poll		= dvb_video_poll,
++};
++
++static struct dvb_device dvbdev_video = {
++	.priv		= 0,
++	.users		= 6,
++	.readers	= 5,	/* arbitrary */
++	.writers	= 1,
++	.fops		= &dvb_video_fops,
++	.kernel_ioctl	= dvb_video_ioctl,
++};
++
++static struct file_operations dvb_audio_fops = {
++	.owner		= THIS_MODULE,
++	.write		= dvb_audio_write,
++	.ioctl		= dvb_generic_ioctl,
++	.open		= dvb_audio_open,
++	.release	= dvb_audio_release,
++	.poll		= dvb_audio_poll,
++};
++
++static struct dvb_device dvbdev_audio = {
++	.priv		= 0,
++	.users		= 1,
++	.writers	= 1,
++	.fops		= &dvb_audio_fops,
++	.kernel_ioctl	= dvb_audio_ioctl,
++};
++
++static struct file_operations dvb_ca_fops = {
++	.owner		= THIS_MODULE,
++	.read		= dvb_ca_read,
++	.write		= dvb_ca_write,
++	.ioctl		= dvb_generic_ioctl,
++	.open		= dvb_ca_open,
++	.release	= dvb_generic_release,
++	.poll		= dvb_ca_poll,
++};
++
++static struct dvb_device dvbdev_ca = {
++	.priv		= 0,
++	.users		= 1,
++	.writers	= 1,
++	.fops		= &dvb_ca_fops,
++	.kernel_ioctl	= dvb_ca_ioctl,
++};
++
++
++static void av7110_before_after_tune (fe_status_t s, void *data)
++{
++	struct av7110 *av7110 = data;
++
++	DEB_EE(("av7110: %p\n",av7110));
++
++        av7110->fe_synced = (s & FE_HAS_LOCK) ? 1 : 0;
++
++        if (av7110->playing)
++                return;
++
++        if (down_interruptible(&av7110->pid_mutex))
++                return;
++
++	if (av7110->fe_synced) {
++                SetPIDs(av7110, av7110->pids[DMX_PES_VIDEO], 
++                        av7110->pids[DMX_PES_AUDIO], 
++                        av7110->pids[DMX_PES_TELETEXT], 0, 
++                        av7110->pids[DMX_PES_PCR]);
++        	outcom(av7110, COMTYPE_PIDFILTER, Scan, 0);
++	} else {
++		SetPIDs(av7110, 0, 0, 0, 0, 0);
++        	outcom(av7110, COMTYPE_PIDFILTER, FlushTSQueue, 0);
++	}
++
++        up(&av7110->pid_mutex);
++}
++
++
++static int av7110_register(struct av7110 *av7110)
++{
++        int ret, i;
++        struct dvb_demux *dvbdemux=&av7110->demux;
++
++	DEB_EE(("av7110: %p\n",av7110));
++
++        if (av7110->registered)
++                return -1;
++
++        av7110->registered=1;
++
++	dvb_add_frontend_notifier (av7110->dvb_adapter,
++				   av7110_before_after_tune, av7110);
++
++	/**
++	 *   init DiSEqC stuff
++	 */
++	dvb_add_frontend_ioctls (av7110->dvb_adapter,
++				 av7110_diseqc_ioctl, NULL, av7110);
++
++	av7110->audiostate.AV_sync_state=0;
++	av7110->audiostate.mute_state=0;
++	av7110->audiostate.play_state=AUDIO_STOPPED;
++	av7110->audiostate.stream_source=AUDIO_SOURCE_DEMUX;
++	av7110->audiostate.channel_select=AUDIO_STEREO;
++	av7110->audiostate.bypass_mode=0;
++
++	av7110->videostate.video_blank=0;
++	av7110->videostate.play_state=VIDEO_STOPPED;
++	av7110->videostate.stream_source=VIDEO_SOURCE_DEMUX;
++	av7110->videostate.video_format=VIDEO_FORMAT_4_3;
++	av7110->videostate.display_format=VIDEO_CENTER_CUT_OUT;
++        av7110->display_ar=VIDEO_FORMAT_4_3;
++
++        dvbdemux->priv = (void *) av7110;
++
++	for (i=0; i<32; i++)
++		av7110->handle2filter[i]=NULL;
++
++	dvbdemux->filternum = 32;
++	dvbdemux->feednum = 32;
++	dvbdemux->start_feed = av7110_start_feed;
++	dvbdemux->stop_feed = av7110_stop_feed;
++	dvbdemux->write_to_decoder = av7110_write_to_decoder;
++	dvbdemux->dmx.capabilities = (DMX_TS_FILTERING | DMX_SECTION_FILTERING |
++				      DMX_MEMORY_BASED_FILTERING);
++
++	dvb_dmx_init(&av7110->demux);
++	av7110->demux.dmx.get_stc = dvb_get_stc;
++
++	av7110->dmxdev.filternum = 32;
++	av7110->dmxdev.demux = &dvbdemux->dmx;
++	av7110->dmxdev.capabilities = 0;
++        
++	dvb_dmxdev_init(&av7110->dmxdev, av7110->dvb_adapter);
++
++        av7110->hw_frontend.source = DMX_FRONTEND_0;
++
++        ret = dvbdemux->dmx.add_frontend(&dvbdemux->dmx, &av7110->hw_frontend);
++
++        if (ret < 0)
++                return ret;
++        
++        av7110->mem_frontend.source = DMX_MEMORY_FE;
++
++	ret = dvbdemux->dmx.add_frontend(&dvbdemux->dmx, &av7110->mem_frontend);
++
++	if (ret < 0)
++                return ret;
++        
++        ret = dvbdemux->dmx.connect_frontend(&dvbdemux->dmx, 
++					     &av7110->hw_frontend);
++        if (ret < 0)
++                return ret;
++
++	init_waitqueue_head(&av7110->video_events.wait_queue);
++	spin_lock_init(&av7110->video_events.lock);
++	av7110->video_events.eventw = av7110->video_events.eventr = 0;
++	av7110->video_events.overflow = 0;
++	memset(&av7110->video_size, 0, sizeof (video_size_t));
++
++	dvb_register_device(av7110->dvb_adapter, &av7110->video_dev,
++			    &dvbdev_video, av7110, DVB_DEVICE_VIDEO);
++          
++	dvb_register_device(av7110->dvb_adapter, &av7110->audio_dev,
++			    &dvbdev_audio, av7110, DVB_DEVICE_AUDIO);
++  
++	dvb_register_device(av7110->dvb_adapter, &av7110->ca_dev,  
++                                    &dvbdev_ca, av7110, DVB_DEVICE_CA);
++#ifdef CONFIG_DVB_AV7110_OSD
++	dvb_register_device(av7110->dvb_adapter, &av7110->osd_dev,
++			    &dvbdev_osd, av7110, DVB_DEVICE_OSD);
++#endif
++#ifdef USE_DVB_DSP
++                dvb->dsp_dev = dvb_register_dsp(dvb_audio_open, 
++                                                dvb_audio_release, 
++                                                dvb_audio_ioctl, 
++                                                dvb_audio_write, 
++                                                av7110->audio_dev);
++#endif
++//        }
++        
++        dvb_net_init(av7110->dvb_adapter, &av7110->dvb_net, &dvbdemux->dmx);
++
++	return 0;
++}
++
++
++static void dvb_unregister(struct av7110 *av7110)
++{
++        struct dvb_demux *dvbdemux=&av7110->demux;
++
++	DEB_EE(("av7110: %p\n",av7110));
++
++        if (!av7110->registered)
++                return;
++
++	dvb_net_release(&av7110->dvb_net);
++
++	dvbdemux->dmx.close(&dvbdemux->dmx);
++        dvbdemux->dmx.remove_frontend(&dvbdemux->dmx, &av7110->hw_frontend);
++        dvbdemux->dmx.remove_frontend(&dvbdemux->dmx, &av7110->mem_frontend);
++
++        dvb_dmxdev_release(&av7110->dmxdev);
++        dvb_dmx_release(&av7110->demux);
++
++	dvb_remove_frontend_notifier (av7110->dvb_adapter,
++				      av7110_before_after_tune);
++
++	dvb_remove_frontend_ioctls (av7110->dvb_adapter,
++				    av7110_diseqc_ioctl, NULL);
++
++	dvb_unregister_device(av7110->audio_dev);
++	dvb_unregister_device(av7110->video_dev);
++	dvb_unregister_device(av7110->osd_dev);
++	dvb_unregister_device(av7110->ca_dev);
++#ifdef USE_DVB_DSP
++	dvb_unregister_dsp(av7110->dsp_dev);
++#endif
++//        }
++}
++
++static int master_xfer (struct dvb_i2c_bus *i2c, const struct i2c_msg msgs[], int num)
++{
++	struct saa7146_dev *dev = i2c->data;
++	return saa7146_i2c_transfer(dev, msgs, num, 6);
++}
++
++/****************************************************************************
++ * INITIALIZATION
++ ****************************************************************************/
++
++struct saa7146_extension_ioctls ioctls[] = {
++	{ VIDIOC_ENUMINPUT, 	SAA7146_EXCLUSIVE },
++	{ VIDIOC_G_INPUT,	SAA7146_EXCLUSIVE },
++	{ VIDIOC_S_INPUT,	SAA7146_EXCLUSIVE },
++	{ VIDIOC_G_FREQUENCY,	SAA7146_EXCLUSIVE },
++	{ VIDIOC_S_FREQUENCY, 	SAA7146_EXCLUSIVE },
++	{ VIDIOC_G_TUNER, 	SAA7146_EXCLUSIVE },
++	{ VIDIOC_S_TUNER, 	SAA7146_EXCLUSIVE },
++	{ VIDIOC_G_AUDIO,	SAA7146_EXCLUSIVE },
++	{ VIDIOC_S_AUDIO,	SAA7146_EXCLUSIVE },
++	{ 0, 0 }
++};
++
++static u8 saa7113_init_regs[] = {
++	0x02, 0xd0,
++	0x03, 0x23,
++	0x04, 0x00,
++	0x05, 0x00,
++	0x06, 0xe9,
++	0x07, 0x0d,
++	0x08, 0x98,
++	0x09, 0x02,
++	0x0a, 0x80,
++	0x0b, 0x40,
++	0x0c, 0x40,
++	0x0d, 0x00,
++	0x0e, 0x01,
++	0x0f, 0x7c,
++	0x10, 0x48,
++	0x11, 0x0c,
++	0x12, 0x8b,
++	0x13, 0x1a,
++	0x14, 0x00,
++	0x15, 0x00,
++	0x16, 0x00,
++	0x17, 0x00,
++	0x18, 0x00,
++	0x19, 0x00,
++	0x1a, 0x00,
++	0x1b, 0x00,
++	0x1c, 0x00,
++	0x1d, 0x00,
++	0x1e, 0x00,
++
++	0x41, 0x77,
++	0x42, 0x77,
++	0x43, 0x77,
++	0x44, 0x77,
++	0x45, 0x77,
++	0x46, 0x77,
++	0x47, 0x77,
++	0x48, 0x77,
++	0x49, 0x77,
++	0x4a, 0x77,
++	0x4b, 0x77,
++	0x4c, 0x77,
++	0x4d, 0x77,
++	0x4e, 0x77,
++	0x4f, 0x77,
++	0x50, 0x77,
++	0x51, 0x77,
++	0x52, 0x77,
++	0x53, 0x77,
++	0x54, 0x77,
++	0x55, 0x77,
++	0x56, 0x77,
++	0x57, 0xff,
++	
++	0xff
++};
++
++
++static struct saa7146_ext_vv av7110_vv_data_st;
++static struct saa7146_ext_vv av7110_vv_data_c;
++
++static int av7110_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_data *pci_ext)
++{
++	struct av7110 *av7110 = NULL;
++	int ret = 0;
++	
++	if (!(av7110 = kmalloc (sizeof (struct av7110), GFP_KERNEL))) {
++		printk ("%s: out of memory!\n", __FUNCTION__);
++		return -ENOMEM;
++	}
++
++	memset(av7110, 0, sizeof(struct av7110));
++
++	av7110->card_name = (char*)pci_ext->ext_priv;
++	(struct av7110*)dev->ext_priv = av7110;
++
++	DEB_EE(("dev: %p, av7110: %p\n",dev,av7110));
++
++	av7110->dev=(struct saa7146_dev *)dev;
++	dvb_register_adapter(&av7110->dvb_adapter, av7110->card_name);
++
++	/* the Siemens DVB needs this if you want to have the i2c chips
++	   get recognized before the main driver is fully loaded */
++	saa7146_write(dev, GPIO_CTRL, 0x500000);
++
++	saa7146_i2c_adapter_prepare(dev, NULL, SAA7146_I2C_BUS_BIT_RATE_120); /* 275 kHz */
++
++	av7110->i2c_bus = dvb_register_i2c_bus (master_xfer, dev,
++						av7110->dvb_adapter, 0);
++
++	if (!av7110->i2c_bus) {
++		dvb_unregister_adapter (av7110->dvb_adapter);
++		kfree(av7110);
++		return -ENOMEM;
++	}
++
++	ttpci_eeprom_parse_mac(av7110->i2c_bus);
++
++	saa7146_write(dev, PCI_BT_V1, 0x1c00101f);
++	saa7146_write(dev, BCS_CTRL, 0x80400040);
++
++	/* set dd1 stream a & b */
++      	saa7146_write(dev, DD1_STREAM_B, 0x00000000);
++	saa7146_write(dev, DD1_INIT, 0x03000000);
++	saa7146_write(dev, MC2, (MASK_09 | MASK_25 | MASK_10 | MASK_26));
++
++	/* upload all */
++	saa7146_write(dev, MC2, 0x077c077c);
++        saa7146_write(dev, GPIO_CTRL, 0x000000);
++
++	tasklet_init (&av7110->debi_tasklet, debiirq, (unsigned long) av7110);
++	tasklet_init (&av7110->gpio_tasklet, gpioirq, (unsigned long) av7110);
++
++        sema_init(&av7110->pid_mutex, 1);
++
++        /* locks for data transfers from/to AV7110 */
++        spin_lock_init (&av7110->debilock);
++        sema_init(&av7110->dcomlock, 1);
++        av7110->debilock=SPIN_LOCK_UNLOCKED;
++        av7110->debitype=-1;
++
++        /* default OSD window */
++        av7110->osdwin=1;
++
++        /* ARM "watchdog" */
++	init_waitqueue_head(&av7110->arm_wait);
++        av7110->arm_thread=0;
++     
++        av7110->vidmode=VIDEO_MODE_PAL;
++
++        av7110_ipack_init(&av7110->ipack[0], IPACKS, play_audio_cb);
++        av7110->ipack[0].data=(void *) av7110;
++        av7110_ipack_init(&av7110->ipack[1], IPACKS, play_video_cb);
++        av7110->ipack[1].data=(void *) av7110;
++        
++
++        /* allocate and init buffers */
++        av7110->debi_virt = pci_alloc_consistent(dev->pci, 8192,
++						 &av7110->debi_bus);
++	if (!av7110->debi_virt) {
++		ret = -ENOMEM;
++                goto err;
++	}
++
++        av7110->iobuf = vmalloc(AVOUTLEN+AOUTLEN+BMPLEN+4*IPACKS);
++	if (!av7110->iobuf) {
++		ret = -ENOMEM;
++                goto err;
++	}
++
++        dvb_ringbuffer_init(&av7110->avout, av7110->iobuf, AVOUTLEN);
++        dvb_ringbuffer_init(&av7110->aout, av7110->iobuf+AVOUTLEN, AOUTLEN);
++
++        /* init BMP buffer */
++        av7110->bmpbuf=av7110->iobuf+AVOUTLEN+AOUTLEN;
++        init_waitqueue_head(&av7110->bmpq);
++        
++        av7110->kbuf[0]=(u8 *)(av7110->iobuf+AVOUTLEN+AOUTLEN+BMPLEN);
++        av7110->kbuf[1]=av7110->kbuf[0]+2*IPACKS;
++
++        /* CI link layer buffers */
++        ci_ll_init(&av7110->ci_rbuffer, &av7110->ci_wbuffer, 8192);
++
++        /* handle different card types */
++
++        /* load firmware into AV7110 cards */
++
++	bootarm(av7110);
++	firmversion(av7110);
++
++	if (FW_VERSION(av7110->arm_app)<0x2501)
++		printk ("av7110: Warning, firmware version 0x%04x is too old. "
++			"System might be unstable!\n", FW_VERSION(av7110->arm_app));
++
++	kernel_thread(arm_thread, (void *) av7110, 0);
++
++	/* set internal volume control to maximum */
++	av7110->adac_type = DVB_ADAC_TI;
++	SetVolume(av7110, 0xff, 0xff);
++
++	VidMode(av7110, vidmode);
++
++	/* remaining inits according to card and frontend type */
++	av7110->has_analog_tuner = 0;
++	av7110->current_input = 0;
++	if (i2c_writereg(av7110, 0x20, 0x00, 0x00)==1) {
++		printk ("av7110(%d): Crystal audio DAC detected\n",
++			av7110->dvb_adapter->num);
++		av7110->adac_type = DVB_ADAC_CRYSTAL;
++		i2c_writereg(av7110, 0x20, 0x01, 0xd2);
++		i2c_writereg(av7110, 0x20, 0x02, 0x49);
++		i2c_writereg(av7110, 0x20, 0x03, 0x00);
++		i2c_writereg(av7110, 0x20, 0x04, 0x00);
++	
++	/**
++	 * some special handling for the Siemens DVB-C cards...
++	 */
++	} else if (i2c_writereg(av7110, 0x80, 0x0, 0x80) == 1
++			&& i2c_writereg(av7110, 0x80, 0x0, 0) == 1) {
++		u16 version1, version2;
++		printk ("av7110(%d): DVB-C analog module detected, "
++			"initializing MSP3400\n",
++			av7110->dvb_adapter->num);
++		av7110->adac_type = DVB_ADAC_MSP;
++		dvb_delay(100); // the probing above resets the msp...
++		msp_readreg(av7110, MSP_RD_DSP, 0x001e, &version1);
++		msp_readreg(av7110, MSP_RD_DSP, 0x001f, &version2);
++		printk("av7110(%d): MSP3400 version 0x%04x 0x%04x\n",
++			av7110->dvb_adapter->num, version1, version2);
++		msp_writereg(av7110, MSP_WR_DSP, 0x0013, 0x0c00);
++		msp_writereg(av7110, MSP_WR_DSP, 0x0000, 0x7f00); // loudspeaker + headphone
++		msp_writereg(av7110, MSP_WR_DSP, 0x0008, 0x0220); // loudspeaker source
++		msp_writereg(av7110, MSP_WR_DSP, 0x0009, 0x0220); // headphone source
++		msp_writereg(av7110, MSP_WR_DSP, 0x0004, 0x7f00); // loudspeaker volume
++		msp_writereg(av7110, MSP_WR_DSP, 0x000a, 0x0220); // SCART 1 source
++		msp_writereg(av7110, MSP_WR_DSP, 0x0007, 0x7f00); // SCART 1 volume
++		msp_writereg(av7110, MSP_WR_DSP, 0x000d, 0x4800); // prescale SCART
++		
++		if (i2c_writereg(av7110, 0x48, 0x01, 0x00)!=1) {
++			INFO(("saa7113 not accessible.\n"));
++		}
++		else {
++			u8 *i = saa7113_init_regs;
++			av7110->has_analog_tuner = 1;
++			/* init the saa7113 */
++			while (*i != 0xff) {
++				if (i2c_writereg(av7110, 0x48, i[0], i[1]) != 1) {
++					printk("av7110(%d): saa7113 initialization failed",
++							av7110->dvb_adapter->num);
++					break;
++				}
++				i += 2;
++			}
++			/* setup msp for analog sound: B/G Dual-FM */
++			msp_writereg(av7110, MSP_WR_DEM, 0x00bb, 0x02d0); // AD_CV
++			msp_writereg(av7110, MSP_WR_DEM, 0x0001,  3); // FIR1
++			msp_writereg(av7110, MSP_WR_DEM, 0x0001, 18); // FIR1
++			msp_writereg(av7110, MSP_WR_DEM, 0x0001, 27); // FIR1
++			msp_writereg(av7110, MSP_WR_DEM, 0x0001, 48); // FIR1
++			msp_writereg(av7110, MSP_WR_DEM, 0x0001, 66); // FIR1
++			msp_writereg(av7110, MSP_WR_DEM, 0x0001, 72); // FIR1
++			msp_writereg(av7110, MSP_WR_DEM, 0x0005,  4); // FIR2
++			msp_writereg(av7110, MSP_WR_DEM, 0x0005, 64); // FIR2
++			msp_writereg(av7110, MSP_WR_DEM, 0x0005,  0); // FIR2
++			msp_writereg(av7110, MSP_WR_DEM, 0x0005,  3); // FIR2
++			msp_writereg(av7110, MSP_WR_DEM, 0x0005, 18); // FIR2
++			msp_writereg(av7110, MSP_WR_DEM, 0x0005, 27); // FIR2
++			msp_writereg(av7110, MSP_WR_DEM, 0x0005, 48); // FIR2
++			msp_writereg(av7110, MSP_WR_DEM, 0x0005, 66); // FIR2
++			msp_writereg(av7110, MSP_WR_DEM, 0x0005, 72); // FIR2
++			msp_writereg(av7110, MSP_WR_DEM, 0x0083, 0xa000); // MODE_REG
++			msp_writereg(av7110, MSP_WR_DEM, 0x0093, 0x00aa); // DCO1_LO 5.74MHz
++			msp_writereg(av7110, MSP_WR_DEM, 0x009b, 0x04fc); // DCO1_HI
++			msp_writereg(av7110, MSP_WR_DEM, 0x00a3, 0x038e); // DCO2_LO 5.5MHz
++			msp_writereg(av7110, MSP_WR_DEM, 0x00ab, 0x04c6); // DCO2_HI
++			msp_writereg(av7110, MSP_WR_DEM, 0x0056, 0); // LOAD_REG 1/2
++		}	
++
++		memcpy(standard,dvb_standard,sizeof(struct saa7146_standard)*2);
++		/* set dd1 stream a & b */
++      		saa7146_write(dev, DD1_STREAM_B, 0x00000000);
++		saa7146_write(dev, DD1_INIT, 0x03000700);
++		saa7146_write(dev, MC2, (MASK_09 | MASK_25 | MASK_10 | MASK_26));
++	}
++	else if (dev->pci->subsystem_vendor == 0x110a) {
++		printk("av7110(%d): DVB-C w/o analog module detected\n",
++			av7110->dvb_adapter->num);
++		av7110->adac_type = DVB_ADAC_NONE;
++	}
++	else {
++		av7110->adac_type = adac;
++		printk("av7110(%d): adac type set to %d\n",
++			av7110->dvb_adapter->num, av7110->adac_type);
++		}
++
++	if (av7110->adac_type == DVB_ADAC_NONE || av7110->adac_type == DVB_ADAC_MSP) {
++		// switch DVB SCART on
++		outcom(av7110, COMTYPE_AUDIODAC, MainSwitch, 1, 0);
++		outcom(av7110, COMTYPE_AUDIODAC, ADSwitch, 1, 1);
++		if (rgb_on)
++			saa7146_setgpio(dev, 1, SAA7146_GPIO_OUTHI); // RGB on, SCART pin 16
++		//saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO); // SCARTpin 8
++	}
++	
++	SetVolume(av7110, 0xff, 0xff);
++
++	av7110_setup_irc_config (av7110, 0);
++	av7110_register(av7110);
++	
++	/* special case DVB-C: these cards have an analog tuner
++	   plus need some special handling, so we have separate
++	   saa7146_ext_vv data for these... */
++	if (0 != av7110->has_analog_tuner) {
++		ret = saa7146_vv_init(dev, &av7110_vv_data_c);
++	} else {
++		ret = saa7146_vv_init(dev, &av7110_vv_data_st);
++	}
++	
++	if ( 0 != ret) {
++		ERR(("cannot init capture device. skipping.\n"));
++		ret = -ENODEV;
++		goto err;
++	}
++
++	if (saa7146_register_device(&av7110->v4l_dev, dev, "av7110", VFL_TYPE_GRABBER)) {
++		ERR(("cannot register capture device. skipping.\n"));
++		ret = -ENODEV;
++		goto video_err;
++	}
++	
++	if (0 != av7110->has_analog_tuner) {
++		if( 0 != saa7146_register_device(&av7110->vbi_dev, dev, "av7110", VFL_TYPE_VBI)) {
++			ERR(("cannot register vbi v4l2 device. skipping.\n"));
++		}
++		/* we use this to remember that this dvb-c card cannot do vbi */
++		av7110->has_analog_tuner = 2;
++	}	
++
++	printk(KERN_INFO "av7110: found av7110-%d.\n",av7110_num);
++	av7110_num++;
++        return 0;
++
++video_err:
++	saa7146_vv_release(dev);
++
++err:
++	if (NULL != av7110 ) {
++		kfree(av7110);
++	}
++	if (NULL != av7110->debi_virt) {
++		pci_free_consistent(dev->pci, 8192, av7110->debi_virt, av7110->debi_bus);
++	}
++	if (NULL != av7110->iobuf) {
++		vfree(av7110->iobuf);
++	}
++
++	dvb_unregister_i2c_bus (master_xfer,av7110->i2c_bus->adapter,
++				av7110->i2c_bus->id);
++
++	dvb_unregister_adapter (av7110->dvb_adapter);
++
++	return ret;
++}
++
++static int av7110_detach (struct saa7146_dev* saa)
++{
++	struct av7110 *av7110 = (struct av7110*)saa->ext_priv;
++	DEB_EE(("av7110: %p\n",av7110));
++
++	saa7146_unregister_device(&av7110->v4l_dev, saa);
++	if (2 == av7110->has_analog_tuner) {
++		saa7146_unregister_device(&av7110->vbi_dev, saa);
++	}	
++
++	av7110->arm_rmmod=1;
++	wake_up_interruptible(&av7110->arm_wait);
++
++	while (av7110->arm_thread)
++		dvb_delay(1);
++
++	dvb_unregister(av7110);
++	
++	IER_DISABLE(saa, (MASK_19 | MASK_03));
++//	saa7146_write (av7110->dev, IER, 
++//		     saa7146_read(av7110->dev, IER) & ~(MASK_19 | MASK_03));
++	
++	saa7146_write(av7110->dev, ISR,(MASK_19 | MASK_03));
++
++	ci_ll_release(&av7110->ci_rbuffer, &av7110->ci_wbuffer);
++	av7110_ipack_free(&av7110->ipack[0]);
++	av7110_ipack_free(&av7110->ipack[1]);
++	vfree(av7110->iobuf);
++	pci_free_consistent(saa->pci, 8192, av7110->debi_virt,
++			    av7110->debi_bus);
++
++	dvb_unregister_i2c_bus (master_xfer,av7110->i2c_bus->adapter, av7110->i2c_bus->id);
++	dvb_unregister_adapter (av7110->dvb_adapter);
++
++	kfree (av7110);
++
++	saa->ext_priv = NULL;
++	av7110_num--;
++	
++	return 0;
++}
++
++
++static void av7110_irq(struct saa7146_dev* dev, u32 *isr) 
++{
++	struct av7110 *av7110 = (struct av7110*)dev->ext_priv;
++
++//	DEB_INT(("dev: %p, av7110: %p\n",dev,av7110));
++
++	if (*isr & MASK_19)
++		tasklet_schedule (&av7110->debi_tasklet);
++	
++	if (*isr & MASK_03)
++		tasklet_schedule (&av7110->gpio_tasklet);
++}
++
++
++/* FIXME: these values are experimental values that look better than the
++   values from the latest "official" driver -- at least for me... (MiHu) */
++static struct saa7146_standard standard[] = {
++	{
++		.name	= "PAL", 	.id		= V4L2_STD_PAL_BG,
++		.v_offset	= 0x15,	.v_field 	= 288,		.v_calc	= 576,
++		.h_offset	= 0x4a,	.h_pixels 	= 708,		.h_calc	= 709,
++		.v_max_out	= 576,	.h_max_out	= 768,
++	}, {
++		.name	= "NTSC", 	.id		= V4L2_STD_NTSC,
++		.v_offset	= 0x10,	.v_field 	= 244,		.v_calc	= 480,
++		.h_offset	= 0x40,	.h_pixels 	= 708,		.h_calc	= 709,
++		.v_max_out	= 480,	.h_max_out	= 640,
++	}
++};
++
++static struct saa7146_standard analog_standard[] = {
++	{
++		.name	= "PAL", 	.id		= V4L2_STD_PAL_BG,
++		.v_offset	= 0x18 /* 0 */ ,	.v_field 	= 288,		.v_calc	= 576,
++		.h_offset	= 0x08,	.h_pixels 	= 708,		.h_calc	= 709,
++		.v_max_out	= 576,	.h_max_out	= 768,
++	}, {
++		.name	= "NTSC", 	.id		= V4L2_STD_NTSC,
++		.v_offset	= 0x10,	.v_field 	= 244,		.v_calc	= 480,
++		.h_offset	= 0x40,	.h_pixels 	= 708,		.h_calc	= 709,
++		.v_max_out	= 480,	.h_max_out	= 640,
++	}
++};
++
++static struct saa7146_standard dvb_standard[] = {
++	{
++		.name	= "PAL", 	.id		= V4L2_STD_PAL_BG,
++		.v_offset	= 0x14,	.v_field 	= 288,		.v_calc	= 576,
++		.h_offset	= 0x4a,	.h_pixels 	= 708,		.h_calc	= 709,
++		.v_max_out	= 576,	.h_max_out	= 768,
++	}, {
++		.name	= "NTSC", 	.id		= V4L2_STD_NTSC,
++		.v_offset	= 0x10,	.v_field 	= 244,		.v_calc	= 480,
++		.h_offset	= 0x40,	.h_pixels 	= 708,		.h_calc	= 709,
++		.v_max_out	= 480,	.h_max_out	= 640,
++	}
++};
++
++static struct saa7146_extension av7110_extension;
++
++#define MAKE_AV7110_INFO(x_var,x_name) \
++static struct saa7146_pci_extension_data x_var = { \
++	.ext_priv = x_name, \
++	.ext = &av7110_extension }
++
++MAKE_AV7110_INFO(fs_1_5, "Siemens cable card PCI rev1.5");
++MAKE_AV7110_INFO(fs_1_3, "Siemens/Technotrend/Hauppauge PCI rev1.3");
++MAKE_AV7110_INFO(tt_1_6, "Technotrend/Hauppauge PCI rev1.3 or 1.6");
++MAKE_AV7110_INFO(tt_2_1, "Technotrend/Hauppauge PCI rev2.1");
++MAKE_AV7110_INFO(tt_t,	 "Technotrend/Hauppauge PCI DVB-T");
++MAKE_AV7110_INFO(unkwn0, "Technotrend/Hauppauge PCI rev?(unknown0)?");
++MAKE_AV7110_INFO(unkwn1, "Technotrend/Hauppauge PCI rev?(unknown1)?");
++MAKE_AV7110_INFO(unkwn2, "Technotrend/Hauppauge PCI rev?(unknown2)?");
++MAKE_AV7110_INFO(nexus,  "Technotrend/Hauppauge Nexus PCI DVB-S");
++MAKE_AV7110_INFO(dvboc11,"Octal/Technotrend DVB-C for iTV");
++
++static struct pci_device_id pci_tbl[] = {
++	MAKE_EXTENSION_PCI(fs_1_5, 0x110a, 0xffff),
++	MAKE_EXTENSION_PCI(fs_1_5, 0x110a, 0x0000),
++	MAKE_EXTENSION_PCI(fs_1_3, 0x13c2, 0x0000),
++	MAKE_EXTENSION_PCI(unkwn0, 0x13c2, 0x1002),
++	MAKE_EXTENSION_PCI(tt_1_6, 0x13c2, 0x0001),
++	MAKE_EXTENSION_PCI(tt_2_1, 0x13c2, 0x0002),
++	MAKE_EXTENSION_PCI(tt_2_1, 0x13c2, 0x0003),
++	MAKE_EXTENSION_PCI(tt_2_1, 0x13c2, 0x0004),
++	MAKE_EXTENSION_PCI(tt_1_6, 0x13c2, 0x0006),
++	MAKE_EXTENSION_PCI(tt_t,   0x13c2, 0x0008),
++	MAKE_EXTENSION_PCI(tt_2_1, 0x13c2, 0x1102),
++	MAKE_EXTENSION_PCI(unkwn1, 0xffc2, 0x0000),
++	MAKE_EXTENSION_PCI(unkwn2, 0x00a1, 0x00a1),
++	MAKE_EXTENSION_PCI(nexus,  0x00a1, 0xa1a0),
++	MAKE_EXTENSION_PCI(dvboc11,0x13c2, 0x000a),
++	{
++		.vendor    = 0,
++	}
++};
++
++MODULE_DEVICE_TABLE(pci, pci_tbl);
++
++static int std_callback(struct saa7146_dev* dev, struct saa7146_standard *std)
++{
++	struct av7110 *av7110 = (struct av7110*)dev->ext_priv;
++	if (std->id == V4L2_STD_PAL) {
++                av7110->vidmode = VIDEO_MODE_PAL;
++		SetMode(av7110, av7110->vidmode);
++	}
++	else if (std->id == V4L2_STD_NTSC) {
++		av7110->vidmode = VIDEO_MODE_NTSC;
++		SetMode(av7110, av7110->vidmode);
++	}
++	else
++		return -1;
++
++	return 0;
++}
++
++
++static struct saa7146_ext_vv av7110_vv_data_st = {
++	.inputs		= 1,
++	.audios 	= 1,
++	.capabilities	= 0,
++	.flags		= 0, 
++
++	.stds		= &standard[0],
++	.num_stds	= sizeof(standard)/sizeof(struct saa7146_standard),
++	.std_callback	= &std_callback, 
++
++	.ioctls		= &ioctls[0],
++	.ioctl		= av7110_ioctl,
++};
++
++static struct saa7146_ext_vv av7110_vv_data_c = {
++	.inputs		= 1,
++	.audios 	= 1,
++	.capabilities	= V4L2_CAP_TUNER | V4L2_CAP_VBI_CAPTURE,
++	.flags		= SAA7146_USE_PORT_B_FOR_VBI,
++
++	.stds		= &standard[0],
++	.num_stds	= sizeof(standard)/sizeof(struct saa7146_standard),
++	.std_callback	= &std_callback, 
++
++	.ioctls		= &ioctls[0],
++	.ioctl		= av7110_ioctl,
++};
++
++
++static struct saa7146_extension av7110_extension = {
++	.name		= "dvb\0",
++	.flags		= SAA7146_I2C_SHORT_DELAY,
++
++	.module		= THIS_MODULE,
++	.pci_tbl	= &pci_tbl[0],
++	.attach		= av7110_attach,
++	.detach		= av7110_detach,
++
++	.irq_mask	= MASK_19|MASK_03,
++	.irq_func	= av7110_irq,
++};	
++
++
++static int __init av7110_init(void) 
++{
++	int retval;
++	retval = saa7146_register_extension(&av7110_extension);
++	if (retval)
++		goto failed_saa7146_register;
++	
++	retval = av7110_ir_init();
++	if (retval)
++		goto failed_av7110_ir_init;
++	return 0;
++failed_av7110_ir_init:
++	saa7146_unregister_extension(&av7110_extension);
++failed_saa7146_register:
++	return retval;
++}
++
++
++static void __exit av7110_exit(void)
++{
++	av7110_ir_exit();
++	saa7146_unregister_extension(&av7110_extension);
++}
++
++module_init(av7110_init);
++module_exit(av7110_exit);
++
++MODULE_DESCRIPTION("driver for the SAA7146 based AV110 PCI DVB cards by "
++		   "Siemens, Technotrend, Hauppauge");
++MODULE_AUTHOR("Ralph Metzler, Marcus Metzler, others");
++MODULE_LICENSE("GPL");
++
++MODULE_PARM(av7110_debug,"i");
++MODULE_PARM(vidmode,"i");
++MODULE_PARM_DESC(vidmode,"analog video out: 0 off, 1 CVBS+RGB (default), 2 CVBS+YC, 3 YC");
++MODULE_PARM(pids_off,"i");
++MODULE_PARM_DESC(pids_off,"clear video/audio/PCR PID filters when demux is closed");
++MODULE_PARM(adac,"i");
++MODULE_PARM_DESC(adac,"audio DAC type: 0 TI, 1 CRYSTAL, 2 MSP (use if autodetection fails)");
++MODULE_PARM(hw_sections, "i");
++MODULE_PARM_DESC(hw_sections, "0 use software section filter, 1 use hardware");
++MODULE_PARM(rgb_on, "i");
++MODULE_PARM_DESC(rgb_on, "For Siemens DVB-C cards only: Enable RGB control"
++		" signal on SCART pin 16 to switch SCART video mode from CVBS to RGB");
+--- linux-2.6.0/drivers/media/dvb/ttpci/av7110_firm.h	2003-10-25 14:45:45.000000000 -0700
++++ /dev/null	2002-08-30 16:31:37.000000000 -0700
+@@ -1,28315 +0,0 @@
+-
+-#include <asm/types.h>
+-
+-static u8 Dpram [] = {
+-	0xe5, 0x9f, 0xf0, 0x1c, 0xe1, 0xb0, 0xf0, 0x0e, 
+-	0xe5, 0x9f, 0xf0, 0x18, 0xe2, 0x5e, 0xf0, 0x04, 
+-	0xe2, 0x5e, 0xf0, 0x08, 0xe1, 0xa0, 0x00, 0x00, 
+-	0xea, 0x00, 0x00, 0x06, 0xe2, 0x5e, 0xf0, 0x04, 
+-	0x2c, 0x00, 0x00, 0xe8, 0x2e, 0x02, 0x5c, 0xcc, 
+-	0x2e, 0x01, 0xcb, 0x40, 0xa5, 0xa5, 0x5a, 0x5a, 
+-	0x00, 0x1f, 0x15, 0x55, 0x00, 0x00, 0x00, 0x09, 
+-	0xe9, 0x2d, 0x5f, 0xff, 0xe1, 0x4f, 0x00, 0x00, 
+-	0xe9, 0x2d, 0x00, 0x01, 0xe2, 0x8f, 0x00, 0x01, 
+-	0xe1, 0x2f, 0xff, 0x10, 0x21, 0xff, 0x48, 0x25, 
+-	0x68, 0x00, 0x40, 0x52, 0x42, 0x08, 0xd1, 0x0b, 
+-	0x32, 0x20, 0x0a, 0x00, 0x42, 0x08, 0xd1, 0x07, 
+-	0x32, 0x20, 0x0a, 0x00, 0x42, 0x08, 0xd1, 0x03, 
+-	0x0a, 0x00, 0x42, 0x08, 0xd0, 0x29, 0x32, 0x20, 
+-	0x21, 0x0f, 0x42, 0x08, 0xd1, 0x01, 0x32, 0x10, 
+-	0x09, 0x00, 0x21, 0x01, 0x42, 0x08, 0xd1, 0x08, 
+-	0x1d, 0x12, 0x21, 0x02, 0x42, 0x08, 0xd1, 0x04, 
+-	0x1d, 0x12, 0x21, 0x04, 0x42, 0x08, 0xd1, 0x00, 
+-	0x1d, 0x12, 0x48, 0x13, 0x68, 0x00, 0xb4, 0x01, 
+-	0x08, 0x90, 0x21, 0x01, 0x40, 0x81, 0x48, 0x0f, 
+-	0x60, 0x01, 0x48, 0x0d, 0x58, 0x82, 0x48, 0x01, 
+-	0x46, 0x86, 0x47, 0x10, 0x2c, 0x00, 0x00, 0xb1, 
+-	0xbc, 0x02, 0x48, 0x0b, 0x68, 0x02, 0x23, 0x20, 
+-	0x05, 0x1b, 0x40, 0x1a, 0x43, 0x99, 0x43, 0x11, 
+-	0x60, 0x01, 0x00, 0x00, 0x47, 0x78, 0x00, 0x00, 
+-	0xe8, 0xbd, 0x00, 0x01, 0xe1, 0x69, 0xf0, 0x00, 
+-	0xe8, 0xbd, 0x5f, 0xff, 0xe2, 0x5e, 0xf0, 0x04, 
+-	0x2e, 0x08, 0x3a, 0xf4, 0x66, 0x00, 0x00, 0x14, 
+-	0x66, 0x00, 0x00, 0x18, 0x66, 0x00, 0x00, 0x1c, 
+-	0x00, 0x00, 0x00, 0x0c, 0x2e, 0x02, 0x5d, 0xd4, 
+-	0x2c, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-};
+-
+-
+-static u8 Root [] = {
+-	0xb4, 0x90, 0x49, 0x18, 0x1c, 0x0b, 0x4a, 0x18, 
+-	0x1a, 0x50, 0x4f, 0x18, 0x1a, 0x79, 0x10, 0x8f, 
+-	0x21, 0x00, 0x2f, 0x00, 0xdd, 0x04, 0xcb, 0x10, 
+-	0xc2, 0x10, 0x31, 0x01, 0x42, 0xb9, 0xdb, 0xfa, 
+-	0x49, 0x13, 0x18, 0x09, 0x4a, 0x13, 0x60, 0x11, 
+-	0x49, 0x13, 0x18, 0x09, 0x4a, 0x13, 0x60, 0x11, 
+-	0x49, 0x13, 0x18, 0x09, 0x4a, 0x13, 0x60, 0x11, 
+-	0x49, 0x13, 0x18, 0x09, 0x4a, 0x13, 0x60, 0x11, 
+-	0x49, 0x13, 0x18, 0x09, 0x4a, 0x13, 0x60, 0x11, 
+-	0x49, 0x13, 0x18, 0x09, 0x4a, 0x13, 0x60, 0x11, 
+-	0x49, 0x13, 0x18, 0x09, 0x4a, 0x13, 0x60, 0x11, 
+-	0x49, 0x13, 0x18, 0x08, 0x49, 0x13, 0x60, 0x08, 
+-	0xbc, 0x90, 0x47, 0x70, 0x2e, 0x01, 0xc8, 0x08, 
+-	0x9e, 0x00, 0x0a, 0x00, 0x2e, 0x01, 0xc9, 0x08, 
+-	0x2e, 0x01, 0xc8, 0x58, 0x2e, 0x01, 0xca, 0x28, 
+-	0x2e, 0x01, 0xc8, 0x90, 0x2e, 0x01, 0xca, 0x2c, 
+-	0x2e, 0x01, 0xc8, 0xac, 0x2e, 0x01, 0xca, 0x30, 
+-	0x2e, 0x01, 0xc8, 0x58, 0x2e, 0x01, 0xca, 0x34, 
+-	0x2e, 0x01, 0xc8, 0x74, 0x2e, 0x01, 0xca, 0x38, 
+-	0x2e, 0x01, 0xc8, 0xac, 0x2e, 0x01, 0xca, 0x3c, 
+-	0x2e, 0x01, 0xc8, 0x90, 0x2e, 0x01, 0xca, 0x40, 
+-	0x2e, 0x01, 0xc8, 0x08, 0x2e, 0x01, 0xca, 0x44, 
+-	0xb5, 0xf0, 0x1c, 0x0c, 0x1c, 0x15, 0x1c, 0x07, 
+-	0xb0, 0x82, 0x2a, 0x00, 0xd1, 0x03, 0xb0, 0x02, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x0e, 0x38, 
+-	0x06, 0x00, 0x21, 0x0b, 0x06, 0x89, 0x4b, 0x43, 
+-	0x93, 0x01, 0x42, 0x88, 0xd1, 0x32, 0x08, 0x78, 
+-	0xd3, 0x05, 0x1e, 0x78, 0x88, 0x00, 0x70, 0x20, 
+-	0x34, 0x01, 0x3d, 0x01, 0x37, 0x01, 0x08, 0xb8, 
+-	0xd3, 0x0f, 0x2d, 0x02, 0xdb, 0x0d, 0x08, 0x60, 
+-	0xd3, 0x06, 0x88, 0x39, 0x0a, 0x09, 0x70, 0x21, 
+-	0x88, 0x38, 0x70, 0x60, 0x34, 0x02, 0xe0, 0x02, 
+-	0x88, 0x38, 0x80, 0x20, 0x34, 0x02, 0x3d, 0x02, 
+-	0x37, 0x02, 0x07, 0xae, 0x0f, 0xb6, 0x1b, 0xad, 
+-	0xd0, 0x08, 0x9b, 0x01, 0x68, 0x1b, 0x1c, 0x38, 
+-	0x1c, 0x21, 0x1c, 0x2a, 0xf0, 0x18, 0xfb, 0x6a, 
+-	0x19, 0x7f, 0x19, 0x64, 0x2e, 0x00, 0xd0, 0x54, 
+-	0x68, 0x38, 0x90, 0x00, 0x46, 0x6f, 0x78, 0x38, 
+-	0x70, 0x20, 0x34, 0x01, 0x37, 0x01, 0x3e, 0x01, 
+-	0xd1, 0xf9, 0xe0, 0x4a, 0x0e, 0x20, 0x06, 0x00, 
+-	0x42, 0x88, 0xd1, 0x3f, 0xe0, 0x14, 0x08, 0x60, 
+-	0xd3, 0x08, 0x1e, 0x60, 0x88, 0x01, 0x23, 0xff, 
+-	0x02, 0x1b, 0x40, 0x19, 0x78, 0x3a, 0x43, 0x11, 
+-	0x80, 0x01, 0xe0, 0x06, 0x88, 0x21, 0x06, 0x09, 
+-	0x0e, 0x09, 0x78, 0x3a, 0x02, 0x12, 0x43, 0x11, 
+-	0x80, 0x21, 0x34, 0x01, 0x3d, 0x01, 0x37, 0x01, 
+-	0x07, 0xb8, 0xd0, 0x01, 0x2d, 0x00, 0xdc, 0xe6, 
+-	0x07, 0xae, 0x0f, 0xb6, 0x1b, 0xad, 0xd0, 0x06, 
+-	0x9b, 0x01, 0x68, 0x1b, 0x1c, 0x38, 0x1c, 0x21, 
+-	0x1c, 0x2a, 0xf0, 0x18, 0xfb, 0x33, 0x19, 0x7f, 
+-	0x19, 0x64, 0x2e, 0x00, 0xd0, 0x1d, 0x08, 0x60, 
+-	0xd3, 0x08, 0x1e, 0x60, 0x88, 0x01, 0x23, 0xff, 
+-	0x02, 0x1b, 0x40, 0x19, 0x78, 0x3a, 0x43, 0x11, 
+-	0x80, 0x01, 0xe0, 0x06, 0x88, 0x21, 0x06, 0x09, 
+-	0x0e, 0x09, 0x78, 0x3a, 0x02, 0x12, 0x43, 0x11, 
+-	0x80, 0x21, 0x34, 0x01, 0x37, 0x01, 0x3e, 0x01, 
+-	0xd1, 0xe9, 0xe0, 0x06, 0x9b, 0x01, 0x68, 0x1b, 
+-	0x1c, 0x38, 0x1c, 0x21, 0x1c, 0x2a, 0xf0, 0x18, 
+-	0xfb, 0x11, 0xb0, 0x02, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x00, 0x48, 
+-	0xb5, 0x00, 0x20, 0x03, 0xf0, 0x03, 0xfc, 0x50, 
+-	0xbc, 0x08, 0x47, 0x18, 0xb5, 0xf0, 0x4f, 0x10, 
+-	0x89, 0x3c, 0x89, 0xbe, 0x8a, 0x3d, 0x23, 0x04, 
+-	0x43, 0xdb, 0x68, 0x78, 0x40, 0x18, 0x0c, 0x1a, 
+-	0x60, 0x78, 0xb4, 0x04, 0x1c, 0x13, 0x22, 0x00, 
+-	0x21, 0x00, 0x20, 0x00, 0xf0, 0x00, 0xf8, 0x54, 
+-	0x20, 0x01, 0x60, 0x78, 0xb0, 0x01, 0x4a, 0x07, 
+-	0xb4, 0x04, 0x1c, 0x20, 0x1c, 0x31, 0x1c, 0x2a, 
+-	0x4b, 0x04, 0xf0, 0x00, 0xf8, 0x49, 0xb0, 0x01, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 
+-	0xb5, 0xb0, 0x06, 0x00, 0x0e, 0x00, 0x4f, 0x1d, 
+-	0x24, 0x10, 0x68, 0x3b, 0x2b, 0x00, 0xd1, 0x1a, 
+-	0x28, 0x00, 0xd0, 0x18, 0x20, 0xa5, 0x01, 0xc0, 
+-	0xf0, 0x05, 0xfb, 0x64, 0x60, 0x38, 0x8a, 0xbf, 
+-	0x1c, 0x03, 0x2f, 0x00, 0xd0, 0x0c, 0x2b, 0x00, 
+-	0xd0, 0x0a, 0x22, 0x01, 0x21, 0x00, 0x20, 0x1c, 
+-	0xb4, 0x07, 0x1c, 0x18, 0x22, 0x1d, 0x1c, 0x39, 
+-	0x1c, 0x23, 0xf0, 0x0a, 0xfb, 0xc7, 0xb0, 0x03, 
+-	0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 0x2b, 0x00, 
+-	0xd0, 0xfa, 0x28, 0x00, 0xd1, 0xf8, 0x8a, 0xbd, 
+-	0x2d, 0x00, 0xd0, 0x0a, 0x22, 0x00, 0x21, 0x00, 
+-	0x20, 0x1c, 0xb4, 0x07, 0x1c, 0x18, 0x22, 0x1d, 
+-	0x1c, 0x29, 0x1c, 0x23, 0xf0, 0x0a, 0xfb, 0xb2, 
+-	0xb0, 0x03, 0x68, 0x38, 0xf0, 0x05, 0xfb, 0x44, 
+-	0x20, 0x00, 0x60, 0x38, 0xbc, 0xb0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x00, 0x00, 
+-	0xb5, 0xf0, 0x9f, 0x05, 0x04, 0x04, 0x0c, 0x24, 
+-	0x04, 0x0d, 0x0c, 0x2d, 0x04, 0x16, 0x0c, 0x36, 
+-	0x04, 0x19, 0x0c, 0x09, 0xb0, 0x82, 0x91, 0x00, 
+-	0x04, 0x38, 0x0c, 0x00, 0xb0, 0x81, 0x49, 0x89, 
+-	0x4f, 0x89, 0x42, 0x8d, 0xd1, 0x00, 0x89, 0xbd, 
+-	0x42, 0x8e, 0xd1, 0x00, 0x8a, 0x3e, 0x4a, 0x87, 
+-	0x42, 0x95, 0xd1, 0x02, 0x89, 0xbd, 0x08, 0xd3, 
+-	0x81, 0xbb, 0x4b, 0x84, 0x42, 0x9e, 0xd1, 0x02, 
+-	0x8a, 0x3e, 0x08, 0xdb, 0x82, 0x3b, 0x9a, 0x01, 
+-	0x42, 0x8a, 0xd1, 0x01, 0x8a, 0xba, 0x92, 0x01, 
+-	0x8a, 0xbb, 0x99, 0x01, 0x42, 0x99, 0xd0, 0x20, 
+-	0x68, 0x38, 0x90, 0x02, 0x28, 0x00, 0xd0, 0x1a, 
+-	0x2b, 0x00, 0xd0, 0x0a, 0x22, 0x00, 0x21, 0x00, 
+-	0x20, 0x1c, 0xb4, 0x07, 0x1c, 0x19, 0x23, 0x10, 
+-	0x22, 0x1d, 0x98, 0x05, 0xf0, 0x0a, 0xfb, 0x6a, 
+-	0xb0, 0x03, 0x99, 0x01, 0x29, 0x00, 0xd0, 0x0a, 
+-	0x22, 0x01, 0x21, 0x00, 0x20, 0x1c, 0xb4, 0x07, 
+-	0x99, 0x04, 0x23, 0x10, 0x22, 0x1d, 0x68, 0x38, 
+-	0xf0, 0x0a, 0xfb, 0x5c, 0xb0, 0x03, 0x99, 0x01, 
+-	0x82, 0xb9, 0x4b, 0x6d, 0x42, 0x9c, 0xd0, 0x37, 
+-	0xdc, 0x28, 0x2c, 0x00, 0xd0, 0x2e, 0x3b, 0x02, 
+-	0x42, 0x9c, 0xd0, 0x29, 0x4b, 0x69, 0x42, 0x9c, 
+-	0xd1, 0x00, 0x1c, 0x34, 0x22, 0x00, 0xb4, 0x04, 
+-	0x23, 0x00, 0x49, 0x62, 0x20, 0x1c, 0xf0, 0x0a, 
+-	0xfc, 0xe3, 0x89, 0xb8, 0xb0, 0x01, 0x42, 0x85, 
+-	0xd1, 0x02, 0x89, 0x38, 0x42, 0x84, 0xd0, 0x44, 
+-	0x81, 0xbd, 0x20, 0x1f, 0xf0, 0x0b, 0xf8, 0x1c, 
+-	0x23, 0x03, 0x02, 0x5b, 0x22, 0x01, 0x02, 0xd2, 
+-	0x21, 0x02, 0x20, 0x1f, 0xf0, 0x0a, 0xfe, 0x94, 
+-	0x2d, 0x00, 0xd0, 0x33, 0x2d, 0x01, 0xd1, 0x11, 
+-	0x25, 0x00, 0xe0, 0x32, 0x4b, 0x55, 0x42, 0x9c, 
+-	0xd0, 0x04, 0x33, 0x01, 0x42, 0x9c, 0xd1, 0xd9, 
+-	0x89, 0x3c, 0xe7, 0xd7, 0x2d, 0x00, 0xd0, 0x01, 
+-	0x1c, 0x2c, 0xe7, 0xd3, 0x1c, 0x34, 0xe7, 0xd1, 
+-	0x1c, 0x2c, 0xe7, 0xcf, 0x42, 0xac, 0xd1, 0x01, 
+-	0x20, 0x80, 0xe0, 0x00, 0x20, 0x00, 0x22, 0x00, 
+-	0xb4, 0x04, 0x06, 0x00, 0x0e, 0x00, 0x22, 0x02, 
+-	0x43, 0x02, 0x23, 0x01, 0x20, 0x1f, 0x1c, 0x29, 
+-	0xf0, 0x0a, 0xfc, 0xaa, 0x23, 0x01, 0x02, 0x9b, 
+-	0x00, 0x5a, 0x21, 0x01, 0x20, 0x1f, 0xb0, 0x01, 
+-	0xf0, 0x0a, 0xfe, 0x66, 0x21, 0x00, 0x20, 0x1f, 
+-	0xf0, 0x0b, 0xfb, 0x58, 0x20, 0x01, 0xf0, 0x0d, 
+-	0xff, 0x47, 0xe0, 0x02, 0x20, 0x00, 0xf0, 0x0d, 
+-	0xff, 0x43, 0x8a, 0x38, 0x42, 0x86, 0xd1, 0x02, 
+-	0x89, 0x39, 0x42, 0x8c, 0xd0, 0x52, 0x28, 0x00, 
+-	0xd0, 0x0d, 0x20, 0x03, 0xf0, 0x0e, 0xf8, 0x9a, 
+-	0x20, 0x1e, 0xf0, 0x0b, 0xf8, 0x97, 0x23, 0x03, 
+-	0x02, 0x5b, 0x22, 0x01, 0x02, 0xd2, 0x21, 0x02, 
+-	0x20, 0x1e, 0xf0, 0x0a, 0xfe, 0x45, 0x82, 0x3e, 
+-	0x2e, 0x00, 0xd0, 0x3f, 0x42, 0xb4, 0xd1, 0x02, 
+-	0x20, 0x80, 0x90, 0x00, 0xe0, 0x01, 0x20, 0x00, 
+-	0x90, 0x00, 0xf0, 0x1c, 0xf9, 0x57, 0x23, 0x01, 
+-	0x04, 0x1b, 0x43, 0x18, 0xf0, 0x1c, 0xf9, 0x56, 
+-	0x21, 0x00, 0x20, 0x00, 0xf0, 0x0e, 0xfd, 0x78, 
+-	0x20, 0xff, 0x49, 0x29, 0x68, 0x09, 0x70, 0x08, 
+-	0x49, 0x28, 0x48, 0x29, 0x23, 0x1e, 0x22, 0x10, 
+-	0xf0, 0x0e, 0xfe, 0xac, 0x48, 0x27, 0x68, 0x00, 
+-	0x78, 0x01, 0x23, 0x06, 0x43, 0x19, 0x70, 0x01, 
+-	0xf0, 0x1c, 0xf9, 0x3c, 0x4b, 0x24, 0x40, 0x18, 
+-	0xf0, 0x1c, 0xf9, 0x3c, 0x22, 0x00, 0xb4, 0x04, 
+-	0x98, 0x01, 0x06, 0x00, 0x0e, 0x00, 0x22, 0x02, 
+-	0x43, 0x02, 0x23, 0x02, 0x20, 0x1e, 0x1c, 0x31, 
+-	0xf0, 0x0a, 0xfc, 0x4a, 0x23, 0x01, 0x02, 0x9b, 
+-	0x00, 0x5a, 0x21, 0x01, 0x20, 0x1e, 0xb0, 0x01, 
+-	0xf0, 0x0a, 0xfe, 0x06, 0x21, 0x00, 0x20, 0x1e, 
+-	0xf0, 0x0b, 0xfa, 0xf8, 0x42, 0xac, 0xd0, 0x13, 
+-	0x42, 0xb4, 0xd0, 0x11, 0x2c, 0x00, 0xd0, 0x0f, 
+-	0x23, 0x01, 0x02, 0x9b, 0x00, 0x5a, 0x21, 0x01, 
+-	0x20, 0x1c, 0xf0, 0x0a, 0xfd, 0xf5, 0x22, 0x00, 
+-	0xb4, 0x04, 0x23, 0x00, 0x22, 0x82, 0x20, 0x1c, 
+-	0x1c, 0x21, 0xf0, 0x0a, 0xfc, 0x29, 0xb0, 0x01, 
+-	0x81, 0x3c, 0xb0, 0x03, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 
+-	0x2e, 0x08, 0x00, 0x00, 0x00, 0x00, 0xff, 0xfe, 
+-	0x00, 0x00, 0xff, 0xfd, 0x00, 0x00, 0xff, 0xfc, 
+-	0x2e, 0x08, 0x5e, 0x2c, 0x2e, 0x08, 0x47, 0x60, 
+-	0x2e, 0x08, 0x05, 0xa8, 0x2e, 0x08, 0x5e, 0x58, 
+-	0xff, 0xfe, 0xff, 0xff, 0xb5, 0x00, 0x22, 0x00, 
+-	0xb4, 0x04, 0x04, 0x01, 0x0c, 0x09, 0x23, 0x00, 
+-	0x4a, 0x03, 0x1e, 0x50, 0xf7, 0xff, 0xfe, 0xc0, 
+-	0xb0, 0x01, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x00, 0x00, 0xff, 0xff, 0xb5, 0x00, 0x22, 0x00, 
+-	0xb4, 0x04, 0x04, 0x02, 0x0c, 0x12, 0x23, 0x00, 
+-	0x49, 0x03, 0x1e, 0x48, 0xf7, 0xff, 0xfe, 0xb0, 
+-	0xb0, 0x01, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x00, 0x00, 0xff, 0xff, 0xb5, 0x00, 0x04, 0x00, 
+-	0x0c, 0x00, 0xd0, 0x08, 0x28, 0x01, 0xd0, 0x0b, 
+-	0x28, 0x02, 0xd1, 0x02, 0x02, 0x00, 0xf0, 0x0d, 
+-	0xff, 0xf1, 0xbc, 0x08, 0x47, 0x18, 0x20, 0x80, 
+-	0xf0, 0x0d, 0xff, 0xec, 0xbc, 0x08, 0x47, 0x18, 
+-	0x20, 0xff, 0x30, 0x01, 0xf0, 0x0d, 0xff, 0xe6, 
+-	0xbc, 0x08, 0x47, 0x18, 0xb5, 0xb0, 0x27, 0x00, 
+-	0x4c, 0x1b, 0x20, 0x01, 0x04, 0x80, 0x21, 0x00, 
+-	0x22, 0x00, 0xc4, 0x86, 0xc4, 0x84, 0x3c, 0x14, 
+-	0xf0, 0x05, 0xf9, 0x70, 0x61, 0x60, 0x28, 0x00, 
+-	0xd0, 0x06, 0x21, 0x01, 0x04, 0x89, 0x61, 0xe1, 
+-	0x18, 0x41, 0x62, 0x20, 0x61, 0xa1, 0xe0, 0x02, 
+-	0x61, 0xe7, 0x61, 0xa7, 0x62, 0x27, 0x68, 0x21, 
+-	0x00, 0xc9, 0x4a, 0x10, 0x18, 0x89, 0x60, 0x48, 
+-	0x20, 0x00, 0x49, 0x0f, 0x4d, 0x0f, 0x00, 0x42, 
+-	0x52, 0x8d, 0x30, 0x01, 0x06, 0x00, 0x0e, 0x00, 
+-	0x28, 0x1d, 0xdb, 0xf8, 0x20, 0x00, 0x1c, 0x39, 
+-	0x4c, 0x0b, 0x4f, 0x0c, 0x4b, 0x0c, 0x00, 0x42, 
+-	0x52, 0xa5, 0x00, 0x82, 0x50, 0xb9, 0x50, 0x99, 
+-	0x30, 0x01, 0x06, 0x00, 0x0e, 0x00, 0x28, 0x20, 
+-	0xdb, 0xf5, 0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x00, 0x1c, 0x2e, 0x08, 0x3b, 0x70, 
+-	0x2e, 0x08, 0x48, 0xf8, 0x00, 0x00, 0xff, 0xff, 
+-	0x2e, 0x08, 0x49, 0x30, 0x2e, 0x08, 0x49, 0xe8, 
+-	0x2e, 0x08, 0x4a, 0x68, 0xb4, 0xf0, 0xb0, 0x81, 
+-	0x49, 0x25, 0xc9, 0x0c, 0x39, 0x08, 0x1a, 0xd2, 
+-	0x60, 0x8a, 0xd5, 0x02, 0x32, 0xff, 0x32, 0x01, 
+-	0x60, 0x8a, 0x6a, 0x0a, 0x62, 0x8a, 0x68, 0x8f, 
+-	0x2f, 0xfe, 0xdb, 0x03, 0x20, 0x00, 0xb0, 0x01, 
+-	0xbc, 0xf0, 0x47, 0x70, 0x30, 0x03, 0x08, 0x80, 
+-	0x00, 0x80, 0x4c, 0x1b, 0x69, 0xa6, 0x69, 0x64, 
+-	0x2f, 0x3e, 0xdb, 0x24, 0x00, 0xdb, 0x4f, 0x19, 
+-	0x19, 0xdb, 0x68, 0x5b, 0x62, 0x4b, 0x93, 0x00, 
+-	0x1a, 0x9f, 0x4b, 0x15, 0x69, 0xdd, 0x2f, 0x00, 
+-	0xdc, 0x00, 0x19, 0x7f, 0x23, 0x01, 0x03, 0x1b, 
+-	0x18, 0xc3, 0x42, 0xbb, 0xdd, 0x0f, 0x18, 0x17, 
+-	0x42, 0xb7, 0xdb, 0x09, 0x9a, 0x00, 0x1b, 0x12, 
+-	0x2a, 0x00, 0xdc, 0x00, 0x19, 0x52, 0x42, 0x93, 
+-	0xdd, 0x11, 0x18, 0x20, 0x62, 0x08, 0xe0, 0x0e, 
+-	0x62, 0x0f, 0x1c, 0x14, 0xe0, 0x0b, 0x18, 0x10, 
+-	0x62, 0x08, 0x1c, 0x14, 0xe0, 0x07, 0x18, 0x12, 
+-	0x42, 0xb2, 0xdb, 0x00, 0x62, 0x0c, 0x6a, 0x0a, 
+-	0x18, 0x10, 0x62, 0x08, 0x1c, 0x14, 0x1c, 0x20, 
+-	0xb0, 0x01, 0xbc, 0xf0, 0x47, 0x70, 0x00, 0x00, 
+-	0x2e, 0x08, 0x00, 0x1c, 0x2e, 0x08, 0x3b, 0x70, 
+-	0x48, 0x03, 0x6a, 0x81, 0x62, 0x01, 0x69, 0x01, 
+-	0x31, 0x01, 0x61, 0x01, 0x47, 0x70, 0x00, 0x00, 
+-	0x2e, 0x08, 0x00, 0x1c, 0xb5, 0xf7, 0x04, 0x05, 
+-	0x0c, 0x2d, 0x04, 0x0e, 0x0c, 0x36, 0xb0, 0x81, 
+-	0x23, 0x01, 0x03, 0x1b, 0x98, 0x03, 0x42, 0x9e, 
+-	0xdd, 0x05, 0x20, 0xff, 0xb0, 0x01, 0xb0, 0x03, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x4f, 0x24, 
+-	0x68, 0xb9, 0x29, 0xff, 0xdb, 0x02, 0x20, 0xff, 
+-	0xb0, 0x01, 0xe7, 0xf4, 0x00, 0x69, 0x19, 0x49, 
+-	0x00, 0x89, 0x4a, 0x20, 0x18, 0x8c, 0x89, 0x21, 
+-	0x29, 0x01, 0xd0, 0x02, 0x20, 0xff, 0xb0, 0x01, 
+-	0xe7, 0xe9, 0x79, 0x81, 0x91, 0x00, 0x88, 0xa0, 
+-	0x08, 0x40, 0x07, 0x80, 0xd1, 0x02, 0x1c, 0x28, 
+-	0xf0, 0x05, 0xfb, 0xca, 0x88, 0xa0, 0x23, 0x06, 
+-	0x40, 0x18, 0x28, 0x02, 0xd1, 0x09, 0x88, 0xe0, 
+-	0x99, 0x00, 0x42, 0x88, 0xd1, 0x05, 0x1c, 0x28, 
+-	0xf0, 0x05, 0xfb, 0xbe, 0x20, 0xff, 0xb0, 0x01, 
+-	0xe7, 0xd1, 0x88, 0xe0, 0x4b, 0x10, 0x42, 0x98, 
+-	0xd1, 0x01, 0x99, 0x00, 0x80, 0xe1, 0x68, 0x39, 
+-	0x00, 0xc8, 0x4a, 0x0e, 0x52, 0x15, 0x18, 0x80, 
+-	0x80, 0x46, 0x9a, 0x03, 0x31, 0x01, 0x60, 0x42, 
+-	0x20, 0x00, 0x23, 0xff, 0x60, 0x39, 0x33, 0x01, 
+-	0x42, 0x99, 0xd1, 0x00, 0x60, 0x38, 0x68, 0xb9, 
+-	0x31, 0x01, 0x60, 0xb9, 0x68, 0xfb, 0x42, 0x99, 
+-	0xdd, 0x00, 0x60, 0xf9, 0xb0, 0x01, 0xe7, 0xb2, 
+-	0x2e, 0x08, 0x00, 0x1c, 0x2e, 0x08, 0x47, 0x78, 
+-	0x00, 0x00, 0xff, 0xff, 0x2e, 0x08, 0x3b, 0x70, 
+-	0xb5, 0xf0, 0x20, 0xff, 0xb0, 0x82, 0x49, 0x33, 
+-	0x91, 0x01, 0x49, 0x33, 0x8e, 0x89, 0x29, 0x00, 
+-	0xd0, 0x03, 0xb0, 0x02, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x4f, 0x30, 0xcf, 0x0a, 0x3f, 0x08, 
+-	0x1a, 0xc9, 0x60, 0xb9, 0x1c, 0x0a, 0xd5, 0x02, 
+-	0x1d, 0xd1, 0x31, 0xf9, 0x60, 0xb9, 0x68, 0xb9, 
+-	0x29, 0x00, 0xd1, 0x03, 0xb0, 0x02, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x00, 0xda, 0x49, 0x28, 
+-	0x5a, 0x8d, 0x18, 0x51, 0x88, 0x4c, 0x68, 0x49, 
+-	0x91, 0x00, 0x00, 0xa9, 0x4a, 0x25, 0x58, 0x56, 
+-	0x2e, 0x00, 0xd0, 0x07, 0x48, 0x24, 0x58, 0x43, 
+-	0x99, 0x00, 0x1c, 0x28, 0x1c, 0x22, 0xf0, 0x17, 
+-	0xff, 0xff, 0x20, 0x00, 0x28, 0x00, 0xd0, 0x29, 
+-	0x06, 0xed, 0x0e, 0xed, 0x1c, 0xe0, 0x08, 0x82, 
+-	0x00, 0x92, 0x98, 0x00, 0x99, 0x01, 0x6a, 0xfb, 
+-	0xf0, 0x17, 0xff, 0xec, 0x00, 0x68, 0x19, 0x40, 
+-	0x00, 0x80, 0x49, 0x1a, 0x18, 0x40, 0x88, 0x80, 
+-	0x21, 0x0c, 0x40, 0x01, 0x29, 0x0c, 0xd1, 0x04, 
+-	0x02, 0x29, 0x31, 0x02, 0x04, 0x09, 0x0c, 0x09, 
+-	0xe0, 0x03, 0x02, 0x29, 0x31, 0x01, 0x04, 0x09, 
+-	0x0c, 0x09, 0x08, 0x40, 0xd3, 0x04, 0x04, 0x08, 
+-	0x0c, 0x00, 0x21, 0x01, 0x03, 0xc9, 0x43, 0x01, 
+-	0x48, 0x09, 0x85, 0x01, 0x85, 0x44, 0x21, 0x01, 
+-	0x02, 0x49, 0x86, 0x81, 0x68, 0x78, 0x28, 0xff, 
+-	0xd1, 0x02, 0x20, 0x00, 0x60, 0x78, 0xe0, 0x01, 
+-	0x30, 0x01, 0x60, 0x78, 0xb0, 0x02, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2c, 0x00, 0x02, 0x00, 
+-	0x2c, 0x00, 0x1f, 0xc0, 0x2e, 0x08, 0x00, 0x1c, 
+-	0x2e, 0x08, 0x3b, 0x70, 0x2e, 0x08, 0x49, 0xe8, 
+-	0x2e, 0x08, 0x4a, 0x68, 0x2e, 0x08, 0x47, 0x78, 
+-	0xb4, 0xf0, 0x06, 0x09, 0x0e, 0x09, 0x4f, 0x14, 
+-	0x8e, 0xba, 0x2a, 0x00, 0xd0, 0x03, 0x20, 0x00, 
+-	0x43, 0xc0, 0xbc, 0xf0, 0x47, 0x70, 0x1c, 0x05, 
+-	0x4c, 0x10, 0x1d, 0x48, 0xd5, 0x00, 0x30, 0x01, 
+-	0x10, 0x40, 0x04, 0x01, 0x0c, 0x09, 0x20, 0x00, 
+-	0x29, 0x02, 0xdb, 0xf2, 0x29, 0xe0, 0xdc, 0xf0, 
+-	0x22, 0x00, 0x29, 0x00, 0xdd, 0x07, 0x00, 0x53, 
+-	0x5a, 0xee, 0x52, 0xe6, 0x32, 0x01, 0x04, 0x12, 
+-	0x0c, 0x12, 0x42, 0x8a, 0xdb, 0xf7, 0x22, 0x04, 
+-	0x85, 0x3a, 0x00, 0x49, 0x85, 0x79, 0x21, 0x0f, 
+-	0x02, 0x49, 0x86, 0xb9, 0xbc, 0xf0, 0x47, 0x70, 
+-	0x2c, 0x00, 0x1f, 0xc0, 0x2c, 0x00, 0x1e, 0x00, 
+-	0xb5, 0xb0, 0x27, 0x00, 0x4d, 0x13, 0x8e, 0xa9, 
+-	0x29, 0x00, 0xd0, 0x03, 0x43, 0xf8, 0xbc, 0xb0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x1c, 0x79, 0x04, 0x09, 
+-	0x0c, 0x09, 0x1c, 0x3a, 0x1c, 0x0f, 0x56, 0x81, 
+-	0x29, 0x00, 0xd1, 0xf7, 0x24, 0x00, 0x2f, 0xfe, 
+-	0xdd, 0x03, 0x27, 0xfe, 0x1d, 0xc1, 0x31, 0xd9, 
+-	0x77, 0xcc, 0x1c, 0x7a, 0x49, 0x08, 0xf7, 0xff, 
+-	0xfb, 0xc3, 0x20, 0x04, 0x85, 0x28, 0x1c, 0xf8, 
+-	0x08, 0x80, 0x00, 0x80, 0x85, 0x68, 0x20, 0x0f, 
+-	0x02, 0x40, 0x86, 0xa8, 0x1c, 0x20, 0xbc, 0xb0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2c, 0x00, 0x1f, 0xc0, 
+-	0x2c, 0x00, 0x1e, 0x00, 0xb4, 0xf0, 0x4b, 0x1b, 
+-	0x8e, 0x9b, 0x2b, 0x00, 0xd0, 0x03, 0x20, 0x00, 
+-	0x43, 0xc0, 0xbc, 0xf0, 0x47, 0x70, 0x1c, 0xd4, 
+-	0xd5, 0x00, 0x34, 0x01, 0x10, 0x64, 0x1c, 0x0d, 
+-	0x4f, 0x15, 0x02, 0x00, 0x04, 0x00, 0x0c, 0x00, 
+-	0x78, 0x4e, 0x0a, 0x33, 0xd3, 0x07, 0x06, 0x73, 
+-	0x0e, 0x5b, 0x18, 0x59, 0x78, 0x89, 0x43, 0x08, 
+-	0x04, 0x00, 0x0c, 0x00, 0xe0, 0x03, 0x78, 0x89, 
+-	0x43, 0x08, 0x04, 0x00, 0x0c, 0x00, 0x80, 0x38, 
+-	0x20, 0x00, 0x2c, 0x00, 0xdd, 0x06, 0x00, 0x41, 
+-	0x5a, 0x6b, 0x19, 0xc9, 0x80, 0x4b, 0x30, 0x01, 
+-	0x42, 0xa0, 0xdb, 0xf8, 0x20, 0x0b, 0x49, 0x05, 
+-	0x85, 0x08, 0x1c, 0x90, 0x85, 0x48, 0x20, 0x01, 
+-	0x02, 0x40, 0x86, 0x88, 0x20, 0x00, 0xbc, 0xf0, 
+-	0x47, 0x70, 0x00, 0x00, 0x2c, 0x00, 0x1f, 0xc0, 
+-	0x2c, 0x00, 0x02, 0x00, 0x04, 0x02, 0x0c, 0x12, 
+-	0x48, 0x0c, 0x6f, 0xc1, 0x20, 0x00, 0x43, 0xc0, 
+-	0x29, 0x00, 0xd1, 0x12, 0x49, 0x0a, 0x8e, 0xcb, 
+-	0x2b, 0x00, 0xd1, 0x0e, 0x8d, 0x8b, 0x2b, 0x00, 
+-	0xd1, 0x0b, 0x48, 0x08, 0x86, 0xc2, 0x23, 0x07, 
+-	0x86, 0x83, 0x85, 0x8b, 0x85, 0xca, 0x20, 0x09, 
+-	0x02, 0x40, 0x86, 0xc8, 0x20, 0x01, 0x87, 0x88, 
+-	0x20, 0x00, 0x47, 0x70, 0x2c, 0x00, 0x1f, 0x80, 
+-	0x2c, 0x00, 0x1f, 0xc0, 0x2c, 0x00, 0x00, 0xc0, 
+-	0xb5, 0x80, 0x1c, 0x01, 0x4a, 0x0d, 0x8e, 0xd3, 
+-	0x20, 0x00, 0x43, 0xc0, 0x2b, 0x00, 0xd1, 0x12, 
+-	0x8d, 0x93, 0x2b, 0x07, 0xd1, 0x0f, 0x8d, 0xd7, 
+-	0x20, 0x00, 0x85, 0x90, 0x2f, 0x00, 0xd0, 0x0a, 
+-	0x23, 0x01, 0x02, 0xdb, 0x42, 0x9f, 0xdc, 0x06, 
+-	0x1c, 0x3a, 0x48, 0x05, 0x4b, 0x05, 0x6a, 0xdb, 
+-	0xf0, 0x17, 0xfe, 0xdc, 0x1c, 0x38, 0xbc, 0x80, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2c, 0x00, 0x1f, 0xc0, 
+-	0x2c, 0x00, 0x12, 0x00, 0x2e, 0x08, 0x00, 0x1c, 
+-	0xb5, 0xf0, 0xb0, 0x83, 0x49, 0x62, 0x8e, 0x88, 
+-	0x28, 0x00, 0xd0, 0x03, 0xb0, 0x03, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x4e, 0x5f, 0x78, 0x30, 
+-	0x49, 0x5f, 0x91, 0x02, 0x78, 0x09, 0x42, 0x88, 
+-	0xd1, 0x03, 0xb0, 0x03, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x20, 0x00, 0x4d, 0x5b, 0x4b, 0x5c, 
+-	0x93, 0x01, 0x1d, 0xd9, 0x31, 0x19, 0x7d, 0x0a, 
+-	0x00, 0x53, 0x18, 0x9b, 0x01, 0x1b, 0x19, 0x5b, 
+-	0x78, 0xdc, 0x1c, 0x1f, 0x79, 0x1b, 0x42, 0x9c, 
+-	0xd1, 0x04, 0x79, 0x7b, 0x07, 0xdb, 0x0f, 0xdb, 
+-	0x2b, 0x01, 0xd1, 0x06, 0x7d, 0x0b, 0x93, 0x00, 
+-	0x32, 0x01, 0x07, 0x52, 0x0f, 0x52, 0x75, 0x0a, 
+-	0xe0, 0x08, 0x32, 0x01, 0x07, 0x52, 0x0f, 0x52, 
+-	0x75, 0x0a, 0x30, 0x01, 0x06, 0x00, 0x0e, 0x00, 
+-	0x28, 0x08, 0xdb, 0xe0, 0x28, 0x08, 0xd1, 0x03, 
+-	0xb0, 0x03, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x98, 0x00, 0x00, 0x43, 0x18, 0x18, 0x01, 0x00, 
+-	0x19, 0x47, 0x78, 0xf8, 0x00, 0xc0, 0x19, 0xc0, 
+-	0x89, 0x84, 0x23, 0x01, 0x03, 0x1b, 0x42, 0x9c, 
+-	0xdd, 0x00, 0x1c, 0x1c, 0x68, 0x81, 0x89, 0xc0, 
+-	0x18, 0x08, 0x1c, 0xe1, 0x08, 0x8a, 0x00, 0x92, 
+-	0x49, 0x3e, 0x9b, 0x01, 0x6a, 0xdb, 0xf0, 0x17, 
+-	0xfe, 0x79, 0x88, 0x38, 0x02, 0x00, 0x30, 0x09, 
+-	0x49, 0x35, 0x85, 0x08, 0x85, 0x4c, 0x20, 0x01, 
+-	0x02, 0x40, 0x86, 0x88, 0x78, 0xf8, 0x00, 0xc0, 
+-	0x19, 0xc0, 0x89, 0xc1, 0x19, 0x09, 0x81, 0xc1, 
+-	0x78, 0xf8, 0x00, 0xc0, 0x19, 0xc0, 0x89, 0x81, 
+-	0x1b, 0x09, 0x81, 0x81, 0x78, 0xf8, 0x00, 0xc0, 
+-	0x19, 0xc0, 0x89, 0x81, 0x29, 0x00, 0xd1, 0x4f, 
+-	0x24, 0x00, 0x81, 0xc4, 0x78, 0xf9, 0x6a, 0xb8, 
+-	0x18, 0x40, 0x73, 0x04, 0x78, 0xf8, 0x30, 0x01, 
+-	0x07, 0x80, 0x0f, 0x80, 0x70, 0xf8, 0x78, 0x30, 
+-	0x30, 0x01, 0x70, 0x30, 0x78, 0xf8, 0x79, 0x39, 
+-	0x42, 0x88, 0xd1, 0x3d, 0x79, 0x78, 0x21, 0x02, 
+-	0x40, 0x01, 0x29, 0x02, 0xd1, 0x1e, 0x70, 0xfc, 
+-	0x71, 0x3c, 0x71, 0x7c, 0x49, 0x22, 0x80, 0x39, 
+-	0x6a, 0xb8, 0x68, 0x00, 0xf0, 0x04, 0xfe, 0xac, 
+-	0x6a, 0xb8, 0xf0, 0x04, 0xfe, 0xa9, 0x20, 0x00, 
+-	0x49, 0x1d, 0x00, 0x42, 0x18, 0x12, 0x01, 0x12, 
+-	0x5a, 0xaa, 0x42, 0x8a, 0xd1, 0x04, 0x30, 0x01, 
+-	0x06, 0x00, 0x0e, 0x00, 0x28, 0x08, 0xdb, 0xf4, 
+-	0x28, 0x08, 0xd1, 0x1d, 0x70, 0x34, 0x99, 0x02, 
+-	0x70, 0x0c, 0xe0, 0x19, 0x07, 0xc0, 0x0f, 0xc0, 
+-	0x28, 0x01, 0xd1, 0x15, 0x70, 0xfc, 0x71, 0x3c, 
+-	0x21, 0x06, 0x1d, 0xf8, 0x30, 0x19, 0x73, 0x41, 
+-	0x6a, 0xb9, 0x72, 0x0c, 0x79, 0x79, 0x08, 0x49, 
+-	0x00, 0x49, 0x71, 0x79, 0x22, 0x04, 0x7b, 0x01, 
+-	0xb4, 0x06, 0x78, 0xb9, 0x22, 0x0a, 0x20, 0x85, 
+-	0x6a, 0xbb, 0xf0, 0x0a, 0xfb, 0x07, 0xb0, 0x02, 
+-	0xb0, 0x03, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2c, 0x00, 0x1f, 0xc0, 0x2e, 0x08, 0x03, 0xbc, 
+-	0x2e, 0x08, 0x03, 0xb8, 0x2e, 0x08, 0x44, 0x68, 
+-	0x2e, 0x08, 0x00, 0x1c, 0x2c, 0x00, 0x02, 0x00, 
+-	0x00, 0x00, 0xff, 0xff, 0xb5, 0x80, 0x4f, 0x0b, 
+-	0x68, 0x38, 0x28, 0x00, 0xd1, 0x0f, 0x20, 0x2f, 
+-	0x02, 0x80, 0xf0, 0x04, 0xfe, 0x87, 0x60, 0x38, 
+-	0x20, 0x00, 0x49, 0x07, 0x60, 0x08, 0x49, 0x07, 
+-	0x60, 0x08, 0x49, 0x07, 0x60, 0x08, 0x20, 0x2f, 
+-	0x02, 0x80, 0x49, 0x06, 0x60, 0x08, 0xbc, 0x80, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x02, 0x5c, 0x90, 
+-	0x2e, 0x02, 0x5c, 0x98, 0x2e, 0x02, 0x5c, 0x94, 
+-	0x2e, 0x02, 0x5c, 0x9c, 0x2e, 0x02, 0x5c, 0xa0, 
+-	0xb5, 0x80, 0x4f, 0x04, 0x68, 0x38, 0xf0, 0x04, 
+-	0xfe, 0x73, 0x20, 0x00, 0x60, 0x38, 0xbc, 0x80, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x02, 0x5c, 0x90, 
+-	0xb5, 0xf0, 0xb0, 0x82, 0x4a, 0x36, 0x8e, 0x90, 
+-	0x28, 0x00, 0xd0, 0x03, 0xb0, 0x02, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x48, 0x33, 0x68, 0x01, 
+-	0x4e, 0x33, 0x68, 0x30, 0x1a, 0x0f, 0xd1, 0x03, 
+-	0xb0, 0x02, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2f, 0x00, 0xda, 0x02, 0x23, 0x2f, 0x02, 0x9b, 
+-	0x18, 0xff, 0x4c, 0x2e, 0x6b, 0xa1, 0x1c, 0x4a, 
+-	0x49, 0x2d, 0x68, 0x09, 0x42, 0x8a, 0xd9, 0x13, 
+-	0x23, 0x2f, 0x01, 0x1b, 0x42, 0x9f, 0xda, 0x03, 
+-	0xb0, 0x02, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x4a, 0x23, 0x8e, 0xd2, 0x2a, 0x00, 0xd0, 0x07, 
+-	0x23, 0xeb, 0x01, 0x1b, 0x42, 0x9f, 0xda, 0x03, 
+-	0xb0, 0x02, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x63, 0xa1, 0x4b, 0x22, 0x42, 0x9f, 0xdd, 0x00, 
+-	0x1c, 0x1f, 0x21, 0x2f, 0x02, 0x89, 0x1a, 0x0d, 
+-	0x49, 0x1f, 0x91, 0x01, 0x42, 0xaf, 0xdd, 0x14, 
+-	0x1b, 0x7a, 0x92, 0x00, 0x99, 0x01, 0x68, 0x09, 
+-	0x18, 0x08, 0x1c, 0x2a, 0x49, 0x1b, 0x6b, 0x23, 
+-	0xf0, 0x17, 0xfd, 0x84, 0x4b, 0x19, 0x18, 0xe9, 
+-	0x98, 0x01, 0x9a, 0x00, 0x68, 0x00, 0x6b, 0x23, 
+-	0xf0, 0x17, 0xfd, 0x7c, 0x9a, 0x00, 0x60, 0x32, 
+-	0xe0, 0x0e, 0x99, 0x01, 0x68, 0x09, 0x18, 0x08, 
+-	0x1c, 0x3a, 0x49, 0x12, 0x6b, 0x23, 0xf0, 0x17, 
+-	0xfd, 0x71, 0x68, 0x30, 0x19, 0xc1, 0x20, 0x2f, 
+-	0x02, 0x80, 0xf0, 0x17, 0xfd, 0x75, 0x60, 0x31, 
+-	0x20, 0x12, 0x4a, 0x05, 0x85, 0x10, 0x85, 0x57, 
+-	0x20, 0x01, 0x02, 0x40, 0x86, 0x90, 0xb0, 0x02, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2c, 0x00, 0x1f, 0xc0, 0x2e, 0x02, 0x5c, 0x98, 
+-	0x2e, 0x02, 0x5c, 0x94, 0x2e, 0x08, 0x00, 0x1c, 
+-	0x2e, 0x08, 0x05, 0xb0, 0x00, 0x00, 0x0f, 0x6c, 
+-	0x2e, 0x02, 0x5c, 0x90, 0x2c, 0x00, 0x02, 0x00, 
+-	0x20, 0x00, 0x49, 0x03, 0x60, 0x08, 0x49, 0x03, 
+-	0x60, 0x08, 0x49, 0x03, 0x60, 0x08, 0x47, 0x70, 
+-	0x2e, 0x02, 0x5c, 0x98, 0x2e, 0x02, 0x5c, 0x94, 
+-	0x2e, 0x02, 0x5c, 0x9c, 0x2a, 0x00, 0xd0, 0x05, 
+-	0x78, 0x03, 0x70, 0x0b, 0x30, 0x01, 0x31, 0x01, 
+-	0x3a, 0x01, 0xd1, 0xf9, 0x47, 0x70, 0xb5, 0xf3, 
+-	0xb0, 0x83, 0x98, 0x03, 0x78, 0x40, 0x00, 0x80, 
+-	0x1c, 0x0f, 0x49, 0x3d, 0x58, 0x08, 0x28, 0x00, 
+-	0xd1, 0x05, 0x20, 0xb0, 0xb0, 0x03, 0xb0, 0x02, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x98, 0x03, 
+-	0x88, 0x45, 0x30, 0x04, 0xc8, 0x41, 0x1d, 0xf2, 
+-	0x32, 0xb9, 0x1a, 0x14, 0x23, 0x01, 0x03, 0x1b, 
+-	0x42, 0x9d, 0xdd, 0x03, 0x20, 0x00, 0x43, 0xc0, 
+-	0xb0, 0x03, 0xe7, 0xec, 0x19, 0x79, 0x91, 0x00, 
+-	0x4b, 0x30, 0x93, 0x02, 0x2c, 0xbc, 0xdc, 0x01, 
+-	0x2c, 0x00, 0xda, 0x07, 0x9b, 0x02, 0x68, 0x18, 
+-	0x30, 0x01, 0x60, 0x18, 0x20, 0x00, 0x43, 0xc0, 
+-	0xb0, 0x03, 0xe7, 0xdc, 0x42, 0xac, 0xdb, 0x06, 
+-	0x9b, 0x02, 0x68, 0x5b, 0x1c, 0x39, 0x1c, 0x2a, 
+-	0xf0, 0x17, 0xfd, 0x00, 0xe0, 0x44, 0x2d, 0x00, 
+-	0xdd, 0x42, 0x4b, 0x25, 0x93, 0x01, 0x99, 0x00, 
+-	0x42, 0x8f, 0xd9, 0x07, 0x9b, 0x02, 0x68, 0x18, 
+-	0x30, 0x01, 0x60, 0x18, 0x20, 0x00, 0x43, 0xc0, 
+-	0xb0, 0x03, 0xe7, 0xc4, 0x42, 0xa5, 0xdd, 0x07, 
+-	0x9b, 0x02, 0x68, 0x5b, 0x1c, 0x39, 0x1c, 0x22, 
+-	0xf0, 0x17, 0xfc, 0xe8, 0x68, 0x36, 0xe0, 0x05, 
+-	0x9b, 0x02, 0x68, 0x5b, 0x1c, 0x39, 0x1c, 0x2a, 
+-	0xf0, 0x17, 0xfc, 0xe0, 0x19, 0x3f, 0x1b, 0x2d, 
+-	0x79, 0xb0, 0x19, 0x80, 0x9a, 0x03, 0x78, 0x52, 
+-	0x00, 0xd3, 0x1a, 0x9a, 0x00, 0x92, 0x9b, 0x01, 
+-	0x68, 0x1b, 0x18, 0xd2, 0x78, 0x92, 0x06, 0xd2, 
+-	0x0e, 0xd2, 0x1d, 0x31, 0x2a, 0x12, 0xd1, 0x06, 
+-	0x78, 0xca, 0x0a, 0x12, 0xd2, 0x03, 0x78, 0x89, 
+-	0x29, 0x09, 0xd1, 0x00, 0x38, 0x01, 0x1d, 0xf1, 
+-	0x31, 0xb9, 0x1a, 0x0c, 0x2c, 0xbc, 0xdc, 0x01, 
+-	0x2c, 0x00, 0xda, 0x03, 0x20, 0x00, 0x43, 0xc0, 
+-	0xb0, 0x03, 0xe7, 0x90, 0x2d, 0x00, 0xdc, 0xbe, 
+-	0x20, 0x00, 0xb0, 0x03, 0xe7, 0x8b, 0x00, 0x00, 
+-	0x2e, 0x08, 0x5e, 0x5c, 0x2e, 0x08, 0x00, 0x58, 
+-	0x2e, 0x08, 0x5d, 0xc4, 0xb4, 0xf0, 0x68, 0x42, 
+-	0x68, 0x84, 0x1d, 0xe1, 0x31, 0xb7, 0x1c, 0x16, 
+-	0xb0, 0x81, 0x42, 0x91, 0xd9, 0x09, 0x78, 0x51, 
+-	0x07, 0x09, 0x0f, 0x09, 0x02, 0x09, 0x78, 0x92, 
+-	0x43, 0x11, 0x31, 0x03, 0x04, 0x09, 0x0c, 0x09, 
+-	0xe0, 0x5b, 0x68, 0x21, 0x79, 0x8b, 0x93, 0x00, 
+-	0x1d, 0x0f, 0x18, 0x59, 0x78, 0x45, 0x00, 0xeb, 
+-	0x1b, 0x5b, 0x00, 0x9b, 0x4d, 0x2b, 0x68, 0x2d, 
+-	0x19, 0x5b, 0x78, 0x9b, 0x06, 0xdb, 0x0e, 0xdb, 
+-	0x2b, 0x12, 0xd1, 0x31, 0x1d, 0xe3, 0x33, 0xb9, 
+-	0x1b, 0x9b, 0x06, 0x1d, 0x0e, 0x2d, 0x78, 0xfe, 
+-	0x0a, 0x33, 0xd2, 0x29, 0x2d, 0x0e, 0xda, 0x27, 
+-	0x9b, 0x00, 0x2b, 0x09, 0xdd, 0x06, 0x79, 0x3b, 
+-	0x18, 0xfb, 0x33, 0x05, 0x42, 0x8b, 0xd0, 0x1f, 
+-	0x39, 0x01, 0xe0, 0x1d, 0x9b, 0x00, 0x2b, 0x09, 
+-	0xd1, 0x1a, 0x79, 0x3b, 0x2b, 0x00, 0xd0, 0x01, 
+-	0x39, 0x01, 0xe0, 0x15, 0x39, 0x01, 0x1d, 0xe3, 
+-	0x33, 0xb8, 0x42, 0x93, 0xd9, 0x09, 0x78, 0x53, 
+-	0x07, 0x1b, 0x0f, 0x1b, 0x02, 0x1b, 0x04, 0x1b, 
+-	0x0c, 0x1b, 0x33, 0x03, 0x04, 0x1b, 0x0c, 0x1b, 
+-	0xe0, 0x03, 0x78, 0x4b, 0x33, 0x03, 0x04, 0x1b, 
+-	0x0c, 0x1b, 0x42, 0x9d, 0xda, 0x00, 0x31, 0x01, 
+-	0x1d, 0xe3, 0x33, 0xb8, 0x42, 0x93, 0xd9, 0x0b, 
+-	0x78, 0x52, 0x07, 0x12, 0x0f, 0x12, 0x02, 0x12, 
+-	0x04, 0x12, 0x0c, 0x12, 0x78, 0x09, 0x18, 0x51, 
+-	0x31, 0x03, 0x04, 0x09, 0x0c, 0x09, 0xe0, 0x08, 
+-	0x78, 0x0a, 0x07, 0x12, 0x0f, 0x12, 0x02, 0x12, 
+-	0x78, 0x49, 0x43, 0x11, 0x31, 0x03, 0x04, 0x09, 
+-	0x0c, 0x09, 0x80, 0x41, 0xb0, 0x01, 0xbc, 0xf0, 
+-	0x47, 0x70, 0x00, 0x00, 0x2e, 0x08, 0x5d, 0xc4, 
+-	0x4a, 0x02, 0xc2, 0x03, 0x3a, 0x08, 0x20, 0x00, 
+-	0x60, 0x90, 0x47, 0x70, 0x2e, 0x08, 0x43, 0x70, 
+-	0x48, 0x01, 0x68, 0x80, 0x47, 0x70, 0x00, 0x00, 
+-	0x2e, 0x08, 0x43, 0x70, 0x48, 0x01, 0x68, 0x80, 
+-	0x08, 0xc0, 0x47, 0x70, 0x2e, 0x08, 0x43, 0x70, 
+-	0x48, 0x02, 0x68, 0x81, 0x08, 0xc9, 0x68, 0x00, 
+-	0x18, 0x08, 0x47, 0x70, 0x2e, 0x08, 0x43, 0x70, 
+-	0xb4, 0xf0, 0x1c, 0x03, 0x20, 0x00, 0xb0, 0x82, 
+-	0x49, 0x53, 0x91, 0x01, 0x68, 0x89, 0x18, 0xcf, 
+-	0x97, 0x00, 0x08, 0xca, 0x07, 0x4c, 0x0f, 0x64, 
+-	0x49, 0x4f, 0x68, 0x09, 0xd1, 0x32, 0x1c, 0x1f, 
+-	0xd5, 0x04, 0x42, 0x7f, 0x07, 0x7f, 0x0f, 0x7f, 
+-	0x42, 0x7f, 0xe0, 0x01, 0x07, 0x7f, 0x0f, 0x7f, 
+-	0x2f, 0x00, 0xd1, 0x27, 0x2b, 0x10, 0xd0, 0x16, 
+-	0xdc, 0x05, 0x2b, 0x00, 0xd0, 0x5a, 0x2b, 0x08, 
+-	0xd1, 0x59, 0x5c, 0x88, 0xe0, 0x81, 0x2b, 0x18, 
+-	0xd0, 0x13, 0x2b, 0x20, 0xd1, 0x53, 0x5c, 0x88, 
+-	0x06, 0x00, 0x18, 0x89, 0x78, 0x4a, 0x04, 0x12, 
+-	0x18, 0x80, 0x78, 0x8a, 0x02, 0x12, 0x18, 0x80, 
+-	0x78, 0xc9, 0x18, 0x40, 0xe0, 0x71, 0x5c, 0x88, 
+-	0x02, 0x00, 0x18, 0x89, 0x78, 0x49, 0x18, 0x40, 
+-	0xe0, 0x6b, 0x5c, 0x88, 0x04, 0x00, 0x18, 0x89, 
+-	0x78, 0x4a, 0x02, 0x12, 0x18, 0x80, 0x78, 0x89, 
+-	0x18, 0x40, 0xe0, 0x62, 0x2b, 0x00, 0xd1, 0x03, 
+-	0x20, 0x00, 0xb0, 0x02, 0xbc, 0xf0, 0x47, 0x70, 
+-	0x9f, 0x00, 0x08, 0xfd, 0x07, 0x7f, 0x0f, 0x7f, 
+-	0x2b, 0x20, 0xdc, 0x56, 0x1a, 0xae, 0x4d, 0x2f, 
+-	0x2e, 0x05, 0xd2, 0x52, 0xa3, 0x01, 0x5d, 0x9b, 
+-	0x00, 0x5b, 0x44, 0x9f, 0x02, 0x09, 0x14, 0x25, 
+-	0x38, 0x00, 0x5c, 0x88, 0x5d, 0x29, 0x40, 0x08, 
+-	0x21, 0x08, 0x1b, 0xc9, 0x40, 0xc8, 0xe0, 0x44, 
+-	0x1c, 0x50, 0x5c, 0x8a, 0x5d, 0x2b, 0x40, 0x1a, 
+-	0x02, 0x12, 0x5c, 0x08, 0x18, 0x80, 0x21, 0x08, 
+-	0x1b, 0xc9, 0x40, 0xc8, 0xe0, 0x39, 0x1c, 0x50, 
+-	0x5c, 0x8a, 0x5d, 0x2b, 0x40, 0x1a, 0x02, 0x12, 
+-	0x1c, 0x43, 0x5c, 0x08, 0x18, 0x80, 0x02, 0x00, 
+-	0x5c, 0xc9, 0x18, 0x08, 0x21, 0x08, 0x1b, 0xc9, 
+-	0x40, 0xc8, 0xe0, 0x2a, 0xe0, 0x29, 0xe0, 0x28, 
+-	0x1c, 0x50, 0x5c, 0x8a, 0x5d, 0x2b, 0x40, 0x1a, 
+-	0x02, 0x12, 0x1c, 0x43, 0x5c, 0x08, 0x18, 0x80, 
+-	0x02, 0x00, 0x1c, 0x5a, 0x5c, 0xcb, 0x18, 0x18, 
+-	0x02, 0x00, 0x5c, 0x89, 0x18, 0x08, 0x21, 0x08, 
+-	0x1b, 0xc9, 0x40, 0xc8, 0xe0, 0x15, 0x1c, 0x50, 
+-	0x5c, 0x8a, 0x5d, 0x2b, 0x40, 0x1a, 0x02, 0x12, 
+-	0x1c, 0x43, 0x5c, 0x08, 0x18, 0x80, 0x02, 0x00, 
+-	0x1c, 0x5a, 0x5c, 0xcb, 0x18, 0x18, 0x02, 0x03, 
+-	0x1c, 0x50, 0x5c, 0x8a, 0x18, 0xd2, 0x40, 0xba, 
+-	0x5c, 0x08, 0x21, 0x08, 0x1b, 0xc9, 0x40, 0xc8, 
+-	0x18, 0x80, 0x99, 0x01, 0x9f, 0x00, 0x60, 0x8f, 
+-	0xb0, 0x02, 0xbc, 0xf0, 0x47, 0x70, 0x00, 0x00, 
+-	0x2e, 0x08, 0x43, 0x70, 0x2e, 0x08, 0x00, 0x60, 
+-	0xb5, 0xb0, 0x1c, 0x07, 0x20, 0x00, 0x24, 0x00, 
+-	0x2f, 0x00, 0xdd, 0x09, 0x00, 0x85, 0x18, 0x2d, 
+-	0x00, 0x6d, 0x20, 0x04, 0xf7, 0xff, 0xff, 0x44, 
+-	0x19, 0x40, 0x34, 0x01, 0x42, 0xbc, 0xdb, 0xf5, 
+-	0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x47, 0x70, 0xb5, 0xb0, 0x1c, 0x0c, 0x1c, 0x05, 
+-	0x1c, 0x17, 0xb0, 0x90, 0xf0, 0x1b, 0xfb, 0x16, 
+-	0x49, 0x25, 0x20, 0x0c, 0xf0, 0x1b, 0xfa, 0xde, 
+-	0xf0, 0x1b, 0xfa, 0xd4, 0x4b, 0x23, 0x40, 0x18, 
+-	0xf0, 0x1b, 0xfa, 0xd4, 0xf0, 0x1b, 0xfb, 0x40, 
+-	0x20, 0x10, 0x90, 0x0a, 0x20, 0xff, 0x90, 0x0b, 
+-	0xa8, 0x0f, 0x90, 0x0c, 0x20, 0x0c, 0x90, 0x0d, 
+-	0x48, 0x1d, 0x90, 0x0e, 0xa8, 0x0a, 0xf0, 0x0f, 
+-	0xf8, 0xd5, 0xab, 0x07, 0x70, 0x1d, 0x94, 0x08, 
+-	0x72, 0x1f, 0x24, 0x00, 0xab, 0x09, 0x70, 0x5c, 
+-	0x27, 0x00, 0x4d, 0x18, 0xf0, 0x0f, 0xf9, 0x36, 
+-	0x28, 0x00, 0xd0, 0x02, 0x37, 0x01, 0x42, 0xaf, 
+-	0xdb, 0xf8, 0x20, 0x01, 0xa9, 0x07, 0xf0, 0x0f, 
+-	0xf9, 0x37, 0xf0, 0x0f, 0xf9, 0x2b, 0x28, 0x00, 
+-	0xd1, 0xfb, 0x94, 0x0b, 0xa8, 0x0a, 0xf0, 0x0f, 
+-	0xf8, 0xb9, 0xf0, 0x1b, 0xfa, 0xdf, 0x21, 0x00, 
+-	0x20, 0x0c, 0xf0, 0x1b, 0xfa, 0xa7, 0xf0, 0x1b, 
+-	0xfa, 0x9d, 0x23, 0x01, 0x02, 0xdb, 0x43, 0x18, 
+-	0xf0, 0x1b, 0xfa, 0x9c, 0xf0, 0x1b, 0xfb, 0x08, 
+-	0x46, 0x68, 0xf0, 0x0f, 0xf8, 0xf3, 0x98, 0x04, 
+-	0xb0, 0x10, 0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x00, 0x15, 0x45, 0xff, 0xff, 0xf7, 0xff, 
+-	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x27, 0x10, 
+-	0xb5, 0xff, 0x9e, 0x09, 0x1c, 0x04, 0x1c, 0x0d, 
+-	0x1c, 0x17, 0xb0, 0x93, 0xf0, 0x1b, 0xfa, 0xba, 
+-	0x49, 0x31, 0x20, 0x0c, 0xf0, 0x1b, 0xfa, 0x82, 
+-	0xf0, 0x1b, 0xfa, 0x78, 0x4b, 0x2f, 0x40, 0x18, 
+-	0xf0, 0x1b, 0xfa, 0x78, 0xf0, 0x1b, 0xfa, 0xe4, 
+-	0x20, 0x10, 0x90, 0x0d, 0x20, 0xff, 0x90, 0x0e, 
+-	0xa8, 0x12, 0x90, 0x0f, 0x20, 0x0c, 0x90, 0x10, 
+-	0x48, 0x29, 0x90, 0x11, 0xa8, 0x0d, 0xf0, 0x0f, 
+-	0xf8, 0x79, 0xab, 0x07, 0x70, 0x1c, 0x95, 0x08, 
+-	0x72, 0x1f, 0x20, 0xff, 0xab, 0x09, 0x70, 0x58, 
+-	0x1c, 0x60, 0x71, 0x18, 0x9b, 0x16, 0x93, 0x0b, 
+-	0xab, 0x0c, 0x70, 0x1e, 0x20, 0xff, 0x70, 0x58, 
+-	0x24, 0x00, 0x4d, 0x20, 0xf0, 0x0f, 0xf8, 0xd2, 
+-	0x28, 0x00, 0xd0, 0x02, 0x34, 0x01, 0x42, 0xac, 
+-	0xdb, 0xf8, 0x2f, 0x00, 0xd1, 0x04, 0x20, 0x01, 
+-	0xa9, 0x0a, 0xf0, 0x0f, 0xf8, 0xd1, 0xe0, 0x03, 
+-	0x20, 0x02, 0xa9, 0x07, 0xf0, 0x0f, 0xf8, 0xcc, 
+-	0xf0, 0x0f, 0xf8, 0xc0, 0x28, 0x00, 0xd1, 0xfb, 
+-	0x27, 0x00, 0x97, 0x0e, 0xa8, 0x0d, 0xf0, 0x0f, 
+-	0xf8, 0x4d, 0xf0, 0x1b, 0xfa, 0x73, 0x21, 0x00, 
+-	0x20, 0x0c, 0xf0, 0x1b, 0xfa, 0x3b, 0xf0, 0x1b, 
+-	0xfa, 0x31, 0x23, 0x01, 0x02, 0xdb, 0x43, 0x18, 
+-	0xf0, 0x1b, 0xfa, 0x30, 0xf0, 0x1b, 0xfa, 0x9c, 
+-	0x46, 0x68, 0xf0, 0x0f, 0xf8, 0x87, 0x98, 0x01, 
+-	0x0a, 0x80, 0xd2, 0x05, 0x20, 0x01, 0xb0, 0x13, 
+-	0xb0, 0x04, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x1c, 0x38, 0xb0, 0x13, 0xe7, 0xf8, 0x00, 0x00, 
+-	0x2e, 0x00, 0x15, 0x45, 0xff, 0xff, 0xf7, 0xff, 
+-	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x27, 0x10, 
+-	0x1c, 0x01, 0x48, 0x04, 0x61, 0xc1, 0x68, 0x00, 
+-	0x28, 0x00, 0xd1, 0x01, 0x48, 0x02, 0x60, 0x01, 
+-	0x47, 0x70, 0x00, 0x00, 0x2e, 0x08, 0x01, 0x68, 
+-	0x6e, 0x00, 0x17, 0x00, 0xb5, 0xb0, 0x4f, 0x41, 
+-	0x69, 0x38, 0x4c, 0x41, 0x28, 0x00, 0xd0, 0x07, 
+-	0x20, 0x03, 0x60, 0x20, 0x69, 0x38, 0x38, 0x01, 
+-	0x61, 0x38, 0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x21, 0x02, 0x69, 0x78, 0x28, 0x00, 0xd0, 0x04, 
+-	0x60, 0x21, 0x69, 0x78, 0x38, 0x01, 0x61, 0x78, 
+-	0xd1, 0xf3, 0x68, 0xf8, 0x28, 0x00, 0xd0, 0x20, 
+-	0x38, 0x01, 0x60, 0xf8, 0x4a, 0x35, 0xd0, 0x08, 
+-	0x68, 0xbb, 0x18, 0xd2, 0x3a, 0x20, 0x7f, 0xd2, 
+-	0x1e, 0x45, 0x40, 0xea, 0x07, 0xd2, 0x0f, 0xd2, 
+-	0xe0, 0x09, 0x68, 0xbb, 0x18, 0xd2, 0x3a, 0x20, 
+-	0x7f, 0xd2, 0x4b, 0x2f, 0x5c, 0x9a, 0x23, 0x01, 
+-	0x40, 0x5a, 0x06, 0x12, 0x0e, 0x12, 0x23, 0x01, 
+-	0x2a, 0x00, 0xd0, 0x02, 0x61, 0x79, 0x61, 0x3b, 
+-	0xe0, 0x01, 0x61, 0x39, 0x61, 0x7b, 0x28, 0x00, 
+-	0xd1, 0xcf, 0x68, 0xb8, 0x30, 0x01, 0x60, 0xb8, 
+-	0x23, 0x09, 0x68, 0x7a, 0x1c, 0x01, 0x42, 0x90, 
+-	0xdc, 0x03, 0x60, 0xfb, 0xbc, 0xb0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x20, 0x20, 0x1c, 0x55, 0x42, 0x8d, 
+-	0xd1, 0x03, 0x61, 0x78, 0xbc, 0xb0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x1c, 0x95, 0x42, 0x8d, 0xd1, 0x0d, 
+-	0x7e, 0x3d, 0x2d, 0xff, 0xd0, 0x0a, 0x2d, 0x00, 
+-	0xd0, 0x03, 0x60, 0xfb, 0xbc, 0xb0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x20, 0x19, 0x61, 0x38, 0xbc, 0xb0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x32, 0x03, 0x42, 0x8a, 
+-	0xd1, 0x04, 0x20, 0x22, 0x61, 0x78, 0xbc, 0xb0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x69, 0xf9, 0x60, 0x21, 
+-	0x68, 0x79, 0x68, 0xba, 0x31, 0x04, 0x42, 0x91, 
+-	0xd1, 0x0a, 0x69, 0xf9, 0x29, 0x00, 0xd0, 0x03, 
+-	0x61, 0x38, 0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x61, 0x78, 0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 
+-	0xf0, 0x04, 0xf8, 0xac, 0x20, 0x00, 0x60, 0x38, 
+-	0x69, 0xf8, 0x60, 0x20, 0xbc, 0xb0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x01, 0x68, 
+-	0x6e, 0x00, 0x17, 0x00, 0x2e, 0x08, 0x43, 0x7c, 
+-	0x2e, 0x08, 0x00, 0x68, 0xb5, 0xb0, 0x04, 0x0b, 
+-	0x0c, 0x1b, 0x04, 0x14, 0x0c, 0x24, 0x49, 0x14, 
+-	0x68, 0x0a, 0x2a, 0x00, 0xd0, 0x02, 0x68, 0x0a, 
+-	0x2a, 0x00, 0xd1, 0xfc, 0x22, 0x01, 0x60, 0x0a, 
+-	0x2b, 0x0a, 0xdd, 0x00, 0x23, 0x0a, 0x22, 0x00, 
+-	0x4f, 0x0e, 0x2b, 0x00, 0xdd, 0x05, 0x00, 0x55, 
+-	0x5b, 0x45, 0x54, 0xbd, 0x32, 0x01, 0x42, 0x9a, 
+-	0xdb, 0xf9, 0x76, 0x0c, 0x20, 0xff, 0x18, 0xfa, 
+-	0x70, 0x50, 0x20, 0x00, 0x60, 0x4b, 0x22, 0x20, 
+-	0x61, 0x08, 0x61, 0x4a, 0x60, 0x88, 0x60, 0xc8, 
+-	0x49, 0x05, 0x20, 0x32, 0xf0, 0x04, 0xf8, 0x48, 
+-	0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x01, 0x68, 0x2e, 0x08, 0x43, 0x7c, 
+-	0x2e, 0x00, 0x17, 0x01, 0xb5, 0x80, 0x04, 0x01, 
+-	0x0c, 0x09, 0x20, 0x00, 0x22, 0x00, 0xb0, 0x88, 
+-	0x00, 0x47, 0x46, 0x6b, 0x53, 0xda, 0x30, 0x01, 
+-	0x04, 0x00, 0x14, 0x00, 0x28, 0x10, 0xdb, 0xf7, 
+-	0x22, 0x80, 0x00, 0x43, 0x46, 0x68, 0x52, 0xc2, 
+-	0x46, 0x6a, 0x1c, 0x08, 0x21, 0x05, 0xf0, 0x04, 
+-	0xfb, 0x17, 0x49, 0x06, 0x80, 0x88, 0x00, 0x42, 
+-	0x18, 0x12, 0x00, 0x92, 0x4b, 0x04, 0x5a, 0x9a, 
+-	0x81, 0x0a, 0xb0, 0x08, 0xbc, 0x80, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x01, 0x88, 
+-	0x2e, 0x08, 0x47, 0x78, 0xb5, 0xf0, 0xb0, 0xb3, 
+-	0xa8, 0x01, 0xf0, 0x0f, 0xfd, 0xc9, 0x49, 0x61, 
+-	0x68, 0x0f, 0x68, 0x4d, 0x68, 0x8c, 0x03, 0x20, 
+-	0x05, 0x2a, 0x0d, 0x12, 0x43, 0x10, 0x04, 0x00, 
+-	0x0c, 0x00, 0x4b, 0x5d, 0x8e, 0x9a, 0x2a, 0x00, 
+-	0xd1, 0x16, 0x89, 0xda, 0x42, 0x90, 0xd0, 0x01, 
+-	0x22, 0x01, 0xe0, 0x00, 0x22, 0x00, 0x89, 0x9e, 
+-	0x42, 0xb7, 0xd0, 0x01, 0x26, 0x01, 0xe0, 0x00, 
+-	0x26, 0x00, 0x43, 0x32, 0xd0, 0x08, 0x81, 0x9f, 
+-	0x81, 0xd8, 0x20, 0x00, 0x85, 0x58, 0x20, 0x0d, 
+-	0x85, 0x18, 0x20, 0x01, 0x02, 0x40, 0x86, 0x98, 
+-	0x68, 0xce, 0x69, 0x08, 0x90, 0x00, 0x1c, 0x38, 
+-	0x1c, 0x29, 0x1c, 0x32, 0xf0, 0x00, 0xfa, 0x72, 
+-	0x1c, 0x20, 0xf0, 0x00, 0xfb, 0x8d, 0xa0, 0x4b, 
+-	0x22, 0x00, 0x21, 0x11, 0xf0, 0x04, 0xff, 0xc2, 
+-	0x22, 0x0a, 0x21, 0x11, 0x98, 0x1b, 0xf0, 0x05, 
+-	0xf8, 0x1f, 0x22, 0x14, 0x21, 0x11, 0x1c, 0x38, 
+-	0xf0, 0x05, 0xf8, 0x1a, 0x22, 0x1e, 0x21, 0x11, 
+-	0x1c, 0x28, 0xf0, 0x05, 0xf8, 0x15, 0x22, 0x28, 
+-	0x21, 0x11, 0x1c, 0x20, 0xf0, 0x05, 0xf8, 0x10, 
+-	0x22, 0x32, 0x21, 0x11, 0x1c, 0x30, 0xf0, 0x05, 
+-	0xf8, 0x0b, 0x22, 0x3c, 0x21, 0x11, 0x98, 0x00, 
+-	0xf0, 0x05, 0xf8, 0x06, 0xa0, 0x3b, 0x22, 0x00, 
+-	0x21, 0x13, 0xf0, 0x04, 0xff, 0x9f, 0x22, 0x0a, 
+-	0x21, 0x13, 0x4f, 0x35, 0x8d, 0x78, 0xf0, 0x04, 
+-	0xff, 0xfb, 0xa0, 0x38, 0x22, 0x14, 0x21, 0x13, 
+-	0xf0, 0x04, 0xff, 0x94, 0x22, 0x1e, 0x21, 0x13, 
+-	0x8d, 0xf8, 0xf0, 0x04, 0xff, 0xf1, 0xa0, 0x35, 
+-	0x22, 0x00, 0x21, 0x14, 0xf0, 0x04, 0xff, 0x8a, 
+-	0x22, 0x0a, 0x21, 0x14, 0x8e, 0xb8, 0xf0, 0x04, 
+-	0xff, 0xe7, 0xa0, 0x32, 0x22, 0x14, 0x21, 0x14, 
+-	0xf0, 0x04, 0xff, 0x80, 0x22, 0x1e, 0x21, 0x14, 
+-	0x8e, 0xf8, 0xf0, 0x04, 0xff, 0xdd, 0xa0, 0x2f, 
+-	0x22, 0x28, 0x21, 0x14, 0xf0, 0x04, 0xff, 0x76, 
+-	0x22, 0x32, 0x21, 0x14, 0x48, 0x2e, 0x6f, 0xc0, 
+-	0xf0, 0x04, 0xff, 0xd2, 0xa0, 0x2d, 0x22, 0x00, 
+-	0x21, 0x15, 0xf0, 0x04, 0xff, 0x6b, 0x22, 0x0a, 
+-	0x21, 0x15, 0x8d, 0x38, 0xf0, 0x04, 0xff, 0xc8, 
+-	0xa0, 0x2b, 0x22, 0x14, 0x21, 0x15, 0xf0, 0x04, 
+-	0xff, 0x61, 0x22, 0x1e, 0x21, 0x15, 0x8d, 0xb8, 
+-	0xf0, 0x04, 0xff, 0xbe, 0xa0, 0x29, 0x22, 0x00, 
+-	0x21, 0x10, 0xf0, 0x04, 0xff, 0x57, 0xf0, 0x0f, 
+-	0xfe, 0xf1, 0x22, 0x0a, 0x21, 0x10, 0xf0, 0x04, 
+-	0xff, 0xb3, 0xa0, 0x26, 0x22, 0x14, 0x21, 0x10, 
+-	0xf0, 0x04, 0xff, 0x4c, 0x22, 0x1e, 0x21, 0x10, 
+-	0x27, 0x33, 0x06, 0x7f, 0x6d, 0x78, 0xf0, 0x04, 
+-	0xff, 0xa7, 0xa0, 0x22, 0x22, 0x28, 0x21, 0x10, 
+-	0xf0, 0x04, 0xff, 0x40, 0xf0, 0x0f, 0xfe, 0xda, 
+-	0x6d, 0x79, 0x1a, 0x08, 0x22, 0x32, 0x21, 0x10, 
+-	0xf0, 0x04, 0xff, 0x9a, 0xb0, 0x33, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0xcc, 0x00, 0x0c, 0x00, 
+-	0x2c, 0x00, 0x1f, 0xc0, 0x73, 0x74, 0x61, 0x74, 
+-	0x73, 0x3a, 0x00, 0x00, 0x72, 0x78, 0x6c, 0x65, 
+-	0x6e, 0x3a, 0x00, 0x00, 0x74, 0x78, 0x6c, 0x65, 
+-	0x6e, 0x3a, 0x00, 0x00, 0x72, 0x78, 0x62, 0x75, 
+-	0x66, 0x66, 0x3a, 0x00, 0x74, 0x78, 0x62, 0x75, 
+-	0x66, 0x66, 0x3a, 0x00, 0x69, 0x66, 0x5f, 0x75, 
+-	0x73, 0x65, 0x64, 0x3a, 0x00, 0x00, 0x00, 0x00, 
+-	0x2c, 0x00, 0x1f, 0x80, 0x72, 0x78, 0x73, 0x74, 
+-	0x61, 0x74, 0x65, 0x3a, 0x00, 0x00, 0x00, 0x00, 
+-	0x74, 0x78, 0x73, 0x74, 0x61, 0x74, 0x65, 0x3a, 
+-	0x00, 0x00, 0x00, 0x00, 0x65, 0x6e, 0x64, 0x63, 
+-	0x75, 0x72, 0x3a, 0x00, 0x76, 0x69, 0x64, 0x62, 
+-	0x75, 0x66, 0x3a, 0x00, 0x6f, 0x73, 0x64, 0x3a, 
+-	0x00, 0x00, 0x00, 0x00, 0xb5, 0xf0, 0x25, 0x00, 
+-	0x20, 0x00, 0x49, 0x19, 0x81, 0xc8, 0x81, 0x88, 
+-	0x4e, 0x18, 0x4c, 0x19, 0x4f, 0x19, 0x68, 0x30, 
+-	0x68, 0x00, 0x00, 0x40, 0x0a, 0x40, 0x02, 0x40, 
+-	0x21, 0x19, 0x06, 0x89, 0x6a, 0x89, 0x4b, 0x16, 
+-	0x40, 0x19, 0x0a, 0x49, 0x43, 0x08, 0x49, 0x15, 
+-	0x64, 0x08, 0xf0, 0x01, 0xfc, 0x57, 0xf0, 0x02, 
+-	0xf9, 0x6b, 0x68, 0x38, 0x30, 0x01, 0x60, 0x38, 
+-	0x48, 0x11, 0x88, 0x01, 0x31, 0x01, 0x80, 0x01, 
+-	0x20, 0x0c, 0x68, 0x21, 0xf0, 0x17, 0xf8, 0x9a, 
+-	0x29, 0x00, 0xd1, 0x01, 0xf7, 0xff, 0xfe, 0xd6, 
+-	0x20, 0x32, 0x68, 0x21, 0xf0, 0x17, 0xf8, 0x92, 
+-	0x42, 0x85, 0xd0, 0xd8, 0x1c, 0x05, 0xf0, 0x00, 
+-	0xfe, 0x39, 0x20, 0x00, 0x60, 0x38, 0xe7, 0xd2, 
+-	0x2c, 0x00, 0x1f, 0xc0, 0x2e, 0x08, 0x5e, 0x38, 
+-	0x2e, 0x08, 0x05, 0xb0, 0x2e, 0x08, 0x01, 0x88, 
+-	0x00, 0x03, 0xfe, 0x00, 0x2c, 0x00, 0x1f, 0x80, 
+-	0x2c, 0x00, 0x1f, 0xc8, 0xb5, 0xf0, 0x27, 0x00, 
+-	0xb0, 0x94, 0x46, 0x68, 0x4c, 0x2f, 0xcc, 0x6e, 
+-	0xc0, 0x6e, 0xcc, 0x6e, 0xc0, 0x6e, 0x23, 0x28, 
+-	0x22, 0x41, 0x00, 0xd2, 0x21, 0x00, 0x20, 0x01, 
+-	0xf0, 0x08, 0xfa, 0x30, 0x22, 0xff, 0x21, 0x64, 
+-	0x20, 0x01, 0x32, 0xf5, 0xf0, 0x08, 0xfa, 0xf2, 
+-	0x20, 0x00, 0x46, 0x69, 0x5c, 0x09, 0x40, 0x41, 
+-	0x23, 0x35, 0x40, 0x59, 0xaa, 0x0a, 0x54, 0x11, 
+-	0x30, 0x01, 0x28, 0x25, 0xdb, 0xf5, 0x24, 0x00, 
+-	0xa9, 0x0a, 0x54, 0x0c, 0x22, 0x00, 0x20, 0x01, 
+-	0x1c, 0x23, 0xf0, 0x08, 0xfd, 0x50, 0x4e, 0x1e, 
+-	0x4d, 0x1e, 0x4c, 0x1f, 0xf0, 0x03, 0xff, 0x80, 
+-	0xf0, 0x03, 0xff, 0x7e, 0x28, 0x28, 0xd9, 0x10, 
+-	0x42, 0xb0, 0xd3, 0x0e, 0x69, 0xe9, 0x08, 0xc9, 
+-	0xd3, 0x0b, 0x4b, 0x1a, 0x18, 0xc1, 0x20, 0x1e, 
+-	0xf0, 0x17, 0xf8, 0x40, 0x21, 0x64, 0x1d, 0xc2, 
+-	0x32, 0xff, 0x32, 0xee, 0x20, 0x01, 0xf0, 0x08, 
+-	0xfa, 0xc5, 0xf0, 0x01, 0xfb, 0xe7, 0xf0, 0x02, 
+-	0xf8, 0xfb, 0xf0, 0x03, 0xff, 0x65, 0x1c, 0x01, 
+-	0x20, 0x7d, 0x00, 0xc0, 0xf0, 0x17, 0xf8, 0x2e, 
+-	0x1c, 0x01, 0x48, 0x0f, 0x88, 0x02, 0x32, 0x01, 
+-	0x80, 0x02, 0x42, 0xb9, 0xd0, 0xd6, 0x2f, 0x04, 
+-	0xd3, 0x06, 0x20, 0x01, 0xf0, 0x08, 0xf9, 0xce, 
+-	0xb0, 0x14, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x1c, 0x0f, 0xf0, 0x00, 0xfd, 0xc7, 0x20, 0x00, 
+-	0x60, 0x20, 0xe7, 0xc7, 0x2e, 0x02, 0x5e, 0x00, 
+-	0x00, 0x00, 0x0b, 0xb8, 0x72, 0x00, 0x01, 0x00, 
+-	0x2e, 0x08, 0x01, 0x88, 0xff, 0xff, 0xf4, 0x48, 
+-	0x2c, 0x00, 0x1f, 0xc8, 0xb5, 0x80, 0x27, 0x00, 
+-	0x48, 0x07, 0x81, 0x07, 0xf0, 0x03, 0xfd, 0x5e, 
+-	0xf7, 0xff, 0xff, 0x88, 0xf0, 0x00, 0xf8, 0xce, 
+-	0xf0, 0x05, 0xfe, 0xfe, 0xf7, 0xff, 0xff, 0x3e, 
+-	0x1c, 0x38, 0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2c, 0x00, 0x1f, 0xc0, 0xb5, 0xf0, 0x4d, 0x29, 
+-	0x68, 0x01, 0x31, 0x03, 0x10, 0x89, 0x1e, 0xcb, 
+-	0x68, 0x41, 0x10, 0x89, 0x68, 0x82, 0x10, 0x92, 
+-	0x00, 0x89, 0x30, 0x0c, 0x18, 0x0c, 0x21, 0x03, 
+-	0x05, 0x89, 0x27, 0x35, 0x06, 0x7f, 0x60, 0x39, 
+-	0x49, 0x21, 0x68, 0x0e, 0x08, 0xb6, 0x00, 0xb6, 
+-	0x60, 0x0e, 0x21, 0x00, 0x2b, 0x00, 0xd9, 0x04, 
+-	0xc8, 0x40, 0xc5, 0x40, 0x31, 0x01, 0x42, 0x99, 
+-	0xd3, 0xfa, 0x23, 0x00, 0x49, 0x1b, 0x65, 0x8b, 
+-	0x20, 0x00, 0x2a, 0x00, 0xd9, 0x04, 0xcc, 0x20, 
+-	0x64, 0x8d, 0x30, 0x01, 0x42, 0x90, 0xd3, 0xfa, 
+-	0x48, 0x17, 0x60, 0x03, 0x60, 0x3b, 0x66, 0x8b, 
+-	0x60, 0x3b, 0x22, 0x01, 0x64, 0xca, 0x21, 0x00, 
+-	0x4a, 0x14, 0x68, 0x03, 0x2b, 0x00, 0xd1, 0x05, 
+-	0x33, 0x01, 0x2b, 0x64, 0xdb, 0xfc, 0x31, 0x01, 
+-	0x42, 0x91, 0xdb, 0xf6, 0x48, 0x10, 0x68, 0x01, 
+-	0x23, 0x01, 0x43, 0x19, 0x60, 0x01, 0x49, 0x0f, 
+-	0x20, 0x33, 0x06, 0x40, 0x65, 0x41, 0x49, 0x0e, 
+-	0x65, 0x81, 0x49, 0x0e, 0x66, 0x81, 0x39, 0x04, 
+-	0x66, 0x41, 0x21, 0x03, 0x67, 0x01, 0x21, 0x00, 
+-	0x20, 0x0d, 0xf0, 0x0f, 0xf9, 0xc9, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0xcc, 0x00, 0x00, 0x00, 
+-	0x66, 0x00, 0x00, 0x70, 0x6a, 0x00, 0x00, 0x80, 
+-	0xcc, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x27, 0x10, 
+-	0x6a, 0x00, 0x00, 0x10, 0xcc, 0x00, 0x0f, 0x84, 
+-	0xcc, 0x00, 0x0f, 0x88, 0x98, 0x00, 0x0f, 0x88, 
+-	0xb5, 0x00, 0x22, 0x00, 0x21, 0x00, 0x20, 0x08, 
+-	0xf0, 0x0f, 0xfe, 0x04, 0x48, 0x08, 0x21, 0x40, 
+-	0xf0, 0x0f, 0xfa, 0xd4, 0x20, 0x01, 0x21, 0x35, 
+-	0x06, 0x49, 0x61, 0x08, 0x20, 0x02, 0x43, 0xc0, 
+-	0x49, 0x04, 0x63, 0x08, 0x20, 0x00, 0x21, 0x39, 
+-	0x06, 0x49, 0x62, 0xc8, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x01, 0xcc, 0x90, 0x72, 0x00, 0x01, 0x00, 
+-	0xb5, 0x00, 0x1c, 0x01, 0x48, 0x0f, 0xd0, 0x10, 
+-	0x29, 0x01, 0xd0, 0x12, 0x29, 0x02, 0xd0, 0x14, 
+-	0x29, 0x03, 0xd1, 0x01, 0x49, 0x0c, 0x60, 0x01, 
+-	0x68, 0x01, 0x68, 0x40, 0x43, 0x08, 0x22, 0x00, 
+-	0x21, 0x1e, 0xf0, 0x0f, 0xfe, 0x43, 0xbc, 0x08, 
+-	0x47, 0x18, 0x21, 0x01, 0x04, 0x49, 0x60, 0x01, 
+-	0xe7, 0xf2, 0x21, 0x21, 0x03, 0x09, 0x60, 0x01, 
+-	0xe7, 0xee, 0x21, 0x41, 0x03, 0x09, 0x60, 0x01, 
+-	0xe7, 0xea, 0x00, 0x00, 0x2e, 0x08, 0x01, 0x94, 
+-	0x00, 0x08, 0x10, 0x08, 0xb5, 0x00, 0x1c, 0x01, 
+-	0x48, 0x0b, 0xd0, 0x0e, 0x29, 0x01, 0xd0, 0x0f, 
+-	0x29, 0x02, 0xd1, 0x01, 0x21, 0x04, 0x60, 0x41, 
+-	0x68, 0x01, 0x68, 0x40, 0x43, 0x08, 0x22, 0x00, 
+-	0x21, 0x1e, 0xf0, 0x0f, 0xfe, 0x1f, 0xbc, 0x08, 
+-	0x47, 0x18, 0x21, 0x01, 0x60, 0x41, 0xe7, 0xf3, 
+-	0x21, 0x02, 0x60, 0x41, 0xe7, 0xf0, 0x00, 0x00, 
+-	0x2e, 0x08, 0x01, 0x94, 0xb5, 0x80, 0x4b, 0x09, 
+-	0x22, 0x0a, 0x21, 0x0a, 0x20, 0x0b, 0xf0, 0x10, 
+-	0xf8, 0x53, 0x20, 0x0b, 0xf0, 0x10, 0xf9, 0x75, 
+-	0x4f, 0x05, 0x60, 0x38, 0x00, 0x80, 0xf0, 0x03, 
+-	0xff, 0x45, 0x60, 0x78, 0xbc, 0x80, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x01, 0xc0, 
+-	0x2e, 0x08, 0x01, 0xd0, 0xb5, 0xb0, 0x25, 0x00, 
+-	0x1c, 0x0c, 0x1c, 0x07, 0x2a, 0x08, 0xd2, 0x30, 
+-	0xa3, 0x01, 0x5c, 0x9b, 0x00, 0x5b, 0x44, 0x9f, 
+-	0x2c, 0x29, 0x29, 0x03, 0x29, 0x29, 0x03, 0x29, 
+-	0x20, 0x00, 0xf0, 0x00, 0xf8, 0x4d, 0x23, 0x2d, 
+-	0x01, 0x1b, 0x42, 0x9f, 0xd0, 0x13, 0x23, 0x0b, 
+-	0x01, 0x9b, 0x42, 0x9f, 0xd0, 0x0f, 0x23, 0xff, 
+-	0x33, 0xe1, 0x42, 0x9f, 0xd0, 0x0b, 0x23, 0xff, 
+-	0x33, 0x61, 0x42, 0x9f, 0xd0, 0x07, 0x23, 0x21, 
+-	0x01, 0x1b, 0x42, 0x9f, 0xd0, 0x03, 0x23, 0x11, 
+-	0x01, 0x5b, 0x42, 0x9f, 0xd1, 0x08, 0x23, 0x09, 
+-	0x01, 0x9b, 0x42, 0x9c, 0xd0, 0x09, 0x08, 0x5b, 
+-	0x42, 0x9c, 0xd0, 0x06, 0x2c, 0xf0, 0xd0, 0x04, 
+-	0x25, 0x01, 0xe0, 0x02, 0x20, 0x01, 0xf0, 0x00, 
+-	0xf8, 0x27, 0x4f, 0x12, 0x6c, 0x78, 0x42, 0x85, 
+-	0xd0, 0x1c, 0x1d, 0xfb, 0x33, 0x35, 0x2d, 0x00, 
+-	0xd0, 0x12, 0x1f, 0xda, 0x3a, 0x0d, 0x21, 0x03, 
+-	0x1d, 0x10, 0xb4, 0x07, 0x22, 0x0b, 0xb4, 0x04, 
+-	0x1c, 0x19, 0x23, 0x00, 0x22, 0x00, 0x20, 0x00, 
+-	0xf0, 0x0a, 0xfc, 0x4c, 0x6a, 0xb8, 0x1c, 0x29, 
+-	0xb0, 0x04, 0xf0, 0x0b, 0xfd, 0x9b, 0xe0, 0x04, 
+-	0x21, 0x00, 0x6a, 0xb8, 0x1c, 0x1a, 0xf0, 0x0a, 
+-	0xff, 0x51, 0x64, 0x7d, 0xbc, 0xb0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x01, 0x94, 
+-	0xb5, 0xf0, 0x1c, 0x07, 0xb0, 0x81, 0x4d, 0x56, 
+-	0x1d, 0xee, 0x36, 0x19, 0x79, 0x30, 0x42, 0x87, 
+-	0xd1, 0x03, 0xb0, 0x01, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x24, 0x00, 0x6c, 0x68, 0x28, 0x00, 
+-	0xd0, 0x05, 0x64, 0x6c, 0x4a, 0x4f, 0x21, 0x00, 
+-	0x6a, 0xa8, 0xf0, 0x0a, 0xff, 0x33, 0x71, 0x37, 
+-	0x21, 0x00, 0x20, 0x0e, 0xf0, 0x0f, 0xf8, 0xc4, 
+-	0x20, 0x00, 0xf0, 0x0c, 0xfb, 0xc5, 0x20, 0x1f, 
+-	0xf0, 0x09, 0xfc, 0x5a, 0x26, 0x03, 0x02, 0x76, 
+-	0x22, 0x01, 0x02, 0xd2, 0x21, 0x02, 0x20, 0x1f, 
+-	0x1c, 0x33, 0xf0, 0x09, 0xfa, 0xd1, 0x20, 0x1e, 
+-	0xf0, 0x09, 0xfd, 0x18, 0x22, 0x01, 0x02, 0xd2, 
+-	0x21, 0x02, 0x20, 0x1e, 0x1c, 0x33, 0xf0, 0x09, 
+-	0xfa, 0xc7, 0x1c, 0x39, 0x27, 0x1c, 0x48, 0x3e, 
+-	0x26, 0x0c, 0x29, 0x06, 0xd2, 0x07, 0xa3, 0x02, 
+-	0x5c, 0x5b, 0x00, 0x5b, 0x44, 0x9f, 0x1c, 0x00, 
+-	0x03, 0x12, 0x03, 0x21, 0x12, 0x30, 0x48, 0x39, 
+-	0x21, 0x40, 0xf0, 0x0f, 0xf9, 0xc3, 0xab, 0x00, 
+-	0x70, 0x1c, 0x20, 0x08, 0x70, 0x58, 0x70, 0x9f, 
+-	0x70, 0xdc, 0x22, 0x00, 0x21, 0x00, 0xf0, 0x0f, 
+-	0xfc, 0xe5, 0xe0, 0x2b, 0x21, 0x1f, 0x43, 0xc9, 
+-	0xf0, 0x0f, 0xf9, 0xb4, 0xab, 0x00, 0x70, 0x1c, 
+-	0x70, 0x5c, 0x70, 0x9e, 0x70, 0xdc, 0x22, 0x00, 
+-	0x21, 0x00, 0x20, 0x00, 0xf0, 0x0f, 0xfc, 0xd6, 
+-	0xe0, 0x1c, 0x21, 0x40, 0xf0, 0x0f, 0xf9, 0xa6, 
+-	0xab, 0x00, 0x70, 0x1c, 0x20, 0x10, 0x70, 0x58, 
+-	0x70, 0x9f, 0x70, 0xdc, 0x22, 0x00, 0x21, 0x00, 
+-	0x20, 0x08, 0xf0, 0x0f, 0xfc, 0xc7, 0xe0, 0x0d, 
+-	0x21, 0x1f, 0x43, 0xc9, 0xf0, 0x0f, 0xf9, 0x96, 
+-	0xab, 0x00, 0x70, 0x1c, 0x70, 0x5c, 0x70, 0x9e, 
+-	0x70, 0xdc, 0x22, 0x00, 0x21, 0x00, 0x20, 0x08, 
+-	0xf0, 0x0f, 0xfc, 0xb8, 0x20, 0x01, 0x21, 0x35, 
+-	0x06, 0x49, 0x61, 0x08, 0x20, 0x02, 0x43, 0xc0, 
+-	0x49, 0x19, 0x63, 0x08, 0x20, 0x39, 0x06, 0x40, 
+-	0x62, 0xc4, 0xcd, 0x03, 0x43, 0x08, 0x22, 0x00, 
+-	0x21, 0x1e, 0xf0, 0x0f, 0xfd, 0x0f, 0x48, 0x15, 
+-	0xf0, 0x0c, 0xfa, 0xd0, 0x20, 0x00, 0xf0, 0x0c, 
+-	0xfb, 0x41, 0x20, 0x00, 0xf0, 0x00, 0xf8, 0x68, 
+-	0x20, 0x00, 0xf0, 0x03, 0xfb, 0x3f, 0x20, 0x01, 
+-	0xf0, 0x0c, 0xfb, 0x46, 0x4a, 0x0e, 0xb4, 0x04, 
+-	0x1c, 0x13, 0x3a, 0x01, 0x49, 0x0d, 0x1e, 0xc8, 
+-	0xf7, 0xfe, 0xfb, 0x4e, 0x21, 0x00, 0x20, 0x0d, 
+-	0xb0, 0x01, 0xf0, 0x0f, 0xf8, 0x35, 0xb0, 0x01, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x01, 0x94, 0x2e, 0x08, 0x01, 0xd0, 
+-	0x2e, 0x02, 0x12, 0xfc, 0x2e, 0x01, 0xcc, 0x90, 
+-	0x72, 0x00, 0x01, 0x00, 0x00, 0x80, 0x10, 0x80, 
+-	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xfe, 
+-	0xb5, 0xb0, 0x1c, 0x07, 0x4c, 0x10, 0x6a, 0x20, 
+-	0x42, 0x87, 0xd0, 0x19, 0x20, 0x00, 0x2f, 0x03, 
+-	0xd1, 0x02, 0x21, 0x01, 0x61, 0x61, 0xe0, 0x00, 
+-	0x61, 0x60, 0x21, 0x02, 0x4d, 0x0b, 0x60, 0x29, 
+-	0x71, 0x28, 0x71, 0x68, 0x22, 0x01, 0xb4, 0x04, 
+-	0x7a, 0x23, 0x7c, 0x22, 0x7b, 0x21, 0x20, 0x00, 
+-	0xf0, 0x0f, 0xfb, 0x02, 0x69, 0x61, 0x1c, 0x28, 
+-	0xb0, 0x01, 0xf0, 0x10, 0xfb, 0xa9, 0x62, 0x27, 
+-	0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x01, 0x94, 0x2e, 0x08, 0x01, 0xac, 
+-	0xb5, 0x00, 0x22, 0x02, 0x49, 0x09, 0x60, 0x0a, 
+-	0x22, 0x00, 0x71, 0x0a, 0x71, 0x4a, 0x39, 0x48, 
+-	0x28, 0x00, 0xd0, 0x08, 0x28, 0x01, 0xd1, 0x00, 
+-	0x72, 0x08, 0x6a, 0x08, 0x62, 0x0a, 0xf7, 0xff, 
+-	0xff, 0xc7, 0xbc, 0x08, 0x47, 0x18, 0x72, 0x0a, 
+-	0xe7, 0xf7, 0x00, 0x00, 0x2e, 0x08, 0x01, 0xdc, 
+-	0xb5, 0x80, 0x06, 0x00, 0x0e, 0x00, 0x4f, 0x0b, 
+-	0xd0, 0x02, 0x20, 0x00, 0x73, 0x38, 0xe0, 0x01, 
+-	0x20, 0x01, 0x73, 0x38, 0x22, 0x01, 0xb4, 0x04, 
+-	0x7a, 0x3b, 0x7c, 0x3a, 0x7b, 0x39, 0x20, 0x00, 
+-	0xf0, 0x0f, 0xfa, 0xca, 0x69, 0x79, 0xb0, 0x01, 
+-	0x48, 0x03, 0xf0, 0x10, 0xfb, 0x71, 0xbc, 0x80, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x01, 0x94, 
+-	0x2e, 0x08, 0x01, 0xac, 0xb5, 0x80, 0x06, 0x00, 
+-	0x0e, 0x00, 0x1c, 0x01, 0x4f, 0x08, 0x74, 0x39, 
+-	0x22, 0x01, 0xb4, 0x04, 0x7a, 0x3b, 0x7b, 0x39, 
+-	0x1c, 0x02, 0x20, 0x00, 0xf0, 0x0f, 0xfa, 0xb0, 
+-	0x69, 0x79, 0xb0, 0x01, 0x48, 0x03, 0xf0, 0x10, 
+-	0xfb, 0x57, 0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x01, 0x94, 0x2e, 0x08, 0x01, 0xac, 
+-	0xb4, 0xb0, 0x21, 0x00, 0x48, 0x08, 0x60, 0x01, 
+-	0x20, 0x00, 0x4c, 0x08, 0x4f, 0x08, 0x4b, 0x09, 
+-	0x4a, 0x09, 0x00, 0x85, 0x51, 0x61, 0x54, 0x39, 
+-	0x54, 0x19, 0x54, 0x11, 0x30, 0x01, 0x28, 0x20, 
+-	0xdb, 0xf7, 0xbc, 0xb0, 0x47, 0x70, 0x00, 0x00, 
+-	0x2e, 0x08, 0x01, 0xe4, 0x2e, 0x08, 0x43, 0x88, 
+-	0x2e, 0x08, 0x44, 0x08, 0x2e, 0x08, 0x44, 0x48, 
+-	0x2e, 0x08, 0x44, 0x28, 0x06, 0x00, 0x0e, 0x00, 
+-	0x21, 0x01, 0x40, 0x81, 0x43, 0xca, 0x49, 0x05, 
+-	0x68, 0x0b, 0x40, 0x1a, 0x60, 0x0a, 0x21, 0x00, 
+-	0x00, 0x82, 0x4b, 0x03, 0x50, 0x99, 0x4a, 0x03, 
+-	0x54, 0x11, 0x47, 0x70, 0x2e, 0x08, 0x01, 0xe4, 
+-	0x2e, 0x08, 0x43, 0x88, 0x2e, 0x08, 0x44, 0x08, 
+-	0xb5, 0xf0, 0xb0, 0x84, 0x4f, 0x36, 0x68, 0x38, 
+-	0x1d, 0xc1, 0x31, 0x0d, 0x20, 0x00, 0xf0, 0x23, 
+-	0xfb, 0xc1, 0x1c, 0x04, 0x68, 0x38, 0x1d, 0xc1, 
+-	0x31, 0x05, 0x20, 0x00, 0xf0, 0x23, 0xfb, 0xba, 
+-	0x1c, 0x05, 0x68, 0x38, 0x1d, 0xc1, 0x31, 0x09, 
+-	0x20, 0x00, 0xf0, 0x23, 0xfb, 0xb3, 0x43, 0x2c, 
+-	0x1c, 0x20, 0x4c, 0x2c, 0x68, 0x21, 0x43, 0x08, 
+-	0x27, 0x00, 0x60, 0x20, 0x1c, 0x05, 0xd0, 0x4a, 
+-	0x48, 0x29, 0x90, 0x03, 0x48, 0x29, 0x90, 0x02, 
+-	0x4a, 0x29, 0x92, 0x01, 0x4e, 0x29, 0x08, 0x68, 
+-	0xd3, 0x3c, 0x98, 0x03, 0x5d, 0xc0, 0x28, 0x00, 
+-	0xd0, 0x32, 0x98, 0x02, 0x5d, 0xc0, 0x28, 0x00, 
+-	0xd0, 0x2a, 0x46, 0x68, 0x1c, 0x39, 0xf0, 0x10, 
+-	0xff, 0x69, 0xa8, 0x00, 0x78, 0x00, 0x28, 0x01, 
+-	0xd1, 0x1b, 0x68, 0x60, 0x30, 0x01, 0x60, 0x60, 
+-	0x5d, 0xf0, 0x28, 0x00, 0xd1, 0x06, 0x20, 0xff, 
+-	0x55, 0xf0, 0x21, 0x00, 0x00, 0xb8, 0x9a, 0x01, 
+-	0x50, 0x11, 0xe0, 0x1f, 0x20, 0x02, 0x1c, 0x39, 
+-	0xf0, 0x00, 0xf8, 0x8e, 0x28, 0x00, 0xd1, 0x19, 
+-	0x21, 0x00, 0x55, 0xf1, 0x20, 0x01, 0x40, 0xb8, 
+-	0x43, 0xc0, 0x68, 0x21, 0x40, 0x08, 0x60, 0x20, 
+-	0xe0, 0x10, 0x20, 0x01, 0x40, 0xb8, 0x43, 0xc0, 
+-	0x68, 0x21, 0x40, 0x08, 0x60, 0x20, 0xe0, 0x09, 
+-	0x68, 0x60, 0x30, 0x01, 0x60, 0x60, 0xe0, 0x05, 
+-	0x20, 0x01, 0x40, 0xb8, 0x43, 0xc0, 0x68, 0x21, 
+-	0x40, 0x08, 0x60, 0x20, 0x1c, 0x78, 0x06, 0x07, 
+-	0x0e, 0x3f, 0x08, 0x6d, 0xd1, 0xbb, 0xb0, 0x04, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x5e, 0x0c, 0x2e, 0x08, 0x01, 0xe4, 
+-	0x2e, 0x08, 0x44, 0x28, 0x2e, 0x08, 0x44, 0x48, 
+-	0x2e, 0x08, 0x43, 0x88, 0x2e, 0x08, 0x44, 0x08, 
+-	0xb5, 0xf0, 0x27, 0x00, 0xb0, 0x85, 0x4c, 0x26, 
+-	0x68, 0x25, 0x2d, 0x00, 0xd0, 0x44, 0x4e, 0x25, 
+-	0x48, 0x25, 0x90, 0x04, 0x49, 0x25, 0x91, 0x03, 
+-	0x4a, 0x25, 0x92, 0x02, 0x48, 0x25, 0x90, 0x01, 
+-	0x08, 0x68, 0xd3, 0x34, 0x5d, 0xf0, 0x28, 0x00, 
+-	0xd0, 0x2b, 0x98, 0x04, 0x5d, 0xc0, 0x28, 0x00, 
+-	0xd0, 0x2d, 0x46, 0x68, 0x1c, 0x39, 0xf0, 0x10, 
+-	0xff, 0x05, 0xa8, 0x00, 0x78, 0x00, 0x28, 0x01, 
+-	0xd1, 0x18, 0x68, 0x60, 0x30, 0x01, 0x60, 0x60, 
+-	0x00, 0xb8, 0x99, 0x03, 0x58, 0x09, 0x69, 0x09, 
+-	0x9a, 0x02, 0x50, 0x11, 0x20, 0x02, 0x1c, 0x39, 
+-	0xf0, 0x00, 0xf8, 0x2e, 0x28, 0x00, 0xd1, 0x16, 
+-	0x21, 0x00, 0x98, 0x01, 0x55, 0xc1, 0x20, 0x01, 
+-	0x40, 0xb8, 0x43, 0xc0, 0x68, 0x21, 0x40, 0x08, 
+-	0x60, 0x20, 0xe0, 0x0c, 0x20, 0x01, 0x40, 0xb8, 
+-	0x43, 0xc0, 0x68, 0x21, 0x40, 0x08, 0x60, 0x20, 
+-	0xe0, 0x05, 0x20, 0x01, 0x40, 0xb8, 0x43, 0xc0, 
+-	0x68, 0x21, 0x40, 0x08, 0x60, 0x20, 0x1c, 0x78, 
+-	0x06, 0x07, 0x0e, 0x3f, 0x08, 0x6d, 0xd1, 0xc3, 
+-	0xb0, 0x05, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x01, 0xe4, 0x2e, 0x08, 0x44, 0x28, 
+-	0x2e, 0x08, 0x44, 0x48, 0x2e, 0x08, 0x5e, 0x5c, 
+-	0x2e, 0x08, 0x43, 0x88, 0x2e, 0x08, 0x44, 0x08, 
+-	0xb4, 0xf0, 0x06, 0x03, 0x0e, 0x1b, 0xb0, 0x82, 
+-	0x93, 0x00, 0x06, 0x0c, 0x0e, 0x24, 0x00, 0xa2, 
+-	0xb0, 0x81, 0x48, 0x33, 0x58, 0x80, 0x90, 0x00, 
+-	0x28, 0x00, 0xd1, 0x03, 0x20, 0xb0, 0xb0, 0x03, 
+-	0xbc, 0xf0, 0x47, 0x70, 0x48, 0x2f, 0x68, 0x00, 
+-	0x18, 0x17, 0x00, 0xe0, 0x1b, 0x00, 0x00, 0x80, 
+-	0x49, 0x2d, 0x68, 0x09, 0x18, 0x41, 0x9b, 0x01, 
+-	0x48, 0x2c, 0x4d, 0x2d, 0x95, 0x02, 0x2b, 0x01, 
+-	0xd0, 0x2a, 0x2b, 0x02, 0xd1, 0x47, 0x4d, 0x2b, 
+-	0x58, 0xab, 0x2b, 0x00, 0xd1, 0x03, 0x20, 0xff, 
+-	0xb0, 0x03, 0xbc, 0xf0, 0x47, 0x70, 0x60, 0x4b, 
+-	0x23, 0x00, 0x50, 0xab, 0x22, 0x00, 0x5c, 0x83, 
+-	0x42, 0xa3, 0xd1, 0x07, 0x00, 0x93, 0x9d, 0x02, 
+-	0x58, 0xeb, 0x78, 0x5e, 0x1c, 0x5d, 0x23, 0x80, 
+-	0x43, 0x9e, 0x70, 0x2e, 0x32, 0x01, 0x06, 0x12, 
+-	0x0e, 0x12, 0x2a, 0x20, 0xdb, 0xef, 0x88, 0x08, 
+-	0x4b, 0x1d, 0x40, 0x18, 0x80, 0x08, 0x98, 0x00, 
+-	0x9b, 0x01, 0x70, 0xc3, 0x68, 0x38, 0x23, 0x01, 
+-	0x03, 0x5b, 0x43, 0x18, 0x60, 0x38, 0xe0, 0x1a, 
+-	0x68, 0x3a, 0x4b, 0x18, 0x40, 0x1a, 0x60, 0x3a, 
+-	0x9a, 0x00, 0x9b, 0x01, 0x70, 0xd3, 0x23, 0x00, 
+-	0x60, 0x8b, 0x70, 0xcb, 0x60, 0xcb, 0x21, 0x00, 
+-	0x5c, 0x42, 0x42, 0xa2, 0xd1, 0x06, 0x00, 0x8a, 
+-	0x9d, 0x02, 0x58, 0xaa, 0x78, 0x57, 0x23, 0x80, 
+-	0x43, 0x3b, 0x70, 0x53, 0x31, 0x01, 0x06, 0x09, 
+-	0x0e, 0x09, 0x29, 0x20, 0xdb, 0xf0, 0x20, 0x00, 
+-	0xb0, 0x03, 0xbc, 0xf0, 0x47, 0x70, 0x20, 0xbc, 
+-	0xb0, 0x03, 0xbc, 0xf0, 0x47, 0x70, 0x00, 0x00, 
+-	0x2e, 0x08, 0x5e, 0x5c, 0x2e, 0x08, 0x5d, 0xcc, 
+-	0x2e, 0x08, 0x5d, 0xc4, 0x2e, 0x08, 0x5f, 0xa4, 
+-	0x2e, 0x08, 0x5e, 0xe4, 0x2e, 0x08, 0x43, 0x88, 
+-	0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, 0xdf, 0xff, 
+-	0xb4, 0xf0, 0x78, 0x43, 0x00, 0x9e, 0x49, 0x32, 
+-	0x59, 0x8c, 0x88, 0x42, 0x68, 0x87, 0x68, 0x40, 
+-	0x1d, 0xf9, 0x31, 0xb9, 0x1a, 0x09, 0x42, 0x91, 
+-	0xda, 0x3d, 0x25, 0x00, 0x1c, 0x18, 0x00, 0xdb, 
+-	0x1a, 0x18, 0x00, 0x80, 0x4b, 0x2b, 0x68, 0x1b, 
+-	0x18, 0xc0, 0x78, 0x80, 0x06, 0xc0, 0x0e, 0xc0, 
+-	0x28, 0x12, 0xd1, 0x02, 0x29, 0x0e, 0xda, 0x00, 
+-	0x25, 0x01, 0x2a, 0x00, 0xdd, 0x2b, 0x42, 0x8a, 
+-	0xdd, 0x05, 0x68, 0x3f, 0x2f, 0x00, 0xd1, 0x02, 
+-	0x20, 0xba, 0xbc, 0xf0, 0x47, 0x70, 0x1a, 0x52, 
+-	0x79, 0xb9, 0x23, 0xc0, 0x1a, 0x59, 0x79, 0xfb, 
+-	0x1d, 0x38, 0x08, 0x5b, 0xd3, 0x01, 0x22, 0x00, 
+-	0xe0, 0x16, 0x2d, 0x00, 0xd0, 0x14, 0x42, 0x91, 
+-	0xdb, 0x01, 0x31, 0x01, 0xe0, 0x10, 0x1c, 0x4b, 
+-	0x42, 0x93, 0xd1, 0x0d, 0x78, 0x85, 0x2d, 0x09, 
+-	0xdd, 0x06, 0x79, 0x05, 0x78, 0x80, 0x35, 0x09, 
+-	0x42, 0x85, 0xd0, 0x05, 0x1c, 0x19, 0xe0, 0x03, 
+-	0x78, 0x80, 0x28, 0x09, 0xd1, 0x00, 0x1c, 0x19, 
+-	0x25, 0x00, 0x2a, 0x00, 0xdc, 0xd3, 0x69, 0x21, 
+-	0x20, 0x00, 0x1c, 0x0a, 0x42, 0xb9, 0xd0, 0xd4, 
+-	0x68, 0x0b, 0x42, 0xbb, 0xd0, 0x08, 0x68, 0x09, 
+-	0x29, 0x00, 0xd1, 0x02, 0x20, 0xba, 0xbc, 0xf0, 
+-	0x47, 0x70, 0x68, 0x0b, 0x42, 0xbb, 0xd1, 0xf6, 
+-	0x4b, 0x07, 0x51, 0x9a, 0x60, 0x08, 0x69, 0xa2, 
+-	0x69, 0x23, 0x60, 0x13, 0x61, 0xa1, 0x61, 0x27, 
+-	0x61, 0x67, 0xbc, 0xf0, 0x47, 0x70, 0x00, 0x00, 
+-	0x2e, 0x08, 0x5e, 0x5c, 0x2e, 0x08, 0x5d, 0xc4, 
+-	0x2e, 0x08, 0x43, 0x88, 0xb5, 0xf0, 0x06, 0x07, 
+-	0x0e, 0x3f, 0x04, 0x0c, 0x0c, 0x24, 0x06, 0x15, 
+-	0x0e, 0x2d, 0x00, 0xf8, 0x49, 0x2c, 0x68, 0x09, 
+-	0x18, 0x40, 0x00, 0xb9, 0x4a, 0x2b, 0x68, 0x12, 
+-	0x18, 0x8a, 0x00, 0xf9, 0x1b, 0xc9, 0x00, 0x89, 
+-	0x4b, 0x29, 0x68, 0x1b, 0x18, 0xc9, 0x68, 0x16, 
+-	0x23, 0x01, 0x03, 0x5b, 0x43, 0x9e, 0x60, 0x16, 
+-	0x68, 0x06, 0x23, 0x03, 0x03, 0x9b, 0x43, 0x9e, 
+-	0x60, 0x06, 0x4b, 0x24, 0x42, 0x9c, 0xd0, 0x36, 
+-	0x68, 0x06, 0x23, 0x21, 0x43, 0x9e, 0x60, 0x06, 
+-	0x68, 0x16, 0x23, 0x07, 0x03, 0x5b, 0x40, 0x33, 
+-	0x60, 0x13, 0x23, 0x07, 0x03, 0x5b, 0x43, 0x9c, 
+-	0x1c, 0x23, 0x68, 0x14, 0x43, 0x23, 0x60, 0x13, 
+-	0x22, 0x00, 0x75, 0x0a, 0x88, 0x0c, 0x23, 0x01, 
+-	0x02, 0x9b, 0x43, 0x9c, 0x80, 0x0c, 0x07, 0xab, 
+-	0x0f, 0x9b, 0x2b, 0x01, 0xd1, 0x04, 0x88, 0x0c, 
+-	0x23, 0x10, 0x43, 0x23, 0x80, 0x0b, 0xe0, 0x03, 
+-	0x88, 0x0c, 0x23, 0x10, 0x43, 0x9c, 0x80, 0x0c, 
+-	0x68, 0x01, 0x23, 0x40, 0x43, 0xdb, 0x40, 0x19, 
+-	0x60, 0x01, 0x00, 0xf9, 0x4b, 0x0e, 0x68, 0x1b, 
+-	0x18, 0xc9, 0x60, 0x4a, 0x68, 0x01, 0x4b, 0x0d, 
+-	0x43, 0x19, 0x60, 0x01, 0x68, 0x01, 0x60, 0x01, 
+-	0x21, 0x0f, 0x60, 0x41, 0xe0, 0x04, 0x1c, 0x38, 
+-	0xf0, 0x0d, 0xff, 0x1a, 0x28, 0x00, 0xd1, 0x00, 
+-	0x20, 0x00, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x5d, 0xd0, 0x2e, 0x08, 0x5d, 0xcc, 
+-	0x2e, 0x08, 0x5d, 0xc4, 0x00, 0x00, 0xff, 0xff, 
+-	0x2e, 0x08, 0x5d, 0xd4, 0x00, 0x00, 0x20, 0xa0, 
+-	0xb5, 0xf0, 0x06, 0x09, 0x0e, 0x09, 0x1c, 0x07, 
+-	0xb0, 0x8a, 0x48, 0x58, 0x29, 0x00, 0xd1, 0x0a, 
+-	0x4d, 0x57, 0x69, 0x01, 0x91, 0x04, 0x49, 0x57, 
+-	0x91, 0x03, 0x69, 0x41, 0x91, 0x02, 0x6a, 0x00, 
+-	0x1e, 0x43, 0x93, 0x01, 0xe0, 0x0b, 0x29, 0x20, 
+-	0xd1, 0x15, 0x4d, 0x53, 0x69, 0x81, 0x91, 0x04, 
+-	0x49, 0x52, 0x91, 0x03, 0x69, 0xc1, 0x91, 0x02, 
+-	0x6a, 0x40, 0x1e, 0x43, 0x93, 0x01, 0x24, 0x00, 
+-	0x4b, 0x4f, 0x93, 0x09, 0x4a, 0x4f, 0x92, 0x08, 
+-	0x4b, 0x4f, 0x93, 0x07, 0x4e, 0x4f, 0x96, 0x06, 
+-	0x4a, 0x4f, 0x92, 0x05, 0xe0, 0x7a, 0x20, 0xb3, 
+-	0xb0, 0x0a, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x98, 0x04, 0x00, 0x80, 0x19, 0x40, 0x23, 0x01, 
+-	0x02, 0x9b, 0x18, 0xc0, 0x68, 0x01, 0x98, 0x04, 
+-	0x00, 0x80, 0x58, 0x28, 0x9a, 0x04, 0x18, 0xaa, 
+-	0x00, 0x5b, 0x18, 0xd2, 0x78, 0x12, 0x92, 0x00, 
+-	0x22, 0x00, 0x9b, 0x04, 0x18, 0xee, 0x23, 0x01, 
+-	0x02, 0xdb, 0x18, 0xf3, 0x70, 0x1a, 0x9a, 0x04, 
+-	0x32, 0x01, 0x92, 0x04, 0x9b, 0x01, 0x40, 0x1a, 
+-	0x92, 0x04, 0x29, 0x00, 0xd0, 0x56, 0xb0, 0x82, 
+-	0x91, 0x01, 0x21, 0x01, 0x9a, 0x02, 0x2a, 0x80, 
+-	0xd1, 0x19, 0x22, 0x00, 0x9b, 0x01, 0x40, 0x0b, 
+-	0xd0, 0x10, 0x9b, 0x0b, 0x5c, 0x9b, 0x2b, 0xff, 
+-	0xd0, 0x0c, 0x9b, 0x0b, 0x5c, 0x9b, 0x93, 0x00, 
+-	0x00, 0x91, 0x9a, 0x0a, 0x58, 0x52, 0x00, 0xa1, 
+-	0x19, 0xc9, 0x61, 0x0a, 0x1c, 0x61, 0x06, 0x0c, 
+-	0x0e, 0x24, 0xe0, 0x1c, 0x00, 0x49, 0x32, 0x01, 
+-	0x2a, 0x10, 0xd3, 0xe7, 0xe0, 0x17, 0x22, 0x00, 
+-	0x9b, 0x01, 0x40, 0x0b, 0xd0, 0x0f, 0x9b, 0x09, 
+-	0x5c, 0x9b, 0x2b, 0xff, 0xd0, 0x0b, 0x93, 0x00, 
+-	0x00, 0x93, 0x9e, 0x08, 0x58, 0xf6, 0x00, 0xa3, 
+-	0x19, 0xdb, 0x61, 0x1e, 0x28, 0x00, 0xd0, 0x02, 
+-	0x1c, 0x63, 0x06, 0x1c, 0x0e, 0x24, 0x00, 0x49, 
+-	0x32, 0x01, 0x2a, 0x20, 0xd3, 0xe8, 0x2c, 0x00, 
+-	0xd0, 0x1b, 0x9b, 0x00, 0x70, 0x7b, 0x60, 0x78, 
+-	0x9b, 0x00, 0x00, 0x99, 0x9a, 0x07, 0x58, 0x52, 
+-	0x69, 0x51, 0xe0, 0x07, 0x68, 0x09, 0x29, 0x00, 
+-	0xd1, 0x04, 0x20, 0xba, 0xb0, 0x0c, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x42, 0x88, 0xd3, 0xf5, 
+-	0x1d, 0xcb, 0x33, 0xb9, 0x42, 0x83, 0xd3, 0xf1, 
+-	0x60, 0xb9, 0x61, 0x51, 0x1c, 0x38, 0xf0, 0x0d, 
+-	0xff, 0x24, 0xb0, 0x02, 0x98, 0x04, 0x99, 0x02, 
+-	0x42, 0x88, 0xd0, 0x01, 0x2c, 0x00, 0xd0, 0x83, 
+-	0x70, 0x3c, 0x98, 0x04, 0x99, 0x03, 0x60, 0x08, 
+-	0x20, 0x00, 0xb0, 0x0a, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x9e, 0x00, 0x04, 0x80, 
+-	0x2e, 0x08, 0x60, 0x90, 0x9e, 0x00, 0x04, 0x90, 
+-	0x2e, 0x08, 0x69, 0x90, 0x9e, 0x00, 0x04, 0x98, 
+-	0x2e, 0x08, 0x5f, 0xc4, 0x2e, 0x08, 0x5f, 0x64, 
+-	0x2e, 0x08, 0x5f, 0xa4, 0x2e, 0x08, 0x5e, 0xe4, 
+-	0x2e, 0x08, 0x5e, 0x5c, 0xb5, 0x00, 0x20, 0xff, 
+-	0x49, 0x03, 0x60, 0x08, 0x20, 0x01, 0x05, 0x00, 
+-	0xf0, 0x1a, 0xf9, 0x9e, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x01, 0xe4, 0xb5, 0xf0, 0x06, 0x07, 
+-	0x0e, 0x3f, 0x06, 0x0c, 0x0e, 0x24, 0x20, 0x10, 
+-	0x2f, 0x1f, 0xdc, 0x2c, 0x2c, 0x1f, 0xdc, 0x2a, 
+-	0x1c, 0x39, 0x43, 0x21, 0x08, 0x49, 0xd2, 0x26, 
+-	0x49, 0x14, 0x1c, 0x38, 0xf0, 0x1a, 0xf9, 0x9a, 
+-	0x26, 0x01, 0x1c, 0x35, 0x40, 0xbd, 0x1c, 0x30, 
+-	0x40, 0xa0, 0x1c, 0x04, 0x43, 0x28, 0xf0, 0x1a, 
+-	0xf9, 0x84, 0xf0, 0x1a, 0xf9, 0x87, 0x43, 0xa8, 
+-	0xf0, 0x1a, 0xf9, 0x88, 0xf0, 0x1a, 0xf9, 0x82, 
+-	0x43, 0xa0, 0xf0, 0x1a, 0xf9, 0x83, 0x1c, 0x38, 
+-	0xf0, 0x10, 0xf8, 0x66, 0x1c, 0x04, 0xd1, 0x07, 
+-	0x21, 0x03, 0x05, 0x09, 0x20, 0x00, 0x1c, 0x3a, 
+-	0x1c, 0x33, 0xf0, 0x10, 0xff, 0x17, 0x1c, 0x04, 
+-	0xf7, 0xff, 0xfc, 0x8e, 0x1c, 0x20, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x00, 0x2d, 0x43, 
+-	0xb5, 0xf0, 0x06, 0x04, 0x0e, 0x24, 0x04, 0x0d, 
+-	0x0c, 0x2d, 0x06, 0x16, 0x0e, 0x36, 0x9f, 0x05, 
+-	0x06, 0x38, 0x0e, 0x00, 0x22, 0x00, 0x21, 0x00, 
+-	0xb4, 0x07, 0x21, 0x10, 0x1c, 0x1a, 0xb4, 0x06, 
+-	0x23, 0x10, 0x1c, 0x20, 0x1c, 0x29, 0x1c, 0x32, 
+-	0xf0, 0x00, 0xf8, 0x54, 0xb0, 0x05, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0xb5, 0xf0, 0x06, 0x04, 
+-	0x0e, 0x24, 0x04, 0x0d, 0x0c, 0x2d, 0x06, 0x16, 
+-	0x0e, 0x36, 0x9f, 0x05, 0x06, 0x38, 0x0e, 0x00, 
+-	0x22, 0x00, 0x21, 0x00, 0xb4, 0x07, 0x21, 0x18, 
+-	0x1c, 0x1a, 0xb4, 0x06, 0x23, 0x11, 0x1c, 0x20, 
+-	0x1c, 0x29, 0x1c, 0x32, 0xf0, 0x00, 0xf8, 0x3a, 
+-	0xb0, 0x05, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0xb5, 0xf0, 0x06, 0x04, 0x0e, 0x24, 0x04, 0x0d, 
+-	0x0c, 0x2d, 0x06, 0x16, 0x0e, 0x36, 0x9f, 0x05, 
+-	0x06, 0x38, 0x0e, 0x00, 0x22, 0x00, 0x21, 0x00, 
+-	0xb4, 0x07, 0x21, 0x20, 0x1c, 0x1a, 0xb4, 0x06, 
+-	0x23, 0x51, 0x1c, 0x20, 0x1c, 0x29, 0x1c, 0x32, 
+-	0xf0, 0x00, 0xf8, 0x20, 0xb0, 0x05, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0xb5, 0xff, 0x06, 0x03, 
+-	0x0e, 0x1b, 0x04, 0x0d, 0x0c, 0x2d, 0x06, 0x16, 
+-	0x0e, 0x36, 0x9c, 0x09, 0x9f, 0x0a, 0x06, 0x20, 
+-	0x0e, 0x00, 0x22, 0x00, 0x1c, 0x39, 0xb4, 0x07, 
+-	0x21, 0x10, 0x9a, 0x06, 0xb4, 0x06, 0x1c, 0x18, 
+-	0x23, 0x62, 0x1c, 0x29, 0x1c, 0x32, 0xf0, 0x00, 
+-	0xf8, 0x05, 0xb0, 0x05, 0xb0, 0x04, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0xb5, 0xff, 0x9e, 0x09, 
+-	0x9f, 0x0b, 0x06, 0x04, 0x0e, 0x24, 0x04, 0x09, 
+-	0x0c, 0x09, 0xb0, 0x88, 0x91, 0x00, 0x06, 0x15, 
+-	0x0e, 0x2d, 0x06, 0x18, 0x0e, 0x00, 0x90, 0x01, 
+-	0x06, 0x32, 0x0e, 0x12, 0x92, 0x02, 0x06, 0x38, 
+-	0x0e, 0x00, 0x90, 0x03, 0xb0, 0x82, 0xf0, 0x1a, 
+-	0xf8, 0xe9, 0x0d, 0x40, 0xd2, 0x09, 0x20, 0xff, 
+-	0x90, 0x00, 0xf0, 0x1a, 0xf8, 0xe3, 0x23, 0x01, 
+-	0x05, 0x1b, 0x43, 0x18, 0xf0, 0x1a, 0xf8, 0xe2, 
+-	0xe0, 0x01, 0x20, 0x00, 0x90, 0x00, 0x98, 0x03, 
+-	0x08, 0x40, 0xd3, 0x02, 0x22, 0x12, 0x92, 0x01, 
+-	0xe0, 0x01, 0x22, 0x11, 0x92, 0x01, 0x22, 0x01, 
+-	0x1c, 0x11, 0x40, 0xa9, 0x4b, 0x5f, 0x1c, 0x0f, 
+-	0x68, 0x18, 0x40, 0x07, 0xd0, 0x01, 0x27, 0x11, 
+-	0xe0, 0xa2, 0x27, 0x00, 0x43, 0x08, 0x60, 0x18, 
+-	0x23, 0x1c, 0x98, 0x05, 0x40, 0x18, 0x28, 0x1c, 
+-	0xd1, 0x06, 0x21, 0x01, 0x20, 0x7d, 0x01, 0x00, 
+-	0xf0, 0x10, 0xfb, 0xc4, 0x1c, 0x06, 0xe0, 0x0d, 
+-	0x98, 0x05, 0x08, 0x40, 0xd3, 0x05, 0x21, 0x01, 
+-	0x20, 0xc8, 0xf0, 0x10, 0xfb, 0xbb, 0x1c, 0x06, 
+-	0xe0, 0x04, 0x21, 0x01, 0x20, 0x3c, 0xf0, 0x10, 
+-	0xfb, 0xb5, 0x1c, 0x06, 0x20, 0x34, 0xf0, 0x03, 
+-	0xf9, 0x6d, 0x00, 0xaa, 0x92, 0x09, 0x49, 0x4c, 
+-	0x91, 0x08, 0x50, 0x88, 0x00, 0xa1, 0x91, 0x07, 
+-	0x48, 0x4a, 0x90, 0x06, 0x58, 0x40, 0x28, 0x00, 
+-	0xd1, 0x05, 0x00, 0xb0, 0xf0, 0x03, 0xf9, 0x5e, 
+-	0x99, 0x07, 0x9a, 0x06, 0x50, 0x50, 0x98, 0x09, 
+-	0x99, 0x08, 0x58, 0x08, 0x28, 0x00, 0xd0, 0x04, 
+-	0x98, 0x06, 0x99, 0x07, 0x58, 0x40, 0x28, 0x00, 
+-	0xd1, 0x01, 0x27, 0x13, 0xe0, 0x64, 0x99, 0x07, 
+-	0x4a, 0x3f, 0x58, 0x51, 0x29, 0x00, 0xd1, 0x3a, 
+-	0x9a, 0x01, 0xb4, 0x04, 0x23, 0x40, 0x1c, 0x31, 
+-	0x1c, 0x22, 0xf0, 0x10, 0xfc, 0x13, 0xb0, 0x01, 
+-	0x1c, 0x07, 0xd1, 0x17, 0x23, 0x03, 0x02, 0x5b, 
+-	0x22, 0x01, 0x02, 0xd2, 0x21, 0x01, 0x1c, 0x20, 
+-	0xf0, 0x08, 0xfd, 0x56, 0x22, 0x00, 0xb4, 0x04, 
+-	0x22, 0x02, 0x99, 0x03, 0x9b, 0x02, 0x1c, 0x20, 
+-	0xf0, 0x08, 0xfb, 0x8a, 0xb0, 0x01, 0x1c, 0x07, 
+-	0xd1, 0x04, 0x22, 0x01, 0x48, 0x2f, 0x55, 0x02, 
+-	0x48, 0x2f, 0x55, 0x02, 0x2f, 0x00, 0xd1, 0x16, 
+-	0x98, 0x16, 0x28, 0x00, 0xd0, 0x13, 0x21, 0x02, 
+-	0x98, 0x16, 0xf0, 0x10, 0xfb, 0x63, 0x1c, 0x07, 
+-	0x00, 0x80, 0xf0, 0x03, 0xf9, 0x1b, 0x99, 0x07, 
+-	0x4a, 0x28, 0x50, 0x50, 0x28, 0x00, 0xd0, 0x05, 
+-	0x1c, 0x39, 0x1c, 0x22, 0xf0, 0x10, 0xfb, 0x77, 
+-	0x1c, 0x07, 0xe0, 0x00, 0x27, 0x13, 0x2f, 0x00, 
+-	0xd1, 0x22, 0x98, 0x03, 0x09, 0x80, 0xd3, 0x06, 
+-	0x20, 0x5c, 0xf0, 0x03, 0xf9, 0x07, 0x28, 0x00, 
+-	0xd1, 0x02, 0x27, 0x13, 0xe0, 0x00, 0x20, 0x00, 
+-	0x1c, 0x02, 0x98, 0x05, 0x99, 0x17, 0xb4, 0x07, 
+-	0x1c, 0x2a, 0xb4, 0x04, 0x98, 0x0d, 0x99, 0x0c, 
+-	0x58, 0x08, 0x99, 0x18, 0x9a, 0x08, 0x9b, 0x07, 
+-	0xf0, 0x00, 0xf9, 0x1c, 0xb0, 0x04, 0x2f, 0x00, 
+-	0xd1, 0x06, 0x98, 0x09, 0x99, 0x08, 0x58, 0x08, 
+-	0x1c, 0x21, 0xf0, 0x0c, 0xfd, 0xf7, 0x1c, 0x07, 
+-	0x2f, 0x00, 0xd0, 0x03, 0x1c, 0x20, 0x1c, 0x29, 
+-	0xf0, 0x00, 0xf8, 0x20, 0x98, 0x00, 0x28, 0x00, 
+-	0xd0, 0x05, 0xf0, 0x1a, 0xf8, 0x1b, 0x4b, 0x0c, 
+-	0x40, 0x18, 0xf0, 0x1a, 0xf8, 0x1b, 0x1c, 0x38, 
+-	0xb0, 0x0a, 0xb0, 0x04, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x01, 0xec, 
+-	0x2e, 0x08, 0x01, 0xf0, 0x2e, 0x08, 0x02, 0x70, 
+-	0x2e, 0x08, 0x5e, 0x5c, 0x2e, 0x08, 0x44, 0x48, 
+-	0x2e, 0x08, 0x44, 0x28, 0x2e, 0x08, 0x02, 0xf0, 
+-	0xff, 0xef, 0xff, 0xff, 0xb5, 0xf0, 0x06, 0x07, 
+-	0x0e, 0x3f, 0x06, 0x0d, 0x0e, 0x2d, 0xb0, 0x83, 
+-	0xf0, 0x19, 0xff, 0xf8, 0x0d, 0x40, 0xd2, 0x09, 
+-	0x20, 0xff, 0x90, 0x00, 0xf0, 0x19, 0xff, 0xf2, 
+-	0x23, 0x01, 0x05, 0x1b, 0x43, 0x18, 0xf0, 0x19, 
+-	0xff, 0xf1, 0xe0, 0x01, 0x20, 0x00, 0x90, 0x00, 
+-	0x24, 0x00, 0x20, 0x01, 0x40, 0xa8, 0x1c, 0x02, 
+-	0x49, 0x3f, 0x1c, 0x13, 0x68, 0x08, 0x40, 0x03, 
+-	0xd0, 0x69, 0x43, 0xd2, 0x40, 0x10, 0x00, 0xae, 
+-	0x60, 0x08, 0x4d, 0x3c, 0x59, 0xa8, 0x28, 0x00, 
+-	0xd0, 0x62, 0x78, 0x81, 0x91, 0x02, 0x08, 0x49, 
+-	0xd3, 0x02, 0x23, 0x12, 0x93, 0x01, 0xe0, 0x01, 
+-	0x23, 0x11, 0x93, 0x01, 0x1c, 0x39, 0xf0, 0x0c, 
+-	0xfe, 0x11, 0x1c, 0x04, 0x59, 0xa8, 0x6b, 0x00, 
+-	0x28, 0x00, 0xd0, 0x01, 0xf0, 0x03, 0xf8, 0xac, 
+-	0x59, 0xa8, 0x6a, 0xc0, 0x28, 0x00, 0xd0, 0x01, 
+-	0xf0, 0x03, 0xf8, 0xa6, 0x59, 0xa8, 0xf0, 0x03, 
+-	0xf8, 0xa3, 0x20, 0x00, 0x51, 0xa8, 0x00, 0xbd, 
+-	0x48, 0x2b, 0x59, 0x40, 0x78, 0x80, 0x28, 0x00, 
+-	0xd1, 0x40, 0x1c, 0x39, 0xf0, 0x10, 0xf9, 0x36, 
+-	0x2c, 0x00, 0xd1, 0x2a, 0x98, 0x02, 0x09, 0x80, 
+-	0xd3, 0x0a, 0x21, 0x00, 0x1c, 0x3a, 0x48, 0x25, 
+-	0xf0, 0x10, 0xfa, 0xd1, 0x28, 0x00, 0xd0, 0x03, 
+-	0xb0, 0x03, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x22, 0x00, 0xb4, 0x04, 0x22, 0x02, 0x9b, 0x02, 
+-	0x1c, 0x38, 0x49, 0x1e, 0xf0, 0x08, 0xfa, 0xb8, 
+-	0xb0, 0x01, 0x1c, 0x04, 0xd1, 0x11, 0x9a, 0x01, 
+-	0xb4, 0x04, 0x26, 0x00, 0x21, 0x00, 0x1c, 0x3a, 
+-	0x1c, 0x33, 0x48, 0x18, 0xf0, 0x10, 0xfb, 0x22, 
+-	0x1c, 0x04, 0xb0, 0x01, 0x48, 0x16, 0x55, 0xc6, 
+-	0x48, 0x16, 0x55, 0xc6, 0x1c, 0x38, 0xf7, 0xff, 
+-	0xfa, 0xc1, 0x4f, 0x15, 0x59, 0x78, 0xf0, 0x03, 
+-	0xf8, 0x67, 0x26, 0x00, 0x51, 0x7e, 0x37, 0x80, 
+-	0x59, 0x78, 0x28, 0x00, 0xd0, 0x04, 0xf0, 0x03, 
+-	0xf8, 0x5f, 0x51, 0x7e, 0xe0, 0x02, 0xe0, 0x00, 
+-	0xe0, 0x00, 0x24, 0x12, 0x98, 0x00, 0x28, 0x00, 
+-	0xd0, 0x05, 0xf0, 0x19, 0xff, 0x6f, 0x4b, 0x0b, 
+-	0x40, 0x18, 0xf0, 0x19, 0xff, 0x6f, 0x1c, 0x20, 
+-	0xb0, 0x03, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x01, 0xec, 0x2e, 0x08, 0x01, 0xf0, 
+-	0x2e, 0x08, 0x5e, 0x5c, 0x00, 0x00, 0xff, 0xff, 
+-	0x2e, 0x08, 0x44, 0x48, 0x2e, 0x08, 0x44, 0x28, 
+-	0x2e, 0x08, 0x02, 0x70, 0xff, 0xef, 0xff, 0xff, 
+-	0xb5, 0xb0, 0x06, 0x00, 0x0e, 0x00, 0x00, 0x80, 
+-	0x1c, 0x0c, 0x1c, 0x17, 0xb0, 0xad, 0x49, 0x1c, 
+-	0x58, 0x08, 0x90, 0x04, 0x78, 0x81, 0x23, 0x04, 
+-	0x40, 0x19, 0x25, 0x00, 0x29, 0x00, 0xd0, 0x0b, 
+-	0xa9, 0x25, 0xf0, 0x0d, 0xf9, 0xd3, 0xab, 0x00, 
+-	0x80, 0x5d, 0xa8, 0x25, 0x90, 0x24, 0x46, 0x68, 
+-	0x21, 0x00, 0xf0, 0x0d, 0xf9, 0xf2, 0xe0, 0x0c, 
+-	0x78, 0x00, 0x0a, 0x00, 0xd3, 0x04, 0x20, 0x01, 
+-	0x03, 0x00, 0xab, 0x00, 0x80, 0x58, 0xe0, 0x03, 
+-	0x20, 0x01, 0x02, 0x80, 0xab, 0x00, 0x80, 0x58, 
+-	0x20, 0x00, 0x28, 0x00, 0xd1, 0x0e, 0xa8, 0x00, 
+-	0x88, 0x40, 0x60, 0x38, 0xf0, 0x02, 0xff, 0xea, 
+-	0x60, 0x20, 0x28, 0x00, 0xd1, 0x01, 0x20, 0x13, 
+-	0xe0, 0x06, 0x1c, 0x01, 0x46, 0x68, 0xf0, 0x0d, 
+-	0xf9, 0xd4, 0xe0, 0x01, 0x60, 0x25, 0x60, 0x3d, 
+-	0xb0, 0x2d, 0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x01, 0xf0, 0xb4, 0xf0, 0x06, 0x12, 
+-	0x0e, 0x12, 0x06, 0x1b, 0x0e, 0x1b, 0x9c, 0x06, 
+-	0x9f, 0x07, 0x9d, 0x05, 0x9e, 0x04, 0x06, 0x36, 
+-	0x0e, 0x36, 0x06, 0x2d, 0xd0, 0x02, 0x25, 0x80, 
+-	0x70, 0x05, 0xe0, 0x01, 0x25, 0x00, 0x70, 0x05, 
+-	0x25, 0x00, 0x70, 0x45, 0x80, 0x85, 0x72, 0x05, 
+-	0x70, 0xc6, 0x70, 0x83, 0x62, 0xc4, 0x63, 0x07, 
+-	0x27, 0x00, 0x23, 0x00, 0x2a, 0x00, 0xdd, 0x10, 
+-	0x5c, 0xcc, 0x19, 0xc5, 0x73, 0x2c, 0x18, 0xcc, 
+-	0x78, 0x66, 0x1c, 0x7c, 0x06, 0x25, 0x0e, 0x2d, 
+-	0x1c, 0x3c, 0x18, 0x24, 0x77, 0x26, 0x33, 0x02, 
+-	0x06, 0x1b, 0x0e, 0x1b, 0x1c, 0x2f, 0x42, 0x93, 
+-	0xdb, 0xee, 0xbc, 0xf0, 0x47, 0x70, 0xb5, 0xf0, 
+-	0xb0, 0xac, 0x21, 0x00, 0xa8, 0x07, 0xf0, 0x0d, 
+-	0xf8, 0x59, 0xa8, 0x07, 0x78, 0x00, 0x90, 0x06, 
+-	0x28, 0x00, 0xd0, 0x4b, 0x24, 0x00, 0x98, 0x06, 
+-	0x28, 0x00, 0xdd, 0x43, 0xa8, 0x07, 0xf0, 0x0d, 
+-	0xfc, 0x20, 0x00, 0xa1, 0xa8, 0x07, 0x18, 0x08, 
+-	0x69, 0x07, 0x78, 0xfe, 0xad, 0x07, 0x88, 0x6d, 
+-	0x78, 0xb8, 0x09, 0xc0, 0xd3, 0x12, 0xa8, 0x07, 
+-	0xa9, 0x01, 0xf0, 0x10, 0xfe, 0x6f, 0x78, 0xb8, 
+-	0x08, 0x40, 0xd3, 0x05, 0x46, 0x6a, 0x1c, 0x38, 
+-	0xa9, 0x01, 0xf0, 0x10, 0xfe, 0x9c, 0xe0, 0x08, 
+-	0x46, 0x6a, 0x1c, 0x38, 0xa9, 0x01, 0xf0, 0x10, 
+-	0xfe, 0xd9, 0xe0, 0x02, 0x20, 0x40, 0xab, 0x00, 
+-	0x70, 0x18, 0xa8, 0x00, 0x78, 0x00, 0x09, 0xc0, 
+-	0xd3, 0x16, 0x1c, 0x28, 0xf7, 0xfd, 0xfe, 0x3a, 
+-	0x1c, 0x07, 0xd0, 0x11, 0xa8, 0x07, 0x1c, 0x39, 
+-	0xf0, 0x0d, 0xfa, 0x92, 0x28, 0x00, 0xd1, 0x09, 
+-	0x1c, 0x30, 0x1c, 0x29, 0x1c, 0x3a, 0xf7, 0xfd, 
+-	0xfe, 0x89, 0x28, 0x00, 0xd0, 0x04, 0xf7, 0xfd, 
+-	0xfe, 0x7b, 0xe0, 0x01, 0xf7, 0xfd, 0xfe, 0x78, 
+-	0x1c, 0x60, 0x06, 0x04, 0x0e, 0x24, 0x98, 0x06, 
+-	0x42, 0x84, 0xdb, 0xbb, 0xa8, 0x07, 0xf0, 0x0d, 
+-	0xf8, 0xfb, 0xe7, 0xaa, 0xf7, 0xff, 0xfa, 0x58, 
+-	0xb0, 0x2c, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0xb5, 0xf0, 0xb0, 0xad, 0x21, 0x00, 0xa8, 0x08, 
+-	0xf0, 0x0c, 0xff, 0xfc, 0x22, 0x05, 0x21, 0x16, 
+-	0x1c, 0x04, 0xf0, 0x03, 0xfd, 0x76, 0x2c, 0xb2, 
+-	0xd1, 0x03, 0x21, 0x00, 0xa8, 0x08, 0xf0, 0x0c, 
+-	0xff, 0xab, 0xa8, 0x08, 0x78, 0x00, 0x90, 0x06, 
+-	0x28, 0x00, 0xd0, 0x73, 0x25, 0x00, 0x98, 0x06, 
+-	0x28, 0x00, 0xdd, 0x57, 0xa8, 0x08, 0xf0, 0x0d, 
+-	0xfb, 0xb8, 0x00, 0xa9, 0xa8, 0x08, 0x18, 0x08, 
+-	0x69, 0x07, 0x78, 0xf8, 0x90, 0x07, 0xae, 0x08, 
+-	0x88, 0x76, 0x78, 0xb8, 0x09, 0xc0, 0xd3, 0x12, 
+-	0xa8, 0x08, 0xa9, 0x01, 0xf0, 0x10, 0xfe, 0x06, 
+-	0x78, 0xb8, 0x08, 0x40, 0xd3, 0x05, 0x46, 0x6a, 
+-	0x1c, 0x38, 0xa9, 0x01, 0xf0, 0x10, 0xfe, 0x33, 
+-	0xe0, 0x08, 0x46, 0x6a, 0x1c, 0x38, 0xa9, 0x01, 
+-	0xf0, 0x10, 0xfe, 0x70, 0xe0, 0x02, 0x20, 0x40, 
+-	0xab, 0x00, 0x70, 0x18, 0xa8, 0x00, 0x78, 0x00, 
+-	0x09, 0xc0, 0xd3, 0x29, 0x78, 0xb8, 0x09, 0x80, 
+-	0xd3, 0x0f, 0xa8, 0x08, 0xa9, 0x01, 0xf0, 0x10, 
+-	0xff, 0xcd, 0x1c, 0x04, 0xa8, 0x00, 0x78, 0x00, 
+-	0x08, 0x80, 0xd2, 0x02, 0x78, 0xb8, 0x08, 0x80, 
+-	0xd3, 0x1a, 0x1c, 0x38, 0xf0, 0x11, 0xf8, 0xd4, 
+-	0xe0, 0x16, 0x1c, 0x30, 0xf7, 0xfd, 0xfd, 0xbe, 
+-	0x1c, 0x07, 0xd0, 0x11, 0xa8, 0x08, 0x1c, 0x39, 
+-	0xf0, 0x0d, 0xfa, 0x16, 0x28, 0x00, 0xd1, 0x09, 
+-	0x98, 0x07, 0x1c, 0x31, 0x1c, 0x3a, 0xf7, 0xfd, 
+-	0xfe, 0x0d, 0x28, 0x00, 0xd0, 0x04, 0xf7, 0xfd, 
+-	0xfd, 0xff, 0xe0, 0x01, 0xf7, 0xfd, 0xfd, 0xfc, 
+-	0x1c, 0x68, 0x06, 0x05, 0x0e, 0x2d, 0x98, 0x06, 
+-	0x42, 0x85, 0xdb, 0xa7, 0x98, 0x06, 0x28, 0x00, 
+-	0xd0, 0x08, 0xa8, 0x08, 0xf0, 0x0d, 0xf8, 0x7c, 
+-	0x2c, 0xb2, 0xd1, 0x03, 0x21, 0x00, 0xa8, 0x08, 
+-	0xf0, 0x0c, 0xff, 0x3e, 0xf7, 0xff, 0xf9, 0x58, 
+-	0x21, 0x00, 0xa8, 0x08, 0xf7, 0xff, 0xfb, 0x88, 
+-	0x1c, 0x04, 0xa8, 0x08, 0x78, 0x00, 0x90, 0x06, 
+-	0x28, 0x00, 0xe0, 0x00, 0xe0, 0x00, 0xd1, 0x89, 
+-	0xf7, 0xff, 0xf9, 0xc6, 0xb0, 0x2d, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0xb5, 0xf0, 0x26, 0x00, 
+-	0x48, 0x28, 0x71, 0x06, 0x70, 0x06, 0x20, 0x00, 
+-	0x4f, 0x27, 0x4a, 0x28, 0x49, 0x28, 0x00, 0x43, 
+-	0x52, 0xd6, 0x52, 0xfe, 0x00, 0x83, 0x50, 0xce, 
+-	0x30, 0x01, 0x06, 0x00, 0x0e, 0x00, 0x28, 0x1d, 
+-	0xdb, 0xf5, 0x28, 0x20, 0xda, 0x08, 0x00, 0x43, 
+-	0x52, 0xd6, 0x00, 0x83, 0x50, 0xce, 0x30, 0x01, 
+-	0x06, 0x00, 0x0e, 0x00, 0x28, 0x20, 0xdb, 0xf6, 
+-	0x20, 0x01, 0x02, 0x80, 0xf0, 0x19, 0xfd, 0xcd, 
+-	0xf0, 0x19, 0xfd, 0xd0, 0x4b, 0x1b, 0x40, 0x18, 
+-	0xf0, 0x19, 0xfd, 0xd0, 0x49, 0x1a, 0x20, 0x0a, 
+-	0xf0, 0x19, 0xfd, 0xd0, 0x21, 0x00, 0x4f, 0x19, 
+-	0x20, 0xff, 0x4a, 0x19, 0x00, 0x4b, 0x18, 0x5b, 
+-	0x01, 0x1b, 0x52, 0xd7, 0x18, 0x9b, 0x70, 0x98, 
+-	0x70, 0xde, 0x71, 0x1e, 0x1d, 0xdc, 0x34, 0x19, 
+-	0x73, 0x26, 0x71, 0x5e, 0x1c, 0x1d, 0x23, 0x06, 
+-	0x73, 0x63, 0x23, 0x00, 0x00, 0xdc, 0x19, 0x2c, 
+-	0x81, 0xa6, 0x81, 0xe6, 0x33, 0x01, 0x06, 0x1b, 
+-	0x0e, 0x1b, 0x60, 0xa6, 0x2b, 0x04, 0xdb, 0xf5, 
+-	0x31, 0x01, 0x06, 0x09, 0x0e, 0x09, 0x29, 0x08, 
+-	0xdb, 0xe0, 0x1c, 0x30, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x03, 0xb8, 
+-	0x2e, 0x08, 0x49, 0xb0, 0x2e, 0x08, 0x49, 0x70, 
+-	0x2e, 0x08, 0x45, 0xe8, 0xff, 0xff, 0xfb, 0xff, 
+-	0x2e, 0x00, 0x31, 0x7d, 0x00, 0x00, 0xff, 0xff, 
+-	0x2e, 0x08, 0x44, 0x68, 0xb5, 0xf0, 0x06, 0x00, 
+-	0x0e, 0x00, 0xb0, 0x83, 0x90, 0x00, 0x04, 0x09, 
+-	0x0c, 0x09, 0x91, 0x01, 0x06, 0x10, 0x0e, 0x00, 
+-	0x04, 0x1c, 0x0c, 0x24, 0x27, 0x00, 0x49, 0x5a, 
+-	0x00, 0x7b, 0x19, 0xdb, 0x01, 0x1b, 0x5a, 0xcd, 
+-	0x4b, 0x58, 0x42, 0x9d, 0xd1, 0x01, 0x1c, 0x3a, 
+-	0xe0, 0x04, 0x1c, 0x7b, 0x06, 0x1f, 0x0e, 0x3f, 
+-	0x2f, 0x08, 0xdb, 0xf1, 0x2f, 0x08, 0xd1, 0x05, 
+-	0x20, 0x00, 0x43, 0xc0, 0xb0, 0x03, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x00, 0x46, 0x4f, 0x50, 
+-	0x97, 0x02, 0x5b, 0xbb, 0x2b, 0x00, 0xd0, 0x05, 
+-	0x20, 0x00, 0x43, 0xc0, 0xb0, 0x03, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x23, 0x01, 0x9f, 0x02, 
+-	0x53, 0xbb, 0x00, 0x53, 0x18, 0x9a, 0x01, 0x12, 
+-	0x18, 0x57, 0x80, 0x38, 0x20, 0x14, 0xf0, 0x02, 
+-	0xfe, 0x19, 0x1c, 0x01, 0x62, 0xb8, 0x20, 0x00, 
+-	0x29, 0x00, 0xd1, 0x08, 0x49, 0x41, 0x80, 0x39, 
+-	0x9f, 0x02, 0x53, 0xb8, 0x43, 0xc0, 0xb0, 0x03, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x1c, 0x0d, 
+-	0x21, 0xff, 0x02, 0x09, 0x40, 0x21, 0x12, 0x08, 
+-	0x28, 0x09, 0xd2, 0x1f, 0xa3, 0x01, 0x5c, 0x1b, 
+-	0x00, 0x5b, 0x44, 0x9f, 0x1b, 0x04, 0x06, 0x09, 
+-	0x0c, 0x0f, 0x12, 0x15, 0x18, 0x00, 0x24, 0xb8, 
+-	0xe0, 0x16, 0x24, 0xff, 0x34, 0x71, 0xe0, 0x13, 
+-	0x24, 0x01, 0x02, 0xa4, 0xe0, 0x10, 0x24, 0x01, 
+-	0x02, 0xe4, 0xe0, 0x0d, 0x24, 0x01, 0x03, 0x24, 
+-	0xe0, 0x0a, 0x24, 0x01, 0x03, 0x64, 0xe0, 0x07, 
+-	0x24, 0x01, 0x03, 0xa4, 0xe0, 0x04, 0x24, 0x01, 
+-	0x03, 0xe4, 0xe0, 0x01, 0x24, 0x01, 0x02, 0xa4, 
+-	0x80, 0xac, 0x88, 0xa8, 0x00, 0x80, 0xf0, 0x02, 
+-	0xfd, 0xdd, 0x60, 0x28, 0x28, 0x00, 0xd1, 0x0d, 
+-	0x48, 0x24, 0x80, 0x38, 0x20, 0x00, 0x9f, 0x02, 
+-	0x53, 0xb8, 0x1c, 0x28, 0xf0, 0x02, 0xfd, 0xf4, 
+-	0x20, 0x00, 0x43, 0xc0, 0xb0, 0x03, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x98, 0x00, 0x70, 0xb8, 
+-	0x26, 0x00, 0x88, 0x38, 0x00, 0x80, 0x49, 0x1d, 
+-	0x50, 0x0e, 0x20, 0x00, 0x1c, 0x01, 0x43, 0x61, 
+-	0x68, 0x2a, 0x18, 0x8a, 0x00, 0xc1, 0x19, 0xc9, 
+-	0x30, 0x01, 0x06, 0x00, 0x0e, 0x00, 0x60, 0x8a, 
+-	0x28, 0x04, 0xdb, 0xf3, 0x20, 0xb8, 0x1c, 0x21, 
+-	0xf0, 0x15, 0xfd, 0x94, 0x1d, 0xfc, 0x34, 0x19, 
+-	0x73, 0x20, 0x72, 0x2e, 0x78, 0xb8, 0x23, 0x01, 
+-	0x02, 0x9b, 0x00, 0x5a, 0x21, 0x01, 0xf0, 0x08, 
+-	0xf9, 0xc7, 0x22, 0x00, 0xb4, 0x04, 0x78, 0xb8, 
+-	0x23, 0x05, 0x22, 0x02, 0x99, 0x02, 0xf0, 0x07, 
+-	0xff, 0xfb, 0x22, 0x04, 0x7b, 0x21, 0xb0, 0x01, 
+-	0xb4, 0x06, 0x78, 0xb9, 0x22, 0x0a, 0x20, 0x85, 
+-	0x6a, 0xbb, 0xf0, 0x08, 0xfa, 0x43, 0x1c, 0x30, 
+-	0xb0, 0x05, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x44, 0x68, 0x00, 0x00, 0xff, 0xff, 
+-	0x2e, 0x08, 0x49, 0x70, 0x2e, 0x08, 0x45, 0xe8, 
+-	0xb5, 0xf0, 0xb0, 0x82, 0x46, 0x68, 0xf0, 0x08, 
+-	0xff, 0xd7, 0x21, 0x00, 0x4f, 0x24, 0x4b, 0x25, 
+-	0x93, 0x01, 0x4a, 0x25, 0x00, 0x48, 0x18, 0x40, 
+-	0x01, 0x00, 0x19, 0xc0, 0x78, 0x84, 0x9d, 0x00, 
+-	0x40, 0xe5, 0x07, 0xeb, 0x0f, 0xdb, 0x2b, 0x01, 
+-	0xd1, 0x31, 0x6a, 0x83, 0x7a, 0x1c, 0x2c, 0xa4, 
+-	0xd0, 0x01, 0x2c, 0xa5, 0xd1, 0x2b, 0x1d, 0xc4, 
+-	0x34, 0x19, 0xe0, 0x0e, 0x79, 0x05, 0x73, 0x65, 
+-	0x88, 0xde, 0x79, 0x05, 0x00, 0xed, 0x18, 0x2d, 
+-	0x81, 0xae, 0x79, 0x05, 0x35, 0x01, 0x07, 0xad, 
+-	0x0f, 0xad, 0x71, 0x05, 0x78, 0x15, 0x35, 0x01, 
+-	0x70, 0x15, 0x7a, 0x9d, 0x7b, 0x66, 0x42, 0xb5, 
+-	0xd0, 0x02, 0x79, 0x45, 0x2d, 0x00, 0xd0, 0xe9, 
+-	0x7a, 0x1b, 0x2b, 0xa5, 0xd1, 0x0f, 0x79, 0x43, 
+-	0x07, 0xdc, 0x0f, 0xe4, 0x2c, 0x01, 0xd0, 0x0a, 
+-	0x1c, 0x1c, 0x23, 0x01, 0x43, 0x23, 0x71, 0x43, 
+-	0x88, 0x00, 0x00, 0x80, 0x9b, 0x01, 0x18, 0xc0, 
+-	0x68, 0x03, 0x33, 0x01, 0x60, 0x03, 0x1c, 0x48, 
+-	0x06, 0x01, 0x0e, 0x09, 0x29, 0x08, 0xdb, 0xbd, 
+-	0xb0, 0x02, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x44, 0x68, 0x2e, 0x08, 0x45, 0xe8, 
+-	0x2e, 0x08, 0x03, 0xb8, 0xb5, 0xf0, 0x04, 0x05, 
+-	0x0c, 0x2d, 0x20, 0x00, 0x4c, 0x31, 0x00, 0x42, 
+-	0x18, 0x12, 0x01, 0x12, 0x5a, 0xa2, 0x42, 0xaa, 
+-	0xd1, 0x01, 0x1c, 0x01, 0xe0, 0x04, 0x30, 0x01, 
+-	0x06, 0x00, 0x0e, 0x00, 0x28, 0x08, 0xdb, 0xf2, 
+-	0x28, 0x08, 0xd1, 0x04, 0x20, 0x00, 0x43, 0xc0, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x48, 
+-	0x18, 0x40, 0x01, 0x00, 0x19, 0x07, 0x78, 0xb8, 
+-	0x49, 0x25, 0xf0, 0x08, 0xfa, 0x0f, 0x79, 0x78, 
+-	0x23, 0x02, 0x43, 0x18, 0x71, 0x78, 0x78, 0xbe, 
+-	0x20, 0xff, 0x70, 0xb8, 0x21, 0x00, 0x1d, 0xf8, 
+-	0x30, 0x19, 0x73, 0x01, 0x21, 0x06, 0x73, 0x41, 
+-	0x78, 0xf8, 0x79, 0x39, 0x42, 0x88, 0xd1, 0x11, 
+-	0x79, 0x78, 0x07, 0xc0, 0x0f, 0xc0, 0x28, 0x01, 
+-	0xd0, 0x0c, 0x20, 0x00, 0x70, 0xf8, 0x71, 0x38, 
+-	0x71, 0x78, 0x48, 0x17, 0x80, 0x38, 0x6a, 0xb8, 
+-	0x68, 0x00, 0xf0, 0x02, 0xfd, 0x15, 0x6a, 0xb8, 
+-	0xf0, 0x02, 0xfd, 0x12, 0x4f, 0x12, 0x00, 0x68, 
+-	0x49, 0x12, 0x52, 0x0f, 0x00, 0x71, 0x4a, 0x12, 
+-	0x52, 0x57, 0x21, 0x00, 0x4a, 0x11, 0x52, 0x11, 
+-	0x1c, 0x30, 0x1c, 0x29, 0xf0, 0x03, 0xf8, 0x12, 
+-	0x20, 0x00, 0x00, 0x41, 0x18, 0x09, 0x01, 0x09, 
+-	0x5a, 0x61, 0x42, 0xb9, 0xd1, 0x04, 0x30, 0x01, 
+-	0x06, 0x00, 0x0e, 0x00, 0x28, 0x08, 0xdb, 0xf4, 
+-	0x28, 0x08, 0xd1, 0x03, 0x21, 0x00, 0x48, 0x08, 
+-	0x71, 0x01, 0x70, 0x01, 0x20, 0x00, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x44, 0x68, 
+-	0x00, 0x00, 0xff, 0xff, 0x2e, 0x08, 0x49, 0x30, 
+-	0x2e, 0x08, 0x48, 0xf8, 0x2e, 0x08, 0x49, 0x70, 
+-	0x2e, 0x08, 0x03, 0xb8, 0xb5, 0x80, 0x1c, 0x07, 
+-	0x30, 0x28, 0xf0, 0x02, 0xfc, 0xbb, 0x49, 0x07, 
+-	0x64, 0x88, 0x65, 0x08, 0x65, 0x48, 0x19, 0xc0, 
+-	0x64, 0xc8, 0x20, 0x00, 0x64, 0x08, 0x64, 0x4f, 
+-	0x49, 0x03, 0x84, 0x08, 0xbc, 0x80, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x03, 0xc0, 
+-	0x2c, 0x00, 0x01, 0x00, 0xb5, 0x80, 0x1c, 0x07, 
+-	0x30, 0x28, 0xf0, 0x02, 0xfc, 0xa3, 0x49, 0x06, 
+-	0x66, 0x08, 0x66, 0x88, 0x66, 0xc8, 0x19, 0xc0, 
+-	0x66, 0x48, 0x20, 0x00, 0x65, 0x88, 0x65, 0xcf, 
+-	0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x03, 0xc0, 0xb4, 0x80, 0x04, 0x09, 
+-	0x0c, 0x09, 0x88, 0x02, 0x42, 0x8a, 0xd0, 0x18, 
+-	0x4a, 0x0d, 0x8f, 0x13, 0x2b, 0x01, 0xd0, 0x04, 
+-	0x23, 0x01, 0x87, 0x13, 0x8f, 0x17, 0x2f, 0x01, 
+-	0xd1, 0xfb, 0x88, 0x03, 0x42, 0x8b, 0xd0, 0x03, 
+-	0x80, 0x01, 0x88, 0x03, 0x42, 0x8b, 0xd1, 0xfb, 
+-	0x8f, 0x11, 0x1c, 0x10, 0x29, 0x00, 0xd0, 0x04, 
+-	0x21, 0x00, 0x87, 0x01, 0x8f, 0x02, 0x2a, 0x00, 
+-	0xd1, 0xfb, 0xbc, 0x80, 0x47, 0x70, 0x00, 0x00, 
+-	0x2c, 0x00, 0x1f, 0xc0, 0xb5, 0x80, 0x48, 0x1f, 
+-	0x8f, 0x40, 0x28, 0x00, 0xd1, 0x37, 0x4f, 0x1e, 
+-	0x88, 0x38, 0x12, 0x00, 0x4a, 0x1d, 0x28, 0x06, 
+-	0xd0, 0x1e, 0xdc, 0x08, 0x28, 0x06, 0xd2, 0x26, 
+-	0xa3, 0x01, 0x5c, 0x1b, 0x00, 0x5b, 0x44, 0x9f, 
+-	0x2a, 0x12, 0x12, 0x0d, 0x22, 0x12, 0x28, 0x07, 
+-	0xd0, 0x15, 0x28, 0x09, 0xd0, 0x0b, 0x28, 0x0b, 
+-	0xd0, 0x14, 0x28, 0x80, 0xd1, 0x17, 0xf0, 0x00, 
+-	0xf9, 0x1f, 0xe0, 0x18, 0x88, 0x79, 0x88, 0x38, 
+-	0xf0, 0x00, 0xf8, 0x24, 0xe0, 0x13, 0x88, 0x79, 
+-	0x88, 0x38, 0xf0, 0x00, 0xf8, 0xbd, 0xe0, 0x0e, 
+-	0xf0, 0x00, 0xf9, 0x6a, 0xe0, 0x0b, 0xf0, 0x00, 
+-	0xf9, 0xd5, 0xe0, 0x08, 0x88, 0x79, 0x88, 0x38, 
+-	0xf0, 0x00, 0xfc, 0x9c, 0xe0, 0x03, 0x48, 0x08, 
+-	0x8e, 0x81, 0x31, 0x01, 0x86, 0x81, 0x21, 0x00, 
+-	0x1c, 0x38, 0xf7, 0xff, 0xff, 0x9f, 0xbc, 0x80, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2c, 0x00, 0x1f, 0xc0, 
+-	0x2c, 0x00, 0x00, 0xfc, 0x2c, 0x00, 0x01, 0x00, 
+-	0x2e, 0x08, 0x04, 0x00, 0xb5, 0xf0, 0x04, 0x04, 
+-	0x0c, 0x24, 0x04, 0x0d, 0x0c, 0x2d, 0x1c, 0x17, 
+-	0x2d, 0x10, 0xdd, 0x03, 0x20, 0x02, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0xf0, 0x19, 0xfb, 0x92, 
+-	0x1c, 0x68, 0x10, 0x40, 0x00, 0x40, 0x04, 0x01, 
+-	0x0c, 0x09, 0x1c, 0x88, 0x00, 0x40, 0x1d, 0x02, 
+-	0x48, 0x1c, 0x6c, 0x03, 0x18, 0x9d, 0x6c, 0x46, 
+-	0x4b, 0x1b, 0x42, 0xb5, 0xdd, 0x0a, 0x88, 0x19, 
+-	0x1c, 0x18, 0x23, 0x20, 0x43, 0x19, 0x80, 0x01, 
+-	0xf0, 0x19, 0xfb, 0xb2, 0x20, 0x01, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x64, 0x05, 0x35, 0x28, 
+-	0x42, 0xb5, 0xdd, 0x04, 0x88, 0x1e, 0x1c, 0x1d, 
+-	0x23, 0x10, 0x43, 0x33, 0x80, 0x2b, 0x6d, 0x03, 
+-	0x80, 0x9c, 0x6d, 0x04, 0x80, 0xe2, 0x23, 0x00, 
+-	0x29, 0x00, 0xdd, 0x08, 0x88, 0x3d, 0x00, 0x5c, 
+-	0x6d, 0x06, 0x19, 0xa4, 0x81, 0x25, 0x33, 0x01, 
+-	0x37, 0x02, 0x42, 0x8b, 0xdb, 0xf6, 0x6d, 0x01, 
+-	0x18, 0x8a, 0x6c, 0xc3, 0x42, 0x9a, 0xd9, 0x00, 
+-	0x6c, 0x82, 0x60, 0x0a, 0x65, 0x02, 0xf0, 0x19, 
+-	0xfb, 0x8b, 0x20, 0x00, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x03, 0xc0, 
+-	0x2c, 0x00, 0x00, 0xf8, 0xb4, 0xf0, 0x04, 0x04, 
+-	0x0c, 0x24, 0x04, 0x08, 0x0c, 0x00, 0x28, 0x10, 
+-	0xdd, 0x02, 0x20, 0x02, 0xbc, 0xf0, 0x47, 0x70, 
+-	0x30, 0x01, 0x4f, 0x1c, 0x40, 0x07, 0x1c, 0xb8, 
+-	0x00, 0x40, 0x1d, 0x01, 0x48, 0x1a, 0x6d, 0x83, 
+-	0x18, 0x5d, 0x6d, 0xc6, 0x4b, 0x19, 0x42, 0xb5, 
+-	0xdd, 0x07, 0x88, 0x19, 0x1c, 0x18, 0x23, 0x02, 
+-	0x43, 0x19, 0x80, 0x01, 0x20, 0x01, 0xbc, 0xf0, 
+-	0x47, 0x70, 0x65, 0x85, 0x35, 0x28, 0x42, 0xb5, 
+-	0xdd, 0x04, 0x88, 0x1e, 0x1c, 0x1d, 0x23, 0x01, 
+-	0x43, 0x33, 0x80, 0x2b, 0x6e, 0x83, 0x80, 0x9c, 
+-	0x6e, 0x84, 0x80, 0xe1, 0x23, 0x00, 0x2f, 0x00, 
+-	0xdd, 0x08, 0x88, 0x15, 0x00, 0x5c, 0x6e, 0x86, 
+-	0x19, 0xa4, 0x81, 0x25, 0x32, 0x02, 0x33, 0x01, 
+-	0x42, 0xbb, 0xdb, 0xf6, 0x6e, 0x82, 0x18, 0x51, 
+-	0x6e, 0x43, 0x42, 0x99, 0xd3, 0x00, 0x6e, 0x01, 
+-	0x60, 0x11, 0x66, 0x81, 0x20, 0x00, 0xbc, 0xf0, 
+-	0x47, 0x70, 0x00, 0x00, 0x00, 0x00, 0xff, 0xfe, 
+-	0x2e, 0x08, 0x03, 0xc0, 0x2c, 0x00, 0x00, 0xf8, 
+-	0xb5, 0xb0, 0x04, 0x04, 0x0c, 0x24, 0x04, 0x0d, 
+-	0x0c, 0x2d, 0x1c, 0x17, 0xf0, 0x19, 0xfa, 0xfa, 
+-	0x1c, 0x20, 0x1c, 0x29, 0x1c, 0x3a, 0xf7, 0xff, 
+-	0xff, 0xa9, 0x1c, 0x07, 0xf0, 0x19, 0xfb, 0x28, 
+-	0x1c, 0x38, 0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 
+-	0xb4, 0xf0, 0x04, 0x04, 0x0c, 0x24, 0x04, 0x09, 
+-	0x0c, 0x09, 0x29, 0x08, 0xdd, 0x02, 0x20, 0x02, 
+-	0xbc, 0xf0, 0x47, 0x70, 0x00, 0x88, 0x1d, 0xc7, 
+-	0x37, 0x01, 0x48, 0x19, 0x6d, 0x83, 0x19, 0xdd, 
+-	0x6d, 0xc6, 0x4b, 0x18, 0x42, 0xb5, 0xdd, 0x07, 
+-	0x88, 0x19, 0x1c, 0x18, 0x23, 0x02, 0x43, 0x19, 
+-	0x80, 0x01, 0x20, 0x01, 0xbc, 0xf0, 0x47, 0x70, 
+-	0x65, 0x85, 0x35, 0x28, 0x42, 0xb5, 0xdd, 0x04, 
+-	0x88, 0x1e, 0x1c, 0x1d, 0x23, 0x01, 0x43, 0x33, 
+-	0x80, 0x2b, 0x6e, 0x83, 0x80, 0x9c, 0x6e, 0x84, 
+-	0x80, 0xe7, 0x23, 0x00, 0x6e, 0x84, 0x29, 0x00, 
+-	0xdd, 0x06, 0xca, 0x40, 0x00, 0x9d, 0x19, 0x2d, 
+-	0x60, 0xae, 0x33, 0x01, 0x42, 0x8b, 0xdb, 0xf8, 
+-	0x6e, 0x81, 0x19, 0xca, 0x6e, 0x43, 0x42, 0x9a, 
+-	0xd3, 0x00, 0x6e, 0x02, 0x60, 0x0a, 0x66, 0x82, 
+-	0x20, 0x00, 0xbc, 0xf0, 0x47, 0x70, 0x00, 0x00, 
+-	0x2e, 0x08, 0x03, 0xc0, 0x2c, 0x00, 0x00, 0xf8, 
+-	0xb5, 0x80, 0x48, 0x28, 0x88, 0x00, 0x06, 0x00, 
+-	0x0e, 0x00, 0x4f, 0x27, 0x28, 0x01, 0xd0, 0x13, 
+-	0x28, 0x02, 0xd0, 0x1a, 0x28, 0x03, 0xd1, 0x0c, 
+-	0x68, 0x38, 0x88, 0x41, 0x29, 0x0e, 0xdb, 0x02, 
+-	0x88, 0x41, 0x29, 0x0f, 0xdd, 0x2f, 0x88, 0x01, 
+-	0x04, 0x09, 0x88, 0x40, 0x43, 0x08, 0xf0, 0x0b, 
+-	0xf9, 0x81, 0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 
+-	0x68, 0x38, 0x88, 0x82, 0x88, 0x41, 0x88, 0x00, 
+-	0xf0, 0x0e, 0xf8, 0x60, 0xbc, 0x80, 0xbc, 0x08, 
+-	0x47, 0x18, 0x68, 0x38, 0x88, 0x81, 0x04, 0x09, 
+-	0x88, 0xc2, 0x43, 0x11, 0x88, 0x02, 0x04, 0x12, 
+-	0x88, 0x40, 0x43, 0x10, 0xf0, 0x0d, 0xfd, 0x04, 
+-	0x68, 0x38, 0x88, 0x41, 0x29, 0x0e, 0xd1, 0x08, 
+-	0x88, 0x81, 0x04, 0x09, 0x88, 0xc0, 0x43, 0x08, 
+-	0xf0, 0x0a, 0xff, 0xfe, 0xbc, 0x80, 0xbc, 0x08, 
+-	0x47, 0x18, 0x20, 0x01, 0xf0, 0x0a, 0xff, 0xf8, 
+-	0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 0x88, 0x41, 
+-	0x48, 0x08, 0x29, 0x0e, 0xd1, 0x02, 0x21, 0x00, 
+-	0x60, 0x01, 0xe0, 0x01, 0x21, 0x01, 0x60, 0x01, 
+-	0x68, 0x00, 0xf0, 0x00, 0xfb, 0xe1, 0xbc, 0x80, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2c, 0x00, 0x00, 0xfc, 
+-	0x2e, 0x08, 0x03, 0xc0, 0x2e, 0x08, 0x04, 0xf4, 
+-	0xb5, 0x90, 0x48, 0x31, 0x88, 0x00, 0x06, 0x04, 
+-	0x0e, 0x24, 0x48, 0x30, 0x22, 0x03, 0x21, 0x02, 
+-	0x4f, 0x2f, 0x2c, 0x08, 0xd2, 0x4f, 0xa3, 0x02, 
+-	0x5d, 0x1b, 0x00, 0x5b, 0x44, 0x9f, 0x1c, 0x00, 
+-	0x04, 0x4b, 0x10, 0x16, 0x1c, 0x28, 0x34, 0x3f, 
+-	0x68, 0x39, 0x88, 0x49, 0x06, 0x09, 0x0e, 0x09, 
+-	0x88, 0x00, 0x06, 0x00, 0x0e, 0x00, 0xf0, 0x03, 
+-	0xfa, 0xa7, 0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 
+-	0x20, 0x03, 0xf7, 0xfd, 0xff, 0xe1, 0xbc, 0x90, 
+-	0xbc, 0x08, 0x47, 0x18, 0x20, 0x02, 0xf7, 0xfd, 
+-	0xff, 0xdb, 0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 
+-	0x88, 0x00, 0x4b, 0x1e, 0x28, 0x00, 0xd0, 0x03, 
+-	0x60, 0x1a, 0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 
+-	0x60, 0x19, 0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 
+-	0x88, 0x00, 0x4b, 0x19, 0x28, 0x00, 0xd0, 0x03, 
+-	0x60, 0x1a, 0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 
+-	0x60, 0x19, 0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 
+-	0xf0, 0x02, 0xfe, 0x72, 0x68, 0x39, 0x88, 0x4a, 
+-	0x1d, 0x08, 0x88, 0x09, 0xf7, 0xfe, 0xf8, 0x52, 
+-	0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 0x68, 0x38, 
+-	0x88, 0x81, 0x04, 0x09, 0x88, 0xc2, 0x18, 0x8a, 
+-	0x88, 0x01, 0x04, 0x09, 0x88, 0x40, 0x50, 0x0a, 
+-	0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 0x1d, 0xf8, 
+-	0x30, 0x39, 0x8e, 0x81, 0x31, 0x01, 0x86, 0x81, 
+-	0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2c, 0x00, 0x00, 0xfc, 0x2c, 0x00, 0x01, 0x00, 
+-	0x2e, 0x08, 0x03, 0xc0, 0x6e, 0x00, 0x13, 0x00, 
+-	0x6e, 0x00, 0x12, 0x00, 0xb5, 0x90, 0xb0, 0x86, 
+-	0x48, 0x80, 0x88, 0x00, 0x06, 0x00, 0x0e, 0x00, 
+-	0x4c, 0x7f, 0x4f, 0x80, 0x28, 0x0b, 0xd2, 0x61, 
+-	0xa3, 0x01, 0x5c, 0x1b, 0x00, 0x5b, 0x44, 0x9f, 
+-	0x05, 0x0f, 0x17, 0x3a, 0x5e, 0x86, 0x90, 0xbd, 
+-	0xc5, 0xd3, 0xd8, 0x00, 0xf0, 0x0b, 0xfb, 0x38, 
+-	0x90, 0x05, 0x14, 0x00, 0x68, 0x39, 0x80, 0x08, 
+-	0x98, 0x05, 0x68, 0x39, 0x80, 0x48, 0xe0, 0xe0, 
+-	0x20, 0x1e, 0xa9, 0x05, 0xf0, 0x0b, 0xfa, 0x3a, 
+-	0x98, 0x05, 0x68, 0x39, 0x80, 0x08, 0xe0, 0xd8, 
+-	0x1c, 0x20, 0xf0, 0x0d, 0xfe, 0x31, 0x20, 0x00, 
+-	0x00, 0x81, 0x58, 0x61, 0x00, 0x42, 0x68, 0x3b, 
+-	0x52, 0x99, 0x30, 0x01, 0x28, 0x04, 0xdd, 0xf7, 
+-	0x20, 0x07, 0x00, 0x81, 0x58, 0x61, 0x00, 0x42, 
+-	0x68, 0x3b, 0x18, 0xd2, 0x3a, 0x40, 0x87, 0x91, 
+-	0x30, 0x01, 0x28, 0x0b, 0xdd, 0xf5, 0x20, 0x0d, 
+-	0x00, 0x81, 0x58, 0x61, 0x00, 0x42, 0x68, 0x3b, 
+-	0x18, 0xd2, 0x3a, 0x40, 0x87, 0x51, 0x30, 0x01, 
+-	0x28, 0x12, 0xdd, 0xf5, 0xe0, 0xb5, 0x20, 0x13, 
+-	0x00, 0x81, 0x58, 0x61, 0x00, 0x42, 0x68, 0x3b, 
+-	0x18, 0xd2, 0x3a, 0x40, 0x83, 0x51, 0x30, 0x01, 
+-	0x28, 0x15, 0xdd, 0xf5, 0x20, 0x00, 0x00, 0x81, 
+-	0x19, 0x09, 0x6d, 0x89, 0x00, 0x42, 0x68, 0x3b, 
+-	0x18, 0xd2, 0x80, 0xd1, 0x30, 0x01, 0x28, 0x0a, 
+-	0xdd, 0xf5, 0x20, 0x00, 0x00, 0x81, 0x19, 0x09, 
+-	0x31, 0x80, 0x68, 0x49, 0x00, 0x42, 0x68, 0x3b, 
+-	0x18, 0xd2, 0x83, 0x91, 0x30, 0x01, 0x28, 0x01, 
+-	0xdd, 0xf4, 0xe0, 0x92, 0xe0, 0x8c, 0x20, 0x02, 
+-	0x00, 0x81, 0x19, 0x09, 0x31, 0x80, 0x68, 0x49, 
+-	0x00, 0x42, 0x68, 0x3b, 0x18, 0xd2, 0x3a, 0x40, 
+-	0x87, 0x91, 0x30, 0x01, 0x28, 0x05, 0xdd, 0xf3, 
+-	0x20, 0x09, 0x00, 0x81, 0x19, 0x09, 0x31, 0x80, 
+-	0x68, 0x49, 0x00, 0x42, 0x68, 0x3b, 0x18, 0xd2, 
+-	0x3a, 0x40, 0x86, 0xd1, 0x30, 0x01, 0x28, 0x0f, 
+-	0xdd, 0xf3, 0x20, 0x11, 0x00, 0x81, 0x19, 0x09, 
+-	0x31, 0x80, 0x68, 0x49, 0x00, 0x42, 0x68, 0x3b, 
+-	0x18, 0xd2, 0x3a, 0x40, 0x86, 0x91, 0x30, 0x01, 
+-	0x28, 0x13, 0xdd, 0xf3, 0xe0, 0x69, 0x22, 0x00, 
+-	0x21, 0x00, 0x20, 0x01, 0x02, 0xc0, 0xf7, 0xff, 
+-	0xfe, 0x47, 0x6f, 0xb8, 0x49, 0x36, 0x80, 0x08, 
+-	0xe0, 0x5f, 0xa8, 0x02, 0xf0, 0x10, 0xfc, 0x18, 
+-	0x98, 0x02, 0x0c, 0x00, 0x68, 0x39, 0x80, 0x08, 
+-	0x98, 0x02, 0x68, 0x39, 0x80, 0x48, 0x98, 0x03, 
+-	0x0c, 0x00, 0x68, 0x39, 0x80, 0x88, 0x98, 0x03, 
+-	0x68, 0x39, 0x80, 0xc8, 0x98, 0x04, 0x0c, 0x00, 
+-	0x68, 0x39, 0x81, 0x08, 0x98, 0x04, 0x68, 0x39, 
+-	0x81, 0x48, 0x20, 0x00, 0x68, 0x39, 0x81, 0x88, 
+-	0x68, 0x38, 0x89, 0x81, 0x23, 0x01, 0x03, 0xdb, 
+-	0x43, 0x19, 0x81, 0x81, 0x48, 0x25, 0x68, 0x39, 
+-	0x81, 0xc8, 0x48, 0x25, 0x68, 0x01, 0x14, 0x09, 
+-	0x68, 0x3a, 0x82, 0x11, 0x68, 0x00, 0x68, 0x39, 
+-	0x82, 0x48, 0xe0, 0x32, 0x20, 0x19, 0x06, 0x80, 
+-	0x6b, 0x80, 0x06, 0x00, 0x0e, 0x00, 0x68, 0x39, 
+-	0x80, 0x08, 0xe0, 0x2a, 0x68, 0x38, 0x88, 0x01, 
+-	0x04, 0x09, 0x88, 0x40, 0x18, 0x08, 0x68, 0x00, 
+-	0x90, 0x05, 0x14, 0x00, 0x68, 0x39, 0x80, 0x08, 
+-	0x98, 0x05, 0x68, 0x39, 0x80, 0x48, 0xe0, 0x1c, 
+-	0x48, 0x16, 0x68, 0x00, 0x68, 0x39, 0x80, 0x08, 
+-	0xe0, 0x17, 0x46, 0x69, 0xa8, 0x01, 0xf0, 0x08, 
+-	0xfb, 0xb9, 0x98, 0x01, 0x68, 0x39, 0x80, 0x08, 
+-	0x98, 0x01, 0x0c, 0x00, 0x68, 0x39, 0x80, 0x48, 
+-	0x98, 0x00, 0x68, 0x39, 0x80, 0x88, 0x98, 0x00, 
+-	0x0c, 0x00, 0x68, 0x39, 0x80, 0xc8, 0xe0, 0x04, 
+-	0x1d, 0xf8, 0x30, 0x39, 0x8e, 0x81, 0x31, 0x01, 
+-	0x86, 0x81, 0xb0, 0x06, 0xbc, 0x90, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2c, 0x00, 0x00, 0xfc, 
+-	0x2e, 0x08, 0x46, 0x68, 0x2e, 0x08, 0x03, 0xc0, 
+-	0x2c, 0x00, 0x01, 0x00, 0x00, 0x00, 0x26, 0x1a, 
+-	0x2e, 0x08, 0x05, 0x68, 0x2e, 0x08, 0x00, 0x58, 
+-	0xb5, 0xf0, 0x4f, 0x6e, 0x25, 0x00, 0x6f, 0xf8, 
+-	0x28, 0x00, 0xd0, 0x08, 0xf0, 0x06, 0xff, 0x4a, 
+-	0x28, 0x00, 0xd0, 0x00, 0x67, 0xfd, 0x20, 0x01, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x6c, 0x38, 
+-	0x28, 0x00, 0xd1, 0x03, 0x1c, 0x28, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x6d, 0x38, 0x6d, 0x7c, 
+-	0x42, 0xa0, 0xd1, 0x03, 0x1c, 0x28, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x88, 0xa0, 0x06, 0x00, 
+-	0x0e, 0x00, 0x28, 0x15, 0xd2, 0x56, 0xa3, 0x02, 
+-	0x5c, 0x1b, 0x00, 0x5b, 0x44, 0x9f, 0x1c, 0x00, 
+-	0x0b, 0x12, 0x1c, 0x16, 0x22, 0x53, 0x26, 0x31, 
+-	0x3c, 0x47, 0x57, 0x61, 0x68, 0x6d, 0x71, 0x75, 
+-	0x7d, 0x84, 0x83, 0x83, 0x87, 0x00, 0x89, 0xe3, 
+-	0x89, 0xa2, 0x89, 0x61, 0x89, 0x20, 0xf0, 0x06, 
+-	0xfa, 0xc5, 0xe0, 0x70, 0x89, 0x20, 0xf0, 0x06, 
+-	0xfa, 0xa9, 0xe0, 0x6c, 0x89, 0xa2, 0x89, 0x61, 
+-	0x89, 0x20, 0xf0, 0x06, 0xfb, 0x83, 0xe0, 0x66, 
+-	0x89, 0xa2, 0x89, 0x61, 0x89, 0x20, 0xf0, 0x06, 
+-	0xfb, 0x2b, 0xe0, 0x60, 0x89, 0x20, 0xf0, 0x06, 
+-	0xfb, 0xc1, 0xe0, 0x5c, 0x8a, 0x62, 0x8a, 0x21, 
+-	0xb4, 0x06, 0x89, 0xe3, 0x89, 0xa2, 0x89, 0x61, 
+-	0x89, 0x20, 0xf0, 0x06, 0xfc, 0x45, 0xb0, 0x02, 
+-	0xe0, 0x51, 0x8a, 0x62, 0x8a, 0x21, 0xb4, 0x06, 
+-	0x89, 0xe3, 0x89, 0xa2, 0x89, 0x61, 0x89, 0x20, 
+-	0xf0, 0x06, 0xfc, 0x8c, 0xb0, 0x02, 0xe0, 0x46, 
+-	0x89, 0xa3, 0x89, 0x62, 0x89, 0x20, 0x49, 0x3c, 
+-	0xf0, 0x06, 0xfd, 0xcd, 0x21, 0x00, 0x48, 0x3a, 
+-	0xf7, 0xff, 0xfc, 0x58, 0xe0, 0x3b, 0x89, 0xe0, 
+-	0x04, 0x03, 0x14, 0x1b, 0x89, 0xa0, 0x04, 0x02, 
+-	0x14, 0x12, 0x89, 0x61, 0x89, 0x20, 0xf0, 0x06, 
+-	0xfd, 0xed, 0xe0, 0x30, 0xe0, 0x4c, 0x89, 0x20, 
+-	0xf0, 0x06, 0xfb, 0xa0, 0xe0, 0x2b, 0x89, 0xe0, 
+-	0x04, 0x00, 0x8a, 0x21, 0x18, 0x43, 0x89, 0xa2, 
+-	0x89, 0x61, 0x89, 0x20, 0xf0, 0x06, 0xfe, 0x40, 
+-	0xe0, 0x21, 0x89, 0xe3, 0x89, 0xa2, 0x89, 0x61, 
+-	0x89, 0x20, 0xf0, 0x06, 0xfe, 0x71, 0xe0, 0x1a, 
+-	0x89, 0x61, 0x89, 0x20, 0xf0, 0x06, 0xfb, 0xc2, 
+-	0xe0, 0x15, 0x89, 0x20, 0xf0, 0x06, 0xfb, 0xdc, 
+-	0xe0, 0x11, 0x89, 0x20, 0xf0, 0x06, 0xfb, 0xec, 
+-	0xe0, 0x0d, 0x20, 0x01, 0x67, 0xf8, 0x89, 0xa2, 
+-	0x89, 0x61, 0x89, 0x20, 0xf0, 0x06, 0xff, 0x04, 
+-	0xe0, 0x05, 0x89, 0xe3, 0x89, 0xa2, 0x89, 0x61, 
+-	0x89, 0x20, 0xf0, 0x06, 0xff, 0x67, 0xe0, 0x1b, 
+-	0xf0, 0x06, 0xff, 0xfe, 0xe0, 0x18, 0x89, 0x20, 
+-	0xb0, 0x82, 0x90, 0x01, 0x89, 0x61, 0x91, 0x00, 
+-	0x89, 0xa5, 0x89, 0xe0, 0x1b, 0x40, 0x24, 0x00, 
+-	0x1c, 0x46, 0x2e, 0x00, 0xdd, 0x0b, 0x00, 0xa0, 
+-	0x4b, 0x12, 0x18, 0xc0, 0x19, 0x2a, 0x68, 0x03, 
+-	0x98, 0x01, 0x99, 0x00, 0xf0, 0x06, 0xfe, 0x04, 
+-	0x34, 0x01, 0x42, 0xb4, 0xdb, 0xf3, 0xb0, 0x02, 
+-	0x6d, 0x78, 0x88, 0xc0, 0x6c, 0x39, 0x1a, 0x08, 
+-	0x64, 0x38, 0x6c, 0x79, 0x1a, 0x08, 0x28, 0x28, 
+-	0xdb, 0x05, 0x48, 0x09, 0x88, 0x01, 0x23, 0x10, 
+-	0x43, 0xdb, 0x40, 0x19, 0x80, 0x01, 0x6d, 0x78, 
+-	0x68, 0x00, 0x65, 0x78, 0x20, 0x01, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x03, 0xc0, 
+-	0x2c, 0x00, 0x01, 0x20, 0x2c, 0x00, 0x1a, 0x00, 
+-	0x2c, 0x00, 0x00, 0xf8, 0xb5, 0x90, 0x4f, 0x66, 
+-	0x6e, 0xf8, 0x6e, 0xb9, 0x42, 0x81, 0xd0, 0x57, 
+-	0x88, 0x81, 0x0a, 0x0a, 0x2a, 0x0a, 0xd2, 0x5a, 
+-	0xa3, 0x01, 0x5c, 0x9b, 0x00, 0x5b, 0x44, 0x9f, 
+-	0x93, 0x04, 0x50, 0x93, 0x93, 0x57, 0x93, 0x93, 
+-	0x7c, 0x82, 0x06, 0x09, 0x0e, 0x09, 0x24, 0x00, 
+-	0x29, 0x0c, 0xd2, 0x4c, 0xa3, 0x01, 0x5c, 0x5b, 
+-	0x00, 0x5b, 0x44, 0x9f, 0x1d, 0x09, 0x13, 0x3c, 
+-	0x85, 0x85, 0x85, 0x85, 0x85, 0x39, 0x85, 0x05, 
+-	0x89, 0x00, 0xf0, 0x03, 0xf8, 0xc1, 0xe0, 0x7b, 
+-	0x22, 0x00, 0xb4, 0x04, 0x89, 0x01, 0x1c, 0x23, 
+-	0x4a, 0x52, 0x1e, 0x50, 0xf7, 0xfc, 0xfd, 0x5c, 
+-	0xb0, 0x01, 0xe0, 0x71, 0x22, 0x00, 0xb4, 0x04, 
+-	0x89, 0x02, 0x1c, 0x23, 0x49, 0x4d, 0x1e, 0x48, 
+-	0xf7, 0xfc, 0xfd, 0x52, 0xb0, 0x01, 0xe0, 0x67, 
+-	0x8a, 0x02, 0xb4, 0x04, 0x89, 0xc3, 0x89, 0x82, 
+-	0x89, 0x41, 0x89, 0x00, 0xf7, 0xfc, 0xfd, 0x48, 
+-	0x6e, 0xf8, 0x89, 0x01, 0xb0, 0x01, 0x29, 0x00, 
+-	0xd1, 0x5a, 0x89, 0x41, 0x29, 0x00, 0xd1, 0x57, 
+-	0x89, 0x81, 0x29, 0x00, 0xd1, 0x54, 0x89, 0xc1, 
+-	0x29, 0x00, 0xd1, 0x51, 0x8a, 0x00, 0x28, 0x00, 
+-	0xd1, 0x4e, 0xf7, 0xfd, 0xfa, 0x85, 0xe0, 0x62, 
+-	0xf7, 0xfc, 0xfc, 0xc6, 0xe0, 0x5f, 0x21, 0x18, 
+-	0x20, 0x14, 0xf7, 0xfe, 0xfd, 0xaf, 0xe0, 0x5a, 
+-	0xe0, 0x6a, 0x06, 0x09, 0xd1, 0x40, 0x89, 0x00, 
+-	0xf7, 0xfc, 0xfe, 0x7c, 0xe0, 0x53, 0xe0, 0x52, 
+-	0x06, 0x09, 0x0e, 0x09, 0x29, 0x06, 0xd2, 0x4e, 
+-	0xa3, 0x01, 0x5c, 0x5b, 0x00, 0x5b, 0x44, 0x9f, 
+-	0x02, 0x06, 0x0a, 0x0e, 0x12, 0x16, 0x89, 0x00, 
+-	0xf7, 0xfe, 0xf8, 0x6a, 0xe0, 0x43, 0x89, 0x00, 
+-	0xf7, 0xfe, 0xf8, 0x8c, 0xe0, 0x3f, 0x89, 0x00, 
+-	0xf7, 0xfe, 0xf9, 0x1a, 0xe0, 0x3b, 0x89, 0x00, 
+-	0xf7, 0xfe, 0xf9, 0xfe, 0xe0, 0x37, 0x89, 0x00, 
+-	0xf7, 0xfe, 0xfa, 0x30, 0xe0, 0x33, 0x89, 0x00, 
+-	0x06, 0x00, 0x0e, 0x00, 0xf7, 0xfe, 0xfa, 0x0c, 
+-	0xe0, 0x2d, 0x06, 0x08, 0xd1, 0x14, 0x6f, 0xb8, 
+-	0x30, 0x01, 0x67, 0xb8, 0xe0, 0x27, 0x06, 0x09, 
+-	0x0e, 0x09, 0x29, 0x08, 0xd2, 0x23, 0xa3, 0x02, 
+-	0x5c, 0x5b, 0x00, 0x5b, 0x44, 0x9f, 0x1c, 0x00, 
+-	0x04, 0x0d, 0x09, 0x10, 0x13, 0x17, 0x1a, 0x1d, 
+-	0x89, 0x00, 0xf0, 0x01, 0xf9, 0x7f, 0xe0, 0x16, 
+-	0xe0, 0x15, 0x89, 0x00, 0xf0, 0x01, 0xf9, 0xa6, 
+-	0xe0, 0x11, 0xf0, 0x01, 0xf9, 0xf1, 0xe0, 0x0e, 
+-	0xf0, 0x01, 0xfa, 0x48, 0xe0, 0x0b, 0x89, 0x00, 
+-	0xf0, 0x01, 0xfa, 0xcc, 0xe0, 0x07, 0xf0, 0x01, 
+-	0xfb, 0x05, 0xe0, 0x04, 0xf0, 0x01, 0xfb, 0x1e, 
+-	0xe0, 0x01, 0xf0, 0x01, 0xfa, 0x7b, 0x6e, 0xf8, 
+-	0x88, 0xc0, 0x6d, 0xb9, 0x1a, 0x08, 0x65, 0xb8, 
+-	0x6d, 0xf9, 0x1a, 0x08, 0x28, 0x28, 0xdb, 0x04, 
+-	0x48, 0x07, 0x88, 0x01, 0x08, 0x49, 0x00, 0x49, 
+-	0x80, 0x01, 0x6e, 0xf8, 0x68, 0x00, 0x66, 0xf8, 
+-	0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x03, 0xc0, 0x00, 0x00, 0xff, 0xff, 
+-	0x2c, 0x00, 0x00, 0xf8, 0xb5, 0x80, 0x06, 0x00, 
+-	0x0e, 0x00, 0x1c, 0x17, 0x28, 0x03, 0xd0, 0x0b, 
+-	0x28, 0x07, 0xd0, 0x0e, 0x28, 0x08, 0xd1, 0x03, 
+-	0x88, 0x38, 0xf0, 0x02, 0xfa, 0x39, 0x80, 0x78, 
+-	0x20, 0x00, 0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 
+-	0x21, 0x18, 0x20, 0x14, 0xf7, 0xfe, 0xfd, 0x22, 
+-	0xe7, 0xf6, 0x88, 0x79, 0x88, 0x38, 0x1d, 0x3a, 
+-	0xf0, 0x02, 0xf8, 0xaa, 0x49, 0x01, 0x68, 0x09, 
+-	0x80, 0x08, 0xe7, 0xed, 0x2e, 0x08, 0x03, 0xc0, 
+-	0x48, 0x0d, 0x6f, 0xc0, 0x28, 0x00, 0xd1, 0x0c, 
+-	0x49, 0x0c, 0x60, 0x08, 0x48, 0x0c, 0x8e, 0x83, 
+-	0x49, 0x0c, 0x22, 0x01, 0x2b, 0x00, 0xd0, 0x05, 
+-	0x8d, 0x03, 0x86, 0x8b, 0x8d, 0x43, 0x86, 0xcb, 
+-	0x87, 0x82, 0x47, 0x70, 0x8e, 0xc3, 0x2b, 0x00, 
+-	0xd0, 0xfb, 0x8d, 0x83, 0x86, 0x8b, 0x8d, 0xc3, 
+-	0x86, 0xcb, 0x87, 0x82, 0x47, 0x70, 0x00, 0x00, 
+-	0x2c, 0x00, 0x1f, 0x80, 0x2e, 0x08, 0x04, 0x40, 
+-	0x2c, 0x00, 0x1f, 0xc0, 0x2c, 0x00, 0x00, 0xc0, 
+-	0xb5, 0x00, 0xf0, 0x00, 0xfa, 0x71, 0xf7, 0xfd, 
+-	0xf8, 0x37, 0xf7, 0xfc, 0xfe, 0xdd, 0xf7, 0xfd, 
+-	0xf9, 0x37, 0xf0, 0x03, 0xf8, 0x71, 0xf7, 0xff, 
+-	0xff, 0xcf, 0x48, 0x09, 0x8e, 0x80, 0x28, 0x00, 
+-	0xd1, 0x0b, 0x48, 0x08, 0x6f, 0xc0, 0x28, 0x00, 
+-	0xd1, 0x01, 0xf0, 0x03, 0xfd, 0xe3, 0xf7, 0xff, 
+-	0xfd, 0xe7, 0x28, 0x00, 0xd1, 0x01, 0xf7, 0xff, 
+-	0xfe, 0xc9, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2c, 0x00, 0x1f, 0xc0, 0x2c, 0x00, 0x1f, 0x80, 
+-	0xb4, 0x80, 0x02, 0x4f, 0x4b, 0x07, 0x40, 0x3b, 
+-	0x43, 0x1a, 0x23, 0x19, 0x06, 0x9b, 0x62, 0x9a, 
+-	0x0a, 0x49, 0x02, 0x49, 0x08, 0x49, 0x07, 0xc0, 
+-	0x43, 0x08, 0x49, 0x03, 0x68, 0x09, 0x60, 0x08, 
+-	0xbc, 0x80, 0x47, 0x70, 0x00, 0x03, 0xfe, 0x00, 
+-	0x2e, 0x08, 0x5e, 0x38, 0xb4, 0x90, 0x4b, 0x0c, 
+-	0x68, 0x1f, 0x68, 0x3f, 0x0f, 0xff, 0x60, 0x07, 
+-	0x68, 0x18, 0x68, 0x00, 0x00, 0x40, 0x0a, 0x47, 
+-	0x02, 0x7f, 0x20, 0x19, 0x06, 0x80, 0x6a, 0x84, 
+-	0x4b, 0x06, 0x40, 0x23, 0x0a, 0x5b, 0x43, 0x3b, 
+-	0x60, 0x0b, 0x6a, 0x80, 0x05, 0xc0, 0x0d, 0xc0, 
+-	0x60, 0x10, 0xbc, 0x90, 0x47, 0x70, 0x00, 0x00, 
+-	0x2e, 0x08, 0x5e, 0x38, 0x00, 0x03, 0xfe, 0x00, 
+-	0xb5, 0x00, 0x49, 0x1d, 0x62, 0xc8, 0x28, 0x00, 
+-	0xd0, 0x11, 0x28, 0x01, 0xd0, 0x1b, 0x28, 0x02, 
+-	0xd0, 0x25, 0x28, 0x03, 0xd1, 0x09, 0x48, 0x19, 
+-	0x68, 0x01, 0x08, 0x49, 0x00, 0x49, 0x60, 0x01, 
+-	0x22, 0x01, 0x21, 0x01, 0x20, 0x00, 0xf0, 0x0b, 
+-	0xf9, 0x8f, 0xbc, 0x08, 0x47, 0x18, 0x48, 0x13, 
+-	0x68, 0x01, 0x08, 0x49, 0x00, 0x49, 0x60, 0x01, 
+-	0x48, 0x11, 0x68, 0x01, 0x04, 0x03, 0x43, 0x19, 
+-	0x60, 0x01, 0xbc, 0x08, 0x47, 0x18, 0x48, 0x0d, 
+-	0x68, 0x01, 0x23, 0x01, 0x43, 0x19, 0x60, 0x01, 
+-	0x48, 0x0b, 0x68, 0x01, 0x4b, 0x0b, 0x40, 0x19, 
+-	0x60, 0x01, 0xbc, 0x08, 0x47, 0x18, 0x48, 0x07, 
+-	0x68, 0x01, 0x08, 0x49, 0x00, 0x49, 0x60, 0x01, 
+-	0x22, 0x00, 0x21, 0x00, 0x20, 0x00, 0xf0, 0x0b, 
+-	0xf9, 0x6b, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x04, 0xc4, 0x6a, 0x00, 0x00, 0x18, 
+-	0x6c, 0x00, 0x00, 0x20, 0xff, 0xdf, 0xff, 0xff, 
+-	0xb5, 0x90, 0x48, 0x11, 0x6c, 0xc1, 0x6c, 0x80, 
+-	0x1a, 0x0f, 0x48, 0x10, 0xd5, 0x01, 0x69, 0x01, 
+-	0x18, 0x7f, 0x69, 0x00, 0x10, 0x80, 0x4c, 0x0e, 
+-	0x42, 0xb8, 0xda, 0x0b, 0x68, 0xe0, 0x28, 0x00, 
+-	0xd1, 0x08, 0x48, 0x0c, 0x68, 0x01, 0x23, 0x02, 
+-	0x43, 0xdb, 0x40, 0x19, 0x60, 0x01, 0x20, 0x02, 
+-	0xf0, 0x0a, 0xfd, 0x0c, 0x2f, 0x00, 0xd1, 0x04, 
+-	0x20, 0x01, 0x61, 0xe0, 0x6b, 0xa0, 0x30, 0x01, 
+-	0x63, 0xa0, 0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 
+-	0x66, 0x00, 0x00, 0x80, 0x2e, 0x08, 0x04, 0x44, 
+-	0x2e, 0x08, 0x04, 0xc4, 0x6c, 0x00, 0x00, 0x20, 
+-	0xb5, 0x00, 0x20, 0x03, 0xf0, 0x0a, 0xfc, 0xf6, 
+-	0x20, 0x1e, 0xf0, 0x07, 0xfc, 0xf3, 0x23, 0x03, 
+-	0x02, 0x5b, 0x22, 0x01, 0x02, 0xd2, 0x21, 0x02, 
+-	0x20, 0x1e, 0xf0, 0x07, 0xfa, 0xa1, 0x22, 0x00, 
+-	0xb4, 0x04, 0x23, 0x02, 0x22, 0x02, 0x49, 0x07, 
+-	0x20, 0x1e, 0xf0, 0x07, 0xf8, 0xd5, 0x23, 0x01, 
+-	0x02, 0x9b, 0x00, 0x5a, 0x21, 0x01, 0x20, 0x1e, 
+-	0xb0, 0x01, 0xf0, 0x07, 0xfa, 0x91, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 
+-	0xb5, 0x00, 0x21, 0x00, 0x20, 0x0e, 0xf0, 0x0d, 
+-	0xf8, 0x6b, 0x20, 0x1f, 0xf0, 0x07, 0xfc, 0x04, 
+-	0x23, 0x03, 0x02, 0x5b, 0x22, 0x01, 0x02, 0xd2, 
+-	0x21, 0x02, 0x20, 0x1f, 0xf0, 0x07, 0xfa, 0x7c, 
+-	0x20, 0x00, 0xf0, 0x0a, 0xfb, 0x61, 0x22, 0x00, 
+-	0xb4, 0x04, 0x23, 0x01, 0x22, 0x02, 0x49, 0x07, 
+-	0x20, 0x1f, 0xf0, 0x07, 0xf8, 0xad, 0x23, 0x01, 
+-	0x02, 0x9b, 0x00, 0x5a, 0x21, 0x01, 0x20, 0x1f, 
+-	0xb0, 0x01, 0xf0, 0x07, 0xfa, 0x69, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfe, 
+-	0xb5, 0x80, 0x20, 0x0f, 0x02, 0x40, 0x4f, 0x0a, 
+-	0x61, 0x38, 0x49, 0x0a, 0x6c, 0x89, 0x61, 0x79, 
+-	0xf0, 0x01, 0xfe, 0x3c, 0x1d, 0xf9, 0x31, 0x79, 
+-	0x61, 0x08, 0x28, 0x00, 0xd0, 0x05, 0x20, 0x00, 
+-	0x61, 0xf8, 0x62, 0x38, 0x64, 0xf8, 0x20, 0xff, 
+-	0x72, 0x08, 0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x04, 0x44, 0x66, 0x00, 0x00, 0x80, 
+-	0xb5, 0x80, 0x4f, 0x05, 0x69, 0x38, 0x28, 0x00, 
+-	0xd0, 0x03, 0xf0, 0x01, 0xfe, 0x45, 0x20, 0x00, 
+-	0x61, 0x38, 0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x04, 0xc4, 0xb5, 0x00, 0x4a, 0x0d, 
+-	0xb4, 0x04, 0x1f, 0x10, 0x1e, 0x51, 0x1c, 0x13, 
+-	0xf7, 0xfc, 0xfb, 0x2a, 0x21, 0x33, 0x06, 0x49, 
+-	0x6d, 0x88, 0x6d, 0x4a, 0x1a, 0x82, 0xb0, 0x01, 
+-	0x48, 0x07, 0x62, 0x42, 0x6d, 0x49, 0x62, 0xc1, 
+-	0x21, 0x00, 0x65, 0x81, 0x21, 0x01, 0x02, 0xc9, 
+-	0x64, 0x41, 0x21, 0x01, 0x30, 0x60, 0x76, 0x01, 
+-	0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 0xff, 0xff, 
+-	0x2e, 0x08, 0x04, 0x44, 0xb5, 0x00, 0x4a, 0x10, 
+-	0xb4, 0x04, 0x1c, 0x13, 0x3a, 0x01, 0x49, 0x0f, 
+-	0x1e, 0xc8, 0xf7, 0xfc, 0xfb, 0x09, 0x21, 0x33, 
+-	0x06, 0x49, 0x6d, 0x88, 0x6d, 0x4a, 0x1a, 0x82, 
+-	0xb0, 0x01, 0x48, 0x0b, 0x62, 0x42, 0x6d, 0x49, 
+-	0x62, 0xc1, 0x21, 0x00, 0x65, 0x81, 0x21, 0x01, 
+-	0x02, 0xc9, 0x64, 0x41, 0x21, 0x01, 0x30, 0x60, 
+-	0x76, 0x01, 0x48, 0x06, 0x23, 0x02, 0x68, 0x01, 
+-	0x43, 0x19, 0x60, 0x01, 0xbc, 0x08, 0x47, 0x18, 
+-	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xfe, 
+-	0x2e, 0x08, 0x04, 0x44, 0x2e, 0x08, 0x00, 0x04, 
+-	0x48, 0x03, 0x23, 0x02, 0x43, 0xdb, 0x68, 0x01, 
+-	0x40, 0x19, 0x60, 0x01, 0x47, 0x70, 0x00, 0x00, 
+-	0x2e, 0x08, 0x00, 0x04, 0xb5, 0xf0, 0x20, 0x0f, 
+-	0x02, 0x40, 0x4c, 0x11, 0x61, 0x20, 0x20, 0x00, 
+-	0xf7, 0xfc, 0xfc, 0x1c, 0x48, 0x0f, 0xf7, 0xfc, 
+-	0xfc, 0x19, 0x26, 0x00, 0x1d, 0xe0, 0x30, 0x59, 
+-	0x77, 0x06, 0x25, 0xff, 0x1d, 0xe7, 0x37, 0x79, 
+-	0x70, 0x3d, 0x20, 0x01, 0x63, 0x78, 0x60, 0xe6, 
+-	0x69, 0x78, 0x28, 0x00, 0xd1, 0x04, 0x20, 0x41, 
+-	0x01, 0x40, 0xf0, 0x01, 0xfd, 0xab, 0x61, 0x78, 
+-	0x69, 0x78, 0x28, 0x00, 0xd0, 0x01, 0x76, 0x3e, 
+-	0x70, 0x3d, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x04, 0x44, 0x00, 0x00, 0x1f, 0xff, 
+-	0xb5, 0x00, 0x20, 0x00, 0xf7, 0xfd, 0xff, 0xbc, 
+-	0x22, 0x00, 0xb4, 0x04, 0x23, 0x00, 0x4a, 0x06, 
+-	0x21, 0x00, 0x20, 0x00, 0xf7, 0xfc, 0xfa, 0xa8, 
+-	0x21, 0x00, 0x20, 0x0d, 0xb0, 0x01, 0xf0, 0x0c, 
+-	0xff, 0x8f, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x00, 0x00, 0xff, 0xff, 0xb5, 0x80, 0x22, 0x00, 
+-	0xb4, 0x04, 0x27, 0x00, 0x1c, 0x3b, 0x4a, 0x17, 
+-	0x21, 0x00, 0x20, 0x00, 0xf7, 0xfc, 0xfa, 0x94, 
+-	0x22, 0x00, 0xb0, 0x01, 0xb4, 0x04, 0x1c, 0x3b, 
+-	0x4a, 0x12, 0x49, 0x13, 0x20, 0x00, 0xf7, 0xfc, 
+-	0xfa, 0x8b, 0x21, 0x33, 0x06, 0x49, 0x6d, 0x88, 
+-	0x6d, 0x4a, 0x1a, 0x82, 0xb0, 0x01, 0x48, 0x0f, 
+-	0x62, 0x42, 0x6d, 0x49, 0x63, 0x01, 0x21, 0x01, 
+-	0x02, 0xc9, 0x64, 0x81, 0x21, 0x01, 0x65, 0x87, 
+-	0x30, 0x60, 0x76, 0x01, 0x77, 0x07, 0x22, 0x00, 
+-	0x21, 0x00, 0x20, 0x00, 0xf7, 0xff, 0xfe, 0x28, 
+-	0x20, 0x00, 0xf7, 0xff, 0xfe, 0x59, 0x21, 0x00, 
+-	0x20, 0x0d, 0xf0, 0x0c, 0xff, 0x59, 0xbc, 0x80, 
+-	0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 0xff, 0xff, 
+-	0x00, 0x00, 0x1f, 0xfe, 0x2e, 0x08, 0x04, 0x44, 
+-	0xb5, 0xf0, 0x06, 0x05, 0x0e, 0x2d, 0x20, 0x0f, 
+-	0x02, 0x40, 0x4f, 0x2f, 0x26, 0x33, 0x06, 0x76, 
+-	0x61, 0x38, 0x6d, 0xb0, 0x6d, 0x71, 0x1a, 0x40, 
+-	0x62, 0x78, 0x62, 0xb8, 0x20, 0x00, 0x1d, 0xfc, 
+-	0x34, 0x79, 0x60, 0xe0, 0x2d, 0x00, 0xd0, 0x02, 
+-	0x20, 0xff, 0xf7, 0xfd, 0xff, 0x59, 0x22, 0x00, 
+-	0xb4, 0x04, 0x23, 0x00, 0x21, 0x00, 0x20, 0x00, 
+-	0xf7, 0xfc, 0xfa, 0x46, 0x22, 0x01, 0x21, 0x01, 
+-	0x20, 0x00, 0xb0, 0x01, 0xf0, 0x0a, 0xff, 0xcc, 
+-	0x21, 0x00, 0x20, 0x00, 0xf0, 0x0b, 0xf8, 0x8c, 
+-	0x22, 0x00, 0xb4, 0x04, 0x23, 0x00, 0x4a, 0x1d, 
+-	0x20, 0x00, 0x1e, 0x51, 0xf7, 0xfc, 0xfa, 0x34, 
+-	0x20, 0x01, 0x63, 0x60, 0x69, 0x60, 0xb0, 0x01, 
+-	0x28, 0x00, 0xd1, 0x04, 0x20, 0x41, 0x01, 0x40, 
+-	0xf0, 0x01, 0xfd, 0x14, 0x61, 0x60, 0x69, 0x60, 
+-	0x28, 0x00, 0xd0, 0x03, 0x20, 0x00, 0x76, 0x20, 
+-	0x20, 0xff, 0x70, 0x20, 0x6d, 0x70, 0x63, 0x38, 
+-	0x20, 0x01, 0x02, 0xc0, 0x64, 0xb8, 0x20, 0x00, 
+-	0x26, 0x01, 0x65, 0xb8, 0x1d, 0xf9, 0x31, 0x59, 
+-	0x76, 0x0e, 0x22, 0x00, 0x21, 0x00, 0x20, 0x00, 
+-	0xf7, 0xff, 0xfd, 0xc6, 0x21, 0x00, 0x20, 0x0d, 
+-	0xf0, 0x0c, 0xfe, 0xfa, 0x20, 0x00, 0x60, 0xf8, 
+-	0x2d, 0x00, 0xd1, 0x02, 0xf7, 0xff, 0xfd, 0xf0, 
+-	0x61, 0xe6, 0x20, 0x00, 0x60, 0xb8, 0x66, 0x38, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x04, 0x44, 0x00, 0x00, 0x1f, 0xff, 
+-	0xb5, 0xb0, 0x4f, 0x45, 0x25, 0x00, 0x6d, 0x38, 
+-	0x4c, 0x44, 0x28, 0x05, 0xd2, 0x14, 0xa3, 0x02, 
+-	0x5c, 0x1b, 0x00, 0x5b, 0x44, 0x9f, 0x1c, 0x00, 
+-	0x10, 0x03, 0x2e, 0x65, 0x73, 0x00, 0x4d, 0x40, 
+-	0x68, 0x28, 0x08, 0x41, 0xd2, 0x08, 0x08, 0xc0, 
+-	0xd3, 0x09, 0xf7, 0xff, 0xfe, 0xb3, 0x23, 0x04, 
+-	0x43, 0xdb, 0x68, 0x28, 0x40, 0x18, 0x60, 0x28, 
+-	0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 0x6d, 0x78, 
+-	0x28, 0x00, 0xd0, 0xf9, 0x28, 0x01, 0xd0, 0x01, 
+-	0x28, 0x05, 0xd1, 0x06, 0xf0, 0x00, 0xf8, 0x6c, 
+-	0x8e, 0xa0, 0x28, 0x00, 0xd1, 0xf0, 0xf0, 0x00, 
+-	0xf9, 0x29, 0x6d, 0x78, 0x28, 0x04, 0xd0, 0x01, 
+-	0x28, 0x05, 0xd1, 0xe9, 0x8e, 0xa0, 0x28, 0x00, 
+-	0xd1, 0xe6, 0xf0, 0x00, 0xfa, 0x4b, 0xbc, 0xb0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x8e, 0xe0, 0x28, 0x00, 
+-	0xd1, 0xde, 0x8d, 0xa0, 0x06, 0x00, 0x0e, 0x00, 
+-	0x28, 0x06, 0xd1, 0x15, 0x48, 0x27, 0x78, 0x00, 
+-	0x28, 0x00, 0xd0, 0x06, 0x6d, 0x78, 0x28, 0x01, 
+-	0xd0, 0x01, 0x28, 0x05, 0xd1, 0x01, 0xf0, 0x00, 
+-	0xfc, 0xcd, 0x6d, 0x78, 0x28, 0x04, 0xd0, 0x01, 
+-	0x28, 0x05, 0xd1, 0x01, 0xf0, 0x00, 0xfc, 0x2e, 
+-	0x85, 0xa5, 0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x8d, 0xa0, 0x28, 0x00, 0xd1, 0xc0, 0x6d, 0x78, 
+-	0x28, 0x01, 0xd0, 0x08, 0x28, 0x04, 0xd0, 0x0b, 
+-	0x28, 0x05, 0xd1, 0xb9, 0xf0, 0x00, 0xfd, 0xe4, 
+-	0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 0xf0, 0x00, 
+-	0xfd, 0xb9, 0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 
+-	0xf0, 0x00, 0xfd, 0x88, 0xbc, 0xb0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x8e, 0xe0, 0x28, 0x00, 0xd1, 0xa7, 
+-	0x20, 0x06, 0x85, 0xa0, 0x85, 0xe5, 0x20, 0x09, 
+-	0x02, 0x40, 0x86, 0xe0, 0x20, 0x04, 0x65, 0x38, 
+-	0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 0x8e, 0xe0, 
+-	0x28, 0x00, 0xd1, 0x99, 0x8d, 0xa0, 0x06, 0x00, 
+-	0x0e, 0x00, 0x28, 0x06, 0xd1, 0x94, 0x85, 0xa5, 
+-	0x65, 0x3d, 0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x04, 0x44, 0x2c, 0x00, 0x1f, 0xc0, 
+-	0x2e, 0x08, 0x00, 0x04, 0x2e, 0x08, 0x04, 0xc4, 
+-	0xb5, 0xb0, 0x48, 0x46, 0x6c, 0xc1, 0x4c, 0x46, 
+-	0x64, 0x21, 0x69, 0x60, 0x1a, 0x09, 0x1d, 0xe7, 
+-	0x37, 0x79, 0x63, 0xf9, 0x29, 0x00, 0xda, 0x02, 
+-	0x69, 0x22, 0x18, 0x89, 0x63, 0xf9, 0x23, 0xff, 
+-	0x6b, 0xf9, 0x33, 0x01, 0x42, 0x99, 0xdb, 0x73, 
+-	0x22, 0x01, 0x03, 0x12, 0x42, 0x91, 0xdd, 0x00, 
+-	0x63, 0xfa, 0x6b, 0xf9, 0x08, 0x89, 0x00, 0x89, 
+-	0x63, 0xf9, 0x7a, 0x3a, 0x2a, 0x00, 0xd0, 0x05, 
+-	0x23, 0xff, 0x03, 0x5b, 0x1a, 0xc2, 0x61, 0xe2, 
+-	0x22, 0x00, 0x72, 0x3a, 0x18, 0x42, 0x49, 0x35, 
+-	0x25, 0x12, 0x42, 0x8a, 0xdd, 0x2c, 0x1a, 0x08, 
+-	0x64, 0x38, 0xf0, 0x18, 0xfb, 0x5f, 0x4b, 0x32, 
+-	0x40, 0x18, 0xf0, 0x18, 0xfb, 0x5f, 0x22, 0x00, 
+-	0x49, 0x30, 0xb4, 0x06, 0x69, 0x60, 0x69, 0x39, 
+-	0x18, 0x41, 0x23, 0xff, 0x03, 0x5b, 0x1a, 0xc9, 
+-	0x23, 0x0d, 0x06, 0x9b, 0x1a, 0xc0, 0x6c, 0x3a, 
+-	0x1c, 0x2b, 0xf0, 0x0f, 0xf8, 0x67, 0x22, 0x00, 
+-	0xb0, 0x02, 0x49, 0x28, 0xb4, 0x06, 0x6b, 0xf8, 
+-	0x6c, 0x39, 0x1a, 0x42, 0x69, 0x39, 0x1c, 0x2b, 
+-	0x48, 0x25, 0xf0, 0x0f, 0xf8, 0x5b, 0xb0, 0x02, 
+-	0xf0, 0x18, 0xfb, 0x3c, 0x23, 0x01, 0x04, 0x9b, 
+-	0x43, 0x18, 0xf0, 0x18, 0xfb, 0x3b, 0xe0, 0x1d, 
+-	0xf0, 0x18, 0xfb, 0x34, 0x4b, 0x1c, 0x40, 0x18, 
+-	0xf0, 0x18, 0xfb, 0x34, 0x22, 0x00, 0x49, 0x1b, 
+-	0xb4, 0x06, 0x69, 0x60, 0x69, 0x39, 0x18, 0x41, 
+-	0x23, 0xff, 0x03, 0x5b, 0x1a, 0xc9, 0x23, 0x0d, 
+-	0x06, 0x9b, 0x1a, 0xc0, 0x6b, 0xfa, 0x1c, 0x2b, 
+-	0xf0, 0x0f, 0xf8, 0x3c, 0xb0, 0x02, 0xf0, 0x18, 
+-	0xfb, 0x1d, 0x23, 0x01, 0x04, 0x9b, 0x43, 0x18, 
+-	0xf0, 0x18, 0xfb, 0x1c, 0x69, 0x60, 0x6b, 0xf9, 
+-	0x18, 0x40, 0x23, 0x0d, 0x06, 0x9b, 0x1a, 0xc1, 
+-	0x61, 0x60, 0x4b, 0x0e, 0x42, 0x99, 0xd3, 0x02, 
+-	0x69, 0x21, 0x1a, 0x40, 0x61, 0x60, 0x23, 0xff, 
+-	0x03, 0x5b, 0x69, 0x60, 0x1a, 0xc0, 0xe0, 0x00, 
+-	0xe0, 0x00, 0x62, 0x20, 0xbc, 0xb0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x66, 0x00, 0x00, 0x80, 
+-	0x2e, 0x08, 0x04, 0x44, 0x00, 0x1f, 0xfe, 0x00, 
+-	0xff, 0xfb, 0xff, 0xff, 0x9e, 0x00, 0x08, 0x00, 
+-	0xcc, 0x1f, 0xe0, 0x00, 0xcc, 0x1f, 0xfe, 0x00, 
+-	0x21, 0x00, 0x23, 0xff, 0x68, 0x02, 0x33, 0xc1, 
+-	0x42, 0x9a, 0xd0, 0x01, 0x1c, 0x08, 0x47, 0x70, 
+-	0x79, 0xc2, 0x0a, 0x12, 0xd2, 0x01, 0x1c, 0x08, 
+-	0x47, 0x70, 0x7a, 0x41, 0x23, 0x0e, 0x40, 0x19, 
+-	0x07, 0x49, 0x7a, 0x82, 0x05, 0x92, 0x43, 0x11, 
+-	0x7a, 0xc2, 0x23, 0xfe, 0x40, 0x1a, 0x03, 0x92, 
+-	0x43, 0x11, 0x7b, 0x02, 0x01, 0xd2, 0x43, 0x11, 
+-	0x7b, 0x40, 0x40, 0x18, 0x08, 0x40, 0x43, 0x08, 
+-	0x49, 0x01, 0x67, 0x08, 0x47, 0x70, 0x00, 0x00, 
+-	0x2e, 0x08, 0x04, 0x44, 0xb5, 0xf0, 0xb0, 0x86, 
+-	0x4c, 0x8c, 0x6c, 0xe0, 0x1d, 0xe7, 0x37, 0x79, 
+-	0x1d, 0xfd, 0x35, 0x39, 0x28, 0x00, 0xd0, 0x04, 
+-	0x28, 0x01, 0xd0, 0x3a, 0x28, 0x02, 0xd1, 0x73, 
+-	0xe0, 0x74, 0x69, 0xe0, 0x6a, 0x21, 0x1a, 0x09, 
+-	0x63, 0xf9, 0x1c, 0x0a, 0xd5, 0x02, 0x69, 0x21, 
+-	0x18, 0x51, 0x63, 0xf9, 0x6b, 0xf9, 0x29, 0x04, 
+-	0xdb, 0x67, 0x69, 0x3e, 0x5c, 0x31, 0x06, 0x0a, 
+-	0x65, 0x7a, 0x92, 0x05, 0x1c, 0x41, 0x69, 0x20, 
+-	0x90, 0x04, 0xf0, 0x14, 0xfb, 0x29, 0x61, 0xe1, 
+-	0x5c, 0x70, 0x04, 0x00, 0x9a, 0x05, 0x18, 0x82, 
+-	0x65, 0x7a, 0x92, 0x03, 0x98, 0x04, 0x31, 0x01, 
+-	0xf0, 0x14, 0xfb, 0x1e, 0x61, 0xe1, 0x5c, 0x70, 
+-	0x02, 0x00, 0x9a, 0x03, 0x18, 0x80, 0x65, 0x78, 
+-	0x90, 0x02, 0x98, 0x04, 0x31, 0x01, 0xf0, 0x14, 
+-	0xfb, 0x13, 0x61, 0xe1, 0x5c, 0x70, 0x9a, 0x02, 
+-	0x18, 0x80, 0x65, 0x78, 0x98, 0x04, 0x31, 0x01, 
+-	0xf0, 0x14, 0xfb, 0x0a, 0x20, 0x01, 0x64, 0xe0, 
+-	0x61, 0xe1, 0x6a, 0x20, 0x69, 0xe1, 0x1a, 0x40, 
+-	0x63, 0xf8, 0x1c, 0x01, 0xd4, 0x05, 0x48, 0x67, 
+-	0x69, 0x06, 0x30, 0x80, 0x69, 0x02, 0x92, 0x01, 
+-	0xe0, 0x03, 0x69, 0x20, 0x18, 0x08, 0x63, 0xf8, 
+-	0xe7, 0xf5, 0x6b, 0xf8, 0x90, 0x00, 0x28, 0x02, 
+-	0xdb, 0x22, 0x6d, 0x78, 0x09, 0x01, 0x01, 0x09, 
+-	0x23, 0xff, 0x33, 0xc1, 0x42, 0x99, 0xd1, 0x31, 
+-	0x9a, 0x01, 0x69, 0xe0, 0x5c, 0x11, 0x02, 0x09, 
+-	0x83, 0x29, 0x1c, 0x41, 0x1c, 0x30, 0xf0, 0x14, 
+-	0xfa, 0xe3, 0x61, 0xe1, 0x69, 0x38, 0x5c, 0x40, 
+-	0x8b, 0x2a, 0x18, 0x80, 0x83, 0x28, 0x8b, 0x28, 
+-	0x30, 0x06, 0x83, 0x28, 0x19, 0x88, 0x1f, 0x41, 
+-	0x1c, 0x30, 0xf0, 0x14, 0xfa, 0xd5, 0x61, 0xe1, 
+-	0x21, 0xff, 0x71, 0x39, 0x20, 0x02, 0x64, 0xe0, 
+-	0x6c, 0xe0, 0x28, 0x02, 0xd1, 0x00, 0xe0, 0x01, 
+-	0xe0, 0x94, 0xe0, 0x93, 0x6a, 0x20, 0x69, 0xe1, 
+-	0x1a, 0x40, 0x63, 0xf8, 0x1c, 0x01, 0xd5, 0x02, 
+-	0x69, 0x20, 0x18, 0x08, 0x63, 0xf8, 0x79, 0x38, 
+-	0x28, 0x00, 0xd0, 0x13, 0x20, 0x01, 0x02, 0xc0, 
+-	0x83, 0xa8, 0xe0, 0x11, 0x02, 0x01, 0x65, 0x79, 
+-	0x9a, 0x01, 0x69, 0xe0, 0x5c, 0x12, 0x18, 0x51, 
+-	0x65, 0x79, 0x1c, 0x41, 0x1c, 0x30, 0xf0, 0x14, 
+-	0xfa, 0xaf, 0x61, 0xe1, 0x98, 0x00, 0x38, 0x01, 
+-	0x63, 0xf8, 0xe7, 0xb2, 0x48, 0x3c, 0x83, 0xa8, 
+-	0x8b, 0x28, 0x6b, 0xf9, 0x42, 0x88, 0xda, 0x01, 
+-	0x63, 0xf8, 0xe0, 0x02, 0x8b, 0xa8, 0x42, 0x81, 
+-	0xdb, 0x68, 0x8b, 0xa8, 0x6b, 0xf9, 0x42, 0x81, 
+-	0xdd, 0x00, 0x63, 0xf8, 0x48, 0x35, 0x21, 0x00, 
+-	0x66, 0x78, 0x80, 0x01, 0x30, 0x02, 0x21, 0xff, 
+-	0x31, 0xc1, 0x66, 0x78, 0x80, 0x01, 0x48, 0x32, 
+-	0x66, 0x78, 0x79, 0x39, 0x29, 0x00, 0xd0, 0x21, 
+-	0x21, 0x00, 0x71, 0x39, 0x69, 0x3b, 0x69, 0x20, 
+-	0x18, 0x1a, 0xb4, 0x04, 0x69, 0xe0, 0x18, 0x18, 
+-	0x6b, 0xfa, 0x49, 0x2a, 0xf0, 0x00, 0xfe, 0xf4, 
+-	0x6b, 0xf8, 0x38, 0x06, 0x6e, 0x79, 0x80, 0x08, 
+-	0x31, 0x02, 0x66, 0x79, 0xb0, 0x01, 0x48, 0x25, 
+-	0xf7, 0xff, 0xff, 0x02, 0x8b, 0x28, 0x6b, 0xf9, 
+-	0x1a, 0x40, 0x83, 0x28, 0x69, 0xe0, 0x6b, 0xf9, 
+-	0x18, 0x41, 0x69, 0x20, 0xf0, 0x14, 0xfa, 0x6c, 
+-	0x61, 0xe1, 0xe0, 0x26, 0x6b, 0xf9, 0x31, 0x03, 
+-	0x80, 0x01, 0x48, 0x1e, 0x21, 0x01, 0x03, 0xc9, 
+-	0x66, 0x78, 0x80, 0x01, 0x30, 0x02, 0x21, 0xff, 
+-	0x66, 0x78, 0x80, 0x01, 0x48, 0x1a, 0x66, 0x78, 
+-	0x69, 0x3b, 0x69, 0x20, 0x18, 0x1a, 0xb4, 0x04, 
+-	0x69, 0xe0, 0x18, 0x18, 0x6b, 0xfa, 0x49, 0x17, 
+-	0xf0, 0x00, 0xfe, 0xc6, 0x8b, 0x28, 0x6b, 0xf9, 
+-	0x1a, 0x40, 0x83, 0x28, 0x69, 0xe0, 0x6b, 0xfe, 
+-	0x19, 0x81, 0x69, 0x20, 0xb0, 0x01, 0xf0, 0x14, 
+-	0xfa, 0x47, 0x1d, 0xf0, 0x30, 0x02, 0x61, 0xe1, 
+-	0x63, 0xf8, 0x8b, 0x28, 0x28, 0x00, 0xd1, 0x01, 
+-	0x21, 0x00, 0x64, 0xe0, 0x21, 0x10, 0x48, 0x0c, 
+-	0x85, 0x01, 0x6b, 0xf9, 0x85, 0x41, 0x21, 0x01, 
+-	0x02, 0x49, 0x86, 0x81, 0xb0, 0x06, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x04, 0x44, 
+-	0x00, 0x00, 0x07, 0xf7, 0x2c, 0x00, 0x02, 0x00, 
+-	0x2c, 0x00, 0x02, 0x04, 0x2c, 0x00, 0x02, 0x06, 
+-	0x2c, 0x00, 0x02, 0x0a, 0x2c, 0x00, 0x02, 0x09, 
+-	0x2c, 0x00, 0x1f, 0xc0, 0xb5, 0xf0, 0x20, 0x33, 
+-	0x06, 0x40, 0x6e, 0x40, 0xb0, 0x81, 0x4f, 0x77, 
+-	0x63, 0xb8, 0x6a, 0xf9, 0x1a, 0x40, 0x1d, 0xfc, 
+-	0x34, 0x79, 0x63, 0xe0, 0x28, 0x00, 0xda, 0x02, 
+-	0x6a, 0x79, 0x18, 0x40, 0x63, 0xe0, 0x6b, 0xe0, 
+-	0x4b, 0x71, 0x42, 0x98, 0xdc, 0x03, 0xb0, 0x01, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x6d, 0xb9, 
+-	0x48, 0x6e, 0x1d, 0xc5, 0x35, 0x59, 0x29, 0x00, 
+-	0xd1, 0x16, 0x7e, 0x01, 0x29, 0x00, 0xd1, 0x13, 
+-	0x21, 0x01, 0x75, 0x01, 0x21, 0x05, 0x84, 0x29, 
+-	0x23, 0x0d, 0x06, 0x9b, 0x6c, 0x79, 0x1a, 0xca, 
+-	0x68, 0x52, 0x31, 0x08, 0x23, 0x05, 0x02, 0x5b, 
+-	0x64, 0x79, 0x66, 0xba, 0x42, 0x99, 0xdb, 0x06, 
+-	0x21, 0x01, 0x02, 0xc9, 0x64, 0x79, 0xe0, 0x02, 
+-	0x21, 0x00, 0x75, 0x01, 0x84, 0x29, 0x8c, 0x29, 
+-	0x1c, 0x4a, 0x6a, 0xfb, 0x1a, 0x9a, 0x07, 0x92, 
+-	0x0f, 0x92, 0x18, 0x51, 0x84, 0x29, 0x7e, 0x01, 
+-	0x29, 0x00, 0xd0, 0x03, 0x21, 0x00, 0x66, 0x39, 
+-	0x66, 0x79, 0x76, 0x01, 0x6c, 0x79, 0x4a, 0x58, 
+-	0x69, 0x52, 0x42, 0x91, 0xd0, 0x26, 0x6e, 0x7a, 
+-	0x2a, 0x00, 0xd1, 0x10, 0x23, 0x0d, 0x06, 0x9b, 
+-	0x1a, 0xc9, 0x68, 0x09, 0x66, 0x79, 0x1c, 0x0a, 
+-	0x6e, 0x3b, 0x18, 0x59, 0x66, 0x39, 0x4b, 0x51, 
+-	0x42, 0x99, 0xdb, 0x04, 0x32, 0x01, 0x31, 0x01, 
+-	0x40, 0x19, 0x66, 0x39, 0x66, 0x7a, 0x6e, 0x79, 
+-	0x6d, 0xba, 0x1a, 0x89, 0x65, 0x21, 0x91, 0x00, 
+-	0x8c, 0x2b, 0x4e, 0x4b, 0x1a, 0xf3, 0x42, 0x8b, 
+-	0xd3, 0x04, 0x63, 0xe1, 0x21, 0x00, 0x65, 0xb9, 
+-	0x66, 0x79, 0xe0, 0x0a, 0x18, 0xd1, 0x63, 0xe3, 
+-	0x65, 0xb9, 0xe0, 0x06, 0x8c, 0x29, 0x4a, 0x44, 
+-	0x1a, 0x51, 0x63, 0xe1, 0x6d, 0xba, 0x18, 0x51, 
+-	0x65, 0xb9, 0x49, 0x42, 0x66, 0x61, 0x8c, 0x2a, 
+-	0x6b, 0xe1, 0x18, 0x89, 0x31, 0x03, 0x83, 0xa9, 
+-	0x22, 0x00, 0x6e, 0x61, 0x80, 0x0a, 0x31, 0x02, 
+-	0x22, 0xff, 0x32, 0xe1, 0x66, 0x61, 0x80, 0x0a, 
+-	0x31, 0x02, 0x66, 0x61, 0x8b, 0xaa, 0x80, 0x0a, 
+-	0x31, 0x02, 0x66, 0x61, 0x7d, 0x00, 0x28, 0x00, 
+-	0xd0, 0x1d, 0x4a, 0x37, 0x80, 0x0a, 0x1c, 0x88, 
+-	0x66, 0x60, 0x8c, 0x29, 0x02, 0x09, 0x6e, 0xba, 
+-	0x0f, 0x52, 0x23, 0x06, 0x40, 0x1a, 0x43, 0x11, 
+-	0x23, 0x21, 0x43, 0x19, 0x80, 0x01, 0x30, 0x02, 
+-	0x66, 0x60, 0x6e, 0xb9, 0x0b, 0x89, 0x23, 0x01, 
+-	0x43, 0x19, 0x80, 0x01, 0x30, 0x02, 0x66, 0x60, 
+-	0x6e, 0xb9, 0x00, 0x49, 0x43, 0x19, 0x80, 0x01, 
+-	0x30, 0x02, 0x66, 0x60, 0xe0, 0x0b, 0x20, 0x01, 
+-	0x03, 0xc0, 0x80, 0x08, 0x31, 0x02, 0x66, 0x61, 
+-	0x8c, 0x28, 0x02, 0x00, 0x23, 0xff, 0x43, 0x18, 
+-	0x80, 0x08, 0x31, 0x02, 0x66, 0x61, 0x48, 0x23, 
+-	0x6e, 0x61, 0x80, 0x08, 0x31, 0x02, 0x66, 0x61, 
+-	0x80, 0x08, 0x31, 0x02, 0x22, 0x33, 0x06, 0x52, 
+-	0x66, 0x61, 0x00, 0x53, 0x6d, 0x90, 0x18, 0xc2, 
+-	0xb4, 0x04, 0x08, 0x5a, 0x6d, 0x50, 0x18, 0xc6, 
+-	0x8c, 0x28, 0x4b, 0x1b, 0x18, 0xc1, 0x00, 0x53, 
+-	0x6a, 0xf8, 0x18, 0xc0, 0x6b, 0xe2, 0x1c, 0x33, 
+-	0xf0, 0x00, 0xfd, 0xbe, 0x6a, 0xf8, 0x6b, 0xe1, 
+-	0x18, 0x40, 0x22, 0x33, 0x06, 0x52, 0x62, 0xf8, 
+-	0x6d, 0x92, 0xb0, 0x01, 0x42, 0x90, 0xdb, 0x02, 
+-	0x6a, 0x79, 0x1a, 0x40, 0x62, 0xf8, 0x21, 0xff, 
+-	0x31, 0x11, 0x48, 0x10, 0x85, 0x01, 0x8b, 0xa9, 
+-	0x31, 0x06, 0x85, 0x41, 0x21, 0x01, 0x02, 0x49, 
+-	0x86, 0x81, 0xb0, 0x01, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x04, 0x44, 
+-	0x00, 0x00, 0x0f, 0xee, 0x2e, 0x08, 0x04, 0xa4, 
+-	0xcc, 0x00, 0x0f, 0x00, 0x00, 0xff, 0xff, 0xff, 
+-	0x00, 0x00, 0x07, 0xf7, 0x2c, 0x00, 0x02, 0x00, 
+-	0x00, 0x00, 0x80, 0x80, 0x00, 0x00, 0xff, 0xff, 
+-	0x2c, 0x00, 0x02, 0x09, 0x2c, 0x00, 0x1f, 0xc0, 
+-	0xb5, 0xb0, 0x1c, 0x07, 0xb0, 0x83, 0x4d, 0x20, 
+-	0x6b, 0x28, 0xf7, 0xff, 0xfa, 0x51, 0x48, 0x1f, 
+-	0x6c, 0xc1, 0x6c, 0x80, 0x1a, 0x08, 0xd5, 0x03, 
+-	0x1f, 0xe9, 0x39, 0x79, 0x69, 0x09, 0x18, 0x40, 
+-	0x6e, 0xa9, 0x29, 0x00, 0xd0, 0x22, 0x29, 0x10, 
+-	0xd0, 0x20, 0x29, 0x20, 0xd0, 0x24, 0x29, 0x30, 
+-	0xd1, 0x04, 0x24, 0x2d, 0x43, 0x44, 0xd5, 0x00, 
+-	0x34, 0x3f, 0x11, 0xa4, 0x46, 0x6a, 0xa8, 0x01, 
+-	0xa9, 0x02, 0xf7, 0xff, 0xfa, 0x17, 0x1b, 0x38, 
+-	0x99, 0x02, 0x1a, 0x08, 0x22, 0x7d, 0x01, 0x52, 
+-	0x42, 0x90, 0xdc, 0x01, 0x42, 0x90, 0xda, 0x05, 
+-	0x1a, 0x09, 0x91, 0x02, 0x22, 0x00, 0x20, 0x00, 
+-	0xf7, 0xff, 0xf9, 0xf2, 0xb0, 0x03, 0xbc, 0xb0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x01, 0x04, 0x1a, 0x24, 
+-	0xd5, 0x00, 0x34, 0x1f, 0x11, 0x64, 0xe7, 0xe1, 
+-	0x21, 0x4b, 0x43, 0x41, 0x20, 0x93, 0xf0, 0x14, 
+-	0xf8, 0xd7, 0x1c, 0x04, 0xe7, 0xda, 0x00, 0x00, 
+-	0x2e, 0x08, 0x04, 0xc4, 0x66, 0x00, 0x00, 0x80, 
+-	0xb5, 0x90, 0x1c, 0x07, 0xb0, 0x83, 0x4c, 0x18, 
+-	0x6f, 0x60, 0x30, 0x01, 0x46, 0x6a, 0x67, 0x60, 
+-	0xa8, 0x01, 0xa9, 0x02, 0xf7, 0xff, 0xf9, 0xe6, 
+-	0x4b, 0x14, 0x18, 0xf9, 0x98, 0x02, 0x1a, 0x40, 
+-	0x4b, 0x13, 0x42, 0x98, 0xdc, 0x04, 0x42, 0xd8, 
+-	0xdb, 0x02, 0x69, 0xe0, 0x28, 0x01, 0xd1, 0x07, 
+-	0x91, 0x02, 0x20, 0x00, 0x90, 0x01, 0x22, 0x00, 
+-	0xf7, 0xff, 0xf9, 0xbe, 0x20, 0x01, 0x61, 0xe0, 
+-	0x69, 0xe0, 0x28, 0x00, 0xd0, 0x0b, 0x6b, 0x20, 
+-	0xf7, 0xff, 0xf9, 0xea, 0x6f, 0x60, 0x67, 0xa0, 
+-	0x48, 0x08, 0x60, 0x07, 0x6f, 0xe0, 0x30, 0x01, 
+-	0x67, 0xe0, 0x20, 0x00, 0x61, 0xe0, 0xb0, 0x03, 
+-	0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x04, 0xc4, 0xff, 0xff, 0xec, 0x78, 
+-	0x00, 0x02, 0xbf, 0x20, 0x2e, 0x08, 0x05, 0x44, 
+-	0xb4, 0xf0, 0x1c, 0x1c, 0x23, 0x00, 0x9f, 0x04, 
+-	0x60, 0x3b, 0x79, 0x85, 0x23, 0xc0, 0x40, 0x1d, 
+-	0x4b, 0x33, 0x2d, 0x80, 0xd1, 0x16, 0x25, 0x02, 
+-	0x60, 0x9d, 0x79, 0xc5, 0x0a, 0x2b, 0xd3, 0x06, 
+-	0x7a, 0x45, 0x23, 0xe0, 0x40, 0x2b, 0x2b, 0x20, 
+-	0xd1, 0x01, 0x23, 0x09, 0x60, 0x3b, 0x7a, 0x03, 
+-	0x33, 0x09, 0x60, 0x13, 0x79, 0x02, 0x02, 0x12, 
+-	0x79, 0x45, 0x43, 0x2a, 0x32, 0x06, 0x1a, 0xd2, 
+-	0x60, 0x22, 0xe0, 0x25, 0x25, 0x06, 0x26, 0x01, 
+-	0x60, 0x9e, 0x79, 0x83, 0x2b, 0xff, 0xd1, 0x03, 
+-	0x35, 0x01, 0x5d, 0x43, 0x2b, 0xff, 0xd0, 0xfb, 
+-	0x5d, 0x46, 0x23, 0xc0, 0x40, 0x33, 0x2b, 0x40, 
+-	0xd1, 0x00, 0x35, 0x02, 0x5d, 0x46, 0x09, 0x33, 
+-	0x07, 0x9b, 0xd0, 0x08, 0x60, 0x3d, 0x5d, 0x46, 
+-	0x09, 0x73, 0xd3, 0x02, 0x1d, 0xeb, 0x33, 0x03, 
+-	0xe0, 0x02, 0x1d, 0x6b, 0xe0, 0x00, 0x1c, 0x6b, 
+-	0x60, 0x13, 0x79, 0x02, 0x02, 0x12, 0x79, 0x45, 
+-	0x43, 0x2a, 0x32, 0x06, 0x1a, 0xd2, 0x60, 0x22, 
+-	0x68, 0x3a, 0x2a, 0x00, 0xd0, 0x20, 0x5c, 0x82, 
+-	0x23, 0x0e, 0x40, 0x1a, 0x07, 0x52, 0x60, 0x0a, 
+-	0x68, 0x3b, 0x18, 0xc3, 0x78, 0x5b, 0x05, 0x9b, 
+-	0x43, 0x1a, 0x60, 0x0a, 0x68, 0x3b, 0x18, 0xc3, 
+-	0x78, 0x9c, 0x23, 0xfe, 0x40, 0x23, 0x03, 0x9b, 
+-	0x43, 0x1a, 0x60, 0x0a, 0x68, 0x3b, 0x18, 0xc3, 
+-	0x78, 0xdb, 0x01, 0xdb, 0x43, 0x1a, 0x60, 0x0a, 
+-	0x68, 0x3b, 0x18, 0xc0, 0x79, 0x00, 0x23, 0xfe, 
+-	0x40, 0x18, 0x08, 0x40, 0x43, 0x10, 0x60, 0x08, 
+-	0x20, 0x00, 0xbc, 0xf0, 0x47, 0x70, 0x00, 0x00, 
+-	0x2e, 0x08, 0x04, 0x44, 0xb5, 0xb0, 0xb0, 0x83, 
+-	0x48, 0x43, 0x49, 0x44, 0x8d, 0xc9, 0x4c, 0x44, 
+-	0x63, 0xe1, 0x29, 0x06, 0xda, 0x03, 0xb0, 0x03, 
+-	0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 0x68, 0x01, 
+-	0x09, 0x09, 0x01, 0x09, 0x23, 0xff, 0x33, 0xe1, 
+-	0x42, 0x99, 0xd0, 0x03, 0xb0, 0x03, 0xbc, 0xb0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x46, 0x6a, 0xb4, 0x04, 
+-	0xaa, 0x03, 0xab, 0x02, 0x49, 0x39, 0xf7, 0xff, 
+-	0xff, 0x6f, 0xb0, 0x01, 0x28, 0x00, 0xd0, 0x03, 
+-	0xb0, 0x03, 0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x98, 0x02, 0x99, 0x01, 0x18, 0x40, 0x6b, 0xe1, 
+-	0x42, 0x88, 0xd0, 0x03, 0xb0, 0x03, 0xbc, 0xb0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x98, 0x00, 0x4f, 0x30, 
+-	0x28, 0x00, 0xd0, 0x2e, 0x6e, 0x38, 0x6d, 0xb9, 
+-	0x18, 0x40, 0x23, 0x01, 0x06, 0x1b, 0x66, 0x38, 
+-	0x42, 0x98, 0xdb, 0x04, 0x43, 0xdb, 0x18, 0xc0, 
+-	0x66, 0x38, 0x1e, 0x48, 0x65, 0xb8, 0x23, 0x0d, 
+-	0x06, 0x9b, 0x6d, 0xb8, 0x6c, 0xb9, 0x1a, 0xc9, 
+-	0x60, 0x08, 0x6e, 0xe0, 0x6c, 0xb9, 0x1a, 0xc9, 
+-	0x60, 0x48, 0x20, 0x00, 0x65, 0xb8, 0x6c, 0xb8, 
+-	0x30, 0x08, 0x23, 0x05, 0x02, 0x5b, 0x64, 0xb8, 
+-	0x42, 0x98, 0xd1, 0x02, 0x20, 0x01, 0x02, 0xc0, 
+-	0x64, 0xb8, 0x6c, 0xb8, 0x49, 0x1d, 0x61, 0x48, 
+-	0x6d, 0x78, 0x28, 0x04, 0xd1, 0x05, 0x68, 0xe0, 
+-	0x28, 0x00, 0xd1, 0x02, 0x6e, 0xe0, 0xf7, 0xff, 
+-	0xfe, 0xef, 0x24, 0x33, 0x06, 0x64, 0x00, 0x63, 
+-	0x6d, 0xa0, 0x18, 0xc2, 0xb4, 0x04, 0x6d, 0x60, 
+-	0x18, 0xc5, 0x6e, 0x60, 0x18, 0xc1, 0x98, 0x03, 
+-	0x4b, 0x0d, 0x18, 0xc0, 0x9a, 0x02, 0x1c, 0x2b, 
+-	0xf0, 0x00, 0xfc, 0x52, 0xb0, 0x01, 0x6d, 0xb8, 
+-	0x99, 0x01, 0x18, 0x40, 0x65, 0xb8, 0x48, 0x0e, 
+-	0x68, 0x02, 0x18, 0x51, 0x60, 0x01, 0x6e, 0x60, 
+-	0x6d, 0xa1, 0x42, 0x88, 0xdb, 0x04, 0x48, 0x0a, 
+-	0x68, 0x01, 0x6a, 0x7a, 0x1a, 0x89, 0x60, 0x01, 
+-	0xb0, 0x03, 0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2c, 0x00, 0x12, 0x00, 0x2c, 0x00, 0x1f, 0xc0, 
+-	0x2e, 0x08, 0x04, 0xc4, 0x2e, 0x08, 0x05, 0x30, 
+-	0x2e, 0x08, 0x04, 0x44, 0xcc, 0x00, 0x0f, 0x00, 
+-	0x66, 0x00, 0x00, 0x64, 0xb5, 0xf0, 0xb0, 0x83, 
+-	0x4e, 0x65, 0x25, 0x00, 0x4f, 0x65, 0x6a, 0xf8, 
+-	0xf7, 0xff, 0xf8, 0xc2, 0x48, 0x64, 0x8d, 0xc0, 
+-	0x63, 0xf8, 0x28, 0x0a, 0xda, 0x03, 0xb0, 0x03, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x68, 0x34, 
+-	0x09, 0x60, 0x01, 0x40, 0x23, 0xff, 0x33, 0xc1, 
+-	0x42, 0x98, 0xd0, 0x07, 0x23, 0xff, 0x33, 0xbe, 
+-	0x42, 0x9c, 0xd0, 0x03, 0xb0, 0x03, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x46, 0x6a, 0xb4, 0x04, 
+-	0xaa, 0x03, 0xab, 0x02, 0x49, 0x57, 0x1c, 0x30, 
+-	0xf7, 0xff, 0xfe, 0xce, 0xb0, 0x01, 0x28, 0x00, 
+-	0xd0, 0x03, 0xb0, 0x03, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x98, 0x02, 0x99, 0x01, 0x18, 0x41, 
+-	0x6b, 0xfa, 0x42, 0x91, 0xd0, 0x03, 0xb0, 0x03, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x21, 0x01, 
+-	0x1c, 0x22, 0x4c, 0x4d, 0x23, 0xff, 0x33, 0xbe, 
+-	0x42, 0x9a, 0xd1, 0x3c, 0x5c, 0x30, 0x28, 0xa0, 
+-	0xd0, 0x03, 0xb0, 0x03, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x68, 0xe0, 0x28, 0x00, 0xd1, 0x1b, 
+-	0x20, 0x02, 0x63, 0x78, 0x60, 0xe1, 0x21, 0x00, 
+-	0x20, 0x00, 0xf0, 0x09, 0xfd, 0x8d, 0x20, 0x00, 
+-	0xf7, 0xfb, 0xfd, 0xd4, 0x98, 0x02, 0x4b, 0x3c, 
+-	0x18, 0xc0, 0x79, 0x40, 0x23, 0x30, 0x40, 0x18, 
+-	0x66, 0xb8, 0xd0, 0x16, 0x28, 0x10, 0xd0, 0x14, 
+-	0x28, 0x20, 0xd0, 0x17, 0x28, 0x30, 0xd1, 0x03, 
+-	0x21, 0x20, 0x20, 0x1e, 0xf0, 0x0a, 0xf8, 0xa7, 
+-	0x98, 0x00, 0x28, 0x00, 0xd0, 0x2b, 0x6d, 0x60, 
+-	0x28, 0x05, 0xd1, 0x28, 0x68, 0xf8, 0x28, 0x00, 
+-	0xd1, 0x25, 0x6f, 0x38, 0xf7, 0xff, 0xfe, 0x00, 
+-	0xe0, 0x21, 0x21, 0x02, 0x20, 0x1e, 0xf0, 0x0a, 
+-	0xf8, 0x96, 0xe7, 0xed, 0x21, 0x08, 0x20, 0x1e, 
+-	0xf0, 0x0a, 0xf8, 0x91, 0xe7, 0xe8, 0x68, 0xe0, 
+-	0x28, 0x00, 0xd0, 0x08, 0x20, 0x00, 0x63, 0x79, 
+-	0x21, 0x00, 0x60, 0xe0, 0xf0, 0x09, 0xfd, 0x58, 
+-	0x20, 0x02, 0xf0, 0x09, 0xfd, 0xab, 0x98, 0x00, 
+-	0x28, 0x00, 0xd0, 0x08, 0x6d, 0x60, 0x28, 0x05, 
+-	0xd1, 0x05, 0x68, 0xf8, 0x28, 0x00, 0xd1, 0x02, 
+-	0x6f, 0x38, 0xf7, 0xff, 0xfe, 0x25, 0x68, 0xe0, 
+-	0x28, 0x00, 0xd0, 0x01, 0x98, 0x02, 0x1d, 0xc5, 
+-	0x6b, 0xf8, 0x1b, 0x42, 0x63, 0xfa, 0x7e, 0x39, 
+-	0x69, 0x78, 0x18, 0x41, 0x4b, 0x16, 0x18, 0xe8, 
+-	0xf7, 0xfb, 0xfb, 0x3a, 0x7e, 0x38, 0x6b, 0xf9, 
+-	0x18, 0x40, 0x07, 0x81, 0x0f, 0x89, 0x76, 0x39, 
+-	0x1a, 0x44, 0x20, 0x01, 0x06, 0x00, 0x49, 0x15, 
+-	0x60, 0x08, 0xf0, 0x17, 0xfe, 0x57, 0x4b, 0x14, 
+-	0x40, 0x18, 0xf0, 0x17, 0xfe, 0x57, 0x22, 0x04, 
+-	0x49, 0x10, 0xb4, 0x06, 0x23, 0x12, 0x21, 0x1e, 
+-	0x69, 0x78, 0x1c, 0x22, 0xf0, 0x0e, 0xfb, 0x66, 
+-	0xb0, 0x02, 0xf0, 0x17, 0xfe, 0x47, 0x23, 0x01, 
+-	0x04, 0x9b, 0x43, 0x18, 0xf0, 0x17, 0xfe, 0x46, 
+-	0x69, 0x78, 0x59, 0x01, 0x60, 0x01, 0xb0, 0x03, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2c, 0x00, 0x12, 0x00, 0x2e, 0x08, 0x04, 0xc4, 
+-	0x2c, 0x00, 0x1f, 0xc0, 0x2e, 0x08, 0x05, 0x34, 
+-	0x2e, 0x08, 0x04, 0x44, 0x9e, 0x00, 0x08, 0x00, 
+-	0xff, 0xfb, 0xff, 0xff, 0x20, 0x33, 0x06, 0x40, 
+-	0x6e, 0x81, 0x6e, 0x40, 0x1a, 0x09, 0x48, 0x0f, 
+-	0x63, 0xc1, 0x29, 0x00, 0xdc, 0x04, 0x1f, 0xc2, 
+-	0x3a, 0x79, 0x6a, 0x52, 0x18, 0x89, 0x63, 0xc1, 
+-	0x6b, 0xc1, 0x08, 0x89, 0x00, 0x89, 0x23, 0x01, 
+-	0x02, 0xdb, 0x63, 0xc1, 0x42, 0x99, 0xdd, 0x0b, 
+-	0x4a, 0x07, 0x42, 0x91, 0xdd, 0x00, 0x63, 0xc2, 
+-	0x4a, 0x06, 0x49, 0x07, 0x85, 0x8a, 0x6b, 0xc0, 
+-	0x85, 0xc8, 0x20, 0x09, 0x02, 0x40, 0x86, 0xc8, 
+-	0x47, 0x70, 0x00, 0x00, 0x2e, 0x08, 0x04, 0xc4, 
+-	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x02, 0x06, 
+-	0x2c, 0x00, 0x1f, 0xc0, 0x48, 0x0f, 0x78, 0x01, 
+-	0x29, 0x00, 0xd0, 0x1a, 0x49, 0x0e, 0x6c, 0x8a, 
+-	0x6c, 0xc9, 0x1a, 0x51, 0x63, 0xc1, 0x1c, 0x0a, 
+-	0x29, 0x00, 0xdc, 0x04, 0x1f, 0xc1, 0x39, 0x79, 
+-	0x69, 0x09, 0x18, 0x51, 0x63, 0xc1, 0x23, 0x01, 
+-	0x03, 0x1b, 0x6b, 0xc1, 0x42, 0x99, 0xdb, 0x08, 
+-	0x22, 0xff, 0x32, 0x07, 0x49, 0x05, 0x85, 0x8a, 
+-	0x6b, 0xc0, 0x85, 0xc8, 0x20, 0x09, 0x02, 0x40, 
+-	0x86, 0xc8, 0x47, 0x70, 0x2e, 0x08, 0x04, 0xc4, 
+-	0x66, 0x00, 0x00, 0x80, 0x2c, 0x00, 0x1f, 0xc0, 
+-	0xb4, 0x80, 0x20, 0x00, 0x49, 0x1e, 0x6c, 0x8a, 
+-	0x6c, 0xc9, 0x1a, 0x52, 0x49, 0x1d, 0x2a, 0x00, 
+-	0xdc, 0x01, 0x69, 0x0b, 0x18, 0xd2, 0x23, 0x01, 
+-	0x02, 0xdb, 0x42, 0x9a, 0xdd, 0x00, 0x08, 0xd8, 
+-	0x22, 0x33, 0x06, 0x52, 0x6e, 0x93, 0x6e, 0x52, 
+-	0x1a, 0x9a, 0x2a, 0x00, 0xdc, 0x01, 0x6a, 0x4b, 
+-	0x18, 0xd2, 0x08, 0x92, 0x00, 0x92, 0x4b, 0x14, 
+-	0x68, 0xdb, 0x2b, 0x00, 0xd0, 0x06, 0x23, 0x01, 
+-	0x03, 0x1b, 0x6a, 0x4f, 0x18, 0xfb, 0x6a, 0x89, 
+-	0x1a, 0x59, 0xe0, 0x01, 0x21, 0x01, 0x03, 0x09, 
+-	0x42, 0x8a, 0xdd, 0x04, 0x04, 0x00, 0x0c, 0x00, 
+-	0x23, 0x01, 0x02, 0x5b, 0x43, 0x18, 0x28, 0x00, 
+-	0xd0, 0x0b, 0x4b, 0x0a, 0x42, 0x9a, 0xdd, 0x00, 
+-	0x1c, 0x1a, 0x21, 0x06, 0x43, 0x01, 0x48, 0x08, 
+-	0x85, 0x81, 0x85, 0xc2, 0x21, 0x09, 0x02, 0x49, 
+-	0x86, 0xc1, 0xbc, 0x80, 0x47, 0x70, 0x00, 0x00, 
+-	0x66, 0x00, 0x00, 0x80, 0x2e, 0x08, 0x04, 0x44, 
+-	0x2e, 0x08, 0x04, 0xc4, 0x00, 0x00, 0xff, 0xff, 
+-	0x2c, 0x00, 0x1f, 0xc0, 0xb5, 0x90, 0x04, 0x00, 
+-	0x0c, 0x00, 0x4f, 0x13, 0x6d, 0x39, 0x29, 0x00, 
+-	0xd1, 0x10, 0x24, 0x01, 0x28, 0x01, 0xd0, 0x10, 
+-	0x28, 0x04, 0xd0, 0x15, 0x28, 0x05, 0xd1, 0x09, 
+-	0xf7, 0xff, 0xf8, 0x48, 0xf7, 0xfe, 0xff, 0xfc, 
+-	0x20, 0x00, 0x66, 0xf8, 0x67, 0x38, 0x20, 0x05, 
+-	0x65, 0x78, 0x65, 0x3c, 0xbc, 0x90, 0xbc, 0x08, 
+-	0x47, 0x18, 0xf7, 0xfe, 0xff, 0xf1, 0x65, 0x3c, 
+-	0x65, 0x7c, 0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 
+-	0xf7, 0xff, 0xf8, 0x34, 0x20, 0x04, 0x65, 0x78, 
+-	0x65, 0x3c, 0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x04, 0x44, 0xb5, 0x90, 0x04, 0x00, 
+-	0x0c, 0x00, 0x4f, 0x23, 0x6d, 0x39, 0x29, 0x00, 
+-	0xd0, 0x0e, 0x29, 0x02, 0xd1, 0x09, 0x6d, 0x78, 
+-	0x28, 0x01, 0xd0, 0x34, 0x28, 0x04, 0xd0, 0x27, 
+-	0x28, 0x05, 0xd1, 0x02, 0x20, 0xff, 0xf7, 0xff, 
+-	0xf8, 0xc7, 0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 
+-	0x24, 0x02, 0x28, 0x01, 0xd0, 0x0c, 0x28, 0x04, 
+-	0xd0, 0x12, 0x28, 0x05, 0xd1, 0xf5, 0x20, 0x00, 
+-	0xf7, 0xff, 0xf8, 0xba, 0x20, 0x05, 0x65, 0x78, 
+-	0x65, 0x3c, 0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 
+-	0xf7, 0xff, 0xf8, 0x38, 0x20, 0x01, 0x65, 0x78, 
+-	0x65, 0x3c, 0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 
+-	0xf7, 0xff, 0xf8, 0x70, 0x20, 0x04, 0x65, 0x78, 
+-	0x65, 0x3c, 0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 
+-	0x21, 0x00, 0x20, 0x0e, 0xf0, 0x0b, 0xff, 0xf0, 
+-	0x21, 0x00, 0x20, 0x0d, 0xf0, 0x0b, 0xff, 0xec, 
+-	0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 0x20, 0x02, 
+-	0xf0, 0x09, 0xfc, 0x4c, 0x20, 0xff, 0x49, 0x03, 
+-	0x70, 0x08, 0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x04, 0x44, 0x2e, 0x08, 0x04, 0xc4, 
+-	0xb5, 0xf0, 0x4f, 0x2b, 0x24, 0x00, 0x6d, 0x38, 
+-	0x28, 0x01, 0xd0, 0x1e, 0x28, 0x02, 0xd1, 0x19, 
+-	0x26, 0x03, 0x6d, 0x78, 0x1d, 0xfd, 0x35, 0x79, 
+-	0x28, 0x01, 0xd0, 0x34, 0x28, 0x04, 0xd0, 0x3f, 
+-	0x28, 0x05, 0xd1, 0x0f, 0x20, 0x02, 0x63, 0x6c, 
+-	0xf0, 0x09, 0xfc, 0x2c, 0x20, 0x00, 0xf7, 0xfb, 
+-	0xfc, 0x1d, 0xf7, 0xff, 0xf8, 0x21, 0x65, 0x3e, 
+-	0x20, 0x00, 0x65, 0x78, 0xf7, 0xfe, 0xfe, 0xb8, 
+-	0x20, 0x01, 0x61, 0xe8, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x6d, 0x78, 0x28, 0x01, 0xd0, 0x0c, 
+-	0x28, 0x04, 0xd0, 0x11, 0x28, 0x05, 0xd1, 0xf5, 
+-	0xf7, 0xfe, 0xff, 0x82, 0xf7, 0xfe, 0xff, 0xd8, 
+-	0x65, 0x3c, 0x65, 0x7c, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0xf7, 0xfe, 0xff, 0x79, 0x65, 0x3c, 
+-	0x65, 0x7c, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0xf7, 0xfe, 0xff, 0xca, 0x65, 0x3c, 0x65, 0x7c, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x63, 0x6c, 
+-	0x20, 0x02, 0x60, 0xfc, 0xf0, 0x09, 0xfb, 0xfa, 
+-	0x20, 0x00, 0xf7, 0xfb, 0xfb, 0xeb, 0x65, 0x7c, 
+-	0x65, 0x3e, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0xf7, 0xfe, 0xff, 0xea, 0x65, 0x7c, 0x65, 0x3e, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x04, 0x44, 0xb5, 0x90, 0x4c, 0x1b, 
+-	0x68, 0xe0, 0x28, 0x03, 0xd0, 0x1f, 0x1f, 0xe7, 
+-	0x3f, 0x79, 0x6d, 0x38, 0x28, 0x02, 0xd1, 0x1a, 
+-	0x6d, 0x78, 0x28, 0x01, 0xd0, 0x1a, 0x28, 0x04, 
+-	0xd0, 0x20, 0x28, 0x05, 0xd1, 0x13, 0x4a, 0x14, 
+-	0x49, 0x14, 0x48, 0x15, 0xf7, 0xfe, 0xfe, 0x4a, 
+-	0x21, 0x00, 0x20, 0x0e, 0xf0, 0x0b, 0xff, 0x68, 
+-	0x20, 0x01, 0xf0, 0x09, 0xfb, 0xcb, 0x20, 0x03, 
+-	0x60, 0xe0, 0x68, 0xf8, 0x28, 0x00, 0xd0, 0x02, 
+-	0x20, 0x01, 0xf0, 0x09, 0xfb, 0xc3, 0xbc, 0x90, 
+-	0xbc, 0x08, 0x47, 0x18, 0x20, 0x01, 0xf0, 0x09, 
+-	0xfb, 0xbd, 0x20, 0x00, 0x70, 0x20, 0xbc, 0x90, 
+-	0xbc, 0x08, 0x47, 0x18, 0x21, 0x00, 0x20, 0x0b, 
+-	0xf0, 0x0b, 0xff, 0x4e, 0xbc, 0x90, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x04, 0xc4, 
+-	0x2e, 0x08, 0x05, 0x50, 0x2e, 0x08, 0x05, 0x48, 
+-	0x2e, 0x08, 0x05, 0x4c, 0xb5, 0xf0, 0x4c, 0x21, 
+-	0x6d, 0x20, 0x28, 0x02, 0xd1, 0x24, 0x26, 0xff, 
+-	0x6d, 0x60, 0x1d, 0xe7, 0x37, 0x79, 0x28, 0x01, 
+-	0xd0, 0x1d, 0x28, 0x04, 0xd0, 0x1f, 0x28, 0x05, 
+-	0xd1, 0x1a, 0x20, 0x01, 0xf0, 0x09, 0xfb, 0x96, 
+-	0x25, 0x00, 0x68, 0xe0, 0x28, 0x00, 0xd0, 0x04, 
+-	0x21, 0x00, 0x20, 0x00, 0xf0, 0x09, 0xfb, 0x38, 
+-	0x60, 0xe5, 0x70, 0x3e, 0x68, 0xf8, 0x28, 0x03, 
+-	0xd1, 0x14, 0x48, 0x13, 0x22, 0x00, 0x68, 0x41, 
+-	0x20, 0x00, 0xf7, 0xfe, 0xfd, 0xe5, 0x6b, 0x38, 
+-	0xf7, 0xfe, 0xfe, 0x16, 0xe0, 0x0f, 0x70, 0x3e, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x21, 0x00, 
+-	0x20, 0x0d, 0xf0, 0x0b, 0xff, 0x11, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x20, 0x01, 0x61, 0xf8, 
+-	0x6b, 0x38, 0xf7, 0xfe, 0xfe, 0x05, 0x20, 0x02, 
+-	0x60, 0xfd, 0xf0, 0x09, 0xfb, 0x6b, 0x21, 0x00, 
+-	0x20, 0x0d, 0xf0, 0x0b, 0xff, 0x01, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x04, 0x44, 
+-	0x2e, 0x08, 0x05, 0x44, 0xb5, 0xb0, 0x04, 0x07, 
+-	0x0c, 0x3f, 0x2f, 0x01, 0xda, 0x00, 0x27, 0x01, 
+-	0x2f, 0x3f, 0xdd, 0x00, 0x27, 0x3f, 0x48, 0x17, 
+-	0x6d, 0x01, 0x29, 0x02, 0xd1, 0x13, 0x6d, 0x40, 
+-	0x25, 0x02, 0x4c, 0x15, 0x28, 0x04, 0xd0, 0x11, 
+-	0x28, 0x05, 0xd1, 0x0c, 0x21, 0x00, 0x20, 0x0e, 
+-	0xf0, 0x0b, 0xfe, 0xe2, 0x21, 0x00, 0x20, 0x0d, 
+-	0xf0, 0x0b, 0xfe, 0xde, 0x20, 0x22, 0x1c, 0x39, 
+-	0xf0, 0x0b, 0xfe, 0xda, 0x60, 0xe5, 0xbc, 0xb0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x21, 0x00, 0x20, 0x0e, 
+-	0xf0, 0x0b, 0xfe, 0xd2, 0x21, 0x00, 0x20, 0x0d, 
+-	0xf0, 0x0b, 0xfe, 0xce, 0x20, 0x22, 0x1c, 0x39, 
+-	0xf0, 0x0b, 0xfe, 0xca, 0x20, 0x00, 0xf7, 0xfe, 
+-	0xfd, 0xc3, 0x60, 0xe5, 0xbc, 0xb0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x04, 0x44, 
+-	0x2e, 0x08, 0x04, 0xc4, 0xb5, 0x00, 0x48, 0x0b, 
+-	0x6d, 0x01, 0x29, 0x02, 0xd1, 0x10, 0x6d, 0x40, 
+-	0x28, 0x04, 0xd0, 0x01, 0x28, 0x05, 0xd1, 0x0b, 
+-	0x21, 0x00, 0x20, 0x16, 0xf0, 0x0b, 0xfe, 0xb0, 
+-	0x20, 0x00, 0xf7, 0xfe, 0xfd, 0xa9, 0x21, 0x00, 
+-	0x48, 0x03, 0x70, 0x01, 0x21, 0x01, 0x60, 0xc1, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x04, 0x44, 
+-	0x2e, 0x08, 0x04, 0xc4, 0xb5, 0x00, 0x48, 0x0b, 
+-	0x6d, 0x01, 0x29, 0x02, 0xd1, 0x10, 0x6d, 0x40, 
+-	0x28, 0x04, 0xd0, 0x01, 0x28, 0x05, 0xd1, 0x0b, 
+-	0x21, 0x00, 0x20, 0x1a, 0xf0, 0x0b, 0xfe, 0x94, 
+-	0x20, 0x00, 0xf7, 0xfe, 0xfd, 0x8d, 0x21, 0x00, 
+-	0x48, 0x03, 0x70, 0x01, 0x21, 0x01, 0x60, 0xc1, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x04, 0x44, 
+-	0x2e, 0x08, 0x04, 0xc4, 0x48, 0x03, 0x6d, 0x00, 
+-	0x28, 0x00, 0xd1, 0x00, 0x47, 0x70, 0x20, 0xff, 
+-	0x47, 0x70, 0x00, 0x00, 0x2e, 0x08, 0x04, 0x44, 
+-	0xb5, 0xf0, 0x1c, 0x04, 0x1c, 0x0f, 0x4d, 0x52, 
+-	0x6d, 0x29, 0x48, 0x52, 0x26, 0x00, 0x29, 0x01, 
+-	0xd0, 0x4c, 0x29, 0x02, 0xd1, 0x6e, 0x6d, 0x69, 
+-	0x29, 0x01, 0xd0, 0x20, 0x29, 0x04, 0xd0, 0x2e, 
+-	0x29, 0x05, 0xd1, 0x3e, 0x6c, 0xc1, 0x6c, 0x80, 
+-	0x1a, 0x08, 0xd5, 0x01, 0x69, 0x29, 0x18, 0x40, 
+-	0x21, 0x64, 0x43, 0x41, 0x69, 0x28, 0xf0, 0x13, 
+-	0xfc, 0x1b, 0x70, 0x20, 0x20, 0x33, 0x06, 0x40, 
+-	0x6e, 0x41, 0x6e, 0x80, 0x1a, 0x08, 0xd5, 0x01, 
+-	0x6a, 0x69, 0x18, 0x40, 0x21, 0x64, 0x43, 0x41, 
+-	0x6a, 0x68, 0xf0, 0x13, 0xfc, 0x0d, 0x70, 0x38, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x6c, 0xc1, 
+-	0x6c, 0x80, 0x1a, 0x08, 0xd5, 0x01, 0x69, 0x29, 
+-	0x18, 0x40, 0x21, 0x64, 0x43, 0x41, 0x69, 0x28, 
+-	0xf0, 0x13, 0xfb, 0xfe, 0x70, 0x20, 0x70, 0x3e, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x20, 0x33, 
+-	0x06, 0x40, 0x6e, 0x41, 0x6e, 0x80, 0x1a, 0x08, 
+-	0xd5, 0x01, 0x6a, 0x69, 0x18, 0x40, 0x21, 0x64, 
+-	0x43, 0x41, 0x6a, 0x68, 0xf0, 0x13, 0xfb, 0xec, 
+-	0x70, 0x38, 0x70, 0x26, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x70, 0x26, 0x70, 0x3e, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x6d, 0x69, 0x29, 0x01, 
+-	0xd0, 0x21, 0x29, 0x04, 0xd0, 0x2f, 0x29, 0x05, 
+-	0xd1, 0x3f, 0x69, 0x69, 0x6c, 0xc0, 0x1a, 0x40, 
+-	0xd5, 0x01, 0x69, 0x29, 0x18, 0x40, 0x21, 0x64, 
+-	0x43, 0x41, 0x69, 0x28, 0xf0, 0x13, 0xfb, 0xd0, 
+-	0x70, 0x20, 0x21, 0x33, 0x06, 0x49, 0x6a, 0xe8, 
+-	0x6e, 0x49, 0x1a, 0x08, 0xd5, 0x01, 0x6a, 0x69, 
+-	0x18, 0x40, 0x21, 0x64, 0x43, 0x41, 0x6a, 0x68, 
+-	0xf0, 0x13, 0xfb, 0xc2, 0x70, 0x38, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0xe0, 0x26, 0x69, 0x69, 
+-	0x6c, 0xc0, 0x1a, 0x40, 0xd5, 0x01, 0x69, 0x29, 
+-	0x18, 0x40, 0x21, 0x64, 0x43, 0x41, 0x69, 0x28, 
+-	0xf0, 0x13, 0xfb, 0xb2, 0x70, 0x20, 0x70, 0x3e, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x21, 0x33, 
+-	0x06, 0x49, 0x6a, 0xe8, 0x6e, 0x49, 0x1a, 0x08, 
+-	0xd5, 0x01, 0x6a, 0x69, 0x18, 0x40, 0x21, 0x64, 
+-	0x43, 0x41, 0x6a, 0x68, 0xf0, 0x13, 0xfb, 0xa0, 
+-	0x70, 0x38, 0x70, 0x26, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x70, 0x26, 0x70, 0x3e, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x70, 0x26, 0x70, 0x3e, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x04, 0x44, 0x66, 0x00, 0x00, 0x80, 
+-	0xb5, 0xf0, 0x1c, 0x17, 0x9e, 0x05, 0x1a, 0xf2, 
+-	0x1c, 0x0d, 0x21, 0x00, 0x1c, 0x1c, 0x42, 0xba, 
+-	0xda, 0x03, 0x1c, 0x08, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x42, 0xa0, 0xd3, 0x01, 0x42, 0xb0, 
+-	0xd9, 0x03, 0x1c, 0x08, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x19, 0xc1, 0x42, 0xb1, 0xd9, 0x0c, 
+-	0x1a, 0x32, 0x4e, 0x0a, 0x64, 0x32, 0x1c, 0x29, 
+-	0xf7, 0xfa, 0xff, 0xc2, 0x6c, 0x30, 0x1a, 0x3a, 
+-	0x18, 0x29, 0x1c, 0x20, 0xf7, 0xfa, 0xff, 0xbc, 
+-	0xe0, 0x03, 0x1c, 0x29, 0x1c, 0x3a, 0xf7, 0xfa, 
+-	0xff, 0xb7, 0x1c, 0x38, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x04, 0xc4, 
+-	0xb5, 0xf0, 0x1c, 0x17, 0x9e, 0x05, 0x1a, 0xf2, 
+-	0x1c, 0x05, 0x20, 0x00, 0x1c, 0x1c, 0x42, 0xba, 
+-	0xdb, 0x18, 0x42, 0xa1, 0xd3, 0x16, 0x42, 0xb1, 
+-	0xd2, 0x14, 0x19, 0xc8, 0x42, 0xb0, 0xd9, 0x0c, 
+-	0x1a, 0x72, 0x4e, 0x0a, 0x64, 0x32, 0x1c, 0x28, 
+-	0xf7, 0xfa, 0xff, 0x9a, 0x6c, 0x30, 0x1a, 0x3a, 
+-	0x18, 0x28, 0x1c, 0x21, 0xf7, 0xfa, 0xff, 0x94, 
+-	0xe0, 0x03, 0x1c, 0x28, 0x1c, 0x3a, 0xf7, 0xfa, 
+-	0xff, 0x8f, 0x1c, 0x38, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x04, 0xc4, 
+-	0x47, 0x70, 0xb5, 0x00, 0xb0, 0x82, 0x46, 0x6a, 
+-	0x49, 0x06, 0xa8, 0x01, 0xf7, 0xfe, 0xfc, 0x4e, 
+-	0x21, 0x00, 0x20, 0x0b, 0xf0, 0x0b, 0xfd, 0x6c, 
+-	0x20, 0x03, 0x49, 0x03, 0x61, 0x08, 0xb0, 0x02, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x05, 0x58, 
+-	0x2e, 0x08, 0x05, 0x44, 0xb5, 0x80, 0x4f, 0x0b, 
+-	0x22, 0x00, 0x20, 0x00, 0x69, 0x79, 0xf7, 0xfe, 
+-	0xfc, 0x23, 0x21, 0x00, 0x20, 0x0d, 0xf0, 0x0b, 
+-	0xfd, 0x57, 0x21, 0x01, 0x1f, 0xf8, 0x38, 0x79, 
+-	0x61, 0xc1, 0x6b, 0x00, 0xf7, 0xfe, 0xfc, 0x4c, 
+-	0x20, 0x00, 0x61, 0x38, 0xbc, 0x80, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x05, 0x44, 
+-	0xb5, 0x80, 0x4f, 0x06, 0x68, 0x38, 0x1d, 0xc1, 
+-	0x31, 0xb5, 0x20, 0x2f, 0x02, 0x80, 0xf0, 0x13, 
+-	0xfa, 0xfb, 0x60, 0x39, 0xbc, 0x80, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x02, 0x5c, 0x9c, 
+-	0x48, 0x05, 0x8f, 0xc1, 0x29, 0x00, 0xd0, 0x05, 
+-	0x21, 0x00, 0x87, 0xc1, 0x48, 0x03, 0x69, 0x01, 
+-	0x31, 0x01, 0x61, 0x01, 0x47, 0x70, 0x00, 0x00, 
+-	0x2c, 0x00, 0x1f, 0xc0, 0x2e, 0x08, 0x05, 0x5c, 
+-	0x20, 0x00, 0x49, 0x03, 0x60, 0x08, 0x48, 0x03, 
+-	0x69, 0x41, 0x31, 0x01, 0x61, 0x41, 0x47, 0x70, 
+-	0x2e, 0x08, 0x47, 0x50, 0x2e, 0x08, 0x05, 0x5c, 
+-	0xb5, 0x00, 0xb0, 0x88, 0x46, 0x68, 0xf0, 0x0e, 
+-	0xf8, 0xfd, 0x48, 0x07, 0x69, 0x81, 0x31, 0x01, 
+-	0x23, 0x01, 0x22, 0x06, 0x61, 0x81, 0x21, 0x47, 
+-	0x02, 0x49, 0x05, 0x48, 0xf0, 0x0d, 0xff, 0xea, 
+-	0xb0, 0x08, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x05, 0x5c, 0xb5, 0x80, 0x1c, 0x07, 
+-	0x20, 0xff, 0x30, 0xcd, 0xb0, 0x85, 0x90, 0x00, 
+-	0x20, 0x01, 0x02, 0x40, 0x90, 0x02, 0x48, 0x0e, 
+-	0x90, 0x04, 0x20, 0x0e, 0xab, 0x03, 0x80, 0x18, 
+-	0x46, 0x68, 0xf0, 0x0e, 0xf9, 0x0f, 0x2f, 0x00, 
+-	0xd0, 0x0d, 0x20, 0x33, 0x06, 0x40, 0x6d, 0x40, 
+-	0x23, 0x0d, 0x06, 0x9b, 0x1a, 0xc7, 0x98, 0x02, 
+-	0x1e, 0x79, 0xf0, 0x00, 0xfb, 0x21, 0x98, 0x02, 
+-	0x1a, 0x38, 0x49, 0x04, 0x60, 0x88, 0xb0, 0x05, 
+-	0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x1c, 0x00, 0x00, 0x2e, 0x08, 0x05, 0x5c, 
+-	0xb5, 0x00, 0x22, 0x01, 0x21, 0x01, 0x20, 0x00, 
+-	0xf0, 0x09, 0xfd, 0x76, 0x48, 0x04, 0x68, 0x00, 
+-	0x78, 0x01, 0x23, 0x06, 0x43, 0x19, 0x70, 0x01, 
+-	0xf0, 0x00, 0xf9, 0xe4, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x5e, 0x58, 0xb5, 0xf0, 0x48, 0x53, 
+-	0x4e, 0x53, 0x80, 0x30, 0x27, 0x00, 0x4c, 0x53, 
+-	0x86, 0xe7, 0x86, 0xa7, 0x48, 0x52, 0x60, 0x07, 
+-	0xf0, 0x05, 0xfc, 0x76, 0x48, 0x51, 0xf0, 0x0e, 
+-	0xfd, 0x23, 0xf7, 0xfa, 0xfe, 0x71, 0x21, 0xff, 
+-	0x48, 0x4f, 0x60, 0x01, 0x68, 0x01, 0x29, 0x00, 
+-	0xd0, 0x01, 0x21, 0x00, 0xe0, 0x00, 0x21, 0x01, 
+-	0x4a, 0x4c, 0x60, 0xd1, 0x60, 0x07, 0xf7, 0xfc, 
+-	0xfa, 0xf7, 0x20, 0x01, 0xf7, 0xff, 0xff, 0xa2, 
+-	0x21, 0x00, 0x20, 0x00, 0xf0, 0x09, 0xf8, 0xb4, 
+-	0xf0, 0x01, 0xfa, 0xac, 0x48, 0x46, 0x60, 0x07, 
+-	0x25, 0x02, 0x48, 0x46, 0x60, 0x05, 0x20, 0x03, 
+-	0x49, 0x45, 0x60, 0x08, 0x49, 0x45, 0x60, 0x08, 
+-	0x49, 0x45, 0x60, 0x0d, 0x49, 0x45, 0x60, 0x08, 
+-	0x48, 0x45, 0x60, 0x07, 0x48, 0x45, 0x65, 0x87, 
+-	0xf0, 0x00, 0xf9, 0x84, 0xf0, 0x0e, 0xfd, 0x90, 
+-	0x20, 0x00, 0xf0, 0x0c, 0xfa, 0xcd, 0x28, 0x00, 
+-	0xd1, 0x60, 0x48, 0x41, 0xf0, 0x08, 0xff, 0x06, 
+-	0x20, 0x00, 0xf0, 0x08, 0xff, 0x77, 0x87, 0xe7, 
+-	0x87, 0xa7, 0x22, 0x01, 0xb4, 0x04, 0x22, 0x03, 
+-	0x21, 0x01, 0x20, 0x00, 0x1c, 0x2b, 0xf0, 0x0b, 
+-	0xff, 0x73, 0x20, 0x02, 0xb0, 0x01, 0xf7, 0xfc, 
+-	0xfc, 0x53, 0xf7, 0xff, 0xff, 0x95, 0x20, 0x7d, 
+-	0x00, 0xc0, 0xf7, 0xfd, 0xfd, 0xab, 0x20, 0x7d, 
+-	0x00, 0xc0, 0xf7, 0xfd, 0xfd, 0xbf, 0xf0, 0x04, 
+-	0xfb, 0x8d, 0xf0, 0x04, 0xfb, 0xcb, 0xf7, 0xfb, 
+-	0xf8, 0xe5, 0x21, 0x18, 0x20, 0x14, 0xf7, 0xfc, 
+-	0xff, 0xf5, 0xf7, 0xfd, 0xfb, 0xa3, 0xf7, 0xfb, 
+-	0xfc, 0x11, 0x20, 0xff, 0xf7, 0xfa, 0xff, 0x2c, 
+-	0x05, 0xa8, 0xf0, 0x17, 0xf9, 0x8a, 0x49, 0x29, 
+-	0x20, 0x17, 0xf0, 0x17, 0xf9, 0x93, 0x49, 0x28, 
+-	0x20, 0x08, 0xf0, 0x17, 0xf9, 0x8f, 0xf0, 0x17, 
+-	0xf9, 0x85, 0x4b, 0x26, 0x40, 0x18, 0xf0, 0x17, 
+-	0xf9, 0x85, 0x01, 0xe8, 0xf0, 0x17, 0xf9, 0x79, 
+-	0x48, 0x23, 0x23, 0x01, 0x22, 0x08, 0x21, 0x81, 
+-	0x01, 0x09, 0x60, 0x07, 0xf0, 0x0b, 0xfe, 0x84, 
+-	0xf0, 0x01, 0xfa, 0xd2, 0x49, 0x1f, 0x20, 0x04, 
+-	0xf0, 0x17, 0xf9, 0x78, 0xf0, 0x17, 0xf9, 0x6e, 
+-	0x23, 0x10, 0x43, 0xdb, 0x40, 0x18, 0xf0, 0x17, 
+-	0xf9, 0x6d, 0x20, 0x10, 0xf0, 0x17, 0xf9, 0x61, 
+-	0x87, 0x67, 0x21, 0x00, 0x1c, 0x30, 0xf7, 0xfd, 
+-	0xfd, 0x91, 0x1c, 0x38, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 
+-	0x2c, 0x00, 0x00, 0xfc, 0x2c, 0x00, 0x1f, 0xc0, 
+-	0x2e, 0x08, 0x04, 0x94, 0x07, 0x77, 0x77, 0x20, 
+-	0x72, 0x00, 0x02, 0x00, 0x2e, 0x08, 0x05, 0x5c, 
+-	0x6e, 0x00, 0x10, 0x00, 0x6e, 0x00, 0x11, 0x00, 
+-	0x6e, 0x00, 0x14, 0x00, 0x6e, 0x00, 0x15, 0x00, 
+-	0x6e, 0x00, 0x16, 0x00, 0x6e, 0x00, 0x17, 0x00, 
+-	0x6e, 0x00, 0x18, 0x00, 0xcc, 0x00, 0x0f, 0x80, 
+-	0x00, 0x80, 0x10, 0x80, 0x2e, 0x00, 0x56, 0x25, 
+-	0x2e, 0x00, 0x56, 0x45, 0xff, 0xff, 0xfe, 0xff, 
+-	0x2e, 0x08, 0x47, 0x50, 0x2e, 0x00, 0x56, 0x05, 
+-	0xb5, 0x90, 0x1c, 0x0c, 0x1c, 0x07, 0xf0, 0x17, 
+-	0xf9, 0x69, 0x2f, 0x01, 0xda, 0x00, 0x27, 0x01, 
+-	0x4b, 0x0e, 0x42, 0x9f, 0xdd, 0x00, 0x1c, 0x1f, 
+-	0x3f, 0x01, 0x04, 0x3f, 0x4b, 0x0c, 0x18, 0xff, 
+-	0x21, 0x03, 0x48, 0x0c, 0x60, 0x01, 0x60, 0x47, 
+-	0x21, 0x01, 0x60, 0x01, 0x20, 0x01, 0x1c, 0x21, 
+-	0xf0, 0x17, 0xf9, 0x20, 0xf0, 0x17, 0xf9, 0x16, 
+-	0x23, 0x02, 0x43, 0xdb, 0x40, 0x18, 0xf0, 0x17, 
+-	0xf9, 0x15, 0xf0, 0x17, 0xf9, 0x81, 0xbc, 0x90, 
+-	0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 0xfd, 0xe8, 
+-	0x00, 0x00, 0x9e, 0x34, 0x6e, 0x00, 0x03, 0x00, 
+-	0xb5, 0x90, 0x1c, 0x0c, 0x1c, 0x07, 0xf0, 0x17, 
+-	0xf9, 0x3d, 0x2f, 0x01, 0xda, 0x00, 0x27, 0x01, 
+-	0x4b, 0x0e, 0x42, 0x9f, 0xdd, 0x00, 0x1c, 0x1f, 
+-	0x3f, 0x01, 0x04, 0x3f, 0x21, 0x03, 0x37, 0xff, 
+-	0x37, 0x96, 0x48, 0x0b, 0x60, 0x01, 0x60, 0x47, 
+-	0x21, 0x01, 0x60, 0x01, 0x20, 0x01, 0x1c, 0x21, 
+-	0xf0, 0x17, 0xf8, 0xf4, 0xf0, 0x17, 0xf8, 0xea, 
+-	0x23, 0x02, 0x43, 0xdb, 0x40, 0x18, 0xf0, 0x17, 
+-	0xf8, 0xe9, 0xf0, 0x17, 0xf9, 0x55, 0xbc, 0x90, 
+-	0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 0xfd, 0xe8, 
+-	0x6e, 0x00, 0x03, 0x00, 0xb5, 0x00, 0xf0, 0x17, 
+-	0xf9, 0x15, 0x20, 0x03, 0x49, 0x05, 0x60, 0x08, 
+-	0xf0, 0x17, 0xf8, 0xd4, 0x23, 0x02, 0x43, 0x18, 
+-	0xf0, 0x17, 0xf8, 0xd4, 0xf0, 0x17, 0xf9, 0x40, 
+-	0xbc, 0x08, 0x47, 0x18, 0x6e, 0x00, 0x03, 0x00, 
+-	0xb5, 0x90, 0x1c, 0x0c, 0x1c, 0x07, 0xf0, 0x17, 
+-	0xf9, 0x01, 0x2f, 0x01, 0xda, 0x00, 0x27, 0x01, 
+-	0x4b, 0x0e, 0x42, 0x9f, 0xdd, 0x00, 0x1c, 0x1f, 
+-	0x3f, 0x01, 0x04, 0x3f, 0x4b, 0x0c, 0x18, 0xff, 
+-	0x21, 0x03, 0x48, 0x0c, 0x60, 0x01, 0x60, 0x47, 
+-	0x21, 0x01, 0x60, 0x01, 0x20, 0x05, 0x1c, 0x21, 
+-	0xf0, 0x17, 0xf8, 0xb8, 0xf0, 0x17, 0xf8, 0xae, 
+-	0x23, 0x20, 0x43, 0xdb, 0x40, 0x18, 0xf0, 0x17, 
+-	0xf8, 0xad, 0xf0, 0x17, 0xf9, 0x19, 0xbc, 0x90, 
+-	0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 0xfd, 0xe8, 
+-	0x00, 0x00, 0x9e, 0x34, 0x6e, 0x00, 0x04, 0x00, 
+-	0xb5, 0x90, 0x1c, 0x0c, 0x1c, 0x07, 0xf0, 0x17, 
+-	0xf8, 0xd5, 0x2f, 0x01, 0xda, 0x00, 0x27, 0x01, 
+-	0x4b, 0x0e, 0x42, 0x9f, 0xdd, 0x00, 0x1c, 0x1f, 
+-	0x3f, 0x01, 0x04, 0x3f, 0x21, 0x03, 0x37, 0xff, 
+-	0x37, 0x96, 0x48, 0x0b, 0x60, 0x01, 0x60, 0x47, 
+-	0x21, 0x01, 0x60, 0x01, 0x20, 0x05, 0x1c, 0x21, 
+-	0xf0, 0x17, 0xf8, 0x8c, 0xf0, 0x17, 0xf8, 0x82, 
+-	0x23, 0x20, 0x43, 0xdb, 0x40, 0x18, 0xf0, 0x17, 
+-	0xf8, 0x81, 0xf0, 0x17, 0xf8, 0xed, 0xbc, 0x90, 
+-	0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 0xfd, 0xe8, 
+-	0x6e, 0x00, 0x04, 0x00, 0xb5, 0x00, 0xf0, 0x17, 
+-	0xf8, 0xad, 0x20, 0x03, 0x49, 0x05, 0x60, 0x08, 
+-	0xf0, 0x17, 0xf8, 0x6c, 0x23, 0x20, 0x43, 0x18, 
+-	0xf0, 0x17, 0xf8, 0x6c, 0xf0, 0x17, 0xf8, 0xd8, 
+-	0xbc, 0x08, 0x47, 0x18, 0x6e, 0x00, 0x04, 0x00, 
+-	0xb5, 0x00, 0x48, 0x0b, 0x68, 0x41, 0x31, 0x14, 
+-	0x60, 0x41, 0x68, 0x81, 0x31, 0x01, 0x60, 0x81, 
+-	0x48, 0x08, 0x68, 0x00, 0x28, 0x00, 0xd0, 0x05, 
+-	0x28, 0x01, 0xd1, 0x01, 0xf7, 0xfe, 0xfa, 0x58, 
+-	0xbc, 0x08, 0x47, 0x18, 0x48, 0x04, 0x21, 0x10, 
+-	0xf0, 0x09, 0xfc, 0x82, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x05, 0xa8, 0x2e, 0x08, 0x04, 0xf8, 
+-	0x2e, 0x08, 0x05, 0xa8, 0xb5, 0x00, 0xf0, 0x17, 
+-	0xf8, 0x7d, 0x21, 0x00, 0x48, 0x08, 0x60, 0x41, 
+-	0x60, 0x81, 0x49, 0x08, 0x20, 0x07, 0xf0, 0x17, 
+-	0xf8, 0x41, 0xf0, 0x17, 0xf8, 0x37, 0x23, 0x80, 
+-	0x43, 0xdb, 0x40, 0x18, 0xf0, 0x17, 0xf8, 0x36, 
+-	0xf0, 0x17, 0xf8, 0xa2, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x05, 0xa8, 0x2e, 0x00, 0x5a, 0x45, 
+-	0x48, 0x01, 0x68, 0x40, 0x47, 0x70, 0x00, 0x00, 
+-	0x2e, 0x08, 0x05, 0xa8, 0xb5, 0x90, 0x49, 0x0d, 
+-	0x1c, 0x0f, 0x48, 0x0d, 0x24, 0x1e, 0x22, 0x10, 
+-	0x1c, 0x23, 0xf0, 0x09, 0xfd, 0x83, 0x22, 0x02, 
+-	0x21, 0x10, 0x1c, 0x38, 0x1c, 0x23, 0xf0, 0x05, 
+-	0xff, 0xeb, 0x49, 0x08, 0x20, 0x10, 0xf0, 0x17, 
+-	0xf8, 0x19, 0xf0, 0x17, 0xf8, 0x0f, 0x4b, 0x06, 
+-	0x40, 0x18, 0xf0, 0x17, 0xf8, 0x0f, 0xbc, 0x90, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x47, 0x60, 
+-	0x2e, 0x08, 0x05, 0xa8, 0x2e, 0x00, 0x5b, 0x09, 
+-	0xff, 0xfe, 0xff, 0xff, 0xb5, 0x00, 0xb0, 0x86, 
+-	0x46, 0x68, 0x49, 0x0c, 0xc9, 0x0c, 0xc0, 0x0c, 
+-	0xc9, 0x0c, 0xc0, 0x0c, 0xc9, 0x0c, 0xc0, 0x0c, 
+-	0x48, 0x09, 0xab, 0x00, 0xcb, 0x0e, 0xb0, 0x03, 
+-	0xf0, 0x09, 0xfd, 0x88, 0xb0, 0x03, 0x48, 0x07, 
+-	0x68, 0x01, 0x08, 0x4a, 0xd3, 0x04, 0x08, 0x49, 
+-	0x00, 0x49, 0x23, 0x04, 0x43, 0x19, 0x60, 0x01, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x47, 0x60, 
+-	0x2e, 0x08, 0x05, 0xa8, 0x2e, 0x08, 0x00, 0x04, 
+-	0xb5, 0x80, 0x29, 0x0c, 0xd2, 0x00, 0x21, 0x0c, 
+-	0x31, 0x07, 0x08, 0xc9, 0x00, 0xc9, 0x27, 0x00, 
+-	0x68, 0x02, 0x42, 0x82, 0xd0, 0x03, 0x68, 0x93, 
+-	0x42, 0x8b, 0xd3, 0x0d, 0x1c, 0x17, 0x2f, 0x00, 
+-	0xd0, 0x1e, 0x68, 0xb8, 0x1a, 0x42, 0x2a, 0x0c, 
+-	0xd2, 0x00, 0x1c, 0x01, 0x1a, 0x42, 0xd1, 0x05, 
+-	0x1c, 0x38, 0xf0, 0x00, 0xf8, 0x76, 0xe0, 0x0c, 
+-	0x68, 0x12, 0xe7, 0xea, 0x1d, 0xca, 0x32, 0x01, 
+-	0x1a, 0x80, 0x60, 0xb8, 0x19, 0xc0, 0x1d, 0xc7, 
+-	0x37, 0x01, 0x20, 0x00, 0x60, 0x38, 0x60, 0x78, 
+-	0x60, 0xb9, 0x68, 0xb8, 0x60, 0x38, 0x1d, 0xf8, 
+-	0x30, 0x01, 0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 
+-	0x20, 0x00, 0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 
+-	0xb5, 0xb0, 0x1f, 0xcc, 0x3c, 0x01, 0x68, 0x21, 
+-	0x19, 0x0a, 0x60, 0xa1, 0x68, 0x07, 0x32, 0x08, 
+-	0x42, 0x87, 0xd1, 0x06, 0x68, 0x41, 0x1c, 0x20, 
+-	0xf0, 0x00, 0xf8, 0x48, 0xbc, 0xb0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x42, 0x97, 0xd1, 0x0f, 0x68, 0x7d, 
+-	0x1c, 0x38, 0xf0, 0x00, 0xf8, 0x46, 0x68, 0xa0, 
+-	0x68, 0xb9, 0x18, 0x40, 0x30, 0x08, 0x60, 0xa0, 
+-	0x1c, 0x20, 0x1c, 0x29, 0xf0, 0x00, 0xf8, 0x36, 
+-	0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 0x68, 0xbb, 
+-	0x19, 0xdb, 0x33, 0x08, 0x42, 0xa3, 0xd1, 0x13, 
+-	0x68, 0xb8, 0x18, 0x40, 0x30, 0x08, 0x60, 0xb8, 
+-	0x19, 0xc0, 0x68, 0x3c, 0x30, 0x08, 0x42, 0xa0, 
+-	0xd1, 0xdc, 0x1c, 0x20, 0xf0, 0x00, 0xf8, 0x29, 
+-	0x68, 0xb8, 0x68, 0xa1, 0x18, 0x40, 0x30, 0x08, 
+-	0x60, 0xb8, 0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x42, 0xbc, 0xd2, 0x06, 0x68, 0x79, 0x1c, 0x20, 
+-	0xf0, 0x00, 0xf8, 0x14, 0xbc, 0xb0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x68, 0x3f, 0xe7, 0xc0, 0xb5, 0x00, 
+-	0x31, 0x10, 0x32, 0x01, 0x1c, 0x0b, 0x1a, 0x51, 
+-	0x39, 0x08, 0x60, 0x99, 0x60, 0x00, 0x1c, 0x01, 
+-	0x60, 0x40, 0x1c, 0x18, 0xf0, 0x00, 0xf8, 0x02, 
+-	0xbc, 0x08, 0x47, 0x18, 0x68, 0x0a, 0x60, 0x02, 
+-	0x60, 0x08, 0x68, 0x02, 0x60, 0x50, 0x60, 0x41, 
+-	0x47, 0x70, 0xc8, 0x06, 0x38, 0x08, 0x60, 0x11, 
+-	0xc8, 0x03, 0x60, 0x41, 0x47, 0x70, 0xb5, 0x00, 
+-	0x1c, 0x0a, 0x1c, 0x01, 0x48, 0x02, 0xf7, 0xff, 
+-	0xff, 0xde, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x05, 0xcc, 0xb5, 0x90, 0x1c, 0x07, 
+-	0xf0, 0x16, 0xff, 0x38, 0x23, 0x11, 0x05, 0x1b, 
+-	0x1c, 0x04, 0x43, 0x18, 0xf0, 0x16, 0xff, 0x36, 
+-	0x1c, 0x39, 0x48, 0x05, 0xf7, 0xff, 0xff, 0x50, 
+-	0x1c, 0x07, 0x1c, 0x20, 0xf0, 0x16, 0xff, 0x2e, 
+-	0x1c, 0x38, 0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x05, 0xcc, 0xb5, 0x00, 0x1c, 0x01, 
+-	0x48, 0x02, 0xf7, 0xff, 0xff, 0x41, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x05, 0xcc, 
+-	0xb5, 0x90, 0x1c, 0x07, 0xd0, 0x0e, 0xf0, 0x16, 
+-	0xff, 0x15, 0x23, 0x11, 0x05, 0x1b, 0x1c, 0x04, 
+-	0x43, 0x18, 0xf0, 0x16, 0xff, 0x13, 0x1c, 0x39, 
+-	0x48, 0x04, 0xf7, 0xff, 0xff, 0x61, 0x1c, 0x20, 
+-	0xf0, 0x16, 0xff, 0x0c, 0xbc, 0x90, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x05, 0xcc, 
+-	0xb5, 0x00, 0x4a, 0x04, 0xc2, 0x03, 0x1c, 0x0a, 
+-	0x1c, 0x01, 0x48, 0x03, 0xf7, 0xff, 0xff, 0x97, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x05, 0xb4, 
+-	0x2e, 0x08, 0x05, 0xc4, 0xb5, 0x00, 0x1c, 0x01, 
+-	0x48, 0x02, 0xf7, 0xff, 0xff, 0x11, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x05, 0xc4, 
+-	0xb5, 0x00, 0x49, 0x08, 0x68, 0x0a, 0x42, 0x90, 
+-	0xd3, 0x02, 0x68, 0x49, 0x42, 0x88, 0xd9, 0x03, 
+-	0xf7, 0xff, 0xff, 0xc6, 0xbc, 0x08, 0x47, 0x18, 
+-	0x1c, 0x01, 0x48, 0x03, 0xf7, 0xff, 0xff, 0x30, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x05, 0xb4, 
+-	0x2e, 0x08, 0x05, 0xc4, 0xb5, 0x00, 0x4a, 0x05, 
+-	0x60, 0x90, 0x60, 0xd1, 0x1c, 0x0a, 0x1c, 0x01, 
+-	0x48, 0x03, 0xf7, 0xff, 0xff, 0x68, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x05, 0xb4, 
+-	0x2e, 0x08, 0x05, 0xd4, 0xb5, 0x00, 0x1c, 0x01, 
+-	0x48, 0x02, 0xf7, 0xff, 0xfe, 0xe1, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x05, 0xd4, 
+-	0xb5, 0x00, 0x49, 0x08, 0x68, 0x8a, 0x42, 0x90, 
+-	0xd3, 0x02, 0x68, 0xc9, 0x42, 0x88, 0xd9, 0x03, 
+-	0xf7, 0xff, 0xff, 0x96, 0xbc, 0x08, 0x47, 0x18, 
+-	0x1c, 0x01, 0x48, 0x03, 0xf7, 0xff, 0xff, 0x00, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x05, 0xb4, 
+-	0x2e, 0x08, 0x05, 0xd4, 0xb5, 0xf0, 0x06, 0x07, 
+-	0x0e, 0x3f, 0x04, 0x09, 0x0c, 0x09, 0xb0, 0x81, 
+-	0x91, 0x00, 0x06, 0x16, 0x0e, 0x36, 0x00, 0xbd, 
+-	0x4c, 0x15, 0x59, 0x60, 0x28, 0x00, 0xd1, 0x15, 
+-	0xf7, 0xfb, 0xf9, 0x10, 0x22, 0x00, 0xb4, 0x04, 
+-	0x23, 0x00, 0x22, 0x02, 0x99, 0x01, 0x1c, 0x38, 
+-	0xf0, 0x05, 0xf9, 0xaa, 0x23, 0x01, 0x02, 0x9b, 
+-	0x00, 0x5a, 0x21, 0x01, 0x1c, 0x38, 0xb0, 0x01, 
+-	0xf0, 0x05, 0xfb, 0x66, 0x20, 0x03, 0x00, 0x71, 
+-	0x4a, 0x0a, 0x52, 0x50, 0x59, 0x60, 0x30, 0x01, 
+-	0x51, 0x60, 0x48, 0x09, 0x23, 0x14, 0x5e, 0xc1, 
+-	0x29, 0x00, 0xd1, 0x02, 0x49, 0x07, 0x4a, 0x08, 
+-	0x65, 0xd1, 0x8a, 0x81, 0x31, 0x01, 0x82, 0x81, 
+-	0xb0, 0x01, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x02, 0x5c, 0x10, 0x2e, 0x08, 0x49, 0x70, 
+-	0x2e, 0x08, 0x07, 0x5c, 0x2e, 0x02, 0x5a, 0x20, 
+-	0xa0, 0x00, 0x0d, 0x00, 0xb5, 0xb0, 0x06, 0x07, 
+-	0x0e, 0x3f, 0x06, 0x0d, 0x0e, 0x2d, 0x00, 0xb9, 
+-	0x48, 0x1b, 0x58, 0x42, 0x3a, 0x01, 0x50, 0x42, 
+-	0x24, 0x00, 0x2a, 0x00, 0xd1, 0x1f, 0x23, 0x01, 
+-	0x02, 0x9b, 0x00, 0x5a, 0x21, 0x02, 0x1c, 0x38, 
+-	0xf0, 0x05, 0xfb, 0x32, 0x22, 0x00, 0xb4, 0x04, 
+-	0x1c, 0x38, 0x1c, 0x23, 0x49, 0x13, 0xf0, 0x05, 
+-	0xf9, 0x67, 0x00, 0x69, 0xb0, 0x01, 0x48, 0x12, 
+-	0x52, 0x44, 0x48, 0x10, 0x4a, 0x11, 0x52, 0x50, 
+-	0x00, 0x79, 0x4a, 0x11, 0x52, 0x50, 0x00, 0x6a, 
+-	0x19, 0x52, 0x00, 0x92, 0x4b, 0x0f, 0x18, 0xd1, 
+-	0x81, 0x0c, 0x52, 0x98, 0x80, 0x48, 0x48, 0x0e, 
+-	0x8a, 0x81, 0x39, 0x01, 0x82, 0x81, 0x23, 0x14, 
+-	0x5e, 0xc0, 0x28, 0x00, 0xd1, 0x03, 0x20, 0xd7, 
+-	0x00, 0xc0, 0x49, 0x0a, 0x65, 0xc8, 0x1c, 0x20, 
+-	0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x02, 0x5c, 0x10, 0x00, 0x00, 0xff, 0xff, 
+-	0x2e, 0x08, 0x49, 0x70, 0x2e, 0x08, 0x49, 0x30, 
+-	0x2e, 0x08, 0x48, 0xf8, 0x2e, 0x08, 0x47, 0x78, 
+-	0x2e, 0x08, 0x07, 0x5c, 0xa0, 0x00, 0x0d, 0x00, 
+-	0xb5, 0xf0, 0x04, 0x06, 0x0c, 0x36, 0x04, 0x0c, 
+-	0x0c, 0x24, 0x1c, 0x17, 0xb0, 0x8a, 0x46, 0x69, 
+-	0x1c, 0x30, 0x1c, 0x22, 0xf0, 0x00, 0xf8, 0xb0, 
+-	0x23, 0x01, 0x1c, 0x05, 0x42, 0xd8, 0xd1, 0x03, 
+-	0xb0, 0x0a, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x4b, 0x4e, 0x42, 0x9c, 0xd1, 0x06, 0xa8, 0x00, 
+-	0x88, 0x00, 0x1c, 0x31, 0x1c, 0x2a, 0xf7, 0xff, 
+-	0xff, 0x55, 0xe0, 0x7f, 0x20, 0x20, 0x40, 0x20, 
+-	0x28, 0x20, 0xd1, 0x1f, 0x06, 0x2a, 0x0e, 0x12, 
+-	0xa8, 0x00, 0x88, 0x00, 0x06, 0x00, 0x0e, 0x00, 
+-	0x1c, 0x31, 0x1c, 0x23, 0xf7, 0xfd, 0xf8, 0x5a, 
+-	0x28, 0x00, 0xd0, 0x6f, 0x48, 0x42, 0x00, 0x69, 
+-	0x4a, 0x42, 0x52, 0x50, 0xa9, 0x00, 0x88, 0x09, 
+-	0x00, 0x49, 0x4a, 0x41, 0x52, 0x50, 0xa8, 0x00, 
+-	0x88, 0x00, 0x1c, 0x29, 0xf0, 0x00, 0xf9, 0xce, 
+-	0x20, 0x00, 0x43, 0xc0, 0xb0, 0x0a, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x20, 0x00, 0x21, 0x00, 
+-	0xaa, 0x01, 0x88, 0x3b, 0x0a, 0x1b, 0x70, 0x13, 
+-	0x88, 0x3b, 0x93, 0x09, 0x32, 0x01, 0x06, 0x1b, 
+-	0xd0, 0x02, 0x1c, 0x48, 0x06, 0x00, 0x0e, 0x00, 
+-	0x9b, 0x09, 0x70, 0x13, 0x31, 0x01, 0x32, 0x01, 
+-	0x37, 0x02, 0x29, 0x0e, 0xdb, 0xed, 0x21, 0x00, 
+-	0x23, 0x00, 0x70, 0x13, 0x31, 0x01, 0x32, 0x01, 
+-	0x29, 0x04, 0xdb, 0xfa, 0x21, 0x0c, 0x40, 0x21, 
+-	0x29, 0x0c, 0xd1, 0x03, 0x04, 0x21, 0x0c, 0x09, 
+-	0x24, 0x01, 0x43, 0x0c, 0x28, 0x06, 0xdc, 0x0e, 
+-	0x06, 0x22, 0x0e, 0x12, 0xb4, 0x04, 0x06, 0x2a, 
+-	0x0e, 0x12, 0xa8, 0x01, 0x88, 0x00, 0x06, 0x00, 
+-	0x0e, 0x00, 0x1c, 0x31, 0xab, 0x02, 0xf7, 0xfc, 
+-	0xfc, 0x37, 0xb0, 0x01, 0xe0, 0x1e, 0x28, 0x0a, 
+-	0xdc, 0x0e, 0x06, 0x22, 0x0e, 0x12, 0xb4, 0x04, 
+-	0x06, 0x2a, 0x0e, 0x12, 0xa8, 0x01, 0x88, 0x00, 
+-	0x06, 0x00, 0x0e, 0x00, 0x1c, 0x31, 0xab, 0x02, 
+-	0xf7, 0xfc, 0xfc, 0x40, 0xb0, 0x01, 0xe0, 0x0d, 
+-	0x06, 0x22, 0x0e, 0x12, 0xb4, 0x04, 0x06, 0x2a, 
+-	0x0e, 0x12, 0xa8, 0x01, 0x88, 0x00, 0x06, 0x00, 
+-	0x0e, 0x00, 0x1c, 0x31, 0xab, 0x02, 0xf7, 0xfc, 
+-	0xfc, 0x4b, 0xb0, 0x01, 0x28, 0x00, 0xd0, 0x05, 
+-	0x20, 0x00, 0x43, 0xc0, 0xb0, 0x0a, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0xe7, 0xff, 0xa8, 0x00, 
+-	0x88, 0x00, 0x00, 0x6a, 0x19, 0x52, 0x00, 0x92, 
+-	0x49, 0x0a, 0x52, 0x88, 0x18, 0x50, 0x80, 0x46, 
+-	0x80, 0x84, 0x49, 0x05, 0x80, 0xc1, 0x21, 0x01, 
+-	0x81, 0x01, 0x1c, 0x28, 0xb0, 0x0a, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 0xb9, 0x6a, 
+-	0x00, 0x00, 0xff, 0xff, 0x2e, 0x08, 0x49, 0x30, 
+-	0x2e, 0x08, 0x48, 0xf8, 0x2e, 0x08, 0x47, 0x78, 
+-	0xb4, 0xf0, 0x04, 0x04, 0x0c, 0x24, 0x04, 0x17, 
+-	0x0c, 0x3f, 0xb0, 0x82, 0x48, 0x58, 0x22, 0x00, 
+-	0x4d, 0x58, 0x95, 0x01, 0x1c, 0x06, 0x00, 0x53, 
+-	0x9d, 0x01, 0x5a, 0xed, 0x42, 0xb5, 0xd1, 0x02, 
+-	0x04, 0x10, 0x0c, 0x00, 0xe0, 0x02, 0x32, 0x01, 
+-	0x2a, 0x20, 0xdb, 0xf4, 0x42, 0xb0, 0xd1, 0x04, 
+-	0x20, 0x00, 0x43, 0xc0, 0xb0, 0x02, 0xbc, 0xf0, 
+-	0x47, 0x70, 0x80, 0x0e, 0x4a, 0x4e, 0x92, 0x00, 
+-	0x4d, 0x4e, 0x4a, 0x4f, 0x4b, 0x4f, 0x42, 0x9f, 
+-	0xd1, 0x32, 0x23, 0x00, 0x00, 0x5f, 0x5b, 0xd7, 
+-	0x42, 0xa7, 0xd1, 0x0a, 0x00, 0x5f, 0x5b, 0xef, 
+-	0x2f, 0x03, 0xd1, 0x01, 0x80, 0x0b, 0xe0, 0x07, 
+-	0x20, 0x00, 0x43, 0xc0, 0xb0, 0x02, 0xbc, 0xf0, 
+-	0x47, 0x70, 0x33, 0x01, 0x2b, 0x1c, 0xdb, 0xed, 
+-	0x88, 0x0f, 0x4b, 0x3f, 0x42, 0x9f, 0xd1, 0x0a, 
+-	0x27, 0x00, 0x00, 0x7b, 0x5a, 0xd6, 0x4b, 0x3c, 
+-	0x42, 0x9e, 0xd1, 0x01, 0x80, 0x0f, 0xe0, 0x02, 
+-	0x37, 0x01, 0x2f, 0x1c, 0xdb, 0xf5, 0x88, 0x0f, 
+-	0x4b, 0x37, 0x42, 0x9f, 0xd1, 0x04, 0x20, 0x00, 
+-	0x43, 0xc0, 0xb0, 0x02, 0xbc, 0xf0, 0x47, 0x70, 
+-	0x23, 0x03, 0x00, 0x47, 0x9e, 0x00, 0x53, 0xf3, 
+-	0x88, 0x0f, 0x00, 0x7f, 0x53, 0xeb, 0xe0, 0x54, 
+-	0x23, 0x20, 0x40, 0x3b, 0x2b, 0x20, 0xd1, 0x1e, 
+-	0x23, 0x00, 0x00, 0x5f, 0x5b, 0xd7, 0x42, 0xa7, 
+-	0xd1, 0x04, 0x20, 0x00, 0x43, 0xc0, 0xb0, 0x02, 
+-	0xbc, 0xf0, 0x47, 0x70, 0x33, 0x01, 0x2b, 0x1c, 
+-	0xdb, 0xf3, 0x27, 0x00, 0x00, 0x7b, 0x5a, 0xd5, 
+-	0x42, 0xb5, 0xd1, 0x01, 0x80, 0x0f, 0xe0, 0x02, 
+-	0x37, 0x01, 0x2f, 0x1c, 0xdb, 0xf6, 0x88, 0x0f, 
+-	0x42, 0xb7, 0xd1, 0x36, 0x20, 0x00, 0x43, 0xc0, 
+-	0xb0, 0x02, 0xbc, 0xf0, 0x47, 0x70, 0x23, 0x00, 
+-	0x00, 0x5f, 0x5b, 0xd7, 0x42, 0xa7, 0xd1, 0x0a, 
+-	0x00, 0x5f, 0x5b, 0xef, 0x2f, 0x02, 0xd1, 0x01, 
+-	0x80, 0x0b, 0xe0, 0x07, 0x20, 0x00, 0x43, 0xc0, 
+-	0xb0, 0x02, 0xbc, 0xf0, 0x47, 0x70, 0x33, 0x01, 
+-	0x2b, 0x1c, 0xdb, 0xed, 0x88, 0x0f, 0x4b, 0x14, 
+-	0x42, 0x9f, 0xd1, 0x0a, 0x27, 0x00, 0x00, 0x7b, 
+-	0x5a, 0xd6, 0x4b, 0x11, 0x42, 0x9e, 0xd1, 0x01, 
+-	0x80, 0x0f, 0xe0, 0x02, 0x37, 0x01, 0x2f, 0x1c, 
+-	0xdb, 0xf5, 0x88, 0x0f, 0x4b, 0x0c, 0x42, 0x9f, 
+-	0xd1, 0x04, 0x20, 0x00, 0x43, 0xc0, 0xb0, 0x02, 
+-	0xbc, 0xf0, 0x47, 0x70, 0x23, 0x02, 0x00, 0x47, 
+-	0x9e, 0x00, 0x53, 0xf3, 0x88, 0x0f, 0x00, 0x7f, 
+-	0x53, 0xeb, 0x00, 0x43, 0x9d, 0x01, 0x52, 0xec, 
+-	0x88, 0x09, 0x00, 0x49, 0x52, 0x54, 0x04, 0x00, 
+-	0x14, 0x00, 0xb0, 0x02, 0xbc, 0xf0, 0x47, 0x70, 
+-	0x00, 0x00, 0xff, 0xff, 0x2e, 0x08, 0x49, 0x30, 
+-	0x2e, 0x08, 0x49, 0x70, 0x2e, 0x08, 0x49, 0xb0, 
+-	0x2e, 0x08, 0x48, 0xf8, 0x00, 0x00, 0xb9, 0x6a, 
+-	0xb5, 0xf0, 0x04, 0x07, 0x0c, 0x3f, 0xb0, 0x81, 
+-	0x4a, 0x34, 0x92, 0x00, 0x1c, 0x11, 0x42, 0x97, 
+-	0xd0, 0x01, 0x2f, 0x20, 0xdb, 0x05, 0x20, 0x00, 
+-	0x43, 0xc0, 0xb0, 0x01, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x7c, 0x4a, 0x2e, 0x5b, 0x10, 
+-	0x42, 0x88, 0xd1, 0x05, 0x20, 0x00, 0x43, 0xc0, 
+-	0xb0, 0x01, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x49, 0x28, 0x53, 0x11, 0x23, 0x00, 0x49, 0x29, 
+-	0x00, 0x5e, 0x5b, 0x8e, 0x42, 0x86, 0xd1, 0x02, 
+-	0x04, 0x1d, 0x0c, 0x2d, 0xe0, 0x02, 0x33, 0x01, 
+-	0x2b, 0x1c, 0xdb, 0xf5, 0x23, 0x00, 0x00, 0x5e, 
+-	0x5b, 0x96, 0x42, 0x86, 0xd1, 0x03, 0x04, 0x1a, 
+-	0x0c, 0x12, 0x92, 0x00, 0xe0, 0x02, 0x33, 0x01, 
+-	0x2b, 0x20, 0xdb, 0xf4, 0x9a, 0x00, 0x4e, 0x1b, 
+-	0x42, 0xb2, 0xd1, 0x0d, 0x22, 0x00, 0x00, 0x53, 
+-	0x5a, 0xcb, 0x42, 0x83, 0xd1, 0x05, 0x23, 0x00, 
+-	0x00, 0x50, 0x4a, 0x19, 0x52, 0x13, 0x52, 0x0e, 
+-	0xe0, 0x02, 0x32, 0x01, 0x2a, 0x1c, 0xdb, 0xf2, 
+-	0x4e, 0x16, 0x5b, 0x30, 0x28, 0x02, 0xd1, 0x05, 
+-	0x23, 0x00, 0x53, 0x33, 0x1c, 0x28, 0x1c, 0x39, 
+-	0xf0, 0x00, 0xf8, 0x38, 0x5b, 0x30, 0x28, 0x01, 
+-	0xd1, 0x0a, 0x1c, 0x38, 0xf7, 0xfc, 0xff, 0xce, 
+-	0x28, 0x00, 0xd0, 0x05, 0x20, 0x00, 0x43, 0xc0, 
+-	0xb0, 0x01, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x5b, 0x30, 0x28, 0x03, 0xd1, 0x03, 0x1c, 0x28, 
+-	0x1c, 0x39, 0xf7, 0xff, 0xfd, 0xcb, 0x04, 0x38, 
+-	0x14, 0x00, 0xb0, 0x01, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 
+-	0x2e, 0x08, 0x49, 0x30, 0x2e, 0x08, 0x48, 0xf8, 
+-	0x2e, 0x08, 0x49, 0xb0, 0x2e, 0x08, 0x49, 0x70, 
+-	0x04, 0x01, 0x0c, 0x09, 0x20, 0x02, 0x00, 0x4b, 
+-	0x18, 0x5b, 0x00, 0x9b, 0x4a, 0x03, 0x18, 0x99, 
+-	0x81, 0x08, 0x48, 0x03, 0x52, 0xd0, 0x80, 0x48, 
+-	0x47, 0x70, 0x00, 0x00, 0x2e, 0x08, 0x47, 0x78, 
+-	0x00, 0x00, 0xff, 0xff, 0xb5, 0x80, 0x04, 0x0f, 
+-	0x0c, 0x3f, 0x06, 0x39, 0x0e, 0x09, 0x06, 0x00, 
+-	0x0e, 0x00, 0xf7, 0xfc, 0xfc, 0x03, 0x20, 0x00, 
+-	0x00, 0x7b, 0x19, 0xdb, 0x00, 0x9b, 0x4a, 0x04, 
+-	0x18, 0x99, 0x81, 0x08, 0x48, 0x03, 0x52, 0xd0, 
+-	0x80, 0x48, 0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x47, 0x78, 0x00, 0x00, 0xff, 0xff, 
+-	0xb5, 0x80, 0x04, 0x09, 0x0c, 0x09, 0x78, 0x42, 
+-	0x02, 0x12, 0x78, 0x83, 0x43, 0x1a, 0x05, 0x12, 
+-	0x0d, 0x12, 0x27, 0x00, 0x43, 0xff, 0x32, 0x03, 
+-	0x42, 0x8a, 0xd0, 0x03, 0x1c, 0x38, 0xbc, 0x80, 
+-	0xbc, 0x08, 0x47, 0x18, 0xf0, 0x05, 0xfd, 0xec, 
+-	0x28, 0x00, 0xd0, 0x03, 0x1c, 0x38, 0xbc, 0x80, 
+-	0xbc, 0x08, 0x47, 0x18, 0x20, 0x00, 0xbc, 0x80, 
+-	0xbc, 0x08, 0x47, 0x18, 0xb5, 0xff, 0x9c, 0x09, 
+-	0x04, 0x00, 0x0c, 0x00, 0xb0, 0x81, 0x90, 0x00, 
+-	0x06, 0x09, 0x0e, 0x09, 0x06, 0x12, 0x0e, 0x12, 
+-	0xb0, 0x88, 0x4f, 0x16, 0x68, 0xb8, 0x28, 0x0c, 
+-	0xdb, 0x06, 0x20, 0x00, 0x43, 0xc0, 0xb0, 0x09, 
+-	0xb0, 0x04, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x20, 0x00, 0x23, 0x00, 0x00, 0x45, 0x46, 0x6e, 
+-	0x53, 0x73, 0x30, 0x01, 0x04, 0x00, 0x14, 0x00, 
+-	0x28, 0x10, 0xdb, 0xf7, 0x02, 0x08, 0x43, 0x10, 
+-	0xab, 0x00, 0x80, 0x18, 0x46, 0x6a, 0x21, 0x04, 
+-	0x98, 0x08, 0xf7, 0xff, 0xfd, 0x95, 0x28, 0x00, 
+-	0xda, 0x01, 0xb0, 0x09, 0xe7, 0xe4, 0x00, 0x81, 
+-	0x4a, 0x05, 0x50, 0x54, 0x9b, 0x0c, 0x4a, 0x05, 
+-	0x50, 0x53, 0x68, 0xb9, 0x31, 0x01, 0x60, 0xb9, 
+-	0xb0, 0x09, 0xe7, 0xd9, 0x2e, 0x08, 0x07, 0x74, 
+-	0x2e, 0x08, 0x4a, 0x68, 0x2e, 0x08, 0x49, 0xe8, 
+-	0xb5, 0x80, 0x04, 0x07, 0x14, 0x3f, 0xd5, 0x04, 
+-	0x20, 0x00, 0x43, 0xc0, 0xbc, 0x80, 0xbc, 0x08, 
+-	0x47, 0x18, 0x1c, 0x38, 0xf7, 0xff, 0xfe, 0xf4, 
+-	0x20, 0x00, 0x00, 0xb9, 0x4a, 0x05, 0x50, 0x50, 
+-	0x4a, 0x05, 0x50, 0x50, 0x49, 0x05, 0x68, 0x8a, 
+-	0x3a, 0x01, 0x60, 0x8a, 0xbc, 0x80, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x49, 0xe8, 
+-	0x2e, 0x08, 0x4a, 0x68, 0x2e, 0x08, 0x07, 0x74, 
+-	0xb5, 0x90, 0x27, 0x00, 0x4c, 0x08, 0x00, 0xb8, 
+-	0x58, 0x20, 0x28, 0x00, 0xd0, 0x02, 0x1c, 0x38, 
+-	0xf7, 0xff, 0xff, 0xd6, 0x37, 0x01, 0x2f, 0x20, 
+-	0xdb, 0xf5, 0x20, 0x00, 0x49, 0x03, 0x60, 0xc8, 
+-	0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x49, 0xe8, 0x2e, 0x08, 0x07, 0x74, 
+-	0xb5, 0x00, 0xf7, 0xff, 0xff, 0xe5, 0xbc, 0x08, 
+-	0x47, 0x18, 0xb5, 0xf0, 0x04, 0x00, 0x14, 0x00, 
+-	0xb0, 0x83, 0x90, 0x00, 0x1c, 0x0f, 0x04, 0x11, 
+-	0x0c, 0x09, 0x24, 0x00, 0x1c, 0x38, 0x1c, 0x1d, 
+-	0x1c, 0x0e, 0xb0, 0x81, 0xf7, 0xff, 0xff, 0x58, 
+-	0x1c, 0x01, 0x20, 0x00, 0x29, 0x00, 0xd0, 0x03, 
+-	0xb0, 0x04, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x78, 0xf9, 0x02, 0x09, 0x79, 0x3a, 0x43, 0x11, 
+-	0x04, 0x09, 0x0c, 0x09, 0x88, 0x2a, 0x42, 0x91, 
+-	0xd0, 0x03, 0xb0, 0x04, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x7a, 0x39, 0x02, 0x09, 0x7a, 0x7a, 
+-	0x43, 0x11, 0x04, 0xc9, 0x0c, 0xc9, 0x91, 0x00, 
+-	0x7a, 0xb9, 0x02, 0x09, 0x7a, 0xfa, 0x43, 0x11, 
+-	0x05, 0x0b, 0x0d, 0x1b, 0x1d, 0xf9, 0x31, 0x05, 
+-	0x27, 0x00, 0x1d, 0xd8, 0x30, 0x09, 0x1a, 0x32, 
+-	0x2b, 0x00, 0xdd, 0x0a, 0x78, 0x08, 0x28, 0x09, 
+-	0xd1, 0x00, 0x37, 0x01, 0x78, 0x48, 0x1c, 0x85, 
+-	0x1b, 0x5b, 0x18, 0x40, 0x1c, 0x81, 0x2b, 0x00, 
+-	0xdc, 0xf4, 0x2a, 0x00, 0xdd, 0x36, 0x48, 0x26, 
+-	0x88, 0x06, 0x96, 0x03, 0x88, 0x85, 0x95, 0x02, 
+-	0x78, 0xc8, 0x02, 0x00, 0x79, 0x0b, 0x43, 0x18, 
+-	0x05, 0x00, 0x0d, 0x00, 0x78, 0x0b, 0x2b, 0x01, 
+-	0xd0, 0x01, 0x2b, 0x02, 0xd1, 0x06, 0x78, 0x4d, 
+-	0x02, 0x2d, 0x78, 0x8e, 0x43, 0x35, 0x04, 0xed, 
+-	0x0c, 0xed, 0x9e, 0x03, 0x2b, 0x04, 0xd0, 0x01, 
+-	0x2b, 0x03, 0xd1, 0x09, 0x78, 0x4b, 0x02, 0x1b, 
+-	0x78, 0x8d, 0x43, 0x2b, 0x04, 0xdb, 0x0c, 0xdb, 
+-	0x9d, 0x02, 0x42, 0xab, 0xd1, 0x00, 0x24, 0x01, 
+-	0x1d, 0x43, 0x1a, 0xd2, 0x31, 0x05, 0x28, 0x00, 
+-	0xdd, 0x0a, 0x78, 0x0b, 0x2b, 0x09, 0xd1, 0x00, 
+-	0x37, 0x01, 0x78, 0x4b, 0x1c, 0x9d, 0x1b, 0x40, 
+-	0x18, 0x59, 0x31, 0x02, 0x28, 0x00, 0xdc, 0xf4, 
+-	0x2a, 0x00, 0xdc, 0xcd, 0x2c, 0x00, 0xd0, 0x09, 
+-	0xf7, 0xff, 0xff, 0x62, 0x99, 0x00, 0x48, 0x09, 
+-	0x80, 0x01, 0x2f, 0x00, 0xd1, 0x07, 0xf7, 0xfa, 
+-	0xf8, 0x45, 0xe0, 0x04, 0x98, 0x01, 0xf7, 0xff, 
+-	0xff, 0x37, 0xf0, 0x00, 0xf8, 0x23, 0x20, 0x00, 
+-	0xb0, 0x04, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x07, 0x74, 0x2e, 0x08, 0x00, 0x08, 
+-	0xb4, 0x90, 0x04, 0x02, 0x0c, 0x12, 0x04, 0x0f, 
+-	0x0c, 0x3f, 0x4b, 0x07, 0x68, 0xd8, 0x28, 0x80, 
+-	0xda, 0x08, 0x2a, 0x00, 0xd0, 0x06, 0x00, 0x41, 
+-	0x4c, 0x04, 0x52, 0x67, 0x4f, 0x04, 0x52, 0x7a, 
+-	0x30, 0x01, 0x60, 0xd8, 0xbc, 0x90, 0x47, 0x70, 
+-	0x2e, 0x08, 0x07, 0x74, 0x2e, 0x08, 0x4a, 0xe8, 
+-	0x2e, 0x08, 0x4b, 0xe8, 0xb5, 0x90, 0x4f, 0x13, 
+-	0x24, 0x00, 0x43, 0xe4, 0x68, 0xf8, 0x28, 0x00, 
+-	0xd1, 0x03, 0x1c, 0x20, 0xbc, 0x90, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x40, 0x49, 0x0e, 0x18, 0x41, 
+-	0x1e, 0x8a, 0xb4, 0x04, 0x49, 0x0d, 0x18, 0x40, 
+-	0x38, 0x40, 0x8f, 0xc0, 0x4b, 0x0c, 0x22, 0xff, 
+-	0x21, 0x02, 0xf7, 0xff, 0xfe, 0xbb, 0xb0, 0x01, 
+-	0x28, 0x00, 0xda, 0x03, 0x1c, 0x20, 0xbc, 0x90, 
+-	0xbc, 0x08, 0x47, 0x18, 0x68, 0xf8, 0x38, 0x01, 
+-	0x60, 0xf8, 0x20, 0x00, 0xbc, 0x90, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x07, 0x74, 
+-	0x2e, 0x08, 0x4b, 0xe8, 0x2e, 0x08, 0x4a, 0xe8, 
+-	0x2e, 0x00, 0x64, 0x57, 0xb5, 0xf0, 0x04, 0x05, 
+-	0x14, 0x2d, 0x1c, 0x0f, 0x04, 0x11, 0x0c, 0x09, 
+-	0x1c, 0x0e, 0x4c, 0x28, 0x23, 0x02, 0x69, 0x20, 
+-	0x42, 0xd8, 0xd0, 0x04, 0x1c, 0x38, 0xf7, 0xff, 
+-	0xfe, 0x77, 0x28, 0x00, 0xd0, 0x06, 0x1c, 0x28, 
+-	0xf7, 0xff, 0xfe, 0xce, 0x20, 0x00, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x79, 0xb8, 0x69, 0x21, 
+-	0x42, 0x88, 0xd1, 0x09, 0x20, 0x01, 0x43, 0xc0, 
+-	0x61, 0x20, 0x1c, 0x28, 0xf7, 0xff, 0xfe, 0xc0, 
+-	0x20, 0x00, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x23, 0x01, 0x42, 0xd9, 0xd1, 0x02, 0x61, 0x20, 
+-	0x20, 0x00, 0x60, 0xe0, 0x37, 0x08, 0x1f, 0xf4, 
+-	0x3c, 0x05, 0x2c, 0x00, 0xdd, 0x11, 0x78, 0x38, 
+-	0x02, 0x00, 0x78, 0x79, 0x43, 0x08, 0x04, 0x00, 
+-	0x0c, 0x00, 0x78, 0xb9, 0x02, 0x09, 0x78, 0xfa, 
+-	0x43, 0x11, 0x04, 0xc9, 0x0c, 0xc9, 0xf7, 0xff, 
+-	0xff, 0x77, 0x37, 0x04, 0x3c, 0x04, 0x2c, 0x00, 
+-	0xdc, 0xed, 0xf7, 0xff, 0xff, 0x8b, 0xf7, 0xff, 
+-	0xff, 0x89, 0xf7, 0xff, 0xff, 0x87, 0xf7, 0xff, 
+-	0xff, 0x85, 0xf7, 0xff, 0xff, 0x83, 0xf7, 0xff, 
+-	0xff, 0x81, 0xf7, 0xff, 0xff, 0x7f, 0xf7, 0xff, 
+-	0xff, 0x7d, 0x20, 0x00, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x07, 0x74, 
+-	0xb5, 0xf0, 0x04, 0x04, 0x0c, 0x24, 0x04, 0x0d, 
+-	0x0c, 0x2d, 0x26, 0x00, 0x43, 0xf6, 0x4f, 0x0f, 
+-	0x62, 0x3e, 0x61, 0xfe, 0x61, 0xbe, 0xf7, 0xff, 
+-	0xfe, 0x9b, 0x2d, 0x00, 0xd0, 0x13, 0x2c, 0x00, 
+-	0xd0, 0x11, 0x0c, 0xf0, 0x42, 0x85, 0xd0, 0x0e, 
+-	0x42, 0x84, 0xd0, 0x0c, 0x80, 0x3c, 0x80, 0xbd, 
+-	0x20, 0x00, 0x61, 0x3e, 0x22, 0x00, 0x61, 0x78, 
+-	0xb4, 0x04, 0x4b, 0x05, 0x22, 0xff, 0x21, 0x00, 
+-	0xf7, 0xff, 0xfe, 0x28, 0xb0, 0x01, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x07, 0x74, 
+-	0x2e, 0x00, 0x66, 0x19, 0x56, 0x47, 0x41, 0x38, 
+-	0x78, 0x31, 0x36, 0x00, 0xb5, 0x00, 0xb0, 0x81, 
+-	0x48, 0x05, 0x69, 0xc0, 0x68, 0x80, 0x46, 0x6b, 
+-	0x22, 0x00, 0x21, 0x00, 0xf0, 0x0d, 0xfe, 0x7a, 
+-	0xb0, 0x01, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x55, 0x10, 0xb5, 0xf0, 0x27, 0x00, 
+-	0xb0, 0x85, 0x97, 0x00, 0x26, 0x10, 0x96, 0x01, 
+-	0x25, 0x05, 0x01, 0xed, 0x95, 0x02, 0x20, 0xff, 
+-	0x30, 0xd1, 0x90, 0x03, 0x97, 0x04, 0x22, 0x00, 
+-	0x21, 0x00, 0xb4, 0x06, 0x4c, 0x0d, 0x69, 0xe0, 
+-	0x68, 0x81, 0x1c, 0x08, 0xaa, 0x02, 0x1c, 0x3b, 
+-	0xf0, 0x0e, 0xf8, 0xe2, 0xb0, 0x02, 0x97, 0x00, 
+-	0x20, 0xff, 0x30, 0xd1, 0x90, 0x01, 0x95, 0x02, 
+-	0x96, 0x03, 0x97, 0x04, 0x69, 0xe0, 0x68, 0x80, 
+-	0x46, 0x69, 0xf0, 0x0e, 0xf8, 0x13, 0xf7, 0xff, 
+-	0xff, 0xc9, 0xb0, 0x05, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x55, 0x10, 
+-	0xb5, 0x90, 0x20, 0x07, 0xb0, 0x85, 0xf0, 0x03, 
+-	0xfb, 0xfd, 0x24, 0xff, 0x34, 0xe1, 0x22, 0x05, 
+-	0x01, 0xd2, 0x21, 0x00, 0x20, 0x07, 0x1c, 0x23, 
+-	0xf0, 0x03, 0xfc, 0x0c, 0x27, 0x00, 0x22, 0x00, 
+-	0x21, 0x02, 0x20, 0x07, 0x1c, 0x3b, 0xf0, 0x03, 
+-	0xff, 0xcf, 0x22, 0x01, 0x21, 0x01, 0x20, 0x07, 
+-	0x1c, 0x3b, 0xf0, 0x03, 0xff, 0x67, 0x22, 0x32, 
+-	0x21, 0x32, 0x20, 0x07, 0xf0, 0x03, 0xfc, 0xc2, 
+-	0x97, 0x00, 0x97, 0x01, 0x20, 0x05, 0x01, 0xc0, 
+-	0x90, 0x02, 0x94, 0x03, 0x97, 0x04, 0x48, 0x06, 
+-	0x69, 0xc0, 0x68, 0x80, 0x46, 0x69, 0xf0, 0x0d, 
+-	0xff, 0xdd, 0xf7, 0xff, 0xff, 0x93, 0xb0, 0x05, 
+-	0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x55, 0x10, 0xb4, 0x80, 0x01, 0x00, 
+-	0x4b, 0x2a, 0x18, 0xc0, 0x4b, 0x2a, 0x69, 0xdb, 
+-	0x69, 0x9f, 0x00, 0x8b, 0x18, 0x59, 0x02, 0x09, 
+-	0x18, 0x89, 0x18, 0x79, 0x78, 0x02, 0x70, 0x0a, 
+-	0x78, 0x42, 0x1d, 0xcb, 0x33, 0x39, 0x74, 0x1a, 
+-	0x78, 0x82, 0x1d, 0xcb, 0x33, 0x99, 0x70, 0x1a, 
+-	0x78, 0xc2, 0x1d, 0xcb, 0x33, 0xd9, 0x74, 0x1a, 
+-	0x79, 0x02, 0x1d, 0xcb, 0x33, 0xff, 0x33, 0x3a, 
+-	0x70, 0x1a, 0x79, 0x42, 0x1d, 0xcb, 0x33, 0xff, 
+-	0x33, 0x7a, 0x74, 0x1a, 0x79, 0x82, 0x1d, 0xcb, 
+-	0x33, 0xff, 0x33, 0xda, 0x70, 0x1a, 0x79, 0xc2, 
+-	0x23, 0x11, 0x01, 0x5b, 0x18, 0xcb, 0x74, 0x1a, 
+-	0x7a, 0x02, 0x23, 0x05, 0x01, 0xdb, 0x18, 0xcb, 
+-	0x70, 0x1a, 0x7a, 0x42, 0x23, 0x0b, 0x01, 0x9b, 
+-	0x18, 0xcb, 0x74, 0x1a, 0x7a, 0x82, 0x23, 0x19, 
+-	0x01, 0x5b, 0x18, 0xcb, 0x70, 0x1a, 0x7a, 0xc2, 
+-	0x23, 0x1b, 0x01, 0x5b, 0x18, 0xcb, 0x74, 0x1a, 
+-	0x7b, 0x02, 0x23, 0x0f, 0x01, 0x9b, 0x18, 0xcb, 
+-	0x70, 0x1a, 0x7b, 0x42, 0x23, 0x01, 0x02, 0x9b, 
+-	0x18, 0xcb, 0x74, 0x1a, 0x7b, 0x82, 0x23, 0x23, 
+-	0x01, 0x5b, 0x18, 0xcb, 0x70, 0x1a, 0x7b, 0xc0, 
+-	0x23, 0x25, 0x01, 0x5b, 0x18, 0xc9, 0x74, 0x08, 
+-	0xbc, 0x80, 0x47, 0x70, 0x2e, 0x08, 0x07, 0x98, 
+-	0x2e, 0x08, 0x55, 0x10, 0xb5, 0xb0, 0x23, 0x00, 
+-	0x1c, 0x07, 0x56, 0xc0, 0x1c, 0x14, 0x1c, 0x0d, 
+-	0x28, 0x00, 0xd0, 0x0f, 0x20, 0x50, 0x1c, 0x21, 
+-	0xf0, 0x12, 0xf9, 0x96, 0x19, 0x41, 0x23, 0x00, 
+-	0x56, 0xf8, 0x1c, 0x22, 0xf7, 0xff, 0xff, 0x92, 
+-	0x23, 0x00, 0x37, 0x01, 0x56, 0xf8, 0x34, 0x01, 
+-	0x28, 0x00, 0xd1, 0xef, 0xbc, 0xb0, 0xbc, 0x08, 
+-	0x47, 0x18, 0xb5, 0x90, 0x06, 0x00, 0x0e, 0x00, 
+-	0x04, 0x09, 0x14, 0x09, 0x04, 0x17, 0x14, 0x3f, 
+-	0x09, 0x03, 0xb0, 0x81, 0x4a, 0x08, 0x5c, 0xd4, 
+-	0xab, 0x00, 0x70, 0x1c, 0x07, 0x00, 0x0f, 0x00, 
+-	0x5c, 0x10, 0x70, 0x58, 0x20, 0x00, 0x70, 0x98, 
+-	0x46, 0x68, 0x1c, 0x3a, 0xf7, 0xff, 0xff, 0xce, 
+-	0xb0, 0x01, 0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x17, 0xb0, 0xb5, 0x90, 0x04, 0x00, 
+-	0x0c, 0x00, 0x04, 0x09, 0x14, 0x09, 0x04, 0x17, 
+-	0x14, 0x3f, 0x0b, 0x03, 0xb0, 0x82, 0x4a, 0x0f, 
+-	0x5c, 0xd4, 0xab, 0x00, 0x70, 0x1c, 0x0a, 0x03, 
+-	0x07, 0x1b, 0x0f, 0x1b, 0x5c, 0xd4, 0xab, 0x00, 
+-	0x70, 0x5c, 0x09, 0x03, 0x07, 0x1b, 0x0f, 0x1b, 
+-	0x5c, 0xd4, 0xab, 0x00, 0x70, 0x9c, 0x07, 0x00, 
+-	0x0f, 0x00, 0x5c, 0x10, 0x70, 0xd8, 0x20, 0x00, 
+-	0x71, 0x18, 0x46, 0x68, 0x1c, 0x3a, 0xf7, 0xff, 
+-	0xff, 0xa5, 0xb0, 0x02, 0xbc, 0x90, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x17, 0xb0, 
+-	0xb5, 0x90, 0x04, 0x0f, 0x14, 0x3f, 0x04, 0x12, 
+-	0x14, 0x12, 0x0f, 0x03, 0xb0, 0x83, 0x49, 0x1b, 
+-	0x5c, 0xcc, 0xab, 0x00, 0x70, 0x1c, 0x0e, 0x03, 
+-	0x07, 0x1b, 0x0f, 0x1b, 0x5c, 0xcc, 0xab, 0x00, 
+-	0x70, 0x5c, 0x0d, 0x03, 0x07, 0x1b, 0x0f, 0x1b, 
+-	0x5c, 0xcc, 0xab, 0x00, 0x70, 0x9c, 0x0c, 0x03, 
+-	0x07, 0x1b, 0x0f, 0x1b, 0x5c, 0xcc, 0xab, 0x00, 
+-	0x70, 0xdc, 0x0b, 0x03, 0x07, 0x1b, 0x0f, 0x1b, 
+-	0x5c, 0xcc, 0xab, 0x01, 0x70, 0x1c, 0x0a, 0x03, 
+-	0x07, 0x1b, 0x0f, 0x1b, 0x5c, 0xcc, 0xab, 0x01, 
+-	0x70, 0x5c, 0x09, 0x03, 0x07, 0x1b, 0x0f, 0x1b, 
+-	0x5c, 0xcc, 0xab, 0x01, 0x70, 0x9c, 0x07, 0x00, 
+-	0x0f, 0x00, 0x5c, 0x08, 0x70, 0xd8, 0x20, 0x00, 
+-	0x71, 0x18, 0x46, 0x68, 0x1c, 0x39, 0xf7, 0xff, 
+-	0xff, 0x65, 0xb0, 0x03, 0xbc, 0x90, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x17, 0xb0, 
+-	0xb5, 0xf0, 0x1c, 0x04, 0x04, 0x10, 0x14, 0x00, 
+-	0xb0, 0x81, 0x90, 0x00, 0x04, 0x1e, 0x14, 0x36, 
+-	0x22, 0x3c, 0x1c, 0x20, 0x1c, 0x0f, 0xb0, 0x85, 
+-	0xf0, 0x12, 0xf9, 0x2a, 0xa3, 0x72, 0xcb, 0x0c, 
+-	0xf0, 0x12, 0xf9, 0x36, 0xf0, 0x12, 0xf9, 0x38, 
+-	0x4d, 0x71, 0x5c, 0x28, 0xab, 0x02, 0x70, 0x18, 
+-	0x22, 0x38, 0x1c, 0x20, 0x1c, 0x39, 0xf0, 0x12, 
+-	0xf9, 0x1b, 0xa3, 0x6b, 0xcb, 0x0c, 0xf0, 0x12, 
+-	0xf9, 0x27, 0xf0, 0x12, 0xf9, 0x29, 0x5c, 0x28, 
+-	0xab, 0x02, 0x70, 0x58, 0x22, 0x34, 0x1c, 0x20, 
+-	0x1c, 0x39, 0xf0, 0x12, 0xf9, 0x0d, 0xa3, 0x64, 
+-	0xcb, 0x0c, 0xf0, 0x12, 0xf9, 0x19, 0xf0, 0x12, 
+-	0xf9, 0x1b, 0x5c, 0x28, 0xab, 0x02, 0x70, 0x98, 
+-	0x22, 0x30, 0x1c, 0x20, 0x1c, 0x39, 0xf0, 0x12, 
+-	0xf8, 0xff, 0xa3, 0x5d, 0xcb, 0x0c, 0xf0, 0x12, 
+-	0xf9, 0x0b, 0xf0, 0x12, 0xf9, 0x0d, 0x5c, 0x28, 
+-	0xab, 0x02, 0x70, 0xd8, 0x22, 0x2c, 0x1c, 0x20, 
+-	0x1c, 0x39, 0xf0, 0x12, 0xf8, 0xf1, 0xa3, 0x56, 
+-	0xcb, 0x0c, 0xf0, 0x12, 0xf8, 0xfd, 0xf0, 0x12, 
+-	0xf8, 0xff, 0x5c, 0x28, 0xab, 0x03, 0x70, 0x18, 
+-	0x22, 0x28, 0x1c, 0x20, 0x1c, 0x39, 0xf0, 0x12, 
+-	0xf8, 0xe3, 0xa3, 0x4f, 0xcb, 0x0c, 0xf0, 0x12, 
+-	0xf8, 0xef, 0xf0, 0x12, 0xf8, 0xf1, 0x5c, 0x28, 
+-	0xab, 0x03, 0x70, 0x58, 0x22, 0x24, 0x1c, 0x20, 
+-	0x1c, 0x39, 0xf0, 0x12, 0xf8, 0xd5, 0xa3, 0x48, 
+-	0xcb, 0x0c, 0xf0, 0x12, 0xf8, 0xe1, 0xf0, 0x12, 
+-	0xf8, 0xe3, 0x5c, 0x28, 0xab, 0x03, 0x70, 0x98, 
+-	0x22, 0x20, 0x1c, 0x20, 0x1c, 0x39, 0xf0, 0x12, 
+-	0xf8, 0xc7, 0xa3, 0x41, 0xcb, 0x0c, 0xf0, 0x12, 
+-	0xf8, 0xd3, 0xf0, 0x12, 0xf8, 0xd5, 0x5c, 0x28, 
+-	0xab, 0x03, 0x70, 0xd8, 0x22, 0x1c, 0x1c, 0x20, 
+-	0x1c, 0x39, 0xf0, 0x12, 0xf8, 0xb9, 0xa3, 0x3a, 
+-	0xcb, 0x0c, 0xf0, 0x12, 0xf8, 0xc5, 0xf0, 0x12, 
+-	0xf8, 0xc7, 0x5c, 0x28, 0xab, 0x00, 0x70, 0x18, 
+-	0x22, 0x18, 0x1c, 0x20, 0x1c, 0x39, 0xf0, 0x12, 
+-	0xf8, 0xab, 0xa3, 0x33, 0xcb, 0x0c, 0xf0, 0x12, 
+-	0xf8, 0xb7, 0xf0, 0x12, 0xf8, 0xb9, 0x5c, 0x28, 
+-	0xab, 0x00, 0x70, 0x58, 0x22, 0x14, 0x1c, 0x20, 
+-	0x1c, 0x39, 0xf0, 0x12, 0xf8, 0x9d, 0xa3, 0x2c, 
+-	0xcb, 0x0c, 0xf0, 0x12, 0xf8, 0xa9, 0xf0, 0x12, 
+-	0xf8, 0xab, 0x5c, 0x28, 0xab, 0x00, 0x70, 0x98, 
+-	0x22, 0x10, 0x1c, 0x20, 0x1c, 0x39, 0xf0, 0x12, 
+-	0xf8, 0x8f, 0xa3, 0x25, 0xcb, 0x0c, 0xf0, 0x12, 
+-	0xf8, 0x9b, 0xf0, 0x12, 0xf8, 0x9d, 0x5c, 0x28, 
+-	0xab, 0x00, 0x70, 0xd8, 0x22, 0x0c, 0x1c, 0x20, 
+-	0x1c, 0x39, 0xf0, 0x12, 0xf8, 0x81, 0xa3, 0x1e, 
+-	0xcb, 0x0c, 0xf0, 0x12, 0xf8, 0x8d, 0xf0, 0x12, 
+-	0xf8, 0x8f, 0x5c, 0x28, 0xab, 0x01, 0x70, 0x18, 
+-	0x22, 0x08, 0x1c, 0x20, 0x1c, 0x39, 0xf0, 0x12, 
+-	0xf8, 0x73, 0xa3, 0x17, 0xcb, 0x0c, 0xf0, 0x12, 
+-	0xf8, 0x7f, 0xf0, 0x12, 0xf8, 0x81, 0x5c, 0x28, 
+-	0xab, 0x01, 0x70, 0x58, 0x22, 0x04, 0x1c, 0x20, 
+-	0x1c, 0x39, 0xf0, 0x12, 0xf8, 0x65, 0xa3, 0x10, 
+-	0xcb, 0x0c, 0xf0, 0x12, 0xf8, 0x71, 0xf0, 0x12, 
+-	0xf8, 0x73, 0x5c, 0x28, 0xab, 0x01, 0x70, 0x98, 
+-	0xa3, 0x0b, 0xcb, 0x0c, 0x1c, 0x20, 0x1c, 0x39, 
+-	0xf0, 0x12, 0xf8, 0x66, 0xf0, 0x12, 0xf8, 0x68, 
+-	0x5c, 0x28, 0xab, 0x01, 0x70, 0xd8, 0x20, 0x00, 
+-	0x73, 0x18, 0x46, 0x68, 0x99, 0x05, 0x1c, 0x32, 
+-	0x33, 0x0c, 0xf7, 0xff, 0xfe, 0x6f, 0xb0, 0x06, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 
+-	0x2e, 0x08, 0x17, 0xb0, 0x21, 0x00, 0xb0, 0x81, 
+-	0x91, 0x00, 0xe0, 0x02, 0x99, 0x00, 0x31, 0x01, 
+-	0x91, 0x00, 0x99, 0x00, 0x42, 0x81, 0xdb, 0xf9, 
+-	0xb0, 0x01, 0x47, 0x70, 0xb5, 0xf0, 0x06, 0x06, 
+-	0x0e, 0x36, 0x25, 0x02, 0x48, 0x0d, 0x60, 0x05, 
+-	0x27, 0x07, 0x4c, 0x0d, 0x60, 0x25, 0x20, 0x01, 
+-	0x40, 0xb8, 0x40, 0x30, 0xd0, 0x01, 0x20, 0x03, 
+-	0xe0, 0x00, 0x20, 0x02, 0x49, 0x09, 0x60, 0x08, 
+-	0x20, 0x0a, 0xf7, 0xff, 0xff, 0xdf, 0x20, 0x03, 
+-	0x60, 0x20, 0x20, 0x0c, 0xf7, 0xff, 0xff, 0xda, 
+-	0x3f, 0x01, 0xd5, 0xeb, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x6e, 0x00, 0x14, 0x00, 
+-	0x6e, 0x00, 0x13, 0x00, 0x6e, 0x00, 0x12, 0x00, 
+-	0xb5, 0x80, 0x06, 0x00, 0x0e, 0x00, 0x06, 0x0f, 
+-	0x0e, 0x3f, 0x06, 0x00, 0x0e, 0x00, 0x23, 0x80, 
+-	0x43, 0x18, 0xf7, 0xff, 0xff, 0xcf, 0x20, 0x14, 
+-	0xf7, 0xff, 0xff, 0xc0, 0x1c, 0x38, 0xf7, 0xff, 
+-	0xff, 0xc9, 0x20, 0x03, 0x49, 0x04, 0x60, 0x08, 
+-	0x20, 0x00, 0x49, 0x04, 0x60, 0x08, 0x49, 0x04, 
+-	0x60, 0x08, 0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 
+-	0x6e, 0x00, 0x14, 0x00, 0x6e, 0x00, 0x12, 0x00, 
+-	0x6e, 0x00, 0x13, 0x00, 0xb5, 0x00, 0x21, 0x01, 
+-	0x20, 0x02, 0xf7, 0xff, 0xff, 0xd9, 0x48, 0x10, 
+-	0xf7, 0xff, 0xff, 0xa4, 0x21, 0x00, 0x20, 0x02, 
+-	0xf7, 0xff, 0xff, 0xd2, 0x48, 0x0d, 0xf7, 0xff, 
+-	0xff, 0x9d, 0x21, 0x44, 0x20, 0x00, 0xf7, 0xff, 
+-	0xff, 0xcb, 0x21, 0x81, 0x20, 0x01, 0xf7, 0xff, 
+-	0xff, 0xc7, 0x21, 0xf0, 0x20, 0x02, 0xf7, 0xff, 
+-	0xff, 0xc3, 0x21, 0x45, 0x20, 0x03, 0xf7, 0xff, 
+-	0xff, 0xbf, 0x21, 0x45, 0x20, 0x04, 0xf7, 0xff, 
+-	0xff, 0xbb, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x00, 0x00, 0x4e, 0x20, 0x00, 0x00, 0xc3, 0x50, 
+-	0xb5, 0x80, 0x06, 0x07, 0x0e, 0x3f, 0x06, 0x08, 
+-	0x0e, 0x00, 0x28, 0x45, 0xdd, 0x00, 0x20, 0x45, 
+-	0x1d, 0xc1, 0x31, 0x79, 0x20, 0x03, 0xf7, 0xff, 
+-	0xff, 0xa7, 0x2f, 0x45, 0xdd, 0x00, 0x27, 0x45, 
+-	0x20, 0x04, 0x1d, 0xf9, 0x31, 0x79, 0xf7, 0xff, 
+-	0xff, 0x9f, 0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 
+-	0xb5, 0x00, 0xf0, 0x15, 0xfe, 0xeb, 0x23, 0x01, 
+-	0x03, 0x5b, 0x43, 0x18, 0xf0, 0x15, 0xfe, 0xea, 
+-	0xf0, 0x15, 0xfe, 0xe4, 0x23, 0x01, 0x03, 0x9b, 
+-	0x43, 0x18, 0xf0, 0x15, 0xfe, 0xe3, 0xbc, 0x08, 
+-	0x47, 0x18, 0xb5, 0x00, 0xf0, 0x15, 0xfe, 0xda, 
+-	0x4b, 0x05, 0x40, 0x18, 0xf0, 0x15, 0xfe, 0xda, 
+-	0xf0, 0x15, 0xfe, 0xd4, 0x4b, 0x03, 0x40, 0x18, 
+-	0xf0, 0x15, 0xfe, 0xd4, 0xbc, 0x08, 0x47, 0x18, 
+-	0xff, 0xff, 0xbf, 0xff, 0xff, 0xff, 0xdf, 0xff, 
+-	0xb5, 0x80, 0x07, 0x01, 0x0f, 0x09, 0x29, 0x02, 
+-	0xd2, 0x19, 0x00, 0x89, 0x4a, 0x0d, 0x58, 0x51, 
+-	0x4f, 0x0d, 0x0c, 0x00, 0x60, 0x39, 0xd3, 0x05, 
+-	0x23, 0x01, 0x02, 0x5b, 0x68, 0x08, 0x43, 0x18, 
+-	0x60, 0x08, 0xe0, 0x03, 0x68, 0x08, 0x4b, 0x09, 
+-	0x40, 0x18, 0x60, 0x08, 0xf7, 0xff, 0xff, 0xc4, 
+-	0x68, 0x38, 0xf0, 0x0e, 0xfb, 0xb1, 0x20, 0x00, 
+-	0x61, 0xb8, 0xf7, 0xff, 0xff, 0xce, 0xbc, 0x80, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x1a, 0x3c, 
+-	0x2e, 0x08, 0x17, 0xc0, 0xff, 0xff, 0xfd, 0xff, 
+-	0xb5, 0x00, 0x4a, 0x09, 0x1f, 0x11, 0x20, 0x0e, 
+-	0xf0, 0x0e, 0xfb, 0x58, 0x28, 0x00, 0xd1, 0x09, 
+-	0x48, 0x06, 0xf0, 0x0e, 0xfb, 0x99, 0x49, 0x06, 
+-	0x20, 0x0e, 0xf0, 0x15, 0xfe, 0x9b, 0xf7, 0xff, 
+-	0xff, 0xb4, 0x20, 0x00, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x17, 0xd8, 0x2e, 0x08, 0x19, 0x00, 
+-	0x2e, 0x00, 0x6e, 0x0b, 0xb5, 0x00, 0xf7, 0xff, 
+-	0xff, 0x97, 0x21, 0x00, 0x20, 0x0e, 0xf0, 0x15, 
+-	0xfe, 0x89, 0xbc, 0x08, 0x47, 0x18, 0xb5, 0x00, 
+-	0x48, 0x04, 0x7d, 0x01, 0x29, 0x01, 0xd1, 0x02, 
+-	0x69, 0x80, 0xf0, 0x00, 0xf8, 0x05, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x17, 0xc0, 
+-	0xb5, 0x90, 0x1c, 0x07, 0x4c, 0x12, 0x68, 0x20, 
+-	0x49, 0x12, 0x42, 0x88, 0xd1, 0x01, 0x0b, 0x38, 
+-	0xd1, 0x1a, 0xf7, 0xff, 0xff, 0x79, 0x60, 0x67, 
+-	0x69, 0x21, 0x1c, 0x38, 0x29, 0x00, 0xd1, 0x11, 
+-	0x68, 0xe1, 0x1c, 0x4a, 0x68, 0xe1, 0x60, 0xe2, 
+-	0x00, 0x89, 0x4a, 0x0b, 0x50, 0x50, 0x68, 0xe0, 
+-	0x28, 0x64, 0xd1, 0x01, 0x20, 0x00, 0x60, 0xe0, 
+-	0x68, 0xe0, 0x68, 0xa1, 0x42, 0x88, 0xd1, 0x01, 
+-	0x20, 0x01, 0x61, 0x20, 0xf7, 0xff, 0xff, 0x71, 
+-	0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x17, 0xc0, 0x2e, 0x08, 0x19, 0x00, 
+-	0x2e, 0x08, 0x4c, 0xe8, 0xb5, 0x90, 0x1c, 0x07, 
+-	0xf7, 0xff, 0xff, 0x52, 0x48, 0x10, 0x69, 0x01, 
+-	0x24, 0x00, 0x29, 0x00, 0xd1, 0x03, 0x68, 0x81, 
+-	0x68, 0xc2, 0x42, 0x91, 0xd0, 0x12, 0x68, 0x81, 
+-	0x1c, 0x4a, 0x68, 0x81, 0x60, 0x82, 0x00, 0x89, 
+-	0x4a, 0x0a, 0x58, 0x51, 0x60, 0x39, 0x68, 0x81, 
+-	0x29, 0x64, 0xd1, 0x00, 0x60, 0x84, 0x61, 0x04, 
+-	0xf7, 0xff, 0xff, 0x4b, 0x20, 0x01, 0xbc, 0x90, 
+-	0xbc, 0x08, 0x47, 0x18, 0xf7, 0xff, 0xff, 0x45, 
+-	0x1c, 0x20, 0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x17, 0xc0, 0x2e, 0x08, 0x4c, 0xe8, 
+-	0xb5, 0x80, 0xb0, 0x81, 0x4f, 0x0e, 0x8e, 0xb8, 
+-	0x28, 0x00, 0xd1, 0x04, 0x46, 0x68, 0xf7, 0xff, 
+-	0xff, 0xcd, 0x28, 0x00, 0xd1, 0x05, 0x20, 0x00, 
+-	0x43, 0xc0, 0xb0, 0x01, 0xbc, 0x80, 0xbc, 0x08, 
+-	0x47, 0x18, 0x98, 0x00, 0x49, 0x07, 0x60, 0x08, 
+-	0x20, 0x08, 0x85, 0x38, 0x20, 0x04, 0x85, 0x78, 
+-	0x20, 0x0f, 0x02, 0x40, 0x86, 0xb8, 0x20, 0x01, 
+-	0xb0, 0x01, 0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2c, 0x00, 0x1f, 0xc0, 0x2c, 0x00, 0x1e, 0x00, 
+-	0x06, 0x00, 0x16, 0x00, 0x28, 0x30, 0xdb, 0x03, 
+-	0x28, 0x39, 0xdc, 0x01, 0x20, 0x01, 0x47, 0x70, 
+-	0x20, 0x00, 0x47, 0x70, 0xb5, 0xff, 0x26, 0x00, 
+-	0x1c, 0x07, 0x20, 0x00, 0x1c, 0x14, 0x22, 0x30, 
+-	0x9d, 0x09, 0x54, 0x3a, 0x30, 0x01, 0x28, 0x1f, 
+-	0xdb, 0xfb, 0x20, 0x00, 0x77, 0xf8, 0x29, 0x00, 
+-	0xda, 0x02, 0x2d, 0x00, 0xd1, 0x00, 0x42, 0x49, 
+-	0x25, 0x1e, 0x29, 0x00, 0xd0, 0x14, 0x1c, 0x20, 
+-	0xf0, 0x11, 0xfe, 0x78, 0x31, 0x30, 0x55, 0x79, 
+-	0x57, 0x79, 0x29, 0x39, 0xdd, 0x07, 0x31, 0x07, 
+-	0x55, 0x79, 0x9b, 0x03, 0x2b, 0x00, 0xd0, 0x02, 
+-	0x5d, 0x79, 0x31, 0x20, 0x55, 0x79, 0x1c, 0x01, 
+-	0x3d, 0x01, 0x36, 0x01, 0x28, 0x00, 0xd1, 0xea, 
+-	0x2e, 0x00, 0xd1, 0x00, 0x26, 0x01, 0x1c, 0x30, 
+-	0xb0, 0x04, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0xb5, 0xff, 0x9e, 0x09, 0x20, 0x01, 0x1c, 0x0f, 
+-	0x21, 0x00, 0xb0, 0x94, 0x91, 0x12, 0x91, 0x11, 
+-	0x91, 0x10, 0x91, 0x0f, 0x91, 0x0e, 0x25, 0x00, 
+-	0x42, 0x41, 0x91, 0x0d, 0x21, 0x00, 0x91, 0x0c, 
+-	0x1c, 0x14, 0x92, 0x00, 0x23, 0x00, 0x56, 0xe1, 
+-	0x29, 0x2b, 0xd0, 0x10, 0xdc, 0x07, 0x29, 0x20, 
+-	0xd0, 0x15, 0x29, 0x23, 0xd1, 0x17, 0x21, 0x01, 
+-	0x91, 0x0f, 0x18, 0x64, 0xe0, 0x14, 0x29, 0x2d, 
+-	0xd0, 0x09, 0x29, 0x30, 0xd1, 0x0f, 0x21, 0x01, 
+-	0x91, 0x0e, 0x18, 0x64, 0xe0, 0x0c, 0x21, 0x01, 
+-	0x91, 0x12, 0x18, 0x64, 0xe0, 0x08, 0x21, 0x01, 
+-	0x91, 0x11, 0x18, 0x64, 0xe0, 0x04, 0x21, 0x01, 
+-	0x91, 0x10, 0x18, 0x64, 0xe0, 0x00, 0x20, 0x00, 
+-	0x28, 0x00, 0xd1, 0xdb, 0x23, 0x00, 0x56, 0xe0, 
+-	0xf7, 0xff, 0xff, 0x8a, 0x28, 0x00, 0xd0, 0x15, 
+-	0x25, 0x00, 0x23, 0x00, 0x56, 0xe0, 0xf7, 0xff, 
+-	0xff, 0x83, 0x28, 0x00, 0xd0, 0x19, 0x00, 0xa8, 
+-	0x19, 0x40, 0x00, 0x40, 0x23, 0x00, 0x56, 0xe1, 
+-	0x18, 0x08, 0x34, 0x01, 0x1f, 0xc5, 0x3d, 0x29, 
+-	0x56, 0xe0, 0xf7, 0xff, 0xff, 0x75, 0x28, 0x00, 
+-	0xd1, 0xf1, 0xe0, 0x0a, 0x23, 0x00, 0x56, 0xe0, 
+-	0x28, 0x2a, 0xd1, 0x06, 0x9b, 0x17, 0xcb, 0x20, 
+-	0x93, 0x17, 0x68, 0x30, 0x30, 0x01, 0x60, 0x30, 
+-	0x34, 0x01, 0x23, 0x00, 0x56, 0xe0, 0x28, 0x2e, 
+-	0xd1, 0x16, 0x20, 0x00, 0x90, 0x0d, 0x34, 0x01, 
+-	0x56, 0xe0, 0xf7, 0xff, 0xff, 0x5d, 0x28, 0x00, 
+-	0xd0, 0x0e, 0x98, 0x0d, 0x00, 0x83, 0x18, 0x18, 
+-	0x00, 0x40, 0x23, 0x00, 0x56, 0xe1, 0x18, 0x08, 
+-	0x38, 0x30, 0x90, 0x0d, 0x34, 0x01, 0x56, 0xe0, 
+-	0xf7, 0xff, 0xff, 0x4e, 0x28, 0x00, 0xd1, 0xf0, 
+-	0x23, 0x00, 0x56, 0xe0, 0x28, 0x68, 0xd0, 0x01, 
+-	0x28, 0x6c, 0xd1, 0x02, 0x90, 0x0c, 0x34, 0x01, 
+-	0xe0, 0x04, 0x28, 0x46, 0xd0, 0x01, 0x28, 0x4e, 
+-	0xd1, 0x00, 0x34, 0x01, 0x23, 0x00, 0x56, 0xe0, 
+-	0x21, 0x25, 0x34, 0x01, 0x28, 0x67, 0xd0, 0x12, 
+-	0xdc, 0x1d, 0x28, 0x63, 0xd0, 0x54, 0xdc, 0x08, 
+-	0x28, 0x25, 0xd0, 0x73, 0x28, 0x45, 0xd0, 0x0a, 
+-	0x28, 0x47, 0xd0, 0x08, 0x28, 0x58, 0xd1, 0x6e, 
+-	0xe0, 0x53, 0x28, 0x64, 0xd0, 0x6c, 0x28, 0x65, 
+-	0xd0, 0x01, 0x28, 0x66, 0xd1, 0x67, 0x98, 0x0c, 
+-	0x28, 0x6c, 0xd1, 0x66, 0x68, 0x30, 0x30, 0x03, 
+-	0x60, 0x30, 0x22, 0x08, 0x99, 0x17, 0xa8, 0x09, 
+-	0xf0, 0x11, 0xfd, 0xe0, 0xe0, 0xe5, 0x28, 0x70, 
+-	0xd0, 0x3d, 0xdc, 0x36, 0x28, 0x69, 0xd0, 0x57, 
+-	0x28, 0x6e, 0xd0, 0x57, 0x28, 0x6f, 0xd1, 0x52, 
+-	0x68, 0x30, 0x30, 0x01, 0x60, 0x30, 0x9b, 0x17, 
+-	0x68, 0x19, 0x91, 0x13, 0x98, 0x0c, 0x28, 0x68, 
+-	0xd1, 0x09, 0x99, 0x13, 0x04, 0x09, 0x0c, 0x09, 
+-	0x91, 0x13, 0x0c, 0x08, 0xd3, 0x03, 0x99, 0x13, 
+-	0x4b, 0xeb, 0x43, 0x19, 0x91, 0x13, 0x22, 0x01, 
+-	0xb4, 0x04, 0x23, 0x00, 0x22, 0x08, 0x99, 0x14, 
+-	0xa8, 0x02, 0xf7, 0xff, 0xfe, 0xff, 0xb0, 0x01, 
+-	0x99, 0x0f, 0x1c, 0x06, 0x29, 0x00, 0xd0, 0x03, 
+-	0x99, 0x13, 0x29, 0x00, 0xd0, 0x00, 0x3e, 0x01, 
+-	0x99, 0x12, 0x29, 0x00, 0xd0, 0x55, 0x20, 0x2b, 
+-	0x68, 0x39, 0x70, 0x08, 0x31, 0x01, 0x60, 0x39, 
+-	0x2d, 0x00, 0xd0, 0x73, 0x3d, 0x01, 0xe0, 0xe7, 
+-	0xe0, 0x3f, 0x28, 0x73, 0xd0, 0x6f, 0x28, 0x75, 
+-	0xd0, 0x6e, 0x28, 0x78, 0xd1, 0x1b, 0x23, 0x01, 
+-	0x93, 0x0b, 0x68, 0x30, 0x30, 0x01, 0x60, 0x30, 
+-	0x23, 0x1f, 0x1f, 0xe0, 0x38, 0x19, 0x56, 0xc0, 
+-	0x28, 0x58, 0xd1, 0x01, 0x23, 0x00, 0x93, 0x0b, 
+-	0x9b, 0x17, 0x68, 0x19, 0x98, 0x0c, 0x28, 0x68, 
+-	0xd1, 0x05, 0x04, 0x09, 0x0c, 0x09, 0x0c, 0x08, 
+-	0xd3, 0x01, 0x4b, 0xcd, 0x43, 0x19, 0x22, 0x01, 
+-	0xb4, 0x04, 0xe0, 0x04, 0xe0, 0x16, 0xe1, 0x88, 
+-	0xe0, 0x28, 0xe0, 0x7e, 0xe0, 0x91, 0x22, 0x10, 
+-	0x9b, 0x0c, 0xa8, 0x02, 0xf7, 0xff, 0xfe, 0xbe, 
+-	0xb0, 0x01, 0x99, 0x12, 0x1c, 0x06, 0x29, 0x00, 
+-	0xd0, 0x52, 0x20, 0x2b, 0x68, 0x39, 0x70, 0x08, 
+-	0x31, 0x01, 0x60, 0x39, 0x2d, 0x00, 0xd0, 0x57, 
+-	0x3d, 0x01, 0xe1, 0x0a, 0x68, 0x38, 0x70, 0x01, 
+-	0x30, 0x01, 0x23, 0x00, 0x60, 0x38, 0x70, 0x03, 
+-	0xe1, 0x70, 0x68, 0x30, 0x30, 0x01, 0x60, 0x30, 
+-	0x98, 0x17, 0x68, 0x01, 0x68, 0x38, 0x70, 0x01, 
+-	0x30, 0x01, 0x23, 0x00, 0x60, 0x38, 0x70, 0x03, 
+-	0xe1, 0x64, 0xe0, 0x74, 0x68, 0x30, 0x30, 0x01, 
+-	0x60, 0x30, 0x98, 0x17, 0x68, 0x01, 0x91, 0x13, 
+-	0x98, 0x0c, 0x28, 0x68, 0xd1, 0x09, 0x99, 0x13, 
+-	0x04, 0x09, 0x0c, 0x09, 0x91, 0x13, 0x0c, 0x08, 
+-	0xd3, 0x03, 0x99, 0x13, 0x4b, 0xac, 0x43, 0x19, 
+-	0x91, 0x13, 0x22, 0x00, 0xb4, 0x04, 0x23, 0x00, 
+-	0x22, 0x0a, 0x99, 0x14, 0xa8, 0x02, 0xf7, 0xff, 
+-	0xfe, 0x81, 0xb0, 0x01, 0x1c, 0x06, 0x20, 0x2d, 
+-	0x99, 0x12, 0x29, 0x00, 0xd0, 0x15, 0x99, 0x13, 
+-	0x29, 0x00, 0xe0, 0x02, 0xe0, 0x87, 0xe0, 0x5a, 
+-	0xe0, 0x97, 0xda, 0x04, 0x68, 0x39, 0x70, 0x08, 
+-	0x31, 0x01, 0x60, 0x39, 0xe0, 0x04, 0x20, 0x2b, 
+-	0x68, 0x39, 0x70, 0x08, 0x31, 0x01, 0x60, 0x39, 
+-	0x2d, 0x00, 0xd0, 0x65, 0x3d, 0x01, 0xe0, 0x76, 
+-	0xe0, 0xb4, 0x99, 0x10, 0x29, 0x00, 0xd0, 0x11, 
+-	0x99, 0x13, 0x29, 0x00, 0xda, 0x05, 0x68, 0x39, 
+-	0x70, 0x08, 0x31, 0x01, 0x60, 0x39, 0xe0, 0x05, 
+-	0xe0, 0xb3, 0x21, 0x20, 0x68, 0x38, 0x70, 0x01, 
+-	0x30, 0x01, 0x60, 0x38, 0x2d, 0x00, 0xd0, 0x4f, 
+-	0x3d, 0x01, 0xe0, 0x60, 0x99, 0x13, 0x29, 0x00, 
+-	0xda, 0x5d, 0x68, 0x39, 0x70, 0x08, 0x31, 0x01, 
+-	0x60, 0x39, 0x2d, 0x00, 0xd0, 0x44, 0x3d, 0x01, 
+-	0xe0, 0xab, 0x68, 0x30, 0x30, 0x02, 0x60, 0x30, 
+-	0x22, 0x08, 0x99, 0x17, 0xa8, 0x09, 0xf0, 0x11, 
+-	0xfc, 0xf9, 0x68, 0x38, 0xa1, 0x85, 0x22, 0x10, 
+-	0xf0, 0x11, 0xfc, 0xf4, 0x68, 0x38, 0xf0, 0x11, 
+-	0xfd, 0x35, 0x68, 0x39, 0x18, 0x40, 0x60, 0x38, 
+-	0xe0, 0xf8, 0x68, 0x30, 0x30, 0x01, 0x60, 0x30, 
+-	0x98, 0x17, 0x68, 0x00, 0x68, 0x39, 0x9a, 0x14, 
+-	0x1a, 0x89, 0x60, 0x01, 0xe0, 0xee, 0x99, 0x10, 
+-	0x29, 0x00, 0xd0, 0x21, 0x21, 0x20, 0x68, 0x38, 
+-	0x70, 0x01, 0x30, 0x01, 0x60, 0x38, 0x2d, 0x00, 
+-	0xd0, 0x1a, 0x3d, 0x01, 0xe0, 0x81, 0x68, 0x30, 
+-	0x30, 0x01, 0x60, 0x30, 0x98, 0x17, 0xf0, 0x11, 
+-	0xfd, 0x15, 0x1c, 0x06, 0x98, 0x0d, 0x28, 0x00, 
+-	0xdd, 0x03, 0x98, 0x0d, 0x42, 0xb0, 0xda, 0x00, 
+-	0x9e, 0x0d, 0x2d, 0x00, 0xd0, 0x09, 0x21, 0x20, 
+-	0x68, 0x38, 0x1c, 0x2a, 0xf0, 0x11, 0xfd, 0x28, 
+-	0x23, 0x00, 0x68, 0x38, 0x55, 0x43, 0xe0, 0x03, 
+-	0xe0, 0x67, 0x23, 0x00, 0x68, 0x38, 0x55, 0x83, 
+-	0x2d, 0x00, 0xd0, 0x0d, 0x42, 0xae, 0xda, 0x0b, 
+-	0x99, 0x11, 0x29, 0x00, 0xd1, 0x08, 0x68, 0x38, 
+-	0x19, 0x40, 0x1b, 0x80, 0x99, 0x17, 0x1c, 0x32, 
+-	0xf0, 0x11, 0xfd, 0x2c, 0xe0, 0x0a, 0xe0, 0x54, 
+-	0x2d, 0x00, 0xd0, 0x02, 0x42, 0xae, 0xdb, 0x00, 
+-	0x36, 0x01, 0x99, 0x17, 0x68, 0x38, 0x1c, 0x32, 
+-	0xf0, 0x11, 0xfd, 0x20, 0x68, 0x38, 0xf0, 0x11, 
+-	0xfc, 0xe1, 0x68, 0x39, 0x18, 0x40, 0x60, 0x38, 
+-	0xe0, 0xa4, 0x68, 0x30, 0x30, 0x01, 0x60, 0x30, 
+-	0x98, 0x17, 0x99, 0x0c, 0x29, 0x68, 0xd1, 0x02, 
+-	0x23, 0x01, 0x03, 0xdb, 0x40, 0x18, 0x22, 0x01, 
+-	0xb4, 0x04, 0x98, 0x18, 0x68, 0x01, 0x23, 0x00, 
+-	0x22, 0x0a, 0xa8, 0x02, 0xf7, 0xff, 0xfd, 0xca, 
+-	0xb0, 0x01, 0x99, 0x12, 0x1c, 0x06, 0x29, 0x00, 
+-	0xd0, 0x08, 0x20, 0x2b, 0x68, 0x39, 0x70, 0x08, 
+-	0x31, 0x01, 0x60, 0x39, 0x2d, 0x00, 0xd0, 0x24, 
+-	0x3d, 0x01, 0xe0, 0x22, 0x99, 0x10, 0x29, 0x00, 
+-	0xd0, 0x1f, 0x21, 0x20, 0x68, 0x38, 0x70, 0x01, 
+-	0x30, 0x01, 0x60, 0x38, 0x2d, 0x00, 0xd0, 0x18, 
+-	0x3d, 0x01, 0xe0, 0x16, 0x99, 0x10, 0x29, 0x00, 
+-	0xd0, 0x07, 0x21, 0x20, 0x68, 0x38, 0x70, 0x01, 
+-	0x30, 0x01, 0x60, 0x38, 0x2d, 0x00, 0xd0, 0x00, 
+-	0x3d, 0x01, 0x99, 0x0f, 0x29, 0x00, 0xd0, 0x08, 
+-	0x21, 0x30, 0x68, 0x38, 0x70, 0x01, 0x30, 0x01, 
+-	0x21, 0x78, 0x60, 0x38, 0x70, 0x01, 0x30, 0x01, 
+-	0x60, 0x38, 0x2d, 0x00, 0xd0, 0x48, 0x42, 0xb5, 
+-	0xdd, 0x46, 0x99, 0x11, 0x29, 0x00, 0xd0, 0x02, 
+-	0x99, 0x0e, 0x29, 0x00, 0xd0, 0x2a, 0x99, 0x0e, 
+-	0x29, 0x00, 0xd0, 0x0c, 0x20, 0x00, 0x1b, 0xa9, 
+-	0x29, 0x00, 0xdd, 0x14, 0x22, 0x30, 0x68, 0x3b, 
+-	0x70, 0x1a, 0x33, 0x01, 0x60, 0x3b, 0x30, 0x01, 
+-	0x42, 0x81, 0xdc, 0xf8, 0xe0, 0x0b, 0x20, 0x00, 
+-	0x1b, 0xa9, 0x29, 0x00, 0xdd, 0x07, 0x23, 0x20, 
+-	0x68, 0x3a, 0x70, 0x13, 0x32, 0x01, 0x60, 0x3a, 
+-	0x30, 0x01, 0x42, 0x81, 0xdc, 0xf8, 0x21, 0x20, 
+-	0x1b, 0x89, 0xa8, 0x01, 0x18, 0x08, 0x1e, 0x41, 
+-	0x68, 0x38, 0xf0, 0x11, 0xfc, 0xd3, 0x68, 0x38, 
+-	0xf0, 0x11, 0xfc, 0x68, 0x68, 0x39, 0x18, 0x40, 
+-	0x60, 0x38, 0xe0, 0x2b, 0x68, 0x38, 0xf0, 0x11, 
+-	0xfc, 0x61, 0x68, 0x39, 0x18, 0x40, 0x60, 0x38, 
+-	0x20, 0x00, 0x1b, 0xa9, 0x29, 0x00, 0xdd, 0x07, 
+-	0x23, 0x20, 0x68, 0x3a, 0x70, 0x13, 0x32, 0x01, 
+-	0x60, 0x3a, 0x30, 0x01, 0x42, 0x81, 0xdc, 0xf8, 
+-	0x23, 0x00, 0x68, 0x38, 0x70, 0x03, 0xe0, 0x15, 
+-	0x21, 0x20, 0x1b, 0x89, 0xa8, 0x01, 0x18, 0x08, 
+-	0x1e, 0x41, 0x68, 0x38, 0xf0, 0x11, 0xfc, 0xae, 
+-	0x68, 0x38, 0xf0, 0x11, 0xfc, 0x43, 0x68, 0x39, 
+-	0x18, 0x40, 0x23, 0x00, 0x60, 0x38, 0x70, 0x03, 
+-	0xe0, 0x04, 0x68, 0x38, 0x70, 0x01, 0x30, 0x01, 
+-	0x60, 0x38, 0x9c, 0x00, 0x1c, 0x20, 0xb0, 0x14, 
+-	0xb0, 0x04, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0xff, 0xff, 0x00, 0x00, 0x28, 0x46, 0x50, 0x20, 
+-	0x6e, 0x6f, 0x74, 0x20, 0x6c, 0x69, 0x6e, 0x6b, 
+-	0x65, 0x64, 0x29, 0x00, 0xb5, 0x87, 0x23, 0x00, 
+-	0x98, 0x01, 0x9f, 0x00, 0x56, 0xc0, 0x28, 0x00, 
+-	0xd0, 0x2f, 0xe0, 0x05, 0x30, 0x01, 0x90, 0x01, 
+-	0x98, 0x00, 0x70, 0x01, 0x30, 0x01, 0x90, 0x00, 
+-	0x23, 0x00, 0x98, 0x01, 0x56, 0xc1, 0x29, 0x25, 
+-	0xd0, 0x01, 0x29, 0x00, 0xd1, 0xf2, 0x23, 0x00, 
+-	0x99, 0x01, 0x56, 0xc9, 0x29, 0x00, 0xd0, 0x17, 
+-	0x23, 0x01, 0x56, 0xc0, 0x28, 0x00, 0xd0, 0x13, 
+-	0x20, 0x00, 0xb0, 0x81, 0x90, 0x00, 0x46, 0x6a, 
+-	0xb4, 0x04, 0x98, 0x03, 0x1c, 0x42, 0x9b, 0x04, 
+-	0x1c, 0x38, 0xa9, 0x02, 0xf7, 0xff, 0xfd, 0x30, 
+-	0xb0, 0x01, 0x90, 0x02, 0x98, 0x00, 0x00, 0x80, 
+-	0x99, 0x03, 0x18, 0x40, 0x90, 0x03, 0xb0, 0x01, 
+-	0x23, 0x00, 0x98, 0x01, 0x56, 0xc0, 0x28, 0x00, 
+-	0xd1, 0xd6, 0x20, 0x00, 0x99, 0x00, 0x70, 0x08, 
+-	0x31, 0x01, 0x91, 0x00, 0x1c, 0x38, 0xf0, 0x11, 
+-	0xfb, 0xe9, 0xb0, 0x03, 0xbc, 0x80, 0xbc, 0x08, 
+-	0x47, 0x18, 0xb4, 0x0f, 0xb5, 0x00, 0x98, 0x01, 
+-	0x99, 0x02, 0xaa, 0x03, 0xf7, 0xff, 0xff, 0xb6, 
+-	0xbc, 0x08, 0xb0, 0x04, 0x47, 0x18, 0xb4, 0x0f, 
+-	0xb5, 0x00, 0xb0, 0xb8, 0x46, 0x68, 0x99, 0x39, 
+-	0xaa, 0x3a, 0xf7, 0xff, 0xff, 0xab, 0x46, 0x68, 
+-	0xf0, 0x11, 0xfb, 0xd0, 0x1c, 0x01, 0x46, 0x68, 
+-	0xf7, 0xf9, 0xfb, 0x7e, 0xb0, 0x38, 0xbc, 0x08, 
+-	0xb0, 0x04, 0x47, 0x18, 0x21, 0x00, 0xb0, 0x81, 
+-	0x91, 0x00, 0xe0, 0x02, 0x99, 0x00, 0x31, 0x01, 
+-	0x91, 0x00, 0x99, 0x00, 0x42, 0x81, 0xd3, 0xf9, 
+-	0xb0, 0x01, 0x47, 0x70, 0xb5, 0xf0, 0x06, 0x0d, 
+-	0x0e, 0x2d, 0xb0, 0x83, 0x49, 0x23, 0x68, 0x09, 
+-	0x91, 0x01, 0x26, 0x09, 0x1d, 0xc4, 0x34, 0x19, 
+-	0xab, 0x02, 0x70, 0x1d, 0x20, 0xff, 0x3b, 0x04, 
+-	0x70, 0x18, 0x22, 0x01, 0xb4, 0x04, 0x7b, 0x20, 
+-	0xa9, 0x03, 0xab, 0x02, 0xf7, 0xfa, 0xf8, 0x0c, 
+-	0xb0, 0x01, 0xaf, 0x01, 0x78, 0x3f, 0xab, 0x02, 
+-	0x70, 0x1d, 0x20, 0xff, 0x3b, 0x04, 0x70, 0x18, 
+-	0x22, 0x01, 0xb4, 0x04, 0x7b, 0x20, 0xa9, 0x03, 
+-	0xab, 0x02, 0xf7, 0xf9, 0xff, 0xfd, 0xb0, 0x01, 
+-	0xa9, 0x01, 0x78, 0x09, 0x91, 0x00, 0xab, 0x02, 
+-	0x70, 0x1d, 0x20, 0xff, 0x3b, 0x04, 0x70, 0x18, 
+-	0x22, 0x01, 0xb4, 0x04, 0x7b, 0x20, 0xa9, 0x03, 
+-	0xab, 0x02, 0xf7, 0xf9, 0xff, 0xed, 0xb0, 0x01, 
+-	0xa8, 0x01, 0x78, 0x00, 0x99, 0x00, 0x42, 0x8f, 
+-	0xd1, 0x06, 0x42, 0x87, 0xd1, 0x04, 0x1c, 0x38, 
+-	0xb0, 0x03, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x1e, 0x70, 0x06, 0x06, 0x0e, 0x36, 0xd1, 0xc3, 
+-	0x20, 0xff, 0xb0, 0x03, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x02, 0x5e, 0x28, 
+-	0xb5, 0xf0, 0x06, 0x0c, 0x0e, 0x24, 0x06, 0x16, 
+-	0x0e, 0x36, 0x25, 0x0a, 0xb0, 0x82, 0xab, 0x00, 
+-	0x70, 0x1c, 0x70, 0x5e, 0x1c, 0x07, 0x30, 0x20, 
+-	0x90, 0x01, 0x98, 0x01, 0x7b, 0x00, 0x46, 0x69, 
+-	0x22, 0x02, 0xf7, 0xf9, 0xff, 0x66, 0x1c, 0x38, 
+-	0x1c, 0x21, 0xf7, 0xff, 0xff, 0x9b, 0x1c, 0x01, 
+-	0x2c, 0x00, 0xd0, 0x05, 0x2c, 0x09, 0xd0, 0x03, 
+-	0x2c, 0x1f, 0xd1, 0x03, 0x20, 0x7f, 0xe0, 0x02, 
+-	0x20, 0x5e, 0xe0, 0x00, 0x20, 0xff, 0x40, 0x71, 
+-	0x40, 0x08, 0xd1, 0x03, 0xb0, 0x02, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x1e, 0x68, 0x06, 0x05, 
+-	0x0e, 0x2d, 0xd1, 0xde, 0xb0, 0x02, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0xb5, 0x90, 0x1c, 0x07, 
+-	0x2a, 0x00, 0xd0, 0x01, 0x24, 0x09, 0xe0, 0x00, 
+-	0x24, 0x00, 0x00, 0x90, 0x19, 0xc0, 0x6c, 0x02, 
+-	0x42, 0x8a, 0xd0, 0x15, 0x64, 0x01, 0x20, 0x03, 
+-	0x4a, 0x19, 0x29, 0x01, 0xd0, 0x13, 0x29, 0x02, 
+-	0xd0, 0x1f, 0x29, 0x03, 0xd1, 0x0c, 0x60, 0x10, 
+-	0x1c, 0x38, 0x1c, 0x21, 0xf7, 0xff, 0xff, 0x66, 
+-	0x23, 0xf3, 0x40, 0x18, 0x22, 0x08, 0x43, 0x02, 
+-	0x1c, 0x38, 0x1c, 0x21, 0xf7, 0xff, 0xff, 0xac, 
+-	0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 0x60, 0x10, 
+-	0x1c, 0x38, 0x1c, 0x21, 0xf7, 0xff, 0xff, 0x56, 
+-	0x22, 0xf3, 0x40, 0x02, 0x1c, 0x38, 0x1c, 0x21, 
+-	0xf7, 0xff, 0xff, 0x9e, 0xbc, 0x90, 0xbc, 0x08, 
+-	0x47, 0x18, 0x1c, 0x38, 0x1c, 0x21, 0xf7, 0xff, 
+-	0xff, 0x49, 0x23, 0xf3, 0x40, 0x18, 0x22, 0x04, 
+-	0x43, 0x02, 0x1c, 0x38, 0x1c, 0x21, 0xf7, 0xff, 
+-	0xff, 0x8f, 0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 
+-	0x6e, 0x00, 0x11, 0x00, 0xb5, 0xf0, 0x1c, 0x0c, 
+-	0x68, 0x41, 0x68, 0x09, 0x68, 0x80, 0x1c, 0x1f, 
+-	0x28, 0x00, 0xd0, 0x01, 0x6b, 0x8b, 0xe0, 0x00, 
+-	0x23, 0x00, 0x6b, 0x0e, 0x43, 0x32, 0x6b, 0xcd, 
+-	0x43, 0x2a, 0x43, 0x1a, 0x43, 0x1e, 0x1c, 0x15, 
+-	0x1c, 0x02, 0x1c, 0x08, 0x21, 0x01, 0xf7, 0xff, 
+-	0xff, 0xa5, 0x20, 0x00, 0x2f, 0x00, 0xdd, 0x07, 
+-	0x88, 0x29, 0x54, 0x21, 0x88, 0x31, 0x54, 0x21, 
+-	0x30, 0x01, 0x35, 0x02, 0x42, 0xb8, 0xdb, 0xf7, 
+-	0x1c, 0x38, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0xb5, 0xff, 0x68, 0x41, 0x68, 0x0c, 0x68, 0x80, 
+-	0x1c, 0x1f, 0x28, 0x00, 0xd0, 0x01, 0x6b, 0xa6, 
+-	0xe0, 0x00, 0x26, 0x00, 0x6b, 0x21, 0x43, 0x11, 
+-	0x6b, 0xe2, 0x43, 0x11, 0x43, 0x31, 0x1c, 0x02, 
+-	0x1c, 0x0d, 0x21, 0x01, 0x1c, 0x20, 0xf7, 0xff, 
+-	0xff, 0x81, 0x20, 0x00, 0x2f, 0x00, 0xdd, 0x09, 
+-	0x99, 0x01, 0x5c, 0x09, 0x80, 0x29, 0x6b, 0x21, 
+-	0x19, 0x89, 0x88, 0x09, 0x30, 0x01, 0x35, 0x02, 
+-	0x42, 0xb8, 0xdb, 0xf5, 0x1c, 0x38, 0xb0, 0x04, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0xb5, 0xb0, 
+-	0x68, 0x42, 0x68, 0x17, 0x68, 0x82, 0x2a, 0x00, 
+-	0xd0, 0x01, 0x6b, 0xbc, 0xe0, 0x00, 0x24, 0x00, 
+-	0x08, 0x48, 0xd3, 0x0a, 0x23, 0xfe, 0x40, 0x19, 
+-	0x6b, 0x38, 0x43, 0x08, 0x6b, 0x79, 0x43, 0x08, 
+-	0x6b, 0xf9, 0x43, 0x08, 0x43, 0x20, 0x1c, 0x05, 
+-	0xe0, 0x05, 0x6b, 0x38, 0x43, 0x08, 0x6b, 0xf9, 
+-	0x43, 0x08, 0x43, 0x20, 0x1c, 0x05, 0x21, 0x02, 
+-	0x1c, 0x38, 0xf7, 0xff, 0xff, 0x4f, 0x6b, 0x38, 
+-	0x43, 0x20, 0x88, 0x29, 0x88, 0x01, 0x88, 0x00, 
+-	0x06, 0x00, 0x0e, 0x00, 0xbc, 0xb0, 0xbc, 0x08, 
+-	0x47, 0x18, 0xb5, 0xb0, 0x06, 0x15, 0x0e, 0x2d, 
+-	0x68, 0x42, 0x68, 0x13, 0x68, 0x82, 0x2a, 0x00, 
+-	0xd0, 0x01, 0x6b, 0x98, 0xe0, 0x00, 0x20, 0x00, 
+-	0x07, 0xcc, 0x0f, 0xe4, 0xd0, 0x08, 0x6b, 0x1f, 
+-	0x43, 0x39, 0x6b, 0x5f, 0x43, 0x39, 0x6b, 0xdf, 
+-	0x43, 0x39, 0x43, 0x01, 0x1c, 0x0f, 0xe0, 0x05, 
+-	0x6b, 0x1f, 0x43, 0x39, 0x6b, 0xdf, 0x43, 0x39, 
+-	0x43, 0x01, 0x1c, 0x0f, 0x21, 0x02, 0x1c, 0x18, 
+-	0xf7, 0xff, 0xff, 0x24, 0x80, 0x3d, 0xbc, 0xb0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x47, 0x70, 0xb5, 0x80, 
+-	0x68, 0x41, 0x68, 0x0a, 0x68, 0x81, 0x29, 0x00, 
+-	0xd0, 0x01, 0x21, 0x09, 0xe0, 0x00, 0x21, 0x00, 
+-	0x27, 0x00, 0x69, 0x80, 0x28, 0x06, 0xd1, 0x03, 
+-	0x20, 0x01, 0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 
+-	0x1c, 0x10, 0x6c, 0xd2, 0xf0, 0x11, 0xf9, 0xa8, 
+-	0x08, 0x40, 0xd3, 0x00, 0x27, 0x01, 0x1c, 0x38, 
+-	0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 0xb5, 0xf0, 
+-	0x68, 0x42, 0x68, 0x17, 0x68, 0x80, 0x28, 0x00, 
+-	0xd0, 0x01, 0x24, 0x09, 0xe0, 0x00, 0x24, 0x00, 
+-	0x29, 0x00, 0xd0, 0x16, 0x29, 0x01, 0xd0, 0x21, 
+-	0x29, 0x02, 0xd1, 0x0e, 0x22, 0x80, 0x6c, 0xbb, 
+-	0x1c, 0x38, 0x1c, 0x21, 0xf0, 0x11, 0xf9, 0x8e, 
+-	0x48, 0x1e, 0xf7, 0xff, 0xfe, 0x5f, 0x22, 0x00, 
+-	0x6c, 0xbb, 0x1c, 0x38, 0x1c, 0x21, 0xf0, 0x11, 
+-	0xf9, 0x85, 0x20, 0x00, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x6c, 0xfa, 0x1c, 0x38, 0x1c, 0x21, 
+-	0xf0, 0x11, 0xf9, 0x7a, 0x22, 0x9f, 0x40, 0x02, 
+-	0x6c, 0xbb, 0x1c, 0x38, 0x1c, 0x21, 0xf0, 0x11, 
+-	0xf9, 0x75, 0xe7, 0xee, 0x6c, 0xfa, 0x1c, 0x38, 
+-	0x1c, 0x21, 0xf0, 0x11, 0xf9, 0x6d, 0x22, 0x20, 
+-	0x43, 0x02, 0x6c, 0xbb, 0x1c, 0x38, 0x1c, 0x21, 
+-	0xf0, 0x11, 0xf9, 0x68, 0x25, 0x00, 0x6c, 0xfa, 
+-	0x1c, 0x38, 0x1c, 0x21, 0xf0, 0x11, 0xf9, 0x60, 
+-	0x1c, 0x06, 0x09, 0x80, 0xd2, 0x05, 0x20, 0x14, 
+-	0xf7, 0xff, 0xfe, 0x30, 0x35, 0x01, 0x2d, 0x0a, 
+-	0xdb, 0xf1, 0x22, 0x40, 0x43, 0x32, 0x6c, 0xbb, 
+-	0x1c, 0x38, 0x1c, 0x21, 0xf0, 0x11, 0xf9, 0x52, 
+-	0xe7, 0xcb, 0x00, 0x00, 0x00, 0x01, 0x86, 0xa0, 
+-	0xb5, 0x80, 0x49, 0x0f, 0x4f, 0x0f, 0x8e, 0xfa, 
+-	0x20, 0x00, 0x43, 0xc0, 0x2a, 0x00, 0xd1, 0x13, 
+-	0x8d, 0xba, 0x06, 0x12, 0x0e, 0x12, 0x2a, 0x0c, 
+-	0xd1, 0x0e, 0x8d, 0xf8, 0x28, 0x00, 0xd0, 0x09, 
+-	0x8d, 0xf8, 0x1e, 0x82, 0xb4, 0x04, 0x78, 0x4a, 
+-	0x1c, 0x8b, 0x78, 0x09, 0x48, 0x06, 0xf0, 0x00, 
+-	0xfd, 0x5f, 0xb0, 0x01, 0x20, 0x00, 0x85, 0xb8, 
+-	0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2c, 0x00, 0x12, 0x00, 0x2c, 0x00, 0x1f, 0xc0, 
+-	0x2e, 0x08, 0x4e, 0x78, 0x48, 0x08, 0x8d, 0x81, 
+-	0x29, 0x00, 0xd0, 0x02, 0x20, 0x00, 0x43, 0xc0, 
+-	0x47, 0x70, 0x21, 0x0c, 0x85, 0x81, 0x21, 0x01, 
+-	0x02, 0xc9, 0x85, 0xc1, 0x21, 0x09, 0x02, 0x49, 
+-	0x86, 0xc1, 0x20, 0x00, 0x47, 0x70, 0x00, 0x00, 
+-	0x2c, 0x00, 0x1f, 0xc0, 0xb5, 0x90, 0x4f, 0x15, 
+-	0x68, 0x38, 0x28, 0x00, 0xd0, 0x23, 0xf7, 0xff, 
+-	0xff, 0xbf, 0x48, 0x13, 0x68, 0x00, 0x68, 0x79, 
+-	0x1a, 0x41, 0x29, 0x02, 0xd3, 0x1b, 0x60, 0x78, 
+-	0x4c, 0x10, 0x8e, 0xa0, 0x4f, 0x10, 0x28, 0x00, 
+-	0xd1, 0x02, 0x1c, 0x38, 0xf0, 0x00, 0xfc, 0xd0, 
+-	0x8e, 0xa0, 0x28, 0x00, 0xd1, 0x04, 0x23, 0xc9, 
+-	0x00, 0x9b, 0x18, 0xf8, 0xf0, 0x00, 0xfc, 0xc8, 
+-	0x69, 0xb8, 0x28, 0x06, 0xd0, 0x05, 0x23, 0x03, 
+-	0x02, 0x1b, 0x18, 0xf8, 0x6b, 0xc0, 0x28, 0x06, 
+-	0xd1, 0x01, 0xf7, 0xff, 0xff, 0xc3, 0xbc, 0x90, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x1a, 0x44, 
+-	0x2e, 0x08, 0x05, 0xb0, 0x2c, 0x00, 0x1f, 0xc0, 
+-	0x2e, 0x08, 0x4e, 0xc8, 0xb5, 0x00, 0x1c, 0x10, 
+-	0x1c, 0x1a, 0x1c, 0x03, 0x1c, 0x08, 0x1c, 0x19, 
+-	0xf7, 0xf9, 0xf9, 0x84, 0xbc, 0x08, 0x47, 0x18, 
+-	0xb5, 0x90, 0x4f, 0x23, 0x24, 0x02, 0x48, 0x23, 
+-	0x60, 0x04, 0x22, 0x50, 0x21, 0x00, 0x1c, 0x38, 
+-	0xf0, 0x11, 0xf9, 0x8a, 0x20, 0x80, 0x1d, 0xf9, 
+-	0x31, 0x19, 0x73, 0x08, 0x20, 0x03, 0x07, 0x00, 
+-	0x63, 0x38, 0x02, 0xe0, 0x63, 0x78, 0x03, 0x20, 
+-	0x63, 0xb8, 0x03, 0x60, 0x63, 0xf8, 0x48, 0x1a, 
+-	0x64, 0xb8, 0x48, 0x1a, 0x64, 0xf8, 0x60, 0x3f, 
+-	0x48, 0x19, 0x60, 0xf8, 0x60, 0x7c, 0x24, 0x00, 
+-	0x60, 0xbc, 0x48, 0x18, 0x61, 0x78, 0x48, 0x18, 
+-	0x61, 0xb8, 0x48, 0x18, 0x61, 0xf8, 0x48, 0x18, 
+-	0x62, 0x38, 0x48, 0x18, 0x61, 0x38, 0x48, 0x18, 
+-	0x62, 0x78, 0x48, 0x18, 0x62, 0xb8, 0x1c, 0x38, 
+-	0xf0, 0x00, 0xf8, 0xbc, 0x4f, 0x16, 0x28, 0x00, 
+-	0xd0, 0x03, 0x60, 0x3c, 0xbc, 0x90, 0xbc, 0x08, 
+-	0x47, 0x18, 0x20, 0x01, 0x06, 0x40, 0xf0, 0x15, 
+-	0xf8, 0x1c, 0x48, 0x12, 0xf7, 0xff, 0xfd, 0x6a, 
+-	0x20, 0x01, 0x60, 0x38, 0x48, 0x10, 0x68, 0x00, 
+-	0x60, 0x78, 0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x4e, 0x78, 0x6e, 0x00, 0x11, 0x00, 
+-	0x2e, 0x00, 0x76, 0x55, 0x2e, 0x00, 0x75, 0xb9, 
+-	0x2e, 0x08, 0x4e, 0xc8, 0x2e, 0x00, 0x77, 0x41, 
+-	0x2e, 0x00, 0x77, 0x8d, 0x2e, 0x00, 0x77, 0xdb, 
+-	0x2e, 0x00, 0x78, 0x2f, 0x2e, 0x00, 0x7a, 0x39, 
+-	0x2e, 0x00, 0x78, 0x7b, 0x2e, 0x00, 0x78, 0xb3, 
+-	0x2e, 0x08, 0x1a, 0x44, 0x00, 0x06, 0x1a, 0x80, 
+-	0x2e, 0x08, 0x05, 0xb0, 0xb5, 0x80, 0x22, 0x80, 
+-	0x21, 0x1f, 0x6c, 0x83, 0x1c, 0x07, 0xf0, 0x11, 
+-	0xf8, 0x69, 0x48, 0x3f, 0xf7, 0xff, 0xfd, 0x3a, 
+-	0x22, 0x55, 0x21, 0x02, 0x6c, 0xbb, 0x1c, 0x38, 
+-	0xf0, 0x11, 0xf8, 0x60, 0x21, 0x02, 0x6c, 0xfa, 
+-	0x1c, 0x38, 0xf0, 0x11, 0xf8, 0x59, 0x28, 0x55, 
+-	0xd0, 0x04, 0x20, 0x00, 0x43, 0xc0, 0xbc, 0x80, 
+-	0xbc, 0x08, 0x47, 0x18, 0x22, 0x33, 0x21, 0x05, 
+-	0x6c, 0xbb, 0x1c, 0x38, 0xf0, 0x11, 0xf8, 0x4e, 
+-	0x22, 0x33, 0x21, 0x0e, 0x6c, 0xbb, 0x1c, 0x38, 
+-	0xf0, 0x11, 0xf8, 0x48, 0x22, 0x21, 0x21, 0x17, 
+-	0x6c, 0xbb, 0x1c, 0x38, 0xf0, 0x11, 0xf8, 0x42, 
+-	0x22, 0x00, 0x21, 0x01, 0x6c, 0xbb, 0x1c, 0x38, 
+-	0xf0, 0x11, 0xf8, 0x3c, 0x22, 0x00, 0x21, 0x0a, 
+-	0x6c, 0xbb, 0x1c, 0x38, 0xf0, 0x11, 0xf8, 0x36, 
+-	0x22, 0x01, 0x21, 0x02, 0x6c, 0xbb, 0x1c, 0x38, 
+-	0xf0, 0x11, 0xf8, 0x30, 0x22, 0x01, 0x21, 0x0b, 
+-	0x6c, 0xbb, 0x1c, 0x38, 0xf0, 0x11, 0xf8, 0x2a, 
+-	0x22, 0x00, 0x21, 0x03, 0x6c, 0xbb, 0x1c, 0x38, 
+-	0xf0, 0x11, 0xf8, 0x24, 0x22, 0x00, 0x21, 0x0c, 
+-	0x6c, 0xbb, 0x1c, 0x38, 0xf0, 0x11, 0xf8, 0x1e, 
+-	0x22, 0x00, 0x21, 0x04, 0x6c, 0xbb, 0x1c, 0x38, 
+-	0xf0, 0x11, 0xf8, 0x18, 0x22, 0x01, 0x21, 0x0d, 
+-	0x6c, 0xbb, 0x1c, 0x38, 0xf0, 0x11, 0xf8, 0x12, 
+-	0x22, 0x02, 0x21, 0x1e, 0x6c, 0xbb, 0x1c, 0x38, 
+-	0xf0, 0x11, 0xf8, 0x0c, 0x22, 0x04, 0x21, 0x1c, 
+-	0x6c, 0xbb, 0x1c, 0x38, 0xf0, 0x11, 0xf8, 0x06, 
+-	0x22, 0x03, 0x21, 0x1b, 0x6c, 0xbb, 0x1c, 0x38, 
+-	0xf0, 0x11, 0xf8, 0x00, 0x22, 0x01, 0x21, 0x1f, 
+-	0x6c, 0xbb, 0x1c, 0x38, 0xf0, 0x10, 0xff, 0xfa, 
+-	0x22, 0x01, 0x21, 0x18, 0x6c, 0xbb, 0x1c, 0x38, 
+-	0xf0, 0x10, 0xff, 0xf4, 0x21, 0x1a, 0x6c, 0xfa, 
+-	0x1c, 0x38, 0xf0, 0x10, 0xff, 0xed, 0x20, 0x00, 
+-	0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x00, 0x00, 0xc3, 0x50, 0xb5, 0x90, 0x1c, 0x07, 
+-	0xf7, 0xff, 0xff, 0x74, 0x28, 0x00, 0xda, 0x04, 
+-	0x20, 0x00, 0x43, 0xc0, 0xbc, 0x90, 0xbc, 0x08, 
+-	0x47, 0x18, 0x24, 0x00, 0x64, 0x3c, 0x64, 0x7c, 
+-	0x1c, 0x38, 0xf0, 0x00, 0xfc, 0x2f, 0x1c, 0x20, 
+-	0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0xb5, 0x00, 0x1c, 0x13, 0x1c, 0x0a, 0x1c, 0x01, 
+-	0x1c, 0x18, 0xf0, 0x00, 0xf8, 0xeb, 0xbc, 0x08, 
+-	0x47, 0x18, 0xb5, 0x90, 0x1c, 0x0b, 0x68, 0x54, 
+-	0x69, 0x27, 0x1c, 0x11, 0x2f, 0x00, 0xd0, 0x07, 
+-	0x68, 0x89, 0x1c, 0x02, 0x1c, 0x20, 0xf0, 0x10, 
+-	0xff, 0xc5, 0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 
+-	0x20, 0x00, 0x43, 0xc0, 0xbc, 0x90, 0xbc, 0x08, 
+-	0x47, 0x18, 0xb5, 0x90, 0x69, 0x82, 0x68, 0x44, 
+-	0xb0, 0x81, 0x42, 0x8a, 0xd1, 0x03, 0xb0, 0x01, 
+-	0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 0x22, 0xff, 
+-	0xab, 0x00, 0x61, 0x81, 0x70, 0x1a, 0x22, 0x02, 
+-	0x70, 0x5a, 0x22, 0x00, 0x70, 0x9a, 0x70, 0xd9, 
+-	0x69, 0x27, 0x2f, 0x00, 0xd0, 0x05, 0x46, 0x6a, 
+-	0x68, 0x81, 0x23, 0x04, 0x1c, 0x20, 0xf0, 0x10, 
+-	0xff, 0xa1, 0xb0, 0x01, 0xbc, 0x90, 0xbc, 0x08, 
+-	0x47, 0x18, 0xb5, 0x00, 0x49, 0x04, 0x68, 0x09, 
+-	0x31, 0x19, 0x61, 0x01, 0x21, 0x00, 0xf7, 0xff, 
+-	0xff, 0xd8, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x05, 0xb0, 0xb5, 0xf0, 0x1c, 0x07, 
+-	0x68, 0x40, 0x69, 0x40, 0x25, 0x00, 0xb0, 0x9e, 
+-	0x28, 0x00, 0xd1, 0x08, 0x21, 0x02, 0x1c, 0x38, 
+-	0xf7, 0xff, 0xff, 0xc7, 0x1c, 0x28, 0xb0, 0x1e, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x23, 0x11, 
+-	0x01, 0x5b, 0x18, 0xfc, 0x70, 0x25, 0x23, 0xff, 
+-	0x22, 0x00, 0x68, 0x7e, 0x69, 0x76, 0x1c, 0x38, 
+-	0x1c, 0x21, 0x33, 0x01, 0xf0, 0x10, 0xff, 0x70, 
+-	0x46, 0x68, 0x22, 0xff, 0x1c, 0x21, 0x32, 0x01, 
+-	0xf0, 0x01, 0xfa, 0xea, 0x28, 0x00, 0xda, 0x11, 
+-	0x23, 0x03, 0x02, 0x1b, 0x18, 0xf8, 0x6a, 0x01, 
+-	0x31, 0x01, 0x62, 0x01, 0x29, 0x64, 0xdd, 0x03, 
+-	0x21, 0x00, 0x1c, 0x38, 0xf7, 0xff, 0xff, 0xa1, 
+-	0x20, 0x00, 0x43, 0xc0, 0xb0, 0x1e, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x46, 0x68, 0x1d, 0xc1, 
+-	0x31, 0x6b, 0x23, 0x01, 0x9a, 0x16, 0x68, 0x7c, 
+-	0x69, 0xa4, 0x1c, 0x38, 0xf0, 0x10, 0xff, 0x48, 
+-	0x21, 0x02, 0x1c, 0x38, 0xf7, 0xff, 0xff, 0x8d, 
+-	0x21, 0x01, 0x68, 0x7a, 0x6a, 0x92, 0x1c, 0x38, 
+-	0xf0, 0x10, 0xff, 0x3a, 0x1c, 0x28, 0xb0, 0x1e, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0xb5, 0x00, 
+-	0x21, 0x01, 0x68, 0x42, 0x69, 0xd2, 0xf0, 0x10, 
+-	0xff, 0x2f, 0xbc, 0x08, 0x47, 0x18, 0xb5, 0xf0, 
+-	0x1d, 0xc6, 0x36, 0x19, 0x1c, 0x07, 0xf7, 0xff, 
+-	0xff, 0xf2, 0x0a, 0x00, 0xd2, 0x03, 0x20, 0x00, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x21, 0x02, 
+-	0x68, 0x7a, 0x69, 0xd2, 0x1c, 0x38, 0xf0, 0x10, 
+-	0xff, 0x1b, 0x1c, 0x04, 0x21, 0x03, 0x68, 0x7a, 
+-	0x69, 0xd2, 0x1c, 0x38, 0xf0, 0x10, 0xff, 0x14, 
+-	0x02, 0x00, 0x43, 0x20, 0x04, 0x04, 0x0c, 0x24, 
+-	0x69, 0xf8, 0x42, 0xa0, 0xda, 0x01, 0x04, 0x04, 
+-	0x0c, 0x24, 0x25, 0x00, 0x2c, 0x00, 0xdd, 0x09, 
+-	0x21, 0x00, 0x68, 0x7a, 0x69, 0xd2, 0x1c, 0x38, 
+-	0xf0, 0x10, 0xff, 0x02, 0x55, 0x70, 0x35, 0x01, 
+-	0x42, 0xa5, 0xdb, 0xf5, 0x1c, 0x21, 0xa0, 0x07, 
+-	0xf0, 0x11, 0xf8, 0x22, 0x69, 0xb8, 0x28, 0x06, 
+-	0xd1, 0x04, 0x68, 0xf8, 0x1c, 0x31, 0x1c, 0x22, 
+-	0xf0, 0x00, 0xff, 0x40, 0x1c, 0x20, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x63, 0x69, 0x5f, 0x73, 
+-	0x6c, 0x6f, 0x74, 0x3a, 0x20, 0x72, 0x65, 0x63, 
+-	0x65, 0x69, 0x76, 0x65, 0x64, 0x20, 0x64, 0x61, 
+-	0x74, 0x61, 0x20, 0x6c, 0x65, 0x6e, 0x3d, 0x25, 
+-	0x64, 0x0a, 0x00, 0x00, 0xb5, 0xf0, 0x1c, 0x14, 
+-	0x1c, 0x0d, 0x1c, 0x07, 0xf7, 0xff, 0xff, 0xab, 
+-	0x22, 0x01, 0x21, 0x01, 0x68, 0x7b, 0x6a, 0x1b, 
+-	0x1c, 0x38, 0xf0, 0x10, 0xfe, 0xd3, 0x1c, 0x38, 
+-	0xf7, 0xff, 0xff, 0x99, 0x09, 0xc0, 0xd3, 0x23, 
+-	0x06, 0x22, 0x0e, 0x12, 0x21, 0x02, 0x68, 0x7b, 
+-	0x6a, 0x1b, 0x1c, 0x38, 0xf0, 0x10, 0xfe, 0xc6, 
+-	0x12, 0x22, 0x21, 0x03, 0x68, 0x7b, 0x6a, 0x1b, 
+-	0x1c, 0x38, 0xf0, 0x10, 0xfe, 0xbf, 0x26, 0x00, 
+-	0x2c, 0x00, 0xdd, 0x09, 0x5d, 0xaa, 0x21, 0x00, 
+-	0x68, 0x7b, 0x6a, 0x1b, 0x1c, 0x38, 0xf0, 0x10, 
+-	0xfe, 0xb5, 0x36, 0x01, 0x42, 0xa6, 0xdb, 0xf5, 
+-	0x1c, 0x38, 0xf7, 0xff, 0xff, 0x78, 0x08, 0x80, 
+-	0xd3, 0x02, 0xa0, 0x0b, 0xf0, 0x10, 0xff, 0xd0, 
+-	0x22, 0x00, 0x21, 0x01, 0x68, 0x7b, 0x6a, 0x1b, 
+-	0x1c, 0x38, 0xf0, 0x10, 0xfe, 0xa3, 0x1c, 0x38, 
+-	0xf7, 0xff, 0xff, 0x69, 0x08, 0x80, 0xd3, 0x02, 
+-	0xa0, 0x0b, 0xf0, 0x10, 0xff, 0xc1, 0x20, 0x00, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x63, 0x69, 0x5f, 0x73, 0x6c, 0x6f, 0x74, 0x5f, 
+-	0x77, 0x72, 0x69, 0x74, 0x65, 0x3a, 0x20, 0x77, 
+-	0x72, 0x69, 0x74, 0x65, 0x20, 0x65, 0x72, 0x72, 
+-	0x6f, 0x72, 0x20, 0x31, 0x0a, 0x00, 0x00, 0x00, 
+-	0x63, 0x69, 0x5f, 0x73, 0x6c, 0x6f, 0x74, 0x5f, 
+-	0x77, 0x72, 0x69, 0x74, 0x65, 0x3a, 0x20, 0x77, 
+-	0x72, 0x69, 0x74, 0x65, 0x20, 0x65, 0x72, 0x72, 
+-	0x6f, 0x72, 0x20, 0x32, 0x0a, 0x00, 0x00, 0x00, 
+-	0xb5, 0x00, 0x1c, 0x0a, 0x1d, 0xc1, 0x31, 0xff, 
+-	0x31, 0x1a, 0xf7, 0xff, 0xff, 0x8f, 0xbc, 0x08, 
+-	0x47, 0x18, 0xb5, 0x80, 0x1c, 0x07, 0xa0, 0x0d, 
+-	0xf0, 0x10, 0xff, 0x8e, 0x22, 0x08, 0x21, 0x01, 
+-	0x68, 0x7b, 0x6a, 0x1b, 0x1c, 0x38, 0xf0, 0x10, 
+-	0xfe, 0x61, 0x21, 0x03, 0x1c, 0x38, 0xf7, 0xff, 
+-	0xfe, 0xa8, 0x48, 0x0a, 0x68, 0x00, 0x30, 0x05, 
+-	0x61, 0x38, 0x20, 0x00, 0x23, 0x03, 0x02, 0x1b, 
+-	0x18, 0xf9, 0x62, 0x08, 0xbc, 0x80, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x63, 0x69, 0x5f, 0x73, 
+-	0x6c, 0x6f, 0x74, 0x3a, 0x20, 0x72, 0x65, 0x73, 
+-	0x65, 0x74, 0x0a, 0x00, 0x2e, 0x08, 0x05, 0xb0, 
+-	0xb5, 0x90, 0x22, 0x00, 0x21, 0x01, 0x68, 0x43, 
+-	0x6a, 0x1b, 0x1c, 0x07, 0xf0, 0x10, 0xfe, 0x3e, 
+-	0x1c, 0x38, 0xf7, 0xff, 0xff, 0x04, 0x23, 0x40, 
+-	0x40, 0x18, 0x4c, 0x14, 0xd1, 0x13, 0x68, 0x20, 
+-	0x30, 0x05, 0x23, 0x03, 0x02, 0x1b, 0x61, 0x38, 
+-	0x18, 0xf8, 0x6a, 0x01, 0x31, 0x01, 0x62, 0x01, 
+-	0x29, 0x0a, 0xdd, 0x03, 0x21, 0x00, 0x1c, 0x38, 
+-	0xf7, 0xff, 0xfe, 0x73, 0x20, 0x00, 0x43, 0xc0, 
+-	0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 0x22, 0x04, 
+-	0x21, 0x01, 0x68, 0x7b, 0x6a, 0x1b, 0x1c, 0x38, 
+-	0xf0, 0x10, 0xfe, 0x1c, 0x21, 0x04, 0x1c, 0x38, 
+-	0xf7, 0xff, 0xfe, 0x63, 0x68, 0x20, 0x30, 0x05, 
+-	0x61, 0x38, 0x20, 0x00, 0xbc, 0x90, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x05, 0xb0, 
+-	0xb5, 0xf0, 0x26, 0xff, 0x36, 0x01, 0x61, 0xc6, 
+-	0x1d, 0xc5, 0x35, 0x19, 0x1c, 0x07, 0xf7, 0xff, 
+-	0xfe, 0xd6, 0x4c, 0x17, 0x28, 0x00, 0xd1, 0x0d, 
+-	0xa0, 0x16, 0xf0, 0x10, 0xff, 0x25, 0x21, 0xfe, 
+-	0x1c, 0x38, 0xf7, 0xff, 0xfe, 0x46, 0x68, 0x20, 
+-	0x61, 0x78, 0x20, 0x00, 0x43, 0xc0, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x78, 0x28, 0x02, 0x00, 
+-	0x78, 0x69, 0x43, 0x01, 0x61, 0xf9, 0xa0, 0x19, 
+-	0xf0, 0x10, 0xff, 0x12, 0x69, 0xf8, 0x42, 0xb0, 
+-	0xdd, 0x00, 0x61, 0xfe, 0x22, 0x02, 0x21, 0x01, 
+-	0x68, 0x7b, 0x6a, 0x1b, 0x1c, 0x38, 0xf0, 0x10, 
+-	0xfd, 0xe1, 0x68, 0x20, 0x30, 0x05, 0x61, 0x38, 
+-	0x21, 0x05, 0x1c, 0x38, 0xf7, 0xff, 0xfe, 0x25, 
+-	0x20, 0x00, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x05, 0xb0, 0x63, 0x69, 0x5f, 0x73, 
+-	0x6c, 0x6f, 0x74, 0x3a, 0x20, 0x6d, 0x6f, 0x64, 
+-	0x75, 0x6c, 0x65, 0x20, 0x6e, 0x6f, 0x74, 0x20, 
+-	0x72, 0x65, 0x61, 0x64, 0x79, 0x20, 0x74, 0x6f, 
+-	0x20, 0x73, 0x65, 0x6e, 0x64, 0x20, 0x62, 0x75, 
+-	0x66, 0x66, 0x65, 0x72, 0x20, 0x73, 0x69, 0x7a, 
+-	0x65, 0x0a, 0x00, 0x00, 0x63, 0x69, 0x5f, 0x73, 
+-	0x6c, 0x6f, 0x74, 0x3a, 0x20, 0x6d, 0x6f, 0x64, 
+-	0x75, 0x6c, 0x65, 0x20, 0x62, 0x75, 0x66, 0x66, 
+-	0x65, 0x72, 0x20, 0x73, 0x69, 0x7a, 0x65, 0x20, 
+-	0x3d, 0x20, 0x25, 0x30, 0x34, 0x78, 0x0a, 0x00, 
+-	0xb5, 0xb0, 0x1c, 0x07, 0xf7, 0xff, 0xfe, 0x6f, 
+-	0x23, 0x40, 0x40, 0x18, 0x25, 0x00, 0x43, 0xed, 
+-	0x4c, 0x3d, 0x28, 0x00, 0xd1, 0x0c, 0xa0, 0x3d, 
+-	0xf0, 0x10, 0xfe, 0xc2, 0x21, 0xff, 0x1c, 0x38, 
+-	0xf7, 0xff, 0xfd, 0xe3, 0x68, 0x20, 0x61, 0x78, 
+-	0x1c, 0x28, 0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x22, 0x03, 0x21, 0x01, 0x68, 0x7b, 0x6a, 0x1b, 
+-	0x1c, 0x38, 0xf0, 0x10, 0xfd, 0x8b, 0x1c, 0x38, 
+-	0xf7, 0xff, 0xfe, 0x51, 0x09, 0xc0, 0xd2, 0x0c, 
+-	0xa0, 0x3d, 0xf0, 0x10, 0xfe, 0xa9, 0x21, 0xff, 
+-	0x1c, 0x38, 0xf7, 0xff, 0xfd, 0xca, 0x68, 0x20, 
+-	0x61, 0x78, 0x1c, 0x28, 0xbc, 0xb0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x22, 0x02, 0x21, 0x02, 0x68, 0x7b, 
+-	0x6a, 0x1b, 0x1c, 0x38, 0xf0, 0x10, 0xfd, 0x72, 
+-	0x22, 0x00, 0x21, 0x03, 0x68, 0x7b, 0x6a, 0x1b, 
+-	0x1c, 0x38, 0xf0, 0x10, 0xfd, 0x6b, 0x69, 0xf8, 
+-	0x12, 0x02, 0x21, 0x00, 0x68, 0x7b, 0x6a, 0x1b, 
+-	0x1c, 0x38, 0xf0, 0x10, 0xfd, 0x63, 0x69, 0xf8, 
+-	0x06, 0x02, 0x0e, 0x12, 0x21, 0x00, 0x68, 0x7b, 
+-	0x6a, 0x1b, 0x1c, 0x38, 0xf0, 0x10, 0xfd, 0x5a, 
+-	0xa0, 0x34, 0xf0, 0x10, 0xfe, 0x7d, 0x1c, 0x38, 
+-	0xf7, 0xff, 0xfe, 0x1d, 0x08, 0x80, 0xd3, 0x02, 
+-	0xa0, 0x3e, 0xf0, 0x10, 0xfe, 0x75, 0x22, 0x00, 
+-	0x21, 0x01, 0x68, 0x7b, 0x6a, 0x1b, 0x1c, 0x38, 
+-	0xf0, 0x10, 0xfd, 0x48, 0x68, 0xf8, 0x69, 0xf9, 
+-	0xf0, 0x00, 0xfa, 0x3e, 0x48, 0x42, 0x68, 0xf9, 
+-	0x4b, 0x42, 0x18, 0xc9, 0x61, 0x48, 0x68, 0xf8, 
+-	0x18, 0xc0, 0x61, 0x07, 0x48, 0x40, 0x68, 0xf9, 
+-	0x18, 0xc9, 0x61, 0x88, 0x68, 0xf8, 0x18, 0xc0, 
+-	0x60, 0xc7, 0x69, 0xf9, 0xa0, 0x3d, 0xf0, 0x10, 
+-	0xfe, 0x57, 0x68, 0x20, 0x61, 0x38, 0x21, 0x06, 
+-	0x1c, 0x38, 0xf7, 0xff, 0xfd, 0x76, 0x20, 0x00, 
+-	0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x05, 0xb0, 0x63, 0x69, 0x5f, 0x73, 
+-	0x6c, 0x6f, 0x74, 0x3a, 0x20, 0x6d, 0x6f, 0x64, 
+-	0x75, 0x6c, 0x65, 0x20, 0x6e, 0x6f, 0x74, 0x20, 
+-	0x72, 0x65, 0x61, 0x64, 0x79, 0x20, 0x74, 0x6f, 
+-	0x20, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 
+-	0x20, 0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 0x20, 
+-	0x73, 0x69, 0x7a, 0x65, 0x0a, 0x00, 0x00, 0x00, 
+-	0x63, 0x69, 0x5f, 0x73, 0x6c, 0x6f, 0x74, 0x3a, 
+-	0x20, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x20, 
+-	0x6e, 0x6f, 0x74, 0x20, 0x72, 0x65, 0x61, 0x64, 
+-	0x79, 0x20, 0x74, 0x6f, 0x20, 0x72, 0x65, 0x63, 
+-	0x65, 0x69, 0x76, 0x65, 0x20, 0x62, 0x75, 0x66, 
+-	0x66, 0x65, 0x72, 0x20, 0x73, 0x69, 0x7a, 0x65, 
+-	0x20, 0x32, 0x0a, 0x00, 0x63, 0x69, 0x5f, 0x73, 
+-	0x6c, 0x6f, 0x74, 0x3a, 0x20, 0x73, 0x65, 0x6e, 
+-	0x64, 0x69, 0x6e, 0x67, 0x20, 0x6e, 0x65, 0x67, 
+-	0x6f, 0x74, 0x69, 0x61, 0x74, 0x65, 0x64, 0x20, 
+-	0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 0x20, 0x73, 
+-	0x69, 0x7a, 0x65, 0x20, 0x62, 0x61, 0x63, 0x6b, 
+-	0x20, 0x74, 0x6f, 0x20, 0x6d, 0x6f, 0x64, 0x75, 
+-	0x6c, 0x65, 0x0a, 0x00, 0x63, 0x69, 0x5f, 0x73, 
+-	0x6c, 0x6f, 0x74, 0x5f, 0x6e, 0x65, 0x67, 0x6f, 
+-	0x74, 0x69, 0x61, 0x74, 0x65, 0x3a, 0x20, 0x62, 
+-	0x75, 0x66, 0x66, 0x65, 0x72, 0x20, 0x73, 0x69, 
+-	0x7a, 0x65, 0x20, 0x77, 0x72, 0x69, 0x74, 0x65, 
+-	0x20, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x0a, 0x00, 
+-	0x2e, 0x00, 0x7c, 0x55, 0x00, 0x01, 0x3b, 0x80, 
+-	0x2e, 0x00, 0x7c, 0x67, 0x63, 0x69, 0x5f, 0x73, 
+-	0x6c, 0x6f, 0x74, 0x3a, 0x20, 0x62, 0x75, 0x66, 
+-	0x66, 0x65, 0x72, 0x20, 0x73, 0x69, 0x7a, 0x65, 
+-	0x20, 0x3d, 0x20, 0x25, 0x30, 0x34, 0x78, 0x0a, 
+-	0x00, 0x00, 0x00, 0x00, 0xb5, 0x80, 0x1c, 0x07, 
+-	0x20, 0xff, 0x30, 0x01, 0x61, 0xf8, 0x21, 0x00, 
+-	0x1c, 0x38, 0xf7, 0xff, 0xfc, 0xea, 0x48, 0x05, 
+-	0x68, 0x00, 0x61, 0x38, 0x48, 0x04, 0xf7, 0xfd, 
+-	0xfc, 0xe5, 0x60, 0xf8, 0xbc, 0x80, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x05, 0xb0, 
+-	0x00, 0x01, 0x3b, 0x9c, 0xb5, 0x00, 0x68, 0xc0, 
+-	0xf7, 0xfd, 0xfc, 0xfa, 0xbc, 0x08, 0x47, 0x18, 
+-	0xb5, 0x80, 0x1c, 0x1f, 0x06, 0x0b, 0x0e, 0x1b, 
+-	0x69, 0x81, 0x29, 0x06, 0xd0, 0x04, 0x20, 0x00, 
+-	0x43, 0xc0, 0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 
+-	0x78, 0x11, 0x29, 0xff, 0xd1, 0x05, 0xf7, 0xff, 
+-	0xfc, 0xe4, 0x1c, 0x38, 0xbc, 0x80, 0xbc, 0x08, 
+-	0x47, 0x18, 0x68, 0xc0, 0x1c, 0x11, 0x1c, 0x3a, 
+-	0xf0, 0x00, 0xfb, 0x9a, 0xbc, 0x80, 0xbc, 0x08, 
+-	0x47, 0x18, 0x69, 0x00, 0x49, 0x04, 0x68, 0x09, 
+-	0x1a, 0x40, 0x4b, 0x04, 0x42, 0x98, 0xd2, 0x01, 
+-	0x20, 0x00, 0x47, 0x70, 0x20, 0x01, 0x47, 0x70, 
+-	0x2e, 0x08, 0x05, 0xb0, 0x80, 0x00, 0x00, 0x00, 
+-	0xb5, 0x90, 0x68, 0x44, 0x6a, 0x61, 0x1c, 0x07, 
+-	0x29, 0x00, 0xd0, 0x03, 0x1c, 0x38, 0xf0, 0x10, 
+-	0xfc, 0x51, 0xe0, 0x00, 0x20, 0x01, 0x08, 0x40, 
+-	0xd2, 0x06, 0x21, 0x00, 0x1c, 0x38, 0xf7, 0xff, 
+-	0xfc, 0x98, 0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 
+-	0x69, 0xb8, 0x28, 0x00, 0xd1, 0xf9, 0x6a, 0xa2, 
+-	0x2a, 0x00, 0xd0, 0x03, 0x21, 0x02, 0x1c, 0x38, 
+-	0xf0, 0x10, 0xfc, 0x3e, 0x21, 0x01, 0x1c, 0x38, 
+-	0xf7, 0xff, 0xfc, 0x87, 0x20, 0x00, 0x23, 0x03, 
+-	0x02, 0x1b, 0x18, 0xf9, 0x62, 0x08, 0x48, 0x03, 
+-	0x68, 0x00, 0x30, 0x19, 0x61, 0x38, 0xbc, 0x90, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x05, 0xb0, 
+-	0xb5, 0x90, 0x1c, 0x07, 0xf7, 0xff, 0xff, 0xcc, 
+-	0x1c, 0x38, 0xf7, 0xff, 0xff, 0xba, 0x28, 0x00, 
+-	0xd1, 0x03, 0x43, 0xc0, 0xbc, 0x90, 0xbc, 0x08, 
+-	0x47, 0x18, 0x69, 0xb8, 0x4c, 0x23, 0x28, 0x05, 
+-	0xd0, 0x30, 0xdc, 0x0b, 0x28, 0x01, 0xd0, 0x1e, 
+-	0x28, 0x02, 0xd0, 0x23, 0x28, 0x03, 0xd0, 0x25, 
+-	0x28, 0x04, 0xd1, 0x14, 0x1c, 0x38, 0xf7, 0xff, 
+-	0xfe, 0x03, 0xe0, 0x10, 0x28, 0x06, 0xd0, 0x25, 
+-	0x28, 0xfe, 0xd0, 0x01, 0x28, 0xff, 0xd1, 0x0a, 
+-	0x69, 0x78, 0x68, 0x21, 0x1a, 0x08, 0x23, 0xff, 
+-	0x33, 0xf5, 0x42, 0x98, 0xd9, 0x03, 0x21, 0x00, 
+-	0x1c, 0x38, 0xf7, 0xff, 0xfc, 0x4a, 0x20, 0x00, 
+-	0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 0x68, 0x20, 
+-	0x30, 0x05, 0x61, 0x38, 0x1c, 0x38, 0xf7, 0xff, 
+-	0xfc, 0x6d, 0xe7, 0xf4, 0x1c, 0x38, 0xf7, 0xff, 
+-	0xfd, 0x84, 0xe7, 0xf0, 0x1c, 0x38, 0xf7, 0xff, 
+-	0xfd, 0xa7, 0xe7, 0xec, 0x1c, 0x38, 0xf7, 0xff, 
+-	0xfe, 0x3f, 0xe7, 0xe8, 0x68, 0xf8, 0xf0, 0x00, 
+-	0xfc, 0x53, 0x28, 0x00, 0xd1, 0x02, 0x1c, 0x38, 
+-	0xf7, 0xff, 0xfc, 0xb1, 0x68, 0xf8, 0xf0, 0x00, 
+-	0xfb, 0xd9, 0x68, 0x20, 0x30, 0x02, 0x61, 0x38, 
+-	0xe7, 0xd9, 0x00, 0x00, 0x2e, 0x08, 0x05, 0xb0, 
+-	0xb5, 0xb0, 0x06, 0x15, 0x0e, 0x2d, 0x9f, 0x04, 
+-	0x68, 0x42, 0x1c, 0x1c, 0x42, 0x8a, 0xdc, 0x04, 
+-	0x20, 0x00, 0x43, 0xc0, 0xbc, 0xb0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x68, 0xc0, 0x23, 0xc9, 0x00, 0x9b, 
+-	0x43, 0x59, 0x18, 0x40, 0x1c, 0x29, 0x1c, 0x22, 
+-	0x1c, 0x3b, 0xf7, 0xff, 0xff, 0x35, 0xbc, 0xb0, 
+-	0xbc, 0x08, 0x47, 0x18, 0xb5, 0x90, 0x24, 0x00, 
+-	0x1c, 0x07, 0x68, 0x40, 0x28, 0x00, 0xdd, 0x0a, 
+-	0x21, 0xc9, 0x00, 0x89, 0x43, 0x61, 0x68, 0xf8, 
+-	0x18, 0x40, 0xf7, 0xff, 0xff, 0x81, 0x68, 0x78, 
+-	0x34, 0x01, 0x42, 0xa0, 0xdc, 0xf4, 0xbc, 0x90, 
+-	0xbc, 0x08, 0x47, 0x18, 0xb5, 0x90, 0x24, 0x00, 
+-	0x1c, 0x07, 0x68, 0x40, 0x28, 0x00, 0xdd, 0x0f, 
+-	0x21, 0xc9, 0x00, 0x89, 0x43, 0x61, 0x68, 0xf8, 
+-	0x18, 0x40, 0x60, 0x84, 0x68, 0x3a, 0xc0, 0x84, 
+-	0x68, 0xf8, 0x18, 0x40, 0xf7, 0xff, 0xfe, 0xee, 
+-	0x68, 0x78, 0x34, 0x01, 0x42, 0xa0, 0xdc, 0xef, 
+-	0x20, 0x00, 0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 
+-	0xb5, 0xf0, 0x25, 0x00, 0x1c, 0x07, 0x68, 0x40, 
+-	0x1c, 0x0c, 0x28, 0x00, 0xdd, 0x0f, 0x26, 0x01, 
+-	0x1c, 0x30, 0x40, 0xa8, 0x40, 0x20, 0xd0, 0x06, 
+-	0x21, 0xc9, 0x00, 0x89, 0x43, 0x69, 0x68, 0xf8, 
+-	0x18, 0x40, 0xf7, 0xff, 0xfb, 0xe6, 0x68, 0x78, 
+-	0x35, 0x01, 0x42, 0xa8, 0xdc, 0xf0, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0xb4, 0xf0, 0x21, 0x00, 
+-	0x78, 0x07, 0x22, 0x80, 0x43, 0xd2, 0x40, 0x3a, 
+-	0x1c, 0x04, 0x0a, 0x3b, 0xd3, 0x0f, 0x27, 0x00, 
+-	0x30, 0x01, 0x2a, 0x00, 0xdd, 0x0d, 0x1b, 0xd3, 
+-	0x00, 0xdb, 0x78, 0x06, 0x1f, 0xdd, 0x3d, 0x01, 
+-	0x40, 0xae, 0x43, 0x31, 0x30, 0x01, 0x37, 0x01, 
+-	0x42, 0x97, 0xdb, 0xf4, 0xe0, 0x01, 0x30, 0x01, 
+-	0x1c, 0x11, 0x1b, 0x00, 0x18, 0x40, 0xbc, 0xf0, 
+-	0x47, 0x70, 0xb4, 0xb0, 0x22, 0x01, 0x28, 0x80, 
+-	0xda, 0x02, 0x70, 0x08, 0xbc, 0xb0, 0x47, 0x70, 
+-	0x27, 0x03, 0x25, 0xff, 0x00, 0xfc, 0x1c, 0x2b, 
+-	0x40, 0xa3, 0x40, 0x03, 0xd0, 0x03, 0x1c, 0x03, 
+-	0x41, 0x23, 0x54, 0x8b, 0x32, 0x01, 0x37, 0x01, 
+-	0xd5, 0xf4, 0x20, 0x80, 0x43, 0x10, 0x70, 0x08, 
+-	0xbc, 0xb0, 0x47, 0x70, 0xb5, 0xb0, 0x22, 0x00, 
+-	0x78, 0x41, 0x1c, 0x47, 0x20, 0x80, 0x43, 0xc0, 
+-	0x40, 0x08, 0x0a, 0x09, 0xd3, 0x0f, 0x21, 0x00, 
+-	0x37, 0x01, 0x28, 0x00, 0xdd, 0x0d, 0x1a, 0x43, 
+-	0x00, 0xdb, 0x78, 0x3d, 0x1f, 0xdc, 0x3c, 0x01, 
+-	0x40, 0xa5, 0x43, 0x2a, 0x31, 0x01, 0x37, 0x01, 
+-	0x42, 0x81, 0xdb, 0xf4, 0xe0, 0x01, 0x1c, 0x02, 
+-	0x37, 0x01, 0x78, 0x3b, 0xa1, 0x03, 0xa0, 0x04, 
+-	0xf0, 0x10, 0xfc, 0x42, 0x78, 0x38, 0xbc, 0xb0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x63, 0x69, 0x3a, 0x00, 
+-	0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 
+-	0x3a, 0x20, 0x25, 0x73, 0x2c, 0x20, 0x6c, 0x65, 
+-	0x6e, 0x3d, 0x25, 0x64, 0x2c, 0x20, 0x69, 0x64, 
+-	0x3d, 0x25, 0x30, 0x32, 0x78, 0x0a, 0x00, 0x00, 
+-	0xb5, 0xb0, 0x25, 0x00, 0x60, 0x01, 0x1c, 0x07, 
+-	0x4b, 0x2f, 0x18, 0xc4, 0x72, 0x25, 0x72, 0x65, 
+-	0x72, 0xa5, 0x72, 0xe5, 0x1c, 0x08, 0x21, 0x01, 
+-	0x04, 0x09, 0xf0, 0x10, 0xfb, 0x01, 0x21, 0x01, 
+-	0x02, 0x49, 0x42, 0x88, 0xdd, 0x01, 0x60, 0x79, 
+-	0xe0, 0x00, 0x60, 0x78, 0x22, 0x01, 0x04, 0x12, 
+-	0x21, 0x00, 0x1d, 0xf8, 0x30, 0x01, 0xf0, 0x10, 
+-	0xfb, 0xa7, 0x20, 0x00, 0x43, 0xc1, 0x00, 0x82, 
+-	0x19, 0xd2, 0x4b, 0x22, 0x18, 0xd3, 0x60, 0x9d, 
+-	0x4b, 0x21, 0x18, 0xd3, 0x60, 0x9d, 0x23, 0x9d, 
+-	0x02, 0x5b, 0x18, 0xd3, 0x60, 0x9d, 0x4b, 0x1f, 
+-	0x18, 0xd2, 0x60, 0x95, 0x00, 0x42, 0x19, 0xd2, 
+-	0x4b, 0x1d, 0x18, 0xd3, 0x81, 0x19, 0x4b, 0x1d, 
+-	0x18, 0xd2, 0x81, 0x11, 0x30, 0x01, 0x28, 0x20, 
+-	0xdb, 0xe5, 0x20, 0x00, 0x68, 0x79, 0x29, 0x00, 
+-	0xdd, 0x11, 0x00, 0x41, 0x18, 0x09, 0x00, 0xc9, 
+-	0x19, 0xc9, 0x23, 0x01, 0x04, 0x1b, 0x18, 0xc9, 
+-	0x72, 0x0d, 0x60, 0xcd, 0x61, 0x0d, 0x61, 0x4d, 
+-	0x76, 0x0d, 0x76, 0x4d, 0x61, 0xc8, 0x68, 0x79, 
+-	0x30, 0x01, 0x42, 0x81, 0xdc, 0xed, 0x4b, 0x10, 
+-	0x18, 0xf8, 0x22, 0x01, 0x02, 0xd2, 0x21, 0x00, 
+-	0xf0, 0x10, 0xfb, 0x6e, 0x4b, 0x0d, 0x18, 0xf8, 
+-	0x22, 0xff, 0x21, 0x00, 0x32, 0x01, 0xf0, 0x10, 
+-	0xfb, 0x67, 0x60, 0xe5, 0x61, 0x25, 0x61, 0x65, 
+-	0x61, 0xa5, 0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x00, 0x01, 0x3b, 0x80, 0x00, 0x01, 0x39, 0x00, 
+-	0x00, 0x01, 0x39, 0x80, 0x00, 0x01, 0x3a, 0x80, 
+-	0x00, 0x01, 0x3b, 0x00, 0x00, 0x01, 0x3b, 0x40, 
+-	0x00, 0x01, 0x30, 0x08, 0x00, 0x01, 0x38, 0x08, 
+-	0x21, 0x00, 0x70, 0x01, 0x60, 0x41, 0x60, 0x81, 
+-	0x60, 0xc1, 0x74, 0x01, 0x74, 0x41, 0x47, 0x70, 
+-	0xb4, 0x80, 0x21, 0x00, 0x68, 0x42, 0x2a, 0x00, 
+-	0xdd, 0x18, 0x00, 0x4b, 0x18, 0x5b, 0x00, 0xdb, 
+-	0x18, 0x1f, 0x23, 0x01, 0x04, 0x1b, 0x18, 0xfb, 
+-	0x7a, 0x1b, 0x2b, 0x00, 0xd1, 0x0b, 0x22, 0x01, 
+-	0x00, 0x4b, 0x18, 0x59, 0x00, 0xc9, 0x18, 0x08, 
+-	0x04, 0x13, 0x18, 0xc1, 0x72, 0x0a, 0x4b, 0x05, 
+-	0x18, 0xc0, 0xbc, 0x80, 0x47, 0x70, 0x31, 0x01, 
+-	0x42, 0x8a, 0xdc, 0xe6, 0x20, 0x00, 0xbc, 0x80, 
+-	0x47, 0x70, 0x00, 0x00, 0x00, 0x01, 0x00, 0x08, 
+-	0xb5, 0xb0, 0x06, 0x1d, 0x0e, 0x2d, 0x1c, 0x14, 
+-	0x68, 0x0a, 0x21, 0x00, 0x1c, 0x07, 0xf0, 0x10, 
+-	0xfb, 0x1b, 0x70, 0x3d, 0x2c, 0x00, 0xd0, 0x04, 
+-	0x20, 0x80, 0x70, 0x78, 0xbc, 0xb0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x20, 0x00, 0x70, 0x78, 0xbc, 0xb0, 
+-	0xbc, 0x08, 0x47, 0x18, 0xb5, 0xff, 0x99, 0x01, 
+-	0x1c, 0x1c, 0x1c, 0x15, 0x1c, 0x07, 0x29, 0x00, 
+-	0xd1, 0x04, 0x20, 0x00, 0xb0, 0x04, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x1c, 0x28, 0xf7, 0xff, 
+-	0xff, 0xb7, 0x1c, 0x06, 0xd1, 0x01, 0x20, 0x00, 
+-	0xe7, 0xf4, 0x69, 0x70, 0x68, 0x29, 0x43, 0x48, 
+-	0x19, 0x01, 0x23, 0x01, 0x04, 0x1b, 0x42, 0x99, 
+-	0xdd, 0x01, 0x20, 0x00, 0xe7, 0xea, 0x18, 0x2d, 
+-	0x99, 0x01, 0x1d, 0xe8, 0x30, 0x01, 0x1c, 0x22, 
+-	0xf0, 0x10, 0xfa, 0x84, 0x74, 0x34, 0x7a, 0x68, 
+-	0x74, 0x70, 0x2f, 0x00, 0xd0, 0x04, 0x68, 0xb8, 
+-	0x60, 0xb0, 0x60, 0xf7, 0x60, 0xbe, 0xe0, 0x02, 
+-	0x20, 0x00, 0x60, 0xb0, 0x60, 0xf0, 0x1c, 0x30, 
+-	0xe7, 0xd4, 0xb5, 0xff, 0x9c, 0x09, 0x06, 0x25, 
+-	0x0e, 0x2d, 0x24, 0x00, 0x43, 0xe4, 0x1c, 0x07, 
+-	0x98, 0x02, 0x1c, 0x21, 0x4b, 0x4c, 0x18, 0xfa, 
+-	0x28, 0x00, 0xd0, 0x03, 0x28, 0x01, 0xd1, 0x6a, 
+-	0x20, 0x00, 0xe0, 0x2d, 0x20, 0x00, 0x00, 0x43, 
+-	0x19, 0xde, 0x4b, 0x48, 0x18, 0xf6, 0x23, 0x08, 
+-	0x5e, 0xf3, 0x42, 0xab, 0xd1, 0x00, 0x1c, 0x04, 
+-	0x29, 0x00, 0xda, 0x04, 0x1c, 0x1e, 0x23, 0x01, 
+-	0x42, 0xde, 0xd1, 0x00, 0x1c, 0x01, 0x30, 0x01, 
+-	0x28, 0x20, 0xdb, 0xec, 0x20, 0x00, 0x43, 0xc0, 
+-	0x42, 0x84, 0xd1, 0x05, 0x42, 0x81, 0xd0, 0x03, 
+-	0x7a, 0x13, 0x33, 0x01, 0x72, 0x13, 0x1c, 0x0c, 
+-	0x2c, 0x00, 0xdb, 0x44, 0x00, 0x60, 0x19, 0xc0, 
+-	0x4b, 0x38, 0x18, 0xc0, 0x81, 0x05, 0x00, 0xa0, 
+-	0x19, 0xc1, 0x4b, 0x37, 0x18, 0xc8, 0x68, 0x80, 
+-	0x4b, 0x36, 0x18, 0xc9, 0x68, 0x8d, 0xe0, 0x2c, 
+-	0x00, 0x43, 0x19, 0xde, 0x4b, 0x34, 0x18, 0xf6, 
+-	0x23, 0x08, 0x5e, 0xf3, 0x42, 0xab, 0xd1, 0x00, 
+-	0x1c, 0x04, 0x29, 0x00, 0xda, 0x04, 0x1c, 0x1e, 
+-	0x23, 0x01, 0x42, 0xde, 0xd1, 0x00, 0x1c, 0x01, 
+-	0x30, 0x01, 0x28, 0x20, 0xdb, 0xec, 0x20, 0x00, 
+-	0x43, 0xc0, 0x42, 0x84, 0xd1, 0x05, 0x42, 0x81, 
+-	0xd0, 0x03, 0x7a, 0x93, 0x33, 0x01, 0x72, 0x93, 
+-	0x1c, 0x0c, 0x2c, 0x00, 0xdb, 0x17, 0x00, 0x60, 
+-	0x19, 0xc0, 0x4b, 0x25, 0x18, 0xc0, 0x81, 0x05, 
+-	0x00, 0xa0, 0x19, 0xc1, 0x23, 0x9d, 0x02, 0x5b, 
+-	0x18, 0xc8, 0x68, 0x80, 0x4b, 0x21, 0x18, 0xc9, 
+-	0x68, 0x8d, 0x28, 0x00, 0xd0, 0x0f, 0x99, 0x01, 
+-	0x9b, 0x03, 0x1c, 0x3a, 0xf7, 0xff, 0xff, 0x5a, 
+-	0x28, 0x00, 0xd1, 0x12, 0x43, 0xc0, 0xb0, 0x04, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0xe7, 0xff, 
+-	0x20, 0x00, 0x43, 0xc0, 0xe7, 0xf7, 0x99, 0x01, 
+-	0x9b, 0x03, 0x1c, 0x3a, 0xf7, 0xff, 0xff, 0x4a, 
+-	0x1c, 0x05, 0xd1, 0x01, 0x43, 0xe8, 0xe7, 0xee, 
+-	0x1c, 0x28, 0x60, 0x44, 0x9a, 0x02, 0x2a, 0x00, 
+-	0xd0, 0x0c, 0x2a, 0x01, 0xd1, 0x08, 0x00, 0xa1, 
+-	0x19, 0xc9, 0x23, 0x9d, 0x02, 0x5b, 0x18, 0xca, 
+-	0x60, 0x90, 0x4b, 0x0c, 0x18, 0xc8, 0x60, 0x85, 
+-	0x1c, 0x20, 0xe7, 0xdc, 0x00, 0xa1, 0x19, 0xc9, 
+-	0x4b, 0x05, 0x18, 0xca, 0x60, 0x90, 0x4b, 0x05, 
+-	0x18, 0xc8, 0x60, 0x85, 0xe7, 0xf4, 0x00, 0x00, 
+-	0x00, 0x01, 0x3b, 0x80, 0x00, 0x01, 0x3b, 0x00, 
+-	0x00, 0x01, 0x39, 0x00, 0x00, 0x01, 0x39, 0x80, 
+-	0x00, 0x01, 0x3b, 0x40, 0x00, 0x01, 0x3a, 0x80, 
+-	0xb5, 0x80, 0x27, 0x00, 0x28, 0x00, 0xd1, 0x03, 
+-	0x1c, 0x38, 0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 
+-	0x22, 0x00, 0x68, 0x81, 0x29, 0x00, 0xd0, 0x0b, 
+-	0x68, 0xc3, 0x2b, 0x00, 0xd0, 0x05, 0x60, 0x99, 
+-	0x68, 0xc1, 0x68, 0x82, 0x60, 0xd1, 0x68, 0xc7, 
+-	0xe0, 0x07, 0x60, 0xca, 0x68, 0x87, 0xe0, 0x04, 
+-	0x68, 0xc1, 0x29, 0x00, 0xd0, 0x01, 0x60, 0x8a, 
+-	0x68, 0xc7, 0xf7, 0xff, 0xfe, 0xbd, 0x1c, 0x38, 
+-	0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 0xb5, 0xf7, 
+-	0x1c, 0x07, 0x98, 0x01, 0x68, 0x46, 0x99, 0x02, 
+-	0x29, 0x00, 0xd0, 0x0b, 0x29, 0x01, 0xd1, 0x12, 
+-	0x00, 0xb0, 0x19, 0xc0, 0x23, 0x9d, 0x02, 0x5b, 
+-	0x18, 0xc1, 0x68, 0x8d, 0x4b, 0x2c, 0x18, 0xc0, 
+-	0x68, 0x84, 0xe0, 0x0a, 0x00, 0xb0, 0x19, 0xc0, 
+-	0x4b, 0x2a, 0x18, 0xc1, 0x68, 0x8d, 0x4b, 0x2a, 
+-	0x18, 0xc0, 0x68, 0x84, 0xe0, 0x01, 0x25, 0x00, 
+-	0x24, 0x00, 0x99, 0x01, 0x42, 0xa9, 0xd1, 0x08, 
+-	0x98, 0x01, 0xf7, 0xff, 0xff, 0xb9, 0x99, 0x01, 
+-	0x1c, 0x05, 0x42, 0xa1, 0xd1, 0x08, 0x24, 0x00, 
+-	0xe0, 0x06, 0x99, 0x01, 0x42, 0xa1, 0xd1, 0x03, 
+-	0x98, 0x01, 0xf7, 0xff, 0xff, 0xad, 0x1c, 0x04, 
+-	0x22, 0x00, 0x43, 0xd2, 0x99, 0x02, 0x4b, 0x1d, 
+-	0x18, 0xf8, 0x29, 0x00, 0xd0, 0x1a, 0x29, 0x01, 
+-	0xd1, 0x14, 0x00, 0xb1, 0x19, 0xc9, 0x23, 0x9d, 
+-	0x02, 0x5b, 0x18, 0xcb, 0x60, 0x9d, 0x4b, 0x14, 
+-	0x18, 0xc9, 0x60, 0x8c, 0x2d, 0x00, 0xd1, 0x09, 
+-	0x2c, 0x00, 0xd1, 0x07, 0x7a, 0x81, 0x39, 0x01, 
+-	0x72, 0x81, 0x00, 0x70, 0x19, 0xc0, 0x4b, 0x12, 
+-	0x18, 0xc0, 0x81, 0x02, 0xb0, 0x03, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x00, 0xb1, 0x19, 0xc9, 
+-	0x4b, 0x0a, 0x18, 0xcb, 0x60, 0x9d, 0x4b, 0x0a, 
+-	0x18, 0xc9, 0x60, 0x8c, 0x2d, 0x00, 0xd1, 0xf1, 
+-	0x2c, 0x00, 0xd1, 0xef, 0x7a, 0x01, 0x39, 0x01, 
+-	0x72, 0x01, 0x00, 0x70, 0x19, 0xc0, 0x4b, 0x07, 
+-	0x18, 0xc0, 0x81, 0x02, 0xe7, 0xe6, 0x00, 0x00, 
+-	0x00, 0x01, 0x3a, 0x80, 0x00, 0x01, 0x39, 0x00, 
+-	0x00, 0x01, 0x39, 0x80, 0x00, 0x01, 0x3b, 0x80, 
+-	0x00, 0x01, 0x3b, 0x40, 0x00, 0x01, 0x3b, 0x00, 
+-	0xb5, 0xf0, 0x1c, 0x17, 0x06, 0x1a, 0x0e, 0x12, 
+-	0xb0, 0x82, 0x92, 0x00, 0x1c, 0x04, 0x1c, 0x08, 
+-	0x1c, 0x0d, 0xb0, 0x81, 0xf7, 0xff, 0xfd, 0x8e, 
+-	0x90, 0x00, 0x1c, 0x3a, 0x1c, 0x03, 0xa1, 0x27, 
+-	0x48, 0x27, 0xf0, 0x10, 0xf9, 0xe9, 0x2f, 0x00, 
+-	0xdd, 0x42, 0x4b, 0x26, 0x18, 0xe0, 0x90, 0x02, 
+-	0x68, 0x20, 0x38, 0x02, 0x42, 0xb8, 0xda, 0x01, 
+-	0x1c, 0x06, 0xe0, 0x00, 0x1c, 0x3e, 0x42, 0xbe, 
+-	0xda, 0x01, 0x22, 0x01, 0xe0, 0x00, 0x22, 0x00, 
+-	0x98, 0x02, 0x9b, 0x00, 0x1c, 0x21, 0xf7, 0xff, 
+-	0xfe, 0x47, 0x9a, 0x01, 0xb4, 0x04, 0x22, 0x00, 
+-	0x99, 0x03, 0x1c, 0x20, 0x1c, 0xb3, 0xf7, 0xff, 
+-	0xfe, 0x88, 0xb0, 0x01, 0x28, 0x00, 0xda, 0x05, 
+-	0x20, 0x00, 0x43, 0xc0, 0xb0, 0x03, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x00, 0x80, 0x19, 0x00, 
+-	0x4b, 0x13, 0x18, 0xc0, 0x68, 0x80, 0x69, 0x40, 
+-	0x68, 0x21, 0x43, 0x48, 0x30, 0x02, 0x19, 0x81, 
+-	0x23, 0x01, 0x04, 0x1b, 0x42, 0x99, 0xdd, 0x05, 
+-	0x20, 0x00, 0x43, 0xc0, 0xb0, 0x03, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x18, 0x20, 0x30, 0x08, 
+-	0x1c, 0x29, 0x1c, 0x32, 0xf0, 0x10, 0xf8, 0xda, 
+-	0x1b, 0xbf, 0x19, 0xad, 0x2f, 0x00, 0xdc, 0xbf, 
+-	0x20, 0x00, 0xb0, 0x03, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x63, 0x69, 0x3a, 0x00, 
+-	0x2e, 0x00, 0x85, 0xcc, 0x00, 0x01, 0x38, 0x08, 
+-	0x00, 0x01, 0x39, 0x00, 0xb5, 0xf3, 0xb0, 0x83, 
+-	0x1c, 0x07, 0x99, 0x04, 0x00, 0x88, 0x19, 0xc0, 
+-	0x4b, 0x2f, 0x18, 0xc0, 0x90, 0x02, 0x68, 0x84, 
+-	0x4b, 0x2e, 0x18, 0xfb, 0x93, 0x01, 0x2c, 0x00, 
+-	0xd0, 0x46, 0x25, 0x00, 0x7c, 0x26, 0x69, 0x60, 
+-	0x68, 0x39, 0x43, 0x48, 0x7c, 0x61, 0x23, 0x80, 
+-	0x40, 0x19, 0x91, 0x00, 0x30, 0x02, 0x19, 0x81, 
+-	0x02, 0x5b, 0x39, 0x02, 0x42, 0x99, 0xdd, 0x04, 
+-	0xb0, 0x03, 0xb0, 0x02, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x18, 0x38, 0x1d, 0xc1, 0x31, 0x01, 
+-	0x19, 0x78, 0x1e, 0xb2, 0x4b, 0x20, 0x18, 0xc0, 
+-	0xf0, 0x10, 0xf8, 0x9c, 0x19, 0xa8, 0x1e, 0x85, 
+-	0x68, 0xa0, 0x42, 0xa0, 0xd0, 0x04, 0x1c, 0x04, 
+-	0xd0, 0x02, 0x99, 0x00, 0x29, 0x00, 0xd1, 0xd9, 
+-	0x23, 0x01, 0x02, 0xdb, 0x42, 0x9d, 0xda, 0x1b, 
+-	0x9b, 0x01, 0x68, 0xda, 0x4b, 0x16, 0x18, 0xf8, 
+-	0x9b, 0x01, 0x69, 0x9b, 0x1c, 0x29, 0xf0, 0x10, 
+-	0xf8, 0x2d, 0x28, 0x00, 0xd1, 0x18, 0x98, 0x02, 
+-	0x68, 0x81, 0x29, 0x00, 0xd0, 0x0c, 0x7c, 0x48, 
+-	0x24, 0x80, 0x40, 0x04, 0x22, 0x01, 0x1c, 0x38, 
+-	0xf7, 0xff, 0xfe, 0xd5, 0x98, 0x02, 0x68, 0x81, 
+-	0x29, 0x00, 0xd0, 0x01, 0x2c, 0x00, 0xd1, 0xf2, 
+-	0x99, 0x04, 0x1c, 0x48, 0xd5, 0x06, 0x42, 0x40, 
+-	0x06, 0xc0, 0x0e, 0xc0, 0x42, 0x40, 0xe0, 0x03, 
+-	0xb0, 0x03, 0xe7, 0xbe, 0x06, 0xc0, 0x0e, 0xc0, 
+-	0x9b, 0x01, 0x72, 0x58, 0xb0, 0x03, 0xe7, 0xb8, 
+-	0x00, 0x01, 0x3a, 0x80, 0x00, 0x01, 0x3b, 0x80, 
+-	0x00, 0x01, 0x30, 0x08, 0xb5, 0xf0, 0x21, 0x00, 
+-	0x4b, 0x24, 0x18, 0xc4, 0x7a, 0xe7, 0x7a, 0xa2, 
+-	0x25, 0x00, 0x2a, 0x00, 0xd1, 0x03, 0x1c, 0x28, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x22, 0x00, 
+-	0xe0, 0x1e, 0x00, 0x7b, 0x18, 0x1e, 0x4b, 0x1e, 
+-	0x18, 0xf6, 0x23, 0x08, 0x5e, 0xf3, 0x2b, 0x00, 
+-	0xdb, 0x0c, 0x00, 0xbb, 0x18, 0x1e, 0x23, 0x9d, 
+-	0x02, 0x5b, 0x18, 0xf3, 0x68, 0x9b, 0x2b, 0x00, 
+-	0xd0, 0x04, 0x7c, 0x5e, 0x0a, 0x33, 0xd2, 0x01, 
+-	0x21, 0x01, 0xe0, 0x09, 0x37, 0x01, 0xd5, 0x04, 
+-	0x42, 0x7f, 0x06, 0xff, 0x0e, 0xff, 0x42, 0x7f, 
+-	0xe0, 0x01, 0x06, 0xff, 0x0e, 0xff, 0x32, 0x01, 
+-	0x2a, 0x20, 0xda, 0x01, 0x29, 0x00, 0xd0, 0xdc, 
+-	0x29, 0x00, 0xd1, 0x04, 0x72, 0xe5, 0x1c, 0x28, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x72, 0xe7, 
+-	0x1c, 0x39, 0xf7, 0xff, 0xff, 0x57, 0x1c, 0x78, 
+-	0xd5, 0x04, 0x42, 0x40, 0x06, 0xc0, 0x0e, 0xc0, 
+-	0x42, 0x40, 0xe0, 0x01, 0x06, 0xc0, 0x0e, 0xc0, 
+-	0x72, 0xe0, 0x20, 0x01, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x00, 0x01, 0x3b, 0x80, 
+-	0x00, 0x01, 0x3b, 0x40, 0xb5, 0xb0, 0x78, 0x0b, 
+-	0x1c, 0x14, 0x1c, 0x05, 0x1c, 0x0f, 0xa1, 0x0c, 
+-	0x48, 0x0c, 0xf0, 0x10, 0xf8, 0xd1, 0x78, 0x3a, 
+-	0xb4, 0x04, 0x22, 0x01, 0x1c, 0x28, 0x1c, 0x39, 
+-	0x1c, 0x23, 0xf7, 0xff, 0xfd, 0x86, 0xb0, 0x01, 
+-	0x28, 0x00, 0xda, 0x04, 0x20, 0x00, 0x43, 0xc0, 
+-	0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 0x20, 0x00, 
+-	0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x63, 0x69, 0x3a, 0x00, 0x2e, 0x00, 0x85, 0xcc, 
+-	0xb5, 0xf0, 0x1c, 0x07, 0x4b, 0x2a, 0x18, 0xc4, 
+-	0x7a, 0x65, 0x7a, 0x20, 0x28, 0x00, 0xd1, 0x02, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x20, 0x00, 
+-	0x43, 0xc1, 0xe0, 0x09, 0x35, 0x01, 0xd5, 0x04, 
+-	0x42, 0x6d, 0x06, 0xed, 0x0e, 0xed, 0x42, 0x6d, 
+-	0xe0, 0x01, 0x06, 0xed, 0x0e, 0xed, 0x30, 0x01, 
+-	0x28, 0x20, 0xda, 0x07, 0x00, 0x6a, 0x19, 0xd2, 
+-	0x4b, 0x1e, 0x18, 0xd2, 0x23, 0x08, 0x5e, 0xd2, 
+-	0x42, 0x8a, 0xd0, 0xeb, 0x00, 0xa8, 0x19, 0xc0, 
+-	0x4b, 0x1b, 0x18, 0xc1, 0x68, 0x89, 0x29, 0x00, 
+-	0xd0, 0x10, 0x72, 0x65, 0x4b, 0x19, 0x18, 0xc6, 
+-	0x68, 0xb1, 0x69, 0x48, 0x68, 0x3a, 0x43, 0x50, 
+-	0x7c, 0x09, 0x18, 0x0a, 0x23, 0x01, 0x04, 0x1b, 
+-	0x42, 0x9a, 0xdd, 0x08, 0x20, 0x00, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x20, 0x00, 0x72, 0x60, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x18, 0x38, 
+-	0x69, 0x22, 0x69, 0x63, 0x30, 0x08, 0xf0, 0x0f, 
+-	0xff, 0x4d, 0x22, 0x00, 0x68, 0xb1, 0x1c, 0x38, 
+-	0xf7, 0xff, 0xfd, 0xfd, 0x1c, 0x68, 0xd5, 0x04, 
+-	0x42, 0x40, 0x06, 0xc0, 0x0e, 0xc0, 0x42, 0x40, 
+-	0xe0, 0x01, 0x06, 0xc0, 0x0e, 0xc0, 0x72, 0x60, 
+-	0x20, 0x01, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x00, 0x01, 0x3b, 0x80, 0x00, 0x01, 0x3b, 0x00, 
+-	0x00, 0x01, 0x39, 0x00, 0x00, 0x01, 0x39, 0x80, 
+-	0xb5, 0xff, 0xb0, 0x8b, 0x9a, 0x0d, 0x1c, 0x1c, 
+-	0x1c, 0x0f, 0x2a, 0x02, 0xda, 0x06, 0x20, 0x00, 
+-	0x43, 0xc0, 0xb0, 0x0b, 0xb0, 0x04, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x78, 0x79, 0x91, 0x04, 
+-	0x31, 0x02, 0x78, 0x3b, 0x1c, 0x0d, 0x42, 0x83, 
+-	0xd0, 0x07, 0x1c, 0x19, 0x1c, 0x02, 0xa0, 0xf9, 
+-	0xf0, 0x10, 0xf8, 0x3e, 0x42, 0x68, 0xb0, 0x0b, 
+-	0xe7, 0xec, 0x9a, 0x0d, 0x42, 0x91, 0xdd, 0x02, 
+-	0x42, 0x68, 0xb0, 0x0b, 0xe7, 0xe6, 0x1d, 0x39, 
+-	0x91, 0x0a, 0x1d, 0xe2, 0x32, 0x59, 0x92, 0x09, 
+-	0x1d, 0xe6, 0x36, 0x39, 0x28, 0x1d, 0xd0, 0x63, 
+-	0xdc, 0x08, 0x28, 0x15, 0xd0, 0x13, 0x28, 0x1a, 
+-	0xd0, 0x5f, 0x28, 0x1b, 0xd0, 0x5e, 0x28, 0x1c, 
+-	0xd0, 0x5a, 0xe0, 0x7a, 0x28, 0x20, 0xd0, 0x41, 
+-	0x1c, 0xbe, 0x28, 0xc0, 0xd0, 0x74, 0x28, 0xc1, 
+-	0xd1, 0x73, 0x98, 0x14, 0x28, 0x1b, 0xd0, 0x71, 
+-	0x42, 0x68, 0xb0, 0x0b, 0xe7, 0xc6, 0x78, 0xb8, 
+-	0x28, 0x05, 0xd0, 0x02, 0x42, 0x68, 0xb0, 0x0b, 
+-	0xe7, 0xc0, 0x78, 0xf8, 0x28, 0x00, 0xd0, 0x02, 
+-	0x42, 0x68, 0xb0, 0x0b, 0xe7, 0xba, 0x98, 0x04, 
+-	0x1e, 0x82, 0x2a, 0x4f, 0xda, 0x04, 0x99, 0x0a, 
+-	0x1c, 0x20, 0xf0, 0x0f, 0xff, 0x33, 0xe0, 0x04, 
+-	0x22, 0x4f, 0x99, 0x0a, 0x1c, 0x20, 0xf0, 0x0f, 
+-	0xff, 0x2d, 0x78, 0xfa, 0x78, 0xb9, 0x9c, 0x0a, 
+-	0xa0, 0xe0, 0x1c, 0x23, 0xf0, 0x0f, 0xff, 0xf4, 
+-	0x98, 0x04, 0x18, 0x38, 0x1c, 0x47, 0x42, 0xa7, 
+-	0xd9, 0x0c, 0x1c, 0x20, 0xf0, 0x0f, 0xff, 0x62, 
+-	0x19, 0x00, 0x1c, 0x44, 0x42, 0xa7, 0xd9, 0x03, 
+-	0x1c, 0x21, 0xa0, 0xdd, 0xf0, 0x0f, 0xff, 0xe4, 
+-	0x42, 0xa7, 0xd8, 0xf2, 0xa0, 0xd4, 0xf0, 0x0f, 
+-	0xff, 0xdf, 0xe0, 0xe3, 0x98, 0x04, 0x28, 0x04, 
+-	0xd0, 0x02, 0x42, 0x68, 0xb0, 0x0b, 0xe7, 0x89, 
+-	0x78, 0xf8, 0x02, 0x00, 0x78, 0xb9, 0x43, 0x08, 
+-	0x82, 0x30, 0x79, 0x78, 0x02, 0x00, 0x79, 0x39, 
+-	0x43, 0x08, 0x82, 0x70, 0x8a, 0x72, 0x8a, 0x31, 
+-	0xa0, 0xd1, 0xf0, 0x0f, 0xff, 0xc9, 0xe0, 0xcd, 
+-	0xe2, 0x17, 0xe0, 0x00, 0xe0, 0x62, 0x78, 0xb8, 
+-	0x07, 0x80, 0x0f, 0x80, 0x30, 0x01, 0x75, 0x30, 
+-	0x78, 0xb8, 0x08, 0x80, 0x07, 0x00, 0x0f, 0x00, 
+-	0x30, 0x01, 0x75, 0x70, 0x78, 0xf8, 0x9a, 0x09, 
+-	0x73, 0x10, 0x20, 0x00, 0x65, 0xa0, 0x7d, 0x31, 
+-	0x29, 0x00, 0xdd, 0x0e, 0x18, 0x39, 0x79, 0x09, 
+-	0x00, 0xc2, 0x40, 0x91, 0x6d, 0xa2, 0x43, 0x11, 
+-	0x65, 0xa1, 0x7d, 0x31, 0x30, 0x01, 0xe0, 0x02, 
+-	0xe1, 0x02, 0xe1, 0xf9, 0xe1, 0x4b, 0x42, 0x81, 
+-	0xdc, 0xf0, 0x7d, 0x30, 0x30, 0x04, 0x90, 0x03, 
+-	0x7d, 0x72, 0x18, 0x39, 0x1d, 0xe0, 0x30, 0x55, 
+-	0xf0, 0x0f, 0xfe, 0xcc, 0x7d, 0x70, 0x99, 0x03, 
+-	0x18, 0x40, 0x90, 0x03, 0x6d, 0xa1, 0xa0, 0xbc, 
+-	0xf0, 0x0f, 0xff, 0x92, 0x7d, 0x70, 0x28, 0x00, 
+-	0xd0, 0x17, 0xa0, 0xbf, 0xf0, 0x0f, 0xff, 0x8c, 
+-	0x21, 0x00, 0x91, 0x02, 0x7d, 0x70, 0x28, 0x00, 
+-	0xdd, 0x0c, 0x99, 0x02, 0x18, 0x60, 0x30, 0x40, 
+-	0x7f, 0x01, 0xa0, 0xbc, 0xf0, 0x0f, 0xff, 0x80, 
+-	0x99, 0x02, 0x31, 0x01, 0x91, 0x02, 0x7d, 0x70, 
+-	0x42, 0x88, 0xdc, 0xf2, 0xa0, 0xb9, 0xf0, 0x0f, 
+-	0xff, 0x77, 0x9a, 0x09, 0x7b, 0x11, 0xa0, 0xb8, 
+-	0xf0, 0x0f, 0xff, 0x72, 0x22, 0x1a, 0xb4, 0x04, 
+-	0x98, 0x04, 0x9a, 0x0e, 0x1a, 0x12, 0x18, 0x39, 
+-	0x20, 0xc0, 0x1c, 0x23, 0xf7, 0xff, 0xff, 0x10, 
+-	0xb0, 0x01, 0x28, 0x00, 0xda, 0x6a, 0x42, 0x68, 
+-	0xb0, 0x0b, 0xe7, 0x13, 0x78, 0xb8, 0x06, 0x86, 
+-	0x0e, 0xb6, 0x1c, 0x31, 0xa0, 0xb1, 0xf0, 0x0f, 
+-	0xff, 0x5b, 0x9a, 0x09, 0x7b, 0x10, 0x42, 0xb0, 
+-	0xd1, 0x01, 0x22, 0x01, 0x67, 0x62, 0x78, 0xb8, 
+-	0x23, 0xc0, 0x40, 0x18, 0x28, 0xc0, 0xd0, 0x02, 
+-	0x1c, 0x28, 0xb0, 0x0b, 0xe6, 0xfe, 0x2e, 0x00, 
+-	0xd1, 0x02, 0x1c, 0x28, 0xb0, 0x0b, 0xe6, 0xf9, 
+-	0x78, 0xf8, 0x28, 0x04, 0xd0, 0x02, 0x1c, 0x28, 
+-	0xb0, 0x0b, 0xe6, 0xf3, 0x79, 0x38, 0x90, 0x08, 
+-	0x23, 0x0b, 0x40, 0x18, 0x28, 0x09, 0xda, 0x02, 
+-	0x1c, 0x28, 0xb0, 0x0b, 0xe6, 0xea, 0x20, 0x00, 
+-	0x21, 0x00, 0x79, 0x7a, 0x92, 0x07, 0x9a, 0x07, 
+-	0x40, 0xca, 0x08, 0x52, 0xd3, 0x05, 0x30, 0x01, 
+-	0x18, 0x3a, 0x79, 0x52, 0x0a, 0x12, 0xd3, 0x00, 
+-	0x30, 0x01, 0x31, 0x01, 0x29, 0x08, 0xdb, 0xf2, 
+-	0x1c, 0x41, 0x98, 0x08, 0x08, 0xc0, 0xd3, 0x22, 
+-	0x20, 0x00, 0x18, 0x7a, 0x79, 0x52, 0x92, 0x06, 
+-	0x07, 0x92, 0xd0, 0x0a, 0x19, 0xca, 0x79, 0x92, 
+-	0x0a, 0x12, 0xd3, 0x05, 0x30, 0x01, 0x18, 0x0a, 
+-	0x19, 0xd2, 0x79, 0x92, 0x0a, 0x12, 0xd2, 0xf9, 
+-	0x30, 0x01, 0x9a, 0x06, 0x08, 0x92, 0x07, 0x52, 
+-	0xd0, 0x0b, 0x18, 0x0a, 0x19, 0xd2, 0x79, 0x92, 
+-	0x0a, 0x12, 0xd3, 0x05, 0x30, 0x01, 0x18, 0x0a, 
+-	0x19, 0xd2, 0x79, 0x92, 0x0a, 0x12, 0xd2, 0xf9, 
+-	0x30, 0x01, 0x18, 0x08, 0x1c, 0x41, 0x18, 0x78, 
+-	0x79, 0x40, 0x28, 0x22, 0xd0, 0x03, 0x1c, 0x28, 
+-	0xb0, 0x0b, 0xe6, 0xab, 0xe1, 0x49, 0x1c, 0x48, 
+-	0x99, 0x08, 0x09, 0x49, 0xd3, 0x05, 0x18, 0x39, 
+-	0x79, 0x49, 0x09, 0x49, 0xd3, 0x00, 0x30, 0x02, 
+-	0x30, 0x01, 0x99, 0x08, 0x09, 0x49, 0x07, 0x49, 
+-	0xd0, 0x1b, 0x22, 0x00, 0x92, 0x01, 0x92, 0x00, 
+-	0x18, 0x39, 0x79, 0x49, 0x91, 0x05, 0x08, 0xc9, 
+-	0x07, 0x89, 0x0f, 0x89, 0xd0, 0x03, 0x22, 0x01, 
+-	0x39, 0x01, 0x40, 0x8a, 0x92, 0x01, 0x99, 0x05, 
+-	0x09, 0x49, 0x07, 0x89, 0x0f, 0x89, 0xd0, 0x03, 
+-	0x22, 0x01, 0x39, 0x01, 0x40, 0x8a, 0x92, 0x00, 
+-	0x99, 0x00, 0x9a, 0x01, 0x18, 0x51, 0x18, 0x08, 
+-	0x30, 0x01, 0x1d, 0x41, 0x91, 0x03, 0x22, 0x1b, 
+-	0xb4, 0x04, 0x99, 0x04, 0x9a, 0x0e, 0x1a, 0x52, 
+-	0x18, 0x79, 0x20, 0xc0, 0x1c, 0x23, 0xf7, 0xff, 
+-	0xfe, 0x6b, 0xb0, 0x01, 0x28, 0x00, 0xda, 0x02, 
+-	0x42, 0x68, 0xb0, 0x0b, 0xe6, 0x6e, 0x99, 0x03, 
+-	0x18, 0x08, 0x22, 0x1b, 0xb4, 0x04, 0x9a, 0x0e, 
+-	0x1a, 0x12, 0x18, 0x39, 0x20, 0xc1, 0x1c, 0x23, 
+-	0xf7, 0xff, 0xfe, 0x5a, 0xb0, 0x01, 0x28, 0x00, 
+-	0xda, 0x02, 0x42, 0x68, 0xb0, 0x0b, 0xe6, 0x5d, 
+-	0x9a, 0x09, 0x74, 0x96, 0x9a, 0x09, 0x7c, 0x91, 
+-	0xa0, 0x5d, 0xf0, 0x0f, 0xfe, 0xa5, 0xe0, 0xf4, 
+-	0x98, 0x14, 0x28, 0x1a, 0xd1, 0x2f, 0x98, 0x04, 
+-	0x28, 0x0e, 0xd0, 0x02, 0x42, 0x68, 0xb0, 0x0b, 
+-	0xe6, 0x4c, 0x78, 0xb8, 0x28, 0x41, 0xd1, 0x02, 
+-	0x78, 0xf8, 0x28, 0x02, 0xd0, 0x02, 0x42, 0x68, 
+-	0xb0, 0x0b, 0xe6, 0x43, 0xa0, 0x5a, 0xf0, 0x0f, 
+-	0xfe, 0x05, 0x99, 0x0a, 0x1c, 0x02, 0xa0, 0x58, 
+-	0xf0, 0x0f, 0xfe, 0xba, 0x28, 0x00, 0xd0, 0x02, 
+-	0x42, 0x68, 0xb0, 0x0b, 0xe6, 0x36, 0xa0, 0x54, 
+-	0xf0, 0x0f, 0xfd, 0xf8, 0x19, 0xc0, 0x1d, 0x01, 
+-	0x1d, 0xe0, 0x30, 0x66, 0x22, 0x04, 0x1c, 0x07, 
+-	0xf0, 0x0f, 0xfe, 0x2c, 0x20, 0x00, 0x9a, 0x09, 
+-	0x74, 0x50, 0x1c, 0x3a, 0xa1, 0x4c, 0xa0, 0x4f, 
+-	0xf0, 0x0f, 0xfe, 0x72, 0xe0, 0xc1, 0x98, 0x14, 
+-	0x28, 0x1b, 0xd1, 0x11, 0xa0, 0x4f, 0xf0, 0x0f, 
+-	0xfd, 0xe1, 0x1c, 0x31, 0x1c, 0x02, 0xa0, 0x4d, 
+-	0xf0, 0x0f, 0xfe, 0x96, 0x28, 0x00, 0xd0, 0x02, 
+-	0x42, 0x68, 0xb0, 0x0b, 0xe6, 0x12, 0xa1, 0x49, 
+-	0xa0, 0x4b, 0xf0, 0x0f, 0xfe, 0x5d, 0xe0, 0xac, 
+-	0x42, 0x68, 0xb0, 0x0b, 0xe6, 0x0a, 0xa0, 0x4c, 
+-	0xf0, 0x0f, 0xfd, 0xcc, 0x1c, 0x31, 0x1c, 0x02, 
+-	0xa0, 0x49, 0xf0, 0x0f, 0xfe, 0x81, 0x28, 0x00, 
+-	0xe0, 0x96, 0x00, 0x00, 0x74, 0x75, 0x70, 0x6c, 
+-	0x65, 0x20, 0x70, 0x61, 0x72, 0x73, 0x65, 0x20, 
+-	0x65, 0x72, 0x72, 0x6f, 0x72, 0x3a, 0x20, 0x74, 
+-	0x75, 0x70, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0x30, 
+-	0x78, 0x25, 0x30, 0x32, 0x78, 0x20, 0x6e, 0x6f, 
+-	0x74, 0x20, 0x30, 0x78, 0x25, 0x30, 0x32, 0x78, 
+-	0x0a, 0x00, 0x00, 0x00, 0x76, 0x65, 0x72, 0x73, 
+-	0x5f, 0x31, 0x3a, 0x20, 0x25, 0x64, 0x2e, 0x25, 
+-	0x64, 0x2c, 0x20, 0x25, 0x73, 0x00, 0x00, 0x00, 
+-	0x2c, 0x20, 0x25, 0x73, 0x00, 0x00, 0x00, 0x00, 
+-	0x6d, 0x61, 0x6e, 0x66, 0x69, 0x64, 0x3a, 0x20, 
+-	0x30, 0x78, 0x25, 0x30, 0x34, 0x78, 0x20, 0x20, 
+-	0x30, 0x78, 0x25, 0x30, 0x34, 0x78, 0x0a, 0x00, 
+-	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x20, 0x62, 
+-	0x61, 0x73, 0x65, 0x3a, 0x20, 0x30, 0x78, 0x25, 
+-	0x30, 0x34, 0x78, 0x20, 0x00, 0x00, 0x00, 0x00, 
+-	0x6d, 0x61, 0x73, 0x6b, 0x3a, 0x20, 0x30, 0x78, 
+-	0x00, 0x00, 0x00, 0x00, 0x25, 0x30, 0x32, 0x78, 
+-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
+-	0x6c, 0x61, 0x73, 0x74, 0x5f, 0x69, 0x6e, 0x64, 
+-	0x65, 0x78, 0x3a, 0x20, 0x30, 0x78, 0x25, 0x30, 
+-	0x32, 0x78, 0x0a, 0x00, 0x63, 0x6f, 0x6e, 0x66, 
+-	0x69, 0x67, 0x20, 0x74, 0x61, 0x62, 0x6c, 0x65, 
+-	0x20, 0x6e, 0x62, 0x3a, 0x20, 0x30, 0x78, 0x25, 
+-	0x30, 0x32, 0x78, 0x0a, 0x00, 0x00, 0x00, 0x00, 
+-	0x63, 0x66, 0x67, 0x20, 0x74, 0x61, 0x62, 0x6c, 
+-	0x65, 0x20, 0x63, 0x6f, 0x72, 0x20, 0x76, 0x61, 
+-	0x6c, 0x75, 0x65, 0x3a, 0x20, 0x30, 0x78, 0x25, 
+-	0x30, 0x32, 0x78, 0x20, 0x0a, 0x00, 0x00, 0x00, 
+-	0x44, 0x56, 0x42, 0x5f, 0x43, 0x49, 0x5f, 0x56, 
+-	0x00, 0x00, 0x00, 0x00, 0x76, 0x65, 0x72, 0x73, 
+-	0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x25, 0x73, 0x25, 
+-	0x73, 0x0a, 0x00, 0x00, 0x44, 0x56, 0x42, 0x5f, 
+-	0x48, 0x4f, 0x53, 0x54, 0x00, 0x00, 0x00, 0x00, 
+-	0x73, 0x74, 0x63, 0x65, 0x5f, 0x65, 0x76, 0x3a, 
+-	0x20, 0x25, 0x73, 0x0a, 0x00, 0x00, 0x00, 0x00, 
+-	0x44, 0x56, 0x42, 0x5f, 0x43, 0x49, 0x5f, 0x4d, 
+-	0x4f, 0x44, 0x55, 0x4c, 0x45, 0x00, 0x00, 0x00, 
+-	0xd0, 0x02, 0x42, 0x68, 0xb0, 0x0b, 0xe5, 0x65, 
+-	0x46, 0x79, 0x39, 0x1c, 0xa0, 0x04, 0xf0, 0x0f, 
+-	0xfd, 0xaf, 0x1c, 0x28, 0xb0, 0x0b, 0xe5, 0x5d, 
+-	0x1c, 0x28, 0xb0, 0x0b, 0xe5, 0x5a, 0x00, 0x00, 
+-	0x73, 0x74, 0x63, 0x65, 0x5f, 0x70, 0x64, 0x3a, 
+-	0x20, 0x25, 0x73, 0x0a, 0x00, 0x00, 0x00, 0x00, 
+-	0xb5, 0xf0, 0x26, 0x00, 0x1c, 0x04, 0x20, 0x00, 
+-	0x67, 0x60, 0x1c, 0x0d, 0x1c, 0x17, 0xe0, 0x00, 
+-	0x36, 0x01, 0x42, 0xbe, 0xda, 0x02, 0x5d, 0xa8, 
+-	0x28, 0x1d, 0xd1, 0xf9, 0x22, 0x00, 0xb4, 0x04, 
+-	0x1b, 0xba, 0x19, 0xa9, 0x20, 0x1d, 0x1c, 0x23, 
+-	0xf7, 0xff, 0xfd, 0x32, 0xb0, 0x01, 0x28, 0x00, 
+-	0xda, 0x04, 0x20, 0x00, 0x43, 0xc0, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x18, 0x36, 0x22, 0x00, 
+-	0xb4, 0x04, 0x1b, 0xba, 0x19, 0xa9, 0x20, 0x1c, 
+-	0x1c, 0x23, 0xf7, 0xff, 0xfd, 0x21, 0xb0, 0x01, 
+-	0x28, 0x00, 0xda, 0x04, 0x20, 0x00, 0x43, 0xc0, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x18, 0x36, 
+-	0x22, 0x00, 0xb4, 0x04, 0x1b, 0xba, 0x19, 0xa9, 
+-	0x20, 0x15, 0x1c, 0x23, 0xf7, 0xff, 0xfd, 0x10, 
+-	0xb0, 0x01, 0x28, 0x00, 0xda, 0x04, 0x20, 0x00, 
+-	0x43, 0xc0, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x18, 0x36, 0x22, 0x00, 0xb4, 0x04, 0x1b, 0xba, 
+-	0x19, 0xa9, 0x20, 0x20, 0x1c, 0x23, 0xf7, 0xff, 
+-	0xfc, 0xff, 0xb0, 0x01, 0x28, 0x00, 0xda, 0x04, 
+-	0x20, 0x00, 0x43, 0xc0, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x18, 0x36, 0x22, 0x00, 0xb4, 0x04, 
+-	0x1b, 0xba, 0x19, 0xa9, 0x20, 0x1a, 0x1c, 0x23, 
+-	0xf7, 0xff, 0xfc, 0xee, 0xb0, 0x01, 0x28, 0x00, 
+-	0xda, 0x04, 0x20, 0x00, 0x43, 0xc0, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x18, 0x36, 0xe0, 0x10, 
+-	0x22, 0x00, 0xb4, 0x04, 0x1b, 0xba, 0x19, 0xa9, 
+-	0x20, 0x1b, 0x1c, 0x23, 0xf7, 0xff, 0xfc, 0xdc, 
+-	0xb0, 0x01, 0x28, 0x00, 0xda, 0x04, 0x20, 0x00, 
+-	0x43, 0xc0, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x18, 0x36, 0x42, 0xbe, 0xda, 0x02, 0x6f, 0x60, 
+-	0x28, 0x00, 0xd0, 0xe9, 0x22, 0x00, 0xb4, 0x04, 
+-	0x1b, 0xba, 0x19, 0xa9, 0x20, 0x14, 0x1c, 0x23, 
+-	0xf7, 0xff, 0xfc, 0xc6, 0xb0, 0x01, 0x28, 0x00, 
+-	0xda, 0x04, 0x20, 0x00, 0x43, 0xc0, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x20, 0x00, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0xb5, 0xf7, 0x06, 0x0e, 
+-	0x0e, 0x36, 0xb0, 0x83, 0xf0, 0x0c, 0xfc, 0x40, 
+-	0x1c, 0x05, 0xd0, 0x05, 0x00, 0xa8, 0x30, 0x0c, 
+-	0xf7, 0xfc, 0xfc, 0x2c, 0x1c, 0x04, 0xd1, 0x01, 
+-	0x20, 0x00, 0xe0, 0x22, 0x95, 0x01, 0x1d, 0xe0, 
+-	0x30, 0x05, 0x90, 0x02, 0x46, 0x6a, 0xb4, 0x04, 
+-	0x25, 0x00, 0x98, 0x04, 0x1c, 0x31, 0xaa, 0x02, 
+-	0x1c, 0x2b, 0x1c, 0x27, 0xf0, 0x0c, 0xf9, 0xe6, 
+-	0xb0, 0x01, 0x98, 0x00, 0x60, 0x38, 0x28, 0x00, 
+-	0xd0, 0x0b, 0x99, 0x05, 0xf0, 0x0c, 0xfb, 0xbc, 
+-	0x28, 0x00, 0xd1, 0x02, 0x60, 0x7d, 0x1c, 0x38, 
+-	0xe0, 0x07, 0x68, 0x38, 0xa9, 0x01, 0xf0, 0x0c, 
+-	0xfa, 0x05, 0x1c, 0x20, 0xf7, 0xfc, 0xfc, 0x28, 
+-	0x1c, 0x28, 0xb0, 0x03, 0xb0, 0x03, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0xb5, 0xff, 0x9c, 0x0b, 
+-	0x9e, 0x09, 0xb0, 0x8b, 0x4a, 0x7c, 0x92, 0x0a, 
+-	0x4d, 0x7c, 0x2c, 0x00, 0xd1, 0x0b, 0x20, 0x00, 
+-	0x00, 0x81, 0x9a, 0x0a, 0x58, 0x51, 0x29, 0x00, 
+-	0xd1, 0x01, 0x1c, 0x04, 0xe0, 0x16, 0x30, 0x01, 
+-	0x28, 0x08, 0xdb, 0xf5, 0xe0, 0x12, 0x2c, 0x08, 
+-	0xd8, 0x07, 0x3c, 0x01, 0x00, 0xa0, 0x9a, 0x0a, 
+-	0x58, 0x10, 0x28, 0x00, 0xd0, 0x0a, 0x20, 0x00, 
+-	0xe0, 0xd8, 0x23, 0x20, 0x5e, 0xec, 0x1c, 0x60, 
+-	0x84, 0x28, 0x5e, 0xe8, 0x28, 0x00, 0xd1, 0x01, 
+-	0x20, 0x64, 0x84, 0x28, 0x98, 0x15, 0x28, 0x00, 
+-	0xd0, 0x03, 0x28, 0x01, 0xd1, 0x03, 0x22, 0x01, 
+-	0xe0, 0x02, 0x22, 0x00, 0xe0, 0x00, 0x22, 0x03, 
+-	0x92, 0x01, 0x1c, 0x30, 0xf0, 0x08, 0xfd, 0xf5, 
+-	0x90, 0x00, 0x00, 0x80, 0x30, 0x80, 0xf7, 0xfc, 
+-	0xfb, 0xc5, 0x1c, 0x07, 0xd0, 0xdf, 0x98, 0x00, 
+-	0x1d, 0xc2, 0x32, 0x79, 0x21, 0x00, 0x1c, 0x38, 
+-	0xf0, 0x0f, 0xfc, 0x2e, 0x98, 0x00, 0x60, 0xf8, 
+-	0x1d, 0xf8, 0x30, 0x79, 0x61, 0x38, 0x98, 0x0d, 
+-	0x86, 0x78, 0x98, 0x0e, 0x86, 0xb8, 0x98, 0x0b, 
+-	0x90, 0x02, 0x99, 0x0c, 0x91, 0x03, 0x9a, 0x0d, 
+-	0x18, 0x80, 0x38, 0x01, 0x90, 0x04, 0x98, 0x0e, 
+-	0x18, 0x08, 0x38, 0x01, 0x90, 0x05, 0xa8, 0x02, 
+-	0x1c, 0x31, 0xf0, 0x08, 0xfd, 0xd5, 0x61, 0x78, 
+-	0x9a, 0x01, 0x2a, 0x00, 0xd0, 0x0e, 0x2a, 0x01, 
+-	0xd1, 0x27, 0x00, 0x80, 0xf7, 0xfc, 0xfb, 0x9a, 
+-	0x61, 0xb8, 0x28, 0x00, 0xd0, 0x04, 0x69, 0x79, 
+-	0x00, 0x8a, 0x21, 0x00, 0xf0, 0x0f, 0xfc, 0x04, 
+-	0x20, 0x01, 0xe0, 0x14, 0x23, 0x28, 0x5e, 0xe8, 
+-	0x1c, 0x41, 0x85, 0x29, 0x28, 0x00, 0xd1, 0x01, 
+-	0xf7, 0xf7, 0xf8, 0x5e, 0x69, 0x78, 0x00, 0x80, 
+-	0xf7, 0xfc, 0xfb, 0xcc, 0x61, 0xb8, 0x28, 0x00, 
+-	0xd0, 0x04, 0x69, 0x79, 0x00, 0x8a, 0x21, 0x00, 
+-	0xf0, 0x0f, 0xfb, 0xee, 0x20, 0x00, 0x86, 0x38, 
+-	0x23, 0x01, 0x03, 0xdb, 0x69, 0xf8, 0x43, 0x18, 
+-	0xe0, 0x10, 0x98, 0x15, 0x61, 0xb8, 0x98, 0x15, 
+-	0x0e, 0x00, 0x06, 0x00, 0x90, 0x15, 0x23, 0x0d, 
+-	0x06, 0x9b, 0x42, 0xd8, 0xd1, 0x01, 0x20, 0x00, 
+-	0xe0, 0x00, 0x20, 0x01, 0x86, 0x38, 0x69, 0xf8, 
+-	0x4b, 0x33, 0x40, 0x18, 0x61, 0xf8, 0x69, 0xb8, 
+-	0x28, 0x00, 0xd1, 0x06, 0x69, 0x78, 0x28, 0x00, 
+-	0xd0, 0x03, 0x1c, 0x38, 0xf7, 0xfc, 0xfb, 0x7c, 
+-	0xe7, 0x75, 0x68, 0xf8, 0x90, 0x06, 0x69, 0x38, 
+-	0x90, 0x07, 0x69, 0x78, 0x90, 0x08, 0x69, 0xb8, 
+-	0x90, 0x09, 0xa8, 0x02, 0x1c, 0x21, 0x1d, 0xfa, 
+-	0x32, 0x01, 0xb4, 0x07, 0x1c, 0x32, 0xb4, 0x04, 
+-	0x20, 0x00, 0x9a, 0x05, 0xa9, 0x0a, 0xab, 0x0c, 
+-	0xf0, 0x03, 0xf8, 0xa0, 0xb0, 0x04, 0x28, 0x00, 
+-	0xd0, 0x03, 0x1c, 0x38, 0xf0, 0x00, 0xf8, 0x5f, 
+-	0xe7, 0x59, 0x2e, 0x00, 0xd0, 0x09, 0x2e, 0x01, 
+-	0xd0, 0x07, 0x2e, 0x02, 0xd0, 0x05, 0x2e, 0x03, 
+-	0xd0, 0x03, 0x23, 0x02, 0x69, 0xf8, 0x43, 0x18, 
+-	0x61, 0xf8, 0x85, 0xfc, 0x2c, 0x08, 0xd2, 0x02, 
+-	0x00, 0xa0, 0x9a, 0x0a, 0x50, 0x17, 0x20, 0x01, 
+-	0x24, 0x00, 0x63, 0xf8, 0x63, 0xbc, 0x85, 0xbe, 
+-	0x21, 0x01, 0x1c, 0x38, 0xf0, 0x00, 0xf9, 0x18, 
+-	0x8c, 0xa8, 0x06, 0x01, 0x0e, 0x09, 0x1c, 0x38, 
+-	0xf0, 0x00, 0xf8, 0xcb, 0x22, 0x00, 0x21, 0x00, 
+-	0x1c, 0x38, 0xf0, 0x00, 0xf8, 0xa0, 0x98, 0x17, 
+-	0x60, 0x38, 0x98, 0x17, 0x28, 0x00, 0xd0, 0x06, 
+-	0x22, 0x00, 0x21, 0x03, 0x1c, 0x23, 0x9c, 0x17, 
+-	0x1c, 0x38, 0xf0, 0x0f, 0xfa, 0xc1, 0x68, 0xb8, 
+-	0x60, 0x78, 0x1c, 0x38, 0xb0, 0x0b, 0xb0, 0x04, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x1a, 0x4c, 0x2e, 0x08, 0x1a, 0x4c, 
+-	0xff, 0xff, 0x7f, 0xff, 0xb5, 0x80, 0x1c, 0x07, 
+-	0xb0, 0x82, 0x28, 0x00, 0xd0, 0x13, 0x68, 0x78, 
+-	0x28, 0x00, 0xd1, 0x10, 0x68, 0xb8, 0x90, 0x00, 
+-	0x1d, 0xf8, 0x30, 0x05, 0x90, 0x01, 0x46, 0x69, 
+-	0x68, 0x38, 0xf0, 0x0c, 0xf8, 0xe7, 0x22, 0x0c, 
+-	0x21, 0x00, 0x1c, 0x38, 0xf0, 0x0f, 0xfb, 0x58, 
+-	0x1c, 0x38, 0xf7, 0xfc, 0xfb, 0x05, 0xb0, 0x02, 
+-	0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 0xb5, 0x90, 
+-	0x1c, 0x07, 0xb0, 0x84, 0x28, 0x00, 0xd1, 0x03, 
+-	0xb0, 0x04, 0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 
+-	0x20, 0x00, 0x23, 0x00, 0x49, 0x22, 0x00, 0x82, 
+-	0x58, 0x8c, 0x42, 0xbc, 0xd1, 0x00, 0x50, 0x8b, 
+-	0x30, 0x01, 0x28, 0x08, 0xdb, 0xf7, 0x21, 0x00, 
+-	0x1c, 0x38, 0xf0, 0x00, 0xf8, 0xc8, 0x68, 0xf8, 
+-	0x90, 0x00, 0x69, 0x38, 0x90, 0x01, 0x69, 0x78, 
+-	0x90, 0x02, 0x69, 0xb8, 0x90, 0x03, 0x46, 0x68, 
+-	0x1d, 0xc2, 0x32, 0x01, 0x46, 0x69, 0x68, 0xb8, 
+-	0xf0, 0x03, 0xfb, 0x24, 0x6a, 0x38, 0x28, 0x00, 
+-	0xd0, 0x03, 0x68, 0x41, 0x39, 0x01, 0x60, 0x41, 
+-	0x30, 0x04, 0x69, 0xf8, 0x0c, 0x00, 0xd3, 0x16, 
+-	0x23, 0x30, 0x5e, 0xf8, 0x28, 0x00, 0xd1, 0x0d, 
+-	0x69, 0xb8, 0xf7, 0xfc, 0xfa, 0xf9, 0x48, 0x0d, 
+-	0x8d, 0x01, 0x39, 0x01, 0x04, 0x09, 0x14, 0x09, 
+-	0x85, 0x01, 0xd1, 0x08, 0x20, 0xff, 0xf7, 0xf6, 
+-	0xff, 0x73, 0xe0, 0x04, 0x28, 0x01, 0xd1, 0x02, 
+-	0x69, 0xb8, 0xf7, 0xfc, 0xfa, 0xb9, 0x22, 0x80, 
+-	0x21, 0x00, 0x1c, 0x38, 0xf0, 0x0f, 0xfb, 0x04, 
+-	0x1c, 0x38, 0xf7, 0xfc, 0xfa, 0xb1, 0xe7, 0xb3, 
+-	0x2e, 0x08, 0x1a, 0x4c, 0x2e, 0x08, 0x1a, 0x4c, 
+-	0x28, 0x00, 0xd0, 0x08, 0x28, 0x01, 0xd0, 0x08, 
+-	0x28, 0x02, 0xd0, 0x08, 0x28, 0x03, 0xd1, 0x08, 
+-	0x20, 0xff, 0x30, 0x01, 0x47, 0x70, 0x20, 0x02, 
+-	0x47, 0x70, 0x20, 0x04, 0x47, 0x70, 0x20, 0x10, 
+-	0x47, 0x70, 0x20, 0x00, 0x47, 0x70, 0xb5, 0x90, 
+-	0x1c, 0x07, 0x06, 0x08, 0x0e, 0x00, 0x06, 0x14, 
+-	0x0e, 0x24, 0x28, 0x00, 0xd0, 0x0a, 0x21, 0x03, 
+-	0x68, 0xb8, 0xf0, 0x04, 0xfc, 0x1f, 0x68, 0xb8, 
+-	0x1c, 0x21, 0xf0, 0x04, 0xfc, 0xc7, 0xbc, 0x90, 
+-	0xbc, 0x08, 0x47, 0x18, 0x21, 0x00, 0x68, 0xb8, 
+-	0xf0, 0x04, 0xfc, 0x14, 0xbc, 0x90, 0xbc, 0x08, 
+-	0x47, 0x18, 0xb5, 0x00, 0x06, 0x09, 0xd0, 0x02, 
+-	0x68, 0x80, 0x21, 0x02, 0xe0, 0x01, 0x68, 0x80, 
+-	0x21, 0x00, 0xf0, 0x04, 0xfc, 0x07, 0xbc, 0x08, 
+-	0x47, 0x18, 0xb5, 0x00, 0x06, 0x09, 0x0e, 0x09, 
+-	0x28, 0x00, 0xd0, 0x02, 0x68, 0x80, 0xf0, 0x04, 
+-	0xfe, 0x0d, 0xbc, 0x08, 0x47, 0x18, 0xb5, 0xb0, 
+-	0x23, 0x05, 0x43, 0x18, 0x4d, 0x08, 0x84, 0xa8, 
+-	0x27, 0x00, 0x4c, 0x08, 0x00, 0xb8, 0x58, 0x20, 
+-	0x8c, 0xa9, 0x06, 0x09, 0x0e, 0x09, 0xf7, 0xff, 
+-	0xff, 0xe8, 0x37, 0x01, 0x2f, 0x08, 0xdb, 0xf5, 
+-	0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x1a, 0x4c, 0x2e, 0x08, 0x1a, 0x4c, 
+-	0x48, 0x01, 0x23, 0x24, 0x5e, 0xc0, 0x47, 0x70, 
+-	0x2e, 0x08, 0x1a, 0x4c, 0xb5, 0x90, 0x1c, 0x04, 
+-	0x1c, 0x0f, 0x28, 0x00, 0xd0, 0x15, 0x6a, 0x20, 
+-	0x28, 0x00, 0xd0, 0x06, 0x42, 0xb8, 0xd0, 0x10, 
+-	0x68, 0x41, 0x39, 0x01, 0x60, 0x41, 0x20, 0x00, 
+-	0x62, 0x20, 0x2f, 0x00, 0xd0, 0x09, 0x68, 0xa0, 
+-	0x68, 0x39, 0xf0, 0x0c, 0xf8, 0x19, 0x28, 0x00, 
+-	0xd1, 0x03, 0x62, 0x27, 0x68, 0x78, 0x30, 0x01, 
+-	0x60, 0x78, 0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 
+-	0xb5, 0x00, 0x06, 0x09, 0xd0, 0x01, 0x21, 0x01, 
+-	0xe0, 0x00, 0x21, 0x00, 0x68, 0x80, 0xf0, 0x04, 
+-	0xfd, 0x0d, 0xbc, 0x08, 0x47, 0x18, 0xb5, 0x90, 
+-	0x1c, 0x07, 0x1c, 0x0c, 0xd0, 0x01, 0x21, 0x01, 
+-	0xe0, 0x00, 0x21, 0x00, 0x68, 0xb8, 0xf0, 0x04, 
+-	0xf8, 0xa5, 0x2c, 0x00, 0xd0, 0x03, 0x23, 0x01, 
+-	0x69, 0xf8, 0x43, 0x18, 0xe0, 0x02, 0x69, 0xf8, 
+-	0x08, 0x40, 0x00, 0x40, 0x61, 0xf8, 0xbc, 0x90, 
+-	0xbc, 0x08, 0x47, 0x18, 0x20, 0x01, 0x21, 0x07, 
+-	0x07, 0x09, 0x63, 0x88, 0x47, 0x70, 0x00, 0x00, 
+-	0xb5, 0x90, 0x9c, 0x03, 0x9f, 0x04, 0xb0, 0x85, 
+-	0x91, 0x00, 0x92, 0x01, 0x93, 0x02, 0x94, 0x03, 
+-	0x97, 0x04, 0x68, 0x80, 0x46, 0x69, 0xf0, 0x0a, 
+-	0xff, 0x69, 0xb0, 0x05, 0xbc, 0x90, 0xbc, 0x08, 
+-	0x47, 0x18, 0xb5, 0xff, 0xb0, 0x86, 0x98, 0x06, 
+-	0x6a, 0x40, 0x68, 0xc3, 0x93, 0x05, 0x98, 0x06, 
+-	0x6b, 0xc0, 0x01, 0x80, 0x06, 0x05, 0x0e, 0x2d, 
+-	0x95, 0x00, 0x68, 0x18, 0x01, 0x00, 0x30, 0x1f, 
+-	0x09, 0x40, 0x01, 0x40, 0x08, 0xc0, 0x90, 0x04, 
+-	0x99, 0x07, 0x68, 0x48, 0x99, 0x04, 0x43, 0x48, 
+-	0x99, 0x07, 0x68, 0x09, 0x08, 0xc9, 0x18, 0x0f, 
+-	0x97, 0x03, 0x21, 0x00, 0x91, 0x02, 0x9b, 0x05, 
+-	0x68, 0x58, 0x28, 0x00, 0xdd, 0x5e, 0x23, 0x32, 
+-	0x98, 0x06, 0x5e, 0xc0, 0x9b, 0x09, 0x43, 0x58, 
+-	0x9a, 0x08, 0x18, 0x81, 0x1c, 0x08, 0xd5, 0x00, 
+-	0x30, 0x03, 0x10, 0x80, 0x29, 0x00, 0xda, 0x04, 
+-	0x42, 0x49, 0x07, 0x89, 0x0f, 0x89, 0x42, 0x49, 
+-	0xe0, 0x01, 0x07, 0x89, 0x0f, 0x89, 0x00, 0x4a, 
+-	0x9d, 0x00, 0x41, 0x15, 0x1c, 0x2b, 0x06, 0x2d, 
+-	0x0e, 0x2d, 0x27, 0xc0, 0x40, 0xd7, 0x06, 0x3a, 
+-	0x0e, 0x12, 0x9b, 0x06, 0x69, 0x9b, 0x18, 0x18, 
+-	0x9b, 0x05, 0x9f, 0x03, 0x19, 0xdb, 0x33, 0x88, 
+-	0x78, 0x1f, 0x33, 0x01, 0x93, 0x01, 0x24, 0x00, 
+-	0x9b, 0x07, 0x68, 0x9b, 0x2b, 0x00, 0xd9, 0x23, 
+-	0x0a, 0x3b, 0xd3, 0x05, 0x78, 0x03, 0x43, 0x93, 
+-	0x70, 0x03, 0x78, 0x03, 0x43, 0x2b, 0x70, 0x03, 
+-	0x31, 0x01, 0x29, 0x03, 0xdd, 0x04, 0x22, 0xc0, 
+-	0x21, 0x00, 0x9d, 0x00, 0x30, 0x01, 0xe0, 0x05, 
+-	0x10, 0x92, 0x06, 0x12, 0x0e, 0x12, 0x10, 0xab, 
+-	0x06, 0x1d, 0x0e, 0x2d, 0x00, 0x7b, 0x06, 0x1f, 
+-	0x0e, 0x3f, 0x34, 0x01, 0x07, 0x63, 0xd1, 0x03, 
+-	0x9b, 0x01, 0x78, 0x1f, 0x33, 0x01, 0x93, 0x01, 
+-	0x9b, 0x07, 0x68, 0x9b, 0x42, 0xa3, 0xd8, 0xdb, 
+-	0x98, 0x04, 0x9f, 0x03, 0x18, 0x3f, 0x97, 0x03, 
+-	0x9b, 0x09, 0x33, 0x01, 0x93, 0x09, 0x99, 0x02, 
+-	0x31, 0x01, 0x91, 0x02, 0x9b, 0x05, 0x68, 0x58, 
+-	0x42, 0x88, 0xdc, 0xa0, 0xb0, 0x06, 0xb0, 0x04, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0xb5, 0xff, 
+-	0xb0, 0x86, 0x98, 0x06, 0x6a, 0x40, 0x68, 0xc3, 
+-	0x93, 0x05, 0x98, 0x06, 0x6b, 0xc0, 0x07, 0x06, 
+-	0x0f, 0x36, 0x96, 0x00, 0x01, 0x30, 0x06, 0x06, 
+-	0x0e, 0x36, 0x96, 0x01, 0x68, 0x18, 0x01, 0x00, 
+-	0x30, 0x1f, 0x09, 0x40, 0x01, 0x40, 0x08, 0xc0, 
+-	0x90, 0x04, 0x68, 0x48, 0x9a, 0x04, 0x43, 0x50, 
+-	0x68, 0x0a, 0x08, 0xd2, 0x18, 0x17, 0x97, 0x03, 
+-	0x22, 0x00, 0x92, 0x02, 0x9b, 0x05, 0x68, 0x58, 
+-	0x28, 0x00, 0xdd, 0x48, 0x23, 0x32, 0x98, 0x06, 
+-	0x5e, 0xc0, 0x9b, 0x09, 0x43, 0x58, 0x9a, 0x08, 
+-	0x18, 0x82, 0x1c, 0x10, 0xd5, 0x00, 0x30, 0x01, 
+-	0x10, 0x40, 0x9b, 0x06, 0x69, 0x9b, 0x18, 0x18, 
+-	0x9b, 0x05, 0x9f, 0x03, 0x19, 0xdb, 0x1d, 0xdd, 
+-	0x35, 0x81, 0x78, 0x2f, 0x24, 0x00, 0x68, 0x8b, 
+-	0x35, 0x01, 0x2b, 0x00, 0xd9, 0x21, 0x0a, 0x3b, 
+-	0xd3, 0x10, 0x08, 0x53, 0xd3, 0x06, 0x78, 0x06, 
+-	0x23, 0xf0, 0x40, 0x33, 0x70, 0x03, 0x78, 0x03, 
+-	0x9e, 0x00, 0xe0, 0x05, 0x78, 0x03, 0x07, 0x1b, 
+-	0x0f, 0x1b, 0x70, 0x03, 0x78, 0x03, 0x9e, 0x01, 
+-	0x43, 0x33, 0x70, 0x03, 0x32, 0x01, 0x08, 0x53, 
+-	0xd2, 0x00, 0x30, 0x01, 0x00, 0x7b, 0x06, 0x1f, 
+-	0x0e, 0x3f, 0x34, 0x01, 0x07, 0x63, 0xd1, 0x01, 
+-	0x78, 0x2f, 0x35, 0x01, 0x68, 0x8b, 0x42, 0xa3, 
+-	0xd8, 0xdd, 0x98, 0x04, 0x9f, 0x03, 0x18, 0x3f, 
+-	0x97, 0x03, 0x9b, 0x09, 0x33, 0x01, 0x93, 0x09, 
+-	0x9a, 0x02, 0x32, 0x01, 0x92, 0x02, 0x9b, 0x05, 
+-	0x68, 0x58, 0x42, 0x90, 0xdc, 0xb6, 0xb0, 0x06, 
+-	0xb0, 0x04, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0xb5, 0xff, 0xb0, 0x83, 0x98, 0x03, 0x6a, 0x40, 
+-	0x68, 0xc4, 0x98, 0x03, 0x6b, 0xc0, 0x06, 0x03, 
+-	0x0e, 0x1b, 0x93, 0x00, 0x68, 0x20, 0x01, 0x00, 
+-	0x30, 0x1f, 0x09, 0x40, 0x01, 0x40, 0x08, 0xc2, 
+-	0x92, 0x02, 0x68, 0x48, 0x43, 0x50, 0x68, 0x0a, 
+-	0x08, 0xd2, 0x18, 0x10, 0x90, 0x01, 0x25, 0x00, 
+-	0x68, 0x60, 0x28, 0x00, 0xdd, 0x35, 0x23, 0x32, 
+-	0x98, 0x03, 0x5e, 0xc0, 0x9b, 0x06, 0x43, 0x58, 
+-	0x9a, 0x05, 0x18, 0x80, 0x9a, 0x03, 0x69, 0x92, 
+-	0x18, 0x17, 0x98, 0x01, 0x18, 0x20, 0x1d, 0xc6, 
+-	0x36, 0x81, 0x78, 0x32, 0x20, 0x00, 0x68, 0x8b, 
+-	0x36, 0x01, 0x2b, 0x00, 0xd9, 0x16, 0x0a, 0x13, 
+-	0xd3, 0x01, 0x9b, 0x00, 0x70, 0x3b, 0x00, 0x52, 
+-	0x06, 0x12, 0x0e, 0x12, 0xd1, 0x09, 0x1d, 0xc2, 
+-	0x32, 0x01, 0x08, 0xd2, 0x00, 0xd2, 0x1a, 0x10, 
+-	0x19, 0xc7, 0x1c, 0x10, 0x78, 0x32, 0x36, 0x01, 
+-	0xe0, 0x01, 0x30, 0x01, 0x37, 0x01, 0x68, 0x8b, 
+-	0x42, 0x83, 0xd8, 0xe8, 0x98, 0x01, 0x9a, 0x02, 
+-	0x18, 0x80, 0x90, 0x01, 0x9b, 0x06, 0x33, 0x01, 
+-	0x93, 0x06, 0x68, 0x60, 0x35, 0x01, 0x42, 0xa8, 
+-	0xdc, 0xc9, 0xb0, 0x03, 0xb0, 0x04, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0xb5, 0xff, 0x23, 0x2c, 
+-	0x1c, 0x07, 0x5e, 0xc0, 0xb0, 0x85, 0x28, 0x01, 
+-	0xd0, 0x0f, 0x28, 0x02, 0xd0, 0x07, 0x28, 0x03, 
+-	0xd1, 0x11, 0xab, 0x06, 0xcb, 0x0e, 0x1c, 0x38, 
+-	0xf7, 0xff, 0xff, 0x9a, 0xe0, 0x5d, 0xab, 0x06, 
+-	0xcb, 0x0e, 0x1c, 0x38, 0xf7, 0xff, 0xff, 0x23, 
+-	0xe0, 0x57, 0xab, 0x06, 0xcb, 0x0e, 0x1c, 0x38, 
+-	0xf7, 0xff, 0xfe, 0x97, 0xe0, 0x51, 0x6a, 0x78, 
+-	0x68, 0xc0, 0x90, 0x04, 0x68, 0x00, 0x01, 0x00, 
+-	0x30, 0x1f, 0x09, 0x40, 0x01, 0x40, 0x08, 0xc0, 
+-	0x90, 0x03, 0x99, 0x06, 0x68, 0x48, 0x99, 0x03, 
+-	0x43, 0x48, 0x99, 0x06, 0x68, 0x09, 0x08, 0xc9, 
+-	0x18, 0x09, 0x91, 0x02, 0x21, 0x00, 0x91, 0x01, 
+-	0x98, 0x04, 0x68, 0x40, 0x28, 0x00, 0xdd, 0x38, 
+-	0x98, 0x04, 0x99, 0x02, 0x9e, 0x07, 0x18, 0x40, 
+-	0x30, 0x88, 0x78, 0x05, 0x30, 0x01, 0x90, 0x00, 
+-	0x24, 0x00, 0x99, 0x06, 0x68, 0x88, 0x28, 0x00, 
+-	0xd9, 0x1d, 0x0a, 0x28, 0xd3, 0x05, 0x68, 0xb8, 
+-	0x6b, 0xfb, 0x9a, 0x08, 0x1c, 0x31, 0xf0, 0x0a, 
+-	0xfb, 0x87, 0x00, 0x68, 0x06, 0x05, 0x0e, 0x2d, 
+-	0xd1, 0x0b, 0x1d, 0xe0, 0x30, 0x01, 0x08, 0xc0, 
+-	0x00, 0xc0, 0x1b, 0x01, 0x19, 0x8e, 0x1c, 0x04, 
+-	0x98, 0x00, 0x78, 0x05, 0x30, 0x01, 0x90, 0x00, 
+-	0xe0, 0x01, 0x34, 0x01, 0x36, 0x01, 0x99, 0x06, 
+-	0x68, 0x88, 0x42, 0xa0, 0xd8, 0xe1, 0x98, 0x03, 
+-	0x99, 0x02, 0x18, 0x09, 0x91, 0x02, 0x9a, 0x08, 
+-	0x32, 0x01, 0x92, 0x08, 0x99, 0x01, 0x31, 0x01, 
+-	0x91, 0x01, 0x98, 0x04, 0x68, 0x40, 0x42, 0x88, 
+-	0xdc, 0xc6, 0xb0, 0x05, 0xb0, 0x04, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0xb5, 0x90, 0x1c, 0x07, 
+-	0x20, 0x00, 0xb0, 0x88, 0xf0, 0x08, 0xfa, 0x35, 
+-	0x90, 0x06, 0x00, 0x80, 0x30, 0x10, 0x00, 0x80, 
+-	0xf7, 0xfc, 0xf8, 0x04, 0x1c, 0x04, 0x20, 0x00, 
+-	0x2c, 0x00, 0xd1, 0x03, 0xb0, 0x08, 0xbc, 0x90, 
+-	0xbc, 0x08, 0x47, 0x18, 0x1d, 0xe1, 0x31, 0x09, 
+-	0x91, 0x07, 0x49, 0x19, 0x68, 0x4b, 0x1c, 0x5a, 
+-	0x60, 0x4a, 0x60, 0x63, 0x60, 0xe7, 0x68, 0x39, 
+-	0x01, 0x09, 0x31, 0x1f, 0x09, 0x49, 0x01, 0x49, 
+-	0x90, 0x00, 0x90, 0x01, 0x1e, 0x48, 0x90, 0x02, 
+-	0x68, 0xe0, 0x68, 0x40, 0x00, 0xc0, 0x38, 0x01, 
+-	0x90, 0x03, 0x46, 0x68, 0x21, 0x00, 0xf0, 0x08, 
+-	0xfa, 0x13, 0x60, 0xa0, 0x68, 0xe0, 0x30, 0x88, 
+-	0x90, 0x05, 0x68, 0xa0, 0x90, 0x04, 0x46, 0x68, 
+-	0x1c, 0x22, 0x68, 0x61, 0xb4, 0x07, 0x22, 0x00, 
+-	0xb4, 0x04, 0x22, 0x01, 0x20, 0x00, 0xa9, 0x0a, 
+-	0xab, 0x08, 0xf0, 0x02, 0xfd, 0x2b, 0xb0, 0x04, 
+-	0x28, 0x00, 0xd0, 0x03, 0x1c, 0x20, 0xf7, 0xfb, 
+-	0xff, 0xeb, 0x24, 0x00, 0x1c, 0x20, 0xe7, 0xc5, 
+-	0x2e, 0x08, 0x1a, 0x78, 0xb5, 0x80, 0x1c, 0x07, 
+-	0xb0, 0x84, 0x28, 0x00, 0xd0, 0x1a, 0x20, 0x00, 
+-	0xf0, 0x08, 0xf9, 0xe7, 0x90, 0x00, 0x1d, 0xf8, 
+-	0x30, 0x09, 0x90, 0x01, 0x68, 0xb8, 0x90, 0x02, 
+-	0x68, 0xf8, 0x30, 0x88, 0x90, 0x03, 0x46, 0x68, 
+-	0x46, 0x69, 0x1d, 0xc2, 0x32, 0x01, 0x68, 0x38, 
+-	0xf0, 0x03, 0xf8, 0x18, 0x22, 0x10, 0x21, 0x00, 
+-	0x1c, 0x38, 0xf0, 0x0f, 0xf8, 0x19, 0x1c, 0x38, 
+-	0xf7, 0xfb, 0xff, 0xc6, 0xb0, 0x04, 0xbc, 0x80, 
+-	0xbc, 0x08, 0x47, 0x18, 0xb5, 0xff, 0x23, 0x32, 
+-	0x1c, 0x07, 0x5e, 0xc0, 0x1c, 0x0c, 0x1c, 0x15, 
+-	0xb0, 0x8a, 0x42, 0x90, 0xdd, 0x63, 0x6a, 0x78, 
+-	0x28, 0x00, 0xd1, 0x0b, 0x4e, 0x38, 0x68, 0x30, 
+-	0x28, 0x00, 0xd1, 0x05, 0x48, 0x37, 0xf7, 0xff, 
+-	0xff, 0x7d, 0x60, 0x30, 0x28, 0x00, 0xd0, 0x61, 
+-	0x68, 0x30, 0x62, 0x78, 0x23, 0x01, 0x6b, 0xb8, 
+-	0x6a, 0x79, 0x42, 0xd8, 0xd1, 0x01, 0x22, 0x01, 
+-	0xe0, 0x00, 0x22, 0x00, 0x92, 0x01, 0x68, 0xc8, 
+-	0x90, 0x00, 0x68, 0x00, 0x90, 0x04, 0x98, 0x00, 
+-	0x68, 0x40, 0x90, 0x03, 0x6b, 0xf8, 0x28, 0x01, 
+-	0xd1, 0x01, 0x90, 0x02, 0xe0, 0x11, 0x20, 0x00, 
+-	0x90, 0x02, 0x9a, 0x01, 0x2a, 0x00, 0xd1, 0x0c, 
+-	0x1c, 0x20, 0xf0, 0x00, 0xf8, 0x57, 0x6b, 0xba, 
+-	0x99, 0x03, 0xb4, 0x06, 0x1c, 0x03, 0x9a, 0x0f, 
+-	0x1c, 0x38, 0x1c, 0x29, 0xf7, 0xff, 0xfd, 0x80, 
+-	0xb0, 0x02, 0x99, 0x03, 0x91, 0x08, 0x20, 0x01, 
+-	0x90, 0x09, 0x78, 0x20, 0x28, 0x00, 0xd0, 0x31, 
+-	0x23, 0x32, 0x5e, 0xf8, 0x42, 0xa8, 0xdd, 0x22, 
+-	0x78, 0x20, 0x99, 0x00, 0xf0, 0x00, 0xf8, 0x34, 
+-	0x90, 0x07, 0x1c, 0x06, 0x78, 0x20, 0x07, 0x00, 
+-	0x0f, 0x00, 0x99, 0x04, 0x43, 0x48, 0x90, 0x05, 
+-	0x78, 0x20, 0x09, 0x00, 0x07, 0x40, 0x0f, 0x40, 
+-	0x99, 0x03, 0x43, 0x48, 0x90, 0x06, 0x98, 0x02, 
+-	0x34, 0x01, 0x28, 0x00, 0xd0, 0x0c, 0x99, 0x0d, 
+-	0x9a, 0x01, 0xb4, 0x06, 0x6a, 0x78, 0x68, 0xb9, 
+-	0x68, 0x00, 0xaa, 0x07, 0x1c, 0x2b, 0xf0, 0x0a, 
+-	0xfd, 0x8b, 0xb0, 0x02, 0xe0, 0x06, 0xe0, 0x09, 
+-	0x9b, 0x0d, 0x1c, 0x38, 0xa9, 0x05, 0x1c, 0x2a, 
+-	0xf7, 0xff, 0xfe, 0xa8, 0x19, 0xad, 0x78, 0x20, 
+-	0x28, 0x00, 0xd1, 0xcd, 0xb0, 0x0a, 0xb0, 0x04, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x1a, 0x78, 0x2e, 0x02, 0xd7, 0x44, 
+-	0x29, 0x00, 0xd1, 0x00, 0x49, 0x02, 0x06, 0x40, 
+-	0x0e, 0x40, 0x18, 0x40, 0x7a, 0x00, 0x47, 0x70, 
+-	0x2e, 0x02, 0xd7, 0x44, 0xb5, 0xb0, 0x1c, 0x04, 
+-	0x1c, 0x0f, 0xd1, 0x08, 0x4f, 0x0c, 0x68, 0x38, 
+-	0x28, 0x00, 0xd1, 0x03, 0x48, 0x0b, 0xf7, 0xff, 
+-	0xfe, 0xf9, 0x60, 0x38, 0x68, 0x3f, 0x25, 0x00, 
+-	0x78, 0x20, 0x28, 0x00, 0xd0, 0x08, 0x78, 0x20, 
+-	0x68, 0xf9, 0x34, 0x01, 0xf7, 0xff, 0xff, 0xe0, 
+-	0x19, 0x45, 0x78, 0x20, 0x28, 0x00, 0xd1, 0xf6, 
+-	0x1c, 0x28, 0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x1a, 0x78, 0x2e, 0x02, 0xd7, 0x44, 
+-	0xb5, 0x80, 0x28, 0x00, 0xd1, 0x08, 0x4f, 0x09, 
+-	0x68, 0x38, 0x28, 0x00, 0xd1, 0x03, 0x48, 0x08, 
+-	0xf7, 0xff, 0xfe, 0xd8, 0x60, 0x38, 0x68, 0x38, 
+-	0x28, 0x00, 0xd1, 0x02, 0xbc, 0x80, 0xbc, 0x08, 
+-	0x47, 0x18, 0x68, 0xc0, 0x68, 0x40, 0xbc, 0x80, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x1a, 0x78, 
+-	0x2e, 0x02, 0xd7, 0x44, 0xb5, 0xf0, 0xb0, 0x83, 
+-	0x4a, 0x18, 0x21, 0x00, 0x20, 0xff, 0x30, 0x01, 
+-	0xf7, 0xff, 0xfa, 0x98, 0x49, 0x16, 0x27, 0x00, 
+-	0x64, 0x08, 0x49, 0x16, 0x91, 0x02, 0x49, 0x16, 
+-	0x91, 0x01, 0x49, 0x16, 0x91, 0x00, 0x4c, 0x16, 
+-	0x01, 0x38, 0x06, 0x01, 0x0e, 0x09, 0x20, 0x10, 
+-	0x1c, 0x22, 0x1c, 0x0d, 0xf7, 0xff, 0xfa, 0x86, 
+-	0x00, 0xbe, 0x99, 0x02, 0x51, 0x88, 0x20, 0x04, 
+-	0x1c, 0x29, 0x1c, 0x22, 0xf7, 0xff, 0xfa, 0x7e, 
+-	0x99, 0x01, 0x51, 0x88, 0x20, 0x02, 0x1c, 0x29, 
+-	0x1c, 0x22, 0xf7, 0xff, 0xfa, 0x77, 0x99, 0x00, 
+-	0x51, 0x88, 0x37, 0x01, 0x2f, 0x08, 0xdb, 0xe3, 
+-	0x20, 0x00, 0xb0, 0x03, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x1a, 0xc0, 
+-	0x2e, 0x08, 0x1c, 0x80, 0x2e, 0x08, 0x55, 0x50, 
+-	0x2e, 0x08, 0x55, 0x70, 0x2e, 0x08, 0x55, 0x90, 
+-	0x2e, 0x08, 0x1a, 0x80, 0xb5, 0x80, 0x48, 0x0c, 
+-	0xf7, 0xff, 0xfe, 0x84, 0x4f, 0x0b, 0x64, 0x78, 
+-	0x48, 0x0b, 0xf7, 0xff, 0xfe, 0x7f, 0x64, 0xb8, 
+-	0x48, 0x0a, 0xf7, 0xff, 0xfe, 0x7b, 0x64, 0xf8, 
+-	0x20, 0x00, 0x22, 0x00, 0x49, 0x08, 0x00, 0x83, 
+-	0x50, 0xca, 0x30, 0x01, 0x28, 0x10, 0xdb, 0xfa, 
+-	0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x02, 0x5e, 0x2c, 0x2e, 0x08, 0x1c, 0x80, 
+-	0x2e, 0x02, 0x94, 0xb8, 0x2e, 0x02, 0xd7, 0x44, 
+-	0x2e, 0x08, 0x55, 0x10, 0xb5, 0x90, 0x04, 0x01, 
+-	0x0c, 0x09, 0x20, 0xff, 0x29, 0x00, 0xd0, 0x0b, 
+-	0x29, 0x0f, 0xdc, 0x09, 0x00, 0x8c, 0x4f, 0x06, 
+-	0x59, 0x39, 0x29, 0x00, 0xd0, 0x04, 0x1c, 0x08, 
+-	0xf7, 0xff, 0xfb, 0x85, 0x20, 0x00, 0x51, 0x38, 
+-	0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x55, 0x10, 0xb5, 0xff, 0x04, 0x05, 
+-	0x0c, 0x2d, 0x04, 0x10, 0x0c, 0x00, 0xb0, 0x82, 
+-	0x90, 0x00, 0x04, 0x18, 0x0c, 0x00, 0x90, 0x01, 
+-	0x2d, 0x00, 0xd0, 0x01, 0x2d, 0x0f, 0xdd, 0x01, 
+-	0x20, 0xff, 0xe0, 0x53, 0x00, 0xaf, 0x4c, 0x2c, 
+-	0x59, 0xe0, 0x28, 0x00, 0xd0, 0x02, 0x1c, 0x28, 
+-	0xf7, 0xff, 0xff, 0xd0, 0x98, 0x00, 0x4a, 0x29, 
+-	0x40, 0x02, 0x92, 0x00, 0x23, 0x2d, 0x01, 0x1b, 
+-	0x42, 0x9a, 0xdd, 0x01, 0x1c, 0x1a, 0x93, 0x00, 
+-	0x23, 0x09, 0x01, 0x9b, 0x98, 0x01, 0x42, 0x98, 
+-	0xdd, 0x01, 0x1c, 0x1a, 0x93, 0x00, 0x2d, 0x08, 
+-	0xda, 0x01, 0x20, 0x00, 0xe0, 0x00, 0x20, 0x01, 
+-	0x22, 0x00, 0x21, 0x00, 0xb4, 0x07, 0x9a, 0x06, 
+-	0xb4, 0x04, 0x20, 0x00, 0x9a, 0x04, 0x9b, 0x05, 
+-	0xf7, 0xff, 0xfa, 0x24, 0x51, 0xe0, 0xb0, 0x04, 
+-	0x1c, 0x01, 0xd0, 0xd1, 0x48, 0x18, 0x6c, 0x82, 
+-	0x62, 0x4a, 0x21, 0x01, 0x59, 0xe2, 0x63, 0xd1, 
+-	0x21, 0x00, 0x43, 0xc9, 0x59, 0xe2, 0x63, 0x91, 
+-	0x99, 0x03, 0x29, 0x08, 0xd2, 0x10, 0xa3, 0x02, 
+-	0x5c, 0x5b, 0x00, 0x5b, 0x44, 0x9f, 0x1c, 0x00, 
+-	0x04, 0x06, 0x08, 0x0b, 0x04, 0x06, 0x08, 0x0b, 
+-	0x48, 0x0e, 0xe0, 0x02, 0x48, 0x0e, 0xe0, 0x00, 
+-	0x48, 0x0e, 0x59, 0xc6, 0xe0, 0x00, 0x6c, 0x06, 
+-	0x59, 0xe0, 0x1c, 0x31, 0xf7, 0xff, 0xfb, 0xd6, 
+-	0x59, 0xe0, 0x68, 0x80, 0x21, 0x07, 0xf0, 0x04, 
+-	0xf9, 0xbd, 0x20, 0x00, 0xb0, 0x02, 0xb0, 0x04, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x55, 0x10, 0x00, 0x00, 0xff, 0xfe, 
+-	0x2e, 0x08, 0x1c, 0x80, 0x2e, 0x08, 0x55, 0x90, 
+-	0x2e, 0x08, 0x55, 0x70, 0x2e, 0x08, 0x55, 0x50, 
+-	0xb5, 0xf0, 0x04, 0x00, 0x0c, 0x00, 0x04, 0x09, 
+-	0x14, 0x09, 0x04, 0x16, 0x14, 0x36, 0xb0, 0x85, 
+-	0x28, 0x07, 0xdc, 0x29, 0x00, 0x84, 0x4f, 0x21, 
+-	0x59, 0x38, 0x28, 0x00, 0xd0, 0x24, 0x08, 0x49, 
+-	0x00, 0x49, 0x04, 0x0d, 0x14, 0x2d, 0x68, 0x80, 
+-	0xa9, 0x01, 0xf0, 0x04, 0xfa, 0x6b, 0x98, 0x01, 
+-	0x19, 0x40, 0x90, 0x01, 0x98, 0x03, 0x19, 0x40, 
+-	0x90, 0x03, 0x98, 0x02, 0x19, 0x80, 0x90, 0x02, 
+-	0x98, 0x04, 0x19, 0x80, 0x90, 0x04, 0x98, 0x01, 
+-	0x49, 0x15, 0x42, 0x88, 0xd8, 0x0c, 0x98, 0x02, 
+-	0x42, 0x88, 0xd8, 0x09, 0x23, 0x2d, 0x01, 0x1b, 
+-	0x98, 0x01, 0x42, 0x98, 0xda, 0x04, 0x23, 0x09, 
+-	0x01, 0x9b, 0x98, 0x02, 0x42, 0x98, 0xdb, 0x01, 
+-	0x20, 0xff, 0xe0, 0x12, 0x59, 0x38, 0x68, 0x80, 
+-	0xa9, 0x01, 0xf0, 0x02, 0xf8, 0x3b, 0x59, 0x38, 
+-	0x68, 0x80, 0x46, 0x69, 0xf0, 0x03, 0xff, 0x0a, 
+-	0x98, 0x00, 0x28, 0x00, 0xd1, 0x04, 0x59, 0x38, 
+-	0x68, 0x80, 0x21, 0x01, 0xf0, 0x03, 0xfc, 0x4e, 
+-	0x20, 0x00, 0xb0, 0x05, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x55, 0x10, 
+-	0x80, 0x00, 0x00, 0x00, 0xb5, 0xf0, 0x04, 0x07, 
+-	0x0c, 0x3f, 0x04, 0x0b, 0x0c, 0x1b, 0x04, 0x16, 
+-	0x0c, 0x36, 0x20, 0xff, 0xb0, 0x85, 0x2f, 0x07, 
+-	0xdc, 0x10, 0x00, 0xbc, 0x4f, 0x1c, 0x59, 0x39, 
+-	0x29, 0x00, 0xd0, 0x0b, 0x08, 0x5a, 0x00, 0x52, 
+-	0x04, 0x15, 0x0c, 0x2d, 0x23, 0x2d, 0x01, 0x1b, 
+-	0x42, 0x9d, 0xda, 0x03, 0x23, 0x09, 0x01, 0x9b, 
+-	0x42, 0x9e, 0xdb, 0x03, 0xb0, 0x05, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x68, 0x88, 0xa9, 0x01, 
+-	0xf0, 0x04, 0xfa, 0x0c, 0x98, 0x03, 0x99, 0x01, 
+-	0x1a, 0x40, 0x90, 0x03, 0x19, 0x40, 0x90, 0x03, 
+-	0x98, 0x04, 0x99, 0x02, 0x1a, 0x40, 0x90, 0x04, 
+-	0x19, 0x80, 0x90, 0x04, 0x95, 0x01, 0x96, 0x02, 
+-	0x59, 0x38, 0x68, 0x80, 0xa9, 0x01, 0xf0, 0x01, 
+-	0xff, 0xed, 0x59, 0x38, 0x68, 0x80, 0x46, 0x69, 
+-	0xf0, 0x03, 0xfe, 0xbc, 0x98, 0x00, 0x28, 0x00, 
+-	0xd1, 0x04, 0x59, 0x38, 0x68, 0x80, 0x21, 0x01, 
+-	0xf0, 0x03, 0xfc, 0x00, 0x20, 0x00, 0xe7, 0xd5, 
+-	0x2e, 0x08, 0x55, 0x10, 0xb5, 0x00, 0x04, 0x00, 
+-	0x0c, 0x00, 0x00, 0x80, 0x49, 0x04, 0x58, 0x08, 
+-	0x28, 0x00, 0xd0, 0x03, 0x68, 0x80, 0x21, 0x00, 
+-	0xf0, 0x03, 0xfb, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x55, 0x10, 0xb5, 0x80, 0x04, 0x01, 
+-	0x0c, 0x09, 0x20, 0xff, 0x29, 0x07, 0xdc, 0x0c, 
+-	0x29, 0x01, 0xdb, 0x0a, 0x00, 0x88, 0x49, 0x06, 
+-	0x58, 0x08, 0x27, 0x00, 0x28, 0x00, 0xd0, 0x03, 
+-	0x68, 0x80, 0x21, 0x01, 0xf0, 0x03, 0xfa, 0x36, 
+-	0x1c, 0x38, 0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x55, 0x10, 0x04, 0x01, 0x0c, 0x09, 
+-	0x20, 0x00, 0x29, 0x0f, 0xdc, 0x06, 0x00, 0x89, 
+-	0x4a, 0x03, 0x58, 0x51, 0x29, 0x00, 0xd0, 0x01, 
+-	0x23, 0x32, 0x5e, 0xc8, 0x47, 0x70, 0x00, 0x00, 
+-	0x2e, 0x08, 0x55, 0x10, 0x04, 0x01, 0x0c, 0x09, 
+-	0x20, 0x00, 0x29, 0x0f, 0xdc, 0x06, 0x00, 0x89, 
+-	0x4a, 0x03, 0x58, 0x51, 0x29, 0x00, 0xd0, 0x01, 
+-	0x23, 0x34, 0x5e, 0xc8, 0x47, 0x70, 0x00, 0x00, 
+-	0x2e, 0x08, 0x55, 0x10, 0xb5, 0xb0, 0x04, 0x03, 
+-	0x0c, 0x1b, 0x04, 0x0a, 0x0c, 0x12, 0x20, 0xff, 
+-	0x2b, 0x07, 0xdc, 0x10, 0x00, 0x9d, 0x4f, 0x09, 
+-	0x59, 0x79, 0x29, 0x00, 0xd0, 0x0b, 0x07, 0x14, 
+-	0x0f, 0x24, 0x68, 0x88, 0x21, 0x03, 0xf0, 0x03, 
+-	0xfe, 0xa5, 0x59, 0x78, 0x68, 0x80, 0x1c, 0x21, 
+-	0xf0, 0x03, 0xff, 0x4c, 0x20, 0x00, 0xbc, 0xb0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x55, 0x10, 
+-	0xb5, 0x00, 0x04, 0x01, 0x0c, 0x09, 0x20, 0xff, 
+-	0x29, 0x07, 0xdc, 0x09, 0x00, 0x89, 0x4a, 0x05, 
+-	0x58, 0x51, 0x29, 0x00, 0xd0, 0x04, 0x68, 0x88, 
+-	0x21, 0x02, 0xf0, 0x03, 0xfe, 0x8b, 0x20, 0x00, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x55, 0x10, 
+-	0xb5, 0x00, 0x04, 0x01, 0x0c, 0x09, 0x20, 0xff, 
+-	0x29, 0x07, 0xdc, 0x09, 0x00, 0x89, 0x4a, 0x05, 
+-	0x58, 0x51, 0x29, 0x00, 0xd0, 0x04, 0x68, 0x88, 
+-	0x21, 0x00, 0xf0, 0x03, 0xfe, 0x77, 0x20, 0x00, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x55, 0x10, 
+-	0xb5, 0xf0, 0x04, 0x05, 0x0c, 0x2d, 0x04, 0x09, 
+-	0x0c, 0x09, 0x04, 0x12, 0x0c, 0x12, 0x04, 0x1e, 
+-	0x0c, 0x36, 0x9c, 0x05, 0x9f, 0x06, 0x04, 0x24, 
+-	0x0c, 0x24, 0x04, 0x3f, 0x0c, 0x3f, 0x20, 0xff, 
+-	0xb0, 0x85, 0x2d, 0x0f, 0xdc, 0x04, 0x00, 0xab, 
+-	0x4d, 0x10, 0x58, 0xed, 0x2d, 0x00, 0xd1, 0x03, 
+-	0xb0, 0x05, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x19, 0x88, 0x23, 0x32, 0x5e, 0xeb, 0x42, 0x98, 
+-	0xdd, 0x02, 0x1a, 0x58, 0x04, 0x06, 0x0c, 0x36, 
+-	0x19, 0x10, 0x23, 0x34, 0x5e, 0xeb, 0x42, 0x98, 
+-	0xdd, 0x02, 0x1a, 0x98, 0x04, 0x04, 0x0c, 0x24, 
+-	0x91, 0x00, 0x92, 0x01, 0x96, 0x02, 0x94, 0x03, 
+-	0x97, 0x04, 0x46, 0x69, 0x68, 0xa8, 0xf0, 0x0a, 
+-	0xfa, 0x1d, 0xe7, 0xe1, 0x2e, 0x08, 0x55, 0x10, 
+-	0xb4, 0x80, 0x04, 0x03, 0x0c, 0x1b, 0x20, 0x00, 
+-	0x29, 0x00, 0xdb, 0x0f, 0x2a, 0x00, 0xdb, 0x0d, 
+-	0x00, 0x9b, 0x4f, 0x07, 0x58, 0xff, 0x2f, 0x00, 
+-	0xd0, 0x08, 0x23, 0x32, 0x5e, 0xfb, 0x42, 0x8b, 
+-	0xdd, 0x04, 0x23, 0x34, 0x5e, 0xf9, 0x42, 0x91, 
+-	0xdd, 0x00, 0x20, 0x01, 0xbc, 0x80, 0x47, 0x70, 
+-	0x2e, 0x08, 0x55, 0x10, 0xb5, 0xf0, 0x9c, 0x06, 
+-	0x9e, 0x05, 0x04, 0x00, 0x0c, 0x00, 0xb0, 0x85, 
+-	0x90, 0x00, 0x04, 0x08, 0x14, 0x00, 0x04, 0x17, 
+-	0x14, 0x3f, 0x04, 0x1d, 0x14, 0x2d, 0x04, 0x31, 
+-	0x14, 0x09, 0x91, 0x01, 0x04, 0x23, 0x0c, 0x1b, 
+-	0x93, 0x02, 0xb0, 0x82, 0x99, 0x02, 0x00, 0x89, 
+-	0x91, 0x06, 0x4a, 0x71, 0x92, 0x05, 0x58, 0x51, 
+-	0x29, 0x00, 0xd1, 0x01, 0x20, 0xff, 0xe0, 0xd6, 
+-	0x2d, 0x00, 0xda, 0x0e, 0x19, 0x40, 0x04, 0x00, 
+-	0x14, 0x00, 0x42, 0x69, 0x04, 0x0d, 0x14, 0x2d, 
+-	0x99, 0x03, 0x18, 0x79, 0x04, 0x0f, 0x14, 0x3f, 
+-	0x99, 0x03, 0x42, 0x49, 0x04, 0x09, 0x14, 0x09, 
+-	0x91, 0x03, 0x1c, 0x01, 0x1c, 0x04, 0x98, 0x02, 
+-	0x1c, 0x3a, 0xf7, 0xff, 0xff, 0xb1, 0x28, 0x00, 
+-	0xd0, 0x08, 0x98, 0x06, 0x99, 0x05, 0x58, 0x08, 
+-	0x68, 0x80, 0x9b, 0x04, 0x1c, 0x21, 0x1c, 0x3a, 
+-	0xf0, 0x09, 0xff, 0x7a, 0x98, 0x03, 0x10, 0x40, 
+-	0x90, 0x00, 0x10, 0x6e, 0x1c, 0x28, 0xb0, 0x82, 
+-	0xf0, 0x0e, 0xfd, 0x58, 0xf0, 0x0e, 0xfd, 0x94, 
+-	0x90, 0x00, 0x91, 0x01, 0x98, 0x05, 0xf0, 0x0e, 
+-	0xfd, 0x51, 0xf0, 0x0e, 0xfd, 0x8d, 0x9a, 0x00, 
+-	0x9b, 0x01, 0xb0, 0x02, 0xf0, 0x0e, 0xfd, 0x8c, 
+-	0x28, 0x00, 0xd0, 0x4c, 0x98, 0x03, 0x28, 0x00, 
+-	0xdd, 0x21, 0x26, 0x00, 0x2d, 0x00, 0xdd, 0x6d, 
+-	0x98, 0x00, 0x99, 0x03, 0x18, 0x40, 0x90, 0x00, 
+-	0x34, 0x01, 0x42, 0xa8, 0xdb, 0x03, 0x98, 0x00, 
+-	0x1b, 0x40, 0x90, 0x00, 0x37, 0x01, 0x98, 0x02, 
+-	0x1c, 0x21, 0x1c, 0x3a, 0xf7, 0xff, 0xff, 0x78, 
+-	0x28, 0x00, 0xd0, 0x08, 0x98, 0x06, 0x99, 0x05, 
+-	0x58, 0x08, 0x68, 0x80, 0x9b, 0x04, 0x1c, 0x21, 
+-	0x1c, 0x3a, 0xf0, 0x09, 0xff, 0x41, 0x36, 0x01, 
+-	0x42, 0xae, 0xdb, 0xe1, 0xe0, 0x76, 0x98, 0x03, 
+-	0x42, 0x40, 0x04, 0x00, 0x14, 0x00, 0x90, 0x03, 
+-	0x98, 0x00, 0x42, 0x46, 0x20, 0x00, 0x90, 0x01, 
+-	0x2d, 0x00, 0xdd, 0x43, 0x98, 0x03, 0x18, 0x36, 
+-	0x34, 0x01, 0x42, 0xae, 0xdb, 0x01, 0x1b, 0x76, 
+-	0x3f, 0x01, 0x98, 0x02, 0x1c, 0x21, 0x1c, 0x3a, 
+-	0xf7, 0xff, 0xff, 0x52, 0x28, 0x00, 0xd0, 0x08, 
+-	0x98, 0x06, 0x99, 0x05, 0x58, 0x08, 0x68, 0x80, 
+-	0x9b, 0x04, 0x1c, 0x21, 0x1c, 0x3a, 0xf0, 0x09, 
+-	0xff, 0x1b, 0x98, 0x01, 0x30, 0x01, 0x90, 0x01, 
+-	0x42, 0xa8, 0xdb, 0xe3, 0xe0, 0x4e, 0x98, 0x03, 
+-	0x28, 0x00, 0xdd, 0x24, 0x20, 0x00, 0x90, 0x01, 
+-	0x98, 0x03, 0x28, 0x00, 0xdd, 0x1e, 0x19, 0x76, 
+-	0x99, 0x03, 0x37, 0x01, 0x42, 0x8e, 0xdb, 0x02, 
+-	0x98, 0x03, 0x1a, 0x36, 0x34, 0x01, 0x98, 0x02, 
+-	0x1c, 0x21, 0x1c, 0x3a, 0xf7, 0xff, 0xff, 0x2c, 
+-	0x28, 0x00, 0xd0, 0x08, 0x98, 0x06, 0x99, 0x05, 
+-	0x58, 0x08, 0x68, 0x80, 0x9b, 0x04, 0x1c, 0x21, 
+-	0x1c, 0x3a, 0xf0, 0x09, 0xfe, 0xf5, 0x98, 0x01, 
+-	0x30, 0x01, 0x90, 0x01, 0x99, 0x03, 0x42, 0x88, 
+-	0xdb, 0xe1, 0xe0, 0x27, 0xe0, 0x26, 0x98, 0x03, 
+-	0x42, 0x40, 0x04, 0x01, 0x14, 0x09, 0x91, 0x03, 
+-	0x20, 0x00, 0x90, 0x01, 0x29, 0x00, 0xdd, 0x1d, 
+-	0x19, 0x76, 0x99, 0x03, 0x3f, 0x01, 0x42, 0x8e, 
+-	0xdb, 0x02, 0x99, 0x03, 0x1a, 0x76, 0x34, 0x01, 
+-	0x98, 0x02, 0x1c, 0x21, 0x1c, 0x3a, 0xf7, 0xff, 
+-	0xff, 0x03, 0x28, 0x00, 0xd0, 0x08, 0x98, 0x06, 
+-	0x99, 0x05, 0x58, 0x08, 0x68, 0x80, 0x9b, 0x04, 
+-	0x1c, 0x21, 0x1c, 0x3a, 0xf0, 0x09, 0xfe, 0xcc, 
+-	0x98, 0x01, 0x30, 0x01, 0x90, 0x01, 0x99, 0x03, 
+-	0x42, 0x88, 0xdb, 0xe1, 0x20, 0x00, 0xb0, 0x07, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x55, 0x10, 0xb4, 0x80, 0x23, 0x00, 
+-	0x88, 0x01, 0x0a, 0x0a, 0x06, 0x12, 0x0e, 0x12, 
+-	0x06, 0x09, 0x0e, 0x09, 0x2a, 0xdf, 0xd0, 0x1a, 
+-	0xdc, 0x07, 0x2a, 0xc4, 0xd0, 0x19, 0x2a, 0xd6, 
+-	0xd0, 0x1b, 0x2a, 0xdc, 0xd1, 0x08, 0x22, 0x1e, 
+-	0xe0, 0x06, 0x2a, 0xe4, 0xd0, 0x13, 0x2a, 0xf6, 
+-	0xd0, 0x15, 0x2a, 0xfc, 0xd1, 0x00, 0x22, 0x1f, 
+-	0x29, 0xdf, 0xd0, 0x26, 0xdc, 0x11, 0x29, 0xc4, 
+-	0xd0, 0x25, 0x29, 0xd6, 0xd0, 0x27, 0x29, 0xdc, 
+-	0xd1, 0x12, 0x21, 0x1e, 0xe0, 0x10, 0x22, 0x19, 
+-	0xe7, 0xf2, 0x22, 0x1a, 0xe7, 0xf0, 0x22, 0x1b, 
+-	0xe7, 0xee, 0x22, 0x1c, 0xe7, 0xec, 0x22, 0x1d, 
+-	0xe7, 0xea, 0x29, 0xe4, 0xd0, 0x15, 0x29, 0xf6, 
+-	0xd0, 0x17, 0x29, 0xfc, 0xd1, 0x00, 0x21, 0x1f, 
+-	0x02, 0x17, 0x18, 0x7f, 0x80, 0x07, 0x30, 0x02, 
+-	0x2a, 0x00, 0xd0, 0x04, 0x29, 0x00, 0xd0, 0x02, 
+-	0x33, 0x01, 0x2b, 0x70, 0xdb, 0xc0, 0xbc, 0x80, 
+-	0x47, 0x70, 0x21, 0x19, 0xe7, 0xf0, 0x21, 0x1a, 
+-	0xe7, 0xee, 0x21, 0x1b, 0xe7, 0xec, 0x21, 0x1c, 
+-	0xe7, 0xea, 0x21, 0x1d, 0xe7, 0xe8, 0xb5, 0xf0, 
+-	0x1c, 0x0f, 0x1c, 0x11, 0x04, 0x02, 0x0c, 0x12, 
+-	0x04, 0x0c, 0x0c, 0x24, 0x04, 0x1d, 0x0c, 0x2d, 
+-	0x00, 0x96, 0xb0, 0x81, 0x48, 0x10, 0x90, 0x00, 
+-	0x59, 0x81, 0x20, 0xff, 0x29, 0x00, 0xd0, 0x16, 
+-	0x2a, 0x00, 0xd0, 0x14, 0x2a, 0x0f, 0xdc, 0x12, 
+-	0x23, 0x32, 0x5e, 0xca, 0x42, 0xa2, 0xdb, 0x0e, 
+-	0x23, 0x34, 0x5e, 0xc9, 0x42, 0xa9, 0xdb, 0x0a, 
+-	0x1c, 0x38, 0xf7, 0xff, 0xff, 0x93, 0x98, 0x00, 
+-	0x59, 0x80, 0x1c, 0x39, 0x1c, 0x22, 0x1c, 0x2b, 
+-	0xf7, 0xff, 0xfb, 0x5c, 0x20, 0x00, 0xb0, 0x01, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x55, 0x10, 0xb4, 0xb0, 0x04, 0x07, 
+-	0x0c, 0x3f, 0x04, 0x09, 0x0c, 0x09, 0x04, 0x14, 
+-	0x14, 0x24, 0x04, 0x1a, 0x14, 0x12, 0x20, 0xff, 
+-	0x2f, 0x0f, 0xdc, 0x1d, 0x00, 0xbd, 0x4f, 0x0f, 
+-	0x59, 0x7b, 0x2b, 0x00, 0xd0, 0x18, 0x48, 0x0e, 
+-	0x29, 0x01, 0xd0, 0x05, 0x29, 0x02, 0xd0, 0x01, 
+-	0x29, 0x03, 0xd0, 0x03, 0x6c, 0x80, 0xe0, 0x02, 
+-	0x6c, 0x40, 0xe0, 0x00, 0x6c, 0xc0, 0x62, 0x58, 
+-	0x59, 0x78, 0x63, 0xc4, 0x20, 0x00, 0x43, 0xc0, 
+-	0x42, 0x82, 0xd1, 0x02, 0x59, 0x79, 0x63, 0x88, 
+-	0xe0, 0x01, 0x59, 0x78, 0x63, 0x82, 0x20, 0x00, 
+-	0xbc, 0xb0, 0x47, 0x70, 0x2e, 0x08, 0x55, 0x10, 
+-	0x2e, 0x08, 0x1c, 0x80, 0xb5, 0x00, 0x04, 0x00, 
+-	0x0c, 0x00, 0x04, 0x09, 0x0c, 0x09, 0x00, 0x80, 
+-	0x4a, 0x07, 0x58, 0x10, 0x28, 0x00, 0xd1, 0x02, 
+-	0x20, 0xff, 0xbc, 0x08, 0x47, 0x18, 0x07, 0x89, 
+-	0x0f, 0x89, 0x68, 0x80, 0xf0, 0x03, 0xfe, 0x76, 
+-	0x20, 0x00, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x55, 0x10, 0x04, 0x09, 0x0c, 0x09, 
+-	0x4b, 0x0a, 0x40, 0x18, 0x08, 0x4a, 0xd3, 0x01, 
+-	0x23, 0x02, 0x43, 0x18, 0x08, 0x8a, 0xd3, 0x02, 
+-	0x23, 0x01, 0x04, 0x5b, 0x43, 0x18, 0x08, 0xca, 
+-	0xd3, 0x01, 0x23, 0x01, 0x43, 0x18, 0x09, 0x09, 
+-	0xd3, 0x02, 0x23, 0x01, 0x04, 0x1b, 0x43, 0x18, 
+-	0x47, 0x70, 0x00, 0x00, 0xff, 0xfc, 0xff, 0xfc, 
+-	0xb5, 0xf0, 0x04, 0x00, 0x0c, 0x00, 0x04, 0x14, 
+-	0x0c, 0x24, 0x1c, 0x1e, 0x1c, 0x0f, 0x28, 0x07, 
+-	0xdc, 0x25, 0x28, 0x01, 0xdb, 0x23, 0x00, 0x85, 
+-	0x48, 0x12, 0x59, 0x40, 0x28, 0x00, 0xd0, 0x1e, 
+-	0x0e, 0x31, 0x02, 0x30, 0x0a, 0x00, 0xf7, 0xff, 
+-	0xff, 0xd1, 0x1c, 0x06, 0x2f, 0x02, 0xd0, 0x0e, 
+-	0x2f, 0x04, 0xd0, 0x0c, 0x2f, 0x10, 0xd0, 0x0a, 
+-	0x23, 0xff, 0x33, 0x01, 0x42, 0x9f, 0xd1, 0x0e, 
+-	0x06, 0x22, 0x0e, 0x12, 0x1c, 0x31, 0x48, 0x08, 
+-	0x6c, 0x00, 0x68, 0x00, 0xe0, 0x05, 0x07, 0x22, 
+-	0x0f, 0x12, 0x48, 0x06, 0x59, 0x40, 0x68, 0x00, 
+-	0x1c, 0x31, 0xf0, 0x0b, 0xfa, 0xdb, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x55, 0x10, 
+-	0x2e, 0x08, 0x1c, 0x80, 0x2e, 0x08, 0x55, 0x50, 
+-	0xb5, 0xf0, 0x04, 0x04, 0x0c, 0x24, 0x04, 0x10, 
+-	0x0c, 0x00, 0x04, 0x1f, 0x0c, 0x3f, 0x22, 0x00, 
+-	0xb0, 0x81, 0x92, 0x00, 0x2c, 0x07, 0xdc, 0x3a, 
+-	0x2c, 0x01, 0xdb, 0x38, 0x00, 0xa4, 0x4a, 0x1e, 
+-	0x59, 0x12, 0x2a, 0x00, 0xd0, 0x33, 0x29, 0x02, 
+-	0xd0, 0x1b, 0x29, 0x04, 0xd0, 0x19, 0x29, 0x10, 
+-	0xd0, 0x17, 0x23, 0xff, 0x33, 0x01, 0x42, 0x99, 
+-	0xd1, 0x29, 0x06, 0x02, 0x0e, 0x12, 0x46, 0x69, 
+-	0x1c, 0x15, 0x4c, 0x16, 0x6c, 0x20, 0x68, 0x00, 
+-	0xf0, 0x0b, 0xfa, 0xdc, 0x98, 0x00, 0x02, 0x00, 
+-	0x0a, 0x00, 0x1c, 0x39, 0xf7, 0xff, 0xff, 0x82, 
+-	0x90, 0x00, 0x1c, 0x01, 0x6c, 0x20, 0x1c, 0x2a, 
+-	0xe0, 0x12, 0x07, 0x02, 0x0f, 0x12, 0x1c, 0x15, 
+-	0x4e, 0x0d, 0x59, 0x30, 0x68, 0x00, 0x46, 0x69, 
+-	0xf0, 0x0b, 0xfa, 0xc8, 0x98, 0x00, 0x02, 0x00, 
+-	0x0a, 0x00, 0x1c, 0x39, 0xf7, 0xff, 0xff, 0x6e, 
+-	0x90, 0x00, 0x1c, 0x01, 0x59, 0x30, 0x1c, 0x2a, 
+-	0x68, 0x00, 0xf0, 0x0b, 0xfa, 0x8b, 0xb0, 0x01, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x55, 0x10, 0x2e, 0x08, 0x1c, 0x80, 
+-	0x2e, 0x08, 0x55, 0x50, 0xb5, 0xf0, 0x4f, 0x28, 
+-	0x25, 0x00, 0x24, 0xff, 0x69, 0x38, 0x28, 0x00, 
+-	0xd1, 0x01, 0x60, 0xbd, 0xe0, 0x0c, 0x26, 0x05, 
+-	0x68, 0xb9, 0x29, 0x07, 0xd2, 0xf9, 0xa3, 0x02, 
+-	0x5c, 0x5b, 0x00, 0x5b, 0x44, 0x9f, 0x1c, 0x00, 
+-	0x04, 0x08, 0x10, 0x1a, 0x21, 0x30, 0x38, 0x00, 
+-	0x1c, 0x20, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x20, 0x01, 0x02, 0x80, 0xf7, 0xf6, 0xfa, 0x86, 
+-	0x28, 0x00, 0xdb, 0x2d, 0x20, 0x02, 0xe0, 0x25, 
+-	0x48, 0x18, 0xf7, 0xf6, 0xfa, 0xa1, 0x28, 0x00, 
+-	0xdb, 0x26, 0x89, 0xb8, 0x28, 0x00, 0xdd, 0x15, 
+-	0x20, 0x03, 0xe0, 0x1b, 0x89, 0xb8, 0xf7, 0xf6, 
+-	0xfa, 0x75, 0x28, 0x00, 0xdb, 0x1c, 0x20, 0x04, 
+-	0xe0, 0x14, 0xf7, 0xf6, 0xfa, 0x91, 0x28, 0x00, 
+-	0xdb, 0x16, 0x69, 0x39, 0x18, 0x09, 0x61, 0x39, 
+-	0x89, 0xb9, 0x1a, 0x08, 0x81, 0xb8, 0x89, 0xb8, 
+-	0x28, 0x00, 0xdc, 0xe9, 0x60, 0xbe, 0xe0, 0x0b, 
+-	0x20, 0x00, 0xf7, 0xf6, 0xfa, 0x5f, 0x28, 0x00, 
+-	0xd1, 0x06, 0x20, 0x06, 0x60, 0xb8, 0xe0, 0x03, 
+-	0xf7, 0xf6, 0xfa, 0x7a, 0x28, 0x00, 0xda, 0xb8, 
+-	0x1c, 0x28, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x1d, 0x00, 0x2e, 0x08, 0x55, 0xb0, 
+-	0xb5, 0xf0, 0x04, 0x04, 0x0c, 0x24, 0x04, 0x0d, 
+-	0x0c, 0x2d, 0x04, 0x16, 0x0c, 0x36, 0xb0, 0x85, 
+-	0xa8, 0x01, 0x49, 0x2e, 0xc9, 0x8e, 0xc0, 0x8e, 
+-	0x2c, 0x00, 0xd0, 0x07, 0x2c, 0x01, 0xd0, 0x07, 
+-	0x2c, 0x02, 0xd0, 0x07, 0x2c, 0x03, 0xd1, 0x3f, 
+-	0x21, 0x08, 0xe0, 0x04, 0x21, 0x01, 0xe0, 0x02, 
+-	0x21, 0x02, 0xe0, 0x00, 0x21, 0x04, 0x91, 0x00, 
+-	0x23, 0x2d, 0x01, 0x1b, 0x42, 0x9d, 0xdc, 0x33, 
+-	0x23, 0x09, 0x01, 0x9b, 0x42, 0x9e, 0xdc, 0x2f, 
+-	0x1e, 0x68, 0x90, 0x03, 0x1e, 0x70, 0x90, 0x04, 
+-	0xa8, 0x01, 0x1c, 0x21, 0xf0, 0x07, 0xfb, 0xb8, 
+-	0x4f, 0x1d, 0x60, 0x78, 0x00, 0x80, 0x23, 0x01, 
+-	0x04, 0x1b, 0x42, 0x98, 0xdc, 0x20, 0x1f, 0xf8, 
+-	0x38, 0x79, 0x67, 0xc4, 0x68, 0x38, 0x28, 0x00, 
+-	0xd0, 0x0a, 0x68, 0x80, 0xb0, 0x81, 0x46, 0x6b, 
+-	0x22, 0x00, 0x21, 0x00, 0xf0, 0x09, 0xfd, 0x42, 
+-	0x68, 0x38, 0xf7, 0xfe, 0xfe, 0x90, 0xb0, 0x01, 
+-	0x22, 0x00, 0x21, 0x0a, 0x20, 0x01, 0xb4, 0x07, 
+-	0x1c, 0x22, 0xb4, 0x04, 0x21, 0x00, 0x20, 0x00, 
+-	0x1c, 0x2a, 0x1c, 0x33, 0xf7, 0xfe, 0xfd, 0x62, 
+-	0xb0, 0x04, 0x60, 0x38, 0x1c, 0x01, 0xd1, 0x03, 
+-	0xb0, 0x05, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x69, 0x88, 0x99, 0x00, 0x43, 0x4d, 0x1d, 0xe9, 
+-	0xd5, 0x00, 0x31, 0x07, 0x10, 0xc9, 0x43, 0x71, 
+-	0x61, 0x38, 0x60, 0x79, 0x81, 0xb9, 0x20, 0x01, 
+-	0x60, 0xb8, 0xe7, 0xed, 0x2e, 0x03, 0x39, 0x50, 
+-	0x2e, 0x08, 0x1d, 0x00, 0xb5, 0xf0, 0x04, 0x00, 
+-	0x0c, 0x00, 0x04, 0x09, 0x0c, 0x09, 0xb0, 0x87, 
+-	0x91, 0x00, 0x04, 0x11, 0x0c, 0x09, 0x91, 0x01, 
+-	0x04, 0x19, 0x0c, 0x09, 0x91, 0x02, 0xb0, 0x85, 
+-	0x28, 0x07, 0xdc, 0x43, 0x28, 0x01, 0xdb, 0x41, 
+-	0x00, 0x85, 0x48, 0x3e, 0x90, 0x0b, 0x59, 0x41, 
+-	0x29, 0x00, 0xd0, 0x3b, 0x48, 0x3c, 0x90, 0x0a, 
+-	0x68, 0x00, 0x28, 0x00, 0xd0, 0x36, 0x23, 0x2c, 
+-	0x5e, 0xca, 0x2a, 0x0b, 0xd2, 0x32, 0xa3, 0x02, 
+-	0x5c, 0x9b, 0x00, 0x5b, 0x44, 0x9f, 0x1c, 0x00, 
+-	0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 
+-	0x06, 0x06, 0x06, 0x00, 0x22, 0x00, 0x92, 0x00, 
+-	0x92, 0x01, 0x23, 0x32, 0x5e, 0xc3, 0x93, 0x02, 
+-	0x23, 0x34, 0x5e, 0xc0, 0x90, 0x03, 0x92, 0x04, 
+-	0x98, 0x07, 0x08, 0x80, 0xd3, 0x40, 0x23, 0x2c, 
+-	0x5e, 0xc8, 0x28, 0x00, 0xd0, 0x08, 0x28, 0x01, 
+-	0xd0, 0x08, 0x28, 0x02, 0xd0, 0x08, 0x28, 0x03, 
+-	0xd1, 0x10, 0x27, 0xff, 0x37, 0x01, 0xe0, 0x04, 
+-	0x27, 0x02, 0xe0, 0x02, 0x27, 0x04, 0xe0, 0x00, 
+-	0x27, 0x10, 0x4e, 0x24, 0x23, 0xff, 0x33, 0x01, 
+-	0x42, 0x9f, 0xd1, 0x16, 0x24, 0x00, 0x48, 0x22, 
+-	0x90, 0x09, 0xe0, 0x03, 0xb0, 0x0c, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x00, 0xa0, 0x58, 0x31, 
+-	0x29, 0x00, 0xd0, 0x06, 0x06, 0x22, 0x0e, 0x12, 
+-	0x98, 0x09, 0x6c, 0x00, 0x68, 0x00, 0xf0, 0x0b, 
+-	0xf9, 0x5d, 0x34, 0x01, 0x42, 0xbc, 0xdb, 0xf1, 
+-	0xe0, 0x12, 0x24, 0x00, 0x2f, 0x00, 0xdd, 0x0f, 
+-	0x48, 0x16, 0x90, 0x08, 0x00, 0xa0, 0x58, 0x31, 
+-	0x29, 0x00, 0xd0, 0x06, 0x07, 0x22, 0x0f, 0x12, 
+-	0x98, 0x08, 0x59, 0x40, 0x68, 0x00, 0xf0, 0x0b, 
+-	0xf9, 0x49, 0x34, 0x01, 0x42, 0xbc, 0xdb, 0xf1, 
+-	0x98, 0x07, 0x08, 0x40, 0xd3, 0x01, 0x22, 0xff, 
+-	0xe0, 0x00, 0x22, 0x00, 0x99, 0x06, 0xb4, 0x06, 
+-	0x98, 0x0d, 0x59, 0x40, 0x68, 0x81, 0x98, 0x0c, 
+-	0x68, 0x00, 0x68, 0x80, 0x9b, 0x07, 0xaa, 0x02, 
+-	0xf0, 0x09, 0xff, 0x12, 0xb0, 0x0e, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x55, 0x10, 
+-	0x2e, 0x08, 0x1d, 0x00, 0x2e, 0x08, 0x55, 0xb0, 
+-	0x2e, 0x08, 0x1c, 0x80, 0x2e, 0x08, 0x55, 0x50, 
+-	0xb5, 0x80, 0x4f, 0x0a, 0x68, 0x38, 0x28, 0x00, 
+-	0xd0, 0x0c, 0x68, 0x80, 0xb0, 0x81, 0x46, 0x6b, 
+-	0x22, 0x00, 0x21, 0x00, 0xf0, 0x09, 0xfc, 0x72, 
+-	0x68, 0x38, 0xf7, 0xfe, 0xfd, 0xc0, 0x20, 0x00, 
+-	0x60, 0x38, 0xb0, 0x01, 0xbc, 0x80, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x1d, 0x00, 
+-	0xb5, 0x00, 0x04, 0x01, 0x0c, 0x09, 0x20, 0xff, 
+-	0x29, 0x07, 0xdc, 0x09, 0x00, 0x89, 0x4a, 0x05, 
+-	0x58, 0x51, 0x29, 0x00, 0xd0, 0x04, 0x68, 0x88, 
+-	0x21, 0x01, 0xf0, 0x03, 0xfb, 0x93, 0x20, 0x00, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x55, 0x10, 
+-	0xb5, 0x00, 0x04, 0x01, 0x0c, 0x09, 0x20, 0xff, 
+-	0x29, 0x07, 0xdc, 0x09, 0x00, 0x89, 0x4a, 0x05, 
+-	0x58, 0x51, 0x29, 0x00, 0xd0, 0x04, 0x68, 0x88, 
+-	0x21, 0x00, 0xf0, 0x03, 0xfb, 0x7f, 0x20, 0x00, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x55, 0x10, 
+-	0xb5, 0xf7, 0xb0, 0x86, 0x9c, 0x07, 0x20, 0x00, 
+-	0x6e, 0x40, 0x90, 0x05, 0x98, 0x05, 0x30, 0x0c, 
+-	0x90, 0x05, 0x48, 0x7f, 0x90, 0x04, 0x98, 0x04, 
+-	0x30, 0x0c, 0x90, 0x04, 0xf0, 0x11, 0xff, 0xf0, 
+-	0x90, 0x01, 0xf0, 0x11, 0xff, 0xd3, 0x90, 0x00, 
+-	0x20, 0x00, 0x43, 0xc0, 0x49, 0x79, 0x60, 0x08, 
+-	0x20, 0x00, 0x43, 0xc0, 0x49, 0x77, 0x60, 0x88, 
+-	0x20, 0x00, 0x43, 0xc0, 0x49, 0x75, 0x61, 0x08, 
+-	0x98, 0x06, 0x28, 0x00, 0xd0, 0x73, 0x20, 0x00, 
+-	0x6a, 0x40, 0x90, 0x03, 0x68, 0x20, 0x30, 0x05, 
+-	0x99, 0x06, 0x1a, 0x08, 0x90, 0x06, 0x68, 0xe0, 
+-	0x28, 0x00, 0xd0, 0x08, 0x68, 0x60, 0x99, 0x03, 
+-	0x68, 0x09, 0x42, 0x88, 0xd1, 0x01, 0x20, 0x01, 
+-	0xe0, 0x00, 0x20, 0x00, 0xe0, 0x06, 0x68, 0x60, 
+-	0x9a, 0x08, 0x42, 0x90, 0xd1, 0x01, 0x20, 0x01, 
+-	0xe0, 0x00, 0x20, 0x00, 0x28, 0x00, 0xd0, 0x73, 
+-	0x68, 0x27, 0x68, 0xe0, 0x28, 0x00, 0xd0, 0x01, 
+-	0x98, 0x05, 0xe0, 0x00, 0x98, 0x04, 0x1c, 0x06, 
+-	0x68, 0xe0, 0x28, 0x00, 0xd0, 0x02, 0x20, 0x00, 
+-	0x6e, 0x40, 0xe0, 0x00, 0x48, 0x5c, 0x90, 0x02, 
+-	0x1d, 0xe5, 0x35, 0x0d, 0x68, 0xa0, 0x28, 0x08, 
+-	0xd2, 0x5f, 0xa3, 0x02, 0x5c, 0x1b, 0x00, 0x5b, 
+-	0x44, 0x9f, 0x1c, 0x00, 0x04, 0x16, 0x28, 0x3a, 
+-	0x49, 0x55, 0x65, 0x71, 0x69, 0x20, 0x49, 0x55, 
+-	0x60, 0x08, 0xcd, 0x02, 0x48, 0x53, 0x60, 0x41, 
+-	0xcd, 0x02, 0x98, 0x02, 0x60, 0x01, 0x3f, 0x01, 
+-	0x1c, 0x38, 0x3f, 0x01, 0x28, 0x00, 0xd0, 0x02, 
+-	0xcd, 0x02, 0xc6, 0x02, 0xe7, 0xf8, 0xe0, 0x67, 
+-	0x69, 0x20, 0x49, 0x4c, 0x60, 0x88, 0xcd, 0x02, 
+-	0x48, 0x4a, 0x60, 0xc1, 0xcd, 0x02, 0x98, 0x02, 
+-	0x60, 0x41, 0x3f, 0x01, 0x1c, 0x38, 0x3f, 0x01, 
+-	0x28, 0x00, 0xd0, 0x02, 0xcd, 0x02, 0xc6, 0x02, 
+-	0xe7, 0xf8, 0xe0, 0x55, 0x69, 0x20, 0x49, 0x43, 
+-	0x61, 0x08, 0xcd, 0x02, 0x48, 0x41, 0x61, 0x41, 
+-	0xcd, 0x02, 0x98, 0x02, 0x60, 0x81, 0x3f, 0x01, 
+-	0x1c, 0x38, 0x3f, 0x01, 0x28, 0x00, 0xd0, 0x02, 
+-	0xcd, 0x02, 0xc6, 0x02, 0xe7, 0xf8, 0xe0, 0x43, 
+-	0x69, 0x20, 0x00, 0x80, 0xe0, 0x00, 0xe0, 0x4b, 
+-	0x21, 0x00, 0x6a, 0x89, 0x50, 0x0e, 0x1c, 0x38, 
+-	0x3f, 0x01, 0x28, 0x00, 0xd0, 0x02, 0xcd, 0x02, 
+-	0xc6, 0x02, 0xe7, 0xf8, 0xe0, 0x34, 0x69, 0x20, 
+-	0x00, 0x80, 0x49, 0x33, 0x50, 0x0e, 0x1c, 0x38, 
+-	0x3f, 0x01, 0x28, 0x00, 0xd0, 0x02, 0xcd, 0x02, 
+-	0xc6, 0x02, 0xe7, 0xf8, 0xe0, 0x28, 0x69, 0x20, 
+-	0x00, 0x80, 0x21, 0x00, 0x6e, 0x09, 0xe0, 0x01, 
+-	0xe0, 0x28, 0xe0, 0x20, 0x50, 0x0e, 0x1c, 0x38, 
+-	0x3f, 0x01, 0x28, 0x00, 0xd0, 0x02, 0xcd, 0x02, 
+-	0xc6, 0x02, 0xe7, 0xf8, 0xe0, 0x18, 0x69, 0x20, 
+-	0x00, 0x80, 0x49, 0x26, 0x50, 0x0e, 0x1c, 0x38, 
+-	0x3f, 0x01, 0x28, 0x00, 0xd0, 0x02, 0xcd, 0x02, 
+-	0xc6, 0x02, 0xe7, 0xf8, 0xe0, 0x0c, 0x69, 0x20, 
+-	0x90, 0x03, 0x1c, 0x38, 0x3f, 0x01, 0x28, 0x00, 
+-	0xd0, 0x04, 0xcd, 0x02, 0x98, 0x03, 0xc0, 0x02, 
+-	0x90, 0x03, 0xe7, 0xf6, 0xe0, 0x00, 0xe7, 0xff, 
+-	0x68, 0xe0, 0x28, 0xff, 0xd1, 0x01, 0x96, 0x05, 
+-	0xe0, 0x00, 0x96, 0x04, 0x68, 0x20, 0x00, 0x80, 
+-	0x19, 0x00, 0x1d, 0xc4, 0x34, 0x0d, 0xe7, 0x3b, 
+-	0x98, 0x01, 0x28, 0x00, 0xd1, 0x01, 0xf0, 0x11, 
+-	0xff, 0x4f, 0x98, 0x00, 0x28, 0x00, 0xd1, 0x01, 
+-	0xf0, 0x11, 0xff, 0x2e, 0x20, 0x00, 0x6e, 0x80, 
+-	0x68, 0x00, 0x4b, 0x0f, 0x42, 0x98, 0xd0, 0x06, 
+-	0x48, 0x0d, 0x21, 0x00, 0x6e, 0x89, 0x60, 0x08, 
+-	0x20, 0x01, 0x49, 0x08, 0x62, 0x08, 0x20, 0x00, 
+-	0x21, 0x00, 0x6e, 0x89, 0x60, 0x08, 0x20, 0x00, 
+-	0xb0, 0x06, 0xb0, 0x03, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0xb0, 0x06, 0xe7, 0xf9, 0x00, 0x00, 
+-	0x2e, 0x08, 0x59, 0xb0, 0x66, 0x00, 0x00, 0x80, 
+-	0x2e, 0x08, 0x3a, 0xf4, 0x2e, 0x08, 0x1d, 0x14, 
+-	0xda, 0xa5, 0xaa, 0x57, 0xb5, 0x80, 0xb0, 0xa7, 
+-	0x46, 0x68, 0x4f, 0x08, 0x23, 0x13, 0xcf, 0x06, 
+-	0xc0, 0x06, 0x3b, 0x01, 0xd1, 0xfb, 0xcf, 0x04, 
+-	0xc0, 0x04, 0x46, 0x69, 0x4a, 0x04, 0x20, 0x27, 
+-	0xf7, 0xff, 0xfe, 0xde, 0xb0, 0x27, 0xbc, 0x80, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x03, 0x39, 0x60, 
+-	0xf0, 0x24, 0x00, 0x09, 0xb5, 0xff, 0xb0, 0x83, 
+-	0x99, 0x04, 0x04, 0x09, 0x0c, 0x09, 0x91, 0x00, 
+-	0x9a, 0x05, 0x06, 0x16, 0x0e, 0x36, 0x9b, 0x06, 
+-	0x06, 0x18, 0x0e, 0x00, 0x90, 0x01, 0x98, 0x0c, 
+-	0x06, 0x00, 0x0e, 0x00, 0x90, 0x02, 0xb0, 0x84, 
+-	0x25, 0x00, 0x98, 0x07, 0x1d, 0xc2, 0x32, 0x21, 
+-	0x92, 0x00, 0x20, 0xff, 0x30, 0x01, 0x68, 0x00, 
+-	0x49, 0x6b, 0x60, 0x08, 0x98, 0x12, 0x28, 0x01, 
+-	0xd1, 0x73, 0x98, 0x07, 0x28, 0x00, 0xd1, 0x05, 
+-	0x20, 0x63, 0xb0, 0x07, 0xb0, 0x04, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x21, 0x00, 0x91, 0x01, 
+-	0x99, 0x01, 0x23, 0xff, 0x33, 0xe1, 0x42, 0x99, 
+-	0xd3, 0x04, 0xe0, 0x0a, 0x99, 0x01, 0x31, 0x01, 
+-	0x91, 0x01, 0xe7, 0xf5, 0x20, 0x00, 0x99, 0x01, 
+-	0x23, 0x2c, 0x43, 0x59, 0x9a, 0x00, 0x50, 0x50, 
+-	0xe7, 0xf4, 0x98, 0x07, 0x49, 0x5b, 0x68, 0x09, 
+-	0x60, 0x08, 0x98, 0x05, 0x28, 0x10, 0xdb, 0x01, 
+-	0x20, 0x01, 0xe0, 0x00, 0x20, 0x00, 0x99, 0x05, 
+-	0x29, 0x1f, 0xdc, 0x01, 0x21, 0x01, 0xe0, 0x00, 
+-	0x21, 0x00, 0x40, 0x08, 0xd0, 0x04, 0x98, 0x05, 
+-	0x49, 0x53, 0x68, 0x09, 0x60, 0x08, 0xe0, 0x02, 
+-	0x20, 0x62, 0xb0, 0x07, 0xe7, 0xce, 0x20, 0x00, 
+-	0x49, 0x4d, 0x68, 0x09, 0x70, 0x08, 0x1c, 0x30, 
+-	0x23, 0x03, 0x02, 0x5b, 0x22, 0x01, 0x02, 0xd2, 
+-	0x21, 0x01, 0xf0, 0x00, 0xfb, 0x01, 0x1c, 0x07, 
+-	0x2f, 0x00, 0xd0, 0x02, 0x20, 0xa2, 0xb0, 0x07, 
+-	0xe7, 0xbc, 0x22, 0x00, 0xb4, 0x04, 0x99, 0x05, 
+-	0x1c, 0x30, 0x23, 0x04, 0x22, 0x00, 0xf0, 0x00, 
+-	0xf9, 0x2f, 0xb0, 0x01, 0x1c, 0x07, 0x2f, 0x00, 
+-	0xd0, 0x02, 0x20, 0xa2, 0xb0, 0x07, 0xe7, 0xad, 
+-	0x98, 0x06, 0x28, 0x00, 0xdb, 0x04, 0x98, 0x06, 
+-	0x28, 0x3f, 0xdc, 0x01, 0x9d, 0x06, 0xe0, 0x00, 
+-	0x25, 0x1b, 0x98, 0x11, 0x01, 0x80, 0x43, 0x05, 
+-	0x23, 0x80, 0x43, 0x1d, 0x48, 0x39, 0x68, 0x01, 
+-	0x0a, 0x09, 0x02, 0x09, 0x60, 0x01, 0x48, 0x37, 
+-	0x68, 0x01, 0x43, 0x29, 0x60, 0x01, 0xf0, 0x11, 
+-	0xfe, 0x2d, 0x90, 0x03, 0xf0, 0x11, 0xfe, 0x44, 
+-	0xe0, 0x00, 0xe0, 0x13, 0x90, 0x02, 0xf0, 0x11, 
+-	0xfe, 0xa3, 0x1c, 0x04, 0x4b, 0x30, 0x40, 0x1c, 
+-	0x1c, 0x20, 0xf0, 0x11, 0xfe, 0xa1, 0x98, 0x02, 
+-	0x28, 0x40, 0xd0, 0x01, 0xf0, 0x11, 0xfe, 0x6c, 
+-	0x98, 0x03, 0x28, 0x80, 0xd0, 0x01, 0xf0, 0x11, 
+-	0xfe, 0x4b, 0xe0, 0x43, 0x22, 0x00, 0xb4, 0x04, 
+-	0x1c, 0x30, 0x23, 0x04, 0x22, 0x00, 0x49, 0x27, 
+-	0xf0, 0x00, 0xf8, 0xee, 0xb0, 0x01, 0x1c, 0x07, 
+-	0x2f, 0x00, 0xd0, 0x02, 0x20, 0xa2, 0xb0, 0x07, 
+-	0xe7, 0x6c, 0x1c, 0x30, 0x23, 0x03, 0x02, 0x5b, 
+-	0x22, 0x01, 0x02, 0xd2, 0x21, 0x02, 0xf0, 0x00, 
+-	0xfa, 0xa3, 0x1c, 0x07, 0x2f, 0x00, 0xd0, 0x02, 
+-	0x20, 0xa2, 0xb0, 0x07, 0xe7, 0x5e, 0x48, 0x19, 
+-	0x68, 0x01, 0x0a, 0x09, 0x02, 0x09, 0x60, 0x01, 
+-	0x48, 0x16, 0x68, 0x01, 0x23, 0x1b, 0x43, 0x19, 
+-	0x60, 0x01, 0x48, 0x12, 0x68, 0x00, 0x68, 0x00, 
+-	0x90, 0x07, 0xf0, 0x11, 0xfd, 0xe7, 0x90, 0x03, 
+-	0xf0, 0x11, 0xfd, 0xfe, 0x90, 0x02, 0xf0, 0x11, 
+-	0xfe, 0x5f, 0x1c, 0x04, 0x23, 0x01, 0x04, 0x5b, 
+-	0x43, 0x1c, 0x1c, 0x20, 0xf0, 0x11, 0xfe, 0x5c, 
+-	0x98, 0x02, 0x28, 0x40, 0xd0, 0x01, 0xf0, 0x11, 
+-	0xfe, 0x27, 0x98, 0x03, 0x28, 0x80, 0xd0, 0x01, 
+-	0xf0, 0x11, 0xfe, 0x06, 0x1c, 0x38, 0xb0, 0x07, 
+-	0xe7, 0x34, 0xb0, 0x04, 0xb0, 0x03, 0xe7, 0x31, 
+-	0x2e, 0x08, 0x5d, 0xb8, 0x2e, 0x08, 0x5d, 0xb0, 
+-	0x2e, 0x08, 0x5d, 0xb4, 0x68, 0x00, 0x00, 0x38, 
+-	0xff, 0xfd, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 
+-	0xb5, 0x00, 0xf7, 0xff, 0xfe, 0xe7, 0xf0, 0x00, 
+-	0xf8, 0x02, 0xbc, 0x08, 0x47, 0x18, 0xb5, 0xf0, 
+-	0xf0, 0x0b, 0xf9, 0x48, 0x26, 0x00, 0x2e, 0x04, 
+-	0xd3, 0x02, 0xe0, 0x12, 0x36, 0x01, 0xe7, 0xfa, 
+-	0x01, 0x30, 0x4b, 0x3c, 0x18, 0xc7, 0x25, 0x00, 
+-	0x2d, 0x04, 0xd3, 0x02, 0xe0, 0x08, 0x35, 0x01, 
+-	0xe7, 0xfa, 0x20, 0x00, 0x60, 0xb8, 0x20, 0x00, 
+-	0x60, 0xf8, 0x37, 0xff, 0x37, 0x01, 0xe7, 0xf6, 
+-	0xe7, 0xec, 0x4f, 0x35, 0x25, 0x00, 0x2d, 0x04, 
+-	0xd3, 0x02, 0xe0, 0x07, 0x35, 0x01, 0xe7, 0xfa, 
+-	0x20, 0x00, 0x60, 0xb8, 0x20, 0x00, 0x60, 0xf8, 
+-	0x37, 0x10, 0xe7, 0xf7, 0x20, 0x00, 0x49, 0x2f, 
+-	0x68, 0x09, 0x70, 0x08, 0x24, 0x00, 0x2c, 0x20, 
+-	0xd3, 0x02, 0xe0, 0x1f, 0x34, 0x01, 0xe7, 0xfa, 
+-	0x21, 0x00, 0x00, 0xe0, 0x4a, 0x2a, 0x68, 0x12, 
+-	0x50, 0x11, 0x20, 0x00, 0x00, 0xe1, 0x4a, 0x28, 
+-	0x68, 0x12, 0x18, 0x89, 0x60, 0x48, 0x21, 0x00, 
+-	0x00, 0xe0, 0x4a, 0x26, 0x68, 0x12, 0x18, 0x80, 
+-	0x60, 0x41, 0x20, 0x00, 0x00, 0xa1, 0x4a, 0x24, 
+-	0x68, 0x12, 0x50, 0x50, 0x20, 0x00, 0x00, 0xe1, 
+-	0x1b, 0x09, 0x00, 0x89, 0x4a, 0x21, 0x68, 0x12, 
+-	0x52, 0x50, 0xe7, 0xdf, 0x20, 0x00, 0x21, 0x19, 
+-	0x06, 0x89, 0x62, 0x48, 0x48, 0x1e, 0x21, 0x19, 
+-	0x06, 0x89, 0x62, 0x48, 0x20, 0x00, 0x49, 0x1d, 
+-	0x68, 0x09, 0x60, 0x08, 0x20, 0x00, 0x49, 0x1b, 
+-	0x68, 0x09, 0x60, 0x48, 0x20, 0x00, 0x49, 0x19, 
+-	0x68, 0x09, 0x60, 0xc8, 0x20, 0x00, 0x49, 0x17, 
+-	0x68, 0x09, 0x61, 0x08, 0x20, 0x00, 0x49, 0x15, 
+-	0x68, 0x09, 0x61, 0x48, 0x20, 0x00, 0x49, 0x13, 
+-	0x68, 0x09, 0x61, 0x88, 0x20, 0x00, 0x49, 0x12, 
+-	0x68, 0x09, 0x60, 0x08, 0x20, 0x00, 0x49, 0x10, 
+-	0x68, 0x09, 0x60, 0x48, 0x20, 0x00, 0x49, 0x0e, 
+-	0x68, 0x09, 0x60, 0x88, 0x48, 0x0d, 0x68, 0x01, 
+-	0x23, 0x01, 0x43, 0x19, 0x60, 0x01, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x9e, 0x00, 0x00, 0xc0, 
+-	0x9e, 0x00, 0x09, 0x80, 0x2e, 0x08, 0x5d, 0xbc, 
+-	0x2e, 0x08, 0x5d, 0xd0, 0x2e, 0x08, 0x5d, 0xd4, 
+-	0x2e, 0x08, 0x5d, 0xcc, 0x2e, 0x08, 0x5d, 0xc4, 
+-	0x00, 0x40, 0x00, 0x03, 0x2e, 0x08, 0x5e, 0x0c, 
+-	0x2e, 0x08, 0x5e, 0x10, 0x6a, 0x00, 0x00, 0x10, 
+-	0xb5, 0xff, 0xb0, 0x83, 0x98, 0x03, 0x06, 0x04, 
+-	0x0e, 0x24, 0x99, 0x04, 0x04, 0x08, 0x0c, 0x00, 
+-	0x90, 0x00, 0x9a, 0x05, 0x06, 0x10, 0x0e, 0x00, 
+-	0x90, 0x01, 0x9b, 0x06, 0x06, 0x18, 0x0e, 0x00, 
+-	0x90, 0x02, 0xb0, 0x81, 0x00, 0xe0, 0x49, 0xc1, 
+-	0x68, 0x09, 0x18, 0x47, 0x00, 0xa0, 0x49, 0xc0, 
+-	0x68, 0x09, 0x18, 0x45, 0x00, 0xe0, 0x1b, 0x00, 
+-	0x00, 0x80, 0x49, 0xbe, 0x68, 0x09, 0x18, 0x46, 
+-	0x2c, 0x20, 0xdb, 0x05, 0x20, 0xa2, 0xb0, 0x04, 
+-	0xb0, 0x04, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x68, 0x28, 0x4b, 0xb9, 0x40, 0x18, 0x60, 0x28, 
+-	0x68, 0x38, 0x4b, 0xb8, 0x40, 0x18, 0x60, 0x38, 
+-	0x68, 0x38, 0x23, 0x40, 0x40, 0x18, 0xd0, 0x17, 
+-	0x68, 0x38, 0x23, 0x40, 0x43, 0xdb, 0x40, 0x18, 
+-	0x60, 0x38, 0x48, 0xb3, 0x68, 0x01, 0x08, 0x49, 
+-	0x00, 0x49, 0x60, 0x01, 0x48, 0xb1, 0x68, 0x01, 
+-	0x23, 0x01, 0x05, 0x5b, 0x43, 0x19, 0x60, 0x01, 
+-	0x98, 0x01, 0x4b, 0xaf, 0x42, 0x98, 0xd1, 0x03, 
+-	0x20, 0x00, 0x49, 0xae, 0x68, 0x09, 0x60, 0x08, 
+-	0x98, 0x01, 0x4b, 0xab, 0x42, 0x98, 0xd0, 0x73, 
+-	0x68, 0x38, 0x23, 0x21, 0x43, 0xdb, 0x40, 0x18, 
+-	0x60, 0x38, 0x68, 0x28, 0x23, 0x07, 0x03, 0x5b, 
+-	0x40, 0x18, 0x60, 0x28, 0x98, 0x01, 0x4b, 0xa6, 
+-	0x40, 0x18, 0x68, 0x29, 0x43, 0x08, 0x60, 0x28, 
+-	0x20, 0x00, 0x75, 0x30, 0x98, 0x02, 0x07, 0x80, 
+-	0x0f, 0x80, 0x28, 0x01, 0xd1, 0x04, 0x88, 0x30, 
+-	0x23, 0x10, 0x43, 0x18, 0x80, 0x30, 0xe0, 0x04, 
+-	0x88, 0x30, 0x23, 0x10, 0x43, 0xdb, 0x40, 0x18, 
+-	0x80, 0x30, 0x98, 0x02, 0x23, 0x80, 0x40, 0x18, 
+-	0x28, 0x80, 0xd1, 0x08, 0x68, 0x38, 0x23, 0x40, 
+-	0x43, 0x18, 0x60, 0x38, 0x20, 0xff, 0x49, 0x97, 
+-	0x68, 0x09, 0x70, 0x08, 0xe0, 0x04, 0x68, 0x38, 
+-	0x23, 0x40, 0x43, 0xdb, 0x40, 0x18, 0x60, 0x38, 
+-	0x98, 0x03, 0x28, 0x01, 0xd1, 0x36, 0x88, 0x30, 
+-	0x23, 0x10, 0x43, 0xdb, 0x40, 0x18, 0x80, 0x30, 
+-	0x20, 0x33, 0x06, 0x40, 0x6d, 0x40, 0x23, 0x0d, 
+-	0x06, 0x9b, 0x1a, 0xc1, 0x00, 0xe0, 0x4a, 0x8c, 
+-	0x68, 0x12, 0x18, 0x80, 0x60, 0x41, 0x20, 0x01, 
+-	0x70, 0xb0, 0x68, 0x38, 0x23, 0x01, 0x03, 0x9b, 
+-	0x43, 0x18, 0x60, 0x38, 0x68, 0x38, 0x4b, 0x87, 
+-	0x43, 0x18, 0x60, 0x38, 0x48, 0x86, 0x70, 0x44, 
+-	0x20, 0x00, 0x49, 0x86, 0x68, 0x09, 0x60, 0x08, 
+-	0x20, 0x01, 0x02, 0xc0, 0x49, 0x84, 0x61, 0x48, 
+-	0x49, 0x83, 0x61, 0x08, 0x20, 0x01, 0x49, 0x83, 
+-	0x64, 0x48, 0x20, 0x00, 0x49, 0x81, 0x64, 0x48, 
+-	0x68, 0x28, 0x23, 0x01, 0x03, 0x5b, 0x43, 0x18, 
+-	0x60, 0x28, 0x20, 0x00, 0x49, 0x7e, 0x68, 0x09, 
+-	0x60, 0x08, 0xe0, 0x9a, 0x98, 0x03, 0x28, 0x02, 
+-	0xd1, 0x30, 0x20, 0x33, 0x06, 0x40, 0xe0, 0x00, 
+-	0xe0, 0x94, 0x6d, 0xc0, 0x23, 0x0d, 0x06, 0x9b, 
+-	0x1a, 0xc0, 0x00, 0xe1, 0x4a, 0x70, 0x68, 0x12, 
+-	0x18, 0x89, 0x60, 0x48, 0x20, 0x02, 0x70, 0xb0, 
+-	0x68, 0x38, 0x23, 0x01, 0x03, 0xdb, 0x43, 0x18, 
+-	0x60, 0x38, 0x68, 0x38, 0x4b, 0x6b, 0x43, 0x18, 
+-	0x60, 0x38, 0x48, 0x6b, 0x70, 0x84, 0x20, 0x00, 
+-	0x49, 0x6e, 0x60, 0x08, 0x00, 0xe0, 0x49, 0x5b, 
+-	0x68, 0x09, 0x58, 0x08, 0x23, 0xff, 0x33, 0x01, 
+-	0x43, 0x18, 0x00, 0xe1, 0x4a, 0x57, 0x68, 0x12, 
+-	0x50, 0x50, 0x20, 0x4b, 0x49, 0x67, 0x60, 0x08, 
+-	0x68, 0x28, 0x23, 0x01, 0x03, 0x5b, 0x43, 0x18, 
+-	0x60, 0x28, 0xe0, 0x66, 0x98, 0x03, 0x28, 0x04, 
+-	0xd1, 0x15, 0x20, 0x00, 0x00, 0xe1, 0x4a, 0x5a, 
+-	0x68, 0x12, 0x18, 0x89, 0x60, 0x48, 0x98, 0x03, 
+-	0x70, 0xb0, 0x68, 0x38, 0x23, 0x20, 0x43, 0x18, 
+-	0x60, 0x38, 0x68, 0x38, 0x60, 0x38, 0x48, 0x56, 
+-	0x70, 0x04, 0x68, 0x28, 0x23, 0x01, 0x03, 0x5b, 
+-	0x43, 0x18, 0x60, 0x28, 0xe0, 0x4d, 0x98, 0x03, 
+-	0x23, 0x10, 0x40, 0x18, 0xd0, 0x0f, 0x21, 0x00, 
+-	0x00, 0xe0, 0x4a, 0x4d, 0x68, 0x12, 0x18, 0x80, 
+-	0x60, 0x41, 0x68, 0x38, 0x4b, 0x52, 0x43, 0x18, 
+-	0x60, 0x38, 0x68, 0x38, 0x60, 0x38, 0x37, 0x04, 
+-	0x20, 0x0e, 0x60, 0x38, 0xe0, 0x39, 0x98, 0x03, 
+-	0x28, 0x08, 0xd1, 0x23, 0x48, 0x4d, 0x68, 0x00, 
+-	0x30, 0x60, 0x7e, 0x80, 0x28, 0x00, 0xd0, 0x03, 
+-	0x20, 0x4f, 0xb0, 0x04, 0xe6, 0xf8, 0xe0, 0x67, 
+-	0x20, 0x01, 0x49, 0x48, 0x68, 0x09, 0x31, 0x60, 
+-	0x76, 0x88, 0x48, 0x46, 0x68, 0x00, 0x30, 0x60, 
+-	0x76, 0x04, 0x20, 0x01, 0x49, 0x43, 0x68, 0x09, 
+-	0x31, 0x80, 0x70, 0xc8, 0x49, 0x42, 0x00, 0xe0, 
+-	0x4a, 0x37, 0x68, 0x12, 0x18, 0x80, 0x60, 0x41, 
+-	0x68, 0x28, 0x23, 0x01, 0x03, 0x5b, 0x43, 0x18, 
+-	0x60, 0x28, 0xe0, 0x12, 0x21, 0x00, 0x00, 0xe0, 
+-	0x4a, 0x31, 0x68, 0x12, 0x18, 0x80, 0x60, 0x41, 
+-	0x98, 0x03, 0x70, 0xb0, 0x68, 0x38, 0x23, 0x20, 
+-	0x43, 0x18, 0x60, 0x38, 0x68, 0x38, 0x60, 0x38, 
+-	0x68, 0x28, 0x23, 0x01, 0x03, 0x5b, 0x43, 0x18, 
+-	0x60, 0x28, 0xe0, 0x33, 0x98, 0x03, 0x23, 0x10, 
+-	0x40, 0x18, 0xd0, 0x09, 0x1c, 0x20, 0xf0, 0x05, 
+-	0xf8, 0x0f, 0x90, 0x00, 0x28, 0x00, 0xd0, 0x02, 
+-	0x98, 0x00, 0xb0, 0x04, 0xe6, 0xbc, 0xe0, 0x1a, 
+-	0x98, 0x03, 0x28, 0x01, 0xd1, 0x03, 0x20, 0xff, 
+-	0x49, 0x21, 0x70, 0x48, 0xe0, 0x13, 0x98, 0x03, 
+-	0x28, 0x02, 0xd1, 0x03, 0x20, 0xff, 0x49, 0x1e, 
+-	0x70, 0x88, 0xe0, 0x0c, 0x98, 0x03, 0x28, 0x08, 
+-	0xd1, 0x09, 0x20, 0x00, 0x49, 0x21, 0x68, 0x09, 
+-	0x31, 0x80, 0x70, 0xc8, 0x20, 0x00, 0x49, 0x1f, 
+-	0x68, 0x09, 0x31, 0x60, 0x76, 0x88, 0x7d, 0x30, 
+-	0x07, 0xc0, 0x0f, 0xc0, 0x28, 0x01, 0xd1, 0x03, 
+-	0x1c, 0x20, 0x49, 0x1c, 0xf0, 0x00, 0xf9, 0x16, 
+-	0x20, 0x00, 0x70, 0xb0, 0x20, 0x00, 0xb0, 0x04, 
+-	0xe6, 0x92, 0xb0, 0x01, 0xb0, 0x03, 0xe6, 0x8f, 
+-	0xe6, 0x8e, 0x00, 0x00, 0x2e, 0x08, 0x5d, 0xd0, 
+-	0x2e, 0x08, 0x5d, 0xcc, 0x2e, 0x08, 0x5d, 0xc4, 
+-	0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0x3f, 0xff, 
+-	0x6a, 0x00, 0x00, 0x18, 0x6c, 0x00, 0x00, 0x20, 
+-	0x00, 0x00, 0xff, 0xff, 0x2e, 0x08, 0x5d, 0xd8, 
+-	0xff, 0xff, 0x1f, 0xff, 0x2e, 0x08, 0x5e, 0x2c, 
+-	0x2e, 0x08, 0x5d, 0xd4, 0x00, 0x00, 0x20, 0x01, 
+-	0x2e, 0x08, 0x5e, 0x30, 0x2e, 0x08, 0x5d, 0xfc, 
+-	0xcc, 0x00, 0x0f, 0x00, 0x66, 0x00, 0x00, 0x80, 
+-	0x2e, 0x08, 0x5e, 0x40, 0x2e, 0x08, 0x5e, 0x44, 
+-	0x00, 0x00, 0x20, 0xa0, 0x2e, 0x08, 0x7c, 0x44, 
+-	0x66, 0x00, 0x01, 0xf0, 0xff, 0xff, 0x00, 0x00, 
+-	0xb5, 0xff, 0x98, 0x00, 0x06, 0x01, 0x0e, 0x09, 
+-	0x98, 0x01, 0x06, 0x02, 0x0e, 0x12, 0x98, 0x02, 
+-	0x04, 0x07, 0x0c, 0x3f, 0x9b, 0x03, 0x04, 0x1c, 
+-	0x0c, 0x24, 0x29, 0x20, 0xdb, 0x04, 0x20, 0xa2, 
+-	0xb0, 0x04, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2a, 0x02, 0xd1, 0x0a, 0x00, 0xc8, 0x4b, 0x1f, 
+-	0x68, 0x1b, 0x58, 0x18, 0x4b, 0x1e, 0x40, 0x18, 
+-	0x00, 0xcb, 0x4d, 0x1c, 0x68, 0x2d, 0x50, 0xe8, 
+-	0xe0, 0x30, 0x2a, 0x01, 0xd1, 0x0b, 0x00, 0xc8, 
+-	0x4b, 0x18, 0x68, 0x1b, 0x58, 0x18, 0x43, 0x27, 
+-	0x1c, 0x3b, 0x43, 0x18, 0x00, 0xcb, 0x4d, 0x15, 
+-	0x68, 0x2d, 0x50, 0xe8, 0xe0, 0x22, 0x20, 0x00, 
+-	0x28, 0x20, 0xdb, 0x04, 0xe0, 0x1e, 0x1c, 0x43, 
+-	0x06, 0x1b, 0x16, 0x18, 0xe7, 0xf8, 0x2a, 0x03, 
+-	0xd1, 0x0b, 0x00, 0xc3, 0x4d, 0x0d, 0x68, 0x2d, 
+-	0x58, 0xeb, 0x1c, 0x3d, 0x43, 0x25, 0x43, 0x1d, 
+-	0x00, 0xc3, 0x4e, 0x0a, 0x68, 0x36, 0x50, 0xf5, 
+-	0xe0, 0x0b, 0x2a, 0x04, 0xd1, 0x09, 0x00, 0xc3, 
+-	0x4d, 0x06, 0x68, 0x2d, 0x58, 0xed, 0x4b, 0x06, 
+-	0x40, 0x2b, 0x00, 0xc5, 0x4e, 0x03, 0x68, 0x36, 
+-	0x51, 0x73, 0xe7, 0xe0, 0x20, 0x00, 0xe7, 0xbb, 
+-	0xe7, 0xba, 0x00, 0x00, 0x2e, 0x08, 0x5d, 0xd0, 
+-	0xff, 0xff, 0xe1, 0xff, 0xb4, 0xb0, 0x1c, 0x07, 
+-	0x1c, 0x0a, 0x06, 0x38, 0x0e, 0x00, 0x06, 0x11, 
+-	0x0e, 0x09, 0x4c, 0x14, 0x68, 0x25, 0x4b, 0x14, 
+-	0x40, 0x2b, 0x60, 0x23, 0x28, 0x01, 0xd1, 0x06, 
+-	0x4c, 0x10, 0x68, 0x25, 0x23, 0x01, 0x04, 0x1b, 
+-	0x43, 0x2b, 0x60, 0x23, 0xe0, 0x07, 0x28, 0x00, 
+-	0xd1, 0x05, 0x4c, 0x0c, 0x68, 0x25, 0x23, 0x01, 
+-	0x05, 0x9b, 0x43, 0x2b, 0x60, 0x23, 0x29, 0x01, 
+-	0xd1, 0x06, 0x4c, 0x08, 0x68, 0x25, 0x23, 0x01, 
+-	0x03, 0x9b, 0x43, 0x2b, 0x60, 0x23, 0xe0, 0x07, 
+-	0x29, 0x02, 0xd1, 0x05, 0x4c, 0x03, 0x68, 0x25, 
+-	0x23, 0x01, 0x03, 0xdb, 0x43, 0x2b, 0x60, 0x23, 
+-	0xbc, 0xb0, 0x47, 0x70, 0x64, 0x00, 0x00, 0x24, 
+-	0xff, 0xbe, 0x3f, 0xff, 0xb5, 0xff, 0x1c, 0x1f, 
+-	0x9c, 0x09, 0xb0, 0x82, 0x98, 0x02, 0x04, 0x00, 
+-	0x0c, 0x00, 0x90, 0x00, 0x99, 0x03, 0x06, 0x0a, 
+-	0x0e, 0x12, 0x98, 0x04, 0x06, 0x05, 0x0e, 0x2d, 
+-	0x98, 0x0c, 0x06, 0x00, 0x0e, 0x00, 0x90, 0x01, 
+-	0x00, 0xd0, 0x1a, 0x80, 0x00, 0x80, 0x4b, 0x1b, 
+-	0x68, 0x1b, 0x18, 0xc1, 0x2a, 0x20, 0xdb, 0x05, 
+-	0x20, 0xa2, 0xb0, 0x02, 0xb0, 0x04, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2d, 0x1f, 0xdb, 0x02, 
+-	0x20, 0xaf, 0xb0, 0x02, 0xe7, 0xf6, 0x71, 0x8d, 
+-	0x68, 0x3b, 0x00, 0xd0, 0x4e, 0x12, 0x68, 0x36, 
+-	0x19, 0x80, 0x60, 0x43, 0x1c, 0x20, 0x71, 0xc8, 
+-	0x20, 0x00, 0x80, 0x88, 0x20, 0x00, 0x60, 0xc8, 
+-	0x98, 0x00, 0x23, 0x01, 0x43, 0x18, 0x75, 0x08, 
+-	0x98, 0x01, 0x74, 0x88, 0x60, 0x8f, 0x88, 0xb8, 
+-	0x82, 0x08, 0x20, 0x00, 0x74, 0xc8, 0x88, 0xb8, 
+-	0x61, 0x38, 0x20, 0x00, 0x73, 0x38, 0x20, 0x00, 
+-	0x73, 0x78, 0x20, 0x00, 0x73, 0xb8, 0x20, 0x00, 
+-	0x73, 0xf8, 0x20, 0x00, 0xb0, 0x02, 0xe7, 0xd1, 
+-	0xb0, 0x02, 0xe7, 0xcf, 0x2e, 0x08, 0x5d, 0xc4, 
+-	0x2e, 0x08, 0x5d, 0xd4, 0xb5, 0xf3, 0x98, 0x00, 
+-	0x06, 0x04, 0x0e, 0x24, 0x99, 0x01, 0x04, 0x0d, 
+-	0x0c, 0x2d, 0x00, 0xe0, 0x1b, 0x00, 0x00, 0x80, 
+-	0x49, 0x25, 0x68, 0x09, 0x18, 0x47, 0x2c, 0x20, 
+-	0xdb, 0x04, 0x20, 0xa2, 0xb0, 0x02, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x4b, 0x21, 0x42, 0x9d, 
+-	0xd1, 0x27, 0x00, 0xe1, 0x4b, 0x20, 0x68, 0x1b, 
+-	0x18, 0xc8, 0x00, 0xa1, 0x4b, 0x1f, 0x68, 0x1b, 
+-	0x18, 0xca, 0x68, 0x11, 0x4b, 0x1e, 0x40, 0x19, 
+-	0x60, 0x11, 0x68, 0x01, 0x23, 0x40, 0x40, 0x19, 
+-	0xd0, 0x13, 0x68, 0x01, 0x23, 0x40, 0x43, 0xdb, 
+-	0x40, 0x19, 0x60, 0x01, 0x21, 0x00, 0x4b, 0x19, 
+-	0x68, 0x1b, 0x70, 0x19, 0x49, 0x18, 0x68, 0x0b, 
+-	0x08, 0x5b, 0x00, 0x5b, 0x60, 0x0b, 0x49, 0x17, 
+-	0x68, 0x0e, 0x23, 0x01, 0x05, 0x5b, 0x43, 0x33, 
+-	0x60, 0x0b, 0x68, 0x01, 0x4b, 0x14, 0x40, 0x19, 
+-	0x60, 0x01, 0x20, 0x00, 0x75, 0x38, 0x20, 0x00, 
+-	0x80, 0x38, 0x20, 0x00, 0x80, 0xb8, 0x68, 0xb8, 
+-	0x72, 0x44, 0x20, 0xa0, 0x68, 0xb9, 0x72, 0x08, 
+-	0x20, 0x00, 0x60, 0xb8, 0x79, 0xb9, 0x20, 0x01, 
+-	0x40, 0x88, 0xf0, 0x11, 0xf9, 0xe5, 0x20, 0x00, 
+-	0x71, 0xb8, 0x20, 0x00, 0xe7, 0xba, 0xe7, 0xb9, 
+-	0x2e, 0x08, 0x5d, 0xc4, 0x00, 0x00, 0xff, 0xff, 
+-	0x2e, 0x08, 0x5d, 0xd0, 0x2e, 0x08, 0x5d, 0xcc, 
+-	0xff, 0xff, 0xdf, 0xff, 0x2e, 0x08, 0x5d, 0xc0, 
+-	0x6a, 0x00, 0x00, 0x18, 0x6c, 0x00, 0x00, 0x20, 
+-	0xff, 0xff, 0x3f, 0xde, 0xb5, 0xff, 0x1c, 0x05, 
+-	0x1c, 0x0c, 0x1c, 0x17, 0x06, 0x28, 0x0e, 0x00, 
+-	0x06, 0x23, 0x0e, 0x1b, 0x06, 0x39, 0x0e, 0x09, 
+-	0x9e, 0x03, 0x06, 0x36, 0x16, 0x32, 0x28, 0x20, 
+-	0xda, 0x02, 0x4e, 0x08, 0x68, 0x36, 0x60, 0x30, 
+-	0x4e, 0x07, 0x68, 0x36, 0x60, 0x33, 0x4e, 0x07, 
+-	0x68, 0x36, 0x60, 0x31, 0x4e, 0x06, 0x68, 0x36, 
+-	0x60, 0x32, 0xb0, 0x04, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x5d, 0xec, 
+-	0x2e, 0x08, 0x5d, 0xf0, 0x2e, 0x08, 0x5d, 0xf4, 
+-	0x2e, 0x08, 0x5d, 0xf8, 0x1c, 0x01, 0x06, 0x08, 
+-	0x0e, 0x00, 0x28, 0x01, 0xd1, 0x04, 0x22, 0x01, 
+-	0x4b, 0x04, 0x68, 0x1b, 0x60, 0x1a, 0xe0, 0x03, 
+-	0x22, 0x02, 0x4b, 0x02, 0x68, 0x1b, 0x60, 0x1a, 
+-	0x47, 0x70, 0x00, 0x00, 0x2e, 0x08, 0x5e, 0x34, 
+-	0xb5, 0xf1, 0x98, 0x00, 0x06, 0x04, 0x0e, 0x24, 
+-	0xb0, 0x81, 0x27, 0x00, 0x26, 0x00, 0x4a, 0x55, 
+-	0x92, 0x00, 0x00, 0xe0, 0x49, 0x54, 0x68, 0x09, 
+-	0x58, 0x08, 0x23, 0x03, 0x03, 0x9b, 0x40, 0x18, 
+-	0x23, 0x01, 0x03, 0x9b, 0x42, 0x98, 0xd0, 0x05, 
+-	0x20, 0xa0, 0xb0, 0x01, 0xb0, 0x01, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x00, 0xe0, 0x49, 0x4c, 
+-	0x68, 0x09, 0x58, 0x08, 0x21, 0x20, 0x43, 0x01, 
+-	0x00, 0xe0, 0x4a, 0x49, 0x68, 0x12, 0x50, 0x11, 
+-	0x21, 0x00, 0x48, 0x48, 0xf0, 0x05, 0xfc, 0x3c, 
+-	0x48, 0x47, 0x68, 0x00, 0x28, 0x00, 0xd1, 0x01, 
+-	0xe0, 0x08, 0xe0, 0x82, 0x20, 0x02, 0xf0, 0x0c, 
+-	0xf8, 0x75, 0x1c, 0x38, 0x37, 0x01, 0x4b, 0x43, 
+-	0x42, 0x98, 0xd3, 0xf1, 0x4b, 0x41, 0x42, 0x9f, 
+-	0xd3, 0x00, 0x26, 0xa1, 0x48, 0x40, 0x68, 0x01, 
+-	0x4b, 0x40, 0x40, 0x19, 0x60, 0x01, 0x20, 0x00, 
+-	0x00, 0xe1, 0x1b, 0x09, 0x00, 0x89, 0x4a, 0x3e, 
+-	0x68, 0x12, 0x18, 0x89, 0x70, 0x88, 0x20, 0x00, 
+-	0x43, 0xc0, 0x49, 0x3c, 0x67, 0x48, 0x22, 0x00, 
+-	0xb4, 0x04, 0x1c, 0x20, 0x23, 0x00, 0x22, 0x00, 
+-	0x49, 0x39, 0xf7, 0xff, 0xfc, 0x69, 0xb0, 0x01, 
+-	0x27, 0x00, 0x25, 0x00, 0x2d, 0x04, 0xdb, 0x02, 
+-	0xe0, 0x1e, 0x35, 0x01, 0xe7, 0xfa, 0x00, 0xa9, 
+-	0x22, 0x0f, 0x1c, 0x10, 0x40, 0x88, 0x01, 0x29, 
+-	0x9a, 0x00, 0x18, 0x89, 0x68, 0x49, 0x42, 0xa1, 
+-	0xd1, 0x11, 0x21, 0x33, 0x06, 0x49, 0x6b, 0xc9, 
+-	0x40, 0x01, 0xd0, 0x01, 0x37, 0x01, 0xe0, 0x00, 
+-	0xe0, 0x02, 0x4b, 0x26, 0x42, 0x9f, 0xd3, 0xf4, 
+-	0x4b, 0x24, 0x42, 0x9f, 0xd3, 0x02, 0x26, 0xa1, 
+-	0xe0, 0x02, 0xe0, 0x3a, 0x27, 0x00, 0xe7, 0xe0, 
+-	0x48, 0x26, 0x68, 0x01, 0x23, 0xff, 0x33, 0x01, 
+-	0x43, 0x19, 0x60, 0x01, 0x48, 0x21, 0x6d, 0x80, 
+-	0x49, 0x20, 0x65, 0x88, 0x48, 0x1f, 0x6b, 0xc0, 
+-	0x23, 0x01, 0x07, 0x9b, 0x40, 0x18, 0xd0, 0x00, 
+-	0xe7, 0xf8, 0x20, 0x33, 0x06, 0x40, 0x6d, 0x40, 
+-	0x21, 0x33, 0x06, 0x49, 0x66, 0x48, 0x20, 0x33, 
+-	0x06, 0x40, 0x6d, 0x80, 0x21, 0x33, 0x06, 0x49, 
+-	0x66, 0x88, 0x20, 0x03, 0x02, 0x00, 0x49, 0x15, 
+-	0x67, 0x48, 0x48, 0x11, 0x68, 0x01, 0x23, 0x01, 
+-	0x02, 0x5b, 0x43, 0x19, 0x60, 0x01, 0x20, 0x00, 
+-	0x49, 0x13, 0x65, 0x88, 0x20, 0x00, 0x49, 0x12, 
+-	0x65, 0xc8, 0x20, 0x00, 0x49, 0x10, 0x66, 0x08, 
+-	0x21, 0x00, 0x20, 0xff, 0xf0, 0x05, 0xfb, 0xb8, 
+-	0x1c, 0x30, 0xb0, 0x01, 0xe7, 0x66, 0xb0, 0x01, 
+-	0xe7, 0x64, 0xe7, 0x63, 0x9e, 0x00, 0x00, 0xc0, 
+-	0x2e, 0x08, 0x5d, 0xd0, 0x00, 0x00, 0x80, 0x0f, 
+-	0xcc, 0x00, 0x05, 0x00, 0x00, 0x1e, 0x84, 0x80, 
+-	0x66, 0x00, 0x00, 0x4c, 0xff, 0xff, 0xfd, 0xff, 
+-	0x2e, 0x08, 0x5d, 0xc4, 0x66, 0x00, 0x00, 0x80, 
+-	0x00, 0x00, 0xff, 0xff, 0x66, 0x00, 0x00, 0xe0, 
+-	0xcc, 0x00, 0x00, 0x00, 0xb5, 0xf1, 0x98, 0x00, 
+-	0x06, 0x07, 0x0e, 0x3f, 0xb0, 0x81, 0x25, 0x00, 
+-	0x26, 0x00, 0x4a, 0x2e, 0x92, 0x00, 0x00, 0xf8, 
+-	0x49, 0x2d, 0x68, 0x09, 0x58, 0x08, 0x23, 0x03, 
+-	0x03, 0x9b, 0x40, 0x18, 0x23, 0x01, 0x03, 0xdb, 
+-	0x42, 0x98, 0xd0, 0x05, 0x20, 0xa0, 0xb0, 0x01, 
+-	0xb0, 0x01, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x22, 0x00, 0xb4, 0x04, 0x1c, 0x38, 0x23, 0x00, 
+-	0x22, 0x00, 0x49, 0x24, 0xf7, 0xff, 0xfb, 0xd0, 
+-	0xb0, 0x01, 0x24, 0x00, 0x2c, 0x04, 0xdb, 0x02, 
+-	0xe0, 0x1e, 0x34, 0x01, 0xe7, 0xfa, 0x00, 0xa1, 
+-	0x22, 0x0f, 0x1c, 0x10, 0x40, 0x88, 0x01, 0x21, 
+-	0x9a, 0x00, 0x18, 0x89, 0x68, 0x49, 0x42, 0xb9, 
+-	0xd1, 0x11, 0x21, 0x33, 0x06, 0x49, 0x6b, 0xc9, 
+-	0x40, 0x01, 0xd0, 0x01, 0x35, 0x01, 0xe0, 0x00, 
+-	0xe0, 0x02, 0x4b, 0x17, 0x42, 0x9d, 0xd3, 0xf4, 
+-	0x4b, 0x15, 0x42, 0x9d, 0xd9, 0x02, 0x26, 0xa1, 
+-	0xe0, 0x02, 0xe0, 0x1d, 0x25, 0x00, 0xe7, 0xe0, 
+-	0x20, 0x04, 0xf0, 0x02, 0xff, 0xb7, 0x20, 0x01, 
+-	0x21, 0x33, 0x06, 0x49, 0x66, 0xc8, 0x21, 0x00, 
+-	0x00, 0xf8, 0x4a, 0x0b, 0x68, 0x12, 0x50, 0x11, 
+-	0x21, 0x00, 0x00, 0xf8, 0x4a, 0x08, 0x68, 0x12, 
+-	0x18, 0x80, 0x60, 0x41, 0x21, 0x00, 0x00, 0xb8, 
+-	0x4a, 0x08, 0x68, 0x12, 0x50, 0x11, 0x1c, 0x30, 
+-	0xb0, 0x01, 0xe7, 0xb5, 0xb0, 0x01, 0xe7, 0xb3, 
+-	0xe7, 0xb2, 0x00, 0x00, 0x9e, 0x00, 0x00, 0xc0, 
+-	0x2e, 0x08, 0x5d, 0xd0, 0x00, 0x00, 0xff, 0xff, 
+-	0x00, 0x01, 0xd4, 0xc0, 0x2e, 0x08, 0x5d, 0xcc, 
+-	0xb5, 0xff, 0x99, 0x01, 0x06, 0x0f, 0x0e, 0x3f, 
+-	0x9a, 0x02, 0x06, 0x15, 0x0e, 0x2d, 0x9b, 0x03, 
+-	0x06, 0x1e, 0x0e, 0x36, 0x2d, 0x1f, 0xdb, 0x04, 
+-	0x20, 0xaf, 0xb0, 0x04, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x2f, 0x20, 0xdb, 0x01, 0x20, 0xa2, 
+-	0xe7, 0xf7, 0x2e, 0x80, 0xd0, 0x13, 0xf0, 0x11, 
+-	0xf8, 0x89, 0x1c, 0x04, 0x1c, 0x39, 0x22, 0x80, 
+-	0x20, 0x01, 0xf0, 0x00, 0xfb, 0x6d, 0x2c, 0x80, 
+-	0xd0, 0x01, 0xf0, 0x11, 0xf8, 0xb5, 0x98, 0x00, 
+-	0x21, 0x80, 0x68, 0x49, 0x60, 0x08, 0x48, 0x09, 
+-	0x68, 0x00, 0x70, 0x05, 0xe0, 0x0b, 0xf0, 0x11, 
+-	0xf8, 0x75, 0x1c, 0x04, 0x1c, 0x39, 0x22, 0x80, 
+-	0x20, 0x02, 0xf0, 0x00, 0xfb, 0x59, 0x2c, 0x80, 
+-	0xd0, 0x01, 0xf0, 0x11, 0xf8, 0xa1, 0x20, 0x00, 
+-	0xe7, 0xd3, 0xe7, 0xd2, 0x2e, 0x08, 0x5e, 0x1c, 
+-	0xb5, 0xff, 0x99, 0x01, 0x06, 0x0e, 0x0e, 0x36, 
+-	0x9a, 0x02, 0x06, 0x17, 0x0e, 0x3f, 0x9b, 0x03, 
+-	0x06, 0x1c, 0x0e, 0x24, 0xb0, 0x82, 0x20, 0x80, 
+-	0x40, 0x38, 0x90, 0x00, 0x06, 0x7f, 0x0e, 0x7f, 
+-	0x2e, 0x1f, 0xdb, 0x05, 0x20, 0xaf, 0xb0, 0x02, 
+-	0xb0, 0x04, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2c, 0x20, 0xdb, 0x02, 0x20, 0xa2, 0xb0, 0x02, 
+-	0xe7, 0xf6, 0x2f, 0x04, 0xd1, 0x00, 0x27, 0x00, 
+-	0x00, 0xe0, 0x1b, 0x00, 0x00, 0x80, 0x49, 0x17, 
+-	0x68, 0x09, 0x18, 0x40, 0x90, 0x01, 0x98, 0x00, 
+-	0x28, 0x00, 0xd0, 0x0d, 0xf0, 0x11, 0xf8, 0x3a, 
+-	0x1c, 0x05, 0x1c, 0x21, 0x22, 0x01, 0x02, 0x92, 
+-	0x20, 0x02, 0xf0, 0x00, 0xfb, 0x1d, 0x2d, 0x80, 
+-	0xd0, 0x01, 0xf0, 0x11, 0xf8, 0x65, 0xe0, 0x13, 
+-	0xf0, 0x11, 0xf8, 0x2c, 0x1c, 0x05, 0x1c, 0x21, 
+-	0x22, 0x01, 0x02, 0x92, 0x20, 0x01, 0xf0, 0x00, 
+-	0xfb, 0x0f, 0x2d, 0x80, 0xd0, 0x01, 0xf0, 0x11, 
+-	0xf8, 0x57, 0x98, 0x02, 0x21, 0x80, 0x68, 0x89, 
+-	0x60, 0x08, 0x20, 0x80, 0x6a, 0x00, 0x55, 0xc6, 
+-	0x20, 0x00, 0xb0, 0x02, 0xe7, 0xc4, 0xb0, 0x02, 
+-	0xe7, 0xc2, 0x00, 0x00, 0x2e, 0x08, 0x5d, 0xc4, 
+-	0xb5, 0xff, 0xb0, 0x82, 0x99, 0x03, 0x04, 0x0d, 
+-	0x0c, 0x2d, 0x9a, 0x04, 0x06, 0x10, 0x0e, 0x00, 
+-	0x90, 0x00, 0x9b, 0x05, 0x06, 0x18, 0x0e, 0x00, 
+-	0x90, 0x01, 0x98, 0x00, 0x28, 0x1f, 0xdb, 0x05, 
+-	0x20, 0xaf, 0xb0, 0x02, 0xb0, 0x04, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x98, 0x01, 0x23, 0x80, 
+-	0x40, 0x18, 0xd1, 0x2f, 0x98, 0x00, 0x49, 0x2c, 
+-	0x68, 0x09, 0x73, 0x08, 0x27, 0x00, 0x2f, 0x20, 
+-	0xdb, 0x04, 0xe0, 0x26, 0x1c, 0x78, 0x06, 0x07, 
+-	0x0e, 0x3f, 0xe7, 0xf8, 0x20, 0x01, 0x40, 0xb8, 
+-	0x99, 0x02, 0x40, 0x08, 0xd0, 0x1c, 0x24, 0x00, 
+-	0x20, 0x40, 0x40, 0x28, 0xd0, 0x04, 0x04, 0x20, 
+-	0x0c, 0x00, 0x24, 0x01, 0x03, 0xa4, 0x43, 0x04, 
+-	0x20, 0x80, 0x40, 0x28, 0xd0, 0x04, 0x04, 0x20, 
+-	0x0c, 0x00, 0x24, 0x01, 0x03, 0xe4, 0x43, 0x04, 
+-	0xf0, 0x10, 0xff, 0xd4, 0x1c, 0x06, 0x1c, 0x22, 
+-	0x1c, 0x39, 0x20, 0x01, 0xf0, 0x00, 0xfa, 0xb8, 
+-	0x2e, 0x80, 0xd0, 0x01, 0xf0, 0x11, 0xf8, 0x00, 
+-	0xe7, 0xd8, 0xe0, 0x24, 0x27, 0x00, 0x2f, 0x20, 
+-	0xdb, 0x04, 0xe0, 0x20, 0x1c, 0x78, 0x06, 0x07, 
+-	0x0e, 0x3f, 0xe7, 0xf8, 0x20, 0x01, 0x40, 0xb8, 
+-	0x99, 0x02, 0x40, 0x08, 0xd0, 0x16, 0x24, 0x00, 
+-	0x20, 0x40, 0x40, 0x28, 0xd0, 0x01, 0x4b, 0x0d, 
+-	0x40, 0x1c, 0x20, 0x80, 0x40, 0x28, 0xd0, 0x01, 
+-	0x04, 0x64, 0x0c, 0x64, 0xf0, 0x10, 0xff, 0xae, 
+-	0x1c, 0x06, 0x1c, 0x22, 0x1c, 0x39, 0x20, 0x02, 
+-	0xf0, 0x00, 0xfa, 0x92, 0x2e, 0x80, 0xd0, 0x01, 
+-	0xf0, 0x10, 0xff, 0xda, 0xe7, 0xde, 0x20, 0x00, 
+-	0xb0, 0x02, 0xe7, 0x9f, 0xb0, 0x02, 0xe7, 0x9d, 
+-	0x2e, 0x08, 0x5e, 0x10, 0x00, 0x00, 0xbf, 0xff, 
+-	0xb5, 0x80, 0x1c, 0x07, 0x48, 0x07, 0x68, 0x01, 
+-	0x20, 0x00, 0xf0, 0x19, 0xfe, 0x73, 0x60, 0x38, 
+-	0x48, 0x04, 0x68, 0x00, 0x1d, 0x01, 0x20, 0x00, 
+-	0xf0, 0x19, 0xfe, 0x6c, 0x60, 0x78, 0xbc, 0x80, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x5e, 0x10, 
+-	0xb5, 0xf7, 0x1c, 0x07, 0x99, 0x01, 0x06, 0x0e, 
+-	0x0e, 0x36, 0x9a, 0x02, 0x06, 0x14, 0x0e, 0x24, 
+-	0x2e, 0x1f, 0xdb, 0x04, 0x20, 0xaf, 0xb0, 0x03, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x2c, 0x20, 
+-	0xdb, 0x01, 0x20, 0xa2, 0xe7, 0xf7, 0x20, 0x80, 
+-	0x40, 0x20, 0xd0, 0x0d, 0xf0, 0x10, 0xff, 0x6e, 
+-	0x1c, 0x05, 0x1c, 0x21, 0x22, 0x01, 0x02, 0xd2, 
+-	0x20, 0x02, 0xf0, 0x00, 0xfa, 0x51, 0x2d, 0x80, 
+-	0xd0, 0x01, 0xf0, 0x10, 0xff, 0x99, 0xe0, 0x16, 
+-	0x48, 0x0c, 0x68, 0x00, 0x60, 0x07, 0x48, 0x0b, 
+-	0x68, 0x00, 0x71, 0x46, 0x20, 0xff, 0x49, 0x09, 
+-	0x68, 0x09, 0x71, 0x08, 0xf0, 0x10, 0xff, 0x56, 
+-	0x1c, 0x05, 0x1c, 0x21, 0x22, 0x01, 0x02, 0xd2, 
+-	0x20, 0x01, 0xf0, 0x00, 0xfa, 0x39, 0x2d, 0x80, 
+-	0xd0, 0x01, 0xf0, 0x10, 0xff, 0x81, 0x20, 0x00, 
+-	0xe7, 0xcd, 0xe7, 0xcc, 0x2e, 0x08, 0x5e, 0x14, 
+-	0xb5, 0xf7, 0x1c, 0x07, 0x99, 0x01, 0x06, 0x0e, 
+-	0x0e, 0x36, 0x9a, 0x02, 0x06, 0x14, 0x0e, 0x24, 
+-	0x2e, 0x1f, 0xdb, 0x04, 0x20, 0xaf, 0xb0, 0x03, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x2c, 0x20, 
+-	0xdb, 0x01, 0x20, 0xa2, 0xe7, 0xf7, 0x20, 0x80, 
+-	0x40, 0x20, 0xd0, 0x0d, 0xf0, 0x10, 0xff, 0x2e, 
+-	0x1c, 0x05, 0x1c, 0x21, 0x22, 0x01, 0x03, 0x12, 
+-	0x20, 0x02, 0xf0, 0x00, 0xfa, 0x11, 0x2d, 0x80, 
+-	0xd0, 0x01, 0xf0, 0x10, 0xff, 0x59, 0xe0, 0x16, 
+-	0x48, 0x0c, 0x68, 0x00, 0x60, 0x07, 0x48, 0x0b, 
+-	0x68, 0x00, 0x71, 0x46, 0x20, 0xff, 0x49, 0x09, 
+-	0x68, 0x09, 0x71, 0x08, 0xf0, 0x10, 0xff, 0x16, 
+-	0x1c, 0x05, 0x1c, 0x21, 0x22, 0x01, 0x03, 0x12, 
+-	0x20, 0x01, 0xf0, 0x00, 0xf9, 0xf9, 0x2d, 0x80, 
+-	0xd0, 0x01, 0xf0, 0x10, 0xff, 0x41, 0x20, 0x00, 
+-	0xe7, 0xcd, 0xe7, 0xcc, 0x2e, 0x08, 0x5e, 0x18, 
+-	0xb5, 0xff, 0xb0, 0x81, 0x98, 0x01, 0x06, 0x00, 
+-	0x0e, 0x00, 0x90, 0x00, 0x99, 0x02, 0x06, 0x0d, 
+-	0x0e, 0x2d, 0x9a, 0x03, 0x06, 0x16, 0x0e, 0x36, 
+-	0x9f, 0x04, 0x1c, 0x29, 0x98, 0x00, 0xf0, 0x00, 
+-	0xf8, 0x91, 0x28, 0x00, 0xd0, 0x05, 0x20, 0xa2, 
+-	0xb0, 0x01, 0xb0, 0x04, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x79, 0x38, 0x79, 0x79, 0x18, 0x40, 
+-	0x79, 0xb9, 0x18, 0x40, 0x06, 0x04, 0x0e, 0x24, 
+-	0x79, 0xb8, 0x02, 0x00, 0x43, 0x04, 0x00, 0x68, 
+-	0x19, 0x80, 0x01, 0x00, 0x49, 0x15, 0x68, 0x09, 
+-	0x50, 0x0c, 0x9b, 0x04, 0x88, 0x99, 0x00, 0x68, 
+-	0x19, 0x80, 0x01, 0x00, 0x4a, 0x11, 0x68, 0x12, 
+-	0x18, 0x80, 0x60, 0x41, 0x78, 0x78, 0x78, 0x39, 
+-	0x18, 0x40, 0x78, 0xb9, 0x18, 0x40, 0x06, 0x04, 
+-	0x0e, 0x24, 0x78, 0xb8, 0x02, 0x00, 0x43, 0x04, 
+-	0x00, 0x68, 0x19, 0x80, 0x01, 0x00, 0x49, 0x09, 
+-	0x68, 0x09, 0x18, 0x40, 0x60, 0x84, 0x9b, 0x04, 
+-	0x88, 0x19, 0x00, 0x68, 0x19, 0x80, 0x01, 0x00, 
+-	0x4a, 0x04, 0x68, 0x12, 0x18, 0x80, 0x60, 0xc1, 
+-	0x20, 0x00, 0xb0, 0x01, 0xe7, 0xc5, 0xb0, 0x01, 
+-	0xe7, 0xc3, 0x00, 0x00, 0x2e, 0x08, 0x5d, 0xc8, 
+-	0xb5, 0xff, 0x1c, 0x07, 0x06, 0x3d, 0x0e, 0x2d, 
+-	0x99, 0x01, 0x06, 0x0c, 0x0e, 0x24, 0x9a, 0x02, 
+-	0x06, 0x16, 0x0e, 0x36, 0x1c, 0x21, 0x1c, 0x28, 
+-	0xf0, 0x00, 0xf8, 0x40, 0x28, 0x00, 0xd0, 0x04, 
+-	0x20, 0xa2, 0xb0, 0x04, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x9a, 0x03, 0x1c, 0x31, 0x1c, 0x20, 
+-	0xf0, 0x00, 0xf8, 0x02, 0xe7, 0xf5, 0xe7, 0xf4, 
+-	0xb4, 0xf0, 0x1c, 0x04, 0x1c, 0x0f, 0x1c, 0x13, 
+-	0x06, 0x21, 0x0e, 0x09, 0x06, 0x3a, 0x0e, 0x12, 
+-	0x29, 0x10, 0xdb, 0x02, 0x20, 0xa2, 0xbc, 0xf0, 
+-	0x47, 0x70, 0x88, 0xdd, 0x00, 0x48, 0x18, 0x80, 
+-	0x01, 0x00, 0x4e, 0x0f, 0x68, 0x36, 0x50, 0x35, 
+-	0x88, 0x98, 0x00, 0x4d, 0x18, 0xad, 0x01, 0x2d, 
+-	0x4e, 0x0b, 0x68, 0x36, 0x19, 0xad, 0x60, 0x68, 
+-	0x88, 0x58, 0x00, 0x4d, 0x18, 0xad, 0x01, 0x2d, 
+-	0x4e, 0x07, 0x68, 0x36, 0x19, 0xad, 0x60, 0xa8, 
+-	0x88, 0x18, 0x00, 0x4d, 0x18, 0xad, 0x01, 0x2d, 
+-	0x4e, 0x03, 0x68, 0x36, 0x19, 0xad, 0x60, 0xe8, 
+-	0x20, 0x00, 0xe7, 0xdc, 0xe7, 0xdb, 0x00, 0x00, 
+-	0x2e, 0x08, 0x5d, 0xc8, 0xb4, 0xb0, 0x1c, 0x07, 
+-	0x1c, 0x0a, 0x06, 0x39, 0x0e, 0x09, 0x06, 0x15, 
+-	0x0e, 0x2d, 0xb0, 0x81, 0x29, 0x20, 0xdb, 0x03, 
+-	0x20, 0xa2, 0xb0, 0x01, 0xbc, 0xb0, 0x47, 0x70, 
+-	0x2d, 0x10, 0xdb, 0x02, 0x20, 0xa2, 0xb0, 0x01, 
+-	0xe7, 0xf8, 0x00, 0xc8, 0x4b, 0x0a, 0x68, 0x1b, 
+-	0x18, 0xc4, 0x68, 0x20, 0x90, 0x00, 0x98, 0x00, 
+-	0x4b, 0x08, 0x40, 0x18, 0x90, 0x00, 0x00, 0x68, 
+-	0x23, 0x1e, 0x40, 0x18, 0x9b, 0x00, 0x43, 0x18, 
+-	0x90, 0x00, 0x98, 0x00, 0x60, 0x20, 0x20, 0x00, 
+-	0xb0, 0x01, 0xe7, 0xe3, 0xb0, 0x01, 0xe7, 0xe1, 
+-	0x2e, 0x08, 0x5d, 0xd0, 0xff, 0xff, 0xdf, 0xe1, 
+-	0x20, 0xff, 0x49, 0x02, 0x68, 0x09, 0x70, 0x08, 
+-	0x47, 0x70, 0x00, 0x00, 0x2e, 0x08, 0x5e, 0x2c, 
+-	0xb4, 0xb0, 0x1c, 0x07, 0x1c, 0x0a, 0xb0, 0x83, 
+-	0x20, 0x00, 0x43, 0xc0, 0x23, 0x19, 0x06, 0x9b, 
+-	0x67, 0x58, 0x08, 0xb9, 0x00, 0x89, 0x1a, 0x78, 
+-	0x90, 0x02, 0x98, 0x02, 0x18, 0x10, 0x07, 0x80, 
+-	0x0f, 0x80, 0x90, 0x01, 0x98, 0x02, 0x18, 0x10, 
+-	0x08, 0x80, 0x90, 0x00, 0x9b, 0x02, 0x20, 0x03, 
+-	0x1a, 0xc0, 0x23, 0x19, 0x06, 0x9b, 0x67, 0xd8, 
+-	0x24, 0x00, 0x98, 0x00, 0x42, 0x84, 0xd3, 0x02, 
+-	0xe0, 0x06, 0x34, 0x01, 0xe7, 0xf9, 0xc9, 0x08, 
+-	0x20, 0x19, 0x06, 0x80, 0x67, 0x03, 0xe7, 0xf8, 
+-	0x98, 0x01, 0x28, 0x00, 0xd0, 0x0b, 0x9b, 0x01, 
+-	0x00, 0xd8, 0x25, 0x00, 0x43, 0xed, 0x40, 0xc5, 
+-	0x1c, 0x2b, 0x43, 0xdb, 0x68, 0x0d, 0x40, 0x2b, 
+-	0x25, 0x19, 0x06, 0xad, 0x67, 0x2b, 0x20, 0x19, 
+-	0x06, 0x80, 0x6f, 0x40, 0xb0, 0x03, 0xbc, 0xb0, 
+-	0x47, 0x70, 0xb0, 0x03, 0xe7, 0xfb, 0x1c, 0x01, 
+-	0x06, 0x08, 0x0e, 0x00, 0x22, 0x19, 0x06, 0x92, 
+-	0x63, 0x90, 0x47, 0x70, 0xb4, 0xf0, 0x48, 0x4d, 
+-	0x6a, 0x80, 0x07, 0xc0, 0x0f, 0xc0, 0xd0, 0x74, 
+-	0x22, 0x00, 0x27, 0x00, 0x49, 0x4a, 0x20, 0x00, 
+-	0x28, 0x20, 0xdb, 0x04, 0xe0, 0x16, 0x1c, 0x43, 
+-	0x06, 0x18, 0x0e, 0x00, 0xe7, 0xf8, 0x00, 0x83, 
+-	0x58, 0xcc, 0x23, 0x01, 0x03, 0x5b, 0x40, 0x23, 
+-	0xd0, 0x0b, 0x24, 0x01, 0x40, 0x84, 0x1c, 0x23, 
+-	0x43, 0x1f, 0x00, 0x83, 0x58, 0xcc, 0x23, 0x01, 
+-	0x03, 0x5b, 0x43, 0x9c, 0x1c, 0x23, 0x00, 0x84, 
+-	0x51, 0x0b, 0xe7, 0xe8, 0x20, 0x00, 0x28, 0x04, 
+-	0xdb, 0x04, 0xe0, 0x1a, 0x1c, 0x43, 0x06, 0x18, 
+-	0x0e, 0x00, 0xe7, 0xf8, 0x01, 0x05, 0x4b, 0x39, 
+-	0x18, 0xec, 0x22, 0x00, 0x2a, 0x04, 0xdb, 0x04, 
+-	0xe0, 0x0e, 0x1c, 0x53, 0x06, 0x1a, 0x0e, 0x12, 
+-	0xe7, 0xf8, 0x4b, 0x35, 0x60, 0x23, 0x4b, 0x35, 
+-	0x60, 0x63, 0x23, 0x00, 0x60, 0xa3, 0x23, 0x00, 
+-	0x60, 0xe3, 0x34, 0xff, 0x34, 0x01, 0xe7, 0xf0, 
+-	0xe7, 0xe4, 0xb0, 0x82, 0x4b, 0x2b, 0x69, 0xdc, 
+-	0x23, 0x0c, 0x40, 0x23, 0x08, 0x9c, 0xab, 0x01, 
+-	0x70, 0x1c, 0x4b, 0x28, 0x69, 0xdc, 0x23, 0x30, 
+-	0x40, 0x23, 0x09, 0x1c, 0xab, 0x00, 0x70, 0x1c, 
+-	0xab, 0x01, 0x78, 0x1b, 0xac, 0x00, 0x78, 0x24, 
+-	0x42, 0xa3, 0xd1, 0x09, 0x23, 0x33, 0x06, 0x5b, 
+-	0x6b, 0xdb, 0x2b, 0x00, 0xd1, 0x04, 0x4b, 0x1f, 
+-	0x6a, 0x9b, 0x07, 0xdb, 0x0f, 0xdb, 0xd0, 0x21, 
+-	0x4b, 0x1c, 0x69, 0xdd, 0x23, 0x0c, 0x40, 0x2b, 
+-	0x08, 0x9c, 0x00, 0xa5, 0x26, 0x01, 0x40, 0xae, 
+-	0x1c, 0x33, 0x25, 0x33, 0x06, 0x6d, 0x64, 0x2b, 
+-	0x25, 0x01, 0x40, 0xa5, 0x1c, 0x2b, 0x4d, 0x1a, 
+-	0x63, 0xab, 0x4b, 0x14, 0x69, 0xdd, 0x23, 0x0c, 
+-	0x40, 0x2b, 0x08, 0x9d, 0xab, 0x01, 0x70, 0x1d, 
+-	0xe0, 0x00, 0xe0, 0x1d, 0x4b, 0x0f, 0x69, 0xdd, 
+-	0x23, 0x30, 0x40, 0x2b, 0x09, 0x1d, 0xab, 0x00, 
+-	0x70, 0x1d, 0xe7, 0xcd, 0xb0, 0x02, 0x20, 0x00, 
+-	0x28, 0x20, 0xdb, 0x04, 0xe0, 0x10, 0x1c, 0x43, 
+-	0x06, 0x18, 0x0e, 0x00, 0xe7, 0xf8, 0x24, 0x01, 
+-	0x40, 0x84, 0x1c, 0x23, 0x40, 0x3b, 0xd0, 0x06, 
+-	0x00, 0x83, 0x58, 0xcc, 0x23, 0x01, 0x03, 0x5b, 
+-	0x43, 0x23, 0x00, 0x84, 0x51, 0x0b, 0xe7, 0xee, 
+-	0xbc, 0xf0, 0x47, 0x70, 0x66, 0x00, 0x01, 0x00, 
+-	0x64, 0x00, 0x00, 0x80, 0x9e, 0x00, 0x00, 0xc0, 
+-	0x9e, 0x00, 0x00, 0x00, 0x2e, 0x0f, 0x00, 0x00, 
+-	0x66, 0x00, 0x00, 0x80, 0xb4, 0x80, 0x1c, 0x03, 
+-	0x1c, 0x0a, 0x48, 0x0a, 0x68, 0x00, 0x68, 0x01, 
+-	0x20, 0x19, 0x06, 0x80, 0x6a, 0x80, 0x0a, 0x40, 
+-	0x00, 0x4f, 0x43, 0x38, 0x60, 0x18, 0x0f, 0xc8, 
+-	0x07, 0xc0, 0x60, 0x10, 0x68, 0x10, 0x0f, 0xc0, 
+-	0x60, 0x10, 0x20, 0x00, 0xbc, 0x80, 0x47, 0x70, 
+-	0xe7, 0xfc, 0x00, 0x00, 0x2e, 0x08, 0x5e, 0x38, 
+-	0xb5, 0x80, 0x1c, 0x07, 0x48, 0x05, 0x68, 0x00, 
+-	0x1d, 0xc1, 0x31, 0x01, 0x20, 0x00, 0xf0, 0x19, 
+-	0xfb, 0xfd, 0x60, 0x38, 0xbc, 0x80, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x5e, 0x10, 
+-	0xb4, 0xf0, 0x1c, 0x04, 0x1c, 0x0f, 0x1c, 0x13, 
+-	0x06, 0x20, 0x0e, 0x00, 0x06, 0x39, 0x0e, 0x09, 
+-	0x04, 0x1a, 0x0c, 0x12, 0x4d, 0x07, 0x68, 0x2d, 
+-	0x70, 0xe8, 0x4d, 0x06, 0x68, 0x2d, 0x70, 0xa9, 
+-	0x4d, 0x04, 0x68, 0x2d, 0x80, 0x2a, 0x25, 0x01, 
+-	0x04, 0x2d, 0x26, 0x33, 0x06, 0x76, 0x60, 0x35, 
+-	0xbc, 0xf0, 0x47, 0x70, 0x2e, 0x08, 0x5e, 0x3c, 
+-	0x20, 0x0d, 0x06, 0xc0, 0x69, 0xc0, 0x47, 0x70, 
+-	0xe7, 0xfd, 0x1c, 0x01, 0x31, 0x01, 0x23, 0x2d, 
+-	0x01, 0x1b, 0x42, 0x99, 0xd9, 0x03, 0x20, 0x2d, 
+-	0x01, 0x00, 0x47, 0x70, 0xe0, 0x01, 0x1c, 0x08, 
+-	0xe7, 0xfb, 0xe7, 0xfa, 0xb5, 0xf3, 0xb0, 0x85, 
+-	0x20, 0x00, 0x90, 0x03, 0x20, 0x00, 0x90, 0x02, 
+-	0x9f, 0x05, 0x69, 0x3d, 0x69, 0x38, 0x28, 0x13, 
+-	0xd1, 0x05, 0x20, 0x75, 0xb0, 0x05, 0xb0, 0x02, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x99, 0x06, 
+-	0x68, 0x88, 0x68, 0x09, 0x1a, 0x40, 0x1c, 0x41, 
+-	0x91, 0x04, 0x69, 0x78, 0x23, 0x04, 0x40, 0x18, 
+-	0xd0, 0x02, 0x99, 0x04, 0x08, 0x49, 0x91, 0x04, 
+-	0x00, 0xa8, 0x49, 0xf8, 0x58, 0x08, 0x99, 0x04, 
+-	0x43, 0x48, 0x61, 0xf8, 0x99, 0x06, 0x68, 0x88, 
+-	0x68, 0x09, 0x1a, 0x40, 0x30, 0x01, 0x63, 0xb8, 
+-	0x68, 0xf8, 0x90, 0x01, 0x48, 0xf2, 0x68, 0x00, 
+-	0x28, 0x00, 0xd0, 0x06, 0x98, 0x01, 0x28, 0x19, 
+-	0xd3, 0x01, 0x20, 0x01, 0xe0, 0x00, 0x20, 0x00, 
+-	0xe0, 0x05, 0x98, 0x01, 0x28, 0x08, 0xd3, 0x01, 
+-	0x20, 0x01, 0xe0, 0x00, 0x20, 0x00, 0x28, 0x00, 
+-	0xd0, 0x07, 0x1d, 0xf8, 0x30, 0x21, 0x99, 0x06, 
+-	0xf0, 0x02, 0xf9, 0xea, 0x20, 0x00, 0xb0, 0x05, 
+-	0xe7, 0xc5, 0x49, 0xe6, 0x20, 0x91, 0xf0, 0x19, 
+-	0xfb, 0x7d, 0x28, 0x92, 0xd0, 0x03, 0x20, 0x01, 
+-	0xf0, 0x0b, 0xfb, 0x64, 0xe7, 0xf5, 0x98, 0x01, 
+-	0x00, 0x80, 0x49, 0xe1, 0x58, 0x08, 0x99, 0x05, 
+-	0x42, 0x88, 0xd0, 0x05, 0x20, 0x92, 0x49, 0xdd, 
+-	0x60, 0x08, 0x20, 0xff, 0xb0, 0x05, 0xe7, 0xae, 
+-	0x48, 0xd9, 0x68, 0x00, 0x28, 0x00, 0xd0, 0x03, 
+-	0x2d, 0x0b, 0xdb, 0x26, 0x2d, 0x12, 0xdc, 0x24, 
+-	0x2d, 0x0b, 0xdb, 0x0b, 0x2d, 0x12, 0xdc, 0x09, 
+-	0x48, 0xd6, 0x68, 0x00, 0x28, 0x00, 0xd0, 0x05, 
+-	0x1d, 0xf8, 0x30, 0x21, 0x99, 0x06, 0xf0, 0x02, 
+-	0xf9, 0xbb, 0xe0, 0x16, 0x6b, 0x38, 0xf7, 0xff, 
+-	0xff, 0x7c, 0x90, 0x00, 0x6a, 0xb9, 0x9a, 0x00, 
+-	0x48, 0xcf, 0xf0, 0x0c, 0xfb, 0x4b, 0x1d, 0xf8, 
+-	0x30, 0x21, 0x99, 0x06, 0xf0, 0x02, 0xf9, 0xac, 
+-	0x6b, 0x38, 0xf7, 0xff, 0xff, 0x6e, 0x90, 0x00, 
+-	0x6a, 0xb9, 0x9a, 0x00, 0x48, 0xc8, 0xf0, 0x0c, 
+-	0xfb, 0x6b, 0x48, 0xc8, 0x68, 0x00, 0x99, 0x05, 
+-	0x42, 0x88, 0xd1, 0x30, 0x48, 0xc0, 0x68, 0x00, 
+-	0x28, 0x00, 0xd1, 0x2c, 0x48, 0xc1, 0x68, 0x00, 
+-	0x28, 0x00, 0xd1, 0x0a, 0x20, 0x0d, 0x06, 0xc0, 
+-	0x68, 0xc0, 0x90, 0x02, 0x98, 0x02, 0x28, 0x01, 
+-	0xd1, 0x03, 0x20, 0x00, 0x21, 0x0d, 0x06, 0xc9, 
+-	0x60, 0xc8, 0x48, 0xba, 0x68, 0x00, 0x28, 0x00, 
+-	0xd1, 0x0d, 0x6a, 0xb8, 0x30, 0x01, 0x05, 0x00, 
+-	0x6a, 0xf9, 0x31, 0x01, 0x02, 0x89, 0x43, 0x08, 
+-	0x6b, 0x79, 0x31, 0x02, 0x43, 0x08, 0x21, 0x0d, 
+-	0x06, 0xc9, 0x61, 0x88, 0xe0, 0x0b, 0x6a, 0xb8, 
+-	0x30, 0x01, 0x05, 0x00, 0x6a, 0xf9, 0x31, 0x01, 
+-	0x02, 0x89, 0x43, 0x08, 0x6b, 0x79, 0x31, 0x02, 
+-	0x43, 0x08, 0x49, 0xaf, 0x60, 0x08, 0x2d, 0x0b, 
+-	0xdb, 0x15, 0x2d, 0x12, 0xdc, 0x13, 0x48, 0xa9, 
+-	0x68, 0x00, 0x28, 0x00, 0xd0, 0x0f, 0x48, 0xa4, 
+-	0x68, 0x00, 0x28, 0x00, 0xd1, 0x0b, 0x20, 0x00, 
+-	0x62, 0xb8, 0x20, 0x00, 0x62, 0xf8, 0x48, 0xa7, 
+-	0x63, 0x38, 0x48, 0xa7, 0x63, 0x78, 0x6b, 0x38, 
+-	0xf7, 0xff, 0xff, 0x1b, 0x90, 0x00, 0x48, 0x9c, 
+-	0x68, 0x00, 0x28, 0x00, 0xd1, 0x16, 0x20, 0x0d, 
+-	0x06, 0xc0, 0x68, 0x80, 0x90, 0x03, 0x20, 0x00, 
+-	0x21, 0x0d, 0x06, 0xc9, 0x60, 0x88, 0xf0, 0x01, 
+-	0xfb, 0x07, 0x6b, 0x38, 0xf7, 0xff, 0xff, 0x09, 
+-	0x90, 0x00, 0x9a, 0x00, 0x99, 0x01, 0x1c, 0x38, 
+-	0xf0, 0x01, 0xfa, 0x8c, 0x98, 0x03, 0x21, 0x0d, 
+-	0x06, 0xc9, 0x60, 0x88, 0x48, 0x93, 0x68, 0x00, 
+-	0x99, 0x05, 0x42, 0x88, 0xd1, 0x0b, 0x48, 0x8c, 
+-	0x68, 0x00, 0x28, 0x00, 0xd1, 0x07, 0x48, 0x8d, 
+-	0x68, 0x00, 0x28, 0x00, 0xd1, 0x03, 0x98, 0x02, 
+-	0x21, 0x0d, 0x06, 0xc9, 0x60, 0xc8, 0x48, 0x86, 
+-	0x68, 0x00, 0x28, 0x01, 0xd1, 0x73, 0x48, 0x87, 
+-	0x68, 0x00, 0x28, 0x01, 0xd1, 0x6f, 0xb0, 0x84, 
+-	0x98, 0x05, 0xf0, 0x0c, 0xf9, 0xe1, 0x28, 0x00, 
+-	0xd1, 0x0e, 0x2d, 0x0b, 0xdb, 0x01, 0x2d, 0x12, 
+-	0xdd, 0x0a, 0x1d, 0xf8, 0x30, 0x21, 0x99, 0x0a, 
+-	0xf0, 0x02, 0xf9, 0x12, 0x20, 0x92, 0x49, 0x7b, 
+-	0x60, 0x08, 0x20, 0x00, 0xb0, 0x09, 0xe6, 0xea, 
+-	0x49, 0x80, 0x20, 0x91, 0xf0, 0x19, 0xfa, 0xa2, 
+-	0x28, 0x92, 0xd0, 0x00, 0xe7, 0xf8, 0xf0, 0x0c, 
+-	0xfa, 0x22, 0x20, 0x92, 0x49, 0x7b, 0x60, 0x08, 
+-	0x20, 0x01, 0x49, 0x7b, 0x68, 0x09, 0x60, 0x08, 
+-	0x2d, 0x0b, 0xdb, 0x39, 0x2d, 0x12, 0xdc, 0x37, 
+-	0xb0, 0x81, 0x24, 0x00, 0x20, 0x00, 0x90, 0x03, 
+-	0x20, 0x01, 0x49, 0x75, 0x68, 0x09, 0x23, 0x07, 
+-	0x02, 0x1b, 0x18, 0xc9, 0x66, 0x88, 0x6a, 0xb8, 
+-	0x30, 0x01, 0x05, 0x00, 0x6a, 0xf9, 0x31, 0x01, 
+-	0x02, 0x89, 0x43, 0x08, 0x6b, 0x79, 0x31, 0x02, 
+-	0x43, 0x08, 0x90, 0x00, 0x20, 0x00, 0x62, 0xb8, 
+-	0x20, 0x00, 0x62, 0xf8, 0x48, 0x67, 0x63, 0x38, 
+-	0x48, 0x67, 0x63, 0x78, 0x6b, 0x38, 0xf7, 0xff, 
+-	0xfe, 0x9c, 0x90, 0x02, 0x48, 0x66, 0x68, 0x00, 
+-	0x23, 0x77, 0x01, 0x1b, 0x18, 0xc0, 0x9a, 0x02, 
+-	0x1c, 0x39, 0xf0, 0x0b, 0xfe, 0x05, 0x98, 0x00, 
+-	0x49, 0x61, 0x68, 0x09, 0x23, 0x07, 0x02, 0x1b, 
+-	0x18, 0xc9, 0x66, 0xc8, 0x48, 0x5e, 0x68, 0x00, 
+-	0xf0, 0x0c, 0xf9, 0xf8, 0xb0, 0x01, 0xe1, 0x2b, 
+-	0x24, 0x00, 0x26, 0x00, 0x2e, 0x00, 0xd1, 0x16, 
+-	0x2c, 0x07, 0xd2, 0x14, 0x6a, 0xf8, 0x05, 0x81, 
+-	0x0d, 0x89, 0x1c, 0x20, 0x34, 0x01, 0x00, 0x83, 
+-	0x18, 0x18, 0x00, 0xc0, 0xe0, 0x00, 0xe1, 0x3c, 
+-	0x4a, 0x53, 0x68, 0x12, 0x18, 0x80, 0x23, 0x05, 
+-	0x02, 0x1b, 0x18, 0xc0, 0x6f, 0xc0, 0x42, 0x81, 
+-	0xd1, 0x00, 0x26, 0x01, 0xe7, 0xe6, 0x2e, 0x00, 
+-	0xd1, 0x13, 0x2c, 0x18, 0xd2, 0x11, 0x6a, 0xf8, 
+-	0x05, 0x81, 0x0d, 0x89, 0x1c, 0x20, 0x34, 0x01, 
+-	0x23, 0x4c, 0x43, 0x58, 0x4a, 0x48, 0x68, 0x12, 
+-	0x18, 0x80, 0x38, 0xff, 0x38, 0xff, 0x38, 0x02, 
+-	0x69, 0x40, 0x42, 0x81, 0xd1, 0x00, 0x26, 0x01, 
+-	0xe7, 0xe9, 0x3c, 0x01, 0x6b, 0x38, 0xf7, 0xff, 
+-	0xfe, 0x50, 0x90, 0x01, 0x2c, 0x07, 0xd2, 0x05, 
+-	0x48, 0x3f, 0x68, 0x01, 0x1c, 0x20, 0xf0, 0x0b, 
+-	0xfc, 0xcb, 0xe0, 0x06, 0x2c, 0x18, 0xd2, 0x04, 
+-	0x1f, 0xe0, 0x49, 0x3b, 0x68, 0x09, 0xf0, 0x0b, 
+-	0xfd, 0x01, 0x48, 0x3a, 0x49, 0x38, 0x68, 0x09, 
+-	0x23, 0x09, 0x01, 0xdb, 0x18, 0xc9, 0x66, 0xc8, 
+-	0x48, 0x36, 0x49, 0x35, 0x68, 0x09, 0x23, 0x09, 
+-	0x01, 0xdb, 0x18, 0xc9, 0x67, 0x08, 0x48, 0x33, 
+-	0x49, 0x31, 0x68, 0x09, 0x23, 0x09, 0x01, 0xdb, 
+-	0x18, 0xc9, 0x66, 0x88, 0x48, 0x2f, 0x49, 0x2e, 
+-	0x68, 0x09, 0x23, 0x09, 0x01, 0xdb, 0x18, 0xc9, 
+-	0x66, 0x48, 0x20, 0x00, 0x49, 0x2a, 0x68, 0x09, 
+-	0x23, 0x09, 0x01, 0xdb, 0x18, 0xc9, 0x64, 0x88, 
+-	0x6b, 0x79, 0x48, 0x27, 0x68, 0x00, 0xf0, 0x0b, 
+-	0xfd, 0x4b, 0x94, 0x02, 0x1d, 0xf8, 0x30, 0x21, 
+-	0x99, 0x0a, 0xf0, 0x02, 0xf8, 0x4d, 0x24, 0x00, 
+-	0x26, 0x00, 0x2e, 0x00, 0xd1, 0x14, 0x2c, 0x07, 
+-	0xd2, 0x12, 0x6a, 0xf8, 0x05, 0x81, 0x0d, 0x89, 
+-	0x1c, 0x20, 0x34, 0x01, 0x00, 0x83, 0x18, 0x18, 
+-	0x00, 0xc0, 0x4a, 0x1b, 0x68, 0x12, 0x18, 0x80, 
+-	0x23, 0x05, 0x02, 0x1b, 0x18, 0xc0, 0x6f, 0xc0, 
+-	0x42, 0x81, 0xda, 0x00, 0x26, 0x01, 0xe7, 0xe8, 
+-	0x2e, 0x00, 0xd1, 0x2f, 0x2c, 0x18, 0xd2, 0x2d, 
+-	0x6a, 0xf8, 0x05, 0x81, 0x0d, 0x89, 0x1c, 0x20, 
+-	0x34, 0x01, 0x23, 0x4c, 0x43, 0x58, 0x4a, 0x10, 
+-	0x68, 0x12, 0x18, 0x80, 0x38, 0xff, 0x38, 0xff, 
+-	0x38, 0x02, 0x69, 0x40, 0x42, 0x81, 0xda, 0x1c, 
+-	0xe0, 0x1a, 0x00, 0x00, 0x2e, 0x03, 0x3a, 0x54, 
+-	0x2e, 0x08, 0x94, 0x84, 0x2e, 0x08, 0x7c, 0xc0, 
+-	0x2e, 0x08, 0x7c, 0x58, 0x2e, 0x08, 0x60, 0x84, 
+-	0x2e, 0x08, 0x7d, 0x94, 0x2e, 0x08, 0x7c, 0xbc, 
+-	0x2e, 0x08, 0x5e, 0x4c, 0x00, 0x00, 0x02, 0xcf, 
+-	0x00, 0x00, 0x02, 0x3f, 0x2e, 0x08, 0x94, 0x88, 
+-	0x2e, 0x08, 0x7d, 0xb4, 0x00, 0x00, 0xff, 0xff, 
+-	0x26, 0x01, 0xe7, 0xcd, 0x3c, 0x01, 0x6b, 0x38, 
+-	0xf7, 0xff, 0xfd, 0xc3, 0x90, 0x01, 0x2c, 0x07, 
+-	0xd2, 0x12, 0x48, 0x48, 0x68, 0x01, 0x1c, 0x20, 
+-	0xf0, 0x0b, 0xfb, 0xcc, 0x00, 0xa0, 0x19, 0x00, 
+-	0x00, 0xc0, 0x49, 0x44, 0x68, 0x09, 0x18, 0x40, 
+-	0x23, 0x2b, 0x01, 0x5b, 0x18, 0xc0, 0x9a, 0x01, 
+-	0x1c, 0x39, 0xf0, 0x0b, 0xfd, 0x21, 0xe0, 0x4a, 
+-	0x2c, 0x18, 0xd2, 0x48, 0x1f, 0xe0, 0x49, 0x3d, 
+-	0x68, 0x09, 0xf0, 0x0b, 0xfc, 0x0b, 0x20, 0x4c, 
+-	0x43, 0x60, 0x49, 0x3a, 0x68, 0x09, 0x18, 0x40, 
+-	0x38, 0xff, 0x38, 0xff, 0x38, 0x0a, 0x9a, 0x01, 
+-	0x1c, 0x39, 0xf0, 0x0b, 0xfd, 0x0d, 0x20, 0x4c, 
+-	0x43, 0x60, 0x49, 0x34, 0x68, 0x09, 0x18, 0x40, 
+-	0x38, 0xff, 0x38, 0xff, 0x38, 0x82, 0x6f, 0xc0, 
+-	0x28, 0x00, 0xd0, 0x17, 0x20, 0x4c, 0x43, 0x60, 
+-	0x49, 0x2e, 0x68, 0x09, 0x18, 0x40, 0x38, 0xff, 
+-	0x38, 0xff, 0x38, 0x02, 0x68, 0x00, 0x04, 0x00, 
+-	0x0c, 0x00, 0xd0, 0x0b, 0x20, 0x4c, 0x43, 0x60, 
+-	0x49, 0x28, 0x68, 0x09, 0x18, 0x40, 0x38, 0xff, 
+-	0x38, 0xff, 0x38, 0x02, 0x68, 0x00, 0x0c, 0x00, 
+-	0x04, 0x00, 0xd1, 0x0a, 0x20, 0x02, 0x21, 0x4c, 
+-	0x43, 0x61, 0x4a, 0x22, 0x68, 0x12, 0x18, 0x89, 
+-	0x39, 0xff, 0x39, 0xff, 0x39, 0x82, 0x67, 0x48, 
+-	0xe0, 0x09, 0x20, 0x03, 0x21, 0x4c, 0x43, 0x61, 
+-	0x4a, 0x1c, 0x68, 0x12, 0x18, 0x89, 0x39, 0xff, 
+-	0x39, 0xff, 0x39, 0x82, 0x67, 0x48, 0x48, 0x19, 
+-	0x68, 0x00, 0xf0, 0x0c, 0xf8, 0xcf, 0x6b, 0x79, 
+-	0x48, 0x16, 0x68, 0x00, 0xf0, 0x0b, 0xfc, 0x36, 
+-	0x98, 0x02, 0x42, 0x84, 0xda, 0x01, 0x1c, 0x21, 
+-	0xe0, 0x00, 0x99, 0x02, 0x91, 0x00, 0x99, 0x00, 
+-	0x48, 0x10, 0x68, 0x00, 0xf0, 0x0b, 0xfd, 0x46, 
+-	0x49, 0x0f, 0x20, 0x91, 0xf0, 0x19, 0xf9, 0x1e, 
+-	0x28, 0x92, 0xd0, 0x00, 0xe7, 0xf8, 0x48, 0x0b, 
+-	0x68, 0x00, 0x90, 0x03, 0x48, 0x0b, 0x68, 0x00, 
+-	0x49, 0x08, 0x60, 0x08, 0x98, 0x03, 0x49, 0x09, 
+-	0x60, 0x08, 0x20, 0x92, 0x49, 0x06, 0x60, 0x08, 
+-	0xb0, 0x04, 0x20, 0x92, 0x49, 0x06, 0x60, 0x08, 
+-	0x20, 0x00, 0xb0, 0x05, 0xe5, 0x4b, 0xb0, 0x05, 
+-	0xe5, 0x49, 0x00, 0x00, 0x2e, 0x08, 0x7d, 0xb4, 
+-	0x2e, 0x08, 0x94, 0x88, 0x2e, 0x08, 0x7d, 0xb8, 
+-	0x2e, 0x08, 0x7c, 0xc0, 0xb5, 0xff, 0x1c, 0x07, 
+-	0x9d, 0x09, 0xb0, 0x89, 0x26, 0x00, 0x20, 0x00, 
+-	0x90, 0x03, 0x99, 0x0a, 0x68, 0x4c, 0x2d, 0x13, 
+-	0xd1, 0x05, 0x20, 0x75, 0xb0, 0x09, 0xb0, 0x04, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x98, 0x15, 
+-	0x60, 0x04, 0x20, 0x00, 0x60, 0xe0, 0x20, 0x00, 
+-	0x61, 0x20, 0x69, 0x60, 0x4b, 0xf9, 0x40, 0x18, 
+-	0x61, 0x60, 0x02, 0x00, 0x69, 0x60, 0x4b, 0xf8, 
+-	0x40, 0x18, 0x61, 0x60, 0x04, 0x80, 0x69, 0x60, 
+-	0x4b, 0xf6, 0x40, 0x18, 0x61, 0x60, 0x05, 0x80, 
+-	0x69, 0x60, 0x23, 0xc0, 0x43, 0xdb, 0x40, 0x18, 
+-	0x61, 0x60, 0x06, 0x00, 0x69, 0x60, 0x4b, 0xf2, 
+-	0x40, 0x18, 0x61, 0x60, 0x04, 0x40, 0x69, 0x60, 
+-	0x23, 0x20, 0x43, 0xdb, 0x40, 0x18, 0x61, 0x60, 
+-	0x06, 0x80, 0x69, 0x60, 0x09, 0x40, 0x01, 0x40, 
+-	0x61, 0x60, 0x06, 0xc0, 0x20, 0x00, 0x61, 0xa0, 
+-	0x20, 0x00, 0x61, 0xe0, 0x20, 0x00, 0x62, 0x20, 
+-	0x20, 0x00, 0x62, 0x60, 0x20, 0x00, 0x63, 0xa0, 
+-	0x20, 0x00, 0x63, 0xe0, 0x20, 0x00, 0x64, 0x60, 
+-	0x20, 0x00, 0x64, 0x20, 0x20, 0x00, 0x60, 0x20, 
+-	0x20, 0x00, 0x71, 0x20, 0x99, 0x0a, 0x68, 0x48, 
+-	0x64, 0xe0, 0x99, 0x0a, 0x68, 0x08, 0x64, 0xa0, 
+-	0x1d, 0xe0, 0x30, 0x21, 0x99, 0x13, 0xf0, 0x01, 
+-	0xff, 0x07, 0x2d, 0x0b, 0xdb, 0x06, 0x2d, 0x12, 
+-	0xdc, 0x04, 0x1d, 0xe0, 0x30, 0x49, 0x99, 0x13, 
+-	0xf0, 0x01, 0xfe, 0xfe, 0x6b, 0x20, 0x6a, 0xa1, 
+-	0x1a, 0x40, 0x30, 0x01, 0x63, 0xa0, 0x00, 0xa8, 
+-	0x49, 0xd4, 0x58, 0x08, 0x69, 0x61, 0x09, 0x49, 
+-	0x01, 0x49, 0x06, 0xc0, 0x0e, 0xc0, 0x43, 0x08, 
+-	0x61, 0x60, 0x06, 0xc0, 0x0e, 0xc0, 0x6b, 0x20, 
+-	0x6a, 0xa1, 0x1a, 0x40, 0x1c, 0x41, 0x91, 0x04, 
+-	0x69, 0x60, 0x23, 0x04, 0x40, 0x18, 0xd0, 0x02, 
+-	0x99, 0x04, 0x08, 0x49, 0x91, 0x04, 0x00, 0xa8, 
+-	0x49, 0xc9, 0x58, 0x08, 0x99, 0x04, 0x43, 0x48, 
+-	0x61, 0xe0, 0x2d, 0x13, 0xd1, 0x04, 0x20, 0x00, 
+-	0x90, 0x14, 0x20, 0x00, 0x61, 0xa0, 0xe0, 0x13, 
+-	0x9b, 0x0c, 0x68, 0x58, 0x90, 0x01, 0x98, 0x01, 
+-	0x08, 0x80, 0x61, 0xa0, 0x98, 0x01, 0x64, 0x60, 
+-	0x9b, 0x0c, 0x68, 0x18, 0x64, 0x20, 0x20, 0x00, 
+-	0x62, 0x60, 0x9a, 0x0b, 0x63, 0xe2, 0x69, 0x60, 
+-	0x4b, 0xb6, 0x40, 0x18, 0x61, 0x60, 0x02, 0x00, 
+-	0x69, 0x60, 0x4b, 0xb6, 0x40, 0x18, 0x61, 0x60, 
+-	0x05, 0x80, 0x69, 0x60, 0x23, 0x0f, 0x02, 0x9b, 
+-	0x43, 0x18, 0x61, 0x60, 0x04, 0x80, 0x69, 0x60, 
+-	0x23, 0x20, 0x43, 0xdb, 0x40, 0x18, 0x61, 0x60, 
+-	0x06, 0x80, 0x69, 0x60, 0x23, 0xc0, 0x43, 0x18, 
+-	0x61, 0x60, 0x06, 0x00, 0x69, 0x60, 0x23, 0x01, 
+-	0x03, 0x9b, 0x43, 0x18, 0x61, 0x60, 0x04, 0x40, 
+-	0x98, 0x14, 0x60, 0xe0, 0x61, 0x25, 0x48, 0xab, 
+-	0x68, 0x00, 0x28, 0x00, 0xd0, 0x06, 0x98, 0x14, 
+-	0x28, 0x19, 0xd3, 0x01, 0x20, 0x01, 0xe0, 0x00, 
+-	0x20, 0x00, 0xe0, 0x05, 0x98, 0x14, 0x28, 0x08, 
+-	0xd3, 0x01, 0x20, 0x01, 0xe0, 0x00, 0x20, 0x00, 
+-	0x28, 0x00, 0xd0, 0x02, 0x20, 0x00, 0xb0, 0x09, 
+-	0xe7, 0x35, 0x49, 0xa1, 0x20, 0x91, 0xf0, 0x19, 
+-	0xf8, 0x21, 0x28, 0x92, 0xd0, 0x03, 0x20, 0x01, 
+-	0xf0, 0x0b, 0xf8, 0x08, 0xe7, 0xf5, 0x48, 0x9d, 
+-	0x68, 0x00, 0x28, 0x01, 0xd1, 0x53, 0x68, 0x38, 
+-	0x01, 0x80, 0x0f, 0xc0, 0x68, 0xa1, 0x4b, 0x9a, 
+-	0x40, 0x19, 0x07, 0xc0, 0x09, 0x80, 0x43, 0x08, 
+-	0x60, 0xa0, 0x01, 0x80, 0x0f, 0xc0, 0x68, 0x38, 
+-	0x01, 0xc0, 0x0f, 0xc0, 0x68, 0xa1, 0x4b, 0x95, 
+-	0x40, 0x19, 0x07, 0xc0, 0x09, 0xc0, 0x43, 0x08, 
+-	0x60, 0xa0, 0x01, 0xc0, 0x0f, 0xc0, 0x68, 0x38, 
+-	0x02, 0x00, 0x0e, 0x00, 0x68, 0xa1, 0x4b, 0x85, 
+-	0x40, 0x19, 0x06, 0x00, 0x0e, 0x00, 0x04, 0x00, 
+-	0x43, 0x08, 0x60, 0xa0, 0x02, 0x00, 0x0e, 0x00, 
+-	0x48, 0x86, 0x68, 0x00, 0x28, 0x00, 0xd1, 0x2a, 
+-	0x2f, 0x00, 0xd0, 0x28, 0x20, 0x0d, 0x06, 0xc0, 
+-	0x6a, 0x00, 0x1c, 0x06, 0x68, 0x38, 0x4b, 0x85, 
+-	0x43, 0x98, 0xd0, 0x06, 0x68, 0x38, 0x02, 0x00, 
+-	0x0e, 0x01, 0x20, 0x01, 0x40, 0x88, 0x43, 0x06, 
+-	0xe0, 0x05, 0x68, 0x38, 0x02, 0x00, 0x0e, 0x00, 
+-	0x21, 0x01, 0x40, 0x81, 0x43, 0x8e, 0x68, 0x38, 
+-	0x4b, 0x7b, 0x43, 0x98, 0xd0, 0x08, 0x68, 0x38, 
+-	0x02, 0x00, 0x0e, 0x00, 0x1d, 0xc1, 0x31, 0x01, 
+-	0x20, 0x01, 0x40, 0x88, 0x43, 0x06, 0xe0, 0x06, 
+-	0x68, 0x38, 0x02, 0x00, 0x0e, 0x00, 0x30, 0x08, 
+-	0x21, 0x01, 0x40, 0x81, 0x43, 0x8e, 0x2d, 0x0b, 
+-	0xdb, 0x0a, 0x2d, 0x12, 0xdc, 0x08, 0x48, 0x6f, 
+-	0x68, 0x00, 0x28, 0x01, 0xd1, 0x04, 0x20, 0x51, 
+-	0x01, 0x00, 0x21, 0x0d, 0x06, 0xc9, 0x60, 0x08, 
+-	0x98, 0x14, 0x00, 0x80, 0x49, 0x6c, 0x58, 0x08, 
+-	0x28, 0x00, 0xd0, 0x01, 0x20, 0x83, 0x90, 0x03, 
+-	0x2d, 0x0b, 0xdb, 0x08, 0x2d, 0x12, 0xdc, 0x06, 
+-	0x48, 0x68, 0x68, 0x00, 0x28, 0x00, 0xd0, 0x01, 
+-	0x20, 0x84, 0x90, 0x03, 0xe0, 0x06, 0x9a, 0x0b, 
+-	0x2a, 0x01, 0xd1, 0x03, 0x2d, 0x13, 0xd0, 0x01, 
+-	0x20, 0x82, 0x90, 0x03, 0x98, 0x03, 0x28, 0x00, 
+-	0xd0, 0x07, 0x20, 0x92, 0x49, 0x5a, 0x60, 0x08, 
+-	0x20, 0x08, 0x60, 0xe0, 0x98, 0x03, 0xb0, 0x09, 
+-	0xe6, 0xa1, 0x98, 0x15, 0x68, 0x01, 0x98, 0x14, 
+-	0x00, 0x80, 0x4a, 0x59, 0x50, 0x11, 0x6a, 0xa0, 
+-	0x28, 0x00, 0xda, 0x01, 0x20, 0x00, 0x62, 0xa0, 
+-	0x6b, 0x20, 0x28, 0x00, 0xdc, 0x01, 0x20, 0x01, 
+-	0x63, 0x20, 0x6a, 0xe0, 0x28, 0x00, 0xda, 0x01, 
+-	0x20, 0x00, 0x62, 0xe0, 0x6b, 0x60, 0x4b, 0x52, 
+-	0x42, 0x98, 0xdd, 0x01, 0x48, 0x50, 0x63, 0x60, 
+-	0x6b, 0x20, 0xf7, 0xff, 0xfb, 0x9e, 0x90, 0x00, 
+-	0x2d, 0x13, 0xd1, 0x05, 0x6a, 0xa1, 0x9a, 0x00, 
+-	0x48, 0x4c, 0xf0, 0x0b, 0xff, 0x99, 0xe0, 0x15, 
+-	0x2d, 0x0b, 0xdb, 0x01, 0x2d, 0x12, 0xdd, 0x03, 
+-	0x48, 0x40, 0x68, 0x00, 0x28, 0x00, 0xd1, 0x0d, 
+-	0x2d, 0x0b, 0xdb, 0x06, 0x2d, 0x12, 0xdc, 0x04, 
+-	0x48, 0x3e, 0x68, 0x00, 0x28, 0x01, 0xd1, 0x00, 
+-	0xe0, 0x04, 0x6a, 0xa1, 0x9a, 0x00, 0x48, 0x41, 
+-	0xf0, 0x0b, 0xff, 0x82, 0x2d, 0x0b, 0xdb, 0x5f, 
+-	0x2d, 0x12, 0xdc, 0x5e, 0x98, 0x15, 0x68, 0x00, 
+-	0x49, 0x3a, 0x60, 0x08, 0x99, 0x13, 0xa8, 0x05, 
+-	0xf0, 0x01, 0xfd, 0xae, 0xa9, 0x05, 0x98, 0x15, 
+-	0x68, 0x00, 0xf0, 0x05, 0xfc, 0x5f, 0x1d, 0xe0, 
+-	0x30, 0x21, 0xa9, 0x05, 0xf0, 0x01, 0xfd, 0xa4, 
+-	0x20, 0x01, 0x49, 0x35, 0x65, 0x08, 0x20, 0x02, 
+-	0x21, 0x0d, 0x06, 0xc9, 0x60, 0xc8, 0x21, 0x00, 
+-	0x20, 0x02, 0xf0, 0x04, 0xfa, 0xdd, 0x2d, 0x0b, 
+-	0xd0, 0x05, 0x2d, 0x0f, 0xd0, 0x03, 0x2d, 0x10, 
+-	0xd0, 0x01, 0x2d, 0x11, 0xd1, 0x03, 0x21, 0x00, 
+-	0x20, 0x12, 0xf0, 0x04, 0xfa, 0xd1, 0x2d, 0x0c, 
+-	0xd0, 0x01, 0x2d, 0x0f, 0xd1, 0x03, 0x21, 0x00, 
+-	0x20, 0x04, 0xf0, 0x04, 0xfa, 0xc9, 0x2d, 0x0d, 
+-	0xd0, 0x01, 0x2d, 0x10, 0xd1, 0x03, 0x21, 0x00, 
+-	0x20, 0x08, 0xf0, 0x04, 0xfa, 0xc1, 0x2d, 0x0e, 
+-	0xd0, 0x01, 0x2d, 0x11, 0xd1, 0x03, 0x21, 0x00, 
+-	0x20, 0x01, 0xf0, 0x04, 0xfa, 0xb9, 0x48, 0x15, 
+-	0x68, 0x00, 0x28, 0x01, 0xd1, 0x73, 0xb0, 0x82, 
+-	0x49, 0x1c, 0x20, 0x91, 0xf0, 0x18, 0xff, 0x06, 
+-	0x28, 0x92, 0xd0, 0x00, 0xe7, 0xf8, 0xf0, 0x0b, 
+-	0xfe, 0x86, 0x20, 0x92, 0x49, 0x17, 0x60, 0x08, 
+-	0x20, 0x01, 0x49, 0x17, 0x68, 0x09, 0x60, 0x08, 
+-	0x20, 0x01, 0x49, 0x15, 0x68, 0x09, 0x23, 0x07, 
+-	0x02, 0x1b, 0x18, 0xc9, 0x66, 0x88, 0xe0, 0x25, 
+-	0xe0, 0xae, 0xe0, 0xad, 0xff, 0x00, 0xff, 0xff, 
+-	0xff, 0xff, 0xc3, 0xff, 0xff, 0xff, 0xfc, 0xff, 
+-	0xff, 0xff, 0xbf, 0xff, 0x2e, 0x03, 0x3a, 0x04, 
+-	0x2e, 0x03, 0x3a, 0x54, 0x2e, 0x08, 0x94, 0x84, 
+-	0x2e, 0x08, 0x7c, 0xc0, 0x2e, 0x08, 0x60, 0x84, 
+-	0xfd, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 
+-	0x2e, 0x08, 0x7c, 0x58, 0x2e, 0x08, 0x7c, 0xbc, 
+-	0x00, 0x00, 0x02, 0x3f, 0x2e, 0x08, 0x7d, 0x94, 
+-	0xcc, 0x00, 0x00, 0x00, 0x2e, 0x08, 0x94, 0x88, 
+-	0x2e, 0x08, 0x7d, 0xb4, 0x6a, 0xa0, 0x30, 0x01, 
+-	0x05, 0x00, 0x6a, 0xe1, 0x31, 0x01, 0x02, 0x89, 
+-	0x43, 0x08, 0x6b, 0x61, 0x31, 0x02, 0x43, 0x08, 
+-	0x90, 0x00, 0x20, 0x00, 0x62, 0xa0, 0x20, 0x00, 
+-	0x62, 0xe0, 0x48, 0x5f, 0x63, 0x20, 0x48, 0x5f, 
+-	0x63, 0x60, 0x6b, 0x20, 0xf7, 0xff, 0xfa, 0xe1, 
+-	0x90, 0x02, 0x48, 0x5d, 0x68, 0x00, 0x23, 0x77, 
+-	0x01, 0x1b, 0x18, 0xc0, 0x9a, 0x02, 0x1c, 0x21, 
+-	0xf0, 0x0b, 0xfa, 0x4a, 0x98, 0x00, 0x49, 0x58, 
+-	0x68, 0x09, 0x23, 0x07, 0x02, 0x1b, 0x18, 0xc9, 
+-	0x66, 0xc8, 0x48, 0x55, 0x68, 0x00, 0x21, 0x00, 
+-	0xf0, 0x0b, 0xfa, 0xc4, 0x48, 0x52, 0x68, 0x00, 
+-	0xf0, 0x0b, 0xfe, 0x38, 0x49, 0x51, 0x20, 0x91, 
+-	0xf0, 0x18, 0xfe, 0x98, 0xe0, 0x00, 0xe0, 0x11, 
+-	0x28, 0x92, 0xd0, 0x00, 0xe7, 0xf6, 0x48, 0x4c, 
+-	0x68, 0x00, 0x90, 0x01, 0x48, 0x4c, 0x68, 0x00, 
+-	0x49, 0x49, 0x60, 0x08, 0x98, 0x01, 0x49, 0x4a, 
+-	0x60, 0x08, 0x20, 0x92, 0x49, 0x47, 0x60, 0x08, 
+-	0xb0, 0x02, 0xe0, 0x40, 0x48, 0x47, 0x68, 0x00, 
+-	0x28, 0x00, 0xd0, 0x0c, 0x6a, 0xa0, 0x30, 0x01, 
+-	0x05, 0x00, 0x6a, 0xe1, 0x31, 0x01, 0x02, 0x89, 
+-	0x43, 0x08, 0x6b, 0x61, 0x31, 0x02, 0x43, 0x08, 
+-	0x49, 0x41, 0x60, 0x08, 0xe0, 0x0c, 0x6a, 0xa0, 
+-	0x30, 0x01, 0x05, 0x00, 0x6a, 0xe1, 0x31, 0x01, 
+-	0x02, 0x89, 0x43, 0x08, 0x6b, 0x61, 0x31, 0x02, 
+-	0x43, 0x08, 0x21, 0x0d, 0x06, 0xc9, 0x61, 0x88, 
+-	0x20, 0x0d, 0x06, 0xc0, 0x68, 0x80, 0x90, 0x02, 
+-	0x20, 0x00, 0x21, 0x0d, 0x06, 0xc9, 0x60, 0x88, 
+-	0xf0, 0x00, 0xfe, 0x82, 0x48, 0x33, 0x68, 0x00, 
+-	0x28, 0x00, 0xd0, 0x07, 0x20, 0x00, 0x62, 0xa0, 
+-	0x20, 0x00, 0x62, 0xe0, 0x48, 0x2a, 0x63, 0x20, 
+-	0x48, 0x2a, 0x63, 0x60, 0x6b, 0x20, 0xf7, 0xff, 
+-	0xfa, 0x78, 0x90, 0x00, 0x9a, 0x00, 0x99, 0x14, 
+-	0x1c, 0x20, 0xf0, 0x00, 0xfd, 0xfb, 0x98, 0x02, 
+-	0x21, 0x0d, 0x06, 0xc9, 0x60, 0x88, 0xe0, 0x05, 
+-	0x2d, 0x13, 0xd1, 0x03, 0x20, 0x1f, 0x21, 0x0d, 
+-	0x06, 0xc9, 0x60, 0x08, 0x2d, 0x0b, 0xdb, 0x01, 
+-	0x2d, 0x12, 0xdd, 0x1a, 0x48, 0x23, 0x68, 0x00, 
+-	0x28, 0x00, 0xd1, 0x16, 0x20, 0x0d, 0x06, 0xc0, 
+-	0x68, 0x80, 0x90, 0x02, 0x20, 0x00, 0x21, 0x0d, 
+-	0x06, 0xc9, 0x60, 0x88, 0xf0, 0x00, 0xfe, 0x50, 
+-	0x6b, 0x20, 0xf7, 0xff, 0xfa, 0x52, 0x90, 0x00, 
+-	0x9a, 0x00, 0x99, 0x14, 0x1c, 0x20, 0xf0, 0x00, 
+-	0xfd, 0xd5, 0x98, 0x02, 0x21, 0x0d, 0x06, 0xc9, 
+-	0x60, 0x88, 0x48, 0x14, 0x68, 0x00, 0x28, 0x01, 
+-	0xd1, 0x06, 0x48, 0x14, 0x68, 0x00, 0x28, 0x00, 
+-	0xd1, 0x02, 0x20, 0x0d, 0x06, 0xc0, 0x62, 0x06, 
+-	0x48, 0x0e, 0x68, 0x00, 0x28, 0x01, 0xd1, 0x07, 
+-	0x48, 0x0e, 0x68, 0x00, 0x28, 0x01, 0xd1, 0x03, 
+-	0x98, 0x14, 0x21, 0x00, 0xf0, 0x0b, 0xfd, 0x0a, 
+-	0x20, 0x92, 0x49, 0x0b, 0x60, 0x08, 0x20, 0x00, 
+-	0xb0, 0x09, 0xe5, 0x10, 0xb0, 0x09, 0xe5, 0x0e, 
+-	0x00, 0x00, 0x02, 0xcf, 0x00, 0x00, 0x02, 0x3f, 
+-	0x2e, 0x08, 0x7d, 0xb4, 0x2e, 0x08, 0x94, 0x88, 
+-	0x2e, 0x08, 0x7d, 0xb8, 0x2e, 0x08, 0x60, 0x84, 
+-	0x2e, 0x08, 0x5e, 0x4c, 0x2e, 0x08, 0x94, 0x84, 
+-	0x2e, 0x08, 0x7c, 0xc0, 0xb5, 0xf7, 0xb0, 0x83, 
+-	0x9f, 0x03, 0x69, 0x38, 0x90, 0x00, 0x98, 0x00, 
+-	0x28, 0x13, 0xd1, 0x05, 0x20, 0x75, 0xb0, 0x03, 
+-	0xb0, 0x03, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x6c, 0x78, 0x99, 0x04, 0x60, 0x48, 0x6c, 0x38, 
+-	0x99, 0x04, 0x60, 0x08, 0x6c, 0xf8, 0x9a, 0x05, 
+-	0x60, 0x50, 0x6c, 0xb8, 0x9a, 0x05, 0x60, 0x10, 
+-	0x68, 0xfd, 0x48, 0xf9, 0x68, 0x00, 0x28, 0x00, 
+-	0xd0, 0x05, 0x2d, 0x19, 0xd3, 0x01, 0x20, 0x01, 
+-	0xe0, 0x00, 0x20, 0x00, 0xe0, 0x04, 0x2d, 0x08, 
+-	0xd3, 0x01, 0x20, 0x01, 0xe0, 0x00, 0x20, 0x00, 
+-	0x28, 0x00, 0xd0, 0x02, 0x20, 0x00, 0xb0, 0x03, 
+-	0xe7, 0xda, 0x49, 0xf0, 0x20, 0x91, 0xf0, 0x18, 
+-	0xfd, 0xb9, 0x28, 0x92, 0xd0, 0x03, 0x20, 0x01, 
+-	0xf0, 0x0a, 0xfd, 0xa0, 0xe7, 0xf5, 0x00, 0xa8, 
+-	0x49, 0xeb, 0x58, 0x08, 0x99, 0x03, 0x42, 0x88, 
+-	0xd0, 0x05, 0x20, 0x92, 0x49, 0xe7, 0x60, 0x08, 
+-	0x20, 0xff, 0xb0, 0x03, 0xe7, 0xc4, 0x21, 0x00, 
+-	0x00, 0xa8, 0x4a, 0xe5, 0x50, 0x11, 0x48, 0xe2, 
+-	0x68, 0x00, 0x28, 0x00, 0xd0, 0x05, 0x69, 0x38, 
+-	0x28, 0x0b, 0xdb, 0x16, 0x69, 0x38, 0x28, 0x12, 
+-	0xdc, 0x13, 0x48, 0xe0, 0x68, 0x00, 0x28, 0x01, 
+-	0xd1, 0x06, 0x69, 0x38, 0x28, 0x0b, 0xdb, 0x03, 
+-	0x69, 0x38, 0x28, 0x12, 0xdc, 0x00, 0xe0, 0x08, 
+-	0x6b, 0x38, 0xf7, 0xff, 0xf9, 0xb6, 0x90, 0x01, 
+-	0x6a, 0xb9, 0x9a, 0x01, 0x48, 0xd8, 0xf0, 0x0b, 
+-	0xfd, 0x85, 0x69, 0x38, 0x28, 0x0b, 0xdb, 0x2e, 
+-	0x69, 0x38, 0x28, 0x12, 0xdc, 0x2b, 0x48, 0xd0, 
+-	0x68, 0x00, 0x28, 0x00, 0xd1, 0x27, 0x20, 0x00, 
+-	0x49, 0xd2, 0x65, 0x08, 0x20, 0x01, 0x03, 0x00, 
+-	0x49, 0xd0, 0x65, 0x48, 0x20, 0x00, 0x49, 0xcf, 
+-	0x65, 0x88, 0x20, 0x00, 0x49, 0xcd, 0x65, 0xc8, 
+-	0x20, 0x00, 0x49, 0xcc, 0x66, 0x08, 0x20, 0x00, 
+-	0x49, 0xcb, 0x60, 0x08, 0x20, 0x02, 0x21, 0x0d, 
+-	0x06, 0xc9, 0x60, 0xc8, 0x21, 0x00, 0x20, 0x02, 
+-	0xf0, 0x04, 0xf9, 0x0a, 0x48, 0xc3, 0x68, 0x00, 
+-	0x28, 0x00, 0xd1, 0x04, 0x48, 0xc5, 0x21, 0x0d, 
+-	0x06, 0xc9, 0x61, 0x88, 0xe0, 0x02, 0x48, 0xc3, 
+-	0x49, 0xc3, 0x60, 0x08, 0xe0, 0x06, 0x69, 0x38, 
+-	0x28, 0x13, 0xd1, 0x03, 0x20, 0x00, 0x21, 0x0d, 
+-	0x06, 0xc9, 0x60, 0x08, 0x48, 0xb6, 0x68, 0x00, 
+-	0x28, 0x00, 0xd1, 0x2c, 0x20, 0x0d, 0x06, 0xc0, 
+-	0x68, 0x80, 0x90, 0x02, 0x20, 0x00, 0x21, 0x0d, 
+-	0x06, 0xc9, 0x60, 0x88, 0xf0, 0x00, 0xfd, 0x64, 
+-	0x20, 0x00, 0x43, 0xc0, 0x00, 0xe9, 0x4b, 0xb7, 
+-	0x18, 0xc9, 0x60, 0x08, 0x20, 0x00, 0x43, 0xc0, 
+-	0x00, 0xe9, 0x4b, 0xb4, 0x18, 0xc9, 0x60, 0x48, 
+-	0x20, 0x00, 0x43, 0xc0, 0x00, 0xe9, 0x4b, 0xb1, 
+-	0x18, 0xc9, 0x64, 0x08, 0x20, 0x00, 0x43, 0xc0, 
+-	0x00, 0xe9, 0x4b, 0xae, 0x18, 0xc9, 0x64, 0x48, 
+-	0x20, 0x01, 0x40, 0xa8, 0x43, 0xc0, 0x99, 0x02, 
+-	0x40, 0x08, 0x90, 0x02, 0x98, 0x02, 0x21, 0x0d, 
+-	0x06, 0xc9, 0x60, 0x88, 0xe0, 0x9c, 0x69, 0x38, 
+-	0x28, 0x0b, 0xdb, 0x74, 0x69, 0x38, 0x28, 0x12, 
+-	0xdc, 0x72, 0x48, 0x9b, 0x68, 0x00, 0x28, 0x01, 
+-	0xd1, 0x6f, 0x20, 0x00, 0x49, 0x9d, 0x65, 0x08, 
+-	0x20, 0x01, 0x03, 0x00, 0x49, 0x9b, 0x65, 0x48, 
+-	0x20, 0x00, 0x49, 0x9a, 0x65, 0x88, 0x20, 0x00, 
+-	0x49, 0x98, 0x65, 0xc8, 0x20, 0x00, 0x49, 0x97, 
+-	0x66, 0x08, 0x20, 0x00, 0x49, 0x96, 0x60, 0x08, 
+-	0x20, 0x02, 0x21, 0x0d, 0x06, 0xc9, 0x60, 0xc8, 
+-	0x21, 0x00, 0x20, 0x02, 0xf0, 0x04, 0xf8, 0xa0, 
+-	0x49, 0x95, 0x20, 0x91, 0xf0, 0x18, 0xfc, 0xf2, 
+-	0x28, 0x92, 0xd0, 0x00, 0xe7, 0xf8, 0xf0, 0x0b, 
+-	0xfc, 0x72, 0x20, 0x92, 0x49, 0x90, 0x60, 0x08, 
+-	0x48, 0x90, 0x68, 0x00, 0x23, 0x0d, 0x01, 0xdb, 
+-	0x18, 0xc0, 0x69, 0x80, 0x08, 0x40, 0x00, 0x40, 
+-	0x49, 0x8c, 0x68, 0x09, 0x23, 0x0d, 0x01, 0xdb, 
+-	0x18, 0xc9, 0x61, 0x88, 0x20, 0x01, 0x49, 0x89, 
+-	0x68, 0x09, 0x60, 0x08, 0x20, 0x01, 0x49, 0x87, 
+-	0x68, 0x09, 0x23, 0x07, 0x02, 0x1b, 0x18, 0xc9, 
+-	0x66, 0x88, 0x20, 0x00, 0x43, 0xc0, 0x49, 0x83, 
+-	0x68, 0x09, 0x23, 0x0f, 0x01, 0xdb, 0x18, 0xc9, 
+-	0x61, 0x08, 0x20, 0x00, 0x43, 0xc0, 0x49, 0x7f, 
+-	0x68, 0x09, 0x23, 0x0f, 0x01, 0xdb, 0x18, 0xc9, 
+-	0x61, 0x48, 0x20, 0x00, 0x43, 0xc0, 0x49, 0x7b, 
+-	0x68, 0x09, 0x23, 0x0f, 0x01, 0xdb, 0x18, 0xc9, 
+-	0x60, 0xc8, 0x20, 0x00, 0x43, 0xc0, 0x49, 0x77, 
+-	0x68, 0x09, 0x23, 0x0f, 0x01, 0xdb, 0x18, 0xc9, 
+-	0x60, 0x88, 0x6b, 0x38, 0xf7, 0xff, 0xf8, 0xd9, 
+-	0x90, 0x01, 0x48, 0x72, 0x68, 0x00, 0x23, 0x77, 
+-	0x01, 0x1b, 0x18, 0xc0, 0x9a, 0x01, 0x1c, 0x39, 
+-	0xf0, 0x0b, 0xf8, 0x42, 0xe0, 0x02, 0xe0, 0x23, 
+-	0xe0, 0x22, 0xe0, 0x21, 0x48, 0x67, 0x49, 0x6b, 
+-	0x68, 0x09, 0x23, 0x07, 0x02, 0x1b, 0x18, 0xc9, 
+-	0x66, 0xc8, 0x48, 0x68, 0x68, 0x00, 0x21, 0x00, 
+-	0xf0, 0x0b, 0xf8, 0xb8, 0x48, 0x65, 0x68, 0x00, 
+-	0xf0, 0x0b, 0xfc, 0x2c, 0x49, 0x62, 0x20, 0x91, 
+-	0xf0, 0x18, 0xfc, 0x8c, 0x28, 0x92, 0xd0, 0x00, 
+-	0xe7, 0xf8, 0x48, 0x60, 0x68, 0x04, 0x48, 0x60, 
+-	0x68, 0x00, 0x49, 0x5e, 0x60, 0x08, 0x48, 0x5e, 
+-	0x60, 0x04, 0x20, 0x92, 0x49, 0x5a, 0x60, 0x08, 
+-	0x48, 0x52, 0x68, 0x00, 0x28, 0x01, 0xd1, 0x73, 
+-	0x48, 0x4d, 0x68, 0x00, 0x28, 0x01, 0xd1, 0x6f, 
+-	0x1c, 0x28, 0xf0, 0x0b, 0xfb, 0x9d, 0x28, 0x01, 
+-	0xd1, 0x6a, 0x98, 0x00, 0x28, 0x0b, 0xdb, 0x02, 
+-	0x98, 0x00, 0x28, 0x12, 0xdd, 0x65, 0xb0, 0x84, 
+-	0x49, 0x4f, 0x20, 0x91, 0xf0, 0x18, 0xfc, 0x66, 
+-	0x28, 0x92, 0xd0, 0x00, 0xe7, 0xf8, 0xf0, 0x0b, 
+-	0xfb, 0xe6, 0x48, 0x4c, 0x68, 0x00, 0x68, 0x40, 
+-	0x28, 0x00, 0xd0, 0x06, 0x48, 0x49, 0x68, 0x00, 
+-	0x68, 0x40, 0x38, 0x01, 0x49, 0x47, 0x68, 0x09, 
+-	0x60, 0x48, 0x20, 0x92, 0x49, 0x44, 0x60, 0x08, 
+-	0x20, 0x01, 0x49, 0x44, 0x68, 0x09, 0x60, 0x08, 
+-	0x24, 0x00, 0x20, 0x00, 0x90, 0x02, 0x98, 0x02, 
+-	0x28, 0x00, 0xd1, 0x15, 0x2c, 0x07, 0xd2, 0x13, 
+-	0x6a, 0xf8, 0x05, 0x81, 0x0d, 0x89, 0x1c, 0x20, 
+-	0x34, 0x01, 0x00, 0x83, 0x18, 0x18, 0x00, 0xc0, 
+-	0x4a, 0x3a, 0x68, 0x12, 0x18, 0x80, 0x23, 0x05, 
+-	0x02, 0x1b, 0x18, 0xc0, 0x6f, 0xc0, 0x42, 0x81, 
+-	0xd1, 0x01, 0x20, 0x01, 0x90, 0x02, 0xe7, 0xe6, 
+-	0x98, 0x02, 0x28, 0x00, 0xd1, 0x14, 0x2c, 0x18, 
+-	0xd2, 0x12, 0x6a, 0xf8, 0x05, 0x81, 0x0d, 0x89, 
+-	0x1c, 0x20, 0x34, 0x01, 0x23, 0x4c, 0x43, 0x58, 
+-	0x4a, 0x2e, 0x68, 0x12, 0x18, 0x80, 0x38, 0xff, 
+-	0x38, 0xff, 0x38, 0x02, 0x69, 0x40, 0x42, 0x81, 
+-	0xd1, 0x01, 0x20, 0x01, 0x90, 0x02, 0xe7, 0xe7, 
+-	0x3c, 0x01, 0x6b, 0x38, 0xf7, 0xff, 0xf8, 0x41, 
+-	0x90, 0x01, 0x2c, 0x07, 0xd2, 0x09, 0x48, 0x25, 
+-	0x68, 0x01, 0x1c, 0x20, 0xf0, 0x0a, 0xfe, 0xbc, 
+-	0x48, 0x22, 0x68, 0x00, 0xf0, 0x0b, 0xfb, 0xa6, 
+-	0xe0, 0x09, 0x2c, 0x18, 0xd2, 0x07, 0xe0, 0x01, 
+-	0xe0, 0x95, 0xe0, 0x94, 0x1f, 0xe0, 0x49, 0x1d, 
+-	0x68, 0x09, 0xf0, 0x0a, 0xfe, 0xeb, 0x48, 0x1b, 
+-	0x68, 0x00, 0x4b, 0x1c, 0x18, 0xc0, 0xf0, 0x0b, 
+-	0xf8, 0x0b, 0x20, 0x00, 0x49, 0x17, 0x68, 0x09, 
+-	0x23, 0x09, 0x01, 0xdb, 0x18, 0xc9, 0x64, 0x88, 
+-	0x48, 0x14, 0x68, 0x00, 0x68, 0x40, 0x28, 0x07, 
+-	0xd3, 0x2c, 0x48, 0x12, 0x68, 0x00, 0x23, 0x0d, 
+-	0x01, 0xdb, 0x18, 0xc0, 0x69, 0x80, 0x23, 0xfe, 
+-	0x43, 0x18, 0x49, 0x0e, 0x68, 0x09, 0x23, 0x0d, 
+-	0x01, 0xdb, 0x18, 0xc9, 0xe0, 0x1c, 0x00, 0x00, 
+-	0x2e, 0x08, 0x94, 0x84, 0x2e, 0x08, 0x7c, 0xc0, 
+-	0x2e, 0x08, 0x7c, 0x58, 0x2e, 0x08, 0x60, 0x84, 
+-	0x2e, 0x08, 0x7d, 0x94, 0xcc, 0x00, 0x00, 0x00, 
+-	0x2e, 0x08, 0x7c, 0xbc, 0x3f, 0xff, 0xff, 0xff, 
+-	0x2e, 0x08, 0x5e, 0x4c, 0x68, 0x00, 0x04, 0x00, 
+-	0x2e, 0x08, 0x94, 0x88, 0x2e, 0x08, 0x7d, 0xb4, 
+-	0x2e, 0x08, 0x7d, 0xb8, 0x00, 0x00, 0x04, 0xcc, 
+-	0x61, 0x88, 0xe0, 0x2d, 0x26, 0x01, 0x21, 0x00, 
+-	0x91, 0x00, 0x48, 0x2b, 0x68, 0x00, 0x68, 0x40, 
+-	0x99, 0x00, 0x42, 0x88, 0xd8, 0x04, 0xe0, 0x06, 
+-	0x99, 0x00, 0x31, 0x01, 0x91, 0x00, 0xe7, 0xf4, 
+-	0x00, 0x70, 0x1c, 0x46, 0xe7, 0xf8, 0x08, 0x76, 
+-	0x00, 0x76, 0x48, 0x23, 0x68, 0x00, 0x23, 0x0d, 
+-	0x01, 0xdb, 0x18, 0xc0, 0x69, 0x80, 0x07, 0xc0, 
+-	0x0f, 0xc0, 0x49, 0x1f, 0x68, 0x09, 0x23, 0x0d, 
+-	0x01, 0xdb, 0x18, 0xc9, 0x61, 0x88, 0x48, 0x1c, 
+-	0x68, 0x00, 0x23, 0x0d, 0x01, 0xdb, 0x18, 0xc0, 
+-	0x69, 0x80, 0x43, 0x30, 0x49, 0x18, 0x68, 0x09, 
+-	0x23, 0x0d, 0x01, 0xdb, 0x18, 0xc9, 0x61, 0x88, 
+-	0x1c, 0x21, 0x48, 0x15, 0x68, 0x00, 0xf0, 0x0a, 
+-	0xff, 0xb1, 0x6b, 0x79, 0x48, 0x12, 0x68, 0x00, 
+-	0xf0, 0x0a, 0xfe, 0xe6, 0x1c, 0x28, 0x21, 0x00, 
+-	0xf0, 0x0b, 0xfa, 0x88, 0x49, 0x0f, 0x20, 0x91, 
+-	0xf0, 0x18, 0xfb, 0x80, 0x28, 0x92, 0xd0, 0x00, 
+-	0xe7, 0xf8, 0x48, 0x0b, 0x68, 0x00, 0x90, 0x03, 
+-	0x48, 0x0b, 0x68, 0x00, 0x49, 0x08, 0x60, 0x08, 
+-	0x98, 0x03, 0x49, 0x09, 0x60, 0x08, 0x20, 0x92, 
+-	0x49, 0x06, 0x60, 0x08, 0xb0, 0x04, 0x20, 0x92, 
+-	0x49, 0x06, 0x60, 0x08, 0x20, 0x00, 0xb0, 0x03, 
+-	0xe5, 0x86, 0xb0, 0x03, 0xe5, 0x84, 0x00, 0x00, 
+-	0x2e, 0x08, 0x7d, 0xb4, 0x2e, 0x08, 0x94, 0x88, 
+-	0x2e, 0x08, 0x7d, 0xb8, 0x2e, 0x08, 0x7c, 0xc0, 
+-	0xb5, 0xf3, 0xb0, 0x85, 0x20, 0x00, 0x90, 0x01, 
+-	0x9d, 0x05, 0x9f, 0x06, 0x69, 0x28, 0x90, 0x04, 
+-	0x69, 0x3c, 0x98, 0x04, 0x28, 0x13, 0xd0, 0x01, 
+-	0x2c, 0x13, 0xd1, 0x05, 0x20, 0xff, 0xb0, 0x05, 
+-	0xb0, 0x02, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x68, 0xee, 0x68, 0xf9, 0x91, 0x03, 0x48, 0xdf, 
+-	0x68, 0x00, 0x28, 0x00, 0xd0, 0x05, 0x2e, 0x19, 
+-	0xd3, 0x01, 0x20, 0x01, 0xe0, 0x00, 0x20, 0x00, 
+-	0xe0, 0x04, 0x2e, 0x08, 0xd3, 0x01, 0x20, 0x01, 
+-	0xe0, 0x00, 0x20, 0x00, 0x28, 0x00, 0xd0, 0x20, 
+-	0x48, 0xd6, 0x68, 0x00, 0x28, 0x00, 0xd0, 0x06, 
+-	0x99, 0x03, 0x29, 0x19, 0xd3, 0x01, 0x20, 0x01, 
+-	0xe0, 0x00, 0x20, 0x00, 0xe0, 0x05, 0x99, 0x03, 
+-	0x29, 0x08, 0xd3, 0x01, 0x20, 0x01, 0xe0, 0x00, 
+-	0x20, 0x00, 0x28, 0x00, 0xd0, 0x06, 0x99, 0x03, 
+-	0x60, 0xe9, 0x60, 0xfe, 0x20, 0x00, 0xb0, 0x05, 
+-	0xe7, 0xce, 0xe1, 0x92, 0x1c, 0x3d, 0x9f, 0x05, 
+-	0x9e, 0x03, 0x68, 0xf9, 0x91, 0x03, 0x9c, 0x04, 
+-	0xe0, 0xaa, 0x48, 0xc6, 0x68, 0x00, 0x28, 0x00, 
+-	0xd0, 0x06, 0x99, 0x03, 0x29, 0x19, 0xd3, 0x01, 
+-	0x20, 0x01, 0xe0, 0x00, 0x20, 0x00, 0xe0, 0x05, 
+-	0x99, 0x03, 0x29, 0x08, 0xd3, 0x01, 0x20, 0x01, 
+-	0xe0, 0x00, 0x20, 0x00, 0x28, 0x00, 0xd1, 0x73, 
+-	0x49, 0xbd, 0x20, 0x91, 0xf0, 0x18, 0xfa, 0xfe, 
+-	0x28, 0x92, 0xd0, 0x03, 0x20, 0x01, 0xf0, 0x0a, 
+-	0xfa, 0xe5, 0xe7, 0xf5, 0x00, 0xb0, 0x49, 0xb9, 
+-	0x58, 0x08, 0x42, 0xa8, 0xd1, 0x05, 0x99, 0x03, 
+-	0x00, 0x88, 0x49, 0xb6, 0x58, 0x08, 0x42, 0xb8, 
+-	0xd0, 0x05, 0x20, 0x92, 0x49, 0xb2, 0x60, 0x08, 
+-	0x20, 0xff, 0xb0, 0x05, 0xe7, 0x98, 0x48, 0xb2, 
+-	0x68, 0x00, 0x42, 0xa8, 0xd0, 0x03, 0x48, 0xb0, 
+-	0x68, 0x00, 0x42, 0xb8, 0xd1, 0x0a, 0x20, 0x0d, 
+-	0x06, 0xc0, 0x68, 0xc0, 0x90, 0x01, 0x98, 0x01, 
+-	0x28, 0x01, 0xd1, 0x03, 0x20, 0x00, 0x21, 0x0d, 
+-	0x06, 0xc9, 0x60, 0xc8, 0x99, 0x03, 0x60, 0xe9, 
+-	0x60, 0xfe, 0x00, 0xb0, 0x49, 0xa5, 0x50, 0x0f, 
+-	0x99, 0x03, 0x00, 0x88, 0x49, 0xa3, 0x50, 0x0d, 
+-	0x48, 0xa0, 0x68, 0x00, 0x28, 0x00, 0xd1, 0x55, 
+-	0x20, 0x0d, 0x06, 0xc0, 0x68, 0x80, 0x90, 0x02, 
+-	0x20, 0x00, 0x21, 0x0d, 0x06, 0xc9, 0x60, 0x88, 
+-	0x20, 0x01, 0x40, 0xb0, 0x99, 0x02, 0x40, 0x08, 
+-	0xd1, 0x12, 0x99, 0x03, 0x20, 0x01, 0x40, 0x88, 
+-	0x99, 0x02, 0x40, 0x08, 0xd0, 0x0b, 0x99, 0x03, 
+-	0x20, 0x01, 0x40, 0x88, 0x43, 0xc0, 0x99, 0x02, 
+-	0x40, 0x08, 0x90, 0x02, 0x20, 0x01, 0x40, 0xb0, 
+-	0x99, 0x02, 0x43, 0x08, 0x90, 0x02, 0xe0, 0x11, 
+-	0x99, 0x03, 0x20, 0x01, 0x40, 0x88, 0x99, 0x02, 
+-	0x40, 0x08, 0xd1, 0x0b, 0x20, 0x01, 0x40, 0xb0, 
+-	0x43, 0xc0, 0x99, 0x02, 0x40, 0x08, 0x90, 0x02, 
+-	0x99, 0x03, 0x20, 0x01, 0x40, 0x88, 0x99, 0x02, 
+-	0x43, 0x08, 0x90, 0x02, 0x6b, 0x28, 0xf7, 0xfe, 
+-	0xfe, 0xbc, 0x90, 0x00, 0x9a, 0x00, 0xe0, 0x00, 
+-	0xe0, 0x22, 0x99, 0x03, 0x1c, 0x28, 0xf0, 0x00, 
+-	0xfa, 0x3d, 0x6b, 0x38, 0xf7, 0xfe, 0xfe, 0xb1, 
+-	0x90, 0x00, 0x9a, 0x00, 0x1c, 0x31, 0x1c, 0x38, 
+-	0xf0, 0x00, 0xfa, 0x34, 0x98, 0x02, 0x21, 0x0d, 
+-	0x06, 0xc9, 0x60, 0x88, 0x48, 0x7c, 0x68, 0x00, 
+-	0x42, 0xa8, 0xd0, 0x03, 0x48, 0x7a, 0x68, 0x00, 
+-	0x42, 0xb8, 0xd1, 0x03, 0x98, 0x01, 0x21, 0x0d, 
+-	0x06, 0xc9, 0x60, 0xc8, 0x20, 0x92, 0x49, 0x74, 
+-	0x60, 0x08, 0x20, 0x00, 0xb0, 0x05, 0xe7, 0x1b, 
+-	0x49, 0x71, 0x20, 0x91, 0xf0, 0x18, 0xfa, 0x66, 
+-	0x28, 0x92, 0xd0, 0x03, 0x20, 0x01, 0xf0, 0x0a, 
+-	0xfa, 0x4d, 0xe7, 0xf5, 0x00, 0xb0, 0x49, 0x6d, 
+-	0x58, 0x08, 0x42, 0xa8, 0xd0, 0x05, 0x20, 0x92, 
+-	0x49, 0x69, 0x60, 0x08, 0x20, 0xff, 0xb0, 0x05, 
+-	0xe7, 0x06, 0x2c, 0x0b, 0xdb, 0x12, 0x2c, 0x12, 
+-	0xdc, 0x10, 0x48, 0x67, 0x68, 0x00, 0x28, 0x00, 
+-	0xd0, 0x09, 0x48, 0x65, 0x68, 0x00, 0x42, 0xa8, 
+-	0xd0, 0x05, 0x20, 0x92, 0x49, 0x60, 0x60, 0x08, 
+-	0x20, 0xff, 0xb0, 0x05, 0xe6, 0xf4, 0x48, 0x60, 
+-	0x60, 0x07, 0xe0, 0x08, 0x6b, 0xf8, 0x28, 0x01, 
+-	0xd1, 0x05, 0x20, 0x92, 0x49, 0x5a, 0x60, 0x08, 
+-	0x20, 0xff, 0xb0, 0x05, 0xe6, 0xe8, 0x48, 0x5a, 
+-	0x68, 0x00, 0x42, 0xa8, 0xd1, 0x02, 0x20, 0x00, 
+-	0x49, 0x57, 0x60, 0x08, 0x00, 0xb0, 0x49, 0x55, 
+-	0x50, 0x0f, 0x99, 0x03, 0x60, 0xe9, 0x60, 0xfe, 
+-	0x48, 0x50, 0x68, 0x00, 0x28, 0x00, 0xd1, 0x73, 
+-	0x6b, 0x28, 0xf7, 0xfe, 0xfe, 0x4e, 0x90, 0x00, 
+-	0x6a, 0xa9, 0x9a, 0x00, 0x48, 0x4f, 0xf0, 0x0b, 
+-	0xfa, 0x1d, 0x6b, 0x38, 0xf7, 0xfe, 0xfe, 0x45, 
+-	0x90, 0x00, 0x6a, 0xb9, 0x9a, 0x00, 0x48, 0x4b, 
+-	0xf0, 0x0b, 0xfa, 0x42, 0x48, 0x48, 0x68, 0x00, 
+-	0x42, 0xa8, 0xd1, 0x0f, 0x20, 0x02, 0x21, 0x0d, 
+-	0x06, 0xc9, 0x60, 0xc8, 0x2c, 0x0b, 0xdb, 0x01, 
+-	0x2c, 0x12, 0xdd, 0x07, 0x21, 0x00, 0x20, 0x02, 
+-	0xf0, 0x03, 0xfd, 0xae, 0x48, 0x42, 0x21, 0x0d, 
+-	0x06, 0xc9, 0x61, 0x88, 0x2c, 0x0b, 0xdb, 0x42, 
+-	0x2c, 0x12, 0xdc, 0x40, 0x98, 0x04, 0x42, 0xa0, 
+-	0xd0, 0x2c, 0x20, 0x02, 0x21, 0x0d, 0x06, 0xc9, 
+-	0x60, 0xc8, 0x21, 0x00, 0x20, 0x02, 0xf0, 0x03, 
+-	0xfd, 0x9b, 0x2c, 0x0f, 0xd0, 0x05, 0x2c, 0x10, 
+-	0xd0, 0x03, 0x2c, 0x11, 0xd0, 0x01, 0x2c, 0x0b, 
+-	0xd1, 0x03, 0x21, 0x00, 0x20, 0x12, 0xf0, 0x03, 
+-	0xfd, 0x8f, 0x2c, 0x0c, 0xd0, 0x01, 0x2c, 0x0f, 
+-	0xd1, 0x03, 0x21, 0x00, 0x20, 0x04, 0xf0, 0x03, 
+-	0xfd, 0x87, 0x2c, 0x0d, 0xd0, 0x01, 0x2c, 0x10, 
+-	0xd1, 0x03, 0x21, 0x00, 0x20, 0x08, 0xf0, 0x03, 
+-	0xfd, 0x7f, 0x2c, 0x0e, 0xd0, 0x01, 0x2c, 0x11, 
+-	0xd1, 0x03, 0x21, 0x00, 0x20, 0x01, 0xf0, 0x03, 
+-	0xfd, 0x77, 0xe0, 0x03, 0x20, 0x00, 0x21, 0x0d, 
+-	0x06, 0xc9, 0x60, 0xc8, 0x6a, 0xb8, 0x30, 0x01, 
+-	0x05, 0x00, 0x6a, 0xf9, 0x31, 0x01, 0x02, 0x89, 
+-	0x43, 0x08, 0x6b, 0x79, 0x31, 0x02, 0x43, 0x08, 
+-	0x21, 0x0d, 0x06, 0xc9, 0x61, 0x88, 0x20, 0x0d, 
+-	0x06, 0xc0, 0x68, 0x80, 0x90, 0x02, 0x20, 0x00, 
+-	0x21, 0x0d, 0x06, 0xc9, 0x60, 0x88, 0xe0, 0x00, 
+-	0xe0, 0x1f, 0x20, 0x01, 0x40, 0xb0, 0x43, 0xc0, 
+-	0x99, 0x02, 0x40, 0x08, 0x90, 0x02, 0xf0, 0x00, 
+-	0xf9, 0xcf, 0x6b, 0x38, 0xf7, 0xfe, 0xfd, 0xd1, 
+-	0x90, 0x00, 0x9a, 0x00, 0x1c, 0x31, 0x1c, 0x38, 
+-	0xf0, 0x00, 0xf9, 0x54, 0x98, 0x02, 0x21, 0x0d, 
+-	0x06, 0xc9, 0x60, 0x88, 0x2c, 0x0b, 0xdb, 0x08, 
+-	0x2c, 0x12, 0xdc, 0x06, 0x98, 0x04, 0x42, 0xa0, 
+-	0xd1, 0x03, 0x20, 0x01, 0x21, 0x0d, 0x06, 0xc9, 
+-	0x60, 0xc8, 0x20, 0x92, 0x49, 0x04, 0x60, 0x08, 
+-	0x20, 0x00, 0xb0, 0x05, 0xe6, 0x3c, 0xb0, 0x05, 
+-	0xe6, 0x3a, 0xe6, 0x39, 0x2e, 0x08, 0x94, 0x84, 
+-	0x2e, 0x08, 0x7c, 0xc0, 0x2e, 0x08, 0x7c, 0x58, 
+-	0x2e, 0x08, 0x7c, 0xbc, 0x2e, 0x08, 0x7d, 0x94, 
+-	0x3f, 0xff, 0xff, 0xff, 0xb5, 0xf0, 0x1c, 0x07, 
+-	0x00, 0xb8, 0x49, 0x09, 0x58, 0x0c, 0x1c, 0x7d, 
+-	0x60, 0xe5, 0x00, 0xa8, 0x49, 0x06, 0x50, 0x0c, 
+-	0x6b, 0x20, 0xf7, 0xfe, 0xfd, 0x9a, 0x1c, 0x06, 
+-	0x1c, 0x32, 0x1c, 0x29, 0x1c, 0x20, 0xf0, 0x00, 
+-	0xf9, 0x1d, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x7c, 0x58, 0xb5, 0xf0, 0x1c, 0x07, 
+-	0x00, 0xb8, 0x49, 0x09, 0x58, 0x0c, 0x1e, 0x7d, 
+-	0x60, 0xe5, 0x00, 0xa8, 0x49, 0x06, 0x50, 0x0c, 
+-	0x6b, 0x20, 0xf7, 0xfe, 0xfd, 0x82, 0x1c, 0x06, 
+-	0x1c, 0x32, 0x1c, 0x29, 0x1c, 0x20, 0xf0, 0x00, 
+-	0xf9, 0x05, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x7c, 0x58, 0xb5, 0xf3, 0x1c, 0x0f, 
+-	0xb0, 0x86, 0x98, 0x06, 0x90, 0x05, 0x98, 0x05, 
+-	0x68, 0xc5, 0x48, 0x77, 0x68, 0x00, 0x28, 0x00, 
+-	0xd0, 0x05, 0x2d, 0x19, 0xd3, 0x01, 0x20, 0x01, 
+-	0xe0, 0x00, 0x20, 0x00, 0xe0, 0x04, 0x2d, 0x08, 
+-	0xd3, 0x01, 0x20, 0x01, 0xe0, 0x00, 0x20, 0x00, 
+-	0x28, 0x00, 0xd0, 0x05, 0x20, 0xff, 0xb0, 0x06, 
+-	0xb0, 0x02, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x98, 0x05, 0x69, 0x00, 0x28, 0x13, 0xd1, 0x02, 
+-	0x20, 0xff, 0xb0, 0x06, 0xe7, 0xf4, 0x49, 0x69, 
+-	0x20, 0x91, 0xf0, 0x18, 0xf9, 0x23, 0x28, 0x92, 
+-	0xd0, 0x03, 0x20, 0x01, 0xf0, 0x0a, 0xf9, 0x0a, 
+-	0xe7, 0xf5, 0x00, 0xa8, 0x49, 0x64, 0x58, 0x08, 
+-	0x99, 0x05, 0x42, 0x88, 0xd0, 0x05, 0x20, 0x92, 
+-	0x49, 0x60, 0x60, 0x08, 0x20, 0xff, 0xb0, 0x06, 
+-	0xe7, 0xde, 0x42, 0xbd, 0xd1, 0x05, 0x20, 0x92, 
+-	0x49, 0x5c, 0x60, 0x08, 0x20, 0x00, 0xb0, 0x06, 
+-	0xe7, 0xd6, 0x20, 0x00, 0x00, 0xa9, 0x4a, 0x5a, 
+-	0x50, 0x50, 0x98, 0x05, 0x60, 0xc7, 0x48, 0x59, 
+-	0x68, 0x00, 0x28, 0x01, 0xd1, 0x0d, 0x48, 0x54, 
+-	0x68, 0x00, 0x28, 0x01, 0xd1, 0x09, 0x99, 0x05, 
+-	0x00, 0xb8, 0x4a, 0x53, 0x50, 0x11, 0x20, 0x92, 
+-	0x49, 0x50, 0x60, 0x08, 0x20, 0x00, 0xb0, 0x06, 
+-	0xe7, 0xbe, 0x20, 0x0d, 0x06, 0xc0, 0x68, 0x80, 
+-	0x1c, 0x04, 0x20, 0x00, 0x21, 0x0d, 0x06, 0xc9, 
+-	0x60, 0x88, 0x20, 0x00, 0x43, 0xc0, 0x00, 0xe9, 
+-	0x4b, 0x4b, 0x18, 0xc9, 0x60, 0x08, 0x20, 0x00, 
+-	0x43, 0xc0, 0x00, 0xe9, 0x4b, 0x48, 0x18, 0xc9, 
+-	0x60, 0x48, 0x20, 0x00, 0x43, 0xc0, 0x00, 0xe9, 
+-	0x4b, 0x45, 0x18, 0xc9, 0x64, 0x08, 0x20, 0x00, 
+-	0x43, 0xc0, 0x00, 0xe9, 0x4b, 0x42, 0x18, 0xc9, 
+-	0x64, 0x48, 0x20, 0x01, 0x90, 0x01, 0x20, 0x01, 
+-	0x40, 0xa8, 0x40, 0x20, 0xd1, 0x01, 0x20, 0x00, 
+-	0x90, 0x01, 0x20, 0x01, 0x40, 0xa8, 0x43, 0xc0, 
+-	0x40, 0x04, 0x1c, 0x3e, 0x42, 0xbd, 0xd9, 0x23, 
+-	0x00, 0xb0, 0x49, 0x37, 0x58, 0x08, 0x28, 0x00, 
+-	0xd0, 0x01, 0x36, 0x01, 0xe7, 0xf8, 0x1e, 0x70, 
+-	0x90, 0x04, 0x98, 0x04, 0x42, 0xb8, 0xda, 0x04, 
+-	0xe0, 0x07, 0x98, 0x04, 0x38, 0x01, 0x90, 0x04, 
+-	0xe7, 0xf7, 0x98, 0x04, 0xf7, 0xff, 0xff, 0x32, 
+-	0xe7, 0xf7, 0x20, 0xff, 0x40, 0xb8, 0x90, 0x03, 
+-	0x20, 0xff, 0x40, 0xb0, 0x43, 0xc0, 0x99, 0x03, 
+-	0x40, 0x08, 0x90, 0x03, 0x98, 0x03, 0x00, 0x40, 
+-	0x90, 0x03, 0x00, 0x60, 0x90, 0x00, 0xe0, 0x1f, 
+-	0x00, 0xb0, 0x49, 0x25, 0x58, 0x08, 0x28, 0x00, 
+-	0xd0, 0x01, 0x3e, 0x01, 0xe7, 0xf8, 0x1c, 0x70, 
+-	0x90, 0x04, 0x98, 0x04, 0x42, 0xb8, 0xd9, 0x04, 
+-	0xe0, 0x07, 0x98, 0x04, 0x30, 0x01, 0x90, 0x04, 
+-	0xe7, 0xf7, 0x98, 0x04, 0xf7, 0xff, 0xff, 0x26, 
+-	0xe7, 0xf7, 0x20, 0xff, 0x40, 0xb0, 0x90, 0x03, 
+-	0x20, 0xff, 0x40, 0xb8, 0x43, 0xc0, 0x99, 0x03, 
+-	0x40, 0x08, 0x90, 0x03, 0x08, 0x60, 0x90, 0x00, 
+-	0x98, 0x00, 0x99, 0x03, 0x40, 0x08, 0x90, 0x00, 
+-	0x98, 0x03, 0x43, 0x84, 0x98, 0x00, 0x43, 0x04, 
+-	0x20, 0x01, 0x40, 0xb8, 0x43, 0xc0, 0x40, 0x04, 
+-	0x98, 0x01, 0x40, 0xb8, 0x43, 0x04, 0x99, 0x05, 
+-	0x00, 0xb8, 0x4a, 0x0d, 0x50, 0x11, 0x98, 0x05, 
+-	0x6b, 0x00, 0xf7, 0xfe, 0xfc, 0x92, 0x90, 0x02, 
+-	0x9a, 0x02, 0x1c, 0x39, 0x98, 0x05, 0xf0, 0x00, 
+-	0xf8, 0x15, 0x20, 0x0d, 0x06, 0xc0, 0x60, 0x84, 
+-	0x20, 0x92, 0x49, 0x04, 0x60, 0x08, 0x20, 0x00, 
+-	0xb0, 0x06, 0xe7, 0x25, 0xb0, 0x06, 0xe7, 0x23, 
+-	0x2e, 0x08, 0x94, 0x84, 0x2e, 0x08, 0x7c, 0xc0, 
+-	0x2e, 0x08, 0x7c, 0x58, 0x2e, 0x08, 0x60, 0x84, 
+-	0x68, 0x00, 0x04, 0x00, 0xb5, 0xf7, 0x1c, 0x04, 
+-	0x1c, 0x0f, 0x01, 0x3d, 0x4b, 0x2f, 0x18, 0xe9, 
+-	0x1d, 0xe2, 0x32, 0x0d, 0x20, 0x00, 0x28, 0x03, 
+-	0xd3, 0x02, 0xe0, 0x04, 0x30, 0x01, 0xe7, 0xfa, 
+-	0xca, 0x20, 0xc1, 0x20, 0xe7, 0xfa, 0x6a, 0xe3, 
+-	0x05, 0x9d, 0x0d, 0xad, 0x00, 0xfe, 0x4b, 0x28, 
+-	0x18, 0xf3, 0x60, 0x1d, 0x6b, 0x63, 0x33, 0x01, 
+-	0x05, 0x9d, 0x0d, 0xad, 0x00, 0xfe, 0x4b, 0x24, 
+-	0x18, 0xf3, 0x60, 0x5d, 0x6a, 0xa5, 0x23, 0x01, 
+-	0x02, 0x9b, 0x43, 0x1d, 0x00, 0xfe, 0x4b, 0x20, 
+-	0x18, 0xf3, 0x64, 0x1d, 0x9d, 0x02, 0x23, 0x01, 
+-	0x02, 0x9b, 0x43, 0x1d, 0x00, 0xfe, 0x4b, 0x1c, 
+-	0x18, 0xf3, 0x64, 0x5d, 0x4b, 0x1b, 0x68, 0x1b, 
+-	0x2b, 0x01, 0xd1, 0x2a, 0x2f, 0x00, 0xd1, 0x28, 
+-	0x4b, 0x17, 0x68, 0x5d, 0x23, 0x8f, 0x00, 0x9b, 
+-	0x42, 0x9d, 0xd3, 0x03, 0x23, 0x8f, 0x00, 0x9b, 
+-	0x4d, 0x13, 0x60, 0x6b, 0x4b, 0x12, 0x68, 0x1d, 
+-	0x4b, 0x13, 0x42, 0x9d, 0xd3, 0x02, 0x4b, 0x12, 
+-	0x4d, 0x0f, 0x60, 0x2b, 0x4b, 0x0e, 0x6c, 0x5d, 
+-	0x23, 0x01, 0x02, 0x9b, 0x1a, 0xed, 0x23, 0xb3, 
+-	0x00, 0x9b, 0x42, 0x9d, 0xd3, 0x02, 0x4b, 0x0d, 
+-	0x4d, 0x09, 0x64, 0x6b, 0x4b, 0x08, 0x6c, 0x1d, 
+-	0x23, 0x01, 0x02, 0x9b, 0x1a, 0xed, 0x4b, 0x0a, 
+-	0x42, 0x9d, 0xd3, 0x02, 0x4b, 0x09, 0x4d, 0x04, 
+-	0x64, 0x2b, 0xb0, 0x03, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x68, 0x00, 0x0c, 0x00, 
+-	0x68, 0x00, 0x04, 0x00, 0x2e, 0x08, 0x60, 0x84, 
+-	0x00, 0x00, 0x02, 0x3a, 0x00, 0x00, 0x06, 0xcc, 
+-	0x00, 0x00, 0x02, 0xca, 0x00, 0x00, 0x06, 0xca, 
+-	0xb4, 0xf0, 0x4f, 0x15, 0x4c, 0x15, 0x20, 0x00, 
+-	0x21, 0x00, 0x22, 0x00, 0x43, 0xd2, 0x4d, 0x14, 
+-	0x68, 0x6d, 0x42, 0x85, 0xdd, 0x1b, 0x1c, 0x05, 
+-	0x30, 0x01, 0x00, 0xad, 0x59, 0x7b, 0x42, 0x93, 
+-	0xd0, 0xf9, 0x4d, 0x0f, 0x68, 0x6d, 0x42, 0x85, 
+-	0xda, 0x00, 0xe0, 0x10, 0x31, 0x01, 0x1c, 0x05, 
+-	0x30, 0x01, 0x00, 0xad, 0x59, 0x7a, 0x42, 0x93, 
+-	0xd0, 0xf9, 0x02, 0x95, 0x43, 0x1d, 0x1c, 0x2e, 
+-	0xc4, 0x40, 0x4d, 0x07, 0x68, 0x6d, 0x42, 0x85, 
+-	0xdb, 0x00, 0x31, 0x01, 0xe7, 0xdf, 0x25, 0x0d, 
+-	0x06, 0xed, 0x61, 0x29, 0xbc, 0xf0, 0x47, 0x70, 
+-	0x2e, 0x08, 0x7c, 0xcc, 0x68, 0x00, 0x0d, 0x40, 
+-	0x2e, 0x08, 0x7d, 0x94, 0xb5, 0xf3, 0xb0, 0x82, 
+-	0x9d, 0x02, 0x69, 0x2c, 0x2c, 0x13, 0xd1, 0x05, 
+-	0x20, 0x75, 0xb0, 0x02, 0xb0, 0x02, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x68, 0xee, 0x48, 0xf8, 
+-	0x68, 0x00, 0x28, 0x00, 0xd0, 0x05, 0x2e, 0x19, 
+-	0xd3, 0x01, 0x20, 0x01, 0xe0, 0x00, 0x20, 0x00, 
+-	0xe0, 0x04, 0x2e, 0x08, 0xd3, 0x01, 0x20, 0x01, 
+-	0xe0, 0x00, 0x20, 0x00, 0x28, 0x00, 0xd0, 0x02, 
+-	0x20, 0xff, 0xb0, 0x02, 0xe7, 0xe6, 0x49, 0xef, 
+-	0x20, 0x91, 0xf0, 0x17, 0xff, 0x83, 0x28, 0x92, 
+-	0xd0, 0x03, 0x20, 0x01, 0xf0, 0x09, 0xff, 0x6a, 
+-	0xe7, 0xf5, 0x00, 0xb0, 0x49, 0xea, 0x58, 0x08, 
+-	0x99, 0x02, 0x42, 0x88, 0xd0, 0x05, 0x20, 0x92, 
+-	0x49, 0xe6, 0x60, 0x08, 0x20, 0xff, 0xb0, 0x02, 
+-	0xe7, 0xd0, 0x48, 0xe3, 0x68, 0x00, 0x28, 0x00, 
+-	0xd1, 0x16, 0x20, 0x0d, 0x06, 0xc0, 0x68, 0x80, 
+-	0x90, 0x01, 0x99, 0x03, 0x29, 0x01, 0xd1, 0x05, 
+-	0x20, 0x01, 0x40, 0xb0, 0x99, 0x01, 0x43, 0x08, 
+-	0x90, 0x01, 0xe0, 0x05, 0x20, 0x01, 0x40, 0xb0, 
+-	0x43, 0xc0, 0x99, 0x01, 0x40, 0x08, 0x90, 0x01, 
+-	0x98, 0x01, 0x21, 0x0d, 0x06, 0xc9, 0x60, 0x88, 
+-	0x48, 0xd8, 0x68, 0x00, 0x28, 0x01, 0xd1, 0x73, 
+-	0x48, 0xd3, 0x68, 0x00, 0x28, 0x01, 0xd1, 0x6f, 
+-	0x99, 0x03, 0x29, 0x01, 0xd1, 0x6c, 0xb0, 0x83, 
+-	0x1c, 0x30, 0xf0, 0x0a, 0xfe, 0x71, 0x28, 0x01, 
+-	0xd1, 0x05, 0x20, 0x92, 0x49, 0xcd, 0x60, 0x08, 
+-	0x20, 0x00, 0xb0, 0x05, 0xe7, 0x9e, 0x49, 0xce, 
+-	0x20, 0x91, 0xf0, 0x17, 0xff, 0x3b, 0x28, 0x92, 
+-	0xd0, 0x00, 0xe7, 0xf8, 0xf0, 0x0a, 0xfe, 0xbb, 
+-	0x2c, 0x0b, 0xdb, 0x01, 0x2c, 0x12, 0xdd, 0x06, 
+-	0x48, 0xc8, 0x68, 0x00, 0x68, 0x40, 0x30, 0x01, 
+-	0x49, 0xc6, 0x68, 0x09, 0x60, 0x48, 0x20, 0x92, 
+-	0x49, 0xc3, 0x60, 0x08, 0x20, 0x01, 0x49, 0xc3, 
+-	0x68, 0x09, 0x60, 0x08, 0x2c, 0x0b, 0xdb, 0x11, 
+-	0x2c, 0x12, 0xdc, 0x0f, 0x48, 0xbf, 0x68, 0x00, 
+-	0x23, 0x0d, 0x01, 0xdb, 0x18, 0xc0, 0x69, 0x80, 
+-	0x23, 0x01, 0x43, 0x18, 0x49, 0xbb, 0x68, 0x09, 
+-	0x23, 0x0d, 0x01, 0xdb, 0x18, 0xc9, 0x61, 0x88, 
+-	0x27, 0x00, 0xe0, 0xbc, 0x27, 0x00, 0x20, 0x00, 
+-	0x90, 0x01, 0x98, 0x01, 0x28, 0x00, 0xd1, 0x15, 
+-	0x2f, 0x07, 0xd2, 0x13, 0x6a, 0xe8, 0x05, 0x81, 
+-	0x0d, 0x89, 0x1c, 0x38, 0x37, 0x01, 0x00, 0x83, 
+-	0x18, 0x18, 0x00, 0xc0, 0x4a, 0xaf, 0x68, 0x12, 
+-	0x18, 0x80, 0x23, 0x05, 0x02, 0x1b, 0x18, 0xc0, 
+-	0x6f, 0xc0, 0x42, 0x81, 0xda, 0x01, 0x20, 0x01, 
+-	0x90, 0x01, 0xe7, 0xe6, 0x98, 0x01, 0x28, 0x00, 
+-	0xd1, 0x16, 0x2f, 0x18, 0xd2, 0x14, 0x6a, 0xe8, 
+-	0x05, 0x81, 0x0d, 0x89, 0x1c, 0x38, 0x37, 0x01, 
+-	0x23, 0x4c, 0x43, 0x58, 0x4a, 0xa3, 0x68, 0x12, 
+-	0x18, 0x80, 0x38, 0xff, 0x38, 0xff, 0x38, 0x02, 
+-	0x69, 0x40, 0x42, 0x81, 0xda, 0x03, 0xe0, 0x00, 
+-	0xe0, 0xb0, 0x20, 0x01, 0x90, 0x01, 0xe7, 0xe5, 
+-	0x3f, 0x01, 0x6b, 0x28, 0xf7, 0xfe, 0xfb, 0x01, 
+-	0x90, 0x00, 0x2f, 0x07, 0xd2, 0x16, 0x48, 0x99, 
+-	0x68, 0x01, 0x1c, 0x38, 0xf0, 0x0a, 0xf9, 0x0a, 
+-	0x00, 0xb8, 0x19, 0xc0, 0x00, 0xc0, 0x49, 0x95, 
+-	0x68, 0x09, 0x18, 0x40, 0x23, 0x2b, 0x01, 0x5b, 
+-	0x18, 0xc0, 0x9a, 0x00, 0x1c, 0x29, 0xf0, 0x0a, 
+-	0xfa, 0x5f, 0x48, 0x90, 0x68, 0x00, 0xf0, 0x0a, 
+-	0xfe, 0x59, 0xe0, 0x4a, 0x2f, 0x18, 0xd2, 0x48, 
+-	0x1f, 0xf8, 0x49, 0x8c, 0x68, 0x09, 0xf0, 0x0a, 
+-	0xf9, 0x45, 0x20, 0x4c, 0x43, 0x78, 0x49, 0x89, 
+-	0x68, 0x09, 0x18, 0x40, 0x38, 0xff, 0x38, 0xff, 
+-	0x38, 0x0a, 0x9a, 0x00, 0x1c, 0x29, 0xf0, 0x0a, 
+-	0xfa, 0x47, 0x20, 0x4c, 0x43, 0x78, 0x49, 0x83, 
+-	0x68, 0x09, 0x18, 0x40, 0x38, 0xff, 0x38, 0xff, 
+-	0x38, 0x82, 0x6f, 0xc0, 0x28, 0x00, 0xd0, 0x17, 
+-	0x20, 0x4c, 0x43, 0x78, 0x49, 0x7d, 0x68, 0x09, 
+-	0x18, 0x40, 0x38, 0xff, 0x38, 0xff, 0x38, 0x02, 
+-	0x68, 0x00, 0x04, 0x00, 0x0c, 0x00, 0xd0, 0x0b, 
+-	0x20, 0x4c, 0x43, 0x78, 0x49, 0x77, 0x68, 0x09, 
+-	0x18, 0x40, 0x38, 0xff, 0x38, 0xff, 0x38, 0x02, 
+-	0x68, 0x00, 0x0c, 0x00, 0x04, 0x00, 0xd1, 0x0a, 
+-	0x20, 0x02, 0x21, 0x4c, 0x43, 0x79, 0x4a, 0x71, 
+-	0x68, 0x12, 0x18, 0x89, 0x39, 0xff, 0x39, 0xff, 
+-	0x39, 0x82, 0x67, 0x48, 0xe0, 0x09, 0x20, 0x03, 
+-	0x21, 0x4c, 0x43, 0x79, 0x4a, 0x6b, 0x68, 0x12, 
+-	0x18, 0x89, 0x39, 0xff, 0x39, 0xff, 0x39, 0x82, 
+-	0x67, 0x48, 0x48, 0x68, 0x68, 0x00, 0x23, 0x0d, 
+-	0x01, 0xdb, 0x18, 0xc0, 0x69, 0x80, 0x00, 0x40, 
+-	0x90, 0x03, 0x98, 0x03, 0x23, 0x02, 0x43, 0x18, 
+-	0x90, 0x03, 0x48, 0x62, 0x68, 0x00, 0x23, 0x0d, 
+-	0x01, 0xdb, 0x18, 0xc0, 0x69, 0x80, 0x07, 0xc0, 
+-	0x0f, 0xc0, 0x99, 0x03, 0x18, 0x40, 0x90, 0x03, 
+-	0x98, 0x03, 0x49, 0x5c, 0x68, 0x09, 0x23, 0x0d, 
+-	0x01, 0xdb, 0x18, 0xc9, 0x61, 0x88, 0x1c, 0x39, 
+-	0x48, 0x58, 0x68, 0x00, 0xf0, 0x0a, 0xfa, 0x72, 
+-	0x2c, 0x0b, 0xdb, 0x01, 0x2c, 0x12, 0xdd, 0x04, 
+-	0x6b, 0x69, 0x48, 0x54, 0x68, 0x00, 0xf0, 0x0a, 
+-	0xf9, 0x4d, 0x1c, 0x30, 0x21, 0x01, 0xf0, 0x0a, 
+-	0xfd, 0x45, 0x49, 0x4f, 0x20, 0x91, 0xf0, 0x17, 
+-	0xfe, 0x3d, 0x28, 0x92, 0xd0, 0x00, 0xe7, 0xf8, 
+-	0x48, 0x4c, 0x68, 0x00, 0x90, 0x02, 0x48, 0x4c, 
+-	0x68, 0x00, 0x49, 0x4a, 0x60, 0x08, 0x98, 0x02, 
+-	0x49, 0x49, 0x60, 0x08, 0x20, 0x92, 0x49, 0x46, 
+-	0x60, 0x08, 0xb0, 0x03, 0x48, 0x43, 0x68, 0x00, 
+-	0x28, 0x01, 0xd1, 0x75, 0x48, 0x3e, 0x68, 0x00, 
+-	0x28, 0x01, 0xd1, 0x71, 0x99, 0x03, 0x29, 0x00, 
+-	0xd1, 0x6e, 0xb0, 0x85, 0x1c, 0x30, 0xf0, 0x0a, 
+-	0xfd, 0x47, 0x28, 0x00, 0xd1, 0x05, 0x20, 0x92, 
+-	0x49, 0x38, 0x60, 0x08, 0x20, 0x00, 0xb0, 0x07, 
+-	0xe6, 0x74, 0x49, 0x39, 0x20, 0x91, 0xf0, 0x17, 
+-	0xfe, 0x11, 0x28, 0x92, 0xd0, 0x00, 0xe7, 0xf8, 
+-	0xf0, 0x0a, 0xfd, 0x91, 0x2c, 0x0b, 0xdb, 0x01, 
+-	0x2c, 0x12, 0xdd, 0x0b, 0x48, 0x33, 0x68, 0x00, 
+-	0x68, 0x40, 0x28, 0x00, 0xd0, 0x06, 0x48, 0x31, 
+-	0x68, 0x00, 0x68, 0x40, 0x38, 0x01, 0x49, 0x2f, 
+-	0x68, 0x09, 0x60, 0x48, 0x20, 0x92, 0x49, 0x2c, 
+-	0x60, 0x08, 0x20, 0x01, 0x49, 0x2b, 0x68, 0x09, 
+-	0x60, 0x08, 0x2c, 0x0b, 0xdb, 0x11, 0x2c, 0x12, 
+-	0xdc, 0x0f, 0x48, 0x28, 0x68, 0x00, 0x23, 0x0d, 
+-	0x01, 0xdb, 0x18, 0xc0, 0x69, 0x80, 0x08, 0x40, 
+-	0x00, 0x40, 0x49, 0x24, 0x68, 0x09, 0x23, 0x0d, 
+-	0x01, 0xdb, 0x18, 0xc9, 0x61, 0x88, 0x27, 0x00, 
+-	0xe0, 0xb2, 0x27, 0x00, 0x20, 0x00, 0x90, 0x03, 
+-	0x98, 0x03, 0x28, 0x00, 0xd1, 0x15, 0x2f, 0x07, 
+-	0xd2, 0x13, 0x6a, 0xe8, 0x05, 0x81, 0x0d, 0x89, 
+-	0x1c, 0x38, 0x37, 0x01, 0x00, 0x83, 0x18, 0x18, 
+-	0x00, 0xc0, 0x4a, 0x18, 0x68, 0x12, 0x18, 0x80, 
+-	0x23, 0x05, 0x02, 0x1b, 0x18, 0xc0, 0x6f, 0xc0, 
+-	0x42, 0x81, 0xd1, 0x01, 0x20, 0x01, 0x90, 0x03, 
+-	0xe7, 0xe6, 0x98, 0x03, 0x28, 0x00, 0xd1, 0x26, 
+-	0x2f, 0x18, 0xd2, 0x24, 0x6a, 0xe8, 0x05, 0x81, 
+-	0x0d, 0x89, 0x1c, 0x38, 0x37, 0x01, 0x23, 0x4c, 
+-	0x43, 0x58, 0x4a, 0x0c, 0x68, 0x12, 0x18, 0x80, 
+-	0x38, 0xff, 0x38, 0xff, 0x38, 0x02, 0xe0, 0x00, 
+-	0xe0, 0xa9, 0x69, 0x40, 0x42, 0x81, 0xd1, 0x11, 
+-	0x20, 0x01, 0x90, 0x03, 0xe0, 0x0e, 0x00, 0x00, 
+-	0x2e, 0x08, 0x94, 0x84, 0x2e, 0x08, 0x7c, 0xc0, 
+-	0x2e, 0x08, 0x7c, 0x58, 0x2e, 0x08, 0x60, 0x84, 
+-	0x2e, 0x08, 0x94, 0x88, 0x2e, 0x08, 0x7d, 0xb4, 
+-	0x2e, 0x08, 0x7d, 0xb8, 0xe7, 0xd5, 0x3f, 0x01, 
+-	0x6b, 0x28, 0xf7, 0xfe, 0xf9, 0xc2, 0x90, 0x01, 
+-	0x2f, 0x07, 0xd2, 0x09, 0x48, 0x4a, 0x68, 0x01, 
+-	0x1c, 0x38, 0xf0, 0x0a, 0xf8, 0x3d, 0x48, 0x48, 
+-	0x68, 0x00, 0xf0, 0x0a, 0xfd, 0x27, 0xe0, 0x06, 
+-	0x2f, 0x18, 0xd2, 0x04, 0x1f, 0xf8, 0x49, 0x44, 
+-	0x68, 0x09, 0xf0, 0x0a, 0xf8, 0x6f, 0x48, 0x42, 
+-	0x68, 0x00, 0x4b, 0x42, 0x18, 0xc0, 0xf0, 0x0a, 
+-	0xf9, 0x8f, 0x20, 0x00, 0x49, 0x3e, 0x68, 0x09, 
+-	0x23, 0x09, 0x01, 0xdb, 0x18, 0xc9, 0x64, 0x88, 
+-	0x48, 0x3b, 0x68, 0x00, 0x68, 0x40, 0x28, 0x07, 
+-	0xd3, 0x0e, 0x48, 0x39, 0x68, 0x00, 0x23, 0x0d, 
+-	0x01, 0xdb, 0x18, 0xc0, 0x69, 0x80, 0x23, 0xfe, 
+-	0x43, 0x18, 0x49, 0x35, 0x68, 0x09, 0x23, 0x0d, 
+-	0x01, 0xdb, 0x18, 0xc9, 0x61, 0x88, 0xe0, 0x33, 
+-	0x20, 0x01, 0x90, 0x00, 0x21, 0x00, 0x91, 0x02, 
+-	0x48, 0x2f, 0x68, 0x00, 0x68, 0x40, 0x99, 0x02, 
+-	0x42, 0x88, 0xd8, 0x04, 0xe0, 0x08, 0x99, 0x02, 
+-	0x31, 0x01, 0x91, 0x02, 0xe7, 0xf4, 0x98, 0x00, 
+-	0x00, 0x40, 0x30, 0x01, 0x90, 0x00, 0xe7, 0xf6, 
+-	0x98, 0x00, 0x08, 0x40, 0x00, 0x40, 0x90, 0x00, 
+-	0x48, 0x25, 0x68, 0x00, 0x23, 0x0d, 0x01, 0xdb, 
+-	0x18, 0xc0, 0x69, 0x80, 0x07, 0xc0, 0x0f, 0xc0, 
+-	0x49, 0x21, 0x68, 0x09, 0x23, 0x0d, 0x01, 0xdb, 
+-	0x18, 0xc9, 0x61, 0x88, 0x48, 0x1e, 0x68, 0x00, 
+-	0x23, 0x0d, 0x01, 0xdb, 0x18, 0xc0, 0x69, 0x80, 
+-	0x99, 0x00, 0x43, 0x08, 0x49, 0x1a, 0x68, 0x09, 
+-	0x23, 0x0d, 0x01, 0xdb, 0x18, 0xc9, 0x61, 0x88, 
+-	0x1c, 0x39, 0x48, 0x17, 0x68, 0x00, 0xf0, 0x0a, 
+-	0xf9, 0x4d, 0x2c, 0x0b, 0xdb, 0x01, 0x2c, 0x12, 
+-	0xdd, 0x04, 0x6b, 0x69, 0x48, 0x12, 0x68, 0x00, 
+-	0xf0, 0x0a, 0xf8, 0x7e, 0x1c, 0x30, 0x21, 0x00, 
+-	0xf0, 0x0a, 0xfc, 0x20, 0x49, 0x10, 0x20, 0x91, 
+-	0xf0, 0x17, 0xfd, 0x18, 0x28, 0x92, 0xd0, 0x00, 
+-	0xe7, 0xf8, 0x48, 0x0b, 0x68, 0x00, 0x90, 0x04, 
+-	0x48, 0x0c, 0x68, 0x00, 0x49, 0x08, 0x60, 0x08, 
+-	0x98, 0x04, 0x49, 0x0a, 0x60, 0x08, 0x20, 0x92, 
+-	0x49, 0x07, 0x60, 0x08, 0xb0, 0x05, 0x20, 0x92, 
+-	0x49, 0x07, 0x60, 0x08, 0x20, 0x00, 0xb0, 0x02, 
+-	0xe5, 0x60, 0xb0, 0x02, 0xe5, 0x5e, 0x00, 0x00, 
+-	0x2e, 0x08, 0x7d, 0xb4, 0x00, 0x00, 0x04, 0xcc, 
+-	0x2e, 0x08, 0x94, 0x88, 0x2e, 0x08, 0x7d, 0xb8, 
+-	0x2e, 0x08, 0x7c, 0xc0, 0xb5, 0xf3, 0x1c, 0x07, 
+-	0x1c, 0x3e, 0x69, 0x30, 0x28, 0x13, 0xd1, 0x04, 
+-	0x20, 0x75, 0xb0, 0x02, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x68, 0xf4, 0x48, 0x1e, 0x68, 0x00, 
+-	0x28, 0x00, 0xd0, 0x05, 0x2c, 0x19, 0xd3, 0x01, 
+-	0x20, 0x01, 0xe0, 0x00, 0x20, 0x00, 0xe0, 0x04, 
+-	0x2c, 0x08, 0xd3, 0x01, 0x20, 0x01, 0xe0, 0x00, 
+-	0x20, 0x00, 0x28, 0x00, 0xd0, 0x01, 0x20, 0xff, 
+-	0xe7, 0xe7, 0x49, 0x16, 0x20, 0x91, 0xf0, 0x17, 
+-	0xfc, 0xd1, 0x28, 0x92, 0xd0, 0x03, 0x20, 0x01, 
+-	0xf0, 0x09, 0xfc, 0xb8, 0xe7, 0xf5, 0x00, 0xa0, 
+-	0x49, 0x11, 0x58, 0x08, 0x42, 0xb8, 0xd0, 0x04, 
+-	0x20, 0x92, 0x49, 0x0e, 0x60, 0x08, 0x20, 0xff, 
+-	0xe7, 0xd3, 0x20, 0x0d, 0x06, 0xc0, 0x68, 0x80, 
+-	0x1c, 0x05, 0x20, 0x01, 0x40, 0xa0, 0x40, 0x05, 
+-	0x2d, 0x00, 0xd1, 0x03, 0x20, 0x00, 0x99, 0x01, 
+-	0x60, 0x08, 0xe0, 0x02, 0x20, 0x01, 0x99, 0x01, 
+-	0x60, 0x08, 0x20, 0x92, 0x49, 0x03, 0x60, 0x08, 
+-	0x20, 0x00, 0xe7, 0xbe, 0xe7, 0xbd, 0x00, 0x00, 
+-	0x2e, 0x08, 0x94, 0x84, 0x2e, 0x08, 0x7c, 0xc0, 
+-	0x2e, 0x08, 0x7c, 0x58, 0xb5, 0xf3, 0x1c, 0x07, 
+-	0xb0, 0x81, 0x1c, 0x3c, 0x68, 0xe5, 0x69, 0x60, 
+-	0x4b, 0x49, 0x40, 0x18, 0x99, 0x02, 0x07, 0x89, 
+-	0x0f, 0x89, 0x02, 0x09, 0x43, 0x08, 0x61, 0x60, 
+-	0x05, 0x80, 0x48, 0x46, 0x68, 0x00, 0x28, 0x00, 
+-	0xd0, 0x05, 0x2d, 0x19, 0xd3, 0x01, 0x20, 0x01, 
+-	0xe0, 0x00, 0x20, 0x00, 0xe0, 0x04, 0x2d, 0x08, 
+-	0xd3, 0x01, 0x20, 0x01, 0xe0, 0x00, 0x20, 0x00, 
+-	0x28, 0x00, 0xd0, 0x05, 0x20, 0x00, 0xb0, 0x01, 
+-	0xb0, 0x02, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x49, 0x3b, 0x20, 0x91, 0xf0, 0x17, 0xfc, 0x7a, 
+-	0x28, 0x92, 0xd0, 0x03, 0x20, 0x01, 0xf0, 0x09, 
+-	0xfc, 0x61, 0xe7, 0xf5, 0x00, 0xa8, 0x49, 0x37, 
+-	0x58, 0x08, 0x42, 0xb8, 0xd0, 0x05, 0x20, 0x92, 
+-	0x49, 0x33, 0x60, 0x08, 0x20, 0xff, 0xb0, 0x01, 
+-	0xe7, 0xe6, 0x48, 0x30, 0x68, 0x00, 0x28, 0x00, 
+-	0xd0, 0x05, 0x69, 0x20, 0x28, 0x0b, 0xdb, 0x0c, 
+-	0x69, 0x20, 0x28, 0x12, 0xdc, 0x09, 0x01, 0x28, 
+-	0x4b, 0x2d, 0x18, 0xc1, 0x91, 0x00, 0x1d, 0xe6, 
+-	0x36, 0x0d, 0x68, 0x30, 0x99, 0x00, 0x60, 0x08, 
+-	0xe0, 0x41, 0x48, 0x26, 0x68, 0x00, 0x28, 0x01, 
+-	0xd1, 0x3d, 0x48, 0x28, 0x68, 0x00, 0x28, 0x01, 
+-	0xd1, 0x39, 0xb0, 0x82, 0x1c, 0x28, 0xf0, 0x0a, 
+-	0xfb, 0x73, 0x28, 0x00, 0xd1, 0x05, 0x20, 0x92, 
+-	0x49, 0x1f, 0x60, 0x08, 0x20, 0x00, 0xb0, 0x03, 
+-	0xe7, 0xbe, 0x49, 0x21, 0x20, 0x91, 0xf0, 0x17, 
+-	0xfc, 0x3d, 0x28, 0x92, 0xd0, 0x00, 0xe7, 0xf8, 
+-	0xf0, 0x0a, 0xfb, 0xbd, 0x20, 0x92, 0x49, 0x1c, 
+-	0x60, 0x08, 0x20, 0x01, 0x49, 0x1b, 0x68, 0x09, 
+-	0x60, 0x08, 0x48, 0x1a, 0x68, 0x01, 0x1c, 0x20, 
+-	0xf0, 0x0a, 0xfb, 0x6e, 0x90, 0x00, 0x69, 0x60, 
+-	0x99, 0x00, 0x60, 0xc8, 0x49, 0x14, 0x20, 0x91, 
+-	0xf0, 0x17, 0xfc, 0x24, 0x28, 0x92, 0xd0, 0x00, 
+-	0xe7, 0xf8, 0x48, 0x12, 0x68, 0x00, 0x90, 0x01, 
+-	0x48, 0x11, 0x68, 0x00, 0x49, 0x0f, 0x60, 0x08, 
+-	0x98, 0x01, 0x49, 0x0f, 0x60, 0x08, 0x20, 0x92, 
+-	0x49, 0x0b, 0x60, 0x08, 0xb0, 0x02, 0x20, 0x92, 
+-	0x49, 0x05, 0x60, 0x08, 0x20, 0x00, 0xb0, 0x01, 
+-	0xe7, 0x8a, 0xb0, 0x01, 0xe7, 0x88, 0x00, 0x00, 
+-	0xff, 0xff, 0xfc, 0xff, 0x2e, 0x08, 0x94, 0x84, 
+-	0x2e, 0x08, 0x7c, 0xc0, 0x2e, 0x08, 0x7c, 0x58, 
+-	0x68, 0x00, 0x0c, 0x00, 0x2e, 0x08, 0x60, 0x84, 
+-	0x2e, 0x08, 0x94, 0x88, 0x2e, 0x08, 0x7d, 0xb4, 
+-	0x2e, 0x08, 0x7d, 0xb8, 0xb5, 0xf3, 0x1c, 0x07, 
+-	0xb0, 0x81, 0x1c, 0x3c, 0x68, 0xe5, 0x69, 0x60, 
+-	0x4b, 0x49, 0x40, 0x18, 0x99, 0x02, 0x07, 0x09, 
+-	0x0f, 0x09, 0x02, 0x89, 0x43, 0x08, 0x61, 0x60, 
+-	0x04, 0x80, 0x48, 0x46, 0x68, 0x00, 0x28, 0x00, 
+-	0xd0, 0x05, 0x2d, 0x19, 0xd3, 0x01, 0x20, 0x01, 
+-	0xe0, 0x00, 0x20, 0x00, 0xe0, 0x04, 0x2d, 0x08, 
+-	0xd3, 0x01, 0x20, 0x01, 0xe0, 0x00, 0x20, 0x00, 
+-	0x28, 0x00, 0xd0, 0x05, 0x20, 0x00, 0xb0, 0x01, 
+-	0xb0, 0x02, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x49, 0x3b, 0x20, 0x91, 0xf0, 0x17, 0xfb, 0xce, 
+-	0x28, 0x92, 0xd0, 0x03, 0x20, 0x01, 0xf0, 0x09, 
+-	0xfb, 0xb5, 0xe7, 0xf5, 0x00, 0xa8, 0x49, 0x37, 
+-	0x58, 0x08, 0x42, 0xb8, 0xd0, 0x05, 0x20, 0x92, 
+-	0x49, 0x33, 0x60, 0x08, 0x20, 0xff, 0xb0, 0x01, 
+-	0xe7, 0xe6, 0x48, 0x30, 0x68, 0x00, 0x28, 0x00, 
+-	0xd0, 0x05, 0x69, 0x20, 0x28, 0x0b, 0xdb, 0x0c, 
+-	0x69, 0x20, 0x28, 0x12, 0xdc, 0x09, 0x01, 0x28, 
+-	0x4b, 0x2d, 0x18, 0xc6, 0x1d, 0xe0, 0x30, 0x0d, 
+-	0x90, 0x00, 0x98, 0x00, 0x68, 0x00, 0x60, 0x30, 
+-	0xe0, 0x41, 0x48, 0x26, 0x68, 0x00, 0x28, 0x01, 
+-	0xd1, 0x3d, 0x48, 0x28, 0x68, 0x00, 0x28, 0x01, 
+-	0xd1, 0x39, 0xb0, 0x82, 0x1c, 0x28, 0xf0, 0x0a, 
+-	0xfa, 0xc7, 0x28, 0x00, 0xd1, 0x05, 0x20, 0x92, 
+-	0x49, 0x1f, 0x60, 0x08, 0x20, 0x00, 0xb0, 0x03, 
+-	0xe7, 0xbe, 0x49, 0x21, 0x20, 0x91, 0xf0, 0x17, 
+-	0xfb, 0x91, 0x28, 0x92, 0xd0, 0x00, 0xe7, 0xf8, 
+-	0xf0, 0x0a, 0xfb, 0x11, 0x20, 0x92, 0x49, 0x1c, 
+-	0x60, 0x08, 0x20, 0x01, 0x49, 0x1b, 0x68, 0x09, 
+-	0x60, 0x08, 0x48, 0x1a, 0x68, 0x01, 0x1c, 0x20, 
+-	0xf0, 0x0a, 0xfa, 0xc2, 0x90, 0x00, 0x69, 0x60, 
+-	0x99, 0x00, 0x60, 0xc8, 0x49, 0x14, 0x20, 0x91, 
+-	0xf0, 0x17, 0xfb, 0x78, 0x28, 0x92, 0xd0, 0x00, 
+-	0xe7, 0xf8, 0x48, 0x12, 0x68, 0x00, 0x90, 0x01, 
+-	0x48, 0x11, 0x68, 0x00, 0x49, 0x0f, 0x60, 0x08, 
+-	0x98, 0x01, 0x49, 0x0f, 0x60, 0x08, 0x20, 0x92, 
+-	0x49, 0x0b, 0x60, 0x08, 0xb0, 0x02, 0x20, 0x92, 
+-	0x49, 0x05, 0x60, 0x08, 0x20, 0x00, 0xb0, 0x01, 
+-	0xe7, 0x8a, 0xb0, 0x01, 0xe7, 0x88, 0x00, 0x00, 
+-	0xff, 0xff, 0xc3, 0xff, 0x2e, 0x08, 0x94, 0x84, 
+-	0x2e, 0x08, 0x7c, 0xc0, 0x2e, 0x08, 0x7c, 0x58, 
+-	0x68, 0x00, 0x0c, 0x00, 0x2e, 0x08, 0x60, 0x84, 
+-	0x2e, 0x08, 0x94, 0x88, 0x2e, 0x08, 0x7d, 0xb4, 
+-	0x2e, 0x08, 0x7d, 0xb8, 0xb5, 0xf3, 0x1c, 0x07, 
+-	0xb0, 0x82, 0x1c, 0x3c, 0x68, 0xe5, 0x26, 0x00, 
+-	0x99, 0x03, 0x29, 0x01, 0xd1, 0x00, 0x26, 0x01, 
+-	0x69, 0x60, 0x06, 0x80, 0x0f, 0xc0, 0x42, 0xb0, 
+-	0xd1, 0x05, 0x20, 0x00, 0xb0, 0x02, 0xb0, 0x02, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x69, 0x60, 
+-	0x23, 0x20, 0x43, 0xdb, 0x40, 0x18, 0x07, 0xf1, 
+-	0x0e, 0x89, 0x43, 0x08, 0x61, 0x60, 0x06, 0x80, 
+-	0x48, 0x44, 0x68, 0x00, 0x28, 0x00, 0xd0, 0x05, 
+-	0x2d, 0x19, 0xd3, 0x01, 0x20, 0x01, 0xe0, 0x00, 
+-	0x20, 0x00, 0xe0, 0x04, 0x2d, 0x08, 0xd3, 0x01, 
+-	0x20, 0x01, 0xe0, 0x00, 0x20, 0x00, 0x28, 0x00, 
+-	0xd0, 0x02, 0x20, 0x00, 0xb0, 0x02, 0xe7, 0xde, 
+-	0x49, 0x3b, 0x20, 0x91, 0xf0, 0x17, 0xfb, 0x16, 
+-	0x28, 0x92, 0xd0, 0x03, 0x20, 0x01, 0xf0, 0x09, 
+-	0xfa, 0xfd, 0xe7, 0xf5, 0x00, 0xa8, 0x49, 0x37, 
+-	0x58, 0x08, 0x42, 0xb8, 0xd0, 0x05, 0x20, 0x92, 
+-	0x49, 0x33, 0x60, 0x08, 0x20, 0xff, 0xb0, 0x02, 
+-	0xe7, 0xc9, 0x48, 0x30, 0x68, 0x00, 0x28, 0x00, 
+-	0xd0, 0x05, 0x69, 0x20, 0x28, 0x0b, 0xdb, 0x0e, 
+-	0x69, 0x20, 0x28, 0x12, 0xdc, 0x0b, 0x01, 0x28, 
+-	0x4b, 0x2d, 0x18, 0xc1, 0x91, 0x01, 0x1d, 0xe0, 
+-	0x30, 0x0d, 0x90, 0x00, 0x98, 0x00, 0x68, 0x00, 
+-	0x99, 0x01, 0x60, 0x08, 0xe0, 0x41, 0x48, 0x25, 
+-	0x68, 0x00, 0x28, 0x01, 0xd1, 0x3d, 0x48, 0x27, 
+-	0x68, 0x00, 0x28, 0x01, 0xd1, 0x39, 0xb0, 0x82, 
+-	0x1c, 0x28, 0xf0, 0x0a, 0xfa, 0x0d, 0x28, 0x00, 
+-	0xd1, 0x05, 0x20, 0x92, 0x49, 0x1e, 0x60, 0x08, 
+-	0x20, 0x00, 0xb0, 0x04, 0xe7, 0x9f, 0x49, 0x20, 
+-	0x20, 0x91, 0xf0, 0x17, 0xfa, 0xd7, 0x28, 0x92, 
+-	0xd0, 0x00, 0xe7, 0xf8, 0xf0, 0x0a, 0xfa, 0x57, 
+-	0x20, 0x92, 0x49, 0x1b, 0x60, 0x08, 0x20, 0x01, 
+-	0x49, 0x1a, 0x68, 0x09, 0x60, 0x08, 0x48, 0x19, 
+-	0x68, 0x01, 0x1c, 0x20, 0xf0, 0x0a, 0xfa, 0x08, 
+-	0x90, 0x00, 0x69, 0x60, 0x99, 0x00, 0x60, 0xc8, 
+-	0x49, 0x13, 0x20, 0x91, 0xf0, 0x17, 0xfa, 0xbe, 
+-	0x28, 0x92, 0xd0, 0x00, 0xe7, 0xf8, 0x48, 0x11, 
+-	0x68, 0x00, 0x90, 0x01, 0x48, 0x10, 0x68, 0x00, 
+-	0x49, 0x0e, 0x60, 0x08, 0x98, 0x01, 0x49, 0x0e, 
+-	0x60, 0x08, 0x20, 0x92, 0x49, 0x0a, 0x60, 0x08, 
+-	0xb0, 0x02, 0x20, 0x92, 0x49, 0x04, 0x60, 0x08, 
+-	0x20, 0x00, 0xb0, 0x02, 0xe7, 0x6b, 0xb0, 0x02, 
+-	0xe7, 0x69, 0x00, 0x00, 0x2e, 0x08, 0x94, 0x84, 
+-	0x2e, 0x08, 0x7c, 0xc0, 0x2e, 0x08, 0x7c, 0x58, 
+-	0x68, 0x00, 0x0c, 0x00, 0x2e, 0x08, 0x60, 0x84, 
+-	0x2e, 0x08, 0x94, 0x88, 0x2e, 0x08, 0x7d, 0xb4, 
+-	0x2e, 0x08, 0x7d, 0xb8, 0xb5, 0xf0, 0x1c, 0x04, 
+-	0x1c, 0x0f, 0xb0, 0x83, 0x1c, 0x25, 0x69, 0x28, 
+-	0x28, 0x13, 0xd1, 0x04, 0x20, 0x75, 0xb0, 0x03, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x68, 0xee, 
+-	0x20, 0x04, 0x40, 0x38, 0x08, 0x81, 0x91, 0x02, 
+-	0x69, 0x68, 0x23, 0xc0, 0x43, 0xdb, 0x40, 0x18, 
+-	0x07, 0xb9, 0x0f, 0x89, 0x01, 0x89, 0x43, 0x08, 
+-	0x61, 0x68, 0x06, 0x00, 0x69, 0x68, 0x4b, 0x48, 
+-	0x40, 0x18, 0x99, 0x02, 0x07, 0xc9, 0x0c, 0x49, 
+-	0x43, 0x08, 0x61, 0x68, 0x04, 0x40, 0x48, 0x45, 
+-	0x68, 0x00, 0x28, 0x00, 0xd0, 0x05, 0x2e, 0x19, 
+-	0xd3, 0x01, 0x20, 0x01, 0xe0, 0x00, 0x20, 0x00, 
+-	0xe0, 0x04, 0x2e, 0x08, 0xd3, 0x01, 0x20, 0x01, 
+-	0xe0, 0x00, 0x20, 0x00, 0x28, 0x00, 0xd0, 0x02, 
+-	0x20, 0x00, 0xb0, 0x03, 0xe7, 0xd0, 0x49, 0x3c, 
+-	0x20, 0x91, 0xf0, 0x17, 0xfa, 0x57, 0x28, 0x92, 
+-	0xd0, 0x03, 0x20, 0x01, 0xf0, 0x09, 0xfa, 0x3e, 
+-	0xe7, 0xf5, 0x00, 0xb0, 0x49, 0x37, 0x58, 0x08, 
+-	0x42, 0xa0, 0xd0, 0x05, 0x20, 0x92, 0x49, 0x34, 
+-	0x60, 0x08, 0x20, 0xff, 0xb0, 0x03, 0xe7, 0xbb, 
+-	0x48, 0x30, 0x68, 0x00, 0x28, 0x00, 0xd0, 0x05, 
+-	0x69, 0x28, 0x28, 0x0b, 0xdb, 0x0e, 0x69, 0x28, 
+-	0x28, 0x12, 0xdc, 0x0b, 0x01, 0x30, 0x4b, 0x2e, 
+-	0x18, 0xc0, 0x90, 0x01, 0x1d, 0xe8, 0x30, 0x0d, 
+-	0x90, 0x00, 0x98, 0x00, 0x68, 0x00, 0x99, 0x01, 
+-	0x60, 0x08, 0xe0, 0x41, 0x48, 0x25, 0x68, 0x00, 
+-	0x28, 0x01, 0xd1, 0x3d, 0x48, 0x27, 0x68, 0x00, 
+-	0x28, 0x01, 0xd1, 0x39, 0xb0, 0x82, 0x1c, 0x30, 
+-	0xf0, 0x0a, 0xf9, 0x4e, 0x28, 0x00, 0xd1, 0x05, 
+-	0x20, 0x92, 0x49, 0x1f, 0x60, 0x08, 0x20, 0x00, 
+-	0xb0, 0x05, 0xe7, 0x91, 0x49, 0x20, 0x20, 0x91, 
+-	0xf0, 0x17, 0xfa, 0x18, 0x28, 0x92, 0xd0, 0x00, 
+-	0xe7, 0xf8, 0xf0, 0x0a, 0xf9, 0x98, 0x20, 0x92, 
+-	0x49, 0x1b, 0x60, 0x08, 0x20, 0x01, 0x49, 0x1b, 
+-	0x68, 0x09, 0x60, 0x08, 0x48, 0x19, 0x68, 0x01, 
+-	0x1c, 0x28, 0xf0, 0x0a, 0xf9, 0x49, 0x90, 0x00, 
+-	0x69, 0x68, 0x99, 0x00, 0x60, 0xc8, 0x49, 0x14, 
+-	0x20, 0x91, 0xf0, 0x17, 0xf9, 0xff, 0x28, 0x92, 
+-	0xd0, 0x00, 0xe7, 0xf8, 0x48, 0x11, 0x68, 0x00, 
+-	0x90, 0x01, 0x48, 0x11, 0x68, 0x00, 0x49, 0x0f, 
+-	0x60, 0x08, 0x98, 0x01, 0x49, 0x0e, 0x60, 0x08, 
+-	0x20, 0x92, 0x49, 0x0b, 0x60, 0x08, 0xb0, 0x02, 
+-	0x20, 0x92, 0x49, 0x05, 0x60, 0x08, 0x20, 0x00, 
+-	0xb0, 0x03, 0xe7, 0x5d, 0xb0, 0x03, 0xe7, 0x5b, 
+-	0xff, 0xff, 0xbf, 0xff, 0x2e, 0x08, 0x94, 0x84, 
+-	0x2e, 0x08, 0x7c, 0xc0, 0x2e, 0x08, 0x7c, 0x58, 
+-	0x68, 0x00, 0x0c, 0x00, 0x2e, 0x08, 0x60, 0x84, 
+-	0x2e, 0x08, 0x94, 0x88, 0x2e, 0x08, 0x7d, 0xb4, 
+-	0x2e, 0x08, 0x7d, 0xb8, 0x1c, 0x01, 0x20, 0x0d, 
+-	0x06, 0xc0, 0x60, 0x41, 0x48, 0x02, 0x63, 0x81, 
+-	0x20, 0x00, 0x47, 0x70, 0xe7, 0xfd, 0x00, 0x00, 
+-	0x68, 0x00, 0x0d, 0x00, 0x20, 0x0d, 0x06, 0xc0, 
+-	0x68, 0x40, 0x02, 0x00, 0x0a, 0x00, 0x47, 0x70, 
+-	0xe7, 0xfd, 0x1c, 0x01, 0x1c, 0x0a, 0x68, 0xd0, 
+-	0x47, 0x70, 0xe7, 0xfd, 0x1c, 0x03, 0x1c, 0x0a, 
+-	0x1c, 0x19, 0x69, 0x08, 0x28, 0x13, 0xd1, 0x01, 
+-	0x20, 0x75, 0x47, 0x70, 0x69, 0x08, 0x28, 0x0b, 
+-	0xdb, 0x0b, 0x69, 0x08, 0x28, 0x12, 0xdc, 0x08, 
+-	0x6d, 0x08, 0x60, 0x10, 0x6d, 0x88, 0x60, 0x90, 
+-	0x6d, 0x48, 0x60, 0x50, 0x6d, 0xc8, 0x60, 0xd0, 
+-	0xe0, 0x07, 0x6a, 0x88, 0x60, 0x10, 0x6b, 0x08, 
+-	0x60, 0x90, 0x6a, 0xc8, 0x60, 0x50, 0x6b, 0x48, 
+-	0x60, 0xd0, 0x20, 0x00, 0xe7, 0xe5, 0xe7, 0xe4, 
+-	0x1c, 0x03, 0x1c, 0x0a, 0x68, 0x10, 0x60, 0x18, 
+-	0x68, 0x90, 0x60, 0x98, 0x68, 0x50, 0x60, 0x58, 
+-	0x68, 0xd0, 0x60, 0xd8, 0x47, 0x70, 0xe7, 0xfd, 
+-	0x1c, 0x01, 0x1c, 0x0a, 0x69, 0x50, 0x05, 0x80, 
+-	0x0f, 0x80, 0x47, 0x70, 0xe7, 0xfd, 0x1c, 0x01, 
+-	0x1c, 0x0a, 0x69, 0x50, 0x12, 0x80, 0x07, 0x00, 
+-	0x0f, 0x00, 0x47, 0x70, 0xe7, 0xfd, 0xb4, 0x80, 
+-	0x1c, 0x01, 0x1c, 0x0f, 0x22, 0x01, 0x69, 0x78, 
+-	0x23, 0x20, 0x40, 0x18, 0xd1, 0x00, 0x22, 0x00, 
+-	0x1c, 0x10, 0xbc, 0x80, 0x47, 0x70, 0xe7, 0xfc, 
+-	0x1c, 0x01, 0x1c, 0x0b, 0x69, 0x18, 0x28, 0x13, 
+-	0xd1, 0x01, 0x20, 0x75, 0x47, 0x70, 0x69, 0x58, 
+-	0x06, 0x00, 0x0f, 0x82, 0x69, 0x58, 0x04, 0x40, 
+-	0x0f, 0xc0, 0x00, 0x80, 0x43, 0x02, 0x1c, 0x10, 
+-	0xe7, 0xf4, 0xe7, 0xf3, 0x1c, 0x01, 0x20, 0x0d, 
+-	0x06, 0xc0, 0x61, 0x41, 0x20, 0x00, 0x47, 0x70, 
+-	0xe7, 0xfd, 0x20, 0x0d, 0x06, 0xc0, 0x69, 0x40, 
+-	0x1c, 0x01, 0x1c, 0x08, 0x47, 0x70, 0xe7, 0xfd, 
+-	0x1c, 0x01, 0x22, 0x00, 0x29, 0x01, 0xd1, 0x00, 
+-	0x22, 0x01, 0x20, 0x0d, 0x06, 0xc0, 0x68, 0xc0, 
+-	0x1c, 0x03, 0x2b, 0x02, 0xd1, 0x01, 0x29, 0x00, 
+-	0xd1, 0x02, 0x20, 0x0d, 0x06, 0xc0, 0x60, 0xc2, 
+-	0x20, 0x00, 0x47, 0x70, 0xe7, 0xfd, 0x21, 0x01, 
+-	0x20, 0x0d, 0x06, 0xc0, 0x68, 0xc0, 0x1c, 0x02, 
+-	0x2a, 0x00, 0xd1, 0x00, 0x21, 0x00, 0x1c, 0x08, 
+-	0x47, 0x70, 0xe7, 0xfd, 0x1c, 0x01, 0x1c, 0x0a, 
+-	0x69, 0x10, 0x47, 0x70, 0xe7, 0xfd, 0xb4, 0x90, 
+-	0x1c, 0x07, 0x1c, 0x0a, 0x1c, 0x39, 0x69, 0x08, 
+-	0x28, 0x13, 0xd0, 0x05, 0x69, 0x08, 0x28, 0x0b, 
+-	0xdb, 0x05, 0x69, 0x08, 0x28, 0x12, 0xdc, 0x02, 
+-	0x20, 0x86, 0xbc, 0x90, 0x47, 0x70, 0x6b, 0x8c, 
+-	0x69, 0x48, 0x23, 0x04, 0x40, 0x18, 0xd0, 0x00, 
+-	0x08, 0x64, 0x69, 0x08, 0x00, 0x80, 0x4b, 0x03, 
+-	0x58, 0x18, 0x43, 0x60, 0x60, 0x10, 0x20, 0x00, 
+-	0xe7, 0xef, 0xe7, 0xee, 0x2e, 0x03, 0x3a, 0x54, 
+-	0xb5, 0xf3, 0x1c, 0x07, 0xb0, 0x81, 0x9c, 0x02, 
+-	0x69, 0x20, 0x28, 0x13, 0xd0, 0x05, 0x69, 0x20, 
+-	0x28, 0x0b, 0xdb, 0x08, 0x69, 0x20, 0x28, 0x12, 
+-	0xdc, 0x05, 0x20, 0x86, 0xb0, 0x01, 0xb0, 0x02, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x68, 0xe5, 
+-	0x68, 0x38, 0x64, 0x20, 0x68, 0x7e, 0x64, 0x66, 
+-	0x08, 0xb6, 0x61, 0xa6, 0x48, 0x3f, 0x68, 0x00, 
+-	0x28, 0x00, 0xd0, 0x05, 0x2d, 0x19, 0xd3, 0x01, 
+-	0x20, 0x01, 0xe0, 0x00, 0x20, 0x00, 0xe0, 0x04, 
+-	0x2d, 0x08, 0xd3, 0x01, 0x20, 0x01, 0xe0, 0x00, 
+-	0x20, 0x00, 0x28, 0x00, 0xd0, 0x02, 0x20, 0x00, 
+-	0xb0, 0x01, 0xe7, 0xe0, 0x49, 0x36, 0x20, 0x91, 
+-	0xf0, 0x17, 0xf8, 0xdc, 0x28, 0x92, 0xd0, 0x03, 
+-	0x20, 0x01, 0xf0, 0x09, 0xf8, 0xc3, 0xe7, 0xf5, 
+-	0x00, 0xa8, 0x49, 0x32, 0x58, 0x08, 0x99, 0x02, 
+-	0x42, 0x88, 0xd0, 0x05, 0x20, 0x92, 0x49, 0x2e, 
+-	0x60, 0x08, 0x20, 0x86, 0xb0, 0x01, 0xe7, 0xca, 
+-	0x48, 0x2a, 0x68, 0x00, 0x28, 0x00, 0xd1, 0x06, 
+-	0x01, 0x28, 0x4b, 0x2b, 0x18, 0xc0, 0x90, 0x00, 
+-	0x98, 0x00, 0x60, 0x06, 0xe0, 0x41, 0x48, 0x25, 
+-	0x68, 0x00, 0x28, 0x01, 0xd1, 0x3d, 0x48, 0x27, 
+-	0x68, 0x00, 0x28, 0x01, 0xd1, 0x39, 0xb0, 0x82, 
+-	0x1c, 0x28, 0xf0, 0x09, 0xff, 0xdd, 0x28, 0x00, 
+-	0xd1, 0x05, 0x20, 0x92, 0x49, 0x1e, 0x60, 0x08, 
+-	0x20, 0x00, 0xb0, 0x03, 0xe7, 0xab, 0x49, 0x20, 
+-	0x20, 0x91, 0xf0, 0x17, 0xf8, 0xa7, 0x28, 0x92, 
+-	0xd0, 0x00, 0xe7, 0xf8, 0xf0, 0x0a, 0xf8, 0x27, 
+-	0x20, 0x92, 0x49, 0x1b, 0x60, 0x08, 0x20, 0x01, 
+-	0x49, 0x1a, 0x68, 0x09, 0x60, 0x08, 0x48, 0x19, 
+-	0x68, 0x01, 0x1c, 0x20, 0xf0, 0x09, 0xff, 0xd8, 
+-	0x90, 0x00, 0x69, 0xa0, 0x99, 0x00, 0x61, 0x08, 
+-	0x49, 0x13, 0x20, 0x91, 0xf0, 0x17, 0xf8, 0x8e, 
+-	0x28, 0x92, 0xd0, 0x00, 0xe7, 0xf8, 0x48, 0x11, 
+-	0x68, 0x00, 0x90, 0x01, 0x48, 0x10, 0x68, 0x00, 
+-	0x49, 0x0e, 0x60, 0x08, 0x98, 0x01, 0x49, 0x0e, 
+-	0x60, 0x08, 0x20, 0x92, 0x49, 0x0a, 0x60, 0x08, 
+-	0xb0, 0x02, 0x20, 0x92, 0x49, 0x04, 0x60, 0x08, 
+-	0x20, 0x00, 0xb0, 0x01, 0xe7, 0x77, 0xb0, 0x01, 
+-	0xe7, 0x75, 0x00, 0x00, 0x2e, 0x08, 0x94, 0x84, 
+-	0x2e, 0x08, 0x7c, 0xc0, 0x2e, 0x08, 0x7c, 0x58, 
+-	0x68, 0x00, 0x0c, 0x04, 0x2e, 0x08, 0x60, 0x84, 
+-	0x2e, 0x08, 0x94, 0x88, 0x2e, 0x08, 0x7d, 0xb4, 
+-	0x2e, 0x08, 0x7d, 0xb8, 0xb4, 0x80, 0x1c, 0x01, 
+-	0x06, 0x0b, 0x0e, 0x1b, 0x22, 0x01, 0x2a, 0x19, 
+-	0xd3, 0x02, 0xe0, 0x0f, 0x32, 0x01, 0xe7, 0xfa, 
+-	0x00, 0x90, 0x4f, 0x08, 0x58, 0x38, 0x68, 0x80, 
+-	0x02, 0x00, 0x0e, 0x00, 0x42, 0x98, 0xd1, 0x04, 
+-	0x00, 0x90, 0x4f, 0x04, 0x58, 0x38, 0xbc, 0x80, 
+-	0x47, 0x70, 0xe7, 0xef, 0x20, 0x00, 0xe7, 0xfa, 
+-	0xe7, 0xf9, 0x00, 0x00, 0x2e, 0x08, 0x7c, 0x58, 
+-	0xb4, 0x90, 0x1c, 0x07, 0x1c, 0x0a, 0x06, 0x38, 
+-	0x16, 0x01, 0x48, 0x20, 0x60, 0x02, 0x48, 0x20, 
+-	0x68, 0x80, 0x23, 0x33, 0x06, 0x5b, 0x65, 0xd8, 
+-	0x48, 0x1d, 0x68, 0xc0, 0x23, 0x33, 0x06, 0x5b, 
+-	0x66, 0x18, 0x48, 0x1c, 0x4b, 0x1a, 0x60, 0x98, 
+-	0x48, 0x1b, 0x4b, 0x19, 0x60, 0xd8, 0x20, 0x01, 
+-	0x23, 0x33, 0x06, 0x5b, 0x66, 0xd8, 0x48, 0x19, 
+-	0x68, 0x04, 0x23, 0x01, 0x04, 0xdb, 0x43, 0x23, 
+-	0x60, 0x03, 0x48, 0x16, 0x68, 0x04, 0x23, 0x01, 
+-	0x04, 0xdb, 0x43, 0x9c, 0x1c, 0x23, 0x60, 0x03, 
+-	0x29, 0x00, 0xd1, 0x10, 0x20, 0xff, 0x30, 0x14, 
+-	0x23, 0x1b, 0x06, 0x9b, 0x62, 0x18, 0x48, 0x10, 
+-	0x68, 0x04, 0x23, 0xff, 0x33, 0x01, 0x43, 0x9c, 
+-	0x1c, 0x23, 0x60, 0x03, 0x48, 0x0d, 0x23, 0x1b, 
+-	0x06, 0x9b, 0x64, 0x18, 0xe0, 0x08, 0x20, 0xff, 
+-	0x30, 0x14, 0x23, 0x1b, 0x06, 0x9b, 0x62, 0x18, 
+-	0x48, 0x02, 0x68, 0x00, 0x4b, 0x08, 0x60, 0x18, 
+-	0xbc, 0x90, 0x47, 0x70, 0x2e, 0x08, 0x5e, 0x50, 
+-	0x2e, 0x08, 0x7c, 0x1c, 0xcc, 0x1f, 0xe0, 0x00, 
+-	0xcc, 0x1f, 0xfe, 0x00, 0x6c, 0x00, 0x00, 0x40, 
+-	0x6c, 0x00, 0x00, 0x20, 0x00, 0x00, 0x82, 0x18, 
+-	0x6c, 0x00, 0x00, 0x80, 0xb4, 0xf0, 0x1c, 0x01, 
+-	0xb0, 0x82, 0x23, 0x1b, 0x06, 0x9b, 0x6a, 0x1b, 
+-	0x1c, 0x18, 0x27, 0x00, 0x22, 0x00, 0x08, 0x40, 
+-	0x00, 0x40, 0x4b, 0xaf, 0x68, 0x1c, 0x08, 0x64, 
+-	0x00, 0x64, 0x60, 0x1c, 0x4b, 0xad, 0x68, 0x1b, 
+-	0x1c, 0x1d, 0x23, 0x1b, 0x06, 0x9b, 0x6c, 0x1b, 
+-	0x93, 0x01, 0x23, 0xff, 0x33, 0x01, 0x40, 0x03, 
+-	0xd0, 0x00, 0x22, 0xff, 0x23, 0x01, 0x04, 0x9b, 
+-	0x40, 0x03, 0xd0, 0x1b, 0x4c, 0xa4, 0x68, 0x26, 
+-	0x23, 0x01, 0x04, 0x9b, 0x43, 0x9e, 0x1c, 0x33, 
+-	0x60, 0x23, 0x4c, 0xa1, 0x68, 0x26, 0x23, 0x01, 
+-	0x43, 0x33, 0x60, 0x23, 0x23, 0x00, 0x93, 0x00, 
+-	0x9b, 0x00, 0x2b, 0x0a, 0xdb, 0x04, 0xe0, 0x04, 
+-	0x9b, 0x00, 0x33, 0x01, 0x93, 0x00, 0xe7, 0xf7, 
+-	0xe7, 0xfa, 0x4b, 0x99, 0x68, 0x1c, 0x08, 0x64, 
+-	0x00, 0x64, 0x60, 0x1c, 0x23, 0x01, 0x02, 0x9b, 
+-	0x40, 0x0b, 0xd0, 0x29, 0x23, 0x01, 0x02, 0xdb, 
+-	0x40, 0x0b, 0xd0, 0x01, 0x4b, 0x94, 0x40, 0x18, 
+-	0x23, 0x01, 0x03, 0x1b, 0x40, 0x0b, 0xd0, 0x02, 
+-	0x23, 0x01, 0x05, 0x9b, 0x43, 0x18, 0x4b, 0x91, 
+-	0x40, 0x18, 0x02, 0x4c, 0x23, 0x7f, 0x02, 0x5b, 
+-	0x40, 0x23, 0x43, 0x18, 0x23, 0x40, 0x40, 0x0b, 
+-	0xd0, 0x03, 0x23, 0x01, 0x04, 0x5b, 0x43, 0x18, 
+-	0xe0, 0x0a, 0x4b, 0x8b, 0x40, 0x18, 0x23, 0x20, 
+-	0x40, 0x0b, 0xd0, 0x03, 0x23, 0x01, 0x04, 0x1b, 
+-	0x43, 0x18, 0xe0, 0x01, 0x4b, 0x87, 0x40, 0x18, 
+-	0x23, 0x1b, 0x06, 0x9b, 0x62, 0x18, 0xe0, 0xfc, 
+-	0x23, 0x04, 0x40, 0x0b, 0xd0, 0x0f, 0x4c, 0x7e, 
+-	0x68, 0x26, 0x23, 0x01, 0x43, 0x33, 0x60, 0x23, 
+-	0x4b, 0x81, 0x68, 0x9b, 0x24, 0x33, 0x06, 0x64, 
+-	0x65, 0xe3, 0x4b, 0x7f, 0x68, 0xdb, 0x24, 0x33, 
+-	0x06, 0x64, 0x66, 0x23, 0xe0, 0xe9, 0x23, 0x01, 
+-	0x03, 0x5b, 0x40, 0x0b, 0xd0, 0x13, 0x4b, 0x7a, 
+-	0x68, 0x9b, 0x24, 0x33, 0x06, 0x64, 0x65, 0xe3, 
+-	0x4b, 0x77, 0x68, 0xdb, 0x24, 0x33, 0x06, 0x64, 
+-	0x66, 0x23, 0x23, 0x01, 0x24, 0x33, 0x06, 0x64, 
+-	0x66, 0xe3, 0x4c, 0x6d, 0x68, 0x26, 0x23, 0x01, 
+-	0x43, 0x33, 0x60, 0x23, 0xe0, 0xd1, 0x07, 0xcb, 
+-	0x0f, 0xdb, 0xd0, 0x02, 0x23, 0x02, 0x43, 0x18, 
+-	0xe0, 0x05, 0x23, 0x02, 0x40, 0x0b, 0xd0, 0x02, 
+-	0x23, 0x02, 0x43, 0xdb, 0x40, 0x18, 0x23, 0x07, 
+-	0x01, 0xdb, 0x40, 0x0b, 0xd0, 0x0f, 0x23, 0x0c, 
+-	0x43, 0xdb, 0x40, 0x18, 0x23, 0xff, 0x33, 0x01, 
+-	0x40, 0x0b, 0xd0, 0x02, 0x23, 0x04, 0x43, 0x18, 
+-	0xe0, 0x05, 0x23, 0x01, 0x02, 0x5b, 0x40, 0x0b, 
+-	0xd0, 0x01, 0x23, 0x08, 0x43, 0x18, 0x23, 0x01, 
+-	0x04, 0x1b, 0x40, 0x0b, 0xd0, 0x08, 0x23, 0x01, 
+-	0x04, 0x9b, 0x43, 0x98, 0x1c, 0x04, 0x20, 0x01, 
+-	0x04, 0xc0, 0x43, 0x20, 0x23, 0x01, 0x43, 0x18, 
+-	0x23, 0x78, 0x40, 0x0b, 0xd0, 0x73, 0x23, 0x30, 
+-	0x40, 0x03, 0xd0, 0x06, 0x2b, 0x10, 0xd0, 0x04, 
+-	0x2b, 0x20, 0xd0, 0x42, 0x2b, 0x30, 0xd0, 0x40, 
+-	0xe0, 0x81, 0x23, 0x10, 0x40, 0x0b, 0xd1, 0x02, 
+-	0x23, 0x08, 0x40, 0x0b, 0xd0, 0x08, 0x23, 0x30, 
+-	0x43, 0xdb, 0x40, 0x18, 0x23, 0x10, 0x40, 0x0b, 
+-	0xd0, 0x01, 0x23, 0x10, 0x43, 0x18, 0xe0, 0x2f, 
+-	0x23, 0x30, 0x43, 0xdb, 0x40, 0x18, 0x23, 0x20, 
+-	0x40, 0x0b, 0xd0, 0x02, 0x23, 0x20, 0x43, 0x18, 
+-	0xe0, 0x01, 0x23, 0x30, 0x43, 0x18, 0x23, 0x01, 
+-	0x43, 0x18, 0x23, 0x1b, 0x06, 0x9b, 0x62, 0x18, 
+-	0x27, 0xff, 0x2a, 0x00, 0xd0, 0x04, 0x4b, 0x43, 
+-	0x68, 0x1b, 0x4c, 0x43, 0x60, 0x23, 0xe0, 0x17, 
+-	0x07, 0xab, 0x0f, 0x9b, 0xd0, 0x09, 0x2b, 0x01, 
+-	0xd0, 0x02, 0x2b, 0x02, 0xd0, 0x0a, 0xe0, 0x0e, 
+-	0x4b, 0x3e, 0x24, 0x1b, 0x06, 0xa4, 0x64, 0x23, 
+-	0xe0, 0x0a, 0x4b, 0x3d, 0x24, 0x1b, 0x06, 0xa4, 
+-	0x64, 0x23, 0xe0, 0x05, 0x4b, 0x3b, 0x24, 0x1b, 
+-	0x06, 0xa4, 0x64, 0x23, 0xe0, 0x00, 0xe7, 0xff, 
+-	0xe0, 0x42, 0x23, 0x40, 0x40, 0x0b, 0xd1, 0x02, 
+-	0x23, 0x20, 0x40, 0x0b, 0xd0, 0x0b, 0x23, 0x30, 
+-	0x43, 0xdb, 0x40, 0x18, 0x23, 0x20, 0x40, 0x0b, 
+-	0xd0, 0x02, 0x23, 0x20, 0x43, 0x18, 0xe0, 0x01, 
+-	0x23, 0x30, 0x43, 0x18, 0xe0, 0x2e, 0x23, 0x30, 
+-	0x43, 0xdb, 0x40, 0x18, 0x23, 0x10, 0x40, 0x0b, 
+-	0xd0, 0x01, 0x23, 0x10, 0x43, 0x18, 0x23, 0x01, 
+-	0x43, 0x18, 0x23, 0x1b, 0x06, 0x9b, 0x62, 0x18, 
+-	0x27, 0xff, 0x2a, 0x00, 0xd0, 0x04, 0x4b, 0x23, 
+-	0x68, 0x1b, 0x4c, 0x23, 0x60, 0x23, 0xe0, 0x19, 
+-	0x07, 0xab, 0x0f, 0x9b, 0xe0, 0x00, 0xe0, 0x17, 
+-	0xd0, 0x09, 0x2b, 0x01, 0xd0, 0x02, 0x2b, 0x02, 
+-	0xd0, 0x0a, 0xe0, 0x0e, 0x4b, 0x20, 0x24, 0x1b, 
+-	0x06, 0xa4, 0x64, 0x23, 0xe0, 0x0a, 0x4b, 0x1f, 
+-	0x24, 0x1b, 0x06, 0xa4, 0x64, 0x23, 0xe0, 0x05, 
+-	0x4b, 0x1d, 0x24, 0x1b, 0x06, 0xa4, 0x64, 0x23, 
+-	0xe0, 0x00, 0xe7, 0xff, 0xe0, 0x00, 0xe7, 0xff, 
+-	0x2f, 0x00, 0xd1, 0x12, 0x23, 0x1b, 0x06, 0x9b, 
+-	0x62, 0x18, 0x23, 0x00, 0x93, 0x00, 0x9b, 0x00, 
+-	0x2b, 0x0a, 0xdb, 0x04, 0xe0, 0x04, 0x9b, 0x00, 
+-	0x33, 0x01, 0x93, 0x00, 0xe7, 0xf7, 0xe7, 0xfa, 
+-	0x4b, 0x03, 0x68, 0x1c, 0x08, 0x64, 0x00, 0x64, 
+-	0x60, 0x1c, 0xb0, 0x02, 0xbc, 0xf0, 0x47, 0x70, 
+-	0x6c, 0x00, 0x00, 0x20, 0x6c, 0x00, 0x68, 0x00, 
+-	0xff, 0xbf, 0xff, 0xff, 0xff, 0xfe, 0x01, 0xff, 
+-	0xff, 0xfd, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 
+-	0x2e, 0x08, 0x7c, 0x1c, 0x2e, 0x08, 0x5e, 0x50, 
+-	0x6c, 0x00, 0x00, 0x80, 0x00, 0x00, 0x98, 0x60, 
+-	0x00, 0x01, 0x58, 0x60, 0x00, 0x02, 0x54, 0x28, 
+-	0x00, 0x00, 0x82, 0x18, 0x00, 0x01, 0x42, 0x18, 
+-	0x00, 0x02, 0x42, 0x18, 0xb5, 0xf3, 0x1c, 0x0f, 
+-	0xb0, 0x81, 0x98, 0x01, 0x06, 0x00, 0x0e, 0x00, 
+-	0x90, 0x00, 0x98, 0x00, 0x28, 0x20, 0xdb, 0x05, 
+-	0x20, 0xa2, 0xb0, 0x01, 0xb0, 0x02, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x20, 0x33, 0x06, 0x40, 
+-	0x6e, 0x00, 0x21, 0x33, 0x06, 0x49, 0x6d, 0xc9, 
+-	0x1a, 0x46, 0x48, 0x12, 0x6c, 0x80, 0x1c, 0x04, 
+-	0x48, 0x10, 0x6c, 0xc0, 0x1c, 0x05, 0x42, 0xac, 
+-	0xd9, 0x09, 0x1b, 0x60, 0x21, 0x64, 0x43, 0x41, 
+-	0x1c, 0x30, 0xf0, 0x09, 0xff, 0xcb, 0x21, 0x64, 
+-	0x1a, 0x08, 0x60, 0x38, 0xe0, 0x06, 0x1b, 0x28, 
+-	0x21, 0x64, 0x43, 0x41, 0x1c, 0x30, 0xf0, 0x09, 
+-	0xff, 0xc1, 0x60, 0x38, 0x42, 0xac, 0xd1, 0x03, 
+-	0x20, 0x31, 0xb0, 0x01, 0xe7, 0xd6, 0xe0, 0x02, 
+-	0x20, 0x00, 0xb0, 0x01, 0xe7, 0xd2, 0xb0, 0x01, 
+-	0xe7, 0xd0, 0x00, 0x00, 0x66, 0x00, 0x00, 0x80, 
+-	0xb5, 0xff, 0x1c, 0x14, 0x1c, 0x1f, 0xb0, 0x82, 
+-	0x98, 0x02, 0x06, 0x01, 0x0e, 0x09, 0x91, 0x00, 
+-	0x98, 0x0b, 0x06, 0x03, 0x16, 0x1b, 0x93, 0x01, 
+-	0xb0, 0x84, 0x99, 0x04, 0x29, 0x20, 0xdb, 0x05, 
+-	0x20, 0xa2, 0xb0, 0x06, 0xb0, 0x04, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x9b, 0x05, 0x2b, 0x1f, 
+-	0xdd, 0x02, 0x20, 0xaf, 0xb0, 0x06, 0xe7, 0xf5, 
+-	0x98, 0x07, 0x90, 0x01, 0x2f, 0x00, 0xd0, 0x47, 
+-	0xb0, 0x81, 0x98, 0x08, 0x22, 0x00, 0x92, 0x00, 
+-	0x22, 0x1b, 0x06, 0x92, 0x6a, 0x12, 0x23, 0x01, 
+-	0x05, 0x1b, 0x40, 0x1a, 0xd0, 0x01, 0x22, 0xff, 
+-	0x92, 0x00, 0x25, 0x00, 0x08, 0x62, 0x42, 0xaa, 
+-	0xd8, 0x02, 0xe0, 0x34, 0x35, 0x01, 0xe7, 0xf9, 
+-	0x9a, 0x00, 0x2a, 0x00, 0xd0, 0x1e, 0x88, 0x02, 
+-	0x23, 0xff, 0x02, 0x1b, 0x40, 0x1a, 0x12, 0x12, 
+-	0x88, 0x03, 0x02, 0x1b, 0x43, 0x1a, 0x04, 0x11, 
+-	0x0c, 0x09, 0x2f, 0x00, 0xda, 0x05, 0x42, 0x7a, 
+-	0x41, 0x11, 0x1c, 0x0b, 0x04, 0x19, 0x0c, 0x09, 
+-	0xe0, 0x03, 0x40, 0xb9, 0x1c, 0x0a, 0x04, 0x11, 
+-	0x0c, 0x09, 0x22, 0xff, 0x02, 0x12, 0x40, 0x0a, 
+-	0x12, 0x12, 0x02, 0x0b, 0x43, 0x13, 0x80, 0x03, 
+-	0x30, 0x02, 0xe0, 0x0f, 0x2f, 0x00, 0xda, 0x07, 
+-	0x88, 0x02, 0x42, 0x7e, 0x41, 0x32, 0x04, 0x12, 
+-	0x0c, 0x12, 0x80, 0x02, 0x30, 0x02, 0xe0, 0x05, 
+-	0x88, 0x02, 0x40, 0xba, 0x04, 0x12, 0x0c, 0x12, 
+-	0x80, 0x02, 0x30, 0x02, 0xe7, 0xca, 0xb0, 0x01, 
+-	0x49, 0x23, 0x91, 0x03, 0x20, 0x01, 0x06, 0x00, 
+-	0x99, 0x03, 0x60, 0x08, 0x48, 0x21, 0x6c, 0x80, 
+-	0x49, 0x20, 0x6c, 0xc9, 0x1a, 0x40, 0x90, 0x00, 
+-	0x98, 0x00, 0x28, 0x00, 0xdc, 0x09, 0x20, 0x33, 
+-	0x06, 0x40, 0x6e, 0x00, 0x21, 0x33, 0x06, 0x49, 
+-	0x6d, 0xc9, 0x1a, 0x40, 0x99, 0x00, 0x18, 0x40, 
+-	0x90, 0x00, 0x98, 0x00, 0x23, 0x3b, 0x01, 0xdb, 
+-	0x42, 0x98, 0xda, 0x02, 0x20, 0x06, 0xf0, 0x08, 
+-	0xfd, 0x8d, 0x98, 0x00, 0x23, 0x3b, 0x01, 0xdb, 
+-	0x42, 0x98, 0xdb, 0xdf, 0x98, 0x00, 0x42, 0x84, 
+-	0xd9, 0x02, 0x98, 0x00, 0x90, 0x02, 0xe0, 0x00, 
+-	0x94, 0x02, 0x22, 0x04, 0x99, 0x03, 0xb4, 0x06, 
+-	0x9b, 0x07, 0x9a, 0x04, 0x99, 0x06, 0x98, 0x03, 
+-	0xf0, 0x04, 0xfb, 0x8c, 0xb0, 0x02, 0x98, 0x02, 
+-	0x1a, 0x24, 0x98, 0x01, 0x99, 0x02, 0x18, 0x40, 
+-	0x90, 0x01, 0x20, 0x00, 0x90, 0x00, 0x2c, 0x00, 
+-	0xd1, 0xc4, 0x20, 0x00, 0xb0, 0x06, 0xe7, 0x65, 
+-	0xb0, 0x04, 0xb0, 0x02, 0xe7, 0x62, 0x00, 0x00, 
+-	0x9e, 0x00, 0x08, 0x00, 0x66, 0x00, 0x00, 0x80, 
+-	0x20, 0x1b, 0x06, 0x80, 0x6a, 0x00, 0x07, 0xc0, 
+-	0x0f, 0xc0, 0x4a, 0x03, 0x68, 0x12, 0x1c, 0x01, 
+-	0x43, 0x11, 0x1c, 0x08, 0x47, 0x70, 0xe7, 0xfd, 
+-	0x6c, 0x00, 0x08, 0x00, 0xb4, 0x90, 0x1c, 0x01, 
+-	0x20, 0x1b, 0x06, 0x80, 0x6a, 0x00, 0x1c, 0x04, 
+-	0x48, 0x1b, 0x68, 0x00, 0x1c, 0x07, 0x20, 0x30, 
+-	0x40, 0x20, 0xd0, 0x06, 0x28, 0x10, 0xd0, 0x06, 
+-	0x28, 0x20, 0xd0, 0x06, 0x28, 0x30, 0xd0, 0x06, 
+-	0xe0, 0x07, 0x22, 0x01, 0xe0, 0x08, 0x22, 0x02, 
+-	0xe0, 0x06, 0x22, 0x04, 0xe0, 0x04, 0x22, 0x08, 
+-	0xe0, 0x02, 0x20, 0x30, 0xbc, 0x90, 0x47, 0x70, 
+-	0x20, 0x03, 0x07, 0x40, 0x40, 0x38, 0x0f, 0x40, 
+-	0xd0, 0x04, 0x28, 0x01, 0xd0, 0x05, 0x28, 0x02, 
+-	0xd0, 0x06, 0xe0, 0x08, 0x23, 0x10, 0x43, 0x1a, 
+-	0xe0, 0x07, 0x23, 0x20, 0x43, 0x1a, 0xe0, 0x04, 
+-	0x23, 0x40, 0x43, 0x1a, 0xe0, 0x01, 0x20, 0x30, 
+-	0xe7, 0xe8, 0x20, 0x01, 0x05, 0xc0, 0x40, 0x38, 
+-	0xd1, 0x01, 0x23, 0x80, 0x43, 0x1a, 0x60, 0x0a, 
+-	0x20, 0x00, 0xe7, 0xdf, 0xe7, 0xde, 0x00, 0x00, 
+-	0x6c, 0x00, 0x08, 0x00, 0x1c, 0x01, 0x48, 0x01, 
+-	0x60, 0x01, 0x47, 0x70, 0x6c, 0x00, 0x00, 0x80, 
+-	0x1c, 0x01, 0x29, 0x1f, 0xdd, 0x01, 0x20, 0xaf, 
+-	0x47, 0x70, 0x20, 0x80, 0x6c, 0x00, 0x60, 0x01, 
+-	0x20, 0x00, 0xe7, 0xf9, 0xe7, 0xf8, 0xb5, 0xf3, 
+-	0x1c, 0x0a, 0xb0, 0x81, 0x98, 0x01, 0x06, 0x03, 
+-	0x0e, 0x1b, 0x93, 0x00, 0xb0, 0x81, 0x20, 0x1b, 
+-	0x06, 0x80, 0x6a, 0x00, 0x1c, 0x01, 0x25, 0x00, 
+-	0x20, 0x00, 0x90, 0x00, 0x20, 0x1b, 0x06, 0x80, 
+-	0x6c, 0x00, 0x1c, 0x04, 0x27, 0x00, 0x9b, 0x01, 
+-	0x2b, 0x20, 0xdb, 0x05, 0x20, 0xa2, 0xb0, 0x02, 
+-	0xb0, 0x02, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x20, 0x33, 0x06, 0x40, 0x6d, 0xc0, 0x23, 0x0d, 
+-	0x06, 0x9b, 0x1a, 0xc0, 0x9b, 0x01, 0x00, 0xdb, 
+-	0x4e, 0x5f, 0x68, 0x36, 0x19, 0x9b, 0x60, 0x58, 
+-	0x20, 0xff, 0x30, 0x01, 0x40, 0x08, 0xd0, 0x01, 
+-	0x20, 0xff, 0x90, 0x00, 0x23, 0x01, 0x04, 0xdb, 
+-	0x43, 0x99, 0x1c, 0x08, 0x21, 0x01, 0x04, 0x89, 
+-	0x43, 0x01, 0x20, 0x01, 0x03, 0x00, 0x40, 0x10, 
+-	0xd0, 0x05, 0x06, 0x90, 0x0e, 0x80, 0xd0, 0x02, 
+-	0x23, 0x01, 0x05, 0x1b, 0x43, 0x19, 0x23, 0x30, 
+-	0x43, 0xdb, 0x40, 0x19, 0x05, 0x10, 0x0d, 0x00, 
+-	0x28, 0x40, 0xd0, 0x48, 0xdc, 0x0e, 0x28, 0x08, 
+-	0xd0, 0x32, 0xdc, 0x06, 0x28, 0x01, 0xd0, 0x1e, 
+-	0x28, 0x02, 0xd0, 0x21, 0x28, 0x04, 0xd0, 0x26, 
+-	0xe0, 0x67, 0x28, 0x10, 0xd0, 0x2f, 0x28, 0x20, 
+-	0xd0, 0x32, 0xe0, 0x62, 0x23, 0x01, 0x02, 0x5b, 
+-	0x42, 0x98, 0xd0, 0x49, 0xdc, 0x06, 0x28, 0x80, 
+-	0xd0, 0x38, 0x23, 0xff, 0x33, 0x01, 0x42, 0x98, 
+-	0xd0, 0x3b, 0xe0, 0x56, 0x23, 0x01, 0x02, 0x9b, 
+-	0x42, 0x98, 0xd0, 0x44, 0x23, 0x01, 0x02, 0xdb, 
+-	0x42, 0x98, 0xd0, 0x47, 0xe0, 0x4d, 0x4b, 0x3d, 
+-	0x42, 0x9c, 0xd0, 0x00, 0x4f, 0x3b, 0xe0, 0x49, 
+-	0x23, 0x10, 0x43, 0x19, 0x4b, 0x39, 0x42, 0x9c, 
+-	0xd0, 0x00, 0x4f, 0x38, 0xe0, 0x42, 0x4b, 0x38, 
+-	0x42, 0x9c, 0xd0, 0x00, 0x4f, 0x36, 0xe0, 0x3d, 
+-	0x23, 0x10, 0x43, 0x19, 0x4b, 0x34, 0x42, 0x9c, 
+-	0xd0, 0x00, 0x4f, 0x33, 0xe0, 0x36, 0x4b, 0x33, 
+-	0x42, 0x9c, 0xd0, 0x00, 0x4f, 0x31, 0xe0, 0x31, 
+-	0x23, 0x10, 0x43, 0x19, 0x4b, 0x2f, 0x42, 0x9c, 
+-	0xd0, 0x00, 0x4f, 0x2e, 0xe0, 0x2a, 0x23, 0x20, 
+-	0x43, 0x19, 0x4b, 0x2d, 0x42, 0x9c, 0xd0, 0x00, 
+-	0x4f, 0x2b, 0xe0, 0x23, 0x23, 0x30, 0x43, 0x19, 
+-	0x4b, 0x29, 0x42, 0x9c, 0xd0, 0x00, 0x4f, 0x28, 
+-	0xe0, 0x1c, 0x23, 0x20, 0x43, 0x19, 0x4b, 0x27, 
+-	0x42, 0x9c, 0xd0, 0x00, 0x4f, 0x25, 0xe0, 0x15, 
+-	0x23, 0x30, 0x43, 0x19, 0x4b, 0x23, 0x42, 0x9c, 
+-	0xd0, 0x00, 0x4f, 0x22, 0xe0, 0x0e, 0x23, 0x20, 
+-	0x43, 0x19, 0x4b, 0x21, 0x42, 0x9c, 0xd0, 0x00, 
+-	0x4f, 0x1f, 0xe0, 0x07, 0x23, 0x30, 0x43, 0x19, 
+-	0x4b, 0x1d, 0x42, 0x9c, 0xd0, 0x00, 0x4f, 0x1c, 
+-	0xe0, 0x00, 0xe7, 0xff, 0x98, 0x00, 0x28, 0x00, 
+-	0xd0, 0x0a, 0x23, 0x01, 0x43, 0x19, 0x20, 0x1b, 
+-	0x06, 0x80, 0x62, 0x01, 0x48, 0x17, 0x68, 0x00, 
+-	0x4b, 0x17, 0x60, 0x18, 0x25, 0xff, 0xe0, 0x0e, 
+-	0x23, 0x01, 0x43, 0x19, 0x2f, 0x00, 0xd0, 0x07, 
+-	0x20, 0x1b, 0x06, 0x80, 0x62, 0x01, 0x20, 0x1b, 
+-	0x06, 0x80, 0x64, 0x07, 0x25, 0xff, 0xe0, 0x02, 
+-	0x20, 0x1b, 0x06, 0x80, 0x62, 0x01, 0x2d, 0x00, 
+-	0xd1, 0x04, 0x48, 0x0e, 0x68, 0x03, 0x08, 0x5b, 
+-	0x00, 0x5b, 0x60, 0x03, 0x20, 0x00, 0xb0, 0x02, 
+-	0xe7, 0x36, 0xb0, 0x01, 0xb0, 0x01, 0xe7, 0x33, 
+-	0x2e, 0x08, 0x5d, 0xd4, 0x00, 0x00, 0x82, 0x18, 
+-	0x00, 0x01, 0x42, 0x18, 0x00, 0x02, 0x42, 0x18, 
+-	0x00, 0x00, 0x98, 0x60, 0x00, 0x01, 0x58, 0x60, 
+-	0x00, 0x02, 0x54, 0x28, 0x2e, 0x08, 0x5e, 0x50, 
+-	0x6c, 0x00, 0x00, 0x80, 0x6c, 0x00, 0x00, 0x20, 
+-	0xb5, 0xf3, 0x1c, 0x0f, 0xb0, 0x82, 0x49, 0x2c, 
+-	0x46, 0x68, 0x22, 0x08, 0xf0, 0x09, 0xfd, 0xca, 
+-	0x20, 0x04, 0xf7, 0xff, 0xfc, 0x23, 0x48, 0x29, 
+-	0x68, 0x80, 0x21, 0x33, 0x06, 0x49, 0x65, 0xc8, 
+-	0x48, 0x26, 0x68, 0xc0, 0x21, 0x33, 0x06, 0x49, 
+-	0x66, 0x08, 0x48, 0x25, 0x68, 0x01, 0x23, 0x02, 
+-	0x43, 0x19, 0x60, 0x01, 0x20, 0x01, 0x21, 0x33, 
+-	0x06, 0x49, 0x67, 0xc8, 0x48, 0x21, 0x68, 0x01, 
+-	0x31, 0xff, 0x31, 0xff, 0x31, 0x02, 0x60, 0x01, 
+-	0x1c, 0x78, 0x12, 0x00, 0xab, 0x01, 0x70, 0x18, 
+-	0x1c, 0x78, 0xab, 0x01, 0x70, 0x58, 0x20, 0x33, 
+-	0x06, 0x40, 0x6d, 0xc5, 0x4b, 0x1a, 0x43, 0x1d, 
+-	0x26, 0x00, 0x2e, 0x10, 0xdb, 0x02, 0xe0, 0x18, 
+-	0x36, 0x01, 0xe7, 0xfa, 0x24, 0x00, 0x2c, 0x07, 
+-	0xd3, 0x02, 0xe0, 0x06, 0x34, 0x01, 0xe7, 0xfa, 
+-	0x46, 0x68, 0x5d, 0x01, 0x70, 0x29, 0x35, 0x01, 
+-	0xe7, 0xf8, 0x24, 0x00, 0x42, 0xbc, 0xdb, 0x02, 
+-	0xe0, 0x06, 0x34, 0x01, 0xe7, 0xfa, 0x98, 0x02, 
+-	0x5d, 0x01, 0x70, 0x29, 0x35, 0x01, 0xe7, 0xf8, 
+-	0xe7, 0xe6, 0x20, 0x33, 0x06, 0x40, 0x66, 0x05, 
+-	0x48, 0x0a, 0x68, 0x01, 0x23, 0x01, 0x05, 0x5b, 
+-	0x43, 0x19, 0x60, 0x01, 0xb0, 0x02, 0xb0, 0x02, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x03, 0x39, 0xfc, 0x2e, 0x08, 0x7c, 0x1c, 
+-	0x66, 0x00, 0x00, 0x70, 0x66, 0x00, 0x00, 0x5c, 
+-	0xcc, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x20, 
+-	0xb5, 0xf7, 0x1c, 0x04, 0x1c, 0x0f, 0x06, 0x20, 
+-	0x0e, 0x00, 0x06, 0x3d, 0x0e, 0x2d, 0x99, 0x02, 
+-	0x06, 0x0a, 0x0e, 0x12, 0x21, 0x02, 0x40, 0x01, 
+-	0xd0, 0x04, 0x21, 0xff, 0x4b, 0x2f, 0x68, 0x1b, 
+-	0x72, 0x19, 0xe0, 0x0c, 0x49, 0x2d, 0x68, 0x09, 
+-	0x7a, 0x09, 0x29, 0xff, 0xd1, 0x03, 0x21, 0x00, 
+-	0x4b, 0x2a, 0x68, 0x1b, 0x60, 0x19, 0x21, 0x00, 
+-	0x4b, 0x28, 0x68, 0x1b, 0x72, 0x19, 0x07, 0xc1, 
+-	0x0f, 0xc9, 0xd0, 0x04, 0x21, 0xff, 0x4b, 0x25, 
+-	0x68, 0x1b, 0x72, 0x59, 0xe0, 0x0c, 0x49, 0x23, 
+-	0x68, 0x09, 0x7a, 0x49, 0x29, 0xff, 0xd1, 0x03, 
+-	0x21, 0x00, 0x4b, 0x20, 0x68, 0x1b, 0x60, 0x59, 
+-	0x21, 0x00, 0x4b, 0x1e, 0x68, 0x1b, 0x72, 0x59, 
+-	0x2d, 0x01, 0xd1, 0x0f, 0x49, 0x1c, 0x68, 0x0e, 
+-	0x23, 0x01, 0x05, 0x5b, 0x43, 0x9e, 0x1c, 0x33, 
+-	0x60, 0x0b, 0x49, 0x1a, 0x68, 0x09, 0x78, 0x09, 
+-	0x23, 0x02, 0x43, 0x19, 0x4b, 0x17, 0x68, 0x1b, 
+-	0x70, 0x19, 0xe0, 0x0e, 0x49, 0x14, 0x68, 0x0e, 
+-	0x23, 0x01, 0x05, 0x5b, 0x43, 0x33, 0x60, 0x0b, 
+-	0x49, 0x12, 0x68, 0x09, 0x78, 0x09, 0x23, 0x02, 
+-	0x43, 0xdb, 0x40, 0x19, 0x4b, 0x0f, 0x68, 0x1b, 
+-	0x70, 0x19, 0x49, 0x0f, 0x62, 0x4a, 0x2a, 0x01, 
+-	0xd1, 0x08, 0x49, 0x0c, 0x68, 0x09, 0x78, 0x09, 
+-	0x23, 0x01, 0x43, 0x19, 0x4b, 0x09, 0x68, 0x1b, 
+-	0x70, 0x19, 0xe0, 0x07, 0x49, 0x07, 0x68, 0x09, 
+-	0x78, 0x09, 0x08, 0x49, 0x00, 0x49, 0x4b, 0x05, 
+-	0x68, 0x1b, 0x70, 0x19, 0xb0, 0x03, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x5e, 0x54, 
+-	0x6c, 0x00, 0x00, 0x20, 0x2e, 0x08, 0x5e, 0x58, 
+-	0xcc, 0x00, 0x0f, 0x80, 0xb4, 0x80, 0x1c, 0x07, 
+-	0x1c, 0x0a, 0x68, 0x38, 0x49, 0x23, 0x68, 0x09, 
+-	0x60, 0xc8, 0x68, 0x78, 0x49, 0x21, 0x68, 0x09, 
+-	0x61, 0x08, 0x68, 0xb8, 0x49, 0x1f, 0x68, 0x09, 
+-	0x61, 0x48, 0x68, 0xf8, 0x49, 0x1d, 0x68, 0x09, 
+-	0x61, 0x88, 0x7d, 0x38, 0x49, 0x1b, 0x68, 0x09, 
+-	0x31, 0x20, 0x70, 0x08, 0x7d, 0x78, 0x49, 0x19, 
+-	0x68, 0x09, 0x31, 0x20, 0x70, 0x48, 0x69, 0x38, 
+-	0x49, 0x16, 0x68, 0x09, 0x61, 0xc8, 0x7d, 0xb8, 
+-	0x49, 0x14, 0x68, 0x09, 0x31, 0x20, 0x70, 0x88, 
+-	0x68, 0x10, 0x49, 0x12, 0x68, 0x09, 0x62, 0x48, 
+-	0x68, 0x50, 0x49, 0x10, 0x68, 0x09, 0x62, 0x88, 
+-	0x68, 0x90, 0x49, 0x0e, 0x68, 0x09, 0x62, 0xc8, 
+-	0x68, 0xd0, 0x49, 0x0c, 0x68, 0x09, 0x63, 0x08, 
+-	0x7d, 0x10, 0x49, 0x0a, 0x68, 0x09, 0x31, 0x20, 
+-	0x76, 0x08, 0x7d, 0x50, 0x49, 0x07, 0x68, 0x09, 
+-	0x31, 0x20, 0x76, 0x48, 0x69, 0x10, 0x49, 0x05, 
+-	0x68, 0x09, 0x63, 0x48, 0x7d, 0x90, 0x49, 0x03, 
+-	0x68, 0x09, 0x31, 0x20, 0x76, 0x88, 0xbc, 0x80, 
+-	0x47, 0x70, 0x00, 0x00, 0x2e, 0x08, 0x5e, 0x54, 
+-	0x1c, 0x02, 0x1c, 0x0b, 0x48, 0x03, 0x68, 0x00, 
+-	0x60, 0x02, 0x48, 0x02, 0x68, 0x00, 0x60, 0x43, 
+-	0x47, 0x70, 0x00, 0x00, 0x2e, 0x08, 0x5e, 0x54, 
+-	0xb5, 0xf3, 0xb0, 0x88, 0x98, 0x08, 0x68, 0x04, 
+-	0x20, 0x01, 0x90, 0x06, 0x20, 0x01, 0x90, 0x05, 
+-	0x48, 0x8c, 0x68, 0x00, 0x28, 0x00, 0xd0, 0x19, 
+-	0x48, 0x8a, 0x68, 0x00, 0x38, 0x01, 0x49, 0x89, 
+-	0x60, 0x08, 0x48, 0x88, 0x68, 0x00, 0x28, 0x00, 
+-	0xd1, 0x10, 0x48, 0x87, 0x78, 0x80, 0x90, 0x00, 
+-	0x98, 0x00, 0x00, 0xc0, 0x49, 0x85, 0x68, 0x09, 
+-	0x58, 0x08, 0x23, 0xff, 0x33, 0x01, 0x43, 0x98, 
+-	0x1c, 0x01, 0x98, 0x00, 0x00, 0xc0, 0x4a, 0x81, 
+-	0x68, 0x12, 0x50, 0x11, 0x20, 0x33, 0x06, 0x40, 
+-	0x6e, 0x00, 0x23, 0x0d, 0x06, 0x9b, 0x1a, 0xc1, 
+-	0x91, 0x02, 0x20, 0x33, 0x06, 0x40, 0x6d, 0xc0, 
+-	0x23, 0x0d, 0x06, 0x9b, 0x1a, 0xc0, 0x90, 0x01, 
+-	0x48, 0x79, 0x68, 0x00, 0x42, 0x84, 0xd1, 0x73, 
+-	0x98, 0x01, 0x1d, 0xc7, 0x37, 0x01, 0x78, 0x38, 
+-	0x18, 0x38, 0x1c, 0x47, 0x48, 0x75, 0x6c, 0xc0, 
+-	0x23, 0x0d, 0x06, 0x9b, 0x1a, 0xc0, 0x42, 0xb8, 
+-	0xd9, 0x19, 0x78, 0x38, 0x28, 0xff, 0xd1, 0x12, 
+-	0x78, 0x78, 0x23, 0xf0, 0x40, 0x18, 0x28, 0xf0, 
+-	0xd1, 0x0d, 0x78, 0xb8, 0x10, 0x80, 0x07, 0x80, 
+-	0x0f, 0x80, 0x06, 0x00, 0x16, 0x00, 0x90, 0x06, 
+-	0x78, 0x78, 0x10, 0xc0, 0x07, 0xc0, 0x09, 0xc0, 
+-	0x16, 0x00, 0x90, 0x05, 0xe0, 0x03, 0x21, 0x01, 
+-	0x70, 0x39, 0x18, 0x7f, 0xe7, 0xde, 0x21, 0x40, 
+-	0x91, 0x03, 0x25, 0x20, 0x21, 0x14, 0x91, 0x07, 
+-	0x98, 0x06, 0x28, 0x00, 0xd1, 0x02, 0x25, 0x23, 
+-	0x21, 0x12, 0x91, 0x07, 0x98, 0x06, 0x28, 0x02, 
+-	0xd1, 0x02, 0x25, 0x30, 0x21, 0x18, 0x91, 0x07, 
+-	0x98, 0x05, 0x28, 0x00, 0xd1, 0x02, 0x00, 0x6d, 
+-	0x21, 0x70, 0x91, 0x03, 0x99, 0x03, 0x00, 0x48, 
+-	0x99, 0x02, 0x1a, 0x08, 0x90, 0x04, 0x98, 0x04, 
+-	0x99, 0x02, 0x42, 0x88, 0xd3, 0x05, 0xe0, 0x4e, 
+-	0x98, 0x04, 0x99, 0x03, 0x18, 0x40, 0x90, 0x04, 
+-	0xe7, 0xf5, 0x9f, 0x04, 0x21, 0x00, 0x70, 0x39, 
+-	0x37, 0x01, 0x21, 0x00, 0x70, 0x39, 0x37, 0x01, 
+-	0x21, 0x01, 0x70, 0x39, 0x18, 0x7f, 0x21, 0xc0, 
+-	0x70, 0x39, 0x37, 0x01, 0x21, 0x00, 0x70, 0x39, 
+-	0x37, 0x01, 0x21, 0x3a, 0x70, 0x39, 0x37, 0x01, 
+-	0x21, 0x80, 0x70, 0x39, 0x37, 0x01, 0x21, 0x00, 
+-	0x70, 0x39, 0x37, 0x01, 0x99, 0x03, 0x1f, 0xc8, 
+-	0x38, 0x02, 0x1b, 0x41, 0x70, 0x39, 0x37, 0x01, 
+-	0x26, 0x00, 0x99, 0x03, 0x1f, 0xc8, 0x38, 0x02, 
+-	0x1b, 0x40, 0x42, 0xb0, 0xdc, 0x04, 0xe0, 0x00, 
+-	0xe0, 0x34, 0xe0, 0x05, 0x36, 0x01, 0xe7, 0xf4, 
+-	0x21, 0xff, 0x70, 0x39, 0x37, 0x01, 0xe7, 0xf9, 
+-	0x21, 0xff, 0x70, 0x39, 0x37, 0x01, 0x98, 0x05, 
+-	0x00, 0xc0, 0x21, 0xf7, 0x43, 0x01, 0x70, 0x39, 
+-	0x37, 0x01, 0x99, 0x07, 0x70, 0x39, 0x37, 0x01, 
+-	0x21, 0xc0, 0x70, 0x39, 0x37, 0x01, 0x26, 0x00, 
+-	0x1f, 0x28, 0x42, 0xb0, 0xdc, 0x02, 0xe0, 0x05, 
+-	0x36, 0x01, 0xe7, 0xf9, 0x21, 0x00, 0x70, 0x39, 
+-	0x37, 0x01, 0xe7, 0xf9, 0xe7, 0xb0, 0x99, 0x03, 
+-	0x00, 0x48, 0x99, 0x02, 0x1a, 0x08, 0x23, 0x0d, 
+-	0x06, 0x9b, 0x18, 0xc0, 0x49, 0x29, 0x64, 0x88, 
+-	0x99, 0x09, 0x20, 0x78, 0x40, 0x08, 0x23, 0x02, 
+-	0x43, 0x18, 0xf7, 0xff, 0xfa, 0x17, 0x20, 0x01, 
+-	0xf7, 0xff, 0xfa, 0x14, 0x48, 0x22, 0x68, 0x00, 
+-	0x38, 0x02, 0x42, 0xa0, 0xd1, 0x09, 0x48, 0x22, 
+-	0x68, 0x01, 0x23, 0x01, 0x05, 0x5b, 0x43, 0x19, 
+-	0x60, 0x01, 0x20, 0xff, 0x49, 0x1f, 0x68, 0x09, 
+-	0x70, 0x08, 0x48, 0x1b, 0x68, 0x00, 0x38, 0x02, 
+-	0x42, 0xa0, 0xd3, 0x0f, 0x48, 0x1c, 0x68, 0x00, 
+-	0x28, 0x00, 0xd0, 0x05, 0x48, 0x1a, 0x68, 0x00, 
+-	0x23, 0x01, 0x06, 0x9b, 0x40, 0x18, 0xd0, 0x05, 
+-	0x20, 0x32, 0x49, 0x13, 0x60, 0x08, 0x48, 0x12, 
+-	0x68, 0x00, 0x1e, 0x84, 0x2c, 0x01, 0xd1, 0x02, 
+-	0x20, 0x02, 0xf7, 0xff, 0xf9, 0xeb, 0x2c, 0xff, 
+-	0xd1, 0x08, 0x20, 0x33, 0x06, 0x40, 0x6d, 0xc0, 
+-	0x30, 0xbc, 0x49, 0x0c, 0x6c, 0xc9, 0x42, 0x88, 
+-	0xd2, 0x00, 0x24, 0x18, 0x2c, 0x00, 0xd0, 0x02, 
+-	0x2c, 0xff, 0xd0, 0x00, 0x3c, 0x01, 0x98, 0x08, 
+-	0x60, 0x04, 0xb0, 0x08, 0xb0, 0x02, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x5e, 0x44, 
+-	0x2e, 0x08, 0x5e, 0x30, 0x2e, 0x08, 0x5d, 0xd0, 
+-	0x2e, 0x08, 0x1f, 0x18, 0x66, 0x00, 0x00, 0x80, 
+-	0x6c, 0x00, 0x00, 0x20, 0x2e, 0x08, 0x5e, 0x2c, 
+-	0x6c, 0x00, 0x08, 0x00, 0xb5, 0xff, 0x1c, 0x04, 
+-	0x1c, 0x0f, 0x9a, 0x02, 0x06, 0x15, 0x0e, 0x2d, 
+-	0x9b, 0x03, 0x06, 0x1e, 0x0e, 0x36, 0x2e, 0x20, 
+-	0xdb, 0x04, 0x20, 0xa2, 0xb0, 0x04, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2d, 0x1f, 0xdb, 0x01, 
+-	0x20, 0xaf, 0xe7, 0xf7, 0x20, 0x01, 0x03, 0x40, 
+-	0xf7, 0xff, 0xf9, 0xac, 0x20, 0x14, 0x49, 0x09, 
+-	0x60, 0x08, 0x20, 0xff, 0x60, 0x20, 0x1c, 0x33, 
+-	0x1c, 0x29, 0x1c, 0x38, 0x22, 0x02, 0xf7, 0xfc, 
+-	0xfa, 0x4b, 0x48, 0x05, 0x68, 0x01, 0x23, 0x01, 
+-	0x05, 0x5b, 0x43, 0x19, 0x60, 0x01, 0x20, 0x00, 
+-	0xe7, 0xe0, 0xe7, 0xdf, 0x2e, 0x08, 0x1f, 0x18, 
+-	0x6c, 0x00, 0x00, 0x20, 0xb4, 0x0f, 0xb5, 0xf0, 
+-	0x1c, 0x07, 0xb0, 0x82, 0x20, 0x00, 0x49, 0x16, 
+-	0x60, 0x08, 0x48, 0x16, 0x6f, 0x80, 0x23, 0x09, 
+-	0x01, 0x9b, 0x42, 0x98, 0xd1, 0x02, 0x20, 0xe1, 
+-	0x00, 0xc0, 0xe0, 0x00, 0x48, 0x12, 0x1c, 0x05, 
+-	0x68, 0x38, 0x28, 0xff, 0xd1, 0x17, 0x98, 0x0d, 
+-	0x90, 0x00, 0x98, 0x0c, 0x90, 0x01, 0x98, 0x01, 
+-	0x99, 0x00, 0x1a, 0x46, 0x08, 0x68, 0x19, 0x81, 
+-	0x1c, 0x28, 0xf0, 0x09, 0xfa, 0xeb, 0x1c, 0x04, 
+-	0x34, 0x01, 0x0f, 0xf0, 0x07, 0xc0, 0xd0, 0x00, 
+-	0x24, 0x04, 0x2c, 0x32, 0xd9, 0x00, 0x24, 0x04, 
+-	0x1d, 0xe0, 0x30, 0x0d, 0x60, 0x38, 0xb0, 0x02, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0xb0, 0x04, 0x47, 0x18, 
+-	0x2e, 0x08, 0x5e, 0x44, 0xcc, 0x00, 0x0f, 0x80, 
+-	0x00, 0x00, 0x05, 0xdd, 0xb5, 0xf3, 0x1c, 0x07, 
+-	0xb0, 0x81, 0x99, 0x02, 0x06, 0x09, 0x0e, 0x09, 
+-	0x91, 0x00, 0xb0, 0x82, 0x99, 0x02, 0x29, 0x20, 
+-	0xdb, 0x05, 0x20, 0xa2, 0xb0, 0x03, 0xb0, 0x02, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x99, 0x02, 
+-	0x00, 0x88, 0x49, 0x2f, 0x58, 0x08, 0x90, 0x01, 
+-	0x28, 0x00, 0xd1, 0x02, 0x20, 0xb0, 0xb0, 0x03, 
+-	0xe7, 0xf1, 0x20, 0x00, 0x70, 0x78, 0x78, 0xb8, 
+-	0x07, 0x00, 0x0f, 0x00, 0x90, 0x00, 0x98, 0x00, 
+-	0x28, 0x04, 0xd1, 0x1f, 0x6a, 0xfe, 0x24, 0x00, 
+-	0x2c, 0x08, 0xdb, 0x04, 0xe0, 0x18, 0x1c, 0x60, 
+-	0x06, 0x04, 0x0e, 0x24, 0xe7, 0xf8, 0x00, 0xa0, 
+-	0x19, 0x80, 0x68, 0x40, 0x00, 0xa1, 0x19, 0x89, 
+-	0x64, 0x48, 0x21, 0x00, 0x00, 0xa0, 0x19, 0x80, 
+-	0x62, 0x41, 0x00, 0xa0, 0x19, 0x80, 0x6c, 0x40, 
+-	0x28, 0x00, 0xd0, 0x04, 0x20, 0x80, 0x41, 0x20, 
+-	0x88, 0x31, 0x43, 0x08, 0x80, 0x30, 0xe7, 0xe6, 
+-	0x88, 0x30, 0x80, 0x70, 0x78, 0xb8, 0x23, 0x20, 
+-	0x40, 0x18, 0xd0, 0x1f, 0x6b, 0x3d, 0x20, 0x00, 
+-	0x60, 0x28, 0x20, 0x00, 0x60, 0x68, 0x20, 0x00, 
+-	0x60, 0xa8, 0x24, 0x00, 0x2c, 0x08, 0xdb, 0x04, 
+-	0xe0, 0x0c, 0x1c, 0x60, 0x06, 0x04, 0x0e, 0x24, 
+-	0xe7, 0xf8, 0x20, 0x00, 0x00, 0xa1, 0x19, 0x49, 
+-	0x60, 0xc8, 0x20, 0x00, 0x00, 0xa1, 0x19, 0x49, 
+-	0x63, 0x88, 0xe7, 0xf2, 0x20, 0x00, 0x62, 0xe8, 
+-	0x20, 0x00, 0x63, 0x28, 0x20, 0x00, 0x63, 0x68, 
+-	0x20, 0x00, 0x65, 0xa8, 0x99, 0x02, 0x1c, 0x38, 
+-	0xf0, 0x00, 0xf8, 0x3e, 0xb0, 0x03, 0xe7, 0x9e, 
+-	0xb0, 0x02, 0xb0, 0x01, 0xe7, 0x9b, 0x00, 0x00, 
+-	0x2e, 0x08, 0x5e, 0x5c, 0xb5, 0xf3, 0x1c, 0x07, 
+-	0x99, 0x01, 0x06, 0x0c, 0x0e, 0x24, 0xb0, 0x82, 
+-	0x2c, 0x20, 0xdb, 0x05, 0x20, 0xa2, 0xb0, 0x02, 
+-	0xb0, 0x02, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x00, 0xa0, 0x49, 0x12, 0x58, 0x08, 0x1c, 0x05, 
+-	0xd1, 0x02, 0x20, 0xb0, 0xb0, 0x02, 0xe7, 0xf3, 
+-	0x1c, 0x21, 0x1c, 0x38, 0xf0, 0x00, 0xf9, 0x84, 
+-	0x1c, 0x06, 0xd0, 0x02, 0x1c, 0x30, 0xb0, 0x02, 
+-	0xe7, 0xea, 0x78, 0x68, 0x21, 0x20, 0x40, 0x01, 
+-	0x91, 0x00, 0x99, 0x00, 0x1c, 0x38, 0xf0, 0x00, 
+-	0xff, 0x3f, 0x68, 0xe9, 0x91, 0x01, 0x29, 0x00, 
+-	0xd0, 0x03, 0x99, 0x01, 0x1c, 0x38, 0xf0, 0x03, 
+-	0xfe, 0x7a, 0x20, 0x00, 0xb0, 0x02, 0xe7, 0xd7, 
+-	0xb0, 0x02, 0xe7, 0xd5, 0x2e, 0x08, 0x5e, 0x5c, 
+-	0xb5, 0xf3, 0x1c, 0x02, 0x99, 0x01, 0x06, 0x0f, 
+-	0x0e, 0x3f, 0xb0, 0x86, 0x00, 0xb8, 0x4b, 0xa1, 
+-	0x68, 0x1b, 0x18, 0xc0, 0x90, 0x00, 0x2f, 0x20, 
+-	0xdb, 0x05, 0x20, 0xa2, 0xb0, 0x06, 0xb0, 0x02, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0xb8, 
+-	0x4b, 0x9b, 0x58, 0x18, 0x90, 0x05, 0x28, 0x00, 
+-	0xd1, 0x02, 0x20, 0xb0, 0xb0, 0x06, 0xe7, 0xf2, 
+-	0x78, 0x90, 0x90, 0x01, 0x71, 0xd7, 0x78, 0xd1, 
+-	0x98, 0x01, 0x23, 0x80, 0x40, 0x18, 0xd1, 0x73, 
+-	0x29, 0x20, 0xdd, 0x02, 0x20, 0xb1, 0xb0, 0x06, 
+-	0xe7, 0xe5, 0x48, 0x92, 0x68, 0x00, 0x23, 0x01, 
+-	0x42, 0xd8, 0xd1, 0x02, 0x20, 0xb2, 0xb0, 0x06, 
+-	0xe7, 0xdd, 0x20, 0x01, 0x40, 0x88, 0x4b, 0x8d, 
+-	0x68, 0x1b, 0x40, 0x18, 0xd0, 0x02, 0x20, 0xb1, 
+-	0xb0, 0x06, 0xe7, 0xd4, 0x00, 0x88, 0x4b, 0x8a, 
+-	0x50, 0x1a, 0x48, 0x8a, 0x54, 0x47, 0x01, 0x08, 
+-	0x4b, 0x89, 0x18, 0xc5, 0x7f, 0x10, 0x06, 0x00, 
+-	0x7f, 0x53, 0x04, 0x1b, 0x43, 0x18, 0x7f, 0x93, 
+-	0x02, 0x1b, 0x43, 0x18, 0x7f, 0xd3, 0x43, 0x03, 
+-	0xc5, 0x08, 0x1d, 0xd0, 0x30, 0x19, 0x78, 0x00, 
+-	0x06, 0x00, 0x1d, 0xd3, 0x33, 0x19, 0x78, 0x5b, 
+-	0x04, 0x1b, 0x43, 0x18, 0x1d, 0xd3, 0x33, 0x19, 
+-	0x78, 0x9b, 0x02, 0x1b, 0x43, 0x18, 0x1d, 0xd3, 
+-	0x33, 0x19, 0x78, 0xdb, 0x43, 0x03, 0xc5, 0x08, 
+-	0x01, 0x08, 0x4b, 0x7a, 0x18, 0xc4, 0x7b, 0x10, 
+-	0x06, 0x00, 0x7b, 0x53, 0x04, 0x1b, 0x43, 0x18, 
+-	0x7b, 0x93, 0x02, 0x1b, 0x43, 0x18, 0x7b, 0xd3, 
+-	0x43, 0x03, 0xc4, 0x08, 0x7c, 0x10, 0x06, 0x00, 
+-	0x7c, 0x53, 0x04, 0x1b, 0x43, 0x18, 0x7c, 0x93, 
+-	0x02, 0x1b, 0x43, 0x18, 0x7c, 0xd3, 0x43, 0x03, 
+-	0xc4, 0x08, 0x98, 0x01, 0x07, 0xc0, 0x0f, 0xc0, 
+-	0xd0, 0x20, 0x1d, 0xd0, 0x30, 0x19, 0x79, 0x00, 
+-	0x06, 0x00, 0x1d, 0xd3, 0x33, 0x19, 0x79, 0x5b, 
+-	0x04, 0x1b, 0x43, 0x18, 0x1d, 0xd3, 0x33, 0x19, 
+-	0x79, 0x9b, 0x02, 0x1b, 0x43, 0x18, 0x1d, 0xd3, 
+-	0x33, 0x19, 0x79, 0xdb, 0x43, 0x03, 0xc5, 0x08, 
+-	0x7d, 0x10, 0x06, 0x00, 0x7d, 0x53, 0x04, 0x1b, 
+-	0x43, 0x18, 0x7d, 0x93, 0x02, 0x1b, 0xe0, 0x00, 
+-	0xe0, 0x42, 0x43, 0x18, 0x7d, 0xd3, 0x43, 0x03, 
+-	0xc4, 0x08, 0xe0, 0x03, 0x23, 0x00, 0xc5, 0x08, 
+-	0x23, 0x00, 0xc4, 0x08, 0x23, 0xff, 0xc5, 0x08, 
+-	0x20, 0x19, 0x06, 0x80, 0x6b, 0x00, 0x23, 0x08, 
+-	0x40, 0x18, 0xd0, 0x06, 0x88, 0x90, 0x04, 0x00, 
+-	0x19, 0xc3, 0x93, 0x02, 0x9b, 0x02, 0xc4, 0x08, 
+-	0xe0, 0x00, 0xc4, 0x80, 0x98, 0x01, 0x23, 0x08, 
+-	0x40, 0x18, 0xd0, 0x17, 0x48, 0x50, 0x5d, 0xc0, 
+-	0x30, 0x01, 0x4b, 0x4f, 0x55, 0xd8, 0x7a, 0x10, 
+-	0x07, 0xc0, 0x0f, 0xc0, 0xd0, 0x04, 0x20, 0x01, 
+-	0x40, 0x88, 0x23, 0x19, 0x06, 0x9b, 0x61, 0x18, 
+-	0x7a, 0x10, 0x23, 0x02, 0x40, 0x18, 0xd0, 0x04, 
+-	0x20, 0x01, 0x40, 0x88, 0x23, 0x19, 0x06, 0x9b, 
+-	0x61, 0x58, 0xe0, 0x05, 0x4e, 0x45, 0x20, 0x01, 
+-	0x40, 0x88, 0x68, 0x33, 0x43, 0x18, 0x60, 0x30, 
+-	0x20, 0x01, 0x40, 0x88, 0x4b, 0x3b, 0x68, 0x1b, 
+-	0x43, 0x18, 0x4b, 0x3a, 0x60, 0x18, 0xe0, 0x4f, 
+-	0x98, 0x01, 0x23, 0x80, 0x40, 0x18, 0xd0, 0x48, 
+-	0x48, 0x3d, 0x88, 0x00, 0x4b, 0x3d, 0x42, 0x98, 
+-	0xd1, 0x02, 0x20, 0xb2, 0xb0, 0x06, 0xe7, 0x26, 
+-	0x00, 0x88, 0x4b, 0x3b, 0x58, 0x18, 0x28, 0x00, 
+-	0xd0, 0x02, 0x20, 0xb1, 0xb0, 0x06, 0xe7, 0x1e, 
+-	0x29, 0x10, 0xdb, 0x02, 0x20, 0xb1, 0xb0, 0x06, 
+-	0xe7, 0x19, 0x20, 0x01, 0x40, 0x88, 0x4b, 0x32, 
+-	0x88, 0x1b, 0x40, 0x18, 0xd0, 0x02, 0x20, 0xb1, 
+-	0xb0, 0x06, 0xe7, 0x10, 0x98, 0x05, 0x78, 0x80, 
+-	0x28, 0x02, 0xdb, 0x02, 0x20, 0xb1, 0xb0, 0x06, 
+-	0xe7, 0x09, 0x00, 0x88, 0x4b, 0x2c, 0x50, 0x1a, 
+-	0x48, 0x2c, 0x54, 0x47, 0x00, 0xf8, 0x1b, 0xc0, 
+-	0x00, 0x80, 0x4b, 0x2b, 0x68, 0x1b, 0x18, 0xc0, 
+-	0x90, 0x04, 0x98, 0x04, 0x7e, 0x00, 0x28, 0xff, 
+-	0xd1, 0x02, 0x98, 0x04, 0x76, 0x01, 0xe0, 0x01, 
+-	0x98, 0x04, 0x76, 0x41, 0x4e, 0x25, 0x96, 0x03, 
+-	0x1d, 0xd3, 0x33, 0x05, 0x00, 0x88, 0x9e, 0x03, 
+-	0x50, 0x33, 0x20, 0x01, 0x40, 0x88, 0x4b, 0x1c, 
+-	0x88, 0x1b, 0x43, 0x18, 0x4b, 0x1a, 0x80, 0x18, 
+-	0xe0, 0x02, 0x20, 0xb1, 0xb0, 0x06, 0xe6, 0xe2, 
+-	0x78, 0x50, 0x23, 0x80, 0x43, 0xdb, 0x40, 0x18, 
+-	0x70, 0x50, 0x98, 0x05, 0x78, 0x80, 0x28, 0x00, 
+-	0xd1, 0x09, 0x98, 0x00, 0x68, 0x00, 0x23, 0x01, 
+-	0x03, 0x5b, 0x43, 0x18, 0x9b, 0x00, 0x60, 0x18, 
+-	0x20, 0x02, 0x9b, 0x05, 0x70, 0xd8, 0x98, 0x05, 
+-	0x78, 0x80, 0x30, 0x01, 0x9b, 0x05, 0x70, 0x98, 
+-	0x20, 0x00, 0xb0, 0x06, 0xe6, 0xc7, 0xb0, 0x06, 
+-	0xe6, 0xc5, 0x00, 0x00, 0x2e, 0x08, 0x5d, 0xcc, 
+-	0x2e, 0x08, 0x5e, 0x5c, 0x2e, 0x08, 0x5e, 0xdc, 
+-	0x2e, 0x08, 0x5e, 0xe4, 0x2e, 0x08, 0x5f, 0xa4, 
+-	0x64, 0x00, 0x10, 0x00, 0x64, 0x00, 0x08, 0x00, 
+-	0x2e, 0x08, 0x7b, 0xf4, 0x64, 0x00, 0x00, 0x18, 
+-	0x2e, 0x08, 0x5e, 0xe0, 0x00, 0x00, 0xff, 0xff, 
+-	0x2e, 0x08, 0x5f, 0x64, 0x2e, 0x08, 0x5f, 0xc4, 
+-	0x2e, 0x08, 0x5d, 0xc4, 0x9e, 0x00, 0x04, 0xb8, 
+-	0xb5, 0xf3, 0x1c, 0x02, 0x99, 0x01, 0x06, 0x0f, 
+-	0x0e, 0x3f, 0xb0, 0x86, 0x00, 0xb8, 0x4b, 0x65, 
+-	0x68, 0x1b, 0x18, 0xc0, 0x90, 0x01, 0x2f, 0x20, 
+-	0xdb, 0x05, 0x20, 0xa2, 0xb0, 0x06, 0xb0, 0x02, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0xb8, 
+-	0x4b, 0x5f, 0x58, 0x18, 0x1c, 0x05, 0xd1, 0x02, 
+-	0x20, 0xb0, 0xb0, 0x06, 0xe7, 0xf3, 0x78, 0x90, 
+-	0x90, 0x03, 0x78, 0xd1, 0x00, 0x88, 0x4b, 0x5b, 
+-	0x58, 0x18, 0x42, 0x90, 0xd0, 0x02, 0x20, 0xb1, 
+-	0xb0, 0x06, 0xe7, 0xe8, 0x98, 0x03, 0x23, 0x80, 
+-	0x40, 0x18, 0xd1, 0x49, 0x01, 0x08, 0x4b, 0x56, 
+-	0x18, 0xc3, 0x93, 0x00, 0x20, 0x00, 0x9b, 0x00, 
+-	0x60, 0x18, 0x23, 0x00, 0x00, 0x88, 0x4e, 0x51, 
+-	0x50, 0x33, 0x23, 0xff, 0x48, 0x51, 0x54, 0x43, 
+-	0x20, 0x01, 0x40, 0x88, 0x43, 0xc0, 0x4b, 0x50, 
+-	0x68, 0x1b, 0x40, 0x18, 0x4b, 0x4e, 0x60, 0x18, 
+-	0x98, 0x03, 0x23, 0x08, 0x40, 0x18, 0xd0, 0x27, 
+-	0x20, 0x01, 0x40, 0x88, 0x90, 0x04, 0x7a, 0x10, 
+-	0x07, 0xc0, 0x0f, 0xc0, 0xd0, 0x0b, 0x98, 0x04, 
+-	0x23, 0x19, 0x06, 0x9b, 0x69, 0x1b, 0x40, 0x18, 
+-	0xd0, 0x04, 0x98, 0x04, 0x23, 0x19, 0x06, 0x9b, 
+-	0x61, 0x18, 0xe7, 0xf4, 0xe0, 0x0e, 0x7a, 0x10, 
+-	0x23, 0x02, 0x40, 0x18, 0xd0, 0x0a, 0x98, 0x04, 
+-	0x23, 0x19, 0x06, 0x9b, 0x69, 0x5b, 0x40, 0x18, 
+-	0xd0, 0x04, 0x98, 0x04, 0x23, 0x19, 0x06, 0x9b, 
+-	0x61, 0x58, 0xe7, 0xf4, 0x48, 0x3b, 0x5d, 0xc0, 
+-	0x38, 0x01, 0x4b, 0x3a, 0x55, 0xd8, 0xe0, 0x06, 
+-	0x4e, 0x39, 0x20, 0x01, 0x40, 0x88, 0x43, 0xc0, 
+-	0x68, 0x33, 0x40, 0x18, 0x60, 0x30, 0xe0, 0x36, 
+-	0x98, 0x03, 0x23, 0x80, 0x40, 0x18, 0xd0, 0x2f, 
+-	0x00, 0xf8, 0x1b, 0xc0, 0x00, 0x80, 0x4b, 0x33, 
+-	0x68, 0x1b, 0x18, 0xc3, 0x93, 0x02, 0x9b, 0x02, 
+-	0x7e, 0x18, 0x42, 0x88, 0xd1, 0x03, 0x20, 0xff, 
+-	0x9b, 0x02, 0x76, 0x18, 0xe0, 0x0a, 0x9b, 0x02, 
+-	0x7e, 0x58, 0x42, 0x88, 0xd1, 0x03, 0x20, 0xff, 
+-	0x9b, 0x02, 0x76, 0x58, 0xe0, 0x02, 0x20, 0xb1, 
+-	0xb0, 0x06, 0xe7, 0x7c, 0x23, 0x00, 0x00, 0x88, 
+-	0x4e, 0x27, 0x50, 0x33, 0x20, 0xff, 0x4b, 0x27, 
+-	0x54, 0x58, 0x20, 0x01, 0x40, 0x88, 0x43, 0xc0, 
+-	0x4b, 0x25, 0x88, 0x1b, 0x40, 0x18, 0x4b, 0x24, 
+-	0x80, 0x18, 0x4e, 0x24, 0x96, 0x05, 0x23, 0x00, 
+-	0x00, 0x88, 0x9e, 0x05, 0x50, 0x33, 0xe0, 0x02, 
+-	0x20, 0xb1, 0xb0, 0x06, 0xe7, 0x63, 0x78, 0xa8, 
+-	0x38, 0x01, 0x70, 0xa8, 0x78, 0x50, 0x23, 0x80, 
+-	0x43, 0x18, 0x70, 0x50, 0x78, 0xa8, 0x28, 0x00, 
+-	0xd1, 0x07, 0x98, 0x01, 0x68, 0x00, 0x4b, 0x1a, 
+-	0x40, 0x18, 0x9b, 0x01, 0x60, 0x18, 0x20, 0x01, 
+-	0x70, 0xe8, 0x24, 0x1f, 0x2c, 0x00, 0xd1, 0x02, 
+-	0xe0, 0x0a, 0x3c, 0x01, 0xe7, 0xfa, 0x48, 0x0d, 
+-	0x5d, 0x00, 0x28, 0x00, 0xd1, 0x03, 0x20, 0x19, 
+-	0x06, 0x80, 0x64, 0xc4, 0xe0, 0x00, 0xe7, 0xf4, 
+-	0x20, 0x00, 0xb0, 0x06, 0xe7, 0x3f, 0xb0, 0x06, 
+-	0xe7, 0x3d, 0x00, 0x00, 0x2e, 0x08, 0x5d, 0xcc, 
+-	0x2e, 0x08, 0x5e, 0x5c, 0x2e, 0x08, 0x5e, 0xe4, 
+-	0x64, 0x00, 0x08, 0x08, 0x2e, 0x08, 0x5f, 0xa4, 
+-	0x2e, 0x08, 0x5e, 0xdc, 0x2e, 0x08, 0x7b, 0xf4, 
+-	0x64, 0x00, 0x00, 0x18, 0x2e, 0x08, 0x5d, 0xc4, 
+-	0x2e, 0x08, 0x5f, 0x64, 0x2e, 0x08, 0x5f, 0xc4, 
+-	0x2e, 0x08, 0x5e, 0xe0, 0x9e, 0x00, 0x04, 0xb8, 
+-	0xff, 0xff, 0xdf, 0xff, 0x1c, 0x03, 0x1c, 0x0a, 
+-	0x78, 0x58, 0x70, 0x10, 0x20, 0x00, 0x47, 0x70, 
+-	0xe7, 0xfd, 0xb5, 0xf7, 0x1c, 0x07, 0xb0, 0x81, 
+-	0x9a, 0x03, 0x06, 0x10, 0x0e, 0x00, 0x90, 0x00, 
+-	0xb0, 0x87, 0x78, 0x78, 0x23, 0x80, 0x40, 0x18, 
+-	0xd0, 0x4c, 0x78, 0x78, 0x23, 0x80, 0x40, 0x18, 
+-	0xd0, 0x48, 0x78, 0xb8, 0x90, 0x06, 0x99, 0x09, 
+-	0x78, 0x88, 0x90, 0x05, 0x98, 0x06, 0x23, 0x20, 
+-	0x40, 0x18, 0xd0, 0x3f, 0x98, 0x05, 0x23, 0x20, 
+-	0x40, 0x18, 0xd0, 0x3b, 0x6b, 0x38, 0x90, 0x01, 
+-	0x99, 0x09, 0x6b, 0x08, 0x90, 0x00, 0x98, 0x01, 
+-	0x28, 0x00, 0xd1, 0x02, 0x98, 0x00, 0x28, 0x00, 
+-	0xd0, 0x01, 0x20, 0x01, 0xe0, 0x00, 0x20, 0x00, 
+-	0x28, 0x00, 0xd1, 0x05, 0x20, 0xb6, 0xb0, 0x08, 
+-	0xb0, 0x03, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x98, 0x01, 0x68, 0x05, 0x98, 0x00, 0x68, 0x04, 
+-	0x7a, 0x2e, 0x7a, 0x21, 0x91, 0x04, 0x7d, 0x6a, 
+-	0x92, 0x03, 0x7d, 0x62, 0x92, 0x02, 0x98, 0x07, 
+-	0x28, 0x00, 0xd0, 0x0a, 0x9a, 0x02, 0x99, 0x04, 
+-	0x1c, 0x28, 0xf0, 0x00, 0xfc, 0xe5, 0x9a, 0x03, 
+-	0x1c, 0x31, 0x1c, 0x20, 0xf0, 0x00, 0xfc, 0xe0, 
+-	0xe0, 0x09, 0x99, 0x04, 0x1c, 0x28, 0x22, 0x00, 
+-	0xf0, 0x00, 0xfc, 0xda, 0x1c, 0x31, 0x1c, 0x20, 
+-	0x22, 0x00, 0xf0, 0x00, 0xfc, 0xd5, 0x20, 0x00, 
+-	0xb0, 0x08, 0xe7, 0xd5, 0x20, 0xb1, 0xb0, 0x08, 
+-	0xe7, 0xd2, 0xb0, 0x07, 0xb0, 0x01, 0xe7, 0xcf, 
+-	0xb4, 0xf0, 0x1c, 0x02, 0x1c, 0x0b, 0x06, 0x1d, 
+-	0x0e, 0x2d, 0xb0, 0x82, 0x2d, 0x00, 0xd1, 0x0a, 
+-	0x48, 0x1a, 0x69, 0x00, 0x90, 0x01, 0x49, 0x1a, 
+-	0x48, 0x18, 0x69, 0x40, 0x90, 0x00, 0x48, 0x17, 
+-	0x6a, 0x00, 0x1e, 0x44, 0xe0, 0x10, 0x2d, 0x20, 
+-	0xd1, 0x0a, 0x48, 0x14, 0x69, 0x80, 0x90, 0x01, 
+-	0x49, 0x14, 0x48, 0x12, 0x69, 0xc0, 0x90, 0x00, 
+-	0x48, 0x10, 0x6a, 0x40, 0x1e, 0x44, 0xe0, 0x03, 
+-	0x20, 0xb3, 0xb0, 0x02, 0xbc, 0xf0, 0x47, 0x70, 
+-	0x20, 0x00, 0x70, 0x10, 0x78, 0x50, 0x00, 0x80, 
+-	0x4e, 0x0d, 0x58, 0x37, 0x69, 0x38, 0x61, 0x78, 
+-	0x98, 0x01, 0x9e, 0x00, 0x42, 0xb0, 0xd0, 0x07, 
+-	0x98, 0x01, 0x30, 0x01, 0x90, 0x01, 0x98, 0x01, 
+-	0x40, 0x20, 0x90, 0x01, 0x98, 0x01, 0x60, 0x08, 
+-	0x20, 0x00, 0xb0, 0x02, 0xe7, 0xe6, 0xb0, 0x02, 
+-	0xe7, 0xe4, 0x00, 0x00, 0x9e, 0x00, 0x04, 0x80, 
+-	0x9e, 0x00, 0x04, 0x90, 0x9e, 0x00, 0x04, 0x98, 
+-	0x2e, 0x08, 0x5e, 0x5c, 0xb5, 0xf3, 0x1c, 0x07, 
+-	0xb0, 0x81, 0x99, 0x02, 0x06, 0x08, 0x0e, 0x00, 
+-	0x90, 0x00, 0xb0, 0x88, 0x98, 0x08, 0x28, 0x00, 
+-	0xd1, 0x0e, 0x49, 0x69, 0x91, 0x02, 0x48, 0x69, 
+-	0x69, 0x00, 0x90, 0x07, 0x48, 0x68, 0x90, 0x06, 
+-	0x48, 0x66, 0x69, 0x40, 0x90, 0x05, 0x48, 0x65, 
+-	0x6a, 0x00, 0x1e, 0x41, 0x91, 0x04, 0xe0, 0x17, 
+-	0x98, 0x08, 0x28, 0x20, 0xd1, 0x0e, 0x49, 0x63, 
+-	0x91, 0x02, 0x48, 0x60, 0x69, 0x80, 0x90, 0x07, 
+-	0x48, 0x61, 0x90, 0x06, 0x48, 0x5d, 0x69, 0xc0, 
+-	0x90, 0x05, 0x48, 0x5c, 0x6a, 0x40, 0x1e, 0x41, 
+-	0x91, 0x04, 0xe0, 0x05, 0x20, 0xb3, 0xb0, 0x09, 
+-	0xb0, 0x02, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x25, 0x00, 0x98, 0x07, 0x99, 0x05, 0x42, 0x88, 
+-	0xd0, 0x73, 0x2d, 0x00, 0xd1, 0x72, 0x98, 0x07, 
+-	0x00, 0x80, 0x99, 0x02, 0x18, 0x40, 0x23, 0x01, 
+-	0x02, 0x9b, 0x18, 0xc0, 0x68, 0x01, 0x91, 0x03, 
+-	0x98, 0x07, 0x00, 0x80, 0x99, 0x02, 0x58, 0x08, 
+-	0x90, 0x01, 0x99, 0x02, 0x98, 0x07, 0x18, 0x08, 
+-	0x23, 0x01, 0x02, 0xdb, 0x18, 0xc0, 0x78, 0x00, 
+-	0x90, 0x00, 0x20, 0x00, 0x99, 0x02, 0x9a, 0x07, 
+-	0x18, 0x89, 0x23, 0x01, 0x02, 0xdb, 0x18, 0xc9, 
+-	0x70, 0x08, 0x98, 0x07, 0x30, 0x01, 0x90, 0x07, 
+-	0x98, 0x07, 0x99, 0x04, 0x40, 0x08, 0x90, 0x07, 
+-	0x99, 0x03, 0x29, 0x00, 0xd0, 0x71, 0xb0, 0x83, 
+-	0x20, 0x00, 0x90, 0x00, 0x99, 0x06, 0x91, 0x02, 
+-	0x20, 0x01, 0x90, 0x01, 0x98, 0x03, 0x28, 0x80, 
+-	0xd1, 0x1f, 0x24, 0x00, 0x2c, 0x10, 0xd3, 0x02, 
+-	0xe0, 0x1a, 0x34, 0x01, 0xe7, 0xfa, 0x98, 0x01, 
+-	0x99, 0x02, 0x40, 0x08, 0xd0, 0x10, 0x48, 0x39, 
+-	0x5d, 0x00, 0x28, 0xff, 0xd0, 0x0c, 0x48, 0x37, 
+-	0x5d, 0x00, 0x90, 0x00, 0x00, 0xa0, 0x49, 0x36, 
+-	0x58, 0x09, 0x00, 0xa8, 0x19, 0xc0, 0x61, 0x01, 
+-	0x1c, 0x68, 0x06, 0x05, 0x0e, 0x2d, 0xe0, 0x03, 
+-	0x98, 0x01, 0x00, 0x40, 0x90, 0x01, 0xe7, 0xe4, 
+-	0xe0, 0x1d, 0x24, 0x00, 0x2c, 0x20, 0xd3, 0x02, 
+-	0xe0, 0x19, 0x34, 0x01, 0xe7, 0xfa, 0x98, 0x01, 
+-	0x99, 0x02, 0x40, 0x08, 0xd0, 0x0f, 0x48, 0x2b, 
+-	0x5d, 0x00, 0x28, 0xff, 0xd0, 0x0b, 0x48, 0x29, 
+-	0x5d, 0x00, 0x90, 0x00, 0x00, 0xa0, 0x49, 0x28, 
+-	0x58, 0x09, 0x00, 0xa8, 0x19, 0xc0, 0x61, 0x01, 
+-	0x1c, 0x68, 0x06, 0x05, 0x0e, 0x2d, 0x98, 0x01, 
+-	0x00, 0x40, 0x90, 0x01, 0xe7, 0xe5, 0x2d, 0x00, 
+-	0xe0, 0x01, 0xe0, 0x27, 0xe0, 0x26, 0xd0, 0x23, 
+-	0xb0, 0x81, 0x98, 0x01, 0x70, 0x78, 0x98, 0x05, 
+-	0x60, 0x78, 0x98, 0x01, 0x00, 0x80, 0x49, 0x1d, 
+-	0x58, 0x08, 0x90, 0x00, 0x98, 0x00, 0x69, 0x46, 
+-	0x98, 0x05, 0x42, 0xb0, 0xd3, 0x04, 0x1d, 0xf0, 
+-	0x30, 0xb9, 0x99, 0x05, 0x42, 0x88, 0xd2, 0x08, 
+-	0x68, 0x30, 0x28, 0x00, 0xd0, 0x01, 0x68, 0x36, 
+-	0xe0, 0x02, 0x20, 0xba, 0xb0, 0x0d, 0xe7, 0x63, 
+-	0xe7, 0xee, 0x60, 0xbe, 0x98, 0x00, 0x61, 0x46, 
+-	0x1c, 0x38, 0xf0, 0x00, 0xfb, 0x02, 0xb0, 0x01, 
+-	0xb0, 0x03, 0xe7, 0x5e, 0x70, 0x3d, 0x98, 0x07, 
+-	0x99, 0x06, 0x60, 0x08, 0x20, 0x00, 0xb0, 0x09, 
+-	0xe7, 0x52, 0xb0, 0x08, 0xb0, 0x01, 0xe7, 0x4f, 
+-	0x2e, 0x08, 0x60, 0x90, 0x9e, 0x00, 0x04, 0x80, 
+-	0x9e, 0x00, 0x04, 0x90, 0x2e, 0x08, 0x69, 0x90, 
+-	0x9e, 0x00, 0x04, 0x98, 0x2e, 0x08, 0x5f, 0xc4, 
+-	0x2e, 0x08, 0x5f, 0x64, 0x2e, 0x08, 0x5f, 0xa4, 
+-	0x2e, 0x08, 0x5e, 0xe4, 0x2e, 0x08, 0x5e, 0x5c, 
+-	0xb4, 0x90, 0x1c, 0x01, 0x78, 0x48, 0x00, 0x80, 
+-	0x4c, 0x0d, 0x58, 0x23, 0x69, 0x1a, 0x68, 0x8f, 
+-	0x42, 0xba, 0xd0, 0x12, 0x68, 0x10, 0x42, 0xb8, 
+-	0xd0, 0x08, 0x68, 0x10, 0x28, 0x00, 0xd0, 0x01, 
+-	0x68, 0x12, 0xe0, 0x02, 0x20, 0xba, 0xbc, 0x90, 
+-	0x47, 0x70, 0xe7, 0xf3, 0x20, 0x00, 0x60, 0x10, 
+-	0x69, 0x9c, 0x69, 0x18, 0x60, 0x20, 0x61, 0x1f, 
+-	0x61, 0x9a, 0x20, 0x00, 0xe7, 0xf3, 0xe7, 0xf2, 
+-	0x2e, 0x08, 0x5e, 0x5c, 0xb4, 0xb0, 0x1c, 0x02, 
+-	0x1c, 0x0f, 0x78, 0x90, 0x23, 0x04, 0x40, 0x18, 
+-	0xd0, 0x1c, 0x78, 0x90, 0x23, 0x20, 0x40, 0x18, 
+-	0xd0, 0x18, 0x6b, 0x14, 0x68, 0x20, 0x28, 0x00, 
+-	0xd0, 0x02, 0x1d, 0xe5, 0x35, 0x05, 0xe0, 0x01, 
+-	0x1d, 0xe5, 0x35, 0x31, 0x21, 0x00, 0x29, 0x08, 
+-	0xdb, 0x04, 0xe0, 0x08, 0x1c, 0x48, 0x06, 0x01, 
+-	0x0e, 0x09, 0xe7, 0xf8, 0x00, 0x88, 0x58, 0x2b, 
+-	0x00, 0x88, 0x50, 0x3b, 0xe7, 0xf6, 0x20, 0x00, 
+-	0xbc, 0xb0, 0x47, 0x70, 0x20, 0xb1, 0xe7, 0xfb, 
+-	0xe7, 0xfa, 0xb5, 0xf3, 0x1c, 0x0a, 0xb0, 0x93, 
+-	0x20, 0x00, 0x90, 0x06, 0x98, 0x13, 0x69, 0x00, 
+-	0x90, 0x00, 0x98, 0x00, 0x6b, 0x00, 0x90, 0x12, 
+-	0x98, 0x00, 0x78, 0x80, 0x90, 0x05, 0x98, 0x12, 
+-	0x68, 0x00, 0x90, 0x01, 0x28, 0x00, 0xd0, 0x03, 
+-	0x98, 0x12, 0x30, 0x0c, 0x90, 0x09, 0xe0, 0x0e, 
+-	0x98, 0x12, 0x6a, 0xc0, 0x90, 0x01, 0x28, 0x00, 
+-	0xd0, 0x03, 0x98, 0x12, 0x30, 0x38, 0x90, 0x09, 
+-	0xe0, 0x05, 0x20, 0xb1, 0xb0, 0x13, 0xb0, 0x02, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x20, 0x00, 
+-	0x90, 0x06, 0x98, 0x05, 0x23, 0x04, 0x40, 0x18, 
+-	0xd0, 0x73, 0x21, 0x00, 0x29, 0x08, 0xdb, 0x04, 
+-	0xe0, 0x0c, 0x1c, 0x48, 0x06, 0x01, 0x0e, 0x09, 
+-	0xe7, 0xf8, 0x98, 0x13, 0x30, 0x80, 0x69, 0x00, 
+-	0x00, 0x8b, 0x58, 0xc0, 0x00, 0x8e, 0xab, 0x0a, 
+-	0x51, 0x98, 0xe7, 0xf2, 0x9d, 0x01, 0x21, 0x00, 
+-	0x29, 0x08, 0xdb, 0x04, 0xe0, 0xa7, 0x1c, 0x48, 
+-	0x06, 0x01, 0x0e, 0x09, 0xe7, 0xf8, 0x00, 0x88, 
+-	0xab, 0x0a, 0x58, 0x18, 0x28, 0x00, 0xd0, 0x55, 
+-	0x20, 0x00, 0x90, 0x08, 0x48, 0x73, 0x90, 0x07, 
+-	0x20, 0x00, 0x90, 0x02, 0x98, 0x02, 0x28, 0x20, 
+-	0xdb, 0x06, 0xe0, 0x8d, 0x98, 0x02, 0x30, 0x01, 
+-	0x06, 0x00, 0x0e, 0x00, 0x90, 0x02, 0xe7, 0xf5, 
+-	0x00, 0x8b, 0xa8, 0x0a, 0x58, 0xc0, 0x9b, 0x07, 
+-	0x40, 0x18, 0x90, 0x08, 0x28, 0x00, 0xd0, 0x73, 
+-	0x00, 0x88, 0x9b, 0x09, 0x58, 0x18, 0x9b, 0x08, 
+-	0x40, 0x18, 0xd0, 0x6e, 0x1d, 0xec, 0x34, 0x01, 
+-	0x27, 0x00, 0x79, 0xa0, 0x9b, 0x06, 0x42, 0x98, 
+-	0xd0, 0x08, 0x68, 0x68, 0x1c, 0x05, 0xd1, 0x02, 
+-	0x20, 0xba, 0xb0, 0x13, 0xe7, 0xab, 0x1d, 0xec, 
+-	0x34, 0x01, 0xe7, 0xf2, 0x78, 0x60, 0x07, 0x00, 
+-	0x0f, 0x00, 0x02, 0x00, 0x04, 0x07, 0x0c, 0x3f, 
+-	0x78, 0xa0, 0x19, 0xc0, 0x30, 0x03, 0x04, 0x07, 
+-	0x0c, 0x3f, 0x2a, 0x00, 0xd0, 0x42, 0x98, 0x13, 
+-	0x88, 0x40, 0x42, 0xb8, 0xdb, 0x3a, 0x98, 0x13, 
+-	0x88, 0x40, 0x1b, 0xc0, 0x9b, 0x13, 0x80, 0x58, 
+-	0x20, 0xbc, 0x90, 0x04, 0x2f, 0x00, 0xdd, 0x30, 
+-	0x2f, 0xbc, 0xdd, 0x1b, 0x20, 0x00, 0x90, 0x03, 
+-	0x98, 0x03, 0x28, 0xbc, 0xdb, 0x09, 0xe0, 0x0d, 
+-	0x98, 0x03, 0x30, 0x01, 0x06, 0x00, 0x0e, 0x00, 
+-	0xe0, 0x01, 0xe0, 0x4c, 0xe0, 0x41, 0x90, 0x03, 
+-	0xe7, 0xf2, 0x78, 0x23, 0x34, 0x01, 0x70, 0x13, 
+-	0x32, 0x01, 0xe7, 0xf1, 0x1f, 0xf8, 0x38, 0xb5, 
+-	0x04, 0x07, 0x0c, 0x3f, 0x68, 0x2d, 0x1d, 0xec, 
+-	0x34, 0x01, 0xe0, 0x11, 0x20, 0x00, 0x90, 0x03, 
+-	0x98, 0x03, 0x42, 0xb8, 0xdb, 0x06, 0xe0, 0x0a, 
+-	0x98, 0x03, 0x30, 0x01, 0x06, 0x00, 0x0e, 0x00, 
+-	0x90, 0x03, 0xe7, 0xf5, 0x78, 0x23, 0x34, 0x01, 
+-	0x70, 0x13, 0x32, 0x01, 0xe7, 0xf4, 0x27, 0x00, 
+-	0xe7, 0xcc, 0xe0, 0x02, 0x20, 0xb7, 0xb0, 0x13, 
+-	0xe7, 0x59, 0xe0, 0x04, 0x98, 0x13, 0x88, 0x40, 
+-	0x19, 0xc0, 0x9b, 0x13, 0x80, 0x58, 0x00, 0x88, 
+-	0xab, 0x0a, 0x58, 0x18, 0x9b, 0x07, 0x43, 0x98, 
+-	0x00, 0x8e, 0xab, 0x0a, 0x51, 0x98, 0xe0, 0x01, 
+-	0xe0, 0x01, 0xe0, 0x00, 0x9d, 0x01, 0x98, 0x06, 
+-	0x30, 0x01, 0x06, 0x00, 0x0e, 0x00, 0x90, 0x06, 
+-	0x98, 0x07, 0x08, 0x40, 0x90, 0x07, 0xe7, 0x71, 
+-	0xe0, 0x04, 0x98, 0x06, 0x30, 0x20, 0x06, 0x00, 
+-	0x0e, 0x00, 0x90, 0x06, 0xe7, 0x57, 0x20, 0x00, 
+-	0xb0, 0x13, 0xe7, 0x34, 0xe0, 0x44, 0x98, 0x05, 
+-	0x23, 0x02, 0x40, 0x18, 0xd0, 0x3b, 0x98, 0x01, 
+-	0x1d, 0xc4, 0x34, 0x01, 0x78, 0x60, 0x07, 0x00, 
+-	0x0f, 0x00, 0x02, 0x00, 0x04, 0x07, 0x0c, 0x3f, 
+-	0x78, 0xa0, 0x19, 0xc0, 0x30, 0x03, 0x04, 0x07, 
+-	0x0c, 0x3f, 0x2f, 0x00, 0xdd, 0x28, 0x2f, 0xbc, 
+-	0xdd, 0x17, 0x21, 0x00, 0x29, 0xbc, 0xdb, 0x04, 
+-	0xe0, 0x08, 0x1c, 0x48, 0x06, 0x01, 0x0e, 0x09, 
+-	0xe7, 0xf8, 0x78, 0x23, 0x34, 0x01, 0x70, 0x13, 
+-	0x32, 0x01, 0xe7, 0xf6, 0x1f, 0xf8, 0x38, 0xb5, 
+-	0x04, 0x07, 0x0c, 0x3f, 0x98, 0x01, 0x68, 0x00, 
+-	0x90, 0x01, 0x98, 0x01, 0x1d, 0xc4, 0x34, 0x01, 
+-	0xe0, 0x0d, 0x21, 0x00, 0x42, 0xb9, 0xdb, 0x04, 
+-	0xe0, 0x08, 0x1c, 0x48, 0x06, 0x01, 0x0e, 0x09, 
+-	0xe7, 0xf8, 0x78, 0x23, 0x34, 0x01, 0x70, 0x13, 
+-	0x32, 0x01, 0xe7, 0xf6, 0x27, 0x00, 0xe7, 0xd4, 
+-	0x20, 0x00, 0xb0, 0x13, 0xe6, 0xf3, 0x20, 0xb1, 
+-	0xb0, 0x13, 0xe6, 0xf0, 0xb0, 0x13, 0xe6, 0xee, 
+-	0xe6, 0xed, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 
+-	0xb5, 0xf3, 0xb0, 0x84, 0x98, 0x04, 0x78, 0x40, 
+-	0x00, 0x80, 0x49, 0x4b, 0x58, 0x08, 0x90, 0x03, 
+-	0x28, 0x00, 0xd1, 0x05, 0x20, 0xb0, 0xb0, 0x04, 
+-	0xb0, 0x02, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x98, 0x04, 0x68, 0x86, 0x98, 0x04, 0x88, 0x47, 
+-	0x98, 0x04, 0x68, 0x44, 0x1d, 0xf0, 0x30, 0xb9, 
+-	0x99, 0x04, 0x68, 0x49, 0x1a, 0x45, 0x42, 0xbd, 
+-	0xdb, 0x0c, 0x2f, 0x00, 0xdb, 0x01, 0x2f, 0xbc, 
+-	0xdd, 0x02, 0x20, 0xba, 0xb0, 0x04, 0xe7, 0xe7, 
+-	0x1c, 0x3a, 0x99, 0x05, 0x1c, 0x20, 0xf0, 0x00, 
+-	0xf9, 0x29, 0xe0, 0x6b, 0x20, 0x00, 0x90, 0x00, 
+-	0x98, 0x04, 0x78, 0x40, 0x00, 0xc3, 0x1a, 0x18, 
+-	0x00, 0x80, 0x49, 0x36, 0x68, 0x09, 0x18, 0x40, 
+-	0x90, 0x01, 0x98, 0x01, 0x78, 0x80, 0x90, 0x02, 
+-	0x98, 0x02, 0x06, 0xc0, 0x0e, 0xc0, 0x90, 0x02, 
+-	0x98, 0x02, 0x28, 0x12, 0xd1, 0x03, 0x2d, 0x0e, 
+-	0xda, 0x01, 0x20, 0x01, 0x90, 0x00, 0x2f, 0x00, 
+-	0xdd, 0x50, 0xb0, 0x81, 0x42, 0xaf, 0xdd, 0x0d, 
+-	0x2d, 0x00, 0xdb, 0x01, 0x2d, 0xbc, 0xdd, 0x02, 
+-	0x20, 0xba, 0xb0, 0x05, 0xe7, 0xbc, 0x1c, 0x2a, 
+-	0x99, 0x06, 0x1c, 0x20, 0xf0, 0x00, 0xf8, 0xfe, 
+-	0x68, 0x36, 0xe0, 0x0b, 0x2f, 0x00, 0xdb, 0x01, 
+-	0x2f, 0xbc, 0xdd, 0x02, 0x20, 0xba, 0xb0, 0x05, 
+-	0xe7, 0xae, 0x1c, 0x3a, 0x99, 0x06, 0x1c, 0x20, 
+-	0xf0, 0x00, 0xf8, 0xf0, 0x99, 0x06, 0x19, 0x49, 
+-	0x91, 0x06, 0x1b, 0x7f, 0x1d, 0x31, 0x91, 0x00, 
+-	0x99, 0x00, 0x78, 0x88, 0x19, 0x84, 0x98, 0x01, 
+-	0x28, 0x00, 0xd0, 0x20, 0x99, 0x00, 0x78, 0xc8, 
+-	0x23, 0x80, 0x40, 0x18, 0xd1, 0x1b, 0x1d, 0xf0, 
+-	0x30, 0xb9, 0x1b, 0x05, 0x42, 0xbd, 0xdb, 0x01, 
+-	0x3c, 0x01, 0xe0, 0x14, 0x1c, 0x68, 0x42, 0xb8, 
+-	0xd1, 0x11, 0x99, 0x00, 0x78, 0x88, 0x28, 0x09, 
+-	0xdd, 0x08, 0x99, 0x00, 0x79, 0x08, 0x30, 0x09, 
+-	0x99, 0x00, 0x78, 0x89, 0x42, 0x88, 0xd0, 0x00, 
+-	0x3c, 0x01, 0xe0, 0x04, 0x99, 0x00, 0x78, 0x88, 
+-	0x28, 0x09, 0xd1, 0x00, 0x3c, 0x01, 0x20, 0x00, 
+-	0x90, 0x01, 0x1d, 0xf0, 0x30, 0xb9, 0x1b, 0x05, 
+-	0xb0, 0x01, 0xe7, 0xac, 0x20, 0x00, 0xb0, 0x04, 
+-	0xe7, 0x72, 0xb0, 0x04, 0xe7, 0x70, 0x00, 0x00, 
+-	0x2e, 0x08, 0x5e, 0x5c, 0x2e, 0x08, 0x5d, 0xc4, 
+-	0xb5, 0xf1, 0x98, 0x00, 0x06, 0x04, 0x0e, 0x24, 
+-	0xb0, 0x83, 0x00, 0xa0, 0x4b, 0x4c, 0x58, 0x1d, 
+-	0x78, 0x28, 0x90, 0x02, 0x2c, 0x20, 0xdb, 0x05, 
+-	0x20, 0xa2, 0xb0, 0x03, 0xb0, 0x01, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x00, 0xa0, 0x4b, 0x46, 
+-	0x58, 0x18, 0x1c, 0x05, 0xd1, 0x02, 0x20, 0xb0, 
+-	0xb0, 0x03, 0xe7, 0xf3, 0x00, 0xe0, 0x1b, 0x00, 
+-	0x00, 0x80, 0x4b, 0x42, 0x68, 0x1b, 0x18, 0xc7, 
+-	0x78, 0xa8, 0x28, 0x00, 0xd0, 0x63, 0x20, 0x00, 
+-	0x42, 0x80, 0xd0, 0x20, 0x21, 0x00, 0x29, 0x20, 
+-	0xdb, 0x04, 0xe0, 0x1b, 0x1c, 0x48, 0x06, 0x01, 
+-	0x0e, 0x09, 0xe7, 0xf8, 0x00, 0x88, 0x4b, 0x3a, 
+-	0x58, 0x18, 0x90, 0x01, 0x98, 0x01, 0x79, 0xc0, 
+-	0x42, 0xa0, 0xd1, 0x0e, 0x20, 0x01, 0x40, 0x88, 
+-	0x43, 0xc0, 0x4b, 0x36, 0x68, 0x1b, 0x40, 0x18, 
+-	0x4b, 0x34, 0x60, 0x18, 0x23, 0x00, 0x00, 0x88, 
+-	0x4e, 0x31, 0x50, 0x33, 0x23, 0xff, 0x48, 0x32, 
+-	0x54, 0x43, 0xe7, 0xe3, 0xe0, 0x3f, 0x7e, 0x38, 
+-	0x1c, 0x02, 0x28, 0xff, 0xd0, 0x10, 0x20, 0xff, 
+-	0x4b, 0x2e, 0x54, 0x98, 0x23, 0x00, 0x00, 0x90, 
+-	0x4e, 0x2d, 0x50, 0x33, 0x20, 0x01, 0x40, 0x90, 
+-	0x43, 0xc0, 0x4b, 0x2c, 0x88, 0x1b, 0x40, 0x18, 
+-	0x4b, 0x2a, 0x80, 0x18, 0x20, 0xff, 0x76, 0x38, 
+-	0x7e, 0x78, 0x1c, 0x02, 0x28, 0xff, 0xd0, 0x11, 
+-	0x20, 0xff, 0x4b, 0x24, 0x54, 0x98, 0x23, 0x00, 
+-	0x00, 0x90, 0x4e, 0x23, 0x50, 0x33, 0x20, 0x01, 
+-	0x40, 0x90, 0x43, 0xc0, 0x4b, 0x21, 0x88, 0x1b, 
+-	0x40, 0x18, 0x4b, 0x20, 0x80, 0x18, 0x20, 0xff, 
+-	0x76, 0x78, 0xe0, 0x02, 0x20, 0xb1, 0xb0, 0x03, 
+-	0xe7, 0x98, 0x23, 0x00, 0x00, 0x90, 0x4e, 0x1a, 
+-	0x50, 0x33, 0x20, 0x01, 0x40, 0x90, 0x43, 0xc0, 
+-	0x4b, 0x18, 0x88, 0x1b, 0x40, 0x18, 0x4b, 0x17, 
+-	0x80, 0x18, 0x4e, 0x17, 0x96, 0x00, 0x20, 0x00, 
+-	0x00, 0x93, 0x9e, 0x00, 0x50, 0xf0, 0x98, 0x02, 
+-	0x23, 0x20, 0x40, 0x18, 0xd0, 0xff, 0x21, 0x00, 
+-	0x29, 0x0c, 0xdb, 0x04, 0xe0, 0x07, 0x1c, 0x48, 
+-	0x06, 0x01, 0x0e, 0x09, 0xe7, 0xf8, 0x20, 0x00, 
+-	0x18, 0x7b, 0x73, 0x18, 0xe7, 0xf7, 0x20, 0x00, 
+-	0x83, 0x38, 0x20, 0x00, 0x70, 0xf8, 0x20, 0x00, 
+-	0xb0, 0x03, 0xe7, 0x6f, 0xb0, 0x03, 0xe7, 0x6d, 
+-	0x2e, 0x08, 0x5e, 0x5c, 0x2e, 0x08, 0x5d, 0xc4, 
+-	0x2e, 0x08, 0x5e, 0xe4, 0x2e, 0x08, 0x5e, 0xdc, 
+-	0x2e, 0x08, 0x5f, 0xa4, 0x2e, 0x08, 0x5f, 0xc4, 
+-	0x2e, 0x08, 0x5f, 0x64, 0x2e, 0x08, 0x5e, 0xe0, 
+-	0x9e, 0x00, 0x04, 0xb8, 0xb5, 0xf0, 0x1c, 0x05, 
+-	0x1c, 0x0c, 0x1c, 0x17, 0x20, 0x1d, 0x02, 0x80, 
+-	0x69, 0x86, 0x1c, 0x3a, 0x1c, 0x29, 0x1c, 0x20, 
+-	0xf0, 0x08, 0xfb, 0x32, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0xb4, 0xf0, 0x1c, 0x01, 0xb0, 0x82, 
+-	0x68, 0x48, 0x68, 0x8c, 0x1d, 0xe2, 0x32, 0xb7, 
+-	0x42, 0x82, 0xd9, 0x09, 0x78, 0x42, 0x07, 0x12, 
+-	0x0f, 0x12, 0x02, 0x12, 0x78, 0x83, 0x43, 0x1a, 
+-	0x32, 0x03, 0x04, 0x17, 0x0c, 0x3f, 0xe0, 0x41, 
+-	0xb0, 0x82, 0x68, 0x23, 0x93, 0x01, 0x9b, 0x01, 
+-	0x33, 0x04, 0x93, 0x00, 0x9b, 0x00, 0x78, 0x9b, 
+-	0x9e, 0x01, 0x19, 0x9a, 0x78, 0x4e, 0x00, 0xf3, 
+-	0x1b, 0x9b, 0x00, 0x9b, 0x4e, 0x1b, 0x68, 0x36, 
+-	0x19, 0x9b, 0x93, 0x02, 0x9b, 0x02, 0x78, 0x9d, 
+-	0x06, 0xed, 0x0e, 0xed, 0x2d, 0x12, 0xd1, 0x0f, 
+-	0x1d, 0xe3, 0x33, 0xb9, 0x68, 0x4e, 0x1b, 0x9b, 
+-	0x06, 0x1b, 0x0e, 0x1b, 0x93, 0x03, 0x9b, 0x00, 
+-	0x78, 0xde, 0x23, 0x80, 0x40, 0x33, 0xd1, 0x03, 
+-	0x9b, 0x03, 0x2b, 0x0e, 0xda, 0x00, 0x3a, 0x01, 
+-	0x1d, 0xe3, 0x33, 0xb8, 0x42, 0x83, 0xd9, 0x0b, 
+-	0x78, 0x43, 0x07, 0x1b, 0x0f, 0x1b, 0x02, 0x1b, 
+-	0x04, 0x1f, 0x0c, 0x3f, 0x78, 0x13, 0x18, 0xfb, 
+-	0x33, 0x03, 0x04, 0x1f, 0x0c, 0x3f, 0xe0, 0x08, 
+-	0x78, 0x13, 0x07, 0x1b, 0x0f, 0x1b, 0x02, 0x1b, 
+-	0x78, 0x56, 0x43, 0x33, 0x33, 0x03, 0x04, 0x1f, 
+-	0x0c, 0x3f, 0xb0, 0x02, 0x80, 0x4f, 0xb0, 0x02, 
+-	0xbc, 0xf0, 0x47, 0x70, 0x2e, 0x08, 0x5d, 0xc4, 
+-	0xb5, 0xf3, 0xb0, 0x81, 0x99, 0x02, 0x06, 0x0b, 
+-	0x0e, 0x1b, 0x93, 0x00, 0x9b, 0x00, 0x2b, 0x00, 
+-	0xd1, 0x0a, 0x49, 0x24, 0x4b, 0x24, 0x69, 0x1b, 
+-	0x1c, 0x18, 0x4b, 0x23, 0x69, 0x5b, 0x1c, 0x1c, 
+-	0x4b, 0x21, 0x6a, 0x1b, 0x1e, 0x5a, 0xe0, 0x09, 
+-	0x49, 0x20, 0x4b, 0x1f, 0x69, 0x9b, 0x1c, 0x18, 
+-	0x4b, 0x1d, 0x69, 0xdb, 0x1c, 0x1c, 0x4b, 0x1c, 
+-	0x6a, 0x5b, 0x1e, 0x5a, 0x9b, 0x01, 0x78, 0xdd, 
+-	0x26, 0x01, 0x40, 0xae, 0x1c, 0x37, 0x42, 0xa0, 
+-	0xd0, 0x26, 0x00, 0x83, 0x18, 0x5d, 0x23, 0x01, 
+-	0x02, 0x9b, 0x18, 0xeb, 0x68, 0x1b, 0x40, 0x3b, 
+-	0xd0, 0x1b, 0x00, 0x83, 0x18, 0x5d, 0x23, 0x01, 
+-	0x02, 0x9b, 0x18, 0xeb, 0x68, 0x1b, 0x43, 0xbb, 
+-	0x1c, 0x1d, 0x00, 0x83, 0x18, 0x5e, 0x23, 0x01, 
+-	0x02, 0x9b, 0x18, 0xf3, 0x60, 0x1d, 0x00, 0x83, 
+-	0x18, 0x5d, 0x23, 0x01, 0x02, 0x9b, 0x18, 0xeb, 
+-	0x68, 0x1b, 0x2b, 0x00, 0xd1, 0x05, 0x25, 0x00, 
+-	0x18, 0x0e, 0x23, 0x01, 0x02, 0xdb, 0x18, 0xf3, 
+-	0x70, 0x1d, 0x30, 0x01, 0x40, 0x10, 0xe7, 0xd6, 
+-	0xb0, 0x01, 0xb0, 0x02, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x60, 0x90, 
+-	0x9e, 0x00, 0x04, 0x80, 0x2e, 0x08, 0x69, 0x90, 
+-	0xb4, 0x90, 0x1c, 0x03, 0x1c, 0x0c, 0x1c, 0x17, 
+-	0x06, 0x21, 0x0e, 0x09, 0x06, 0x38, 0x0e, 0x00, 
+-	0x72, 0x19, 0x28, 0x00, 0xd0, 0x00, 0x75, 0x58, 
+-	0x68, 0x5b, 0x2b, 0x00, 0xd1, 0xf8, 0xbc, 0x90, 
+-	0x47, 0x70, 0x00, 0x00, 0xb5, 0x80, 0x1c, 0x07, 
+-	0x68, 0xf8, 0x28, 0x1f, 0xd9, 0x03, 0x20, 0xe1, 
+-	0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 0x48, 0x1e, 
+-	0x6d, 0x00, 0x68, 0x00, 0x4b, 0x1d, 0x40, 0x18, 
+-	0x49, 0x1b, 0x6d, 0x09, 0x60, 0x08, 0x05, 0x80, 
+-	0x48, 0x19, 0x6d, 0x00, 0x68, 0x00, 0x49, 0x18, 
+-	0x6e, 0xc9, 0x60, 0x08, 0x48, 0x16, 0x6d, 0x00, 
+-	0x68, 0x00, 0x23, 0x01, 0x02, 0x5b, 0x43, 0x18, 
+-	0x49, 0x13, 0x6d, 0x09, 0x60, 0x08, 0x05, 0x80, 
+-	0x48, 0x11, 0x6d, 0x00, 0x68, 0x00, 0x49, 0x10, 
+-	0x6e, 0xc9, 0x60, 0x08, 0x48, 0x0e, 0x6f, 0xc1, 
+-	0xcf, 0x09, 0xc1, 0x09, 0xcf, 0x09, 0xc1, 0x09, 
+-	0xcf, 0x08, 0xc1, 0x08, 0xf0, 0x00, 0xfc, 0x1e, 
+-	0x20, 0x00, 0x49, 0x09, 0x60, 0x08, 0x20, 0x00, 
+-	0x49, 0x07, 0x60, 0x48, 0x20, 0x00, 0x49, 0x06, 
+-	0x60, 0x88, 0x49, 0x07, 0x20, 0x0b, 0xf0, 0x0c, 
+-	0xf9, 0xb5, 0x20, 0xff, 0x30, 0x01, 0x49, 0x02, 
+-	0x61, 0xc8, 0x20, 0x00, 0xe7, 0xc0, 0xe7, 0xbf, 
+-	0x2e, 0x08, 0x1f, 0x1c, 0xff, 0xff, 0xfd, 0xff, 
+-	0x2e, 0x01, 0x09, 0x15, 0x1c, 0x01, 0x48, 0x0e, 
+-	0x6f, 0x00, 0x68, 0x00, 0x60, 0x08, 0x48, 0x0c, 
+-	0x6e, 0x80, 0x68, 0x00, 0x60, 0x48, 0x48, 0x0a, 
+-	0x6e, 0xc0, 0x68, 0x00, 0x60, 0x88, 0x48, 0x08, 
+-	0x6f, 0x40, 0x68, 0x00, 0x60, 0xc8, 0x48, 0x06, 
+-	0x68, 0x00, 0x61, 0x08, 0x48, 0x04, 0x68, 0x40, 
+-	0x61, 0x48, 0x48, 0x03, 0x68, 0x80, 0x61, 0x88, 
+-	0x20, 0x00, 0x47, 0x70, 0xe7, 0xfd, 0x00, 0x00, 
+-	0x2e, 0x08, 0x1f, 0x1c, 0x48, 0x03, 0x6e, 0x80, 
+-	0x68, 0x00, 0x07, 0x40, 0x0f, 0xc0, 0x47, 0x70, 
+-	0xe7, 0xfd, 0x00, 0x00, 0x2e, 0x08, 0x1f, 0x1c, 
+-	0xb4, 0x80, 0x1c, 0x07, 0x1c, 0x0a, 0x48, 0x37, 
+-	0x69, 0xc0, 0x23, 0xff, 0x33, 0x01, 0x42, 0x98, 
+-	0xd0, 0x02, 0x20, 0xe0, 0xbc, 0x80, 0x47, 0x70, 
+-	0x48, 0x32, 0x62, 0x07, 0x20, 0x00, 0x49, 0x31, 
+-	0x62, 0x48, 0x48, 0x31, 0x60, 0x02, 0x48, 0x30, 
+-	0x68, 0x00, 0x78, 0x00, 0x49, 0x2d, 0x61, 0x88, 
+-	0x48, 0x2d, 0x68, 0x00, 0x7a, 0x00, 0x49, 0x2b, 
+-	0x61, 0x08, 0x48, 0x2b, 0x68, 0x00, 0x68, 0x40, 
+-	0x49, 0x28, 0x60, 0xc8, 0x48, 0x27, 0x69, 0x80, 
+-	0x07, 0xc0, 0x0f, 0xc0, 0xd0, 0x01, 0x48, 0x27, 
+-	0xe0, 0x01, 0x20, 0x01, 0x02, 0x40, 0x49, 0x23, 
+-	0x61, 0xc8, 0x48, 0x22, 0x68, 0x40, 0x30, 0x01, 
+-	0x49, 0x20, 0x60, 0x48, 0x48, 0x1f, 0x6d, 0x40, 
+-	0x68, 0x00, 0x0a, 0x00, 0x02, 0x00, 0x49, 0x1d, 
+-	0x69, 0x89, 0x08, 0x49, 0x06, 0x09, 0x0e, 0x09, 
+-	0x43, 0x08, 0x49, 0x1a, 0x6d, 0x49, 0x60, 0x08, 
+-	0x06, 0x00, 0x48, 0x18, 0x6d, 0x00, 0x68, 0x00, 
+-	0x4b, 0x19, 0x40, 0x18, 0x49, 0x15, 0x69, 0x89, 
+-	0x07, 0xc9, 0x0c, 0x49, 0x43, 0x08, 0x49, 0x13, 
+-	0x6d, 0x09, 0x60, 0x08, 0x04, 0x40, 0x48, 0x11, 
+-	0x6d, 0x00, 0x68, 0x00, 0x4b, 0x13, 0x40, 0x18, 
+-	0x49, 0x0e, 0x6d, 0x09, 0x60, 0x08, 0x05, 0x40, 
+-	0x48, 0x0c, 0x6d, 0x00, 0x68, 0x00, 0x23, 0x01, 
+-	0x03, 0x1b, 0x43, 0x18, 0x49, 0x09, 0x6d, 0x09, 
+-	0x60, 0x08, 0x04, 0xc0, 0x48, 0x07, 0x6d, 0x40, 
+-	0x68, 0x00, 0x49, 0x06, 0x6f, 0x09, 0x60, 0x08, 
+-	0x48, 0x04, 0x6d, 0x00, 0x68, 0x00, 0x49, 0x03, 
+-	0x6e, 0xc9, 0x60, 0x08, 0x20, 0x00, 0xe7, 0x99, 
+-	0xe7, 0x98, 0x00, 0x00, 0x2e, 0x08, 0x1f, 0x1c, 
+-	0x2e, 0x08, 0x60, 0x54, 0x00, 0x00, 0x02, 0x01, 
+-	0xff, 0xff, 0xbf, 0xff, 0xff, 0xff, 0xfb, 0xff, 
+-	0xb5, 0x00, 0x48, 0xf6, 0x6e, 0x80, 0x68, 0x00, 
+-	0x23, 0x08, 0x40, 0x18, 0xd0, 0x74, 0x48, 0xf3, 
+-	0x6d, 0x00, 0x68, 0x00, 0x4b, 0xf2, 0x40, 0x18, 
+-	0x49, 0xf0, 0x6d, 0x09, 0x60, 0x08, 0x04, 0x80, 
+-	0x48, 0xee, 0x6e, 0x40, 0x68, 0x00, 0x0a, 0x00, 
+-	0x02, 0x00, 0x49, 0xec, 0x6e, 0x49, 0x60, 0x08, 
+-	0x06, 0x00, 0x48, 0xea, 0x6e, 0xc0, 0x68, 0x00, 
+-	0x23, 0x01, 0x02, 0xdb, 0x40, 0x18, 0xd0, 0x3e, 
+-	0x20, 0xff, 0x30, 0x01, 0x49, 0xe5, 0x61, 0xc8, 
+-	0x48, 0xe4, 0x6d, 0x00, 0x68, 0x00, 0x4b, 0xe5, 
+-	0x40, 0x18, 0x49, 0xe2, 0x6d, 0x09, 0x60, 0x08, 
+-	0x04, 0xc0, 0x48, 0xe0, 0x6f, 0xc0, 0x68, 0x80, 
+-	0x68, 0x01, 0x02, 0x09, 0x0a, 0x09, 0x4a, 0xdd, 
+-	0x6a, 0x52, 0x06, 0x12, 0x43, 0x11, 0x60, 0x01, 
+-	0x48, 0xdd, 0x68, 0x00, 0x7a, 0x00, 0x49, 0xd9, 
+-	0x69, 0x09, 0x1a, 0x41, 0x48, 0xd7, 0x6f, 0xc0, 
+-	0x68, 0x80, 0x68, 0x02, 0x4b, 0xd9, 0x40, 0x1a, 
+-	0x04, 0x09, 0x0c, 0x09, 0x02, 0x09, 0x43, 0x11, 
+-	0x60, 0x01, 0x02, 0x08, 0x0c, 0x00, 0x48, 0xd1, 
+-	0x6f, 0xc0, 0x68, 0x80, 0x68, 0x01, 0x23, 0x04, 
+-	0x43, 0x19, 0x60, 0x01, 0x07, 0x48, 0x48, 0xcd, 
+-	0x6f, 0xc0, 0x68, 0xc1, 0x20, 0x01, 0x40, 0x88, 
+-	0xf0, 0x0c, 0xf8, 0x96, 0x48, 0xc9, 0x68, 0x00, 
+-	0x30, 0x01, 0x49, 0xc8, 0x60, 0x08, 0x48, 0xc7, 
+-	0x69, 0xc0, 0x4b, 0xcb, 0x42, 0x98, 0xd0, 0x73, 
+-	0xdc, 0x08, 0x23, 0xff, 0x33, 0x01, 0x42, 0x98, 
+-	0xd0, 0x6f, 0x23, 0x01, 0x02, 0x5b, 0x42, 0x98, 
+-	0xd0, 0x07, 0xe2, 0xba, 0x4b, 0xc5, 0x42, 0x98, 
+-	0xd0, 0x68, 0x4b, 0xc5, 0x42, 0x98, 0xd0, 0x66, 
+-	0xe2, 0xb3, 0x48, 0xbc, 0x6e, 0x80, 0x68, 0x00, 
+-	0x23, 0x01, 0x02, 0x5b, 0x40, 0x18, 0xe0, 0x00, 
+-	0xe2, 0xcd, 0xd0, 0x3f, 0x48, 0xb7, 0x68, 0x00, 
+-	0x30, 0x01, 0x49, 0xb6, 0x60, 0x08, 0x48, 0xb5, 
+-	0x6d, 0x00, 0x68, 0x00, 0x4b, 0xb5, 0x40, 0x18, 
+-	0x49, 0xb2, 0x6d, 0x09, 0x60, 0x08, 0x04, 0xc0, 
+-	0x20, 0xff, 0x30, 0x01, 0x49, 0xaf, 0x61, 0xc8, 
+-	0x48, 0xae, 0x6f, 0xc0, 0x68, 0x80, 0x68, 0x01, 
+-	0x02, 0x09, 0x0a, 0x09, 0x4a, 0xab, 0x6a, 0x52, 
+-	0x06, 0x12, 0x43, 0x11, 0x60, 0x01, 0x48, 0xac, 
+-	0x68, 0x00, 0x7a, 0x00, 0x49, 0xa7, 0x69, 0x09, 
+-	0x1a, 0x41, 0x48, 0xa6, 0x6f, 0xc0, 0x68, 0x80, 
+-	0x68, 0x02, 0x4b, 0xa8, 0x40, 0x1a, 0x04, 0x09, 
+-	0x0c, 0x09, 0x02, 0x09, 0x43, 0x11, 0x60, 0x01, 
+-	0x02, 0x08, 0x0c, 0x00, 0x48, 0x9f, 0x6f, 0xc0, 
+-	0x68, 0x80, 0x68, 0x01, 0x23, 0x02, 0x43, 0x19, 
+-	0x60, 0x01, 0x07, 0x88, 0x48, 0x9b, 0x6f, 0xc0, 
+-	0x68, 0xc1, 0x20, 0x01, 0x40, 0x88, 0xf0, 0x0c, 
+-	0xf8, 0x33, 0xe0, 0x5e, 0x48, 0x97, 0x69, 0x00, 
+-	0x28, 0x00, 0xd0, 0x20, 0x48, 0x95, 0x69, 0x00, 
+-	0x38, 0x01, 0x49, 0x94, 0x61, 0x08, 0x48, 0x93, 
+-	0x68, 0xc0, 0x78, 0x00, 0x49, 0x91, 0x6c, 0x89, 
+-	0x68, 0x09, 0x0a, 0x09, 0x02, 0x09, 0x43, 0x08, 
+-	0x49, 0x8e, 0x6c, 0x89, 0x60, 0x08, 0x06, 0x00, 
+-	0x0e, 0x00, 0x48, 0x8c, 0x68, 0xc0, 0xe0, 0x03, 
+-	0xe1, 0x4b, 0xe2, 0x4d, 0xe0, 0x42, 0xe1, 0x93, 
+-	0x30, 0x01, 0x49, 0x88, 0x60, 0xc8, 0x48, 0x8d, 
+-	0x49, 0x86, 0x61, 0xc8, 0xe0, 0x39, 0x20, 0xff, 
+-	0x30, 0x01, 0x49, 0x84, 0x61, 0xc8, 0x48, 0x83, 
+-	0x6f, 0xc0, 0x68, 0x80, 0x68, 0x01, 0x02, 0x09, 
+-	0x0a, 0x09, 0x4a, 0x80, 0x6a, 0x52, 0x06, 0x12, 
+-	0x43, 0x11, 0x60, 0x01, 0x48, 0x80, 0x68, 0x00, 
+-	0x7a, 0x00, 0x49, 0x7c, 0x69, 0x09, 0x1a, 0x41, 
+-	0x48, 0x7a, 0x6f, 0xc0, 0x68, 0x80, 0x68, 0x02, 
+-	0x4b, 0x7c, 0x40, 0x1a, 0x04, 0x09, 0x0c, 0x09, 
+-	0x02, 0x09, 0x43, 0x11, 0x60, 0x01, 0x02, 0x08, 
+-	0x0c, 0x00, 0x48, 0x74, 0x6f, 0xc0, 0x68, 0x80, 
+-	0x68, 0x01, 0x23, 0x01, 0x43, 0x19, 0x60, 0x01, 
+-	0x07, 0xc8, 0x48, 0x70, 0x6f, 0xc0, 0x68, 0xc1, 
+-	0x20, 0x01, 0x40, 0x88, 0xf0, 0x0b, 0xff, 0xdc, 
+-	0x48, 0x6c, 0x6d, 0x00, 0x68, 0x00, 0x4b, 0x6d, 
+-	0x40, 0x18, 0x49, 0x6a, 0x6d, 0x09, 0x60, 0x08, 
+-	0x04, 0xc0, 0xe2, 0x08, 0x48, 0x67, 0x69, 0x00, 
+-	0x28, 0x00, 0xd0, 0x5f, 0x48, 0x65, 0x6e, 0x80, 
+-	0x68, 0x00, 0x23, 0xff, 0x33, 0x01, 0x40, 0x18, 
+-	0xd0, 0x3f, 0x48, 0x62, 0x68, 0x00, 0x30, 0x01, 
+-	0x49, 0x60, 0x60, 0x08, 0x48, 0x5f, 0x6d, 0x00, 
+-	0x68, 0x00, 0x4b, 0x60, 0x40, 0x18, 0x49, 0x5d, 
+-	0x6d, 0x09, 0x60, 0x08, 0x04, 0xc0, 0x20, 0xff, 
+-	0x30, 0x01, 0x49, 0x5a, 0x61, 0xc8, 0x48, 0x59, 
+-	0x6f, 0xc0, 0x68, 0x80, 0x68, 0x01, 0x02, 0x09, 
+-	0x0a, 0x09, 0x4a, 0x56, 0x6a, 0x52, 0x06, 0x12, 
+-	0x43, 0x11, 0x60, 0x01, 0x48, 0x56, 0x68, 0x00, 
+-	0x7a, 0x00, 0x49, 0x52, 0x69, 0x09, 0x1a, 0x41, 
+-	0x48, 0x50, 0x6f, 0xc0, 0x68, 0x80, 0x68, 0x02, 
+-	0x4b, 0x52, 0x40, 0x1a, 0x04, 0x09, 0x0c, 0x09, 
+-	0x02, 0x09, 0x43, 0x11, 0x60, 0x01, 0x02, 0x08, 
+-	0x0c, 0x00, 0x48, 0x4a, 0x6f, 0xc0, 0x68, 0x80, 
+-	0x68, 0x01, 0x23, 0x02, 0x43, 0x19, 0x60, 0x01, 
+-	0x07, 0x88, 0x48, 0x46, 0x6f, 0xc0, 0x68, 0xc1, 
+-	0x20, 0x01, 0x40, 0x88, 0xf0, 0x0b, 0xff, 0x88, 
+-	0xe0, 0x17, 0x48, 0x42, 0x68, 0xc0, 0x78, 0x00, 
+-	0x49, 0x40, 0x6c, 0x89, 0x68, 0x09, 0x0a, 0x09, 
+-	0x02, 0x09, 0x43, 0x08, 0x49, 0x3d, 0x6c, 0x89, 
+-	0x60, 0x08, 0x06, 0x00, 0x0e, 0x00, 0x48, 0x3b, 
+-	0x68, 0xc0, 0x30, 0x01, 0x49, 0x39, 0x60, 0xc8, 
+-	0x48, 0x38, 0x69, 0x00, 0x38, 0x01, 0x49, 0x37, 
+-	0x61, 0x08, 0xe0, 0xa1, 0x48, 0x35, 0x6a, 0x00, 
+-	0x38, 0x01, 0x49, 0x34, 0x62, 0x08, 0x48, 0x33, 
+-	0x6a, 0x00, 0x28, 0x00, 0xd0, 0x4b, 0x48, 0x31, 
+-	0x6a, 0x40, 0x30, 0x01, 0x49, 0x2f, 0x62, 0x48, 
+-	0x48, 0x31, 0x68, 0x00, 0x30, 0x0c, 0x49, 0x30, 
+-	0x60, 0x08, 0x48, 0x2f, 0x68, 0x00, 0x78, 0x00, 
+-	0x49, 0x2a, 0x61, 0x88, 0x48, 0x2c, 0x68, 0x00, 
+-	0x7a, 0x00, 0x49, 0x28, 0x61, 0x08, 0x48, 0x2a, 
+-	0x68, 0x00, 0x68, 0x40, 0x49, 0x25, 0x60, 0xc8, 
+-	0x48, 0x24, 0x69, 0x80, 0x07, 0xc0, 0x0f, 0xc0, 
+-	0xd0, 0x01, 0x48, 0x27, 0xe0, 0x01, 0x20, 0x01, 
+-	0x02, 0x40, 0x49, 0x20, 0x61, 0xc8, 0x48, 0x1f, 
+-	0x6d, 0x00, 0x68, 0x00, 0x23, 0x01, 0x03, 0x5b, 
+-	0x43, 0x18, 0x49, 0x1c, 0x6d, 0x09, 0x60, 0x08, 
+-	0x04, 0x80, 0x48, 0x1a, 0x6d, 0x40, 0x68, 0x00, 
+-	0x0a, 0x00, 0x02, 0x00, 0x49, 0x17, 0x69, 0x89, 
+-	0x08, 0x49, 0x06, 0x09, 0x0e, 0x09, 0x43, 0x08, 
+-	0x49, 0x14, 0x6d, 0x49, 0x60, 0x08, 0x06, 0x00, 
+-	0x48, 0x12, 0x6d, 0x00, 0x68, 0x00, 0x4b, 0x19, 
+-	0x40, 0x18, 0x49, 0x10, 0x69, 0x89, 0x07, 0xc9, 
+-	0x0c, 0x49, 0x43, 0x08, 0x49, 0x0d, 0x6d, 0x09, 
+-	0x60, 0x08, 0x04, 0x40, 0xe0, 0x4c, 0x20, 0xff, 
+-	0x30, 0x01, 0x49, 0x0a, 0x61, 0xc8, 0x48, 0x09, 
+-	0x6f, 0xc0, 0x68, 0x80, 0x68, 0x01, 0x02, 0x09, 
+-	0x0a, 0x09, 0x4a, 0x06, 0x6a, 0x52, 0x06, 0x12, 
+-	0x43, 0x11, 0x60, 0x01, 0x48, 0x06, 0x68, 0x00, 
+-	0x7a, 0x00, 0x49, 0x02, 0x69, 0x09, 0x1a, 0x41, 
+-	0x48, 0x00, 0xe0, 0x11, 0x2e, 0x08, 0x1f, 0x1c, 
+-	0xff, 0xff, 0xdf, 0xff, 0xff, 0xff, 0xef, 0xff, 
+-	0x2e, 0x08, 0x60, 0x54, 0xff, 0x00, 0x00, 0xff, 
+-	0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x02, 0x02, 
+-	0x00, 0x00, 0x02, 0x03, 0xff, 0xff, 0xbf, 0xff, 
+-	0x6f, 0xc0, 0x68, 0x80, 0x68, 0x02, 0x4b, 0xa5, 
+-	0x40, 0x1a, 0x04, 0x09, 0x0c, 0x09, 0x02, 0x09, 
+-	0x43, 0x11, 0x60, 0x01, 0x02, 0x08, 0x0c, 0x00, 
+-	0x48, 0xa1, 0x6f, 0xc0, 0x68, 0x80, 0x68, 0x01, 
+-	0x23, 0x01, 0x43, 0x19, 0x60, 0x01, 0x07, 0xc8, 
+-	0x48, 0x9d, 0x6f, 0xc0, 0x68, 0xc1, 0x20, 0x01, 
+-	0x40, 0x88, 0xf0, 0x0b, 0xfe, 0xd5, 0x48, 0x9a, 
+-	0x6d, 0x00, 0x68, 0x00, 0x4b, 0x99, 0x40, 0x18, 
+-	0x49, 0x97, 0x6d, 0x09, 0x60, 0x08, 0x04, 0xc0, 
+-	0xe1, 0x01, 0x48, 0x95, 0x6e, 0x80, 0x68, 0x00, 
+-	0x23, 0x01, 0x02, 0x5b, 0x40, 0x18, 0xd0, 0x3f, 
+-	0x48, 0x91, 0x68, 0x00, 0x30, 0x01, 0x49, 0x90, 
+-	0x60, 0x08, 0x48, 0x8f, 0x6d, 0x00, 0x68, 0x00, 
+-	0x4b, 0x8e, 0x40, 0x18, 0x49, 0x8c, 0x6d, 0x09, 
+-	0x60, 0x08, 0x04, 0xc0, 0x20, 0xff, 0x30, 0x01, 
+-	0x49, 0x89, 0x61, 0xc8, 0x48, 0x88, 0x6f, 0xc0, 
+-	0x68, 0x80, 0x68, 0x01, 0x02, 0x09, 0x0a, 0x09, 
+-	0x4a, 0x85, 0x6a, 0x52, 0x06, 0x12, 0x43, 0x11, 
+-	0x60, 0x01, 0x48, 0x85, 0x68, 0x00, 0x7a, 0x00, 
+-	0x49, 0x81, 0x69, 0x09, 0x1a, 0x41, 0x48, 0x80, 
+-	0x6f, 0xc0, 0x68, 0x80, 0x68, 0x02, 0x4b, 0x7d, 
+-	0x40, 0x1a, 0x04, 0x09, 0x0c, 0x09, 0x02, 0x09, 
+-	0x43, 0x11, 0x60, 0x01, 0x02, 0x08, 0x0c, 0x00, 
+-	0x48, 0x79, 0x6f, 0xc0, 0x68, 0x80, 0x68, 0x01, 
+-	0x23, 0x02, 0x43, 0x19, 0x60, 0x01, 0x07, 0x88, 
+-	0x48, 0x75, 0x6f, 0xc0, 0x68, 0xc1, 0x20, 0x01, 
+-	0x40, 0x88, 0xf0, 0x0b, 0xfe, 0x85, 0xe0, 0x02, 
+-	0x48, 0x74, 0x49, 0x71, 0x61, 0xc8, 0xe0, 0xb6, 
+-	0x48, 0x6f, 0x69, 0x00, 0x28, 0x00, 0xd0, 0x62, 
+-	0x48, 0x6d, 0x6e, 0x00, 0x68, 0x00, 0x49, 0x6c, 
+-	0x68, 0xc9, 0x70, 0x08, 0x48, 0x6a, 0x68, 0xc0, 
+-	0x30, 0x01, 0x49, 0x69, 0x60, 0xc8, 0x48, 0x68, 
+-	0x69, 0x00, 0x38, 0x01, 0x49, 0x66, 0x61, 0x08, 
+-	0x48, 0x65, 0x69, 0x00, 0x28, 0x00, 0xd1, 0x4d, 
+-	0x48, 0x63, 0x6a, 0x00, 0x28, 0x01, 0xd1, 0x49, 
+-	0x48, 0x63, 0x68, 0x00, 0x7a, 0x40, 0x49, 0x60, 
+-	0x6d, 0x09, 0x68, 0x09, 0x4b, 0x62, 0x40, 0x19, 
+-	0x07, 0xc0, 0x0d, 0x40, 0x43, 0x08, 0x49, 0x5c, 
+-	0x6d, 0x09, 0x60, 0x08, 0x05, 0x40, 0x0f, 0xc0, 
+-	0x20, 0xff, 0x30, 0x01, 0x49, 0x58, 0x61, 0xc8, 
+-	0x48, 0x57, 0x6d, 0x00, 0x68, 0x00, 0x4b, 0x57, 
+-	0x40, 0x18, 0x49, 0x55, 0x6d, 0x09, 0x60, 0x08, 
+-	0x04, 0xc0, 0x48, 0x53, 0x6f, 0xc0, 0x68, 0x80, 
+-	0x68, 0x01, 0x02, 0x09, 0x0a, 0x09, 0x4a, 0x50, 
+-	0x6a, 0x52, 0x06, 0x12, 0x43, 0x11, 0x60, 0x01, 
+-	0x48, 0x4f, 0x68, 0x00, 0x7a, 0x00, 0x49, 0x4c, 
+-	0x69, 0x09, 0x1a, 0x41, 0x48, 0x4a, 0x6f, 0xc0, 
+-	0x68, 0x80, 0x68, 0x02, 0x4b, 0x47, 0x40, 0x1a, 
+-	0x04, 0x09, 0x0c, 0x09, 0x02, 0x09, 0x43, 0x11, 
+-	0x60, 0x01, 0x02, 0x08, 0x0c, 0x00, 0x48, 0x44, 
+-	0x6f, 0xc0, 0x68, 0x80, 0x68, 0x01, 0x23, 0x01, 
+-	0x43, 0x19, 0x60, 0x01, 0x07, 0xc8, 0x48, 0x40, 
+-	0x6f, 0xc0, 0x68, 0xc1, 0x20, 0x01, 0x40, 0x88, 
+-	0xf0, 0x0b, 0xfe, 0x1a, 0xe0, 0x4f, 0x48, 0x3c, 
+-	0x6a, 0x00, 0x38, 0x01, 0x49, 0x3a, 0x62, 0x08, 
+-	0x48, 0x39, 0x6a, 0x40, 0x30, 0x01, 0x49, 0x38, 
+-	0x62, 0x48, 0x48, 0x39, 0x68, 0x00, 0x30, 0x0c, 
+-	0x49, 0x37, 0x60, 0x08, 0x48, 0x36, 0x68, 0x00, 
+-	0x78, 0x00, 0x49, 0x33, 0x61, 0x88, 0x48, 0x34, 
+-	0x68, 0x00, 0x7a, 0x00, 0x49, 0x30, 0x61, 0x08, 
+-	0x48, 0x31, 0x68, 0x00, 0x68, 0x40, 0x49, 0x2e, 
+-	0x60, 0xc8, 0x48, 0x2d, 0x69, 0x80, 0x07, 0xc0, 
+-	0x0f, 0xc0, 0xd0, 0x01, 0x48, 0x2f, 0xe0, 0x01, 
+-	0x20, 0x01, 0x02, 0x40, 0x49, 0x28, 0x61, 0xc8, 
+-	0x48, 0x27, 0x6d, 0x00, 0x68, 0x00, 0x23, 0x01, 
+-	0x03, 0x5b, 0x43, 0x18, 0x49, 0x24, 0x6d, 0x09, 
+-	0x60, 0x08, 0x04, 0x80, 0x48, 0x22, 0x6d, 0x40, 
+-	0x68, 0x00, 0x0a, 0x00, 0x02, 0x00, 0x49, 0x20, 
+-	0x69, 0x89, 0x08, 0x49, 0x06, 0x09, 0x0e, 0x09, 
+-	0x43, 0x08, 0x49, 0x1d, 0x6d, 0x49, 0x60, 0x08, 
+-	0x06, 0x00, 0x48, 0x1b, 0x6d, 0x00, 0x68, 0x00, 
+-	0x4b, 0x1f, 0x40, 0x18, 0x49, 0x18, 0x69, 0x89, 
+-	0x07, 0xc9, 0x0c, 0x49, 0x43, 0x08, 0x49, 0x16, 
+-	0x6d, 0x09, 0x60, 0x08, 0x04, 0x40, 0xe0, 0x01, 
+-	0xe0, 0x00, 0xe7, 0xff, 0x48, 0x12, 0x6c, 0x80, 
+-	0x68, 0x00, 0x49, 0x11, 0x6e, 0x49, 0x60, 0x08, 
+-	0x48, 0x0f, 0x6d, 0x40, 0x68, 0x00, 0x49, 0x0e, 
+-	0x6f, 0x09, 0x60, 0x08, 0x48, 0x0c, 0x6d, 0x00, 
+-	0x68, 0x00, 0x49, 0x0b, 0x6e, 0xc9, 0x60, 0x08, 
+-	0x48, 0x09, 0x6c, 0xc0, 0x68, 0x00, 0x23, 0x08, 
+-	0x43, 0x18, 0x49, 0x07, 0x6c, 0xc9, 0x60, 0x08, 
+-	0x07, 0x00, 0x48, 0x05, 0x6c, 0xc0, 0x68, 0x00, 
+-	0x49, 0x03, 0x6e, 0x89, 0x60, 0x08, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 
+-	0x2e, 0x08, 0x1f, 0x1c, 0xff, 0xff, 0xef, 0xff, 
+-	0x2e, 0x08, 0x60, 0x54, 0x00, 0x00, 0x02, 0x03, 
+-	0xff, 0xff, 0xfb, 0xff, 0x00, 0x00, 0x02, 0x01, 
+-	0xff, 0xff, 0xbf, 0xff, 0xb4, 0x80, 0x49, 0x2e, 
+-	0x20, 0x00, 0x28, 0x08, 0xd3, 0x04, 0xe0, 0x06, 
+-	0x1c, 0x42, 0x06, 0x10, 0x0e, 0x00, 0xe7, 0xf8, 
+-	0x23, 0x00, 0xc1, 0x08, 0xe7, 0xf8, 0x4a, 0x29, 
+-	0x6f, 0xd2, 0x68, 0x12, 0x4b, 0x27, 0x6d, 0x9b, 
+-	0x68, 0x1b, 0x0a, 0x1b, 0x02, 0x1b, 0x06, 0x12, 
+-	0x0e, 0x12, 0x43, 0x1a, 0x4b, 0x23, 0x6d, 0x9b, 
+-	0x60, 0x1a, 0x06, 0x12, 0x0e, 0x12, 0x4a, 0x21, 
+-	0x6f, 0xd2, 0x68, 0x52, 0x4b, 0x1f, 0x6d, 0x1b, 
+-	0x68, 0x1f, 0x23, 0x01, 0x03, 0xdb, 0x43, 0x9f, 
+-	0x1c, 0x3b, 0x07, 0xd2, 0x0c, 0x12, 0x43, 0x1a, 
+-	0x4b, 0x1a, 0x6d, 0x1b, 0x60, 0x1a, 0x04, 0x12, 
+-	0x0f, 0xd2, 0x4a, 0x18, 0x6f, 0xd2, 0x69, 0x12, 
+-	0x4b, 0x16, 0x6d, 0xdb, 0x68, 0x1b, 0x0c, 0x1b, 
+-	0x04, 0x1b, 0x04, 0x12, 0x0c, 0x12, 0x43, 0x1a, 
+-	0x4b, 0x12, 0x6d, 0xdb, 0x60, 0x1a, 0x04, 0x12, 
+-	0x0c, 0x12, 0x4a, 0x10, 0x6d, 0x12, 0x68, 0x12, 
+-	0x23, 0x01, 0x02, 0x5b, 0x43, 0x1a, 0x4b, 0x0d, 
+-	0x6d, 0x1b, 0x60, 0x1a, 0x05, 0x92, 0x4a, 0x0b, 
+-	0x6d, 0x12, 0x68, 0x12, 0x4b, 0x09, 0x6e, 0xdb, 
+-	0x60, 0x1a, 0x4a, 0x08, 0x6d, 0x92, 0x68, 0x12, 
+-	0x4b, 0x06, 0x6f, 0x5b, 0x60, 0x1a, 0x4a, 0x05, 
+-	0x6d, 0xd2, 0x68, 0x12, 0x4b, 0x03, 0x6f, 0x9b, 
+-	0x60, 0x1a, 0xbc, 0x80, 0x47, 0x70, 0x00, 0x00, 
+-	0x2e, 0x08, 0x1f, 0x44, 0x2e, 0x08, 0x1f, 0x1c, 
+-	0xb5, 0x90, 0x1c, 0x07, 0x1c, 0x0c, 0x2f, 0x22, 
+-	0xd1, 0x07, 0x2c, 0x3f, 0xd8, 0x01, 0x2c, 0x01, 
+-	0xd2, 0x03, 0x20, 0x38, 0xbc, 0x90, 0xbc, 0x08, 
+-	0x47, 0x18, 0x20, 0x01, 0x49, 0x13, 0x70, 0x08, 
+-	0x23, 0x01, 0x03, 0xdb, 0x42, 0x9f, 0xd0, 0x02, 
+-	0x4b, 0x11, 0x42, 0x9f, 0xd1, 0x04, 0x48, 0x11, 
+-	0x60, 0x07, 0x20, 0x00, 0xe7, 0xee, 0xe0, 0x18, 
+-	0x2f, 0xff, 0xd1, 0x0b, 0x21, 0x00, 0x43, 0xc9, 
+-	0x20, 0x0d, 0xf0, 0x00, 0xf8, 0x1d, 0x48, 0x0c, 
+-	0x68, 0x01, 0x48, 0x0c, 0x68, 0x00, 0xf0, 0x00, 
+-	0xf8, 0x43, 0xe0, 0x07, 0x1c, 0x21, 0x1c, 0x38, 
+-	0xf0, 0x00, 0xf8, 0x3e, 0x48, 0x07, 0x60, 0x07, 
+-	0x48, 0x05, 0x60, 0x04, 0x20, 0x00, 0xe7, 0xd5, 
+-	0xe7, 0xd4, 0xe7, 0xd3, 0x2e, 0x08, 0x60, 0x7c, 
+-	0x00, 0x00, 0x80, 0x0f, 0xcc, 0x00, 0x05, 0x00, 
+-	0x2e, 0x08, 0x60, 0x78, 0x2e, 0x08, 0x1f, 0x9c, 
+-	0xb4, 0xb0, 0x1c, 0x07, 0x1c, 0x0a, 0x4b, 0x13, 
+-	0x68, 0x5b, 0x1c, 0x18, 0x21, 0x00, 0x29, 0x02, 
+-	0xdb, 0x04, 0xe0, 0x1a, 0x1c, 0x4b, 0x06, 0x19, 
+-	0x0e, 0x09, 0xe7, 0xf8, 0x23, 0x0d, 0x06, 0x9b, 
+-	0x1a, 0xc4, 0x29, 0x00, 0xd1, 0x01, 0x60, 0x27, 
+-	0xe0, 0x05, 0x23, 0x01, 0x42, 0xda, 0xd0, 0x01, 
+-	0x60, 0x22, 0xe0, 0x00, 0xe0, 0x09, 0x1d, 0x05, 
+-	0x23, 0x05, 0x02, 0x1b, 0x42, 0x9d, 0xdb, 0x02, 
+-	0x20, 0x01, 0x02, 0x80, 0xe0, 0x00, 0x30, 0x04, 
+-	0xe7, 0xe4, 0x4b, 0x02, 0x60, 0x58, 0xbc, 0xb0, 
+-	0x47, 0x70, 0x00, 0x00, 0xcc, 0x00, 0x0f, 0x00, 
+-	0xb5, 0x90, 0x1c, 0x04, 0x1c, 0x0f, 0x05, 0x20, 
+-	0x0d, 0x00, 0x23, 0xff, 0x33, 0x04, 0x42, 0x98, 
+-	0xd0, 0x50, 0xdc, 0x18, 0x28, 0x10, 0xd0, 0x2d, 
+-	0xdc, 0x08, 0x28, 0x01, 0xd0, 0x23, 0x28, 0x02, 
+-	0xd0, 0x1e, 0x28, 0x04, 0xd0, 0x1f, 0x28, 0x08, 
+-	0xd0, 0x1d, 0xe0, 0x76, 0x28, 0x12, 0xd0, 0x1d, 
+-	0x28, 0x22, 0xd0, 0x3a, 0x23, 0xff, 0x33, 0x02, 
+-	0x42, 0x98, 0xd0, 0x24, 0x23, 0xff, 0x33, 0x03, 
+-	0x42, 0x98, 0xd0, 0x29, 0xe0, 0x69, 0x38, 0xff, 
+-	0x38, 0x05, 0x28, 0x08, 0xd2, 0x65, 0xa3, 0x02, 
+-	0x5c, 0x1b, 0x00, 0x5b, 0x44, 0x9f, 0x1c, 0x00, 
+-	0x35, 0x3c, 0x41, 0x4f, 0x56, 0x4b, 0x5d, 0x46, 
+-	0x20, 0x00, 0x49, 0x32, 0x63, 0x48, 0x48, 0x31, 
+-	0x62, 0x04, 0xe0, 0x5c, 0x20, 0x01, 0x49, 0x2f, 
+-	0x63, 0x48, 0xe0, 0x58, 0x20, 0x00, 0x49, 0x2e, 
+-	0x67, 0x08, 0x21, 0x00, 0x43, 0xc9, 0x20, 0x10, 
+-	0xf7, 0xff, 0xff, 0x92, 0xe0, 0x4f, 0x20, 0x01, 
+-	0x49, 0x29, 0x67, 0x08, 0x21, 0x00, 0x43, 0xc9, 
+-	0x20, 0x10, 0xf7, 0xff, 0xff, 0x89, 0xe0, 0x46, 
+-	0x20, 0x02, 0x49, 0x25, 0x67, 0x08, 0x21, 0x00, 
+-	0x43, 0xc9, 0x20, 0x10, 0xf7, 0xff, 0xff, 0x80, 
+-	0xe0, 0x3d, 0x1c, 0x39, 0x20, 0x22, 0xf7, 0xff, 
+-	0xff, 0x7b, 0xe0, 0x38, 0x48, 0x1e, 0x65, 0xc7, 
+-	0x21, 0x01, 0x20, 0x35, 0xf7, 0xff, 0xff, 0x74, 
+-	0xe0, 0x31, 0x48, 0x1b, 0x65, 0xc7, 0x21, 0x02, 
+-	0x20, 0x35, 0xf7, 0xff, 0xff, 0x6d, 0xe0, 0x2a, 
+-	0x21, 0x00, 0x20, 0x35, 0xf7, 0xff, 0xff, 0x68, 
+-	0xe0, 0x25, 0x21, 0x03, 0x20, 0x35, 0xf7, 0xff, 
+-	0xff, 0x63, 0xe0, 0x20, 0x21, 0x04, 0x20, 0x35, 
+-	0xf7, 0xff, 0xff, 0x5e, 0xe0, 0x1b, 0x20, 0x00, 
+-	0x49, 0x0f, 0x65, 0xc8, 0xe0, 0x17, 0x48, 0x0e, 
+-	0x66, 0x07, 0x21, 0x01, 0x20, 0x36, 0xf7, 0xff, 
+-	0xff, 0x53, 0xe0, 0x10, 0x48, 0x0a, 0x66, 0x07, 
+-	0x21, 0x02, 0x20, 0x36, 0xf7, 0xff, 0xff, 0x4c, 
+-	0xe0, 0x09, 0x20, 0x00, 0x49, 0x06, 0x66, 0x08, 
+-	0xe0, 0x05, 0x1c, 0x20, 0x21, 0x00, 0x43, 0xc9, 
+-	0xf7, 0xff, 0xff, 0x42, 0xe7, 0xff, 0xbc, 0x90, 
+-	0xbc, 0x08, 0x47, 0x18, 0xcc, 0x00, 0x0f, 0x80, 
+-	0xcc, 0x00, 0x05, 0x00, 0xb4, 0xb0, 0x1c, 0x04, 
+-	0x1c, 0x0f, 0x1c, 0x13, 0x06, 0x38, 0x0e, 0x00, 
+-	0x06, 0x19, 0x0e, 0x09, 0x29, 0x01, 0xd0, 0x08, 
+-	0x22, 0x00, 0x4d, 0x09, 0x60, 0x2a, 0x22, 0x00, 
+-	0x43, 0xd2, 0x4d, 0x08, 0x68, 0x2d, 0x60, 0x2a, 
+-	0xe0, 0x08, 0x4a, 0x07, 0x68, 0x12, 0x60, 0x14, 
+-	0x4a, 0x04, 0x68, 0x12, 0x60, 0x10, 0x22, 0x01, 
+-	0x4d, 0x01, 0x60, 0x2a, 0xbc, 0xb0, 0x47, 0x70, 
+-	0xcc, 0x00, 0x0d, 0x00, 0x2e, 0x08, 0x60, 0x70, 
+-	0x2e, 0x08, 0x60, 0x6c, 0xb5, 0xf3, 0xb0, 0x81, 
+-	0x99, 0x02, 0x06, 0x08, 0x16, 0x00, 0x90, 0x00, 
+-	0xb0, 0x85, 0x20, 0x00, 0x90, 0x01, 0x9c, 0x06, 
+-	0x1d, 0xe6, 0x36, 0x05, 0xcc, 0x20, 0x07, 0xa8, 
+-	0x0f, 0x80, 0x06, 0x00, 0x16, 0x00, 0x90, 0x00, 
+-	0x08, 0xad, 0x3d, 0x03, 0xcc, 0x80, 0x08, 0xb8, 
+-	0x00, 0x80, 0x19, 0x86, 0xcc, 0x02, 0x91, 0x04, 
+-	0x99, 0x04, 0x08, 0x89, 0x91, 0x04, 0x20, 0x03, 
+-	0x05, 0x80, 0x21, 0x35, 0x06, 0x49, 0x60, 0x08, 
+-	0x48, 0x46, 0x68, 0x01, 0x08, 0x89, 0x00, 0x89, 
+-	0x60, 0x01, 0x48, 0x45, 0x90, 0x03, 0x20, 0x00, 
+-	0x90, 0x02, 0x98, 0x02, 0x42, 0xa8, 0xd3, 0x04, 
+-	0xe0, 0x08, 0x98, 0x02, 0x30, 0x01, 0x90, 0x02, 
+-	0xe7, 0xf7, 0xcc, 0x02, 0x98, 0x03, 0xc0, 0x02, 
+-	0x90, 0x03, 0xe7, 0xf6, 0x98, 0x00, 0x28, 0x00, 
+-	0xd0, 0x03, 0xcc, 0x02, 0x98, 0x03, 0xc0, 0x02, 
+-	0x90, 0x03, 0x20, 0x00, 0x49, 0x39, 0x65, 0x88, 
+-	0x9f, 0x04, 0x2f, 0x00, 0xd8, 0x02, 0xe0, 0x05, 
+-	0x3f, 0x01, 0xe7, 0xfa, 0xce, 0x02, 0x48, 0x35, 
+-	0x64, 0x81, 0xe7, 0xf9, 0x20, 0x00, 0x49, 0x34, 
+-	0x60, 0x48, 0x20, 0x00, 0x21, 0x35, 0x06, 0x49, 
+-	0x60, 0x08, 0x20, 0x00, 0x49, 0x2f, 0x66, 0x88, 
+-	0x20, 0x00, 0x21, 0x35, 0x06, 0x49, 0x61, 0x88, 
+-	0x20, 0x01, 0x49, 0x2c, 0x64, 0xc8, 0x48, 0x2c, 
+-	0x68, 0x40, 0x28, 0x00, 0xd1, 0x0e, 0x27, 0x00, 
+-	0x2f, 0x64, 0xd3, 0x02, 0xe0, 0x02, 0x37, 0x01, 
+-	0xe7, 0xfa, 0xe7, 0xfc, 0x98, 0x01, 0x1c, 0x41, 
+-	0x91, 0x01, 0x4b, 0x26, 0x42, 0x98, 0xdb, 0x00, 
+-	0xe0, 0x00, 0xe7, 0xec, 0x48, 0x24, 0x68, 0x01, 
+-	0x23, 0x01, 0x43, 0x19, 0x60, 0x01, 0x48, 0x23, 
+-	0x68, 0x00, 0x28, 0x00, 0xd0, 0x03, 0x48, 0x21, 
+-	0x68, 0x40, 0x28, 0x00, 0xd1, 0x0b, 0x48, 0x20, 
+-	0x68, 0x40, 0x4b, 0x19, 0x18, 0xc0, 0x49, 0x1d, 
+-	0x60, 0x08, 0x48, 0x1d, 0x68, 0x80, 0x4b, 0x16, 
+-	0x18, 0xc0, 0x49, 0x1a, 0x60, 0x48, 0x48, 0x19, 
+-	0x68, 0x00, 0x21, 0x33, 0x06, 0x49, 0x65, 0x48, 
+-	0x48, 0x16, 0x68, 0x40, 0x21, 0x33, 0x06, 0x49, 
+-	0x65, 0x88, 0x48, 0x14, 0x68, 0x40, 0x21, 0x33, 
+-	0x06, 0x49, 0x66, 0x88, 0x48, 0x11, 0x68, 0x00, 
+-	0x21, 0x33, 0x06, 0x49, 0x66, 0x48, 0x20, 0x03, 
+-	0x21, 0x33, 0x06, 0x49, 0x67, 0x08, 0x20, 0x00, 
+-	0x49, 0x0e, 0x68, 0x09, 0x70, 0x08, 0x21, 0x00, 
+-	0x20, 0x0d, 0xf7, 0xff, 0xfe, 0x2d, 0xb0, 0x05, 
+-	0xb0, 0x01, 0xb0, 0x02, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x66, 0x00, 0x00, 0x70, 
+-	0xcc, 0x00, 0x00, 0x00, 0x6a, 0x00, 0x00, 0x80, 
+-	0xcc, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x27, 0x10, 
+-	0x6a, 0x00, 0x00, 0x10, 0x2e, 0x08, 0x7c, 0x1c, 
+-	0xcc, 0x00, 0x0f, 0x80, 0x2e, 0x08, 0x94, 0xa4, 
+-	0x1c, 0x01, 0xb0, 0x81, 0x48, 0x27, 0x22, 0x00, 
+-	0x92, 0x00, 0x9a, 0x00, 0x2a, 0x16, 0xdb, 0x04, 
+-	0xe0, 0x09, 0x9a, 0x00, 0x32, 0x01, 0x92, 0x00, 
+-	0xe7, 0xf7, 0x68, 0x02, 0x9b, 0x00, 0x00, 0x9b, 
+-	0x50, 0xca, 0x30, 0x04, 0xe7, 0xf5, 0x48, 0x20, 
+-	0x22, 0x00, 0x92, 0x00, 0x9a, 0x00, 0x2a, 0x0b, 
+-	0xdb, 0x04, 0xe0, 0x0a, 0x9a, 0x00, 0x32, 0x01, 
+-	0x92, 0x00, 0xe7, 0xf7, 0x68, 0x03, 0x9a, 0x00, 
+-	0x00, 0x92, 0x18, 0x52, 0x65, 0x93, 0x30, 0x04, 
+-	0xe7, 0xf4, 0x48, 0x18, 0x22, 0x00, 0x92, 0x00, 
+-	0x9a, 0x00, 0x2a, 0x11, 0xdb, 0x04, 0xe0, 0x0b, 
+-	0x9a, 0x00, 0x32, 0x01, 0x92, 0x00, 0xe7, 0xf7, 
+-	0x68, 0x03, 0x9a, 0x00, 0x00, 0x92, 0x18, 0x52, 
+-	0x32, 0x80, 0x60, 0x53, 0x30, 0x04, 0xe7, 0xf3, 
+-	0x48, 0x0f, 0x22, 0x02, 0x92, 0x00, 0x9a, 0x00, 
+-	0x2a, 0x05, 0xdb, 0x04, 0xe0, 0x0b, 0x9a, 0x00, 
+-	0x32, 0x01, 0x92, 0x00, 0xe7, 0xf7, 0x68, 0x02, 
+-	0x9b, 0x00, 0x00, 0x9b, 0x18, 0x5b, 0x33, 0x80, 
+-	0x60, 0x5a, 0x30, 0x04, 0xe7, 0xf3, 0x4a, 0x07, 
+-	0x6c, 0x12, 0x1d, 0xcb, 0x33, 0x79, 0x61, 0xda, 
+-	0xb0, 0x01, 0x47, 0x70, 0xcc, 0x00, 0x05, 0x20, 
+-	0xcc, 0x00, 0x0c, 0x00, 0xcc, 0x00, 0x0c, 0x5c, 
+-	0xcc, 0x00, 0x0c, 0xa0, 0xcc, 0x00, 0x0c, 0x80, 
+-	0xb4, 0xf0, 0x1c, 0x06, 0x1c, 0x0f, 0x1c, 0x14, 
+-	0x1c, 0x1d, 0x06, 0x29, 0x0e, 0x09, 0x2c, 0x1f, 
+-	0xdb, 0x02, 0x20, 0xaf, 0xbc, 0xf0, 0x47, 0x70, 
+-	0x4b, 0x0b, 0x40, 0x1f, 0x48, 0x0b, 0x68, 0x00, 
+-	0x60, 0x06, 0x29, 0x01, 0xd1, 0x07, 0x48, 0x0a, 
+-	0x68, 0x02, 0x43, 0x3a, 0x60, 0x02, 0x20, 0x80, 
+-	0x6e, 0x00, 0x60, 0x04, 0xe0, 0x05, 0x29, 0x02, 
+-	0xd1, 0x03, 0x48, 0x05, 0x68, 0x02, 0x43, 0xba, 
+-	0x60, 0x02, 0x20, 0x00, 0xe7, 0xe6, 0xe7, 0xe5, 
+-	0xff, 0xff, 0xf8, 0xff, 0x2e, 0x08, 0x60, 0x74, 
+-	0xcc, 0x00, 0x02, 0x20, 0xb5, 0xf3, 0xb0, 0x81, 
+-	0x98, 0x01, 0x06, 0x00, 0x0e, 0x00, 0x90, 0x00, 
+-	0x99, 0x02, 0x06, 0x0e, 0x0e, 0x36, 0x48, 0x1a, 
+-	0x6f, 0x00, 0x23, 0x02, 0x40, 0x18, 0xd0, 0x0d, 
+-	0x20, 0x33, 0x06, 0x40, 0x6d, 0x80, 0x21, 0x33, 
+-	0x06, 0x49, 0x6d, 0x49, 0x1a, 0x41, 0x48, 0x14, 
+-	0x6d, 0xc0, 0x4a, 0x13, 0x6d, 0x92, 0x1a, 0x80, 
+-	0x18, 0x0d, 0xe0, 0x06, 0x20, 0x33, 0x06, 0x40, 
+-	0x6d, 0x80, 0x21, 0x33, 0x06, 0x49, 0x6d, 0x49, 
+-	0x1a, 0x45, 0x98, 0x00, 0x43, 0x68, 0x1c, 0x01, 
+-	0x20, 0x64, 0xf0, 0x07, 0xfb, 0x43, 0x1c, 0x04, 
+-	0x43, 0x6e, 0x1c, 0x31, 0x20, 0x64, 0xf0, 0x07, 
+-	0xfb, 0x3d, 0x1c, 0x07, 0x08, 0xa4, 0x00, 0xa4, 
+-	0x08, 0xbf, 0x00, 0xbf, 0x48, 0x05, 0x64, 0x84, 
+-	0x48, 0x04, 0x64, 0xc7, 0xb0, 0x01, 0xb0, 0x02, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x66, 0x00, 0x00, 0x80, 0xcc, 0x00, 0x0c, 0x80, 
+-	0xb5, 0xf7, 0x9a, 0x02, 0x06, 0x15, 0x0e, 0x2d, 
+-	0xb0, 0x82, 0x27, 0x00, 0x2d, 0x1f, 0xdb, 0x05, 
+-	0x20, 0xaf, 0xb0, 0x02, 0xb0, 0x03, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2f, 0x00, 0xd1, 0x0d, 
+-	0x48, 0x19, 0x69, 0x80, 0x28, 0x00, 0xd0, 0x00, 
+-	0xe7, 0xfa, 0x20, 0x02, 0x49, 0x16, 0x61, 0x88, 
+-	0x48, 0x15, 0x69, 0x80, 0x28, 0x02, 0xd1, 0x00, 
+-	0x27, 0xff, 0xe7, 0xef, 0x4c, 0x13, 0x94, 0x00, 
+-	0x20, 0x01, 0x02, 0x40, 0x90, 0x01, 0x22, 0x00, 
+-	0x99, 0x03, 0xb4, 0x06, 0x06, 0x2b, 0x16, 0x1b, 
+-	0x9a, 0x03, 0x99, 0x04, 0x1c, 0x20, 0xf0, 0x01, 
+-	0xff, 0x75, 0xb0, 0x02, 0x1c, 0x06, 0x2e, 0xd2, 
+-	0xd1, 0x06, 0x20, 0x00, 0x49, 0x08, 0x61, 0x88, 
+-	0x20, 0xd2, 0xb0, 0x02, 0xe7, 0xd2, 0xe0, 0x08, 
+-	0x20, 0x00, 0x99, 0x00, 0x60, 0x08, 0x20, 0x00, 
+-	0x49, 0x03, 0x61, 0x88, 0x20, 0x00, 0xb0, 0x02, 
+-	0xe7, 0xc8, 0xb0, 0x02, 0xe7, 0xc6, 0x00, 0x00, 
+-	0xcc, 0x00, 0x0f, 0x80, 0xcc, 0x00, 0x06, 0x00, 
+-	0xb5, 0xff, 0x9f, 0x09, 0xb0, 0x81, 0x9b, 0x01, 
+-	0x06, 0x18, 0x0e, 0x00, 0x9b, 0x02, 0x06, 0x19, 
+-	0x0e, 0x09, 0x9b, 0x03, 0x06, 0x1b, 0x0e, 0x1b, 
+-	0x93, 0x00, 0x9b, 0x04, 0x06, 0x1a, 0x0e, 0x12, 
+-	0x06, 0x3d, 0x0e, 0x2d, 0x2d, 0x01, 0xd1, 0x07, 
+-	0x4c, 0x1c, 0x68, 0x26, 0x23, 0x01, 0x02, 0x9b, 
+-	0x43, 0x9e, 0x1c, 0x33, 0x60, 0x23, 0xe0, 0x07, 
+-	0x2d, 0x02, 0xd1, 0x05, 0x4c, 0x17, 0x68, 0x26, 
+-	0x23, 0x01, 0x02, 0x9b, 0x43, 0x33, 0x60, 0x23, 
+-	0x28, 0x00, 0xd1, 0x03, 0x23, 0x00, 0x4c, 0x14, 
+-	0x61, 0xe3, 0xe0, 0x04, 0x28, 0x01, 0xd1, 0x02, 
+-	0x23, 0x01, 0x4c, 0x11, 0x61, 0xe3, 0x29, 0x00, 
+-	0xd1, 0x03, 0x23, 0x00, 0x4c, 0x0e, 0x65, 0xa3, 
+-	0xe0, 0x04, 0x29, 0x01, 0xd1, 0x02, 0x23, 0x01, 
+-	0x4c, 0x0b, 0x65, 0xa3, 0x2a, 0x00, 0xd1, 0x03, 
+-	0x23, 0x02, 0x4c, 0x09, 0x66, 0xe3, 0xe0, 0x04, 
+-	0x2a, 0x01, 0xd1, 0x02, 0x23, 0x03, 0x4c, 0x06, 
+-	0x66, 0xe3, 0x9b, 0x00, 0x4c, 0x04, 0x67, 0x23, 
+-	0xb0, 0x01, 0xb0, 0x04, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0xcc, 0x00, 0x02, 0x20, 
+-	0xcc, 0x00, 0x0f, 0x80, 0xb5, 0xf0, 0x1c, 0x05, 
+-	0x1c, 0x0c, 0x1c, 0x17, 0x06, 0x2e, 0x0e, 0x36, 
+-	0xb0, 0x84, 0x48, 0x15, 0x68, 0x00, 0x28, 0x00, 
+-	0xd0, 0x04, 0x20, 0x39, 0xb0, 0x04, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x01, 0xd1, 0x0a, 
+-	0x94, 0x00, 0x97, 0x01, 0x48, 0x0f, 0x90, 0x02, 
+-	0x48, 0x0f, 0x90, 0x03, 0x46, 0x68, 0x21, 0x01, 
+-	0xf0, 0x00, 0xfd, 0x1a, 0xe0, 0x0f, 0x20, 0x00, 
+-	0x90, 0x00, 0x20, 0x00, 0x90, 0x01, 0x48, 0x09, 
+-	0x90, 0x02, 0x48, 0x09, 0x90, 0x03, 0x46, 0x68, 
+-	0x21, 0x01, 0xf0, 0x00, 0xfd, 0x0d, 0x21, 0x00, 
+-	0x20, 0x02, 0xf7, 0xff, 0xfc, 0x85, 0x20, 0x00, 
+-	0xb0, 0x04, 0xe7, 0xdc, 0xb0, 0x04, 0xe7, 0xda, 
+-	0x2e, 0x08, 0x7c, 0xbc, 0x00, 0x00, 0x02, 0xcf, 
+-	0x00, 0x00, 0x02, 0x3f, 0xb4, 0xb0, 0x1c, 0x05, 
+-	0x1c, 0x0c, 0x1c, 0x17, 0x48, 0x14, 0x6c, 0x00, 
+-	0x1c, 0x01, 0x48, 0x13, 0x6f, 0x80, 0x23, 0x09, 
+-	0x01, 0x9b, 0x42, 0x98, 0xd1, 0x12, 0x20, 0x02, 
+-	0x40, 0x20, 0xd0, 0x0c, 0x2d, 0x02, 0xd1, 0x0a, 
+-	0x2f, 0x03, 0xd1, 0x00, 0x31, 0x04, 0x2f, 0x03, 
+-	0xd2, 0x05, 0x07, 0xe0, 0x0f, 0xc0, 0xd0, 0x01, 
+-	0x31, 0x05, 0xe0, 0x00, 0x31, 0x08, 0x2d, 0x02, 
+-	0xd9, 0x00, 0x21, 0x12, 0x00, 0x48, 0x18, 0x40, 
+-	0x30, 0x01, 0x10, 0x40, 0x21, 0x2d, 0x02, 0x09, 
+-	0x43, 0x41, 0x48, 0x03, 0x69, 0x40, 0x18, 0x09, 
+-	0x1c, 0x08, 0xbc, 0xb0, 0x47, 0x70, 0xe7, 0xfc, 
+-	0xcc, 0x00, 0x0f, 0x80, 0x48, 0x07, 0x6a, 0xc0, 
+-	0x1c, 0x01, 0x00, 0x48, 0x18, 0x40, 0x30, 0x01, 
+-	0x10, 0x40, 0x21, 0x2d, 0x02, 0x09, 0x43, 0x41, 
+-	0x48, 0x03, 0x69, 0x40, 0x18, 0x09, 0x1c, 0x08, 
+-	0x47, 0x70, 0xe7, 0xfd, 0xcc, 0x00, 0x00, 0x00, 
+-	0xcc, 0x00, 0x0f, 0x80, 0x48, 0x07, 0x68, 0x80, 
+-	0x28, 0x00, 0xd1, 0x03, 0x48, 0x06, 0x69, 0x00, 
+-	0x1c, 0x01, 0xe0, 0x02, 0x48, 0x04, 0x68, 0xc0, 
+-	0x1c, 0x01, 0x4b, 0x02, 0x18, 0xc9, 0x1c, 0x08, 
+-	0x47, 0x70, 0xe7, 0xfd, 0xcc, 0x00, 0x00, 0x00, 
+-	0xcc, 0x00, 0x0f, 0x80, 0xb5, 0x90, 0x1c, 0x04, 
+-	0x1c, 0x0f, 0x48, 0x06, 0x6c, 0x40, 0x60, 0x20, 
+-	0x48, 0x04, 0x6c, 0x80, 0x60, 0x38, 0xf7, 0xff, 
+-	0xff, 0xe1, 0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 
+-	0xe7, 0xfb, 0x00, 0x00, 0xcc, 0x00, 0x02, 0x00, 
+-	0xb5, 0xf0, 0x1c, 0x05, 0x1c, 0x0c, 0x1c, 0x17, 
+-	0xf7, 0xff, 0xff, 0xd4, 0x1c, 0x06, 0x2d, 0x00, 
+-	0xd0, 0x01, 0x2c, 0x00, 0xd1, 0x03, 0x20, 0x3a, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x08, 0x78, 
+-	0x00, 0x40, 0xd0, 0x01, 0x20, 0x3a, 0xe7, 0xf7, 
+-	0x20, 0x00, 0x49, 0x0d, 0x66, 0x88, 0x48, 0x0d, 
+-	0x68, 0x01, 0x23, 0x12, 0x43, 0x19, 0x60, 0x01, 
+-	0x48, 0x0b, 0x63, 0x45, 0x48, 0x0a, 0x63, 0x84, 
+-	0x20, 0x01, 0x49, 0x09, 0x62, 0x48, 0x48, 0x09, 
+-	0x68, 0x01, 0x23, 0x01, 0x40, 0x59, 0x60, 0x01, 
+-	0x48, 0x05, 0x63, 0xc7, 0x48, 0x02, 0x60, 0x46, 
+-	0x20, 0x00, 0xe7, 0xdd, 0xe7, 0xdc, 0x00, 0x00, 
+-	0xcc, 0x00, 0x00, 0x00, 0xcc, 0x00, 0x0f, 0x48, 
+-	0xcc, 0x00, 0x00, 0x80, 0xcc, 0x00, 0x00, 0x08, 
+-	0xb4, 0xf0, 0x1c, 0x07, 0x1c, 0x0c, 0x1c, 0x16, 
+-	0x1c, 0x1d, 0x48, 0x10, 0x6a, 0x00, 0x28, 0x10, 
+-	0xd0, 0x02, 0x20, 0x3b, 0xbc, 0xf0, 0x47, 0x70, 
+-	0x48, 0x0d, 0x68, 0x00, 0x60, 0x38, 0x68, 0x38, 
+-	0x4b, 0x0b, 0x18, 0xc0, 0x60, 0x38, 0x48, 0x0b, 
+-	0x6b, 0x40, 0x60, 0x30, 0x48, 0x09, 0x6b, 0x80, 
+-	0x60, 0x28, 0x48, 0x09, 0x6c, 0x80, 0x23, 0x10, 
+-	0x40, 0x18, 0xd0, 0x02, 0x20, 0x02, 0x60, 0x20, 
+-	0xe0, 0x01, 0x20, 0x01, 0x60, 0x20, 0x20, 0x00, 
+-	0xe7, 0xe4, 0xe7, 0xe3, 0xcc, 0x00, 0x05, 0x00, 
+-	0xcc, 0x00, 0x00, 0x00, 0xcc, 0x00, 0x00, 0x80, 
+-	0xcc, 0x00, 0x0f, 0x00, 0xb4, 0xf0, 0x1c, 0x05, 
+-	0x1c, 0x0c, 0x1c, 0x17, 0x06, 0x2a, 0x0e, 0x12, 
+-	0x06, 0x21, 0x0e, 0x09, 0x2f, 0x00, 0xd1, 0x30, 
+-	0xb0, 0x81, 0x46, 0x6f, 0x2a, 0x00, 0xd0, 0x06, 
+-	0x2a, 0x08, 0xd0, 0x0d, 0x2a, 0x10, 0xd0, 0x14, 
+-	0x2a, 0x18, 0xd0, 0x1b, 0xe0, 0x23, 0x20, 0x00, 
+-	0x70, 0x38, 0x20, 0x00, 0x70, 0x78, 0x20, 0x0c, 
+-	0x70, 0xb8, 0x20, 0x00, 0x70, 0xf8, 0xe0, 0x1b, 
+-	0x20, 0x00, 0x70, 0x38, 0x20, 0x08, 0x70, 0x78, 
+-	0x20, 0x1c, 0x70, 0xb8, 0x20, 0x00, 0x70, 0xf8, 
+-	0xe0, 0x12, 0x20, 0x00, 0x70, 0x38, 0x20, 0x10, 
+-	0x70, 0x78, 0x20, 0x0c, 0x70, 0xb8, 0x20, 0x00, 
+-	0x70, 0xf8, 0xe0, 0x09, 0x20, 0x00, 0x70, 0x38, 
+-	0x20, 0x18, 0x70, 0x78, 0x20, 0x1c, 0x70, 0xb8, 
+-	0x20, 0x00, 0x70, 0xf8, 0xe0, 0x00, 0xe7, 0xff, 
+-	0xb0, 0x01, 0x23, 0x00, 0x56, 0xf8, 0x23, 0x39, 
+-	0x06, 0x5b, 0x60, 0x18, 0x23, 0x01, 0x56, 0xf8, 
+-	0x23, 0x39, 0x06, 0x5b, 0x61, 0xd8, 0x29, 0x00, 
+-	0xd1, 0x06, 0x48, 0x0e, 0x68, 0x06, 0x23, 0x20, 
+-	0x43, 0x9e, 0x1c, 0x33, 0x60, 0x03, 0xe0, 0x06, 
+-	0x29, 0x20, 0xd1, 0x04, 0x48, 0x09, 0x68, 0x06, 
+-	0x23, 0x20, 0x43, 0x33, 0x60, 0x03, 0x23, 0x02, 
+-	0x56, 0xf8, 0x23, 0x39, 0x06, 0x5b, 0x60, 0x58, 
+-	0x23, 0x03, 0x56, 0xf8, 0x4b, 0x04, 0x63, 0x18, 
+-	0x20, 0x00, 0x23, 0x39, 0x06, 0x5b, 0x64, 0x98, 
+-	0xbc, 0xf0, 0x47, 0x70, 0x72, 0x00, 0x00, 0x1c, 
+-	0x72, 0x00, 0x01, 0x00, 0xb4, 0xb0, 0x1c, 0x07, 
+-	0x1c, 0x0d, 0x1c, 0x14, 0x06, 0x29, 0x0e, 0x09, 
+-	0x06, 0x22, 0x0e, 0x12, 0xb0, 0x84, 0x29, 0x33, 
+-	0xdc, 0x01, 0x2a, 0x0f, 0xdd, 0x03, 0x20, 0xff, 
+-	0xb0, 0x04, 0xbc, 0xb0, 0x47, 0x70, 0x20, 0x39, 
+-	0x06, 0x40, 0x63, 0x41, 0x20, 0x10, 0x43, 0x10, 
+-	0x23, 0x39, 0x06, 0x5b, 0x63, 0x98, 0x20, 0x39, 
+-	0x06, 0x40, 0x68, 0x00, 0x90, 0x03, 0x98, 0x03, 
+-	0x23, 0x9c, 0x43, 0xdb, 0x40, 0x18, 0x90, 0x03, 
+-	0x20, 0x39, 0x06, 0x40, 0x68, 0x40, 0x90, 0x01, 
+-	0x98, 0x01, 0x23, 0x20, 0x43, 0xdb, 0x40, 0x18, 
+-	0x90, 0x01, 0x06, 0x38, 0x0e, 0x00, 0xd0, 0x29, 
+-	0x20, 0x10, 0x40, 0x38, 0xd0, 0x03, 0x98, 0x03, 
+-	0x23, 0x80, 0x43, 0x18, 0x90, 0x03, 0x20, 0x08, 
+-	0x40, 0x38, 0xd0, 0x03, 0x98, 0x03, 0x23, 0x10, 
+-	0x43, 0x18, 0x90, 0x03, 0x20, 0x04, 0x40, 0x38, 
+-	0xd0, 0x04, 0x98, 0x03, 0x23, 0x08, 0x43, 0x18, 
+-	0x90, 0x03, 0xe0, 0x0c, 0x20, 0x02, 0x40, 0x38, 
+-	0xd0, 0x04, 0x98, 0x03, 0x23, 0x0c, 0x43, 0x18, 
+-	0x90, 0x03, 0xe0, 0x04, 0x98, 0x03, 0x23, 0x0c, 
+-	0x43, 0xdb, 0x40, 0x18, 0x90, 0x03, 0x20, 0x20, 
+-	0x40, 0x38, 0xd0, 0x03, 0x98, 0x01, 0x23, 0x20, 
+-	0x43, 0x18, 0x90, 0x01, 0x98, 0x03, 0x23, 0x39, 
+-	0x06, 0x5b, 0x60, 0x18, 0x98, 0x01, 0x23, 0x39, 
+-	0x06, 0x5b, 0x60, 0x58, 0x20, 0x39, 0x06, 0x40, 
+-	0x6a, 0x00, 0x90, 0x00, 0x98, 0x00, 0x23, 0xf0, 
+-	0x43, 0xdb, 0x43, 0x18, 0x90, 0x00, 0x20, 0xff, 
+-	0x02, 0x00, 0x40, 0x38, 0xd0, 0x27, 0x20, 0xff, 
+-	0x30, 0x01, 0x40, 0x38, 0xd0, 0x03, 0x98, 0x00, 
+-	0x23, 0xfe, 0x40, 0x18, 0x90, 0x00, 0x20, 0x01, 
+-	0x02, 0x40, 0x40, 0x38, 0xd0, 0x03, 0x98, 0x00, 
+-	0x23, 0xfd, 0x40, 0x18, 0x90, 0x00, 0x20, 0x01, 
+-	0x02, 0x80, 0x40, 0x38, 0xd0, 0x03, 0x98, 0x00, 
+-	0x23, 0xfb, 0x40, 0x18, 0x90, 0x00, 0x20, 0x01, 
+-	0x02, 0xc0, 0x40, 0x38, 0xd0, 0x03, 0x98, 0x00, 
+-	0x23, 0xf7, 0x40, 0x18, 0x90, 0x00, 0x20, 0x01, 
+-	0x03, 0x00, 0x40, 0x38, 0xd0, 0x03, 0x98, 0x00, 
+-	0x23, 0xf0, 0x40, 0x18, 0x90, 0x00, 0x98, 0x00, 
+-	0x23, 0x39, 0x06, 0x5b, 0x62, 0x18, 0x20, 0x39, 
+-	0x06, 0x40, 0x69, 0xc0, 0x90, 0x02, 0x98, 0x02, 
+-	0x08, 0x40, 0x00, 0x40, 0x90, 0x02, 0x20, 0x39, 
+-	0x06, 0x40, 0x6a, 0xc0, 0x90, 0x00, 0x98, 0x00, 
+-	0x23, 0x1c, 0x43, 0xdb, 0x40, 0x18, 0x90, 0x00, 
+-	0x20, 0x39, 0x06, 0x40, 0x6b, 0x80, 0x90, 0x03, 
+-	0x98, 0x03, 0x23, 0x10, 0x43, 0xdb, 0x40, 0x18, 
+-	0x90, 0x03, 0x20, 0x39, 0x06, 0x40, 0x6b, 0xc0, 
+-	0x90, 0x01, 0x98, 0x01, 0x09, 0x00, 0x01, 0x00, 
+-	0x90, 0x01, 0x48, 0x4a, 0x40, 0x38, 0xd0, 0x45, 
+-	0x20, 0x01, 0x04, 0x00, 0x40, 0x38, 0xd0, 0x03, 
+-	0x98, 0x02, 0x23, 0x01, 0x43, 0x18, 0x90, 0x02, 
+-	0x20, 0x01, 0x05, 0xc0, 0x40, 0x38, 0xd0, 0x03, 
+-	0x98, 0x00, 0x23, 0x10, 0x43, 0x18, 0x90, 0x00, 
+-	0x20, 0x07, 0x04, 0x40, 0x40, 0x38, 0x23, 0x01, 
+-	0x04, 0x5b, 0x42, 0x98, 0xd0, 0x08, 0x23, 0x01, 
+-	0x04, 0x9b, 0x42, 0x98, 0xd0, 0x07, 0x23, 0x01, 
+-	0x04, 0xdb, 0x42, 0x98, 0xd0, 0x08, 0xe0, 0x0c, 
+-	0x98, 0x00, 0x90, 0x00, 0xe0, 0x0a, 0x98, 0x00, 
+-	0x23, 0x04, 0x43, 0x18, 0x90, 0x00, 0xe0, 0x05, 
+-	0x98, 0x00, 0x23, 0x0c, 0x43, 0x18, 0x90, 0x00, 
+-	0xe0, 0x00, 0xe7, 0xff, 0x20, 0x01, 0x05, 0x80, 
+-	0x40, 0x38, 0xd0, 0x03, 0x98, 0x03, 0x23, 0x10, 
+-	0x43, 0x18, 0x90, 0x03, 0x20, 0x01, 0x05, 0x00, 
+-	0x40, 0x38, 0xd0, 0x03, 0x98, 0x01, 0x23, 0x08, 
+-	0x43, 0x18, 0x90, 0x01, 0x20, 0x01, 0x05, 0x40, 
+-	0x40, 0x38, 0xd0, 0x03, 0x98, 0x01, 0x23, 0x07, 
+-	0x43, 0x18, 0x90, 0x01, 0x98, 0x03, 0x23, 0x39, 
+-	0x06, 0x5b, 0x63, 0x98, 0x98, 0x02, 0x23, 0x39, 
+-	0x06, 0x5b, 0x61, 0xd8, 0x98, 0x01, 0x23, 0x39, 
+-	0x06, 0x5b, 0x63, 0xd8, 0x98, 0x00, 0x23, 0x39, 
+-	0x06, 0x5b, 0x62, 0xd8, 0x20, 0x39, 0x06, 0x40, 
+-	0x68, 0x80, 0x90, 0x03, 0x98, 0x03, 0x08, 0x80, 
+-	0x00, 0x80, 0x90, 0x03, 0x0f, 0x38, 0x07, 0x00, 
+-	0xd0, 0x26, 0x20, 0x01, 0x07, 0x00, 0x40, 0x38, 
+-	0x23, 0x01, 0x07, 0x1b, 0x42, 0x98, 0xd1, 0x04, 
+-	0x98, 0x03, 0x23, 0x02, 0x43, 0x18, 0x90, 0x03, 
+-	0xe0, 0x07, 0x20, 0x00, 0x42, 0x80, 0xd1, 0x04, 
+-	0x98, 0x03, 0x23, 0x02, 0x43, 0xdb, 0x40, 0x18, 
+-	0x90, 0x03, 0x20, 0x01, 0x07, 0x40, 0x40, 0x38, 
+-	0x23, 0x01, 0x07, 0x5b, 0x42, 0x98, 0xd1, 0x04, 
+-	0x98, 0x03, 0x23, 0x01, 0x43, 0x18, 0x90, 0x03, 
+-	0xe0, 0x06, 0x20, 0x00, 0x42, 0x80, 0xd1, 0x03, 
+-	0x98, 0x03, 0x08, 0x40, 0x00, 0x40, 0x90, 0x03, 
+-	0x98, 0x03, 0x23, 0x39, 0x06, 0x5b, 0x60, 0x98, 
+-	0x20, 0x00, 0xb0, 0x04, 0xe6, 0xc1, 0xb0, 0x04, 
+-	0xe6, 0xbf, 0x00, 0x00, 0x0f, 0xff, 0x00, 0x00, 
+-	0x48, 0x02, 0x69, 0xc0, 0x06, 0x00, 0x16, 0x00, 
+-	0x47, 0x70, 0xe7, 0xfd, 0x72, 0x00, 0x01, 0x00, 
+-	0xb5, 0xf7, 0x1c, 0x04, 0x1c, 0x0f, 0x06, 0x23, 
+-	0x16, 0x18, 0x06, 0x3b, 0x16, 0x19, 0x9b, 0x02, 
+-	0x06, 0x1a, 0x0e, 0x12, 0x2a, 0x00, 0xd1, 0x0b, 
+-	0x23, 0x39, 0x06, 0x5b, 0x60, 0xd8, 0x23, 0x39, 
+-	0x06, 0x5b, 0x61, 0x19, 0x4d, 0x0b, 0x68, 0x2e, 
+-	0x23, 0x01, 0x43, 0x33, 0x60, 0x2b, 0xe0, 0x0c, 
+-	0x2a, 0x01, 0xd1, 0x0a, 0x23, 0x39, 0x06, 0x5b, 
+-	0x61, 0x58, 0x23, 0x39, 0x06, 0x5b, 0x61, 0x99, 
+-	0x4d, 0x04, 0x68, 0x2e, 0x23, 0x02, 0x43, 0x33, 
+-	0x60, 0x2b, 0xb0, 0x03, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x72, 0x00, 0x00, 0x08, 
+-	0xb4, 0x90, 0x1c, 0x01, 0x20, 0x92, 0x4b, 0x4b, 
+-	0x60, 0x18, 0x20, 0x92, 0x4b, 0x4a, 0x60, 0x18, 
+-	0x20, 0x10, 0x4b, 0x4a, 0x60, 0x18, 0x20, 0x00, 
+-	0x4b, 0x48, 0x60, 0x58, 0x48, 0x48, 0x4b, 0x47, 
+-	0x60, 0x98, 0x22, 0x00, 0x2a, 0x10, 0xdb, 0x02, 
+-	0xe0, 0x07, 0x32, 0x01, 0xe7, 0xfa, 0x20, 0x00, 
+-	0x43, 0xc0, 0x00, 0x93, 0x4c, 0x42, 0x50, 0xe0, 
+-	0xe7, 0xf7, 0x20, 0x00, 0x43, 0xc0, 0x00, 0x93, 
+-	0x4c, 0x3f, 0x50, 0xe0, 0x22, 0x00, 0x2a, 0x08, 
+-	0xdb, 0x02, 0xe0, 0x08, 0x32, 0x01, 0xe7, 0xfa, 
+-	0x20, 0x00, 0x43, 0xc0, 0x00, 0x94, 0x4b, 0x3b, 
+-	0x18, 0xe3, 0x64, 0x18, 0xe7, 0xf6, 0x22, 0x00, 
+-	0x2a, 0x20, 0xdb, 0x02, 0xe0, 0x08, 0x32, 0x01, 
+-	0xe7, 0xfa, 0x20, 0x00, 0x43, 0xc0, 0x00, 0x94, 
+-	0x4b, 0x35, 0x18, 0xe3, 0x60, 0x18, 0xe7, 0xf6, 
+-	0x22, 0x00, 0x2a, 0x19, 0xdb, 0x02, 0xe0, 0x06, 
+-	0x32, 0x01, 0xe7, 0xfa, 0x20, 0x00, 0x00, 0x93, 
+-	0x4c, 0x30, 0x50, 0xe0, 0xe7, 0xf8, 0x20, 0x00, 
+-	0x4b, 0x2f, 0x60, 0x18, 0x20, 0x39, 0x06, 0x40, 
+-	0x69, 0xc0, 0x27, 0x18, 0x40, 0x07, 0x2f, 0x00, 
+-	0xd0, 0x03, 0x48, 0x2c, 0x4b, 0x2c, 0x60, 0x18, 
+-	0xe0, 0x03, 0x20, 0xff, 0x30, 0xe0, 0x4b, 0x2a, 
+-	0x60, 0x18, 0x20, 0x00, 0x4b, 0x29, 0x60, 0x18, 
+-	0x20, 0x00, 0x4b, 0x28, 0x60, 0x58, 0x48, 0x28, 
+-	0x4b, 0x26, 0x60, 0x98, 0x48, 0x24, 0x68, 0x00, 
+-	0x4b, 0x24, 0x60, 0xd8, 0x48, 0x25, 0x60, 0x01, 
+-	0x20, 0x0d, 0x06, 0xc0, 0x61, 0xc1, 0x20, 0x05, 
+-	0x02, 0x00, 0x23, 0x0d, 0x06, 0xdb, 0x60, 0x18, 
+-	0x48, 0x21, 0x23, 0x0d, 0x06, 0xdb, 0x60, 0x58, 
+-	0x48, 0x1f, 0x4b, 0x16, 0x63, 0x98, 0x20, 0x00, 
+-	0x23, 0x0d, 0x06, 0xdb, 0x60, 0x98, 0x20, 0x00, 
+-	0x23, 0x0d, 0x06, 0xdb, 0x61, 0x18, 0x48, 0x1b, 
+-	0x23, 0x0d, 0x06, 0xdb, 0x61, 0x98, 0x20, 0x01, 
+-	0x23, 0x0d, 0x06, 0xdb, 0x60, 0xd8, 0x48, 0x18, 
+-	0x23, 0x0d, 0x06, 0xdb, 0x63, 0x18, 0x48, 0x17, 
+-	0x23, 0x0d, 0x06, 0xdb, 0x63, 0x58, 0x20, 0x00, 
+-	0x4b, 0x15, 0x60, 0x18, 0x48, 0x11, 0x4b, 0x15, 
+-	0x60, 0x18, 0x20, 0x00, 0xbc, 0x90, 0x47, 0x70, 
+-	0xe7, 0xfc, 0x00, 0x00, 0x2e, 0x08, 0x7c, 0xc4, 
+-	0x2e, 0x08, 0x7c, 0xc0, 0x2e, 0x08, 0x7d, 0x94, 
+-	0x2e, 0x08, 0x7c, 0xcc, 0x68, 0x00, 0x0d, 0x00, 
+-	0x68, 0x00, 0x04, 0x00, 0x2e, 0x08, 0x7c, 0x58, 
+-	0x2e, 0x08, 0x7c, 0xbc, 0x00, 0x00, 0x02, 0x3f, 
+-	0x2e, 0x08, 0x60, 0x80, 0x2e, 0x08, 0x7d, 0xa0, 
+-	0x00, 0x00, 0x02, 0xcf, 0x2e, 0x08, 0x60, 0x84, 
+-	0x00, 0xf0, 0x29, 0x6d, 0x3f, 0xff, 0xff, 0xff, 
+-	0x00, 0x80, 0x10, 0x80, 0x00, 0x80, 0xeb, 0x80, 
+-	0x2e, 0x08, 0x94, 0x84, 0x2e, 0x08, 0x5e, 0x4c, 
+-	0xb5, 0xff, 0xb0, 0x85, 0x20, 0x39, 0x06, 0x40, 
+-	0x69, 0xc0, 0x23, 0x18, 0x40, 0x18, 0x90, 0x00, 
+-	0x98, 0x00, 0x28, 0x00, 0xd0, 0x03, 0x48, 0x5a, 
+-	0x4b, 0x5a, 0x60, 0x18, 0xe0, 0x03, 0x20, 0xff, 
+-	0x30, 0xe0, 0x4b, 0x58, 0x60, 0x18, 0x9c, 0x06, 
+-	0x9f, 0x07, 0x22, 0x00, 0x21, 0x00, 0x98, 0x05, 
+-	0x38, 0x0c, 0x28, 0x06, 0xd2, 0x0c, 0xa3, 0x02, 
+-	0x5c, 0x1b, 0x00, 0x5b, 0x44, 0x9f, 0x1c, 0x00, 
+-	0x04, 0x03, 0x06, 0x04, 0x03, 0x06, 0x32, 0x01, 
+-	0x32, 0x01, 0xe0, 0x02, 0x3a, 0x01, 0xe0, 0x00, 
+-	0xe7, 0xff, 0x98, 0x05, 0x38, 0x0b, 0x28, 0x08, 
+-	0xd2, 0x15, 0xa3, 0x02, 0x5c, 0x1b, 0x00, 0x5b, 
+-	0x44, 0x9f, 0x1c, 0x00, 0x0a, 0x04, 0x04, 0x04, 
+-	0x0a, 0x0a, 0x0a, 0x04, 0x25, 0x2d, 0x01, 0x2d, 
+-	0x48, 0x44, 0x68, 0x00, 0x1c, 0x46, 0xe0, 0x0e, 
+-	0x48, 0x43, 0x6c, 0x40, 0x1c, 0x05, 0x48, 0x43, 
+-	0x68, 0x40, 0x1c, 0x06, 0xe0, 0x07, 0x21, 0xff, 
+-	0x1c, 0x08, 0xb0, 0x05, 0xb0, 0x04, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0xe7, 0xff, 0x2d, 0x00, 
+-	0xd0, 0x01, 0x2e, 0x00, 0xd1, 0x04, 0x25, 0x2d, 
+-	0x01, 0x2d, 0x48, 0x38, 0x68, 0x00, 0x1c, 0x46, 
+-	0x29, 0xff, 0xd1, 0x02, 0x1c, 0x08, 0xb0, 0x05, 
+-	0xe7, 0xec, 0x1e, 0x68, 0x90, 0x02, 0x1e, 0x70, 
+-	0x90, 0x01, 0x23, 0x01, 0x42, 0xda, 0xd1, 0x08, 
+-	0x42, 0x50, 0x40, 0x85, 0x1c, 0x2b, 0x1e, 0x5d, 
+-	0x42, 0x50, 0x40, 0x86, 0x1c, 0x33, 0x1e, 0x5e, 
+-	0xe0, 0x05, 0x41, 0x15, 0x1c, 0x28, 0x1e, 0x45, 
+-	0x41, 0x16, 0x1c, 0x30, 0x1e, 0x46, 0x07, 0xe0, 
+-	0x0f, 0xc0, 0xd0, 0x02, 0x21, 0x80, 0x08, 0x64, 
+-	0x00, 0x64, 0x07, 0xf8, 0x0f, 0xc0, 0xd0, 0x02, 
+-	0x21, 0x80, 0x08, 0x7f, 0x00, 0x7f, 0x19, 0x60, 
+-	0x90, 0x04, 0x19, 0xb8, 0x90, 0x03, 0x2c, 0x00, 
+-	0xda, 0x01, 0x21, 0x80, 0x24, 0x00, 0x98, 0x04, 
+-	0x28, 0x01, 0xda, 0x02, 0x21, 0x80, 0x20, 0x01, 
+-	0x90, 0x04, 0x4b, 0x1f, 0x42, 0x9c, 0xdb, 0x01, 
+-	0x21, 0x80, 0x4c, 0x1e, 0x98, 0x04, 0x4b, 0x1c, 
+-	0x42, 0x98, 0xdd, 0x02, 0x21, 0x80, 0x48, 0x1a, 
+-	0x90, 0x04, 0x2f, 0x00, 0xda, 0x01, 0x21, 0x80, 
+-	0x27, 0x00, 0x98, 0x03, 0x28, 0x01, 0xda, 0x02, 
+-	0x21, 0x80, 0x20, 0x01, 0x90, 0x03, 0x48, 0x11, 
+-	0x68, 0x00, 0x42, 0x87, 0xd3, 0x03, 0x21, 0x80, 
+-	0x48, 0x0e, 0x68, 0x00, 0x1e, 0x47, 0x98, 0x03, 
+-	0x4b, 0x0c, 0x68, 0x1b, 0x42, 0x98, 0xd9, 0x03, 
+-	0x21, 0x80, 0x48, 0x0a, 0x68, 0x00, 0x90, 0x03, 
+-	0x9b, 0x08, 0x60, 0x1c, 0x9b, 0x08, 0x60, 0x5f, 
+-	0x98, 0x04, 0x9b, 0x08, 0x60, 0x98, 0x98, 0x03, 
+-	0x9b, 0x08, 0x60, 0xd8, 0x1c, 0x08, 0xb0, 0x05, 
+-	0xe7, 0x88, 0xb0, 0x05, 0xe7, 0x86, 0x00, 0x00, 
+-	0x00, 0x00, 0x02, 0x3f, 0x2e, 0x08, 0x60, 0x80, 
+-	0xcc, 0x00, 0x02, 0x00, 0xcc, 0x00, 0x0c, 0x00, 
+-	0x00, 0x00, 0x02, 0xcf, 0x00, 0x00, 0x02, 0xce, 
+-	0xb5, 0xf0, 0x1c, 0x07, 0x1c, 0x0c, 0xb0, 0x81, 
+-	0x2c, 0x0b, 0xdb, 0x19, 0x2c, 0x12, 0xdc, 0x17, 
+-	0x68, 0xbe, 0x68, 0xf9, 0x91, 0x00, 0x68, 0x7a, 
+-	0x1c, 0x3b, 0x68, 0x39, 0x1c, 0x20, 0xf7, 0xff, 
+-	0xff, 0x23, 0x1c, 0x05, 0x68, 0xb8, 0x42, 0xb0, 
+-	0xd0, 0x00, 0x25, 0x80, 0x68, 0xf8, 0x99, 0x00, 
+-	0x42, 0x88, 0xd0, 0x00, 0x25, 0x80, 0x1c, 0x28, 
+-	0xb0, 0x01, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x25, 0x00, 0x68, 0x38, 0x28, 0x00, 0xda, 0x02, 
+-	0x25, 0x80, 0x20, 0x00, 0x60, 0x38, 0x68, 0x78, 
+-	0x28, 0x00, 0xda, 0x02, 0x25, 0x80, 0x20, 0x00, 
+-	0x60, 0x78, 0x68, 0x38, 0x07, 0xc0, 0x0f, 0xc0, 
+-	0xd0, 0x04, 0x25, 0x80, 0x68, 0x38, 0x08, 0x40, 
+-	0x00, 0x40, 0x60, 0x38, 0x68, 0xb8, 0x07, 0xc0, 
+-	0x0f, 0xc0, 0xd1, 0x09, 0x25, 0x80, 0x68, 0xb8, 
+-	0x07, 0xc0, 0x0f, 0xc0, 0xd0, 0x01, 0x68, 0xb8, 
+-	0xe0, 0x01, 0x68, 0xb8, 0x38, 0x01, 0x60, 0xb8, 
+-	0x68, 0xb8, 0x68, 0x39, 0x42, 0x88, 0xdc, 0x03, 
+-	0x25, 0x80, 0x68, 0x38, 0x30, 0x01, 0x60, 0xb8, 
+-	0x68, 0x78, 0x68, 0xf9, 0x42, 0x88, 0xdb, 0x03, 
+-	0x25, 0x80, 0x68, 0x78, 0x30, 0x01, 0x60, 0xf8, 
+-	0x1c, 0x28, 0xb0, 0x01, 0xe7, 0xc5, 0xb0, 0x01, 
+-	0xe7, 0xc3, 0x1c, 0x02, 0x21, 0x18, 0xe0, 0x00, 
+-	0x31, 0x01, 0x1c, 0x08, 0x47, 0x70, 0xe7, 0xfd, 
+-	0xb4, 0xf0, 0x1c, 0x07, 0x1c, 0x0a, 0xb0, 0x81, 
+-	0x68, 0xb8, 0x68, 0x3b, 0x1a, 0xc0, 0x1c, 0x46, 
+-	0x68, 0xf8, 0x68, 0x7b, 0x1a, 0xc0, 0x30, 0x01, 
+-	0x90, 0x00, 0x00, 0x90, 0x4b, 0x15, 0x58, 0x1c, 
+-	0x98, 0x00, 0x43, 0x46, 0x1c, 0x35, 0x07, 0xa0, 
+-	0x0f, 0x80, 0x1c, 0x29, 0x40, 0x81, 0x2a, 0x0b, 
+-	0xdb, 0x01, 0x2a, 0x12, 0xdd, 0x01, 0x2a, 0x13, 
+-	0xd1, 0x01, 0x21, 0x00, 0xe0, 0x0a, 0x2a, 0x09, 
+-	0xd0, 0x01, 0x2a, 0x0a, 0xd1, 0x03, 0x00, 0x69, 
+-	0x19, 0x49, 0x00, 0xc9, 0xe0, 0x02, 0x2a, 0x08, 
+-	0xd1, 0x00, 0x01, 0x29, 0x20, 0x04, 0x40, 0x20, 
+-	0xd0, 0x00, 0x08, 0x49, 0x09, 0x4c, 0x06, 0xc8, 
+-	0x0e, 0xc0, 0xd0, 0x00, 0x34, 0x01, 0x1c, 0x20, 
+-	0xb0, 0x01, 0xbc, 0xf0, 0x47, 0x70, 0xb0, 0x01, 
+-	0xe7, 0xfb, 0x00, 0x00, 0x2e, 0x03, 0x3a, 0x04, 
+-	0xb4, 0x80, 0x23, 0x00, 0x22, 0x01, 0x21, 0x00, 
+-	0x29, 0x08, 0xdb, 0x02, 0xe0, 0x09, 0x31, 0x01, 
+-	0xe7, 0xfa, 0x00, 0x88, 0x4f, 0x05, 0x58, 0x38, 
+-	0x28, 0x00, 0xd0, 0x00, 0x43, 0x13, 0x00, 0x52, 
+-	0xe7, 0xf5, 0x1c, 0x18, 0xbc, 0x80, 0x47, 0x70, 
+-	0xe7, 0xfc, 0x00, 0x00, 0x2e, 0x08, 0x7c, 0x58, 
+-	0xb5, 0xf3, 0x1c, 0x0f, 0xb0, 0x81, 0x20, 0x39, 
+-	0x06, 0x40, 0x69, 0xc0, 0x23, 0x18, 0x40, 0x18, 
+-	0x90, 0x00, 0x98, 0x00, 0x28, 0x00, 0xd0, 0x03, 
+-	0x48, 0x32, 0x49, 0x33, 0x60, 0x08, 0xe0, 0x03, 
+-	0x20, 0xff, 0x30, 0xe0, 0x49, 0x30, 0x60, 0x08, 
+-	0x24, 0x00, 0x99, 0x01, 0x48, 0x2f, 0xf7, 0xfc, 
+-	0xfa, 0x1f, 0x48, 0x2e, 0x68, 0x00, 0x28, 0x00, 
+-	0xda, 0x03, 0x20, 0x00, 0x49, 0x2b, 0x60, 0x08, 
+-	0x24, 0x80, 0x48, 0x2a, 0x68, 0x40, 0x28, 0x00, 
+-	0xda, 0x03, 0x20, 0x00, 0x49, 0x27, 0x60, 0x48, 
+-	0x24, 0x80, 0x48, 0x26, 0x68, 0x80, 0x4b, 0x26, 
+-	0x42, 0x98, 0xdd, 0x03, 0x48, 0x24, 0x49, 0x23, 
+-	0x60, 0x88, 0x24, 0x80, 0x48, 0x21, 0x68, 0xc0, 
+-	0x49, 0x1f, 0x68, 0x09, 0x42, 0x88, 0xd9, 0x04, 
+-	0x48, 0x1d, 0x68, 0x00, 0x49, 0x1d, 0x60, 0xc8, 
+-	0x24, 0x80, 0x48, 0x1e, 0x68, 0x00, 0x28, 0x00, 
+-	0xd1, 0x27, 0x2f, 0x01, 0xd1, 0x25, 0x48, 0x19, 
+-	0x68, 0x06, 0x48, 0x18, 0x68, 0x45, 0x23, 0xff, 
+-	0x33, 0x68, 0x42, 0x9e, 0xdd, 0x01, 0x26, 0xff, 
+-	0x36, 0x68, 0x48, 0x13, 0x68, 0x00, 0x08, 0x40, 
+-	0x42, 0xa8, 0xd2, 0x02, 0x48, 0x10, 0x68, 0x00, 
+-	0x08, 0x45, 0x48, 0x13, 0x49, 0x13, 0x65, 0x48, 
+-	0x48, 0x13, 0x43, 0x70, 0x23, 0x01, 0x04, 0x1b, 
+-	0x18, 0xc0, 0x14, 0x40, 0x49, 0x0f, 0x65, 0x88, 
+-	0x20, 0x00, 0x49, 0x0e, 0x65, 0xc8, 0x48, 0x0d, 
+-	0x66, 0x05, 0x1c, 0x38, 0x21, 0x00, 0xf7, 0xfe, 
+-	0xff, 0x13, 0x1c, 0x20, 0xb0, 0x01, 0xb0, 0x02, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0xb0, 0x01, 
+-	0xe7, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x02, 0x3f, 
+-	0x2e, 0x08, 0x60, 0x80, 0x2e, 0x08, 0x7d, 0xa0, 
+-	0x00, 0x00, 0x02, 0xcf, 0x2e, 0x08, 0x7c, 0xbc, 
+-	0x00, 0x00, 0x07, 0xfa, 0xcc, 0x00, 0x00, 0x00, 
+-	0x00, 0x0b, 0x60, 0xb6, 0xb5, 0xf0, 0x1c, 0x04, 
+-	0x1c, 0x0f, 0xb0, 0x81, 0x1c, 0x26, 0x69, 0x30, 
+-	0x90, 0x00, 0x98, 0x00, 0x28, 0x13, 0xd1, 0x04, 
+-	0x20, 0x75, 0xb0, 0x01, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x68, 0xf5, 0x68, 0x38, 0x08, 0x40, 
+-	0x00, 0x40, 0x60, 0x38, 0x68, 0x78, 0x08, 0x40, 
+-	0x00, 0x40, 0x60, 0x78, 0x68, 0xb8, 0x07, 0xc0, 
+-	0x0f, 0xc0, 0xd1, 0x02, 0x68, 0xb8, 0x38, 0x01, 
+-	0x60, 0xb8, 0x68, 0xf8, 0x07, 0xc0, 0x0f, 0xc0, 
+-	0xd1, 0x02, 0x68, 0xf8, 0x38, 0x01, 0x60, 0xf8, 
+-	0x1d, 0xf0, 0x30, 0x49, 0x1c, 0x39, 0xf7, 0xfc, 
+-	0xf9, 0x8b, 0x48, 0x1c, 0x68, 0x00, 0x28, 0x00, 
+-	0xd0, 0x05, 0x2d, 0x19, 0xd3, 0x01, 0x20, 0x01, 
+-	0xe0, 0x00, 0x20, 0x00, 0xe0, 0x04, 0x2d, 0x08, 
+-	0xd3, 0x01, 0x20, 0x01, 0xe0, 0x00, 0x20, 0x00, 
+-	0x28, 0x00, 0xd0, 0x02, 0x20, 0x00, 0xb0, 0x01, 
+-	0xe7, 0xcc, 0x49, 0x13, 0x20, 0x91, 0xf0, 0x13, 
+-	0xfb, 0x0d, 0x28, 0x92, 0xd0, 0x03, 0x20, 0x01, 
+-	0xf0, 0x05, 0xfa, 0xf4, 0xe7, 0xf5, 0x00, 0xa8, 
+-	0x49, 0x0e, 0x58, 0x08, 0x42, 0xa0, 0xd0, 0x05, 
+-	0x20, 0x92, 0x49, 0x0b, 0x60, 0x08, 0x20, 0xff, 
+-	0xb0, 0x01, 0xe7, 0xb7, 0x48, 0x0a, 0x68, 0x00, 
+-	0x42, 0xa0, 0xd1, 0x03, 0x1c, 0x39, 0x1c, 0x20, 
+-	0xf0, 0x00, 0xf8, 0x10, 0x20, 0x92, 0x49, 0x04, 
+-	0x60, 0x08, 0x20, 0x00, 0xb0, 0x01, 0xe7, 0xa9, 
+-	0xb0, 0x01, 0xe7, 0xa7, 0x2e, 0x08, 0x94, 0x84, 
+-	0x2e, 0x08, 0x7c, 0xc0, 0x2e, 0x08, 0x7c, 0x58, 
+-	0x2e, 0x08, 0x7c, 0xbc, 0xb5, 0xf3, 0x1c, 0x0f, 
+-	0xb0, 0x9b, 0x20, 0x39, 0x06, 0x40, 0x69, 0xc0, 
+-	0x23, 0x18, 0x40, 0x18, 0x90, 0x01, 0x98, 0x01, 
+-	0x28, 0x00, 0xd0, 0x03, 0x48, 0xf8, 0x49, 0xf9, 
+-	0x60, 0x08, 0xe0, 0x03, 0x20, 0xff, 0x30, 0xe0, 
+-	0x49, 0xf6, 0x60, 0x08, 0x20, 0xff, 0x30, 0x01, 
+-	0x90, 0x06, 0x98, 0x1b, 0x90, 0x1a, 0x98, 0x1a, 
+-	0x69, 0x05, 0x98, 0x1a, 0x68, 0xc0, 0x90, 0x19, 
+-	0x48, 0xf1, 0x68, 0x00, 0x99, 0x1b, 0x42, 0x88, 
+-	0xd1, 0x73, 0x20, 0x02, 0x90, 0x08, 0x2d, 0x0c, 
+-	0xd0, 0x01, 0x2d, 0x0f, 0xd1, 0x02, 0x20, 0x04, 
+-	0x90, 0x08, 0xe0, 0x0c, 0x2d, 0x0d, 0xd0, 0x01, 
+-	0x2d, 0x10, 0xd1, 0x02, 0x20, 0x08, 0x90, 0x08, 
+-	0xe0, 0x05, 0x2d, 0x0e, 0xd0, 0x01, 0x2d, 0x11, 
+-	0xd1, 0x01, 0x20, 0x01, 0x90, 0x08, 0x68, 0xf8, 
+-	0x68, 0x79, 0x1a, 0x40, 0x1c, 0x44, 0x2d, 0x0b, 
+-	0xd0, 0x05, 0x2d, 0x0f, 0xd0, 0x03, 0x2d, 0x10, 
+-	0xd0, 0x01, 0x2d, 0x11, 0xd1, 0x11, 0x48, 0xdf, 
+-	0x6c, 0x40, 0x1c, 0x06, 0x48, 0xdd, 0x6c, 0x81, 
+-	0x91, 0x07, 0x2e, 0x00, 0xd0, 0x02, 0x99, 0x07, 
+-	0x29, 0x00, 0xd1, 0x05, 0x26, 0x2d, 0x01, 0x36, 
+-	0x48, 0xd6, 0x68, 0x00, 0x1c, 0x41, 0x91, 0x07, 
+-	0xe0, 0x05, 0x26, 0x2d, 0x01, 0x36, 0x48, 0xd3, 
+-	0x68, 0x00, 0x1c, 0x41, 0x91, 0x07, 0x49, 0xd4, 
+-	0xa8, 0x15, 0xf7, 0xfc, 0xf8, 0xe9, 0x98, 0x17, 
+-	0x1e, 0x71, 0x42, 0x88, 0xdd, 0x01, 0x1e, 0x70, 
+-	0x90, 0x17, 0x98, 0x18, 0x99, 0x07, 0x39, 0x01, 
+-	0x42, 0x88, 0xdd, 0x02, 0x99, 0x07, 0x1e, 0x48, 
+-	0x90, 0x18, 0x98, 0x18, 0x99, 0x16, 0x1a, 0x40, 
+-	0x00, 0x40, 0x1c, 0x81, 0x98, 0x08, 0xf0, 0x06, 
+-	0xfb, 0xd3, 0x90, 0x0a, 0x98, 0x0a, 0x42, 0x84, 
+-	0xdd, 0x00, 0x9c, 0x0a, 0x48, 0xc5, 0x6f, 0x00, 
+-	0x90, 0x02, 0x20, 0x00, 0x90, 0x05, 0x98, 0x02, 
+-	0x28, 0x02, 0xd0, 0x02, 0x98, 0x02, 0x28, 0x03, 
+-	0xd1, 0x3a, 0x48, 0xc1, 0x6b, 0x00, 0x90, 0x04, 
+-	0x48, 0xbe, 0x6e, 0xc1, 0x91, 0x03, 0x98, 0x04, 
+-	0x99, 0x03, 0x42, 0x88, 0xdd, 0x21, 0x20, 0xc0, 
+-	0x90, 0x06, 0x1d, 0x20, 0x28, 0x00, 0xda, 0x02, 
+-	0xe0, 0x00, 0xe1, 0x8e, 0x30, 0x07, 0x10, 0xc0, 
+-	0x90, 0x05, 0x98, 0x04, 0x28, 0x03, 0xd0, 0x14, 
+-	0x99, 0x03, 0x29, 0x03, 0xd1, 0x07, 0x20, 0xcd, 
+-	0x90, 0x06, 0x1d, 0x61, 0x20, 0x0a, 0xf0, 0x06, 
+-	0xfb, 0xa3, 0x90, 0x05, 0xe0, 0x09, 0x98, 0x02, 
+-	0x28, 0x02, 0xd1, 0x06, 0x20, 0x9a, 0x90, 0x06, 
+-	0x1c, 0xa1, 0x20, 0x05, 0xf0, 0x06, 0xfb, 0x98, 
+-	0x90, 0x05, 0x98, 0x06, 0x28, 0x9a, 0xd0, 0x02, 
+-	0x98, 0x06, 0x28, 0xcd, 0xd1, 0x08, 0x2d, 0x0e, 
+-	0xd0, 0x01, 0x2d, 0x11, 0xd1, 0x04, 0x20, 0x00, 
+-	0x90, 0x05, 0x20, 0xff, 0x30, 0x01, 0x90, 0x06, 
+-	0x2d, 0x12, 0xd1, 0x0b, 0x48, 0x9d, 0x68, 0x00, 
+-	0x30, 0x01, 0x42, 0xa0, 0xd1, 0x06, 0x68, 0x78, 
+-	0x28, 0x00, 0xd1, 0x03, 0x20, 0x01, 0x49, 0x9f, 
+-	0x63, 0x48, 0xe0, 0x02, 0x20, 0x00, 0x49, 0x9d, 
+-	0x63, 0x48, 0x98, 0x0a, 0x99, 0x06, 0x43, 0x48, 
+-	0x28, 0x00, 0xda, 0x00, 0x30, 0xff, 0x12, 0x00, 
+-	0x42, 0xa0, 0xdd, 0x04, 0x20, 0x00, 0x90, 0x05, 
+-	0x20, 0xff, 0x30, 0x01, 0x90, 0x06, 0x68, 0x78, 
+-	0x99, 0x05, 0x18, 0x40, 0x60, 0x78, 0x1c, 0x39, 
+-	0xa8, 0x11, 0xf7, 0xfc, 0xf8, 0x61, 0x1c, 0x29, 
+-	0xa8, 0x11, 0xf7, 0xff, 0xfd, 0x71, 0x98, 0x12, 
+-	0x49, 0x88, 0x68, 0x09, 0x39, 0x01, 0x42, 0x88, 
+-	0xd1, 0x00, 0x24, 0x00, 0x99, 0x15, 0x91, 0x0d, 
+-	0x98, 0x16, 0x90, 0x0f, 0x21, 0x00, 0x91, 0x10, 
+-	0x68, 0x38, 0x28, 0x00, 0xda, 0x08, 0x68, 0x38, 
+-	0x99, 0x08, 0x43, 0x48, 0x42, 0x41, 0x29, 0x00, 
+-	0xda, 0x00, 0x31, 0x01, 0x10, 0x49, 0x91, 0x10, 
+-	0x68, 0x78, 0x28, 0x00, 0xda, 0x0d, 0x68, 0x78, 
+-	0x99, 0x08, 0x43, 0x48, 0x28, 0x00, 0xda, 0x00, 
+-	0x30, 0x01, 0x10, 0x40, 0x02, 0x01, 0x98, 0x06, 
+-	0xf0, 0x06, 0xfb, 0x36, 0x99, 0x0f, 0x1a, 0x08, 
+-	0x90, 0x0f, 0x98, 0x18, 0x99, 0x0f, 0x42, 0x88, 
+-	0xdc, 0x02, 0x98, 0x18, 0x30, 0x01, 0x90, 0x0f, 
+-	0x98, 0x17, 0x99, 0x0d, 0x1a, 0x40, 0x30, 0x01, 
+-	0x90, 0x0e, 0x98, 0x18, 0x99, 0x0f, 0x1a, 0x40, 
+-	0x30, 0x01, 0x90, 0x09, 0x98, 0x09, 0x00, 0x41, 
+-	0x98, 0x08, 0xf0, 0x06, 0xfb, 0x1d, 0x99, 0x06, 
+-	0x43, 0x48, 0x28, 0x00, 0xda, 0x00, 0x30, 0xff, 
+-	0x12, 0x00, 0x90, 0x09, 0x68, 0xb8, 0x68, 0x39, 
+-	0x1a, 0x40, 0x1c, 0x41, 0x91, 0x0c, 0x98, 0x17, 
+-	0x99, 0x15, 0x1a, 0x40, 0x00, 0x40, 0x1c, 0x81, 
+-	0x98, 0x08, 0xf0, 0x06, 0xfb, 0x09, 0x90, 0x0b, 
+-	0x98, 0x0b, 0x4b, 0x65, 0x40, 0x18, 0x90, 0x0b, 
+-	0x98, 0x0b, 0x99, 0x08, 0x43, 0x48, 0x28, 0x00, 
+-	0xda, 0x00, 0x30, 0x01, 0x10, 0x40, 0x90, 0x0e, 
+-	0x99, 0x0c, 0x98, 0x0b, 0x42, 0x81, 0xdd, 0x01, 
+-	0x98, 0x0b, 0x90, 0x0c, 0x99, 0x0c, 0x4b, 0x5c, 
+-	0x40, 0x19, 0x91, 0x0c, 0x98, 0x0c, 0x28, 0x00, 
+-	0xdd, 0x05, 0x68, 0x38, 0x99, 0x0c, 0x18, 0x40, 
+-	0x38, 0x01, 0x90, 0x13, 0xe0, 0x02, 0x68, 0x38, 
+-	0x30, 0x01, 0x90, 0x13, 0x98, 0x13, 0x28, 0x01, 
+-	0xda, 0x01, 0x20, 0x01, 0x90, 0x13, 0x98, 0x13, 
+-	0x4b, 0x52, 0x42, 0x98, 0xdd, 0x01, 0x48, 0x51, 
+-	0x90, 0x13, 0x99, 0x06, 0x43, 0x4c, 0x1c, 0x20, 
+-	0x28, 0x00, 0xda, 0x00, 0x30, 0xff, 0x12, 0x04, 
+-	0x98, 0x0a, 0x42, 0x84, 0xdd, 0x00, 0x9c, 0x0a, 
+-	0x2c, 0x02, 0xda, 0x00, 0x24, 0x02, 0x68, 0x78, 
+-	0x19, 0x00, 0x38, 0x01, 0x90, 0x14, 0x98, 0x14, 
+-	0x28, 0x01, 0xda, 0x01, 0x20, 0x01, 0x90, 0x14, 
+-	0x98, 0x14, 0x49, 0x3c, 0x68, 0x09, 0x42, 0x88, 
+-	0xd9, 0x02, 0x48, 0x3a, 0x68, 0x00, 0x90, 0x14, 
+-	0x98, 0x12, 0x49, 0x38, 0x68, 0x09, 0x39, 0x01, 
+-	0x42, 0x88, 0xd9, 0x03, 0x48, 0x35, 0x68, 0x00, 
+-	0x38, 0x01, 0x90, 0x12, 0x98, 0x09, 0x28, 0x04, 
+-	0xdb, 0x01, 0x2c, 0x04, 0xda, 0x01, 0x20, 0x00, 
+-	0x90, 0x0e, 0x98, 0x0e, 0x28, 0x03, 0xdb, 0x02, 
+-	0x98, 0x0c, 0x28, 0x04, 0xda, 0x09, 0x20, 0x00, 
+-	0x90, 0x0e, 0x48, 0x35, 0x90, 0x11, 0x48, 0x33, 
+-	0x90, 0x13, 0x20, 0x00, 0x90, 0x12, 0x20, 0x01, 
+-	0x90, 0x14, 0x21, 0x00, 0x91, 0x00, 0x98, 0x08, 
+-	0x28, 0x01, 0xd1, 0x16, 0x98, 0x0e, 0x99, 0x10, 
+-	0x1a, 0x40, 0x00, 0x40, 0x4b, 0x2b, 0x42, 0x98, 
+-	0xdd, 0x0b, 0x98, 0x0e, 0x99, 0x10, 0x1a, 0x40, 
+-	0x00, 0x40, 0x23, 0x2d, 0x01, 0x1b, 0x1a, 0xc1, 
+-	0x29, 0x00, 0xda, 0x00, 0x31, 0x01, 0x10, 0x49, 
+-	0x91, 0x00, 0x98, 0x0e, 0x42, 0xb0, 0xdd, 0x00, 
+-	0x96, 0x0e, 0x99, 0x10, 0x42, 0xb1, 0xdd, 0x00, 
+-	0x96, 0x10, 0x1c, 0x30, 0x21, 0x01, 0x07, 0x49, 
+-	0xf0, 0x06, 0xfa, 0x76, 0x99, 0x0d, 0x43, 0x48, 
+-	0x23, 0x01, 0x04, 0x1b, 0x18, 0xc0, 0x14, 0x40, 
+-	0x49, 0x1c, 0x65, 0x88, 0x1c, 0x30, 0x21, 0x01, 
+-	0x07, 0x49, 0xf0, 0x06, 0xfa, 0x69, 0x99, 0x10, 
+-	0x43, 0x48, 0x23, 0x01, 0x04, 0x1b, 0x18, 0xc0, 
+-	0x14, 0x40, 0x49, 0x16, 0x65, 0xc8, 0x1c, 0x30, 
+-	0x21, 0x01, 0x07, 0x49, 0xf0, 0x06, 0xfa, 0x5c, 
+-	0x99, 0x0e, 0x43, 0x48, 0x23, 0x01, 0x04, 0x1b, 
+-	0x18, 0xc0, 0x14, 0x40, 0x49, 0x0f, 0x65, 0x48, 
+-	0x99, 0x07, 0x1f, 0x08, 0x99, 0x0f, 0x42, 0x88, 
+-	0xdc, 0x1b, 0x99, 0x07, 0x1f, 0x08, 0xe0, 0x17, 
+-	0x00, 0x00, 0x02, 0x3f, 0x2e, 0x08, 0x60, 0x80, 
+-	0x2e, 0x08, 0x7c, 0xbc, 0xcc, 0x00, 0x02, 0x00, 
+-	0x2e, 0x08, 0x7d, 0xa0, 0xcc, 0x00, 0x0f, 0x80, 
+-	0xcc, 0x00, 0x00, 0x80, 0xcc, 0x00, 0x01, 0x00, 
+-	0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x02, 0xcf, 
+-	0x00, 0x00, 0x02, 0xce, 0xcc, 0x00, 0x00, 0x00, 
+-	0x90, 0x0f, 0x98, 0x0f, 0x49, 0x0d, 0x66, 0x08, 
+-	0x1c, 0x30, 0x21, 0x01, 0x07, 0x49, 0xf0, 0x06, 
+-	0xfa, 0x2b, 0x99, 0x00, 0x43, 0x48, 0x23, 0x01, 
+-	0x04, 0x1b, 0x18, 0xc0, 0x14, 0x40, 0x49, 0x07, 
+-	0x66, 0x48, 0xa9, 0x11, 0x1c, 0x38, 0xf7, 0xfb, 
+-	0xff, 0x1f, 0x20, 0x00, 0xb0, 0x1b, 0xb0, 0x02, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0xb0, 0x1b, 
+-	0xe7, 0xf9, 0x00, 0x00, 0xcc, 0x00, 0x00, 0x00, 
+-	0xb4, 0xb0, 0x1c, 0x02, 0x1c, 0x0f, 0x2a, 0x00, 
+-	0xd1, 0x02, 0x20, 0x01, 0xbc, 0xb0, 0x47, 0x70, 
+-	0x2f, 0x01, 0xd1, 0x20, 0x20, 0x00, 0x23, 0x00, 
+-	0x4d, 0x13, 0x62, 0x2b, 0x23, 0x00, 0x4d, 0x12, 
+-	0x62, 0xab, 0x4b, 0x12, 0x68, 0x9b, 0x1c, 0x1c, 
+-	0x4b, 0x11, 0x6e, 0xdb, 0x1c, 0x19, 0x2c, 0x02, 
+-	0xd0, 0x01, 0x29, 0x02, 0xd1, 0x01, 0x20, 0x08, 
+-	0xe0, 0x00, 0x20, 0x07, 0x79, 0x13, 0x2b, 0x00, 
+-	0xd0, 0x01, 0x23, 0x10, 0x43, 0x18, 0x4b, 0x08, 
+-	0x62, 0x58, 0x79, 0x55, 0x23, 0x80, 0x43, 0x2b, 
+-	0x4d, 0x05, 0x62, 0xab, 0xe0, 0x05, 0x48, 0x07, 
+-	0x68, 0x05, 0x23, 0x80, 0x43, 0x9d, 0x1c, 0x2b, 
+-	0x60, 0x03, 0x20, 0x00, 0xe7, 0xd2, 0xe7, 0xd1, 
+-	0x72, 0x00, 0x01, 0x00, 0xcc, 0x00, 0x0c, 0x00, 
+-	0xcc, 0x00, 0x0f, 0x80, 0x72, 0x00, 0x01, 0x28, 
+-	0xb5, 0xff, 0x9f, 0x09, 0xb0, 0x81, 0x98, 0x01, 
+-	0x06, 0x00, 0x0e, 0x00, 0x90, 0x00, 0x99, 0x02, 
+-	0x06, 0x0c, 0x0e, 0x24, 0x98, 0x03, 0x06, 0x02, 
+-	0x0e, 0x12, 0x9b, 0x04, 0x06, 0x1d, 0x0e, 0x2d, 
+-	0x2f, 0x01, 0xd1, 0x1b, 0x20, 0x00, 0x4b, 0x14, 
+-	0x62, 0x18, 0x20, 0x00, 0x4b, 0x12, 0x62, 0x98, 
+-	0x98, 0x00, 0x07, 0x00, 0x0f, 0x00, 0x01, 0x23, 
+-	0x43, 0x18, 0x06, 0x01, 0x0e, 0x09, 0x48, 0x0e, 
+-	0x62, 0x41, 0x07, 0x50, 0x0f, 0x40, 0x07, 0x6b, 
+-	0x0f, 0x5b, 0x00, 0xdb, 0x43, 0x18, 0x06, 0x01, 
+-	0x0e, 0x09, 0x20, 0x80, 0x43, 0x08, 0x4b, 0x08, 
+-	0x62, 0x98, 0xe0, 0x05, 0x48, 0x07, 0x68, 0x06, 
+-	0x23, 0x80, 0x43, 0x9e, 0x1c, 0x33, 0x60, 0x03, 
+-	0x20, 0x00, 0xb0, 0x01, 0xb0, 0x04, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0xb0, 0x01, 0xe7, 0xf9, 
+-	0x72, 0x00, 0x01, 0x00, 0x72, 0x00, 0x01, 0x28, 
+-	0xb5, 0xf1, 0x98, 0x00, 0x06, 0x07, 0x0e, 0x3f, 
+-	0xb0, 0x81, 0x2f, 0x1f, 0xdb, 0x05, 0x20, 0xb3, 
+-	0xb0, 0x01, 0xb0, 0x01, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x48, 0x62, 0x23, 0x80, 0x68, 0x1b, 
+-	0x60, 0x18, 0x48, 0x61, 0x23, 0x80, 0x6b, 0x1b, 
+-	0x60, 0x18, 0x48, 0x60, 0x23, 0x80, 0x6b, 0x5b, 
+-	0x60, 0x18, 0x48, 0x5f, 0x23, 0x80, 0x6b, 0x9b, 
+-	0x60, 0x18, 0x20, 0x01, 0x40, 0xb8, 0x4b, 0x59, 
+-	0x60, 0x18, 0x20, 0x00, 0x4b, 0x57, 0x71, 0x18, 
+-	0x20, 0x00, 0x4b, 0x56, 0x71, 0x58, 0x48, 0x55, 
+-	0x68, 0x00, 0x4b, 0x58, 0x60, 0x58, 0x48, 0x58, 
+-	0x4b, 0x56, 0x60, 0x98, 0x48, 0x57, 0x4b, 0x55, 
+-	0x60, 0xd8, 0x20, 0xff, 0x30, 0x01, 0x4b, 0x53, 
+-	0x62, 0x18, 0x20, 0xff, 0x30, 0x01, 0x4b, 0x51, 
+-	0x62, 0x58, 0x20, 0x03, 0x4b, 0x52, 0x75, 0x18, 
+-	0x20, 0x0e, 0x4b, 0x51, 0x75, 0x58, 0x20, 0x04, 
+-	0x4b, 0x4f, 0x75, 0x98, 0x20, 0x03, 0x4b, 0x4e, 
+-	0x75, 0xd8, 0x20, 0x00, 0x4b, 0x4d, 0x60, 0x18, 
+-	0x20, 0x00, 0x4b, 0x4d, 0x60, 0x18, 0x20, 0x0d, 
+-	0x23, 0x19, 0x06, 0x9b, 0x63, 0x18, 0x22, 0x00, 
+-	0x2a, 0x20, 0xdb, 0x04, 0xe0, 0x21, 0x1c, 0x50, 
+-	0x06, 0x02, 0x0e, 0x12, 0xe7, 0xf8, 0x25, 0x00, 
+-	0x00, 0x93, 0x4e, 0x46, 0x50, 0xf5, 0x25, 0xff, 
+-	0x4b, 0x45, 0x54, 0x9d, 0x01, 0x15, 0x4b, 0x45, 
+-	0x18, 0xec, 0x01, 0x15, 0x4b, 0x44, 0x18, 0xe8, 
+-	0x25, 0x00, 0xc4, 0x20, 0x25, 0x00, 0xc4, 0x20, 
+-	0x25, 0x00, 0xc4, 0x20, 0x25, 0x00, 0xc4, 0x20, 
+-	0x25, 0x00, 0xc0, 0x20, 0x25, 0x00, 0xc0, 0x20, 
+-	0x25, 0x00, 0xc0, 0x20, 0x25, 0x00, 0xc0, 0x20, 
+-	0xe7, 0xdd, 0x21, 0x00, 0x29, 0x20, 0xdb, 0x04, 
+-	0xe0, 0x0b, 0x1c, 0x48, 0x04, 0x01, 0x0c, 0x09, 
+-	0xe7, 0xf8, 0x23, 0x00, 0x00, 0x88, 0x4c, 0x2a, 
+-	0x50, 0x23, 0x23, 0x00, 0x48, 0x35, 0x54, 0x43, 
+-	0xe7, 0xf3, 0x4c, 0x35, 0x94, 0x00, 0x22, 0x00, 
+-	0x2a, 0x10, 0xdb, 0x04, 0xe0, 0x0f, 0x1c, 0x50, 
+-	0x06, 0x02, 0x0e, 0x12, 0xe7, 0xf8, 0x20, 0x00, 
+-	0x00, 0x93, 0x4c, 0x30, 0x50, 0xe0, 0x23, 0xff, 
+-	0x48, 0x2f, 0x54, 0x83, 0x20, 0x00, 0x00, 0x93, 
+-	0x9c, 0x00, 0x50, 0xe0, 0xe7, 0xef, 0x21, 0x00, 
+-	0x23, 0xff, 0x33, 0x01, 0x42, 0x99, 0xdb, 0x04, 
+-	0xe0, 0x2a, 0x1c, 0x48, 0x04, 0x01, 0x0c, 0x09, 
+-	0xe7, 0xf6, 0x23, 0x00, 0x00, 0x88, 0x4c, 0x1a, 
+-	0x50, 0x23, 0x20, 0x00, 0x00, 0x8b, 0x4c, 0x18, 
+-	0x19, 0x1c, 0x23, 0x01, 0x02, 0x9b, 0x18, 0xe3, 
+-	0x60, 0x18, 0x20, 0x00, 0x4b, 0x14, 0x18, 0x5c, 
+-	0x23, 0x01, 0x02, 0xdb, 0x18, 0xe3, 0x70, 0x18, 
+-	0x20, 0x00, 0x00, 0x8b, 0x4c, 0x11, 0x50, 0xe0, 
+-	0x20, 0x00, 0x00, 0x8b, 0x4c, 0x0f, 0x19, 0x1c, 
+-	0x23, 0x01, 0x02, 0x9b, 0x18, 0xe3, 0x60, 0x18, 
+-	0x20, 0x00, 0x4b, 0x0c, 0x18, 0x5c, 0x23, 0x01, 
+-	0x02, 0xdb, 0x18, 0xe3, 0x70, 0x18, 0xe7, 0xd4, 
+-	0x20, 0x00, 0xb0, 0x01, 0xe7, 0x39, 0xb0, 0x01, 
+-	0xe7, 0x37, 0x00, 0x00, 0x2e, 0x08, 0x72, 0xec, 
+-	0x2e, 0x08, 0x5e, 0x5c, 0x2e, 0x08, 0x72, 0x90, 
+-	0x2e, 0x08, 0x72, 0x9c, 0x9e, 0x00, 0x04, 0x80, 
+-	0x2e, 0x08, 0x60, 0x90, 0x2e, 0x08, 0x69, 0x90, 
+-	0x9e, 0x00, 0x04, 0xa0, 0x2e, 0x08, 0x5e, 0xdc, 
+-	0x2e, 0x08, 0x5e, 0xe0, 0x2e, 0x08, 0x5e, 0xe4, 
+-	0x2e, 0x08, 0x5f, 0xa4, 0x64, 0x00, 0x08, 0x00, 
+-	0x64, 0x00, 0x10, 0x00, 0x2e, 0x08, 0x7b, 0xf4, 
+-	0x9e, 0x00, 0x04, 0xb8, 0x2e, 0x08, 0x5f, 0x64, 
+-	0x2e, 0x08, 0x5f, 0xc4, 0xb4, 0xb0, 0x1c, 0x07, 
+-	0x1c, 0x0a, 0x06, 0x11, 0x0e, 0x09, 0x29, 0x20, 
+-	0xdb, 0x02, 0x20, 0xa2, 0xbc, 0xb0, 0x47, 0x70, 
+-	0x00, 0x88, 0x4b, 0x0a, 0x58, 0x18, 0x1c, 0x05, 
+-	0xd1, 0x01, 0x20, 0xb0, 0xe7, 0xf6, 0x68, 0xe8, 
+-	0x1c, 0x04, 0xd1, 0x01, 0x20, 0xb6, 0xe7, 0xf1, 
+-	0x68, 0x60, 0x00, 0x43, 0x18, 0x18, 0x01, 0x80, 
+-	0x08, 0x80, 0x60, 0x38, 0x20, 0x00, 0xe7, 0xe9, 
+-	0xe7, 0xe8, 0x00, 0x00, 0x2e, 0x08, 0x5e, 0x5c, 
+-	0xb5, 0xff, 0xb0, 0x82, 0x9a, 0x04, 0x06, 0x11, 
+-	0x0e, 0x09, 0x91, 0x00, 0x9b, 0x05, 0x06, 0x18, 
+-	0x0e, 0x00, 0x90, 0x01, 0xb0, 0x83, 0x99, 0x03, 
+-	0x29, 0x20, 0xdb, 0x05, 0x20, 0xa2, 0xb0, 0x05, 
+-	0xb0, 0x04, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x98, 0x05, 0x28, 0x00, 0xd0, 0x64, 0x98, 0x05, 
+-	0x23, 0x0d, 0x06, 0x9b, 0x42, 0xd8, 0xd3, 0x02, 
+-	0x20, 0xb4, 0xb0, 0x05, 0xe7, 0xf0, 0x99, 0x06, 
+-	0x23, 0xff, 0x33, 0x81, 0x42, 0x99, 0xd2, 0x02, 
+-	0x20, 0xb5, 0xb0, 0x05, 0xe7, 0xe8, 0x99, 0x03, 
+-	0x00, 0x88, 0x49, 0x2c, 0x58, 0x08, 0x90, 0x02, 
+-	0x28, 0x00, 0xd1, 0x02, 0x20, 0xb0, 0xb0, 0x05, 
+-	0xe7, 0xde, 0x99, 0x06, 0x00, 0x88, 0x1f, 0xc1, 
+-	0x39, 0x05, 0x91, 0x00, 0x9e, 0x05, 0x98, 0x05, 
+-	0x1d, 0xc5, 0x35, 0x05, 0x60, 0x35, 0x99, 0x06, 
+-	0x60, 0x71, 0x20, 0x00, 0x60, 0xb0, 0x98, 0x04, 
+-	0x28, 0x10, 0xd1, 0x0a, 0x98, 0x02, 0x68, 0x84, 
+-	0x98, 0x02, 0x30, 0x18, 0x90, 0x01, 0x1c, 0x2a, 
+-	0x99, 0x00, 0x98, 0x01, 0xf0, 0x00, 0xfc, 0x86, 
+-	0xe0, 0x25, 0x98, 0x04, 0x28, 0x20, 0xd1, 0x1f, 
+-	0x98, 0x02, 0x68, 0xc0, 0x1c, 0x07, 0xd1, 0x02, 
+-	0x20, 0xb6, 0xb0, 0x05, 0xe7, 0xb8, 0x78, 0xb8, 
+-	0x08, 0x40, 0x00, 0x40, 0x70, 0xb8, 0x69, 0x3c, 
+-	0x1d, 0xf8, 0x30, 0x05, 0x90, 0x01, 0x68, 0xb8, 
+-	0x28, 0x00, 0xd1, 0x00, 0x60, 0xbd, 0x1c, 0x2a, 
+-	0x99, 0x00, 0x98, 0x01, 0xf0, 0x00, 0xfc, 0x6a, 
+-	0x68, 0x79, 0x18, 0x40, 0x60, 0x78, 0x78, 0x78, 
+-	0x99, 0x03, 0xf0, 0x00, 0xf8, 0xb9, 0xe0, 0x02, 
+-	0x20, 0xbc, 0xb0, 0x05, 0xe7, 0x9c, 0x68, 0xa0, 
+-	0x28, 0x00, 0xd0, 0x01, 0x68, 0xa4, 0xe7, 0xfa, 
+-	0x60, 0xa6, 0x20, 0x00, 0xb0, 0x05, 0xe7, 0x93, 
+-	0x20, 0xb4, 0xb0, 0x05, 0xe7, 0x90, 0xb0, 0x03, 
+-	0xb0, 0x02, 0xe7, 0x8d, 0x2e, 0x08, 0x5e, 0x5c, 
+-	0xb5, 0xff, 0xb0, 0x81, 0x9a, 0x03, 0x06, 0x16, 
+-	0x0e, 0x36, 0x9b, 0x04, 0x06, 0x18, 0x0e, 0x00, 
+-	0x90, 0x00, 0xb0, 0x83, 0x27, 0x00, 0x2e, 0x20, 
+-	0xdb, 0x05, 0x20, 0xa2, 0xb0, 0x04, 0xb0, 0x04, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0xb0, 
+-	0x49, 0x45, 0x58, 0x08, 0x1c, 0x04, 0xd1, 0x02, 
+-	0x20, 0xb0, 0xb0, 0x04, 0xe7, 0xf3, 0x78, 0xe0, 
+-	0x28, 0x00, 0xd1, 0x73, 0x98, 0x03, 0x28, 0x20, 
+-	0xd1, 0x19, 0x68, 0xe0, 0x1c, 0x07, 0xd1, 0x02, 
+-	0x20, 0xb6, 0xb0, 0x04, 0xe7, 0xe7, 0x69, 0x38, 
+-	0x49, 0x3c, 0x60, 0x48, 0x48, 0x3b, 0x68, 0x40, 
+-	0x68, 0x00, 0x60, 0xb8, 0x1d, 0xf8, 0x30, 0x05, 
+-	0x90, 0x02, 0x20, 0x01, 0x90, 0x00, 0x48, 0x37, 
+-	0x68, 0x40, 0x68, 0x40, 0x00, 0x80, 0x1f, 0xc1, 
+-	0x39, 0x19, 0x91, 0x01, 0xe0, 0x1d, 0x98, 0x03, 
+-	0x28, 0x10, 0xd1, 0x17, 0x68, 0xa0, 0x49, 0x31, 
+-	0x60, 0x48, 0x48, 0x30, 0x68, 0x40, 0x68, 0x00, 
+-	0x61, 0x20, 0x48, 0x2e, 0x68, 0x40, 0x68, 0x00, 
+-	0x61, 0x60, 0x1d, 0xe0, 0x30, 0x11, 0x90, 0x02, 
+-	0x48, 0x2a, 0x68, 0x40, 0x68, 0x40, 0x00, 0x80, 
+-	0x1f, 0xc1, 0x39, 0x21, 0x91, 0x01, 0x20, 0x00, 
+-	0x90, 0x00, 0xe0, 0x02, 0x20, 0xbc, 0xb0, 0x04, 
+-	0xe7, 0xb5, 0x48, 0x24, 0x68, 0x40, 0x68, 0x80, 
+-	0x28, 0x00, 0xd0, 0x37, 0x25, 0x00, 0x48, 0x21, 
+-	0x68, 0x40, 0x68, 0x02, 0x99, 0x01, 0x98, 0x02, 
+-	0xf0, 0x00, 0xfb, 0xe8, 0x19, 0x45, 0x48, 0x1d, 
+-	0x68, 0x40, 0x49, 0x1c, 0x60, 0x08, 0x48, 0x1b, 
+-	0x68, 0x00, 0x68, 0x80, 0x49, 0x19, 0x60, 0x48, 
+-	0x48, 0x18, 0x68, 0x40, 0x68, 0x40, 0x00, 0x80, 
+-	0x1f, 0xc1, 0x39, 0x05, 0x91, 0x01, 0x48, 0x15, 
+-	0x68, 0x40, 0x68, 0x80, 0x28, 0x00, 0xd1, 0xe2, 
+-	0x20, 0x00, 0x49, 0x12, 0x68, 0x09, 0x60, 0x88, 
+-	0x48, 0x10, 0x68, 0x40, 0x99, 0x04, 0x60, 0x08, 
+-	0x48, 0x0e, 0x68, 0x40, 0x68, 0x40, 0x99, 0x05, 
+-	0x60, 0x08, 0x98, 0x00, 0x28, 0x00, 0xd0, 0x06, 
+-	0x60, 0x7d, 0x78, 0x78, 0x1c, 0x31, 0xf0, 0x00, 
+-	0xf8, 0x13, 0xe0, 0x00, 0xe0, 0x05, 0x20, 0x00, 
+-	0xb0, 0x04, 0xe7, 0x78, 0x20, 0xb4, 0xb0, 0x04, 
+-	0xe7, 0x75, 0x20, 0xbc, 0xb0, 0x04, 0xe7, 0x72, 
+-	0xb0, 0x03, 0xb0, 0x01, 0xe7, 0x6f, 0x00, 0x00, 
+-	0x2e, 0x08, 0x5e, 0x5c, 0x2e, 0x08, 0x60, 0x88, 
+-	0xb5, 0xf3, 0x98, 0x00, 0x06, 0x02, 0x0e, 0x12, 
+-	0x99, 0x01, 0x06, 0x0c, 0x0e, 0x24, 0xb0, 0x81, 
+-	0x2c, 0x20, 0xdb, 0x05, 0x20, 0xa2, 0xb0, 0x01, 
+-	0xb0, 0x02, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x00, 0xa0, 0x4b, 0x14, 0x58, 0x18, 0x1c, 0x05, 
+-	0xd1, 0x02, 0x20, 0xb0, 0xb0, 0x01, 0xe7, 0xf3, 
+-	0x68, 0xe8, 0x1c, 0x01, 0xd1, 0x02, 0x20, 0xb6, 
+-	0xb0, 0x01, 0xe7, 0xed, 0x11, 0x10, 0x06, 0x00, 
+-	0x0e, 0x00, 0x90, 0x00, 0x28, 0x00, 0xd1, 0x04, 
+-	0x68, 0x48, 0x40, 0xd0, 0x06, 0x07, 0x0e, 0x3f, 
+-	0xe0, 0x09, 0x68, 0x48, 0x07, 0x16, 0x0f, 0x36, 
+-	0x40, 0xf0, 0x68, 0x4e, 0x40, 0xd6, 0x1c, 0x33, 
+-	0x18, 0xc0, 0x06, 0x07, 0x0e, 0x3f, 0x70, 0x0f, 
+-	0x70, 0x4a, 0x20, 0x00, 0xb0, 0x01, 0xe7, 0xd3, 
+-	0xb0, 0x01, 0xe7, 0xd1, 0x2e, 0x08, 0x5e, 0x5c, 
+-	0xb4, 0xb0, 0x1c, 0x03, 0x1c, 0x0a, 0x06, 0x11, 
+-	0x0e, 0x09, 0x29, 0x20, 0xdb, 0x02, 0x20, 0xa2, 
+-	0xbc, 0xb0, 0x47, 0x70, 0x00, 0x88, 0x4d, 0x08, 
+-	0x58, 0x28, 0x1c, 0x04, 0xd1, 0x01, 0x20, 0xb0, 
+-	0xe7, 0xf6, 0x68, 0xe0, 0x1c, 0x07, 0xd1, 0x01, 
+-	0x20, 0xb6, 0xe7, 0xf1, 0x78, 0x78, 0x70, 0x18, 
+-	0x20, 0x00, 0xe7, 0xed, 0xe7, 0xec, 0x00, 0x00, 
+-	0x2e, 0x08, 0x5e, 0x5c, 0xb5, 0xf3, 0xb0, 0x81, 
+-	0x98, 0x01, 0x06, 0x00, 0x0e, 0x00, 0x90, 0x00, 
+-	0x99, 0x02, 0x06, 0x0d, 0x0e, 0x2d, 0xb0, 0x86, 
+-	0x20, 0x00, 0x90, 0x00, 0x2d, 0x20, 0xdd, 0x05, 
+-	0x20, 0xa2, 0xb0, 0x07, 0xb0, 0x02, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x00, 0xa8, 0x49, 0xa2, 
+-	0x58, 0x08, 0x90, 0x04, 0x28, 0x00, 0xd1, 0x02, 
+-	0x20, 0xb0, 0xb0, 0x07, 0xe7, 0xf2, 0x00, 0xa8, 
+-	0x49, 0x9e, 0x68, 0x09, 0x18, 0x40, 0x90, 0x05, 
+-	0x00, 0xe8, 0x1b, 0x40, 0x00, 0x80, 0x49, 0x9c, 
+-	0x68, 0x09, 0x18, 0x46, 0x98, 0x06, 0x28, 0x00, 
+-	0xd0, 0x73, 0x28, 0x01, 0xd0, 0x4f, 0x28, 0x02, 
+-	0xd0, 0x00, 0xe1, 0x1d, 0x98, 0x04, 0x69, 0x00, 
+-	0x60, 0x70, 0x98, 0x04, 0x78, 0x40, 0x06, 0xc0, 
+-	0x0e, 0xc0, 0x90, 0x02, 0x98, 0x02, 0x28, 0x13, 
+-	0xd0, 0x16, 0x27, 0x00, 0x2f, 0x20, 0xdb, 0x04, 
+-	0xe0, 0x11, 0x1c, 0x78, 0x06, 0x07, 0x0e, 0x3f, 
+-	0xe7, 0xf8, 0x48, 0x8e, 0x5d, 0xc0, 0x42, 0xa8, 
+-	0xd1, 0x08, 0x00, 0xb8, 0x49, 0x8c, 0x58, 0x08, 
+-	0x30, 0x01, 0x78, 0x01, 0x23, 0x80, 0x43, 0xdb, 
+-	0x40, 0x19, 0x70, 0x01, 0xe7, 0xed, 0xe0, 0x1e, 
+-	0x27, 0x00, 0x2f, 0x10, 0xdb, 0x04, 0xe0, 0x1a, 
+-	0x1c, 0x78, 0x06, 0x07, 0x0e, 0x3f, 0xe7, 0xf8, 
+-	0x48, 0x84, 0x5d, 0xc0, 0x42, 0xa8, 0xd1, 0x11, 
+-	0x00, 0xb8, 0x49, 0x83, 0x58, 0x08, 0x30, 0x01, 
+-	0x78, 0x01, 0x23, 0x80, 0x43, 0xdb, 0x40, 0x19, 
+-	0x70, 0x01, 0x98, 0x00, 0x30, 0x01, 0x06, 0x00, 
+-	0x0e, 0x00, 0x90, 0x00, 0x98, 0x00, 0x28, 0x02, 
+-	0xd1, 0x00, 0xe0, 0x00, 0xe7, 0xe4, 0x88, 0x30, 
+-	0x4b, 0x7a, 0x40, 0x18, 0x80, 0x30, 0x98, 0x05, 
+-	0x68, 0x00, 0x23, 0x01, 0x03, 0x5b, 0x43, 0x18, 
+-	0x99, 0x05, 0x60, 0x08, 0xe0, 0xd3, 0x98, 0x05, 
+-	0x68, 0x00, 0x4b, 0x75, 0x40, 0x18, 0x99, 0x05, 
+-	0x60, 0x08, 0x20, 0x00, 0x60, 0xb0, 0x20, 0x00, 
+-	0x70, 0xf0, 0x20, 0x00, 0x60, 0xf0, 0x98, 0x04, 
+-	0x78, 0x40, 0x06, 0xc0, 0x0e, 0xc0, 0x90, 0x02, 
+-	0x98, 0x02, 0x28, 0x13, 0xd0, 0x16, 0x27, 0x00, 
+-	0x2f, 0x20, 0xdb, 0x04, 0xe0, 0x11, 0x1c, 0x78, 
+-	0x06, 0x07, 0x0e, 0x3f, 0xe7, 0xf8, 0x48, 0x63, 
+-	0x5d, 0xc0, 0x42, 0xa8, 0xd1, 0x08, 0x00, 0xb8, 
+-	0xe0, 0x00, 0xe0, 0x27, 0x49, 0x60, 0x58, 0x0c, 
+-	0x78, 0x60, 0x23, 0x80, 0x43, 0x18, 0x70, 0x60, 
+-	0xe7, 0xed, 0xe0, 0x1e, 0x27, 0x00, 0x2f, 0x10, 
+-	0xdb, 0x04, 0xe0, 0x1a, 0x1c, 0x78, 0x06, 0x07, 
+-	0x0e, 0x3f, 0xe7, 0xf8, 0x48, 0x59, 0x5d, 0xc0, 
+-	0x42, 0xa8, 0xd1, 0x11, 0x00, 0xb8, 0x49, 0x58, 
+-	0x58, 0x08, 0x30, 0x01, 0x78, 0x01, 0x23, 0x80, 
+-	0x43, 0xdb, 0x40, 0x19, 0x70, 0x01, 0x98, 0x00, 
+-	0x30, 0x01, 0x06, 0x00, 0x0e, 0x00, 0x90, 0x00, 
+-	0x98, 0x00, 0x28, 0x02, 0xd1, 0x00, 0xe0, 0x00, 
+-	0xe7, 0xe4, 0xe0, 0x88, 0x98, 0x05, 0x68, 0x00, 
+-	0x4b, 0x4f, 0x40, 0x18, 0x99, 0x05, 0x60, 0x08, 
+-	0x20, 0x00, 0x60, 0xb0, 0x20, 0x00, 0x70, 0xf0, 
+-	0x20, 0x00, 0x60, 0xf0, 0x98, 0x04, 0x78, 0x40, 
+-	0x06, 0xc0, 0x0e, 0xc0, 0x90, 0x02, 0x98, 0x04, 
+-	0x78, 0x40, 0x21, 0x20, 0x40, 0x01, 0x91, 0x03, 
+-	0x98, 0x02, 0x28, 0x13, 0xd0, 0x4c, 0x27, 0x00, 
+-	0x2f, 0x20, 0xdb, 0x04, 0xe0, 0x47, 0x1c, 0x78, 
+-	0x06, 0x07, 0x0e, 0x3f, 0xe7, 0xf8, 0x48, 0x3b, 
+-	0x5d, 0xc0, 0x42, 0xa8, 0xd1, 0x3e, 0x00, 0xb8, 
+-	0x49, 0x39, 0x58, 0x0c, 0x20, 0x80, 0x70, 0x60, 
+-	0x99, 0x03, 0x1c, 0x20, 0xf7, 0xfd, 0xfb, 0x30, 
+-	0x78, 0xa0, 0x23, 0x04, 0x40, 0x18, 0xd0, 0x28, 
+-	0x6a, 0xe0, 0x22, 0x00, 0x92, 0x01, 0x99, 0x01, 
+-	0x29, 0x08, 0xdb, 0x06, 0xe0, 0x1f, 0x99, 0x01, 
+-	0x31, 0x01, 0x06, 0x09, 0x0e, 0x09, 0x91, 0x01, 
+-	0xe7, 0xf5, 0x99, 0x01, 0x00, 0x89, 0x18, 0x09, 
+-	0x68, 0x49, 0x9a, 0x01, 0x00, 0x92, 0x18, 0x12, 
+-	0x64, 0x51, 0x22, 0x00, 0x99, 0x01, 0x00, 0x89, 
+-	0x18, 0x09, 0x62, 0x4a, 0x99, 0x01, 0x00, 0x89, 
+-	0x18, 0x09, 0x6c, 0x49, 0x29, 0x00, 0xd0, 0x05, 
+-	0x9a, 0x01, 0x21, 0x80, 0x41, 0x11, 0x88, 0x02, 
+-	0x43, 0x11, 0x80, 0x01, 0xe7, 0xdf, 0x88, 0x01, 
+-	0x80, 0x41, 0x78, 0xa0, 0x23, 0x20, 0x40, 0x18, 
+-	0xd0, 0x04, 0x98, 0x04, 0x68, 0xc1, 0x1c, 0x20, 
+-	0xf0, 0x00, 0xfa, 0x3d, 0xe7, 0xb7, 0xe0, 0x1e, 
+-	0x27, 0x00, 0x2f, 0x10, 0xdb, 0x04, 0xe0, 0x1a, 
+-	0x1c, 0x78, 0x06, 0x07, 0x0e, 0x3f, 0xe7, 0xf8, 
+-	0x48, 0x16, 0x5d, 0xc0, 0x42, 0xa8, 0xd1, 0x11, 
+-	0x00, 0xb8, 0x49, 0x15, 0x58, 0x0c, 0x20, 0x80, 
+-	0x70, 0x60, 0x99, 0x03, 0x1c, 0x20, 0xf7, 0xfd, 
+-	0xfa, 0xe3, 0x98, 0x00, 0x30, 0x01, 0x06, 0x00, 
+-	0x0e, 0x00, 0x90, 0x00, 0x98, 0x00, 0x28, 0x02, 
+-	0xd1, 0x00, 0xe0, 0x00, 0xe7, 0xe4, 0xe0, 0x02, 
+-	0x20, 0xbc, 0xb0, 0x07, 0xe6, 0xbe, 0x98, 0x06, 
+-	0x99, 0x04, 0x70, 0xc8, 0x20, 0x00, 0xb0, 0x07, 
+-	0xe6, 0xb8, 0xb0, 0x06, 0xb0, 0x01, 0xe6, 0xb5, 
+-	0x2e, 0x08, 0x5e, 0x5c, 0x2e, 0x08, 0x5d, 0xcc, 
+-	0x2e, 0x08, 0x5d, 0xc4, 0x2e, 0x08, 0x5f, 0xa4, 
+-	0x2e, 0x08, 0x5e, 0xe4, 0x2e, 0x08, 0x5f, 0xc4, 
+-	0x2e, 0x08, 0x5f, 0x64, 0xff, 0xff, 0xfb, 0xff, 
+-	0xff, 0xff, 0xdf, 0xff, 0xb4, 0x90, 0x1c, 0x03, 
+-	0x1c, 0x0a, 0x06, 0x11, 0x0e, 0x09, 0x29, 0x20, 
+-	0xdd, 0x02, 0x20, 0xa2, 0xbc, 0x90, 0x47, 0x70, 
+-	0x00, 0x88, 0x4c, 0x05, 0x58, 0x20, 0x1c, 0x07, 
+-	0xd1, 0x01, 0x20, 0xb0, 0xe7, 0xf6, 0x78, 0xf8, 
+-	0x70, 0x18, 0x20, 0x00, 0xe7, 0xf2, 0xe7, 0xf1, 
+-	0x2e, 0x08, 0x5e, 0x5c, 0xb4, 0x90, 0x1c, 0x02, 
+-	0x1c, 0x0f, 0x06, 0x38, 0x16, 0x04, 0x2a, 0x02, 
+-	0xda, 0x02, 0x20, 0x00, 0xbc, 0x90, 0x47, 0x70, 
+-	0x2c, 0x01, 0xd1, 0x01, 0x21, 0x28, 0xe0, 0x09, 
+-	0x2c, 0x02, 0xd1, 0x01, 0x21, 0x20, 0xe0, 0x05, 
+-	0x2c, 0x00, 0xd1, 0x01, 0x21, 0x0c, 0xe0, 0x01, 
+-	0x20, 0x00, 0xe7, 0xef, 0x00, 0x50, 0x18, 0x80, 
+-	0x01, 0x80, 0x18, 0x41, 0x1c, 0xc8, 0x08, 0x81, 
+-	0x1c, 0x08, 0xe7, 0xe7, 0xe7, 0xe6, 0xb5, 0xf7, 
+-	0x1c, 0x07, 0xb0, 0x81, 0x9a, 0x03, 0x06, 0x11, 
+-	0x0e, 0x09, 0x91, 0x00, 0xb0, 0x84, 0x99, 0x04, 
+-	0x29, 0x20, 0xdb, 0x05, 0x20, 0xa2, 0xb0, 0x05, 
+-	0xb0, 0x03, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x99, 0x04, 0x00, 0x88, 0x49, 0x29, 0x58, 0x08, 
+-	0x1c, 0x06, 0xd1, 0x02, 0x20, 0xb0, 0xb0, 0x05, 
+-	0xe7, 0xf2, 0x2f, 0x00, 0xd1, 0x02, 0x20, 0xb4, 
+-	0xb0, 0x05, 0xe7, 0xed, 0x4b, 0x24, 0x42, 0x9f, 
+-	0xd1, 0x0a, 0x78, 0xf0, 0x28, 0x00, 0xd0, 0x02, 
+-	0x20, 0xbc, 0xb0, 0x05, 0xe7, 0xe4, 0x20, 0x00, 
+-	0x60, 0xf0, 0x20, 0x00, 0xb0, 0x05, 0xe7, 0xdf, 
+-	0x68, 0xf0, 0x28, 0x00, 0xd0, 0x02, 0x20, 0xb4, 
+-	0xb0, 0x05, 0xe7, 0xd9, 0x99, 0x06, 0x00, 0x88, 
+-	0x1f, 0xc1, 0x39, 0x19, 0x91, 0x02, 0x20, 0xff, 
+-	0x30, 0x81, 0x90, 0x01, 0x99, 0x02, 0x98, 0x01, 
+-	0x42, 0x81, 0xda, 0x02, 0x20, 0xb5, 0xb0, 0x05, 
+-	0xe7, 0xca, 0x1c, 0x3c, 0x60, 0xf4, 0x37, 0x14, 
+-	0x1c, 0x3d, 0x37, 0x0c, 0x60, 0x2f, 0x99, 0x06, 
+-	0x60, 0x69, 0x20, 0x00, 0x60, 0xa8, 0x97, 0x03, 
+-	0x20, 0x00, 0x60, 0xe0, 0x1d, 0xe0, 0x30, 0x05, 
+-	0x9a, 0x03, 0x99, 0x02, 0xf0, 0x00, 0xf9, 0x56, 
+-	0x90, 0x00, 0x20, 0x00, 0x70, 0xa0, 0x98, 0x00, 
+-	0x60, 0x60, 0x9a, 0x03, 0x60, 0xa2, 0x61, 0x25, 
+-	0x99, 0x04, 0x20, 0x54, 0xf7, 0xff, 0xfd, 0xa0, 
+-	0xb0, 0x05, 0xe7, 0xa9, 0xb0, 0x04, 0xb0, 0x01, 
+-	0xe7, 0xa6, 0x00, 0x00, 0x2e, 0x08, 0x5e, 0x5c, 
+-	0x00, 0x00, 0xff, 0xff, 0xb5, 0xff, 0xb0, 0x83, 
+-	0x9a, 0x05, 0x06, 0x11, 0x0e, 0x09, 0x91, 0x00, 
+-	0x9b, 0x06, 0x06, 0x18, 0x0e, 0x00, 0x90, 0x01, 
+-	0x98, 0x0c, 0x06, 0x01, 0x0e, 0x09, 0x91, 0x02, 
+-	0xb0, 0x85, 0x99, 0x05, 0x29, 0x20, 0xdb, 0x05, 
+-	0x20, 0xa2, 0xb0, 0x08, 0xb0, 0x04, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x98, 0x08, 0x28, 0x00, 
+-	0xd1, 0x02, 0x20, 0xb4, 0xb0, 0x08, 0xe7, 0xf5, 
+-	0x99, 0x05, 0x00, 0xc8, 0x1a, 0x40, 0x00, 0x80, 
+-	0x49, 0x83, 0x68, 0x09, 0x18, 0x47, 0x98, 0x08, 
+-	0x4b, 0x82, 0x42, 0x98, 0xd1, 0x73, 0x99, 0x05, 
+-	0x00, 0x88, 0x49, 0x81, 0x58, 0x08, 0x1c, 0x05, 
+-	0xd1, 0x02, 0x20, 0xb0, 0xb0, 0x08, 0xe7, 0xe1, 
+-	0x68, 0xe8, 0x28, 0x00, 0xd1, 0x02, 0x78, 0xe8, 
+-	0x28, 0x00, 0xd0, 0x02, 0x20, 0xbc, 0xb0, 0x08, 
+-	0xe7, 0xd8, 0x78, 0xa8, 0x28, 0x00, 0xd0, 0x54, 
+-	0x20, 0x00, 0x42, 0x80, 0xd0, 0x1d, 0x24, 0x00, 
+-	0x2c, 0x20, 0xdb, 0x04, 0xe0, 0x18, 0x1c, 0x60, 
+-	0x06, 0x04, 0x0e, 0x24, 0xe7, 0xf8, 0x48, 0x73, 
+-	0x5d, 0x00, 0x99, 0x05, 0x42, 0x88, 0xd1, 0x0e, 
+-	0x20, 0x01, 0x40, 0xa0, 0x43, 0xc0, 0x49, 0x70, 
+-	0x68, 0x09, 0x40, 0x08, 0x49, 0x6e, 0x60, 0x08, 
+-	0x20, 0x00, 0x00, 0xa1, 0x4a, 0x6d, 0x50, 0x50, 
+-	0x20, 0xff, 0x49, 0x6a, 0x55, 0x08, 0xe7, 0xe6, 
+-	0xe0, 0x33, 0x4a, 0x6b, 0x92, 0x03, 0x7e, 0x38, 
+-	0x1c, 0x06, 0x28, 0xff, 0xd0, 0x14, 0x20, 0x00, 
+-	0x00, 0xb1, 0x4a, 0x68, 0x50, 0x50, 0x20, 0x01, 
+-	0x40, 0xb0, 0x43, 0xc0, 0x49, 0x66, 0x68, 0x09, 
+-	0x40, 0x08, 0x49, 0x65, 0x60, 0x08, 0x20, 0xff, 
+-	0x76, 0x38, 0x21, 0xff, 0x48, 0x63, 0x55, 0x81, 
+-	0x21, 0x00, 0x00, 0xb0, 0x9a, 0x03, 0x50, 0x11, 
+-	0x7e, 0x78, 0x1c, 0x06, 0x28, 0xff, 0xd0, 0x14, 
+-	0x21, 0x00, 0x00, 0xb0, 0x4a, 0x5b, 0x50, 0x11, 
+-	0x20, 0x01, 0x40, 0xb0, 0x43, 0xc0, 0x49, 0x5a, 
+-	0x68, 0x09, 0x40, 0x08, 0x49, 0x58, 0x60, 0x08, 
+-	0x20, 0xff, 0x76, 0x78, 0x20, 0xff, 0x49, 0x51, 
+-	0x55, 0x88, 0x21, 0x00, 0x00, 0xb0, 0x9a, 0x03, 
+-	0x50, 0x11, 0x20, 0x00, 0x99, 0x05, 0x00, 0x89, 
+-	0x4a, 0x4b, 0x50, 0x50, 0x24, 0x00, 0x2c, 0x0c, 
+-	0xdb, 0x06, 0xe0, 0x09, 0xe0, 0x00, 0xe0, 0x0e, 
+-	0x1c, 0x60, 0x06, 0x04, 0x0e, 0x24, 0xe7, 0xf6, 
+-	0x20, 0x00, 0x19, 0x39, 0x73, 0x08, 0xe7, 0xf7, 
+-	0x20, 0x00, 0x83, 0x38, 0x20, 0x00, 0x70, 0xf8, 
+-	0x20, 0x00, 0xb0, 0x08, 0xe7, 0x66, 0x99, 0x05, 
+-	0x00, 0x88, 0x49, 0x3f, 0x58, 0x08, 0x28, 0x00, 
+-	0xd0, 0x02, 0x20, 0xb0, 0xb0, 0x08, 0xe7, 0x5d, 
+-	0x99, 0x07, 0x29, 0x11, 0xdb, 0x02, 0x99, 0x07, 
+-	0x29, 0x13, 0xdd, 0x02, 0x20, 0xb1, 0xb0, 0x08, 
+-	0xe7, 0x54, 0x99, 0x09, 0x00, 0x88, 0x1f, 0xc1, 
+-	0x39, 0x21, 0x91, 0x01, 0x20, 0xff, 0x30, 0x81, 
+-	0x90, 0x00, 0x99, 0x01, 0x98, 0x00, 0x42, 0x81, 
+-	0xda, 0x02, 0x20, 0xb5, 0xb0, 0x08, 0xe7, 0x45, 
+-	0x9d, 0x08, 0x98, 0x08, 0x30, 0x1c, 0x90, 0x08, 
+-	0x98, 0x08, 0x90, 0x04, 0x98, 0x08, 0x30, 0x0c, 
+-	0x90, 0x08, 0x98, 0x08, 0x90, 0x02, 0x9a, 0x02, 
+-	0x98, 0x04, 0x60, 0x02, 0x99, 0x09, 0x98, 0x04, 
+-	0x60, 0x41, 0x20, 0x00, 0x99, 0x04, 0x60, 0x88, 
+-	0x20, 0x00, 0x61, 0xa8, 0x1d, 0xe8, 0x30, 0x11, 
+-	0x9a, 0x02, 0x99, 0x01, 0xf0, 0x00, 0xf8, 0x56, 
+-	0x20, 0x00, 0x70, 0x28, 0x98, 0x06, 0x99, 0x07, 
+-	0x43, 0x08, 0x70, 0x68, 0x20, 0x00, 0x70, 0xa8, 
+-	0x20, 0x02, 0x70, 0xe8, 0x20, 0x00, 0x71, 0x28, 
+-	0x98, 0x04, 0x60, 0xa8, 0x20, 0x00, 0x60, 0xe8, 
+-	0x9a, 0x02, 0x61, 0x2a, 0x9a, 0x02, 0x61, 0x6a, 
+-	0x99, 0x05, 0x00, 0x88, 0x49, 0x16, 0x50, 0x0d, 
+-	0x20, 0x00, 0x60, 0xf8, 0x88, 0x38, 0x4b, 0x1c, 
+-	0x40, 0x18, 0x80, 0x38, 0x20, 0x00, 0x60, 0xb8, 
+-	0x9a, 0x02, 0x60, 0x7a, 0x98, 0x06, 0x99, 0x07, 
+-	0x43, 0x08, 0x70, 0xb8, 0x24, 0x00, 0x2c, 0x0c, 
+-	0xdb, 0x04, 0xe0, 0x07, 0x1c, 0x60, 0x06, 0x04, 
+-	0x0e, 0x24, 0xe7, 0xf8, 0x20, 0x00, 0x19, 0x39, 
+-	0x74, 0x08, 0xe7, 0xf7, 0x20, 0x00, 0x83, 0x38, 
+-	0x20, 0x00, 0x70, 0xf8, 0x20, 0xff, 0x76, 0x38, 
+-	0x20, 0xff, 0x76, 0x78, 0x20, 0x00, 0xb0, 0x08, 
+-	0xe6, 0xec, 0xb0, 0x05, 0xb0, 0x03, 0xe6, 0xe9, 
+-	0x2e, 0x08, 0x5d, 0xc4, 0x00, 0x00, 0xff, 0xff, 
+-	0x2e, 0x08, 0x5e, 0x5c, 0x2e, 0x08, 0x5f, 0xa4, 
+-	0x2e, 0x08, 0x5e, 0xdc, 0x2e, 0x08, 0x5e, 0xe4, 
+-	0x9e, 0x00, 0x04, 0xb8, 0x2e, 0x08, 0x5f, 0x64, 
+-	0x2e, 0x08, 0x5e, 0xe0, 0x2e, 0x08, 0x5f, 0xc4, 
+-	0xff, 0xff, 0xfb, 0xff, 0xb4, 0x90, 0x1c, 0x04, 
+-	0x1c, 0x0f, 0x1c, 0x13, 0x21, 0x00, 0x68, 0x22, 
+-	0x2a, 0x00, 0xd0, 0x00, 0x60, 0x13, 0x1d, 0xd8, 
+-	0x30, 0xb9, 0x60, 0x18, 0x33, 0xc0, 0x31, 0x01, 
+-	0x3f, 0xc0, 0x2f, 0xc0, 0xd8, 0xf7, 0x20, 0x00, 
+-	0x60, 0x18, 0x60, 0x23, 0x31, 0x01, 0x1c, 0x08, 
+-	0xbc, 0x90, 0x47, 0x70, 0xe7, 0xfc, 0xb4, 0x90, 
+-	0x1c, 0x03, 0x1c, 0x0a, 0x6b, 0x18, 0x68, 0xd1, 
+-	0x68, 0x07, 0x2f, 0x00, 0xd0, 0x0c, 0x68, 0x07, 
+-	0x60, 0x0f, 0x68, 0x41, 0x68, 0x57, 0x68, 0x84, 
+-	0x19, 0x3f, 0x60, 0x57, 0x27, 0x00, 0x60, 0x07, 
+-	0x27, 0x00, 0x60, 0x47, 0x27, 0x00, 0x60, 0x87, 
+-	0x6a, 0xc7, 0x2f, 0x00, 0xd0, 0x0c, 0x6a, 0xc7, 
+-	0x60, 0x0f, 0x6b, 0x01, 0x68, 0x57, 0x6b, 0x44, 
+-	0x19, 0x3f, 0x60, 0x57, 0x27, 0x00, 0x62, 0xc7, 
+-	0x27, 0x00, 0x63, 0x07, 0x27, 0x00, 0x63, 0x47, 
+-	0x60, 0xd1, 0xbc, 0x90, 0x47, 0x70, 0xe7, 0xfc, 
+-	0x20, 0x00, 0x49, 0x01, 0x70, 0x08, 0x47, 0x70, 
+-	0x2e, 0x08, 0x7c, 0x14, 0xb5, 0xff, 0xb0, 0x82, 
+-	0x9b, 0x05, 0x06, 0x18, 0x16, 0x00, 0x90, 0x00, 
+-	0x98, 0x0c, 0x06, 0x01, 0x16, 0x09, 0x91, 0x01, 
+-	0x98, 0x00, 0x28, 0x1f, 0xdd, 0x05, 0x20, 0xaf, 
+-	0xb0, 0x02, 0xb0, 0x04, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x48, 0x37, 0x78, 0x00, 0x28, 0x00, 
+-	0xd0, 0x03, 0x20, 0xd2, 0xb0, 0x02, 0xe7, 0xf4, 
+-	0xe0, 0x64, 0x20, 0xff, 0x49, 0x32, 0x70, 0x08, 
+-	0x49, 0x32, 0x98, 0x00, 0xf0, 0x09, 0xfa, 0xca, 
+-	0x9a, 0x04, 0x2a, 0x00, 0xd9, 0x52, 0x20, 0xff, 
+-	0x49, 0x2f, 0x70, 0x08, 0x9d, 0x02, 0x98, 0x0b, 
+-	0x99, 0x01, 0x18, 0x44, 0x99, 0x01, 0x20, 0xc0, 
+-	0x1a, 0x40, 0x9a, 0x04, 0x42, 0x90, 0xd9, 0x01, 
+-	0x9f, 0x04, 0xe0, 0x02, 0x99, 0x01, 0x20, 0xc0, 
+-	0x1a, 0x47, 0x1c, 0x3a, 0x1c, 0x21, 0x1c, 0x28, 
+-	0x23, 0xfe, 0xf0, 0x05, 0xfa, 0xa5, 0x1c, 0x06, 
+-	0x2e, 0xd0, 0xd1, 0x0a, 0x20, 0x03, 0xf0, 0x04, 
+-	0xf9, 0xa9, 0x1c, 0x3a, 0x1c, 0x21, 0x1c, 0x28, 
+-	0x23, 0xfe, 0xf0, 0x05, 0xfa, 0x99, 0x1c, 0x06, 
+-	0xe7, 0xf2, 0x98, 0x02, 0x19, 0xc0, 0x90, 0x02, 
+-	0x9a, 0x04, 0x1b, 0xd2, 0x92, 0x04, 0x9d, 0x0b, 
+-	0x9c, 0x03, 0x9b, 0x00, 0x1c, 0x3a, 0x1c, 0x21, 
+-	0x1c, 0x28, 0xf0, 0x05, 0xfa, 0x89, 0x1c, 0x06, 
+-	0x2e, 0xd0, 0xd1, 0x0a, 0x20, 0x03, 0xf0, 0x04, 
+-	0xf9, 0x8d, 0x9b, 0x00, 0x1c, 0x3a, 0x1c, 0x21, 
+-	0x1c, 0x28, 0xf0, 0x05, 0xfa, 0x7d, 0x1c, 0x06, 
+-	0xe7, 0xf2, 0x99, 0x03, 0x29, 0x20, 0xd3, 0x04, 
+-	0x99, 0x01, 0x18, 0x78, 0x99, 0x03, 0x18, 0x41, 
+-	0x91, 0x03, 0x48, 0x0b, 0x78, 0x00, 0x28, 0x00, 
+-	0xd0, 0x03, 0x20, 0x03, 0xf0, 0x04, 0xf9, 0x76, 
+-	0xe7, 0xf7, 0xe7, 0xa9, 0x20, 0x00, 0x49, 0x04, 
+-	0x70, 0x08, 0x20, 0x00, 0xb0, 0x02, 0xe7, 0x90, 
+-	0xb0, 0x02, 0xe7, 0x8e, 0xe7, 0x8d, 0x00, 0x00, 
+-	0x2e, 0x08, 0x1f, 0xa0, 0x2e, 0x01, 0x35, 0x35, 
+-	0x2e, 0x08, 0x7c, 0x14, 0xb5, 0xff, 0x1c, 0x0f, 
+-	0x9a, 0x02, 0x06, 0x14, 0x0e, 0x24, 0x9b, 0x03, 
+-	0x06, 0x1d, 0x0e, 0x2d, 0x2c, 0x1f, 0xdb, 0x04, 
+-	0x20, 0xb3, 0xb0, 0x04, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x04, 0x3a, 0x0c, 0x12, 0x2d, 0x01, 
+-	0xd1, 0x73, 0x20, 0x01, 0x03, 0x40, 0x40, 0x10, 
+-	0xd0, 0x0a, 0x4b, 0x6f, 0x40, 0x1a, 0x48, 0x6f, 
+-	0x68, 0x00, 0x68, 0x00, 0x23, 0x02, 0x43, 0xdb, 
+-	0x40, 0x18, 0x4b, 0x6c, 0x68, 0x1b, 0x60, 0x18, 
+-	0x20, 0x01, 0x02, 0x40, 0x40, 0x10, 0xd0, 0x0a, 
+-	0x4b, 0x69, 0x40, 0x1a, 0x48, 0x67, 0x68, 0x00, 
+-	0x68, 0x00, 0x23, 0x20, 0x43, 0xdb, 0x40, 0x18, 
+-	0x4b, 0x64, 0x68, 0x1b, 0x60, 0x18, 0x20, 0x01, 
+-	0x05, 0x00, 0x40, 0x38, 0xd0, 0x08, 0x48, 0x63, 
+-	0x68, 0x00, 0x69, 0x80, 0x23, 0x01, 0x05, 0x1b, 
+-	0x43, 0x18, 0x4b, 0x60, 0x68, 0x1b, 0x61, 0x98, 
+-	0x20, 0x01, 0x05, 0x40, 0x40, 0x38, 0xd0, 0x08, 
+-	0x48, 0x5c, 0x68, 0x00, 0x69, 0x80, 0x23, 0x01, 
+-	0x05, 0x5b, 0x43, 0x18, 0x4b, 0x59, 0x68, 0x1b, 
+-	0x61, 0x98, 0x0a, 0x12, 0x48, 0x55, 0x68, 0x00, 
+-	0x68, 0x00, 0x43, 0x90, 0x4b, 0x53, 0x68, 0x1b, 
+-	0x60, 0x18, 0x48, 0x52, 0x68, 0x00, 0x68, 0x00, 
+-	0x4b, 0x53, 0x65, 0x18, 0x48, 0x51, 0x68, 0x00, 
+-	0x77, 0x04, 0x20, 0x09, 0x04, 0x80, 0x40, 0x38, 
+-	0xd0, 0x35, 0x21, 0x00, 0x29, 0x20, 0xdb, 0x04, 
+-	0xe0, 0x31, 0x1c, 0x48, 0x06, 0x01, 0x0e, 0x09, 
+-	0xe7, 0xf8, 0x20, 0x01, 0x40, 0x88, 0x9b, 0x00, 
+-	0x40, 0x18, 0xd0, 0x27, 0x20, 0x01, 0x05, 0x40, 
+-	0x40, 0x38, 0xd0, 0x0e, 0x00, 0xc8, 0x1a, 0x40, 
+-	0x00, 0x80, 0x4b, 0x46, 0x68, 0x1b, 0x5a, 0x18, 
+-	0x23, 0xff, 0x33, 0x01, 0x43, 0x18, 0x00, 0xcb, 
+-	0x1a, 0x5b, 0x00, 0x9b, 0x4e, 0x41, 0x68, 0x36, 
+-	0x52, 0xf0, 0x20, 0x01, 0x04, 0x80, 0x40, 0x38, 
+-	0xd0, 0x10, 0x00, 0xc8, 0x1a, 0x40, 0x00, 0x80, 
+-	0xe0, 0x00, 0xe0, 0x0d, 0x4b, 0x3b, 0x68, 0x1b, 
+-	0x5a, 0x18, 0x23, 0x01, 0x02, 0x5b, 0x43, 0x18, 
+-	0x00, 0xcb, 0x1a, 0x5b, 0x00, 0x9b, 0x4e, 0x37, 
+-	0x68, 0x36, 0x52, 0xf0, 0xe7, 0xcd, 0xe0, 0x5c, 
+-	0x2d, 0x02, 0xd1, 0x5a, 0x0a, 0x12, 0x48, 0x2f, 
+-	0x68, 0x00, 0x68, 0x00, 0x43, 0x10, 0x4b, 0x2d, 
+-	0x68, 0x1b, 0x60, 0x18, 0x48, 0x2b, 0x68, 0x00, 
+-	0x68, 0x00, 0x4b, 0x2d, 0x65, 0x18, 0x20, 0x01, 
+-	0x05, 0x00, 0x40, 0x38, 0xd0, 0x07, 0x48, 0x29, 
+-	0x68, 0x00, 0x69, 0x80, 0x4b, 0x2a, 0x40, 0x18, 
+-	0x4b, 0x26, 0x68, 0x1b, 0x61, 0x98, 0x20, 0x01, 
+-	0x05, 0x40, 0x40, 0x38, 0xd0, 0x07, 0x48, 0x23, 
+-	0x68, 0x00, 0x69, 0x80, 0x4b, 0x25, 0x40, 0x18, 
+-	0x4b, 0x20, 0x68, 0x1b, 0x61, 0x98, 0x21, 0x00, 
+-	0x29, 0x20, 0xdb, 0x04, 0xe0, 0x31, 0x1c, 0x48, 
+-	0x06, 0x01, 0x0e, 0x09, 0xe7, 0xf8, 0x20, 0x09, 
+-	0x04, 0x80, 0x40, 0x38, 0xd0, 0x28, 0x20, 0x01, 
+-	0x40, 0x88, 0x9b, 0x00, 0x40, 0x18, 0xd0, 0x23, 
+-	0x20, 0x01, 0x05, 0x40, 0x40, 0x38, 0xd0, 0x0d, 
+-	0x00, 0xc8, 0x1a, 0x40, 0x00, 0x80, 0x4b, 0x15, 
+-	0x68, 0x1b, 0x5a, 0x18, 0x4b, 0x16, 0x40, 0x18, 
+-	0x00, 0xcb, 0x1a, 0x5b, 0x00, 0x9b, 0x4e, 0x11, 
+-	0x68, 0x36, 0x52, 0xf0, 0x20, 0x01, 0x04, 0x80, 
+-	0x40, 0x38, 0xd0, 0x0d, 0x00, 0xc8, 0x1a, 0x40, 
+-	0x00, 0x80, 0x4b, 0x0c, 0x68, 0x1b, 0x5a, 0x18, 
+-	0x4b, 0x05, 0x40, 0x18, 0x00, 0xcb, 0x1a, 0x5b, 
+-	0x00, 0x9b, 0x4e, 0x08, 0x68, 0x36, 0x52, 0xf0, 
+-	0xe7, 0xcd, 0x20, 0x00, 0xe7, 0x15, 0xe7, 0x14, 
+-	0xff, 0xff, 0xfd, 0xff, 0x2e, 0x08, 0x7c, 0x18, 
+-	0xff, 0xff, 0xdf, 0xff, 0x2e, 0x08, 0x5e, 0x0c, 
+-	0x66, 0x00, 0x00, 0x80, 0x2e, 0x08, 0x5d, 0xc4, 
+-	0xff, 0xef, 0xff, 0xff, 0xff, 0xdf, 0xff, 0xff, 
+-	0xff, 0xff, 0xfe, 0xff, 0xb5, 0x80, 0x1c, 0x07, 
+-	0x48, 0x17, 0x68, 0x01, 0x20, 0x00, 0xf0, 0x12, 
+-	0xf8, 0x69, 0x60, 0x38, 0x48, 0x14, 0x68, 0x00, 
+-	0x1d, 0x01, 0x20, 0x00, 0xf0, 0x12, 0xf8, 0x62, 
+-	0x60, 0x78, 0x48, 0x11, 0x68, 0x00, 0x1d, 0xc1, 
+-	0x31, 0x05, 0x20, 0x00, 0xf0, 0x12, 0xf8, 0x5a, 
+-	0x60, 0xf8, 0x48, 0x0d, 0x68, 0x00, 0x1d, 0xc1, 
+-	0x31, 0x09, 0x20, 0x00, 0xf0, 0x12, 0xf8, 0x52, 
+-	0x61, 0x38, 0x48, 0x09, 0x68, 0x00, 0x1d, 0xc1, 
+-	0x31, 0x0d, 0x20, 0x00, 0xf0, 0x12, 0xf8, 0x4a, 
+-	0x61, 0x78, 0x48, 0x05, 0x68, 0x00, 0x1d, 0xc1, 
+-	0x31, 0x01, 0x20, 0x00, 0xf0, 0x12, 0xf8, 0x42, 
+-	0x60, 0xb8, 0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x5e, 0x0c, 0xb5, 0xf0, 0x1c, 0x07, 
+-	0xb0, 0x82, 0x26, 0x00, 0x89, 0xb8, 0x23, 0x08, 
+-	0x40, 0x18, 0xd0, 0x08, 0x48, 0x59, 0x6e, 0xc2, 
+-	0x48, 0x58, 0x6f, 0x01, 0x48, 0x57, 0x6a, 0x00, 
+-	0xf7, 0xfd, 0xff, 0x5c, 0x1c, 0x06, 0x89, 0xb8, 
+-	0x23, 0x10, 0x40, 0x18, 0xd0, 0x02, 0x48, 0x53, 
+-	0x69, 0x40, 0x1c, 0x06, 0x89, 0xb8, 0x07, 0xc0, 
+-	0x0f, 0xc0, 0xd0, 0x21, 0x48, 0x50, 0x68, 0xc0, 
+-	0x90, 0x00, 0x68, 0x78, 0x02, 0x40, 0x99, 0x00, 
+-	0x1a, 0x08, 0x90, 0x01, 0x98, 0x01, 0x21, 0x33, 
+-	0x06, 0x49, 0x65, 0xc8, 0x98, 0x00, 0x21, 0x33, 
+-	0x06, 0x49, 0x66, 0x08, 0x98, 0x01, 0x49, 0x48, 
+-	0x60, 0x88, 0x98, 0x00, 0x49, 0x46, 0x60, 0xc8, 
+-	0x20, 0x01, 0x21, 0x33, 0x06, 0x49, 0x66, 0xc8, 
+-	0x20, 0x00, 0x21, 0x33, 0x06, 0x49, 0x66, 0xc8, 
+-	0x89, 0xb8, 0x23, 0x02, 0x43, 0x18, 0x81, 0xb8, 
+-	0x89, 0xb8, 0x23, 0x02, 0x40, 0x18, 0xd0, 0x3e, 
+-	0x48, 0x3d, 0x68, 0x80, 0x1f, 0xc4, 0x3c, 0xff, 
+-	0x3c, 0xfa, 0x68, 0x38, 0x02, 0x40, 0x1a, 0x25, 
+-	0x48, 0x38, 0x60, 0x45, 0x48, 0x37, 0x60, 0x84, 
+-	0x20, 0x33, 0x06, 0x40, 0x65, 0x45, 0x20, 0x33, 
+-	0x06, 0x40, 0x65, 0x84, 0x1b, 0x60, 0x38, 0xc0, 
+-	0x21, 0x33, 0x06, 0x49, 0x66, 0x88, 0x21, 0x00, 
+-	0x48, 0x32, 0xf7, 0xfd, 0xfb, 0x89, 0x48, 0x32, 
+-	0x68, 0x00, 0x28, 0x00, 0xd0, 0x00, 0xe7, 0xfa, 
+-	0x48, 0x30, 0x68, 0x01, 0x23, 0xff, 0x33, 0x01, 
+-	0x43, 0x19, 0x60, 0x01, 0x48, 0x2e, 0x6d, 0x80, 
+-	0x49, 0x2d, 0x65, 0x88, 0x48, 0x2c, 0x6b, 0xc0, 
+-	0x23, 0x01, 0x07, 0x9b, 0x40, 0x18, 0xd0, 0x00, 
+-	0xe7, 0xf8, 0x20, 0x33, 0x06, 0x40, 0x66, 0x45, 
+-	0x20, 0x33, 0x06, 0x40, 0x66, 0x84, 0x21, 0x00, 
+-	0x20, 0xff, 0xf7, 0xfd, 0xfb, 0x69, 0x48, 0x20, 
+-	0x60, 0x05, 0x48, 0x1f, 0x60, 0x44, 0x89, 0xb8, 
+-	0x23, 0x04, 0x40, 0x18, 0xd0, 0x21, 0x68, 0xb8, 
+-	0x28, 0x00, 0xd1, 0x06, 0x48, 0x1f, 0x68, 0x01, 
+-	0x23, 0x02, 0x43, 0xdb, 0x40, 0x19, 0x60, 0x01, 
+-	0xe0, 0x17, 0x69, 0x38, 0x49, 0x1a, 0x65, 0x88, 
+-	0x69, 0x38, 0x68, 0xb9, 0x02, 0x49, 0x18, 0x40, 
+-	0x49, 0x17, 0x65, 0xc8, 0x20, 0x03, 0x02, 0x00, 
+-	0x49, 0x15, 0x67, 0x48, 0x20, 0x02, 0x49, 0x14, 
+-	0x67, 0x88, 0x20, 0x40, 0x49, 0x12, 0x66, 0x08, 
+-	0x48, 0x12, 0x68, 0x01, 0x23, 0x02, 0x43, 0x19, 
+-	0x60, 0x01, 0x20, 0x33, 0x06, 0x40, 0x6d, 0x40, 
+-	0x23, 0x0d, 0x06, 0x9b, 0x1a, 0xc0, 0x60, 0x38, 
+-	0x20, 0x33, 0x06, 0x40, 0x6d, 0xc0, 0x23, 0x0d, 
+-	0x06, 0x9b, 0x1a, 0xc0, 0x60, 0x78, 0x48, 0x0a, 
+-	0x43, 0x30, 0x60, 0xb8, 0xb0, 0x02, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0xcc, 0x00, 0x0f, 0x80, 
+-	0x2e, 0x08, 0x7c, 0x1c, 0x00, 0x00, 0x80, 0x0f, 
+-	0xcc, 0x00, 0x05, 0x00, 0x66, 0x00, 0x00, 0xe0, 
+-	0x66, 0x00, 0x00, 0x80, 0x66, 0x00, 0x00, 0xf0, 
+-	0xcc, 0x00, 0x00, 0x00, 0xb5, 0xf3, 0x1c, 0x02, 
+-	0xb0, 0x81, 0x68, 0x93, 0x68, 0x54, 0x21, 0x00, 
+-	0x1d, 0xd8, 0x30, 0xb9, 0x1b, 0x00, 0x06, 0x05, 
+-	0x0e, 0x2d, 0x2d, 0x12, 0xda, 0x12, 0x21, 0x00, 
+-	0x42, 0xa9, 0xdb, 0x04, 0xe0, 0x08, 0x1c, 0x48, 
+-	0x06, 0x01, 0x0e, 0x09, 0xe7, 0xf8, 0x78, 0x26, 
+-	0x34, 0x01, 0x98, 0x02, 0x54, 0x46, 0xe7, 0xf6, 
+-	0x68, 0x1b, 0x1d, 0x18, 0x90, 0x00, 0x98, 0x00, 
+-	0x78, 0x80, 0x18, 0xc4, 0x1c, 0x0f, 0x2f, 0x12, 
+-	0xdb, 0x04, 0xe0, 0x08, 0x1c, 0x78, 0x06, 0x07, 
+-	0x0e, 0x3f, 0xe7, 0xf8, 0x78, 0x26, 0x34, 0x01, 
+-	0x98, 0x02, 0x55, 0xc6, 0xe7, 0xf6, 0x20, 0x00, 
+-	0xb0, 0x01, 0xb0, 0x02, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0xb0, 0x01, 0xe7, 0xf9, 0xb4, 0xf0, 
+-	0x1c, 0x07, 0x1c, 0x0d, 0x1c, 0x14, 0xb0, 0x82, 
+-	0x20, 0x00, 0x70, 0x20, 0x78, 0x78, 0x23, 0x80, 
+-	0x40, 0x18, 0xd0, 0x03, 0x20, 0xb1, 0xb0, 0x02, 
+-	0xbc, 0xf0, 0x47, 0x70, 0x78, 0xba, 0x20, 0x40, 
+-	0x40, 0x10, 0xd0, 0x2a, 0x07, 0x12, 0x0f, 0x12, 
+-	0x07, 0xd0, 0x0f, 0xc0, 0xd0, 0x25, 0x20, 0x40, 
+-	0x70, 0x20, 0x35, 0x0a, 0x21, 0x00, 0x1d, 0xf8, 
+-	0x30, 0x0d, 0x90, 0x01, 0x1d, 0xf8, 0x30, 0x1d, 
+-	0x90, 0x00, 0x21, 0x00, 0x29, 0x08, 0xdb, 0x04, 
+-	0xe0, 0x14, 0x1c, 0x48, 0x06, 0x01, 0x0e, 0x09, 
+-	0xe7, 0xf8, 0x78, 0x2e, 0x35, 0x01, 0x98, 0x00, 
+-	0x78, 0x03, 0x30, 0x01, 0x90, 0x00, 0x40, 0x33, 
+-	0x98, 0x01, 0x78, 0x06, 0x30, 0x01, 0x90, 0x01, 
+-	0x42, 0xb3, 0xd0, 0x02, 0x20, 0x00, 0x70, 0x20, 
+-	0xe0, 0x00, 0xe7, 0xea, 0x20, 0x00, 0xb0, 0x02, 
+-	0xe7, 0xce, 0x20, 0xb1, 0xb0, 0x02, 0xe7, 0xcb, 
+-	0xb0, 0x02, 0xe7, 0xc9, 0xb5, 0xf7, 0x1c, 0x07, 
+-	0xb0, 0x8d, 0x20, 0x00, 0x9a, 0x0f, 0x70, 0x10, 
+-	0x78, 0x78, 0x23, 0x80, 0x40, 0x18, 0xd0, 0x05, 
+-	0x20, 0xb1, 0xb0, 0x0d, 0xb0, 0x03, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x78, 0xb8, 0x90, 0x05, 
+-	0x98, 0x05, 0x23, 0x40, 0x40, 0x18, 0xd0, 0x73, 
+-	0x98, 0x05, 0x07, 0x00, 0x0f, 0x00, 0x90, 0x05, 
+-	0x98, 0x05, 0x23, 0x02, 0x40, 0x18, 0xd1, 0x03, 
+-	0x98, 0x05, 0x23, 0x04, 0x40, 0x18, 0xd0, 0x68, 
+-	0x99, 0x0e, 0x79, 0x48, 0x23, 0x3e, 0x40, 0x18, 
+-	0x90, 0x0c, 0x78, 0xf8, 0x90, 0x04, 0x98, 0x04, 
+-	0x01, 0x00, 0x4b, 0x81, 0x18, 0xc0, 0x90, 0x02, 
+-	0x98, 0x02, 0x68, 0x00, 0x90, 0x01, 0x78, 0x7c, 
+-	0x23, 0xbf, 0x40, 0x1c, 0x23, 0xfe, 0x40, 0x1c, 
+-	0x20, 0x00, 0x90, 0x03, 0x98, 0x01, 0x06, 0x00, 
+-	0x0e, 0x00, 0x99, 0x0c, 0x42, 0x88, 0xd0, 0x08, 
+-	0x06, 0x20, 0x0e, 0x00, 0x24, 0x01, 0x43, 0x04, 
+-	0x20, 0x01, 0x90, 0x03, 0x23, 0xdf, 0x40, 0x1c, 
+-	0xe0, 0x06, 0x20, 0x02, 0x40, 0x20, 0xd0, 0x03, 
+-	0x70, 0x7c, 0x20, 0x00, 0xb0, 0x0d, 0xe7, 0xbd, 
+-	0x23, 0xfd, 0x40, 0x1c, 0x98, 0x05, 0x23, 0x04, 
+-	0x40, 0x18, 0xd0, 0x73, 0x6a, 0xfd, 0x98, 0x03, 
+-	0x28, 0x00, 0xd0, 0x14, 0x26, 0x00, 0x2e, 0x08, 
+-	0xdb, 0x04, 0xe0, 0x0e, 0x1c, 0x70, 0x06, 0x06, 
+-	0x0e, 0x36, 0xe7, 0xf8, 0x00, 0xb0, 0x19, 0x40, 
+-	0x68, 0x40, 0x00, 0xb1, 0x19, 0x49, 0x64, 0x48, 
+-	0x20, 0x00, 0x00, 0xb1, 0x19, 0x49, 0x62, 0x48, 
+-	0xe7, 0xf0, 0x88, 0x28, 0x80, 0x68, 0x20, 0x20, 
+-	0x40, 0x20, 0xd1, 0x3e, 0x99, 0x0e, 0x79, 0xc8, 
+-	0x09, 0x40, 0x06, 0x00, 0x0e, 0x00, 0x90, 0x0a, 
+-	0x99, 0x0e, 0x79, 0xc8, 0x06, 0xc0, 0x0e, 0xc0, 
+-	0x90, 0x09, 0x98, 0x0a, 0x30, 0x01, 0x06, 0x06, 
+-	0x0e, 0x36, 0x2e, 0x08, 0xdb, 0x04, 0xe0, 0x10, 
+-	0x1c, 0x70, 0x06, 0x06, 0x0e, 0x36, 0xe7, 0xf8, 
+-	0x20, 0x00, 0x00, 0xb1, 0x19, 0x49, 0xe0, 0x01, 
+-	0xe0, 0x9d, 0xe0, 0x9c, 0x64, 0x48, 0x88, 0x68, 
+-	0x21, 0x80, 0x41, 0x31, 0x43, 0x88, 0x80, 0x68, 
+-	0xe7, 0xee, 0x98, 0x0a, 0x00, 0x80, 0x19, 0x40, 
+-	0x6c, 0x41, 0x98, 0x09, 0x00, 0x80, 0x4a, 0x4b, 
+-	0x58, 0x10, 0x40, 0x08, 0x99, 0x0a, 0x00, 0x89, 
+-	0x19, 0x49, 0x64, 0x48, 0x06, 0x20, 0x0e, 0x00, 
+-	0x24, 0x20, 0x43, 0x04, 0x98, 0x01, 0x0a, 0x00, 
+-	0x02, 0x00, 0x90, 0x01, 0x98, 0x01, 0x99, 0x0c, 
+-	0x43, 0x08, 0x90, 0x01, 0x98, 0x01, 0x99, 0x02, 
+-	0x60, 0x08, 0x78, 0x38, 0x23, 0x80, 0x40, 0x18, 
+-	0xd0, 0x19, 0x99, 0x0e, 0x7b, 0x08, 0x07, 0x42, 
+-	0x0f, 0x52, 0x92, 0x07, 0x99, 0x0e, 0x7b, 0x08, 
+-	0x08, 0xc0, 0x06, 0x02, 0x0e, 0x12, 0x92, 0x08, 
+-	0x1d, 0xe9, 0x31, 0x3d, 0x91, 0x06, 0x99, 0x06, 
+-	0x9a, 0x08, 0x5c, 0x88, 0x49, 0x36, 0x9a, 0x07, 
+-	0x5c, 0x89, 0xe0, 0x00, 0xe0, 0x4e, 0x40, 0x08, 
+-	0x99, 0x06, 0x9a, 0x08, 0x54, 0x88, 0x99, 0x0e, 
+-	0x79, 0x88, 0x06, 0xc0, 0x0e, 0xc0, 0x90, 0x00, 
+-	0x98, 0x00, 0x49, 0x30, 0x40, 0xc1, 0x91, 0x00, 
+-	0x99, 0x0e, 0x79, 0x88, 0x09, 0x40, 0x06, 0x02, 
+-	0x0e, 0x12, 0x92, 0x0b, 0x9a, 0x0b, 0x00, 0x90, 
+-	0x19, 0x40, 0x6c, 0x40, 0x99, 0x00, 0x40, 0x08, 
+-	0xd0, 0x33, 0x06, 0x20, 0x0e, 0x00, 0x24, 0x40, 
+-	0x43, 0x04, 0x9a, 0x0b, 0x00, 0x90, 0x19, 0x40, 
+-	0x6c, 0x40, 0x99, 0x00, 0x40, 0x41, 0x00, 0x90, 
+-	0x19, 0x40, 0x64, 0x41, 0x9a, 0x0b, 0x00, 0x90, 
+-	0x19, 0x40, 0x6a, 0x40, 0x99, 0x00, 0x43, 0x01, 
+-	0x00, 0x90, 0x19, 0x40, 0x62, 0x41, 0x9a, 0x0b, 
+-	0x00, 0x90, 0x19, 0x40, 0x6c, 0x40, 0x28, 0x00, 
+-	0xd1, 0x17, 0x88, 0x68, 0x9a, 0x0b, 0x21, 0x80, 
+-	0x41, 0x11, 0x43, 0x88, 0x80, 0x68, 0x88, 0x68, 
+-	0x28, 0x00, 0xd1, 0x0e, 0x06, 0x20, 0x0e, 0x00, 
+-	0x24, 0x02, 0x43, 0x04, 0x23, 0xfe, 0x40, 0x1c, 
+-	0x98, 0x0c, 0x30, 0x02, 0x06, 0x00, 0x0e, 0x00, 
+-	0x90, 0x0c, 0x98, 0x0c, 0x23, 0x3e, 0x40, 0x18, 
+-	0x90, 0x0c, 0xe0, 0x0a, 0x06, 0x20, 0x0e, 0x00, 
+-	0x24, 0x40, 0x43, 0x04, 0x23, 0xfe, 0x40, 0x1c, 
+-	0x98, 0x0c, 0x1c, 0x41, 0x98, 0x04, 0xf0, 0x00, 
+-	0xf8, 0x13, 0x9a, 0x0f, 0x70, 0x14, 0x70, 0x7c, 
+-	0x20, 0x00, 0xb0, 0x0d, 0xe6, 0xe2, 0x20, 0xb1, 
+-	0xb0, 0x0d, 0xe6, 0xdf, 0xb0, 0x0d, 0xe6, 0xdd, 
+-	0x64, 0x00, 0x08, 0x00, 0x2e, 0x08, 0x20, 0x10, 
+-	0x2e, 0x08, 0x20, 0x90, 0x80, 0x00, 0x00, 0x00, 
+-	0xb5, 0xf3, 0x98, 0x00, 0x06, 0x07, 0x0e, 0x3f, 
+-	0x99, 0x01, 0x06, 0x0e, 0x0e, 0x36, 0x00, 0xf8, 
+-	0x4b, 0x13, 0x18, 0xc5, 0x01, 0x38, 0x4b, 0x13, 
+-	0x18, 0xc4, 0x01, 0x38, 0x4b, 0x12, 0x18, 0xc2, 
+-	0x68, 0x10, 0x23, 0x40, 0x43, 0xdb, 0x40, 0x18, 
+-	0x60, 0x10, 0x2e, 0x3e, 0xdc, 0x15, 0x68, 0x20, 
+-	0x1c, 0x01, 0x0a, 0x09, 0x02, 0x09, 0x43, 0x31, 
+-	0x60, 0x21, 0x68, 0x28, 0x1c, 0x01, 0x0a, 0x09, 
+-	0x02, 0x09, 0x23, 0x3e, 0x43, 0x19, 0x60, 0x29, 
+-	0x68, 0x10, 0x23, 0x40, 0x43, 0x18, 0x60, 0x10, 
+-	0x20, 0x00, 0xb0, 0x02, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x20, 0xbd, 0xe7, 0xf9, 0xe7, 0xf8, 
+-	0x64, 0x00, 0x10, 0x00, 0x64, 0x00, 0x08, 0x00, 
+-	0x64, 0x00, 0x08, 0x08, 0xb5, 0xf3, 0xb0, 0x93, 
+-	0x98, 0x13, 0x69, 0x00, 0x90, 0x01, 0x98, 0x01, 
+-	0x78, 0x40, 0x23, 0x80, 0x40, 0x18, 0xd0, 0x05, 
+-	0x20, 0xbe, 0xb0, 0x13, 0xb0, 0x02, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x98, 0x01, 0x78, 0x80, 
+-	0x90, 0x08, 0x98, 0x08, 0x23, 0x40, 0x40, 0x18, 
+-	0xd0, 0x73, 0x98, 0x08, 0x23, 0x20, 0x40, 0x18, 
+-	0xd0, 0x6f, 0x98, 0x01, 0x6b, 0x07, 0x98, 0x01, 
+-	0x79, 0xc0, 0x00, 0x80, 0x49, 0x76, 0x58, 0x08, 
+-	0x90, 0x00, 0x98, 0x00, 0x68, 0xc0, 0x1c, 0x06, 
+-	0xd1, 0x02, 0x20, 0xb6, 0xb0, 0x13, 0xe7, 0xe1, 
+-	0x78, 0xb0, 0x07, 0xc0, 0x0f, 0xc0, 0xd0, 0x02, 
+-	0x20, 0xb6, 0xb0, 0x13, 0xe7, 0xda, 0xa9, 0x11, 
+-	0x1c, 0x30, 0xf0, 0x00, 0xf9, 0x2b, 0x90, 0x02, 
+-	0x98, 0x11, 0x28, 0x00, 0xd1, 0x02, 0x98, 0x02, 
+-	0xb0, 0x13, 0xe7, 0xcf, 0x98, 0x11, 0x90, 0x0e, 
+-	0x20, 0x01, 0x90, 0x0b, 0x98, 0x13, 0x88, 0x40, 
+-	0x90, 0x0d, 0x98, 0x13, 0x68, 0x40, 0x90, 0x06, 
+-	0x98, 0x13, 0x68, 0x81, 0x91, 0x10, 0x99, 0x10, 
+-	0x1d, 0xc8, 0x30, 0xb9, 0x90, 0x05, 0x98, 0x05, 
+-	0x99, 0x06, 0x1a, 0x40, 0x04, 0x04, 0x0c, 0x24, 
+-	0x99, 0x14, 0x79, 0x88, 0x90, 0x03, 0x98, 0x03, 
+-	0x06, 0xc0, 0x0e, 0xc0, 0x90, 0x0a, 0x98, 0x0a, 
+-	0x49, 0x5a, 0x40, 0xc1, 0x91, 0x0a, 0x98, 0x03, 
+-	0x09, 0x40, 0x06, 0x00, 0x0e, 0x00, 0x90, 0x09, 
+-	0x98, 0x09, 0x00, 0x80, 0x19, 0xc0, 0x6b, 0x80, 
+-	0x99, 0x0a, 0x40, 0x08, 0xd0, 0x02, 0x20, 0xb1, 
+-	0xb0, 0x13, 0xe7, 0x9f, 0x20, 0xb8, 0x90, 0x0c, 
+-	0x98, 0x11, 0x30, 0x08, 0x90, 0x04, 0x20, 0x00, 
+-	0x90, 0x07, 0x98, 0x07, 0x28, 0x00, 0xd0, 0x10, 
+-	0x99, 0x10, 0x68, 0x09, 0x91, 0x10, 0x99, 0x10, 
+-	0x1d, 0x08, 0x90, 0x12, 0x98, 0x12, 0x78, 0x80, 
+-	0x99, 0x10, 0x18, 0x40, 0x90, 0x06, 0x98, 0x12, 
+-	0x78, 0x81, 0x20, 0xc0, 0x1a, 0x40, 0x04, 0x04, 
+-	0x0c, 0x24, 0x98, 0x0d, 0x42, 0x84, 0xdb, 0x05, 
+-	0xe0, 0x00, 0xe0, 0x7c, 0x9c, 0x0d, 0x20, 0x00, 
+-	0x90, 0x0d, 0xe0, 0x06, 0x98, 0x0d, 0x1b, 0x00, 
+-	0x04, 0x00, 0x0c, 0x00, 0x90, 0x0d, 0x20, 0x01, 
+-	0x90, 0x07, 0x98, 0x0c, 0x42, 0xa0, 0xda, 0x2e, 
+-	0x25, 0x00, 0x98, 0x0c, 0x42, 0x85, 0xdb, 0x04, 
+-	0xe0, 0x0c, 0x1c, 0x68, 0x06, 0x05, 0x0e, 0x2d, 
+-	0xe7, 0xf7, 0x98, 0x06, 0x78, 0x01, 0x30, 0x01, 
+-	0x90, 0x06, 0x98, 0x04, 0x70, 0x01, 0x30, 0x01, 
+-	0x90, 0x04, 0xe7, 0xf2, 0x98, 0x0c, 0x1a, 0x20, 
+-	0x04, 0x04, 0x0c, 0x24, 0xa9, 0x11, 0x1c, 0x30, 
+-	0xf0, 0x00, 0xf8, 0xac, 0x90, 0x02, 0x98, 0x11, 
+-	0x28, 0x00, 0xd1, 0x08, 0x98, 0x0e, 0x60, 0xb0, 
+-	0x68, 0x70, 0x99, 0x0b, 0x18, 0x40, 0x60, 0x70, 
+-	0x98, 0x02, 0xb0, 0x13, 0xe7, 0x4a, 0x98, 0x0b, 
+-	0x30, 0x01, 0x90, 0x0b, 0x20, 0xb8, 0x90, 0x0c, 
+-	0x98, 0x11, 0x30, 0x08, 0x90, 0x04, 0x25, 0x00, 
+-	0x42, 0xa5, 0xdb, 0x04, 0xe0, 0x0c, 0x1c, 0x68, 
+-	0x06, 0x05, 0x0e, 0x2d, 0xe7, 0xf8, 0x98, 0x06, 
+-	0x78, 0x01, 0x30, 0x01, 0x90, 0x06, 0x98, 0x04, 
+-	0x70, 0x01, 0x30, 0x01, 0x90, 0x04, 0xe7, 0xf2, 
+-	0x98, 0x0c, 0x1b, 0x00, 0x04, 0x00, 0x0c, 0x00, 
+-	0x90, 0x0c, 0x98, 0x0d, 0x28, 0x00, 0xd1, 0x90, 
+-	0x6b, 0x39, 0x91, 0x0f, 0x6a, 0xf8, 0x28, 0x00, 
+-	0xd1, 0x02, 0x98, 0x0e, 0x62, 0xf8, 0xe0, 0x05, 
+-	0x98, 0x0e, 0x99, 0x0f, 0x60, 0x08, 0x98, 0x0e, 
+-	0x6d, 0xb9, 0x60, 0x08, 0x98, 0x09, 0x00, 0x80, 
+-	0x19, 0xc0, 0x6b, 0x80, 0x99, 0x0a, 0x43, 0x01, 
+-	0x98, 0x09, 0x00, 0x80, 0x19, 0xc0, 0x63, 0x81, 
+-	0x6b, 0x78, 0x99, 0x0b, 0x18, 0x40, 0x63, 0x78, 
+-	0x20, 0x00, 0x99, 0x11, 0x60, 0x08, 0x98, 0x11, 
+-	0x63, 0x38, 0x98, 0x0e, 0x30, 0x04, 0x65, 0xb8, 
+-	0x98, 0x02, 0xb0, 0x13, 0xe7, 0x02, 0x20, 0xb1, 
+-	0xb0, 0x13, 0xe6, 0xff, 0xb0, 0x13, 0xe6, 0xfd, 
+-	0x2e, 0x08, 0x5e, 0x5c, 0x80, 0x00, 0x00, 0x00, 
+-	0xb4, 0xf0, 0x1c, 0x01, 0x78, 0x88, 0x23, 0x20, 
+-	0x40, 0x18, 0xd0, 0x42, 0x79, 0xc8, 0x00, 0x80, 
+-	0x4b, 0x21, 0x58, 0x1d, 0x6b, 0x0a, 0x68, 0xef, 
+-	0x68, 0x10, 0x28, 0x00, 0xd0, 0x17, 0x68, 0xfe, 
+-	0x68, 0x10, 0x60, 0x30, 0x68, 0x50, 0x60, 0xf8, 
+-	0x68, 0x78, 0x68, 0x93, 0x18, 0xc0, 0x60, 0x78, 
+-	0x20, 0x00, 0x60, 0x10, 0x20, 0x00, 0x60, 0x50, 
+-	0x20, 0x00, 0x60, 0x90, 0x68, 0x78, 0x78, 0x3b, 
+-	0x42, 0x98, 0xd9, 0x04, 0x78, 0xb8, 0x23, 0x02, 
+-	0x43, 0xdb, 0x40, 0x18, 0x70, 0xb8, 0x6a, 0xd0, 
+-	0x60, 0x10, 0x6b, 0x10, 0x60, 0x50, 0x6b, 0x50, 
+-	0x60, 0x90, 0x24, 0x00, 0x2c, 0x08, 0xdb, 0x04, 
+-	0xe0, 0x0e, 0x1c, 0x60, 0x06, 0x04, 0x0e, 0x24, 
+-	0xe7, 0xf8, 0x00, 0xa0, 0x18, 0x80, 0x6b, 0x80, 
+-	0x00, 0xa3, 0x18, 0x9b, 0x60, 0xd8, 0x23, 0x00, 
+-	0x00, 0xa0, 0x18, 0x80, 0x63, 0x83, 0xe7, 0xf0, 
+-	0x20, 0x00, 0x62, 0xd0, 0x20, 0x00, 0x63, 0x10, 
+-	0x20, 0x00, 0x63, 0x50, 0x20, 0x00, 0xbc, 0xf0, 
+-	0x47, 0x70, 0x20, 0xb1, 0xe7, 0xfb, 0xe7, 0xfa, 
+-	0x2e, 0x08, 0x5e, 0x5c, 0xb4, 0x90, 0x1c, 0x02, 
+-	0x1c, 0x0f, 0x78, 0x14, 0x68, 0x90, 0x1c, 0x01, 
+-	0xd1, 0x08, 0x20, 0x00, 0x60, 0x38, 0x78, 0x90, 
+-	0x23, 0x01, 0x43, 0x18, 0x70, 0x90, 0x20, 0xb7, 
+-	0xbc, 0x90, 0x47, 0x70, 0x68, 0x08, 0x60, 0x90, 
+-	0x20, 0x00, 0x60, 0x48, 0x60, 0x39, 0x68, 0x50, 
+-	0x38, 0x01, 0x60, 0x50, 0x68, 0x50, 0x42, 0xa0, 
+-	0xd1, 0x02, 0x20, 0xbf, 0xe7, 0xf0, 0xe0, 0x01, 
+-	0x20, 0x00, 0xe7, 0xed, 0xe7, 0xec, 0x00, 0x00, 
+-	0x1c, 0x01, 0x22, 0x00, 0x6a, 0x50, 0x68, 0x02, 
+-	0x60, 0x0a, 0x4a, 0x05, 0x6f, 0xd2, 0x60, 0x8a, 
+-	0x4a, 0x04, 0x68, 0x12, 0x60, 0x4a, 0x22, 0x1d, 
+-	0x02, 0x92, 0x68, 0x12, 0x60, 0xca, 0x47, 0x70, 
+-	0xcc, 0x00, 0x0f, 0x80, 0x2e, 0x08, 0x1f, 0xa4, 
+-	0x1c, 0x01, 0x48, 0x02, 0x60, 0x01, 0x20, 0x00, 
+-	0x47, 0x70, 0xe7, 0xfd, 0x66, 0x00, 0x01, 0x00, 
+-	0x1c, 0x01, 0x20, 0x33, 0x06, 0x40, 0x62, 0x01, 
+-	0x20, 0x00, 0x47, 0x70, 0xe7, 0xfd, 0x1c, 0x01, 
+-	0x20, 0x33, 0x06, 0x40, 0x6a, 0xc0, 0x23, 0x7f, 
+-	0x03, 0x9b, 0x40, 0x18, 0x03, 0x8a, 0x43, 0x10, 
+-	0x22, 0x33, 0x06, 0x52, 0x62, 0xd0, 0x20, 0x00, 
+-	0x47, 0x70, 0xe7, 0xfd, 0x1c, 0x01, 0x20, 0x33, 
+-	0x06, 0x40, 0x6a, 0xc0, 0x23, 0x03, 0x03, 0x1b, 
+-	0x40, 0x18, 0x43, 0x08, 0x22, 0x33, 0x06, 0x52, 
+-	0x62, 0xd0, 0x20, 0x00, 0x47, 0x70, 0xe7, 0xfd, 
+-	0x1c, 0x01, 0x06, 0x0a, 0x0e, 0x12, 0x2a, 0x00, 
+-	0xd0, 0x06, 0x20, 0x33, 0x06, 0x40, 0x6a, 0xc0, 
+-	0x23, 0x01, 0x05, 0x5b, 0x43, 0x18, 0xe0, 0x04, 
+-	0x20, 0x33, 0x06, 0x40, 0x6a, 0xc0, 0x4b, 0x04, 
+-	0x40, 0x18, 0x23, 0x33, 0x06, 0x5b, 0x62, 0xd8, 
+-	0x20, 0x00, 0x47, 0x70, 0xe7, 0xfd, 0x00, 0x00, 
+-	0xff, 0xdf, 0xff, 0xff, 0x48, 0x04, 0x69, 0x80, 
+-	0x07, 0xc0, 0x0f, 0xc0, 0xd0, 0x01, 0x20, 0xff, 
+-	0x47, 0x70, 0x20, 0x00, 0xe7, 0xfc, 0xe7, 0xfb, 
+-	0x66, 0x00, 0x00, 0x80, 0xb4, 0x80, 0x1c, 0x01, 
+-	0x06, 0x0f, 0x0e, 0x3f, 0x4a, 0x08, 0x2f, 0x00, 
+-	0xd0, 0x03, 0x68, 0x10, 0x23, 0x01, 0x43, 0x18, 
+-	0xe0, 0x02, 0x68, 0x10, 0x08, 0x40, 0x00, 0x40, 
+-	0x68, 0x13, 0x43, 0x18, 0x60, 0x10, 0x20, 0x00, 
+-	0xbc, 0x80, 0x47, 0x70, 0xe7, 0xfc, 0x00, 0x00, 
+-	0x66, 0x00, 0x00, 0x98, 0xb4, 0x80, 0x1c, 0x07, 
+-	0x1c, 0x0a, 0x4b, 0x06, 0x40, 0x1a, 0x4b, 0x06, 
+-	0x40, 0x1f, 0x0b, 0x10, 0x02, 0x39, 0x43, 0x08, 
+-	0x49, 0x04, 0x61, 0xc8, 0x20, 0x00, 0xbc, 0x80, 
+-	0x47, 0x70, 0xe7, 0xfc, 0x01, 0xff, 0xf0, 0x00, 
+-	0x00, 0xff, 0xf0, 0x00, 0x66, 0x00, 0x00, 0x80, 
+-	0x48, 0x01, 0x69, 0xc0, 0x47, 0x70, 0xe7, 0xfd, 
+-	0x66, 0x00, 0x00, 0x80, 0x1c, 0x01, 0x48, 0x07, 
+-	0x68, 0x02, 0x4b, 0x07, 0x40, 0x1a, 0x60, 0x02, 
+-	0x23, 0x01, 0x05, 0x9b, 0x42, 0x99, 0xd1, 0x03, 
+-	0x48, 0x02, 0x68, 0x02, 0x43, 0x0a, 0x60, 0x02, 
+-	0x47, 0x70, 0x00, 0x00, 0x66, 0x00, 0x00, 0x2c, 
+-	0xff, 0xbf, 0xff, 0xff, 0x1c, 0x01, 0x20, 0x33, 
+-	0x06, 0x40, 0x67, 0x41, 0x47, 0x70, 0x1c, 0x01, 
+-	0x20, 0x33, 0x06, 0x40, 0x67, 0x81, 0x47, 0x70, 
+-	0xb5, 0x90, 0x4c, 0x21, 0x20, 0x01, 0x60, 0x20, 
+-	0xf0, 0x11, 0xfb, 0x6a, 0x48, 0x1f, 0x69, 0x84, 
+-	0x27, 0x00, 0x2f, 0x04, 0xd3, 0x04, 0xe0, 0x06, 
+-	0x1c, 0x78, 0x06, 0x07, 0x0e, 0x3f, 0xe7, 0xf8, 
+-	0x21, 0x00, 0xc4, 0x02, 0xe7, 0xf8, 0x20, 0x00, 
+-	0x49, 0x18, 0x69, 0x49, 0x60, 0x08, 0x20, 0x00, 
+-	0x49, 0x16, 0x69, 0x49, 0x60, 0x48, 0x20, 0x00, 
+-	0x49, 0x14, 0x69, 0x49, 0x60, 0x88, 0x20, 0x00, 
+-	0x49, 0x12, 0x69, 0x49, 0x60, 0xc8, 0x20, 0x00, 
+-	0x49, 0x10, 0x69, 0x49, 0x61, 0x08, 0x20, 0x00, 
+-	0x49, 0x0e, 0x69, 0x49, 0x61, 0x48, 0x20, 0x00, 
+-	0x49, 0x0c, 0x69, 0x49, 0x61, 0x88, 0x20, 0x00, 
+-	0x49, 0x0a, 0x69, 0x49, 0x61, 0xc8, 0x20, 0x00, 
+-	0x49, 0x08, 0x69, 0x49, 0x62, 0x08, 0x20, 0x00, 
+-	0x49, 0x06, 0x69, 0x49, 0x62, 0x48, 0x20, 0x18, 
+-	0x49, 0x04, 0x69, 0x49, 0x62, 0x88, 0x20, 0x00, 
+-	0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 0xe7, 0xfb, 
+-	0x70, 0x00, 0x00, 0x38, 0x2e, 0x08, 0x1f, 0xa8, 
+-	0xb5, 0xff, 0x1c, 0x0f, 0xb0, 0x81, 0x9c, 0x01, 
+-	0x69, 0x20, 0x28, 0x08, 0xd1, 0x01, 0x08, 0x7f, 
+-	0x00, 0x7f, 0x6b, 0xa0, 0x9a, 0x03, 0x43, 0x50, 
+-	0x19, 0xc6, 0x69, 0x20, 0x00, 0x80, 0x49, 0x34, 
+-	0x58, 0x08, 0x23, 0x04, 0x40, 0x18, 0xd0, 0x00, 
+-	0x08, 0x76, 0x69, 0x20, 0x00, 0x80, 0x49, 0x31, 
+-	0x58, 0x08, 0x43, 0x70, 0x90, 0x00, 0x69, 0xa0, 
+-	0x99, 0x00, 0x09, 0x49, 0x18, 0x45, 0x6b, 0xe0, 
+-	0x28, 0x00, 0xd1, 0x02, 0x03, 0x28, 0x0b, 0x00, 
+-	0xe0, 0x01, 0x02, 0x28, 0x0a, 0x00, 0x1c, 0x05, 
+-	0xf0, 0x11, 0xfb, 0x08, 0xf0, 0x11, 0xfa, 0xe4, 
+-	0x48, 0x27, 0x69, 0x80, 0x68, 0x00, 0x08, 0xc0, 
+-	0x00, 0xc0, 0x49, 0x25, 0x69, 0x89, 0x60, 0x08, 
+-	0x07, 0x40, 0x48, 0x23, 0x69, 0x80, 0x68, 0x00, 
+-	0x01, 0x40, 0x09, 0x40, 0x49, 0x20, 0x69, 0x89, 
+-	0x60, 0x08, 0x6b, 0xe0, 0x49, 0x1e, 0x69, 0x89, 
+-	0x68, 0x09, 0x4b, 0x1e, 0x40, 0x19, 0x07, 0xc0, 
+-	0x0c, 0x80, 0x43, 0x08, 0x49, 0x1a, 0x69, 0x89, 
+-	0x60, 0x08, 0x04, 0x80, 0x0f, 0xc0, 0x1c, 0x21, 
+-	0x1c, 0x20, 0xf0, 0x00, 0xfe, 0x51, 0x48, 0x16, 
+-	0x69, 0xc0, 0x68, 0x00, 0x4b, 0x16, 0x40, 0x18, 
+-	0x02, 0x29, 0x0a, 0x09, 0x00, 0x89, 0x43, 0x08, 
+-	0x49, 0x11, 0x69, 0xc9, 0x60, 0x08, 0x01, 0x80, 
+-	0x48, 0x0f, 0x69, 0xc0, 0x68, 0x00, 0x01, 0x40, 
+-	0x09, 0x40, 0x99, 0x00, 0x06, 0xc9, 0x43, 0x08, 
+-	0x49, 0x0b, 0x69, 0xc9, 0x60, 0x08, 0x99, 0x04, 
+-	0x1c, 0x20, 0x22, 0x00, 0xf0, 0x00, 0xfe, 0xbc, 
+-	0xf0, 0x00, 0xff, 0x9d, 0xf0, 0x11, 0xfa, 0xda, 
+-	0x20, 0x00, 0xb0, 0x01, 0xb0, 0x04, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0xb0, 0x01, 0xe7, 0xf9, 
+-	0x2e, 0x03, 0x3a, 0x04, 0x2e, 0x03, 0x3a, 0x54, 
+-	0x2e, 0x08, 0x1f, 0xa8, 0xff, 0xff, 0xdf, 0xff, 
+-	0xfc, 0x00, 0x00, 0x03, 0xb5, 0xff, 0x1c, 0x0f, 
+-	0xb0, 0x81, 0x9c, 0x01, 0x69, 0x20, 0x28, 0x08, 
+-	0xd1, 0x01, 0x08, 0x7f, 0x00, 0x7f, 0x6b, 0xa0, 
+-	0x9a, 0x03, 0x43, 0x50, 0x19, 0xc6, 0x69, 0x20, 
+-	0x00, 0x80, 0x49, 0x37, 0x58, 0x08, 0x23, 0x04, 
+-	0x40, 0x18, 0xd0, 0x00, 0x08, 0x76, 0x69, 0x20, 
+-	0x00, 0x80, 0x49, 0x34, 0x58, 0x08, 0x43, 0x70, 
+-	0x90, 0x00, 0x69, 0xa0, 0x99, 0x00, 0x09, 0x49, 
+-	0x18, 0x45, 0x6b, 0xe0, 0x28, 0x00, 0xd1, 0x02, 
+-	0x03, 0x28, 0x0b, 0x00, 0xe0, 0x01, 0x02, 0x28, 
+-	0x0a, 0x00, 0x1c, 0x05, 0xf0, 0x11, 0xfa, 0x86, 
+-	0xf0, 0x11, 0xfa, 0x62, 0x48, 0x2a, 0x69, 0x80, 
+-	0x68, 0x00, 0x08, 0xc0, 0x00, 0xc0, 0x23, 0x01, 
+-	0x43, 0x18, 0x49, 0x27, 0x69, 0x89, 0x60, 0x08, 
+-	0x07, 0x40, 0x6b, 0xe0, 0x49, 0x24, 0x69, 0x89, 
+-	0x68, 0x09, 0x4b, 0x24, 0x40, 0x19, 0x07, 0xc0, 
+-	0x0c, 0x80, 0x43, 0x08, 0x49, 0x20, 0x69, 0x89, 
+-	0x60, 0x08, 0x04, 0x80, 0x0f, 0xc0, 0x48, 0x1e, 
+-	0x69, 0x80, 0x68, 0x00, 0x01, 0x40, 0x09, 0x40, 
+-	0x99, 0x00, 0x06, 0xc9, 0x43, 0x01, 0x48, 0x1a, 
+-	0x69, 0x80, 0x60, 0x01, 0x1c, 0x21, 0x1c, 0x20, 
+-	0xf0, 0x00, 0xfd, 0xca, 0x48, 0x16, 0x69, 0xc0, 
+-	0x68, 0x00, 0x4b, 0x17, 0x40, 0x18, 0x02, 0x29, 
+-	0x0a, 0x09, 0x00, 0x89, 0x43, 0x08, 0x49, 0x12, 
+-	0x69, 0xc9, 0x60, 0x08, 0x01, 0x80, 0x48, 0x10, 
+-	0x69, 0xc0, 0x68, 0x00, 0x01, 0x40, 0x09, 0x40, 
+-	0x49, 0x0d, 0x69, 0xc9, 0x60, 0x08, 0xf0, 0x00, 
+-	0xff, 0x1e, 0xf0, 0x11, 0xfa, 0x39, 0x48, 0x0a, 
+-	0x6b, 0x81, 0x1c, 0x20, 0xf0, 0x00, 0xfe, 0xf0, 
+-	0x9b, 0x04, 0x60, 0x18, 0xf0, 0x11, 0xfa, 0x52, 
+-	0x20, 0x00, 0xb0, 0x01, 0xb0, 0x04, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0xb0, 0x01, 0xe7, 0xf9, 
+-	0x2e, 0x03, 0x3a, 0x04, 0x2e, 0x03, 0x3a, 0x54, 
+-	0x2e, 0x08, 0x1f, 0xa8, 0xff, 0xff, 0xdf, 0xff, 
+-	0xfc, 0x00, 0x00, 0x03, 0xb5, 0xff, 0x1c, 0x0c, 
+-	0x1c, 0x1f, 0xb0, 0x83, 0x9d, 0x03, 0x6b, 0x28, 
+-	0x6a, 0xa9, 0x1a, 0x40, 0x30, 0x01, 0x90, 0x00, 
+-	0x19, 0xe0, 0x99, 0x00, 0x42, 0x88, 0xd9, 0x01, 
+-	0x98, 0x00, 0x1b, 0x07, 0x69, 0x28, 0x28, 0x08, 
+-	0xd1, 0x02, 0x08, 0x7f, 0x08, 0x64, 0x00, 0x64, 
+-	0x6b, 0xa8, 0x9a, 0x05, 0x43, 0x50, 0x19, 0x01, 
+-	0x91, 0x01, 0x69, 0x28, 0x00, 0x80, 0x49, 0x38, 
+-	0x58, 0x08, 0x23, 0x04, 0x40, 0x18, 0xd0, 0x02, 
+-	0x99, 0x01, 0x08, 0x49, 0x91, 0x01, 0x69, 0x28, 
+-	0x00, 0x80, 0x49, 0x34, 0x58, 0x08, 0x99, 0x01, 
+-	0x43, 0x48, 0x90, 0x02, 0x69, 0xa8, 0x99, 0x02, 
+-	0x09, 0x49, 0x18, 0x46, 0x6b, 0xe8, 0x28, 0x00, 
+-	0xd1, 0x02, 0x03, 0x30, 0x0b, 0x00, 0xe0, 0x01, 
+-	0x02, 0x30, 0x0a, 0x00, 0x1c, 0x06, 0xf0, 0x11, 
+-	0xf9, 0xed, 0xf0, 0x11, 0xf9, 0xc9, 0x48, 0x2a, 
+-	0x69, 0x80, 0x68, 0x00, 0x01, 0x40, 0x09, 0x40, 
+-	0x49, 0x27, 0x69, 0x89, 0x60, 0x08, 0x48, 0x26, 
+-	0x69, 0x80, 0x68, 0x00, 0x08, 0xc0, 0x00, 0xc0, 
+-	0x23, 0x02, 0x43, 0x18, 0x49, 0x22, 0x69, 0x89, 
+-	0x60, 0x08, 0x07, 0x40, 0x6b, 0xe8, 0x49, 0x20, 
+-	0x69, 0x89, 0x68, 0x09, 0x4b, 0x1f, 0x40, 0x19, 
+-	0x07, 0xc0, 0x0c, 0x80, 0x43, 0x08, 0x49, 0x1c, 
+-	0x69, 0x89, 0x60, 0x08, 0x04, 0x80, 0x0f, 0xc0, 
+-	0x1c, 0x29, 0x1c, 0x28, 0xf0, 0x00, 0xfd, 0x34, 
+-	0x48, 0x17, 0x69, 0xc0, 0x68, 0x00, 0x4b, 0x18, 
+-	0x40, 0x18, 0x02, 0x31, 0x0a, 0x09, 0x00, 0x89, 
+-	0x43, 0x08, 0x49, 0x13, 0x69, 0xc9, 0x60, 0x08, 
+-	0x01, 0x80, 0x48, 0x11, 0x69, 0xc0, 0x68, 0x00, 
+-	0x01, 0x40, 0x09, 0x40, 0x99, 0x02, 0x06, 0xc9, 
+-	0x43, 0x08, 0x49, 0x0d, 0x69, 0xc9, 0x60, 0x08, 
+-	0x99, 0x0c, 0x1c, 0x28, 0x22, 0x02, 0xf0, 0x00, 
+-	0xfd, 0x9f, 0x48, 0x09, 0x69, 0x40, 0x62, 0x07, 
+-	0xf0, 0x00, 0xfe, 0x7d, 0xf0, 0x11, 0xf9, 0xba, 
+-	0x20, 0x00, 0xb0, 0x03, 0xb0, 0x04, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0xb0, 0x03, 0xe7, 0xf9, 
+-	0x2e, 0x03, 0x3a, 0x04, 0x2e, 0x03, 0x3a, 0x54, 
+-	0x2e, 0x08, 0x1f, 0xa8, 0xff, 0xff, 0xdf, 0xff, 
+-	0xfc, 0x00, 0x00, 0x03, 0xb5, 0xff, 0xb0, 0x81, 
+-	0x9f, 0x01, 0x6b, 0x78, 0x6a, 0xf9, 0x1a, 0x40, 
+-	0x30, 0x01, 0x90, 0x00, 0x9a, 0x03, 0x9b, 0x04, 
+-	0x18, 0xd0, 0x99, 0x00, 0x42, 0x88, 0xd9, 0x03, 
+-	0x98, 0x00, 0x9a, 0x03, 0x1a, 0x83, 0x93, 0x04, 
+-	0x69, 0x38, 0x28, 0x08, 0xd1, 0x03, 0x99, 0x02, 
+-	0x08, 0x49, 0x00, 0x49, 0x91, 0x02, 0x6b, 0xb8, 
+-	0x9a, 0x03, 0x43, 0x50, 0x99, 0x02, 0x18, 0x45, 
+-	0x69, 0x38, 0x00, 0x80, 0x49, 0x3c, 0x58, 0x08, 
+-	0x23, 0x04, 0x40, 0x18, 0xd0, 0x00, 0x08, 0x6d, 
+-	0x69, 0x38, 0x00, 0x80, 0x49, 0x39, 0x58, 0x08, 
+-	0x1c, 0x06, 0x43, 0x6e, 0x69, 0xb8, 0x09, 0x71, 
+-	0x18, 0x44, 0x6b, 0xf8, 0x28, 0x00, 0xd1, 0x02, 
+-	0x03, 0x20, 0x0b, 0x00, 0xe0, 0x01, 0x02, 0x20, 
+-	0x0a, 0x00, 0x1c, 0x04, 0xf0, 0x11, 0xf9, 0x56, 
+-	0xf0, 0x11, 0xf9, 0x32, 0x48, 0x30, 0x69, 0x80, 
+-	0x68, 0x00, 0x01, 0x40, 0x09, 0x40, 0x49, 0x2e, 
+-	0x69, 0x89, 0x60, 0x08, 0x48, 0x2c, 0x69, 0x80, 
+-	0x68, 0x00, 0x08, 0xc0, 0x00, 0xc0, 0x23, 0x03, 
+-	0x43, 0x18, 0x49, 0x29, 0x69, 0x89, 0x60, 0x08, 
+-	0x07, 0x40, 0x6b, 0xf8, 0x49, 0x26, 0x69, 0x89, 
+-	0x68, 0x09, 0x4b, 0x26, 0x40, 0x19, 0x07, 0xc0, 
+-	0x0c, 0x80, 0x43, 0x08, 0x49, 0x22, 0x69, 0x89, 
+-	0x60, 0x08, 0x04, 0x80, 0x0f, 0xc0, 0x1c, 0x39, 
+-	0x1c, 0x38, 0xf0, 0x00, 0xfc, 0x9d, 0x99, 0x0a, 
+-	0x1c, 0x38, 0x22, 0x03, 0xf0, 0x00, 0xfd, 0x20, 
+-	0x69, 0xf8, 0x49, 0x1b, 0x69, 0x49, 0x61, 0x08, 
+-	0x48, 0x19, 0x69, 0xc0, 0x68, 0x00, 0x4b, 0x1a, 
+-	0x40, 0x18, 0x02, 0x21, 0x0a, 0x09, 0x00, 0x89, 
+-	0x43, 0x08, 0x49, 0x15, 0x69, 0xc9, 0x60, 0x08, 
+-	0x01, 0x80, 0x48, 0x13, 0x69, 0xc0, 0x68, 0x00, 
+-	0x01, 0x40, 0x09, 0x40, 0x06, 0xf1, 0x43, 0x08, 
+-	0x49, 0x0f, 0x69, 0xc9, 0x60, 0x08, 0x48, 0x0e, 
+-	0x69, 0x40, 0x61, 0x84, 0x06, 0xf0, 0x0e, 0xc0, 
+-	0x49, 0x0b, 0x69, 0x49, 0x61, 0x48, 0x9b, 0x04, 
+-	0x48, 0x09, 0x69, 0x40, 0x62, 0x43, 0xf0, 0x00, 
+-	0xfd, 0xda, 0xf0, 0x11, 0xf9, 0x17, 0x20, 0x00, 
+-	0xb0, 0x01, 0xb0, 0x04, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0xb0, 0x01, 0xe7, 0xf9, 0x00, 0x00, 
+-	0x2e, 0x03, 0x3a, 0x04, 0x2e, 0x03, 0x3a, 0x54, 
+-	0x2e, 0x08, 0x1f, 0xa8, 0xff, 0xff, 0xdf, 0xff, 
+-	0xfc, 0x00, 0x00, 0x03, 0xb5, 0xf3, 0xb0, 0x86, 
+-	0x9f, 0x06, 0x99, 0x07, 0x68, 0x8c, 0x99, 0x07, 
+-	0x68, 0xc8, 0x90, 0x03, 0x99, 0x07, 0x68, 0x0d, 
+-	0x99, 0x07, 0x68, 0x49, 0x91, 0x02, 0x6b, 0x78, 
+-	0x6a, 0xf9, 0x1a, 0x40, 0x30, 0x01, 0x90, 0x01, 
+-	0x6b, 0x38, 0x6a, 0xb9, 0x1a, 0x40, 0x30, 0x01, 
+-	0x90, 0x00, 0x99, 0x02, 0x98, 0x03, 0x18, 0x08, 
+-	0x99, 0x01, 0x42, 0x88, 0xd9, 0x03, 0x98, 0x01, 
+-	0x99, 0x02, 0x1a, 0x40, 0x90, 0x03, 0x19, 0x28, 
+-	0x99, 0x00, 0x42, 0x88, 0xd9, 0x01, 0x98, 0x00, 
+-	0x1b, 0x44, 0x69, 0x38, 0x28, 0x08, 0xd1, 0x02, 
+-	0x08, 0x64, 0x08, 0x6d, 0x00, 0x6d, 0x6b, 0xb8, 
+-	0x99, 0x02, 0x43, 0x48, 0x19, 0x41, 0x91, 0x04, 
+-	0x69, 0x38, 0x00, 0x80, 0x49, 0x41, 0x58, 0x08, 
+-	0x23, 0x04, 0x40, 0x18, 0xd0, 0x02, 0x99, 0x04, 
+-	0x08, 0x49, 0x91, 0x04, 0x69, 0x38, 0x00, 0x80, 
+-	0x49, 0x3d, 0x58, 0x08, 0x99, 0x04, 0x43, 0x48, 
+-	0x90, 0x05, 0x69, 0xb8, 0x99, 0x05, 0x09, 0x49, 
+-	0x18, 0x46, 0x6b, 0xf8, 0x28, 0x00, 0xd1, 0x02, 
+-	0x03, 0x30, 0x0b, 0x00, 0xe0, 0x01, 0x02, 0x30, 
+-	0x0a, 0x00, 0x1c, 0x06, 0xf0, 0x11, 0xf8, 0x9a, 
+-	0xf0, 0x11, 0xf8, 0x76, 0x48, 0x33, 0x69, 0x80, 
+-	0x68, 0x00, 0x01, 0x40, 0x09, 0x40, 0x49, 0x31, 
+-	0x69, 0x89, 0x60, 0x08, 0x48, 0x2f, 0x69, 0x80, 
+-	0x68, 0x00, 0x08, 0xc0, 0x00, 0xc0, 0x23, 0x04, 
+-	0x43, 0x18, 0x49, 0x2c, 0x69, 0x89, 0x60, 0x08, 
+-	0x07, 0x40, 0x48, 0x2a, 0x69, 0xc0, 0x68, 0x00, 
+-	0x01, 0x40, 0x09, 0x40, 0x99, 0x05, 0x06, 0xc9, 
+-	0x43, 0x08, 0x49, 0x26, 0x69, 0xc9, 0x60, 0x08, 
+-	0x48, 0x24, 0x69, 0xc0, 0x68, 0x00, 0x4b, 0x24, 
+-	0x40, 0x18, 0x02, 0x31, 0x0a, 0x09, 0x00, 0x89, 
+-	0x43, 0x08, 0x49, 0x20, 0x69, 0xc9, 0x60, 0x08, 
+-	0x01, 0x80, 0x1c, 0x39, 0x1c, 0x38, 0xf0, 0x00, 
+-	0xfb, 0xd7, 0x6b, 0xf8, 0x49, 0x1b, 0x69, 0x89, 
+-	0x68, 0x09, 0x4b, 0x1c, 0x40, 0x19, 0x07, 0xc0, 
+-	0x0c, 0x80, 0x43, 0x08, 0x49, 0x17, 0x69, 0x89, 
+-	0x60, 0x08, 0x04, 0x80, 0x0f, 0xc0, 0x99, 0x07, 
+-	0x69, 0x09, 0x1c, 0x38, 0x22, 0x04, 0xf0, 0x00, 
+-	0xfc, 0x4b, 0x69, 0xf8, 0x49, 0x11, 0x69, 0x49, 
+-	0x61, 0x08, 0x98, 0x05, 0x06, 0xc0, 0x0e, 0xc0, 
+-	0x49, 0x0e, 0x69, 0x49, 0x61, 0x48, 0x48, 0x0d, 
+-	0x69, 0x40, 0x61, 0x86, 0x48, 0x0b, 0x69, 0x40, 
+-	0x62, 0x04, 0x98, 0x03, 0x49, 0x09, 0x69, 0x49, 
+-	0x62, 0x48, 0xf0, 0x00, 0xfd, 0x18, 0xf0, 0x11, 
+-	0xf8, 0x55, 0x20, 0x00, 0xb0, 0x06, 0xb0, 0x02, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0xb0, 0x06, 
+-	0xe7, 0xf9, 0x00, 0x00, 0x2e, 0x03, 0x3a, 0x04, 
+-	0x2e, 0x03, 0x3a, 0x54, 0x2e, 0x08, 0x1f, 0xa8, 
+-	0xfc, 0x00, 0x00, 0x03, 0xff, 0xff, 0xdf, 0xff, 
+-	0xb5, 0xff, 0x9d, 0x09, 0xb0, 0x81, 0x98, 0x0b, 
+-	0x06, 0x02, 0x0e, 0x12, 0x92, 0x00, 0xb0, 0x93, 
+-	0x98, 0x14, 0x90, 0x12, 0x99, 0x15, 0x91, 0x11, 
+-	0xaf, 0x0c, 0x1c, 0x38, 0x9a, 0x16, 0xca, 0x5e, 
+-	0xc0, 0x5e, 0x68, 0x39, 0x91, 0x04, 0x68, 0x79, 
+-	0x91, 0x03, 0x98, 0x12, 0x99, 0x11, 0x42, 0x88, 
+-	0xd1, 0x73, 0x99, 0x03, 0x42, 0x8d, 0xd9, 0x71, 
+-	0x68, 0xb8, 0x90, 0x01, 0x68, 0xf8, 0x90, 0x02, 
+-	0x99, 0x11, 0x6b, 0x48, 0x6a, 0xc9, 0x1a, 0x40, 
+-	0x1c, 0x44, 0x99, 0x11, 0x6b, 0x08, 0x6a, 0x89, 
+-	0x1a, 0x40, 0x30, 0x01, 0x90, 0x00, 0x98, 0x02, 
+-	0x18, 0x28, 0x42, 0xa0, 0xd9, 0x01, 0x1b, 0x61, 
+-	0x91, 0x02, 0x9b, 0x17, 0x98, 0x01, 0x18, 0x18, 
+-	0x99, 0x00, 0x42, 0x88, 0xd9, 0x03, 0x98, 0x00, 
+-	0x9b, 0x17, 0x1a, 0xc0, 0x90, 0x01, 0x98, 0x01, 
+-	0x60, 0xb8, 0x98, 0x02, 0x60, 0xf8, 0x98, 0x12, 
+-	0x69, 0xc0, 0x90, 0x0a, 0x98, 0x12, 0x6b, 0x80, 
+-	0x99, 0x03, 0x43, 0x48, 0x99, 0x04, 0x18, 0x41, 
+-	0x91, 0x05, 0x98, 0x12, 0x69, 0x00, 0x00, 0x80, 
+-	0x49, 0x48, 0x58, 0x08, 0x99, 0x05, 0x43, 0x48, 
+-	0x90, 0x0b, 0x98, 0x12, 0x69, 0x80, 0x99, 0x0b, 
+-	0x09, 0x49, 0x18, 0x41, 0x91, 0x07, 0x98, 0x0a, 
+-	0x99, 0x02, 0x43, 0x48, 0x90, 0x0b, 0x98, 0x0b, 
+-	0x09, 0x40, 0x99, 0x07, 0x18, 0x40, 0x90, 0x06, 
+-	0x98, 0x06, 0x0b, 0xc0, 0x99, 0x07, 0x0b, 0xc9, 
+-	0x1a, 0x40, 0x90, 0x09, 0x98, 0x09, 0x28, 0x00, 
+-	0xd0, 0x56, 0x9e, 0x02, 0x98, 0x06, 0x04, 0x40, 
+-	0x0c, 0x40, 0x01, 0x41, 0x91, 0x08, 0x99, 0x08, 
+-	0x98, 0x0a, 0xf0, 0x04, 0xf9, 0x17, 0x1c, 0x04, 
+-	0x2c, 0x00, 0xd1, 0x00, 0x34, 0x01, 0x99, 0x03, 
+-	0x98, 0x02, 0x18, 0x08, 0x1b, 0x00, 0x60, 0x78, 
+-	0x60, 0xfc, 0x98, 0x02, 0x18, 0x28, 0x1b, 0x05, 
+-	0x9a, 0x13, 0x1c, 0x29, 0xb4, 0x06, 0x9b, 0x19, 
+-	0x1c, 0x3a, 0x99, 0x17, 0x98, 0x16, 0xf0, 0x00, 
+-	0xf8, 0x57, 0xb0, 0x02, 0x1b, 0x36, 0x98, 0x09, 
+-	0xe0, 0x01, 0xe0, 0x3c, 0xe0, 0x3b, 0x38, 0x01, 
+-	0x90, 0x09, 0x98, 0x09, 0x28, 0x00, 0xd0, 0x1a, 
+-	0x98, 0x0a, 0x21, 0x01, 0x03, 0x09, 0xf0, 0x04, 
+-	0xf8, 0xf1, 0x1c, 0x04, 0x68, 0x78, 0x1b, 0x80, 
+-	0x60, 0x78, 0x60, 0xfc, 0x68, 0xf8, 0x1a, 0x2d, 
+-	0x9a, 0x13, 0x1c, 0x29, 0xb4, 0x06, 0x9b, 0x19, 
+-	0x1c, 0x3a, 0x99, 0x17, 0x98, 0x16, 0xf0, 0x00, 
+-	0xf8, 0x37, 0xb0, 0x02, 0x1b, 0x36, 0x98, 0x09, 
+-	0x38, 0x01, 0x90, 0x09, 0xe7, 0xe1, 0x68, 0x78, 
+-	0x1b, 0x80, 0x60, 0x78, 0x60, 0xfe, 0x68, 0xf8, 
+-	0x1a, 0x2d, 0x9a, 0x13, 0x1c, 0x29, 0xb4, 0x06, 
+-	0x9b, 0x19, 0x1c, 0x3a, 0x99, 0x17, 0x98, 0x16, 
+-	0xf0, 0x00, 0xf8, 0x22, 0xb0, 0x02, 0xe0, 0x09, 
+-	0x9a, 0x13, 0x1c, 0x29, 0xb4, 0x06, 0x9b, 0x19, 
+-	0x1c, 0x3a, 0x99, 0x17, 0x98, 0x16, 0xf0, 0x00, 
+-	0xf8, 0x17, 0xb0, 0x02, 0xe0, 0x09, 0x9a, 0x13, 
+-	0x1c, 0x29, 0xb4, 0x06, 0x9b, 0x19, 0x1c, 0x3a, 
+-	0x99, 0x17, 0x98, 0x16, 0xf0, 0x00, 0xf8, 0xb8, 
+-	0xb0, 0x02, 0x20, 0x00, 0xb0, 0x14, 0xb0, 0x04, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0xb0, 0x13, 
+-	0xb0, 0x01, 0xe7, 0xf8, 0x2e, 0x03, 0x3a, 0x54, 
+-	0xb5, 0xff, 0x9d, 0x09, 0xb0, 0x81, 0x98, 0x0b, 
+-	0x06, 0x02, 0x0e, 0x12, 0x92, 0x00, 0xb0, 0x92, 
+-	0x98, 0x13, 0x90, 0x11, 0x99, 0x14, 0x91, 0x10, 
+-	0xaf, 0x0b, 0x1c, 0x38, 0x9a, 0x15, 0xca, 0x5e, 
+-	0xc0, 0x5e, 0x68, 0x38, 0x90, 0x03, 0x68, 0x78, 
+-	0x90, 0x02, 0x68, 0xb8, 0x90, 0x00, 0x68, 0xf9, 
+-	0x91, 0x01, 0x98, 0x11, 0x69, 0xc0, 0x90, 0x09, 
+-	0x99, 0x10, 0x6b, 0x88, 0x43, 0x68, 0x9b, 0x16, 
+-	0x18, 0xc1, 0x91, 0x04, 0x99, 0x10, 0x69, 0x08, 
+-	0x00, 0x80, 0x49, 0x42, 0x58, 0x08, 0x99, 0x04, 
+-	0x43, 0x48, 0x90, 0x0a, 0x99, 0x10, 0x69, 0x88, 
+-	0x99, 0x0a, 0x09, 0x49, 0x18, 0x40, 0x90, 0x06, 
+-	0x98, 0x09, 0x99, 0x01, 0x43, 0x48, 0x90, 0x0a, 
+-	0x98, 0x0a, 0x09, 0x40, 0x99, 0x06, 0x18, 0x40, 
+-	0x90, 0x05, 0x98, 0x05, 0x0b, 0xc0, 0x99, 0x06, 
+-	0x0b, 0xc9, 0x1a, 0x40, 0x90, 0x08, 0x98, 0x08, 
+-	0x28, 0x00, 0xd0, 0x53, 0x9e, 0x01, 0x98, 0x05, 
+-	0x04, 0x40, 0x0c, 0x40, 0x01, 0x41, 0x91, 0x07, 
+-	0x99, 0x07, 0x98, 0x09, 0xf0, 0x04, 0xf8, 0x5e, 
+-	0x1c, 0x04, 0x2c, 0x00, 0xd1, 0x00, 0x34, 0x01, 
+-	0x98, 0x02, 0x99, 0x01, 0x18, 0x40, 0x1b, 0x00, 
+-	0x60, 0x78, 0x60, 0xfc, 0x99, 0x01, 0x18, 0x68, 
+-	0x1b, 0x05, 0x9a, 0x12, 0x1c, 0x29, 0xb4, 0x06, 
+-	0x9b, 0x18, 0x1c, 0x3a, 0x99, 0x16, 0x98, 0x15, 
+-	0xf0, 0x00, 0xf8, 0x4a, 0xb0, 0x02, 0x1b, 0x36, 
+-	0x98, 0x08, 0x38, 0x01, 0x90, 0x08, 0x98, 0x08, 
+-	0x28, 0x00, 0xd0, 0x1a, 0x98, 0x09, 0x21, 0x01, 
+-	0x03, 0x09, 0xf0, 0x04, 0xf8, 0x3b, 0x1c, 0x04, 
+-	0x68, 0x78, 0x1b, 0x80, 0x60, 0x78, 0x60, 0xfc, 
+-	0x68, 0xf8, 0x1a, 0x2d, 0x9a, 0x12, 0x1c, 0x29, 
+-	0xb4, 0x06, 0x9b, 0x18, 0x1c, 0x3a, 0x99, 0x16, 
+-	0x98, 0x15, 0xf0, 0x00, 0xf8, 0x2d, 0xb0, 0x02, 
+-	0x1b, 0x36, 0x98, 0x08, 0x38, 0x01, 0x90, 0x08, 
+-	0xe7, 0xe1, 0x68, 0x78, 0x1b, 0x80, 0x60, 0x78, 
+-	0x60, 0xfe, 0x68, 0xf8, 0x1a, 0x2d, 0x9a, 0x12, 
+-	0x1c, 0x29, 0xb4, 0x06, 0x9b, 0x18, 0x1c, 0x3a, 
+-	0x99, 0x16, 0x98, 0x15, 0xf0, 0x00, 0xf8, 0x18, 
+-	0xb0, 0x02, 0xe0, 0x09, 0x9a, 0x12, 0x1c, 0x29, 
+-	0xb4, 0x06, 0x9b, 0x18, 0x1c, 0x3a, 0x99, 0x16, 
+-	0x98, 0x15, 0xf0, 0x00, 0xf8, 0x0d, 0xb0, 0x02, 
+-	0x20, 0x00, 0xb0, 0x13, 0xb0, 0x04, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0xb0, 0x12, 0xb0, 0x01, 
+-	0xe7, 0xf8, 0x00, 0x00, 0x2e, 0x03, 0x3a, 0x54, 
+-	0xb5, 0xff, 0xb0, 0x81, 0x98, 0x0b, 0x06, 0x02, 
+-	0x0e, 0x12, 0x92, 0x00, 0xb0, 0x8e, 0x9f, 0x0f, 
+-	0x9c, 0x10, 0x9a, 0x11, 0x68, 0x10, 0x90, 0x07, 
+-	0x9a, 0x11, 0x68, 0x50, 0x90, 0x06, 0x9a, 0x11, 
+-	0x68, 0x91, 0x91, 0x08, 0x9a, 0x11, 0x68, 0xd0, 
+-	0x90, 0x09, 0x6b, 0x60, 0x6a, 0xe1, 0x1a, 0x40, 
+-	0x30, 0x01, 0x90, 0x01, 0x6b, 0x20, 0x6a, 0xa1, 
+-	0x1a, 0x40, 0x30, 0x01, 0x90, 0x00, 0x99, 0x18, 
+-	0x98, 0x09, 0x18, 0x08, 0x99, 0x01, 0x42, 0x88, 
+-	0xd9, 0x03, 0x98, 0x01, 0x99, 0x18, 0x1a, 0x41, 
+-	0x91, 0x09, 0x9b, 0x12, 0x99, 0x08, 0x18, 0x58, 
+-	0x99, 0x00, 0x42, 0x88, 0xd9, 0x03, 0x98, 0x00, 
+-	0x9b, 0x12, 0x1a, 0xc1, 0x91, 0x08, 0x22, 0x00, 
+-	0x92, 0x05, 0x42, 0xa7, 0xd1, 0x20, 0x99, 0x18, 
+-	0x98, 0x06, 0x42, 0x81, 0xd9, 0x0c, 0x22, 0x02, 
+-	0x92, 0x05, 0x99, 0x06, 0x98, 0x09, 0x18, 0x08, 
+-	0x1e, 0x41, 0x91, 0x06, 0x99, 0x18, 0x98, 0x09, 
+-	0x18, 0x08, 0x1e, 0x41, 0x91, 0x18, 0xe0, 0x0f, 
+-	0x9b, 0x12, 0x98, 0x07, 0x42, 0x83, 0xd9, 0x0b, 
+-	0x22, 0x01, 0x92, 0x05, 0x98, 0x07, 0x99, 0x08, 
+-	0x18, 0x40, 0x38, 0x01, 0x90, 0x07, 0x9b, 0x12, 
+-	0x99, 0x08, 0x18, 0x58, 0x1e, 0x43, 0x93, 0x12, 
+-	0x69, 0x38, 0x28, 0x08, 0xd1, 0x0a, 0x99, 0x08, 
+-	0x08, 0x49, 0x91, 0x08, 0x98, 0x07, 0x08, 0x40, 
+-	0x00, 0x40, 0x90, 0x07, 0x9b, 0x12, 0x08, 0x5b, 
+-	0x00, 0x5b, 0x93, 0x12, 0x69, 0x38, 0x00, 0x80, 
+-	0x49, 0xc6, 0x58, 0x08, 0x23, 0x04, 0x40, 0x18, 
+-	0x08, 0x80, 0x90, 0x03, 0x69, 0x20, 0x00, 0x80, 
+-	0x49, 0xc2, 0x58, 0x08, 0x23, 0x04, 0x40, 0x18, 
+-	0x08, 0x80, 0x90, 0x02, 0x6b, 0xb8, 0x99, 0x06, 
+-	0x43, 0x48, 0x99, 0x07, 0x18, 0x41, 0x91, 0x04, 
+-	0x98, 0x03, 0x28, 0x00, 0xd0, 0x02, 0x99, 0x04, 
+-	0x08, 0x49, 0x91, 0x04, 0x69, 0x38, 0x00, 0x80, 
+-	0x49, 0xb9, 0x58, 0x08, 0x99, 0x04, 0x1c, 0x06, 
+-	0x43, 0x4e, 0x6b, 0xa0, 0x99, 0x18, 0x43, 0x48, 
+-	0x9b, 0x12, 0x18, 0xc1, 0x91, 0x04, 0x98, 0x02, 
+-	0x28, 0x00, 0xd0, 0x02, 0x99, 0x04, 0x08, 0x49, 
+-	0x91, 0x04, 0x69, 0x20, 0x00, 0x80, 0x49, 0xb0, 
+-	0x58, 0x08, 0x99, 0x04, 0x1c, 0x05, 0x43, 0x4d, 
+-	0x9a, 0x05, 0x2a, 0x01, 0xd1, 0x3d, 0x69, 0x38, 
+-	0x28, 0x08, 0xd0, 0x3a, 0x69, 0x38, 0x28, 0x09, 
+-	0xd0, 0x02, 0x69, 0x38, 0x28, 0x0a, 0xd1, 0x0a, 
+-	0x36, 0x10, 0x69, 0xb8, 0x09, 0x71, 0x18, 0x41, 
+-	0x91, 0x0b, 0x06, 0xf0, 0x0e, 0xc0, 0x1d, 0xc1, 
+-	0x31, 0x01, 0x91, 0x0a, 0xe0, 0x0b, 0x69, 0xb8, 
+-	0x09, 0x71, 0x18, 0x41, 0x91, 0x0b, 0x69, 0x38, 
+-	0x00, 0x80, 0x49, 0x9f, 0x58, 0x08, 0x19, 0x86, 
+-	0x06, 0xf1, 0x0e, 0xc9, 0x91, 0x0a, 0x69, 0x20, 
+-	0x28, 0x09, 0xd0, 0x02, 0x69, 0x20, 0x28, 0x0a, 
+-	0xd1, 0x0a, 0x35, 0x10, 0x69, 0xa0, 0x09, 0x69, 
+-	0x18, 0x41, 0x91, 0x0d, 0x06, 0xe8, 0x0e, 0xc0, 
+-	0x1d, 0xc1, 0x31, 0x01, 0x91, 0x0c, 0xe0, 0x0b, 
+-	0x69, 0xa0, 0x09, 0x69, 0x18, 0x41, 0x91, 0x0d, 
+-	0x69, 0x20, 0x00, 0x80, 0x49, 0x90, 0x58, 0x08, 
+-	0x19, 0x45, 0x06, 0xe9, 0x0e, 0xc9, 0x91, 0x0c, 
+-	0xe0, 0x0d, 0x69, 0xb8, 0x09, 0x71, 0x18, 0x41, 
+-	0x91, 0x0b, 0x69, 0xa0, 0x09, 0x69, 0x18, 0x41, 
+-	0x91, 0x0d, 0x06, 0xf1, 0x0e, 0xc9, 0x91, 0x0a, 
+-	0x06, 0xe9, 0x0e, 0xc9, 0x91, 0x0c, 0x6b, 0xf8, 
+-	0x28, 0x00, 0xd1, 0x03, 0x99, 0x0b, 0x03, 0x09, 
+-	0x0b, 0x09, 0xe0, 0x02, 0x99, 0x0b, 0x02, 0x09, 
+-	0x0a, 0x09, 0x91, 0x0b, 0x6b, 0xe0, 0x28, 0x00, 
+-	0xd1, 0x03, 0x99, 0x0d, 0x03, 0x09, 0x0b, 0x09, 
+-	0xe0, 0x02, 0x99, 0x0d, 0x02, 0x09, 0x0a, 0x09, 
+-	0x91, 0x0d, 0xf0, 0x10, 0xfd, 0x9b, 0xf0, 0x10, 
+-	0xfd, 0x77, 0x48, 0x7a, 0x69, 0x80, 0x68, 0x00, 
+-	0x08, 0xc0, 0x00, 0xc0, 0x23, 0x05, 0x43, 0x18, 
+-	0x49, 0x76, 0x69, 0x89, 0x60, 0x08, 0x07, 0x40, 
+-	0x1c, 0x21, 0x1c, 0x38, 0xf0, 0x00, 0xf8, 0xf8, 
+-	0x98, 0x03, 0x28, 0x00, 0xd0, 0x18, 0x98, 0x02, 
+-	0x28, 0x00, 0xd0, 0x15, 0x48, 0x6f, 0x69, 0x80, 
+-	0x68, 0x00, 0x23, 0x08, 0x43, 0xdb, 0x40, 0x18, 
+-	0x49, 0x6c, 0x69, 0x89, 0x60, 0x08, 0x07, 0x00, 
+-	0x48, 0x6a, 0x69, 0x80, 0x68, 0x00, 0x4b, 0x6a, 
+-	0x40, 0x18, 0x49, 0x68, 0x69, 0x89, 0x60, 0x08, 
+-	0x05, 0xc0, 0x99, 0x08, 0x08, 0x49, 0x91, 0x08, 
+-	0x6b, 0xf8, 0x49, 0x64, 0x69, 0x89, 0x68, 0x09, 
+-	0x4b, 0x64, 0x40, 0x19, 0x07, 0xc0, 0x0c, 0x40, 
+-	0x43, 0x08, 0x49, 0x60, 0x69, 0x89, 0x60, 0x08, 
+-	0x04, 0x40, 0x0f, 0xc0, 0x6b, 0xe0, 0x49, 0x5d, 
+-	0x69, 0x89, 0x68, 0x09, 0x4b, 0x5e, 0x40, 0x19, 
+-	0x07, 0xc0, 0x0c, 0x80, 0x43, 0x08, 0x49, 0x59, 
+-	0x69, 0x89, 0x60, 0x08, 0x04, 0x80, 0x0f, 0xc0, 
+-	0x68, 0x38, 0x28, 0x00, 0xd0, 0x0d, 0x79, 0x38, 
+-	0x49, 0x54, 0x69, 0x89, 0x68, 0x09, 0x4b, 0x57, 
+-	0x40, 0x19, 0x03, 0xc0, 0x43, 0x08, 0x49, 0x51, 
+-	0x69, 0x89, 0x60, 0x08, 0x02, 0x40, 0x0e, 0x00, 
+-	0xe0, 0x0d, 0x6a, 0x78, 0x78, 0x00, 0x49, 0x4d, 
+-	0x69, 0x89, 0x68, 0x09, 0x4b, 0x4f, 0x40, 0x19, 
+-	0x03, 0xc0, 0x43, 0x08, 0x49, 0x49, 0x69, 0x89, 
+-	0x60, 0x08, 0x02, 0x40, 0x0e, 0x00, 0x69, 0x20, 
+-	0x00, 0x80, 0x49, 0x45, 0x58, 0x08, 0x99, 0x08, 
+-	0x43, 0x48, 0x28, 0x40, 0xd9, 0x01, 0x21, 0x00, 
+-	0xe0, 0x00, 0x21, 0x01, 0x1c, 0x08, 0x49, 0x41, 
+-	0x69, 0x89, 0x68, 0x09, 0x4b, 0x44, 0x40, 0x19, 
+-	0x07, 0xc2, 0x09, 0x52, 0x43, 0x11, 0x4a, 0x3d, 
+-	0x69, 0x92, 0x60, 0x11, 0x01, 0x49, 0x0f, 0xc9, 
+-	0x49, 0x3a, 0x69, 0x89, 0x68, 0x09, 0x4b, 0x3f, 
+-	0x40, 0x19, 0x9a, 0x05, 0x07, 0x92, 0x0f, 0x92, 
+-	0x05, 0xd2, 0x43, 0x11, 0x4a, 0x35, 0x69, 0x92, 
+-	0x60, 0x11, 0x01, 0xc9, 0x49, 0x33, 0x69, 0x89, 
+-	0x68, 0x09, 0x4b, 0x39, 0x40, 0x19, 0x9a, 0x0e, 
+-	0x07, 0xd2, 0x09, 0x92, 0x43, 0x11, 0x4a, 0x2f, 
+-	0x69, 0x92, 0x60, 0x11, 0x01, 0x89, 0x69, 0xf9, 
+-	0x4a, 0x2c, 0x69, 0x52, 0x60, 0x11, 0x49, 0x2b, 
+-	0x69, 0x89, 0x68, 0x09, 0x01, 0x49, 0x09, 0x49, 
+-	0x9a, 0x0a, 0x06, 0xd2, 0x43, 0x11, 0x4a, 0x27, 
+-	0x69, 0x92, 0x60, 0x11, 0x99, 0x0a, 0x4a, 0x25, 
+-	0x69, 0x52, 0x60, 0x51, 0x99, 0x0b, 0x4a, 0x23, 
+-	0x69, 0x52, 0x60, 0x91, 0x99, 0x0b, 0x4a, 0x21, 
+-	0x69, 0x52, 0x60, 0xd1, 0x69, 0xe1, 0x4a, 0x1f, 
+-	0x69, 0x52, 0x61, 0x11, 0x49, 0x1d, 0x69, 0xc9, 
+-	0x68, 0x09, 0x01, 0x49, 0x09, 0x49, 0x9a, 0x0c, 
+-	0x06, 0xd2, 0x43, 0x11, 0x4a, 0x19, 0x69, 0xd2, 
+-	0x60, 0x11, 0x99, 0x0c, 0x4a, 0x17, 0x69, 0x52, 
+-	0x61, 0x51, 0x99, 0x0d, 0x4a, 0x15, 0x69, 0x52, 
+-	0x61, 0x91, 0x99, 0x0d, 0x4a, 0x13, 0x69, 0x52, 
+-	0x61, 0xd1, 0x99, 0x09, 0x4a, 0x11, 0x69, 0x52, 
+-	0x62, 0x51, 0x99, 0x08, 0x4a, 0x0f, 0x69, 0x52, 
+-	0x62, 0x11, 0x68, 0x38, 0x28, 0x00, 0xd0, 0x05, 
+-	0x48, 0x14, 0x68, 0x01, 0x23, 0x01, 0x43, 0x19, 
+-	0x60, 0x01, 0xe0, 0x02, 0x48, 0x11, 0x21, 0x00, 
+-	0x60, 0x01, 0xf0, 0x00, 0xf9, 0x8c, 0xf0, 0x10, 
+-	0xfc, 0xc9, 0x20, 0x00, 0xb0, 0x0f, 0xb0, 0x04, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0xb0, 0x0e, 
+-	0xb0, 0x01, 0xe7, 0xf8, 0x2e, 0x03, 0x3a, 0x04, 
+-	0x2e, 0x03, 0x3a, 0x54, 0x2e, 0x08, 0x1f, 0xa8, 
+-	0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xbf, 0xff, 
+-	0xff, 0xff, 0xdf, 0xff, 0xff, 0x80, 0x7f, 0xff, 
+-	0xfb, 0xff, 0xff, 0xff, 0xfe, 0x7f, 0xff, 0xff, 
+-	0xfd, 0xff, 0xff, 0xff, 0x68, 0x00, 0x00, 0x40, 
+-	0xb4, 0x80, 0x1c, 0x07, 0x1c, 0x0a, 0x69, 0x38, 
+-	0x00, 0x80, 0x49, 0x3c, 0x58, 0x08, 0x23, 0x18, 
+-	0x40, 0x18, 0x08, 0xc0, 0x49, 0x3a, 0x69, 0x89, 
+-	0x68, 0x09, 0x23, 0xc0, 0x43, 0xdb, 0x40, 0x19, 
+-	0x07, 0x80, 0x0f, 0x80, 0x01, 0x80, 0x43, 0x08, 
+-	0x49, 0x35, 0x69, 0x89, 0x60, 0x08, 0x06, 0x00, 
+-	0x0f, 0x80, 0x69, 0x38, 0x00, 0x80, 0x49, 0x31, 
+-	0x58, 0x08, 0x23, 0x04, 0x40, 0x18, 0x08, 0x80, 
+-	0x49, 0x2f, 0x69, 0x89, 0x68, 0x09, 0x23, 0x08, 
+-	0x43, 0xdb, 0x40, 0x19, 0x07, 0xc0, 0x0f, 0x00, 
+-	0x43, 0x08, 0x49, 0x2b, 0x69, 0x89, 0x60, 0x08, 
+-	0x07, 0x00, 0x0f, 0xc0, 0x69, 0x38, 0x00, 0x80, 
+-	0x49, 0x26, 0x58, 0x08, 0x49, 0x26, 0x69, 0x89, 
+-	0x68, 0x09, 0x23, 0x30, 0x43, 0xdb, 0x40, 0x19, 
+-	0x07, 0x80, 0x0f, 0x80, 0x01, 0x00, 0x43, 0x08, 
+-	0x49, 0x21, 0x69, 0x89, 0x60, 0x08, 0x06, 0x80, 
+-	0x0f, 0x80, 0x69, 0x10, 0x00, 0x80, 0x49, 0x1d, 
+-	0x58, 0x08, 0x23, 0x18, 0x40, 0x18, 0x08, 0xc0, 
+-	0x49, 0x1b, 0x69, 0x89, 0x68, 0x09, 0x4b, 0x1b, 
+-	0x40, 0x19, 0x07, 0x80, 0x0f, 0x80, 0x02, 0xc0, 
+-	0x43, 0x08, 0x49, 0x17, 0x69, 0x89, 0x60, 0x08, 
+-	0x04, 0xc0, 0x0f, 0x80, 0x69, 0x10, 0x00, 0x80, 
+-	0x49, 0x12, 0x58, 0x08, 0x23, 0x04, 0x40, 0x18, 
+-	0x08, 0x80, 0x49, 0x11, 0x69, 0x89, 0x68, 0x09, 
+-	0x4b, 0x11, 0x40, 0x19, 0x07, 0xc0, 0x0d, 0xc0, 
+-	0x43, 0x08, 0x49, 0x0d, 0x69, 0x89, 0x60, 0x08, 
+-	0x05, 0xc0, 0x0f, 0xc0, 0x69, 0x10, 0x00, 0x80, 
+-	0x49, 0x08, 0x58, 0x08, 0x49, 0x08, 0x69, 0x89, 
+-	0x68, 0x09, 0x4b, 0x0a, 0x40, 0x19, 0x07, 0x80, 
+-	0x0f, 0x80, 0x02, 0x40, 0x43, 0x08, 0x49, 0x04, 
+-	0x69, 0x89, 0x60, 0x08, 0x05, 0x40, 0x0f, 0x80, 
+-	0xbc, 0x80, 0x47, 0x70, 0x2e, 0x03, 0x3a, 0x04, 
+-	0x2e, 0x08, 0x1f, 0xa8, 0xff, 0xff, 0xe7, 0xff, 
+-	0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xf9, 0xff, 
+-	0xb4, 0xb0, 0x1c, 0x04, 0x1c, 0x0f, 0x1c, 0x15, 
+-	0x2d, 0x00, 0xd0, 0x06, 0x2d, 0x02, 0xd0, 0x21, 
+-	0x2d, 0x03, 0xd0, 0x02, 0x2d, 0x04, 0xd0, 0x1d, 
+-	0xe0, 0xa3, 0x69, 0x20, 0x28, 0x0b, 0xd2, 0x14, 
+-	0xa3, 0x01, 0x5c, 0x1b, 0x00, 0x5b, 0x44, 0x9f, 
+-	0x05, 0x07, 0x09, 0x0b, 0x05, 0x07, 0x09, 0x0b, 
+-	0x0d, 0x0e, 0x0e, 0x00, 0x07, 0xff, 0xe0, 0x09, 
+-	0x07, 0xbf, 0xe0, 0x07, 0x07, 0x3f, 0xe0, 0x05, 
+-	0x06, 0x3f, 0xe0, 0x03, 0xe0, 0x02, 0x02, 0x3f, 
+-	0xe0, 0x00, 0xe7, 0xff, 0x48, 0x46, 0x6a, 0x00, 
+-	0x60, 0x07, 0xe0, 0x86, 0x69, 0x20, 0x28, 0x0b, 
+-	0xd2, 0x73, 0xa3, 0x02, 0x5c, 0x1b, 0x00, 0x5b, 
+-	0x44, 0x9f, 0x1c, 0x00, 0x06, 0x15, 0x24, 0x33, 
+-	0x06, 0x15, 0x24, 0x33, 0x41, 0x45, 0x45, 0x00, 
+-	0x01, 0xff, 0x48, 0x3d, 0x6a, 0x40, 0x68, 0x00, 
+-	0x4b, 0x3c, 0x40, 0x18, 0x06, 0x39, 0x0e, 0x09, 
+-	0x00, 0x89, 0x43, 0x08, 0x49, 0x38, 0x6a, 0x49, 
+-	0x60, 0x08, 0x05, 0x80, 0xe0, 0x69, 0x01, 0xbf, 
+-	0x48, 0x35, 0x6a, 0x40, 0x68, 0x00, 0x4b, 0x35, 
+-	0x40, 0x18, 0x06, 0x39, 0x0e, 0x09, 0x00, 0x89, 
+-	0x43, 0x08, 0x49, 0x31, 0x6a, 0x49, 0x60, 0x08, 
+-	0x05, 0x80, 0xe0, 0x5a, 0x01, 0x3f, 0x48, 0x2e, 
+-	0x6a, 0x40, 0x68, 0x00, 0x4b, 0x2d, 0x40, 0x18, 
+-	0x06, 0x39, 0x0e, 0x09, 0x00, 0x89, 0x43, 0x08, 
+-	0x49, 0x29, 0x6a, 0x49, 0x60, 0x08, 0x05, 0x80, 
+-	0xe0, 0x4b, 0x48, 0x27, 0x6a, 0x40, 0x68, 0x00, 
+-	0x4b, 0x26, 0x40, 0x18, 0x06, 0x39, 0x0e, 0x09, 
+-	0x00, 0x89, 0x43, 0x08, 0x49, 0x22, 0x6a, 0x49, 
+-	0x60, 0x08, 0x05, 0x80, 0xe0, 0x3d, 0x48, 0x20, 
+-	0x6a, 0x00, 0x60, 0x07, 0xe0, 0x39, 0x48, 0x1e, 
+-	0x6a, 0x40, 0x68, 0x00, 0x4b, 0x1d, 0x40, 0x18, 
+-	0x06, 0x39, 0x0e, 0x09, 0x00, 0x89, 0x43, 0x08, 
+-	0x49, 0x19, 0x6a, 0x49, 0x60, 0x08, 0x05, 0x80, 
+-	0x48, 0x17, 0x6a, 0x40, 0x68, 0x00, 0x4b, 0x18, 
+-	0x40, 0x18, 0x21, 0xff, 0x02, 0x09, 0x40, 0x39, 
+-	0x00, 0x89, 0x43, 0x08, 0x49, 0x12, 0x6a, 0x49, 
+-	0x60, 0x08, 0x03, 0x80, 0x48, 0x10, 0x6a, 0x40, 
+-	0x68, 0x00, 0x4b, 0x12, 0x40, 0x18, 0x21, 0xff, 
+-	0x04, 0x09, 0x40, 0x39, 0x00, 0x89, 0x43, 0x01, 
+-	0x48, 0x0b, 0x6a, 0x40, 0x60, 0x01, 0x01, 0x88, 
+-	0xe0, 0x00, 0xe0, 0x0d, 0x48, 0x08, 0x6a, 0x40, 
+-	0x68, 0x00, 0x01, 0x80, 0x09, 0x80, 0x21, 0x3f, 
+-	0x06, 0x09, 0x40, 0x39, 0x00, 0x89, 0x43, 0x08, 
+-	0x49, 0x03, 0x6a, 0x49, 0x60, 0x08, 0xe0, 0x00, 
+-	0xe7, 0xff, 0xbc, 0xb0, 0x47, 0x70, 0x00, 0x00, 
+-	0x2e, 0x08, 0x1f, 0xa8, 0xff, 0xff, 0xfc, 0x03, 
+-	0xff, 0xfc, 0x03, 0xff, 0xfc, 0x03, 0xff, 0xff, 
+-	0xb4, 0x80, 0x1c, 0x07, 0x1c, 0x0a, 0x69, 0x38, 
+-	0x28, 0x0b, 0xd2, 0x1a, 0xa3, 0x01, 0x5c, 0x1b, 
+-	0x00, 0x5b, 0x44, 0x9f, 0x05, 0x08, 0x0b, 0x0e, 
+-	0x05, 0x08, 0x0b, 0x0e, 0x11, 0x13, 0x13, 0x00, 
+-	0x68, 0x10, 0x0f, 0xc1, 0xe0, 0x0f, 0x68, 0x10, 
+-	0x0f, 0x81, 0xe0, 0x0c, 0x68, 0x10, 0x0f, 0x01, 
+-	0xe0, 0x09, 0x68, 0x10, 0x0e, 0x01, 0xe0, 0x06, 
+-	0x68, 0x11, 0xe0, 0x04, 0x68, 0x10, 0x0a, 0x01, 
+-	0xe0, 0x01, 0x68, 0x11, 0xe7, 0xff, 0x1c, 0x08, 
+-	0xbc, 0x80, 0x47, 0x70, 0xe7, 0xfc, 0x48, 0x14, 
+-	0x69, 0x80, 0x68, 0x00, 0x49, 0x12, 0x6a, 0x89, 
+-	0x60, 0x08, 0x48, 0x11, 0x69, 0xc0, 0x68, 0x00, 
+-	0x49, 0x0f, 0x6a, 0xc9, 0x60, 0x08, 0x48, 0x0e, 
+-	0x6a, 0x00, 0x68, 0x00, 0x49, 0x0c, 0x6b, 0x09, 
+-	0x60, 0x08, 0x48, 0x0b, 0x6a, 0x40, 0x68, 0x00, 
+-	0x49, 0x09, 0x6b, 0x49, 0x60, 0x08, 0x20, 0x01, 
+-	0x49, 0x07, 0x6b, 0xc9, 0x60, 0x08, 0x20, 0x00, 
+-	0x49, 0x06, 0x60, 0x08, 0x20, 0x00, 0x49, 0x05, 
+-	0x60, 0x48, 0x20, 0x00, 0x49, 0x03, 0x60, 0x88, 
+-	0x20, 0x00, 0x49, 0x02, 0x60, 0xc8, 0x47, 0x70, 
+-	0x2e, 0x08, 0x1f, 0xa8, 0x2e, 0x08, 0x1f, 0xac, 
+-	0xb4, 0x90, 0x1c, 0x01, 0x29, 0x00, 0xd1, 0x02, 
+-	0x20, 0x8d, 0xbc, 0x90, 0x47, 0x70, 0x4c, 0x08, 
+-	0x1c, 0x0f, 0x22, 0x00, 0x23, 0xff, 0x33, 0x01, 
+-	0x42, 0x9a, 0xd3, 0x02, 0xe0, 0x04, 0x32, 0x01, 
+-	0xe7, 0xf8, 0xcf, 0x08, 0xc4, 0x08, 0xe7, 0xfa, 
+-	0x20, 0x00, 0xe7, 0xee, 0xe7, 0xed, 0x00, 0x00, 
+-	0x68, 0x00, 0x18, 0x00, 0xb4, 0x90, 0x1c, 0x04, 
+-	0x1c, 0x0f, 0x1c, 0x13, 0x06, 0x1a, 0x0e, 0x12, 
+-	0x1c, 0x21, 0x60, 0x0f, 0x71, 0x0a, 0x20, 0x00, 
+-	0xbc, 0x90, 0x47, 0x70, 0xe7, 0xfc, 0x00, 0x00, 
+-	0xb5, 0x00, 0x48, 0x1d, 0x69, 0x00, 0x23, 0x04, 
+-	0x40, 0x18, 0xd0, 0x19, 0x48, 0x1a, 0x69, 0x00, 
+-	0x23, 0x02, 0x40, 0x18, 0xd0, 0x09, 0x48, 0x18, 
+-	0x69, 0x40, 0x49, 0x18, 0x68, 0x09, 0x60, 0x08, 
+-	0x20, 0x01, 0x49, 0x17, 0x68, 0x09, 0x70, 0x08, 
+-	0xe0, 0x03, 0x20, 0x00, 0x49, 0x14, 0x68, 0x09, 
+-	0x70, 0x08, 0x48, 0x14, 0x78, 0x01, 0x20, 0x01, 
+-	0x40, 0x88, 0xf0, 0x07, 0xfb, 0x65, 0xe0, 0x18, 
+-	0x48, 0x11, 0x6a, 0x80, 0x23, 0x02, 0x40, 0x18, 
+-	0xd0, 0x13, 0x48, 0x0f, 0x6a, 0x80, 0x07, 0xc0, 
+-	0x0f, 0xc0, 0xd0, 0x04, 0x20, 0xfe, 0x49, 0x0d, 
+-	0x68, 0x09, 0x70, 0x08, 0xe0, 0x03, 0x20, 0x0e, 
+-	0x49, 0x0a, 0x68, 0x09, 0x70, 0x08, 0x48, 0x0a, 
+-	0x78, 0x01, 0x20, 0x01, 0x40, 0x88, 0xf0, 0x07, 
+-	0xfb, 0x4b, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x6e, 0x00, 0x0c, 0x00, 0x2e, 0x08, 0x7c, 0x2c, 
+-	0x2e, 0x08, 0x7c, 0x30, 0x2e, 0x08, 0x7c, 0x34, 
+-	0x6e, 0x00, 0x0e, 0x00, 0x2e, 0x08, 0x7c, 0x38, 
+-	0x2e, 0x08, 0x7c, 0x3c, 0xb5, 0xf0, 0x1c, 0x05, 
+-	0x1c, 0x0c, 0x1c, 0x17, 0x06, 0x2e, 0x0e, 0x36, 
+-	0x2e, 0x1f, 0xdd, 0x03, 0x20, 0xaf, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x49, 0x08, 0x20, 0x0d, 
+-	0xf0, 0x07, 0xfb, 0x3c, 0x48, 0x07, 0x60, 0x04, 
+-	0x20, 0x00, 0x49, 0x06, 0x68, 0x09, 0x70, 0x08, 
+-	0x48, 0x05, 0x60, 0x07, 0x48, 0x05, 0x70, 0x06, 
+-	0x20, 0x00, 0xe7, 0xec, 0xe7, 0xeb, 0x00, 0x00, 
+-	0x2e, 0x01, 0x53, 0xed, 0x2e, 0x08, 0x7c, 0x30, 
+-	0x2e, 0x08, 0x7c, 0x2c, 0x2e, 0x08, 0x7c, 0x34, 
+-	0xb5, 0xb0, 0x1c, 0x04, 0x1c, 0x0f, 0x06, 0x25, 
+-	0x0e, 0x2d, 0x2d, 0x1f, 0xdd, 0x03, 0x20, 0xaf, 
+-	0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 0x49, 0x07, 
+-	0x20, 0x0d, 0xf0, 0x07, 0xfb, 0x17, 0x48, 0x06, 
+-	0x60, 0x07, 0x20, 0x00, 0x49, 0x04, 0x68, 0x09, 
+-	0x70, 0x08, 0x48, 0x04, 0x70, 0x05, 0x20, 0x00, 
+-	0xe7, 0xee, 0xe7, 0xed, 0x2e, 0x01, 0x53, 0xed, 
+-	0x2e, 0x08, 0x7c, 0x38, 0x2e, 0x08, 0x7c, 0x3c, 
+-	0xb4, 0xb0, 0x1c, 0x01, 0x4a, 0x35, 0x23, 0x01, 
+-	0x60, 0x13, 0x4a, 0x35, 0x1c, 0x0f, 0x68, 0x3d, 
+-	0xc2, 0x20, 0x88, 0x8d, 0xc2, 0x20, 0x88, 0xcb, 
+-	0x60, 0x13, 0x68, 0x8c, 0x2c, 0x00, 0xd0, 0x57, 
+-	0x4a, 0x30, 0x1c, 0x27, 0x20, 0x00, 0x28, 0x13, 
+-	0xdb, 0x02, 0xe0, 0x04, 0x30, 0x01, 0xe7, 0xfa, 
+-	0xcf, 0x20, 0xc2, 0x20, 0xe7, 0xfa, 0x4a, 0x2c, 
+-	0x1d, 0xe7, 0x37, 0x45, 0x20, 0x00, 0x28, 0x0b, 
+-	0xdb, 0x02, 0xe0, 0x04, 0x30, 0x01, 0xe7, 0xfa, 
+-	0xcf, 0x20, 0xc2, 0x20, 0xe7, 0xfa, 0x4a, 0x27, 
+-	0x1d, 0xe7, 0x37, 0x71, 0x20, 0x00, 0x28, 0x07, 
+-	0xdb, 0x02, 0xe0, 0x04, 0x30, 0x01, 0xe7, 0xfa, 
+-	0xcf, 0x20, 0xc2, 0x20, 0xe7, 0xfa, 0x4a, 0x22, 
+-	0x1d, 0xe7, 0x37, 0x8d, 0x20, 0x00, 0x28, 0x09, 
+-	0xdb, 0x02, 0xe0, 0x04, 0x30, 0x01, 0xe7, 0xfa, 
+-	0xcf, 0x20, 0xc2, 0x20, 0xe7, 0xfa, 0x4a, 0x1d, 
+-	0x1d, 0xe7, 0x37, 0xb1, 0x20, 0x00, 0x28, 0x09, 
+-	0xdb, 0x02, 0xe0, 0x04, 0x30, 0x01, 0xe7, 0xfa, 
+-	0xcf, 0x20, 0xc2, 0x20, 0xe7, 0xfa, 0x68, 0x0d, 
+-	0x23, 0x01, 0x02, 0x9b, 0x40, 0x2b, 0xd0, 0x17, 
+-	0x4a, 0x15, 0x1d, 0xe7, 0x37, 0xd5, 0x20, 0x00, 
+-	0x28, 0x09, 0xdb, 0x02, 0xe0, 0x04, 0x30, 0x01, 
+-	0xe7, 0xfa, 0xcf, 0x20, 0xc2, 0x20, 0xe7, 0xfa, 
+-	0x4a, 0x10, 0x1d, 0xe7, 0x37, 0xf9, 0x20, 0x00, 
+-	0x28, 0x09, 0xdb, 0x02, 0xe0, 0x04, 0x30, 0x01, 
+-	0xe7, 0xfa, 0xcf, 0x20, 0xc2, 0x20, 0xe7, 0xfa, 
+-	0x4a, 0x02, 0x23, 0x00, 0x60, 0x13, 0xbc, 0xb0, 
+-	0x47, 0x70, 0x00, 0x00, 0x6e, 0x00, 0x0c, 0x0c, 
+-	0x6e, 0x00, 0x0c, 0x00, 0x6e, 0x00, 0x08, 0x00, 
+-	0x6e, 0x00, 0x08, 0x50, 0x6e, 0x00, 0x08, 0x80, 
+-	0x6e, 0x00, 0x08, 0xa0, 0x6e, 0x00, 0x08, 0xd0, 
+-	0x6e, 0x00, 0x09, 0x00, 0x6e, 0x00, 0x09, 0x30, 
+-	0xb4, 0xf0, 0x1c, 0x01, 0x69, 0x08, 0x06, 0xc0, 
+-	0x0e, 0xc0, 0x28, 0x01, 0xdb, 0x04, 0x69, 0x08, 
+-	0x06, 0xc0, 0x0e, 0xc0, 0x28, 0x0a, 0xdd, 0x02, 
+-	0x20, 0xc3, 0xbc, 0xf0, 0x47, 0x70, 0x69, 0x08, 
+-	0x05, 0x80, 0x0e, 0xc0, 0x28, 0x01, 0xdb, 0x04, 
+-	0x69, 0x08, 0x05, 0x80, 0x0e, 0xc0, 0x28, 0x0a, 
+-	0xdd, 0x01, 0x20, 0xc4, 0xe7, 0xf1, 0x48, 0x4f, 
+-	0x6a, 0x80, 0x07, 0xc0, 0x0f, 0xc0, 0xd1, 0x01, 
+-	0x20, 0xc0, 0xe7, 0xea, 0x68, 0x08, 0x07, 0x00, 
+-	0x0f, 0xc0, 0x4b, 0x4b, 0x70, 0x18, 0x4f, 0x49, 
+-	0x1c, 0x0c, 0x22, 0x00, 0x2a, 0x04, 0xd3, 0x02, 
+-	0xe0, 0x04, 0x32, 0x01, 0xe7, 0xfa, 0xcc, 0x08, 
+-	0xc7, 0x08, 0xe7, 0xfa, 0x4f, 0x45, 0x69, 0x08, 
+-	0x06, 0xc0, 0x0e, 0xc0, 0x00, 0x43, 0x18, 0x18, 
+-	0x38, 0x03, 0x69, 0x0b, 0x05, 0x9b, 0x0e, 0xde, 
+-	0x00, 0x73, 0x19, 0x9b, 0x3b, 0x03, 0x01, 0x5b, 
+-	0x43, 0x18, 0x60, 0x38, 0x4f, 0x3e, 0x69, 0x48, 
+-	0x60, 0x38, 0x4f, 0x3e, 0x69, 0x88, 0x05, 0x40, 
+-	0x0d, 0x40, 0x69, 0x8b, 0x02, 0x9b, 0x0d, 0x5b, 
+-	0x02, 0xdb, 0x43, 0x18, 0x60, 0x38, 0x69, 0xcd, 
+-	0x2d, 0x00, 0xd0, 0x63, 0x4f, 0x38, 0x1c, 0x2c, 
+-	0x22, 0x00, 0x2a, 0x09, 0xd3, 0x02, 0xe0, 0x04, 
+-	0x32, 0x01, 0xe7, 0xfa, 0xcc, 0x08, 0xc7, 0x08, 
+-	0xe7, 0xfa, 0x4f, 0x34, 0x1d, 0xec, 0x34, 0x1d, 
+-	0x22, 0x00, 0x2a, 0x09, 0xd3, 0x02, 0xe0, 0x04, 
+-	0x32, 0x01, 0xe7, 0xfa, 0xcc, 0x08, 0xc7, 0x08, 
+-	0xe7, 0xfa, 0x4f, 0x2f, 0x1d, 0xec, 0x34, 0x41, 
+-	0x22, 0x00, 0x2a, 0x09, 0xd3, 0x02, 0xe0, 0x04, 
+-	0x32, 0x01, 0xe7, 0xfa, 0xcc, 0x08, 0xc7, 0x08, 
+-	0xe7, 0xfa, 0x4f, 0x2a, 0x1d, 0xec, 0x34, 0x65, 
+-	0x22, 0x00, 0x2a, 0x09, 0xd3, 0x02, 0xe0, 0x04, 
+-	0x32, 0x01, 0xe7, 0xfa, 0xcc, 0x08, 0xc7, 0x08, 
+-	0xe7, 0xfa, 0x4f, 0x25, 0x1d, 0xec, 0x34, 0x89, 
+-	0x22, 0x00, 0x2a, 0x05, 0xd3, 0x02, 0xe0, 0x04, 
+-	0x32, 0x01, 0xe7, 0xfa, 0xcc, 0x08, 0xc7, 0x08, 
+-	0xe7, 0xfa, 0x4f, 0x20, 0x1d, 0xec, 0x34, 0x9d, 
+-	0x22, 0x00, 0x2a, 0x05, 0xd3, 0x02, 0xe0, 0x04, 
+-	0x32, 0x01, 0xe7, 0xfa, 0xcc, 0x08, 0xc7, 0x08, 
+-	0xe7, 0xfa, 0x68, 0x08, 0x23, 0x01, 0x02, 0x9b, 
+-	0x40, 0x18, 0xd0, 0x17, 0x4f, 0x18, 0x1d, 0xec, 
+-	0x34, 0xb1, 0x22, 0x00, 0x2a, 0x05, 0xd3, 0x02, 
+-	0xe0, 0x04, 0x32, 0x01, 0xe7, 0xfa, 0xcc, 0x08, 
+-	0xc7, 0x08, 0xe7, 0xfa, 0x4f, 0x13, 0x1d, 0xec, 
+-	0x34, 0xc5, 0x22, 0x00, 0x2a, 0x05, 0xd3, 0x02, 
+-	0xe0, 0x04, 0x32, 0x01, 0xe7, 0xfa, 0xcc, 0x08, 
+-	0xc7, 0x08, 0xe7, 0xfa, 0x20, 0x00, 0xe7, 0x54, 
+-	0xe7, 0x53, 0x00, 0x00, 0x6e, 0x00, 0x0e, 0x00, 
+-	0x2e, 0x08, 0x7c, 0x3d, 0x6e, 0x00, 0x0e, 0x10, 
+-	0x6e, 0x00, 0x0e, 0x14, 0x6e, 0x00, 0x0e, 0x18, 
+-	0x6e, 0x00, 0x0a, 0x00, 0x6e, 0x00, 0x0a, 0x24, 
+-	0x6e, 0x00, 0x0a, 0x48, 0x6e, 0x00, 0x0a, 0x90, 
+-	0x6e, 0x00, 0x0a, 0xc0, 0x6e, 0x00, 0x0a, 0xe4, 
+-	0x6e, 0x00, 0x09, 0xc0, 0x6e, 0x00, 0x09, 0xe4, 
+-	0x1c, 0x01, 0x48, 0x0c, 0x78, 0x00, 0x28, 0x00, 
+-	0xd0, 0x01, 0x20, 0xc1, 0x47, 0x70, 0x48, 0x0a, 
+-	0x6a, 0x80, 0x07, 0xc0, 0x0f, 0xc0, 0xd1, 0x01, 
+-	0x20, 0xc0, 0xe7, 0xf7, 0x20, 0x00, 0x4b, 0x06, 
+-	0x61, 0x58, 0x4a, 0x06, 0x68, 0x08, 0x60, 0x10, 
+-	0x4a, 0x05, 0x68, 0x48, 0x60, 0x10, 0x20, 0x00, 
+-	0xe7, 0xec, 0xe7, 0xeb, 0x2e, 0x08, 0x7c, 0x3d, 
+-	0x6e, 0x00, 0x0e, 0x00, 0x6e, 0x00, 0x0e, 0x20, 
+-	0x6e, 0x00, 0x0e, 0x24, 0x48, 0x09, 0x78, 0x00, 
+-	0x28, 0x00, 0xd0, 0x01, 0x20, 0xc1, 0x47, 0x70, 
+-	0x48, 0x07, 0x6a, 0x80, 0x07, 0xc0, 0x0f, 0xc0, 
+-	0xd0, 0x01, 0x20, 0xc2, 0xe7, 0xf7, 0x20, 0x01, 
+-	0x49, 0x03, 0x61, 0x48, 0x20, 0x00, 0xe7, 0xf2, 
+-	0xe7, 0xf1, 0x00, 0x00, 0x2e, 0x08, 0x7c, 0x3d, 
+-	0x6e, 0x00, 0x0e, 0x00, 0xb5, 0xff, 0x1c, 0x04, 
+-	0x1c, 0x0d, 0x1c, 0x17, 0x9e, 0x09, 0x20, 0x00, 
+-	0x60, 0x30, 0x48, 0x13, 0x68, 0x00, 0x28, 0x00, 
+-	0xd0, 0x07, 0x9b, 0x03, 0x2b, 0x00, 0xd1, 0x04, 
+-	0x20, 0x8a, 0xb0, 0x04, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x23, 0xff, 0x33, 0x01, 0x42, 0x9c, 
+-	0xdd, 0x01, 0x20, 0x87, 0xe7, 0xf5, 0x19, 0x28, 
+-	0x23, 0xff, 0x33, 0x01, 0x42, 0x98, 0xd9, 0x01, 
+-	0x20, 0x88, 0xe7, 0xee, 0x68, 0x79, 0x1c, 0x20, 
+-	0x80, 0x48, 0x70, 0x0d, 0x9b, 0x03, 0x60, 0x4b, 
+-	0x68, 0x78, 0x60, 0xc8, 0x68, 0x38, 0x60, 0x88, 
+-	0x60, 0x31, 0x20, 0x00, 0xe7, 0xe1, 0xe7, 0xe0, 
+-	0x2e, 0x08, 0x60, 0x84, 0x1c, 0x03, 0x1c, 0x0a, 
+-	0x1c, 0x19, 0x68, 0xc8, 0x60, 0x50, 0x68, 0x88, 
+-	0x60, 0x10, 0x20, 0x00, 0x47, 0x70, 0xe7, 0xfd, 
+-	0xb5, 0xf3, 0xb0, 0x87, 0x21, 0x00, 0x91, 0x06, 
+-	0x26, 0x00, 0x98, 0x07, 0xf0, 0x00, 0xfa, 0xcb, 
+-	0x90, 0x03, 0x9c, 0x07, 0x9d, 0x08, 0x88, 0x69, 
+-	0x91, 0x04, 0x98, 0x03, 0x99, 0x04, 0x42, 0x88, 
+-	0xd0, 0x09, 0x48, 0xbb, 0x68, 0x00, 0x28, 0x00, 
+-	0xd1, 0x05, 0x20, 0xff, 0xb0, 0x07, 0xb0, 0x02, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x78, 0x28, 
+-	0x90, 0x05, 0x99, 0x04, 0x23, 0xff, 0x33, 0x01, 
+-	0x42, 0x99, 0xdd, 0x02, 0x20, 0xff, 0xb0, 0x07, 
+-	0xe7, 0xf1, 0x98, 0x05, 0x99, 0x04, 0x18, 0x40, 
+-	0x23, 0xff, 0x33, 0x01, 0x42, 0x98, 0xdd, 0x02, 
+-	0x20, 0xff, 0xb0, 0x07, 0xe7, 0xe7, 0x48, 0xad, 
+-	0x68, 0x00, 0x28, 0x00, 0xd0, 0x0a, 0x68, 0xa0, 
+-	0x23, 0x01, 0x06, 0x1b, 0x40, 0x18, 0xd0, 0x05, 
+-	0x68, 0x68, 0x28, 0x00, 0xd1, 0x02, 0x20, 0x8a, 
+-	0xb0, 0x07, 0xe7, 0xd8, 0x62, 0x65, 0x69, 0x60, 
+-	0x4b, 0xa5, 0x40, 0x18, 0x99, 0x05, 0x06, 0x09, 
+-	0x0e, 0x09, 0x04, 0x09, 0x43, 0x08, 0x61, 0x60, 
+-	0x02, 0x00, 0x68, 0xe0, 0x90, 0x00, 0x48, 0x9e, 
+-	0x68, 0x00, 0x28, 0x00, 0xd0, 0x06, 0x98, 0x00, 
+-	0x28, 0x19, 0xd3, 0x01, 0x20, 0x01, 0xe0, 0x00, 
+-	0x20, 0x00, 0xe0, 0x05, 0x98, 0x00, 0x28, 0x08, 
+-	0xd3, 0x01, 0x20, 0x01, 0xe0, 0x00, 0x20, 0x00, 
+-	0x28, 0x00, 0xd0, 0x02, 0x20, 0x00, 0xb0, 0x07, 
+-	0xe7, 0xb5, 0x48, 0x94, 0x68, 0x00, 0x28, 0x00, 
+-	0xd0, 0x1e, 0x48, 0x91, 0x68, 0x00, 0x28, 0x00, 
+-	0xd1, 0x1a, 0x68, 0xa0, 0x02, 0x00, 0x0e, 0x00, 
+-	0x06, 0x01, 0x0e, 0x09, 0x91, 0x06, 0x99, 0x04, 
+-	0x29, 0x04, 0xd0, 0x06, 0x29, 0x10, 0xd0, 0x07, 
+-	0x23, 0xff, 0x33, 0x01, 0x42, 0x99, 0xd0, 0x06, 
+-	0xe0, 0x08, 0x26, 0xff, 0x36, 0x01, 0xe0, 0x07, 
+-	0x26, 0x01, 0x02, 0x76, 0xe0, 0x04, 0x26, 0x03, 
+-	0x02, 0x36, 0xe0, 0x01, 0x26, 0x00, 0xe7, 0xff, 
+-	0x49, 0x84, 0x20, 0x91, 0xf0, 0x0f, 0xff, 0xca, 
+-	0x28, 0x92, 0xd0, 0x03, 0x20, 0x01, 0xf0, 0x01, 
+-	0xff, 0xb1, 0xe7, 0xf5, 0x98, 0x00, 0x00, 0x80, 
+-	0x49, 0x7f, 0x58, 0x08, 0x99, 0x07, 0x42, 0x88, 
+-	0xd0, 0x05, 0x20, 0x92, 0x49, 0x7b, 0x60, 0x08, 
+-	0x20, 0xff, 0xb0, 0x07, 0xe7, 0x7b, 0x48, 0x77, 
+-	0x68, 0x00, 0x28, 0x00, 0xd0, 0x73, 0x48, 0x74, 
+-	0x68, 0x00, 0x28, 0x00, 0xd0, 0x6f, 0x98, 0x00, 
+-	0xf0, 0x02, 0xfe, 0xd6, 0x28, 0x00, 0xd0, 0x6a, 
+-	0xb0, 0x82, 0x49, 0x74, 0x20, 0x91, 0xf0, 0x0f, 
+-	0xff, 0xa5, 0x28, 0x92, 0xd0, 0x00, 0xe7, 0xf8, 
+-	0xf0, 0x02, 0xff, 0x25, 0x20, 0x92, 0x49, 0x6f, 
+-	0x60, 0x08, 0x20, 0x01, 0x49, 0x6e, 0x68, 0x09, 
+-	0x60, 0x08, 0x27, 0x00, 0x20, 0x00, 0x90, 0x00, 
+-	0x98, 0x00, 0x28, 0x00, 0xd1, 0x15, 0x2f, 0x07, 
+-	0xd2, 0x13, 0x6a, 0xe0, 0x05, 0x81, 0x0d, 0x89, 
+-	0x1c, 0x38, 0x37, 0x01, 0x00, 0x83, 0x18, 0x18, 
+-	0x00, 0xc0, 0x4a, 0x65, 0x68, 0x12, 0x18, 0x80, 
+-	0x23, 0x05, 0x02, 0x1b, 0x18, 0xc0, 0x6f, 0xc0, 
+-	0x42, 0x81, 0xd1, 0x01, 0x20, 0x01, 0x90, 0x00, 
+-	0xe7, 0xe6, 0x98, 0x00, 0x28, 0x00, 0xd1, 0x14, 
+-	0x2f, 0x18, 0xd2, 0x12, 0x6a, 0xe0, 0x05, 0x81, 
+-	0x0d, 0x89, 0x1c, 0x38, 0x37, 0x01, 0x23, 0x4c, 
+-	0x43, 0x58, 0x4a, 0x59, 0x68, 0x12, 0x18, 0x80, 
+-	0x38, 0xff, 0x38, 0xff, 0x38, 0x02, 0x69, 0x40, 
+-	0x42, 0x81, 0xd1, 0x01, 0x20, 0x01, 0x90, 0x00, 
+-	0xe7, 0xe7, 0x3f, 0x01, 0x2f, 0x07, 0xd2, 0x10, 
+-	0x00, 0xb8, 0x19, 0xc0, 0x00, 0xc0, 0x49, 0x50, 
+-	0x68, 0x09, 0x18, 0x40, 0x23, 0x2b, 0x01, 0x5b, 
+-	0x18, 0xc0, 0x1c, 0x21, 0xf0, 0x02, 0xfb, 0x38, 
+-	0x48, 0x4b, 0x68, 0x00, 0xf0, 0x02, 0xfe, 0xee, 
+-	0xe0, 0x46, 0x2f, 0x18, 0xd2, 0x44, 0x20, 0x4c, 
+-	0x43, 0x78, 0x49, 0x47, 0x68, 0x09, 0x18, 0x40, 
+-	0x38, 0xff, 0x38, 0xff, 0x38, 0x0a, 0x1c, 0x21, 
+-	0xf0, 0x02, 0xfb, 0x26, 0x20, 0x4c, 0x43, 0x78, 
+-	0x49, 0x41, 0x68, 0x09, 0xe0, 0x00, 0xe0, 0x48, 
+-	0x18, 0x40, 0x38, 0xff, 0x38, 0xff, 0x38, 0x82, 
+-	0x6f, 0xc0, 0x28, 0x00, 0xd0, 0x17, 0x20, 0x4c, 
+-	0x43, 0x78, 0x49, 0x3b, 0x68, 0x09, 0x18, 0x40, 
+-	0x38, 0xff, 0x38, 0xff, 0x38, 0x02, 0x68, 0x00, 
+-	0x04, 0x00, 0x0c, 0x00, 0xd0, 0x0b, 0x20, 0x4c, 
+-	0x43, 0x78, 0x49, 0x35, 0x68, 0x09, 0x18, 0x40, 
+-	0x38, 0xff, 0x38, 0xff, 0x38, 0x02, 0x68, 0x00, 
+-	0x0c, 0x00, 0x04, 0x00, 0xd1, 0x0a, 0x20, 0x02, 
+-	0x21, 0x4c, 0x43, 0x79, 0x4a, 0x2e, 0x68, 0x12, 
+-	0x18, 0x89, 0x39, 0xff, 0x39, 0xff, 0x39, 0x82, 
+-	0x67, 0x48, 0xe0, 0x09, 0x20, 0x03, 0x21, 0x4c, 
+-	0x43, 0x79, 0x4a, 0x29, 0x68, 0x12, 0x18, 0x89, 
+-	0x39, 0xff, 0x39, 0xff, 0x39, 0x82, 0x67, 0x48, 
+-	0x49, 0x24, 0x20, 0x91, 0xf0, 0x0f, 0xff, 0x06, 
+-	0x28, 0x92, 0xd0, 0x00, 0xe7, 0xf8, 0x48, 0x22, 
+-	0x68, 0x00, 0x90, 0x01, 0x48, 0x21, 0x68, 0x00, 
+-	0x49, 0x1f, 0x60, 0x08, 0x98, 0x01, 0x49, 0x1f, 
+-	0x60, 0x08, 0x20, 0x92, 0x49, 0x1b, 0x60, 0x08, 
+-	0xb0, 0x02, 0x48, 0x15, 0x68, 0x00, 0x28, 0x00, 
+-	0xd1, 0x1d, 0x98, 0x00, 0x01, 0x00, 0x4b, 0x1a, 
+-	0x18, 0xc1, 0x91, 0x01, 0x1d, 0xe0, 0x30, 0x0d, 
+-	0x90, 0x02, 0x98, 0x02, 0x68, 0x00, 0x99, 0x01, 
+-	0x60, 0x08, 0x48, 0x0e, 0x68, 0x00, 0x28, 0x00, 
+-	0xd0, 0x0d, 0x68, 0x68, 0x08, 0x80, 0x99, 0x06, 
+-	0x00, 0x89, 0x4b, 0x12, 0x18, 0xc9, 0x67, 0x08, 
+-	0x98, 0x05, 0x43, 0x30, 0x99, 0x06, 0x00, 0x89, 
+-	0x4b, 0x0f, 0x18, 0xc9, 0x61, 0x08, 0x20, 0x92, 
+-	0x49, 0x06, 0x60, 0x08, 0x20, 0x00, 0xb0, 0x07, 
+-	0xe6, 0x91, 0xb0, 0x07, 0xe6, 0x8f, 0x00, 0x00, 
+-	0x2e, 0x08, 0x94, 0x84, 0x2e, 0x08, 0x60, 0x84, 
+-	0xff, 0x00, 0xff, 0xff, 0x2e, 0x08, 0x7c, 0xc0, 
+-	0x2e, 0x08, 0x7c, 0x58, 0x2e, 0x08, 0x94, 0x88, 
+-	0x2e, 0x08, 0x7d, 0xb4, 0x2e, 0x08, 0x7d, 0xb8, 
+-	0x68, 0x00, 0x0c, 0x00, 0x68, 0x00, 0x0e, 0x00, 
+-	0x68, 0x00, 0x0e, 0x80, 0x1c, 0x01, 0x1c, 0x0a, 
+-	0x6a, 0x53, 0x1c, 0x18, 0x47, 0x70, 0xe7, 0xfd, 
+-	0xb5, 0xf3, 0x1c, 0x0f, 0xb0, 0x82, 0x48, 0x2b, 
+-	0x68, 0x00, 0x28, 0x00, 0xd0, 0x05, 0x20, 0x8a, 
+-	0xb0, 0x02, 0xb0, 0x02, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x98, 0x02, 0x90, 0x01, 0x98, 0x01, 
+-	0x88, 0x44, 0x98, 0x01, 0x78, 0x06, 0x23, 0xff, 
+-	0x33, 0x01, 0x42, 0x9c, 0xdd, 0x02, 0x20, 0xff, 
+-	0xb0, 0x02, 0xe7, 0xee, 0x19, 0x30, 0x23, 0xff, 
+-	0x33, 0x01, 0x42, 0x98, 0xdd, 0x02, 0x20, 0xff, 
+-	0xb0, 0x02, 0xe7, 0xe6, 0x49, 0x1c, 0x20, 0x91, 
+-	0xf0, 0x0f, 0xfe, 0x88, 0x28, 0x92, 0xd0, 0x03, 
+-	0x20, 0x01, 0xf0, 0x01, 0xfe, 0x6f, 0xe7, 0xf5, 
+-	0x2c, 0x10, 0xda, 0x0d, 0x25, 0x00, 0x42, 0xa5, 
+-	0xdb, 0x02, 0xe0, 0x08, 0x35, 0x01, 0xe7, 0xfa, 
+-	0xcf, 0x01, 0x19, 0x71, 0x00, 0x89, 0x4b, 0x13, 
+-	0x18, 0xc9, 0x60, 0x08, 0xe7, 0xf6, 0xe0, 0x15, 
+-	0x4a, 0x11, 0x43, 0x22, 0x92, 0x00, 0x20, 0x91, 
+-	0x49, 0x10, 0x60, 0x08, 0x00, 0xb0, 0x4b, 0x0d, 
+-	0x18, 0xc1, 0x9a, 0x00, 0x1c, 0x38, 0x23, 0x02, 
+-	0xf0, 0x00, 0xfa, 0xfe, 0x28, 0x00, 0xd0, 0x00, 
+-	0xe7, 0xf4, 0x48, 0x0a, 0x68, 0x00, 0x28, 0x92, 
+-	0xd0, 0x00, 0xe7, 0xfa, 0x20, 0x92, 0x49, 0x04, 
+-	0x60, 0x08, 0x20, 0x00, 0xb0, 0x02, 0xe7, 0xb0, 
+-	0xb0, 0x02, 0xe7, 0xae, 0x2e, 0x08, 0x60, 0x84, 
+-	0x2e, 0x08, 0x7c, 0xc4, 0x68, 0x00, 0x08, 0x00, 
+-	0xf0, 0x00, 0x00, 0x00, 0x2e, 0x08, 0x7c, 0xc8, 
+-	0x21, 0x04, 0xe0, 0x00, 0x31, 0x01, 0x1c, 0x08, 
+-	0x47, 0x70, 0xe7, 0xfd, 0xb5, 0xf3, 0x1c, 0x0f, 
+-	0xb0, 0x82, 0x48, 0x2b, 0x68, 0x00, 0x28, 0x00, 
+-	0xd0, 0x05, 0x20, 0x8a, 0xb0, 0x02, 0xb0, 0x02, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x98, 0x02, 
+-	0x90, 0x01, 0x98, 0x01, 0x88, 0x44, 0x98, 0x01, 
+-	0x78, 0x06, 0x23, 0xff, 0x33, 0x01, 0x42, 0x9c, 
+-	0xdd, 0x02, 0x20, 0xff, 0xb0, 0x02, 0xe7, 0xee, 
+-	0x19, 0x30, 0x23, 0xff, 0x33, 0x01, 0x42, 0x98, 
+-	0xdd, 0x02, 0x20, 0xff, 0xb0, 0x02, 0xe7, 0xe6, 
+-	0x49, 0x1c, 0x20, 0x91, 0xf0, 0x0f, 0xfe, 0x1e, 
+-	0x28, 0x92, 0xd0, 0x03, 0x20, 0x01, 0xf0, 0x01, 
+-	0xfe, 0x05, 0xe7, 0xf5, 0x2c, 0x10, 0xda, 0x0d, 
+-	0x25, 0x00, 0x42, 0xa5, 0xdb, 0x02, 0xe0, 0x08, 
+-	0x35, 0x01, 0xe7, 0xfa, 0x19, 0x70, 0x00, 0x80, 
+-	0x4b, 0x13, 0x18, 0xc0, 0x68, 0x01, 0xc7, 0x02, 
+-	0xe7, 0xf6, 0xe0, 0x15, 0x4a, 0x11, 0x43, 0x22, 
+-	0x92, 0x00, 0x20, 0x91, 0x49, 0x10, 0x60, 0x08, 
+-	0x00, 0xb0, 0x4b, 0x0d, 0x18, 0xc0, 0x9a, 0x00, 
+-	0x1c, 0x39, 0x23, 0x02, 0xf0, 0x00, 0xfa, 0x94, 
+-	0x28, 0x00, 0xd0, 0x00, 0xe7, 0xf4, 0x48, 0x0a, 
+-	0x68, 0x00, 0x28, 0x92, 0xd0, 0x00, 0xe7, 0xfa, 
+-	0x20, 0x92, 0x49, 0x04, 0x60, 0x08, 0x20, 0x00, 
+-	0xb0, 0x02, 0xe7, 0xb0, 0xb0, 0x02, 0xe7, 0xae, 
+-	0x2e, 0x08, 0x60, 0x84, 0x2e, 0x08, 0x7c, 0xc4, 
+-	0x68, 0x00, 0x08, 0x00, 0xf0, 0x00, 0x00, 0x00, 
+-	0x2e, 0x08, 0x7c, 0xc8, 0xb5, 0xf7, 0x9a, 0x02, 
+-	0x06, 0x15, 0x0e, 0x2d, 0x9c, 0x00, 0x88, 0x66, 
+-	0x42, 0xb5, 0xdd, 0x04, 0x20, 0xff, 0xb0, 0x03, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x78, 0x20, 
+-	0x19, 0x40, 0x06, 0x07, 0x0e, 0x3f, 0x23, 0xff, 
+-	0x33, 0x01, 0x42, 0x9f, 0xdd, 0x01, 0x20, 0xff, 
+-	0xe7, 0xf1, 0x49, 0x0a, 0x20, 0x91, 0xf0, 0x0f, 
+-	0xfd, 0xc5, 0x28, 0x92, 0xd0, 0x03, 0x20, 0x01, 
+-	0xf0, 0x01, 0xfd, 0xac, 0xe7, 0xf5, 0x99, 0x01, 
+-	0x00, 0xb8, 0x4b, 0x05, 0x18, 0xc0, 0x60, 0x01, 
+-	0x20, 0x92, 0x49, 0x02, 0x60, 0x08, 0x20, 0x00, 
+-	0xe7, 0xdd, 0xe7, 0xdc, 0x2e, 0x08, 0x7c, 0xc4, 
+-	0x68, 0x00, 0x08, 0x00, 0xb5, 0xf7, 0x9a, 0x02, 
+-	0x06, 0x14, 0x0e, 0x24, 0x9f, 0x00, 0x88, 0x7d, 
+-	0x78, 0x38, 0x19, 0x00, 0x06, 0x06, 0x0e, 0x36, 
+-	0x42, 0xac, 0xdd, 0x04, 0x20, 0xff, 0xb0, 0x03, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x49, 0x0b, 
+-	0x20, 0x91, 0xf0, 0x0f, 0xfd, 0x9b, 0x28, 0x92, 
+-	0xd0, 0x03, 0x20, 0x01, 0xf0, 0x01, 0xfd, 0x82, 
+-	0xe7, 0xf5, 0x00, 0xb0, 0x4b, 0x06, 0x18, 0xc0, 
+-	0x68, 0x00, 0x99, 0x01, 0x60, 0x08, 0x20, 0x92, 
+-	0x49, 0x02, 0x60, 0x08, 0x20, 0x00, 0xe7, 0xe6, 
+-	0xe7, 0xe5, 0x00, 0x00, 0x2e, 0x08, 0x7c, 0xc4, 
+-	0x68, 0x00, 0x08, 0x00, 0x1c, 0x01, 0x1c, 0x0a, 
+-	0x88, 0x50, 0x47, 0x70, 0xe7, 0xfd, 0xb4, 0x80, 
+-	0x1c, 0x01, 0x1c, 0x0f, 0x69, 0x3a, 0x2a, 0x08, 
+-	0xd2, 0x12, 0xa3, 0x02, 0x5c, 0x9b, 0x00, 0x5b, 
+-	0x44, 0x9f, 0x1c, 0x00, 0x04, 0x07, 0x09, 0x0b, 
+-	0x04, 0x07, 0x09, 0x0b, 0x20, 0x02, 0xbc, 0x80, 
+-	0x47, 0x70, 0x20, 0x04, 0xe7, 0xfb, 0x20, 0x10, 
+-	0xe7, 0xf9, 0x20, 0xff, 0x30, 0x01, 0xe7, 0xf6, 
+-	0x20, 0x00, 0xe7, 0xf4, 0xe7, 0xf3, 0xb5, 0xf3, 
+-	0x98, 0x00, 0x06, 0x05, 0x0e, 0x2d, 0x48, 0x89, 
+-	0x68, 0x00, 0x28, 0x00, 0xd1, 0x04, 0x20, 0x8b, 
+-	0xb0, 0x02, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x48, 0x85, 0x68, 0x00, 0x28, 0x01, 0xd1, 0x04, 
+-	0x2d, 0x17, 0xdd, 0x02, 0x20, 0x8c, 0xe7, 0xf3, 
+-	0xe0, 0xfe, 0x2d, 0x07, 0xdd, 0x01, 0x20, 0x8c, 
+-	0xe7, 0xee, 0x49, 0x80, 0x20, 0x91, 0xf0, 0x0f, 
+-	0xfd, 0x45, 0x28, 0x92, 0xd0, 0x03, 0x20, 0x01, 
+-	0xf0, 0x01, 0xfd, 0x2c, 0xe7, 0xf5, 0x1c, 0x28, 
+-	0xf7, 0xf8, 0xfc, 0xd8, 0x1c, 0x04, 0x2c, 0x00, 
+-	0xd0, 0x09, 0x68, 0xa0, 0x4b, 0x78, 0x40, 0x18, 
+-	0x99, 0x01, 0x07, 0xc9, 0x09, 0xc9, 0x43, 0x08, 
+-	0x60, 0xa0, 0x01, 0xc0, 0xe0, 0x04, 0x20, 0x92, 
+-	0x49, 0x72, 0x60, 0x08, 0x20, 0xff, 0xe7, 0xcf, 
+-	0x48, 0x6f, 0x68, 0x00, 0x28, 0x00, 0xd1, 0x11, 
+-	0x99, 0x01, 0x29, 0x00, 0xd0, 0x06, 0x48, 0x6f, 
+-	0x21, 0x01, 0x40, 0xa9, 0x68, 0x02, 0x43, 0x11, 
+-	0x60, 0x01, 0xe0, 0x06, 0x48, 0x6b, 0x21, 0x01, 
+-	0x40, 0xa9, 0x43, 0xc9, 0x68, 0x02, 0x40, 0x11, 
+-	0x60, 0x01, 0xe0, 0xbf, 0x68, 0xe0, 0xf0, 0x02, 
+-	0xfc, 0x3b, 0x28, 0x00, 0xd0, 0x73, 0xb0, 0x81, 
+-	0x49, 0x65, 0x20, 0x91, 0xf0, 0x0f, 0xfd, 0x0a, 
+-	0x28, 0x92, 0xd0, 0x00, 0xe7, 0xf8, 0xf0, 0x02, 
+-	0xfc, 0x8a, 0x20, 0x92, 0x49, 0x60, 0x60, 0x08, 
+-	0x20, 0x01, 0x49, 0x60, 0x68, 0x09, 0x60, 0x08, 
+-	0x27, 0x00, 0x26, 0x00, 0x2e, 0x00, 0xd1, 0x14, 
+-	0x2f, 0x07, 0xd2, 0x12, 0x6a, 0xe0, 0x05, 0x81, 
+-	0x0d, 0x89, 0x1c, 0x38, 0x37, 0x01, 0x00, 0x83, 
+-	0x18, 0x18, 0x00, 0xc0, 0x4a, 0x57, 0x68, 0x12, 
+-	0x18, 0x80, 0x23, 0x05, 0x02, 0x1b, 0x18, 0xc0, 
+-	0x6f, 0xc0, 0x42, 0x81, 0xd1, 0x00, 0x26, 0x01, 
+-	0xe7, 0xe8, 0x2e, 0x00, 0xd1, 0x13, 0x2f, 0x18, 
+-	0xd2, 0x11, 0x6a, 0xe0, 0x05, 0x81, 0x0d, 0x89, 
+-	0x1c, 0x38, 0x37, 0x01, 0x23, 0x4c, 0x43, 0x58, 
+-	0x4a, 0x4c, 0x68, 0x12, 0x18, 0x80, 0x38, 0xff, 
+-	0x38, 0xff, 0x38, 0x02, 0x69, 0x40, 0x42, 0x81, 
+-	0xd1, 0x00, 0x26, 0x01, 0xe7, 0xe9, 0x3f, 0x01, 
+-	0x2f, 0x07, 0xd2, 0x32, 0x99, 0x02, 0x29, 0x00, 
+-	0xd0, 0x16, 0x00, 0xb8, 0x19, 0xc0, 0x00, 0xc0, 
+-	0x49, 0x42, 0x68, 0x09, 0x18, 0x40, 0x23, 0x05, 
+-	0x02, 0x1b, 0x18, 0xc0, 0x6e, 0x80, 0x4b, 0x40, 
+-	0x43, 0x18, 0x00, 0xb9, 0x19, 0xc9, 0x00, 0xc9, 
+-	0x4a, 0x3c, 0x68, 0x12, 0x18, 0x89, 0x23, 0x05, 
+-	0x02, 0x1b, 0x18, 0xc9, 0x66, 0x88, 0xe0, 0x17, 
+-	0x00, 0xb8, 0x19, 0xc0, 0x00, 0xc0, 0x49, 0x37, 
+-	0x68, 0x09, 0x18, 0x40, 0x23, 0x05, 0x02, 0x1b, 
+-	0x18, 0xc0, 0x6e, 0x80, 0x04, 0x00, 0x0c, 0x00, 
+-	0x00, 0xb9, 0x19, 0xc9, 0x00, 0xc9, 0x4a, 0x31, 
+-	0x68, 0x12, 0x18, 0x89, 0x23, 0x05, 0x02, 0x1b, 
+-	0x18, 0xc9, 0x66, 0x88, 0xe0, 0x00, 0xe0, 0x45, 
+-	0xe0, 0x2b, 0x99, 0x02, 0x29, 0x00, 0xd0, 0x14, 
+-	0x20, 0x4c, 0x43, 0x78, 0x49, 0x29, 0x68, 0x09, 
+-	0x18, 0x40, 0x38, 0xff, 0x38, 0xff, 0x38, 0x02, 
+-	0x68, 0x00, 0x4b, 0x27, 0x43, 0x18, 0x21, 0x4c, 
+-	0x43, 0x79, 0x4a, 0x24, 0x68, 0x12, 0x18, 0x89, 
+-	0x39, 0xff, 0x39, 0xff, 0x39, 0x02, 0x60, 0x08, 
+-	0xe0, 0x13, 0x20, 0x4c, 0x43, 0x78, 0x49, 0x1f, 
+-	0x68, 0x09, 0x18, 0x40, 0x38, 0xff, 0x38, 0xff, 
+-	0x38, 0x02, 0x68, 0x00, 0x04, 0x00, 0x0c, 0x00, 
+-	0x21, 0x4c, 0x43, 0x79, 0x4a, 0x19, 0x68, 0x12, 
+-	0x18, 0x89, 0x39, 0xff, 0x39, 0xff, 0x39, 0x02, 
+-	0x60, 0x08, 0x48, 0x16, 0x68, 0x00, 0xf0, 0x02, 
+-	0xfc, 0x05, 0x49, 0x13, 0x20, 0x91, 0xf0, 0x0f, 
+-	0xfc, 0x65, 0x28, 0x92, 0xd0, 0x00, 0xe7, 0xf8, 
+-	0x48, 0x10, 0x68, 0x00, 0x90, 0x00, 0x48, 0x11, 
+-	0x68, 0x00, 0x49, 0x0e, 0x60, 0x08, 0x98, 0x00, 
+-	0x49, 0x0e, 0x60, 0x08, 0x20, 0x92, 0x49, 0x0a, 
+-	0x60, 0x08, 0xb0, 0x01, 0x20, 0x92, 0x49, 0x05, 
+-	0x60, 0x08, 0x20, 0x00, 0xe6, 0xf4, 0xe6, 0xf3, 
+-	0xe6, 0xf2, 0x00, 0x00, 0x2e, 0x08, 0x60, 0x84, 
+-	0x2e, 0x08, 0x94, 0x84, 0x2e, 0x08, 0x7c, 0xc4, 
+-	0xfe, 0xff, 0xff, 0xff, 0x68, 0x00, 0x00, 0x20, 
+-	0x2e, 0x08, 0x94, 0x88, 0x2e, 0x08, 0x7d, 0xb4, 
+-	0xff, 0xff, 0x00, 0x00, 0x2e, 0x08, 0x7d, 0xb8, 
+-	0xb5, 0xf0, 0x1c, 0x04, 0x1c, 0x0f, 0x06, 0x26, 
+-	0x0e, 0x36, 0x48, 0x0f, 0x68, 0x00, 0x28, 0x00, 
+-	0xd1, 0x03, 0x20, 0x8b, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x2e, 0x07, 0xdd, 0x01, 0x20, 0x8c, 
+-	0xe7, 0xf8, 0x1c, 0x30, 0xf7, 0xf8, 0xfb, 0xc2, 
+-	0x1c, 0x05, 0x2d, 0x00, 0xd0, 0x04, 0x68, 0xa8, 
+-	0x01, 0xc0, 0x0f, 0xc0, 0x60, 0x38, 0xe0, 0x04, 
+-	0x20, 0x92, 0x49, 0x04, 0x60, 0x08, 0x20, 0xff, 
+-	0xe7, 0xe8, 0x20, 0x00, 0xe7, 0xe6, 0xe7, 0xe5, 
+-	0x2e, 0x08, 0x60, 0x84, 0x2e, 0x08, 0x7c, 0xc4, 
+-	0xb5, 0xb0, 0x1c, 0x04, 0x1c, 0x0f, 0x06, 0x25, 
+-	0x0e, 0x2d, 0x48, 0x20, 0x68, 0x00, 0x28, 0x00, 
+-	0xd1, 0x03, 0x20, 0x8b, 0xbc, 0xb0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x48, 0x1d, 0x68, 0x00, 0x28, 0x01, 
+-	0xd1, 0x04, 0x2d, 0x17, 0xdd, 0x02, 0x20, 0x8c, 
+-	0xe7, 0xf4, 0xe0, 0x2d, 0x2d, 0x07, 0xdd, 0x01, 
+-	0x20, 0x8c, 0xe7, 0xef, 0x48, 0x16, 0x68, 0x00, 
+-	0x28, 0x00, 0xd0, 0x01, 0x20, 0xff, 0xe7, 0xe9, 
+-	0x49, 0x14, 0x20, 0x91, 0xf0, 0x0f, 0xfb, 0xee, 
+-	0x28, 0x92, 0xd0, 0x03, 0x20, 0x01, 0xf0, 0x01, 
+-	0xfb, 0xd5, 0xe7, 0xf5, 0x2f, 0x00, 0xd0, 0x08, 
+-	0x48, 0x0f, 0x1d, 0xe9, 0x31, 0x01, 0x22, 0x01, 
+-	0x40, 0x8a, 0x68, 0x01, 0x43, 0x11, 0x60, 0x01, 
+-	0xe0, 0x08, 0x48, 0x0b, 0x1d, 0xea, 0x32, 0x01, 
+-	0x21, 0x01, 0x40, 0x91, 0x43, 0xc9, 0x68, 0x02, 
+-	0x40, 0x11, 0x60, 0x01, 0x20, 0x92, 0x49, 0x05, 
+-	0x60, 0x08, 0x20, 0x00, 0xe7, 0xc6, 0xe7, 0xc5, 
+-	0xe7, 0xc4, 0x00, 0x00, 0x2e, 0x08, 0x60, 0x84, 
+-	0x2e, 0x08, 0x94, 0x84, 0x2e, 0x08, 0x7c, 0xc4, 
+-	0x68, 0x00, 0x00, 0x20, 0xb4, 0x90, 0x1c, 0x07, 
+-	0x1c, 0x0a, 0x06, 0x39, 0x0e, 0x09, 0x48, 0x10, 
+-	0x68, 0x00, 0x28, 0x00, 0xd1, 0x02, 0x20, 0x8b, 
+-	0xbc, 0x90, 0x47, 0x70, 0x29, 0x07, 0xdd, 0x01, 
+-	0x20, 0x8c, 0xe7, 0xf9, 0x48, 0x0b, 0x68, 0x00, 
+-	0x28, 0x00, 0xd0, 0x01, 0x20, 0xff, 0xe7, 0xf3, 
+-	0x1d, 0xc8, 0x30, 0x01, 0x24, 0x01, 0x40, 0x84, 
+-	0x1c, 0x23, 0x20, 0x0d, 0x06, 0xc0, 0x6a, 0x00, 
+-	0x40, 0x18, 0x1d, 0xcc, 0x34, 0x01, 0x40, 0xe0, 
+-	0x60, 0x10, 0x20, 0x00, 0xe7, 0xe4, 0xe7, 0xe3, 
+-	0x2e, 0x08, 0x60, 0x84, 0x2e, 0x08, 0x94, 0x84, 
+-	0xb5, 0xb0, 0x1c, 0x04, 0x1c, 0x0f, 0x06, 0x25, 
+-	0x0e, 0x2d, 0x48, 0x13, 0x68, 0x00, 0x28, 0x00, 
+-	0xd1, 0x03, 0x20, 0x8b, 0xbc, 0xb0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x2d, 0x07, 0xdd, 0x01, 0x20, 0x8c, 
+-	0xe7, 0xf8, 0x48, 0x0e, 0x68, 0x00, 0x28, 0x00, 
+-	0xd0, 0x01, 0x20, 0xff, 0xe7, 0xf2, 0x49, 0x0c, 
+-	0x20, 0x91, 0xf0, 0x0f, 0xfb, 0x7f, 0x28, 0x92, 
+-	0xd0, 0x03, 0x20, 0x01, 0xf0, 0x01, 0xfb, 0x66, 
+-	0xe7, 0xf5, 0x08, 0xb8, 0x00, 0xa9, 0x4b, 0x07, 
+-	0x18, 0xc9, 0x67, 0x08, 0x20, 0x92, 0x49, 0x04, 
+-	0x60, 0x08, 0x20, 0x00, 0xe7, 0xde, 0xe7, 0xdd, 
+-	0x2e, 0x08, 0x60, 0x84, 0x2e, 0x08, 0x94, 0x84, 
+-	0x2e, 0x08, 0x7c, 0xc4, 0x68, 0x00, 0x0e, 0x00, 
+-	0xb4, 0xf0, 0x1c, 0x05, 0x1c, 0x0c, 0x1c, 0x17, 
+-	0x1c, 0x1e, 0x04, 0x3f, 0x0c, 0x3f, 0x1c, 0x39, 
+-	0x29, 0x00, 0xd8, 0x02, 0xe0, 0x04, 0x39, 0x01, 
+-	0xe7, 0xfa, 0xcd, 0x04, 0xc4, 0x04, 0xe7, 0xfa, 
+-	0x20, 0x92, 0x4a, 0x03, 0x60, 0x10, 0x20, 0x00, 
+-	0xbc, 0xf0, 0x47, 0x70, 0xe7, 0xfc, 0x00, 0x00, 
+-	0x2e, 0x08, 0x7c, 0xc8, 0x20, 0x00, 0x6b, 0x00, 
+-	0x49, 0x63, 0x60, 0x08, 0x20, 0x00, 0x6b, 0x40, 
+-	0x49, 0x62, 0x60, 0x08, 0x48, 0x62, 0x49, 0x63, 
+-	0x60, 0x08, 0x48, 0x63, 0x49, 0x63, 0x60, 0x08, 
+-	0x20, 0x00, 0x6a, 0xc0, 0x49, 0x62, 0x60, 0x08, 
+-	0x48, 0x62, 0x49, 0x63, 0x60, 0x08, 0x48, 0x63, 
+-	0x49, 0x63, 0x60, 0x08, 0x48, 0x63, 0x49, 0x64, 
+-	0x60, 0x08, 0x20, 0x00, 0x6b, 0x80, 0x49, 0x63, 
+-	0x60, 0x08, 0x20, 0x00, 0x6b, 0xc0, 0x49, 0x62, 
+-	0x60, 0x08, 0x20, 0x00, 0x6c, 0x00, 0x49, 0x61, 
+-	0x60, 0x08, 0x20, 0x00, 0x6c, 0x40, 0x49, 0x60, 
+-	0x60, 0x08, 0x20, 0x00, 0x6c, 0x80, 0x49, 0x5f, 
+-	0x60, 0x08, 0x20, 0x00, 0x6c, 0xc0, 0x49, 0x5e, 
+-	0x60, 0x08, 0x20, 0x00, 0x6e, 0xc0, 0x49, 0x5d, 
+-	0x60, 0x08, 0x20, 0x80, 0x6d, 0x00, 0x49, 0x5c, 
+-	0x60, 0x08, 0x20, 0x80, 0x6d, 0x40, 0x49, 0x5b, 
+-	0x60, 0x08, 0x20, 0x80, 0x6d, 0x80, 0x49, 0x5a, 
+-	0x60, 0x08, 0x20, 0x00, 0x6d, 0x00, 0x49, 0x59, 
+-	0x60, 0x08, 0x20, 0x00, 0x6d, 0x40, 0x49, 0x58, 
+-	0x60, 0x08, 0x20, 0x00, 0x6d, 0x80, 0x49, 0x57, 
+-	0x60, 0x08, 0x20, 0x00, 0x6d, 0xc0, 0x49, 0x56, 
+-	0x60, 0x08, 0x20, 0x80, 0x6a, 0xc0, 0x49, 0x55, 
+-	0x60, 0x08, 0x20, 0x80, 0x6d, 0xc0, 0x49, 0x54, 
+-	0x60, 0x08, 0x20, 0x80, 0x6c, 0xc0, 0x49, 0x53, 
+-	0x60, 0x08, 0x20, 0x80, 0x68, 0x40, 0x49, 0x52, 
+-	0x60, 0x08, 0x20, 0x80, 0x68, 0x80, 0x49, 0x51, 
+-	0x60, 0x08, 0x20, 0x80, 0x68, 0xc0, 0x49, 0x50, 
+-	0x60, 0x08, 0x20, 0x80, 0x69, 0x00, 0x49, 0x4f, 
+-	0x60, 0x08, 0x20, 0x80, 0x69, 0x40, 0x49, 0x4e, 
+-	0x60, 0x08, 0x20, 0x80, 0x69, 0x80, 0x49, 0x4d, 
+-	0x60, 0x08, 0x20, 0x80, 0x69, 0xc0, 0x49, 0x4c, 
+-	0x60, 0x08, 0x20, 0x80, 0x6a, 0x00, 0x49, 0x4b, 
+-	0x60, 0x08, 0x20, 0x80, 0x6a, 0x40, 0x49, 0x4a, 
+-	0x60, 0x08, 0x20, 0x80, 0x6a, 0x80, 0x49, 0x49, 
+-	0x60, 0x08, 0x20, 0x00, 0x6f, 0x00, 0x49, 0x48, 
+-	0x60, 0x08, 0x20, 0x00, 0x6f, 0x40, 0x49, 0x47, 
+-	0x60, 0x08, 0x20, 0x80, 0x6c, 0x40, 0x49, 0x46, 
+-	0x60, 0x08, 0x20, 0x80, 0x6c, 0x80, 0x49, 0x45, 
+-	0x60, 0x08, 0x20, 0x80, 0x6e, 0x40, 0x49, 0x44, 
+-	0x60, 0x08, 0x20, 0x80, 0x6e, 0x80, 0x49, 0x43, 
+-	0x60, 0x08, 0x20, 0x00, 0x49, 0x42, 0x60, 0x08, 
+-	0x20, 0x00, 0x49, 0x41, 0x60, 0x48, 0x48, 0x41, 
+-	0x49, 0x3f, 0x60, 0x88, 0x48, 0x40, 0x49, 0x3e, 
+-	0x60, 0xc8, 0x20, 0xff, 0x30, 0x01, 0x68, 0x40, 
+-	0x49, 0x3e, 0x60, 0x08, 0x20, 0x80, 0x6e, 0xc0, 
+-	0x49, 0x3d, 0x60, 0x08, 0x20, 0x80, 0x6f, 0x00, 
+-	0x49, 0x3c, 0x60, 0x08, 0x20, 0x80, 0x6f, 0x40, 
+-	0x49, 0x3b, 0x60, 0x08, 0x20, 0x80, 0x6f, 0x80, 
+-	0x49, 0x3a, 0x60, 0x08, 0x20, 0x80, 0x6f, 0xc0, 
+-	0x49, 0x39, 0x60, 0x08, 0x20, 0xff, 0x30, 0x01, 
+-	0x68, 0x80, 0x49, 0x38, 0x60, 0x08, 0x47, 0x70, 
+-	0x2e, 0x08, 0x5d, 0xbc, 0x2e, 0x08, 0x5d, 0xc0, 
+-	0x64, 0x00, 0x05, 0x00, 0x2e, 0x08, 0x5d, 0xc8, 
+-	0x64, 0x00, 0x00, 0x80, 0x2e, 0x08, 0x5d, 0xcc, 
+-	0x2e, 0x08, 0x5d, 0xc4, 0x64, 0x00, 0x04, 0x00, 
+-	0x2e, 0x08, 0x5d, 0xd0, 0x9e, 0x00, 0x00, 0x00, 
+-	0x2e, 0x08, 0x5d, 0xe8, 0x9e, 0x00, 0x05, 0x00, 
+-	0x2e, 0x08, 0x5d, 0xd4, 0x2e, 0x08, 0x94, 0x9c, 
+-	0x2e, 0x08, 0x94, 0xa0, 0x2e, 0x08, 0x94, 0xa4, 
+-	0x2e, 0x08, 0x94, 0xa8, 0x2e, 0x08, 0x5d, 0xd8, 
+-	0x2e, 0x08, 0x5d, 0xdc, 0x2e, 0x08, 0x5d, 0xec, 
+-	0x2e, 0x08, 0x5d, 0xf0, 0x2e, 0x08, 0x5d, 0xf4, 
+-	0x2e, 0x08, 0x5d, 0xf8, 0x2e, 0x08, 0x5d, 0xe0, 
+-	0x2e, 0x08, 0x5d, 0xe4, 0x2e, 0x08, 0x60, 0x6c, 
+-	0x2e, 0x08, 0x60, 0x70, 0x2e, 0x08, 0x5d, 0xfc, 
+-	0x2e, 0x08, 0x5e, 0x00, 0x2e, 0x08, 0x5e, 0x2c, 
+-	0x2e, 0x08, 0x5e, 0x04, 0x2e, 0x08, 0x5e, 0x08, 
+-	0x2e, 0x08, 0x5e, 0x0c, 0x2e, 0x08, 0x5e, 0x10, 
+-	0x2e, 0x08, 0x5e, 0x14, 0x2e, 0x08, 0x5e, 0x18, 
+-	0x2e, 0x08, 0x5e, 0x1c, 0x2e, 0x08, 0x5e, 0x20, 
+-	0x2e, 0x08, 0x5e, 0x24, 0x2e, 0x08, 0x5e, 0x28, 
+-	0x2e, 0x08, 0x5d, 0xb0, 0x2e, 0x08, 0x5d, 0xb4, 
+-	0x2e, 0x08, 0x7c, 0x44, 0x2e, 0x08, 0x5e, 0x54, 
+-	0x2e, 0x08, 0x5e, 0x34, 0x2e, 0x08, 0x60, 0x74, 
+-	0x2e, 0x08, 0x7c, 0x1c, 0xcc, 0x1f, 0xe0, 0x00, 
+-	0xcc, 0x1f, 0xfe, 0x00, 0x2e, 0x08, 0x5e, 0x40, 
+-	0x2e, 0x08, 0x5e, 0x58, 0x2e, 0x08, 0x5e, 0x38, 
+-	0x2e, 0x08, 0x5e, 0x3c, 0x2e, 0x08, 0x7c, 0x40, 
+-	0x2e, 0x08, 0x7c, 0x18, 0x2e, 0x08, 0x5e, 0x48, 
+-	0x49, 0x4f, 0x68, 0x0a, 0x23, 0x04, 0x43, 0x1a, 
+-	0x60, 0x0a, 0x21, 0xff, 0x4a, 0x4d, 0x68, 0x12, 
+-	0x32, 0x40, 0x72, 0x11, 0x21, 0xff, 0x4a, 0x4b, 
+-	0x68, 0x12, 0x32, 0x40, 0x76, 0x11, 0x21, 0xff, 
+-	0x4a, 0x48, 0x68, 0x12, 0x32, 0x60, 0x72, 0x11, 
+-	0x21, 0xff, 0x4a, 0x46, 0x68, 0x12, 0x32, 0x20, 
+-	0x72, 0x11, 0x21, 0xff, 0x4a, 0x43, 0x68, 0x12, 
+-	0x32, 0x20, 0x76, 0x11, 0x21, 0xff, 0x4a, 0x41, 
+-	0x68, 0x12, 0x32, 0x60, 0x76, 0x11, 0x21, 0x00, 
+-	0x4a, 0x3e, 0x68, 0x12, 0x32, 0x40, 0x72, 0x91, 
+-	0x21, 0x00, 0x4a, 0x3c, 0x68, 0x12, 0x32, 0x40, 
+-	0x76, 0x91, 0x21, 0x00, 0x4a, 0x39, 0x68, 0x12, 
+-	0x32, 0x60, 0x72, 0x91, 0x21, 0x00, 0x4a, 0x37, 
+-	0x68, 0x12, 0x32, 0x20, 0x72, 0x91, 0x21, 0x00, 
+-	0x4a, 0x34, 0x68, 0x12, 0x32, 0x20, 0x76, 0x91, 
+-	0x21, 0x00, 0x4a, 0x32, 0x68, 0x12, 0x32, 0x60, 
+-	0x76, 0x91, 0x21, 0x00, 0x4a, 0x2f, 0x68, 0x12, 
+-	0x32, 0x80, 0x70, 0xd1, 0x21, 0x00, 0x4a, 0x2d, 
+-	0x68, 0x12, 0x32, 0x80, 0x70, 0x51, 0x21, 0x00, 
+-	0x4a, 0x2a, 0x68, 0x12, 0x32, 0x80, 0x70, 0x91, 
+-	0x21, 0x00, 0x4a, 0x29, 0x60, 0x11, 0x21, 0x00, 
+-	0x4a, 0x28, 0x64, 0x11, 0x21, 0x03, 0x4a, 0x28, 
+-	0x61, 0x11, 0x49, 0x28, 0x68, 0x0a, 0x4b, 0x28, 
+-	0x43, 0x1a, 0x60, 0x0a, 0x49, 0x26, 0x22, 0x33, 
+-	0x06, 0x52, 0x60, 0x51, 0x21, 0x00, 0x4a, 0x25, 
+-	0x70, 0x11, 0x21, 0x00, 0x4a, 0x23, 0x70, 0x51, 
+-	0x21, 0x00, 0x4a, 0x22, 0x70, 0x91, 0x21, 0x00, 
+-	0x4a, 0x20, 0x70, 0xd1, 0x21, 0x00, 0x4a, 0x1f, 
+-	0x71, 0x11, 0x21, 0x00, 0x4a, 0x1d, 0x71, 0x51, 
+-	0x21, 0x00, 0x4a, 0x1c, 0x71, 0x91, 0x21, 0x00, 
+-	0x4a, 0x1a, 0x71, 0xd1, 0x21, 0x00, 0x4a, 0x19, 
+-	0x72, 0x11, 0x21, 0x00, 0x4a, 0x17, 0x72, 0x51, 
+-	0x21, 0x00, 0x4a, 0x16, 0x72, 0x91, 0x21, 0x00, 
+-	0x4a, 0x14, 0x72, 0xd1, 0x21, 0x00, 0x4a, 0x13, 
+-	0x73, 0x11, 0x21, 0xff, 0x4a, 0x11, 0x70, 0x11, 
+-	0x21, 0x00, 0x4a, 0x10, 0x70, 0x11, 0x21, 0x00, 
+-	0x4a, 0x0e, 0x70, 0x51, 0x20, 0x00, 0x28, 0x20, 
+-	0xdb, 0x04, 0xe0, 0x08, 0x1c, 0x41, 0x06, 0x08, 
+-	0x0e, 0x00, 0xe7, 0xf8, 0x21, 0xff, 0x4a, 0x03, 
+-	0x68, 0x12, 0x54, 0x11, 0xe7, 0xf6, 0x47, 0x70, 
+-	0x66, 0x00, 0x01, 0x18, 0x2e, 0x08, 0x7c, 0x44, 
+-	0x9e, 0x00, 0x0a, 0x00, 0x9e, 0x00, 0x0a, 0x80, 
+-	0x66, 0x00, 0x01, 0x00, 0x66, 0x00, 0x00, 0x08, 
+-	0x23, 0x48, 0x00, 0x00, 0x2e, 0x08, 0x7c, 0x48, 
+-	0xb4, 0x80, 0x1c, 0x07, 0x1c, 0x0a, 0x06, 0x39, 
+-	0x0e, 0x09, 0x29, 0x05, 0xd2, 0x40, 0xa3, 0x02, 
+-	0x5c, 0x5b, 0x00, 0x5b, 0x44, 0x9f, 0x1c, 0x00, 
+-	0x03, 0x14, 0x07, 0x0d, 0x13, 0x00, 0x78, 0x10, 
+-	0x4b, 0x1f, 0x70, 0x18, 0xe0, 0x38, 0x78, 0x50, 
+-	0x4b, 0x1e, 0x68, 0x1b, 0x33, 0x80, 0x71, 0x58, 
+-	0xe0, 0x32, 0x78, 0x10, 0x4b, 0x1b, 0x68, 0x1b, 
+-	0x33, 0x80, 0x71, 0x18, 0xe0, 0x2c, 0xe0, 0x2b, 
+-	0x78, 0x10, 0x4b, 0x17, 0x70, 0x18, 0x78, 0x50, 
+-	0x4b, 0x15, 0x70, 0x58, 0x78, 0x90, 0x4b, 0x14, 
+-	0x70, 0x98, 0x78, 0xd0, 0x4b, 0x12, 0x70, 0xd8, 
+-	0x79, 0x10, 0x4b, 0x11, 0x71, 0x18, 0x79, 0x50, 
+-	0x4b, 0x0f, 0x71, 0x58, 0x79, 0x90, 0x4b, 0x0e, 
+-	0x71, 0x98, 0x79, 0xd0, 0x4b, 0x0c, 0x71, 0xd8, 
+-	0x7a, 0x10, 0x4b, 0x0b, 0x72, 0x18, 0x7a, 0x50, 
+-	0x4b, 0x09, 0x72, 0x58, 0x7a, 0x90, 0x4b, 0x08, 
+-	0x72, 0x98, 0x7a, 0xd0, 0x4b, 0x06, 0x72, 0xd8, 
+-	0x7b, 0x10, 0x4b, 0x05, 0x73, 0x18, 0xe0, 0x03, 
+-	0x20, 0x4a, 0xbc, 0x80, 0x47, 0x70, 0xe7, 0xff, 
+-	0x20, 0x00, 0xe7, 0xfa, 0xe7, 0xf9, 0x00, 0x00, 
+-	0x2e, 0x08, 0x7c, 0x48, 0x2e, 0x08, 0x7c, 0x44, 
+-	0xb5, 0xf3, 0x1c, 0x07, 0x06, 0x3e, 0x0e, 0x36, 
+-	0x99, 0x01, 0x06, 0x0c, 0x0e, 0x24, 0x2e, 0x20, 
+-	0xdb, 0x04, 0x20, 0xa2, 0xb0, 0x02, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2c, 0x02, 0xd0, 0x03, 
+-	0x2c, 0x03, 0xd0, 0x01, 0x2c, 0x04, 0xd1, 0x0b, 
+-	0x48, 0xb8, 0x68, 0x00, 0x30, 0x20, 0x7a, 0x80, 
+-	0x28, 0x00, 0xd1, 0x39, 0x48, 0xb5, 0x68, 0x00, 
+-	0x30, 0x20, 0x7e, 0x80, 0x28, 0x00, 0xd1, 0x33, 
+-	0x2c, 0x00, 0xd1, 0x17, 0x48, 0xb1, 0x68, 0x00, 
+-	0x30, 0x40, 0x7a, 0x80, 0x28, 0x00, 0xd1, 0x2b, 
+-	0x48, 0xae, 0x68, 0x00, 0x30, 0x40, 0x7e, 0x80, 
+-	0x28, 0x00, 0xd1, 0x25, 0x48, 0xab, 0x68, 0x00, 
+-	0x30, 0x60, 0x7a, 0x80, 0x28, 0x00, 0xd1, 0x1f, 
+-	0x48, 0xa8, 0x68, 0x00, 0x30, 0x20, 0x7e, 0x80, 
+-	0x28, 0x00, 0xd1, 0x19, 0x2c, 0x01, 0xd1, 0x19, 
+-	0x48, 0xa4, 0x68, 0x00, 0x30, 0x40, 0x7a, 0x80, 
+-	0x28, 0x00, 0xd1, 0x11, 0x48, 0xa1, 0x68, 0x00, 
+-	0x30, 0x40, 0x7e, 0x80, 0x28, 0x00, 0xd1, 0x0b, 
+-	0x48, 0x9e, 0x68, 0x00, 0x30, 0x60, 0x7a, 0x80, 
+-	0x28, 0x00, 0xd1, 0x05, 0x48, 0x9b, 0x68, 0x00, 
+-	0x30, 0x20, 0x7a, 0x80, 0x28, 0x00, 0xd0, 0x01, 
+-	0x20, 0x49, 0xe7, 0xb3, 0x48, 0x97, 0x68, 0x00, 
+-	0x55, 0x84, 0x2c, 0xff, 0xd0, 0x73, 0x20, 0x01, 
+-	0x49, 0x95, 0x60, 0x48, 0x2c, 0x05, 0xd2, 0x6f, 
+-	0xa3, 0x01, 0x5d, 0x1b, 0x00, 0x5b, 0x44, 0x9f, 
+-	0x02, 0x34, 0x30, 0x30, 0x30, 0x00, 0x20, 0x02, 
+-	0x49, 0x90, 0x61, 0x88, 0x48, 0x90, 0x6a, 0xc0, 
+-	0x49, 0x90, 0x60, 0x08, 0x48, 0x90, 0x68, 0x01, 
+-	0x23, 0x01, 0x07, 0x5b, 0x43, 0x19, 0x60, 0x01, 
+-	0x48, 0x8e, 0x49, 0x8b, 0x62, 0xc8, 0x48, 0x8c, 
+-	0x68, 0x01, 0x4b, 0x8d, 0x40, 0x19, 0x60, 0x01, 
+-	0x20, 0x01, 0x21, 0x31, 0x06, 0x49, 0x61, 0x88, 
+-	0x20, 0x15, 0x21, 0x31, 0x06, 0x49, 0x61, 0x08, 
+-	0x20, 0x0f, 0x21, 0x31, 0x06, 0x49, 0x61, 0xc8, 
+-	0x20, 0x0c, 0x21, 0x31, 0x06, 0x49, 0x61, 0xc8, 
+-	0x20, 0x54, 0x21, 0x31, 0x06, 0x49, 0x62, 0xc8, 
+-	0x20, 0x37, 0x21, 0x31, 0x06, 0x49, 0x60, 0x88, 
+-	0xe0, 0x56, 0x20, 0x00, 0x49, 0x79, 0x61, 0x88, 
+-	0xe0, 0x52, 0x20, 0x01, 0x49, 0x77, 0x61, 0x88, 
+-	0x20, 0x01, 0x49, 0x7c, 0x62, 0x88, 0x48, 0x7c, 
+-	0x78, 0x00, 0x06, 0x80, 0x0e, 0x80, 0x02, 0x80, 
+-	0x49, 0x79, 0x78, 0x49, 0x07, 0xc9, 0x0d, 0x89, 
+-	0x43, 0x08, 0x49, 0x77, 0x78, 0x89, 0x07, 0xc9, 
+-	0x0d, 0xc9, 0x43, 0x08, 0x49, 0x74, 0x78, 0xc9, 
+-	0x07, 0x89, 0x0f, 0x89, 0x01, 0x89, 0x43, 0x08, 
+-	0x49, 0x71, 0x79, 0x09, 0x07, 0x89, 0x0f, 0x89, 
+-	0x01, 0x09, 0x43, 0x08, 0x49, 0x6e, 0x79, 0x49, 
+-	0x07, 0x89, 0x0f, 0x89, 0x00, 0x89, 0x43, 0x08, 
+-	0x49, 0x6b, 0x79, 0x89, 0x07, 0x89, 0x0f, 0x89, 
+-	0x43, 0x08, 0x49, 0x68, 0x62, 0x08, 0x48, 0x68, 
+-	0x79, 0xc0, 0x07, 0xc0, 0x0e, 0x40, 0x49, 0x66, 
+-	0x7a, 0x09, 0x07, 0xc9, 0xe0, 0x01, 0xe0, 0x21, 
+-	0xe0, 0x18, 0x0e, 0xc9, 0x43, 0x08, 0x49, 0x62, 
+-	0x7a, 0x49, 0x07, 0xc9, 0x0f, 0x09, 0x43, 0x08, 
+-	0x49, 0x5f, 0x7a, 0x89, 0x07, 0xc9, 0x0f, 0x49, 
+-	0x43, 0x08, 0x49, 0x5d, 0x7a, 0xc9, 0x07, 0xc9, 
+-	0x0f, 0x89, 0x43, 0x08, 0x49, 0x5a, 0x7b, 0x09, 
+-	0x07, 0xc9, 0x0f, 0xc9, 0x43, 0x08, 0x49, 0x57, 
+-	0x62, 0x48, 0xe0, 0x01, 0x20, 0x4a, 0xe7, 0x1d, 
+-	0x48, 0x51, 0x68, 0x01, 0x4b, 0x55, 0x40, 0x19, 
+-	0x60, 0x01, 0xe0, 0x8f, 0x48, 0x49, 0x68, 0x00, 
+-	0x30, 0x80, 0x78, 0xc0, 0x28, 0x00, 0xd0, 0x08, 
+-	0x22, 0x00, 0xb4, 0x04, 0x1c, 0x30, 0x23, 0x00, 
+-	0x22, 0x00, 0x49, 0x4f, 0xf7, 0xf4, 0xfc, 0x10, 
+-	0xb0, 0x01, 0x20, 0x00, 0x49, 0x42, 0x60, 0x48, 
+-	0x48, 0x45, 0x68, 0x01, 0x4b, 0x4b, 0x43, 0x19, 
+-	0x60, 0x01, 0x48, 0x4a, 0x21, 0x33, 0x06, 0x49, 
+-	0x60, 0x48, 0x48, 0x49, 0x68, 0x01, 0x23, 0x04, 
+-	0x43, 0x19, 0x60, 0x01, 0x2c, 0x00, 0xd1, 0x0e, 
+-	0x48, 0x3c, 0x68, 0x00, 0x28, 0x00, 0xd0, 0x0a, 
+-	0x48, 0x3a, 0x68, 0x00, 0x49, 0x38, 0x62, 0xc8, 
+-	0x20, 0x00, 0x49, 0x38, 0x60, 0x08, 0x20, 0x00, 
+-	0x21, 0x31, 0x06, 0x49, 0x61, 0x88, 0x20, 0x00, 
+-	0x49, 0x30, 0x68, 0x09, 0x31, 0x80, 0x70, 0x48, 
+-	0x20, 0x00, 0x49, 0x2e, 0x68, 0x09, 0x31, 0x80, 
+-	0x70, 0x88, 0x20, 0x00, 0x49, 0x39, 0x60, 0x08, 
+-	0x20, 0x00, 0x49, 0x39, 0x64, 0x08, 0x20, 0x03, 
+-	0x49, 0x2a, 0x61, 0x08, 0x25, 0x00, 0x2d, 0x20, 
+-	0xd3, 0x02, 0xe0, 0x06, 0x35, 0x01, 0xe7, 0xfa, 
+-	0x20, 0xff, 0x49, 0x24, 0x68, 0x09, 0x55, 0x48, 
+-	0xe7, 0xf8, 0x20, 0xff, 0x49, 0x21, 0x68, 0x09, 
+-	0x31, 0x40, 0x72, 0x08, 0x20, 0xff, 0x49, 0x1f, 
+-	0x68, 0x09, 0x31, 0x40, 0x76, 0x08, 0x20, 0xff, 
+-	0x49, 0x1c, 0x68, 0x09, 0x31, 0x60, 0x72, 0x08, 
+-	0x20, 0xff, 0x49, 0x1a, 0x68, 0x09, 0x31, 0x20, 
+-	0x72, 0x08, 0x20, 0xff, 0x49, 0x17, 0x68, 0x09, 
+-	0x31, 0x20, 0x76, 0x08, 0x20, 0xff, 0x49, 0x15, 
+-	0x68, 0x09, 0x31, 0x60, 0x76, 0x08, 0x20, 0x00, 
+-	0x49, 0x12, 0x68, 0x09, 0x31, 0x40, 0x72, 0x88, 
+-	0x20, 0x00, 0x49, 0x10, 0x68, 0x09, 0x31, 0x40, 
+-	0x76, 0x88, 0x20, 0x00, 0x49, 0x0d, 0x68, 0x09, 
+-	0x31, 0x60, 0x72, 0x88, 0x20, 0x00, 0x49, 0x0b, 
+-	0x68, 0x09, 0x31, 0x20, 0x72, 0x88, 0x20, 0x00, 
+-	0x49, 0x08, 0x68, 0x09, 0x31, 0x20, 0x76, 0x88, 
+-	0x20, 0x00, 0x49, 0x06, 0x68, 0x09, 0x31, 0x60, 
+-	0x76, 0x88, 0x20, 0x00, 0x49, 0x03, 0x68, 0x09, 
+-	0x31, 0x80, 0x70, 0xc8, 0x20, 0x00, 0xe6, 0x85, 
+-	0xe6, 0x84, 0x00, 0x00, 0x2e, 0x08, 0x7c, 0x44, 
+-	0x62, 0x00, 0x03, 0x00, 0x66, 0x00, 0x01, 0x00, 
+-	0xa0, 0x00, 0x0d, 0x80, 0x2e, 0x08, 0x20, 0x08, 
+-	0x66, 0x00, 0x00, 0x08, 0x2e, 0x01, 0x8b, 0xa8, 
+-	0xdf, 0xff, 0xff, 0xff, 0x62, 0x01, 0x00, 0x00, 
+-	0x2e, 0x08, 0x7c, 0x48, 0xfc, 0xb7, 0xff, 0xff, 
+-	0x00, 0x00, 0xff, 0xff, 0x23, 0x48, 0x00, 0x00, 
+-	0x66, 0x00, 0x01, 0x18, 0x9e, 0x00, 0x0a, 0x00, 
+-	0x9e, 0x00, 0x0a, 0x80, 0xb5, 0xf7, 0x1c, 0x17, 
+-	0x98, 0x00, 0x06, 0x02, 0x0e, 0x12, 0x99, 0x01, 
+-	0x06, 0x0d, 0x0e, 0x2d, 0x48, 0x6a, 0x68, 0x00, 
+-	0x5c, 0x81, 0x2a, 0x20, 0xdb, 0x04, 0x20, 0xa2, 
+-	0xb0, 0x03, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x29, 0xff, 0xd1, 0x01, 0x20, 0x4b, 0xe7, 0xf7, 
+-	0x48, 0x64, 0x69, 0x80, 0x28, 0x00, 0xd1, 0x03, 
+-	0x29, 0x04, 0xd1, 0x01, 0x20, 0x58, 0xe7, 0xef, 
+-	0x48, 0x60, 0x69, 0x80, 0x28, 0x00, 0xd1, 0x03, 
+-	0x29, 0x02, 0xd0, 0x01, 0x29, 0x03, 0xd1, 0x0b, 
+-	0x48, 0x5c, 0x69, 0x80, 0x28, 0x02, 0xd1, 0x01, 
+-	0x29, 0x00, 0xd1, 0x05, 0x48, 0x59, 0x69, 0x80, 
+-	0x28, 0x01, 0xd1, 0x03, 0x29, 0x01, 0xd0, 0x01, 
+-	0x20, 0x4d, 0xe7, 0xd9, 0x29, 0x02, 0xd1, 0x05, 
+-	0x48, 0x53, 0x68, 0x00, 0x30, 0x40, 0x7a, 0x80, 
+-	0x28, 0x00, 0xd1, 0x17, 0x29, 0x03, 0xd1, 0x05, 
+-	0x48, 0x4f, 0x68, 0x00, 0x30, 0x40, 0x7e, 0x80, 
+-	0x28, 0x00, 0xd1, 0x0f, 0x29, 0x00, 0xd1, 0x05, 
+-	0x48, 0x4b, 0x68, 0x00, 0x30, 0x20, 0x7a, 0x80, 
+-	0x28, 0x00, 0xd1, 0x07, 0x29, 0x01, 0xd1, 0x07, 
+-	0x48, 0x47, 0x68, 0x00, 0x30, 0x20, 0x7e, 0x80, 
+-	0x28, 0x00, 0xd0, 0x01, 0x20, 0x4e, 0xe7, 0xb7, 
+-	0x68, 0x78, 0x28, 0x00, 0xd1, 0x01, 0x20, 0x4c, 
+-	0xe7, 0xb2, 0x23, 0x01, 0x01, 0x08, 0x4e, 0x40, 
+-	0x68, 0x36, 0x19, 0x80, 0x30, 0x20, 0x72, 0x83, 
+-	0x2d, 0x01, 0xd1, 0x0b, 0x20, 0x33, 0x06, 0x40, 
+-	0x6e, 0x40, 0x23, 0x0d, 0x06, 0x9b, 0x1a, 0xc0, 
+-	0x00, 0xd3, 0x4e, 0x3b, 0x68, 0x36, 0x19, 0x9b, 
+-	0x60, 0x58, 0xe0, 0x12, 0x2d, 0x02, 0xd1, 0x0a, 
+-	0x48, 0x38, 0x6c, 0xc0, 0x23, 0x0d, 0x06, 0x9b, 
+-	0x1a, 0xc3, 0x00, 0xd0, 0x4e, 0x34, 0x68, 0x36, 
+-	0x19, 0x80, 0x60, 0x43, 0xe0, 0x05, 0x68, 0x3b, 
+-	0x00, 0xd0, 0x4e, 0x31, 0x68, 0x36, 0x19, 0x80, 
+-	0x60, 0x43, 0x68, 0x3b, 0x01, 0x08, 0x4e, 0x2c, 
+-	0x68, 0x36, 0x19, 0x80, 0x62, 0x03, 0x68, 0x7b, 
+-	0x01, 0x08, 0x4e, 0x29, 0x68, 0x36, 0x19, 0x80, 
+-	0x62, 0x43, 0x01, 0x08, 0x4b, 0x26, 0x68, 0x1b, 
+-	0x18, 0xc0, 0x62, 0xc7, 0x01, 0x08, 0x4b, 0x24, 
+-	0x68, 0x1b, 0x18, 0xc0, 0x30, 0x20, 0x72, 0x45, 
+-	0x01, 0x08, 0x4b, 0x21, 0x68, 0x1b, 0x18, 0xc0, 
+-	0x30, 0x20, 0x72, 0x02, 0x20, 0x00, 0x60, 0x78, 
+-	0x20, 0x00, 0x72, 0x78, 0x20, 0x00, 0x4b, 0x20, 
+-	0x60, 0x18, 0x20, 0x00, 0x4b, 0x1f, 0x64, 0x18, 
+-	0x01, 0x08, 0x4b, 0x19, 0x68, 0x1b, 0x18, 0xc0, 
+-	0x6a, 0x40, 0x28, 0xbc, 0xdd, 0x01, 0x24, 0xbc, 
+-	0xe0, 0x04, 0x01, 0x08, 0x4b, 0x14, 0x68, 0x1b, 
+-	0x18, 0xc0, 0x6a, 0x44, 0x48, 0x18, 0x60, 0x04, 
+-	0x29, 0x01, 0xd1, 0x14, 0x20, 0x01, 0x4b, 0x17, 
+-	0x62, 0x98, 0x48, 0x17, 0x68, 0x03, 0x04, 0x1b, 
+-	0x0c, 0x1b, 0x60, 0x03, 0x48, 0x14, 0x04, 0x23, 
+-	0x68, 0x06, 0x43, 0x33, 0x60, 0x03, 0x48, 0x13, 
+-	0x68, 0x06, 0x23, 0x20, 0x43, 0x33, 0x60, 0x03, 
+-	0x20, 0x01, 0x4b, 0x0e, 0x63, 0x18, 0x48, 0x07, 
+-	0x69, 0x80, 0x28, 0x00, 0xd1, 0x04, 0x48, 0x0e, 
+-	0x68, 0x06, 0x23, 0x28, 0x43, 0x33, 0x60, 0x03, 
+-	0x20, 0x00, 0xe7, 0x31, 0xe7, 0x30, 0x00, 0x00, 
+-	0x2e, 0x08, 0x7c, 0x44, 0x66, 0x00, 0x01, 0x00, 
+-	0x2e, 0x08, 0x5d, 0xd4, 0x66, 0x00, 0x00, 0x80, 
+-	0x9e, 0x00, 0x0a, 0x00, 0x9e, 0x00, 0x0a, 0x80, 
+-	0x62, 0x00, 0x03, 0x00, 0x62, 0x01, 0x00, 0x00, 
+-	0x62, 0x01, 0x00, 0x20, 0x62, 0x01, 0x00, 0x24, 
+-	0x64, 0x00, 0x00, 0x60, 0xb5, 0xf3, 0x1c, 0x0f, 
+-	0x98, 0x00, 0x06, 0x06, 0x0e, 0x36, 0xb0, 0x82, 
+-	0x4d, 0x68, 0x49, 0x69, 0x91, 0x01, 0x48, 0x69, 
+-	0x68, 0x00, 0x5d, 0x84, 0x2e, 0x20, 0xdb, 0x05, 
+-	0x20, 0xa2, 0xb0, 0x02, 0xb0, 0x02, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2c, 0xff, 0xd1, 0x02, 
+-	0x20, 0x4b, 0xb0, 0x02, 0xe7, 0xf6, 0x48, 0x62, 
+-	0x69, 0x80, 0x28, 0x00, 0xd1, 0x05, 0x2c, 0x02, 
+-	0xd0, 0x03, 0x2c, 0x03, 0xd0, 0x01, 0x2c, 0x04, 
+-	0xd1, 0x0b, 0x48, 0x5d, 0x69, 0x80, 0x28, 0x02, 
+-	0xd1, 0x01, 0x2c, 0x00, 0xd1, 0x05, 0x48, 0x5a, 
+-	0x69, 0x80, 0x28, 0x01, 0xd1, 0x04, 0x2c, 0x01, 
+-	0xd0, 0x02, 0x20, 0x4d, 0xb0, 0x02, 0xe7, 0xdd, 
+-	0x48, 0x54, 0x68, 0x00, 0x30, 0x60, 0x7e, 0x80, 
+-	0x28, 0x00, 0xd0, 0x02, 0x20, 0x4f, 0xb0, 0x02, 
+-	0xe7, 0xd4, 0x48, 0x50, 0x68, 0x00, 0x30, 0x80, 
+-	0x78, 0xc0, 0x28, 0x00, 0xd0, 0x02, 0x20, 0x50, 
+-	0xb0, 0x02, 0xe7, 0xcb, 0x68, 0x78, 0x28, 0x00, 
+-	0xd1, 0x02, 0x20, 0x4c, 0xb0, 0x02, 0xe7, 0xc5, 
+-	0x2c, 0x04, 0xd1, 0x08, 0x68, 0x79, 0x20, 0xbc, 
+-	0xf0, 0x01, 0xff, 0xac, 0x29, 0x00, 0xd0, 0x02, 
+-	0x20, 0x59, 0xb0, 0x02, 0xe7, 0xba, 0x48, 0x43, 
+-	0x68, 0x00, 0x30, 0x80, 0x78, 0x80, 0x21, 0x01, 
+-	0x40, 0x81, 0x48, 0x41, 0x68, 0x40, 0x40, 0x08, 
+-	0x07, 0x80, 0x0f, 0x80, 0xd0, 0x02, 0x20, 0x51, 
+-	0xb0, 0x02, 0xe7, 0xab, 0x20, 0x33, 0x06, 0x40, 
+-	0x6b, 0x80, 0x90, 0x00, 0x23, 0x04, 0x40, 0x18, 
+-	0xd0, 0x02, 0x20, 0x52, 0xb0, 0x02, 0xe7, 0xa1, 
+-	0x2c, 0x00, 0xd1, 0x04, 0x48, 0x37, 0x68, 0x01, 
+-	0x23, 0xfd, 0x40, 0x19, 0x60, 0x01, 0x20, 0x01, 
+-	0x49, 0x32, 0x68, 0x09, 0x31, 0x60, 0x76, 0x88, 
+-	0x68, 0x38, 0x49, 0x30, 0x68, 0x09, 0x67, 0x08, 
+-	0x68, 0x78, 0x49, 0x2e, 0x68, 0x09, 0x67, 0x48, 
+-	0x48, 0x2c, 0x68, 0x00, 0x67, 0xc7, 0x20, 0x00, 
+-	0x49, 0x2a, 0x68, 0x09, 0x31, 0x60, 0x76, 0x48, 
+-	0x48, 0x28, 0x68, 0x00, 0x30, 0x60, 0x76, 0x06, 
+-	0x20, 0x00, 0x60, 0x78, 0x20, 0x00, 0x72, 0x78, 
+-	0x48, 0x24, 0x68, 0x00, 0x5d, 0x80, 0x28, 0x01, 
+-	0xd1, 0x02, 0x20, 0x01, 0x49, 0x24, 0x62, 0x88, 
+-	0x98, 0x00, 0x01, 0x00, 0x19, 0x45, 0x48, 0x1f, 
+-	0x68, 0x00, 0x6f, 0x40, 0x28, 0xbc, 0xdd, 0x07, 
+-	0x48, 0x20, 0x60, 0xa8, 0x20, 0xbc, 0x49, 0x1b, 
+-	0x68, 0x09, 0x31, 0x80, 0x70, 0x08, 0xe0, 0x0d, 
+-	0x48, 0x18, 0x68, 0x00, 0x6f, 0x40, 0x23, 0x01, 
+-	0x07, 0x9b, 0x43, 0x18, 0x60, 0xa8, 0x48, 0x15, 
+-	0x68, 0x00, 0x6f, 0x40, 0x49, 0x13, 0x68, 0x09, 
+-	0x31, 0x80, 0x70, 0x08, 0x48, 0x11, 0x68, 0x00, 
+-	0x30, 0x80, 0x78, 0x80, 0x00, 0x43, 0x18, 0x18, 
+-	0x01, 0x80, 0x99, 0x01, 0x18, 0x41, 0x91, 0x01, 
+-	0x48, 0x0c, 0x68, 0x00, 0x6f, 0x00, 0x60, 0x28, 
+-	0x99, 0x01, 0x1d, 0x08, 0x60, 0x68, 0x20, 0x01, 
+-	0x06, 0x00, 0x60, 0xe8, 0x99, 0x00, 0x20, 0x01, 
+-	0x40, 0x88, 0x21, 0x33, 0x06, 0x49, 0x63, 0x48, 
+-	0x20, 0x00, 0xb0, 0x02, 0xe7, 0x3a, 0xb0, 0x02, 
+-	0xe7, 0x38, 0x00, 0x00, 0x9e, 0x00, 0x09, 0x80, 
+-	0x9e, 0x00, 0x0b, 0x80, 0x2e, 0x08, 0x7c, 0x44, 
+-	0x66, 0x00, 0x01, 0x00, 0x62, 0x00, 0x00, 0x1c, 
+-	0x62, 0x01, 0x00, 0x00, 0x40, 0x00, 0x00, 0xbc, 
+-	0xb5, 0xf3, 0x1c, 0x0f, 0xb0, 0x81, 0x98, 0x01, 
+-	0x06, 0x00, 0x0e, 0x00, 0x90, 0x00, 0xb0, 0x82, 
+-	0x48, 0xf9, 0x68, 0x00, 0x99, 0x02, 0x5c, 0x44, 
+-	0x98, 0x02, 0x28, 0x20, 0xdb, 0x05, 0x20, 0xa2, 
+-	0xb0, 0x03, 0xb0, 0x02, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x2c, 0xff, 0xd1, 0x02, 0x20, 0x4b, 
+-	0xb0, 0x03, 0xe7, 0xf6, 0x48, 0xf1, 0x69, 0x80, 
+-	0x28, 0x00, 0xd1, 0x05, 0x2c, 0x02, 0xd0, 0x03, 
+-	0x2c, 0x03, 0xd0, 0x01, 0x2c, 0x04, 0xd1, 0x0b, 
+-	0x48, 0xec, 0x69, 0x80, 0x28, 0x02, 0xd1, 0x01, 
+-	0x2c, 0x00, 0xd1, 0x05, 0x48, 0xe9, 0x69, 0x80, 
+-	0x28, 0x01, 0xd1, 0x04, 0x2c, 0x01, 0xd0, 0x02, 
+-	0x20, 0x4d, 0xb0, 0x03, 0xe7, 0xdd, 0x48, 0xe4, 
+-	0x68, 0x00, 0x30, 0x60, 0x7e, 0x80, 0x28, 0x00, 
+-	0xd0, 0x02, 0x20, 0x4f, 0xb0, 0x03, 0xe7, 0xd4, 
+-	0x68, 0x78, 0x28, 0x00, 0xd1, 0x02, 0x20, 0x4c, 
+-	0xb0, 0x03, 0xe7, 0xce, 0x2c, 0x04, 0xd1, 0x08, 
+-	0x68, 0x79, 0x20, 0xbc, 0xf0, 0x01, 0xfe, 0xce, 
+-	0x29, 0x00, 0xd0, 0x02, 0x20, 0x59, 0xb0, 0x03, 
+-	0xe7, 0xc3, 0x48, 0xd7, 0x68, 0x00, 0x30, 0x80, 
+-	0x78, 0xc0, 0x28, 0x00, 0xd0, 0x02, 0x20, 0x50, 
+-	0xb0, 0x03, 0xe7, 0xba, 0x2c, 0x00, 0xd1, 0x04, 
+-	0x48, 0xd3, 0x68, 0x01, 0x23, 0xfd, 0x40, 0x19, 
+-	0x60, 0x01, 0x48, 0xd2, 0x68, 0x01, 0x23, 0x8d, 
+-	0x05, 0x9b, 0x43, 0x19, 0x60, 0x01, 0x48, 0xd0, 
+-	0x21, 0x33, 0x06, 0x49, 0x60, 0x48, 0x20, 0x01, 
+-	0x49, 0xc9, 0x68, 0x09, 0x31, 0x60, 0x76, 0x88, 
+-	0x68, 0x38, 0x49, 0xc7, 0x68, 0x09, 0x67, 0x08, 
+-	0x68, 0x78, 0x49, 0xc5, 0x68, 0x09, 0x67, 0x48, 
+-	0x48, 0xc3, 0x68, 0x00, 0x67, 0xc7, 0x20, 0x00, 
+-	0x49, 0xc1, 0x68, 0x09, 0x31, 0x60, 0x76, 0x48, 
+-	0x98, 0x02, 0x49, 0xbf, 0x68, 0x09, 0x31, 0x60, 
+-	0x76, 0x08, 0x20, 0x00, 0x49, 0xbc, 0x68, 0x09, 
+-	0x6f, 0xc9, 0x60, 0x48, 0x20, 0x00, 0x49, 0xba, 
+-	0x68, 0x09, 0x6f, 0xc9, 0x72, 0x48, 0x48, 0xb8, 
+-	0x68, 0x00, 0x99, 0x02, 0x5c, 0x40, 0x28, 0x01, 
+-	0xd1, 0x02, 0x20, 0x01, 0x49, 0xb9, 0x62, 0x88, 
+-	0x48, 0xb3, 0x68, 0x00, 0x30, 0x80, 0x78, 0x81, 
+-	0x20, 0x01, 0x40, 0x88, 0x49, 0xb1, 0x68, 0x49, 
+-	0x40, 0x08, 0x07, 0x80, 0x0f, 0x80, 0xd0, 0x1b, 
+-	0x20, 0x00, 0x49, 0xad, 0x68, 0x09, 0x31, 0x60, 
+-	0x76, 0x88, 0x20, 0x51, 0x49, 0xaa, 0x68, 0x09, 
+-	0x6f, 0xc9, 0x72, 0x48, 0x48, 0xa8, 0x68, 0x00, 
+-	0x6f, 0xc0, 0x7a, 0x00, 0x28, 0xff, 0xd0, 0x07, 
+-	0x48, 0xa5, 0x68, 0x00, 0x6f, 0xc0, 0x7a, 0x01, 
+-	0x20, 0x01, 0x40, 0x88, 0xf0, 0x05, 0xfd, 0xb0, 
+-	0x20, 0x51, 0xb0, 0x03, 0xe7, 0x55, 0xe1, 0x6c, 
+-	0x20, 0x33, 0x06, 0x40, 0x6b, 0x81, 0x91, 0x00, 
+-	0x99, 0x00, 0x20, 0x04, 0x40, 0x08, 0xd0, 0x07, 
+-	0x20, 0x04, 0xf0, 0x00, 0xfc, 0xb3, 0x20, 0x33, 
+-	0x06, 0x40, 0x6b, 0x81, 0x91, 0x00, 0xe7, 0xf3, 
+-	0x4d, 0x9d, 0x99, 0x00, 0x01, 0x08, 0x19, 0x45, 
+-	0x48, 0x95, 0x68, 0x00, 0x6f, 0x40, 0x28, 0xbc, 
+-	0xdd, 0x07, 0x48, 0x9a, 0x60, 0xa8, 0x20, 0xbc, 
+-	0x49, 0x91, 0x68, 0x09, 0x31, 0x80, 0x70, 0x08, 
+-	0xe0, 0x0d, 0x48, 0x8f, 0x68, 0x00, 0x6f, 0x40, 
+-	0x23, 0x01, 0x07, 0x9b, 0x43, 0x18, 0x60, 0xa8, 
+-	0x48, 0x8b, 0x68, 0x00, 0x6f, 0x40, 0x49, 0x8a, 
+-	0x68, 0x09, 0x31, 0x80, 0x70, 0x08, 0x48, 0x90, 
+-	0x90, 0x01, 0x48, 0x87, 0x68, 0x00, 0x30, 0x80, 
+-	0x78, 0x80, 0x00, 0x43, 0x18, 0x18, 0x01, 0x80, 
+-	0x99, 0x01, 0x18, 0x40, 0x90, 0x01, 0x48, 0x82, 
+-	0x68, 0x00, 0x6f, 0x00, 0x60, 0x28, 0x98, 0x01, 
+-	0x30, 0x04, 0x60, 0x68, 0x20, 0x01, 0x06, 0x00, 
+-	0x60, 0xe8, 0x99, 0x00, 0x20, 0x01, 0x40, 0x88, 
+-	0x21, 0x33, 0x06, 0x49, 0x63, 0x48, 0x48, 0x83, 
+-	0x6b, 0x00, 0x23, 0x01, 0x06, 0x1b, 0x40, 0x18, 
+-	0xd1, 0x03, 0x20, 0x04, 0xf0, 0x00, 0xfc, 0x6a, 
+-	0xe7, 0xf5, 0x20, 0x01, 0x06, 0x00, 0x21, 0x33, 
+-	0x06, 0x49, 0x60, 0x48, 0x4e, 0x7c, 0x48, 0x72, 
+-	0x68, 0x00, 0x30, 0x80, 0x78, 0x80, 0x01, 0x00, 
+-	0x19, 0x86, 0x98, 0x01, 0x30, 0x04, 0x60, 0x30, 
+-	0x48, 0x78, 0x60, 0x70, 0x48, 0x6c, 0x68, 0x00, 
+-	0x30, 0x80, 0x78, 0x00, 0x23, 0x01, 0x07, 0x9b, 
+-	0x43, 0x18, 0x60, 0xb0, 0x20, 0x01, 0x05, 0x80, 
+-	0x60, 0xf0, 0x48, 0x67, 0x68, 0x00, 0x30, 0x80, 
+-	0x78, 0x81, 0x20, 0x01, 0x40, 0x88, 0x49, 0x65, 
+-	0x60, 0xc8, 0x48, 0x63, 0x68, 0x00, 0x30, 0x60, 
+-	0x7e, 0x00, 0x49, 0x61, 0x68, 0x09, 0x5c, 0x08, 
+-	0x28, 0x00, 0xd0, 0x48, 0x28, 0x01, 0xd0, 0x47, 
+-	0x28, 0x02, 0xd0, 0x02, 0x28, 0x03, 0xd0, 0x21, 
+-	0xe0, 0x5a, 0x48, 0x67, 0x68, 0x01, 0x23, 0x02, 
+-	0x43, 0x19, 0x60, 0x01, 0x48, 0x58, 0x68, 0x00, 
+-	0x6f, 0x40, 0x49, 0x57, 0x68, 0x09, 0x31, 0x80, 
+-	0x78, 0x09, 0x1a, 0x40, 0x28, 0xbc, 0xd8, 0x05, 
+-	0x48, 0x5f, 0x68, 0x01, 0x23, 0x10, 0x43, 0x19, 
+-	0x60, 0x01, 0xe0, 0x05, 0x48, 0x5c, 0x68, 0x01, 
+-	0x23, 0x10, 0x43, 0xdb, 0x40, 0x19, 0x60, 0x01, 
+-	0x48, 0x59, 0x68, 0x01, 0x23, 0x08, 0x43, 0x19, 
+-	0x60, 0x01, 0xe0, 0x39, 0x48, 0x56, 0x68, 0x01, 
+-	0x23, 0x04, 0x43, 0x19, 0x60, 0x01, 0x48, 0x48, 
+-	0x68, 0x00, 0x6f, 0x40, 0x49, 0x46, 0x68, 0x09, 
+-	0x31, 0x80, 0x78, 0x09, 0x1a, 0x40, 0x28, 0xbc, 
+-	0xd8, 0x05, 0x48, 0x4f, 0x68, 0x01, 0x23, 0x10, 
+-	0x43, 0x19, 0x60, 0x01, 0xe0, 0x05, 0x48, 0x4c, 
+-	0x68, 0x01, 0x23, 0x10, 0x43, 0xdb, 0x40, 0x19, 
+-	0x60, 0x01, 0x48, 0x49, 0x68, 0x01, 0x23, 0x08, 
+-	0x43, 0x19, 0x60, 0x01, 0xe0, 0x18, 0xe0, 0x17, 
+-	0x48, 0x46, 0x68, 0x01, 0x04, 0x09, 0x0c, 0x09, 
+-	0x60, 0x01, 0x48, 0x44, 0x49, 0x36, 0x68, 0x09, 
+-	0x31, 0x80, 0x78, 0x09, 0x04, 0x09, 0x68, 0x02, 
+-	0x43, 0x11, 0x60, 0x01, 0x48, 0x40, 0x68, 0x01, 
+-	0x23, 0x20, 0x43, 0xdb, 0x40, 0x19, 0x60, 0x01, 
+-	0x20, 0x01, 0x49, 0x34, 0x63, 0x08, 0xe7, 0xff, 
+-	0x48, 0x36, 0x6b, 0x00, 0x23, 0x01, 0x05, 0x9b, 
+-	0x40, 0x18, 0xd1, 0x03, 0x20, 0x04, 0xf0, 0x00, 
+-	0xfb, 0xd1, 0xe7, 0xf5, 0x20, 0x01, 0x05, 0x80, 
+-	0x21, 0x33, 0x06, 0x49, 0x60, 0x48, 0x48, 0x26, 
+-	0x68, 0x00, 0x30, 0x80, 0x78, 0x80, 0x23, 0x01, 
+-	0x40, 0x58, 0x49, 0x23, 0x68, 0x09, 0x31, 0x80, 
+-	0x70, 0x88, 0x48, 0x21, 0x68, 0x00, 0x6f, 0x40, 
+-	0x49, 0x1f, 0x68, 0x09, 0x31, 0x80, 0x78, 0x09, 
+-	0x1a, 0x40, 0x49, 0x1d, 0x68, 0x09, 0x67, 0x48, 
+-	0x48, 0x1b, 0x68, 0x00, 0x6f, 0xc0, 0x30, 0x04, 
+-	0x49, 0x19, 0x68, 0x09, 0x31, 0x80, 0x78, 0x09, 
+-	0x68, 0x02, 0x18, 0x89, 0x60, 0x01, 0x48, 0x16, 
+-	0x68, 0x00, 0x6f, 0x00, 0x49, 0x14, 0x68, 0x09, 
+-	0x31, 0x80, 0x78, 0x09, 0x18, 0x40, 0x49, 0x12, 
+-	0x68, 0x09, 0x67, 0x08, 0x48, 0x10, 0x68, 0x00, 
+-	0x6f, 0x40, 0x28, 0x00, 0xd0, 0x00, 0xe6, 0xb3, 
+-	0x48, 0x11, 0x21, 0x33, 0x06, 0x49, 0x60, 0x48, 
+-	0x48, 0x0e, 0x68, 0x01, 0x4b, 0x19, 0x40, 0x19, 
+-	0x60, 0x01, 0x20, 0x48, 0x49, 0x08, 0x68, 0x09, 
+-	0x6f, 0xc9, 0x72, 0x48, 0x20, 0x00, 0x49, 0x06, 
+-	0x68, 0x09, 0x31, 0x60, 0x76, 0x88, 0x48, 0x04, 
+-	0x68, 0x00, 0x6f, 0xc0, 0x7a, 0x00, 0x28, 0xff, 
+-	0xd0, 0x29, 0x48, 0x01, 0xe0, 0x20, 0x00, 0x00, 
+-	0x2e, 0x08, 0x7c, 0x44, 0x66, 0x00, 0x01, 0x00, 
+-	0x62, 0x00, 0x00, 0x1c, 0x66, 0x00, 0x00, 0x08, 
+-	0x23, 0x48, 0x00, 0x00, 0x62, 0x01, 0x00, 0x00, 
+-	0x9e, 0x00, 0x09, 0x80, 0x40, 0x00, 0x00, 0xbc, 
+-	0x9e, 0x00, 0x0b, 0x80, 0x66, 0x00, 0x00, 0x80, 
+-	0x9e, 0x00, 0x09, 0xc0, 0x66, 0x00, 0x01, 0xf0, 
+-	0x64, 0x00, 0x00, 0x60, 0x62, 0x01, 0x00, 0x20, 
+-	0x62, 0x01, 0x00, 0x24, 0xfc, 0xb7, 0xff, 0xff, 
+-	0x68, 0x00, 0x6f, 0xc0, 0x7a, 0x01, 0x20, 0x01, 
+-	0x40, 0x88, 0xf0, 0x05, 0xfc, 0x45, 0x20, 0x00, 
+-	0xb0, 0x03, 0xe5, 0xea, 0xb0, 0x02, 0xb0, 0x01, 
+-	0xe5, 0xe7, 0xe5, 0xe6, 0xb5, 0xb0, 0x1c, 0x07, 
+-	0x06, 0x3d, 0x0e, 0x2d, 0x48, 0x5d, 0x68, 0x00, 
+-	0x5d, 0x44, 0x2d, 0x20, 0xdb, 0x03, 0x20, 0xa2, 
+-	0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 0x48, 0x59, 
+-	0x68, 0x00, 0x5d, 0x40, 0x28, 0xff, 0xd1, 0x01, 
+-	0x20, 0x4b, 0xe7, 0xf5, 0x48, 0x56, 0x69, 0x80, 
+-	0x28, 0x00, 0xd1, 0x05, 0x2c, 0x02, 0xd0, 0x03, 
+-	0x2c, 0x03, 0xd0, 0x01, 0x2c, 0x04, 0xd1, 0x0b, 
+-	0x48, 0x51, 0x69, 0x80, 0x28, 0x02, 0xd1, 0x01, 
+-	0x2c, 0x00, 0xd1, 0x05, 0x48, 0x4e, 0x69, 0x80, 
+-	0x28, 0x01, 0xd1, 0x04, 0x2c, 0x01, 0xd0, 0x02, 
+-	0x20, 0x4d, 0xe7, 0xdd, 0xe0, 0x90, 0x48, 0x4b, 
+-	0x68, 0x01, 0x4b, 0x4b, 0x43, 0x19, 0x60, 0x01, 
+-	0x48, 0x49, 0x21, 0x33, 0x06, 0x49, 0x60, 0x48, 
+-	0x48, 0x48, 0x68, 0x01, 0x23, 0x04, 0x43, 0x19, 
+-	0x60, 0x01, 0x20, 0x00, 0x49, 0x41, 0x68, 0x09, 
+-	0x31, 0x80, 0x70, 0x88, 0x20, 0x00, 0x49, 0x3f, 
+-	0x68, 0x09, 0x31, 0x80, 0x70, 0x48, 0x20, 0xff, 
+-	0x49, 0x3c, 0x68, 0x09, 0x55, 0x48, 0x2c, 0x00, 
+-	0xd1, 0x03, 0x20, 0x18, 0x21, 0x31, 0x06, 0x49, 
+-	0x62, 0x48, 0x01, 0x20, 0x49, 0x37, 0x68, 0x09, 
+-	0x18, 0x40, 0x30, 0x20, 0x7a, 0x80, 0x28, 0x00, 
+-	0xd0, 0x28, 0x20, 0x00, 0x49, 0x38, 0x60, 0x08, 
+-	0x20, 0x00, 0x49, 0x38, 0x64, 0x08, 0x20, 0x03, 
+-	0x49, 0x31, 0x61, 0x08, 0x21, 0x55, 0x01, 0x20, 
+-	0x4a, 0x2e, 0x68, 0x12, 0x18, 0x80, 0x6a, 0xc0, 
+-	0x72, 0x41, 0x21, 0x00, 0x01, 0x20, 0x4a, 0x2b, 
+-	0x68, 0x12, 0x18, 0x80, 0x30, 0x20, 0x72, 0x81, 
+-	0x01, 0x20, 0x49, 0x28, 0x68, 0x09, 0x18, 0x40, 
+-	0x6a, 0xc0, 0x7a, 0x00, 0x28, 0xff, 0xd0, 0x09, 
+-	0x01, 0x20, 0x49, 0x24, 0x68, 0x09, 0x18, 0x40, 
+-	0x6a, 0xc0, 0x7a, 0x01, 0x20, 0x01, 0x40, 0x88, 
+-	0xf0, 0x05, 0xfb, 0xbe, 0x48, 0x1f, 0x68, 0x00, 
+-	0x30, 0x60, 0x7e, 0x80, 0x28, 0x00, 0xd0, 0x2b, 
+-	0x48, 0x1c, 0x68, 0x00, 0x30, 0x80, 0x78, 0xc0, 
+-	0x28, 0x00, 0xd0, 0x0d, 0x20, 0x00, 0x49, 0x19, 
+-	0x68, 0x09, 0x31, 0x80, 0x70, 0xc8, 0x22, 0x00, 
+-	0xb4, 0x04, 0x1c, 0x28, 0x23, 0x00, 0x22, 0x00, 
+-	0x49, 0x1b, 0xf7, 0xf3, 0xfe, 0xcd, 0xb0, 0x01, 
+-	0x20, 0x55, 0x49, 0x12, 0x68, 0x09, 0x6f, 0xc9, 
+-	0x72, 0x48, 0x20, 0x00, 0x49, 0x0f, 0x68, 0x09, 
+-	0x31, 0x60, 0x76, 0x88, 0x48, 0x0d, 0x68, 0x00, 
+-	0x6f, 0xc0, 0x7a, 0x00, 0x28, 0xff, 0xd0, 0x07, 
+-	0x48, 0x0a, 0x68, 0x00, 0x6f, 0xc0, 0x7a, 0x01, 
+-	0x20, 0x01, 0x40, 0x88, 0xf0, 0x05, 0xfb, 0x8c, 
+-	0x48, 0x09, 0x21, 0x33, 0x06, 0x49, 0x60, 0x48, 
+-	0x48, 0x06, 0x68, 0x01, 0x4b, 0x0b, 0x40, 0x19, 
+-	0x60, 0x01, 0x20, 0x00, 0xe7, 0x4c, 0xe7, 0x4b, 
+-	0xe7, 0x4a, 0x00, 0x00, 0x2e, 0x08, 0x7c, 0x44, 
+-	0x66, 0x00, 0x01, 0x00, 0x66, 0x00, 0x00, 0x08, 
+-	0x23, 0x48, 0x00, 0x00, 0x66, 0x00, 0x01, 0x18, 
+-	0x9e, 0x00, 0x0a, 0x00, 0x9e, 0x00, 0x0a, 0x80, 
+-	0x00, 0x00, 0xff, 0xff, 0xfc, 0xb7, 0xff, 0xff, 
+-	0xb5, 0xff, 0x1c, 0x1f, 0x98, 0x00, 0x06, 0x02, 
+-	0x0e, 0x12, 0x99, 0x01, 0x06, 0x0d, 0x0e, 0x2d, 
+-	0x98, 0x02, 0x06, 0x04, 0x0e, 0x24, 0x48, 0x2d, 
+-	0x68, 0x00, 0x5c, 0x81, 0x2a, 0x20, 0xdb, 0x04, 
+-	0x20, 0xa2, 0xb0, 0x04, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x29, 0xff, 0xd1, 0x01, 0x20, 0x4b, 
+-	0xe7, 0xf7, 0x48, 0x27, 0x69, 0x80, 0x28, 0x00, 
+-	0xd1, 0x05, 0x29, 0x02, 0xd0, 0x03, 0x29, 0x03, 
+-	0xd0, 0x01, 0x29, 0x04, 0xd1, 0x0b, 0x48, 0x22, 
+-	0x69, 0x80, 0x28, 0x02, 0xd1, 0x01, 0x29, 0x00, 
+-	0xd1, 0x05, 0x48, 0x1f, 0x69, 0x80, 0x28, 0x01, 
+-	0xd1, 0x03, 0x29, 0x01, 0xd0, 0x01, 0x20, 0x4d, 
+-	0xe7, 0xdf, 0x29, 0x05, 0xd2, 0x2a, 0xa3, 0x02, 
+-	0x5c, 0x5b, 0x00, 0x5b, 0x44, 0x9f, 0x1c, 0x00, 
+-	0x03, 0x07, 0x04, 0x05, 0x06, 0x00, 0xe0, 0x24, 
+-	0xe0, 0x23, 0xe0, 0x22, 0xe0, 0x21, 0x01, 0x08, 
+-	0x4b, 0x12, 0x68, 0x1b, 0x18, 0xc0, 0x30, 0x20, 
+-	0x7a, 0x80, 0x28, 0x00, 0xd1, 0x05, 0x48, 0x0f, 
+-	0x68, 0x00, 0x30, 0x60, 0x7e, 0x80, 0x28, 0x00, 
+-	0xd0, 0x02, 0x20, 0x49, 0xe7, 0xc1, 0xe0, 0x13, 
+-	0x2d, 0x00, 0xd1, 0x05, 0x00, 0xa0, 0x4b, 0x0b, 
+-	0x18, 0xc0, 0x68, 0x00, 0x60, 0x38, 0xe0, 0x04, 
+-	0x68, 0x38, 0x00, 0xa6, 0x4b, 0x07, 0x18, 0xf3, 
+-	0x60, 0x18, 0xe0, 0x02, 0x20, 0x4a, 0xe7, 0xb0, 
+-	0xe7, 0xff, 0x20, 0x00, 0xe7, 0xad, 0xe7, 0xac, 
+-	0xe7, 0xab, 0x00, 0x00, 0x2e, 0x08, 0x7c, 0x44, 
+-	0x66, 0x00, 0x01, 0x00, 0x62, 0x01, 0x00, 0x80, 
+-	0xb5, 0xf7, 0xb0, 0x82, 0x98, 0x02, 0x06, 0x03, 
+-	0x0e, 0x1b, 0x93, 0x00, 0x99, 0x03, 0x06, 0x08, 
+-	0x0e, 0x00, 0x90, 0x01, 0x9a, 0x04, 0x06, 0x15, 
+-	0x0e, 0x2d, 0xb0, 0x84, 0x4a, 0xca, 0x4f, 0xcb, 
+-	0x48, 0xcb, 0x68, 0x00, 0x9b, 0x04, 0x5c, 0xc4, 
+-	0x48, 0xca, 0x90, 0x02, 0x21, 0x00, 0x23, 0x00, 
+-	0x93, 0x01, 0x9b, 0x04, 0x2b, 0x20, 0xdb, 0x05, 
+-	0x20, 0xa2, 0xb0, 0x06, 0xb0, 0x03, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2c, 0xff, 0xd1, 0x02, 
+-	0x20, 0x4b, 0xb0, 0x06, 0xe7, 0xf6, 0x48, 0xc2, 
+-	0x69, 0x80, 0x28, 0x02, 0xd1, 0x01, 0x2c, 0x00, 
+-	0xd1, 0x03, 0x48, 0xbf, 0x69, 0x80, 0x28, 0x02, 
+-	0xd0, 0x02, 0x20, 0x4d, 0xb0, 0x06, 0xe7, 0xe9, 
+-	0x98, 0x05, 0x28, 0x01, 0xd1, 0x08, 0x48, 0xb8, 
+-	0x68, 0x00, 0x30, 0x80, 0x78, 0xc0, 0x28, 0x00, 
+-	0xd0, 0x02, 0x20, 0x50, 0xb0, 0x06, 0xe7, 0xdd, 
+-	0x98, 0x05, 0x28, 0x00, 0xd1, 0x05, 0x48, 0xb2, 
+-	0x68, 0x00, 0x30, 0x20, 0x7a, 0x80, 0x28, 0x00, 
+-	0xd0, 0x08, 0x98, 0x05, 0x28, 0x01, 0xd1, 0x08, 
+-	0x48, 0xad, 0x68, 0x00, 0x30, 0x60, 0x7e, 0x80, 
+-	0x28, 0x00, 0xd1, 0x02, 0x20, 0x5a, 0xb0, 0x06, 
+-	0xe7, 0xc8, 0x20, 0x00, 0x4b, 0xa8, 0x68, 0x1b, 
+-	0x6f, 0xdb, 0x72, 0x58, 0x98, 0x05, 0x28, 0x00, 
+-	0xd1, 0x50, 0x2d, 0x01, 0xd0, 0x01, 0x2d, 0x02, 
+-	0xd1, 0x32, 0x4e, 0xa6, 0x68, 0x30, 0x23, 0x01, 
+-	0x04, 0xdb, 0x43, 0x18, 0x60, 0x30, 0x20, 0x00, 
+-	0x4b, 0xa3, 0x60, 0x18, 0x48, 0x9e, 0x68, 0x00, 
+-	0x30, 0x80, 0x78, 0x40, 0x00, 0x43, 0x18, 0x18, 
+-	0x01, 0x80, 0x9b, 0x02, 0x18, 0xc0, 0x90, 0x02, 
+-	0x98, 0x02, 0x68, 0x01, 0x48, 0x9a, 0x69, 0x80, 
+-	0x07, 0x80, 0x0f, 0x80, 0x01, 0x80, 0x43, 0x01, 
+-	0x23, 0x20, 0x43, 0x19, 0x4b, 0x99, 0x43, 0x19, 
+-	0x98, 0x02, 0x60, 0x01, 0x4e, 0x98, 0x68, 0x30, 
+-	0x23, 0x01, 0x04, 0xdb, 0x43, 0x18, 0x60, 0x30, 
+-	0x4e, 0x92, 0x68, 0x30, 0x4b, 0x95, 0x40, 0x18, 
+-	0x60, 0x30, 0x2c, 0x00, 0xd1, 0x04, 0x20, 0x00, 
+-	0x4b, 0x8b, 0x68, 0x1b, 0x33, 0x20, 0x72, 0x98, 
+-	0x2d, 0x02, 0xd0, 0x04, 0x20, 0x01, 0x04, 0xc0, 
+-	0x23, 0x33, 0x06, 0x5b, 0x60, 0x18, 0x2c, 0x00, 
+-	0xd1, 0x0f, 0x20, 0xff, 0x02, 0x00, 0x40, 0x08, 
+-	0xd1, 0x0b, 0x2d, 0x02, 0xd0, 0x09, 0x48, 0x82, 
+-	0x68, 0x00, 0x30, 0x80, 0x78, 0x40, 0x23, 0x01, 
+-	0x40, 0x58, 0x4b, 0x7f, 0x68, 0x1b, 0x33, 0x80, 
+-	0x70, 0x58, 0xe0, 0xed, 0x2d, 0x01, 0xd1, 0x73, 
+-	0x2c, 0x00, 0xd1, 0x72, 0x20, 0x31, 0x06, 0x40, 
+-	0x68, 0x80, 0x23, 0x08, 0x40, 0x18, 0xd1, 0x3a, 
+-	0x48, 0x7a, 0x68, 0x06, 0x23, 0x05, 0x05, 0x9b, 
+-	0x43, 0x33, 0x60, 0x03, 0x68, 0x10, 0x4b, 0x7c, 
+-	0x40, 0x18, 0x60, 0x10, 0x32, 0xc0, 0x68, 0x10, 
+-	0x4b, 0x79, 0x40, 0x18, 0x60, 0x10, 0x20, 0x00, 
+-	0x4b, 0x6f, 0x68, 0x1b, 0x67, 0x58, 0x20, 0x00, 
+-	0x4b, 0x6d, 0x68, 0x1b, 0x33, 0x80, 0x70, 0x18, 
+-	0x48, 0x6d, 0x68, 0x80, 0x23, 0x02, 0x40, 0x18, 
+-	0xd1, 0x04, 0x20, 0x00, 0x4b, 0x68, 0x68, 0x1b, 
+-	0x33, 0x60, 0x76, 0x98, 0x20, 0x5b, 0x4b, 0x66, 
+-	0x68, 0x1b, 0x6f, 0xdb, 0x72, 0x58, 0x4e, 0x6d, 
+-	0x68, 0x30, 0x23, 0x02, 0x43, 0x18, 0x60, 0x30, 
+-	0x4e, 0x67, 0x68, 0x30, 0x23, 0x05, 0x05, 0x9b, 
+-	0x43, 0x18, 0x60, 0x30, 0x4e, 0x61, 0x68, 0x30, 
+-	0x4b, 0x67, 0x40, 0x18, 0x60, 0x30, 0x20, 0x5b, 
+-	0xb0, 0x06, 0xe7, 0x2b, 0xe0, 0xae, 0x48, 0x5d, 
+-	0x68, 0x06, 0x23, 0x01, 0x05, 0x9b, 0x43, 0x33, 
+-	0x60, 0x03, 0x20, 0x31, 0x06, 0x40, 0x6a, 0x00, 
+-	0x23, 0x04, 0x40, 0x18, 0xd1, 0x27, 0x9b, 0x01, 
+-	0x20, 0x31, 0x06, 0x40, 0x6b, 0x00, 0x18, 0x1b, 
+-	0x93, 0x01, 0x4e, 0x5c, 0x68, 0x30, 0x23, 0x3b, 
+-	0x40, 0x18, 0x60, 0x30, 0x4e, 0x57, 0x68, 0x30, 
+-	0x23, 0x0e, 0x43, 0x18, 0x60, 0x30, 0x4e, 0x55, 
+-	0x68, 0x30, 0x23, 0x0c, 0x40, 0x18, 0x60, 0x30, 
+-	0x20, 0x37, 0x23, 0x31, 0x06, 0x5b, 0x60, 0x98, 
+-	0x20, 0x01, 0x90, 0x00, 0x98, 0x00, 0x28, 0x64, 
+-	0xd3, 0x04, 0xe0, 0x07, 0x98, 0x00, 0x30, 0x01, 
+-	0x90, 0x00, 0xe7, 0xf7, 0xe7, 0xfa, 0xe0, 0x01, 
+-	0xe0, 0x36, 0xe0, 0x34, 0xe7, 0xd1, 0x4e, 0x46, 
+-	0x68, 0x30, 0x23, 0x01, 0x05, 0x9b, 0x43, 0x18, 
+-	0x60, 0x30, 0x4e, 0x40, 0x68, 0x30, 0x4b, 0x48, 
+-	0x40, 0x18, 0x60, 0x30, 0x48, 0x3c, 0x68, 0x40, 
+-	0x28, 0x00, 0xd0, 0x0d, 0x20, 0x5b, 0x4b, 0x38, 
+-	0x68, 0x1b, 0x6f, 0xdb, 0x72, 0x58, 0x20, 0x00, 
+-	0x4b, 0x35, 0x68, 0x1b, 0x33, 0x60, 0x76, 0x98, 
+-	0x20, 0x5b, 0xb0, 0x06, 0xe6, 0xda, 0xe0, 0x5d, 
+-	0x48, 0x31, 0x68, 0x00, 0x6f, 0xc0, 0x1d, 0x06, 
+-	0x48, 0x2f, 0x68, 0x00, 0x30, 0x80, 0x78, 0x00, 
+-	0x9b, 0x01, 0x1a, 0xc0, 0x68, 0x33, 0x18, 0xc0, 
+-	0x60, 0x30, 0x20, 0x5c, 0x4b, 0x2a, 0x68, 0x1b, 
+-	0x6f, 0xdb, 0x72, 0x58, 0x20, 0x00, 0x4b, 0x28, 
+-	0x68, 0x1b, 0x33, 0x60, 0x76, 0x98, 0xe0, 0x3f, 
+-	0x20, 0x33, 0x06, 0x40, 0x6b, 0x80, 0x90, 0x03, 
+-	0x23, 0x04, 0x40, 0x18, 0xd0, 0x03, 0x20, 0x52, 
+-	0xb0, 0x06, 0xe6, 0xb7, 0xe0, 0x3a, 0x98, 0x03, 
+-	0x01, 0x00, 0x19, 0xc7, 0x48, 0x1e, 0x68, 0x00, 
+-	0x6f, 0x40, 0x28, 0xbc, 0xdd, 0x07, 0x48, 0x29, 
+-	0x60, 0xb8, 0x20, 0xbc, 0x4b, 0x1a, 0x68, 0x1b, 
+-	0x33, 0x80, 0x70, 0x18, 0xe0, 0x0d, 0x48, 0x18, 
+-	0x68, 0x00, 0x6f, 0x40, 0x23, 0x01, 0x07, 0x9b, 
+-	0x43, 0x18, 0x60, 0xb8, 0x48, 0x14, 0x68, 0x00, 
+-	0x6f, 0x40, 0x4b, 0x13, 0x68, 0x1b, 0x33, 0x80, 
+-	0x70, 0x18, 0x48, 0x11, 0x68, 0x00, 0x30, 0x80, 
+-	0x78, 0x80, 0x00, 0x43, 0x18, 0x18, 0x01, 0x80, 
+-	0x18, 0x82, 0x48, 0x0d, 0x68, 0x00, 0x6f, 0x00, 
+-	0x60, 0x38, 0x1d, 0x10, 0x60, 0x78, 0x20, 0x01, 
+-	0x06, 0x00, 0x60, 0xf8, 0x9e, 0x03, 0x20, 0x01, 
+-	0x40, 0xb0, 0x23, 0x33, 0x06, 0x5b, 0x63, 0x58, 
+-	0x20, 0x00, 0xb0, 0x06, 0xe6, 0x7e, 0xb0, 0x04, 
+-	0xb0, 0x02, 0xe6, 0x7b, 0xe6, 0x7a, 0x00, 0x00, 
+-	0x9e, 0x00, 0x0b, 0x80, 0x9e, 0x00, 0x09, 0x80, 
+-	0x2e, 0x08, 0x7c, 0x44, 0x9e, 0x00, 0x0a, 0x00, 
+-	0x66, 0x00, 0x01, 0x00, 0x66, 0x00, 0x00, 0x08, 
+-	0x62, 0x00, 0x03, 0x00, 0x80, 0x00, 0x00, 0x00, 
+-	0x66, 0x00, 0x00, 0x04, 0xff, 0xf7, 0xff, 0xff, 
+-	0xff, 0xff, 0x00, 0xff, 0x62, 0x00, 0x00, 0x1c, 
+-	0xfe, 0xbf, 0xff, 0xff, 0x62, 0x00, 0x00, 0x08, 
+-	0xff, 0xbf, 0xff, 0xff, 0x40, 0x00, 0x00, 0xbc, 
+-	0x48, 0x07, 0x69, 0x80, 0x28, 0x02, 0xd0, 0x03, 
+-	0x48, 0x05, 0x69, 0x80, 0x28, 0x03, 0xd1, 0x04, 
+-	0x20, 0x31, 0x06, 0x40, 0x6a, 0x80, 0x47, 0x70, 
+-	0xe0, 0x01, 0x20, 0x00, 0xe7, 0xfb, 0xe7, 0xfa, 
+-	0x66, 0x00, 0x01, 0x00, 0xb5, 0xb0, 0x27, 0x0f, 
+-	0x20, 0x31, 0x06, 0x40, 0x68, 0xc0, 0x09, 0x05, 
+-	0xf7, 0xff, 0xff, 0xe6, 0x43, 0xc4, 0x48, 0x18, 
+-	0x69, 0x80, 0x28, 0x00, 0xd0, 0x03, 0x48, 0x16, 
+-	0x69, 0x80, 0x28, 0x01, 0xd1, 0x03, 0x1c, 0x38, 
+-	0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 0x2d, 0x09, 
+-	0xd2, 0x1e, 0xa3, 0x02, 0x5d, 0x5b, 0x00, 0x5b, 
+-	0x44, 0x9f, 0x1c, 0x00, 0x05, 0x05, 0x05, 0x05, 
+-	0x05, 0x07, 0x07, 0x07, 0x0e, 0x00, 0x1c, 0x2f, 
+-	0xe0, 0x13, 0x20, 0x08, 0x40, 0x20, 0xd0, 0x01, 
+-	0x1c, 0x2f, 0xe0, 0x00, 0x27, 0x02, 0xe0, 0x0c, 
+-	0x20, 0x08, 0x40, 0x20, 0xd0, 0x06, 0x20, 0x02, 
+-	0x40, 0x20, 0xd0, 0x01, 0x27, 0x07, 0xe0, 0x00, 
+-	0x27, 0x08, 0xe0, 0x00, 0x27, 0x02, 0xe0, 0x00, 
+-	0xe7, 0xff, 0x1c, 0x38, 0xe7, 0xd8, 0xe7, 0xd7, 
+-	0x66, 0x00, 0x01, 0x00, 0x1c, 0x01, 0x29, 0x07, 
+-	0xd2, 0x0f, 0xa3, 0x02, 0x5c, 0x5b, 0x00, 0x5b, 
+-	0x44, 0x9f, 0x1c, 0x00, 0x04, 0x05, 0x06, 0x09, 
+-	0x08, 0x07, 0x0a, 0x00, 0xe0, 0x06, 0xe0, 0x05, 
+-	0xe0, 0x04, 0xe0, 0x03, 0xe0, 0x02, 0xe0, 0x01, 
+-	0xe0, 0x00, 0xe7, 0xff, 0x20, 0x00, 0x47, 0x70, 
+-	0xe7, 0xfd, 0x00, 0x00, 0x20, 0x1d, 0x02, 0x80, 
+-	0x69, 0x80, 0x49, 0x06, 0x60, 0x08, 0x20, 0x1d, 
+-	0x02, 0x80, 0x69, 0x40, 0x49, 0x04, 0x60, 0x08, 
+-	0x20, 0x1d, 0x02, 0x80, 0x69, 0xc0, 0x49, 0x03, 
+-	0x60, 0x08, 0x47, 0x70, 0x2e, 0x08, 0x94, 0x90, 
+-	0x2e, 0x08, 0x94, 0x94, 0x2e, 0x08, 0x94, 0x98, 
+-	0xb5, 0xf1, 0xb0, 0x81, 0x20, 0x00, 0x4d, 0x21, 
+-	0x95, 0x00, 0x21, 0x00, 0x22, 0x00, 0x23, 0x00, 
+-	0x43, 0xdb, 0x4c, 0x1f, 0x68, 0x64, 0x42, 0x8c, 
+-	0xdd, 0x21, 0x1c, 0x0c, 0x31, 0x01, 0x00, 0xa4, 
+-	0x9d, 0x00, 0x59, 0x2f, 0x42, 0x9f, 0xd0, 0xf8, 
+-	0x4c, 0x19, 0x68, 0x64, 0x42, 0x8c, 0xda, 0x00, 
+-	0xe0, 0x15, 0x32, 0x01, 0x1c, 0x0c, 0x31, 0x01, 
+-	0x00, 0xa4, 0x9d, 0x00, 0x59, 0x2b, 0x42, 0x9f, 
+-	0xd0, 0xf8, 0x02, 0x9c, 0x43, 0x3c, 0x1c, 0x25, 
+-	0x1c, 0x04, 0x30, 0x01, 0x00, 0xa4, 0x9e, 0x01, 
+-	0x51, 0x35, 0x4c, 0x0f, 0x68, 0x64, 0x42, 0x8c, 
+-	0xdb, 0x00, 0x32, 0x01, 0xe7, 0xd9, 0x28, 0x08, 
+-	0xd3, 0x02, 0xe0, 0x07, 0x30, 0x01, 0xe7, 0xfa, 
+-	0x25, 0x00, 0x43, 0xed, 0x00, 0x84, 0x9e, 0x01, 
+-	0x51, 0x35, 0xe7, 0xf7, 0x4c, 0x07, 0x68, 0x24, 
+-	0x2c, 0x00, 0xd1, 0x02, 0x24, 0x0d, 0x06, 0xe4, 
+-	0x61, 0x22, 0xb0, 0x01, 0xb0, 0x01, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x7c, 0xcc, 
+-	0x2e, 0x08, 0x7d, 0x94, 0x2e, 0x08, 0x94, 0x84, 
+-	0xb5, 0x80, 0x48, 0xdc, 0x68, 0x00, 0x28, 0x00, 
+-	0xd1, 0x04, 0x48, 0xda, 0x68, 0x00, 0xbc, 0x80, 
+-	0xbc, 0x08, 0x47, 0x18, 0xf7, 0xff, 0xff, 0x92, 
+-	0x48, 0xd7, 0x49, 0xd8, 0x60, 0x08, 0x48, 0xd8, 
+-	0x49, 0xd8, 0x60, 0x08, 0x48, 0xd8, 0x49, 0xd9, 
+-	0x60, 0x08, 0x48, 0xd3, 0x49, 0xd8, 0x68, 0x0b, 
+-	0x4a, 0xd8, 0x21, 0x00, 0xf0, 0x01, 0xf8, 0xda, 
+-	0x20, 0x00, 0x49, 0xd0, 0x68, 0x09, 0x60, 0x08, 
+-	0x20, 0x00, 0x49, 0xd0, 0x68, 0x09, 0x60, 0x08, 
+-	0x20, 0x00, 0x49, 0xd0, 0x68, 0x09, 0x60, 0x08, 
+-	0x20, 0x00, 0x49, 0xca, 0x68, 0x09, 0x23, 0x07, 
+-	0x02, 0x1b, 0x18, 0xc9, 0x66, 0x88, 0x48, 0xce, 
+-	0x49, 0xc6, 0x68, 0x09, 0x23, 0x07, 0x02, 0x1b, 
+-	0x18, 0xc9, 0x66, 0xc8, 0x20, 0x00, 0x49, 0xc5, 
+-	0x68, 0x09, 0x23, 0x07, 0x02, 0x1b, 0x18, 0xc9, 
+-	0x66, 0x88, 0x48, 0xc7, 0x49, 0xc1, 0x68, 0x09, 
+-	0x23, 0x07, 0x02, 0x1b, 0x18, 0xc9, 0x66, 0xc8, 
+-	0x20, 0x00, 0x49, 0xc0, 0x68, 0x09, 0x23, 0x07, 
+-	0x02, 0x1b, 0x18, 0xc9, 0x66, 0x88, 0x48, 0xc0, 
+-	0x49, 0xbc, 0x68, 0x09, 0x23, 0x07, 0x02, 0x1b, 
+-	0x18, 0xc9, 0x66, 0xc8, 0x27, 0x00, 0x2f, 0x19, 
+-	0xd3, 0x02, 0xe0, 0x38, 0x37, 0x01, 0xe7, 0xfa, 
+-	0x48, 0xba, 0x00, 0xb9, 0x4a, 0xb1, 0x68, 0x12, 
+-	0x18, 0x89, 0x23, 0x0d, 0x01, 0xdb, 0x18, 0xc9, 
+-	0x62, 0x08, 0x48, 0xb6, 0x00, 0xb9, 0x4a, 0xad, 
+-	0x68, 0x12, 0x18, 0x89, 0x23, 0x07, 0x02, 0x1b, 
+-	0x18, 0xc9, 0x60, 0x48, 0x48, 0xb1, 0x00, 0xb9, 
+-	0x4a, 0xaa, 0x68, 0x12, 0x18, 0x89, 0x23, 0x0d, 
+-	0x01, 0xdb, 0x18, 0xc9, 0x62, 0x08, 0x48, 0xad, 
+-	0x00, 0xb9, 0x4a, 0xa6, 0x68, 0x12, 0x18, 0x89, 
+-	0x23, 0x07, 0x02, 0x1b, 0x18, 0xc9, 0x60, 0x48, 
+-	0x48, 0xa8, 0x00, 0xb9, 0x4a, 0xa3, 0x68, 0x12, 
+-	0x18, 0x89, 0x23, 0x0d, 0x01, 0xdb, 0x18, 0xc9, 
+-	0x62, 0x08, 0x48, 0xa4, 0x00, 0xb9, 0x4a, 0x9f, 
+-	0x68, 0x12, 0x18, 0x89, 0x23, 0x07, 0x02, 0x1b, 
+-	0x18, 0xc9, 0x60, 0x48, 0xe7, 0xc6, 0x27, 0x00, 
+-	0x2f, 0x07, 0xd3, 0x02, 0xe0, 0x86, 0x37, 0x01, 
+-	0xe7, 0xfa, 0x48, 0x9c, 0x00, 0xb9, 0x19, 0xc9, 
+-	0x00, 0xc9, 0x4a, 0x92, 0x68, 0x12, 0x18, 0x89, 
+-	0x23, 0x0b, 0x01, 0xdb, 0x18, 0xc9, 0x60, 0x08, 
+-	0x48, 0x96, 0x00, 0xb9, 0x19, 0xc9, 0x00, 0xc9, 
+-	0x4a, 0x8c, 0x68, 0x12, 0x18, 0x89, 0x23, 0x05, 
+-	0x02, 0x1b, 0x18, 0xc9, 0x67, 0xc8, 0x48, 0x91, 
+-	0x00, 0xb9, 0x19, 0xc9, 0x00, 0xc9, 0x4a, 0x87, 
+-	0x68, 0x12, 0x18, 0x89, 0x23, 0x0b, 0x01, 0xdb, 
+-	0x18, 0xc9, 0x60, 0x48, 0x48, 0x8b, 0x00, 0xb9, 
+-	0x19, 0xc9, 0x00, 0xc9, 0x4a, 0x81, 0x68, 0x12, 
+-	0x18, 0x89, 0x23, 0x05, 0x02, 0x1b, 0x18, 0xc9, 
+-	0x67, 0x88, 0x48, 0x86, 0x00, 0xb9, 0x19, 0xc9, 
+-	0x00, 0xc9, 0x4a, 0x7e, 0x68, 0x12, 0x18, 0x89, 
+-	0x23, 0x0b, 0x01, 0xdb, 0x18, 0xc9, 0x60, 0x08, 
+-	0x48, 0x80, 0x00, 0xb9, 0x19, 0xc9, 0x00, 0xc9, 
+-	0x4a, 0x78, 0x68, 0x12, 0x18, 0x89, 0x23, 0x05, 
+-	0x02, 0x1b, 0x18, 0xc9, 0x67, 0xc8, 0x48, 0x7b, 
+-	0x00, 0xb9, 0x19, 0xc9, 0x00, 0xc9, 0x4a, 0x73, 
+-	0x68, 0x12, 0x18, 0x89, 0x23, 0x0b, 0x01, 0xdb, 
+-	0x18, 0xc9, 0x60, 0x48, 0x48, 0x75, 0x00, 0xb9, 
+-	0x19, 0xc9, 0x00, 0xc9, 0x4a, 0x6d, 0x68, 0x12, 
+-	0x18, 0x89, 0x23, 0x05, 0x02, 0x1b, 0x18, 0xc9, 
+-	0x67, 0x88, 0x48, 0x70, 0x00, 0xb9, 0x19, 0xc9, 
+-	0x00, 0xc9, 0x4a, 0x6a, 0x68, 0x12, 0x18, 0x89, 
+-	0x23, 0x0b, 0x01, 0xdb, 0x18, 0xc9, 0x60, 0x08, 
+-	0x48, 0x6a, 0x00, 0xb9, 0x19, 0xc9, 0x00, 0xc9, 
+-	0x4a, 0x64, 0x68, 0x12, 0x18, 0x89, 0x23, 0x05, 
+-	0x02, 0x1b, 0x18, 0xc9, 0x67, 0xc8, 0x48, 0x65, 
+-	0x00, 0xb9, 0x19, 0xc9, 0x00, 0xc9, 0x4a, 0x5f, 
+-	0x68, 0x12, 0x18, 0x89, 0x23, 0x0b, 0x01, 0xdb, 
+-	0x18, 0xc9, 0x60, 0x48, 0x48, 0x5f, 0x00, 0xb9, 
+-	0x19, 0xc9, 0x00, 0xc9, 0x4a, 0x59, 0x68, 0x12, 
+-	0x18, 0x89, 0x23, 0x05, 0x02, 0x1b, 0x18, 0xc9, 
+-	0x67, 0x88, 0xe7, 0x78, 0x27, 0x00, 0x2f, 0x12, 
+-	0xd3, 0x02, 0xe0, 0x56, 0x37, 0x01, 0xe7, 0xfa, 
+-	0x48, 0x56, 0x21, 0x4c, 0x43, 0x79, 0x4a, 0x4d, 
+-	0x68, 0x12, 0x18, 0x89, 0x62, 0xc8, 0x48, 0x53, 
+-	0x21, 0x4c, 0x43, 0x79, 0x4a, 0x49, 0x68, 0x12, 
+-	0x18, 0x89, 0x62, 0x88, 0x48, 0x4f, 0x21, 0x4c, 
+-	0x43, 0x79, 0x4a, 0x46, 0x68, 0x12, 0x18, 0x89, 
+-	0x63, 0x08, 0x48, 0x4c, 0x21, 0x4c, 0x43, 0x79, 
+-	0x4a, 0x42, 0x68, 0x12, 0x18, 0x89, 0x62, 0x48, 
+-	0x48, 0x48, 0x21, 0x4c, 0x43, 0x79, 0x4a, 0x41, 
+-	0x68, 0x12, 0x18, 0x89, 0x62, 0xc8, 0x48, 0x45, 
+-	0x21, 0x4c, 0x43, 0x79, 0x4a, 0x3d, 0x68, 0x12, 
+-	0x18, 0x89, 0x62, 0x88, 0x48, 0x41, 0x21, 0x4c, 
+-	0x43, 0x79, 0x4a, 0x3a, 0x68, 0x12, 0x18, 0x89, 
+-	0x63, 0x08, 0x48, 0x3e, 0x21, 0x4c, 0x43, 0x79, 
+-	0x4a, 0x36, 0x68, 0x12, 0x18, 0x89, 0x62, 0x48, 
+-	0x48, 0x3a, 0x21, 0x4c, 0x43, 0x79, 0x4a, 0x35, 
+-	0x68, 0x12, 0x18, 0x89, 0x62, 0xc8, 0x48, 0x37, 
+-	0x21, 0x4c, 0x43, 0x79, 0x4a, 0x31, 0x68, 0x12, 
+-	0x18, 0x89, 0x62, 0x88, 0x48, 0x33, 0x21, 0x4c, 
+-	0x43, 0x79, 0x4a, 0x2e, 0x68, 0x12, 0x18, 0x89, 
+-	0x63, 0x08, 0x48, 0x30, 0x21, 0x4c, 0x43, 0x79, 
+-	0x4a, 0x2a, 0x68, 0x12, 0x18, 0x89, 0x62, 0x48, 
+-	0xe7, 0xa8, 0x20, 0x00, 0x49, 0x25, 0x68, 0x09, 
+-	0x23, 0x0d, 0x01, 0xdb, 0x18, 0xc9, 0x61, 0xc8, 
+-	0x20, 0x00, 0x49, 0x22, 0x68, 0x09, 0x23, 0x0d, 
+-	0x01, 0xdb, 0x18, 0xc9, 0x61, 0x88, 0x20, 0x00, 
+-	0x49, 0x1c, 0x68, 0x09, 0x23, 0x0d, 0x01, 0xdb, 
+-	0x18, 0xc9, 0x61, 0xc8, 0x20, 0x00, 0x49, 0x19, 
+-	0x68, 0x09, 0x23, 0x0d, 0x01, 0xdb, 0x18, 0xc9, 
+-	0x61, 0x88, 0x20, 0x00, 0x49, 0x19, 0x68, 0x09, 
+-	0x23, 0x0d, 0x01, 0xdb, 0x18, 0xc9, 0x61, 0xc8, 
+-	0x20, 0x00, 0x49, 0x16, 0x68, 0x09, 0x23, 0x0d, 
+-	0x01, 0xdb, 0x18, 0xc9, 0x61, 0x88, 0x20, 0x92, 
+-	0x49, 0x17, 0x60, 0x08, 0x27, 0x00, 0x2f, 0x08, 
+-	0xd3, 0x02, 0xe0, 0x08, 0x37, 0x01, 0xe7, 0xfa, 
+-	0x20, 0x00, 0x43, 0xc0, 0x00, 0xb9, 0x4b, 0x13, 
+-	0x18, 0xc9, 0x64, 0x08, 0xe7, 0xf6, 0x20, 0x10, 
+-	0x21, 0x0d, 0x06, 0xc9, 0x61, 0x08, 0x20, 0x01, 
+-	0x49, 0x0f, 0x60, 0x08, 0x48, 0x0e, 0x68, 0x00, 
+-	0xe6, 0x4d, 0xe6, 0x4c, 0x2e, 0x08, 0x60, 0x84, 
+-	0x2e, 0x08, 0x7d, 0xbc, 0x2e, 0x08, 0x7d, 0xb0, 
+-	0x2e, 0x08, 0x85, 0x54, 0x2e, 0x08, 0x7d, 0xb4, 
+-	0x2e, 0x08, 0x8c, 0xec, 0x2e, 0x08, 0x7d, 0xb8, 
+-	0x2e, 0x08, 0x94, 0x94, 0x00, 0x00, 0x16, 0xc8, 
+-	0x3f, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 
+-	0x2e, 0x08, 0x94, 0x88, 0x68, 0x00, 0x0d, 0x00, 
+-	0x2e, 0x08, 0x94, 0x84, 0xb5, 0x90, 0x1c, 0x04, 
+-	0x1c, 0x0f, 0x1c, 0x39, 0x20, 0x00, 0xf0, 0x00, 
+-	0xf8, 0x4d, 0x1c, 0x39, 0x1c, 0x20, 0xf0, 0x00, 
+-	0xf8, 0x03, 0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 
+-	0xb5, 0xf0, 0x1c, 0x04, 0x1c, 0x0f, 0x68, 0x78, 
+-	0x28, 0x07, 0xd9, 0x1d, 0x23, 0x03, 0x02, 0x5b, 
+-	0x18, 0xf8, 0x6d, 0x40, 0x28, 0x00, 0xd0, 0x06, 
+-	0x23, 0x03, 0x02, 0x5b, 0x18, 0xf8, 0x6d, 0x80, 
+-	0x04, 0x00, 0x0c, 0x00, 0xd1, 0x02, 0x20, 0x02, 
+-	0x60, 0xb8, 0xe0, 0x01, 0x20, 0x03, 0x60, 0xb8, 
+-	0x1d, 0xfd, 0x35, 0x05, 0x23, 0x65, 0x01, 0x1b, 
+-	0x18, 0xfe, 0x1c, 0x31, 0x1c, 0x28, 0x4a, 0x11, 
+-	0x68, 0x13, 0x22, 0x28, 0xf0, 0x00, 0xfe, 0xee, 
+-	0x2c, 0x06, 0xd0, 0x18, 0x00, 0xa0, 0x19, 0x00, 
+-	0x00, 0xc0, 0x19, 0xc0, 0x23, 0x2b, 0x01, 0x5b, 
+-	0x18, 0xc6, 0x00, 0xa0, 0x19, 0x00, 0x00, 0xc0, 
+-	0x19, 0xc0, 0x23, 0xb1, 0x00, 0xdb, 0x18, 0xc5, 
+-	0x20, 0x06, 0x1b, 0x00, 0x00, 0x82, 0x18, 0x12, 
+-	0x00, 0xd2, 0x1c, 0x31, 0x1c, 0x28, 0x4b, 0x04, 
+-	0x68, 0x1b, 0xf0, 0x00, 0xfe, 0xd3, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x94, 0x90, 
+-	0x2e, 0x08, 0x94, 0x98, 0xb5, 0xf0, 0x1c, 0x07, 
+-	0x1c, 0x0c, 0x2f, 0x10, 0xd0, 0x13, 0x20, 0x4c, 
+-	0x43, 0x78, 0x19, 0x00, 0x1d, 0xc6, 0x36, 0x01, 
+-	0x20, 0x4c, 0x43, 0x78, 0x19, 0x00, 0x1d, 0xc5, 
+-	0x35, 0x4d, 0x20, 0x10, 0x1b, 0xc0, 0x22, 0x4c, 
+-	0x43, 0x42, 0x1c, 0x31, 0x1c, 0x28, 0x4b, 0x03, 
+-	0x68, 0x1b, 0xf0, 0x00, 0xfe, 0xb3, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x94, 0x98, 
+-	0xb5, 0x90, 0x1c, 0x04, 0x1c, 0x0f, 0x1c, 0x39, 
+-	0x1c, 0x20, 0xf0, 0x00, 0xf8, 0x07, 0x1c, 0x39, 
+-	0x20, 0x00, 0xf0, 0x00, 0xf8, 0x33, 0xbc, 0x90, 
+-	0xbc, 0x08, 0x47, 0x18, 0xb5, 0xf0, 0x1c, 0x04, 
+-	0x1c, 0x0f, 0x00, 0xa0, 0x19, 0x00, 0x00, 0xc0, 
+-	0x19, 0xc0, 0x23, 0xb1, 0x00, 0xdb, 0x18, 0xc6, 
+-	0x00, 0xa0, 0x19, 0x00, 0x00, 0xc0, 0x19, 0xc0, 
+-	0x23, 0x2b, 0x01, 0x5b, 0x18, 0xc5, 0x20, 0x06, 
+-	0x1b, 0x00, 0x00, 0x82, 0x18, 0x12, 0x00, 0xd2, 
+-	0x1c, 0x31, 0x1c, 0x28, 0x4b, 0x09, 0x68, 0x1b, 
+-	0xf0, 0x00, 0xfe, 0x84, 0x1d, 0xfe, 0x36, 0x05, 
+-	0x23, 0x65, 0x01, 0x1b, 0x18, 0xfd, 0x1c, 0x31, 
+-	0x1c, 0x28, 0x4a, 0x05, 0x68, 0x13, 0x22, 0x28, 
+-	0xf0, 0x00, 0xfe, 0x78, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x94, 0x98, 
+-	0x2e, 0x08, 0x94, 0x90, 0xb5, 0xf0, 0x1c, 0x07, 
+-	0x1c, 0x0c, 0x20, 0x4c, 0x43, 0x78, 0x19, 0x00, 
+-	0x1d, 0xc6, 0x36, 0x4d, 0x20, 0x4c, 0x43, 0x78, 
+-	0x19, 0x00, 0x1d, 0xc5, 0x35, 0x01, 0x20, 0x10, 
+-	0x1b, 0xc0, 0x22, 0x4c, 0x43, 0x42, 0x1c, 0x31, 
+-	0x1c, 0x28, 0x4b, 0x03, 0x68, 0x1b, 0xf0, 0x00, 
+-	0xfe, 0x59, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x94, 0x98, 0xb4, 0xb0, 0x1c, 0x02, 
+-	0x1c, 0x0f, 0x20, 0x00, 0x1c, 0x03, 0x30, 0x01, 
+-	0x00, 0x9b, 0x18, 0x9c, 0x23, 0x07, 0x02, 0x1b, 
+-	0x18, 0xe3, 0x68, 0x5b, 0x10, 0x7c, 0x34, 0x01, 
+-	0x42, 0xa3, 0xd2, 0x00, 0xe7, 0xf2, 0x38, 0x01, 
+-	0x21, 0x18, 0x42, 0x81, 0xd8, 0x02, 0xe0, 0x1a, 
+-	0x39, 0x01, 0xe7, 0xfa, 0x00, 0x8b, 0x18, 0x9c, 
+-	0x23, 0x0d, 0x01, 0xdb, 0x18, 0xe3, 0x69, 0xdc, 
+-	0x00, 0x8b, 0x18, 0x9d, 0x23, 0x0d, 0x01, 0xdb, 
+-	0x18, 0xeb, 0x62, 0x1c, 0x00, 0x8b, 0x18, 0x9c, 
+-	0x23, 0x07, 0x02, 0x1b, 0x18, 0xe3, 0x68, 0x1c, 
+-	0x00, 0x8b, 0x18, 0x9d, 0x23, 0x07, 0x02, 0x1b, 
+-	0x18, 0xeb, 0x60, 0x5c, 0xe7, 0xe4, 0x23, 0x00, 
+-	0x2b, 0x00, 0xd0, 0x10, 0x10, 0x7b, 0x1c, 0x5c, 
+-	0x00, 0x83, 0x18, 0x9d, 0x23, 0x0d, 0x01, 0xdb, 
+-	0x18, 0xeb, 0x62, 0x1c, 0x10, 0x7b, 0x1c, 0x5c, 
+-	0x00, 0x83, 0x18, 0x9d, 0x23, 0x07, 0x02, 0x1b, 
+-	0x18, 0xeb, 0x60, 0x5c, 0xe0, 0x0e, 0x10, 0x7c, 
+-	0x00, 0x83, 0x18, 0x9d, 0x23, 0x0d, 0x01, 0xdb, 
+-	0x18, 0xeb, 0x62, 0x1c, 0x10, 0x7b, 0x1c, 0x5c, 
+-	0x00, 0x83, 0x18, 0x9d, 0x23, 0x07, 0x02, 0x1b, 
+-	0x18, 0xeb, 0x60, 0x5c, 0xbc, 0xb0, 0x47, 0x70, 
+-	0xb4, 0xb0, 0x1c, 0x02, 0x1c, 0x0f, 0x21, 0x00, 
+-	0x1c, 0x0b, 0x31, 0x01, 0x00, 0x9b, 0x18, 0x9c, 
+-	0x23, 0x07, 0x02, 0x1b, 0x18, 0xe3, 0x68, 0x5b, 
+-	0x10, 0x7c, 0x34, 0x01, 0x42, 0xa3, 0xd0, 0x00, 
+-	0xe7, 0xf2, 0x39, 0x01, 0x1c, 0x08, 0x28, 0x18, 
+-	0xd3, 0x02, 0xe0, 0x1a, 0x30, 0x01, 0xe7, 0xfa, 
+-	0x00, 0x83, 0x18, 0x9c, 0x23, 0x0d, 0x01, 0xdb, 
+-	0x18, 0xe3, 0x6a, 0x5c, 0x00, 0x83, 0x18, 0x9d, 
+-	0x23, 0x0d, 0x01, 0xdb, 0x18, 0xeb, 0x62, 0x1c, 
+-	0x00, 0x83, 0x18, 0x9c, 0x23, 0x07, 0x02, 0x1b, 
+-	0x18, 0xe3, 0x68, 0x9c, 0x00, 0x83, 0x18, 0x9d, 
+-	0x23, 0x07, 0x02, 0x1b, 0x18, 0xeb, 0x60, 0x5c, 
+-	0xe7, 0xe4, 0x4c, 0x06, 0x23, 0x07, 0x02, 0x1b, 
+-	0x18, 0xd3, 0x60, 0x1c, 0x4c, 0x03, 0x23, 0x07, 
+-	0x02, 0x1b, 0x18, 0xd3, 0x66, 0x5c, 0xbc, 0xb0, 
+-	0x47, 0x70, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 
+-	0xb4, 0xb0, 0x1c, 0x07, 0x1c, 0x0c, 0x1c, 0x15, 
+-	0x6a, 0xa1, 0x23, 0x01, 0x02, 0x9b, 0x43, 0x19, 
+-	0x62, 0x39, 0x21, 0x01, 0x02, 0x89, 0x43, 0x29, 
+-	0x62, 0x79, 0x6a, 0xe1, 0x05, 0x89, 0x0d, 0x89, 
+-	0x61, 0xf9, 0x6b, 0x61, 0x31, 0x01, 0x05, 0x89, 
+-	0x0d, 0x89, 0x61, 0xb9, 0x69, 0x61, 0x60, 0xf9, 
+-	0x69, 0xa1, 0x61, 0x39, 0x69, 0xe1, 0x61, 0x79, 
+-	0x68, 0xa1, 0x23, 0x01, 0x06, 0x1b, 0x40, 0x19, 
+-	0xd0, 0x02, 0x49, 0x0f, 0x60, 0xb9, 0xe0, 0x01, 
+-	0x21, 0x00, 0x60, 0xb9, 0x6a, 0x60, 0x28, 0x00, 
+-	0xd0, 0x0b, 0x68, 0x41, 0x60, 0x39, 0x78, 0x01, 
+-	0x00, 0x89, 0x4b, 0x0a, 0x18, 0xc9, 0x60, 0x79, 
+-	0x68, 0xb9, 0x88, 0x42, 0x43, 0x11, 0x60, 0xb9, 
+-	0xe0, 0x07, 0x21, 0x00, 0x60, 0x39, 0x21, 0x00, 
+-	0x60, 0x79, 0x68, 0xb9, 0x0c, 0x09, 0x04, 0x09, 
+-	0x60, 0xb9, 0xbc, 0xb0, 0x47, 0x70, 0x00, 0x00, 
+-	0xff, 0xff, 0x00, 0x00, 0x68, 0x00, 0x08, 0x00, 
+-	0xb4, 0x80, 0x1c, 0x02, 0x1c, 0x0f, 0x69, 0x79, 
+-	0x60, 0xd1, 0x69, 0xb9, 0x61, 0x11, 0x69, 0xf9, 
+-	0x61, 0x51, 0x68, 0xb9, 0x23, 0x01, 0x06, 0x1b, 
+-	0x40, 0x19, 0xd0, 0x02, 0x49, 0x0e, 0x60, 0x91, 
+-	0xe0, 0x01, 0x21, 0x00, 0x60, 0x91, 0x6a, 0x78, 
+-	0x28, 0x00, 0xd0, 0x0b, 0x68, 0x41, 0x60, 0x11, 
+-	0x78, 0x01, 0x00, 0x89, 0x4b, 0x09, 0x18, 0xc9, 
+-	0x60, 0x51, 0x68, 0x91, 0x88, 0x43, 0x43, 0x19, 
+-	0x60, 0x91, 0xe0, 0x07, 0x21, 0x00, 0x60, 0x11, 
+-	0x21, 0x00, 0x60, 0x51, 0x68, 0x91, 0x0c, 0x09, 
+-	0x04, 0x09, 0x60, 0x91, 0xbc, 0x80, 0x47, 0x70, 
+-	0xff, 0xff, 0x00, 0x00, 0x68, 0x00, 0x08, 0x00, 
+-	0x1c, 0x01, 0x48, 0x07, 0x62, 0x08, 0x48, 0x06, 
+-	0x62, 0x48, 0x48, 0x05, 0x61, 0xc8, 0x48, 0x04, 
+-	0x61, 0x88, 0x20, 0x00, 0x60, 0x08, 0x20, 0x00, 
+-	0x60, 0x48, 0x20, 0x00, 0x60, 0x88, 0x47, 0x70, 
+-	0x00, 0x00, 0xff, 0xff, 0xb5, 0xb0, 0x1c, 0x07, 
+-	0x1c, 0x0c, 0x2c, 0x07, 0xd2, 0x73, 0x25, 0x00, 
+-	0x2d, 0x07, 0xdb, 0x02, 0xe0, 0x2f, 0x35, 0x01, 
+-	0xe7, 0xfa, 0x00, 0xa8, 0x19, 0x40, 0x00, 0xc0, 
+-	0x19, 0xc0, 0x23, 0x0b, 0x01, 0xdb, 0x18, 0xc0, 
+-	0x68, 0x00, 0x00, 0xa9, 0x19, 0x49, 0x00, 0xc9, 
+-	0x19, 0xc9, 0x23, 0x0b, 0x01, 0xdb, 0x18, 0xc9, 
+-	0x68, 0x49, 0x42, 0x88, 0xd0, 0x1a, 0x00, 0xa8, 
+-	0x19, 0x40, 0x00, 0xc0, 0x19, 0xc0, 0x23, 0x0b, 
+-	0x01, 0xdb, 0x18, 0xc0, 0x68, 0x40, 0x23, 0x01, 
+-	0x02, 0x9b, 0x43, 0x98, 0x1c, 0x02, 0x00, 0xa8, 
+-	0x19, 0x40, 0x00, 0xc0, 0x19, 0xc0, 0x23, 0x0b, 
+-	0x01, 0xdb, 0x18, 0xc0, 0x68, 0x00, 0x23, 0x01, 
+-	0x02, 0x9b, 0x43, 0x98, 0x1c, 0x01, 0x48, 0xf8, 
+-	0xf0, 0x00, 0xfb, 0xd2, 0xe7, 0xcf, 0x23, 0xcf, 
+-	0x00, 0xdb, 0x18, 0xf8, 0xf7, 0xff, 0xfb, 0xb8, 
+-	0x25, 0x00, 0x2d, 0x07, 0xdb, 0x02, 0xe0, 0x54, 
+-	0x35, 0x01, 0xe7, 0xfa, 0x00, 0xa8, 0x19, 0x40, 
+-	0x00, 0xc0, 0x19, 0xc0, 0x23, 0x0b, 0x01, 0xdb, 
+-	0x18, 0xc0, 0x68, 0x00, 0x00, 0xa9, 0x19, 0x49, 
+-	0x00, 0xc9, 0x19, 0xc9, 0x23, 0x0b, 0x01, 0xdb, 
+-	0x18, 0xc9, 0x68, 0x49, 0x42, 0x88, 0xd0, 0x1a, 
+-	0x00, 0xa8, 0x19, 0x40, 0x00, 0xc0, 0x19, 0xc0, 
+-	0x23, 0x0b, 0x01, 0xdb, 0x18, 0xc0, 0x68, 0x40, 
+-	0x23, 0x01, 0x02, 0x9b, 0x43, 0x98, 0x1c, 0x02, 
+-	0x00, 0xa8, 0x19, 0x40, 0x00, 0xc0, 0x19, 0xc0, 
+-	0x23, 0x0b, 0x01, 0xdb, 0x18, 0xc0, 0x68, 0x00, 
+-	0x23, 0x01, 0x02, 0x9b, 0x43, 0x98, 0x1c, 0x01, 
+-	0x48, 0xdb, 0xf0, 0x00, 0xfb, 0x6b, 0x20, 0x4c, 
+-	0x43, 0x68, 0x19, 0xc0, 0x6a, 0xc0, 0x21, 0x4c, 
+-	0x43, 0x69, 0x19, 0xc9, 0xe0, 0x00, 0xe0, 0x94, 
+-	0x6b, 0x09, 0x42, 0x88, 0xd0, 0x12, 0x20, 0x4c, 
+-	0x43, 0x68, 0x19, 0xc0, 0x6b, 0x00, 0x23, 0x01, 
+-	0x02, 0x9b, 0x43, 0x98, 0x1c, 0x02, 0x20, 0x4c, 
+-	0x43, 0x68, 0x19, 0xc0, 0x6a, 0xc0, 0x23, 0x01, 
+-	0x02, 0x9b, 0x43, 0x98, 0x1c, 0x01, 0x48, 0xcc, 
+-	0xf0, 0x00, 0xfb, 0x7a, 0x20, 0x4c, 0x43, 0x68, 
+-	0x19, 0xc0, 0x30, 0x34, 0xf7, 0xff, 0xfb, 0x60, 
+-	0xe7, 0xaa, 0x25, 0x07, 0x2d, 0x11, 0xdb, 0x02, 
+-	0xe0, 0x4e, 0x35, 0x01, 0xe7, 0xfa, 0x20, 0x4c, 
+-	0x43, 0x68, 0x19, 0xc0, 0x38, 0xff, 0x38, 0xff, 
+-	0x38, 0x02, 0x69, 0x80, 0x21, 0x4c, 0x43, 0x69, 
+-	0x19, 0xc9, 0x39, 0xff, 0x39, 0xff, 0x39, 0x02, 
+-	0x69, 0xc9, 0x42, 0x88, 0xd0, 0x18, 0x20, 0x4c, 
+-	0x43, 0x68, 0x19, 0xc0, 0x38, 0xff, 0x38, 0xff, 
+-	0x38, 0x02, 0x69, 0xc0, 0x23, 0x01, 0x02, 0x9b, 
+-	0x43, 0x98, 0x1c, 0x02, 0x20, 0x4c, 0x43, 0x68, 
+-	0x19, 0xc0, 0x38, 0xff, 0x38, 0xff, 0x38, 0x02, 
+-	0x69, 0x80, 0x23, 0x01, 0x02, 0x9b, 0x43, 0x98, 
+-	0x1c, 0x01, 0x48, 0xb1, 0xf0, 0x00, 0xfb, 0x16, 
+-	0x20, 0x4c, 0x43, 0x68, 0x19, 0xc0, 0x6a, 0xc0, 
+-	0x21, 0x4c, 0x43, 0x69, 0x19, 0xc9, 0x6b, 0x09, 
+-	0x42, 0x88, 0xd0, 0x12, 0x20, 0x4c, 0x43, 0x68, 
+-	0x19, 0xc0, 0x6b, 0x00, 0x23, 0x01, 0x02, 0x9b, 
+-	0x43, 0x98, 0x1c, 0x02, 0x20, 0x4c, 0x43, 0x68, 
+-	0x19, 0xc0, 0x6a, 0xc0, 0x23, 0x01, 0x02, 0x9b, 
+-	0x43, 0x98, 0x1c, 0x01, 0x48, 0xa2, 0xf0, 0x00, 
+-	0xfb, 0x27, 0x20, 0x4c, 0x43, 0x68, 0x19, 0xc0, 
+-	0x30, 0x34, 0xf7, 0xff, 0xfb, 0x0d, 0xe7, 0xb0, 
+-	0x25, 0x0a, 0x2d, 0x11, 0xdb, 0x02, 0xe0, 0x1f, 
+-	0x35, 0x01, 0xe7, 0xfa, 0x20, 0x4c, 0x43, 0x68, 
+-	0x19, 0xc0, 0x6a, 0xc0, 0x21, 0x4c, 0x43, 0x69, 
+-	0x19, 0xc9, 0x6b, 0x09, 0x42, 0x88, 0xd0, 0x12, 
+-	0x20, 0x4c, 0x43, 0x68, 0x19, 0xc0, 0x6b, 0x00, 
+-	0x23, 0x01, 0x02, 0x9b, 0x43, 0x98, 0x1c, 0x02, 
+-	0x20, 0x4c, 0x43, 0x68, 0x19, 0xc0, 0x6a, 0xc0, 
+-	0x23, 0x01, 0x02, 0x9b, 0x43, 0x98, 0x1c, 0x01, 
+-	0x48, 0x8d, 0xf0, 0x00, 0xfa, 0xcf, 0xe7, 0xdf, 
+-	0xe1, 0xca, 0x2c, 0x0e, 0xd3, 0x73, 0x3c, 0x07, 
+-	0x1f, 0xe5, 0x42, 0xa5, 0xd3, 0x02, 0xe0, 0x1f, 
+-	0x35, 0x01, 0xe7, 0xfa, 0x20, 0x4c, 0x43, 0x68, 
+-	0x19, 0xc0, 0x6a, 0xc0, 0x21, 0x4c, 0x43, 0x69, 
+-	0x19, 0xc9, 0x6b, 0x09, 0x42, 0x88, 0xd0, 0x12, 
+-	0x20, 0x4c, 0x43, 0x68, 0x19, 0xc0, 0x6b, 0x00, 
+-	0x23, 0x01, 0x02, 0x9b, 0x43, 0x98, 0x1c, 0x02, 
+-	0x20, 0x4c, 0x43, 0x68, 0x19, 0xc0, 0x6a, 0xc0, 
+-	0x23, 0x01, 0x02, 0x9b, 0x43, 0x98, 0x1c, 0x01, 
+-	0x48, 0x79, 0xf0, 0x00, 0xfa, 0xd5, 0xe7, 0xdf, 
+-	0x1c, 0x25, 0x2d, 0x11, 0xdb, 0x02, 0xe0, 0x50, 
+-	0x35, 0x01, 0xe7, 0xfa, 0x20, 0x4c, 0x43, 0x68, 
+-	0x19, 0xc0, 0x38, 0xff, 0x38, 0xff, 0x38, 0x02, 
+-	0x69, 0x80, 0x21, 0x4c, 0x43, 0x69, 0x19, 0xc9, 
+-	0x39, 0xff, 0x39, 0xff, 0x39, 0x02, 0x69, 0xc9, 
+-	0x42, 0x88, 0xd0, 0x18, 0x20, 0x4c, 0x43, 0x68, 
+-	0x19, 0xc0, 0x38, 0xff, 0x38, 0xff, 0x38, 0x02, 
+-	0x69, 0xc0, 0x23, 0x01, 0x02, 0x9b, 0x43, 0x98, 
+-	0x1c, 0x02, 0x20, 0x4c, 0x43, 0x68, 0x19, 0xc0, 
+-	0x38, 0xff, 0x38, 0xff, 0x38, 0x02, 0x69, 0x80, 
+-	0x23, 0x01, 0x02, 0x9b, 0x43, 0x98, 0x1c, 0x01, 
+-	0x48, 0x61, 0xf0, 0x00, 0xfa, 0x77, 0x20, 0x4c, 
+-	0x43, 0x68, 0x19, 0xc0, 0x6a, 0xc0, 0x21, 0x4c, 
+-	0x43, 0x69, 0x19, 0xc9, 0x6b, 0x09, 0x42, 0x88, 
+-	0xd0, 0x12, 0x20, 0x4c, 0x43, 0x68, 0x19, 0xc0, 
+-	0x6b, 0x00, 0x23, 0x01, 0x02, 0x9b, 0x43, 0x98, 
+-	0x1c, 0x02, 0x20, 0x4c, 0x43, 0x68, 0x19, 0xc0, 
+-	0x6a, 0xc0, 0x23, 0x01, 0x02, 0x9b, 0x43, 0x98, 
+-	0x1c, 0x01, 0x48, 0x53, 0xf0, 0x00, 0xfa, 0x88, 
+-	0x20, 0x4c, 0x43, 0x68, 0xe0, 0x00, 0xe0, 0x29, 
+-	0x19, 0xc0, 0x30, 0x34, 0xf7, 0xff, 0xfa, 0x6c, 
+-	0xe7, 0xae, 0x25, 0x0a, 0x2d, 0x11, 0xdb, 0x02, 
+-	0xe0, 0x1f, 0x35, 0x01, 0xe7, 0xfa, 0x20, 0x4c, 
+-	0x43, 0x68, 0x19, 0xc0, 0x6a, 0xc0, 0x21, 0x4c, 
+-	0x43, 0x69, 0x19, 0xc9, 0x6b, 0x09, 0x42, 0x88, 
+-	0xd0, 0x12, 0x20, 0x4c, 0x43, 0x68, 0x19, 0xc0, 
+-	0x6b, 0x00, 0x23, 0x01, 0x02, 0x9b, 0x43, 0x98, 
+-	0x1c, 0x02, 0x20, 0x4c, 0x43, 0x68, 0x19, 0xc0, 
+-	0x6a, 0xc0, 0x23, 0x01, 0x02, 0x9b, 0x43, 0x98, 
+-	0x1c, 0x01, 0x48, 0x3d, 0xf0, 0x00, 0xfa, 0x2e, 
+-	0xe7, 0xdf, 0xe1, 0x29, 0x3c, 0x07, 0x1c, 0x25, 
+-	0x2d, 0x07, 0xdb, 0x02, 0xe0, 0x2f, 0x35, 0x01, 
+-	0xe7, 0xfa, 0x00, 0xa8, 0x19, 0x40, 0x00, 0xc0, 
+-	0x19, 0xc0, 0x23, 0x0b, 0x01, 0xdb, 0x18, 0xc0, 
+-	0x68, 0x00, 0x00, 0xa9, 0x19, 0x49, 0x00, 0xc9, 
+-	0x19, 0xc9, 0x23, 0x0b, 0x01, 0xdb, 0x18, 0xc9, 
+-	0x68, 0x49, 0x42, 0x88, 0xd0, 0x1a, 0x00, 0xa8, 
+-	0x19, 0x40, 0x00, 0xc0, 0x19, 0xc0, 0x23, 0x0b, 
+-	0x01, 0xdb, 0x18, 0xc0, 0x68, 0x40, 0x23, 0x01, 
+-	0x02, 0x9b, 0x43, 0x98, 0x1c, 0x02, 0x00, 0xa8, 
+-	0x19, 0x40, 0x00, 0xc0, 0x19, 0xc0, 0x23, 0x0b, 
+-	0x01, 0xdb, 0x18, 0xc0, 0x68, 0x00, 0x23, 0x01, 
+-	0x02, 0x9b, 0x43, 0x98, 0x1c, 0x01, 0x48, 0x22, 
+-	0xf0, 0x00, 0xfa, 0x26, 0xe7, 0xcf, 0x25, 0x00, 
+-	0x42, 0xa5, 0xd3, 0x02, 0xe0, 0x1f, 0x35, 0x01, 
+-	0xe7, 0xfa, 0x20, 0x4c, 0x43, 0x68, 0x19, 0xc0, 
+-	0x6a, 0xc0, 0x21, 0x4c, 0x43, 0x69, 0x19, 0xc9, 
+-	0x6b, 0x09, 0x42, 0x88, 0xd0, 0x12, 0x20, 0x4c, 
+-	0x43, 0x68, 0x19, 0xc0, 0x6b, 0x00, 0x23, 0x01, 
+-	0x02, 0x9b, 0x43, 0x98, 0x1c, 0x02, 0x20, 0x4c, 
+-	0x43, 0x68, 0x19, 0xc0, 0x6a, 0xc0, 0x23, 0x01, 
+-	0x02, 0x9b, 0x43, 0x98, 0x1c, 0x01, 0x48, 0x10, 
+-	0xf0, 0x00, 0xfa, 0x02, 0xe7, 0xdf, 0x1c, 0x25, 
+-	0x2d, 0x07, 0xdb, 0x02, 0xe0, 0x55, 0x35, 0x01, 
+-	0xe7, 0xfa, 0x00, 0xa8, 0x19, 0x40, 0x00, 0xc0, 
+-	0x19, 0xc0, 0x23, 0x0b, 0x01, 0xdb, 0x18, 0xc0, 
+-	0x68, 0x00, 0x00, 0xa9, 0x19, 0x49, 0x00, 0xc9, 
+-	0x19, 0xc9, 0x23, 0x0b, 0x01, 0xdb, 0x18, 0xc9, 
+-	0x68, 0x49, 0x42, 0x88, 0xd0, 0x1d, 0x00, 0xa8, 
+-	0x19, 0x40, 0x00, 0xc0, 0x19, 0xc0, 0xe0, 0x01, 
+-	0x2e, 0x08, 0x7d, 0x94, 0x23, 0x0b, 0x01, 0xdb, 
+-	0x18, 0xc0, 0x68, 0x40, 0x23, 0x01, 0x02, 0x9b, 
+-	0x43, 0x98, 0x1c, 0x02, 0x00, 0xa8, 0x19, 0x40, 
+-	0x00, 0xc0, 0x19, 0xc0, 0x23, 0x0b, 0x01, 0xdb, 
+-	0x18, 0xc0, 0x68, 0x00, 0x23, 0x01, 0x02, 0x9b, 
+-	0x43, 0x98, 0x1c, 0x01, 0x48, 0x50, 0xf0, 0x00, 
+-	0xf9, 0x9d, 0x20, 0x4c, 0x43, 0x68, 0x19, 0xc0, 
+-	0x6a, 0xc0, 0x21, 0x4c, 0x43, 0x69, 0x19, 0xc9, 
+-	0x6b, 0x09, 0x42, 0x88, 0xd0, 0x12, 0x20, 0x4c, 
+-	0x43, 0x68, 0x19, 0xc0, 0x6b, 0x00, 0x23, 0x01, 
+-	0x02, 0x9b, 0x43, 0x98, 0x1c, 0x02, 0x20, 0x4c, 
+-	0x43, 0x68, 0x19, 0xc0, 0x6a, 0xc0, 0x23, 0x01, 
+-	0x02, 0x9b, 0x43, 0x98, 0x1c, 0x01, 0x48, 0x42, 
+-	0xf0, 0x00, 0xf9, 0xae, 0x20, 0x4c, 0x43, 0x68, 
+-	0x19, 0xc0, 0x30, 0x34, 0xf7, 0xff, 0xf9, 0x94, 
+-	0xe7, 0xa9, 0x25, 0x07, 0x2d, 0x11, 0xdb, 0x02, 
+-	0xe0, 0x4e, 0x35, 0x01, 0xe7, 0xfa, 0x20, 0x4c, 
+-	0x43, 0x68, 0x19, 0xc0, 0x38, 0xff, 0x38, 0xff, 
+-	0x38, 0x02, 0x69, 0x80, 0x21, 0x4c, 0x43, 0x69, 
+-	0x19, 0xc9, 0x39, 0xff, 0x39, 0xff, 0x39, 0x02, 
+-	0x69, 0xc9, 0x42, 0x88, 0xd0, 0x18, 0x20, 0x4c, 
+-	0x43, 0x68, 0x19, 0xc0, 0x38, 0xff, 0x38, 0xff, 
+-	0x38, 0x02, 0x69, 0xc0, 0x23, 0x01, 0x02, 0x9b, 
+-	0x43, 0x98, 0x1c, 0x02, 0x20, 0x4c, 0x43, 0x68, 
+-	0x19, 0xc0, 0x38, 0xff, 0x38, 0xff, 0x38, 0x02, 
+-	0x69, 0x80, 0x23, 0x01, 0x02, 0x9b, 0x43, 0x98, 
+-	0x1c, 0x01, 0x48, 0x27, 0xf0, 0x00, 0xf9, 0x4a, 
+-	0x20, 0x4c, 0x43, 0x68, 0x19, 0xc0, 0x6a, 0xc0, 
+-	0x21, 0x4c, 0x43, 0x69, 0x19, 0xc9, 0x6b, 0x09, 
+-	0x42, 0x88, 0xd0, 0x12, 0x20, 0x4c, 0x43, 0x68, 
+-	0x19, 0xc0, 0x6b, 0x00, 0x23, 0x01, 0x02, 0x9b, 
+-	0x43, 0x98, 0x1c, 0x02, 0x20, 0x4c, 0x43, 0x68, 
+-	0x19, 0xc0, 0x6a, 0xc0, 0x23, 0x01, 0x02, 0x9b, 
+-	0x43, 0x98, 0x1c, 0x01, 0x48, 0x18, 0xf0, 0x00, 
+-	0xf9, 0x5b, 0x20, 0x4c, 0x43, 0x68, 0x19, 0xc0, 
+-	0x30, 0x34, 0xf7, 0xff, 0xf9, 0x41, 0xe7, 0xb0, 
+-	0x25, 0x0a, 0x2d, 0x11, 0xdb, 0x02, 0xe0, 0x1f, 
+-	0x35, 0x01, 0xe7, 0xfa, 0x20, 0x4c, 0x43, 0x68, 
+-	0x19, 0xc0, 0x6a, 0xc0, 0x21, 0x4c, 0x43, 0x69, 
+-	0x19, 0xc9, 0x6b, 0x09, 0x42, 0x88, 0xd0, 0x12, 
+-	0x20, 0x4c, 0x43, 0x68, 0x19, 0xc0, 0x6b, 0x00, 
+-	0x23, 0x01, 0x02, 0x9b, 0x43, 0x98, 0x1c, 0x02, 
+-	0x20, 0x4c, 0x43, 0x68, 0x19, 0xc0, 0x6a, 0xc0, 
+-	0x23, 0x01, 0x02, 0x9b, 0x43, 0x98, 0x1c, 0x01, 
+-	0x48, 0x03, 0xf0, 0x00, 0xf9, 0x03, 0xe7, 0xdf, 
+-	0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x7d, 0x94, 0xb4, 0x90, 0x1c, 0x02, 
+-	0x1c, 0x0f, 0x3a, 0x01, 0x2f, 0x01, 0xd1, 0x0d, 
+-	0x09, 0x50, 0x00, 0x80, 0x49, 0x0d, 0x58, 0x08, 
+-	0x06, 0xd4, 0x0e, 0xe4, 0x21, 0x01, 0x40, 0xa1, 
+-	0x43, 0x08, 0x09, 0x51, 0x00, 0x89, 0x4b, 0x09, 
+-	0x50, 0x58, 0xe0, 0x0d, 0x09, 0x50, 0x00, 0x80, 
+-	0x49, 0x06, 0x58, 0x08, 0x06, 0xd4, 0x0e, 0xe4, 
+-	0x21, 0x01, 0x40, 0xa1, 0x43, 0xc9, 0x40, 0x01, 
+-	0x09, 0x50, 0x00, 0x80, 0x4b, 0x01, 0x50, 0x19, 
+-	0xbc, 0x90, 0x47, 0x70, 0x2e, 0x08, 0x94, 0x8c, 
+-	0xb4, 0x80, 0x1c, 0x01, 0x39, 0x01, 0x09, 0x48, 
+-	0x00, 0x80, 0x4a, 0x08, 0x58, 0x10, 0x06, 0xca, 
+-	0x0e, 0xd2, 0x27, 0x01, 0x40, 0x97, 0x1c, 0x3b, 
+-	0x40, 0x18, 0xd0, 0x03, 0x20, 0x01, 0xbc, 0x80, 
+-	0x47, 0x70, 0xe0, 0x01, 0x20, 0x00, 0xe7, 0xfa, 
+-	0xe7, 0xf9, 0x00, 0x00, 0x2e, 0x08, 0x94, 0x8c, 
+-	0xb4, 0xf0, 0x1c, 0x07, 0x1c, 0x0a, 0x68, 0x54, 
+-	0x6a, 0xf8, 0x05, 0x86, 0x0d, 0xb6, 0x2c, 0x07, 
+-	0xda, 0x01, 0x1c, 0x20, 0xe0, 0x00, 0x20, 0x07, 
+-	0x1c, 0x05, 0x21, 0x00, 0x42, 0xa9, 0xd3, 0x02, 
+-	0xe0, 0x15, 0x31, 0x01, 0xe7, 0xfa, 0x00, 0x88, 
+-	0x18, 0x40, 0x00, 0xc0, 0x18, 0x80, 0x23, 0x05, 
+-	0x02, 0x1b, 0x18, 0xc0, 0x6f, 0xc0, 0x42, 0xb0, 
+-	0xd1, 0x08, 0x00, 0x88, 0x18, 0x40, 0x00, 0xc0, 
+-	0x18, 0x80, 0x23, 0x2b, 0x01, 0x5b, 0x18, 0xc0, 
+-	0xbc, 0xf0, 0x47, 0x70, 0xe7, 0xe9, 0x1f, 0xe0, 
+-	0x28, 0x11, 0xda, 0x01, 0x1f, 0xe0, 0xe0, 0x00, 
+-	0x20, 0x11, 0x1c, 0x05, 0x21, 0x00, 0x42, 0xa9, 
+-	0xd3, 0x02, 0xe0, 0x0d, 0x31, 0x01, 0xe7, 0xfa, 
+-	0x20, 0x4c, 0x43, 0x48, 0x18, 0x80, 0x6a, 0x80, 
+-	0x42, 0xb0, 0xd1, 0x04, 0x20, 0x4c, 0x43, 0x48, 
+-	0x18, 0x80, 0x30, 0x0c, 0xe7, 0xe4, 0xe7, 0xf1, 
+-	0x20, 0x00, 0xe7, 0xe1, 0xe7, 0xe0, 0xb5, 0x90, 
+-	0x48, 0x07, 0x68, 0x04, 0x48, 0x07, 0x68, 0x07, 
+-	0x1c, 0x39, 0x1c, 0x20, 0x4a, 0x06, 0x68, 0x13, 
+-	0x22, 0xf3, 0x00, 0xd2, 0xf0, 0x00, 0xf9, 0xca, 
+-	0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x7d, 0xb4, 0x2e, 0x08, 0x7d, 0xb8, 
+-	0x2e, 0x08, 0x94, 0x90, 0xb4, 0xf0, 0x1c, 0x01, 
+-	0xb0, 0x83, 0x22, 0x00, 0x68, 0x4b, 0x2b, 0x07, 
+-	0xdd, 0x01, 0x23, 0x07, 0xe0, 0x00, 0x68, 0x4b, 
+-	0x1c, 0x1c, 0x23, 0x00, 0x43, 0xdb, 0x93, 0x02, 
+-	0x23, 0x00, 0x43, 0xdb, 0x93, 0x01, 0x23, 0x00, 
+-	0x93, 0x00, 0x4b, 0x17, 0x68, 0x1b, 0x2b, 0x00, 
+-	0xd0, 0x07, 0x4b, 0x15, 0x68, 0x1b, 0x6a, 0xdb, 
+-	0x93, 0x02, 0x4b, 0x13, 0x68, 0x1b, 0x6b, 0x5b, 
+-	0x93, 0x01, 0x20, 0x00, 0x42, 0xa0, 0xd3, 0x02, 
+-	0xe0, 0x16, 0x30, 0x01, 0xe7, 0xfa, 0x00, 0x83, 
+-	0x18, 0x1b, 0x00, 0xdb, 0x18, 0x5d, 0x23, 0x05, 
+-	0x02, 0x1b, 0x18, 0xeb, 0x6e, 0x9f, 0x04, 0x3b, 
+-	0x0c, 0x1b, 0xd0, 0x08, 0x0c, 0x3b, 0x04, 0x1b, 
+-	0xd0, 0x05, 0x9b, 0x00, 0x18, 0xc5, 0x26, 0x01, 
+-	0x40, 0xae, 0x1c, 0x33, 0x43, 0x1a, 0xe7, 0xe8, 
+-	0x23, 0x0d, 0x01, 0xdb, 0x18, 0xcb, 0x61, 0xda, 
+-	0xb0, 0x03, 0xbc, 0xf0, 0x47, 0x70, 0x00, 0x00, 
+-	0x2e, 0x08, 0x7c, 0x58, 0xb4, 0x80, 0x1c, 0x01, 
+-	0x20, 0x00, 0x68, 0x0a, 0x42, 0x90, 0xdb, 0x02, 
+-	0xe0, 0x07, 0x30, 0x01, 0xe7, 0xf9, 0x23, 0x00, 
+-	0x43, 0xdb, 0x68, 0x8a, 0x00, 0x87, 0x51, 0xd3, 
+-	0xe7, 0xf7, 0x22, 0x00, 0x43, 0xd2, 0x68, 0x8b, 
+-	0x68, 0x0f, 0x00, 0xbf, 0x51, 0xda, 0x23, 0x00, 
+-	0x43, 0xdb, 0x68, 0x8a, 0x68, 0x0f, 0x00, 0xbf, 
+-	0x19, 0xd2, 0x60, 0x53, 0x22, 0x00, 0x60, 0x4a, 
+-	0xbc, 0x80, 0x47, 0x70, 0xb4, 0xf0, 0x1c, 0x03, 
+-	0x1c, 0x0c, 0x1c, 0x17, 0x68, 0x9a, 0xca, 0x40, 
+-	0x42, 0xa6, 0xd2, 0x00, 0xe7, 0xfb, 0x3a, 0x04, 
+-	0x1c, 0x11, 0xc9, 0x40, 0x42, 0xbe, 0xd2, 0x00, 
+-	0xe7, 0xfb, 0x39, 0x04, 0x68, 0x10, 0x42, 0xa0, 
+-	0xd1, 0x02, 0x68, 0x08, 0x42, 0xb8, 0xd0, 0x02, 
+-	0x20, 0xff, 0xbc, 0xf0, 0x47, 0x70, 0x39, 0x04, 
+-	0x68, 0x98, 0x68, 0x5e, 0x00, 0xb6, 0x19, 0x85, 
+-	0x68, 0x58, 0x38, 0x02, 0x60, 0x58, 0x68, 0x50, 
+-	0x60, 0x10, 0x32, 0x04, 0x42, 0x8a, 0xd3, 0xfa, 
+-	0x68, 0x88, 0x60, 0x08, 0x31, 0x04, 0x42, 0xa9, 
+-	0xd3, 0xfa, 0x20, 0x00, 0xe7, 0xe9, 0xe7, 0xe8, 
+-	0xb4, 0xf0, 0x1c, 0x03, 0x1c, 0x0c, 0x1c, 0x17, 
+-	0x68, 0x58, 0x68, 0x1e, 0x3e, 0x01, 0x42, 0xb0, 
+-	0xdb, 0x02, 0x20, 0xff, 0xbc, 0xf0, 0x47, 0x70, 
+-	0x68, 0x9a, 0xca, 0x40, 0x42, 0xa6, 0xd2, 0x00, 
+-	0xe7, 0xfb, 0x3a, 0x04, 0x1c, 0x15, 0xcd, 0x40, 
+-	0x42, 0xbe, 0xd2, 0x00, 0xe7, 0xfb, 0x68, 0x58, 
+-	0x30, 0x02, 0x60, 0x58, 0x68, 0x98, 0x68, 0x5e, 
+-	0x00, 0xb6, 0x19, 0x80, 0x1f, 0xc1, 0x39, 0x01, 
+-	0x68, 0x08, 0x60, 0x88, 0x39, 0x04, 0x1d, 0xc8, 
+-	0x30, 0x01, 0x42, 0xa8, 0xd8, 0xf8, 0x60, 0x8f, 
+-	0x68, 0x08, 0x60, 0x48, 0x39, 0x04, 0x1d, 0x08, 
+-	0x42, 0x90, 0xd8, 0xf9, 0x60, 0x14, 0x20, 0x00, 
+-	0xe7, 0xd8, 0xe7, 0xd7, 0xb5, 0xf0, 0x1c, 0x07, 
+-	0x1c, 0x0c, 0xb0, 0x81, 0x1c, 0x38, 0x21, 0x00, 
+-	0xf0, 0x0c, 0xff, 0xe0, 0x1c, 0x06, 0x1c, 0x38, 
+-	0x21, 0x01, 0xf0, 0x0c, 0xff, 0xdb, 0x90, 0x00, 
+-	0x1c, 0x31, 0x1c, 0x38, 0xf0, 0x00, 0xf8, 0x50, 
+-	0x49, 0x20, 0x68, 0x09, 0x60, 0x08, 0x99, 0x00, 
+-	0x1c, 0x38, 0xf0, 0x00, 0xf8, 0x49, 0x49, 0x1e, 
+-	0x68, 0x09, 0x60, 0x08, 0x48, 0x1b, 0x68, 0x00, 
+-	0x68, 0x05, 0x48, 0x1c, 0x68, 0x01, 0x23, 0x02, 
+-	0x43, 0xdb, 0x40, 0x19, 0x60, 0x01, 0x2c, 0x00, 
+-	0xd0, 0x0c, 0x48, 0x19, 0x68, 0x00, 0x78, 0x00, 
+-	0x28, 0x00, 0xd0, 0x07, 0x48, 0x14, 0x68, 0x00, 
+-	0x68, 0x05, 0x48, 0x14, 0x68, 0x01, 0x23, 0x02, 
+-	0x43, 0x19, 0x60, 0x01, 0x1c, 0x20, 0x49, 0x13, 
+-	0x68, 0x09, 0x70, 0x08, 0x48, 0x12, 0x63, 0xc5, 
+-	0x20, 0x3f, 0x04, 0x00, 0x40, 0x28, 0x0c, 0x00, 
+-	0x49, 0x10, 0x62, 0x08, 0x20, 0xff, 0x02, 0x00, 
+-	0x40, 0x28, 0x0a, 0x00, 0x49, 0x0d, 0x62, 0x48, 
+-	0x06, 0xa8, 0x0e, 0x80, 0x23, 0x80, 0x43, 0x18, 
+-	0x49, 0x0a, 0x62, 0x88, 0x1c, 0x28, 0xb0, 0x01, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0xb0, 0x01, 
+-	0xe7, 0xfa, 0x00, 0x00, 0x2e, 0x08, 0x94, 0x9c, 
+-	0x2e, 0x08, 0x94, 0xa0, 0x6a, 0x00, 0x00, 0x18, 
+-	0x2e, 0x08, 0x94, 0xa4, 0x2e, 0x08, 0x94, 0xa8, 
+-	0x68, 0x00, 0x0d, 0x00, 0x72, 0x00, 0x01, 0x00, 
+-	0xb4, 0x80, 0x1c, 0x02, 0x1c, 0x0f, 0x06, 0xb9, 
+-	0x0e, 0x89, 0x20, 0x01, 0x03, 0x80, 0x40, 0x10, 
+-	0x09, 0xc0, 0x43, 0x01, 0x20, 0xf0, 0x40, 0x10, 
+-	0x01, 0x40, 0x43, 0x01, 0x07, 0x10, 0x0f, 0x00, 
+-	0x03, 0x00, 0x43, 0x01, 0x20, 0x07, 0x02, 0xc0, 
+-	0x40, 0x10, 0x01, 0x40, 0x43, 0x01, 0x20, 0x07, 
+-	0x02, 0x00, 0x40, 0x10, 0x02, 0xc0, 0x43, 0x01, 
+-	0x1c, 0x08, 0xbc, 0x80, 0x47, 0x70, 0xe7, 0xfc, 
+-	0xb5, 0xff, 0x1c, 0x05, 0x1c, 0x0c, 0x1c, 0x17, 
+-	0x9b, 0x03, 0x06, 0x18, 0x16, 0x06, 0x20, 0x33, 
+-	0x06, 0x40, 0x6b, 0x80, 0x1c, 0x01, 0x20, 0x04, 
+-	0x40, 0x08, 0xd0, 0x05, 0x20, 0xd0, 0xb0, 0x04, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0xe0, 0x17, 
+-	0x23, 0x04, 0x43, 0xdb, 0x40, 0x19, 0x01, 0x08, 
+-	0x4b, 0x0a, 0x68, 0x1b, 0x18, 0xc2, 0x60, 0x15, 
+-	0x60, 0x54, 0x2e, 0xfe, 0xd0, 0x04, 0x20, 0x01, 
+-	0x40, 0xb0, 0x60, 0xd0, 0x4b, 0x06, 0x43, 0x1f, 
+-	0x60, 0x97, 0x20, 0x01, 0x40, 0x88, 0x23, 0x33, 
+-	0x06, 0x5b, 0x63, 0x58, 0x20, 0x00, 0xe7, 0xe2, 
+-	0xe7, 0xe1, 0x00, 0x00, 0x2e, 0x08, 0x20, 0x0c, 
+-	0x80, 0x00, 0x00, 0x00, 0xb4, 0xb0, 0x1c, 0x01, 
+-	0x06, 0x08, 0x16, 0x04, 0x4f, 0x0c, 0x22, 0x00, 
+-	0x20, 0x00, 0x28, 0x04, 0xd3, 0x02, 0xe0, 0x0b, 
+-	0x30, 0x01, 0xe7, 0xfa, 0x01, 0x03, 0x19, 0xdb, 
+-	0x68, 0x5b, 0x42, 0xa3, 0xd1, 0x03, 0x25, 0x01, 
+-	0x40, 0x85, 0x1c, 0x2b, 0x43, 0x1a, 0xe7, 0xf3, 
+-	0x23, 0x33, 0x06, 0x5b, 0x6c, 0x1b, 0x40, 0x13, 
+-	0xd0, 0x00, 0xe7, 0xf9, 0xbc, 0xb0, 0x47, 0x70, 
+-	0x9e, 0x00, 0x00, 0xc0, 0xe3, 0xa0, 0x14, 0x62, 
+-	0xe5, 0x91, 0x10, 0x14, 0xe2, 0x01, 0x00, 0xff, 
+-	0xe5, 0x9f, 0x10, 0x2c, 0xe5, 0xd1, 0x10, 0x00, 
+-	0xe3, 0x51, 0x00, 0xff, 0x0a, 0x00, 0x00, 0x05, 
+-	0xe5, 0x9f, 0x10, 0x1c, 0xe5, 0xd1, 0x10, 0x00, 
+-	0xe3, 0xa0, 0x20, 0x01, 0xe1, 0xa0, 0x11, 0x12, 
+-	0xe3, 0xa0, 0x24, 0x66, 0xe5, 0x82, 0x10, 0x10, 
+-	0xe3, 0xa0, 0x14, 0x62, 0xe5, 0x81, 0x00, 0x14, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0x2e, 0x08, 0x7c, 0x48, 
+-	0x47, 0x00, 0x00, 0x00, 0x47, 0x08, 0x00, 0x00, 
+-	0x47, 0x10, 0x00, 0x00, 0x47, 0x18, 0x00, 0x00, 
+-	0x47, 0x20, 0x00, 0x00, 0x47, 0x28, 0x00, 0x00, 
+-	0x47, 0x30, 0x00, 0x00, 0x47, 0x38, 0x00, 0x00, 
+-	0x17, 0xcb, 0x40, 0x59, 0x1a, 0xc9, 0x17, 0xc2, 
+-	0x40, 0x50, 0x1a, 0x80, 0xd1, 0x01, 0xf0, 0x00, 
+-	0xfa, 0x07, 0xb4, 0x0c, 0x08, 0x4b, 0x1c, 0x02, 
+-	0x42, 0x9a, 0xd8, 0x00, 0x00, 0x52, 0xd3, 0xfb, 
+-	0x23, 0x00, 0xe0, 0x00, 0x08, 0x52, 0x42, 0x91, 
+-	0x41, 0x5b, 0x42, 0x91, 0xd3, 0x00, 0x1a, 0x89, 
+-	0x42, 0x82, 0xd1, 0xf7, 0x1c, 0x18, 0xbc, 0x0c, 
+-	0x40, 0x5a, 0x40, 0x50, 0x1a, 0x80, 0x40, 0x59, 
+-	0x1a, 0xc9, 0x47, 0x70, 0x08, 0x4b, 0x1c, 0x02, 
+-	0xd1, 0x01, 0xf0, 0x00, 0xf9, 0xe9, 0x42, 0x9a, 
+-	0xd8, 0x00, 0x00, 0x52, 0xd3, 0xfb, 0x23, 0x00, 
+-	0xe0, 0x00, 0x08, 0x52, 0x42, 0x91, 0x41, 0x5b, 
+-	0x42, 0x91, 0xd3, 0x00, 0x1a, 0x89, 0x42, 0x82, 
+-	0xd1, 0xf7, 0x1c, 0x18, 0x47, 0x70, 0x00, 0x00, 
+-	0x3a, 0x20, 0xd5, 0x09, 0x42, 0x53, 0x32, 0x20, 
+-	0x40, 0xd0, 0x46, 0x94, 0x1c, 0x0a, 0x40, 0x9a, 
+-	0x43, 0x10, 0x46, 0x62, 0x40, 0xd1, 0x47, 0x70, 
+-	0x1c, 0x08, 0x40, 0xd0, 0x21, 0x00, 0x47, 0x70, 
+-	0x40, 0x10, 0x40, 0x19, 0x47, 0x70, 0x00, 0x00, 
+-	0x47, 0x70, 0x00, 0x00, 0x1a, 0x43, 0x42, 0x93, 
+-	0xd3, 0x30, 0x46, 0x84, 0x07, 0x8b, 0xd0, 0x07, 
+-	0x1e, 0x52, 0xd3, 0x29, 0x78, 0x0b, 0x70, 0x03, 
+-	0x1c, 0x40, 0x1c, 0x49, 0x07, 0x8b, 0xd1, 0xf7, 
+-	0x07, 0x83, 0xd1, 0x17, 0x3a, 0x10, 0xd3, 0x05, 
+-	0xb4, 0xb0, 0xc9, 0xb8, 0xc0, 0xb8, 0x3a, 0x10, 
+-	0xd2, 0xfb, 0xbc, 0xb0, 0x32, 0x0c, 0xd3, 0x0f, 
+-	0xc9, 0x08, 0xc0, 0x08, 0x1f, 0x12, 0xd2, 0xfb, 
+-	0xe0, 0x0a, 0xc9, 0x08, 0x70, 0xc3, 0x0a, 0x1b, 
+-	0x70, 0x83, 0x0a, 0x1b, 0x70, 0x43, 0x0a, 0x1b, 
+-	0x70, 0x03, 0x1d, 0x00, 0x1f, 0x12, 0xd2, 0xf4, 
+-	0x1c, 0xd2, 0xd3, 0x05, 0x78, 0x0b, 0x70, 0x03, 
+-	0x1c, 0x49, 0x1c, 0x40, 0x1e, 0x52, 0xd2, 0xf9, 
+-	0x46, 0x60, 0x47, 0x70, 0x1c, 0x03, 0x43, 0x0b, 
+-	0x43, 0x13, 0x07, 0x9b, 0xd1, 0x04, 0x1f, 0x12, 
+-	0x58, 0x8b, 0x50, 0x83, 0xd1, 0xfb, 0x47, 0x70, 
+-	0x1e, 0x52, 0x5c, 0x8b, 0x54, 0x83, 0xd1, 0xfb, 
+-	0x47, 0x70, 0x00, 0x00, 0x42, 0x41, 0x46, 0x8c, 
+-	0x07, 0x83, 0xd0, 0x05, 0x78, 0x03, 0x2b, 0x00, 
+-	0xd0, 0x16, 0x1c, 0x40, 0x07, 0x83, 0xd1, 0xf9, 
+-	0x49, 0x0a, 0xc8, 0x04, 0x09, 0xc9, 0x1a, 0x53, 
+-	0x43, 0x93, 0x01, 0xc9, 0x40, 0x0b, 0xd0, 0xf8, 
+-	0x1f, 0x00, 0x0e, 0x13, 0xd0, 0x08, 0x1c, 0x40, 
+-	0x02, 0x13, 0x0e, 0x1b, 0xd0, 0x04, 0x1c, 0x40, 
+-	0x04, 0x13, 0x0e, 0x1b, 0xd0, 0x00, 0x1c, 0x40, 
+-	0x44, 0x60, 0x47, 0x70, 0x80, 0x80, 0x80, 0x80, 
+-	0x46, 0x84, 0x07, 0x83, 0xd0, 0x05, 0x1e, 0x52, 
+-	0xd3, 0x12, 0x70, 0x01, 0x1c, 0x40, 0x07, 0x83, 
+-	0xd1, 0xf9, 0x3a, 0x08, 0xd3, 0x07, 0x02, 0x0b, 
+-	0x43, 0x19, 0x04, 0x0b, 0x43, 0x19, 0x1c, 0x0b, 
+-	0xc0, 0x0a, 0x3a, 0x08, 0xd2, 0xfc, 0x1d, 0xd2, 
+-	0xd3, 0x02, 0x54, 0x81, 0x1e, 0x52, 0xd2, 0xfc, 
+-	0x46, 0x60, 0x47, 0x70, 0x46, 0x84, 0x1c, 0x03, 
+-	0x43, 0x0b, 0x07, 0x9b, 0xd1, 0x15, 0x1f, 0x12, 
+-	0xd3, 0x0b, 0xb4, 0xb0, 0x4c, 0x10, 0x01, 0xe5, 
+-	0xc9, 0x80, 0x1b, 0x3b, 0x43, 0xbb, 0x40, 0x2b, 
+-	0xd1, 0x0f, 0xc0, 0x80, 0x1f, 0x12, 0xd2, 0xf7, 
+-	0xbc, 0xb0, 0x1c, 0xd2, 0xd3, 0x11, 0x78, 0x0b, 
+-	0x70, 0x03, 0x1c, 0x49, 0x1c, 0x40, 0x2b, 0x00, 
+-	0xd0, 0x09, 0x1e, 0x52, 0xd2, 0xf7, 0x46, 0x60, 
+-	0x47, 0x70, 0xbc, 0xb0, 0x1f, 0x09, 0x1c, 0xd2, 
+-	0xe7, 0xf1, 0x70, 0x03, 0x1c, 0x40, 0x1e, 0x52, 
+-	0xd2, 0xfb, 0x46, 0x60, 0x47, 0x70, 0x00, 0x00, 
+-	0x01, 0x01, 0x01, 0x01, 0x1c, 0x02, 0x43, 0x0a, 
+-	0x07, 0x92, 0xd1, 0x13, 0x46, 0x84, 0xb4, 0x30, 
+-	0x4c, 0x0c, 0x01, 0xe5, 0xe0, 0x00, 0xc0, 0x04, 
+-	0xc9, 0x04, 0x1b, 0x13, 0x43, 0x93, 0x40, 0x2b, 
+-	0xd0, 0xf9, 0xe0, 0x01, 0x02, 0x12, 0x1c, 0x40, 
+-	0x0e, 0x13, 0x70, 0x03, 0xd1, 0xfa, 0xbc, 0x30, 
+-	0x46, 0x60, 0x47, 0x70, 0x1c, 0x03, 0x78, 0x0a, 
+-	0x70, 0x1a, 0x1c, 0x49, 0x1c, 0x5b, 0x2a, 0x00, 
+-	0xd1, 0xf9, 0x47, 0x70, 0x01, 0x01, 0x01, 0x01, 
+-	0xb5, 0x80, 0x00, 0x43, 0x15, 0x5f, 0x43, 0xff, 
+-	0x1c, 0x02, 0x0f, 0xc0, 0x07, 0xc0, 0x2f, 0x00, 
+-	0xd0, 0x15, 0x43, 0x0b, 0xd0, 0x0c, 0x28, 0x00, 
+-	0xd1, 0x07, 0x1c, 0x10, 0xf0, 0x00, 0xf9, 0x00, 
+-	0xf0, 0x00, 0xf9, 0x9a, 0xbc, 0x80, 0xbc, 0x08, 
+-	0x47, 0x18, 0x21, 0x01, 0x1c, 0x10, 0xe0, 0x11, 
+-	0x21, 0x01, 0x07, 0xc8, 0xf0, 0x00, 0xfa, 0x98, 
+-	0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 0x03, 0x13, 
+-	0x43, 0x0b, 0xd1, 0x05, 0x28, 0x00, 0xd1, 0x03, 
+-	0x1c, 0x10, 0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 
+-	0x21, 0x01, 0x07, 0xc8, 0xf0, 0x00, 0xfa, 0x82, 
+-	0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x46, 0xbc, 0xb4, 0x60, 0x1c, 0x03, 0x43, 0x08, 
+-	0x07, 0x80, 0xd1, 0x1b, 0x1f, 0x12, 0xd3, 0x0b, 
+-	0x4e, 0x0f, 0xcb, 0x01, 0xc9, 0x80, 0x1b, 0xc0, 
+-	0xd1, 0x09, 0x1b, 0xbd, 0x43, 0xbd, 0x01, 0xf7, 
+-	0x40, 0x3d, 0xd1, 0x04, 0x1f, 0x12, 0xd2, 0xf4, 
+-	0x1c, 0xd2, 0xd3, 0x0e, 0xe0, 0x02, 0x1f, 0x1b, 
+-	0x1f, 0x09, 0x1c, 0xd2, 0x78, 0x18, 0x78, 0x0f, 
+-	0x1b, 0xc0, 0xd1, 0x06, 0x2f, 0x00, 0xd0, 0x04, 
+-	0x1c, 0x5b, 0x1c, 0x49, 0x1e, 0x52, 0xd2, 0xf5, 
+-	0x20, 0x00, 0xbc, 0x60, 0x46, 0x67, 0x47, 0x70, 
+-	0x01, 0x01, 0x01, 0x01, 0x47, 0x78, 0x00, 0x00, 
+-	0xe2, 0x10, 0xc1, 0x02, 0x12, 0x60, 0x00, 0x00, 
+-	0x03, 0x30, 0x00, 0x00, 0x03, 0xa0, 0x10, 0x00, 
+-	0x01, 0x2f, 0xff, 0x1e, 0xe3, 0x8c, 0xc1, 0x01, 
+-	0xe3, 0x8c, 0xc6, 0x1e, 0xe1, 0xb0, 0x28, 0x20, 
+-	0x01, 0xa0, 0x08, 0x00, 0x02, 0x4c, 0xc4, 0x01, 
+-	0xe1, 0xb0, 0x2c, 0x20, 0x01, 0xa0, 0x04, 0x00, 
+-	0x02, 0x4c, 0xc5, 0x02, 0xe1, 0xb0, 0x2e, 0x20, 
+-	0x01, 0xa0, 0x02, 0x00, 0x02, 0x4c, 0xc5, 0x01, 
+-	0xe1, 0xb0, 0x2f, 0x20, 0x01, 0xa0, 0x01, 0x00, 
+-	0x02, 0x4c, 0xc6, 0x02, 0xe1, 0xb0, 0x2f, 0xa0, 
+-	0x01, 0xa0, 0x00, 0x80, 0x02, 0x4c, 0xc6, 0x01, 
+-	0xe1, 0xa0, 0x00, 0x80, 0xe1, 0xa0, 0x1a, 0x00, 
+-	0xe1, 0x8c, 0x06, 0x20, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0x22, 0x01, 0x07, 0xd2, 0x40, 0x50, 0x47, 0x70, 
+-	0xe2, 0x20, 0x01, 0x02, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0x00, 0x40, 0x08, 0x40, 0x47, 0x70, 0x00, 0x00, 
+-	0x47, 0x78, 0x00, 0x00, 0xe3, 0xa0, 0xc4, 0xff, 
+-	0xe3, 0x8c, 0xc6, 0x0e, 0xe1, 0x5c, 0x00, 0x82, 
+-	0x9a, 0x00, 0x00, 0x0a, 0xe1, 0xb0, 0x00, 0x80, 
+-	0x03, 0x31, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x0a, 
+-	0x3a, 0x00, 0x00, 0x12, 0xe1, 0x50, 0x00, 0x0c, 
+-	0x03, 0x51, 0x00, 0x00, 0x8a, 0x00, 0x01, 0x0c, 
+-	0xe1, 0xb0, 0x20, 0x82, 0x8a, 0x00, 0x00, 0x18, 
+-	0xe3, 0xa0, 0x00, 0x01, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0x03, 0x53, 0x00, 0x00, 0x0a, 0xff, 0xff, 0xf2, 
+-	0xea, 0x00, 0x01, 0x09, 0xe1, 0x50, 0x00, 0x0c, 
+-	0x03, 0x51, 0x00, 0x00, 0x8a, 0x00, 0x01, 0x02, 
+-	0xe1, 0xb0, 0x20, 0x82, 0x33, 0xa0, 0x00, 0x01, 
+-	0x23, 0xa0, 0x00, 0x00, 0x03, 0x33, 0x00, 0x00, 
+-	0x03, 0xa0, 0x00, 0x00, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0xe1, 0x50, 0x00, 0x0c, 0x03, 0x51, 0x00, 0x00, 
+-	0x8a, 0x00, 0x00, 0xf9, 0xe1, 0xb0, 0x20, 0x82, 
+-	0x23, 0xa0, 0x00, 0x00, 0x21, 0x2f, 0xff, 0x1e, 
+-	0xe1, 0x50, 0x00, 0x02, 0x01, 0x51, 0x00, 0x03, 
+-	0x33, 0xa0, 0x00, 0x01, 0x23, 0xa0, 0x00, 0x00, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0xe1, 0x50, 0x00, 0x02, 
+-	0x01, 0x51, 0x00, 0x03, 0x83, 0xa0, 0x00, 0x01, 
+-	0x93, 0xa0, 0x00, 0x00, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0x47, 0x78, 0x00, 0x00, 0xe5, 0x9f, 0xc0, 0x28, 
+-	0xe8, 0xac, 0x7f, 0xff, 0xe2, 0x8f, 0x00, 0x0c, 
+-	0xe2, 0x4c, 0x10, 0x3c, 0xe2, 0x4e, 0xe0, 0x04, 
+-	0xe5, 0x8c, 0xe0, 0x00, 0xea, 0x00, 0x01, 0x91, 
+-	0x80, 0x00, 0x00, 0x20, 0x44, 0x69, 0x76, 0x69, 
+-	0x64, 0x65, 0x20, 0x62, 0x79, 0x20, 0x7a, 0x65, 
+-	0x72, 0x6f, 0x00, 0x00, 0x2e, 0x08, 0x21, 0x50, 
+-	0xb5, 0xf0, 0xb0, 0x8f, 0xf0, 0x00, 0xfd, 0x01, 
+-	0x1c, 0x04, 0x1c, 0x16, 0x1c, 0x0f, 0xf0, 0x00, 
+-	0xfd, 0x3b, 0x90, 0x03, 0x91, 0x04, 0x92, 0x05, 
+-	0xa3, 0x3e, 0xcb, 0x0c, 0x1c, 0x20, 0x1c, 0x39, 
+-	0xf0, 0x00, 0xfd, 0xae, 0x49, 0x3d, 0x22, 0x00, 
+-	0x4f, 0x3d, 0x28, 0x00, 0xd0, 0x0a, 0x48, 0x3d, 
+-	0xab, 0x03, 0xf0, 0x00, 0xfd, 0xfb, 0x90, 0x0c, 
+-	0x91, 0x0d, 0x92, 0x0e, 0xaa, 0x03, 0xca, 0x07, 
+-	0x1c, 0x3b, 0xe0, 0x08, 0x48, 0x38, 0xab, 0x03, 
+-	0x3e, 0x01, 0xf0, 0x00, 0xfd, 0xef, 0x90, 0x0c, 
+-	0x91, 0x0d, 0x92, 0x0e, 0x1c, 0x3b, 0xf0, 0x00, 
+-	0xfe, 0x03, 0x1c, 0x3b, 0xf0, 0x00, 0xfd, 0xe6, 
+-	0xab, 0x0c, 0xf0, 0x00, 0xfe, 0x17, 0x90, 0x09, 
+-	0x91, 0x0a, 0x92, 0x0b, 0xf0, 0x00, 0xfe, 0x48, 
+-	0x1c, 0x04, 0x1c, 0x15, 0x1c, 0x0f, 0x4a, 0x2d, 
+-	0xb4, 0x04, 0x23, 0x03, 0x1c, 0x2a, 0xf0, 0x00, 
+-	0xfe, 0x5b, 0x90, 0x01, 0x91, 0x02, 0x92, 0x03, 
+-	0xb0, 0x01, 0x4a, 0x29, 0xb4, 0x04, 0x23, 0x03, 
+-	0x1c, 0x20, 0x1c, 0x39, 0x1c, 0x2a, 0xf0, 0x00, 
+-	0xfe, 0x65, 0xb0, 0x01, 0x46, 0x6b, 0xf0, 0x00, 
+-	0xfd, 0xf9, 0xab, 0x09, 0xf0, 0x00, 0xfd, 0xdc, 
+-	0xab, 0x09, 0xf0, 0x00, 0xfd, 0xbf, 0x2e, 0x00, 
+-	0xd0, 0x2c, 0xb0, 0x86, 0xab, 0x0c, 0xc3, 0x07, 
+-	0x1c, 0x30, 0xf0, 0x00, 0xfe, 0x69, 0x1c, 0x0c, 
+-	0x1c, 0x05, 0x1c, 0x17, 0x4b, 0x1b, 0x1c, 0x1e, 
+-	0xf0, 0x00, 0xfd, 0xca, 0x90, 0x03, 0x91, 0x04, 
+-	0x92, 0x05, 0xab, 0x0c, 0xf0, 0x00, 0xfd, 0xaa, 
+-	0x90, 0x06, 0x91, 0x07, 0x92, 0x08, 0xab, 0x03, 
+-	0xf0, 0x00, 0xfe, 0x86, 0xab, 0x0c, 0xf0, 0x00, 
+-	0xfe, 0x83, 0x90, 0x00, 0x91, 0x01, 0x92, 0x02, 
+-	0x1c, 0x28, 0x1c, 0x21, 0x1c, 0x3a, 0x1d, 0xf3, 
+-	0x33, 0x05, 0xf0, 0x00, 0xfd, 0xb1, 0x46, 0x6b, 
+-	0xf0, 0x00, 0xfd, 0x94, 0xab, 0x06, 0xf0, 0x00, 
+-	0xfd, 0x91, 0xb0, 0x06, 0xb0, 0x0f, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x3f, 0xe6, 0xa0, 0x9e, 
+-	0x66, 0x7f, 0x3b, 0xcd, 0x80, 0x00, 0x00, 0x00, 
+-	0x2e, 0x03, 0x3b, 0x10, 0x80, 0x00, 0x3f, 0xff, 
+-	0x80, 0x00, 0x3f, 0xfe, 0x2e, 0x03, 0x3a, 0xbc, 
+-	0x2e, 0x03, 0x3a, 0xe0, 0x2e, 0x03, 0x3a, 0xa4, 
+-	0x47, 0x78, 0x00, 0x00, 0xe1, 0xa0, 0x38, 0x80, 
+-	0xe1, 0xa0, 0x38, 0xa3, 0xe1, 0xc0, 0x00, 0x03, 
+-	0xe1, 0xd1, 0xc0, 0x80, 0x5a, 0x00, 0x00, 0x0c, 
+-	0xe2, 0x53, 0x3b, 0x0f, 0x4a, 0x00, 0x00, 0x13, 
+-	0x12, 0x83, 0xc0, 0x01, 0x13, 0x5c, 0x0b, 0x02, 
+-	0xaa, 0x00, 0x00, 0x0d, 0xe1, 0xb0, 0xc5, 0xa2, 
+-	0x2a, 0x00, 0x00, 0x58, 0xe1, 0x80, 0x0a, 0x03, 
+-	0xe3, 0xc1, 0x11, 0x02, 0xe1, 0x80, 0x05, 0xa1, 
+-	0xe1, 0x8c, 0x1a, 0x81, 0xe3, 0xa0, 0x30, 0x00, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0xe3, 0x10, 0x01, 0x01, 
+-	0x1a, 0x00, 0x00, 0x40, 0xe2, 0x00, 0x01, 0x02, 
+-	0xe3, 0xa0, 0x10, 0x00, 0xe3, 0xa0, 0x30, 0x00, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0xe3, 0x33, 0x00, 0x00, 
+-	0x13, 0xa0, 0x33, 0x19, 0x11, 0x2f, 0xff, 0x1e, 
+-	0xe2, 0x93, 0x30, 0x34, 0x0a, 0x00, 0x00, 0x31, 
+-	0x42, 0x00, 0x01, 0x02, 0x43, 0xa0, 0x10, 0x00, 
+-	0x43, 0xa0, 0x30, 0x00, 0x41, 0x2f, 0xff, 0x1e, 
+-	0xe2, 0x53, 0x30, 0x20, 0x0a, 0x00, 0x00, 0x13, 
+-	0xba, 0x00, 0x00, 0x1a, 0xe1, 0xb0, 0xc3, 0x12, 
+-	0x4a, 0x00, 0x00, 0x05, 0xe2, 0x63, 0xc0, 0x20, 
+-	0xe1, 0x80, 0x0c, 0x31, 0xe1, 0xa0, 0x2c, 0x32, 
+-	0xe1, 0x82, 0x13, 0x11, 0xe3, 0xa0, 0x30, 0x00, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0xe1, 0x96, 0xc0, 0x8c, 
+-	0xe2, 0x63, 0xc0, 0x20, 0xe1, 0x80, 0x0c, 0x31, 
+-	0xe1, 0xa0, 0x2c, 0x32, 0xe1, 0x82, 0x13, 0x11, 
+-	0xe3, 0xa0, 0x30, 0x00, 0x03, 0x11, 0x00, 0x01, 
+-	0x01, 0x2f, 0xff, 0x1e, 0xe2, 0x91, 0x10, 0x01, 
+-	0x22, 0x80, 0x00, 0x01, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0xe3, 0xa0, 0x30, 0x00, 0xe3, 0x32, 0x01, 0x02, 
+-	0x41, 0x2f, 0xff, 0x1e, 0x03, 0x11, 0x00, 0x01, 
+-	0x01, 0x2f, 0xff, 0x1e, 0xe2, 0x91, 0x10, 0x01, 
+-	0x22, 0x80, 0x00, 0x01, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0xe2, 0x83, 0x30, 0x20, 0xe1, 0xb0, 0xc3, 0x11, 
+-	0x4a, 0x00, 0x00, 0x04, 0xe2, 0x63, 0xc0, 0x20, 
+-	0xe1, 0xa0, 0x1c, 0x31, 0xe2, 0x00, 0x01, 0x02, 
+-	0xe3, 0xa0, 0x30, 0x00, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0xe3, 0x3c, 0x01, 0x02, 0x01, 0x92, 0xc0, 0x06, 
+-	0xe2, 0x63, 0xc0, 0x20, 0xe1, 0xa0, 0x1c, 0x31, 
+-	0x03, 0x11, 0x00, 0x01, 0x12, 0x81, 0x10, 0x01, 
+-	0xe3, 0xa0, 0x30, 0x00, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0xe3, 0x31, 0x01, 0x02, 0x03, 0x32, 0x00, 0x00, 
+-	0x03, 0xa0, 0x10, 0x00, 0x13, 0xa0, 0x10, 0x01, 
+-	0xe3, 0xa0, 0x30, 0x00, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0xe3, 0x10, 0x02, 0x02, 0x1a, 0x00, 0x00, 0x0b, 
+-	0xe3, 0xa0, 0x30, 0x00, 0xe3, 0x31, 0x00, 0x00, 
+-	0x11, 0xb0, 0x10, 0x81, 0x43, 0xe0, 0x00, 0x00, 
+-	0x41, 0x2f, 0xff, 0x1e, 0x03, 0x32, 0x00, 0x00, 
+-	0x13, 0xa0, 0x34, 0x61, 0x11, 0x2f, 0xff, 0x1e, 
+-	0xe2, 0x00, 0x01, 0x02, 0xe3, 0x80, 0x02, 0x07, 
+-	0xe3, 0x80, 0x06, 0xff, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0xe1, 0xa0, 0x30, 0x00, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0xe3, 0xc1, 0x11, 0x02, 0xe1, 0xa0, 0xcb, 0x02, 
+-	0xe1, 0x9c, 0xc0, 0x06, 0xe2, 0x00, 0xc1, 0x02, 
+-	0xe1, 0xa0, 0x0a, 0x03, 0xe1, 0x80, 0x05, 0xa1, 
+-	0xe1, 0xa0, 0x1a, 0x81, 0xe1, 0x81, 0x15, 0xa2, 
+-	0xe3, 0xa0, 0x30, 0x00, 0x0a, 0x00, 0x00, 0x06, 
+-	0xe2, 0x91, 0x10, 0x01, 0x22, 0x80, 0x00, 0x01, 
+-	0xe2, 0x90, 0x26, 0x01, 0xe1, 0x80, 0x00, 0x0c, 
+-	0x51, 0x2f, 0xff, 0x1e, 0xe3, 0xa0, 0x33, 0x19, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0x03, 0x11, 0x00, 0x01, 
+-	0x01, 0x80, 0x00, 0x0c, 0x01, 0x2f, 0xff, 0x1e, 
+-	0xe2, 0x91, 0x10, 0x01, 0x22, 0x80, 0x00, 0x01, 
+-	0xe2, 0x90, 0x26, 0x01, 0xe1, 0x80, 0x00, 0x0c, 
+-	0x51, 0x2f, 0xff, 0x1e, 0xe3, 0xa0, 0x33, 0x19, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0x47, 0x78, 0x00, 0x00, 
+-	0xe3, 0xa0, 0x20, 0x01, 0xea, 0x00, 0x00, 0x01, 
+-	0x47, 0x78, 0x00, 0x00, 0xe3, 0xa0, 0x20, 0x02, 
+-	0xe2, 0x00, 0x31, 0x02, 0xe5, 0x9f, 0x00, 0x18, 
+-	0xe5, 0x80, 0x20, 0x00, 0xe3, 0x31, 0x00, 0x00, 
+-	0x03, 0xa0, 0x00, 0x00, 0x15, 0x9f, 0x00, 0x0c, 
+-	0x18, 0x90, 0x00, 0x03, 0xe1, 0x80, 0x00, 0x03, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0x2e, 0x08, 0x20, 0xb0, 
+-	0x2e, 0x08, 0x20, 0xbc, 0xe3, 0x10, 0x06, 0x01, 
+-	0x13, 0xa0, 0x00, 0x00, 0x11, 0x2f, 0xff, 0x1e, 
+-	0xea, 0x00, 0x00, 0x0a, 0xe3, 0x12, 0x07, 0x02, 
+-	0x0a, 0x00, 0x00, 0x08, 0xe1, 0x5c, 0x00, 0x80, 
+-	0x83, 0xa0, 0x00, 0x00, 0x81, 0x2f, 0xff, 0x1e, 
+-	0x03, 0x51, 0x00, 0x00, 0x03, 0xa0, 0x00, 0x00, 
+-	0x01, 0x2f, 0xff, 0x1e, 0xe3, 0x10, 0x07, 0x02, 
+-	0x13, 0xa0, 0x00, 0x00, 0x11, 0x2f, 0xff, 0x1e, 
+-	0xe3, 0xa0, 0x35, 0x06, 0xea, 0x00, 0x04, 0xee, 
+-	0xe1, 0x2f, 0xff, 0x1f, 0xea, 0x00, 0x00, 0x3e, 
+-	0xe5, 0x9f, 0x04, 0x5c, 0xe3, 0x50, 0x00, 0x00, 
+-	0x0a, 0x00, 0x00, 0x02, 0xe3, 0xa0, 0x00, 0x20, 
+-	0xe3, 0xa0, 0x10, 0x01, 0xef, 0x12, 0x34, 0x56, 
+-	0xe5, 0x9f, 0x04, 0x48, 0xe3, 0x50, 0x00, 0x00, 
+-	0x0a, 0x00, 0x00, 0x05, 0xe5, 0x90, 0x10, 0x00, 
+-	0xe5, 0x9f, 0x04, 0x3c, 0xe5, 0x90, 0x30, 0x00, 
+-	0xe5, 0x9f, 0x04, 0x38, 0xe5, 0x90, 0xd0, 0x00, 
+-	0xea, 0x00, 0x00, 0x0b, 0xe3, 0xa0, 0x00, 0x16, 
+-	0xe5, 0x9f, 0x44, 0x18, 0xe2, 0x84, 0x20, 0xa8, 
+-	0xe2, 0x84, 0x10, 0xa4, 0xe5, 0x81, 0x20, 0x00, 
+-	0xef, 0x12, 0x34, 0x56, 0xe2, 0x84, 0x00, 0xa8, 
+-	0xe5, 0x90, 0xd0, 0x08, 0xe5, 0x90, 0x30, 0x04, 
+-	0xe5, 0x90, 0x10, 0x00, 0xe3, 0x51, 0x00, 0x00, 
+-	0x05, 0x9f, 0x14, 0x04, 0xe2, 0x8f, 0x00, 0x10, 
+-	0xeb, 0x00, 0x00, 0x36, 0xe5, 0x9f, 0x03, 0xfc, 
+-	0xe5, 0x9f, 0x33, 0xfc, 0xeb, 0x00, 0x00, 0x12, 
+-	0xea, 0x00, 0x00, 0x4e, 0x2e, 0x00, 0x04, 0x04, 
+-	0x2e, 0x03, 0x3b, 0xfc, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0xe9, 0x2d, 0x40, 0x00, 
+-	0xe3, 0x1c, 0x00, 0x01, 0x1a, 0x00, 0x00, 0x03, 
+-	0xe1, 0xa0, 0xe0, 0x0f, 0xe1, 0x2f, 0xff, 0x1c, 
+-	0xe8, 0xbd, 0x40, 0x00, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0xe3, 0x8f, 0xe0, 0x01, 0xe1, 0x2f, 0xff, 0x1c, 
+-	0x47, 0x78, 0x00, 0x00, 0xe8, 0xbd, 0x40, 0x00, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0x1c, 0x02, 0x1c, 0x13, 
+-	0x47, 0x78, 0x00, 0x00, 0xe9, 0x2d, 0x40, 0x00, 
+-	0xe3, 0x13, 0x00, 0x01, 0x1a, 0x00, 0x00, 0x03, 
+-	0xe1, 0xa0, 0xe0, 0x0f, 0xe1, 0x2f, 0xff, 0x13, 
+-	0xe8, 0xbd, 0x40, 0x00, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0xe3, 0x8f, 0xe0, 0x01, 0xe1, 0x2f, 0xff, 0x13, 
+-	0x47, 0x78, 0x00, 0x00, 0xe8, 0xbd, 0x40, 0x00, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0xe5, 0x9f, 0xc0, 0x44, 
+-	0xe8, 0x8c, 0xff, 0xff, 0xe2, 0x8f, 0x00, 0x00, 
+-	0xea, 0x00, 0x0c, 0xac, 0x00, 0x80, 0x0e, 0x09, 
+-	0x54, 0x68, 0x69, 0x73, 0x20, 0x63, 0x6f, 0x64, 
+-	0x65, 0x20, 0x63, 0x61, 0x6e, 0x20, 0x6f, 0x6e, 
+-	0x6c, 0x79, 0x20, 0x72, 0x75, 0x6e, 0x20, 0x6f, 
+-	0x6e, 0x20, 0x61, 0x20, 0x54, 0x68, 0x75, 0x6d, 
+-	0x62, 0x20, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x74, 
+-	0x69, 0x62, 0x6c, 0x65, 0x20, 0x70, 0x72, 0x6f, 
+-	0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x00, 0x00, 
+-	0x2e, 0x08, 0x21, 0x50, 0x47, 0x78, 0x00, 0x00, 
+-	0xe5, 0x9f, 0x73, 0x08, 0xe5, 0x87, 0x00, 0x00, 
+-	0xe2, 0x8f, 0x50, 0xc9, 0xe2, 0x85, 0x5c, 0x02, 
+-	0xe5, 0x87, 0x50, 0x10, 0xe2, 0x8f, 0x50, 0xe9, 
+-	0xe2, 0x85, 0x5c, 0x02, 0xe5, 0x87, 0x50, 0x14, 
+-	0xe1, 0xa0, 0x80, 0x0e, 0xe2, 0x87, 0x00, 0x04, 
+-	0xeb, 0x00, 0x02, 0x39, 0xe9, 0x2d, 0x01, 0x00, 
+-	0xe3, 0xa0, 0x00, 0x00, 0xe5, 0xc7, 0x00, 0x2c, 
+-	0xe2, 0x87, 0x00, 0x04, 0xeb, 0x00, 0x00, 0xce, 
+-	0xe3, 0xa0, 0x40, 0x00, 0xe2, 0x8d, 0x00, 0x04, 
+-	0xe5, 0x97, 0x10, 0x00, 0xe3, 0xa0, 0x30, 0x00, 
+-	0xe5, 0xc7, 0x30, 0x2e, 0xe2, 0x81, 0x30, 0x08, 
+-	0xe8, 0x91, 0x00, 0x06, 0xe5, 0x9f, 0xc2, 0xcc, 
+-	0xeb, 0xff, 0xff, 0xb7, 0xe8, 0xbd, 0x40, 0x00, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0x47, 0x78, 0x00, 0x00, 
+-	0xe3, 0xa0, 0x80, 0x01, 0xea, 0x00, 0x00, 0x01, 
+-	0x47, 0x78, 0x00, 0x00, 0xe3, 0xa0, 0x80, 0x00, 
+-	0xe1, 0xa0, 0x70, 0x00, 0xeb, 0x00, 0x02, 0x31, 
+-	0xe1, 0xa0, 0x00, 0x08, 0xeb, 0x00, 0x00, 0x0d, 
+-	0xe1, 0xa0, 0x20, 0x07, 0xe3, 0x52, 0x00, 0x00, 
+-	0x12, 0x8f, 0x00, 0x08, 0x15, 0x9f, 0x10, 0x00, 
+-	0xeb, 0x00, 0x0c, 0x6d, 0x41, 0x42, 0x45, 0x58, 
+-	0x00, 0x80, 0x0e, 0x06, 0x52, 0x65, 0x74, 0x75, 
+-	0x72, 0x6e, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x20, 
+-	0x74, 0x6f, 0x6f, 0x20, 0x6c, 0x61, 0x72, 0x67, 
+-	0x65, 0x00, 0x00, 0x00, 0xe3, 0xa0, 0x00, 0x00, 
+-	0xe9, 0x2d, 0x40, 0x00, 0xe5, 0x9f, 0x32, 0x60, 
+-	0xeb, 0xff, 0xff, 0xa9, 0xe8, 0xbd, 0x40, 0x00, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0x47, 0x78, 0x00, 0x00, 
+-	0xe5, 0x9f, 0xc2, 0x28, 0xe5, 0xdc, 0x00, 0x2c, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0xe1, 0xa0, 0x30, 0x00, 
+-	0xe5, 0x9f, 0x12, 0x14, 0xe4, 0x81, 0xf0, 0x04, 
+-	0xe8, 0xb3, 0x00, 0x04, 0xe8, 0xa1, 0x00, 0x04, 
+-	0xe4, 0xd3, 0x20, 0x01, 0xe4, 0xc1, 0x20, 0x01, 
+-	0xe3, 0x52, 0x00, 0x00, 0x1a, 0xff, 0xff, 0xfb, 
+-	0xe1, 0xa0, 0xf0, 0x0e, 0x47, 0x78, 0x00, 0x00, 
+-	0xe1, 0xa0, 0x80, 0x01, 0xeb, 0xff, 0xff, 0xf2, 
+-	0xe5, 0x9f, 0x71, 0xe8, 0xe5, 0xd7, 0x20, 0x2f, 
+-	0xe3, 0x52, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x2c, 
+-	0xe3, 0xa0, 0x20, 0x01, 0xe5, 0xc7, 0x20, 0x2f, 
+-	0xeb, 0x00, 0x00, 0x3b, 0xe1, 0xa0, 0x10, 0x08, 
+-	0xeb, 0x00, 0x01, 0xfa, 0xe3, 0x50, 0x00, 0x00, 
+-	0x0a, 0x00, 0x00, 0x1b, 0xe2, 0x88, 0xb0, 0x40, 
+-	0xe9, 0x3b, 0x01, 0xef, 0xe9, 0x2c, 0x01, 0xef, 
+-	0xe9, 0x3b, 0x01, 0xef, 0xe9, 0x2c, 0x01, 0xef, 
+-	0xe5, 0x9f, 0x71, 0xa8, 0xe5, 0x97, 0x40, 0xa0, 
+-	0xe3, 0x84, 0x40, 0x80, 0xe1, 0x21, 0xf0, 0x04, 
+-	0xe1, 0xa0, 0xd0, 0x0c, 0xe1, 0xa0, 0xb0, 0x04, 
+-	0xe5, 0x9f, 0x01, 0x8c, 0xe5, 0x90, 0x00, 0x04, 
+-	0xe1, 0xa0, 0x10, 0x0d, 0xeb, 0x00, 0x02, 0x1a, 
+-	0xe3, 0xa0, 0x10, 0x00, 0xe5, 0xc7, 0x10, 0x2f, 
+-	0xe1, 0xa0, 0x10, 0x0d, 0xe3, 0x54, 0x00, 0x10, 
+-	0x1a, 0x00, 0x00, 0x02, 0xe3, 0xa0, 0x00, 0x17, 
+-	0xef, 0x12, 0x34, 0x56, 0xe3, 0x21, 0xf0, 0x93, 
+-	0xe1, 0xa0, 0x00, 0x00, 0xe2, 0x81, 0xe0, 0x3c, 
+-	0xe9, 0x5e, 0x7f, 0xff, 0xe1, 0xa0, 0x00, 0x00, 
+-	0xe8, 0xde, 0x80, 0x00, 0xe2, 0x8f, 0x00, 0x00, 
+-	0xea, 0x00, 0x0c, 0x2a, 0x00, 0x80, 0x0e, 0x07, 
+-	0x4e, 0x6f, 0x20, 0x53, 0x74, 0x61, 0x63, 0x6b, 
+-	0x20, 0x66, 0x6f, 0x72, 0x20, 0x54, 0x72, 0x61, 
+-	0x70, 0x20, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 
+-	0x72, 0x00, 0x00, 0x00, 0xe2, 0x8f, 0x00, 0x00, 
+-	0xea, 0x00, 0x0c, 0x20, 0x00, 0x80, 0x0e, 0x00, 
+-	0x52, 0x65, 0x63, 0x75, 0x72, 0x73, 0x69, 0x76, 
+-	0x65, 0x20, 0x54, 0x72, 0x61, 0x70, 0x00, 0x00, 
+-	0x47, 0x78, 0x00, 0x00, 0xe5, 0x9f, 0xc1, 0x04, 
+-	0xe3, 0xa0, 0x00, 0x00, 0xe5, 0xcc, 0x00, 0x2f, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0x47, 0x78, 0x00, 0x00, 
+-	0xe5, 0x9f, 0x00, 0xf0, 0xe5, 0x90, 0x00, 0x00, 
+-	0xe5, 0x90, 0x00, 0x00, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0x47, 0x78, 0x00, 0x00, 0xe5, 0x9f, 0x00, 0xdc, 
+-	0xe2, 0x80, 0x00, 0x04, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0x47, 0x78, 0x00, 0x00, 0xe5, 0x9f, 0xc0, 0xcc, 
+-	0xe3, 0x50, 0x0b, 0x02, 0x33, 0xa0, 0x0b, 0x02, 
+-	0xe2, 0x8c, 0xc0, 0x04, 0xe9, 0x9c, 0x00, 0x0c, 
+-	0xe0, 0x53, 0x31, 0x00, 0x21, 0x53, 0x00, 0x02, 
+-	0x3a, 0x00, 0x00, 0x03, 0xe5, 0x81, 0x20, 0x00, 
+-	0xe0, 0x82, 0x21, 0x00, 0xe5, 0x8c, 0x20, 0x04, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0xe9, 0x2d, 0x50, 0x03, 
+-	0xe1, 0xa0, 0x10, 0x0c, 0xeb, 0x00, 0x00, 0x44, 
+-	0xe3, 0x50, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x0d, 
+-	0xe5, 0x9d, 0xc0, 0x08, 0xe9, 0x9c, 0x40, 0x04, 
+-	0xe1, 0x5e, 0x00, 0x01, 0x10, 0x4e, 0x30, 0x02, 
+-	0xe0, 0x81, 0xe0, 0x00, 0x11, 0xa0, 0x00, 0x02, 
+-	0x11, 0xa0, 0x20, 0x01, 0xe9, 0x8c, 0x40, 0x04, 
+-	0x13, 0x53, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x03, 
+-	0xe8, 0xbd, 0x50, 0x03, 0xe5, 0x81, 0x00, 0x00, 
+-	0xe1, 0xa0, 0x01, 0x43, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0xe8, 0xbd, 0x50, 0x03, 0xe9, 0x9c, 0x00, 0x0c, 
+-	0xe0, 0x43, 0x00, 0x02, 0xe1, 0xb0, 0x01, 0x40, 
+-	0x03, 0xa0, 0x20, 0x00, 0x15, 0x8c, 0x30, 0x04, 
+-	0xe5, 0x81, 0x20, 0x00, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0x47, 0x78, 0x00, 0x00, 0xe2, 0x80, 0x20, 0x03, 
+-	0xe3, 0xc2, 0x20, 0x03, 0xe5, 0x9f, 0xc0, 0x24, 
+-	0xe2, 0x8c, 0xc0, 0x08, 0xe8, 0x9c, 0x00, 0x03, 
+-	0xe0, 0x90, 0x20, 0x02, 0x31, 0x52, 0x00, 0x01, 
+-	0x35, 0x8c, 0x20, 0x00, 0x23, 0xa0, 0x00, 0x00, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0x47, 0x78, 0x00, 0x00, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0x2e, 0x08, 0x20, 0xcc, 
+-	0x2e, 0x08, 0x20, 0x98, 0x00, 0x00, 0x00, 0x00, 
+-	0x2e, 0x02, 0x5d, 0xa4, 0x2e, 0x02, 0x5d, 0xa0, 
+-	0x2e, 0x02, 0x5d, 0x9c, 0x2e, 0x08, 0x99, 0xfc, 
+-	0x2e, 0x00, 0x1c, 0x39, 0x2e, 0x01, 0xa1, 0x35, 
+-	0x2e, 0x01, 0x9f, 0xe9, 0x2e, 0x01, 0xa0, 0xa9, 
+-	0x47, 0x78, 0x00, 0x00, 0xe3, 0xa0, 0x00, 0x04, 
+-	0xe5, 0x90, 0x00, 0x00, 0xe2, 0x00, 0x04, 0xff, 
+-	0xe3, 0x50, 0x04, 0xea, 0x03, 0xa0, 0x00, 0x01, 
+-	0x13, 0xa0, 0x00, 0x00, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0x47, 0x78, 0x00, 0x00, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0x47, 0x78, 0x00, 0x00, 0xe2, 0x40, 0x0b, 0x05, 
+-	0xe3, 0x50, 0x0b, 0x1b, 0x33, 0xa0, 0x00, 0x01, 
+-	0x23, 0xa0, 0x00, 0x00, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0x47, 0x78, 0x00, 0x00, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0x47, 0x78, 0x00, 0x00, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0x47, 0x78, 0x00, 0x00, 0xe3, 0xa0, 0x00, 0x00, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0x47, 0x78, 0x00, 0x00, 
+-	0xe2, 0x8f, 0x00, 0x00, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x20, 
+-	0x45, 0x72, 0x72, 0x6f, 0x72, 0x00, 0x00, 0x00, 
+-	0x00, 0x02, 0x00, 0x00, 0x42, 0x72, 0x61, 0x6e, 
+-	0x63, 0x68, 0x20, 0x54, 0x68, 0x72, 0x6f, 0x75, 
+-	0x67, 0x68, 0x20, 0x5a, 0x65, 0x72, 0x6f, 0x00, 
+-	0x00, 0x02, 0x00, 0x01, 0x55, 0x6e, 0x64, 0x65, 
+-	0x66, 0x69, 0x6e, 0x65, 0x64, 0x20, 0x49, 0x6e, 
+-	0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x69, 0x6f, 
+-	0x6e, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x02, 
+-	0x55, 0x6e, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x65, 
+-	0x64, 0x20, 0x53, 0x57, 0x49, 0x20, 0x49, 0x6e, 
+-	0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x69, 0x6f, 
+-	0x6e, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x03, 
+-	0x50, 0x72, 0x65, 0x66, 0x65, 0x74, 0x63, 0x68, 
+-	0x20, 0x41, 0x62, 0x6f, 0x72, 0x74, 0x00, 0x00, 
+-	0x00, 0x02, 0x00, 0x04, 0x44, 0x61, 0x74, 0x61, 
+-	0x20, 0x41, 0x62, 0x6f, 0x72, 0x74, 0x00, 0x00, 
+-	0x00, 0x02, 0x00, 0x05, 0x41, 0x64, 0x64, 0x72, 
+-	0x65, 0x73, 0x73, 0x20, 0x45, 0x78, 0x63, 0x65, 
+-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x00, 0x00, 
+-	0x00, 0x02, 0x00, 0x06, 0x55, 0x6e, 0x68, 0x61, 
+-	0x6e, 0x64, 0x6c, 0x65, 0x64, 0x20, 0x49, 0x6e, 
+-	0x74, 0x65, 0x72, 0x72, 0x75, 0x70, 0x74, 0x00, 
+-	0x00, 0x02, 0x00, 0x07, 0x55, 0x6e, 0x68, 0x61, 
+-	0x6e, 0x64, 0x6c, 0x65, 0x64, 0x20, 0x46, 0x61, 
+-	0x73, 0x74, 0x20, 0x49, 0x6e, 0x74, 0x65, 0x72, 
+-	0x72, 0x75, 0x70, 0x74, 0x00, 0x00, 0x00, 0x00, 
+-	0x2e, 0x01, 0x99, 0x2c, 0x2e, 0x01, 0x99, 0x44, 
+-	0x2e, 0x01, 0x99, 0x60, 0x2e, 0x01, 0x99, 0x80, 
+-	0x2e, 0x01, 0x99, 0x94, 0x2e, 0x01, 0x99, 0xa4, 
+-	0x2e, 0x01, 0x99, 0xbc, 0x2e, 0x01, 0x99, 0xd4, 
+-	0xe2, 0x4f, 0x20, 0x28, 0xe7, 0x92, 0x01, 0x00, 
+-	0xea, 0xff, 0xff, 0x1c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0xb5, 0x04, 0xf0, 0x00, 
+-	0xf8, 0x04, 0xbc, 0x08, 0x60, 0x1a, 0xbc, 0x08, 
+-	0x47, 0x18, 0x47, 0x78, 0xe1, 0xb0, 0x00, 0x80, 
+-	0x03, 0x31, 0x00, 0x00, 0x01, 0xa0, 0x00, 0x60, 
+-	0x03, 0xa0, 0x20, 0x00, 0x01, 0x2f, 0xff, 0x1e, 
+-	0xe1, 0xa0, 0x2a, 0xa0, 0xe1, 0xc0, 0x0a, 0x82, 
+-	0xe1, 0xa0, 0x00, 0x60, 0xe3, 0x32, 0x00, 0x00, 
+-	0xe2, 0x42, 0x2c, 0x03, 0xe2, 0x42, 0x20, 0xfe, 
+-	0x0a, 0x00, 0x00, 0x06, 0xe3, 0x80, 0x04, 0x3f, 
+-	0xe3, 0x80, 0x06, 0x0e, 0xe2, 0x22, 0x3b, 0x01, 
+-	0xe3, 0x33, 0x00, 0x01, 0x11, 0x2f, 0xff, 0x1e, 
+-	0xe3, 0xa0, 0x10, 0x01, 0xea, 0xff, 0xfe, 0x39, 
+-	0xe2, 0x00, 0xc1, 0x02, 0xe1, 0xa0, 0x06, 0x00, 
+-	0xe2, 0x42, 0x20, 0x01, 0xe1, 0xb0, 0x00, 0x80, 
+-	0x4a, 0x00, 0x00, 0x02, 0xe1, 0xb0, 0x10, 0x81, 
+-	0x23, 0x80, 0x0a, 0x01, 0xea, 0xff, 0xff, 0xf9, 
+-	0xe1, 0xa0, 0x04, 0xc0, 0xe3, 0xc0, 0x05, 0x01, 
+-	0xe1, 0x8c, 0x01, 0x20, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0x47, 0x78, 0x00, 0x00, 0xe1, 0xb0, 0xc0, 0x80, 
+-	0x03, 0x31, 0x00, 0x00, 0xe1, 0xa0, 0x35, 0x0c, 
+-	0xe1, 0xa0, 0x0a, 0x2c, 0xe1, 0xa0, 0x25, 0x81, 
+-	0xe1, 0x83, 0x1a, 0xa1, 0x12, 0x80, 0x0b, 0x1e, 
+-	0xe1, 0xa0, 0x00, 0x60, 0x13, 0x81, 0x11, 0x02, 
+-	0xe1, 0xb0, 0xca, 0xcc, 0x0a, 0x00, 0x00, 0x02, 
+-	0xe3, 0x7c, 0x00, 0x01, 0x03, 0x80, 0x01, 0x01, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0xe3, 0x11, 0x01, 0x02, 
+-	0x01, 0x2f, 0xff, 0x1e, 0xe3, 0xd1, 0x11, 0x02, 
+-	0x0a, 0x00, 0x00, 0x15, 0xe1, 0xb0, 0x38, 0x21, 
+-	0x01, 0xa0, 0x18, 0x01, 0x03, 0xa0, 0xc0, 0x10, 
+-	0x13, 0xa0, 0xc0, 0x00, 0xe1, 0xb0, 0x3c, 0x21, 
+-	0x01, 0xa0, 0x14, 0x01, 0x02, 0x8c, 0xc0, 0x08, 
+-	0xe1, 0xb0, 0x3e, 0x21, 0x01, 0xa0, 0x12, 0x01, 
+-	0x02, 0x8c, 0xc0, 0x04, 0xe1, 0xb0, 0x3f, 0x21, 
+-	0x01, 0xa0, 0x11, 0x01, 0x02, 0x8c, 0xc0, 0x02, 
+-	0xe1, 0xb0, 0x3f, 0xa1, 0x01, 0xa0, 0x10, 0x81, 
+-	0x02, 0x8c, 0xc0, 0x01, 0xe2, 0x6c, 0x30, 0x20, 
+-	0xe1, 0x81, 0x13, 0x32, 0xe1, 0xa0, 0x2c, 0x12, 
+-	0xe0, 0x40, 0x00, 0x0c, 0xe2, 0x80, 0x00, 0x01, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0xe1, 0xb0, 0x38, 0x22, 
+-	0x01, 0xa0, 0x28, 0x02, 0x03, 0xa0, 0xc0, 0x10, 
+-	0x13, 0xa0, 0xc0, 0x00, 0xe1, 0xb0, 0x3c, 0x22, 
+-	0x01, 0xa0, 0x24, 0x02, 0x02, 0x8c, 0xc0, 0x08, 
+-	0xe1, 0xb0, 0x3e, 0x22, 0x01, 0xa0, 0x22, 0x02, 
+-	0x02, 0x8c, 0xc0, 0x04, 0xe1, 0xb0, 0x3f, 0x22, 
+-	0x01, 0xa0, 0x21, 0x02, 0x02, 0x8c, 0xc0, 0x02, 
+-	0xe1, 0xb0, 0x3f, 0xa2, 0x01, 0xa0, 0x20, 0x82, 
+-	0x02, 0x8c, 0xc0, 0x01, 0xe1, 0xa0, 0x10, 0x02, 
+-	0xe3, 0xa0, 0x20, 0x00, 0xe2, 0x40, 0x00, 0x1f, 
+-	0xe0, 0x40, 0x00, 0x0c, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0x47, 0x78, 0x00, 0x00, 0xe3, 0xa0, 0xc4, 0xff, 
+-	0xe3, 0x8c, 0xc6, 0x0e, 0xe1, 0x5c, 0x00, 0x82, 
+-	0x9a, 0x00, 0x00, 0x0a, 0xe1, 0xb0, 0x00, 0x80, 
+-	0x03, 0x31, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x0a, 
+-	0x3a, 0x00, 0x00, 0x11, 0xe1, 0x50, 0x00, 0x0c, 
+-	0x03, 0x51, 0x00, 0x00, 0x8a, 0xff, 0xfd, 0xf2, 
+-	0xe1, 0xb0, 0x20, 0x82, 0x8a, 0x00, 0x00, 0x17, 
+-	0xe3, 0xa0, 0x00, 0x00, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0x03, 0x53, 0x00, 0x00, 0x0a, 0xff, 0xff, 0xf2, 
+-	0xea, 0xff, 0xfd, 0xef, 0xe1, 0x50, 0x00, 0x0c, 
+-	0x03, 0x51, 0x00, 0x00, 0x8a, 0xff, 0xfd, 0xe8, 
+-	0xe1, 0xb0, 0x20, 0x82, 0x03, 0x33, 0x00, 0x00, 
+-	0x83, 0xa0, 0x00, 0x01, 0x93, 0xa0, 0x00, 0x00, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0xe1, 0x50, 0x00, 0x0c, 
+-	0x03, 0x51, 0x00, 0x00, 0x8a, 0xff, 0xfd, 0xe0, 
+-	0xe1, 0xb0, 0x20, 0x82, 0x23, 0xa0, 0x00, 0x01, 
+-	0x21, 0x2f, 0xff, 0x1e, 0xe1, 0x50, 0x00, 0x02, 
+-	0x01, 0x51, 0x00, 0x03, 0x93, 0xa0, 0x00, 0x00, 
+-	0x83, 0xa0, 0x00, 0x01, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0xe1, 0x50, 0x00, 0x02, 0x01, 0x51, 0x00, 0x03, 
+-	0x33, 0xa0, 0x00, 0x01, 0x23, 0xa0, 0x00, 0x00, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0x47, 0x78, 0x00, 0x00, 
+-	0xe9, 0x2d, 0x4b, 0xf0, 0xe8, 0x93, 0x00, 0x38, 
+-	0xe3, 0x10, 0x01, 0x01, 0x03, 0x13, 0x01, 0x01, 
+-	0x1a, 0x00, 0x00, 0x03, 0xeb, 0x00, 0x02, 0x30, 
+-	0xeb, 0x00, 0x03, 0x38, 0xe8, 0xbd, 0x4b, 0xf0, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0xe2, 0x4f, 0xe0, 0x14, 
+-	0xe3, 0xa0, 0xb0, 0x00, 0xea, 0x00, 0x02, 0x86, 
+-	0x47, 0x78, 0x00, 0x00, 0xe9, 0x2d, 0x4b, 0xf0, 
+-	0xe8, 0x93, 0x00, 0x38, 0xe3, 0x10, 0x01, 0x01, 
+-	0x03, 0x13, 0x01, 0x01, 0x1a, 0x00, 0x00, 0x03, 
+-	0xeb, 0x00, 0x03, 0x5e, 0xeb, 0x00, 0x03, 0x2b, 
+-	0xe8, 0xbd, 0x4b, 0xf0, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0xe2, 0x4f, 0xe0, 0x14, 0xe3, 0xa0, 0xb0, 0x00, 
+-	0xea, 0x00, 0x03, 0xf8, 0x47, 0x78, 0x00, 0x00, 
+-	0xe9, 0x2d, 0x4b, 0xf0, 0xe8, 0x93, 0x00, 0x38, 
+-	0xe3, 0xa0, 0xb0, 0x00, 0xe1, 0xd1, 0xc0, 0x80, 
+-	0x41, 0xd4, 0xc0, 0x83, 0x5a, 0x00, 0x00, 0x04, 
+-	0xe3, 0xa0, 0xb0, 0x04, 0xeb, 0x00, 0x04, 0x3f, 
+-	0xeb, 0x00, 0x03, 0x1c, 0xe8, 0xbd, 0x4b, 0xf0, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0xe3, 0x11, 0x01, 0x02, 
+-	0x0a, 0x00, 0x00, 0x08, 0xe3, 0x10, 0x01, 0x01, 
+-	0x03, 0x13, 0x01, 0x01, 0x02, 0x4f, 0xe0, 0x24, 
+-	0xe3, 0xa0, 0xb0, 0x04, 0x0a, 0x00, 0x05, 0x5b, 
+-	0xe0, 0x23, 0x00, 0x00, 0xe2, 0x00, 0x01, 0x02, 
+-	0xe8, 0xbd, 0x4b, 0xf0, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0xe3, 0x14, 0x01, 0x02, 0x03, 0xa0, 0x34, 0x62, 
+-	0x13, 0xa0, 0x34, 0x61, 0xea, 0x00, 0x02, 0x9d, 
+-	0x47, 0x78, 0x00, 0x00, 0xe9, 0x2d, 0x4b, 0xf0, 
+-	0xe1, 0xa0, 0x30, 0x00, 0xe1, 0xa0, 0x40, 0x01, 
+-	0xe1, 0xa0, 0x50, 0x02, 0xe3, 0x10, 0x01, 0x01, 
+-	0x1a, 0x00, 0x00, 0x03, 0xeb, 0x00, 0x03, 0x35, 
+-	0xeb, 0x00, 0x03, 0x02, 0xe8, 0xbd, 0x4b, 0xf0, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0xe2, 0x4f, 0xe0, 0x14, 
+-	0xe3, 0xa0, 0xb0, 0x00, 0xea, 0x00, 0x03, 0xcf, 
+-	0xb4, 0x77, 0x46, 0x76, 0x1e, 0x5d, 0x9b, 0x06, 
+-	0x1c, 0x1c, 0x34, 0x0c, 0xf7, 0xff, 0xff, 0x8c, 
+-	0x1c, 0x23, 0x34, 0x0c, 0xf7, 0xff, 0xff, 0x6e, 
+-	0x46, 0x6b, 0xf7, 0xff, 0xff, 0x85, 0x1e, 0x6d, 
+-	0xd1, 0xf6, 0xb0, 0x03, 0x46, 0xb6, 0xbc, 0x70, 
+-	0x47, 0x70, 0x00, 0x00, 0xb4, 0x77, 0x46, 0x76, 
+-	0x1e, 0x5d, 0x9b, 0x06, 0x1c, 0x1c, 0x34, 0x0c, 
+-	0xf7, 0xff, 0xff, 0x5c, 0x46, 0x6b, 0xf7, 0xff, 
+-	0xff, 0x73, 0x1c, 0x23, 0x34, 0x0c, 0xf7, 0xff, 
+-	0xff, 0x55, 0x1e, 0x6d, 0xd1, 0xf6, 0xb0, 0x03, 
+-	0x46, 0xb6, 0xbc, 0x70, 0x47, 0x70, 0x00, 0x00, 
+-	0x47, 0x78, 0x00, 0x00, 0xe1, 0xb0, 0x10, 0x00, 
+-	0xe2, 0x00, 0x01, 0x02, 0x42, 0x61, 0x10, 0x00, 
+-	0xe3, 0xa0, 0x20, 0x00, 0x01, 0x2f, 0xff, 0x1e, 
+-	0xe3, 0x80, 0x09, 0x01, 0xe3, 0x80, 0x00, 0x1e, 
+-	0xe1, 0xb0, 0xc8, 0x21, 0x01, 0xa0, 0x18, 0x01, 
+-	0x02, 0x40, 0x00, 0x10, 0xe1, 0xb0, 0xcc, 0x21, 
+-	0x01, 0xa0, 0x14, 0x01, 0x02, 0x40, 0x00, 0x08, 
+-	0xe1, 0xb0, 0xce, 0x21, 0x01, 0xa0, 0x12, 0x01, 
+-	0x02, 0x40, 0x00, 0x04, 0xe1, 0xb0, 0xcf, 0x21, 
+-	0x01, 0xa0, 0x11, 0x01, 0x02, 0x40, 0x00, 0x02, 
+-	0xe1, 0xb0, 0xcf, 0xa1, 0x01, 0xa0, 0x10, 0x81, 
+-	0x02, 0x40, 0x00, 0x01, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0x47, 0x78, 0x00, 0x00, 0xe9, 0x2d, 0x4b, 0xf0, 
+-	0xe8, 0x93, 0x00, 0x38, 0xe2, 0x23, 0x31, 0x02, 
+-	0xe3, 0x10, 0x01, 0x01, 0x03, 0x13, 0x01, 0x01, 
+-	0x1a, 0x00, 0x00, 0x03, 0xeb, 0x00, 0x01, 0xbe, 
+-	0xeb, 0x00, 0x02, 0xc6, 0xe8, 0xbd, 0x4b, 0xf0, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0xe2, 0x4f, 0xe0, 0x14, 
+-	0xe3, 0xa0, 0xb0, 0x00, 0xea, 0x00, 0x02, 0x14, 
+-	0x47, 0x78, 0x00, 0x00, 0xe3, 0xa0, 0xb0, 0x00, 
+-	0xe1, 0xa0, 0x20, 0x01, 0xe8, 0x80, 0x00, 0x0e, 
+-	0xe5, 0x9f, 0xc0, 0x38, 0xe5, 0x8c, 0xd0, 0x00, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0x47, 0x78, 0x00, 0x00, 
+-	0xe5, 0x9f, 0x20, 0x28, 0xe5, 0x92, 0x20, 0x00, 
+-	0xe5, 0x91, 0x40, 0x2c, 0xe5, 0x91, 0xc0, 0x34, 
+-	0xe1, 0x5c, 0x00, 0x02, 0x23, 0xa0, 0x00, 0x00, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0x47, 0x78, 0x00, 0x00, 
+-	0xe5, 0x9f, 0xc0, 0x08, 0xe5, 0x9c, 0xd0, 0x00, 
+-	0xe3, 0xa0, 0xb0, 0x00, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0x2e, 0x08, 0x21, 0x90, 0x47, 0x78, 0x00, 0x00, 
+-	0xe9, 0x2d, 0x40, 0x00, 0xe5, 0x9f, 0xc0, 0xe4, 
+-	0xe5, 0x9c, 0x00, 0x00, 0xe3, 0x50, 0x00, 0x00, 
+-	0xe3, 0xa0, 0x00, 0x04, 0x15, 0x8c, 0x00, 0x04, 
+-	0x0b, 0x00, 0x00, 0x01, 0xe8, 0xbd, 0x40, 0x00, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0xe5, 0x9f, 0xc0, 0xcc, 
+-	0xea, 0xff, 0xfd, 0x6b, 0xe3, 0xa0, 0x10, 0x0a, 
+-	0xe3, 0x50, 0x01, 0x02, 0x13, 0x50, 0x01, 0x06, 
+-	0x13, 0x50, 0x01, 0x16, 0x03, 0xa0, 0x10, 0x03, 
+-	0xe3, 0x50, 0x01, 0x0a, 0x13, 0x50, 0x01, 0x0e, 
+-	0x03, 0xa0, 0x10, 0x05, 0xe5, 0x9f, 0x20, 0xa8, 
+-	0xe1, 0x50, 0x00, 0x02, 0xe2, 0x82, 0x20, 0xff, 
+-	0x21, 0x52, 0x00, 0x00, 0x23, 0xa0, 0x10, 0x02, 
+-	0xe3, 0x50, 0x01, 0x82, 0x03, 0xa0, 0x10, 0x02, 
+-	0xe3, 0x50, 0x01, 0x86, 0x03, 0xa0, 0x10, 0x07, 
+-	0xe5, 0x9f, 0x20, 0x88, 0xe0, 0x50, 0x20, 0x02, 
+-	0x13, 0x52, 0x00, 0x01, 0x03, 0xa0, 0x10, 0x05, 
+-	0xe1, 0xa0, 0x00, 0x01, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0x47, 0x78, 0x00, 0x00, 0xe9, 0x2d, 0x40, 0x02, 
+-	0xe1, 0xa0, 0x30, 0x00, 0xeb, 0xff, 0xff, 0xe4, 
+-	0xe8, 0xbd, 0x40, 0x02, 0xe5, 0x9f, 0xc0, 0x50, 
+-	0xe3, 0xa0, 0x20, 0x01, 0xe5, 0xcc, 0x20, 0x00, 
+-	0xe9, 0x2d, 0x00, 0x0a, 0xeb, 0xff, 0xff, 0xdc, 
+-	0xea, 0x00, 0x00, 0x09, 0x47, 0x78, 0x00, 0x00, 
+-	0xe5, 0x9f, 0xc0, 0x30, 0xe3, 0xa0, 0x10, 0x00, 
+-	0xe5, 0x8c, 0x10, 0x00, 0xe5, 0x9c, 0x00, 0x04, 
+-	0xe3, 0x50, 0x00, 0x00, 0x01, 0x2f, 0xff, 0x1e, 
+-	0xe5, 0x8c, 0x10, 0x04, 0xea, 0xff, 0xff, 0xd2, 
+-	0x47, 0x78, 0x00, 0x00, 0xe1, 0xa0, 0xc0, 0x0d, 
+-	0xe9, 0x2d, 0xd9, 0xf0, 0xe2, 0x4c, 0xb0, 0x04, 
+-	0xe3, 0xa0, 0x10, 0x01, 0xea, 0xff, 0xfd, 0x88, 
+-	0x2e, 0x08, 0x20, 0xb4, 0x2e, 0x08, 0x20, 0xc6, 
+-	0x2e, 0x01, 0xb5, 0xe1, 0x80, 0x00, 0x02, 0x00, 
+-	0x80, 0x80, 0x0e, 0xa0, 0xb5, 0xff, 0xa6, 0x23, 
+-	0xa5, 0x22, 0xa4, 0x22, 0x68, 0x5a, 0x68, 0x1f, 
+-	0x4b, 0x21, 0x60, 0x5a, 0x23, 0x00, 0x4a, 0x21, 
+-	0x70, 0x13, 0x70, 0x53, 0x70, 0x93, 0x4a, 0x20, 
+-	0x2a, 0x00, 0xd0, 0x02, 0x9a, 0x02, 0xf7, 0xff, 
+-	0xff, 0xfe, 0x48, 0x1e, 0x28, 0x00, 0xd0, 0x01, 
+-	0xf7, 0xff, 0xff, 0xfe, 0x48, 0x1c, 0x28, 0x00, 
+-	0xd0, 0x01, 0xf7, 0xff, 0xff, 0xfe, 0x48, 0x1b, 
+-	0x28, 0x00, 0xd0, 0x01, 0xf0, 0x01, 0xfc, 0xb2, 
+-	0x48, 0x19, 0x28, 0x00, 0xd0, 0x01, 0xf7, 0xff, 
+-	0xff, 0xfe, 0x48, 0x18, 0x28, 0x00, 0xd0, 0x01, 
+-	0xf0, 0x01, 0xfb, 0x18, 0x48, 0x16, 0x28, 0x00, 
+-	0xd0, 0x01, 0xf0, 0x01, 0xfc, 0x89, 0x48, 0x15, 
+-	0x28, 0x00, 0xd0, 0x01, 0xf7, 0xff, 0xff, 0xfe, 
+-	0xf7, 0xff, 0xff, 0xa0, 0x48, 0x12, 0x28, 0x00, 
+-	0xd0, 0x04, 0x1c, 0x30, 0x1c, 0x29, 0x1c, 0x22, 
+-	0xf0, 0x01, 0xfe, 0xa6, 0x2f, 0x00, 0xd0, 0x01, 
+-	0xf7, 0xfe, 0xfd, 0xcc, 0xb0, 0x04, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x3a, 0x74, 0x74, 0x00, 
+-	0x2e, 0x08, 0x21, 0x94, 0x2e, 0x08, 0x21, 0x94, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x2e, 0x01, 0xb9, 0x91, 
+-	0x00, 0x00, 0x00, 0x00, 0x2e, 0x01, 0xb6, 0x71, 
+-	0x2e, 0x01, 0xb9, 0x5d, 0x00, 0x00, 0x00, 0x00, 
+-	0x2e, 0x01, 0xbd, 0xb5, 0xb5, 0x90, 0x28, 0x00, 
+-	0xd0, 0x04, 0x48, 0x12, 0x28, 0x00, 0xd0, 0x01, 
+-	0xf7, 0xff, 0xff, 0xfe, 0x4f, 0x10, 0x68, 0x78, 
+-	0x28, 0x00, 0xd0, 0x03, 0xf7, 0xfe, 0xfd, 0x94, 
+-	0x20, 0x00, 0x60, 0x78, 0x4f, 0x0d, 0x78, 0x78, 
+-	0x24, 0x01, 0x28, 0x00, 0xd1, 0x05, 0x70, 0x7c, 
+-	0x48, 0x0b, 0x28, 0x00, 0xd0, 0x01, 0xf7, 0xff, 
+-	0xff, 0xfe, 0x78, 0xb8, 0x28, 0x00, 0xd1, 0x05, 
+-	0x70, 0xbc, 0x48, 0x08, 0x28, 0x00, 0xd0, 0x01, 
+-	0xf0, 0x01, 0xfe, 0xb2, 0xbc, 0x90, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x2e, 0x08, 0x21, 0x94, 0x2e, 0x08, 0x21, 0x94, 
+-	0x00, 0x00, 0x00, 0x00, 0x2e, 0x01, 0xbe, 0x55, 
+-	0xb5, 0x90, 0x1c, 0x0c, 0x21, 0x01, 0x1c, 0x17, 
+-	0xf0, 0x01, 0xfa, 0xbc, 0x21, 0x00, 0x1c, 0x20, 
+-	0xf0, 0x01, 0xfa, 0xb8, 0x21, 0x02, 0x1c, 0x38, 
+-	0xf0, 0x01, 0xfa, 0xb4, 0x20, 0x01, 0xf7, 0xff, 
+-	0xfa, 0x5d, 0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 
+-	0xb5, 0xf1, 0x20, 0x00, 0xb0, 0x89, 0x90, 0x06, 
+-	0x26, 0x00, 0x90, 0x05, 0x20, 0x01, 0x90, 0x04, 
+-	0x27, 0x00, 0x20, 0x00, 0x90, 0x03, 0x90, 0x02, 
+-	0x25, 0x00, 0x90, 0x01, 0xf0, 0x01, 0xfb, 0xe2, 
+-	0x1c, 0x04, 0x78, 0x00, 0x28, 0x00, 0xd0, 0x17, 
+-	0x49, 0xe3, 0x5d, 0xe0, 0x5c, 0x08, 0x08, 0x40, 
+-	0xd3, 0x06, 0x37, 0x01, 0x5d, 0xe0, 0x5c, 0x08, 
+-	0x08, 0x40, 0xd2, 0xfa, 0xe0, 0x00, 0x37, 0x01, 
+-	0x5d, 0xe0, 0x5c, 0x0a, 0x08, 0x52, 0xd2, 0x01, 
+-	0x28, 0x00, 0xd1, 0xf8, 0x98, 0x04, 0x30, 0x01, 
+-	0x90, 0x04, 0x5d, 0xe0, 0x28, 0x00, 0xd1, 0xe8, 
+-	0x98, 0x04, 0x00, 0x80, 0xf0, 0x01, 0xfc, 0x16, 
+-	0x4b, 0xd6, 0x93, 0x08, 0x60, 0x18, 0x1c, 0x78, 
+-	0xf0, 0x01, 0xfc, 0x10, 0x9b, 0x08, 0x60, 0x58, 
+-	0x48, 0xd3, 0x28, 0x00, 0xd0, 0x01, 0xf7, 0xff, 
+-	0xff, 0xfe, 0x21, 0x00, 0x20, 0x00, 0x90, 0x04, 
+-	0x48, 0xd0, 0x90, 0x07, 0x78, 0x27, 0x34, 0x01, 
+-	0x2e, 0x00, 0xd1, 0x58, 0x2f, 0x22, 0xd0, 0x01, 
+-	0x2f, 0x27, 0xd1, 0x02, 0x97, 0x05, 0x1c, 0x3e, 
+-	0xe0, 0x93, 0x98, 0x06, 0x42, 0x81, 0xd1, 0x4e, 
+-	0x98, 0x03, 0x28, 0x00, 0xd1, 0x4b, 0x25, 0x00, 
+-	0x43, 0xed, 0x1c, 0x2a, 0x95, 0x01, 0x22, 0x00, 
+-	0xab, 0x00, 0x70, 0x1a, 0x70, 0x5a, 0x1e, 0x60, 
+-	0x78, 0x02, 0x2a, 0x30, 0xdb, 0x04, 0x2a, 0x39, 
+-	0xdc, 0x02, 0x30, 0x01, 0x1f, 0xd5, 0x3d, 0x29, 
+-	0x78, 0x02, 0x2a, 0x3e, 0xd0, 0x01, 0x2a, 0x3c, 
+-	0xd1, 0x35, 0x2a, 0x3e, 0xd1, 0x0e, 0x22, 0x77, 
+-	0xab, 0x00, 0x70, 0x1a, 0x2d, 0x00, 0xd0, 0x63, 
+-	0x2d, 0x02, 0xdc, 0x62, 0x78, 0x42, 0x30, 0x01, 
+-	0x2a, 0x3e, 0xd1, 0x13, 0x22, 0x61, 0x70, 0x1a, 
+-	0x30, 0x01, 0xe0, 0x0f, 0x30, 0x01, 0x1c, 0x02, 
+-	0xe0, 0x02, 0x2b, 0x3e, 0xd0, 0x56, 0x32, 0x01, 
+-	0x78, 0x13, 0x2b, 0x00, 0xd0, 0x01, 0x2b, 0x20, 
+-	0xd1, 0xf7, 0x2d, 0x00, 0xdc, 0x4d, 0x22, 0x72, 
+-	0xab, 0x00, 0x70, 0x1a, 0x78, 0x02, 0x2a, 0x26, 
+-	0xd1, 0x24, 0x23, 0x01, 0x42, 0xdd, 0xd0, 0x19, 
+-	0x2d, 0x00, 0xdd, 0x5e, 0x78, 0x42, 0x30, 0x01, 
+-	0x2a, 0x30, 0xdb, 0x5b, 0x2a, 0x32, 0xdc, 0x3c, 
+-	0x30, 0x01, 0x1c, 0x2b, 0xd5, 0x04, 0x07, 0xdb, 
+-	0x0f, 0xdb, 0x42, 0x5b, 0xe0, 0x02, 0xe0, 0x42, 
+-	0x07, 0xdb, 0x0f, 0xdb, 0x33, 0x31, 0x42, 0x9a, 
+-	0xd1, 0x63, 0x22, 0x00, 0xab, 0x00, 0x70, 0x1a, 
+-	0x95, 0x01, 0xe0, 0x11, 0x22, 0x02, 0x92, 0x01, 
+-	0xaa, 0x00, 0x78, 0x12, 0x30, 0x01, 0x2a, 0x72, 
+-	0xd0, 0x09, 0xe0, 0x06, 0x23, 0x01, 0x42, 0xdd, 
+-	0xd1, 0x06, 0xaa, 0x00, 0x78, 0x12, 0x2a, 0x72, 
+-	0xd0, 0x01, 0x25, 0x01, 0xe0, 0x00, 0x25, 0x00, 
+-	0xaa, 0x00, 0x78, 0x12, 0x2a, 0x00, 0xd0, 0x16, 
+-	0x22, 0x01, 0x92, 0x03, 0x4a, 0x8c, 0x78, 0x03, 
+-	0x5c, 0xd3, 0x08, 0x5b, 0xd3, 0x04, 0x78, 0x43, 
+-	0x5c, 0xd3, 0x30, 0x01, 0x08, 0x5b, 0xd2, 0xfa, 
+-	0x78, 0x02, 0x2a, 0x22, 0xd0, 0x01, 0x2a, 0x27, 
+-	0xd1, 0x0c, 0x30, 0x01, 0x1c, 0x16, 0xe0, 0x09, 
+-	0xe0, 0x6a, 0xe0, 0xfb, 0xe0, 0x23, 0x78, 0x02, 
+-	0x2a, 0x00, 0xd0, 0x03, 0x4b, 0x80, 0x5c, 0x9a, 
+-	0x08, 0x52, 0xd3, 0x61, 0x22, 0x01, 0x92, 0x02, 
+-	0x1c, 0x04, 0x78, 0x27, 0x34, 0x01, 0x2e, 0x00, 
+-	0xd0, 0x15, 0x2f, 0x5c, 0xd1, 0x0b, 0x78, 0x20, 
+-	0x28, 0x22, 0xd0, 0x03, 0x28, 0x5c, 0xd0, 0x01, 
+-	0x28, 0x27, 0xd1, 0x04, 0x34, 0x01, 0x1c, 0x07, 
+-	0xe0, 0x09, 0xe0, 0xdf, 0xe0, 0xde, 0x1c, 0x30, 
+-	0x42, 0xb7, 0xd1, 0x04, 0x40, 0x7e, 0x78, 0x27, 
+-	0x34, 0x01, 0x42, 0x87, 0xd0, 0xfa, 0x2f, 0x00, 
+-	0xd0, 0x0c, 0x2e, 0x00, 0xd1, 0x03, 0x48, 0x6e, 
+-	0x5d, 0xc0, 0x08, 0x40, 0xd2, 0x06, 0x1c, 0x08, 
+-	0x9b, 0x08, 0x68, 0x5a, 0x54, 0x17, 0x31, 0x01, 
+-	0xe0, 0x97, 0xe0, 0xc7, 0x98, 0x06, 0x42, 0x81, 
+-	0xd1, 0x08, 0x98, 0x05, 0x28, 0x00, 0xd1, 0x05, 
+-	0x98, 0x02, 0x28, 0x00, 0xd0, 0x74, 0x98, 0x03, 
+-	0x28, 0x00, 0xd1, 0x72, 0x22, 0x00, 0x1c, 0x08, 
+-	0x9b, 0x08, 0x68, 0x5b, 0x54, 0x1a, 0x98, 0x02, 
+-	0x31, 0x01, 0x28, 0x00, 0xd0, 0x6a, 0x98, 0x03, 
+-	0x28, 0x00, 0xd0, 0x13, 0x01, 0xa8, 0x99, 0x07, 
+-	0x18, 0x42, 0x9b, 0x08, 0x68, 0x58, 0x99, 0x06, 
+-	0x18, 0x40, 0x46, 0x69, 0xf0, 0x01, 0xfc, 0x72, 
+-	0x28, 0x00, 0xd1, 0x07, 0x9b, 0x08, 0x68, 0x58, 
+-	0x99, 0x06, 0x18, 0x41, 0xa2, 0x58, 0xa0, 0x5e, 
+-	0xf7, 0xff, 0xfe, 0xb6, 0x23, 0x01, 0x98, 0x01, 
+-	0x42, 0xd8, 0xdd, 0x51, 0x98, 0x01, 0x28, 0x00, 
+-	0xda, 0x03, 0x40, 0x18, 0x42, 0x40, 0xe0, 0x02, 
+-	0xe0, 0x90, 0x07, 0xc0, 0x0f, 0xc0, 0x1c, 0x41, 
+-	0x98, 0x01, 0xf0, 0x01, 0xfd, 0x61, 0x01, 0x80, 
+-	0x99, 0x07, 0x18, 0x40, 0xf0, 0x01, 0xf9, 0xfc, 
+-	0x28, 0x00, 0xd1, 0x3d, 0xb0, 0x82, 0x98, 0x03, 
+-	0x01, 0x80, 0x99, 0x09, 0x18, 0x40, 0x90, 0x01, 
+-	0x9a, 0x03, 0x2a, 0x00, 0xda, 0x03, 0x07, 0xd2, 
+-	0x0f, 0xd2, 0x42, 0x52, 0xe0, 0x01, 0x07, 0xd2, 
+-	0x0f, 0xd2, 0x01, 0x90, 0x99, 0x09, 0x18, 0x40, 
+-	0x30, 0x40, 0x90, 0x00, 0x20, 0xff, 0x30, 0x01, 
+-	0xf0, 0x01, 0xfa, 0xe0, 0x1c, 0x01, 0x23, 0xff, 
+-	0x22, 0x01, 0x02, 0x52, 0x98, 0x01, 0x33, 0x01, 
+-	0xf0, 0x01, 0xfd, 0x56, 0x98, 0x01, 0x68, 0xc0, 
+-	0x23, 0x01, 0x02, 0xdb, 0x43, 0x18, 0x99, 0x01, 
+-	0x60, 0xc8, 0x08, 0xd8, 0xf0, 0x01, 0xfa, 0xce, 
+-	0x1c, 0x01, 0x23, 0xff, 0x22, 0x01, 0x02, 0x52, 
+-	0x98, 0x00, 0x33, 0x01, 0xf0, 0x01, 0xfd, 0x44, 
+-	0x98, 0x00, 0x68, 0xc0, 0x23, 0x01, 0x02, 0xdb, 
+-	0x43, 0x18, 0x99, 0x00, 0x60, 0xc8, 0xe0, 0x02, 
+-	0xe0, 0x13, 0xe0, 0x12, 0xe0, 0x05, 0xb0, 0x02, 
+-	0x20, 0x00, 0x90, 0x02, 0x90, 0x03, 0x99, 0x06, 
+-	0xe0, 0x0b, 0x9b, 0x08, 0x68, 0x58, 0x9a, 0x06, 
+-	0x18, 0x82, 0x98, 0x04, 0x1c, 0x43, 0x93, 0x04, 
+-	0x00, 0x80, 0x9b, 0x08, 0x68, 0x1b, 0x50, 0x1a, 
+-	0x91, 0x06, 0x2f, 0x00, 0xd0, 0x01, 0x26, 0x00, 
+-	0x96, 0x05, 0x2f, 0x00, 0xd0, 0x00, 0xe6, 0x9d, 
+-	0x2e, 0x00, 0xd0, 0x0a, 0xb0, 0x81, 0xab, 0x00, 
+-	0x70, 0x1e, 0x22, 0x00, 0x70, 0x5a, 0x46, 0x69, 
+-	0xa2, 0x24, 0xa0, 0x25, 0xf7, 0xff, 0xfe, 0x3c, 
+-	0xb0, 0x01, 0x22, 0x00, 0x98, 0x04, 0x00, 0x80, 
+-	0x9b, 0x08, 0x68, 0x19, 0x50, 0x0a, 0x98, 0x04, 
+-	0x28, 0x00, 0xdd, 0x0f, 0x9b, 0x08, 0x68, 0x18, 
+-	0x68, 0x01, 0x68, 0x09, 0x4b, 0x21, 0x40, 0x19, 
+-	0xa2, 0x21, 0x68, 0x12, 0x42, 0x91, 0xd1, 0x05, 
+-	0x9b, 0x04, 0x3b, 0x01, 0x93, 0x04, 0x30, 0x04, 
+-	0x9b, 0x08, 0x60, 0x18, 0x9a, 0x09, 0x9b, 0x08, 
+-	0x68, 0x19, 0x98, 0x04, 0xf7, 0xff, 0xf8, 0x0f, 
+-	0xf7, 0xff, 0xf8, 0x88, 0x1e, 0x61, 0xa2, 0x19, 
+-	0xa0, 0x19, 0xf7, 0xff, 0xfe, 0x15, 0xb0, 0x09, 
+-	0xb0, 0x01, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x21, 0xac, 0x2e, 0x08, 0x21, 0x9c, 
+-	0x00, 0x00, 0x00, 0x00, 0x2e, 0x08, 0x95, 0xdc, 
+-	0x27, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x49, 0x2f, 
+-	0x4f, 0x20, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 
+-	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x0a, 0x00, 0x00, 
+-	0x63, 0x61, 0x6e, 0x27, 0x74, 0x20, 0x6f, 0x70, 
+-	0x65, 0x6e, 0x20, 0x27, 0x00, 0x00, 0x00, 0x00, 
+-	0x6d, 0x69, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x20, 
+-	0x63, 0x6c, 0x6f, 0x73, 0x69, 0x6e, 0x67, 0x20, 
+-	0x00, 0x00, 0x00, 0x00, 0xdf, 0xdf, 0xdf, 0xdf, 
+-	0x52, 0x55, 0x4e, 0x00, 0x27, 0x0a, 0x00, 0x00, 
+-	0x75, 0x6e, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 
+-	0x74, 0x65, 0x64, 0x20, 0x6f, 0x72, 0x20, 0x69, 
+-	0x6c, 0x6c, 0x65, 0x67, 0x61, 0x6c, 0x20, 0x49, 
+-	0x2f, 0x4f, 0x20, 0x72, 0x65, 0x64, 0x69, 0x72, 
+-	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x27, 
+-	0x00, 0x00, 0x00, 0x00, 0xe9, 0x2d, 0x40, 0x00, 
+-	0xe1, 0xa0, 0x68, 0x80, 0xe0, 0x56, 0x88, 0x83, 
+-	0xe0, 0x20, 0xe0, 0x03, 0xe2, 0x00, 0x01, 0x02, 
+-	0xe1, 0xa0, 0x38, 0xa6, 0x8a, 0x00, 0x00, 0x1a, 
+-	0x01, 0xa0, 0x90, 0x08, 0x0a, 0x00, 0x00, 0x2e, 
+-	0xe2, 0x68, 0x60, 0x00, 0xe1, 0xa0, 0x68, 0xa6, 
+-	0xe0, 0x83, 0x30, 0x06, 0xe1, 0xa0, 0x92, 0xa6, 
+-	0xe1, 0xc6, 0x62, 0x89, 0xe3, 0x59, 0x00, 0x02, 
+-	0x33, 0x39, 0x00, 0x00, 0xe2, 0x66, 0x90, 0x20, 
+-	0xe1, 0xa0, 0x89, 0x12, 0xe1, 0xa0, 0x26, 0x32, 
+-	0xe1, 0x82, 0x29, 0x11, 0xe1, 0xa0, 0x16, 0x31, 
+-	0x0a, 0x00, 0x00, 0x03, 0x11, 0x88, 0x81, 0x08, 
+-	0x11, 0x82, 0x81, 0x28, 0x11, 0xa0, 0x20, 0x01, 
+-	0x13, 0xa0, 0x10, 0x00, 0x3a, 0x00, 0x00, 0x04, 
+-	0x21, 0x88, 0x80, 0x02, 0x21, 0x88, 0x81, 0x08, 
+-	0x21, 0x81, 0x81, 0x28, 0x23, 0xa0, 0x20, 0x00, 
+-	0x23, 0xa0, 0x10, 0x00, 0xe3, 0xa0, 0x90, 0x00, 
+-	0xea, 0x00, 0x00, 0x15, 0xe1, 0xa0, 0x68, 0xa8, 
+-	0xe1, 0xa0, 0x82, 0xa6, 0xe1, 0xc6, 0x62, 0x88, 
+-	0xe3, 0x58, 0x00, 0x02, 0x33, 0x38, 0x00, 0x00, 
+-	0xe2, 0x66, 0x80, 0x20, 0xe1, 0xa0, 0x98, 0x15, 
+-	0xe1, 0xa0, 0x56, 0x35, 0xe1, 0x85, 0x58, 0x14, 
+-	0xe1, 0xa0, 0x46, 0x34, 0x0a, 0x00, 0x00, 0x03, 
+-	0x11, 0x89, 0x91, 0x09, 0x11, 0x85, 0x91, 0x29, 
+-	0x11, 0xa0, 0x50, 0x04, 0x13, 0xa0, 0x40, 0x00, 
+-	0x3a, 0x00, 0x00, 0x04, 0x21, 0x89, 0x90, 0x05, 
+-	0x21, 0x89, 0x91, 0x09, 0x21, 0x84, 0x91, 0x29, 
+-	0x23, 0xa0, 0x50, 0x00, 0x23, 0xa0, 0x40, 0x00, 
+-	0xe3, 0xa0, 0x80, 0x00, 0xe3, 0x1e, 0x01, 0x02, 
+-	0x1a, 0x00, 0x00, 0x09, 0xe0, 0x98, 0x60, 0x09, 
+-	0xe0, 0xb2, 0x20, 0x05, 0xe0, 0xb1, 0x10, 0x04, 
+-	0x38, 0xbd, 0x80, 0x00, 0xe2, 0x83, 0x30, 0x01, 
+-	0xe1, 0xb0, 0x10, 0x61, 0xe1, 0xb0, 0x20, 0x62, 
+-	0xe1, 0x86, 0x60, 0x86, 0xe1, 0xa0, 0x60, 0x66, 
+-	0xe8, 0xbd, 0x80, 0x00, 0xe0, 0x58, 0x60, 0x09, 
+-	0xe0, 0xd2, 0x20, 0x05, 0xe0, 0xd1, 0x10, 0x04, 
+-	0x2a, 0x00, 0x00, 0x03, 0xe2, 0x20, 0x01, 0x02, 
+-	0xe2, 0x76, 0x60, 0x00, 0xe2, 0xf2, 0x20, 0x00, 
+-	0xe2, 0xe1, 0x10, 0x00, 0xe3, 0x11, 0x01, 0x02, 
+-	0x18, 0xbd, 0x80, 0x00, 0xe0, 0x96, 0x60, 0x06, 
+-	0xe0, 0xb2, 0x20, 0x02, 0xe0, 0xa1, 0x10, 0x01, 
+-	0xe2, 0x43, 0x30, 0x01, 0xe3, 0x11, 0x01, 0x02, 
+-	0x18, 0xbd, 0x80, 0x00, 0xe1, 0x91, 0xe0, 0x02, 
+-	0x1b, 0x00, 0x06, 0x90, 0x18, 0xbd, 0x80, 0x00, 
+-	0xe3, 0xa0, 0x00, 0x00, 0xe3, 0xa0, 0x10, 0x00, 
+-	0xe2, 0x8d, 0xd0, 0x04, 0xe8, 0xbd, 0x4b, 0xf0, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0xe1, 0xa0, 0x98, 0x83, 
+-	0xe3, 0x79, 0x08, 0x02, 0x30, 0x09, 0x90, 0x04, 
+-	0xe0, 0x19, 0x90, 0x83, 0xe1, 0xa0, 0x88, 0x80, 
+-	0xe3, 0x78, 0x08, 0x02, 0x30, 0x08, 0x80, 0x01, 
+-	0xe0, 0x18, 0x80, 0x80, 0x4a, 0x00, 0x00, 0x14, 
+-	0xe3, 0x19, 0x01, 0x02, 0x1a, 0x00, 0x00, 0x22, 
+-	0xe9, 0x2d, 0x40, 0x00, 0xe0, 0x11, 0x60, 0x80, 
+-	0x43, 0xc1, 0x11, 0x02, 0x42, 0x80, 0x00, 0x01, 
+-	0xe0, 0x14, 0x60, 0x83, 0x43, 0xc4, 0x41, 0x02, 
+-	0x42, 0x83, 0x30, 0x01, 0xe3, 0x10, 0x01, 0x01, 
+-	0x11, 0xb0, 0x68, 0x80, 0x1b, 0x00, 0x05, 0xf8, 
+-	0xe3, 0x13, 0x01, 0x01, 0x11, 0xb0, 0x68, 0x83, 
+-	0x1b, 0x00, 0x06, 0x2f, 0xeb, 0xff, 0xff, 0x8a, 
+-	0xe3, 0x11, 0x01, 0x02, 0x18, 0xbd, 0x80, 0x00, 
+-	0xe1, 0x91, 0xe0, 0x02, 0x1b, 0x00, 0x06, 0x6d, 
+-	0xe8, 0xbd, 0x80, 0x00, 0xe3, 0x19, 0x01, 0x02, 
+-	0x0a, 0x00, 0x00, 0x09, 0xe1, 0x82, 0x80, 0x81, 
+-	0xe1, 0x88, 0x80, 0x05, 0xe1, 0x98, 0x80, 0x84, 
+-	0x1a, 0x00, 0x06, 0xb7, 0xe0, 0x23, 0x85, 0x0b, 
+-	0xe0, 0x38, 0x80, 0x00, 0x52, 0x00, 0x81, 0x02, 
+-	0x5a, 0x00, 0x00, 0x0a, 0xe3, 0x80, 0x04, 0x61, 
+-	0xe1, 0xa0, 0xf0, 0x0e, 0xe1, 0x92, 0x80, 0x81, 
+-	0x1a, 0x00, 0x06, 0xc0, 0xe2, 0x00, 0x81, 0x02, 
+-	0xea, 0x00, 0x00, 0x04, 0xe1, 0x95, 0x80, 0x84, 
+-	0x1a, 0x00, 0x06, 0xb3, 0xe2, 0x03, 0x81, 0x02, 
+-	0xe3, 0x1b, 0x06, 0x02, 0x12, 0x28, 0x81, 0x02, 
+-	0xe3, 0x1b, 0x06, 0x01, 0x12, 0x28, 0x81, 0x02, 
+-	0xe2, 0x8f, 0x00, 0x14, 0xe8, 0x90, 0x00, 0x07, 
+-	0xe1, 0x80, 0x00, 0x08, 0xe1, 0xa0, 0xf0, 0x0e, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x7f, 0xff, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0xe8, 0xbd, 0x4b, 0xf0, 0xe5, 0x9f, 0x20, 0x6c, 
+-	0xe5, 0x92, 0x10, 0x00, 0xe1, 0xa0, 0xc1, 0x83, 
+-	0xe1, 0xa0, 0xcd, 0xac, 0xe1, 0x81, 0x10, 0x0c, 
+-	0xe5, 0x82, 0x10, 0x00, 0xe3, 0x13, 0x03, 0x01, 
+-	0x1a, 0x00, 0x00, 0x05, 0xe3, 0x13, 0x04, 0x02, 
+-	0x1a, 0x00, 0x00, 0x07, 0xe3, 0x11, 0x08, 0x01, 
+-	0x0a, 0x00, 0x00, 0x44, 0xe2, 0x8f, 0x00, 0x54, 
+-	0xea, 0x00, 0x00, 0x06, 0xe3, 0x11, 0x07, 0x01, 
+-	0x0a, 0x00, 0x00, 0x34, 0xe2, 0x8f, 0x00, 0x74, 
+-	0xea, 0x00, 0x00, 0x02, 0xe3, 0x11, 0x08, 0x02, 
+-	0x0a, 0x00, 0x00, 0x30, 0xe2, 0x8f, 0x00, 0x8c, 
+-	0xe5, 0x9f, 0x10, 0x1c, 0xe2, 0x4e, 0xe0, 0x04, 
+-	0xe5, 0x81, 0xe0, 0x3c, 0xe3, 0xa0, 0xec, 0xde, 
+-	0xe3, 0x8e, 0xe0, 0xad, 0xe1, 0x8e, 0xe8, 0x0e, 
+-	0xe8, 0x81, 0x7f, 0xff, 0xea, 0x00, 0x00, 0x01, 
+-	0x2e, 0x08, 0x22, 0xac, 0x2e, 0x08, 0x22, 0xb0, 
+-	0xe5, 0x9f, 0xc1, 0x2c, 0xe3, 0x5c, 0x00, 0x00, 
+-	0x11, 0x2f, 0xff, 0x1c, 0xe6, 0x00, 0x00, 0x10, 
+-	0x80, 0x00, 0x02, 0x00, 0x46, 0x6c, 0x6f, 0x61, 
+-	0x74, 0x69, 0x6e, 0x67, 0x20, 0x50, 0x6f, 0x69, 
+-	0x6e, 0x74, 0x20, 0x45, 0x78, 0x63, 0x65, 0x70, 
+-	0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x49, 0x6e, 
+-	0x76, 0x61, 0x6c, 0x69, 0x64, 0x20, 0x4f, 0x70, 
+-	0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x00, 
+-	0x80, 0x00, 0x02, 0x01, 0x46, 0x6c, 0x6f, 0x61, 
+-	0x74, 0x69, 0x6e, 0x67, 0x20, 0x50, 0x6f, 0x69, 
+-	0x6e, 0x74, 0x20, 0x45, 0x78, 0x63, 0x65, 0x70, 
+-	0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x4f, 0x76, 
+-	0x65, 0x72, 0x66, 0x6c, 0x6f, 0x77, 0x00, 0x00, 
+-	0x80, 0x00, 0x02, 0x02, 0x46, 0x6c, 0x6f, 0x61, 
+-	0x74, 0x69, 0x6e, 0x67, 0x20, 0x50, 0x6f, 0x69, 
+-	0x6e, 0x74, 0x20, 0x45, 0x78, 0x63, 0x65, 0x70, 
+-	0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x44, 0x69, 
+-	0x76, 0x69, 0x64, 0x65, 0x20, 0x42, 0x79, 0x20, 
+-	0x5a, 0x65, 0x72, 0x6f, 0x00, 0x00, 0x00, 0x00, 
+-	0xe2, 0x00, 0x21, 0x02, 0xe3, 0x13, 0x07, 0x0f, 
+-	0x1a, 0x00, 0x00, 0x13, 0xe3, 0x13, 0x05, 0x02, 
+-	0x12, 0x8f, 0x00, 0x0c, 0x18, 0x90, 0x00, 0x03, 
+-	0x05, 0x9f, 0x00, 0x0c, 0xe1, 0x80, 0x00, 0x02, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0x7f, 0xf0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x7f, 0x80, 0x00, 0x00, 
+-	0xe3, 0x13, 0x07, 0x0f, 0x12, 0x00, 0x21, 0x02, 
+-	0x1a, 0x00, 0x00, 0x07, 0xe3, 0x13, 0x05, 0x02, 
+-	0x12, 0x8f, 0x00, 0x08, 0x18, 0x90, 0x00, 0x03, 
+-	0x05, 0x9f, 0x00, 0x08, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0x7f, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x7f, 0xc0, 0x00, 0x00, 0xe3, 0x13, 0x07, 0x02, 
+-	0x13, 0xa0, 0x00, 0x00, 0x13, 0xa0, 0x10, 0x00, 
+-	0x11, 0x2f, 0xff, 0x1e, 0xe3, 0x13, 0x07, 0x01, 
+-	0x13, 0xe0, 0x00, 0x00, 0x13, 0xe0, 0x10, 0x00, 
+-	0x11, 0x2f, 0xff, 0x1e, 0xe3, 0x13, 0x06, 0x01, 
+-	0x13, 0xa0, 0x00, 0x00, 0x13, 0xa0, 0x11, 0x02, 
+-	0x03, 0xa0, 0x01, 0x02, 0xe3, 0x32, 0x01, 0x02, 
+-	0x11, 0xe0, 0x00, 0x00, 0x11, 0xe0, 0x10, 0x01, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0x2e, 0x01, 0x96, 0x91, 
+-	0xe3, 0x10, 0x02, 0x06, 0x1a, 0x00, 0x00, 0x0d, 
+-	0xe1, 0xb0, 0x80, 0x86, 0x0a, 0x00, 0x00, 0x0d, 
+-	0x22, 0x92, 0x20, 0x01, 0x22, 0x91, 0x10, 0x01, 
+-	0x23, 0xa0, 0x11, 0x02, 0xe2, 0xb3, 0x30, 0x00, 
+-	0x4a, 0x00, 0x00, 0x0a, 0xe2, 0x83, 0xc0, 0x01, 
+-	0xe3, 0xcc, 0xc1, 0x01, 0xe3, 0x5c, 0x09, 0x02, 
+-	0xc3, 0xa0, 0x33, 0x19, 0xe2, 0x00, 0x01, 0x02, 
+-	0xe1, 0x83, 0x00, 0x00, 0xe1, 0xa0, 0xf0, 0x0e, 
+-	0xe1, 0xa0, 0x30, 0x00, 0xe1, 0xa0, 0xf0, 0x0e, 
+-	0x21, 0xb0, 0x80, 0xa2, 0xea, 0xff, 0xff, 0xef, 
+-	0xe3, 0x11, 0x01, 0x02, 0x1a, 0x00, 0x00, 0x04, 
+-	0xe3, 0xa0, 0x10, 0x00, 0xe3, 0xa0, 0x20, 0x00, 
+-	0xe2, 0x00, 0x01, 0x02, 0xe3, 0xa0, 0x30, 0x00, 
+-	0xe1, 0xa0, 0xf0, 0x0e, 0xe1, 0xb0, 0xc8, 0x21, 
+-	0x01, 0xa0, 0xc8, 0x22, 0x01, 0x8c, 0x18, 0x01, 
+-	0x02, 0x83, 0x30, 0x10, 0xe1, 0xb0, 0xcc, 0x21, 
+-	0x01, 0xa0, 0xcc, 0x22, 0x01, 0x8c, 0x14, 0x01, 
+-	0x02, 0x83, 0x30, 0x08, 0xe1, 0xb0, 0xce, 0x21, 
+-	0x01, 0xa0, 0xce, 0x22, 0x01, 0x8c, 0x12, 0x01, 
+-	0x02, 0x83, 0x30, 0x04, 0xe1, 0xb0, 0xcf, 0x21, 
+-	0x01, 0xa0, 0xcf, 0x22, 0x01, 0x8c, 0x11, 0x01, 
+-	0x02, 0x83, 0x30, 0x02, 0xe1, 0xb0, 0xcf, 0xa1, 
+-	0x01, 0xa0, 0xcf, 0xa2, 0x01, 0x8c, 0x10, 0x81, 
+-	0x02, 0x83, 0x30, 0x01, 0xe1, 0xb0, 0x30, 0x03, 
+-	0x4a, 0xff, 0xff, 0xe4, 0x5a, 0xff, 0xff, 0xda, 
+-	0xe3, 0xc0, 0x81, 0x03, 0xe3, 0xc3, 0x91, 0x03, 
+-	0xe0, 0x20, 0x00, 0x03, 0xe2, 0x00, 0x01, 0x02, 
+-	0xe0, 0x88, 0x30, 0x09, 0xe2, 0x43, 0x3c, 0x3f, 
+-	0xe2, 0x43, 0x30, 0xfe, 0xe3, 0x32, 0x00, 0x00, 
+-	0x0a, 0x00, 0x00, 0x5d, 0xe3, 0x35, 0x00, 0x00, 
+-	0x0a, 0x00, 0x00, 0x3d, 0xe9, 0x2d, 0x48, 0x81, 
+-	0xe1, 0xa0, 0x08, 0x21, 0xe1, 0xc1, 0x78, 0x00, 
+-	0xe1, 0xa0, 0x68, 0x24, 0xe1, 0xc4, 0x88, 0x06, 
+-	0xe0, 0x09, 0x06, 0x90, 0xe0, 0x06, 0x06, 0x97, 
+-	0xe0, 0x07, 0x07, 0x98, 0xe0, 0x97, 0x78, 0x06, 
+-	0xe0, 0xa9, 0x98, 0x26, 0xe0, 0x08, 0x08, 0x90, 
+-	0xe0, 0x97, 0x78, 0x08, 0xe0, 0xa9, 0x08, 0x28, 
+-	0xe1, 0xa0, 0xb8, 0x22, 0xe1, 0xc2, 0xe8, 0x0b, 
+-	0xe1, 0xa0, 0x68, 0x25, 0xe1, 0xc5, 0x88, 0x06, 
+-	0xe0, 0x09, 0x06, 0x9b, 0xe0, 0x06, 0x06, 0x9e, 
+-	0xe0, 0x0e, 0x0e, 0x98, 0xe0, 0x9e, 0xe8, 0x06, 
+-	0xe0, 0xa9, 0x98, 0x26, 0xe0, 0x08, 0x08, 0x9b, 
+-	0xe0, 0x9e, 0xe8, 0x08, 0xe0, 0xa9, 0xb8, 0x28, 
+-	0xe0, 0x97, 0x70, 0x0b, 0xe2, 0xa0, 0x00, 0x00, 
+-	0xe0, 0x97, 0xb0, 0x0e, 0xe0, 0xb7, 0x70, 0x00, 
+-	0xe2, 0xa0, 0x00, 0x00, 0xe0, 0x51, 0x80, 0x02, 
+-	0xe3, 0xa0, 0x10, 0x00, 0xe3, 0xa0, 0x60, 0x00, 
+-	0x31, 0xe0, 0x10, 0x01, 0x30, 0x44, 0x60, 0x05, 
+-	0x10, 0x55, 0x90, 0x04, 0x03, 0xa0, 0x10, 0x00, 
+-	0x31, 0xe0, 0x10, 0x01, 0x30, 0x46, 0x60, 0x08, 
+-	0xe1, 0xa0, 0x48, 0x28, 0xe1, 0xc8, 0x58, 0x04, 
+-	0xe1, 0xa0, 0x88, 0x29, 0xe1, 0xc9, 0x98, 0x08, 
+-	0xe0, 0x22, 0x68, 0x94, 0xe0, 0x08, 0x08, 0x95, 
+-	0xe0, 0x06, 0x05, 0x99, 0xe0, 0x96, 0x68, 0x08, 
+-	0xe0, 0xa2, 0x28, 0x28, 0xe0, 0x09, 0x09, 0x94, 
+-	0xe0, 0x96, 0x68, 0x09, 0xe0, 0xa2, 0x28, 0x29, 
+-	0xe0, 0x9b, 0x60, 0x06, 0xe0, 0xb7, 0x20, 0x02, 
+-	0xe0, 0xb0, 0x10, 0x01, 0xe1, 0x8e, 0xe1, 0x0e, 
+-	0xe1, 0x86, 0x61, 0x2e, 0x48, 0xbd, 0x88, 0x81, 
+-	0xe0, 0x96, 0x60, 0x06, 0xe0, 0xb2, 0x20, 0x02, 
+-	0xe0, 0xa1, 0x10, 0x01, 0xe2, 0x43, 0x30, 0x01, 
+-	0xe8, 0xbd, 0x88, 0x81, 0xe1, 0xa0, 0x58, 0x24, 
+-	0xe1, 0xc4, 0x68, 0x05, 0xe1, 0xa0, 0x88, 0x21, 
+-	0xe1, 0xc1, 0x98, 0x08, 0xe0, 0x04, 0x08, 0x95, 
+-	0xe0, 0x08, 0x08, 0x96, 0xe0, 0x01, 0x06, 0x99, 
+-	0xe0, 0x91, 0x18, 0x08, 0xe0, 0xa4, 0x48, 0x28, 
+-	0xe0, 0x09, 0x09, 0x95, 0xe0, 0x91, 0x18, 0x09, 
+-	0xe0, 0xa4, 0x48, 0x29, 0xe1, 0xa0, 0x88, 0x22, 
+-	0xe1, 0xc2, 0x98, 0x08, 0xe0, 0x02, 0x08, 0x95, 
+-	0xe0, 0x08, 0x08, 0x96, 0xe0, 0x06, 0x06, 0x99, 
+-	0xe0, 0x96, 0x68, 0x08, 0xe0, 0xa2, 0x28, 0x28, 
+-	0xe0, 0x09, 0x09, 0x95, 0xe0, 0x96, 0x68, 0x09, 
+-	0xe0, 0xa2, 0x58, 0x29, 0xe0, 0x95, 0x20, 0x01, 
+-	0xe2, 0xb4, 0x10, 0x00, 0x41, 0xa0, 0xf0, 0x0e, 
+-	0xe0, 0x96, 0x60, 0x06, 0xe0, 0xb2, 0x20, 0x02, 
+-	0xe0, 0xa1, 0x10, 0x01, 0xe2, 0x43, 0x30, 0x01, 
+-	0xe1, 0xa0, 0xf0, 0x0e, 0xe3, 0x35, 0x00, 0x00, 
+-	0x0a, 0x00, 0x00, 0x24, 0xe1, 0xa0, 0x28, 0x21, 
+-	0xe1, 0xc1, 0x68, 0x02, 0xe1, 0xa0, 0x88, 0x24, 
+-	0xe1, 0xc4, 0x98, 0x08, 0xe0, 0x01, 0x08, 0x92, 
+-	0xe0, 0x08, 0x08, 0x96, 0xe0, 0x04, 0x06, 0x99, 
+-	0xe0, 0x94, 0x48, 0x08, 0xe0, 0xa1, 0x18, 0x28, 
+-	0xe0, 0x09, 0x09, 0x92, 0xe0, 0x94, 0x48, 0x09, 
+-	0xe0, 0xa1, 0x18, 0x29, 0xe1, 0xa0, 0x88, 0x25, 
+-	0xe1, 0xc5, 0x98, 0x08, 0xe0, 0x05, 0x08, 0x92, 
+-	0xe0, 0x08, 0x08, 0x96, 0xe0, 0x06, 0x06, 0x99, 
+-	0xe0, 0x96, 0x68, 0x08, 0xe0, 0xa5, 0x58, 0x28, 
+-	0xe0, 0x09, 0x09, 0x92, 0xe0, 0x96, 0x68, 0x09, 
+-	0xe0, 0xa5, 0x28, 0x29, 0xe0, 0x92, 0x20, 0x04, 
+-	0xe2, 0xb1, 0x10, 0x00, 0x41, 0xa0, 0xf0, 0x0e, 
+-	0xe0, 0x96, 0x60, 0x06, 0xe0, 0xb2, 0x20, 0x02, 
+-	0xe0, 0xa1, 0x10, 0x01, 0xe2, 0x43, 0x30, 0x01, 
+-	0xe1, 0xa0, 0xf0, 0x0e, 0xe3, 0xc0, 0x81, 0x03, 
+-	0xe3, 0xc3, 0x91, 0x03, 0xe0, 0x20, 0x00, 0x03, 
+-	0xe2, 0x00, 0x01, 0x02, 0xe0, 0x88, 0x30, 0x09, 
+-	0xe2, 0x43, 0x3c, 0x3f, 0xe2, 0x43, 0x30, 0xfe, 
+-	0xe1, 0xa0, 0x58, 0x24, 0xe1, 0xc4, 0x68, 0x05, 
+-	0xe1, 0xa0, 0x88, 0x21, 0xe1, 0xc1, 0x98, 0x08, 
+-	0xe0, 0x01, 0x08, 0x95, 0xe0, 0x08, 0x08, 0x96, 
+-	0xe0, 0x02, 0x06, 0x99, 0xe0, 0x92, 0x28, 0x08, 
+-	0xe0, 0xa1, 0x18, 0x28, 0xe0, 0x09, 0x09, 0x95, 
+-	0xe0, 0x92, 0x28, 0x09, 0xe0, 0xb1, 0x18, 0x29, 
+-	0xe3, 0xa0, 0x60, 0x00, 0x41, 0xa0, 0xf0, 0x0e, 
+-	0xe0, 0x92, 0x20, 0x02, 0xe0, 0xa1, 0x10, 0x01, 
+-	0xe2, 0x43, 0x30, 0x01, 0xe1, 0xa0, 0xf0, 0x0e, 
+-	0xe1, 0xa0, 0x98, 0x83, 0xe3, 0x79, 0x08, 0x02, 
+-	0x30, 0x09, 0x90, 0x04, 0xe0, 0x19, 0x90, 0x83, 
+-	0xe1, 0xa0, 0x88, 0x80, 0xe3, 0x78, 0x08, 0x02, 
+-	0x30, 0x08, 0x80, 0x01, 0xe0, 0x18, 0x80, 0x80, 
+-	0x4a, 0x00, 0x00, 0x1f, 0xe3, 0x19, 0x01, 0x02, 
+-	0x1a, 0x00, 0x00, 0x2f, 0xe1, 0x91, 0x80, 0x02, 
+-	0x11, 0x94, 0x80, 0x05, 0x0a, 0x00, 0x00, 0x13, 
+-	0xe0, 0x11, 0x60, 0x80, 0x43, 0xc1, 0x11, 0x02, 
+-	0x42, 0x80, 0x00, 0x01, 0xe0, 0x14, 0x60, 0x83, 
+-	0x43, 0xc4, 0x41, 0x02, 0x42, 0x83, 0x30, 0x01, 
+-	0xe3, 0xc0, 0x81, 0x03, 0xe3, 0xc3, 0x91, 0x03, 
+-	0xe0, 0x20, 0x00, 0x03, 0xe2, 0x00, 0x01, 0x02, 
+-	0xe0, 0x88, 0x30, 0x09, 0xe2, 0x43, 0x3c, 0x3f, 
+-	0xe2, 0x43, 0x30, 0xfe, 0xe9, 0x2d, 0x40, 0x00, 
+-	0xe3, 0x11, 0x01, 0x02, 0x0b, 0x00, 0x04, 0xed, 
+-	0xe3, 0x14, 0x01, 0x02, 0x0b, 0x00, 0x05, 0x04, 
+-	0xe8, 0xbd, 0x40, 0x00, 0xea, 0xff, 0xff, 0x44, 
+-	0xe0, 0x20, 0x00, 0x03, 0xe2, 0x00, 0x01, 0x02, 
+-	0xe3, 0xa0, 0x10, 0x00, 0xe3, 0xa0, 0x20, 0x00, 
+-	0xe3, 0xa0, 0x30, 0x00, 0xe3, 0xa0, 0x60, 0x00, 
+-	0xe1, 0xa0, 0xf0, 0x0e, 0xe3, 0x19, 0x01, 0x02, 
+-	0x0a, 0x00, 0x00, 0x09, 0xe1, 0x82, 0x80, 0x81, 
+-	0xe1, 0x88, 0x80, 0x05, 0xe1, 0x98, 0x80, 0x84, 
+-	0x1a, 0x00, 0x05, 0x2d, 0xe0, 0x20, 0x80, 0x03, 
+-	0xe2, 0x08, 0x81, 0x02, 0xe2, 0x8f, 0x00, 0x44, 
+-	0xe8, 0x90, 0x00, 0x07, 0xe1, 0x80, 0x00, 0x08, 
+-	0xe1, 0xa0, 0xf0, 0x0e, 0xe1, 0x92, 0x80, 0x81, 
+-	0x1a, 0x00, 0x05, 0x36, 0xe1, 0x94, 0x80, 0x05, 
+-	0x1a, 0xff, 0xff, 0xf5, 0xe3, 0x80, 0x04, 0x61, 
+-	0xe1, 0xa0, 0xf0, 0x0e, 0xe1, 0x95, 0x80, 0x84, 
+-	0x1a, 0x00, 0x05, 0x27, 0xe1, 0x91, 0x80, 0x02, 
+-	0x1a, 0xff, 0xff, 0xef, 0xe3, 0x80, 0x04, 0x61, 
+-	0xe1, 0xa0, 0xf0, 0x0e, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x40, 0x00, 0x7f, 0xff, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0xe1, 0xa0, 0x80, 0x00, 
+-	0xe1, 0xa0, 0x00, 0x03, 0xe1, 0xa0, 0x30, 0x08, 
+-	0xe1, 0xa0, 0x80, 0x01, 0xe1, 0xa0, 0x10, 0x04, 
+-	0xe1, 0xa0, 0x40, 0x08, 0xe1, 0xa0, 0x80, 0x02, 
+-	0xe1, 0xa0, 0x20, 0x05, 0xe1, 0xa0, 0x50, 0x08, 
+-	0xe3, 0xc0, 0x81, 0x03, 0xe3, 0xc3, 0x91, 0x03, 
+-	0xe0, 0x20, 0x00, 0x03, 0xe2, 0x00, 0x01, 0x02, 
+-	0xe0, 0x49, 0x30, 0x08, 0xe2, 0x83, 0x3c, 0x3f, 
+-	0xe2, 0x83, 0x30, 0xff, 0xe9, 0x2d, 0x48, 0x89, 
+-	0xe1, 0xa0, 0x08, 0x21, 0xe1, 0xc1, 0x78, 0x00, 
+-	0xe1, 0xa0, 0xb8, 0x22, 0xe1, 0xc2, 0xe8, 0x0b, 
+-	0xe2, 0x8f, 0x6e, 0x36, 0xe7, 0xd6, 0x64, 0x20, 
+-	0xe0, 0x28, 0x66, 0x90, 0xe2, 0x68, 0x85, 0x02, 
+-	0xe0, 0x06, 0x06, 0x98, 0xe1, 0xa0, 0x69, 0xa6, 
+-	0xe2, 0x86, 0x60, 0x02, 0xe1, 0xa0, 0x86, 0xa1, 
+-	0xe0, 0x29, 0x66, 0x98, 0xe2, 0x69, 0x92, 0x02, 
+-	0xe1, 0xa0, 0x88, 0x29, 0xe1, 0xc9, 0x98, 0x08, 
+-	0xe0, 0x02, 0x06, 0x99, 0xe0, 0x01, 0x06, 0x98, 
+-	0xe0, 0x81, 0x68, 0x22, 0xe1, 0xa0, 0x63, 0x26, 
+-	0xe1, 0xb0, 0x40, 0xa4, 0xe1, 0xb0, 0x50, 0x65, 
+-	0x33, 0xa0, 0x30, 0x00, 0x23, 0xa0, 0x31, 0x02, 
+-	0xe1, 0xa0, 0x87, 0xa4, 0xe0, 0x09, 0x08, 0x96, 
+-	0xe1, 0xa0, 0x98, 0x29, 0xe0, 0x08, 0x0b, 0x99, 
+-	0xe0, 0x55, 0x50, 0x08, 0xe0, 0x08, 0x09, 0x90, 
+-	0xe0, 0xc4, 0x40, 0x08, 0xe0, 0x08, 0x0e, 0x99, 
+-	0xe0, 0x53, 0x38, 0x08, 0xe0, 0xd5, 0x58, 0x28, 
+-	0xe0, 0x08, 0x07, 0x99, 0x30, 0x45, 0x58, 0x08, 
+-	0x20, 0x55, 0x58, 0x08, 0xe0, 0xc4, 0x48, 0x28, 
+-	0xe1, 0xa0, 0x18, 0x09, 0xe1, 0xa0, 0x81, 0x24, 
+-	0xe0, 0x09, 0x08, 0x96, 0xe1, 0xa0, 0x98, 0x29, 
+-	0xe0, 0x08, 0x0b, 0x99, 0xe0, 0x53, 0x39, 0x88, 
+-	0xe0, 0xd5, 0x56, 0xa8, 0xe0, 0x08, 0x09, 0x90, 
+-	0x30, 0x45, 0x59, 0x88, 0x20, 0x55, 0x59, 0x88, 
+-	0xe0, 0xc4, 0x46, 0xa8, 0xe0, 0x08, 0x0e, 0x99, 
+-	0xe0, 0x53, 0x31, 0x88, 0xe0, 0xd5, 0x5e, 0xa8, 
+-	0xe0, 0x08, 0x07, 0x99, 0x30, 0x45, 0x51, 0x88, 
+-	0x20, 0x55, 0x51, 0x88, 0xe0, 0xc4, 0x4e, 0xa8, 
+-	0xe1, 0xa0, 0x4d, 0x04, 0xe1, 0x84, 0x43, 0x25, 
+-	0xe1, 0xa0, 0x5d, 0x05, 0xe1, 0x85, 0x53, 0x23, 
+-	0xe1, 0xa0, 0x3d, 0x03, 0xe0, 0x81, 0x11, 0x89, 
+-	0xe5, 0x9d, 0x80, 0x0c, 0xe3, 0x18, 0x00, 0x01, 
+-	0x1a, 0x00, 0x00, 0x94, 0xe1, 0xa0, 0x87, 0xa4, 
+-	0xe0, 0x09, 0x08, 0x96, 0xe1, 0xa0, 0x98, 0x29, 
+-	0xe0, 0x08, 0x0b, 0x99, 0xe0, 0x55, 0x50, 0x08, 
+-	0xe0, 0x08, 0x09, 0x90, 0xe0, 0xc4, 0x40, 0x08, 
+-	0xe0, 0x08, 0x0e, 0x99, 0xe0, 0x53, 0x38, 0x08, 
+-	0xe0, 0xd5, 0x58, 0x28, 0xe0, 0x08, 0x07, 0x99, 
+-	0x30, 0x45, 0x58, 0x08, 0x20, 0x55, 0x58, 0x08, 
+-	0xe0, 0xc4, 0x48, 0x28, 0xe1, 0xa0, 0x2b, 0x09, 
+-	0xe0, 0x81, 0x15, 0x29, 0xe1, 0xa0, 0x81, 0x24, 
+-	0xe0, 0x09, 0x08, 0x96, 0xe1, 0xa0, 0x98, 0x29, 
+-	0xe0, 0x08, 0x0b, 0x99, 0xe0, 0x53, 0x39, 0x88, 
+-	0xe0, 0xd5, 0x56, 0xa8, 0xe0, 0x08, 0x09, 0x90, 
+-	0x30, 0x45, 0x59, 0x88, 0x20, 0x55, 0x59, 0x88, 
+-	0xe0, 0xc4, 0x46, 0xa8, 0xe0, 0x08, 0x0e, 0x99, 
+-	0xe0, 0x53, 0x31, 0x88, 0xe0, 0xd5, 0x5e, 0xa8, 
+-	0xe0, 0x08, 0x07, 0x99, 0x30, 0x45, 0x51, 0x88, 
+-	0x20, 0x55, 0x51, 0x88, 0xe0, 0xc4, 0x4e, 0xa8, 
+-	0xe1, 0xa0, 0x4d, 0x04, 0xe1, 0x84, 0x43, 0x25, 
+-	0xe1, 0xa0, 0x5d, 0x05, 0xe1, 0x85, 0x53, 0x23, 
+-	0xe1, 0xa0, 0x3d, 0x03, 0xe0, 0x92, 0x24, 0x89, 
+-	0xe2, 0xa1, 0x10, 0x00, 0xe5, 0x9d, 0x80, 0x0c, 
+-	0xe3, 0x18, 0x00, 0x02, 0x1a, 0x00, 0x00, 0x3f, 
+-	0xe1, 0xa0, 0x87, 0xa4, 0xe0, 0x09, 0x08, 0x96, 
+-	0xe1, 0xa0, 0x98, 0x29, 0xe0, 0x08, 0x0b, 0x99, 
+-	0xe0, 0x55, 0x50, 0x08, 0xe0, 0x08, 0x09, 0x90, 
+-	0xe0, 0xc4, 0x40, 0x08, 0xe0, 0x08, 0x0e, 0x99, 
+-	0xe0, 0x53, 0x38, 0x08, 0xe0, 0xd5, 0x58, 0x28, 
+-	0xe0, 0x08, 0x07, 0x99, 0x30, 0x45, 0x58, 0x08, 
+-	0x20, 0x55, 0x58, 0x08, 0xe0, 0xc4, 0x48, 0x28, 
+-	0xe1, 0xa0, 0x47, 0x04, 0xe1, 0x84, 0x49, 0x25, 
+-	0xe1, 0xa0, 0x57, 0x05, 0xe1, 0x85, 0x59, 0x23, 
+-	0xe1, 0xa0, 0x37, 0x03, 0xe1, 0xa0, 0x6e, 0x09, 
+-	0xe0, 0x92, 0x22, 0x29, 0xe2, 0xa1, 0x10, 0x00, 
+-	0xe1, 0x87, 0x08, 0x00, 0xe1, 0x8e, 0x78, 0x0b, 
+-	0xe3, 0xa0, 0xe0, 0x00, 0xe0, 0x55, 0x90, 0x07, 
+-	0xe0, 0xd4, 0x80, 0x00, 0x21, 0xa0, 0x50, 0x09, 
+-	0x21, 0xa0, 0x40, 0x08, 0xe0, 0xae, 0xe0, 0x0e, 
+-	0xe3, 0xa0, 0xb0, 0x00, 0xe0, 0x93, 0x30, 0x03, 
+-	0xe0, 0xb5, 0x50, 0x05, 0xe0, 0xb4, 0x40, 0x04, 
+-	0xe0, 0xab, 0xb0, 0x0b, 0xe0, 0x55, 0x90, 0x07, 
+-	0xe0, 0xd4, 0x80, 0x00, 0xe2, 0xdb, 0xb0, 0x00, 
+-	0x21, 0xa0, 0x50, 0x09, 0x21, 0xa0, 0x40, 0x08, 
+-	0xe0, 0xae, 0xe0, 0x0e, 0xe3, 0xa0, 0xb0, 0x00, 
+-	0xe0, 0x93, 0x30, 0x03, 0xe0, 0xb5, 0x50, 0x05, 
+-	0xe0, 0xb4, 0x40, 0x04, 0xe0, 0xab, 0xb0, 0x0b, 
+-	0xe0, 0x55, 0x90, 0x07, 0xe0, 0xd4, 0x80, 0x00, 
+-	0xe2, 0xdb, 0xb0, 0x00, 0x21, 0xa0, 0x50, 0x09, 
+-	0x21, 0xa0, 0x40, 0x08, 0xe0, 0xae, 0xe0, 0x0e, 
+-	0xe1, 0x94, 0x80, 0x05, 0x13, 0x86, 0x60, 0x01, 
+-	0xe0, 0x96, 0x6e, 0x0e, 0xe2, 0xb2, 0x20, 0x00, 
+-	0xe2, 0xb1, 0x10, 0x00, 0x48, 0xbd, 0x88, 0x89, 
+-	0xe8, 0xbd, 0x48, 0x89, 0xe0, 0x96, 0x60, 0x06, 
+-	0xe0, 0xb2, 0x20, 0x02, 0xe0, 0xa1, 0x10, 0x01, 
+-	0xe2, 0x43, 0x30, 0x01, 0xe1, 0xa0, 0xf0, 0x0e, 
+-	0xe1, 0x87, 0x08, 0x00, 0xe1, 0x8e, 0x78, 0x0b, 
+-	0xe3, 0xa0, 0xe0, 0x00, 0xe0, 0x93, 0x30, 0x03, 
+-	0xe0, 0xb5, 0x50, 0x05, 0xe0, 0xa4, 0x40, 0x04, 
+-	0xe0, 0x55, 0x90, 0x07, 0xe0, 0xd4, 0x80, 0x00, 
+-	0x21, 0xa0, 0x50, 0x09, 0x21, 0xa0, 0x40, 0x08, 
+-	0xe0, 0xae, 0xe0, 0x0e, 0xe3, 0xa0, 0xb0, 0x00, 
+-	0xe0, 0x93, 0x30, 0x03, 0xe0, 0xb5, 0x50, 0x05, 
+-	0xe0, 0xb4, 0x40, 0x04, 0xe0, 0xab, 0xb0, 0x0b, 
+-	0xe0, 0x55, 0x90, 0x07, 0xe0, 0xd4, 0x80, 0x00, 
+-	0xe2, 0xdb, 0xb0, 0x00, 0x21, 0xa0, 0x50, 0x09, 
+-	0x21, 0xa0, 0x40, 0x08, 0xe0, 0xae, 0xe0, 0x0e, 
+-	0xe3, 0xa0, 0xb0, 0x00, 0xe0, 0x93, 0x30, 0x03, 
+-	0xe0, 0xb5, 0x50, 0x05, 0xe0, 0xb4, 0x40, 0x04, 
+-	0xe0, 0xab, 0xb0, 0x0b, 0xe0, 0x55, 0x90, 0x07, 
+-	0xe0, 0xd4, 0x80, 0x00, 0xe2, 0xdb, 0xb0, 0x00, 
+-	0x21, 0xa0, 0x50, 0x09, 0x21, 0xa0, 0x40, 0x08, 
+-	0xe0, 0xae, 0xe0, 0x0e, 0xe1, 0x84, 0x60, 0x05, 
+-	0xe0, 0x92, 0x24, 0x8e, 0xe2, 0xb1, 0x10, 0x00, 
+-	0x48, 0xbd, 0x88, 0x89, 0xe8, 0xbd, 0x48, 0x89, 
+-	0xe0, 0x92, 0x20, 0x02, 0xe0, 0xa1, 0x10, 0x01, 
+-	0xe2, 0x43, 0x30, 0x01, 0xe1, 0xa0, 0xf0, 0x0e, 
+-	0xe1, 0x87, 0x08, 0x00, 0xe1, 0x8e, 0x78, 0x0b, 
+-	0xe0, 0x93, 0x30, 0x03, 0xe0, 0xb5, 0x50, 0x05, 
+-	0xe0, 0xa4, 0x40, 0x04, 0xe0, 0x55, 0x90, 0x07, 
+-	0xe0, 0xd4, 0x80, 0x00, 0x21, 0xa0, 0x50, 0x09, 
+-	0x21, 0xa0, 0x40, 0x08, 0x22, 0x81, 0x10, 0x20, 
+-	0xe3, 0xa0, 0xb0, 0x00, 0xe0, 0x93, 0x30, 0x03, 
+-	0xe0, 0xb5, 0x50, 0x05, 0xe0, 0xb4, 0x40, 0x04, 
+-	0xe0, 0xab, 0xb0, 0x0b, 0xe0, 0x55, 0x90, 0x07, 
+-	0xe0, 0xd4, 0x80, 0x00, 0xe2, 0xdb, 0xb0, 0x00, 
+-	0x21, 0xa0, 0x50, 0x09, 0x21, 0xa0, 0x40, 0x08, 
+-	0x22, 0x81, 0x10, 0x10, 0xe3, 0xa0, 0xb0, 0x00, 
+-	0xe0, 0x93, 0x30, 0x03, 0xe0, 0xb5, 0x50, 0x05, 
+-	0xe0, 0xb4, 0x40, 0x04, 0xe0, 0xab, 0xb0, 0x0b, 
+-	0xe0, 0x55, 0x90, 0x07, 0xe0, 0xd4, 0x80, 0x00, 
+-	0xe2, 0xdb, 0xb0, 0x00, 0x21, 0xa0, 0x50, 0x09, 
+-	0x21, 0xa0, 0x40, 0x08, 0x22, 0x81, 0x10, 0x08, 
+-	0xe1, 0x84, 0x60, 0x05, 0xe3, 0xa0, 0x20, 0x00, 
+-	0xe3, 0x31, 0x00, 0x00, 0x48, 0xbd, 0x88, 0x89, 
+-	0xe8, 0xbd, 0x48, 0x89, 0xe1, 0xa0, 0x10, 0x81, 
+-	0xe2, 0x43, 0x30, 0x01, 0xe1, 0xa0, 0xf0, 0x0e, 
+-	0x80, 0x80, 0x7f, 0x7e, 0x7d, 0x7c, 0x7b, 0x7a, 
+-	0x79, 0x78, 0x77, 0x76, 0x76, 0x75, 0x74, 0x73, 
+-	0x72, 0x71, 0x71, 0x70, 0x6f, 0x6e, 0x6e, 0x6d, 
+-	0x6c, 0x6c, 0x6b, 0x6a, 0x6a, 0x69, 0x68, 0x68, 
+-	0x67, 0x66, 0x66, 0x65, 0x64, 0x64, 0x63, 0x63, 
+-	0x62, 0x61, 0x61, 0x60, 0x60, 0x5f, 0x5f, 0x5e, 
+-	0x5e, 0x5d, 0x5d, 0x5c, 0x5c, 0x5b, 0x5b, 0x5a, 
+-	0x5a, 0x59, 0x59, 0x58, 0x58, 0x57, 0x57, 0x56, 
+-	0x56, 0x55, 0x55, 0x55, 0x54, 0x54, 0x53, 0x53, 
+-	0x52, 0x52, 0x52, 0x51, 0x51, 0x50, 0x50, 0x50, 
+-	0x4f, 0x4f, 0x4f, 0x4e, 0x4e, 0x4d, 0x4d, 0x4d, 
+-	0x4c, 0x4c, 0x4c, 0x4b, 0x4b, 0x4b, 0x4a, 0x4a, 
+-	0x4a, 0x49, 0x49, 0x49, 0x48, 0x48, 0x48, 0x47, 
+-	0x47, 0x47, 0x47, 0x46, 0x46, 0x46, 0x45, 0x45, 
+-	0x45, 0x44, 0x44, 0x44, 0x44, 0x43, 0x43, 0x43, 
+-	0x43, 0x42, 0x42, 0x42, 0x42, 0x41, 0x41, 0x41, 
+-	0xe1, 0xa0, 0x98, 0x83, 0xe3, 0x79, 0x08, 0x02, 
+-	0x30, 0x09, 0x90, 0x04, 0xe0, 0x19, 0x90, 0x83, 
+-	0xe1, 0xa0, 0x88, 0x80, 0xe3, 0x78, 0x08, 0x02, 
+-	0x30, 0x08, 0x80, 0x01, 0xe0, 0x18, 0x80, 0x80, 
+-	0x4a, 0x00, 0x00, 0x20, 0xe3, 0x19, 0x01, 0x02, 
+-	0x1a, 0x00, 0x00, 0x32, 0xe3, 0x1b, 0x00, 0x04, 
+-	0x1a, 0x00, 0x00, 0x08, 0xe1, 0xa0, 0x80, 0x00, 
+-	0xe1, 0xa0, 0x00, 0x03, 0xe1, 0xa0, 0x30, 0x08, 
+-	0xe1, 0xa0, 0x80, 0x01, 0xe1, 0xa0, 0x10, 0x04, 
+-	0xe1, 0xa0, 0x40, 0x08, 0xe1, 0xa0, 0x80, 0x02, 
+-	0xe1, 0xa0, 0x20, 0x05, 0xe1, 0xa0, 0x50, 0x08, 
+-	0xe0, 0x11, 0x60, 0x80, 0x43, 0xc1, 0x11, 0x02, 
+-	0x42, 0x80, 0x00, 0x01, 0xe0, 0x14, 0x60, 0x83, 
+-	0x43, 0xc4, 0x41, 0x02, 0x42, 0x83, 0x30, 0x01, 
+-	0xe3, 0xc0, 0x81, 0x03, 0xe3, 0xc3, 0x91, 0x03, 
+-	0xe0, 0x20, 0x00, 0x03, 0xe2, 0x00, 0x01, 0x02, 
+-	0xe0, 0x49, 0x30, 0x08, 0xe2, 0x83, 0x3c, 0x3f, 
+-	0xe2, 0x83, 0x30, 0xff, 0xe9, 0x2d, 0x40, 0x00, 
+-	0xe3, 0x11, 0x01, 0x02, 0x0b, 0x00, 0x03, 0xa1, 
+-	0xe3, 0x14, 0x01, 0x02, 0x0b, 0x00, 0x03, 0x86, 
+-	0xe8, 0xbd, 0x40, 0x00, 0xea, 0xff, 0xfe, 0xb6, 
+-	0xe3, 0x19, 0x01, 0x02, 0x0a, 0x00, 0x00, 0x05, 
+-	0xe1, 0x82, 0x80, 0x81, 0xe1, 0x88, 0x80, 0x05, 
+-	0xe1, 0x98, 0x80, 0x84, 0x1a, 0x00, 0x03, 0xb6, 
+-	0xe3, 0x80, 0x04, 0x61, 0xe1, 0xa0, 0xf0, 0x0e, 
+-	0xe1, 0x92, 0x80, 0x81, 0x1a, 0x00, 0x03, 0xc3, 
+-	0xe0, 0x20, 0x80, 0x03, 0xe2, 0x08, 0x81, 0x02, 
+-	0xe3, 0x1b, 0x00, 0x04, 0x02, 0x8f, 0x00, 0x50, 
+-	0x12, 0x8f, 0x00, 0x40, 0xe8, 0x90, 0x00, 0x07, 
+-	0xe1, 0x80, 0x00, 0x08, 0xe3, 0xa0, 0x30, 0x00, 
+-	0xe3, 0xa0, 0x60, 0x00, 0xe1, 0xa0, 0xf0, 0x0e, 
+-	0xe1, 0x95, 0x80, 0x84, 0x1a, 0x00, 0x03, 0xae, 
+-	0xe0, 0x20, 0x80, 0x03, 0xe2, 0x08, 0x81, 0x02, 
+-	0xe3, 0x1b, 0x00, 0x04, 0x12, 0x8f, 0x00, 0x20, 
+-	0x02, 0x8f, 0x00, 0x10, 0xe8, 0x90, 0x00, 0x07, 
+-	0xe1, 0x80, 0x00, 0x08, 0xe3, 0xa0, 0x30, 0x00, 
+-	0xe3, 0xa0, 0x60, 0x00, 0xe1, 0xa0, 0xf0, 0x0e, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x7f, 0xff, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0xb5, 0x00, 0x49, 0x02, 0xf0, 0x00, 0xf9, 0x2a, 
+-	0xbc, 0x08, 0x47, 0x18, 0xff, 0xff, 0xff, 0xfd, 
+-	0xb5, 0x80, 0x1c, 0x07, 0x28, 0x0a, 0xd2, 0x14, 
+-	0xa3, 0x01, 0x5c, 0x1b, 0x00, 0x5b, 0x44, 0x9f, 
+-	0x10, 0x04, 0x10, 0x06, 0x08, 0x0a, 0x0c, 0x10, 
+-	0x0e, 0x0e, 0xa0, 0x0f, 0xe0, 0x0c, 0xa0, 0x1a, 
+-	0xe0, 0x0a, 0xa0, 0x33, 0xe0, 0x08, 0xa0, 0x3f, 
+-	0xe0, 0x06, 0xa0, 0x4b, 0xe0, 0x04, 0xa0, 0x52, 
+-	0xe0, 0x02, 0x1c, 0x38, 0xf0, 0x00, 0xff, 0x89, 
+-	0x21, 0x03, 0xf0, 0x00, 0xf9, 0x27, 0x2f, 0x04, 
+-	0xd1, 0x05, 0x20, 0x01, 0xf7, 0xfe, 0xf8, 0xd4, 
+-	0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 0xf7, 0xfe, 
+-	0xfd, 0xb3, 0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 
+-	0x41, 0x62, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 
+-	0x20, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 
+-	0x74, 0x69, 0x6f, 0x6e, 0x20, 0x28, 0x65, 0x2e, 
+-	0x67, 0x2e, 0x20, 0x61, 0x62, 0x6f, 0x72, 0x74, 
+-	0x28, 0x29, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 
+-	0x69, 0x6f, 0x6e, 0x29, 0x00, 0x00, 0x00, 0x00, 
+-	0x49, 0x6c, 0x6c, 0x65, 0x67, 0x61, 0x6c, 0x20, 
+-	0x69, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 
+-	0x69, 0x6f, 0x6e, 0x20, 0x28, 0x63, 0x61, 0x6c, 
+-	0x6c, 0x20, 0x74, 0x6f, 0x20, 0x6e, 0x6f, 0x6e, 
+-	0x2d, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 
+-	0x6e, 0x2f, 0x63, 0x6f, 0x64, 0x65, 0x20, 0x63, 
+-	0x6f, 0x72, 0x72, 0x75, 0x70, 0x74, 0x65, 0x64, 
+-	0x29, 0x0a, 0x5b, 0x69, 0x73, 0x20, 0x74, 0x68, 
+-	0x65, 0x20, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x69, 
+-	0x6e, 0x67, 0x20, 0x70, 0x6f, 0x69, 0x6e, 0x74, 
+-	0x20, 0x65, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x6f, 
+-	0x72, 0x20, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6c, 
+-	0x6c, 0x65, 0x64, 0x3f, 0x5d, 0x00, 0x00, 0x00, 
+-	0x49, 0x6e, 0x74, 0x65, 0x72, 0x72, 0x75, 0x70, 
+-	0x74, 0x20, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 
+-	0x65, 0x64, 0x20, 0x66, 0x72, 0x6f, 0x6d, 0x20, 
+-	0x75, 0x73, 0x65, 0x72, 0x20, 0x2d, 0x20, 0x70, 
+-	0x72, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x20, 0x74, 
+-	0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x65, 
+-	0x64, 0x00, 0x00, 0x00, 0x49, 0x6c, 0x6c, 0x65, 
+-	0x67, 0x61, 0x6c, 0x20, 0x61, 0x64, 0x64, 0x72, 
+-	0x65, 0x73, 0x73, 0x20, 0x28, 0x65, 0x2e, 0x67, 
+-	0x2e, 0x20, 0x77, 0x69, 0x6c, 0x64, 0x6c, 0x79, 
+-	0x20, 0x6f, 0x75, 0x74, 0x73, 0x69, 0x64, 0x65, 
+-	0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x20, 0x62, 
+-	0x6f, 0x75, 0x6e, 0x64, 0x73, 0x29, 0x00, 0x00, 
+-	0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 
+-	0x69, 0x6f, 0x6e, 0x20, 0x72, 0x65, 0x71, 0x75, 
+-	0x65, 0x73, 0x74, 0x20, 0x72, 0x65, 0x63, 0x65, 
+-	0x69, 0x76, 0x65, 0x64, 0x00, 0x00, 0x00, 0x00, 
+-	0x55, 0x73, 0x65, 0x72, 0x2d, 0x64, 0x65, 0x66, 
+-	0x69, 0x6e, 0x65, 0x64, 0x20, 0x73, 0x69, 0x67, 
+-	0x6e, 0x61, 0x6c, 0x00, 0xb5, 0x00, 0x20, 0x01, 
+-	0x49, 0x05, 0x70, 0x08, 0xa0, 0x05, 0x21, 0x03, 
+-	0xf0, 0x00, 0xf8, 0x78, 0x20, 0x64, 0xf7, 0xfe, 
+-	0xf8, 0x27, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x21, 0x94, 0x53, 0x74, 0x61, 0x63, 
+-	0x6b, 0x20, 0x6f, 0x76, 0x65, 0x72, 0x66, 0x6c, 
+-	0x6f, 0x77, 0x0a, 0x00, 0xb5, 0x00, 0x28, 0x07, 
+-	0xd1, 0x03, 0xf7, 0xff, 0xff, 0xe3, 0xbc, 0x08, 
+-	0x47, 0x18, 0xf7, 0xff, 0xff, 0x19, 0xbc, 0x08, 
+-	0x47, 0x18, 0xb5, 0x00, 0xf7, 0xff, 0xff, 0xf2, 
+-	0xbc, 0x08, 0x47, 0x18, 0xb5, 0x90, 0x28, 0x00, 
+-	0xdd, 0x01, 0x28, 0x0b, 0xdb, 0x05, 0x20, 0x03, 
+-	0x49, 0x0b, 0x60, 0x08, 0xbc, 0x90, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x87, 0x4b, 0x09, 0x59, 0xd9, 
+-	0x4a, 0x09, 0x42, 0x91, 0xd1, 0x02, 0xf7, 0xff, 
+-	0xff, 0xdd, 0xe0, 0x05, 0x4c, 0x07, 0x42, 0xa1, 
+-	0xd0, 0x02, 0x51, 0xda, 0xf7, 0xfd, 0xfa, 0xee, 
+-	0x20, 0x00, 0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x20, 0xb0, 0x2e, 0x08, 0x94, 0xac, 
+-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfd, 
+-	0x28, 0x00, 0xdd, 0x09, 0x28, 0x0b, 0xda, 0x07, 
+-	0x00, 0x80, 0x49, 0x04, 0x58, 0x08, 0x49, 0x04, 
+-	0x42, 0x88, 0xd0, 0x01, 0x20, 0x01, 0x47, 0x70, 
+-	0x20, 0x00, 0x47, 0x70, 0x2e, 0x08, 0x94, 0xac, 
+-	0xff, 0xff, 0xff, 0xff, 0x28, 0x00, 0xdd, 0x01, 
+-	0x28, 0x0b, 0xdb, 0x01, 0x48, 0x03, 0x47, 0x70, 
+-	0x00, 0x83, 0x4a, 0x03, 0x58, 0xd0, 0x50, 0xd1, 
+-	0x47, 0x70, 0x00, 0x00, 0xff, 0xff, 0xff, 0xfe, 
+-	0x2e, 0x08, 0x94, 0xac, 0xb5, 0x90, 0x27, 0x01, 
+-	0x4c, 0x05, 0x1c, 0x38, 0x1c, 0x21, 0xf7, 0xff, 
+-	0xff, 0xe9, 0x37, 0x01, 0x2f, 0x0b, 0xdb, 0xf8, 
+-	0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0xff, 0xff, 0xff, 0xff, 0xb5, 0x90, 0x1c, 0x0c, 
+-	0x1c, 0x07, 0x48, 0x12, 0x28, 0x00, 0xd0, 0x09, 
+-	0x48, 0x11, 0x78, 0x00, 0x28, 0x00, 0xd1, 0x05, 
+-	0x1c, 0x38, 0x1c, 0x21, 0xf0, 0x00, 0xfb, 0x44, 
+-	0x28, 0x00, 0xd1, 0x13, 0x08, 0x60, 0xd3, 0x02, 
+-	0x20, 0x0a, 0xf0, 0x00, 0xf8, 0xd3, 0x78, 0x38, 
+-	0x28, 0x00, 0xd0, 0x06, 0x78, 0x38, 0x37, 0x01, 
+-	0xf0, 0x00, 0xf8, 0xcc, 0x78, 0x38, 0x28, 0x00, 
+-	0xd1, 0xf8, 0x08, 0xa0, 0xd3, 0x02, 0x20, 0x0a, 
+-	0xf0, 0x00, 0xf8, 0xc4, 0xbc, 0x90, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x01, 0xbd, 0x35, 
+-	0x2e, 0x08, 0x21, 0x94, 0xb5, 0x80, 0xb0, 0x83, 
+-	0x90, 0x00, 0x91, 0x01, 0xf7, 0xfd, 0xfb, 0x1e, 
+-	0x90, 0x02, 0x46, 0x69, 0x20, 0x01, 0xf0, 0x01, 
+-	0xf8, 0x61, 0x23, 0x01, 0x1c, 0x07, 0x42, 0xd8, 
+-	0xd1, 0x05, 0x21, 0x00, 0x20, 0x13, 0xf0, 0x01, 
+-	0xf8, 0x59, 0x49, 0x03, 0x60, 0x08, 0x1c, 0x38, 
+-	0xb0, 0x03, 0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x20, 0xb0, 0xb5, 0x80, 0xb0, 0x81, 
+-	0x90, 0x00, 0x46, 0x69, 0x20, 0x02, 0xf0, 0x01, 
+-	0xf8, 0x49, 0x1c, 0x07, 0xd0, 0x05, 0x21, 0x00, 
+-	0x20, 0x13, 0xf0, 0x01, 0xf8, 0x43, 0x49, 0x03, 
+-	0x60, 0x08, 0x1c, 0x38, 0xb0, 0x01, 0xbc, 0x80, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x20, 0xb0, 
+-	0xb5, 0x80, 0xb0, 0x84, 0x90, 0x00, 0x91, 0x01, 
+-	0x92, 0x02, 0x46, 0x69, 0x20, 0x05, 0xf0, 0x01, 
+-	0xf8, 0x31, 0x1c, 0x07, 0xd0, 0x05, 0x21, 0x00, 
+-	0x20, 0x13, 0xf0, 0x01, 0xf8, 0x2b, 0x49, 0x03, 
+-	0x60, 0x08, 0x1c, 0x38, 0xb0, 0x04, 0xbc, 0x80, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x20, 0xb0, 
+-	0xb5, 0x80, 0xb0, 0x84, 0x90, 0x00, 0x91, 0x01, 
+-	0x92, 0x02, 0x93, 0x03, 0x46, 0x69, 0x20, 0x06, 
+-	0xf0, 0x01, 0xf8, 0x18, 0x1c, 0x07, 0xd0, 0x05, 
+-	0x21, 0x00, 0x20, 0x13, 0xf0, 0x01, 0xf8, 0x12, 
+-	0x49, 0x03, 0x60, 0x08, 0x1c, 0x38, 0xb0, 0x04, 
+-	0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x20, 0xb0, 0xb5, 0x00, 0xb0, 0x81, 
+-	0x90, 0x00, 0x46, 0x69, 0x20, 0x08, 0xf0, 0x01, 
+-	0xf8, 0x01, 0xb0, 0x01, 0xbc, 0x08, 0x47, 0x18, 
+-	0xb5, 0x00, 0x69, 0x40, 0xb0, 0x81, 0x90, 0x00, 
+-	0x46, 0x69, 0x20, 0x09, 0xf0, 0x00, 0xff, 0xf6, 
+-	0xb0, 0x01, 0xbc, 0x08, 0x47, 0x18, 0xb5, 0x80, 
+-	0xb0, 0x82, 0x90, 0x00, 0x91, 0x01, 0x46, 0x69, 
+-	0x20, 0x0a, 0xf0, 0x00, 0xff, 0xeb, 0x1c, 0x07, 
+-	0xd5, 0x05, 0x21, 0x00, 0x20, 0x13, 0xf0, 0x00, 
+-	0xff, 0xe5, 0x49, 0x03, 0x60, 0x08, 0x1c, 0x38, 
+-	0xb0, 0x02, 0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x20, 0xb0, 0xb5, 0x80, 0xb0, 0x81, 
+-	0x90, 0x00, 0x46, 0x69, 0x20, 0x0b, 0xf0, 0x00, 
+-	0xff, 0xd5, 0x1c, 0x07, 0xd5, 0x05, 0x21, 0x00, 
+-	0x20, 0x13, 0xf0, 0x00, 0xff, 0xcf, 0x49, 0x03, 
+-	0x60, 0x08, 0x1c, 0x38, 0xb0, 0x01, 0xbc, 0x80, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x20, 0xb0, 
+-	0xb5, 0x00, 0xb0, 0x81, 0x90, 0x00, 0x46, 0x69, 
+-	0x20, 0x0c, 0xf0, 0x00, 0xff, 0xbf, 0xb0, 0x01, 
+-	0xbc, 0x08, 0x47, 0x18, 0xb5, 0x00, 0xb0, 0x83, 
+-	0x90, 0x00, 0x91, 0x01, 0x92, 0x02, 0x46, 0x69, 
+-	0x20, 0x0d, 0xf0, 0x00, 0xff, 0xb3, 0xb0, 0x03, 
+-	0xbc, 0x08, 0x47, 0x18, 0xb5, 0x01, 0x46, 0x69, 
+-	0x20, 0x03, 0xf0, 0x00, 0xff, 0xab, 0xb0, 0x01, 
+-	0xbc, 0x08, 0x47, 0x18, 0xb5, 0x80, 0xb0, 0x82, 
+-	0x90, 0x00, 0xf7, 0xfd, 0xfa, 0x5b, 0x90, 0x01, 
+-	0x46, 0x69, 0x20, 0x12, 0xf0, 0x00, 0xff, 0x9e, 
+-	0x1c, 0x07, 0xd0, 0x05, 0x21, 0x00, 0x20, 0x13, 
+-	0xf0, 0x00, 0xff, 0x98, 0x49, 0x03, 0x60, 0x08, 
+-	0x1c, 0x38, 0xb0, 0x02, 0xbc, 0x80, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x20, 0xb0, 
+-	0xb5, 0x80, 0xb0, 0x82, 0x90, 0x00, 0xf7, 0xfd, 
+-	0xfa, 0x41, 0x90, 0x01, 0x46, 0x69, 0x20, 0x0e, 
+-	0xf0, 0x00, 0xff, 0x84, 0x1c, 0x07, 0xd0, 0x05, 
+-	0x21, 0x00, 0x20, 0x13, 0xf0, 0x00, 0xff, 0x7e, 
+-	0x49, 0x03, 0x60, 0x08, 0x1c, 0x38, 0xb0, 0x02, 
+-	0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x20, 0xb0, 0xb5, 0x80, 0xb0, 0x84, 
+-	0x90, 0x00, 0x1c, 0x0f, 0xf7, 0xfd, 0xfa, 0x26, 
+-	0x90, 0x01, 0x97, 0x02, 0x1c, 0x38, 0xf7, 0xfd, 
+-	0xfa, 0x21, 0x90, 0x03, 0x46, 0x69, 0x20, 0x0f, 
+-	0xf0, 0x00, 0xff, 0x64, 0x1c, 0x07, 0xd0, 0x05, 
+-	0x21, 0x00, 0x20, 0x13, 0xf0, 0x00, 0xff, 0x5e, 
+-	0x49, 0x03, 0x60, 0x08, 0x1c, 0x38, 0xb0, 0x04, 
+-	0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x20, 0xb0, 0xb5, 0x80, 0xb0, 0x82, 
+-	0x4f, 0x08, 0x97, 0x00, 0x20, 0xff, 0x30, 0x01, 
+-	0x90, 0x01, 0x46, 0x69, 0x20, 0x15, 0xf0, 0x00, 
+-	0xff, 0x49, 0x28, 0x00, 0xd0, 0x01, 0x20, 0x00, 
+-	0xe0, 0x00, 0x1c, 0x38, 0xb0, 0x02, 0xbc, 0x80, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x94, 0xdc, 
+-	0xb5, 0x00, 0x21, 0x00, 0x20, 0x10, 0xf0, 0x00, 
+-	0xff, 0x39, 0x49, 0x02, 0x68, 0x09, 0x1a, 0x40, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x21, 0xa4, 
+-	0xb5, 0x00, 0x21, 0x00, 0x20, 0x10, 0xf0, 0x00, 
+-	0xff, 0x2d, 0x49, 0x02, 0x60, 0x08, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x21, 0xa4, 
+-	0xb5, 0x80, 0x21, 0x00, 0x1c, 0x07, 0x20, 0x11, 
+-	0xf0, 0x00, 0xff, 0x20, 0x2f, 0x00, 0xd0, 0x00, 
+-	0x60, 0x38, 0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 
+-	0x20, 0x00, 0x47, 0x70, 0xb4, 0x80, 0x20, 0x03, 
+-	0x43, 0xc0, 0x23, 0x00, 0x49, 0x07, 0x54, 0x0b, 
+-	0x30, 0x01, 0xd4, 0xfc, 0x20, 0x00, 0x4a, 0x06, 
+-	0x5c, 0x17, 0x54, 0x0f, 0x18, 0x0f, 0x37, 0x80, 
+-	0x70, 0x3b, 0x30, 0x01, 0x28, 0x80, 0xd3, 0xf7, 
+-	0xbc, 0x80, 0x47, 0x70, 0x2e, 0x08, 0x21, 0xac, 
+-	0x2e, 0x03, 0x3b, 0x58, 0xb5, 0x80, 0x49, 0x07, 
+-	0x68, 0x09, 0xf7, 0xfd, 0xf9, 0x13, 0x1c, 0x07, 
+-	0xd1, 0x03, 0xa1, 0x05, 0xa0, 0x05, 0xf0, 0x00, 
+-	0xfc, 0xe7, 0x1c, 0x38, 0xbc, 0x80, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x20, 0xa8, 
+-	0x00, 0x00, 0x00, 0x00, 0x4e, 0x6f, 0x20, 0x73, 
+-	0x74, 0x6f, 0x72, 0x65, 0x20, 0x6c, 0x65, 0x66, 
+-	0x74, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x49, 0x2f, 
+-	0x4f, 0x20, 0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 
+-	0x20, 0x6f, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 
+-	0x6c, 0x69, 0x6b, 0x65, 0x00, 0x00, 0x00, 0x00, 
+-	0x23, 0x80, 0x68, 0xc1, 0x43, 0x19, 0x60, 0xc1, 
+-	0x21, 0x00, 0x60, 0x01, 0x60, 0x81, 0x47, 0x70, 
+-	0xb5, 0xf7, 0x68, 0xd5, 0x69, 0x56, 0x1c, 0x0c, 
+-	0x1c, 0x17, 0x0d, 0x68, 0xd3, 0x05, 0x23, 0x10, 
+-	0x43, 0x1d, 0x1c, 0x30, 0xf7, 0xff, 0xfe, 0xfc, 
+-	0x61, 0xb8, 0x48, 0x12, 0x40, 0x28, 0xd0, 0x08, 
+-	0x69, 0xb9, 0x1c, 0x30, 0xf7, 0xff, 0xfe, 0xc7, 
+-	0x28, 0x00, 0xdb, 0x10, 0x4b, 0x0e, 0x40, 0x1d, 
+-	0x60, 0xfd, 0x99, 0x00, 0x1c, 0x30, 0x1c, 0x22, 
+-	0x1c, 0x2b, 0xf7, 0xff, 0xfe, 0x75, 0x00, 0x41, 
+-	0x08, 0x49, 0x1a, 0x61, 0x69, 0xba, 0x18, 0x51, 
+-	0x61, 0xb9, 0x28, 0x00, 0xd0, 0x08, 0x1c, 0x38, 
+-	0xf7, 0xff, 0xff, 0xce, 0x20, 0x00, 0x43, 0xc0, 
+-	0xb0, 0x03, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x20, 0x00, 0xe7, 0xf9, 0x00, 0x02, 0x00, 0x10, 
+-	0xff, 0xfd, 0xff, 0xef, 0xb5, 0xb0, 0x48, 0x15, 
+-	0x68, 0xc1, 0x4b, 0x15, 0x40, 0x19, 0x1c, 0x1d, 
+-	0x42, 0x99, 0xd1, 0x01, 0xf0, 0x00, 0xfc, 0xd6, 
+-	0x48, 0x12, 0x68, 0xc1, 0x4b, 0x10, 0x40, 0x19, 
+-	0x42, 0xa9, 0xd1, 0x01, 0xf0, 0x00, 0xfc, 0xce, 
+-	0x48, 0x0f, 0x68, 0xc1, 0x4b, 0x0c, 0x40, 0x19, 
+-	0x42, 0xa9, 0xd1, 0x01, 0xf0, 0x00, 0xfc, 0xc6, 
+-	0x27, 0x00, 0x4c, 0x0c, 0x01, 0xb8, 0x19, 0x00, 
+-	0x68, 0xc1, 0x4b, 0x07, 0x40, 0x19, 0x42, 0xa9, 
+-	0xd1, 0x01, 0xf0, 0x00, 0xfc, 0xbb, 0x37, 0x01, 
+-	0x2f, 0x0d, 0xdb, 0xf3, 0xbc, 0xb0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x95, 0xdc, 
+-	0x00, 0x00, 0x02, 0x02, 0x2e, 0x08, 0x96, 0x1c, 
+-	0x2e, 0x08, 0x96, 0x5c, 0x2e, 0x08, 0x96, 0x9c, 
+-	0xb5, 0xf0, 0x1c, 0x07, 0x69, 0x04, 0x6a, 0xc0, 
+-	0x68, 0x79, 0x42, 0x88, 0xd9, 0x00, 0x1c, 0x01, 
+-	0x68, 0xf8, 0x4b, 0x13, 0x40, 0x18, 0x07, 0x82, 
+-	0x0f, 0x92, 0x25, 0x00, 0x60, 0xf8, 0x2a, 0x01, 
+-	0xd0, 0x1a, 0x22, 0x82, 0x40, 0x02, 0x15, 0x1e, 
+-	0x2a, 0x02, 0xd1, 0x0a, 0x0c, 0x40, 0xd3, 0x13, 
+-	0x42, 0xa1, 0xd0, 0x0a, 0x1b, 0x09, 0x1c, 0x20, 
+-	0x1c, 0x3a, 0xf7, 0xff, 0xff, 0x75, 0x28, 0x00, 
+-	0xd0, 0x03, 0x1c, 0x30, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x62, 0xfc, 0x60, 0x7c, 0x60, 0xbd, 
+-	0x68, 0xf8, 0x4b, 0x04, 0x40, 0x18, 0x60, 0xf8, 
+-	0x1c, 0x28, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0xff, 0xf7, 0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 
+-	0xb5, 0x80, 0x1c, 0x07, 0x68, 0xc0, 0x23, 0x20, 
+-	0x43, 0xdb, 0x40, 0x18, 0x60, 0xf8, 0x69, 0xb8, 
+-	0x6a, 0xb9, 0x42, 0x88, 0xd0, 0x0d, 0x1c, 0x38, 
+-	0xf7, 0xff, 0xff, 0xbe, 0x68, 0xf8, 0x4b, 0x08, 
+-	0x40, 0x18, 0x23, 0x10, 0x43, 0x18, 0x60, 0xf8, 
+-	0x6a, 0xb8, 0x61, 0xb8, 0x69, 0x38, 0x62, 0xf8, 
+-	0x60, 0x78, 0x68, 0xf8, 0x4b, 0x03, 0x40, 0x18, 
+-	0x60, 0xf8, 0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 
+-	0xff, 0xff, 0xcf, 0xff, 0xff, 0xff, 0xbf, 0xbf, 
+-	0xb5, 0xf0, 0x1c, 0x07, 0x69, 0x40, 0xb0, 0x83, 
+-	0x90, 0x01, 0x69, 0x38, 0x90, 0x00, 0x25, 0x00, 
+-	0x68, 0xfe, 0x07, 0xb0, 0xd1, 0x01, 0x43, 0xc0, 
+-	0xe0, 0x48, 0x09, 0x30, 0xd2, 0x40, 0x24, 0x10, 
+-	0x1c, 0x38, 0xf0, 0x00, 0xfc, 0x3f, 0x1c, 0x05, 
+-	0x0d, 0x70, 0xd3, 0x1b, 0x24, 0x00, 0x49, 0x21, 
+-	0x91, 0x02, 0x01, 0xa0, 0x99, 0x02, 0x18, 0x40, 
+-	0x42, 0xb8, 0xd0, 0x10, 0x68, 0xc1, 0x07, 0x8a, 
+-	0xd0, 0x0d, 0x69, 0x42, 0x9b, 0x01, 0x42, 0x9a, 
+-	0xd1, 0x09, 0x0d, 0x49, 0xd3, 0x07, 0x68, 0xc1, 
+-	0x4b, 0x19, 0x40, 0x19, 0x60, 0xc1, 0x68, 0xf8, 
+-	0x40, 0x18, 0x60, 0xf8, 0xe0, 0x02, 0x34, 0x01, 
+-	0x2c, 0x10, 0xdb, 0xe6, 0x2c, 0x10, 0xd1, 0x06, 
+-	0x98, 0x01, 0xf7, 0xff, 0xfd, 0x83, 0x28, 0x00, 
+-	0xda, 0x01, 0x25, 0x00, 0x43, 0xed, 0x0b, 0x30, 
+-	0xd3, 0x04, 0x98, 0x00, 0x49, 0x0f, 0x68, 0x09, 
+-	0xf7, 0xfc, 0xff, 0xe0, 0x0d, 0xf0, 0x05, 0xc0, 
+-	0x23, 0xa5, 0x05, 0xdb, 0x42, 0xd8, 0xd1, 0x07, 
+-	0x48, 0x0b, 0x28, 0x00, 0xd0, 0x04, 0x1c, 0x38, 
+-	0x1c, 0x29, 0xf7, 0xff, 0xff, 0xfe, 0x1c, 0x05, 
+-	0x22, 0x40, 0x21, 0x00, 0x1c, 0x38, 0xf7, 0xfd, 
+-	0xf8, 0x8f, 0x1c, 0x28, 0xb0, 0x03, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x95, 0xdc, 
+-	0xff, 0xef, 0xff, 0xff, 0x2e, 0x08, 0x20, 0xac, 
+-	0x00, 0x00, 0x00, 0x00, 0xb5, 0xf7, 0x1c, 0x10, 
+-	0x1c, 0x0c, 0x1c, 0x17, 0xf7, 0xff, 0xff, 0x98, 
+-	0x78, 0x20, 0x34, 0x01, 0x28, 0x61, 0xd0, 0x09, 
+-	0x28, 0x72, 0xd0, 0x04, 0x28, 0x77, 0xd1, 0x25, 
+-	0x26, 0x02, 0x25, 0x04, 0xe0, 0x04, 0x26, 0x01, 
+-	0x25, 0x00, 0xe0, 0x01, 0x4e, 0x1a, 0x25, 0x08, 
+-	0x78, 0x20, 0x34, 0x01, 0x28, 0x2b, 0xd0, 0x06, 
+-	0x28, 0x62, 0xd1, 0x09, 0x23, 0x04, 0x43, 0x1e, 
+-	0x23, 0x01, 0x43, 0x1d, 0xe7, 0xf4, 0x23, 0x03, 
+-	0x43, 0x1e, 0x23, 0x02, 0x43, 0x1d, 0xe7, 0xef, 
+-	0x1f, 0xe0, 0x38, 0x19, 0x7f, 0xc0, 0x28, 0x74, 
+-	0xd1, 0x01, 0x23, 0x10, 0x43, 0x1d, 0x98, 0x00, 
+-	0x1c, 0x29, 0xf7, 0xff, 0xfd, 0x0b, 0x23, 0x01, 
+-	0x42, 0xd8, 0xd1, 0x04, 0x20, 0x00, 0xb0, 0x03, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x21, 0x00, 
+-	0x60, 0x79, 0x61, 0x39, 0x21, 0x01, 0x03, 0x09, 
+-	0x61, 0x78, 0x61, 0xf9, 0x60, 0xfe, 0x09, 0x28, 
+-	0xd3, 0x04, 0x22, 0x02, 0x21, 0x00, 0x1c, 0x38, 
+-	0xf0, 0x00, 0xfb, 0xc4, 0x1c, 0x38, 0xe7, 0xea, 
+-	0x00, 0x00, 0x80, 0x02, 0xb5, 0x90, 0x23, 0x03, 
+-	0x4f, 0x08, 0x01, 0x9a, 0x19, 0xd2, 0x68, 0xd4, 
+-	0x07, 0xa4, 0xd1, 0x04, 0xf7, 0xff, 0xff, 0xaa, 
+-	0xbc, 0x90, 0xbc, 0x08, 0x47, 0x18, 0x33, 0x01, 
+-	0x2b, 0x10, 0xdb, 0xf2, 0x20, 0x00, 0xbc, 0x90, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x95, 0xdc, 
+-	0xb5, 0xf0, 0x1c, 0x04, 0x1c, 0x0f, 0x4d, 0x10, 
+-	0x68, 0xe8, 0x08, 0x80, 0xd3, 0x18, 0x20, 0x01, 
+-	0x4e, 0x0e, 0x70, 0x30, 0x40, 0x38, 0xd0, 0x03, 
+-	0x20, 0x0a, 0x1c, 0x29, 0xf0, 0x00, 0xfc, 0x1e, 
+-	0x1c, 0x20, 0x1c, 0x29, 0xf0, 0x00, 0xfc, 0x2c, 
+-	0x08, 0xb8, 0xd3, 0x03, 0x20, 0x0a, 0x1c, 0x29, 
+-	0xf0, 0x00, 0xfc, 0x14, 0x20, 0x00, 0x70, 0x30, 
+-	0x20, 0x01, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x20, 0x00, 0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x96, 0x5c, 0x2e, 0x08, 0x21, 0x94, 
+-	0xb5, 0x80, 0x1c, 0x07, 0xa0, 0x06, 0x21, 0x01, 
+-	0xf7, 0xff, 0xfc, 0x80, 0x21, 0x02, 0x1c, 0x38, 
+-	0xf7, 0xff, 0xfc, 0x7c, 0x20, 0x01, 0xf7, 0xfd, 
+-	0xfc, 0x25, 0xbc, 0x80, 0xbc, 0x08, 0x47, 0x18, 
+-	0x43, 0x6f, 0x75, 0x6c, 0x64, 0x6e, 0x27, 0x74, 
+-	0x20, 0x77, 0x72, 0x69, 0x74, 0x65, 0x20, 0x00, 
+-	0xb5, 0xf0, 0x1c, 0x04, 0x1c, 0x15, 0x1c, 0x0f, 
+-	0x48, 0x20, 0x22, 0x01, 0x02, 0x92, 0x21, 0x00, 
+-	0x1c, 0x06, 0xf7, 0xfc, 0xff, 0xd5, 0x4a, 0x1e, 
+-	0x1c, 0x28, 0xa1, 0x1e, 0xf7, 0xff, 0xff, 0x4e, 
+-	0x28, 0x00, 0xd1, 0x02, 0x1c, 0x28, 0xf7, 0xff, 
+-	0xff, 0xd3, 0x1c, 0x20, 0x1c, 0x32, 0xa1, 0x1a, 
+-	0xf7, 0xff, 0xff, 0x44, 0x28, 0x00, 0xd1, 0x02, 
+-	0x1c, 0x20, 0xf7, 0xff, 0xff, 0xc9, 0x4a, 0x17, 
+-	0x1c, 0x38, 0x1c, 0x15, 0xa1, 0x13, 0xf7, 0xff, 
+-	0xff, 0x39, 0x28, 0x00, 0xd1, 0x02, 0x1c, 0x38, 
+-	0xf7, 0xff, 0xff, 0xbe, 0x1c, 0x30, 0x26, 0x01, 
+-	0x03, 0x36, 0x08, 0xf2, 0x21, 0x00, 0x1c, 0x33, 
+-	0xf0, 0x00, 0xf8, 0x52, 0x28, 0x00, 0xd0, 0x02, 
+-	0x1c, 0x20, 0xf7, 0xff, 0xff, 0xb1, 0x22, 0x01, 
+-	0x02, 0x52, 0x21, 0x00, 0x1c, 0x28, 0x1c, 0x33, 
+-	0xf0, 0x00, 0xf8, 0x46, 0x28, 0x00, 0xd0, 0x02, 
+-	0x1c, 0x38, 0xf7, 0xff, 0xff, 0xa5, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x95, 0xdc, 
+-	0x2e, 0x08, 0x96, 0x5c, 0x77, 0x00, 0x00, 0x00, 
+-	0x72, 0x00, 0x00, 0x00, 0x2e, 0x08, 0x96, 0x1c, 
+-	0xb5, 0x90, 0x27, 0x03, 0x4c, 0x09, 0x01, 0xb8, 
+-	0x19, 0x00, 0xf7, 0xff, 0xfe, 0xa5, 0x37, 0x01, 
+-	0x2f, 0x10, 0xdb, 0xf8, 0x27, 0x00, 0x01, 0xb8, 
+-	0x19, 0x00, 0xf7, 0xff, 0xfe, 0x9d, 0x37, 0x01, 
+-	0x2f, 0x03, 0xdb, 0xf8, 0xbc, 0x90, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x95, 0xdc, 
+-	0xb5, 0xb0, 0x01, 0x80, 0x1c, 0x0f, 0x4c, 0x0a, 
+-	0x19, 0x00, 0x1c, 0x05, 0xf7, 0xff, 0xfe, 0x8c, 
+-	0x01, 0xb8, 0x19, 0x00, 0x23, 0x01, 0x05, 0x1b, 
+-	0x68, 0xc1, 0x43, 0x19, 0x60, 0xc1, 0x4b, 0x05, 
+-	0x40, 0x19, 0x60, 0xe9, 0x69, 0x40, 0x61, 0x68, 
+-	0x1c, 0x38, 0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 
+-	0x2e, 0x08, 0x95, 0xdc, 0x00, 0x10, 0x8f, 0x03, 
+-	0xb4, 0xf0, 0x1c, 0x1f, 0x68, 0xc3, 0x07, 0x9e, 
+-	0x0f, 0xb6, 0x25, 0x01, 0x1c, 0x1c, 0x2e, 0x00, 
+-	0xd0, 0x13, 0x1c, 0x1e, 0x0d, 0xf3, 0xd2, 0x10, 
+-	0x02, 0x2b, 0x42, 0x9a, 0xd0, 0x09, 0x00, 0x5b, 
+-	0x42, 0x9a, 0xd0, 0x06, 0x00, 0x5b, 0x42, 0x9a, 
+-	0xd1, 0x07, 0x27, 0x01, 0x1d, 0xc1, 0x31, 0x1d, 
+-	0xe0, 0x06, 0x1e, 0x7e, 0x4b, 0x08, 0x42, 0x9e, 
+-	0xd3, 0x02, 0x1c, 0x28, 0xbc, 0xf0, 0x47, 0x70, 
+-	0x61, 0x01, 0x23, 0x0f, 0x02, 0x1b, 0x43, 0x9c, 
+-	0x60, 0x41, 0x61, 0xc7, 0x1c, 0x21, 0x43, 0x11, 
+-	0x60, 0xc1, 0x20, 0x00, 0xbc, 0xf0, 0x47, 0x70, 
+-	0x00, 0xff, 0xff, 0xff, 0xe2, 0x00, 0x01, 0x02, 
+-	0xe3, 0x31, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x17, 
+-	0xe3, 0xa0, 0x80, 0x00, 0xe1, 0xb0, 0x98, 0x21, 
+-	0x01, 0xa0, 0x18, 0x01, 0x02, 0x88, 0x80, 0x10, 
+-	0xe1, 0xb0, 0x9c, 0x21, 0x01, 0xa0, 0x14, 0x01, 
+-	0x02, 0x88, 0x80, 0x08, 0xe1, 0xb0, 0x9e, 0x21, 
+-	0x01, 0xa0, 0x12, 0x01, 0x02, 0x88, 0x80, 0x04, 
+-	0xe1, 0xb0, 0x9f, 0x21, 0x01, 0xa0, 0x11, 0x01, 
+-	0x02, 0x88, 0x80, 0x02, 0xe1, 0xb0, 0x9f, 0xa1, 
+-	0x01, 0xa0, 0x10, 0x81, 0x02, 0x88, 0x80, 0x01, 
+-	0xe0, 0x58, 0x98, 0xa6, 0x81, 0xa0, 0x19, 0x31, 
+-	0x81, 0xa0, 0x88, 0xa6, 0xe2, 0x68, 0x60, 0x20, 
+-	0xe1, 0x81, 0x16, 0x32, 0xe1, 0xa0, 0x28, 0x12, 
+-	0x30, 0x40, 0x00, 0x09, 0xe1, 0xa0, 0xf0, 0x0e, 
+-	0xe3, 0x56, 0x05, 0x01, 0x3a, 0x00, 0x00, 0x16, 
+-	0xe1, 0xb0, 0x10, 0x02, 0x01, 0xa0, 0xf0, 0x0e, 
+-	0xe3, 0xa0, 0x20, 0x00, 0xe3, 0xa0, 0x80, 0x20, 
+-	0xe1, 0xb0, 0x98, 0x21, 0x01, 0xa0, 0x18, 0x01, 
+-	0x02, 0x88, 0x80, 0x10, 0xe1, 0xb0, 0x9c, 0x21, 
+-	0x01, 0xa0, 0x14, 0x01, 0x02, 0x88, 0x80, 0x08, 
+-	0xe1, 0xb0, 0x9e, 0x21, 0x01, 0xa0, 0x12, 0x01, 
+-	0x02, 0x88, 0x80, 0x04, 0xe1, 0xb0, 0x9f, 0x21, 
+-	0x01, 0xa0, 0x11, 0x01, 0x02, 0x88, 0x80, 0x02, 
+-	0xe1, 0xb0, 0x9f, 0xa1, 0x01, 0xa0, 0x10, 0x81, 
+-	0x02, 0x88, 0x80, 0x01, 0xe0, 0x58, 0x98, 0xa6, 
+-	0x81, 0xa0, 0x19, 0x31, 0x30, 0x40, 0x00, 0x09, 
+-	0xe1, 0xa0, 0xf0, 0x0e, 0xe1, 0xa0, 0x88, 0xa6, 
+-	0xe2, 0x68, 0x90, 0x20, 0xe1, 0xa0, 0x18, 0x11, 
+-	0xe1, 0x81, 0x19, 0x32, 0xe1, 0xa0, 0x28, 0x12, 
+-	0xe1, 0xa0, 0xf0, 0x0e, 0xe2, 0x03, 0x31, 0x02, 
+-	0xe3, 0x34, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x17, 
+-	0xe3, 0xa0, 0x80, 0x00, 0xe1, 0xb0, 0x98, 0x24, 
+-	0x01, 0xa0, 0x48, 0x04, 0x02, 0x88, 0x80, 0x10, 
+-	0xe1, 0xb0, 0x9c, 0x24, 0x01, 0xa0, 0x44, 0x04, 
+-	0x02, 0x88, 0x80, 0x08, 0xe1, 0xb0, 0x9e, 0x24, 
+-	0x01, 0xa0, 0x42, 0x04, 0x02, 0x88, 0x80, 0x04, 
+-	0xe1, 0xb0, 0x9f, 0x24, 0x01, 0xa0, 0x41, 0x04, 
+-	0x02, 0x88, 0x80, 0x02, 0xe1, 0xb0, 0x9f, 0xa4, 
+-	0x01, 0xa0, 0x40, 0x84, 0x02, 0x88, 0x80, 0x01, 
+-	0xe0, 0x58, 0x98, 0xa6, 0x81, 0xa0, 0x49, 0x34, 
+-	0x81, 0xa0, 0x88, 0xa6, 0xe2, 0x68, 0x60, 0x20, 
+-	0xe1, 0x84, 0x46, 0x35, 0xe1, 0xa0, 0x58, 0x15, 
+-	0x30, 0x43, 0x30, 0x09, 0xe1, 0xa0, 0xf0, 0x0e, 
+-	0xe3, 0x56, 0x05, 0x01, 0x3a, 0x00, 0x00, 0x16, 
+-	0xe1, 0xb0, 0x40, 0x05, 0x01, 0xa0, 0xf0, 0x0e, 
+-	0xe3, 0xa0, 0x50, 0x00, 0xe3, 0xa0, 0x80, 0x20, 
+-	0xe1, 0xb0, 0x98, 0x24, 0x01, 0xa0, 0x48, 0x04, 
+-	0x02, 0x88, 0x80, 0x10, 0xe1, 0xb0, 0x9c, 0x24, 
+-	0x01, 0xa0, 0x44, 0x04, 0x02, 0x88, 0x80, 0x08, 
+-	0xe1, 0xb0, 0x9e, 0x24, 0x01, 0xa0, 0x42, 0x04, 
+-	0x02, 0x88, 0x80, 0x04, 0xe1, 0xb0, 0x9f, 0x24, 
+-	0x01, 0xa0, 0x41, 0x04, 0x02, 0x88, 0x80, 0x02, 
+-	0xe1, 0xb0, 0x9f, 0xa4, 0x01, 0xa0, 0x40, 0x84, 
+-	0x02, 0x88, 0x80, 0x01, 0xe0, 0x58, 0x98, 0xa6, 
+-	0x81, 0xa0, 0x49, 0x34, 0x30, 0x43, 0x30, 0x09, 
+-	0xe1, 0xa0, 0xf0, 0x0e, 0xe1, 0xa0, 0x88, 0xa6, 
+-	0xe2, 0x68, 0x90, 0x20, 0xe1, 0xa0, 0x48, 0x14, 
+-	0xe1, 0x84, 0x49, 0x35, 0xe1, 0xa0, 0x58, 0x15, 
+-	0xe1, 0xa0, 0xf0, 0x0e, 0xe3, 0xa0, 0x20, 0x00, 
+-	0xe2, 0x16, 0x01, 0x02, 0x12, 0x66, 0x10, 0x00, 
+-	0x01, 0xb0, 0x10, 0x06, 0x03, 0xa0, 0x30, 0x00, 
+-	0x01, 0xa0, 0xf0, 0x0e, 0xe3, 0xa0, 0x39, 0x01, 
+-	0xe3, 0x83, 0x30, 0x1e, 0xe3, 0xa0, 0x60, 0x00, 
+-	0xe3, 0x31, 0x00, 0x00, 0x01, 0xa0, 0x10, 0x02, 
+-	0x03, 0xa0, 0x20, 0x00, 0x02, 0x43, 0x30, 0x20, 
+-	0xe3, 0xa0, 0x80, 0x00, 0xe1, 0xb0, 0x98, 0x21, 
+-	0x01, 0xa0, 0x18, 0x01, 0x02, 0x88, 0x80, 0x10, 
+-	0xe1, 0xb0, 0x9c, 0x21, 0x01, 0xa0, 0x14, 0x01, 
+-	0x02, 0x88, 0x80, 0x08, 0xe1, 0xb0, 0x9e, 0x21, 
+-	0x01, 0xa0, 0x12, 0x01, 0x02, 0x88, 0x80, 0x04, 
+-	0xe1, 0xb0, 0x9f, 0x21, 0x01, 0xa0, 0x11, 0x01, 
+-	0x02, 0x88, 0x80, 0x02, 0xe1, 0xb0, 0x9f, 0xa1, 
+-	0x01, 0xa0, 0x10, 0x81, 0x02, 0x88, 0x80, 0x01, 
+-	0xe2, 0x78, 0x90, 0x20, 0xe1, 0x81, 0x19, 0x32, 
+-	0xe1, 0xa0, 0x28, 0x12, 0xe0, 0x43, 0x30, 0x08, 
+-	0xe1, 0xa0, 0xf0, 0x0e, 0xe3, 0x34, 0x00, 0x00, 
+-	0x01, 0xa0, 0x40, 0x05, 0x03, 0xa0, 0x50, 0x00, 
+-	0x02, 0x43, 0x30, 0x20, 0xe3, 0xa0, 0x80, 0x00, 
+-	0xe1, 0xb0, 0x98, 0x24, 0x01, 0xa0, 0x48, 0x04, 
+-	0x02, 0x88, 0x80, 0x10, 0xe1, 0xb0, 0x9c, 0x24, 
+-	0x01, 0xa0, 0x44, 0x04, 0x02, 0x88, 0x80, 0x08, 
+-	0xe1, 0xb0, 0x9e, 0x24, 0x01, 0xa0, 0x42, 0x04, 
+-	0x02, 0x88, 0x80, 0x04, 0xe1, 0xb0, 0x9f, 0x24, 
+-	0x01, 0xa0, 0x41, 0x04, 0x02, 0x88, 0x80, 0x02, 
+-	0xe1, 0xb0, 0x9f, 0xa4, 0x01, 0xa0, 0x40, 0x84, 
+-	0x02, 0x88, 0x80, 0x01, 0xe2, 0x78, 0x90, 0x20, 
+-	0xe1, 0x84, 0x49, 0x35, 0xe1, 0xa0, 0x58, 0x15, 
+-	0xe0, 0x43, 0x30, 0x08, 0xe1, 0xa0, 0xf0, 0x0e, 
+-	0xe3, 0x31, 0x00, 0x00, 0x01, 0xa0, 0x10, 0x02, 
+-	0x03, 0xa0, 0x20, 0x00, 0x02, 0x83, 0x30, 0x20, 
+-	0xe3, 0xa0, 0x80, 0x00, 0xe1, 0xb0, 0x98, 0x21, 
+-	0x01, 0xa0, 0x18, 0x01, 0x02, 0x88, 0x80, 0x10, 
+-	0xe1, 0xb0, 0x9c, 0x21, 0x01, 0xa0, 0x14, 0x01, 
+-	0x02, 0x88, 0x80, 0x08, 0xe1, 0xb0, 0x9e, 0x21, 
+-	0x01, 0xa0, 0x12, 0x01, 0x02, 0x88, 0x80, 0x04, 
+-	0xe1, 0xb0, 0x9f, 0x21, 0x01, 0xa0, 0x11, 0x01, 
+-	0x02, 0x88, 0x80, 0x02, 0xe1, 0xb0, 0x9f, 0xa1, 
+-	0x01, 0xa0, 0x10, 0x81, 0x02, 0x88, 0x80, 0x01, 
+-	0xe2, 0x78, 0x90, 0x20, 0xe1, 0x81, 0x19, 0x32, 
+-	0xe1, 0xa0, 0x28, 0x12, 0xe0, 0x83, 0x30, 0x08, 
+-	0xe1, 0xa0, 0xf0, 0x0e, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x40, 0x00, 0x7f, 0xff, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0xe1, 0x92, 0x80, 0x81, 
+-	0x0a, 0x00, 0x00, 0x05, 0xe3, 0x11, 0x01, 0x01, 
+-	0x0a, 0x00, 0x00, 0x0c, 0xe1, 0x95, 0x80, 0x84, 
+-	0x0a, 0x00, 0x00, 0x0a, 0xe3, 0x14, 0x01, 0x01, 
+-	0x1a, 0x00, 0x00, 0x08, 0xe3, 0x14, 0x01, 0x01, 
+-	0x0a, 0x00, 0x00, 0x28, 0xe1, 0xa0, 0x00, 0x03, 
+-	0xe1, 0xa0, 0x10, 0x04, 0xe1, 0xa0, 0x20, 0x05, 
+-	0xea, 0x00, 0x00, 0x04, 0xe3, 0x11, 0x01, 0x01, 
+-	0x0a, 0x00, 0x00, 0x22, 0xea, 0x00, 0x00, 0x01, 
+-	0xe3, 0x11, 0x01, 0x01, 0x0a, 0x00, 0x00, 0x1f, 
+-	0xe3, 0x1b, 0x00, 0x01, 0x1a, 0x00, 0x00, 0x16, 
+-	0xe3, 0x1b, 0x00, 0x02, 0x1a, 0x00, 0x00, 0x0c, 
+-	0xe3, 0x1b, 0x0c, 0x02, 0x1a, 0x00, 0x00, 0x05, 
+-	0xe3, 0xc0, 0x81, 0x03, 0xe3, 0xa0, 0x90, 0xff, 
+-	0xe3, 0x89, 0x9c, 0x43, 0xe1, 0x58, 0x00, 0x09, 
+-	0x33, 0xc2, 0x20, 0x01, 0x03, 0x82, 0x20, 0x01, 
+-	0xe2, 0x00, 0x01, 0x03, 0xe3, 0x80, 0x00, 0xff, 
+-	0xe3, 0x80, 0x0c, 0x7f, 0xe1, 0x30, 0x00, 0x00, 
+-	0xe1, 0xa0, 0xf0, 0x0e, 0xe2, 0x00, 0x01, 0x03, 
+-	0xe3, 0x80, 0x00, 0xff, 0xe3, 0x80, 0x0c, 0x43, 
+-	0xe1, 0xa0, 0x25, 0xa2, 0xe1, 0xa0, 0x25, 0x82, 
+-	0xe3, 0x81, 0x11, 0x02, 0xe1, 0x30, 0x00, 0x00, 
+-	0xe1, 0xa0, 0xf0, 0x0e, 0xe2, 0x00, 0x01, 0x03, 
+-	0xe3, 0x80, 0x00, 0x7f, 0xe3, 0x80, 0x09, 0x01, 
+-	0xe3, 0xa0, 0x20, 0x00, 0xe3, 0xc1, 0x10, 0xff, 
+-	0xe3, 0x81, 0x11, 0x02, 0xe1, 0xa0, 0xf0, 0x0e, 
+-	0xe3, 0x80, 0x04, 0x61, 0xe1, 0xa0, 0xf0, 0x0e, 
+-	0xb5, 0x80, 0x1c, 0x0f, 0x29, 0x0f, 0xdd, 0x04, 
+-	0x11, 0x39, 0xf7, 0xff, 0xff, 0xf9, 0x07, 0x3f, 
+-	0x0f, 0x3f, 0x2f, 0x09, 0xdd, 0x02, 0x1d, 0xf9, 
+-	0x31, 0x29, 0xe0, 0x01, 0x1d, 0xf9, 0x31, 0x50, 
+-	0x70, 0x01, 0x30, 0x01, 0xbc, 0x80, 0xbc, 0x08, 
+-	0x47, 0x18, 0xb5, 0x90, 0x1c, 0x07, 0x48, 0x0d, 
+-	0x68, 0x01, 0x29, 0x00, 0xd1, 0x12, 0x4c, 0x0c, 
+-	0x1c, 0x20, 0xa1, 0x0c, 0x22, 0x14, 0xf7, 0xfc, 
+-	0xfc, 0xa1, 0x1d, 0xe0, 0x30, 0x0b, 0x1c, 0x39, 
+-	0xf7, 0xff, 0xff, 0xda, 0x21, 0x29, 0x70, 0x01, 
+-	0x21, 0x00, 0x70, 0x41, 0x1c, 0x20, 0xbc, 0x90, 
+-	0xbc, 0x08, 0x47, 0x18, 0x30, 0x08, 0xbc, 0x90, 
+-	0xbc, 0x08, 0x47, 0x18, 0x2e, 0x08, 0x20, 0xcc, 
+-	0x2e, 0x08, 0x99, 0xdc, 0x55, 0x6e, 0x6b, 0x6e, 
+-	0x6f, 0x77, 0x6e, 0x20, 0x53, 0x69, 0x67, 0x6e, 
+-	0x61, 0x6c, 0x20, 0x28, 0x30, 0x78, 0x00, 0x00, 
+-	0xb5, 0x90, 0x1c, 0x04, 0x1c, 0x0f, 0xa0, 0x09, 
+-	0x21, 0x01, 0xf7, 0xff, 0xf9, 0x6f, 0x21, 0x00, 
+-	0x1c, 0x20, 0xf7, 0xff, 0xf9, 0x6b, 0x21, 0x02, 
+-	0x1c, 0x38, 0xf7, 0xff, 0xf9, 0x67, 0x20, 0x01, 
+-	0xf7, 0xfd, 0xf9, 0x10, 0xbc, 0x90, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x2a, 0x2a, 0x2a, 0x20, 
+-	0x66, 0x61, 0x74, 0x61, 0x6c, 0x20, 0x65, 0x72, 
+-	0x72, 0x6f, 0x72, 0x20, 0x69, 0x6e, 0x20, 0x72, 
+-	0x75, 0x6e, 0x20, 0x74, 0x69, 0x6d, 0x65, 0x20, 
+-	0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x3a, 0x20, 
+-	0x00, 0x00, 0x00, 0x00, 0xb5, 0xb0, 0x1c, 0x07, 
+-	0x68, 0xc0, 0x07, 0x81, 0xd0, 0x1f, 0x23, 0x20, 
+-	0x40, 0x18, 0xd0, 0x01, 0x6a, 0xbd, 0xe0, 0x04, 
+-	0x68, 0x79, 0x69, 0xba, 0x18, 0x89, 0x69, 0x3a, 
+-	0x1a, 0x8d, 0x28, 0x00, 0xd0, 0x02, 0x1c, 0x38, 
+-	0xf7, 0xff, 0xfb, 0xa2, 0x68, 0xf8, 0x4b, 0x0a, 
+-	0x40, 0x18, 0x60, 0xf8, 0x1c, 0x38, 0xf7, 0xff, 
+-	0xfb, 0x67, 0x1c, 0x04, 0x22, 0x00, 0x1c, 0x38, 
+-	0x1c, 0x29, 0xf0, 0x00, 0xf8, 0x27, 0x1c, 0x20, 
+-	0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 0x20, 0x00, 
+-	0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0xff, 0xff, 0xcf, 0xff, 0xb5, 0xb0, 0x24, 0x00, 
+-	0x28, 0x00, 0xd0, 0x03, 0xf7, 0xff, 0xff, 0xce, 
+-	0x1c, 0x04, 0xe0, 0x0c, 0x27, 0x00, 0x4d, 0x08, 
+-	0x01, 0xb8, 0x19, 0x40, 0xf7, 0xff, 0xff, 0xc6, 
+-	0x28, 0x00, 0xd0, 0x01, 0x24, 0x00, 0x43, 0xe4, 
+-	0x37, 0x01, 0x2f, 0x10, 0xdb, 0xf4, 0x1c, 0x20, 
+-	0xbc, 0xb0, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0x2e, 0x08, 0x95, 0xdc, 0xb5, 0xf7, 0x68, 0xc5, 
+-	0x69, 0x46, 0x1c, 0x0c, 0x1c, 0x07, 0xb0, 0x81, 
+-	0x48, 0x3c, 0x40, 0x28, 0xd0, 0x04, 0x1c, 0x38, 
+-	0xf7, 0xff, 0xf9, 0x92, 0x28, 0x00, 0xd0, 0x01, 
+-	0x20, 0x02, 0xe0, 0x6a, 0x9a, 0x03, 0x2a, 0x00, 
+-	0xd0, 0x26, 0x2a, 0x01, 0xd0, 0x0b, 0x2a, 0x02, 
+-	0xd1, 0x24, 0x1c, 0x30, 0xf7, 0xff, 0xf9, 0xbc, 
+-	0x28, 0x00, 0xda, 0x09, 0x1c, 0x38, 0xf7, 0xff, 
+-	0xfa, 0xa7, 0x20, 0x01, 0xe0, 0x59, 0x1c, 0x38, 
+-	0xf0, 0x00, 0xf8, 0x8c, 0x19, 0x04, 0xe0, 0x13, 
+-	0x68, 0x79, 0x6a, 0xfa, 0x42, 0x8a, 0xd9, 0x00, 
+-	0x1c, 0x11, 0x69, 0xba, 0x18, 0x89, 0x69, 0x3a, 
+-	0x1a, 0x89, 0x68, 0xfa, 0x09, 0x92, 0xd3, 0x03, 
+-	0x6a, 0xba, 0x42, 0x8a, 0xdd, 0x00, 0x1c, 0x11, 
+-	0x42, 0x81, 0xdd, 0x00, 0x1c, 0x08, 0x18, 0x24, 
+-	0x2c, 0x00, 0xda, 0x03, 0x1c, 0x38, 0xf7, 0xff, 
+-	0xfa, 0x87, 0xe7, 0xcd, 0x0b, 0xa8, 0xd3, 0x04, 
+-	0x68, 0x78, 0x6a, 0xf9, 0x42, 0x81, 0xd2, 0x00, 
+-	0x62, 0xf8, 0x69, 0xb8, 0x42, 0xa0, 0xdc, 0x10, 
+-	0x68, 0x79, 0x6a, 0xfa, 0x42, 0x8a, 0xd9, 0x01, 
+-	0x1c, 0x13, 0xe0, 0x00, 0x1c, 0x0b, 0x18, 0x1b, 
+-	0x69, 0x3e, 0x1b, 0x9b, 0x42, 0xa3, 0xdb, 0x04, 
+-	0x6b, 0x3b, 0x93, 0x00, 0x18, 0xc3, 0x42, 0xa3, 
+-	0xdc, 0x06, 0x20, 0x20, 0x43, 0x28, 0x21, 0x00, 
+-	0x60, 0x39, 0x60, 0xb9, 0x62, 0xbc, 0xe0, 0x14, 
+-	0x1a, 0x24, 0x08, 0xa8, 0xd3, 0x03, 0x9b, 0x00, 
+-	0x1b, 0x18, 0x42, 0x40, 0x60, 0xb8, 0x08, 0x68, 
+-	0xd3, 0x06, 0x42, 0x8a, 0xd9, 0x00, 0x1c, 0x11, 
+-	0x1b, 0x88, 0x1b, 0x00, 0x42, 0x40, 0x60, 0x38, 
+-	0x19, 0x30, 0x23, 0x20, 0x43, 0x9d, 0x60, 0x78, 
+-	0x1c, 0x28, 0x4b, 0x05, 0x40, 0x18, 0x60, 0xf8, 
+-	0x20, 0x00, 0xb0, 0x01, 0xb0, 0x03, 0xbc, 0xf0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x00, 0x10, 0x00, 0x03, 
+-	0xff, 0xf7, 0xcf, 0xbf, 0xb5, 0x00, 0x68, 0x8a, 
+-	0x68, 0x4b, 0x3a, 0x01, 0xd5, 0x03, 0xf0, 0x00, 
+-	0xf8, 0x3f, 0xbc, 0x08, 0x47, 0x18, 0x06, 0x00, 
+-	0x0e, 0x00, 0x70, 0x18, 0x33, 0x01, 0x60, 0x8a, 
+-	0x60, 0x4b, 0xbc, 0x08, 0x47, 0x18, 0x00, 0x00, 
+-	0xb5, 0xb0, 0x1c, 0x07, 0x78, 0x00, 0x1c, 0x0c, 
+-	0x37, 0x01, 0x28, 0x00, 0xd0, 0x0e, 0x25, 0x00, 
+-	0x43, 0xed, 0x1c, 0x21, 0xf0, 0x00, 0xf8, 0xe8, 
+-	0x42, 0xa8, 0xd1, 0x03, 0x1c, 0x28, 0xbc, 0xb0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x78, 0x38, 0x37, 0x01, 
+-	0x28, 0x00, 0xd1, 0xf2, 0x20, 0x00, 0xbc, 0xb0, 
+-	0xbc, 0x08, 0x47, 0x18, 0x68, 0xc1, 0x07, 0x8a, 
+-	0xd1, 0x04, 0x20, 0x01, 0x49, 0x09, 0x60, 0x08, 
+-	0x42, 0x40, 0x47, 0x70, 0x09, 0x8a, 0xd3, 0x01, 
+-	0x6a, 0x80, 0xe0, 0x04, 0x68, 0x42, 0x69, 0x83, 
+-	0x18, 0xd2, 0x69, 0x00, 0x1a, 0x10, 0x0d, 0x09, 
+-	0xd3, 0xf3, 0x28, 0x00, 0xdd, 0xf1, 0x38, 0x01, 
+-	0x47, 0x70, 0x00, 0x00, 0x2e, 0x08, 0x20, 0xb0, 
+-	0xb5, 0xf0, 0x1c, 0x04, 0x68, 0xc8, 0x1c, 0x0f, 
+-	0x4b, 0x5a, 0x40, 0x18, 0x23, 0x01, 0x05, 0x9b, 
+-	0x43, 0x18, 0x60, 0xc8, 0x09, 0x80, 0xd3, 0x02, 
+-	0x1c, 0x38, 0xf7, 0xff, 0xfa, 0x95, 0x06, 0x26, 
+-	0x0e, 0x36, 0x68, 0xb9, 0x29, 0x00, 0xda, 0x12, 
+-	0x68, 0xf8, 0x0a, 0x82, 0xd2, 0x0f, 0x22, 0x00, 
+-	0x43, 0xd2, 0x1a, 0x51, 0x23, 0x09, 0x03, 0x5b, 
+-	0x43, 0x18, 0x60, 0xf8, 0x60, 0xb9, 0x68, 0x79, 
+-	0x70, 0x0e, 0x31, 0x01, 0x60, 0x79, 0x1c, 0x30, 
+-	0xbc, 0xf0, 0xbc, 0x08, 0x47, 0x18, 0x68, 0xf8, 
+-	0x49, 0x49, 0x40, 0x01, 0x29, 0x02, 0xd0, 0x03, 
+-	0x1c, 0x38, 0xf7, 0xff, 0xf9, 0xcd, 0xe0, 0x7f, 
+-	0x49, 0x46, 0x40, 0x01, 0x23, 0x01, 0x03, 0xdb, 
+-	0x42, 0x99, 0xd1, 0x0b, 0x22, 0x02, 0x21, 0x00, 
+-	0x1c, 0x38, 0xf7, 0xff, 0xfe, 0xfb, 0x68, 0xf8, 
+-	0x09, 0x80, 0xd3, 0x02, 0x1c, 0x38, 0xf7, 0xff, 
+-	0xfa, 0x63, 0x68, 0xf8, 0x25, 0x09, 0x03, 0x6d, 
+-	0x43, 0x05, 0x60, 0xfd, 0x69, 0x38, 0x28, 0x00, 
+-	0xd1, 0x2f, 0x1c, 0x38, 0xf7, 0xff, 0xf8, 0x88, 
+-	0x28, 0x00, 0xd0, 0x18, 0x68, 0xf8, 0x0a, 0x00, 
+-	0x07, 0x80, 0xd0, 0x09, 0x69, 0xf8, 0xf7, 0xff, 
+-	0xf9, 0x7d, 0x61, 0x38, 0x60, 0x78, 0x23, 0x01, 
+-	0x02, 0xdb, 0x43, 0x1d, 0x68, 0xf8, 0xe0, 0x1a, 
+-	0x1d, 0xf8, 0x30, 0x1d, 0x61, 0x38, 0x60, 0x78, 
+-	0x20, 0x01, 0x23, 0x01, 0x02, 0x9b, 0x43, 0x1d, 
+-	0x61, 0xf8, 0x60, 0xfd, 0xe0, 0x11, 0x69, 0xf8, 
+-	0xf7, 0xff, 0xf9, 0x68, 0x61, 0x38, 0x60, 0x78, 
+-	0x23, 0x01, 0x02, 0xdb, 0x43, 0x1d, 0x68, 0xf8, 
+-	0x43, 0x28, 0x60, 0xf8, 0x0a, 0x29, 0x07, 0x89, 
+-	0xd1, 0x03, 0x08, 0xdb, 0x43, 0x1d, 0x43, 0x28, 
+-	0x60, 0xf8, 0x0a, 0x68, 0xd3, 0x19, 0x68, 0x78, 
+-	0x6a, 0xf9, 0x69, 0x3c, 0x42, 0x81, 0xd9, 0x00, 
+-	0x1c, 0x08, 0x1b, 0x01, 0xd0, 0x05, 0x1c, 0x20, 
+-	0x1c, 0x3a, 0xf7, 0xff, 0xf9, 0x7d, 0x28, 0x00, 
+-	0xd1, 0x26, 0x1c, 0x60, 0x62, 0xf8, 0x60, 0x78, 
+-	0x69, 0xf8, 0x1e, 0x41, 0x63, 0x38, 0x60, 0xb9, 
+-	0x70, 0x26, 0x1c, 0x30, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x69, 0x38, 0x68, 0x7a, 0x70, 0x14, 
+-	0x32, 0x01, 0x60, 0x7a, 0x6a, 0xf9, 0x42, 0x91, 
+-	0xd8, 0x00, 0x1c, 0x11, 0x1a, 0x09, 0x69, 0xfa, 
+-	0x63, 0x3a, 0x0a, 0xeb, 0xd2, 0x03, 0x2e, 0x0a, 
+-	0xd0, 0x01, 0x42, 0x8a, 0xdc, 0x0d, 0x62, 0xf8, 
+-	0x22, 0x00, 0x60, 0x78, 0x60, 0xba, 0x1c, 0x3a, 
+-	0xf7, 0xff, 0xf9, 0x56, 0x28, 0x00, 0xd0, 0x04, 
+-	0x20, 0x00, 0x43, 0xc0, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x1c, 0x30, 0xbc, 0xf0, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0xff, 0xf7, 0xff, 0xff, 
+-	0x00, 0x00, 0x10, 0x8a, 0x00, 0x00, 0xa0, 0x10, 
+-	0xb5, 0x00, 0x68, 0x8a, 0x68, 0x4b, 0x3a, 0x01, 
+-	0xd5, 0x03, 0xf7, 0xff, 0xff, 0x39, 0xbc, 0x08, 
+-	0x47, 0x18, 0x06, 0x00, 0x0e, 0x00, 0x70, 0x18, 
+-	0x33, 0x01, 0x60, 0x8a, 0x60, 0x4b, 0xbc, 0x08, 
+-	0x47, 0x18, 0x00, 0x00, 0x47, 0x78, 0x46, 0xc0, 
+-	0xe9, 0x2d, 0x40, 0x00, 0xe2, 0x8f, 0xe0, 0x00, 
+-	0xef, 0x12, 0x34, 0x56, 0xe8, 0xbd, 0x40, 0x00, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0xe1, 0xa0, 0x10, 0x00, 
+-	0xe3, 0xa0, 0x00, 0x18, 0xe5, 0x9f, 0x10, 0x18, 
+-	0xef, 0x12, 0x34, 0x56, 0xea, 0xff, 0xff, 0xfe, 
+-	0xe1, 0xa0, 0x10, 0x00, 0xe3, 0xa0, 0x00, 0x18, 
+-	0xe5, 0x9f, 0x10, 0x08, 0xef, 0x12, 0x34, 0x56, 
+-	0xea, 0xff, 0xff, 0xfe, 0x00, 0x02, 0x00, 0x26, 
+-	0x00, 0x02, 0x00, 0x23, 0xe8, 0xb0, 0x01, 0xf0, 
+-	0xe8, 0xa1, 0x01, 0xf0, 0xe8, 0xb0, 0x01, 0xf8, 
+-	0xe8, 0xa1, 0x01, 0xf8, 0xe8, 0xb0, 0x01, 0xf8, 
+-	0xe8, 0xa1, 0x01, 0xf8, 0xe8, 0xb0, 0x01, 0xf8, 
+-	0xe8, 0xa1, 0x01, 0xf8, 0xe8, 0xb0, 0x01, 0xf8, 
+-	0xe8, 0xa1, 0x01, 0xf8, 0xe8, 0xb0, 0x01, 0xf8, 
+-	0xe8, 0xa1, 0x01, 0xf8, 0xe8, 0xb0, 0x01, 0xf8, 
+-	0xe8, 0xa1, 0x01, 0xf8, 0xe8, 0xb0, 0x01, 0xf8, 
+-	0xe8, 0xa1, 0x01, 0xf8, 0xe2, 0x52, 0x20, 0xbc, 
+-	0x1a, 0xff, 0xff, 0xed, 0xe8, 0xbd, 0x01, 0xf8, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0xe4, 0x90, 0x40, 0x04, 
+-	0xe1, 0x85, 0x54, 0x24, 0xe4, 0x81, 0x50, 0x04, 
+-	0xe1, 0xa0, 0x5c, 0x04, 0xe2, 0x53, 0x30, 0x04, 
+-	0x1a, 0xff, 0xff, 0xf9, 0xe5, 0x9f, 0xf0, 0x88, 
+-	0xe4, 0x90, 0x40, 0x04, 0xe1, 0x85, 0x5c, 0x24, 
+-	0xe4, 0x81, 0x50, 0x04, 0xe1, 0xa0, 0x54, 0x04, 
+-	0xe2, 0x53, 0x30, 0x04, 0x1a, 0xff, 0xff, 0xf9, 
+-	0xe5, 0x9f, 0xf0, 0x70, 0xe4, 0x90, 0x40, 0x04, 
+-	0xe1, 0xa0, 0x58, 0x24, 0xe0, 0xc1, 0x50, 0xb2, 
+-	0xe0, 0xc1, 0x40, 0xb2, 0xe2, 0x53, 0x30, 0x04, 
+-	0x1a, 0xff, 0xff, 0xf9, 0xe5, 0x9f, 0xf0, 0x4c, 
+-	0xe2, 0x03, 0x40, 0x0f, 0xe0, 0x53, 0x40, 0x04, 
+-	0x0a, 0x00, 0x00, 0x0a, 0xe9, 0x2d, 0x00, 0xc4, 
+-	0xe1, 0xa0, 0x20, 0x03, 0xe1, 0xa0, 0x30, 0x04, 
+-	0xe8, 0xb0, 0x00, 0xf0, 0xe8, 0xa1, 0x00, 0xf0, 
+-	0xe2, 0x53, 0x30, 0x10, 0x1a, 0xff, 0xff, 0xfb, 
+-	0xe1, 0xa0, 0x30, 0x02, 0xe8, 0xbd, 0x00, 0xc4, 
+-	0xe2, 0x13, 0x30, 0x0f, 0x0a, 0x00, 0x00, 0x03, 
+-	0xe4, 0x90, 0x40, 0x04, 0xe4, 0x81, 0x40, 0x04, 
+-	0xe2, 0x53, 0x30, 0x04, 0x1a, 0xff, 0xff, 0xfb, 
+-	0xe5, 0x9f, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x2e, 0x01, 0xc9, 0xe4, 0x2e, 0x01, 0xc9, 0x88, 
+-	0x2e, 0x01, 0xc9, 0xb8, 0xe9, 0x2d, 0x00, 0x38, 
+-	0xe3, 0x52, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x3f, 
+-	0xe3, 0xe0, 0x30, 0x03, 0xe0, 0x12, 0x30, 0x03, 
+-	0x0a, 0x00, 0x00, 0x30, 0xe2, 0x10, 0x30, 0x01, 
+-	0x0a, 0x00, 0x00, 0x03, 0xe4, 0xd0, 0x30, 0x01, 
+-	0xe4, 0xc1, 0x30, 0x01, 0xe2, 0x52, 0x20, 0x01, 
+-	0x0a, 0x00, 0x00, 0x36, 0xe2, 0x10, 0x30, 0x02, 
+-	0x0a, 0x00, 0x00, 0x05, 0xe0, 0xd0, 0x30, 0xb2, 
+-	0xe1, 0xa0, 0x44, 0x23, 0xe4, 0xc1, 0x40, 0x01, 
+-	0xe4, 0xc1, 0x30, 0x01, 0xe2, 0x52, 0x20, 0x02, 
+-	0x0a, 0x00, 0x00, 0x2e, 0xe3, 0xe0, 0x30, 0x03, 
+-	0xe0, 0x12, 0x30, 0x03, 0x0a, 0x00, 0x00, 0x1f, 
+-	0xe2, 0x11, 0x40, 0x01, 0x0a, 0x00, 0x00, 0x19, 
+-	0xe2, 0x11, 0x40, 0x02, 0x1a, 0x00, 0x00, 0x0b, 
+-	0xe2, 0x41, 0x10, 0x01, 0xe5, 0x91, 0x50, 0x00, 
+-	0xe1, 0xa0, 0x5c, 0x25, 0xe1, 0xa0, 0x5c, 0x05, 
+-	0xe5, 0x9f, 0xf0, 0xa8, 0xe5, 0x91, 0x40, 0x00, 
+-	0xe1, 0xa0, 0x44, 0x04, 0xe1, 0xa0, 0x44, 0x24, 
+-	0xe1, 0x85, 0x50, 0x04, 0xe5, 0x81, 0x50, 0x00, 
+-	0xe2, 0x81, 0x10, 0x01, 0xea, 0x00, 0x00, 0x0f, 
+-	0xe2, 0x41, 0x10, 0x03, 0xe5, 0x91, 0x50, 0x00, 
+-	0xe1, 0xa0, 0x54, 0x25, 0xe1, 0xa0, 0x54, 0x05, 
+-	0xe5, 0x9f, 0xf0, 0x7c, 0xe5, 0x91, 0x40, 0x00, 
+-	0xe1, 0xa0, 0x4c, 0x04, 0xe1, 0xa0, 0x4c, 0x24, 
+-	0xe1, 0x85, 0x50, 0x04, 0xe5, 0x81, 0x50, 0x00, 
+-	0xe2, 0x81, 0x10, 0x03, 0xea, 0x00, 0x00, 0x03, 
+-	0xe2, 0x11, 0x40, 0x02, 0x0a, 0x00, 0x00, 0x00, 
+-	0xe5, 0x9f, 0xf0, 0x5c, 0xe5, 0x9f, 0xf0, 0x48, 
+-	0xe2, 0x12, 0x20, 0x03, 0x0a, 0x00, 0x00, 0x09, 
+-	0xe4, 0xd0, 0x40, 0x01, 0xe4, 0xc1, 0x40, 0x01, 
+-	0xe2, 0x52, 0x20, 0x01, 0x0a, 0x00, 0x00, 0x05, 
+-	0xe4, 0xd0, 0x40, 0x01, 0xe4, 0xc1, 0x40, 0x01, 
+-	0xe2, 0x52, 0x20, 0x01, 0x0a, 0x00, 0x00, 0x01, 
+-	0xe4, 0xd0, 0x40, 0x01, 0xe4, 0xc1, 0x40, 0x01, 
+-	0xe8, 0xbd, 0x00, 0x38, 0xe3, 0x8e, 0xe0, 0x01, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0xe9, 0x2d, 0x01, 0xf8, 
+-	0xe5, 0x9f, 0xf0, 0x18, 0x2e, 0x01, 0xc8, 0x58, 
+-	0x2e, 0x01, 0xc8, 0x90, 0x2e, 0x01, 0xc8, 0xac, 
+-	0x2e, 0x01, 0xc8, 0x58, 0x2e, 0x01, 0xc8, 0x74, 
+-	0x2e, 0x01, 0xc8, 0xac, 0x2e, 0x01, 0xc8, 0x90, 
+-	0x2e, 0x01, 0xc8, 0x08, 0xe9, 0x2d, 0x5f, 0xff, 
+-	0xe1, 0x4f, 0x00, 0x00, 0xe9, 0x2d, 0x00, 0x01, 
+-	0xe2, 0x8f, 0x00, 0x01, 0xe1, 0x2f, 0xff, 0x10, 
+-	0x21, 0xff, 0x48, 0x37, 0x68, 0x00, 0x40, 0x52, 
+-	0x42, 0x08, 0xd1, 0x0b, 0x32, 0x20, 0x0a, 0x00, 
+-	0x42, 0x08, 0xd1, 0x07, 0x32, 0x20, 0x0a, 0x00, 
+-	0x42, 0x08, 0xd1, 0x03, 0x0a, 0x00, 0x42, 0x08, 
+-	0xd0, 0x23, 0x32, 0x20, 0x21, 0x0f, 0x42, 0x08, 
+-	0xd1, 0x01, 0x32, 0x10, 0x09, 0x00, 0x21, 0x01, 
+-	0x42, 0x08, 0xd1, 0x08, 0x1d, 0x12, 0x21, 0x02, 
+-	0x42, 0x08, 0xd1, 0x04, 0x1d, 0x12, 0x21, 0x04, 
+-	0x42, 0x08, 0xd1, 0x00, 0x1d, 0x12, 0x48, 0x25, 
+-	0x68, 0x00, 0xb4, 0x01, 0x08, 0x90, 0x21, 0x01, 
+-	0x40, 0x81, 0x48, 0x21, 0x60, 0x01, 0x48, 0x1d, 
+-	0x58, 0x82, 0x48, 0x01, 0x46, 0x86, 0x47, 0x10, 
+-	0x2e, 0x01, 0xca, 0xc1, 0xbc, 0x02, 0x48, 0x1d, 
+-	0x60, 0x01, 0x00, 0x00, 0x47, 0x78, 0x00, 0x00, 
+-	0xe8, 0xbd, 0x00, 0x01, 0xe1, 0x69, 0xf0, 0x00, 
+-	0xe8, 0xbd, 0x5f, 0xff, 0xe2, 0x5e, 0xf0, 0x04, 
+-	0x48, 0x12, 0x21, 0x20, 0x4a, 0x12, 0x60, 0x02, 
+-	0x1d, 0x00, 0x1e, 0x49, 0xd1, 0xfb, 0x20, 0x00, 
+-	0x47, 0x70, 0x00, 0x00, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0x46, 0x73, 0x49, 0x0e, 0x60, 0x08, 0x20, 0x00, 
+-	0x47, 0x18, 0x46, 0x73, 0x49, 0x0c, 0x60, 0x08, 
+-	0x20, 0x00, 0x47, 0x18, 0x46, 0x73, 0x48, 0x0b, 
+-	0x68, 0x00, 0x47, 0x18, 0x46, 0x73, 0x49, 0x09, 
+-	0x60, 0x08, 0x47, 0x18, 0x46, 0x73, 0x4a, 0x03, 
+-	0x00, 0x80, 0x18, 0x12, 0x68, 0x10, 0x60, 0x11, 
+-	0x47, 0x18, 0x00, 0x00, 0x2e, 0x08, 0x3a, 0xf4, 
+-	0x2e, 0x01, 0xca, 0xf0, 0x66, 0x00, 0x00, 0x10, 
+-	0x66, 0x00, 0x00, 0x14, 0x66, 0x00, 0x00, 0x18, 
+-	0x66, 0x00, 0x00, 0x1c, 0xe9, 0x2d, 0x5f, 0xf0, 
+-	0xe1, 0x4f, 0x40, 0x00, 0xe3, 0x14, 0x00, 0x20, 
+-	0x11, 0x5e, 0x40, 0xb2, 0x13, 0xc4, 0x4c, 0xff, 
+-	0x05, 0x1e, 0x40, 0x04, 0x03, 0xc4, 0x44, 0xff, 
+-	0xe5, 0x9f, 0x50, 0x14, 0xe7, 0x95, 0x51, 0x04, 
+-	0xe5, 0x9f, 0xe0, 0x00, 0xe1, 0x2f, 0xff, 0x15, 
+-	0x2e, 0x01, 0xcb, 0x70, 0xe8, 0xbd, 0x5f, 0xf0, 
+-	0xe1, 0xb0, 0xf0, 0x0e, 0x2e, 0x08, 0x1f, 0xe8, 
+-	0x00, 0x00, 0x00, 0xc0, 0x46, 0x73, 0x47, 0x78, 
+-	0xe1, 0x0f, 0x10, 0x00, 0xe3, 0x81, 0x00, 0x80, 
+-	0xe1, 0x29, 0xf0, 0x00, 0xe2, 0x01, 0x00, 0x80, 
+-	0xe1, 0x2f, 0xff, 0x13, 0x46, 0x73, 0x00, 0x00, 
+-	0x47, 0x78, 0x00, 0x00, 0xe1, 0x4f, 0x10, 0x00, 
+-	0xe3, 0x81, 0x00, 0x80, 0xe1, 0x69, 0xf0, 0x00, 
+-	0xe2, 0x01, 0x00, 0x80, 0xe1, 0x2f, 0xff, 0x13, 
+-	0x46, 0x73, 0x00, 0x00, 0x47, 0x78, 0x00, 0x00, 
+-	0xe1, 0x0f, 0x10, 0x00, 0xe3, 0x81, 0x00, 0x40, 
+-	0xe1, 0x29, 0xf0, 0x00, 0xe2, 0x01, 0x00, 0x40, 
+-	0xe1, 0x2f, 0xff, 0x13, 0x46, 0x73, 0x00, 0x00, 
+-	0x47, 0x78, 0x00, 0x00, 0xe1, 0x4f, 0x10, 0x00, 
+-	0xe3, 0x81, 0x00, 0x40, 0xe1, 0x69, 0xf0, 0x00, 
+-	0xe2, 0x01, 0x00, 0x40, 0xe1, 0x2f, 0xff, 0x13, 
+-	0x46, 0x73, 0x00, 0x00, 0x47, 0x78, 0x00, 0x00, 
+-	0xe1, 0x0f, 0x00, 0x00, 0xe3, 0xc0, 0x00, 0x80, 
+-	0xe1, 0x29, 0xf0, 0x00, 0xe3, 0xa0, 0x00, 0x00, 
+-	0xe1, 0x2f, 0xff, 0x13, 0x46, 0x73, 0x00, 0x00, 
+-	0x47, 0x78, 0x00, 0x00, 0xe1, 0x4f, 0x00, 0x00, 
+-	0xe3, 0xc0, 0x00, 0x80, 0xe1, 0x69, 0xf0, 0x00, 
+-	0xe3, 0xa0, 0x00, 0x00, 0xe1, 0x2f, 0xff, 0x13, 
+-	0x46, 0x73, 0x00, 0x00, 0x47, 0x78, 0x00, 0x00, 
+-	0xe1, 0x0f, 0x00, 0x00, 0xe3, 0xc0, 0x00, 0x40, 
+-	0xe1, 0x29, 0xf0, 0x00, 0xe3, 0xa0, 0x00, 0x00, 
+-	0xe1, 0x2f, 0xff, 0x13, 0x46, 0x73, 0x00, 0x00, 
+-	0x47, 0x78, 0x00, 0x00, 0xe1, 0x4f, 0x00, 0x00, 
+-	0xe3, 0xc0, 0x00, 0x40, 0xe1, 0x69, 0xf0, 0x00, 
+-	0xe3, 0xa0, 0x00, 0x00, 0xe1, 0x2f, 0xff, 0x13, 
+-	0x46, 0x73, 0x49, 0x02, 0x60, 0x08, 0x20, 0x00, 
+-	0x46, 0x9f, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00, 
+-	0x46, 0x73, 0x49, 0x02, 0x60, 0x08, 0x20, 0x00, 
+-	0x46, 0x9f, 0x00, 0x00, 0x66, 0x00, 0x00, 0x04, 
+-	0x46, 0x73, 0x48, 0x03, 0x68, 0x00, 0x47, 0x18, 
+-	0x46, 0x73, 0x49, 0x01, 0x60, 0x08, 0x47, 0x18, 
+-	0x66, 0x00, 0x00, 0x08, 0x00, 0x00, 0x46, 0x6c, 
+-	0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x01, 0x80, 
+-	0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x02, 0xd0, 
+-	0x00, 0x00, 0x02, 0xd0, 0x00, 0x00, 0x00, 0x15, 
+-	0x00, 0x03, 0xb1, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x04, 0x90, 0x85, 0x00, 0x00, 0xa6, 0xee, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xd0, 
+-	0x00, 0x00, 0x02, 0x40, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x08, 0x08, 0xa0, 0x00, 0x08, 0x08, 0x28, 
+-	0x00, 0x08, 0x88, 0x68, 0x00, 0x08, 0xa0, 0x98, 
+-	0x00, 0x08, 0x88, 0x68, 0x00, 0x08, 0x28, 0x98, 
+-	0x00, 0x08, 0xac, 0xf4, 0x00, 0x08, 0xb8, 0x7c, 
+-	0x00, 0x02, 0x02, 0x88, 0x00, 0x02, 0x08, 0x22, 
+-	0x00, 0x02, 0x88, 0xaa, 0x00, 0x02, 0x22, 0xaa, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x04, 0x04, 0x24, 0x00, 0x04, 0x04, 0x24, 
+-	0x00, 0x04, 0x28, 0x6c, 0x00, 0x04, 0x28, 0x6c, 
+-	0x00, 0x01, 0x10, 0x44, 0x00, 0x01, 0x20, 0x44, 
+-	0x00, 0x01, 0x11, 0xaa, 0x00, 0x01, 0x88, 0x55, 
+-	0x00, 0x01, 0x44, 0xaa, 0x00, 0x01, 0x44, 0x55, 
+-	0x00, 0x20, 0x80, 0xa0, 0x00, 0x20, 0x80, 0xc0, 
+-	0x00, 0x20, 0x20, 0xa0, 0x00, 0x20, 0x40, 0xc0, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x02, 0x40, 0x00, 0x00, 0x02, 0x40, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x08, 0x10, 0x13, 0x16, 0x1a, 0x1b, 0x1d, 0x22, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x08, 0x10, 0x13, 0x16, 0x1a, 0x1b, 0x1d, 0x22, 
+-	0x10, 0x10, 0x16, 0x18, 0x1b, 0x1d, 0x22, 0x25, 
+-	0x13, 0x16, 0x1a, 0x1b, 0x1d, 0x22, 0x22, 0x26, 
+-	0x16, 0x16, 0x1a, 0x1b, 0x1d, 0x22, 0x25, 0x28, 
+-	0x16, 0x1a, 0x1b, 0x1d, 0x20, 0x23, 0x28, 0x30, 
+-	0x1a, 0x1b, 0x1d, 0x20, 0x23, 0x28, 0x30, 0x3a, 
+-	0x1a, 0x1b, 0x1d, 0x22, 0x26, 0x2e, 0x38, 0x45, 
+-	0x1b, 0x1d, 0x23, 0x26, 0x2e, 0x38, 0x45, 0x53, 
+-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
+-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
+-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
+-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
+-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
+-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
+-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
+-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x04, 0xd6, 0x00, 0x00, 0x1b, 0x08, 0x00, 
+-	0x00, 0x1f, 0xde, 0x00, 0x00, 0x00, 0x50, 0x00, 
+-	0x00, 0x09, 0xce, 0x00, 0x00, 0x13, 0x4c, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
+-	0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x03, 0x05, 0x28, 0x20, 0x01, 
+-	0x00, 0x00, 0x02, 0x40, 0x71, 0x01, 0x00, 0x68, 
+-	0xe0, 0x7f, 0xb0, 0x7f, 0x60, 0x40, 0xe0, 0x1d, 
+-	0x90, 0x10, 0xb4, 0x81, 0xe8, 0xc0, 0xe0, 0xc2, 
+-	0x90, 0x18, 0x00, 0x8a, 0x70, 0xc0, 0x0f, 0x87, 
+-	0xe3, 0xe8, 0xc0, 0x00, 0x70, 0x40, 0xe0, 0x01, 
+-	0xe0, 0x86, 0x00, 0x26, 0xd0, 0x28, 0xe0, 0x0e, 
+-	0xd0, 0x0e, 0x0f, 0x0b, 0x70, 0x1d, 0xe0, 0x67, 
+-	0x0f, 0x87, 0x0f, 0x87, 0x0f, 0x87, 0x0f, 0x87, 
+-	0x0f, 0x87, 0x02, 0x20, 0xd0, 0x01, 0xe0, 0x25, 
+-	0x0f, 0x45, 0x6f, 0x81, 0xdf, 0xa6, 0xe0, 0x36, 
+-	0xe1, 0x30, 0xa0, 0x37, 0xc0, 0x00, 0xe0, 0x26, 
+-	0x00, 0x33, 0xdf, 0x00, 0xe0, 0x32, 0x0f, 0xc5, 
+-	0x0f, 0x87, 0x00, 0x27, 0xd0, 0x4c, 0xe0, 0x21, 
+-	0x00, 0x33, 0xdf, 0x60, 0x00, 0x27, 0xd0, 0x56, 
+-	0x60, 0x01, 0xe0, 0x2d, 0x03, 0xa0, 0xd0, 0x41, 
+-	0xa0, 0x78, 0x00, 0x60, 0xd0, 0x41, 0xa0, 0x77, 
+-	0x00, 0x22, 0xd0, 0x58, 0xa0, 0x76, 0x00, 0x21, 
+-	0xd0, 0x7c, 0x00, 0x4a, 0xd0, 0x72, 0x70, 0x40, 
+-	0x00, 0x06, 0x0f, 0x87, 0x00, 0x22, 0xdc, 0xf8, 
+-	0xf0, 0x4a, 0xe1, 0x70, 0x07, 0xef, 0xdd, 0xbf, 
+-	0x4f, 0x36, 0x1d, 0x99, 0x4d, 0x80, 0x10, 0x18, 
+-	0xdd, 0x50, 0x60, 0x35, 0xdd, 0x72, 0xdd, 0x10, 
+-	0x3d, 0xb4, 0xec, 0x57, 0x2d, 0x36, 0x1d, 0x03, 
+-	0xbd, 0x04, 0xe4, 0x2b, 0x01, 0x46, 0x00, 0x06, 
+-	0xac, 0xf6, 0x80, 0x3f, 0x0d, 0x0a, 0x10, 0x02, 
+-	0x7d, 0x40, 0x10, 0x1e, 0xb0, 0x20, 0xbc, 0xe0, 
+-	0x00, 0x06, 0x00, 0xc6, 0xe0, 0x52, 0xb7, 0x60, 
+-	0xb7, 0x60, 0xc0, 0x5d, 0x30, 0x5f, 0xe4, 0x72, 
+-	0xc7, 0x5e, 0x00, 0xed, 0xd0, 0x28, 0x70, 0x40, 
+-	0xb0, 0x7f, 0x60, 0x40, 0xc0, 0x1d, 0x30, 0x1c, 
+-	0xf8, 0x7e, 0x00, 0x21, 0xd0, 0x01, 0x00, 0x26, 
+-	0xd0, 0x78, 0xa0, 0x38, 0x80, 0x3f, 0x70, 0x01, 
+-	0xb0, 0x3f, 0x60, 0x01, 0x0f, 0x87, 0x80, 0x34, 
+-	0x03, 0xef, 0xd8, 0x3f, 0xa8, 0x38, 0x01, 0x35, 
+-	0xdc, 0x33, 0xe0, 0x46, 0xc0, 0x1c, 0xe4, 0xa5, 
+-	0x97, 0x2e, 0x30, 0x1c, 0xe8, 0x8e, 0x00, 0x21, 
+-	0xd0, 0x00, 0xa0, 0x38, 0xc0, 0x5d, 0x00, 0x23, 
+-	0xd0, 0x00, 0x30, 0x40, 0x30, 0x5e, 0xe4, 0x99, 
+-	0x20, 0x5e, 0xc0, 0x01, 0x30, 0x1c, 0xec, 0xa4, 
+-	0xe0, 0x9d, 0x20, 0x5f, 0xc0, 0x1c, 0x30, 0x01, 
+-	0xf4, 0xa5, 0xc0, 0x1c, 0x30, 0x1d, 0xec, 0xa4, 
+-	0xe4, 0xa5, 0x90, 0x38, 0x00, 0x1b, 0xe8, 0xa5, 
+-	0xa0, 0x66, 0xb1, 0x3f, 0xe4, 0xb3, 0xe8, 0xb1, 
+-	0xc0, 0x4b, 0x30, 0x44, 0xf8, 0xb3, 0x60, 0x45, 
+-	0xb1, 0x7c, 0x01, 0x20, 0xd0, 0x00, 0xa0, 0x05, 
+-	0x80, 0x40, 0x72, 0xc5, 0x00, 0x06, 0x90, 0x55, 
+-	0xd0, 0x01, 0x00, 0x40, 0xa0, 0x55, 0x0f, 0x87, 
+-	0x01, 0x46, 0x00, 0x06, 0x03, 0xef, 0xd0, 0x3f, 
+-	0xa0, 0x38, 0xb0, 0x01, 0xa0, 0x37, 0x80, 0x3f, 
+-	0x82, 0x34, 0x80, 0x3f, 0xf2, 0x1a, 0x80, 0x34, 
+-	0x80, 0x3f, 0xf2, 0x1a, 0xd8, 0x00, 0xd8, 0x40, 
+-	0xd8, 0x80, 0xd8, 0xc0, 0xd9, 0x00, 0xd9, 0x40, 
+-	0xd9, 0x80, 0xd9, 0xc0, 0xda, 0x00, 0xda, 0x40, 
+-	0xda, 0x80, 0xda, 0xc0, 0xdb, 0x00, 0xdb, 0x40, 
+-	0xdb, 0x80, 0xdb, 0xc0, 0xdc, 0x00, 0xdc, 0x40, 
+-	0xdc, 0x80, 0xdc, 0xc0, 0xdd, 0x00, 0xdd, 0x40, 
+-	0xdd, 0x80, 0xdd, 0xc0, 0xde, 0x00, 0xde, 0x40, 
+-	0xde, 0x80, 0xde, 0xc0, 0xdf, 0x00, 0xdf, 0x40, 
+-	0xdf, 0x80, 0xdf, 0xc0, 0xde, 0x80, 0xde, 0xc1, 
+-	0x00, 0x28, 0xd0, 0x60, 0x6e, 0x81, 0x80, 0x00, 
+-	0x80, 0x05, 0x00, 0xe3, 0xd1, 0x88, 0x00, 0x73, 
+-	0xd5, 0x80, 0x60, 0x06, 0xb1, 0xbc, 0x00, 0xfa, 
+-	0xd0, 0x80, 0x60, 0x06, 0x00, 0x26, 0xd0, 0x6c, 
+-	0x6e, 0x81, 0x04, 0xf4, 0xdc, 0x00, 0x00, 0xee, 
+-	0xd1, 0x94, 0x60, 0x06, 0x00, 0xed, 0xd0, 0x50, 
+-	0x6e, 0x81, 0x00, 0x22, 0xd0, 0x70, 0x6e, 0x81, 
+-	0x00, 0xee, 0xd0, 0x74, 0x6e, 0x81, 0xd0, 0x4c, 
+-	0x6e, 0x81, 0xd0, 0x02, 0x00, 0xef, 0xd0, 0x6c, 
+-	0x60, 0x01, 0xd0, 0x03, 0x00, 0xef, 0xd0, 0x70, 
+-	0x60, 0x01, 0x00, 0xe0, 0xd0, 0x48, 0xd0, 0x02, 
+-	0x60, 0x01, 0x00, 0x32, 0xdf, 0x20, 0xa0, 0x1c, 
+-	0x00, 0x21, 0xd0, 0x60, 0xa0, 0x76, 0x00, 0x34, 
+-	0xd5, 0x70, 0x80, 0x3f, 0x00, 0x23, 0xd0, 0x5c, 
+-	0x00, 0x4a, 0xd0, 0x72, 0x70, 0x40, 0x00, 0x06, 
+-	0x00, 0x22, 0xd1, 0xa4, 0x6e, 0xc6, 0xd0, 0x58, 
+-	0x6e, 0xc1, 0xd0, 0xc9, 0x00, 0xed, 0xd0, 0x54, 
+-	0x60, 0xc1, 0x00, 0x22, 0xd0, 0x40, 0x60, 0xc1, 
+-	0x00, 0x22, 0xd0, 0x60, 0x60, 0xc1, 0x82, 0x34, 
+-	0x80, 0x3f, 0xd6, 0xd9, 0x01, 0x2d, 0xd6, 0x0c, 
+-	0x16, 0x08, 0xd0, 0x55, 0xd0, 0x2c, 0x60, 0x40, 
+-	0xd0, 0x70, 0x00, 0xfb, 0xd1, 0x00, 0x60, 0x01, 
+-	0x00, 0x2b, 0xd4, 0x10, 0x00, 0x29, 0xd4, 0x40, 
+-	0x00, 0x2b, 0xd0, 0x90, 0xc0, 0xc2, 0xd1, 0x18, 
+-	0xd1, 0x44, 0xa1, 0x50, 0x00, 0x21, 0xd0, 0xb6, 
+-	0xd0, 0xd7, 0x00, 0x29, 0xd0, 0x04, 0x64, 0x00, 
+-	0xb0, 0x3c, 0x64, 0x40, 0x80, 0x34, 0x80, 0x3f, 
+-	0xd0, 0x40, 0x00, 0x35, 0xd0, 0x00, 0x60, 0x01, 
+-	0xd0, 0x48, 0x6e, 0x81, 0xd0, 0x44, 0x6e, 0x81, 
+-	0x00, 0x64, 0xd1, 0x80, 0x6e, 0x86, 0x01, 0x3c, 
+-	0xd2, 0x39, 0xe0, 0x46, 0xd0, 0x00, 0xd0, 0x40, 
+-	0xd0, 0x80, 0xd0, 0xc0, 0xd1, 0x00, 0xd1, 0x40, 
+-	0xd1, 0x80, 0xd1, 0xc0, 0xd2, 0x00, 0xd2, 0x40, 
+-	0xd2, 0x80, 0xd2, 0xc0, 0xd3, 0x00, 0xd3, 0x40, 
+-	0xd3, 0x80, 0xd3, 0xc0, 0xd4, 0x00, 0xd4, 0x40, 
+-	0xd4, 0x80, 0xd4, 0xc0, 0xd5, 0x00, 0xd5, 0x40, 
+-	0xd5, 0x80, 0xd5, 0xc0, 0xd6, 0x00, 0xd6, 0x40, 
+-	0xd6, 0x80, 0xd6, 0xc0, 0xd7, 0x00, 0xd7, 0x40, 
+-	0xd7, 0x80, 0xd7, 0xc0, 0x0f, 0xc5, 0x50, 0x00, 
+-	0x01, 0x46, 0x00, 0x06, 0xde, 0x80, 0xde, 0xc1, 
+-	0x03, 0x2f, 0xd0, 0x33, 0xa0, 0x38, 0xb0, 0x01, 
+-	0xa0, 0x37, 0x80, 0x3f, 0x08, 0x20, 0xdf, 0x00, 
+-	0x82, 0x34, 0x80, 0x3f, 0x00, 0xee, 0xd0, 0x08, 
+-	0x77, 0xc0, 0xb0, 0x04, 0x77, 0x80, 0xb0, 0x04, 
+-	0xc0, 0x5f, 0x30, 0x5e, 0x60, 0x40, 0xd7, 0x00, 
+-	0xb7, 0x01, 0x80, 0x34, 0x80, 0x3f, 0x00, 0x60, 
+-	0xd0, 0x80, 0x00, 0xec, 0xd0, 0x40, 0x60, 0x81, 
+-	0xb0, 0x7c, 0x60, 0x81, 0x00, 0xa0, 0xd0, 0x80, 
+-	0xb0, 0x74, 0x60, 0x81, 0xb0, 0x7c, 0x60, 0x81, 
+-	0x00, 0x68, 0xd0, 0x80, 0x6e, 0x82, 0x00, 0xef, 
+-	0xd0, 0x8c, 0x6e, 0x82, 0x00, 0x06, 0xd0, 0x11, 
+-	0xa0, 0x38, 0x80, 0x3f, 0x08, 0x20, 0xd0, 0x40, 
+-	0x10, 0x48, 0xa0, 0x4a, 0xa0, 0x5b, 0x0c, 0x20, 
+-	0xd0, 0x00, 0x10, 0x08, 0xa0, 0x27, 0xa0, 0x0a, 
+-	0x90, 0x4d, 0x0f, 0xff, 0xd8, 0x1f, 0x40, 0x40, 
+-	0xa0, 0x4d, 0x80, 0x0a, 0x80, 0x07, 0x80, 0x1b, 
+-	0x80, 0x27, 0x00, 0x60, 0xd0, 0x00, 0xa0, 0x09, 
+-	0x80, 0x28, 0x01, 0x20, 0xd0, 0x67, 0xa0, 0x69, 
+-	0x80, 0x2a, 0x82, 0x29, 0x80, 0x6a, 0x84, 0x29, 
+-	0xd0, 0x54, 0x10, 0x4f, 0xa0, 0x6a, 0x01, 0x20, 
+-	0xd0, 0x00, 0xa0, 0x29, 0x80, 0x2b, 0x02, 0x30, 
+-	0xd0, 0x00, 0xa0, 0x38, 0x80, 0x3f, 0x01, 0xb0, 
+-	0xd0, 0x10, 0xa0, 0x37, 0x80, 0x3f, 0x02, 0x30, 
+-	0xd0, 0x01, 0xa0, 0x38, 0x00, 0xea, 0xd0, 0x00, 
+-	0xd0, 0x4e, 0x0f, 0x0b, 0x70, 0x40, 0x00, 0x06, 
+-	0x00, 0x21, 0xd0, 0x88, 0x00, 0xe1, 0xd0, 0x60, 
+-	0x60, 0x81, 0x00, 0x2b, 0xd0, 0x80, 0x00, 0xe0, 
+-	0xd0, 0x6c, 0x60, 0x81, 0xb0, 0x7c, 0x00, 0x29, 
+-	0xd0, 0x80, 0x60, 0x81, 0xb0, 0x7c, 0xd0, 0x82, 
+-	0x60, 0x81, 0xb0, 0x7c, 0xd0, 0x85, 0x60, 0x81, 
+-	0xb0, 0x7c, 0x03, 0xaa, 0xd0, 0x98, 0x60, 0x81, 
+-	0xb0, 0x7c, 0x6e, 0x81, 0x00, 0x27, 0xd0, 0x40, 
+-	0x6e, 0x81, 0xb0, 0x7c, 0x6e, 0x81, 0xb0, 0x7c, 
+-	0x6e, 0x81, 0x00, 0x27, 0xd1, 0x90, 0x6e, 0x86, 
+-	0x00, 0x21, 0xd1, 0xb8, 0x6e, 0x86, 0x00, 0x66, 
+-	0xd1, 0xa0, 0xd0, 0x00, 0x01, 0x64, 0xd0, 0x58, 
+-	0x30, 0x01, 0x60, 0x06, 0x00, 0xed, 0xd1, 0xbc, 
+-	0x6e, 0x86, 0x00, 0xec, 0xd1, 0xb8, 0x6e, 0x86, 
+-	0xb1, 0x84, 0x6e, 0x86, 0x00, 0xee, 0xd1, 0x84, 
+-	0x70, 0x46, 0x00, 0x65, 0xd1, 0x94, 0x60, 0x46, 
+-	0x00, 0x64, 0xd1, 0xbc, 0x6e, 0x86, 0x00, 0x65, 
+-	0xd1, 0x80, 0x6e, 0x86, 0xb1, 0xbc, 0x6e, 0x86, 
+-	0xb1, 0xbc, 0x6e, 0x86, 0x00, 0xed, 0xd1, 0xa8, 
+-	0x6e, 0x86, 0xd0, 0x0e, 0xb1, 0xbc, 0x60, 0x06, 
+-	0xb1, 0xbc, 0x60, 0x06, 0x00, 0x65, 0xd1, 0xa4, 
+-	0x60, 0x06, 0x00, 0x28, 0xd1, 0xa4, 0x6e, 0x86, 
+-	0x00, 0x27, 0xd1, 0x98, 0x6e, 0x86, 0x00, 0x64, 
+-	0xd1, 0xa4, 0x6e, 0x86, 0xd2, 0x01, 0x00, 0x64, 
+-	0xd0, 0x60, 0x62, 0x01, 0x00, 0x64, 0xd1, 0x80, 
+-	0x70, 0x46, 0x6e, 0x86, 0x00, 0xef, 0xd1, 0x98, 
+-	0x70, 0x86, 0x08, 0x20, 0xd0, 0xcf, 0x30, 0xc1, 
+-	0xea, 0x42, 0xd0, 0x81, 0x00, 0x21, 0xd1, 0xa8, 
+-	0x60, 0x86, 0x00, 0xed, 0xd1, 0xa0, 0x6e, 0xc6, 
+-	0x00, 0x65, 0xd1, 0x98, 0x6e, 0xc6, 0x00, 0x22, 
+-	0xd0, 0x00, 0xa0, 0x05, 0x80, 0x40, 0x00, 0xc6, 
+-	0x01, 0x73, 0xd4, 0x3d, 0xe0, 0x46, 0x50, 0x00, 
+-	0x08, 0x20, 0xd0, 0x00, 0x5f, 0x00, 0x00, 0x64, 
+-	0xd0, 0x60, 0x70, 0xc1, 0x00, 0xec, 0xd0, 0x40, 
+-	0x71, 0x81, 0xb0, 0x7c, 0x71, 0xc1, 0xc0, 0x87, 
+-	0x30, 0x86, 0xf9, 0x83, 0x10, 0xee, 0xe9, 0x76, 
+-	0x10, 0xe1, 0xe9, 0x76, 0xe2, 0x57, 0x00, 0x63, 
+-	0xd0, 0xbf, 0x72, 0x06, 0xb1, 0xbc, 0x41, 0x82, 
+-	0x02, 0x1b, 0xe9, 0x8d, 0x72, 0x86, 0xb1, 0xbc, 
+-	0x41, 0x82, 0xd0, 0x75, 0x30, 0x48, 0xe9, 0xfe, 
+-	0xb0, 0x7f, 0xea, 0x00, 0x02, 0x1c, 0xe9, 0x96, 
+-	0x15, 0xa3, 0xea, 0x57, 0x10, 0xf0, 0xe9, 0x9a, 
+-	0x10, 0xfa, 0xf9, 0xa1, 0x15, 0xa3, 0xea, 0x57, 
+-	0x00, 0x21, 0xd0, 0x4c, 0x70, 0x41, 0x10, 0x61, 
+-	0xfa, 0x57, 0x00, 0xed, 0xd0, 0x08, 0x70, 0x40, 
+-	0xd0, 0x85, 0x40, 0x42, 0x60, 0x40, 0x00, 0x64, 
+-	0xd0, 0x64, 0x62, 0x01, 0x12, 0x2b, 0xe9, 0xeb, 
+-	0x12, 0x3b, 0xe9, 0xd5, 0x00, 0xec, 0xd0, 0x40, 
+-	0x61, 0x81, 0x12, 0x2d, 0xe9, 0xbf, 0x12, 0x30, 
+-	0xe9, 0xd4, 0x12, 0x36, 0xe9, 0xd4, 0x12, 0x3a, 
+-	0xe9, 0xd4, 0xd0, 0x62, 0x30, 0x48, 0xe9, 0xf2, 
+-	0x12, 0x2e, 0xe9, 0xf9, 0xe1, 0x76, 0x00, 0xed, 
+-	0xd0, 0x08, 0x70, 0x40, 0xd0, 0x85, 0x40, 0x42, 
+-	0x60, 0x40, 0xb0, 0x08, 0x00, 0x21, 0xd0, 0x41, 
+-	0x60, 0x40, 0x00, 0x64, 0xd0, 0x60, 0x62, 0x01, 
+-	0xf2, 0x5a, 0x00, 0xed, 0xd0, 0x20, 0xd0, 0x41, 
+-	0x60, 0x40, 0x10, 0xe1, 0xea, 0x3a, 0xe2, 0x57, 
+-	0xe2, 0x53, 0x10, 0xee, 0xf9, 0xe9, 0x01, 0x46, 
+-	0x82, 0x34, 0x80, 0x3f, 0x97, 0x2e, 0xc7, 0x5c, 
+-	0xa7, 0x66, 0x81, 0x34, 0x80, 0x3f, 0x00, 0x21, 
+-	0xd0, 0x01, 0xa0, 0x38, 0x00, 0xc6, 0x00, 0x21, 
+-	0xd0, 0x15, 0x0b, 0x09, 0x00, 0x4d, 0xb0, 0x01, 
+-	0xed, 0xe5, 0xd2, 0x1a, 0xe1, 0xec, 0xf1, 0x18, 
+-	0x00, 0xec, 0xd0, 0x40, 0x71, 0x81, 0xd0, 0x4e, 
+-	0x60, 0x46, 0xe2, 0x54, 0xc0, 0x0a, 0x10, 0x06, 
+-	0x52, 0x80, 0x00, 0xed, 0xd0, 0x40, 0x62, 0x81, 
+-	0xe2, 0x53, 0x00, 0x64, 0xd0, 0x60, 0x62, 0x01, 
+-	0xf2, 0x5a, 0xe1, 0x70, 0x12, 0xa3, 0xf6, 0x57, 
+-	0x15, 0xa1, 0xfa, 0x57, 0x12, 0xa0, 0xea, 0x23, 
+-	0x00, 0x65, 0xd1, 0x1c, 0xd0, 0x75, 0x30, 0x48, 
+-	0xea, 0x0a, 0xb1, 0x3c, 0x71, 0x04, 0x11, 0x20, 
+-	0xfa, 0x11, 0x00, 0xec, 0xd0, 0x40, 0x61, 0x81, 
+-	0xe2, 0x57, 0x12, 0xa1, 0xea, 0x33, 0x00, 0xe2, 
+-	0xd0, 0x60, 0x70, 0x01, 0xb0, 0x7c, 0x70, 0x41, 
+-	0x10, 0x0c, 0x50, 0x40, 0x0c, 0x30, 0xd0, 0x00, 
+-	0x31, 0x01, 0xee, 0x21, 0x21, 0x00, 0xe6, 0x57, 
+-	0xe2, 0x23, 0x31, 0x00, 0xfe, 0x57, 0xd0, 0x75, 
+-	0x30, 0x48, 0xea, 0x28, 0xf2, 0x5a, 0xe2, 0x0d, 
+-	0x00, 0xec, 0xd0, 0x40, 0x71, 0x81, 0x00, 0x63, 
+-	0xd1, 0x3f, 0xb1, 0xbc, 0x41, 0x84, 0x61, 0x81, 
+-	0xd0, 0x50, 0x60, 0x46, 0xe2, 0x57, 0x00, 0xed, 
+-	0xd0, 0x7c, 0x70, 0x41, 0x08, 0x20, 0xd0, 0x00, 
+-	0x10, 0x08, 0xe2, 0x1c, 0xd2, 0x84, 0x00, 0xed, 
+-	0xd1, 0xa4, 0x62, 0x86, 0xd5, 0x00, 0xb5, 0x01, 
+-	0x01, 0x46, 0x82, 0x34, 0x80, 0x3f, 0xc7, 0x5e, 
+-	0x97, 0x2e, 0x81, 0x34, 0x80, 0x3f, 0x02, 0xe8, 
+-	0xd0, 0x30, 0xa0, 0x37, 0xa0, 0x38, 0x08, 0x20, 
+-	0xdf, 0x00, 0x80, 0x73, 0x80, 0x3f, 0x00, 0xc6, 
+-	0x01, 0x7a, 0xde, 0x1a, 0xe0, 0x46, 0xf2, 0x5a, 
+-	0x00, 0x64, 0xd0, 0x60, 0x62, 0x01, 0x02, 0x3c, 
+-	0xdc, 0x89, 0xe0, 0x46, 0x00, 0x28, 0xd0, 0x64, 
+-	0x70, 0x81, 0x00, 0x22, 0xd0, 0x00, 0x50, 0x80, 
+-	0x60, 0x81, 0x0f, 0xc5, 0x50, 0x00, 0x50, 0x00, 
+-	0x00, 0xed, 0xd1, 0xa4, 0x72, 0x86, 0x00, 0xef, 
+-	0xd1, 0x90, 0x70, 0x46, 0x10, 0x5c, 0x10, 0x65, 
+-	0xed, 0x7d, 0xd0, 0x46, 0xc0, 0x0a, 0x10, 0x40, 
+-	0x60, 0x46, 0x00, 0x22, 0xd0, 0x73, 0x30, 0x54, 
+-	0xe9, 0x8e, 0x12, 0xa4, 0xe9, 0xb5, 0x15, 0x20, 
+-	0xe9, 0xc0, 0xb0, 0x7b, 0xe9, 0xc3, 0xb0, 0x41, 
+-	0xe9, 0xc9, 0xc0, 0x54, 0x10, 0x5c, 0x10, 0x6e, 
+-	0xe9, 0xc6, 0xe1, 0xb5, 0x00, 0x28, 0xd1, 0xb0, 
+-	0xd0, 0x00, 0x60, 0x06, 0x12, 0xa4, 0xf9, 0xb2, 
+-	0x00, 0xed, 0xd1, 0x9c, 0x62, 0x86, 0xd2, 0x80, 
+-	0x00, 0xed, 0xd1, 0xa4, 0x62, 0x86, 0xd0, 0x02, 
+-	0x00, 0xec, 0xd1, 0xbc, 0x60, 0x06, 0x00, 0x64, 
+-	0xd1, 0xa0, 0x72, 0x06, 0x12, 0x21, 0xf9, 0xa6, 
+-	0xd2, 0x0d, 0x62, 0x06, 0x00, 0xed, 0xd1, 0xa0, 
+-	0x61, 0x86, 0xd0, 0x0e, 0x00, 0xed, 0xd1, 0xac, 
+-	0x60, 0x06, 0xb1, 0xbc, 0x60, 0x06, 0x00, 0x65, 
+-	0xd1, 0xa4, 0x60, 0x06, 0x01, 0x7e, 0xd2, 0x32, 
+-	0xe1, 0xcb, 0x01, 0x46, 0x90, 0x49, 0x00, 0x60, 
+-	0xd0, 0x00, 0x50, 0x40, 0xa0, 0x49, 0x80, 0x3f, 
+-	0x00, 0xc6, 0x0c, 0x09, 0x05, 0x0d, 0xe1, 0x70, 
+-	0x01, 0xbf, 0xd0, 0x41, 0xe1, 0xcb, 0x01, 0xbb, 
+-	0xda, 0x10, 0xe1, 0xcb, 0x01, 0xbd, 0xda, 0x0b, 
+-	0xe1, 0xcb, 0x03, 0xb9, 0xd8, 0x10, 0x01, 0x46, 
+-	0x90, 0x49, 0x00, 0x60, 0xd1, 0x00, 0x50, 0x44, 
+-	0x30, 0x44, 0xa0, 0x49, 0x80, 0x3f, 0x00, 0xc6, 
+-	0xe0, 0x46, 0x50, 0x00, 0x50, 0x00, 0x50, 0x00, 
+-	0x01, 0xfa, 0xd4, 0x3d, 0x00, 0x25, 0xdc, 0xd8, 
+-	0xf0, 0x4a, 0x00, 0x26, 0xd0, 0x18, 0xd0, 0x40, 
+-	0x60, 0x40, 0x00, 0x28, 0xd0, 0x24, 0x70, 0x40, 
+-	0xd0, 0x82, 0x50, 0x42, 0x60, 0x40, 0x00, 0xec, 
+-	0xd0, 0xa4, 0x70, 0xc2, 0x10, 0xe0, 0xf9, 0x81, 
+-	0x00, 0xec, 0xd1, 0x98, 0xd0, 0x41, 0x60, 0x46, 
+-	0x70, 0xc2, 0x10, 0xe0, 0xe9, 0x8e, 0xd0, 0x40, 
+-	0x60, 0x46, 0xe1, 0x81, 0xd0, 0x40, 0x00, 0xe6, 
+-	0xd0, 0x10, 0x60, 0x40, 0xb0, 0x3c, 0x60, 0x40, 
+-	0xb0, 0x3c, 0x60, 0x40, 0xd0, 0xe0, 0x00, 0xea, 
+-	0xd0, 0x40, 0x00, 0xe8, 0xd0, 0x82, 0x01, 0x46, 
+-	0x70, 0x01, 0xb0, 0x7c, 0x60, 0x02, 0xb0, 0xbc, 
+-	0x00, 0x06, 0x00, 0xc6, 0xb0, 0xc1, 0xed, 0x9b, 
+-	0x80, 0x49, 0xd6, 0x44, 0xd5, 0x43, 0x00, 0xe0, 
+-	0xd1, 0x80, 0x00, 0x06, 0x0b, 0x09, 0x01, 0x0d, 
+-	0x0b, 0x09, 0x61, 0x06, 0xb1, 0xbc, 0x01, 0x4d, 
+-	0x09, 0x09, 0x61, 0x46, 0xb1, 0xbc, 0x00, 0xcd, 
+-	0x09, 0x09, 0x10, 0xe4, 0xed, 0xb8, 0x60, 0xc6, 
+-	0xb1, 0xbc, 0x00, 0xcd, 0x60, 0xc6, 0x00, 0xed, 
+-	0xd0, 0x04, 0x70, 0x00, 0x10, 0x20, 0xf9, 0xd8, 
+-	0xd0, 0x0a, 0x40, 0x03, 0xe9, 0xc9, 0x10, 0xe2, 
+-	0xe9, 0xc9, 0x10, 0xe7, 0xe9, 0xc9, 0x10, 0xe8, 
+-	0xf9, 0xd8, 0x01, 0x46, 0x90, 0x10, 0x00, 0x20, 
+-	0xd0, 0x44, 0x50, 0x40, 0x00, 0xc6, 0xa0, 0x50, 
+-	0x00, 0xa0, 0xd0, 0x00, 0xa0, 0x05, 0x80, 0x40, 
+-	0x00, 0xed, 0xd1, 0xa4, 0xd0, 0x04, 0x60, 0x06, 
+-	0x00, 0xee, 0xd1, 0xac, 0x73, 0x86, 0x10, 0xe3, 
+-	0xe5, 0xe3, 0xe9, 0xe8, 0x00, 0xe7, 0xd0, 0x40, 
+-	0x00, 0xae, 0xd0, 0xbb, 0xe1, 0xec, 0x01, 0x24, 
+-	0xd0, 0x6b, 0x00, 0xea, 0xd0, 0xa6, 0xe1, 0xec, 
+-	0x01, 0x21, 0xd0, 0x7b, 0x00, 0xe8, 0xd0, 0x90, 
+-	0x13, 0xa0, 0xf9, 0xef, 0xc0, 0x42, 0x00, 0xe0, 
+-	0xd1, 0xa8, 0x60, 0x46, 0xb1, 0x98, 0x0b, 0xc9, 
+-	0x00, 0x4d, 0x09, 0x09, 0x10, 0x44, 0x00, 0x8d, 
+-	0x20, 0x42, 0x10, 0x5f, 0x60, 0x46, 0xb1, 0xb8, 
+-	0x00, 0x90, 0xea, 0x1c, 0x0a, 0x89, 0x00, 0x8d, 
+-	0x60, 0x86, 0xb1, 0xbc, 0x08, 0x49, 0x00, 0x4d, 
+-	0x60, 0x46, 0xb1, 0xbc, 0x08, 0x49, 0x00, 0x4d, 
+-	0x60, 0x46, 0x10, 0x60, 0xea, 0x10, 0x00, 0xe8, 
+-	0xd1, 0x80, 0xf2, 0xb0, 0x10, 0x60, 0xfa, 0x1c, 
+-	0x08, 0x49, 0x00, 0xe0, 0xd1, 0xa4, 0x00, 0x4d, 
+-	0x60, 0x46, 0x10, 0x60, 0xea, 0x20, 0x00, 0xe9, 
+-	0xd1, 0x80, 0xf2, 0xb0, 0x10, 0x60, 0xea, 0x20, 
+-	0x00, 0xe0, 0xd1, 0x88, 0xd0, 0x40, 0x60, 0x46, 
+-	0xd0, 0x00, 0x00, 0xe0, 0xd1, 0xa8, 0x70, 0x46, 
+-	0x00, 0xef, 0xd1, 0x9c, 0x70, 0x86, 0xb0, 0xb0, 
+-	0xee, 0x2a, 0xd0, 0x81, 0x00, 0x90, 0xea, 0x2d, 
+-	0x20, 0x01, 0x10, 0x41, 0x10, 0x9f, 0x10, 0xa0, 
+-	0xee, 0x2a, 0x10, 0x1c, 0x00, 0x65, 0xd1, 0xa8, 
+-	0x60, 0x06, 0x01, 0xb4, 0xd6, 0x3a, 0xe0, 0x46, 
+-	0x02, 0x31, 0xde, 0x13, 0x00, 0x27, 0xdc, 0xd8, 
+-	0xf0, 0x4a, 0x0c, 0x09, 0x00, 0x06, 0x05, 0x0d, 
+-	0x00, 0x22, 0xd0, 0x72, 0x30, 0x54, 0xe9, 0xea, 
+-	0xb0, 0x7d, 0xfa, 0x05, 0x09, 0x09, 0x01, 0xcd, 
+-	0x11, 0xe1, 0xf9, 0xc7, 0x80, 0x09, 0x80, 0x27, 
+-	0x0a, 0x09, 0xd6, 0x45, 0x00, 0xe1, 0xd1, 0xa0, 
+-	0x00, 0x4d, 0x60, 0x46, 0xb1, 0xbc, 0x08, 0x49, 
+-	0x00, 0x4d, 0x60, 0x46, 0x00, 0x50, 0xe9, 0x91, 
+-	0xd4, 0x01, 0xb1, 0xbc, 0x08, 0x89, 0x00, 0x4d, 
+-	0x60, 0x46, 0x00, 0xe0, 0xd1, 0x80, 0x08, 0x89, 
+-	0x00, 0x4d, 0x08, 0x89, 0x10, 0x4c, 0x71, 0x06, 
+-	0x21, 0x01, 0x61, 0x06, 0xb1, 0xbc, 0x00, 0x4d, 
+-	0x0b, 0x49, 0x10, 0x4c, 0x71, 0x46, 0x21, 0x41, 
+-	0x61, 0x46, 0xb1, 0xb0, 0x00, 0x4d, 0x10, 0x5f, 
+-	0x60, 0x46, 0xb1, 0xbc, 0x0a, 0x09, 0x00, 0x4d, 
+-	0x10, 0x4a, 0x70, 0x86, 0x20, 0x81, 0x60, 0x86, 
+-	0x00, 0xe1, 0xd1, 0xac, 0x08, 0x49, 0x00, 0x4d, 
+-	0x60, 0x46, 0xb1, 0xbc, 0x08, 0x89, 0x00, 0x4d, 
+-	0x60, 0x46, 0xb1, 0xbc, 0x09, 0x49, 0x00, 0x8d, 
+-	0x60, 0x86, 0xc0, 0x02, 0x00, 0xe0, 0xd1, 0xa8, 
+-	0x70, 0xc6, 0x10, 0xc0, 0xd0, 0x20, 0x30, 0x01, 
+-	0x10, 0xc0, 0x60, 0xc6, 0xe1, 0x75, 0x11, 0xe2, 
+-	0xf9, 0x75, 0x00, 0xe2, 0xd1, 0x80, 0x08, 0xc9, 
+-	0x00, 0x4d, 0x60, 0x46, 0xb1, 0xbc, 0x08, 0x49, 
+-	0x00, 0x4d, 0x60, 0x46, 0xb1, 0xbc, 0x10, 0x60, 
+-	0xf9, 0xd7, 0xb1, 0xb4, 0xe1, 0xde, 0xd2, 0x03, 
+-	0x0a, 0x09, 0x00, 0x4d, 0x60, 0x46, 0xb1, 0xbc, 
+-	0xb2, 0x01, 0xf9, 0xd8, 0x0b, 0xc9, 0x00, 0x4d, 
+-	0x10, 0x49, 0x10, 0x56, 0x60, 0x46, 0xb1, 0xbc, 
+-	0x0b, 0x89, 0x00, 0x4d, 0x10, 0x4a, 0x10, 0x56, 
+-	0x60, 0x46, 0xe1, 0x75, 0x0b, 0x2c, 0xd4, 0x40, 
+-	0xf3, 0xb0, 0xe1, 0x77, 0x00, 0xe0, 0xd0, 0x6c, 
+-	0x00, 0xe0, 0xd1, 0x80, 0xd0, 0x0a, 0xf1, 0xfe, 
+-	0x00, 0xe1, 0xd1, 0xb0, 0xd0, 0x02, 0xf1, 0xfe, 
+-	0x00, 0xe0, 0xd1, 0x80, 0x76, 0x86, 0xb1, 0xbc, 
+-	0x73, 0x46, 0xe2, 0x3c, 0x70, 0x81, 0x60, 0x86, 
+-	0xb1, 0xbc, 0xb0, 0x7c, 0xb0, 0x01, 0xed, 0xfe, 
+-	0x0f, 0xc5, 0x00, 0xe1, 0xd1, 0xa0, 0x70, 0x46, 
+-	0xd0, 0x8f, 0x40, 0x42, 0x00, 0x25, 0xd0, 0xe0, 
+-	0x00, 0x24, 0xd1, 0x20, 0x10, 0x6a, 0xea, 0x1e, 
+-	0x00, 0x66, 0xd0, 0xe0, 0x00, 0x62, 0xd1, 0x00, 
+-	0x10, 0x66, 0xea, 0x1e, 0x00, 0x6e, 0xd0, 0xc0, 
+-	0x10, 0x64, 0xea, 0x1e, 0x00, 0x2b, 0xd0, 0xd0, 
+-	0x00, 0x29, 0xd1, 0x00, 0x00, 0xe0, 0xd1, 0x80, 
+-	0x76, 0x86, 0x16, 0xa0, 0xe9, 0xee, 0x30, 0xda, 
+-	0xe5, 0xee, 0xb1, 0xbc, 0x73, 0x46, 0x13, 0x60, 
+-	0xe9, 0xee, 0x31, 0x0d, 0xe5, 0xee, 0xd0, 0x82, 
+-	0xb1, 0xbc, 0x70, 0x46, 0x10, 0x60, 0xe9, 0xee, 
+-	0xb0, 0x81, 0xee, 0x2c, 0x00, 0xe0, 0xd0, 0x40, 
+-	0x00, 0xe0, 0xd1, 0xac, 0xd0, 0x0a, 0xf1, 0xfe, 
+-	0x00, 0xe1, 0xd0, 0x70, 0xd0, 0x02, 0xf1, 0xfe, 
+-	0x00, 0xec, 0xd1, 0x98, 0xd0, 0x40, 0x60, 0x46, 
+-	0x00, 0xe0, 0xd0, 0x8c, 0x70, 0x82, 0x00, 0x21, 
+-	0xd0, 0x70, 0x60, 0x81, 0xd0, 0x40, 0x00, 0x25, 
+-	0xd0, 0x20, 0x30, 0x1a, 0xfa, 0x50, 0x00, 0x24, 
+-	0xd0, 0x20, 0x30, 0x0d, 0xfa, 0x50, 0xd0, 0x41, 
+-	0x00, 0x21, 0xd1, 0x84, 0x60, 0x46, 0xb6, 0xb1, 
+-	0x16, 0x9c, 0x01, 0x7a, 0xde, 0x1a, 0xe0, 0x46, 
+-	0x02, 0x31, 0xde, 0x13, 0x00, 0x27, 0xdc, 0xd8, 
+-	0xf0, 0x4a, 0x00, 0xec, 0xd0, 0xa8, 0x70, 0xc2, 
+-	0x10, 0xe0, 0xf9, 0x77, 0x00, 0xec, 0xd1, 0x9c, 
+-	0xd0, 0x41, 0x60, 0x46, 0x70, 0xc2, 0x10, 0xe0, 
+-	0xe9, 0x84, 0xd0, 0x40, 0x60, 0x46, 0xe1, 0x77, 
+-	0x0b, 0x49, 0x00, 0xe2, 0xd1, 0xa0, 0x00, 0x4d, 
+-	0x10, 0x5f, 0x00, 0x6f, 0xd0, 0xff, 0x40, 0x43, 
+-	0x60, 0x46, 0xb1, 0xbc, 0x0b, 0x09, 0x00, 0x4d, 
+-	0x60, 0x46, 0xb1, 0xbc, 0x08, 0x89, 0x00, 0x4d, 
+-	0x60, 0x46, 0x10, 0x61, 0xf9, 0x9b, 0xd3, 0xc2, 
+-	0x00, 0xec, 0xd1, 0xbc, 0x63, 0xc6, 0x0c, 0x09, 
+-	0x90, 0x4d, 0x10, 0x60, 0xe5, 0x9c, 0x00, 0x06, 
+-	0x05, 0x0d, 0x00, 0x22, 0xd0, 0x72, 0x30, 0x54, 
+-	0xf9, 0xa9, 0x0b, 0xa0, 0xd4, 0x40, 0xf3, 0xb0, 
+-	0xe1, 0xa0, 0x00, 0xec, 0xd1, 0x9c, 0xd0, 0x40, 
+-	0x60, 0x46, 0x01, 0x7a, 0xde, 0x1a, 0xe0, 0x46, 
+-	0x0b, 0x09, 0x00, 0x4d, 0x0b, 0x09, 0x00, 0x4d, 
+-	0x0a, 0x09, 0x01, 0x4d, 0x0a, 0x09, 0x00, 0x4d, 
+-	0x01, 0x59, 0xe9, 0x96, 0x09, 0x09, 0x00, 0x4d, 
+-	0x10, 0x5f, 0x10, 0x61, 0xf9, 0x96, 0x09, 0x09, 
+-	0x01, 0x4d, 0x11, 0x5f, 0x0b, 0xc9, 0x00, 0x4d, 
+-	0xc0, 0x01, 0x10, 0x5f, 0x11, 0x4e, 0x51, 0x41, 
+-	0x08, 0x49, 0x00, 0x4d, 0x0b, 0xc9, 0x10, 0x0f, 
+-	0x00, 0x4d, 0x50, 0x01, 0x00, 0xed, 0xd1, 0xb6, 
+-	0x01, 0x46, 0x00, 0x06, 0xa0, 0x3c, 0xa1, 0x7d, 
+-	0x60, 0x06, 0x00, 0xc6, 0xd5, 0x00, 0xb5, 0x01, 
+-	0x01, 0x7a, 0xde, 0x1a, 0xe0, 0x46, 0x50, 0x00, 
+-	0x00, 0xec, 0xd0, 0xac, 0x70, 0xc2, 0x10, 0xe0, 
+-	0xf9, 0x70, 0x00, 0xec, 0xd1, 0xa0, 0xd0, 0x41, 
+-	0x60, 0x46, 0x70, 0xc2, 0x10, 0xe0, 0xe9, 0x7f, 
+-	0xd0, 0x40, 0x60, 0x46, 0xe1, 0x70, 0x0a, 0x89, 
+-	0x0b, 0xcd, 0x00, 0xe3, 0xd1, 0x80, 0x6b, 0xc6, 
+-	0x08, 0xc9, 0x05, 0x8d, 0x15, 0xa3, 0xee, 0x6e, 
+-	0x15, 0xa0, 0xea, 0x6e, 0x90, 0x4d, 0xd0, 0x9f, 
+-	0xd0, 0xdf, 0x40, 0x81, 0x10, 0x55, 0x40, 0xc1, 
+-	0x01, 0x46, 0x82, 0x34, 0x80, 0x3f, 0xc8, 0x1d, 
+-	0x81, 0x34, 0x80, 0x3f, 0x00, 0xc6, 0xd1, 0x23, 
+-	0x31, 0x03, 0x11, 0x02, 0x38, 0x04, 0xb0, 0x8d, 
+-	0x10, 0x9d, 0x28, 0x02, 0xc0, 0x60, 0x00, 0x65, 
+-	0xd1, 0x94, 0x71, 0x06, 0x68, 0x06, 0x30, 0x44, 
+-	0x00, 0xed, 0xd1, 0xa8, 0x70, 0x06, 0x10, 0x20, 
+-	0xe9, 0xb0, 0x00, 0xee, 0xd0, 0xc0, 0x70, 0xc3, 
+-	0x20, 0x43, 0xb0, 0x01, 0xf9, 0xac, 0x60, 0x06, 
+-	0x00, 0x64, 0xd1, 0xbc, 0x71, 0x06, 0xc0, 0x04, 
+-	0x21, 0x01, 0x61, 0x06, 0x10, 0x20, 0xf5, 0xbb, 
+-	0x11, 0x20, 0xe5, 0xbb, 0xb0, 0x41, 0x00, 0x65, 
+-	0xd1, 0x80, 0x71, 0x06, 0x21, 0x01, 0x61, 0x06, 
+-	0x00, 0xed, 0xd1, 0xac, 0x71, 0x06, 0x15, 0xa1, 
+-	0xe9, 0xcb, 0xb1, 0x3f, 0x61, 0x06, 0x15, 0xa3, 
+-	0xf9, 0xd6, 0xd0, 0xbf, 0xe1, 0xd3, 0xd0, 0x40, 
+-	0x60, 0x46, 0xb1, 0xbc, 0x70, 0x86, 0x61, 0x06, 
+-	0x31, 0x02, 0xe5, 0xd3, 0x20, 0x84, 0x00, 0x65, 
+-	0xd1, 0xa4, 0x60, 0x86, 0xd9, 0x40, 0x00, 0xec, 
+-	0xd1, 0x94, 0x79, 0x06, 0xb1, 0x84, 0x78, 0xc6, 
+-	0xc0, 0x63, 0x30, 0x64, 0xe9, 0xf8, 0x00, 0xa7, 
+-	0xd0, 0xff, 0x7a, 0x63, 0x00, 0x65, 0xd0, 0x00, 
+-	0x71, 0x00, 0x31, 0x29, 0xe5, 0xf8, 0xc0, 0x63, 
+-	0xc8, 0xc1, 0xb0, 0x78, 0x40, 0x43, 0xc0, 0xa4, 
+-	0x30, 0x81, 0xe9, 0xf2, 0x7a, 0x41, 0x31, 0x29, 
+-	0xf5, 0xe8, 0x21, 0x29, 0x61, 0x00, 0xb8, 0xfc, 
+-	0x79, 0x63, 0xb8, 0xfc, 0x48, 0xc3, 0x68, 0xc6, 
+-	0x00, 0xed, 0xd1, 0xb8, 0x69, 0x46, 0x80, 0x28, 
+-	0x0b, 0xc9, 0x00, 0x4d, 0x08, 0x49, 0x10, 0x41, 
+-	0x00, 0xe3, 0xd1, 0x84, 0x00, 0x8d, 0x20, 0x42, 
+-	0x60, 0x46, 0x00, 0xee, 0xd1, 0xa4, 0x70, 0x86, 
+-	0x10, 0xa1, 0xee, 0x18, 0xe6, 0x6b, 0x90, 0x86, 
+-	0x00, 0x90, 0xea, 0x18, 0x00, 0xed, 0xd0, 0x1c, 
+-	0x70, 0x80, 0xb0, 0x81, 0xe6, 0x6b, 0x60, 0x80, 
+-	0xb1, 0xa8, 0x70, 0x86, 0x10, 0xa0, 0xfa, 0x6b, 
+-	0x00, 0x21, 0xd0, 0x38, 0x70, 0x80, 0x10, 0xa0, 
+-	0xfa, 0x6b, 0x0f, 0xef, 0xd0, 0xbf, 0x30, 0x81, 
+-	0xfa, 0x22, 0x60, 0x00, 0x08, 0x20, 0xd0, 0x00, 
+-	0x5f, 0x00, 0x15, 0xa3, 0xea, 0x6b, 0x00, 0xee, 
+-	0xd1, 0x80, 0x79, 0x46, 0x00, 0xf8, 0xd0, 0x00, 
+-	0xc4, 0x40, 0x00, 0xe3, 0xd1, 0x84, 0x78, 0x46, 
+-	0x0f, 0xef, 0xd0, 0x3f, 0x30, 0x21, 0xea, 0x48, 
+-	0x00, 0xe0, 0xd1, 0x90, 0x78, 0x06, 0xc0, 0xa1, 
+-	0x18, 0x43, 0x28, 0x42, 0x18, 0x43, 0x28, 0x42, 
+-	0x18, 0x1e, 0xd8, 0x80, 0x08, 0x11, 0xea, 0x41, 
+-	0x28, 0xa1, 0x18, 0x01, 0x18, 0x5f, 0x18, 0x60, 
+-	0xee, 0x3e, 0xc0, 0x51, 0x30, 0x62, 0xee, 0x4e, 
+-	0xc8, 0x91, 0x18, 0x9f, 0x00, 0x21, 0xd1, 0xb8, 
+-	0xd0, 0x01, 0x60, 0x06, 0x00, 0xef, 0xd0, 0x10, 
+-	0xd0, 0x72, 0x60, 0x40, 0x01, 0x46, 0x82, 0x34, 
+-	0x80, 0x3f, 0xc8, 0xdc, 0xc9, 0x1d, 0x81, 0x34, 
+-	0x80, 0x3f, 0x00, 0xc6, 0x38, 0xe4, 0xee, 0x5e, 
+-	0xea, 0x52, 0x28, 0xe5, 0x01, 0x46, 0x90, 0x6d, 
+-	0x28, 0xc1, 0x00, 0xc6, 0x38, 0xe2, 0xf6, 0x6b, 
+-	0xdb, 0x08, 0xf1, 0x16, 0xf1, 0x18, 0x00, 0x21, 
+-	0xd1, 0xb4, 0x61, 0x86, 0xe2, 0x52, 0x01, 0xf7, 
+-	0xd2, 0x19, 0xe0, 0x46, 0xd5, 0x00, 0xb5, 0x01, 
+-	0x01, 0x7a, 0xde, 0x1a, 0xe0, 0x46, 0x50, 0x00, 
+-	0x02, 0x31, 0xde, 0x13, 0x00, 0x27, 0xdc, 0xd8, 
+-	0xf0, 0x4a, 0xdb, 0x09, 0x00, 0xe3, 0xd0, 0x1c, 
+-	0x6b, 0x00, 0xda, 0xc1, 0x00, 0xe6, 0xd1, 0x98, 
+-	0x70, 0x06, 0xb1, 0x84, 0x60, 0x06, 0xb1, 0x84, 
+-	0x60, 0x06, 0x05, 0x9f, 0xe9, 0x9f, 0x08, 0x49, 
+-	0xd1, 0x17, 0x46, 0x44, 0x00, 0x4d, 0x10, 0x43, 
+-	0x26, 0x41, 0x08, 0xc9, 0x05, 0xcd, 0xb5, 0xc1, 
+-	0xe5, 0xcc, 0xc0, 0x57, 0x15, 0xc6, 0x25, 0xc1, 
+-	0x15, 0xa3, 0xf9, 0x9f, 0x08, 0x49, 0xd1, 0x0f, 
+-	0x46, 0x44, 0x00, 0x4d, 0x10, 0x44, 0x26, 0x41, 
+-	0x08, 0xc9, 0x06, 0x0d, 0xb6, 0x01, 0xe5, 0xcc, 
+-	0xc0, 0x58, 0x16, 0x06, 0x26, 0x01, 0x08, 0x49, 
+-	0x00, 0x4d, 0x10, 0x60, 0xe9, 0xa6, 0x0a, 0x09, 
+-	0x00, 0x4d, 0xe1, 0x9f, 0x0c, 0x09, 0x90, 0x4d, 
+-	0x10, 0x60, 0xe5, 0xa7, 0x00, 0x06, 0x05, 0x0d, 
+-	0x00, 0x22, 0xd0, 0x72, 0x30, 0x54, 0xf9, 0xb3, 
+-	0xd4, 0x40, 0xf3, 0xb0, 0xe1, 0xab, 0xb0, 0x7d, 
+-	0xf9, 0xb8, 0x02, 0x34, 0xd4, 0x44, 0xe0, 0x46, 
+-	0x00, 0xec, 0xd1, 0xa0, 0xd0, 0x40, 0x60, 0x46, 
+-	0x02, 0x3c, 0xdc, 0x89, 0x00, 0xec, 0xd1, 0x80, 
+-	0x70, 0x46, 0xb1, 0xbc, 0x70, 0x86, 0x30, 0x81, 
+-	0xe8, 0x46, 0x15, 0x63, 0xe9, 0xc9, 0x05, 0x5e, 
+-	0xe8, 0x46, 0x01, 0x73, 0xd4, 0x3d, 0xe0, 0x46, 
+-	0xd5, 0x00, 0xb5, 0x01, 0x01, 0x7a, 0xde, 0x1a, 
+-	0xe0, 0x46, 0x50, 0x00, 0x50, 0x00, 0x50, 0x00, 
+-	0xcc, 0xc0, 0xcd, 0x01, 0xcd, 0x42, 0xcd, 0x83, 
+-	0x00, 0xa0, 0xd0, 0x01, 0xa0, 0x38, 0xc8, 0x7f, 
+-	0xc8, 0x06, 0xb1, 0xbe, 0xf3, 0x96, 0xc8, 0x80, 
+-	0xf3, 0x92, 0x58, 0x80, 0xf3, 0x96, 0xc8, 0xc0, 
+-	0xf3, 0x96, 0xc9, 0x00, 0xf3, 0x92, 0x58, 0xc0, 
+-	0xf3, 0x96, 0xc9, 0x40, 0xf3, 0x92, 0x59, 0x40, 
+-	0xc0, 0x22, 0xc0, 0x65, 0xc0, 0x86, 0xf3, 0x9a, 
+-	0xf3, 0x96, 0xc8, 0x80, 0xf3, 0x92, 0x59, 0x00, 
+-	0xf3, 0x96, 0xc9, 0x40, 0xf3, 0x96, 0xc9, 0x80, 
+-	0xf3, 0x92, 0x59, 0x40, 0xf3, 0x96, 0xc9, 0xc0, 
+-	0xf3, 0x92, 0x58, 0x80, 0xc0, 0x23, 0xc0, 0x62, 
+-	0xd0, 0x88, 0x20, 0x86, 0xf3, 0x9a, 0xf3, 0x96, 
+-	0xc8, 0xc0, 0xf3, 0x92, 0x58, 0xc0, 0xf3, 0x96, 
+-	0xc8, 0x80, 0xf3, 0x92, 0x59, 0xc0, 0xc0, 0x24, 
+-	0xc0, 0x67, 0xd0, 0x90, 0x20, 0x86, 0xf3, 0x9a, 
+-	0xf3, 0x96, 0xc9, 0x00, 0xf3, 0x92, 0x59, 0x80, 
+-	0xf3, 0x96, 0xc9, 0xc0, 0xf3, 0x96, 0xca, 0x00, 
+-	0xf3, 0x92, 0x59, 0xc0, 0xf3, 0x96, 0xca, 0x40, 
+-	0xf3, 0x92, 0x59, 0x00, 0xc0, 0x25, 0xc0, 0x64, 
+-	0xd0, 0x98, 0x20, 0x86, 0xf3, 0x9a, 0xf3, 0x96, 
+-	0xc9, 0x40, 0xf3, 0x92, 0x58, 0x80, 0xf3, 0x96, 
+-	0xc9, 0x00, 0xf3, 0x92, 0x59, 0x00, 0xc0, 0x23, 
+-	0xc0, 0x64, 0xd0, 0x84, 0x20, 0x86, 0xf3, 0x9a, 
+-	0xf3, 0x96, 0xc8, 0xc0, 0xf3, 0x92, 0x59, 0x40, 
+-	0xf3, 0x96, 0xc9, 0x00, 0xf3, 0x92, 0x5a, 0x40, 
+-	0xc0, 0x26, 0xc0, 0x69, 0xd0, 0xa0, 0x20, 0x86, 
+-	0xf3, 0x9a, 0xf3, 0x96, 0xc9, 0x80, 0xf3, 0x92, 
+-	0x5a, 0x00, 0xf3, 0x96, 0xca, 0x40, 0xf3, 0x92, 
+-	0x5a, 0x40, 0xf3, 0x96, 0xca, 0x80, 0xf3, 0x92, 
+-	0x59, 0x80, 0xc0, 0x27, 0xc0, 0x66, 0xd0, 0xa8, 
+-	0x20, 0x86, 0xf3, 0x9a, 0xf3, 0x96, 0xc9, 0xc0, 
+-	0xf3, 0x92, 0x59, 0x00, 0xf3, 0x96, 0xc9, 0x80, 
+-	0xf3, 0x92, 0x58, 0xc0, 0xc0, 0x22, 0xc0, 0x63, 
+-	0xd0, 0x8c, 0x20, 0x86, 0xf3, 0x9a, 0xf3, 0x92, 
+-	0x59, 0x80, 0xc0, 0x25, 0xc0, 0x66, 0xd0, 0x94, 
+-	0x20, 0x86, 0xf3, 0x9a, 0xf3, 0x96, 0xc8, 0x80, 
+-	0xf3, 0x92, 0x59, 0xc0, 0xf3, 0x96, 0xc8, 0xc0, 
+-	0xf3, 0x92, 0x5a, 0x80, 0xc0, 0x28, 0xc0, 0x6a, 
+-	0xd0, 0xb0, 0x20, 0x86, 0xf3, 0x9a, 0xf3, 0x96, 
+-	0xc9, 0x40, 0xf3, 0x92, 0x59, 0x40, 0xc0, 0x29, 
+-	0xc0, 0x65, 0xd0, 0xb8, 0x20, 0x86, 0xf3, 0x9a, 
+-	0xf3, 0x96, 0xc9, 0x80, 0xf3, 0x92, 0x58, 0xc0, 
+-	0xf3, 0x96, 0xca, 0x00, 0xf3, 0x92, 0x58, 0x80, 
+-	0xc0, 0x24, 0xc0, 0x62, 0xd0, 0x9c, 0x20, 0x86, 
+-	0xf3, 0x9a, 0xf3, 0x92, 0x5a, 0x00, 0xc0, 0x27, 
+-	0xc0, 0x68, 0xd0, 0xa4, 0x20, 0x86, 0xf3, 0x9a, 
+-	0xf3, 0x96, 0xca, 0x80, 0xf3, 0x92, 0x59, 0x80, 
+-	0xf3, 0x96, 0xca, 0x40, 0xf3, 0x92, 0x5a, 0x40, 
+-	0xf3, 0x96, 0xc9, 0x40, 0xf3, 0x92, 0x5a, 0x80, 
+-	0xc0, 0x23, 0xc0, 0x6a, 0xd0, 0xac, 0x20, 0x86, 
+-	0xf3, 0x9a, 0xf3, 0x92, 0x59, 0x40, 0xc0, 0x26, 
+-	0xc0, 0x65, 0xd0, 0xb4, 0x20, 0x86, 0xf3, 0x9a, 
+-	0xf3, 0x96, 0xc9, 0x00, 0xf3, 0x92, 0x59, 0x00, 
+-	0xc0, 0x29, 0xc0, 0x64, 0xd0, 0xbc, 0x20, 0x86, 
+-	0xf3, 0x9a, 0xc0, 0x33, 0xc0, 0x74, 0xc0, 0xb5, 
+-	0xc0, 0xf6, 0xd0, 0x40, 0x00, 0xa0, 0xd8, 0x00, 
+-	0xa8, 0x38, 0x08, 0x45, 0x0a, 0x09, 0x00, 0x0d, 
+-	0x0f, 0xc5, 0x50, 0x00, 0x0a, 0x09, 0x00, 0x0d, 
+-	0x10, 0x08, 0x0f, 0xc5, 0x01, 0x46, 0x00, 0x06, 
+-	0xa0, 0x7c, 0xa0, 0x3d, 0x60, 0x42, 0x00, 0xc6, 
+-	0x0f, 0xc5, 0x50, 0x00, 0x50, 0x00, 0x50, 0x00, 
+-	0x14, 0x48, 0xd0, 0x81, 0x00, 0xef, 0xd1, 0x8c, 
+-	0x71, 0x46, 0x11, 0x60, 0xfb, 0xb1, 0x60, 0x86, 
+-	0x71, 0x46, 0x31, 0x42, 0xfb, 0xb1, 0x00, 0xec, 
+-	0xd1, 0x0c, 0x74, 0x84, 0x00, 0x68, 0xd0, 0x80, 
+-	0x70, 0x02, 0x10, 0x20, 0xfb, 0xc4, 0xc4, 0x82, 
+-	0xc4, 0xd2, 0xb4, 0xfc, 0xda, 0x00, 0xda, 0x4f, 
+-	0x0a, 0x09, 0x0f, 0xef, 0xd0, 0x3f, 0xb4, 0x7f, 
+-	0xca, 0x29, 0x1a, 0x18, 0x4a, 0x00, 0x1a, 0x48, 
+-	0x00, 0x8d, 0x2a, 0x42, 0xd0, 0x03, 0x40, 0x11, 
+-	0xfb, 0xe3, 0xb4, 0x44, 0x00, 0xa0, 0xd0, 0xc0, 
+-	0x30, 0xd3, 0xff, 0xe3, 0xb4, 0xfe, 0x01, 0x46, 
+-	0x00, 0x06, 0xaa, 0x3d, 0xaa, 0x7c, 0x6a, 0x53, 
+-	0x00, 0xc6, 0xb4, 0xfe, 0xb4, 0x7c, 0x1a, 0x61, 
+-	0xfb, 0xc8, 0xb4, 0x43, 0x00, 0xef, 0xd0, 0x3f, 
+-	0x40, 0x11, 0xeb, 0xf7, 0xb0, 0xc4, 0xe7, 0xf7, 
+-	0xeb, 0xee, 0x61, 0x53, 0x64, 0x52, 0x64, 0xc4, 
+-	0x00, 0x28, 0xd1, 0x24, 0x70, 0x04, 0x00, 0x21, 
+-	0xd0, 0x80, 0x50, 0x02, 0x60, 0x04, 0x61, 0x46, 
+-	0x0a, 0x09, 0x0f, 0xc5, 0x50, 0x00, 0x50, 0x00, 
+-	0x02, 0x31, 0xde, 0x13, 0x00, 0x27, 0xdc, 0xd8, 
+-	0xf0, 0x4a, 0x01, 0xfa, 0xd4, 0x3d, 0x00, 0x25, 
+-	0xdc, 0xd8, 0xf0, 0x4a, 0x09, 0x09, 0x01, 0xcd, 
+-	0x11, 0xe8, 0xf9, 0xe2, 0x00, 0xe3, 0xd1, 0x9c, 
+-	0x09, 0x09, 0x05, 0xcd, 0xb5, 0xc1, 0x09, 0x09, 
+-	0x00, 0x4d, 0xb0, 0x41, 0x10, 0x46, 0x25, 0xc1, 
+-	0x09, 0x09, 0x06, 0x0d, 0xb6, 0x01, 0x09, 0x09, 
+-	0x00, 0x4d, 0x08, 0x89, 0xb0, 0x41, 0x10, 0x46, 
+-	0x26, 0x01, 0x00, 0x8d, 0x08, 0x89, 0x10, 0x82, 
+-	0xd0, 0x04, 0xc0, 0x55, 0x00, 0x40, 0x40, 0x40, 
+-	0x05, 0x4d, 0x08, 0x49, 0x0b, 0x0d, 0xd1, 0x00, 
+-	0x15, 0x63, 0xe9, 0xa2, 0xd1, 0x01, 0x55, 0x41, 
+-	0xdb, 0x01, 0x4b, 0x15, 0xa1, 0x1b, 0x08, 0x89, 
+-	0x00, 0x4d, 0x08, 0x49, 0x10, 0x41, 0xd1, 0x19, 
+-	0x46, 0x44, 0x26, 0x41, 0x00, 0xcd, 0x08, 0x49, 
+-	0x10, 0xc4, 0x00, 0x4d, 0x08, 0x49, 0x10, 0x41, 
+-	0x20, 0x81, 0xa0, 0x89, 0x00, 0x4d, 0x10, 0x43, 
+-	0x20, 0xc1, 0xa0, 0xe8, 0x08, 0x49, 0x00, 0x4d, 
+-	0x1b, 0x03, 0x5b, 0x01, 0xbb, 0x3f, 0x6b, 0x06, 
+-	0x08, 0x49, 0xb1, 0xbc, 0x00, 0x4d, 0x60, 0x46, 
+-	0x08, 0x49, 0xb1, 0xbc, 0x0a, 0xcd, 0x1a, 0xc2, 
+-	0x4a, 0xd9, 0x1a, 0xde, 0x6a, 0xc6, 0x08, 0x49, 
+-	0xb1, 0xbc, 0x00, 0x4d, 0x60, 0x46, 0x10, 0x60, 
+-	0xea, 0x3e, 0xb1, 0xbc, 0x08, 0x49, 0x00, 0x4d, 
+-	0x60, 0x46, 0xb1, 0xbc, 0x08, 0xc9, 0x00, 0x4d, 
+-	0x60, 0x46, 0xb1, 0xbc, 0x08, 0x49, 0x00, 0x4d, 
+-	0x60, 0x46, 0xb1, 0xbc, 0x09, 0xc9, 0x00, 0x4d, 
+-	0x60, 0x46, 0xb1, 0xbc, 0x0a, 0x09, 0x00, 0x4d, 
+-	0x60, 0x46, 0xe2, 0x3e, 0x11, 0xe3, 0xfa, 0x00, 
+-	0x00, 0xe7, 0xd0, 0xc0, 0xd0, 0x84, 0xb0, 0x81, 
+-	0xe6, 0x3e, 0x08, 0x49, 0x00, 0x4d, 0x60, 0x43, 
+-	0xb0, 0xfc, 0x10, 0x60, 0xe9, 0xe7, 0x10, 0xa3, 
+-	0xf9, 0xf4, 0x00, 0xe8, 0xd1, 0x80, 0xe1, 0xf8, 
+-	0x10, 0xa2, 0xf9, 0xfa, 0x00, 0xe9, 0xd1, 0x80, 
+-	0xf2, 0xb0, 0xe1, 0xe7, 0xd2, 0x3f, 0x0a, 0x09, 
+-	0x00, 0x4d, 0xb2, 0x01, 0xf5, 0xfb, 0xe1, 0xe7, 
+-	0x11, 0xe7, 0xfa, 0x3e, 0xd4, 0x01, 0x00, 0xe1, 
+-	0xd0, 0x24, 0x70, 0x00, 0x10, 0x21, 0xea, 0x0d, 
+-	0x15, 0x63, 0xfa, 0x0d, 0xd4, 0x03, 0x44, 0x2c, 
+-	0xb4, 0x3f, 0x00, 0xe6, 0xd1, 0x90, 0x0b, 0x09, 
+-	0x00, 0x4d, 0x09, 0x49, 0x10, 0x45, 0x00, 0x8d, 
+-	0x50, 0x81, 0xd0, 0x40, 0x10, 0x87, 0x10, 0x98, 
+-	0x30, 0x42, 0xf2, 0x61, 0x60, 0x46, 0xb1, 0xbc, 
+-	0x0b, 0x09, 0x00, 0x0d, 0x09, 0x49, 0x00, 0x0d, 
+-	0xb4, 0x01, 0xfa, 0x0f, 0x00, 0xe6, 0xd0, 0x18, 
+-	0x30, 0x06, 0xe6, 0x29, 0x60, 0x46, 0xb1, 0xbc, 
+-	0xe2, 0x22, 0x00, 0xe0, 0xd1, 0x88, 0x70, 0x46, 
+-	0x10, 0x63, 0xea, 0x39, 0x10, 0x64, 0xea, 0x39, 
+-	0x00, 0xe6, 0xd1, 0x90, 0xd0, 0x00, 0x60, 0x06, 
+-	0xb1, 0xbc, 0x60, 0x06, 0xb1, 0xbc, 0x60, 0x06, 
+-	0xe2, 0x3e, 0x00, 0xef, 0xd1, 0x84, 0x70, 0x46, 
+-	0x10, 0x60, 0xfa, 0x30, 0x0c, 0x09, 0x90, 0x4d, 
+-	0x10, 0x60, 0xe6, 0x3f, 0x00, 0x06, 0x05, 0x0d, 
+-	0x00, 0x22, 0xd0, 0x72, 0x30, 0x54, 0xfa, 0x4b, 
+-	0xd4, 0x40, 0xf3, 0xb0, 0xe2, 0x43, 0xb0, 0x7d, 
+-	0xe9, 0x7a, 0x00, 0xec, 0xd1, 0xa0, 0xd0, 0x40, 
+-	0x60, 0x46, 0x02, 0x3c, 0xdc, 0x89, 0x00, 0xec, 
+-	0xd1, 0x80, 0x70, 0x46, 0xb1, 0xbc, 0x70, 0x86, 
+-	0x30, 0x81, 0xe8, 0x46, 0x15, 0x63, 0xea, 0x5e, 
+-	0x05, 0x5e, 0xe8, 0x46, 0x01, 0x73, 0xd4, 0x3d, 
+-	0xe0, 0x46, 0x00, 0xe0, 0xd0, 0x00, 0x70, 0xc0, 
+-	0x10, 0xc1, 0x00, 0xe0, 0xd0, 0x08, 0x70, 0x00, 
+-	0x10, 0x23, 0xea, 0x75, 0xc0, 0x83, 0x10, 0x9d, 
+-	0x30, 0xc2, 0x10, 0x9f, 0x30, 0xc2, 0x00, 0xef, 
+-	0xd0, 0xac, 0x70, 0x82, 0x10, 0xa3, 0xea, 0x75, 
+-	0x10, 0xc1, 0xc0, 0x83, 0x30, 0x81, 0xe6, 0x7e, 
+-	0xc0, 0x83, 0x20, 0x81, 0xf6, 0x7f, 0xd0, 0x40, 
+-	0x30, 0x43, 0x0f, 0xc5, 0xc0, 0x43, 0x0f, 0xc5, 
+-	0x00, 0xed, 0xd1, 0xa4, 0x72, 0x86, 0x15, 0xa3, 
+-	0xee, 0x23, 0x15, 0xa1, 0xe6, 0x23, 0x08, 0x20, 
+-	0xd0, 0x00, 0x5f, 0x00, 0xd8, 0xc4, 0x15, 0x63, 
+-	0xe9, 0x7e, 0x48, 0xd5, 0x18, 0xde, 0x18, 0xe0, 
+-	0xe9, 0xc2, 0x00, 0xed, 0xd1, 0xb4, 0x79, 0xc6, 
+-	0x19, 0xe0, 0xe9, 0x8c, 0x00, 0xed, 0xd0, 0x3a, 
+-	0x79, 0xc6, 0x69, 0xc0, 0xd9, 0xc0, 0x69, 0xc6, 
+-	0x00, 0xed, 0xd0, 0x38, 0x79, 0x40, 0x19, 0x60, 
+-	0xe9, 0x98, 0x00, 0x28, 0xd0, 0x24, 0x70, 0x40, 
+-	0x02, 0x20, 0xd0, 0x80, 0x50, 0x42, 0x60, 0x40, 
+-	0x15, 0xa3, 0xe9, 0x9f, 0x00, 0xec, 0xd1, 0xb8, 
+-	0x79, 0xc6, 0x69, 0x46, 0xc9, 0x67, 0x00, 0xec, 
+-	0xd9, 0xb4, 0x70, 0x66, 0x00, 0xec, 0xd1, 0xbc, 
+-	0x70, 0x06, 0x10, 0x20, 0xed, 0xbe, 0x10, 0x60, 
+-	0xe9, 0xc1, 0x00, 0xe0, 0xda, 0xa8, 0x7a, 0xaa, 
+-	0xc0, 0x2a, 0x10, 0x1f, 0x00, 0x22, 0xd0, 0xa0, 
+-	0x70, 0x82, 0x20, 0x6a, 0x00, 0x9f, 0xe9, 0xb5, 
+-	0x20, 0x40, 0x19, 0x60, 0xf9, 0xb8, 0xc9, 0x41, 
+-	0xb0, 0x48, 0x30, 0x65, 0xf5, 0xbd, 0xb0, 0x70, 
+-	0xed, 0xbe, 0xd9, 0x40, 0x00, 0xed, 0xd1, 0xbc, 
+-	0x69, 0x46, 0x69, 0x66, 0x12, 0xa4, 0xea, 0x21, 
+-	0x00, 0xec, 0xd1, 0xbc, 0x73, 0xc6, 0x15, 0xa3, 
+-	0xe9, 0xdf, 0x33, 0xe3, 0xe5, 0xd3, 0xed, 0xd2, 
+-	0x63, 0xc6, 0x00, 0x21, 0xd1, 0xa8, 0x63, 0xc6, 
+-	0x00, 0xed, 0xd1, 0xa0, 0x63, 0xc6, 0x15, 0xa1, 
+-	0xf9, 0xdc, 0x12, 0xa3, 0xe5, 0xe3, 0xd3, 0xc2, 
+-	0x00, 0xec, 0xd1, 0xbc, 0x63, 0xc6, 0xe1, 0xe3, 
+-	0x12, 0xa3, 0xea, 0x21, 0xe1, 0xe3, 0x12, 0xa2, 
+-	0xf6, 0x21, 0x13, 0xe0, 0xfa, 0x21, 0x00, 0xee, 
+-	0xd1, 0x8c, 0x78, 0x06, 0xb1, 0xbc, 0x78, 0x46, 
+-	0xb1, 0xbc, 0x78, 0x86, 0xd1, 0x88, 0x72, 0x46, 
+-	0xd1, 0x84, 0x73, 0x06, 0x13, 0x20, 0xf9, 0xe3, 
+-	0x00, 0x64, 0xd1, 0xa0, 0x70, 0x46, 0xd0, 0xa2, 
+-	0x30, 0x81, 0xe9, 0xff, 0x10, 0x70, 0xea, 0x11, 
+-	0x10, 0x6d, 0xea, 0x14, 0x10, 0x76, 0xea, 0x19, 
+-	0x10, 0x7a, 0xea, 0x28, 0xe2, 0x3b, 0x18, 0xe0, 
+-	0xea, 0x3b, 0x00, 0xed, 0xd1, 0x80, 0x70, 0x86, 
+-	0xb0, 0x81, 0xd0, 0x3f, 0x40, 0x02, 0x10, 0x20, 
+-	0xea, 0x0c, 0x60, 0x86, 0xf3, 0x8a, 0xe1, 0xe3, 
+-	0xc0, 0x02, 0x10, 0x1a, 0x50, 0x80, 0x60, 0x86, 
+-	0xe2, 0x3b, 0x15, 0xa3, 0xea, 0x21, 0xe2, 0xe9, 
+-	0xd2, 0x80, 0x00, 0xed, 0xd1, 0xa4, 0x62, 0x86, 
+-	0xe3, 0x0c, 0x00, 0xed, 0xd1, 0x88, 0xd0, 0x60, 
+-	0x70, 0x06, 0x50, 0x40, 0x60, 0x46, 0x15, 0xa3, 
+-	0xfb, 0x0c, 0xd5, 0x84, 0xe3, 0x0c, 0xd5, 0x00, 
+-	0xb5, 0x01, 0x01, 0x7a, 0xde, 0x1a, 0xe0, 0x46, 
+-	0x00, 0xed, 0xd1, 0x88, 0xd0, 0x60, 0x70, 0x06, 
+-	0x50, 0x40, 0x60, 0x46, 0x15, 0xa2, 0xe7, 0x0c, 
+-	0xee, 0x21, 0x00, 0x21, 0xd1, 0x8c, 0x18, 0xe0, 
+-	0xfa, 0x39, 0x70, 0x46, 0x10, 0x61, 0xea, 0x70, 
+-	0xe2, 0x21, 0x65, 0x86, 0xe2, 0x21, 0x18, 0xe0, 
+-	0xea, 0x70, 0xd1, 0x80, 0x73, 0x06, 0x15, 0xa2, 
+-	0xee, 0x68, 0x00, 0x22, 0xd1, 0x80, 0x70, 0x46, 
+-	0x6b, 0x06, 0xcb, 0x01, 0xb1, 0xb4, 0x70, 0x46, 
+-	0x6a, 0xc6, 0xca, 0xc1, 0x00, 0x65, 0xd1, 0x98, 
+-	0x70, 0x46, 0x10, 0x61, 0xfa, 0x50, 0x02, 0x41, 
+-	0xc3, 0x21, 0xc7, 0xe0, 0x02, 0x50, 0xea, 0x56, 
+-	0xc3, 0x20, 0xc7, 0xe1, 0xd1, 0x88, 0xd0, 0x01, 
+-	0x02, 0x40, 0x62, 0x46, 0x0f, 0xef, 0xd0, 0x7f, 
+-	0x30, 0x6f, 0xfa, 0x5f, 0xc3, 0x20, 0xc7, 0x4c, 
+-	0xd0, 0x00, 0x00, 0x65, 0xd1, 0x98, 0x70, 0x46, 
+-	0x60, 0x06, 0xb0, 0x41, 0x43, 0x01, 0xe2, 0x70, 
+-	0xc3, 0x22, 0xc7, 0xcc, 0xc7, 0x60, 0xc7, 0xa1, 
+-	0x02, 0x50, 0xea, 0x70, 0xc7, 0x61, 0xc7, 0xa0, 
+-	0xdb, 0x80, 0xd1, 0x00, 0x00, 0xef, 0xd1, 0xa8, 
+-	0x70, 0x46, 0x10, 0x60, 0xfa, 0x7a, 0x00, 0xe0, 
+-	0xd1, 0x88, 0x70, 0x46, 0x00, 0x22, 0xd1, 0xb0, 
+-	0x70, 0x86, 0x30, 0x81, 0xea, 0x82, 0x60, 0x46, 
+-	0xd0, 0x20, 0xf3, 0x06, 0x10, 0x63, 0xea, 0x87, 
+-	0x10, 0x64, 0xea, 0x87, 0xe2, 0x95, 0x00, 0xef, 
+-	0xd1, 0x6c, 0x71, 0x45, 0xc0, 0x05, 0x30, 0x01, 
+-	0xf6, 0x95, 0xdb, 0x82, 0xd1, 0x01, 0x10, 0x63, 
+-	0xea, 0x95, 0xd1, 0x02, 0x11, 0x62, 0xea, 0x95, 
+-	0xd1, 0x03, 0xd1, 0x8c, 0x61, 0x06, 0xdb, 0x40, 
+-	0x00, 0xe0, 0xd0, 0x00, 0x71, 0x00, 0xc0, 0x84, 
+-	0x10, 0x9c, 0xb0, 0x96, 0xfa, 0xa0, 0xb1, 0x38, 
+-	0xb0, 0x96, 0xfa, 0xa3, 0xb1, 0x30, 0x00, 0x29, 
+-	0xd1, 0x84, 0x00, 0x22, 0xd0, 0x74, 0x70, 0x86, 
+-	0x70, 0xc1, 0x61, 0x06, 0x30, 0xc2, 0xea, 0xae, 
+-	0x60, 0x81, 0xdb, 0x41, 0xb0, 0x3c, 0xb1, 0xbc, 
+-	0xb0, 0x7c, 0x71, 0x00, 0x70, 0x86, 0x70, 0xc1, 
+-	0x61, 0x06, 0x30, 0xc2, 0xea, 0xb9, 0x60, 0x81, 
+-	0xdb, 0x41, 0x00, 0xee, 0xd1, 0xb4, 0x70, 0x06, 
+-	0xb1, 0xbc, 0x70, 0x46, 0x30, 0x40, 0xea, 0xc2, 
+-	0x60, 0x06, 0xdb, 0x41, 0x00, 0x24, 0xd0, 0x60, 
+-	0x30, 0x81, 0xea, 0xc7, 0x30, 0x81, 0x50, 0x02, 
+-	0xea, 0xca, 0xd0, 0x01, 0x00, 0x22, 0xd1, 0xbc, 
+-	0x70, 0x86, 0x30, 0x80, 0xea, 0xd2, 0x60, 0x06, 
+-	0xd0, 0x10, 0xf3, 0x06, 0x00, 0x22, 0xd1, 0xa4, 
+-	0x71, 0x06, 0xd0, 0x01, 0x41, 0x00, 0x5b, 0x44, 
+-	0x5b, 0x6e, 0x6b, 0x46, 0x00, 0x28, 0xd0, 0x70, 
+-	0x70, 0x41, 0x10, 0x62, 0xfa, 0xe6, 0xd1, 0x84, 
+-	0x70, 0x06, 0x10, 0x20, 0xfa, 0xdf, 0x00, 0x22, 
+-	0xd0, 0x00, 0xf3, 0x06, 0x02, 0x7d, 0xde, 0x68, 
+-	0xe0, 0x46, 0x00, 0xed, 0xd1, 0x88, 0x71, 0x06, 
+-	0x01, 0x1f, 0xfa, 0xfd, 0xd0, 0x41, 0x41, 0x01, 
+-	0xd0, 0x62, 0x00, 0x65, 0xd0, 0x30, 0x70, 0x00, 
+-	0x10, 0x21, 0xea, 0xfa, 0xee, 0xf9, 0x1a, 0xe1, 
+-	0xfa, 0xfa, 0xd0, 0x52, 0x51, 0x01, 0x61, 0x06, 
+-	0xe3, 0x0c, 0x18, 0xe0, 0xea, 0x70, 0xc7, 0x60, 
+-	0xc7, 0xe1, 0x02, 0x50, 0xea, 0x70, 0xc7, 0x61, 
+-	0xc7, 0xe0, 0xe2, 0x70, 0x00, 0x28, 0xdc, 0xa4, 
+-	0x7c, 0x72, 0x5c, 0x40, 0x6c, 0x72, 0x0f, 0xc5, 
+-	0x18, 0xe0, 0xeb, 0x82, 0xd9, 0x0d, 0x00, 0xee, 
+-	0xd1, 0xa4, 0x70, 0x06, 0x10, 0x21, 0xfb, 0x7f, 
+-	0xd9, 0x0c, 0x90, 0x06, 0x00, 0x10, 0xeb, 0x7f, 
+-	0x00, 0x21, 0xd1, 0x88, 0x7a, 0x06, 0x1a, 0x20, 
+-	0xeb, 0x7f, 0xd9, 0x00, 0x00, 0xed, 0xd1, 0xbc, 
+-	0x79, 0x46, 0x19, 0x60, 0xeb, 0x7f, 0x39, 0x68, 
+-	0xc0, 0xe5, 0xc0, 0x25, 0x10, 0x13, 0xb0, 0x0f, 
+-	0xef, 0x7f, 0xb0, 0x22, 0xe7, 0x7f, 0x00, 0xe0, 
+-	0xd1, 0xa8, 0x71, 0x46, 0x11, 0x5f, 0x29, 0x45, 
+-	0x00, 0x22, 0xd0, 0x18, 0x00, 0x22, 0xd4, 0x54, 
+-	0x00, 0x22, 0xd0, 0x9c, 0x70, 0x00, 0x74, 0x51, 
+-	0x70, 0x42, 0x34, 0x40, 0xe7, 0x3c, 0xd0, 0x40, 
+-	0x00, 0x22, 0xd4, 0x50, 0x74, 0x51, 0x34, 0x40, 
+-	0xef, 0x42, 0x20, 0x45, 0x60, 0x42, 0x39, 0x41, 
+-	0x19, 0x60, 0xf7, 0x5e, 0x00, 0x65, 0xd1, 0xa8, 
+-	0x7a, 0x86, 0x29, 0x6a, 0x19, 0x59, 0xb9, 0x7e, 
+-	0xf7, 0x75, 0x15, 0xa3, 0xf7, 0x57, 0x00, 0xed, 
+-	0xd1, 0xac, 0x70, 0x06, 0x00, 0xed, 0xd1, 0xb0, 
+-	0x70, 0x46, 0x30, 0x01, 0xfb, 0x7f, 0x00, 0x65, 
+-	0xd1, 0x84, 0x70, 0x46, 0xb0, 0x7f, 0x60, 0x46, 
+-	0xd5, 0x84, 0xe3, 0x7f, 0x11, 0x41, 0xd0, 0x4a, 
+-	0x00, 0xed, 0xd1, 0xa0, 0x74, 0x46, 0xd0, 0x00, 
+-	0x60, 0x06, 0x30, 0xc5, 0x39, 0x45, 0xe7, 0x6e, 
+-	0x14, 0x60, 0xeb, 0x6b, 0xf3, 0x85, 0xb0, 0x41, 
+-	0xef, 0x65, 0xe3, 0x71, 0x00, 0x66, 0xd1, 0xa0, 
+-	0x60, 0xc6, 0x15, 0xa3, 0xeb, 0x7f, 0xf3, 0x85, 
+-	0xe3, 0x7f, 0xd9, 0x01, 0x00, 0x66, 0xd1, 0xa0, 
+-	0x70, 0x06, 0x30, 0x03, 0xe7, 0x7e, 0x10, 0x1d, 
+-	0x10, 0x3b, 0xe7, 0x7f, 0x60, 0xc6, 0x00, 0x66, 
+-	0xd1, 0xa4, 0x69, 0x06, 0x15, 0xa4, 0xea, 0x23, 
+-	0xe2, 0x3b, 0x00, 0x65, 0xdd, 0x08, 0x7c, 0xf4, 
+-	0xbc, 0xff, 0x6c, 0xf4, 0x00, 0xef, 0xdd, 0x10, 
+-	0x7c, 0xf4, 0xbc, 0xfe, 0x6c, 0xf4, 0xc0, 0x3f, 
+-	0xf1, 0x18, 0xf1, 0x16, 0xf1, 0x18, 0x00, 0x05, 
+-	0x08, 0x20, 0xd0, 0x40, 0x5f, 0x01, 0x15, 0x63, 
+-	0xe9, 0x77, 0x05, 0x5e, 0xeb, 0x08, 0x00, 0x22, 
+-	0xd1, 0xa0, 0x6b, 0x06, 0x00, 0x22, 0xd1, 0xa8, 
+-	0x6b, 0xc6, 0x00, 0x22, 0xd1, 0xac, 0x6a, 0xc6, 
+-	0x00, 0xee, 0xd0, 0x0c, 0x00, 0xe6, 0xd1, 0x9c, 
+-	0x70, 0x40, 0x30, 0x5f, 0xe9, 0x8d, 0xb0, 0x3c, 
+-	0xb1, 0xb4, 0x70, 0x40, 0x30, 0x5f, 0xe9, 0x8d, 
+-	0xb1, 0xb4, 0x00, 0xe6, 0xd0, 0x10, 0xd0, 0x83, 
+-	0x70, 0x40, 0x60, 0x46, 0xb0, 0x3c, 0xb1, 0xbc, 
+-	0xb0, 0x81, 0xed, 0x90, 0x00, 0xee, 0xd0, 0x0c, 
+-	0x00, 0xe6, 0xd1, 0x9c, 0x70, 0x40, 0x30, 0x4c, 
+-	0xe9, 0xa3, 0xb0, 0x3c, 0xb1, 0xb4, 0x70, 0x40, 
+-	0x30, 0x4c, 0xe9, 0xa3, 0xb1, 0xb4, 0x00, 0xe6, 
+-	0xd0, 0x00, 0x61, 0x80, 0x00, 0x21, 0xd1, 0xb4, 
+-	0x70, 0x06, 0x10, 0x20, 0xe9, 0xae, 0xd0, 0x00, 
+-	0x60, 0x06, 0xf1, 0x18, 0x00, 0x21, 0xd1, 0x8c, 
+-	0x70, 0x46, 0x65, 0x86, 0xde, 0xc0, 0x00, 0xee, 
+-	0xd0, 0x20, 0x70, 0x00, 0x10, 0x22, 0xfd, 0xb9, 
+-	0xde, 0xc2, 0x00, 0x21, 0xd0, 0x04, 0x70, 0x00, 
+-	0x10, 0x21, 0xe9, 0xc0, 0x15, 0xa3, 0xe9, 0xdc, 
+-	0xd0, 0x02, 0x4c, 0x00, 0x10, 0x63, 0xe9, 0xc5, 
+-	0xcc, 0x3b, 0xd0, 0x04, 0x63, 0x00, 0xd0, 0x00, 
+-	0x70, 0x00, 0x30, 0x1f, 0xfb, 0x08, 0xd0, 0x18, 
+-	0x70, 0x00, 0x10, 0x20, 0xed, 0xc7, 0xd0, 0x04, 
+-	0x70, 0x80, 0x10, 0xa0, 0xeb, 0x08, 0xf1, 0x16, 
+-	0x00, 0x21, 0xd0, 0x9a, 0xc0, 0x39, 0x30, 0x1f, 
+-	0x10, 0x18, 0x30, 0x02, 0xfd, 0xcf, 0xe3, 0x08, 
+-	0x00, 0xe0, 0xd9, 0x04, 0x79, 0x24, 0xb9, 0x38, 
+-	0x19, 0x1c, 0xdc, 0x88, 0x4c, 0xac, 0xd0, 0x02, 
+-	0x40, 0x2c, 0x10, 0x02, 0x0c, 0x80, 0x10, 0x63, 
+-	0xea, 0x70, 0x15, 0x63, 0xf9, 0xec, 0xf1, 0x18, 
+-	0x00, 0xef, 0xdc, 0x00, 0x7c, 0x30, 0x00, 0x24, 
+-	0xd0, 0x30, 0x70, 0x00, 0x10, 0x21, 0xf9, 0xf6, 
+-	0xbc, 0x3b, 0xe1, 0xfd, 0x10, 0x22, 0xf9, 0xfa, 
+-	0xbc, 0x38, 0xe1, 0xfd, 0x10, 0x23, 0xf9, 0xfd, 
+-	0xbc, 0x3c, 0x1e, 0xe0, 0xea, 0x03, 0x15, 0x63, 
+-	0xfa, 0x02, 0xbe, 0xfc, 0xdc, 0x12, 0x0e, 0xde, 
+-	0xfa, 0x09, 0xc0, 0x24, 0x30, 0x30, 0xf6, 0x09, 
+-	0x2c, 0x00, 0xd0, 0x2c, 0x6c, 0x00, 0x1e, 0xe0, 
+-	0xea, 0x0f, 0xcc, 0x24, 0x1c, 0x1f, 0xd9, 0x40, 
+-	0x06, 0x50, 0xea, 0x22, 0xc0, 0x24, 0xb0, 0x12, 
+-	0xfe, 0x22, 0xd9, 0x74, 0x79, 0x65, 0x19, 0x5f, 
+-	0x30, 0x25, 0xee, 0x1b, 0x29, 0x40, 0x19, 0x5f, 
+-	0x19, 0x41, 0xc0, 0x25, 0x20, 0x30, 0x30, 0x24, 
+-	0xe6, 0x22, 0x3c, 0x00, 0xd0, 0x38, 0x69, 0x40, 
+-	0x1c, 0x05, 0xbc, 0x38, 0x3c, 0x32, 0x5c, 0x3b, 
+-	0xbc, 0x3f, 0xd8, 0xec, 0x78, 0xe3, 0xc0, 0xa3, 
+-	0x10, 0xb2, 0xf6, 0x2f, 0xd0, 0x92, 0x02, 0xe4, 
+-	0xd8, 0x00, 0xd0, 0xc0, 0x20, 0xe0, 0xb0, 0x81, 
+-	0xee, 0x32, 0xd0, 0x30, 0x60, 0xc0, 0x00, 0xac, 
+-	0xd0, 0x20, 0xc0, 0xc0, 0xd8, 0x40, 0xc1, 0x23, 
+-	0xd4, 0x64, 0x34, 0x63, 0xdc, 0x40, 0x0c, 0x1f, 
+-	0xfa, 0x5b, 0xc0, 0x65, 0xb0, 0x41, 0xe6, 0x47, 
+-	0x68, 0x40, 0xb0, 0x3c, 0xe2, 0x42, 0xc0, 0xc0, 
+-	0x34, 0x65, 0xdc, 0x48, 0x4c, 0x70, 0x1c, 0x5f, 
+-	0x20, 0xf1, 0x15, 0x63, 0xfa, 0x5c, 0xf2, 0x54, 
+-	0xc1, 0x11, 0xc0, 0x83, 0xf2, 0xa5, 0xe2, 0x6f, 
+-	0xb1, 0x01, 0xe6, 0x5a, 0x68, 0x40, 0x28, 0x60, 
+-	0xb0, 0x3c, 0xe2, 0x54, 0x0f, 0xc5, 0xd9, 0x40, 
+-	0xb1, 0x12, 0x11, 0x01, 0x21, 0x25, 0xf2, 0x54, 
+-	0xc1, 0x11, 0xb1, 0x01, 0xe6, 0x6f, 0x20, 0x31, 
+-	0x68, 0x40, 0x30, 0x31, 0xb0, 0x3c, 0x28, 0x60, 
+-	0x70, 0x43, 0x30, 0x31, 0x60, 0x40, 0x20, 0x31, 
+-	0xb0, 0x3c, 0xb0, 0xf8, 0xe2, 0x61, 0xe2, 0xf7, 
+-	0xd8, 0xec, 0x78, 0xe3, 0x00, 0xa8, 0xd0, 0x80, 
+-	0x00, 0xa8, 0xd1, 0x44, 0x00, 0xac, 0xd0, 0x20, 
+-	0xc0, 0xc0, 0x0c, 0x1f, 0xfa, 0xb3, 0xd9, 0x78, 
+-	0x79, 0x65, 0x39, 0x25, 0x19, 0x5f, 0xc9, 0xa5, 
+-	0x19, 0x83, 0x20, 0x26, 0x20, 0xe6, 0x20, 0xa6, 
+-	0x21, 0x66, 0xc1, 0x23, 0xc0, 0x64, 0x10, 0x5f, 
+-	0x10, 0x9d, 0x20, 0x81, 0x31, 0x01, 0x30, 0x44, 
+-	0xf6, 0x8e, 0x21, 0x01, 0x30, 0x84, 0x10, 0x83, 
+-	0xc4, 0x64, 0x34, 0x63, 0xdc, 0x48, 0x4c, 0x70, 
+-	0x1c, 0x5f, 0x15, 0x63, 0xfa, 0xc3, 0x20, 0xb1, 
+-	0xf2, 0xa5, 0xc1, 0x24, 0x11, 0x1f, 0xc0, 0x85, 
+-	0x30, 0xb1, 0xf2, 0xa5, 0xc1, 0x11, 0xc0, 0x83, 
+-	0x0c, 0x9d, 0xfa, 0xa3, 0xb0, 0xbc, 0xf2, 0xa5, 
+-	0xe2, 0xec, 0xb1, 0x01, 0xe6, 0x5a, 0x70, 0x42, 
+-	0xb0, 0xb8, 0x60, 0x40, 0xb0, 0x3c, 0xe2, 0xa5, 
+-	0xb1, 0x01, 0xe6, 0x5a, 0x70, 0x42, 0xb0, 0xb8, 
+-	0x60, 0x40, 0xb0, 0x38, 0xe2, 0xac, 0x00, 0xac, 
+-	0xd0, 0x24, 0xc1, 0x23, 0xb1, 0x12, 0xf2, 0xac, 
+-	0xd1, 0x24, 0x31, 0x23, 0x00, 0xa8, 0xd0, 0x84, 
+-	0xf2, 0xac, 0xd1, 0x12, 0x00, 0xa8, 0xd0, 0x84, 
+-	0xc0, 0x03, 0xf2, 0xac, 0xe2, 0xec, 0xd8, 0x82, 
+-	0x48, 0x95, 0x18, 0x81, 0xb1, 0x01, 0xe6, 0xd9, 
+-	0x20, 0xb1, 0x70, 0x42, 0x30, 0xb1, 0x20, 0x22, 
+-	0x60, 0x40, 0x30, 0x22, 0xb0, 0xbc, 0xb0, 0x3c, 
+-	0x30, 0xb1, 0x70, 0x42, 0x20, 0xb1, 0x30, 0x22, 
+-	0x60, 0x40, 0x20, 0x22, 0xb0, 0xbc, 0xb0, 0x3c, 
+-	0xe2, 0xc6, 0xc1, 0x11, 0xc0, 0x85, 0x30, 0xb1, 
+-	0x20, 0xe2, 0xb1, 0x01, 0xe6, 0xec, 0x70, 0x42, 
+-	0xb0, 0xb8, 0x20, 0x22, 0x60, 0x40, 0x30, 0x22, 
+-	0xb0, 0x3c, 0x70, 0x43, 0xb0, 0xf8, 0x30, 0x22, 
+-	0x60, 0x40, 0x20, 0x22, 0xb0, 0x3c, 0xe2, 0xdd, 
+-	0xd0, 0x08, 0x5c, 0x00, 0x3c, 0x32, 0xd0, 0x04, 
+-	0x40, 0x30, 0x3c, 0x00, 0x15, 0x63, 0xfa, 0xf7, 
+-	0x1e, 0xe0, 0xea, 0xf7, 0xbc, 0x3c, 0x00, 0xac, 
+-	0xd0, 0xa0, 0x00, 0xa8, 0xd0, 0x00, 0x00, 0x20, 
+-	0xd1, 0x24, 0x70, 0x42, 0xb0, 0xbc, 0x60, 0x40, 
+-	0xb0, 0x3c, 0xb1, 0x01, 0xee, 0xfd, 0xd0, 0x30, 
+-	0x30, 0x30, 0xef, 0x03, 0xd0, 0x04, 0x63, 0x00, 
+-	0x08, 0x20, 0xd0, 0x40, 0x3f, 0x01, 0x02, 0xba, 
+-	0xde, 0x3c, 0xe0, 0x46, 0x50, 0x00, 0x50, 0x00, 
+-	0x01, 0x46, 0xd0, 0x08, 0x94, 0x89, 0xd0, 0x8c, 
+-	0x44, 0x82, 0x14, 0x9e, 0x30, 0x12, 0xd0, 0x88, 
+-	0x10, 0x80, 0x00, 0xe8, 0xd1, 0x80, 0x70, 0xc6, 
+-	0x00, 0x06, 0xa0, 0xbd, 0xa0, 0xfc, 0x80, 0x3f, 
+-	0xb1, 0xbe, 0x60, 0xc6, 0x00, 0x06, 0x80, 0xa9, 
+-	0x80, 0x3f, 0x80, 0x2a, 0x80, 0x3f, 0x00, 0x21, 
+-	0xd0, 0x3c, 0x00, 0x0a, 0xb1, 0x82, 0xd0, 0x6b, 
+-	0x70, 0x46, 0x00, 0x06, 0x80, 0x07, 0x01, 0x20, 
+-	0xd0, 0x67, 0xa0, 0x69, 0x80, 0x2a, 0x82, 0x29, 
+-	0x80, 0x6a, 0x84, 0x29, 0xd0, 0x54, 0x10, 0x4f, 
+-	0xa0, 0x6a, 0x01, 0x20, 0xd0, 0x00, 0xa0, 0x29, 
+-	0x80, 0x2b, 0x0c, 0x20, 0xd0, 0x00, 0x10, 0x08, 
+-	0xa0, 0x27, 0x90, 0x09, 0xd0, 0x41, 0x40, 0x01, 
+-	0xd0, 0x44, 0x40, 0x70, 0x20, 0x01, 0xa0, 0x27, 
+-	0x80, 0x3f, 0x00, 0xc6, 0x15, 0x63, 0xe9, 0xae, 
+-	0x05, 0x5e, 0xe9, 0xbe, 0x00, 0xe0, 0xd0, 0x40, 
+-	0x70, 0x81, 0x10, 0x9c, 0xb0, 0x96, 0xf9, 0xb7, 
+-	0x00, 0x21, 0xd0, 0x40, 0xe1, 0xbb, 0xb0, 0x96, 
+-	0xf9, 0xbe, 0x00, 0x22, 0xd0, 0x40, 0x27, 0xc1, 
+-	0x27, 0x41, 0x27, 0x81, 0x90, 0x83, 0x00, 0x64, 
+-	0xd0, 0x10, 0x60, 0x80, 0x01, 0x46, 0x82, 0x34, 
+-	0x80, 0x3f, 0x00, 0x64, 0xd0, 0x14, 0x67, 0x40, 
+-	0x80, 0x34, 0x80, 0x3f, 0x00, 0xc6, 0x90, 0xae, 
+-	0x00, 0x64, 0xd0, 0x18, 0x60, 0x80, 0x90, 0xa6, 
+-	0x00, 0x64, 0xd0, 0x1c, 0x60, 0x80, 0x15, 0x63, 
+-	0xe9, 0xe3, 0x0c, 0x1f, 0xe9, 0xe3, 0x05, 0x50, 
+-	0xf9, 0xe3, 0x15, 0xa3, 0xf9, 0xe3, 0x90, 0x4d, 
+-	0x10, 0x60, 0xe5, 0xdb, 0x00, 0x06, 0x05, 0x0d, 
+-	0x01, 0x7a, 0xde, 0x1a, 0xe0, 0x46, 0x15, 0xa3, 
+-	0xf9, 0xfb, 0x00, 0x21, 0xd0, 0x04, 0x70, 0x00, 
+-	0x10, 0x21, 0xe9, 0xfb, 0xd0, 0x38, 0x70, 0x00, 
+-	0x15, 0x63, 0xe9, 0xef, 0x10, 0x1f, 0x15, 0x21, 
+-	0xe5, 0xe0, 0xd0, 0x64, 0x30, 0x54, 0xe5, 0xe0, 
+-	0xc0, 0x40, 0xb0, 0x7f, 0x30, 0x54, 0xe9, 0xfb, 
+-	0x0c, 0x09, 0x05, 0x0d, 0xe1, 0xef, 0xc0, 0x5f, 
+-	0x10, 0x58, 0x10, 0x48, 0x00, 0xee, 0xd0, 0x8c, 
+-	0xd0, 0xc3, 0x70, 0x02, 0x30, 0x01, 0xea, 0x10, 
+-	0xb0, 0xbc, 0xb0, 0xc1, 0xee, 0x01, 0x00, 0x26, 
+-	0xd0, 0x20, 0x70, 0x40, 0xb0, 0x7f, 0x60, 0x40, 
+-	0x15, 0xa3, 0xea, 0x0f, 0xb0, 0x88, 0x77, 0xc2, 
+-	0x80, 0x07, 0x09, 0x49, 0xd4, 0x00, 0xd4, 0x40, 
+-	0xd4, 0x80, 0xd4, 0xc0, 0x00, 0x4d, 0xa0, 0x6c, 
+-	0xd3, 0x80, 0xd0, 0xa1, 0x00, 0x88, 0xd0, 0xa9, 
+-	0x00, 0x4d, 0x00, 0x50, 0xfa, 0x1a, 0x0c, 0x49, 
+-	0x00, 0x8d, 0xc0, 0x42, 0x10, 0x60, 0xea, 0x2a, 
+-	0xb0, 0x5e, 0xb0, 0x43, 0xfe, 0x34, 0xd0, 0x61, 
+-	0x23, 0x81, 0xe2, 0x1f, 0x0c, 0x09, 0x05, 0x0d, 
+-	0x15, 0x20, 0xfe, 0x31, 0xd0, 0x65, 0x30, 0x54, 
+-	0xee, 0x10, 0x03, 0xb4, 0xd6, 0x29, 0xe0, 0x46, 
+-	0xc6, 0xd4, 0xb6, 0xc1, 0xe6, 0x31, 0xd0, 0x64, 
+-	0x30, 0x5b, 0xfe, 0x31, 0xd7, 0x00, 0xb7, 0x01, 
+-	0xd3, 0x81, 0x00, 0x27, 0xd0, 0x10, 0xd0, 0x81, 
+-	0x60, 0x80, 0x15, 0x63, 0xfa, 0x54, 0x00, 0x22, 
+-	0xdc, 0xd8, 0x03, 0xf8, 0xd0, 0x10, 0xf0, 0x4a, 
+-	0x15, 0xa3, 0xfa, 0x51, 0x02, 0xf7, 0xdc, 0x26, 
+-	0x0c, 0x10, 0xf8, 0x46, 0x02, 0xfc, 0xd8, 0x22, 
+-	0xe0, 0x46, 0x02, 0xf2, 0xd6, 0x2b, 0xe0, 0x46, 
+-	0x00, 0x22, 0xdc, 0xd8, 0x03, 0xfa, 0xd0, 0x10, 
+-	0xf0, 0x4a, 0x03, 0x35, 0xda, 0x20, 0x15, 0xa3, 
+-	0xe8, 0x46, 0x03, 0x30, 0xdc, 0x27, 0xe0, 0x46, 
+-	0x03, 0x76, 0xd0, 0x73, 0x00, 0x24, 0xdc, 0xd8, 
+-	0xf0, 0x4a, 0xe1, 0xe0, 0xe1, 0xec, 0xe2, 0x12, 
+-	0xe2, 0x14, 0xe1, 0xc7, 0xe1, 0x30, 0x30, 0x5a, 
+-	0xe5, 0x8d, 0x06, 0x50, 0xe9, 0x83, 0xc0, 0x54, 
+-	0x30, 0x5b, 0xb0, 0x42, 0xf8, 0x11, 0x37, 0x1a, 
+-	0xb6, 0xff, 0xd0, 0x64, 0x30, 0x5b, 0xfc, 0x11, 
+-	0xc0, 0x39, 0x30, 0x31, 0x10, 0x12, 0x10, 0x20, 
+-	0xe9, 0x88, 0x03, 0x10, 0xe9, 0x93, 0x0f, 0x19, 
+-	0xf9, 0x8f, 0xd1, 0x44, 0xe1, 0x79, 0x03, 0xde, 
+-	0xf9, 0xba, 0x03, 0xdf, 0xe9, 0x99, 0xd3, 0x40, 
+-	0xca, 0x50, 0xd1, 0x42, 0xe2, 0xea, 0xc0, 0x50, 
+-	0x10, 0x54, 0xc0, 0x90, 0x10, 0x8c, 0x10, 0x92, 
+-	0x10, 0xe0, 0xe5, 0xa8, 0xc0, 0x01, 0x10, 0x01, 
+-	0x20, 0x40, 0xc0, 0x02, 0x10, 0x01, 0x20, 0x80, 
+-	0x10, 0x60, 0xfd, 0xab, 0xb0, 0x7f, 0x10, 0xa0, 
+-	0xfd, 0xae, 0xb0, 0xbf, 0x10, 0x5f, 0x10, 0x9f, 
+-	0x00, 0xef, 0xd0, 0x3e, 0x20, 0x52, 0x20, 0x83, 
+-	0x20, 0x93, 0x10, 0x4c, 0x10, 0x82, 0x40, 0x80, 
+-	0x50, 0x42, 0x0f, 0xc5, 0xcb, 0xaa, 0xcb, 0xeb, 
+-	0xca, 0x50, 0xd0, 0xc0, 0xb0, 0xc1, 0xf1, 0x9b, 
+-	0xcb, 0x01, 0xd0, 0xc1, 0xf1, 0x9b, 0xcb, 0x41, 
+-	0xba, 0x7f, 0xbb, 0x3f, 0xe2, 0xea, 0xcc, 0x5b, 
+-	0x1c, 0x42, 0x2c, 0x5b, 0xc0, 0x31, 0x1c, 0x43, 
+-	0x2c, 0x40, 0x1c, 0x48, 0xcc, 0xb1, 0x1c, 0x9f, 
+-	0x06, 0xd0, 0xe9, 0xd5, 0x01, 0x69, 0xd0, 0x20, 
+-	0x3c, 0x80, 0xc0, 0x1c, 0x10, 0x08, 0x20, 0x1f, 
+-	0x2c, 0x40, 0x2c, 0x80, 0x01, 0xb5, 0xd4, 0x00, 
+-	0x2c, 0x80, 0xde, 0x84, 0xde, 0xc4, 0xe3, 0x1e, 
+-	0xd3, 0xc2, 0xf2, 0xd3, 0x13, 0xa0, 0xed, 0xe5, 
+-	0xf2, 0x32, 0xb3, 0x81, 0xe9, 0xec, 0x80, 0x07, 
+-	0xd4, 0x00, 0xc4, 0x50, 0xd3, 0x08, 0xe2, 0x95, 
+-	0xd0, 0x71, 0x20, 0x56, 0x00, 0x48, 0xd1, 0x8c, 
+-	0x03, 0x0d, 0x41, 0x8c, 0xe9, 0xfa, 0x06, 0x5e, 
+-	0xfa, 0x03, 0x08, 0x89, 0x03, 0xcd, 0x13, 0xe3, 
+-	0xf9, 0xfa, 0xd3, 0xc4, 0x06, 0x5e, 0xfa, 0x03, 
+-	0xd0, 0x43, 0x40, 0x4c, 0xea, 0x03, 0x08, 0x49, 
+-	0x00, 0x8d, 0x10, 0x87, 0x53, 0x02, 0x01, 0x46, 
+-	0x90, 0x2c, 0x00, 0xc6, 0x03, 0x1c, 0xea, 0x0a, 
+-	0x09, 0x49, 0x00, 0x0d, 0xd0, 0x9f, 0x40, 0x02, 
+-	0xb0, 0x20, 0x03, 0x19, 0xea, 0x10, 0xb0, 0x20, 
+-	0xa0, 0x2c, 0xe2, 0x5b, 0x06, 0x5f, 0xfa, 0x80, 
+-	0xd4, 0x00, 0xc4, 0x50, 0xc4, 0x90, 0xc4, 0xd0, 
+-	0xe2, 0x8d, 0x50, 0x00, 0x50, 0x00, 0x50, 0x00, 
+-	0x03, 0x76, 0xd0, 0x73, 0x00, 0x24, 0xdc, 0xd8, 
+-	0xf0, 0x4a, 0xe1, 0xd3, 0xe1, 0xdc, 0xe2, 0x00, 
+-	0xe2, 0x02, 0xe1, 0xac, 0xe1, 0x30, 0x30, 0x5a, 
+-	0xe5, 0x91, 0x06, 0x50, 0xe9, 0x83, 0xc0, 0x54, 
+-	0x30, 0x5b, 0xb0, 0x42, 0xf8, 0x11, 0x37, 0x1a, 
+-	0xb6, 0xff, 0xd0, 0x64, 0x30, 0x5b, 0xfc, 0x11, 
+-	0xbc, 0x10, 0xd0, 0x10, 0x0c, 0x1e, 0xf9, 0x8e, 
+-	0xbc, 0x10, 0xd0, 0x30, 0xc0, 0x40, 0x30, 0x70, 
+-	0xed, 0x8e, 0x03, 0x10, 0xe9, 0x97, 0x0f, 0x19, 
+-	0xf9, 0x93, 0xd1, 0x44, 0xe1, 0x79, 0x03, 0xdf, 
+-	0xe9, 0xa1, 0xd3, 0x40, 0xca, 0x50, 0xcb, 0x52, 
+-	0x03, 0x1d, 0xf9, 0xa8, 0xca, 0x12, 0xca, 0x52, 
+-	0xe1, 0xa5, 0x03, 0x1d, 0xf9, 0xa8, 0xca, 0x12, 
+-	0xca, 0x53, 0xca, 0xae, 0xca, 0xef, 0xb1, 0x7e, 
+-	0x03, 0x1e, 0xfa, 0xea, 0xb1, 0x7e, 0xe2, 0xea, 
+-	0x00, 0x24, 0xd0, 0x00, 0x2c, 0x40, 0x2c, 0x80, 
+-	0x17, 0x20, 0xf9, 0xd2, 0x00, 0xa8, 0xd0, 0x00, 
+-	0xcc, 0x5b, 0x1c, 0x5f, 0x1c, 0x43, 0x20, 0x31, 
+-	0x7c, 0x40, 0xb0, 0x3c, 0x7e, 0x80, 0xcc, 0xb1, 
+-	0xce, 0xfa, 0x1c, 0x9f, 0x1e, 0xdf, 0x01, 0x69, 
+-	0xd0, 0x3c, 0x0c, 0x99, 0xe9, 0xc4, 0x3c, 0x80, 
+-	0x0e, 0xd9, 0xe9, 0xc7, 0x3e, 0xc0, 0x3e, 0xf2, 
+-	0x3e, 0xb1, 0xd0, 0x01, 0x40, 0x1b, 0x10, 0x05, 
+-	0x20, 0x1f, 0x2c, 0x40, 0x2c, 0x80, 0xd0, 0x30, 
+-	0x70, 0x00, 0x2c, 0x80, 0xe3, 0x1e, 0xd3, 0xc2, 
+-	0xf2, 0xd3, 0x13, 0xa0, 0xed, 0xd8, 0xf2, 0x32, 
+-	0xb3, 0x81, 0xe9, 0xdc, 0x80, 0x07, 0xe2, 0x95, 
+-	0x0d, 0x09, 0xd1, 0x8c, 0x03, 0x0d, 0x41, 0x8c, 
+-	0xe9, 0xe8, 0x06, 0x5e, 0xf9, 0xf1, 0x08, 0x89, 
+-	0x03, 0xcd, 0x13, 0xe3, 0xf9, 0xe8, 0xd3, 0xc4, 
+-	0x06, 0x5e, 0xf9, 0xf1, 0xd0, 0x43, 0x40, 0x4c, 
+-	0xe9, 0xf1, 0x08, 0x49, 0x00, 0x8d, 0x10, 0x87, 
+-	0x53, 0x02, 0x01, 0x46, 0x90, 0x2c, 0x00, 0xc6, 
+-	0x03, 0x1c, 0xe9, 0xf8, 0x09, 0x49, 0x00, 0x0d, 
+-	0xd0, 0x9f, 0x40, 0x02, 0xb0, 0x20, 0x03, 0x19, 
+-	0xe9, 0xfe, 0xb0, 0x20, 0xa0, 0x2c, 0xe2, 0x5b, 
+-	0x06, 0x5f, 0xfa, 0x80, 0xd4, 0x00, 0xc4, 0x50, 
+-	0xc4, 0x90, 0xc4, 0xd0, 0xe2, 0x8d, 0x50, 0x00, 
+-	0x03, 0x76, 0xd0, 0x73, 0x00, 0x24, 0xdc, 0xd8, 
+-	0xf0, 0x4a, 0xe1, 0xc1, 0xe1, 0xca, 0xe1, 0xee, 
+-	0xe1, 0xf0, 0xe1, 0xa8, 0xe1, 0x30, 0x30, 0x5a, 
+-	0xe5, 0x8d, 0x06, 0x50, 0xe9, 0x83, 0xc0, 0x54, 
+-	0x30, 0x5b, 0xb0, 0x42, 0xf8, 0x11, 0x37, 0x1a, 
+-	0xb6, 0xff, 0xd0, 0x64, 0x30, 0x5b, 0xfc, 0x11, 
+-	0xc0, 0x39, 0x30, 0x31, 0x10, 0x12, 0x10, 0x20, 
+-	0xe9, 0x88, 0x03, 0x10, 0xe9, 0x93, 0x0f, 0x19, 
+-	0xf9, 0x8f, 0xd1, 0x44, 0xe1, 0x79, 0x03, 0xdf, 
+-	0xe9, 0x9d, 0xd3, 0x40, 0xca, 0x50, 0xcb, 0x52, 
+-	0x03, 0x1d, 0xf9, 0xa4, 0xca, 0x12, 0xca, 0x52, 
+-	0xe1, 0xa1, 0x03, 0x1d, 0xf9, 0xa4, 0xca, 0x12, 
+-	0xca, 0x53, 0xca, 0xae, 0xca, 0xef, 0xb1, 0x7e, 
+-	0x03, 0x1e, 0xfa, 0xea, 0xb1, 0x7e, 0xe2, 0xea, 
+-	0xcc, 0x5b, 0x1c, 0x42, 0x2c, 0x5b, 0xc0, 0x31, 
+-	0x1c, 0x43, 0x2c, 0x40, 0x1c, 0x48, 0xcc, 0xb1, 
+-	0x1c, 0x9f, 0x06, 0xd0, 0xe9, 0xb6, 0x01, 0x69, 
+-	0xd0, 0x20, 0x3c, 0x80, 0xc0, 0x1c, 0x10, 0x08, 
+-	0x20, 0x1f, 0x2c, 0x40, 0x2c, 0x80, 0xd0, 0x30, 
+-	0x70, 0x00, 0x2c, 0x80, 0xde, 0x84, 0xde, 0xc4, 
+-	0xe3, 0x1e, 0xd3, 0xc2, 0xf2, 0xd3, 0x13, 0xa0, 
+-	0xed, 0xc6, 0xf2, 0x32, 0xb3, 0x81, 0xe9, 0xca, 
+-	0x80, 0x07, 0xe2, 0x95, 0x0d, 0x09, 0xd1, 0x8c, 
+-	0x03, 0x0d, 0x41, 0x8c, 0xe9, 0xd6, 0x06, 0x5e, 
+-	0xf9, 0xdf, 0x08, 0x89, 0x03, 0xcd, 0x13, 0xe3, 
+-	0xf9, 0xd6, 0xd3, 0xc4, 0x06, 0x5e, 0xf9, 0xdf, 
+-	0xd0, 0x43, 0x40, 0x4c, 0xe9, 0xdf, 0x08, 0x49, 
+-	0x00, 0x8d, 0x10, 0x87, 0x53, 0x02, 0x01, 0x46, 
+-	0x90, 0x2c, 0x00, 0xc6, 0x03, 0x1c, 0xe9, 0xe6, 
+-	0x09, 0x49, 0x00, 0x0d, 0xd0, 0x9f, 0x40, 0x02, 
+-	0xb0, 0x20, 0x03, 0x19, 0xe9, 0xec, 0xb0, 0x20, 
+-	0xa0, 0x2c, 0xe2, 0x5b, 0x06, 0x5f, 0xfa, 0x80, 
+-	0xd4, 0x00, 0xc4, 0x50, 0xc4, 0x90, 0xc4, 0xd0, 
+-	0xe2, 0x8d, 0x50, 0x00, 0x50, 0x00, 0x50, 0x00, 
+-	0x03, 0x76, 0xd0, 0x73, 0x00, 0x24, 0xdc, 0xd8, 
+-	0xf0, 0x4a, 0xe1, 0xdb, 0xe1, 0xe9, 0xe2, 0x00, 
+-	0xe2, 0x02, 0xe1, 0xc3, 0xe1, 0x65, 0x30, 0x5a, 
+-	0xe5, 0x8d, 0x06, 0x50, 0xe9, 0x83, 0xc0, 0x54, 
+-	0x30, 0x5b, 0xb0, 0x42, 0xf8, 0x11, 0x37, 0x1a, 
+-	0xb6, 0xff, 0xd0, 0x52, 0x30, 0x5b, 0xfc, 0x11, 
+-	0xc0, 0x39, 0x30, 0x31, 0x10, 0x11, 0x10, 0x20, 
+-	0xe9, 0x88, 0x03, 0x10, 0xe9, 0x93, 0x0f, 0x19, 
+-	0xf9, 0x8f, 0xd1, 0x44, 0xe1, 0x79, 0x03, 0xd0, 
+-	0xf9, 0x98, 0xca, 0x50, 0x03, 0xde, 0xf9, 0x9a, 
+-	0xd1, 0x42, 0xe2, 0xea, 0xcb, 0xaa, 0xcb, 0xeb, 
+-	0xc0, 0x50, 0x10, 0x54, 0xc0, 0x90, 0x10, 0x8c, 
+-	0x10, 0x92, 0xd0, 0xc1, 0x05, 0x50, 0xe9, 0xa5, 
+-	0xb0, 0xc2, 0x10, 0x60, 0xfd, 0xa8, 0xb0, 0x7f, 
+-	0x10, 0xa0, 0xfd, 0xab, 0xb0, 0xbf, 0x10, 0x5f, 
+-	0x10, 0x9f, 0x00, 0xef, 0xd0, 0x3e, 0x20, 0x52, 
+-	0x20, 0x83, 0x20, 0x93, 0x10, 0x4c, 0x10, 0x82, 
+-	0x40, 0x80, 0x50, 0x42, 0xd0, 0x81, 0x14, 0x1f, 
+-	0x14, 0x01, 0x05, 0x50, 0xe9, 0xbd, 0x50, 0x42, 
+-	0xe1, 0xbe, 0x54, 0x02, 0xca, 0x10, 0xca, 0x50, 
+-	0xcb, 0x01, 0xcb, 0x41, 0xe2, 0xea, 0xcc, 0x5b, 
+-	0x1c, 0x42, 0x2c, 0x5b, 0xc0, 0x31, 0x1c, 0x43, 
+-	0x2c, 0x40, 0x1c, 0x49, 0xcc, 0xb1, 0x1c, 0x9f, 
+-	0xc0, 0x1c, 0x10, 0x08, 0x20, 0x1f, 0x05, 0x50, 
+-	0xf9, 0xd2, 0xb0, 0x3c, 0x2c, 0x40, 0x2c, 0x80, 
+-	0x01, 0xb5, 0xd4, 0x00, 0x2c, 0x80, 0x02, 0xe4, 
+-	0xde, 0x80, 0xde, 0xc1, 0xe3, 0x1e, 0xd3, 0xc0, 
+-	0xf2, 0xd3, 0x13, 0xa0, 0xed, 0xe0, 0xf2, 0x32, 
+-	0xb3, 0x81, 0xe9, 0xe9, 0x80, 0x07, 0xd4, 0x02, 
+-	0x44, 0x15, 0x14, 0x1f, 0xc4, 0x50, 0xd3, 0x08, 
+-	0xe2, 0x95, 0xd0, 0x71, 0x20, 0x56, 0x00, 0x48, 
+-	0xd1, 0x8c, 0x03, 0x0d, 0x41, 0x8c, 0xe9, 0xf7, 
+-	0x08, 0x89, 0x03, 0xcd, 0x13, 0xe3, 0xf9, 0xf6, 
+-	0xd3, 0xc4, 0xe1, 0xf7, 0xb3, 0xc1, 0x01, 0x46, 
+-	0x90, 0x2c, 0x00, 0xc6, 0x03, 0x1c, 0xe9, 0xfe, 
+-	0x09, 0x49, 0x00, 0x0d, 0xa0, 0x2c, 0xe2, 0x5b, 
+-	0x06, 0x5f, 0xfa, 0x7f, 0xd4, 0x02, 0x44, 0x15, 
+-	0x14, 0x1f, 0xc4, 0x50, 0xc4, 0x90, 0xc4, 0xd0, 
+-	0xe2, 0x8d, 0x50, 0x00, 0x50, 0x00, 0x50, 0x00, 
+-	0x03, 0x76, 0xd0, 0x73, 0x00, 0x24, 0xdc, 0xd8, 
+-	0xf0, 0x4a, 0xe1, 0xc9, 0xe1, 0xd2, 0xe1, 0xe7, 
+-	0xe1, 0xe9, 0xe1, 0xab, 0xe1, 0x30, 0x30, 0x5a, 
+-	0xe5, 0x91, 0x06, 0x50, 0xe9, 0x83, 0xc0, 0x54, 
+-	0x30, 0x5b, 0xb0, 0x42, 0xf8, 0x11, 0x37, 0x1a, 
+-	0xb6, 0xff, 0xd0, 0x52, 0x30, 0x5b, 0xfc, 0x11, 
+-	0xbc, 0x10, 0xd0, 0x10, 0x0c, 0x1e, 0xf9, 0x8e, 
+-	0xbc, 0x10, 0xd0, 0x20, 0xc0, 0x40, 0x30, 0x70, 
+-	0xed, 0x8e, 0x03, 0x10, 0xe9, 0x97, 0x0f, 0x19, 
+-	0xf9, 0x93, 0xd1, 0x44, 0xe1, 0x79, 0x03, 0xd0, 
+-	0xf9, 0xa0, 0xca, 0x50, 0xcb, 0x52, 0x03, 0x1d, 
+-	0xf9, 0xa7, 0xca, 0x12, 0xca, 0x52, 0xe1, 0xa4, 
+-	0x03, 0x1d, 0xf9, 0xa7, 0xca, 0x12, 0xca, 0x53, 
+-	0xca, 0xae, 0xca, 0xef, 0xb1, 0x7e, 0x03, 0x1e, 
+-	0xfa, 0xea, 0xb1, 0x7e, 0xe2, 0xea, 0x00, 0x24, 
+-	0xd0, 0x00, 0x2c, 0x40, 0x2c, 0x80, 0x17, 0x20, 
+-	0xf9, 0xc8, 0x00, 0x2a, 0xd0, 0x00, 0x20, 0x1b, 
+-	0x20, 0x1b, 0x05, 0x50, 0xf9, 0xb8, 0xb0, 0x3f, 
+-	0x10, 0x02, 0x7c, 0x40, 0xcc, 0xb1, 0x1c, 0x9f, 
+-	0x01, 0x69, 0xd0, 0x3c, 0x0c, 0x99, 0xe9, 0xc1, 
+-	0x3c, 0x80, 0xde, 0xa0, 0x2c, 0x5f, 0x2c, 0x9f, 
+-	0xd0, 0x30, 0x70, 0x00, 0x2c, 0x80, 0xde, 0xc1, 
+-	0xe3, 0x1e, 0xd3, 0xc0, 0xf2, 0xd3, 0x13, 0xa0, 
+-	0xed, 0xce, 0xf2, 0x32, 0xb3, 0x81, 0xe9, 0xd2, 
+-	0x80, 0x07, 0xe2, 0x95, 0x0d, 0x09, 0xd1, 0x8c, 
+-	0x03, 0x0d, 0x41, 0x8c, 0xe9, 0xde, 0x08, 0x89, 
+-	0x03, 0xcd, 0x13, 0xe3, 0xf9, 0xdd, 0xd3, 0xc4, 
+-	0xe1, 0xde, 0xb3, 0xc1, 0x01, 0x46, 0x90, 0x2c, 
+-	0x00, 0xc6, 0x03, 0x1c, 0xe9, 0xe5, 0x09, 0x49, 
+-	0x00, 0x0d, 0xa0, 0x2c, 0xe2, 0x5b, 0x06, 0x5f, 
+-	0xfa, 0x7f, 0xd4, 0x00, 0xc4, 0x50, 0xc4, 0x90, 
+-	0xc4, 0xd0, 0xe2, 0x8d, 0x50, 0x00, 0x50, 0x00, 
+-	0x03, 0x76, 0xd0, 0x73, 0x00, 0x24, 0xdc, 0xd8, 
+-	0xf0, 0x4a, 0xe1, 0xa3, 0xc0, 0x00, 0xc0, 0x00, 
+-	0xc0, 0x00, 0xe1, 0x8a, 0xe1, 0x30, 0x30, 0x5a, 
+-	0xe5, 0x87, 0x37, 0x1a, 0xb6, 0xff, 0xd0, 0x64, 
+-	0x30, 0x5b, 0xfd, 0xb4, 0xc0, 0x39, 0x30, 0x31, 
+-	0x10, 0x12, 0x10, 0x20, 0xe9, 0x82, 0xd1, 0x42, 
+-	0xd3, 0x40, 0xe2, 0xea, 0xcc, 0x5b, 0x1c, 0x42, 
+-	0x2c, 0x5b, 0xc0, 0x31, 0x1c, 0x43, 0x2c, 0x40, 
+-	0x1c, 0x48, 0xcc, 0xb1, 0x1c, 0x9f, 0x06, 0xd0, 
+-	0xe9, 0x98, 0x01, 0x69, 0xd0, 0x20, 0x3c, 0x80, 
+-	0xc0, 0x1c, 0x10, 0x08, 0x20, 0x1f, 0x2c, 0x40, 
+-	0x2c, 0x80, 0x01, 0xb5, 0xd4, 0x00, 0x2c, 0x80, 
+-	0xde, 0x84, 0xde, 0xc4, 0xe3, 0x1e, 0xf2, 0xd3, 
+-	0xc0, 0x5c, 0xb0, 0x7f, 0x30, 0x5a, 0xe5, 0xc8, 
+-	0x00, 0x26, 0xd0, 0x00, 0x70, 0x00, 0x10, 0x20, 
+-	0xe9, 0xbf, 0x00, 0xe0, 0xd0, 0x44, 0x70, 0x41, 
+-	0x10, 0x5c, 0x30, 0x5b, 0xb0, 0x41, 0xed, 0xc8, 
+-	0x0f, 0x17, 0xf9, 0xb4, 0x0f, 0x49, 0xf2, 0xd3, 
+-	0x0f, 0x19, 0xf9, 0xb8, 0xdf, 0x00, 0x00, 0x06, 
+-	0x03, 0xb4, 0xd6, 0x29, 0xe0, 0x46, 0xc0, 0x5b, 
+-	0x30, 0x54, 0xb0, 0x7e, 0xe5, 0xc8, 0x0f, 0x17, 
+-	0xf9, 0xc3, 0x02, 0xf2, 0xd6, 0x2b, 0xe0, 0x46, 
+-	0xd3, 0x08, 0xd3, 0xc0, 0xe2, 0x95, 0x50, 0x00, 
+-	0x03, 0x76, 0xd0, 0x73, 0x00, 0x24, 0xdc, 0xd8, 
+-	0xf0, 0x4a, 0xe1, 0xb5, 0xc0, 0x00, 0xc0, 0x00, 
+-	0xc0, 0x00, 0xe1, 0x8e, 0xe1, 0x30, 0x30, 0x5a, 
+-	0xe5, 0x8b, 0x37, 0x1a, 0xb6, 0xff, 0xd0, 0x64, 
+-	0x30, 0x5b, 0xfd, 0xc6, 0xbc, 0x10, 0xd0, 0x10, 
+-	0x0c, 0x1e, 0xf9, 0x88, 0xbc, 0x10, 0xd0, 0x30, 
+-	0xc0, 0x40, 0x30, 0x70, 0xed, 0x88, 0xd1, 0x42, 
+-	0xd3, 0x40, 0xe2, 0xea, 0x00, 0x24, 0xd0, 0x00, 
+-	0x2c, 0x40, 0x2c, 0x80, 0x17, 0x20, 0xf9, 0xb4, 
+-	0x00, 0xa8, 0xd0, 0x00, 0xcc, 0x5b, 0x1c, 0x5f, 
+-	0x1c, 0x43, 0x20, 0x31, 0x7c, 0x40, 0xb0, 0x3c, 
+-	0x7e, 0x80, 0xcc, 0xb1, 0xce, 0xfa, 0x1c, 0x9f, 
+-	0x1e, 0xdf, 0x01, 0x69, 0xd0, 0x3c, 0x0c, 0x99, 
+-	0xe9, 0xa6, 0x3c, 0x80, 0x0e, 0xd9, 0xe9, 0xa9, 
+-	0x3e, 0xc0, 0x3e, 0xf2, 0x3e, 0xb1, 0xd0, 0x01, 
+-	0x40, 0x1b, 0x10, 0x05, 0x20, 0x1f, 0x2c, 0x40, 
+-	0x2c, 0x80, 0xd0, 0x30, 0x70, 0x00, 0x2c, 0x80, 
+-	0xe3, 0x1e, 0xf2, 0xd3, 0xc0, 0x5c, 0xb0, 0x7f, 
+-	0x30, 0x5a, 0xe5, 0xda, 0x00, 0x26, 0xd0, 0x00, 
+-	0x70, 0x00, 0x10, 0x20, 0xe9, 0xd1, 0x00, 0xe0, 
+-	0xd0, 0x44, 0x70, 0x41, 0x10, 0x5c, 0x30, 0x5b, 
+-	0xb0, 0x41, 0xed, 0xda, 0x0f, 0x17, 0xf9, 0xc6, 
+-	0x0f, 0x49, 0xf2, 0xd3, 0x0f, 0x19, 0xf9, 0xca, 
+-	0xdf, 0x00, 0x00, 0x06, 0x03, 0xb4, 0xd6, 0x29, 
+-	0xe0, 0x46, 0xc0, 0x5b, 0x30, 0x54, 0xb0, 0x7e, 
+-	0xe5, 0xda, 0x0f, 0x17, 0xf9, 0xd5, 0x02, 0xf7, 
+-	0xdc, 0x26, 0xe0, 0x46, 0xd3, 0x08, 0xd3, 0xc0, 
+-	0xe2, 0x95, 0x50, 0x00, 0x50, 0x00, 0x50, 0x00, 
+-	0x03, 0x76, 0xd0, 0x73, 0x00, 0x24, 0xdc, 0xd8, 
+-	0xf0, 0x4a, 0xe1, 0xa2, 0xc0, 0x00, 0xc0, 0x00, 
+-	0xc0, 0x00, 0xe1, 0x8a, 0xe1, 0x65, 0x30, 0x5a, 
+-	0xe5, 0x87, 0x37, 0x1a, 0xb6, 0xff, 0xd0, 0x52, 
+-	0x30, 0x5b, 0xfd, 0xb3, 0xc0, 0x39, 0x30, 0x31, 
+-	0x10, 0x11, 0x10, 0x20, 0xe9, 0x82, 0xd1, 0x42, 
+-	0xd3, 0x41, 0xe2, 0xea, 0xcc, 0x5b, 0x1c, 0x42, 
+-	0x2c, 0x5b, 0xc0, 0x31, 0x1c, 0x43, 0x2c, 0x40, 
+-	0x1c, 0x49, 0xcc, 0xb1, 0x1c, 0x9f, 0xc0, 0x1c, 
+-	0x10, 0x08, 0x20, 0x1f, 0x05, 0x50, 0xf9, 0x99, 
+-	0xb0, 0x3c, 0x2c, 0x40, 0x2c, 0x80, 0x01, 0xb5, 
+-	0xd4, 0x00, 0x2c, 0x80, 0x02, 0xe4, 0xde, 0x80, 
+-	0xde, 0xc1, 0xe3, 0x1e, 0xf2, 0xd3, 0xc0, 0x5c, 
+-	0xb0, 0x7f, 0x30, 0x5a, 0xe5, 0xc7, 0x00, 0x26, 
+-	0xd0, 0x00, 0x70, 0x00, 0x10, 0x20, 0xe9, 0xbe, 
+-	0x00, 0xe0, 0xd0, 0x44, 0x70, 0x41, 0x10, 0x5b, 
+-	0x30, 0x5b, 0xb0, 0x41, 0xed, 0xc7, 0x0f, 0x17, 
+-	0xf9, 0xb3, 0x0f, 0x49, 0xf2, 0xd3, 0x0f, 0x19, 
+-	0xf9, 0xb7, 0xdf, 0x00, 0x00, 0x06, 0x03, 0xb4, 
+-	0xd6, 0x29, 0xe0, 0x46, 0xc0, 0x5b, 0x30, 0x54, 
+-	0xb0, 0x7e, 0xe5, 0xc7, 0x0f, 0x17, 0xf9, 0xc2, 
+-	0x03, 0x30, 0xdc, 0x27, 0xe0, 0x46, 0xd3, 0x08, 
+-	0xd3, 0xc0, 0xe2, 0x95, 0x50, 0x00, 0x50, 0x00, 
+-	0x03, 0x76, 0xd0, 0x73, 0x00, 0x24, 0xdc, 0xd8, 
+-	0xf0, 0x4a, 0xe1, 0xac, 0xc0, 0x00, 0xc0, 0x00, 
+-	0xc0, 0x00, 0xe1, 0x8e, 0xe1, 0x30, 0x30, 0x5a, 
+-	0xe5, 0x8b, 0x37, 0x1a, 0xb6, 0xff, 0xd0, 0x52, 
+-	0x30, 0x5b, 0xfd, 0xbd, 0xbc, 0x10, 0xd0, 0x10, 
+-	0x0c, 0x1e, 0xf9, 0x88, 0xbc, 0x10, 0xd0, 0x20, 
+-	0xc0, 0x40, 0x30, 0x70, 0xed, 0x88, 0xd1, 0x42, 
+-	0xd3, 0x41, 0xe2, 0xea, 0x00, 0x24, 0xd0, 0x00, 
+-	0x2c, 0x40, 0x2c, 0x80, 0x17, 0x20, 0xf9, 0xab, 
+-	0x00, 0x2a, 0xd0, 0x00, 0x20, 0x1b, 0x20, 0x1b, 
+-	0x05, 0x50, 0xf9, 0x9b, 0xb0, 0x3f, 0x10, 0x02, 
+-	0x7c, 0x40, 0xcc, 0xb1, 0x1c, 0x9f, 0x01, 0x69, 
+-	0xd0, 0x3c, 0x0c, 0x99, 0xe9, 0xa4, 0x3c, 0x80, 
+-	0xde, 0xa0, 0x2c, 0x5f, 0x2c, 0x9f, 0xd0, 0x30, 
+-	0x70, 0x00, 0x2c, 0x80, 0xde, 0xc1, 0xe3, 0x1e, 
+-	0xf2, 0xd3, 0xc0, 0x5c, 0xb0, 0x7f, 0x30, 0x5a, 
+-	0xe5, 0xd1, 0x00, 0x26, 0xd0, 0x00, 0x70, 0x00, 
+-	0x10, 0x20, 0xe9, 0xc8, 0x00, 0xe0, 0xd0, 0x44, 
+-	0x70, 0x41, 0x10, 0x5b, 0x30, 0x5b, 0xb0, 0x41, 
+-	0xed, 0xd1, 0x0f, 0x17, 0xf9, 0xbd, 0x0f, 0x49, 
+-	0xf2, 0xd3, 0x0f, 0x19, 0xf9, 0xc1, 0xdf, 0x00, 
+-	0x00, 0x06, 0x03, 0xb4, 0xd6, 0x29, 0xe0, 0x46, 
+-	0xc0, 0x5b, 0x30, 0x54, 0xb0, 0x7e, 0xe5, 0xd1, 
+-	0x0f, 0x17, 0xf9, 0xcc, 0x03, 0x35, 0xda, 0x20, 
+-	0xe0, 0x46, 0xd3, 0x08, 0xd3, 0xc0, 0xe2, 0x95, 
+-	0xd0, 0x61, 0x23, 0x81, 0x0c, 0x49, 0xd0, 0x61, 
+-	0x00, 0x8d, 0x10, 0xa0, 0xea, 0x3b, 0x30, 0x42, 
+-	0xe6, 0x30, 0x23, 0x82, 0x0f, 0xc5, 0x0c, 0x09, 
+-	0x05, 0x0d, 0x15, 0x20, 0xfe, 0x45, 0xd0, 0x65, 
+-	0x15, 0x63, 0xea, 0x43, 0xd0, 0x53, 0x30, 0x54, 
+-	0xee, 0x4a, 0x0f, 0x17, 0xfa, 0x45, 0x03, 0xb4, 
+-	0xd6, 0x29, 0xe0, 0x46, 0x80, 0x07, 0x09, 0x49, 
+-	0xd4, 0x00, 0xd4, 0x40, 0xd4, 0x80, 0xd4, 0xc0, 
+-	0x00, 0x4d, 0xa0, 0x6c, 0xd0, 0xa1, 0x00, 0x88, 
+-	0xd0, 0xa9, 0x00, 0x4d, 0x00, 0x50, 0xfa, 0x53, 
+-	0xf2, 0x32, 0xd3, 0x80, 0xe1, 0x76, 0xd1, 0xc2, 
+-	0x41, 0xcf, 0x11, 0xdf, 0xd0, 0x41, 0x01, 0xc1, 
+-	0x00, 0xef, 0xd0, 0xbe, 0x03, 0x10, 0xf9, 0x77, 
+-	0x80, 0x07, 0x21, 0x96, 0x11, 0xa2, 0xe9, 0x78, 
+-	0x03, 0x1d, 0xea, 0x73, 0xc0, 0xd7, 0xc2, 0x90, 
+-	0xf2, 0xa4, 0xc4, 0x0a, 0x03, 0xd0, 0xea, 0x72, 
+-	0xc2, 0x91, 0xf2, 0xa4, 0xc4, 0x4a, 0x03, 0x1e, 
+-	0xea, 0x8d, 0xc0, 0xd8, 0xc2, 0x92, 0xf2, 0xa4, 
+-	0xc4, 0x8a, 0x03, 0xd0, 0xea, 0x7d, 0xc2, 0x93, 
+-	0xf2, 0xa4, 0xc4, 0xca, 0xe2, 0x8d, 0xd3, 0xc0, 
+-	0xc0, 0xd7, 0xc2, 0x90, 0xf2, 0xa4, 0xc4, 0x0a, 
+-	0x03, 0xd0, 0xea, 0x88, 0xc2, 0x91, 0xf2, 0xa4, 
+-	0xc4, 0x4a, 0x08, 0x49, 0x00, 0x4d, 0x10, 0x61, 
+-	0xf8, 0x11, 0x03, 0x1f, 0xea, 0x93, 0x0d, 0xc9, 
+-	0x00, 0x4d, 0xd0, 0x1a, 0xe2, 0x98, 0x03, 0x10, 
+-	0xfa, 0x97, 0xd0, 0x1d, 0xe2, 0x98, 0xd0, 0x18, 
+-	0x0f, 0x16, 0xfa, 0x98, 0xd0, 0x4c, 0x40, 0x4c, 
+-	0x10, 0x6c, 0xea, 0xa2, 0x03, 0xde, 0xfa, 0xa2, 
+-	0x0f, 0x12, 0xfa, 0xa0, 0x00, 0x08, 0xe2, 0xd9, 
+-	0xd2, 0x00, 0x13, 0xe1, 0xee, 0xa9, 0x08, 0x49, 
+-	0x02, 0x0d, 0x00, 0xc8, 0xc2, 0xca, 0x12, 0x94, 
+-	0xd0, 0x1f, 0x30, 0x07, 0x12, 0xc0, 0xc2, 0x43, 
+-	0x12, 0x5a, 0x00, 0x0d, 0x03, 0xde, 0xea, 0xb6, 
+-	0x0e, 0xc9, 0x04, 0x8d, 0x02, 0x48, 0x22, 0x80, 
+-	0x12, 0x88, 0xd0, 0x0b, 0x30, 0x03, 0x12, 0x80, 
+-	0xd0, 0x19, 0x20, 0x03, 0x12, 0x80, 0x00, 0x0d, 
+-	0x22, 0xc0, 0x12, 0xc8, 0xd0, 0x0b, 0x30, 0x09, 
+-	0x12, 0xc0, 0x12, 0xd8, 0xd0, 0x16, 0x20, 0x09, 
+-	0x20, 0x07, 0x12, 0xc0, 0x42, 0xc2, 0x22, 0x8b, 
+-	0x22, 0x88, 0x03, 0xde, 0xea, 0xd2, 0x0e, 0xc9, 
+-	0xc4, 0x4a, 0x04, 0xcd, 0x0f, 0xc5, 0x01, 0x46, 
+-	0x90, 0x4d, 0x00, 0xc6, 0x10, 0x60, 0xe6, 0xd3, 
+-	0x0f, 0xc5, 0x01, 0xb5, 0xd4, 0x00, 0xca, 0x9d, 
+-	0xcb, 0x9e, 0xca, 0xea, 0xcb, 0xee, 0x2a, 0xc0, 
+-	0x2b, 0xc0, 0xca, 0x10, 0xca, 0x51, 0xcb, 0x12, 
+-	0xcb, 0x53, 0xd1, 0x40, 0xd3, 0x41, 0xb7, 0x3f, 
+-	0xc0, 0x5c, 0xe1, 0x7b, 0xd0, 0xc0, 0xc1, 0x28, 
+-	0xc2, 0x2a, 0xc2, 0xab, 0xf1, 0x7a, 0x0f, 0x17, 
+-	0xfa, 0xef, 0xcc, 0xe8, 0xcd, 0x29, 0xcd, 0x6c, 
+-	0xcd, 0xad, 0xc8, 0x08, 0xc8, 0x49, 0xca, 0x0a, 
+-	0xca, 0x4b, 0xf3, 0x31, 0xd0, 0xc1, 0xc1, 0x34, 
+-	0xc2, 0x2a, 0xc2, 0xab, 0xf1, 0x7a, 0x00, 0x28, 
+-	0xd9, 0xc0, 0xc8, 0x88, 0xc8, 0xc9, 0xa9, 0xf8, 
+-	0xca, 0x8a, 0xca, 0xcb, 0x11, 0x62, 0xe9, 0x79, 
+-	0xd0, 0xc0, 0xc1, 0x35, 0xc2, 0x2e, 0xc2, 0xaf, 
+-	0xf1, 0x7a, 0xc9, 0x08, 0xc9, 0x49, 0xa9, 0xf8, 
+-	0xcb, 0x0a, 0xcb, 0x4b, 0xd0, 0xc1, 0xc1, 0x36, 
+-	0xc2, 0x2e, 0xc2, 0xaf, 0xf1, 0x7a, 0xc0, 0x27, 
+-	0xc9, 0x88, 0xc9, 0xc9, 0xa0, 0x38, 0xcb, 0x8a, 
+-	0xcb, 0xcb, 0xe1, 0x79, 0x5f, 0x0d, 0x07, 0x7d, 
+-	0xde, 0x07, 0x11, 0x5e, 0x30, 0x05, 0xcd, 0xc0, 
+-	0x00, 0x28, 0xd0, 0x00, 0xa0, 0x38, 0x11, 0x61, 
+-	0xf9, 0x75, 0x00, 0xe2, 0xd0, 0x00, 0x0f, 0x1d, 
+-	0xeb, 0x29, 0x00, 0x2d, 0xdf, 0x4b, 0xf3, 0x3f, 
+-	0xe1, 0x75, 0x04, 0xeb, 0xd0, 0x00, 0x11, 0x62, 
+-	0xeb, 0x36, 0xb0, 0x20, 0x0f, 0x19, 0xfb, 0x36, 
+-	0xac, 0xe0, 0x01, 0xa4, 0xde, 0x00, 0x5e, 0x0d, 
+-	0x00, 0x2d, 0xdf, 0x7a, 0xdd, 0xc0, 0xd8, 0x80, 
+-	0xd9, 0x00, 0xd9, 0x80, 0x5f, 0x00, 0x01, 0x46, 
+-	0x00, 0x28, 0xd0, 0x01, 0x00, 0x06, 0xa0, 0x37, 
+-	0x80, 0x3f, 0x00, 0xc6, 0x0f, 0xc5, 0xad, 0xda, 
+-	0xc6, 0xb1, 0xd0, 0x01, 0x01, 0xa3, 0xde, 0x1d, 
+-	0x40, 0x30, 0x3e, 0x00, 0x80, 0x3f, 0x0e, 0x0a, 
+-	0x66, 0xda, 0xc8, 0x28, 0xc8, 0x69, 0xc8, 0xaa, 
+-	0xc8, 0xeb, 0x0c, 0x1e, 0xfb, 0x68, 0x26, 0xba, 
+-	0x07, 0x7d, 0xdc, 0x00, 0x1d, 0xcf, 0x1d, 0xd1, 
+-	0x5d, 0xc0, 0x00, 0x2d, 0xdf, 0x64, 0x0f, 0x87, 
+-	0xad, 0xda, 0x80, 0x3f, 0x0e, 0x0a, 0x66, 0xda, 
+-	0xc9, 0x2c, 0xc9, 0x6d, 0xc9, 0xae, 0xc9, 0xef, 
+-	0x0f, 0x2f, 0xd0, 0x37, 0x4f, 0x00, 0x0f, 0x1a, 
+-	0xeb, 0xbe, 0x01, 0xa4, 0xde, 0x20, 0xd0, 0x01, 
+-	0x40, 0x3c, 0x2e, 0x00, 0x00, 0x2d, 0xdf, 0x7a, 
+-	0xac, 0xe0, 0x0f, 0x87, 0x0e, 0x0a, 0x76, 0xe0, 
+-	0xbf, 0x79, 0xbe, 0x3c, 0x0f, 0x1b, 0xeb, 0x9e, 
+-	0x0f, 0x87, 0x0e, 0x0a, 0x76, 0xe1, 0xbf, 0x79, 
+-	0xbe, 0x34, 0x18, 0xa0, 0xeb, 0xb9, 0x0f, 0x87, 
+-	0xad, 0x20, 0x80, 0x3f, 0x0e, 0x0a, 0x76, 0xe2, 
+-	0xbf, 0x79, 0xbe, 0x3c, 0x0f, 0x87, 0x0e, 0x0a, 
+-	0x76, 0xe3, 0x0f, 0x1b, 0xeb, 0xb3, 0xbf, 0x77, 
+-	0xbe, 0x0c, 0x19, 0x20, 0xeb, 0xb9, 0x0f, 0x87, 
+-	0xad, 0x60, 0x80, 0x3f, 0x0e, 0x0a, 0x76, 0xe4, 
+-	0xbe, 0x3c, 0xbf, 0x75, 0x0f, 0x15, 0xf8, 0x1c, 
+-	0x1f, 0x0a, 0x1f, 0x16, 0x0f, 0x87, 0x0e, 0x0a, 
+-	0x76, 0xe5, 0xbf, 0x79, 0xbe, 0x34, 0x19, 0xa0, 
+-	0xeb, 0xb9, 0x0f, 0x87, 0xad, 0xa0, 0x80, 0x3f, 
+-	0x0e, 0x0a, 0x76, 0xe6, 0xbe, 0x3c, 0xbf, 0x79, 
+-	0x0f, 0x87, 0x0e, 0x0a, 0x76, 0xe7, 0x0f, 0x15, 
+-	0xeb, 0xbe, 0x00, 0x2f, 0xdf, 0x72, 0x1d, 0xe0, 
+-	0xf8, 0x1c, 0x00, 0x28, 0xd0, 0x01, 0xa0, 0x38, 
+-	0x80, 0x3f, 0x0f, 0x87, 0xd0, 0x01, 0x4d, 0xc0, 
+-	0x1f, 0x0f, 0x1f, 0x11, 0x00, 0x2f, 0xdf, 0x76, 
+-	0xc6, 0xb2, 0x03, 0x7d, 0xde, 0x0e, 0x01, 0xa3, 
+-	0xde, 0x2d, 0x5d, 0xc0, 0x0f, 0x87, 0x1e, 0xe1, 
+-	0xeb, 0xdb, 0xad, 0xda, 0x80, 0x3f, 0x0e, 0x0a, 
+-	0x66, 0xda, 0x0c, 0x1e, 0xfb, 0xe4, 0x26, 0xbb, 
+-	0x03, 0xff, 0xdd, 0xff, 0x4d, 0xc0, 0x00, 0xa3, 
+-	0xde, 0x2d, 0xbf, 0x56, 0x0f, 0x87, 0x07, 0x7d, 
+-	0xde, 0x0e, 0x5d, 0xc0, 0x00, 0xa3, 0xde, 0x1d, 
+-	0xad, 0xda, 0x80, 0x3f, 0x0e, 0x0a, 0x66, 0xda, 
+-	0xdf, 0x5c, 0xd0, 0x0e, 0x4f, 0x00, 0x0f, 0x87, 
+-	0xd0, 0x06, 0x40, 0x3c, 0xeb, 0xf0, 0xbf, 0x3e, 
+-	0xb0, 0x04, 0xe7, 0xf2, 0xeb, 0xf6, 0xbf, 0x0c, 
+-	0xbf, 0x3a, 0x0f, 0x87, 0x0f, 0x1d, 0xfb, 0x4b, 
+-	0xbf, 0x38, 0x0f, 0x87, 0x0f, 0x1c, 0xfb, 0xcb, 
+-	0xbf, 0x30, 0x0f, 0x87, 0x50, 0x00, 0x50, 0x00, 
+-	0x0f, 0x17, 0xf9, 0x70, 0x90, 0x4d, 0x10, 0x60, 
+-	0xe5, 0x72, 0x0f, 0x49, 0x90, 0x4d, 0x10, 0x60, 
+-	0xe5, 0x76, 0x0f, 0x19, 0xf9, 0x79, 0x01, 0x46, 
+-	0xd0, 0x11, 0xa0, 0x38, 0x80, 0x3f, 0x00, 0xc6, 
+-	0xdf, 0x00, 0x00, 0x06, 0x08, 0x20, 0xd0, 0x00, 
+-	0x10, 0x08, 0xa0, 0x0a, 0xa0, 0x1b, 0x0c, 0x20, 
+-	0xd0, 0x00, 0x10, 0x08, 0xa0, 0x27, 0x90, 0x4d, 
+-	0x0f, 0xff, 0xd8, 0x1f, 0x40, 0x40, 0xa0, 0x4d, 
+-	0x80, 0x0a, 0xd0, 0x00, 0x06, 0x50, 0xf9, 0x95, 
+-	0xd0, 0x01, 0xa0, 0x09, 0x80, 0x1b, 0xa0, 0x27, 
+-	0x01, 0x20, 0xd0, 0x67, 0xa0, 0x69, 0x80, 0x2a, 
+-	0x82, 0x29, 0x80, 0x6a, 0x84, 0x29, 0xd0, 0x54, 
+-	0x10, 0x4f, 0xa0, 0x6a, 0x01, 0x20, 0xd0, 0x40, 
+-	0xa0, 0x69, 0x80, 0x2b, 0x80, 0x07, 0x08, 0x20, 
+-	0xdf, 0x00, 0x02, 0x30, 0xd0, 0x00, 0xa0, 0x38, 
+-	0x80, 0x3f, 0x01, 0xb0, 0xd0, 0x10, 0xa0, 0x37, 
+-	0x80, 0x3f, 0x02, 0x30, 0xd0, 0x01, 0xa0, 0x38, 
+-	0xd0, 0x10, 0xa0, 0x38, 0x15, 0x63, 0xe9, 0xba, 
+-	0x05, 0x5e, 0xf9, 0xfa, 0xc0, 0xdf, 0x00, 0xe0, 
+-	0xd1, 0x80, 0x70, 0x06, 0x10, 0x1c, 0xc1, 0x40, 
+-	0x11, 0x48, 0xd3, 0x10, 0x00, 0x21, 0xd0, 0x80, 
+-	0xb0, 0x16, 0xe9, 0xca, 0xd3, 0x20, 0x10, 0x81, 
+-	0xb0, 0x16, 0xf9, 0xfa, 0x30, 0xc2, 0xd2, 0x64, 
+-	0xd0, 0x92, 0x00, 0xee, 0xd0, 0x54, 0x70, 0x41, 
+-	0x30, 0x43, 0xed, 0xd7, 0xd2, 0x6c, 0x72, 0x49, 
+-	0xc0, 0x89, 0xb0, 0xbf, 0x10, 0x9f, 0x22, 0x42, 
+-	0x04, 0x31, 0xd0, 0x10, 0xc0, 0x42, 0x30, 0x49, 
+-	0xe5, 0xde, 0x10, 0x03, 0xc1, 0x0c, 0xc1, 0x83, 
+-	0xb1, 0xbe, 0x01, 0x46, 0x00, 0x06, 0xa0, 0x3d, 
+-	0xa0, 0x3c, 0x60, 0x06, 0x00, 0xc6, 0xb1, 0xbc, 
+-	0xb1, 0x01, 0xed, 0xe1, 0xc1, 0x0c, 0x21, 0x85, 
+-	0x01, 0x46, 0x00, 0x06, 0xa0, 0x3d, 0xa0, 0x3c, 
+-	0x60, 0x06, 0x00, 0xc6, 0xb1, 0xbc, 0xb1, 0x01, 
+-	0xed, 0xec, 0x02, 0xe4, 0xd0, 0x00, 0x20, 0xc0, 
+-	0xb2, 0x41, 0xed, 0xd8, 0x15, 0xa3, 0xfa, 0x00, 
+-	0xbc, 0x10, 0x0c, 0x1e, 0xfa, 0x00, 0xbc, 0x10, 
+-	0xd0, 0x04, 0x70, 0x00, 0x10, 0x20, 0xfa, 0x00, 
+-	0x00, 0x27, 0xd0, 0x10, 0xd0, 0x40, 0x60, 0x40, 
+-	0x00, 0x26, 0xd0, 0x14, 0x60, 0x40, 0xb0, 0x28, 
+-	0x70, 0x40, 0xb0, 0x7f, 0x60, 0x40, 0x01, 0x7a, 
+-	0xde, 0x1a, 0xe0, 0x46, 0x50, 0x00, 0x50, 0x00, 
+-	0x00, 0x28, 0xd1, 0xb0, 0x70, 0x06, 0xd0, 0x81, 
+-	0x60, 0x86, 0x10, 0x20, 0xe9, 0xab, 0xb0, 0x3f, 
+-	0x60, 0x06, 0x00, 0xec, 0xd1, 0x84, 0x70, 0x46, 
+-	0xb1, 0x84, 0x70, 0x86, 0x30, 0x42, 0xe9, 0xab, 
+-	0x70, 0x42, 0xd0, 0x35, 0x30, 0x40, 0xf9, 0xab, 
+-	0x00, 0x63, 0xd0, 0x3f, 0xb0, 0xbc, 0x40, 0x80, 
+-	0x70, 0xc2, 0x10, 0xe3, 0xe5, 0xab, 0xb0, 0xbc, 
+-	0x40, 0x80, 0x60, 0x86, 0x00, 0x28, 0xd0, 0x24, 
+-	0x70, 0x40, 0x00, 0x22, 0xd0, 0x80, 0x50, 0x42, 
+-	0x60, 0x40, 0x00, 0x64, 0xd0, 0x60, 0xd0, 0x90, 
+-	0x60, 0x81, 0x00, 0xed, 0xd1, 0x88, 0x70, 0x46, 
+-	0x10, 0xe4, 0xe9, 0xa8, 0x00, 0x21, 0xd0, 0xe8, 
+-	0xd0, 0x00, 0x60, 0x03, 0xd0, 0x81, 0x40, 0x42, 
+-	0x60, 0x46, 0x02, 0x3c, 0xdc, 0x89, 0xe0, 0x46, 
+-	0xd0, 0x82, 0x50, 0x42, 0x60, 0x46, 0x00, 0x23, 
+-	0xd5, 0x3e, 0x01, 0x7a, 0xde, 0x1a, 0xe0, 0x46, 
+-	0x01, 0x46, 0xdf, 0x5c, 0x08, 0x20, 0xd1, 0x00, 
+-	0xcf, 0x04, 0x11, 0x08, 0xa1, 0x0a, 0xa1, 0x1b, 
+-	0x11, 0x1f, 0xa1, 0x27, 0xd2, 0x80, 0xb2, 0x81, 
+-	0x90, 0x4d, 0xc0, 0x01, 0x10, 0x14, 0x00, 0x16, 
+-	0xe9, 0x8d, 0x80, 0x33, 0x80, 0x3f, 0x92, 0x8b, 
+-	0x00, 0x23, 0xd0, 0x3f, 0x42, 0x80, 0xe9, 0x8d, 
+-	0x0f, 0xff, 0xdf, 0xff, 0x40, 0x01, 0xa0, 0x0d, 
+-	0xe1, 0x94, 0xa1, 0x0a, 0x00, 0xea, 0xd0, 0x00, 
+-	0xd0, 0x8e, 0x00, 0x06, 0x0f, 0x0b, 0x70, 0x80, 
+-	0x80, 0x73, 0x80, 0x0a, 0xd0, 0x00, 0x06, 0x50, 
+-	0xf9, 0x9a, 0xd0, 0x01, 0xd0, 0x44, 0x40, 0x70, 
+-	0x20, 0x01, 0x15, 0x63, 0xf9, 0xa1, 0x80, 0x1b, 
+-	0xe1, 0xa2, 0x80, 0x5b, 0xa0, 0x27, 0x01, 0x20, 
+-	0xd0, 0x67, 0xa0, 0x69, 0x80, 0x2a, 0x82, 0x29, 
+-	0x80, 0x6a, 0x84, 0x29, 0xd0, 0x54, 0x10, 0x4f, 
+-	0xa0, 0x6a, 0x01, 0x20, 0xd0, 0x40, 0xa0, 0x69, 
+-	0x80, 0x2b, 0x80, 0x07, 0x08, 0x20, 0xd0, 0x00, 
+-	0xcf, 0x00, 0x02, 0x30, 0xd0, 0x00, 0xa0, 0x38, 
+-	0x80, 0x3f, 0x01, 0xb2, 0xd2, 0x10, 0xa0, 0x37, 
+-	0x80, 0x3f, 0x02, 0x30, 0xd0, 0x01, 0xa0, 0x38, 
+-	0x00, 0x30, 0xd0, 0x10, 0xa0, 0x38, 0x80, 0x3f, 
+-	0x00, 0xc6, 0x00, 0x28, 0xd1, 0x24, 0x70, 0x04, 
+-	0xd0, 0x41, 0x50, 0x01, 0x60, 0x04, 0x00, 0x27, 
+-	0xd0, 0x18, 0x70, 0x40, 0xb0, 0x7f, 0x60, 0x40, 
+-	0x00, 0x26, 0xd0, 0x20, 0x70, 0x40, 0xb0, 0x7f, 
+-	0x60, 0x40, 0x08, 0x20, 0xdf, 0x00, 0xd4, 0x00, 
+-	0xd4, 0x40, 0xd4, 0x80, 0xd4, 0xc0, 0xd3, 0x81, 
+-	0x12, 0xa0, 0xed, 0xe3, 0xd0, 0x08, 0x0a, 0x09, 
+-	0x00, 0x4d, 0xb0, 0x01, 0xed, 0xdf, 0x03, 0xbf, 
+-	0xd4, 0x27, 0xe0, 0x46, 0x50, 0x00, 0x50, 0x00, 
+-	0x02, 0x24, 0xd0, 0x00, 0xa0, 0x37, 0x00, 0x27, 
+-	0xd3, 0xd0, 0x00, 0x26, 0xd0, 0x04, 0x73, 0xcf, 
+-	0x13, 0xe1, 0xe9, 0x7b, 0xb0, 0x3c, 0xf2, 0x00, 
+-	0x00, 0x26, 0xd0, 0x40, 0xd0, 0x00, 0x60, 0x01, 
+-	0x00, 0x26, 0xd0, 0x14, 0xf2, 0x00, 0x00, 0x26, 
+-	0xd0, 0x18, 0xf2, 0x00, 0x00, 0xee, 0xd0, 0x1c, 
+-	0x71, 0x40, 0xd1, 0x24, 0x15, 0x63, 0xe9, 0x8d, 
+-	0x11, 0x1f, 0xc7, 0x1a, 0xb7, 0x01, 0xd3, 0x81, 
+-	0xc4, 0xd4, 0xf2, 0x04, 0x00, 0x26, 0xd0, 0x18, 
+-	0x70, 0x40, 0xb0, 0x54, 0xfd, 0x9b, 0x00, 0xed, 
+-	0xd0, 0x24, 0xd0, 0x44, 0x60, 0x40, 0x13, 0xe1, 
+-	0xf9, 0xbc, 0x15, 0xa3, 0xf9, 0xa1, 0x0c, 0x10, 
+-	0xe9, 0xb9, 0x11, 0x61, 0xe5, 0xb3, 0xed, 0xb9, 
+-	0x15, 0xa3, 0xf9, 0xab, 0x00, 0x26, 0xd0, 0x14, 
+-	0x70, 0x40, 0x10, 0x62, 0xf5, 0xb3, 0x15, 0x22, 
+-	0xe5, 0xb3, 0xc0, 0x44, 0x30, 0x54, 0xe5, 0xb3, 
+-	0x34, 0xd4, 0xf5, 0xb3, 0xe1, 0xbf, 0x03, 0xb4, 
+-	0xd6, 0x29, 0x00, 0x26, 0xd0, 0x40, 0x60, 0x01, 
+-	0xe1, 0xdb, 0x03, 0xb4, 0xd6, 0x29, 0xe0, 0x46, 
+-	0x01, 0x7a, 0xde, 0x1a, 0xe0, 0x46, 0x80, 0x07, 
+-	0x09, 0x49, 0xd4, 0x00, 0xd4, 0x40, 0xd4, 0x80, 
+-	0xd4, 0xc0, 0x00, 0x4d, 0xa0, 0x6c, 0xd3, 0x80, 
+-	0xd0, 0xa1, 0x00, 0x88, 0xd0, 0xa9, 0x00, 0x4d, 
+-	0x00, 0x50, 0xf9, 0xc9, 0x0c, 0x49, 0xd0, 0x61, 
+-	0x00, 0x8d, 0x10, 0xa0, 0xe9, 0x90, 0x30, 0x42, 
+-	0xf5, 0xd8, 0xd0, 0x61, 0x23, 0x81, 0xe1, 0xce, 
+-	0x23, 0x82, 0x13, 0xa1, 0xf9, 0x90, 0xd0, 0x42, 
+-	0x15, 0xa1, 0xf9, 0xdf, 0xb0, 0x7f, 0x00, 0x26, 
+-	0xd0, 0x14, 0x70, 0x00, 0x30, 0x01, 0xf5, 0xe8, 
+-	0x16, 0xe0, 0xe5, 0xe8, 0xb6, 0xc1, 0xbc, 0x20, 
+-	0xc0, 0x44, 0x30, 0x5b, 0xfd, 0xb9, 0xc0, 0x44, 
+-	0x30, 0x54, 0xe5, 0xb9, 0x15, 0x63, 0xf9, 0xf8, 
+-	0x15, 0xa3, 0xf9, 0xf5, 0x03, 0x3c, 0xd8, 0x1c, 
+-	0xe0, 0x46, 0x03, 0x39, 0xda, 0x17, 0xe0, 0x46, 
+-	0x15, 0xa3, 0xf9, 0xfd, 0x03, 0x72, 0xde, 0x19, 
+-	0xe0, 0x46, 0x03, 0x70, 0xd0, 0x17, 0xe0, 0x46, 
+-	0x70, 0x40, 0xb0, 0x7f, 0x60, 0x40, 0x0f, 0xc5, 
+-	0xdf, 0x00, 0x0c, 0x09, 0x05, 0x0d, 0x08, 0x20, 
+-	0xdf, 0x00, 0x0f, 0xc5, 0x50, 0x00, 0x50, 0x00, 
+-	0x00, 0xef, 0xd0, 0x14, 0x70, 0x40, 0x10, 0x60, 
+-	0xe9, 0x45, 0xb0, 0x04, 0x70, 0x40, 0xb0, 0x41, 
+-	0xed, 0x44, 0x00, 0xed, 0xd0, 0x24, 0xd0, 0x44, 
+-	0x60, 0x40, 0x00, 0x64, 0xd0, 0x20, 0x70, 0x00, 
+-	0x10, 0x30, 0xe9, 0x45, 0x00, 0x21, 0xd0, 0x28, 
+-	0x60, 0x40, 0x00, 0x64, 0xd2, 0xc0, 0x70, 0x0b, 
+-	0x00, 0x11, 0xe9, 0x6a, 0x08, 0x20, 0xd0, 0x4f, 
+-	0x30, 0x40, 0xe9, 0x55, 0xb0, 0x4f, 0xf9, 0x6a, 
+-	0x03, 0xef, 0xdf, 0xbf, 0xaf, 0xb8, 0xdf, 0x80, 
+-	0x0f, 0x87, 0xd0, 0x18, 0x70, 0x00, 0x10, 0x20, 
+-	0xed, 0x6c, 0xdf, 0x84, 0xd0, 0x40, 0x60, 0x7e, 
+-	0x00, 0x27, 0xd0, 0x54, 0x70, 0x41, 0x10, 0x60, 
+-	0x01, 0xa0, 0xd0, 0x40, 0xa0, 0x78, 0x80, 0x34, 
+-	0x80, 0x3f, 0x01, 0x3c, 0xd2, 0x39, 0x00, 0x21, 
+-	0xdf, 0x86, 0x0f, 0x87, 0xd0, 0x40, 0x60, 0x4b, 
+-	0x03, 0xe6, 0xd0, 0x08, 0xe0, 0x36, 0x50, 0x00, 
+-	0x00, 0x28, 0xd0, 0x24, 0x72, 0xc0, 0xd0, 0x40, 
+-	0x60, 0x40, 0xd0, 0x0c, 0x52, 0xc0, 0xc0, 0x1c, 
+-	0x30, 0x1d, 0xf5, 0x3c, 0x20, 0x1f, 0x30, 0x1e, 
+-	0x90, 0x6d, 0x20, 0x01, 0x00, 0x22, 0xd0, 0x58, 
+-	0x60, 0x01, 0x00, 0xe3, 0xd0, 0x48, 0x70, 0x41, 
+-	0x30, 0x40, 0xf5, 0x47, 0xb2, 0xc8, 0x00, 0xe3, 
+-	0xd0, 0x4c, 0x70, 0x41, 0x30, 0x40, 0xfd, 0x4d, 
+-	0xb2, 0xc4, 0x00, 0x28, 0xd0, 0x20, 0x70, 0x00, 
+-	0x42, 0xc0, 0xa2, 0xc5, 0x12, 0xe0, 0xe9, 0x55, 
+-	0x80, 0x40, 0x80, 0x34, 0x80, 0x3f, 0xcf, 0x95, 
+-	0x82, 0x34, 0x80, 0x3f, 0x03, 0xe8, 0xd0, 0x00, 
+-	0x1f, 0xa3, 0xe9, 0x60, 0x03, 0xea, 0xd0, 0x00, 
+-	0x00, 0x27, 0xd0, 0x4c, 0x7f, 0x81, 0x00, 0x27, 
+-	0xd0, 0x54, 0x70, 0x41, 0x10, 0x60, 0x03, 0xa0, 
+-	0xd0, 0x40, 0xa0, 0x78, 0xe0, 0x3c, 0x50, 0x00, 
+-	0xc0, 0x84, 0x10, 0x8c, 0x10, 0x92, 0xd0, 0x41, 
+-	0x30, 0x4d, 0x40, 0x43, 0x10, 0x43, 0x20, 0x81, 
+-	0xd1, 0x8f, 0x41, 0x82, 0x10, 0x9c, 0x20, 0x9b, 
+-	0xc1, 0xc2, 0x10, 0x82, 0x20, 0x87, 0xc0, 0x42, 
+-	0x10, 0x43, 0x20, 0x81, 0x10, 0x88, 0x22, 0x02, 
+-	0x10, 0x97, 0x01, 0xd0, 0xe9, 0x48, 0xb0, 0x96, 
+-	0x10, 0x88, 0x22, 0x82, 0xc0, 0x5c, 0x10, 0x48, 
+-	0xc0, 0x84, 0x10, 0x91, 0x10, 0x86, 0x20, 0x42, 
+-	0x41, 0x0d, 0x11, 0x02, 0x20, 0x44, 0x22, 0x01, 
+-	0x22, 0x81, 0x02, 0xe4, 0xd2, 0x40, 0xc2, 0xca, 
+-	0xb2, 0xe0, 0x01, 0xd0, 0xe9, 0x5e, 0xc2, 0xca, 
+-	0x22, 0xc9, 0xb2, 0xa0, 0x22, 0x48, 0xd0, 0x78, 
+-	0x03, 0x50, 0xf9, 0x69, 0xd0, 0x7c, 0x01, 0x9d, 
+-	0xf9, 0x69, 0xc2, 0x48, 0xb2, 0x60, 0xc2, 0xca, 
+-	0xb2, 0xf0, 0x11, 0x82, 0x41, 0x81, 0x22, 0x06, 
+-	0x11, 0x9f, 0x41, 0x81, 0x22, 0x86, 0x0f, 0xc5, 
+-	0xc0, 0x84, 0x10, 0x8c, 0x10, 0x92, 0xd1, 0x8f, 
+-	0x41, 0x82, 0x10, 0x9c, 0xc1, 0xdb, 0x11, 0xc1, 
+-	0x21, 0xc3, 0x20, 0x87, 0xc1, 0xc2, 0x10, 0x82, 
+-	0x20, 0x87, 0xc0, 0x42, 0x10, 0x43, 0x20, 0x81, 
+-	0x10, 0x88, 0x22, 0x02, 0x10, 0x97, 0x01, 0xd0, 
+-	0xe9, 0x46, 0xb0, 0x96, 0x10, 0x88, 0x22, 0x82, 
+-	0xc0, 0x5c, 0x10, 0x48, 0xc0, 0x84, 0x10, 0x91, 
+-	0x10, 0x86, 0x20, 0x42, 0xd0, 0x81, 0x41, 0x02, 
+-	0x11, 0x02, 0x20, 0x44, 0x22, 0x01, 0x22, 0x81, 
+-	0x02, 0xe4, 0xd2, 0x40, 0xc2, 0xca, 0xb2, 0xe0, 
+-	0x01, 0xd0, 0xe9, 0x5d, 0xc2, 0xca, 0x22, 0xc9, 
+-	0xb2, 0xa0, 0x22, 0x48, 0x11, 0x9f, 0x11, 0x83, 
+-	0x22, 0x06, 0x11, 0x9c, 0x11, 0x83, 0x22, 0x86, 
+-	0x0f, 0xc5, 0xd0, 0x41, 0x40, 0x44, 0x20, 0x55, 
+-	0x10, 0x62, 0xf9, 0x6f, 0x01, 0xb5, 0xd4, 0x00, 
+-	0xc2, 0x9f, 0xc2, 0x1f, 0x22, 0x80, 0xe1, 0x30, 
+-	0x0f, 0x11, 0xf9, 0x51, 0x90, 0x38, 0x80, 0x3f, 
+-	0x00, 0x1b, 0xf9, 0x51, 0x00, 0x27, 0xd0, 0x04, 
+-	0x70, 0x40, 0x30, 0x71, 0xf9, 0x51, 0xb0, 0x3c, 
+-	0x70, 0x40, 0x30, 0x5d, 0xf9, 0x51, 0xb0, 0x08, 
+-	0x70, 0x40, 0xb0, 0x7f, 0x60, 0x40, 0x10, 0x63, 
+-	0xe5, 0x5d, 0x02, 0x20, 0xd0, 0x01, 0xa0, 0x37, 
+-	0x00, 0x26, 0xd0, 0x24, 0x70, 0x40, 0xb0, 0x7f, 
+-	0x60, 0x40, 0xb0, 0x08, 0x70, 0x40, 0xb0, 0x41, 
+-	0x60, 0x40, 0x00, 0x26, 0xd0, 0x30, 0x70, 0x40, 
+-	0xb0, 0x7f, 0x60, 0x40, 0xb0, 0x30, 0xd0, 0x40, 
+-	0x60, 0x40, 0xb0, 0x3c, 0x6c, 0x40, 0xb0, 0x3c, 
+-	0x67, 0x40, 0x00, 0x33, 0xdf, 0xb0, 0xe0, 0x36, 
+-	0x00, 0x26, 0xd0, 0x1c, 0x70, 0x40, 0xb0, 0x7f, 
+-	0x60, 0x40, 0xb0, 0x3c, 0x70, 0x40, 0xb0, 0x41, 
+-	0x60, 0x40, 0x08, 0x20, 0xdf, 0x00, 0x80, 0x35, 
+-	0xc0, 0x3c, 0x10, 0x08, 0xa0, 0x0a, 0xa0, 0x27, 
+-	0xa0, 0x1b, 0xdf, 0x5c, 0x01, 0xa0, 0xd0, 0x00, 
+-	0xa0, 0x38, 0x80, 0x3f, 0x80, 0x34, 0x80, 0x3f, 
+-	0x03, 0xbb, 0xd8, 0x1e, 0xcf, 0x95, 0x82, 0x34, 
+-	0x80, 0x3f, 0x03, 0xe8, 0xd0, 0x00, 0x1f, 0xa3, 
+-	0xe9, 0x55, 0x1f, 0xa0, 0xe9, 0x55, 0x03, 0xea, 
+-	0xd0, 0x00, 0x00, 0x21, 0xdf, 0x86, 0xe0, 0x3c, 
+-	0x89, 0x78, 0x89, 0x37, 0x00, 0xee, 0xd0, 0x14, 
+-	0x76, 0x00, 0xd0, 0x30, 0x76, 0x40, 0x26, 0x58, 
+-	0xd6, 0xd9, 0x00, 0xee, 0xd0, 0x20, 0x75, 0x40, 
+-	0xd0, 0x1c, 0x71, 0x40, 0xd0, 0x20, 0x71, 0x00, 
+-	0xd0, 0x24, 0x70, 0x80, 0xc4, 0x02, 0xd0, 0x28, 
+-	0x70, 0xc0, 0x00, 0x21, 0xd0, 0x10, 0x72, 0x00, 
+-	0x93, 0x90, 0xd4, 0x81, 0x13, 0x96, 0x43, 0x92, 
+-	0x34, 0x8e, 0x00, 0x22, 0xd1, 0xa4, 0x71, 0x86, 
+-	0xde, 0x40, 0x7e, 0x79, 0xd0, 0x18, 0x70, 0x40, 
+-	0xb0, 0x41, 0xf5, 0x58, 0xd3, 0x42, 0x50, 0x4d, 
+-	0x60, 0x40, 0x10, 0x60, 0xe5, 0x62, 0xd0, 0x54, 
+-	0x70, 0x01, 0xb0, 0x3c, 0x60, 0x01, 0x04, 0x2d, 
+-	0xd0, 0x30, 0xe0, 0x36, 0x00, 0x22, 0xd0, 0x60, 
+-	0x71, 0xc1, 0xd0, 0x4f, 0x41, 0xc1, 0x04, 0x20, 
+-	0xd0, 0x28, 0xe0, 0x36, 0x50, 0x00, 0x50, 0x00, 
+-	0x04, 0x22, 0xd0, 0x18, 0xd3, 0x44, 0x72, 0x8d, 
+-	0x12, 0xa0, 0xe8, 0x36, 0xc0, 0x47, 0x10, 0x5d, 
+-	0x30, 0x4e, 0xf8, 0x36, 0xb2, 0x3e, 0x60, 0x4d, 
+-	0x00, 0xed, 0xd0, 0x48, 0x70, 0x01, 0xde, 0x45, 
+-	0x50, 0x39, 0x00, 0x1b, 0xf9, 0x44, 0xb0, 0x01, 
+-	0x00, 0x1c, 0xf9, 0x47, 0xb0, 0x04, 0x60, 0x01, 
+-	0xd0, 0x40, 0x62, 0x81, 0xce, 0x4a, 0xd0, 0x43, 
+-	0x41, 0xc1, 0xd0, 0x58, 0x61, 0xc1, 0x90, 0x43, 
+-	0x00, 0xe0, 0xd0, 0x28, 0x70, 0x00, 0x10, 0x1f, 
+-	0x20, 0x40, 0xb1, 0xc1, 0xf5, 0x54, 0x00, 0x21, 
+-	0xd0, 0x08, 0x60, 0x40, 0x00, 0xe6, 0xd0, 0x40, 
+-	0x70, 0x41, 0xd2, 0x94, 0x60, 0x4a, 0x04, 0x2c, 
+-	0xd0, 0x08, 0x01, 0x90, 0xf8, 0x36, 0x04, 0x2d, 
+-	0xd0, 0x30, 0xe0, 0x36, 0x50, 0x00, 0x50, 0x00, 
+-	0xc0, 0x47, 0x10, 0x5d, 0x30, 0x4e, 0xf9, 0x41, 
+-	0x90, 0x43, 0x00, 0xe0, 0xd0, 0x28, 0x70, 0x00, 
+-	0x20, 0x40, 0x00, 0x21, 0xd0, 0x08, 0x60, 0x40, 
+-	0x00, 0x26, 0xd0, 0x74, 0x70, 0x01, 0xb0, 0x3f, 
+-	0x60, 0x01, 0x00, 0xed, 0xd0, 0x48, 0x70, 0x41, 
+-	0x00, 0x5e, 0xf9, 0x4b, 0x00, 0x21, 0xd0, 0x00, 
+-	0x73, 0x80, 0xd4, 0x81, 0x34, 0x8e, 0x00, 0x34, 
+-	0xd3, 0x70, 0xe0, 0x36, 0x50, 0x00, 0x50, 0x00, 
+-	0xd1, 0x88, 0xd1, 0xc8, 0x01, 0x1b, 0xe9, 0x39, 
+-	0x11, 0x9f, 0x11, 0xdf, 0xd4, 0x80, 0xd3, 0x81, 
+-	0xe1, 0x43, 0x00, 0xed, 0xd0, 0x08, 0x70, 0x00, 
+-	0x00, 0x10, 0xf9, 0x37, 0x0c, 0x1f, 0xf9, 0x36, 
+-	0x13, 0xa1, 0xe9, 0x43, 0xbe, 0x7c, 0x00, 0x69, 
+-	0xd2, 0x54, 0x12, 0x48, 0xc0, 0x39, 0x30, 0x18, 
+-	0xe5, 0x4b, 0xd2, 0x70, 0x72, 0x49, 0x22, 0x79, 
+-	0x00, 0x21, 0xd0, 0x00, 0x63, 0x80, 0x04, 0x24, 
+-	0xd0, 0x38, 0x02, 0x10, 0xe9, 0x56, 0xd0, 0x41, 
+-	0x51, 0x41, 0xe0, 0x36, 0x15, 0x61, 0xe8, 0x36, 
+-	0xd5, 0x80, 0xd3, 0x00, 0xd3, 0x40, 0x04, 0x28, 
+-	0xd0, 0x18, 0xe0, 0x36, 0x50, 0x00, 0x50, 0x00, 
+-	0x00, 0x21, 0xd0, 0x18, 0x73, 0x00, 0xb0, 0x04, 
+-	0x73, 0x80, 0xd2, 0x80, 0xb0, 0x38, 0x72, 0xc0, 
+-	0x31, 0x0d, 0xc0, 0x0e, 0x10, 0x0b, 0x10, 0x20, 
+-	0xe9, 0x42, 0xf5, 0x3f, 0x22, 0x8d, 0x10, 0x01, 
+-	0x13, 0x5f, 0xe1, 0x3b, 0x33, 0x8b, 0x15, 0x61, 
+-	0xf9, 0x49, 0x00, 0x21, 0xd0, 0x64, 0x70, 0x41, 
+-	0x33, 0x81, 0x03, 0xd0, 0xe9, 0x4c, 0x20, 0x0b, 
+-	0x13, 0xdf, 0x12, 0xc1, 0x13, 0xe0, 0xf9, 0x49, 
+-	0x10, 0x03, 0xc0, 0x50, 0x10, 0x4b, 0x13, 0x0b, 
+-	0x23, 0x00, 0x13, 0x20, 0xe9, 0x5c, 0xf5, 0x59, 
+-	0x22, 0x81, 0x13, 0x01, 0x10, 0x5f, 0xe1, 0x55, 
+-	0x12, 0x99, 0x12, 0x87, 0x21, 0x0a, 0x00, 0xa0, 
+-	0xd2, 0x80, 0xc3, 0x0a, 0x03, 0x90, 0xe9, 0x66, 
+-	0x22, 0x82, 0x23, 0x03, 0x10, 0x81, 0x10, 0xc1, 
+-	0x13, 0x9f, 0x13, 0xa0, 0xed, 0x62, 0xc0, 0x8a, 
+-	0xc0, 0xcc, 0x04, 0x26, 0xd0, 0x38, 0xe0, 0x36, 
+-	0x15, 0x61, 0xf9, 0x3d, 0x07, 0x32, 0xd0, 0x00, 
+-	0x30, 0x03, 0xed, 0x3d, 0xc0, 0x03, 0x10, 0x1d, 
+-	0x30, 0xc0, 0xc0, 0x02, 0x10, 0x1d, 0x30, 0x80, 
+-	0xe1, 0x32, 0x10, 0x94, 0x10, 0xd4, 0x00, 0x21, 
+-	0xd0, 0x20, 0x73, 0x00, 0xc5, 0x8c, 0xd3, 0x4e, 
+-	0x01, 0x1b, 0xe9, 0x48, 0x13, 0x1f, 0xd3, 0x4f, 
+-	0x43, 0x4c, 0x13, 0x1c, 0xc0, 0x0c, 0x10, 0x03, 
+-	0x20, 0x0c, 0xc0, 0x40, 0x10, 0x42, 0x20, 0x40, 
+-	0x10, 0x46, 0x20, 0x4d, 0x10, 0x42, 0x2e, 0x41, 
+-	0x10, 0x5c, 0x10, 0x43, 0x00, 0x59, 0xe9, 0x5b, 
+-	0x01, 0x69, 0xd0, 0x20, 0x30, 0x40, 0x22, 0x41, 
+-	0x04, 0x28, 0xd0, 0x18, 0xe0, 0x36, 0x50, 0x00, 
+-	0x2c, 0x14, 0xd0, 0x34, 0x63, 0x00, 0xd0, 0x38, 
+-	0x72, 0xc0, 0xc0, 0x51, 0x10, 0x5c, 0x30, 0x4b, 
+-	0x10, 0x44, 0xd4, 0xc0, 0xd5, 0x00, 0xc0, 0x18, 
+-	0x30, 0x39, 0xed, 0x5f, 0xd4, 0xd0, 0xc5, 0x01, 
+-	0xd0, 0x18, 0x70, 0x00, 0x0c, 0x1f, 0xe9, 0x48, 
+-	0x10, 0x20, 0xfd, 0x48, 0xd4, 0xc0, 0xd5, 0x00, 
+-	0x10, 0x22, 0xe5, 0x4e, 0xd4, 0xc0, 0xbc, 0x30, 
+-	0xd5, 0x00, 0xb5, 0x10, 0xb0, 0x3f, 0xf9, 0x52, 
+-	0x3c, 0x01, 0x3c, 0x01, 0x02, 0x1f, 0xe9, 0x5f, 
+-	0x00, 0xa8, 0xd3, 0xc0, 0xd3, 0xa4, 0x00, 0xaa, 
+-	0xd0, 0x10, 0x70, 0x4f, 0xb3, 0xfc, 0x60, 0x40, 
+-	0xb0, 0x3c, 0xb3, 0x81, 0xed, 0x59, 0x00, 0x21, 
+-	0xd0, 0x28, 0x70, 0x00, 0x10, 0x20, 0xf9, 0x69, 
+-	0x02, 0x1f, 0xf9, 0x6a, 0x90, 0x10, 0x00, 0x1e, 
+-	0xe9, 0x6a, 0xb1, 0x7c, 0x04, 0x2a, 0xd0, 0x18, 
+-	0xe0, 0x36, 0x50, 0x00, 0x50, 0x00, 0x50, 0x00, 
+-	0x01, 0x5e, 0xf9, 0x35, 0x01, 0x50, 0xe9, 0x35, 
+-	0xb1, 0x78, 0xd2, 0x00, 0x01, 0x5c, 0xf9, 0x5f, 
+-	0xc0, 0x18, 0x30, 0x39, 0xed, 0x5f, 0x11, 0x9f, 
+-	0xce, 0x58, 0xc2, 0x59, 0x00, 0xaa, 0xd2, 0x10, 
+-	0x14, 0x82, 0x22, 0x12, 0xc0, 0x0c, 0x10, 0x1f, 
+-	0x10, 0x03, 0x22, 0x00, 0x70, 0x48, 0x03, 0x10, 
+-	0xe9, 0x4c, 0xb2, 0x38, 0xbe, 0x60, 0xb2, 0x60, 
+-	0x2e, 0x41, 0x10, 0x5f, 0x00, 0x59, 0xe9, 0x53, 
+-	0x01, 0x69, 0xd0, 0x3c, 0x30, 0x40, 0x22, 0x41, 
+-	0x13, 0x41, 0x2e, 0x4d, 0x13, 0x5d, 0x13, 0x43, 
+-	0x22, 0x4d, 0x14, 0xe0, 0xe9, 0x5f, 0x33, 0x0b, 
+-	0x13, 0x04, 0x2c, 0x0c, 0x35, 0x0c, 0xc3, 0x46, 
+-	0xc3, 0x87, 0x04, 0x62, 0xd0, 0x10, 0x15, 0x62, 
+-	0xfc, 0x36, 0x04, 0x60, 0xd0, 0x10, 0xe0, 0x36, 
+-	0x00, 0x22, 0xd0, 0x74, 0x74, 0x01, 0xb0, 0x7c, 
+-	0x74, 0x41, 0xb0, 0x7c, 0x71, 0x41, 0xd1, 0x18, 
+-	0xc0, 0x10, 0x10, 0x1c, 0xb0, 0x16, 0xf9, 0x45, 
+-	0x00, 0x24, 0xd0, 0x20, 0x30, 0x11, 0xf9, 0x45, 
+-	0xb1, 0x70, 0x01, 0x50, 0xf9, 0x45, 0xb1, 0x20, 
+-	0x14, 0x41, 0xc0, 0x90, 0x00, 0x2b, 0xd0, 0xd0, 
+-	0x01, 0x50, 0xe9, 0x4b, 0xc0, 0xd0, 0x00, 0x35, 
+-	0xdc, 0x00, 0x20, 0x11, 0x10, 0x1f, 0xa0, 0x1c, 
+-	0x00, 0x21, 0xd0, 0x2c, 0x70, 0x00, 0x10, 0x05, 
+-	0x51, 0x40, 0xd0, 0x1c, 0x61, 0x40, 0xd0, 0x20, 
+-	0x61, 0x00, 0xd0, 0x24, 0x60, 0x80, 0xd0, 0x28, 
+-	0x60, 0xc0, 0x04, 0x2d, 0xd0, 0x30, 0x00, 0x22, 
+-	0xd0, 0x64, 0xb1, 0x81, 0x61, 0x81, 0xe0, 0x36, 
+-	0x90, 0x50, 0xd0, 0x3c, 0x10, 0x41, 0x60, 0x40, 
+-	0x15, 0x62, 0xfd, 0x3d, 0xc0, 0x10, 0x10, 0x1e, 
+-	0x10, 0x07, 0x21, 0x00, 0x10, 0x16, 0x34, 0x00, 
+-	0xc0, 0x90, 0xd3, 0x40, 0x00, 0x24, 0xd3, 0xc0, 
+-	0x04, 0x23, 0xd0, 0x18, 0x01, 0x9f, 0xe8, 0x36, 
+-	0xd0, 0x54, 0x70, 0x41, 0x73, 0x41, 0x04, 0x2e, 
+-	0xd0, 0x28, 0xe0, 0x36, 0x50, 0x00, 0x50, 0x00, 
+-	0x00, 0xef, 0xd3, 0x30, 0x73, 0x0c, 0xd0, 0x0c, 
+-	0x70, 0x00, 0xc0, 0x40, 0x13, 0x24, 0xf5, 0x42, 
+-	0x13, 0x22, 0xe9, 0x41, 0xe5, 0x43, 0xd3, 0x00, 
+-	0x10, 0x22, 0xf9, 0x41, 0xd0, 0x01, 0xd0, 0x43, 
+-	0xd3, 0x01, 0x21, 0x00, 0xd3, 0x40, 0x03, 0x10, 
+-	0xf9, 0x47, 0xd3, 0x40, 0xe1, 0x61, 0x00, 0x23, 
+-	0xd0, 0x00, 0x10, 0x61, 0xe9, 0x50, 0xb0, 0x33, 
+-	0x10, 0x63, 0xe9, 0x50, 0x00, 0x22, 0xd0, 0x1a, 
+-	0xc3, 0xc0, 0xd2, 0xc0, 0x00, 0x10, 0xe9, 0x55, 
+-	0x22, 0xd0, 0x10, 0x1f, 0x14, 0x01, 0x10, 0x20, 
+-	0xed, 0x52, 0x14, 0x18, 0x12, 0xd8, 0xc0, 0x8b, 
+-	0x32, 0xd0, 0x12, 0xc3, 0x33, 0x4b, 0x13, 0x47, 
+-	0x21, 0x0d, 0x04, 0x23, 0xd0, 0x18, 0xe0, 0x36, 
+-	0x00, 0x24, 0xd0, 0x30, 0xd0, 0x40, 0x60, 0x40, 
+-	0xd3, 0xc7, 0x43, 0xc4, 0x31, 0x0f, 0xd5, 0xd4, 
+-	0x25, 0xcf, 0x15, 0xc4, 0x10, 0xdf, 0xc2, 0xc6, 
+-	0xc3, 0x07, 0x11, 0x81, 0xb1, 0x3b, 0x15, 0x64, 
+-	0xe9, 0x47, 0x10, 0xdf, 0x12, 0xc1, 0x11, 0x81, 
+-	0x11, 0xc1, 0xb1, 0x3f, 0xb5, 0xf8, 0x90, 0x10, 
+-	0x00, 0x16, 0xf9, 0x5e, 0xb5, 0xfc, 0xd0, 0x20, 
+-	0x40, 0x39, 0x2e, 0x4b, 0x22, 0x4c, 0x12, 0x20, 
+-	0xe9, 0x59, 0x20, 0x39, 0x00, 0x1b, 0xe9, 0x59, 
+-	0x2c, 0x13, 0x35, 0x13, 0x0e, 0x5a, 0xf9, 0x59, 
+-	0xb2, 0x38, 0x02, 0xe3, 0xd0, 0x00, 0x0e, 0x5a, 
+-	0xe9, 0x5e, 0x2e, 0x40, 0x01, 0xee, 0xd2, 0x80, 
+-	0x42, 0x84, 0xc0, 0x03, 0x30, 0x02, 0xf5, 0x6b, 
+-	0x31, 0x0a, 0x12, 0x98, 0x20, 0x03, 0xf5, 0x69, 
+-	0x12, 0x9f, 0x12, 0x87, 0x51, 0x0a, 0x00, 0x34, 
+-	0xd4, 0xf0, 0xe0, 0x36, 0x50, 0x00, 0x50, 0x00, 
+-	0xd3, 0xc7, 0x43, 0xc4, 0x15, 0x61, 0xf9, 0x48, 
+-	0x10, 0xc1, 0xd5, 0xe0, 0xd1, 0x80, 0xd1, 0xc0, 
+-	0x31, 0x0f, 0x13, 0xe1, 0xe9, 0x3c, 0xd3, 0xc0, 
+-	0x00, 0x24, 0xd0, 0x30, 0x63, 0xc0, 0x25, 0xcf, 
+-	0x15, 0xc2, 0xd0, 0x03, 0x40, 0x16, 0x25, 0xc0, 
+-	0x15, 0xc2, 0x15, 0x81, 0x35, 0x91, 0xe1, 0x5c, 
+-	0x00, 0x24, 0xd0, 0x30, 0x63, 0xc0, 0x01, 0x50, 
+-	0xe9, 0x54, 0x15, 0xa0, 0xf9, 0x55, 0x00, 0x24, 
+-	0xd0, 0x34, 0x70, 0x00, 0x10, 0x20, 0xe9, 0x55, 
+-	0xd3, 0xc0, 0x31, 0x0f, 0xd5, 0xfc, 0x25, 0xcf, 
+-	0x15, 0xc3, 0x14, 0xa0, 0xe9, 0x5c, 0xb5, 0xfc, 
+-	0x00, 0x34, 0xd4, 0xf0, 0xe0, 0x36, 0x50, 0x00, 
+-	0xc4, 0x91, 0x34, 0x96, 0xed, 0x34, 0xd4, 0x80, 
+-	0x14, 0x84, 0xb3, 0xc1, 0xe5, 0x41, 0xc0, 0x52, 
+-	0x10, 0x5e, 0x34, 0x81, 0xb3, 0xc1, 0xe5, 0x41, 
+-	0xc0, 0x52, 0x10, 0x5c, 0x24, 0x81, 0xb3, 0xc1, 
+-	0xe5, 0x37, 0x02, 0xe8, 0xd0, 0x00, 0xb4, 0xb0, 
+-	0x14, 0x9b, 0x00, 0x24, 0xd0, 0x60, 0x30, 0x52, 
+-	0xed, 0x4a, 0x24, 0x81, 0x20, 0x12, 0xa0, 0x1c, 
+-	0x10, 0x8a, 0x50, 0x83, 0xa0, 0x96, 0xa1, 0x50, 
+-	0xa1, 0x11, 0xc0, 0x52, 0xd4, 0x84, 0x10, 0x6c, 
+-	0xed, 0x56, 0xd4, 0x81, 0xd1, 0x00, 0xb1, 0x17, 
+-	0x00, 0x23, 0xd1, 0x40, 0xc2, 0xb9, 0x22, 0x86, 
+-	0x12, 0x20, 0xf9, 0x66, 0x02, 0xe3, 0xd0, 0x40, 
+-	0x02, 0x9a, 0xe9, 0x63, 0x22, 0x81, 0x02, 0x5a, 
+-	0xe9, 0x66, 0x22, 0x41, 0x75, 0xd7, 0xc3, 0xd7, 
+-	0xd0, 0xd7, 0x00, 0x21, 0xd0, 0xb6, 0x8b, 0x38, 
+-	0x00, 0x33, 0xdd, 0x08, 0xe0, 0x36, 0x50, 0x00, 
+-	0xd0, 0x7c, 0x60, 0x01, 0xae, 0x52, 0xd0, 0x60, 
+-	0x40, 0x79, 0x00, 0x13, 0xe8, 0xc9, 0xa2, 0x94, 
+-	0x22, 0x86, 0x13, 0xe0, 0xe4, 0xd0, 0x13, 0xc1, 
+-	0x15, 0x62, 0xfc, 0xd1, 0x13, 0xc1, 0xe0, 0xd1, 
+-	0xc3, 0xd7, 0x03, 0xd9, 0xe8, 0xd4, 0x22, 0x8d, 
+-	0x15, 0x62, 0xfc, 0xda, 0x03, 0xda, 0xe8, 0xda, 
+-	0x22, 0x8d, 0x22, 0x8d, 0xce, 0x4a, 0x22, 0x86, 
+-	0x00, 0x14, 0xe8, 0xe0, 0xa2, 0x53, 0x22, 0x47, 
+-	0x03, 0xd1, 0xe8, 0xe8, 0x22, 0x4e, 0x15, 0x62, 
+-	0xfc, 0xe8, 0x03, 0xd2, 0xe8, 0xe8, 0x22, 0x4e, 
+-	0x12, 0x20, 0xe9, 0x09, 0x20, 0x79, 0x00, 0x5b, 
+-	0xe8, 0xf4, 0x15, 0x20, 0xfc, 0xf1, 0x2c, 0x13, 
+-	0x35, 0x13, 0x0e, 0x5b, 0xe8, 0xf4, 0xb2, 0x38, 
+-	0x02, 0x9a, 0xe8, 0xfb, 0x70, 0x08, 0xd0, 0x7c, 
+-	0x42, 0x81, 0x22, 0x98, 0x22, 0x80, 0x02, 0x5a, 
+-	0xe9, 0x11, 0x70, 0x08, 0xd0, 0x78, 0x42, 0x41, 
+-	0x22, 0x59, 0x10, 0x1f, 0x22, 0x40, 0x00, 0x19, 
+-	0xe9, 0x11, 0x01, 0x69, 0xd0, 0x7c, 0x32, 0x41, 
+-	0xe1, 0x11, 0x02, 0xe3, 0xd0, 0x40, 0x02, 0x9a, 
+-	0xe9, 0x0e, 0x22, 0x81, 0x02, 0x5a, 0xe9, 0x11, 
+-	0x22, 0x41, 0x0e, 0x5a, 0xe9, 0x15, 0xce, 0x4a, 
+-	0x3e, 0x46, 0x0f, 0x87, 0xdd, 0x48, 0xe1, 0x19, 
+-	0xdd, 0x40, 0xdc, 0xc8, 0xdd, 0x3c, 0x7d, 0x34, 
+-	0x1d, 0x19, 0x3d, 0x35, 0x4d, 0x33, 0x4c, 0xec, 
+-	0x3d, 0x33, 0xf9, 0x17, 0x0f, 0xc5, 0x50, 0x00, 
+-	0xd0, 0x39, 0xd0, 0x35, 0xd0, 0x1d, 0xd0, 0x2d, 
+-	0xd0, 0x3f, 0xd0, 0x2e, 0xd0, 0x3c, 0xd0, 0x37, 
+-	0xd0, 0x33, 0xd0, 0x19, 0xd0, 0x33, 0xd0, 0x2e, 
+-	0xd0, 0x3d, 0xd0, 0x3e, 0xd0, 0x27, 0xd0, 0x3e, 
+-	0xd0, 0x3a, 0xd0, 0x2f, 0xd0, 0x32, 0x00, 0x00, 
+-	0x00, 0x00, 0x46, 0x44, 0x00, 0x00, 0x10, 0x00, 
+-	0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 0x50, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 
+-	0x00, 0x00, 0x02, 0xd0, 0x00, 0x00, 0x02, 0xd0, 
+-	0x00, 0x00, 0x00, 0x1e, 0x00, 0x05, 0x46, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x90, 0x85, 
+-	0x00, 0x00, 0xa6, 0xee, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x02, 0xd0, 0x00, 0x00, 0x01, 0xe0, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0xa0, 
+-	0x00, 0x08, 0x08, 0x28, 0x00, 0x08, 0x88, 0x68, 
+-	0x00, 0x08, 0xa0, 0x98, 0x00, 0x08, 0x88, 0x68, 
+-	0x00, 0x08, 0x28, 0x98, 0x00, 0x08, 0xac, 0xf4, 
+-	0x00, 0x08, 0xb8, 0x7c, 0x00, 0x02, 0x02, 0x88, 
+-	0x00, 0x02, 0x08, 0x22, 0x00, 0x02, 0x88, 0xaa, 
+-	0x00, 0x02, 0x22, 0xaa, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x24, 
+-	0x00, 0x04, 0x04, 0x24, 0x00, 0x04, 0x28, 0x6c, 
+-	0x00, 0x04, 0x28, 0x6c, 0x00, 0x01, 0x10, 0x44, 
+-	0x00, 0x01, 0x20, 0x44, 0x00, 0x01, 0x11, 0xaa, 
+-	0x00, 0x01, 0x88, 0x55, 0x00, 0x01, 0x44, 0xaa, 
+-	0x00, 0x01, 0x44, 0x55, 0x00, 0x20, 0x80, 0xa0, 
+-	0x00, 0x20, 0x80, 0xc0, 0x00, 0x20, 0x20, 0xa0, 
+-	0x00, 0x20, 0x40, 0xc0, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xe0, 
+-	0x00, 0x00, 0x01, 0xe0, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x13, 0x16, 
+-	0x1a, 0x1b, 0x1d, 0x22, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x13, 0x16, 
+-	0x1a, 0x1b, 0x1d, 0x22, 0x10, 0x10, 0x16, 0x18, 
+-	0x1b, 0x1d, 0x22, 0x25, 0x13, 0x16, 0x1a, 0x1b, 
+-	0x1d, 0x22, 0x22, 0x26, 0x16, 0x16, 0x1a, 0x1b, 
+-	0x1d, 0x22, 0x25, 0x28, 0x16, 0x1a, 0x1b, 0x1d, 
+-	0x20, 0x23, 0x28, 0x30, 0x1a, 0x1b, 0x1d, 0x20, 
+-	0x23, 0x28, 0x30, 0x3a, 0x1a, 0x1b, 0x1d, 0x22, 
+-	0x26, 0x2e, 0x38, 0x45, 0x1b, 0x1d, 0x23, 0x26, 
+-	0x2e, 0x38, 0x45, 0x53, 0x10, 0x10, 0x10, 0x10, 
+-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
+-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
+-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
+-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
+-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
+-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
+-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
+-	0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0xd6, 0x00, 
+-	0x00, 0x1b, 0x08, 0x00, 0x00, 0x1f, 0xde, 0x00, 
+-	0x00, 0x00, 0x50, 0x00, 0x00, 0x08, 0x39, 0x00, 
+-	0x00, 0x10, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 
+-	0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 
+-	0x05, 0x28, 0x20, 0x01, 0x00, 0x00, 0x01, 0xe0, 
+-	0x71, 0x01, 0x00, 0x68, 0xe0, 0x7f, 0xb0, 0x7f, 
+-	0x60, 0x40, 0xe0, 0x1d, 0x90, 0x10, 0xb4, 0x81, 
+-	0xe8, 0xc0, 0xe0, 0xc2, 0x90, 0x18, 0x00, 0x8a, 
+-	0x70, 0xc0, 0x0f, 0x87, 0xe3, 0xe8, 0xc0, 0x00, 
+-	0x70, 0x40, 0xe0, 0x01, 0xe0, 0x86, 0x00, 0x26, 
+-	0xd0, 0x28, 0xe0, 0x0e, 0xd0, 0x0e, 0x0f, 0x0b, 
+-	0x70, 0x1d, 0xe0, 0x67, 0x0f, 0x87, 0x0f, 0x87, 
+-	0x0f, 0x87, 0x0f, 0x87, 0x0f, 0x87, 0x02, 0x20, 
+-	0xd0, 0x01, 0xe0, 0x25, 0x0f, 0x45, 0x6f, 0x81, 
+-	0xdf, 0xa6, 0xe0, 0x36, 0xe1, 0x30, 0xa0, 0x37, 
+-	0xc0, 0x00, 0xe0, 0x26, 0x00, 0x33, 0xde, 0xc8, 
+-	0xe0, 0x32, 0x0f, 0xc5, 0x0f, 0x87, 0x00, 0x27, 
+-	0xd0, 0x4c, 0xe0, 0x21, 0x00, 0x33, 0xdf, 0x28, 
+-	0x00, 0x27, 0xd0, 0x56, 0x60, 0x01, 0xe0, 0x2d, 
+-	0x03, 0xa0, 0xd0, 0x41, 0xa0, 0x78, 0x00, 0x60, 
+-	0xd0, 0x41, 0xa0, 0x77, 0x00, 0x22, 0xd0, 0x58, 
+-	0xa0, 0x76, 0x00, 0x21, 0xd0, 0x7c, 0x00, 0x4a, 
+-	0xd0, 0x72, 0x70, 0x40, 0x00, 0x06, 0x0f, 0x87, 
+-	0x00, 0x22, 0xdc, 0xf8, 0xf0, 0x4a, 0xe1, 0x70, 
+-	0x07, 0xef, 0xdd, 0xbf, 0x4f, 0x36, 0x1d, 0x99, 
+-	0x4d, 0x80, 0x10, 0x18, 0xdd, 0x50, 0x60, 0x35, 
+-	0xdd, 0x72, 0xdd, 0x10, 0x3d, 0xb4, 0xec, 0x57, 
+-	0x2d, 0x36, 0x1d, 0x03, 0xbd, 0x04, 0xe4, 0x2b, 
+-	0x01, 0x46, 0x00, 0x06, 0xac, 0xf6, 0x80, 0x3f, 
+-	0x0d, 0x0a, 0x10, 0x02, 0x7d, 0x40, 0x10, 0x1e, 
+-	0xb0, 0x20, 0xbc, 0xe0, 0x00, 0x06, 0x00, 0xc6, 
+-	0xe0, 0x52, 0xb7, 0x60, 0xb7, 0x60, 0xc0, 0x5d, 
+-	0x30, 0x5f, 0xe4, 0x72, 0xc7, 0x5e, 0x00, 0xed, 
+-	0xd0, 0x28, 0x70, 0x40, 0xb0, 0x7f, 0x60, 0x40, 
+-	0xc0, 0x1d, 0x30, 0x1c, 0xf8, 0x7e, 0x00, 0x21, 
+-	0xd0, 0x01, 0x00, 0x26, 0xd0, 0x78, 0xa0, 0x38, 
+-	0x80, 0x3f, 0x70, 0x01, 0xb0, 0x3f, 0x60, 0x01, 
+-	0x0f, 0x87, 0x80, 0x34, 0x03, 0xef, 0xd8, 0x3f, 
+-	0xa8, 0x38, 0x01, 0x35, 0xdc, 0x33, 0xe0, 0x46, 
+-	0xc0, 0x1c, 0xe4, 0xa5, 0x97, 0x2e, 0x30, 0x1c, 
+-	0xe8, 0x8e, 0x00, 0x21, 0xd0, 0x00, 0xa0, 0x38, 
+-	0xc0, 0x5d, 0x00, 0x23, 0xd0, 0x00, 0x30, 0x40, 
+-	0x30, 0x5e, 0xe4, 0x99, 0x20, 0x5e, 0xc0, 0x01, 
+-	0x30, 0x1c, 0xec, 0xa4, 0xe0, 0x9d, 0x20, 0x5f, 
+-	0xc0, 0x1c, 0x30, 0x01, 0xf4, 0xa5, 0xc0, 0x1c, 
+-	0x30, 0x1d, 0xec, 0xa4, 0xe4, 0xa5, 0x90, 0x38, 
+-	0x00, 0x1b, 0xe8, 0xa5, 0xa0, 0x66, 0xb1, 0x3f, 
+-	0xe4, 0xb3, 0xe8, 0xb1, 0xc0, 0x4b, 0x30, 0x44, 
+-	0xf8, 0xb3, 0x60, 0x45, 0xb1, 0x7c, 0x01, 0x20, 
+-	0xd0, 0x00, 0xa0, 0x05, 0x80, 0x40, 0x72, 0xc5, 
+-	0x00, 0x06, 0x90, 0x55, 0xd0, 0x01, 0x00, 0x40, 
+-	0xa0, 0x55, 0x0f, 0x87, 0x01, 0x46, 0x00, 0x06, 
+-	0x03, 0xef, 0xd0, 0x3f, 0xa0, 0x38, 0xb0, 0x01, 
+-	0xa0, 0x37, 0x80, 0x3f, 0x82, 0x34, 0x80, 0x3f, 
+-	0xf2, 0x1a, 0x80, 0x34, 0x80, 0x3f, 0xf2, 0x1a, 
+-	0xd8, 0x00, 0xd8, 0x40, 0xd8, 0x80, 0xd8, 0xc0, 
+-	0xd9, 0x00, 0xd9, 0x40, 0xd9, 0x80, 0xd9, 0xc0, 
+-	0xda, 0x00, 0xda, 0x40, 0xda, 0x80, 0xda, 0xc0, 
+-	0xdb, 0x00, 0xdb, 0x40, 0xdb, 0x80, 0xdb, 0xc0, 
+-	0xdc, 0x00, 0xdc, 0x40, 0xdc, 0x80, 0xdc, 0xc0, 
+-	0xdd, 0x00, 0xdd, 0x40, 0xdd, 0x80, 0xdd, 0xc0, 
+-	0xde, 0x00, 0xde, 0x40, 0xde, 0x80, 0xde, 0xc0, 
+-	0xdf, 0x00, 0xdf, 0x40, 0xdf, 0x80, 0xdf, 0xc0, 
+-	0xde, 0x80, 0xde, 0xc1, 0x00, 0x28, 0xd0, 0x60, 
+-	0x6e, 0x81, 0x80, 0x00, 0x80, 0x05, 0x00, 0xe3, 
+-	0xd1, 0x88, 0x00, 0x73, 0xd5, 0x80, 0x60, 0x06, 
+-	0xb1, 0xbc, 0x00, 0xfa, 0xd0, 0x80, 0x60, 0x06, 
+-	0x00, 0x26, 0xd0, 0x6c, 0x6e, 0x81, 0x04, 0x32, 
+-	0xd2, 0x00, 0x00, 0xee, 0xd1, 0x94, 0x60, 0x06, 
+-	0x00, 0xed, 0xd0, 0x50, 0x6e, 0x81, 0x00, 0x22, 
+-	0xd0, 0x70, 0x6e, 0x81, 0x00, 0xee, 0xd0, 0x74, 
+-	0x6e, 0x81, 0xd0, 0x4c, 0x6e, 0x81, 0xd0, 0x02, 
+-	0x00, 0xef, 0xd0, 0x6c, 0x60, 0x01, 0xd0, 0x03, 
+-	0x00, 0xef, 0xd0, 0x70, 0x60, 0x01, 0x00, 0xe0, 
+-	0xd0, 0x48, 0xd0, 0x02, 0x60, 0x01, 0x00, 0x32, 
+-	0xd6, 0xf0, 0xa0, 0x1c, 0x00, 0x21, 0xd0, 0x60, 
+-	0xa0, 0x76, 0x00, 0x34, 0xd5, 0x48, 0x80, 0x3f, 
+-	0x00, 0x23, 0xd0, 0x5c, 0x00, 0x4a, 0xd0, 0x72, 
+-	0x70, 0x40, 0x00, 0x06, 0x00, 0x22, 0xd1, 0xa4, 
+-	0x6e, 0xc6, 0xd0, 0x58, 0x6e, 0xc1, 0xd0, 0xc9, 
+-	0x00, 0xed, 0xd0, 0x54, 0x60, 0xc1, 0x00, 0x22, 
+-	0xd0, 0x40, 0x60, 0xc1, 0x00, 0x22, 0xd0, 0x60, 
+-	0x60, 0xc1, 0x82, 0x34, 0x80, 0x3f, 0xd6, 0xd9, 
+-	0x01, 0x20, 0xd6, 0x22, 0x16, 0x08, 0xd0, 0x5e, 
+-	0xd0, 0x2c, 0x60, 0x40, 0xd0, 0x70, 0x01, 0x74, 
+-	0xd6, 0x00, 0x60, 0x01, 0x00, 0x2b, 0xd4, 0x10, 
+-	0x00, 0x27, 0xd4, 0x60, 0x00, 0x2b, 0xd0, 0x90, 
+-	0xc0, 0xc2, 0xd1, 0x08, 0xd1, 0x44, 0xa1, 0x50, 
+-	0x00, 0x21, 0xd0, 0xb6, 0xd0, 0xd7, 0x00, 0x29, 
+-	0xd0, 0x04, 0x64, 0x00, 0xb0, 0x3c, 0x64, 0x40, 
+-	0x80, 0x34, 0x80, 0x3f, 0xd0, 0x40, 0x00, 0x35, 
+-	0xd0, 0x00, 0x60, 0x01, 0xd0, 0x48, 0x6e, 0x81, 
+-	0xd0, 0x44, 0x6e, 0x81, 0x00, 0x64, 0xd1, 0x80, 
+-	0x6e, 0x86, 0x01, 0x3c, 0xd2, 0x39, 0xe0, 0x46, 
+-	0xd0, 0x00, 0xd0, 0x40, 0xd0, 0x80, 0xd0, 0xc0, 
+-	0xd1, 0x00, 0xd1, 0x40, 0xd1, 0x80, 0xd1, 0xc0, 
+-	0xd2, 0x00, 0xd2, 0x40, 0xd2, 0x80, 0xd2, 0xc0, 
+-	0xd3, 0x00, 0xd3, 0x40, 0xd3, 0x80, 0xd3, 0xc0, 
+-	0xd4, 0x00, 0xd4, 0x40, 0xd4, 0x80, 0xd4, 0xc0, 
+-	0xd5, 0x00, 0xd5, 0x40, 0xd5, 0x80, 0xd5, 0xc0, 
+-	0xd6, 0x00, 0xd6, 0x40, 0xd6, 0x80, 0xd6, 0xc0, 
+-	0xd7, 0x00, 0xd7, 0x40, 0xd7, 0x80, 0xd7, 0xc0, 
+-	0x0f, 0xc5, 0x50, 0x00, 0x01, 0x46, 0x00, 0x06, 
+-	0xde, 0x80, 0xde, 0xc1, 0x03, 0x2f, 0xd0, 0x33, 
+-	0xa0, 0x38, 0xb0, 0x01, 0xa0, 0x37, 0x80, 0x3f, 
+-	0x08, 0x20, 0xdf, 0x00, 0x82, 0x34, 0x80, 0x3f, 
+-	0x00, 0xee, 0xd0, 0x08, 0x77, 0xc0, 0xb0, 0x04, 
+-	0x77, 0x80, 0xb0, 0x04, 0xc0, 0x5f, 0x30, 0x5e, 
+-	0x60, 0x40, 0xd7, 0x00, 0xb7, 0x01, 0x80, 0x34, 
+-	0x80, 0x3f, 0x00, 0x60, 0xd0, 0x80, 0x00, 0xec, 
+-	0xd0, 0x40, 0x60, 0x81, 0xb0, 0x7c, 0x60, 0x81, 
+-	0x00, 0xa0, 0xd0, 0x80, 0xb0, 0x74, 0x60, 0x81, 
+-	0xb0, 0x7c, 0x60, 0x81, 0x00, 0x68, 0xd0, 0x80, 
+-	0x6e, 0x82, 0x00, 0xef, 0xd0, 0x8c, 0x6e, 0x82, 
+-	0x00, 0x06, 0xd0, 0x11, 0xa0, 0x38, 0x80, 0x3f, 
+-	0x08, 0x20, 0xd0, 0x40, 0x10, 0x48, 0xa0, 0x4a, 
+-	0xa0, 0x5b, 0x0c, 0x20, 0xd0, 0x00, 0x10, 0x08, 
+-	0xa0, 0x27, 0xa0, 0x0a, 0x90, 0x4d, 0x0f, 0xff, 
+-	0xd8, 0x1f, 0x40, 0x40, 0xa0, 0x4d, 0x80, 0x0a, 
+-	0x80, 0x07, 0x80, 0x1b, 0x80, 0x27, 0x00, 0x60, 
+-	0xd0, 0x00, 0xa0, 0x09, 0x80, 0x28, 0x01, 0x20, 
+-	0xd0, 0x67, 0xa0, 0x69, 0x80, 0x2a, 0x82, 0x29, 
+-	0x80, 0x6a, 0x84, 0x29, 0xd0, 0x54, 0x10, 0x4f, 
+-	0xa0, 0x6a, 0x01, 0x20, 0xd0, 0x00, 0xa0, 0x29, 
+-	0x80, 0x2b, 0x02, 0x30, 0xd0, 0x00, 0xa0, 0x38, 
+-	0x80, 0x3f, 0x01, 0xb0, 0xd0, 0x10, 0xa0, 0x37, 
+-	0x80, 0x3f, 0x02, 0x30, 0xd0, 0x01, 0xa0, 0x38, 
+-	0x00, 0xea, 0xd0, 0x00, 0xd0, 0x4e, 0x0f, 0x0b, 
+-	0x70, 0x40, 0x00, 0x06, 0x00, 0x21, 0xd0, 0x88, 
+-	0x00, 0xe1, 0xd0, 0x60, 0x60, 0x81, 0x00, 0x2b, 
+-	0xd0, 0x80, 0x00, 0xe0, 0xd0, 0x6c, 0x60, 0x81, 
+-	0xb0, 0x7c, 0x00, 0x27, 0xd0, 0xa0, 0x60, 0x81, 
+-	0xb0, 0x7c, 0xd0, 0x82, 0x60, 0x81, 0xb0, 0x7c, 
+-	0xd0, 0x85, 0x60, 0x81, 0xb0, 0x7c, 0x03, 0xaa, 
+-	0xd0, 0x98, 0x60, 0x81, 0xb0, 0x7c, 0x6e, 0x81, 
+-	0x00, 0x27, 0xd0, 0x40, 0x6e, 0x81, 0xb0, 0x7c, 
+-	0x6e, 0x81, 0xb0, 0x7c, 0x6e, 0x81, 0x00, 0x27, 
+-	0xd1, 0x90, 0x6e, 0x86, 0x00, 0x21, 0xd1, 0xb8, 
+-	0x6e, 0x86, 0x00, 0x66, 0xd1, 0xa0, 0xd0, 0x00, 
+-	0x01, 0x26, 0xd0, 0x58, 0x30, 0x01, 0x60, 0x06, 
+-	0x00, 0xed, 0xd1, 0xbc, 0x6e, 0x86, 0x00, 0xec, 
+-	0xd1, 0xb8, 0x6e, 0x86, 0xb1, 0x84, 0x6e, 0x86, 
+-	0x00, 0xee, 0xd1, 0x84, 0x70, 0x46, 0x00, 0x65, 
+-	0xd1, 0x94, 0x60, 0x46, 0x00, 0x64, 0xd1, 0xbc, 
+-	0x6e, 0x86, 0x00, 0x65, 0xd1, 0x80, 0x6e, 0x86, 
+-	0xb1, 0xbc, 0x6e, 0x86, 0xb1, 0xbc, 0x6e, 0x86, 
+-	0x00, 0xed, 0xd1, 0xa8, 0x6e, 0x86, 0xd0, 0x0e, 
+-	0xb1, 0xbc, 0x60, 0x06, 0xb1, 0xbc, 0x60, 0x06, 
+-	0x00, 0x65, 0xd1, 0xa4, 0x60, 0x06, 0x00, 0x28, 
+-	0xd1, 0xa4, 0x6e, 0x86, 0x00, 0x27, 0xd1, 0x98, 
+-	0x6e, 0x86, 0x00, 0x64, 0xd1, 0xa4, 0x6e, 0x86, 
+-	0xd2, 0x01, 0x00, 0x64, 0xd0, 0x60, 0x62, 0x01, 
+-	0x00, 0x64, 0xd1, 0x80, 0x70, 0x46, 0x6e, 0x86, 
+-	0x00, 0xef, 0xd1, 0x98, 0x70, 0x86, 0x08, 0x20, 
+-	0xd0, 0xcf, 0x30, 0xc1, 0xea, 0x42, 0xd0, 0x81, 
+-	0x00, 0x21, 0xd1, 0xa8, 0x60, 0x86, 0x00, 0xed, 
+-	0xd1, 0xa0, 0x6e, 0xc6, 0x00, 0x65, 0xd1, 0x98, 
+-	0x6e, 0xc6, 0x00, 0x22, 0xd0, 0x00, 0xa0, 0x05, 
+-	0x80, 0x40, 0x00, 0xc6, 0x01, 0x73, 0xd4, 0x3d, 
+-	0xe0, 0x46, 0x50, 0x00, 0x08, 0x20, 0xd0, 0x00, 
+-	0x5f, 0x00, 0x00, 0x64, 0xd0, 0x60, 0x70, 0xc1, 
+-	0x00, 0xec, 0xd0, 0x40, 0x71, 0x81, 0xb0, 0x7c, 
+-	0x71, 0xc1, 0xc0, 0x87, 0x30, 0x86, 0xf9, 0x83, 
+-	0x10, 0xee, 0xe9, 0x76, 0x10, 0xe1, 0xe9, 0x76, 
+-	0xe2, 0x57, 0x00, 0x63, 0xd0, 0xbf, 0x72, 0x06, 
+-	0xb1, 0xbc, 0x41, 0x82, 0x02, 0x1b, 0xe9, 0x8d, 
+-	0x72, 0x86, 0xb1, 0xbc, 0x41, 0x82, 0xd0, 0x75, 
+-	0x30, 0x48, 0xe9, 0xfe, 0xb0, 0x7f, 0xea, 0x00, 
+-	0x02, 0x1c, 0xe9, 0x96, 0x15, 0xa3, 0xea, 0x57, 
+-	0x10, 0xf0, 0xe9, 0x9a, 0x10, 0xfa, 0xf9, 0xa1, 
+-	0x15, 0xa3, 0xea, 0x57, 0x00, 0x21, 0xd0, 0x4c, 
+-	0x70, 0x41, 0x10, 0x61, 0xfa, 0x57, 0x00, 0xed, 
+-	0xd0, 0x08, 0x70, 0x40, 0xd0, 0x85, 0x40, 0x42, 
+-	0x60, 0x40, 0x00, 0x64, 0xd0, 0x64, 0x62, 0x01, 
+-	0x12, 0x2b, 0xe9, 0xeb, 0x12, 0x3b, 0xe9, 0xd5, 
+-	0x00, 0xec, 0xd0, 0x40, 0x61, 0x81, 0x12, 0x2d, 
+-	0xe9, 0xbf, 0x12, 0x30, 0xe9, 0xd4, 0x12, 0x36, 
+-	0xe9, 0xd4, 0x12, 0x3a, 0xe9, 0xd4, 0xd0, 0x62, 
+-	0x30, 0x48, 0xe9, 0xf2, 0x12, 0x2e, 0xe9, 0xf9, 
+-	0xe1, 0x76, 0x00, 0xed, 0xd0, 0x08, 0x70, 0x40, 
+-	0xd0, 0x85, 0x40, 0x42, 0x60, 0x40, 0xb0, 0x08, 
+-	0x00, 0x21, 0xd0, 0x41, 0x60, 0x40, 0x00, 0x64, 
+-	0xd0, 0x60, 0x62, 0x01, 0xf2, 0x5a, 0x00, 0xed, 
+-	0xd0, 0x20, 0xd0, 0x41, 0x60, 0x40, 0x10, 0xe1, 
+-	0xea, 0x3a, 0xe2, 0x57, 0xe2, 0x53, 0x10, 0xee, 
+-	0xf9, 0xe9, 0x01, 0x46, 0x82, 0x34, 0x80, 0x3f, 
+-	0x97, 0x2e, 0xc7, 0x5c, 0xa7, 0x66, 0x81, 0x34, 
+-	0x80, 0x3f, 0x00, 0x21, 0xd0, 0x01, 0xa0, 0x38, 
+-	0x00, 0xc6, 0x00, 0x21, 0xd0, 0x15, 0x0b, 0x09, 
+-	0x00, 0x4d, 0xb0, 0x01, 0xed, 0xe5, 0xd2, 0x1a, 
+-	0xe1, 0xec, 0xf1, 0x18, 0x00, 0xec, 0xd0, 0x40, 
+-	0x71, 0x81, 0xd0, 0x4e, 0x60, 0x46, 0xe2, 0x54, 
+-	0xc0, 0x0a, 0x10, 0x06, 0x52, 0x80, 0x00, 0xed, 
+-	0xd0, 0x40, 0x62, 0x81, 0xe2, 0x53, 0x00, 0x64, 
+-	0xd0, 0x60, 0x62, 0x01, 0xf2, 0x5a, 0xe1, 0x70, 
+-	0x12, 0xa3, 0xf6, 0x57, 0x15, 0xa1, 0xfa, 0x57, 
+-	0x12, 0xa0, 0xea, 0x23, 0x00, 0x65, 0xd1, 0x1c, 
+-	0xd0, 0x75, 0x30, 0x48, 0xea, 0x0a, 0xb1, 0x3c, 
+-	0x71, 0x04, 0x11, 0x20, 0xfa, 0x11, 0x00, 0xec, 
+-	0xd0, 0x40, 0x61, 0x81, 0xe2, 0x57, 0x12, 0xa1, 
+-	0xea, 0x33, 0x00, 0xe2, 0xd0, 0x60, 0x70, 0x01, 
+-	0xb0, 0x7c, 0x70, 0x41, 0x10, 0x0c, 0x50, 0x40, 
+-	0x0c, 0x30, 0xd0, 0x00, 0x31, 0x01, 0xee, 0x21, 
+-	0x21, 0x00, 0xe6, 0x57, 0xe2, 0x23, 0x31, 0x00, 
+-	0xfe, 0x57, 0xd0, 0x75, 0x30, 0x48, 0xea, 0x28, 
+-	0xf2, 0x5a, 0xe2, 0x0d, 0x00, 0xec, 0xd0, 0x40, 
+-	0x71, 0x81, 0x00, 0x63, 0xd1, 0x3f, 0xb1, 0xbc, 
+-	0x41, 0x84, 0x61, 0x81, 0xd0, 0x50, 0x60, 0x46, 
+-	0xe2, 0x57, 0x00, 0xed, 0xd0, 0x7c, 0x70, 0x41, 
+-	0x08, 0x20, 0xd0, 0x00, 0x10, 0x08, 0xe2, 0x1c, 
+-	0xd2, 0x84, 0x00, 0xed, 0xd1, 0xa4, 0x62, 0x86, 
+-	0xd5, 0x00, 0xb5, 0x01, 0x01, 0x46, 0x82, 0x34, 
+-	0x80, 0x3f, 0xc7, 0x5e, 0x97, 0x2e, 0x81, 0x34, 
+-	0x80, 0x3f, 0x02, 0xe8, 0xd0, 0x30, 0xa0, 0x37, 
+-	0xa0, 0x38, 0x08, 0x20, 0xdf, 0x00, 0x80, 0x73, 
+-	0x80, 0x3f, 0x00, 0xc6, 0x01, 0x7a, 0xde, 0x1a, 
+-	0xe0, 0x46, 0xf2, 0x5a, 0x00, 0x64, 0xd0, 0x60, 
+-	0x62, 0x01, 0x02, 0x3c, 0xda, 0x89, 0xe0, 0x46, 
+-	0x00, 0x28, 0xd0, 0x64, 0x70, 0x81, 0x00, 0x22, 
+-	0xd0, 0x00, 0x50, 0x80, 0x60, 0x81, 0x0f, 0xc5, 
+-	0x50, 0x00, 0x50, 0x00, 0x00, 0xed, 0xd1, 0xa4, 
+-	0x72, 0x86, 0x00, 0xef, 0xd1, 0x90, 0x70, 0x46, 
+-	0x10, 0x5c, 0x10, 0x65, 0xed, 0x7d, 0xd0, 0x46, 
+-	0xc0, 0x0a, 0x10, 0x40, 0x60, 0x46, 0x00, 0x22, 
+-	0xd0, 0x73, 0x30, 0x54, 0xe9, 0x8e, 0x12, 0xa4, 
+-	0xe9, 0xb5, 0x15, 0x20, 0xe9, 0xc0, 0xb0, 0x7b, 
+-	0xe9, 0xc3, 0xb0, 0x41, 0xe9, 0xc9, 0xc0, 0x54, 
+-	0x10, 0x5c, 0x10, 0x6e, 0xe9, 0xc6, 0xe1, 0xb5, 
+-	0x00, 0x28, 0xd1, 0xb0, 0xd0, 0x00, 0x60, 0x06, 
+-	0x12, 0xa4, 0xf9, 0xb2, 0x00, 0xed, 0xd1, 0x9c, 
+-	0x62, 0x86, 0xd2, 0x80, 0x00, 0xed, 0xd1, 0xa4, 
+-	0x62, 0x86, 0xd0, 0x02, 0x00, 0xec, 0xd1, 0xbc, 
+-	0x60, 0x06, 0x00, 0x64, 0xd1, 0xa0, 0x72, 0x06, 
+-	0x12, 0x21, 0xf9, 0xa6, 0xd2, 0x0d, 0x62, 0x06, 
+-	0x00, 0xed, 0xd1, 0xa0, 0x61, 0x86, 0xd0, 0x0e, 
+-	0x00, 0xed, 0xd1, 0xac, 0x60, 0x06, 0xb1, 0xbc, 
+-	0x60, 0x06, 0x00, 0x65, 0xd1, 0xa4, 0x60, 0x06, 
+-	0x01, 0x7e, 0xd2, 0x31, 0xe1, 0xcb, 0x01, 0x46, 
+-	0x90, 0x49, 0x00, 0x60, 0xd0, 0x00, 0x50, 0x40, 
+-	0xa0, 0x49, 0x80, 0x3f, 0x00, 0xc6, 0x0c, 0x09, 
+-	0x05, 0x0d, 0xe1, 0x70, 0x01, 0xbe, 0xde, 0x41, 
+-	0xe1, 0xcb, 0x01, 0xbb, 0xd8, 0x10, 0xe1, 0xcb, 
+-	0x01, 0xbd, 0xd8, 0x0b, 0xe1, 0xcb, 0x03, 0xb8, 
+-	0xda, 0x10, 0x01, 0x46, 0x90, 0x49, 0x00, 0x60, 
+-	0xd1, 0x00, 0x50, 0x44, 0x30, 0x44, 0xa0, 0x49, 
+-	0x80, 0x3f, 0x00, 0xc6, 0xe0, 0x46, 0x50, 0x00, 
+-	0x50, 0x00, 0x50, 0x00, 0x01, 0xfa, 0xd2, 0x3d, 
+-	0x00, 0x25, 0xdc, 0xd8, 0xf0, 0x4a, 0x00, 0x26, 
+-	0xd0, 0x18, 0xd0, 0x40, 0x60, 0x40, 0x00, 0x28, 
+-	0xd0, 0x24, 0x70, 0x40, 0xd0, 0x82, 0x50, 0x42, 
+-	0x60, 0x40, 0x00, 0xec, 0xd0, 0xa4, 0x70, 0xc2, 
+-	0x10, 0xe0, 0xf9, 0x81, 0x00, 0xec, 0xd1, 0x98, 
+-	0xd0, 0x41, 0x60, 0x46, 0x70, 0xc2, 0x10, 0xe0, 
+-	0xe9, 0x8e, 0xd0, 0x40, 0x60, 0x46, 0xe1, 0x81, 
+-	0xd0, 0x40, 0x00, 0xe6, 0xd0, 0x10, 0x60, 0x40, 
+-	0xb0, 0x3c, 0x60, 0x40, 0xb0, 0x3c, 0x60, 0x40, 
+-	0xd0, 0xe0, 0x00, 0xea, 0xd0, 0x40, 0x00, 0xe8, 
+-	0xd0, 0x82, 0x01, 0x46, 0x70, 0x01, 0xb0, 0x7c, 
+-	0x60, 0x02, 0xb0, 0xbc, 0x00, 0x06, 0x00, 0xc6, 
+-	0xb0, 0xc1, 0xed, 0x9b, 0x80, 0x49, 0xd6, 0x44, 
+-	0xd5, 0x43, 0x00, 0xe0, 0xd1, 0x80, 0x00, 0x06, 
+-	0x0b, 0x09, 0x01, 0x0d, 0x0b, 0x09, 0x61, 0x06, 
+-	0xb1, 0xbc, 0x01, 0x4d, 0x09, 0x09, 0x61, 0x46, 
+-	0xb1, 0xbc, 0x00, 0xcd, 0x09, 0x09, 0x10, 0xe4, 
+-	0xed, 0xb8, 0x60, 0xc6, 0xb1, 0xbc, 0x00, 0xcd, 
+-	0x60, 0xc6, 0x00, 0xed, 0xd0, 0x04, 0x70, 0x00, 
+-	0x10, 0x20, 0xf9, 0xd3, 0x10, 0xe3, 0xe9, 0xc4, 
+-	0x10, 0xe6, 0xf9, 0xd3, 0x01, 0x46, 0x90, 0x10, 
+-	0x00, 0x20, 0xd0, 0x44, 0x50, 0x40, 0x00, 0xc6, 
+-	0xa0, 0x50, 0x00, 0xa0, 0xd0, 0x00, 0xa0, 0x05, 
+-	0x80, 0x40, 0x00, 0xed, 0xd1, 0xa4, 0xd0, 0x04, 
+-	0x60, 0x06, 0x00, 0xee, 0xd1, 0xac, 0x73, 0x86, 
+-	0x10, 0xe3, 0xe5, 0xde, 0xe9, 0xe3, 0x00, 0xe7, 
+-	0xd0, 0x40, 0x00, 0xae, 0xd0, 0xbb, 0xe1, 0xe7, 
+-	0x01, 0x24, 0xd0, 0x6b, 0x00, 0xea, 0xd0, 0xa6, 
+-	0xe1, 0xe7, 0x01, 0x21, 0xd0, 0x7b, 0x00, 0xe8, 
+-	0xd0, 0x90, 0x13, 0xa0, 0xf9, 0xea, 0xc0, 0x42, 
+-	0x00, 0xe0, 0xd1, 0xa8, 0x60, 0x46, 0xb1, 0x98, 
+-	0x0b, 0xc9, 0x00, 0x4d, 0x09, 0x09, 0x10, 0x44, 
+-	0x00, 0x8d, 0x20, 0x42, 0x10, 0x5f, 0x60, 0x46, 
+-	0xb1, 0xb8, 0x00, 0x90, 0xea, 0x17, 0x0a, 0x89, 
+-	0x00, 0x8d, 0x60, 0x86, 0xb1, 0xbc, 0x08, 0x49, 
+-	0x00, 0x4d, 0x60, 0x46, 0xb1, 0xbc, 0x08, 0x49, 
+-	0x00, 0x4d, 0x60, 0x46, 0x10, 0x60, 0xea, 0x0b, 
+-	0x00, 0xe8, 0xd1, 0x80, 0xf2, 0xb0, 0x10, 0x60, 
+-	0xfa, 0x17, 0x08, 0x49, 0x00, 0xe0, 0xd1, 0xa4, 
+-	0x00, 0x4d, 0x60, 0x46, 0x10, 0x60, 0xea, 0x1b, 
+-	0x00, 0xe9, 0xd1, 0x80, 0xf2, 0xb0, 0x10, 0x60, 
+-	0xea, 0x1b, 0x00, 0xe0, 0xd1, 0x88, 0xd0, 0x40, 
+-	0x60, 0x46, 0xd0, 0x00, 0x00, 0xe0, 0xd1, 0xa8, 
+-	0x70, 0x46, 0x00, 0xef, 0xd1, 0x9c, 0x70, 0x86, 
+-	0xb0, 0xb0, 0xee, 0x25, 0xd0, 0x81, 0x00, 0x90, 
+-	0xea, 0x28, 0x20, 0x01, 0x10, 0x41, 0x10, 0x9f, 
+-	0x10, 0xa0, 0xee, 0x25, 0x10, 0x1c, 0x00, 0x65, 
+-	0xd1, 0xa8, 0x60, 0x06, 0x01, 0xb4, 0xd4, 0x3a, 
+-	0xe0, 0x46, 0x50, 0x00, 0x02, 0x31, 0xdc, 0x13, 
+-	0x00, 0x27, 0xdc, 0xd8, 0xf0, 0x4a, 0x0c, 0x09, 
+-	0x00, 0x06, 0x05, 0x0d, 0x00, 0x22, 0xd0, 0x72, 
+-	0x30, 0x54, 0xe9, 0xea, 0xb0, 0x7d, 0xfa, 0x05, 
+-	0x09, 0x09, 0x01, 0xcd, 0x11, 0xe1, 0xf9, 0xc7, 
+-	0x80, 0x09, 0x80, 0x27, 0x0a, 0x09, 0xd6, 0x45, 
+-	0x00, 0xe1, 0xd1, 0xa0, 0x00, 0x4d, 0x60, 0x46, 
+-	0xb1, 0xbc, 0x08, 0x49, 0x00, 0x4d, 0x60, 0x46, 
+-	0x00, 0x50, 0xe9, 0x91, 0xd4, 0x01, 0xb1, 0xbc, 
+-	0x08, 0x89, 0x00, 0x4d, 0x60, 0x46, 0x00, 0xe0, 
+-	0xd1, 0x80, 0x08, 0x89, 0x00, 0x4d, 0x08, 0x89, 
+-	0x10, 0x4c, 0x71, 0x06, 0x21, 0x01, 0x61, 0x06, 
+-	0xb1, 0xbc, 0x00, 0x4d, 0x0b, 0x49, 0x10, 0x4c, 
+-	0x71, 0x46, 0x21, 0x41, 0x61, 0x46, 0xb1, 0xb0, 
+-	0x00, 0x4d, 0x10, 0x5f, 0x60, 0x46, 0xb1, 0xbc, 
+-	0x0a, 0x09, 0x00, 0x4d, 0x10, 0x4a, 0x70, 0x86, 
+-	0x20, 0x81, 0x60, 0x86, 0x00, 0xe1, 0xd1, 0xac, 
+-	0x08, 0x49, 0x00, 0x4d, 0x60, 0x46, 0xb1, 0xbc, 
+-	0x08, 0x89, 0x00, 0x4d, 0x60, 0x46, 0xb1, 0xbc, 
+-	0x09, 0x49, 0x00, 0x8d, 0x60, 0x86, 0xc0, 0x02, 
+-	0x00, 0xe0, 0xd1, 0xa8, 0x70, 0xc6, 0x10, 0xc0, 
+-	0xd0, 0x20, 0x30, 0x01, 0x10, 0xc0, 0x60, 0xc6, 
+-	0xe1, 0x75, 0x11, 0xe2, 0xf9, 0x75, 0x00, 0xe2, 
+-	0xd1, 0x80, 0x08, 0xc9, 0x00, 0x4d, 0x60, 0x46, 
+-	0xb1, 0xbc, 0x08, 0x49, 0x00, 0x4d, 0x60, 0x46, 
+-	0xb1, 0xbc, 0x10, 0x60, 0xf9, 0xd7, 0xb1, 0xb4, 
+-	0xe1, 0xde, 0xd2, 0x03, 0x0a, 0x09, 0x00, 0x4d, 
+-	0x60, 0x46, 0xb1, 0xbc, 0xb2, 0x01, 0xf9, 0xd8, 
+-	0x0b, 0xc9, 0x00, 0x4d, 0x10, 0x49, 0x10, 0x56, 
+-	0x60, 0x46, 0xb1, 0xbc, 0x0b, 0x89, 0x00, 0x4d, 
+-	0x10, 0x4a, 0x10, 0x56, 0x60, 0x46, 0xe1, 0x75, 
+-	0x0b, 0x2c, 0xd4, 0x40, 0xf3, 0xb0, 0xe1, 0x77, 
+-	0x00, 0xe0, 0xd0, 0x6c, 0x00, 0xe0, 0xd1, 0x80, 
+-	0xd0, 0x0a, 0xf1, 0xfe, 0x00, 0xe1, 0xd1, 0xb0, 
+-	0xd0, 0x02, 0xf1, 0xfe, 0x00, 0xe0, 0xd1, 0x80, 
+-	0x76, 0x86, 0xb1, 0xbc, 0x73, 0x46, 0xe2, 0x3c, 
+-	0x70, 0x81, 0x60, 0x86, 0xb1, 0xbc, 0xb0, 0x7c, 
+-	0xb0, 0x01, 0xed, 0xfe, 0x0f, 0xc5, 0x00, 0xe1, 
+-	0xd1, 0xa0, 0x70, 0x46, 0xd0, 0x8f, 0x40, 0x42, 
+-	0x00, 0x25, 0xd0, 0xe0, 0x00, 0x24, 0xd1, 0x20, 
+-	0x10, 0x6a, 0xea, 0x1e, 0x00, 0x66, 0xd0, 0xe0, 
+-	0x00, 0x62, 0xd1, 0x00, 0x10, 0x66, 0xea, 0x1e, 
+-	0x00, 0x6e, 0xd0, 0xc0, 0x10, 0x64, 0xea, 0x1e, 
+-	0x00, 0x2b, 0xd0, 0xd0, 0x00, 0x29, 0xd1, 0x00, 
+-	0x00, 0xe0, 0xd1, 0x80, 0x76, 0x86, 0x16, 0xa0, 
+-	0xe9, 0xee, 0x30, 0xda, 0xe5, 0xee, 0xb1, 0xbc, 
+-	0x73, 0x46, 0x13, 0x60, 0xe9, 0xee, 0x31, 0x0d, 
+-	0xe5, 0xee, 0xd0, 0x82, 0xb1, 0xbc, 0x70, 0x46, 
+-	0x10, 0x60, 0xe9, 0xee, 0xb0, 0x81, 0xee, 0x2c, 
+-	0x00, 0xe0, 0xd0, 0x40, 0x00, 0xe0, 0xd1, 0xac, 
+-	0xd0, 0x0a, 0xf1, 0xfe, 0x00, 0xe1, 0xd0, 0x70, 
+-	0xd0, 0x02, 0xf1, 0xfe, 0x00, 0xec, 0xd1, 0x98, 
+-	0xd0, 0x40, 0x60, 0x46, 0x00, 0xe0, 0xd0, 0x8c, 
+-	0x70, 0x82, 0x00, 0x21, 0xd0, 0x70, 0x60, 0x81, 
+-	0xd0, 0x40, 0x00, 0x25, 0xd0, 0x20, 0x30, 0x1a, 
+-	0xfa, 0x50, 0x00, 0x23, 0xd0, 0x30, 0x30, 0x0d, 
+-	0xfa, 0x50, 0xd0, 0x41, 0x00, 0x21, 0xd1, 0x84, 
+-	0x60, 0x46, 0xb6, 0xb1, 0x16, 0x9c, 0x01, 0x7a, 
+-	0xde, 0x1a, 0xe0, 0x46, 0x02, 0x31, 0xdc, 0x13, 
+-	0x00, 0x27, 0xdc, 0xd8, 0xf0, 0x4a, 0x00, 0xec, 
+-	0xd0, 0xa8, 0x70, 0xc2, 0x10, 0xe0, 0xf9, 0x77, 
+-	0x00, 0xec, 0xd1, 0x9c, 0xd0, 0x41, 0x60, 0x46, 
+-	0x70, 0xc2, 0x10, 0xe0, 0xe9, 0x84, 0xd0, 0x40, 
+-	0x60, 0x46, 0xe1, 0x77, 0x0b, 0x49, 0x00, 0xe2, 
+-	0xd1, 0xa0, 0x00, 0x4d, 0x10, 0x5f, 0x00, 0x6f, 
+-	0xd0, 0xff, 0x40, 0x43, 0x60, 0x46, 0xb1, 0xbc, 
+-	0x0b, 0x09, 0x00, 0x4d, 0x60, 0x46, 0xb1, 0xbc, 
+-	0x08, 0x89, 0x00, 0x4d, 0x60, 0x46, 0x10, 0x61, 
+-	0xf9, 0x9b, 0xd3, 0xc2, 0x00, 0xec, 0xd1, 0xbc, 
+-	0x63, 0xc6, 0x0c, 0x09, 0x90, 0x4d, 0x10, 0x60, 
+-	0xe5, 0x9c, 0x00, 0x06, 0x05, 0x0d, 0x00, 0x22, 
+-	0xd0, 0x72, 0x30, 0x54, 0xf9, 0xa9, 0x0b, 0xa0, 
+-	0xd4, 0x40, 0xf3, 0xb0, 0xe1, 0xa0, 0x00, 0xec, 
+-	0xd1, 0x9c, 0xd0, 0x40, 0x60, 0x46, 0x01, 0x7a, 
+-	0xde, 0x1a, 0xe0, 0x46, 0x0b, 0x09, 0x00, 0x4d, 
+-	0x0b, 0x09, 0x00, 0x4d, 0x0a, 0x09, 0x01, 0x4d, 
+-	0x0a, 0x09, 0x00, 0x4d, 0x01, 0x59, 0xe9, 0x96, 
+-	0x09, 0x09, 0x00, 0x4d, 0x10, 0x5f, 0x10, 0x61, 
+-	0xf9, 0x96, 0x09, 0x09, 0x01, 0x4d, 0x11, 0x5f, 
+-	0x0b, 0xc9, 0x00, 0x4d, 0xc0, 0x01, 0x10, 0x5f, 
+-	0x11, 0x4e, 0x51, 0x41, 0x08, 0x49, 0x00, 0x4d, 
+-	0x0b, 0xc9, 0x10, 0x0f, 0x00, 0x4d, 0x50, 0x01, 
+-	0x00, 0xed, 0xd1, 0xb6, 0x01, 0x46, 0x00, 0x06, 
+-	0xa0, 0x3c, 0xa1, 0x7d, 0x60, 0x06, 0x00, 0xc6, 
+-	0xd5, 0x00, 0xb5, 0x01, 0x01, 0x7a, 0xde, 0x1a, 
+-	0xe0, 0x46, 0x50, 0x00, 0x00, 0xec, 0xd0, 0xac, 
+-	0x70, 0xc2, 0x10, 0xe0, 0xf9, 0x70, 0x00, 0xec, 
+-	0xd1, 0xa0, 0xd0, 0x41, 0x60, 0x46, 0x70, 0xc2, 
+-	0x10, 0xe0, 0xe9, 0x7f, 0xd0, 0x40, 0x60, 0x46, 
+-	0xe1, 0x70, 0x0a, 0x89, 0x0b, 0xcd, 0x00, 0xe3, 
+-	0xd1, 0x80, 0x6b, 0xc6, 0x08, 0xc9, 0x05, 0x8d, 
+-	0x15, 0xa3, 0xee, 0x6e, 0x15, 0xa0, 0xea, 0x6e, 
+-	0x90, 0x4d, 0xd0, 0x9f, 0xd0, 0xdf, 0x40, 0x81, 
+-	0x10, 0x55, 0x40, 0xc1, 0x01, 0x46, 0x82, 0x34, 
+-	0x80, 0x3f, 0xc8, 0x1d, 0x81, 0x34, 0x80, 0x3f, 
+-	0x00, 0xc6, 0xd1, 0x23, 0x31, 0x03, 0x11, 0x02, 
+-	0x38, 0x04, 0xb0, 0x8d, 0x10, 0x9d, 0x28, 0x02, 
+-	0xc0, 0x60, 0x00, 0x65, 0xd1, 0x94, 0x71, 0x06, 
+-	0x68, 0x06, 0x30, 0x44, 0x00, 0xed, 0xd1, 0xa8, 
+-	0x70, 0x06, 0x10, 0x20, 0xe9, 0xb0, 0x00, 0xee, 
+-	0xd0, 0xc0, 0x70, 0xc3, 0x20, 0x43, 0xb0, 0x01, 
+-	0xf9, 0xac, 0x60, 0x06, 0x00, 0x64, 0xd1, 0xbc, 
+-	0x71, 0x06, 0xc0, 0x04, 0x21, 0x01, 0x61, 0x06, 
+-	0x10, 0x20, 0xf5, 0xbb, 0x11, 0x20, 0xe5, 0xbb, 
+-	0xb0, 0x41, 0x00, 0x65, 0xd1, 0x80, 0x71, 0x06, 
+-	0x21, 0x01, 0x61, 0x06, 0x00, 0xed, 0xd1, 0xac, 
+-	0x71, 0x06, 0x15, 0xa1, 0xe9, 0xcb, 0xb1, 0x3f, 
+-	0x61, 0x06, 0x15, 0xa3, 0xf9, 0xd6, 0xd0, 0xbf, 
+-	0xe1, 0xd3, 0xd0, 0x40, 0x60, 0x46, 0xb1, 0xbc, 
+-	0x70, 0x86, 0x61, 0x06, 0x31, 0x02, 0xe5, 0xd3, 
+-	0x20, 0x84, 0x00, 0x65, 0xd1, 0xa4, 0x60, 0x86, 
+-	0xd9, 0x40, 0x00, 0xec, 0xd1, 0x94, 0x79, 0x06, 
+-	0xb1, 0x84, 0x78, 0xc6, 0xc0, 0x63, 0x30, 0x64, 
+-	0xe9, 0xf8, 0x00, 0xa7, 0xd0, 0xff, 0x7a, 0x63, 
+-	0x00, 0x65, 0xd0, 0x00, 0x71, 0x00, 0x31, 0x29, 
+-	0xe5, 0xf8, 0xc0, 0x63, 0xc8, 0xc1, 0xb0, 0x78, 
+-	0x40, 0x43, 0xc0, 0xa4, 0x30, 0x81, 0xe9, 0xf2, 
+-	0x7a, 0x41, 0x31, 0x29, 0xf5, 0xe8, 0x21, 0x29, 
+-	0x61, 0x00, 0xb8, 0xfc, 0x79, 0x63, 0xb8, 0xfc, 
+-	0x48, 0xc3, 0x68, 0xc6, 0x00, 0xed, 0xd1, 0xb8, 
+-	0x69, 0x46, 0x80, 0x28, 0x0b, 0xc9, 0x00, 0x4d, 
+-	0x08, 0x49, 0x10, 0x41, 0x00, 0xe3, 0xd1, 0x84, 
+-	0x00, 0x8d, 0x20, 0x42, 0x60, 0x46, 0x00, 0xee, 
+-	0xd1, 0xa4, 0x70, 0x86, 0x10, 0xa1, 0xee, 0x18, 
+-	0xe6, 0x6b, 0x90, 0x86, 0x00, 0x90, 0xea, 0x18, 
+-	0x00, 0xed, 0xd0, 0x1c, 0x70, 0x80, 0xb0, 0x81, 
+-	0xe6, 0x6b, 0x60, 0x80, 0xb1, 0xa8, 0x70, 0x86, 
+-	0x10, 0xa0, 0xfa, 0x6b, 0x00, 0x21, 0xd0, 0x38, 
+-	0x70, 0x80, 0x10, 0xa0, 0xfa, 0x6b, 0x0f, 0xef, 
+-	0xd0, 0xbf, 0x30, 0x81, 0xfa, 0x22, 0x60, 0x00, 
+-	0x08, 0x20, 0xd0, 0x00, 0x5f, 0x00, 0x15, 0xa3, 
+-	0xea, 0x6b, 0x00, 0xee, 0xd1, 0x80, 0x79, 0x46, 
+-	0x00, 0xf8, 0xd0, 0x00, 0xc4, 0x40, 0x00, 0xe3, 
+-	0xd1, 0x84, 0x78, 0x46, 0x0f, 0xef, 0xd0, 0x3f, 
+-	0x30, 0x21, 0xea, 0x48, 0x00, 0xe0, 0xd1, 0x90, 
+-	0x78, 0x06, 0xc0, 0xa1, 0x18, 0x43, 0x28, 0x42, 
+-	0x18, 0x43, 0x28, 0x42, 0x18, 0x1e, 0xd8, 0x80, 
+-	0x08, 0x11, 0xea, 0x41, 0x28, 0xa1, 0x18, 0x01, 
+-	0x18, 0x5f, 0x18, 0x60, 0xee, 0x3e, 0xc0, 0x51, 
+-	0x30, 0x62, 0xee, 0x4e, 0xc8, 0x91, 0x18, 0x9f, 
+-	0x00, 0x21, 0xd1, 0xb8, 0xd0, 0x01, 0x60, 0x06, 
+-	0x00, 0xef, 0xd0, 0x10, 0xd0, 0x72, 0x60, 0x40, 
+-	0x01, 0x46, 0x82, 0x34, 0x80, 0x3f, 0xc8, 0xdc, 
+-	0xc9, 0x1d, 0x81, 0x34, 0x80, 0x3f, 0x00, 0xc6, 
+-	0x38, 0xe4, 0xee, 0x5e, 0xea, 0x52, 0x28, 0xe5, 
+-	0x01, 0x46, 0x90, 0x6d, 0x28, 0xc1, 0x00, 0xc6, 
+-	0x38, 0xe2, 0xf6, 0x6b, 0xdb, 0x08, 0xf1, 0x16, 
+-	0xf1, 0x18, 0x00, 0x21, 0xd1, 0xb4, 0x61, 0x86, 
+-	0xe2, 0x52, 0x01, 0xf7, 0xd0, 0x19, 0xe0, 0x46, 
+-	0xd5, 0x00, 0xb5, 0x01, 0x01, 0x7a, 0xde, 0x1a, 
+-	0xe0, 0x46, 0x50, 0x00, 0x02, 0x31, 0xdc, 0x13, 
+-	0x00, 0x27, 0xdc, 0xd8, 0xf0, 0x4a, 0xdb, 0x09, 
+-	0x00, 0xe3, 0xd0, 0x1c, 0x6b, 0x00, 0xda, 0xc1, 
+-	0x00, 0xe6, 0xd1, 0x98, 0x70, 0x06, 0xb1, 0x84, 
+-	0x60, 0x06, 0xb1, 0x84, 0x60, 0x06, 0x05, 0x9f, 
+-	0xe9, 0x9f, 0x08, 0x49, 0xd1, 0x17, 0x46, 0x44, 
+-	0x00, 0x4d, 0x10, 0x43, 0x26, 0x41, 0x08, 0xc9, 
+-	0x05, 0xcd, 0xb5, 0xc1, 0xe5, 0xcc, 0xc0, 0x57, 
+-	0x15, 0xc6, 0x25, 0xc1, 0x15, 0xa3, 0xf9, 0x9f, 
+-	0x08, 0x49, 0xd1, 0x0f, 0x46, 0x44, 0x00, 0x4d, 
+-	0x10, 0x44, 0x26, 0x41, 0x08, 0xc9, 0x06, 0x0d, 
+-	0xb6, 0x01, 0xe5, 0xcc, 0xc0, 0x58, 0x16, 0x06, 
+-	0x26, 0x01, 0x08, 0x49, 0x00, 0x4d, 0x10, 0x60, 
+-	0xe9, 0xa6, 0x0a, 0x09, 0x00, 0x4d, 0xe1, 0x9f, 
+-	0x0c, 0x09, 0x90, 0x4d, 0x10, 0x60, 0xe5, 0xa7, 
+-	0x00, 0x06, 0x05, 0x0d, 0x00, 0x22, 0xd0, 0x72, 
+-	0x30, 0x54, 0xf9, 0xb3, 0xd4, 0x40, 0xf3, 0xb0, 
+-	0xe1, 0xab, 0xb0, 0x7d, 0xf9, 0xb8, 0x02, 0x34, 
+-	0xd2, 0x44, 0xe0, 0x46, 0x00, 0xec, 0xd1, 0xa0, 
+-	0xd0, 0x40, 0x60, 0x46, 0x02, 0x3c, 0xda, 0x89, 
+-	0x00, 0xec, 0xd1, 0x80, 0x70, 0x46, 0xb1, 0xbc, 
+-	0x70, 0x86, 0x30, 0x81, 0xe8, 0x46, 0x15, 0x63, 
+-	0xe9, 0xc9, 0x05, 0x5e, 0xe8, 0x46, 0x01, 0x73, 
+-	0xd4, 0x3d, 0xe0, 0x46, 0xd5, 0x00, 0xb5, 0x01, 
+-	0x01, 0x7a, 0xde, 0x1a, 0xe0, 0x46, 0x50, 0x00, 
+-	0x50, 0x00, 0x50, 0x00, 0xcc, 0xc0, 0xcd, 0x01, 
+-	0xcd, 0x42, 0xcd, 0x83, 0x00, 0xa0, 0xd0, 0x01, 
+-	0xa0, 0x38, 0xc8, 0x7f, 0xc8, 0x06, 0xb1, 0xbe, 
+-	0xf3, 0x96, 0xc8, 0x80, 0xf3, 0x92, 0x58, 0x80, 
+-	0xf3, 0x96, 0xc8, 0xc0, 0xf3, 0x96, 0xc9, 0x00, 
+-	0xf3, 0x92, 0x58, 0xc0, 0xf3, 0x96, 0xc9, 0x40, 
+-	0xf3, 0x92, 0x59, 0x40, 0xc0, 0x22, 0xc0, 0x65, 
+-	0xc0, 0x86, 0xf3, 0x9a, 0xf3, 0x96, 0xc8, 0x80, 
+-	0xf3, 0x92, 0x59, 0x00, 0xf3, 0x96, 0xc9, 0x40, 
+-	0xf3, 0x96, 0xc9, 0x80, 0xf3, 0x92, 0x59, 0x40, 
+-	0xf3, 0x96, 0xc9, 0xc0, 0xf3, 0x92, 0x58, 0x80, 
+-	0xc0, 0x23, 0xc0, 0x62, 0xd0, 0x88, 0x20, 0x86, 
+-	0xf3, 0x9a, 0xf3, 0x96, 0xc8, 0xc0, 0xf3, 0x92, 
+-	0x58, 0xc0, 0xf3, 0x96, 0xc8, 0x80, 0xf3, 0x92, 
+-	0x59, 0xc0, 0xc0, 0x24, 0xc0, 0x67, 0xd0, 0x90, 
+-	0x20, 0x86, 0xf3, 0x9a, 0xf3, 0x96, 0xc9, 0x00, 
+-	0xf3, 0x92, 0x59, 0x80, 0xf3, 0x96, 0xc9, 0xc0, 
+-	0xf3, 0x96, 0xca, 0x00, 0xf3, 0x92, 0x59, 0xc0, 
+-	0xf3, 0x96, 0xca, 0x40, 0xf3, 0x92, 0x59, 0x00, 
+-	0xc0, 0x25, 0xc0, 0x64, 0xd0, 0x98, 0x20, 0x86, 
+-	0xf3, 0x9a, 0xf3, 0x96, 0xc9, 0x40, 0xf3, 0x92, 
+-	0x58, 0x80, 0xf3, 0x96, 0xc9, 0x00, 0xf3, 0x92, 
+-	0x59, 0x00, 0xc0, 0x23, 0xc0, 0x64, 0xd0, 0x84, 
+-	0x20, 0x86, 0xf3, 0x9a, 0xf3, 0x96, 0xc8, 0xc0, 
+-	0xf3, 0x92, 0x59, 0x40, 0xf3, 0x96, 0xc9, 0x00, 
+-	0xf3, 0x92, 0x5a, 0x40, 0xc0, 0x26, 0xc0, 0x69, 
+-	0xd0, 0xa0, 0x20, 0x86, 0xf3, 0x9a, 0xf3, 0x96, 
+-	0xc9, 0x80, 0xf3, 0x92, 0x5a, 0x00, 0xf3, 0x96, 
+-	0xca, 0x40, 0xf3, 0x92, 0x5a, 0x40, 0xf3, 0x96, 
+-	0xca, 0x80, 0xf3, 0x92, 0x59, 0x80, 0xc0, 0x27, 
+-	0xc0, 0x66, 0xd0, 0xa8, 0x20, 0x86, 0xf3, 0x9a, 
+-	0xf3, 0x96, 0xc9, 0xc0, 0xf3, 0x92, 0x59, 0x00, 
+-	0xf3, 0x96, 0xc9, 0x80, 0xf3, 0x92, 0x58, 0xc0, 
+-	0xc0, 0x22, 0xc0, 0x63, 0xd0, 0x8c, 0x20, 0x86, 
+-	0xf3, 0x9a, 0xf3, 0x92, 0x59, 0x80, 0xc0, 0x25, 
+-	0xc0, 0x66, 0xd0, 0x94, 0x20, 0x86, 0xf3, 0x9a, 
+-	0xf3, 0x96, 0xc8, 0x80, 0xf3, 0x92, 0x59, 0xc0, 
+-	0xf3, 0x96, 0xc8, 0xc0, 0xf3, 0x92, 0x5a, 0x80, 
+-	0xc0, 0x28, 0xc0, 0x6a, 0xd0, 0xb0, 0x20, 0x86, 
+-	0xf3, 0x9a, 0xf3, 0x96, 0xc9, 0x40, 0xf3, 0x92, 
+-	0x59, 0x40, 0xc0, 0x29, 0xc0, 0x65, 0xd0, 0xb8, 
+-	0x20, 0x86, 0xf3, 0x9a, 0xf3, 0x96, 0xc9, 0x80, 
+-	0xf3, 0x92, 0x58, 0xc0, 0xf3, 0x96, 0xca, 0x00, 
+-	0xf3, 0x92, 0x58, 0x80, 0xc0, 0x24, 0xc0, 0x62, 
+-	0xd0, 0x9c, 0x20, 0x86, 0xf3, 0x9a, 0xf3, 0x92, 
+-	0x5a, 0x00, 0xc0, 0x27, 0xc0, 0x68, 0xd0, 0xa4, 
+-	0x20, 0x86, 0xf3, 0x9a, 0xf3, 0x96, 0xca, 0x80, 
+-	0xf3, 0x92, 0x59, 0x80, 0xf3, 0x96, 0xca, 0x40, 
+-	0xf3, 0x92, 0x5a, 0x40, 0xf3, 0x96, 0xc9, 0x40, 
+-	0xf3, 0x92, 0x5a, 0x80, 0xc0, 0x23, 0xc0, 0x6a, 
+-	0xd0, 0xac, 0x20, 0x86, 0xf3, 0x9a, 0xf3, 0x92, 
+-	0x59, 0x40, 0xc0, 0x26, 0xc0, 0x65, 0xd0, 0xb4, 
+-	0x20, 0x86, 0xf3, 0x9a, 0xf3, 0x96, 0xc9, 0x00, 
+-	0xf3, 0x92, 0x59, 0x00, 0xc0, 0x29, 0xc0, 0x64, 
+-	0xd0, 0xbc, 0x20, 0x86, 0xf3, 0x9a, 0xc0, 0x33, 
+-	0xc0, 0x74, 0xc0, 0xb5, 0xc0, 0xf6, 0xd0, 0x40, 
+-	0x00, 0xa0, 0xd8, 0x00, 0xa8, 0x38, 0x08, 0x45, 
+-	0x0a, 0x09, 0x00, 0x0d, 0x0f, 0xc5, 0x50, 0x00, 
+-	0x0a, 0x09, 0x00, 0x0d, 0x10, 0x08, 0x0f, 0xc5, 
+-	0x01, 0x46, 0x00, 0x06, 0xa0, 0x7c, 0xa0, 0x3d, 
+-	0x60, 0x42, 0x00, 0xc6, 0x0f, 0xc5, 0x50, 0x00, 
+-	0x50, 0x00, 0x50, 0x00, 0x14, 0x48, 0xd0, 0x81, 
+-	0x00, 0xef, 0xd1, 0x8c, 0x71, 0x46, 0x11, 0x60, 
+-	0xfb, 0xb1, 0x60, 0x86, 0x71, 0x46, 0x31, 0x42, 
+-	0xfb, 0xb1, 0x00, 0xec, 0xd1, 0x0c, 0x74, 0x84, 
+-	0x00, 0x68, 0xd0, 0x80, 0x70, 0x02, 0x10, 0x20, 
+-	0xfb, 0xc4, 0xc4, 0x82, 0xc4, 0xd2, 0xb4, 0xfc, 
+-	0xda, 0x00, 0xda, 0x4f, 0x0a, 0x09, 0x0f, 0xef, 
+-	0xd0, 0x3f, 0xb4, 0x7f, 0xca, 0x29, 0x1a, 0x18, 
+-	0x4a, 0x00, 0x1a, 0x48, 0x00, 0x8d, 0x2a, 0x42, 
+-	0xd0, 0x03, 0x40, 0x11, 0xfb, 0xe3, 0xb4, 0x44, 
+-	0x00, 0xa0, 0xd0, 0xc0, 0x30, 0xd3, 0xff, 0xe3, 
+-	0xb4, 0xfe, 0x01, 0x46, 0x00, 0x06, 0xaa, 0x3d, 
+-	0xaa, 0x7c, 0x6a, 0x53, 0x00, 0xc6, 0xb4, 0xfe, 
+-	0xb4, 0x7c, 0x1a, 0x61, 0xfb, 0xc8, 0xb4, 0x43, 
+-	0x00, 0xef, 0xd0, 0x3f, 0x40, 0x11, 0xeb, 0xf7, 
+-	0xb0, 0xc4, 0xe7, 0xf7, 0xeb, 0xee, 0x61, 0x53, 
+-	0x64, 0x52, 0x64, 0xc4, 0x00, 0x28, 0xd1, 0x24, 
+-	0x70, 0x04, 0x00, 0x21, 0xd0, 0x80, 0x50, 0x02, 
+-	0x60, 0x04, 0x61, 0x46, 0x0a, 0x09, 0x0f, 0xc5, 
+-	0x50, 0x00, 0x50, 0x00, 0x02, 0x31, 0xdc, 0x13, 
+-	0x00, 0x27, 0xdc, 0xd8, 0xf0, 0x4a, 0x01, 0xfa, 
+-	0xd2, 0x3d, 0x00, 0x25, 0xdc, 0xd8, 0xf0, 0x4a, 
+-	0x09, 0x09, 0x01, 0xcd, 0x11, 0xe8, 0xf9, 0xe2, 
+-	0x00, 0xe3, 0xd1, 0x9c, 0x09, 0x09, 0x05, 0xcd, 
+-	0xb5, 0xc1, 0x09, 0x09, 0x00, 0x4d, 0xb0, 0x41, 
+-	0x10, 0x46, 0x25, 0xc1, 0x09, 0x09, 0x06, 0x0d, 
+-	0xb6, 0x01, 0x09, 0x09, 0x00, 0x4d, 0x08, 0x89, 
+-	0xb0, 0x41, 0x10, 0x46, 0x26, 0x01, 0x00, 0x8d, 
+-	0x08, 0x89, 0x10, 0x82, 0xd0, 0x04, 0xc0, 0x55, 
+-	0x00, 0x40, 0x40, 0x40, 0x05, 0x4d, 0x08, 0x49, 
+-	0x0b, 0x0d, 0xd1, 0x00, 0x15, 0x63, 0xe9, 0xa2, 
+-	0xd1, 0x01, 0x55, 0x41, 0xdb, 0x01, 0x4b, 0x15, 
+-	0xa1, 0x1b, 0x08, 0x89, 0x00, 0x4d, 0x08, 0x49, 
+-	0x10, 0x41, 0xd1, 0x19, 0x46, 0x44, 0x26, 0x41, 
+-	0x00, 0xcd, 0x08, 0x49, 0x10, 0xc4, 0x00, 0x4d, 
+-	0x08, 0x49, 0x10, 0x41, 0x20, 0x81, 0xa0, 0x89, 
+-	0x00, 0x4d, 0x10, 0x43, 0x20, 0xc1, 0xa0, 0xe8, 
+-	0x08, 0x49, 0x00, 0x4d, 0x1b, 0x03, 0x5b, 0x01, 
+-	0xbb, 0x3f, 0x6b, 0x06, 0x08, 0x49, 0xb1, 0xbc, 
+-	0x00, 0x4d, 0x60, 0x46, 0x08, 0x49, 0xb1, 0xbc, 
+-	0x0a, 0xcd, 0x1a, 0xc2, 0x4a, 0xd9, 0x1a, 0xde, 
+-	0x6a, 0xc6, 0x08, 0x49, 0xb1, 0xbc, 0x00, 0x4d, 
+-	0x60, 0x46, 0x10, 0x60, 0xea, 0x3e, 0xb1, 0xbc, 
+-	0x08, 0x49, 0x00, 0x4d, 0x60, 0x46, 0xb1, 0xbc, 
+-	0x08, 0xc9, 0x00, 0x4d, 0x60, 0x46, 0xb1, 0xbc, 
+-	0x08, 0x49, 0x00, 0x4d, 0x60, 0x46, 0xb1, 0xbc, 
+-	0x09, 0xc9, 0x00, 0x4d, 0x60, 0x46, 0xb1, 0xbc, 
+-	0x0a, 0x09, 0x00, 0x4d, 0x60, 0x46, 0xe2, 0x3e, 
+-	0x11, 0xe3, 0xfa, 0x00, 0x00, 0xe7, 0xd0, 0xc0, 
+-	0xd0, 0x84, 0xb0, 0x81, 0xe6, 0x3e, 0x08, 0x49, 
+-	0x00, 0x4d, 0x60, 0x43, 0xb0, 0xfc, 0x10, 0x60, 
+-	0xe9, 0xe7, 0x10, 0xa3, 0xf9, 0xf4, 0x00, 0xe8, 
+-	0xd1, 0x80, 0xe1, 0xf8, 0x10, 0xa2, 0xf9, 0xfa, 
+-	0x00, 0xe9, 0xd1, 0x80, 0xf2, 0xb0, 0xe1, 0xe7, 
+-	0xd2, 0x3f, 0x0a, 0x09, 0x00, 0x4d, 0xb2, 0x01, 
+-	0xf5, 0xfb, 0xe1, 0xe7, 0x11, 0xe7, 0xfa, 0x3e, 
+-	0xd4, 0x01, 0x00, 0xe1, 0xd0, 0x24, 0x70, 0x00, 
+-	0x10, 0x21, 0xea, 0x0d, 0x15, 0x63, 0xfa, 0x0d, 
+-	0xd4, 0x03, 0x44, 0x2c, 0xb4, 0x3f, 0x00, 0xe6, 
+-	0xd1, 0x90, 0x0b, 0x09, 0x00, 0x4d, 0x09, 0x49, 
+-	0x10, 0x45, 0x00, 0x8d, 0x50, 0x81, 0xd0, 0x40, 
+-	0x10, 0x87, 0x10, 0x98, 0x30, 0x42, 0xf2, 0x61, 
+-	0x60, 0x46, 0xb1, 0xbc, 0x0b, 0x09, 0x00, 0x0d, 
+-	0x09, 0x49, 0x00, 0x0d, 0xb4, 0x01, 0xfa, 0x0f, 
+-	0x00, 0xe6, 0xd0, 0x18, 0x30, 0x06, 0xe6, 0x29, 
+-	0x60, 0x46, 0xb1, 0xbc, 0xe2, 0x22, 0x00, 0xe0, 
+-	0xd1, 0x88, 0x70, 0x46, 0x10, 0x63, 0xea, 0x39, 
+-	0x10, 0x64, 0xea, 0x39, 0x00, 0xe6, 0xd1, 0x90, 
+-	0xd0, 0x00, 0x60, 0x06, 0xb1, 0xbc, 0x60, 0x06, 
+-	0xb1, 0xbc, 0x60, 0x06, 0xe2, 0x3e, 0x00, 0xef, 
+-	0xd1, 0x84, 0x70, 0x46, 0x10, 0x60, 0xfa, 0x30, 
+-	0x0c, 0x09, 0x90, 0x4d, 0x10, 0x60, 0xe6, 0x3f, 
+-	0x00, 0x06, 0x05, 0x0d, 0x00, 0x22, 0xd0, 0x72, 
+-	0x30, 0x54, 0xfa, 0x4b, 0xd4, 0x40, 0xf3, 0xb0, 
+-	0xe2, 0x43, 0xb0, 0x7d, 0xe9, 0x7a, 0x00, 0xec, 
+-	0xd1, 0xa0, 0xd0, 0x40, 0x60, 0x46, 0x02, 0x3c, 
+-	0xda, 0x89, 0x00, 0xec, 0xd1, 0x80, 0x70, 0x46, 
+-	0xb1, 0xbc, 0x70, 0x86, 0x30, 0x81, 0xe8, 0x46, 
+-	0x15, 0x63, 0xea, 0x5e, 0x05, 0x5e, 0xe8, 0x46, 
+-	0x01, 0x73, 0xd4, 0x3d, 0xe0, 0x46, 0x00, 0xe0, 
+-	0xd0, 0x00, 0x70, 0xc0, 0x10, 0xc1, 0x00, 0xe0, 
+-	0xd0, 0x08, 0x70, 0x00, 0x10, 0x23, 0xea, 0x75, 
+-	0xc0, 0x83, 0x10, 0x9d, 0x30, 0xc2, 0x10, 0x9f, 
+-	0x30, 0xc2, 0x00, 0xef, 0xd0, 0xac, 0x70, 0x82, 
+-	0x10, 0xa3, 0xea, 0x75, 0x10, 0xc1, 0xc0, 0x83, 
+-	0x30, 0x81, 0xe6, 0x7e, 0xc0, 0x83, 0x20, 0x81, 
+-	0xf6, 0x7f, 0xd0, 0x40, 0x30, 0x43, 0x0f, 0xc5, 
+-	0xc0, 0x43, 0x0f, 0xc5, 0x00, 0xed, 0xd1, 0xa4, 
+-	0x72, 0x86, 0x15, 0xa3, 0xee, 0x23, 0x15, 0xa1, 
+-	0xe6, 0x23, 0x08, 0x20, 0xd0, 0x00, 0x5f, 0x00, 
+-	0xd8, 0xc4, 0x15, 0x63, 0xe9, 0x7e, 0x48, 0xd5, 
+-	0x18, 0xde, 0x18, 0xe0, 0xe9, 0xc2, 0x00, 0xed, 
+-	0xd1, 0xb4, 0x79, 0xc6, 0x19, 0xe0, 0xe9, 0x8c, 
+-	0x00, 0xed, 0xd0, 0x3a, 0x79, 0xc6, 0x69, 0xc0, 
+-	0xd9, 0xc0, 0x69, 0xc6, 0x00, 0xed, 0xd0, 0x38, 
+-	0x79, 0x40, 0x19, 0x60, 0xe9, 0x98, 0x00, 0x28, 
+-	0xd0, 0x24, 0x70, 0x40, 0x02, 0x20, 0xd0, 0x80, 
+-	0x50, 0x42, 0x60, 0x40, 0x15, 0xa3, 0xe9, 0x9f, 
+-	0x00, 0xec, 0xd1, 0xb8, 0x79, 0xc6, 0x69, 0x46, 
+-	0xc9, 0x67, 0x00, 0xec, 0xd9, 0xb4, 0x70, 0x66, 
+-	0x00, 0xec, 0xd1, 0xbc, 0x70, 0x06, 0x10, 0x20, 
+-	0xed, 0xbe, 0x10, 0x60, 0xe9, 0xc1, 0x00, 0xe0, 
+-	0xda, 0xa8, 0x7a, 0xaa, 0xc0, 0x2a, 0x10, 0x1f, 
+-	0x00, 0x22, 0xd0, 0xa0, 0x70, 0x82, 0x20, 0x6a, 
+-	0x00, 0x9f, 0xe9, 0xb5, 0x20, 0x40, 0x19, 0x60, 
+-	0xf9, 0xb8, 0xc9, 0x41, 0xb0, 0x48, 0x30, 0x65, 
+-	0xf5, 0xbd, 0xb0, 0x70, 0xed, 0xbe, 0xd9, 0x40, 
+-	0x00, 0xed, 0xd1, 0xbc, 0x69, 0x46, 0x69, 0x66, 
+-	0x12, 0xa4, 0xea, 0x21, 0x00, 0xec, 0xd1, 0xbc, 
+-	0x73, 0xc6, 0x15, 0xa3, 0xe9, 0xdf, 0x33, 0xe3, 
+-	0xe5, 0xd3, 0xed, 0xd2, 0x63, 0xc6, 0x00, 0x21, 
+-	0xd1, 0xa8, 0x63, 0xc6, 0x00, 0xed, 0xd1, 0xa0, 
+-	0x63, 0xc6, 0x15, 0xa1, 0xf9, 0xdc, 0x12, 0xa3, 
+-	0xe5, 0xe3, 0xd3, 0xc2, 0x00, 0xec, 0xd1, 0xbc, 
+-	0x63, 0xc6, 0xe1, 0xe3, 0x12, 0xa3, 0xea, 0x21, 
+-	0xe1, 0xe3, 0x12, 0xa2, 0xf6, 0x21, 0x13, 0xe0, 
+-	0xfa, 0x21, 0x00, 0xee, 0xd1, 0x8c, 0x78, 0x06, 
+-	0xb1, 0xbc, 0x78, 0x46, 0xb1, 0xbc, 0x78, 0x86, 
+-	0xd1, 0x88, 0x72, 0x46, 0xd1, 0x84, 0x73, 0x06, 
+-	0x13, 0x20, 0xf9, 0xe3, 0x00, 0x64, 0xd1, 0xa0, 
+-	0x70, 0x46, 0xd0, 0xa2, 0x30, 0x81, 0xe9, 0xff, 
+-	0x10, 0x70, 0xea, 0x11, 0x10, 0x6d, 0xea, 0x14, 
+-	0x10, 0x76, 0xea, 0x19, 0x10, 0x7a, 0xea, 0x28, 
+-	0xe2, 0x3b, 0x18, 0xe0, 0xea, 0x3b, 0x00, 0xed, 
+-	0xd1, 0x80, 0x70, 0x86, 0xb0, 0x81, 0xd0, 0x3f, 
+-	0x40, 0x02, 0x10, 0x20, 0xea, 0x0c, 0x60, 0x86, 
+-	0xf3, 0x8a, 0xe1, 0xe3, 0xc0, 0x02, 0x10, 0x1a, 
+-	0x50, 0x80, 0x60, 0x86, 0xe2, 0x3b, 0x15, 0xa3, 
+-	0xea, 0x21, 0xe2, 0xe9, 0xd2, 0x80, 0x00, 0xed, 
+-	0xd1, 0xa4, 0x62, 0x86, 0xe3, 0x0c, 0x00, 0xed, 
+-	0xd1, 0x88, 0xd0, 0x60, 0x70, 0x06, 0x50, 0x40, 
+-	0x60, 0x46, 0x15, 0xa3, 0xfb, 0x0c, 0xd5, 0x84, 
+-	0xe3, 0x0c, 0xd5, 0x00, 0xb5, 0x01, 0x01, 0x7a, 
+-	0xde, 0x1a, 0xe0, 0x46, 0x00, 0xed, 0xd1, 0x88, 
+-	0xd0, 0x60, 0x70, 0x06, 0x50, 0x40, 0x60, 0x46, 
+-	0x15, 0xa2, 0xe7, 0x0c, 0xee, 0x21, 0x00, 0x21, 
+-	0xd1, 0x8c, 0x18, 0xe0, 0xfa, 0x39, 0x70, 0x46, 
+-	0x10, 0x61, 0xea, 0x70, 0xe2, 0x21, 0x65, 0x86, 
+-	0xe2, 0x21, 0x18, 0xe0, 0xea, 0x70, 0xd1, 0x80, 
+-	0x73, 0x06, 0x15, 0xa2, 0xee, 0x68, 0x00, 0x22, 
+-	0xd1, 0x80, 0x70, 0x46, 0x6b, 0x06, 0xcb, 0x01, 
+-	0xb1, 0xb4, 0x70, 0x46, 0x6a, 0xc6, 0xca, 0xc1, 
+-	0x00, 0x65, 0xd1, 0x98, 0x70, 0x46, 0x10, 0x61, 
+-	0xfa, 0x50, 0x02, 0x41, 0xc3, 0x21, 0xc7, 0xe0, 
+-	0x02, 0x50, 0xea, 0x56, 0xc3, 0x20, 0xc7, 0xe1, 
+-	0xd1, 0x88, 0xd0, 0x01, 0x02, 0x40, 0x62, 0x46, 
+-	0x0f, 0xef, 0xd0, 0x7f, 0x30, 0x6f, 0xfa, 0x5f, 
+-	0xc3, 0x20, 0xc7, 0x4c, 0xd0, 0x00, 0x00, 0x65, 
+-	0xd1, 0x98, 0x70, 0x46, 0x60, 0x06, 0xb0, 0x41, 
+-	0x43, 0x01, 0xe2, 0x70, 0xc3, 0x22, 0xc7, 0xcc, 
+-	0xc7, 0x60, 0xc7, 0xa1, 0x02, 0x50, 0xea, 0x70, 
+-	0xc7, 0x61, 0xc7, 0xa0, 0xdb, 0x80, 0xd1, 0x00, 
+-	0x00, 0xef, 0xd1, 0xa8, 0x70, 0x46, 0x10, 0x60, 
+-	0xfa, 0x7a, 0x00, 0xe0, 0xd1, 0x88, 0x70, 0x46, 
+-	0x00, 0x22, 0xd1, 0xb0, 0x70, 0x86, 0x30, 0x81, 
+-	0xea, 0x82, 0x60, 0x46, 0xd0, 0x20, 0xf3, 0x06, 
+-	0x10, 0x63, 0xea, 0x87, 0x10, 0x64, 0xea, 0x87, 
+-	0xe2, 0x95, 0x00, 0xef, 0xd1, 0x6c, 0x71, 0x45, 
+-	0xc0, 0x05, 0x30, 0x01, 0xf6, 0x95, 0xdb, 0x82, 
+-	0xd1, 0x01, 0x10, 0x63, 0xea, 0x95, 0xd1, 0x02, 
+-	0x11, 0x62, 0xea, 0x95, 0xd1, 0x03, 0xd1, 0x8c, 
+-	0x61, 0x06, 0xdb, 0x40, 0x00, 0xe0, 0xd0, 0x00, 
+-	0x71, 0x00, 0xc0, 0x84, 0x10, 0x9c, 0xb0, 0x96, 
+-	0xfa, 0xa0, 0xb1, 0x38, 0xb0, 0x96, 0xfa, 0xa3, 
+-	0xb1, 0x30, 0x00, 0x29, 0xd1, 0x84, 0x00, 0x22, 
+-	0xd0, 0x74, 0x70, 0x86, 0x70, 0xc1, 0x61, 0x06, 
+-	0x30, 0xc2, 0xea, 0xae, 0x60, 0x81, 0xdb, 0x41, 
+-	0xb0, 0x3c, 0xb1, 0xbc, 0xb0, 0x7c, 0x71, 0x00, 
+-	0x70, 0x86, 0x70, 0xc1, 0x61, 0x06, 0x30, 0xc2, 
+-	0xea, 0xb9, 0x60, 0x81, 0xdb, 0x41, 0x00, 0xee, 
+-	0xd1, 0xb4, 0x70, 0x06, 0xb1, 0xbc, 0x70, 0x46, 
+-	0x30, 0x40, 0xea, 0xc2, 0x60, 0x06, 0xdb, 0x41, 
+-	0x00, 0x23, 0xd0, 0x70, 0x30, 0x81, 0xea, 0xc7, 
+-	0x30, 0x81, 0x50, 0x02, 0xea, 0xca, 0xd0, 0x01, 
+-	0x00, 0x22, 0xd1, 0xbc, 0x70, 0x86, 0x30, 0x80, 
+-	0xea, 0xd2, 0x60, 0x06, 0xd0, 0x10, 0xf3, 0x06, 
+-	0x00, 0x22, 0xd1, 0xa4, 0x71, 0x06, 0xd0, 0x01, 
+-	0x41, 0x00, 0x5b, 0x44, 0x5b, 0x6e, 0x6b, 0x46, 
+-	0x00, 0x28, 0xd0, 0x70, 0x70, 0x41, 0x10, 0x62, 
+-	0xfa, 0xe6, 0xd1, 0x84, 0x70, 0x06, 0x10, 0x20, 
+-	0xfa, 0xdf, 0x00, 0x22, 0xd0, 0x00, 0xf3, 0x06, 
+-	0x02, 0x7d, 0xdc, 0x62, 0xe0, 0x46, 0x00, 0xed, 
+-	0xd1, 0x88, 0x71, 0x06, 0x01, 0x1f, 0xfa, 0xfd, 
+-	0xd0, 0x41, 0x41, 0x01, 0xd0, 0x62, 0x00, 0x65, 
+-	0xd0, 0x30, 0x70, 0x00, 0x10, 0x21, 0xea, 0xfa, 
+-	0xee, 0xf9, 0x1a, 0xe1, 0xfa, 0xfa, 0xd0, 0x52, 
+-	0x51, 0x01, 0x61, 0x06, 0xe3, 0x0c, 0x18, 0xe0, 
+-	0xea, 0x70, 0xc7, 0x60, 0xc7, 0xe1, 0x02, 0x50, 
+-	0xea, 0x70, 0xc7, 0x61, 0xc7, 0xe0, 0xe2, 0x70, 
+-	0x00, 0x28, 0xdc, 0xa4, 0x7c, 0x72, 0x5c, 0x40, 
+-	0x6c, 0x72, 0x0f, 0xc5, 0x18, 0xe0, 0xeb, 0x82, 
+-	0xd9, 0x0d, 0x00, 0xee, 0xd1, 0xa4, 0x70, 0x06, 
+-	0x10, 0x21, 0xfb, 0x7f, 0xd9, 0x0c, 0x90, 0x06, 
+-	0x00, 0x10, 0xeb, 0x7f, 0x00, 0x21, 0xd1, 0x88, 
+-	0x7a, 0x06, 0x1a, 0x20, 0xeb, 0x7f, 0xd9, 0x00, 
+-	0x00, 0xed, 0xd1, 0xbc, 0x79, 0x46, 0x19, 0x60, 
+-	0xeb, 0x7f, 0x39, 0x68, 0xc0, 0xe5, 0xc0, 0x25, 
+-	0x10, 0x13, 0xb0, 0x0f, 0xef, 0x7f, 0xb0, 0x22, 
+-	0xe7, 0x7f, 0x00, 0xe0, 0xd1, 0xa8, 0x71, 0x46, 
+-	0x11, 0x5f, 0x29, 0x45, 0x00, 0x22, 0xd0, 0x18, 
+-	0x00, 0x22, 0xd4, 0x54, 0x00, 0x22, 0xd0, 0x9c, 
+-	0x70, 0x00, 0x74, 0x51, 0x70, 0x42, 0x34, 0x40, 
+-	0xe7, 0x3c, 0xd0, 0x40, 0x00, 0x22, 0xd4, 0x50, 
+-	0x74, 0x51, 0x34, 0x40, 0xef, 0x42, 0x20, 0x45, 
+-	0x60, 0x42, 0x39, 0x41, 0x19, 0x60, 0xf7, 0x5e, 
+-	0x00, 0x65, 0xd1, 0xa8, 0x7a, 0x86, 0x29, 0x6a, 
+-	0x19, 0x59, 0xb9, 0x7e, 0xf7, 0x75, 0x15, 0xa3, 
+-	0xf7, 0x57, 0x00, 0xed, 0xd1, 0xac, 0x70, 0x06, 
+-	0x00, 0xed, 0xd1, 0xb0, 0x70, 0x46, 0x30, 0x01, 
+-	0xfb, 0x7f, 0x00, 0x65, 0xd1, 0x84, 0x70, 0x46, 
+-	0xb0, 0x7f, 0x60, 0x46, 0xd5, 0x84, 0xe3, 0x7f, 
+-	0x11, 0x41, 0xd0, 0x4a, 0x00, 0xed, 0xd1, 0xa0, 
+-	0x74, 0x46, 0xd0, 0x00, 0x60, 0x06, 0x30, 0xc5, 
+-	0x39, 0x45, 0xe7, 0x6e, 0x14, 0x60, 0xeb, 0x6b, 
+-	0xf3, 0x85, 0xb0, 0x41, 0xef, 0x65, 0xe3, 0x71, 
+-	0x00, 0x66, 0xd1, 0xa0, 0x60, 0xc6, 0x15, 0xa3, 
+-	0xeb, 0x7f, 0xf3, 0x85, 0xe3, 0x7f, 0xd9, 0x01, 
+-	0x00, 0x66, 0xd1, 0xa0, 0x70, 0x06, 0x30, 0x03, 
+-	0xe7, 0x7e, 0x10, 0x1d, 0x10, 0x3b, 0xe7, 0x7f, 
+-	0x60, 0xc6, 0x00, 0x66, 0xd1, 0xa4, 0x69, 0x06, 
+-	0x15, 0xa4, 0xea, 0x23, 0xe2, 0x3b, 0x00, 0x65, 
+-	0xdd, 0x08, 0x7c, 0xf4, 0xbc, 0xff, 0x6c, 0xf4, 
+-	0x00, 0xef, 0xdd, 0x10, 0x7c, 0xf4, 0xbc, 0xfe, 
+-	0x6c, 0xf4, 0xc0, 0x3f, 0xf1, 0x18, 0xf1, 0x16, 
+-	0xf1, 0x18, 0x00, 0x05, 0x08, 0x20, 0xd0, 0x40, 
+-	0x5f, 0x01, 0x15, 0x63, 0xe9, 0x77, 0x05, 0x5e, 
+-	0xea, 0xf2, 0x00, 0x22, 0xd1, 0xa0, 0x6b, 0x06, 
+-	0x00, 0x22, 0xd1, 0xa8, 0x6b, 0xc6, 0x00, 0x22, 
+-	0xd1, 0xac, 0x6a, 0xc6, 0x00, 0xee, 0xd0, 0x0c, 
+-	0x00, 0xe6, 0xd1, 0x9c, 0x70, 0x40, 0x30, 0x5f, 
+-	0xe9, 0x8d, 0xb0, 0x3c, 0xb1, 0xb4, 0x70, 0x40, 
+-	0x30, 0x5f, 0xe9, 0x8d, 0xb1, 0xb4, 0x00, 0xe6, 
+-	0xd0, 0x10, 0xd0, 0x83, 0x70, 0x40, 0x60, 0x46, 
+-	0xb0, 0x3c, 0xb1, 0xbc, 0xb0, 0x81, 0xed, 0x90, 
+-	0x00, 0xee, 0xd0, 0x0c, 0x00, 0xe6, 0xd1, 0x9c, 
+-	0x70, 0x40, 0x30, 0x4c, 0xe9, 0xa3, 0xb0, 0x3c, 
+-	0xb1, 0xb4, 0x70, 0x40, 0x30, 0x4c, 0xe9, 0xa3, 
+-	0xb1, 0xb4, 0x00, 0xe6, 0xd0, 0x00, 0x61, 0x80, 
+-	0x00, 0x21, 0xd1, 0xb4, 0x70, 0x06, 0x10, 0x20, 
+-	0xe9, 0xae, 0xd0, 0x00, 0x60, 0x06, 0xf1, 0x18, 
+-	0x00, 0x21, 0xd1, 0x8c, 0x70, 0x46, 0x65, 0x86, 
+-	0xde, 0xc0, 0x00, 0xee, 0xd0, 0x20, 0x70, 0x00, 
+-	0x10, 0x22, 0xfd, 0xb9, 0xde, 0xc2, 0x00, 0x21, 
+-	0xd0, 0x04, 0x70, 0x00, 0x10, 0x21, 0xe9, 0xc0, 
+-	0x15, 0xa3, 0xe9, 0xdc, 0xd0, 0x02, 0x4c, 0x00, 
+-	0x10, 0x63, 0xe9, 0xc5, 0xcc, 0x3b, 0xd0, 0x04, 
+-	0x63, 0x00, 0xd0, 0x00, 0x70, 0x00, 0x30, 0x1f, 
+-	0xfa, 0xf2, 0xd0, 0x18, 0x70, 0x00, 0x10, 0x20, 
+-	0xed, 0xc7, 0xd0, 0x04, 0x70, 0x80, 0x10, 0xa0, 
+-	0xea, 0xf2, 0xf1, 0x16, 0x00, 0x21, 0xd0, 0x9a, 
+-	0xc0, 0x39, 0x30, 0x1f, 0x10, 0x18, 0x30, 0x02, 
+-	0xfd, 0xcf, 0xe2, 0xf2, 0x00, 0xe0, 0xd9, 0x04, 
+-	0x79, 0x24, 0xb9, 0x38, 0x19, 0x1c, 0xd0, 0x1e, 
+-	0x30, 0x24, 0xf5, 0xe5, 0x29, 0x00, 0xdc, 0x88, 
+-	0x4c, 0xac, 0xd0, 0x02, 0x40, 0x2c, 0x10, 0x02, 
+-	0x0c, 0x80, 0x10, 0x63, 0xea, 0x5a, 0x15, 0x63, 
+-	0xf9, 0xf0, 0xf1, 0x18, 0xdc, 0x1e, 0x1e, 0xe0, 
+-	0xe9, 0xf6, 0x15, 0x63, 0xf9, 0xf6, 0xbe, 0xfc, 
+-	0xd0, 0x2c, 0x6c, 0x00, 0xcc, 0x24, 0xd9, 0x40, 
+-	0x06, 0x50, 0xea, 0x0c, 0xc0, 0x24, 0xb0, 0x0f, 
+-	0xfe, 0x0c, 0xd9, 0x74, 0x79, 0x65, 0x19, 0x5f, 
+-	0x30, 0x25, 0xee, 0x05, 0x29, 0x40, 0x19, 0x5f, 
+-	0x19, 0x41, 0xc0, 0x25, 0x20, 0x30, 0x30, 0x24, 
+-	0xe6, 0x0c, 0x3c, 0x00, 0xd0, 0x38, 0x69, 0x40, 
+-	0x1c, 0x05, 0xbc, 0x38, 0x3c, 0x32, 0x5c, 0x3b, 
+-	0xbc, 0x3f, 0xd8, 0xec, 0x78, 0xe3, 0xc0, 0xa3, 
+-	0x10, 0xaf, 0xf6, 0x19, 0xd0, 0x8f, 0x02, 0xe4, 
+-	0xd8, 0x00, 0xd0, 0xc0, 0x20, 0xe0, 0xb0, 0x81, 
+-	0xee, 0x1c, 0xd0, 0x30, 0x60, 0xc0, 0x00, 0xab, 
+-	0xd0, 0x30, 0xc0, 0xc0, 0xd8, 0x40, 0xc1, 0x23, 
+-	0xd4, 0x5e, 0x34, 0x63, 0xdc, 0x40, 0x0c, 0x1f, 
+-	0xfa, 0x45, 0xc0, 0x65, 0xb0, 0x41, 0xe6, 0x31, 
+-	0x68, 0x40, 0xb0, 0x3c, 0xe2, 0x2c, 0xc0, 0xc0, 
+-	0x34, 0x65, 0xdc, 0x48, 0x4c, 0x70, 0x1c, 0x5f, 
+-	0x20, 0xf1, 0x15, 0x63, 0xfa, 0x46, 0xf2, 0x3e, 
+-	0xc1, 0x11, 0xc0, 0x83, 0xf2, 0x8f, 0xe2, 0x59, 
+-	0xb1, 0x01, 0xe6, 0x44, 0x68, 0x40, 0x28, 0x60, 
+-	0xb0, 0x3c, 0xe2, 0x3e, 0x0f, 0xc5, 0xd9, 0x40, 
+-	0xb1, 0x0f, 0x11, 0x01, 0x21, 0x25, 0xf2, 0x3e, 
+-	0xc1, 0x11, 0xb1, 0x01, 0xe6, 0x59, 0x20, 0x31, 
+-	0x68, 0x40, 0x30, 0x31, 0xb0, 0x3c, 0x28, 0x60, 
+-	0x70, 0x43, 0x30, 0x31, 0x60, 0x40, 0x20, 0x31, 
+-	0xb0, 0x3c, 0xb0, 0xf8, 0xe2, 0x4b, 0xe2, 0xe1, 
+-	0xd8, 0xec, 0x78, 0xe3, 0x00, 0xa8, 0xd0, 0x80, 
+-	0x00, 0xa8, 0xd1, 0x44, 0x00, 0xab, 0xd0, 0x30, 
+-	0xc0, 0xc0, 0x0c, 0x1f, 0xfa, 0x9d, 0xd9, 0x78, 
+-	0x79, 0x65, 0x39, 0x25, 0x19, 0x5f, 0xc9, 0xa5, 
+-	0x19, 0x83, 0x20, 0x26, 0x20, 0xe6, 0x20, 0xa6, 
+-	0x21, 0x66, 0xc1, 0x23, 0xc0, 0x64, 0x10, 0x5f, 
+-	0x10, 0x9d, 0x20, 0x81, 0x31, 0x01, 0x30, 0x44, 
+-	0xf6, 0x78, 0x21, 0x01, 0x30, 0x84, 0x10, 0x83, 
+-	0xc4, 0x64, 0x34, 0x63, 0xdc, 0x48, 0x4c, 0x70, 
+-	0x1c, 0x5f, 0x15, 0x63, 0xfa, 0xad, 0x20, 0xb1, 
+-	0xf2, 0x8f, 0xc1, 0x24, 0x11, 0x1f, 0xc0, 0x85, 
+-	0x30, 0xb1, 0xf2, 0x8f, 0xc1, 0x11, 0xc0, 0x83, 
+-	0x0c, 0x9d, 0xfa, 0x8d, 0xb0, 0xbc, 0xf2, 0x8f, 
+-	0xe2, 0xd6, 0xb1, 0x01, 0xe6, 0x44, 0x70, 0x42, 
+-	0xb0, 0xb8, 0x60, 0x40, 0xb0, 0x3c, 0xe2, 0x8f, 
+-	0xb1, 0x01, 0xe6, 0x44, 0x70, 0x42, 0xb0, 0xb8, 
+-	0x60, 0x40, 0xb0, 0x38, 0xe2, 0x96, 0x00, 0xab, 
+-	0xd0, 0x34, 0xc1, 0x23, 0xb1, 0x0f, 0xf2, 0x96, 
+-	0xd1, 0x1e, 0x31, 0x23, 0x00, 0xa8, 0xd0, 0x84, 
+-	0xf2, 0x96, 0xd1, 0x0f, 0x00, 0xa8, 0xd0, 0x84, 
+-	0xc0, 0x03, 0xf2, 0x96, 0xe2, 0xd6, 0xd8, 0x82, 
+-	0x48, 0x95, 0x18, 0x81, 0xb1, 0x01, 0xe6, 0xc3, 
+-	0x20, 0xb1, 0x70, 0x42, 0x30, 0xb1, 0x20, 0x22, 
+-	0x60, 0x40, 0x30, 0x22, 0xb0, 0xbc, 0xb0, 0x3c, 
+-	0x30, 0xb1, 0x70, 0x42, 0x20, 0xb1, 0x30, 0x22, 
+-	0x60, 0x40, 0x20, 0x22, 0xb0, 0xbc, 0xb0, 0x3c, 
+-	0xe2, 0xb0, 0xc1, 0x11, 0xc0, 0x85, 0x30, 0xb1, 
+-	0x20, 0xe2, 0xb1, 0x01, 0xe6, 0xd6, 0x70, 0x42, 
+-	0xb0, 0xb8, 0x20, 0x22, 0x60, 0x40, 0x30, 0x22, 
+-	0xb0, 0x3c, 0x70, 0x43, 0xb0, 0xf8, 0x30, 0x22, 
+-	0x60, 0x40, 0x20, 0x22, 0xb0, 0x3c, 0xe2, 0xc7, 
+-	0xd0, 0x08, 0x5c, 0x00, 0x3c, 0x32, 0xd0, 0x04, 
+-	0x40, 0x30, 0x3c, 0x00, 0x15, 0x63, 0xfa, 0xe1, 
+-	0x1e, 0xe0, 0xea, 0xe1, 0xbc, 0x3c, 0x00, 0xab, 
+-	0xd0, 0xb0, 0x00, 0xa8, 0xd0, 0x00, 0x00, 0x20, 
+-	0xd1, 0x1e, 0x70, 0x42, 0xb0, 0xbc, 0x60, 0x40, 
+-	0xb0, 0x3c, 0xb1, 0x01, 0xee, 0xe7, 0xd0, 0x30, 
+-	0x30, 0x30, 0xee, 0xed, 0xd0, 0x04, 0x63, 0x00, 
+-	0x08, 0x20, 0xd0, 0x40, 0x3f, 0x01, 0x02, 0xba, 
+-	0xd0, 0x3c, 0xe0, 0x46, 0x01, 0x46, 0xd0, 0x08, 
+-	0x94, 0x89, 0xd0, 0x8c, 0x44, 0x82, 0x14, 0x9e, 
+-	0x30, 0x12, 0xd0, 0x88, 0x10, 0x80, 0x00, 0xe8, 
+-	0xd1, 0x80, 0x70, 0xc6, 0x00, 0x06, 0xa0, 0xbd, 
+-	0xa0, 0xfc, 0x80, 0x3f, 0xb1, 0xbe, 0x60, 0xc6, 
+-	0x00, 0x06, 0x80, 0xa9, 0x80, 0x3f, 0x80, 0x2a, 
+-	0x80, 0x3f, 0x00, 0x21, 0xd0, 0x3c, 0x00, 0x0a, 
+-	0xb1, 0x82, 0xd0, 0x6b, 0x70, 0x46, 0x00, 0x06, 
+-	0x80, 0x07, 0x01, 0x20, 0xd0, 0x67, 0xa0, 0x69, 
+-	0x80, 0x2a, 0x82, 0x29, 0x80, 0x6a, 0x84, 0x29, 
+-	0xd0, 0x54, 0x10, 0x4f, 0xa0, 0x6a, 0x01, 0x20, 
+-	0xd0, 0x00, 0xa0, 0x29, 0x80, 0x2b, 0x0c, 0x20, 
+-	0xd0, 0x00, 0x10, 0x08, 0xa0, 0x27, 0x90, 0x09, 
+-	0xd0, 0x41, 0x40, 0x01, 0xd0, 0x44, 0x40, 0x70, 
+-	0x20, 0x01, 0xa0, 0x27, 0x80, 0x3f, 0x00, 0xc6, 
+-	0x15, 0x63, 0xe9, 0xae, 0x05, 0x5e, 0xe9, 0xbe, 
+-	0x00, 0xe0, 0xd0, 0x40, 0x70, 0x81, 0x10, 0x9c, 
+-	0xb0, 0x96, 0xf9, 0xb7, 0x00, 0x21, 0xd0, 0x40, 
+-	0xe1, 0xbb, 0xb0, 0x96, 0xf9, 0xbe, 0x00, 0x22, 
+-	0xd0, 0x40, 0x27, 0xc1, 0x27, 0x41, 0x27, 0x81, 
+-	0x90, 0x83, 0x00, 0x64, 0xd0, 0x10, 0x60, 0x80, 
+-	0x01, 0x46, 0x82, 0x34, 0x80, 0x3f, 0x00, 0x64, 
+-	0xd0, 0x14, 0x67, 0x40, 0x80, 0x34, 0x80, 0x3f, 
+-	0x00, 0xc6, 0x90, 0xae, 0x00, 0x64, 0xd0, 0x18, 
+-	0x60, 0x80, 0x90, 0xa6, 0x00, 0x64, 0xd0, 0x1c, 
+-	0x60, 0x80, 0x15, 0x63, 0xe9, 0xe3, 0x0c, 0x1f, 
+-	0xe9, 0xe3, 0x05, 0x50, 0xf9, 0xe3, 0x15, 0xa3, 
+-	0xf9, 0xe3, 0x90, 0x4d, 0x10, 0x60, 0xe5, 0xdb, 
+-	0x00, 0x06, 0x05, 0x0d, 0x01, 0x7a, 0xde, 0x1a, 
+-	0xe0, 0x46, 0x15, 0xa3, 0xf9, 0xfb, 0x00, 0x21, 
+-	0xd0, 0x04, 0x70, 0x00, 0x10, 0x21, 0xe9, 0xfb, 
+-	0xd0, 0x38, 0x70, 0x00, 0x15, 0x63, 0xe9, 0xef, 
+-	0x10, 0x1f, 0x15, 0x21, 0xe5, 0xe0, 0xd0, 0x5e, 
+-	0x30, 0x54, 0xe5, 0xe0, 0xc0, 0x40, 0xb0, 0x7f, 
+-	0x30, 0x54, 0xe9, 0xfb, 0x0c, 0x09, 0x05, 0x0d, 
+-	0xe1, 0xef, 0xc0, 0x5f, 0x10, 0x58, 0x10, 0x48, 
+-	0x00, 0xee, 0xd0, 0x8c, 0xd0, 0xc3, 0x70, 0x02, 
+-	0x30, 0x01, 0xea, 0x10, 0xb0, 0xbc, 0xb0, 0xc1, 
+-	0xee, 0x01, 0x00, 0x26, 0xd0, 0x20, 0x70, 0x40, 
+-	0xb0, 0x7f, 0x60, 0x40, 0x15, 0xa3, 0xea, 0x0f, 
+-	0xb0, 0x88, 0x77, 0xc2, 0x80, 0x07, 0x09, 0x49, 
+-	0xd4, 0x00, 0xd4, 0x40, 0xd4, 0x80, 0xd4, 0xc0, 
+-	0x00, 0x4d, 0xa0, 0x6c, 0xd3, 0x80, 0xd0, 0xa1, 
+-	0x00, 0x88, 0xd0, 0xa9, 0x00, 0x4d, 0x00, 0x50, 
+-	0xfa, 0x1a, 0x0c, 0x49, 0x00, 0x8d, 0xc0, 0x42, 
+-	0x10, 0x60, 0xea, 0x2a, 0xb0, 0x5e, 0xb0, 0x43, 
+-	0xfe, 0x34, 0xd0, 0x61, 0x23, 0x81, 0xe2, 0x1f, 
+-	0x0c, 0x09, 0x05, 0x0d, 0x15, 0x20, 0xfe, 0x31, 
+-	0xd0, 0x5f, 0x30, 0x54, 0xee, 0x10, 0x03, 0xb3, 
+-	0xd8, 0x29, 0xe0, 0x46, 0xc6, 0xd4, 0xb6, 0xc1, 
+-	0xe6, 0x31, 0xd0, 0x5e, 0x30, 0x5b, 0xfe, 0x31, 
+-	0xd7, 0x00, 0xb7, 0x01, 0xd3, 0x81, 0x00, 0x27, 
+-	0xd0, 0x10, 0xd0, 0x81, 0x60, 0x80, 0x15, 0x63, 
+-	0xfa, 0x54, 0x00, 0x22, 0xdc, 0xd8, 0x03, 0xf7, 
+-	0xd2, 0x10, 0xf0, 0x4a, 0x15, 0xa3, 0xfa, 0x51, 
+-	0x02, 0xf6, 0xde, 0x26, 0x0c, 0x10, 0xf8, 0x46, 
+-	0x02, 0xfb, 0xda, 0x22, 0xe0, 0x46, 0x02, 0xf1, 
+-	0xd8, 0x2b, 0xe0, 0x46, 0x00, 0x22, 0xdc, 0xd8, 
+-	0x03, 0xf9, 0xd2, 0x10, 0xf0, 0x4a, 0x03, 0x34, 
+-	0xdc, 0x20, 0x15, 0xa3, 0xe8, 0x46, 0x02, 0xff, 
+-	0xde, 0x27, 0xe0, 0x46, 0x03, 0x75, 0xd2, 0x73, 
+-	0x00, 0x24, 0xdc, 0xd8, 0xf0, 0x4a, 0xe1, 0xe0, 
+-	0xe1, 0xec, 0xe2, 0x12, 0xe2, 0x14, 0xe1, 0xc7, 
+-	0xe1, 0x30, 0x30, 0x5a, 0xe5, 0x8d, 0x06, 0x50, 
+-	0xe9, 0x83, 0xc0, 0x54, 0x30, 0x5b, 0xb0, 0x42, 
+-	0xf8, 0x11, 0x37, 0x1a, 0xb6, 0xff, 0xd0, 0x5e, 
+-	0x30, 0x5b, 0xfc, 0x11, 0xc0, 0x39, 0x30, 0x31, 
+-	0x10, 0x12, 0x10, 0x20, 0xe9, 0x88, 0x03, 0x10, 
+-	0xe9, 0x93, 0x0f, 0x19, 0xf9, 0x8f, 0xd1, 0x44, 
+-	0xe1, 0x79, 0x03, 0xde, 0xf9, 0xba, 0x03, 0xdf, 
+-	0xe9, 0x99, 0xd3, 0x40, 0xca, 0x50, 0xd1, 0x42, 
+-	0xe2, 0xea, 0xc0, 0x50, 0x10, 0x54, 0xc0, 0x90, 
+-	0x10, 0x8c, 0x10, 0x92, 0x10, 0xe0, 0xe5, 0xa8, 
+-	0xc0, 0x01, 0x10, 0x01, 0x20, 0x40, 0xc0, 0x02, 
+-	0x10, 0x01, 0x20, 0x80, 0x10, 0x60, 0xfd, 0xab, 
+-	0xb0, 0x7f, 0x10, 0xa0, 0xfd, 0xae, 0xb0, 0xbf, 
+-	0x10, 0x5f, 0x10, 0x9f, 0x00, 0xef, 0xd0, 0x3e, 
+-	0x20, 0x52, 0x20, 0x83, 0x20, 0x93, 0x10, 0x4c, 
+-	0x10, 0x82, 0x40, 0x80, 0x50, 0x42, 0x0f, 0xc5, 
+-	0xcb, 0xaa, 0xcb, 0xeb, 0xca, 0x50, 0xd0, 0xc0, 
+-	0xb0, 0xc1, 0xf1, 0x9b, 0xcb, 0x01, 0xd0, 0xc1, 
+-	0xf1, 0x9b, 0xcb, 0x41, 0xba, 0x7f, 0xbb, 0x3f, 
+-	0xe2, 0xea, 0xcc, 0x5b, 0x1c, 0x42, 0x2c, 0x5b, 
+-	0xc0, 0x31, 0x1c, 0x43, 0x2c, 0x40, 0x1c, 0x48, 
+-	0xcc, 0xb1, 0x1c, 0x9f, 0x06, 0xd0, 0xe9, 0xd5, 
+-	0x01, 0x69, 0xd0, 0x20, 0x3c, 0x80, 0xc0, 0x1c, 
+-	0x10, 0x08, 0x20, 0x1f, 0x2c, 0x40, 0x2c, 0x80, 
+-	0x01, 0x74, 0xd6, 0x00, 0x2c, 0x80, 0xde, 0x84, 
+-	0xde, 0xc4, 0xe3, 0x1e, 0xd3, 0xc2, 0xf2, 0xd3, 
+-	0x13, 0xa0, 0xed, 0xe5, 0xf2, 0x32, 0xb3, 0x81, 
+-	0xe9, 0xec, 0x80, 0x07, 0xd4, 0x00, 0xc4, 0x50, 
+-	0xd3, 0x08, 0xe2, 0x95, 0xd0, 0x71, 0x20, 0x56, 
+-	0x00, 0x48, 0xd1, 0x8c, 0x03, 0x0d, 0x41, 0x8c, 
+-	0xe9, 0xfa, 0x06, 0x5e, 0xfa, 0x03, 0x08, 0x89, 
+-	0x03, 0xcd, 0x13, 0xe3, 0xf9, 0xfa, 0xd3, 0xc4, 
+-	0x06, 0x5e, 0xfa, 0x03, 0xd0, 0x43, 0x40, 0x4c, 
+-	0xea, 0x03, 0x08, 0x49, 0x00, 0x8d, 0x10, 0x87, 
+-	0x53, 0x02, 0x01, 0x46, 0x90, 0x2c, 0x00, 0xc6, 
+-	0x03, 0x1c, 0xea, 0x0a, 0x09, 0x49, 0x00, 0x0d, 
+-	0xd0, 0x9f, 0x40, 0x02, 0xb0, 0x20, 0x03, 0x19, 
+-	0xea, 0x10, 0xb0, 0x20, 0xa0, 0x2c, 0xe2, 0x5b, 
+-	0x06, 0x5f, 0xfa, 0x80, 0xd4, 0x00, 0xc4, 0x50, 
+-	0xc4, 0x90, 0xc4, 0xd0, 0xe2, 0x8d, 0x50, 0x00, 
+-	0x50, 0x00, 0x50, 0x00, 0x03, 0x75, 0xd2, 0x73, 
+-	0x00, 0x24, 0xdc, 0xd8, 0xf0, 0x4a, 0xe1, 0xd3, 
+-	0xe1, 0xdc, 0xe2, 0x00, 0xe2, 0x02, 0xe1, 0xac, 
+-	0xe1, 0x30, 0x30, 0x5a, 0xe5, 0x91, 0x06, 0x50, 
+-	0xe9, 0x83, 0xc0, 0x54, 0x30, 0x5b, 0xb0, 0x42, 
+-	0xf8, 0x11, 0x37, 0x1a, 0xb6, 0xff, 0xd0, 0x5e, 
+-	0x30, 0x5b, 0xfc, 0x11, 0xbc, 0x10, 0xd0, 0x10, 
+-	0x0c, 0x1e, 0xf9, 0x8e, 0xbc, 0x10, 0xd0, 0x30, 
+-	0xc0, 0x40, 0x30, 0x70, 0xed, 0x8e, 0x03, 0x10, 
+-	0xe9, 0x97, 0x0f, 0x19, 0xf9, 0x93, 0xd1, 0x44, 
+-	0xe1, 0x79, 0x03, 0xdf, 0xe9, 0xa1, 0xd3, 0x40, 
+-	0xca, 0x50, 0xcb, 0x52, 0x03, 0x1d, 0xf9, 0xa8, 
+-	0xca, 0x12, 0xca, 0x52, 0xe1, 0xa5, 0x03, 0x1d, 
+-	0xf9, 0xa8, 0xca, 0x12, 0xca, 0x53, 0xca, 0xae, 
+-	0xca, 0xef, 0xb1, 0x7e, 0x03, 0x1e, 0xfa, 0xea, 
+-	0xb1, 0x7e, 0xe2, 0xea, 0x00, 0x24, 0xd0, 0x00, 
+-	0x2c, 0x40, 0x2c, 0x80, 0x17, 0x20, 0xf9, 0xd2, 
+-	0x00, 0xa8, 0xd0, 0x00, 0xcc, 0x5b, 0x1c, 0x5f, 
+-	0x1c, 0x43, 0x20, 0x31, 0x7c, 0x40, 0xb0, 0x3c, 
+-	0x7e, 0x80, 0xcc, 0xb1, 0xce, 0xfa, 0x1c, 0x9f, 
+-	0x1e, 0xdf, 0x01, 0x69, 0xd0, 0x3c, 0x0c, 0x99, 
+-	0xe9, 0xc4, 0x3c, 0x80, 0x0e, 0xd9, 0xe9, 0xc7, 
+-	0x3e, 0xc0, 0x3e, 0xf2, 0x3e, 0xb1, 0xd0, 0x01, 
+-	0x40, 0x1b, 0x10, 0x05, 0x20, 0x1f, 0x2c, 0x40, 
+-	0x2c, 0x80, 0xd0, 0x30, 0x70, 0x00, 0x2c, 0x80, 
+-	0xe3, 0x1e, 0xd3, 0xc2, 0xf2, 0xd3, 0x13, 0xa0, 
+-	0xed, 0xd8, 0xf2, 0x32, 0xb3, 0x81, 0xe9, 0xdc, 
+-	0x80, 0x07, 0xe2, 0x95, 0x0d, 0x09, 0xd1, 0x8c, 
+-	0x03, 0x0d, 0x41, 0x8c, 0xe9, 0xe8, 0x06, 0x5e, 
+-	0xf9, 0xf1, 0x08, 0x89, 0x03, 0xcd, 0x13, 0xe3, 
+-	0xf9, 0xe8, 0xd3, 0xc4, 0x06, 0x5e, 0xf9, 0xf1, 
+-	0xd0, 0x43, 0x40, 0x4c, 0xe9, 0xf1, 0x08, 0x49, 
+-	0x00, 0x8d, 0x10, 0x87, 0x53, 0x02, 0x01, 0x46, 
+-	0x90, 0x2c, 0x00, 0xc6, 0x03, 0x1c, 0xe9, 0xf8, 
+-	0x09, 0x49, 0x00, 0x0d, 0xd0, 0x9f, 0x40, 0x02, 
+-	0xb0, 0x20, 0x03, 0x19, 0xe9, 0xfe, 0xb0, 0x20, 
+-	0xa0, 0x2c, 0xe2, 0x5b, 0x06, 0x5f, 0xfa, 0x80, 
+-	0xd4, 0x00, 0xc4, 0x50, 0xc4, 0x90, 0xc4, 0xd0, 
+-	0xe2, 0x8d, 0x50, 0x00, 0x03, 0x75, 0xd2, 0x73, 
+-	0x00, 0x24, 0xdc, 0xd8, 0xf0, 0x4a, 0xe1, 0xc1, 
+-	0xe1, 0xca, 0xe1, 0xee, 0xe1, 0xf0, 0xe1, 0xa8, 
+-	0xe1, 0x30, 0x30, 0x5a, 0xe5, 0x8d, 0x06, 0x50, 
+-	0xe9, 0x83, 0xc0, 0x54, 0x30, 0x5b, 0xb0, 0x42, 
+-	0xf8, 0x11, 0x37, 0x1a, 0xb6, 0xff, 0xd0, 0x5e, 
+-	0x30, 0x5b, 0xfc, 0x11, 0xc0, 0x39, 0x30, 0x31, 
+-	0x10, 0x12, 0x10, 0x20, 0xe9, 0x88, 0x03, 0x10, 
+-	0xe9, 0x93, 0x0f, 0x19, 0xf9, 0x8f, 0xd1, 0x44, 
+-	0xe1, 0x79, 0x03, 0xdf, 0xe9, 0x9d, 0xd3, 0x40, 
+-	0xca, 0x50, 0xcb, 0x52, 0x03, 0x1d, 0xf9, 0xa4, 
+-	0xca, 0x12, 0xca, 0x52, 0xe1, 0xa1, 0x03, 0x1d, 
+-	0xf9, 0xa4, 0xca, 0x12, 0xca, 0x53, 0xca, 0xae, 
+-	0xca, 0xef, 0xb1, 0x7e, 0x03, 0x1e, 0xfa, 0xea, 
+-	0xb1, 0x7e, 0xe2, 0xea, 0xcc, 0x5b, 0x1c, 0x42, 
+-	0x2c, 0x5b, 0xc0, 0x31, 0x1c, 0x43, 0x2c, 0x40, 
+-	0x1c, 0x48, 0xcc, 0xb1, 0x1c, 0x9f, 0x06, 0xd0, 
+-	0xe9, 0xb6, 0x01, 0x69, 0xd0, 0x20, 0x3c, 0x80, 
+-	0xc0, 0x1c, 0x10, 0x08, 0x20, 0x1f, 0x2c, 0x40, 
+-	0x2c, 0x80, 0xd0, 0x30, 0x70, 0x00, 0x2c, 0x80, 
+-	0xde, 0x84, 0xde, 0xc4, 0xe3, 0x1e, 0xd3, 0xc2, 
+-	0xf2, 0xd3, 0x13, 0xa0, 0xed, 0xc6, 0xf2, 0x32, 
+-	0xb3, 0x81, 0xe9, 0xca, 0x80, 0x07, 0xe2, 0x95, 
+-	0x0d, 0x09, 0xd1, 0x8c, 0x03, 0x0d, 0x41, 0x8c, 
+-	0xe9, 0xd6, 0x06, 0x5e, 0xf9, 0xdf, 0x08, 0x89, 
+-	0x03, 0xcd, 0x13, 0xe3, 0xf9, 0xd6, 0xd3, 0xc4, 
+-	0x06, 0x5e, 0xf9, 0xdf, 0xd0, 0x43, 0x40, 0x4c, 
+-	0xe9, 0xdf, 0x08, 0x49, 0x00, 0x8d, 0x10, 0x87, 
+-	0x53, 0x02, 0x01, 0x46, 0x90, 0x2c, 0x00, 0xc6, 
+-	0x03, 0x1c, 0xe9, 0xe6, 0x09, 0x49, 0x00, 0x0d, 
+-	0xd0, 0x9f, 0x40, 0x02, 0xb0, 0x20, 0x03, 0x19, 
+-	0xe9, 0xec, 0xb0, 0x20, 0xa0, 0x2c, 0xe2, 0x5b, 
+-	0x06, 0x5f, 0xfa, 0x80, 0xd4, 0x00, 0xc4, 0x50, 
+-	0xc4, 0x90, 0xc4, 0xd0, 0xe2, 0x8d, 0x50, 0x00, 
+-	0x50, 0x00, 0x50, 0x00, 0x03, 0x75, 0xd2, 0x73, 
+-	0x00, 0x24, 0xdc, 0xd8, 0xf0, 0x4a, 0xe1, 0xdb, 
+-	0xe1, 0xe9, 0xe2, 0x00, 0xe2, 0x02, 0xe1, 0xc3, 
+-	0xe1, 0x65, 0x30, 0x5a, 0xe5, 0x8d, 0x06, 0x50, 
+-	0xe9, 0x83, 0xc0, 0x54, 0x30, 0x5b, 0xb0, 0x42, 
+-	0xf8, 0x11, 0x37, 0x1a, 0xb6, 0xff, 0xd0, 0x4f, 
+-	0x30, 0x5b, 0xfc, 0x11, 0xc0, 0x39, 0x30, 0x31, 
+-	0x10, 0x11, 0x10, 0x20, 0xe9, 0x88, 0x03, 0x10, 
+-	0xe9, 0x93, 0x0f, 0x19, 0xf9, 0x8f, 0xd1, 0x44, 
+-	0xe1, 0x79, 0x03, 0xd0, 0xf9, 0x98, 0xca, 0x50, 
+-	0x03, 0xde, 0xf9, 0x9a, 0xd1, 0x42, 0xe2, 0xea, 
+-	0xcb, 0xaa, 0xcb, 0xeb, 0xc0, 0x50, 0x10, 0x54, 
+-	0xc0, 0x90, 0x10, 0x8c, 0x10, 0x92, 0xd0, 0xc1, 
+-	0x05, 0x50, 0xe9, 0xa5, 0xb0, 0xc2, 0x10, 0x60, 
+-	0xfd, 0xa8, 0xb0, 0x7f, 0x10, 0xa0, 0xfd, 0xab, 
+-	0xb0, 0xbf, 0x10, 0x5f, 0x10, 0x9f, 0x00, 0xef, 
+-	0xd0, 0x3e, 0x20, 0x52, 0x20, 0x83, 0x20, 0x93, 
+-	0x10, 0x4c, 0x10, 0x82, 0x40, 0x80, 0x50, 0x42, 
+-	0xd0, 0x81, 0x14, 0x1f, 0x14, 0x01, 0x05, 0x50, 
+-	0xe9, 0xbd, 0x50, 0x42, 0xe1, 0xbe, 0x54, 0x02, 
+-	0xca, 0x10, 0xca, 0x50, 0xcb, 0x01, 0xcb, 0x41, 
+-	0xe2, 0xea, 0xcc, 0x5b, 0x1c, 0x42, 0x2c, 0x5b, 
+-	0xc0, 0x31, 0x1c, 0x43, 0x2c, 0x40, 0x1c, 0x49, 
+-	0xcc, 0xb1, 0x1c, 0x9f, 0xc0, 0x1c, 0x10, 0x08, 
+-	0x20, 0x1f, 0x05, 0x50, 0xf9, 0xd2, 0xb0, 0x3c, 
+-	0x2c, 0x40, 0x2c, 0x80, 0x01, 0x74, 0xd6, 0x00, 
+-	0x2c, 0x80, 0x02, 0xe4, 0xde, 0x80, 0xde, 0xc1, 
+-	0xe3, 0x1e, 0xd3, 0xc0, 0xf2, 0xd3, 0x13, 0xa0, 
+-	0xed, 0xe0, 0xf2, 0x32, 0xb3, 0x81, 0xe9, 0xe9, 
+-	0x80, 0x07, 0xd4, 0x02, 0x44, 0x15, 0x14, 0x1f, 
+-	0xc4, 0x50, 0xd3, 0x08, 0xe2, 0x95, 0xd0, 0x71, 
+-	0x20, 0x56, 0x00, 0x48, 0xd1, 0x8c, 0x03, 0x0d, 
+-	0x41, 0x8c, 0xe9, 0xf7, 0x08, 0x89, 0x03, 0xcd, 
+-	0x13, 0xe3, 0xf9, 0xf6, 0xd3, 0xc4, 0xe1, 0xf7, 
+-	0xb3, 0xc1, 0x01, 0x46, 0x90, 0x2c, 0x00, 0xc6, 
+-	0x03, 0x1c, 0xe9, 0xfe, 0x09, 0x49, 0x00, 0x0d, 
+-	0xa0, 0x2c, 0xe2, 0x5b, 0x06, 0x5f, 0xfa, 0x7f, 
+-	0xd4, 0x02, 0x44, 0x15, 0x14, 0x1f, 0xc4, 0x50, 
+-	0xc4, 0x90, 0xc4, 0xd0, 0xe2, 0x8d, 0x50, 0x00, 
+-	0x50, 0x00, 0x50, 0x00, 0x03, 0x75, 0xd2, 0x73, 
+-	0x00, 0x24, 0xdc, 0xd8, 0xf0, 0x4a, 0xe1, 0xc9, 
+-	0xe1, 0xd2, 0xe1, 0xe7, 0xe1, 0xe9, 0xe1, 0xab, 
+-	0xe1, 0x30, 0x30, 0x5a, 0xe5, 0x91, 0x06, 0x50, 
+-	0xe9, 0x83, 0xc0, 0x54, 0x30, 0x5b, 0xb0, 0x42, 
+-	0xf8, 0x11, 0x37, 0x1a, 0xb6, 0xff, 0xd0, 0x4f, 
+-	0x30, 0x5b, 0xfc, 0x11, 0xbc, 0x10, 0xd0, 0x10, 
+-	0x0c, 0x1e, 0xf9, 0x8e, 0xbc, 0x10, 0xd0, 0x20, 
+-	0xc0, 0x40, 0x30, 0x70, 0xed, 0x8e, 0x03, 0x10, 
+-	0xe9, 0x97, 0x0f, 0x19, 0xf9, 0x93, 0xd1, 0x44, 
+-	0xe1, 0x79, 0x03, 0xd0, 0xf9, 0xa0, 0xca, 0x50, 
+-	0xcb, 0x52, 0x03, 0x1d, 0xf9, 0xa7, 0xca, 0x12, 
+-	0xca, 0x52, 0xe1, 0xa4, 0x03, 0x1d, 0xf9, 0xa7, 
+-	0xca, 0x12, 0xca, 0x53, 0xca, 0xae, 0xca, 0xef, 
+-	0xb1, 0x7e, 0x03, 0x1e, 0xfa, 0xea, 0xb1, 0x7e, 
+-	0xe2, 0xea, 0x00, 0x24, 0xd0, 0x00, 0x2c, 0x40, 
+-	0x2c, 0x80, 0x17, 0x20, 0xf9, 0xc8, 0x00, 0x2a, 
+-	0xd0, 0x00, 0x20, 0x1b, 0x20, 0x1b, 0x05, 0x50, 
+-	0xf9, 0xb8, 0xb0, 0x3f, 0x10, 0x02, 0x7c, 0x40, 
+-	0xcc, 0xb1, 0x1c, 0x9f, 0x01, 0x69, 0xd0, 0x3c, 
+-	0x0c, 0x99, 0xe9, 0xc1, 0x3c, 0x80, 0xde, 0xa0, 
+-	0x2c, 0x5f, 0x2c, 0x9f, 0xd0, 0x30, 0x70, 0x00, 
+-	0x2c, 0x80, 0xde, 0xc1, 0xe3, 0x1e, 0xd3, 0xc0, 
+-	0xf2, 0xd3, 0x13, 0xa0, 0xed, 0xce, 0xf2, 0x32, 
+-	0xb3, 0x81, 0xe9, 0xd2, 0x80, 0x07, 0xe2, 0x95, 
+-	0x0d, 0x09, 0xd1, 0x8c, 0x03, 0x0d, 0x41, 0x8c, 
+-	0xe9, 0xde, 0x08, 0x89, 0x03, 0xcd, 0x13, 0xe3, 
+-	0xf9, 0xdd, 0xd3, 0xc4, 0xe1, 0xde, 0xb3, 0xc1, 
+-	0x01, 0x46, 0x90, 0x2c, 0x00, 0xc6, 0x03, 0x1c, 
+-	0xe9, 0xe5, 0x09, 0x49, 0x00, 0x0d, 0xa0, 0x2c, 
+-	0xe2, 0x5b, 0x06, 0x5f, 0xfa, 0x7f, 0xd4, 0x00, 
+-	0xc4, 0x50, 0xc4, 0x90, 0xc4, 0xd0, 0xe2, 0x8d, 
+-	0x50, 0x00, 0x50, 0x00, 0x03, 0x75, 0xd2, 0x73, 
+-	0x00, 0x24, 0xdc, 0xd8, 0xf0, 0x4a, 0xe1, 0xa3, 
+-	0xc0, 0x00, 0xc0, 0x00, 0xc0, 0x00, 0xe1, 0x8a, 
+-	0xe1, 0x30, 0x30, 0x5a, 0xe5, 0x87, 0x37, 0x1a, 
+-	0xb6, 0xff, 0xd0, 0x5e, 0x30, 0x5b, 0xfd, 0xb4, 
+-	0xc0, 0x39, 0x30, 0x31, 0x10, 0x12, 0x10, 0x20, 
+-	0xe9, 0x82, 0xd1, 0x42, 0xd3, 0x40, 0xe2, 0xea, 
+-	0xcc, 0x5b, 0x1c, 0x42, 0x2c, 0x5b, 0xc0, 0x31, 
+-	0x1c, 0x43, 0x2c, 0x40, 0x1c, 0x48, 0xcc, 0xb1, 
+-	0x1c, 0x9f, 0x06, 0xd0, 0xe9, 0x98, 0x01, 0x69, 
+-	0xd0, 0x20, 0x3c, 0x80, 0xc0, 0x1c, 0x10, 0x08, 
+-	0x20, 0x1f, 0x2c, 0x40, 0x2c, 0x80, 0x01, 0x74, 
+-	0xd6, 0x00, 0x2c, 0x80, 0xde, 0x84, 0xde, 0xc4, 
+-	0xe3, 0x1e, 0xf2, 0xd3, 0xc0, 0x5c, 0xb0, 0x7f, 
+-	0x30, 0x5a, 0xe5, 0xc8, 0x00, 0x26, 0xd0, 0x00, 
+-	0x70, 0x00, 0x10, 0x20, 0xe9, 0xbf, 0x00, 0xe0, 
+-	0xd0, 0x44, 0x70, 0x41, 0x10, 0x5c, 0x30, 0x5b, 
+-	0xb0, 0x41, 0xed, 0xc8, 0x0f, 0x17, 0xf9, 0xb4, 
+-	0x0f, 0x49, 0xf2, 0xd3, 0x0f, 0x19, 0xf9, 0xb8, 
+-	0xdf, 0x00, 0x00, 0x06, 0x03, 0xb3, 0xd8, 0x29, 
+-	0xe0, 0x46, 0xc0, 0x5b, 0x30, 0x54, 0xb0, 0x7e, 
+-	0xe5, 0xc8, 0x0f, 0x17, 0xf9, 0xc3, 0x02, 0xf1, 
+-	0xd8, 0x2b, 0xe0, 0x46, 0xd3, 0x08, 0xd3, 0xc0, 
+-	0xe2, 0x95, 0x50, 0x00, 0x03, 0x75, 0xd2, 0x73, 
+-	0x00, 0x24, 0xdc, 0xd8, 0xf0, 0x4a, 0xe1, 0xb5, 
+-	0xc0, 0x00, 0xc0, 0x00, 0xc0, 0x00, 0xe1, 0x8e, 
+-	0xe1, 0x30, 0x30, 0x5a, 0xe5, 0x8b, 0x37, 0x1a, 
+-	0xb6, 0xff, 0xd0, 0x5e, 0x30, 0x5b, 0xfd, 0xc6, 
+-	0xbc, 0x10, 0xd0, 0x10, 0x0c, 0x1e, 0xf9, 0x88, 
+-	0xbc, 0x10, 0xd0, 0x30, 0xc0, 0x40, 0x30, 0x70, 
+-	0xed, 0x88, 0xd1, 0x42, 0xd3, 0x40, 0xe2, 0xea, 
+-	0x00, 0x24, 0xd0, 0x00, 0x2c, 0x40, 0x2c, 0x80, 
+-	0x17, 0x20, 0xf9, 0xb4, 0x00, 0xa8, 0xd0, 0x00, 
+-	0xcc, 0x5b, 0x1c, 0x5f, 0x1c, 0x43, 0x20, 0x31, 
+-	0x7c, 0x40, 0xb0, 0x3c, 0x7e, 0x80, 0xcc, 0xb1, 
+-	0xce, 0xfa, 0x1c, 0x9f, 0x1e, 0xdf, 0x01, 0x69, 
+-	0xd0, 0x3c, 0x0c, 0x99, 0xe9, 0xa6, 0x3c, 0x80, 
+-	0x0e, 0xd9, 0xe9, 0xa9, 0x3e, 0xc0, 0x3e, 0xf2, 
+-	0x3e, 0xb1, 0xd0, 0x01, 0x40, 0x1b, 0x10, 0x05, 
+-	0x20, 0x1f, 0x2c, 0x40, 0x2c, 0x80, 0xd0, 0x30, 
+-	0x70, 0x00, 0x2c, 0x80, 0xe3, 0x1e, 0xf2, 0xd3, 
+-	0xc0, 0x5c, 0xb0, 0x7f, 0x30, 0x5a, 0xe5, 0xda, 
+-	0x00, 0x26, 0xd0, 0x00, 0x70, 0x00, 0x10, 0x20, 
+-	0xe9, 0xd1, 0x00, 0xe0, 0xd0, 0x44, 0x70, 0x41, 
+-	0x10, 0x5c, 0x30, 0x5b, 0xb0, 0x41, 0xed, 0xda, 
+-	0x0f, 0x17, 0xf9, 0xc6, 0x0f, 0x49, 0xf2, 0xd3, 
+-	0x0f, 0x19, 0xf9, 0xca, 0xdf, 0x00, 0x00, 0x06, 
+-	0x03, 0xb3, 0xd8, 0x29, 0xe0, 0x46, 0xc0, 0x5b, 
+-	0x30, 0x54, 0xb0, 0x7e, 0xe5, 0xda, 0x0f, 0x17, 
+-	0xf9, 0xd5, 0x02, 0xf6, 0xde, 0x26, 0xe0, 0x46, 
+-	0xd3, 0x08, 0xd3, 0xc0, 0xe2, 0x95, 0x50, 0x00, 
+-	0x50, 0x00, 0x50, 0x00, 0x03, 0x75, 0xd2, 0x73, 
+-	0x00, 0x24, 0xdc, 0xd8, 0xf0, 0x4a, 0xe1, 0xa2, 
+-	0xc0, 0x00, 0xc0, 0x00, 0xc0, 0x00, 0xe1, 0x8a, 
+-	0xe1, 0x65, 0x30, 0x5a, 0xe5, 0x87, 0x37, 0x1a, 
+-	0xb6, 0xff, 0xd0, 0x4f, 0x30, 0x5b, 0xfd, 0xb3, 
+-	0xc0, 0x39, 0x30, 0x31, 0x10, 0x11, 0x10, 0x20, 
+-	0xe9, 0x82, 0xd1, 0x42, 0xd3, 0x41, 0xe2, 0xea, 
+-	0xcc, 0x5b, 0x1c, 0x42, 0x2c, 0x5b, 0xc0, 0x31, 
+-	0x1c, 0x43, 0x2c, 0x40, 0x1c, 0x49, 0xcc, 0xb1, 
+-	0x1c, 0x9f, 0xc0, 0x1c, 0x10, 0x08, 0x20, 0x1f, 
+-	0x05, 0x50, 0xf9, 0x99, 0xb0, 0x3c, 0x2c, 0x40, 
+-	0x2c, 0x80, 0x01, 0x74, 0xd6, 0x00, 0x2c, 0x80, 
+-	0x02, 0xe4, 0xde, 0x80, 0xde, 0xc1, 0xe3, 0x1e, 
+-	0xf2, 0xd3, 0xc0, 0x5c, 0xb0, 0x7f, 0x30, 0x5a, 
+-	0xe5, 0xc7, 0x00, 0x26, 0xd0, 0x00, 0x70, 0x00, 
+-	0x10, 0x20, 0xe9, 0xbe, 0x00, 0xe0, 0xd0, 0x44, 
+-	0x70, 0x41, 0x10, 0x5b, 0x30, 0x5b, 0xb0, 0x41, 
+-	0xed, 0xc7, 0x0f, 0x17, 0xf9, 0xb3, 0x0f, 0x49, 
+-	0xf2, 0xd3, 0x0f, 0x19, 0xf9, 0xb7, 0xdf, 0x00, 
+-	0x00, 0x06, 0x03, 0xb3, 0xd8, 0x29, 0xe0, 0x46, 
+-	0xc0, 0x5b, 0x30, 0x54, 0xb0, 0x7e, 0xe5, 0xc7, 
+-	0x0f, 0x17, 0xf9, 0xc2, 0x02, 0xff, 0xde, 0x27, 
+-	0xe0, 0x46, 0xd3, 0x08, 0xd3, 0xc0, 0xe2, 0x95, 
+-	0x50, 0x00, 0x50, 0x00, 0x03, 0x75, 0xd2, 0x73, 
+-	0x00, 0x24, 0xdc, 0xd8, 0xf0, 0x4a, 0xe1, 0xac, 
+-	0xc0, 0x00, 0xc0, 0x00, 0xc0, 0x00, 0xe1, 0x8e, 
+-	0xe1, 0x30, 0x30, 0x5a, 0xe5, 0x8b, 0x37, 0x1a, 
+-	0xb6, 0xff, 0xd0, 0x4f, 0x30, 0x5b, 0xfd, 0xbd, 
+-	0xbc, 0x10, 0xd0, 0x10, 0x0c, 0x1e, 0xf9, 0x88, 
+-	0xbc, 0x10, 0xd0, 0x20, 0xc0, 0x40, 0x30, 0x70, 
+-	0xed, 0x88, 0xd1, 0x42, 0xd3, 0x41, 0xe2, 0xea, 
+-	0x00, 0x24, 0xd0, 0x00, 0x2c, 0x40, 0x2c, 0x80, 
+-	0x17, 0x20, 0xf9, 0xab, 0x00, 0x2a, 0xd0, 0x00, 
+-	0x20, 0x1b, 0x20, 0x1b, 0x05, 0x50, 0xf9, 0x9b, 
+-	0xb0, 0x3f, 0x10, 0x02, 0x7c, 0x40, 0xcc, 0xb1, 
+-	0x1c, 0x9f, 0x01, 0x69, 0xd0, 0x3c, 0x0c, 0x99, 
+-	0xe9, 0xa4, 0x3c, 0x80, 0xde, 0xa0, 0x2c, 0x5f, 
+-	0x2c, 0x9f, 0xd0, 0x30, 0x70, 0x00, 0x2c, 0x80, 
+-	0xde, 0xc1, 0xe3, 0x1e, 0xf2, 0xd3, 0xc0, 0x5c, 
+-	0xb0, 0x7f, 0x30, 0x5a, 0xe5, 0xd1, 0x00, 0x26, 
+-	0xd0, 0x00, 0x70, 0x00, 0x10, 0x20, 0xe9, 0xc8, 
+-	0x00, 0xe0, 0xd0, 0x44, 0x70, 0x41, 0x10, 0x5b, 
+-	0x30, 0x5b, 0xb0, 0x41, 0xed, 0xd1, 0x0f, 0x17, 
+-	0xf9, 0xbd, 0x0f, 0x49, 0xf2, 0xd3, 0x0f, 0x19, 
+-	0xf9, 0xc1, 0xdf, 0x00, 0x00, 0x06, 0x03, 0xb3, 
+-	0xd8, 0x29, 0xe0, 0x46, 0xc0, 0x5b, 0x30, 0x54, 
+-	0xb0, 0x7e, 0xe5, 0xd1, 0x0f, 0x17, 0xf9, 0xcc, 
+-	0x03, 0x34, 0xdc, 0x20, 0xe0, 0x46, 0xd3, 0x08, 
+-	0xd3, 0xc0, 0xe2, 0x95, 0xd0, 0x61, 0x23, 0x81, 
+-	0x0c, 0x49, 0xd0, 0x61, 0x00, 0x8d, 0x10, 0xa0, 
+-	0xea, 0x3b, 0x30, 0x42, 0xe6, 0x30, 0x23, 0x82, 
+-	0x0f, 0xc5, 0x0c, 0x09, 0x05, 0x0d, 0x15, 0x20, 
+-	0xfe, 0x45, 0xd0, 0x5f, 0x15, 0x63, 0xea, 0x43, 
+-	0xd0, 0x50, 0x30, 0x54, 0xee, 0x4a, 0x0f, 0x17, 
+-	0xfa, 0x45, 0x03, 0xb3, 0xd8, 0x29, 0xe0, 0x46, 
+-	0x80, 0x07, 0x09, 0x49, 0xd4, 0x00, 0xd4, 0x40, 
+-	0xd4, 0x80, 0xd4, 0xc0, 0x00, 0x4d, 0xa0, 0x6c, 
+-	0xd0, 0xa1, 0x00, 0x88, 0xd0, 0xa9, 0x00, 0x4d, 
+-	0x00, 0x50, 0xfa, 0x53, 0xf2, 0x32, 0xd3, 0x80, 
+-	0xe1, 0x76, 0xd1, 0xc2, 0x41, 0xcf, 0x11, 0xdf, 
+-	0xd0, 0x41, 0x01, 0xc1, 0x00, 0xef, 0xd0, 0xbe, 
+-	0x03, 0x10, 0xf9, 0x77, 0x80, 0x07, 0x21, 0x96, 
+-	0x11, 0xa2, 0xe9, 0x78, 0x03, 0x1d, 0xea, 0x73, 
+-	0xc0, 0xd7, 0xc2, 0x90, 0xf2, 0xa4, 0xc4, 0x0a, 
+-	0x03, 0xd0, 0xea, 0x72, 0xc2, 0x91, 0xf2, 0xa4, 
+-	0xc4, 0x4a, 0x03, 0x1e, 0xea, 0x8d, 0xc0, 0xd8, 
+-	0xc2, 0x92, 0xf2, 0xa4, 0xc4, 0x8a, 0x03, 0xd0, 
+-	0xea, 0x7d, 0xc2, 0x93, 0xf2, 0xa4, 0xc4, 0xca, 
+-	0xe2, 0x8d, 0xd3, 0xc0, 0xc0, 0xd7, 0xc2, 0x90, 
+-	0xf2, 0xa4, 0xc4, 0x0a, 0x03, 0xd0, 0xea, 0x88, 
+-	0xc2, 0x91, 0xf2, 0xa4, 0xc4, 0x4a, 0x08, 0x49, 
+-	0x00, 0x4d, 0x10, 0x61, 0xf8, 0x11, 0x03, 0x1f, 
+-	0xea, 0x93, 0x0d, 0xc9, 0x00, 0x4d, 0xd0, 0x1a, 
+-	0xe2, 0x98, 0x03, 0x10, 0xfa, 0x97, 0xd0, 0x1d, 
+-	0xe2, 0x98, 0xd0, 0x18, 0x0f, 0x16, 0xfa, 0x98, 
+-	0xd0, 0x4c, 0x40, 0x4c, 0x10, 0x6c, 0xea, 0xa2, 
+-	0x03, 0xde, 0xfa, 0xa2, 0x0f, 0x12, 0xfa, 0xa0, 
+-	0x00, 0x08, 0xe2, 0xd9, 0xd2, 0x00, 0x13, 0xe1, 
+-	0xee, 0xa9, 0x08, 0x49, 0x02, 0x0d, 0x00, 0xc8, 
+-	0xc2, 0xca, 0x12, 0x94, 0xd0, 0x1f, 0x30, 0x07, 
+-	0x12, 0xc0, 0xc2, 0x43, 0x12, 0x5a, 0x00, 0x0d, 
+-	0x03, 0xde, 0xea, 0xb6, 0x0e, 0xc9, 0x04, 0x8d, 
+-	0x02, 0x48, 0x22, 0x80, 0x12, 0x88, 0xd0, 0x0b, 
+-	0x30, 0x03, 0x12, 0x80, 0xd0, 0x19, 0x20, 0x03, 
+-	0x12, 0x80, 0x00, 0x0d, 0x22, 0xc0, 0x12, 0xc8, 
+-	0xd0, 0x0b, 0x30, 0x09, 0x12, 0xc0, 0x12, 0xd8, 
+-	0xd0, 0x16, 0x20, 0x09, 0x20, 0x07, 0x12, 0xc0, 
+-	0x42, 0xc2, 0x22, 0x8b, 0x22, 0x88, 0x03, 0xde, 
+-	0xea, 0xd2, 0x0e, 0xc9, 0xc4, 0x4a, 0x04, 0xcd, 
+-	0x0f, 0xc5, 0x01, 0x46, 0x90, 0x4d, 0x00, 0xc6, 
+-	0x10, 0x60, 0xe6, 0xd3, 0x0f, 0xc5, 0x01, 0x74, 
+-	0xd6, 0x00, 0xca, 0x9d, 0xcb, 0x9e, 0xca, 0xea, 
+-	0xcb, 0xee, 0x2a, 0xc0, 0x2b, 0xc0, 0xca, 0x10, 
+-	0xca, 0x51, 0xcb, 0x12, 0xcb, 0x53, 0xd1, 0x40, 
+-	0xd3, 0x41, 0xb7, 0x3f, 0xc0, 0x5c, 0xe1, 0x7b, 
+-	0xd0, 0xc0, 0xc1, 0x28, 0xc2, 0x2a, 0xc2, 0xab, 
+-	0xf1, 0x7a, 0x0f, 0x17, 0xfa, 0xef, 0xcc, 0xe8, 
+-	0xcd, 0x29, 0xcd, 0x6c, 0xcd, 0xad, 0xc8, 0x08, 
+-	0xc8, 0x49, 0xca, 0x0a, 0xca, 0x4b, 0xf3, 0x31, 
+-	0xd0, 0xc1, 0xc1, 0x34, 0xc2, 0x2a, 0xc2, 0xab, 
+-	0xf1, 0x7a, 0x00, 0x28, 0xd9, 0xc0, 0xc8, 0x88, 
+-	0xc8, 0xc9, 0xa9, 0xf8, 0xca, 0x8a, 0xca, 0xcb, 
+-	0x11, 0x62, 0xe9, 0x79, 0xd0, 0xc0, 0xc1, 0x35, 
+-	0xc2, 0x2e, 0xc2, 0xaf, 0xf1, 0x7a, 0xc9, 0x08, 
+-	0xc9, 0x49, 0xa9, 0xf8, 0xcb, 0x0a, 0xcb, 0x4b, 
+-	0xd0, 0xc1, 0xc1, 0x36, 0xc2, 0x2e, 0xc2, 0xaf, 
+-	0xf1, 0x7a, 0xc0, 0x27, 0xc9, 0x88, 0xc9, 0xc9, 
+-	0xa0, 0x38, 0xcb, 0x8a, 0xcb, 0xcb, 0xe1, 0x79, 
+-	0x5f, 0x0d, 0x07, 0x7d, 0xde, 0x07, 0x11, 0x5e, 
+-	0x30, 0x05, 0xcd, 0xc0, 0x00, 0x28, 0xd0, 0x00, 
+-	0xa0, 0x38, 0x11, 0x61, 0xf9, 0x75, 0x00, 0xe2, 
+-	0xd0, 0x00, 0x0f, 0x1d, 0xeb, 0x29, 0x00, 0x2d, 
+-	0xdf, 0x4b, 0xf3, 0x3f, 0xe1, 0x75, 0x04, 0xeb, 
+-	0xd0, 0x00, 0x11, 0x62, 0xeb, 0x36, 0xb0, 0x20, 
+-	0x0f, 0x19, 0xfb, 0x36, 0xac, 0xe0, 0x01, 0xa4, 
+-	0xde, 0x00, 0x5e, 0x0d, 0x00, 0x2d, 0xdf, 0x7a, 
+-	0xdd, 0xc0, 0xd8, 0x80, 0xd9, 0x00, 0xd9, 0x80, 
+-	0x5f, 0x00, 0x01, 0x46, 0x00, 0x28, 0xd0, 0x01, 
+-	0x00, 0x06, 0xa0, 0x37, 0x80, 0x3f, 0x00, 0xc6, 
+-	0x0f, 0xc5, 0xad, 0xda, 0xc6, 0xb1, 0xd0, 0x01, 
+-	0x01, 0xa3, 0xde, 0x1d, 0x40, 0x30, 0x3e, 0x00, 
+-	0x80, 0x3f, 0x0e, 0x0a, 0x66, 0xda, 0xc8, 0x28, 
+-	0xc8, 0x69, 0xc8, 0xaa, 0xc8, 0xeb, 0x0c, 0x1e, 
+-	0xfb, 0x68, 0x26, 0xba, 0x07, 0x7d, 0xdc, 0x00, 
+-	0x1d, 0xcf, 0x1d, 0xd1, 0x5d, 0xc0, 0x00, 0x2d, 
+-	0xdf, 0x64, 0x0f, 0x87, 0xad, 0xda, 0x80, 0x3f, 
+-	0x0e, 0x0a, 0x66, 0xda, 0xc9, 0x2c, 0xc9, 0x6d, 
+-	0xc9, 0xae, 0xc9, 0xef, 0x0f, 0x2f, 0xd0, 0x37, 
+-	0x4f, 0x00, 0x0f, 0x1a, 0xeb, 0xbe, 0x01, 0xa4, 
+-	0xde, 0x20, 0xd0, 0x01, 0x40, 0x3c, 0x2e, 0x00, 
+-	0x00, 0x2d, 0xdf, 0x7a, 0xac, 0xe0, 0x0f, 0x87, 
+-	0x0e, 0x0a, 0x76, 0xe0, 0xbf, 0x79, 0xbe, 0x3c, 
+-	0x0f, 0x1b, 0xeb, 0x9e, 0x0f, 0x87, 0x0e, 0x0a, 
+-	0x76, 0xe1, 0xbf, 0x79, 0xbe, 0x34, 0x18, 0xa0, 
+-	0xeb, 0xb9, 0x0f, 0x87, 0xad, 0x20, 0x80, 0x3f, 
+-	0x0e, 0x0a, 0x76, 0xe2, 0xbf, 0x79, 0xbe, 0x3c, 
+-	0x0f, 0x87, 0x0e, 0x0a, 0x76, 0xe3, 0x0f, 0x1b, 
+-	0xeb, 0xb3, 0xbf, 0x77, 0xbe, 0x0c, 0x19, 0x20, 
+-	0xeb, 0xb9, 0x0f, 0x87, 0xad, 0x60, 0x80, 0x3f, 
+-	0x0e, 0x0a, 0x76, 0xe4, 0xbe, 0x3c, 0xbf, 0x75, 
+-	0x0f, 0x15, 0xf8, 0x1c, 0x1f, 0x0a, 0x1f, 0x16, 
+-	0x0f, 0x87, 0x0e, 0x0a, 0x76, 0xe5, 0xbf, 0x79, 
+-	0xbe, 0x34, 0x19, 0xa0, 0xeb, 0xb9, 0x0f, 0x87, 
+-	0xad, 0xa0, 0x80, 0x3f, 0x0e, 0x0a, 0x76, 0xe6, 
+-	0xbe, 0x3c, 0xbf, 0x79, 0x0f, 0x87, 0x0e, 0x0a, 
+-	0x76, 0xe7, 0x0f, 0x15, 0xeb, 0xbe, 0x00, 0x2f, 
+-	0xdf, 0x72, 0x1d, 0xe0, 0xf8, 0x1c, 0x00, 0x28, 
+-	0xd0, 0x01, 0xa0, 0x38, 0x80, 0x3f, 0x0f, 0x87, 
+-	0xd0, 0x01, 0x4d, 0xc0, 0x1f, 0x0f, 0x1f, 0x11, 
+-	0x00, 0x2f, 0xdf, 0x76, 0xc6, 0xb2, 0x03, 0x7d, 
+-	0xde, 0x0e, 0x01, 0xa3, 0xde, 0x2d, 0x5d, 0xc0, 
+-	0x0f, 0x87, 0x1e, 0xe1, 0xeb, 0xdb, 0xad, 0xda, 
+-	0x80, 0x3f, 0x0e, 0x0a, 0x66, 0xda, 0x0c, 0x1e, 
+-	0xfb, 0xe4, 0x26, 0xbb, 0x03, 0xff, 0xdd, 0xff, 
+-	0x4d, 0xc0, 0x00, 0xa3, 0xde, 0x2d, 0xbf, 0x56, 
+-	0x0f, 0x87, 0x07, 0x7d, 0xde, 0x0e, 0x5d, 0xc0, 
+-	0x00, 0xa3, 0xde, 0x1d, 0xad, 0xda, 0x80, 0x3f, 
+-	0x0e, 0x0a, 0x66, 0xda, 0xdf, 0x5c, 0xd0, 0x0e, 
+-	0x4f, 0x00, 0x0f, 0x87, 0xd0, 0x06, 0x40, 0x3c, 
+-	0xeb, 0xf0, 0xbf, 0x3e, 0xb0, 0x04, 0xe7, 0xf2, 
+-	0xeb, 0xf6, 0xbf, 0x0c, 0xbf, 0x3a, 0x0f, 0x87, 
+-	0x0f, 0x1d, 0xfb, 0x4b, 0xbf, 0x38, 0x0f, 0x87, 
+-	0x0f, 0x1c, 0xfb, 0xcb, 0xbf, 0x30, 0x0f, 0x87, 
+-	0x50, 0x00, 0x50, 0x00, 0x0f, 0x17, 0xf9, 0x70, 
+-	0x90, 0x4d, 0x10, 0x60, 0xe5, 0x72, 0x0f, 0x49, 
+-	0x90, 0x4d, 0x10, 0x60, 0xe5, 0x76, 0x0f, 0x19, 
+-	0xf9, 0x79, 0x01, 0x46, 0xd0, 0x11, 0xa0, 0x38, 
+-	0x80, 0x3f, 0x00, 0xc6, 0xdf, 0x00, 0x00, 0x06, 
+-	0x08, 0x20, 0xd0, 0x00, 0x10, 0x08, 0xa0, 0x0a, 
+-	0xa0, 0x1b, 0x0c, 0x20, 0xd0, 0x00, 0x10, 0x08, 
+-	0xa0, 0x27, 0x90, 0x4d, 0x0f, 0xff, 0xd8, 0x1f, 
+-	0x40, 0x40, 0xa0, 0x4d, 0x80, 0x0a, 0xd0, 0x00, 
+-	0x06, 0x50, 0xf9, 0x95, 0xd0, 0x01, 0xa0, 0x09, 
+-	0x80, 0x1b, 0xa0, 0x27, 0x01, 0x20, 0xd0, 0x67, 
+-	0xa0, 0x69, 0x80, 0x2a, 0x82, 0x29, 0x80, 0x6a, 
+-	0x84, 0x29, 0xd0, 0x54, 0x10, 0x4f, 0xa0, 0x6a, 
+-	0x01, 0x20, 0xd0, 0x40, 0xa0, 0x69, 0x80, 0x2b, 
+-	0x80, 0x07, 0x08, 0x20, 0xdf, 0x00, 0x02, 0x30, 
+-	0xd0, 0x00, 0xa0, 0x38, 0x80, 0x3f, 0x01, 0xb0, 
+-	0xd0, 0x10, 0xa0, 0x37, 0x80, 0x3f, 0x02, 0x30, 
+-	0xd0, 0x01, 0xa0, 0x38, 0xd0, 0x10, 0xa0, 0x38, 
+-	0x15, 0x63, 0xe9, 0xba, 0x05, 0x5e, 0xf9, 0xfa, 
+-	0xc0, 0xdf, 0x00, 0xe0, 0xd1, 0x80, 0x70, 0x06, 
+-	0x10, 0x1c, 0xc1, 0x40, 0x11, 0x48, 0xd3, 0x10, 
+-	0x00, 0x21, 0xd0, 0x80, 0xb0, 0x16, 0xe9, 0xca, 
+-	0xd3, 0x20, 0x10, 0x81, 0xb0, 0x16, 0xf9, 0xfa, 
+-	0x30, 0xc2, 0xd2, 0x5e, 0xd0, 0x8f, 0x00, 0xee, 
+-	0xd0, 0x54, 0x70, 0x41, 0x30, 0x43, 0xed, 0xd7, 
+-	0xd2, 0x6c, 0x72, 0x49, 0xc0, 0x89, 0xb0, 0xbf, 
+-	0x10, 0x9f, 0x22, 0x42, 0x04, 0x31, 0xd0, 0x10, 
+-	0xc0, 0x42, 0x30, 0x49, 0xe5, 0xde, 0x10, 0x03, 
+-	0xc1, 0x0c, 0xc1, 0x83, 0xb1, 0xbe, 0x01, 0x46, 
+-	0x00, 0x06, 0xa0, 0x3d, 0xa0, 0x3c, 0x60, 0x06, 
+-	0x00, 0xc6, 0xb1, 0xbc, 0xb1, 0x01, 0xed, 0xe1, 
+-	0xc1, 0x0c, 0x21, 0x85, 0x01, 0x46, 0x00, 0x06, 
+-	0xa0, 0x3d, 0xa0, 0x3c, 0x60, 0x06, 0x00, 0xc6, 
+-	0xb1, 0xbc, 0xb1, 0x01, 0xed, 0xec, 0x02, 0xe4, 
+-	0xd0, 0x00, 0x20, 0xc0, 0xb2, 0x41, 0xed, 0xd8, 
+-	0x15, 0xa3, 0xfa, 0x00, 0xbc, 0x10, 0x0c, 0x1e, 
+-	0xfa, 0x00, 0xbc, 0x10, 0xd0, 0x04, 0x70, 0x00, 
+-	0x10, 0x20, 0xfa, 0x00, 0x00, 0x27, 0xd0, 0x10, 
+-	0xd0, 0x40, 0x60, 0x40, 0x00, 0x26, 0xd0, 0x14, 
+-	0x60, 0x40, 0xb0, 0x28, 0x70, 0x40, 0xb0, 0x7f, 
+-	0x60, 0x40, 0x01, 0x7a, 0xde, 0x1a, 0xe0, 0x46, 
+-	0x50, 0x00, 0x50, 0x00, 0x00, 0x28, 0xd1, 0xb0, 
+-	0x70, 0x06, 0xd0, 0x81, 0x60, 0x86, 0x10, 0x20, 
+-	0xe9, 0xab, 0xb0, 0x3f, 0x60, 0x06, 0x00, 0xec, 
+-	0xd1, 0x84, 0x70, 0x46, 0xb1, 0x84, 0x70, 0x86, 
+-	0x30, 0x42, 0xe9, 0xab, 0x70, 0x42, 0xd0, 0x35, 
+-	0x30, 0x40, 0xf9, 0xab, 0x00, 0x63, 0xd0, 0x3f, 
+-	0xb0, 0xbc, 0x40, 0x80, 0x70, 0xc2, 0x10, 0xe3, 
+-	0xe5, 0xab, 0xb0, 0xbc, 0x40, 0x80, 0x60, 0x86, 
+-	0x00, 0x28, 0xd0, 0x24, 0x70, 0x40, 0x00, 0x22, 
+-	0xd0, 0x80, 0x50, 0x42, 0x60, 0x40, 0x00, 0x64, 
+-	0xd0, 0x60, 0xd0, 0x90, 0x60, 0x81, 0x00, 0xed, 
+-	0xd1, 0x88, 0x70, 0x46, 0x10, 0xe4, 0xe9, 0xa8, 
+-	0x00, 0x21, 0xd0, 0xe8, 0xd0, 0x00, 0x60, 0x03, 
+-	0xd0, 0x81, 0x40, 0x42, 0x60, 0x46, 0x02, 0x3c, 
+-	0xda, 0x89, 0xe0, 0x46, 0xd0, 0x82, 0x50, 0x42, 
+-	0x60, 0x46, 0x00, 0x23, 0xd5, 0x3e, 0x01, 0x7a, 
+-	0xde, 0x1a, 0xe0, 0x46, 0x01, 0x46, 0xdf, 0x5c, 
+-	0x08, 0x20, 0xd1, 0x00, 0xcf, 0x04, 0x11, 0x08, 
+-	0xa1, 0x0a, 0xa1, 0x1b, 0x11, 0x1f, 0xa1, 0x27, 
+-	0xd2, 0x80, 0xb2, 0x81, 0x90, 0x4d, 0xc0, 0x01, 
+-	0x10, 0x14, 0x00, 0x16, 0xe9, 0x8d, 0x80, 0x33, 
+-	0x80, 0x3f, 0x92, 0x8b, 0x00, 0x23, 0xd0, 0x3f, 
+-	0x42, 0x80, 0xe9, 0x8d, 0x0f, 0xff, 0xdf, 0xff, 
+-	0x40, 0x01, 0xa0, 0x0d, 0xe1, 0x94, 0xa1, 0x0a, 
+-	0x00, 0xea, 0xd0, 0x00, 0xd0, 0x8e, 0x00, 0x06, 
+-	0x0f, 0x0b, 0x70, 0x80, 0x80, 0x73, 0x80, 0x0a, 
+-	0xd0, 0x00, 0x06, 0x50, 0xf9, 0x9a, 0xd0, 0x01, 
+-	0xd0, 0x44, 0x40, 0x70, 0x20, 0x01, 0x15, 0x63, 
+-	0xf9, 0xa1, 0x80, 0x1b, 0xe1, 0xa2, 0x80, 0x5b, 
+-	0xa0, 0x27, 0x01, 0x20, 0xd0, 0x67, 0xa0, 0x69, 
+-	0x80, 0x2a, 0x82, 0x29, 0x80, 0x6a, 0x84, 0x29, 
+-	0xd0, 0x54, 0x10, 0x4f, 0xa0, 0x6a, 0x01, 0x20, 
+-	0xd0, 0x40, 0xa0, 0x69, 0x80, 0x2b, 0x80, 0x07, 
+-	0x08, 0x20, 0xd0, 0x00, 0xcf, 0x00, 0x02, 0x30, 
+-	0xd0, 0x00, 0xa0, 0x38, 0x80, 0x3f, 0x01, 0xb2, 
+-	0xd2, 0x10, 0xa0, 0x37, 0x80, 0x3f, 0x02, 0x30, 
+-	0xd0, 0x01, 0xa0, 0x38, 0x00, 0x30, 0xd0, 0x10, 
+-	0xa0, 0x38, 0x80, 0x3f, 0x00, 0xc6, 0x00, 0x28, 
+-	0xd1, 0x24, 0x70, 0x04, 0xd0, 0x41, 0x50, 0x01, 
+-	0x60, 0x04, 0x00, 0x27, 0xd0, 0x18, 0x70, 0x40, 
+-	0xb0, 0x7f, 0x60, 0x40, 0x00, 0x26, 0xd0, 0x20, 
+-	0x70, 0x40, 0xb0, 0x7f, 0x60, 0x40, 0x08, 0x20, 
+-	0xdf, 0x00, 0xd4, 0x00, 0xd4, 0x40, 0xd4, 0x80, 
+-	0xd4, 0xc0, 0xd3, 0x81, 0x12, 0xa0, 0xed, 0xe3, 
+-	0xd0, 0x08, 0x0a, 0x09, 0x00, 0x4d, 0xb0, 0x01, 
+-	0xed, 0xdf, 0x03, 0xbe, 0xd6, 0x27, 0xe0, 0x46, 
+-	0x50, 0x00, 0x50, 0x00, 0x02, 0x24, 0xd0, 0x00, 
+-	0xa0, 0x37, 0x00, 0x27, 0xd3, 0xd0, 0x00, 0x26, 
+-	0xd0, 0x04, 0x73, 0xcf, 0x13, 0xe1, 0xe9, 0x7b, 
+-	0xb0, 0x3c, 0xf2, 0x00, 0x00, 0x26, 0xd0, 0x40, 
+-	0xd0, 0x00, 0x60, 0x01, 0x00, 0x26, 0xd0, 0x14, 
+-	0xf2, 0x00, 0x00, 0x26, 0xd0, 0x18, 0xf2, 0x00, 
+-	0x00, 0xee, 0xd0, 0x1c, 0x71, 0x40, 0xd1, 0x1e, 
+-	0x15, 0x63, 0xe9, 0x8d, 0x11, 0x1f, 0xc7, 0x1a, 
+-	0xb7, 0x01, 0xd3, 0x81, 0xc4, 0xd4, 0xf2, 0x04, 
+-	0x00, 0x26, 0xd0, 0x18, 0x70, 0x40, 0xb0, 0x54, 
+-	0xfd, 0x9b, 0x00, 0xed, 0xd0, 0x24, 0xd0, 0x44, 
+-	0x60, 0x40, 0x13, 0xe1, 0xf9, 0xbc, 0x15, 0xa3, 
+-	0xf9, 0xa1, 0x0c, 0x10, 0xe9, 0xb9, 0x11, 0x61, 
+-	0xe5, 0xb3, 0xed, 0xb9, 0x15, 0xa3, 0xf9, 0xab, 
+-	0x00, 0x26, 0xd0, 0x14, 0x70, 0x40, 0x10, 0x62, 
+-	0xf5, 0xb3, 0x15, 0x22, 0xe5, 0xb3, 0xc0, 0x44, 
+-	0x30, 0x54, 0xe5, 0xb3, 0x34, 0xd4, 0xf5, 0xb3, 
+-	0xe1, 0xbf, 0x03, 0xb3, 0xd8, 0x29, 0x00, 0x26, 
+-	0xd0, 0x40, 0x60, 0x01, 0xe1, 0xdb, 0x03, 0xb3, 
+-	0xd8, 0x29, 0xe0, 0x46, 0x01, 0x7a, 0xde, 0x1a, 
+-	0xe0, 0x46, 0x80, 0x07, 0x09, 0x49, 0xd4, 0x00, 
+-	0xd4, 0x40, 0xd4, 0x80, 0xd4, 0xc0, 0x00, 0x4d, 
+-	0xa0, 0x6c, 0xd3, 0x80, 0xd0, 0xa1, 0x00, 0x88, 
+-	0xd0, 0xa9, 0x00, 0x4d, 0x00, 0x50, 0xf9, 0xc9, 
+-	0x0c, 0x49, 0xd0, 0x61, 0x00, 0x8d, 0x10, 0xa0, 
+-	0xe9, 0x90, 0x30, 0x42, 0xf5, 0xd8, 0xd0, 0x61, 
+-	0x23, 0x81, 0xe1, 0xce, 0x23, 0x82, 0x13, 0xa1, 
+-	0xf9, 0x90, 0xd0, 0x42, 0x15, 0xa1, 0xf9, 0xdf, 
+-	0xb0, 0x7f, 0x00, 0x26, 0xd0, 0x14, 0x70, 0x00, 
+-	0x30, 0x01, 0xf5, 0xe8, 0x16, 0xe0, 0xe5, 0xe8, 
+-	0xb6, 0xc1, 0xbc, 0x20, 0xc0, 0x44, 0x30, 0x5b, 
+-	0xfd, 0xb9, 0xc0, 0x44, 0x30, 0x54, 0xe5, 0xb9, 
+-	0x15, 0x63, 0xf9, 0xf8, 0x15, 0xa3, 0xf9, 0xf5, 
+-	0x03, 0x3b, 0xda, 0x1c, 0xe0, 0x46, 0x03, 0x38, 
+-	0xdc, 0x17, 0xe0, 0x46, 0x15, 0xa3, 0xf9, 0xfd, 
+-	0x03, 0x72, 0xd0, 0x19, 0xe0, 0x46, 0x03, 0x3f, 
+-	0xd2, 0x17, 0xe0, 0x46, 0x70, 0x40, 0xb0, 0x7f, 
+-	0x60, 0x40, 0x0f, 0xc5, 0xdf, 0x00, 0x0c, 0x09, 
+-	0x05, 0x0d, 0x08, 0x20, 0xdf, 0x00, 0x0f, 0xc5, 
+-	0x50, 0x00, 0x50, 0x00, 0x00, 0xef, 0xd0, 0x14, 
+-	0x70, 0x40, 0x10, 0x60, 0xe9, 0x45, 0xb0, 0x04, 
+-	0x70, 0x40, 0xb0, 0x41, 0xed, 0x44, 0x00, 0xed, 
+-	0xd0, 0x24, 0xd0, 0x44, 0x60, 0x40, 0x00, 0x64, 
+-	0xd0, 0x20, 0x70, 0x00, 0x10, 0x30, 0xe9, 0x45, 
+-	0x00, 0x21, 0xd0, 0x28, 0x60, 0x40, 0x00, 0x64, 
+-	0xd2, 0xc0, 0x70, 0x0b, 0x00, 0x11, 0xe9, 0x6a, 
+-	0x08, 0x20, 0xd0, 0x4f, 0x30, 0x40, 0xe9, 0x55, 
+-	0xb0, 0x4f, 0xf9, 0x6a, 0x03, 0xef, 0xdf, 0xbf, 
+-	0xaf, 0xb8, 0xdf, 0x80, 0x0f, 0x87, 0xd0, 0x18, 
+-	0x70, 0x00, 0x10, 0x20, 0xed, 0x6c, 0xdf, 0x84, 
+-	0xd0, 0x40, 0x60, 0x7e, 0x00, 0x27, 0xd0, 0x54, 
+-	0x70, 0x41, 0x10, 0x60, 0x01, 0xa0, 0xd0, 0x40, 
+-	0xa0, 0x78, 0x80, 0x34, 0x80, 0x3f, 0x01, 0x3c, 
+-	0xd2, 0x39, 0x00, 0x21, 0xdf, 0x86, 0x0f, 0x87, 
+-	0xd0, 0x40, 0x60, 0x4b, 0x03, 0xe5, 0xd0, 0x10, 
+-	0xe0, 0x36, 0x50, 0x00, 0x00, 0x28, 0xd0, 0x24, 
+-	0x72, 0xc0, 0xd0, 0x40, 0x60, 0x40, 0xd0, 0x0c, 
+-	0x52, 0xc0, 0xc0, 0x1c, 0x30, 0x1d, 0xf5, 0x3c, 
+-	0x20, 0x1f, 0x30, 0x1e, 0x90, 0x6d, 0x20, 0x01, 
+-	0x00, 0x22, 0xd0, 0x58, 0x60, 0x01, 0x00, 0xe3, 
+-	0xd0, 0x48, 0x70, 0x41, 0x30, 0x40, 0xf5, 0x47, 
+-	0xb2, 0xc8, 0x00, 0xe3, 0xd0, 0x4c, 0x70, 0x41, 
+-	0x30, 0x40, 0xfd, 0x4d, 0xb2, 0xc4, 0x00, 0x28, 
+-	0xd0, 0x20, 0x70, 0x00, 0x42, 0xc0, 0xa2, 0xc5, 
+-	0x12, 0xe0, 0xe9, 0x55, 0x80, 0x40, 0x80, 0x34, 
+-	0x80, 0x3f, 0xcf, 0x95, 0x82, 0x34, 0x80, 0x3f, 
+-	0x03, 0xe7, 0xd0, 0x08, 0x1f, 0xa3, 0xe9, 0x60, 
+-	0x03, 0xe9, 0xd0, 0x08, 0x00, 0x27, 0xd0, 0x4c, 
+-	0x7f, 0x81, 0x00, 0x27, 0xd0, 0x54, 0x70, 0x41, 
+-	0x10, 0x60, 0x03, 0xa0, 0xd0, 0x40, 0xa0, 0x78, 
+-	0xe0, 0x3c, 0x50, 0x00, 0xc0, 0x84, 0x10, 0x8c, 
+-	0x10, 0x92, 0xd0, 0x41, 0x30, 0x4d, 0x40, 0x43, 
+-	0x10, 0x43, 0x20, 0x81, 0xd1, 0x8f, 0x41, 0x82, 
+-	0x10, 0x9c, 0x20, 0x9b, 0xc1, 0xc2, 0x10, 0x82, 
+-	0x20, 0x87, 0xc0, 0x42, 0x10, 0x43, 0x20, 0x81, 
+-	0x10, 0x88, 0x22, 0x02, 0x10, 0x97, 0x01, 0xd0, 
+-	0xe9, 0x48, 0xb0, 0x96, 0x10, 0x88, 0x22, 0x82, 
+-	0xc0, 0x5c, 0x10, 0x48, 0xc0, 0x84, 0x10, 0x91, 
+-	0x10, 0x86, 0x20, 0x42, 0x41, 0x0d, 0x11, 0x02, 
+-	0x20, 0x44, 0x22, 0x01, 0x22, 0x81, 0x02, 0xe4, 
+-	0xd2, 0x40, 0xc2, 0xca, 0xb2, 0xe0, 0x01, 0xd0, 
+-	0xe9, 0x5e, 0xc2, 0xca, 0x22, 0xc9, 0xb2, 0xa0, 
+-	0x22, 0x48, 0xd0, 0x78, 0x03, 0x50, 0xf9, 0x69, 
+-	0xd0, 0x7c, 0x01, 0x9d, 0xf9, 0x69, 0xc2, 0x48, 
+-	0xb2, 0x60, 0xc2, 0xca, 0xb2, 0xf0, 0x11, 0x82, 
+-	0x41, 0x81, 0x22, 0x06, 0x11, 0x9f, 0x41, 0x81, 
+-	0x22, 0x86, 0x0f, 0xc5, 0xc0, 0x84, 0x10, 0x8c, 
+-	0x10, 0x92, 0xd1, 0x8f, 0x41, 0x82, 0x10, 0x9c, 
+-	0xc1, 0xdb, 0x11, 0xc1, 0x21, 0xc3, 0x20, 0x87, 
+-	0xc1, 0xc2, 0x10, 0x82, 0x20, 0x87, 0xc0, 0x42, 
+-	0x10, 0x43, 0x20, 0x81, 0x10, 0x88, 0x22, 0x02, 
+-	0x10, 0x97, 0x01, 0xd0, 0xe9, 0x46, 0xb0, 0x96, 
+-	0x10, 0x88, 0x22, 0x82, 0xc0, 0x5c, 0x10, 0x48, 
+-	0xc0, 0x84, 0x10, 0x91, 0x10, 0x86, 0x20, 0x42, 
+-	0xd0, 0x81, 0x41, 0x02, 0x11, 0x02, 0x20, 0x44, 
+-	0x22, 0x01, 0x22, 0x81, 0x02, 0xe4, 0xd2, 0x40, 
+-	0xc2, 0xca, 0xb2, 0xe0, 0x01, 0xd0, 0xe9, 0x5d, 
+-	0xc2, 0xca, 0x22, 0xc9, 0xb2, 0xa0, 0x22, 0x48, 
+-	0x11, 0x9f, 0x11, 0x83, 0x22, 0x06, 0x11, 0x9c, 
+-	0x11, 0x83, 0x22, 0x86, 0x0f, 0xc5, 0xd0, 0x41, 
+-	0x40, 0x44, 0x20, 0x55, 0x10, 0x62, 0xf9, 0x6f, 
+-	0x01, 0x74, 0xd6, 0x00, 0xc2, 0x9f, 0xc2, 0x1f, 
+-	0x22, 0x80, 0xe1, 0x30, 0x0f, 0x11, 0xf9, 0x51, 
+-	0x90, 0x38, 0x80, 0x3f, 0x00, 0x1b, 0xf9, 0x51, 
+-	0x00, 0x27, 0xd0, 0x04, 0x70, 0x40, 0x30, 0x71, 
+-	0xf9, 0x51, 0xb0, 0x3c, 0x70, 0x40, 0x30, 0x5d, 
+-	0xf9, 0x51, 0xb0, 0x08, 0x70, 0x40, 0xb0, 0x7f, 
+-	0x60, 0x40, 0x10, 0x63, 0xe5, 0x5d, 0x02, 0x20, 
+-	0xd0, 0x01, 0xa0, 0x37, 0x00, 0x26, 0xd0, 0x24, 
+-	0x70, 0x40, 0xb0, 0x7f, 0x60, 0x40, 0xb0, 0x08, 
+-	0x70, 0x40, 0xb0, 0x41, 0x60, 0x40, 0x00, 0x26, 
+-	0xd0, 0x30, 0x70, 0x40, 0xb0, 0x7f, 0x60, 0x40, 
+-	0xb0, 0x30, 0xd0, 0x40, 0x60, 0x40, 0xb0, 0x3c, 
+-	0x6c, 0x40, 0xb0, 0x3c, 0x67, 0x40, 0x00, 0x33, 
+-	0xdf, 0x78, 0xe0, 0x36, 0x00, 0x26, 0xd0, 0x1c, 
+-	0x70, 0x40, 0xb0, 0x7f, 0x60, 0x40, 0xb0, 0x3c, 
+-	0x70, 0x40, 0xb0, 0x41, 0x60, 0x40, 0x08, 0x20, 
+-	0xdf, 0x00, 0x80, 0x35, 0xc0, 0x3c, 0x10, 0x08, 
+-	0xa0, 0x0a, 0xa0, 0x27, 0xa0, 0x1b, 0xdf, 0x5c, 
+-	0x01, 0xa0, 0xd0, 0x00, 0xa0, 0x38, 0x80, 0x3f, 
+-	0x80, 0x34, 0x80, 0x3f, 0x03, 0xba, 0xda, 0x1e, 
+-	0xcf, 0x95, 0x82, 0x34, 0x80, 0x3f, 0x03, 0xe7, 
+-	0xd0, 0x08, 0x1f, 0xa3, 0xe9, 0x55, 0x1f, 0xa0, 
+-	0xe9, 0x55, 0x03, 0xe9, 0xd0, 0x08, 0x00, 0x21, 
+-	0xdf, 0x86, 0xe0, 0x3c, 0x89, 0x78, 0x89, 0x37, 
+-	0x00, 0xee, 0xd0, 0x14, 0x76, 0x00, 0xd0, 0x30, 
+-	0x76, 0x40, 0x26, 0x58, 0xd6, 0xd9, 0x00, 0xee, 
+-	0xd0, 0x20, 0x75, 0x40, 0xd0, 0x1c, 0x71, 0x40, 
+-	0xd0, 0x20, 0x71, 0x00, 0xd0, 0x24, 0x70, 0x80, 
+-	0xc4, 0x02, 0xd0, 0x28, 0x70, 0xc0, 0x00, 0x21, 
+-	0xd0, 0x10, 0x72, 0x00, 0x93, 0x90, 0xd4, 0x81, 
+-	0x13, 0x96, 0x43, 0x92, 0x34, 0x8e, 0x00, 0x22, 
+-	0xd1, 0xa4, 0x71, 0x86, 0xde, 0x40, 0x7e, 0x79, 
+-	0xd0, 0x18, 0x70, 0x40, 0xb0, 0x41, 0xf5, 0x58, 
+-	0xd3, 0x42, 0x50, 0x4d, 0x60, 0x40, 0x10, 0x60, 
+-	0xe5, 0x62, 0xd0, 0x54, 0x70, 0x01, 0xb0, 0x3c, 
+-	0x60, 0x01, 0x04, 0x2d, 0xd0, 0x08, 0xe0, 0x36, 
+-	0x00, 0x22, 0xd0, 0x60, 0x71, 0xc1, 0xd0, 0x4f, 
+-	0x41, 0xc1, 0x03, 0xef, 0xd0, 0x30, 0xe0, 0x36, 
+-	0x50, 0x00, 0x50, 0x00, 0x04, 0x21, 0xd0, 0x20, 
+-	0xd3, 0x44, 0x72, 0x8d, 0x12, 0xa0, 0xe8, 0x36, 
+-	0xc0, 0x47, 0x10, 0x5d, 0x30, 0x4e, 0xf8, 0x36, 
+-	0xb2, 0x3e, 0x60, 0x4d, 0x00, 0xed, 0xd0, 0x48, 
+-	0x70, 0x01, 0xde, 0x45, 0x50, 0x39, 0x00, 0x1b, 
+-	0xf9, 0x44, 0xb0, 0x01, 0x00, 0x1c, 0xf9, 0x47, 
+-	0xb0, 0x04, 0x60, 0x01, 0xd0, 0x40, 0x62, 0x81, 
+-	0xce, 0x4a, 0xd0, 0x43, 0x41, 0xc1, 0xd0, 0x58, 
+-	0x61, 0xc1, 0x90, 0x43, 0x00, 0xe0, 0xd0, 0x28, 
+-	0x70, 0x00, 0x10, 0x1f, 0x20, 0x40, 0xb1, 0xc1, 
+-	0xf5, 0x54, 0x00, 0x21, 0xd0, 0x08, 0x60, 0x40, 
+-	0x00, 0xe6, 0xd0, 0x40, 0x70, 0x41, 0xd2, 0x94, 
+-	0x60, 0x4a, 0x04, 0x2b, 0xd0, 0x10, 0x01, 0x90, 
+-	0xf8, 0x36, 0x04, 0x2d, 0xd0, 0x08, 0xe0, 0x36, 
+-	0x50, 0x00, 0x50, 0x00, 0xc0, 0x47, 0x10, 0x5d, 
+-	0x30, 0x4e, 0xf9, 0x41, 0x90, 0x43, 0x00, 0xe0, 
+-	0xd0, 0x28, 0x70, 0x00, 0x20, 0x40, 0x00, 0x21, 
+-	0xd0, 0x08, 0x60, 0x40, 0x00, 0x26, 0xd0, 0x74, 
+-	0x70, 0x01, 0xb0, 0x3f, 0x60, 0x01, 0x00, 0xed, 
+-	0xd0, 0x48, 0x70, 0x41, 0x00, 0x5e, 0xf9, 0x4b, 
+-	0x00, 0x21, 0xd0, 0x00, 0x73, 0x80, 0xd4, 0x81, 
+-	0x34, 0x8e, 0x00, 0x34, 0xd3, 0x48, 0xe0, 0x36, 
+-	0x50, 0x00, 0x50, 0x00, 0xd1, 0x88, 0xd1, 0xc8, 
+-	0x01, 0x1b, 0xe9, 0x39, 0x11, 0x9f, 0x11, 0xdf, 
+-	0xd4, 0x80, 0xd3, 0x81, 0xe1, 0x43, 0x00, 0xed, 
+-	0xd0, 0x08, 0x70, 0x00, 0x00, 0x10, 0xf9, 0x37, 
+-	0x0c, 0x1f, 0xf9, 0x36, 0x13, 0xa1, 0xe9, 0x43, 
+-	0xbe, 0x7c, 0x00, 0x65, 0xd2, 0x46, 0x12, 0x48, 
+-	0xc0, 0x39, 0x30, 0x18, 0xe5, 0x4b, 0xd2, 0x70, 
+-	0x72, 0x49, 0x22, 0x79, 0x00, 0x21, 0xd0, 0x00, 
+-	0x63, 0x80, 0x04, 0x24, 0xd0, 0x00, 0x02, 0x10, 
+-	0xe9, 0x56, 0xd0, 0x41, 0x51, 0x41, 0xe0, 0x36, 
+-	0x15, 0x61, 0xe8, 0x36, 0xd5, 0x80, 0xd3, 0x00, 
+-	0xd3, 0x40, 0x04, 0x27, 0xd0, 0x20, 0xe0, 0x36, 
+-	0x50, 0x00, 0x50, 0x00, 0x00, 0x21, 0xd0, 0x18, 
+-	0x73, 0x00, 0xb0, 0x04, 0x73, 0x80, 0xd2, 0x80, 
+-	0xb0, 0x38, 0x72, 0xc0, 0x31, 0x0d, 0xc0, 0x0e, 
+-	0x10, 0x0b, 0x10, 0x20, 0xe9, 0x42, 0xf5, 0x3f, 
+-	0x22, 0x8d, 0x10, 0x01, 0x13, 0x5f, 0xe1, 0x3b, 
+-	0x33, 0x8b, 0x15, 0x61, 0xf9, 0x49, 0x00, 0x21, 
+-	0xd0, 0x64, 0x70, 0x41, 0x33, 0x81, 0x03, 0xd0, 
+-	0xe9, 0x4c, 0x20, 0x0b, 0x13, 0xdf, 0x12, 0xc1, 
+-	0x13, 0xe0, 0xf9, 0x49, 0x10, 0x03, 0xc0, 0x50, 
+-	0x10, 0x4b, 0x13, 0x0b, 0x23, 0x00, 0x13, 0x20, 
+-	0xe9, 0x5c, 0xf5, 0x59, 0x22, 0x81, 0x13, 0x01, 
+-	0x10, 0x5f, 0xe1, 0x55, 0x12, 0x99, 0x12, 0x87, 
+-	0x21, 0x0a, 0x00, 0xa0, 0xd2, 0x80, 0xc3, 0x0a, 
+-	0x03, 0x90, 0xe9, 0x66, 0x22, 0x82, 0x23, 0x03, 
+-	0x10, 0x81, 0x10, 0xc1, 0x13, 0x9f, 0x13, 0xa0, 
+-	0xed, 0x62, 0xc0, 0x8a, 0xc0, 0xcc, 0x04, 0x26, 
+-	0xd0, 0x00, 0xe0, 0x36, 0x15, 0x61, 0xf9, 0x3d, 
+-	0x07, 0x32, 0xd0, 0x00, 0x30, 0x03, 0xed, 0x3d, 
+-	0xc0, 0x03, 0x10, 0x1d, 0x30, 0xc0, 0xc0, 0x02, 
+-	0x10, 0x1d, 0x30, 0x80, 0xe1, 0x32, 0x10, 0x94, 
+-	0x10, 0xd4, 0x00, 0x21, 0xd0, 0x20, 0x73, 0x00, 
+-	0xc5, 0x8c, 0xd3, 0x4e, 0x01, 0x1b, 0xe9, 0x48, 
+-	0x13, 0x1f, 0xd3, 0x4f, 0x43, 0x4c, 0x13, 0x1c, 
+-	0xc0, 0x0c, 0x10, 0x03, 0x20, 0x0c, 0xc0, 0x40, 
+-	0x10, 0x42, 0x20, 0x40, 0x10, 0x46, 0x20, 0x4d, 
+-	0x10, 0x42, 0x2e, 0x41, 0x10, 0x5c, 0x10, 0x43, 
+-	0x00, 0x59, 0xe9, 0x5b, 0x01, 0x69, 0xd0, 0x20, 
+-	0x30, 0x40, 0x22, 0x41, 0x04, 0x27, 0xd0, 0x20, 
+-	0xe0, 0x36, 0x50, 0x00, 0x2c, 0x14, 0xd0, 0x34, 
+-	0x63, 0x00, 0xd0, 0x38, 0x72, 0xc0, 0xc0, 0x51, 
+-	0x10, 0x5c, 0x30, 0x4b, 0x10, 0x44, 0xd4, 0xc0, 
+-	0xd5, 0x00, 0xc0, 0x18, 0x30, 0x39, 0xed, 0x5f, 
+-	0xd4, 0xd0, 0xc5, 0x01, 0xd0, 0x18, 0x70, 0x00, 
+-	0x0c, 0x1f, 0xe9, 0x48, 0x10, 0x20, 0xfd, 0x48, 
+-	0xd4, 0xc0, 0xd5, 0x00, 0x10, 0x22, 0xe5, 0x4e, 
+-	0xd4, 0xc0, 0xbc, 0x30, 0xd5, 0x00, 0xb5, 0x10, 
+-	0xb0, 0x3f, 0xf9, 0x52, 0x3c, 0x01, 0x3c, 0x01, 
+-	0x02, 0x1f, 0xe9, 0x5f, 0x00, 0xa8, 0xd3, 0xc0, 
+-	0xd3, 0x9e, 0x00, 0xa9, 0xd0, 0x38, 0x70, 0x4f, 
+-	0xb3, 0xfc, 0x60, 0x40, 0xb0, 0x3c, 0xb3, 0x81, 
+-	0xed, 0x59, 0x00, 0x21, 0xd0, 0x28, 0x70, 0x00, 
+-	0x10, 0x20, 0xf9, 0x69, 0x02, 0x1f, 0xf9, 0x6a, 
+-	0x90, 0x10, 0x00, 0x1e, 0xe9, 0x6a, 0xb1, 0x7c, 
+-	0x04, 0x29, 0xd0, 0x20, 0xe0, 0x36, 0x50, 0x00, 
+-	0x50, 0x00, 0x50, 0x00, 0x01, 0x5e, 0xf9, 0x35, 
+-	0x01, 0x50, 0xe9, 0x35, 0xb1, 0x78, 0xd2, 0x00, 
+-	0x01, 0x5c, 0xf9, 0x5f, 0xc0, 0x18, 0x30, 0x39, 
+-	0xed, 0x5f, 0x11, 0x9f, 0xce, 0x58, 0xc2, 0x59, 
+-	0x00, 0xa9, 0xd2, 0x38, 0x14, 0x82, 0x22, 0x12, 
+-	0xc0, 0x0c, 0x10, 0x1f, 0x10, 0x03, 0x22, 0x00, 
+-	0x70, 0x48, 0x03, 0x10, 0xe9, 0x4c, 0xb2, 0x38, 
+-	0xbe, 0x60, 0xb2, 0x60, 0x2e, 0x41, 0x10, 0x5f, 
+-	0x00, 0x59, 0xe9, 0x53, 0x01, 0x69, 0xd0, 0x3c, 
+-	0x30, 0x40, 0x22, 0x41, 0x13, 0x41, 0x2e, 0x4d, 
+-	0x13, 0x5d, 0x13, 0x43, 0x22, 0x4d, 0x14, 0xe0, 
+-	0xe9, 0x5f, 0x33, 0x0b, 0x13, 0x04, 0x2c, 0x0c, 
+-	0x35, 0x0c, 0xc3, 0x46, 0xc3, 0x87, 0x04, 0x61, 
+-	0xd0, 0x28, 0x15, 0x62, 0xfc, 0x36, 0x04, 0x2f, 
+-	0xd0, 0x28, 0xe0, 0x36, 0x00, 0x22, 0xd0, 0x74, 
+-	0x74, 0x01, 0xb0, 0x7c, 0x74, 0x41, 0xb0, 0x7c, 
+-	0x00, 0x27, 0xd0, 0x20, 0x30, 0x11, 0xf5, 0x3b, 
+-	0x24, 0x40, 0x71, 0x41, 0xd1, 0x08, 0xc0, 0x10, 
+-	0x10, 0x1c, 0xb0, 0x16, 0xf9, 0x4a, 0x00, 0x23, 
+-	0xd0, 0x30, 0x30, 0x11, 0xf9, 0x4a, 0xb1, 0x70, 
+-	0x01, 0x50, 0xf9, 0x4a, 0xb1, 0x20, 0x14, 0x41, 
+-	0xc0, 0x90, 0x00, 0x2b, 0xd0, 0xd0, 0x01, 0x50, 
+-	0xe9, 0x50, 0xc0, 0xd0, 0x00, 0x34, 0xdc, 0x00, 
+-	0x20, 0x11, 0x10, 0x1f, 0xa0, 0x1c, 0x00, 0x21, 
+-	0xd0, 0x2c, 0x70, 0x00, 0x10, 0x05, 0x51, 0x40, 
+-	0xd0, 0x1c, 0x61, 0x40, 0xd0, 0x20, 0x61, 0x00, 
+-	0xd0, 0x24, 0x60, 0x80, 0xd0, 0x28, 0x60, 0xc0, 
+-	0x04, 0x2d, 0xd0, 0x08, 0x00, 0x22, 0xd0, 0x64, 
+-	0xb1, 0x81, 0x61, 0x81, 0xe0, 0x36, 0x50, 0x00, 
+-	0x50, 0x00, 0x50, 0x00, 0x90, 0x50, 0xd0, 0x3c, 
+-	0x10, 0x41, 0x60, 0x40, 0x15, 0x62, 0xfd, 0x3d, 
+-	0xc0, 0x10, 0x10, 0x1e, 0x10, 0x07, 0x21, 0x00, 
+-	0x10, 0x16, 0x34, 0x00, 0xc0, 0x90, 0xd3, 0x40, 
+-	0x00, 0x24, 0xd3, 0xc0, 0x04, 0x22, 0xd0, 0x20, 
+-	0x01, 0x9f, 0xe8, 0x36, 0xd0, 0x54, 0x70, 0x41, 
+-	0x73, 0x41, 0x04, 0x2e, 0xd0, 0x00, 0xe0, 0x36, 
+-	0x50, 0x00, 0x50, 0x00, 0x00, 0xef, 0xd3, 0x30, 
+-	0x73, 0x0c, 0xd0, 0x0c, 0x70, 0x00, 0xc0, 0x40, 
+-	0x13, 0x24, 0xf5, 0x42, 0x13, 0x22, 0xe9, 0x41, 
+-	0xe5, 0x43, 0xd3, 0x00, 0x10, 0x22, 0xf9, 0x41, 
+-	0xd0, 0x01, 0xd0, 0x43, 0xd3, 0x01, 0x21, 0x00, 
+-	0xd3, 0x40, 0x03, 0x10, 0xf9, 0x47, 0xd3, 0x40, 
+-	0xe1, 0x61, 0x00, 0x23, 0xd0, 0x00, 0x10, 0x61, 
+-	0xe9, 0x50, 0xb0, 0x33, 0x10, 0x63, 0xe9, 0x50, 
+-	0x00, 0x22, 0xd0, 0x1a, 0xc3, 0xc0, 0xd2, 0xc0, 
+-	0x00, 0x10, 0xe9, 0x55, 0x22, 0xd0, 0x10, 0x1f, 
+-	0x14, 0x01, 0x10, 0x20, 0xed, 0x52, 0x14, 0x18, 
+-	0x12, 0xd8, 0xc0, 0x8b, 0x32, 0xd0, 0x12, 0xc3, 
+-	0x33, 0x4b, 0x13, 0x47, 0x21, 0x0d, 0x04, 0x22, 
+-	0xd0, 0x20, 0xe0, 0x36, 0x00, 0x24, 0xd0, 0x30, 
+-	0xd0, 0x40, 0x60, 0x40, 0xd3, 0xc7, 0x43, 0xc4, 
+-	0x31, 0x0f, 0xd5, 0xd4, 0x25, 0xcf, 0x15, 0xc4, 
+-	0x10, 0xdf, 0xc2, 0xc6, 0xc3, 0x07, 0x11, 0x81, 
+-	0xb1, 0x3b, 0x15, 0x64, 0xe9, 0x47, 0x10, 0xdf, 
+-	0x12, 0xc1, 0x11, 0x81, 0x11, 0xc1, 0xb1, 0x3f, 
+-	0xb5, 0xf8, 0x90, 0x10, 0x00, 0x16, 0xf9, 0x5e, 
+-	0xb5, 0xfc, 0xd0, 0x20, 0x40, 0x39, 0x2e, 0x4b, 
+-	0x22, 0x4c, 0x12, 0x20, 0xe9, 0x59, 0x20, 0x39, 
+-	0x00, 0x1b, 0xe9, 0x59, 0x2c, 0x13, 0x35, 0x13, 
+-	0x0e, 0x5a, 0xf9, 0x59, 0xb2, 0x38, 0x02, 0xe3, 
+-	0xd0, 0x00, 0x0e, 0x5a, 0xe9, 0x5e, 0x2e, 0x40, 
+-	0x01, 0xee, 0xd2, 0x80, 0x42, 0x84, 0xc0, 0x03, 
+-	0x30, 0x02, 0xf5, 0x6b, 0x31, 0x0a, 0x12, 0x98, 
+-	0x20, 0x03, 0xf5, 0x69, 0x12, 0x9f, 0x12, 0x87, 
+-	0x51, 0x0a, 0x00, 0x34, 0xd4, 0xc8, 0xe0, 0x36, 
+-	0x50, 0x00, 0x50, 0x00, 0xd3, 0xc7, 0x43, 0xc4, 
+-	0x15, 0x61, 0xf9, 0x48, 0x10, 0xc1, 0xd5, 0xe0, 
+-	0xd1, 0x80, 0xd1, 0xc0, 0x31, 0x0f, 0x13, 0xe1, 
+-	0xe9, 0x3c, 0xd3, 0xc0, 0x00, 0x24, 0xd0, 0x30, 
+-	0x63, 0xc0, 0x25, 0xcf, 0x15, 0xc2, 0xd0, 0x03, 
+-	0x40, 0x16, 0x25, 0xc0, 0x15, 0xc2, 0x15, 0x81, 
+-	0x35, 0x91, 0xe1, 0x5c, 0x00, 0x24, 0xd0, 0x30, 
+-	0x63, 0xc0, 0x01, 0x50, 0xe9, 0x54, 0x15, 0xa0, 
+-	0xf9, 0x55, 0x00, 0x24, 0xd0, 0x34, 0x70, 0x00, 
+-	0x10, 0x20, 0xe9, 0x55, 0xd3, 0xc0, 0x31, 0x0f, 
+-	0xd5, 0xfc, 0x25, 0xcf, 0x15, 0xc3, 0x14, 0xa0, 
+-	0xe9, 0x5c, 0xb5, 0xfc, 0x00, 0x34, 0xd4, 0xc8, 
+-	0xe0, 0x36, 0x50, 0x00, 0xc4, 0x91, 0x34, 0x96, 
+-	0xed, 0x34, 0xd4, 0x80, 0x14, 0x84, 0xb3, 0xc1, 
+-	0xe5, 0x41, 0xc0, 0x52, 0x10, 0x5e, 0x34, 0x81, 
+-	0xb3, 0xc1, 0xe5, 0x41, 0xc0, 0x52, 0x10, 0x5c, 
+-	0x24, 0x81, 0xb3, 0xc1, 0xe5, 0x37, 0x02, 0x68, 
+-	0xd0, 0x00, 0xb4, 0xb0, 0x14, 0x9b, 0x00, 0x23, 
+-	0xd0, 0x70, 0x30, 0x52, 0xed, 0x4a, 0x24, 0x81, 
+-	0x20, 0x12, 0xa0, 0x1c, 0x10, 0x8a, 0x50, 0x83, 
+-	0xa0, 0x96, 0xa1, 0x50, 0xa1, 0x11, 0xc0, 0x52, 
+-	0xd4, 0x84, 0x10, 0x6c, 0xed, 0x56, 0xd4, 0x81, 
+-	0xd1, 0x00, 0xb1, 0x13, 0x00, 0x23, 0xd1, 0x40, 
+-	0xc2, 0xb9, 0x22, 0x86, 0x12, 0x20, 0xf9, 0x66, 
+-	0x02, 0xe3, 0xd0, 0x40, 0x02, 0x9a, 0xe9, 0x63, 
+-	0x22, 0x81, 0x02, 0x5a, 0xe9, 0x66, 0x22, 0x41, 
+-	0x75, 0xd7, 0xc3, 0xd7, 0xd0, 0xd7, 0x00, 0x21, 
+-	0xd0, 0xb6, 0x8b, 0x38, 0x00, 0x33, 0xdc, 0xd0, 
+-	0xe0, 0x36, 0x50, 0x00, 0xd0, 0x7c, 0x60, 0x01, 
+-	0xae, 0x52, 0xd0, 0x60, 0x40, 0x79, 0x00, 0x13, 
+-	0xe8, 0xc9, 0xa2, 0x94, 0x22, 0x86, 0x13, 0xe0, 
+-	0xe4, 0xd0, 0x13, 0xc1, 0x15, 0x62, 0xfc, 0xd1, 
+-	0x13, 0xc1, 0xe0, 0xd1, 0xc3, 0xd7, 0x03, 0xd9, 
+-	0xe8, 0xd4, 0x22, 0x8d, 0x15, 0x62, 0xfc, 0xda, 
+-	0x03, 0xda, 0xe8, 0xda, 0x22, 0x8d, 0x22, 0x8d, 
+-	0xce, 0x4a, 0x22, 0x86, 0x00, 0x14, 0xe8, 0xe0, 
+-	0xa2, 0x53, 0x22, 0x47, 0x03, 0xd1, 0xe8, 0xe8, 
+-	0x22, 0x4e, 0x15, 0x62, 0xfc, 0xe8, 0x03, 0xd2, 
+-	0xe8, 0xe8, 0x22, 0x4e, 0x12, 0x20, 0xe9, 0x09, 
+-	0x20, 0x79, 0x00, 0x5b, 0xe8, 0xf4, 0x15, 0x20, 
+-	0xfc, 0xf1, 0x2c, 0x13, 0x35, 0x13, 0x0e, 0x5b, 
+-	0xe8, 0xf4, 0xb2, 0x38, 0x02, 0x9a, 0xe8, 0xfb, 
+-	0x70, 0x08, 0xd0, 0x7c, 0x42, 0x81, 0x22, 0x98, 
+-	0x22, 0x80, 0x02, 0x5a, 0xe9, 0x11, 0x70, 0x08, 
+-	0xd0, 0x78, 0x42, 0x41, 0x22, 0x59, 0x10, 0x1f, 
+-	0x22, 0x40, 0x00, 0x19, 0xe9, 0x11, 0x01, 0x69, 
+-	0xd0, 0x7c, 0x32, 0x41, 0xe1, 0x11, 0x02, 0xe3, 
+-	0xd0, 0x40, 0x02, 0x9a, 0xe9, 0x0e, 0x22, 0x81, 
+-	0x02, 0x5a, 0xe9, 0x11, 0x22, 0x41, 0x0e, 0x5a, 
+-	0xe9, 0x15, 0xce, 0x4a, 0x3e, 0x46, 0x0f, 0x87, 
+-	0xdd, 0x48, 0xe1, 0x19, 0xdd, 0x40, 0xdc, 0xc8, 
+-	0xdd, 0x3c, 0x7d, 0x34, 0x1d, 0x19, 0x3d, 0x35, 
+-	0x4d, 0x33, 0x4c, 0xec, 0x3d, 0x33, 0xf9, 0x17, 
+-	0x0f, 0xc5, 0x50, 0x00, 0xd0, 0x39, 0xd0, 0x35, 
+-	0xd0, 0x1d, 0xd0, 0x2d, 0xd0, 0x3f, 0xd0, 0x2e, 
+-	0xd0, 0x3c, 0xd0, 0x37, 0xd0, 0x38, 0xd0, 0x19, 
+-	0xd0, 0x33, 0xd0, 0x2e, 0xd0, 0x3d, 0xd0, 0x3e, 
+-	0xd0, 0x27, 0xd0, 0x3e, 0xd0, 0x3a, 0xd0, 0x2f, 
+-	0xd0, 0x32, 0x00, 0x00, 0x47, 0x78, 0x46, 0xc0, 
+-	0xe1, 0x01, 0x00, 0x90, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0x47, 0x78, 0x00, 0x00, 0xe9, 0x2d, 0x40, 0x00, 
+-	0xe5, 0x9f, 0x20, 0x6c, 0xe0, 0x21, 0x10, 0x01, 
+-	0xe1, 0x02, 0x00, 0x91, 0xe3, 0x50, 0x00, 0x00, 
+-	0x1a, 0x00, 0x00, 0x02, 0xe3, 0xa0, 0x00, 0x00, 
+-	0xeb, 0x00, 0x38, 0x99, 0xea, 0xff, 0xff, 0xf7, 
+-	0xe8, 0xbd, 0x40, 0x00, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0xb5, 0x00, 0x4a, 0x12, 0x68, 0x10, 0x28, 0x00, 
+-	0xd1, 0x03, 0x20, 0x00, 0xf7, 0xf1, 0xff, 0xc6, 
+-	0xe7, 0xf7, 0xbd, 0x00, 0x47, 0x78, 0x00, 0x00, 
+-	0xe9, 0x2d, 0x40, 0x00, 0xe5, 0x9f, 0x20, 0x2c, 
+-	0xe3, 0xa0, 0x10, 0x01, 0xe1, 0x02, 0x00, 0x91, 
+-	0xe3, 0x50, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x02, 
+-	0xe3, 0xa0, 0x00, 0x00, 0xeb, 0x00, 0x38, 0x88, 
+-	0xea, 0xff, 0xff, 0xf7, 0xe8, 0xbd, 0x00, 0x01, 
+-	0xe1, 0x2f, 0xff, 0x10, 0x48, 0x02, 0x40, 0x49, 
+-	0x60, 0x01, 0x47, 0x70, 0x70, 0x00, 0x00, 0x34, 
+-	0x2e, 0x08, 0x1f, 0xa8, 0x47, 0x78, 0x46, 0xc0, 
+-	0xe1, 0xa0, 0x09, 0x00, 0xe1, 0xb0, 0x10, 0x01, 
+-	0x03, 0xc0, 0x01, 0x02, 0x13, 0x80, 0x01, 0x02, 
+-	0xe3, 0xa0, 0x13, 0x3f, 0xe3, 0xa0, 0x30, 0x0e, 
+-	0xe1, 0xb0, 0x10, 0x81, 0x3a, 0x00, 0x00, 0x04, 
+-	0xe1, 0xb0, 0x00, 0x80, 0x32, 0x21, 0x13, 0x03, 
+-	0xe2, 0x53, 0x30, 0x01, 0x1a, 0xff, 0xff, 0xf9, 
+-	0xea, 0x00, 0x00, 0x03, 0xe1, 0xb0, 0x00, 0x80, 
+-	0x22, 0x21, 0x13, 0x03, 0xe2, 0x53, 0x30, 0x01, 
+-	0x1a, 0xff, 0xff, 0xf4, 0xe1, 0xa0, 0x0d, 0x21, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0xe9, 0x2d, 0x41, 0xf0, 
+-	0xe2, 0x4d, 0xd0, 0x14, 0xe3, 0xa0, 0xc0, 0x44, 
+-	0xe2, 0x8c, 0xc4, 0x66, 0xe5, 0x9c, 0xc0, 0x00, 
+-	0xe5, 0x9f, 0x01, 0x94, 0xe5, 0x80, 0xc0, 0x00, 
+-	0xe1, 0xa0, 0xc1, 0x4c, 0xe2, 0x0c, 0xc0, 0x03, 
+-	0xe5, 0x9f, 0x01, 0x88, 0xe5, 0xc0, 0xc0, 0x00, 
+-	0xe5, 0x9f, 0x01, 0x84, 0xe5, 0x90, 0x00, 0x00, 
+-	0xe0, 0x80, 0x64, 0x0c, 0xe1, 0xa0, 0x70, 0x06, 
+-	0xe8, 0xb7, 0x00, 0x01, 0xe2, 0x00, 0x40, 0x1f, 
+-	0xe2, 0x8f, 0x2f, 0x69, 0xe7, 0x92, 0x21, 0x04, 
+-	0xe3, 0x52, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x51, 
+-	0xe5, 0x9f, 0x32, 0x1c, 0xe2, 0x83, 0x50, 0xbc, 
+-	0xe5, 0x9f, 0x12, 0x1c, 0xe1, 0x55, 0x00, 0x01, 
+-	0x03, 0xa0, 0x50, 0x00, 0xe5, 0x9f, 0x12, 0x04, 
+-	0xe1, 0x51, 0x00, 0x05, 0x0a, 0x00, 0x00, 0x45, 
+-	0xe5, 0x9f, 0x81, 0xf4, 0xe0, 0x88, 0x80, 0x03, 
+-	0xe5, 0x9f, 0x11, 0x5c, 0xe1, 0xa0, 0x36, 0x20, 
+-	0xe2, 0x03, 0x30, 0x0f, 0xe1, 0x81, 0x10, 0x03, 
+-	0xe5, 0x9f, 0x21, 0x48, 0xe7, 0x92, 0x31, 0x04, 
+-	0xe1, 0xa0, 0x39, 0x83, 0xe1, 0xa0, 0x35, 0xa3, 
+-	0xe1, 0x81, 0x10, 0x03, 0xe1, 0xa0, 0x33, 0xa0, 
+-	0xe2, 0x03, 0x30, 0x01, 0xe1, 0xa0, 0x3b, 0x03, 
+-	0xe1, 0x81, 0x10, 0x03, 0xe1, 0xa0, 0x35, 0x20, 
+-	0xe2, 0x03, 0x30, 0x03, 0xe1, 0xa0, 0x32, 0x03, 
+-	0xe1, 0x81, 0x10, 0x03, 0xe1, 0xa0, 0x3a, 0xa0, 
+-	0xe2, 0x03, 0x30, 0x01, 0xe1, 0xa0, 0x3b, 0x83, 
+-	0xe1, 0x81, 0x10, 0x03, 0xe1, 0xa0, 0x34, 0xa0, 
+-	0xe2, 0x03, 0x30, 0x01, 0xe1, 0xa0, 0x3a, 0x83, 
+-	0xe1, 0x81, 0x10, 0x03, 0xe2, 0x00, 0x30, 0x60, 
+-	0xe1, 0xa0, 0x30, 0x83, 0xe1, 0x81, 0x10, 0x03, 
+-	0xe8, 0xa8, 0x00, 0x02, 0xe5, 0x9f, 0x00, 0xf0, 
+-	0xe3, 0xa0, 0x10, 0x30, 0xe5, 0x80, 0x10, 0x00, 
+-	0xe5, 0x9f, 0x00, 0x9c, 0xe5, 0xd0, 0x40, 0x00, 
+-	0xe2, 0x84, 0x10, 0x01, 0xe5, 0xc0, 0x10, 0x00, 
+-	0xe2, 0x04, 0x40, 0x00, 0xe5, 0x9f, 0x00, 0x98, 
+-	0xe5, 0x90, 0x10, 0x00, 0xe3, 0x11, 0x00, 0x10, 
+-	0x1a, 0x00, 0x00, 0x1a, 0xe5, 0x80, 0x10, 0x00, 
+-	0xe5, 0x8f, 0x51, 0x4c, 0xe1, 0xa0, 0x22, 0x04, 
+-	0xe1, 0x82, 0x10, 0x0c, 0xe5, 0x9f, 0x00, 0xac, 
+-	0xe0, 0x80, 0x02, 0x01, 0xe5, 0x80, 0x70, 0x00, 
+-	0xe5, 0x80, 0x80, 0x04, 0xe5, 0x9f, 0x10, 0x5c, 
+-	0xe5, 0x80, 0x10, 0x08, 0xe5, 0x9f, 0x10, 0x58, 
+-	0xe5, 0x80, 0x10, 0x0c, 0xe5, 0x9f, 0x00, 0x58, 
+-	0xe5, 0x90, 0x10, 0x00, 0xe0, 0x84, 0x00, 0x01, 
+-	0xe3, 0xa0, 0x20, 0x01, 0xe1, 0xa0, 0x00, 0x12, 
+-	0xe3, 0xa0, 0x10, 0x40, 0xe2, 0x81, 0x14, 0x66, 
+-	0xe5, 0x81, 0x00, 0x00, 0xe3, 0xa0, 0x10, 0x01, 
+-	0xe1, 0xa0, 0x0c, 0x11, 0xe3, 0xa0, 0x10, 0xb8, 
+-	0xe2, 0x81, 0x14, 0x66, 0xe5, 0x81, 0x00, 0x00, 
+-	0xe2, 0x8d, 0xd0, 0x14, 0xe8, 0xbd, 0x81, 0xf0, 
+-	0xe5, 0x9f, 0x10, 0xf0, 0xe2, 0x81, 0x10, 0x01, 
+-	0xe5, 0x8f, 0x10, 0xe8, 0xea, 0xff, 0xff, 0xf4, 
+-	0xe5, 0x9f, 0xf0, 0x08, 0xa0, 0x00, 0x05, 0xc4, 
+-	0x80, 0x00, 0x00, 0xb8, 0x00, 0x00, 0x00, 0x10, 
+-	0x00, 0x00, 0x06, 0xf4, 0xa0, 0x00, 0x04, 0x28, 
+-	0xa0, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x05, 0x50, 
+-	0x2c, 0x00, 0x1f, 0xe8, 0x2c, 0x00, 0x1f, 0xea, 
+-	0x2c, 0x00, 0x1f, 0xf4, 0x00, 0x00, 0x05, 0xe0, 
+-	0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x12, 
+-	0x2c, 0x00, 0x02, 0x00, 0x64, 0x00, 0x04, 0x00, 
+-	0x64, 0x00, 0x00, 0x80, 0x47, 0x00, 0x00, 0x00, 
+-	0x9e, 0x00, 0x00, 0xc0, 0x66, 0x00, 0x00, 0x50, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0xea, 0x00, 0x00, 0x07, 
+-	0xe1, 0xb0, 0xf0, 0x0e, 0xe5, 0x9f, 0xf1, 0x00, 
+-	0xe2, 0x5e, 0xf0, 0x04, 0xe2, 0x5e, 0xf0, 0x08, 
+-	0xea, 0x00, 0x00, 0x02, 0xe5, 0x9f, 0xf0, 0xec, 
+-	0xe2, 0x5e, 0xf0, 0x04, 0x2c, 0x00, 0x00, 0xe8, 
+-	0xe1, 0x0f, 0x00, 0x00, 0xe3, 0xc0, 0x00, 0x1f, 
+-	0xe3, 0x80, 0x00, 0x1b, 0xe1, 0x29, 0xf0, 0x00, 
+-	0xe5, 0x9f, 0xd0, 0xd8, 0xe5, 0x9f, 0x00, 0xd8, 
+-	0xe0, 0x8d, 0xd0, 0x00, 0xe1, 0x0f, 0x00, 0x00, 
+-	0xe3, 0xc0, 0x00, 0x1f, 0xe3, 0x80, 0x00, 0x13, 
+-	0xe1, 0x29, 0xf0, 0x00, 0xe5, 0x9f, 0xd0, 0xc4, 
+-	0xe5, 0x9f, 0x00, 0xc4, 0xe0, 0x8d, 0xd0, 0x00, 
+-	0xe1, 0x0f, 0x00, 0x00, 0xe3, 0xc0, 0x00, 0x1f, 
+-	0xe3, 0x80, 0x00, 0x12, 0xe1, 0x29, 0xf0, 0x00, 
+-	0xe5, 0x9f, 0xd0, 0xb0, 0xe5, 0x9f, 0x00, 0xb0, 
+-	0xe0, 0x8d, 0xd0, 0x00, 0xe1, 0x0f, 0x00, 0x00, 
+-	0xe3, 0xc0, 0x00, 0x9f, 0xe3, 0x80, 0x00, 0x10, 
+-	0xe1, 0x29, 0xf0, 0x00, 0xe5, 0x9f, 0xd0, 0x60, 
+-	0xeb, 0x00, 0x00, 0x08, 0xe5, 0x9f, 0x00, 0x64, 
+-	0xe5, 0x9f, 0x10, 0x5c, 0xeb, 0x00, 0x37, 0xa7, 
+-	0xe5, 0x9f, 0x00, 0x60, 0xe5, 0x9f, 0x10, 0x58, 
+-	0xeb, 0x00, 0x37, 0xa7, 0xe5, 0x9f, 0xe0, 0x58, 
+-	0xe3, 0x8e, 0xe0, 0x01, 0xe1, 0x2f, 0xff, 0x1e, 
+-	0xe5, 0x9f, 0x00, 0x8c, 0xe5, 0x9f, 0x10, 0x8c, 
+-	0xe5, 0x9f, 0x30, 0x8c, 0xe1, 0x50, 0x00, 0x01, 
+-	0x0a, 0x00, 0x00, 0x03, 0xe1, 0x51, 0x00, 0x03, 
+-	0x34, 0x90, 0x20, 0x04, 0x34, 0x81, 0x20, 0x04, 
+-	0x3a, 0xff, 0xff, 0xfb, 0xe5, 0x9f, 0x10, 0x74, 
+-	0xe3, 0xa0, 0x20, 0x00, 0xe1, 0x53, 0x00, 0x01, 
+-	0x34, 0x83, 0x20, 0x04, 0x3a, 0xff, 0xff, 0xfc, 
+-	0xe1, 0x2f, 0xff, 0x1e, 0x2e, 0x1b, 0xff, 0xf0, 
+-	0x2e, 0x1b, 0x7f, 0xf0, 0x2e, 0x1b, 0x7f, 0xef, 
+-	0x2e, 0x08, 0x9a, 0x00, 0xcc, 0x1f, 0xff, 0xef, 
+-	0xcc, 0x1f, 0x7f, 0xf0, 0x2e, 0x00, 0x1c, 0x39, 
+-	0x2e, 0x01, 0xca, 0x48, 0x2e, 0x01, 0xcb, 0x40, 
+-	0x2e, 0x08, 0x32, 0xf4, 0x00, 0x00, 0x08, 0x00, 
+-	0x2e, 0x08, 0x22, 0xf4, 0x00, 0x00, 0x08, 0x00, 
+-	0x2e, 0x08, 0x2a, 0xf4, 0x00, 0x00, 0x08, 0x00, 
+-	0x2e, 0x08, 0x59, 0xb0, 0xe5, 0x9f, 0xf0, 0x04, 
+-	0xe5, 0x9f, 0xf0, 0x04, 0xe5, 0x9f, 0xf0, 0x04, 
+-	0x2e, 0x08, 0x59, 0xb0, 0x2e, 0x08, 0x59, 0xb1, 
+-	0x2e, 0x08, 0x59, 0xb2, 0x2e, 0x03, 0x3b, 0xfc, 
+-	0x2e, 0x08, 0x00, 0x00, 0x2e, 0x08, 0x3b, 0x70, 
+-	0x2e, 0x08, 0x99, 0xfc, 0x1d, 0x77, 0x1e, 0x16, 
+-	0x03, 0x00, 0x03, 0x03, 0x1d, 0x7f, 0x50, 0x50, 
+-	0x4f, 0x5d, 0x49, 0x5d, 0x40, 0x4a, 0x44, 0x43, 
+-	0x01, 0x49, 0x4d, 0x56, 0x48, 0x4b, 0x5d, 0x4f, 
+-	0x5d, 0x4d, 0x4f, 0x0a, 0x78, 0x71, 0x73, 0x7f, 
+-	0x70, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x1b, 
+-	0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 
+-	0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 
+-	0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 
+-	0x08, 0x0f, 0x0f, 0x0d, 0x13, 0x0d, 0x11, 0x0e, 
+-	0x07, 0x08, 0x09, 0x0d, 0x0d, 0x15, 0x10, 0x05, 
+-	0x08, 0x08, 0x09, 0x0e, 0x07, 0x08, 0x07, 0x07, 
+-	0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 
+-	0x0d, 0x0d, 0x07, 0x07, 0x0e, 0x0e, 0x0e, 0x0d, 
+-	0x18, 0x0f, 0x10, 0x11, 0x11, 0x10, 0x0f, 0x13, 
+-	0x11, 0x06, 0x0c, 0x10, 0x0d, 0x13, 0x11, 0x13, 
+-	0x10, 0x13, 0x11, 0x10, 0x0e, 0x11, 0x0f, 0x17, 
+-	0x0f, 0x10, 0x0f, 0x07, 0x07, 0x07, 0x0c, 0x0d, 
+-	0x08, 0x0d, 0x0e, 0x0c, 0x0e, 0x0d, 0x07, 0x0e, 
+-	0x0e, 0x05, 0x06, 0x0c, 0x06, 0x14, 0x0e, 0x0d, 
+-	0x0e, 0x0e, 0x08, 0x0c, 0x07, 0x0e, 0x0b, 0x11, 
+-	0x0b, 0x0c, 0x0c, 0x08, 0x06, 0x08, 0x0e, 0x12, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1f, 0xfe, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 
+-	0x1f, 0xfe, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 
+-	0x1f, 0xfe, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 
+-	0x1f, 0xfe, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 
+-	0x1f, 0xfe, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 
+-	0x1f, 0xfe, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 
+-	0x1f, 0xfe, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 
+-	0x1f, 0xfe, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x1f, 0xfe, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 
+-	0x1f, 0xfe, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 
+-	0x1f, 0xfe, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 
+-	0x1f, 0xfe, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 
+-	0x1f, 0xfe, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 
+-	0x1f, 0xfe, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 
+-	0x1f, 0xfe, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 
+-	0x1f, 0xfe, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x06, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x01, 0x98, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x03, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x06, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x01, 0x98, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x03, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x0f, 0x80, 0x00, 0x00, 
+-	0x03, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x03, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1f, 0xfe, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 
+-	0x1f, 0xfe, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 
+-	0x1f, 0xfe, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 
+-	0x1f, 0xfe, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1f, 0xc0, 0x00, 0x00, 
+-	0x07, 0xc0, 0x00, 0x00, 0x19, 0x80, 0x00, 0x00, 
+-	0x0f, 0xfe, 0x00, 0x00, 0x0c, 0xc0, 0x00, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x0c, 0xc0, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0xe0, 0x00, 0x00, 
+-	0x07, 0xc0, 0x00, 0x00, 0x19, 0x80, 0x00, 0x00, 
+-	0x1e, 0x0f, 0x00, 0x00, 0x0c, 0xc0, 0x00, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x0c, 0xc0, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x30, 0x60, 0x00, 0x00, 
+-	0x06, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x03, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x30, 0x60, 0x00, 0x00, 
+-	0x0e, 0xe0, 0x00, 0x00, 0x1f, 0x80, 0x00, 0x00, 
+-	0x30, 0x01, 0x80, 0x00, 0x0f, 0x80, 0x00, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x30, 0x60, 0x00, 0x00, 
+-	0x0c, 0x60, 0x00, 0x00, 0x3f, 0xc0, 0x00, 0x00, 
+-	0x70, 0x01, 0xc0, 0x00, 0x3f, 0xe0, 0x00, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x30, 0xc0, 0x00, 0x00, 
+-	0x0c, 0x60, 0x00, 0x00, 0x70, 0xe0, 0x00, 0x00, 
+-	0x60, 0x00, 0xc0, 0x00, 0x38, 0xe0, 0x00, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x30, 0xc0, 0x00, 0x00, 
+-	0x1c, 0x70, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
+-	0x60, 0x00, 0xc0, 0x00, 0x70, 0x70, 0x00, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x30, 0xc0, 0x00, 0x00, 
+-	0x18, 0x30, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
+-	0x60, 0x00, 0xc0, 0x00, 0x60, 0x30, 0x00, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x30, 0xf0, 0x00, 0x00, 
+-	0x38, 0x38, 0x00, 0x00, 0x03, 0xe0, 0x00, 0x00, 
+-	0x60, 0x00, 0xc0, 0x00, 0x60, 0x30, 0x00, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0xfe, 0x00, 0x00, 0x00, 0x30, 0x78, 0x00, 0x00, 
+-	0x3f, 0xf8, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 
+-	0x60, 0x00, 0xc0, 0x00, 0x60, 0x30, 0x00, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0xfe, 0x00, 0x00, 0x00, 0x30, 0x1c, 0x00, 0x00, 
+-	0x3f, 0xf8, 0x00, 0x00, 0x3e, 0x60, 0x00, 0x00, 
+-	0x70, 0x01, 0xc0, 0x00, 0x60, 0x30, 0x00, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x30, 0x0c, 0x00, 0x00, 
+-	0x70, 0x1c, 0x00, 0x00, 0x70, 0x60, 0x00, 0x00, 
+-	0x30, 0x01, 0x80, 0x00, 0x60, 0x30, 0x00, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x32, 0x0c, 0x00, 0x00, 
+-	0x60, 0x0c, 0x00, 0x00, 0x60, 0xe0, 0x00, 0x00, 
+-	0x38, 0x03, 0x80, 0x00, 0x70, 0x70, 0x00, 0x00, 
+-	0x38, 0x0e, 0x00, 0x00, 0x30, 0x70, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x37, 0x1c, 0x00, 0x00, 
+-	0x60, 0x0c, 0x00, 0x00, 0x71, 0xe0, 0x00, 0x00, 
+-	0x1e, 0x0f, 0x00, 0x00, 0x38, 0xe0, 0x00, 0x00, 
+-	0x1c, 0x1c, 0x00, 0x00, 0x38, 0xf0, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x10, 0x02, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x33, 0xf8, 0x00, 0x00, 
+-	0xe0, 0x0e, 0x00, 0x00, 0x7f, 0xe0, 0x00, 0x00, 
+-	0x0f, 0xfe, 0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 
+-	0x0f, 0xf8, 0x00, 0x00, 0x1f, 0xf0, 0x00, 0x00, 
+-	0x1f, 0xfe, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 
+-	0x1f, 0xfe, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 
+-	0x1f, 0xfe, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 
+-	0x1f, 0xfe, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x31, 0xf0, 0x00, 0x00, 
+-	0xc0, 0x06, 0x00, 0x00, 0x1e, 0x30, 0x00, 0x00, 
+-	0x03, 0xf8, 0x00, 0x00, 0x0f, 0x80, 0x00, 0x00, 
+-	0x07, 0xf0, 0x00, 0x00, 0x0f, 0x30, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x66, 0x00, 0x00, 0x00, 0x06, 0x30, 0x00, 0x00, 
+-	0x1f, 0xc0, 0x00, 0x00, 0x1e, 0x03, 0x00, 0x00, 
+-	0x07, 0x80, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x06, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x66, 0x00, 0x00, 0x00, 0x0e, 0x70, 0x00, 0x00, 
+-	0x3f, 0xe0, 0x00, 0x00, 0x33, 0x07, 0x00, 0x00, 
+-	0x0f, 0xc0, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x0c, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x66, 0x00, 0x00, 0x00, 0x0e, 0x70, 0x00, 0x00, 
+-	0x7a, 0xf0, 0x00, 0x00, 0x61, 0x86, 0x00, 0x00, 
+-	0x1c, 0xe0, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x7f, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x66, 0x00, 0x00, 0x00, 0x0c, 0x60, 0x00, 0x00, 
+-	0x62, 0x30, 0x00, 0x00, 0x61, 0x8e, 0x00, 0x00, 
+-	0x18, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x18, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x3f, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x66, 0x00, 0x00, 0x00, 0x0c, 0x60, 0x00, 0x00, 
+-	0x62, 0x00, 0x00, 0x00, 0x61, 0x8c, 0x00, 0x00, 
+-	0x18, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x1e, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x66, 0x00, 0x00, 0x00, 0xff, 0xf8, 0x00, 0x00, 
+-	0x72, 0x00, 0x00, 0x00, 0x61, 0x9c, 0x00, 0x00, 
+-	0x0c, 0xe0, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x33, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0xff, 0xf8, 0x00, 0x00, 
+-	0x7a, 0x00, 0x00, 0x00, 0x61, 0xb8, 0x00, 0x00, 
+-	0x0f, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 
+-	0x33, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0xc0, 0x00, 0x00, 
+-	0x3f, 0x80, 0x00, 0x00, 0x33, 0x30, 0x00, 0x00, 
+-	0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0xc0, 0x00, 0x00, 
+-	0x0f, 0xe0, 0x00, 0x00, 0x1e, 0x73, 0xc0, 0x00, 
+-	0x1f, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x60, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x7f, 0xf8, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0xc0, 0x00, 0x00, 
+-	0x02, 0xe0, 0x00, 0x00, 0x00, 0x66, 0x60, 0x00, 
+-	0x39, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x60, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x7f, 0xf8, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x39, 0xc0, 0x00, 0x00, 
+-	0x02, 0x70, 0x00, 0x00, 0x00, 0xec, 0x30, 0x00, 
+-	0x70, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x60, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0xff, 0xf8, 0x00, 0x00, 
+-	0x02, 0x30, 0x00, 0x00, 0x00, 0xcc, 0x30, 0x00, 
+-	0x60, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x60, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0xff, 0xf8, 0x00, 0x00, 
+-	0x62, 0x30, 0x00, 0x00, 0x01, 0xcc, 0x30, 0x00, 
+-	0x60, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x60, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x31, 0x80, 0x00, 0x00, 
+-	0x72, 0x70, 0x00, 0x00, 0x01, 0x8c, 0x30, 0x00, 
+-	0x70, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x60, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x73, 0x80, 0x00, 0x00, 
+-	0x3a, 0xf0, 0x00, 0x00, 0x03, 0x8c, 0x30, 0x00, 
+-	0x38, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x73, 0x80, 0x00, 0x00, 
+-	0x3f, 0xe0, 0x00, 0x00, 0x03, 0x06, 0x60, 0x00, 
+-	0x3f, 0xee, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x63, 0x00, 0x00, 0x00, 
+-	0x0f, 0x80, 0x00, 0x00, 0x07, 0x03, 0xc0, 0x00, 
+-	0x0f, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x18, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0c, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0f, 0x80, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 
+-	0x0f, 0xc0, 0x00, 0x00, 0x1f, 0x80, 0x00, 0x00, 
+-	0x00, 0xc0, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 
+-	0x0f, 0xc0, 0x00, 0x00, 0x7f, 0xf0, 0x00, 0x00, 
+-	0x0f, 0x80, 0x00, 0x00, 0x0f, 0x80, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x00, 0x00, 
+-	0x3f, 0xe0, 0x00, 0x00, 0x03, 0x80, 0x00, 0x00, 
+-	0x3f, 0xe0, 0x00, 0x00, 0x3f, 0xc0, 0x00, 0x00, 
+-	0x01, 0xc0, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 
+-	0x1f, 0xe0, 0x00, 0x00, 0x7f, 0xf0, 0x00, 0x00, 
+-	0x1f, 0xc0, 0x00, 0x00, 0x3f, 0xc0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 
+-	0x38, 0xe0, 0x00, 0x00, 0x07, 0x80, 0x00, 0x00, 
+-	0x38, 0xf0, 0x00, 0x00, 0x70, 0xe0, 0x00, 0x00, 
+-	0x03, 0xc0, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x70, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
+-	0x38, 0xe0, 0x00, 0x00, 0x38, 0xe0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0xf0, 0x00, 0x00, 
+-	0x70, 0x60, 0x00, 0x00, 0x0f, 0x80, 0x00, 0x00, 
+-	0x70, 0x70, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
+-	0x03, 0xc0, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x30, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
+-	0x30, 0x60, 0x00, 0x00, 0x70, 0x70, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x60, 0x00, 0x00, 0x00, 0x70, 0x70, 0x00, 0x00, 
+-	0x70, 0x70, 0x00, 0x00, 0x1d, 0x80, 0x00, 0x00, 
+-	0x60, 0x30, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
+-	0x06, 0xc0, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 
+-	0x30, 0x60, 0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x78, 0x00, 0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 
+-	0x60, 0x30, 0x00, 0x00, 0x19, 0x80, 0x00, 0x00, 
+-	0x00, 0x30, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
+-	0x0e, 0xc0, 0x00, 0x00, 0x3f, 0x80, 0x00, 0x00, 
+-	0x60, 0x00, 0x00, 0x00, 0x01, 0xc0, 0x00, 0x00, 
+-	0x30, 0x60, 0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x03, 0xe0, 0x00, 0x00, 0x7f, 0xf0, 0x00, 0x00, 
+-	0x3e, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 
+-	0x60, 0x30, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 
+-	0x00, 0x70, 0x00, 0x00, 0x01, 0xc0, 0x00, 0x00, 
+-	0x0c, 0xc0, 0x00, 0x00, 0x7f, 0xe0, 0x00, 0x00, 
+-	0x67, 0x80, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 
+-	0x38, 0xe0, 0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0f, 0x80, 0x00, 0x00, 0x7f, 0xf0, 0x00, 0x00, 
+-	0x0f, 0x80, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 
+-	0x60, 0x30, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 
+-	0x00, 0x60, 0x00, 0x00, 0x07, 0x80, 0x00, 0x00, 
+-	0x1c, 0xc0, 0x00, 0x00, 0x70, 0xe0, 0x00, 0x00, 
+-	0x7f, 0xe0, 0x00, 0x00, 0x03, 0x80, 0x00, 0x00, 
+-	0x1f, 0xc0, 0x00, 0x00, 0x70, 0x70, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x01, 0xe0, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 
+-	0x60, 0x30, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 
+-	0x00, 0xc0, 0x00, 0x00, 0x07, 0xe0, 0x00, 0x00, 
+-	0x38, 0xc0, 0x00, 0x00, 0x60, 0x70, 0x00, 0x00, 
+-	0x78, 0xe0, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 
+-	0x1f, 0xc0, 0x00, 0x00, 0x38, 0xf0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x70, 0x00, 0x00, 0x03, 0xc0, 0x00, 0x00, 
+-	0x60, 0x30, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 
+-	0x01, 0x80, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
+-	0x30, 0xc0, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 
+-	0x70, 0x70, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 
+-	0x30, 0xe0, 0x00, 0x00, 0x3f, 0xf0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x01, 0xe0, 0x00, 0x00, 0x03, 0x80, 0x00, 0x00, 
+-	0x60, 0x30, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 
+-	0x03, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 
+-	0x70, 0xc0, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 
+-	0x60, 0x30, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 
+-	0x60, 0x70, 0x00, 0x00, 0x0f, 0x30, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0f, 0x80, 0x00, 0x00, 0x7f, 0xf0, 0x00, 0x00, 
+-	0x0f, 0x80, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 
+-	0x60, 0x30, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 
+-	0x07, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 
+-	0x7f, 0xf0, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 
+-	0x60, 0x30, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 
+-	0x60, 0x30, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x03, 0xe0, 0x00, 0x00, 0x7f, 0xf0, 0x00, 0x00, 
+-	0x3e, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 
+-	0x60, 0x30, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 
+-	0x7f, 0xf0, 0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 
+-	0x60, 0x30, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 
+-	0x60, 0x30, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x78, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 
+-	0x70, 0x70, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x70, 0x70, 0x00, 0x00, 
+-	0x00, 0xc0, 0x00, 0x00, 0x70, 0x70, 0x00, 0x00, 
+-	0x30, 0x70, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 
+-	0x60, 0x30, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0xe0, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x38, 0xe0, 0x00, 0x00, 
+-	0x00, 0xc0, 0x00, 0x00, 0x38, 0xe0, 0x00, 0x00, 
+-	0x38, 0xe0, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x38, 0x60, 0x00, 0x00, 0x70, 0xe0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x3f, 0xe0, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 
+-	0x7f, 0xf0, 0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 
+-	0x00, 0xc0, 0x00, 0x00, 0x3f, 0xc0, 0x00, 0x00, 
+-	0x1f, 0xe0, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x3f, 0xe0, 0x00, 0x00, 0x3f, 0xc0, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 
+-	0x1f, 0x80, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 
+-	0x7f, 0xf0, 0x00, 0x00, 0x0f, 0x80, 0x00, 0x00, 
+-	0x00, 0xc0, 0x00, 0x00, 0x0f, 0x80, 0x00, 0x00, 
+-	0x0f, 0x80, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x0f, 0x80, 0x00, 0x00, 0x1f, 0x80, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0xff, 0x00, 0x00, 0x03, 0x80, 0x00, 0x00, 
+-	0x3f, 0xf0, 0x00, 0x00, 0x03, 0xf8, 0x00, 0x00, 
+-	0x3f, 0xf0, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
+-	0x3f, 0xfc, 0x00, 0x00, 0x03, 0xf8, 0x00, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x00, 0xc0, 0x00, 0x00, 0x30, 0x0f, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x38, 0x03, 0x80, 0x00, 
+-	0x38, 0x06, 0x00, 0x00, 0x03, 0xf8, 0x00, 0x00, 
+-	0x03, 0xff, 0xc0, 0x00, 0x07, 0xc0, 0x00, 0x00, 
+-	0x3f, 0xf8, 0x00, 0x00, 0x0f, 0xfc, 0x00, 0x00, 
+-	0x3f, 0xfc, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
+-	0x3f, 0xfc, 0x00, 0x00, 0x0f, 0xfe, 0x00, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x00, 0xc0, 0x00, 0x00, 0x30, 0x1e, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x3c, 0x07, 0x80, 0x00, 
+-	0x38, 0x06, 0x00, 0x00, 0x0f, 0xfe, 0x00, 0x00, 
+-	0x07, 0xc1, 0xe0, 0x00, 0x07, 0xc0, 0x00, 0x00, 
+-	0x30, 0x1c, 0x00, 0x00, 0x1e, 0x1e, 0x00, 0x00, 
+-	0x30, 0x1c, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x1e, 0x0f, 0x00, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x00, 0xc0, 0x00, 0x00, 0x30, 0x3c, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x3c, 0x07, 0x80, 0x00, 
+-	0x3c, 0x06, 0x00, 0x00, 0x1e, 0x0f, 0x00, 0x00, 
+-	0x0e, 0x00, 0x70, 0x00, 0x06, 0xc0, 0x00, 0x00, 
+-	0x30, 0x0c, 0x00, 0x00, 0x38, 0x07, 0x00, 0x00, 
+-	0x30, 0x0e, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x38, 0x03, 0x00, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x00, 0xc0, 0x00, 0x00, 0x30, 0x70, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x3c, 0x07, 0x80, 0x00, 
+-	0x3e, 0x06, 0x00, 0x00, 0x38, 0x03, 0x80, 0x00, 
+-	0x1c, 0x79, 0xb8, 0x00, 0x0e, 0xe0, 0x00, 0x00, 
+-	0x30, 0x0c, 0x00, 0x00, 0x30, 0x07, 0x00, 0x00, 
+-	0x30, 0x07, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x03, 0x80, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x00, 0xc0, 0x00, 0x00, 0x30, 0xe0, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x36, 0x0d, 0x80, 0x00, 
+-	0x36, 0x06, 0x00, 0x00, 0x30, 0x01, 0x80, 0x00, 
+-	0x39, 0xff, 0x9c, 0x00, 0x0c, 0x60, 0x00, 0x00, 
+-	0x30, 0x0c, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 
+-	0x30, 0x07, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x00, 0xc0, 0x00, 0x00, 0x31, 0xc0, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x36, 0x0d, 0x80, 0x00, 
+-	0x37, 0x06, 0x00, 0x00, 0x70, 0x01, 0xc0, 0x00, 
+-	0x31, 0xcf, 0x9c, 0x00, 0x0c, 0x60, 0x00, 0x00, 
+-	0x30, 0x1c, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x30, 0x03, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x00, 0xc0, 0x00, 0x00, 0x37, 0x80, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x36, 0x0d, 0x80, 0x00, 
+-	0x33, 0x06, 0x00, 0x00, 0x60, 0x00, 0xc0, 0x00, 
+-	0x33, 0x87, 0x0c, 0x00, 0x1c, 0x70, 0x00, 0x00, 
+-	0x3f, 0xf8, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x30, 0x03, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 
+-	0x3f, 0xf8, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x3f, 0xfe, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x00, 0xc0, 0x00, 0x00, 0x3f, 0x80, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x37, 0x1d, 0x80, 0x00, 
+-	0x31, 0x86, 0x00, 0x00, 0x60, 0x00, 0xc0, 0x00, 
+-	0x77, 0x03, 0x0c, 0x00, 0x18, 0x30, 0x00, 0x00, 
+-	0x3f, 0xf8, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x30, 0x03, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 
+-	0x3f, 0xf8, 0x00, 0x00, 0x60, 0x3f, 0x80, 0x00, 
+-	0x3f, 0xfe, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x00, 0xc0, 0x00, 0x00, 0x3f, 0xc0, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x33, 0x19, 0x80, 0x00, 
+-	0x31, 0xc6, 0x00, 0x00, 0x60, 0x00, 0xc0, 0x00, 
+-	0x67, 0x03, 0x0c, 0x00, 0x38, 0x38, 0x00, 0x00, 
+-	0x30, 0x1c, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x30, 0x03, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x60, 0x3f, 0x80, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x00, 0xc0, 0x00, 0x00, 0x3d, 0xe0, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x33, 0x19, 0x80, 0x00, 
+-	0x30, 0xc6, 0x00, 0x00, 0x60, 0x00, 0xc0, 0x00, 
+-	0x66, 0x03, 0x0c, 0x00, 0x3f, 0xf8, 0x00, 0x00, 
+-	0x30, 0x0e, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x30, 0x03, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x60, 0x01, 0x80, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x00, 0xc0, 0x00, 0x00, 0x38, 0xe0, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x33, 0x19, 0x80, 0x00, 
+-	0x30, 0x66, 0x00, 0x00, 0x60, 0x00, 0xc0, 0x00, 
+-	0x66, 0x07, 0x1c, 0x00, 0x3f, 0xf8, 0x00, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x70, 0x03, 0x00, 0x00, 
+-	0x30, 0x07, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x70, 0x01, 0x80, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x00, 0xc0, 0x00, 0x00, 0x30, 0x70, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x31, 0xb1, 0x80, 0x00, 
+-	0x30, 0x76, 0x00, 0x00, 0x70, 0x01, 0xc0, 0x00, 
+-	0x66, 0x06, 0x18, 0x00, 0x70, 0x1c, 0x00, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x07, 0x00, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x01, 0x80, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x60, 0xc0, 0x00, 0x00, 0x30, 0x38, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x31, 0xb1, 0x80, 0x00, 
+-	0x30, 0x36, 0x00, 0x00, 0x30, 0x01, 0x80, 0x00, 
+-	0x67, 0x0e, 0x38, 0x00, 0x60, 0x0c, 0x00, 0x00, 
+-	0x30, 0x0e, 0x00, 0x00, 0x38, 0x06, 0x00, 0x00, 
+-	0x30, 0x0e, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x38, 0x03, 0x80, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x60, 0xc0, 0x00, 0x00, 0x30, 0x3c, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x31, 0xf1, 0x80, 0x00, 
+-	0x30, 0x3e, 0x00, 0x00, 0x38, 0x03, 0x80, 0x00, 
+-	0x77, 0x1e, 0x70, 0x00, 0x60, 0x0c, 0x00, 0x00, 
+-	0x30, 0x1e, 0x00, 0x00, 0x1e, 0x1e, 0x00, 0x00, 
+-	0x30, 0x1c, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x1e, 0x0f, 0x80, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x71, 0xc0, 0x00, 0x00, 0x30, 0x1c, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x31, 0xf1, 0x80, 0x00, 
+-	0x30, 0x1e, 0x00, 0x00, 0x1e, 0x0f, 0x00, 0x00, 
+-	0x73, 0xff, 0xe0, 0x00, 0xe0, 0x0e, 0x00, 0x00, 
+-	0x3f, 0xfc, 0x00, 0x00, 0x0f, 0xfc, 0x00, 0x00, 
+-	0x3f, 0xfc, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x0f, 0xff, 0x00, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x3f, 0x80, 0x00, 0x00, 0x30, 0x0e, 0x00, 0x00, 
+-	0x3f, 0xf0, 0x00, 0x00, 0x30, 0xe1, 0x80, 0x00, 
+-	0x30, 0x0e, 0x00, 0x00, 0x0f, 0xfe, 0x00, 0x00, 
+-	0x39, 0xe7, 0xc0, 0x00, 0xc0, 0x06, 0x00, 0x00, 
+-	0x3f, 0xf0, 0x00, 0x00, 0x07, 0xf0, 0x00, 0x00, 
+-	0x3f, 0xf0, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x03, 0xfc, 0x00, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x1f, 0x00, 0x00, 0x00, 0x30, 0x07, 0x00, 0x00, 
+-	0x3f, 0xf0, 0x00, 0x00, 0x30, 0xe1, 0x80, 0x00, 
+-	0x30, 0x0e, 0x00, 0x00, 0x03, 0xf8, 0x00, 0x00, 
+-	0x3c, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1e, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0f, 0xc0, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x03, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x3f, 0xf8, 0x00, 0x00, 0x03, 0xf8, 0x00, 0x00, 
+-	0x3f, 0xf8, 0x00, 0x00, 0x07, 0xf0, 0x00, 0x00, 
+-	0xff, 0xfc, 0x00, 0x00, 0x30, 0x06, 0x00, 0x00, 
+-	0xc0, 0x06, 0x00, 0x00, 0xc0, 0x38, 0x06, 0x00, 
+-	0x70, 0x1c, 0x00, 0x00, 0xe0, 0x07, 0x00, 0x00, 
+-	0x7f, 0xfc, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 
+-	0xc0, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 
+-	0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x3f, 0xfc, 0x00, 0x00, 0x0f, 0xfe, 0x00, 0x00, 
+-	0x3f, 0xfc, 0x00, 0x00, 0x1f, 0xfc, 0x00, 0x00, 
+-	0xff, 0xfc, 0x00, 0x00, 0x30, 0x06, 0x00, 0x00, 
+-	0xe0, 0x0e, 0x00, 0x00, 0xe0, 0x7c, 0x0e, 0x00, 
+-	0x38, 0x38, 0x00, 0x00, 0x70, 0x0e, 0x00, 0x00, 
+-	0x7f, 0xfc, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 
+-	0xe0, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 
+-	0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x1e, 0x00, 0x00, 0x1e, 0x0f, 0x00, 0x00, 
+-	0x30, 0x1e, 0x00, 0x00, 0x3c, 0x1c, 0x00, 0x00, 
+-	0x03, 0x00, 0x00, 0x00, 0x30, 0x06, 0x00, 0x00, 
+-	0x60, 0x0c, 0x00, 0x00, 0xe0, 0x7c, 0x0e, 0x00, 
+-	0x1c, 0x70, 0x00, 0x00, 0x30, 0x1c, 0x00, 0x00, 
+-	0x00, 0x38, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x60, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x0e, 0x00, 0x00, 0x38, 0x03, 0x80, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x0e, 0x00, 0x00, 
+-	0x03, 0x00, 0x00, 0x00, 0x30, 0x06, 0x00, 0x00, 
+-	0x70, 0x1c, 0x00, 0x00, 0x60, 0x6c, 0x0c, 0x00, 
+-	0x1c, 0x70, 0x00, 0x00, 0x38, 0x1c, 0x00, 0x00, 
+-	0x00, 0x30, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x60, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x1f, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x01, 0x80, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x30, 0x06, 0x00, 0x00, 
+-	0x03, 0x00, 0x00, 0x00, 0x30, 0x06, 0x00, 0x00, 
+-	0x70, 0x1c, 0x00, 0x00, 0x60, 0xec, 0x0c, 0x00, 
+-	0x0e, 0xe0, 0x00, 0x00, 0x1c, 0x38, 0x00, 0x00, 
+-	0x00, 0x70, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x60, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x19, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x70, 0x01, 0xc0, 0x00, 
+-	0x30, 0x06, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x03, 0x00, 0x00, 0x00, 0x30, 0x06, 0x00, 0x00, 
+-	0x30, 0x18, 0x00, 0x00, 0x70, 0xee, 0x1c, 0x00, 
+-	0x06, 0xc0, 0x00, 0x00, 0x0e, 0x70, 0x00, 0x00, 
+-	0x00, 0xe0, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x39, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x0e, 0x00, 0x00, 0x60, 0x00, 0xc0, 0x00, 
+-	0x30, 0x1e, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 
+-	0x03, 0x00, 0x00, 0x00, 0x30, 0x06, 0x00, 0x00, 
+-	0x38, 0x38, 0x00, 0x00, 0x70, 0xc6, 0x1c, 0x00, 
+-	0x07, 0xc0, 0x00, 0x00, 0x06, 0x60, 0x00, 0x00, 
+-	0x01, 0xc0, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x30, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x1c, 0x00, 0x00, 0x60, 0x00, 0xc0, 0x00, 
+-	0x3f, 0xfc, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 
+-	0x03, 0x00, 0x00, 0x00, 0x30, 0x06, 0x00, 0x00, 
+-	0x18, 0x30, 0x00, 0x00, 0x30, 0xc6, 0x18, 0x00, 
+-	0x03, 0x80, 0x00, 0x00, 0x07, 0xe0, 0x00, 0x00, 
+-	0x03, 0x80, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x70, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x3f, 0xfc, 0x00, 0x00, 0x60, 0x00, 0xc0, 0x00, 
+-	0x3f, 0xf8, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 
+-	0x03, 0x00, 0x00, 0x00, 0x30, 0x06, 0x00, 0x00, 
+-	0x18, 0x30, 0x00, 0x00, 0x31, 0xc7, 0x18, 0x00, 
+-	0x03, 0x80, 0x00, 0x00, 0x03, 0xc0, 0x00, 0x00, 
+-	0x03, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x3f, 0xf0, 0x00, 0x00, 0x60, 0x00, 0xc0, 0x00, 
+-	0x30, 0xe0, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 
+-	0x03, 0x00, 0x00, 0x00, 0x30, 0x06, 0x00, 0x00, 
+-	0x1c, 0x70, 0x00, 0x00, 0x31, 0x83, 0x18, 0x00, 
+-	0x07, 0xc0, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 
+-	0x07, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x18, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x60, 0x00, 0xc0, 0x00, 
+-	0x30, 0x70, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x03, 0x00, 0x00, 0x00, 0x30, 0x06, 0x00, 0x00, 
+-	0x0c, 0x60, 0x00, 0x00, 0x39, 0x83, 0x38, 0x00, 
+-	0x0e, 0xe0, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x18, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x70, 0x01, 0xc0, 0x00, 
+-	0x30, 0x38, 0x00, 0x00, 0x60, 0x06, 0x00, 0x00, 
+-	0x03, 0x00, 0x00, 0x00, 0x30, 0x06, 0x00, 0x00, 
+-	0x0e, 0xe0, 0x00, 0x00, 0x1b, 0x83, 0xb0, 0x00, 
+-	0x0e, 0xe0, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x31, 0x80, 0x00, 
+-	0x30, 0x38, 0x00, 0x00, 0x70, 0x06, 0x00, 0x00, 
+-	0x03, 0x00, 0x00, 0x00, 0x30, 0x06, 0x00, 0x00, 
+-	0x0e, 0xe0, 0x00, 0x00, 0x1b, 0x01, 0xb0, 0x00, 
+-	0x1c, 0x70, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x38, 0x3f, 0x80, 0x00, 
+-	0x30, 0x1c, 0x00, 0x00, 0x70, 0x0e, 0x00, 0x00, 
+-	0x03, 0x00, 0x00, 0x00, 0x38, 0x0e, 0x00, 0x00, 
+-	0x07, 0xc0, 0x00, 0x00, 0x1f, 0x01, 0xf0, 0x00, 
+-	0x38, 0x38, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x1e, 0x1f, 0x00, 0x00, 
+-	0x30, 0x1e, 0x00, 0x00, 0x3c, 0x1c, 0x00, 0x00, 
+-	0x03, 0x00, 0x00, 0x00, 0x1c, 0x1c, 0x00, 0x00, 
+-	0x07, 0xc0, 0x00, 0x00, 0x1f, 0x01, 0xf0, 0x00, 
+-	0x38, 0x38, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x0f, 0xff, 0x80, 0x00, 
+-	0x30, 0x0e, 0x00, 0x00, 0x1f, 0xfc, 0x00, 0x00, 
+-	0x03, 0x00, 0x00, 0x00, 0x0f, 0xf8, 0x00, 0x00, 
+-	0x03, 0x80, 0x00, 0x00, 0x1e, 0x00, 0xe0, 0x00, 
+-	0x70, 0x1c, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 
+-	0xff, 0xfc, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x03, 0xff, 0xc0, 0x00, 
+-	0x30, 0x07, 0x00, 0x00, 0x07, 0xf0, 0x00, 0x00, 
+-	0x03, 0x00, 0x00, 0x00, 0x07, 0xf0, 0x00, 0x00, 
+-	0x03, 0x80, 0x00, 0x00, 0x0e, 0x00, 0xe0, 0x00, 
+-	0xe0, 0x0e, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 
+-	0xff, 0xfc, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x06, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x01, 0xff, 0xf8, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x01, 0xff, 0xf8, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1f, 0x80, 0x00, 0x00, 
+-	0x33, 0xc0, 0x00, 0x00, 0x0f, 0x80, 0x00, 0x00, 
+-	0x0f, 0xb0, 0x00, 0x00, 0x0f, 0x80, 0x00, 0x00, 
+-	0xfe, 0x00, 0x00, 0x00, 0x0f, 0x30, 0x00, 0x00, 
+-	0x33, 0xc0, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x60, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x37, 0xcf, 0x80, 0x00, 
+-	0x33, 0xc0, 0x00, 0x00, 0x0f, 0x80, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3f, 0xc0, 0x00, 0x00, 
+-	0x3f, 0xe0, 0x00, 0x00, 0x3f, 0xc0, 0x00, 0x00, 
+-	0x3f, 0xf0, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 
+-	0xfe, 0x00, 0x00, 0x00, 0x1f, 0xf0, 0x00, 0x00, 
+-	0x3f, 0xe0, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0xc0, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x3f, 0xdf, 0x80, 0x00, 
+-	0x37, 0xe0, 0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x70, 0xe0, 0x00, 0x00, 
+-	0x3c, 0x70, 0x00, 0x00, 0x38, 0xe0, 0x00, 0x00, 
+-	0x38, 0xf0, 0x00, 0x00, 0x38, 0xe0, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x38, 0xf0, 0x00, 0x00, 
+-	0x3c, 0x70, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x31, 0x80, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x3c, 0xf9, 0xc0, 0x00, 
+-	0x3c, 0x70, 0x00, 0x00, 0x38, 0xe0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
+-	0x38, 0x38, 0x00, 0x00, 0x70, 0x60, 0x00, 0x00, 
+-	0x70, 0x70, 0x00, 0x00, 0x70, 0x70, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x70, 0x70, 0x00, 0x00, 
+-	0x38, 0x30, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x70, 0xc0, 0x00, 
+-	0x38, 0x30, 0x00, 0x00, 0x70, 0x70, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
+-	0x30, 0x18, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x60, 0x30, 0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 
+-	0x30, 0x30, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x60, 0xc0, 0x00, 
+-	0x30, 0x30, 0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x03, 0xe0, 0x00, 0x00, 
+-	0x30, 0x18, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x60, 0x30, 0x00, 0x00, 0x7f, 0xf0, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 
+-	0x30, 0x30, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x60, 0xc0, 0x00, 
+-	0x30, 0x30, 0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 
+-	0x30, 0x18, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x60, 0x30, 0x00, 0x00, 0x7f, 0xf0, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 
+-	0x30, 0x30, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x60, 0xc0, 0x00, 
+-	0x30, 0x30, 0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3e, 0x60, 0x00, 0x00, 
+-	0x30, 0x18, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x60, 0x30, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 
+-	0x30, 0x30, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x33, 0x80, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x60, 0xc0, 0x00, 
+-	0x30, 0x30, 0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x70, 0x60, 0x00, 0x00, 
+-	0x30, 0x18, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x60, 0x30, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 
+-	0x30, 0x30, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x33, 0x80, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x60, 0xc0, 0x00, 
+-	0x30, 0x30, 0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x60, 0xe0, 0x00, 0x00, 
+-	0x38, 0x38, 0x00, 0x00, 0x70, 0x60, 0x00, 0x00, 
+-	0x70, 0x70, 0x00, 0x00, 0x70, 0x30, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x70, 0x70, 0x00, 0x00, 
+-	0x30, 0x30, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x31, 0xc0, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x60, 0xc0, 0x00, 
+-	0x30, 0x30, 0x00, 0x00, 0x70, 0x70, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x71, 0xe0, 0x00, 0x00, 
+-	0x3c, 0x70, 0x00, 0x00, 0x38, 0xe0, 0x00, 0x00, 
+-	0x38, 0xf0, 0x00, 0x00, 0x38, 0xe0, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x38, 0xf0, 0x00, 0x00, 
+-	0x30, 0x30, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0xe0, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x60, 0xc0, 0x00, 
+-	0x30, 0x30, 0x00, 0x00, 0x38, 0xe0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x7f, 0xe0, 0x00, 0x00, 
+-	0x3f, 0xe0, 0x00, 0x00, 0x3f, 0xc0, 0x00, 0x00, 
+-	0x1f, 0xf0, 0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x1f, 0xf0, 0x00, 0x00, 
+-	0x30, 0x30, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x60, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x60, 0xc0, 0x00, 
+-	0x30, 0x30, 0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1e, 0x30, 0x00, 0x00, 
+-	0x33, 0xc0, 0x00, 0x00, 0x0f, 0x80, 0x00, 0x00, 
+-	0x0f, 0x30, 0x00, 0x00, 0x0f, 0x80, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x0f, 0x30, 0x00, 0x00, 
+-	0x30, 0x30, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x70, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x60, 0xc0, 0x00, 
+-	0x30, 0x30, 0x00, 0x00, 0x0f, 0x80, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x60, 0x70, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x70, 0xe0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
+-	0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1f, 0x80, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
+-	0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x37, 0xc0, 0x00, 0x00, 0x0f, 0x30, 0x00, 0x00, 
+-	0x37, 0x00, 0x00, 0x00, 0x1f, 0x80, 0x00, 0x00, 
+-	0xfe, 0x00, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 
+-	0xc0, 0x60, 0x00, 0x00, 0xc0, 0x81, 0x80, 0x00, 
+-	0xe0, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
+-	0x3f, 0xe0, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x3f, 0xf0, 0x00, 0x00, 0x3f, 0xf0, 0x00, 0x00, 
+-	0x3f, 0x00, 0x00, 0x00, 0x3f, 0xc0, 0x00, 0x00, 
+-	0xfe, 0x00, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 
+-	0xc0, 0x60, 0x00, 0x00, 0xc1, 0xc1, 0x80, 0x00, 
+-	0x60, 0xc0, 0x00, 0x00, 0x60, 0xe0, 0x00, 0x00, 
+-	0x3f, 0xe0, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x3c, 0x70, 0x00, 0x00, 0x38, 0xf0, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x70, 0xe0, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 
+-	0xe0, 0xe0, 0x00, 0x00, 0xe1, 0xc1, 0x80, 0x00, 
+-	0x31, 0xc0, 0x00, 0x00, 0x70, 0xe0, 0x00, 0x00, 
+-	0x01, 0xe0, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x38, 0x38, 0x00, 0x00, 0x70, 0x70, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 
+-	0x60, 0xc0, 0x00, 0x00, 0x63, 0xe3, 0x00, 0x00, 
+-	0x3b, 0x80, 0x00, 0x00, 0x30, 0xc0, 0x00, 0x00, 
+-	0x01, 0xc0, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x3e, 0x08, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x30, 0x18, 0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 
+-	0x71, 0xc0, 0x00, 0x00, 0x63, 0x63, 0x00, 0x00, 
+-	0x1f, 0x00, 0x00, 0x00, 0x31, 0xc0, 0x00, 0x00, 
+-	0x03, 0x80, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x7f, 0x98, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x30, 0x18, 0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 
+-	0x31, 0x80, 0x00, 0x00, 0x67, 0x63, 0x00, 0x00, 
+-	0x0f, 0x00, 0x00, 0x00, 0x39, 0xc0, 0x00, 0x00, 
+-	0x07, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x67, 0xf8, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x30, 0x18, 0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x1f, 0xc0, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 
+-	0x31, 0x80, 0x00, 0x00, 0x37, 0x76, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x19, 0x80, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 
+-	0x41, 0xf0, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x30, 0x18, 0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x07, 0xe0, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 
+-	0x3b, 0x80, 0x00, 0x00, 0x36, 0x36, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x19, 0x80, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x30, 0x18, 0x00, 0x00, 0x60, 0x30, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x30, 0x00, 0x00, 
+-	0x1b, 0x00, 0x00, 0x00, 0x3e, 0x3e, 0x00, 0x00, 
+-	0x1f, 0x00, 0x00, 0x00, 0x1d, 0x80, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x38, 0x38, 0x00, 0x00, 0x70, 0x70, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x30, 0x70, 0x00, 0x00, 
+-	0x1f, 0x00, 0x00, 0x00, 0x1e, 0x3c, 0x00, 0x00, 
+-	0x3b, 0x80, 0x00, 0x00, 0x0f, 0x80, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x3c, 0x70, 0x00, 0x00, 0x38, 0xf0, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x70, 0xe0, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x38, 0xf0, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x1c, 0x1c, 0x00, 0x00, 
+-	0x31, 0x80, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x37, 0xe0, 0x00, 0x00, 0x1f, 0xf0, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x3f, 0xc0, 0x00, 0x00, 
+-	0x3e, 0x00, 0x00, 0x00, 0x1f, 0xf0, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x1c, 0x1c, 0x00, 0x00, 
+-	0x60, 0xc0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 
+-	0x7f, 0xe0, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x10, 0x02, 0x00, 0x00, 
+-	0x33, 0xc0, 0x00, 0x00, 0x0f, 0x30, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x1f, 0x80, 0x00, 0x00, 
+-	0x1e, 0x00, 0x00, 0x00, 0x0f, 0x30, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x0c, 0x18, 0x00, 0x00, 
+-	0xe0, 0xe0, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 
+-	0x7f, 0xe0, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 
+-	0x00, 0x00, 0x00, 0x21, 0x16, 0x16, 0x16, 0x16, 
+-	0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 
+-	0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 
+-	0x16, 0x16, 0x16, 0x16, 0x0a, 0x12, 0x13, 0x10, 
+-	0x17, 0x10, 0x15, 0x10, 0x08, 0x09, 0x0a, 0x10, 
+-	0x10, 0x1a, 0x13, 0x06, 0x0a, 0x0a, 0x0b, 0x11, 
+-	0x08, 0x0a, 0x08, 0x08, 0x10, 0x10, 0x10, 0x10, 
+-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 
+-	0x11, 0x11, 0x11, 0x10, 0x1d, 0x13, 0x13, 0x15, 
+-	0x15, 0x13, 0x12, 0x17, 0x15, 0x07, 0x0f, 0x13, 
+-	0x10, 0x17, 0x15, 0x17, 0x13, 0x17, 0x15, 0x13, 
+-	0x13, 0x15, 0x13, 0x1e, 0x13, 0x13, 0x12, 0x08, 
+-	0x08, 0x08, 0x0e, 0x10, 0x0a, 0x10, 0x10, 0x0f, 
+-	0x10, 0x10, 0x08, 0x10, 0x10, 0x07, 0x07, 0x0e, 
+-	0x07, 0x19, 0x10, 0x10, 0x10, 0x10, 0x0a, 0x0f, 
+-	0x08, 0x10, 0x0d, 0x15, 0x0d, 0x0d, 0x0e, 0x0a, 
+-	0x08, 0x0a, 0x11, 0x16, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xc0, 0x00, 
+-	0x0f, 0xff, 0xc0, 0x00, 0x0f, 0xff, 0xc0, 0x00, 
+-	0x0f, 0xff, 0xc0, 0x00, 0x0f, 0xff, 0xc0, 0x00, 
+-	0x0f, 0xff, 0xc0, 0x00, 0x0f, 0xff, 0xc0, 0x00, 
+-	0x0f, 0xff, 0xc0, 0x00, 0x0f, 0xff, 0xc0, 0x00, 
+-	0x0f, 0xff, 0xc0, 0x00, 0x0f, 0xff, 0xc0, 0x00, 
+-	0x0f, 0xff, 0xc0, 0x00, 0x0f, 0xff, 0xc0, 0x00, 
+-	0x0f, 0xff, 0xc0, 0x00, 0x0f, 0xff, 0xc0, 0x00, 
+-	0x0f, 0xff, 0xc0, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x0f, 0xff, 0xc0, 0x00, 
+-	0x0f, 0xff, 0xc0, 0x00, 0x0f, 0xff, 0xc0, 0x00, 
+-	0x0f, 0xff, 0xc0, 0x00, 0x0f, 0xff, 0xc0, 0x00, 
+-	0x0f, 0xff, 0xc0, 0x00, 0x0f, 0xff, 0xc0, 0x00, 
+-	0x0f, 0xff, 0xc0, 0x00, 0x0f, 0xff, 0xc0, 0x00, 
+-	0x0f, 0xff, 0xc0, 0x00, 0x0f, 0xff, 0xc0, 0x00, 
+-	0x0f, 0xff, 0xc0, 0x00, 0x0f, 0xff, 0xc0, 0x00, 
+-	0x0f, 0xff, 0xc0, 0x00, 0x0f, 0xff, 0xc0, 0x00, 
+-	0x0f, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x07, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x01, 0xc7, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x03, 0x8e, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x07, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x01, 0xc7, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x03, 0x8e, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x07, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x01, 0xc7, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x03, 0x8e, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x07, 0xf0, 0x00, 0x00, 0x01, 0xf0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0f, 0xf8, 0x00, 0x00, 0x03, 0xf8, 0x00, 0x00, 
+-	0x1c, 0x70, 0x00, 0x00, 0x07, 0xff, 0x80, 0x00, 
+-	0x0e, 0x38, 0x00, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x1c, 0x70, 0x00, 0x00, 0x0f, 0xff, 0xc0, 0x00, 
+-	0x0f, 0xff, 0xc0, 0x00, 0x0f, 0xff, 0xc0, 0x00, 
+-	0x0f, 0xff, 0xc0, 0x00, 0x0f, 0xff, 0xc0, 0x00, 
+-	0x0f, 0xff, 0xc0, 0x00, 0x0f, 0xff, 0xc0, 0x00, 
+-	0x0f, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1e, 0x1c, 0x00, 0x00, 0x03, 0xf8, 0x00, 0x00, 
+-	0x1c, 0x70, 0x00, 0x00, 0x0f, 0xff, 0xe0, 0x00, 
+-	0x0e, 0x38, 0x00, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x1c, 0x70, 0x00, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x3c, 0x0c, 0x00, 0x00, 0x03, 0xb8, 0x00, 0x00, 
+-	0x1c, 0x70, 0x00, 0x00, 0x1f, 0x83, 0xf0, 0x00, 
+-	0x0e, 0x38, 0x00, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x1c, 0x70, 0x00, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0x07, 0xbc, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0xf8, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0x07, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x78, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x38, 0x00, 0x00, 0x07, 0x1c, 0x00, 0x00, 
+-	0x0f, 0xf0, 0x00, 0x00, 0x78, 0x00, 0x3c, 0x00, 
+-	0x07, 0xe0, 0x00, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x38, 0x00, 0x00, 0x0f, 0x1e, 0x00, 0x00, 
+-	0x1f, 0xf8, 0x00, 0x00, 0x78, 0x00, 0x3c, 0x00, 
+-	0x1f, 0xf8, 0x00, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x70, 0x00, 0x00, 0x0e, 0x0e, 0x00, 0x00, 
+-	0x3c, 0x7c, 0x00, 0x00, 0x70, 0x00, 0x1c, 0x00, 
+-	0x3c, 0x3c, 0x00, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x70, 0x00, 0x00, 0x0e, 0x0e, 0x00, 0x00, 
+-	0x70, 0x1c, 0x00, 0x00, 0x70, 0x00, 0x1c, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x70, 0x00, 0x00, 0x1e, 0x0f, 0x00, 0x00, 
+-	0x70, 0x1c, 0x00, 0x00, 0x70, 0x00, 0x1c, 0x00, 
+-	0x78, 0x1e, 0x00, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x78, 0x00, 0x00, 0x1c, 0x07, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x70, 0x00, 0x1c, 0x00, 
+-	0x70, 0x0e, 0x00, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x7f, 0x80, 0x00, 0x00, 
+-	0x38, 0x3e, 0x00, 0x00, 0x1f, 0xff, 0x00, 0x00, 
+-	0x00, 0xfc, 0x00, 0x00, 0x70, 0x00, 0x1c, 0x00, 
+-	0x70, 0x0e, 0x00, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x7f, 0x80, 0x00, 0x00, 
+-	0x38, 0x1f, 0x00, 0x00, 0x3f, 0xff, 0x80, 0x00, 
+-	0x1f, 0xfc, 0x00, 0x00, 0x78, 0x00, 0x3c, 0x00, 
+-	0x70, 0x0e, 0x00, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x7f, 0x80, 0x00, 0x00, 
+-	0x38, 0x07, 0x80, 0x00, 0x3f, 0xff, 0x80, 0x00, 
+-	0x3f, 0x9c, 0x00, 0x00, 0x78, 0x00, 0x3c, 0x00, 
+-	0x70, 0x0e, 0x00, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x03, 0x80, 0x00, 0x38, 0x03, 0x80, 0x00, 
+-	0x78, 0x1c, 0x00, 0x00, 0x3c, 0x00, 0x78, 0x00, 
+-	0x70, 0x0e, 0x00, 0x00, 0x3c, 0x01, 0xe0, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x03, 0x80, 0x00, 0x78, 0x03, 0xc0, 0x00, 
+-	0x70, 0x1c, 0x00, 0x00, 0x1e, 0x00, 0xf8, 0x00, 
+-	0x78, 0x1e, 0x00, 0x00, 0x3c, 0x01, 0xe0, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x39, 0xc3, 0x80, 0x00, 0x70, 0x01, 0xc0, 0x00, 
+-	0x70, 0x3c, 0x00, 0x00, 0x1f, 0x83, 0xf0, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0x1f, 0x07, 0xc0, 0x00, 
+-	0x38, 0x3c, 0x00, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x39, 0xe7, 0x00, 0x00, 0x70, 0x01, 0xc0, 0x00, 
+-	0x78, 0x7c, 0x00, 0x00, 0x0f, 0xff, 0xe0, 0x00, 
+-	0x3c, 0x3c, 0x00, 0x00, 0x0f, 0xff, 0x80, 0x00, 
+-	0x3c, 0x7c, 0x00, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x08, 0x00, 0x40, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0xff, 0x00, 0x00, 0xe0, 0x01, 0xe0, 0x00, 
+-	0x3f, 0xfc, 0x00, 0x00, 0x03, 0xff, 0xc0, 0x00, 
+-	0x1f, 0xf8, 0x00, 0x00, 0x07, 0xff, 0x00, 0x00, 
+-	0x1f, 0xfc, 0x00, 0x00, 0x0f, 0xff, 0xc0, 0x00, 
+-	0x0f, 0xff, 0xc0, 0x00, 0x0f, 0xff, 0xc0, 0x00, 
+-	0x0f, 0xff, 0xc0, 0x00, 0x0f, 0xff, 0xc0, 0x00, 
+-	0x0f, 0xff, 0xc0, 0x00, 0x0f, 0xff, 0xc0, 0x00, 
+-	0x0f, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x7c, 0x00, 0x00, 0xe0, 0x00, 0xe0, 0x00, 
+-	0x1f, 0x8e, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 
+-	0x07, 0xe0, 0x00, 0x00, 0x03, 0xfe, 0x00, 0x00, 
+-	0x0f, 0x9c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x73, 0x80, 0x00, 0x00, 
+-	0x07, 0x1c, 0x00, 0x00, 0x0f, 0xe0, 0x00, 0x00, 
+-	0x0f, 0x80, 0x60, 0x00, 0x03, 0xe0, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x01, 0xc0, 0x00, 0x00, 
+-	0xe0, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x73, 0x80, 0x00, 0x00, 
+-	0x07, 0x1c, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 
+-	0x1f, 0xc0, 0xe0, 0x00, 0x07, 0xf0, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 
+-	0x60, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x73, 0x80, 0x00, 0x00, 
+-	0x0f, 0x3c, 0x00, 0x00, 0x3d, 0xb8, 0x00, 0x00, 
+-	0x38, 0xe0, 0xc0, 0x00, 0x0f, 0x78, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x76, 0xe0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x73, 0x80, 0x00, 0x00, 
+-	0x0e, 0x38, 0x00, 0x00, 0x79, 0xbc, 0x00, 0x00, 
+-	0x30, 0x61, 0xc0, 0x00, 0x0e, 0x38, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x7f, 0xe0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x73, 0x80, 0x00, 0x00, 
+-	0x0e, 0x38, 0x00, 0x00, 0x71, 0x9c, 0x00, 0x00, 
+-	0x30, 0x61, 0x80, 0x00, 0x0e, 0x38, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x3f, 0xc0, 0x00, 0x00, 
+-	0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x73, 0x80, 0x00, 0x00, 
+-	0xff, 0xfe, 0x00, 0x00, 0x71, 0x80, 0x00, 0x00, 
+-	0x30, 0x63, 0x80, 0x00, 0x0e, 0x38, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 
+-	0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x73, 0x80, 0x00, 0x00, 
+-	0xff, 0xfe, 0x00, 0x00, 0x79, 0x80, 0x00, 0x00, 
+-	0x30, 0x63, 0x00, 0x00, 0x0f, 0x78, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x1f, 0x80, 0x00, 0x00, 
+-	0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0xff, 0xfe, 0x00, 0x00, 0x7d, 0x80, 0x00, 0x00, 
+-	0x30, 0x67, 0x00, 0x00, 0x07, 0x70, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x39, 0xc0, 0x00, 0x00, 
+-	0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1e, 0x78, 0x00, 0x00, 0x3f, 0x80, 0x00, 0x00, 
+-	0x38, 0xe6, 0x00, 0x00, 0x03, 0xe0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x19, 0x80, 0x00, 0x00, 
+-	0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x70, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 
+-	0x1f, 0xce, 0x00, 0x00, 0x07, 0xc0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 
+-	0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x70, 0x00, 0x00, 0x0f, 0xf8, 0x00, 0x00, 
+-	0x0f, 0x8c, 0x7c, 0x00, 0x1f, 0xe0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x7f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x70, 0x00, 0x00, 0x01, 0xfc, 0x00, 0x00, 
+-	0x00, 0x1c, 0xfe, 0x00, 0x3e, 0xe2, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x7f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x3c, 0xf0, 0x00, 0x00, 0x01, 0xbe, 0x00, 0x00, 
+-	0x00, 0x19, 0xc7, 0x00, 0x38, 0x73, 0x80, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x7f, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0xff, 0xfe, 0x00, 0x00, 0x01, 0x9e, 0x00, 0x00, 
+-	0x00, 0x39, 0x83, 0x00, 0x78, 0x3f, 0x80, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x7f, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0xff, 0xfe, 0x00, 0x00, 0x01, 0x8e, 0x00, 0x00, 
+-	0x00, 0x31, 0x83, 0x00, 0x70, 0x3f, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x7f, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0xff, 0xfe, 0x00, 0x00, 0x71, 0x8e, 0x00, 0x00, 
+-	0x00, 0x71, 0x83, 0x00, 0x70, 0x1f, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0xe0, 0x00, 0x00, 0x71, 0x8e, 0x00, 0x00, 
+-	0x00, 0x61, 0x83, 0x00, 0x70, 0x0f, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0xe0, 0x00, 0x00, 0x79, 0x9e, 0x00, 0x00, 
+-	0x00, 0xe1, 0x83, 0x00, 0x78, 0x1f, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 
+-	0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x79, 0xe0, 0x00, 0x00, 0x3d, 0xbc, 0x00, 0x00, 
+-	0x00, 0xc1, 0xc7, 0x00, 0x3c, 0x7f, 0x80, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x71, 0xc0, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 
+-	0x01, 0xc0, 0xfe, 0x00, 0x1f, 0xfb, 0xc0, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x71, 0xc0, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 
+-	0x01, 0x80, 0x7c, 0x00, 0x0f, 0xe1, 0x80, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 
+-	0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 
+-	0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x01, 0x80, 0x00, 0x00, 
+-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x01, 0xc0, 0x00, 0x00, 
+-	0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x07, 0xe0, 0x00, 0x00, 
+-	0x00, 0x60, 0x00, 0x00, 0x0f, 0xe0, 0x00, 0x00, 
+-	0x0f, 0xe0, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x1f, 0xfc, 0x00, 0x00, 0x03, 0xf0, 0x00, 0x00, 
+-	0x3f, 0xfe, 0x00, 0x00, 0x07, 0xe0, 0x00, 0x00, 
+-	0x07, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x07, 0xf0, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 
+-	0x00, 0xe0, 0x00, 0x00, 0x1f, 0xf0, 0x00, 0x00, 
+-	0x1f, 0xf0, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x1f, 0xfc, 0x00, 0x00, 0x0f, 0xf8, 0x00, 0x00, 
+-	0x3f, 0xfe, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 
+-	0x1f, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1f, 0xf8, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 
+-	0x01, 0xe0, 0x00, 0x00, 0x3f, 0xf8, 0x00, 0x00, 
+-	0x3f, 0xf8, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 
+-	0x3f, 0xfc, 0x00, 0x00, 0x1f, 0xfc, 0x00, 0x00, 
+-	0x3f, 0xfe, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 
+-	0x3f, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x3c, 0x3c, 0x00, 0x00, 0x3c, 0x3c, 0x00, 0x00, 
+-	0x03, 0xe0, 0x00, 0x00, 0x7c, 0x7c, 0x00, 0x00, 
+-	0x7c, 0x7c, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 
+-	0x3c, 0x00, 0x00, 0x00, 0x3e, 0x3e, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x3c, 0x3c, 0x00, 0x00, 
+-	0x3c, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x1e, 0x00, 0x00, 0x38, 0x1c, 0x00, 0x00, 
+-	0x0f, 0xe0, 0x00, 0x00, 0x78, 0x3c, 0x00, 0x00, 
+-	0x70, 0x3c, 0x00, 0x00, 0x01, 0xf8, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x0e, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x38, 0x1c, 0x00, 0x00, 
+-	0x78, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x78, 0x0e, 0x00, 0x00, 0x78, 0x1e, 0x00, 0x00, 
+-	0x1e, 0xe0, 0x00, 0x00, 0x70, 0x1c, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x01, 0xf8, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x00, 0x00, 0x38, 0x1c, 0x00, 0x00, 
+-	0x70, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 
+-	0x70, 0x0e, 0x00, 0x00, 0x70, 0x0e, 0x00, 0x00, 
+-	0x1c, 0xe0, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x03, 0xb8, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 
+-	0x00, 0x78, 0x00, 0x00, 0x38, 0x1c, 0x00, 0x00, 
+-	0x70, 0x0e, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 
+-	0x7f, 0xfe, 0x00, 0x00, 0x3f, 0x80, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x70, 0x0e, 0x00, 0x00, 
+-	0x10, 0xe0, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x3c, 0x00, 0x00, 0x07, 0x38, 0x00, 0x00, 
+-	0x7b, 0xe0, 0x00, 0x00, 0x73, 0xf0, 0x00, 0x00, 
+-	0x00, 0x70, 0x00, 0x00, 0x1c, 0x38, 0x00, 0x00, 
+-	0x70, 0x0e, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x07, 0xfc, 0x00, 0x00, 
+-	0x7f, 0xfe, 0x00, 0x00, 0x1f, 0xf0, 0x00, 0x00, 
+-	0x00, 0x1e, 0x00, 0x00, 0x70, 0x0e, 0x00, 0x00, 
+-	0x00, 0xe0, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 
+-	0x00, 0x78, 0x00, 0x00, 0x0f, 0x38, 0x00, 0x00, 
+-	0x7f, 0xf8, 0x00, 0x00, 0x77, 0xf8, 0x00, 0x00, 
+-	0x00, 0xf0, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 
+-	0x70, 0x0e, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 
+-	0x7f, 0xfe, 0x00, 0x00, 0x03, 0xfc, 0x00, 0x00, 
+-	0x00, 0x3c, 0x00, 0x00, 0x70, 0x0e, 0x00, 0x00, 
+-	0x00, 0xe0, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x03, 0xf0, 0x00, 0x00, 0x0e, 0x38, 0x00, 0x00, 
+-	0x7f, 0xfc, 0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 
+-	0x00, 0xe0, 0x00, 0x00, 0x0f, 0xe0, 0x00, 0x00, 
+-	0x78, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 
+-	0x00, 0x78, 0x00, 0x00, 0x70, 0x0e, 0x00, 0x00, 
+-	0x00, 0xe0, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 
+-	0x03, 0xf8, 0x00, 0x00, 0x1c, 0x38, 0x00, 0x00, 
+-	0x78, 0x3c, 0x00, 0x00, 0x7c, 0x3e, 0x00, 0x00, 
+-	0x01, 0xe0, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 
+-	0x3c, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 
+-	0x00, 0xf0, 0x00, 0x00, 0x70, 0x0e, 0x00, 0x00, 
+-	0x00, 0xe0, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 
+-	0x00, 0x3c, 0x00, 0x00, 0x38, 0x38, 0x00, 0x00, 
+-	0x00, 0x1e, 0x00, 0x00, 0x78, 0x1e, 0x00, 0x00, 
+-	0x01, 0xc0, 0x00, 0x00, 0x3c, 0x3c, 0x00, 0x00, 
+-	0x3f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 
+-	0x01, 0xe0, 0x00, 0x00, 0x70, 0x0e, 0x00, 0x00, 
+-	0x00, 0xe0, 0x00, 0x00, 0x01, 0xe0, 0x00, 0x00, 
+-	0x00, 0x1e, 0x00, 0x00, 0x78, 0x38, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x70, 0x0e, 0x00, 0x00, 
+-	0x01, 0xc0, 0x00, 0x00, 0x78, 0x1e, 0x00, 0x00, 
+-	0x1f, 0xee, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 
+-	0x7f, 0xfe, 0x00, 0x00, 0x03, 0xfc, 0x00, 0x00, 
+-	0x03, 0xc0, 0x00, 0x00, 0x70, 0x0e, 0x00, 0x00, 
+-	0x00, 0xe0, 0x00, 0x00, 0x03, 0xc0, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x70, 0x0e, 0x00, 0x00, 
+-	0x03, 0xc0, 0x00, 0x00, 0x70, 0x0e, 0x00, 0x00, 
+-	0x0f, 0xce, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x07, 0xfc, 0x00, 0x00, 
+-	0x7f, 0xfe, 0x00, 0x00, 0x1f, 0xf0, 0x00, 0x00, 
+-	0x03, 0x80, 0x00, 0x00, 0x70, 0x0e, 0x00, 0x00, 
+-	0x00, 0xe0, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x70, 0x0e, 0x00, 0x00, 
+-	0x03, 0x80, 0x00, 0x00, 0x70, 0x0e, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 
+-	0x7f, 0xfe, 0x00, 0x00, 0x3f, 0x80, 0x00, 0x00, 
+-	0x03, 0x80, 0x00, 0x00, 0x78, 0x1e, 0x00, 0x00, 
+-	0x00, 0xe0, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 
+-	0x70, 0x0e, 0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 
+-	0x70, 0x0e, 0x00, 0x00, 0x78, 0x0e, 0x00, 0x00, 
+-	0x03, 0x80, 0x00, 0x00, 0x70, 0x0e, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 
+-	0x03, 0x80, 0x00, 0x00, 0x38, 0x1c, 0x00, 0x00, 
+-	0x00, 0xe0, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x78, 0x1e, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x78, 0x1e, 0x00, 0x00, 0x38, 0x1e, 0x00, 0x00, 
+-	0x07, 0x80, 0x00, 0x00, 0x78, 0x1e, 0x00, 0x00, 
+-	0x70, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3c, 0x3c, 0x00, 0x00, 
+-	0x00, 0xe0, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x3c, 0x3c, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x3c, 0x3c, 0x00, 0x00, 0x3c, 0x3c, 0x00, 0x00, 
+-	0x07, 0x80, 0x00, 0x00, 0x7c, 0x3e, 0x00, 0x00, 
+-	0x78, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 
+-	0x00, 0xe0, 0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 
+-	0x3f, 0xfc, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x3f, 0xf8, 0x00, 0x00, 0x1f, 0xfc, 0x00, 0x00, 
+-	0x07, 0x00, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 
+-	0x3f, 0xf8, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x03, 0x80, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 
+-	0x00, 0xe0, 0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 
+-	0x1f, 0xf8, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x1f, 0xf8, 0x00, 0x00, 0x0f, 0xf8, 0x00, 0x00, 
+-	0x07, 0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 
+-	0x1f, 0xf0, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x03, 0x80, 0x00, 0x00, 0x07, 0xe0, 0x00, 0x00, 
+-	0x00, 0xe0, 0x00, 0x00, 0x7f, 0xfc, 0x00, 0x00, 
+-	0x07, 0xe0, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x07, 0xe0, 0x00, 0x00, 0x07, 0xe0, 0x00, 0x00, 
+-	0x07, 0x00, 0x00, 0x00, 0x07, 0xe0, 0x00, 0x00, 
+-	0x0f, 0xc0, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x03, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xf0, 0x00, 
+-	0x01, 0xf0, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 
+-	0x01, 0xfe, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
+-	0x3f, 0xff, 0x80, 0x00, 0x3f, 0xff, 0x80, 0x00, 
+-	0x00, 0xff, 0x00, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x38, 0x01, 0xe0, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x7c, 0x00, 0x7c, 0x00, 0x3c, 0x00, 0xe0, 0x00, 
+-	0x01, 0xff, 0x00, 0x00, 0x00, 0x7f, 0xfe, 0x00, 
+-	0x03, 0xf8, 0x00, 0x00, 0x3f, 0xff, 0x00, 0x00, 
+-	0x07, 0xff, 0x80, 0x00, 0x3f, 0xff, 0x00, 0x00, 
+-	0x3f, 0xff, 0x80, 0x00, 0x3f, 0xff, 0x80, 0x00, 
+-	0x07, 0xff, 0xc0, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x38, 0x03, 0xc0, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x7c, 0x00, 0x7c, 0x00, 0x3c, 0x00, 0xe0, 0x00, 
+-	0x07, 0xff, 0x80, 0x00, 0x01, 0xff, 0xff, 0x00, 
+-	0x03, 0xf8, 0x00, 0x00, 0x3f, 0xff, 0x00, 0x00, 
+-	0x0f, 0xff, 0xc0, 0x00, 0x3f, 0xff, 0xc0, 0x00, 
+-	0x3f, 0xff, 0x80, 0x00, 0x3f, 0xff, 0x80, 0x00, 
+-	0x0f, 0xff, 0xe0, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x38, 0x07, 0x80, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x7e, 0x00, 0xfc, 0x00, 0x3e, 0x00, 0xe0, 0x00, 
+-	0x0f, 0xff, 0xe0, 0x00, 0x03, 0xf8, 0x3f, 0x80, 
+-	0x03, 0xb8, 0x00, 0x00, 0x38, 0x0f, 0x80, 0x00, 
+-	0x1f, 0x83, 0xe0, 0x00, 0x38, 0x07, 0xc0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x1f, 0x83, 0xf0, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x38, 0x0f, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x7e, 0x00, 0xfc, 0x00, 0x3f, 0x00, 0xe0, 0x00, 
+-	0x1f, 0x83, 0xf0, 0x00, 0x07, 0xc0, 0x07, 0xc0, 
+-	0x07, 0xbc, 0x00, 0x00, 0x38, 0x03, 0x80, 0x00, 
+-	0x3e, 0x01, 0xe0, 0x00, 0x38, 0x01, 0xe0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x3e, 0x00, 0xf0, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x38, 0x1e, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x7f, 0x01, 0xfc, 0x00, 0x3f, 0x00, 0xe0, 0x00, 
+-	0x3e, 0x00, 0xf8, 0x00, 0x07, 0x80, 0x03, 0xe0, 
+-	0x07, 0x1c, 0x00, 0x00, 0x38, 0x03, 0x80, 0x00, 
+-	0x3c, 0x00, 0xf0, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x3c, 0x00, 0x78, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x38, 0x3c, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x77, 0x01, 0xdc, 0x00, 0x3b, 0x80, 0xe0, 0x00, 
+-	0x3c, 0x00, 0x78, 0x00, 0x0f, 0x0f, 0x1d, 0xe0, 
+-	0x07, 0x1c, 0x00, 0x00, 0x38, 0x03, 0x80, 0x00, 
+-	0x78, 0x00, 0x70, 0x00, 0x38, 0x00, 0xf0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x30, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x38, 0x78, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x77, 0x01, 0xdc, 0x00, 0x3b, 0xc0, 0xe0, 0x00, 
+-	0x78, 0x00, 0x3c, 0x00, 0x1e, 0x3f, 0xbc, 0xf0, 
+-	0x0f, 0x1e, 0x00, 0x00, 0x38, 0x0f, 0x00, 0x00, 
+-	0x78, 0x00, 0x00, 0x00, 0x38, 0x00, 0x70, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x78, 0x00, 0x00, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x38, 0xf0, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x77, 0x83, 0xdc, 0x00, 0x39, 0xc0, 0xe0, 0x00, 
+-	0x78, 0x00, 0x3c, 0x00, 0x1e, 0x7f, 0xfc, 0xf0, 
+-	0x0e, 0x0e, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x38, 0x00, 0x70, 0x00, 
+-	0x3f, 0xff, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xe0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x39, 0xe0, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x73, 0x83, 0x9c, 0x00, 0x38, 0xe0, 0xe0, 0x00, 
+-	0x70, 0x00, 0x1c, 0x00, 0x1c, 0xf9, 0xf8, 0x70, 
+-	0x0e, 0x0e, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x38, 0x00, 0x70, 0x00, 
+-	0x3f, 0xff, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xe0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x3b, 0xe0, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x73, 0x83, 0x9c, 0x00, 0x38, 0xe0, 0xe0, 0x00, 
+-	0x70, 0x00, 0x1c, 0x00, 0x3c, 0xf0, 0xf8, 0x70, 
+-	0x1e, 0x0f, 0x00, 0x00, 0x3f, 0xff, 0x80, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x38, 0x00, 0x70, 0x00, 
+-	0x3f, 0xff, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
+-	0x70, 0x0f, 0xf8, 0x00, 0x3f, 0xff, 0xe0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x3f, 0xf0, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x73, 0xc7, 0x9c, 0x00, 0x38, 0x70, 0xe0, 0x00, 
+-	0x70, 0x00, 0x1c, 0x00, 0x39, 0xe0, 0x78, 0x70, 
+-	0x1c, 0x07, 0x00, 0x00, 0x38, 0x07, 0x80, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x38, 0x00, 0x70, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x70, 0x0f, 0xf8, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x3f, 0xf0, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x71, 0xc7, 0x1c, 0x00, 0x38, 0x38, 0xe0, 0x00, 
+-	0x70, 0x00, 0x1c, 0x00, 0x39, 0xe0, 0x78, 0x70, 
+-	0x1f, 0xff, 0x00, 0x00, 0x38, 0x03, 0xc0, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x38, 0x00, 0x70, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x70, 0x0f, 0xf8, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x3e, 0x78, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x71, 0xc7, 0x1c, 0x00, 0x38, 0x38, 0xe0, 0x00, 
+-	0x70, 0x00, 0x1c, 0x00, 0x39, 0xc0, 0x70, 0x70, 
+-	0x3f, 0xff, 0x80, 0x00, 0x38, 0x01, 0xc0, 0x00, 
+-	0x78, 0x00, 0x60, 0x00, 0x38, 0x00, 0xf0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x78, 0x00, 0x38, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x3c, 0x3c, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x71, 0xef, 0x1c, 0x00, 0x38, 0x1c, 0xe0, 0x00, 
+-	0x78, 0x00, 0x3c, 0x00, 0x39, 0xc0, 0xf0, 0xf0, 
+-	0x3f, 0xff, 0x80, 0x00, 0x38, 0x01, 0xc0, 0x00, 
+-	0x78, 0x00, 0xf0, 0x00, 0x38, 0x00, 0xf0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x78, 0x00, 0x38, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x70, 0x38, 0x00, 0x00, 
+-	0x38, 0x3e, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x70, 0xee, 0x1c, 0x00, 0x38, 0x1e, 0xe0, 0x00, 
+-	0x78, 0x00, 0x3c, 0x00, 0x39, 0xc0, 0xf0, 0xe0, 
+-	0x38, 0x03, 0x80, 0x00, 0x38, 0x01, 0xc0, 0x00, 
+-	0x3c, 0x00, 0xf0, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x3c, 0x00, 0x38, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x70, 0x38, 0x00, 0x00, 
+-	0x38, 0x1e, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x70, 0xee, 0x1c, 0x00, 0x38, 0x0e, 0xe0, 0x00, 
+-	0x3c, 0x00, 0x78, 0x00, 0x39, 0xe1, 0xe1, 0xc0, 
+-	0x78, 0x03, 0xc0, 0x00, 0x38, 0x03, 0xc0, 0x00, 
+-	0x3e, 0x01, 0xe0, 0x00, 0x38, 0x01, 0xe0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x3e, 0x00, 0x78, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x78, 0x78, 0x00, 0x00, 
+-	0x38, 0x0f, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x70, 0xfe, 0x1c, 0x00, 0x38, 0x07, 0xe0, 0x00, 
+-	0x1e, 0x00, 0xf8, 0x00, 0x3d, 0xe3, 0xe3, 0xc0, 
+-	0x70, 0x01, 0xc0, 0x00, 0x38, 0x07, 0xc0, 0x00, 
+-	0x1f, 0x87, 0xe0, 0x00, 0x38, 0x07, 0xc0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x1f, 0x81, 0xf8, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x7c, 0xf8, 0x00, 0x00, 
+-	0x38, 0x07, 0x80, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x70, 0x7c, 0x1c, 0x00, 0x38, 0x07, 0xe0, 0x00, 
+-	0x1f, 0x83, 0xf0, 0x00, 0x3c, 0xff, 0xe7, 0x80, 
+-	0x70, 0x01, 0xc0, 0x00, 0x3f, 0xff, 0x80, 0x00, 
+-	0x0f, 0xff, 0xc0, 0x00, 0x3f, 0xff, 0x80, 0x00, 
+-	0x3f, 0xff, 0x80, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x0f, 0xff, 0xf0, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x3f, 0xf0, 0x00, 0x00, 
+-	0x38, 0x07, 0x80, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
+-	0x70, 0x7c, 0x1c, 0x00, 0x38, 0x03, 0xe0, 0x00, 
+-	0x0f, 0xff, 0xe0, 0x00, 0x1e, 0xfe, 0xff, 0x00, 
+-	0xe0, 0x01, 0xe0, 0x00, 0x3f, 0xff, 0x00, 0x00, 
+-	0x07, 0xff, 0x80, 0x00, 0x3f, 0xff, 0x00, 0x00, 
+-	0x3f, 0xff, 0x80, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x03, 0xff, 0xe0, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x3f, 0xf0, 0x00, 0x00, 
+-	0x38, 0x03, 0xc0, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
+-	0x70, 0x7c, 0x1c, 0x00, 0x38, 0x01, 0xe0, 0x00, 
+-	0x03, 0xff, 0xc0, 0x00, 0x1e, 0x3c, 0x7c, 0x78, 
+-	0xe0, 0x00, 0xe0, 0x00, 0x3f, 0xfc, 0x00, 0x00, 
+-	0x01, 0xfe, 0x00, 0x00, 0x3f, 0xfc, 0x00, 0x00, 
+-	0x3f, 0xff, 0x80, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0xff, 0x00, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x00, 0x00, 
+-	0x38, 0x01, 0xe0, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
+-	0x70, 0x38, 0x1c, 0x00, 0x38, 0x01, 0xe0, 0x00, 
+-	0x00, 0xfe, 0x00, 0x00, 0x0f, 0x00, 0x00, 0xf0, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x07, 0xc0, 0x01, 0xf0, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x0f, 0xe0, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0x80, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
+-	0x01, 0xff, 0x00, 0x00, 0x3f, 0xff, 0x00, 0x00, 
+-	0x03, 0xf8, 0x00, 0x00, 0x7f, 0xff, 0xc0, 0x00, 
+-	0x38, 0x00, 0xe0, 0x00, 0xe0, 0x00, 0xe0, 0x00, 
+-	0xe0, 0x0f, 0x80, 0x38, 0x78, 0x03, 0xc0, 0x00, 
+-	0xf0, 0x01, 0xe0, 0x00, 0x7f, 0xff, 0x00, 0x00, 
+-	0x3f, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 
+-	0xfc, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0x00, 0x00, 
+-	0x07, 0xff, 0xc0, 0x00, 0x3f, 0xff, 0x80, 0x00, 
+-	0x0f, 0xfe, 0x00, 0x00, 0x7f, 0xff, 0xc0, 0x00, 
+-	0x38, 0x00, 0xe0, 0x00, 0xf0, 0x01, 0xe0, 0x00, 
+-	0xf0, 0x0f, 0x80, 0x78, 0x3c, 0x07, 0x80, 0x00, 
+-	0x70, 0x03, 0xc0, 0x00, 0x7f, 0xff, 0x00, 0x00, 
+-	0x3f, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 
+-	0xfc, 0x00, 0x00, 0x00, 0x07, 0x80, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0x80, 0x00, 
+-	0x0f, 0xff, 0xe0, 0x00, 0x3f, 0xff, 0xc0, 0x00, 
+-	0x1f, 0xff, 0x00, 0x00, 0x7f, 0xff, 0xc0, 0x00, 
+-	0x38, 0x00, 0xe0, 0x00, 0x70, 0x01, 0xc0, 0x00, 
+-	0xf0, 0x1f, 0xc0, 0x78, 0x1c, 0x07, 0x00, 0x00, 
+-	0x38, 0x03, 0x80, 0x00, 0x7f, 0xff, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x07, 0x80, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x07, 0xc0, 0x00, 
+-	0x1f, 0x83, 0xf0, 0x00, 0x38, 0x03, 0xe0, 0x00, 
+-	0x3e, 0x0f, 0x80, 0x00, 0x00, 0xe0, 0x00, 0x00, 
+-	0x38, 0x00, 0xe0, 0x00, 0x70, 0x01, 0xc0, 0x00, 
+-	0x70, 0x1f, 0xc0, 0x70, 0x1e, 0x0f, 0x00, 0x00, 
+-	0x3c, 0x07, 0x80, 0x00, 0x00, 0x0f, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x03, 0xc0, 0x00, 
+-	0x1e, 0x00, 0xf8, 0x00, 0x38, 0x01, 0xe0, 0x00, 
+-	0x3c, 0x07, 0x80, 0x00, 0x00, 0xe0, 0x00, 0x00, 
+-	0x38, 0x00, 0xe0, 0x00, 0x78, 0x03, 0xc0, 0x00, 
+-	0x70, 0x1d, 0xc0, 0x70, 0x0f, 0x1e, 0x00, 0x00, 
+-	0x1e, 0x0f, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x01, 0xc0, 0x00, 
+-	0x3c, 0x00, 0x78, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x03, 0x80, 0x00, 0x00, 0xe0, 0x00, 0x00, 
+-	0x38, 0x00, 0xe0, 0x00, 0x38, 0x03, 0x80, 0x00, 
+-	0x78, 0x1d, 0xc0, 0xf0, 0x07, 0xbc, 0x00, 0x00, 
+-	0x0e, 0x0e, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x1c, 0xe0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x01, 0xc0, 0x00, 
+-	0x38, 0x00, 0x3c, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 
+-	0x38, 0x00, 0xe0, 0x00, 0x38, 0x07, 0x80, 0x00, 
+-	0x78, 0x3d, 0xe0, 0xf0, 0x07, 0xbc, 0x00, 0x00, 
+-	0x0f, 0x1e, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x1c, 0xe0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x01, 0xc0, 0x00, 
+-	0x78, 0x00, 0x3c, 0x00, 0x38, 0x01, 0xe0, 0x00, 
+-	0x3c, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 
+-	0x38, 0x00, 0xe0, 0x00, 0x3c, 0x07, 0x80, 0x00, 
+-	0x38, 0x38, 0xe0, 0xe0, 0x03, 0xf8, 0x00, 0x00, 
+-	0x07, 0x1c, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x38, 0x70, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x03, 0xc0, 0x00, 
+-	0x70, 0x00, 0x1c, 0x00, 0x38, 0x03, 0xe0, 0x00, 
+-	0x1f, 0x80, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 
+-	0x38, 0x00, 0xe0, 0x00, 0x1c, 0x07, 0x00, 0x00, 
+-	0x38, 0x38, 0xe0, 0xe0, 0x01, 0xf0, 0x00, 0x00, 
+-	0x07, 0xbc, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x38, 0x70, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x07, 0xc0, 0x00, 
+-	0x70, 0x00, 0x1c, 0x00, 0x3f, 0xff, 0xc0, 0x00, 
+-	0x0f, 0xf8, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 
+-	0x38, 0x00, 0xe0, 0x00, 0x1e, 0x0f, 0x00, 0x00, 
+-	0x3c, 0x38, 0xe1, 0xe0, 0x00, 0xe0, 0x00, 0x00, 
+-	0x03, 0xf8, 0x00, 0x00, 0x01, 0xe0, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x78, 0x78, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0x80, 0x00, 
+-	0x70, 0x00, 0x1c, 0x00, 0x3f, 0xff, 0x80, 0x00, 
+-	0x03, 0xfe, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 
+-	0x38, 0x00, 0xe0, 0x00, 0x1e, 0x0f, 0x00, 0x00, 
+-	0x3c, 0x78, 0xf1, 0xe0, 0x01, 0xf0, 0x00, 0x00, 
+-	0x01, 0xf0, 0x00, 0x00, 0x03, 0xc0, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x70, 0x38, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0x00, 0x00, 
+-	0x70, 0x00, 0x1c, 0x00, 0x3f, 0xff, 0x00, 0x00, 
+-	0x00, 0x7f, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 
+-	0x38, 0x00, 0xe0, 0x00, 0x0e, 0x0e, 0x00, 0x00, 
+-	0x1c, 0x70, 0x71, 0xc0, 0x01, 0xf0, 0x00, 0x00, 
+-	0x01, 0xf0, 0x00, 0x00, 0x07, 0x80, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
+-	0x70, 0x00, 0x1c, 0x00, 0x38, 0x3c, 0x00, 0x00, 
+-	0x00, 0x07, 0x80, 0x00, 0x00, 0xe0, 0x00, 0x00, 
+-	0x38, 0x00, 0xe0, 0x00, 0x0f, 0x1e, 0x00, 0x00, 
+-	0x1c, 0x70, 0x71, 0xc0, 0x03, 0xb8, 0x00, 0x00, 
+-	0x00, 0xe0, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x78, 0x00, 0x3c, 0x00, 0x38, 0x1e, 0x00, 0x00, 
+-	0x00, 0x03, 0x80, 0x00, 0x00, 0xe0, 0x00, 0x00, 
+-	0x38, 0x00, 0xe0, 0x00, 0x07, 0x1c, 0x00, 0x00, 
+-	0x1e, 0x70, 0x73, 0xc0, 0x07, 0xbc, 0x00, 0x00, 
+-	0x00, 0xe0, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x78, 0x08, 0x38, 0x00, 0x38, 0x0f, 0x00, 0x00, 
+-	0x70, 0x03, 0x80, 0x00, 0x00, 0xe0, 0x00, 0x00, 
+-	0x38, 0x00, 0xe0, 0x00, 0x07, 0x1c, 0x00, 0x00, 
+-	0x1e, 0xf0, 0x7b, 0xc0, 0x0f, 0x1e, 0x00, 0x00, 
+-	0x00, 0xe0, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x3c, 0x0e, 0x78, 0x00, 0x38, 0x07, 0x80, 0x00, 
+-	0x78, 0x03, 0x80, 0x00, 0x00, 0xe0, 0x00, 0x00, 
+-	0x3c, 0x01, 0xe0, 0x00, 0x07, 0xbc, 0x00, 0x00, 
+-	0x0e, 0xe0, 0x3b, 0x80, 0x0f, 0x1e, 0x00, 0x00, 
+-	0x00, 0xe0, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x1e, 0x0f, 0xf0, 0x00, 0x38, 0x03, 0x80, 0x00, 
+-	0x78, 0x07, 0x80, 0x00, 0x00, 0xe0, 0x00, 0x00, 
+-	0x3c, 0x01, 0xe0, 0x00, 0x03, 0xb8, 0x00, 0x00, 
+-	0x0e, 0xe0, 0x3b, 0x80, 0x1e, 0x0f, 0x00, 0x00, 
+-	0x00, 0xe0, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x1f, 0x83, 0xe0, 0x00, 0x38, 0x03, 0xc0, 0x00, 
+-	0x3e, 0x0f, 0x80, 0x00, 0x00, 0xe0, 0x00, 0x00, 
+-	0x1f, 0x07, 0xc0, 0x00, 0x03, 0xf8, 0x00, 0x00, 
+-	0x0f, 0xe0, 0x3f, 0x80, 0x3c, 0x07, 0x80, 0x00, 
+-	0x00, 0xe0, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x0f, 0xff, 0xf0, 0x00, 0x38, 0x01, 0xe0, 0x00, 
+-	0x1f, 0xff, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 
+-	0x0f, 0xff, 0x80, 0x00, 0x03, 0xf8, 0x00, 0x00, 
+-	0x0f, 0xe0, 0x3f, 0x80, 0x38, 0x03, 0x80, 0x00, 
+-	0x00, 0xe0, 0x00, 0x00, 0xff, 0xff, 0x80, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x03, 0xff, 0xf8, 0x00, 0x38, 0x00, 0xe0, 0x00, 
+-	0x0f, 0xfe, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 
+-	0x07, 0xff, 0x00, 0x00, 0x01, 0xf0, 0x00, 0x00, 
+-	0x07, 0xc0, 0x1f, 0x00, 0x78, 0x03, 0xc0, 0x00, 
+-	0x00, 0xe0, 0x00, 0x00, 0xff, 0xff, 0x80, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x01, 0xff, 0x3c, 0x00, 0x38, 0x00, 0xf0, 0x00, 
+-	0x07, 0xf8, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 
+-	0x03, 0xfe, 0x00, 0x00, 0x01, 0xf0, 0x00, 0x00, 
+-	0x07, 0xc0, 0x1f, 0x00, 0xf0, 0x01, 0xe0, 0x00, 
+-	0x00, 0xe0, 0x00, 0x00, 0xff, 0xff, 0x80, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
+-	0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
+-	0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x0f, 0x80, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1f, 0x80, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0f, 0xf0, 0x00, 0x00, 0x39, 0xf0, 0x00, 0x00, 
+-	0x07, 0xe0, 0x00, 0x00, 0x0f, 0x9c, 0x00, 0x00, 
+-	0x07, 0xe0, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 
+-	0x0f, 0x9c, 0x00, 0x00, 0x39, 0xf0, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x3c, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x39, 0xf0, 0xf8, 0x00, 0x39, 0xf0, 0x00, 0x00, 
+-	0x07, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1f, 0xf8, 0x00, 0x00, 0x3f, 0xf8, 0x00, 0x00, 
+-	0x1f, 0xf0, 0x00, 0x00, 0x1f, 0xfc, 0x00, 0x00, 
+-	0x1f, 0xf8, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 
+-	0x1f, 0xfc, 0x00, 0x00, 0x3f, 0xf8, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x78, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x3f, 0xfb, 0xfc, 0x00, 0x3f, 0xf8, 0x00, 0x00, 
+-	0x1f, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x3c, 0x7c, 0x00, 0x00, 0x3e, 0x3c, 0x00, 0x00, 
+-	0x3c, 0x78, 0x00, 0x00, 0x3c, 0x7c, 0x00, 0x00, 
+-	0x3c, 0x3c, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x3c, 0x7c, 0x00, 0x00, 0x3e, 0x3c, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0xf0, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x3e, 0x3f, 0x1e, 0x00, 0x3e, 0x3c, 0x00, 0x00, 
+-	0x3c, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x70, 0x1c, 0x00, 0x00, 0x3c, 0x1c, 0x00, 0x00, 
+-	0x38, 0x3c, 0x00, 0x00, 0x38, 0x3c, 0x00, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x3c, 0x00, 0x00, 0x3c, 0x3c, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x39, 0xe0, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x3c, 0x1e, 0x0e, 0x00, 0x3c, 0x1c, 0x00, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x70, 0x1c, 0x00, 0x00, 0x38, 0x1e, 0x00, 0x00, 
+-	0x78, 0x1c, 0x00, 0x00, 0x78, 0x3c, 0x00, 0x00, 
+-	0x70, 0x0e, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x78, 0x1c, 0x00, 0x00, 0x38, 0x1c, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x3b, 0xc0, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x1c, 0x0e, 0x00, 0x38, 0x1c, 0x00, 0x00, 
+-	0x78, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x38, 0x0e, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x70, 0x1c, 0x00, 0x00, 
+-	0x70, 0x0e, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x70, 0x1c, 0x00, 0x00, 0x38, 0x1c, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x3f, 0x80, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x1c, 0x0e, 0x00, 0x38, 0x1c, 0x00, 0x00, 
+-	0x70, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0xfc, 0x00, 0x00, 0x38, 0x0e, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x70, 0x1c, 0x00, 0x00, 
+-	0x7f, 0xfe, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x70, 0x1c, 0x00, 0x00, 0x38, 0x1c, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x3f, 0x80, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x1c, 0x0e, 0x00, 0x38, 0x1c, 0x00, 0x00, 
+-	0x70, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1f, 0xfc, 0x00, 0x00, 0x38, 0x0e, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x70, 0x1c, 0x00, 0x00, 
+-	0x7f, 0xfe, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x70, 0x1c, 0x00, 0x00, 0x38, 0x1c, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x3f, 0xc0, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x1c, 0x0e, 0x00, 0x38, 0x1c, 0x00, 0x00, 
+-	0x70, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x3f, 0x9c, 0x00, 0x00, 0x38, 0x0e, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x70, 0x1c, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x70, 0x1c, 0x00, 0x00, 0x38, 0x1c, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x3b, 0xc0, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x1c, 0x0e, 0x00, 0x38, 0x1c, 0x00, 0x00, 
+-	0x70, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x78, 0x1c, 0x00, 0x00, 0x38, 0x0e, 0x00, 0x00, 
+-	0x70, 0x1c, 0x00, 0x00, 0x70, 0x1c, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x70, 0x1c, 0x00, 0x00, 0x38, 0x1c, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x39, 0xe0, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x1c, 0x0e, 0x00, 0x38, 0x1c, 0x00, 0x00, 
+-	0x70, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x70, 0x1c, 0x00, 0x00, 0x3c, 0x1e, 0x00, 0x00, 
+-	0x78, 0x1c, 0x00, 0x00, 0x78, 0x3c, 0x00, 0x00, 
+-	0x78, 0x0e, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x78, 0x3c, 0x00, 0x00, 0x38, 0x1c, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0xf0, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x1c, 0x0e, 0x00, 0x38, 0x1c, 0x00, 0x00, 
+-	0x78, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x70, 0x3c, 0x00, 0x00, 0x3c, 0x1c, 0x00, 0x00, 
+-	0x38, 0x38, 0x00, 0x00, 0x38, 0x3c, 0x00, 0x00, 
+-	0x38, 0x1e, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x3c, 0x00, 0x00, 0x38, 0x1c, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0xf0, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x1c, 0x0e, 0x00, 0x38, 0x1c, 0x00, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x78, 0x7c, 0x00, 0x00, 0x3e, 0x3c, 0x00, 0x00, 
+-	0x3c, 0x78, 0x00, 0x00, 0x3c, 0x7c, 0x00, 0x00, 
+-	0x3e, 0x3c, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x3c, 0x7c, 0x00, 0x00, 0x38, 0x1c, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x78, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x1c, 0x0e, 0x00, 0x38, 0x1c, 0x00, 0x00, 
+-	0x3c, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x3f, 0xfc, 0x00, 0x00, 0x3f, 0xf8, 0x00, 0x00, 
+-	0x1f, 0xf0, 0x00, 0x00, 0x1f, 0xfc, 0x00, 0x00, 
+-	0x1f, 0xf8, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x1f, 0xfc, 0x00, 0x00, 0x38, 0x1c, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x38, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x1c, 0x0e, 0x00, 0x38, 0x1c, 0x00, 0x00, 
+-	0x1f, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1f, 0x8e, 0x00, 0x00, 0x39, 0xf0, 0x00, 0x00, 
+-	0x07, 0xe0, 0x00, 0x00, 0x0f, 0x9c, 0x00, 0x00, 
+-	0x07, 0xf0, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x0f, 0x9c, 0x00, 0x00, 0x38, 0x1c, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x3c, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x1c, 0x0e, 0x00, 0x38, 0x1c, 0x00, 0x00, 
+-	0x07, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x70, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x78, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x7c, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x3f, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x01, 0xf0, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x01, 0xe0, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x03, 0xc0, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x07, 0xc0, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0f, 0xc0, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0f, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0f, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x39, 0xf0, 0x00, 0x00, 
+-	0x0f, 0x9c, 0x00, 0x00, 0x3b, 0xc0, 0x00, 0x00, 
+-	0x1f, 0xe0, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0xe0, 0x38, 0x00, 0x01, 
+-	0xe0, 0x70, 0x3c, 0x00, 0xe0, 0x38, 0x00, 0x00, 
+-	0xe0, 0x38, 0x00, 0x00, 0x7f, 0xf8, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x3f, 0xf8, 0x00, 0x00, 
+-	0x1f, 0xfc, 0x00, 0x00, 0x3f, 0xc0, 0x00, 0x00, 
+-	0x3f, 0xf0, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0xf0, 0x78, 0x00, 0x00, 
+-	0xe0, 0x70, 0x38, 0x00, 0x70, 0x70, 0x00, 0x00, 
+-	0xf0, 0x78, 0x00, 0x00, 0x7f, 0xf8, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x3e, 0x3c, 0x00, 0x00, 
+-	0x3c, 0x7c, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 
+-	0x78, 0x78, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0x70, 0x70, 0x00, 0x00, 
+-	0xe0, 0xf8, 0x38, 0x00, 0x38, 0xe0, 0x00, 0x00, 
+-	0x70, 0x70, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x1f, 0x01, 0x00, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x3c, 0x1c, 0x00, 0x00, 
+-	0x38, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 
+-	0x70, 0x38, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0x70, 0x70, 0x00, 0x00, 
+-	0xe0, 0xf8, 0x38, 0x00, 0x38, 0xe0, 0x00, 0x00, 
+-	0x70, 0x70, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x7f, 0xe3, 0x00, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x38, 0x1e, 0x00, 0x00, 
+-	0x78, 0x3c, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0x70, 0x70, 0x00, 0x00, 
+-	0x70, 0xd8, 0x70, 0x00, 0x1d, 0xc0, 0x00, 0x00, 
+-	0x78, 0xf0, 0x00, 0x00, 0x01, 0xe0, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x7f, 0xff, 0x00, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x38, 0x0e, 0x00, 0x00, 
+-	0x70, 0x1c, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x7c, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0x38, 0xe0, 0x00, 0x00, 
+-	0x71, 0xdc, 0x70, 0x00, 0x0f, 0x80, 0x00, 0x00, 
+-	0x38, 0xe0, 0x00, 0x00, 0x03, 0xc0, 0x00, 0x00, 
+-	0x1e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x1e, 0x00, 0x00, 0x00, 0x61, 0xff, 0x00, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x38, 0x0e, 0x00, 0x00, 
+-	0x70, 0x1c, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x3f, 0xc0, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0x38, 0xe0, 0x00, 0x00, 
+-	0x71, 0x8c, 0x70, 0x00, 0x0f, 0x80, 0x00, 0x00, 
+-	0x38, 0xe0, 0x00, 0x00, 0x03, 0x80, 0x00, 0x00, 
+-	0x3c, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x0f, 0x00, 0x00, 0x00, 0x40, 0x7c, 0x00, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x38, 0x0e, 0x00, 0x00, 
+-	0x70, 0x1c, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x1f, 0xf0, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0x38, 0xe0, 0x00, 0x00, 
+-	0x31, 0x8c, 0x60, 0x00, 0x07, 0x00, 0x00, 0x00, 
+-	0x39, 0xe0, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 
+-	0x78, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x07, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x38, 0x0e, 0x00, 0x00, 
+-	0x70, 0x1c, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x03, 0xf8, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0x1d, 0xc0, 0x00, 0x00, 
+-	0x33, 0x8e, 0xe0, 0x00, 0x0f, 0x80, 0x00, 0x00, 
+-	0x1d, 0xc0, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 
+-	0x78, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x07, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x38, 0x0e, 0x00, 0x00, 
+-	0x70, 0x1c, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x3c, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0x1d, 0xc0, 0x00, 0x00, 
+-	0x3b, 0x06, 0xe0, 0x00, 0x0f, 0x80, 0x00, 0x00, 
+-	0x1d, 0xc0, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x3c, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x3c, 0x1e, 0x00, 0x00, 
+-	0x78, 0x3c, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x70, 0x1c, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0x0d, 0x80, 0x00, 0x00, 
+-	0x1b, 0x06, 0xe0, 0x00, 0x1d, 0xc0, 0x00, 0x00, 
+-	0x1f, 0xc0, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 
+-	0x1e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x3c, 0x1c, 0x00, 0x00, 
+-	0x38, 0x3c, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x78, 0x1c, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x38, 0x3c, 0x00, 0x00, 0x0f, 0x80, 0x00, 0x00, 
+-	0x1f, 0x07, 0xc0, 0x00, 0x38, 0xe0, 0x00, 0x00, 
+-	0x0f, 0x80, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x3e, 0x3c, 0x00, 0x00, 
+-	0x3c, 0x7c, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x3c, 0x3c, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x3c, 0x7c, 0x00, 0x00, 0x0f, 0x80, 0x00, 0x00, 
+-	0x1e, 0x07, 0xc0, 0x00, 0x38, 0xe0, 0x00, 0x00, 
+-	0x0f, 0x80, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x3f, 0xf8, 0x00, 0x00, 
+-	0x1f, 0xfc, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x1f, 0xf8, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 
+-	0x1f, 0xfc, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 
+-	0x1e, 0x03, 0xc0, 0x00, 0x70, 0x70, 0x00, 0x00, 
+-	0x0f, 0x80, 0x00, 0x00, 0xff, 0xf8, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x08, 0x00, 0x40, 0x00, 0x39, 0xe0, 0x00, 0x00, 
+-	0x07, 0x9c, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x0f, 0xe0, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 
+-	0x0f, 0x9c, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 
+-	0x0e, 0x03, 0x80, 0x00, 0xe0, 0x38, 0x00, 0x00, 
+-	0x07, 0x00, 0x00, 0x00, 0xff, 0xf8, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0f, 0xff, 0xc0, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0f, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0f, 0xc0, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x07, 0xc0, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x03, 0xc0, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x27, 
+-	0x1a, 0x1a, 0x1a, 0x1a, 0x1a, 0x1a, 0x1a, 0x1a, 
+-	0x1a, 0x1a, 0x1a, 0x1a, 0x1a, 0x1a, 0x1a, 0x1a, 
+-	0x1a, 0x1a, 0x1a, 0x1a, 0x1a, 0x1a, 0x1a, 0x1a, 
+-	0x0b, 0x15, 0x17, 0x13, 0x1a, 0x13, 0x19, 0x13, 
+-	0x09, 0x0b, 0x0c, 0x13, 0x13, 0x1e, 0x17, 0x06, 
+-	0x0b, 0x0b, 0x0d, 0x14, 0x09, 0x0b, 0x09, 0x09, 
+-	0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 
+-	0x13, 0x13, 0x09, 0x09, 0x14, 0x14, 0x14, 0x13, 
+-	0x23, 0x17, 0x17, 0x19, 0x19, 0x17, 0x15, 0x1a, 
+-	0x19, 0x09, 0x11, 0x17, 0x13, 0x1d, 0x19, 0x1a, 
+-	0x17, 0x1a, 0x19, 0x17, 0x15, 0x19, 0x17, 0x22, 
+-	0x17, 0x15, 0x15, 0x09, 0x09, 0x09, 0x11, 0x13, 
+-	0x0b, 0x12, 0x12, 0x11, 0x12, 0x12, 0x0a, 0x12, 
+-	0x13, 0x07, 0x07, 0x11, 0x07, 0x1b, 0x13, 0x12, 
+-	0x12, 0x12, 0x0b, 0x11, 0x09, 0x13, 0x11, 0x17, 
+-	0x10, 0x11, 0x10, 0x0b, 0x09, 0x0b, 0x14, 0x1a, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0f, 0xff, 0xfc, 0x00, 0x00, 0x0f, 0xff, 0xfc, 
+-	0x00, 0x00, 0x0f, 0xff, 0xfc, 0x00, 0x00, 0x0f, 
+-	0xff, 0xfc, 0x00, 0x00, 0x0f, 0xff, 0xfc, 0x00, 
+-	0x00, 0x0f, 0xff, 0xfc, 0x00, 0x00, 0x0f, 0xff, 
+-	0xfc, 0x00, 0x00, 0x0f, 0xff, 0xfc, 0x00, 0x00, 
+-	0x0f, 0xff, 0xfc, 0x00, 0x00, 0x0f, 0xff, 0xfc, 
+-	0x00, 0x00, 0x0f, 0xff, 0xfc, 0x00, 0x00, 0x0f, 
+-	0xff, 0xfc, 0x00, 0x00, 0x0f, 0xff, 0xfc, 0x00, 
+-	0x00, 0x0f, 0xff, 0xfc, 0x00, 0x00, 0x0f, 0xff, 
+-	0xfc, 0x00, 0x00, 0x0f, 0xff, 0xfc, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x0f, 0xff, 0xfc, 0x00, 0x00, 0x0f, 0xff, 0xfc, 
+-	0x00, 0x00, 0x0f, 0xff, 0xfc, 0x00, 0x00, 0x0f, 
+-	0xff, 0xfc, 0x00, 0x00, 0x0f, 0xff, 0xfc, 0x00, 
+-	0x00, 0x0f, 0xff, 0xfc, 0x00, 0x00, 0x0f, 0xff, 
+-	0xfc, 0x00, 0x00, 0x0f, 0xff, 0xfc, 0x00, 0x00, 
+-	0x0f, 0xff, 0xfc, 0x00, 0x00, 0x0f, 0xff, 0xfc, 
+-	0x00, 0x00, 0x0f, 0xff, 0xfc, 0x00, 0x00, 0x0f, 
+-	0xff, 0xfc, 0x00, 0x00, 0x0f, 0xff, 0xfc, 0x00, 
+-	0x00, 0x0f, 0xff, 0xfc, 0x00, 0x00, 0x0f, 0xff, 
+-	0xfc, 0x00, 0x00, 0x0f, 0xff, 0xfc, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x01, 0xc7, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x71, 0xc0, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe3, 
+-	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x01, 0xc7, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x71, 0xc0, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe3, 
+-	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x01, 0xc7, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x71, 0xc0, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe3, 
+-	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xf8, 0x00, 
+-	0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x80, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xfe, 0x00, 
+-	0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xe0, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xfe, 0x00, 
+-	0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x07, 
+-	0x1c, 0x00, 0x00, 0x00, 0x03, 0xff, 0xf0, 0x00, 
+-	0x00, 0x07, 0x1c, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x1c, 0x00, 0x00, 0x07, 0x1c, 0x00, 0x00, 0x00, 
+-	0x0f, 0xff, 0xfc, 0x00, 0x00, 0x0f, 0xff, 0xfc, 
+-	0x00, 0x00, 0x0f, 0xff, 0xfc, 0x00, 0x00, 0x0f, 
+-	0xff, 0xfc, 0x00, 0x00, 0x0f, 0xff, 0xfc, 0x00, 
+-	0x00, 0x0f, 0xff, 0xfc, 0x00, 0x00, 0x0f, 0xff, 
+-	0xfc, 0x00, 0x00, 0x0f, 0xff, 0xfc, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x1f, 0x00, 
+-	0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x07, 
+-	0x1c, 0x00, 0x00, 0x00, 0x07, 0xe1, 0xf8, 0x00, 
+-	0x00, 0x07, 0x1c, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x1c, 0x00, 0x00, 0x07, 0x1c, 0x00, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x07, 0x00, 
+-	0x00, 0x00, 0x00, 0xee, 0x00, 0x00, 0x00, 0x07, 
+-	0x1c, 0x00, 0x00, 0x00, 0x0f, 0x80, 0x7c, 0x00, 
+-	0x00, 0x07, 0x1c, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x1c, 0x00, 0x00, 0x07, 0x1c, 0x00, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x07, 0x00, 
+-	0x00, 0x00, 0x01, 0xef, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x1e, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x07, 0x00, 
+-	0x00, 0x00, 0x01, 0xc7, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x1e, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x07, 0x00, 
+-	0x00, 0x00, 0x03, 0xc7, 0x80, 0x00, 0x00, 0x0f, 
+-	0xf8, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x0e, 0x00, 
+-	0x00, 0x03, 0xf0, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x1c, 0x00, 0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x0e, 0x00, 
+-	0x00, 0x00, 0x03, 0xc7, 0x80, 0x00, 0x00, 0x1f, 
+-	0xfe, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x0f, 0x00, 
+-	0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x1c, 0x00, 0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x0e, 0x00, 
+-	0x00, 0x00, 0x03, 0x83, 0x80, 0x00, 0x00, 0x3f, 
+-	0xff, 0x00, 0x00, 0x00, 0x38, 0x00, 0x07, 0x00, 
+-	0x00, 0x1f, 0xfe, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x1c, 0x00, 0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x1c, 0x00, 
+-	0x00, 0x00, 0x07, 0x83, 0xc0, 0x00, 0x00, 0x78, 
+-	0x1f, 0x00, 0x00, 0x00, 0x38, 0x00, 0x07, 0x00, 
+-	0x00, 0x3e, 0x1f, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x1c, 0x00, 0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x1c, 0x00, 
+-	0x00, 0x00, 0x07, 0x01, 0xc0, 0x00, 0x00, 0x70, 
+-	0x07, 0x00, 0x00, 0x00, 0x38, 0x00, 0x07, 0x00, 
+-	0x00, 0x3c, 0x0f, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x1c, 0x00, 0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x1c, 0x00, 
+-	0x00, 0x00, 0x0f, 0x01, 0xe0, 0x00, 0x00, 0x00, 
+-	0x07, 0x00, 0x00, 0x00, 0x38, 0x00, 0x07, 0x00, 
+-	0x00, 0x78, 0x07, 0x80, 0x00, 0x00, 0x1c, 0x00, 
+-	0x1c, 0x00, 0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x1f, 0x00, 
+-	0x00, 0x00, 0x0f, 0x01, 0xe0, 0x00, 0x00, 0x00, 
+-	0x3f, 0x00, 0x00, 0x00, 0x38, 0x00, 0x07, 0x00, 
+-	0x00, 0x70, 0x03, 0x80, 0x00, 0x00, 0x1c, 0x00, 
+-	0x1c, 0x00, 0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x0f, 0x80, 
+-	0x00, 0x00, 0x0f, 0xff, 0xe0, 0x00, 0x00, 0x07, 
+-	0xff, 0x00, 0x00, 0x00, 0x38, 0x00, 0x07, 0x00, 
+-	0x00, 0x70, 0x03, 0x80, 0x00, 0x00, 0x1c, 0x00, 
+-	0x1c, 0x00, 0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x7f, 0xc0, 0x00, 0x00, 0x00, 0x1c, 0x07, 0xc0, 
+-	0x00, 0x00, 0x1f, 0xff, 0xf0, 0x00, 0x00, 0x1f, 
+-	0xff, 0x00, 0x00, 0x00, 0x38, 0x00, 0x07, 0x00, 
+-	0x00, 0x70, 0x03, 0x80, 0x00, 0x00, 0x1c, 0x00, 
+-	0x1c, 0x00, 0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x7f, 0xc0, 0x00, 0x00, 0x00, 0x1c, 0x01, 0xe0, 
+-	0x00, 0x00, 0x1f, 0xff, 0xf0, 0x00, 0x00, 0x3f, 
+-	0xf7, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x0f, 0x00, 
+-	0x00, 0x70, 0x03, 0x80, 0x00, 0x00, 0x1c, 0x00, 
+-	0x1c, 0x00, 0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x7f, 0xc0, 0x00, 0x00, 0x00, 0x1c, 0x00, 0xf0, 
+-	0x00, 0x00, 0x1c, 0x00, 0x70, 0x00, 0x00, 0x7c, 
+-	0x07, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x0e, 0x00, 
+-	0x00, 0x70, 0x03, 0x80, 0x00, 0x00, 0x1c, 0x00, 
+-	0x1c, 0x00, 0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x70, 
+-	0x00, 0x00, 0x3c, 0x00, 0x78, 0x00, 0x00, 0x70, 
+-	0x07, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x1e, 0x00, 
+-	0x00, 0x70, 0x03, 0x80, 0x00, 0x00, 0x1e, 0x00, 
+-	0x3c, 0x00, 0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x20, 0x70, 
+-	0x00, 0x00, 0x38, 0x00, 0x38, 0x00, 0x00, 0x70, 
+-	0x0f, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x1e, 0x00, 
+-	0x00, 0x78, 0x07, 0x80, 0x00, 0x00, 0x1e, 0x00, 
+-	0x3c, 0x00, 0x00, 0x38, 0x07, 0x80, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0xf0, 0xf0, 
+-	0x00, 0x00, 0x78, 0x00, 0x3c, 0x00, 0x00, 0x70, 
+-	0x1f, 0x00, 0x00, 0x00, 0x0f, 0x80, 0x7c, 0x00, 
+-	0x00, 0x3c, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x00, 
+-	0x78, 0x00, 0x00, 0x3c, 0x07, 0x80, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0xf9, 0xf0, 
+-	0x00, 0x00, 0x78, 0x00, 0x3c, 0x00, 0x00, 0x7c, 
+-	0x3f, 0x00, 0x00, 0x00, 0x07, 0xe1, 0xf8, 0x00, 
+-	0x00, 0x3e, 0x1f, 0x00, 0x00, 0x00, 0x0f, 0xc1, 
+-	0xf8, 0x00, 0x00, 0x3e, 0x1f, 0x80, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x7f, 0xe0, 
+-	0x00, 0x00, 0x70, 0x00, 0x1c, 0x00, 0x00, 0x3f, 
+-	0xff, 0x00, 0x00, 0x00, 0x03, 0xff, 0xf0, 0x00, 
+-	0x00, 0x1f, 0xfe, 0x00, 0x00, 0x00, 0x07, 0xff, 
+-	0xf0, 0x00, 0x00, 0x1f, 0xff, 0x80, 0x00, 0x00, 
+-	0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 
+-	0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 
+-	0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 
+-	0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 0x08, 0x00, 
+-	0x04, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x3f, 0xc0, 
+-	0x00, 0x00, 0xf0, 0x00, 0x1e, 0x00, 0x00, 0x3f, 
+-	0xf7, 0x80, 0x00, 0x00, 0x01, 0xff, 0xe0, 0x00, 
+-	0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 0x03, 0xff, 
+-	0xe0, 0x00, 0x00, 0x1f, 0xfb, 0x80, 0x00, 0x00, 
+-	0x0f, 0xff, 0xfc, 0x00, 0x00, 0x0f, 0xff, 0xfc, 
+-	0x00, 0x00, 0x0f, 0xff, 0xfc, 0x00, 0x00, 0x0f, 
+-	0xff, 0xfc, 0x00, 0x00, 0x0f, 0xff, 0xfc, 0x00, 
+-	0x00, 0x0f, 0xff, 0xfc, 0x00, 0x00, 0x0f, 0xff, 
+-	0xfc, 0x00, 0x00, 0x0f, 0xff, 0xfc, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x1f, 0x80, 
+-	0x00, 0x00, 0xe0, 0x00, 0x0e, 0x00, 0x00, 0x0f, 
+-	0xe3, 0x80, 0x00, 0x00, 0x00, 0x7f, 0x80, 0x00, 
+-	0x00, 0x03, 0xf0, 0x00, 0x00, 0x00, 0x00, 0xff, 
+-	0x80, 0x00, 0x00, 0x07, 0xe3, 0x80, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x00, 0x71, 0xc0, 0x00, 0x00, 0x00, 0x01, 
+-	0xc3, 0x80, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 
+-	0x00, 0x07, 0xc0, 0x0e, 0x00, 0x00, 0x00, 0xf8, 
+-	0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 
+-	0x01, 0xc0, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 
+-	0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x01, 0xc0, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x00, 0x71, 0xc0, 0x00, 0x00, 0x00, 0x01, 
+-	0xc7, 0x80, 0x00, 0x00, 0x0f, 0xfc, 0x00, 0x00, 
+-	0x00, 0x1f, 0xe0, 0x1e, 0x00, 0x00, 0x01, 0xfe, 
+-	0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 
+-	0x01, 0x80, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 
+-	0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x03, 0xc0, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x00, 0x71, 0xc0, 0x00, 0x00, 0x00, 0x03, 
+-	0xc7, 0x80, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 
+-	0x00, 0x1c, 0x70, 0x1c, 0x00, 0x00, 0x03, 0xfe, 
+-	0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 
+-	0x03, 0x80, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x03, 0x80, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x00, 0x71, 0xc0, 0x00, 0x00, 0x00, 0x03, 
+-	0xc7, 0x00, 0x00, 0x00, 0x3e, 0xde, 0x00, 0x00, 
+-	0x00, 0x3c, 0x78, 0x3c, 0x00, 0x00, 0x07, 0x8f, 
+-	0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 
+-	0x07, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x76, 0xe0, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x03, 0x80, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x00, 0x71, 0xc0, 0x00, 0x00, 0x00, 0x03, 
+-	0x87, 0x00, 0x00, 0x00, 0x3c, 0xcf, 0x00, 0x00, 
+-	0x00, 0x38, 0x38, 0x38, 0x00, 0x00, 0x07, 0x07, 
+-	0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 
+-	0x07, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x7f, 0xe0, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x03, 0x80, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x00, 0x71, 0xc0, 0x00, 0x00, 0x00, 0x03, 
+-	0x87, 0x00, 0x00, 0x00, 0x38, 0xc7, 0x00, 0x00, 
+-	0x00, 0x38, 0x38, 0x78, 0x00, 0x00, 0x07, 0x07, 
+-	0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x00, 0x3f, 0xc0, 0x00, 0x00, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x07, 0x80, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x00, 0x71, 0xc0, 0x00, 0x00, 0x00, 0x03, 
+-	0x8f, 0x00, 0x00, 0x00, 0x38, 0xc0, 0x00, 0x00, 
+-	0x00, 0x38, 0x38, 0x70, 0x00, 0x00, 0x07, 0x07, 
+-	0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x00, 0x71, 0xc0, 0x00, 0x00, 0x00, 0x7f, 
+-	0xff, 0xc0, 0x00, 0x00, 0x38, 0xc0, 0x00, 0x00, 
+-	0x00, 0x38, 0x38, 0xf0, 0x00, 0x00, 0x07, 0x8f, 
+-	0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 
+-	0x1e, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 
+-	0x00, 0x00, 0x1f, 0x80, 0x00, 0x00, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x00, 0x70, 0xc0, 0x00, 0x00, 0x00, 0x7f, 
+-	0xff, 0xc0, 0x00, 0x00, 0x3c, 0xc0, 0x00, 0x00, 
+-	0x00, 0x38, 0x38, 0xe0, 0x00, 0x00, 0x03, 0x9e, 
+-	0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 
+-	0x00, 0x00, 0x39, 0xc0, 0x00, 0x00, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 
+-	0xff, 0xc0, 0x00, 0x00, 0x1e, 0xc0, 0x00, 0x00, 
+-	0x00, 0x3c, 0x79, 0xe0, 0x00, 0x00, 0x03, 0xfc, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 
+-	0x00, 0x00, 0x19, 0x80, 0x00, 0x00, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 
+-	0x0e, 0x00, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x00, 
+-	0x00, 0x1c, 0x71, 0xc0, 0x00, 0x00, 0x01, 0xf8, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 
+-	0x1e, 0x00, 0x00, 0x00, 0x0f, 0xf8, 0x00, 0x00, 
+-	0x00, 0x1f, 0xe3, 0xc0, 0x00, 0x00, 0x03, 0xf0, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x3c, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 
+-	0x1e, 0x00, 0x00, 0x00, 0x03, 0xfe, 0x00, 0x00, 
+-	0x00, 0x07, 0xc3, 0x8f, 0x80, 0x00, 0x07, 0xf0, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 
+-	0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 
+-	0x00, 0x00, 0x07, 0xbf, 0xc0, 0x00, 0x0f, 0x78, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 
+-	0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0xcf, 0x00, 0x00, 
+-	0x00, 0x00, 0x07, 0x38, 0xe0, 0x00, 0x1e, 0x3c, 
+-	0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 
+-	0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 
+-	0xff, 0xc0, 0x00, 0x00, 0x00, 0xc7, 0x80, 0x00, 
+-	0x00, 0x00, 0x0f, 0x78, 0xf0, 0x00, 0x3c, 0x1e, 
+-	0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x7f, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 
+-	0xff, 0xc0, 0x00, 0x00, 0x00, 0xc3, 0x80, 0x00, 
+-	0x00, 0x00, 0x0e, 0x70, 0x70, 0x00, 0x38, 0x1e, 
+-	0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x7f, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 
+-	0xff, 0xc0, 0x00, 0x00, 0x00, 0xc3, 0x80, 0x00, 
+-	0x00, 0x00, 0x1e, 0x70, 0x70, 0x00, 0x38, 0x0f, 
+-	0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x7f, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 
+-	0x38, 0x00, 0x00, 0x00, 0x70, 0xc3, 0x80, 0x00, 
+-	0x00, 0x00, 0x1c, 0x70, 0x70, 0x00, 0x38, 0x07, 
+-	0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 
+-	0x38, 0x00, 0x00, 0x00, 0x78, 0xc7, 0x80, 0x00, 
+-	0x00, 0x00, 0x3c, 0x70, 0x70, 0x00, 0x3c, 0x03, 
+-	0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 
+-	0x38, 0x00, 0x00, 0x00, 0x78, 0xc7, 0x80, 0x00, 
+-	0x00, 0x00, 0x38, 0x70, 0x70, 0x00, 0x3c, 0x07, 
+-	0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x3c, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 
+-	0x78, 0x00, 0x00, 0x00, 0x3e, 0xdf, 0x00, 0x00, 
+-	0x00, 0x00, 0x70, 0x78, 0xf0, 0x00, 0x1f, 0x1f, 
+-	0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 
+-	0x78, 0x00, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 
+-	0x00, 0x00, 0x70, 0x38, 0xe0, 0x00, 0x0f, 0xff, 
+-	0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 
+-	0x70, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 0x00, 
+-	0x00, 0x00, 0xe0, 0x3f, 0xc0, 0x00, 0x07, 0xfe, 
+-	0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0x70, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 
+-	0x00, 0x00, 0xe0, 0x0f, 0x80, 0x00, 0x03, 0xf8, 
+-	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1e, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x07, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x07, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x03, 0x80, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x01, 0x80, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x01, 0xc0, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x03, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 
+-	0x00, 0x00, 0x03, 0xfc, 0x00, 0x00, 0x00, 0x07, 
+-	0xf8, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x1f, 0xff, 0x80, 0x00, 0x00, 0x01, 0xfc, 
+-	0x00, 0x00, 0x00, 0x7f, 0xff, 0xc0, 0x00, 0x00, 
+-	0x03, 0xf8, 0x00, 0x00, 0x00, 0x03, 0xf8, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x03, 0xf8, 0x00, 0x00, 0x00, 
+-	0x0f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 
+-	0x00, 0x00, 0x0f, 0xfe, 0x00, 0x00, 0x00, 0x0f, 
+-	0xfe, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x1f, 0xff, 0x80, 0x00, 0x00, 0x07, 0xff, 
+-	0x00, 0x00, 0x00, 0x7f, 0xff, 0xc0, 0x00, 0x00, 
+-	0x0f, 0xfe, 0x00, 0x00, 0x00, 0x0f, 0xfe, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x0f, 0xfe, 0x00, 0x00, 0x00, 
+-	0x1f, 0xff, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 
+-	0x00, 0x00, 0x1f, 0xff, 0x00, 0x00, 0x00, 0x1f, 
+-	0xff, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 
+-	0x00, 0x3f, 0xff, 0x80, 0x00, 0x00, 0x0f, 0xff, 
+-	0x80, 0x00, 0x00, 0x7f, 0xff, 0xc0, 0x00, 0x00, 
+-	0x1f, 0xff, 0x00, 0x00, 0x00, 0x1f, 0xff, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x0f, 0xff, 0x00, 0x00, 0x00, 
+-	0x1f, 0x1f, 0x00, 0x00, 0x00, 0x01, 0xf0, 0x00, 
+-	0x00, 0x00, 0x3e, 0x0f, 0x80, 0x00, 0x00, 0x3e, 
+-	0x1f, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 
+-	0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x0f, 
+-	0x80, 0x00, 0x00, 0x00, 0x03, 0x80, 0x00, 0x00, 
+-	0x1e, 0x0f, 0x00, 0x00, 0x00, 0x3e, 0x0f, 0x80, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x1f, 0x1f, 0x00, 0x00, 0x00, 
+-	0x3c, 0x07, 0x80, 0x00, 0x00, 0x03, 0xf0, 0x00, 
+-	0x00, 0x00, 0x78, 0x03, 0xc0, 0x00, 0x00, 0x78, 
+-	0x07, 0x80, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 
+-	0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x03, 
+-	0xc0, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 
+-	0x3c, 0x07, 0x80, 0x00, 0x00, 0x3c, 0x03, 0x80, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 
+-	0x00, 0x00, 0x00, 0x3c, 0x07, 0x80, 0x00, 0x00, 
+-	0x38, 0x03, 0x80, 0x00, 0x00, 0x0f, 0xf0, 0x00, 
+-	0x00, 0x00, 0x70, 0x03, 0xc0, 0x00, 0x00, 0x70, 
+-	0x03, 0x80, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 
+-	0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x01, 
+-	0xc0, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 
+-	0x38, 0x03, 0x80, 0x00, 0x00, 0x78, 0x03, 0x80, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xc0, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 
+-	0x00, 0x00, 0x00, 0x3c, 0x03, 0x80, 0x00, 0x00, 
+-	0x78, 0x03, 0xc0, 0x00, 0x00, 0x1f, 0x70, 0x00, 
+-	0x00, 0x00, 0x70, 0x01, 0xc0, 0x00, 0x00, 0x00, 
+-	0x03, 0x80, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 
+-	0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 
+-	0x38, 0x03, 0x80, 0x00, 0x00, 0x70, 0x01, 0xc0, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 
+-	0x00, 0x00, 0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 
+-	0x78, 0x03, 0xc0, 0x00, 0x00, 0x1e, 0x70, 0x00, 
+-	0x00, 0x00, 0x00, 0x01, 0xc0, 0x00, 0x00, 0x00, 
+-	0x03, 0x80, 0x00, 0x00, 0x01, 0xee, 0x00, 0x00, 
+-	0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x38, 0x03, 0x80, 0x00, 0x00, 0x70, 0x01, 0xc0, 
+-	0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x1c, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x80, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xc0, 
+-	0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x00, 0x00, 
+-	0x70, 0x01, 0xc0, 0x00, 0x00, 0x18, 0x70, 0x00, 
+-	0x00, 0x00, 0x00, 0x01, 0xc0, 0x00, 0x00, 0x00, 
+-	0x07, 0x80, 0x00, 0x00, 0x03, 0xce, 0x00, 0x00, 
+-	0x00, 0x3b, 0xf8, 0x00, 0x00, 0x00, 0x78, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x3c, 0x07, 0x80, 0x00, 0x00, 0x70, 0x01, 0xc0, 
+-	0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x1c, 
+-	0x00, 0x00, 0x00, 0x00, 0x01, 0xfe, 0x00, 0x00, 
+-	0x00, 0x3f, 0xff, 0xc0, 0x00, 0x00, 0x07, 0xf8, 
+-	0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x00, 0x00, 
+-	0x70, 0x01, 0xc0, 0x00, 0x00, 0x00, 0x70, 0x00, 
+-	0x00, 0x00, 0x00, 0x03, 0xc0, 0x00, 0x00, 0x00, 
+-	0x1f, 0x00, 0x00, 0x00, 0x03, 0xce, 0x00, 0x00, 
+-	0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 0x71, 0xfc, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x1e, 0x0f, 0x00, 0x00, 0x00, 0x70, 0x01, 0xc0, 
+-	0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x1c, 
+-	0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 
+-	0x00, 0x3f, 0xff, 0xc0, 0x00, 0x00, 0x01, 0xfe, 
+-	0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 
+-	0x70, 0x01, 0xc0, 0x00, 0x00, 0x00, 0x70, 0x00, 
+-	0x00, 0x00, 0x00, 0x03, 0x80, 0x00, 0x00, 0x01, 
+-	0xfe, 0x00, 0x00, 0x00, 0x07, 0x8e, 0x00, 0x00, 
+-	0x00, 0x7f, 0xff, 0x00, 0x00, 0x00, 0x77, 0xfe, 
+-	0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 
+-	0x0f, 0xfe, 0x00, 0x00, 0x00, 0x78, 0x03, 0xc0, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1f, 0xc0, 0x00, 0x00, 
+-	0x00, 0x3f, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x3f, 
+-	0x80, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 
+-	0x70, 0x01, 0xc0, 0x00, 0x00, 0x00, 0x70, 0x00, 
+-	0x00, 0x00, 0x00, 0x07, 0x80, 0x00, 0x00, 0x01, 
+-	0xfe, 0x00, 0x00, 0x00, 0x0f, 0x0e, 0x00, 0x00, 
+-	0x00, 0x7c, 0x0f, 0x80, 0x00, 0x00, 0x7f, 0xff, 
+-	0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 
+-	0x07, 0xfc, 0x00, 0x00, 0x00, 0x78, 0x07, 0xc0, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 
+-	0xc0, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 
+-	0x70, 0x01, 0xc0, 0x00, 0x00, 0x00, 0x70, 0x00, 
+-	0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x01, 
+-	0xff, 0x80, 0x00, 0x00, 0x1e, 0x0e, 0x00, 0x00, 
+-	0x00, 0x78, 0x03, 0x80, 0x00, 0x00, 0x7e, 0x0f, 
+-	0x80, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 
+-	0x1f, 0xff, 0x00, 0x00, 0x00, 0x3e, 0x0f, 0xc0, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 
+-	0xc0, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x00, 
+-	0x70, 0x01, 0xc0, 0x00, 0x00, 0x00, 0x70, 0x00, 
+-	0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 
+-	0x07, 0x80, 0x00, 0x00, 0x1e, 0x0e, 0x00, 0x00, 
+-	0x00, 0x00, 0x03, 0xc0, 0x00, 0x00, 0x7c, 0x03, 
+-	0xc0, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 
+-	0x3e, 0x0f, 0x80, 0x00, 0x00, 0x1f, 0xff, 0xc0, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 
+-	0xc0, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 
+-	0x70, 0x01, 0xc0, 0x00, 0x00, 0x00, 0x70, 0x00, 
+-	0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 
+-	0x03, 0xc0, 0x00, 0x00, 0x3c, 0x0e, 0x00, 0x00, 
+-	0x00, 0x00, 0x01, 0xc0, 0x00, 0x00, 0x78, 0x03, 
+-	0xc0, 0x00, 0x00, 0x01, 0xe0, 0x00, 0x00, 0x00, 
+-	0x78, 0x03, 0x80, 0x00, 0x00, 0x0f, 0xfd, 0xc0, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x1f, 0xc0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 
+-	0x80, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 
+-	0x70, 0x01, 0xc0, 0x00, 0x00, 0x00, 0x70, 0x00, 
+-	0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 
+-	0x03, 0xc0, 0x00, 0x00, 0x78, 0x0e, 0x00, 0x00, 
+-	0x00, 0x00, 0x01, 0xc0, 0x00, 0x00, 0x70, 0x01, 
+-	0xc0, 0x00, 0x00, 0x01, 0xc0, 0x00, 0x00, 0x00, 
+-	0x78, 0x03, 0xc0, 0x00, 0x00, 0x07, 0xf1, 0xc0, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x07, 0xf8, 0x00, 0x00, 
+-	0x00, 0x3f, 0xff, 0xc0, 0x00, 0x00, 0x01, 0xfe, 
+-	0x00, 0x00, 0x00, 0x01, 0xe0, 0x00, 0x00, 0x00, 
+-	0x70, 0x01, 0xc0, 0x00, 0x00, 0x00, 0x70, 0x00, 
+-	0x00, 0x00, 0x01, 0xf0, 0x00, 0x00, 0x00, 0x00, 
+-	0x01, 0xc0, 0x00, 0x00, 0x7f, 0xff, 0xc0, 0x00, 
+-	0x00, 0x00, 0x01, 0xc0, 0x00, 0x00, 0x70, 0x01, 
+-	0xc0, 0x00, 0x00, 0x01, 0xc0, 0x00, 0x00, 0x00, 
+-	0x70, 0x01, 0xc0, 0x00, 0x00, 0x00, 0x03, 0xc0, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x01, 0xfe, 0x00, 0x00, 
+-	0x00, 0x3f, 0xff, 0xc0, 0x00, 0x00, 0x07, 0xf8, 
+-	0x00, 0x00, 0x00, 0x01, 0xc0, 0x00, 0x00, 0x00, 
+-	0x78, 0x03, 0xc0, 0x00, 0x00, 0x00, 0x70, 0x00, 
+-	0x00, 0x00, 0x03, 0xe0, 0x00, 0x00, 0x00, 0x00, 
+-	0x01, 0xc0, 0x00, 0x00, 0x7f, 0xff, 0xc0, 0x00, 
+-	0x00, 0x00, 0x01, 0xc0, 0x00, 0x00, 0x70, 0x01, 
+-	0xc0, 0x00, 0x00, 0x03, 0xc0, 0x00, 0x00, 0x00, 
+-	0x70, 0x01, 0xc0, 0x00, 0x00, 0x00, 0x03, 0xc0, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x80, 0x00, 
+-	0x00, 0x3f, 0xff, 0xc0, 0x00, 0x00, 0x1f, 0xc0, 
+-	0x00, 0x00, 0x00, 0x01, 0xc0, 0x00, 0x00, 0x00, 
+-	0x78, 0x03, 0xc0, 0x00, 0x00, 0x00, 0x70, 0x00, 
+-	0x00, 0x00, 0x07, 0x80, 0x00, 0x00, 0x00, 0x70, 
+-	0x01, 0xc0, 0x00, 0x00, 0x7f, 0xff, 0xc0, 0x00, 
+-	0x00, 0x70, 0x01, 0xc0, 0x00, 0x00, 0x70, 0x01, 
+-	0xc0, 0x00, 0x00, 0x03, 0x80, 0x00, 0x00, 0x00, 
+-	0x70, 0x01, 0xc0, 0x00, 0x00, 0x00, 0x03, 0x80, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 
+-	0x00, 0x00, 0x00, 0x01, 0xc0, 0x00, 0x00, 0x00, 
+-	0x38, 0x03, 0x80, 0x00, 0x00, 0x00, 0x70, 0x00, 
+-	0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x78, 
+-	0x03, 0xc0, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x78, 0x03, 0xc0, 0x00, 0x00, 0x38, 0x03, 
+-	0xc0, 0x00, 0x00, 0x03, 0x80, 0x00, 0x00, 0x00, 
+-	0x78, 0x03, 0xc0, 0x00, 0x00, 0x70, 0x07, 0x80, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xc0, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x3c, 0x07, 0x80, 0x00, 0x00, 0x00, 0x70, 0x00, 
+-	0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x78, 
+-	0x07, 0x80, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x78, 0x07, 0x80, 0x00, 0x00, 0x3c, 0x03, 
+-	0x80, 0x00, 0x00, 0x07, 0x80, 0x00, 0x00, 0x00, 
+-	0x78, 0x03, 0xc0, 0x00, 0x00, 0x78, 0x07, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1f, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 
+-	0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x3e, 
+-	0x0f, 0x80, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x3e, 0x0f, 0x00, 0x00, 0x00, 0x1e, 0x0f, 
+-	0x80, 0x00, 0x00, 0x07, 0x80, 0x00, 0x00, 0x00, 
+-	0x3e, 0x0f, 0x80, 0x00, 0x00, 0x3c, 0x1f, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1f, 0xff, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 
+-	0x00, 0x00, 0x7f, 0xff, 0xc0, 0x00, 0x00, 0x1f, 
+-	0xff, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x1f, 0xff, 0x00, 0x00, 0x00, 0x0f, 0xff, 
+-	0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 
+-	0x1f, 0xff, 0x00, 0x00, 0x00, 0x3f, 0xfe, 0x00, 
+-	0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x1c, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x01, 0xc0, 0x00, 0x00, 0x00, 
+-	0x0f, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 
+-	0x00, 0x00, 0x7f, 0xff, 0xc0, 0x00, 0x00, 0x0f, 
+-	0xfe, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x0f, 0xfe, 0x00, 0x00, 0x00, 0x07, 0xfe, 
+-	0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 
+-	0x0f, 0xfe, 0x00, 0x00, 0x00, 0x1f, 0xfc, 0x00, 
+-	0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x1c, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x01, 0xc0, 0x00, 0x00, 0x00, 
+-	0x03, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 
+-	0x00, 0x00, 0x7f, 0xff, 0xc0, 0x00, 0x00, 0x03, 
+-	0xf8, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 
+-	0x00, 0x03, 0xf8, 0x00, 0x00, 0x00, 0x03, 0xf8, 
+-	0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 
+-	0x03, 0xf8, 0x00, 0x00, 0x00, 0x07, 0xf0, 0x00, 
+-	0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x1c, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x01, 0xc0, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x07, 0xfe, 0x00, 0x00, 0x00, 0x7c, 0x00, 
+-	0x00, 0x00, 0x1f, 0xff, 0x00, 0x00, 0x00, 0x00, 
+-	0x7f, 0x80, 0x00, 0x00, 0x1f, 0xff, 0x80, 0x00, 
+-	0x00, 0x1f, 0xff, 0xf0, 0x00, 0x00, 0x1f, 0xff, 
+-	0xe0, 0x00, 0x00, 0x00, 0x3f, 0xc0, 0x00, 0x00, 
+-	0x1c, 0x00, 0x1c, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x1c, 
+-	0x00, 0x7c, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x1f, 0x00, 0x07, 0xc0, 0x00, 0x1e, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x7f, 0x80, 0x00, 0x00, 
+-	0x00, 0x1f, 0xff, 0x80, 0x00, 0x00, 0x7c, 0x00, 
+-	0x00, 0x00, 0x1f, 0xff, 0xc0, 0x00, 0x00, 0x01, 
+-	0xff, 0xc0, 0x00, 0x00, 0x1f, 0xff, 0xe0, 0x00, 
+-	0x00, 0x1f, 0xff, 0xf0, 0x00, 0x00, 0x1f, 0xff, 
+-	0xe0, 0x00, 0x00, 0x01, 0xff, 0xf0, 0x00, 0x00, 
+-	0x1c, 0x00, 0x1c, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x1c, 
+-	0x00, 0xf8, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x1f, 0x80, 0x0f, 0xc0, 0x00, 0x1e, 0x00, 
+-	0x1c, 0x00, 0x00, 0x01, 0xff, 0xe0, 0x00, 0x00, 
+-	0x00, 0x7f, 0xff, 0xe0, 0x00, 0x00, 0xfe, 0x00, 
+-	0x00, 0x00, 0x1f, 0xff, 0xe0, 0x00, 0x00, 0x03, 
+-	0xff, 0xf0, 0x00, 0x00, 0x1f, 0xff, 0xf0, 0x00, 
+-	0x00, 0x1f, 0xff, 0xf0, 0x00, 0x00, 0x1f, 0xff, 
+-	0xe0, 0x00, 0x00, 0x03, 0xff, 0xf8, 0x00, 0x00, 
+-	0x1c, 0x00, 0x1c, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x1c, 
+-	0x01, 0xf0, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x1f, 0x80, 0x0f, 0xc0, 0x00, 0x1f, 0x00, 
+-	0x1c, 0x00, 0x00, 0x03, 0xff, 0xf0, 0x00, 0x00, 
+-	0x00, 0xfe, 0x07, 0xf0, 0x00, 0x00, 0xfe, 0x00, 
+-	0x00, 0x00, 0x1c, 0x01, 0xf0, 0x00, 0x00, 0x07, 
+-	0xc1, 0xf0, 0x00, 0x00, 0x1c, 0x01, 0xf8, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x07, 0xe0, 0xfc, 0x00, 0x00, 
+-	0x1c, 0x00, 0x1c, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x1c, 
+-	0x03, 0xe0, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x1f, 0x80, 0x0f, 0xc0, 0x00, 0x1f, 0x80, 
+-	0x1c, 0x00, 0x00, 0x07, 0xe1, 0xf8, 0x00, 0x00, 
+-	0x01, 0xf0, 0x00, 0xf8, 0x00, 0x00, 0xee, 0x00, 
+-	0x00, 0x00, 0x1c, 0x00, 0xf0, 0x00, 0x00, 0x0f, 
+-	0x00, 0x78, 0x00, 0x00, 0x1c, 0x00, 0x78, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x0f, 0x80, 0x1e, 0x00, 0x00, 
+-	0x1c, 0x00, 0x1c, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x1c, 
+-	0x07, 0xc0, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x1f, 0xc0, 0x1f, 0xc0, 0x00, 0x1f, 0x80, 
+-	0x1c, 0x00, 0x00, 0x0f, 0x80, 0x7c, 0x00, 0x00, 
+-	0x03, 0xc0, 0x00, 0x7c, 0x00, 0x01, 0xef, 0x00, 
+-	0x00, 0x00, 0x1c, 0x00, 0x70, 0x00, 0x00, 0x1e, 
+-	0x00, 0x3c, 0x00, 0x00, 0x1c, 0x00, 0x3c, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x0f, 0x00, 0x0e, 0x00, 0x00, 
+-	0x1c, 0x00, 0x1c, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x1c, 
+-	0x0f, 0x80, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x1d, 0xc0, 0x1d, 0xc0, 0x00, 0x1f, 0xc0, 
+-	0x1c, 0x00, 0x00, 0x1e, 0x00, 0x1e, 0x00, 0x00, 
+-	0x07, 0x80, 0x00, 0x3c, 0x00, 0x01, 0xc7, 0x00, 
+-	0x00, 0x00, 0x1c, 0x00, 0x70, 0x00, 0x00, 0x1c, 
+-	0x00, 0x3c, 0x00, 0x00, 0x1c, 0x00, 0x1c, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x1e, 0x00, 0x0f, 0x00, 0x00, 
+-	0x1c, 0x00, 0x1c, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x1c, 
+-	0x1f, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x1d, 0xc0, 0x1d, 0xc0, 0x00, 0x1d, 0xc0, 
+-	0x1c, 0x00, 0x00, 0x1e, 0x00, 0x1e, 0x00, 0x00, 
+-	0x0f, 0x03, 0xe3, 0x9e, 0x00, 0x03, 0xc7, 0x80, 
+-	0x00, 0x00, 0x1c, 0x00, 0x70, 0x00, 0x00, 0x1c, 
+-	0x00, 0x18, 0x00, 0x00, 0x1c, 0x00, 0x1e, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x1c, 0x00, 0x06, 0x00, 0x00, 
+-	0x1c, 0x00, 0x1c, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x1c, 
+-	0x3e, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x1d, 0xe0, 0x1d, 0xc0, 0x00, 0x1c, 0xe0, 
+-	0x1c, 0x00, 0x00, 0x1c, 0x00, 0x0e, 0x00, 0x00, 
+-	0x0f, 0x0f, 0xf7, 0x8e, 0x00, 0x03, 0xc7, 0x80, 
+-	0x00, 0x00, 0x1c, 0x00, 0xf0, 0x00, 0x00, 0x3c, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x1e, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x1c, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x1c, 
+-	0x7c, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x1c, 0xe0, 0x39, 0xc0, 0x00, 0x1c, 0xf0, 
+-	0x1c, 0x00, 0x00, 0x3c, 0x00, 0x0f, 0x00, 0x00, 
+-	0x1e, 0x1f, 0xff, 0x8f, 0x00, 0x03, 0x83, 0x80, 
+-	0x00, 0x00, 0x1c, 0x01, 0xe0, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x0e, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x1c, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x1c, 
+-	0xf8, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x1c, 0xe0, 0x39, 0xc0, 0x00, 0x1c, 0x70, 
+-	0x1c, 0x00, 0x00, 0x38, 0x00, 0x07, 0x00, 0x00, 
+-	0x1c, 0x3e, 0x3f, 0x0f, 0x00, 0x07, 0x83, 0xc0, 
+-	0x00, 0x00, 0x1f, 0xff, 0xc0, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x0e, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 
+-	0x1f, 0xff, 0xfc, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x1d, 
+-	0xf0, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x1c, 0xf0, 0x39, 0xc0, 0x00, 0x1c, 0x78, 
+-	0x1c, 0x00, 0x00, 0x38, 0x00, 0x07, 0x00, 0x00, 
+-	0x1c, 0x3c, 0x1f, 0x07, 0x00, 0x07, 0x01, 0xc0, 
+-	0x00, 0x00, 0x1f, 0xff, 0xc0, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x0e, 0x00, 
+-	0x00, 0x1f, 0xff, 0xe0, 0x00, 0x00, 0x1f, 0xff, 
+-	0x80, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 
+-	0x1f, 0xff, 0xfc, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x1f, 
+-	0xf8, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x1c, 0xf0, 0x79, 0xc0, 0x00, 0x1c, 0x3c, 
+-	0x1c, 0x00, 0x00, 0x38, 0x00, 0x07, 0x00, 0x00, 
+-	0x3c, 0x78, 0x0f, 0x07, 0x00, 0x0f, 0x01, 0xe0, 
+-	0x00, 0x00, 0x1f, 0xff, 0xe0, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x0e, 0x00, 
+-	0x00, 0x1f, 0xff, 0xe0, 0x00, 0x00, 0x1f, 0xff, 
+-	0x80, 0x00, 0x00, 0x38, 0x03, 0xff, 0x00, 0x00, 
+-	0x1f, 0xff, 0xfc, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x1f, 
+-	0xfc, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x1c, 0x70, 0x71, 0xc0, 0x00, 0x1c, 0x1c, 
+-	0x1c, 0x00, 0x00, 0x38, 0x00, 0x07, 0x00, 0x00, 
+-	0x38, 0x70, 0x0f, 0x07, 0x00, 0x0f, 0x01, 0xe0, 
+-	0x00, 0x00, 0x1c, 0x01, 0xf0, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x0e, 0x00, 
+-	0x00, 0x1f, 0xff, 0xe0, 0x00, 0x00, 0x1f, 0xff, 
+-	0x80, 0x00, 0x00, 0x38, 0x03, 0xff, 0x00, 0x00, 
+-	0x1c, 0x00, 0x1c, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x1f, 
+-	0x9c, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x1c, 0x70, 0x71, 0xc0, 0x00, 0x1c, 0x1e, 
+-	0x1c, 0x00, 0x00, 0x38, 0x00, 0x07, 0x00, 0x00, 
+-	0x38, 0xf0, 0x0f, 0x07, 0x00, 0x0f, 0xff, 0xe0, 
+-	0x00, 0x00, 0x1c, 0x00, 0x78, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x0e, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x38, 0x03, 0xff, 0x00, 0x00, 
+-	0x1c, 0x00, 0x1c, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x1f, 
+-	0x1e, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x1c, 0x78, 0xf1, 0xc0, 0x00, 0x1c, 0x0f, 
+-	0x1c, 0x00, 0x00, 0x38, 0x00, 0x07, 0x00, 0x00, 
+-	0x38, 0xe0, 0x0e, 0x07, 0x00, 0x1f, 0xff, 0xf0, 
+-	0x00, 0x00, 0x1c, 0x00, 0x78, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x0e, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x38, 0x00, 0x07, 0x00, 0x00, 
+-	0x1c, 0x00, 0x1c, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x1e, 
+-	0x0f, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x1c, 0x38, 0xe1, 0xc0, 0x00, 0x1c, 0x07, 
+-	0x1c, 0x00, 0x00, 0x38, 0x00, 0x07, 0x00, 0x00, 
+-	0x38, 0xe0, 0x0e, 0x0f, 0x00, 0x1f, 0xff, 0xf0, 
+-	0x00, 0x00, 0x1c, 0x00, 0x38, 0x00, 0x00, 0x3c, 
+-	0x00, 0x0c, 0x00, 0x00, 0x1c, 0x00, 0x1e, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x3c, 0x00, 0x07, 0x00, 0x00, 
+-	0x1c, 0x00, 0x1c, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x1c, 
+-	0x07, 0x80, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x1c, 0x38, 0xe1, 0xc0, 0x00, 0x1c, 0x07, 
+-	0x9c, 0x00, 0x00, 0x3c, 0x00, 0x0f, 0x00, 0x00, 
+-	0x38, 0xe0, 0x1e, 0x0e, 0x00, 0x1c, 0x00, 0x70, 
+-	0x00, 0x00, 0x1c, 0x00, 0x38, 0x00, 0x00, 0x1c, 
+-	0x00, 0x1e, 0x00, 0x00, 0x1c, 0x00, 0x1c, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x1c, 0x00, 0x07, 0x00, 0x00, 
+-	0x1c, 0x00, 0x1c, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x70, 0x1c, 0x00, 0x00, 0x00, 0x1c, 
+-	0x03, 0x80, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x1c, 0x3d, 0xe1, 0xc0, 0x00, 0x1c, 0x03, 
+-	0x9c, 0x00, 0x00, 0x1c, 0x00, 0x0e, 0x00, 0x00, 
+-	0x38, 0xe0, 0x1e, 0x1e, 0x00, 0x3c, 0x00, 0x78, 
+-	0x00, 0x00, 0x1c, 0x00, 0x38, 0x00, 0x00, 0x1e, 
+-	0x00, 0x1e, 0x00, 0x00, 0x1c, 0x00, 0x1c, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x1e, 0x00, 0x07, 0x00, 0x00, 
+-	0x1c, 0x00, 0x1c, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x70, 0x1c, 0x00, 0x00, 0x00, 0x1c, 
+-	0x03, 0xc0, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x1c, 0x1d, 0xc1, 0xc0, 0x00, 0x1c, 0x01, 
+-	0xdc, 0x00, 0x00, 0x1e, 0x00, 0x1e, 0x00, 0x00, 
+-	0x38, 0xe0, 0x3c, 0x1c, 0x00, 0x38, 0x00, 0x38, 
+-	0x00, 0x00, 0x1c, 0x00, 0x78, 0x00, 0x00, 0x1e, 
+-	0x00, 0x3c, 0x00, 0x00, 0x1c, 0x00, 0x3c, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x0f, 0x00, 0x07, 0x00, 0x00, 
+-	0x1c, 0x00, 0x1c, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x70, 0x1c, 0x00, 0x00, 0x00, 0x1c, 
+-	0x01, 0xe0, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x1c, 0x1d, 0xc1, 0xc0, 0x00, 0x1c, 0x01, 
+-	0xfc, 0x00, 0x00, 0x1e, 0x00, 0x1e, 0x00, 0x00, 
+-	0x3c, 0xf0, 0x7c, 0x3c, 0x00, 0x78, 0x00, 0x3c, 
+-	0x00, 0x00, 0x1c, 0x00, 0x78, 0x00, 0x00, 0x0f, 
+-	0x00, 0x7c, 0x00, 0x00, 0x1c, 0x00, 0x78, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x0f, 0x80, 0x1f, 0x00, 0x00, 
+-	0x1c, 0x00, 0x1c, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x78, 0x3c, 0x00, 0x00, 0x00, 0x1c, 
+-	0x00, 0xf0, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x1c, 0x1f, 0xc1, 0xc0, 0x00, 0x1c, 0x00, 
+-	0xfc, 0x00, 0x00, 0x0f, 0x80, 0x7c, 0x00, 0x00, 
+-	0x3c, 0x78, 0xfc, 0xf8, 0x00, 0x78, 0x00, 0x3c, 
+-	0x00, 0x00, 0x1c, 0x01, 0xf0, 0x00, 0x00, 0x07, 
+-	0xe1, 0xf8, 0x00, 0x00, 0x1c, 0x01, 0xf8, 0x00, 
+-	0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x07, 0xe0, 0x7f, 0x00, 0x00, 
+-	0x1c, 0x00, 0x1c, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x7c, 0x78, 0x00, 0x00, 0x00, 0x1c, 
+-	0x00, 0x70, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x1c, 0x1f, 0x81, 0xc0, 0x00, 0x1c, 0x00, 
+-	0xfc, 0x00, 0x00, 0x07, 0xe1, 0xf8, 0x00, 0x00, 
+-	0x1c, 0x7f, 0xff, 0xf0, 0x00, 0x70, 0x00, 0x1c, 
+-	0x00, 0x00, 0x1f, 0xff, 0xe0, 0x00, 0x00, 0x03, 
+-	0xff, 0xf0, 0x00, 0x00, 0x1f, 0xff, 0xf0, 0x00, 
+-	0x00, 0x1f, 0xff, 0xf8, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x03, 0xff, 0xfc, 0x00, 0x00, 
+-	0x1c, 0x00, 0x1c, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x3f, 0xf8, 0x00, 0x00, 0x00, 0x1c, 
+-	0x00, 0x78, 0x00, 0x00, 0x1f, 0xff, 0xc0, 0x00, 
+-	0x00, 0x1c, 0x0f, 0x81, 0xc0, 0x00, 0x1c, 0x00, 
+-	0x7c, 0x00, 0x00, 0x03, 0xff, 0xf0, 0x00, 0x00, 
+-	0x1e, 0x3f, 0xdf, 0xe0, 0x00, 0xf0, 0x00, 0x1e, 
+-	0x00, 0x00, 0x1f, 0xff, 0xc0, 0x00, 0x00, 0x01, 
+-	0xff, 0xe0, 0x00, 0x00, 0x1f, 0xff, 0xc0, 0x00, 
+-	0x00, 0x1f, 0xff, 0xf8, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0xff, 0xf8, 0x00, 0x00, 
+-	0x1c, 0x00, 0x1c, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x1f, 0xf0, 0x00, 0x00, 0x00, 0x1c, 
+-	0x00, 0x3c, 0x00, 0x00, 0x1f, 0xff, 0xc0, 0x00, 
+-	0x00, 0x1c, 0x0f, 0x81, 0xc0, 0x00, 0x1c, 0x00, 
+-	0x3c, 0x00, 0x00, 0x01, 0xff, 0xe0, 0x00, 0x00, 
+-	0x0f, 0x1f, 0x0f, 0x87, 0x80, 0xe0, 0x00, 0x0e, 
+-	0x00, 0x00, 0x1f, 0xff, 0x80, 0x00, 0x00, 0x00, 
+-	0x7f, 0x80, 0x00, 0x00, 0x1f, 0xff, 0x00, 0x00, 
+-	0x00, 0x1f, 0xff, 0xf8, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x3f, 0xc0, 0x00, 0x00, 
+-	0x1c, 0x00, 0x1c, 0x00, 0x00, 0x1c, 0x00, 0x00, 
+-	0x00, 0x00, 0x0f, 0xe0, 0x00, 0x00, 0x00, 0x1c, 
+-	0x00, 0x1e, 0x00, 0x00, 0x1f, 0xff, 0xc0, 0x00, 
+-	0x00, 0x1c, 0x0f, 0x01, 0xc0, 0x00, 0x1c, 0x00, 
+-	0x3c, 0x00, 0x00, 0x00, 0x7f, 0x80, 0x00, 0x00, 
+-	0x0f, 0x80, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x07, 0xc0, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x03, 0xf0, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x01, 0xfe, 0x01, 0xfc, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x3f, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x07, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1f, 0xff, 0x80, 0x00, 0x00, 0x00, 0x7f, 0x00, 
+-	0x00, 0x00, 0x1f, 0xff, 0xc0, 0x00, 0x00, 0x01, 
+-	0xfe, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xf0, 0x00, 
+-	0x00, 0x1c, 0x00, 0x1c, 0x00, 0x00, 0xe0, 0x00, 
+-	0x0e, 0x00, 0x00, 0xe0, 0x03, 0xe0, 0x03, 0x80, 
+-	0x3c, 0x00, 0x78, 0x00, 0x00, 0xf0, 0x00, 0x78, 
+-	0x00, 0x00, 0x1f, 0xff, 0xe0, 0x00, 0x00, 0x3f, 
+-	0x00, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 
+-	0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x01, 0xc0, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1f, 0xff, 0xe0, 0x00, 0x00, 0x01, 0xff, 0xc0, 
+-	0x00, 0x00, 0x1f, 0xff, 0xf0, 0x00, 0x00, 0x03, 
+-	0xff, 0x80, 0x00, 0x00, 0x7f, 0xff, 0xf0, 0x00, 
+-	0x00, 0x1c, 0x00, 0x1c, 0x00, 0x00, 0xf0, 0x00, 
+-	0x1e, 0x00, 0x00, 0xf0, 0x03, 0xe0, 0x07, 0x80, 
+-	0x1e, 0x00, 0xf0, 0x00, 0x00, 0x70, 0x00, 0x70, 
+-	0x00, 0x00, 0x1f, 0xff, 0xe0, 0x00, 0x00, 0x3f, 
+-	0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 
+-	0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x03, 0xe0, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1f, 0xff, 0xf0, 0x00, 0x00, 0x03, 0xff, 0xe0, 
+-	0x00, 0x00, 0x1f, 0xff, 0xf8, 0x00, 0x00, 0x0f, 
+-	0xff, 0xc0, 0x00, 0x00, 0x7f, 0xff, 0xf0, 0x00, 
+-	0x00, 0x1c, 0x00, 0x1c, 0x00, 0x00, 0xf0, 0x00, 
+-	0x1e, 0x00, 0x00, 0xf0, 0x07, 0xe0, 0x07, 0x80, 
+-	0x0e, 0x00, 0xe0, 0x00, 0x00, 0x78, 0x00, 0xf0, 
+-	0x00, 0x00, 0x1f, 0xff, 0xe0, 0x00, 0x00, 0x3f, 
+-	0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 
+-	0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x03, 0xe0, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0xf0, 0x00, 0x00, 0x07, 0xc1, 0xf0, 
+-	0x00, 0x00, 0x1c, 0x00, 0xf8, 0x00, 0x00, 0x0f, 
+-	0x83, 0xe0, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x1c, 0x00, 0x00, 0x78, 0x00, 
+-	0x3c, 0x00, 0x00, 0x70, 0x07, 0xf0, 0x07, 0x00, 
+-	0x0f, 0x01, 0xe0, 0x00, 0x00, 0x3c, 0x01, 0xe0, 
+-	0x00, 0x00, 0x00, 0x01, 0xe0, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x07, 0xf0, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x78, 0x00, 0x00, 0x0f, 0x00, 0x78, 
+-	0x00, 0x00, 0x1c, 0x00, 0x3c, 0x00, 0x00, 0x1e, 
+-	0x00, 0xf0, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x1c, 0x00, 0x00, 0x78, 0x00, 
+-	0x3c, 0x00, 0x00, 0x70, 0x07, 0x70, 0x07, 0x00, 
+-	0x07, 0x83, 0xc0, 0x00, 0x00, 0x1c, 0x01, 0xc0, 
+-	0x00, 0x00, 0x00, 0x03, 0xc0, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x07, 0x70, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x78, 0x00, 0x00, 0x1e, 0x00, 0x3c, 
+-	0x00, 0x00, 0x1c, 0x00, 0x1c, 0x00, 0x00, 0x1c, 
+-	0x00, 0xf0, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x1c, 0x00, 0x00, 0x38, 0x00, 
+-	0x38, 0x00, 0x00, 0x78, 0x07, 0x70, 0x0f, 0x00, 
+-	0x03, 0x83, 0x80, 0x00, 0x00, 0x1e, 0x03, 0xc0, 
+-	0x00, 0x00, 0x00, 0x07, 0x80, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x78, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x38, 0x00, 0x00, 0x1c, 0x00, 0x3c, 
+-	0x00, 0x00, 0x1c, 0x00, 0x1c, 0x00, 0x00, 0x1c, 
+-	0x00, 0x70, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x1c, 0x00, 0x00, 0x3c, 0x00, 
+-	0x78, 0x00, 0x00, 0x78, 0x0f, 0x78, 0x0f, 0x00, 
+-	0x03, 0xc7, 0x80, 0x00, 0x00, 0x0f, 0x07, 0x80, 
+-	0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x38, 0x00, 0x00, 0x1c, 0x00, 0x1c, 
+-	0x00, 0x00, 0x1c, 0x00, 0x1c, 0x00, 0x00, 0x1c, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x1c, 0x00, 0x00, 0x3c, 0x00, 
+-	0x78, 0x00, 0x00, 0x38, 0x0e, 0x38, 0x0e, 0x00, 
+-	0x01, 0xef, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 
+-	0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x3c, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x38, 0x00, 0x00, 0x3c, 0x00, 0x1e, 
+-	0x00, 0x00, 0x1c, 0x00, 0x3c, 0x00, 0x00, 0x1e, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x1c, 0x00, 0x00, 0x1c, 0x00, 
+-	0x70, 0x00, 0x00, 0x38, 0x0e, 0x38, 0x0e, 0x00, 
+-	0x00, 0xfe, 0x00, 0x00, 0x00, 0x07, 0x8f, 0x00, 
+-	0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x1c, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x78, 0x00, 0x00, 0x38, 0x00, 0x0e, 
+-	0x00, 0x00, 0x1c, 0x00, 0x3c, 0x00, 0x00, 0x0f, 
+-	0x80, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x1c, 0x00, 0x00, 0x1e, 0x00, 
+-	0xf0, 0x00, 0x00, 0x3c, 0x0e, 0x38, 0x1e, 0x00, 
+-	0x00, 0x7c, 0x00, 0x00, 0x00, 0x03, 0x8e, 0x00, 
+-	0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x1e, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x78, 0x00, 0x00, 0x38, 0x00, 0x0e, 
+-	0x00, 0x00, 0x1c, 0x00, 0xf8, 0x00, 0x00, 0x0f, 
+-	0xf8, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x1c, 0x00, 0x00, 0x1e, 0x00, 
+-	0xf0, 0x00, 0x00, 0x3c, 0x1e, 0x3c, 0x1e, 0x00, 
+-	0x00, 0x7c, 0x00, 0x00, 0x00, 0x03, 0xde, 0x00, 
+-	0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x38, 0x0e, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x01, 0xf0, 0x00, 0x00, 0x38, 0x00, 0x0e, 
+-	0x00, 0x00, 0x1f, 0xff, 0xf8, 0x00, 0x00, 0x07, 
+-	0xff, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x1c, 0x00, 0x00, 0x0f, 0x01, 
+-	0xe0, 0x00, 0x00, 0x1c, 0x1c, 0x1c, 0x1c, 0x00, 
+-	0x00, 0x7c, 0x00, 0x00, 0x00, 0x01, 0xfc, 0x00, 
+-	0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x38, 0x0e, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1f, 0xff, 0xe0, 0x00, 0x00, 0x38, 0x00, 0x0e, 
+-	0x00, 0x00, 0x1f, 0xff, 0xf0, 0x00, 0x00, 0x01, 
+-	0xff, 0xc0, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x1c, 0x00, 0x00, 0x0f, 0x01, 
+-	0xe0, 0x00, 0x00, 0x1c, 0x1c, 0x1c, 0x1c, 0x00, 
+-	0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 
+-	0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x70, 0x07, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1f, 0xff, 0xc0, 0x00, 0x00, 0x38, 0x00, 0x0e, 
+-	0x00, 0x00, 0x1f, 0xff, 0xc0, 0x00, 0x00, 0x00, 
+-	0x3f, 0xe0, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x1c, 0x00, 0x00, 0x07, 0x01, 
+-	0xc0, 0x00, 0x00, 0x1e, 0x3c, 0x1c, 0x3c, 0x00, 
+-	0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 
+-	0x00, 0x00, 0x01, 0xe0, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1f, 0xff, 0x80, 0x00, 0x00, 0x38, 0x00, 0x0e, 
+-	0x00, 0x00, 0x1c, 0x0f, 0x00, 0x00, 0x00, 0x00, 
+-	0x03, 0xf0, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x1c, 0x00, 0x00, 0x07, 0x83, 
+-	0xc0, 0x00, 0x00, 0x1e, 0x3c, 0x1e, 0x3c, 0x00, 
+-	0x01, 0xef, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 
+-	0x00, 0x00, 0x03, 0xc0, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x0e, 
+-	0x00, 0x00, 0x1c, 0x07, 0x80, 0x00, 0x00, 0x00, 
+-	0x00, 0xf8, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x1c, 0x00, 0x00, 0x07, 0x83, 
+-	0xc0, 0x00, 0x00, 0x0e, 0x38, 0x0e, 0x38, 0x00, 
+-	0x01, 0xc7, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 
+-	0x00, 0x00, 0x03, 0xc0, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x1e, 
+-	0x00, 0x00, 0x1c, 0x07, 0xc0, 0x00, 0x00, 0x38, 
+-	0x00, 0x78, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x1c, 0x00, 0x00, 0x03, 0xc7, 
+-	0x80, 0x00, 0x00, 0x0e, 0x38, 0x0e, 0x38, 0x00, 
+-	0x03, 0xc7, 0x80, 0x00, 0x00, 0x00, 0x70, 0x00, 
+-	0x00, 0x00, 0x07, 0x80, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x1c, 
+-	0x00, 0x00, 0x1c, 0x03, 0xe0, 0x00, 0x00, 0x38, 
+-	0x00, 0x38, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 
+-	0x00, 0x1c, 0x00, 0x1c, 0x00, 0x00, 0x03, 0xc7, 
+-	0x80, 0x00, 0x00, 0x0f, 0x78, 0x0f, 0x78, 0x00, 
+-	0x07, 0x83, 0xc0, 0x00, 0x00, 0x00, 0x70, 0x00, 
+-	0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x07, 0x3c, 
+-	0x00, 0x00, 0x1c, 0x01, 0xf0, 0x00, 0x00, 0x3c, 
+-	0x00, 0x38, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 
+-	0x00, 0x1e, 0x00, 0x3c, 0x00, 0x00, 0x01, 0xc7, 
+-	0x00, 0x00, 0x00, 0x0f, 0x70, 0x07, 0x78, 0x00, 
+-	0x0f, 0x01, 0xe0, 0x00, 0x00, 0x00, 0x70, 0x00, 
+-	0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x07, 0xb8, 
+-	0x00, 0x00, 0x1c, 0x00, 0xf0, 0x00, 0x00, 0x1c, 
+-	0x00, 0x78, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 
+-	0x00, 0x1e, 0x00, 0x3c, 0x00, 0x00, 0x01, 0xef, 
+-	0x00, 0x00, 0x00, 0x07, 0x70, 0x07, 0x70, 0x00, 
+-	0x0e, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x70, 0x00, 
+-	0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x07, 0xf8, 
+-	0x00, 0x00, 0x1c, 0x00, 0x78, 0x00, 0x00, 0x1e, 
+-	0x00, 0xf8, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 
+-	0x00, 0x0f, 0x00, 0x78, 0x00, 0x00, 0x01, 0xef, 
+-	0x00, 0x00, 0x00, 0x07, 0xf0, 0x07, 0xf0, 0x00, 
+-	0x1e, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x70, 0x00, 
+-	0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x07, 0xc1, 0xf0, 
+-	0x00, 0x00, 0x1c, 0x00, 0x78, 0x00, 0x00, 0x0f, 
+-	0xc1, 0xf0, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 
+-	0x00, 0x0f, 0xc1, 0xf8, 0x00, 0x00, 0x00, 0xfe, 
+-	0x00, 0x00, 0x00, 0x07, 0xf0, 0x07, 0xf0, 0x00, 
+-	0x3c, 0x00, 0x78, 0x00, 0x00, 0x00, 0x70, 0x00, 
+-	0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xf8, 
+-	0x00, 0x00, 0x1c, 0x00, 0x3c, 0x00, 0x00, 0x0f, 
+-	0xff, 0xe0, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 
+-	0x00, 0x07, 0xff, 0xf0, 0x00, 0x00, 0x00, 0xfe, 
+-	0x00, 0x00, 0x00, 0x07, 0xe0, 0x03, 0xf0, 0x00, 
+-	0x38, 0x00, 0x38, 0x00, 0x00, 0x00, 0x70, 0x00, 
+-	0x00, 0x00, 0x7f, 0xff, 0xf0, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xfe, 
+-	0x00, 0x00, 0x1c, 0x00, 0x3e, 0x00, 0x00, 0x03, 
+-	0xff, 0xc0, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 
+-	0x00, 0x03, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x7c, 
+-	0x00, 0x00, 0x00, 0x03, 0xe0, 0x03, 0xe0, 0x00, 
+-	0x78, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x70, 0x00, 
+-	0x00, 0x00, 0x7f, 0xff, 0xf0, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x03, 0xc0, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x9f, 
+-	0x00, 0x00, 0x1c, 0x00, 0x1e, 0x00, 0x00, 0x00, 
+-	0xff, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 
+-	0x00, 0x00, 0xff, 0x80, 0x00, 0x00, 0x00, 0x7c, 
+-	0x00, 0x00, 0x00, 0x03, 0xe0, 0x03, 0xe0, 0x00, 
+-	0xf0, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x70, 0x00, 
+-	0x00, 0x00, 0x7f, 0xff, 0xf0, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x01, 0xc0, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x01, 0xff, 0xff, 0xe0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x01, 0xff, 0xff, 0xe0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x01, 0xff, 0xff, 0xe0, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xe0, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xe0, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xe0, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xf8, 0x00, 
+-	0x00, 0x00, 0x39, 0xf8, 0x00, 0x00, 0x00, 0x03, 
+-	0xf0, 0x00, 0x00, 0x00, 0x07, 0xe7, 0x00, 0x00, 
+-	0x00, 0x03, 0xf0, 0x00, 0x00, 0x00, 0xff, 0x80, 
+-	0x00, 0x00, 0x00, 0x07, 0xe7, 0x00, 0x00, 0x00, 
+-	0x38, 0xfc, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0x0f, 0x80, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x39, 0xf0, 0x7e, 0x00, 0x00, 0x39, 0xfc, 
+-	0x00, 0x00, 0x00, 0x03, 0xf0, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xfe, 0x00, 
+-	0x00, 0x00, 0x3b, 0xfc, 0x00, 0x00, 0x00, 0x0f, 
+-	0xfc, 0x00, 0x00, 0x00, 0x0f, 0xf7, 0x00, 0x00, 
+-	0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 0xff, 0x80, 
+-	0x00, 0x00, 0x00, 0x0f, 0xf7, 0x00, 0x00, 0x00, 
+-	0x3b, 0xfe, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0x1f, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x3b, 0xfc, 0xff, 0x00, 0x00, 0x3b, 0xff, 
+-	0x00, 0x00, 0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0x00, 
+-	0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 0x00, 0x1f, 
+-	0xfe, 0x00, 0x00, 0x00, 0x1f, 0xff, 0x00, 0x00, 
+-	0x00, 0x1f, 0xfe, 0x00, 0x00, 0x00, 0xff, 0x80, 
+-	0x00, 0x00, 0x00, 0x1f, 0xff, 0x00, 0x00, 0x00, 
+-	0x3f, 0xff, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0x3e, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x3f, 0xfd, 0xff, 0x80, 0x00, 0x3f, 0xff, 
+-	0x00, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x1f, 0x00, 
+-	0x00, 0x00, 0x3f, 0x1f, 0x00, 0x00, 0x00, 0x3e, 
+-	0x1e, 0x00, 0x00, 0x00, 0x3e, 0x3f, 0x00, 0x00, 
+-	0x00, 0x3e, 0x1f, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x3e, 0x3f, 0x00, 0x00, 0x00, 
+-	0x3f, 0x0f, 0x80, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0x78, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x3f, 0x1f, 0x8f, 0x80, 0x00, 0x3f, 0x0f, 
+-	0x80, 0x00, 0x00, 0x3e, 0x1f, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x07, 0x00, 
+-	0x00, 0x00, 0x3e, 0x07, 0x00, 0x00, 0x00, 0x3c, 
+-	0x0f, 0x00, 0x00, 0x00, 0x38, 0x1f, 0x00, 0x00, 
+-	0x00, 0x38, 0x07, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x3c, 0x1f, 0x00, 0x00, 0x00, 
+-	0x3c, 0x07, 0x80, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0xf0, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x3c, 0x1f, 0x07, 0x80, 0x00, 0x3c, 0x07, 
+-	0x80, 0x00, 0x00, 0x3c, 0x0f, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 
+-	0x00, 0x00, 0x3c, 0x07, 0x80, 0x00, 0x00, 0x78, 
+-	0x07, 0x00, 0x00, 0x00, 0x78, 0x0f, 0x00, 0x00, 
+-	0x00, 0x78, 0x07, 0x80, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x78, 0x0f, 0x00, 0x00, 0x00, 
+-	0x3c, 0x03, 0x80, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x39, 
+-	0xe0, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x3c, 0x0f, 0x03, 0x80, 0x00, 0x3c, 0x03, 
+-	0x80, 0x00, 0x00, 0x78, 0x07, 0x80, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 
+-	0x00, 0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 0x70, 
+-	0x00, 0x00, 0x00, 0x00, 0x70, 0x07, 0x00, 0x00, 
+-	0x00, 0x70, 0x03, 0x80, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x70, 0x07, 0x00, 0x00, 0x00, 
+-	0x38, 0x03, 0x80, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x3b, 
+-	0xc0, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x0e, 0x03, 0x80, 0x00, 0x38, 0x03, 
+-	0x80, 0x00, 0x00, 0x70, 0x03, 0x80, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0x00, 
+-	0x00, 0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 0x70, 
+-	0x00, 0x00, 0x00, 0x00, 0x70, 0x07, 0x00, 0x00, 
+-	0x00, 0x7f, 0xff, 0x80, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x70, 0x07, 0x00, 0x00, 0x00, 
+-	0x38, 0x03, 0x80, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x3f, 
+-	0xc0, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x0e, 0x03, 0x80, 0x00, 0x38, 0x03, 
+-	0x80, 0x00, 0x00, 0x70, 0x03, 0x80, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0x00, 
+-	0x00, 0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 0x70, 
+-	0x00, 0x00, 0x00, 0x00, 0x70, 0x07, 0x00, 0x00, 
+-	0x00, 0x7f, 0xff, 0x80, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x70, 0x07, 0x00, 0x00, 0x00, 
+-	0x38, 0x03, 0x80, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x3f, 
+-	0xe0, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x0e, 0x03, 0x80, 0x00, 0x38, 0x03, 
+-	0x80, 0x00, 0x00, 0x70, 0x03, 0x80, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf7, 0x00, 
+-	0x00, 0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 0x70, 
+-	0x00, 0x00, 0x00, 0x00, 0x70, 0x07, 0x00, 0x00, 
+-	0x00, 0x7f, 0xff, 0x80, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x70, 0x07, 0x00, 0x00, 0x00, 
+-	0x38, 0x03, 0x80, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x3f, 
+-	0xe0, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x0e, 0x03, 0x80, 0x00, 0x38, 0x03, 
+-	0x80, 0x00, 0x00, 0x70, 0x03, 0x80, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x07, 0x00, 
+-	0x00, 0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 0x70, 
+-	0x00, 0x00, 0x00, 0x00, 0x70, 0x07, 0x00, 0x00, 
+-	0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x70, 0x07, 0x00, 0x00, 0x00, 
+-	0x38, 0x03, 0x80, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x3c, 
+-	0xf0, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x0e, 0x03, 0x80, 0x00, 0x38, 0x03, 
+-	0x80, 0x00, 0x00, 0x70, 0x03, 0x80, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x07, 0x00, 
+-	0x00, 0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 0x70, 
+-	0x07, 0x00, 0x00, 0x00, 0x70, 0x07, 0x00, 0x00, 
+-	0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x70, 0x07, 0x00, 0x00, 0x00, 
+-	0x38, 0x03, 0x80, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0x78, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x0e, 0x03, 0x80, 0x00, 0x38, 0x03, 
+-	0x80, 0x00, 0x00, 0x70, 0x03, 0x80, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x0f, 0x00, 
+-	0x00, 0x00, 0x3c, 0x07, 0x80, 0x00, 0x00, 0x78, 
+-	0x0f, 0x00, 0x00, 0x00, 0x78, 0x0f, 0x00, 0x00, 
+-	0x00, 0x78, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x78, 0x0f, 0x00, 0x00, 0x00, 
+-	0x38, 0x03, 0x80, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0x78, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x0e, 0x03, 0x80, 0x00, 0x38, 0x03, 
+-	0x80, 0x00, 0x00, 0x78, 0x07, 0x80, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x1f, 0x00, 
+-	0x00, 0x00, 0x3c, 0x0f, 0x00, 0x00, 0x00, 0x38, 
+-	0x0f, 0x00, 0x00, 0x00, 0x3c, 0x0f, 0x00, 0x00, 
+-	0x00, 0x3c, 0x07, 0x80, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x38, 0x0f, 0x00, 0x00, 0x00, 
+-	0x38, 0x03, 0x80, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0x3c, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x0e, 0x03, 0x80, 0x00, 0x38, 0x03, 
+-	0x80, 0x00, 0x00, 0x3c, 0x0f, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x3f, 0x00, 
+-	0x00, 0x00, 0x3f, 0x1f, 0x00, 0x00, 0x00, 0x3e, 
+-	0x3e, 0x00, 0x00, 0x00, 0x3e, 0x3f, 0x00, 0x00, 
+-	0x00, 0x3e, 0x0f, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x3e, 0x3f, 0x00, 0x00, 0x00, 
+-	0x38, 0x03, 0x80, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0x1e, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x0e, 0x03, 0x80, 0x00, 0x38, 0x03, 
+-	0x80, 0x00, 0x00, 0x3e, 0x1f, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0x00, 
+-	0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 0x00, 0x1f, 
+-	0xfc, 0x00, 0x00, 0x00, 0x1f, 0xff, 0x00, 0x00, 
+-	0x00, 0x1f, 0xff, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x1f, 0xff, 0x00, 0x00, 0x00, 
+-	0x38, 0x03, 0x80, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0x1e, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x0e, 0x03, 0x80, 0x00, 0x38, 0x03, 
+-	0x80, 0x00, 0x00, 0x1f, 0xfe, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xf7, 0x80, 
+-	0x00, 0x00, 0x3b, 0xfc, 0x00, 0x00, 0x00, 0x0f, 
+-	0xf8, 0x00, 0x00, 0x00, 0x0f, 0xf7, 0x00, 0x00, 
+-	0x00, 0x0f, 0xfe, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x0f, 0xff, 0x00, 0x00, 0x00, 
+-	0x38, 0x03, 0x80, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0x0f, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x0e, 0x03, 0x80, 0x00, 0x38, 0x03, 
+-	0x80, 0x00, 0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xe3, 0x80, 
+-	0x00, 0x00, 0x39, 0xf8, 0x00, 0x00, 0x00, 0x07, 
+-	0xf0, 0x00, 0x00, 0x00, 0x07, 0xe7, 0x00, 0x00, 
+-	0x00, 0x03, 0xf8, 0x00, 0x00, 0x00, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0x07, 0xe7, 0x00, 0x00, 0x00, 
+-	0x38, 0x03, 0x80, 0x00, 0x00, 0x38, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x38, 
+-	0x07, 0x80, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x0e, 0x03, 0x80, 0x00, 0x38, 0x03, 
+-	0x80, 0x00, 0x00, 0x03, 0xf0, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x70, 0x07, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x78, 0x0f, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x7c, 0x3e, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x3f, 0xfe, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x01, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x1f, 0xf8, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x01, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x03, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 
+-	0xc0, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 
+-	0xc0, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 
+-	0xc0, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x0f, 0xff, 0xfc, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x39, 0xf8, 0x00, 0x00, 0x00, 0x07, 0xe7, 0x00, 
+-	0x00, 0x00, 0x39, 0xe0, 0x00, 0x00, 0x00, 0x0f, 
+-	0xf0, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 0xf0, 0x07, 
+-	0x80, 0x00, 0x01, 0xe0, 0x38, 0x0f, 0x00, 0x00, 
+-	0xf0, 0x0f, 0x00, 0x00, 0x00, 0x70, 0x07, 0x00, 
+-	0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 0x0e, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x3b, 0xfc, 0x00, 0x00, 0x00, 0x0f, 0xf7, 0x00, 
+-	0x00, 0x00, 0x3b, 0xe0, 0x00, 0x00, 0x00, 0x1f, 
+-	0xf8, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 0xf0, 0x07, 
+-	0x80, 0x00, 0x00, 0xe0, 0x3c, 0x0e, 0x00, 0x00, 
+-	0x78, 0x0f, 0x00, 0x00, 0x00, 0x78, 0x0f, 0x00, 
+-	0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 0x0e, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x3f, 0xfe, 0x00, 0x00, 0x00, 0x1f, 0xff, 0x00, 
+-	0x00, 0x00, 0x3f, 0xe0, 0x00, 0x00, 0x00, 0x3f, 
+-	0xfc, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 0x70, 0x07, 
+-	0x00, 0x00, 0x00, 0xf0, 0x7c, 0x1e, 0x00, 0x00, 
+-	0x38, 0x1e, 0x00, 0x00, 0x00, 0x38, 0x0e, 0x00, 
+-	0x00, 0x00, 0x7f, 0xfe, 0x00, 0x00, 0x00, 0x0e, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x3f, 0x1f, 0x00, 0x00, 0x00, 0x3e, 0x3f, 0x00, 
+-	0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x78, 
+-	0x3e, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 0x78, 0x0f, 
+-	0x00, 0x00, 0x00, 0xf0, 0x7c, 0x1e, 0x00, 0x00, 
+-	0x3c, 0x3c, 0x00, 0x00, 0x00, 0x38, 0x0e, 0x00, 
+-	0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x0e, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 
+-	0x40, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x3e, 0x0f, 0x00, 0x00, 0x00, 0x38, 0x1f, 0x00, 
+-	0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x70, 
+-	0x0e, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 0x38, 0x0e, 
+-	0x00, 0x00, 0x00, 0x70, 0x7c, 0x1c, 0x00, 0x00, 
+-	0x1e, 0x38, 0x00, 0x00, 0x00, 0x3c, 0x1e, 0x00, 
+-	0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, 0x0e, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc0, 
+-	0xc0, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x3c, 0x07, 0x80, 0x00, 0x00, 0x78, 0x0f, 0x00, 
+-	0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x70, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 0x38, 0x0e, 
+-	0x00, 0x00, 0x00, 0x70, 0xec, 0x1c, 0x00, 0x00, 
+-	0x0e, 0x78, 0x00, 0x00, 0x00, 0x1c, 0x1c, 0x00, 
+-	0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x1e, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xf1, 
+-	0xc0, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x3c, 0x03, 0x80, 0x00, 0x00, 0x70, 0x0f, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x7e, 
+-	0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 0x3c, 0x1e, 
+-	0x00, 0x00, 0x00, 0x78, 0xee, 0x3c, 0x00, 0x00, 
+-	0x0f, 0xf0, 0x00, 0x00, 0x00, 0x1e, 0x1c, 0x00, 
+-	0x00, 0x00, 0x01, 0xf0, 0x00, 0x00, 0x00, 0x3c, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x07, 0x80, 0x00, 0x00, 0x00, 0x71, 0xff, 
+-	0xc0, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x38, 0x03, 0x80, 0x00, 0x00, 0x70, 0x07, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x3f, 
+-	0xe0, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 0x1c, 0x1c, 
+-	0x00, 0x00, 0x00, 0x38, 0xee, 0x38, 0x00, 0x00, 
+-	0x07, 0xe0, 0x00, 0x00, 0x00, 0x1e, 0x1c, 0x00, 
+-	0x00, 0x00, 0x01, 0xe0, 0x00, 0x00, 0x00, 0x78, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x03, 0xc0, 0x00, 0x00, 0x00, 0x60, 0x7f, 
+-	0x80, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x38, 0x03, 0x80, 0x00, 0x00, 0x70, 0x07, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x3f, 
+-	0xfc, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 0x1e, 0x3c, 
+-	0x00, 0x00, 0x00, 0x38, 0xe6, 0x38, 0x00, 0x00, 
+-	0x03, 0xe0, 0x00, 0x00, 0x00, 0x0e, 0x38, 0x00, 
+-	0x00, 0x00, 0x03, 0xc0, 0x00, 0x00, 0x00, 0x70, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x01, 0xc0, 0x00, 0x00, 0x00, 0x40, 0x1f, 
+-	0x00, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x38, 0x03, 0x80, 0x00, 0x00, 0x70, 0x07, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x0f, 
+-	0xfe, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 0x0e, 0x38, 
+-	0x00, 0x00, 0x00, 0x3d, 0xc6, 0x78, 0x00, 0x00, 
+-	0x03, 0xc0, 0x00, 0x00, 0x00, 0x0f, 0x38, 0x00, 
+-	0x00, 0x00, 0x07, 0x80, 0x00, 0x00, 0x00, 0x78, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x03, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x38, 0x03, 0x80, 0x00, 0x00, 0x70, 0x07, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x01, 
+-	0xff, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 0x0e, 0x38, 
+-	0x00, 0x00, 0x00, 0x1d, 0xc7, 0x70, 0x00, 0x00, 
+-	0x07, 0xe0, 0x00, 0x00, 0x00, 0x0f, 0x38, 0x00, 
+-	0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x3c, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x07, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x38, 0x03, 0x80, 0x00, 0x00, 0x70, 0x07, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x0f, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x03, 0x80, 0x00, 0x00, 0x0f, 0x78, 
+-	0x00, 0x00, 0x00, 0x1d, 0xc7, 0x70, 0x00, 0x00, 
+-	0x07, 0xf0, 0x00, 0x00, 0x00, 0x07, 0x70, 0x00, 
+-	0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x1e, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x3c, 0x07, 0x80, 0x00, 0x00, 0x78, 0x0f, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x70, 
+-	0x07, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x07, 0x80, 0x00, 0x00, 0x07, 0x70, 
+-	0x00, 0x00, 0x00, 0x1d, 0xc3, 0x70, 0x00, 0x00, 
+-	0x0f, 0x70, 0x00, 0x00, 0x00, 0x07, 0xf0, 0x00, 
+-	0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x0e, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x3c, 0x0f, 0x00, 0x00, 0x00, 0x3c, 0x0f, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x78, 
+-	0x07, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x3c, 0x07, 0x80, 0x00, 0x00, 0x07, 0xf0, 
+-	0x00, 0x00, 0x00, 0x0f, 0x83, 0xe0, 0x00, 0x00, 
+-	0x1e, 0x78, 0x00, 0x00, 0x00, 0x07, 0xf0, 0x00, 
+-	0x00, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x0e, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x3f, 0x1f, 0x00, 0x00, 0x00, 0x3e, 0x3f, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x3c, 
+-	0x1f, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 
+-	0x00, 0x3e, 0x1f, 0x80, 0x00, 0x00, 0x03, 0xe0, 
+-	0x00, 0x00, 0x00, 0x0f, 0x83, 0xe0, 0x00, 0x00, 
+-	0x3c, 0x3c, 0x00, 0x00, 0x00, 0x03, 0xe0, 0x00, 
+-	0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x0e, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x3f, 0xfe, 0x00, 0x00, 0x00, 0x1f, 0xff, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x3f, 
+-	0xfe, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 
+-	0x00, 0x1f, 0xff, 0x80, 0x00, 0x00, 0x03, 0xe0, 
+-	0x00, 0x00, 0x00, 0x0f, 0x83, 0xe0, 0x00, 0x00, 
+-	0x38, 0x1c, 0x00, 0x00, 0x00, 0x03, 0xe0, 0x00, 
+-	0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x0e, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x3b, 0xfc, 0x00, 0x00, 0x00, 0x0f, 0xf7, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x1f, 
+-	0xfc, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 
+-	0x00, 0x1f, 0xfb, 0x80, 0x00, 0x00, 0x03, 0xe0, 
+-	0x00, 0x00, 0x00, 0x0f, 0x03, 0xc0, 0x00, 0x00, 
+-	0x78, 0x1e, 0x00, 0x00, 0x00, 0x03, 0xe0, 0x00, 
+-	0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x0e, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x00, 
+-	0x39, 0xf0, 0x00, 0x00, 0x00, 0x03, 0xe7, 0x00, 
+-	0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x07, 
+-	0xf0, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 
+-	0x00, 0x07, 0xe3, 0x80, 0x00, 0x00, 0x01, 0xc0, 
+-	0x00, 0x00, 0x00, 0x07, 0x01, 0xc0, 0x00, 0x00, 
+-	0xf0, 0x0f, 0x00, 0x00, 0x00, 0x01, 0xc0, 0x00, 
+-	0x00, 0x00, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x0e, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x0f, 0xff, 0xfc, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xc0, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xc0, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x80, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 
+-	0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 
+-	0xc0, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 
+-	0xc0, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 
+-	0xc0, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 
+-	0x00, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 
+-	0xf0, 0x24, 0x00, 0x09, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x0c, 0x94, 
+-	0xea, 0xff, 0xfd, 0x70, 0xea, 0x00, 0x00, 0x01, 
+-	0xe3, 0x5c, 0x00, 0xb7, 0xa5, 0x9f, 0xf0, 0x04, 
+-	0xe0, 0x86, 0xc0, 0x0c, 0xe5, 0x9f, 0xf0, 0x00, 
+-	0x00, 0x00, 0x0f, 0x74, 0x00, 0x00, 0x0c, 0x98, 
+-	0x00, 0x00, 0x00, 0x0f, 0xf0, 0x24, 0x00, 0x09, 
+-	0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 
+-	0x00, 0x00, 0x0e, 0x4c, 0xea, 0xff, 0xfd, 0x03, 
+-	0xea, 0x00, 0x00, 0x07, 0xe5, 0x9f, 0xc0, 0x1c, 
+-	0xe5, 0x9c, 0x30, 0x00, 0xe3, 0x83, 0x33, 0x33, 
+-	0xe1, 0x52, 0x00, 0x03, 0x05, 0x9f, 0xc0, 0x10, 
+-	0x05, 0x9c, 0xc0, 0x00, 0x03, 0x8c, 0x23, 0x33, 
+-	0xe5, 0x9f, 0xc0, 0x08, 0xe5, 0x9f, 0xf0, 0x08, 
+-	0x66, 0x00, 0x00, 0x60, 0x66, 0x00, 0x00, 0x5c, 
+-	0x66, 0x00, 0x00, 0x58, 0x00, 0x00, 0x0e, 0x50, 
+-	0x00, 0x00, 0x00, 0x01, 0xf0, 0x24, 0x00, 0x09, 
+-	0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xff, 
+-	0x00, 0x00, 0x02, 0x6c, 0xa0, 0x00, 0x0b, 0x38, 
+-	0x00, 0x00, 0x01, 0xc0, 0x00, 0x00, 0x0f, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
+-	0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x03, 
+-	0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x05, 
+-	0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x07, 
+-	0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x13, 
+-	0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x18, 
+-	0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x1a, 
+-	0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x19, 
+-	0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x18, 
+-	0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x1f, 
+-	0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 
+-	0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 
+-	0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 
+-	0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 
+-	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x18, 
+-	0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x3f, 0xfe, 0xb1, 0x72, 0x17, 0xf7, 
+-	0xd1, 0xcf, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xcd, 
+-	0xf3, 0x57, 0x93, 0xc0, 0x00, 0x00, 0x00, 0x00, 
+-	0x80, 0x00, 0x3f, 0xfe, 0xca, 0x20, 0xad, 0x9a, 
+-	0xb5, 0xe9, 0x46, 0xe9, 0x00, 0x00, 0x40, 0x03, 
+-	0x83, 0x12, 0x51, 0x00, 0xb5, 0x7f, 0x65, 0x09, 
+-	0x80, 0x00, 0x40, 0x05, 0x80, 0x3f, 0xf8, 0x95, 
+-	0x9d, 0xac, 0xd2, 0x28, 0x80, 0x00, 0x40, 0x04, 
+-	0x8e, 0xac, 0x02, 0x5b, 0x3e, 0x70, 0x76, 0xbb, 
+-	0x00, 0x00, 0x40, 0x07, 0x9c, 0x04, 0x1f, 0xd0, 
+-	0xa9, 0x33, 0xef, 0x60, 0x80, 0x00, 0x40, 0x08, 
+-	0xc0, 0x5f, 0xf4, 0xe0, 0x6c, 0x83, 0xbb, 0x96, 
+-	0x00, 0x00, 0x3f, 0xff, 0x80, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xfe, 
+-	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x40, 0x00, 0x80, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 
+-	0xc9, 0x0f, 0xda, 0xa2, 0x21, 0x68, 0xc2, 0x35, 
+-	0x00, 0x00, 0x3f, 0xfe, 0xb1, 0x73, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xfc, 
+-	0xff, 0xfe, 0x2f, 0xf1, 0x48, 0x3b, 0x9d, 0x27, 
+-	0x00, 0x00, 0x3f, 0xee, 0xe8, 0x08, 0x97, 0x58, 
+-	0x10, 0x16, 0xb3, 0x7d, 0x40, 0x40, 0x40, 0x40, 
+-	0x40, 0x40, 0x40, 0x40, 0x40, 0x41, 0x41, 0x41, 
+-	0x41, 0x41, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 
+-	0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 
+-	0x40, 0x40, 0x40, 0x40, 0x05, 0x02, 0x02, 0x02, 
+-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 
+-	0x02, 0x02, 0x02, 0x02, 0x20, 0x20, 0x20, 0x20, 
+-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x02, 0x02, 
+-	0x02, 0x02, 0x02, 0x02, 0x02, 0x90, 0x90, 0x90, 
+-	0x90, 0x90, 0x90, 0x10, 0x10, 0x10, 0x10, 0x10, 
+-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
+-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x02, 
+-	0x02, 0x02, 0x02, 0x02, 0x02, 0x88, 0x88, 0x88, 
+-	0x88, 0x88, 0x88, 0x08, 0x08, 0x08, 0x08, 0x08, 
+-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
+-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x02, 
+-	0x02, 0x02, 0x02, 0x40, 0xe5, 0x9f, 0xc0, 0x00, 
+-	0xe1, 0x2f, 0xff, 0x1c, 0x2e, 0x01, 0x79, 0x19, 
+-	0xe5, 0x9f, 0xc0, 0x00, 0xe1, 0x2f, 0xff, 0x1c, 
+-	0x2e, 0x00, 0x5c, 0x7b, 0xe5, 0x9f, 0xc0, 0x00, 
+-	0xe1, 0x2f, 0xff, 0x1c, 0x2e, 0x00, 0x5d, 0x05, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x2e, 0x01, 0xc9, 0x08, 0x2e, 0x01, 0xca, 0x20, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x2e, 0x01, 0xc9, 0x08, 
+-	0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01, 
+-	0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 
+-	0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 
+-	0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 
+-	0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 
+-	0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 
+-	0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 
+-	0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 
+-	0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 
+-	0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 
+-	0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 
+-	0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 
+-	0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 
+-	0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 
+-	0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 
+-	0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 
+-	0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 
+-	0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 
+-	0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 
+-	0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 
+-	0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 
+-	0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 
+-	0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 
+-	0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 
+-	0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 
+-	0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 
+-	0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 
+-	0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 
+-	0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 
+-	0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 
+-	0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 
+-	0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 
+-	0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 
+-	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 
+-	0xff, 0xff, 0x00, 0x00, 0x00, 0x02, 0x10, 0x00, 
+-	0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 
+-	0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x02, 0xcf, 0x00, 0x00, 0x02, 0x40, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x2c, 0x00, 0x01, 0x00, 0x43, 0x6f, 0x70, 0x79, 
+-	0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0x46, 0x75, 
+-	0x6a, 0x69, 0x74, 0x73, 0x75, 0x20, 0x53, 0x69, 
+-	0x65, 0x6d, 0x65, 0x6e, 0x73, 0x20, 0x26, 0x20, 
+-	0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x67, 0x65, 
+-	0x6e, 0x63, 0x65, 0x20, 0x69, 0x6e, 0x74, 0x65, 
+-	0x67, 0x72, 0x61, 0x74, 0x65, 0x64, 0x20, 0x6d, 
+-	0x65, 0x64, 0x69, 0x61, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x57, 0x5e, 0x61, 0xa3, 
+-	0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x6a, 0x00, 0x00, 0x0c, 
+-	0x6c, 0x00, 0x00, 0x24, 0x64, 0x00, 0x00, 0x28, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x4e, 0x20, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x07, 0xd0, 0x00, 0x00, 0x07, 0xd0, 
+-	0x00, 0x00, 0x13, 0x88, 0x02, 0x02, 0x01, 0x00, 
+-	0x00, 0x00, 0x4e, 0x20, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x07, 0xd0, 0x00, 0x00, 0x07, 0xd0, 
+-	0x00, 0x00, 0x13, 0x88, 0x02, 0x02, 0x01, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x2e, 0x08, 0x05, 0xc4, 
+-	0x2e, 0x08, 0x05, 0xc4, 0x2e, 0x08, 0x05, 0xcc, 
+-	0x2e, 0x08, 0x05, 0xcc, 0x2e, 0x08, 0x05, 0xd4, 
+-	0x2e, 0x08, 0x05, 0xd4, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 
+-	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 
+-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x7e, 0x81, 0xa5, 0x81, 0x81, 0xbd, 
+-	0x99, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x7e, 0xff, 0xdb, 0xff, 0xff, 0xc3, 
+-	0xe7, 0xff, 0xff, 0x7e, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x6c, 0xfe, 0xfe, 0xfe, 
+-	0xfe, 0x7c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x7c, 0xfe, 
+-	0x7c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x18, 0x3c, 0x3c, 0xe7, 0xe7, 
+-	0xe7, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x18, 0x3c, 0x7e, 0xff, 0xff, 
+-	0x7e, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c, 
+-	0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xc3, 
+-	0xc3, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x42, 
+-	0x42, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0xff, 0xff, 0xff, 0xff, 0xff, 0xc3, 0x99, 0xbd, 
+-	0xbd, 0x99, 0xc3, 0xff, 0xff, 0xff, 0xff, 0xff, 
+-	0x00, 0x00, 0x1e, 0x0e, 0x1a, 0x32, 0x78, 0xcc, 
+-	0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 
+-	0x18, 0x7e, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x3f, 0x33, 0x3f, 0x30, 0x30, 0x30, 
+-	0x30, 0x70, 0xf0, 0xe0, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x7f, 0x63, 0x7f, 0x63, 0x63, 0x63, 
+-	0x63, 0x67, 0xe7, 0xe6, 0xc0, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x18, 0x18, 0xdb, 0x3c, 0xe7, 
+-	0x3c, 0xdb, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfe, 0xf8, 
+-	0xf0, 0xe0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x02, 0x06, 0x0e, 0x1e, 0x3e, 0xfe, 0x3e, 
+-	0x1e, 0x0e, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18, 
+-	0x7e, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 
+-	0x66, 0x00, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x7f, 0xdb, 0xdb, 0xdb, 0x7b, 0x1b, 
+-	0x1b, 0x1b, 0x1b, 0x1b, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x7c, 0xc6, 0x60, 0x38, 0x6c, 0xc6, 0xc6, 
+-	0x6c, 0x38, 0x0c, 0xc6, 0x7c, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0xfe, 0xfe, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18, 
+-	0x7e, 0x3c, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18, 
+-	0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
+-	0x18, 0x7e, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x0c, 0xfe, 
+-	0x0c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x60, 0xfe, 
+-	0x60, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 
+-	0xc0, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x6c, 0xfe, 
+-	0x6c, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x38, 0x7c, 
+-	0x7c, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0x7c, 0x7c, 
+-	0x38, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x18, 0x3c, 0x3c, 0x3c, 0x18, 0x18, 
+-	0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x66, 0x66, 0x66, 0x24, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x6c, 0x6c, 0xfe, 0x6c, 0x6c, 
+-	0x6c, 0xfe, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00, 
+-	0x18, 0x18, 0x7c, 0xc6, 0xc2, 0xc0, 0x7c, 0x06, 
+-	0x06, 0x86, 0xc6, 0x7c, 0x18, 0x18, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0xc2, 0xc6, 0x0c, 0x18, 
+-	0x30, 0x60, 0xc6, 0x86, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x6c, 0x6c, 0x38, 0x76, 0xdc, 
+-	0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x30, 0x30, 0x30, 0x60, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x0c, 0x18, 0x30, 0x30, 0x30, 0x30, 
+-	0x30, 0x30, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x0c, 
+-	0x0c, 0x0c, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x3c, 0xff, 
+-	0x3c, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e, 
+-	0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x18, 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x02, 0x06, 0x0c, 0x18, 
+-	0x30, 0x60, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x6c, 0xc6, 0xc6, 0xd6, 0xd6, 
+-	0xc6, 0xc6, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x18, 0x38, 0x78, 0x18, 0x18, 0x18, 
+-	0x18, 0x18, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x7c, 0xc6, 0x06, 0x0c, 0x18, 0x30, 
+-	0x60, 0xc0, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x7c, 0xc6, 0x06, 0x06, 0x3c, 0x06, 
+-	0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x0c, 0x1c, 0x3c, 0x6c, 0xcc, 0xfe, 
+-	0x0c, 0x0c, 0x0c, 0x1e, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0xfe, 0xc0, 0xc0, 0xc0, 0xfc, 0x06, 
+-	0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x60, 0xc0, 0xc0, 0xfc, 0xc6, 
+-	0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0xfe, 0xc6, 0x06, 0x06, 0x0c, 0x18, 
+-	0x30, 0x30, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0x7c, 0xc6, 
+-	0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 
+-	0x06, 0x06, 0x0c, 0x78, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 
+-	0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 
+-	0x00, 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x06, 0x0c, 0x18, 0x30, 0x60, 
+-	0x30, 0x18, 0x0c, 0x06, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 
+-	0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x60, 0x30, 0x18, 0x0c, 0x06, 
+-	0x0c, 0x18, 0x30, 0x60, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x0c, 0x18, 0x18, 
+-	0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xde, 0xde, 
+-	0xde, 0xdc, 0xc0, 0x7c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 
+-	0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x66, 
+-	0x66, 0x66, 0x66, 0xfc, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0, 
+-	0xc0, 0xc2, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0xf8, 0x6c, 0x66, 0x66, 0x66, 0x66, 
+-	0x66, 0x66, 0x6c, 0xf8, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 
+-	0x60, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 0x68, 
+-	0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xde, 
+-	0xc6, 0xc6, 0x66, 0x3a, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 
+-	0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 
+-	0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x1e, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
+-	0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0xe6, 0x66, 0x66, 0x6c, 0x78, 0x78, 
+-	0x6c, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0xf0, 0x60, 0x60, 0x60, 0x60, 0x60, 
+-	0x60, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0xc6, 0xee, 0xfe, 0xfe, 0xd6, 0xc6, 
+-	0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 0xce, 
+-	0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 
+-	0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x60, 
+-	0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 
+-	0xc6, 0xd6, 0xde, 0x7c, 0x0c, 0x0e, 0x00, 0x00, 
+-	0x00, 0x00, 0xfc, 0x66, 0x66, 0x66, 0x7c, 0x6c, 
+-	0x66, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x60, 0x38, 0x0c, 
+-	0x06, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x7e, 0x7e, 0x5a, 0x18, 0x18, 0x18, 
+-	0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 
+-	0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 
+-	0xc6, 0x6c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xd6, 0xd6, 
+-	0xd6, 0xfe, 0xee, 0x6c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0xc6, 0xc6, 0x6c, 0x7c, 0x38, 0x38, 
+-	0x7c, 0x6c, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 
+-	0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0xfe, 0xc6, 0x86, 0x0c, 0x18, 0x30, 
+-	0x60, 0xc2, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x3c, 0x30, 0x30, 0x30, 0x30, 0x30, 
+-	0x30, 0x30, 0x30, 0x3c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0x70, 0x38, 
+-	0x1c, 0x0e, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 
+-	0x0c, 0x0c, 0x0c, 0x3c, 0x00, 0x00, 0x00, 0x00, 
+-	0x10, 0x38, 0x6c, 0xc6, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 
+-	0x00, 0x30, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x0c, 0x7c, 
+-	0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0xe0, 0x60, 0x60, 0x78, 0x6c, 0x66, 
+-	0x66, 0x66, 0x66, 0x7c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 
+-	0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x1c, 0x0c, 0x0c, 0x3c, 0x6c, 0xcc, 
+-	0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xfe, 
+-	0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x1c, 0x36, 0x32, 0x30, 0x78, 0x30, 
+-	0x30, 0x30, 0x30, 0x78, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xcc, 0xcc, 
+-	0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0xcc, 0x78, 0x00, 
+-	0x00, 0x00, 0xe0, 0x60, 0x60, 0x6c, 0x76, 0x66, 
+-	0x66, 0x66, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x18, 0x18, 0x00, 0x38, 0x18, 0x18, 
+-	0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x06, 0x06, 0x00, 0x0e, 0x06, 0x06, 
+-	0x06, 0x06, 0x06, 0x06, 0x66, 0x66, 0x3c, 0x00, 
+-	0x00, 0x00, 0xe0, 0x60, 0x60, 0x66, 0x6c, 0x78, 
+-	0x78, 0x6c, 0x66, 0xe6, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 
+-	0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0xfe, 0xd6, 
+-	0xd6, 0xd6, 0xd6, 0xc6, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 
+-	0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 
+-	0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x66, 0x66, 
+-	0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0xf0, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xcc, 0xcc, 
+-	0xcc, 0xcc, 0xcc, 0x7c, 0x0c, 0x0c, 0x1e, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0xdc, 0x76, 0x66, 
+-	0x60, 0x60, 0x60, 0xf0, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x60, 
+-	0x38, 0x0c, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x10, 0x30, 0x30, 0xfc, 0x30, 0x30, 
+-	0x30, 0x30, 0x36, 0x1c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 
+-	0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 
+-	0xc6, 0xc6, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xd6, 
+-	0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x6c, 0x38, 
+-	0x38, 0x38, 0x6c, 0xc6, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 
+-	0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0xf8, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xcc, 0x18, 
+-	0x30, 0x60, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x0e, 0x18, 0x18, 0x18, 0x70, 0x18, 
+-	0x18, 0x18, 0x18, 0x0e, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
+-	0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x70, 0x18, 0x18, 0x18, 0x0e, 0x18, 
+-	0x18, 0x18, 0x18, 0x70, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x6c, 0xc6, 
+-	0xc6, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x3c, 0x66, 0xc2, 0xc0, 0xc0, 0xc0, 
+-	0xc0, 0xc2, 0x66, 0x3c, 0x18, 0x70, 0x00, 0x00, 
+-	0x00, 0x00, 0xcc, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 
+-	0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x0c, 0x18, 0x30, 0x00, 0x7c, 0xc6, 0xfe, 
+-	0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x10, 0x38, 0x6c, 0x00, 0x78, 0x0c, 0x7c, 
+-	0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0xcc, 0x00, 0x00, 0x78, 0x0c, 0x7c, 
+-	0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x60, 0x30, 0x18, 0x00, 0x78, 0x0c, 0x7c, 
+-	0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x6c, 0x38, 0x00, 0x78, 0x0c, 0x7c, 
+-	0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 
+-	0xc0, 0xc0, 0xc6, 0x7c, 0x18, 0x70, 0x00, 0x00, 
+-	0x00, 0x10, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xfe, 
+-	0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0xc6, 0x00, 0x00, 0x7c, 0xc6, 0xfe, 
+-	0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x60, 0x30, 0x18, 0x00, 0x7c, 0xc6, 0xfe, 
+-	0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x66, 0x00, 0x00, 0x38, 0x18, 0x18, 
+-	0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x18, 0x3c, 0x66, 0x00, 0x38, 0x18, 0x18, 
+-	0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x60, 0x30, 0x18, 0x00, 0x38, 0x18, 0x18, 
+-	0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0xc6, 0x00, 0x10, 0x38, 0x6c, 0xc6, 0xc6, 
+-	0xfe, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 
+-	0x38, 0x6c, 0x38, 0x10, 0x38, 0x6c, 0xc6, 0xfe, 
+-	0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 
+-	0x0c, 0x18, 0x00, 0xfe, 0x66, 0x62, 0x68, 0x78, 
+-	0x68, 0x62, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0x36, 0x36, 
+-	0x7e, 0xd8, 0xd8, 0x6e, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x3e, 0x6c, 0xcc, 0xcc, 0xfe, 0xcc, 
+-	0xcc, 0xcc, 0xcc, 0xce, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x10, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 
+-	0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0xc6, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 
+-	0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x60, 0x30, 0x18, 0x00, 0x7c, 0xc6, 0xc6, 
+-	0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x30, 0x78, 0xcc, 0x00, 0xcc, 0xcc, 0xcc, 
+-	0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x60, 0x30, 0x18, 0x00, 0xcc, 0xcc, 0xcc, 
+-	0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0xc6, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 
+-	0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0x78, 0x00, 
+-	0x00, 0xc6, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 
+-	0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0xc6, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 
+-	0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x18, 0x18, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 
+-	0xc6, 0x7c, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x6c, 0x64, 0x60, 0xf0, 0x60, 0x60, 
+-	0x60, 0x60, 0xe6, 0xfc, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x66, 0x66, 0x3c, 0x18, 0x7e, 0x18, 
+-	0x7e, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0xf8, 0xcc, 0xcc, 0xf8, 0xc4, 0xcc, 0xde, 
+-	0xcc, 0xcc, 0xcc, 0xc6, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x0e, 0x1b, 0x18, 0x18, 0x18, 0x7e, 0x18, 
+-	0x18, 0x18, 0xd8, 0x70, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x18, 0x30, 0x60, 0x00, 0x78, 0x0c, 0x7c, 
+-	0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x0c, 0x18, 0x30, 0x00, 0x38, 0x18, 0x18, 
+-	0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x18, 0x30, 0x60, 0x00, 0x7c, 0xc6, 0xc6, 
+-	0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x18, 0x30, 0x60, 0x00, 0xcc, 0xcc, 0xcc, 
+-	0xcc, 0xcc, 0xcc, 0x76, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x76, 0xdc, 0x00, 0xdc, 0x66, 0x66, 
+-	0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 
+-	0x76, 0xdc, 0x00, 0xc6, 0xe6, 0xf6, 0xfe, 0xde, 
+-	0xce, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x3c, 0x6c, 0x6c, 0x3e, 0x00, 0x7e, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x6c, 0x6c, 0x38, 0x00, 0x7c, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x30, 0x30, 0x00, 0x30, 0x30, 0x60, 
+-	0xc0, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc0, 
+-	0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x06, 
+-	0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x60, 0xe0, 0x62, 0x66, 0x6c, 0x18, 0x30, 
+-	0x60, 0xdc, 0x86, 0x0c, 0x18, 0x3e, 0x00, 0x00, 
+-	0x00, 0x60, 0xe0, 0x62, 0x66, 0x6c, 0x18, 0x30, 
+-	0x66, 0xce, 0x9a, 0x3f, 0x06, 0x06, 0x00, 0x00, 
+-	0x00, 0x00, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 
+-	0x3c, 0x3c, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x6c, 0xd8, 
+-	0x6c, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x6c, 0x36, 
+-	0x6c, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x11, 0x44, 0x11, 0x44, 0x11, 0x44, 0x11, 0x44, 
+-	0x11, 0x44, 0x11, 0x44, 0x11, 0x44, 0x11, 0x44, 
+-	0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 
+-	0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 
+-	0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77, 
+-	0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77, 0xdd, 0x77, 
+-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
+-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
+-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 
+-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
+-	0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x18, 0xf8, 
+-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
+-	0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xf6, 
+-	0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 
+-	0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x18, 0xf8, 
+-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
+-	0x36, 0x36, 0x36, 0x36, 0x36, 0xf6, 0x06, 0xf6, 
+-	0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 
+-	0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 
+-	0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x06, 0xf6, 
+-	0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 
+-	0x36, 0x36, 0x36, 0x36, 0x36, 0xf6, 0x06, 0xfe, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xfe, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x18, 0xf8, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 
+-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
+-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 
+-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
+-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 
+-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 
+-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
+-	0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x18, 0x1f, 
+-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
+-	0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x37, 
+-	0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 
+-	0x36, 0x36, 0x36, 0x36, 0x36, 0x37, 0x30, 0x3f, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x30, 0x37, 
+-	0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 
+-	0x36, 0x36, 0x36, 0x36, 0x36, 0xf7, 0x00, 0xff, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xf7, 
+-	0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 
+-	0x36, 0x36, 0x36, 0x36, 0x36, 0x37, 0x30, 0x37, 
+-	0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x36, 0x36, 0x36, 0x36, 0x36, 0xf7, 0x00, 0xf7, 
+-	0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 
+-	0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x00, 0xff, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xff, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, 
+-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 
+-	0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 
+-	0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x3f, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x18, 0x1f, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x18, 0x1f, 
+-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 
+-	0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 
+-	0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0xff, 
+-	0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 0x36, 
+-	0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x18, 0xff, 
+-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
+-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 
+-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
+-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 
+-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+-	0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 
+-	0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 
+-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
+-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 
+-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0xd8, 
+-	0xd8, 0xd8, 0xdc, 0x76, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x78, 0xcc, 0xcc, 0xcc, 0xd8, 0xcc, 
+-	0xc6, 0xc6, 0xc6, 0xcc, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0xfe, 0xc6, 0xc6, 0xc0, 0xc0, 0xc0, 
+-	0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x6c, 0x6c, 
+-	0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0xfe, 0xc6, 0x60, 0x30, 0x18, 0x18, 
+-	0x30, 0x60, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xd8, 0xd8, 
+-	0xd8, 0xd8, 0xd8, 0x70, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 
+-	0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0xc0, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x18, 0x18, 
+-	0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x7e, 0x18, 0x3c, 0x66, 0x66, 0x66, 
+-	0x66, 0x3c, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x6c, 0xc6, 0xc6, 0xfe, 0xc6, 
+-	0xc6, 0xc6, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x38, 0x6c, 0xc6, 0xc6, 0xc6, 0x6c, 
+-	0x6c, 0x6c, 0x6c, 0xee, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x1e, 0x30, 0x18, 0x0c, 0x3e, 0x66, 
+-	0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xdb, 0xdb, 
+-	0xdb, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x03, 0x06, 0x7e, 0xdb, 0xdb, 
+-	0xf3, 0x7e, 0x60, 0xc0, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x1c, 0x30, 0x60, 0x60, 0x7c, 0x60, 
+-	0x60, 0x60, 0x30, 0x1c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 
+-	0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe, 
+-	0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e, 0x18, 
+-	0x18, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x30, 0x18, 0x0c, 0x06, 0x0c, 
+-	0x18, 0x30, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x0c, 0x18, 0x30, 0x60, 0x30, 
+-	0x18, 0x0c, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x0e, 0x1b, 0x1b, 0x18, 0x18, 0x18, 
+-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
+-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 
+-	0x18, 0xd8, 0xd8, 0xd8, 0x70, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x7e, 
+-	0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x00, 
+-	0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x38, 0x6c, 0x6c, 0x38, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 
+-	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x0f, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0xec, 
+-	0x6c, 0x6c, 0x3c, 0x1c, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x6c, 0x36, 0x36, 0x36, 0x36, 0x36, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x3c, 0x66, 0x0c, 0x18, 0x32, 0x7e, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x7e, 0x7e, 0x7e, 0x7e, 
+-	0x7e, 0x7e, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x01, 0x2e, 0x00, 0x67, 0x20, 
+-	0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x10, 
+-	0x2e, 0x08, 0x07, 0x98, 0x00, 0x00, 0x00, 0x00, 
+-	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 
+-	0x38, 0x39, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 
+-	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x39, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x20, 
+-	0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x21, 
+-	0x00, 0x00, 0x00, 0x39, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 
+-	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x38, 
+-	0x00, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00, 0x39, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0xb1, 0x0e, 0xa6, 0x06, 0x53, 
+-	0x2e, 0x08, 0x17, 0xdc, 0x00, 0x00, 0x00, 0x02, 
+-	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x13, 
+-	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x19, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 
+-	0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x07, 
+-	0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x0f, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x0a, 
+-	0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x04, 
+-	0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 
+-	0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x10, 
+-	0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0e, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x13, 
+-	0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x04, 
+-	0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 
+-	0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x19, 
+-	0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0e, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x04, 0xf5, 0x11, 0x38, 0x06, 0x53, 
+-	0x2e, 0x08, 0x19, 0x0c, 0x2e, 0x08, 0x19, 0x00, 
+-	0x2e, 0x08, 0x1a, 0x30, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 
+-	0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 
+-	0x00, 0x80, 0x10, 0x80, 0x00, 0x80, 0xda, 0x80, 
+-	0x00, 0x5a, 0x51, 0xf0, 0x00, 0x36, 0x91, 0x22, 
+-	0x00, 0xf0, 0x29, 0x6e, 0x00, 0x10, 0xd2, 0x92, 
+-	0x00, 0xca, 0x6a, 0xde, 0x00, 0xa6, 0xaa, 0x10, 
+-	0x00, 0x80, 0x3b, 0x80, 0x00, 0x80, 0xbc, 0x80, 
+-	0x00, 0x80, 0x7e, 0x80, 0x00, 0xcf, 0x22, 0x73, 
+-	0x00, 0x93, 0x48, 0x5d, 0x00, 0xa2, 0x73, 0x93, 
+-	0x00, 0x25, 0xae, 0xad, 0x00, 0xa7, 0x9f, 0x60, 
+-	0x00, 0x10, 0x10, 0x10, 0x00, 0x59, 0x10, 0x10, 
+-	0x00, 0xa2, 0x10, 0x10, 0x00, 0xeb, 0x10, 0x10, 
+-	0x00, 0x10, 0x10, 0x59, 0x00, 0x59, 0x10, 0x59, 
+-	0x00, 0xa2, 0x10, 0x59, 0x00, 0xeb, 0x10, 0x59, 
+-	0x00, 0x10, 0x10, 0xa2, 0x00, 0x59, 0x10, 0xa2, 
+-	0x00, 0xa2, 0x10, 0xa2, 0x00, 0xeb, 0x10, 0xa2, 
+-	0x00, 0x10, 0x10, 0xeb, 0x00, 0x59, 0x10, 0xeb, 
+-	0x00, 0xa2, 0x10, 0xeb, 0x00, 0xeb, 0x10, 0xeb, 
+-	0x00, 0x10, 0x2f, 0x10, 0x00, 0x59, 0x2f, 0x10, 
+-	0x00, 0xa2, 0x2f, 0x10, 0x00, 0xeb, 0x2f, 0x10, 
+-	0x00, 0x10, 0x2f, 0x59, 0x00, 0x59, 0x2f, 0x59, 
+-	0x00, 0xa2, 0x2f, 0x59, 0x00, 0xeb, 0x2f, 0x59, 
+-	0x00, 0x10, 0x2f, 0xa2, 0x00, 0x59, 0x2f, 0xa2, 
+-	0x00, 0xa2, 0x2f, 0xa2, 0x00, 0xeb, 0x2f, 0xa2, 
+-	0x00, 0x10, 0x2f, 0xeb, 0x00, 0x59, 0x2f, 0xeb, 
+-	0x00, 0xa2, 0x2f, 0xeb, 0x00, 0xeb, 0x2f, 0xeb, 
+-	0x00, 0x10, 0x4e, 0x10, 0x00, 0x59, 0x4e, 0x10, 
+-	0x00, 0xa2, 0x4e, 0x10, 0x00, 0xeb, 0x4e, 0x10, 
+-	0x00, 0x10, 0x4e, 0x59, 0x00, 0x59, 0x4e, 0x59, 
+-	0x00, 0xa2, 0x4e, 0x59, 0x00, 0xeb, 0x4e, 0x59, 
+-	0x00, 0x10, 0x4e, 0xa2, 0x00, 0x59, 0x4e, 0xa2, 
+-	0x00, 0xa2, 0x4e, 0xa2, 0x00, 0xeb, 0x4e, 0xa2, 
+-	0x00, 0x10, 0x4e, 0xeb, 0x00, 0x59, 0x4e, 0xeb, 
+-	0x00, 0xa2, 0x4e, 0xeb, 0x00, 0xeb, 0x4e, 0xeb, 
+-	0x00, 0x10, 0x6d, 0x10, 0x00, 0x59, 0x6d, 0x10, 
+-	0x00, 0xa2, 0x6d, 0x10, 0x00, 0xeb, 0x6d, 0x10, 
+-	0x00, 0x10, 0x6d, 0x59, 0x00, 0x59, 0x6d, 0x59, 
+-	0x00, 0xa2, 0x6d, 0x59, 0x00, 0xeb, 0x6d, 0x59, 
+-	0x00, 0x10, 0x6d, 0xa2, 0x00, 0x59, 0x6d, 0xa2, 
+-	0x00, 0xa2, 0x6d, 0xa2, 0x00, 0xeb, 0x6d, 0xa2, 
+-	0x00, 0x10, 0x6d, 0xeb, 0x00, 0x59, 0x6d, 0xeb, 
+-	0x00, 0xa2, 0x6d, 0xeb, 0x00, 0xeb, 0x6d, 0xeb, 
+-	0x00, 0x10, 0x8c, 0x10, 0x00, 0x59, 0x8c, 0x10, 
+-	0x00, 0xa2, 0x8c, 0x10, 0x00, 0xeb, 0x8c, 0x10, 
+-	0x00, 0x10, 0x8c, 0x59, 0x00, 0x59, 0x8c, 0x59, 
+-	0x00, 0xa2, 0x8c, 0x59, 0x00, 0xeb, 0x8c, 0x59, 
+-	0x00, 0x10, 0x8c, 0xa2, 0x00, 0x59, 0x8c, 0xa2, 
+-	0x00, 0xa2, 0x8c, 0xa2, 0x00, 0xeb, 0x8c, 0xa2, 
+-	0x00, 0x10, 0x8c, 0xeb, 0x00, 0x59, 0x8c, 0xeb, 
+-	0x00, 0xa2, 0x8c, 0xeb, 0x00, 0xeb, 0x8c, 0xeb, 
+-	0x00, 0x10, 0xab, 0x10, 0x00, 0x59, 0xab, 0x10, 
+-	0x00, 0xa2, 0xab, 0x10, 0x00, 0xeb, 0xab, 0x10, 
+-	0x00, 0x10, 0xab, 0x59, 0x00, 0x59, 0xab, 0x59, 
+-	0x00, 0xa2, 0xab, 0x59, 0x00, 0xeb, 0xab, 0x59, 
+-	0x00, 0x10, 0xab, 0xa2, 0x00, 0x59, 0xab, 0xa2, 
+-	0x00, 0xa2, 0xab, 0xa2, 0x00, 0xeb, 0xab, 0xa2, 
+-	0x00, 0x10, 0xab, 0xeb, 0x00, 0x59, 0xab, 0xeb, 
+-	0x00, 0xa2, 0xab, 0xeb, 0x00, 0xeb, 0xab, 0xeb, 
+-	0x00, 0x10, 0xca, 0x10, 0x00, 0x59, 0xca, 0x10, 
+-	0x00, 0xa2, 0xca, 0x10, 0x00, 0xeb, 0xca, 0x10, 
+-	0x00, 0x10, 0xca, 0x59, 0x00, 0x59, 0xca, 0x59, 
+-	0x00, 0xa2, 0xca, 0x59, 0x00, 0xeb, 0xca, 0x59, 
+-	0x00, 0x10, 0xca, 0xa2, 0x00, 0x59, 0xca, 0xa2, 
+-	0x00, 0xa2, 0xca, 0xa2, 0x00, 0xeb, 0xca, 0xa2, 
+-	0x00, 0x10, 0xca, 0xeb, 0x00, 0x59, 0xca, 0xeb, 
+-	0x00, 0xa2, 0xca, 0xeb, 0x00, 0xeb, 0xca, 0xeb, 
+-	0x00, 0x10, 0xe9, 0x10, 0x00, 0x59, 0xe9, 0x10, 
+-	0x00, 0xa2, 0xe9, 0x10, 0x00, 0xeb, 0xe9, 0x10, 
+-	0x00, 0x10, 0xe9, 0x59, 0x00, 0x59, 0xe9, 0x59, 
+-	0x00, 0xa2, 0xe9, 0x59, 0x00, 0xeb, 0xe9, 0x59, 
+-	0x00, 0x10, 0xe9, 0xa2, 0x00, 0x59, 0xe9, 0xa2, 
+-	0x00, 0xa2, 0xe9, 0xa2, 0x00, 0xeb, 0xe9, 0xa2, 
+-	0x00, 0x10, 0xe9, 0xeb, 0x00, 0x59, 0xe9, 0xeb, 
+-	0x00, 0xa2, 0xe9, 0xeb, 0x00, 0xeb, 0xe9, 0xeb, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0xff, 0xff, 0x24, 0xc0, 0xc1, 0x11, 0x11, 0x10, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x0f, 0x6d, 0xbb, 0xeb, 
+-	0x8e, 0x01, 0xea, 0x25, 0x04, 0xd0, 0x82, 0x49, 
+-	0xed, 0x4c, 0x8f, 0xc2, 0x66, 0x0b, 0x65, 0xc5, 
+-	0x0c, 0xc2, 0x41, 0x19, 0x07, 0xa8, 0x94, 0x13, 
+-	0x42, 0x09, 0x27, 0xb5, 0x32, 0x3f, 0x09, 0x98, 
+-	0x2d, 0x97, 0x14, 0x33, 0x09, 0x04, 0x64, 0x00, 
+-	0xff, 0xff, 0x24, 0xc0, 0xe0, 0x11, 0x21, 0x00, 
+-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x13, 0x8e, 0xf7, 0xe7, 
+-	0x6e, 0x9c, 0x0c, 0xc3, 0xd2, 0xb4, 0x05, 0x16, 
+-	0x3c, 0x8e, 0x82, 0xd4, 0x16, 0x5e, 0x9c, 0x0c, 
+-	0xc3, 0xd2, 0xb4, 0x05, 0x16, 0x3c, 0x8e, 0x82, 
+-	0xd4, 0x16, 0x5e, 0x9c, 0x0c, 0xc3, 0xd2, 0xb4, 
+-	0x05, 0x16, 0x3c, 0x8e, 0x82, 0xd4, 0x16, 0x50, 
+-	0xff, 0xff, 0x24, 0xc0, 0xd4, 0x11, 0x20, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x0d, 0x4d, 0xf8, 0xd5, 
+-	0x9e, 0x7f, 0x02, 0x22, 0x08, 0xa3, 0xbd, 0x94, 
+-	0x53, 0x16, 0x79, 0xfc, 0x08, 0x88, 0x22, 0x8e, 
+-	0xf6, 0x51, 0x4c, 0x59, 0xe7, 0xf0, 0x22, 0x20, 
+-	0x8a, 0x3b, 0xd9, 0x45, 0x31, 0x67, 0x9f, 0xc0, 
+-	0x88, 0x82, 0x28, 0xef, 0x65, 0x14, 0xc4, 0x00, 
+-	0xff, 0xff, 0x24, 0xc0, 0xe8, 0x00, 0x10, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x14, 0x6d, 0xfb, 0x1d, 
+-	0x77, 0xc1, 0x38, 0x81, 0xfb, 0xb1, 0xd7, 0x7c, 
+-	0x13, 0x88, 0x1f, 0xbb, 0x1d, 0x77, 0xc1, 0x38, 
+-	0x81, 0xfb, 0xb1, 0xd7, 0x7c, 0x13, 0x88, 0x1f, 
+-	0xbb, 0x1d, 0x77, 0xc1, 0x38, 0x81, 0xfb, 0xb1, 
+-	0xd7, 0x7c, 0x13, 0x88, 0x1f, 0x80, 0x00, 0x00, 
+-	0xff, 0xff, 0x24, 0xc0, 0x9b, 0x00, 0x20, 0x00, 
+-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x50, 0x3d, 0x75, 0xf7, 
+-	0x14, 0x0a, 0xc3, 0x29, 0x9f, 0x51, 0xbc, 0xfb, 
+-	0xdc, 0x7b, 0x8a, 0x05, 0x61, 0x94, 0xcf, 0xa8, 
+-	0xde, 0x7d, 0xee, 0x3d, 0xc5, 0x02, 0xb0, 0xca, 
+-	0x67, 0xd4, 0x6f, 0x3e, 0xf7, 0x1e, 0xe2, 0x81, 
+-	0x58, 0x65, 0x33, 0xea, 0x37, 0x9f, 0x7b, 0x80, 
+-	0xff, 0xff, 0x24, 0xc0, 0x12, 0xe0, 0x00, 0x00, 
+-	0x00, 0x01, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0xeb, 0x50, 0xfb, 0xe7, 
+-	0x78, 0x1f, 0xde, 0xa1, 0x62, 0x99, 0x11, 0x36, 
+-	0x02, 0x00, 0x97, 0xd6, 0x69, 0x98, 0x1f, 0xde, 
+-	0xa1, 0x62, 0x99, 0x11, 0x36, 0x02, 0x00, 0x97, 
+-	0xd6, 0x69, 0x98, 0x1f, 0xde, 0xa1, 0x62, 0x99, 
+-	0x11, 0x36, 0x02, 0x00, 0x97, 0xd6, 0x69, 0x90, 
+-	0xff, 0xff, 0x24, 0xc0, 0x11, 0xba, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0xdf, 0x95, 0x03, 0xa1, 
+-	0x49, 0xc5, 0x45, 0xe7, 0x96, 0xe6, 0x1d, 0xdc, 
+-	0x0d, 0x50, 0xa4, 0xe2, 0xa2, 0xf3, 0xcb, 0x73, 
+-	0x0e, 0xee, 0x06, 0xa8, 0x52, 0x71, 0x51, 0x79, 
+-	0xe5, 0xb9, 0x87, 0x77, 0x03, 0x54, 0x29, 0x38, 
+-	0xa8, 0xbc, 0xf2, 0xdc, 0xc3, 0xbb, 0x81, 0xa0, 
+-	0xff, 0xff, 0x24, 0xc0, 0x11, 0x21, 0xc3, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0xe7, 0xae, 0x35, 0x0d, 
+-	0x42, 0x14, 0xc2, 0xf9, 0x4a, 0x13, 0x55, 0xa6, 
+-	0x6e, 0xf4, 0x88, 0x53, 0x0b, 0xe5, 0x28, 0x4d, 
+-	0x56, 0x99, 0xbb, 0xd2, 0x21, 0x4c, 0x2f, 0x94, 
+-	0xa1, 0x35, 0x5a, 0x66, 0xef, 0x48, 0x85, 0x30, 
+-	0xbe, 0x52, 0x84, 0xd5, 0x69, 0x9b, 0xbd, 0x20, 
+-	0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x2e, 0x08, 0x1f, 0x48, 
+-	0x2e, 0x08, 0x1f, 0x4c, 0x2e, 0x08, 0x1f, 0x50, 
+-	0x2e, 0x08, 0x1f, 0x58, 0x2e, 0x08, 0x1f, 0x5c, 
+-	0x2e, 0x08, 0x1f, 0x60, 0x6e, 0x00, 0x01, 0x00, 
+-	0x6e, 0x00, 0x01, 0x00, 0x6e, 0x00, 0x01, 0x08, 
+-	0x6e, 0x00, 0x01, 0x0c, 0x6e, 0x00, 0x01, 0x04, 
+-	0x6e, 0x00, 0x01, 0x10, 0x6e, 0x00, 0x01, 0x14, 
+-	0x2e, 0x08, 0x60, 0x58, 0x00, 0x00, 0x00, 0x0d, 
+-	0x00, 0x00, 0x00, 0x00, 0xb0, 0x25, 0x00, 0x18, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x68, 0x00, 0x0d, 0x00, 
+-	0x2e, 0x08, 0x1f, 0xac, 0x2e, 0x08, 0x1f, 0xb0, 
+-	0x2e, 0x08, 0x1f, 0xb4, 0x2e, 0x08, 0x1f, 0xb8, 
+-	0x70, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x04, 
+-	0x70, 0x00, 0x00, 0x08, 0x70, 0x00, 0x00, 0x0c, 
+-	0x70, 0x00, 0x00, 0x10, 0x70, 0x00, 0x00, 0x30, 
+-	0x2e, 0x01, 0xcc, 0x09, 0x2e, 0x01, 0xcb, 0x99, 
+-	0x2e, 0x01, 0xcb, 0x11, 0x2e, 0x01, 0xcb, 0x09, 
+-	0x2e, 0x01, 0xcc, 0x41, 0x2e, 0x01, 0xcb, 0xd1, 
+-	0x2e, 0x01, 0xcc, 0x85, 0x2e, 0x01, 0xcc, 0x7d, 
+-	0x00, 0x00, 0x00, 0x00, 0x9e, 0x00, 0x09, 0x80, 
+-	0x80, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 
+-	0xe0, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, 
+-	0xf8, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 
+-	0xfe, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 
+-	0xff, 0x80, 0x00, 0x00, 0xff, 0xc0, 0x00, 0x00, 
+-	0xff, 0xe0, 0x00, 0x00, 0xff, 0xf0, 0x00, 0x00, 
+-	0xff, 0xf8, 0x00, 0x00, 0xff, 0xfc, 0x00, 0x00, 
+-	0xff, 0xfe, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 
+-	0xff, 0xff, 0x80, 0x00, 0xff, 0xff, 0xc0, 0x00, 
+-	0xff, 0xff, 0xe0, 0x00, 0xff, 0xff, 0xf0, 0x00, 
+-	0xff, 0xff, 0xf8, 0x00, 0xff, 0xff, 0xfc, 0x00, 
+-	0xff, 0xff, 0xfe, 0x00, 0xff, 0xff, 0xff, 0x00, 
+-	0xff, 0xff, 0xff, 0x80, 0xff, 0xff, 0xff, 0xc0, 
+-	0xff, 0xff, 0xff, 0xe0, 0xff, 0xff, 0xff, 0xf0, 
+-	0xff, 0xff, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xfc, 
+-	0xff, 0xff, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xff, 
+-	0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x7f, 0xef, 0xff, 0xff, 
+-	0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x40, 0x1f, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+-	0x00, 0x00, 0x00, 0x00, 0x2e, 0x01, 0xca, 0xf0, 
+-	0x2e, 0x01, 0xca, 0xf0, 0x2e, 0x01, 0xca, 0xf0, 
+-	0x2e, 0x01, 0xca, 0xf0, 0x2e, 0x01, 0xca, 0xf0, 
+-	0x2e, 0x01, 0xca, 0xf0, 0x2e, 0x01, 0xca, 0xf0, 
+-	0x2e, 0x01, 0xca, 0xf0, 0x2e, 0x01, 0xca, 0xf0, 
+-	0x2e, 0x01, 0xca, 0xf0, 0x2e, 0x01, 0xca, 0xf0, 
+-	0x2e, 0x01, 0xca, 0xf0, 0x2e, 0x01, 0xca, 0xf0, 
+-	0x2e, 0x01, 0xca, 0xf0, 0x2e, 0x01, 0xca, 0xf0, 
+-	0x2e, 0x01, 0xca, 0xf0, 0x2e, 0x01, 0xca, 0xf0, 
+-	0x2e, 0x01, 0xca, 0xf0, 0x2e, 0x01, 0xca, 0xf0, 
+-	0x2e, 0x01, 0xca, 0xf0, 0x2e, 0x01, 0xca, 0xf0, 
+-	0x2e, 0x01, 0xca, 0xf0, 0x2e, 0x01, 0xca, 0xf0, 
+-	0x2e, 0x01, 0xca, 0xf0, 0x2e, 0x01, 0xca, 0xf0, 
+-	0x2e, 0x01, 0xca, 0xf0, 0x2e, 0x01, 0xca, 0xf0, 
+-	0x2e, 0x01, 0xca, 0xf0, 0x2e, 0x01, 0xca, 0xf0, 
+-	0x2e, 0x01, 0xca, 0xf0, 0x2e, 0x01, 0xca, 0xf0, 
+-};
+-
+--- linux-2.6.0/drivers/media/dvb/ttpci/av7110.h	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/media/dvb/ttpci/av7110.h	2003-12-28 23:22:39.000000000 -0800
+@@ -1,8 +1,6 @@
+ #ifndef _AV7110_H_
+ #define _AV7110_H_
+ 
+-#define DVB_FIRM_PATH "/lib/DVB/"
+-
+ #include <linux/interrupt.h>
+ #include <linux/socket.h>
+ #include <linux/netdevice.h>
+@@ -169,7 +167,8 @@ enum av7110_pid_command { 
+ 	DelPIDFilter,
+ 	Scan,
+ 	SetDescr,
+-        SetIR
++        SetIR,
++        FlushTSQueue
+ };
+ 			
+ enum av7110_mpeg_command {
+@@ -544,6 +543,18 @@ struct av7110 {
+         int                 dsp_dev;
+ 
+         u32                 ir_config;
++	
++	/* firmware stuff */
++	unsigned int device_initialized;
++
++	unsigned char *bin_fw;
++	unsigned long size_fw;
++
++	unsigned char *bin_dpram;
++	unsigned long size_dpram;
++
++	unsigned char *bin_root;
++	unsigned long size_root;
+ };
+ 
+ 
+--- linux-2.6.0/drivers/media/dvb/ttpci/budget-ci.c	2003-10-08 15:07:09.000000000 -0700
++++ 25/drivers/media/dvb/ttpci/budget-ci.c	2003-12-28 23:22:40.000000000 -0800
+@@ -41,75 +41,14 @@ struct budget_ci {
+ 	struct tasklet_struct msp430_irq_tasklet;
+ };
+ 
+-
+-
+-#ifndef BORROWED_FROM_AV7110_H_BUT_REALLY_BELONGS_IN_SAA7146_DEFS_H
+-
+-#define DEBINOSWAP 0x000e0000
+-#define GPIO_IRQHI 0x10
+-#define GPIO_INPUT 0x00
+-
+-void gpio_set(struct saa7146_dev* saa, u8 pin, u8 data)
+-{
+-        u32 value = 0;
+-
+-        /* sanity check */
+-        if(pin > 3)
+-                return;
+-
+-        /* read old register contents */
+-        value = saa7146_read(saa, GPIO_CTRL );
+-
+-        value &= ~(0xff << (8*pin));
+-        value |= (data << (8*pin));
+-
+-        saa7146_write(saa, GPIO_CTRL, value);
+-}
+-
+-
+-
+-static int wait_for_debi_done(struct saa7146_dev *saa)
+-{
+-	int start = jiffies;
+-
+-	/* wait for registers to be programmed */
+-	while (1) {
+-		if (saa7146_read(saa, MC2) & 2)
+-			break;
+-		if (jiffies - start > HZ / 20) {
+-			printk ("DVB (%s): timed out while waiting"
+-				" for registers getting programmed\n",
+-				__FUNCTION__);
+-			return -ETIMEDOUT;
+-		}
+-	}
+-
+-	/* wait for transfer to complete */
+-	start = jiffies;
+-	while (1) {
+-		if (!(saa7146_read(saa, PSR) & SPCI_DEBI_S))
+-			break;
+-		saa7146_read(saa, MC2);
+-		if (jiffies - start > HZ / 4) {
+-			printk ("DVB (%s): timed out while waiting"
+-				" for transfer completion\n",
+-				__FUNCTION__);
+-			return -ETIMEDOUT;
+-		}
+-	}
+-
+-	return 0;
+-}
+-
+-
+-static u32 debiread (struct saa7146_dev *saa, u32 config, int addr, int count)
++static u32 budget_debiread4 (struct saa7146_dev *saa, u32 config, int addr, int count)
+ {
+ 	u32 result = 0;
+ 
+ 	if (count > 4 || count <= 0)
+ 		return 0;
+ 
+-	if (wait_for_debi_done(saa) < 0)
++	if (saa7146_wait_for_debi_done(saa) < 0)
+ 		return 0;
+ 
+ 	saa7146_write (saa, DEBI_COMMAND,
+@@ -118,7 +57,7 @@ static u32 debiread (struct saa7146_dev 
+ 	saa7146_write(saa, DEBI_CONFIG, config);
+ 	saa7146_write(saa, MC2, (2 << 16) | 2);
+ 
+-	wait_for_debi_done(saa);
++	saa7146_wait_for_debi_done(saa);
+ 
+ 	result = saa7146_read(saa, DEBI_AD);
+ 	result &= (0xffffffffUL >> ((4 - count) * 8));
+@@ -126,20 +65,6 @@ static u32 debiread (struct saa7146_dev 
+ 	return result;
+ }
+ 
+-
+-
+-/* DEBI during interrupt */
+-static inline u32 irdebi(struct saa7146_dev *saa, u32 config, int addr, u32 val, int count)
+-{
+-	u32 res;
+-	res = debiread(saa, config, addr, count);
+-	return res;
+-}
+-#endif
+-
+-
+-
+-
+ /* from reading the following remotes:
+    Zenith Universal 7 / TV Mode 807 / VCR Mode 837
+    Hauppauge (from NOVA-CI-s box product)
+@@ -150,7 +75,7 @@ static  u16 key_map[64] = {
+ 	KEY_0, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8,
+ 	KEY_9,
+ 	KEY_ENTER,
+-	0,
++	KEY_RED,
+ 	KEY_POWER,              /* RADIO on Hauppauge */
+ 	KEY_MUTE,
+ 	0,
+@@ -162,11 +87,11 @@ static  u16 key_map[64] = {
+ 	0, 0, 0, 0, 0, 0, 0,
+ 	KEY_UP, KEY_DOWN,
+ 	KEY_OPTION,             /* RESERVED on Hauppauge */
+-	0,
++	KEY_BREAK,
+ 	/* 0x2X */
+ 	KEY_CHANNELUP, KEY_CHANNELDOWN,
+ 	KEY_PREVIOUS,           /* Prev. Ch on Zenith, SOURCE on Hauppauge */
+-	0, 0, 0,
++	0, KEY_RESTART, KEY_OK,
+ 	KEY_CYCLEWINDOWS,       /* MINIMIZE on Hauppauge */
+ 	0,
+ 	KEY_ENTER,              /* VCR mode on Zenith */
+@@ -177,7 +102,7 @@ static  u16 key_map[64] = {
+ 	KEY_MENU,               /* FULL SCREEN on Hauppauge */
+ 	0,
+ 	/* 0x3X */
+-	0,
++	KEY_SLOW,
+ 	KEY_PREVIOUS,           /* VCR mode on Zenith */
+ 	KEY_REWIND,
+ 	0,
+@@ -189,7 +114,7 @@ static  u16 key_map[64] = {
+ 	KEY_C,
+ 	0,
+ 	KEY_EXIT,
+-	0,
++	KEY_POWER2,
+ 	KEY_TUNER,              /* VCR mode on Zenith */
+ 	0,
+ };
+@@ -217,7 +142,7 @@ static void msp430_ir_interrupt (unsigne
+ 	struct budget_ci *budget_ci = (struct budget_ci*) data;
+ 	struct saa7146_dev *saa = budget_ci->budget.dev;
+ 	struct input_dev *dev = &budget_ci->input_dev;
+-	unsigned int code = irdebi(saa, DEBINOSWAP, 0x1234, 0, 2) >> 8;
++	unsigned int code = budget_debiread4(saa, DEBINOSWAP, 0x1234, 2) >> 8;
+ 
+ 	if (code & 0x40) {
+ 	        code &= 0x3f;
+@@ -271,7 +196,7 @@ static int msp430_ir_init (struct budget
+ 
+ 	saa7146_write(saa, IER, saa7146_read(saa, IER) | MASK_06);
+ 
+-	gpio_set(saa, 3, GPIO_IRQHI);
++	saa7146_setgpio(saa, 3, SAA7146_GPIO_IRQHI); 
+ 
+ 	return 0;
+ }
+@@ -283,8 +208,8 @@ static void msp430_ir_deinit (struct bud
+ 	struct input_dev *dev = &budget_ci->input_dev;
+ 
+ 	saa7146_write(saa, IER, saa7146_read(saa, IER) & ~MASK_06);
+-	gpio_set(saa, 3, GPIO_INPUT);
+-	gpio_set(saa, 2, GPIO_INPUT);
++	saa7146_setgpio(saa, 3, SAA7146_GPIO_INPUT);
++	saa7146_setgpio(saa, 2, SAA7146_GPIO_INPUT);
+ 
+ 	if (del_timer(&dev->timer))
+ 		input_event(dev, EV_KEY, key_map[dev->repeat_key], !!0);
+--- linux-2.6.0/drivers/media/dvb/ttpci/budget.h	2003-07-02 14:53:14.000000000 -0700
++++ 25/drivers/media/dvb/ttpci/budget.h	2003-12-28 23:22:39.000000000 -0800
+@@ -64,8 +64,8 @@ static struct saa7146_pci_extension_data
+ 	.ext_priv = &x_var ## _info, \
+ 	.ext = &budget_extension };
+ 
+-#define TS_WIDTH  (4*188)
+-#define TS_HEIGHT (1024/4)
++#define TS_WIDTH  (376)
++#define TS_HEIGHT (512)
+ #define TS_BUFLEN (TS_WIDTH*TS_HEIGHT)
+ #define TS_MAX_PACKETS (TS_BUFLEN/TS_SIZE)
+ 
+--- linux-2.6.0/drivers/media/dvb/ttpci/ttpci-eeprom.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/media/dvb/ttpci/ttpci-eeprom.c	2003-12-28 23:22:39.000000000 -0800
+@@ -142,3 +142,9 @@ int ttpci_eeprom_parse_mac(struct dvb_i2
+ }
+ 
+ EXPORT_SYMBOL(ttpci_eeprom_parse_mac);
++
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Ralph Metzler, Marcus Metzler, others");
++MODULE_DESCRIPTION("Decode dvb_net MAC address from EEPROM of PCI DVB cards "
++		"made by Siemens, Technotrend, Hauppauge");
++
+--- linux-2.6.0/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c	2003-10-08 15:07:09.000000000 -0700
++++ 25/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c	2003-12-28 23:22:40.000000000 -0800
+@@ -742,11 +742,7 @@ static void ttusb_process_frame(struct t
+ 	}
+ }
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+-static void ttusb_iso_irq(struct urb *urb)
+-#else
+ static void ttusb_iso_irq(struct urb *urb, struct pt_regs *ptregs)
+-#endif
+ {
+ 	struct ttusb *ttusb = urb->context;
+ 
+@@ -787,9 +783,7 @@ static void ttusb_iso_irq(struct urb *ur
+ 			ttusb_process_frame(ttusb, data, len);
+ 		}
+ 	}
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+ 	usb_submit_urb(urb, GFP_ATOMIC);
+-#endif
+ }
+ 
+ static void ttusb_free_iso_urbs(struct ttusb *ttusb)
+@@ -879,13 +873,6 @@ static int ttusb_start_iso_xfer(struct t
+ 		}
+ 	}
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+-	for (i = 0; i < ISO_BUF_COUNT; i++) {
+-		int next = (i + 1) % ISO_BUF_COUNT;
+-		ttusb->iso_urb[i]->next = ttusb->iso_urb[next];
+-	}
+-#endif
+-
+ 	for (i = 0; i < ISO_BUF_COUNT; i++) {
+ 		if ((err = usb_submit_urb(ttusb->iso_urb[i], GFP_KERNEL))) {
+ 			ttusb_stop_iso_xfer(ttusb);
+@@ -1076,22 +1063,6 @@ static struct file_operations stc_fops =
+ };
+ #endif
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+-static void *ttusb_probe(struct usb_device *udev, unsigned int ifnum,
+-		  const struct usb_device_id *id)
+-{
+-	struct ttusb *ttusb;
+-	int result, channel;
+-
+-	if (ifnum != 0)
+-		return NULL;
+-
+-	dprintk("%s: TTUSB DVB connected\n", __FUNCTION__);
+-
+-	if (!(ttusb = kmalloc(sizeof(struct ttusb), GFP_KERNEL)))
+-		return NULL;
+-
+-#else
+ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *id)
+ {
+ 	struct usb_device *udev;
+@@ -1105,8 +1076,6 @@ static int ttusb_probe(struct usb_interf
+ 	if (!(ttusb = kmalloc(sizeof(struct ttusb), GFP_KERNEL)))
+ 		return -ENOMEM;
+ 
+-#endif
+-
+ 	memset(ttusb, 0, sizeof(struct ttusb));
+ 
+ 	for (channel = 0; channel < TTUSB_MAXCHANNEL; ++channel) {
+@@ -1180,35 +1149,22 @@ static int ttusb_probe(struct usb_interf
+ 			   S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP
+ 			   | S_IROTH | S_IWOTH, &stc_fops, ttusb);
+ #endif
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+-	return (void *) ttusb;
+-#else
++
+ 	usb_set_intfdata(intf, (void *) ttusb);
+ 
+ 	return 0;
+-#endif
+ }
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+-static void ttusb_disconnect(struct usb_device *udev, void *data)
+-{
+-	struct ttusb *ttusb = data;
+-#else
+ static void ttusb_disconnect(struct usb_interface *intf)
+ {
+ 	struct ttusb *ttusb = usb_get_intfdata(intf);
+ 
+ 	usb_set_intfdata(intf, NULL);
+-#endif
+ 
+ 	ttusb->disconnecting = 1;
+ 
+ 	ttusb_stop_iso_xfer(ttusb);
+ 
+-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,69))
+-#undef devfs_remove
+-#define devfs_remove(x)	devfs_unregister(ttusb->stc_devfs_handle);
+-#endif
+ #if 0
+ 	devfs_remove(TTUSB_BUDGET_NAME);
+ #endif
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.mod.c	2003-12-28 23:22:40.000000000 -0800
+@@ -0,0 +1,51 @@
++#include <linux/module.h>
++#include <linux/vermagic.h>
++#include <linux/compiler.h>
++
++MODULE_INFO(vermagic, VERMAGIC_STRING);
++
++static const struct modversion_info ____versions[]
++__attribute__((section("__versions"))) = {
++	{ 0x98a034c6, "struct_module" },
++	{ 0x1b636da2, "usb_deregister" },
++	{ 0x9c655b4f, "usb_register" },
++	{ 0x37a0cba, "kfree" },
++	{ 0xc490b263, "dvb_unregister_adapter" },
++	{ 0xf0ca7c9b, "dvb_unregister_i2c_bus" },
++	{ 0x213a4973, "dvb_dmxdev_release" },
++	{ 0x12014018, "dvb_net_release" },
++	{ 0x616af636, "dvb_net_init" },
++	{ 0x6a8b7cf7, "dvb_dmx_release" },
++	{ 0x107a341d, "dvb_dmxdev_init" },
++	{ 0x8fa22872, "dvb_dmx_init" },
++	{ 0x5117ed38, "dvb_add_frontend_ioctls" },
++	{ 0xfc17c7e7, "dvb_register_i2c_bus" },
++	{ 0x3ad6f025, "dvb_register_adapter" },
++	{ 0x7ac96080, "kmem_cache_alloc" },
++	{ 0xa73704a, "malloc_sizes" },
++	{ 0xdfcbe89f, "usb_set_interface" },
++	{ 0x4f0eac15, "usb_reset_configuration" },
++	{ 0x1b49153f, "usb_unlink_urb" },
++	{ 0xf136026d, "usb_alloc_urb" },
++	{ 0xe6f8a15d, "dma_alloc_coherent" },
++	{ 0xe8d874ea, "dma_free_coherent" },
++	{ 0x8ee31378, "usb_free_urb" },
++	{ 0x53e02b2e, "usb_submit_urb" },
++	{ 0xda02d67, "jiffies" },
++	{ 0x4f7c0ba8, "dvb_dmx_swfilter_packets" },
++	{ 0x9d669763, "memcpy" },
++	{ 0xd22b546, "__up_wakeup" },
++	{ 0x1b7d4074, "printk" },
++	{ 0x85eee601, "usb_bulk_msg" },
++	{ 0x28c3bbf5, "__down_failed_interruptible" },
++	{ 0xd533bec7, "__might_sleep" },
++};
++
++static const char __module_depends[]
++__attribute_used__
++__attribute__((section(".modinfo"))) =
++"depends=usbcore,dvb-core";
++
++MODULE_ALIAS("usb:v0B48p1003dl*dh*dc*dsc*dp*ic*isc*ip*");
++MODULE_ALIAS("usb:v0B48p1004dl*dh*dc*dsc*dp*ic*isc*ip*");
++MODULE_ALIAS("usb:v0B48p1005dl*dh*dc*dsc*dp*ic*isc*ip*");
+--- linux-2.6.0/drivers/media/dvb/ttusb-dec/Kconfig	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/media/dvb/ttusb-dec/Kconfig	2003-12-28 23:22:40.000000000 -0800
+@@ -1,24 +1,26 @@
+ config DVB_TTUSB_DEC
+-	tristate "Technotrend/Hauppauge USB DEC2000-T devices"
+-	depends on DVB_CORE && USB && !STANDALONE
++	tristate "Technotrend/Hauppauge USB DEC devices"
++	depends on DVB_CORE && USB && FW_LOADER
+ 	help
+ 	  Support for external USB adapters designed by Technotrend and
+-	  produced by Hauppauge, shipped under the brand name 'DEC2000-T'.
++	  produced by Hauppauge, shipped under the brand name 'DEC2000-t'
++	  and 'DEC3000-s'.
+ 
+           Even if these devices have a MPEG decoder built in, they transmit
+ 	  only compressed MPEG data over the USB bus, so you need
+ 	  an external software decoder to watch TV on your computer.	  
+ 
+-	  Say Y if you own such a device and want to use it.
++	  The DEC devices require firmware in order to boot into a mode in
++	  which they are slaves to the PC.  See
++	  linux/Documentation/dvb/FIRMWARE for details.
++
++	  The firmware can be obtained and put into the default
++	  locations as follows:
+ 
+-config DVB_TTUSB_DEC_FIRMWARE_FILE
+-	string "Full pathname of dec2000t.bin firmware file"
+-	depends on DVB_TTUSB_DEC
+-	default "/etc/dvb/dec2000t.bin"
+-	help
+-	  The DEC2000-T requires a firmware in order to boot into a mode in
+-	  which it is a slave to the PC.  The firmware file can obtained as
+-	  follows:
+ 	    wget http://hauppauge.lightpath.net/de/dec215a.exe
+ 	    unzip -j dec215a.exe Software/Oem/STB/App/Boot/STB_PC_T.bin
+-	    mv STB_PC_T.bin /etc/dvb/dec2000t.bin
++	    mv STB_PC_T.bin /usr/lib/hotplug/firmware/dec2000t.bin
++	    unzip -j dec215a.exe Software/Oem/STB/App/Boot/STB_PC_S.bin
++	    mv STB_PC_S.bin /usr/lib/hotplug/firmware/dec3000s.bin
++
++	  Say Y if you own such a device and want to use it.
+--- linux-2.6.0/drivers/media/dvb/ttusb-dec/Makefile	2003-07-27 12:14:39.000000000 -0700
++++ 25/drivers/media/dvb/ttusb-dec/Makefile	2003-12-28 23:22:40.000000000 -0800
+@@ -1,11 +1,3 @@
+-
+-obj-$(CONFIG_DVB_TTUSB_DEC) += ttusb_dec.o dec2000_frontend.o
++obj-$(CONFIG_DVB_TTUSB_DEC) += ttusb_dec.o
+ 
+ EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/
+-
+-host-progs	:= fdump
+-
+-$(obj)/ttusb_dec.o: $(obj)/dsp_dec2000.h
+-
+-$(obj)/dsp_dec2000.h: $(patsubst "%", %, $(CONFIG_DVB_TTUSB_DEC_FIRMWARE_FILE)) $(obj)/fdump
+-	$(obj)/fdump $< dsp_dec2000 > $@
+--- linux-2.6.0/drivers/media/dvb/ttusb-dec/ttusb_dec.c	2003-10-08 15:07:09.000000000 -0700
++++ 25/drivers/media/dvb/ttusb-dec/ttusb_dec.c	2003-12-28 23:22:40.000000000 -0800
+@@ -19,19 +19,135 @@
+  *
+  */
+ 
+-#include <linux/version.h>
++#include <asm/semaphore.h>
++#include <linux/list.h>
+ #include <linux/module.h>
+ #include <linux/pci.h>
+ #include <linux/slab.h>
++#include <linux/spinlock.h>
+ #include <linux/usb.h>
++#include <linux/version.h>
++#include <linux/interrupt.h>
++#include <linux/firmware.h>
+ 
+-#include "ttusb_dec.h"
++#include "dmxdev.h"
++#include "dvb_demux.h"
++#include "dvb_i2c.h"
++#include "dvb_filter.h"
+ #include "dvb_frontend.h"
++#include "dvb_net.h"
+ 
+ static int debug = 0;
+ 
+ #define dprintk	if (debug) printk
+ 
++#define DRIVER_NAME		"TechnoTrend/Hauppauge DEC USB"
++
++#define COMMAND_PIPE		0x03
++#define RESULT_PIPE		0x84
++#define STREAM_PIPE		0x88
++
++#define COMMAND_PACKET_SIZE	0x3c
++#define ARM_PACKET_SIZE		0x1000
++
++#define ISO_BUF_COUNT		0x04
++#define FRAMES_PER_ISO_BUF	0x04
++#define ISO_FRAME_SIZE		0x0380
++
++#define	MAX_AV_PES_LENGTH	6144
++
++#define LOF_HI			10600000
++#define LOF_LO			9750000
++
++enum ttusb_model {
++	TTUSB_DEC2000T,
++	TTUSB_DEC3000S
++};
++
++struct ttusb_dec {
++	enum ttusb_model		model;
++	char				*model_name;
++	char				*firmware_name;
++
++	/* DVB bits */
++	struct dvb_adapter		*adapter;
++	struct dmxdev			dmxdev;
++	struct dvb_demux		demux;
++	struct dmx_frontend		frontend;
++	struct dvb_i2c_bus		i2c_bus;
++	struct dvb_net			dvb_net;
++	struct dvb_frontend_info	*frontend_info;
++	int (*frontend_ioctl) (struct dvb_frontend *, unsigned int, void *);
++
++	u16			pid[DMX_PES_OTHER];
++	int			hi_band;
++
++	/* USB bits */
++	struct usb_device	*udev;
++	u8			trans_count;
++	unsigned int		command_pipe;
++	unsigned int		result_pipe;
++	unsigned int		stream_pipe;
++	int			interface;
++	struct semaphore	usb_sem;
++
++	void			*iso_buffer;
++	dma_addr_t		iso_dma_handle;
++	struct urb		*iso_urb[ISO_BUF_COUNT];
++	int			iso_stream_count;
++	struct semaphore	iso_sem;
++
++	u8			av_pes[MAX_AV_PES_LENGTH + 4];
++	int			av_pes_state;
++	int			av_pes_length;
++	int			av_pes_payload_length;
++
++	struct dvb_filter_pes2ts	a_pes2ts;
++	struct dvb_filter_pes2ts	v_pes2ts;
++
++	u8			v_pes[16 + MAX_AV_PES_LENGTH];
++	int			v_pes_length;
++	int			v_pes_postbytes;
++
++	struct list_head	urb_frame_list;
++	struct tasklet_struct	urb_tasklet;
++	spinlock_t		urb_frame_list_lock;
++
++	int			active; /* Loaded successfully */
++};
++
++struct urb_frame {
++	u8			data[ISO_FRAME_SIZE];
++	int			length;
++	struct list_head	urb_frame_list;
++};
++
++static struct dvb_frontend_info dec2000t_frontend_info = {
++	.name			= "TechnoTrend/Hauppauge DEC2000-t Frontend",
++	.type			= FE_OFDM,
++	.frequency_min		= 51000000,
++	.frequency_max		= 858000000,
++	.frequency_stepsize	= 62500,
++	.caps =	FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
++		FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
++		FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |
++		FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO |
++		FE_CAN_HIERARCHY_AUTO,
++};
++
++static struct dvb_frontend_info dec3000s_frontend_info = {
++	.name			= "TechnoTrend/Hauppauge DEC3000-s Frontend",
++	.type			= FE_QPSK,
++	.frequency_min		= 950000,
++	.frequency_max		= 2150000,
++	.frequency_stepsize	= 125,
++	.caps =	FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
++		FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
++		FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |
++		FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO |
++		FE_CAN_HIERARCHY_AUTO,
++};
++
+ static int ttusb_dec_send_command(struct ttusb_dec *dec, const u8 command,
+ 				  int param_length, const u8 params[],
+ 				  int *result_length, u8 cmd_result[])
+@@ -129,22 +245,8 @@ static void ttusb_dec_set_pids(struct tt
+ 				       ttusb_dec_av_pes2ts_cb, dec->demux.feed);
+ 		dvb_filter_pes2ts_init(&dec->v_pes2ts, dec->pid[DMX_PES_VIDEO],
+ 				       ttusb_dec_av_pes2ts_cb, dec->demux.feed);
+-}
+-
+-static int ttusb_dec_i2c_master_xfer(struct dvb_i2c_bus *i2c,
+-				     const struct i2c_msg msgs[], int num)
+-{
+-	int result, i;
+-
+-	dprintk("%s\n", __FUNCTION__);
+-
+-	for (i = 0; i < num; i++)
+-		if ((result = ttusb_dec_send_command(i2c->data, msgs[i].addr,
+-						     msgs[i].len, msgs[i].buf,
+-						     NULL, NULL)))
+-			return result;
+-
+-	return 0;
++	dec->v_pes_length = 0;
++	dec->v_pes_postbytes = 0;
+ }
+ 
+ static void ttusb_dec_process_av_pes(struct ttusb_dec * dec, u8 * av_pes,
+@@ -194,7 +296,8 @@ static void ttusb_dec_process_av_pes(str
+ 				       &av_pes[12], prebytes);
+ 
+ 				dvb_filter_pes2ts(&dec->v_pes2ts, dec->v_pes,
+-						  dec->v_pes_length + prebytes);
++						  dec->v_pes_length + prebytes,
++						  1);
+ 			}
+ 
+ 			if (av_pes[5] & 0x10) {
+@@ -239,13 +342,14 @@ static void ttusb_dec_process_av_pes(str
+ 
+ 			if (postbytes == 0)
+ 				dvb_filter_pes2ts(&dec->v_pes2ts, dec->v_pes,
+-							  dec->v_pes_length);
++						  dec->v_pes_length, 1);
+ 
+ 			break;
+ 		}
+ 
+ 	case 0x02:		/* MainAudioStream */
+-		dvb_filter_pes2ts(&dec->a_pes2ts, &av_pes[8], length - 12);
++		dvb_filter_pes2ts(&dec->a_pes2ts, &av_pes[8], length - 12,
++				  av_pes[5] & 0x10);
+ 		break;
+ 
+ 	default:
+@@ -367,11 +471,7 @@ static void ttusb_dec_process_urb_frame_
+ 	}
+ }
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+-static void ttusb_dec_process_urb(struct urb *urb)
+-#else
+ static void ttusb_dec_process_urb(struct urb *urb, struct pt_regs *ptregs)
+-#endif
+ {
+ 	struct ttusb_dec *dec = urb->context;
+ 
+@@ -380,6 +480,7 @@ static void ttusb_dec_process_urb(struct
+ 
+ 		for (i = 0; i < FRAMES_PER_ISO_BUF; i++) {
+ 			struct usb_iso_packet_descriptor *d;
++
+ 			u8 *b;
+ 			int length;
+ 			struct urb_frame *frame;
+@@ -412,10 +513,8 @@ static void ttusb_dec_process_urb(struct
+ 				urb->status);
+ 	}
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+ 	if (dec->iso_stream_count)
+ 		usb_submit_urb(urb, GFP_ATOMIC);
+-#endif
+ }
+ 
+ static void ttusb_dec_setup_urbs(struct ttusb_dec *dec)
+@@ -433,9 +532,8 @@ static void ttusb_dec_setup_urbs(struct 
+ 		urb->complete = ttusb_dec_process_urb;
+ 		urb->pipe = dec->stream_pipe;
+ 		urb->transfer_flags = URB_ISO_ASAP;
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+ 		urb->interval = 1;
+-#endif
++
+ 		urb->number_of_packets = FRAMES_PER_ISO_BUF;
+ 		urb->transfer_buffer_length = ISO_FRAME_SIZE *
+ 					      FRAMES_PER_ISO_BUF;
+@@ -502,8 +600,8 @@ static int ttusb_dec_start_iso_xfer(stru
+ 		ttusb_dec_setup_urbs(dec);
+ 
+ 		for (i = 0; i < ISO_BUF_COUNT; i++) {
+-			if ((result = usb_submit_urb(dec->iso_urb[i]
+-						    , GFP_KERNEL))) {
++			if ((result = usb_submit_urb(dec->iso_urb[i],
++						     GFP_ATOMIC))) {
+ 				printk("%s: failed urb submission %d: "
+ 				       "error %d\n", __FUNCTION__, i, result);
+ 
+@@ -525,10 +623,6 @@ static int ttusb_dec_start_iso_xfer(stru
+ 
+ 	up(&dec->iso_sem);
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+-	ttusb_dec_set_streaming_interface(dec);
+-#endif
+-
+ 	return 0;
+ }
+ 
+@@ -659,7 +753,7 @@ static int ttusb_dec_alloc_iso_urbs(stru
+ 	for (i = 0; i < ISO_BUF_COUNT; i++) {
+ 		struct urb *urb;
+ 
+-		if (!(urb = usb_alloc_urb(FRAMES_PER_ISO_BUF, GFP_KERNEL))) {
++		if (!(urb = usb_alloc_urb(FRAMES_PER_ISO_BUF, GFP_ATOMIC))) {
+ 			ttusb_dec_free_iso_urbs(dec);
+ 			return -ENOMEM;
+ 		}
+@@ -669,13 +763,6 @@ static int ttusb_dec_alloc_iso_urbs(stru
+ 
+ 	ttusb_dec_setup_urbs(dec);
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+-	for (i = 0; i < ISO_BUF_COUNT; i++) {
+-		int next = (i + 1) % ISO_BUF_COUNT;
+-		dec->iso_urb[i]->next = dec->iso_urb[next];
+-	}
+-#endif
+-
+ 	return 0;
+ }
+ 
+@@ -711,20 +798,45 @@ static void ttusb_dec_init_usb(struct tt
+ 	ttusb_dec_alloc_iso_urbs(dec);
+ }
+ 
+-#include "dsp_dec2000.h"
+-
+ static int ttusb_dec_boot_dsp(struct ttusb_dec *dec)
+ {
+ 	int i, j, actual_len, result, size, trans_count;
+-	u8 b0[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1b, 0xc8, 0x61,
++	u8 b0[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 		    0x00 };
+ 	u8 b1[] = { 0x61 };
+ 	u8 b[ARM_PACKET_SIZE];
+-	u32 dsp_length = htonl(sizeof(dsp_dec2000));
++	u8 *firmware = NULL;
++	size_t firmware_size = 0;
++	u32 firmware_csum = 0;
++	u32 firmware_size_nl;
++	u32 firmware_csum_nl;
++	const struct firmware *fw_entry = NULL;
+ 
+ 	dprintk("%s\n", __FUNCTION__);
+ 
+-	memcpy(b0, &dsp_length, 4);
++	if (request_firmware(&fw_entry, dec->firmware_name, &dec->udev->dev)) {
++		printk(KERN_ERR "%s: Firmware (%s) unavailable.\n",
++		       __FUNCTION__, dec->firmware_name);
++		return 1;
++	}
++
++	firmware = fw_entry->data;
++	firmware_size = fw_entry->size;
++
++	switch (dec->model) {
++		case TTUSB_DEC2000T:
++			firmware_csum = 0x1bc86100;
++			break;
++
++		case TTUSB_DEC3000S:
++			firmware_csum = 0x00000000;
++			break;
++	}
++
++	firmware_size_nl = htonl(firmware_size);
++	memcpy(b0, &firmware_size_nl, 4);
++	firmware_csum_nl = htonl(firmware_csum);
++	memcpy(&b0[6], &firmware_csum_nl, 4);
+ 
+ 	result = ttusb_dec_send_command(dec, 0x41, sizeof(b0), b0, NULL, NULL);
+ 
+@@ -734,8 +846,8 @@ static int ttusb_dec_boot_dsp(struct ttu
+ 	trans_count = 0;
+ 	j = 0;
+ 
+-	for (i = 0; i < sizeof(dsp_dec2000); i += COMMAND_PACKET_SIZE) {
+-		size = sizeof(dsp_dec2000) - i;
++	for (i = 0; i < firmware_size; i += COMMAND_PACKET_SIZE) {
++		size = firmware_size - i;
+ 		if (size > COMMAND_PACKET_SIZE)
+ 			size = COMMAND_PACKET_SIZE;
+ 
+@@ -743,7 +855,7 @@ static int ttusb_dec_boot_dsp(struct ttu
+ 		b[j + 1] = trans_count++;
+ 		b[j + 2] = 0xf0;
+ 		b[j + 3] = size;
+-		memcpy(&b[j + 4], &dsp_dec2000[i], size);
++		memcpy(&b[j + 4], &firmware[i], size);
+ 
+ 		j += COMMAND_PACKET_SIZE + 4;
+ 
+@@ -764,7 +876,7 @@ static int ttusb_dec_boot_dsp(struct ttu
+ 	return result;
+ }
+ 
+-static void ttusb_dec_init_stb(struct ttusb_dec *dec)
++static int ttusb_dec_init_stb(struct ttusb_dec *dec)
+ {
+ 	u8 c[COMMAND_PACKET_SIZE];
+ 	int c_length;
+@@ -774,9 +886,14 @@ static void ttusb_dec_init_stb(struct tt
+ 
+ 	result = ttusb_dec_send_command(dec, 0x08, 0, NULL, &c_length, c);
+ 
+-	if (!result)
++	if (!result) {
+ 		if (c_length != 0x0c || (c_length == 0x0c && c[9] != 0x63))
+-			ttusb_dec_boot_dsp(dec);
++			return ttusb_dec_boot_dsp(dec);
++		else
++			return 0;
++	}
++	else
++		return result;
+ }
+ 
+ static int ttusb_dec_init_dvb(struct ttusb_dec *dec)
+@@ -785,22 +902,13 @@ static int ttusb_dec_init_dvb(struct ttu
+ 
+ 	dprintk("%s\n", __FUNCTION__);
+ 
+-	if ((result = dvb_register_adapter(&dec->adapter, "dec2000")) < 0) {
++	if ((result = dvb_register_adapter(&dec->adapter, dec->model_name)) < 0) {
+ 		printk("%s: dvb_register_adapter failed: error %d\n",
+ 		       __FUNCTION__, result);
+ 
+ 		return result;
+ 	}
+ 
+-	if (!(dec->i2c_bus = dvb_register_i2c_bus(ttusb_dec_i2c_master_xfer,
+-						  dec, dec->adapter, 0))) {
+-		printk("%s: dvb_register_i2c_bus failed\n", __FUNCTION__);
+-
+-		dvb_unregister_adapter(dec->adapter);
+-
+-		return -ENOMEM;
+-	}
+-
+ 	dec->demux.dmx.capabilities = DMX_TS_FILTERING | DMX_SECTION_FILTERING;
+ 
+ 	dec->demux.priv = (void *)dec;
+@@ -814,8 +922,6 @@ static int ttusb_dec_init_dvb(struct ttu
+ 		printk("%s: dvb_dmx_init failed: error %d\n", __FUNCTION__,
+ 		       result);
+ 
+-		dvb_unregister_i2c_bus(ttusb_dec_i2c_master_xfer, dec->adapter,
+-				       0);
+ 		dvb_unregister_adapter(dec->adapter);
+ 
+ 		return result;
+@@ -830,8 +936,6 @@ static int ttusb_dec_init_dvb(struct ttu
+ 		       __FUNCTION__, result);
+ 
+ 		dvb_dmx_release(&dec->demux);
+-		dvb_unregister_i2c_bus(ttusb_dec_i2c_master_xfer, dec->adapter,
+-				       0);
+ 		dvb_unregister_adapter(dec->adapter);
+ 
+ 		return result;
+@@ -846,8 +950,6 @@ static int ttusb_dec_init_dvb(struct ttu
+ 
+ 		dvb_dmxdev_release(&dec->dmxdev);
+ 		dvb_dmx_release(&dec->demux);
+-		dvb_unregister_i2c_bus(ttusb_dec_i2c_master_xfer, dec->adapter,
+-				       0);
+ 		dvb_unregister_adapter(dec->adapter);
+ 
+ 		return result;
+@@ -861,8 +963,6 @@ static int ttusb_dec_init_dvb(struct ttu
+ 		dec->demux.dmx.remove_frontend(&dec->demux.dmx, &dec->frontend);
+ 		dvb_dmxdev_release(&dec->dmxdev);
+ 		dvb_dmx_release(&dec->demux);
+-		dvb_unregister_i2c_bus(ttusb_dec_i2c_master_xfer, dec->adapter,
+-				       0);
+ 		dvb_unregister_adapter(dec->adapter);
+ 
+ 		return result;
+@@ -882,7 +982,6 @@ static void ttusb_dec_exit_dvb(struct tt
+ 	dec->demux.dmx.remove_frontend(&dec->demux.dmx, &dec->frontend);
+ 	dvb_dmxdev_release(&dec->dmxdev);
+ 	dvb_dmx_release(&dec->demux);
+-	dvb_unregister_i2c_bus(ttusb_dec_i2c_master_xfer, dec->adapter, 0);
+ 	dvb_unregister_adapter(dec->adapter);
+ }
+ 
+@@ -914,35 +1013,257 @@ static void ttusb_dec_exit_tasklet(struc
+ 	}
+ }
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+-static void *ttusb_dec_probe(struct usb_device *udev, unsigned int ifnum,
+-			     const struct usb_device_id *id)
++static int ttusb_dec_2000t_frontend_ioctl(struct dvb_frontend *fe, unsigned int cmd,
++				  void *arg)
+ {
+-	struct ttusb_dec *dec;
++	struct ttusb_dec *dec = fe->data;
+ 
+ 	dprintk("%s\n", __FUNCTION__);
+ 
+-	if (ifnum != 0)
+-		return NULL;
++	switch (cmd) {
++
++	case FE_GET_INFO:
++		dprintk("%s: FE_GET_INFO\n", __FUNCTION__);
++		memcpy(arg, dec->frontend_info,
++		       sizeof (struct dvb_frontend_info));
++		break;
++
++	case FE_READ_STATUS: {
++			fe_status_t *status = (fe_status_t *)arg;
++			dprintk("%s: FE_READ_STATUS\n", __FUNCTION__);
++			*status = FE_HAS_SIGNAL | FE_HAS_VITERBI |
++				  FE_HAS_SYNC | FE_HAS_CARRIER | FE_HAS_LOCK;
++			break;
++		}
++
++	case FE_READ_BER: {
++			u32 *ber = (u32 *)arg;
++			dprintk("%s: FE_READ_BER\n", __FUNCTION__);
++			*ber = 0;
++			return -ENOSYS;
++			break;
++		}
++
++	case FE_READ_SIGNAL_STRENGTH: {
++			dprintk("%s: FE_READ_SIGNAL_STRENGTH\n", __FUNCTION__);
++			*(s32 *)arg = 0xFF;
++			return -ENOSYS;
++			break;
++		}
++
++	case FE_READ_SNR:
++		dprintk("%s: FE_READ_SNR\n", __FUNCTION__);
++		*(s32 *)arg = 0;
++		return -ENOSYS;
++		break;
++
++	case FE_READ_UNCORRECTED_BLOCKS:
++		dprintk("%s: FE_READ_UNCORRECTED_BLOCKS\n", __FUNCTION__);
++		*(u32 *)arg = 0;
++		return -ENOSYS;
++		break;
++
++	case FE_SET_FRONTEND: {
++			struct dvb_frontend_parameters *p =
++				(struct dvb_frontend_parameters *)arg;
++			u8 b[] = { 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
++				   0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
++				   0x00, 0xff, 0x00, 0x00, 0x00, 0xff };
++			u32 freq;
++
++			dprintk("%s: FE_SET_FRONTEND\n", __FUNCTION__);
++
++			dprintk("            frequency->%d\n", p->frequency);
++			dprintk("            symbol_rate->%d\n",
++				p->u.qam.symbol_rate);
++			dprintk("            inversion->%d\n", p->inversion);
++
++			freq = htonl(p->frequency / 1000);
++			memcpy(&b[4], &freq, sizeof (u32));
++			ttusb_dec_send_command(dec, 0x71, sizeof(b), b, NULL, NULL);
++
++			break;
++		}
++
++	case FE_GET_FRONTEND:
++		dprintk("%s: FE_GET_FRONTEND\n", __FUNCTION__);
++		break;
++
++	case FE_SLEEP:
++		dprintk("%s: FE_SLEEP\n", __FUNCTION__);
++		return -ENOSYS;
++		break;
++
++	case FE_INIT:
++		dprintk("%s: FE_INIT\n", __FUNCTION__);
++		break;
++
++	case FE_RESET:
++		dprintk("%s: FE_RESET\n", __FUNCTION__);
++		break;
++
++	default:
++		dprintk("%s: unknown IOCTL (0x%X)\n", __FUNCTION__, cmd);
++		return -EINVAL;
+ 
+-	if (!(dec = kmalloc(sizeof(struct ttusb_dec), GFP_KERNEL))) {
+-		printk("%s: couldn't allocate memory.\n", __FUNCTION__);
+-		return NULL;
+ 	}
+ 
+-	memset(dec, 0, sizeof(struct ttusb_dec));
++	return 0;
++}
+ 
+-	dec->udev = udev;
++static int ttusb_dec_3000s_frontend_ioctl(struct dvb_frontend *fe, unsigned int cmd,
++				  void *arg)
++{
++	struct ttusb_dec *dec = fe->data;
+ 
+-	ttusb_dec_init_usb(dec);
+-	ttusb_dec_init_stb(dec);
+-	ttusb_dec_init_dvb(dec);
+-	ttusb_dec_init_v_pes(dec);
+-	ttusb_dec_init_tasklet(dec);
++	dprintk("%s\n", __FUNCTION__);
+ 
+-	return (void *)dec;
++	switch (cmd) {
++
++	case FE_GET_INFO:
++		dprintk("%s: FE_GET_INFO\n", __FUNCTION__);
++		memcpy(arg, dec->frontend_info,
++		       sizeof (struct dvb_frontend_info));
++		break;
++
++	case FE_READ_STATUS: {
++			fe_status_t *status = (fe_status_t *)arg;
++			dprintk("%s: FE_READ_STATUS\n", __FUNCTION__);
++			*status = FE_HAS_SIGNAL | FE_HAS_VITERBI |
++				  FE_HAS_SYNC | FE_HAS_CARRIER | FE_HAS_LOCK;
++			break;
++		}
++
++	case FE_READ_BER: {
++			u32 *ber = (u32 *)arg;
++			dprintk("%s: FE_READ_BER\n", __FUNCTION__);
++			*ber = 0;
++			return -ENOSYS;
++			break;
++		}
++
++	case FE_READ_SIGNAL_STRENGTH: {
++			dprintk("%s: FE_READ_SIGNAL_STRENGTH\n", __FUNCTION__);
++			*(s32 *)arg = 0xFF;
++			return -ENOSYS;
++			break;
++		}
++
++	case FE_READ_SNR:
++		dprintk("%s: FE_READ_SNR\n", __FUNCTION__);
++		*(s32 *)arg = 0;
++		return -ENOSYS;
++		break;
++
++	case FE_READ_UNCORRECTED_BLOCKS:
++		dprintk("%s: FE_READ_UNCORRECTED_BLOCKS\n", __FUNCTION__);
++		*(u32 *)arg = 0;
++		return -ENOSYS;
++		break;
++
++	case FE_SET_FRONTEND: {
++			struct dvb_frontend_parameters *p =
++				(struct dvb_frontend_parameters *)arg;
++			u8 b[] = { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
++				   0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
++				   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++				   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
++				   0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00,
++				   0x00, 0x00, 0x00, 0x00, 0x00 };
++			u32 freq;
++			u32 sym_rate;
++			u32 band;
++
++
++			dprintk("%s: FE_SET_FRONTEND\n", __FUNCTION__);
++
++			dprintk("            frequency->%d\n", p->frequency);
++			dprintk("            symbol_rate->%d\n",
++				p->u.qam.symbol_rate);
++			dprintk("            inversion->%d\n", p->inversion);
++
++			freq = htonl(p->frequency * 1000 + (dec->hi_band ? LOF_HI : LOF_LO));
++			memcpy(&b[4], &freq, sizeof(u32));
++			sym_rate = htonl(p->u.qam.symbol_rate);
++			memcpy(&b[12], &sym_rate, sizeof(u32));
++			band = htonl(dec->hi_band ? LOF_HI : LOF_LO);
++			memcpy(&b[24], &band, sizeof(u32));
++
++			ttusb_dec_send_command(dec, 0x71, sizeof(b), b, NULL, NULL);
++
++			break;
++		}
++
++	case FE_GET_FRONTEND:
++		dprintk("%s: FE_GET_FRONTEND\n", __FUNCTION__);
++		break;
++
++	case FE_SLEEP:
++		dprintk("%s: FE_SLEEP\n", __FUNCTION__);
++		return -ENOSYS;
++		break;
++
++	case FE_INIT:
++		dprintk("%s: FE_INIT\n", __FUNCTION__);
++		break;
++
++	case FE_RESET:
++		dprintk("%s: FE_RESET\n", __FUNCTION__);
++		break;
++
++	case FE_DISEQC_SEND_MASTER_CMD:
++		dprintk("%s: FE_DISEQC_SEND_MASTER_CMD\n", __FUNCTION__);
++		break;
++
++	case FE_DISEQC_SEND_BURST:
++		dprintk("%s: FE_DISEQC_SEND_BURST\n", __FUNCTION__);
++		break;
++
++	case FE_SET_TONE: {
++			fe_sec_tone_mode_t tone = (fe_sec_tone_mode_t)arg;
++			dprintk("%s: FE_SET_TONE\n", __FUNCTION__);
++			dec->hi_band = (SEC_TONE_ON == tone);
++			break;
++		}
++
++	case FE_SET_VOLTAGE:
++		dprintk("%s: FE_SET_VOLTAGE\n", __FUNCTION__);
++		break;
++
++	default:
++		dprintk("%s: unknown IOCTL (0x%X)\n", __FUNCTION__, cmd);
++		return -EINVAL;
++
++	}
++
++	return 0;
++}
++
++static void ttusb_dec_init_frontend(struct ttusb_dec *dec)
++{
++	dec->i2c_bus.adapter = dec->adapter;
++
++	switch (dec->model) {
++		case TTUSB_DEC2000T:
++			dec->frontend_info = &dec2000t_frontend_info;
++			dec->frontend_ioctl = ttusb_dec_2000t_frontend_ioctl;
++			break;
++
++		case TTUSB_DEC3000S:
++			dec->frontend_info = &dec3000s_frontend_info;
++			dec->frontend_ioctl = ttusb_dec_3000s_frontend_ioctl;
++			break;
++	}
++
++	dvb_register_frontend(dec->frontend_ioctl, &dec->i2c_bus, (void *)dec,
++			      dec->frontend_info);
++}
++
++static void ttusb_dec_exit_frontend(struct ttusb_dec *dec)
++{
++	dvb_unregister_frontend(dec->frontend_ioctl, &dec->i2c_bus);
+ }
+-#else
++
+ static int ttusb_dec_probe(struct usb_interface *intf,
+ 			   const struct usb_device_id *id)
+ {
+@@ -958,48 +1279,65 @@ static int ttusb_dec_probe(struct usb_in
+ 		return -ENOMEM;
+ 	}
+ 
++	usb_set_intfdata(intf, (void *)dec);
++
+ 	memset(dec, 0, sizeof(struct ttusb_dec));
+ 
++	switch (id->idProduct) {
++		case 0x1006:
++			dec->model = TTUSB_DEC3000S;
++			dec->model_name = "DEC3000-s";
++			dec->firmware_name = "dec3000s.bin";
++			break;
++
++		case 0x1008:
++			dec->model = TTUSB_DEC2000T;
++			dec->model_name = "DEC2000-t";
++			dec->firmware_name = "dec2000t.bin";
++			break;
++	}
++
+ 	dec->udev = udev;
+ 
+ 	ttusb_dec_init_usb(dec);
+-	ttusb_dec_init_stb(dec);
++	if (ttusb_dec_init_stb(dec)) {
++		ttusb_dec_exit_usb(dec);
++		return 0;
++	}
+ 	ttusb_dec_init_dvb(dec);
++	ttusb_dec_init_frontend(dec);
+ 	ttusb_dec_init_v_pes(dec);
+ 	ttusb_dec_init_tasklet(dec);
+ 
+-	usb_set_intfdata(intf, (void *)dec);
++	dec->active = 1;
++
+ 	ttusb_dec_set_streaming_interface(dec);
+ 
+ 	return 0;
+ }
+-#endif
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+-static void ttusb_dec_disconnect(struct usb_device *udev, void *data)
+-{
+-	struct ttusb_dec *dec = data;
+-#else
+ static void ttusb_dec_disconnect(struct usb_interface *intf)
+ {
+ 	struct ttusb_dec *dec = usb_get_intfdata(intf);
+ 
+ 	usb_set_intfdata(intf, NULL);
+-#endif
+ 
+ 	dprintk("%s\n", __FUNCTION__);
+ 
++	if (dec->active) {
+ 	ttusb_dec_exit_tasklet(dec);
+ 	ttusb_dec_exit_usb(dec);
++		ttusb_dec_exit_frontend(dec);
+ 	ttusb_dec_exit_dvb(dec);
++	}
+ 
+ 	kfree(dec);
+ }
+ 
+ static struct usb_device_id ttusb_dec_table[] = {
+-	{USB_DEVICE(0x0b48, 0x1006)},	/* Unconfirmed */
+-	{USB_DEVICE(0x0b48, 0x1007)},	/* Unconfirmed */
+-	{USB_DEVICE(0x0b48, 0x1008)},	/* DEC 2000 t */
++	{USB_DEVICE(0x0b48, 0x1006)},	/* DEC3000-s */
++	/*{USB_DEVICE(0x0b48, 0x1007)},	   Unconfirmed */
++	{USB_DEVICE(0x0b48, 0x1008)},	/* DEC2000-t */
+ 	{}
+ };
+ 
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/media/dvb/ttusb-dec/ttusb_dec.mod.c	2003-12-28 23:22:40.000000000 -0800
+@@ -0,0 +1,13 @@
++#include <linux/module.h>
++#include <linux/vermagic.h>
++#include <linux/compiler.h>
++
++MODULE_INFO(vermagic, VERMAGIC_STRING);
++
++static const char __module_depends[]
++__attribute_used__
++__attribute__((section(".modinfo"))) =
++"depends=dvb-core";
++
++MODULE_ALIAS("usb:v0B48p1006dl*dh*dc*dsc*dp*ic*isc*ip*");
++MODULE_ALIAS("usb:v0B48p1008dl*dh*dc*dsc*dp*ic*isc*ip*");
+--- linux-2.6.0/drivers/media/video/video-buf.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/media/video/video-buf.c	2003-12-28 23:22:12.000000000 -0800
+@@ -1078,7 +1078,7 @@ videobuf_vm_close(struct vm_area_struct 
+  */
+ static struct page*
+ videobuf_vm_nopage(struct vm_area_struct *vma, unsigned long vaddr,
+-		  int write_access)
++		  int *type)
+ {
+ 	struct page *page;
+ 
+@@ -1090,6 +1090,8 @@ videobuf_vm_nopage(struct vm_area_struct
+ 	if (!page)
+ 		return NOPAGE_OOM;
+ 	clear_user_page(page_address(page), vaddr, page);
++	if (type)
++		*type = VM_FAULT_MINOR;
+ 	return page;
+ }
+ 
+--- linux-2.6.0/drivers/message/i2o/i2o_block.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/message/i2o/i2o_block.c	2003-12-28 23:21:17.000000000 -0800
+@@ -885,10 +885,10 @@ static void i2o_block_biosparam(
+  *	Issue device specific ioctl calls.
+  */
+ 
+-static int i2ob_ioctl(struct inode *inode, struct file *file,
++static int i2ob_ioctl(struct block_device *bdev, struct file *file,
+ 		     unsigned int cmd, unsigned long arg)
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
++	struct gendisk *disk = bdev->bd_disk;
+ 	struct i2ob_device *dev = disk->private_data;
+ 
+ 	/* Anyone capable of this syscall can do *real bad* things */
+@@ -901,7 +901,7 @@ static int i2ob_ioctl(struct inode *inod
+ 			struct hd_geometry g;
+ 			i2o_block_biosparam(get_capacity(disk), 
+ 					&g.cylinders, &g.heads, &g.sectors);
+-			g.start = get_start_sect(inode->i_bdev);
++			g.start = get_start_sect(bdev);
+ 			return copy_to_user((void *)arg,&g, sizeof(g))?-EFAULT:0;
+ 		}
+ 		
+@@ -927,9 +927,8 @@ static int i2ob_ioctl(struct inode *inod
+  *	Close the block device down
+  */
+  
+-static int i2ob_release(struct inode *inode, struct file *file)
++static int i2ob_release(struct gendisk *disk)
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
+ 	struct i2ob_device *dev = disk->private_data;
+ 
+ 	/*
+@@ -999,9 +998,9 @@ static int i2ob_release(struct inode *in
+  *	Open the block device.
+  */
+  
+-static int i2ob_open(struct inode *inode, struct file *file)
++static int i2ob_open(struct block_device *bdev, struct file *file)
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
++	struct gendisk *disk = bdev->bd_disk;
+ 	struct i2ob_device *dev = disk->private_data;
+ 
+ 	if(!dev->i2odev)	
+--- linux-2.6.0/drivers/mtd/chips/jedec_probe.c	2003-06-14 12:18:51.000000000 -0700
++++ 25/drivers/mtd/chips/jedec_probe.c	2003-12-28 23:23:01.000000000 -0800
+@@ -8,6 +8,7 @@
+ 
+ #include <linux/config.h>
+ #include <linux/module.h>
++#include <linux/init.h>
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <asm/io.h>
+--- linux-2.6.0/drivers/mtd/maps/pcmciamtd.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/mtd/maps/pcmciamtd.c	2003-12-28 23:22:54.000000000 -0800
+@@ -125,7 +125,7 @@ static caddr_t remap_window(struct map_i
+ 		DEBUG(2, "Remapping window from 0x%8.8x to 0x%8.8x",
+ 		      dev->offset, mrq.CardOffset);
+ 		mrq.Page = 0;
+-		if( (ret = CardServices(MapMemPage, win, &mrq)) != CS_SUCCESS) {
++		if( (ret = pcmcia_map_mem_page(win, &mrq)) != CS_SUCCESS) {
+ 			cs_error(dev->link.handle, MapMemPage, ret);
+ 			return NULL;
+ 		}
+@@ -332,7 +332,7 @@ static void pcmciamtd_set_vpp(struct map
+ 	mod.Vpp1 = mod.Vpp2 = on ? dev->vpp : 0;
+ 
+ 	DEBUG(2, "dev = %p on = %d vpp = %d\n", dev, on, dev->vpp);
+-	ret = CardServices(ModifyConfiguration, link->handle, &mod);
++	ret = pcmcia_modify_configuration(link->handle, &mod);
+ 	if(ret != CS_SUCCESS) {
+ 		cs_error(link->handle, ModifyConfiguration, ret);
+ 	}
+@@ -355,9 +355,9 @@ static void pcmciamtd_release(dev_link_t
+ 			iounmap(dev->win_base);
+ 			dev->win_base = NULL;
+ 		}
+-		CardServices(ReleaseWindow, link->win);
++		pcmcia_release_window(link->win);
+ 	}
+-	CardServices(ReleaseConfiguration, link->handle);
++	pcmcia_release_configuration(link->handle);
+ 	link->state &= ~DEV_CONFIG;
+ }
+ 
+@@ -375,14 +375,14 @@ static void card_settings(struct pcmciam
+ 	tuple.TupleOffset = 0;
+ 	tuple.DesiredTuple = RETURN_FIRST_TUPLE;
+ 
+-	rc = CardServices(GetFirstTuple, link->handle, &tuple);
++	rc = pcmcia_get_first_tuple(link->handle, &tuple);
+ 	while(rc == CS_SUCCESS) {
+-		rc = CardServices(GetTupleData, link->handle, &tuple);
++		rc = pcmcia_get_tuple_data(link->handle, &tuple);
+ 		if(rc != CS_SUCCESS) {
+ 			cs_error(link->handle, GetTupleData, rc);
+ 			break;
+ 		}
+-		rc = CardServices(ParseTuple, link->handle, &tuple, &parse);
++		rc = pcmcia_parse_tuple(link->handle, &tuple, &parse);
+ 		if(rc != CS_SUCCESS) {
+ 			cs_error(link->handle, ParseTuple, rc);
+ 			break;
+@@ -455,7 +455,7 @@ static void card_settings(struct pcmciam
+ 			DEBUG(2, "Unknown tuple code %d", tuple.TupleCode);
+ 		}
+ 		
+-		rc = CardServices(GetNextTuple, link->handle, &tuple, &parse);
++		rc = pcmcia_get_next_tuple(link->handle, &tuple);
+ 	}
+ 	if(!dev->pcmcia_map.size)
+ 		dev->pcmcia_map.size = MAX_PCMCIA_ADDR;
+@@ -489,8 +489,8 @@ static void card_settings(struct pcmciam
+  * MTD device available to the system.
+  */
+ 
+-#define CS_CHECK(fn, args...) \
+-while ((last_ret=CardServices(last_fn=(fn), args))!=0) goto cs_failed
++#define CS_CHECK(fn, ret) \
++do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+ 
+ static void pcmciamtd_config(dev_link_t *link)
+ {
+@@ -512,7 +512,7 @@ static void pcmciamtd_config(dev_link_t 
+ 	link->state |= DEV_CONFIG;
+ 
+ 	DEBUG(2, "Validating CIS");
+-	ret = CardServices(ValidateCIS, link->handle, &cisinfo);
++	ret = pcmcia_validate_cis(link->handle, &cisinfo);
+ 	if(ret != CS_SUCCESS) {
+ 		cs_error(link->handle, GetTupleData, ret);
+ 	} else {
+@@ -547,8 +547,7 @@ static void pcmciamtd_config(dev_link_t 
+ 		int ret;
+ 		DEBUG(2, "requesting window with size = %dKiB memspeed = %d",
+ 		      req.Size >> 10, req.AccessSpeed);
+-		link->win = (window_handle_t)link->handle;
+-		ret = CardServices(RequestWindow, &link->win, &req);
++		ret = pcmcia_request_window(&link->handle, &req, &link->win);
+ 		DEBUG(2, "ret = %d dev->win_size = %d", ret, dev->win_size);
+ 		if(ret) {
+ 			req.Size >>= 1;
+@@ -569,7 +568,7 @@ static void pcmciamtd_config(dev_link_t 
+ 	DEBUG(1, "Allocated a window of %dKiB", dev->win_size >> 10);
+ 		
+ 	/* Get write protect status */
+-	CS_CHECK(GetStatus, link->handle, &status);
++	CS_CHECK(GetStatus, pcmcia_get_status(link->handle, &status));
+ 	DEBUG(2, "status value: 0x%x window handle = 0x%8.8lx",
+ 	      status.CardState, (unsigned long)link->win);
+ 	dev->win_base = ioremap(req.Base, req.Size);
+@@ -586,7 +585,7 @@ static void pcmciamtd_config(dev_link_t 
+ 	dev->pcmcia_map.map_priv_2 = (unsigned long)link->win;
+ 
+ 	DEBUG(2, "Getting configuration");
+-	CS_CHECK(GetConfigurationInfo, link->handle, &t);
++	CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(link->handle, &t));
+ 	DEBUG(2, "Vcc = %d Vpp1 = %d Vpp2 = %d", t.Vcc, t.Vpp1, t.Vpp2);
+ 	dev->vpp = (vpp) ? vpp : t.Vpp1;
+ 	link->conf.Attributes = 0;
+@@ -608,7 +607,7 @@ static void pcmciamtd_config(dev_link_t 
+ 	link->conf.ConfigIndex = 0;
+ 	link->conf.Present = t.Present;
+ 	DEBUG(2, "Setting Configuration");
+-	ret = CardServices(RequestConfiguration, link->handle, &link->conf);
++	ret = pcmcia_request_configuration(link->handle, &link->conf);
+ 	if(ret != CS_SUCCESS) {
+ 		cs_error(link->handle, RequestConfiguration, ret);
+ 	}
+@@ -757,7 +756,7 @@ static void pcmciamtd_detach(dev_link_t 
+ 	if (link->handle) {
+ 		int ret;
+ 		DEBUG(2, "Deregistering with card services");
+-		ret = CardServices(DeregisterClient, link->handle);
++		ret = pcmcia_deregister_client(link->handle);
+ 		if (ret != CS_SUCCESS)
+ 			cs_error(link->handle, DeregisterClient, ret);
+ 	}
+@@ -804,7 +803,7 @@ static dev_link_t *pcmciamtd_attach(void
+ 	client_reg.Version = 0x0210;
+ 	client_reg.event_callback_args.client_data = link;
+ 	DEBUG(2, "Calling RegisterClient");
+-	ret = CardServices(RegisterClient, &link->handle, &client_reg);
++	ret = pcmcia_register_client(&link->handle, &client_reg);
+ 	if (ret != 0) {
+ 		cs_error(link->handle, RegisterClient, ret);
+ 		pcmciamtd_detach(link);
+--- linux-2.6.0/drivers/mtd/mtd_blkdevs.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/mtd/mtd_blkdevs.c	2003-12-28 23:21:17.000000000 -0800
+@@ -141,14 +141,12 @@ static void mtd_blktrans_request(struct 
+ }
+ 
+ 
+-int blktrans_open(struct inode *i, struct file *f)
++static int blktrans_open(struct block_device *bdev, struct file *f)
+ {
+-	struct mtd_blktrans_dev *dev;
+-	struct mtd_blktrans_ops *tr;
++	struct mtd_blktrans_dev *dev = bdev->bd_disk->private_data;
++	struct mtd_blktrans_ops *tr = dev->tr;
+ 	int ret = -ENODEV;
+ 
+-	dev = i->i_bdev->bd_disk->private_data;
+-	tr = dev->tr;
+ 
+ 	if (!try_module_get(dev->mtd->owner))
+ 		goto out;
+@@ -172,15 +170,12 @@ int blktrans_open(struct inode *i, struc
+ 	return ret;
+ }
+ 
+-int blktrans_release(struct inode *i, struct file *f)
++static int blktrans_release(struct gendisk *disk)
+ {
+-	struct mtd_blktrans_dev *dev;
+-	struct mtd_blktrans_ops *tr;
++	struct mtd_blktrans_dev *dev = disk->private_data;
++	struct mtd_blktrans_ops *tr = dev->tr;
+ 	int ret = 0;
+ 
+-	dev = i->i_bdev->bd_disk->private_data;
+-	tr = dev->tr;
+-
+ 	if (tr->release)
+ 		ret = tr->release(dev);
+ 
+@@ -194,10 +189,10 @@ int blktrans_release(struct inode *i, st
+ }
+ 
+ 
+-static int blktrans_ioctl(struct inode *inode, struct file *file, 
++static int blktrans_ioctl(struct block_device *bdev, struct file *file,
+ 			      unsigned int cmd, unsigned long arg)
+ {
+-	struct mtd_blktrans_dev *dev = inode->i_bdev->bd_disk->private_data;
++	struct mtd_blktrans_dev *dev = bdev->bd_disk->private_data;
+ 	struct mtd_blktrans_ops *tr = dev->tr;
+ 
+ 	switch (cmd) {
+@@ -217,7 +212,7 @@ static int blktrans_ioctl(struct inode *
+ 			if (ret)
+ 				return ret;
+ 
+-			g.start = get_start_sect(inode->i_bdev);
++			g.start = get_start_sect(bdev);
+ 			if (copy_to_user((void *)arg, &g, sizeof(g)))
+ 				return -EFAULT;
+ 			return 0;
+--- linux-2.6.0/drivers/net/3c501.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/net/3c501.c	2003-12-28 23:21:00.000000000 -0800
+@@ -136,17 +136,14 @@ static const char version[] =
+ 
+ #include "3c501.h"
+ 
+-/* A zero-terminated list of I/O addresses to be probed.
+-   The 3c501 can be at many locations, but here are the popular ones. */
+-static unsigned int netcard_portlist[] __initdata = { 
+-	0x280, 0x300, 0
+-};
+-
+-
+ /*
+  *	The boilerplate probe code.
+  */
+ 
++static int io=0x280;
++static int irq=5;
++static int mem_start;
++
+ /**
+  * el1_probe:		-	probe for a 3c501
+  * @dev: The device structure passed in to probe. 
+@@ -160,23 +157,47 @@ static unsigned int netcard_portlist[] _
+  * probe and failing to find anything.
+  */
+  
+-int __init el1_probe(struct net_device *dev)
++struct net_device * __init el1_probe(int unit)
+ {
+-	int i;
+-	int base_addr = dev->base_addr;
++	struct net_device *dev = alloc_etherdev(sizeof(struct net_local));
++	static unsigned ports[] = { 0x280, 0x300, 0};
++	unsigned *port;
++	int err = 0;
++
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	if (unit >= 0) {
++		sprintf(dev->name, "eth%d", unit);
++		netdev_boot_setup_check(dev);
++		io = dev->base_addr;
++		irq = dev->irq;
++		mem_start = dev->mem_start & 7;
++	}
+ 
+ 	SET_MODULE_OWNER(dev);
+ 
+-	if (base_addr > 0x1ff)	/* Check a single specified location. */
+-		return el1_probe1(dev, base_addr);
+-	else if (base_addr != 0)	/* Don't probe at all. */
+-		return -ENXIO;
+-
+-	for (i = 0; netcard_portlist[i]; i++)
+-		if (el1_probe1(dev, netcard_portlist[i]) == 0)
+-			return 0;
+-
+-	return -ENODEV;
++	if (io > 0x1ff) {	/* Check a single specified location. */
++		err = el1_probe1(dev, io);
++	} else if (io != 0) {
++		err = -ENXIO;		/* Don't probe at all. */
++	} else {
++		for (port = ports; *port && el1_probe1(dev, *port); port++)
++			;
++		if (!*port)
++			err = -ENODEV;
++	}
++	if (err)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	release_region(dev->base_addr, EL1_IO_EXTENT);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
+ /**
+@@ -240,6 +261,8 @@ static int __init el1_probe1(struct net_
+ 	 *	high.
+ 	 */
+ 
++	dev->irq = irq;
++
+ 	if (dev->irq < 2)
+ 	{
+ 		unsigned long irq_mask;
+@@ -267,8 +290,8 @@ static int __init el1_probe1(struct net_
+ 	dev->base_addr = ioaddr;
+ 	memcpy(dev->dev_addr, station_addr, ETH_ALEN);
+ 
+-	if (dev->mem_start & 0xf)
+-		el_debug = dev->mem_start & 0x7;
++	if (mem_start & 0xf)
++		el_debug = mem_start & 0x7;
+ 	if (autoirq)
+ 		dev->irq = autoirq;
+ 
+@@ -282,17 +305,7 @@ static int __init el1_probe1(struct net_
+ 	if (el_debug)
+ 		printk(KERN_DEBUG "%s", version);
+ 
+-	/*
+-	 *	Initialize the device structure.
+-	 */
+-
+-	dev->priv = kmalloc(sizeof(struct net_local), GFP_KERNEL);
+-	if (dev->priv == NULL) {
+-		release_region(ioaddr, EL1_IO_EXTENT);
+-		return -ENOMEM;
+-	}
+ 	memset(dev->priv, 0, sizeof(struct net_local));
+-
+ 	lp=dev->priv;
+ 	spin_lock_init(&lp->lock);
+ 	
+@@ -308,13 +321,6 @@ static int __init el1_probe1(struct net_
+ 	dev->get_stats = &el1_get_stats;
+ 	dev->set_multicast_list = &set_multicast_list;
+ 	dev->ethtool_ops = &netdev_ethtool_ops;
+-
+-	/*
+-	 *	Setup the generic properties
+-	 */
+-
+-	ether_setup(dev);
+-
+ 	return 0;
+ }
+ 
+@@ -884,14 +890,8 @@ static struct ethtool_ops netdev_ethtool
+ 
+ #ifdef MODULE
+ 
+-static struct net_device dev_3c501 = {
+-	.init		= el1_probe,
+-	.base_addr	= 0x280,
+-	.irq		= 5,
+-};
++static struct net_device *dev_3c501;
+ 
+-static int io=0x280;
+-static int irq=5;
+ MODULE_PARM(io, "i");
+ MODULE_PARM(irq, "i");
+ MODULE_PARM_DESC(io, "EtherLink I/O base address");
+@@ -911,10 +911,9 @@ MODULE_PARM_DESC(irq, "EtherLink IRQ num
+  
+ int init_module(void)
+ {
+-	dev_3c501.irq=irq;
+-	dev_3c501.base_addr=io;
+-	if (register_netdev(&dev_3c501) != 0)
+-		return -EIO;
++	dev_3c501 = el1_probe(-1);
++	if (IS_ERR(dev_3c501))
++		return PTR_ERR(dev_3c501);
+ 	return 0;
+ }
+ 
+@@ -927,19 +926,10 @@ int init_module(void)
+  
+ void cleanup_module(void)
+ {
+-	unregister_netdev(&dev_3c501);
+-
+-	/*
+-	 *	Free up the private structure, or leak memory :-)
+-	 */
+-
+-	kfree(dev_3c501.priv);
+-	dev_3c501.priv = NULL;	/* gets re-allocated by el1_probe1 */
+-
+-	/*
+-	 *	If we don't do this, we can't re-insmod it later.
+-	 */
+-	release_region(dev_3c501.base_addr, EL1_IO_EXTENT);
++	struct net_device *dev = dev_3c501;
++	unregister_netdev(dev);
++	release_region(dev->base_addr, EL1_IO_EXTENT);
++	free_netdev(dev);
+ }
+ 
+ #endif /* MODULE */
+--- linux-2.6.0/drivers/net/3c501.h	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/3c501.h	2003-12-28 23:21:00.000000000 -0800
+@@ -3,7 +3,6 @@
+  *	Index to functions.
+  */
+ 
+-int el1_probe(struct net_device *dev);
+ static int  el1_probe1(struct net_device *dev, int ioaddr);
+ static int  el_open(struct net_device *dev);
+ static void el_timeout(struct net_device *dev);
+--- linux-2.6.0/drivers/net/3c503.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/net/3c503.c	2003-12-28 23:21:00.000000000 -0800
+@@ -60,7 +60,6 @@ static const char version[] =
+ #include "3c503.h"
+ #define WRD_COUNT 4
+ 
+-int el2_probe(struct net_device *dev);
+ static int el2_pio_probe(struct net_device *dev);
+ static int el2_probe1(struct net_device *dev, int ioaddr);
+ 
+@@ -90,11 +89,11 @@ static struct ethtool_ops netdev_ethtool
+    If the ethercard isn't found there is an optional probe for
+    ethercard jumpered to programmed-I/O mode.
+    */
+-int __init 
+-el2_probe(struct net_device *dev)
++static int __init do_el2_probe(struct net_device *dev)
+ {
+     int *addr, addrs[] = { 0xddffe, 0xd9ffe, 0xcdffe, 0xc9ffe, 0};
+     int base_addr = dev->base_addr;
++    int irq = dev->irq;
+ 
+     SET_MODULE_OWNER(dev);
+     
+@@ -104,16 +103,13 @@ el2_probe(struct net_device *dev)
+ 	return -ENXIO;
+ 
+     for (addr = addrs; *addr; addr++) {
+-	int i;
+-	unsigned int base_bits = isa_readb(*addr);
+-	/* Find first set bit. */
+-	for(i = 7; i >= 0; i--, base_bits >>= 1)
+-	    if (base_bits & 0x1)
+-		break;
+-	if (base_bits != 1)
++	unsigned base_bits = isa_readb(*addr);
++	int i = ffs(base_bits) - 1;
++	if (i == -1 || base_bits != (1 << i))
+ 	    continue;
+ 	if (el2_probe1(dev, netcard_portlist[i]) == 0)
+ 	    return 0;
++	dev->irq = irq;
+     }
+ #if ! defined(no_probe_nonshared_memory)
+     return el2_pio_probe(dev);
+@@ -128,20 +124,54 @@ static int __init 
+ el2_pio_probe(struct net_device *dev)
+ {
+     int i;
+-    int base_addr = dev ? dev->base_addr : 0;
++    int base_addr = dev->base_addr;
++    int irq = dev->irq;
+ 
+     if (base_addr > 0x1ff)	/* Check a single specified location. */
+ 	return el2_probe1(dev, base_addr);
+     else if (base_addr != 0)	/* Don't probe at all. */
+ 	return -ENXIO;
+ 
+-    for (i = 0; netcard_portlist[i]; i++)
++    for (i = 0; netcard_portlist[i]; i++) {
+ 	if (el2_probe1(dev, netcard_portlist[i]) == 0)
+ 	    return 0;
++	dev->irq = irq;
++    }
+ 
+     return -ENODEV;
+ }
+ 
++static void cleanup_card(struct net_device *dev)
++{
++	/* NB: el2_close() handles free_irq */
++	release_region(dev->base_addr, EL2_IO_EXTENT);
++}
++
++struct net_device * __init el2_probe(int unit)
++{
++	struct net_device *dev = alloc_ei_netdev();
++	int err;
++
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	sprintf(dev->name, "eth%d", unit);
++	netdev_boot_setup_check(dev);
++
++	err = do_el2_probe(dev);
++	if (err)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	cleanup_card(dev);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
++}
++
+ /* Probe for the Etherlink II card at I/O port base IOADDR,
+    returning non-zero on success.  If found, set the station
+    address and memory parameters in DEVICE. */
+@@ -152,15 +182,19 @@ el2_probe1(struct net_device *dev, int i
+     static unsigned version_printed;
+     unsigned long vendor_id;
+ 
+-    /* FIXME: code reads ioaddr + 0x400, we request ioaddr + 16 */
+     if (!request_region(ioaddr, EL2_IO_EXTENT, dev->name))
+ 	return -EBUSY;
+ 
++    if (!request_region(ioaddr + 0x400, 8, dev->name)) {
++	retval = -EBUSY;
++	goto out;
++    }
++
+     /* Reset and/or avoid any lurking NE2000 */
+     if (inb(ioaddr + 0x408) == 0xff) {
+     	mdelay(1);
+ 	retval = -ENODEV;
+-	goto out;
++	goto out1;
+     }
+ 
+     /* We verify that it's a 3C503 board by checking the first three octets
+@@ -171,7 +205,7 @@ el2_probe1(struct net_device *dev, int i
+     if (   (iobase_reg  & (iobase_reg - 1))
+ 	|| (membase_reg & (membase_reg - 1))) {
+ 	retval = -ENODEV;
+-	goto out;
++	goto out1;
+     }
+     saved_406 = inb_p(ioaddr + 0x406);
+     outb_p(ECNTRL_RESET|ECNTRL_THIN, ioaddr + 0x406); /* Reset it... */
+@@ -184,19 +218,13 @@ el2_probe1(struct net_device *dev, int i
+ 	/* Restore the register we frobbed. */
+ 	outb(saved_406, ioaddr + 0x406);
+ 	retval = -ENODEV;
+-	goto out;
++	goto out1;
+     }
+ 
+     if (ei_debug  &&  version_printed++ == 0)
+ 	printk(version);
+ 
+     dev->base_addr = ioaddr;
+-    /* Allocate dev->priv and fill in 8390 specific dev fields. */
+-    if (ethdev_init(dev)) {
+-	printk ("3c503: unable to allocate memory for dev->priv.\n");
+-	retval = -ENOMEM;
+-	goto out;
+-    }
+ 
+     printk("%s: 3c503 at i/o base %#3x, node ", dev->name, ioaddr);
+ 
+@@ -322,7 +350,10 @@ el2_probe1(struct net_device *dev, int i
+ 	printk("\n%s: %s, %dkB RAM, using programmed I/O (REJUMPER for SHARED MEMORY).\n",
+ 	       dev->name, ei_status.name, (wordlength+1)<<3);
+     }
++    release_region(ioaddr + 0x400, 8);
+     return 0;
++out1:
++    release_region(ioaddr + 0x400, 8);
+ out:
+     release_region(ioaddr, EL2_IO_EXTENT);
+     return retval;
+@@ -633,7 +664,7 @@ static struct ethtool_ops netdev_ethtool
+ #ifdef MODULE
+ #define MAX_EL2_CARDS	4	/* Max number of EL2 cards per module */
+ 
+-static struct net_device dev_el2[MAX_EL2_CARDS];
++static struct net_device *dev_el2[MAX_EL2_CARDS];
+ static int io[MAX_EL2_CARDS];
+ static int irq[MAX_EL2_CARDS];
+ static int xcvr[MAX_EL2_CARDS];	/* choose int. or ext. xcvr */
+@@ -651,28 +682,34 @@ ISA device autoprobes on a running machi
+ int
+ init_module(void)
+ {
++	struct net_device *dev;
+ 	int this_dev, found = 0;
+ 
+ 	for (this_dev = 0; this_dev < MAX_EL2_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_el2[this_dev];
+-		dev->irq = irq[this_dev];
+-		dev->base_addr = io[this_dev];
+-		dev->mem_end = xcvr[this_dev];	/* low 4bits = xcvr sel. */
+-		dev->init = el2_probe;
+ 		if (io[this_dev] == 0)  {
+ 			if (this_dev != 0) break; /* only autoprobe 1st one */
+ 			printk(KERN_NOTICE "3c503.c: Presently autoprobing (not recommended) for a single card.\n");
+ 		}
+-		if (register_netdev(dev) != 0) {
+-			printk(KERN_WARNING "3c503.c: No 3c503 card found (i/o = 0x%x).\n", io[this_dev]);
+-			if (found != 0) {	/* Got at least one. */
+-				return 0;
++		dev = alloc_ei_netdev();
++		if (!dev)
++			break;
++		dev->irq = irq[this_dev];
++		dev->base_addr = io[this_dev];
++		dev->mem_end = xcvr[this_dev];	/* low 4bits = xcvr sel. */
++		if (do_el2_probe(dev) == 0) {
++			if (register_netdev(dev) == 0) {
++				dev_el2[found++] = dev;
++				continue;
+ 			}
+-			return -ENXIO;
++			cleanup_card(dev);
+ 		}
+-		found++;
++		free_netdev(dev);
++		printk(KERN_WARNING "3c503.c: No 3c503 card found (i/o = 0x%x).\n", io[this_dev]);
++		break;
+ 	}
+-	return 0;
++	if (found)
++		return 0;
++	return -ENXIO;
+ }
+ 
+ void
+@@ -681,13 +718,11 @@ cleanup_module(void)
+ 	int this_dev;
+ 
+ 	for (this_dev = 0; this_dev < MAX_EL2_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_el2[this_dev];
+-		if (dev->priv != NULL) {
+-			void *priv = dev->priv;
+-			/* NB: el2_close() handles free_irq */
+-			release_region(dev->base_addr, EL2_IO_EXTENT);
++		struct net_device *dev = dev_el2[this_dev];
++		if (dev) {
+ 			unregister_netdev(dev);
+-			kfree(priv);
++			cleanup_card(dev);
++			free_netdev(dev);
+ 		}
+ 	}
+ }
+--- linux-2.6.0/drivers/net/3c505.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/net/3c505.c	2003-12-28 23:21:00.000000000 -0800
+@@ -1293,42 +1293,6 @@ static void elp_set_mc_list(struct net_d
+ 	}
+ }
+ 
+-/******************************************************
+- *
+- * initialise Etherlink Plus board
+- *
+- ******************************************************/
+-
+-static inline void elp_init(struct net_device *dev)
+-{
+-	elp_device *adapter = dev->priv;
+-
+-	/*
+-	 * set ptrs to various functions
+-	 */
+-	dev->open = elp_open;				/* local */
+-	dev->stop = elp_close;				/* local */
+-	dev->get_stats = elp_get_stats;			/* local */
+-	dev->hard_start_xmit = elp_start_xmit;		/* local */
+-	dev->tx_timeout = elp_timeout;			/* local */
+-	dev->watchdog_timeo = 10*HZ;
+-	dev->set_multicast_list = elp_set_mc_list;	/* local */
+-	dev->ethtool_ops = &netdev_ethtool_ops;		/* local */
+-
+-	/* Setup the generic properties */
+-	ether_setup(dev);
+-
+-	/*
+-	 * setup ptr to adapter specific information
+-	 */
+-	memset(&(adapter->stats), 0, sizeof(struct net_device_stats));
+-
+-	/*
+-	 * memory information
+-	 */
+-	dev->mem_start = dev->mem_end = 0;
+-}
+-
+ /************************************************************
+  *
+  * A couple of tests to see if there's 3C505 or not
+@@ -1442,12 +1406,13 @@ static int __init elp_autodetect(struct 
+  * work at all if it was in a weird state).
+  */
+ 
+-int __init elplus_probe(struct net_device *dev)
++static int __init elplus_setup(struct net_device *dev)
+ {
+-	elp_device *adapter;
++	elp_device *adapter = dev->priv;
+ 	int i, tries, tries1, okay;
+ 	unsigned long timeout;
+ 	unsigned long cookie = 0;
++	int err = -ENODEV;
+ 
+ 	SET_MODULE_OWNER(dev);
+ 
+@@ -1456,17 +1421,8 @@ int __init elplus_probe(struct net_devic
+ 	 */
+ 
+ 	dev->base_addr = elp_autodetect(dev);
+-	if (!(dev->base_addr))
+-		return -ENODEV;
+-
+-	/*
+-	 * setup ptr to adapter specific information
+-	 */
+-	adapter = (elp_device *) (dev->priv = kmalloc(sizeof(elp_device), GFP_KERNEL));
+-	if (adapter == NULL) {
+-		printk(KERN_ERR "%s: out of memory\n", dev->name);
++	if (!dev->base_addr)
+ 		return -ENODEV;
+-	}
+ 
+ 	adapter->send_pcb_semaphore = 0;
+ 
+@@ -1544,8 +1500,7 @@ int __init elplus_probe(struct net_devic
+ 		outb_control(adapter->hcr_val & ~(FLSH | ATTN), dev);
+ 	}
+ 	printk(KERN_ERR "%s: failed to initialise 3c505\n", dev->name);
+-	release_region(dev->base_addr, ELP_IO_EXTENT);
+-	return -ENODEV;
++	goto out;
+ 
+       okay:
+ 	if (dev->irq) {		/* Is there a preset IRQ? */
+@@ -1560,14 +1515,14 @@ int __init elplus_probe(struct net_devic
+ 	case 0:
+ 		printk(KERN_ERR "%s: IRQ probe failed: check 3c505 jumpers.\n",
+ 		       dev->name);
+-		return -ENODEV;
++		goto out;
+ 	case 1:
+ 	case 6:
+ 	case 8:
+ 	case 13:
+ 		printk(KERN_ERR "%s: Impossible IRQ %d reported by probe_irq_off().\n",
+ 		       dev->name, dev->irq);
+-		return -ENODEV;
++		       goto out;
+ 	}
+ 	/*
+ 	 *  Now we have the IRQ number so we can disable the interrupts from
+@@ -1636,16 +1591,48 @@ int __init elplus_probe(struct net_devic
+ 		printk(KERN_ERR "%s: adapter configuration failed\n", dev->name);
+ 	}
+ 
+-	/*
+-	 * initialise the device
+-	 */
+-	elp_init(dev);
++	dev->open = elp_open;				/* local */
++	dev->stop = elp_close;				/* local */
++	dev->get_stats = elp_get_stats;			/* local */
++	dev->hard_start_xmit = elp_start_xmit;		/* local */
++	dev->tx_timeout = elp_timeout;			/* local */
++	dev->watchdog_timeo = 10*HZ;
++	dev->set_multicast_list = elp_set_mc_list;	/* local */
++	dev->ethtool_ops = &netdev_ethtool_ops;		/* local */
++
++	memset(&(adapter->stats), 0, sizeof(struct net_device_stats));
++	dev->mem_start = dev->mem_end = 0;
++
++	err = register_netdev(dev);
++	if (err)
++		goto out;
+ 
+ 	return 0;
++out:
++	release_region(dev->base_addr, ELP_IO_EXTENT);
++	return err;
++}
++
++struct net_device * __init elplus_probe(int unit)
++{
++	struct net_device *dev = alloc_etherdev(sizeof(elp_device));
++	int err;
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	sprintf(dev->name, "eth%d", unit);
++	netdev_boot_setup_check(dev);
++
++	err = elplus_setup(dev);
++	if (err) {
++		free_netdev(dev);
++		return ERR_PTR(err);
++	}
++	return dev;
+ }
+ 
+ #ifdef MODULE
+-static struct net_device dev_3c505[ELP_MAX_CARDS];
++static struct net_device *dev_3c505[ELP_MAX_CARDS];
+ static int io[ELP_MAX_CARDS];
+ static int irq[ELP_MAX_CARDS];
+ static int dma[ELP_MAX_CARDS];
+@@ -1661,10 +1648,12 @@ int init_module(void)
+ 	int this_dev, found = 0;
+ 
+ 	for (this_dev = 0; this_dev < ELP_MAX_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_3c505[this_dev];
++		struct net_device *dev = alloc_etherdev(sizeof(elp_device));
++		if (!dev)
++			break;
++
+ 		dev->irq = irq[this_dev];
+ 		dev->base_addr = io[this_dev];
+-		dev->init = elplus_probe;
+ 		if (dma[this_dev]) {
+ 			dev->dma = dma[this_dev];
+ 		} else {
+@@ -1672,16 +1661,22 @@ int init_module(void)
+ 			printk(KERN_WARNING "3c505.c: warning, using default DMA channel,\n");
+ 		}
+ 		if (io[this_dev] == 0) {
+-			if (this_dev) break;
++			if (this_dev) {
++				free_netdev(dev);
++				break;
++			}
+ 			printk(KERN_NOTICE "3c505.c: module autoprobe not recommended, give io=xx.\n");
+ 		}
+-		if (register_netdev(dev) != 0) {
++		if (elplus_setup(dev) != 0) {
+ 			printk(KERN_WARNING "3c505.c: Failed to register card at 0x%x.\n", io[this_dev]);
+-			if (found != 0) return 0;
+-			return -ENXIO;
++			free_netdev(dev);
++			break;
+ 		}
++		dev_3c505[this_dev] = dev;
+ 		found++;
+ 	}
++	if (!found)
++		return -ENODEV;
+ 	return 0;
+ }
+ 
+@@ -1690,12 +1685,11 @@ void cleanup_module(void)
+ 	int this_dev;
+ 
+ 	for (this_dev = 0; this_dev < ELP_MAX_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_3c505[this_dev];
+-		if (dev->priv != NULL) {
++		struct net_device *dev = dev_3c505[this_dev];
++		if (dev) {
+ 			unregister_netdev(dev);
+-			kfree(dev->priv);
+-			dev->priv = NULL;
+ 			release_region(dev->base_addr, ELP_IO_EXTENT);
++			free_netdev(dev);
+ 		}
+ 	}
+ }
+--- linux-2.6.0/drivers/net/3c507.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/3c507.c	2003-12-28 23:21:00.000000000 -0800
+@@ -74,10 +74,6 @@ static unsigned int net_debug = NET_DEBU
+ #define debug net_debug
+ 
+ 
+-/* A zero-terminated list of common I/O addresses to be probed. */
+-static unsigned int netcard_portlist[] __initdata =
+-	{ 0x300, 0x320, 0x340, 0x280, 0};
+-
+ /*
+   			Details of the i82586.
+ 
+@@ -286,8 +282,6 @@ static unsigned short init_words[] = {
+ 
+ /* Index to functions, as function prototypes. */
+ 
+-extern int el16_probe(struct net_device *dev);	/* Called from Space.c */
+-
+ static int	el16_probe1(struct net_device *dev, int ioaddr);
+ static int	el16_open(struct net_device *dev);
+ static int	el16_send_packet(struct sk_buff *skb, struct net_device *dev);
+@@ -301,6 +295,10 @@ static void hardware_send_packet(struct 
+ static void init_82586_mem(struct net_device *dev);
+ static struct ethtool_ops netdev_ethtool_ops;
+ 
++static int io = 0x300;
++static int irq;
++static int mem_start;
++
+ 
+ /* Check for a network adaptor of this type, and return '0' iff one exists.
+ 	If dev->base_addr == 0, probe all likely locations.
+@@ -309,23 +307,50 @@ static struct ethtool_ops netdev_ethtool
+ 	device and return success.
+ 	*/
+ 
+-int __init el16_probe(struct net_device *dev)
++struct net_device * __init el16_probe(int unit)
+ {
+-	int base_addr = dev->base_addr;
+-	int i;
++	struct net_device *dev = alloc_etherdev(sizeof(struct net_local));
++	static unsigned ports[] = { 0x300, 0x320, 0x340, 0x280, 0};
++	unsigned *port;
++	int err = -ENODEV;
++
++	if (!dev)
++		return ERR_PTR(-ENODEV);
++
++	if (unit >= 0) {
++		sprintf(dev->name, "eth%d", unit);
++		netdev_boot_setup_check(dev);
++		io = dev->base_addr;
++		irq = dev->irq;
++		mem_start = dev->mem_start & 15;
++	}
+ 
+ 	SET_MODULE_OWNER(dev);
+ 
+-	if (base_addr > 0x1ff)	/* Check a single specified location. */
+-		return el16_probe1(dev, base_addr);
+-	else if (base_addr != 0)
+-		return -ENXIO;		/* Don't probe at all. */
+-
+-	for (i = 0; netcard_portlist[i]; i++)
+-		if (el16_probe1(dev, netcard_portlist[i]) == 0)
+-			return 0;
++	if (io > 0x1ff) 	/* Check a single specified location. */
++		err = el16_probe1(dev, io);
++	else if (io != 0)
++		err = -ENXIO;		/* Don't probe at all. */
++	else {
++		for (port = ports; *port; port++) {
++			err = el16_probe1(dev, *port);
++			if (!err)
++				break;
++		}
++	}
+ 
+-	return -ENODEV;
++	if (err)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	free_irq(dev->irq, dev);
++	release_region(dev->base_addr, EL16_IO_EXTENT);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
+ static int __init el16_probe1(struct net_device *dev, int ioaddr)
+@@ -383,8 +408,8 @@ static int __init el16_probe1(struct net
+ 		printk(" %02x", dev->dev_addr[i]);
+ 	}
+ 
+-	if ((dev->mem_start & 0xf) > 0)
+-		net_debug = dev->mem_start & 7;
++	if (mem_start)
++		net_debug = mem_start & 7;
+ 
+ #ifdef MEM_BASE
+ 	dev->mem_start = MEM_BASE;
+@@ -416,27 +441,18 @@ static int __init el16_probe1(struct net
+ 	if (net_debug)
+ 		printk(version);
+ 
+-	/* Initialize the device structure. */
+-	lp = dev->priv = kmalloc(sizeof(struct net_local), GFP_KERNEL);
+-	if (dev->priv == NULL) {
+-		retval = -ENOMEM;
+-		goto out;
+-	}
+-	memset(dev->priv, 0, sizeof(struct net_local));
++	lp = dev->priv;
++ 	memset(lp, 0, sizeof(*lp));
+ 	spin_lock_init(&lp->lock);
+ 
+-	dev->open		= el16_open;
+-	dev->stop		= el16_close;
++ 	dev->open = el16_open;
++ 	dev->stop = el16_close;
+ 	dev->hard_start_xmit = el16_send_packet;
+ 	dev->get_stats	= el16_get_stats;
+ 	dev->tx_timeout = el16_tx_timeout;
+ 	dev->watchdog_timeo = TX_TIMEOUT;
+ 	dev->ethtool_ops = &netdev_ethtool_ops;
+-
+-	ether_setup(dev);	/* Generic ethernet behaviour */
+-
+-	dev->flags&=~IFF_MULTICAST;	/* Multicast doesn't work */
+-
++ 	dev->flags &= ~IFF_MULTICAST;	/* Multicast doesn't work */
+ 	return 0;
+ out:
+ 	release_region(ioaddr, EL16_IO_EXTENT);
+@@ -899,9 +915,7 @@ static struct ethtool_ops netdev_ethtool
+ };
+ 
+ #ifdef MODULE
+-static struct net_device dev_3c507;
+-static int io = 0x300;
+-static int irq;
++static struct net_device *dev_3c507;
+ MODULE_PARM(io, "i");
+ MODULE_PARM(irq, "i");
+ MODULE_PARM_DESC(io, "EtherLink16 I/O base address");
+@@ -911,26 +925,18 @@ int init_module(void)
+ {
+ 	if (io == 0)
+ 		printk("3c507: You should not use auto-probing with insmod!\n");
+-	dev_3c507.base_addr = io;
+-	dev_3c507.irq       = irq;
+-	dev_3c507.init	    = el16_probe;
+-	if (register_netdev(&dev_3c507) != 0) {
+-		printk("3c507: register_netdev() returned non-zero.\n");
+-		return -EIO;
+-	}
+-	return 0;
++	dev_3c507 = el16_probe(-1);
++	return IS_ERR(dev_3c507) ? PTR_ERR(dev_3c507) : 0;
+ }
+ 
+ void
+ cleanup_module(void)
+ {
+-	unregister_netdev(&dev_3c507);
+-	kfree(dev_3c507.priv);
+-	dev_3c507.priv = NULL;
+-
+-	/* If we don't do this, we can't re-insmod it later. */
+-	free_irq(dev_3c507.irq, &dev_3c507);
+-	release_region(dev_3c507.base_addr, EL16_IO_EXTENT);
++	struct net_device *dev = dev_3c507;
++	unregister_netdev(dev);
++	free_irq(dev->irq, dev);
++	release_region(dev->base_addr, EL16_IO_EXTENT);
++	free_netdev(dev);
+ }
+ #endif /* MODULE */
+ MODULE_LICENSE("GPL");
+--- linux-2.6.0/drivers/net/3c515.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/net/3c515.c	2003-12-28 23:21:00.000000000 -0800
+@@ -307,7 +307,8 @@ struct boom_tx_desc {
+ 
+ struct corkscrew_private {
+ 	const char *product_name;
+-	struct net_device *next_module;
++	struct list_head list;
++	struct net_device *our_dev;
+ 	/* The Rx and Tx rings are here to keep them quad-word-aligned. */
+ 	struct boom_rx_desc rx_ring[RX_RING_SIZE];
+ 	struct boom_tx_desc tx_ring[TX_RING_SIZE];
+@@ -329,6 +330,7 @@ struct corkscrew_private {
+ 		full_bus_master_tx:1, full_bus_master_rx:1,	/* Boomerang  */
+ 		tx_full:1;
+ 	spinlock_t lock;
++	struct device *dev;
+ };
+ 
+ /* The action to take with a media selection timer tick.
+@@ -367,17 +369,12 @@ static struct isapnp_device_id corkscrew
+ 
+ MODULE_DEVICE_TABLE(isapnp, corkscrew_isapnp_adapters);
+ 
+-static int corkscrew_isapnp_phys_addr[3];
+-
+ static int nopnp;
+ #endif /* __ISAPNP__ */
+ 
+-static int corkscrew_scan(struct net_device *dev);
+-static struct net_device *corkscrew_found_device(struct net_device *dev,
+-						 int ioaddr, int irq,
+-						 int product_index,
+-						 int options);
+-static int corkscrew_probe1(struct net_device *dev);
++static struct net_device *corkscrew_scan(int unit);
++static void corkscrew_setup(struct net_device *dev, int ioaddr,
++			    struct pnp_dev *idev, int card_number);
+ static int corkscrew_open(struct net_device *dev);
+ static void corkscrew_timer(unsigned long arg);
+ static int corkscrew_start_xmit(struct sk_buff *skb,
+@@ -413,47 +410,99 @@ static int options[MAX_UNITS] = { -1, -1
+ #ifdef MODULE
+ static int debug = -1;
+ /* A list of all installed Vortex devices, for removing the driver module. */
+-static struct net_device *root_corkscrew_dev;
++/* we will need locking (and refcounting) if we ever use it for more */
++static LIST_HEAD(root_corkscrew_dev);
+ 
+ int init_module(void)
+ {
+-	int cards_found;
+-
++	int found = 0;
+ 	if (debug >= 0)
+ 		corkscrew_debug = debug;
+ 	if (corkscrew_debug)
+ 		printk(version);
+-
+-	root_corkscrew_dev = NULL;
+-	cards_found = corkscrew_scan(NULL);
+-	return cards_found ? 0 : -ENODEV;
++	while (corkscrew_scan(-1))
++		found++;
++	return found ? 0 : -ENODEV;
+ }
+ 
+ #else
+-int tc515_probe(struct net_device *dev)
++struct net_device *tc515_probe(int unit)
+ {
+-	int cards_found = 0;
++	struct net_device *dev = corkscrew_scan(unit);
++	static int printed;
+ 
+-	SET_MODULE_OWNER(dev);
+-
+-	cards_found = corkscrew_scan(dev);
++	if (!dev)
++		return ERR_PTR(-ENODEV);
+ 
+-	if (corkscrew_debug > 0 && cards_found)
++	if (corkscrew_debug > 0 && !printed) {
++		printed = 1;
+ 		printk(version);
++	}
+ 
+-	return cards_found ? 0 : -ENODEV;
++	return dev;
+ }
+ #endif				/* not MODULE */
+ 
+-static int corkscrew_scan(struct net_device *dev)
++static int check_device(unsigned ioaddr)
++{
++	int timer;
++
++	if (!request_region(ioaddr, CORKSCREW_TOTAL_SIZE, "3c515"))
++		return 0;
++	/* Check the resource configuration for a matching ioaddr. */
++	if ((inw(ioaddr + 0x2002) & 0x1f0) != (ioaddr & 0x1f0)) {
++		release_region(ioaddr, CORKSCREW_TOTAL_SIZE);
++		return 0;
++	}
++	/* Verify by reading the device ID from the EEPROM. */
++	outw(EEPROM_Read + 7, ioaddr + Wn0EepromCmd);
++	/* Pause for at least 162 us. for the read to take place. */
++	for (timer = 4; timer >= 0; timer--) {
++		udelay(162);
++		if ((inw(ioaddr + Wn0EepromCmd) & 0x0200) == 0)
++			break;
++	}
++	if (inw(ioaddr + Wn0EepromData) != 0x6d50) {
++		release_region(ioaddr, CORKSCREW_TOTAL_SIZE);
++		return 0;
++	}
++	return 1;
++}
++
++static void cleanup_card(struct net_device *dev)
+ {
+-	int cards_found = 0;
++	struct corkscrew_private *vp = (struct corkscrew_private *) dev->priv;
++	list_del_init(&vp->list);
++	if (dev->dma)
++		free_dma(dev->dma);
++	outw(TotalReset, dev->base_addr + EL3_CMD);
++	release_region(dev->base_addr, CORKSCREW_TOTAL_SIZE);
++	if (vp->dev)
++		pnp_device_detach(to_pnp_dev(vp->dev));
++}
++
++static struct net_device *corkscrew_scan(int unit)
++{
++	struct net_device *dev;
++	static int cards_found = 0;
+ 	static int ioaddr;
++	int err;
+ #ifdef __ISAPNP__
+ 	short i;
+ 	static int pnp_cards;
+ #endif
+ 
++	dev = alloc_etherdev(sizeof(struct corkscrew_private));
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	if (unit >= 0) {
++		sprintf(dev->name, "eth%d", unit);
++		netdev_boot_setup_check(dev);
++	}
++
++	SET_MODULE_OWNER(dev);
++
+ #ifdef __ISAPNP__
+ 	if(nopnp == 1)
+ 		goto no_pnp;
+@@ -470,7 +519,7 @@ static int corkscrew_scan(struct net_dev
+ 			if (pnp_activate_dev(idev) < 0) {
+ 				printk("pnp activate failed (out of resources?)\n");
+ 				pnp_device_detach(idev);
+-				return -ENOMEM;
++				continue;
+ 			}
+ 			if (!pnp_port_valid(idev, 0) || !pnp_irq_valid(idev, 0)) {
+ 				pnp_device_detach(idev);
+@@ -478,40 +527,22 @@ static int corkscrew_scan(struct net_dev
+ 			}
+ 			ioaddr = pnp_port_start(idev, 0);
+ 			irq = pnp_irq(idev, 0);
+-			if(corkscrew_debug)
+-				printk ("ISAPNP reports %s at i/o 0x%x, irq %d\n",
+-					(char*) corkscrew_isapnp_adapters[i].driver_data, ioaddr, irq);
+-					
+-			if ((inw(ioaddr + 0x2002) & 0x1f0) != (ioaddr & 0x1f0)) {
++			if (!check_device(ioaddr)) {
+ 				pnp_device_detach(idev);
+ 				continue;
+ 			}
+-			/* Verify by reading the device ID from the EEPROM. */
+-			{
+-				int timer;
+-				outw(EEPROM_Read + 7, ioaddr + Wn0EepromCmd);
+-				/* Pause for at least 162 us. for the read to take place. */
+-				for (timer = 4; timer >= 0; timer--) {
+-					udelay(162);
+-					if ((inw(ioaddr + Wn0EepromCmd) & 0x0200)
+-				    		== 0)
+-							break;
+-				}
+-				if (inw(ioaddr + Wn0EepromData) != 0x6d50) {
+-					pnp_device_detach(idev);
+-					continue;
+-				}
+-			}
++			if(corkscrew_debug)
++				printk ("ISAPNP reports %s at i/o 0x%x, irq %d\n",
++					(char*) corkscrew_isapnp_adapters[i].driver_data, ioaddr, irq);
+ 			printk(KERN_INFO "3c515 Resource configuration register %#4.4x, DCR %4.4x.\n",
+ 		     		inl(ioaddr + 0x2002), inw(ioaddr + 0x2000));
+ 			/* irq = inw(ioaddr + 0x2002) & 15; */ /* Use the irq from isapnp */
+-			corkscrew_isapnp_phys_addr[pnp_cards] = ioaddr;
+-			corkscrew_found_device(dev, ioaddr, irq, CORKSCREW_ID, dev
+-				       	&& dev->mem_start ? dev->
+-				       	mem_start : options[cards_found]);
+-			dev = 0;
++			corkscrew_setup(dev, ioaddr, idev, cards_found++);
+ 			pnp_cards++;
+-			cards_found++;
++			err = register_netdev(dev);
++			if (!err)
++				return dev;
++			cleanup_card(dev);
+ 		}
+ 	}
+ no_pnp:
+@@ -519,122 +550,64 @@ no_pnp:
+ 
+ 	/* Check all locations on the ISA bus -- evil! */
+ 	for (ioaddr = 0x100; ioaddr < 0x400; ioaddr += 0x20) {
+-		int irq;
+-#ifdef __ISAPNP__
+-		/* Make sure this was not already picked up by isapnp */
+-		if(ioaddr == corkscrew_isapnp_phys_addr[0]) continue;
+-		if(ioaddr == corkscrew_isapnp_phys_addr[1]) continue;
+-		if(ioaddr == corkscrew_isapnp_phys_addr[2]) continue;
+-#endif /* __ISAPNP__ */
+-		if (check_region(ioaddr, CORKSCREW_TOTAL_SIZE))
++		if (!check_device(ioaddr))
+ 			continue;
+-		/* Check the resource configuration for a matching ioaddr. */
+-		if ((inw(ioaddr + 0x2002) & 0x1f0) != (ioaddr & 0x1f0))
+-			continue;
+-		/* Verify by reading the device ID from the EEPROM. */
+-		{
+-			int timer;
+-			outw(EEPROM_Read + 7, ioaddr + Wn0EepromCmd);
+-			/* Pause for at least 162 us. for the read to take place. */
+-			for (timer = 4; timer >= 0; timer--) {
+-				udelay(162);
+-				if ((inw(ioaddr + Wn0EepromCmd) & 0x0200)
+-				    == 0)
+-					break;
+-			}
+-			if (inw(ioaddr + Wn0EepromData) != 0x6d50)
+-				continue;
+-		}
++
+ 		printk(KERN_INFO "3c515 Resource configuration register %#4.4x, DCR %4.4x.\n",
+ 		     inl(ioaddr + 0x2002), inw(ioaddr + 0x2000));
+-		irq = inw(ioaddr + 0x2002) & 15;
+-		corkscrew_found_device(dev, ioaddr, irq, CORKSCREW_ID,
+-				       dev && dev->mem_start ?  dev->mem_start :
+-				         (cards_found >= MAX_UNITS ? -1 :
+-						options[cards_found]));
+-		dev = 0;
+-		cards_found++;
++		corkscrew_setup(dev, ioaddr, NULL, cards_found++);
++		err = register_netdev(dev);
++		if (!err)
++			return dev;
++		cleanup_card(dev);
+ 	}
+-	if (corkscrew_debug)
+-		printk(KERN_INFO "%d 3c515 cards found.\n", cards_found);
+-	return cards_found;
++	free_netdev(dev);
++	return NULL;
+ }
+ 
+-static struct net_device *corkscrew_found_device(struct net_device *dev,
+-						 int ioaddr, int irq,
+-						 int product_index,
+-						 int options)
++static void corkscrew_setup(struct net_device *dev, int ioaddr,
++			    struct pnp_dev *idev, int card_number)
+ {
+-	struct corkscrew_private *vp;
+-
+-#ifdef MODULE
+-	/* Allocate and fill new device structure. */
+-	int dev_size = sizeof(struct net_device) + sizeof(struct corkscrew_private) + 15;	/* Pad for alignment */
++	struct corkscrew_private *vp = (struct corkscrew_private *) dev->priv;
++	unsigned int eeprom[0x40], checksum = 0;	/* EEPROM contents */
++	int i;
++	int irq;
+ 
+-	dev = (struct net_device *) kmalloc(dev_size, GFP_KERNEL);
+-	if (!dev)
+-		return NULL;
+-	memset(dev, 0, dev_size);
+-	/* Align the Rx and Tx ring entries.  */
+-	dev->priv = (void *) (((long) dev + sizeof(struct net_device) + 15) & ~15);
+-	vp = (struct corkscrew_private *) dev->priv;
+-	dev->base_addr = ioaddr;
+-	dev->irq = irq;
+-	dev->dma = (product_index == CORKSCREW_ID ? inw(ioaddr + 0x2000) & 7 : 0);
+-	dev->init = corkscrew_probe1;
+-	vp->product_name = "3c515";
+-	vp->options = options;
+-	if (options >= 0) {
+-		vp->media_override = ((options & 7) == 2) ? 0 : options & 7;
+-		vp->full_duplex = (options & 8) ? 1 : 0;
+-		vp->bus_master = (options & 16) ? 1 : 0;
++	if (idev) {
++		irq = pnp_irq(idev, 0);
++		vp->dev = &idev->dev;
+ 	} else {
+-		vp->media_override = 7;
+-		vp->full_duplex = 0;
+-		vp->bus_master = 0;
++		irq = inw(ioaddr + 0x2002) & 15;
+ 	}
+-	ether_setup(dev);
+-	vp->next_module = root_corkscrew_dev;
+-	root_corkscrew_dev = dev;
+-	SET_MODULE_OWNER(dev);
+-	if (register_netdev(dev) != 0) {
+-		kfree(dev);
+-		return NULL;
+-	}
+-#else				/* not a MODULE */
+-	/* Caution: quad-word alignment required for rings! */
+-	dev->priv = kmalloc(sizeof(struct corkscrew_private), GFP_KERNEL);
+-	if (!dev->priv)
+-		return NULL;
+-	memset(dev->priv, 0, sizeof(struct corkscrew_private));
+-	dev = init_etherdev(dev, sizeof(struct corkscrew_private));
++
+ 	dev->base_addr = ioaddr;
+ 	dev->irq = irq;
+-	dev->dma = (product_index == CORKSCREW_ID ? inw(ioaddr + 0x2000) & 7 : 0);
+-	vp = (struct corkscrew_private *) dev->priv;
++	dev->dma = inw(ioaddr + 0x2000) & 7;
+ 	vp->product_name = "3c515";
+-	vp->options = options;
+-	if (options >= 0) {
+-		vp->media_override = ((options & 7) == 2) ? 0 : options & 7;
+-		vp->full_duplex = (options & 8) ? 1 : 0;
+-		vp->bus_master = (options & 16) ? 1 : 0;
++	vp->options = dev->mem_start;
++	vp->our_dev = dev;
++
++	if (!vp->options) {
++		 if (card_number >= MAX_UNITS)
++			vp->options = -1;
++		else
++			vp->options = options[card_number];
++	}
++
++	if (vp->options >= 0) {
++		vp->media_override = vp->options & 7;
++		if (vp->media_override == 2)
++			vp->media_override = 0;
++		vp->full_duplex = (vp->options & 8) ? 1 : 0;
++		vp->bus_master = (vp->options & 16) ? 1 : 0;
+ 	} else {
+ 		vp->media_override = 7;
+ 		vp->full_duplex = 0;
+ 		vp->bus_master = 0;
+ 	}
+-
+-	corkscrew_probe1(dev);
+-#endif				/* MODULE */
+-	return dev;
+-}
+-
+-static int corkscrew_probe1(struct net_device *dev)
+-{
+-	int ioaddr = dev->base_addr;
+-	struct corkscrew_private *vp = (struct corkscrew_private *) dev->priv;
+-	unsigned int eeprom[0x40], checksum = 0;	/* EEPROM contents */
+-	int i;
++#ifdef MODULE
++	list_add(&vp->list, &root_corkscrew_dev);
++#endif
+ 
+ 	printk(KERN_INFO "%s: 3Com %s at %#3x,", dev->name, vp->product_name, ioaddr);
+ 
+@@ -706,9 +679,6 @@ static int corkscrew_probe1(struct net_d
+ 	/* vp->full_bus_master_rx = 0; */
+ 	vp->full_bus_master_rx = (vp->capabilities & 0x20) ? 1 : 0;
+ 
+-	/* We do a request_region() to register /proc/ioports info. */
+-	request_region(ioaddr, CORKSCREW_TOTAL_SIZE, vp->product_name);
+-
+ 	/* The 3c51x-specific entries in the device structure. */
+ 	dev->open = &corkscrew_open;
+ 	dev->hard_start_xmit = &corkscrew_start_xmit;
+@@ -718,8 +688,6 @@ static int corkscrew_probe1(struct net_d
+ 	dev->get_stats = &corkscrew_get_stats;
+ 	dev->set_multicast_list = &set_rx_mode;
+ 	dev->ethtool_ops = &netdev_ethtool_ops;
+-
+-	return 0;
+ }
+ 
+ 
+@@ -1607,20 +1575,16 @@ static struct ethtool_ops netdev_ethtool
+ #ifdef MODULE
+ void cleanup_module(void)
+ {
+-	struct net_device *next_dev;
+-
+-	while (root_corkscrew_dev) {
+-		next_dev =
+-		    ((struct corkscrew_private *) root_corkscrew_dev->
+-		     priv)->next_module;
+-		if (root_corkscrew_dev->dma)
+-			free_dma(root_corkscrew_dev->dma);
+-		unregister_netdev(root_corkscrew_dev);
+-		outw(TotalReset, root_corkscrew_dev->base_addr + EL3_CMD);
+-		release_region(root_corkscrew_dev->base_addr,
+-			       CORKSCREW_TOTAL_SIZE);
+-		free_netdev(root_corkscrew_dev);
+-		root_corkscrew_dev = next_dev;
++	while (!list_empty(&root_corkscrew_dev)) {
++		struct net_device *dev;
++		struct corkscrew_private *vp;
++
++		vp = list_entry(root_corkscrew_dev.next,
++				struct corkscrew_private, list);
++		dev = vp->our_dev;
++		unregister_netdev(dev);
++		cleanup_card(dev);
++		free_netdev(dev);
+ 	}
+ }
+ #endif				/* MODULE */
+--- linux-2.6.0/drivers/net/3c523.c	2003-10-08 15:07:09.000000000 -0700
++++ 25/drivers/net/3c523.c	2003-12-28 23:21:00.000000000 -0800
+@@ -410,7 +410,7 @@ static int elmc_getinfo(char *buf, int s
+ 
+ /*****************************************************************/
+ 
+-int __init elmc_probe(struct net_device *dev)
++static int __init do_elmc_probe(struct net_device *dev)
+ {
+ 	static int slot;
+ 	int base_addr = dev->base_addr;
+@@ -420,7 +420,7 @@ int __init elmc_probe(struct net_device 
+ 	int i = 0;
+ 	unsigned int size = 0;
+ 	int retval;
+-	struct priv *pr;
++	struct priv *pr = dev->priv;
+ 
+ 	SET_MODULE_OWNER(dev);
+ 	if (MCA_bus == 0) {
+@@ -455,10 +455,9 @@ int __init elmc_probe(struct net_device 
+ 	}
+ 
+ 	/* we didn't find any 3c523 in the slots we checked for */
+-	if (slot == MCA_NOTFOUND) {
+-		retval = ((base_addr || irq) ? -ENXIO : -ENODEV);
+-		goto err_out;
+-	}
++	if (slot == MCA_NOTFOUND)
++		return ((base_addr || irq) ? -ENXIO : -ENODEV);
++
+ 	mca_set_adapter_name(slot, "3Com 3c523 Etherlink/MC");
+ 	mca_set_adapter_procfn(slot, (MCA_ProcFn) elmc_getinfo, dev);
+ 
+@@ -497,13 +496,7 @@ int __init elmc_probe(struct net_device 
+ 		break;
+ 	}
+ 
+-	pr = dev->priv = kmalloc(sizeof(struct priv), GFP_KERNEL);
+-	if (dev->priv == NULL) {
+-		retval = -ENOMEM;
+-		goto err_out;
+-	}
+ 	memset(pr, 0, sizeof(struct priv));
+-
+ 	pr->slot = slot;
+ 
+ 	printk(KERN_INFO "%s: 3Com 3c523 Rev 0x%x at %#lx\n", dev->name, (int) revision,
+@@ -530,8 +523,6 @@ int __init elmc_probe(struct net_device 
+ 	if (!check586(dev, dev->mem_start, size)) {
+ 		printk(KERN_ERR "%s: memprobe, Can't find memory at 0x%lx!\n", dev->name,
+ 		       dev->mem_start);
+-		kfree(dev->priv);
+-		dev->priv = NULL;
+ 		retval = -ENODEV;
+ 		goto err_out;
+ 	}
+@@ -573,8 +564,6 @@ int __init elmc_probe(struct net_device 
+ #endif
+ 	dev->ethtool_ops = &netdev_ethtool_ops;
+ 	
+-	ether_setup(dev);
+-
+ 	/* note that we haven't actually requested the IRQ from the kernel.
+ 	   That gets done in elmc_open().  I'm not sure that's such a good idea,
+ 	   but it works, so I'll go with it. */
+@@ -585,9 +574,41 @@ int __init elmc_probe(struct net_device 
+ 
+ 	return 0;
+ err_out:
++	mca_set_adapter_procfn(slot, NULL, NULL);
+ 	release_region(dev->base_addr, ELMC_IO_EXTENT);
+ 	return retval;
+ }
++ 
++static void cleanup_card(struct net_device *dev)
++{
++	mca_set_adapter_procfn(((struct priv *) (dev->priv))->slot, NULL, NULL);
++	release_region(dev->base_addr, ELMC_IO_EXTENT);
++}
++
++struct net_device * __init elmc_probe(int unit)
++{
++	struct net_device *dev = alloc_etherdev(sizeof(struct priv));
++	int err;
++
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	sprintf(dev->name, "eth%d", unit);
++	netdev_boot_setup_check(dev);
++
++	err = do_elmc_probe(dev);
++	if (err)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	cleanup_card(dev);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
++}
+ 
+ /**********************************************
+  * init the chip (elmc-interrupt should be disabled?!)
+@@ -1245,7 +1266,7 @@ static struct ethtool_ops netdev_ethtool
+ /* Increase if needed ;) */
+ #define MAX_3C523_CARDS 4
+ 
+-static struct net_device dev_elmc[MAX_3C523_CARDS];
++static struct net_device *dev_elmc[MAX_3C523_CARDS];
+ static int irq[MAX_3C523_CARDS];
+ static int io[MAX_3C523_CARDS];
+ MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_3C523_CARDS) "i");
+@@ -1258,16 +1279,24 @@ int init_module(void)
+ 	int this_dev,found = 0;
+ 
+ 	/* Loop until we either can't find any more cards, or we have MAX_3C523_CARDS */	
+-	for(this_dev=0; this_dev<MAX_3C523_CARDS; this_dev++) 
+-		{
+-		struct net_device *dev = &dev_elmc[this_dev];
++	for(this_dev=0; this_dev<MAX_3C523_CARDS; this_dev++) {
++		struct net_device *dev = alloc_etherdev(sizeof(struct priv));
++		if (!dev)
++			break;
+ 		dev->irq=irq[this_dev];
+ 		dev->base_addr=io[this_dev];
+-		dev->init=elmc_probe;
+-		if(register_netdev(dev)!=0) {
+-			if(io[this_dev]==0) break;
+-			printk(KERN_WARNING "3c523.c: No 3c523 card found at io=%#x\n",io[this_dev]);
+-		} else found++;
++		if (do_elmc_probe(dev) == 0) {
++			if (register_netdev(dev) == 0) {
++				dev_elmc[this_dev] = dev;
++				found++;
++				continue;
++			}
++			cleanup_card(dev);
++		}
++		free_netdev(dev);
++		if (io[this_dev]==0)
++			break;
++		printk(KERN_WARNING "3c523.c: No 3c523 card found at io=%#x\n",io[this_dev]);
+ 	}
+ 
+ 	if(found==0) {
+@@ -1279,31 +1308,12 @@ int init_module(void)
+ void cleanup_module(void)
+ {
+ 	int this_dev;
+-	for(this_dev=0; this_dev<MAX_3C523_CARDS; this_dev++) {
+-
+-		struct net_device *dev = &dev_elmc[this_dev];
+-		if(dev->priv) {
+-			/* shutdown interrupts on the card */
+-			elmc_id_reset586();
+-			if (dev->irq != 0) {
+-				/* this should be done by close, but if we failed to
+-				   initialize properly something may have gotten hosed. */
+-				free_irq(dev->irq, dev);
+-				dev->irq = 0;
+-			}
+-			if (dev->base_addr != 0) {
+-				release_region(dev->base_addr, ELMC_IO_EXTENT);
+-				dev->base_addr = 0;
+-			}
+-			irq[this_dev] = 0;
+-			io[this_dev] = 0;
++	for (this_dev=0; this_dev<MAX_3C523_CARDS; this_dev++) {
++		struct net_device *dev = dev_elmc[this_dev];
++		if (dev) {
+ 			unregister_netdev(dev);
+-
+-			mca_set_adapter_procfn(((struct priv *) (dev->priv))->slot,
+-			       NULL, NULL);
+-
+-			kfree(dev->priv);
+-			dev->priv = NULL;
++			cleanup_card(dev);
++			free_netdev(dev);
+ 		}
+ 	}
+ }
+--- linux-2.6.0/drivers/net/3c527.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/net/3c527.c	2003-12-28 23:21:00.000000000 -0800
+@@ -1,9 +1,10 @@
+-/* 3c527.c: 3Com Etherlink/MC32 driver for Linux 2.4
++/* 3c527.c: 3Com Etherlink/MC32 driver for Linux 2.4 and 2.6.
+  *
+  *	(c) Copyright 1998 Red Hat Software Inc
+  *	Written by Alan Cox. 
+  *	Further debugging by Carl Drougge.
+- *      Modified by Richard Procter (rnp@netlink.co.nz)
++ *      Initial SMP support by Felipe W Damasio <felipewd@terra.com.br>
++ *      Heavily modified by Richard Procter <rnp@paradise.net.nz>
+  *
+  *	Based on skeleton.c written 1993-94 by Donald Becker and ne2.c
+  *	(for the MCA stuff) written by Wim Dumon.
+@@ -17,11 +18,11 @@
+  */
+ 
+ #define DRV_NAME		"3c527"
+-#define DRV_VERSION		"0.6a"
+-#define DRV_RELDATE		"2001/11/17"
++#define DRV_VERSION		"0.7-SMP"
++#define DRV_RELDATE		"2003/09/21"
+ 
+ static const char *version =
+-DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " Richard Proctor (rnp@netlink.co.nz)\n";
++DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " Richard Procter <rnp@paradise.net.nz>\n";
+ 
+ /**
+  * DOC: Traps for the unwary
+@@ -100,7 +101,9 @@ DRV_NAME ".c:v" DRV_VERSION " " DRV_RELD
+ #include <linux/string.h>
+ #include <linux/wait.h>
+ #include <linux/ethtool.h>
++#include <linux/completion.h>
+ 
++#include <asm/semaphore.h>
+ #include <asm/uaccess.h>
+ #include <asm/system.h>
+ #include <asm/bitops.h>
+@@ -143,19 +146,19 @@ static unsigned int mc32_debug = NET_DEB
+ static const int WORKAROUND_82586=1;
+ 
+ /* Pointers to buffers and their on-card records */
+-
+ struct mc32_ring_desc 
+ {
+ 	volatile struct skb_header *p;                    
+ 	struct sk_buff *skb;          
+ };
+ 
+-
+ /* Information that needs to be kept for each board. */
+ struct mc32_local 
+ {
+-	struct net_device_stats net_stats;
+ 	int slot;
++
++	u32 base;
++	struct net_device_stats net_stats;
+ 	volatile struct mc32_mailbox *rx_box;
+ 	volatile struct mc32_mailbox *tx_box;
+ 	volatile struct mc32_mailbox *exec_box;
+@@ -165,22 +168,23 @@ struct mc32_local 
+         u16 tx_len;             /* Transmit list count */ 
+         u16 rx_len;             /* Receive list count */
+ 
+-	u32 base;
+-	u16 exec_pending;
+-	u16 mc_reload_wait;	/* a multicast load request is pending */
++	u16 xceiver_desired_state; /* HALTED or RUNNING */
++	u16 cmd_nonblocking;    /* Thread is uninterested in command result */
++	u16 mc_reload_wait;	/* A multicast load request is pending */
+ 	u32 mc_list_valid;	/* True when the mclist is set */
+-	u16 xceiver_state;      /* Current transceiver state. bitmapped */ 
+-	u16 desired_state;      /* The state we want the transceiver to be in */ 
+-	atomic_t tx_count;	/* buffers left */
+-	wait_queue_head_t event;
+ 
+ 	struct mc32_ring_desc tx_ring[TX_RING_LEN];	/* Host Transmit ring */
+ 	struct mc32_ring_desc rx_ring[RX_RING_LEN];	/* Host Receive ring */
+ 
++	atomic_t tx_count;	/* buffers left */
++	atomic_t tx_ring_head;  /* index to tx en-queue end */
+ 	u16 tx_ring_tail;       /* index to tx de-queue end */
+-	u16 tx_ring_head;       /* index to tx en-queue end */
+ 
+ 	u16 rx_ring_tail;       /* index to rx de-queue end */ 
++
++	struct semaphore cmd_mutex;    /* Serialises issuing of execute commands */
++        struct completion execution_cmd; /* Card has completed an execute command */
++	struct completion xceiver_cmd;   /* Card has completed a tx or rx command */
+ };
+ 
+ /* The station (ethernet) address prefix, used for a sanity check. */
+@@ -208,8 +212,6 @@ static inline u16 next_tx(u16 tx) { retu
+ 
+ 
+ /* Index to functions, as function prototypes. */
+-extern int mc32_probe(struct net_device *dev);
+-
+ static int	mc32_probe1(struct net_device *dev, int ioaddr);
+ static int      mc32_command(struct net_device *dev, u16 cmd, void *data, int len);
+ static int	mc32_open(struct net_device *dev);
+@@ -222,9 +224,19 @@ static void	mc32_set_multicast_list(stru
+ static void	mc32_reset_multicast_list(struct net_device *dev);
+ static struct ethtool_ops netdev_ethtool_ops;
+ 
++static void cleanup_card(struct net_device *dev)
++{
++	struct mc32_local *lp=dev->priv;
++	unsigned slot = lp->slot;
++	mca_mark_as_unused(slot);
++	mca_set_adapter_name(slot, NULL);
++	free_irq(dev->irq, dev);
++	release_region(dev->base_addr, MC32_IO_EXTENT);
++}
++
+ /**
+  * mc32_probe 	-	Search for supported boards
+- * @dev: device to probe
++ * @unit: interface number to use
+  *
+  * Because MCA bus is a real bus and we can scan for cards we could do a
+  * single scan for all boards here. Right now we use the passed in device
+@@ -232,11 +244,18 @@ static struct ethtool_ops netdev_ethtool
+  * in particular.
+  */
+ 
+-int __init mc32_probe(struct net_device *dev)
++struct net_device *__init mc32_probe(int unit)
+ {
++	struct net_device *dev = alloc_etherdev(sizeof(struct mc32_local));
+ 	static int current_mca_slot = -1;
+ 	int i;
+-	int adapter_found = 0;
++	int err;
++
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	if (unit >= 0)
++		sprintf(dev->name, "eth%d", unit);
+ 
+ 	SET_MODULE_OWNER(dev);
+ 
+@@ -247,22 +266,28 @@ int __init mc32_probe(struct net_device 
+ 	   Autodetecting MCA cards is extremely simple. 
+ 	   Just search for the card. */
+ 
+-	for(i = 0; (mc32_adapters[i].name != NULL) && !adapter_found; i++) {
++	for(i = 0; (mc32_adapters[i].name != NULL); i++) {
+ 		current_mca_slot = 
+ 			mca_find_unused_adapter(mc32_adapters[i].id, 0);
+ 
+-		if((current_mca_slot != MCA_NOTFOUND) && !adapter_found) {
++		if(current_mca_slot != MCA_NOTFOUND) {
+ 			if(!mc32_probe1(dev, current_mca_slot))
+ 			{
+ 				mca_set_adapter_name(current_mca_slot, 
+ 						mc32_adapters[i].name);
+ 				mca_mark_as_used(current_mca_slot);
+-				return 0;
++				err = register_netdev(dev);
++				if (err) {
++					cleanup_card(dev);
++					free_netdev(dev);
++					dev = ERR_PTR(err);
++				}
++				return dev;
+ 			}
+ 			
+ 		}
+ 	}
+-	return -ENODEV;
++	return ERR_PTR(-ENODEV);
+ }
+ 
+ /**
+@@ -282,7 +307,7 @@ static int __init mc32_probe1(struct net
+ 	int i, err;
+ 	u8 POS;
+ 	u32 base;
+-	struct mc32_local *lp;
++	struct mc32_local *lp = dev->priv;
+ 	static u16 mca_io_bases[]={
+ 		0x7280,0x7290,
+ 		0x7680,0x7690,
+@@ -409,24 +434,14 @@ static int __init mc32_probe1(struct net
+ 	 *	Grab the IRQ
+ 	 */
+ 
+-	i = request_irq(dev->irq, &mc32_interrupt, SA_SHIRQ, dev->name, dev);
+-	if (i) {
++	err = request_irq(dev->irq, &mc32_interrupt, SA_SHIRQ | SA_SAMPLE_RANDOM, dev->name, dev);
++	if (err) {
+ 		release_region(dev->base_addr, MC32_IO_EXTENT);
+ 		printk(KERN_ERR "%s: unable to get IRQ %d.\n", dev->name, dev->irq);
+-		return i;
++		goto err_exit_ports; 
+ 	}
+ 
+-
+-	/* Initialize the device structure. */
+-	dev->priv = kmalloc(sizeof(struct mc32_local), GFP_KERNEL);
+-	if (dev->priv == NULL)
+-	{
+-		err = -ENOMEM;
+-		goto err_exit_irq; 
+-	}
+-
+-	memset(dev->priv, 0, sizeof(struct mc32_local));
+-	lp = dev->priv;
++	memset(lp, 0, sizeof(struct mc32_local));
+ 	lp->slot = slot;
+ 
+ 	i=0;
+@@ -440,7 +455,7 @@ static int __init mc32_probe1(struct net
+ 		{
+ 			printk(KERN_ERR "%s: failed to boot adapter.\n", dev->name);
+ 			err = -ENODEV; 
+-			goto err_exit_free;
++			goto err_exit_irq;
+ 		}
+ 		udelay(1000);
+ 		if(inb(dev->base_addr+2)&(1<<5))
+@@ -455,7 +470,7 @@ static int __init mc32_probe1(struct net
+ 		else
+ 			printk(KERN_ERR "%s: unknown failure %d.\n", dev->name, base);
+ 		err = -ENODEV; 
+-		goto err_exit_free;
++		goto err_exit_irq;
+ 	}
+ 	
+ 	base=0;
+@@ -471,7 +486,7 @@ static int __init mc32_probe1(struct net
+ 			{
+ 				printk(KERN_ERR "%s: mailbox read fail (%d).\n", dev->name, i);
+ 				err = -ENODEV;
+-				goto err_exit_free;
++				goto err_exit_irq;
+ 			}
+ 		}
+ 
+@@ -498,7 +513,9 @@ static int __init mc32_probe1(struct net
+ 	lp->tx_len 		= lp->exec_box->data[9];   /* Transmit list count */ 
+ 	lp->rx_len 		= lp->exec_box->data[11];  /* Receive list count */
+ 
+-	init_waitqueue_head(&lp->event);
++	init_MUTEX_LOCKED(&lp->cmd_mutex);
++	init_completion(&lp->execution_cmd);
++	init_completion(&lp->xceiver_cmd);
+ 	
+ 	printk("%s: Firmware Rev %d. %d RX buffers, %d TX buffers. Base of 0x%08X.\n",
+ 		dev->name, lp->exec_box->data[12], lp->rx_len, lp->tx_len, lp->base);
+@@ -511,20 +528,12 @@ static int __init mc32_probe1(struct net
+ 	dev->tx_timeout		= mc32_timeout;
+ 	dev->watchdog_timeo	= HZ*5;	/* Board does all the work */
+ 	dev->ethtool_ops	= &netdev_ethtool_ops;
+-	
+-	lp->xceiver_state = HALTED; 
+-	
+-	lp->tx_ring_tail=lp->tx_ring_head=0;
+ 
+-	/* Fill in the fields of the device structure with ethernet values. */
+-	ether_setup(dev);
+-	
+ 	return 0;
+ 
+-err_exit_free:
+-	kfree(dev->priv);
+ err_exit_irq:
+ 	free_irq(dev->irq, dev);
++err_exit_ports:
+ 	release_region(dev->base_addr, MC32_IO_EXTENT);
+ 	return err;
+ }
+@@ -539,7 +548,7 @@ err_exit_irq:
+  *	status of any pending commands and takes very little time at all.
+  */
+  
+-static void mc32_ready_poll(struct net_device *dev)
++static inline void mc32_ready_poll(struct net_device *dev)
+ {
+ 	int ioaddr = dev->base_addr;
+ 	while(!(inb(ioaddr+HOST_STATUS)&HOST_STATUS_CRR));
+@@ -554,31 +563,38 @@ static void mc32_ready_poll(struct net_d
+  *	@len: Length of the data block
+  *
+  *	Send a command from interrupt state. If there is a command
+- *	currently being executed then we return an error of -1. It simply
+- *	isn't viable to wait around as commands may be slow. Providing we
+- *	get in, we busy wait for the board to become ready to accept the
+- *	command and issue it. We do not wait for the command to complete
+- *	--- the card will interrupt us when it's done.
++ *	currently being executed then we return an error of -1. It
++ *	simply isn't viable to wait around as commands may be
++ *	slow. This can theoretically be starved on SMP, but it's hard
++ *	to see a realistic situation.  We do not wait for the command
++ *	to complete --- we rely on the interrupt handler to tidy up
++ *	after us.
+  */
+ 
+ static int mc32_command_nowait(struct net_device *dev, u16 cmd, void *data, int len)
+ {
+ 	struct mc32_local *lp = (struct mc32_local *)dev->priv;
+ 	int ioaddr = dev->base_addr;
++	int ret = -1;
+ 
+-	if(lp->exec_pending)
+-		return -1;
+-	
+-	lp->exec_pending=3;
+-	lp->exec_box->mbox=0;
+-	lp->exec_box->mbox=cmd;
+-	memcpy((void *)lp->exec_box->data, data, len);
+-	barrier();	/* the memcpy forgot the volatile so be sure */
++	if (down_trylock(&lp->cmd_mutex) == 0)
++	{
++		lp->cmd_nonblocking=1;
++		lp->exec_box->mbox=0;
++		lp->exec_box->mbox=cmd;
++		memcpy((void *)lp->exec_box->data, data, len);
++		barrier();	/* the memcpy forgot the volatile so be sure */
++
++		/* Send the command */
++		mc32_ready_poll(dev);
++		outb(1<<6, ioaddr+HOST_CMD);
+ 
+-	/* Send the command */
+-	while(!(inb(ioaddr+HOST_STATUS)&HOST_STATUS_CRR));
+-	outb(1<<6, ioaddr+HOST_CMD);	
+-	return 0;
++		ret = 0;
++
++		/* Interrupt handler will signal mutex on completion */
++	}
++
++	return ret;
+ }
+ 
+ 
+@@ -592,76 +608,47 @@ static int mc32_command_nowait(struct ne
+  *	Sends exec commands in a user context. This permits us to wait around
+  *	for the replies and also to wait for the command buffer to complete
+  *	from a previous command before we execute our command. After our 
+- *	command completes we will complete any pending multicast reload
++ *	command completes we will attempt any pending multicast reload
+  *	we blocked off by hogging the exec buffer.
+  *
+  *	You feed the card a command, you wait, it interrupts you get a 
+  *	reply. All well and good. The complication arises because you use
+  *	commands for filter list changes which come in at bh level from things
+  *	like IPV6 group stuff.
+- *
+- *	We have a simple state machine
+- *
+- *	0	- nothing issued
+- *
+- *	1	- command issued, wait reply
+- *
+- *	2	- reply waiting - reader then goes to state 0
+- *
+- *	3	- command issued, trash reply. In which case the irq
+- *		  takes it back to state 0
+- *
+  */
+   
+ static int mc32_command(struct net_device *dev, u16 cmd, void *data, int len)
+ {
+ 	struct mc32_local *lp = (struct mc32_local *)dev->priv;
+ 	int ioaddr = dev->base_addr;
+-	unsigned long flags;
+ 	int ret = 0;
+ 	
++	down(&lp->cmd_mutex);
++
+ 	/*
+-	 *	Wait for a command
+-	 */
+-	 
+-	save_flags(flags);
+-	cli();
+-	 
+-	while(lp->exec_pending)
+-		sleep_on(&lp->event);
+-		
+-	/*
+-	 *	Issue mine
++	 *     My Turn
+ 	 */
+ 
+-	lp->exec_pending=1;
+-	
+-	restore_flags(flags);
+-	
++	lp->cmd_nonblocking=0;
+ 	lp->exec_box->mbox=0;
+ 	lp->exec_box->mbox=cmd;
+ 	memcpy((void *)lp->exec_box->data, data, len);
+ 	barrier();	/* the memcpy forgot the volatile so be sure */
+ 
+-	/* Send the command */
+-	while(!(inb(ioaddr+HOST_STATUS)&HOST_STATUS_CRR));
+-	outb(1<<6, ioaddr+HOST_CMD);	
++	mc32_ready_poll(dev);
++	outb(1<<6, ioaddr+HOST_CMD);
+ 
+-	save_flags(flags);
+-	cli();
+-
+-	while(lp->exec_pending!=2)
+-		sleep_on(&lp->event);
+-	lp->exec_pending=0;
+-	restore_flags(flags);
++	wait_for_completion(&lp->execution_cmd);
+ 	
+ 	if(lp->exec_box->mbox&(1<<13))
+ 		ret = -1;
+ 
++	up(&lp->cmd_mutex);
++
+ 	/*
+-	 *	A multicast set got blocked - do it now
+-	 */
+-		
++	 *	A multicast set got blocked - try it now
++         */
++
+ 	if(lp->mc_reload_wait)
+ 	{
+ 		mc32_reset_multicast_list(dev);
+@@ -678,11 +665,9 @@ static int mc32_command(struct net_devic
+  *	This may be called from the interrupt state, where it is used
+  *	to restart the rx ring if the card runs out of rx buffers. 
+  *	
+- * 	First, we check if it's ok to start the transceiver. We then show
+- * 	the card where to start in the rx ring and issue the
+- * 	commands to start reception and transmission. We don't wait
+- * 	around for these to complete.
+- */ 
++ * 	We must first check if it's ok to (re)start the transceiver. See
++ *      mc32_close for details.
++ */
+ 
+ static void mc32_start_transceiver(struct net_device *dev) {
+ 
+@@ -690,24 +675,20 @@ static void mc32_start_transceiver(struc
+ 	int ioaddr = dev->base_addr;
+ 
+ 	/* Ignore RX overflow on device closure */ 
+-	if (lp->desired_state==HALTED)  
++	if (lp->xceiver_desired_state==HALTED)
+ 		return; 
+ 
++	/* Give the card the offset to the post-EOL-bit RX descriptor */
+ 	mc32_ready_poll(dev); 
+-
+-	lp->tx_box->mbox=0;
+ 	lp->rx_box->mbox=0;
+-
+-	/* Give the card the offset to the post-EOL-bit RX descriptor */ 
+ 	lp->rx_box->data[0]=lp->rx_ring[prev_rx(lp->rx_ring_tail)].p->next; 
+-
+ 	outb(HOST_CMD_START_RX, ioaddr+HOST_CMD);      
+ 
+ 	mc32_ready_poll(dev); 
++	lp->tx_box->mbox=0;
+ 	outb(HOST_CMD_RESTRT_TX, ioaddr+HOST_CMD);   /* card ignores this on RX restart */ 
+ 	
+ 	/* We are not interrupted on start completion */ 
+-	lp->xceiver_state=RUNNING; 
+ }
+ 
+ 
+@@ -727,25 +708,17 @@ static void mc32_halt_transceiver(struct
+ {
+ 	struct mc32_local *lp = (struct mc32_local *)dev->priv;
+ 	int ioaddr = dev->base_addr;
+-	unsigned long flags;
+ 
+ 	mc32_ready_poll(dev);	
+-
+-	lp->tx_box->mbox=0;
+ 	lp->rx_box->mbox=0;
+-
+ 	outb(HOST_CMD_SUSPND_RX, ioaddr+HOST_CMD);			
++	wait_for_completion(&lp->xceiver_cmd);
++
+ 	mc32_ready_poll(dev); 
++	lp->tx_box->mbox=0;
+ 	outb(HOST_CMD_SUSPND_TX, ioaddr+HOST_CMD);	
+-		
+-	save_flags(flags);
+-	cli();
+-		
+-	while(lp->xceiver_state!=HALTED) 
+-		sleep_on(&lp->event); 
+-		
+-	restore_flags(flags);	
+-} 
++	wait_for_completion(&lp->xceiver_cmd);
++}
+ 
+ 
+ /**
+@@ -756,7 +729,7 @@ static void mc32_halt_transceiver(struct
+  *	the point where mc32_start_transceiver() can be called.
+  *
+  *	The card sets up the receive ring for us. We are required to use the
+- *	ring it provides although we can change the size of the ring.
++ *	ring it provides, although the size of the ring is configurable.
+  *
+  * 	We allocate an sk_buff for each ring entry in turn and
+  * 	initalise its house-keeping info. At the same time, we read
+@@ -777,7 +750,7 @@ static int mc32_load_rx_ring(struct net_
+ 	
+ 	rx_base=lp->rx_chain;
+ 
+-	for(i=0;i<RX_RING_LEN;i++)
++	for(i=0; i<RX_RING_LEN; i++)
+ 	{
+ 		lp->rx_ring[i].skb=alloc_skb(1532, GFP_KERNEL);
+ 		skb_reserve(lp->rx_ring[i].skb, 18);  
+@@ -814,21 +787,19 @@ static int mc32_load_rx_ring(struct net_
+  *
+  *	Free the buffer for each ring slot. This may be called 
+  *      before mc32_load_rx_ring(), eg. on error in mc32_open().
++ *      Requires rx skb pointers to point to a valid skb, or NULL.
+  */
+ 
+ static void mc32_flush_rx_ring(struct net_device *dev)
+ {
+ 	struct mc32_local *lp = (struct mc32_local *)dev->priv;
+-	
+-	struct sk_buff *skb;
+ 	int i; 
+ 
+ 	for(i=0; i < RX_RING_LEN; i++) 
+ 	{ 
+-		skb = lp->rx_ring[i].skb;
+-		if (skb!=NULL) {
+-			kfree_skb(skb);
+-			skb=NULL; 
++		if (lp->rx_ring[i].skb) {
++			dev_kfree_skb(lp->rx_ring[i].skb);
++			lp->rx_ring[i].skb = NULL;
+ 		}
+ 		lp->rx_ring[i].p=NULL; 
+ 	} 
+@@ -860,7 +831,7 @@ static void mc32_load_tx_ring(struct net
+ 
+ 	tx_base=lp->tx_box->data[0]; 
+ 
+-	for(i=0;i<lp->tx_len;i++) 
++	for(i=0 ; i<TX_RING_LEN ; i++)
+ 	{
+ 		p=isa_bus_to_virt(lp->base+tx_base);
+ 		lp->tx_ring[i].p=p; 
+@@ -869,11 +840,12 @@ static void mc32_load_tx_ring(struct net
+ 		tx_base=p->next;
+ 	}
+ 
+-	/* -1 so that tx_ring_head cannot "lap" tx_ring_tail,           */
+-	/* which would be bad news for mc32_tx_ring as cur. implemented */ 
++	/* -1 so that tx_ring_head cannot "lap" tx_ring_tail */
++	/* see mc32_tx_ring */
+ 
+ 	atomic_set(&lp->tx_count, TX_RING_LEN-1); 
+-	lp->tx_ring_head=lp->tx_ring_tail=0; 
++	atomic_set(&lp->tx_ring_head, 0); 
++	lp->tx_ring_tail=0; 
+ } 
+ 
+ 
+@@ -881,47 +853,29 @@ static void mc32_load_tx_ring(struct net
+  *	mc32_flush_tx_ring 	-	free transmit ring
+  *	@lp: Local data of 3c527 to flush the tx ring of
+  *
+- *	We have to consider two cases here. We want to free the pending
+- *	buffers only. If the ring buffer head is past the start then the
+- *	ring segment we wish to free wraps through zero. The tx ring 
+- *	house-keeping variables are then reset.
++ *      If the ring is non-empty, zip over the it, freeing any
++ *      allocated skb_buffs.  The tx ring house-keeping variables are
++ *      then reset. Requires rx skb pointers to point to a valid skb,
++ *      or NULL.
+  */
+ 
+ static void mc32_flush_tx_ring(struct net_device *dev)
+ {
+ 	struct mc32_local *lp = (struct mc32_local *)dev->priv;
+-	
+-	if(lp->tx_ring_tail!=lp->tx_ring_head)
++	int i;
++
++	for (i=0; i < TX_RING_LEN; i++)
+ 	{
+-		int i;	
+-		if(lp->tx_ring_tail < lp->tx_ring_head)
++		if (lp->tx_ring[i].skb)
+ 		{
+-			for(i=lp->tx_ring_tail;i<lp->tx_ring_head;i++)
+-			{
+-				dev_kfree_skb(lp->tx_ring[i].skb);
+-				lp->tx_ring[i].skb=NULL;
+-				lp->tx_ring[i].p=NULL; 
+-			}
+-		}
+-		else
+-		{
+-			for(i=lp->tx_ring_tail; i<TX_RING_LEN; i++) 
+-			{
+-				dev_kfree_skb(lp->tx_ring[i].skb);
+-				lp->tx_ring[i].skb=NULL;
+-				lp->tx_ring[i].p=NULL; 
+-			}
+-			for(i=0; i<lp->tx_ring_head; i++) 
+-			{
+-				dev_kfree_skb(lp->tx_ring[i].skb);
+-				lp->tx_ring[i].skb=NULL;
+-				lp->tx_ring[i].p=NULL; 
+-			}
++			dev_kfree_skb(lp->tx_ring[i].skb);
++			lp->tx_ring[i].skb = NULL;
+ 		}
+ 	}
+-	
++
+ 	atomic_set(&lp->tx_count, 0); 
+-	lp->tx_ring_tail=lp->tx_ring_head=0;
++	atomic_set(&lp->tx_ring_head, 0); 
++	lp->tx_ring_tail=0;
+ }
+  	
+ 
+@@ -958,6 +912,12 @@ static int mc32_open(struct net_device *
+ 	regs|=HOST_CTRL_INTE;
+ 	outb(regs, ioaddr+HOST_CTRL);
+ 	
++	/*
++	 *      Allow ourselves to issue commands
++	 */
++
++	up(&lp->cmd_mutex);
++
+ 
+ 	/*
+ 	 *	Send the indications on command
+@@ -1010,7 +970,7 @@ static int mc32_open(struct net_device *
+ 		return -ENOBUFS;
+ 	}
+ 
+-	lp->desired_state = RUNNING; 
++	lp->xceiver_desired_state = RUNNING;
+ 	
+ 	/* And finally, set the ball rolling... */
+ 	mc32_start_transceiver(dev);
+@@ -1047,61 +1007,64 @@ static void mc32_timeout(struct net_devi
+  *	Transmit a buffer. This normally means throwing the buffer onto
+  *	the transmit queue as the queue is quite large. If the queue is
+  *	full then we set tx_busy and return. Once the interrupt handler
+- *	gets messages telling it to reclaim transmit queue entries we will
++ *	gets messages telling it to reclaim transmit queue entries, we will
+  *	clear tx_busy and the kernel will start calling this again.
+  *
+- *	We use cli rather than spinlocks. Since I have no access to an SMP
+- *	MCA machine I don't plan to change it. It is probably the top 
+- *	performance hit for this driver on SMP however.
++ *      We do not disable interrupts or acquire any locks; this can
++ *      run concurrently with mc32_tx_ring(), and the function itself
++ *      is serialised at a higher layer. However, similarly for the
++ *      card itself, we must ensure that we update tx_ring_head only
++ *      after we've established a valid packet on the tx ring (and
++ *      before we let the card "see" it, to prevent it racing with the
++ *      irq handler).
++ * 
+  */
+ 
+ static int mc32_send_packet(struct sk_buff *skb, struct net_device *dev)
+ {
+ 	struct mc32_local *lp = (struct mc32_local *)dev->priv;
+-	unsigned long flags;
+-
++	u32 head = atomic_read(&lp->tx_ring_head);
++	
+ 	volatile struct skb_header *p, *np;
+ 
+ 	netif_stop_queue(dev);
+ 
+-	save_flags(flags);
+-	cli();
+-		
+-	if(atomic_read(&lp->tx_count)==0)
+-	{
+-		restore_flags(flags);
++	if(atomic_read(&lp->tx_count)==0) {
+ 		return 1;
+ 	}
+ 
++	skb = skb_padto(skb, ETH_ZLEN);
++	if (skb == NULL) {
++		netif_wake_queue(dev);
++		return 0;
++	}
++
+ 	atomic_dec(&lp->tx_count); 
+ 
+ 	/* P is the last sending/sent buffer as a pointer */
+-	p=lp->tx_ring[lp->tx_ring_head].p; 
++	p=lp->tx_ring[head].p;
+ 		
+-	lp->tx_ring_head=next_tx(lp->tx_ring_head); 
++	head = next_tx(head);
+ 
+ 	/* NP is the buffer we will be loading */
+-	np=lp->tx_ring[lp->tx_ring_head].p; 
+-
+-   	if (skb->len < ETH_ZLEN) {
+-   		skb = skb_padto(skb, ETH_ZLEN);
+-   		if (skb == NULL)
+-   			goto out;
+-   	}
+-
++	np=lp->tx_ring[head].p; 
++	
+ 	/* We will need this to flush the buffer out */
+-	lp->tx_ring[lp->tx_ring_head].skb = skb;
+-   	   
+-	np->length = (skb->len < ETH_ZLEN) ? ETH_ZLEN : skb->len; 
+-			
++	lp->tx_ring[head].skb=skb;
++
++	np->length      = unlikely(skb->len < ETH_ZLEN) ? ETH_ZLEN : skb->len;			
+ 	np->data	= isa_virt_to_bus(skb->data);
+ 	np->status	= 0;
+ 	np->control     = CONTROL_EOP | CONTROL_EOL;     
+ 	wmb();
+ 		
+-	p->control     &= ~CONTROL_EOL;     /* Clear EOL on p */ 
+-out:	
+-	restore_flags(flags);
++	/*
++	 * The new frame has been setup; we can now
++	 * let the interrupt handler and card "see" it
++	 */
++
++	atomic_set(&lp->tx_ring_head, head); 
++	p->control     &= ~CONTROL_EOL;
+ 
+ 	netif_wake_queue(dev);
+ 	return 0;
+@@ -1182,10 +1145,11 @@ static void mc32_rx_ring(struct net_devi
+ {
+ 	struct mc32_local *lp=dev->priv;		
+ 	volatile struct skb_header *p;
+-	u16 rx_ring_tail = lp->rx_ring_tail;
+-	u16 rx_old_tail = rx_ring_tail; 
+-
++	u16 rx_ring_tail;
++	u16 rx_old_tail;
+ 	int x=0;
++
++	rx_old_tail = rx_ring_tail = lp->rx_ring_tail;
+ 	
+ 	do
+ 	{ 
+@@ -1275,9 +1239,14 @@ static void mc32_tx_ring(struct net_devi
+ 	struct mc32_local *lp=(struct mc32_local *)dev->priv;
+ 	volatile struct skb_header *np;
+ 
+-	/* NB: lp->tx_count=TX_RING_LEN-1 so that tx_ring_head cannot "lap" tail here */
++	/*
++	 * We rely on head==tail to mean 'queue empty'.
++	 * This is why lp->tx_count=TX_RING_LEN-1: in order to prevent
++	 * tx_ring_head wrapping to tail and confusing a 'queue empty'
++	 * condition with 'queue full'
++	 */
+ 
+-	while (lp->tx_ring_tail != lp->tx_ring_head)  
++	while (lp->tx_ring_tail != atomic_read(&lp->tx_ring_head))  
+ 	{   
+ 		u16 t; 
+ 
+@@ -1388,8 +1357,7 @@ static irqreturn_t mc32_interrupt(int ir
+ 				break;
+ 			case 3: /* Halt */
+ 			case 4: /* Abort */
+-				lp->xceiver_state |= TX_HALTED; 
+-				wake_up(&lp->event);
++				complete(&lp->xceiver_cmd);
+ 				break;
+ 			default:
+ 				printk("%s: strange tx ack %d\n", dev->name, status&7);
+@@ -1404,8 +1372,7 @@ static irqreturn_t mc32_interrupt(int ir
+ 				break;
+ 			case 3: /* Halt */
+ 			case 4: /* Abort */
+-				lp->xceiver_state |= RX_HALTED;
+-				wake_up(&lp->event);
++				complete(&lp->xceiver_cmd);
+ 				break;
+ 			case 6:
+ 				/* Out of RX buffers stat */
+@@ -1421,26 +1388,17 @@ static irqreturn_t mc32_interrupt(int ir
+ 		status>>=3;
+ 		if(status&1)
+ 		{
+-
+-			/* 0=no 1=yes 2=replied, get cmd, 3 = wait reply & dump it */
+-			
+-			if(lp->exec_pending!=3) {
+-				lp->exec_pending=2;
+-				wake_up(&lp->event);
+-			}
+-			else 
+-			{				
+-			  	lp->exec_pending=0;
+-
+-				/* A new multicast set may have been
+-				   blocked while the old one was
+-				   running. If so, do it now. */
++			/*
++			 * No thread is waiting: we need to tidy
++			 * up ourself.
++			 */
+ 				   
++			if (lp->cmd_nonblocking) {
++				up(&lp->cmd_mutex);
+ 				if (lp->mc_reload_wait) 
+ 					mc32_reset_multicast_list(dev);
+-				else 
+-					wake_up(&lp->event);			       
+ 			}
++			else complete(&lp->execution_cmd);
+ 		}
+ 		if(status&2)
+ 		{
+@@ -1493,12 +1451,12 @@ static irqreturn_t mc32_interrupt(int ir
+ static int mc32_close(struct net_device *dev)
+ {
+ 	struct mc32_local *lp = (struct mc32_local *)dev->priv;
+-
+ 	int ioaddr = dev->base_addr;
++
+ 	u8 regs;
+ 	u16 one=1;
+ 	
+-	lp->desired_state = HALTED;
++	lp->xceiver_desired_state = HALTED;
+ 	netif_stop_queue(dev);
+ 
+ 	/*
+@@ -1511,11 +1469,10 @@ static int mc32_close(struct net_device 
+ 
+ 	mc32_halt_transceiver(dev); 
+ 	
+-	/* Catch any waiting commands */
++	/* Ensure we issue no more commands beyond this point */
++
++	down(&lp->cmd_mutex);
+ 	
+-	while(lp->exec_pending==1)
+-		sleep_on(&lp->event);
+-	       
+ 	/* Ok the card is now stopping */	
+ 	
+ 	regs=inb(ioaddr+HOST_CTRL);
+@@ -1542,12 +1499,9 @@ static int mc32_close(struct net_device 
+ 
+ static struct net_device_stats *mc32_get_stats(struct net_device *dev)
+ {
+-	struct mc32_local *lp;
++	struct mc32_local *lp = (struct mc32_local *)dev->priv;
+ 	
+ 	mc32_update_stats(dev); 
+-
+-	lp = (struct mc32_local *)dev->priv;
+-
+ 	return &lp->net_stats;
+ }
+ 
+@@ -1684,7 +1638,7 @@ static struct ethtool_ops netdev_ethtool
+ 
+ #ifdef MODULE
+ 
+-static struct net_device this_device;
++static struct net_device *this_device;
+ 
+ /**
+  *	init_module		-	entry point
+@@ -1696,12 +1650,9 @@ static struct net_device this_device;
+ 
+ int init_module(void)
+ {
+-	int result;
+-	
+-	this_device.init = mc32_probe;
+-	if ((result = register_netdev(&this_device)) != 0)
+-		return result;
+-
++	this_device = mc32_probe(-1);
++	if (IS_ERR(this_device))
++		return PTR_ERR(this_device);
+ 	return 0;
+ }
+ 
+@@ -1718,24 +1669,9 @@ int init_module(void)
+ 
+ void cleanup_module(void)
+ {
+-	int slot;
+-	
+-	unregister_netdev(&this_device);
+-
+-	/*
+-	 * If we don't do this, we can't re-insmod it later.
+-	 */
+-	 
+-	if (this_device.priv)
+-	{
+-		struct mc32_local *lp=this_device.priv;
+-		slot = lp->slot;
+-		mca_mark_as_unused(slot);
+-		mca_set_adapter_name(slot, NULL);
+-		kfree(this_device.priv);
+-	}
+-	free_irq(this_device.irq, &this_device);
+-	release_region(this_device.base_addr, MC32_IO_EXTENT);
++	unregister_netdev(this_device);
++	cleanup_card(this_device);
++	free_netdev(this_device);
+ }
+ 
+ #endif /* MODULE */
+--- linux-2.6.0/drivers/net/3c527.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/net/3c527.h	2003-12-28 23:21:00.000000000 -0800
+@@ -27,10 +27,8 @@
+ 
+ #define HOST_RAMPAGE		8
+ 
+-#define RX_HALTED (1<<0)
+-#define TX_HALTED (1<<1)  
+-#define HALTED (RX_HALTED | TX_HALTED)
+-#define RUNNING 0
++#define HALTED 0
++#define RUNNING 1
+ 
+ struct mc32_mailbox
+ {
+--- linux-2.6.0/drivers/net/3c59x.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/net/3c59x.c	2003-12-28 23:21:00.000000000 -0800
+@@ -920,6 +920,18 @@ static struct net_device *compaq_net_dev
+ 
+ static int vortex_cards_found;
+ 
++#ifdef CONFIG_NET_POLL_CONTROLLER
++static void poll_vortex(struct net_device *dev)
++{
++	struct vortex_private *vp = (struct vortex_private *)dev->priv;
++	unsigned long flags;
++	local_save_flags(flags);
++	local_irq_disable();
++	(vp->full_bus_master_rx ? boomerang_interrupt:vortex_interrupt)(dev->irq,dev,NULL);
++	local_irq_restore(flags);
++} 
++#endif
++
+ #ifdef CONFIG_PM
+ 
+ static int vortex_suspend (struct pci_dev *pdev, u32 state)
+@@ -1450,6 +1462,9 @@ static int __devinit vortex_probe1(struc
+ 	dev->set_multicast_list = set_rx_mode;
+ 	dev->tx_timeout = vortex_tx_timeout;
+ 	dev->watchdog_timeo = (watchdog * HZ) / 1000;
++#ifdef CONFIG_NET_POLL_CONTROLLER
++	dev->poll_controller = poll_vortex; 
++#endif
+ 	if (pdev) {
+ 		vp->pm_state_valid = 1;
+  		pci_save_state(VORTEX_PCI(vp), vp->power_state);
+--- linux-2.6.0/drivers/net/68360enet.c	2003-06-14 12:17:59.000000000 -0700
++++ /dev/null	2002-08-30 16:31:37.000000000 -0700
+@@ -1,951 +0,0 @@
+-/*
+- * Ethernet driver for Motorola MPC8xx.
+- * Copyright (c) 2000 Michael Leslie <mleslie@lineo.com>
+- * Copyright (c) 1997 Dan Malek (dmalek@jlc.net)
+- *
+- * I copied the basic skeleton from the lance driver, because I did not
+- * know how to write the Linux driver, but I did know how the LANCE worked.
+- *
+- * This version of the driver is somewhat selectable for the different
+- * processor/board combinations.  It works for the boards I know about
+- * now, and should be easily modified to include others.  Some of the
+- * configuration information is contained in "commproc.h" and the
+- * remainder is here.
+- *
+- * Buffer descriptors are kept in the CPM dual port RAM, and the frame
+- * buffers are in the host memory.
+- *
+- * Right now, I am very watseful with the buffers.  I allocate memory
+- * pages and then divide them into 2K frame buffers.  This way I know I
+- * have buffers large enough to hold one frame within one buffer descriptor.
+- * Once I get this working, I will use 64 or 128 byte CPM buffers, which
+- * will be much more memory efficient and will easily handle lots of
+- * small packets.
+- *
+- */
+-#include <linux/config.h>
+-#include <linux/kernel.h>
+-#include <linux/string.h>
+-#include <linux/ptrace.h>
+-#include <linux/errno.h>
+-#include <linux/ioport.h>
+-#include <linux/interrupt.h>
+-#include <linux/pci.h>
+-#include <linux/init.h>
+-#include <linux/delay.h>
+-#include <linux/netdevice.h>
+-#include <linux/etherdevice.h>
+-#include <linux/skbuff.h>
+-#include <linux/spinlock.h> 
+-
+-#include <asm/irq.h>
+-#include <asm/m68360.h>
+-/* #include <asm/8xx_immap.h> */
+-/* #include <asm/pgtable.h> */
+-/* #include <asm/mpc8xx.h> */
+-#include <asm/bitops.h>
+-/* #include <asm/uaccess.h> */
+-#include <asm/commproc.h>
+-
+-
+-/*
+- *				Theory of Operation
+- *
+- * The MPC8xx CPM performs the Ethernet processing on SCC1.  It can use
+- * an aribtrary number of buffers on byte boundaries, but must have at
+- * least two receive buffers to prevent constant overrun conditions.
+- *
+- * The buffer descriptors are allocated from the CPM dual port memory
+- * with the data buffers allocated from host memory, just like all other
+- * serial communication protocols.  The host memory buffers are allocated
+- * from the free page pool, and then divided into smaller receive and
+- * transmit buffers.  The size of the buffers should be a power of two,
+- * since that nicely divides the page.  This creates a ring buffer
+- * structure similar to the LANCE and other controllers.
+- *
+- * Like the LANCE driver:
+- * The driver runs as two independent, single-threaded flows of control.  One
+- * is the send-packet routine, which enforces single-threaded use by the
+- * cep->tx_busy flag.  The other thread is the interrupt handler, which is
+- * single threaded by the hardware and other software.
+- *
+- * The send packet thread has partial control over the Tx ring and the
+- * 'cep->tx_busy' flag.  It sets the tx_busy flag whenever it's queuing a Tx
+- * packet. If the next queue slot is empty, it clears the tx_busy flag when
+- * finished otherwise it sets the 'lp->tx_full' flag.
+- *
+- * The MBX has a control register external to the MPC8xx that has some
+- * control of the Ethernet interface.  Information is in the manual for
+- * your board.
+- *
+- * The RPX boards have an external control/status register.  Consult the
+- * programming documents for details unique to your board.
+- *
+- * For the TQM8xx(L) modules, there is no control register interface.
+- * All functions are directly controlled using I/O pins.  See commproc.h.
+- */
+-
+-
+-/* The transmitter timeout
+- */
+-#define TX_TIMEOUT	(2*HZ)
+-
+-/* The number of Tx and Rx buffers.  These are allocated statically here.
+- * We don't need to allocate pages for the transmitter.  We just use
+- * the skbuffer directly.
+- */
+-#ifdef CONFIG_ENET_BIG_BUFFERS
+-#define RX_RING_SIZE		64
+-#define TX_RING_SIZE		64	/* Must be power of two */
+-#define TX_RING_MOD_MASK	63	/*   for this to work */
+-#else
+-#define RX_RING_SIZE		8
+-#define TX_RING_SIZE		8	/* Must be power of two */
+-#define TX_RING_MOD_MASK	7	/*   for this to work */
+-#endif
+-
+-#define CPM_ENET_RX_FRSIZE  2048 /* overkill left over from ppc page-based allocation */
+-static char rx_buf_pool[RX_RING_SIZE * CPM_ENET_RX_FRSIZE];
+-
+-
+-/* The CPM stores dest/src/type, data, and checksum for receive packets.
+- */
+-#define PKT_MAXBUF_SIZE		1518
+-#define PKT_MINBUF_SIZE		64
+-#define PKT_MAXBLR_SIZE		1520
+-
+-/* The CPM buffer descriptors track the ring buffers.  The rx_bd_base and
+- * tx_bd_base always point to the base of the buffer descriptors.  The
+- * cur_rx and cur_tx point to the currently available buffer.
+- * The dirty_tx tracks the current buffer that is being sent by the
+- * controller.  The cur_tx and dirty_tx are equal under both completely
+- * empty and completely full conditions.  The empty/ready indicator in
+- * the buffer descriptor determines the actual condition.
+- */
+-struct scc_enet_private {
+-	/* The saved address of a sent-in-place packet/buffer, for skfree(). */
+-	struct	sk_buff* tx_skbuff[TX_RING_SIZE];
+-	ushort	skb_cur;
+-	ushort	skb_dirty;
+-
+-	/* CPM dual port RAM relative addresses.
+-	*/
+-	QUICC_BD	*rx_bd_base;		/* Address of Rx and Tx buffers. */
+-	QUICC_BD	*tx_bd_base;
+-	QUICC_BD	*cur_rx, *cur_tx;		/* The next free ring entry */
+-	QUICC_BD	*dirty_tx;	/* The ring entries to be free()ed. */
+-	volatile struct scc_regs	*sccp;
+-	/* struct	net_device_stats stats; */
+-	struct	net_device_stats stats;
+-	uint	tx_full;
+-	/* spinlock_t lock; */
+-	volatile unsigned int lock;
+-};
+-
+-
+-
+-static int scc_enet_open(struct net_device *dev);
+-static int scc_enet_start_xmit(struct sk_buff *skb, struct net_device *dev);
+-static int scc_enet_rx(struct net_device *dev);
+-static irqreturn_t scc_enet_interrupt(int vec, void *dev_id, struct pt_regs *fp);
+-static int scc_enet_close(struct net_device *dev);
+-/* static struct net_device_stats *scc_enet_get_stats(struct net_device *dev); */
+-static struct net_device_stats *scc_enet_get_stats(struct net_device *dev);
+-static void set_multicast_list(struct net_device *dev);
+-
+-/* Get this from various configuration locations (depends on board).
+-*/
+-/*static	ushort	my_enet_addr[] = { 0x0800, 0x3e26, 0x1559 };*/
+-
+-/* Typically, 860(T) boards use SCC1 for Ethernet, and other 8xx boards
+- * use SCC2.  This is easily extended if necessary.
+- */
+-
+-#define CONFIG_SCC1_ENET /* by default */
+-
+-#ifdef CONFIG_SCC1_ENET
+-#define CPM_CR_ENET CPM_CR_CH_SCC1
+-#define PROFF_ENET	PROFF_SCC1
+-#define SCC_ENET	0
+-#define CPMVEC_ENET	CPMVEC_SCC1
+-#endif
+-
+-#ifdef CONFIG_SCC2_ENET
+-#define CPM_CR_ENET	CPM_CR_CH_SCC2
+-#define PROFF_ENET	PROFF_SCC2
+-#define SCC_ENET	1		/* Index, not number! */
+-#define CPMVEC_ENET	CPMVEC_SCC2
+-#endif
+-
+-static int
+-scc_enet_open(struct net_device *dev)
+-{
+-
+-	/* I should reset the ring buffers here, but I don't yet know
+-	 * a simple way to do that.
+-	 * mleslie: That's no biggie. Worth doing, too.
+-	 */
+-
+-	/* netif_start_queue(dev); */
+-	return 0;					/* Always succeed */
+-}
+-
+-
+-static int
+-scc_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
+-{
+-	struct scc_enet_private *cep = (struct scc_enet_private *)dev->priv;
+-	volatile QUICC_BD	*bdp;
+-
+-	/* Fill in a Tx ring entry */
+-	bdp = cep->cur_tx;
+-
+-#ifndef final_version
+-	if (bdp->status & BD_ENET_TX_READY) {
+-		/* Ooops.  All transmit buffers are full.  Bail out.
+-		 * This should not happen, since cep->tx_busy should be set.
+-		 */
+-		printk("%s: tx queue full!.\n", dev->name);
+-		return 1;
+-	}
+-#endif
+-
+-	/* Clear all of the status flags.
+-	 */
+-	bdp->status &= ~BD_ENET_TX_STATS;
+-
+-	/* If the frame is short, tell CPM to pad it.
+-	*/
+-	if (skb->len <= ETH_ZLEN)
+-		bdp->status |= BD_ENET_TX_PAD;
+-	else
+-		bdp->status &= ~BD_ENET_TX_PAD;
+-
+-	/* Set buffer length and buffer pointer.
+-	*/
+-	bdp->length = skb->len;
+-	/* bdp->buf = __pa(skb->data); */
+-	bdp->buf = skb->data;
+-
+-	/* Save skb pointer.
+-	*/
+-	cep->tx_skbuff[cep->skb_cur] = skb;
+-
+-	/* cep->stats.tx_bytes += skb->len; */ /* TODO: It would really be nice... */
+-
+-	cep->skb_cur = (cep->skb_cur+1) & TX_RING_MOD_MASK;
+-	
+-
+-	/* Push the data cache so the CPM does not get stale memory
+-	 * data.
+-	 */
+-/* 	flush_dcache_range((unsigned long)(skb->data), */
+-/* 					(unsigned long)(skb->data + skb->len)); */
+-
+-	/* spin_lock_irq(&cep->lock); */ /* TODO: SPINLOCK */
+-	local_irq_disable();
+-	if (cep->lock > 0) {
+-		printk ("scc_enet_start_xmit() lock == %d\n", cep->lock);
+-	} else {
+-		cep->lock++;
+-	}
+-
+-	/* Send it on its way.  Tell CPM its ready, interrupt when done,
+-	 * its the last BD of the frame, and to put the CRC on the end.
+-	 */
+-	bdp->status |= (BD_ENET_TX_READY | BD_ENET_TX_INTR | BD_ENET_TX_LAST | BD_ENET_TX_TC);
+-
+-	dev->trans_start = jiffies;
+-
+-	/* If this was the last BD in the ring, start at the beginning again.
+-	*/
+-	if (bdp->status & BD_ENET_TX_WRAP)
+-		bdp = cep->tx_bd_base;
+-	else
+-		bdp++;
+-
+-	if (bdp->status & BD_ENET_TX_READY) {
+-		/* netif_stop_queue(dev); */
+-		cep->tx_full = 1;
+-	}
+-
+-	cep->cur_tx = (QUICC_BD *)bdp;
+-
+-	/* spin_unlock_irq(&cep->lock); */ /* TODO: SPINLOCK */
+-	cep->lock--;
+-	sti();
+-
+-	return 0;
+-}
+-
+-#if 0
+-static void
+-scc_enet_timeout(struct net_device *dev)
+-{
+-	struct scc_enet_private *cep = (struct scc_enet_private *)dev->priv;
+-
+-	printk("%s: transmit timed out.\n", dev->name);
+-	cep->stats.tx_errors++;
+-#ifndef final_version
+-	{
+-		int	i;
+-		QUICC_BD	*bdp;
+-		printk(" Ring data dump: cur_tx %p%s cur_rx %p.\n",
+-		       cep->cur_tx, cep->tx_full ? " (full)" : "",
+-		       cep->cur_rx);
+-		bdp = cep->tx_bd_base;
+-		for (i = 0 ; i < TX_RING_SIZE; i++, bdp++)
+-			printk("%04x %04x %08x\n",
+-			       bdp->status,
+-			       bdp->length,
+-			       (int)(bdp->buf));
+-		bdp = cep->rx_bd_base;
+-		for (i = 0 ; i < RX_RING_SIZE; i++, bdp++)
+-			printk("%04x %04x %08x\n",
+-			       bdp->status,
+-			       bdp->length,
+-			       (int)(bdp->buf));
+-	}
+-#endif
+-/* 	if (!cep->tx_full) */
+-/* 		netif_wake_queue(dev); */
+-}
+-#endif
+-
+-/* The interrupt handler.
+- * This is called from the CPM handler, not the MPC core interrupt.
+- */
+-static irqreturn_t scc_enet_interrupt(int vec, void *dev_id, struct pt_regs *fp)
+-{
+-	struct	net_device *dev = (struct net_device *)dev_id;
+-	volatile struct	scc_enet_private *cep;
+-	volatile QUICC_BD	*bdp;
+-	ushort	int_events;
+-	int	must_restart;
+-
+-	cep = (struct scc_enet_private *)dev->priv;
+-
+-	/* Get the interrupt events that caused us to be here.
+-	*/
+-	int_events = cep->sccp->scc_scce;
+-	cep->sccp->scc_scce = int_events;
+-	must_restart = 0;
+-
+-	/* Handle receive event in its own function.
+-	*/
+-	if (int_events & SCCE_ENET_RXF)
+-		scc_enet_rx(dev_id);
+-
+-	/* Check for a transmit error.  The manual is a little unclear
+-	 * about this, so the debug code until I get it figured out.  It
+-	 * appears that if TXE is set, then TXB is not set.  However,
+-	 * if carrier sense is lost during frame transmission, the TXE
+-	 * bit is set, "and continues the buffer transmission normally."
+-	 * I don't know if "normally" implies TXB is set when the buffer
+-	 * descriptor is closed.....trial and error :-).
+-	 */
+-
+-	/* Transmit OK, or non-fatal error.  Update the buffer descriptors.
+-	*/
+-	if (int_events & (SCCE_ENET_TXE | SCCE_ENET_TXB)) {
+-	    /* spin_lock(&cep->lock); */ /* TODO: SPINLOCK */
+-		/* local_irq_disable(); */
+-		if (cep->lock > 0) {
+-			printk ("scc_enet_interrupt() lock == %d\n", cep->lock);
+-		} else {
+-			cep->lock++;
+-		}
+-
+-	    bdp = cep->dirty_tx;
+-	    while ((bdp->status&BD_ENET_TX_READY)==0) {
+-		if ((bdp==cep->cur_tx) && (cep->tx_full == 0))
+-		    break;
+-
+-		if (bdp->status & BD_ENET_TX_HB)	/* No heartbeat */
+-			cep->stats.tx_heartbeat_errors++;
+-		if (bdp->status & BD_ENET_TX_LC)	/* Late collision */
+-			cep->stats.tx_window_errors++;
+-		if (bdp->status & BD_ENET_TX_RL)	/* Retrans limit */
+-			cep->stats.tx_aborted_errors++;
+-		if (bdp->status & BD_ENET_TX_UN)	/* Underrun */
+-			cep->stats.tx_fifo_errors++;
+-		if (bdp->status & BD_ENET_TX_CSL)	/* Carrier lost */
+-			cep->stats.tx_carrier_errors++;
+-
+-
+-		/* No heartbeat or Lost carrier are not really bad errors.
+-		 * The others require a restart transmit command.
+-		 */
+-		if (bdp->status &
+-		    (BD_ENET_TX_LC | BD_ENET_TX_RL | BD_ENET_TX_UN)) {
+-			must_restart = 1;
+-			cep->stats.tx_errors++;
+-		}
+-
+-		cep->stats.tx_packets++;
+-
+-		/* Deferred means some collisions occurred during transmit,
+-		 * but we eventually sent the packet OK.
+-		 */
+-		if (bdp->status & BD_ENET_TX_DEF)
+-			cep->stats.collisions++;
+-
+-		/* Free the sk buffer associated with this last transmit.
+-		*/
+-		/* dev_kfree_skb_irq(cep->tx_skbuff[cep->skb_dirty]); */
+-		dev_kfree_skb (cep->tx_skbuff[cep->skb_dirty]);
+-		cep->skb_dirty = (cep->skb_dirty + 1) & TX_RING_MOD_MASK;
+-
+-		/* Update pointer to next buffer descriptor to be transmitted.
+-		*/
+-		if (bdp->status & BD_ENET_TX_WRAP)
+-			bdp = cep->tx_bd_base;
+-		else
+-			bdp++;
+-
+-		/* I don't know if we can be held off from processing these
+-		 * interrupts for more than one frame time.  I really hope
+-		 * not.  In such a case, we would now want to check the
+-		 * currently available BD (cur_tx) and determine if any
+-		 * buffers between the dirty_tx and cur_tx have also been
+-		 * sent.  We would want to process anything in between that
+-		 * does not have BD_ENET_TX_READY set.
+-		 */
+-
+-		/* Since we have freed up a buffer, the ring is no longer
+-		 * full.
+-		 */
+-		if (cep->tx_full) {
+-			cep->tx_full = 0;
+-/* 			if (netif_queue_stopped(dev)) */
+-/* 				netif_wake_queue(dev); */
+-		}
+-
+-		cep->dirty_tx = (QUICC_BD *)bdp;
+-	    }
+-
+-	    if (must_restart) {
+-			volatile QUICC *cp;
+-
+-		/* Some transmit errors cause the transmitter to shut
+-		 * down.  We now issue a restart transmit.  Since the
+-		 * errors close the BD and update the pointers, the restart
+-		 * _should_ pick up without having to reset any of our
+-		 * pointers either.
+-		 */
+-		cp = pquicc;
+-		cp->cp_cr =
+-		    mk_cr_cmd(CPM_CR_ENET, CPM_CR_RESTART_TX) | CPM_CR_FLG;
+-		while (cp->cp_cr & CPM_CR_FLG);
+-	    }
+-	    /* spin_unlock(&cep->lock); */ /* TODO: SPINLOCK */
+-		/* sti(); */
+-		cep->lock--;
+-	}
+-
+-	/* Check for receive busy, i.e. packets coming but no place to
+-	 * put them.  This "can't happen" because the receive interrupt
+-	 * is tossing previous frames.
+-	 */
+-	if (int_events & SCCE_ENET_BSY) {
+-		cep->stats.rx_dropped++;
+-		printk("CPM ENET: BSY can't happen.\n");
+-	}
+-
+-	return IRQ_HANDLED;
+-}
+-
+-/* During a receive, the cur_rx points to the current incoming buffer.
+- * When we update through the ring, if the next incoming buffer has
+- * not been given to the system, we just set the empty indicator,
+- * effectively tossing the packet.
+- */
+-static int
+-scc_enet_rx(struct net_device *dev)
+-{
+-	struct	scc_enet_private *cep;
+-	volatile QUICC_BD	*bdp;
+-	struct	sk_buff *skb;
+-	ushort	pkt_len;
+-
+-	cep = (struct scc_enet_private *)dev->priv;
+-
+-	/* First, grab all of the stats for the incoming packet.
+-	 * These get messed up if we get called due to a busy condition.
+-	 */
+-	bdp = cep->cur_rx;
+-
+-	for (;;) {
+-		if (bdp->status & BD_ENET_RX_EMPTY)
+-			break;
+-		
+-#ifndef final_version
+-		/* Since we have allocated space to hold a complete frame, both
+-		 * the first and last indicators should be set.
+-		 */
+-		if ((bdp->status & (BD_ENET_RX_FIRST | BD_ENET_RX_LAST)) !=
+-			(BD_ENET_RX_FIRST | BD_ENET_RX_LAST))
+-			printk("CPM ENET: rcv is not first+last\n");
+-#endif
+-
+-		/* Frame too long or too short.
+-		 */
+-		if (bdp->status & (BD_ENET_RX_LG | BD_ENET_RX_SH))
+-			cep->stats.rx_length_errors++;
+-		if (bdp->status & BD_ENET_RX_NO)	/* Frame alignment */
+-			cep->stats.rx_frame_errors++;
+-		if (bdp->status & BD_ENET_RX_CR)	/* CRC Error */
+-			cep->stats.rx_crc_errors++;
+-		if (bdp->status & BD_ENET_RX_OV)	/* FIFO overrun */
+-			cep->stats.rx_crc_errors++;
+-
+-		/* Report late collisions as a frame error.
+-		 * On this error, the BD is closed, but we don't know what we
+-		 * have in the buffer.  So, just drop this frame on the floor.
+-		 */
+-		if (bdp->status & BD_ENET_RX_CL) {
+-			cep->stats.rx_frame_errors++;
+-		}
+-		else {
+-			
+-			/* Process the incoming frame.
+-			 */
+-			cep->stats.rx_packets++;
+-			pkt_len = bdp->length;
+-			/* cep->stats.rx_bytes += pkt_len; */  /* TODO: It would really be nice... */
+-
+-			/* This does 16 byte alignment, much more than we need.
+-			 * The packet length includes FCS, but we don't want to
+-			 * include that when passing upstream as it messes up
+-			 * bridging applications.
+-			 */
+-			skb = dev_alloc_skb(pkt_len-4);
+-
+-			if (skb == NULL) {
+-				printk("%s: Memory squeeze, dropping packet.\n", dev->name);
+-				cep->stats.rx_dropped++;
+-			}
+-			else {
+-				skb->dev = dev;
+-				skb_put(skb,pkt_len-4);	/* Make room */
+-				eth_copy_and_sum(skb, (unsigned char *)bdp->buf, pkt_len-4, 0);
+-				skb->protocol=eth_type_trans(skb,dev);
+-				netif_rx(skb);
+-			}
+-		}
+-
+-		/* Clear the status flags for this buffer.
+-		 */
+-		bdp->status &= ~BD_ENET_RX_STATS;
+-
+-		/* Mark the buffer empty.
+-		 */
+-		bdp->status |= BD_ENET_RX_EMPTY;
+-
+-		/* Update BD pointer to next entry.
+-		 */
+-		if (bdp->status & BD_ENET_RX_WRAP)
+-			bdp = cep->rx_bd_base;
+-		else
+-			bdp++;
+-
+-	}
+-	cep->cur_rx = (QUICC_BD *)bdp;
+-
+-	return 0;
+-}
+-
+-static int
+-scc_enet_close(struct net_device *dev)
+-{
+-	/* Don't know what to do yet.
+-	*/
+-	/* netif_stop_queue(dev); */
+-
+-	return 0;
+-}
+-
+-/* static struct net_device_stats *scc_enet_get_stats(struct net_device *dev) */
+-static struct net_device_stats *scc_enet_get_stats(struct net_device *dev)
+-{
+-	struct scc_enet_private *cep = (struct scc_enet_private *)dev->priv;
+-
+-	return &cep->stats;
+-}
+-
+-/* Set or clear the multicast filter for this adaptor.
+- * Skeleton taken from sunlance driver.
+- * The CPM Ethernet implementation allows Multicast as well as individual
+- * MAC address filtering.  Some of the drivers check to make sure it is
+- * a group multicast address, and discard those that are not.  I guess I
+- * will do the same for now, but just remove the test if you want
+- * individual filtering as well (do the upper net layers want or support
+- * this kind of feature?).
+- */
+-
+-static void set_multicast_list(struct net_device *dev)
+-{
+-	struct	scc_enet_private *cep;
+-	struct	dev_mc_list *dmi;
+-	u_char	*mcptr, *tdptr;
+-	volatile scc_enet_t *ep;
+-	int	i, j;
+-	volatile QUICC *cp = pquicc;
+-
+-	cep = (struct scc_enet_private *)dev->priv;
+-
+-	/* Get pointer to SCC area in parameter RAM.
+-	*/
+-	ep = (scc_enet_t *)dev->base_addr;
+-
+-	if (dev->flags&IFF_PROMISC) {
+-	  
+-		/* Log any net taps. */
+-		printk("%s: Promiscuous mode enabled.\n", dev->name);
+-		cep->sccp->scc_psmr |= ETHER_PRO; 
+-	} else {
+-
+-		cep->sccp->scc_psmr &= ~ETHER_PRO;
+-
+-		if (dev->flags & IFF_ALLMULTI) {
+-			/* Catch all multicast addresses, so set the
+-			 * filter to all 1's.
+-			 */
+-			ep->sen_gaddr1 = 0xffff;
+-			ep->sen_gaddr2 = 0xffff;
+-			ep->sen_gaddr3 = 0xffff;
+-			ep->sen_gaddr4 = 0xffff;
+-		}
+-		else {
+-			/* Clear filter and add the addresses in the list.
+-			*/
+-			ep->sen_gaddr1 = 0;
+-			ep->sen_gaddr2 = 0;
+-			ep->sen_gaddr3 = 0;
+-			ep->sen_gaddr4 = 0;
+-
+-			dmi = dev->mc_list;
+-
+-			for (i=0; i<dev->mc_count; i++) {
+-				
+-				/* Only support group multicast for now.
+-				*/
+-				if (!(dmi->dmi_addr[0] & 1))
+-					continue;
+-
+-				/* The address in dmi_addr is LSB first,
+-				 * and taddr is MSB first.  We have to
+-				 * copy bytes MSB first from dmi_addr.
+-				 */
+-				mcptr = (u_char *)dmi->dmi_addr + 5;
+-				tdptr = (u_char *)&ep->sen_taddrh;
+-				for (j=0; j<6; j++)
+-					*tdptr++ = *mcptr--;
+-
+-				/* Ask CPM to run CRC and set bit in
+-				 * filter mask.
+-				 */
+-				cp->cp_cr = mk_cr_cmd(CPM_CR_ENET, CPM_CR_SET_GADDR) | CPM_CR_FLG;
+-				/* this delay is necessary here -- Cort */
+-				udelay(10);
+-				while (cp->cp_cr & CPM_CR_FLG);
+-			}
+-		}
+-	}
+-}
+-
+-
+-/* Initialize the CPM Ethernet on SCC.
+- */
+-int scc_enet_init(void)
+-{
+-	struct net_device *dev;
+-	struct scc_enet_private *cep;
+-	int i, j;
+-	unsigned char	*eap;
+-	/* unsigned long	mem_addr; */
+-	/* pte_t		*pte; */
+-	/* bd_t		*bd; */ /* `board tag' used by ppc - TODO: integrate uC bootloader vars */
+-	volatile	QUICC_BD	*bdp;
+-	volatile	QUICC	*cp;
+-	volatile struct scc_regs	*sccp;
+-	volatile struct	ethernet_pram	*ep;
+-	/* volatile	immap_t		*immap; */
+-
+-	cp = pquicc;	/* Get pointer to Communication Processor */
+-
+-	/* immap = (immap_t *)IMAP_ADDR; */	/* and to internal registers */
+-
+-	/* bd = (bd_t *)__res; */
+-
+-	/* Allocate some private information.
+-	*/
+-	cep = (struct scc_enet_private *)kmalloc(sizeof(*cep), GFP_KERNEL);
+-	memset(cep, 0, sizeof(*cep));
+-	/* __clear_user(cep,sizeof(*cep)); */
+-	/* spin_lock_init(&cep->lock); */ /* TODO: SPINLOCK */
+-
+-	/* Create an Ethernet device instance.
+-	 */
+-	dev = init_etherdev(0, 0);
+-
+-	/* Get pointer to SCC area in parameter RAM.
+-	*/
+-	/* ep = (ethernet_pram *)(&cp->cp_dparam[PROFF_ENET]); */
+-	ep = &pquicc->pram[SCC_ENET].enet_scc;
+-
+-	/* And another to the SCC register area.
+-	*/
+-	sccp = &pquicc->scc_regs[SCC_ENET];
+-	cep->sccp = sccp;		/* Keep the pointer handy */
+-
+-	/* Disable receive and transmit in case EPPC-Bug started it.
+-	*/
+-	sccp->scc_gsmr.w.low &= ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
+-
+-	/* Set up 360 pins for SCC interface to ethernet transceiver.
+-	 * Pin mappings (PA_xx and PC_xx) are defined in commproc.h
+-	 */
+-
+-	/* Configure port A pins for Txd and Rxd.
+-	 */
+-	pquicc->pio_papar |= (PA_ENET_RXD | PA_ENET_TXD);
+-	pquicc->pio_padir &= ~(PA_ENET_RXD | PA_ENET_TXD);
+-	pquicc->pio_paodr &= ~PA_ENET_TXD;
+-
+-	/* Configure port C pins to enable CLSN and RENA.
+-	 */
+-	pquicc->pio_pcpar &= ~(PC_ENET_CLSN | PC_ENET_RENA);
+-	pquicc->pio_pcdir &= ~(PC_ENET_CLSN | PC_ENET_RENA);
+-	pquicc->pio_pcso |= (PC_ENET_CLSN | PC_ENET_RENA);
+-
+-	/* Configure port A for TCLK and RCLK.
+-	*/
+-	pquicc->pio_papar |= (PA_ENET_TCLK | PA_ENET_RCLK);
+-	pquicc->pio_padir &= ~(PA_ENET_TCLK | PA_ENET_RCLK);
+-
+-	/* Configure Serial Interface clock routing.
+-	 * First, clear all SCC bits to zero, then set the ones we want.
+-	 */
+-	pquicc->si_sicr &= ~SICR_ENET_MASK;
+-	pquicc->si_sicr |= SICR_ENET_CLKRT;
+-
+-
+-	/* Allocate space for the buffer descriptors in the DP ram.
+-	 * These are relative offsets in the DP ram address space.
+-	 * Initialize base addresses for the buffer descriptors.
+-	 */
+-	i = m360_cpm_dpalloc(sizeof(QUICC_BD) * RX_RING_SIZE);
+-	ep->rbase = i;
+-	cep->rx_bd_base = (QUICC_BD *)((uint)pquicc + i);
+-
+-	i = m360_cpm_dpalloc(sizeof(QUICC_BD) * TX_RING_SIZE);
+-	ep->tbase = i;
+-	cep->tx_bd_base = (QUICC_BD *)((uint)pquicc + i);
+-
+-	cep->dirty_tx = cep->cur_tx = cep->tx_bd_base;
+-	cep->cur_rx = cep->rx_bd_base;
+-
+-	/* Issue init Rx BD command for SCC.
+-	 * Manual says to perform an Init Rx parameters here.  We have
+-	 * to perform both Rx and Tx because the SCC may have been
+-	 * already running. [In uCquicc's case, I don't think that is so - mles]
+-	 * In addition, we have to do it later because we don't yet have
+-	 * all of the BD control/status set properly.
+-	cp->cp_cpcr = mk_cr_cmd(CPM_CR_ENET, CPM_CR_INIT_RX) | CPM_CR_FLG;
+-	while (cp->cp_cpcr & CPM_CR_FLG);
+-	 */
+-
+-	/* Initialize function code registers for big-endian.
+-	*/
+-	ep->rfcr = (SCC_EB | SCC_FC_DMA);
+-	ep->tfcr = (SCC_EB | SCC_FC_DMA);
+-
+-	/* Set maximum bytes per receive buffer.
+-	 * This appears to be an Ethernet frame size, not the buffer
+-	 * fragment size.  It must be a multiple of four.
+-	 */
+-	ep->mrblr  = PKT_MAXBLR_SIZE;
+-
+-	/* Set CRC preset and mask.
+-	 */
+-	ep->c_pres = 0xffffffff;
+-	ep->c_mask = 0xdebb20e3; /* see 360UM p. 7-247 */
+-
+-	ep->crcec  = 0;	/* CRC Error counter */
+-	ep->alec   = 0;	/* alignment error counter */
+-	ep->disfc  = 0;	/* discard frame counter */
+-
+-	ep->pads   = 0x8888;	/* Tx short frame pad character */
+-	ep->ret_lim = 0x000f;	/* Retry limit threshold */
+-
+-	ep->mflr   = PKT_MAXBUF_SIZE;	/* maximum frame length register */
+-	ep->minflr = PKT_MINBUF_SIZE;	/* minimum frame length register */
+-
+-	ep->maxd1 = PKT_MAXBLR_SIZE;	/* maximum DMA1 length */
+-	ep->maxd2 = PKT_MAXBLR_SIZE;	/* maximum DMA2 length */
+-
+-	/* Clear hash tables, group and individual.
+-	 */
+-	ep->gaddr1 = ep->gaddr2 = ep->gaddr3 = ep->gaddr4 = 0;
+-	ep->iaddr1 = ep->iaddr2 = ep->iaddr3 = ep->iaddr4 = 0;
+-
+-	/* Set Ethernet station address.
+-	 *
+-	 * The uCbootloader provides a hook to the kernel to retrieve
+-	 * stuff like the MAC address. This is retrieved in config_BSP()
+-	 */
+-#if defined (CONFIG_UCQUICC)
+-	{
+- 		extern unsigned char *scc1_hwaddr;
+-
+-		eap = (char *)ep->paddr.b;
+-		for (i=5; i>=0; i--)
+-			*eap++ = dev->dev_addr[i] = scc1_hwaddr[i];
+-	}
+-#endif
+-
+-
+-/* #ifndef CONFIG_MBX */
+-/* 	eap = (unsigned char *)&(ep->paddrh); */
+-
+-/* 	for (i=5; i>=0; i--) */
+-/* 		*eap++ = dev->dev_addr[i] = bd->bi_enetaddr[i]; */
+-/* #else */
+-/* 	for (i=5; i>=0; i--) */
+-/* 		dev->dev_addr[i] = *eap++; */
+-/* #endif */
+-
+-	ep->p_per   = 0;	/* 'cause the book says so */
+-	ep->taddr_l = 0;	/* temp address (LSB) */
+-	ep->taddr_m = 0;
+-	ep->taddr_h = 0;	/* temp address (MSB) */
+-
+-	/* Now allocate the host memory pages and initialize the
+-	 * buffer descriptors.
+-	 */
+-	/* initialize rx buffer descriptors */
+-	bdp = cep->tx_bd_base;
+-	for (j=0; j<(TX_RING_SIZE-1); j++) {
+-		bdp->buf = 0;
+-		bdp->status = 0;
+-		bdp++;
+-	}
+-	bdp->buf = 0;
+-	bdp->status = BD_SC_WRAP;
+-
+-
+-	/* initialize rx buffer descriptors */
+-	bdp = cep->rx_bd_base;
+-	for (j=0; j<(RX_RING_SIZE-1); j++) {
+-		bdp->buf = &rx_buf_pool[j * CPM_ENET_RX_FRSIZE];
+-		bdp->status = BD_SC_EMPTY | BD_SC_INTRPT;
+-		bdp++;
+-	}
+-	bdp->buf = &rx_buf_pool[j * CPM_ENET_RX_FRSIZE];
+-	bdp->status = BD_SC_WRAP | BD_SC_EMPTY | BD_SC_INTRPT;
+-
+-
+-
+-	/* Let's re-initialize the channel now.  We have to do it later
+-	 * than the manual describes because we have just now finished
+-	 * the BD initialization.
+-	 */
+-	cp->cp_cr = mk_cr_cmd(CPM_CR_ENET, CPM_CR_INIT_TRX) | CPM_CR_FLG;
+-	while (cp->cp_cr & CPM_CR_FLG);
+-
+-	cep->skb_cur = cep->skb_dirty = 0;
+-
+-	sccp->scc_scce = 0xffff;	/* Clear any pending events */
+-
+-	/* Enable interrupts for transmit error, complete frame
+-	 * received, and any transmit buffer we have also set the
+-	 * interrupt flag.
+-	 */
+-	sccp->scc_sccm = (SCCE_ENET_TXE | SCCE_ENET_RXF | SCCE_ENET_TXB);
+-
+-	/* Install our interrupt handler.
+-	 */
+-	/* cpm_install_handler(CPMVEC_ENET, scc_enet_interrupt, dev); */
+-	request_irq(CPMVEC_ENET, scc_enet_interrupt,
+-		IRQ_FLG_LOCK, dev->name, (void *)dev);
+-
+-	/* Set GSMR_H to enable all normal operating modes.
+-	 * Set GSMR_L to enable Ethernet to MC68160.
+-	 */
+-	sccp->scc_gsmr.w.high = 0;
+-	sccp->scc_gsmr.w.low  = (SCC_GSMRL_TCI | SCC_GSMRL_TPL_48 |
+-							 SCC_GSMRL_TPP_10 | SCC_GSMRL_MODE_ENET);
+-
+-	/* Set sync/delimiters.
+-	 */
+-	sccp->scc_dsr = 0xd555;
+-
+-	/* Set processing mode.  Use Ethernet CRC, catch broadcast, and
+-	 * start frame search 22 bit times after RENA.
+-	 */
+-	sccp->scc_psmr = (SCC_PMSR_ENCRC       /* Ethernet CRC mode */
+-			  /* | SCC_PSMR_HBC */ /* Enable heartbeat */
+-			  /* | SCC_PMSR_PRO */ /* Promiscuous mode */
+-			  /* | SCC_PMSR_FDE */ /* Full duplex enable */
+-			  | ETHER_NIB_22);
+-	/* sccp->scc_psmr = (SCC_PMSR_PRO | ETHER_CRC_32 | ETHER_NIB_22); */
+-
+-
+-	/* It is now OK to enable the Ethernet transmitter.
+-	 * Unfortunately, there are board implementation differences here.
+-	 */
+-#if defined(CONFIG_UCQUICC)
+-/* 	 immap->im_ioport.iop_pcpar |= PC_ENET_TENA; */
+-/* 	 immap->im_ioport.iop_pcdir &= ~PC_ENET_TENA; */
+-	 cp->pio_pcpar |=  PC_ENET_TENA; /* t_en */
+-	 cp->pio_pcdir &= ~PC_ENET_TENA;
+-
+-	 cp->pip_pbpar &= ~(0x00000200); /* power up ethernet transceiver */
+-	 cp->pip_pbdir |=  (0x00000200);
+-	 cp->pip_pbdat |=  (0x00000200);
+-#endif
+-
+-
+-	dev->base_addr = (unsigned long)ep;
+-	dev->priv = cep;
+-#if 0
+-	dev->name = "CPM_ENET";
+-#endif
+-
+-	/* The CPM Ethernet specific entries in the device structure. */
+-	dev->open = scc_enet_open;
+-	dev->hard_start_xmit = scc_enet_start_xmit;
+-	/* dev->tx_timeout = scc_enet_timeout; */
+-	/* dev->watchdog_timeo = TX_TIMEOUT; */
+-	dev->stop = scc_enet_close;
+-	dev->get_stats = scc_enet_get_stats;
+-	dev->set_multicast_list = set_multicast_list;
+-
+-	/* And last, enable the transmit and receive processing.
+-	*/
+-	sccp->scc_gsmr.w.low |= (SCC_GSMRL_ENR | SCC_GSMRL_ENT);
+-
+-	printk("%s: CPM ENET Version 0.3, ", dev->name);
+-	for (i=0; i<5; i++)
+-		printk("%02x:", dev->dev_addr[i]);
+-	printk("%02x\n", dev->dev_addr[5]);
+-
+-	return 0;
+-}
+-
+-
+-
+-int m68360_enet_probe(struct device *dev)
+-{
+-	return(scc_enet_init ());
+-}
+-
+-
+-/*
+- * Local variables:
+- *  c-indent-level: 4
+- *  c-basic-offset: 4
+- *  tab-width: 4
+- * End:
+- */
+--- linux-2.6.0/drivers/net/8139too.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/net/8139too.c	2003-12-28 23:22:01.000000000 -0800
+@@ -92,7 +92,7 @@
+ */
+ 
+ #define DRV_NAME	"8139too"
+-#define DRV_VERSION	"0.9.26"
++#define DRV_VERSION	"0.9.27"
+ 
+ 
+ #include <linux/config.h>
+@@ -117,17 +117,17 @@
+ #define RTL8139_DRIVER_NAME   DRV_NAME " Fast Ethernet driver " DRV_VERSION
+ #define PFX DRV_NAME ": "
+ 
++/* Default Message level */
++#define RTL8139_DEF_MSG_ENABLE   (NETIF_MSG_DRV   | \
++                                 NETIF_MSG_PROBE  | \
++                                 NETIF_MSG_LINK)
++
+ 
+ /* enable PIO instead of MMIO, if CONFIG_8139TOO_PIO is selected */
+ #ifdef CONFIG_8139TOO_PIO
+ #define USE_IO_OPS 1
+ #endif
+ 
+-/* use a 16K rx ring buffer instead of the default 32K */
+-#ifdef CONFIG_SH_DREAMCAST
+-#define USE_BUF16K 1
+-#endif
+-
+ /* define to 1 to enable copious debugging info */
+ #undef RTL8139_DEBUG
+ 
+@@ -146,9 +146,9 @@
+ #  define assert(expr) do {} while (0)
+ #else
+ #  define assert(expr) \
+-        if(!(expr)) {					\
+-        printk( "Assertion failed! %s,%s,%s,line=%d\n",	\
+-        #expr,__FILE__,__FUNCTION__,__LINE__);		\
++        if(unlikely(!(expr))) {				        \
++        printk(KERN_ERR "Assertion failed! %s,%s,%s,line=%d\n",	\
++        #expr,__FILE__,__FUNCTION__,__LINE__);		        \
+         }
+ #endif
+ 
+@@ -159,9 +159,6 @@
+ static int media[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
+ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1};
+ 
+-/* Maximum events (Rx packets, etc.) to handle at each interrupt. */
+-static int max_interrupt_work = 20;
+-
+ /* Maximum number of multicast addresses to filter (vs. Rx-all-multicast).
+    The RTL chips use a 64 element hash table based on the Ethernet CRC.  */
+ static int multicast_filter_limit = 32;
+@@ -169,16 +166,16 @@ static int multicast_filter_limit = 32;
+ /* bitmapped message enable number */
+ static int debug = -1;
+ 
+-/* Size of the in-memory receive ring. */
+-#ifdef USE_BUF16K
+-#define RX_BUF_LEN_IDX	1	/* 0==8K, 1==16K, 2==32K, 3==64K */
+-#else
+-#define RX_BUF_LEN_IDX	2	/* 0==8K, 1==16K, 2==32K, 3==64K */
+-#endif
+-#define RX_BUF_LEN	(8192 << RX_BUF_LEN_IDX)
++/* Ring size is now a config option */
++#define RX_BUF_LEN	(8192 << CONFIG_8139_RXBUF_IDX)
+ #define RX_BUF_PAD	16
+ #define RX_BUF_WRAP_PAD 2048 /* spare padding to handle lack of packet wrap */
++
++#if RX_BUF_LEN == 65536
++#define RX_BUF_TOT_LEN	RX_BUF_LEN
++#else
+ #define RX_BUF_TOT_LEN	(RX_BUF_LEN + RX_BUF_PAD + RX_BUF_WRAP_PAD)
++#endif
+ 
+ /* Number of Tx descriptor registers. */
+ #define NUM_TX_DESC	4
+@@ -251,6 +248,10 @@ static struct pci_device_id rtl8139_pci_
+ 	{0x11db, 0x1234, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
+ 	{0x1432, 0x9130, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
+ 	{0x02ac, 0x1012, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
++	{0x018a, 0x0106, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
++	{0x126c, 0x1211, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
++	{0x1743, 0x8139, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
++	{0x021b, 0x8139, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 }, 
+ 
+ #ifdef CONFIG_SH_SECUREEDGE5410
+ 	/* Bogus 8139 silicon reports 8129 without external PROM :-( */
+@@ -450,7 +451,7 @@ enum RxConfigBits {
+ 	RxCfgRcv32K = (1 << 12),
+ 	RxCfgRcv64K = (1 << 11) | (1 << 12),
+ 
+-	/* Disable packet wrap at end of Rx buffer */
++	/* Disable packet wrap at end of Rx buffer. (not possible with 64k) */
+ 	RxNoWrap = (1 << 7),
+ };
+ 
+@@ -560,6 +561,7 @@ struct rtl8139_private {
+ 	int drv_flags;
+ 	struct pci_dev *pci_dev;
+ 	u32 pci_state[16];
++	u32 msg_enable;
+ 	struct net_device_stats stats;
+ 	unsigned char *rx_ring;
+ 	unsigned int cur_rx;	/* Index into the Rx buffer of next Rx pkt. */
+@@ -574,6 +576,7 @@ struct rtl8139_private {
+ 	char twistie, twist_row, twist_col;	/* Twister tune state. */
+ 	unsigned int default_port:4;	/* Last dev->if_port value. */
+ 	spinlock_t lock;
++	spinlock_t rx_lock;
+ 	chip_t chipset;
+ 	pid_t thr_pid;
+ 	wait_queue_head_t thr_wait;
+@@ -590,13 +593,11 @@ MODULE_DESCRIPTION ("RealTek RTL-8139 Fa
+ MODULE_LICENSE("GPL");
+ 
+ MODULE_PARM (multicast_filter_limit, "i");
+-MODULE_PARM (max_interrupt_work, "i");
+ MODULE_PARM (media, "1-" __MODULE_STRING(MAX_UNITS) "i");
+ MODULE_PARM (full_duplex, "1-" __MODULE_STRING(MAX_UNITS) "i");
+ MODULE_PARM (debug, "i");
+ MODULE_PARM_DESC (debug, "8139too bitmapped message enable number");
+ MODULE_PARM_DESC (multicast_filter_limit, "8139too maximum number of filtered multicast addresses");
+-MODULE_PARM_DESC (max_interrupt_work, "8139too maximum events handled per interrupt");
+ MODULE_PARM_DESC (media, "8139too: Bits 4+9: force full duplex, bit 5: 100Mbps");
+ MODULE_PARM_DESC (full_duplex, "8139too: Force full duplex for board(s) (1)");
+ 
+@@ -610,6 +611,10 @@ static void rtl8139_tx_timeout (struct n
+ static void rtl8139_init_ring (struct net_device *dev);
+ static int rtl8139_start_xmit (struct sk_buff *skb,
+ 			       struct net_device *dev);
++static int rtl8139_poll(struct net_device *dev, int *budget);
++#ifdef CONFIG_NET_POLL_CONTROLLER
++static void rtl8139_poll_controller(struct net_device *dev);
++#endif
+ static irqreturn_t rtl8139_interrupt (int irq, void *dev_instance,
+ 			       struct pt_regs *regs);
+ static int rtl8139_close (struct net_device *dev);
+@@ -682,16 +687,32 @@ static const u16 rtl8139_intr_mask =
+ 	PCIErr | PCSTimeout | RxUnderrun | RxOverflow | RxFIFOOver |
+ 	TxErr | TxOK | RxErr | RxOK;
+ 
+-#ifdef USE_BUF16K 
++static const u16 rtl8139_norx_intr_mask =
++	PCIErr | PCSTimeout | RxUnderrun |
++	TxErr | TxOK | RxErr ;
++
++#if CONFIG_8139_RXBUF_IDX == 0
++static const unsigned int rtl8139_rx_config =
++	RxCfgRcv8K | RxNoWrap |
++	(RX_FIFO_THRESH << RxCfgFIFOShift) |
++	(RX_DMA_BURST << RxCfgDMAShift);
++#elif CONFIG_8139_RXBUF_IDX == 1
+ static const unsigned int rtl8139_rx_config =
+ 	RxCfgRcv16K | RxNoWrap |
+ 	(RX_FIFO_THRESH << RxCfgFIFOShift) |
+ 	(RX_DMA_BURST << RxCfgDMAShift);
+-#else
++#elif CONFIG_8139_RXBUF_IDX == 2
+ static const unsigned int rtl8139_rx_config =
+ 	RxCfgRcv32K | RxNoWrap |
+ 	(RX_FIFO_THRESH << RxCfgFIFOShift) |
+ 	(RX_DMA_BURST << RxCfgDMAShift);
++#elif CONFIG_8139_RXBUF_IDX == 3
++static const unsigned int rtl8139_rx_config =
++	RxCfgRcv64K |
++	(RX_FIFO_THRESH << RxCfgFIFOShift) |
++	(RX_DMA_BURST << RxCfgDMAShift);
++#else
++#error "Invalid configuration for 8139_RXBUF_IDX"
+ #endif
+ 
+ static const unsigned int rtl8139_tx_config =
+@@ -868,9 +889,7 @@ static int __devinit rtl8139_init_board 
+ 
+ match:
+ 	DPRINTK ("chipset id (%d) == index %d, '%s'\n",
+-		tmp,
+-		tp->chipset,
+-		rtl_chip_info[tp->chipset].name);
++		 version, i, rtl_chip_info[i].name);
+ 
+ 	if (tp->chipset >= CH_8139B) {
+ 		u8 new_tmp8 = tmp8 = RTL_R8 (Config1);
+@@ -964,6 +983,8 @@ static int __devinit rtl8139_init_one (s
+ 	/* The Rtl8139-specific entries in the device structure. */
+ 	dev->open = rtl8139_open;
+ 	dev->hard_start_xmit = rtl8139_start_xmit;
++	dev->poll = rtl8139_poll;
++	dev->weight = 64;
+ 	dev->stop = rtl8139_close;
+ 	dev->get_stats = rtl8139_get_stats;
+ 	dev->set_multicast_list = rtl8139_set_rx_mode;
+@@ -971,6 +992,9 @@ static int __devinit rtl8139_init_one (s
+ 	dev->ethtool_ops = &rtl8139_ethtool_ops;
+ 	dev->tx_timeout = rtl8139_tx_timeout;
+ 	dev->watchdog_timeo = TX_TIMEOUT;
++#ifdef CONFIG_NET_POLL_CONTROLLER
++	dev->poll_controller = rtl8139_poll_controller;
++#endif
+ 
+ 	/* note: the hardware is not capable of sg/csum/highdma, however
+ 	 * through the use of skb_copy_and_csum_dev we enable these
+@@ -986,7 +1010,10 @@ static int __devinit rtl8139_init_one (s
+ 	/* note: tp->chipset set in rtl8139_init_board */
+ 	tp->drv_flags = board_info[ent->driver_data].hw_flags;
+ 	tp->mmio_addr = ioaddr;
++	tp->msg_enable =
++		(debug < 0 ? RTL8139_DEF_MSG_ENABLE : ((1 << debug) - 1));
+ 	spin_lock_init (&tp->lock);
++	spin_lock_init (&tp->rx_lock);
+ 	init_waitqueue_head (&tp->thr_wait);
+ 	init_completion (&tp->thr_exited);
+ 	tp->mii.dev = dev;
+@@ -1288,9 +1315,7 @@ static int rtl8139_open (struct net_devi
+ {
+ 	struct rtl8139_private *tp = dev->priv;
+ 	int retval;
+-#ifdef RTL8139_DEBUG
+ 	void *ioaddr = tp->mmio_addr;
+-#endif
+ 
+ 	retval = request_irq (dev->irq, rtl8139_interrupt, SA_SHIRQ, dev->name, dev);
+ 	if (retval)
+@@ -1319,8 +1344,10 @@ static int rtl8139_open (struct net_devi
+ 
+ 	rtl8139_init_ring (dev);
+ 	rtl8139_hw_start (dev);
++	netif_start_queue (dev);
+ 
+-	DPRINTK ("%s: rtl8139_open() ioaddr %#lx IRQ %d"
++	if (netif_msg_ifup(tp))
++		printk(KERN_DEBUG "%s: rtl8139_open() ioaddr %#lx IRQ %d"
+ 			" GP Pins %2.2x %s-duplex.\n",
+ 			dev->name, pci_resource_start (tp->pci_dev, 1),
+ 			dev->irq, RTL_R8 (MediaStatus),
+@@ -1337,7 +1364,7 @@ static void rtl_check_media (struct net_
+ 	struct rtl8139_private *tp = dev->priv;
+ 
+ 	if (tp->phys[0] >= 0) {
+-		mii_check_media(&tp->mii, 1, init_media);
++		mii_check_media(&tp->mii, netif_msg_link(tp), init_media);
+ 	}
+ }
+ 
+@@ -1407,8 +1434,6 @@ static void rtl8139_hw_start (struct net
+ 
+ 	/* Enable all known interrupts by setting the interrupt mask. */
+ 	RTL_W16 (IntrMask, rtl8139_intr_mask);
+-
+-	netif_start_queue (dev);
+ }
+ 
+ 
+@@ -1631,7 +1656,7 @@ static inline void rtl8139_start_thread(
+ 	}
+ }
+ 
+-static void rtl8139_tx_clear (struct rtl8139_private *tp)
++static inline void rtl8139_tx_clear (struct rtl8139_private *tp)
+ {
+ 	tp->cur_tx = 0;
+ 	tp->dirty_tx = 0;
+@@ -1661,6 +1686,7 @@ static void rtl8139_tx_timeout (struct n
+ 	if (tmp8 & CmdTxEnb)
+ 		RTL_W8 (ChipCmd, CmdRxEnb);
+ 
++	spin_lock(&tp->rx_lock);
+ 	/* Disable interrupts by clearing the interrupt mask. */
+ 	RTL_W16 (IntrMask, 0x0000);
+ 
+@@ -1679,9 +1705,12 @@ static void rtl8139_tx_timeout (struct n
+ 	spin_unlock_irqrestore (&tp->lock, flags);
+ 
+ 	/* ...and finally, reset everything */
+-	rtl8139_hw_start (dev);
+-
+-	netif_wake_queue (dev);
++	if (netif_running(dev)) {
++		rtl8139_hw_start (dev);
++		netif_wake_queue (dev);
++	}
++	spin_unlock(&tp->rx_lock);
++	
+ }
+ 
+ 
+@@ -1695,6 +1724,7 @@ static int rtl8139_start_xmit (struct sk
+ 	/* Calculate the next Tx descriptor entry. */
+ 	entry = tp->cur_tx % NUM_TX_DESC;
+ 
++	/* Note: the chip doesn't have auto-pad! */
+ 	if (likely(len < TX_BUF_SIZE)) {
+ 		if (len < ETH_ZLEN)
+ 			memset(tp->tx_buf[entry], 0, ETH_ZLEN);
+@@ -1706,7 +1736,6 @@ static int rtl8139_start_xmit (struct sk
+ 		return 0;
+ 	}
+ 
+-	/* Note: the chip doesn't have auto-pad! */
+ 	spin_lock_irq(&tp->lock);
+ 	RTL_W32_F (TxStatus0 + (entry * sizeof (u32)),
+ 		   tp->tx_flag | max(len, (unsigned int)ETH_ZLEN));
+@@ -1720,8 +1749,9 @@ static int rtl8139_start_xmit (struct sk
+ 		netif_stop_queue (dev);
+ 	spin_unlock_irq(&tp->lock);
+ 
+-	DPRINTK ("%s: Queued Tx packet size %u to slot %d.\n",
+-		 dev->name, len, entry);
++	if (netif_msg_tx_queued(tp))
++		printk (KERN_DEBUG "%s: Queued Tx packet size %u to slot %d.\n",
++			dev->name, len, entry);
+ 
+ 	return 0;
+ }
+@@ -1751,8 +1781,9 @@ static void rtl8139_tx_interrupt (struct
+ 		/* Note: TxCarrierLost is always asserted at 100mbps. */
+ 		if (txstatus & (TxOutOfWindow | TxAborted)) {
+ 			/* There was an major error, log it. */
+-			DPRINTK ("%s: Transmit error, Tx status %8.8x.\n",
+-				 dev->name, txstatus);
++			if (netif_msg_tx_err(tp))
++				printk(KERN_DEBUG "%s: Transmit error, Tx status %8.8x.\n",
++					dev->name, txstatus);
+ 			tp->stats.tx_errors++;
+ 			if (txstatus & TxAborted) {
+ 				tp->stats.tx_aborted_errors++;
+@@ -1792,8 +1823,7 @@ static void rtl8139_tx_interrupt (struct
+ 	if (tp->dirty_tx != dirty_tx) {
+ 		tp->dirty_tx = dirty_tx;
+ 		mb();
+-		if (netif_queue_stopped (dev))
+-			netif_wake_queue (dev);
++		netif_wake_queue (dev);
+ 	}
+ }
+ 
+@@ -1807,8 +1837,9 @@ static void rtl8139_rx_err (u32 rx_statu
+ 	int tmp_work;
+ #endif
+ 
+-	DPRINTK ("%s: Ethernet frame had errors, status %8.8x.\n",
+-	         dev->name, rx_status);
++	if (netif_msg_rx_err (tp)) 
++		printk(KERN_DEBUG "%s: Ethernet frame had errors, status %8.8x.\n",
++			dev->name, rx_status);
+ 	tp->stats.rx_errors++;
+ 	if (!(rx_status & RxStatusOK)) {
+ 		if (rx_status & RxTooLong) {
+@@ -1880,30 +1911,41 @@ static void rtl8139_rx_err (u32 rx_statu
+ #endif
+ }
+ 
+-static void rtl8139_rx_interrupt (struct net_device *dev,
+-				  struct rtl8139_private *tp, void *ioaddr)
+-{
+-	unsigned char *rx_ring;
+-	u16 cur_rx;
+-
+-	assert (dev != NULL);
+-	assert (tp != NULL);
+-	assert (ioaddr != NULL);
++#if CONFIG_8139_RXBUF_IDX == 3
++static __inline__ void wrap_copy(struct sk_buff *skb, const unsigned char *ring,
++				 u32 offset, unsigned int size)
++{
++	u32 left = RX_BUF_LEN - offset;
++
++	if (size > left) {
++		memcpy(skb->data, ring + offset, left);
++		memcpy(skb->data+left, ring, size - left);
++	} else
++		memcpy(skb->data, ring + offset, size);
++}
++#endif
+ 
+-	rx_ring = tp->rx_ring;
+-	cur_rx = tp->cur_rx;
++static int rtl8139_rx(struct net_device *dev, struct rtl8139_private *tp,
++		      int budget)
++{
++	void *ioaddr = tp->mmio_addr;
++	int received = 0;
++	unsigned char *rx_ring = tp->rx_ring;
++	unsigned int cur_rx = tp->cur_rx;
+ 
+ 	DPRINTK ("%s: In rtl8139_rx(), current %4.4x BufAddr %4.4x,"
+ 		 " free to %4.4x, Cmd %2.2x.\n", dev->name, cur_rx,
+ 		 RTL_R16 (RxBufAddr),
+ 		 RTL_R16 (RxBufPtr), RTL_R8 (ChipCmd));
+ 
+-	while ((RTL_R8 (ChipCmd) & RxBufEmpty) == 0) {
+-		int ring_offset = cur_rx % RX_BUF_LEN;
++	while (netif_running(dev) && received < budget 
++	       && (RTL_R8 (ChipCmd) & RxBufEmpty) == 0) {
++		u32 ring_offset = cur_rx % RX_BUF_LEN;
+ 		u32 rx_status;
+ 		unsigned int rx_size;
+ 		unsigned int pkt_size;
+ 		struct sk_buff *skb;
++		u16 status;
+ 
+ 		rmb();
+ 
+@@ -1912,8 +1954,9 @@ static void rtl8139_rx_interrupt (struct
+ 		rx_size = rx_status >> 16;
+ 		pkt_size = rx_size - 4;
+ 
+-		DPRINTK ("%s:  rtl8139_rx() status %4.4x, size %4.4x,"
+-			 " cur %4.4x.\n", dev->name, rx_status,
++		if (netif_msg_rx_status(tp))
++			printk(KERN_DEBUG "%s:  rtl8139_rx() status %4.4x, size %4.4x,"
++				" cur %4.4x.\n", dev->name, rx_status,
+ 			 rx_size, cur_rx);
+ #if RTL8139_DEBUG > 2
+ 		{
+@@ -1930,9 +1973,9 @@ static void rtl8139_rx_interrupt (struct
+ 		 * Theoretically, this should never happen
+ 		 * since EarlyRx is disabled.
+ 		 */
+-		if (rx_size == 0xfff0) {
++		if (unlikely(rx_size == 0xfff0)) {
+ 			tp->xstats.early_rx++;
+-			break;
++			goto done;
+ 		}
+ 
+ 		/* If Rx err or invalid rx_size/rx_status received
+@@ -1940,55 +1983,69 @@ static void rtl8139_rx_interrupt (struct
+ 		 * Rx process gets reset, so we abort any further
+ 		 * Rx processing.
+ 		 */
+-		if ((rx_size > (MAX_ETH_FRAME_SIZE+4)) ||
+-		    (rx_size < 8) ||
+-		    (!(rx_status & RxStatusOK))) {
++		if (unlikely((rx_size > (MAX_ETH_FRAME_SIZE+4)) ||
++			     (rx_size < 8) ||
++			     (!(rx_status & RxStatusOK)))) {
+ 			rtl8139_rx_err (rx_status, dev, tp, ioaddr);
+-			return;
++			return -1;
+ 		}
+ 
+ 		/* Malloc up new buffer, compatible with net-2e. */
+ 		/* Omit the four octet CRC from the length. */
+ 
+-		/* TODO: consider allocating skb's outside of
+-		 * interrupt context, both to speed interrupt processing,
+-		 * and also to reduce the chances of having to
+-		 * drop packets here under memory pressure.
+-		 */
+-
+ 		skb = dev_alloc_skb (pkt_size + 2);
+-		if (skb) {
++		if (likely(skb)) {
+ 			skb->dev = dev;
+ 			skb_reserve (skb, 2);	/* 16 byte align the IP fields. */
+-
++#if CONFIG_8139_RXBUF_IDX == 3
++			wrap_copy(skb, rx_ring, ring_offset+4, pkt_size);
++#else
+ 			eth_copy_and_sum (skb, &rx_ring[ring_offset + 4], pkt_size, 0);
++#endif
+ 			skb_put (skb, pkt_size);
+ 
+ 			skb->protocol = eth_type_trans (skb, dev);
+-			netif_rx (skb);
++
+ 			dev->last_rx = jiffies;
+ 			tp->stats.rx_bytes += pkt_size;
+ 			tp->stats.rx_packets++;
++
++			netif_receive_skb (skb);
+ 		} else {
+-			printk (KERN_WARNING
+-				"%s: Memory squeeze, dropping packet.\n",
+-				dev->name);
++			if (net_ratelimit()) 
++				printk (KERN_WARNING
++					"%s: Memory squeeze, dropping packet.\n",
++					dev->name);
+ 			tp->stats.rx_dropped++;
+ 		}
++		received++;
+ 
+ 		cur_rx = (cur_rx + rx_size + 4 + 3) & ~3;
+-		RTL_W16 (RxBufPtr, cur_rx - 16);
++		RTL_W16 (RxBufPtr, (u16) (cur_rx - 16));
+ 
+-		if (RTL_R16 (IntrStatus) & RxAckBits)
++		/* Clear out errors and receive interrupts */
++		status = RTL_R16 (IntrStatus) & RxAckBits;
++		if (likely(status != 0)) {
++			if (unlikely(status & (RxFIFOOver | RxOverflow))) {
++				tp->stats.rx_errors++;
++				if (status & RxFIFOOver)
++					tp->stats.rx_fifo_errors++;
++			}
+ 			RTL_W16_F (IntrStatus, RxAckBits);
++		}
+ 	}
+ 
++ done:
++
++#if RTL8139_DEBUG > 1
+ 	DPRINTK ("%s: Done rtl8139_rx(), current %4.4x BufAddr %4.4x,"
+ 		 " free to %4.4x, Cmd %2.2x.\n", dev->name, cur_rx,
+ 		 RTL_R16 (RxBufAddr),
+ 		 RTL_R16 (RxBufPtr), RTL_R8 (ChipCmd));
++#endif
+ 
+ 	tp->cur_rx = cur_rx;
++	return received;
+ }
+ 
+ 
+@@ -2014,14 +2071,12 @@ static void rtl8139_weird_interrupt (str
+ 		status &= ~RxUnderrun;
+ 	}
+ 
+-	/* XXX along with rtl8139_rx_err, are we double-counting errors? */
+-	if (status &
+-	    (RxUnderrun | RxOverflow | RxErr | RxFIFOOver))
++	if (status & (RxUnderrun | RxErr))
+ 		tp->stats.rx_errors++;
+ 
+ 	if (status & PCSTimeout)
+ 		tp->stats.rx_length_errors++;
+-	if (status & (RxUnderrun | RxFIFOOver))
++	if (status & RxUnderrun)
+ 		tp->stats.rx_fifo_errors++;
+ 	if (status & PCIErr) {
+ 		u16 pci_cmd_status;
+@@ -2033,6 +2088,39 @@ static void rtl8139_weird_interrupt (str
+ 	}
+ }
+ 
++static int rtl8139_poll(struct net_device *dev, int *budget)
++{
++	struct rtl8139_private *tp = dev->priv;
++	void *ioaddr = tp->mmio_addr;
++	int orig_budget = min(*budget, dev->quota);
++	int done = 1;
++
++	spin_lock(&tp->rx_lock);
++	if (likely(RTL_R16(IntrStatus) & RxAckBits)) {
++		int work_done;
++
++		work_done = rtl8139_rx(dev, tp, orig_budget);
++		if (likely(work_done > 0)) {
++			*budget -= work_done;
++			dev->quota -= work_done;
++			done = (work_done < orig_budget);
++		}
++	}
++
++	if (done) {
++		/*
++		 * Order is important since data can get interrupted
++		 * again when we think we are done.
++		 */
++		local_irq_disable();
++		RTL_W16_F(IntrMask, rtl8139_intr_mask);
++		__netif_rx_complete(dev);
++		local_irq_enable();
++	}
++	spin_unlock(&tp->rx_lock);
++
++	return !done;
++}
+ 
+ /* The interrupt handler does all of the Rx thread work and cleans up
+    after the Tx thread. */
+@@ -2041,68 +2129,59 @@ static irqreturn_t rtl8139_interrupt (in
+ {
+ 	struct net_device *dev = (struct net_device *) dev_instance;
+ 	struct rtl8139_private *tp = dev->priv;
+-	int boguscnt = max_interrupt_work;
+ 	void *ioaddr = tp->mmio_addr;
+-	int ackstat, status;
++	u16 status, ackstat;
+ 	int link_changed = 0; /* avoid bogus "uninit" warning */
+ 	int handled = 0;
+ 
+ 	spin_lock (&tp->lock);
++	status = RTL_R16 (IntrStatus);
+ 
+-	do {
+-		status = RTL_R16 (IntrStatus);
++	/* shared irq? */
++	if (unlikely((status & rtl8139_intr_mask) == 0)) 
++		goto out;
+ 
+-		/* h/w no longer present (hotplug?) or major error, bail */
+-		if (status == 0xFFFF)
+-			break;
++	handled = 1;
+ 
+-		if ((status &
+-		     (PCIErr | PCSTimeout | RxUnderrun | RxOverflow |
+-		      RxFIFOOver | TxErr | TxOK | RxErr | RxOK)) == 0)
+-			break;
++	/* h/w no longer present (hotplug?) or major error, bail */
++	if (unlikely(status == 0xFFFF)) 
++		goto out;
+ 
+-		handled = 1;
++	/* close possible race's with dev_close */
++	if (unlikely(!netif_running(dev))) {
++		RTL_W16 (IntrMask, 0);
++		goto out;
++	}
+ 
+-		/* Acknowledge all of the current interrupt sources ASAP, but
+-		   an first get an additional status bit from CSCR. */
+-		if (status & RxUnderrun)
+-			link_changed = RTL_R16 (CSCR) & CSCR_LinkChangeBit;
++	/* Acknowledge all of the current interrupt sources ASAP, but
++	   an first get an additional status bit from CSCR. */
++	if (unlikely(status & RxUnderrun))
++		link_changed = RTL_R16 (CSCR) & CSCR_LinkChangeBit;
+ 
+-		/* The chip takes special action when we clear RxAckBits,
+-		 * so we clear them later in rtl8139_rx_interrupt
+-		 */
+-		ackstat = status & ~(RxAckBits | TxErr);
++	ackstat = status & ~(RxAckBits | TxErr);
++	if (ackstat)
+ 		RTL_W16 (IntrStatus, ackstat);
+ 
+-		DPRINTK ("%s: interrupt  status=%#4.4x ackstat=%#4.4x new intstat=%#4.4x.\n",
+-			 dev->name, status, ackstat, RTL_R16 (IntrStatus));
+-
+-		if (netif_running (dev) && (status & RxAckBits))
+-			rtl8139_rx_interrupt (dev, tp, ioaddr);
+-
+-		/* Check uncommon events with one test. */
+-		if (status & (PCIErr | PCSTimeout | RxUnderrun | RxOverflow |
+-		  	      RxFIFOOver | RxErr))
+-			rtl8139_weird_interrupt (dev, tp, ioaddr,
+-						 status, link_changed);
+-
+-		if (netif_running (dev) && (status & (TxOK | TxErr))) {
+-			rtl8139_tx_interrupt (dev, tp, ioaddr);
+-			if (status & TxErr)
+-				RTL_W16 (IntrStatus, TxErr);
++	/* Receive packets are processed by poll routine.
++	   If not running start it now. */
++	if (status & RxAckBits){
++		if (netif_rx_schedule_prep(dev)) {
++			RTL_W16_F (IntrMask, rtl8139_norx_intr_mask);
++			__netif_rx_schedule (dev);
+ 		}
+-
+-		boguscnt--;
+-	} while (boguscnt > 0);
+-
+-	if (boguscnt <= 0) {
+-		printk (KERN_WARNING "%s: Too much work at interrupt, "
+-			"IntrStatus=0x%4.4x.\n", dev->name, status);
+-
+-		/* Clear all interrupt sources. */
+-		RTL_W16 (IntrStatus, 0xffff);
+ 	}
+ 
++	/* Check uncommon events with one test. */
++	if (unlikely(status & (PCIErr | PCSTimeout | RxUnderrun | RxErr)))
++		rtl8139_weird_interrupt (dev, tp, ioaddr,
++					 status, link_changed);
++
++	if (status & (TxOK | TxErr)) {
++		rtl8139_tx_interrupt (dev, tp, ioaddr);
++		if (status & TxErr)
++			RTL_W16 (IntrStatus, TxErr);
++	}
++ out:
+ 	spin_unlock (&tp->lock);
+ 
+ 	DPRINTK ("%s: exiting interrupt, intr_status=%#4.4x.\n",
+@@ -2110,6 +2189,18 @@ static irqreturn_t rtl8139_interrupt (in
+ 	return IRQ_RETVAL(handled);
+ }
+ 
++#ifdef CONFIG_NET_POLL_CONTROLLER
++/*
++ * Polling receive - used by netconsole and other diagnostic tools
++ * to allow network i/o with interrupts disabled.
++ */
++static void rtl8139_poll_controller(struct net_device *dev)
++{
++	disable_irq(dev->irq);
++	rtl8139_interrupt(dev->irq, dev, NULL);
++	enable_irq(dev->irq);
++}
++#endif
+ 
+ static int rtl8139_close (struct net_device *dev)
+ {
+@@ -2130,8 +2221,9 @@ static int rtl8139_close (struct net_dev
+ 		}
+ 		wait_for_completion (&tp->thr_exited);
+ 	}
+-
+-	DPRINTK ("%s: Shutting down ethercard, status was 0x%4.4x.\n",
++	
++	if (netif_msg_ifdown(tp))
++		printk(KERN_DEBUG "%s: Shutting down ethercard, status was 0x%4.4x.\n",
+ 			dev->name, RTL_R16 (IntrStatus));
+ 
+ 	spin_lock_irqsave (&tp->lock, flags);
+@@ -2289,12 +2381,14 @@ static u32 rtl8139_get_link(struct net_d
+ 
+ static u32 rtl8139_get_msglevel(struct net_device *dev)
+ {
+-	return debug;
++	struct rtl8139_private *np = dev->priv;
++	return np->msg_enable;
+ }
+ 
+ static void rtl8139_set_msglevel(struct net_device *dev, u32 datum)
+ {
+-	debug = datum;
++	struct rtl8139_private *np = dev->priv;
++	np->msg_enable = datum;
+ }
+ 
+ /* TODO: we are too slack to do reg dumping for pio, for now */
+@@ -2475,10 +2569,11 @@ static int rtl8139_suspend (struct pci_d
+ 	tp->stats.rx_missed_errors += RTL_R32 (RxMissed);
+ 	RTL_W32 (RxMissed, 0);
+ 
++	spin_unlock_irqrestore (&tp->lock, flags);
++
+ 	pci_set_power_state (pdev, 3);
+ 	pci_save_state (pdev, tp->pci_state);
+ 
+-	spin_unlock_irqrestore (&tp->lock, flags);
+ 	return 0;
+ }
+ 
+--- linux-2.6.0/drivers/net/82596.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/net/82596.c	2003-12-28 23:21:00.000000000 -0800
+@@ -1129,21 +1129,40 @@ static void print_eth(unsigned char *add
+ 	printk(" %02X%02X, %s\n", add[12], add[13], str);
+ }
+ 
+-int __init i82596_probe(struct net_device *dev)
++static int io = 0x300;
++static int irq = 10;
++
++struct net_device * __init i82596_probe(int unit)
+ {
++	struct net_device *dev;
+ 	int i;
+ 	struct i596_private *lp;
+ 	char eth_addr[8];
+ 	static int probed;
++	int err;
+ 
+ 	if (probed)
+-		return -ENODEV;
++		return ERR_PTR(-ENODEV);
+ 	probed++;
++
++	dev = alloc_etherdev(0);
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	if (unit >= 0) {
++		sprintf(dev->name, "eth%d", unit);
++		netdev_boot_setup_check(dev);
++	} else {
++		dev->base_addr = io;
++		dev->irq = irq;
++	}
++
+ #ifdef ENABLE_MVME16x_NET
+ 	if (MACH_IS_MVME16x) {
+ 		if (mvme16x_config & MVME16x_CONFIG_NO_ETHERNET) {
+ 			printk(KERN_NOTICE "Ethernet probe disabled - chip not present\n");
+-			return -ENODEV;
++			err = -ENODEV;
++			goto out;
+ 		}
+ 		memcpy(eth_addr, (void *) 0xfffc1f2c, 6);	/* YUCK! Get addr from NOVRAM */
+ 		dev->base_addr = MVME_I596_BASE;
+@@ -1174,7 +1193,8 @@ int __init i82596_probe(struct net_devic
+ 
+ 		if (!request_region(ioaddr, I596_TOTAL_SIZE, dev->name)) {
+ 			printk(KERN_ERR "82596: IO address 0x%04x in use\n", ioaddr);
+-			return -EBUSY;
++			err = -EBUSY;
++			goto out;
+ 		}
+ 
+ 		for (i = 0; i < 8; i++) {
+@@ -1190,8 +1210,8 @@ int __init i82596_probe(struct net_devic
+ 
+ 		if ((checksum % 0x100) || 
+ 		    (memcmp(eth_addr, "\x00\x00\x49", 3) != 0)) {
+-			release_region(ioaddr, I596_TOTAL_SIZE);
+-			return -ENODEV;
++			err = -ENODEV;
++			goto out1;
+ 		}
+ 
+ 		dev->base_addr = ioaddr;
+@@ -1200,13 +1220,10 @@ int __init i82596_probe(struct net_devic
+ #endif
+ 	dev->mem_start = (int)__get_free_pages(GFP_ATOMIC, 0);
+ 	if (!dev->mem_start) {
+-#ifdef ENABLE_APRICOT
+-		release_region(dev->base_addr, I596_TOTAL_SIZE);
+-#endif
+-		return -ENOMEM;
++		err = -ENOMEM;
++		goto out1;
+ 	}
+ 
+-	ether_setup(dev);
+ 	DEB(DEB_PROBE,printk(KERN_INFO "%s: 82596 at %#3lx,", dev->name, dev->base_addr));
+ 
+ 	for (i = 0; i < 6; i++)
+@@ -1244,7 +1261,26 @@ int __init i82596_probe(struct net_devic
+ 	lp->scb.rfd = I596_NULL;
+ 	lp->lock = SPIN_LOCK_UNLOCKED;
+ 
+-	return 0;
++	err = register_netdev(dev);
++	if (err)
++		goto out2;
++	return dev;
++out2:
++#ifdef __mc68000__
++	/* XXX This assumes default cache mode to be IOMAP_FULL_CACHING,
++	 * XXX which may be invalid (CONFIG_060_WRITETHROUGH)
++	 */
++	kernel_set_cachemode((void *)(dev->mem_start), 4096,
++			IOMAP_FULL_CACHING);
++#endif
++	free_page ((u32)(dev->mem_start));
++out1:
++#ifdef ENABLE_APRICOT
++	release_region(dev->base_addr, I596_TOTAL_SIZE);
++#endif
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
+ static irqreturn_t i596_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+@@ -1532,11 +1568,9 @@ static void set_multicast_list(struct ne
+ }
+ 
+ #ifdef MODULE
+-static struct net_device dev_82596 = { .init = i82596_probe };
++static struct net_device *dev_82596;
+ 
+ #ifdef ENABLE_APRICOT
+-static int io = 0x300;
+-static int irq = 10;
+ MODULE_PARM(irq, "i");
+ MODULE_PARM_DESC(irq, "Apricot IRQ number");
+ #endif
+@@ -1547,34 +1581,31 @@ static int debug = -1;
+ 
+ int init_module(void)
+ {
+-#ifdef ENABLE_APRICOT
+-	dev_82596.base_addr = io;
+-	dev_82596.irq = irq;
+-#endif
+ 	if (debug >= 0)
+ 		i596_debug = debug;
+-	if (register_netdev(&dev_82596) != 0)
+-		return -EIO;
++	dev_82596 = i82596_probe(-1);
++	if (IS_ERR(dev_82596))
++		return PTR_ERR(dev_82596);
+ 	return 0;
+ }
+ 
+ void cleanup_module(void)
+ {
+-	unregister_netdev(&dev_82596);
++	unregister_netdev(dev_82596);
+ #ifdef __mc68000__
+ 	/* XXX This assumes default cache mode to be IOMAP_FULL_CACHING,
+ 	 * XXX which may be invalid (CONFIG_060_WRITETHROUGH)
+ 	 */
+ 
+-	kernel_set_cachemode((void *)(dev_82596.mem_start), 4096,
++	kernel_set_cachemode((void *)(dev_82596->mem_start), 4096,
+ 			IOMAP_FULL_CACHING);
+ #endif
+-	free_page ((u32)(dev_82596.mem_start));
+-	dev_82596.priv = NULL;
++	free_page ((u32)(dev_82596->mem_start));
+ #ifdef ENABLE_APRICOT
+ 	/* If we don't do this, we can't re-insmod it later. */
+-	release_region(dev_82596.base_addr, I596_TOTAL_SIZE);
++	release_region(dev_82596->base_addr, I596_TOTAL_SIZE);
+ #endif
++	free_netdev(dev_82596);
+ }
+ 
+ #endif				/* MODULE */
+--- linux-2.6.0/drivers/net/8390.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/net/8390.c	2003-12-28 23:21:00.000000000 -0800
+@@ -157,15 +157,8 @@ static void do_set_multicast_list(struct
+ int ei_open(struct net_device *dev)
+ {
+ 	unsigned long flags;
+-	struct ei_device *ei_local = (struct ei_device *) dev->priv;
++	struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
+ 
+-	/* This can't happen unless somebody forgot to call ethdev_init(). */
+-	if (ei_local == NULL) 
+-	{
+-		printk(KERN_EMERG "%s: ei_open passed a non-existent device!\n", dev->name);
+-		return -ENXIO;
+-	}
+-	
+ 	/* The card I/O part of the driver (e.g. 3c503) can hook a Tx timeout
+ 	    wrapper that does e.g. media check & then calls ei_tx_timeout. */
+ 	if (dev->tx_timeout == NULL)
+@@ -196,7 +189,7 @@ int ei_open(struct net_device *dev)
+  */
+ int ei_close(struct net_device *dev)
+ {
+-	struct ei_device *ei_local = (struct ei_device *) dev->priv;
++	struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
+ 	unsigned long flags;
+ 
+ 	/*
+@@ -221,7 +214,7 @@ int ei_close(struct net_device *dev)
+ void ei_tx_timeout(struct net_device *dev)
+ {
+ 	long e8390_base = dev->base_addr;
+-	struct ei_device *ei_local = (struct ei_device *) dev->priv;
++	struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
+ 	int txsr, isr, tickssofar = jiffies - dev->trans_start;
+ 	unsigned long flags;
+ 
+@@ -267,7 +260,7 @@ void ei_tx_timeout(struct net_device *de
+ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
+ {
+ 	long e8390_base = dev->base_addr;
+-	struct ei_device *ei_local = (struct ei_device *) dev->priv;
++	struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
+ 	int length, send_length, output_page;
+ 	unsigned long flags;
+ 	char scratch[ETH_ZLEN];
+@@ -435,7 +428,7 @@ irqreturn_t ei_interrupt(int irq, void *
+ 	}
+     
+ 	e8390_base = dev->base_addr;
+-	ei_local = (struct ei_device *) dev->priv;
++	ei_local = (struct ei_device *) netdev_priv(dev);
+ 
+ 	/*
+ 	 *	Protect the irq test too.
+@@ -540,7 +533,7 @@ irqreturn_t ei_interrupt(int irq, void *
+ static void ei_tx_err(struct net_device *dev)
+ {
+ 	long e8390_base = dev->base_addr;
+-	struct ei_device *ei_local = (struct ei_device *) dev->priv;
++	struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
+ 	unsigned char txsr = inb_p(e8390_base+EN0_TSR);
+ 	unsigned char tx_was_aborted = txsr & (ENTSR_ABT+ENTSR_FU);
+ 
+@@ -583,7 +576,7 @@ static void ei_tx_err(struct net_device 
+ static void ei_tx_intr(struct net_device *dev)
+ {
+ 	long e8390_base = dev->base_addr;
+-	struct ei_device *ei_local = (struct ei_device *) dev->priv;
++	struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
+ 	int status = inb(e8390_base + EN0_TSR);
+     
+ 	outb_p(ENISR_TX, e8390_base + EN0_ISR); /* Ack intr. */
+@@ -675,7 +668,7 @@ static void ei_tx_intr(struct net_device
+ static void ei_receive(struct net_device *dev)
+ {
+ 	long e8390_base = dev->base_addr;
+-	struct ei_device *ei_local = (struct ei_device *) dev->priv;
++	struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
+ 	unsigned char rxing_page, this_frame, next_frame;
+ 	unsigned short current_offset;
+ 	int rx_pkt_count = 0;
+@@ -813,7 +806,7 @@ static void ei_rx_overrun(struct net_dev
+ {
+ 	long e8390_base = dev->base_addr;
+ 	unsigned char was_txing, must_resend = 0;
+-	struct ei_device *ei_local = (struct ei_device *) dev->priv;
++	struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
+     
+ 	/*
+ 	 * Record whether a Tx was in progress and then issue the
+@@ -881,7 +874,7 @@ static void ei_rx_overrun(struct net_dev
+ static struct net_device_stats *get_stats(struct net_device *dev)
+ {
+ 	long ioaddr = dev->base_addr;
+-	struct ei_device *ei_local = (struct ei_device *) dev->priv;
++	struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
+ 	unsigned long flags;
+     
+ 	/* If the card is stopped, just return the present stats. */
+@@ -936,7 +929,7 @@ static void do_set_multicast_list(struct
+ {
+ 	long e8390_base = dev->base_addr;
+ 	int i;
+-	struct ei_device *ei_local = (struct ei_device*)dev->priv;
++	struct ei_device *ei_local = (struct ei_device*)netdev_priv(dev);
+ 
+ 	if (!(dev->flags&(IFF_PROMISC|IFF_ALLMULTI))) 
+ 	{
+@@ -990,53 +983,34 @@ static void do_set_multicast_list(struct
+ static void set_multicast_list(struct net_device *dev)
+ {
+ 	unsigned long flags;
+-	struct ei_device *ei_local = (struct ei_device*)dev->priv;
++	struct ei_device *ei_local = (struct ei_device*)netdev_priv(dev);
+ 	
+ 	spin_lock_irqsave(&ei_local->page_lock, flags);
+ 	do_set_multicast_list(dev);
+ 	spin_unlock_irqrestore(&ei_local->page_lock, flags);
+ }	
+ 
+-static inline void ei_device_init(struct ei_device *ei_local)
+-{
+-	spin_lock_init(&ei_local->page_lock);
+-}
+-
+ /**
+- * ethdev_init - init rest of 8390 device struct
++ * ethdev_setup - init rest of 8390 device struct
+  * @dev: network device structure to init
+  *
+  * Initialize the rest of the 8390 device structure.  Do NOT __init
+  * this, as it is used by 8390 based modular drivers too.
+  */
+ 
+-int ethdev_init(struct net_device *dev)
++static void ethdev_setup(struct net_device *dev)
+ {
++	struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
+ 	if (ei_debug > 1)
+ 		printk(version);
+     
+-	if (dev->priv == NULL) 
+-	{
+-		dev->priv = kmalloc(sizeof(struct ei_device), GFP_KERNEL);
+-		if (dev->priv == NULL)
+-			return -ENOMEM;
+-		memset(dev->priv, 0, sizeof(struct ei_device));
+-		ei_device_init(dev->priv);
+-	}
+-    
+ 	dev->hard_start_xmit = &ei_start_xmit;
+ 	dev->get_stats	= get_stats;
+ 	dev->set_multicast_list = &set_multicast_list;
+ 
+ 	ether_setup(dev);
+-        
+-	return 0;
+-}
+ 
+-/* wrapper to make alloc_netdev happy; probably should just cast... */
+-static void __ethdev_init(struct net_device *dev)
+-{
+-	ethdev_init(dev);
++	spin_lock_init(&ei_local->page_lock);
+ }
+ 
+ /**
+@@ -1044,15 +1018,10 @@ static void __ethdev_init(struct net_dev
+  *
+  * Allocate 8390-specific net_device.
+  */
+-struct net_device *alloc_ei_netdev(void)
++struct net_device *__alloc_ei_netdev(int size)
+ {
+-	struct net_device *dev;
+-	
+-	dev = alloc_netdev(sizeof(struct ei_device), "eth%d", __ethdev_init);
+-	if (dev)
+-		ei_device_init(dev->priv);
+-
+-	return dev;
++	return alloc_netdev(sizeof(struct ei_device) + size, "eth%d",
++				ethdev_setup);
+ }
+ 
+ 
+@@ -1072,7 +1041,7 @@ struct net_device *alloc_ei_netdev(void)
+ void NS8390_init(struct net_device *dev, int startp)
+ {
+ 	long e8390_base = dev->base_addr;
+-	struct ei_device *ei_local = (struct ei_device *) dev->priv;
++	struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
+ 	int i;
+ 	int endcfg = ei_local->word16
+ 	    ? (0x48 | ENDCFG_WTS | (ei_local->bigendian ? ENDCFG_BOS : 0))
+@@ -1136,7 +1105,7 @@ static void NS8390_trigger_send(struct n
+ 								int start_page)
+ {
+ 	long e8390_base = dev->base_addr;
+- 	struct ei_device *ei_local __attribute((unused)) = (struct ei_device *) dev->priv;
++ 	struct ei_device *ei_local __attribute((unused)) = (struct ei_device *) netdev_priv(dev);
+    
+ 	outb_p(E8390_NODMA+E8390_PAGE0, e8390_base+E8390_CMD);
+     
+@@ -1156,9 +1125,8 @@ EXPORT_SYMBOL(ei_open);
+ EXPORT_SYMBOL(ei_close);
+ EXPORT_SYMBOL(ei_interrupt);
+ EXPORT_SYMBOL(ei_tx_timeout);
+-EXPORT_SYMBOL(ethdev_init);
+ EXPORT_SYMBOL(NS8390_init);
+-EXPORT_SYMBOL(alloc_ei_netdev);
++EXPORT_SYMBOL(__alloc_ei_netdev);
+ 
+ #if defined(MODULE)
+ 
+--- linux-2.6.0/drivers/net/8390.h	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/8390.h	2003-12-28 23:21:00.000000000 -0800
+@@ -39,12 +39,15 @@ extern int ei_debug;
+ #define ei_debug 1
+ #endif
+ 
+-extern int ethdev_init(struct net_device *dev);
+ extern void NS8390_init(struct net_device *dev, int startp);
+ extern int ei_open(struct net_device *dev);
+ extern int ei_close(struct net_device *dev);
+ extern irqreturn_t ei_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+-extern struct net_device *alloc_ei_netdev(void);
++extern struct net_device *__alloc_ei_netdev(int size);
++static inline struct net_device *alloc_ei_netdev(void)
++{
++	return __alloc_ei_netdev(0);
++}
+ 
+ /* You have one of these per-board */
+ struct ei_device {
+@@ -84,7 +87,7 @@ struct ei_device {
+ /* The maximum time waited (in jiffies) before assuming a Tx failed. (20ms) */
+ #define TX_TIMEOUT (20*HZ/100)
+ 
+-#define ei_status (*(struct ei_device *)(dev->priv))
++#define ei_status (*(struct ei_device *)netdev_priv(dev))
+ 
+ /* Some generic ethernet register configurations. */
+ #define E8390_TX_IRQ_MASK	0xa	/* For register EN0_ISR */
+--- linux-2.6.0/drivers/net/a2065.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/a2065.c	2003-12-28 23:21:00.000000000 -0800
+@@ -737,7 +737,7 @@ static int __init a2065_probe(void)
+ 			continue;
+ 		}
+ 
+-		dev = init_etherdev(NULL, sizeof(struct lance_private));
++		dev = alloc_etherdev(sizeof(struct lance_private));
+ 
+ 		if (dev == NULL) {
+ 			release_resource(r1);
+@@ -791,17 +791,22 @@ static int __init a2065_probe(void)
+ 		dev->set_multicast_list = &lance_set_multicast;
+ 		dev->dma = 0;
+ 
+-#ifdef MODULE
+-		priv->next_module = root_a2065_dev;
+-		root_a2065_dev = priv;
+-#endif
+-		ether_setup(dev);
+ 		init_timer(&priv->multicast_timer);
+ 		priv->multicast_timer.data = (unsigned long) dev;
+ 		priv->multicast_timer.function =
+ 			(void (*)(unsigned long)) &lance_set_multicast;
+ 
+-		res = 0;
++		res = register_netdev(dev);
++		if (res) {
++			release_resource(r1);
++			release_resource(r2);
++			free_netdev(dev);
++			break;
++		}
++#ifdef MODULE
++		priv->next_module = root_a2065_dev;
++		root_a2065_dev = priv;
++#endif
+ 	}
+ 	return res;
+ }
+--- linux-2.6.0/drivers/net/ac3200.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/ac3200.c	2003-12-28 23:21:00.000000000 -0800
+@@ -75,7 +75,6 @@ static const char *port_name[4] = { "10b
+ #define AC_START_PG		0x00	/* First page of 8390 TX buffer */
+ #define AC_STOP_PG		0x80	/* Last page +1 of the 8390 RX ring */
+ 
+-int ac3200_probe(struct net_device *dev);
+ static int ac_probe1(int ioaddr, struct net_device *dev);
+ 
+ static int ac_open(struct net_device *dev);
+@@ -96,9 +95,11 @@ static int ac_close_card(struct net_devi
+ 	or the unique value in the station address PROM.
+ 	*/
+ 
+-int __init ac3200_probe(struct net_device *dev)
++static int __init do_ac3200_probe(struct net_device *dev)
+ {
+ 	unsigned short ioaddr = dev->base_addr;
++	int irq = dev->irq;
++	int mem_start = dev->mem_start;
+ 
+ 	SET_MODULE_OWNER(dev);
+ 
+@@ -110,13 +111,50 @@ int __init ac3200_probe(struct net_devic
+ 	if ( ! EISA_bus)
+ 		return -ENXIO;
+ 
+-	for (ioaddr = 0x1000; ioaddr < 0x9000; ioaddr += 0x1000)
++	for (ioaddr = 0x1000; ioaddr < 0x9000; ioaddr += 0x1000) {
+ 		if (ac_probe1(ioaddr, dev) == 0)
+ 			return 0;
++		dev->irq = irq;
++		dev->mem_start = mem_start;
++	}
+ 
+ 	return -ENODEV;
+ }
+ 
++static void cleanup_card(struct net_device *dev)
++{
++	/* Someday free_irq may be in ac_close_card() */
++	free_irq(dev->irq, dev);
++	release_region(dev->base_addr, AC_IO_EXTENT);
++	if (ei_status.reg0)
++		iounmap((void *)dev->mem_start);
++}
++
++struct net_device * __init ac3200_probe(int unit)
++{
++	struct net_device *dev = alloc_ei_netdev();
++	int err;
++
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	sprintf(dev->name, "eth%d", unit);
++	netdev_boot_setup_check(dev);
++
++	err = do_ac3200_probe(dev);
++	if (err)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	cleanup_card(dev);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
++}
++
+ static int __init ac_probe1(int ioaddr, struct net_device *dev)
+ {
+ 	int i, retval;
+@@ -156,13 +194,6 @@ static int __init ac_probe1(int ioaddr, 
+ 	}
+ #endif
+ 
+-	/* Allocate dev->priv and fill in 8390 specific dev fields. */
+-	if (ethdev_init(dev)) {
+-		printk (", unable to allocate memory for dev->priv.\n");
+-		retval = -ENOMEM;
+-		goto out;
+-	}
+-
+ 	/* Assign and allocate the interrupt now. */
+ 	if (dev->irq == 0) {
+ 		dev->irq = config2irq(inb(ioaddr + AC_CONFIG));
+@@ -210,7 +241,7 @@ static int __init ac_probe1(int ioaddr, 
+ 			printk(KERN_CRIT "ac3200.c: or to an address above 0x%lx.\n", virt_to_phys(high_memory));
+ 			printk(KERN_CRIT "ac3200.c: Driver NOT installed.\n");
+ 			retval = -EINVAL;
+-			goto out2;
++			goto out1;
+ 		}
+ 		dev->mem_start = (unsigned long)ioremap(dev->mem_start, AC_STOP_PG*0x100);
+ 		if (dev->mem_start == 0) {
+@@ -218,7 +249,7 @@ static int __init ac_probe1(int ioaddr, 
+ 			printk(KERN_ERR "ac3200.c: Try using EISA SCU to set memory below 1MB.\n");
+ 			printk(KERN_ERR "ac3200.c: Driver NOT installed.\n");
+ 			retval = -EINVAL;
+-			goto out2;
++			goto out1;
+ 		}
+ 		ei_status.reg0 = 1;	/* Use as remap flag */
+ 		printk("ac3200.c: remapped %dkB card memory to virtual address %#lx\n",
+@@ -247,11 +278,8 @@ static int __init ac_probe1(int ioaddr, 
+ 	dev->stop = &ac_close_card;
+ 	NS8390_init(dev, 0);
+ 	return 0;
+-out2:
+-	free_irq(dev->irq, dev);
+ out1:
+-	kfree(dev->priv);
+-	dev->priv = NULL;
++	free_irq(dev->irq, dev);
+ out:
+ 	release_region(ioaddr, AC_IO_EXTENT);
+ 	return retval;
+@@ -338,7 +366,7 @@ static int ac_close_card(struct net_devi
+ 
+ #ifdef MODULE
+ #define MAX_AC32_CARDS	4	/* Max number of AC32 cards per module */
+-static struct net_device dev_ac32[MAX_AC32_CARDS];
++static struct net_device *dev_ac32[MAX_AC32_CARDS];
+ static int io[MAX_AC32_CARDS];
+ static int irq[MAX_AC32_CARDS];
+ static int mem[MAX_AC32_CARDS];
+@@ -354,26 +382,32 @@ MODULE_LICENSE("GPL");
+ int
+ init_module(void)
+ {
++	struct net_device *dev;
+ 	int this_dev, found = 0;
+ 
+ 	for (this_dev = 0; this_dev < MAX_AC32_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_ac32[this_dev];
++		if (io[this_dev] == 0 && this_dev != 0)
++			break;
++		dev = alloc_ei_netdev();
++		if (!dev)
++			break;
+ 		dev->irq = irq[this_dev];
+ 		dev->base_addr = io[this_dev];
+ 		dev->mem_start = mem[this_dev];		/* Currently ignored by driver */
+-		dev->init = ac3200_probe;
+-		/* Default is to only install one card. */
+-		if (io[this_dev] == 0 && this_dev != 0) break;
+-		if (register_netdev(dev) != 0) {
+-			printk(KERN_WARNING "ac3200.c: No ac3200 card found (i/o = 0x%x).\n", io[this_dev]);
+-			if (found != 0) {	/* Got at least one. */
+-				return 0;
++		if (do_ac3200_probe(dev) == 0) {
++			if (register_netdev(dev) == 0) {
++				dev_ac32[found++] = dev;
++				continue;
+ 			}
+-			return -ENXIO;
++			cleanup_card(dev);
+ 		}
+-		found++;
+-	}
+-	return 0;
++		free_netdev(dev);
++		printk(KERN_WARNING "ac3200.c: No ac3200 card found (i/o = 0x%x).\n", io[this_dev]);
++		break;
++	}
++	if (found)
++		return 0;
++	return -ENXIO;
+ }
+ 
+ void
+@@ -382,16 +416,11 @@ cleanup_module(void)
+ 	int this_dev;
+ 
+ 	for (this_dev = 0; this_dev < MAX_AC32_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_ac32[this_dev];
+-		if (dev->priv != NULL) {
+-			/* Someday free_irq may be in ac_close_card() */
+-			free_irq(dev->irq, dev);
+-			release_region(dev->base_addr, AC_IO_EXTENT);
+-			if (ei_status.reg0)
+-				iounmap((void *)dev->mem_start);
++		struct net_device *dev = dev_ac32[this_dev];
++		if (dev) {
+ 			unregister_netdev(dev);
+-			kfree(dev->priv);
+-			dev->priv = NULL;
++			cleanup_card(dev);
++			free_netdev(dev);
+ 		}
+ 	}
+ }
+--- linux-2.6.0/drivers/net/amd8111e.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/net/amd8111e.c	2003-12-28 23:21:00.000000000 -0800
+@@ -1153,6 +1153,17 @@ err_no_interrupt:
+ 	return IRQ_RETVAL(handled);
+ }
+ 
++#ifdef CONFIG_NET_POLL_CONTROLLER
++static void amd8111e_poll(struct net_device *dev)
++{ 
++	unsigned long flags;
++	local_save_flags(flags); 
++	local_irq_disable();
++	amd8111e_interrupt(0, dev, NULL);
++	local_irq_restore(flags); 
++} 
++#endif
++
+ /*
+ This function closes the network interface and updates the statistics so that most recent statistics will be available after the interface is down.
+ */
+@@ -1884,6 +1895,9 @@ static int __devinit amd8111e_probe_one(
+ 	dev->irq =pdev->irq;
+ 	dev->tx_timeout = amd8111e_tx_timeout; 
+ 	dev->watchdog_timeo = AMD8111E_TX_TIMEOUT; 
++#ifdef CONFIG_NET_POLL_CONTROLLER
++	dev->poll_controller = amd8111e_poll; 
++#endif
+ 
+ #if AMD8111E_VLAN_TAG_USED
+ 	dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+--- linux-2.6.0/drivers/net/apne.c	2003-06-14 12:18:51.000000000 -0700
++++ 25/drivers/net/apne.c	2003-12-28 23:21:00.000000000 -0800
+@@ -72,7 +72,7 @@
+ #define NESM_STOP_PG	0x80	/* Last page +1 of RX ring */
+ 
+ 
+-int apne_probe(struct net_device *dev);
++struct net_device * __init apne_probe(int unit);
+ static int apne_probe1(struct net_device *dev, int ioaddr);
+ 
+ static int apne_open(struct net_device *dev);
+@@ -116,28 +116,37 @@ static const char version[] =
+ 
+ static int apne_owned;	/* signal if card already owned */
+ 
+-int __init apne_probe(struct net_device *dev)
++struct net_device * __init apne_probe(int unit)
+ {
++	struct net_device *dev;
+ #ifndef MANUAL_CONFIG
+ 	char tuple[8];
+ #endif
++	int err;
+ 
+ 	if (apne_owned)
+-		return -ENODEV;
+-
+-	SET_MODULE_OWNER(dev);
++		return ERR_PTR(-ENODEV);
+ 
+ 	if ( !(AMIGAHW_PRESENT(PCMCIA)) )
+-		return (-ENODEV);
++		return ERR_PTR(-ENODEV);
+                                 
+ 	printk("Looking for PCMCIA ethernet card : ");
+                                         
+ 	/* check if a card is inserted */
+ 	if (!(PCMCIA_INSERTED)) {
+ 		printk("NO PCMCIA card inserted\n");
+-		return (-ENODEV);
++		return ERR_PTR(-ENODEV);
+ 	}
+-                                                                                                
++
++	dev = alloc_ei_netdev();
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++	if (unit >= 0) {
++		sprintf(dev->name, "eth%d", unit);
++		netdev_boot_setup_check(dev);
++	}
++	SET_MODULE_OWNER(dev);
++
+ 	/* disable pcmcia irq for readtuple */
+ 	pcmcia_disable_irq();
+ 
+@@ -145,17 +154,41 @@ int __init apne_probe(struct net_device 
+ 	if ((pcmcia_copy_tuple(CISTPL_FUNCID, tuple, 8) < 3) ||
+ 		(tuple[2] != CISTPL_FUNCID_NETWORK)) {
+ 		printk("not an ethernet card\n");
+-		return (-ENODEV);
++		/* XXX: shouldn't we re-enable irq here? */
++		free_netdev(dev);
++		return ERR_PTR(-ENODEV);
+ 	}
+ #endif
+ 
+ 	printk("ethernet PCMCIA card inserted\n");
+ 
+-	if (init_pcmcia())
+-		return apne_probe1(dev, IOBASE);
+-	else
+-		return (-ENODEV);
++	if (!init_pcmcia()) {
++		/* XXX: shouldn't we re-enable irq here? */
++		free_netdev(dev);
++		return ERR_PTR(-ENODEV);
++	}
+ 
++	if (!request_region(IOBASE, 0x20, dev->name)) {
++		free_netdev(dev);
++		return ERR_PTR(-EBUSY);
++	}
++
++	err = apne_probe1(dev, IOBASE);
++	if (err) {
++		release_region(IOBASE, 0x20);
++		free_netdev(dev);
++		return ERR_PTR(err);
++	}
++	err = register_netdev(dev);
++	if (!err)
++		return dev;
++
++	pcmcia_disable_irq();
++	free_irq(IRQ_AMIGA_PORTS, dev);
++	pcmcia_reset();
++	release_region(IOBASE, 0x20);
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
+ static int __init apne_probe1(struct net_device *dev, int ioaddr)
+@@ -280,13 +313,6 @@ static int __init apne_probe1(struct net
+     i = request_irq(IRQ_AMIGA_PORTS, apne_interrupt, SA_SHIRQ, dev->name, dev);
+     if (i) return i;
+ 
+-    /* Allocate dev->priv and fill in 8390 specific dev fields. */
+-    if (ethdev_init(dev)) {
+-	printk (" unable to get memory for dev->priv.\n");
+-	free_irq(IRQ_AMIGA_PORTS, dev);
+-	return -ENOMEM;
+-    }
+-
+     for(i = 0; i < ETHER_ADDR_LEN; i++) {
+ 	printk(" %2.2x", SA_prom[i]);
+ 	dev->dev_addr[i] = SA_prom[i];
+@@ -534,32 +560,27 @@ static irqreturn_t apne_interrupt(int ir
+ }
+ 
+ #ifdef MODULE
+-static struct net_device apne_dev;
++static struct net_device *apne_dev;
+ 
+ int init_module(void)
+ {
+-	int err;
+-
+-	apne_dev.init = apne_probe;
+-	if ((err = register_netdev(&apne_dev))) {
+-		if (err == -EIO)
+-			printk("No PCMCIA NEx000 ethernet card found.\n");
+-		return (err);
+-	}
+-	return (0);
++	apne_dev = apne_probe(-1);
++	if (IS_ERR(apne_dev))
++		return PTR_ERR(apne_dev);
++	return 0;
+ }
+ 
+ void cleanup_module(void)
+ {
+-	unregister_netdev(&apne_dev);
++	unregister_netdev(apne_dev);
+ 
+ 	pcmcia_disable_irq();
+ 
+-	free_irq(IRQ_AMIGA_PORTS, &apne_dev);
++	free_irq(IRQ_AMIGA_PORTS, apne_dev);
+ 
+ 	pcmcia_reset();
+ 
+-	apne_owned = 0;
++	free_netdev(apne_dev);
+ }
+ 
+ #endif
+--- linux-2.6.0/drivers/net/appletalk/ipddp.c	2003-06-14 12:17:57.000000000 -0700
++++ 25/drivers/net/appletalk/ipddp.c	2003-12-28 23:21:00.000000000 -0800
+@@ -28,6 +28,7 @@
+ #include <linux/kernel.h>
+ #include <linux/init.h>
+ #include <linux/netdevice.h>
++#include <linux/etherdevice.h>
+ #include <linux/ip.h>
+ #include <linux/atalk.h>
+ #include <linux/if_arp.h>
+@@ -55,34 +56,24 @@ static struct ipddp_route* ipddp_find_ro
+ static int ipddp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
+ 
+ 
+-static int __init ipddp_init(struct net_device *dev)
++static struct net_device * __init ipddp_init(void)
+ {
+ 	static unsigned version_printed;
++	struct net_device *dev;
++	int err;
++
++	dev = alloc_etherdev(sizeof(struct net_device_stats));
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
+ 
+ 	SET_MODULE_OWNER(dev);
++	strcpy(dev->name, "ipddp%d");
+ 
+ 	if (version_printed++ == 0)
+                 printk(version);
+ 
+-	/* Let the user now what mode we are in */
+-	if(ipddp_mode == IPDDP_ENCAP)
+-		printk("%s: Appletalk-IP Encap. mode by Bradford W. Johnson <johns393@maroon.tc.umn.edu>\n", 
+-			dev->name);
+-	if(ipddp_mode == IPDDP_DECAP)
+-		printk("%s: Appletalk-IP Decap. mode by Jay Schulist <jschlst@samba.org>\n", 
+-			dev->name);
+-
+-	/* Fill in the device structure with ethernet-generic values. */
+-        ether_setup(dev);
+-
+ 	/* Initalize the device structure. */
+         dev->hard_start_xmit = ipddp_xmit;
+-
+-        dev->priv = kmalloc(sizeof(struct net_device_stats), GFP_KERNEL);
+-        if(!dev->priv)
+-                return -ENOMEM;
+-        memset(dev->priv,0,sizeof(struct net_device_stats));
+-
+         dev->get_stats      = ipddp_get_stats;
+         dev->do_ioctl       = ipddp_ioctl;
+ 
+@@ -97,7 +88,21 @@ static int __init ipddp_init(struct net_
+          */
+         dev->hard_header_len = 14+8+sizeof(struct ddpehdr)+1;
+ 
+-        return 0;
++	err = register_netdev(dev);
++	if (err) {
++		free_netdev(dev);
++		return ERR_PTR(err);
++	}
++
++	/* Let the user now what mode we are in */
++	if(ipddp_mode == IPDDP_ENCAP)
++		printk("%s: Appletalk-IP Encap. mode by Bradford W. Johnson <johns393@maroon.tc.umn.edu>\n", 
++			dev->name);
++	if(ipddp_mode == IPDDP_DECAP)
++		printk("%s: Appletalk-IP Decap. mode by Jay Schulist <jschlst@samba.org>\n", 
++			dev->name);
++
++        return dev;
+ }
+ 
+ /*
+@@ -281,23 +286,16 @@ static int ipddp_ioctl(struct net_device
+         }
+ }
+ 
+-static struct net_device dev_ipddp;
++static struct net_device *dev_ipddp;
+ 
+ MODULE_LICENSE("GPL");
+ MODULE_PARM(ipddp_mode, "i");
+ 
+ static int __init ipddp_init_module(void)
+ {
+-	int err;
+-
+-	dev_ipddp.init = ipddp_init;
+-	err=dev_alloc_name(&dev_ipddp, "ipddp%d");
+-        if(err < 0)
+-                return err;
+-
+-	if(register_netdev(&dev_ipddp) != 0)
+-                return -EIO;
+-
++	dev_ipddp = ipddp_init();
++        if (IS_ERR(dev_ipddp))
++                return PTR_ERR(dev_ipddp);
+ 	return 0;
+ }
+ 
+@@ -305,8 +303,8 @@ static void __exit ipddp_cleanup_module(
+ {
+         struct ipddp_route *p;
+ 
+-	unregister_netdev(&dev_ipddp);
+-        kfree(dev_ipddp.priv);
++	unregister_netdev(dev_ipddp);
++        free_netdev(dev_ipddp);
+ 
+         while (ipddp_route_list) {
+                 p = ipddp_route_list->next;
+--- linux-2.6.0/drivers/net/appletalk/ltpc.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/appletalk/ltpc.c	2003-12-28 23:21:00.000000000 -0800
+@@ -1213,7 +1213,7 @@ out3:
+ out2:
+ 	release_region(io, 8);
+ out1:
+-	kfree(dev);
++	free_netdev(dev);
+ out:
+ 	return ERR_PTR(err);
+ }
+--- linux-2.6.0/drivers/net/arcnet/arcnet.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/arcnet/arcnet.c	2003-12-28 23:21:00.000000000 -0800
+@@ -92,6 +92,7 @@ EXPORT_SYMBOL(arc_proto_null);
+ EXPORT_SYMBOL(arcnet_unregister_proto);
+ EXPORT_SYMBOL(arcnet_debug);
+ EXPORT_SYMBOL(arcdev_setup);
++EXPORT_SYMBOL(alloc_arcdev);
+ EXPORT_SYMBOL(arcnet_interrupt);
+ 
+ /* Internal function prototypes */
+@@ -331,6 +332,11 @@ void arcdev_setup(struct net_device *dev
+ 	dev->rebuild_header = arcnet_rebuild_header;
+ }
+ 
++struct net_device *alloc_arcdev(char *name)
++{
++	return alloc_netdev(sizeof(struct arcnet_local),
++			    name && *name ? name : "arc%d", arcdev_setup);
++}
+ 
+ /*
+  * Open/initialize the board.  This is called sometime after booting when
+--- linux-2.6.0/drivers/net/arcnet/arc-rimi.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/arcnet/arc-rimi.c	2003-12-28 23:21:00.000000000 -0800
+@@ -26,6 +26,7 @@
+  */
+ #include <linux/kernel.h>
+ #include <linux/module.h>
++#include <linux/moduleparam.h>
+ #include <linux/ioport.h>
+ #include <linux/slab.h>
+ #include <linux/delay.h>
+@@ -85,8 +86,6 @@ static void arcrimi_copy_from_card(struc
+  */
+ static int __init arcrimi_probe(struct net_device *dev)
+ {
+-	int retval;
+-
+ 	BUGLVL(D_NORMAL) printk(VERSION);
+ 	BUGLVL(D_NORMAL) printk("E-mail me if you actually test the RIM I driver, please!\n");
+ 
+@@ -114,11 +113,7 @@ static int __init arcrimi_probe(struct n
+ 		       "ID!\n");
+ 		return -ENODEV;
+ 	}
+-	retval = arcrimi_found(dev);
+-	if (retval < 0) {
+-		release_mem_region(dev->mem_start, BUFFER_SIZE);
+-	}
+-	return retval;
++	return arcrimi_found(dev);
+ }
+ 
+ 
+@@ -129,11 +124,13 @@ static int __init arcrimi_probe(struct n
+ static int __init arcrimi_found(struct net_device *dev)
+ {
+ 	struct arcnet_local *lp;
+-	u_long first_mirror, last_mirror, shmem;
++	unsigned long first_mirror, last_mirror, shmem;
+ 	int mirror_size;
++	int err;
+ 
+ 	/* reserve the irq */
+ 	if (request_irq(dev->irq, &arcnet_interrupt, 0, "arcnet (RIM I)", dev)) {
++		release_mem_region(dev->mem_start, BUFFER_SIZE);
+ 		BUGMSG(D_NORMAL, "Can't get IRQ %d!\n", dev->irq);
+ 		return -ENODEV;
+ 	}
+@@ -168,11 +165,7 @@ static int __init arcrimi_found(struct n
+ 
+ 	/* initialize the rest of the device structure. */
+ 
+-	lp = dev->priv = kmalloc(sizeof(struct arcnet_local), GFP_KERNEL);
+-	if (!lp) {
+-		BUGMSG(D_NORMAL, "Can't allocate device data!\n");
+-		goto err_free_irq;
+-	}
++	lp = dev->priv;
+ 	lp->card_name = "RIM I";
+ 	lp->hw.command = arcrimi_command;
+ 	lp->hw.status = arcrimi_status;
+@@ -181,18 +174,6 @@ static int __init arcrimi_found(struct n
+ 	lp->hw.owner = THIS_MODULE;
+ 	lp->hw.copy_to_card = arcrimi_copy_to_card;
+ 	lp->hw.copy_from_card = arcrimi_copy_from_card;
+-	lp->mem_start = ioremap(dev->mem_start, dev->mem_end - dev->mem_start + 1);
+-	if (!lp->mem_start) {
+-		BUGMSG(D_NORMAL, "Can't remap device memory!\n");
+-		goto err_free_dev_priv;
+-	}
+-	/* Fill in the fields of the device structure with generic
+-	 * values.
+-	 */
+-	arcdev_setup(dev);
+-
+-	/* get and check the station ID from offset 1 in shmem */
+-	dev->dev_addr[0] = readb(lp->mem_start + 1);
+ 
+ 	/*
+ 	 * re-reserve the memory region - arcrimi_probe() alloced this reqion
+@@ -200,25 +181,40 @@ static int __init arcrimi_found(struct n
+ 	 * with the correct size.  There is a VERY slim chance this could
+ 	 * fail.
+ 	 */
+-	release_mem_region(dev->mem_start, BUFFER_SIZE);
++	release_mem_region(shmem, BUFFER_SIZE);
+ 	if (!request_mem_region(dev->mem_start,
+ 				dev->mem_end - dev->mem_start + 1,
+ 				"arcnet (90xx)")) {
+ 		BUGMSG(D_NORMAL, "Card memory already allocated\n");
+-		goto err_free_dev_priv;
++		goto err_free_irq;
+ 	}
+ 
++	lp->mem_start = ioremap(dev->mem_start, dev->mem_end - dev->mem_start + 1);
++	if (!lp->mem_start) {
++		BUGMSG(D_NORMAL, "Can't remap device memory!\n");
++		goto err_release_mem;
++	}
++
++	/* get and check the station ID from offset 1 in shmem */
++	dev->dev_addr[0] = readb(lp->mem_start + 1);
++
+ 	BUGMSG(D_NORMAL, "ARCnet RIM I: station %02Xh found at IRQ %d, "
+ 	       "ShMem %lXh (%ld*%d bytes).\n",
+ 	       dev->dev_addr[0],
+ 	       dev->irq, dev->mem_start,
+ 	 (dev->mem_end - dev->mem_start + 1) / mirror_size, mirror_size);
+ 
++	err = register_netdev(dev);
++	if (err)
++		goto err_unmap;
++
+ 	return 0;
+ 
+-      err_free_dev_priv:
+-	kfree(dev->priv);
+-      err_free_irq:
++err_unmap:
++	iounmap(lp->mem_start);
++err_release_mem:
++	release_mem_region(dev->mem_start, dev->mem_end - dev->mem_start + 1);
++err_free_irq:
+ 	free_irq(dev->irq, dev);
+ 	return -EIO;
+ }
+@@ -294,94 +290,79 @@ static void arcrimi_copy_from_card(struc
+ 	TIME("memcpy_fromio", count, memcpy_fromio(buf, memaddr, count));
+ }
+ 
+-#ifdef MODULE
++static int node;
++static int io;			/* use the insmod io= irq= node= options */
++static int irq;
++static char device[9];		/* use eg. device=arc1 to change name */
++
++module_param(node, int, 0);
++module_param(io, int, 0);
++module_param(irq, int, 0);
++module_param_string(device, device, sizeof(device), 0);
++MODULE_LICENSE("GPL");
+ 
+ static struct net_device *my_dev;
+ 
+-/* Module parameters */
+-
+-static int node = 0;
+-static int io = 0x0;		/* <--- EDIT THESE LINES FOR YOUR CONFIGURATION */
+-static int irq = 0;		/* or use the insmod io= irq= shmem= options */
+-static char *device;		/* use eg. device="arc1" to change name */
+-
+-MODULE_PARM(node, "i");
+-MODULE_PARM(io, "i");
+-MODULE_PARM(irq, "i");
+-MODULE_PARM(device, "s");
+-MODULE_LICENSE("GPL");
+-
+-int init_module(void)
++static int __init arc_rimi_init(void)
+ {
+ 	struct net_device *dev;
+-	int err;
+ 
+-	dev = dev_alloc(device ? : "arc%d", &err);
++	dev = alloc_arcdev(device);
+ 	if (!dev)
+-		return err;
++		return -ENOMEM;
+ 
+ 	if (node && node != 0xff)
+ 		dev->dev_addr[0] = node;
+ 
+-	dev->base_addr = io;
++	dev->mem_start = io;
+ 	dev->irq = irq;
+ 	if (dev->irq == 2)
+ 		dev->irq = 9;
+ 
+-	if (arcrimi_probe(dev))
++	if (arcrimi_probe(dev)) {
++		free_netdev(dev);
+ 		return -EIO;
++	}
+ 
+ 	my_dev = dev;
+ 	return 0;
+ }
+ 
+-void cleanup_module(void)
++static void __exit arc_rimi_exit(void)
+ {
+ 	struct net_device *dev = my_dev;
+ 	struct arcnet_local *lp = (struct arcnet_local *) dev->priv;
+ 
+ 	unregister_netdev(dev);
+-	free_irq(dev->irq, dev);
+ 	iounmap(lp->mem_start);
+ 	release_mem_region(dev->mem_start, dev->mem_end - dev->mem_start + 1);
+-	kfree(dev->priv);
++	free_irq(dev->irq, dev);
+ 	free_netdev(dev);
+ }
+ 
+-#else
+-
++#ifndef MODULE
+ static int __init arcrimi_setup(char *s)
+ {
+-	struct net_device *dev;
+ 	int ints[8];
+-
+ 	s = get_options(s, 8, ints);
+ 	if (!ints[0])
+ 		return 1;
+-	dev = alloc_bootmem(sizeof(struct net_device));
+-	memset(dev, 0, sizeof(struct net_device));
+-	dev->init = arcrimi_probe;
+-
+ 	switch (ints[0]) {
+ 	default:		/* ERROR */
+ 		printk("arcrimi: Too many arguments.\n");
+ 	case 3:		/* Node ID */
+-		dev->dev_addr[0] = ints[3];
++		node = ints[3];
+ 	case 2:		/* IRQ */
+-		dev->irq = ints[2];
++		irq = ints[2];
+ 	case 1:		/* IO address */
+-		dev->mem_start = ints[1];
++		io = ints[1];
+ 	}
+ 	if (*s)
+-		strncpy(dev->name, s, 9);
+-	else
+-		strcpy(dev->name, "arc%d");
+-	if (register_netdev(dev))
+-		printk(KERN_ERR "arc-rimi: Cannot register arcnet device\n");
+-
++		snprintf(device, sizeof(device), "%s", s);
+ 	return 1;
+ }
+-
+ __setup("arcrimi=", arcrimi_setup);
+-
+ #endif				/* MODULE */
++
++module_init(arc_rimi_init)
++module_exit(arc_rimi_exit)
+--- linux-2.6.0/drivers/net/arcnet/com20020.c	2003-10-08 15:07:09.000000000 -0700
++++ 25/drivers/net/arcnet/com20020.c	2003-12-28 23:21:00.000000000 -0800
+@@ -172,11 +172,6 @@ int com20020_found(struct net_device *de
+ 
+ 	dev->set_multicast_list = com20020_set_mc_list;
+ 
+-	/* Fill in the fields of the device structure with generic
+-	 * values.
+-	 */
+-	arcdev_setup(dev);
+-
+ 	if (!dev->dev_addr[0])
+ 		dev->dev_addr[0] = inb(ioaddr + 8);	/* FIXME: do this some other way! */
+ 
+@@ -221,7 +216,7 @@ int com20020_found(struct net_device *de
+ 	       lp->setup >> 1, 
+ 	       clockrates[3 - ((lp->setup2 & 0xF0) >> 4) + ((lp->setup & 0x0F) >> 1)]);
+ 
+-	if (!dev->init && register_netdev(dev)) {
++	if (register_netdev(dev)) {
+ 		free_irq(dev->irq, dev);
+ 		return -EIO;
+ 	}
+@@ -332,19 +327,10 @@ static void com20020_set_mc_list(struct 
+ 	}
+ }
+ 
+-void com20020_remove(struct net_device *dev)
+-{
+-	unregister_netdev(dev);
+-	free_irq(dev->irq, dev);
+-	kfree(dev->priv);
+-	free_netdev(dev);
+-}
+-
+ #ifdef MODULE
+ 
+ EXPORT_SYMBOL(com20020_check);
+ EXPORT_SYMBOL(com20020_found);
+-EXPORT_SYMBOL(com20020_remove);
+ 
+ MODULE_LICENSE("GPL");
+ 
+--- linux-2.6.0/drivers/net/arcnet/com20020-isa.c	2003-10-08 15:07:09.000000000 -0700
++++ 25/drivers/net/arcnet/com20020-isa.c	2003-12-28 23:21:00.000000000 -0800
+@@ -26,6 +26,7 @@
+  * **********************
+  */
+ #include <linux/module.h>
++#include <linux/moduleparam.h>
+ #include <linux/kernel.h>
+ #include <linux/types.h>
+ #include <linux/ioport.h>
+@@ -117,49 +118,41 @@ out:
+ 	return err;
+ }
+ 
+-
+-#ifdef MODULE
+-
+-static struct net_device *my_dev;
+-
+-/* Module parameters */
+-
+ static int node = 0;
+ static int io = 0x0;		/* <--- EDIT THESE LINES FOR YOUR CONFIGURATION */
+ static int irq = 0;		/* or use the insmod io= irq= shmem= options */
+-static char *device;		/* use eg. device="arc1" to change name */
++static char device[9];		/* use eg. device="arc1" to change name */
+ static int timeout = 3;
+ static int backplane = 0;
+ static int clockp = 0;
+ static int clockm = 0;
+ 
+-MODULE_PARM(node, "i");
+-MODULE_PARM(io, "i");
+-MODULE_PARM(irq, "i");
+-MODULE_PARM(device, "s");
+-MODULE_PARM(timeout, "i");
+-MODULE_PARM(backplane, "i");
+-MODULE_PARM(clockp, "i");
+-MODULE_PARM(clockm, "i");
++module_param(node, int, 0);
++module_param(io, int, 0);
++module_param(irq, int, 0);
++module_param_string(device, device, sizeof(device), 0);
++module_param(timeout, int, 0);
++module_param(backplane, int, 0);
++module_param(clockp, int, 0);
++module_param(clockm, int, 0);
++
+ MODULE_LICENSE("GPL");
+ 
+-int init_module(void)
++static struct net_device *my_dev;
++
++static int __init com20020_init(void)
+ {
+ 	struct net_device *dev;
+ 	struct arcnet_local *lp;
+-	int err;
+ 
+-	dev = dev_alloc(device ? : "arc%d", &err);
++	dev = alloc_arcdev(device);
+ 	if (!dev)
+-		return err;
+-	lp = dev->priv = kmalloc(sizeof(struct arcnet_local), GFP_KERNEL);
+-	if (!lp)
+ 		return -ENOMEM;
+-	memset(lp, 0, sizeof(struct arcnet_local));
+ 
+ 	if (node && node != 0xff)
+ 		dev->dev_addr[0] = node;
+ 
++	lp = dev->priv;
+ 	lp->backplane = backplane;
+ 	lp->clockp = clockp & 7;
+ 	lp->clockm = clockm & 3;
+@@ -172,21 +165,24 @@ int init_module(void)
+ 	if (dev->irq == 2)
+ 		dev->irq = 9;
+ 
+-	if (com20020isa_probe(dev))
++	if (com20020isa_probe(dev)) {
++		free_netdev(dev);
+ 		return -EIO;
++	}
+ 
+ 	my_dev = dev;
+ 	return 0;
+ }
+ 
+-void cleanup_module(void)
++static void __exit com20020_exit(void)
+ {
+-	com20020_remove(my_dev);
++	unregister_netdev(my_dev);
++	free_irq(my_dev->irq, my_dev);
+ 	release_region(my_dev->base_addr, ARCNET_TOTAL_SIZE);
++	free_netdev(my_dev);
+ }
+ 
+-#else
+-
++#ifndef MODULE
+ static int __init com20020isa_setup(char *s)
+ {
+ 	struct net_device *dev;
+@@ -196,37 +192,31 @@ static int __init com20020isa_setup(char
+ 	s = get_options(s, 8, ints);
+ 	if (!ints[0])
+ 		return 1;
+-	dev = alloc_bootmem(sizeof(struct net_device) + sizeof(struct arcnet_local));
+-	memset(dev, 0, sizeof(struct net_device) + sizeof(struct arcnet_local));
+-	lp = dev->priv = (struct arcnet_local *) (dev + 1);
+-	dev->init = com20020isa_probe;
+ 
+ 	switch (ints[0]) {
+ 	default:		/* ERROR */
+ 		printk("com90xx: Too many arguments.\n");
+ 	case 6:		/* Timeout */
+-		lp->timeout = ints[6];
++		timeout = ints[6];
+ 	case 5:		/* CKP value */
+-		lp->clockp = ints[5];
++		clockp = ints[5];
+ 	case 4:		/* Backplane flag */
+-		lp->backplane = ints[4];
++		backplane = ints[4];
+ 	case 3:		/* Node ID */
+-		dev->dev_addr[0] = ints[3];
++		node = ints[3];
+ 	case 2:		/* IRQ */
+-		dev->irq = ints[2];
++		irq = ints[2];
+ 	case 1:		/* IO address */
+-		dev->base_addr = ints[1];
++		io = ints[1];
+ 	}
+ 	if (*s)
+-		strncpy(dev->name, s, 9);
+-	else
+-		strcpy(dev->name, "arc%d");
+-	if (register_netdev(dev))
+-		printk(KERN_ERR "com20020: Cannot register arcnet device\n");
+-
++		snprintf(device, sizeof(device), "%s", s);
+ 	return 1;
+ }
+ 
+ __setup("com20020=", com20020isa_setup);
+ 
+ #endif				/* MODULE */
++
++module_init(com20020_init)
++module_exit(com20020_exit)
+--- linux-2.6.0/drivers/net/arcnet/com20020-pci.c	2003-10-08 15:07:09.000000000 -0700
++++ 25/drivers/net/arcnet/com20020-pci.c	2003-12-28 23:21:00.000000000 -0800
+@@ -27,6 +27,7 @@
+  * **********************
+  */
+ #include <linux/module.h>
++#include <linux/moduleparam.h>
+ #include <linux/kernel.h>
+ #include <linux/types.h>
+ #include <linux/ioport.h>
+@@ -46,18 +47,18 @@
+ /* Module parameters */
+ 
+ static int node;
+-static char *device;		/* use eg. device="arc1" to change name */
++static char device[9];		/* use eg. device="arc1" to change name */
+ static int timeout = 3;
+ static int backplane;
+ static int clockp;
+ static int clockm;
+ 
+-MODULE_PARM(node, "i");
+-MODULE_PARM(device, "s");
+-MODULE_PARM(timeout, "i");
+-MODULE_PARM(backplane, "i");
+-MODULE_PARM(clockp, "i");
+-MODULE_PARM(clockm, "i");
++module_param(node, int, 0);
++module_param_string(device, device, sizeof(device), 0);
++module_param(timeout, int, 0);
++module_param(backplane, int, 0);
++module_param(clockp, int, 0);
++module_param(clockm, int, 0);
+ MODULE_LICENSE("GPL");
+ 
+ static int __devinit com20020pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+@@ -68,15 +69,11 @@ static int __devinit com20020pci_probe(s
+ 
+ 	if (pci_enable_device(pdev))
+ 		return -EIO;
+-	dev = dev_alloc(device ? : "arc%d", &err);
++	dev = alloc_arcdev(device);
+ 	if (!dev)
+-		return err;
+-	lp = dev->priv = kmalloc(sizeof(struct arcnet_local), GFP_KERNEL);
+-	if (!lp) {
+-		err = -ENOMEM;
+-		goto out_dev;
+-	}
+-	memset(lp, 0, sizeof(struct arcnet_local));
++		return -ENOMEM;
++	lp = dev->priv;
++
+ 	pci_set_drvdata(pdev, dev);
+ 
+ 	// SOHARD needs PCI base addr 4
+@@ -89,6 +86,13 @@ static int __devinit com20020pci_probe(s
+ 		ioaddr = pci_resource_start(pdev, 2);
+ 	}
+ 
++	if (!request_region(ioaddr, ARCNET_TOTAL_SIZE, "com20020-pci")) {
++		BUGMSG(D_INIT, "IO region %xh-%xh already allocated.\n",
++		       ioaddr, ioaddr + ARCNET_TOTAL_SIZE - 1);
++		err = -EBUSY;
++		goto out_dev;
++	}
++
+ 	// Dummy access after Reset
+ 	// ARCNET controller needs this access to detect bustype
+ 	outb(0x00,ioaddr+1);
+@@ -105,12 +109,6 @@ static int __devinit com20020pci_probe(s
+ 	lp->timeout = timeout;
+ 	lp->hw.owner = THIS_MODULE;
+ 
+-	if (!request_region(ioaddr, ARCNET_TOTAL_SIZE, "com20020-pci")) {
+-		BUGMSG(D_INIT, "IO region %xh-%xh already allocated.\n",
+-		       ioaddr, ioaddr + ARCNET_TOTAL_SIZE - 1);
+-		err = -EBUSY;
+-		goto out_priv;
+-	}
+ 	if (ASTATUS() == 0xFF) {
+ 		BUGMSG(D_NORMAL, "IO address %Xh was reported by PCI BIOS, "
+ 		       "but seems empty!\n", ioaddr);
+@@ -129,18 +127,18 @@ static int __devinit com20020pci_probe(s
+ 
+ out_port:
+ 	release_region(ioaddr, ARCNET_TOTAL_SIZE);
+-out_priv:
+-	kfree(dev->priv);
+ out_dev:
+-	kfree(dev);
++	free_netdev(dev);
+ 	return err;
+ }
+ 
+ static void __devexit com20020pci_remove(struct pci_dev *pdev)
+ {
+ 	struct net_device *dev = pci_get_drvdata(pdev);
+-	com20020_remove(dev);
++	unregister_netdev(dev);
++	free_irq(dev->irq, dev);
+ 	release_region(dev->base_addr, ARCNET_TOTAL_SIZE);
++	free_netdev(dev);
+ }
+ 
+ static struct pci_device_id com20020pci_id_table[] = {
+--- linux-2.6.0/drivers/net/arcnet/com90io.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/arcnet/com90io.c	2003-12-28 23:21:00.000000000 -0800
+@@ -27,6 +27,7 @@
+  */
+ #include <linux/kernel.h>
+ #include <linux/module.h>
++#include <linux/moduleparam.h>
+ #include <linux/ioport.h>
+ #include <linux/slab.h>
+ #include <linux/delay.h>
+@@ -234,6 +235,7 @@ static int __init com90io_found(struct n
+ {
+ 	struct arcnet_local *lp;
+ 	int ioaddr = dev->base_addr;
++	int err;
+ 
+ 	/* Reserve the irq */
+ 	if (request_irq(dev->irq, &arcnet_interrupt, 0, "arcnet (COM90xx-IO)", dev)) {
+@@ -246,15 +248,6 @@ static int __init com90io_found(struct n
+ 		return -EBUSY;
+ 	}
+ 
+-	/* Initialize the rest of the device structure. */
+-	dev->priv = kmalloc(sizeof(struct arcnet_local), GFP_KERNEL);
+-	if (!dev->priv) {
+-		free_irq(dev->irq, dev);
+-		release_region(dev->base_addr, ARCNET_TOTAL_SIZE);
+-		return -ENOMEM;
+-	}
+-	memset(dev->priv, 0, sizeof(struct arcnet_local));
+-
+ 	lp = (struct arcnet_local *) (dev->priv);
+ 	lp->card_name = "COM90xx I/O";
+ 	lp->hw.command = com90io_command;
+@@ -265,12 +258,6 @@ static int __init com90io_found(struct n
+ 	lp->hw.copy_to_card = com90io_copy_to_card;
+ 	lp->hw.copy_from_card = com90io_copy_from_card;
+ 
+-	/*
+-	 * Fill in the fields of the device structure with generic
+-	 * values.
+-	 */
+-	arcdev_setup(dev);
+-
+ 	lp->config = (0x16 | IOMAPflag) & ~ENABLE16flag;
+ 	SETCONF();
+ 
+@@ -278,6 +265,14 @@ static int __init com90io_found(struct n
+ 
+ 	dev->dev_addr[0] = get_buffer_byte(dev, 1);
+ 
++	err = register_netdev(dev);
++	if (err) {
++		outb((inb(_CONFIG) & ~IOMAPflag), _CONFIG);
++		free_irq(dev->irq, dev);
++		release_region(dev->base_addr, ARCNET_TOTAL_SIZE);
++		return err;
++	}
++
+ 	BUGMSG(D_NORMAL, "COM90IO: station %02Xh found at %03lXh, IRQ %d.\n",
+ 	       dev->dev_addr[0], dev->base_addr, dev->irq);
+ 
+@@ -361,44 +356,67 @@ static void com90io_copy_from_card(struc
+ 	TIME("get_whole_buffer", count, get_whole_buffer(dev, bufnum * 512 + offset, count, buf));
+ }
+ 
+-
+-#ifdef MODULE
+-
+-static struct net_device *my_dev;
+-
+-/* Module parameters */
+-
+ static int io;			/* use the insmod io= irq= shmem= options */
+ static int irq;
+-static char *device;		/* use eg. device=arc1 to change name */
++static char device[9];		/* use eg. device=arc1 to change name */
+ 
+-MODULE_PARM(io, "i");
+-MODULE_PARM(irq, "i");
+-MODULE_PARM(device, "s");
++module_param(io, int, 0);
++module_param(irq, int, 0);
++module_param_string(device, device, sizeof(device), 0);
+ MODULE_LICENSE("GPL");
+ 
+-int init_module(void)
++#ifndef MODULE
++static int __init com90io_setup(char *s)
++{
++	int ints[4];
++	s = get_options(s, 4, ints);
++	if (!ints[0])
++		return 0;
++	switch (ints[0]) {
++	default:		/* ERROR */
++		printk("com90io: Too many arguments.\n");
++	case 2:		/* IRQ */
++		irq = ints[2];
++	case 1:		/* IO address */
++		io = ints[1];
++	}
++	if (*s)
++		snprintf(device, sizeof(device), "%s", s);
++	return 1;
++}
++__setup("com90io=", com90io_setup);
++#endif
++
++static struct net_device *my_dev;
++
++static int __init com90io_init(void)
+ {
+ 	struct net_device *dev;
+ 	int err;
+ 
+-	dev = dev_alloc(device ? : "arc%d", &err);
++	dev = alloc_arcdev(device);
+ 	if (!dev)
+-		return err;
++		return -ENOMEM;
++
++	SET_MODULE_OWNER(dev);
+ 
+ 	dev->base_addr = io;
+ 	dev->irq = irq;
+ 	if (dev->irq == 2)
+ 		dev->irq = 9;
+ 
+-	if (com90io_probe(dev))
+-		return -EIO;
++	err = com90io_probe(dev);
++
++	if (err) {
++		free_netdev(dev);
++		return err;
++	}
+ 
+ 	my_dev = dev;
+ 	return 0;
+ }
+ 
+-void cleanup_module(void)
++static void __exit com90io_exit(void)
+ {
+ 	struct net_device *dev = my_dev;
+ 	int ioaddr = dev->base_addr;
+@@ -410,42 +428,8 @@ void cleanup_module(void)
+ 
+ 	free_irq(dev->irq, dev);
+ 	release_region(dev->base_addr, ARCNET_TOTAL_SIZE);
+-	kfree(dev->priv);
+ 	free_netdev(dev);
+ }
+ 
+-#else
+-
+-static int __init com90io_setup(char *s)
+-{
+-	struct net_device *dev;
+-	int ints[4];
+-
+-	s = get_options(s, 4, ints);
+-	if (!ints[0])
+-		return 0;
+-	dev = alloc_bootmem(sizeof(struct net_device));
+-	memset(dev, 0, sizeof(struct net_device));
+-	dev->init = com90io_probe;
+-
+-	switch (ints[0]) {
+-	default:		/* ERROR */
+-		printk("com90io: Too many arguments.\n");
+-	case 2:		/* IRQ */
+-		dev->irq = ints[2];
+-	case 1:		/* IO address */
+-		dev->base_addr = ints[1];
+-	}
+-	if (*s)
+-		strncpy(dev->name, s, 9);
+-	else
+-		strcpy(dev->name, "arc%d");
+-	if (register_netdev(dev))
+-		printk(KERN_ERR "com90io: Cannot register arcnet device\n");
+-
+-	return 1;
+-}
+-
+-__setup("com90io=", com90io_setup);
+-
+-#endif				/* MODULE */
++module_init(com90io_init)
++module_exit(com90io_exit)
+--- linux-2.6.0/drivers/net/arcnet/com90xx.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/arcnet/com90xx.c	2003-12-28 23:21:00.000000000 -0800
+@@ -25,6 +25,7 @@
+  * **********************
+  */
+ #include <linux/module.h>
++#include <linux/moduleparam.h>
+ #include <linux/init.h>
+ #include <linux/ioport.h>
+ #include <linux/delay.h>
+@@ -52,8 +53,7 @@
+ 
+ 
+ /* Internal function declarations */
+-static int com90xx_found(struct net_device *dev, int ioaddr, int airq,
+-			 u_long shmem);
++static int com90xx_found(int ioaddr, int airq, u_long shmem);
+ static void com90xx_command(struct net_device *dev, int command);
+ static int com90xx_status(struct net_device *dev);
+ static void com90xx_setmask(struct net_device *dev, int mask);
+@@ -98,32 +98,43 @@ static int numcards;
+ 
+ static int com90xx_skip_probe __initdata = 0;
+ 
+-static int __init com90xx_probe(struct net_device *dev)
++/* Module parameters */
++
++static int io;			/* use the insmod io= irq= shmem= options */
++static int irq;
++static int shmem;
++static char device[9];		/* use eg. device=arc1 to change name */
++
++module_param(io, int, 0);
++module_param(irq, int, 0);
++module_param(shmem, int, 0);
++module_param_string(device, device, sizeof(device), 0);
++
++static void __init com90xx_probe(void)
+ {
+-	int count, status, ioaddr, numprint, airq, retval = -ENODEV,
+-	 openparen = 0;
++	int count, status, ioaddr, numprint, airq, openparen = 0;
+ 	unsigned long airqmask;
+ 	int ports[(0x3f0 - 0x200) / 16 + 1] =
+ 	{0};
+ 	u_long shmems[(0xFF800 - 0xA0000) / 2048 + 1] =
+ 	{0};
+ 	int numports, numshmems, *port;
+-	u_long *shmem;
++	u_long *p;
+ 
+-	if (!dev && com90xx_skip_probe)
+-		return -ENODEV;
++	if (!io && !irq && !shmem && !*device && com90xx_skip_probe)
++		return;
+ 
+ 	BUGLVL(D_NORMAL) printk(VERSION);
+ 
+ 	/* set up the arrays where we'll store the possible probe addresses */
+ 	numports = numshmems = 0;
+-	if (dev && dev->base_addr)
+-		ports[numports++] = dev->base_addr;
++	if (io)
++		ports[numports++] = io;
+ 	else
+ 		for (count = 0x200; count <= 0x3f0; count += 16)
+ 			ports[numports++] = count;
+-	if (dev && dev->mem_start)
+-		shmems[numshmems++] = dev->mem_start;
++	if (shmem)
++		shmems[numshmems++] = shmem;
+ 	else
+ 		for (count = 0xA0000; count <= 0xFF800; count += 2048)
+ 			shmems[numshmems++] = count;
+@@ -143,22 +154,19 @@ static int __init com90xx_probe(struct n
+ 
+ 		ioaddr = *port;
+ 
+-		if (check_region(*port, ARCNET_TOTAL_SIZE)) {
++		if (!request_region(*port, ARCNET_TOTAL_SIZE, "arcnet (90xx)")) {
+ 			BUGMSG2(D_INIT_REASONS, "(check_region)\n");
+ 			BUGMSG2(D_INIT_REASONS, "S1: ");
+ 			BUGLVL(D_INIT_REASONS) numprint = 0;
+-			*port = ports[numports - 1];
+-			numports--;
+-			port--;
++			*port-- = ports[--numports];
+ 			continue;
+ 		}
+ 		if (ASTATUS() == 0xFF) {
+ 			BUGMSG2(D_INIT_REASONS, "(empty)\n");
+ 			BUGMSG2(D_INIT_REASONS, "S1: ");
+ 			BUGLVL(D_INIT_REASONS) numprint = 0;
+-			*port = ports[numports - 1];
+-			numports--;
+-			port--;
++			release_region(*port, ARCNET_TOTAL_SIZE);
++			*port-- = ports[--numports];
+ 			continue;
+ 		}
+ 		inb(_RESET);	/* begin resetting card */
+@@ -171,14 +179,14 @@ static int __init com90xx_probe(struct n
+ 
+ 	if (!numports) {
+ 		BUGMSG2(D_NORMAL, "S1: No ARCnet cards found.\n");
+-		return -ENODEV;
++		return;
+ 	}
+ 	/* Stage 2: we have now reset any possible ARCnet cards, so we can't
+ 	 * do anything until they finish.  If D_INIT, print the list of
+ 	 * cards that are left.
+ 	 */
+ 	numprint = -1;
+-	for (port = &ports[0]; port - ports < numports; port++) {
++	for (port = &ports[0]; port < ports + numports; port++) {
+ 		numprint++;
+ 		numprint %= 8;
+ 		if (!numprint) {
+@@ -194,8 +202,8 @@ static int __init com90xx_probe(struct n
+ 	 * 0xD1 byte in the right place, or are read-only.
+ 	 */
+ 	numprint = -1;
+-	for (shmem = &shmems[0]; shmem - shmems < numshmems; shmem++) {
+-		u_long ptr = *shmem;
++	for (p = &shmems[0]; p < shmems + numshmems; p++) {
++		u_long ptr = *p;
+ 
+ 		numprint++;
+ 		numprint %= 8;
+@@ -203,15 +211,13 @@ static int __init com90xx_probe(struct n
+ 			BUGMSG2(D_INIT, "\n");
+ 			BUGMSG2(D_INIT, "S3: ");
+ 		}
+-		BUGMSG2(D_INIT, "%lXh ", *shmem);
++		BUGMSG2(D_INIT, "%lXh ", *p);
+ 
+-		if (check_mem_region(*shmem, BUFFER_SIZE)) {
++		if (!request_mem_region(*p, BUFFER_SIZE, "arcnet (90xx)")) {
+ 			BUGMSG2(D_INIT_REASONS, "(check_mem_region)\n");
+ 			BUGMSG2(D_INIT_REASONS, "Stage 3: ");
+ 			BUGLVL(D_INIT_REASONS) numprint = 0;
+-			*shmem = shmems[numshmems - 1];
+-			numshmems--;
+-			shmem--;
++			*p-- = shmems[--numshmems];
+ 			continue;
+ 		}
+ 		if (isa_readb(ptr) != TESTvalue) {
+@@ -219,9 +225,8 @@ static int __init com90xx_probe(struct n
+ 				isa_readb(ptr), TESTvalue);
+ 			BUGMSG2(D_INIT_REASONS, "S3: ");
+ 			BUGLVL(D_INIT_REASONS) numprint = 0;
+-			*shmem = shmems[numshmems - 1];
+-			numshmems--;
+-			shmem--;
++			release_mem_region(*p, BUFFER_SIZE);
++			*p-- = shmems[--numshmems];
+ 			continue;
+ 		}
+ 		/* By writing 0x42 to the TESTvalue location, we also make
+@@ -233,9 +238,8 @@ static int __init com90xx_probe(struct n
+ 		if (isa_readb(ptr) != 0x42) {
+ 			BUGMSG2(D_INIT_REASONS, "(read only)\n");
+ 			BUGMSG2(D_INIT_REASONS, "S3: ");
+-			*shmem = shmems[numshmems - 1];
+-			numshmems--;
+-			shmem--;
++			release_mem_region(*p, BUFFER_SIZE);
++			*p-- = shmems[--numshmems];
+ 			continue;
+ 		}
+ 		BUGMSG2(D_INIT_REASONS, "\n");
+@@ -246,20 +250,22 @@ static int __init com90xx_probe(struct n
+ 
+ 	if (!numshmems) {
+ 		BUGMSG2(D_NORMAL, "S3: No ARCnet cards found.\n");
+-		return -ENODEV;
++		for (port = &ports[0]; port < ports + numports; port++)
++			release_region(*port, ARCNET_TOTAL_SIZE);
++		return;
+ 	}
+ 	/* Stage 4: something of a dummy, to report the shmems that are
+ 	 * still possible after stage 3.
+ 	 */
+ 	numprint = -1;
+-	for (shmem = &shmems[0]; shmem - shmems < numshmems; shmem++) {
++	for (p = &shmems[0]; p < shmems + numshmems; p++) {
+ 		numprint++;
+ 		numprint %= 8;
+ 		if (!numprint) {
+ 			BUGMSG2(D_INIT, "\n");
+ 			BUGMSG2(D_INIT, "S4: ");
+ 		}
+-		BUGMSG2(D_INIT, "%lXh ", *shmem);
++		BUGMSG2(D_INIT, "%lXh ", *p);
+ 	}
+ 	BUGMSG2(D_INIT, "\n");
+ 
+@@ -271,7 +277,8 @@ static int __init com90xx_probe(struct n
+ 	 * after the first one is found.
+ 	 */
+ 	numprint = -1;
+-	for (port = &ports[0]; port - ports < numports; port++) {
++	for (port = &ports[0]; port < ports + numports; port++) {
++		int found = 0;
+ 		numprint++;
+ 		numprint %= 8;
+ 		if (!numprint) {
+@@ -288,9 +295,8 @@ static int __init com90xx_probe(struct n
+ 			BUGMSG2(D_INIT_REASONS, "(status=%Xh)\n", status);
+ 			BUGMSG2(D_INIT_REASONS, "S5: ");
+ 			BUGLVL(D_INIT_REASONS) numprint = 0;
+-			*port = ports[numports - 1];
+-			numports--;
+-			port--;
++			release_region(*port, ARCNET_TOTAL_SIZE);
++			*port-- = ports[--numports];
+ 			continue;
+ 		}
+ 		ACOMMAND(CFLAGScmd | RESETclear | CONFIGclear);
+@@ -300,15 +306,14 @@ static int __init com90xx_probe(struct n
+ 				status);
+ 			BUGMSG2(D_INIT_REASONS, "S5: ");
+ 			BUGLVL(D_INIT_REASONS) numprint = 0;
+-			*port = ports[numports - 1];
+-			numports--;
+-			port--;
++			release_region(*port, ARCNET_TOTAL_SIZE);
++			*port-- = ports[--numports];
+ 			continue;
+ 		}
+ 		/* skip this completely if an IRQ was given, because maybe
+ 		 * we're on a machine that locks during autoirq!
+ 		 */
+-		if (!dev || !dev->irq) {
++		if (!irq) {
+ 			/* if we do this, we're sure to get an IRQ since the
+ 			 * card has just reset and the NORXflag is on until
+ 			 * we tell it to start receiving.
+@@ -323,13 +328,12 @@ static int __init com90xx_probe(struct n
+ 				BUGMSG2(D_INIT_REASONS, "(airq=%d)\n", airq);
+ 				BUGMSG2(D_INIT_REASONS, "S5: ");
+ 				BUGLVL(D_INIT_REASONS) numprint = 0;
+-				*port = ports[numports - 1];
+-				numports--;
+-				port--;
++				release_region(*port, ARCNET_TOTAL_SIZE);
++				*port-- = ports[--numports];
+ 				continue;
+ 			}
+ 		} else {
+-			airq = dev->irq;
++			airq = irq;
+ 		}
+ 
+ 		BUGMSG2(D_INIT, "(%d,", airq);
+@@ -354,21 +358,20 @@ static int __init com90xx_probe(struct n
+ 		mdelay(RESETtime);
+ #endif
+ 
+-		for (shmem = &shmems[0]; shmem - shmems < numshmems; shmem++) {
+-			u_long ptr = *shmem;
++		for (p = &shmems[0]; p < shmems + numshmems; p++) {
++			u_long ptr = *p;
+ 
+ 			if (isa_readb(ptr) == TESTvalue) {	/* found one */
+-				BUGMSG2(D_INIT, "%lXh)\n", *shmem);
++				BUGMSG2(D_INIT, "%lXh)\n", *p);
+ 				openparen = 0;
+ 
+ 				/* register the card */
+-				retval = com90xx_found(dev, *port, airq, *shmem);
++				if (com90xx_found(*port, airq, *p) == 0)
++					found = 1;
+ 				numprint = -1;
+ 
+ 				/* remove shmem from the list */
+-				*shmem = shmems[numshmems - 1];
+-				numshmems--;
+-
++				*p = shmems[--numshmems];
+ 				break;	/* go to the next I/O port */
+ 			} else {
+ 				BUGMSG2(D_INIT_REASONS, "%Xh-", isa_readb(ptr));
+@@ -380,44 +383,39 @@ static int __init com90xx_probe(struct n
+ 			BUGLVL(D_INIT_REASONS) printk("S5: ");
+ 			BUGLVL(D_INIT_REASONS) numprint = 0;
+ 		}
+-		*port = ports[numports - 1];
+-		numports--;
+-		port--;
++		if (!found)
++			release_region(*port, ARCNET_TOTAL_SIZE);
++		*port-- = ports[--numports];
+ 	}
+ 
+ 	BUGLVL(D_INIT_REASONS) printk("\n");
+ 
+ 	/* Now put back TESTvalue on all leftover shmems. */
+-	for (shmem = &shmems[0]; shmem - shmems < numshmems; shmem++)
+-		isa_writeb(TESTvalue, *shmem);
+-
+-	if (retval && dev && !numcards)
+-		BUGMSG2(D_NORMAL, "S5: No ARCnet cards found.\n");
+-	return retval;
++	for (p = &shmems[0]; p < shmems + numshmems; p++) {
++		isa_writeb(TESTvalue, *p);
++		release_mem_region(*p, BUFFER_SIZE);
++	}
+ }
+ 
+ 
+ /* Set up the struct net_device associated with this card.  Called after
+  * probing succeeds.
+  */
+-static int __init com90xx_found(struct net_device *dev0, int ioaddr, int airq,
+-				u_long shmem)
++static int __init com90xx_found(int ioaddr, int airq, u_long shmem)
+ {
+-	struct net_device *dev = dev0;
++	struct net_device *dev = NULL;
+ 	struct arcnet_local *lp;
+ 	u_long first_mirror, last_mirror;
+-	int mirror_size, err;
++	int mirror_size;
+ 
+-	/* allocate struct net_device if we don't have one yet */
+-	if (!dev && !(dev = dev_alloc("arc%d", &err))) {
++	/* allocate struct net_device */
++	dev = alloc_arcdev(device);
++	if (!dev) {
+ 		BUGMSG2(D_NORMAL, "com90xx: Can't allocate device!\n");
+-		return err;
+-	}
+-	lp = dev->priv = kmalloc(sizeof(struct arcnet_local), GFP_KERNEL);
+-	if (!lp) {
+-		BUGMSG(D_NORMAL, "Can't allocate device data!\n");
+-		goto err_free_dev;
++		release_mem_region(shmem, BUFFER_SIZE);
++		return -ENOMEM;
+ 	}
++	lp = dev->priv;
+ 	/* find the real shared memory start/end points, including mirrors */
+ 
+ 	/* guess the actual size of one "memory mirror" - the number of
+@@ -442,8 +440,18 @@ static int __init com90xx_found(struct n
+ 	dev->mem_start = first_mirror;
+ 	dev->mem_end = last_mirror + MIRROR_SIZE - 1;
+ 
++	release_mem_region(shmem, BUFFER_SIZE);
++	if (!request_mem_region(dev->mem_start, dev->mem_end - dev->mem_start + 1, "arcnet (90xx)"))
++		goto err_free_dev;
++
++	/* reserve the irq */
++	if (request_irq(airq, &arcnet_interrupt, 0, "arcnet (90xx)", dev)) {
++		BUGMSG(D_NORMAL, "Can't get IRQ %d!\n", airq);
++		goto err_release_mem;
++	}
++	dev->irq = airq;
++
+ 	/* Initialize the rest of the device structure. */
+-	memset(lp, 0, sizeof(struct arcnet_local));
+ 	lp->card_name = "COM90xx";
+ 	lp->hw.command = com90xx_command;
+ 	lp->hw.status = com90xx_status;
+@@ -455,24 +463,12 @@ static int __init com90xx_found(struct n
+ 	lp->mem_start = ioremap(dev->mem_start, dev->mem_end - dev->mem_start + 1);
+ 	if (!lp->mem_start) {
+ 		BUGMSG(D_NORMAL, "Can't remap device memory!\n");
+-		goto err_free_dev_priv;
++		goto err_free_irq;
+ 	}
+-	/* Fill in the fields of the device structure with generic values. */
+-	arcdev_setup(dev);
+ 
+ 	/* get and check the station ID from offset 1 in shmem */
+ 	dev->dev_addr[0] = readb(lp->mem_start + 1);
+ 
+-	/* reserve the irq */
+-	if (request_irq(airq, &arcnet_interrupt, 0, "arcnet (90xx)", dev)) {
+-		BUGMSG(D_NORMAL, "Can't get IRQ %d!\n", airq);
+-		goto err_unmap;
+-	}
+-	dev->irq = airq;
+-
+-	/* reserve the I/O and memory regions - guaranteed to work by check_region */
+-	request_region(ioaddr, ARCNET_TOTAL_SIZE, "arcnet (90xx)");
+-	request_mem_region(dev->mem_start, dev->mem_end - dev->mem_start + 1, "arcnet (90xx)");
+ 	dev->base_addr = ioaddr;
+ 
+ 	BUGMSG(D_NORMAL, "COM90xx station %02Xh found at %03lXh, IRQ %d, "
+@@ -481,23 +477,20 @@ static int __init com90xx_found(struct n
+ 	       dev->base_addr, dev->irq, dev->mem_start,
+ 	 (dev->mem_end - dev->mem_start + 1) / mirror_size, mirror_size);
+ 
+-	if (!dev0 && register_netdev(dev))
+-		goto err_release;
++	if (register_netdev(dev))
++		goto err_unmap;
+ 
+ 	cards[numcards++] = dev;
+ 	return 0;
+ 
+-      err_release:
++err_unmap:
++	iounmap(lp->mem_start);
++err_free_irq:
+ 	free_irq(dev->irq, dev);
+-	release_region(dev->base_addr, ARCNET_TOTAL_SIZE);
++err_release_mem:
+ 	release_mem_region(dev->mem_start, dev->mem_end - dev->mem_start + 1);
+-      err_unmap:
+-	iounmap(lp->mem_start);
+-      err_free_dev_priv:
+-	kfree(dev->priv);
+-      err_free_dev:
+-	if (!dev0)
+-		kfree(dev);
++err_free_dev:
++	free_netdev(dev);
+ 	return -EIO;
+ }
+ 
+@@ -587,37 +580,13 @@ static void com90xx_copy_from_card(struc
+ }
+ 
+ 
+-/* Module parameters */
+-
+-static int io;			/* use the insmod io= irq= shmem= options */
+-static int irq;
+-static int shmem;
+-static char *device;		/* use eg. device=arc1 to change name */
+-
+-MODULE_PARM(io, "i");
+-MODULE_PARM(irq, "i");
+-MODULE_PARM(shmem, "i");
+-MODULE_PARM(device, "s");
+ MODULE_LICENSE("GPL");
+ 
+ static int __init com90xx_init(void)
+ {
+-	struct net_device *dev;
+-	int err;
+-
+-	if (io || irq || shmem || device) {
+-		dev = dev_alloc(device ? : "arc%d", &err);
+-		if (!dev)
+-			return err;
+-		dev->base_addr = io;
+-		dev->irq = irq;
+-		if (dev->irq == 2)
+-			dev->irq = 9;
+-		dev->mem_start = shmem;
+-		com90xx_probe(dev);
+-	} else
+-		com90xx_probe(NULL);
+-
++	if (irq == 2)
++		irq = 9;
++	com90xx_probe();
+ 	if (!numcards)
+ 		return -EIO;
+ 	return 0;
+@@ -638,7 +607,6 @@ static void __exit com90xx_exit(void)
+ 		iounmap(lp->mem_start);
+ 		release_region(dev->base_addr, ARCNET_TOTAL_SIZE);
+ 		release_mem_region(dev->mem_start, dev->mem_end - dev->mem_start + 1);
+-		kfree(dev->priv);
+ 		free_netdev(dev);
+ 	}
+ }
+@@ -669,9 +637,7 @@ static int __init com90xx_setup(char *s)
+ 	}
+ 
+ 	if (*s)
+-		strncpy(device, s, 9);
+-	else
+-		strcpy(device, "arc%d");
++		snprintf(device, sizeof(device), "%s", s);
+ 
+ 	return 1;
+ }
+--- linux-2.6.0/drivers/net/ariadne.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/ariadne.c	2003-12-28 23:21:00.000000000 -0800
+@@ -168,7 +168,7 @@ static int __init ariadne_probe(void)
+ 	    continue;
+ 	}
+ 
+-	dev = init_etherdev(NULL, sizeof(struct ariadne_private));
++	dev = alloc_etherdev(sizeof(struct ariadne_private));
+ 
+ 	if (dev == NULL) {
+ 	    release_resource(r1);
+@@ -205,11 +205,17 @@ static int __init ariadne_probe(void)
+ 	dev->get_stats = &ariadne_get_stats;
+ 	dev->set_multicast_list = &set_multicast_list;
+ 
++	res = register_netdev(dev);
++	if (res) {
++	    release_resource(r1);
++	    release_resource(r2);
++	    free_netdev(dev);
++	    break;
++	}
+ #ifdef MODULE
+ 	priv->next_module = root_ariadne_dev;
+ 	root_ariadne_dev = priv;
+ #endif
+-	res = 0;
+     }
+     return res;
+ }
+--- linux-2.6.0/drivers/net/arm/am79c961a.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/net/arm/am79c961a.c	2003-12-28 23:21:00.000000000 -0800
+@@ -722,7 +722,7 @@ static int __init am79c961_init(void)
+ release:
+ 	release_region(dev->base_addr, 0x18);
+ nodev:
+-	kfree(dev);
++	free_netdev(dev);
+ out:
+ 	return ret;
+ }
+--- linux-2.6.0/drivers/net/arm/ether00.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/arm/ether00.c	2003-12-28 23:21:00.000000000 -0800
+@@ -923,8 +923,6 @@ static int ether00_add_device(struct pld
+ 		result = -ENOMEM;
+ 		goto out_release;
+ 	}
+-	memset(dev,0,sizeof(struct net_device));
+-	memset(dev->priv, 0, sizeof(struct net_priv));
+ 	priv = dev->priv;
+ 
+ 	priv->tq_memupdate.routine=ether00_mem_update;
+@@ -966,7 +964,7 @@ static int ether00_add_device(struct pld
+  out_unmap:
+ 	iounmap(map_addr);
+  out_kfree:
+-	kfree(dev);
++	free_netdev(dev);
+  out_release:
+ 	release_mem_region(dev_info->base_addr, MAC_REG_SIZE);
+ 	return result;
+--- linux-2.6.0/drivers/net/arm/ether1.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/net/arm/ether1.c	2003-12-28 23:21:00.000000000 -0800
+@@ -1068,7 +1068,7 @@ ether1_probe(struct expansion_card *ec, 
+ release:
+ 	release_region(dev->base_addr, 16);
+ 	release_region(dev->base_addr + 0x800, 4096);
+-	kfree(dev);
++	free_netdev(dev);
+ out:
+ 	return ret;
+ }
+--- linux-2.6.0/drivers/net/arm/ether3.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/net/arm/ether3.c	2003-12-28 23:21:00.000000000 -0800
+@@ -908,7 +908,7 @@ ether3_probe(struct expansion_card *ec, 
+ failed:
+ 	release_region(dev->base_addr, 128);
+ free:
+-	kfree(dev);
++	free_netdev(dev);
+ out:
+ 	return ret;
+ }
+--- linux-2.6.0/drivers/net/arm/etherh.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/net/arm/etherh.c	2003-12-28 23:21:00.000000000 -0800
+@@ -551,15 +551,12 @@ etherh_probe(struct expansion_card *ec, 
+ 
+ 	etherh_banner();
+ 
+-	dev = alloc_etherdev(sizeof(struct etherh_priv));
++	dev = alloc_ei_netdev();
+ 	if (!dev) {
+ 		ret = -ENOMEM;
+ 		goto out;
+ 	}
+ 
+-	/*
+-	 * alloc_etherdev allocs and zeros dev->priv
+-	 */
+ 	eh = dev->priv;
+ 
+ 	spin_lock_init(&eh->eidev.page_lock);
+@@ -622,21 +619,12 @@ etherh_probe(struct expansion_card *ec, 
+ 		goto free;
+ 	}
+ 
+-	if (ethdev_init(dev)) {
+-		ret = -ENODEV;
+-		goto release;
+-	}
+-
+ 	/*
+ 	 * If we're in the NIC slot, make sure the IRQ is enabled
+ 	 */
+ 	if (dev->irq == 11)
+ 		etherh_set_ctrl(eh, ETHERH_CP_IE);
+ 
+-	/*
+-	 * Unfortunately, ethdev_init eventually calls
+-	 * ether_setup, which re-writes dev->flags.
+-	 */
+ 	switch (ec->cid.product) {
+ 	case PROD_ANT_ETHERM:
+ 		dev_type = "ANT EtherM";
+@@ -705,7 +693,7 @@ etherh_probe(struct expansion_card *ec, 
+  release:
+ 	release_region(dev->base_addr, 16);
+  free:
+-	kfree(dev);
++	free_netdev(dev);
+  out:
+ 	return ret;
+ }
+--- linux-2.6.0/drivers/net/at1700.c	2003-10-08 15:07:09.000000000 -0700
++++ 25/drivers/net/at1700.c	2003-12-28 23:21:00.000000000 -0800
+@@ -81,12 +81,12 @@ static int fmv18x_probe_list[] __initdat
+  */
+ 
+ #ifndef CONFIG_X86_PC9800
+-static int at1700_probe_list[] __initdata = {
++static unsigned at1700_probe_list[] __initdata = {
+ 	0x260, 0x280, 0x2a0, 0x240, 0x340, 0x320, 0x380, 0x300, 0
+ };
+ 
+ #else /* CONFIG_X86_PC9800 */
+-static int at1700_probe_list[] __initdata = {
++static unsigned at1700_probe_list[] __initdata = {
+ 	0x1d6, 0x1d8, 0x1da, 0x1d4, 0xd4, 0xd2, 0xd8, 0xd0, 0
+ };
+ 
+@@ -196,8 +196,6 @@ struct net_local {
+ 
+ /* Index to functions, as function prototypes. */
+ 
+-extern int at1700_probe(struct net_device *dev);
+-
+ static int at1700_probe1(struct net_device *dev, int ioaddr);
+ static int read_eeprom(long ioaddr, int location);
+ static int net_open(struct net_device *dev);
+@@ -232,24 +230,78 @@ static struct at1720_mca_adapters_struct
+    (detachable devices only).
+    */
+ 
+-int __init at1700_probe(struct net_device *dev)
++#ifndef CONFIG_X86_PC9800
++static int io = 0x260;
++#else
++static int io = 0xd0;
++#endif
++
++static int irq;
++
++static void cleanup_card(struct net_device *dev)
+ {
+-	int i;
+-	int base_addr = dev->base_addr;
++#ifdef CONFIG_MCA	
++	struct net_local *lp = dev->priv;
++	if (lp->mca_slot)
++		mca_mark_as_unused(lp->mca_slot);
++#endif	
++	free_irq(dev->irq, NULL);
++#ifndef CONFIG_X86_PC9800
++	release_region(dev->base_addr, AT1700_IO_EXTENT);
++#else
++	{
++		int i;
++		for (i = 0; i < 0x2000; i += 0x200)
++			release_region(dev->base_addr + i, 2);
++	}
++#endif
++}
++
++struct net_device * __init at1700_probe(int unit)
++{
++	struct net_device *dev = alloc_etherdev(sizeof(struct net_local));
++	unsigned *port;
++	int err = 0;
++
++	if (!dev)
++		return ERR_PTR(-ENODEV);
++
++	if (unit >= 0) {
++		sprintf(dev->name, "eth%d", unit);
++		netdev_boot_setup_check(dev);
++		io = dev->base_addr;
++		irq = dev->irq;
++	} else {
++		dev->base_addr = io;
++		dev->irq = irq;
++	}
+ 
+ 	SET_MODULE_OWNER(dev);
+ 
+-	if (base_addr > 0x1ff)		/* Check a single specified location. */
+-		return at1700_probe1(dev, base_addr);
+-	else if (base_addr != 0)	/* Don't probe at all. */
+-		return -ENXIO;
+-
+-	for (i = 0; at1700_probe_list[i]; i++) {
+-		int ioaddr = at1700_probe_list[i];
+-		if (at1700_probe1(dev, ioaddr) == 0)
+-			return 0;
++	if (io > 0x1ff) {	/* Check a single specified location. */
++		err = at1700_probe1(dev, io);
++	} else if (io != 0) {	/* Don't probe at all. */
++		err = -ENXIO;
++	} else {
++		for (port = at1700_probe_list; *port; port++) {
++			if (at1700_probe1(dev, *port) == 0)
++				break;
++			dev->irq = irq;
++		}
++		if (!*port)
++			err = -ENODEV;
+ 	}
+-	return -ENODEV;
++	if (err)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	cleanup_card(dev);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
+ /* The Fujitsu datasheet suggests that the NIC be probed for by checking its
+@@ -267,7 +319,7 @@ static int __init at1700_probe1(struct n
+ 	char at1700_irqmap[8] = {3, 4, 5, 9, 10, 11, 14, 15};
+ 	unsigned int i, irq, is_fmv18x = 0, is_at1700 = 0;
+ 	int slot, ret = -ENODEV;
+-	struct net_local *lp;
++	struct net_local *lp = dev->priv;
+ 	
+ #ifndef CONFIG_X86_PC9800
+ 	if (!request_region(ioaddr, AT1700_IO_EXTENT, dev->name))
+@@ -284,9 +336,10 @@ static int __init at1700_probe1(struct n
+ 	}
+ #endif
+ 
+-		/* Resetting the chip doesn't reset the ISA interface, so don't bother.
+-	   That means we have to be careful with the register values we probe for.
+-	   */
++	/* Resetting the chip doesn't reset the ISA interface, so don't bother.
++	   That means we have to be careful with the register values we probe
++	   for.
++	 */
+ #ifdef notdef
+ 	printk("at1700 probe at %#x, eeprom is %4.4x %4.4x %4.4x ctrl %4.4x.\n",
+ 		   ioaddr, read_eeprom(ioaddr, 4), read_eeprom(ioaddr, 5),
+@@ -331,15 +384,13 @@ static int __init at1700_probe1(struct n
+ 						break;
+ 
+ 					/* probing for a card at a particular IO/IRQ */
+-				if (dev &&
+-					((dev->irq && dev->irq != irq) ||
+-					 (dev->base_addr && dev->base_addr != ioaddr))) {
++				if ((dev->irq && dev->irq != irq) ||
++				    (dev->base_addr && dev->base_addr != ioaddr)) {
+ 				  	slot++;		/* probing next slot */
+ 				  	continue;
+ 				}
+ 
+-				if (dev)
+-					dev->irq = irq;
++				dev->irq = irq;
+ 				
+ 				/* claim the slot */
+ 				mca_set_adapter_name( slot, at1720_mca_adapters[j].name );
+@@ -476,13 +527,7 @@ found:
+ 	if (net_debug)
+ 		printk(version);
+ 
+-	/* Initialize the device structure. */
+-	dev->priv = kmalloc(sizeof(struct net_local), GFP_KERNEL);
+-	if (dev->priv == NULL) {
+-		ret = -ENOMEM;
+-		goto err_out;
+-	}
+-	memset(dev->priv, 0, sizeof(struct net_local));
++	memset(lp, 0, sizeof(struct net_local));
+ 
+ 	dev->open		= net_open;
+ 	dev->stop		= net_close;
+@@ -492,11 +537,7 @@ found:
+ 	dev->tx_timeout = net_tx_timeout;
+ 	dev->watchdog_timeo = TX_TIMEOUT;
+ 
+-	lp = (struct net_local *)dev->priv;
+-	lp->lock = SPIN_LOCK_UNLOCKED;
+-
+-	/* Fill in the fields of 'dev' with ethernet-generic values. */
+-	ether_setup(dev);
++	spin_lock_init(&lp->lock);
+ 
+ 	lp->jumpered = is_fmv18x;
+ 	lp->mca_slot = slot;
+@@ -505,14 +546,11 @@ found:
+ 	if (ret) {
+ 		printk ("  AT1700 at %#3x is unusable due to a conflict on"
+ 				"IRQ %d.\n", ioaddr, irq);
+-		goto err_out_priv;
++		goto err_out;
+ 	}
+ 
+ 	return 0;
+ 
+-err_out_priv:
+-	kfree(dev->priv);
+-	dev->priv = NULL;
+ err_out:
+ #ifndef CONFIG_X86_PC9800
+ 	release_region(ioaddr, AT1700_IO_EXTENT);
+@@ -940,14 +978,7 @@ set_rx_mode(struct net_device *dev)
+ }
+ 
+ #ifdef MODULE
+-static struct net_device dev_at1700;
+-#ifndef CONFIG_X86_PC9800
+-static int io = 0x260;
+-#else
+-static int io = 0xd0;
+-#endif
+-
+-static int irq;
++static struct net_device *dev_at1700;
+ 
+ MODULE_PARM(io, "i");
+ MODULE_PARM(irq, "i");
+@@ -960,41 +991,18 @@ int init_module(void)
+ {
+ 	if (io == 0)
+ 		printk("at1700: You should not use auto-probing with insmod!\n");
+-	dev_at1700.base_addr = io;
+-	dev_at1700.irq       = irq;
+-	dev_at1700.init      = at1700_probe;
+-	if (register_netdev(&dev_at1700) != 0) {
+-		printk("at1700: register_netdev() returned non-zero.\n");
+-		return -EIO;
+-	}
++	dev_at1700 = at1700_probe(-1);
++	if (IS_ERR(dev_at1700))
++		return PTR_ERR(dev_at1700);
+ 	return 0;
+ }
+ 
+ void
+ cleanup_module(void)
+ {
+-#ifdef CONFIG_MCA	
+-	struct net_local *lp = dev_at1700.priv;
+-	if(lp->mca_slot)
+-	{
+-		mca_mark_as_unused(lp->mca_slot);
+-	}
+-#endif	
+-	unregister_netdev(&dev_at1700);
+-	kfree(dev_at1700.priv);
+-	dev_at1700.priv = NULL;
+-
+-	/* If we don't do this, we can't re-insmod it later. */
+-	free_irq(dev_at1700.irq, NULL);
+-#ifndef CONFIG_X86_PC9800
+-	release_region(dev_at1700.base_addr, AT1700_IO_EXTENT);
+-#else
+-	{
+-		int i;
+-		for (i = 0; i < 0x2000; i += 0x200)
+-			release_region(dev_at1700.base_addr + i, 2);
+-	}
+-#endif
++	unregister_netdev(dev_at1700);
++	cleanup_card(dev_at1700);
++	free_netdev(dev_at1700);
+ }
+ #endif /* MODULE */
+ MODULE_LICENSE("GPL");
+--- linux-2.6.0/drivers/net/atari_bionet.c	2003-06-14 12:18:23.000000000 -0700
++++ 25/drivers/net/atari_bionet.c	2003-12-28 23:21:00.000000000 -0800
+@@ -148,8 +148,6 @@ unsigned char *phys_nic_packet;
+ 
+ /* Index to functions, as function prototypes.
+  */
+-extern int bionet_probe(struct net_device *dev);
+-
+ static int bionet_open(struct net_device *dev);
+ static int bionet_send_packet(struct sk_buff *skb, struct net_device *dev);
+ static void bionet_poll_rx(struct net_device *);
+@@ -321,15 +319,26 @@ end:
+ 
+ /* Check for a network adaptor of this type, and return '0' if one exists.
+  */
+-int __init 
+-bionet_probe(struct net_device *dev){
++struct net_device * __init bionet_probe(int unit)
++{
++	struct net_device *dev;
+ 	unsigned char station_addr[6];
+ 	static unsigned version_printed;
+ 	static int no_more_found;	/* avoid "Probing for..." printed 4 times */
+ 	int i;
++	int err;
+ 
+ 	if (!MACH_IS_ATARI || no_more_found)
+-		return -ENODEV;
++		return ERR_PTR(-ENODEV);
++
++	dev = alloc_etherdev(sizeof(struct net_local));
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++	if (unit >= 0) {
++		sprintf(dev->name, "eth%d", unit);
++		netdev_boot_setup_check(dev);
++	}
++	SET_MODULE_OWNER(dev);
+ 
+ 	printk("Probing for BioNet 100 Adapter...\n");
+ 
+@@ -347,11 +356,10 @@ bionet_probe(struct net_device *dev){
+ 	||  station_addr[2] != 'O' ) {
+ 		no_more_found = 1;
+ 		printk( "No BioNet 100 found.\n" );
+-		return -ENODEV;
++		free_netdev(dev);
++		return ERR_PTR(-ENODEV);
+ 	}
+ 
+-	SET_MODULE_OWNER(dev);
+-
+ 	if (bionet_debug > 0 && version_printed++ == 0)
+ 		printk(version);
+ 
+@@ -369,12 +377,6 @@ bionet_probe(struct net_device *dev){
+ 			nic_packet, phys_nic_packet );
+ 	}
+ 
+-	if (dev->priv == NULL)
+-		dev->priv = kmalloc(sizeof(struct net_local), GFP_KERNEL);
+-	if (!dev->priv)
+-		return -ENOMEM;
+-	memset(dev->priv, 0, sizeof(struct net_local));
+-
+ 	dev->open		= bionet_open;
+ 	dev->stop		= bionet_close;
+ 	dev->hard_start_xmit	= bionet_send_packet;
+@@ -390,8 +392,11 @@ bionet_probe(struct net_device *dev){
+ #endif
+ 		dev->dev_addr[i]  = station_addr[i];
+ 	}
+-	ether_setup(dev);
+-	return 0;
++	err = register_netdev(dev);
++	if (!err)
++		return dev;
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
+ /* Open/initialize the board.  This is called (in the current kernel)
+@@ -640,25 +645,20 @@ static struct net_device_stats *net_get_
+ 
+ #ifdef MODULE
+ 
+-static struct net_device bio_dev;
+-
+-int
+-init_module(void) {
+-	int err;
++static struct net_device *bio_dev;
+ 
+-	bio_dev.init = bionet_probe;
+-	if ((err = register_netdev(&bio_dev))) {
+-		if (err == -EEXIST)  {
+-			printk("BIONET: devices already present. Module not loaded.\n");
+-		}
+-		return err;
+-	}
++int init_module(void)
++{
++	bio_dev = bionet_probe(-1);
++	if (IS_ERR(bio_dev))
++		return PTR_ERR(bio_dev);
+ 	return 0;
+ }
+ 
+-void
+-cleanup_module(void) {
+-	unregister_netdev(&bio_dev);
++void cleanup_module(void)
++{
++	unregister_netdev(bio_dev);
++	free_netdev(bio_dev);
+ }
+ 
+ #endif /* MODULE */
+--- linux-2.6.0/drivers/net/atarilance.c	2003-06-14 12:18:03.000000000 -0700
++++ 25/drivers/net/atarilance.c	2003-12-28 23:21:00.000000000 -0800
+@@ -371,26 +371,39 @@ static void *slow_memcpy( void *dst, con
+ }
+ 
+ 
+-int __init atarilance_probe( struct net_device *dev )
+-{	
++struct net_device * __init atarilance_probe(int unit)
++{
+ 	int i;
+ 	static int found;
+-
+-	SET_MODULE_OWNER(dev);
++	struct net_device *dev;
++	int err = -ENODEV;
+ 
+ 	if (!MACH_IS_ATARI || found)
+ 		/* Assume there's only one board possible... That seems true, since
+ 		 * the Riebl/PAM board's address cannot be changed. */
+-		return( ENODEV );
++		return ERR_PTR(-ENODEV);
++
++	dev = alloc_etherdev(sizeof(struct lance_private));
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++	if (unit >= 0) {
++		sprintf(dev->name, "eth%d", unit);
++		netdev_boot_setup_check(dev);
++	}
++	SET_MODULE_OWNER(dev);
+ 
+ 	for( i = 0; i < N_LANCE_ADDR; ++i ) {
+ 		if (lance_probe1( dev, &lance_addr_list[i] )) {
+ 			found = 1;
+-			return( 0 );
++			err = register_netdev(dev);
++			if (!err)
++				return dev;
++			free_irq(dev->irq, dev);
++			break;
+ 		}
+ 	}
+-
+-	return( ENODEV );
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
+ 
+@@ -511,12 +524,6 @@ static unsigned long __init lance_probe1
+ 	return( 0 );
+ 
+   probe_ok:
+-	init_etherdev( dev, sizeof(struct lance_private) );
+-	if (!dev->priv) {
+-		dev->priv = kmalloc( sizeof(struct lance_private), GFP_KERNEL );
+-		if (!dev->priv)
+-			return 0;
+-	}
+ 	lp = (struct lance_private *)dev->priv;
+ 	MEM = (struct lance_memory *)memaddr;
+ 	IO = lp->iobase = (struct lance_ioreg *)ioaddr;
+@@ -1171,26 +1178,21 @@ static int lance_set_mac_address( struct
+ 
+ 
+ #ifdef MODULE
+-static struct net_device atarilance_dev;
++static struct net_device *atarilance_dev;
+ 
+ int init_module(void)
+-
+-{	int err;
+-
+-	atarilance_dev.init = atarilance_probe;
+-	if ((err = register_netdev( &atarilance_dev ))) {
+-		if (err == -EIO)  {
+-			printk( "No Atari Lance board found. Module not loaded.\n");
+-		}
+-		return( err );
+-	}
+-	return( 0 );
++{
++	atarilance_dev = atarilance_probe(-1);
++	if (IS_ERR(atarilance_dev))
++		return PTR_ERR(atarilance_dev);
++	return 0;
+ }
+ 
+ void cleanup_module(void)
+-
+ {
+-	unregister_netdev( &atarilance_dev );
++	unregister_netdev(atarilance_dev);
++	free_irq(atarilance_dev->irq, atarilance_dev);
++	free_netdev(atarilance_dev);
+ }
+ 
+ #endif /* MODULE */
+--- linux-2.6.0/drivers/net/atari_pamsnet.c	2003-07-27 12:14:39.000000000 -0700
++++ 25/drivers/net/atari_pamsnet.c	2003-12-28 23:21:00.000000000 -0800
+@@ -110,8 +110,6 @@ static char *version =
+ #undef READ
+ #undef WRITE
+ 
+-extern struct net_device *init_etherdev(struct net_device *dev, int sizeof_private);
+-
+ /* use 0 for production, 1 for verification, >2 for debug
+  */
+ #ifndef NET_DEBUG
+@@ -158,8 +156,6 @@ static int	send_1_5 (int lun, unsigned c
+ static int	get_status (void);
+ static int	calc_received (void *start_address);
+ 
+-extern int pamsnet_probe(struct net_device *dev);
+-
+ static int pamsnet_open(struct net_device *dev);
+ static int pamsnet_send_packet(struct sk_buff *skb, struct net_device *dev);
+ static void pamsnet_poll_rx(struct net_device *);
+@@ -562,12 +558,12 @@ bad:
+ /* Check for a network adaptor of this type, and return '0' if one exists.
+  */
+ 
+-int __init 
+-pamsnet_probe (dev)
+-	struct net_device *dev;
++struct net_device * __init pamsnet_probe (int unit)
+ {
++	struct net_device *dev;
+ 	int i;
+ 	HADDR *hwaddr;
++	int err;
+ 
+ 	unsigned char station_addr[6];
+ 	static unsigned version_printed;
+@@ -575,12 +571,18 @@ pamsnet_probe (dev)
+ 	static int no_more_found;
+ 
+ 	if (no_more_found)
+-		return -ENODEV;
++		return ERR_PTR(-ENODEV);
++	no_more_found = 1;
+ 
++	dev = alloc_etherdev(sizeof(struct net_local));
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++	if (unit >= 0) {
++		sprintf(dev->name, "eth%d", unit);
++		netdev_boot_setup_check(dev);
++	}
+ 	SET_MODULE_OWNER(dev);
+ 
+-	no_more_found = 1;
+-
+ 	printk("Probing for PAM's Net/GK Adapter...\n");
+ 
+ 	/* Allocate the DMA buffer here since we need it for probing! */
+@@ -618,11 +620,12 @@ pamsnet_probe (dev)
+ 	ENABLE_IRQ();
+ 	stdma_release();
+ 
+-	if (lance_target < 0)
++	if (lance_target < 0) {
+ 		printk("No PAM's Net/GK found.\n");
++		free_netdev(dev);
++		return ERR_PTR(-ENODEV);
++	}
+ 
+-	if ((dev == NULL) || (lance_target < 0))
+-		return -ENODEV;
+ 	if (pamsnet_debug > 0 && version_printed++ == 0)
+ 		printk(version);
+ 
+@@ -632,12 +635,6 @@ pamsnet_probe (dev)
+ 		station_addr[3], station_addr[4], station_addr[5]);
+ 
+ 	/* Initialize the device structure. */
+-	if (dev->priv == NULL)
+-		dev->priv = kmalloc(sizeof(struct net_local), GFP_KERNEL);
+-	if (!dev->priv)
+-		return -ENOMEM;
+-	memset(dev->priv, 0, sizeof(struct net_local));
+-
+ 	dev->open		= pamsnet_open;
+ 	dev->stop		= pamsnet_close;
+ 	dev->hard_start_xmit	= pamsnet_send_packet;
+@@ -653,9 +650,12 @@ pamsnet_probe (dev)
+ #endif
+ 		dev->dev_addr[i]  = station_addr[i];
+ 	}
+-	ether_setup(dev);
++	err = register_netdev(dev);
++	if (!err)
++		return dev;
+ 
+-	return(0);
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
+ /* Open/initialize the board.  This is called (in the current kernel)
+@@ -866,25 +866,20 @@ static struct net_device_stats *net_get_
+ 
+ #ifdef MODULE
+ 
+-static struct net_device pam_dev;
+-
+-int
+-init_module(void) {
+-	int err;
++static struct net_device *pam_dev;
+ 
+-	pam_dev.init = pamsnet_probe;
+-	if ((err = register_netdev(&pam_dev))) {
+-		if (err == -EEXIST)  {
+-			printk("PAM's Net/GK: devices already present. Module not loaded.\n");
+-		}
+-		return err;
+-	}
++int init_module(void)
++{
++	pam_dev = pamsnet_probe(-1);
++	if (IS_ERR(pam_dev))
++		return PTR_ERR(pam_dev);
+ 	return 0;
+ }
+ 
+-void
+-cleanup_module(void) {
+-	unregister_netdev(&pam_dev);
++void cleanup_module(void)
++{
++	unregister_netdev(pam_dev);
++	free_netdev(pam_dev);
+ }
+ 
+ #endif /* MODULE */
+--- linux-2.6.0/drivers/net/atp.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/atp.c	2003-12-28 23:21:00.000000000 -0800
+@@ -195,7 +195,7 @@ static void atp_timed_checker(unsigned l
+ 
+ /* Index to functions, as function prototypes. */
+ 
+-static int atp_probe1(struct net_device *dev, long ioaddr);
++static int atp_probe1(long ioaddr);
+ static void get_node_ID(struct net_device *dev);
+ static unsigned short eeprom_op(long ioaddr, unsigned int cmd);
+ static int net_open(struct net_device *dev);
+@@ -224,13 +224,13 @@ static struct net_device *root_atp_dev;
+    
+    FIXME: we should use the parport layer for this
+    */
+-static int __init atp_init(struct net_device *dev)
++static int __init atp_init(void)
+ {
+ 	int *port, ports[] = {0x378, 0x278, 0x3bc, 0};
+-	int base_addr = dev ? dev->base_addr : io[0];
++	int base_addr = io[0];
+ 
+ 	if (base_addr > 0x1ff)		/* Check a single specified location. */
+-		return atp_probe1(dev, base_addr);
++		return atp_probe1(base_addr);
+ 	else if (base_addr == 1)	/* Don't probe at all. */
+ 		return -ENXIO;
+ 
+@@ -239,17 +239,19 @@ static int __init atp_init(struct net_de
+ 		outb(0x57, ioaddr + PAR_DATA);
+ 		if (inb(ioaddr + PAR_DATA) != 0x57)
+ 			continue;
+-		if (atp_probe1(dev, ioaddr) == 0)
++		if (atp_probe1(ioaddr) == 0)
+ 			return 0;
+ 	}
+ 
+ 	return -ENODEV;
+ }
+ 
+-static int __init atp_probe1(struct net_device *dev, long ioaddr)
++static int __init atp_probe1(long ioaddr)
+ {
++	struct net_device *dev = NULL;
+ 	struct net_local *lp;
+ 	int saved_ctrl_reg, status, i;
++	int res;
+ 
+ 	outb(0xff, ioaddr + PAR_DATA);
+ 	/* Save the original value of the Control register, in case we guessed
+@@ -296,7 +298,7 @@ static int __init atp_probe1(struct net_
+ 		return -ENODEV;
+ 	}
+ 
+-	dev = init_etherdev(dev, sizeof(struct net_local));
++	dev = alloc_etherdev(sizeof(struct net_local));
+ 	if (!dev)
+ 		return -ENOMEM;
+ 	SET_MODULE_OWNER(dev);
+@@ -331,24 +333,13 @@ static int __init atp_probe1(struct net_
+ 		   dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
+ 
+ 	/* Reset the ethernet hardware and activate the printer pass-through. */
+-    write_reg_high(ioaddr, CMR1, CMR1h_RESET | CMR1h_MUX);
+-
+-	/* Initialize the device structure. */
+-	ether_setup(dev);
+-	if (dev->priv == NULL)
+-		dev->priv = kmalloc(sizeof(struct net_local), GFP_KERNEL);
+-	if (dev->priv == NULL)
+-		return -ENOMEM;
+-	memset(dev->priv, 0, sizeof(struct net_local));
++	write_reg_high(ioaddr, CMR1, CMR1h_RESET | CMR1h_MUX);
+ 
+ 	lp = (struct net_local *)dev->priv;
+ 	lp->chip_type = RTL8002;
+ 	lp->addr_mode = CMR2h_Normal;
+ 	spin_lock_init(&lp->lock);
+ 
+-	lp->next_module = root_atp_dev;
+-	root_atp_dev = dev;
+-
+ 	/* For the ATP adapter the "if_port" is really the data transfer mode. */
+ 	if (xcvr[0])
+ 		dev->if_port = xcvr[0];
+@@ -366,6 +357,15 @@ static int __init atp_probe1(struct net_
+ 	dev->tx_timeout		= tx_timeout;
+ 	dev->watchdog_timeo	= TX_TIMEOUT;
+ 
++	res = register_netdev(dev);
++	if (res) {
++		free_netdev(dev);
++		return res;
++	}
++
++	lp->next_module = root_atp_dev;
++	root_atp_dev = dev;
++
+ 	return 0;
+ }
+ 
+@@ -933,7 +933,7 @@ static void set_rx_mode_8012(struct net_
+ static int __init atp_init_module(void) {
+ 	if (debug)					/* Emit version even if no cards detected. */
+ 		printk(KERN_INFO "%s" KERN_INFO "%s", versionA, versionB);
+-	return atp_init(NULL);
++	return atp_init();
+ }
+ 
+ static void __exit atp_cleanup_module(void) {
+--- linux-2.6.0/drivers/net/au1000_eth.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/au1000_eth.c	2003-12-28 23:21:00.000000000 -0800
+@@ -56,7 +56,7 @@ static void *dma_alloc(size_t, dma_addr_
+ static void dma_free(void *, size_t);
+ static void hard_stop(struct net_device *);
+ static void enable_rx_tx(struct net_device *dev);
+-static int __init au1000_probe1(struct net_device *, long, int, int);
++static int __init au1000_probe1(long, int, int);
+ static int au1000_init(struct net_device *);
+ static int au1000_open(struct net_device *);
+ static int au1000_close(struct net_device *);
+@@ -644,17 +644,17 @@ static int __init au1000_init_module(voi
+ 		}
+ 		// check for valid entries, au1100 only has one entry
+ 		if (base_addr && irq) {
+-			if (au1000_probe1(NULL, base_addr, irq, i) != 0) {
++			if (au1000_probe1(base_addr, irq, i) != 0)
+ 				return -ENODEV;
+-			}
+ 		}
+ 	}
+ 	return 0;
+ }
+ 
+ static int __init
+-au1000_probe1(struct net_device *dev, long ioaddr, int irq, int port_num)
++au1000_probe1(long ioaddr, int irq, int port_num)
+ {
++	struct net_device *dev;
+ 	static unsigned version_printed = 0;
+ 	struct au1000_private *aup = NULL;
+ 	int i, retval = 0;
+@@ -668,15 +668,16 @@ au1000_probe1(struct net_device *dev, lo
+ 	if (version_printed++ == 0)
+ 		printk(version);
+ 
+-	if (!dev)
+-		dev = init_etherdev(NULL, sizeof(struct au1000_private));
++	retval = -ENOMEM;
+ 
++	dev = alloc_etherdev(sizeof(struct au1000_private));
+ 	if (!dev) {
+-		printk (KERN_ERR "au1000 eth: init_etherdev failed\n");  
+-		release_region(ioaddr, MAC_IOSIZE);
+-		return -ENODEV;
++		printk (KERN_ERR "au1000 eth: alloc_etherdev failed\n");  
++		goto out;
+ 	}
+ 
++	SET_MODULE_OWNER(dev);
++
+ 	printk("%s: Au1xxx ethernet found at 0x%lx, irq %d\n", 
+ 	       dev->name, ioaddr, irq);
+ 
+@@ -685,10 +686,8 @@ au1000_probe1(struct net_device *dev, lo
+ 	/* Allocate the data buffers */
+ 	aup->vaddr = (u32)dma_alloc(MAX_BUF_SIZE * 
+ 			(NUM_TX_BUFFS+NUM_RX_BUFFS), &aup->dma_addr);
+-	if (!aup->vaddr) {
+-		retval = -ENOMEM;
+-		goto free_region;
+-	}
++	if (!aup->vaddr)
++		goto out1;
+ 
+ 	/* aup->mac is the base address of the MAC's registers */
+ 	aup->mac = (volatile mac_reg_t *)((unsigned long)ioaddr);
+@@ -749,10 +748,11 @@ au1000_probe1(struct net_device *dev, lo
+ 		MAC_EN_RESET2 | MAC_EN_CLOCK_ENABLE;
+ 	au_sync_delay(2);
+ 
+-	if (mii_probe(dev) != 0) {
+-		 goto free_region;
+-	}
++	retval = mii_probe(dev);
++	if (retval)
++		 goto out2;
+ 
++	retval = -EINVAL;
+ 	pDBfree = NULL;
+ 	/* setup the data buffer descriptors and attach a buffer to each one */
+ 	pDB = aup->db;
+@@ -767,13 +767,13 @@ au1000_probe1(struct net_device *dev, lo
+ 
+ 	for (i=0; i<NUM_RX_DMA; i++) {
+ 		pDB = GetFreeDB(aup);
+-		if (!pDB) goto free_region;
++		if (!pDB) goto out2;
+ 		aup->rx_dma_ring[i]->buff_stat = (unsigned)pDB->dma_addr;
+ 		aup->rx_db_inuse[i] = pDB;
+ 	}
+ 	for (i=0; i<NUM_TX_DMA; i++) {
+ 		pDB = GetFreeDB(aup);
+-		if (!pDB) goto free_region;
++		if (!pDB) goto out2;
+ 		aup->tx_dma_ring[i]->buff_stat = (unsigned)pDB->dma_addr;
+ 		aup->tx_dma_ring[i]->len = 0;
+ 		aup->tx_db_inuse[i] = pDB;
+@@ -792,26 +792,25 @@ au1000_probe1(struct net_device *dev, lo
+ 	dev->tx_timeout = au1000_tx_timeout;
+ 	dev->watchdog_timeo = ETH_TX_TIMEOUT;
+ 
+-
+-	/* Fill in the fields of the device structure with ethernet values. */
+-	ether_setup(dev);
+-
+ 	/* 
+ 	 * The boot code uses the ethernet controller, so reset it to start 
+ 	 * fresh.  au1000_init() expects that the device is in reset state.
+ 	 */
+ 	reset_mac(dev);
++
++	retval = register_netdev(dev);
++	if (retval)
++		goto out2;
+ 	return 0;
+ 
+-free_region:
++out2:
++	dma_free(aup->vaddr, MAX_BUF_SIZE * (NUM_TX_BUFFS+NUM_RX_BUFFS));
++out1:
++	free_netdev(dev);
++out:
+ 	release_region(PHYSADDR(ioaddr), MAC_IOSIZE);
+-	unregister_netdev(dev);
+-	if (aup->vaddr) 
+-		dma_free((void *)aup->vaddr, 
+-				MAX_BUF_SIZE * (NUM_TX_BUFFS+NUM_RX_BUFFS));
+ 	printk(KERN_ERR "%s: au1000_probe1 failed.  Returns %d\n",
+ 	       dev->name, retval);
+-	free_netdev(dev);
+ 	return retval;
+ }
+ 
+@@ -933,15 +932,12 @@ static int au1000_open(struct net_device
+ 	int retval;
+ 	struct au1000_private *aup = (struct au1000_private *) dev->priv;
+ 
+-	MOD_INC_USE_COUNT;
+-
+ 	if (au1000_debug > 4)
+ 		printk("%s: open: dev=%p\n", dev->name, dev);
+ 
+ 	if ((retval = au1000_init(dev))) {
+ 		printk(KERN_ERR "%s: error in au1000_init\n", dev->name);
+ 		free_irq(dev->irq, dev);
+-		MOD_DEC_USE_COUNT;
+ 		return retval;
+ 	}
+ 	netif_start_queue(dev);
+@@ -950,7 +946,6 @@ static int au1000_open(struct net_device
+ 					dev->name, dev))) {
+ 		printk(KERN_ERR "%s: unable to get IRQ %d\n", 
+ 				dev->name, dev->irq);
+-		MOD_DEC_USE_COUNT;
+ 		return retval;
+ 	}
+ 
+@@ -984,8 +979,6 @@ static int au1000_close(struct net_devic
+ 	spin_unlock_irqrestore(&aup->lock, flags);
+ 
+ 	reset_mac(dev);
+-	kfree(dev);
+-	MOD_DEC_USE_COUNT;
+ 	return 0;
+ }
+ 
+--- linux-2.6.0/drivers/net/bagetlance.c	2003-06-14 12:17:56.000000000 -0700
++++ 25/drivers/net/bagetlance.c	2003-12-28 23:21:00.000000000 -0800
+@@ -465,30 +465,43 @@ void *slow_memcpy( void *dst, const void
+ }
+ 
+ 
+-int __init bagetlance_probe( struct net_device *dev )
+-
+-{	int i;
++struct net_device * __init bagetlance_probe(int unit)
++{
++	struct net_device *dev;
++	int i;
+ 	static int found;
+-
+-	SET_MODULE_OWNER(dev);
++	int err = -ENODEV;
+ 
+ 	if (found)
+ 		/* Assume there's only one board possible... That seems true, since
+ 		 * the Riebl/PAM board's address cannot be changed. */
+-		return( -ENODEV );
++		return ERR_PTR(-ENODEV);
++
++	dev = alloc_etherdev(sizeof(struct lance_private));
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	SET_MODULE_OWNER(dev);
+ 
+ 	for( i = 0; i < N_LANCE_ADDR; ++i ) {
+ 		if (lance_probe1( dev, &lance_addr_list[i] )) {
+ 			found = 1;
+-			return( 0 );
++			break;
+ 		}
+ 	}
+-
+-	return( -ENODEV );
++	if (!found)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	free_irq(dev->irq, dev);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
+-
+-
+ /* Derived from hwreg_present() in vme/config.c: */
+ 
+ static int __init addr_accessible( volatile void *regp, 
+@@ -527,6 +540,7 @@ static int __init lance_probe1( struct n
+ 	if (!addr_accessible( memaddr, 1, 1 )) goto probe_fail;
+ 
+ 	if ((unsigned long)memaddr >= KSEG2) {
++			/* FIXME: do we need to undo that on cleanup paths? */
+ 			extern int kseg2_alloc_io (unsigned long addr, unsigned long size);
+ 			if (kseg2_alloc_io((unsigned long)memaddr, BAGET_LANCE_MEM_SIZE)) {
+ 					printk("bagetlance: unable map lance memory\n");
+@@ -580,12 +594,6 @@ static int __init lance_probe1( struct n
+ 	return( 0 );
+ 
+   probe_ok:
+-	init_etherdev( dev, sizeof(struct lance_private) );
+-	if (!dev->priv) {
+-		dev->priv = kmalloc( sizeof(struct lance_private), GFP_KERNEL );
+-		if (!dev->priv)
+-			return 0;
+-	}
+ 	lp = (struct lance_private *)dev->priv;
+ 	MEM = (struct lance_memory *)memaddr;
+ 	IO = lp->iobase = (struct lance_ioreg *)ioaddr;
+@@ -617,8 +625,9 @@ static int __init lance_probe1( struct n
+ 	if (lp->cardtype == PAM_CARD ||
+ 		memaddr == (unsigned short *)0xffe00000) {
+ 		/* PAMs card and Riebl on ST use level 5 autovector */
+-		request_irq(BAGET_LANCE_IRQ, lance_interrupt, IRQ_TYPE_PRIO,
+-		            "PAM/Riebl-ST Ethernet", dev);
++		if (request_irq(BAGET_LANCE_IRQ, lance_interrupt, IRQ_TYPE_PRIO,
++		            "PAM/Riebl-ST Ethernet", dev))
++			goto probe_fail;
+ 		dev->irq = (unsigned short)BAGET_LANCE_IRQ;
+ 	}
+ 	else {
+@@ -629,10 +638,11 @@ static int __init lance_probe1( struct n
+ 		unsigned long irq = BAGET_LANCE_IRQ; 
+ 		if (!irq) {
+ 			printk( "Lance: request for VME interrupt failed\n" );
+-			return( 0 );
++			goto probe_fail;
+ 		}
+-		request_irq(irq, lance_interrupt, IRQ_TYPE_PRIO,
+-		            "Riebl-VME Ethernet", dev);
++		if (request_irq(irq, lance_interrupt, IRQ_TYPE_PRIO,
++		            "Riebl-VME Ethernet", dev))
++			goto probe_fail;
+ 		dev->irq = irq;
+ 	}
+ 
+@@ -1331,26 +1341,21 @@ static int lance_set_mac_address( struct
+ 
+ 
+ #ifdef MODULE
+-static struct net_device bagetlance_dev;
++static struct net_device *bagetlance_dev;
+ 
+ int init_module(void)
+-
+-{	int err;
+-
+-	bagetlance_dev.init = bagetlance_probe;
+-	if ((err = register_netdev( &bagetlance_dev ))) {
+-		if (err == -EIO)  {
+-			printk( "No Vme Lance board found. Module not loaded.\n");
+-		}
+-		return( err );
+-	}
+-	return( 0 );
++{
++	bagetlance_dev = bagetlance_probe(-1);
++	if (IS_ERR(bagetlance_dev))
++		return PTR_ERR(bagetlance_dev);
++	return 0;
+ }
+ 
+ void cleanup_module(void)
+-
+ {
+-	unregister_netdev( &bagetlance_dev );
++	unregister_netdev(bagetlance_dev);
++	free_irq(bagetlance_dev->irq, bagetlance_dev);
++	free_netdev(bagetlance_dev);
+ }
+ 
+ #endif /* MODULE */
+--- linux-2.6.0/drivers/net/bonding/bond_3ad.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/bonding/bond_3ad.c	2003-12-28 23:21:00.000000000 -0800
+@@ -47,8 +47,13 @@
+  *	- Send LACPDU as highest priority packet to further fix the above
+  *	  problem on very high Tx traffic load where packets may get dropped
+  *	  by the slave.
++ *
++ * 2003/09/24 - Shmulik Hen <shmulik.hen at intel dot com>
++ *	- Code cleanup and style changes
+  */
+ 
++//#define BONDING_DEBUG 1
++
+ #include <linux/skbuff.h>
+ #include <linux/if_ether.h>
+ #include <linux/netdevice.h>
+@@ -119,6 +124,7 @@
+ 
+ static struct mac_addr null_mac_addr = {{0, 0, 0, 0, 0, 0}};
+ static u16 ad_ticks_per_sec;
++static const int ad_delta_in_ticks = (AD_TIMER_INTERVAL * HZ) / 1000;
+ 
+ // ================= 3AD api to bonding and kernel code ==================
+ static u16 __get_link_speed(struct port *port);
+@@ -196,13 +202,11 @@ static inline struct bonding *__get_bond
+  */
+ static inline struct port *__get_first_port(struct bonding *bond)
+ {
+-	struct slave *slave = bond->next;
+-
+-	if (slave == (struct slave *)bond) {
++	if (bond->slave_cnt == 0) {
+ 		return NULL;
+ 	}
+ 
+-	return &(SLAVE_AD_INFO(slave).port);
++	return &(SLAVE_AD_INFO(bond->first_slave).port);
+ }
+ 
+ /**
+@@ -218,7 +222,7 @@ static inline struct port *__get_next_po
+ 	struct slave *slave = port->slave;
+ 
+ 	// If there's no bond for this port, or this is the last slave
+-	if ((bond == NULL) || (slave->next == bond->next)) {
++	if ((bond == NULL) || (slave->next == bond->first_slave)) {
+ 		return NULL;
+ 	}
+ 
+@@ -236,12 +240,12 @@ static inline struct aggregator *__get_f
+ {
+ 	struct bonding *bond = __get_bond_by_port(port);
+ 
+-	// If there's no bond for this port, or this is the last slave
+-	if ((bond == NULL) || (bond->next == (struct slave *)bond)) {
++	// If there's no bond for this port, or bond has no slaves
++	if ((bond == NULL) || (bond->slave_cnt == 0)) {
+ 		return NULL;
+ 	}
+ 
+-	return &(SLAVE_AD_INFO(bond->next).aggregator);
++	return &(SLAVE_AD_INFO(bond->first_slave).aggregator);
+ }
+ 
+ /**
+@@ -257,7 +261,7 @@ static inline struct aggregator *__get_n
+ 	struct bonding *bond = bond_get_bond_by_slave(slave);
+ 
+ 	// If there's no bond for this aggregator, or this is the last slave
+-	if ((bond == NULL) || (slave->next == bond->next)) {
++	if ((bond == NULL) || (slave->next == bond->first_slave)) {
+ 		return NULL;
+ 	}
+ 
+@@ -392,7 +396,7 @@ static u16 __get_link_speed(struct port 
+ 		}
+ 	}
+ 
+-	BOND_PRINT_DBG(("Port %d Received link speed %d update from adapter", port->actor_port_number, speed));
++	dprintk("Port %d Received link speed %d update from adapter\n", port->actor_port_number, speed);
+ 	return speed;
+ }
+ 
+@@ -418,12 +422,12 @@ static u8 __get_duplex(struct port *port
+ 		switch (slave->duplex) {
+ 		case DUPLEX_FULL:
+ 			retval=0x1;
+-			BOND_PRINT_DBG(("Port %d Received status full duplex update from adapter", port->actor_port_number));
++			dprintk("Port %d Received status full duplex update from adapter\n", port->actor_port_number);
+ 			break;
+ 		case DUPLEX_HALF:
+ 		default:
+ 			retval=0x0;
+-			BOND_PRINT_DBG(("Port %d Received status NOT full duplex update from adapter", port->actor_port_number));
++			dprintk("Port %d Received status NOT full duplex update from adapter\n", port->actor_port_number);
+ 			break;
+ 		}
+ 	}
+@@ -1059,7 +1063,7 @@ static void ad_mux_machine(struct port *
+ 
+ 	// check if the state machine was changed
+ 	if (port->sm_mux_state != last_state) {
+-		BOND_PRINT_DBG(("Mux Machine: Port=%d, Last State=%d, Curr State=%d", port->actor_port_number, last_state, port->sm_mux_state));
++		dprintk("Mux Machine: Port=%d, Last State=%d, Curr State=%d\n", port->actor_port_number, last_state, port->sm_mux_state);
+ 		switch (port->sm_mux_state) {
+ 		case AD_MUX_DETACHED:
+ 			__detach_bond_from_agg(port);
+@@ -1158,7 +1162,7 @@ static void ad_rx_machine(struct lacpdu 
+ 
+ 	// check if the State machine was changed or new lacpdu arrived
+ 	if ((port->sm_rx_state != last_state) || (lacpdu)) {
+-		BOND_PRINT_DBG(("Rx Machine: Port=%d, Last State=%d, Curr State=%d", port->actor_port_number, last_state, port->sm_rx_state));
++		dprintk("Rx Machine: Port=%d, Last State=%d, Curr State=%d\n", port->actor_port_number, last_state, port->sm_rx_state);
+ 		switch (port->sm_rx_state) {
+ 		case AD_RX_INITIALIZE:
+ 			if (!(port->actor_oper_port_key & AD_DUPLEX_KEY_BITS)) {
+@@ -1204,7 +1208,7 @@ static void ad_rx_machine(struct lacpdu 
+ 			// detect loopback situation
+ 			if (!MAC_ADDRESS_COMPARE(&(lacpdu->actor_system), &(port->actor_system))) {
+ 				// INFO_RECEIVED_LOOPBACK_FRAMES
+-				printk(KERN_ERR "bonding: An illegal loopback occurred on adapter (%s)\n",
++				printk(KERN_ERR DRV_NAME ": An illegal loopback occurred on adapter (%s)\n",
+ 						port->slave->dev->name);
+ 				printk(KERN_ERR "Check the configuration to verify that all Adapters "
+ 						"are connected to 802.3ad compliant switch ports\n");
+@@ -1245,7 +1249,7 @@ static void ad_tx_machine(struct port *p
+ 			__update_lacpdu_from_port(port);
+ 			// send the lacpdu
+ 			if (ad_lacpdu_send(port) >= 0) {
+-				BOND_PRINT_DBG(("Sent LACPDU on port %d", port->actor_port_number));
++				dprintk("Sent LACPDU on port %d\n", port->actor_port_number);
+ 				// mark ntt as false, so it will not be sent again until demanded
+ 				port->ntt = 0;
+ 			}
+@@ -1318,7 +1322,7 @@ static void ad_periodic_machine(struct p
+ 
+ 	// check if the state machine was changed
+ 	if (port->sm_periodic_state != last_state) {
+-		BOND_PRINT_DBG(("Periodic Machine: Port=%d, Last State=%d, Curr State=%d", port->actor_port_number, last_state, port->sm_periodic_state));
++		dprintk("Periodic Machine: Port=%d, Last State=%d, Curr State=%d\n", port->actor_port_number, last_state, port->sm_periodic_state);
+ 		switch (port->sm_periodic_state) {
+ 		case AD_NO_PERIODIC:
+ 			port->sm_periodic_timer_counter = 0;	   // zero timer
+@@ -1375,7 +1379,7 @@ static void ad_port_selection_logic(stru
+ 				port->next_port_in_aggregator=NULL;
+ 				port->actor_port_aggregator_identifier=0;
+ 
+-				BOND_PRINT_DBG(("Port %d left LAG %d", port->actor_port_number, temp_aggregator->aggregator_identifier));
++				dprintk("Port %d left LAG %d\n", port->actor_port_number, temp_aggregator->aggregator_identifier);
+ 				// if the aggregator is empty, clear its parameters, and set it ready to be attached
+ 				if (!temp_aggregator->lag_ports) {
+ 					ad_clear_agg(temp_aggregator);
+@@ -1384,7 +1388,7 @@ static void ad_port_selection_logic(stru
+ 			}
+ 		}
+ 		if (!curr_port) { // meaning: the port was related to an aggregator but was not on the aggregator port list
+-			printk(KERN_WARNING "bonding: Warning: Port %d (on %s) was "
++			printk(KERN_WARNING DRV_NAME ": Warning: Port %d (on %s) was "
+ 			       "related to aggregator %d but was not on its port list\n",
+ 			       port->actor_port_number, port->slave->dev->name,
+ 			       port->aggregator->aggregator_identifier);
+@@ -1417,7 +1421,7 @@ static void ad_port_selection_logic(stru
+ 			port->next_port_in_aggregator=aggregator->lag_ports;
+ 			port->aggregator->num_of_ports++;
+ 			aggregator->lag_ports=port;
+-			BOND_PRINT_DBG(("Port %d joined LAG %d(existing LAG)", port->actor_port_number, port->aggregator->aggregator_identifier));
++			dprintk("Port %d joined LAG %d(existing LAG)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
+ 
+ 			// mark this port as selected
+ 			port->sm_vars |= AD_PORT_SELECTED;
+@@ -1454,9 +1458,9 @@ static void ad_port_selection_logic(stru
+ 			// mark this port as selected
+ 			port->sm_vars |= AD_PORT_SELECTED;
+ 
+-			BOND_PRINT_DBG(("Port %d joined LAG %d(new LAG)", port->actor_port_number, port->aggregator->aggregator_identifier));
++			dprintk("Port %d joined LAG %d(new LAG)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
+ 		} else {
+-			printk(KERN_ERR "bonding: Port %d (on %s) did not find a suitable aggregator\n",
++			printk(KERN_ERR DRV_NAME ": Port %d (on %s) did not find a suitable aggregator\n",
+ 			       port->actor_port_number, port->slave->dev->name);
+ 		}
+ 	}
+@@ -1580,30 +1584,30 @@ static void ad_agg_selection_logic(struc
+ 		    aggregator;
+ 		    aggregator = __get_next_agg(aggregator)) {
+ 
+-			BOND_PRINT_DBG(("Agg=%d; Ports=%d; a key=%d; p key=%d; Indiv=%d; Active=%d",
++			dprintk("Agg=%d; Ports=%d; a key=%d; p key=%d; Indiv=%d; Active=%d\n",
+ 					aggregator->aggregator_identifier, aggregator->num_of_ports,
+ 					aggregator->actor_oper_aggregator_key, aggregator->partner_oper_aggregator_key,
+-					aggregator->is_individual, aggregator->is_active));
++					aggregator->is_individual, aggregator->is_active);
+ 		}
+ 
+ 		// check if any partner replys
+ 		if (best_aggregator->is_individual) {
+-			printk(KERN_WARNING "bonding: Warning: No 802.3ad response from the link partner "
++			printk(KERN_WARNING DRV_NAME ": Warning: No 802.3ad response from the link partner "
+ 					"for any adapters in the bond\n");
+ 		}
+ 
+ 		// check if there are more than one aggregator
+ 		if (num_of_aggs > 1) {
+-			BOND_PRINT_DBG(("Warning: More than one Link Aggregation Group was "
+-					"found in the bond. Only one group will function in the bond"));
++			dprintk("Warning: More than one Link Aggregation Group was "
++				"found in the bond. Only one group will function in the bond\n");
+ 		}
+ 
+ 		best_aggregator->is_active = 1;
+-		BOND_PRINT_DBG(("LAG %d choosed as the active LAG", best_aggregator->aggregator_identifier));
+-		BOND_PRINT_DBG(("Agg=%d; Ports=%d; a key=%d; p key=%d; Indiv=%d; Active=%d",
++		dprintk("LAG %d choosed as the active LAG\n", best_aggregator->aggregator_identifier);
++		dprintk("Agg=%d; Ports=%d; a key=%d; p key=%d; Indiv=%d; Active=%d\n",
+ 				best_aggregator->aggregator_identifier, best_aggregator->num_of_ports,
+ 				best_aggregator->actor_oper_aggregator_key, best_aggregator->partner_oper_aggregator_key,
+-				best_aggregator->is_individual, best_aggregator->is_active));
++				best_aggregator->is_individual, best_aggregator->is_active);
+ 
+ 		// disable the ports that were related to the former active_aggregator
+ 		if (last_active_aggregator) {
+@@ -1644,7 +1648,7 @@ static void ad_clear_agg(struct aggregat
+ 		aggregator->lag_ports = NULL;
+ 		aggregator->is_active = 0;
+ 		aggregator->num_of_ports = 0;
+-		BOND_PRINT_DBG(("LAG %d was cleared", aggregator->aggregator_identifier));
++		dprintk("LAG %d was cleared\n", aggregator->aggregator_identifier);
+ 	}
+ }
+ 
+@@ -1729,7 +1733,7 @@ static void ad_initialize_port(struct po
+ static void ad_enable_collecting_distributing(struct port *port)
+ {
+ 	if (port->aggregator->is_active) {
+-		BOND_PRINT_DBG(("Enabling port %d(LAG %d)", port->actor_port_number, port->aggregator->aggregator_identifier));
++		dprintk("Enabling port %d(LAG %d)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
+ 		__enable_port(port);
+ 	}
+ }
+@@ -1742,7 +1746,7 @@ static void ad_enable_collecting_distrib
+ static void ad_disable_collecting_distributing(struct port *port)
+ {
+ 	if (port->aggregator && MAC_ADDRESS_COMPARE(&(port->aggregator->partner_system), &(null_mac_addr))) {
+-		BOND_PRINT_DBG(("Disabling port %d(LAG %d)", port->actor_port_number, port->aggregator->aggregator_identifier));
++		dprintk("Disabling port %d(LAG %d)\n", port->actor_port_number, port->aggregator->aggregator_identifier);
+ 		__disable_port(port);
+ 	}
+ }
+@@ -1780,7 +1784,7 @@ static void ad_marker_info_send(struct p
+ 
+ 	// send the marker information
+ 	if (ad_marker_send(port, &marker) >= 0) {
+-		BOND_PRINT_DBG(("Sent Marker Information on port %d", port->actor_port_number));
++		dprintk("Sent Marker Information on port %d\n", port->actor_port_number);
+ 	}
+ }
+ #endif
+@@ -1803,7 +1807,7 @@ static void ad_marker_info_received(stru
+ 	// send the marker response
+ 
+ 	if (ad_marker_send(port, &marker) >= 0) {
+-		BOND_PRINT_DBG(("Sent Marker Response on port %d", port->actor_port_number));
++		dprintk("Sent Marker Response on port %d\n", port->actor_port_number);
+ 	}
+ }
+ 
+@@ -1890,13 +1894,13 @@ static u16 aggregator_identifier;
+ void bond_3ad_initialize(struct bonding *bond, u16 tick_resolution, int lacp_fast)
+ {                         
+ 	// check that the bond is not initialized yet
+-	if (MAC_ADDRESS_COMPARE(&(BOND_AD_INFO(bond).system.sys_mac_addr), &(bond->device->dev_addr))) {
++	if (MAC_ADDRESS_COMPARE(&(BOND_AD_INFO(bond).system.sys_mac_addr), &(bond->dev->dev_addr))) {
+ 
+ 		aggregator_identifier = 0;
+ 
+ 		BOND_AD_INFO(bond).lacp_fast = lacp_fast;
+ 		BOND_AD_INFO(bond).system.sys_priority = 0xFFFF;
+-		BOND_AD_INFO(bond).system.sys_mac_addr = *((struct mac_addr *)bond->device->dev_addr);
++		BOND_AD_INFO(bond).system.sys_mac_addr = *((struct mac_addr *)bond->dev->dev_addr);
+ 
+ 		// initialize how many times this module is called in one second(should be about every 100ms)
+ 		ad_ticks_per_sec = tick_resolution;
+@@ -1921,7 +1925,7 @@ int bond_3ad_bind_slave(struct slave *sl
+ 	struct aggregator *aggregator;
+ 
+ 	if (bond == NULL) {
+-		printk(KERN_CRIT "The slave %s is not attached to its bond\n", slave->dev->name);
++		printk(KERN_ERR "The slave %s is not attached to its bond\n", slave->dev->name);
+ 		return -1;
+ 	}
+ 
+@@ -1964,7 +1968,7 @@ int bond_3ad_bind_slave(struct slave *sl
+ 
+ 		ad_initialize_agg(aggregator);
+ 
+-		aggregator->aggregator_mac_address = *((struct mac_addr *)bond->device->dev_addr);
++		aggregator->aggregator_mac_address = *((struct mac_addr *)bond->dev->dev_addr);
+ 		aggregator->aggregator_identifier = (++aggregator_identifier);
+ 		aggregator->slave = slave;
+ 		aggregator->is_active = 0;
+@@ -1996,11 +2000,11 @@ void bond_3ad_unbind_slave(struct slave 
+ 
+ 	// if slave is null, the whole port is not initialized
+ 	if (!port->slave) {
+-		printk(KERN_WARNING "bonding: Trying to unbind an uninitialized port on %s\n", slave->dev->name);
++		printk(KERN_WARNING DRV_NAME ": Trying to unbind an uninitialized port on %s\n", slave->dev->name);
+ 		return;
+ 	}
+ 
+-	BOND_PRINT_DBG(("Unbinding Link Aggregation Group %d", aggregator->aggregator_identifier));
++	dprintk("Unbinding Link Aggregation Group %d\n", aggregator->aggregator_identifier);
+ 
+ 	/* Tell the partner that this port is not suitable for aggregation */
+ 	port->actor_oper_port_state &= ~AD_STATE_AGGREGATION;
+@@ -2024,10 +2028,10 @@ void bond_3ad_unbind_slave(struct slave 
+ 			// if new aggregator found, copy the aggregator's parameters
+ 			// and connect the related lag_ports to the new aggregator
+ 			if ((new_aggregator) && ((!new_aggregator->lag_ports) || ((new_aggregator->lag_ports == port) && !new_aggregator->lag_ports->next_port_in_aggregator))) {
+-				BOND_PRINT_DBG(("Some port(s) related to LAG %d - replaceing with LAG %d", aggregator->aggregator_identifier, new_aggregator->aggregator_identifier));
++				dprintk("Some port(s) related to LAG %d - replaceing with LAG %d\n", aggregator->aggregator_identifier, new_aggregator->aggregator_identifier);
+ 
+ 				if ((new_aggregator->lag_ports == port) && new_aggregator->is_active) {
+-					printk(KERN_INFO "bonding: Removing an active aggregator\n");
++					printk(KERN_INFO DRV_NAME ": Removing an active aggregator\n");
+ 					// select new active aggregator
+ 					 select_new_active_agg = 1;
+ 				}
+@@ -2057,7 +2061,7 @@ void bond_3ad_unbind_slave(struct slave 
+ 					ad_agg_selection_logic(__get_first_agg(port));
+ 				}
+ 			} else {
+-				printk(KERN_WARNING "bonding: Warning: unbinding aggregator, "
++				printk(KERN_WARNING DRV_NAME ": Warning: unbinding aggregator, "
+ 				       "and could not find a new aggregator for its ports\n");
+ 			}
+ 		} else { // in case that the only port related to this aggregator is the one we want to remove
+@@ -2072,7 +2076,7 @@ void bond_3ad_unbind_slave(struct slave 
+ 		}
+ 	}
+ 
+-	BOND_PRINT_DBG(("Unbinding port %d", port->actor_port_number));
++	dprintk("Unbinding port %d\n", port->actor_port_number);
+ 	// find the aggregator that this port is connected to
+ 	temp_aggregator = __get_first_agg(port);
+ 	for (; temp_aggregator; temp_aggregator = __get_next_agg(temp_aggregator)) {
+@@ -2123,13 +2127,13 @@ void bond_3ad_state_machine_handler(stru
+ 
+ 	read_lock(&bond->lock);
+ 
+-	//check if there are any slaves
+-	if (bond->next == (struct slave *)bond) {
+-		goto end;
++	if (bond->kill_timers) {
++		goto out;
+ 	}
+ 
+-	if ((bond->device->flags & IFF_UP) != IFF_UP) {
+-		goto end;
++	//check if there are any slaves
++	if (bond->slave_cnt == 0) {
++		goto re_arm;
+ 	}
+ 
+ 	// check if agg_select_timer timer after initialize is timed out
+@@ -2137,8 +2141,8 @@ void bond_3ad_state_machine_handler(stru
+ 		// select the active aggregator for the bond
+ 		if ((port = __get_first_port(bond))) {
+ 			if (!port->slave) {
+-				printk(KERN_WARNING "bonding: Warning: bond's first port is uninitialized\n");
+-				goto end;
++				printk(KERN_WARNING DRV_NAME ": Warning: bond's first port is uninitialized\n");
++				goto re_arm;
+ 			}
+ 
+ 			aggregator = __get_first_agg(port);
+@@ -2149,8 +2153,8 @@ void bond_3ad_state_machine_handler(stru
+ 	// for each port run the state machines
+ 	for (port = __get_first_port(bond); port; port = __get_next_port(port)) {
+ 		if (!port->slave) {
+-			printk(KERN_WARNING "bonding: Warning: Found an uninitialized port\n");
+-			goto end;
++			printk(KERN_WARNING DRV_NAME ": Warning: Found an uninitialized port\n");
++			goto re_arm;
+ 		}
+ 
+ 		ad_rx_machine(NULL, port);
+@@ -2165,14 +2169,10 @@ void bond_3ad_state_machine_handler(stru
+ 		}
+ 	}
+ 
+-end:
++re_arm:
++	mod_timer(&(BOND_AD_INFO(bond).ad_timer), jiffies + ad_delta_in_ticks);
++out:
+ 	read_unlock(&bond->lock);
+-
+-
+-	if ((bond->device->flags & IFF_UP) == IFF_UP) {
+-		/* re-arm the timer */
+-		mod_timer(&(BOND_AD_INFO(bond).ad_timer), jiffies + (AD_TIMER_INTERVAL * HZ / 1000));
+-	}
+ }
+ 
+ /**
+@@ -2194,14 +2194,14 @@ void bond_3ad_rx_indication(struct lacpd
+ 		port = &(SLAVE_AD_INFO(slave).port);
+ 
+ 		if (!port->slave) {
+-			printk(KERN_WARNING "bonding: Warning: port of slave %s is uninitialized\n", slave->dev->name);
++			printk(KERN_WARNING DRV_NAME ": Warning: port of slave %s is uninitialized\n", slave->dev->name);
+ 			return;
+ 		}
+ 
+ 		switch (lacpdu->subtype) {
+ 		case AD_TYPE_LACPDU:
+ 			__ntohs_lacpdu(lacpdu);
+-			BOND_PRINT_DBG(("Received LACPDU on port %d", port->actor_port_number));
++			dprintk("Received LACPDU on port %d\n", port->actor_port_number);
+ 			ad_rx_machine(lacpdu, port);
+ 			break;
+ 
+@@ -2210,17 +2210,17 @@ void bond_3ad_rx_indication(struct lacpd
+ 
+ 			switch (((struct marker *)lacpdu)->tlv_type) {
+ 			case AD_MARKER_INFORMATION_SUBTYPE:
+-				BOND_PRINT_DBG(("Received Marker Information on port %d", port->actor_port_number));
++				dprintk("Received Marker Information on port %d\n", port->actor_port_number);
+ 				ad_marker_info_received((struct marker *)lacpdu, port);
+ 				break;
+ 
+ 			case AD_MARKER_RESPONSE_SUBTYPE:
+-				BOND_PRINT_DBG(("Received Marker Response on port %d", port->actor_port_number));
++				dprintk("Received Marker Response on port %d\n", port->actor_port_number);
+ 				ad_marker_response_received((struct marker *)lacpdu, port);
+ 				break;
+ 
+ 			default:
+-				BOND_PRINT_DBG(("Received an unknown Marker subtype on slot %d", port->actor_port_number));
++				dprintk("Received an unknown Marker subtype on slot %d\n", port->actor_port_number);
+ 			}
+ 		}
+ 	}
+@@ -2240,14 +2240,14 @@ void bond_3ad_adapter_speed_changed(stru
+ 
+ 	// if slave is null, the whole port is not initialized
+ 	if (!port->slave) {
+-		printk(KERN_WARNING "bonding: Warning: speed changed for uninitialized port on %s\n",
++		printk(KERN_WARNING DRV_NAME ": Warning: speed changed for uninitialized port on %s\n",
+ 		       slave->dev->name);
+ 		return;
+ 	}
+ 
+ 	port->actor_admin_port_key &= ~AD_SPEED_KEY_BITS;
+ 	port->actor_oper_port_key=port->actor_admin_port_key |= (__get_link_speed(port) << 1);
+-	BOND_PRINT_DBG(("Port %d changed speed", port->actor_port_number));
++	dprintk("Port %d changed speed\n", port->actor_port_number);
+ 	// there is no need to reselect a new aggregator, just signal the
+ 	// state machines to reinitialize
+ 	port->sm_vars |= AD_PORT_BEGIN;
+@@ -2267,14 +2267,14 @@ void bond_3ad_adapter_duplex_changed(str
+ 
+ 	// if slave is null, the whole port is not initialized
+ 	if (!port->slave) {
+-		printk(KERN_WARNING "bonding: Warning: duplex changed for uninitialized port on %s\n",
++		printk(KERN_WARNING DRV_NAME ": Warning: duplex changed for uninitialized port on %s\n",
+ 		       slave->dev->name);
+ 		return;
+ 	}
+ 
+ 	port->actor_admin_port_key &= ~AD_DUPLEX_KEY_BITS;
+ 	port->actor_oper_port_key=port->actor_admin_port_key |= __get_duplex(port);
+-	BOND_PRINT_DBG(("Port %d changed duplex", port->actor_port_number));
++	dprintk("Port %d changed duplex\n", port->actor_port_number);
+ 	// there is no need to reselect a new aggregator, just signal the
+ 	// state machines to reinitialize
+ 	port->sm_vars |= AD_PORT_BEGIN;
+@@ -2295,10 +2295,8 @@ void bond_3ad_handle_link_change(struct 
+ 
+ 	// if slave is null, the whole port is not initialized
+ 	if (!port->slave) {
+-#ifdef BONDING_DEBUG
+-		printk(KERN_WARNING "bonding: Warning: link status changed for uninitialized port on %s\n",
+-		       slave->dev->name);
+-#endif
++		printk(KERN_WARNING DRV_NAME ": Warning: link status changed for uninitialized port on %s\n",
++			slave->dev->name);
+ 		return;
+ 	}
+ 
+@@ -2356,41 +2354,27 @@ int bond_3ad_get_active_agg_info(struct 
+ 
+ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
+ {
+-	slave_t *slave, *start_at;
+-	struct bonding *bond = (struct bonding *) dev->priv;
++	struct slave *slave, *start_at;
++	struct bonding *bond = dev->priv;
+ 	struct ethhdr *data = (struct ethhdr *)skb->data;
+ 	int slave_agg_no;
+ 	int slaves_in_agg;
+ 	int agg_id;
++	int i;
+ 	struct ad_info ad_info;
+ 
+-	if (!IS_UP(dev)) { /* bond down */
+-		dev_kfree_skb(skb);
+-		return 0;
+-	}
+-
+-	if (bond == NULL) {
+-		printk(KERN_CRIT "bonding: Error: bond is NULL on device %s\n", dev->name);
+-		dev_kfree_skb(skb);
+-		return 0;
+-	}
+-
++	/* make sure that the slaves list will
++	 * not change during tx
++	 */
+ 	read_lock(&bond->lock);
+-	slave = bond->prev;
+ 
+-	/* check if bond is empty */
+-	if ((slave == (struct slave *) bond) || (bond->slave_cnt == 0)) {
+-		printk(KERN_DEBUG "ERROR: bond is empty\n");
+-		dev_kfree_skb(skb);
+-		read_unlock(&bond->lock);
+-		return 0;
++	if (!BOND_IS_OK(bond)) {
++		goto free_out;
+ 	}
+ 
+ 	if (bond_3ad_get_active_agg_info(bond, &ad_info)) {
+ 		printk(KERN_DEBUG "ERROR: bond_3ad_get_active_agg_info failed\n");
+-		dev_kfree_skb(skb);
+-		read_unlock(&bond->lock);
+-		return 0;
++		goto free_out;
+ 	}
+ 
+ 	slaves_in_agg = ad_info.ports;
+@@ -2399,21 +2383,12 @@ int bond_3ad_xmit_xor(struct sk_buff *sk
+ 	if (slaves_in_agg == 0) {
+ 		/*the aggregator is empty*/
+ 		printk(KERN_DEBUG "ERROR: active aggregator is empty\n");
+-		dev_kfree_skb(skb);
+-		read_unlock(&bond->lock);
+-		return 0;
++		goto free_out;
+ 	}
+ 
+-	/* we're at the root, get the first slave */
+-	if ((slave == NULL) || (slave->dev == NULL)) {
+-		/* no suitable interface, frame not sent */
+-		dev_kfree_skb(skb);
+-		read_unlock(&bond->lock);
+-		return 0;
+-	}
++	slave_agg_no = (data->h_dest[5]^bond->dev->dev_addr[5]) % slaves_in_agg;
+ 
+-	slave_agg_no = (data->h_dest[5]^slave->dev->dev_addr[5]) % slaves_in_agg;
+-	while (slave != (slave_t *)bond) {
++	bond_for_each_slave(bond, slave, i) {
+ 		struct aggregator *agg = SLAVE_AD_INFO(slave).port.aggregator;
+ 
+ 		if (agg && (agg->aggregator_identifier == agg_id)) {
+@@ -2422,37 +2397,18 @@ int bond_3ad_xmit_xor(struct sk_buff *sk
+ 				break;
+ 			}
+ 		}
+-
+-		slave = slave->prev;
+-		if (slave == NULL) {
+-			printk(KERN_ERR "bonding: Error: slave is NULL\n");
+-			dev_kfree_skb(skb);
+-			read_unlock(&bond->lock);
+-			return 0;
+-		}
+ 	}
+ 
+-	if (slave == (slave_t *)bond) {
+-		printk(KERN_ERR "bonding: Error: Couldn't find a slave to tx on for aggregator ID %d\n", agg_id);
+-		dev_kfree_skb(skb);
+-		read_unlock(&bond->lock);
+-		return 0;
++	if (slave_agg_no >= 0) {
++		printk(KERN_ERR DRV_NAME ": Error: Couldn't find a slave to tx on for aggregator ID %d\n", agg_id);
++		goto free_out;
+ 	}
+ 
+ 	start_at = slave;
+ 
+-	do {
++	bond_for_each_slave_from(bond, slave, i, start_at) {
+ 		int slave_agg_id = 0;
+-		struct aggregator *agg;
+-
+-		if (slave == NULL) {
+-			printk(KERN_ERR "bonding: Error: slave is NULL\n");
+-			dev_kfree_skb(skb);
+-			read_unlock(&bond->lock);
+-			return 0;
+-		}
+-
+-		agg = SLAVE_AD_INFO(slave).port.aggregator;
++		struct aggregator *agg = SLAVE_AD_INFO(slave).port.aggregator;
+ 
+ 		if (agg) {
+ 			slave_agg_id = agg->aggregator_identifier;
+@@ -2463,20 +2419,24 @@ int bond_3ad_xmit_xor(struct sk_buff *sk
+ 			skb->dev = slave->dev;			
+ 			skb->priority = 1;
+ 			dev_queue_xmit(skb);
+-			read_unlock(&bond->lock);
+-			return 0;
++
++			goto out;
+ 		}
+-	} while ((slave = slave->next) != start_at);
++	}
+ 
+-	/* no suitable interface, frame not sent */
+-	dev_kfree_skb(skb);
++out:
+ 	read_unlock(&bond->lock);
+ 	return 0;
++
++free_out:
++	/* no suitable interface, frame not sent */
++	dev_kfree_skb(skb);
++	goto out;
+ }
+ 
+ int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type* ptype)
+ {
+-	struct bonding *bond = (struct bonding *)dev->priv;
++	struct bonding *bond = dev->priv;
+ 	struct slave *slave = NULL;
+ 	int ret = NET_RX_DROP;
+ 
+--- linux-2.6.0/drivers/net/bonding/bond_3ad.h	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/bonding/bond_3ad.h	2003-12-28 23:21:00.000000000 -0800
+@@ -28,6 +28,9 @@
+  * 2003/05/01 - Shmulik Hen <shmulik.hen at intel dot com>
+  *	- Renamed bond_3ad_link_status_changed() to
+  *	  bond_3ad_handle_link_change() for compatibility with TLB.
++ *
++ * 2003/09/24 - Shmulik Hen <shmulik.hen at intel dot com>
++ *	- Code cleanup and style changes
+  */
+ 
+ #ifndef __BOND_3AD_H__
+--- linux-2.6.0/drivers/net/bonding/bond_alb.c	2003-10-08 15:07:09.000000000 -0700
++++ 25/drivers/net/bonding/bond_alb.c	2003-12-28 23:21:00.000000000 -0800
+@@ -28,8 +28,13 @@
+  * 2003/08/06 - Amir Noam <amir.noam at intel dot com>
+  *	- Add support for setting bond's MAC address with special
+  *	  handling required for ALB/TLB.
++ *
++ * 2003/09/24 - Shmulik Hen <shmulik.hen at intel dot com>
++ *	- Code cleanup and style changes
+  */
+ 
++//#define BONDING_DEBUG 1
++
+ #include <linux/skbuff.h>
+ #include <linux/netdevice.h>
+ #include <linux/etherdevice.h>
+@@ -50,11 +55,11 @@
+ 
+ 
+ #define ALB_TIMER_TICKS_PER_SEC	    10	/* should be a divisor of HZ */
+-#define BOND_TLB_REBALANCE_INTERVAL 10	/* in seconds, periodic re-balancing
+-					 * used for division - never set
++#define BOND_TLB_REBALANCE_INTERVAL 10	/* In seconds, periodic re-balancing.
++					 * Used for division - never set
+ 					 * to zero !!!
+ 					 */
+-#define BOND_ALB_LP_INTERVAL	    1	/* in seconds periodic send of
++#define BOND_ALB_LP_INTERVAL	    1	/* In seconds, periodic send of
+ 					 * learning packets to the switch
+ 					 */
+ 
+@@ -66,7 +71,7 @@
+ 
+ #define TLB_HASH_TABLE_SIZE 256	/* The size of the clients hash table.
+ 				 * Note that this value MUST NOT be smaller
+-				 * because the key hash table BYTE wide !
++				 * because the key hash table is BYTE wide !
+ 				 */
+ 
+ 
+@@ -86,12 +91,15 @@
+  */
+ #define RLB_PROMISC_TIMEOUT	10*ALB_TIMER_TICKS_PER_SEC
+ 
++static const u8 mac_bcast[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff};
++static const int alb_delta_in_ticks = HZ / ALB_TIMER_TICKS_PER_SEC;
++
+ #pragma pack(1)
+ struct learning_pkt {
+ 	u8 mac_dst[ETH_ALEN];
+ 	u8 mac_src[ETH_ALEN];
+ 	u16 type;
+-	u8 padding[ETH_ZLEN - (2*ETH_ALEN + 2)];
++	u8 padding[ETH_ZLEN - ETH_HLEN];
+ };
+ 
+ struct arp_pkt {
+@@ -110,13 +118,12 @@ struct arp_pkt {
+ /* Forward declaration */
+ static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[]);
+ 
+-static inline u8
+-_simple_hash(u8 *hash_start, int hash_size)
++static inline u8 _simple_hash(u8 *hash_start, int hash_size)
+ {
+ 	int i;
+ 	u8 hash = 0;
+ 
+-	for (i=0; i<hash_size; i++) {
++	for (i = 0; i < hash_size; i++) {
+ 		hash ^= hash_start[i];
+ 	}
+ 
+@@ -125,193 +132,151 @@ _simple_hash(u8 *hash_start, int hash_si
+ 
+ /*********************** tlb specific functions ***************************/
+ 
+-static inline void
+-_lock_tx_hashtbl(struct bonding *bond)
++static inline void _lock_tx_hashtbl(struct bonding *bond)
+ {
+ 	spin_lock(&(BOND_ALB_INFO(bond).tx_hashtbl_lock));
+ }
+ 
+-static inline void
+-_unlock_tx_hashtbl(struct bonding *bond)
++static inline void _unlock_tx_hashtbl(struct bonding *bond)
+ {
+ 	spin_unlock(&(BOND_ALB_INFO(bond).tx_hashtbl_lock));
+ }
+ 
+ /* Caller must hold tx_hashtbl lock */
+-static inline void
+-tlb_init_table_entry(struct bonding *bond, u8 index, u8 save_load)
++static inline void tlb_init_table_entry(struct tlb_client_info *entry, int save_load)
+ {
+-	struct tlb_client_info *entry;
+-
+-	if (BOND_ALB_INFO(bond).tx_hashtbl == NULL) {
+-		return;
+-	}
+-
+-	entry = &(BOND_ALB_INFO(bond).tx_hashtbl[index]);
+-	/* at end of cycle, save the load that was transmitted to the client
+-	 * during the cycle, and set the tx_bytes counter to 0 for counting
+-	 * the load during the next cycle
+-	 */
+ 	if (save_load) {
+ 		entry->load_history = 1 + entry->tx_bytes /
+-			BOND_TLB_REBALANCE_INTERVAL;
++				      BOND_TLB_REBALANCE_INTERVAL;
+ 		entry->tx_bytes = 0;
+ 	}
++
+ 	entry->tx_slave = NULL;
+ 	entry->next = TLB_NULL_INDEX;
+ 	entry->prev = TLB_NULL_INDEX;
+ }
+ 
+-static inline void
+-tlb_init_slave(struct slave *slave)
++static inline void tlb_init_slave(struct slave *slave)
+ {
+-	struct tlb_slave_info *slave_info = &(SLAVE_TLB_INFO(slave));
+-
+-	slave_info->load = 0;
+-	slave_info->head = TLB_NULL_INDEX;
++	SLAVE_TLB_INFO(slave).load = 0;
++	SLAVE_TLB_INFO(slave).head = TLB_NULL_INDEX;
+ }
+ 
+ /* Caller must hold bond lock for read */
+-static inline void
+-tlb_clear_slave(struct bonding *bond, struct slave *slave, u8 save_load)
++static void tlb_clear_slave(struct bonding *bond, struct slave *slave, int save_load)
+ {
+-	struct tlb_client_info *tx_hash_table = NULL;
+-	u32 index, next_index;
++	struct tlb_client_info *tx_hash_table;
++	u32 index;
+ 
+-	/* clear slave from tx_hashtbl */
+ 	_lock_tx_hashtbl(bond);
++
++	/* clear slave from tx_hashtbl */
+ 	tx_hash_table = BOND_ALB_INFO(bond).tx_hashtbl;
+ 
+-	if (tx_hash_table) {
+-		index = SLAVE_TLB_INFO(slave).head;
+-		while (index != TLB_NULL_INDEX) {
+-			next_index = tx_hash_table[index].next;
+-			tlb_init_table_entry(bond, index, save_load);
+-			index = next_index;
+-		}
++	index = SLAVE_TLB_INFO(slave).head;
++	while (index != TLB_NULL_INDEX) {
++		u32 next_index = tx_hash_table[index].next;
++		tlb_init_table_entry(&tx_hash_table[index], save_load);
++		index = next_index;
+ 	}
++
+ 	_unlock_tx_hashtbl(bond);
+ 
+ 	tlb_init_slave(slave);
+ }
+ 
+ /* Must be called before starting the monitor timer */
+-static int
+-tlb_initialize(struct bonding *bond)
++static int tlb_initialize(struct bonding *bond)
+ {
+ 	struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
++	int size = TLB_HASH_TABLE_SIZE * sizeof(struct tlb_client_info);
+ 	int i;
+-	size_t size;
+-
+-#if(TLB_HASH_TABLE_SIZE != 256)
+-	/* Key to the hash table is byte wide. Check the size! */
+-	#error Hash Table size is wrong.
+-#endif
+ 
+ 	spin_lock_init(&(bond_info->tx_hashtbl_lock));
+ 
+ 	_lock_tx_hashtbl(bond);
+-	if (bond_info->tx_hashtbl != NULL) {
+-		printk (KERN_ERR "%s: TLB hash table is not NULL\n",
+-			bond->device->name);
+-		_unlock_tx_hashtbl(bond);
+-		return -1;
+-	}
+ 
+-	size = TLB_HASH_TABLE_SIZE * sizeof(struct tlb_client_info);
+ 	bond_info->tx_hashtbl = kmalloc(size, GFP_KERNEL);
+-	if (bond_info->tx_hashtbl == NULL) {
+-		printk (KERN_ERR "%s: Failed to allocate TLB hash table\n",
+-			bond->device->name);
++	if (!bond_info->tx_hashtbl) {
++		printk(KERN_ERR DRV_NAME
++		       ": Error: %s: Failed to allocate TLB hash table\n",
++		       bond->dev->name);
+ 		_unlock_tx_hashtbl(bond);
+ 		return -1;
+ 	}
+ 
+ 	memset(bond_info->tx_hashtbl, 0, size);
+-	for (i=0; i<TLB_HASH_TABLE_SIZE; i++) {
+-		tlb_init_table_entry(bond, i, 1);
++
++	for (i = 0; i < TLB_HASH_TABLE_SIZE; i++) {
++		tlb_init_table_entry(&bond_info->tx_hashtbl[i], 1);
+ 	}
++
+ 	_unlock_tx_hashtbl(bond);
+ 
+ 	return 0;
+ }
+ 
+ /* Must be called only after all slaves have been released */
+-static void
+-tlb_deinitialize(struct bonding *bond)
++static void tlb_deinitialize(struct bonding *bond)
+ {
+ 	struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
+ 
+ 	_lock_tx_hashtbl(bond);
+-	if (bond_info->tx_hashtbl == NULL) {
+-		_unlock_tx_hashtbl(bond);
+-		return;
+-	}
++
+ 	kfree(bond_info->tx_hashtbl);
+ 	bond_info->tx_hashtbl = NULL;
++
+ 	_unlock_tx_hashtbl(bond);
+ }
+ 
+ /* Caller must hold bond lock for read */
+-static struct slave*
+-tlb_get_least_loaded_slave(struct bonding *bond)
++static struct slave *tlb_get_least_loaded_slave(struct bonding *bond)
+ {
+-	struct slave *slave;
+-	struct slave *least_loaded;
+-	s64 curr_gap, max_gap;
++	struct slave *slave, *least_loaded;
++	s64 max_gap;
++	int i, found = 0;
+ 
+ 	/* Find the first enabled slave */
+-	slave = bond_get_first_slave(bond);
+-	while (slave) {
++	bond_for_each_slave(bond, slave, i) {
+ 		if (SLAVE_IS_OK(slave)) {
++			found = 1;
+ 			break;
+ 		}
+-		slave = bond_get_next_slave(bond, slave);
+ 	}
+ 
+-	if (!slave) {
++	if (!found) {
+ 		return NULL;
+ 	}
+ 
+ 	least_loaded = slave;
+-	max_gap = (s64)(slave->speed * 1000000) -
+-			(s64)(SLAVE_TLB_INFO(slave).load * 8);
++	max_gap = (s64)(slave->speed << 20) - /* Convert to Megabit per sec */
++			(s64)(SLAVE_TLB_INFO(slave).load << 3); /* Bytes to bits */
+ 
+ 	/* Find the slave with the largest gap */
+-	slave = bond_get_next_slave(bond, slave);
+-	while (slave) {
++	bond_for_each_slave_from(bond, slave, i, least_loaded) {
+ 		if (SLAVE_IS_OK(slave)) {
+-			curr_gap = (s64)(slave->speed * 1000000) -
+-					(s64)(SLAVE_TLB_INFO(slave).load * 8);
+-			if (max_gap < curr_gap) {
++			s64 gap = (s64)(slave->speed << 20) -
++					(s64)(SLAVE_TLB_INFO(slave).load << 3);
++			if (max_gap < gap) {
+ 				least_loaded = slave;
+-				max_gap = curr_gap;
++				max_gap = gap;
+ 			}
+ 		}
+-		slave = bond_get_next_slave(bond, slave);
+ 	}
+ 
+ 	return least_loaded;
+ }
+ 
+ /* Caller must hold bond lock for read */
+-struct slave*
+-tlb_choose_channel(struct bonding *bond, u32 hash_index, u32 skb_len)
++struct slave *tlb_choose_channel(struct bonding *bond, u32 hash_index, u32 skb_len)
+ {
+ 	struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
+-	struct tlb_client_info *hash_table = NULL;
+-	struct slave *assigned_slave = NULL;
++	struct tlb_client_info *hash_table;
++	struct slave *assigned_slave;
+ 
+ 	_lock_tx_hashtbl(bond);
+ 
+ 	hash_table = bond_info->tx_hashtbl;
+-	if (hash_table == NULL) {
+-		printk (KERN_ERR "%s: TLB hash table is NULL\n",
+-			bond->device->name);
+-		_unlock_tx_hashtbl(bond);
+-		return NULL;
+-	}
+-
+ 	assigned_slave = hash_table[hash_index].tx_slave;
+ 	if (!assigned_slave) {
+ 		assigned_slave = tlb_get_least_loaded_slave(bond);
+@@ -345,14 +310,12 @@ tlb_choose_channel(struct bonding *bond,
+ }
+ 
+ /*********************** rlb specific functions ***************************/
+-static inline void
+-_lock_rx_hashtbl(struct bonding *bond)
++static inline void _lock_rx_hashtbl(struct bonding *bond)
+ {
+ 	spin_lock(&(BOND_ALB_INFO(bond).rx_hashtbl_lock));
+ }
+ 
+-static inline void
+-_unlock_rx_hashtbl(struct bonding *bond)
++static inline void _unlock_rx_hashtbl(struct bonding *bond)
+ {
+ 	spin_unlock(&(BOND_ALB_INFO(bond).rx_hashtbl_lock));
+ }
+@@ -360,26 +323,20 @@ _unlock_rx_hashtbl(struct bonding *bond)
+ /* when an ARP REPLY is received from a client update its info
+  * in the rx_hashtbl
+  */
+-static void
+-rlb_update_entry_from_arp(struct bonding *bond, struct arp_pkt *arp)
++static void rlb_update_entry_from_arp(struct bonding *bond, struct arp_pkt *arp)
+ {
+-	u32 hash_index;
+-	struct rlb_client_info *client_info = NULL;
+ 	struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
++	struct rlb_client_info *client_info;
++	u32 hash_index;
+ 
+ 	_lock_rx_hashtbl(bond);
+ 
+-	if (bond_info->rx_hashtbl == NULL) {
+-		_unlock_rx_hashtbl(bond);
+-		return;
+-	}
+-	hash_index = _simple_hash((u8*)&(arp->ip_src), 4);
++	hash_index = _simple_hash((u8*)&(arp->ip_src), sizeof(arp->ip_src));
+ 	client_info = &(bond_info->rx_hashtbl[hash_index]);
+ 
+ 	if ((client_info->assigned) &&
+ 	    (client_info->ip_src == arp->ip_dst) &&
+ 	    (client_info->ip_dst == arp->ip_src)) {
+-
+ 		/* update the clients MAC address */
+ 		memcpy(client_info->mac_dst, arp->mac_src, ETH_ALEN);
+ 		client_info->ntt = 1;
+@@ -389,66 +346,60 @@ rlb_update_entry_from_arp(struct bonding
+ 	_unlock_rx_hashtbl(bond);
+ }
+ 
+-static int
+-rlb_arp_recv(struct sk_buff *skb,
+-	     struct net_device *dev,
+-	     struct packet_type* ptype)
++static int rlb_arp_recv(struct sk_buff *skb, struct net_device *bond_dev, struct packet_type *ptype)
+ {
+-	struct bonding *bond = (struct bonding *)dev->priv;
+-	int ret = NET_RX_DROP;
++	struct bonding *bond = bond_dev->priv;
+ 	struct arp_pkt *arp = (struct arp_pkt *)skb->data;
++	int res = NET_RX_DROP;
+ 
+-	if (!(dev->flags & IFF_MASTER)) {
++	if (!(bond_dev->flags & IFF_MASTER)) {
+ 		goto out;
+ 	}
+ 
+ 	if (!arp) {
+-		printk(KERN_ERR "Packet has no ARP data\n");
++		dprintk("Packet has no ARP data\n");
+ 		goto out;
+ 	}
+ 
+ 	if (skb->len < sizeof(struct arp_pkt)) {
+-		printk(KERN_ERR "Packet is too small to be an ARP\n");
++		dprintk("Packet is too small to be an ARP\n");
+ 		goto out;
+ 	}
+ 
+ 	if (arp->op_code == htons(ARPOP_REPLY)) {
+ 		/* update rx hash table for this ARP */
+ 		rlb_update_entry_from_arp(bond, arp);
+-		BOND_PRINT_DBG(("Server received an ARP Reply from client"));
++		dprintk("Server received an ARP Reply from client\n");
+ 	}
+ 
+-	ret = NET_RX_SUCCESS;
++	res = NET_RX_SUCCESS;
+ 
+ out:
+ 	dev_kfree_skb(skb);
+ 
+-	return ret;
++	return res;
+ }
+ 
+ /* Caller must hold bond lock for read */
+-static struct slave*
+-rlb_next_rx_slave(struct bonding *bond)
++static struct slave *rlb_next_rx_slave(struct bonding *bond)
+ {
+-	struct slave *rx_slave = NULL, *slave = NULL;
+-	unsigned int i = 0;
+ 	struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
++	struct slave *rx_slave, *slave, *start_at;
++	int i = 0;
+ 
+-	slave = bond_info->next_rx_slave;
+-	if (slave == NULL) {
+-		slave = bond->next;
++	if (bond_info->next_rx_slave) {
++		start_at = bond_info->next_rx_slave;
++	} else {
++		start_at = bond->first_slave;
+ 	}
+ 
+-	/* this loop uses the circular linked list property of the
+-	 * slave's list to go through all slaves
+-	 */
+-	for (i = 0; i < bond->slave_cnt; i++, slave = slave->next) {
++	rx_slave = NULL;
+ 
++	bond_for_each_slave_from(bond, slave, i, start_at) {
+ 		if (SLAVE_IS_OK(slave)) {
+ 			if (!rx_slave) {
+ 				rx_slave = slave;
+-			}
+-			else if (slave->speed > rx_slave->speed) {
++			} else if (slave->speed > rx_slave->speed) {
+ 				rx_slave = slave;
+ 			}
+ 		}
+@@ -464,48 +415,41 @@ rlb_next_rx_slave(struct bonding *bond)
+ /* teach the switch the mac of a disabled slave
+  * on the primary for fault tolerance
+  *
+- * Caller must hold bond->ptrlock for write or bond lock for write
++ * Caller must hold bond->curr_slave_lock for write or bond lock for write
+  */
+-static void
+-rlb_teach_disabled_mac_on_primary(struct bonding *bond, u8 addr[])
++static void rlb_teach_disabled_mac_on_primary(struct bonding *bond, u8 addr[])
+ {
+-	if (!bond->current_slave) {
++	if (!bond->curr_active_slave) {
+ 		return;
+ 	}
++
+ 	if (!bond->alb_info.primary_is_promisc) {
+ 		bond->alb_info.primary_is_promisc = 1;
+-		dev_set_promiscuity(bond->current_slave->dev, 1);
++		dev_set_promiscuity(bond->curr_active_slave->dev, 1);
+ 	}
++
+ 	bond->alb_info.rlb_promisc_timeout_counter = 0;
+ 
+-	alb_send_learning_packets(bond->current_slave, addr);
++	alb_send_learning_packets(bond->curr_active_slave, addr);
+ }
+ 
+ /* slave being removed should not be active at this point
+  *
+  * Caller must hold bond lock for read
+  */
+-static void
+-rlb_clear_slave(struct bonding *bond, struct slave *slave)
++static void rlb_clear_slave(struct bonding *bond, struct slave *slave)
+ {
+-	struct rlb_client_info *rx_hash_table = NULL;
+ 	struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
+-	u8 mac_bcast[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff};
++	struct rlb_client_info *rx_hash_table;
+ 	u32 index, next_index;
+ 
+ 	/* clear slave from rx_hashtbl */
+ 	_lock_rx_hashtbl(bond);
+-	rx_hash_table = bond_info->rx_hashtbl;
+-
+-	if (rx_hash_table == NULL) {
+-		_unlock_rx_hashtbl(bond);
+-		return;
+-	}
+ 
++	rx_hash_table = bond_info->rx_hashtbl;
+ 	index = bond_info->rx_hashtbl_head;
+ 	for (; index != RLB_NULL_INDEX; index = next_index) {
+ 		next_index = rx_hash_table[index].next;
+-
+ 		if (rx_hash_table[index].slave == slave) {
+ 			struct slave *assigned_slave = rlb_next_rx_slave(bond);
+ 
+@@ -533,23 +477,24 @@ rlb_clear_slave(struct bonding *bond, st
+ 
+ 	_unlock_rx_hashtbl(bond);
+ 
+-	write_lock(&bond->ptrlock);
+-	if (slave != bond->current_slave) {
++	write_lock(&bond->curr_slave_lock);
++
++	if (slave != bond->curr_active_slave) {
+ 		rlb_teach_disabled_mac_on_primary(bond, slave->dev->dev_addr);
+ 	}
+-	write_unlock(&bond->ptrlock);
++
++	write_unlock(&bond->curr_slave_lock);
+ }
+ 
+-static void
+-rlb_update_client(struct rlb_client_info *client_info)
++static void rlb_update_client(struct rlb_client_info *client_info)
+ {
+-	int i = 0;
++	int i;
+ 
+-	if (client_info->slave == NULL) {
++	if (!client_info->slave) {
+ 		return;
+ 	}
+ 
+-	for (i=0; i<RLB_ARP_BURST_SIZE; i++) {
++	for (i = 0; i < RLB_ARP_BURST_SIZE; i++) {
+ 		arp_send(ARPOP_REPLY, ETH_P_ARP,
+ 			 client_info->ip_dst,
+ 			 client_info->slave->dev,
+@@ -561,20 +506,14 @@ rlb_update_client(struct rlb_client_info
+ }
+ 
+ /* sends ARP REPLIES that update the clients that need updating */
+-static void
+-rlb_update_rx_clients(struct bonding *bond)
++static void rlb_update_rx_clients(struct bonding *bond)
+ {
+-	u32 hash_index;
+-	struct rlb_client_info *client_info = NULL;
+ 	struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
++	struct rlb_client_info *client_info;
++	u32 hash_index;
+ 
+ 	_lock_rx_hashtbl(bond);
+ 
+-	if (bond_info->rx_hashtbl == NULL) {
+-		_unlock_rx_hashtbl(bond);
+-		return;
+-	}
+-
+ 	hash_index = bond_info->rx_hashtbl_head;
+ 	for (; hash_index != RLB_NULL_INDEX; hash_index = client_info->next) {
+ 		client_info = &(bond_info->rx_hashtbl[hash_index]);
+@@ -595,22 +534,15 @@ rlb_update_rx_clients(struct bonding *bo
+ }
+ 
+ /* The slave was assigned a new mac address - update the clients */
+-static void
+-rlb_req_update_slave_clients(struct bonding *bond, struct slave *slave)
++static void rlb_req_update_slave_clients(struct bonding *bond, struct slave *slave)
+ {
+-	u32 hash_index;
+-	u8 ntt = 0;
+ 	struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
+-	u8 mac_bcast[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff};
+-	struct rlb_client_info* client_info = NULL;
++	struct rlb_client_info *client_info;
++	int ntt = 0;
++	u32 hash_index;
+ 
+ 	_lock_rx_hashtbl(bond);
+ 
+-	if (bond_info->rx_hashtbl == NULL) {
+-		_unlock_rx_hashtbl(bond);
+-		return;
+-	}
+-
+ 	hash_index = bond_info->rx_hashtbl_head;
+ 	for (; hash_index != RLB_NULL_INDEX; hash_index = client_info->next) {
+ 		client_info = &(bond_info->rx_hashtbl[hash_index]);
+@@ -633,37 +565,31 @@ rlb_req_update_slave_clients(struct bond
+ }
+ 
+ /* mark all clients using src_ip to be updated */
+-static void
+-rlb_req_update_subnet_clients(struct bonding *bond, u32 src_ip)
++static void rlb_req_update_subnet_clients(struct bonding *bond, u32 src_ip)
+ {
+-	u32 hash_index;
+ 	struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
+-	u8 mac_bcast[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff};
+-	struct rlb_client_info *client_info = NULL;
++	struct rlb_client_info *client_info;
++	u32 hash_index;
+ 
+ 	_lock_rx_hashtbl(bond);
+ 
+-	if (bond_info->rx_hashtbl == NULL) {
+-		_unlock_rx_hashtbl(bond);
+-		return;
+-	}
+-
+ 	hash_index = bond_info->rx_hashtbl_head;
+ 	for (; hash_index != RLB_NULL_INDEX; hash_index = client_info->next) {
+ 		client_info = &(bond_info->rx_hashtbl[hash_index]);
+ 
+ 		if (!client_info->slave) {
+-			printk(KERN_ERR "Bonding: Error: found a client with no"
+-			       " channel in the client's hash table\n");
++			printk(KERN_ERR DRV_NAME
++			       ": Error: found a client with no channel in "
++			       "the client's hash table\n");
+ 			continue;
+ 		}
+ 		/*update all clients using this src_ip, that are not assigned
+-		 * to the team's address (current_slave) and have a known
++		 * to the team's address (curr_active_slave) and have a known
+ 		 * unicast mac address.
+ 		 */
+ 		if ((client_info->ip_src == src_ip) &&
+ 		    memcmp(client_info->slave->dev->dev_addr,
+-			   bond->device->dev_addr, ETH_ALEN) &&
++			   bond->dev->dev_addr, ETH_ALEN) &&
+ 		    memcmp(client_info->mac_dst, mac_bcast, ETH_ALEN)) {
+ 			client_info->ntt = 1;
+ 			bond_info->rx_ntt = 1;
+@@ -674,30 +600,22 @@ rlb_req_update_subnet_clients(struct bon
+ }
+ 
+ /* Caller must hold both bond and ptr locks for read */
+-struct slave*
+-rlb_choose_channel(struct bonding *bond, struct arp_pkt *arp)
++struct slave *rlb_choose_channel(struct bonding *bond, struct arp_pkt *arp)
+ {
+ 	struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
+-	struct rlb_client_info *client_info = NULL;
++	struct slave *assigned_slave;
++	struct rlb_client_info *client_info;
+ 	u32 hash_index = 0;
+-	struct slave *assigned_slave = NULL;
+-	u8 mac_bcast[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff};
+ 
+ 	_lock_rx_hashtbl(bond);
+ 
+-	if (bond_info->rx_hashtbl == NULL) {
+-		_unlock_rx_hashtbl(bond);
+-		return NULL;
+-	}
+-
+-	hash_index = _simple_hash((u8 *)&arp->ip_dst, 4);
++	hash_index = _simple_hash((u8 *)&arp->ip_dst, sizeof(arp->ip_src));
+ 	client_info = &(bond_info->rx_hashtbl[hash_index]);
+ 
+-	if (client_info->assigned == 1) {
++	if (client_info->assigned) {
+ 		if ((client_info->ip_src == arp->ip_src) &&
+ 		    (client_info->ip_dst == arp->ip_dst)) {
+ 			/* the entry is already assigned to this client */
+-
+ 			if (memcmp(arp->mac_dst, mac_bcast, ETH_ALEN)) {
+ 				/* update mac address from arp */
+ 				memcpy(client_info->mac_dst, arp->mac_dst, ETH_ALEN);
+@@ -710,12 +628,12 @@ rlb_choose_channel(struct bonding *bond,
+ 			}
+ 		} else {
+ 			/* the entry is already assigned to some other client,
+-			 * move the old client to primary (current_slave) so
++			 * move the old client to primary (curr_active_slave) so
+ 			 * that the new client can be assigned to this entry.
+ 			 */
+-			if (bond->current_slave &&
+-			    client_info->slave != bond->current_slave) {
+-				client_info->slave = bond->current_slave;
++			if (bond->curr_active_slave &&
++			    client_info->slave != bond->curr_active_slave) {
++				client_info->slave = bond->curr_active_slave;
+ 				rlb_update_client(client_info);
+ 			}
+ 		}
+@@ -736,8 +654,7 @@ rlb_choose_channel(struct bonding *bond,
+ 		if (memcmp(client_info->mac_dst, mac_bcast, ETH_ALEN)) {
+ 			client_info->ntt = 1;
+ 			bond->alb_info.rx_ntt = 1;
+-		}
+-		else {
++		} else {
+ 			client_info->ntt = 0;
+ 		}
+ 
+@@ -760,10 +677,9 @@ rlb_choose_channel(struct bonding *bond,
+ 
+ /* chooses (and returns) transmit channel for arp reply
+  * does not choose channel for other arp types since they are
+- * sent on the current_slave
++ * sent on the curr_active_slave
+  */
+-static struct slave*
+-rlb_arp_xmit(struct sk_buff *skb, struct bonding *bond)
++static struct slave *rlb_arp_xmit(struct sk_buff *skb, struct bonding *bond)
+ {
+ 	struct arp_pkt *arp = (struct arp_pkt *)skb->nh.raw;
+ 	struct slave *tx_slave = NULL;
+@@ -776,9 +692,8 @@ rlb_arp_xmit(struct sk_buff *skb, struct
+ 		if (tx_slave) {
+ 			memcpy(arp->mac_src,tx_slave->dev->dev_addr, ETH_ALEN);
+ 		}
+-		BOND_PRINT_DBG(("Server sent ARP Reply packet"));
++		dprintk("Server sent ARP Reply packet\n");
+ 	} else if (arp->op_code == __constant_htons(ARPOP_REQUEST)) {
+-
+ 		/* Create an entry in the rx_hashtbl for this client as a
+ 		 * place holder.
+ 		 * When the arp reply is received the entry will be updated
+@@ -797,34 +712,29 @@ rlb_arp_xmit(struct sk_buff *skb, struct
+ 		 * updated with their assigned mac.
+ 		 */
+ 		rlb_req_update_subnet_clients(bond, arp->ip_src);
+-		BOND_PRINT_DBG(("Server sent ARP Request packet"));
++		dprintk("Server sent ARP Request packet\n");
+ 	}
+ 
+ 	return tx_slave;
+ }
+ 
+ /* Caller must hold bond lock for read */
+-static void
+-rlb_rebalance(struct bonding *bond)
++static void rlb_rebalance(struct bonding *bond)
+ {
+ 	struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
+-	struct slave *assigned_slave = NULL;
++	struct slave *assigned_slave;
++	struct rlb_client_info *client_info;
++	int ntt;
+ 	u32 hash_index;
+-	struct rlb_client_info *client_info = NULL;
+-	u8 ntt = 0;
+ 
+ 	_lock_rx_hashtbl(bond);
+ 
+-	if (bond_info->rx_hashtbl == NULL) {
+-		_unlock_rx_hashtbl(bond);
+-		return;
+-	}
+-
++	ntt = 0;
+ 	hash_index = bond_info->rx_hashtbl_head;
+ 	for (; hash_index != RLB_NULL_INDEX; hash_index = client_info->next) {
+ 		client_info = &(bond_info->rx_hashtbl[hash_index]);
+ 		assigned_slave = rlb_next_rx_slave(bond);
+-		if (assigned_slave && (client_info->slave != assigned_slave)){
++		if (assigned_slave && (client_info->slave != assigned_slave)) {
+ 			client_info->slave = assigned_slave;
+ 			client_info->ntt = 1;
+ 			ntt = 1;
+@@ -839,96 +749,83 @@ rlb_rebalance(struct bonding *bond)
+ }
+ 
+ /* Caller must hold rx_hashtbl lock */
+-static inline void
+-rlb_init_table_entry(struct rlb_client_info *entry)
++static void rlb_init_table_entry(struct rlb_client_info *entry)
+ {
++	memset(entry, 0, sizeof(struct rlb_client_info));
+ 	entry->next = RLB_NULL_INDEX;
+ 	entry->prev = RLB_NULL_INDEX;
+-	entry->assigned = 0;
+-	entry->ntt = 0;
+ }
+ 
+-static int
+-rlb_initialize(struct bonding *bond)
++static int rlb_initialize(struct bonding *bond)
+ {
+ 	struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
+ 	struct packet_type *pk_type = &(BOND_ALB_INFO(bond).rlb_pkt_type);
++	int size = RLB_HASH_TABLE_SIZE * sizeof(struct rlb_client_info);
+ 	int i;
+-	size_t size;
+ 
+ 	spin_lock_init(&(bond_info->rx_hashtbl_lock));
+ 
+ 	_lock_rx_hashtbl(bond);
+-	if (bond_info->rx_hashtbl != NULL) {
+-		printk (KERN_ERR "%s: RLB hash table is not NULL\n",
+-			bond->device->name);
+-		_unlock_rx_hashtbl(bond);
+-		return -1;
+-	}
+ 
+-	size = RLB_HASH_TABLE_SIZE * sizeof(struct rlb_client_info);
+ 	bond_info->rx_hashtbl = kmalloc(size, GFP_KERNEL);
+-	if (bond_info->rx_hashtbl == NULL) {
+-		printk (KERN_ERR "%s: Failed to allocate"
+-			" RLB hash table\n", bond->device->name);
++	if (!bond_info->rx_hashtbl) {
++		printk(KERN_ERR DRV_NAME
++		       ": Error: %s: Failed to allocate RLB hash table\n",
++		       bond->dev->name);
+ 		_unlock_rx_hashtbl(bond);
+ 		return -1;
+ 	}
+ 
+ 	bond_info->rx_hashtbl_head = RLB_NULL_INDEX;
+ 
+-	for (i=0; i<RLB_HASH_TABLE_SIZE; i++) {
++	for (i = 0; i < RLB_HASH_TABLE_SIZE; i++) {
+ 		rlb_init_table_entry(bond_info->rx_hashtbl + i);
+ 	}
+-	_unlock_rx_hashtbl(bond);
+ 
+-	/* register to receive ARPs */
++	_unlock_rx_hashtbl(bond);
+ 
+ 	/*initialize packet type*/
+ 	pk_type->type = __constant_htons(ETH_P_ARP);
+-	pk_type->dev = bond->device;
++	pk_type->dev = bond->dev;
+ 	pk_type->func = rlb_arp_recv;
+ 
++	/* register to receive ARPs */
+ 	dev_add_pack(pk_type);
+ 
+ 	return 0;
+ }
+ 
+-static void
+-rlb_deinitialize(struct bonding *bond)
++static void rlb_deinitialize(struct bonding *bond)
+ {
+ 	struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
+ 
+ 	dev_remove_pack(&(bond_info->rlb_pkt_type));
+ 
+ 	_lock_rx_hashtbl(bond);
+-	if (bond_info->rx_hashtbl == NULL) {
+-		_unlock_rx_hashtbl(bond);
+-		return;
+-	}
++
+ 	kfree(bond_info->rx_hashtbl);
+ 	bond_info->rx_hashtbl = NULL;
++
+ 	_unlock_rx_hashtbl(bond);
+ }
+ 
+ /*********************** tlb/rlb shared functions *********************/
+ 
+-static void
+-alb_send_learning_packets(struct slave *slave, u8 mac_addr[])
++static void alb_send_learning_packets(struct slave *slave, u8 mac_addr[])
+ {
+-	struct sk_buff *skb = NULL;
+ 	struct learning_pkt pkt;
+-	char *data = NULL;
++	int size = sizeof(struct learning_pkt);
+ 	int i;
+-	unsigned int size = sizeof(struct learning_pkt);
+ 
+ 	memset(&pkt, 0, size);
+ 	memcpy(pkt.mac_dst, mac_addr, ETH_ALEN);
+ 	memcpy(pkt.mac_src, mac_addr, ETH_ALEN);
+ 	pkt.type = __constant_htons(ETH_P_LOOP);
+ 
+-	for (i=0; i < MAX_LP_RETRY; i++) {
+-		skb = NULL;
++	for (i = 0; i < MAX_LP_RETRY; i++) {
++		struct sk_buff *skb;
++		char *data;
++
+ 		skb = dev_alloc_skb(size);
+ 		if (!skb) {
+ 			return;
+@@ -936,28 +833,26 @@ alb_send_learning_packets(struct slave *
+ 
+ 		data = skb_put(skb, size);
+ 		memcpy(data, &pkt, size);
++
+ 		skb->mac.raw = data;
+ 		skb->nh.raw = data + ETH_HLEN;
+ 		skb->protocol = pkt.type;
+ 		skb->priority = TC_PRIO_CONTROL;
+ 		skb->dev = slave->dev;
++
+ 		dev_queue_xmit(skb);
+ 	}
+-
+ }
+ 
+ /* hw is a boolean parameter that determines whether we should try and
+  * set the hw address of the device as well as the hw address of the
+  * net_device
+  */
+-static int
+-alb_set_slave_mac_addr(struct slave *slave, u8 addr[], int hw)
++static int alb_set_slave_mac_addr(struct slave *slave, u8 addr[], int hw)
+ {
+-	struct net_device *dev = NULL;
++	struct net_device *dev = slave->dev;
+ 	struct sockaddr s_addr;
+ 
+-	dev = slave->dev;
+-
+ 	if (!hw) {
+ 		memcpy(dev->dev_addr, addr, dev->addr_len);
+ 		return 0;
+@@ -968,26 +863,23 @@ alb_set_slave_mac_addr(struct slave *sla
+ 	memcpy(s_addr.sa_data, addr, dev->addr_len);
+ 	s_addr.sa_family = dev->type;
+ 	if (dev->set_mac_address(dev, &s_addr)) {
+-		printk(KERN_DEBUG "bonding: Error: alb_set_slave_mac_addr:"
+-				  " dev->set_mac_address of dev %s failed!"
+-				  " ALB mode requires that the base driver"
+-				  " support setting the hw address also when"
+-				  " the network device's interface is open\n",
+-				  dev->name);
++		printk(KERN_ERR DRV_NAME
++		       ": Error: dev->set_mac_address of dev %s failed! ALB "
++		       "mode requires that the base driver support setting "
++		       "the hw address also when the network device's "
++		       "interface is open\n",
++		       dev->name);
+ 		return -EOPNOTSUPP;
+ 	}
+ 	return 0;
+ }
+ 
+-/* Caller must hold bond lock for write or ptrlock for write*/
+-static void
+-alb_swap_mac_addr(struct bonding *bond,
+-		  struct slave *slave1,
+-		  struct slave *slave2)
++/* Caller must hold bond lock for write or curr_slave_lock for write*/
++static void alb_swap_mac_addr(struct bonding *bond, struct slave *slave1, struct slave *slave2)
+ {
+-	u8 tmp_mac_addr[ETH_ALEN];
+ 	struct slave *disabled_slave = NULL;
+-	u8 slaves_state_differ;
++	u8 tmp_mac_addr[ETH_ALEN];
++	int slaves_state_differ;
+ 
+ 	slaves_state_differ = (SLAVE_IS_OK(slave1) != SLAVE_IS_OK(slave2));
+ 
+@@ -1004,8 +896,7 @@ alb_swap_mac_addr(struct bonding *bond,
+ 			 */
+ 			rlb_req_update_slave_clients(bond, slave1);
+ 		}
+-	}
+-	else {
++	} else {
+ 		disabled_slave = slave1;
+ 	}
+ 
+@@ -1017,15 +908,14 @@ alb_swap_mac_addr(struct bonding *bond,
+ 			 */
+ 			rlb_req_update_slave_clients(bond, slave2);
+ 		}
+-	}
+-	else {
++	} else {
+ 		disabled_slave = slave2;
+ 	}
+ 
+ 	if (bond->alb_info.rlb_enabled && slaves_state_differ) {
+-			/* A disabled slave was assigned an active mac addr */
+-			rlb_teach_disabled_mac_on_primary(bond,
+-				disabled_slave->dev->dev_addr);
++		/* A disabled slave was assigned an active mac addr */
++		rlb_teach_disabled_mac_on_primary(bond,
++						  disabled_slave->dev->dev_addr);
+ 	}
+ }
+ 
+@@ -1043,10 +933,8 @@ alb_swap_mac_addr(struct bonding *bond,
+  *
+  * Caller must hold bond lock
+  */
+-static void
+-alb_change_hw_addr_on_detach(struct bonding *bond, struct slave *slave)
++static void alb_change_hw_addr_on_detach(struct bonding *bond, struct slave *slave)
+ {
+-	struct slave *tmp_slave;
+ 	int perm_curr_diff;
+ 	int perm_bond_diff;
+ 
+@@ -1054,20 +942,23 @@ alb_change_hw_addr_on_detach(struct bond
+ 				slave->dev->dev_addr,
+ 				ETH_ALEN);
+ 	perm_bond_diff = memcmp(slave->perm_hwaddr,
+-				bond->device->dev_addr,
++				bond->dev->dev_addr,
+ 				ETH_ALEN);
++
+ 	if (perm_curr_diff && perm_bond_diff) {
+-		tmp_slave = bond_get_first_slave(bond);
+-		while (tmp_slave) {
++		struct slave *tmp_slave;
++		int i, found = 0;
++
++		bond_for_each_slave(bond, tmp_slave, i) {
+ 			if (!memcmp(slave->perm_hwaddr,
+-				   tmp_slave->dev->dev_addr,
+-				   ETH_ALEN)) {
++				    tmp_slave->dev->dev_addr,
++				    ETH_ALEN)) {
++				found = 1;
+ 				break;
+ 			}
+-			tmp_slave = bond_get_next_slave(bond, tmp_slave);
+ 		}
+ 
+-		if (tmp_slave) {
++		if (found) {
+ 			alb_swap_mac_addr(bond, slave, tmp_slave);
+ 		}
+ 	}
+@@ -1098,10 +989,10 @@ alb_change_hw_addr_on_detach(struct bond
+  * caller must hold the bond lock for write since the mac addresses are compared
+  * and may be swapped.
+  */
+-static int
+-alb_handle_addr_collision_on_attach(struct bonding *bond, struct slave *slave)
++static int alb_handle_addr_collision_on_attach(struct bonding *bond, struct slave *slave)
+ {
+-	struct slave *tmp_slave1, *tmp_slave2;
++	struct slave *tmp_slave1, *tmp_slave2, *free_mac_slave;
++	int i, j, found = 0;
+ 
+ 	if (bond->slave_cnt == 0) {
+ 		/* this is the first slave */
+@@ -1112,65 +1003,68 @@ alb_handle_addr_collision_on_attach(stru
+ 	 * check uniqueness of slave's mac address against the other
+ 	 * slaves in the bond.
+ 	 */
+-	if (memcmp(slave->perm_hwaddr, bond->device->dev_addr, ETH_ALEN)) {
+-		tmp_slave1 = bond_get_first_slave(bond);
+-		for (; tmp_slave1; tmp_slave1 = bond_get_next_slave(bond, tmp_slave1)) {
++	if (memcmp(slave->perm_hwaddr, bond->dev->dev_addr, ETH_ALEN)) {
++		bond_for_each_slave(bond, tmp_slave1, i) {
+ 			if (!memcmp(tmp_slave1->dev->dev_addr, slave->dev->dev_addr,
+ 				    ETH_ALEN)) {
++				found = 1;
+ 				break;
+ 			}
+ 		}
+-		if (tmp_slave1) {
++
++		if (found) {
+ 			/* a slave was found that is using the mac address
+ 			 * of the new slave
+ 			 */
+-			printk(KERN_ERR "bonding: Warning: the hw address "
+-			       "of slave %s is not unique - cannot enslave it!"
+-			       , slave->dev->name);
++			printk(KERN_ERR DRV_NAME
++			       ": Error: the hw address of slave %s is not "
++			       "unique - cannot enslave it!",
++			       slave->dev->name);
+ 			return -EINVAL;
+ 		}
++
+ 		return 0;
+ 	}
+ 
+-	/* the slave's address is equal to the address of the bond
+-	 * search for a spare address in the bond for this slave.
++	/* The slave's address is equal to the address of the bond.
++	 * Search for a spare address in the bond for this slave.
+ 	 */
+-	tmp_slave1 = bond_get_first_slave(bond);
+-	for (; tmp_slave1; tmp_slave1 = bond_get_next_slave(bond, tmp_slave1)) {
+-
+-		tmp_slave2 = bond_get_first_slave(bond);
+-		for (; tmp_slave2; tmp_slave2 = bond_get_next_slave(bond, tmp_slave2)) {
++	free_mac_slave = NULL;
+ 
++	bond_for_each_slave(bond, tmp_slave1, i) {
++		found = 0;
++		bond_for_each_slave(bond, tmp_slave2, j) {
+ 			if (!memcmp(tmp_slave1->perm_hwaddr,
+ 				    tmp_slave2->dev->dev_addr,
+ 				    ETH_ALEN)) {
+-
++				found = 1;
+ 				break;
+ 			}
+ 		}
+ 
+-		if (!tmp_slave2) {
++		if (!found) {
+ 			/* no slave has tmp_slave1's perm addr
+ 			 * as its curr addr
+ 			 */
++			free_mac_slave = tmp_slave1;
+ 			break;
+ 		}
+ 	}
+ 
+-	if (tmp_slave1) {
+-		alb_set_slave_mac_addr(slave, tmp_slave1->perm_hwaddr,
++	if (free_mac_slave) {
++		alb_set_slave_mac_addr(slave, free_mac_slave->perm_hwaddr,
+ 				       bond->alb_info.rlb_enabled);
+ 
+-		printk(KERN_WARNING "bonding: Warning: the hw address "
+-		       "of slave %s is in use by the bond; "
+-		       "giving it the hw address of %s\n",
+-		       slave->dev->name, tmp_slave1->dev->name);
++		printk(KERN_WARNING DRV_NAME
++		       ": Warning: the hw address of slave %s is in use by "
++		       "the bond; giving it the hw address of %s\n",
++		       slave->dev->name, free_mac_slave->dev->name);
+ 	} else {
+-		printk(KERN_CRIT "bonding: Error: the hw address "
+-		       "of slave %s is in use by the bond; "
+-		       "couldn't find a slave with a free hw "
+-		       "address to give it (this should not have "
+-		       "happened)\n", slave->dev->name);
++		printk(KERN_ERR DRV_NAME
++		       ": Error: the hw address of slave %s is in use by the "
++		       "bond; couldn't find a slave with a free hw address to "
++		       "give it (this should not have happened)\n",
++		       slave->dev->name);
+ 		return -EFAULT;
+ 	}
+ 
+@@ -1188,37 +1082,36 @@ alb_handle_addr_collision_on_attach(stru
+  *
+  * For each slave, this function sets the interface to the new address and then
+  * changes its dev_addr field to its previous value.
+- * 
++ *
+  * Unwinding assumes bond's mac address has not yet changed.
+  */
+-static inline int
+-alb_set_mac_address(struct bonding *bond, void *addr)
++static int alb_set_mac_address(struct bonding *bond, void *addr)
+ {
+ 	struct sockaddr sa;
+-	struct slave *slave;
++	struct slave *slave, *stop_at;
+ 	char tmp_addr[ETH_ALEN];
+-	int error;
++	int res;
++	int i;
+ 
+ 	if (bond->alb_info.rlb_enabled) {
+ 		return 0;
+ 	}
+ 
+-	slave = bond_get_first_slave(bond);
+-	for (; slave; slave = bond_get_next_slave(bond, slave)) {
++	bond_for_each_slave(bond, slave, i) {
+ 		if (slave->dev->set_mac_address == NULL) {
+-			error = -EOPNOTSUPP;
++			res = -EOPNOTSUPP;
+ 			goto unwind;
+ 		}
+ 
+ 		/* save net_device's current hw address */
+ 		memcpy(tmp_addr, slave->dev->dev_addr, ETH_ALEN);
+ 
+-		error = slave->dev->set_mac_address(slave->dev, addr);
++		res = slave->dev->set_mac_address(slave->dev, addr);
+ 
+ 		/* restore net_device's hw address */
+ 		memcpy(slave->dev->dev_addr, tmp_addr, ETH_ALEN);
+ 
+-		if (error) {
++		if (res) {
+ 			goto unwind;
+ 		}
+ 	}
+@@ -1226,22 +1119,23 @@ alb_set_mac_address(struct bonding *bond
+ 	return 0;
+ 
+ unwind:
+-	memcpy(sa.sa_data, bond->device->dev_addr, bond->device->addr_len);
+-	sa.sa_family = bond->device->type;
+-	slave = bond_get_first_slave(bond);
+-	for (; slave; slave = bond_get_next_slave(bond, slave)) {
++	memcpy(sa.sa_data, bond->dev->dev_addr, bond->dev->addr_len);
++	sa.sa_family = bond->dev->type;
++
++	/* unwind from head to the slave that failed */
++	stop_at = slave;
++	bond_for_each_slave_from_to(bond, slave, i, bond->first_slave, stop_at) {
+ 		memcpy(tmp_addr, slave->dev->dev_addr, ETH_ALEN);
+ 		slave->dev->set_mac_address(slave->dev, &sa);
+ 		memcpy(slave->dev->dev_addr, tmp_addr, ETH_ALEN);
+ 	}
+ 
+-	return error;
++	return res;
+ }
+ 
+ /************************ exported alb funcions ************************/
+ 
+-int
+-bond_alb_initialize(struct bonding *bond, int rlb_enabled)
++int bond_alb_initialize(struct bonding *bond, int rlb_enabled)
+ {
+ 	int res;
+ 
+@@ -1263,8 +1157,7 @@ bond_alb_initialize(struct bonding *bond
+ 	return 0;
+ }
+ 
+-void
+-bond_alb_deinitialize(struct bonding *bond)
++void bond_alb_deinitialize(struct bonding *bond)
+ {
+ 	struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
+ 
+@@ -1275,49 +1168,38 @@ bond_alb_deinitialize(struct bonding *bo
+ 	}
+ }
+ 
+-int
+-bond_alb_xmit(struct sk_buff *skb, struct net_device *dev)
++int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)
+ {
+-	struct bonding *bond = (struct bonding *) dev->priv;
+-	struct ethhdr *eth_data = (struct ethhdr *)skb->data;
++	struct bonding *bond = bond_dev->priv;
++	struct ethhdr *eth_data = (struct ethhdr *)skb->mac.raw = skb->data;
+ 	struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
+ 	struct slave *tx_slave = NULL;
+-	char do_tx_balance = 1;
++	static u32 ip_bcast = 0xffffffff;
+ 	int hash_size = 0;
++	int do_tx_balance = 1;
+ 	u32 hash_index = 0;
+ 	u8 *hash_start = NULL;
+-	u8 mac_bcast[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff};
+-
+-	if (!IS_UP(dev)) { /* bond down */
+-		dev_kfree_skb(skb);
+-		return 0;
+-	}
+ 
+-	/* make sure that the current_slave and the slaves list do
++	/* make sure that the curr_active_slave and the slaves list do
+ 	 * not change during tx
+ 	 */
+ 	read_lock(&bond->lock);
++	read_lock(&bond->curr_slave_lock);
+ 
+-	if (bond->slave_cnt == 0) {
+-		/* no suitable interface, frame not sent */
+-		dev_kfree_skb(skb);
+-		read_unlock(&bond->lock);
+-		return 0;
++	if (!BOND_IS_OK(bond)) {
++		goto free_out;
+ 	}
+ 
+-	read_lock(&bond->ptrlock);
+-
+ 	switch (ntohs(skb->protocol)) {
+ 	case ETH_P_IP:
+ 		if ((memcmp(eth_data->h_dest, mac_bcast, ETH_ALEN) == 0) ||
+-		    (skb->nh.iph->daddr == 0xffffffff)) {
++		    (skb->nh.iph->daddr == ip_bcast)) {
+ 			do_tx_balance = 0;
+ 			break;
+ 		}
+ 		hash_start = (char*)&(skb->nh.iph->daddr);
+-		hash_size = 4;
++		hash_size = sizeof(skb->nh.iph->daddr);
+ 		break;
+-
+ 	case ETH_P_IPV6:
+ 		if (memcmp(eth_data->h_dest, mac_bcast, ETH_ALEN) == 0) {
+ 			do_tx_balance = 0;
+@@ -1325,9 +1207,8 @@ bond_alb_xmit(struct sk_buff *skb, struc
+ 		}
+ 
+ 		hash_start = (char*)&(skb->nh.ipv6h->daddr);
+-		hash_size = 16;
++		hash_size = sizeof(skb->nh.ipv6h->daddr);
+ 		break;
+-
+ 	case ETH_P_IPX:
+ 		if (ipx_hdr(skb)->ipx_checksum !=
+ 		    __constant_htons(IPX_NO_CHECKSUM)) {
+@@ -1349,14 +1230,12 @@ bond_alb_xmit(struct sk_buff *skb, struc
+ 		hash_start = (char*)eth_data->h_dest;
+ 		hash_size = ETH_ALEN;
+ 		break;
+-
+ 	case ETH_P_ARP:
+ 		do_tx_balance = 0;
+ 		if (bond_info->rlb_enabled) {
+ 			tx_slave = rlb_arp_xmit(skb, bond);
+ 		}
+ 		break;
+-
+ 	default:
+ 		do_tx_balance = 0;
+ 		break;
+@@ -1369,16 +1248,16 @@ bond_alb_xmit(struct sk_buff *skb, struc
+ 
+ 	if (!tx_slave) {
+ 		/* unbalanced or unassigned, send through primary */
+-		tx_slave = bond->current_slave;
++		tx_slave = bond->curr_active_slave;
+ 		bond_info->unbalanced_load += skb->len;
+ 	}
+ 
+ 	if (tx_slave && SLAVE_IS_OK(tx_slave)) {
+ 		skb->dev = tx_slave->dev;
+-		if (tx_slave != bond->current_slave) {
++		if (tx_slave != bond->curr_active_slave) {
+ 			memcpy(eth_data->h_source,
+-				tx_slave->dev->dev_addr,
+-				ETH_ALEN);
++			       tx_slave->dev->dev_addr,
++			       ETH_ALEN);
+ 		}
+ 		dev_queue_xmit(skb);
+ 	} else {
+@@ -1386,26 +1265,35 @@ bond_alb_xmit(struct sk_buff *skb, struc
+ 		if (tx_slave) {
+ 			tlb_clear_slave(bond, tx_slave, 0);
+ 		}
+-		dev_kfree_skb(skb);
++		goto free_out;
+ 	}
+ 
+-	read_unlock(&bond->ptrlock);
++out:
++	read_unlock(&bond->curr_slave_lock);
+ 	read_unlock(&bond->lock);
+ 	return 0;
++
++free_out:
++	dev_kfree_skb(skb);
++	goto out;
+ }
+ 
+-void
+-bond_alb_monitor(struct bonding *bond)
++void bond_alb_monitor(struct bonding *bond)
+ {
+ 	struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
+-	struct slave *slave = NULL;
++	struct slave *slave;
++	int i;
+ 
+ 	read_lock(&bond->lock);
+ 
+-	if ((bond->slave_cnt == 0) || !(bond->device->flags & IFF_UP)) {
++	if (bond->kill_timers) {
++		goto out;
++	}
++
++	if (bond->slave_cnt == 0) {
+ 		bond_info->tx_rebalance_counter = 0;
+ 		bond_info->lp_counter = 0;
+-		goto out;
++		goto re_arm;
+ 	}
+ 
+ 	bond_info->tx_rebalance_counter++;
+@@ -1413,51 +1301,53 @@ bond_alb_monitor(struct bonding *bond)
+ 
+ 	/* send learning packets */
+ 	if (bond_info->lp_counter >= BOND_ALB_LP_TICKS) {
+-		/* change of current_slave involves swapping of mac addresses.
++		/* change of curr_active_slave involves swapping of mac addresses.
+ 		 * in order to avoid this swapping from happening while
+-		 * sending the learning packets, the ptrlock must be held for
++		 * sending the learning packets, the curr_slave_lock must be held for
+ 		 * read.
+ 		 */
+-		read_lock(&bond->ptrlock);
+-		slave = bond_get_first_slave(bond);
+-		while (slave) {
++		read_lock(&bond->curr_slave_lock);
++
++		bond_for_each_slave(bond, slave, i) {
+ 			alb_send_learning_packets(slave,slave->dev->dev_addr);
+-			slave = bond_get_next_slave(bond, slave);
+ 		}
+-		read_unlock(&bond->ptrlock);
++
++		read_unlock(&bond->curr_slave_lock);
+ 
+ 		bond_info->lp_counter = 0;
+ 	}
+ 
+ 	/* rebalance tx traffic */
+ 	if (bond_info->tx_rebalance_counter >= BOND_TLB_REBALANCE_TICKS) {
+-		read_lock(&bond->ptrlock);
+-		slave = bond_get_first_slave(bond);
+-		while (slave) {
++
++		read_lock(&bond->curr_slave_lock);
++
++		bond_for_each_slave(bond, slave, i) {
+ 			tlb_clear_slave(bond, slave, 1);
+-			if (slave == bond->current_slave) {
++			if (slave == bond->curr_active_slave) {
+ 				SLAVE_TLB_INFO(slave).load =
+ 					bond_info->unbalanced_load /
+ 						BOND_TLB_REBALANCE_INTERVAL;
+ 				bond_info->unbalanced_load = 0;
+ 			}
+-			slave = bond_get_next_slave(bond, slave);
+ 		}
+-		read_unlock(&bond->ptrlock);
++
++		read_unlock(&bond->curr_slave_lock);
++
+ 		bond_info->tx_rebalance_counter = 0;
+ 	}
+ 
+ 	/* handle rlb stuff */
+ 	if (bond_info->rlb_enabled) {
+ 		/* the following code changes the promiscuity of the
+-		 * the current_slave. It needs to be locked with a
++		 * the curr_active_slave. It needs to be locked with a
+ 		 * write lock to protect from other code that also
+ 		 * sets the promiscuity.
+ 		 */
+-		write_lock(&bond->ptrlock);
++		write_lock(&bond->curr_slave_lock);
++
+ 		if (bond_info->primary_is_promisc &&
+-		    (++bond_info->rlb_promisc_timeout_counter >=
+-			RLB_PROMISC_TIMEOUT)) {
++		    (++bond_info->rlb_promisc_timeout_counter >= RLB_PROMISC_TIMEOUT)) {
+ 
+ 			bond_info->rlb_promisc_timeout_counter = 0;
+ 
+@@ -1465,12 +1355,13 @@ bond_alb_monitor(struct bonding *bond)
+ 			 * because a slave was disabled then
+ 			 * it can now leave promiscuous mode.
+ 			 */
+-			dev_set_promiscuity(bond->current_slave->dev, -1);
++			dev_set_promiscuity(bond->curr_active_slave->dev, -1);
+ 			bond_info->primary_is_promisc = 0;
+ 		}
+-		write_unlock(&bond->ptrlock);
+ 
+-		if (bond_info->rlb_rebalance == 1) {
++		write_unlock(&bond->curr_slave_lock);
++
++		if (bond_info->rlb_rebalance) {
+ 			bond_info->rlb_rebalance = 0;
+ 			rlb_rebalance(bond);
+ 		}
+@@ -1490,28 +1381,23 @@ bond_alb_monitor(struct bonding *bond)
+ 		}
+ 	}
+ 
++re_arm:
++	mod_timer(&(bond_info->alb_timer), jiffies + alb_delta_in_ticks);
+ out:
+ 	read_unlock(&bond->lock);
+-
+-	if (bond->device->flags & IFF_UP) {
+-		/* re-arm the timer */
+-		mod_timer(&(bond_info->alb_timer),
+-			jiffies + (HZ/ALB_TIMER_TICKS_PER_SEC));
+-	}
+ }
+ 
+-/* assumption: called before the slave is attched to the bond
++/* assumption: called before the slave is attached to the bond
+  * and not locked by the bond lock
+  */
+-int
+-bond_alb_init_slave(struct bonding *bond, struct slave *slave)
++int bond_alb_init_slave(struct bonding *bond, struct slave *slave)
+ {
+-	int err = 0;
++	int res;
+ 
+-	err = alb_set_slave_mac_addr(slave, slave->perm_hwaddr,
++	res = alb_set_slave_mac_addr(slave, slave->perm_hwaddr,
+ 				     bond->alb_info.rlb_enabled);
+-	if (err) {
+-		return err;
++	if (res) {
++		return res;
+ 	}
+ 
+ 	/* caller must hold the bond lock for write since the mac addresses
+@@ -1519,12 +1405,12 @@ bond_alb_init_slave(struct bonding *bond
+ 	 */
+ 	write_lock_bh(&bond->lock);
+ 
+-	err = alb_handle_addr_collision_on_attach(bond, slave);
++	res = alb_handle_addr_collision_on_attach(bond, slave);
+ 
+ 	write_unlock_bh(&bond->lock);
+ 
+-	if (err) {
+-		return err;
++	if (res) {
++		return res;
+ 	}
+ 
+ 	tlb_init_slave(slave);
+@@ -1540,8 +1426,7 @@ bond_alb_init_slave(struct bonding *bond
+ }
+ 
+ /* Caller must hold bond lock for write */
+-void
+-bond_alb_deinit_slave(struct bonding *bond, struct slave *slave)
++void bond_alb_deinit_slave(struct bonding *bond, struct slave *slave)
+ {
+ 	if (bond->slave_cnt > 1) {
+ 		alb_change_hw_addr_on_detach(bond, slave);
+@@ -1556,9 +1441,7 @@ bond_alb_deinit_slave(struct bonding *bo
+ }
+ 
+ /* Caller must hold bond lock for read */
+-void
+-bond_alb_handle_link_change(struct bonding *bond, struct slave *slave,
+-			    char link)
++void bond_alb_handle_link_change(struct bonding *bond, struct slave *slave, char link)
+ {
+ 	struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
+ 
+@@ -1582,109 +1465,111 @@ bond_alb_handle_link_change(struct bondi
+ }
+ 
+ /**
+- * bond_alb_assign_current_slave - assign new current_slave
++ * bond_alb_handle_active_change - assign new curr_active_slave
+  * @bond: our bonding struct
+  * @new_slave: new slave to assign
+  *
+- * Set the bond->current_slave to @new_slave and handle
++ * Set the bond->curr_active_slave to @new_slave and handle
+  * mac address swapping and promiscuity changes as needed.
+  *
+- * Caller must hold bond ptrlock for write (or bond lock for write)
++ * Caller must hold bond curr_slave_lock for write (or bond lock for write)
+  */
+-void
+-bond_alb_assign_current_slave(struct bonding *bond, struct slave *new_slave)
++void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave)
+ {
+-	struct slave *swap_slave = bond->current_slave;
++	struct slave *swap_slave;
++	int i;
+ 
+-	if (bond->current_slave == new_slave) {
++	if (bond->curr_active_slave == new_slave) {
+ 		return;
+ 	}
+ 
+-	if (bond->current_slave && bond->alb_info.primary_is_promisc) {
+-		dev_set_promiscuity(bond->current_slave->dev, -1);
++	if (bond->curr_active_slave && bond->alb_info.primary_is_promisc) {
++		dev_set_promiscuity(bond->curr_active_slave->dev, -1);
+ 		bond->alb_info.primary_is_promisc = 0;
+ 		bond->alb_info.rlb_promisc_timeout_counter = 0;
+ 	}
+ 
+-	bond->current_slave = new_slave;
++	swap_slave = bond->curr_active_slave;
++	bond->curr_active_slave = new_slave;
+ 
+ 	if (!new_slave || (bond->slave_cnt == 0)) {
+ 		return;
+ 	}
+ 
+-	/* set the new current_slave to the bonds mac address
+-	 * i.e. swap mac addresses of old current_slave and new current_slave
++	/* set the new curr_active_slave to the bonds mac address
++	 * i.e. swap mac addresses of old curr_active_slave and new curr_active_slave
+ 	 */
+ 	if (!swap_slave) {
++		struct slave *tmp_slave;
+ 		/* find slave that is holding the bond's mac address */
+-		swap_slave = bond_get_first_slave(bond);
+-		while (swap_slave) {
+-			if (!memcmp(swap_slave->dev->dev_addr,
+-				bond->device->dev_addr, ETH_ALEN)) {
++		bond_for_each_slave(bond, tmp_slave, i) {
++			if (!memcmp(tmp_slave->dev->dev_addr,
++				    bond->dev->dev_addr, ETH_ALEN)) {
++				swap_slave = tmp_slave;
+ 				break;
+ 			}
+-			swap_slave = bond_get_next_slave(bond, swap_slave);
+ 		}
+ 	}
+ 
+-	/* current_slave must be set before calling alb_swap_mac_addr */
++	/* curr_active_slave must be set before calling alb_swap_mac_addr */
+ 	if (swap_slave) {
+ 		/* swap mac address */
+ 		alb_swap_mac_addr(bond, swap_slave, new_slave);
+ 	} else {
+ 		/* set the new_slave to the bond mac address */
+-		alb_set_slave_mac_addr(new_slave, bond->device->dev_addr,
++		alb_set_slave_mac_addr(new_slave, bond->dev->dev_addr,
+ 				       bond->alb_info.rlb_enabled);
+ 		/* fasten bond mac on new current slave */
+-		alb_send_learning_packets(new_slave, bond->device->dev_addr);
++		alb_send_learning_packets(new_slave, bond->dev->dev_addr);
+ 	}
+ }
+ 
+-int
+-bond_alb_set_mac_address(struct net_device *dev, void *addr)
++int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr)
+ {
+-	struct bonding *bond = dev->priv;
++	struct bonding *bond = bond_dev->priv;
+ 	struct sockaddr *sa = addr;
+-	struct slave *swap_slave = NULL;
+-	int error = 0;
++	struct slave *slave, *swap_slave;
++	int res;
++	int i;
+ 
+ 	if (!is_valid_ether_addr(sa->sa_data)) {
+ 		return -EADDRNOTAVAIL;
+ 	}
+ 
+-	error = alb_set_mac_address(bond, addr);
+-	if (error) {
+-		return error;
++	res = alb_set_mac_address(bond, addr);
++	if (res) {
++		return res;
+ 	}
+ 
+-	memcpy(dev->dev_addr, sa->sa_data, dev->addr_len);
++	memcpy(bond_dev->dev_addr, sa->sa_data, bond_dev->addr_len);
+ 
+-	/* If there is no current_slave there is nothing else to do.
++	/* If there is no curr_active_slave there is nothing else to do.
+ 	 * Otherwise we'll need to pass the new address to it and handle
+ 	 * duplications.
+ 	 */
+-	if (bond->current_slave == NULL) {
++	if (!bond->curr_active_slave) {
+ 		return 0;
+ 	}
+ 
+-	swap_slave = bond_get_first_slave(bond);
+-	while (swap_slave) {
+-		if (!memcmp(swap_slave->dev->dev_addr, dev->dev_addr, ETH_ALEN)) {
++	swap_slave = NULL;
++
++	bond_for_each_slave(bond, slave, i) {
++		if (!memcmp(slave->dev->dev_addr, bond_dev->dev_addr, ETH_ALEN)) {
++			swap_slave = slave;
+ 			break;
+ 		}
+-		swap_slave = bond_get_next_slave(bond, swap_slave);
+ 	}
+ 
+ 	if (swap_slave) {
+-		alb_swap_mac_addr(bond, swap_slave, bond->current_slave);
++		alb_swap_mac_addr(bond, swap_slave, bond->curr_active_slave);
+ 	} else {
+-		alb_set_slave_mac_addr(bond->current_slave, dev->dev_addr,
++		alb_set_slave_mac_addr(bond->curr_active_slave, bond_dev->dev_addr,
+ 				       bond->alb_info.rlb_enabled);
+ 
+-		alb_send_learning_packets(bond->current_slave, dev->dev_addr);
++		alb_send_learning_packets(bond->curr_active_slave, bond_dev->dev_addr);
+ 		if (bond->alb_info.rlb_enabled) {
+ 			/* inform clients mac address has changed */
+-			rlb_req_update_slave_clients(bond, bond->current_slave);
++			rlb_req_update_slave_clients(bond, bond->curr_active_slave);
+ 		}
+ 	}
+ 
+--- linux-2.6.0/drivers/net/bonding/bond_alb.h	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/bonding/bond_alb.h	2003-12-28 23:21:00.000000000 -0800
+@@ -24,6 +24,9 @@
+  * 2003/08/06 - Amir Noam <amir.noam at intel dot com>
+  *	- Add support for setting bond's MAC address with special
+  *	  handling required for ALB/TLB.
++ *
++ * 2003/09/24 - Shmulik Hen <shmulik.hen at intel dot com>
++ *	- Code cleanup and style changes
+  */
+ 
+ #ifndef __BOND_ALB_H__
+@@ -126,10 +129,10 @@ void bond_alb_deinitialize(struct bondin
+ int bond_alb_init_slave(struct bonding *bond, struct slave *slave);
+ void bond_alb_deinit_slave(struct bonding *bond, struct slave *slave);
+ void bond_alb_handle_link_change(struct bonding *bond, struct slave *slave, char link);
+-void bond_alb_assign_current_slave(struct bonding *bond, struct slave *new_slave);
+-int bond_alb_xmit(struct sk_buff *skb, struct net_device *dev);
++void bond_alb_handle_active_change(struct bonding *bond, struct slave *new_slave);
++int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev);
+ void bond_alb_monitor(struct bonding *bond);
+-int bond_alb_set_mac_address(struct net_device *dev, void *addr);
++int bond_alb_set_mac_address(struct net_device *bond_dev, void *addr);
+ 
+ #endif /* __BOND_ALB_H__ */
+ 
+--- linux-2.6.0/drivers/net/bonding/bonding.h	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/bonding/bonding.h	2003-12-28 23:21:00.000000000 -0800
+@@ -9,7 +9,7 @@
+  *
+  *	This software may be used and distributed according to the terms
+  *	of the GNU Public License, incorporated herein by reference.
+- * 
++ *
+  *
+  * 2003/03/18 - Amir Noam <amir.noam at intel dot com>,
+  *		Tsippy Mendelson <tsippy.mendelson at intel dot com> and
+@@ -22,159 +22,205 @@
+  *
+  * 2003/05/01 - Shmulik Hen <shmulik.hen at intel dot com>
+  *	- Added support for Transmit load balancing mode.
++ *
++ * 2003/09/24 - Shmulik Hen <shmulik.hen at intel dot com>
++ *	- Code cleanup and style changes
+  */
+- 
++
+ #ifndef _LINUX_BONDING_H
+ #define _LINUX_BONDING_H
+ 
+ #include <linux/timer.h>
+ #include <linux/proc_fs.h>
++#include <linux/if_bonding.h>
+ #include "bond_3ad.h"
+ #include "bond_alb.h"
+ 
+-#ifdef BONDING_DEBUG
+-
+-// use this like so: BOND_PRINT_DBG(("foo = %d, bar = %d", foo, bar));
+-#define BOND_PRINT_DBG(X)                                     \
+-do {                                                          \
+-	printk(KERN_DEBUG "%s (%d)", __FUNCTION__, __LINE__); \
+-	printk X;                                             \
+-	printk("\n");                                         \
+-} while(0)
++#define DRV_VERSION	"2.5.0"
++#define DRV_RELDATE	"December 1, 2003"
++#define DRV_NAME	"bonding"
++#define DRV_DESCRIPTION	"Ethernet Channel Bonding Driver"
+ 
++#ifdef BONDING_DEBUG
++#define dprintk(fmt, args...) \
++	printk(KERN_DEBUG     \
++	       DRV_NAME ": %s() %d: " fmt, __FUNCTION__, __LINE__ , ## args )
+ #else
+-#define BOND_PRINT_DBG(X)
++#define dprintk(fmt, args...)
+ #endif /* BONDING_DEBUG */
+ 
+-#define IS_UP(dev)  ((((dev)->flags & (IFF_UP)) == (IFF_UP)) && \
+-		     (netif_running(dev) && netif_carrier_ok(dev)))
++#define IS_UP(dev)					   \
++	      ((((dev)->flags & IFF_UP) == IFF_UP)	&& \
++	       netif_running(dev)			&& \
++	       netif_carrier_ok(dev))
+ 
+-/* Checks whether the dev is ready for transmit. We do not check netif_running
+- * since a device can be stopped by the driver for short periods of time for
+- * maintainance. dev_queue_xmit() handles this by queing the packet until the
+- * the dev is running again. Keeping packets ordering requires sticking the
+- * same dev as much as possible
+- */
+-#define SLAVE_IS_OK(slave) \
+-		     ((((slave)->dev->flags & (IFF_UP)) == (IFF_UP)) && \
+-		     netif_carrier_ok((slave)->dev) && \
++/*
++ * Checks whether bond is ready for transmit.
++ *
++ * Caller must hold bond->lock
++ */
++#define BOND_IS_OK(bond)			     \
++		   (((bond)->dev->flags & IFF_UP) && \
++		    netif_running((bond)->dev)	  && \
++		    ((bond)->slave_cnt > 0))
++
++/*
++ * Checks whether slave is ready for transmit.
++ */
++#define SLAVE_IS_OK(slave)			        \
++		    (((slave)->dev->flags & IFF_UP)  && \
++		     netif_running((slave)->dev)     && \
+ 		     ((slave)->link == BOND_LINK_UP) && \
+ 		     ((slave)->state == BOND_STATE_ACTIVE))
+ 
+ 
+-typedef struct slave {
++#define USES_PRIMARY(mode)				\
++		(((mode) == BOND_MODE_ACTIVEBACKUP) ||	\
++		 ((mode) == BOND_MODE_TLB)          ||	\
++		 ((mode) == BOND_MODE_ALB))
++
++/*
++ * Less bad way to call ioctl from within the kernel; this needs to be
++ * done some other way to get the call out of interrupt context.
++ * Needs "ioctl" variable to be supplied by calling context.
++ */
++#define IOCTL(dev, arg, cmd) ({		\
++	int res = 0;			\
++	mm_segment_t fs = get_fs();	\
++	set_fs(get_ds());		\
++	res = ioctl(dev, arg, cmd);	\
++	set_fs(fs);			\
++	res; })
++
++/**
++ * bond_for_each_slave_from - iterate the slaves list from a starting point
++ * @bond:	the bond holding this list.
++ * @pos:	current slave.
++ * @cnt:	counter for max number of moves
++ * @start:	starting point.
++ *
++ * Caller must hold bond->lock
++ */
++#define bond_for_each_slave_from(bond, pos, cnt, start)	\
++	for (cnt = 0, pos = start;				\
++	     cnt < (bond)->slave_cnt;				\
++             cnt++, pos = (pos)->next)
++
++/**
++ * bond_for_each_slave_from_to - iterate the slaves list from start point to stop point
++ * @bond:	the bond holding this list.
++ * @pos:	current slave.
++ * @cnt:	counter for number max of moves
++ * @start:	start point.
++ * @stop:	stop point.
++ *
++ * Caller must hold bond->lock
++ */
++#define bond_for_each_slave_from_to(bond, pos, cnt, start, stop)	\
++	for (cnt = 0, pos = start;					\
++	     ((cnt < (bond)->slave_cnt) && (pos != (stop)->next));	\
++             cnt++, pos = (pos)->next)
++
++/**
++ * bond_for_each_slave - iterate the slaves list from head
++ * @bond:	the bond holding this list.
++ * @pos:	current slave.
++ * @cnt:	counter for max number of moves
++ *
++ * Caller must hold bond->lock
++ */
++#define bond_for_each_slave(bond, pos, cnt)	\
++		bond_for_each_slave_from(bond, pos, cnt, (bond)->first_slave)
++
++
++struct slave {
++	struct net_device *dev; /* first - usefull for panic debug */
+ 	struct slave *next;
+ 	struct slave *prev;
+-	struct net_device *dev;
+-	short  delay;
+-	unsigned long jiffies;
+-	char   link;    /* one of BOND_LINK_XXXX */
+-	char   state;   /* one of BOND_STATE_XXXX */
+-	unsigned short original_flags;
+-	u32 link_failure_count;
++	s16    delay;
++	u32    jiffies;
++	s8     link;    /* one of BOND_LINK_XXXX */
++	s8     state;   /* one of BOND_STATE_XXXX */
++	u32    original_flags;
++	u32    link_failure_count;
+ 	u16    speed;
+ 	u8     duplex;
+ 	u8     perm_hwaddr[ETH_ALEN];
+ 	struct ad_slave_info ad_info; /* HUGE - better to dynamically alloc */
+ 	struct tlb_slave_info tlb_info;
+-} slave_t;
++};
+ 
+ /*
+  * Here are the locking policies for the two bonding locks:
+  *
+  * 1) Get bond->lock when reading/writing slave list.
+- * 2) Get bond->ptrlock when reading/writing bond->current_slave.
++ * 2) Get bond->curr_slave_lock when reading/writing bond->curr_active_slave.
+  *    (It is unnecessary when the write-lock is put with bond->lock.)
+- * 3) When we lock with bond->ptrlock, we must lock with bond->lock
++ * 3) When we lock with bond->curr_slave_lock, we must lock with bond->lock
+  *    beforehand.
+  */
+-typedef struct bonding {
+-	slave_t *next;
+-	slave_t *prev;
+-	slave_t *current_slave;
+-	slave_t *primary_slave;
+-	slave_t *current_arp_slave;
+-	__s32 slave_cnt;
++struct bonding {
++	struct   net_device *dev; /* first - usefull for panic debug */
++	struct   slave *first_slave;
++	struct   slave *curr_active_slave;
++	struct   slave *current_arp_slave;
++	struct   slave *primary_slave;
++	s32      slave_cnt; /* never change this value outside the attach/detach wrappers */
+ 	rwlock_t lock;
+-	rwlock_t ptrlock;
+-	struct timer_list mii_timer;
+-	struct timer_list arp_timer;
+-	struct net_device_stats stats;
++	rwlock_t curr_slave_lock;
++	struct   timer_list mii_timer;
++	struct   timer_list arp_timer;
++	s8       kill_timers;
++	struct   net_device_stats stats;
+ #ifdef CONFIG_PROC_FS
+-	struct proc_dir_entry *bond_proc_file;
+-	char procdir_name[IFNAMSIZ];
++	struct   proc_dir_entry *proc_entry;
++	char     proc_file_name[IFNAMSIZ];
+ #endif /* CONFIG_PROC_FS */
+-	struct list_head bond_list;
+-	struct net_device *device;
+-	struct dev_mc_list *mc_list;
+-	unsigned short flags;
+-	struct ad_bond_info ad_info;
+-	struct alb_bond_info alb_info;
+-} bonding_t;
+-
+-/* Forward declarations */
+-void bond_set_slave_active_flags(slave_t *slave);
+-void bond_set_slave_inactive_flags(slave_t *slave);
+-
+-/**
+- * These functions can be used for iterating the slave list
+- * (which is circular)
+- * Caller must hold bond lock for read
+- */
+-extern inline struct slave*
+-bond_get_first_slave(struct bonding *bond)
+-{
+-	/* if there are no slaves return NULL */
+-	if (bond->next == (slave_t *)bond) {
+-		return NULL;
+-	}
+-	return bond->next;
+-}
+-
+-/**
+- * Caller must hold bond lock for read
+- */
+-extern inline struct slave*
+-bond_get_next_slave(struct bonding *bond, struct slave *slave)
+-{
+-	/* If we have reached the last slave return NULL */
+-	if (slave->next == bond->next) {
+-		return NULL;
+-	}
+-	return slave->next;
+-}
++	struct   list_head bond_list;
++	struct   dev_mc_list *mc_list;
++	u16      flags;
++	struct   ad_bond_info ad_info;
++	struct   alb_bond_info alb_info;
++};
+ 
+ /**
+  * Returns NULL if the net_device does not belong to any of the bond's slaves
+  *
+  * Caller must hold bond lock for read
+  */
+-extern inline struct slave*
+-bond_get_slave_by_dev(struct bonding *bond, struct net_device *slave_dev)
++extern inline struct slave *bond_get_slave_by_dev(struct bonding *bond, struct net_device *slave_dev)
+ {
+-	struct slave *our_slave = bond->next;
+-
+-	/* check if the list of slaves is empty */
+-	if (our_slave == (slave_t *)bond) {
+-		return NULL;
+-	}
++	struct slave *slave = NULL;
++	int i;
+ 
+-	for (; our_slave; our_slave = bond_get_next_slave(bond, our_slave)) {
+-		if (our_slave->dev == slave_dev) {
++	bond_for_each_slave(bond, slave, i) {
++		if (slave->dev == slave_dev) {
+ 			break;
+ 		}
+ 	}
+-	return our_slave;
++
++	return slave;
+ }
+ 
+-extern inline struct bonding*
+-bond_get_bond_by_slave(struct slave *slave)
++extern inline struct bonding *bond_get_bond_by_slave(struct slave *slave)
+ {
+ 	if (!slave || !slave->dev->master) {
+ 		return NULL;
+ 	}
+ 
+-	return (struct bonding *)(slave->dev->master->priv);
++	return (struct bonding *)slave->dev->master->priv;
++}
++
++extern inline void bond_set_slave_inactive_flags(struct slave *slave)
++{
++	slave->state = BOND_STATE_BACKUP;
++	slave->dev->flags |= IFF_NOARP;
++}
++
++extern inline void bond_set_slave_active_flags(struct slave *slave)
++{
++	slave->state = BOND_STATE_ACTIVE;
++	slave->dev->flags &= ~IFF_NOARP;
+ }
+ 
+ #endif /* _LINUX_BONDING_H */
+--- linux-2.6.0/drivers/net/bonding/bond_main.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/net/bonding/bond_main.c	2003-12-28 23:21:05.000000000 -0800
+@@ -1,7 +1,7 @@
+ /*
+  * originally based on the dummy device.
+  *
+- * Copyright 1999, Thomas Davis, tadavis@lbl.gov.  
++ * Copyright 1999, Thomas Davis, tadavis@lbl.gov.
+  * Licensed under the GPL. Based on dummy.c, and eql.c devices.
+  *
+  * bonding.c: an Ethernet Bonding driver
+@@ -15,9 +15,9 @@
+  *
+  * How it works:
+  *    ifconfig bond0 ipaddress netmask up
+- *      will setup a network device, with an ip address.  No mac address 
+- *	will be assigned at this time.  The hw mac address will come from 
+- *	the first slave bonded to the channel.  All slaves will then use 
++ *      will setup a network device, with an ip address.  No mac address
++ *	will be assigned at this time.  The hw mac address will come from
++ *	the first slave bonded to the channel.  All slaves will then use
+  *	this hw mac address.
+  *
+  *    ifconfig bond0 down
+@@ -26,7 +26,7 @@
+  *    ifenslave bond0 eth0
+  *	will attach eth0 to bond0 as a slave.  eth0 hw mac address will either
+  *	a: be used as initial mac address
+- *	b: if a hw mac address already is there, eth0's hw mac address 
++ *	b: if a hw mac address already is there, eth0's hw mac address
+  *	   will then be set from bond0.
+  *
+  * v0.1 - first working version.
+@@ -93,14 +93,14 @@
+  *
+  * 2001/4/5 - Chad N. Tindel <ctindel at ieee dot org>
+  *     - Ported to 2.4 Kernel
+- * 
++ *
+  * 2001/5/2 - Jeffrey E. Mast <jeff at mastfamily dot com>
+  *     - When a device is detached from a bond, the slave device is no longer
+  *       left thinking that is has a master.
+  *
+  * 2001/5/16 - Jeffrey E. Mast <jeff at mastfamily dot com>
+- *     - memset did not appropriately initialized the bond rw_locks. Used 
+- *       rwlock_init to initialize to unlocked state to prevent deadlock when 
++ *     - memset did not appropriately initialized the bond rw_locks. Used
++ *       rwlock_init to initialize to unlocked state to prevent deadlock when
+  *       first attempting a lock
+  *     - Called SET_MODULE_OWNER for bond device
+  *
+@@ -119,7 +119,7 @@
+  *
+  * 2001/6/01 - Chad N. Tindel <ctindel at ieee dot org>
+  *     - Added /proc support for getting bond and slave information.
+- *       Information is in /proc/net/<bond device>/info. 
++ *       Information is in /proc/net/<bond device>/info.
+  *     - Changed the locking when calling bond_close to prevent deadlock.
+  *
+  * 2001/8/05 - Janice Girouard <girouard at us.ibm.com>
+@@ -144,8 +144,8 @@
+  *       but only for an up link.
+  *
+  * 2001/9/20 - Chad N. Tindel <ctindel at ieee dot org>
+- *     - Add the device field to bonding_t.  Previously the net_device 
+- *       corresponding to a bond wasn't available from the bonding_t 
++ *     - Add the device field to bonding_t.  Previously the net_device
++ *       corresponding to a bond wasn't available from the bonding_t
+  *       structure.
+  *
+  * 2001/9/25 - Janice Girouard <girouard at us.ibm.com>
+@@ -155,10 +155,10 @@
+  *     - Various memory leak fixes
+  *
+  * 2001/11/5 - Mark Huth <mark dot huth at mvista dot com>
+- *     - Don't take rtnl lock in bond_mii_monitor as it deadlocks under 
+- *       certain hotswap conditions.  
++ *     - Don't take rtnl lock in bond_mii_monitor as it deadlocks under
++ *       certain hotswap conditions.
+  *       Note:  this same change may be required in bond_arp_monitor ???
+- *     - Remove possibility of calling bond_sethwaddr with NULL slave_dev ptr 
++ *     - Remove possibility of calling bond_sethwaddr with NULL slave_dev ptr
+  *     - Handle hot swap ethernet interface deregistration events to remove
+  *       kernel oops following hot swap of enslaved interface
+  *
+@@ -222,23 +222,23 @@
+  *     - fix deletion of multicast groups after unloading module
+  *
+  * 2002/11/06 - Kameshwara Rayaprolu <kameshwara.rao * wipro_com>
+- *     - Changes to prevent panic from closing the device twice; if we close 
+- *       the device in bond_release, we must set the original_flags to down 
++ *     - Changes to prevent panic from closing the device twice; if we close
++ *       the device in bond_release, we must set the original_flags to down
+  *       so it won't be closed again by the network layer.
+  *
+  * 2002/11/07 - Tony Cureington <tony.cureington * hp_com>
+  *     - Fix arp_target_hw_addr memory leak
+- *     - Created activebackup_arp_monitor function to handle arp monitoring 
+- *       in active backup mode - the bond_arp_monitor had several problems... 
+- *       such as allowing slaves to tx arps sequentially without any delay 
++ *     - Created activebackup_arp_monitor function to handle arp monitoring
++ *       in active backup mode - the bond_arp_monitor had several problems...
++ *       such as allowing slaves to tx arps sequentially without any delay
+  *       for a response
+  *     - Renamed bond_arp_monitor to loadbalance_arp_monitor and re-wrote
+  *       this function to just handle arp monitoring in load-balancing mode;
+  *       it is a lot more compact now
+- *     - Changes to ensure one and only one slave transmits in active-backup 
++ *     - Changes to ensure one and only one slave transmits in active-backup
+  *       mode
+- *     - Robustesize parameters; warn users about bad combinations of 
+- *       parameters; also if miimon is specified and a network driver does 
++ *     - Robustesize parameters; warn users about bad combinations of
++ *       parameters; also if miimon is specified and a network driver does
+  *       not support MII or ETHTOOL, inform the user of this
+  *     - Changes to support link_failure_count when in arp monitoring mode
+  *     - Fix up/down delay reported in /proc
+@@ -248,7 +248,7 @@
+  *
+  * 2002/11/16 - Laurent Deniel <laurent.deniel at free.fr>
+  *     - fix multicast handling in activebackup_arp_monitor
+- *     - remove one unnecessary and confusing current_slave == slave test 
++ *     - remove one unnecessary and confusing curr_active_slave == slave test
+  *	 in activebackup_arp_monitor
+  *
+  *  2002/11/17 - Laurent Deniel <laurent.deniel at free.fr>
+@@ -267,7 +267,7 @@
+  *	  One change: an invalid choice will cause module load failure,
+  *	  rather than the previous behavior of just picking one.
+  *	- Minor cleanups; got rid of dup ctype stuff, atoi function
+- * 
++ *
+  * 2003/02/07 - Jay Vosburgh <fubar at us dot ibm dot com>
+  *	- Added use_carrier module parameter that causes miimon to
+  *	  use netif_carrier_ok() test instead of MII/ETHTOOL ioctls.
+@@ -330,7 +330,7 @@
+  *	  new/old ifenslave and new/old bonding.
+  *
+  * 2003/05/01 - Shmulik Hen <shmulik.hen at intel dot com>
+- *	- Fixed bug in bond_release_all(): save old value of current_slave
++ *	- Fixed bug in bond_release_all(): save old value of curr_active_slave
+  *	  before setting it to NULL.
+  *	- Changed driver versioning scheme to include version number instead
+  *	  of release date (that is already in another field). There are 3
+@@ -358,7 +358,7 @@
+  *
+  * 2003/05/01 - Shmulik Hen <shmulik.hen at intel dot com>
+  *	- Added support for Transmit load balancing mode.
+- *	- Concentrate all assignments of current_slave to a single point
++ *	- Concentrate all assignments of curr_active_slave to a single point
+  *	  so specific modes can take actions when the primary adapter is
+  *	  changed.
+  *	- Take the updelay parameter into consideration during bond_enslave
+@@ -426,8 +426,36 @@
+  *	- Convert /proc to seq_file interface.
+  *	  Change /proc/net/bondX/info to /proc/net/bonding/bondX.
+  *	  Set version to 2.4.1.
++ *
++ * 2003/11/20 - Amir Noam <amir.noam at intel dot com>
++ *	- Fix /proc creation/destruction.
++ *
++ * 2003/12/01 - Shmulik Hen <shmulik.hen at intel dot com>
++ *	- Massive cleanup - Set version to 2.5.0
++ *	  Code changes:
++ *	  o Consolidate format of prints and debug prints.
++ *	  o Remove bonding_t/slave_t typedefs and consolidate all casts.
++ *	  o Remove dead code and unnecessary checks.
++ *	  o Consolidate starting/stopping timers.
++ *	  o Consolidate handling of primary module param throughout the code.
++ *	  o Removed multicast module param support - all settings are done
++ *	    according to mode.
++ *	  o Slave list iteration - bond is no longer part of the list,
++ *	    added cyclic list iteration macros.
++ *	  o Consolidate error handling in all xmit functions.
++ *	  Style changes:
++ *	  o Consolidate function naming and declarations.
++ *	  o Consolidate function params and local variables names.
++ *	  o Consolidate return values.
++ *	  o Consolidate curly braces.
++ *	  o Consolidate conditionals format.
++ *	  o Change struct member names and types.
++ *	  o Chomp trailing spaces, remove empty lines, fix indentations.
++ *	  o Re-organize code according to context.
+  */
+ 
++//#define BONDING_DEBUG 1
++
+ #include <linux/config.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+@@ -452,7 +480,6 @@
+ #include <asm/dma.h>
+ #include <asm/uaccess.h>
+ #include <linux/errno.h>
+-
+ #include <linux/netdevice.h>
+ #include <linux/inetdevice.h>
+ #include <linux/etherdevice.h>
+@@ -461,58 +488,72 @@
+ #include <linux/rtnetlink.h>
+ #include <linux/proc_fs.h>
+ #include <linux/seq_file.h>
+-
+-#include <linux/if_bonding.h>
+ #include <linux/smp.h>
+ #include <linux/if_ether.h>
+ #include <net/arp.h>
+ #include <linux/mii.h>
+ #include <linux/ethtool.h>
++#include <linux/if_bonding.h>
+ #include "bonding.h"
+ #include "bond_3ad.h"
+ #include "bond_alb.h"
+ 
+-#define DRV_VERSION	"2.4.1"
+-#define DRV_RELDATE	"September 15, 2003"
+-#define DRV_NAME	"bonding"
+-#define DRV_DESCRIPTION	"Ethernet Channel Bonding Driver"
+-
+-static const char *version =
+-DRV_NAME ".c:v" DRV_VERSION " (" DRV_RELDATE ")\n";
++/*---------------------------- Module parameters ----------------------------*/
+ 
+ /* monitor all links that often (in milliseconds). <=0 disables monitoring */
+-#ifndef BOND_LINK_MON_INTERV
+ #define BOND_LINK_MON_INTERV	0
+-#endif
+-
+-#ifndef BOND_LINK_ARP_INTERV
+ #define BOND_LINK_ARP_INTERV	0
+-#endif
++#define MAX_ARP_IP_TARGETS	16
+ 
+-#ifndef MAX_ARP_IP_TARGETS
+-#define MAX_ARP_IP_TARGETS 16
+-#endif
++static int max_bonds	= BOND_DEFAULT_MAX_BONDS;
++static int miimon	= BOND_LINK_MON_INTERV;
++static int updelay	= 0;
++static int downdelay	= 0;
++static int use_carrier	= 1;
++static char *mode	= NULL;
++static char *primary	= NULL;
++static char *lacp_rate	= NULL;
++static int arp_interval = BOND_LINK_ARP_INTERV;
++static char *arp_ip_target[MAX_ARP_IP_TARGETS] = { NULL, };
++
++MODULE_PARM(max_bonds, "i");
++MODULE_PARM_DESC(max_bonds, "Max number of bonded devices");
++MODULE_PARM(miimon, "i");
++MODULE_PARM_DESC(miimon, "Link check interval in milliseconds");
++MODULE_PARM(updelay, "i");
++MODULE_PARM_DESC(updelay, "Delay before considering link up, in milliseconds");
++MODULE_PARM(downdelay, "i");
++MODULE_PARM_DESC(downdelay, "Delay before considering link down, in milliseconds");
++MODULE_PARM(use_carrier, "i");
++MODULE_PARM_DESC(use_carrier, "Use netif_carrier_ok (vs MII ioctls) in miimon; 0 for off, 1 for on (default)");
++MODULE_PARM(mode, "s");
++MODULE_PARM_DESC(mode, "Mode of operation : 0 for round robin, 1 for active-backup, 2 for xor");
++MODULE_PARM(primary, "s");
++MODULE_PARM_DESC(primary, "Primary network device to use");
++MODULE_PARM(lacp_rate, "s");
++MODULE_PARM_DESC(lacp_rate, "LACPDU tx rate to request from 802.3ad partner (slow/fast)");
++MODULE_PARM(arp_interval, "i");
++MODULE_PARM_DESC(arp_interval, "arp interval in milliseconds");
++MODULE_PARM(arp_ip_target, "1-" __MODULE_STRING(MAX_ARP_IP_TARGETS) "s");
++MODULE_PARM_DESC(arp_ip_target, "arp targets in n.n.n.n form");
+ 
+-#define USES_PRIMARY(mode) \
+-		(((mode) == BOND_MODE_ACTIVEBACKUP) || \
+-		 ((mode) == BOND_MODE_TLB) || \
+-		 ((mode) == BOND_MODE_ALB))
++/*----------------------------- Global variables ----------------------------*/
+ 
+-struct bond_parm_tbl {
+-	char *modename;
+-	int mode;
+-};
++static const char *version =
++	DRV_DESCRIPTION ": v" DRV_VERSION " (" DRV_RELDATE ")\n";
+ 
+-static int arp_interval = BOND_LINK_ARP_INTERV;
+-static char *arp_ip_target[MAX_ARP_IP_TARGETS] = { NULL, };
+-static u32 arp_target[MAX_ARP_IP_TARGETS] = { 0, } ;
+-static int arp_ip_count = 0;
+-static u32 my_ip = 0;
+-char *arp_target_hw_addr = NULL;
++static LIST_HEAD(bond_dev_list);
+ 
+-static char *primary= NULL;
++#ifdef CONFIG_PROC_FS
++static struct proc_dir_entry *bond_proc_dir = NULL;
++#endif
+ 
+-static int app_abi_ver = 0;
++static u32 arp_target[MAX_ARP_IP_TARGETS] = { 0, } ;
++static int arp_ip_count	= 0;
++static u32 my_ip	= 0;
++static int bond_mode	= BOND_MODE_ROUNDROBIN;
++static int lacp_fast	= 0;
++static int app_abi_ver	= 0;
+ static int orig_app_abi_ver = -1; /* This is used to save the first ABI version
+ 				   * we receive from the application. Once set,
+ 				   * it won't be changed, and the module will
+@@ -521,14 +562,16 @@ static int orig_app_abi_ver = -1; /* Thi
+ 				   * another ABI version.
+ 				   */
+ 
+-static int max_bonds	= BOND_DEFAULT_MAX_BONDS;
+-static int miimon	= BOND_LINK_MON_INTERV;
+-static int use_carrier	= 1;
+-static int bond_mode	= BOND_MODE_ROUNDROBIN;
+-static int updelay	= 0;
+-static int downdelay	= 0;
++struct bond_parm_tbl {
++	char *modename;
++	int mode;
++};
+ 
+-static char *mode	= NULL;
++static struct bond_parm_tbl bond_lacp_tbl[] = {
++{	"slow",		AD_LACP_SLOW},
++{	"fast",		AD_LACP_FAST},
++{	NULL,		-1},
++};
+ 
+ static struct bond_parm_tbl bond_mode_tbl[] = {
+ {	"balance-rr",		BOND_MODE_ROUNDROBIN},
+@@ -541,101 +584,9 @@ static struct bond_parm_tbl bond_mode_tb
+ {	NULL,			-1},
+ };
+ 
+-static int multicast_mode	= BOND_MULTICAST_ALL;
+-static char *multicast		= NULL;
+-
+-static struct bond_parm_tbl bond_mc_tbl[] = {
+-{	"disabled",		BOND_MULTICAST_DISABLED},
+-{	"active",		BOND_MULTICAST_ACTIVE},
+-{	"all",			BOND_MULTICAST_ALL},
+-{	NULL,			-1},
+-};
+-
+-static int lacp_fast		= 0;
+-static char *lacp_rate		= NULL;
+-
+-static struct bond_parm_tbl bond_lacp_tbl[] = {
+-{	"slow",		AD_LACP_SLOW},
+-{	"fast",		AD_LACP_FAST},
+-{	NULL,		-1},
+-};
+-
+-static LIST_HEAD(bond_dev_list);
+-#ifdef CONFIG_PROC_FS
+-static struct proc_dir_entry *bond_proc_dir = NULL;
+-#endif
+-
+-MODULE_PARM(max_bonds, "i");
+-MODULE_PARM_DESC(max_bonds, "Max number of bonded devices");
+-MODULE_PARM(miimon, "i");
+-MODULE_PARM_DESC(miimon, "Link check interval in milliseconds");
+-MODULE_PARM(use_carrier, "i");
+-MODULE_PARM_DESC(use_carrier, "Use netif_carrier_ok (vs MII ioctls) in miimon; 0 for off, 1 for on (default)");
+-MODULE_PARM(mode, "s");
+-MODULE_PARM_DESC(mode, "Mode of operation : 0 for round robin, 1 for active-backup, 2 for xor");
+-MODULE_PARM(arp_interval, "i");
+-MODULE_PARM_DESC(arp_interval, "arp interval in milliseconds");
+-MODULE_PARM(arp_ip_target, "1-" __MODULE_STRING(MAX_ARP_IP_TARGETS) "s");
+-MODULE_PARM_DESC(arp_ip_target, "arp targets in n.n.n.n form");
+-MODULE_PARM(updelay, "i");
+-MODULE_PARM_DESC(updelay, "Delay before considering link up, in milliseconds");
+-MODULE_PARM(downdelay, "i");
+-MODULE_PARM_DESC(downdelay, "Delay before considering link down, in milliseconds");
+-MODULE_PARM(primary, "s");
+-MODULE_PARM_DESC(primary, "Primary network device to use");
+-MODULE_PARM(multicast, "s");
+-MODULE_PARM_DESC(multicast, "Mode for multicast support : 0 for none, 1 for active slave, 2 for all slaves (default)");
+-MODULE_PARM(lacp_rate, "s");
+-MODULE_PARM_DESC(lacp_rate, "LACPDU tx rate to request from 802.3ad partner (slow/fast)");
+-
+-static int bond_xmit_roundrobin(struct sk_buff *skb, struct net_device *dev);
+-static int bond_xmit_xor(struct sk_buff *skb, struct net_device *dev);
+-static int bond_xmit_activebackup(struct sk_buff *skb, struct net_device *dev);
+-static struct net_device_stats *bond_get_stats(struct net_device *dev);
+-static void bond_mii_monitor(struct net_device *dev);
+-static void loadbalance_arp_monitor(struct net_device *dev);
+-static void activebackup_arp_monitor(struct net_device *dev);
+-static void bond_mc_list_destroy(struct bonding *bond);
+-static void bond_mc_add(bonding_t *bond, void *addr, int alen);
+-static void bond_mc_delete(bonding_t *bond, void *addr, int alen);
+-static int bond_mc_list_copy (struct dev_mc_list *src, struct bonding *dst, int gpf_flag);
+-static inline int dmi_same(struct dev_mc_list *dmi1, struct dev_mc_list *dmi2);
+-static void bond_set_promiscuity(bonding_t *bond, int inc);
+-static void bond_set_allmulti(bonding_t *bond, int inc);
+-static struct dev_mc_list* bond_mc_list_find_dmi(struct dev_mc_list *dmi, struct dev_mc_list *mc_list);
+-static void bond_mc_update(bonding_t *bond, slave_t *new, slave_t *old);
+-static int bond_enslave(struct net_device *master, struct net_device *slave);
+-static int bond_release(struct net_device *master, struct net_device *slave);
+-static int bond_release_all(struct net_device *master);
+-static int bond_sethwaddr(struct net_device *master, struct net_device *slave);
+-static void change_active_interface(struct bonding *bond, struct slave *new);
+-static void reselect_active_interface(struct bonding *bond);
+-static struct slave *find_best_interface(struct bonding *bond);
+-
+-
+-/* #define BONDING_DEBUG 1 */
+-#ifdef BONDING_DEBUG
+-#define dprintk(x...) printk(x...)
+-#else /* BONDING_DEBUG */
+-#define dprintk(x...) do {} while (0)
+-#endif /* BONDING_DEBUG */
+-
+-/* several macros */
+-
+-static void arp_send_all(slave_t *slave)
+-{	
+-	int i; 
+-
+-	for (i = 0; (i<MAX_ARP_IP_TARGETS) && arp_target[i]; i++) { 
+-		arp_send(ARPOP_REQUEST, ETH_P_ARP, arp_target[i], slave->dev, 
+-			 my_ip, arp_target_hw_addr, slave->dev->dev_addr,
+-			 arp_target_hw_addr); 
+-	} 
+-}
+- 
++/*---------------------------- General routines -----------------------------*/
+ 
+-static const char *
+-bond_mode_name(void)
++static const char *bond_mode_name(void)
+ {
+ 	switch (bond_mode) {
+ 	case BOND_MODE_ROUNDROBIN :
+@@ -657,149 +608,7 @@ bond_mode_name(void)
+ 	}
+ }
+ 
+-static const char *
+-multicast_mode_name(void)
+-{
+-	switch(multicast_mode) {
+-	case BOND_MULTICAST_DISABLED :
+-		return "disabled";
+-	case BOND_MULTICAST_ACTIVE :
+-		return "active slave only";
+-	case BOND_MULTICAST_ALL :
+-		return "all slaves";
+-	default :
+-		return "unknown";
+-	}
+-}
+-
+-void bond_set_slave_inactive_flags(slave_t *slave)
+-{
+-	slave->state = BOND_STATE_BACKUP;
+-	slave->dev->flags |= IFF_NOARP;
+-}
+-
+-void bond_set_slave_active_flags(slave_t *slave)
+-{
+-	slave->state = BOND_STATE_ACTIVE;
+-	slave->dev->flags &= ~IFF_NOARP;
+-}
+-
+-/*
+- * This function counts and verifies the the number of attached
+- * slaves, checking the count against the expected value (given that incr
+- * is either 1 or -1, for add or removal of a slave).  Only
+- * bond_xmit_xor() uses the slave_cnt value, but this is still a good
+- * consistency check.
+- */
+-static inline void
+-update_slave_cnt(bonding_t *bond, int incr)
+-{
+-	slave_t *slave = NULL;
+-	int expect = bond->slave_cnt + incr;
+-
+-	bond->slave_cnt = 0;
+-	for (slave = bond->prev; slave != (slave_t*)bond;
+-	     slave = slave->prev) {
+-		bond->slave_cnt++;
+-	}
+-
+-	if (expect != bond->slave_cnt)
+-		BUG();
+-}
+-
+-/* 
+- * This function detaches the slave <slave> from the list <bond>.
+- * WARNING: no check is made to verify if the slave effectively
+- * belongs to <bond>. It returns <slave> in case it's needed.
+- * Nothing is freed on return, structures are just unchained.
+- * If the bond->current_slave pointer was pointing to <slave>,
+- * it should be changed by the calling function.
+- *
+- * bond->lock held for writing by caller.
+- */
+-static slave_t *
+-bond_detach_slave(bonding_t *bond, slave_t *slave)
+-{
+-	if ((bond == NULL) || (slave == NULL) ||
+-	   ((void *)bond == (void *)slave)) {
+-		printk(KERN_ERR
+-			"bond_detach_slave(): trying to detach "
+-			"slave %p from bond %p\n", bond, slave);
+-		return slave;
+-	}
+-
+-	if (bond->next == slave) {  /* is the slave at the head ? */
+-		if (bond->prev == slave) {  /* is the slave alone ? */
+-			bond->prev = bond->next = (slave_t *)bond;
+-		} else { /* not alone */
+-			bond->next        = slave->next;
+-			slave->next->prev = (slave_t *)bond;
+-			bond->prev->next  = slave->next;
+-		}
+-	} else {
+-		slave->prev->next = slave->next;
+-		if (bond->prev == slave) {  /* is this slave the last one ? */
+-			bond->prev = slave->prev;
+-		} else {
+-			slave->next->prev = slave->prev;
+-		}
+-	}
+-
+-	update_slave_cnt(bond, -1);
+-
+-	return slave;
+-}
+-
+-/*
+- * This function attaches the slave <slave> to the list <bond>.
+- *
+- * bond->lock held for writing by caller.
+- */
+-static void
+-bond_attach_slave(struct bonding *bond, struct slave *new_slave)
+-{
+-	/* 
+-	 * queue to the end of the slaves list, make the first element its
+-	 * successor, the last one its predecessor, and make it the bond's
+-	 * predecessor. 
+-	 *
+-	 * Just to clarify, so future bonding driver hackers don't go through
+-	 * the same confusion stage I did trying to figure this out, the
+-	 * slaves are stored in a double linked circular list, sortof.
+-	 * In the ->next direction, the last slave points to the first slave,
+-	 * bypassing bond; only the slaves are in the ->next direction.
+-	 * In the ->prev direction, however, the first slave points to bond
+-	 * and bond points to the last slave.
+-	 *
+-	 * It looks like a circle with a little bubble hanging off one side
+-	 * in the ->prev direction only.
+-	 *
+-	 * When going through the list once, its best to start at bond->prev
+-	 * and go in the ->prev direction, testing for bond.  Doing this
+-	 * in the ->next direction doesn't work.  Trust me, I know this now.
+-	 * :)  -mts 2002.03.14
+-	 */
+-	new_slave->prev       = bond->prev;
+-	new_slave->prev->next = new_slave;
+-	bond->prev            = new_slave;
+-	new_slave->next       = bond->next;
+-
+-	update_slave_cnt(bond, 1);
+-}
+-
+-
+-/*
+- * Less bad way to call ioctl from within the kernel; this needs to be
+- * done some other way to get the call out of interrupt context.
+- * Needs "ioctl" variable to be supplied by calling context.
+- */
+-#define IOCTL(dev, arg, cmd) ({		\
+-	int ret;			\
+-	mm_segment_t fs = get_fs();	\
+-	set_fs(get_ds());		\
+-	ret = ioctl(dev, arg, cmd);	\
+-	set_fs(fs);			\
+-	ret; })
++/*------------------------------- Link status -------------------------------*/
+ 
+ /*
+  * Get link speed and duplex from the slave's base driver
+@@ -809,16 +618,16 @@ bond_attach_slave(struct bonding *bond, 
+  */
+ static int bond_update_speed_duplex(struct slave *slave)
+ {
+-	struct net_device *dev = slave->dev;
++	struct net_device *slave_dev = slave->dev;
+ 	static int (* ioctl)(struct net_device *, struct ifreq *, int);
+ 	struct ifreq ifr;
+ 	struct ethtool_cmd etool;
+ 
+-	ioctl = dev->do_ioctl;
++	ioctl = slave_dev->do_ioctl;
+ 	if (ioctl) {
+ 		etool.cmd = ETHTOOL_GSET;
+ 		ifr.ifr_data = (char*)&etool;
+-		if (IOCTL(dev, &ifr, SIOCETHTOOL) == 0) {
++		if (IOCTL(slave_dev, &ifr, SIOCETHTOOL) == 0) {
+ 			slave->speed = etool.speed;
+ 			slave->duplex = etool.duplex;
+ 		} else {
+@@ -829,20 +638,20 @@ static int bond_update_speed_duplex(stru
+ 	}
+ 
+ 	switch (slave->speed) {
+-		case SPEED_10:
+-		case SPEED_100:
+-		case SPEED_1000:
+-			break;
+-		default:
+-			goto err_out;
++	case SPEED_10:
++	case SPEED_100:
++	case SPEED_1000:
++		break;
++	default:
++		goto err_out;
+ 	}
+ 
+ 	switch (slave->duplex) {
+-		case DUPLEX_FULL:
+-		case DUPLEX_HALF:
+-			break;
+-		default:
+-			goto err_out;
++	case DUPLEX_FULL:
++	case DUPLEX_HALF:
++		break;
++	default:
++		goto err_out;
+ 	}
+ 
+ 	return 0;
+@@ -854,7 +663,7 @@ err_out:
+ 	return -1;
+ }
+ 
+-/* 
++/*
+  * if <dev> supports MII link status reporting, check its link status.
+  *
+  * We either do MII/ETHTOOL ioctls, or check netif_carrier_ok(),
+@@ -870,8 +679,7 @@ err_out:
+  * It'd be nice if there was a good way to tell if a driver supports
+  * netif_carrier, but there really isn't.
+  */
+-static int
+-bond_check_dev_link(struct net_device *dev, int reporting)
++static int bond_check_dev_link(struct net_device *slave_dev, int reporting)
+ {
+ 	static int (* ioctl)(struct net_device *, struct ifreq *, int);
+ 	struct ifreq ifr;
+@@ -879,10 +687,10 @@ bond_check_dev_link(struct net_device *d
+ 	struct ethtool_value etool;
+ 
+ 	if (use_carrier) {
+-		return netif_carrier_ok(dev) ? BMSR_LSTATUS : 0;
++		return netif_carrier_ok(slave_dev) ? BMSR_LSTATUS : 0;
+ 	}
+ 
+-	ioctl = dev->do_ioctl;
++	ioctl = slave_dev->do_ioctl;
+ 	if (ioctl) {
+ 		/* TODO: set pointer to correct ioctl on a per team member */
+ 		/*       bases to make this more efficient. that is, once  */
+@@ -898,476 +706,495 @@ bond_check_dev_link(struct net_device *d
+ 
+ 		/* Yes, the mii is overlaid on the ifreq.ifr_ifru */
+ 		mii = (struct mii_ioctl_data *)&ifr.ifr_data;
+-		if (IOCTL(dev, &ifr, SIOCGMIIPHY) == 0) {
++		if (IOCTL(slave_dev, &ifr, SIOCGMIIPHY) == 0) {
+ 			mii->reg_num = MII_BMSR;
+-			if (IOCTL(dev, &ifr, SIOCGMIIREG) == 0) {
+-				return mii->val_out & BMSR_LSTATUS;
++			if (IOCTL(slave_dev, &ifr, SIOCGMIIREG) == 0) {
++				return (mii->val_out & BMSR_LSTATUS);
+ 			}
+ 		}
+ 
+ 		/* try SIOCETHTOOL ioctl, some drivers cache ETHTOOL_GLINK */
+ 		/* for a period of time so we attempt to get link status   */
+ 		/* from it last if the above MII ioctls fail...            */
+-	        etool.cmd = ETHTOOL_GLINK;
+-	        ifr.ifr_data = (char*)&etool;
+-		if (IOCTL(dev, &ifr, SIOCETHTOOL) == 0) {
++		etool.cmd = ETHTOOL_GLINK;
++		ifr.ifr_data = (char*)&etool;
++		if (IOCTL(slave_dev, &ifr, SIOCETHTOOL) == 0) {
+ 			if (etool.data == 1) {
+ 				return BMSR_LSTATUS;
+-			} else { 
+-#ifdef BONDING_DEBUG
+-				printk(KERN_INFO 
+-					":: SIOCETHTOOL shows link down \n");
+-#endif
++			} else {
++				dprintk("SIOCETHTOOL shows link down\n");
+ 				return 0;
+-			} 
++			}
+ 		}
+-
+ 	}
+- 
++
+ 	/*
+ 	 * If reporting, report that either there's no dev->do_ioctl,
+ 	 * or both SIOCGMIIREG and SIOCETHTOOL failed (meaning that we
+ 	 * cannot report link status).  If not reporting, pretend
+ 	 * we're ok.
+ 	 */
+-	return reporting ? -1 : BMSR_LSTATUS;
++	return (reporting ? -1 : BMSR_LSTATUS);
+ }
+ 
+-static u16 bond_check_mii_link(bonding_t *bond)
+-{
+-	int has_active_interface = 0;
+-
+-	read_lock_bh(&bond->lock);
+-	read_lock(&bond->ptrlock);
+-	has_active_interface = (bond->current_slave != NULL);
+-	read_unlock(&bond->ptrlock);
+-	read_unlock_bh(&bond->lock);
++/*----------------------------- Multicast list ------------------------------*/
+ 
+-	return (has_active_interface ? BMSR_LSTATUS : 0);
++/*
++ * Returns 0 if dmi1 and dmi2 are the same, non-0 otherwise
++ */
++static inline int bond_is_dmi_same(struct dev_mc_list *dmi1, struct dev_mc_list *dmi2)
++{
++	return memcmp(dmi1->dmi_addr, dmi2->dmi_addr, dmi1->dmi_addrlen) == 0 &&
++			dmi1->dmi_addrlen == dmi2->dmi_addrlen;
+ }
+ 
+-/* register to receive lacpdus on a bond */
+-static void bond_register_lacpdu(struct bonding *bond)
++/*
++ * returns dmi entry if found, NULL otherwise
++ */
++static struct dev_mc_list *bond_mc_list_find_dmi(struct dev_mc_list *dmi, struct dev_mc_list *mc_list)
+ {
+-	struct packet_type* pk_type = &(BOND_AD_INFO(bond).ad_pkt_type);
++	struct dev_mc_list *idmi;
+ 
+-	/* initialize packet type */
+-	pk_type->type = PKT_TYPE_LACPDU;
+-	pk_type->dev = bond->device;
+-	pk_type->func = bond_3ad_lacpdu_recv;
++	for (idmi = mc_list; idmi; idmi = idmi->next) {
++		if (bond_is_dmi_same(dmi, idmi)) {
++			return idmi;
++		}
++	}
+ 
+-	dev_add_pack(pk_type);
++	return NULL;
+ }
+ 
+-/* unregister to receive lacpdus on a bond */
+-static void bond_unregister_lacpdu(struct bonding *bond)
++/*
++ * Push the promiscuity flag down to appropriate slaves
++ */
++static void bond_set_promiscuity(struct bonding *bond, int inc)
+ {
+-	dev_remove_pack(&(BOND_AD_INFO(bond).ad_pkt_type));
++	if (USES_PRIMARY(bond_mode)) {
++		/* write lock already acquired */
++		if (bond->curr_active_slave) {
++			dev_set_promiscuity(bond->curr_active_slave->dev, inc);
++		}
++	} else {
++		struct slave *slave;
++		int i;
++		bond_for_each_slave(bond, slave, i) {
++			dev_set_promiscuity(slave->dev, inc);
++		}
++	}
+ }
+ 
+-static int bond_open(struct net_device *dev)
++/*
++ * Push the allmulti flag down to all slaves
++ */
++static void bond_set_allmulti(struct bonding *bond, int inc)
+ {
+-	struct bonding *bond = (struct bonding *)(dev->priv);
+-	struct timer_list *timer = &((struct bonding *)(dev->priv))->mii_timer;
+-	struct timer_list *arp_timer = &((struct bonding *)(dev->priv))->arp_timer;
+-
+-	if ((bond_mode == BOND_MODE_TLB) ||
+-	    (bond_mode == BOND_MODE_ALB)) {
+-		struct timer_list *alb_timer = &(BOND_ALB_INFO(bond).alb_timer);
+-
+-		/* bond_alb_initialize must be called before the timer
+-		 * is started.
+-		 */
+-		if (bond_alb_initialize(bond, (bond_mode == BOND_MODE_ALB))) {
+-			/* something went wrong - fail the open operation */
+-			return -1;
++	if (USES_PRIMARY(bond_mode)) {
++		/* write lock already acquired */
++		if (bond->curr_active_slave) {
++			dev_set_allmulti(bond->curr_active_slave->dev, inc);
++		}
++	} else {
++		struct slave *slave;
++		int i;
++		bond_for_each_slave(bond, slave, i) {
++			dev_set_allmulti(slave->dev, inc);
+ 		}
+-
+-		init_timer(alb_timer);
+-		alb_timer->expires  = jiffies + 1;
+-		alb_timer->data     = (unsigned long)bond;
+-		alb_timer->function = (void *)&bond_alb_monitor;
+-		add_timer(alb_timer);
+-	}
+-
+-	if (miimon > 0) {  /* link check interval, in milliseconds. */
+-		init_timer(timer);
+-		timer->expires  = jiffies + (miimon * HZ / 1000);
+-		timer->data     = (unsigned long)dev;
+-		timer->function = (void *)&bond_mii_monitor;
+-		add_timer(timer);
+ 	}
++}
+ 
+-	if (arp_interval> 0) {  /* arp interval, in milliseconds. */
+-		init_timer(arp_timer);
+-		arp_timer->expires  = jiffies + (arp_interval * HZ / 1000);
+-		arp_timer->data     = (unsigned long)dev;
+-		if (bond_mode == BOND_MODE_ACTIVEBACKUP) {
+-			arp_timer->function = (void *)&activebackup_arp_monitor;
+-		} else {
+-			arp_timer->function = (void *)&loadbalance_arp_monitor;
++/*
++ * Add a Multicast address to slaves
++ * according to mode
++ */
++static void bond_mc_add(struct bonding *bond, void *addr, int alen)
++{
++	if (USES_PRIMARY(bond_mode)) {
++		/* write lock already acquired */
++		if (bond->curr_active_slave) {
++			dev_mc_add(bond->curr_active_slave->dev, addr, alen, 0);
++		}
++	} else {
++		struct slave *slave;
++		int i;
++		bond_for_each_slave(bond, slave, i) {
++			dev_mc_add(slave->dev, addr, alen, 0);
+ 		}
+-		add_timer(arp_timer);
+ 	}
+-
+-	if (bond_mode == BOND_MODE_8023AD) {
+-		struct timer_list *ad_timer = &(BOND_AD_INFO(bond).ad_timer);
+-		init_timer(ad_timer);
+-		ad_timer->expires  = jiffies + (AD_TIMER_INTERVAL * HZ / 1000);
+-		ad_timer->data     = (unsigned long)bond;
+-		ad_timer->function = (void *)&bond_3ad_state_machine_handler;
+-		add_timer(ad_timer);
+-
+-		/* register to receive LACPDUs */
+-		bond_register_lacpdu(bond);
+-	}
+-
+-	return 0;
+ }
+ 
+-static int bond_close(struct net_device *master)
++/*
++ * Remove a multicast address from slave
++ * according to mode
++ */
++static void bond_mc_delete(struct bonding *bond, void *addr, int alen)
+ {
+-	bonding_t *bond = (struct bonding *) master->priv;
+-
+-	write_lock_bh(&bond->lock);
+-
+-	if (miimon > 0) {  /* link check interval, in milliseconds. */
+-		del_timer(&bond->mii_timer);
+-	}
+-	if (arp_interval> 0) {  /* arp interval, in milliseconds. */
+-		del_timer(&bond->arp_timer);
+-                if (arp_target_hw_addr != NULL) {
+-			kfree(arp_target_hw_addr); 
+-			arp_target_hw_addr = NULL;
++	if (USES_PRIMARY(bond_mode)) {
++		/* write lock already acquired */
++		if (bond->curr_active_slave) {
++			dev_mc_delete(bond->curr_active_slave->dev, addr, alen, 0);
++		}
++	} else {
++		struct slave *slave;
++		int i;
++		bond_for_each_slave(bond, slave, i) {
++			dev_mc_delete(slave->dev, addr, alen, 0);
+ 		}
+ 	}
++}
+ 
+-	if (bond_mode == BOND_MODE_8023AD) {
+-		del_timer_sync(&(BOND_AD_INFO(bond).ad_timer));
++/*
++ * Totally destroys the mc_list in bond
++ */
++static void bond_mc_list_destroy(struct bonding *bond)
++{
++	struct dev_mc_list *dmi;
+ 
+-		/* Unregister the receive of LACPDUs */
+-		bond_unregister_lacpdu(bond);
++	dmi = bond->mc_list;
++	while (dmi) {
++		bond->mc_list = dmi->next;
++		kfree(dmi);
++		dmi = bond->mc_list;
+ 	}
++}
+ 
+-	bond_mc_list_destroy (bond);
+-
+-	write_unlock_bh(&bond->lock);
++/*
++ * Copy all the Multicast addresses from src to the bonding device dst
++ */
++static int bond_mc_list_copy(struct dev_mc_list *mc_list, struct bonding *bond, int gpf_flag)
++{
++	struct dev_mc_list *dmi, *new_dmi;
+ 
+-	/* Release the bonded slaves */
+-	bond_release_all(master);
++	for (dmi = mc_list; dmi; dmi = dmi->next) {
++		new_dmi = kmalloc(sizeof(struct dev_mc_list), gpf_flag);
+ 
+-	if ((bond_mode == BOND_MODE_TLB) ||
+-	    (bond_mode == BOND_MODE_ALB)) {
+-		del_timer_sync(&(BOND_ALB_INFO(bond).alb_timer));
++		if (!new_dmi) {
++			/* FIXME: Potential memory leak !!! */
++			return -ENOMEM;
++		}
+ 
+-		bond_alb_deinitialize(bond);
++		new_dmi->next = bond->mc_list;
++		bond->mc_list = new_dmi;
++		new_dmi->dmi_addrlen = dmi->dmi_addrlen;
++		memcpy(new_dmi->dmi_addr, dmi->dmi_addr, dmi->dmi_addrlen);
++		new_dmi->dmi_users = dmi->dmi_users;
++		new_dmi->dmi_gusers = dmi->dmi_gusers;
+ 	}
+ 
+ 	return 0;
+ }
+ 
+-/* 
++/*
+  * flush all members of flush->mc_list from device dev->mc_list
+  */
+-static void bond_mc_list_flush(struct net_device *dev, struct net_device *flush)
+-{ 
+-	struct dev_mc_list *dmi; 
+- 
+-	for (dmi = flush->mc_list; dmi != NULL; dmi = dmi->next) 
+-		dev_mc_delete(dev, dmi->dmi_addr, dmi->dmi_addrlen, 0);
++static void bond_mc_list_flush(struct net_device *bond_dev, struct net_device *slave_dev)
++{
++	struct dev_mc_list *dmi;
++
++	for (dmi = bond_dev->mc_list; dmi; dmi = dmi->next) {
++		dev_mc_delete(slave_dev, dmi->dmi_addr, dmi->dmi_addrlen, 0);
++	}
+ 
+ 	if (bond_mode == BOND_MODE_8023AD) {
+ 		/* del lacpdu mc addr from mc list */
+ 		u8 lacpdu_multicast[ETH_ALEN] = MULTICAST_LACPDU_ADDR;
+ 
+-		dev_mc_delete(dev, lacpdu_multicast, ETH_ALEN, 0);
++		dev_mc_delete(slave_dev, lacpdu_multicast, ETH_ALEN, 0);
+ 	}
+ }
+ 
++/*--------------------------- Active slave change ---------------------------*/
++
+ /*
+- * Totally destroys the mc_list in bond
++ * Update the mc list and multicast-related flags for the new and
++ * old active slaves (if any) according to the multicast mode, and
++ * promiscuous flags unconditionally.
+  */
+-static void bond_mc_list_destroy(struct bonding *bond)
++static void bond_mc_swap(struct bonding *bond, struct slave *new_active, struct slave *old_active)
+ {
+ 	struct dev_mc_list *dmi;
+ 
+-	dmi = bond->mc_list; 
+-	while (dmi) { 
+-		bond->mc_list = dmi->next; 
+-		kfree(dmi); 
+-		dmi = bond->mc_list; 
+-	}
+-}
+-
+-/*
+- * Add a Multicast address to every slave in the bonding group
+- */
+-static void bond_mc_add(bonding_t *bond, void *addr, int alen)
+-{ 
+-	slave_t *slave;
+-	switch (multicast_mode) {
+-	case BOND_MULTICAST_ACTIVE :
+-		/* write lock already acquired */
+-		if (bond->current_slave != NULL)
+-			dev_mc_add(bond->current_slave->dev, addr, alen, 0);
+-		break;
+-	case BOND_MULTICAST_ALL :
+-		for (slave = bond->prev; slave != (slave_t*)bond; slave = slave->prev)
+-			dev_mc_add(slave->dev, addr, alen, 0);
+-		break;
+-	case BOND_MULTICAST_DISABLED :
+-		break;
++	if (!USES_PRIMARY(bond_mode)) {
++		/* nothing to do -  mc list is already up-to-date on
++		 * all slaves
++		 */
++		return;
+ 	}
+-} 
+ 
+-/*
+- * Remove a multicast address from every slave in the bonding group
+- */
+-static void bond_mc_delete(bonding_t *bond, void *addr, int alen)
+-{ 
+-	slave_t *slave; 
+-	switch (multicast_mode) {
+-	case BOND_MULTICAST_ACTIVE :
+-		/* write lock already acquired */
+-		if (bond->current_slave != NULL)
+-			dev_mc_delete(bond->current_slave->dev, addr, alen, 0);
+-		break;
+-	case BOND_MULTICAST_ALL :
+-		for (slave = bond->prev; slave != (slave_t*)bond; slave = slave->prev)
+-			dev_mc_delete(slave->dev, addr, alen, 0);
+-		break;
+-	case BOND_MULTICAST_DISABLED :
+-		break;
+-	}
+-} 
++	if (old_active) {
++		if (bond->dev->flags & IFF_PROMISC) {
++			dev_set_promiscuity(old_active->dev, -1);
++		}
+ 
+-/*
+- * Copy all the Multicast addresses from src to the bonding device dst
+- */
+-static int bond_mc_list_copy (struct dev_mc_list *src, struct bonding *dst,
+- int gpf_flag)
+-{
+-	struct dev_mc_list *dmi, *new_dmi;
++		if (bond->dev->flags & IFF_ALLMULTI) {
++			dev_set_allmulti(old_active->dev, -1);
++		}
+ 
+-   	for (dmi = src; dmi != NULL; dmi = dmi->next) { 
+-		new_dmi = kmalloc(sizeof(struct dev_mc_list), gpf_flag);
++		for (dmi = bond->dev->mc_list; dmi; dmi = dmi->next) {
++			dev_mc_delete(old_active->dev, dmi->dmi_addr, dmi->dmi_addrlen, 0);
++		}
++	}
+ 
+-		if (new_dmi == NULL) {
+-			return -ENOMEM; 
++	if (new_active) {
++		if (bond->dev->flags & IFF_PROMISC) {
++			dev_set_promiscuity(new_active->dev, 1);
+ 		}
+ 
+-		new_dmi->next = dst->mc_list; 
+-		dst->mc_list = new_dmi;
++		if (bond->dev->flags & IFF_ALLMULTI) {
++			dev_set_allmulti(new_active->dev, 1);
++		}
+ 
+-		new_dmi->dmi_addrlen = dmi->dmi_addrlen; 
+-		memcpy(new_dmi->dmi_addr, dmi->dmi_addr, dmi->dmi_addrlen); 
+-		new_dmi->dmi_users = dmi->dmi_users;
+-		new_dmi->dmi_gusers = dmi->dmi_gusers; 
+-	} 
+-	return 0;
++		for (dmi = bond->dev->mc_list; dmi; dmi = dmi->next) {
++			dev_mc_add(new_active->dev, dmi->dmi_addr, dmi->dmi_addrlen, 0);
++		}
++	}
+ }
+ 
+-/*
+- * Returns 0 if dmi1 and dmi2 are the same, non-0 otherwise
+- */
+-static inline int dmi_same(struct dev_mc_list *dmi1, struct dev_mc_list *dmi2)
+-{ 
+-	return memcmp(dmi1->dmi_addr, dmi2->dmi_addr, dmi1->dmi_addrlen) == 0 &&
+-	 dmi1->dmi_addrlen == dmi2->dmi_addrlen;
+-} 
+-
+-/*
+- * Push the promiscuity flag down to appropriate slaves
++/**
++ * find_best_interface - select the best available slave to be the active one
++ * @bond: our bonding struct
++ *
++ * Warning: Caller must hold curr_slave_lock for writing.
+  */
+-static void bond_set_promiscuity(bonding_t *bond, int inc)
+-{ 
+-	slave_t *slave; 
++static struct slave *bond_find_best_slave(struct bonding *bond)
++{
++	struct slave *new_active, *old_active;
++	struct slave *bestslave = NULL;
++	int mintime;
++	int i;
+ 
+-	if (USES_PRIMARY(bond_mode)) {
+-		if (bond->current_slave) {
+-			dev_set_promiscuity(bond->current_slave->dev, inc);
+-		}
++	new_active = old_active = bond->curr_active_slave;
+ 
+-	} else { 
+-		for (slave = bond->prev; slave != (slave_t*)bond;
+-		     slave = slave->prev) {
+-			dev_set_promiscuity(slave->dev, inc);
++	if (!new_active) { /* there were no active slaves left */
++		if (bond->slave_cnt > 0) {  /* found one slave */
++			new_active = bond->first_slave;
++		} else {
++			return NULL; /* still no slave, return NULL */
+ 		}
+ 	}
+-} 
+ 
+-/*
+- * Push the allmulti flag down to all slaves
+- */
+-static void bond_set_allmulti(bonding_t *bond, int inc)
+-{ 
+-	slave_t *slave; 
+-	switch (multicast_mode) {
+-	case BOND_MULTICAST_ACTIVE : 
+-		/* write lock already acquired */
+-		if (bond->current_slave != NULL)
+-			dev_set_allmulti(bond->current_slave->dev, inc);
+-		break;
+-	case BOND_MULTICAST_ALL :
+-		for (slave = bond->prev; slave != (slave_t*)bond; slave = slave->prev)
+-			dev_set_allmulti(slave->dev, inc);
+-		break;
+-	case BOND_MULTICAST_DISABLED :
+-		break;
++	mintime = updelay;
++
++	/* first try the primary link; if arping, a link must tx/rx traffic
++	 * before it can be considered the curr_active_slave - also, we would skip
++	 * slaves between the curr_active_slave and primary_slave that may be up
++	 * and able to arp
++	 */
++	if ((bond->primary_slave) &&
++	    (!arp_interval) &&
++	    (IS_UP(bond->primary_slave->dev))) {
++		new_active = bond->primary_slave;
+ 	}
+-} 
+ 
+-/* 
+- * returns dmi entry if found, NULL otherwise 
+- */
+-static struct dev_mc_list* bond_mc_list_find_dmi(struct dev_mc_list *dmi,
+- struct dev_mc_list *mc_list)
+-{ 
+-	struct dev_mc_list *idmi;
++	/* remember where to stop iterating over the slaves */
++	old_active = new_active;
+ 
+-	for (idmi = mc_list; idmi != NULL; idmi = idmi->next) {
+-		if (dmi_same(dmi, idmi)) {
+-			return idmi; 
++	bond_for_each_slave_from(bond, new_active, i, old_active) {
++		if (IS_UP(new_active->dev)) {
++			if (new_active->link == BOND_LINK_UP) {
++				return new_active;
++			} else if (new_active->link == BOND_LINK_BACK) {
++				/* link up, but waiting for stabilization */
++				if (new_active->delay < mintime) {
++					mintime = new_active->delay;
++					bestslave = new_active;
++				}
++			}
+ 		}
+ 	}
+-	return NULL;
+-} 
+ 
+-static void set_multicast_list(struct net_device *master)
++	return bestslave;
++}
++
++/**
++ * change_active_interface - change the active slave into the specified one
++ * @bond: our bonding struct
++ * @new: the new slave to make the active one
++ *
++ * Set the new slave to the bond's settings and unset them on the old
++ * curr_active_slave.
++ * Setting include flags, mc-list, promiscuity, allmulti, etc.
++ *
++ * If @new's link state is %BOND_LINK_BACK we'll set it to %BOND_LINK_UP,
++ * because it is apparently the best available slave we have, even though its
++ * updelay hasn't timed out yet.
++ *
++ * Warning: Caller must hold curr_slave_lock for writing.
++ */
++static void bond_change_active_slave(struct bonding *bond, struct slave *new_active)
+ {
+-	bonding_t *bond = master->priv;
+-	struct dev_mc_list *dmi;
++	struct slave *old_active = bond->curr_active_slave;
+ 
+-	write_lock_bh(&bond->lock);
++	if (old_active == new_active) {
++		return;
++	}
+ 
+-	/*
+-	 * Do promisc before checking multicast_mode
+-	 */
+-	if ( (master->flags & IFF_PROMISC) && !(bond->flags & IFF_PROMISC) )
+-		bond_set_promiscuity(bond, 1); 
++	if (new_active) {
++		if (new_active->link == BOND_LINK_BACK) {
++			if (USES_PRIMARY(bond_mode)) {
++				printk(KERN_INFO DRV_NAME
++				       ": %s: making interface %s the new "
++				       "active one %d ms earlier.\n",
++				       bond->dev->name, new_active->dev->name,
++				       (updelay - new_active->delay) * miimon);
++			}
+ 
+-	if ( !(master->flags & IFF_PROMISC) && (bond->flags & IFF_PROMISC) ) 
+-		bond_set_promiscuity(bond, -1); 
++			new_active->delay = 0;
++			new_active->link = BOND_LINK_UP;
++			new_active->jiffies = jiffies;
+ 
+-	if (multicast_mode == BOND_MULTICAST_DISABLED) {
+-		bond->flags = master->flags;
+-		write_unlock_bh(&bond->lock);
+-		return;
++			if (bond_mode == BOND_MODE_8023AD) {
++				bond_3ad_handle_link_change(new_active, BOND_LINK_UP);
++			}
++
++			if ((bond_mode == BOND_MODE_TLB) ||
++			    (bond_mode == BOND_MODE_ALB)) {
++				bond_alb_handle_link_change(bond, new_active, BOND_LINK_UP);
++			}
++		} else {
++			if (USES_PRIMARY(bond_mode)) {
++				printk(KERN_INFO DRV_NAME
++				       ": %s: making interface %s the new "
++				       "active one.\n",
++				       bond->dev->name, new_active->dev->name);
++			}
++		}
+ 	}
+ 
+-	/* set allmulti flag to slaves */ 
+-	if ( (master->flags & IFF_ALLMULTI) && !(bond->flags & IFF_ALLMULTI) ) 
+-		bond_set_allmulti(bond, 1); 
++	if (bond_mode == BOND_MODE_ACTIVEBACKUP) {
++		if (old_active) {
++			bond_set_slave_inactive_flags(old_active);
++		}
++
++		if (new_active) {
++			bond_set_slave_active_flags(new_active);
++		}
++	}
+ 
+-	if ( !(master->flags & IFF_ALLMULTI) && (bond->flags & IFF_ALLMULTI) )
+-		bond_set_allmulti(bond, -1); 
++	if (USES_PRIMARY(bond_mode)) {
++		bond_mc_swap(bond, new_active, old_active);
++	}
+ 
+-	bond->flags = master->flags; 
++	if ((bond_mode == BOND_MODE_TLB) ||
++	    (bond_mode == BOND_MODE_ALB)) {
++		bond_alb_handle_active_change(bond, new_active);
++	} else {
++		bond->curr_active_slave = new_active;
++	}
++}
+ 
+-	/* looking for addresses to add to slaves' mc list */ 
+-	for (dmi = master->mc_list; dmi != NULL; dmi = dmi->next) { 
+-		if (bond_mc_list_find_dmi(dmi, bond->mc_list) == NULL) 
+-		 bond_mc_add(bond, dmi->dmi_addr, dmi->dmi_addrlen); 
+-	} 
++/**
++ * bond_select_active_slave - select a new active slave, if needed
++ * @bond: our bonding struct
++ *
++ * This functions shoud be called when one of the following occurs:
++ * - The old curr_active_slave has been released or lost its link.
++ * - The primary_slave has got its link back.
++ * - A slave has got its link back and there's no old curr_active_slave.
++ *
++ * Warning: Caller must hold curr_slave_lock for writing.
++ */
++static void bond_select_active_slave(struct bonding *bond)
++{
++	struct slave *best_slave;
+ 
+-	/* looking for addresses to delete from slaves' list */ 
+-	for (dmi = bond->mc_list; dmi != NULL; dmi = dmi->next) { 
+-		if (bond_mc_list_find_dmi(dmi, master->mc_list) == NULL) 
+-		 bond_mc_delete(bond, dmi->dmi_addr, dmi->dmi_addrlen); 
++	best_slave = bond_find_best_slave(bond);
++	if (best_slave != bond->curr_active_slave) {
++		bond_change_active_slave(bond, best_slave);
+ 	}
++}
+ 
++/*--------------------------- slave list handling ---------------------------*/
+ 
+-	/* save master's multicast list */ 
+-	bond_mc_list_destroy (bond);
+-	bond_mc_list_copy (master->mc_list, bond, GFP_ATOMIC);
++/*
++ * This function attaches the slave to the end of list.
++ *
++ * bond->lock held for writing by caller.
++ */
++static void bond_attach_slave(struct bonding *bond, struct slave *new_slave)
++{
++	if (bond->first_slave == NULL) { /* attaching the first slave */
++		new_slave->next = new_slave;
++		new_slave->prev = new_slave;
++		bond->first_slave = new_slave;
++	} else {
++		new_slave->next = bond->first_slave;
++		new_slave->prev = bond->first_slave->prev;
++		new_slave->next->prev = new_slave;
++		new_slave->prev->next = new_slave;
++	}
+ 
+-	write_unlock_bh(&bond->lock);
++	bond->slave_cnt++;
+ }
+ 
+ /*
+- * Update the mc list and multicast-related flags for the new and 
+- * old active slaves (if any) according to the multicast mode, and
+- * promiscuous flags unconditionally.
++ * This function detaches the slave from the list.
++ * WARNING: no check is made to verify if the slave effectively
++ * belongs to <bond>.
++ * Nothing is freed on return, structures are just unchained.
++ * If any slave pointer in bond was pointing to <slave>,
++ * it should be changed by the calling function.
++ *
++ * bond->lock held for writing by caller.
+  */
+-static void bond_mc_update(bonding_t *bond, slave_t *new, slave_t *old)
++static void bond_detach_slave(struct bonding *bond, struct slave *slave)
+ {
+-	struct dev_mc_list *dmi;
++	if (slave->next) {
++		slave->next->prev = slave->prev;
++	}
+ 
+-	if (USES_PRIMARY(bond_mode)) {
+-		if (bond->device->flags & IFF_PROMISC) {
+-			if (old)
+-				dev_set_promiscuity(old->dev, -1);
+-			if (new)
+-				dev_set_promiscuity(new->dev, 1);
+-		}
++	if (slave->prev) {
++		slave->prev->next = slave->next;
+ 	}
+ 
+-	switch(multicast_mode) {
+-	case BOND_MULTICAST_ACTIVE :		
+-		if (bond->device->flags & IFF_ALLMULTI) {
+-			if (old)
+-				dev_set_allmulti(old->dev, -1);
+-			if (new)
+-				dev_set_allmulti(new->dev, 1);
+-		}
+-		/* first remove all mc addresses from old slave if any,
+-		   and _then_ add them to new active slave */
+-		if (old) {
+-			for (dmi = bond->device->mc_list; dmi != NULL; dmi = dmi->next)
+-				dev_mc_delete(old->dev, dmi->dmi_addr, dmi->dmi_addrlen, 0);
+-		}
+-		if (new) {
+-			for (dmi = bond->device->mc_list; dmi != NULL; dmi = dmi->next)
+-				dev_mc_add(new->dev, dmi->dmi_addr, dmi->dmi_addrlen, 0);
++	if (bond->first_slave == slave) { /* slave is the first slave */
++		if (bond->slave_cnt > 1) { /* there are more slave */
++			bond->first_slave = slave->next;
++		} else {
++			bond->first_slave = NULL; /* slave was the last one */
+ 		}
+-		break;
+-	case BOND_MULTICAST_ALL :
+-		/* nothing to do: mc list is already up-to-date on all slaves */
+-		break;
+-	case BOND_MULTICAST_DISABLED :
+-		break;
+ 	}
++
++	slave->next = NULL;
++	slave->prev = NULL;
++	bond->slave_cnt--;
++}
++
++/*---------------------------------- IOCTL ----------------------------------*/
++
++static int bond_sethwaddr(struct net_device *bond_dev, struct net_device *slave_dev)
++{
++	dprintk("bond_dev=%p\n", bond_dev);
++	dprintk("slave_dev=%p\n", slave_dev);
++	dprintk("slave_dev->addr_len=%d\n", slave_dev->addr_len);
++	memcpy(bond_dev->dev_addr, slave_dev->dev_addr, slave_dev->addr_len);
++	return 0;
+ }
+ 
+ /* enslave device <slave> to bond device <master> */
+-static int bond_enslave(struct net_device *master_dev, 
+-                        struct net_device *slave_dev)
++static int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev)
+ {
+-	bonding_t *bond = NULL;
+-	slave_t *new_slave = NULL;
+-	unsigned long rflags = 0;
+-	int err = 0;
++	struct bonding *bond = bond_dev->priv;
++	struct slave *new_slave = NULL;
+ 	struct dev_mc_list *dmi;
+-	struct in_ifaddr **ifap;
+-	struct in_ifaddr *ifa;
+-	int link_reporting;
+ 	struct sockaddr addr;
+-
+-	if (master_dev == NULL || slave_dev == NULL) {
+-		return -ENODEV;
+-	}
+-	bond = (struct bonding *) master_dev->priv;
++	int link_reporting;
++	int res = 0;
+ 
+ 	if (slave_dev->do_ioctl == NULL) {
+-		printk(KERN_DEBUG
+-			"Warning : no link monitoring support for %s\n",
+-			slave_dev->name);
++		printk(KERN_WARNING DRV_NAME
++		       ": Warning : no link monitoring support for %s\n",
++		       slave_dev->name);
+ 	}
+ 
+-
+ 	/* bond must be initialized by bond_open() before enslaving */
+-	if (!(master_dev->flags & IFF_UP)) {
+-#ifdef BONDING_DEBUG
+-		printk(KERN_CRIT "Error, master_dev is not up\n");
+-#endif
++	if (!(bond_dev->flags & IFF_UP)) {
++		dprintk("Error, master_dev is not up\n");
+ 		return -EPERM;
+ 	}
+ 
+ 	/* already enslaved */
+-	if (master_dev->flags & IFF_SLAVE || slave_dev->flags & IFF_SLAVE) {
+-#ifdef BONDING_DEBUG
+-		printk(KERN_CRIT "Error, Device was already enslaved\n");
+-#endif
++	if (slave_dev->flags & IFF_SLAVE) {
++		dprintk("Error, Device was already enslaved\n");
+ 		return -EBUSY;
+ 	}
+ 
+@@ -1376,19 +1203,19 @@ static int bond_enslave(struct net_devic
+ 		 * slave interface to be closed.
+ 		 */
+ 		if ((slave_dev->flags & IFF_UP)) {
+-#ifdef BONDING_DEBUG
+-			printk(KERN_CRIT "Error, slave_dev is up\n");
+-#endif
++			printk(KERN_ERR DRV_NAME
++			       ": Error: %s is up\n",
++			       slave_dev->name);
+ 			return -EPERM;
+ 		}
+ 
+ 		if (slave_dev->set_mac_address == NULL) {
+-			printk(KERN_CRIT
+-			       "The slave device you specified does not support"
+-			       " setting the MAC address.\n");
+-			printk(KERN_CRIT
+-			       "Your kernel likely does not support slave"
+-			       " devices.\n");
++			printk(KERN_ERR DRV_NAME
++			       ": Error: The slave device you specified does "
++			       "not support setting the MAC address.\n");
++			printk(KERN_ERR
++			       "Your kernel likely does not support slave "
++			       "devices.\n");
+ 
+ 			return -EOPNOTSUPP;
+ 		}
+@@ -1397,26 +1224,29 @@ static int bond_enslave(struct net_devic
+ 		 * slave interface to be open.
+ 		 */
+ 		if (!(slave_dev->flags & IFF_UP)) {
+-#ifdef BONDING_DEBUG
+-			printk(KERN_CRIT "Error, slave_dev is not running\n");
+-#endif
++			printk(KERN_ERR DRV_NAME
++			       ": Error: %s is not running\n",
++			       slave_dev->name);
+ 			return -EINVAL;
+ 		}
+ 
+ 		if ((bond_mode == BOND_MODE_8023AD) ||
+-		    (bond_mode == BOND_MODE_TLB) ||
++		    (bond_mode == BOND_MODE_TLB)    ||
+ 		    (bond_mode == BOND_MODE_ALB)) {
+-			printk(KERN_ERR
+-			       "bonding: Error: to use %s mode, you must "
+-			       "upgrade ifenslave.\n", bond_mode_name());
++			printk(KERN_ERR DRV_NAME
++			       ": Error: to use %s mode, you must upgrade "
++			       "ifenslave.\n",
++			       bond_mode_name());
+ 			return -EOPNOTSUPP;
+ 		}
+ 	}
+ 
+-	if ((new_slave = kmalloc(sizeof(slave_t), GFP_KERNEL)) == NULL) {
++	new_slave = kmalloc(sizeof(struct slave), GFP_KERNEL);
++	if (!new_slave) {
+ 		return -ENOMEM;
+ 	}
+-	memset(new_slave, 0, sizeof(slave_t));
++
++	memset(new_slave, 0, sizeof(struct slave));
+ 
+ 	/* save slave's original flags before calling
+ 	 * netdev_set_master and dev_open
+@@ -1430,37 +1260,29 @@ static int bond_enslave(struct net_devic
+ 		 */
+ 		memcpy(new_slave->perm_hwaddr, slave_dev->dev_addr, ETH_ALEN);
+ 
+-		if (bond->slave_cnt > 0) {
+-			/* set slave to master's mac address
+-			 * The application already set the master's
+-			 * mac address to that of the first slave
+-			 */
+-			memcpy(addr.sa_data, master_dev->dev_addr, master_dev->addr_len);
+-			addr.sa_family = slave_dev->type;
+-			err = slave_dev->set_mac_address(slave_dev, &addr);
+-			if (err) {
+-#ifdef BONDING_DEBUG
+-				printk(KERN_CRIT "Error %d calling set_mac_address\n", err);
+-#endif
+-				goto err_free;
+-			}
++		/* set slave to master's mac address
++		 * The application already set the master's
++		 * mac address to that of the first slave
++		 */
++		memcpy(addr.sa_data, bond_dev->dev_addr, bond_dev->addr_len);
++		addr.sa_family = slave_dev->type;
++		res = slave_dev->set_mac_address(slave_dev, &addr);
++		if (res) {
++			dprintk("Error %d calling set_mac_address\n", res);
++			goto err_free;
+ 		}
+ 
+ 		/* open the slave since the application closed it */
+-		err = dev_open(slave_dev);
+-		if (err) {
+-#ifdef BONDING_DEBUG
+-			printk(KERN_CRIT "Openning slave %s failed\n", slave_dev->name);
+-#endif
++		res = dev_open(slave_dev);
++		if (res) {
++			dprintk("Openning slave %s failed\n", slave_dev->name);
+ 			goto err_restore_mac;
+ 		}
+ 	}
+ 
+-	err = netdev_set_master(slave_dev, master_dev);
+-	if (err) {
+-#ifdef BONDING_DEBUG
+-		printk(KERN_CRIT "Error %d calling netdev_set_master\n", err);
+-#endif
++	res = netdev_set_master(slave_dev, bond_dev);
++	if (res) {
++		dprintk("Error %d calling netdev_set_master\n", res);
+ 		if (app_abi_ver < 1) {
+ 			goto err_free;
+ 		} else {
+@@ -1475,32 +1297,32 @@ static int bond_enslave(struct net_devic
+ 		/* bond_alb_init_slave() must be called before all other stages since
+ 		 * it might fail and we do not want to have to undo everything
+ 		 */
+-		err = bond_alb_init_slave(bond, new_slave);
+-		if (err) {
++		res = bond_alb_init_slave(bond, new_slave);
++		if (res) {
+ 			goto err_unset_master;
+ 		}
+ 	}
+ 
+-	/* set promiscuity level to new slave */ 
+-	if (master_dev->flags & IFF_PROMISC) {
+-		/* If the mode USES_PRIMARY, then the new slave gets the
+-		 * master's promisc (and mc) settings only if it becomes the
+-		 * current_slave, and that is taken care of later when calling
+-		 * bond_change_active()
+-		 */
+-		if (!USES_PRIMARY(bond_mode)) {
+-			dev_set_promiscuity(slave_dev, 1); 
++	/* If the mode USES_PRIMARY, then the new slave gets the
++	 * master's promisc (and mc) settings only if it becomes the
++	 * curr_active_slave, and that is taken care of later when calling
++	 * bond_change_active()
++	 */
++	if (!USES_PRIMARY(bond_mode)) {
++		/* set promiscuity level to new slave */
++		if (bond_dev->flags & IFF_PROMISC) {
++			dev_set_promiscuity(slave_dev, 1);
+ 		}
+-	}
+- 
+-	if (multicast_mode == BOND_MULTICAST_ALL) {
++
+ 		/* set allmulti level to new slave */
+-		if (master_dev->flags & IFF_ALLMULTI) 
+-			dev_set_allmulti(slave_dev, 1); 
+-		
+-		/* upload master's mc_list to new slave */ 
+-		for (dmi = master_dev->mc_list; dmi != NULL; dmi = dmi->next) 
++		if (bond_dev->flags & IFF_ALLMULTI) {
++			dev_set_allmulti(slave_dev, 1);
++		}
++
++		/* upload master's mc_list to new slave */
++		for (dmi = bond_dev->mc_list; dmi; dmi = dmi->next) {
+ 			dev_mc_add (slave_dev, dmi->dmi_addr, dmi->dmi_addrlen, 0);
++		}
+ 	}
+ 
+ 	if (bond_mode == BOND_MODE_8023AD) {
+@@ -1511,15 +1333,16 @@ static int bond_enslave(struct net_devic
+ 	}
+ 
+ 	write_lock_bh(&bond->lock);
+-	
++
+ 	bond_attach_slave(bond, new_slave);
++
+ 	new_slave->delay = 0;
+ 	new_slave->link_failure_count = 0;
+ 
+-	if (miimon > 0 && !use_carrier) {
++	if (miimon && !use_carrier) {
+ 		link_reporting = bond_check_dev_link(slave_dev, 1);
+ 
+-		if ((link_reporting == -1) && (arp_interval == 0)) {
++		if ((link_reporting == -1) && !arp_interval) {
+ 			/*
+ 			 * miimon is set but a bonded network driver
+ 			 * does not support ETHTOOL/MII and
+@@ -1528,115 +1351,97 @@ static int bond_enslave(struct net_devic
+ 			 * here (because netif_carrier is always
+ 			 * supported); thus, we don't need to change
+ 			 * the messages for netif_carrier.
+-			 */ 
+-			printk(KERN_ERR
+-				"bond_enslave(): MII and ETHTOOL support not "
+-				"available for interface %s, and "
+-				"arp_interval/arp_ip_target module parameters "
+-		       		"not specified, thus bonding will not detect "
+-				"link failures! see bonding.txt for details.\n",
+-		       		slave_dev->name);
++			 */
++			printk(KERN_WARNING DRV_NAME
++			       ": Warning: MII and ETHTOOL support not "
++			       "available for interface %s, and "
++			       "arp_interval/arp_ip_target module parameters "
++			       "not specified, thus bonding will not detect "
++			       "link failures! see bonding.txt for details.\n",
++			       slave_dev->name);
+ 		} else if (link_reporting == -1) {
+-			/* unable  get link status using mii/ethtool */
+-			printk(KERN_WARNING 
+-			       "bond_enslave: can't get link status from "
++			/* unable get link status using mii/ethtool */
++			printk(KERN_WARNING DRV_NAME
++			       ": Warning: can't get link status from "
+ 			       "interface %s; the network driver associated "
+-			       "with this interface does not support "
+-			       "MII or ETHTOOL link status reporting, thus "
+-			       "miimon has no effect on this interface.\n", 
++			       "with this interface does not support MII or "
++			       "ETHTOOL link status reporting, thus miimon "
++			       "has no effect on this interface.\n",
+ 			       slave_dev->name);
+ 		}
+ 	}
+ 
+ 	/* check for initial state */
+-	if ((miimon <= 0) ||
++	if (!miimon ||
+ 	    (bond_check_dev_link(slave_dev, 0) == BMSR_LSTATUS)) {
+ 		if (updelay) {
+-#ifdef BONDING_DEBUG
+-			printk(KERN_CRIT "Initial state of slave_dev is "
+-			       "BOND_LINK_BACK\n");
+-#endif
++			dprintk("Initial state of slave_dev is "
++				"BOND_LINK_BACK\n");
+ 			new_slave->link  = BOND_LINK_BACK;
+ 			new_slave->delay = updelay;
+-		}
+-		else {
+-#ifdef BONDING_DEBUG
+-			printk(KERN_DEBUG "Initial state of slave_dev is "
++		} else {
++			dprintk("Initial state of slave_dev is "
+ 				"BOND_LINK_UP\n");
+-#endif
+ 			new_slave->link  = BOND_LINK_UP;
+ 		}
+ 		new_slave->jiffies = jiffies;
+-	}
+-	else {
+-#ifdef BONDING_DEBUG
+-		printk(KERN_CRIT "Initial state of slave_dev is "
++	} else {
++		dprintk("Initial state of slave_dev is "
+ 			"BOND_LINK_DOWN\n");
+-#endif
+ 		new_slave->link  = BOND_LINK_DOWN;
+ 	}
+ 
+ 	if (bond_update_speed_duplex(new_slave) &&
+ 	    (new_slave->link != BOND_LINK_DOWN)) {
+-
+-		printk(KERN_WARNING
+-		       "bond_enslave(): failed to get speed/duplex from %s, "
+-		       "speed forced to 100Mbps, duplex forced to Full.\n",
++		printk(KERN_WARNING DRV_NAME
++		       ": Warning: failed to get speed/duplex from %s, speed "
++		       "forced to 100Mbps, duplex forced to Full.\n",
+ 		       new_slave->dev->name);
++
+ 		if (bond_mode == BOND_MODE_8023AD) {
+ 			printk(KERN_WARNING
+-			       "Operation of 802.3ad mode requires ETHTOOL support "
+-			       "in base driver for proper aggregator selection.\n");
++			       "Operation of 802.3ad mode requires ETHTOOL "
++			       "support in base driver for proper aggregator "
++			       "selection.\n");
+ 		}
+ 	}
+ 
+-	/* if we're in active-backup mode, we need one and only one active
+-	 * interface. The backup interfaces will have their NOARP flag set
+-	 * because we need them to be completely deaf and not to respond to
+-	 * any ARP request on the network to avoid fooling a switch. Thus,
+-	 * since we guarantee that current_slave always point to the last
+-	 * usable interface, we just have to verify this interface's flag.
+-	 */
+-	if (bond_mode == BOND_MODE_ACTIVEBACKUP) {
+-		if (((bond->current_slave == NULL)
+-			|| (bond->current_slave->dev->flags & IFF_NOARP))
+-			&& (new_slave->link != BOND_LINK_DOWN)) {
+-#ifdef BONDING_DEBUG
+-			printk(KERN_CRIT "This is the first active slave\n");
+-#endif
++	if (USES_PRIMARY(bond_mode) && primary) {
++		/* if there is a primary slave, remember it */
++		if (strcmp(primary, new_slave->dev->name) == 0) {
++			bond->primary_slave = new_slave;
++		}
++	}
++
++	switch (bond_mode) {
++	case BOND_MODE_ACTIVEBACKUP:
++		/* if we're in active-backup mode, we need one and only one active
++		 * interface. The backup interfaces will have their NOARP flag set
++		 * because we need them to be completely deaf and not to respond to
++		 * any ARP request on the network to avoid fooling a switch. Thus,
++		 * since we guarantee that curr_active_slave always point to the last
++		 * usable interface, we just have to verify this interface's flag.
++		 */
++		if (((!bond->curr_active_slave) ||
++		     (bond->curr_active_slave->dev->flags & IFF_NOARP)) &&
++		    (new_slave->link != BOND_LINK_DOWN)) {
++			dprintk("This is the first active slave\n");
+ 			/* first slave or no active slave yet, and this link
+ 			   is OK, so make this interface the active one */
+-			change_active_interface(bond, new_slave);
+-		}
+-		else {
+-#ifdef BONDING_DEBUG
+-			printk(KERN_CRIT "This is just a backup slave\n");
+-#endif
++			bond_change_active_slave(bond, new_slave);
++		} else {
++			dprintk("This is just a backup slave\n");
+ 			bond_set_slave_inactive_flags(new_slave);
+ 		}
+-		if (((struct in_device *)slave_dev->ip_ptr) != NULL) {
+-			read_lock_irqsave(&(((struct in_device *)slave_dev->ip_ptr)->lock), rflags);
+-			ifap= &(((struct in_device *)slave_dev->ip_ptr)->ifa_list);
+-			ifa = *ifap;
+-			if (ifa != NULL)
+-				my_ip = ifa->ifa_address;
+-			read_unlock_irqrestore(&(((struct in_device *)slave_dev->ip_ptr)->lock), rflags);
+-		}
+-
+-		/* if there is a primary slave, remember it */
+-		if (primary != NULL) {
+-			if (strcmp(primary, new_slave->dev->name) == 0) {
+-				bond->primary_slave = new_slave;
+-			}
+-		}
+-	} else if (bond_mode == BOND_MODE_8023AD) {
++		break;
++	case BOND_MODE_8023AD:
+ 		/* in 802.3ad mode, the internal mechanism
+ 		 * will activate the slaves in the selected
+ 		 * aggregator
+ 		 */
+ 		bond_set_slave_inactive_flags(new_slave);
+ 		/* if this is the first slave */
+-		if (new_slave == bond->next) {
++		if (bond->slave_cnt == 1) {
+ 			SLAVE_AD_INFO(new_slave).id = 1;
+ 			/* Initialize AD with the number of times that the AD timer is called in 1 second
+ 			 * can be called only after the mac address of the bond is set
+@@ -1645,40 +1450,37 @@ static int bond_enslave(struct net_devic
+ 					    lacp_fast);
+ 		} else {
+ 			SLAVE_AD_INFO(new_slave).id =
+-			SLAVE_AD_INFO(new_slave->prev).id + 1;
++				SLAVE_AD_INFO(new_slave->prev).id + 1;
+ 		}
+ 
+ 		bond_3ad_bind_slave(new_slave);
+-	} else if ((bond_mode == BOND_MODE_TLB) ||
+-		   (bond_mode == BOND_MODE_ALB)) {
++		break;
++	case BOND_MODE_TLB:
++	case BOND_MODE_ALB:
+ 		new_slave->state = BOND_STATE_ACTIVE;
+-		if ((bond->current_slave == NULL) && (new_slave->link != BOND_LINK_DOWN)) {
++		if ((!bond->curr_active_slave) &&
++		    (new_slave->link != BOND_LINK_DOWN)) {
+ 			/* first slave or no active slave yet, and this link
+ 			 * is OK, so make this interface the active one
+ 			 */
+-			change_active_interface(bond, new_slave);
++			bond_change_active_slave(bond, new_slave);
+ 		}
++		break;
++	default:
++		dprintk("This slave is always active in trunk mode\n");
+ 
+-		/* if there is a primary slave, remember it */
+-		if (primary != NULL) {
+-			if (strcmp(primary, new_slave->dev->name) == 0) {
+-				bond->primary_slave = new_slave;
+-			}
+-		}
+-	} else {
+-#ifdef BONDING_DEBUG
+-		printk(KERN_CRIT "This slave is always active in trunk mode\n");
+-#endif
+ 		/* always active in trunk mode */
+ 		new_slave->state = BOND_STATE_ACTIVE;
+ 
+-		/* In trunking mode there is little meaning to current_slave
++		/* In trunking mode there is little meaning to curr_active_slave
+ 		 * anyway (it holds no special properties of the bond device),
+ 		 * so we can change it without calling change_active_interface()
+ 		 */
+-		if (bond->current_slave == NULL) 
+-			bond->current_slave = new_slave;
+-	}
++		if (!bond->curr_active_slave) {
++			bond->curr_active_slave = new_slave;
++		}
++		break;
++	} /* switch(bond_mode) */
+ 
+ 	write_unlock_bh(&bond->lock);
+ 
+@@ -1692,38 +1494,34 @@ static int bond_enslave(struct net_devic
+ 		 */
+ 		int ndx = 0;
+ 
+-		for (ndx = 0; ndx < slave_dev->addr_len; ndx++) {
+-#ifdef BONDING_DEBUG
+-			printk(KERN_DEBUG
+-			       "Checking ndx=%d of master_dev->dev_addr\n", ndx);
+-#endif
+-			if (master_dev->dev_addr[ndx] != 0) {
+-#ifdef BONDING_DEBUG
+-				printk(KERN_DEBUG
+-				       "Found non-zero byte at ndx=%d\n", ndx);
+-#endif
++		for (ndx = 0; ndx < bond_dev->addr_len; ndx++) {
++			dprintk("Checking ndx=%d of bond_dev->dev_addr\n",
++				ndx);
++			if (bond_dev->dev_addr[ndx] != 0) {
++				dprintk("Found non-zero byte at ndx=%d\n",
++					ndx);
+ 				break;
+ 			}
+ 		}
+-		if (ndx == slave_dev->addr_len) {
++
++		if (ndx == bond_dev->addr_len) {
+ 			/*
+ 			 * We got all the way through the address and it was
+ 			 * all 0's.
+ 			 */
+-#ifdef BONDING_DEBUG
+-			printk(KERN_DEBUG "%s doesn't have a MAC address yet.  ",
+-			       master_dev->name);
+-			printk(KERN_DEBUG "Going to give assign it from %s.\n",
+-			       slave_dev->name);
+-#endif
+-			bond_sethwaddr(master_dev, slave_dev);
++			dprintk("%s doesn't have a MAC address yet.  \n",
++				bond_dev->name);
++			dprintk("Going to give assign it from %s.\n",
++				slave_dev->name);
++			bond_sethwaddr(bond_dev, slave_dev);
+ 		}
+ 	}
+ 
+-	printk (KERN_INFO "%s: enslaving %s as a%s interface with a%s link.\n",
+-		master_dev->name, slave_dev->name,
+-		new_slave->state == BOND_STATE_ACTIVE ? "n active" : " backup",
+-		new_slave->link != BOND_LINK_DOWN ? "n up" : " down");
++	printk(KERN_INFO DRV_NAME
++	       ": %s: enslaving %s as a%s interface with a%s link.\n",
++	       bond_dev->name, slave_dev->name,
++	       new_slave->state == BOND_STATE_ACTIVE ? "n active" : " backup",
++	       new_slave->link != BOND_LINK_DOWN ? "n up" : " down");
+ 
+ 	/* enslave is successful */
+ 	return 0;
+@@ -1742,435 +1540,204 @@ err_restore_mac:
+ 
+ err_free:
+ 	kfree(new_slave);
+-	return err;
++	return res;
+ }
+ 
+-/* 
+- * This function changes the active slave to slave <slave_dev>.
+- * It returns -EINVAL in the following cases.
+- *  - <slave_dev> is not found in the list.
+- *  - There is not active slave now.
+- *  - <slave_dev> is already active.
+- *  - The link state of <slave_dev> is not BOND_LINK_UP.
+- *  - <slave_dev> is not running.
+- * In these cases, this fuction does nothing.
+- * In the other cases, currnt_slave pointer is changed and 0 is returned.
++/*
++ * Try to release the slave device <slave> from the bond device <master>
++ * It is legal to access curr_active_slave without a lock because all the function
++ * is write-locked.
++ *
++ * The rules for slave state should be:
++ *   for Active/Backup:
++ *     Active stays on all backups go down
++ *   for Bonded connections:
++ *     The first up interface should be left on and all others downed.
+  */
+-static int bond_change_active(struct net_device *master_dev, struct net_device *slave_dev)
++static int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
+ {
+-	bonding_t *bond;
+-	slave_t *slave;
+-	slave_t *oldactive = NULL;
+-	slave_t *newactive = NULL;
+-	int ret = 0;
+-
+-	if (master_dev == NULL || slave_dev == NULL) {
+-		return -ENODEV;
+-	}
++	struct bonding *bond = bond_dev->priv;
++	struct slave *slave;
++	struct sockaddr addr;
++	int mac_addr_differ;
+ 
+-	/* Verify that master_dev is indeed the master of slave_dev */
++	/* slave is not a slave or master is not master of this slave */
+ 	if (!(slave_dev->flags & IFF_SLAVE) ||
+-	    (slave_dev->master != master_dev)) {
+-
++	    (slave_dev->master != bond_dev)) {
++		printk(KERN_ERR DRV_NAME
++		       ": Error: %s: cannot release %s.\n",
++		       bond_dev->name, slave_dev->name);
+ 		return -EINVAL;
+ 	}
+ 
+-	bond = (struct bonding *) master_dev->priv;
+ 	write_lock_bh(&bond->lock);
+-	slave = (slave_t *)bond;
+-	oldactive = bond->current_slave;
+-
+-	while ((slave = slave->prev) != (slave_t *)bond) {
+-		if(slave_dev == slave->dev) {
+-			newactive = slave;
+-			break;
+-		}
+-	}
+-
+-	/*
+-	 * Changing to the current active: do nothing; return success.
+-	 */
+-	if (newactive && (newactive == oldactive)) {
+-		write_unlock_bh(&bond->lock);
+-		return 0;
+-	}
+-
+-	if ((newactive != NULL)&&
+-	    (oldactive != NULL)&&
+-	    (newactive->link == BOND_LINK_UP)&&
+-	    IS_UP(newactive->dev)) {
+-		change_active_interface(bond, newactive);
+-	} else {
+-		ret = -EINVAL;
+-	}
+-	write_unlock_bh(&bond->lock);
+-	return ret;
+-}
+ 
+-/**
+- * find_best_interface - select the best available slave to be the active one
+- * @bond: our bonding struct
+- *
+- * Warning: Caller must hold ptrlock for writing.
+- */
+-static struct slave *find_best_interface(struct bonding *bond)
+-{
+-	struct slave *newslave, *oldslave;
+-	struct slave *bestslave = NULL;
+-	int mintime;
+-
+-	newslave = oldslave = bond->current_slave;
+-
+-	if (newslave == NULL) { /* there were no active slaves left */
+-		if (bond->next != (slave_t *)bond) {  /* found one slave */
+-			newslave = bond->next;
+-		} else {
+-			return NULL; /* still no slave, return NULL */
+-		}
++	slave = bond_get_slave_by_dev(bond, slave_dev);
++	if (!slave) {
++		/* not a slave of this bond */
++		printk(KERN_INFO DRV_NAME
++		       ": %s: %s not enslaved\n",
++		       bond_dev->name, slave_dev->name);
++		return -EINVAL;
+ 	}
+ 
+-	mintime = updelay;
+-
+-	/* first try the primary link; if arping, a link must tx/rx traffic 
+-	 * before it can be considered the current_slave - also, we would skip 
+-	 * slaves between the current_slave and primary_slave that may be up 
+-	 * and able to arp
+-	 */
+-	if ((bond->primary_slave != NULL) && (arp_interval == 0)) {
+-		if (IS_UP(bond->primary_slave->dev)) 
+-			newslave = bond->primary_slave;
++	mac_addr_differ = memcmp(bond_dev->dev_addr,
++				 slave->perm_hwaddr,
++				 ETH_ALEN);
++	if (!mac_addr_differ && (bond->slave_cnt > 1)) {
++		printk(KERN_WARNING DRV_NAME
++		       ": Warning: the permanent HWaddr of %s "
++		       "- %02X:%02X:%02X:%02X:%02X:%02X - is "
++		       "still in use by %s. Set the HWaddr of "
++		       "%s to a different address to avoid "
++		       "conflicts.\n",
++		       slave_dev->name,
++		       slave->perm_hwaddr[0],
++		       slave->perm_hwaddr[1],
++		       slave->perm_hwaddr[2],
++		       slave->perm_hwaddr[3],
++		       slave->perm_hwaddr[4],
++		       slave->perm_hwaddr[5],
++		       bond_dev->name,
++		       slave_dev->name);
+ 	}
+ 
+-	/* remember where to stop iterating over the slaves */
+-	oldslave = newslave;
+-
+-	do {
+-		if (IS_UP(newslave->dev)) {
+-			if (newslave->link == BOND_LINK_UP) {
+-				return newslave;
+-			}
+-			else if (newslave->link == BOND_LINK_BACK) {
+-				/* link up, but waiting for stabilization */
+-				if (newslave->delay < mintime) {
+-					mintime = newslave->delay;
+-					bestslave = newslave;
+-				}
+-			}
+-		}
+-	} while ((newslave = newslave->next) != oldslave);
+-
+-	return bestslave;
+-}
+-
+-/**
+- * change_active_interface - change the active slave into the specified one
+- * @bond: our bonding struct
+- * @new: the new slave to make the active one
+- * 
+- * Set the new slave to the bond's settings and unset them on the old
+- * current_slave.
+- * Setting include flags, mc-list, promiscuity, allmulti, etc.
+- *
+- * If @new's link state is %BOND_LINK_BACK we'll set it to %BOND_LINK_UP,
+- * because it is apparently the best available slave we have, even though its
+- * updelay hasn't timed out yet.
+- *
+- * Warning: Caller must hold ptrlock for writing.
+- */
+-static void change_active_interface(struct bonding *bond, struct slave *new)
+-{
+-	struct slave *old = bond->current_slave;
+-
+-	if (old == new) {
+-		return;
++	/* Inform AD package of unbinding of slave. */
++	if (bond_mode == BOND_MODE_8023AD) {
++		/* must be called before the slave is
++		 * detached from the list
++		 */
++		bond_3ad_unbind_slave(slave);
+ 	}
+ 
+-	if (new) {
+-		if (new->link == BOND_LINK_BACK) {
+-			if (USES_PRIMARY(bond_mode)) {
+-				printk (KERN_INFO
+-					"%s: making interface %s the new "
+-					"active one %d ms earlier.\n",
+-					bond->device->name, new->dev->name,
+-					(updelay - new->delay) * miimon);
+-			}
++	printk(KERN_INFO DRV_NAME
++	       ": %s: releasing %s interface %s\n",
++	       bond_dev->name,
++	       (slave->state == BOND_STATE_ACTIVE)
++	       ? "active" : "backup",
++	       slave_dev->name);
+ 
+-			new->delay = 0;
+-			new->link = BOND_LINK_UP;
+-			new->jiffies = jiffies;
++	bond->current_arp_slave = NULL;
+ 
+-			if (bond_mode == BOND_MODE_8023AD) {
+-				bond_3ad_handle_link_change(new, BOND_LINK_UP);
+-			}
++	/* release the slave from its bond */
++	bond_detach_slave(bond, slave);
+ 
+-			if ((bond_mode == BOND_MODE_TLB) ||
+-			    (bond_mode == BOND_MODE_ALB)) {
+-				bond_alb_handle_link_change(bond, new, BOND_LINK_UP);
+-			}
+-		} else {
+-			if (USES_PRIMARY(bond_mode)) {
+-				printk (KERN_INFO
+-					"%s: making interface %s the new active one.\n",
+-					bond->device->name, new->dev->name);
+-			}
+-		}
++	if (bond->primary_slave == slave) {
++		bond->primary_slave = NULL;
+ 	}
+ 
+-	if (bond_mode == BOND_MODE_ACTIVEBACKUP) {
+-		if (old) {
+-			bond_set_slave_inactive_flags(old);
+-		}
+-
+-		if (new) {
+-			bond_set_slave_active_flags(new);
+-		}
++	if (bond->curr_active_slave == slave) {
++		bond_change_active_slave(bond, NULL);
++		bond_select_active_slave(bond);
+ 	}
+ 
+-	if (USES_PRIMARY(bond_mode)) {
+-		bond_mc_update(bond, new, old);
++	if (!bond->curr_active_slave) {
++		printk(KERN_INFO DRV_NAME
++		       ": %s: now running without any active "
++		       "interface !\n",
++		       bond_dev->name);
+ 	}
+ 
+ 	if ((bond_mode == BOND_MODE_TLB) ||
+ 	    (bond_mode == BOND_MODE_ALB)) {
+-		bond_alb_assign_current_slave(bond, new);
+-	} else {
+-		bond->current_slave = new;
+-	}
+-}
+-
+-/**
+- * reselect_active_interface - select a new active slave, if needed
+- * @bond: our bonding struct
+- *
+- * This functions shoud be called when one of the following occurs:
+- * - The old current_slave has been released or lost its link.
+- * - The primary_slave has got its link back.
+- * - A slave has got its link back and there's no old current_slave.
+- *
+- * Warning: Caller must hold ptrlock for writing.
+- */
+-static void reselect_active_interface(struct bonding *bond)
+-{
+-	struct slave *best_slave;
+-
+-	best_slave = find_best_interface(bond);
+-
+-	if (best_slave != bond->current_slave) {
+-		change_active_interface(bond, best_slave);
+-	}
+-}
+-
+-/*
+- * Try to release the slave device <slave> from the bond device <master>
+- * It is legal to access current_slave without a lock because all the function
+- * is write-locked.
+- *
+- * The rules for slave state should be:
+- *   for Active/Backup:
+- *     Active stays on all backups go down
+- *   for Bonded connections:
+- *     The first up interface should be left on and all others downed.
+- */
+-static int bond_release(struct net_device *master, struct net_device *slave)
+-{
+-	bonding_t *bond;
+-	slave_t *our_slave, *old_current;
+-	struct sockaddr addr;
+-	
+-	if (master == NULL || slave == NULL)  {
+-		return -ENODEV;
+-	}
+-
+-	bond = (struct bonding *) master->priv;
+-
+-	/* master already enslaved, or slave not enslaved,
+-	   or no slave for this master */
+-	if ((master->flags & IFF_SLAVE) || !(slave->flags & IFF_SLAVE)) {
+-		printk (KERN_DEBUG "%s: cannot release %s.\n", master->name, slave->name);
+-		return -EINVAL;
++		/* must be called only after the slave has been
++		 * detached from the list and the curr_active_slave
++		 * has been replaced (if our_slave == old_current)
++		 */
++		bond_alb_deinit_slave(bond, slave);
+ 	}
+ 
+-	write_lock_bh(&bond->lock);
+-	bond->current_arp_slave = NULL;
+-	our_slave = (slave_t *)bond;
+-	old_current = bond->current_slave;
+-	while ((our_slave = our_slave->prev) != (slave_t *)bond) {
+-		if (our_slave->dev == slave) {
+-			int mac_addr_differ = memcmp(bond->device->dev_addr,
+-						 our_slave->perm_hwaddr,
+-						 ETH_ALEN);
+-			if (!mac_addr_differ && (bond->slave_cnt > 1)) {
+-				printk(KERN_WARNING "WARNING: the permanent HWaddr of %s "
+-				"- %02X:%02X:%02X:%02X:%02X:%02X - "
+-				"is still in use by %s. Set the HWaddr "
+-				"of %s to a different address "
+-				"to avoid conflicts.\n",
+-				       slave->name,
+-				       our_slave->perm_hwaddr[0],
+-				       our_slave->perm_hwaddr[1],
+-				       our_slave->perm_hwaddr[2],
+-				       our_slave->perm_hwaddr[3],
+-				       our_slave->perm_hwaddr[4],
+-				       our_slave->perm_hwaddr[5],
+-				       bond->device->name,
+-				       slave->name);
+-			}
+-
+-			/* Inform AD package of unbinding of slave. */
+-			if (bond_mode == BOND_MODE_8023AD) {
+-				/* must be called before the slave is
+-				 * detached from the list
+-				 */
+-				bond_3ad_unbind_slave(our_slave);
+-			}
+-
+-			printk (KERN_INFO "%s: releasing %s interface %s\n",
+-				master->name,
+-				(our_slave->state == BOND_STATE_ACTIVE) ? "active" : "backup",
+-				slave->name);
+-
+-			/* release the slave from its bond */
+-			bond_detach_slave(bond, our_slave);
+-
+-			if (bond->primary_slave == our_slave) {
+-				bond->primary_slave = NULL;
+-			}
+-
+-			if (bond->current_slave == our_slave) {
+-				change_active_interface(bond, NULL);
+-				reselect_active_interface(bond);
+-			}
+-
+-			if (bond->current_slave == NULL) {
+-				printk(KERN_INFO
+-					"%s: now running without any active interface !\n",
+-					master->name);
+-			}
+-
+-			if ((bond_mode == BOND_MODE_TLB) ||
+-			    (bond_mode == BOND_MODE_ALB)) {
+-				/* must be called only after the slave has been
+-				 * detached from the list and the current_slave
+-				 * has been replaced (if our_slave == old_current)
+-				 */
+-				bond_alb_deinit_slave(bond, our_slave);
+-			}
+-
+-			break;
+-		}
+-
+-	}
+ 	write_unlock_bh(&bond->lock);
+-	
+-	if (our_slave == (slave_t *)bond) {
+-		/* if we get here, it's because the device was not found */
+-		printk (KERN_INFO "%s: %s not enslaved\n", master->name, slave->name);
+-		return -EINVAL;
+-	}
+ 
+-	/* unset promiscuity level from slave */
+-	if (master->flags & IFF_PROMISC) {
+-		/* If the mode USES_PRIMARY, then we should only remove its
+-		 * promisc settings if it was the current_slave, but that was
+-		 * already taken care of above when we detached the slave
+-		 */
+-		if (!USES_PRIMARY(bond_mode)) {
+-			dev_set_promiscuity(slave, -1); 
++	/* If the mode USES_PRIMARY, then we should only remove its
++	 * promisc and mc settings if it was the curr_active_slave, but that was
++	 * already taken care of above when we detached the slave
++	 */
++	if (!USES_PRIMARY(bond_mode)) {
++		/* unset promiscuity level from slave */
++		if (bond_dev->flags & IFF_PROMISC) {
++			dev_set_promiscuity(slave_dev, -1);
+ 		}
+-	}
+ 
+-	/* undo settings and restore original values */
+-	if (multicast_mode == BOND_MULTICAST_ALL) {
+-		/* flush master's mc_list from slave */ 
+-		bond_mc_list_flush (slave, master); 
++		/* unset allmulti level from slave */
++		if (bond_dev->flags & IFF_ALLMULTI) {
++			dev_set_allmulti(slave_dev, -1);
++		}
+ 
+-		/* unset allmulti level from slave */ 
+-		if (master->flags & IFF_ALLMULTI)
+-			dev_set_allmulti(slave, -1); 
++		/* flush master's mc_list from slave */
++		bond_mc_list_flush(bond_dev, slave_dev);
+ 	}
+ 
+-	netdev_set_master(slave, NULL);
++	netdev_set_master(slave_dev, NULL);
+ 
+ 	/* close slave before restoring its mac address */
+-	dev_close(slave);
++	dev_close(slave_dev);
+ 
+ 	if (app_abi_ver >= 1) {
+ 		/* restore original ("permanent") mac address */
+-		memcpy(addr.sa_data, our_slave->perm_hwaddr, ETH_ALEN);
+-		addr.sa_family = slave->type;
+-		slave->set_mac_address(slave, &addr);
++		memcpy(addr.sa_data, slave->perm_hwaddr, ETH_ALEN);
++		addr.sa_family = slave_dev->type;
++		slave_dev->set_mac_address(slave_dev, &addr);
+ 	}
+ 
+ 	/* restore the original state of the
+ 	 * IFF_NOARP flag that might have been
+ 	 * set by bond_set_slave_inactive_flags()
+ 	 */
+-	if ((our_slave->original_flags & IFF_NOARP) == 0) {
+-		slave->flags &= ~IFF_NOARP;
++	if ((slave->original_flags & IFF_NOARP) == 0) {
++		slave_dev->flags &= ~IFF_NOARP;
+ 	}
+ 
+-	kfree(our_slave);
++	kfree(slave);
+ 
+ 	/* if the last slave was removed, zero the mac address
+ 	 * of the master so it will be set by the application
+ 	 * to the mac address of the first slave
+ 	 */
+-	if (bond->next == (slave_t*)bond) {
+-		memset(master->dev_addr, 0, master->addr_len);
++	if (bond->slave_cnt == 0) {
++		memset(bond_dev->dev_addr, 0, bond_dev->addr_len);
+ 	}
+ 
+ 	return 0;  /* deletion OK */
+ }
+ 
+-/* 
++/*
+  * This function releases all slaves.
+  */
+-static int bond_release_all(struct net_device *master)
++static int bond_release_all(struct net_device *bond_dev)
+ {
+-	bonding_t *bond;
+-	slave_t *our_slave, *old_current;
++	struct bonding *bond = bond_dev->priv;
++	struct slave *slave;
+ 	struct net_device *slave_dev;
+ 	struct sockaddr addr;
+-	int err = 0;
+-
+-	if (master == NULL)  {
+-		return -ENODEV;
+-	}
+-
+-	if (master->flags & IFF_SLAVE) {
+-		return -EINVAL;
+-	}
+-
+-	bond = (struct bonding *) master->priv;
+ 
+ 	write_lock_bh(&bond->lock);
+-	if (bond->next == (struct slave *) bond) {
+-		err = -EINVAL;
++
++	if (bond->slave_cnt == 0) {
+ 		goto out;
+ 	}
+ 
+-	old_current = bond->current_slave;
+-	change_active_interface(bond, NULL);
+ 	bond->current_arp_slave = NULL;
+ 	bond->primary_slave = NULL;
++	bond_change_active_slave(bond, NULL);
+ 
+-	while ((our_slave = bond->prev) != (slave_t *)bond) {
++	while ((slave = bond->first_slave) != NULL) {
+ 		/* Inform AD package of unbinding of slave
+ 		 * before slave is detached from the list.
+ 		 */
+ 		if (bond_mode == BOND_MODE_8023AD) {
+-			bond_3ad_unbind_slave(our_slave);
++			bond_3ad_unbind_slave(slave);
+ 		}
+ 
+-		slave_dev = our_slave->dev;
+-		bond_detach_slave(bond, our_slave);
++		slave_dev = slave->dev;
++		bond_detach_slave(bond, slave);
+ 
+ 		if ((bond_mode == BOND_MODE_TLB) ||
+ 		    (bond_mode == BOND_MODE_ALB)) {
+ 			/* must be called only after the slave
+ 			 * has been detached from the list
+ 			 */
+-			bond_alb_deinit_slave(bond, our_slave);
++			bond_alb_deinit_slave(bond, slave);
+ 		}
+ 
+ 		/* now that the slave is detached, unlock and perform
+@@ -2179,20 +1746,23 @@ static int bond_release_all(struct net_d
+ 		 */
+ 		write_unlock_bh(&bond->lock);
+ 
+-		/* unset promiscuity level from slave */
+-		if (master->flags & IFF_PROMISC) {
+-			if (!USES_PRIMARY(bond_mode)) {
+-				dev_set_promiscuity(slave_dev, -1); 
++		/* If the mode USES_PRIMARY, then we should only remove its
++		 * promisc and mc settings if it was the curr_active_slave, but that was
++		 * already taken care of above when we detached the slave
++		 */
++		if (!USES_PRIMARY(bond_mode)) {
++			/* unset promiscuity level from slave */
++			if (bond_dev->flags & IFF_PROMISC) {
++				dev_set_promiscuity(slave_dev, -1);
++			}
++
++			/* unset allmulti level from slave */
++			if (bond_dev->flags & IFF_ALLMULTI) {
++				dev_set_allmulti(slave_dev, -1);
+ 			}
+-		}
+ 
+-		if (multicast_mode == BOND_MULTICAST_ALL) {
+-			/* flush master's mc_list from slave */ 
+-			bond_mc_list_flush (slave_dev, master); 
+-
+-			/* unset allmulti level from slave */ 
+-			if (master->flags & IFF_ALLMULTI)
+-				dev_set_allmulti(slave_dev, -1); 
++			/* flush master's mc_list from slave */
++			bond_mc_list_flush(bond_dev, slave_dev);
+ 		}
+ 
+ 		netdev_set_master(slave_dev, NULL);
+@@ -2202,7 +1772,7 @@ static int bond_release_all(struct net_d
+ 
+ 		if (app_abi_ver >= 1) {
+ 			/* restore original ("permanent") mac address*/
+-			memcpy(addr.sa_data, our_slave->perm_hwaddr, ETH_ALEN);
++			memcpy(addr.sa_data, slave->perm_hwaddr, ETH_ALEN);
+ 			addr.sa_family = slave_dev->type;
+ 			slave_dev->set_mac_address(slave_dev, &addr);
+ 		}
+@@ -2210,11 +1780,11 @@ static int bond_release_all(struct net_d
+ 		/* restore the original state of the IFF_NOARP flag that might have
+ 		 * been set by bond_set_slave_inactive_flags()
+ 		 */
+-		if ((our_slave->original_flags & IFF_NOARP) == 0) {
++		if ((slave->original_flags & IFF_NOARP) == 0) {
+ 			slave_dev->flags &= ~IFF_NOARP;
+ 		}
+ 
+-		kfree(our_slave);
++		kfree(slave);
+ 
+ 		/* re-acquire the lock before getting the next slave */
+ 		write_lock_bh(&bond->lock);
+@@ -2224,72 +1794,234 @@ static int bond_release_all(struct net_d
+ 	 * set by the application to the mac address of the
+ 	 * first slave
+ 	 */
+-	memset(master->dev_addr, 0, master->addr_len);
++	memset(bond_dev->dev_addr, 0, bond_dev->addr_len);
+ 
+-	printk (KERN_INFO "%s: released all slaves\n", master->name);
++	printk(KERN_INFO DRV_NAME
++	       ": %s: released all slaves\n",
++	       bond_dev->name);
+ 
+ out:
+ 	write_unlock_bh(&bond->lock);
+ 
+-	return err;
++	return 0;
+ }
+ 
+-/* this function is called regularly to monitor each slave's link. */
+-static void bond_mii_monitor(struct net_device *master)
+-{
+-	bonding_t *bond = (struct bonding *) master->priv;
+-	slave_t *slave, *oldcurrent;
+-	int slave_died = 0;
+-	int do_failover = 0;
++/*
++ * This function changes the active slave to slave <slave_dev>.
++ * It returns -EINVAL in the following cases.
++ *  - <slave_dev> is not found in the list.
++ *  - There is not active slave now.
++ *  - <slave_dev> is already active.
++ *  - The link state of <slave_dev> is not BOND_LINK_UP.
++ *  - <slave_dev> is not running.
++ * In these cases, this fuction does nothing.
++ * In the other cases, currnt_slave pointer is changed and 0 is returned.
++ */
++static int bond_ioctl_change_active(struct net_device *bond_dev, struct net_device *slave_dev)
++{
++	struct bonding *bond = bond_dev->priv;
++	struct slave *old_active = NULL;
++	struct slave *new_active = NULL;
++	int res = 0;
++
++	/* Verify that master_dev is indeed the master of slave_dev */
++	if (!(slave_dev->flags & IFF_SLAVE) ||
++	    (slave_dev->master != bond_dev)) {
++		return -EINVAL;
++	}
++
++	write_lock_bh(&bond->lock);
++
++	old_active = bond->curr_active_slave;
++	new_active = bond_get_slave_by_dev(bond, slave_dev);
++
++	/*
++	 * Changing to the current active: do nothing; return success.
++	 */
++	if (new_active && (new_active == old_active)) {
++		write_unlock_bh(&bond->lock);
++		return 0;
++	}
++
++	if ((new_active) &&
++	    (old_active) &&
++	    (new_active->link == BOND_LINK_UP) &&
++	    IS_UP(new_active->dev)) {
++		bond_change_active_slave(bond, new_active);
++	} else {
++		res = -EINVAL;
++	}
++
++	write_unlock_bh(&bond->lock);
++
++	return res;
++}
++
++static int bond_ethtool_ioctl(struct net_device *bond_dev, struct ifreq *ifr)
++{
++	struct ethtool_drvinfo info;
++	void *addr = ifr->ifr_data;
++	uint32_t cmd;
++
++	if (get_user(cmd, (uint32_t *)addr)) {
++		return -EFAULT;
++	}
++
++	switch (cmd) {
++	case ETHTOOL_GDRVINFO:
++		if (copy_from_user(&info, addr, sizeof(info))) {
++			return -EFAULT;
++		}
++
++		if (strcmp(info.driver, "ifenslave") == 0) {
++			int new_abi_ver;
++			char *endptr;
++
++			new_abi_ver = simple_strtoul(info.fw_version,
++						     &endptr, 0);
++			if (*endptr) {
++				printk(KERN_ERR DRV_NAME
++				       ": Error: got invalid ABI "
++				       "version from application\n");
++
++				return -EINVAL;
++			}
++
++			if (orig_app_abi_ver == -1) {
++				orig_app_abi_ver  = new_abi_ver;
++			}
++
++			app_abi_ver = new_abi_ver;
++		}
++
++		strncpy(info.driver,  DRV_NAME, 32);
++		strncpy(info.version, DRV_VERSION, 32);
++		snprintf(info.fw_version, 32, "%d", BOND_ABI_VERSION);
++
++		if (copy_to_user(addr, &info, sizeof(info))) {
++			return -EFAULT;
++		}
++
++		return 0;
++	default:
++		return -EOPNOTSUPP;
++	}
++}
++
++static int bond_info_query(struct net_device *bond_dev, struct ifbond *info)
++{
++	struct bonding *bond = bond_dev->priv;
++
++	info->bond_mode = bond_mode;
++	info->miimon = miimon;
++
++	read_lock_bh(&bond->lock);
++	info->num_slaves = bond->slave_cnt;
++	read_unlock_bh(&bond->lock);
++
++	return 0;
++}
++
++static int bond_slave_info_query(struct net_device *bond_dev, struct ifslave *info)
++{
++	struct bonding *bond = bond_dev->priv;
++	struct slave *slave;
++	int i, found = 0;
++
++	if (info->slave_id < 0) {
++		return -ENODEV;
++	}
++
++	read_lock_bh(&bond->lock);
++
++	bond_for_each_slave(bond, slave, i) {
++		if (i == (int)info->slave_id) {
++			found = 1;
++			break;
++		}
++	}
++
++	read_unlock_bh(&bond->lock);
++
++	if (found) {
++		strcpy(info->slave_name, slave->dev->name);
++		info->link = slave->link;
++		info->state = slave->state;
++		info->link_failure_count = slave->link_failure_count;
++	} else {
++		return -ENODEV;
++	}
++
++	return 0;
++}
++
++/*-------------------------------- Monitoring -------------------------------*/
++
++/* this function is called regularly to monitor each slave's link. */
++static void bond_mii_monitor(struct net_device *bond_dev)
++{
++	struct bonding *bond = bond_dev->priv;
++	struct slave *slave, *oldcurrent;
++	int do_failover = 0;
++	int delta_in_ticks = (miimon * HZ) / 1000;
++	int i;
+ 
+ 	read_lock(&bond->lock);
+ 
++	if (bond->kill_timers) {
++		goto out;
++	}
++
++	if (bond->slave_cnt == 0) {
++		goto re_arm;
++	}
++
+ 	/* we will try to read the link status of each of our slaves, and
+ 	 * set their IFF_RUNNING flag appropriately. For each slave not
+ 	 * supporting MII status, we won't do anything so that a user-space
+ 	 * program could monitor the link itself if needed.
+ 	 */
+ 
+-	slave = (slave_t *)bond;
++	read_lock(&bond->curr_slave_lock);
++	oldcurrent = bond->curr_active_slave;
++	read_unlock(&bond->curr_slave_lock);
+ 
+-	read_lock(&bond->ptrlock);
+-	oldcurrent = bond->current_slave;
+-	read_unlock(&bond->ptrlock);
+-
+-	while ((slave = slave->prev) != (slave_t *)bond) {
+-		struct net_device *dev = slave->dev;
++	bond_for_each_slave(bond, slave, i) {
++		struct net_device *slave_dev = slave->dev;
+ 		int link_state;
+ 		u16 old_speed = slave->speed;
+ 		u8 old_duplex = slave->duplex;
+-		
+-		link_state = bond_check_dev_link(dev, 0);
++
++		link_state = bond_check_dev_link(slave_dev, 0);
+ 
+ 		switch (slave->link) {
+ 		case BOND_LINK_UP:	/* the link was up */
+ 			if (link_state == BMSR_LSTATUS) {
+ 				/* link stays up, nothing more to do */
+ 				break;
+-			}
+-			else { /* link going down */
++			} else { /* link going down */
+ 				slave->link  = BOND_LINK_FAIL;
+ 				slave->delay = downdelay;
++
+ 				if (slave->link_failure_count < UINT_MAX) {
+ 					slave->link_failure_count++;
+ 				}
+-				if (downdelay > 0) {
+-					printk (KERN_INFO
+-						"%s: link status down for %sinterface "
+-						"%s, disabling it in %d ms.\n",
+-						master->name,
+-						IS_UP(dev)
+-						? ((bond_mode == BOND_MODE_ACTIVEBACKUP)
+-						   ? ((slave == oldcurrent)
+-						      ? "active " : "backup ")
+-						   : "")
+-						: "idle ",
+-						dev->name,
+-						downdelay * miimon);
+-					}
++
++				if (downdelay) {
++					printk(KERN_INFO DRV_NAME
++					       ": %s: link status down for %s "
++					       "interface %s, disabling it in "
++					       "%d ms.\n",
++					       bond_dev->name,
++					       IS_UP(slave_dev)
++					       ? ((bond_mode == BOND_MODE_ACTIVEBACKUP)
++						  ? ((slave == oldcurrent)
++						     ? "active " : "backup ")
++						  : "")
++					       : "idle ",
++					       slave_dev->name,
++					       downdelay * miimon);
++				}
+ 			}
+ 			/* no break ! fall through the BOND_LINK_FAIL test to
+ 			   ensure proper action to be taken
+@@ -2300,6 +2032,7 @@ static void bond_mii_monitor(struct net_
+ 				if (slave->delay <= 0) {
+ 					/* link down for too long time */
+ 					slave->link = BOND_LINK_DOWN;
++
+ 					/* in active/backup mode, we must
+ 					 * completely disable this interface
+ 					 */
+@@ -2308,11 +2041,12 @@ static void bond_mii_monitor(struct net_
+ 						bond_set_slave_inactive_flags(slave);
+ 					}
+ 
+-					printk(KERN_INFO
+-						"%s: link status definitely down "
+-						"for interface %s, disabling it",
+-						master->name,
+-						dev->name);
++					printk(KERN_INFO DRV_NAME
++					       ": %s: link status definitely "
++					       "down for interface %s, "
++					       "disabling it\n",
++					       bond_dev->name,
++					       slave_dev->name);
+ 
+ 					/* notify ad that the link status has changed */
+ 					if (bond_mode == BOND_MODE_8023AD) {
+@@ -2327,8 +2061,6 @@ static void bond_mii_monitor(struct net_
+ 					if (slave == oldcurrent) {
+ 						do_failover = 1;
+ 					}
+-
+-					slave_died = 1;
+ 				} else {
+ 					slave->delay--;
+ 				}
+@@ -2336,12 +2068,12 @@ static void bond_mii_monitor(struct net_
+ 				/* link up again */
+ 				slave->link  = BOND_LINK_UP;
+ 				slave->jiffies = jiffies;
+-				printk(KERN_INFO
+-					"%s: link status up again after %d ms "
+-					"for interface %s.\n",
+-					master->name,
+-					(downdelay - slave->delay) * miimon,
+-					dev->name);
++				printk(KERN_INFO DRV_NAME
++				       ": %s: link status up again after %d "
++				       "ms for interface %s.\n",
++				       bond_dev->name,
++				       (downdelay - slave->delay) * miimon,
++				       slave_dev->name);
+ 			}
+ 			break;
+ 		case BOND_LINK_DOWN:	/* the link was down */
+@@ -2351,16 +2083,17 @@ static void bond_mii_monitor(struct net_
+ 			} else {	/* link going up */
+ 				slave->link  = BOND_LINK_BACK;
+ 				slave->delay = updelay;
+-				
+-				if (updelay > 0) {
++
++				if (updelay) {
+ 					/* if updelay == 0, no need to
+ 					   advertise about a 0 ms delay */
+-					printk (KERN_INFO
+-						"%s: link status up for interface"
+-						" %s, enabling it in %d ms.\n",
+-						master->name,
+-						dev->name,
+-						updelay * miimon);
++					printk(KERN_INFO DRV_NAME
++					       ": %s: link status up for "
++					       "interface %s, enabling it "
++					       "in %d ms.\n",
++					       bond_dev->name,
++					       slave_dev->name,
++					       updelay * miimon);
+ 				}
+ 			}
+ 			/* no break ! fall through the BOND_LINK_BACK state in
+@@ -2370,12 +2103,13 @@ static void bond_mii_monitor(struct net_
+ 			if (link_state != BMSR_LSTATUS) {
+ 				/* link down again */
+ 				slave->link  = BOND_LINK_DOWN;
+-				printk(KERN_INFO
+-					"%s: link status down again after %d ms "
+-					"for interface %s.\n",
+-					master->name,
+-					(updelay - slave->delay) * miimon,
+-					dev->name);
++
++				printk(KERN_INFO DRV_NAME
++				       ": %s: link status down again after %d "
++				       "ms for interface %s.\n",
++				       bond_dev->name,
++				       (updelay - slave->delay) * miimon,
++				       slave_dev->name);
+ 			} else {
+ 				/* link stays up */
+ 				if (slave->delay == 0) {
+@@ -2386,8 +2120,7 @@ static void bond_mii_monitor(struct net_
+ 					if (bond_mode == BOND_MODE_8023AD) {
+ 						/* prevent it from being the active one */
+ 						slave->state = BOND_STATE_BACKUP;
+-					}
+-					else if (bond_mode != BOND_MODE_ACTIVEBACKUP) {
++					} else if (bond_mode != BOND_MODE_ACTIVEBACKUP) {
+ 						/* make it immediately active */
+ 						slave->state = BOND_STATE_ACTIVE;
+ 					} else if (slave != bond->primary_slave) {
+@@ -2395,12 +2128,12 @@ static void bond_mii_monitor(struct net_
+ 						slave->state = BOND_STATE_BACKUP;
+ 					}
+ 
+-					printk(KERN_INFO
+-						"%s: link status definitely up "
+-						"for interface %s.\n",
+-						master->name,
+-						dev->name);
+-	
++					printk(KERN_INFO DRV_NAME
++					       ": %s: link status definitely "
++					       "up for interface %s.\n",
++					       bond_dev->name,
++					       slave_dev->name);
++
+ 					/* notify ad that the link status has changed */
+ 					if (bond_mode == BOND_MODE_8023AD) {
+ 						bond_3ad_handle_link_change(slave, BOND_LINK_UP);
+@@ -2411,7 +2144,7 @@ static void bond_mii_monitor(struct net_
+ 						bond_alb_handle_link_change(bond, slave, BOND_LINK_UP);
+ 					}
+ 
+-					if ((oldcurrent == NULL) ||
++					if ((!oldcurrent) ||
+ 					    (slave == bond->primary_slave)) {
+ 						do_failover = 1;
+ 					}
+@@ -2420,7 +2153,12 @@ static void bond_mii_monitor(struct net_
+ 				}
+ 			}
+ 			break;
+-		} /* end of switch */
++		default:
++			/* Should not happen */
++			printk(KERN_ERR "bonding: Error: %s  Illegal value (link=%d)\n",
++			       slave->dev->name, slave->link);
++			goto out;
++		} /* end of switch (slave->link) */
+ 
+ 		bond_update_speed_duplex(slave);
+ 
+@@ -2428,112 +2166,110 @@ static void bond_mii_monitor(struct net_
+ 			if (old_speed != slave->speed) {
+ 				bond_3ad_adapter_speed_changed(slave);
+ 			}
++
+ 			if (old_duplex != slave->duplex) {
+ 				bond_3ad_adapter_duplex_changed(slave);
+ 			}
+ 		}
+ 
+-	} /* end of while */
++	} /* end of for */
+ 
+ 	if (do_failover) {
+-		write_lock(&bond->ptrlock);
++		write_lock(&bond->curr_slave_lock);
++
++		bond_select_active_slave(bond);
+ 
+-		reselect_active_interface(bond);
+-		if (oldcurrent && !bond->current_slave) {
+-			printk(KERN_INFO
+-				"%s: now running without any active interface !\n",
+-				master->name);
++		if (oldcurrent && !bond->curr_active_slave) {
++			printk(KERN_INFO DRV_NAME
++			       ": %s: now running without any active "
++			       "interface !\n",
++			       bond_dev->name);
+ 		}
+ 
+-		write_unlock(&bond->ptrlock);
++		write_unlock(&bond->curr_slave_lock);
+ 	}
+ 
++re_arm:
++	mod_timer(&bond->mii_timer, jiffies + delta_in_ticks);
++out:
+ 	read_unlock(&bond->lock);
+-	/* re-arm the timer */
+-	mod_timer(&bond->mii_timer, jiffies + (miimon * HZ / 1000));
+ }
+ 
+-/* 
+- * this function is called regularly to monitor each slave's link 
++static void bond_arp_send_all(struct slave *slave)
++{
++	int i;
++
++	for (i = 0; (i<MAX_ARP_IP_TARGETS) && arp_target[i]; i++) {
++		arp_send(ARPOP_REQUEST, ETH_P_ARP, arp_target[i], slave->dev,
++			 my_ip, NULL, slave->dev->dev_addr,
++			 NULL);
++	}
++}
++
++/*
++ * this function is called regularly to monitor each slave's link
+  * ensuring that traffic is being sent and received when arp monitoring
+- * is used in load-balancing mode. if the adapter has been dormant, then an 
+- * arp is transmitted to generate traffic. see activebackup_arp_monitor for 
+- * arp monitoring in active backup mode. 
++ * is used in load-balancing mode. if the adapter has been dormant, then an
++ * arp is transmitted to generate traffic. see activebackup_arp_monitor for
++ * arp monitoring in active backup mode.
+  */
+-static void loadbalance_arp_monitor(struct net_device *master)
++static void bond_loadbalance_arp_mon(struct net_device *bond_dev)
+ {
+-	bonding_t *bond;
+-	slave_t *slave, *oldcurrent;
+-	int the_delta_in_ticks =  arp_interval * HZ / 1000;
+-	int next_timer = jiffies + (arp_interval * HZ / 1000);
++	struct bonding *bond = bond_dev->priv;
++	struct slave *slave, *oldcurrent;
+ 	int do_failover = 0;
++	int delta_in_ticks = (arp_interval * HZ) / 1000;
++	int i;
+ 
+-	bond = (struct bonding *) master->priv; 
+-	if (master->priv == NULL) {
+-		mod_timer(&bond->arp_timer, next_timer);
+-		return;
+-	}
++	read_lock(&bond->lock);
+ 
+-	/* TODO: investigate why rtnl_shlock_nowait and rtnl_exlock_nowait
+-	 * are called below and add comment why they are required... 
+-	 */
+-	if ((!IS_UP(master)) || rtnl_shlock_nowait()) {
+-		mod_timer(&bond->arp_timer, next_timer);
+-		return;
++	if (bond->kill_timers) {
++		goto out;
+ 	}
+ 
+-	if (rtnl_exlock_nowait()) {
+-		rtnl_shunlock();
+-		mod_timer(&bond->arp_timer, next_timer);
+-		return;
++	if (bond->slave_cnt == 0) {
++		goto re_arm;
+ 	}
+ 
+-	read_lock(&bond->lock);
+-
+-	read_lock(&bond->ptrlock);
+-	oldcurrent = bond->current_slave;
+-	read_unlock(&bond->ptrlock);
++	read_lock(&bond->curr_slave_lock);
++	oldcurrent = bond->curr_active_slave;
++	read_unlock(&bond->curr_slave_lock);
+ 
+ 	/* see if any of the previous devices are up now (i.e. they have
+-	 * xmt and rcv traffic). the current_slave does not come into
++	 * xmt and rcv traffic). the curr_active_slave does not come into
+ 	 * the picture unless it is null. also, slave->jiffies is not needed
+ 	 * here because we send an arp on each slave and give a slave as
+ 	 * long as it needs to get the tx/rx within the delta.
+ 	 * TODO: what about up/down delay in arp mode? it wasn't here before
+-	 *       so it can wait 
++	 *       so it can wait
+ 	 */
+-	slave = (slave_t *)bond;
+-	while ((slave = slave->prev) != (slave_t *)bond)  {
+-
+-	  	if (slave->link != BOND_LINK_UP) {
+-
+-	  		if (((jiffies - slave->dev->trans_start) <= 
+-						the_delta_in_ticks) &&  
+-			     ((jiffies - slave->dev->last_rx) <= 
+-						the_delta_in_ticks)) {
++	bond_for_each_slave(bond, slave, i) {
++		if (slave->link != BOND_LINK_UP) {
++			if (((jiffies - slave->dev->trans_start) <= delta_in_ticks) &&
++			    ((jiffies - slave->dev->last_rx) <= delta_in_ticks)) {
+ 
+ 				slave->link  = BOND_LINK_UP;
+ 				slave->state = BOND_STATE_ACTIVE;
+ 
+ 				/* primary_slave has no meaning in round-robin
+-				 * mode. the window of a slave being up and 
+-				 * current_slave being null after enslaving
++				 * mode. the window of a slave being up and
++				 * curr_active_slave being null after enslaving
+ 				 * is closed.
+ 				 */
+-				if (oldcurrent == NULL) {
+-					printk(KERN_INFO
+-						"%s: link status definitely up "
+-						"for interface %s, ",
+-						master->name,
+-						slave->dev->name);
++				if (!oldcurrent) {
++					printk(KERN_INFO DRV_NAME
++					       ": %s: link status definitely "
++					       "up for interface %s, ",
++					       bond_dev->name,
++					       slave->dev->name);
+ 					do_failover = 1;
+ 				} else {
+-					printk(KERN_INFO
+-						"%s: interface %s is now up\n",
+-						master->name,
+-						slave->dev->name);
++					printk(KERN_INFO DRV_NAME
++					       ": %s: interface %s is now up\n",
++					       bond_dev->name,
++					       slave->dev->name);
+ 				}
+-			} 
++			}
+ 		} else {
+ 			/* slave->link == BOND_LINK_UP */
+ 
+@@ -2541,224 +2277,233 @@ static void loadbalance_arp_monitor(stru
+ 			 * when the source ip is 0, so don't take the link down
+ 			 * if we don't know our ip yet
+ 			 */
+-			if (((jiffies - slave->dev->trans_start) >= 
+-		              (2*the_delta_in_ticks)) ||
+-		             (((jiffies - slave->dev->last_rx) >= 
+-		               (2*the_delta_in_ticks)) && my_ip !=0)) {
++			if (((jiffies - slave->dev->trans_start) >= (2*delta_in_ticks)) ||
++			    (((jiffies - slave->dev->last_rx) >= (2*delta_in_ticks)) &&
++			     my_ip)) {
++
+ 				slave->link  = BOND_LINK_DOWN;
+ 				slave->state = BOND_STATE_BACKUP;
++
+ 				if (slave->link_failure_count < UINT_MAX) {
+ 					slave->link_failure_count++;
+ 				}
+-				printk(KERN_INFO
+-				       "%s: interface %s is now down.\n",
+-				       master->name,
++
++				printk(KERN_INFO DRV_NAME
++				       ": %s: interface %s is now down.\n",
++				       bond_dev->name,
+ 				       slave->dev->name);
+ 
+ 				if (slave == oldcurrent) {
+ 					do_failover = 1;
+ 				}
+ 			}
+-		} 
++		}
+ 
+-		/* note: if switch is in round-robin mode, all links 
++		/* note: if switch is in round-robin mode, all links
+ 		 * must tx arp to ensure all links rx an arp - otherwise
+-		 * links may oscillate or not come up at all; if switch is 
+-		 * in something like xor mode, there is nothing we can 
+-		 * do - all replies will be rx'ed on same link causing slaves 
++		 * links may oscillate or not come up at all; if switch is
++		 * in something like xor mode, there is nothing we can
++		 * do - all replies will be rx'ed on same link causing slaves
+ 		 * to be unstable during low/no traffic periods
+ 		 */
+ 		if (IS_UP(slave->dev)) {
+-			arp_send_all(slave);
++			bond_arp_send_all(slave);
+ 		}
+ 	}
+ 
+ 	if (do_failover) {
+-		write_lock(&bond->ptrlock);
++		write_lock(&bond->curr_slave_lock);
+ 
+-		reselect_active_interface(bond);
+-		if (oldcurrent && !bond->current_slave) {
+-			printk(KERN_INFO
+-				"%s: now running without any active interface !\n",
+-				master->name);
++		bond_select_active_slave(bond);
++
++		if (oldcurrent && !bond->curr_active_slave) {
++			printk(KERN_INFO DRV_NAME
++			       ": %s: now running without any active "
++			       "interface !\n",
++			       bond_dev->name);
+ 		}
+ 
+-		write_unlock(&bond->ptrlock);
++		write_unlock(&bond->curr_slave_lock);
+ 	}
+ 
++re_arm:
++	mod_timer(&bond->arp_timer, jiffies + delta_in_ticks);
++out:
+ 	read_unlock(&bond->lock);
+-	rtnl_exunlock();
+-	rtnl_shunlock();
+-
+-	/* re-arm the timer */
+-	mod_timer(&bond->arp_timer, next_timer);
+ }
+ 
+-/* 
++/*
+  * When using arp monitoring in active-backup mode, this function is
+  * called to determine if any backup slaves have went down or a new
+  * current slave needs to be found.
+- * The backup slaves never generate traffic, they are considered up by merely 
+- * receiving traffic. If the current slave goes down, each backup slave will 
+- * be given the opportunity to tx/rx an arp before being taken down - this 
+- * prevents all slaves from being taken down due to the current slave not 
++ * The backup slaves never generate traffic, they are considered up by merely
++ * receiving traffic. If the current slave goes down, each backup slave will
++ * be given the opportunity to tx/rx an arp before being taken down - this
++ * prevents all slaves from being taken down due to the current slave not
+  * sending any traffic for the backups to receive. The arps are not necessarily
+- * necessary, any tx and rx traffic will keep the current slave up. While any 
+- * rx traffic will keep the backup slaves up, the current slave is responsible 
+- * for generating traffic to keep them up regardless of any other traffic they 
++ * necessary, any tx and rx traffic will keep the current slave up. While any
++ * rx traffic will keep the backup slaves up, the current slave is responsible
++ * for generating traffic to keep them up regardless of any other traffic they
+  * may have received.
+  * see loadbalance_arp_monitor for arp monitoring in load balancing mode
+  */
+-static void activebackup_arp_monitor(struct net_device *master)
++static void bond_activebackup_arp_mon(struct net_device *bond_dev)
+ {
+-	bonding_t *bond;
+-	slave_t *slave;
+-	int the_delta_in_ticks =  arp_interval * HZ / 1000;
+-	int next_timer = jiffies + (arp_interval * HZ / 1000);
+-
+-	bond = (struct bonding *) master->priv; 
+-	if (master->priv == NULL) {
+-		mod_timer(&bond->arp_timer, next_timer);
+-		return;
+-	}
++	struct bonding *bond = bond_dev->priv;
++	struct slave *slave;
++	int delta_in_ticks = (arp_interval * HZ) / 1000;
++	int i;
+ 
+-	if (!IS_UP(master)) {
+-		mod_timer(&bond->arp_timer, next_timer);
+-		return;
++	read_lock(&bond->lock);
++
++	if (bond->kill_timers) {
++		goto out;
+ 	}
+ 
+-	read_lock(&bond->lock);
++	if (bond->slave_cnt == 0) {
++		goto re_arm;
++	}
+ 
+-	/* determine if any slave has come up or any backup slave has 
+-	 * gone down 
++	/* determine if any slave has come up or any backup slave has
++	 * gone down
+ 	 * TODO: what about up/down delay in arp mode? it wasn't here before
+-	 *       so it can wait 
++	 *       so it can wait
+ 	 */
+-	slave = (slave_t *)bond;
+-	while ((slave = slave->prev) != (slave_t *)bond)  {
+-
+-	  	if (slave->link != BOND_LINK_UP) {
+-			if ((jiffies - slave->dev->last_rx) <=
+-			    the_delta_in_ticks) {
++	bond_for_each_slave(bond, slave, i) {
++		if (slave->link != BOND_LINK_UP) {
++			if ((jiffies - slave->dev->last_rx) <= delta_in_ticks) {
+ 
+ 				slave->link = BOND_LINK_UP;
+-				write_lock(&bond->ptrlock);
+-				if ((bond->current_slave == NULL) &&
+-				    ((jiffies - slave->dev->trans_start) <=
+-				     the_delta_in_ticks)) {
+-					change_active_interface(bond, slave);
++
++				write_lock(&bond->curr_slave_lock);
++
++				if ((!bond->curr_active_slave) &&
++				    ((jiffies - slave->dev->trans_start) <= delta_in_ticks)) {
++					bond_change_active_slave(bond, slave);
+ 					bond->current_arp_slave = NULL;
+-				} else if (bond->current_slave != slave) {
+-					/* this slave has just come up but we 
++				} else if (bond->curr_active_slave != slave) {
++					/* this slave has just come up but we
+ 					 * already have a current slave; this
+ 					 * can also happen if bond_enslave adds
+-					 * a new slave that is up while we are 
++					 * a new slave that is up while we are
+ 					 * searching for a new slave
+ 					 */
+ 					bond_set_slave_inactive_flags(slave);
+ 					bond->current_arp_slave = NULL;
+ 				}
+ 
+-				if (slave == bond->current_slave) {
+-					printk(KERN_INFO
+-						"%s: %s is up and now the "
+-						"active interface\n",
+-						master->name,
+-						slave->dev->name);
++				if (slave == bond->curr_active_slave) {
++					printk(KERN_INFO DRV_NAME
++					       ": %s: %s is up and now the "
++					       "active interface\n",
++					       bond_dev->name,
++					       slave->dev->name);
+ 				} else {
+-					printk(KERN_INFO
+-						"%s: backup interface %s is "
+-						"now up\n",
+-						master->name,
+-						slave->dev->name);
++					printk(KERN_INFO DRV_NAME
++					       ": %s: backup interface %s is "
++					       "now up\n",
++					       bond_dev->name,
++					       slave->dev->name);
+ 				}
+ 
+-				write_unlock(&bond->ptrlock);
++				write_unlock(&bond->curr_slave_lock);
+ 			}
+ 		} else {
+-			read_lock(&bond->ptrlock);
+-			if ((slave != bond->current_slave) &&
+-			    (bond->current_arp_slave == NULL) &&
+-			    (((jiffies - slave->dev->last_rx) >=
+-			     3*the_delta_in_ticks) && (my_ip != 0))) {
+-				/* a backup slave has gone down; three times 
+-				 * the delta allows the current slave to be 
++			read_lock(&bond->curr_slave_lock);
++
++			if ((slave != bond->curr_active_slave) &&
++			    (!bond->current_arp_slave) &&
++			    (((jiffies - slave->dev->last_rx) >= 3*delta_in_ticks) &&
++			     my_ip)) {
++				/* a backup slave has gone down; three times
++				 * the delta allows the current slave to be
+ 				 * taken out before the backup slave.
+ 				 * note: a non-null current_arp_slave indicates
+-				 * the current_slave went down and we are 
+-				 * searching for a new one; under this 
+-				 * condition we only take the current_slave 
+-				 * down - this gives each slave a chance to 
++				 * the curr_active_slave went down and we are
++				 * searching for a new one; under this
++				 * condition we only take the curr_active_slave
++				 * down - this gives each slave a chance to
+ 				 * tx/rx traffic before being taken out
+ 				 */
+-				read_unlock(&bond->ptrlock);
++
++				read_unlock(&bond->curr_slave_lock);
++
+ 				slave->link  = BOND_LINK_DOWN;
++
+ 				if (slave->link_failure_count < UINT_MAX) {
+ 					slave->link_failure_count++;
+ 				}
++
+ 				bond_set_slave_inactive_flags(slave);
+-				printk(KERN_INFO
+-					"%s: backup interface %s is now down\n",
+-					master->name,
+-					slave->dev->name);
++
++				printk(KERN_INFO DRV_NAME
++				       ": %s: backup interface %s is now down\n",
++				       bond_dev->name,
++				       slave->dev->name);
+ 			} else {
+-				read_unlock(&bond->ptrlock);
++				read_unlock(&bond->curr_slave_lock);
+ 			}
+ 		}
+ 	}
+ 
+-	read_lock(&bond->ptrlock);
+-	slave = bond->current_slave;
+-	read_unlock(&bond->ptrlock);
+-
+-	if (slave != NULL) {
++	read_lock(&bond->curr_slave_lock);
++	slave = bond->curr_active_slave;
++	read_unlock(&bond->curr_slave_lock);
+ 
++	if (slave) {
+ 		/* if we have sent traffic in the past 2*arp_intervals but
+-		 * haven't xmit and rx traffic in that time interval, select 
++		 * haven't xmit and rx traffic in that time interval, select
+ 		 * a different slave. slave->jiffies is only updated when
+-		 * a slave first becomes the current_slave - not necessarily
+-		 * after every arp; this ensures the slave has a full 2*delta 
+-		 * before being taken out. if a primary is being used, check 
+-		 * if it is up and needs to take over as the current_slave
++		 * a slave first becomes the curr_active_slave - not necessarily
++		 * after every arp; this ensures the slave has a full 2*delta
++		 * before being taken out. if a primary is being used, check
++		 * if it is up and needs to take over as the curr_active_slave
+ 		 */
+-		if ((((jiffies - slave->dev->trans_start) >= 
+-		       (2*the_delta_in_ticks)) ||
+-		     (((jiffies - slave->dev->last_rx) >= 
+-		       (2*the_delta_in_ticks)) && (my_ip != 0))) &&
+-		    ((jiffies - slave->jiffies) >= 2*the_delta_in_ticks)) {
++		if ((((jiffies - slave->dev->trans_start) >= (2*delta_in_ticks)) ||
++		     (((jiffies - slave->dev->last_rx) >= (2*delta_in_ticks)) &&
++		      my_ip)) &&
++		    ((jiffies - slave->jiffies) >= 2*delta_in_ticks)) {
+ 
+ 			slave->link  = BOND_LINK_DOWN;
++
+ 			if (slave->link_failure_count < UINT_MAX) {
+ 				slave->link_failure_count++;
+ 			}
+-			printk(KERN_INFO "%s: link status down for "
+-					 "active interface %s, disabling it",
+-			       master->name,
++
++			printk(KERN_INFO DRV_NAME
++			       ": %s: link status down for active interface "
++			       "%s, disabling it\n",
++			       bond_dev->name,
+ 			       slave->dev->name);
+-			write_lock(&bond->ptrlock);
+-			reselect_active_interface(bond);
+-			slave = bond->current_slave;
+-			write_unlock(&bond->ptrlock);
++
++			write_lock(&bond->curr_slave_lock);
++
++			bond_select_active_slave(bond);
++			slave = bond->curr_active_slave;
++
++			write_unlock(&bond->curr_slave_lock);
++
+ 			bond->current_arp_slave = slave;
+-			if (slave != NULL) {
++
++			if (slave) {
+ 				slave->jiffies = jiffies;
+ 			}
+-
+-		} else if ((bond->primary_slave != NULL) && 
+-			   (bond->primary_slave != slave) && 
++		} else if ((bond->primary_slave) &&
++			   (bond->primary_slave != slave) &&
+ 			   (bond->primary_slave->link == BOND_LINK_UP)) {
+-			/* at this point, slave is the current_slave */
+-			printk(KERN_INFO 
+-			       "%s: changing from interface %s to primary "
++			/* at this point, slave is the curr_active_slave */
++			printk(KERN_INFO DRV_NAME
++			       ": %s: changing from interface %s to primary "
+ 			       "interface %s\n",
+-			       master->name, 
+-			       slave->dev->name, 
++			       bond_dev->name,
++			       slave->dev->name,
+ 			       bond->primary_slave->dev->name);
+-			       
++
+ 			/* primary is up so switch to it */
+-			write_lock(&bond->ptrlock);
+-			change_active_interface(bond, bond->primary_slave);
+-			write_unlock(&bond->ptrlock);
++			write_lock(&bond->curr_slave_lock);
++			bond_change_active_slave(bond, bond->primary_slave);
++			write_unlock(&bond->curr_slave_lock);
++
+ 			slave = bond->primary_slave;
+ 			slave->jiffies = jiffies;
+ 		} else {
+@@ -2768,567 +2513,606 @@ static void activebackup_arp_monitor(str
+ 		/* the current slave must tx an arp to ensure backup slaves
+ 		 * rx traffic
+ 		 */
+-		if ((slave != NULL) && (my_ip != 0)) {
+-			arp_send_all(slave);
++		if (slave && my_ip) {
++			bond_arp_send_all(slave);
+ 		}
+ 	}
+ 
+-	/* if we don't have a current_slave, search for the next available 
+-	 * backup slave from the current_arp_slave and make it the candidate 
+-	 * for becoming the current_slave
++	/* if we don't have a curr_active_slave, search for the next available
++	 * backup slave from the current_arp_slave and make it the candidate
++	 * for becoming the curr_active_slave
+ 	 */
+-	if (slave == NULL) { 
+-
+-		if ((bond->current_arp_slave == NULL) ||
+-		    (bond->current_arp_slave == (slave_t *)bond)) {
+-			bond->current_arp_slave = bond->prev;
+-		} 
++	if (!slave) {
++		if (!bond->current_arp_slave) {
++			bond->current_arp_slave = bond->first_slave;
++		}
+ 
+-		if (bond->current_arp_slave != (slave_t *)bond) {
++		if (bond->current_arp_slave) {
+ 			bond_set_slave_inactive_flags(bond->current_arp_slave);
+-			slave = bond->current_arp_slave->next;
+ 
+ 			/* search for next candidate */
+-			do {
++			bond_for_each_slave_from(bond, slave, i, bond->current_arp_slave) {
+ 				if (IS_UP(slave->dev)) {
+ 					slave->link = BOND_LINK_BACK;
+ 					bond_set_slave_active_flags(slave);
+-					arp_send_all(slave);
++					bond_arp_send_all(slave);
+ 					slave->jiffies = jiffies;
+ 					bond->current_arp_slave = slave;
+ 					break;
+ 				}
+ 
+-				/* if the link state is up at this point, we 
+-				 * mark it down - this can happen if we have 
+-				 * simultaneous link failures and 
+-				 * reselect_active_interface doesn't make this 
+-				 * one the current slave so it is still marked 
++				/* if the link state is up at this point, we
++				 * mark it down - this can happen if we have
++				 * simultaneous link failures and
++				 * reselect_active_interface doesn't make this
++				 * one the current slave so it is still marked
+ 				 * up when it is actually down
+ 				 */
+ 				if (slave->link == BOND_LINK_UP) {
+ 					slave->link  = BOND_LINK_DOWN;
+-					if (slave->link_failure_count < 
+-							UINT_MAX) {
++					if (slave->link_failure_count < UINT_MAX) {
+ 						slave->link_failure_count++;
+ 					}
+ 
+ 					bond_set_slave_inactive_flags(slave);
+-					printk(KERN_INFO
+-						"%s: backup interface "
+-						"%s is now down.\n",
+-						master->name,
+-						slave->dev->name);
++
++					printk(KERN_INFO DRV_NAME
++					       ": %s: backup interface %s is "
++					       "now down.\n",
++					       bond_dev->name,
++					       slave->dev->name);
+ 				}
+-			} while ((slave = slave->next) != 
+-					bond->current_arp_slave->next);
++			}
+ 		}
+ 	}
+ 
++re_arm:
++	mod_timer(&bond->arp_timer, jiffies + delta_in_ticks);
++out:
+ 	read_unlock(&bond->lock);
+-	mod_timer(&bond->arp_timer, next_timer);
+ }
+ 
+-static int bond_sethwaddr(struct net_device *master, struct net_device *slave)
+-{
+-#ifdef BONDING_DEBUG
+-	printk(KERN_CRIT "bond_sethwaddr: master=%x\n", (unsigned int)master);
+-	printk(KERN_CRIT "bond_sethwaddr: slave=%x\n", (unsigned int)slave);
+-	printk(KERN_CRIT "bond_sethwaddr: slave->addr_len=%d\n", slave->addr_len);
+-#endif
+-	memcpy(master->dev_addr, slave->dev_addr, slave->addr_len);
+-	return 0;
+-}
++/*------------------------------ proc/seq_file-------------------------------*/
+ 
+-static int bond_info_query(struct net_device *master, struct ifbond *info)
+-{
+-	bonding_t *bond = (struct bonding *) master->priv;
+-	slave_t *slave;
++#ifdef CONFIG_PROC_FS
+ 
+-	info->bond_mode = bond_mode;
+-	info->num_slaves = 0;
+-	info->miimon = miimon;
++#define SEQ_START_TOKEN ((void *)1)
++
++static void *bond_info_seq_start(struct seq_file *seq, loff_t *pos)
++{
++	struct bonding *bond = seq->private;
++	loff_t off = 0;
++	struct slave *slave;
++	int i;
+ 
++	/* make sure the bond won't be taken away */
++	read_lock(&dev_base_lock);
+ 	read_lock_bh(&bond->lock);
+-	for (slave = bond->prev; slave != (slave_t *)bond; slave = slave->prev) {
+-		info->num_slaves++;
++
++	if (*pos == 0) {
++		return SEQ_START_TOKEN;
+ 	}
+-	read_unlock_bh(&bond->lock);
+ 
+-	return 0;
++	bond_for_each_slave(bond, slave, i) {
++		if (++off == *pos) {
++			return slave;
++		}
++	}
++
++	return NULL;
+ }
+ 
+-static int bond_slave_info_query(struct net_device *master, 
+-					struct ifslave *info)
++static void *bond_info_seq_next(struct seq_file *seq, void *v, loff_t *pos)
+ {
+-	bonding_t *bond = (struct bonding *) master->priv;
+-	slave_t *slave;
+-	int cur_ndx = 0;
+-
+-	if (info->slave_id < 0) {
+-		return -ENODEV;
+-	}
++	struct bonding *bond = seq->private;
++	struct slave *slave = v;
+ 
+-	read_lock_bh(&bond->lock);
+-	for (slave = bond->prev; 
+-		 slave != (slave_t *)bond && cur_ndx < info->slave_id; 
+-		 slave = slave->prev) {
+-		cur_ndx++;
++	++*pos;
++	if (v == SEQ_START_TOKEN) {
++		return bond->first_slave;
+ 	}
+-	read_unlock_bh(&bond->lock);
+ 
+-	if (slave != (slave_t *)bond) {
+-		strcpy(info->slave_name, slave->dev->name);
+-		info->link = slave->link;
+-		info->state = slave->state;
+-		info->link_failure_count = slave->link_failure_count;
+-	} else {
+-		return -ENODEV;
+-	}
++	slave = slave->next;
+ 
+-	return 0;
++	return (slave == bond->first_slave) ? NULL : slave;
+ }
+ 
+-static int bond_ethtool_ioctl(struct net_device *master_dev, struct ifreq *ifr)
++static void bond_info_seq_stop(struct seq_file *seq, void *v)
+ {
+-	void *addr = ifr->ifr_data;
+-	uint32_t cmd;
++	struct bonding *bond = seq->private;
+ 
+-	if (get_user(cmd, (uint32_t *) addr))
+-		return -EFAULT;
++	read_unlock_bh(&bond->lock);
++	read_unlock(&dev_base_lock);
++}
+ 
+-	switch (cmd) {
++static void bond_info_show_master(struct seq_file *seq, struct bonding *bond)
++{
++	struct slave *curr;
+ 
+-	case ETHTOOL_GDRVINFO:
+-		{
+-			struct ethtool_drvinfo info;
+-			char *endptr;
++	read_lock(&bond->curr_slave_lock);
++	curr = bond->curr_active_slave;
++	read_unlock(&bond->curr_slave_lock);
+ 
+-			if (copy_from_user(&info, addr, sizeof(info)))
+-				return -EFAULT;
++	seq_printf(seq, "Bonding Mode: %s\n", bond_mode_name());
+ 
+-			if (strcmp(info.driver, "ifenslave") == 0) {
+-				int new_abi_ver;
++	if (USES_PRIMARY(bond_mode)) {
++		if (curr) {
++			seq_printf(seq,
++				   "Currently Active Slave: %s\n",
++				   curr->dev->name);
++		}
++	}
+ 
+-				new_abi_ver = simple_strtoul(info.fw_version,
+-						             &endptr, 0);
+-				if (*endptr) {
+-					printk(KERN_ERR
+-					       "bonding: Error: got invalid ABI"
+-					       " version from application\n");
++	seq_printf(seq, "MII Status: %s\n", (curr) ? "up" : "down");
++	seq_printf(seq, "MII Polling Interval (ms): %d\n", miimon);
++	seq_printf(seq, "Up Delay (ms): %d\n", updelay * miimon);
++	seq_printf(seq, "Down Delay (ms): %d\n", downdelay * miimon);
+ 
+-					return -EINVAL;
+-				}
++	if (bond_mode == BOND_MODE_8023AD) {
++		struct ad_info ad_info;
+ 
+-				if (orig_app_abi_ver == -1) {
+-					orig_app_abi_ver  = new_abi_ver;
+-				}
++		seq_puts(seq, "\n802.3ad info\n");
+ 
+-				app_abi_ver = new_abi_ver;
+-			}
++		if (bond_3ad_get_active_agg_info(bond, &ad_info)) {
++			seq_printf(seq, "bond %s has no active aggregator\n",
++				   bond->dev->name);
++		} else {
++			seq_printf(seq, "Active Aggregator Info:\n");
+ 
+-			strncpy(info.driver,  DRV_NAME, 32);
+-			strncpy(info.version, DRV_VERSION, 32);
+-			snprintf(info.fw_version, 32, "%d", BOND_ABI_VERSION);
++			seq_printf(seq, "\tAggregator ID: %d\n",
++				   ad_info.aggregator_id);
++			seq_printf(seq, "\tNumber of ports: %d\n",
++				   ad_info.ports);
++			seq_printf(seq, "\tActor Key: %d\n",
++				   ad_info.actor_key);
++			seq_printf(seq, "\tPartner Key: %d\n",
++				   ad_info.partner_key);
++			seq_printf(seq, "\tPartner Mac Address: %02x:%02x:%02x:%02x:%02x:%02x\n",
++				   ad_info.partner_system[0],
++				   ad_info.partner_system[1],
++				   ad_info.partner_system[2],
++				   ad_info.partner_system[3],
++				   ad_info.partner_system[4],
++				   ad_info.partner_system[5]);
++		}
++	}
++}
+ 
+-			if (copy_to_user(addr, &info, sizeof(info)))
+-				return -EFAULT;
++static void bond_info_show_slave(struct seq_file *seq, const struct slave *slave)
++{
++	seq_printf(seq, "\nSlave Interface: %s\n", slave->dev->name);
++	seq_printf(seq, "MII Status: %s\n",
++		   (slave->link == BOND_LINK_UP) ?  "up" : "down");
++	seq_printf(seq, "Link Failure Count: %d\n",
++		   slave->link_failure_count);
++
++	if (app_abi_ver >= 1) {
++		seq_printf(seq,
++			   "Permanent HW addr: %02x:%02x:%02x:%02x:%02x:%02x\n",
++			   slave->perm_hwaddr[0],
++			   slave->perm_hwaddr[1],
++			   slave->perm_hwaddr[2],
++			   slave->perm_hwaddr[3],
++			   slave->perm_hwaddr[4],
++			   slave->perm_hwaddr[5]);
++	}
+ 
+-			return 0;
++	if (bond_mode == BOND_MODE_8023AD) {
++		const struct aggregator *agg
++			= SLAVE_AD_INFO(slave).port.aggregator;
++
++		if (agg) {
++			seq_printf(seq, "Aggregator ID: %d\n",
++				   agg->aggregator_identifier);
++		} else {
++			seq_puts(seq, "Aggregator ID: N/A\n");
+ 		}
+-		break;
+-	default:
+-		return -EOPNOTSUPP;
+ 	}
+ }
+ 
+-static int bond_ioctl(struct net_device *master_dev, struct ifreq *ifr, int cmd)
++static int bond_info_seq_show(struct seq_file *seq, void *v)
+ {
+-	struct net_device *slave_dev = NULL;
+-	struct ifbond *u_binfo = NULL, k_binfo;
+-	struct ifslave *u_sinfo = NULL, k_sinfo;
+-	struct mii_ioctl_data *mii = NULL;
+-	int prev_abi_ver = orig_app_abi_ver;
+-	int ret = 0;
++	if (v == SEQ_START_TOKEN) {
++		seq_printf(seq, "%s\n", version);
++		bond_info_show_master(seq, seq->private);
++	} else {
++		bond_info_show_slave(seq, v);
++	}
+ 
+-#ifdef BONDING_DEBUG
+-	printk(KERN_INFO "bond_ioctl: master=%s, cmd=%d\n", 
+-		master_dev->name, cmd);
+-#endif
++	return 0;
++}
+ 
+-	switch (cmd) {
+-	case SIOCETHTOOL:
+-		return bond_ethtool_ioctl(master_dev, ifr);
++static struct seq_operations bond_info_seq_ops = {
++	.start = bond_info_seq_start,
++	.next  = bond_info_seq_next,
++	.stop  = bond_info_seq_stop,
++	.show  = bond_info_seq_show,
++};
+ 
+-	case SIOCGMIIPHY:
+-		mii = (struct mii_ioctl_data *)&ifr->ifr_data;
+-		if (mii == NULL) {
+-			return -EINVAL;
+-		}
+-		mii->phy_id = 0;
+-		/* Fall Through */
+-	case SIOCGMIIREG:
+-		/* 
+-		 * We do this again just in case we were called by SIOCGMIIREG
+-		 * instead of SIOCGMIIPHY.
+-		 */
+-		mii = (struct mii_ioctl_data *)&ifr->ifr_data;
+-		if (mii == NULL) {
+-			return -EINVAL;
+-		}
+-		if (mii->reg_num == 1) {
+-			mii->val_out = bond_check_mii_link(
+-				(struct bonding *)master_dev->priv);
+-		}
+-		return 0;
+-	case BOND_INFO_QUERY_OLD:
+-	case SIOCBONDINFOQUERY:
+-		u_binfo = (struct ifbond *)ifr->ifr_data;
+-		if (copy_from_user(&k_binfo, u_binfo, sizeof(ifbond))) {
+-			return -EFAULT;
+-		}
+-		ret = bond_info_query(master_dev, &k_binfo);
+-		if (ret == 0) {
+-			if (copy_to_user(u_binfo, &k_binfo, sizeof(ifbond))) {
+-				return -EFAULT;
+-			}
++static int bond_info_open(struct inode *inode, struct file *file)
++{
++	struct seq_file *seq;
++	struct proc_dir_entry *proc;
++	int res;
++
++	res = seq_open(file, &bond_info_seq_ops);
++	if (!res) {
++		/* recover the pointer buried in proc_dir_entry data */
++		seq = file->private_data;
++		proc = PDE(inode);
++		seq->private = proc->data;
++	}
++
++	return res;
++}
++
++static struct file_operations bond_info_fops = {
++	.owner   = THIS_MODULE,
++	.open    = bond_info_open,
++	.read    = seq_read,
++	.llseek  = seq_lseek,
++	.release = seq_release,
++};
++
++static int bond_create_proc_entry(struct bonding *bond)
++{
++	struct net_device *bond_dev = bond->dev;
++
++	if (bond_proc_dir) {
++		bond->proc_entry = create_proc_entry(bond_dev->name,
++						     S_IRUGO,
++						     bond_proc_dir);
++		if (bond->proc_entry == NULL) {
++			printk(KERN_WARNING DRV_NAME
++			       ": Warning: Cannot create /proc/net/%s/%s\n",
++			       DRV_NAME, bond_dev->name);
++		} else {
++			bond->proc_entry->data = bond;
++			bond->proc_entry->proc_fops = &bond_info_fops;
++			bond->proc_entry->owner = THIS_MODULE;
++			memcpy(bond->proc_file_name, bond_dev->name, IFNAMSIZ);
+ 		}
+-		return ret;
+-	case BOND_SLAVE_INFO_QUERY_OLD:
+-	case SIOCBONDSLAVEINFOQUERY:
+-		u_sinfo = (struct ifslave *)ifr->ifr_data;
+-		if (copy_from_user(&k_sinfo, u_sinfo, sizeof(ifslave))) {
+-			return -EFAULT;
++	}
++
++	return 0;
++}
++
++static void bond_remove_proc_entry(struct bonding *bond)
++{
++	if (bond_proc_dir && bond->proc_entry) {
++		remove_proc_entry(bond->proc_file_name, bond_proc_dir);
++		memset(bond->proc_file_name, 0, IFNAMSIZ);
++		bond->proc_entry = NULL;
++	}
++}
++
++/* Create the bonding directory under /proc/net, if doesn't exist yet.
++ * Caller must hold rtnl_lock.
++ */
++static void bond_create_proc_dir(void)
++{
++	int len = strlen(DRV_NAME);
++
++	for (bond_proc_dir = proc_net->subdir; bond_proc_dir;
++	     bond_proc_dir = bond_proc_dir->next) {
++		if ((bond_proc_dir->namelen == len) &&
++		    !memcmp(bond_proc_dir->name, DRV_NAME, len)) {
++			break;
+ 		}
+-		ret = bond_slave_info_query(master_dev, &k_sinfo);
+-		if (ret == 0) {
+-			if (copy_to_user(u_sinfo, &k_sinfo, sizeof(ifslave))) {
+-				return -EFAULT;
+-			}
++	}
++
++	if (!bond_proc_dir) {
++		bond_proc_dir = proc_mkdir(DRV_NAME, proc_net);
++		if (bond_proc_dir) {
++			bond_proc_dir->owner = THIS_MODULE;
++		} else {
++			printk(KERN_WARNING DRV_NAME
++				": Warning: cannot create /proc/net/%s\n",
++				DRV_NAME);
+ 		}
+-		return ret;
+ 	}
++}
+ 
+-	if (!capable(CAP_NET_ADMIN)) {
+-		return -EPERM;
++/* Destroy the bonding directory under /proc/net, if empty.
++ * Caller must hold rtnl_lock.
++ */
++static void bond_destroy_proc_dir(void)
++{
++	struct proc_dir_entry *de;
++
++	if (!bond_proc_dir) {
++		return;
+ 	}
+ 
+-	if (orig_app_abi_ver == -1) {
+-		/* no orig_app_abi_ver was provided yet, so we'll use the
+-		 * current one from now on, even if it's 0
+-		 */
+-		orig_app_abi_ver = app_abi_ver;
++	/* verify that the /proc dir is empty */
++	for (de = bond_proc_dir->subdir; de; de = de->next) {
++		/* ignore . and .. */
++		if (*(de->name) != '.') {
++			break;
++		}
++	}
+ 
+-	} else if (orig_app_abi_ver != app_abi_ver) {
+-		printk(KERN_ERR
+-		       "bonding: Error: already using ifenslave ABI "
+-		       "version %d; to upgrade ifenslave to version %d, "
+-		       "you must first reload bonding.\n",
+-		       orig_app_abi_ver, app_abi_ver);
+-		return -EINVAL;
++	if (de) {
++		if (bond_proc_dir->owner == THIS_MODULE) {
++			bond_proc_dir->owner = NULL;
++		}
++	} else {
++		remove_proc_entry(DRV_NAME, proc_net);
++		bond_proc_dir = NULL;
+ 	}
++}
++#endif /* CONFIG_PROC_FS */
+ 
+-	slave_dev = dev_get_by_name(ifr->ifr_slave);
++/*-------------------------- netdev event handling --------------------------*/
+ 
+-#ifdef BONDING_DEBUG
+-	printk(KERN_INFO "slave_dev=%x: \n", (unsigned int)slave_dev);
+-	printk(KERN_INFO "slave_dev->name=%s: \n", slave_dev->name);
++/*
++ * Change device name
++ */
++static int bond_event_changename(struct bonding *bond)
++{
++#ifdef CONFIG_PROC_FS
++	bond_remove_proc_entry(bond);
++	bond_create_proc_entry(bond);
+ #endif
+ 
+-	if (slave_dev == NULL) {
+-		ret = -ENODEV;
+-	} else {
+-		switch (cmd) {
+-		case BOND_ENSLAVE_OLD:
+-		case SIOCBONDENSLAVE:		
+-			ret = bond_enslave(master_dev, slave_dev);
+-			break;
+-		case BOND_RELEASE_OLD:			
+-		case SIOCBONDRELEASE:	
+-			ret = bond_release(master_dev, slave_dev); 
+-			break;
+-		case BOND_SETHWADDR_OLD:
+-		case SIOCBONDSETHWADDR:
+-			ret = bond_sethwaddr(master_dev, slave_dev);
+-			break;
+-		case BOND_CHANGE_ACTIVE_OLD:
+-		case SIOCBONDCHANGEACTIVE:
+-			if (USES_PRIMARY(bond_mode)) {
+-				ret = bond_change_active(master_dev, slave_dev);
+-			}
+-			else {
+-				ret = -EINVAL;
+-			}
+-			break;
+-		default:
+-			ret = -EOPNOTSUPP;
+-		}
+-		dev_put(slave_dev);
++	return NOTIFY_DONE;
++}
++
++static int bond_master_netdev_event(unsigned long event, struct net_device *bond_dev)
++{
++	struct bonding *event_bond = bond_dev->priv;
++
++	switch (event) {
++	case NETDEV_CHANGENAME:
++		return bond_event_changename(event_bond);
++	case NETDEV_UNREGISTER:
++		/*
++		 * TODO: remove a bond from the list?
++		 */
++		break;
++	default:
++		break;
+ 	}
+ 
+-	if (ret < 0) {
+-		/* The ioctl failed, so there's no point in changing the
+-		 * orig_app_abi_ver. We'll restore it's value just in case
+-		 * we've changed it earlier in this function.
++	return NOTIFY_DONE;
++}
++
++static int bond_slave_netdev_event(unsigned long event, struct net_device *slave_dev)
++{
++	struct net_device *bond_dev = slave_dev->master;
++
++	switch (event) {
++	case NETDEV_UNREGISTER:
++		if (bond_dev) {
++			bond_release(bond_dev, slave_dev);
++		}
++		break;
++	case NETDEV_CHANGE:
++		/*
++		 * TODO: is this what we get if somebody
++		 * sets up a hierarchical bond, then rmmod's
++		 * one of the slave bonding devices?
+ 		 */
+-		orig_app_abi_ver = prev_abi_ver;
++		break;
++	case NETDEV_DOWN:
++		/*
++		 * ... Or is it this?
++		 */
++		break;
++	case NETDEV_CHANGEMTU:
++		/*
++		 * TODO: Should slaves be allowed to
++		 * independently alter their MTU?  For
++		 * an active-backup bond, slaves need
++		 * not be the same type of device, so
++		 * MTUs may vary.  For other modes,
++		 * slaves arguably should have the
++		 * same MTUs. To do this, we'd need to
++		 * take over the slave's change_mtu
++		 * function for the duration of their
++		 * servitude.
++		 */
++		break;
++	case NETDEV_CHANGENAME:
++		/*
++		 * TODO: handle changing the primary's name
++		 */
++		break;
++	default:
++		break;
+ 	}
+ 
+-	return ret;
+-}
+-
+-#ifdef CONFIG_NET_FASTROUTE
+-static int bond_accept_fastpath(struct net_device *dev, struct dst_entry *dst)
+-{
+-	return -1;
++	return NOTIFY_DONE;
+ }
+-#endif
+ 
+-/* 
+- * in broadcast mode, we send everything to all usable interfaces.
++/*
++ * bond_netdev_event: handle netdev notifier chain events.
++ *
++ * This function receives events for the netdev chain.  The caller (an
++ * ioctl handler calling notifier_call_chain) holds the necessary
++ * locks for us to safely manipulate the slave devices (RTNL lock,
++ * dev_probe_lock).
+  */
+-static int bond_xmit_broadcast(struct sk_buff *skb, struct net_device *dev)
++static int bond_netdev_event(struct notifier_block *this, unsigned long event, void *ptr)
+ {
+-	slave_t *slave, *start_at;
+-	struct bonding *bond = (struct bonding *) dev->priv;
+-	struct net_device *device_we_should_send_to = 0;
++	struct net_device *event_dev = (struct net_device *)ptr;
+ 
+-	if (!IS_UP(dev)) { /* bond down */
+-		dev_kfree_skb(skb);
+-		return 0;
++	dprintk("event_dev: %s, event: %lx\n",
++		(event_dev ? event_dev->name : "None"),
++		event);
++
++	if (event_dev->flags & IFF_MASTER) {
++		dprintk("IFF_MASTER\n");
++		return bond_master_netdev_event(event, event_dev);
+ 	}
+ 
+-	read_lock(&bond->lock);
+-
+-	read_lock(&bond->ptrlock);
+-	slave = start_at = bond->current_slave;
+-	read_unlock(&bond->ptrlock);
+-
+-	if (slave == NULL) { /* we're at the root, get the first slave */
+-		/* no suitable interface, frame not sent */
+-		read_unlock(&bond->lock);
+-		dev_kfree_skb(skb);
+-		return 0;
++	if (event_dev->flags & IFF_SLAVE) {
++		dprintk("IFF_SLAVE\n");
++		return bond_slave_netdev_event(event, event_dev);
+ 	}
+ 
+-	do {
+-		if (IS_UP(slave->dev)
+-		    && (slave->link == BOND_LINK_UP)
+-		    && (slave->state == BOND_STATE_ACTIVE)) {
+-			if (device_we_should_send_to) {
+-				struct sk_buff *skb2;
+-				if ((skb2 = skb_clone(skb, GFP_ATOMIC)) == NULL) {
+-					printk(KERN_ERR "bond_xmit_broadcast: skb_clone() failed\n");
+-					continue;
+-				}
+-
+-				skb2->dev = device_we_should_send_to;
+-				skb2->priority = 1;
+-				dev_queue_xmit(skb2);
+-			}
+-			device_we_should_send_to = slave->dev;
+-		}
+-	} while ((slave = slave->next) != start_at);
++	return NOTIFY_DONE;
++}
+ 
+-	if (device_we_should_send_to) {
+-		skb->dev = device_we_should_send_to;
+-		skb->priority = 1;
+-		dev_queue_xmit(skb);
+-	} else
+-		dev_kfree_skb(skb);
++static struct notifier_block bond_netdev_notifier = {
++	.notifier_call = bond_netdev_event,
++};
+ 
+-	/* frame sent to all suitable interfaces */
+-	read_unlock(&bond->lock);
+-	return 0;
+-}
++/*-------------------------- Packet type handling ---------------------------*/
+ 
+-static int bond_xmit_roundrobin(struct sk_buff *skb, struct net_device *dev)
++/* register to receive lacpdus on a bond */
++static void bond_register_lacpdu(struct bonding *bond)
+ {
+-	slave_t *slave, *start_at;
+-	struct bonding *bond = (struct bonding *) dev->priv;
++	struct packet_type *pk_type = &(BOND_AD_INFO(bond).ad_pkt_type);
+ 
+-	if (!IS_UP(dev)) { /* bond down */
+-		dev_kfree_skb(skb);
+-		return 0;
+-	}
++	/* initialize packet type */
++	pk_type->type = PKT_TYPE_LACPDU;
++	pk_type->dev = bond->dev;
++	pk_type->func = bond_3ad_lacpdu_recv;
+ 
+-	read_lock(&bond->lock);
++	dev_add_pack(pk_type);
++}
+ 
+-	read_lock(&bond->ptrlock);
+-	slave = start_at = bond->current_slave;
+-	read_unlock(&bond->ptrlock);
+-
+-	if (slave == NULL) { /* we're at the root, get the first slave */
+-		/* no suitable interface, frame not sent */
+-		dev_kfree_skb(skb);
+-		read_unlock(&bond->lock);
+-		return 0;
+-	}
++/* unregister to receive lacpdus on a bond */
++static void bond_unregister_lacpdu(struct bonding *bond)
++{
++	dev_remove_pack(&(BOND_AD_INFO(bond).ad_pkt_type));
++}
+ 
+-	do {
+-		if (IS_UP(slave->dev)
+-		    && (slave->link == BOND_LINK_UP)
+-		    && (slave->state == BOND_STATE_ACTIVE)) {
++/*-------------------------- Device entry points ----------------------------*/
+ 
+-			skb->dev = slave->dev;
+-			skb->priority = 1;
+-			dev_queue_xmit(skb);
++static int bond_open(struct net_device *bond_dev)
++{
++	struct bonding *bond = bond_dev->priv;
++	struct timer_list *mii_timer = &bond->mii_timer;
++	struct timer_list *arp_timer = &bond->arp_timer;
+ 
+-			write_lock(&bond->ptrlock);
+-			bond->current_slave = slave->next;
+-			write_unlock(&bond->ptrlock);
++	bond->kill_timers = 0;
++
++	if ((bond_mode == BOND_MODE_TLB) ||
++	    (bond_mode == BOND_MODE_ALB)) {
++		struct timer_list *alb_timer = &(BOND_ALB_INFO(bond).alb_timer);
+ 
+-			read_unlock(&bond->lock);
+-			return 0;
++		/* bond_alb_initialize must be called before the timer
++		 * is started.
++		 */
++		if (bond_alb_initialize(bond, (bond_mode == BOND_MODE_ALB))) {
++			/* something went wrong - fail the open operation */
++			return -1;
+ 		}
+-	} while ((slave = slave->next) != start_at);
+ 
+-	/* no suitable interface, frame not sent */
+-	dev_kfree_skb(skb);
+-	read_unlock(&bond->lock);
+-	return 0;
+-}
++		init_timer(alb_timer);
++		alb_timer->expires  = jiffies + 1;
++		alb_timer->data     = (unsigned long)bond;
++		alb_timer->function = (void *)&bond_alb_monitor;
++		add_timer(alb_timer);
++	}
+ 
+-/* 
+- * in XOR mode, we determine the output device by performing xor on
+- * the source and destination hw adresses.  If this device is not 
+- * enabled, find the next slave following this xor slave. 
+- */
+-static int bond_xmit_xor(struct sk_buff *skb, struct net_device *dev)
+-{
+-	slave_t *slave, *start_at;
+-	struct bonding *bond = (struct bonding *) dev->priv;
+-	struct ethhdr *data = (struct ethhdr *)skb->data;
+-	int slave_no;
++	if (miimon) {  /* link check interval, in milliseconds. */
++		init_timer(mii_timer);
++		mii_timer->expires  = jiffies + 1;
++		mii_timer->data     = (unsigned long)bond_dev;
++		mii_timer->function = (void *)&bond_mii_monitor;
++		add_timer(mii_timer);
++	}
+ 
+-	if (!IS_UP(dev)) { /* bond down */
+-		dev_kfree_skb(skb);
+-		return 0;
++	if (arp_interval) {  /* arp interval, in milliseconds. */
++		init_timer(arp_timer);
++		arp_timer->expires  = jiffies + 1;
++		arp_timer->data     = (unsigned long)bond_dev;
++		if (bond_mode == BOND_MODE_ACTIVEBACKUP) {
++			arp_timer->function = (void *)&bond_activebackup_arp_mon;
++		} else {
++			arp_timer->function = (void *)&bond_loadbalance_arp_mon;
++		}
++		add_timer(arp_timer);
+ 	}
+ 
+-	read_lock(&bond->lock);
+-	slave = bond->prev;
++	if (bond_mode == BOND_MODE_8023AD) {
++		struct timer_list *ad_timer = &(BOND_AD_INFO(bond).ad_timer);
++		init_timer(ad_timer);
++		ad_timer->expires  = jiffies + 1;
++		ad_timer->data     = (unsigned long)bond;
++		ad_timer->function = (void *)&bond_3ad_state_machine_handler;
++		add_timer(ad_timer);
+ 
+-	/* we're at the root, get the first slave */
+-	if (bond->slave_cnt == 0) {
+-		/* no suitable interface, frame not sent */
+-		dev_kfree_skb(skb);
+-		read_unlock(&bond->lock);
+-		return 0;
++		/* register to receive LACPDUs */
++		bond_register_lacpdu(bond);
+ 	}
+ 
+-	slave_no = (data->h_dest[5]^slave->dev->dev_addr[5]) % bond->slave_cnt;
++	return 0;
++}
+ 
+-	while ( (slave_no > 0) && (slave != (slave_t *)bond) ) {
+-		slave = slave->prev;
+-		slave_no--;
+-	} 
+-	start_at = slave;
++static int bond_close(struct net_device *bond_dev)
++{
++	struct bonding *bond = bond_dev->priv;
+ 
+-	do {
+-		if (IS_UP(slave->dev)
+-		    && (slave->link == BOND_LINK_UP)
+-		    && (slave->state == BOND_STATE_ACTIVE)) {
++	write_lock_bh(&bond->lock);
+ 
+-			skb->dev = slave->dev;
+-			skb->priority = 1;
+-			dev_queue_xmit(skb);
++	bond_mc_list_destroy(bond);
+ 
+-			read_unlock(&bond->lock);
+-			return 0;
+-		}
+-	} while ((slave = slave->next) != start_at);
++	if (bond_mode == BOND_MODE_8023AD) {
++		/* Unregister the receive of LACPDUs */
++		bond_unregister_lacpdu(bond);
++	}
+ 
+-	/* no suitable interface, frame not sent */
+-	dev_kfree_skb(skb);
+-	read_unlock(&bond->lock);
+-	return 0;
+-}
++	/* signal timers not to re-arm */
++	bond->kill_timers = 1;
+ 
+-/* 
+- * in active-backup mode, we know that bond->current_slave is always valid if
+- * the bond has a usable interface.
+- */
+-static int bond_xmit_activebackup(struct sk_buff *skb, struct net_device *dev)
+-{
+-	struct bonding *bond = (struct bonding *) dev->priv;
+-	int ret;
++	write_unlock_bh(&bond->lock);
+ 
+-	if (!IS_UP(dev)) { /* bond down */
+-		dev_kfree_skb(skb);
+-		return 0;
++	/* del_timer_sync must run without holding the bond->lock
++	 * because a running timer might be trying to hold it too
++	 */
++
++	if (miimon) {  /* link check interval, in milliseconds. */
++		del_timer_sync(&bond->mii_timer);
+ 	}
+ 
+-	/* if we are sending arp packets, try to at least 
+-	   identify our own ip address */
+-	if ( (arp_interval > 0) && (my_ip == 0) &&
+-		(skb->protocol == __constant_htons(ETH_P_ARP) ) ) {
+-		char *the_ip = (((char *)skb->data)) 
+-				+ sizeof(struct ethhdr)  
+-				+ sizeof(struct arphdr) + 
+-				ETH_ALEN;
+-		memcpy(&my_ip, the_ip, 4);
++	if (arp_interval) {  /* arp interval, in milliseconds. */
++		del_timer_sync(&bond->arp_timer);
+ 	}
+ 
+-	/* if we are sending arp packets and don't know 
+-	 * the target hw address, save it so we don't need 
+-	 * to use a broadcast address.
+-	 * don't do this if in active backup mode because the slaves must 
+-	 * receive packets to stay up, and the only ones they receive are 
+-	 * broadcasts. 
+-	 */
+-	if ( (bond_mode != BOND_MODE_ACTIVEBACKUP) && 
+-             (arp_ip_count == 1) &&
+-	     (arp_interval > 0) && (arp_target_hw_addr == NULL) &&
+-	     (skb->protocol == __constant_htons(ETH_P_IP) ) ) {
+-		struct ethhdr *eth_hdr = 
+-			(struct ethhdr *) (((char *)skb->data));
+-		struct iphdr *ip_hdr = (struct iphdr *)(eth_hdr + 1);
+-
+-		if (arp_target[0] == ip_hdr->daddr) {
+-			arp_target_hw_addr = kmalloc(ETH_ALEN, GFP_KERNEL);
+-			if (arp_target_hw_addr != NULL)
+-				memcpy(arp_target_hw_addr, eth_hdr->h_dest, ETH_ALEN);
+-		}
++	switch (bond_mode) {
++	case BOND_MODE_8023AD:
++		del_timer_sync(&(BOND_AD_INFO(bond).ad_timer));
++		break;
++	case BOND_MODE_TLB:
++	case BOND_MODE_ALB:
++		del_timer_sync(&(BOND_ALB_INFO(bond).alb_timer));
++		break;
++	default:
++		break;
+ 	}
+ 
+-	read_lock(&bond->lock);
++	/* Release the bonded slaves */
++	bond_release_all(bond_dev);
+ 
+-	read_lock(&bond->ptrlock);
+-	if (bond->current_slave != NULL) { /* one usable interface */
+-		skb->dev = bond->current_slave->dev;
+-		read_unlock(&bond->ptrlock);
+-		skb->priority = 1;
+-		ret = dev_queue_xmit(skb);
+-		read_unlock(&bond->lock);
+-		return 0;
+-	}
+-	else {
+-		read_unlock(&bond->ptrlock);
++	if ((bond_mode == BOND_MODE_TLB) ||
++	    (bond_mode == BOND_MODE_ALB)) {
++		/* Must be called only after all
++		 * slaves have been released
++		 */
++		bond_alb_deinitialize(bond);
+ 	}
+ 
+-	/* no suitable interface, frame not sent */
+-#ifdef BONDING_DEBUG
+-	printk(KERN_INFO "There was no suitable interface, so we don't transmit\n");
+-#endif
+-	dev_kfree_skb(skb);
+-	read_unlock(&bond->lock);
+ 	return 0;
+ }
+ 
+-static struct net_device_stats *bond_get_stats(struct net_device *dev)
++static struct net_device_stats *bond_get_stats(struct net_device *bond_dev)
+ {
+-	bonding_t *bond = dev->priv;
++	struct bonding *bond = bond_dev->priv;
+ 	struct net_device_stats *stats = &(bond->stats), *sstats;
+-	slave_t *slave;
++	struct slave *slave;
++	int i;
+ 
+ 	memset(stats, 0, sizeof(struct net_device_stats));
+ 
+ 	read_lock_bh(&bond->lock);
+ 
+-	for (slave = bond->prev; slave != (slave_t *)bond; slave = slave->prev) {
++	bond_for_each_slave(bond, slave, i) {
+ 		sstats = slave->dev->get_stats(slave->dev);
+- 
++
+ 		stats->rx_packets += sstats->rx_packets;
+ 		stats->rx_bytes += sstats->rx_bytes;
+ 		stats->rx_errors += sstats->rx_errors;
+@@ -3346,290 +3130,294 @@ static struct net_device_stats *bond_get
+ 		stats->rx_over_errors += sstats->rx_over_errors;
+ 		stats->rx_crc_errors += sstats->rx_crc_errors;
+ 		stats->rx_frame_errors += sstats->rx_frame_errors;
+-		stats->rx_fifo_errors += sstats->rx_fifo_errors;	
++		stats->rx_fifo_errors += sstats->rx_fifo_errors;
+ 		stats->rx_missed_errors += sstats->rx_missed_errors;
+-	
++
+ 		stats->tx_aborted_errors += sstats->tx_aborted_errors;
+ 		stats->tx_carrier_errors += sstats->tx_carrier_errors;
+ 		stats->tx_fifo_errors += sstats->tx_fifo_errors;
+ 		stats->tx_heartbeat_errors += sstats->tx_heartbeat_errors;
+ 		stats->tx_window_errors += sstats->tx_window_errors;
+-
+ 	}
+ 
+ 	read_unlock_bh(&bond->lock);
++
+ 	return stats;
+ }
+ 
+-#ifdef CONFIG_PROC_FS
+-
+-#define SEQ_START_TOKEN ((void *)1)
+-
+-static void *bond_info_seq_start(struct seq_file *seq, loff_t *pos)
++static int bond_do_ioctl(struct net_device *bond_dev, struct ifreq *ifr, int cmd)
+ {
+-	struct bonding *bond = seq->private;
+-	loff_t off = 0;
+-	struct slave *slave;
+-
+-	/* make sure the bond won't be taken away */
+-	read_lock(&dev_base_lock);
+-	read_lock_bh(&bond->lock);
+-
+-	if (*pos == 0) {
+-		return SEQ_START_TOKEN;
+-	}
++	struct net_device *slave_dev = NULL;
++	struct ifbond *u_binfo = NULL, k_binfo;
++	struct ifslave *u_sinfo = NULL, k_sinfo;
++	struct mii_ioctl_data *mii = NULL;
++	int prev_abi_ver = orig_app_abi_ver;
++	int res = 0;
+ 
+-	for (slave = bond->prev; slave != (slave_t *)bond;
+-	     slave = slave->prev) {
++	dprintk("bond_ioctl: master=%s, cmd=%d\n",
++		bond_dev->name, cmd);
+ 
+-		if (++off == *pos) {
+-			return slave;
++	switch (cmd) {
++	case SIOCETHTOOL:
++		return bond_ethtool_ioctl(bond_dev, ifr);
++	case SIOCGMIIPHY:
++		mii = (struct mii_ioctl_data *)&ifr->ifr_data;
++		if (!mii) {
++			return -EINVAL;
++		}
++		mii->phy_id = 0;
++		/* Fall Through */
++	case SIOCGMIIREG:
++		/*
++		 * We do this again just in case we were called by SIOCGMIIREG
++		 * instead of SIOCGMIIPHY.
++		 */
++		mii = (struct mii_ioctl_data *)&ifr->ifr_data;
++		if (!mii) {
++			return -EINVAL;
+ 		}
+-	}
+-
+-	return NULL;
+-}
+-
+-static void *bond_info_seq_next(struct seq_file *seq, void *v, loff_t *pos)
+-{
+-	struct bonding *bond = seq->private;
+-	struct slave *slave = v;
+-
+-	++*pos;
+-	if (v == SEQ_START_TOKEN) {
+-		slave = bond->prev;
+-	} else {
+-		slave = slave->prev;
+-	}
+-
+-	return (slave == (struct slave *) bond) ? NULL : slave;
+-}
+-
+-static void bond_info_seq_stop(struct seq_file *seq, void *v)
+-{
+-	struct bonding *bond = seq->private;
+-
+-	read_unlock_bh(&bond->lock);
+-	read_unlock(&dev_base_lock);
+-}
+-
+-static void bond_info_show_master(struct seq_file *seq, struct bonding *bond)
+-{
+-	struct slave *curr;
+ 
+-	read_lock(&bond->ptrlock);
+-	curr = bond->current_slave;
+-	read_unlock(&bond->ptrlock);
++		if (mii->reg_num == 1) {
++			struct bonding *bond = bond_dev->priv;
++			mii->val_out = 0;
++			read_lock_bh(&bond->lock);
++			read_lock(&bond->curr_slave_lock);
++			if (bond->curr_active_slave) {
++				mii->val_out = BMSR_LSTATUS;
++			}
++			read_unlock(&bond->curr_slave_lock);
++			read_unlock_bh(&bond->lock);
++		}
+ 
+-	seq_printf(seq, "Bonding Mode: %s\n", bond_mode_name());
++		return 0;
++	case BOND_INFO_QUERY_OLD:
++	case SIOCBONDINFOQUERY:
++		u_binfo = (struct ifbond *)ifr->ifr_data;
+ 
+-	if (USES_PRIMARY(bond_mode)) {
+-		if (curr) {
+-			seq_printf(seq,
+-				   "Currently Active Slave: %s\n",
+-				   curr->dev->name);
++		if (copy_from_user(&k_binfo, u_binfo, sizeof(ifbond))) {
++			return -EFAULT;
+ 		}
+-	}
+ 
+-	seq_printf(seq, "MII Status: %s\n", (curr) ? "up" : "down");
+-	seq_printf(seq, "MII Polling Interval (ms): %d\n", miimon);
+-	seq_printf(seq, "Up Delay (ms): %d\n", updelay * miimon);
+-	seq_printf(seq, "Down Delay (ms): %d\n", downdelay * miimon);
+-	seq_printf(seq, "Multicast Mode: %s\n", multicast_mode_name());
+-
+-	if (bond_mode == BOND_MODE_8023AD) {
+-		struct ad_info ad_info;
++		res = bond_info_query(bond_dev, &k_binfo);
++		if (res == 0) {
++			if (copy_to_user(u_binfo, &k_binfo, sizeof(ifbond))) {
++				return -EFAULT;
++			}
++		}
+ 
+-		seq_puts(seq, "\n802.3ad info\n");
++		return res;
++	case BOND_SLAVE_INFO_QUERY_OLD:
++	case SIOCBONDSLAVEINFOQUERY:
++		u_sinfo = (struct ifslave *)ifr->ifr_data;
+ 
+-		if (bond_3ad_get_active_agg_info(bond, &ad_info)) {
+-			seq_printf(seq, "bond %s has no active aggregator\n",
+-				   bond->device->name);
+-		} else {
+-			seq_printf(seq, "Active Aggregator Info:\n");
++		if (copy_from_user(&k_sinfo, u_sinfo, sizeof(ifslave))) {
++			return -EFAULT;
++		}
+ 
+-			seq_printf(seq, "\tAggregator ID: %d\n",
+-				   ad_info.aggregator_id);
+-			seq_printf(seq, "\tNumber of ports: %d\n",
+-				   ad_info.ports);
+-			seq_printf(seq, "\tActor Key: %d\n",
+-				   ad_info.actor_key);
+-			seq_printf(seq, "\tPartner Key: %d\n",
+-				   ad_info.partner_key);
+-			seq_printf(seq, "\tPartner Mac Address: %02x:%02x:%02x:%02x:%02x:%02x\n",
+-				   ad_info.partner_system[0],
+-				   ad_info.partner_system[1],
+-				   ad_info.partner_system[2],
+-				   ad_info.partner_system[3],
+-				   ad_info.partner_system[4],
+-				   ad_info.partner_system[5]);
++		res = bond_slave_info_query(bond_dev, &k_sinfo);
++		if (res == 0) {
++			if (copy_to_user(u_sinfo, &k_sinfo, sizeof(ifslave))) {
++				return -EFAULT;
++			}
+ 		}
++
++		return res;
++	default:
++		/* Go on */
++		break;
+ 	}
+-}
+ 
+-static void bond_info_show_slave(struct seq_file *seq, const struct slave *slave)
+-{
+-	seq_printf(seq, "\nSlave Interface: %s\n", slave->dev->name);
+-	seq_printf(seq, "MII Status: %s\n",
+-		   (slave->link == BOND_LINK_UP) ?  "up" : "down");
+-	seq_printf(seq, "Link Failure Count: %d\n",
+-		   slave->link_failure_count);
++	if (!capable(CAP_NET_ADMIN)) {
++		return -EPERM;
++	}
+ 
+-	if (app_abi_ver >= 1) {
+-		seq_printf(seq,
+-			   "Permanent HW addr: %02x:%02x:%02x:%02x:%02x:%02x\n",
+-			   slave->perm_hwaddr[0],
+-			   slave->perm_hwaddr[1],
+-			   slave->perm_hwaddr[2],
+-			   slave->perm_hwaddr[3],
+-			   slave->perm_hwaddr[4],
+-			   slave->perm_hwaddr[5]);
++	if (orig_app_abi_ver == -1) {
++		/* no orig_app_abi_ver was provided yet, so we'll use the
++		 * current one from now on, even if it's 0
++		 */
++		orig_app_abi_ver = app_abi_ver;
++
++	} else if (orig_app_abi_ver != app_abi_ver) {
++		printk(KERN_ERR DRV_NAME
++		       ": Error: already using ifenslave ABI version %d; to "
++		       "upgrade ifenslave to version %d, you must first "
++		       "reload bonding.\n",
++		       orig_app_abi_ver, app_abi_ver);
++		return -EINVAL;
+ 	}
+ 
+-	if (bond_mode == BOND_MODE_8023AD) {
+-		const struct aggregator *agg
+-			= SLAVE_AD_INFO(slave).port.aggregator;
++	slave_dev = dev_get_by_name(ifr->ifr_slave);
+ 
+-		if (agg) {
+-			seq_printf(seq, "Aggregator ID: %d\n",
+-				   agg->aggregator_identifier);
+-		} else {
+-			seq_puts(seq, "Aggregator ID: N/A\n");
++	dprintk("slave_dev=%p: \n", slave_dev);
++
++	if (!slave_dev) {
++		res = -ENODEV;
++	} else {
++		dprintk("slave_dev->name=%s: \n", slave_dev->name);
++		switch (cmd) {
++		case BOND_ENSLAVE_OLD:
++		case SIOCBONDENSLAVE:
++			res = bond_enslave(bond_dev, slave_dev);
++			break;
++		case BOND_RELEASE_OLD:
++		case SIOCBONDRELEASE:
++			res = bond_release(bond_dev, slave_dev);
++			break;
++		case BOND_SETHWADDR_OLD:
++		case SIOCBONDSETHWADDR:
++			res = bond_sethwaddr(bond_dev, slave_dev);
++			break;
++		case BOND_CHANGE_ACTIVE_OLD:
++		case SIOCBONDCHANGEACTIVE:
++			if (USES_PRIMARY(bond_mode)) {
++				res = bond_ioctl_change_active(bond_dev, slave_dev);
++			} else {
++				res = -EINVAL;
++			}
++			break;
++		default:
++			res = -EOPNOTSUPP;
+ 		}
++
++		dev_put(slave_dev);
+ 	}
+-}
+ 
+-static int bond_info_seq_show(struct seq_file *seq, void *v)
+-{
+-	if (v == SEQ_START_TOKEN) {
+-		seq_printf(seq, "%s\n", version);
+-		bond_info_show_master(seq, seq->private);
+-	} else {
+-		bond_info_show_slave(seq, v);
++	if (res < 0) {
++		/* The ioctl failed, so there's no point in changing the
++		 * orig_app_abi_ver. We'll restore it's value just in case
++		 * we've changed it earlier in this function.
++		 */
++		orig_app_abi_ver = prev_abi_ver;
+ 	}
+ 
+-	return 0;
++	return res;
+ }
+ 
+-static struct seq_operations bond_info_seq_ops = {
+-	.start = bond_info_seq_start,
+-	.next  = bond_info_seq_next,
+-	.stop  = bond_info_seq_stop,
+-	.show  = bond_info_seq_show,
+-};
+-
+-static int bond_info_open(struct inode *inode, struct file *file)
++static void bond_set_multicast_list(struct net_device *bond_dev)
+ {
+-	struct seq_file *seq;
+-	struct proc_dir_entry *proc;
+-	int rc;
+-
+-	rc = seq_open(file, &bond_info_seq_ops);
+-	if (!rc) {
+-		/* recover the pointer buried in proc_dir_entry data */
+-		seq = file->private_data;
+-		proc = PDE(inode);
+-		seq->private = proc->data;
+-	}
+-	return rc;
+-}
++	struct bonding *bond = bond_dev->priv;
++	struct dev_mc_list *dmi;
+ 
+-static struct file_operations bond_info_fops = {
+-	.owner	 = THIS_MODULE,
+-	.open    = bond_info_open,
+-	.read    = seq_read,
+-	.llseek  = seq_lseek,
+-	.release = seq_release,
+-};
++	write_lock_bh(&bond->lock);
+ 
+-static int bond_create_proc_info(struct bonding *bond)
+-{
+-	struct net_device *dev = bond->device;
++	/*
++	 * Do promisc before checking multicast_mode
++	 */
++	if ((bond_dev->flags & IFF_PROMISC) && !(bond->flags & IFF_PROMISC)) {
++		bond_set_promiscuity(bond, 1);
++	}
+ 
+-	if (bond_proc_dir) {
+-		bond->bond_proc_file = create_proc_entry(dev->name,
+-							 S_IRUGO, 
+-							 bond_proc_dir);
+-		if (bond->bond_proc_file == NULL) {
+-			printk(KERN_WARNING
+-			       "%s: Cannot create /proc/net/bonding/%s\n", 
+-			       dev->name, dev->name);
+-		} else {
+-			bond->bond_proc_file->data = bond;
+-			bond->bond_proc_file->proc_fops = &bond_info_fops;
+-			bond->bond_proc_file->owner = THIS_MODULE;
+-			memcpy(bond->procdir_name, dev->name, IFNAMSIZ);
+-		}
++	if (!(bond_dev->flags & IFF_PROMISC) && (bond->flags & IFF_PROMISC)) {
++		bond_set_promiscuity(bond, -1);
+ 	}
+ 
+-	return 0;
+-}
++	/* set allmulti flag to slaves */
++	if ((bond_dev->flags & IFF_ALLMULTI) && !(bond->flags & IFF_ALLMULTI)) {
++		bond_set_allmulti(bond, 1);
++	}
+ 
+-static void bond_destroy_proc_info(struct bonding *bond)
+-{
+-	if (bond_proc_dir && bond->bond_proc_file) {
+-		remove_proc_entry(bond->procdir_name, bond_proc_dir);
+-		memset(bond->procdir_name, 0, IFNAMSIZ);
+-		bond->bond_proc_file = NULL;
++	if (!(bond_dev->flags & IFF_ALLMULTI) && (bond->flags & IFF_ALLMULTI)) {
++		bond_set_allmulti(bond, -1);
+ 	}
+-}
+ 
+-/* Create the bonding directory under /proc/net, if doesn't exist yet.
+- * Caller must hold rtnl_lock.
+- */
+-static void bond_create_proc_dir(void)
+-{
+-	int len = strlen(DRV_NAME);
++	bond->flags = bond_dev->flags;
+ 
+-	for (bond_proc_dir = proc_net->subdir; bond_proc_dir;
+-	     bond_proc_dir = bond_proc_dir->next) {
+-		if ((bond_proc_dir->namelen == len) &&
+-		    !memcmp(bond_proc_dir->name, DRV_NAME, len)) {
+-			break;
++	/* looking for addresses to add to slaves' mc list */
++	for (dmi = bond_dev->mc_list; dmi; dmi = dmi->next) {
++		if (!bond_mc_list_find_dmi(dmi, bond->mc_list)) {
++			bond_mc_add(bond, dmi->dmi_addr, dmi->dmi_addrlen);
+ 		}
+ 	}
+ 
+-	if (!bond_proc_dir) {
+-		bond_proc_dir = proc_mkdir(DRV_NAME, proc_net);
+-		if (bond_proc_dir) {
+-			bond_proc_dir->owner = THIS_MODULE;
+-		} else {
+-			printk(KERN_WARNING DRV_NAME
+-				": Warning: cannot create /proc/net/%s\n",
+-				DRV_NAME);
++	/* looking for addresses to delete from slaves' list */
++	for (dmi = bond->mc_list; dmi; dmi = dmi->next) {
++		if (!bond_mc_list_find_dmi(dmi, bond_dev->mc_list)) {
++			bond_mc_delete(bond, dmi->dmi_addr, dmi->dmi_addrlen);
+ 		}
+ 	}
++
++	/* save master's multicast list */
++	bond_mc_list_destroy(bond);
++	bond_mc_list_copy(bond_dev->mc_list, bond, GFP_ATOMIC);
++
++	write_unlock_bh(&bond->lock);
+ }
+ 
+-/* Destroy the bonding directory under /proc/net, if empty.
+- * Caller must hold rtnl_lock.
++/*
++ * Change the MTU of all of a master's slaves to match the master
+  */
+-static void bond_destroy_proc_dir(void)
++static int bond_change_mtu(struct net_device *bond_dev, int new_mtu)
+ {
+-	struct proc_dir_entry *de;
++	struct bonding *bond = bond_dev->priv;
++	struct slave *slave, *stop_at;
++	int res = 0;
++	int i;
+ 
+-	if (!bond_proc_dir) {
+-		return;
+-	}
++	dprintk("bond=%p, name=%s, new_mtu=%d\n", bond,
++		(bond_dev ? bond_dev->name : "None"), new_mtu);
+ 
+-	/* verify that the /proc dir is empty */
+-	for (de = bond_proc_dir->subdir; de; de = de->next) {
+-		/* ignore . and .. */
+-		if (*(de->name) != '.') {
+-			break;
++	/* Can't hold bond->lock with bh disabled here since
++	 * some base drivers panic. On the other hand we can't
++	 * hold bond->lock without bh disabled because we'll
++	 * deadlock. The only solution is to rely on the fact
++	 * that we're under rtnl_lock here, and the slaves
++	 * list won't change. This doesn't solve the problem
++	 * of setting the slave's MTU while it is
++	 * transmitting, but the assumption is that the base
++	 * driver can handle that.
++	 *
++	 * TODO: figure out a way to safely iterate the slaves
++	 * list, but without holding a lock around the actual
++	 * call to the base driver.
++	 */
++
++	bond_for_each_slave(bond, slave, i) {
++		dprintk("s %p s->p %p c_m %p\n", slave,
++			slave->prev, slave->dev->change_mtu);
++		if (slave->dev->change_mtu) {
++			res = slave->dev->change_mtu(slave->dev, new_mtu);
++		} else {
++			slave->dev->mtu = new_mtu;
++			res = 0;
++		}
++
++		if (res) {
++			/* If we failed to set the slave's mtu to the new value
++			 * we must abort the operation even in ACTIVE_BACKUP
++			 * mode, because if we allow the backup slaves to have
++			 * different mtu values than the active slave we'll
++			 * need to change their mtu when doing a failover. That
++			 * means changing their mtu from timer context, which
++			 * is probably not a good idea.
++			 */
++			dprintk("err %d %s\n", res, slave->dev->name);
++			goto unwind;
+ 		}
+ 	}
+ 
+-	if (de) {
+-		if (bond_proc_dir->owner == THIS_MODULE) {
+-			bond_proc_dir->owner = NULL;
++	bond_dev->mtu = new_mtu;
++
++	return 0;
++
++unwind:
++	/* unwind from head to the slave that failed */
++	stop_at = slave;
++	bond_for_each_slave_from_to(bond, slave, i, bond->first_slave, stop_at) {
++		int tmp_res;
++
++		if (slave->dev->change_mtu) {
++			tmp_res = slave->dev->change_mtu(slave->dev, bond_dev->mtu);
++			if (tmp_res) {
++				dprintk("unwind err %d dev %s\n", tmp_res,
++					slave->dev->name);
++			}
++		} else {
++			slave->dev->mtu = bond_dev->mtu;
+ 		}
+-	} else {
+-		remove_proc_entry(DRV_NAME, proc_net);
+-		bond_proc_dir = NULL;
+ 	}
++
++	return res;
+ }
+-#endif /* CONFIG_PROC_FS */
+ 
+ /*
+  * Change HW address
+@@ -3638,353 +3426,366 @@ static void bond_destroy_proc_dir(void)
+  * downing the master releases all slaves.  We can make bonds full of
+  * bonding devices to test this, however.
+  */
+-static inline int
+-bond_set_mac_address(struct net_device *dev, void *addr)
++static int bond_set_mac_address(struct net_device *bond_dev, void *addr)
+ {
+-	struct bonding *bond = dev->priv;
++	struct bonding *bond = bond_dev->priv;
+ 	struct sockaddr *sa = addr, tmp_sa;
+-	struct slave *slave;
+-	int error;
++	struct slave *slave, *stop_at;
++	int res = 0;
++	int i;
+ 
+-	dprintk(KERN_INFO "bond_set_mac_address %p %s\n", dev,
+-	       dev->name);
++	dprintk("bond=%p, name=%s\n", bond, (bond_dev ? bond_dev->name : "None"));
+ 
+ 	if (!is_valid_ether_addr(sa->sa_data)) {
+ 		return -EADDRNOTAVAIL;
+ 	}
+ 
+-	for (slave = bond->prev; slave != (struct slave *)bond;
+-	     slave = slave->prev) {
+-		dprintk(KERN_INFO "bond_set_mac: slave %p %s\n", slave,
+-			slave->dev->name);
++	/* Can't hold bond->lock with bh disabled here since
++	 * some base drivers panic. On the other hand we can't
++	 * hold bond->lock without bh disabled because we'll
++	 * deadlock. The only solution is to rely on the fact
++	 * that we're under rtnl_lock here, and the slaves
++	 * list won't change. This doesn't solve the problem
++	 * of setting the slave's hw address while it is
++	 * transmitting, but the assumption is that the base
++	 * driver can handle that.
++	 *
++	 * TODO: figure out a way to safely iterate the slaves
++	 * list, but without holding a lock around the actual
++	 * call to the base driver.
++	 */
++
++	bond_for_each_slave(bond, slave, i) {
++		dprintk("slave %p %s\n", slave, slave->dev->name);
++
+ 		if (slave->dev->set_mac_address == NULL) {
+-			error = -EOPNOTSUPP;
+-			dprintk(KERN_INFO "bond_set_mac EOPNOTSUPP %s\n",
+-				slave->dev->name);
++			res = -EOPNOTSUPP;
++			dprintk("EOPNOTSUPP %s\n", slave->dev->name);
+ 			goto unwind;
+ 		}
+ 
+-		error = slave->dev->set_mac_address(slave->dev, addr);
+-		if (error) {
+-			/* TODO: consider downing the slave 
++		res = slave->dev->set_mac_address(slave->dev, addr);
++		if (res) {
++			/* TODO: consider downing the slave
+ 			 * and retry ?
+ 			 * User should expect communications
+ 			 * breakage anyway until ARP finish
+ 			 * updating, so...
+ 			 */
+-			dprintk(KERN_INFO "bond_set_mac err %d %s\n",
+-				error, slave->dev->name);
++			dprintk("err %d %s\n", res, slave->dev->name);
+ 			goto unwind;
+ 		}
+ 	}
+ 
+ 	/* success */
+-	memcpy(dev->dev_addr, sa->sa_data, dev->addr_len);
++	memcpy(bond_dev->dev_addr, sa->sa_data, bond_dev->addr_len);
+ 	return 0;
+ 
+ unwind:
+-	memcpy(tmp_sa.sa_data, dev->dev_addr, dev->addr_len);
+-	tmp_sa.sa_family = dev->type;
++	memcpy(tmp_sa.sa_data, bond_dev->dev_addr, bond_dev->addr_len);
++	tmp_sa.sa_family = bond_dev->type;
+ 
+-	for (slave = slave->next; slave != bond->next;
+-	     slave = slave->next) {
+-		int tmp_error;
+-
+-		tmp_error = slave->dev->set_mac_address(slave->dev, &tmp_sa);
+-		if (tmp_error) {
+-			dprintk(KERN_INFO "bond_set_mac_address: "
+-				"unwind err %d dev %s\n",
+-				tmp_error, slave->dev->name);
++	/* unwind from head to the slave that failed */
++	stop_at = slave;
++	bond_for_each_slave_from_to(bond, slave, i, bond->first_slave, stop_at) {
++		int tmp_res;
++
++		tmp_res = slave->dev->set_mac_address(slave->dev, &tmp_sa);
++		if (tmp_res) {
++			dprintk("unwind err %d dev %s\n", tmp_res,
++				slave->dev->name);
+ 		}
+ 	}
+ 
+-	return error;
++	return res;
+ }
+ 
+-/*
+- * Change the MTU of all of a master's slaves to match the master
+- */
+-static inline int
+-bond_change_mtu(struct net_device *dev, int newmtu)
++static int bond_xmit_roundrobin(struct sk_buff *skb, struct net_device *bond_dev)
+ {
+-	bonding_t *bond = dev->priv;
+-	slave_t *slave;
+-	int error;
+-
+-	dprintk(KERN_INFO "CM: b %p nm %d\n", bond, newmtu);
+-	for (slave = bond->prev; slave != (slave_t *)bond;
+-	     slave = slave->prev) {
+-		dprintk(KERN_INFO "CM: s %p s->p %p c_m %p\n", slave,
+-			slave->prev, slave->dev->change_mtu);
+-		if (slave->dev->change_mtu) {
+-			error = slave->dev->change_mtu(slave->dev, newmtu);
+-		} else {
+-			slave->dev->mtu = newmtu;
+-			error = 0;
+-		}
++	struct bonding *bond = bond_dev->priv;
++	struct slave *slave, *start_at;
++	int i;
+ 
+-		if (error) {
+-			/* If we failed to set the slave's mtu to the new value
+-			 * we must abort the operation even in ACTIVE_BACKUP
+-			 * mode, because if we allow the backup slaves to have
+-			 * different mtu values than the active slave we'll
+-			 * need to change their mtu when doing a failover. That
+-			 * means changing their mtu from timer context, which
+-			 * is probably not a good idea.
+-			 */
+-			dprintk(KERN_INFO "bond_change_mtu err %d %s\n",
+-			       error, slave->dev->name);
+-			goto unwind;
++	read_lock(&bond->lock);
++
++	if (!BOND_IS_OK(bond)) {
++		goto free_out;
++	}
++
++	read_lock(&bond->curr_slave_lock);
++	slave = start_at = bond->curr_active_slave;
++	read_unlock(&bond->curr_slave_lock);
++
++	if (!slave) {
++		goto free_out;
++	}
++
++	bond_for_each_slave_from(bond, slave, i, start_at) {
++		if (IS_UP(slave->dev) &&
++		    (slave->link == BOND_LINK_UP) &&
++		    (slave->state == BOND_STATE_ACTIVE)) {
++			skb->dev = slave->dev;
++			skb->priority = 1;
++			dev_queue_xmit(skb);
++
++			write_lock(&bond->curr_slave_lock);
++			bond->curr_active_slave = slave->next;
++			write_unlock(&bond->curr_slave_lock);
++
++			goto out;
+ 		}
+ 	}
+ 
+-	dev->mtu = newmtu;
++out:
++	read_unlock(&bond->lock);
+ 	return 0;
+ 
++free_out:
++	/* no suitable interface, frame not sent */
++	dev_kfree_skb(skb);
++	goto out;
++}
+ 
+-unwind:
+-	for (slave = slave->next; slave != bond->next;
+-	     slave = slave->next) {
++/*
++ * in active-backup mode, we know that bond->curr_active_slave is always valid if
++ * the bond has a usable interface.
++ */
++static int bond_xmit_activebackup(struct sk_buff *skb, struct net_device *bond_dev)
++{
++	struct bonding *bond = bond_dev->priv;
+ 
+-		if (slave->dev->change_mtu) {
+-			slave->dev->change_mtu(slave->dev, dev->mtu);
+-		} else {
+-			slave->dev->mtu = dev->mtu;
+-		}
++	/* if we are sending arp packets, try to at least
++	   identify our own ip address */
++	if (arp_interval && !my_ip &&
++		(skb->protocol == __constant_htons(ETH_P_ARP))) {
++		char *the_ip = (char *)skb->data +
++				sizeof(struct ethhdr) +
++				sizeof(struct arphdr) +
++				ETH_ALEN;
++		memcpy(&my_ip, the_ip, 4);
+ 	}
+ 
+-	return error;
++	read_lock(&bond->lock);
++	read_lock(&bond->curr_slave_lock);
++
++	if (!BOND_IS_OK(bond)) {
++		goto free_out;
++	}
++
++	if (bond->curr_active_slave) { /* one usable interface */
++		skb->dev = bond->curr_active_slave->dev;
++		skb->priority = 1;
++		dev_queue_xmit(skb);
++		goto out;
++	} else {
++		goto free_out;
++	}
++out:
++	read_unlock(&bond->curr_slave_lock);
++	read_unlock(&bond->lock);
++	return 0;
++
++free_out:
++	/* no suitable interface, frame not sent */
++	dev_kfree_skb(skb);
++	goto out;
+ }
+ 
+ /*
+- * Change device name
++ * in XOR mode, we determine the output device by performing xor on
++ * the source and destination hw adresses.  If this device is not
++ * enabled, find the next slave following this xor slave.
+  */
+-static inline int bond_event_changename(struct bonding *bond)
++static int bond_xmit_xor(struct sk_buff *skb, struct net_device *bond_dev)
+ {
+-#ifdef CONFIG_PROC_FS
+-	bond_destroy_proc_info(bond);
+-	bond_create_proc_info(bond);
+-#endif
+-
+-	return NOTIFY_DONE;
+-}
++	struct bonding *bond = bond_dev->priv;
++	struct ethhdr *data = (struct ethhdr *)skb->data;
++	struct slave *slave, *start_at;
++	int slave_no;
++	int i;
+ 
+-static int bond_master_netdev_event(unsigned long event, struct net_device *event_dev)
+-{
+-	struct bonding *bond, *event_bond = NULL;
++	read_lock(&bond->lock);
+ 
+-	list_for_each_entry(bond, &bond_dev_list, bond_list) {
+-		if (bond == event_dev->priv) {
+-			event_bond = bond;
+-			break;
+-		}
++	if (!BOND_IS_OK(bond)) {
++		goto free_out;
+ 	}
+ 
+-	if (event_bond == NULL) {
+-		return NOTIFY_DONE;
+-	}
++	slave_no = (data->h_dest[5]^bond_dev->dev_addr[5]) % bond->slave_cnt;
+ 
+-	switch (event) {
+-	case NETDEV_CHANGENAME:
+-		return bond_event_changename(event_bond);
+-	case NETDEV_UNREGISTER:
+-		/*
+-		 * TODO: remove a bond from the list?
+-		 */
+-		break;
+-	default:
+-		break;
++	bond_for_each_slave(bond, slave, i) {
++		slave_no--;
++		if (slave_no < 0) {
++			break;
++		}
+ 	}
+ 
+-	return NOTIFY_DONE;
+-}
++	start_at = slave;
+ 
+-static int bond_slave_netdev_event(unsigned long event, struct net_device *event_dev)
+-{
+-	struct net_device *master = event_dev->master;
++	bond_for_each_slave_from(bond, slave, i, start_at) {
++		if (IS_UP(slave->dev) &&
++		    (slave->link == BOND_LINK_UP) &&
++		    (slave->state == BOND_STATE_ACTIVE)) {
++			skb->dev = slave->dev;
++			skb->priority = 1;
++			dev_queue_xmit(skb);
+ 
+-	switch (event) {
+-	case NETDEV_UNREGISTER:
+-		if (master != NULL) {
+-			bond_release(master, event_dev);
++			goto out;
+ 		}
+-		break;
+-	case NETDEV_CHANGE:
+-		/*
+-		 * TODO: is this what we get if somebody
+-		 * sets up a hierarchical bond, then rmmod's
+-		 * one of the slave bonding devices?
+-		 */
+-		break;
+-	case NETDEV_DOWN:
+-		/*
+-		 * ... Or is it this?
+-		 */
+-		break;
+-	case NETDEV_CHANGEMTU:
+-		/*
+-		 * TODO: Should slaves be allowed to
+-		 * independently alter their MTU?  For
+-		 * an active-backup bond, slaves need
+-		 * not be the same type of device, so
+-		 * MTUs may vary.  For other modes,
+-		 * slaves arguably should have the
+-		 * same MTUs. To do this, we'd need to
+-		 * take over the slave's change_mtu
+-		 * function for the duration of their
+-		 * servitude.
+-		 */
+-		break;
+-	case NETDEV_CHANGENAME:
+-		/*
+-		 * TODO: handle changing the primary's name
+-		 */
+-		break;
+-	default:
+-		break;
+ 	}
+ 
+-	return NOTIFY_DONE;
++out:
++	read_unlock(&bond->lock);
++	return 0;
++
++free_out:
++	/* no suitable interface, frame not sent */
++	dev_kfree_skb(skb);
++	goto out;
+ }
+ 
+ /*
+- * bond_netdev_event: handle netdev notifier chain events.
+- *
+- * This function receives events for the netdev chain.  The caller (an
+- * ioctl handler calling notifier_call_chain) holds the necessary
+- * locks for us to safely manipulate the slave devices (RTNL lock,
+- * dev_probe_lock).
++ * in broadcast mode, we send everything to all usable interfaces.
+  */
+-static int bond_netdev_event(struct notifier_block *this, unsigned long event, void *ptr)
++static int bond_xmit_broadcast(struct sk_buff *skb, struct net_device *bond_dev)
+ {
+-	struct net_device *event_dev = (struct net_device *)ptr;
+-	unsigned short flags;
+-	int res = NOTIFY_DONE;
++	struct bonding *bond = bond_dev->priv;
++	struct slave *slave, *start_at;
++	struct net_device *tx_dev = NULL;
++	int i;
+ 
+-	dprintk(KERN_INFO "bond_netdev_event n_b %p ev %lx ptr %p\n",
+-		this, event, ptr);
++	read_lock(&bond->lock);
+ 
+-	flags = event_dev->flags & (IFF_MASTER | IFF_SLAVE);
+-	switch (flags) {
+-	case IFF_MASTER:
+-		res = bond_master_netdev_event(event, event_dev);
+-		break;
+-	case IFF_SLAVE:
+-		res = bond_slave_netdev_event(event, event_dev);
+-		break;
+-	default:
+-		/* A master that is also a slave ? */
+-		break;
++	if (!BOND_IS_OK(bond)) {
++		goto free_out;
+ 	}
+ 
+-	return res;
+-}
++	read_lock(&bond->curr_slave_lock);
++	start_at = bond->curr_active_slave;
++	read_unlock(&bond->curr_slave_lock);
++
++	if (!start_at) {
++		goto free_out;
++	}
++
++	bond_for_each_slave_from(bond, slave, i, start_at) {
++		if (IS_UP(slave->dev) &&
++		    (slave->link == BOND_LINK_UP) &&
++		    (slave->state == BOND_STATE_ACTIVE)) {
++			if (tx_dev) {
++				struct sk_buff *skb2 = skb_clone(skb, GFP_ATOMIC);
++				if (!skb2) {
++					printk(KERN_ERR DRV_NAME
++					       ": Error: bond_xmit_broadcast(): "
++					       "skb_clone() failed\n");
++					continue;
++				}
+ 
+-static struct notifier_block bond_netdev_notifier = {
+-	.notifier_call = bond_netdev_event,
+-};
++				skb2->dev = tx_dev;
++				skb2->priority = 1;
++				dev_queue_xmit(skb2);
++			}
++			tx_dev = slave->dev;
++		}
++	}
+ 
+-/* De-initialize device specific data.
+- * Caller must hold rtnl_lock.
+- */
+-static inline void bond_deinit(struct net_device *dev)
+-{
+-	struct bonding *bond = dev->priv;
++	if (tx_dev) {
++		skb->dev = tx_dev;
++		skb->priority = 1;
++		dev_queue_xmit(skb);
++	} else {
++		goto free_out;
++	}
+ 
+-	list_del(&bond->bond_list);
++out:
++	/* frame sent to all suitable interfaces */
++	read_unlock(&bond->lock);
++	return 0;
+ 
+-#ifdef CONFIG_PROC_FS
+-	bond_destroy_proc_info(bond);
+-#endif
++free_out:
++	/* no suitable interface, frame not sent */
++	dev_kfree_skb(skb);
++	goto out;
+ }
+ 
+-/* Unregister and free all bond devices.
+- * Caller must hold rtnl_lock.
+- */
+-static void bond_free_all(void)
++#ifdef CONFIG_NET_FASTROUTE
++static int bond_accept_fastpath(struct net_device *bond_dev, struct dst_entry *dst)
+ {
+-	struct bonding *bond, *nxt;
+-
+-	list_for_each_entry_safe(bond, nxt, &bond_dev_list, bond_list) {
+-		struct net_device *dev = bond->device;
+-
+-		unregister_netdevice(dev);
+-		bond_deinit(dev);
+-		free_netdev(dev);
+-	}
+-
+-#ifdef CONFIG_PROC_FS
+-	bond_destroy_proc_dir();
+-#endif
++	return -1;
+ }
++#endif
++
++/*------------------------- Device initialization ---------------------------*/
+ 
+ /*
+  * Does not allocate but creates a /proc entry.
+  * Allowed to fail.
+  */
+-static int __init bond_init(struct net_device *dev)
++static int __init bond_init(struct net_device *bond_dev)
+ {
+-	struct bonding *bond;
++	struct bonding *bond = bond_dev->priv;
+ 	int count;
+ 
+-#ifdef BONDING_DEBUG
+-	printk (KERN_INFO "Begin bond_init for %s\n", dev->name);
+-#endif
+-	bond = dev->priv;
++	dprintk("Begin bond_init for %s\n", bond_dev->name);
+ 
+ 	/* initialize rwlocks */
+ 	rwlock_init(&bond->lock);
+-	rwlock_init(&bond->ptrlock);
++	rwlock_init(&bond->curr_slave_lock);
+ 
+ 	/* Initialize pointers */
+-	bond->next = bond->prev = (slave_t *)bond;
+-	bond->current_slave = NULL;
++	bond->first_slave = NULL;
++	bond->curr_active_slave = NULL;
+ 	bond->current_arp_slave = NULL;
+-	bond->device = dev;
++	bond->primary_slave = NULL;
++	bond->dev = bond_dev;
+ 
+-	/* Initialize the device structure. */
+-	dev->set_mac_address = bond_set_mac_address;
++	/* Initialize the device entry points */
++	bond_dev->open = bond_open;
++	bond_dev->stop = bond_close;
++	bond_dev->get_stats = bond_get_stats;
++	bond_dev->do_ioctl = bond_do_ioctl;
++	bond_dev->set_multicast_list = bond_set_multicast_list;
++	bond_dev->change_mtu = bond_change_mtu;
++	bond_dev->set_mac_address = bond_set_mac_address;
+ 
+ 	switch (bond_mode) {
+-	case BOND_MODE_ACTIVEBACKUP:
+-		dev->hard_start_xmit = bond_xmit_activebackup;
+-		break;
+ 	case BOND_MODE_ROUNDROBIN:
+-		dev->hard_start_xmit = bond_xmit_roundrobin;
++		bond_dev->hard_start_xmit = bond_xmit_roundrobin;
++		break;
++	case BOND_MODE_ACTIVEBACKUP:
++		bond_dev->hard_start_xmit = bond_xmit_activebackup;
+ 		break;
+ 	case BOND_MODE_XOR:
+-		dev->hard_start_xmit = bond_xmit_xor;
++		bond_dev->hard_start_xmit = bond_xmit_xor;
+ 		break;
+ 	case BOND_MODE_BROADCAST:
+-		dev->hard_start_xmit = bond_xmit_broadcast;
++		bond_dev->hard_start_xmit = bond_xmit_broadcast;
+ 		break;
+ 	case BOND_MODE_8023AD:
+-		dev->hard_start_xmit = bond_3ad_xmit_xor;
++		bond_dev->hard_start_xmit = bond_3ad_xmit_xor; /* extern */
+ 		break;
+ 	case BOND_MODE_TLB:
+ 	case BOND_MODE_ALB:
+-		dev->hard_start_xmit = bond_alb_xmit;
+-		dev->set_mac_address = bond_alb_set_mac_address;
++		bond_dev->hard_start_xmit = bond_alb_xmit; /* extern */
++		bond_dev->set_mac_address = bond_alb_set_mac_address; /* extern */
+ 		break;
+ 	default:
+-		printk(KERN_ERR "Unknown bonding mode %d\n", bond_mode);
++		printk(KERN_ERR DRV_NAME
++		       ": Error: Unknown bonding mode %d\n",
++		       bond_mode);
+ 		return -EINVAL;
+ 	}
+ 
+-	dev->get_stats = bond_get_stats;
+-	dev->open = bond_open;
+-	dev->stop = bond_close;
+-	dev->set_multicast_list = set_multicast_list;
+-	dev->do_ioctl = bond_ioctl;
+-	dev->change_mtu = bond_change_mtu;
+-	dev->tx_queue_len = 0;
+-	dev->flags |= IFF_MASTER|IFF_MULTICAST;
++	bond_dev->destructor = free_netdev;
+ #ifdef CONFIG_NET_FASTROUTE
+-	dev->accept_fastpath = bond_accept_fastpath;
++	bond_dev->accept_fastpath = bond_accept_fastpath;
+ #endif
+ 
+-	printk(KERN_INFO "%s registered with", dev->name);
+-	if (miimon > 0) {
++	/* Initialize the device options */
++	bond_dev->tx_queue_len = 0;
++	bond_dev->flags |= IFF_MASTER|IFF_MULTICAST;
++
++	printk(KERN_INFO DRV_NAME ": %s registered with", bond_dev->name);
++	if (miimon) {
+ 		printk(" MII link monitoring set to %d ms", miimon);
+ 		updelay /= miimon;
+ 		downdelay /= miimon;
+@@ -3993,19 +3794,20 @@ static int __init bond_init(struct net_d
+ 	}
+ 	printk(", in %s mode.\n", bond_mode_name());
+ 
+-	printk(KERN_INFO "%s registered with", dev->name);
++	printk(KERN_INFO DRV_NAME ": %s registered with", bond_dev->name);
+ 	if (arp_interval > 0) {
+-		printk(" ARP monitoring set to %d ms with %d target(s):", 
+-			arp_interval, arp_ip_count);
+-		for (count=0 ; count<arp_ip_count ; count++)
+-                        printk (" %s", arp_ip_target[count]);
++		printk(" ARP monitoring set to %d ms with %d target(s):",
++		       arp_interval, arp_ip_count);
++		for (count=0 ; count<arp_ip_count ; count++) {
++			printk(" %s", arp_ip_target[count]);
++		}
+ 		printk("\n");
+ 	} else {
+ 		printk("out ARP monitoring\n");
+ 	}
+- 
++
+ #ifdef CONFIG_PROC_FS
+-	bond_create_proc_info(bond);
++	bond_create_proc_entry(bond);
+ #endif
+ 
+ 	list_add_tail(&bond->bond_list, &bond_dev_list);
+@@ -4013,28 +3815,54 @@ static int __init bond_init(struct net_d
+ 	return 0;
+ }
+ 
+-/*
+-static int __init bond_probe(struct net_device *dev)
++/* De-initialize device specific data.
++ * Caller must hold rtnl_lock.
++ */
++static inline void bond_deinit(struct net_device *bond_dev)
+ {
+-	bond_init(dev);
+-	return 0;
++	struct bonding *bond = bond_dev->priv;
++
++	list_del(&bond->bond_list);
++
++#ifdef CONFIG_PROC_FS
++	bond_remove_proc_entry(bond);
++#endif
+ }
++
++/* Unregister and free all bond devices.
++ * Caller must hold rtnl_lock.
+  */
++static void bond_free_all(void)
++{
++	struct bonding *bond, *nxt;
++
++	list_for_each_entry_safe(bond, nxt, &bond_dev_list, bond_list) {
++		struct net_device *bond_dev = bond->dev;
++
++		unregister_netdevice(bond_dev);
++		bond_deinit(bond_dev);
++	}
++
++#ifdef CONFIG_PROC_FS
++	bond_destroy_proc_dir();
++#endif
++}
++
++/*------------------------- Module initialization ---------------------------*/
+ 
+ /*
+  * Convert string input module parms.  Accept either the
+  * number of the mode or its string name.
+  */
+-static inline int
+-bond_parse_parm(char *mode_arg, struct bond_parm_tbl *tbl)
++static inline int bond_parse_parm(char *mode_arg, struct bond_parm_tbl *tbl)
+ {
+ 	int i;
+ 
+-	for (i = 0; tbl[i].modename != NULL; i++) {
++	for (i = 0; tbl[i].modename; i++) {
+ 		if ((isdigit(*mode_arg) &&
+-		    tbl[i].mode == simple_strtol(mode_arg, NULL, 0)) ||
+-		    (0 == strncmp(mode_arg, tbl[i].modename,
+-				  strlen(tbl[i].modename)))) {
++		     tbl[i].mode == simple_strtol(mode_arg, NULL, 0)) ||
++		    (strncmp(mode_arg, tbl[i].modename,
++			     strlen(tbl[i].modename)) == 0)) {
+ 			return tbl[i].mode;
+ 		}
+ 	}
+@@ -4042,88 +3870,64 @@ bond_parse_parm(char *mode_arg, struct b
+ 	return -1;
+ }
+ 
+-
+-static int __init bonding_init(void)
++static int bond_check_params(void)
+ {
+-	int no;
+-	int err;
+-
+-	printk(KERN_INFO "%s", version);
+-
+ 	/*
+ 	 * Convert string parameters.
+ 	 */
+ 	if (mode) {
+ 		bond_mode = bond_parse_parm(mode, bond_mode_tbl);
+ 		if (bond_mode == -1) {
+-			printk(KERN_WARNING
+-			       "bonding_init(): Invalid bonding mode \"%s\"\n",
++			printk(KERN_ERR DRV_NAME
++			       ": Error: Invalid bonding mode \"%s\"\n",
+ 			       mode == NULL ? "NULL" : mode);
+ 			return -EINVAL;
+ 		}
+ 	}
+ 
+-	if (USES_PRIMARY(bond_mode)) {
+-		multicast_mode = BOND_MULTICAST_ACTIVE;
+-	} else {
+-		multicast_mode = BOND_MULTICAST_ALL;
+-	}
+-
+-	if (multicast) {
+-		multicast_mode = bond_parse_parm(multicast, bond_mc_tbl);
+-		if (multicast_mode == -1) {
+-			printk(KERN_WARNING 
+-		       "bonding_init(): Invalid multicast mode \"%s\"\n",
+-			       multicast == NULL ? "NULL" : multicast);
+-			return -EINVAL;
+-		}
+-	}
+-
+ 	if (lacp_rate) {
+ 		if (bond_mode != BOND_MODE_8023AD) {
+-			printk(KERN_WARNING
+-			       "lacp_rate param is irrelevant in mode %s\n",
++			printk(KERN_INFO DRV_NAME
++			       ": lacp_rate param is irrelevant in mode %s\n",
+ 			       bond_mode_name());
+ 		} else {
+ 			lacp_fast = bond_parse_parm(lacp_rate, bond_lacp_tbl);
+ 			if (lacp_fast == -1) {
+-				printk(KERN_WARNING
+-			       	       "bonding_init(): Invalid lacp rate "
+-				       "\"%s\"\n",
++				printk(KERN_ERR DRV_NAME
++				       ": Error: Invalid lacp rate \"%s\"\n",
+ 				       lacp_rate == NULL ? "NULL" : lacp_rate);
+-
+ 				return -EINVAL;
+ 			}
+ 		}
+ 	}
+ 
+ 	if (max_bonds < 1 || max_bonds > INT_MAX) {
+-		printk(KERN_WARNING 
+-		       "bonding_init(): max_bonds (%d) not in range %d-%d, "
+-		       "so it was reset to BOND_DEFAULT_MAX_BONDS (%d)",
++		printk(KERN_WARNING DRV_NAME
++		       ": Warning: max_bonds (%d) not in range %d-%d, so it "
++		       "was reset to BOND_DEFAULT_MAX_BONDS (%d)",
+ 		       max_bonds, 1, INT_MAX, BOND_DEFAULT_MAX_BONDS);
+ 		max_bonds = BOND_DEFAULT_MAX_BONDS;
+ 	}
+ 
+ 	if (miimon < 0) {
+-		printk(KERN_WARNING 
+-		       "bonding_init(): miimon module parameter (%d), "
++		printk(KERN_WARNING DRV_NAME
++		       ": Warning: miimon module parameter (%d), "
+ 		       "not in range 0-%d, so it was reset to %d\n",
+ 		       miimon, INT_MAX, BOND_LINK_MON_INTERV);
+ 		miimon = BOND_LINK_MON_INTERV;
+ 	}
+ 
+ 	if (updelay < 0) {
+-		printk(KERN_WARNING 
+-		       "bonding_init(): updelay module parameter (%d), "
++		printk(KERN_WARNING DRV_NAME
++		       ": Warning: updelay module parameter (%d), "
+ 		       "not in range 0-%d, so it was reset to 0\n",
+ 		       updelay, INT_MAX);
+ 		updelay = 0;
+ 	}
+ 
+ 	if (downdelay < 0) {
+-		printk(KERN_WARNING 
+-		       "bonding_init(): downdelay module parameter (%d), "
++		printk(KERN_WARNING DRV_NAME
++		       ": Warning: downdelay module parameter (%d), "
+ 		       "not in range 0-%d, so it was reset to 0\n",
+ 		       downdelay, INT_MAX);
+ 		downdelay = 0;
+@@ -4131,82 +3935,69 @@ static int __init bonding_init(void)
+ 
+ 	/* reset values for 802.3ad */
+ 	if (bond_mode == BOND_MODE_8023AD) {
+-		if (arp_interval != 0) {
+-			printk(KERN_WARNING "bonding_init(): ARP monitoring"
+-			       "can't be used simultaneously with 802.3ad, "
+-			       "disabling ARP monitoring\n");
++		if (arp_interval) {
++			printk(KERN_WARNING DRV_NAME
++			       ": Warning: ARP monitoring can't be used "
++			       "simultaneously with 802.3ad, disabling ARP "
++			       "monitoring\n");
+ 			arp_interval = 0;
+ 		}
+ 
+-		if (miimon == 0) {
+-			printk(KERN_ERR
+-			       "bonding_init(): miimon must be specified, "
+-			       "otherwise bonding will not detect link failure, "
+-			       "speed and duplex which are essential "
+-			       "for 802.3ad operation\n");
+-			printk(KERN_ERR "Forcing miimon to 100msec\n");
++		if (miimon) {
++			printk(KERN_WARNING DRV_NAME
++			       ": Warning: miimon must be specified, "
++			       "otherwise bonding will not detect link "
++			       "failure, speed and duplex which are "
++			       "essential for 802.3ad operation\n");
++			printk(KERN_WARNING "Forcing miimon to 100msec\n");
+ 			miimon = 100;
+ 		}
+-
+-		if (multicast_mode != BOND_MULTICAST_ALL) {
+-			printk(KERN_ERR
+-			       "bonding_init(): Multicast mode must "
+-			       "be set to ALL for 802.3ad\n");
+-			printk(KERN_ERR "Forcing Multicast mode to ALL\n");
+-			multicast_mode = BOND_MULTICAST_ALL;
+-		}
+ 	}
+ 
+ 	/* reset values for TLB/ALB */
+ 	if ((bond_mode == BOND_MODE_TLB) ||
+ 	    (bond_mode == BOND_MODE_ALB)) {
+-		if (miimon == 0) {
+-			printk(KERN_ERR
+-			       "bonding_init(): miimon must be specified, "
+-			       "otherwise bonding will not detect link failure "
+-			       "and link speed which are essential "
++		if (!miimon) {
++			printk(KERN_WARNING DRV_NAME
++			       ": Warning: miimon must be specified, "
++			       "otherwise bonding will not detect link "
++			       "failure and link speed which are essential "
+ 			       "for TLB/ALB load balancing\n");
+-			printk(KERN_ERR "Forcing miimon to 100msec\n");
++			printk(KERN_WARNING "Forcing miimon to 100msec\n");
+ 			miimon = 100;
+ 		}
+-
+-		if (multicast_mode != BOND_MULTICAST_ACTIVE) {
+-			printk(KERN_ERR
+-			       "bonding_init(): Multicast mode must "
+-			       "be set to ACTIVE for TLB/ALB\n");
+-			printk(KERN_ERR "Forcing Multicast mode to ACTIVE\n");
+-			multicast_mode = BOND_MULTICAST_ACTIVE;
+-		}
+ 	}
+ 
+ 	if (bond_mode == BOND_MODE_ALB) {
+-		printk(KERN_INFO
+-		       "In ALB mode you might experience client disconnections"
+-		       " upon reconnection of a link if the bonding module"
+-		       " updelay parameter (%d msec) is incompatible with the"
+-		       " forwarding delay time of the switch\n", updelay);
++		printk(KERN_NOTICE DRV_NAME
++		       ": In ALB mode you might experience client "
++		       "disconnections upon reconnection of a link if the "
++		       "bonding module updelay parameter (%d msec) is "
++		       "incompatible with the forwarding delay time of the "
++		       "switch\n",
++		       updelay);
+ 	}
+ 
+-	if (miimon == 0) {
+-		if ((updelay != 0) || (downdelay != 0)) {
++	if (!miimon) {
++		if (updelay || downdelay) {
+ 			/* just warn the user the up/down delay will have
+ 			 * no effect since miimon is zero...
+ 			 */
+-			printk(KERN_WARNING 
+-		               "bonding_init(): miimon module parameter not "
+-			       "set and updelay (%d) or downdelay (%d) module "
++			printk(KERN_WARNING DRV_NAME
++			       ": Warning: miimon module parameter not set "
++			       "and updelay (%d) or downdelay (%d) module "
+ 			       "parameter is set; updelay and downdelay have "
+ 			       "no effect unless miimon is set\n",
+-		               updelay, downdelay);
++			       updelay, downdelay);
+ 		}
+ 	} else {
+ 		/* don't allow arp monitoring */
+-		if (arp_interval != 0) {
+-			printk(KERN_WARNING 
+-		               "bonding_init(): miimon (%d) and arp_interval "
+-			       "(%d) can't be used simultaneously, "
+-			       "disabling ARP monitoring\n",
+-		               miimon, arp_interval);
++		if (arp_interval) {
++			printk(KERN_WARNING DRV_NAME
++			       ": Warning: miimon (%d) and arp_interval (%d) "
++			       "can't be used simultaneously, disabling ARP "
++			       "monitoring\n",
++			       miimon, arp_interval);
+ 			arp_interval = 0;
+ 		}
+ 
+@@ -4214,103 +4005,114 @@ static int __init bonding_init(void)
+ 			/* updelay will be rounded in bond_init() when it
+ 			 * is divided by miimon, we just inform user here
+ 			 */
+-			printk(KERN_WARNING 
+-		               "bonding_init(): updelay (%d) is not a multiple "
++			printk(KERN_WARNING DRV_NAME
++			       ": Warning: updelay (%d) is not a multiple "
+ 			       "of miimon (%d), updelay rounded to %d ms\n",
+-		               updelay, miimon, (updelay / miimon) * miimon);
++			       updelay, miimon, (updelay / miimon) * miimon);
+ 		}
+ 
+ 		if ((downdelay % miimon) != 0) {
+ 			/* downdelay will be rounded in bond_init() when it
+ 			 * is divided by miimon, we just inform user here
+ 			 */
+-			printk(KERN_WARNING 
+-		               "bonding_init(): downdelay (%d) is not a "
+-			       "multiple of miimon (%d), downdelay rounded "
+-			       "to %d ms\n",
+-		               downdelay, miimon, 
++			printk(KERN_WARNING DRV_NAME
++			       ": Warning: downdelay (%d) is not a multiple "
++			       "of miimon (%d), downdelay rounded to %d ms\n",
++			       downdelay, miimon,
+ 			       (downdelay / miimon) * miimon);
+ 		}
+ 	}
+ 
+ 	if (arp_interval < 0) {
+-		printk(KERN_WARNING 
+-		       "bonding_init(): arp_interval module parameter (%d), "
+-		       "not in range 0-%d, so it was reset to %d\n",
++		printk(KERN_WARNING DRV_NAME
++		       ": Warning: arp_interval module parameter (%d) "
++		       ", not in range 0-%d, so it was reset to %d\n",
+ 		       arp_interval, INT_MAX, BOND_LINK_ARP_INTERV);
+ 		arp_interval = BOND_LINK_ARP_INTERV;
+ 	}
+ 
+-        for (arp_ip_count=0 ;
+-             (arp_ip_count < MAX_ARP_IP_TARGETS) && arp_ip_target[arp_ip_count];
+-              arp_ip_count++ ) {
++	for (arp_ip_count = 0;
++	     (arp_ip_count < MAX_ARP_IP_TARGETS) && arp_ip_target[arp_ip_count];
++	     arp_ip_count++) {
+ 		/* not complete check, but should be good enough to
+ 		   catch mistakes */
+-		if (!isdigit(arp_ip_target[arp_ip_count][0])) { 
+-                        printk(KERN_WARNING
+-                               "bonding_init(): bad arp_ip_target module "
+-                               "parameter (%s), ARP monitoring will not be "
+-                               "performed\n",
+-                               arp_ip_target[arp_ip_count]);
+-                        arp_interval = 0;
+-		} else { 
+-			u32 ip = in_aton(arp_ip_target[arp_ip_count]); 
++		if (!isdigit(arp_ip_target[arp_ip_count][0])) {
++			printk(KERN_WARNING DRV_NAME
++			       ": Warning: bad arp_ip_target module parameter "
++			       "(%s), ARP monitoring will not be performed\n",
++			       arp_ip_target[arp_ip_count]);
++			arp_interval = 0;
++		} else {
++			u32 ip = in_aton(arp_ip_target[arp_ip_count]);
+ 			arp_target[arp_ip_count] = ip;
+ 		}
+-        }
+-
++	}
+ 
+-	if ( (arp_interval > 0) && (arp_ip_count==0)) {
++	if (arp_interval && !arp_ip_count) {
+ 		/* don't allow arping if no arp_ip_target given... */
+-		printk(KERN_WARNING 
+-		       "bonding_init(): arp_interval module parameter "
+-		       "(%d) specified without providing an arp_ip_target "
++		printk(KERN_WARNING DRV_NAME
++		       ": Warning: arp_interval module parameter (%d) "
++		       "specified without providing an arp_ip_target "
+ 		       "parameter, arp_interval was reset to 0\n",
+ 		       arp_interval);
+ 		arp_interval = 0;
+ 	}
+ 
+-	if ((miimon == 0) && (arp_interval == 0)) {
++	if (!miimon && !arp_interval) {
+ 		/* miimon and arp_interval not set, we need one so things
+ 		 * work as expected, see bonding.txt for details
+ 		 */
+-		printk(KERN_ERR 
+-		       "bonding_init(): either miimon or "
+-		       "arp_interval and arp_ip_target module parameters "
+-		       "must be specified, otherwise bonding will not detect "
+-		       "link failures! see bonding.txt for details.\n");
++		printk(KERN_WARNING DRV_NAME
++		       ": Warning: either miimon or arp_interval and "
++		       "arp_ip_target module parameters must be specified, "
++		       "otherwise bonding will not detect link failures! see "
++		       "bonding.txt for details.\n");
+ 	}
+ 
+-	if ((primary != NULL) && !USES_PRIMARY(bond_mode)) {
++	if (primary && !USES_PRIMARY(bond_mode)) {
+ 		/* currently, using a primary only makes sense
+ 		 * in active backup, TLB or ALB modes
+ 		 */
+-		printk(KERN_WARNING 
+-		       "bonding_init(): %s primary device specified but has "
+-		       "no effect in %s mode\n",
++		printk(KERN_WARNING DRV_NAME
++		       ": Warning: %s primary device specified but has no "
++		       "effect in %s mode\n",
+ 		       primary, bond_mode_name());
+ 		primary = NULL;
+ 	}
+ 
++	return 0;
++}
++
++static int __init bonding_init(void)
++{
++	int i;
++	int res;
++
++	printk(KERN_INFO "%s", version);
++
++	res = bond_check_params();
++	if (res) {
++		return res;
++	}
++
+ 	rtnl_lock();
+ 
+ #ifdef CONFIG_PROC_FS
+ 	bond_create_proc_dir();
+ #endif
+ 
+-	err = 0;
+-	for (no = 0; no < max_bonds; no++) {
+-		struct net_device *dev;
+-
+-		dev = alloc_netdev(sizeof(struct bonding), "", ether_setup);
+-		if (!dev) {
+-			err = -ENOMEM;
++	for (i = 0; i < max_bonds; i++) {
++		struct net_device *bond_dev;
++
++		bond_dev = alloc_netdev(sizeof(struct bonding), "", ether_setup);
++		if (!bond_dev) {
++			res = -ENOMEM;
+ 			goto out_err;
+ 		}
+ 
+-		err = dev_alloc_name(dev, "bond%d");
+-		if (err < 0) {
+-			free_netdev(dev);
++		res = dev_alloc_name(bond_dev, "bond%d");
++		if (res < 0) {
++			free_netdev(bond_dev);
+ 			goto out_err;
+ 		}
+ 
+@@ -4318,18 +4120,18 @@ static int __init bonding_init(void)
+ 		 * /proc files), but before register_netdevice(), because we
+ 		 * need to set function pointers.
+ 		 */
+-		err = bond_init(dev);
+-		if (err < 0) {
+-			free_netdev(dev);
++		res = bond_init(bond_dev);
++		if (res < 0) {
++			free_netdev(bond_dev);
+ 			goto out_err;
+ 		}
+ 
+-		SET_MODULE_OWNER(dev);
++		SET_MODULE_OWNER(bond_dev);
+ 
+-		err = register_netdevice(dev);
+-		if (err < 0) {
+-			bond_deinit(dev);
+-			free_netdev(dev);
++		res = register_netdevice(bond_dev);
++		if (res < 0) {
++			bond_deinit(bond_dev);
++			free_netdev(bond_dev);
+ 			goto out_err;
+ 		}
+ 	}
+@@ -4345,7 +4147,7 @@ out_err:
+ 
+ 	rtnl_unlock();
+ 
+-	return err;
++	return res;
+ }
+ 
+ static void __exit bonding_exit(void)
+@@ -4361,6 +4163,8 @@ module_init(bonding_init);
+ module_exit(bonding_exit);
+ MODULE_LICENSE("GPL");
+ MODULE_DESCRIPTION(DRV_DESCRIPTION ", v" DRV_VERSION);
++MODULE_AUTHOR("Thomas Davis, tadavis@lbl.gov and many others");
++MODULE_SUPPORTED_DEVICE("most ethernet devices");
+ 
+ /*
+  * Local variables:
+@@ -4369,3 +4173,4 @@ MODULE_DESCRIPTION(DRV_DESCRIPTION ", v"
+  *  tab-width: 8
+  * End:
+  */
++
+--- linux-2.6.0/drivers/net/cs89x0.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/cs89x0.c	2003-12-28 23:23:06.000000000 -0800
+@@ -47,7 +47,7 @@
+                     : <klee@crystal.cirrus.com>)
+                     : Don't call netif_wake_queue() in net_send_packet()
+                     : Fixed an out-of-mem bug in dma_rx()
+-                    : Updated Documentation/cs89x0.txt
++                    : Updated Documentation/networking/cs89x0.txt
+ 
+   Andrew Morton     : andrewm@uow.edu.au / Kernel 2.3.99-pre1
+                     : Use skb_reserve to longword align IP header (two places)
+@@ -212,9 +212,7 @@ struct net_local {
+ 
+ /* Index to functions, as function prototypes. */
+ 
+-extern int cs89x0_probe(struct net_device *dev);
+-
+-static int cs89x0_probe1(struct net_device *dev, int ioaddr);
++static int cs89x0_probe1(struct net_device *dev, int ioaddr, int modular);
+ static int net_open(struct net_device *dev);
+ static int net_send_packet(struct sk_buff *skb, struct net_device *dev);
+ static irqreturn_t net_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+@@ -274,27 +272,51 @@ __setup("cs89x0_media=", media_fn);
+    Return 0 on success.
+    */
+ 
+-int __init cs89x0_probe(struct net_device *dev)
++struct net_device * __init cs89x0_probe(int unit)
+ {
+-	int i;
+-	int base_addr = dev ? dev->base_addr : 0;
+-
+-	SET_MODULE_OWNER(dev);
++	struct net_device *dev = alloc_etherdev(sizeof(struct net_local));
++	unsigned *port;
++	int err = 0;
++	int irq;
++	int io;
++
++	if (!dev)
++		return ERR_PTR(-ENODEV);
++
++	sprintf(dev->name, "eth%d", unit);
++	netdev_boot_setup_check(dev);
++	io = dev->base_addr;
++	irq = dev->irq;
+ 
+ 	if (net_debug)
+-		printk("cs89x0:cs89x0_probe(0x%x)\n", base_addr);
++		printk("cs89x0:cs89x0_probe(0x%x)\n", io);
+ 
+-	if (base_addr > 0x1ff)		/* Check a single specified location. */
+-		return cs89x0_probe1(dev, base_addr);
+-	else if (base_addr != 0)	/* Don't probe at all. */
+-		return -ENXIO;
+-
+-	for (i = 0; netcard_portlist[i]; i++) {
+-		if (cs89x0_probe1(dev, netcard_portlist[i]) == 0)
+-			return 0;
++	if (io > 0x1ff)	{	/* Check a single specified location. */
++		err = cs89x0_probe1(dev, io, 0);
++	} else if (io != 0) {	/* Don't probe at all. */
++		err = -ENXIO;
++	} else {
++		for (port = netcard_portlist; *port; port++) {
++			if (cs89x0_probe1(dev, *port, 0) == 0)
++				break;
++			dev->irq = irq;
++		}
++		if (!*port)
++			err = -ENODEV;
+ 	}
++	if (err)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	outw(PP_ChipID, dev->base_addr + ADD_PORT);
++	release_region(dev->base_addr, NETCARD_IO_EXTENT);
++out:
++	free_netdev(dev);
+ 	printk(KERN_WARNING "cs89x0: no cs8900 or cs8920 detected.  Be sure to disable PnP with SETUP\n");
+-	return -ENODEV;
++	return ERR_PTR(err);
+ }
+ 
+ static int
+@@ -375,39 +397,34 @@ get_eeprom_cksum(int off, int len, int *
+  */
+ 
+ static int __init
+-cs89x0_probe1(struct net_device *dev, int ioaddr)
++cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)
+ {
+-	struct net_local *lp;
++	struct net_local *lp = (struct net_local *)dev->priv;
+ 	static unsigned version_printed;
+ 	int i;
+ 	unsigned rev_type = 0;
+ 	int eeprom_buff[CHKSUM_LEN];
+ 	int retval;
+ 
++	SET_MODULE_OWNER(dev);
+ 	/* Initialize the device structure. */
+-	if (dev->priv == NULL) {
+-		dev->priv = kmalloc(sizeof(struct net_local), GFP_KERNEL);
+-		if (dev->priv == 0) {
+-			retval = -ENOMEM;
+-			goto out;
+-		}
+-		lp = (struct net_local *)dev->priv;
++	if (!modular) {
+ 		memset(lp, 0, sizeof(*lp));
+ 		spin_lock_init(&lp->lock);
+-#if !defined(MODULE) && (ALLOW_DMA != 0)
++#ifndef MODULE
++#if ALLOW_DMA
+ 		if (g_cs89x0_dma) {
+ 			lp->use_dma = 1;
+ 			lp->dma = g_cs89x0_dma;
+ 			lp->dmasize = 16;	/* Could make this an option... */
+ 		}
+ #endif
+-#ifndef MODULE
+ 		lp->force = g_cs89x0_media__force;
+ #endif
+         }
+-	lp = (struct net_local *)dev->priv;
+ 
+ 	/* Grab the region so we can find another board if autoIRQ fails. */
++	/* WTF is going on here? */
+ 	if (!request_region(ioaddr & ~3, NETCARD_IO_EXTENT, dev->name)) {
+ 		printk(KERN_ERR "%s: request_region(0x%x, 0x%x) failed\n",
+ 				dev->name, ioaddr, NETCARD_IO_EXTENT);
+@@ -696,9 +713,6 @@ printk("PP_addr=0x%x\n", inw(ioaddr + AD
+ 	dev->set_multicast_list = set_multicast_list;
+ 	dev->set_mac_address 	= set_mac_address;
+ 
+-	/* Fill in the fields of the device structure with ethernet values. */
+-	ether_setup(dev);
+-
+ 	printk("\n");
+ 	if (net_debug)
+ 		printk("cs89x0_probe1() successful\n");
+@@ -706,9 +720,6 @@ printk("PP_addr=0x%x\n", inw(ioaddr + AD
+ out2:
+ 	release_region(ioaddr & ~3, NETCARD_IO_EXTENT);
+ out1:
+-	kfree(dev->priv);
+-	dev->priv = 0;
+-out:
+ 	return retval;
+ }
+ 
+@@ -1655,7 +1666,7 @@ static int set_mac_address(struct net_de
+ 
+ #ifdef MODULE
+ 
+-static struct net_device dev_cs89x0;
++static struct net_device *dev_cs89x0;
+ 
+ /*
+  * Support the 'debug' module parm even if we're compiled for non-debug to 
+@@ -1733,6 +1744,7 @@ MODULE_LICENSE("GPL");
+ int
+ init_module(void)
+ {
++	struct net_device *dev = alloc_etherdev(sizeof(struct net_local));
+ 	struct net_local *lp;
+ 	int ret = 0;
+ 
+@@ -1741,18 +1753,12 @@ init_module(void)
+ #else
+ 	debug = 0;
+ #endif
+-
+-	dev_cs89x0.irq = irq;
+-	dev_cs89x0.base_addr = io;
+-
+-        dev_cs89x0.init = cs89x0_probe;
+-        dev_cs89x0.priv = kmalloc(sizeof(struct net_local), GFP_KERNEL);
+-	if (dev_cs89x0.priv == 0) {
+-		printk(KERN_ERR "cs89x0.c: Out of memory.\n");
++	if (!dev)
+ 		return -ENOMEM;
+-	}
+-	memset(dev_cs89x0.priv, 0, sizeof(struct net_local));
+-	lp = (struct net_local *)dev_cs89x0.priv;
++
++	dev->irq = irq;
++	dev->base_addr = io;
++	lp = dev->priv;
+ 
+ #if ALLOW_DMA
+ 	if (use_dma) {
+@@ -1782,7 +1788,10 @@ init_module(void)
+                 printk(KERN_ERR "cs89x0.c: Append io=0xNNN\n");
+                 ret = -EPERM;
+ 		goto out;
+-        }
++        } else if (io <= 0x1ff) {
++		ret = -ENXIO;
++		goto out;
++	}
+ 
+ #if ALLOW_DMA
+ 	if (use_dma && dmasize != 16 && dmasize != 64) {
+@@ -1791,30 +1800,31 @@ init_module(void)
+ 		goto out;
+ 	}
+ #endif
++	ret = cs89x0_probe1(dev, io, 1);
++	if (ret)
++		goto out;
+ 
+-        if (register_netdev(&dev_cs89x0) != 0) {
++        if (register_netdev(dev) != 0) {
+                 printk(KERN_ERR "cs89x0.c: No card found at 0x%x\n", io);
+                 ret = -ENXIO;
++		outw(PP_ChipID, dev->base_addr + ADD_PORT);
++		release_region(dev->base_addr, NETCARD_IO_EXTENT);
+ 		goto out;
+         }
++	dev_cs89x0 = dev;
++	return 0;
+ out:
+-	if (ret)
+-		kfree(dev_cs89x0.priv);
++	free_netdev(dev);
+ 	return ret;
+ }
+ 
+ void
+ cleanup_module(void)
+ {
+-        if (dev_cs89x0.priv != NULL) {
+-                /* Free up the private structure, or leak memory :-)  */
+-                unregister_netdev(&dev_cs89x0);
+-		outw(PP_ChipID, dev_cs89x0.base_addr + ADD_PORT);
+-                kfree(dev_cs89x0.priv);
+-                dev_cs89x0.priv = NULL;	/* gets re-allocated by cs89x0_probe1 */
+-                /* If we don't do this, we can't re-insmod it later. */
+-                release_region(dev_cs89x0.base_addr, NETCARD_IO_EXTENT);
+-        }
++	unregister_netdev(dev_cs89x0);
++	outw(PP_ChipID, dev_cs89x0->base_addr + ADD_PORT);
++	release_region(dev_cs89x0->base_addr, NETCARD_IO_EXTENT);
++	free_netdev(dev_cs89x0);
+ }
+ #endif /* MODULE */
+ 
+--- linux-2.6.0/drivers/net/de600.c	2003-06-14 12:18:35.000000000 -0700
++++ 25/drivers/net/de600.c	2003-12-28 23:21:01.000000000 -0800
+@@ -99,7 +99,7 @@ static volatile int		tx_fifo_in;
+ static volatile int		tx_fifo_out;
+ static volatile int		free_tx_pages = TX_PAGES;
+ static int			was_down;
+-static spinlock_t		de600_lock;
++static spinlock_t		de600_lock = SPIN_LOCK_UNLOCKED;
+ 
+ static inline u8 de600_read_status(struct net_device *dev)
+ {
+@@ -398,20 +398,31 @@ static void de600_rx_intr(struct net_dev
+ 	 */
+ }
+ 
+-int __init de600_probe(struct net_device *dev)
++static struct net_device * __init de600_probe(void)
+ {
+ 	int	i;
+-	static struct net_device_stats de600_netstats;
+-	/*dev->priv = kmalloc(sizeof(struct net_device_stats), GFP_KERNEL);*/
++	struct net_device *dev;
++	int err;
++
++	dev = alloc_etherdev(sizeof(struct net_device_stats));
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
+ 
+ 	SET_MODULE_OWNER(dev);
+ 
++	if (!request_region(DE600_IO, 3, "de600")) {
++		printk(KERN_WARNING "DE600: port 0x%x busy\n", DE600_IO);
++		err = -EBUSY;
++		goto out;
++	}
++
+ 	printk(KERN_INFO "%s: D-Link DE-600 pocket adapter", dev->name);
+ 	/* Alpha testers must have the version number to report bugs. */
+ 	if (de600_debug > 1)
+ 		printk(version);
+ 
+ 	/* probe for adapter */
++	err = -ENODEV;
+ 	rx_page = 0;
+ 	select_nic();
+ 	(void)de600_read_status(dev);
+@@ -419,7 +430,7 @@ int __init de600_probe(struct net_device
+ 	de600_put_command(STOP_RESET);
+ 	if (de600_read_status(dev) & 0xf0) {
+ 		printk(": not at I/O %#3x.\n", DATA_PORT);
+-		return -ENODEV;
++		goto out1;
+ 	}
+ 
+ 	/*
+@@ -444,12 +455,7 @@ int __init de600_probe(struct net_device
+ 		dev->dev_addr[3] |= 0x70;
+ 	} else {
+ 		printk(" not identified in the printer port\n");
+-		return -ENODEV;
+-	}
+-
+-	if (!request_region(DE600_IO, 3, "de600")) {
+-		printk(KERN_WARNING "DE600: port 0x%x busy\n", DE600_IO);
+-		return -EBUSY;
++		goto out1;
+ 	}
+ 
+ 	printk(", Ethernet Address: %02X", dev->dev_addr[0]);
+@@ -457,22 +463,27 @@ int __init de600_probe(struct net_device
+ 		printk(":%02X",dev->dev_addr[i]);
+ 	printk("\n");
+ 
+-	/* Initialize the device structure. */
+-	dev->priv = &de600_netstats;
+-
+-	memset(dev->priv, 0, sizeof(struct net_device_stats));
+ 	dev->get_stats = get_stats;
+ 
+ 	dev->open = de600_open;
+ 	dev->stop = de600_close;
+ 	dev->hard_start_xmit = &de600_start_xmit;
+ 
+-	ether_setup(dev);
+-
+ 	dev->flags&=~IFF_MULTICAST;
+ 
+ 	select_prn();
+-	return 0;
++
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++
++	return dev;
++
++out1:
++	release_region(DE600_IO, 3);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
+ static int adapter_init(struct net_device *dev)
+@@ -527,21 +538,21 @@ static int adapter_init(struct net_devic
+ 	return 0; /* OK */
+ }
+ 
+-static struct net_device de600_dev;
++static struct net_device *de600_dev;
+ 
+ static int __init de600_init(void)
+ {
+-	spin_lock_init(&de600_lock);
+-	de600_dev.init = de600_probe;
+-	if (register_netdev(&de600_dev) != 0)
+-		return -EIO;
++	de600_dev = de600_probe();
++	if (IS_ERR(de600_dev))
++		return PTR_ERR(de600_dev);
+ 	return 0;
+ }
+ 
+ static void __exit de600_exit(void)
+ {
+-	unregister_netdev(&de600_dev);
++	unregister_netdev(de600_dev);
+ 	release_region(DE600_IO, 3);
++	free_netdev(de600_dev);
+ }
+ 
+ module_init(de600_init);
+--- linux-2.6.0/drivers/net/de600.h	2003-06-14 12:18:23.000000000 -0700
++++ 25/drivers/net/de600.h	2003-12-28 23:21:01.000000000 -0800
+@@ -131,7 +131,6 @@ static void	de600_rx_intr(struct net_dev
+ 
+ /* Initialization */
+ static void	trigger_interrupt(struct net_device *dev);
+-int		de600_probe(struct net_device *dev);
+ static int	adapter_init(struct net_device *dev);
+ 
+ /*
+--- linux-2.6.0/drivers/net/de620.c	2003-06-14 12:18:22.000000000 -0700
++++ 25/drivers/net/de620.c	2003-12-28 23:21:01.000000000 -0800
+@@ -226,7 +226,6 @@ static int	de620_rx_intr(struct net_devi
+ 
+ /* Initialization */
+ static int	adapter_init(struct net_device *);
+-int		de620_probe(struct net_device *);
+ static int	read_eeprom(struct net_device *);
+ 
+ 
+@@ -814,11 +813,16 @@ static int adapter_init(struct net_devic
+  *
+  * Check if there is a DE-620 connected
+  */
+-int __init de620_probe(struct net_device *dev)
++struct net_device * __init de620_probe(int unit)
+ {
+-	static struct net_device_stats de620_netstats;
+-	int i;
+ 	byte checkbyte = 0xa5;
++	struct net_device *dev;
++	int err = -ENOMEM;
++	int i;
++
++	dev = alloc_etherdev(sizeof(struct net_device_stats));
++	if (!dev)
++		goto out;
+ 
+ 	SET_MODULE_OWNER(dev);
+ 
+@@ -831,11 +835,23 @@ int __init de620_probe(struct net_device
+ 	dev->base_addr = io;
+ 	dev->irq       = irq;
+ 
++	/* allow overriding parameters on command line */
++	if (unit >= 0) {
++		sprintf(dev->name, "eth%d", unit);
++		netdev_boot_setup_check(dev);
++	}
++	
+ 	if (de620_debug)
+ 		printk(version);
+ 
+ 	printk(KERN_INFO "D-Link DE-620 pocket adapter");
+ 
++	if (!request_region(dev->base_addr, 3, "de620")) {
++		printk(" io 0x%3lX, which is busy.\n", dev->base_addr);
++		err = -EBUSY;
++		goto out1;
++	}
++
+ 	/* Initially, configure basic nibble mode, so we can read the EEPROM */
+ 	NIC_Cmd = DEF_NIC_CMD;
+ 	de620_set_register(dev, W_EIP, EIPRegister);
+@@ -846,12 +862,8 @@ int __init de620_probe(struct net_device
+ 
+ 	if ((checkbyte != 0xa5) || (read_eeprom(dev) != 0)) {
+ 		printk(" not identified in the printer port\n");
+-		return -ENODEV;
+-	}
+-
+-	if (!request_region(dev->base_addr, 3, "de620")) {
+-		printk(KERN_ERR "io 0x%3lX, which is busy.\n", dev->base_addr);
+-		return -EBUSY;
++		err = -ENODEV;
++		goto out2;
+ 	}
+ 
+ 	/* else, got it! */
+@@ -870,10 +882,6 @@ int __init de620_probe(struct net_device
+ 	else
+ 		printk(" UTP)\n");
+ 
+-	/* Initialize the device structure. */
+-	dev->priv = &de620_netstats;
+-
+-	memset(dev->priv, 0, sizeof(struct net_device_stats));
+ 	dev->get_stats 		= get_stats;
+ 	dev->open 		= de620_open;
+ 	dev->stop 		= de620_close;
+@@ -884,8 +892,6 @@ int __init de620_probe(struct net_device
+ 	
+ 	/* base_addr and irq are already set, see above! */
+ 
+-	ether_setup(dev);
+-
+ 	/* dump eeprom */
+ 	if (de620_debug) {
+ 		printk("\nEEPROM contents:\n");
+@@ -899,7 +905,17 @@ int __init de620_probe(struct net_device
+ 		printk("SCR = 0x%02x\n", nic_data.SCR);
+ 	}
+ 
+-	return 0;
++	err = register_netdev(dev);
++	if (err)
++		goto out2;
++	return dev;
++
++out2:
++	release_region(dev->base_addr, 3);
++out1:
++	free_netdev(dev);
++out:
++	return ERR_PTR(err);
+ }
+ 
+ /**********************************
+@@ -994,20 +1010,21 @@ static int __init read_eeprom(struct net
+  *
+  */
+ #ifdef MODULE
+-static struct net_device de620_dev;
++static struct net_device *de620_dev;
+ 
+ int init_module(void)
+ {
+-	de620_dev.init = de620_probe;
+-	if (register_netdev(&de620_dev) != 0)
+-		return -EIO;
++	de620_dev = de620_probe(-1);
++	if (IS_ERR(de620_dev))
++		return PTR_ERR(de620_dev);
+ 	return 0;
+ }
+ 
+ void cleanup_module(void)
+ {
+-	unregister_netdev(&de620_dev);
+-	release_region(de620_dev.base_addr, 3);
++	unregister_netdev(de620_dev);
++	release_region(de620_dev->base_addr, 3);
++	free_netdev(de620_dev);
+ }
+ #endif /* MODULE */
+ MODULE_LICENSE("GPL");
+--- linux-2.6.0/drivers/net/declance.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/declance.c	2003-12-28 23:21:01.000000000 -0800
+@@ -1039,13 +1039,13 @@ static int __init dec_lance_init(const i
+ 	if (dec_lance_debug && version_printed++ == 0)
+ 		printk(version);
+ 
+-	dev = init_etherdev(NULL, sizeof(struct lance_private));
++	dev = alloc_etherdev(sizeof(struct lance_private));
+ 	if (!dev)
+ 		return -ENOMEM;
+ 	SET_MODULE_OWNER(dev);
+ 
+ 	/*
+-	 * init_etherdev ensures the data structures used by the LANCE
++	 * alloc_etherdev ensures the data structures used by the LANCE
+ 	 * are aligned.
+ 	 */
+ 	lp = (struct lance_private *) dev->priv;
+@@ -1188,9 +1188,6 @@ static int __init dec_lance_init(const i
+ 		}
+ 	}
+ 
+-	lp->next = root_lance_dev;
+-	root_lance_dev = dev;
+-
+ 	/* Copy the ethernet address to the device structure, later to the
+ 	 * lance initialization block so the lance gets it every time it's
+ 	 * (re)initialized.
+@@ -1239,11 +1236,14 @@ static int __init dec_lance_init(const i
+ 	init_timer(&lp->multicast_timer);
+ 	lp->multicast_timer.data = (unsigned long) dev;
+ 	lp->multicast_timer.function = &lance_set_multicast_retry;
+-
++	ret = register_netdev(dev);
++	if (ret)
++		goto err_out;
++	lp->next = root_lance_dev;
++	root_lance_dev = dev;
+ 	return 0;
+ 
+ err_out:
+-	unregister_netdev(dev);
+ 	free_netdev(dev);
+ 	return ret;
+ }
+@@ -1288,13 +1288,12 @@ static void __exit dec_lance_cleanup(voi
+ 	while (root_lance_dev) {
+ 		struct net_device *dev = root_lance_dev;
+ 		struct lance_private *lp = (struct lance_private *)dev->priv;
+-
++		unregister_netdev(dev);
+ #ifdef CONFIG_TC
+ 		if (lp->slot >= 0)
+ 			release_tc_card(lp->slot);
+ #endif
+ 		root_lance_dev = lp->next;
+-		unregister_netdev(dev);
+ 		free_netdev(dev);
+ 	}
+ }
+--- linux-2.6.0/drivers/net/defxx.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/net/defxx.c	2003-12-28 23:21:01.000000000 -0800
+@@ -491,7 +491,7 @@ err_out_kfree:
+ err_out_region:
+ 	release_region(ioaddr, pdev ? PFI_K_CSR_IO_LEN : PI_ESIC_K_CSR_IO_LEN);
+ err_out:
+-	kfree(dev);
++	free_netdev(dev);
+ 	return err;
+ }
+ 
+--- linux-2.6.0/drivers/net/depca.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/depca.c	2003-12-28 23:21:01.000000000 -0800
+@@ -681,8 +681,7 @@ static int __init depca_hw_init (struct 
+ 	lp->sh_mem = ioremap(mem_start, mem_len);
+ 	if (lp->sh_mem == NULL) {
+ 		printk(KERN_ERR "depca: cannot remap ISA memory, aborting\n");
+-		release_mem_region (mem_start, mem_len);
+-		goto out_priv;
++		goto out1;
+ 	}
+ 
+ 	lp->mem_start = mem_start;
+@@ -771,7 +770,7 @@ static int __init depca_hw_init (struct 
+ 		status = -ENXIO;
+ 		if (!irqnum) {
+ 			printk(" and failed to detect IRQ line.\n");
+-			goto out_priv;
++			goto out2;
+ 		} else {
+ 			for (dev->irq = 0, i = 0; (depca_irq[i]) && (!dev->irq); i++)
+ 				if (irqnum == depca_irq[i]) {
+@@ -781,7 +780,7 @@ static int __init depca_hw_init (struct 
+ 
+ 			if (!dev->irq) {
+ 				printk(" but incorrect IRQ line detected.\n");
+-				return -ENXIO;
++				goto out2;
+ 			}
+ 		}
+ 	} else {
+@@ -807,11 +806,14 @@ static int __init depca_hw_init (struct 
+ 	device->driver_data = dev;
+ 	SET_NETDEV_DEV (dev, device);
+ 	
+-	register_netdev (dev);
+-	return 0;
+-
+- out_priv:
+-	
++	status = register_netdev(dev);
++	if (status == 0)
++		return 0;
++out2:
++	iounmap(lp->sh_mem);
++out1:
++	release_mem_region (mem_start, mem_len);
++out_priv:
+ 	return status;
+ }
+ 
+--- linux-2.6.0/drivers/net/dummy.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/dummy.c	2003-12-28 23:21:01.000000000 -0800
+@@ -96,7 +96,7 @@ static int __init dummy_init_module(void
+ 		return -ENOMEM;
+ 
+ 	if ((err = register_netdev(dev_dummy))) {
+-		kfree(dev_dummy);
++		free_netdev(dev_dummy);
+ 		dev_dummy = NULL;
+ 	}
+ 	return err;
+--- linux-2.6.0/drivers/net/e1000/e1000_ethtool.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/e1000/e1000_ethtool.c	2003-12-28 23:21:01.000000000 -0800
+@@ -39,6 +39,10 @@ extern int e1000_up(struct e1000_adapter
+ extern void e1000_down(struct e1000_adapter *adapter);
+ extern void e1000_reset(struct e1000_adapter *adapter);
+ extern int e1000_set_spd_dplx(struct e1000_adapter *adapter, uint16_t spddplx);
++extern int e1000_setup_rx_resources(struct e1000_adapter *adapter);
++extern int e1000_setup_tx_resources(struct e1000_adapter *adapter);
++extern void e1000_free_rx_resources(struct e1000_adapter *adapter);
++extern void e1000_free_tx_resources(struct e1000_adapter *adapter);
+ 
+ struct e1000_stats {
+ 	char stat_string[ETH_GSTRING_LEN];
+@@ -440,6 +444,71 @@ seeprom_error:
+ 	return ret_val;
+ }
+ 
++static int
++e1000_ethtool_gring(struct e1000_adapter *adapter,
++                    struct ethtool_ringparam *ring)
++{
++	e1000_mac_type mac_type = adapter->hw.mac_type;
++	struct e1000_desc_ring *txdr = &adapter->tx_ring;
++	struct e1000_desc_ring *rxdr = &adapter->rx_ring;
++
++	ring->rx_max_pending = (mac_type < e1000_82544) ? E1000_MAX_RXD :
++		E1000_MAX_82544_RXD;
++	ring->tx_max_pending = (mac_type < e1000_82544) ? E1000_MAX_TXD :
++		E1000_MAX_82544_TXD;
++	ring->rx_mini_max_pending = 0;
++	ring->rx_jumbo_max_pending = 0;
++	ring->rx_pending = rxdr->count;
++	ring->tx_pending = txdr->count;
++	ring->rx_mini_pending = 0;
++	ring->rx_jumbo_pending = 0;
++
++	return 0;
++}
++static int 
++e1000_ethtool_sring(struct e1000_adapter *adapter,
++                    struct ethtool_ringparam *ring)
++{
++	int err;
++	e1000_mac_type mac_type = adapter->hw.mac_type;
++	struct e1000_desc_ring *txdr = &adapter->tx_ring;
++	struct e1000_desc_ring *rxdr = &adapter->rx_ring;
++
++	if(netif_running(adapter->netdev)) {
++		e1000_down(adapter);
++		e1000_free_rx_resources(adapter);
++		e1000_free_tx_resources(adapter);
++	}
++
++	rxdr->count = max(ring->rx_pending,(uint32_t)E1000_MIN_RXD);
++	rxdr->count = min(rxdr->count,(uint32_t)(mac_type < e1000_82544 ?
++		E1000_MAX_RXD : E1000_MAX_82544_RXD));
++	E1000_ROUNDUP(rxdr->count, REQ_RX_DESCRIPTOR_MULTIPLE); 
++
++	txdr->count = max(ring->tx_pending,(uint32_t)E1000_MIN_TXD);
++	txdr->count = min(txdr->count,(uint32_t)(mac_type < e1000_82544 ?
++		E1000_MAX_TXD : E1000_MAX_82544_TXD));
++	E1000_ROUNDUP(txdr->count, REQ_TX_DESCRIPTOR_MULTIPLE); 
++
++	if(netif_running(adapter->netdev)) {
++		if((err = e1000_setup_rx_resources(adapter)))
++			goto err_setup_rx;
++		if((err = e1000_setup_tx_resources(adapter)))
++			goto err_setup_tx;
++		if((err = e1000_up(adapter)))
++			goto err_up;
++	}
++
++	return 0;
++err_up:
++	e1000_free_tx_resources(adapter);
++err_setup_tx:
++	e1000_free_rx_resources(adapter);
++err_setup_rx:
++	e1000_reset(adapter);
++	return err;
++}
++
+ #define REG_PATTERN_TEST(R, M, W)                                              \
+ {                                                                              \
+ 	uint32_t pat, value;                                                   \
+@@ -579,8 +648,8 @@ e1000_intr_test(struct e1000_adapter *ad
+ 	*data = 0;
+ 
+ 	/* Hook up test interrupt handler just for this test */
+-	if(request_irq
+-	   (netdev->irq, &e1000_test_intr, SA_SHIRQ, netdev->name, netdev)) {
++	if(request_irq(adapter->pdev->irq, &e1000_test_intr, SA_SHIRQ,
++	   netdev->name, netdev)) {
+ 		*data = 1;
+ 		return -1;
+ 	}
+@@ -664,7 +733,7 @@ e1000_intr_test(struct e1000_adapter *ad
+ 	msec_delay(10);
+ 
+ 	/* Unhook test interrupt handler */
+-	free_irq(netdev->irq, netdev);
++	free_irq(adapter->pdev->irq, netdev);
+ 
+ 	return *data;
+ }
+@@ -770,9 +839,9 @@ e1000_setup_desc_rings(struct e1000_adap
+ 				       PCI_DMA_TODEVICE);
+ 		tx_desc->buffer_addr = cpu_to_le64(txdr->buffer_info[i].dma);
+ 		tx_desc->lower.data = cpu_to_le32(skb->len);
+-		tx_desc->lower.data |= E1000_TXD_CMD_EOP;
+-		tx_desc->lower.data |= E1000_TXD_CMD_IFCS;
+-		tx_desc->lower.data |= E1000_TXD_CMD_RPS;
++		tx_desc->lower.data |= cpu_to_le32(E1000_TXD_CMD_EOP |
++						   E1000_TXD_CMD_IFCS |
++						   E1000_TXD_CMD_RPS);
+ 		tx_desc->upper.data = 0;
+ 	}
+ 
+@@ -1502,6 +1571,19 @@ err_geeprom_ioctl:
+ 		addr += offsetof(struct ethtool_eeprom, data);
+ 		return e1000_ethtool_seeprom(adapter, &eeprom, addr);
+ 	}
++	case ETHTOOL_GRINGPARAM: {
++		struct ethtool_ringparam ering = {ETHTOOL_GRINGPARAM};
++		e1000_ethtool_gring(adapter, &ering);
++		if(copy_to_user(addr, &ering, sizeof(ering)))
++			return -EFAULT;
++		return 0;
++	}
++	case ETHTOOL_SRINGPARAM: {
++		struct ethtool_ringparam ering;
++		if(copy_from_user(&ering, addr, sizeof(ering)))
++			return -EFAULT;
++		return e1000_ethtool_sring(adapter, &ering);
++	}
+ 	case ETHTOOL_GPAUSEPARAM: {
+ 		struct ethtool_pauseparam epause = {ETHTOOL_GPAUSEPARAM};
+ 		e1000_ethtool_gpause(adapter, &epause);
+--- linux-2.6.0/drivers/net/e1000/e1000.h	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/e1000/e1000.h	2003-12-28 23:21:01.000000000 -0800
+@@ -92,6 +92,16 @@ struct e1000_adapter;
+ 
+ #define E1000_MAX_INTR 10
+ 
++/* How many descriptors for TX and RX ? */
++#define E1000_DEFAULT_TXD                  256
++#define E1000_MAX_TXD                      256
++#define E1000_MIN_TXD                       80
++#define E1000_MAX_82544_TXD               4096
++#define E1000_DEFAULT_RXD                  256
++#define E1000_MAX_RXD                      256
++#define E1000_MIN_RXD                       80
++#define E1000_MAX_82544_RXD               4096
++
+ /* Supported Rx Buffer Sizes */
+ #define E1000_RXBUFFER_2048  2048
+ #define E1000_RXBUFFER_4096  4096
+--- linux-2.6.0/drivers/net/e1000/e1000_hw.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/e1000/e1000_hw.c	2003-12-28 23:21:01.000000000 -0800
+@@ -1485,8 +1485,8 @@ e1000_phy_force_speed_duplex(struct e100
+             if(mii_status_reg & MII_SR_LINK_STATUS) break;
+             msec_delay(100);
+         }
+-        if(i == 0) { /* We didn't get link */
+-            /* Reset the DSP and wait again for link. */
++        if((i == 0) && (hw->phy_type == e1000_phy_m88)) {
++            /* We didn't get link.  Reset the DSP and wait again for link. */
+             if((ret_val = e1000_phy_reset_dsp(hw))) {
+                 DEBUGOUT("Error Resetting PHY DSP\n");
+                 return ret_val;
+@@ -2081,6 +2081,25 @@ e1000_check_for_link(struct e1000_hw *hw
+         DEBUGOUT("RXing /C/, enable AutoNeg and stop forcing link.\r\n");
+         E1000_WRITE_REG(hw, TXCW, hw->txcw);
+         E1000_WRITE_REG(hw, CTRL, (ctrl & ~E1000_CTRL_SLU));
++
++        hw->serdes_link_down = FALSE;
++    }
++    /* If we force link for non-auto-negotiation switch, check link status
++     * based on MAC synchronization for internal serdes media type.
++     */
++    else if((hw->media_type == e1000_media_type_internal_serdes) &&
++            !(E1000_TXCW_ANE & E1000_READ_REG(hw, TXCW))) {
++        /* SYNCH bit and IV bit are sticky. */
++        udelay(10);
++        if(E1000_RXCW_SYNCH & E1000_READ_REG(hw, RXCW)) {
++            if(!(rxcw & E1000_RXCW_IV)) {
++                hw->serdes_link_down = FALSE;
++                DEBUGOUT("SERDES: Link is up.\n");
++            }
++        } else {
++            hw->serdes_link_down = TRUE;
++            DEBUGOUT("SERDES: Link is down.\n");
++        }
+     }
+     return E1000_SUCCESS;
+ }
+@@ -2481,8 +2500,8 @@ e1000_write_phy_reg_ex(struct e1000_hw *
+         E1000_WRITE_REG(hw, MDIC, mdic);
+ 
+         /* Poll the ready bit to see if the MDI read completed */
+-        for(i = 0; i < 64; i++) {
+-            udelay(50);
++        for(i = 0; i < 640; i++) {
++            udelay(5);
+             mdic = E1000_READ_REG(hw, MDIC);
+             if(mdic & E1000_MDIC_READY) break;
+         }
+@@ -3498,10 +3517,12 @@ e1000_write_eeprom(struct e1000_hw *hw,
+     if (e1000_acquire_eeprom(hw) != E1000_SUCCESS)
+         return -E1000_ERR_EEPROM;
+ 
+-    if(eeprom->type == e1000_eeprom_microwire)
++    if(eeprom->type == e1000_eeprom_microwire) {
+         status = e1000_write_eeprom_microwire(hw, offset, words, data);
+-    else
++    } else {
+         status = e1000_write_eeprom_spi(hw, offset, words, data);
++        msec_delay(10);
++    }
+ 
+     /* Done with writing */
+     e1000_release_eeprom(hw);
+@@ -3719,12 +3740,9 @@ e1000_read_mac_addr(struct e1000_hw * hw
+         hw->perm_mac_addr[i+1] = (uint8_t) (eeprom_data >> 8);
+     }
+     if(((hw->mac_type == e1000_82546) || (hw->mac_type == e1000_82546_rev_3)) &&
+-       (E1000_READ_REG(hw, STATUS) & E1000_STATUS_FUNC_1)) {
+-        if(hw->perm_mac_addr[5] & 0x01)
+-            hw->perm_mac_addr[5] &= ~(0x01);
+-        else
+-            hw->perm_mac_addr[5] |= 0x01;
+-    }
++       (E1000_READ_REG(hw, STATUS) & E1000_STATUS_FUNC_1))
++            hw->perm_mac_addr[5] ^= 0x01;
++
+     for(i = 0; i < NODE_ADDRESS_SIZE; i++)
+         hw->mac_addr[i] = hw->perm_mac_addr[i];
+     return E1000_SUCCESS;
+@@ -3743,22 +3761,13 @@ void
+ e1000_init_rx_addrs(struct e1000_hw *hw)
+ {
+     uint32_t i;
+-    uint32_t addr_low;
+-    uint32_t addr_high;
+ 
+     DEBUGFUNC("e1000_init_rx_addrs");
+ 
+     /* Setup the receive address. */
+     DEBUGOUT("Programming MAC Address into RAR[0]\n");
+-    addr_low = (hw->mac_addr[0] |
+-                (hw->mac_addr[1] << 8) |
+-                (hw->mac_addr[2] << 16) | (hw->mac_addr[3] << 24));
+-
+-    addr_high = (hw->mac_addr[4] |
+-                 (hw->mac_addr[5] << 8) | E1000_RAH_AV);
+ 
+-    E1000_WRITE_REG_ARRAY(hw, RA, 0, addr_low);
+-    E1000_WRITE_REG_ARRAY(hw, RA, 1, addr_high);
++    e1000_rar_set(hw, hw->mac_addr, 0);
+ 
+     /* Zero out the other 15 receive addresses. */
+     DEBUGOUT("Clearing RAR[1-15]\n");
+@@ -3785,11 +3794,11 @@ void
+ e1000_mc_addr_list_update(struct e1000_hw *hw,
+                           uint8_t *mc_addr_list,
+                           uint32_t mc_addr_count,
+-                          uint32_t pad)
++                          uint32_t pad,
++			  uint32_t rar_used_count)
+ {
+     uint32_t hash_value;
+     uint32_t i;
+-    uint32_t rar_used_count = 1; /* RAR[0] is used for our MAC address */
+ 
+     DEBUGFUNC("e1000_mc_addr_list_update");
+ 
+@@ -4523,8 +4532,8 @@ uint32_t
+ e1000_read_reg_io(struct e1000_hw *hw,
+                   uint32_t offset)
+ {
+-    uint32_t io_addr = hw->io_base;
+-    uint32_t io_data = hw->io_base + 4;
++    unsigned long io_addr = hw->io_base;
++    unsigned long io_data = hw->io_base + 4;
+ 
+     e1000_io_write(hw, io_addr, offset);
+     return e1000_io_read(hw, io_data);
+@@ -4543,8 +4552,8 @@ e1000_write_reg_io(struct e1000_hw *hw,
+                    uint32_t offset,
+                    uint32_t value)
+ {
+-    uint32_t io_addr = hw->io_base;
+-    uint32_t io_data = hw->io_base + 4;
++    unsigned long io_addr = hw->io_base;
++    unsigned long io_data = hw->io_base + 4;
+ 
+     e1000_io_write(hw, io_addr, offset);
+     e1000_io_write(hw, io_data, value);
+--- linux-2.6.0/drivers/net/e1000/e1000_hw.h	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/e1000/e1000_hw.h	2003-12-28 23:21:01.000000000 -0800
+@@ -291,7 +291,7 @@ int32_t e1000_read_mac_addr(struct e1000
+ 
+ /* Filters (multicast, vlan, receive) */
+ void e1000_init_rx_addrs(struct e1000_hw *hw);
+-void e1000_mc_addr_list_update(struct e1000_hw *hw, uint8_t * mc_addr_list, uint32_t mc_addr_count, uint32_t pad);
++void e1000_mc_addr_list_update(struct e1000_hw *hw, uint8_t * mc_addr_list, uint32_t mc_addr_count, uint32_t pad, uint32_t rar_used_count);
+ uint32_t e1000_hash_mc_addr(struct e1000_hw *hw, uint8_t * mc_addr);
+ void e1000_mta_set(struct e1000_hw *hw, uint32_t hash_value);
+ void e1000_rar_set(struct e1000_hw *hw, uint8_t * mc_addr, uint32_t rar_index);
+@@ -317,9 +317,9 @@ void e1000_pci_clear_mwi(struct e1000_hw
+ void e1000_read_pci_cfg(struct e1000_hw *hw, uint32_t reg, uint16_t * value);
+ void e1000_write_pci_cfg(struct e1000_hw *hw, uint32_t reg, uint16_t * value);
+ /* Port I/O is only supported on 82544 and newer */
+-uint32_t e1000_io_read(struct e1000_hw *hw, uint32_t port);
++uint32_t e1000_io_read(struct e1000_hw *hw, unsigned long port);
+ uint32_t e1000_read_reg_io(struct e1000_hw *hw, uint32_t offset);
+-void e1000_io_write(struct e1000_hw *hw, uint32_t port, uint32_t value);
++void e1000_io_write(struct e1000_hw *hw, unsigned long port, uint32_t value);
+ void e1000_write_reg_io(struct e1000_hw *hw, uint32_t offset, uint32_t value);
+ int32_t e1000_config_dsp_after_link_change(struct e1000_hw *hw, boolean_t link_up);
+ int32_t e1000_set_d3_lplu_state(struct e1000_hw *hw, boolean_t active);
+@@ -978,7 +978,7 @@ struct e1000_hw {
+     e1000_ms_type master_slave;
+     e1000_ms_type original_master_slave;
+     e1000_ffe_config ffe_config_state;
+-    uint32_t io_base;
++    unsigned long io_base;
+     uint32_t phy_id;
+     uint32_t phy_revision;
+     uint32_t phy_addr;
+@@ -1021,6 +1021,7 @@ struct e1000_hw {
+     boolean_t speed_downgraded;
+     e1000_dsp_config dsp_config_state;
+     boolean_t get_link_status;
++    boolean_t serdes_link_down;
+     boolean_t tbi_compatibility_en;
+     boolean_t tbi_compatibility_on;
+     boolean_t phy_reset_disable;
+--- linux-2.6.0/drivers/net/e1000/e1000_main.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/net/e1000/e1000_main.c	2003-12-28 23:21:01.000000000 -0800
+@@ -30,10 +30,19 @@
+ 
+ /* Change Log
+  *
+- * 5.2.20	9/30/03
++ * 5.2.26	11/13/03
++ *   o Fixed endianess bug causing ethtool loopback diags to fail on ppc.
++ *   o Use pdev->irq rather than netdev->irq in preparation for MSI support.
++ *   o Report driver message on user override of InterruptThrottleRate
++ *     module parameter.
++ *   o Change I/O address storage from uint32_t to unsigned long.
++ *   o Added ethtool RINGPARAM support.
++ *
++ * 5.2.22	10/15/03
+  *   o Bug fix: SERDES devices might be connected to a back-plane
+  *     switch that doesn't support auto-neg, so add the capability
+- *     to force 1000/Full.
++ *     to force 1000/Full.  Also, since forcing 1000/Full, sample
++ *     RxSynchronize bit to detect link state.
+  *   o Bug fix: Flow control settings for hi/lo watermark didn't
+  *     consider changes in the Rx FIFO size, which could occur with
+  *     Jumbo Frames or with the reduced FIFO in 82547.
+@@ -42,29 +51,18 @@
+  *   o Bug fix: hang under heavy Tx stress when running out of Tx
+  *     descriptors; wasn't clearing context descriptor when backing
+  *     out of send because of no-resource condition.
++ *   o Bug fix: check netif_running in dev->poll so we don't have to
++ *     hang in dev->close until all polls are finished.  [Robert
++ *     Ollson (robert.olsson@data.slu.se)].
++ *   o Revert TxDescriptor ring size back to 256 since change to 1024
++ *     wasn't accepted into the kernel.
+  *
+  * 5.2.16	8/8/03
+- *   o Added support for new controllers: 82545GM, 82546GB, 82541/7_B1
+- *   o Bug fix: reset h/w before first EEPROM read because we don't know
+- *     who may have been messing with the device before we got there.
+- *     [Dave Johnson (ddj -a-t- cascv.brown.edu)]
+- *   o Bug fix: read the correct work from EEPROM to detect programmed
+- *     WoL settings.
+- *   o Bug fix: TSO would hang if space left in FIFO was being miscalculated
+- *     when mss dropped without a correspoding drop in the DMA buffer size.
+- *   o ASF for Fiber nics isn't supported.
+- *   o Bug fix: Workaround added for potential hang with 82544 running in
+- *     PCI-X if send buffer terminates within an evenly-aligned dword.
+- *   o Feature: Add support for ethtool flow control setting.
+- *   o Feature: Add support for ethtool TSO setting.
+- *   o Feature: Increase default Tx Descriptor count to 1024 for >= 82544.
+- *   
+- * 5.1.13	5/28/03
+  */
+ 
+ char e1000_driver_name[] = "e1000";
+ char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";
+-char e1000_driver_version[] = "5.2.20-k1";
++char e1000_driver_version[] = "5.2.26-k1";
+ char e1000_copyright[] = "Copyright (c) 1999-2003 Intel Corporation.";
+ 
+ /* e1000_pci_tbl - PCI Device ID Table
+@@ -113,12 +111,16 @@ static struct pci_device_id e1000_pci_tb
+ 
+ MODULE_DEVICE_TABLE(pci, e1000_pci_tbl);
+ 
+-/* Local Function Prototypes */
+-
+ int e1000_up(struct e1000_adapter *adapter);
+ void e1000_down(struct e1000_adapter *adapter);
+ void e1000_reset(struct e1000_adapter *adapter);
+ int e1000_set_spd_dplx(struct e1000_adapter *adapter, uint16_t spddplx);
++int e1000_setup_tx_resources(struct e1000_adapter *adapter);
++int e1000_setup_rx_resources(struct e1000_adapter *adapter);
++void e1000_free_tx_resources(struct e1000_adapter *adapter);
++void e1000_free_rx_resources(struct e1000_adapter *adapter);
++
++/* Local Function Prototypes */
+ 
+ static int e1000_init_module(void);
+ static void e1000_exit_module(void);
+@@ -127,15 +129,11 @@ static void __devexit e1000_remove(struc
+ static int e1000_sw_init(struct e1000_adapter *adapter);
+ static int e1000_open(struct net_device *netdev);
+ static int e1000_close(struct net_device *netdev);
+-static int e1000_setup_tx_resources(struct e1000_adapter *adapter);
+-static int e1000_setup_rx_resources(struct e1000_adapter *adapter);
+ static void e1000_configure_tx(struct e1000_adapter *adapter);
+ static void e1000_configure_rx(struct e1000_adapter *adapter);
+ static void e1000_setup_rctl(struct e1000_adapter *adapter);
+ static void e1000_clean_tx_ring(struct e1000_adapter *adapter);
+ static void e1000_clean_rx_ring(struct e1000_adapter *adapter);
+-static void e1000_free_tx_resources(struct e1000_adapter *adapter);
+-static void e1000_free_rx_resources(struct e1000_adapter *adapter);
+ static void e1000_set_multi(struct net_device *netdev);
+ static void e1000_update_phy_info(unsigned long data);
+ static void e1000_watchdog(unsigned long data);
+@@ -268,7 +266,7 @@ e1000_up(struct e1000_adapter *adapter)
+ 	e1000_configure_rx(adapter);
+ 	e1000_alloc_rx_buffers(adapter);
+ 
+-	if((err = request_irq(netdev->irq, &e1000_intr,
++	if((err = request_irq(adapter->pdev->irq, &e1000_intr,
+ 		              SA_SHIRQ | SA_SAMPLE_RANDOM,
+ 		              netdev->name, netdev)))
+ 		return err;
+@@ -285,7 +283,7 @@ e1000_down(struct e1000_adapter *adapter
+ 	struct net_device *netdev = adapter->netdev;
+ 
+ 	e1000_irq_disable(adapter);
+-	free_irq(netdev->irq, netdev);
++	free_irq(adapter->pdev->irq, netdev);
+ 	del_timer_sync(&adapter->tx_fifo_stall_timer);
+ 	del_timer_sync(&adapter->watchdog_timer);
+ 	del_timer_sync(&adapter->phy_info_timer);
+@@ -435,7 +433,6 @@ e1000_probe(struct pci_dev *pdev,
+ 	netdev->vlan_rx_add_vid = e1000_vlan_rx_add_vid;
+ 	netdev->vlan_rx_kill_vid = e1000_vlan_rx_kill_vid;
+ 
+-	netdev->irq = pdev->irq;
+ 	netdev->mem_start = mmio_start;
+ 	netdev->mem_end = mmio_start + mmio_len;
+ 	netdev->base_addr = adapter->hw.io_base;
+@@ -749,7 +746,7 @@ e1000_close(struct net_device *netdev)
+  * Return 0 on success, negative on failure
+  **/
+ 
+-static int
++int
+ e1000_setup_tx_resources(struct e1000_adapter *adapter)
+ {
+ 	struct e1000_desc_ring *txdr = &adapter->tx_ring;
+@@ -866,7 +863,7 @@ e1000_configure_tx(struct e1000_adapter 
+  * Returns 0 on success, negative on failure
+  **/
+ 
+-static int
++int
+ e1000_setup_rx_resources(struct e1000_adapter *adapter)
+ {
+ 	struct e1000_desc_ring *rxdr = &adapter->rx_ring;
+@@ -1005,7 +1002,7 @@ e1000_configure_rx(struct e1000_adapter 
+  * Free all transmit software resources
+  **/
+ 
+-static void
++void
+ e1000_free_tx_resources(struct e1000_adapter *adapter)
+ {
+ 	struct pci_dev *pdev = adapter->pdev;
+@@ -1073,7 +1070,7 @@ e1000_clean_tx_ring(struct e1000_adapter
+  * Free all receive software resources
+  **/
+ 
+-static void
++void
+ e1000_free_rx_resources(struct e1000_adapter *adapter)
+ {
+ 	struct e1000_desc_ring *rx_ring = &adapter->rx_ring;
+@@ -1281,41 +1278,6 @@ e1000_set_multi(struct net_device *netde
+ 		e1000_leave_82542_rst(adapter);
+ }
+ 
+-static void
+-e1000_tx_flush(struct e1000_adapter *adapter)
+-{
+-	uint32_t ctrl, tctl, txcw, icr;
+-
+-	e1000_irq_disable(adapter);
+-
+-	if(adapter->hw.mac_type < e1000_82543) {
+-		/* Transmit Unit Reset */
+-		tctl = E1000_READ_REG(&adapter->hw, TCTL);
+-		E1000_WRITE_REG(&adapter->hw, TCTL, tctl | E1000_TCTL_RST);
+-		E1000_WRITE_REG(&adapter->hw, TCTL, tctl);
+-		e1000_clean_tx_ring(adapter);
+-		e1000_configure_tx(adapter);
+-	} else {
+-		txcw = E1000_READ_REG(&adapter->hw, TXCW);
+-		E1000_WRITE_REG(&adapter->hw, TXCW, txcw & ~E1000_TXCW_ANE);
+-
+-		ctrl = E1000_READ_REG(&adapter->hw, CTRL);
+-		E1000_WRITE_REG(&adapter->hw, CTRL, ctrl | E1000_CTRL_SLU |
+-				E1000_CTRL_ILOS);
+-
+-		mdelay(10);
+-
+-		e1000_clean_tx_irq(adapter);
+-		E1000_WRITE_REG(&adapter->hw, CTRL, ctrl);
+-		E1000_WRITE_REG(&adapter->hw, TXCW, txcw);
+-
+-		/* clear the link status change interrupts this caused */
+-		icr = E1000_READ_REG(&adapter->hw, ICR);
+-	}
+-
+-	e1000_irq_enable(adapter);
+-}
+-
+ /* need to wait a few seconds after link up to get diagnostic information from the phy */
+ 
+ static void
+@@ -1379,10 +1341,17 @@ e1000_watchdog(unsigned long data)
+ 	struct net_device *netdev = adapter->netdev;
+ 	struct e1000_desc_ring *txdr = &adapter->tx_ring;
+ 	unsigned int i;
++	uint32_t link;
+ 
+ 	e1000_check_for_link(&adapter->hw);
+ 
+-	if(E1000_READ_REG(&adapter->hw, STATUS) & E1000_STATUS_LU) {
++	if((adapter->hw.media_type == e1000_media_type_internal_serdes) &&
++	   !(E1000_READ_REG(&adapter->hw, TXCW) & E1000_TXCW_ANE))
++		link = !adapter->hw.serdes_link_down;
++	else
++		link = E1000_READ_REG(&adapter->hw, STATUS) & E1000_STATUS_LU;
++
++	if(link) {
+ 		if(!netif_carrier_ok(netdev)) {
+ 			e1000_get_speed_and_duplex(&adapter->hw,
+ 			                           &adapter->link_speed,
+@@ -1419,10 +1388,11 @@ e1000_watchdog(unsigned long data)
+ 
+ 	if(!netif_carrier_ok(netdev)) {
+ 		if(E1000_DESC_UNUSED(txdr) + 1 < txdr->count) {
+-			unsigned long flags;
+-			spin_lock_irqsave(&netdev->xmit_lock, flags);
+-			e1000_tx_flush(adapter);
+-			spin_unlock_irqrestore(&netdev->xmit_lock, flags);
++			/* We've lost link, so the controller stops DMA,
++			 * but we've got queued Tx work that's never going
++			 * to get done, so reset controller to flush Tx.
++			 * (Do the reset outside of interrupt context). */
++			schedule_work(&adapter->tx_timeout_task);
+ 		}
+ 	}
+ 
+@@ -2064,7 +2034,7 @@ e1000_irq_disable(struct e1000_adapter *
+ 	atomic_inc(&adapter->irq_sem);
+ 	E1000_WRITE_REG(&adapter->hw, IMC, ~0);
+ 	E1000_WRITE_FLUSH(&adapter->hw);
+-	synchronize_irq(adapter->netdev->irq);
++	synchronize_irq(adapter->pdev->irq);
+ }
+ 
+ /**
+@@ -2093,6 +2063,7 @@ e1000_intr(int irq, void *data, struct p
+ {
+ 	struct net_device *netdev = data;
+ 	struct e1000_adapter *adapter = netdev->priv;
++	struct e1000_hw *hw = &adapter->hw;
+ 	uint32_t icr = E1000_READ_REG(&adapter->hw, ICR);
+ #ifndef CONFIG_E1000_NAPI
+ 	unsigned int i;
+@@ -2102,7 +2073,7 @@ e1000_intr(int irq, void *data, struct p
+ 		return IRQ_NONE;  /* Not our interrupt */
+ 
+ 	if(icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) {
+-		adapter->hw.get_link_status = 1;
++		hw->get_link_status = 1;
+ 		mod_timer(&adapter->watchdog_timer, jiffies);
+ 	}
+ 
+@@ -2114,14 +2085,30 @@ e1000_intr(int irq, void *data, struct p
+ 		*/
+ 
+ 		atomic_inc(&adapter->irq_sem);
+-		E1000_WRITE_REG(&adapter->hw, IMC, ~0);
++		E1000_WRITE_REG(hw, IMC, ~0);
+ 		__netif_rx_schedule(netdev);
+ 	}
+ #else
++        /* Writing IMC and IMS is needed for 82547.
++	   Due to Hub Link bus being occupied, an interrupt 
++	   de-assertion message is not able to be sent. 
++	   When an interrupt assertion message is generated later,
++	   two messages are re-ordered and sent out.
++	   That causes APIC to think 82547 is in de-assertion
++	   state, while 82547 is in assertion state, resulting 
++	   in dead lock. Writing IMC forces 82547 into 
++	   de-assertion state.
++        */
++	if(hw->mac_type == e1000_82547 || hw->mac_type == e1000_82547_rev_2)
++		e1000_irq_disable(adapter);
++
+ 	for(i = 0; i < E1000_MAX_INTR; i++)
+ 		if(!e1000_clean_rx_irq(adapter) &
+ 		   !e1000_clean_tx_irq(adapter))
+ 			break;
++
++	if(hw->mac_type == e1000_82547 || hw->mac_type == e1000_82547_rev_2)
++		e1000_irq_enable(adapter);
+ #endif
+ 
+ 	return IRQ_HANDLED;
+@@ -2146,7 +2133,7 @@ e1000_clean(struct net_device *netdev, i
+ 	*budget -= work_done;
+ 	netdev->quota -= work_done;
+ 	
+-	if(work_done < work_to_do) {
++	if(work_done < work_to_do || !netif_running(netdev)) {
+ 		netif_rx_complete(netdev);
+ 		e1000_irq_enable(adapter);
+ 	}
+@@ -2642,13 +2629,13 @@ e1000_write_pci_cfg(struct e1000_hw *hw,
+ }
+ 
+ uint32_t
+-e1000_io_read(struct e1000_hw *hw, uint32_t port)
++e1000_io_read(struct e1000_hw *hw, unsigned long port)
+ {
+ 	return inl(port);
+ }
+ 
+ void
+-e1000_io_write(struct e1000_hw *hw, uint32_t port, uint32_t value)
++e1000_io_write(struct e1000_hw *hw, unsigned long port, uint32_t value)
+ {
+ 	outl(value, port);
+ }
+--- linux-2.6.0/drivers/net/e1000/e1000_param.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/e1000/e1000_param.c	2003-12-28 23:21:01.000000000 -0800
+@@ -196,16 +196,6 @@ E1000_PARAM(InterruptThrottleRate, "Inte
+ #define AUTONEG_ADV_MASK     0x2F
+ #define FLOW_CONTROL_DEFAULT FLOW_CONTROL_FULL
+ 
+-#define DEFAULT_TXD                  256
+-#define MAX_TXD                      256
+-#define MIN_TXD                       80
+-#define MAX_82544_TXD               4096
+-
+-#define DEFAULT_RXD                  256
+-#define MAX_RXD                      256
+-#define MIN_RXD                       80
+-#define MAX_82544_RXD               4096
+-
+ #define DEFAULT_RDTR                   0
+ #define MAX_RXDELAY               0xFFFF
+ #define MIN_RXDELAY                    0
+@@ -320,14 +310,15 @@ e1000_check_options(struct e1000_adapter
+ 		struct e1000_option opt = {
+ 			.type = range_option,
+ 			.name = "Transmit Descriptors",
+-			.err  = "using default of " __MODULE_STRING(DEFAULT_TXD),
+-			.def  = DEFAULT_TXD,
+-			.arg  = { .r = { .min = MIN_TXD }}
++			.err  = "using default of "
++				__MODULE_STRING(E1000_DEFAULT_TXD),
++			.def  = E1000_DEFAULT_TXD,
++			.arg  = { .r = { .min = E1000_MIN_TXD }}
+ 		};
+ 		struct e1000_desc_ring *tx_ring = &adapter->tx_ring;
+ 		e1000_mac_type mac_type = adapter->hw.mac_type;
+ 		opt.arg.r.max = mac_type < e1000_82544 ?
+-			MAX_TXD : MAX_82544_TXD;
++			E1000_MAX_TXD : E1000_MAX_82544_TXD;
+ 
+ 		tx_ring->count = TxDescriptors[bd];
+ 		e1000_validate_option(&tx_ring->count, &opt);
+@@ -337,13 +328,15 @@ e1000_check_options(struct e1000_adapter
+ 		struct e1000_option opt = {
+ 			.type = range_option,
+ 			.name = "Receive Descriptors",
+-			.err  = "using default of " __MODULE_STRING(DEFAULT_RXD),
+-			.def  = DEFAULT_RXD,
+-			.arg  = { .r = { .min = MIN_RXD }}
++			.err  = "using default of "
++				__MODULE_STRING(E1000_DEFAULT_RXD),
++			.def  = E1000_DEFAULT_RXD,
++			.arg  = { .r = { .min = E1000_MIN_RXD }}
+ 		};
+ 		struct e1000_desc_ring *rx_ring = &adapter->rx_ring;
+ 		e1000_mac_type mac_type = adapter->hw.mac_type;
+-		opt.arg.r.max = mac_type < e1000_82544 ? MAX_RXD : MAX_82544_RXD;
++		opt.arg.r.max = mac_type < e1000_82544 ? E1000_MAX_RXD :
++			E1000_MAX_82544_RXD;
+ 
+ 		rx_ring->count = RxDescriptors[bd];
+ 		e1000_validate_option(&rx_ring->count, &opt);
+@@ -446,13 +439,19 @@ e1000_check_options(struct e1000_adapter
+ 		};
+ 
+ 		adapter->itr = InterruptThrottleRate[bd];
+-		if(adapter->itr == 0) {
+-			printk(KERN_INFO "%s turned off\n", opt.name);
+-		} else if(adapter->itr == 1 || adapter->itr == -1) {
+-			/* Dynamic mode */
++		switch(adapter->itr) {
++		case -1:
+ 			adapter->itr = 1;
+-		} else {
++			break;
++		case 0:
++			printk(KERN_INFO "%s turned off\n", opt.name);
++			break;
++		case 1:
++			printk(KERN_INFO "%s set to dynamic mode\n", opt.name);
++			break;
++		default:
+ 			e1000_validate_option(&adapter->itr, &opt);
++			break;
+ 		}
+ 	}
+ 
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/net/e100.c	2003-12-28 23:21:01.000000000 -0800
+@@ -0,0 +1,2308 @@
++/*******************************************************************************
++
++  
++  Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved.
++  
++  This program is free software; you can redistribute it and/or modify it 
++  under the terms of the GNU General Public License as published by the Free 
++  Software Foundation; either version 2 of the License, or (at your option) 
++  any later version.
++  
++  This program is distributed in the hope that it will be useful, but WITHOUT 
++  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
++  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
++  more details.
++  
++  You should have received a copy of the GNU General Public License along with
++  this program; if not, write to the Free Software Foundation, Inc., 59 
++  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
++  
++  The full GNU General Public License is included in this distribution in the
++  file called LICENSE.
++  
++  Contact Information:
++  Linux NICS <linux.nics@intel.com>
++  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
++
++*******************************************************************************/
++
++/*
++ *	e100.c: Intel(R) PRO/100 ethernet driver 
++ *
++ *	(Re)written 2003 by scott.feldman@intel.com.  Based loosely on
++ *	original e100 driver, but better described as a munging of
++ *	e100, e1000, eepro100, tg3, 8139cp, and other drivers.
++ *
++ *	References:
++ *		Intel 8255x 10/100 Mbps Ethernet Controller Family,
++ *		Open Source Software Developers Manual,
++ *		http://sourceforge.net/projects/e1000
++ *
++ *
++ *	                      Theory of Operation
++ *
++ *	I.   General
++ *
++ *	The driver supports Intel(R) 10/100 Mbps PCI Fast Ethernet
++ *	controller family, which includes the 82557, 82558, 82559, 82550,
++ *	82551, and 82562 devices.  82558 and greater controllers
++ *	integrate the Intel 82555 PHY.  The controllers are used in
++ *	server and client network interface cards, as well as in
++ *	LAN-On-Motherboard (LOM), CardBus, MiniPCI, and ICHx
++ *	configurations.  8255x supports a 32-bit linear addressing
++ *	mode and operates at 33Mhz PCI clock rate.
++ *
++ *	II.  Driver Operation
++ *
++ *	Memory-mapped mode is used exclusively to access the device's
++ *	shared-memory structure, the Control/Status Registers (CSR). All
++ *	setup, configuration, and control of the device, including queuing
++ *	of Tx, Rx, and configuration commands is through the CSR.
++ *	cmd_lock serializes accesses to the CSR command register.  cb_lock
++ *	protects the shared Command Block List (CBL).
++ *
++ *	8255x is highly MII-compliant and all access to the PHY go
++ *	through the Management Data Interface (MDI).  Consequently, the
++ *	driver leverages the mii.c library shared with other MII-compliant
++ *	devices.
++ *	
++ *	Big- and Little-Endian byte order as well as 32- and 64-bit 
++ *	archs are supported.  Weak-ordered memory and non-cache-coherent
++ *	archs are supported.
++ *	
++ *	III. Transmit
++ *
++ *	A Tx skb is mapped and hangs off of a TCB.  TCBs are linked
++ *	together in a fixed-size ring (CBL) thus forming the flexible mode
++ *	memory structure.  A TCB marked with the suspend-bit indicates
++ *	the end of the ring.  The last TCB processed suspends the
++ *	controller, and the controller can be restarted by issue a CU
++ *	resume command to continue from the suspend point, or a CU start
++ *	command to start at a given position in the ring.
++ *
++ *	Non-Tx commands (config, multicast setup, etc) are linked
++ *	into the CBL ring along with Tx commands.  The common structure
++ *	used for both Tx and non-Tx commands is the Command Block (CB).
++ *	
++ *	cb_to_use is the next CB to use for queuing a command; cb_to_clean
++ *	is the next CB to check for completion; cb_to_send is the first
++ *	CB to start on in case of a previous failure to resume.  CB clean
++ *	up happens in interrupt context in response to a CU interrupt, or
++ *	in dev->poll in the case where NAPI is enabled.  cbs_avail keeps
++ *	track of number of free CB resources available.
++ *
++ * 	Hardware padding of short packets to minimum packet size is
++ * 	enabled.  82557 pads with 7Eh, while the later controllers pad
++ * 	with 00h.
++ *
++ *	IV.  Recieve
++ *
++ *	The Receive Frame Area (RFA) comprises a ring of Receive Frame
++ *	Descriptors (RFD) + data buffer, thus forming the simplified mode
++ *	memory structure.  Rx skbs are allocated to contain both the RFD
++ *	and the data buffer, but the RFD is pulled off before the skb is
++ *	indicated.  The data buffer is aligned such that encapsulated 
++ *	protocol headers are u32-aligned.  Since the RFD is part of the
++ *	mapped shared memory, and completion status is contained within
++ *	the RFD, the RFD must be dma_sync'ed to maintain a consistent
++ *	view from software and hardware.
++ *
++ *	Under typical operation, the  receive unit (RU) is start once,
++ *	and the controller happily fills RFDs as frames arrive.  If 
++ *	replacement RFDs cannot be allocated, or the RU goes non-active,
++ *	the RU must be restarted.  Frame arrival generates an interrupt,
++ *	and Rx indication and re-allocation happen in the same context,
++ *	therefore no locking is required.  If NAPI is enabled, this work
++ *	happens in dev->poll.  A software-generated interrupt is gen-
++ *	erated from the watchdog to recover from a failed allocation
++ *	senario where all Rx resources have been indicated and none re-
++ *	placed.
++ *
++ *	V.   Miscellaneous
++ *
++ * 	VLAN offloading of tagging, stripping and filtering is not
++ * 	supported, but driver will accommodate the extra 4-byte VLAN tag
++ * 	for processing by upper layers.  Tx/Rx Checksum offloading is not
++ * 	supported.  Tx Scatter/Gather is not supported.  Jumbo Frames is
++ * 	not supported (hardware limitation).
++ *
++ * 	NAPI support is enabled with CONFIG_E100_NAPI.
++ *
++ * 	MagicPacket(tm) WoL support is enabled/disabled via ethtool.
++ *
++ * 	Thanks to JC (jchapman@katalix.com) for helping with 
++ * 	testing/troubleshooting the development driver.
++ */
++
++#include <linux/config.h>
++#include <linux/module.h>
++#include <linux/moduleparam.h>
++#include <linux/kernel.h>
++#include <linux/types.h>
++#include <linux/slab.h>
++#include <linux/delay.h>
++#include <linux/init.h>
++#include <linux/pci.h>
++#include <linux/list.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/mii.h>
++#include <linux/if_vlan.h>
++#include <linux/skbuff.h>
++#include <linux/ethtool.h>
++#include <linux/string.h>
++#include <asm/unaligned.h>
++
++
++#define DRV_NAME		"e100"
++#define DRV_VERSION		"3.0.11_dev"
++#define DRV_DESCRIPTION		"Intel(R) PRO/100 Network Driver"
++#define DRV_COPYRIGHT		"Copyright(c) 1999-2003 Intel Corporation"
++#define PFX			DRV_NAME ": "
++
++#define E100_WATCHDOG_PERIOD	2 * HZ
++#define E100_NAPI_WEIGHT	16
++
++MODULE_DESCRIPTION(DRV_DESCRIPTION);
++MODULE_AUTHOR(DRV_COPYRIGHT);
++MODULE_LICENSE("GPL");
++
++static int debug = 3;
++module_param(debug, int, 0);
++MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
++#define DPRINTK(nlevel, klevel, fmt, args...) \
++	(void)((NETIF_MSG_##nlevel & nic->msg_enable) && \
++	printk(KERN_##klevel PFX "%s: %s: " fmt, nic->netdev->name, \
++		__FUNCTION__ , ## args))
++
++#define INTEL_8255X_ETHERNET_DEVICE(device_id, ich) {\
++	PCI_VENDOR_ID_INTEL, device_id, PCI_ANY_ID, PCI_ANY_ID, \
++	PCI_CLASS_NETWORK_ETHERNET << 8, 0xFFFF00, ich }
++static struct pci_device_id e100_id_table[] = {
++	INTEL_8255X_ETHERNET_DEVICE(0x1029, 0),
++	INTEL_8255X_ETHERNET_DEVICE(0x1030, 0),
++	INTEL_8255X_ETHERNET_DEVICE(0x1031, 3),
++	INTEL_8255X_ETHERNET_DEVICE(0x1032, 3),
++	INTEL_8255X_ETHERNET_DEVICE(0x1033, 3),
++	INTEL_8255X_ETHERNET_DEVICE(0x1034, 3),
++	INTEL_8255X_ETHERNET_DEVICE(0x1038, 3),
++	INTEL_8255X_ETHERNET_DEVICE(0x1039, 4),
++	INTEL_8255X_ETHERNET_DEVICE(0x103A, 4),
++	INTEL_8255X_ETHERNET_DEVICE(0x103B, 4),
++	INTEL_8255X_ETHERNET_DEVICE(0x103C, 4),
++	INTEL_8255X_ETHERNET_DEVICE(0x103D, 4),
++	INTEL_8255X_ETHERNET_DEVICE(0x103E, 4),
++	INTEL_8255X_ETHERNET_DEVICE(0x1050, 5),
++	INTEL_8255X_ETHERNET_DEVICE(0x1051, 5),
++	INTEL_8255X_ETHERNET_DEVICE(0x1052, 5),
++	INTEL_8255X_ETHERNET_DEVICE(0x1053, 5),
++	INTEL_8255X_ETHERNET_DEVICE(0x1054, 5),
++	INTEL_8255X_ETHERNET_DEVICE(0x1055, 5),
++	INTEL_8255X_ETHERNET_DEVICE(0x1064, 6),
++	INTEL_8255X_ETHERNET_DEVICE(0x1065, 6),
++	INTEL_8255X_ETHERNET_DEVICE(0x1066, 6),
++	INTEL_8255X_ETHERNET_DEVICE(0x1067, 6),
++	INTEL_8255X_ETHERNET_DEVICE(0x1068, 6),
++	INTEL_8255X_ETHERNET_DEVICE(0x1069, 6),
++	INTEL_8255X_ETHERNET_DEVICE(0x106A, 6),
++	INTEL_8255X_ETHERNET_DEVICE(0x106B, 6),
++	INTEL_8255X_ETHERNET_DEVICE(0x1059, 0),
++	INTEL_8255X_ETHERNET_DEVICE(0x1209, 0),
++	INTEL_8255X_ETHERNET_DEVICE(0x1229, 0),
++	INTEL_8255X_ETHERNET_DEVICE(0x2449, 2),
++	INTEL_8255X_ETHERNET_DEVICE(0x2459, 2),
++	INTEL_8255X_ETHERNET_DEVICE(0x245D, 2),
++	{ 0, }
++};
++MODULE_DEVICE_TABLE(pci, e100_id_table);
++
++enum mac {
++	mac_82557_D100_A  = 0,
++	mac_82557_D100_B  = 1,
++	mac_82557_D100_C  = 2,
++	mac_82558_D101_A4 = 4,
++	mac_82558_D101_B0 = 5,
++	mac_82559_D101M   = 8,
++	mac_82559_D101S   = 9,
++	mac_82550_D102    = 12,
++	mac_82550_D102_C  = 13,
++	mac_82551_E       = 14,
++	mac_82551_F       = 15,
++	mac_82551_10      = 16,
++	mac_unknown       = 0xFF,
++};
++
++enum phy {
++	phy_100a     = 0x000003E0,
++	phy_100c     = 0x035002A8, 
++	phy_82555_tx = 0x015002A8,
++	phy_nsc_tx   = 0x5C002000, 
++	phy_82562_et = 0x033002A8,
++	phy_82562_em = 0x032002A8,
++	phy_82562_eh = 0x017002A8,
++	phy_unknown  = 0xFFFFFFFF,
++};
++
++/* CSR (Control/Status Registers) */
++struct csr {
++	struct {
++		u8 status;
++		u8 stat_ack;
++		u8 cmd_lo;
++		u8 cmd_hi;
++		u32 gen_ptr;
++	} scb;
++	u32 port;
++	u16 flash_ctrl;
++	u8 eeprom_ctrl_lo;
++	u8 eeprom_ctrl_hi;
++	u32 mdi_ctrl;
++	u32 rx_dma_count;
++};
++
++enum scb_status {
++	rus_idle         = 0x00,
++	rus_suspended    = 0x04,
++	rus_no_resources = 0x08,
++	rus_ready        = 0x10,
++	rus_mask         = 0x3C,
++	cus_idle         = 0x00,
++	cus_suspended    = 0x40,
++	cus_active       = 0x80,
++       	cus_mask         = 0xC0,
++};
++
++enum scb_stat_ack {
++	stat_ack_sw_gen      = 0x04,
++	stat_ack_rnr         = 0x10,
++	stat_ack_cu_idle     = 0x20,
++	stat_ack_frame_rx    = 0x40,
++	stat_ack_cu_cmd_done = 0x80,
++	stat_ack_rx = (stat_ack_sw_gen | stat_ack_rnr | stat_ack_frame_rx),
++	stat_ack_tx = (stat_ack_cu_idle | stat_ack_cu_cmd_done),
++};
++
++enum scb_cmd_hi {
++	irq_mask_none = 0x00,
++	irq_mask_all  = 0x01,
++	irq_sw_gen    = 0x02,
++};
++
++enum scb_cmd_lo {
++	ruc_start      = 0x01,
++	ruc_load_base  = 0x06,
++	cuc_start      = 0x10,
++	cuc_resume     = 0x20,
++	cuc_dump_addr  = 0x40,
++	cuc_dump_stats = 0x50,
++	cuc_load_base  = 0x60,
++	cuc_dump_reset = 0x70,
++};
++
++enum port {
++	software_reset  = 0x0000,
++	selftest        = 0x0001,
++	selective_reset = 0x0002,
++};
++
++enum eeprom_ctrl_lo {
++	eesk = 0x01,
++	eecs = 0x02,
++	eedi = 0x04,
++	eedo = 0x08,
++};
++
++enum mdi_ctrl {
++	mdi_write = 0x04000000,
++	mdi_read  = 0x08000000,
++	mdi_ready = 0x10000000,
++};
++
++enum eeprom_op {
++	op_write = 0x05,
++	op_read  = 0x06,
++	op_ewds  = 0x10,
++	op_ewen  = 0x13,
++};
++
++enum eeprom_offsets {
++	eeprom_id         = 0x0A,
++	eeprom_config_asf = 0x0D,
++	eeprom_smbus_addr = 0x90,
++};
++
++enum eeprom_id {
++	eeprom_id_wol = 0x0020,
++};
++
++enum eeprom_config_asf {
++	eeprom_asf = 0x8000,
++	eeprom_gcl = 0x4000,
++};
++
++enum cb_status {
++	cb_complete = 0x8000,
++	cb_ok       = 0x2000,
++};
++
++enum cb_command {
++	cb_iaaddr = 0x0001,
++	cb_config = 0x0002,
++	cb_multi  = 0x0003,
++	cb_tx     = 0x0004,
++	cb_dump   = 0x0006,
++	cb_tx_sf  = 0x0008,
++	cb_cid    = 0x1f00,
++	cb_i      = 0x2000,
++	cb_s      = 0x4000,
++	cb_el     = 0x8000,
++};
++
++struct rfd {
++	u16 status;
++	u16 command;
++	u32 link;
++	u32 rbd;
++	u16 actual_size;
++	u16 size;
++};
++
++struct rx_list {
++	struct list_head list;
++	struct sk_buff *skb;
++	dma_addr_t dma_addr;
++	unsigned int length;
++};
++
++#if defined(__BIG_ENDIAN_BITFIELD)
++#define X(a,b)	b,a
++#else
++#define X(a,b)	a,b
++#endif
++struct config {
++/*0*/	u8 X(byte_count:6, pad0:2);
++/*1*/	u8 X(X(rx_fifo_limit:4, tx_fifo_limit:3), pad1:1);
++/*2*/	u8 adaptive_ifs;
++/*3*/	u8 X(X(X(X(mwi_enable:1, type_enable:1), read_align_enable:1),
++	   term_write_cache_line:1), pad3:4);
++/*4*/	u8 X(rx_dma_max_count:7, pad4:1);
++/*5*/	u8 X(tx_dma_max_count:7, dma_max_count_enable:1);
++/*6*/	u8 X(X(X(X(X(X(X(late_scb_update:1, direct_rx_dma:1),
++	   tno_intr:1), cna_intr:1), standard_tcb:1), standard_stat_counter:1),
++	   rx_discard_overruns:1), rx_save_bad_frames:1);
++/*7*/	u8 X(X(X(X(X(rx_discard_short_frames:1, tx_underrun_retry:2),
++	   pad7:2), rx_extended_rfd:1), tx_two_frames_in_fifo:1),
++	   tx_dynamic_tbd:1);
++/*8*/	u8 X(X(mii_mode:1, pad8:6), csma_disabled:1);
++/*9*/	u8 X(X(X(X(X(rx_tcpudp_checksum:1, pad9:3), vlan_arp_tco:1),
++	   link_status_wake:1), arp_wake:1), mcmatch_wake:1);
++/*10*/	u8 X(X(X(pad10:3, no_source_addr_insertion:1), preamble_length:2),
++	   loopback:2);
++/*11*/	u8 X(linear_priority:3, pad11:5);
++/*12*/	u8 X(X(linear_priority_mode:1, pad12:3), ifs:4);
++/*13*/	u8 ip_addr_lo;
++/*14*/	u8 ip_addr_hi;
++/*15*/	u8 X(X(X(X(X(X(X(promiscuous_mode:1, broadcast_disabled:1),
++	   wait_after_win:1), pad15_1:1), ignore_ul_bit:1), crc_16_bit:1),
++	   pad15_2:1), crs_or_cdt:1);
++/*16*/	u8 fc_delay_lo;
++/*17*/	u8 fc_delay_hi;
++/*18*/	u8 X(X(X(X(X(rx_stripping:1, tx_padding:1), rx_crc_transfer:1),
++	   rx_long_ok:1), fc_priority_threshold:3), pad18:1);
++/*19*/	u8 X(X(X(X(X(X(X(addr_wake:1, magic_packet_disable:1),
++	   fc_disable:1), fc_restop:1), fc_restart:1), fc_reject:1),
++	   full_duplex_force:1), full_duplex_pin:1);
++/*20*/	u8 X(X(X(pad20_1:5, fc_priority_location:1), multi_ia:1), pad20_2:1);
++/*21*/	u8 X(X(pad21_1:3, multicast_all:1), pad21_2:4);
++/*22*/	u8 X(X(rx_d102_mode:1, rx_vlan_drop:1), pad22:6);
++	u8 pad_d102[9];
++};
++
++#define E100_MAX_MULTICAST_ADDRS	64
++struct multi {
++	u16 count;
++	u8 addr[E100_MAX_MULTICAST_ADDRS * ETH_ALEN + 2/*pad*/];
++};
++
++/* Important: keep total struct u32-aligned */
++struct cb {
++	u16 status;
++	u16 command;
++	u32 link;
++	union {
++		u8 iaaddr[ETH_ALEN];
++		struct config config;
++		struct multi multi;
++		struct {
++			u32 tbd_array;
++			u16 tcb_byte_count;
++			u8 threshold;
++			u8 tbd_count;
++			struct {
++				u32 buf_addr;
++				u16 size;
++				u16 eol;
++			} tbd;
++		} tcb;
++		u32 dump_buffer_addr;
++	} u;
++	struct cb *next, *prev;
++	dma_addr_t dma_addr;
++	struct sk_buff *skb;
++};
++
++enum loopback {
++	lb_none = 0, lb_mac = 1, lb_phy = 3,
++};
++
++struct stats {
++	u32 tx_good_frames, tx_max_collisions, tx_late_collisions,
++		tx_underruns, tx_lost_crs, tx_deferred, tx_single_collisions,
++		tx_multiple_collisions, tx_total_collisions;
++	u32 rx_good_frames, rx_crc_errors, rx_alignment_errors,
++		rx_resource_errors, rx_overrun_errors, rx_cdt_errors,
++		rx_short_frame_errors;
++	u32 fc_xmt_pause, fc_rcv_pause, fc_rcv_unsupported;
++	u16 xmt_tco_frames, rcv_tco_frames;
++	u32 complete;
++};
++
++struct mem {
++	struct {
++		u32 signature;
++		u32 result;
++	} selftest;
++	struct stats stats;
++	u8 dump_buf[596];
++};
++
++struct param_range {
++	u32 min;
++	u32 max;
++	u32 count;
++};
++
++struct params {
++	struct param_range rfds;
++	struct param_range cbs;
++};
++
++struct nic {
++	/* Begin: frequently used values: keep adjacent for cache effect */
++	u32 msg_enable				____cacheline_aligned;
++	struct net_device *netdev;
++	struct pci_dev *pdev;
++	
++	struct list_head rx_list_head		____cacheline_aligned;
++	struct rx_list *rx_list;
++	struct rfd blank_rfd;
++	
++	spinlock_t cb_lock			____cacheline_aligned;
++	spinlock_t cmd_lock;
++	struct csr *csr;
++	enum scb_cmd_lo cuc_cmd;
++	unsigned int cbs_avail;
++	struct cb *cbs;
++	struct cb *cb_to_use;
++	struct cb *cb_to_send;
++	struct cb *cb_to_clean;
++	u16 tx_command;
++	/* End: frequently used values: keep adjacent for cache effect */
++
++	enum {
++		ich           = (1 << 0),
++		promiscuous   = (1 << 1),
++		multicast_all = (1 << 2),
++		wol_magic     = (1 << 3),
++	} flags					____cacheline_aligned;
++	
++	enum mac mac;
++	enum phy phy;
++	struct params params;
++	struct net_device_stats net_stats;
++	struct timer_list watchdog;
++	struct timer_list blink_timer;
++	struct mii_if_info mii;
++	enum loopback loopback;
++
++	struct mem *mem;
++	dma_addr_t dma_addr;
++
++	dma_addr_t cbs_dma_addr;
++	u8 adaptive_ifs;
++	u8 tx_threshold;
++	u32 tx_frames;
++	u32 tx_collisions;
++	u32 tx_deferred;
++	u32 tx_single_collisions;
++	u32 tx_multiple_collisions;
++	u32 tx_fc_pause;
++	u32 tx_tco_frames;
++
++	u32 rx_fc_pause;
++	u32 rx_fc_unsupported;
++	u32 rx_tco_frames;
++	
++	u8 rev_id;
++	u16 leds;
++	u16 eeprom_wc;
++	u16 eeprom[256];
++	u32 pm_state[16];
++};
++
++static void e100_get_defaults(struct nic *nic)
++{
++	struct param_range rfds = { .min = 64, .max = 256, .count = 64 };
++	struct param_range cbs  = { .min = 64, .max = 256, .count = 64 };
++
++	pci_read_config_byte(nic->pdev, PCI_REVISION_ID, &nic->rev_id);
++	/* MAC type is encoded as rev ID; exception: ICH is treated as 82559 */
++	nic->mac = (nic->flags & ich) ? mac_82559_D101M : nic->rev_id;
++	if(nic->mac == mac_unknown)
++		nic->mac = mac_82557_D100_A;
++
++	nic->params.rfds = rfds; 
++	nic->params.cbs = cbs; 
++	
++	/* Quadwords to DMA into FIFO before starting frame transmit */
++	nic->tx_threshold = 0xE0;
++
++	nic->tx_command = cpu_to_le16(cb_tx | cb_i | cb_tx_sf |
++		((nic->mac >= mac_82558_D101_A4) ? cb_cid : 0));
++
++	/* Template for a freshly allocated RFD */
++	nic->blank_rfd.status = 0;
++	nic->blank_rfd.command = cpu_to_le16(cb_el);
++	nic->blank_rfd.link = 0;
++	nic->blank_rfd.rbd = 0xFFFFFFFF;
++	nic->blank_rfd.actual_size = 0;
++	nic->blank_rfd.size = cpu_to_le16(VLAN_ETH_FRAME_LEN);
++}
++
++static inline void e100_write_flush(struct nic *nic)
++{
++	/* Flush previous PCI writes through intermediate bridges
++	 * by doing a benign read */
++	(void)readb(&nic->csr->scb.status);
++}
++
++static inline void e100_enable_irq(struct nic *nic)
++{
++	writeb(irq_mask_none, &nic->csr->scb.cmd_hi);
++	e100_write_flush(nic);
++}
++
++static inline void e100_disable_irq(struct nic *nic)
++{
++	writeb(irq_mask_all, &nic->csr->scb.cmd_hi);
++	e100_write_flush(nic);
++}
++
++static void e100_hw_reset(struct nic *nic)
++{
++	/* Put CU and RU into idle with a selective reset to get
++	 * device off of PCI bus */
++	writel(selective_reset, &nic->csr->port);
++	e100_write_flush(nic); udelay(20);
++	
++	/* Now fully reset device */
++	writel(software_reset, &nic->csr->port);
++	e100_write_flush(nic); udelay(20);
++	
++	/* TCO workaround - 82559 and greater */
++	if(nic->mac >= mac_82559_D101M) {
++		/* Issue a redundant CU load base without setting 
++		 * general pointer, and without waiting for scb to
++		 * clear.  This gets us into post-driver.  Finally,
++		 * wait 20 msec for reset to take effect. */
++		writeb(cuc_load_base, &nic->csr->scb.cmd_lo);
++		mdelay(20);
++	}
++
++	/* Mask off our interrupt line - it's unmasked after reset */
++	e100_disable_irq(nic);
++}
++
++static int e100_self_test(struct nic *nic)
++{
++	u32 dma_addr = nic->dma_addr + offsetof(struct mem, selftest);
++
++	/* Passing the self-test is a pretty good indication
++	 * that the device can DMA to/from host memory */
++
++	nic->mem->selftest.signature = 0;
++	nic->mem->selftest.result = 0xFFFFFFFF;
++
++	writel(selftest | dma_addr, &nic->csr->port);
++	e100_write_flush(nic);
++	/* Wait 10 msec for self-test to complete */
++	set_current_state(TASK_UNINTERRUPTIBLE);
++	schedule_timeout(HZ / 100 + 1);
++
++	/* Interrupts are enabled after self-test */
++	e100_disable_irq(nic);
++
++	/* Check results of self-test */
++	if(nic->mem->selftest.result != 0) {
++		DPRINTK(HW, ERR, "Self-test failed: result=0x%08X\n",
++			nic->mem->selftest.result);
++		return -ETIMEDOUT;
++	}
++	if(nic->mem->selftest.signature == 0) {
++		DPRINTK(HW, ERR, "Self-test failed: timed out\n");
++		return -ETIMEDOUT;
++	}
++
++	return 0;
++}
++
++static void e100_eeprom_write(struct nic *nic, u16 addr_len, u16 addr, u16 data)
++{
++	u32 cmd_addr_data[3];
++	u8 ctrl;
++	int i, j;
++
++	/* Three cmds: write/erase enable, write data, write/erase disable */
++	cmd_addr_data[0] = op_ewen << (addr_len - 2);
++	cmd_addr_data[1] = (((op_write << addr_len) | addr) << 16) | data;
++	cmd_addr_data[2] = op_ewds << (addr_len - 2);
++
++	/* Bit-bang cmds to write word to eeprom */
++	for(j = 0; j < 3; j++) {
++
++		/* Chip select */
++		writeb(eecs | eesk, &nic->csr->eeprom_ctrl_lo);
++		e100_write_flush(nic); udelay(4);
++
++		for(i = 31; i >= 0; i--) {
++			ctrl = (cmd_addr_data[j] & (1 << i)) ?
++				eecs | eedi : eecs;
++			writeb(ctrl, &nic->csr->eeprom_ctrl_lo);
++			e100_write_flush(nic); udelay(4);
++			writeb(ctrl | eesk, &nic->csr->eeprom_ctrl_lo);
++			e100_write_flush(nic); udelay(4);
++		}
++		/* Wait 10 msec for cmd to complete */
++		set_current_state(TASK_UNINTERRUPTIBLE);
++		schedule_timeout(HZ / 100 + 1);
++
++		/* Chip deselect */
++		writeb(0, &nic->csr->eeprom_ctrl_lo);
++		e100_write_flush(nic); udelay(4);
++	}
++
++};
++
++/* General technique stolen from the eepro100 driver - very clever */
++static u16 e100_eeprom_read(struct nic *nic, u16 *addr_len, u16 addr)
++{
++	u32 cmd_addr_data;
++	u16 data = 0;
++	u8 ctrl;
++	int i;
++
++	cmd_addr_data = ((op_read << *addr_len) | addr) << 16;
++
++	/* Chip select */
++	writeb(eecs | eesk, &nic->csr->eeprom_ctrl_lo);
++	e100_write_flush(nic); udelay(4);
++
++	/* Bit-bang to read word from eeprom */
++	for(i = 31; i >= 0; i--) {
++		ctrl = (cmd_addr_data & (1 << i)) ? eecs | eedi : eecs;
++		writeb(ctrl, &nic->csr->eeprom_ctrl_lo);
++		e100_write_flush(nic); udelay(4);
++		writeb(ctrl | eesk, &nic->csr->eeprom_ctrl_lo);
++		e100_write_flush(nic); udelay(4);
++		/* Eeprom drives a dummy zero to EEDO after receiving
++		 * complete address.  Use this to adjust addr_len. */
++		ctrl = readb(&nic->csr->eeprom_ctrl_lo);
++		if(!(ctrl & eedo) && i > 16) {
++			*addr_len -= (i - 16);
++			i = 17;
++		}
++		data = (data << 1) | (ctrl & eedo ? 1 : 0);
++	}
++
++	/* Chip deselect */
++	writeb(0, &nic->csr->eeprom_ctrl_lo);
++	e100_write_flush(nic); udelay(4);
++
++	return data;
++};
++
++/* Load entire EEPROM image into driver cache and validate checksum */
++static int e100_eeprom_load(struct nic *nic)
++{
++	u16 addr, addr_len = 8, checksum = 0;
++
++	/* Try reading with an 8-bit addr len to discover actual addr len */
++	e100_eeprom_read(nic, &addr_len, 0);
++	nic->eeprom_wc = 1 << addr_len;
++	
++	for(addr = 0; addr < nic->eeprom_wc; addr++) {
++		nic->eeprom[addr] = e100_eeprom_read(nic, &addr_len, addr);
++		if(addr < nic->eeprom_wc - 1)
++			checksum += nic->eeprom[addr];
++	}
++
++	/* The checksum, stored in the last word, is calculated such that
++	 * the sum of words should be 0xBABA */
++	checksum = 0xBABA - checksum;
++	if(checksum != nic->eeprom[nic->eeprom_wc - 1]) {
++		DPRINTK(PROBE, ERR, "EEPROM corrupted\n");
++		return -EAGAIN;
++	}
++	
++	return 0;
++}
++
++/* Save (portion of) driver EEPROM cache to device and update checksum */
++static int e100_eeprom_save(struct nic *nic, u16 start, u16 count)
++{
++	u16 addr, addr_len = 8, checksum = 0;
++
++	/* Try reading with an 8-bit addr len to discover actual addr len */
++	e100_eeprom_read(nic, &addr_len, 0);
++	nic->eeprom_wc = 1 << addr_len;
++	
++	if(start + count >= nic->eeprom_wc)
++		return -EINVAL;
++	
++	for(addr = start; addr < start + count; addr++)
++		e100_eeprom_write(nic, addr_len, addr, nic->eeprom[addr]);
++
++	/* The checksum, stored in the last word, is calculated such that
++	 * the sum of words should be 0xBABA */
++	for(addr = 0; addr < nic->eeprom_wc - 1; addr++)
++		checksum += nic->eeprom[addr];
++	nic->eeprom[nic->eeprom_wc - 1] = 0xBABA - checksum;
++	e100_eeprom_write(nic, addr_len, nic->eeprom_wc - 1, 0xBABA - checksum);
++
++	return 0;
++}
++
++#define E100_WAIT_SCB_TIMEOUT 40
++static inline int e100_exec_cmd(struct nic *nic, u8 cmd, dma_addr_t dma_addr)
++{
++	unsigned long flags;
++	unsigned int i;
++	int err = 0;
++
++	spin_lock_irqsave(&nic->cmd_lock, flags);
++
++	/* Previous command is accepted when SCB clears */
++	for(i = 0; i < E100_WAIT_SCB_TIMEOUT; i++) {
++		if(likely(!readb(&nic->csr->scb.cmd_lo)))
++			break;
++		cpu_relax();
++		if(unlikely(i > (E100_WAIT_SCB_TIMEOUT >> 1)))
++			udelay(5);
++	}
++	if(unlikely(i == E100_WAIT_SCB_TIMEOUT)) {
++		err = -EAGAIN;
++		goto err_unlock;
++	}
++
++	if(unlikely(cmd != cuc_resume))
++		writel(dma_addr, &nic->csr->scb.gen_ptr);
++	writeb(cmd, &nic->csr->scb.cmd_lo);
++
++err_unlock:
++	spin_unlock_irqrestore(&nic->cmd_lock, flags);
++
++	return err;
++}
++
++static inline int e100_exec_cb(struct nic *nic, struct sk_buff *skb,
++	void (*cb_prepare)(struct nic *, struct cb *, struct sk_buff *))
++{
++	struct cb *cb;
++	unsigned long flags;
++	int err = 0;
++
++	spin_lock_irqsave(&nic->cb_lock, flags);
++
++	if(unlikely(!nic->cbs_avail)) {
++		err = -ENOMEM;
++		goto err_unlock;
++	}
++
++	cb = nic->cb_to_use;
++	nic->cb_to_use = cb->next;
++	nic->cbs_avail--;
++	cb->skb = skb;
++
++	if(unlikely(!nic->cbs_avail))
++		err = -ENOSPC;
++
++	cb_prepare(nic, cb, skb);
++	
++	/* Order is important otherwise we'll be in a race with h/w:
++	 * set S-bit in current first, then clear S-bit in previous. */
++	cb->command |= cpu_to_le16(cb_s);
++	cb->prev->command &= cpu_to_le16(~cb_s);
++
++	while(nic->cb_to_send != nic->cb_to_use) {
++		if(unlikely((err = e100_exec_cmd(nic, nic->cuc_cmd,
++			nic->cb_to_send->dma_addr)))) {
++			/* Ok, here's where things get sticky.  It's
++			 * possible that we can't schedule the command
++			 * because the controller is too busy, so
++			 * let's just queue the command and try again
++			 * when another command is scheduled. */
++			break;
++		} else {
++			nic->cuc_cmd = cuc_resume;
++			nic->cb_to_send = nic->cb_to_send->next;
++		}
++	}
++
++err_unlock:
++	spin_unlock_irqrestore(&nic->cb_lock, flags);
++
++	return err;
++}
++
++static u16 mdio_ctrl(struct nic *nic, u32 addr, u32 dir, u32 reg, u16 data)
++{
++	u32 data_out = 0;
++	unsigned int i;
++
++	writel((reg << 16) | (addr << 21) | dir | data, &nic->csr->mdi_ctrl);
++
++	for(i = 0; i < 100; i++) {
++		udelay(20);
++		if((data_out = readl(&nic->csr->mdi_ctrl)) & mdi_ready)
++			break;
++	}
++	
++	DPRINTK(HW, DEBUG,
++		"%s:addr=%d, reg=%d, data_in=0x%04X, data_out=0x%04X\n",
++		dir == mdi_read ? "READ" : "WRITE", addr, reg, data, data_out);
++	return (u16)data_out;
++}
++
++static int mdio_read(struct net_device *netdev, int addr, int reg)
++{
++	return mdio_ctrl(netdev->priv, addr, mdi_read, reg, 0);
++}
++
++static void mdio_write(struct net_device *netdev, int addr, int reg, int data)
++{
++	mdio_ctrl(netdev->priv, addr, mdi_write, reg, data);
++}
++
++static void e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb)
++{
++	struct config *config = &cb->u.config;
++	u8 *c = (u8 *)config;
++
++	cb->command = cpu_to_le16(cb_config);
++				
++	memset(config, 0, sizeof(struct config));
++	
++	config->byte_count = 0x16;		/* bytes in this struct */
++	config->rx_fifo_limit = 0x8;		/* bytes in FIFO before DMA */
++	config->direct_rx_dma = 0x1;		/* reserved */
++	config->standard_tcb = 0x1;		/* 1=standard, 0=extended */
++	config->standard_stat_counter = 0x1;	/* 1=standard, 0=extended */
++	config->rx_discard_short_frames = 0x1;	/* 1=discard, 0=pass */
++	config->tx_underrun_retry = 0x3;	/* # of underrun retries */
++	config->mii_mode = 0x1;			/* 1=MII mode, 0=503 mode */
++	config->pad10 = 0x6;
++	config->no_source_addr_insertion = 0x1;	/* 1=no, 0=yes */
++	config->preamble_length = 0x2;		/* 0=1, 1=3, 2=7, 3=15 bytes */
++	config->ifs = 0x6;			/* x16 = inter frame spacing */
++	config->ip_addr_hi = 0xF2;		/* ARP IP filter - not used */
++	config->pad15_1 = 0x1;
++	config->pad15_2 = 0x1;
++	config->crs_or_cdt = 0x0;		/* 0=CRS only, 1=CRS or CDT */
++	config->fc_delay_hi = 0x40;		/* time delay for fc frame */
++	config->tx_padding = 0x1;		/* 1=pad short frames */
++	config->fc_priority_threshold = 0x7;	/* 7=priority fc disabled */
++	config->pad18 = 0x1;
++	config->full_duplex_pin = 0x1;		/* 1=examine FDX# pin */
++	config->pad20_1 = 0x1F;
++	config->fc_priority_location = 0x1;	/* 1=byte#31, 0=byte#19 */
++	config->pad21_1 = 0x5;
++
++	config->adaptive_ifs = nic->adaptive_ifs;
++	config->loopback = nic->loopback;
++
++	if(nic->mii.force_media && nic->mii.full_duplex)
++		config->full_duplex_force = 0x1;	/* 1=force, 0=auto */
++		
++	if(nic->flags & promiscuous || nic->loopback) {
++		config->rx_save_bad_frames = 0x1;	/* 1=save, 0=discard */
++		config->rx_discard_short_frames = 0x0;	/* 1=discard, 0=save */
++		config->promiscuous_mode = 0x1;		/* 1=on, 0=off */
++	}
++
++	if(nic->flags & multicast_all)
++		config->multicast_all = 0x1;		/* 1=accept, 0=no */
++	
++	if(!(nic->flags & wol_magic))
++		config->magic_packet_disable = 0x1;	/* 1=off, 0=on */
++
++	if(nic->mac >= mac_82558_D101_A4) {
++		config->fc_disable = 0x1;	/* 1=Tx fc off, 0=Tx fc on */
++		config->mwi_enable = 0x1;	/* 1=enable, 0=disable */
++		config->standard_tcb = 0x0;	/* 1=standard, 0=extended */
++		config->rx_long_ok = 0x1;	/* 1=VLANs ok, 0=standard */
++		if(nic->mac >= mac_82559_D101M)
++			config->tno_intr = 0x1;		/* TCO stats enable */
++		else
++			config->standard_stat_counter = 0x0;
++	}
++	
++	DPRINTK(HW, DEBUG, "[00-07]=%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\n",
++		c[0], c[1], c[2], c[3], c[4], c[5], c[6], c[7]);
++	DPRINTK(HW, DEBUG, "[08-15]=%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\n",
++		c[8], c[9], c[10], c[11], c[12], c[13], c[14], c[15]);
++	DPRINTK(HW, DEBUG, "[16-23]=%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\n",
++		c[16], c[17], c[18], c[19], c[20], c[21], c[22], c[23]);
++}
++
++static void e100_setup_iaaddr(struct nic *nic, struct cb *cb,
++	struct sk_buff *skb)
++{
++	cb->command = cpu_to_le16(cb_iaaddr);
++	memcpy(cb->u.iaaddr, nic->netdev->dev_addr, ETH_ALEN);
++}
++
++static void e100_dump(struct nic *nic, struct cb *cb, struct sk_buff *skb)
++{
++	cb->command = cpu_to_le16(cb_dump);
++	cb->u.dump_buffer_addr = cpu_to_le32(nic->dma_addr +
++		offsetof(struct mem, dump_buf));
++}
++
++#define NCONFIG_AUTO_SWITCH	0x0080
++#define MII_NSC_CONG		MII_RESV1
++#define NSC_CONG_ENABLE		0x0100
++#define NSC_CONG_TXREADY	0x0400
++#define ADVERTISE_FC_SUPPORTED	0x0400
++static int e100_phy_init(struct nic *nic)
++{
++	struct net_device *netdev = nic->netdev;
++	u32 addr;
++	u16 bmcr, stat, id_lo, id_hi, cong;
++
++	nic->mii.phy_id = 0;
++	nic->mii.advertising = 0;
++	nic->mii.phy_id_mask = 0x1F;
++	nic->mii.reg_num_mask = 0x1F;
++	nic->mii.dev = netdev;
++	nic->mii.full_duplex = 0;
++	nic->mii.force_media = 0;
++	nic->mii.mdio_read = mdio_read;
++	nic->mii.mdio_write = mdio_write;
++	
++	/* Discover phy addr by searching addrs in order {1,0,2,..., 31} */
++	for(addr = 0; addr < 32; addr++) {
++		nic->mii.phy_id = (addr == 0) ? 1 : (addr == 1) ? 0 : addr;
++		bmcr = mdio_read(netdev, nic->mii.phy_id, MII_BMCR);
++		stat = mdio_read(netdev, nic->mii.phy_id, MII_BMSR);
++		stat = mdio_read(netdev, nic->mii.phy_id, MII_BMSR);
++		if(!((bmcr == 0xFFFF) || ((stat == 0) && (bmcr == 0))))
++			break;
++	}
++	DPRINTK(HW, DEBUG, "phy_addr = %d\n", nic->mii.phy_id);
++	if(addr == 32)
++		return -EAGAIN;
++	
++	/* Selected the phy and isolate the rest */
++	for(addr = 0; addr < 32; addr++) {
++		if(addr != nic->mii.phy_id) {
++			mdio_write(netdev, addr, MII_BMCR, BMCR_ISOLATE);
++		} else {
++			bmcr = mdio_read(netdev, addr, MII_BMCR);
++			mdio_write(netdev, addr, MII_BMCR,
++				bmcr & ~BMCR_ISOLATE);
++		}
++	}
++	
++	/* Get phy ID */
++	id_lo = mdio_read(netdev, nic->mii.phy_id, MII_PHYSID1);
++	id_hi = mdio_read(netdev, nic->mii.phy_id, MII_PHYSID2);
++	nic->phy = (u32)id_hi << 16 | (u32)id_lo;
++	DPRINTK(HW, DEBUG, "phy ID = 0x%08X\n", nic->phy);
++		
++	/* Handle National tx phy */
++	if(nic->phy == phy_nsc_tx) {
++		/* Disable congestion control */
++		cong = mdio_read(netdev, nic->mii.phy_id, MII_NSC_CONG);
++		cong |= NSC_CONG_TXREADY;
++		cong &= ~NSC_CONG_ENABLE;
++		mdio_write(netdev, nic->mii.phy_id, MII_NSC_CONG, cong);
++	}
++	
++	/* enable MDI/MDI-X auto-switching */
++	if(nic->mac >= mac_82550_D102)
++		mdio_write(netdev, nic->mii.phy_id, MII_NCONFIG,
++			NCONFIG_AUTO_SWITCH);
++
++	return 0;
++}
++
++static int e100_hw_init(struct nic *nic)
++{
++	int err;
++	
++	e100_hw_reset(nic);
++
++	DPRINTK(HW, ERR, "e100_hw_init\n");
++	if(!in_interrupt() && (err = e100_self_test(nic)))
++		return err;
++
++	if((err = e100_phy_init(nic)))
++		return err;
++	if((err = e100_exec_cmd(nic, cuc_load_base, 0)))
++		return err;
++	if((err = e100_exec_cmd(nic, ruc_load_base, 0)))
++		return err;
++	if((err = e100_exec_cb(nic, NULL, e100_configure)))
++		return err;
++	if((err = e100_exec_cb(nic, NULL, e100_setup_iaaddr)))
++		return err;
++	if((err = e100_exec_cmd(nic, cuc_dump_addr, 
++		nic->dma_addr + offsetof(struct mem, stats))))
++		return err;
++	if((err = e100_exec_cmd(nic, cuc_dump_reset, 0)))
++		return err;
++
++	e100_disable_irq(nic);
++
++	return 0;
++}
++
++static void e100_multi(struct nic *nic, struct cb *cb, struct sk_buff *skb)
++{
++	struct net_device *netdev = nic->netdev;
++	struct dev_mc_list *list = netdev->mc_list;
++	u16 i, count = min(netdev->mc_count, E100_MAX_MULTICAST_ADDRS);
++
++	cb->command = cpu_to_le16(cb_multi);
++	cb->u.multi.count = cpu_to_le16(count * ETH_ALEN);
++	for(i = 0; list && i < count; i++, list = list->next)
++		memcpy(&cb->u.multi.addr[i*ETH_ALEN], &list->dmi_addr,
++			ETH_ALEN);
++}
++
++static void e100_set_multicast_list(struct net_device *netdev)
++{
++	struct nic *nic = netdev->priv;
++
++	DPRINTK(HW, DEBUG, "mc_count=%d, flags=0x%04X\n",
++		netdev->mc_count, netdev->flags);
++
++	if(netdev->flags & IFF_PROMISC)
++		nic->flags |= promiscuous;
++	else
++		nic->flags &= ~promiscuous;
++
++	if(netdev->flags & IFF_ALLMULTI ||
++		netdev->mc_count > E100_MAX_MULTICAST_ADDRS)
++		nic->flags |= multicast_all;
++	else
++		nic->flags &= ~multicast_all;
++
++	e100_exec_cb(nic, NULL, e100_configure);
++	e100_exec_cb(nic, NULL, e100_multi);
++}
++
++static void e100_update_stats(struct nic *nic)
++{
++	struct net_device_stats *ns = &nic->net_stats;
++	struct stats *s = &nic->mem->stats;
++	u32 *complete = (nic->mac < mac_82558_D101_A4) ? &s->fc_xmt_pause :
++		(nic->mac < mac_82559_D101M) ? (u32 *)&s->xmt_tco_frames :
++		&s->complete;
++
++	/* Device's stats reporting may take several microseconds to
++	 * complete, so where always waiting for results of the 
++	 * previous command. */
++
++	if(*complete == le32_to_cpu(0x0000A007)) {
++		*complete = 0;
++		nic->tx_frames = le32_to_cpu(s->tx_good_frames);
++		nic->tx_collisions = le32_to_cpu(s->tx_total_collisions);
++		ns->tx_aborted_errors += le32_to_cpu(s->tx_max_collisions);
++		ns->tx_window_errors += le32_to_cpu(s->tx_late_collisions);
++		ns->tx_carrier_errors += le32_to_cpu(s->tx_lost_crs);
++		ns->tx_fifo_errors += le32_to_cpu(s->tx_underruns);
++		ns->collisions += nic->tx_collisions;
++		ns->tx_errors += le32_to_cpu(s->tx_max_collisions) +
++			le32_to_cpu(s->tx_lost_crs);
++		ns->rx_dropped += le32_to_cpu(s->rx_resource_errors);
++		ns->rx_length_errors += le32_to_cpu(s->rx_short_frame_errors);
++		ns->rx_over_errors += le32_to_cpu(s->rx_resource_errors);
++		ns->rx_crc_errors += le32_to_cpu(s->rx_crc_errors);
++		ns->rx_frame_errors += le32_to_cpu(s->rx_alignment_errors);
++		ns->rx_fifo_errors += le32_to_cpu(s->rx_overrun_errors);
++		ns->rx_errors += le32_to_cpu(s->rx_crc_errors) +
++			le32_to_cpu(s->rx_alignment_errors) +
++			le32_to_cpu(s->rx_short_frame_errors) +
++			le32_to_cpu(s->rx_cdt_errors);
++		nic->tx_deferred += le32_to_cpu(s->tx_deferred);
++		nic->tx_single_collisions +=
++			le32_to_cpu(s->tx_single_collisions);
++		nic->tx_multiple_collisions +=
++			le32_to_cpu(s->tx_multiple_collisions);
++		if(nic->mac >= mac_82558_D101_A4) {
++			nic->tx_fc_pause += le32_to_cpu(s->fc_xmt_pause);
++			nic->rx_fc_pause += le32_to_cpu(s->fc_rcv_pause);
++			nic->rx_fc_unsupported +=
++				le32_to_cpu(s->fc_rcv_unsupported);
++			if(nic->mac >= mac_82559_D101M) {
++				nic->tx_tco_frames +=
++					le16_to_cpu(s->xmt_tco_frames);
++				nic->rx_tco_frames +=
++					le16_to_cpu(s->rcv_tco_frames);
++			}
++		}
++	}
++
++	e100_exec_cmd(nic, cuc_dump_reset, 0);
++}
++
++static void e100_adjust_adaptive_ifs(struct nic *nic, int speed, int duplex)
++{
++	/* Adjust inter-frame-spacing (IFS) between two transmits if
++	 * we're getting collisions on a half-duplex connection. */
++
++	if(duplex == DUPLEX_HALF) {
++		u32 prev = nic->adaptive_ifs;
++		u32 min_frames = (speed == SPEED_100) ? 1000 : 100;
++
++		if((nic->tx_frames / 32 < nic->tx_collisions) &&
++		   (nic->tx_frames > min_frames)) {
++			if(nic->adaptive_ifs < 60)
++				nic->adaptive_ifs += 5;
++		} else if (nic->tx_frames < min_frames) {
++			if(nic->adaptive_ifs >= 5)
++				nic->adaptive_ifs -= 5;
++		}
++		if(nic->adaptive_ifs != prev)
++			e100_exec_cb(nic, NULL, e100_configure);
++	}
++}
++
++static void e100_watchdog(unsigned long data)
++{
++	struct nic *nic = (struct nic *)data;
++	struct ethtool_cmd cmd;
++
++	DPRINTK(TIMER, DEBUG, "right now = %ld\n", jiffies);
++
++	/* mii library handles link maintenance tasks */
++
++	mii_ethtool_gset(&nic->mii, &cmd);
++
++	if(mii_link_ok(&nic->mii) && !netif_carrier_ok(nic->netdev)) {
++		DPRINTK(LINK, INFO, "link up, %sMbps, %s-duplex\n",
++			cmd.speed == SPEED_100 ? "100" : "10",
++			cmd.duplex == DUPLEX_FULL ? "full" : "half");
++	} else if(!mii_link_ok(&nic->mii) && netif_carrier_ok(nic->netdev)) {
++		DPRINTK(LINK, INFO, "link down\n");
++	}
++	
++	mii_check_link(&nic->mii);
++	
++	/* Software generated interrupt to recover from (rare) Rx 
++	 * allocation failure */
++	writeb(irq_sw_gen, &nic->csr->scb.cmd_hi);
++	e100_write_flush(nic);
++
++	e100_update_stats(nic);
++	e100_adjust_adaptive_ifs(nic, cmd.speed, cmd.duplex);
++
++	if(nic->mac <= mac_82557_D100_C)
++		/* Issue a multicast command to workaround a 557 lock up */
++		e100_set_multicast_list(nic->netdev);
++
++	mod_timer(&nic->watchdog, jiffies + E100_WATCHDOG_PERIOD);
++}
++
++static inline void e100_xmit_prepare(struct nic *nic, struct cb *cb,
++	struct sk_buff *skb)
++{
++	cb->command = nic->tx_command;
++	cb->u.tcb.tbd_array = cb->dma_addr + offsetof(struct cb, u.tcb.tbd);
++	cb->u.tcb.tcb_byte_count = 0;
++	cb->u.tcb.threshold = nic->tx_threshold;
++	cb->u.tcb.tbd_count = 1;
++	cb->u.tcb.tbd.buf_addr = cpu_to_le32(pci_map_single(nic->pdev,
++		skb->data, skb->len, PCI_DMA_TODEVICE));
++	cb->u.tcb.tbd.size = cpu_to_le16(skb->len);
++}
++
++static int e100_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
++{
++	struct nic *nic = netdev->priv;
++	int err = e100_exec_cb(nic, skb, e100_xmit_prepare);
++
++	switch(err) {
++	case -ENOSPC:
++		/* We queued the skb, but now we're out of space. */
++		netif_stop_queue(netdev);
++		break;
++	case -ENOMEM:
++		/* This is a hard error - log it. */
++		DPRINTK(TX_ERR, DEBUG, "Out of Tx resources, returning skb\n");
++		netif_stop_queue(netdev);
++		return 1;
++	}
++
++	netdev->trans_start = jiffies;
++	return 0;
++}
++
++static inline int e100_tx_clean(struct nic *nic)
++{
++	struct cb *cb;
++	int tx_cleaned = 0;
++
++	spin_lock(&nic->cb_lock);
++
++	DPRINTK(TX_DONE, DEBUG, "cb->status = 0x%04X\n",
++		nic->cb_to_clean->status);
++
++	/* Clean CBs marked complete */
++	for(cb = nic->cb_to_clean;
++	    cb->status & cpu_to_le16(cb_complete);
++	    cb = nic->cb_to_clean = cb->next) {
++		if(likely(cb->skb != NULL)) {
++			nic->net_stats.tx_packets++;
++			nic->net_stats.tx_bytes += cb->skb->len;
++
++			pci_unmap_single(nic->pdev,
++				le32_to_cpu(cb->u.tcb.tbd.buf_addr),
++				le16_to_cpu(cb->u.tcb.tbd.size),
++				PCI_DMA_TODEVICE);
++			dev_kfree_skb_any(cb->skb);
++			tx_cleaned = 1;
++		}
++		cb->status = 0;
++		nic->cbs_avail++;
++	}
++	
++	spin_unlock(&nic->cb_lock);
++
++	/* Recover from running out of Tx resources in xmit_frame */
++	if(unlikely(tx_cleaned && netif_queue_stopped(nic->netdev)))
++		netif_wake_queue(nic->netdev);
++
++	return tx_cleaned;
++}
++
++static void e100_clean_cbs(struct nic *nic, int free_mem)
++{
++	if(nic->cbs) {
++		while(nic->cb_to_clean != nic->cb_to_use) {
++			struct cb *cb = nic->cb_to_clean;
++			if(cb->skb) {
++				pci_unmap_single(nic->pdev,
++					le32_to_cpu(cb->u.tcb.tbd.buf_addr),
++					le16_to_cpu(cb->u.tcb.tbd.size),
++					PCI_DMA_TODEVICE);
++				dev_kfree_skb(cb->skb);
++			}
++			nic->cb_to_clean = nic->cb_to_clean->next;
++		}
++		nic->cbs_avail = nic->params.cbs.count;
++		if(free_mem) {
++			pci_free_consistent(nic->pdev, 
++				sizeof(struct cb) * nic->params.cbs.count, 
++				nic->cbs, nic->cbs_dma_addr);
++			nic->cbs = NULL;
++			nic->cbs_avail = 0;
++		}
++	}
++	nic->cuc_cmd = cuc_start;
++	nic->cb_to_use = nic->cb_to_send = nic->cb_to_clean =
++		nic->cbs;
++}
++
++static int e100_alloc_cbs(struct nic *nic)
++{
++	struct cb *cb;
++	unsigned int i, count = nic->params.cbs.count;
++	
++	nic->cuc_cmd = cuc_start;
++	nic->cb_to_use = nic->cb_to_send = nic->cb_to_clean = NULL;
++	nic->cbs_avail = 0;
++	
++	nic->cbs = pci_alloc_consistent(nic->pdev, 
++		sizeof(struct cb) * count, &nic->cbs_dma_addr);
++	if(!nic->cbs)
++		return -ENOMEM;
++
++	for(cb = nic->cbs, i = 0; i < count; cb++, i++) {
++		cb->next = (i + 1 < count) ? cb + 1 : nic->cbs;
++		cb->prev = (i == 0) ? nic->cbs + count - 1 : cb - 1;	
++		
++		cb->dma_addr = nic->cbs_dma_addr + i * sizeof(struct cb);
++		cb->link = cpu_to_le32(nic->cbs_dma_addr +
++			((i+1) % count) * sizeof(struct cb));
++	}
++	
++	nic->cb_to_use = nic->cb_to_send = nic->cb_to_clean = nic->cbs;
++	nic->cbs_avail = count;
++
++	return 0;
++}
++
++static inline void e100_start_receiver(struct nic *nic)
++{
++	/* (Re)start RU if suspended or idle and RFA is fully allocated */
++	struct rx_list *curr =
++		list_entry(nic->rx_list_head.next, struct rx_list, list);
++	if(curr->skb) {
++		u8 status = readb(&nic->csr->scb.status);
++		if(unlikely((status & rus_mask) != rus_ready))
++			e100_exec_cmd(nic, ruc_start, curr->dma_addr);
++	}
++}
++
++static inline int e100_rx_alloc_skb(struct nic *nic, struct rx_list *curr)
++{
++	unsigned int rx_offset = 2; /* u32 align protocol headers */
++
++	curr->dma_addr = 0;
++	curr->length = sizeof(struct rfd) + VLAN_ETH_FRAME_LEN;
++
++	if(!(curr->skb = dev_alloc_skb(curr->length + rx_offset)))
++		return -ENOMEM;
++
++	skb_reserve(curr->skb, rx_offset);
++	curr->skb->dev = nic->netdev;
++	curr->dma_addr = pci_map_single(nic->pdev, curr->skb->data,
++		curr->length, PCI_DMA_FROMDEVICE);
++
++	return 0;
++}
++
++static inline void e100_rx_rfa_add_tail(struct nic *nic, struct rx_list *curr)
++{
++	memcpy(curr->skb->data, &nic->blank_rfd, sizeof(struct rfd));
++	pci_dma_sync_single(nic->pdev, curr->dma_addr, 
++		sizeof(struct rfd), PCI_DMA_TODEVICE);
++
++	if(likely(curr->list.prev != &nic->rx_list_head)) {
++		struct rx_list *prev = (struct rx_list *)curr->list.prev;
++		if(likely(prev->skb != NULL)) {
++			struct rfd *prev_rfd = (struct rfd *)prev->skb->data;
++			put_unaligned(cpu_to_le32(curr->dma_addr),
++				(u32 *)&prev_rfd->link);
++			prev_rfd->command = 0;
++			pci_dma_sync_single(nic->pdev, prev->dma_addr, 
++				sizeof(struct rfd), PCI_DMA_TODEVICE);
++		}
++	}
++}
++
++static inline int e100_rx_indicate(struct nic *nic, struct rx_list *curr,
++	unsigned int *work_done, unsigned int work_to_do)
++{
++	struct sk_buff *skb = curr->skb;
++	struct rfd *rfd = (struct rfd *)skb->data;
++	u16 rfd_status, actual_size;
++
++	if(unlikely(work_done && *work_done >= work_to_do))
++		return -EAGAIN;
++
++	/* Need to sync before taking a peek at cb_complete bit */
++	pci_dma_sync_single(nic->pdev, curr->dma_addr,
++		sizeof(struct rfd), PCI_DMA_FROMDEVICE);
++	rfd_status = le16_to_cpu(rfd->status);
++
++	DPRINTK(RX_STATUS, DEBUG, "status=0x%04X\n", rfd_status);
++
++	/* If data isn't ready, nothing to indicate */
++	if(unlikely(!(rfd_status & cb_complete)))
++       		return -EAGAIN;
++
++	/* Get actual data size */
++	actual_size = le16_to_cpu(rfd->actual_size) & 0x3FFF;
++	if(unlikely(actual_size > curr->length - sizeof(struct rfd)))
++		actual_size = curr->length - sizeof(struct rfd);
++
++	/* Get data */
++	pci_dma_sync_single(nic->pdev, curr->dma_addr,
++		sizeof(struct rfd) + actual_size,
++		PCI_DMA_FROMDEVICE);
++	pci_unmap_single(nic->pdev, curr->dma_addr,
++		curr->length, PCI_DMA_FROMDEVICE);
++
++	/* Pull off the RFD and put the actual data (minus eth hdr) */
++	skb_reserve(skb, sizeof(struct rfd));
++	skb_put(skb, actual_size);
++	skb->protocol = eth_type_trans(skb, nic->netdev);
++
++	if(unlikely(!(rfd_status & cb_ok)) ||
++	   actual_size > nic->netdev->mtu + VLAN_ETH_HLEN) {
++		/* Don't indicate if errors */
++		dev_kfree_skb_any(skb);
++	} else {
++		nic->net_stats.rx_packets++;
++		nic->net_stats.rx_bytes += actual_size;
++		nic->netdev->last_rx = jiffies;
++#ifdef CONFIG_E100_NAPI
++		netif_receive_skb(skb);
++#else
++		netif_rx(skb);
++#endif
++		if(work_done)
++			(*work_done)++;
++	}
++
++	curr->length = 0;
++	curr->dma_addr = 0;
++	curr->skb = NULL;
++	
++	return 0;
++}
++
++static inline void e100_rx_clean(struct nic *nic, unsigned int *work_done,
++	unsigned int work_to_do)
++{
++	struct list_head *list, *tmp;
++	struct rx_list *curr;
++
++	/* Indicate newly arrived packets */
++	list_for_each(list, &nic->rx_list_head) {
++		curr = list_entry(list, struct rx_list, list);
++		if(likely(curr->skb != NULL))
++			if(e100_rx_indicate(nic, curr, work_done, work_to_do))
++				break;
++	}
++
++	/* Alloc new skbs to refill list */
++	list_for_each_safe(list, tmp, &nic->rx_list_head) {
++		curr = list_entry(list, struct rx_list, list);
++		if(unlikely(curr->skb != NULL))
++			break; /* List is full, done */
++		if(unlikely(e100_rx_alloc_skb(nic, curr)))
++			break; /* Better luck next time (see watchdog) */
++		list_del(&curr->list);
++		list_add_tail(&curr->list, &nic->rx_list_head);
++		e100_rx_rfa_add_tail(nic, curr);
++	}
++
++	e100_start_receiver(nic);
++}
++
++static void e100_rx_clean_list(struct nic *nic)
++{
++	struct list_head *list;
++	
++	if(!nic->rx_list)
++		return;
++
++	list_for_each(list, &nic->rx_list_head) {
++		struct rx_list *curr = list_entry(list, 
++			struct rx_list, list);
++		if(curr->skb) {
++			pci_unmap_single(nic->pdev, curr->dma_addr,
++				curr->length, PCI_DMA_FROMDEVICE);
++			dev_kfree_skb(curr->skb);
++		}
++	}
++
++	kfree(nic->rx_list);
++	nic->rx_list = NULL;
++}
++
++static int e100_rx_alloc_list(struct nic *nic)
++{
++	struct rx_list *curr;
++	unsigned int i, count = nic->params.rfds.count;
++	
++	INIT_LIST_HEAD(&nic->rx_list_head);
++
++	if(!(nic->rx_list = kmalloc(sizeof(struct rx_list)*count, GFP_ATOMIC)))
++		return -ENOMEM;
++
++	for(curr = nic->rx_list, i = 0; i < count; curr++, i++) {
++		if(e100_rx_alloc_skb(nic, curr)) {
++			e100_rx_clean_list(nic);
++			return -ENOMEM;
++		}
++		list_add_tail(&curr->list, &nic->rx_list_head);
++		e100_rx_rfa_add_tail(nic, curr);
++	}
++	
++	return 0;
++}
++
++static irqreturn_t e100_intr(int irq, void *dev_id, struct pt_regs *regs)
++{
++	struct net_device *netdev = dev_id;
++	struct nic *nic = netdev->priv;
++	u8 stat_ack = readb(&nic->csr->scb.stat_ack);
++
++	DPRINTK(INTR, DEBUG, "stat_ack = 0x%02X\n", stat_ack);
++
++	if(stat_ack == 0x00 ||	/* Not our interrupt */
++	   stat_ack == 0xFF)	/* Hardware is ejected (cardbus, hotswap)  */
++		return IRQ_NONE;
++
++	/* Ack interrupts */
++	writeb(stat_ack, &nic->csr->scb.stat_ack);
++	e100_write_flush(nic);
++
++#ifdef CONFIG_E100_NAPI
++	e100_disable_irq(nic);
++	netif_rx_schedule(netdev);
++#else
++	if(stat_ack & stat_ack_rx)
++		e100_rx_clean(nic, NULL, 0);
++	if(stat_ack & stat_ack_tx)
++		e100_tx_clean(nic);
++#endif
++
++	return IRQ_HANDLED;
++}
++
++#ifdef CONFIG_E100_NAPI
++static int e100_poll(struct net_device *netdev, int *budget)
++{
++	struct nic *nic = netdev->priv;
++	unsigned int work_to_do = min(netdev->quota, *budget);
++	unsigned int work_done = 0;
++	int tx_cleaned;
++
++	e100_rx_clean(nic, &work_done, work_to_do);
++	tx_cleaned = e100_tx_clean(nic);
++
++	/* If no Rx and Tx cleanup work was done, exit polling mode. */
++	if((!tx_cleaned && (work_done == 0)) || !netif_running(netdev)) {
++		netif_rx_complete(netdev);
++		e100_enable_irq(nic);
++		return 0;
++	}
++
++	*budget -= work_done;
++	netdev->quota -= work_done;
++
++	return 1;
++}
++#endif
++
++static struct net_device_stats *e100_get_stats(struct net_device *netdev)
++{
++	struct nic *nic = netdev->priv;
++	return &nic->net_stats;
++}
++
++static int e100_set_mac_address(struct net_device *netdev, void *p)
++{
++	struct nic *nic = netdev->priv;
++	struct sockaddr *addr = p;
++
++	if (!is_valid_ether_addr(addr->sa_data))
++		return -EADDRNOTAVAIL;
++
++	memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
++	e100_exec_cb(nic, NULL, e100_setup_iaaddr);
++
++	return 0;
++}
++
++static int e100_change_mtu(struct net_device *netdev, int new_mtu)
++{
++	if(new_mtu < ETH_ZLEN || new_mtu > ETH_DATA_LEN)
++		return -EINVAL;
++	netdev->mtu = new_mtu;
++	return 0;
++}
++
++static int e100_asf(struct nic *nic)
++{
++	/* ASF can be enabled from eeprom */
++	return((nic->pdev->device >= 0x1050) && (nic->pdev->device <= 0x1055) &&
++	   (nic->eeprom[eeprom_config_asf] & eeprom_asf) &&
++	   !(nic->eeprom[eeprom_config_asf] & eeprom_gcl) &&
++	   ((nic->eeprom[eeprom_smbus_addr] & 0xFF) != 0xFE));
++}
++	
++static int e100_up(struct nic *nic)
++{
++	int err;
++
++	if((err = e100_rx_alloc_list(nic)))
++		return err;
++	if((err = e100_alloc_cbs(nic)))
++		goto err_rx_clean_list;
++	if((err = e100_hw_init(nic)))
++		goto err_clean_cbs;
++	e100_set_multicast_list(nic->netdev);
++	e100_start_receiver(nic);
++	netif_start_queue(nic->netdev);
++	mod_timer(&nic->watchdog, jiffies);
++	if((err = request_irq(nic->pdev->irq, e100_intr, SA_SHIRQ,
++		nic->netdev->name, nic->netdev)))
++		goto err_no_irq;
++	e100_enable_irq(nic);
++	return 0;
++
++err_no_irq:
++	del_timer_sync(&nic->watchdog);
++	netif_stop_queue(nic->netdev);
++err_clean_cbs:
++	e100_clean_cbs(nic, 1);
++err_rx_clean_list:
++	e100_rx_clean_list(nic);
++	return err;
++}
++
++static void e100_down(struct nic *nic)
++{
++	e100_disable_irq(nic);
++	free_irq(nic->pdev->irq, nic->netdev);
++	del_timer_sync(&nic->watchdog);
++	netif_carrier_off(nic->netdev);
++	netif_stop_queue(nic->netdev);
++	e100_clean_cbs(nic, 1);
++	e100_rx_clean_list(nic);
++}
++
++static void e100_tx_timeout(struct net_device *netdev)
++{
++	struct nic *nic = netdev->priv;
++
++	DPRINTK(TX_ERR, DEBUG, "scb.status=0x%02X\n",
++		readb(&nic->csr->scb.status));
++	e100_down(netdev->priv);
++	e100_up(netdev->priv);
++}
++
++static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode)
++{
++	int err;
++	struct sk_buff *skb;
++	struct rx_list *rx;
++
++	/* Use driver resources to perform internal MAC or PHY
++	 * loopback test.  A single packet is prepared and transmitted
++	 * in loopback mode, and the test passes if the received
++	 * packet compares byte-for-byte to the transmitted packet. */
++
++	if((err = e100_rx_alloc_list(nic)))
++		return err;
++	if((err = e100_alloc_cbs(nic)))
++		goto err_clean_rx;
++
++	/* ICH PHY loopback is broken so do MAC loopback instead */
++	if(nic->flags & ich && loopback_mode == lb_phy)
++		loopback_mode = lb_mac;
++
++	nic->loopback = loopback_mode;
++	if((err = e100_hw_init(nic)))
++		goto err_loopback_none;
++
++	if(loopback_mode == lb_phy)
++		mdio_write(nic->netdev, nic->mii.phy_id, MII_BMCR,
++			BMCR_LOOPBACK);
++
++	e100_start_receiver(nic);
++	
++	if(!(skb = dev_alloc_skb(ETH_DATA_LEN))) {
++		err = -ENOMEM;
++		goto err_loopback_none;
++	}
++	skb_put(skb, ETH_DATA_LEN);
++	memset(skb->data, 0xFF, ETH_DATA_LEN);
++	e100_xmit_frame(skb, nic->netdev);
++
++	set_current_state(TASK_UNINTERRUPTIBLE);
++	schedule_timeout(HZ / 100 + 1);
++
++	rx = list_entry(nic->rx_list_head.next, struct rx_list, list);
++	if(memcmp(rx->skb->data + sizeof(struct rfd), skb->data, ETH_DATA_LEN))
++       		err = -EAGAIN;
++
++err_loopback_none:
++	mdio_write(nic->netdev, nic->mii.phy_id, MII_BMCR, 0);
++	nic->loopback = lb_none;
++	e100_hw_init(nic);
++	e100_clean_cbs(nic, 1);
++err_clean_rx:
++	e100_rx_clean_list(nic);
++	return err;
++}
++
++#define MII_LED_CONTROL	0x1B
++static void e100_blink_led(unsigned long data)
++{
++	struct nic *nic = (struct nic *)data;
++	enum led_state {
++		led_on     = 0x01,
++		led_off    = 0x04,
++		led_on_559 = 0x05,
++		led_on_557 = 0x07,
++	};
++
++	nic->leds = (nic->leds & led_on) ? led_off :
++		(nic->mac < mac_82559_D101M) ? led_on_557 : led_on_559;
++	mdio_write(nic->netdev, nic->mii.phy_id, MII_LED_CONTROL, nic->leds);
++	mod_timer(&nic->blink_timer, jiffies + HZ / 4);
++}
++
++static int e100_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd)
++{
++	struct nic *nic = netdev->priv;
++	return mii_ethtool_gset(&nic->mii, cmd);
++}
++  
++static int e100_set_settings(struct net_device *netdev, struct ethtool_cmd *cmd)
++{
++	struct nic *nic = netdev->priv;
++	return mii_ethtool_sset(&nic->mii, cmd);
++}
++  
++static void e100_get_drvinfo(struct net_device *netdev,
++	struct ethtool_drvinfo *info)
++{
++	struct nic *nic = netdev->priv;
++	strcpy(info->driver, DRV_NAME);
++	strcpy(info->version, DRV_VERSION);
++	strcpy(info->fw_version, "N/A");
++	strcpy(info->bus_info, pci_name(nic->pdev));
++}
++  
++static int e100_get_regs_len(struct net_device *netdev)
++{
++	struct nic *nic = netdev->priv;
++#define E100_PHY_REGS		0x1C
++#define E100_REGS_LEN		1 + E100_PHY_REGS + \
++	sizeof(nic->mem->dump_buf) / sizeof(u32)
++	return E100_REGS_LEN * sizeof(u32);
++}
++
++static void e100_get_regs(struct net_device *netdev,
++	struct ethtool_regs *regs, void *p)
++{
++	struct nic *nic = netdev->priv;
++	u32 *buff = p;
++	int i;
++
++	regs->version = (1 << 24) | nic->rev_id;
++	buff[0] = readb(&nic->csr->scb.cmd_hi) << 24 |
++		readb(&nic->csr->scb.cmd_lo) << 16 |
++		readw(&nic->csr->scb.status);
++	for(i = E100_PHY_REGS; i >= 0; i--)
++		buff[1 + E100_PHY_REGS - i] =
++			mdio_read(netdev, nic->mii.phy_id, i);
++	memset(nic->mem->dump_buf, 0, sizeof(nic->mem->dump_buf));
++	e100_exec_cb(nic, NULL, e100_dump);
++	set_current_state(TASK_UNINTERRUPTIBLE);
++	schedule_timeout(HZ / 100 + 1);
++	memcpy(&buff[2 + E100_PHY_REGS], nic->mem->dump_buf,
++		sizeof(nic->mem->dump_buf));
++}
++
++static void e100_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
++{
++	struct nic *nic = netdev->priv;
++	wol->supported = (nic->mac >= mac_82558_D101_A4) ?  WAKE_MAGIC : 0;
++	wol->wolopts = (nic->flags & wol_magic) ? WAKE_MAGIC : 0;
++}
++  
++static int e100_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
++{
++	struct nic *nic = netdev->priv;
++  
++	if(wol->wolopts != WAKE_MAGIC && wol->wolopts != 0)
++		return -EOPNOTSUPP;
++
++	if(wol->wolopts)
++		nic->flags |= wol_magic;
++	else
++		nic->flags &= ~wol_magic;
++
++	pci_enable_wake(nic->pdev, 0, nic->flags & (wol_magic | e100_asf(nic)));
++	e100_exec_cb(nic, NULL, e100_configure);
++  
++	return 0;
++}
++  
++static u32 e100_get_msglevel(struct net_device *netdev)
++{
++	struct nic *nic = netdev->priv;
++	return nic->msg_enable;
++}
++  
++static void e100_set_msglevel(struct net_device *netdev, u32 value)
++{
++	struct nic *nic = netdev->priv;
++	nic->msg_enable = value;
++}
++  
++static int e100_nway_reset(struct net_device *netdev)
++{
++	struct nic *nic = netdev->priv;
++	return mii_nway_restart(&nic->mii);
++}
++
++static u32 e100_get_link(struct net_device *netdev)
++{
++	struct nic *nic = netdev->priv;
++	return mii_link_ok(&nic->mii);
++}
++  
++static int e100_get_eeprom_len(struct net_device *netdev)
++{
++	struct nic *nic = netdev->priv;
++	return nic->eeprom_wc << 1;
++}
++
++#define E100_EEPROM_MAGIC	0x1234
++static int e100_get_eeprom(struct net_device *netdev,
++	struct ethtool_eeprom *eeprom, u8 *bytes)
++{
++	struct nic *nic = netdev->priv;
++	
++	eeprom->magic = E100_EEPROM_MAGIC;
++	memcpy(bytes, &((u8 *)nic->eeprom)[eeprom->offset], eeprom->len);
++
++	return 0;
++}
++
++static int e100_set_eeprom(struct net_device *netdev,
++	struct ethtool_eeprom *eeprom, u8 *bytes)
++{
++	struct nic *nic = netdev->priv;
++	
++	if(eeprom->magic != E100_EEPROM_MAGIC)
++		return -EINVAL;
++	memcpy(&((u8 *)nic->eeprom)[eeprom->offset], bytes, eeprom->len);
++
++	return e100_eeprom_save(nic, eeprom->offset >> 1,
++		(eeprom->len >> 1) + 1);
++}
++
++static void e100_get_ringparam(struct net_device *netdev,
++	struct ethtool_ringparam *ring)
++{
++	struct nic *nic = netdev->priv;
++	struct param_range *rfds = &nic->params.rfds;
++	struct param_range *cbs = &nic->params.cbs;
++  
++	ring->rx_max_pending = rfds->max;
++	ring->tx_max_pending = cbs->max;
++	ring->rx_mini_max_pending = 0;
++	ring->rx_jumbo_max_pending = 0;
++	ring->rx_pending = rfds->count;
++	ring->tx_pending = cbs->count;
++	ring->rx_mini_pending = 0;
++	ring->rx_jumbo_pending = 0;
++}
++  
++static int e100_set_ringparam(struct net_device *netdev,
++	struct ethtool_ringparam *ring)
++{
++	struct nic *nic = netdev->priv;
++	struct param_range *rfds = &nic->params.rfds;
++	struct param_range *cbs = &nic->params.cbs;
++  
++	if(netif_running(netdev))
++		e100_down(nic);
++	rfds->count = max(ring->rx_pending, rfds->min);
++	rfds->count = min(rfds->count, rfds->max);
++	cbs->count = max(ring->tx_pending, cbs->min);
++	cbs->count = min(cbs->count, cbs->max);
++	if(netif_running(netdev))
++		e100_up(nic);
++		
++	return 0;
++}
++  
++static char e100_gstrings_test[][ETH_GSTRING_LEN] = {
++	"Link test     (on/offline)",
++	"Eeprom test   (on/offline)",
++	"Self test        (offline)",
++	"Mac loopback     (offline)",
++	"Phy loopback     (offline)",
++};
++#define E100_TEST_LEN	sizeof(e100_gstrings_test) / ETH_GSTRING_LEN
++
++static int e100_diag_test_count(struct net_device *netdev)
++{
++	return E100_TEST_LEN;
++}
++
++static void e100_diag_test(struct net_device *netdev,
++	struct ethtool_test *test, u64 *data)
++{
++	struct nic *nic = netdev->priv;
++	int i;
++
++	memset(data, 0, E100_TEST_LEN * sizeof(u64));
++	data[0] = !mii_link_ok(&nic->mii);
++	data[1] = e100_eeprom_load(nic);
++	if(test->flags & ETH_TEST_FL_OFFLINE) {
++		if(netif_running(netdev))
++			e100_down(nic);
++		data[2] = e100_self_test(nic);
++		data[3] = e100_loopback_test(nic, lb_mac);
++		data[4] = e100_loopback_test(nic, lb_phy);
++		if(netif_running(netdev))
++			e100_up(nic);
++	}
++	for(i = 0; i < E100_TEST_LEN; i++)
++		test->flags |= data[i] ? ETH_TEST_FL_FAILED : 0;
++}
++
++static int e100_phys_id(struct net_device *netdev, u32 data)
++{
++	struct nic *nic = netdev->priv;
++
++	if(!data || data > (u32)(MAX_SCHEDULE_TIMEOUT / HZ))
++		data = (u32)(MAX_SCHEDULE_TIMEOUT / HZ);
++	mod_timer(&nic->blink_timer, jiffies);
++	set_current_state(TASK_INTERRUPTIBLE);
++	schedule_timeout(data * HZ);
++	del_timer_sync(&nic->blink_timer);
++	mdio_write(netdev, nic->mii.phy_id, MII_LED_CONTROL, 0);
++
++	return 0;
++}
++
++static char e100_gstrings_stats[][ETH_GSTRING_LEN] = {
++	"rx_packets", "tx_packets", "rx_bytes", "tx_bytes", "rx_errors",
++	"tx_errors", "rx_dropped", "tx_dropped", "multicast", "collisions",
++	"rx_length_errors", "rx_over_errors", "rx_crc_errors",
++	"rx_frame_errors", "rx_fifo_errors", "rx_missed_errors",
++	"tx_aborted_errors", "tx_carrier_errors", "tx_fifo_errors",
++	"tx_heartbeat_errors", "tx_window_errors",
++	/* device-specific stats */
++	"tx_deferred", "tx_single_collisions", "tx_multi_collisions", 
++	"tx_flow_control_pause", "rx_flow_control_pause",
++	"rx_flow_control_unsupported", "tx_tco_packets", "rx_tco_packets",
++};
++#define E100_NET_STATS_LEN	21
++#define E100_STATS_LEN	sizeof(e100_gstrings_stats) / ETH_GSTRING_LEN
++
++static int e100_get_stats_count(struct net_device *netdev)
++{
++	return E100_STATS_LEN;
++}
++
++static void e100_get_ethtool_stats(struct net_device *netdev,
++	struct ethtool_stats *stats, u64 *data)
++{
++	struct nic *nic = netdev->priv;
++	int i;
++
++	for(i = 0; i < E100_NET_STATS_LEN; i++)
++		data[i] = ((unsigned long *)&nic->net_stats)[i];
++
++	data[i++] = nic->tx_deferred;
++	data[i++] = nic->tx_single_collisions;
++	data[i++] = nic->tx_multiple_collisions;
++	data[i++] = nic->tx_fc_pause;
++	data[i++] = nic->rx_fc_pause;
++	data[i++] = nic->rx_fc_unsupported;
++	data[i++] = nic->tx_tco_frames;
++	data[i++] = nic->rx_tco_frames;
++}
++
++static void e100_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
++{
++	switch(stringset) {
++	case ETH_SS_TEST:
++		memcpy(data, *e100_gstrings_test, sizeof(e100_gstrings_test));
++		break;
++	case ETH_SS_STATS:
++		memcpy(data, *e100_gstrings_stats, sizeof(e100_gstrings_stats));
++		break;
++	}
++}
++
++static struct ethtool_ops e100_ethtool_ops = {
++	.get_settings		= e100_get_settings,
++	.set_settings		= e100_set_settings,
++	.get_drvinfo		= e100_get_drvinfo,
++	.get_regs_len		= e100_get_regs_len,
++	.get_regs		= e100_get_regs,
++	.get_wol		= e100_get_wol,
++	.set_wol		= e100_set_wol,
++	.get_msglevel		= e100_get_msglevel,
++	.set_msglevel		= e100_set_msglevel,
++	.nway_reset		= e100_nway_reset,
++	.get_link		= e100_get_link,
++	.get_eeprom_len		= e100_get_eeprom_len,
++	.get_eeprom		= e100_get_eeprom,
++	.set_eeprom		= e100_set_eeprom,
++	.get_ringparam		= e100_get_ringparam,
++	.set_ringparam		= e100_set_ringparam,
++	.self_test_count	= e100_diag_test_count,
++	.self_test		= e100_diag_test,
++	.get_strings		= e100_get_strings,
++	.phys_id		= e100_phys_id,
++	.get_stats_count	= e100_get_stats_count,
++	.get_ethtool_stats	= e100_get_ethtool_stats,
++};
++
++static int e100_do_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
++{
++	struct nic *nic = netdev->priv;
++	struct mii_ioctl_data *mii = (struct mii_ioctl_data *)&ifr->ifr_data;
++
++	return generic_mii_ioctl(&nic->mii, mii, cmd, NULL);
++}
++
++static int e100_alloc(struct nic *nic)
++{
++	nic->mem = pci_alloc_consistent(nic->pdev, sizeof(struct mem),
++		&nic->dma_addr);
++	return nic->mem ? 0 : -ENOMEM;
++}
++
++static void e100_free(struct nic *nic)
++{
++	if(nic->mem) {
++		pci_free_consistent(nic->pdev, sizeof(struct mem),
++			nic->mem, nic->dma_addr);
++		nic->mem = NULL;
++	}
++}
++
++static int e100_open(struct net_device *netdev)
++{
++	struct nic *nic = netdev->priv;
++	int err = 0;
++
++	netif_carrier_off(netdev);
++	if((err = e100_up(nic)))
++		DPRINTK(IFUP, ERR, "Cannot open interface, aborting.\n");
++	return err;
++}
++
++static int e100_close(struct net_device *netdev)
++{
++	e100_down(netdev->priv);
++	return 0;
++}
++
++static int __devinit e100_probe(struct pci_dev *pdev, 
++	const struct pci_device_id *ent)
++{
++	struct net_device *netdev;
++	struct nic *nic;
++	int err;
++	
++	if(!(netdev = alloc_etherdev(sizeof(struct nic)))) {
++		if(((1 << debug) - 1) & NETIF_MSG_PROBE)
++			printk(KERN_ERR PFX "Etherdev alloc failed, abort.\n");
++		return -ENOMEM;
++	}
++
++	netdev->open = e100_open;
++	netdev->stop = e100_close;
++	netdev->hard_start_xmit = e100_xmit_frame;
++	netdev->get_stats = e100_get_stats;
++	netdev->set_multicast_list = e100_set_multicast_list;
++	netdev->set_mac_address = e100_set_mac_address;
++	netdev->change_mtu = e100_change_mtu;
++	netdev->do_ioctl = e100_do_ioctl;
++	SET_ETHTOOL_OPS(netdev, &e100_ethtool_ops);
++	netdev->tx_timeout = e100_tx_timeout;
++	netdev->watchdog_timeo = E100_WATCHDOG_PERIOD;
++#ifdef CONFIG_E100_NAPI
++	netdev->poll = e100_poll;
++	netdev->weight = E100_NAPI_WEIGHT;
++#endif
++
++	nic = netdev->priv;
++	nic->netdev = netdev;
++	nic->pdev = pdev;
++	nic->msg_enable = (1 << debug) - 1;
++	pci_set_drvdata(pdev, netdev);
++
++	if((err = pci_enable_device(pdev))) {
++		DPRINTK(PROBE, ERR, "Cannot enable PCI device, aborting.\n");
++		goto err_out_free_dev;
++	}
++
++	if(!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) {
++		DPRINTK(PROBE, ERR, "Cannot find proper PCI device "
++			"base address, aborting.\n");
++		err = -ENODEV;
++		goto err_out_disable_pdev;
++	}
++
++	if((err = pci_request_regions(pdev, DRV_NAME))) {
++		DPRINTK(PROBE, ERR, "Cannot obtain PCI resources, aborting.\n");
++		goto err_out_disable_pdev;
++	}
++
++	pci_set_master(pdev);
++
++	if((err = pci_set_dma_mask(pdev, 0xFFFFFFFFULL))) {
++		DPRINTK(PROBE, ERR, "No usable DMA configuration, aborting.\n");
++		goto err_out_free_res;
++	}
++
++	SET_MODULE_OWNER(netdev);
++	SET_NETDEV_DEV(netdev, &pdev->dev);
++
++	nic->csr = ioremap(pci_resource_start(pdev, 0), sizeof(struct csr));
++	if(!nic->csr) {
++		DPRINTK(PROBE, ERR, "Cannot map device registers, aborting.\n");
++		err = -ENOMEM;
++		goto err_out_free_res;
++	}
++
++	if(ent->driver_data)
++		nic->flags |= ich;
++	else
++		nic->flags &= ~ich;
++
++	spin_lock_init(&nic->cb_lock);
++	spin_lock_init(&nic->cmd_lock);
++
++	init_timer(&nic->watchdog);
++	nic->watchdog.function = e100_watchdog;
++	nic->watchdog.data = (unsigned long)nic;
++	init_timer(&nic->blink_timer);
++	nic->blink_timer.function = e100_blink_led;
++	nic->blink_timer.data = (unsigned long)nic;
++
++	if((err = e100_alloc(nic))) {
++		DPRINTK(PROBE, ERR, "Cannot alloc driver memory, aborting.\n");
++		goto err_out_iounmap;
++	}
++
++	e100_get_defaults(nic);
++	e100_hw_reset(nic);
++	e100_phy_init(nic);
++
++	if((err = e100_eeprom_load(nic)))
++		goto err_out_free;
++	((u16 *)netdev->dev_addr)[0] = le16_to_cpu(nic->eeprom[0]);
++	((u16 *)netdev->dev_addr)[1] = le16_to_cpu(nic->eeprom[1]);
++	((u16 *)netdev->dev_addr)[2] = le16_to_cpu(nic->eeprom[2]);
++	if(!is_valid_ether_addr(netdev->dev_addr)) {
++		DPRINTK(PROBE, ERR, "Invalid MAC address from "
++			"EEPROM, aborting.\n");
++		err = -EAGAIN;
++		goto err_out_free;
++	}
++
++	/* Wol magic packet can be enabled from eeprom */
++	if((nic->mac >= mac_82558_D101_A4) &&
++	   (nic->eeprom[eeprom_id] & eeprom_id_wol))
++		nic->flags |= wol_magic;
++
++	pci_enable_wake(pdev, 0, nic->flags & (wol_magic | e100_asf(nic)));
++
++	if((err = register_netdev(netdev))) {
++		DPRINTK(PROBE, ERR, "Cannot register net device, aborting.\n");
++		goto err_out_free;
++	}
++
++	DPRINTK(PROBE, INFO, "addr 0x%lx, irq %d, "
++		"MAC addr %02X:%02X:%02X:%02X:%02X:%02X\n",
++		pci_resource_start(pdev, 0), pdev->irq,
++		netdev->dev_addr[0], netdev->dev_addr[1], netdev->dev_addr[2],
++		netdev->dev_addr[3], netdev->dev_addr[4], netdev->dev_addr[5]);
++
++	return 0;
++
++err_out_free:
++	e100_free(nic);
++err_out_iounmap:
++	iounmap(nic->csr);
++err_out_free_res:
++	pci_release_regions(pdev);
++err_out_disable_pdev:
++	pci_disable_device(pdev);
++err_out_free_dev:
++	pci_set_drvdata(pdev, NULL);
++	free_netdev(netdev);
++	return err;
++}
++
++static void __devexit e100_remove(struct pci_dev *pdev)
++{
++	struct net_device *netdev = pci_get_drvdata(pdev);
++
++	if(netdev) {
++		struct nic *nic = netdev->priv;
++		unregister_netdev(netdev);
++		e100_free(nic);
++		iounmap(nic->csr);
++		free_netdev(netdev);
++		pci_release_regions(pdev);
++		pci_disable_device(pdev);
++		pci_set_drvdata(pdev, NULL);
++	}
++}
++
++#ifdef CONFIG_PM			
++static int e100_suspend(struct pci_dev *pdev, u32 state)
++{
++	struct net_device *netdev = pci_get_drvdata(pdev);
++	struct nic *nic = netdev->priv;
++
++	if(netif_running(netdev))
++		e100_down(nic);
++	e100_hw_reset(nic);
++	netif_device_detach(netdev);
++
++	pci_save_state(pdev, nic->pm_state);
++	pci_enable_wake(pdev, state, nic->flags & (wol_magic | e100_asf(nic)));
++	pci_disable_device(pdev);
++	pci_set_power_state(pdev, state);
++
++	return 0;
++}
++
++static int e100_resume(struct pci_dev *pdev)
++{
++	struct net_device *netdev = pci_get_drvdata(pdev);
++	struct nic *nic = netdev->priv;
++
++	pci_set_power_state(pdev, 0);
++	pci_restore_state(pdev, nic->pm_state);
++	e100_hw_init(nic);
++
++	netif_device_attach(netdev);
++	if(netif_running(netdev))
++		e100_up(nic);
++	
++	return 0;
++}
++#endif
++
++static struct pci_driver e100_driver = {
++	.name =         DRV_NAME,
++	.id_table =     e100_id_table,
++	.probe =        e100_probe,
++	.remove =       __devexit_p(e100_remove),
++#ifdef CONFIG_PM			
++	.suspend =      e100_suspend,
++	.resume =       e100_resume,
++#endif
++};
++
++static int __init e100_init_module(void)
++{
++	if(((1 << debug) - 1) & NETIF_MSG_DRV) {
++		printk(KERN_INFO PFX "%s, %s\n", DRV_DESCRIPTION, DRV_VERSION);
++		printk(KERN_INFO PFX "%s\n", DRV_COPYRIGHT);
++	}
++        return pci_module_init(&e100_driver);
++}
++
++static void __exit e100_cleanup_module(void)
++{
++	pci_unregister_driver(&e100_driver);
++}
++
++module_init(e100_init_module);
++module_exit(e100_cleanup_module);
+--- linux-2.6.0/drivers/net/e100/e100_config.c	2003-09-27 18:57:45.000000000 -0700
++++ /dev/null	2002-08-30 16:31:37.000000000 -0700
+@@ -1,639 +0,0 @@
+-/*******************************************************************************
+-
+-  
+-  Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved.
+-  
+-  This program is free software; you can redistribute it and/or modify it 
+-  under the terms of the GNU General Public License as published by the Free 
+-  Software Foundation; either version 2 of the License, or (at your option) 
+-  any later version.
+-  
+-  This program is distributed in the hope that it will be useful, but WITHOUT 
+-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
+-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
+-  more details.
+-  
+-  You should have received a copy of the GNU General Public License along with
+-  this program; if not, write to the Free Software Foundation, Inc., 59 
+-  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+-  
+-  The full GNU General Public License is included in this distribution in the
+-  file called LICENSE.
+-  
+-  Contact Information:
+-  Linux NICS <linux.nics@intel.com>
+-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+-*******************************************************************************/
+-
+-/**********************************************************************
+-*                                                                     *
+-* INTEL CORPORATION                                                   *
+-*                                                                     *
+-* This software is supplied under the terms of the license included   *
+-* above.  All use of this driver must be in accordance with the terms *
+-* of that license.                                                    *
+-*                                                                     *
+-* Module Name:  e100_config.c                                         *
+-*                                                                     *
+-* Abstract:     Functions for configuring the network adapter.        *
+-*                                                                     *
+-* Environment:  This file is intended to be specific to the Linux     *
+-*               operating system.                                     *
+-*                                                                     *
+-**********************************************************************/
+-#include "e100_config.h"
+-
+-static void e100_config_long_rx(struct e100_private *bdp, unsigned char enable);
+-
+-static const u8 def_config[] = {
+-	CB_CFIG_BYTE_COUNT,
+-	0x08, 0x00, 0x00, 0x00, 0x00, 0x32, 0x07, 0x01,
+-	0x00, 0x2e, 0x00, 0x60, 0x00, 0xf2, 0xc8, 0x00,
+-	0x40, 0xf2, 0x80, 0x3f, 0x05
+-};
+-
+-/**
+- * e100_config_init_82557 - config the 82557 adapter
+- * @bdp: atapter's private data struct
+- *
+- * This routine will initialize the 82557 configure block.
+- * All other init functions will only set values that are
+- * different from the 82557 default.
+- */
+-void __devinit
+-e100_config_init_82557(struct e100_private *bdp)
+-{
+-	/* initialize config block */
+-	memcpy(bdp->config, def_config, sizeof (def_config));
+-	bdp->config[0] = CB_CFIG_BYTE_COUNT;	/* just in case */
+-
+-	e100_config_ifs(bdp);
+-
+-	/*
+-	 * Enable extended statistical counters (82558 and up) and TCO counters
+-	 * (82559 and up) and set the statistical counters' mode in bdp 
+-	 *  
+-	 *  stat. mode      |    TCO stat. bit (2)  |  Extended stat. bit (5)
+-	 * ------------------------------------------------------------------
+-	 *  Basic (557)     |       0               |         1
+-	 * ------------------------------------------------------------------
+-	 *  Extended (558)  |       0               |         0
+-	 * ------------------------------------------------------------------
+-	 *  TCO (559)       |       1               |         1
+-	 * ------------------------------------------------------------------
+-	 *  Reserved        |       1               |         0
+-	 * ------------------------------------------------------------------
+-	 */
+-	bdp->config[6] &= ~CB_CFIG_TCO_STAT;
+-	bdp->config[6] |= CB_CFIG_EXT_STAT_DIS;
+-	bdp->stat_mode = E100_BASIC_STATS;
+-
+-	/* Setup for MII or 503 operation.  The CRS+CDT bit should only be set */
+-	/* when operating in 503 mode. */
+-	if (bdp->phy_addr == 32) {
+-		bdp->config[8] &= ~CB_CFIG_503_MII;
+-		bdp->config[15] |= CB_CFIG_CRS_OR_CDT;
+-	} else {
+-		bdp->config[8] |= CB_CFIG_503_MII;
+-		bdp->config[15] &= ~CB_CFIG_CRS_OR_CDT;
+-	}
+-
+-	e100_config_fc(bdp);
+-	e100_config_force_dplx(bdp);
+-	e100_config_promisc(bdp, false);
+-	e100_config_mulcast_enbl(bdp, false);
+-}
+-
+-static void __devinit
+-e100_config_init_82558(struct e100_private *bdp)
+-{
+-	/* MWI enable. This should be turned on only if the adapter is a 82558/9
+-	 * and if the PCI command reg. has enabled the MWI bit. */
+-	bdp->config[3] |= CB_CFIG_MWI_EN;
+-
+-	bdp->config[6] &= ~CB_CFIG_EXT_TCB_DIS;
+-
+-	if (bdp->rev_id >= D101MA_REV_ID) {
+-		/* this is 82559 and up - enable TCO counters */
+-		bdp->config[6] |= CB_CFIG_TCO_STAT;
+-		bdp->config[6] |= CB_CFIG_EXT_STAT_DIS;
+-		bdp->stat_mode = E100_TCO_STATS;
+-
+-		if ((bdp->rev_id < D102_REV_ID) &&
+-		    (bdp->params.b_params & PRM_XSUMRX) &&
+-		    (bdp->pdev->device != 0x1209)) {
+-
+-			bdp->flags |= DF_CSUM_OFFLOAD;
+-			bdp->config[9] |= 1;
+-		}
+-	} else {
+-		/* this is 82558 */
+-		bdp->config[6] &= ~CB_CFIG_TCO_STAT;
+-		bdp->config[6] &= ~CB_CFIG_EXT_STAT_DIS;
+-		bdp->stat_mode = E100_EXTENDED_STATS;
+-	}
+-
+-	e100_config_long_rx(bdp, true);
+-}
+-
+-static void __devinit
+-e100_config_init_82550(struct e100_private *bdp)
+-{
+-	/* The D102 chip allows for 32 config bytes.  This value is
+-	 * supposed to be in Byte 0.  Just add the extra bytes to
+-	 * what was already setup in the block. */
+-	bdp->config[0] += CB_CFIG_D102_BYTE_COUNT;
+-
+-	/* now we need to enable the extended RFD.  When this is
+-	 * enabled, the immediated receive data buffer starts at offset
+-	 * 32 from the RFD base address, instead of at offset 16. */
+-	bdp->config[7] |= CB_CFIG_EXTENDED_RFD;
+-
+-	/* put the chip into D102 receive mode.  This is necessary
+-	 * for any parsing and offloading features. */
+-	bdp->config[22] = CB_CFIG_RECEIVE_GAMLA_MODE;
+-
+-	/* set the flag if checksum offloading was enabled */
+-	if (bdp->params.b_params & PRM_XSUMRX) {
+-		bdp->flags |= DF_CSUM_OFFLOAD;
+-	}
+-}
+-
+-/* Initialize the adapter's configure block */
+-void __devinit
+-e100_config_init(struct e100_private *bdp)
+-{
+-	e100_config_init_82557(bdp);
+-
+-	if (bdp->flags & IS_BACHELOR)
+-		e100_config_init_82558(bdp);
+-
+-	if (bdp->rev_id >= D102_REV_ID)
+-		e100_config_init_82550(bdp);
+-}
+-
+-/**
+- * e100_force_config - force a configure command
+- * @bdp: atapter's private data struct
+- *
+- * This routine will force a configure command to the adapter.
+- * The command will be executed in polled mode as interrupts
+- * are _disabled_ at this time.
+- *
+- * Returns:
+- *      true: if the configure command was successfully issued and completed
+- *      false: otherwise
+- */
+-unsigned char
+-e100_force_config(struct e100_private *bdp)
+-{
+-	spin_lock_bh(&(bdp->config_lock));
+-
+-	bdp->config[0] = CB_CFIG_BYTE_COUNT;
+-	if (bdp->rev_id >= D102_REV_ID) {
+-		/* The D102 chip allows for 32 config bytes.  This value is
+-		   supposed to be in Byte 0.  Just add the extra bytes to
+-		   what was already setup in the block. */
+-		bdp->config[0] += CB_CFIG_D102_BYTE_COUNT;
+-	}
+-
+-	spin_unlock_bh(&(bdp->config_lock));
+-
+-	// although we call config outside the lock, there is no
+-	// race condition because config byte count has maximum value
+-	return e100_config(bdp);
+-}
+-
+-/**
+- * e100_config - issue a configure command
+- * @bdp: atapter's private data struct
+- *
+- * This routine will issue a configure command to the 82557.
+- * This command will be executed in polled mode as interrupts
+- * are _disabled_ at this time.
+- *
+- * Returns:
+- *      true: if the configure command was successfully issued and completed
+- *      false: otherwise
+- */
+-unsigned char
+-e100_config(struct e100_private *bdp)
+-{
+-	cb_header_t *pntcb_hdr;
+-	unsigned char res = true;
+-	nxmit_cb_entry_t *cmd;
+-
+-	if (bdp->config[0] == 0) {
+-		goto exit;
+-	}
+-
+-	if ((cmd = e100_alloc_non_tx_cmd(bdp)) == NULL) {
+-		res = false;
+-		goto exit;
+-	}
+-
+-	pntcb_hdr = (cb_header_t *) cmd->non_tx_cmd;
+-	pntcb_hdr->cb_cmd = __constant_cpu_to_le16(CB_CONFIGURE);
+-
+-	spin_lock_bh(&bdp->config_lock);
+-
+-	if (bdp->config[0] < CB_CFIG_MIN_PARAMS) {
+-		bdp->config[0] = CB_CFIG_MIN_PARAMS;
+-	}
+-
+-	/* Copy the device's config block to the device's memory */
+-	memcpy(cmd->non_tx_cmd->ntcb.config.cfg_byte, bdp->config,
+-	       bdp->config[0]);
+-	/* reset number of bytes to config next time */
+-	bdp->config[0] = 0;
+-
+-	spin_unlock_bh(&bdp->config_lock);
+-
+-	res = e100_exec_non_cu_cmd(bdp, cmd);
+-
+-exit:
+-	if (netif_running(bdp->device))
+-		netif_wake_queue(bdp->device);
+-	return res;
+-}
+-
+-/**
+- * e100_config_fc - config flow-control state
+- * @bdp: adapter's private data struct
+- *
+- * This routine will enable or disable flow control support in the adapter's
+- * config block. Flow control will be enable only if requested using the command
+- * line option, and if the link is flow-contorl capable (both us and the link
+- * partner). But, if link partner is capable of autoneg, but not capable of
+- * flow control, received PAUSE	frames are still honored.
+- */
+-void
+-e100_config_fc(struct e100_private *bdp)
+-{
+-	unsigned char enable = false;
+-	/* 82557 doesn't support fc. Don't touch this option */
+-	if (!(bdp->flags & IS_BACHELOR))
+-		return;
+-
+-	/* Enable fc if requested and if the link supports it */
+-	if ((bdp->params.b_params & PRM_FC) && (bdp->flags & 
+-		(DF_LINK_FC_CAP | DF_LINK_FC_TX_ONLY))) {
+-		enable = true;
+-	}
+-
+-	spin_lock_bh(&(bdp->config_lock));
+-
+-	if (enable) {
+-		if (bdp->flags & DF_LINK_FC_TX_ONLY) {
+-			/* If link partner is capable of autoneg, but  */
+-			/* not capable of flow control, Received PAUSE */
+-			/* frames are still honored, i.e.,             */
+-			/* transmitted frames would be paused by       */
+-			/* incoming PAUSE frames                       */
+-			bdp->config[16] = DFLT_NO_FC_DELAY_LSB;
+-			bdp->config[17] = DFLT_NO_FC_DELAY_MSB;
+-			bdp->config[19] &= ~(CB_CFIG_FC_RESTOP | CB_CFIG_FC_RESTART);
+-			bdp->config[19] |= CB_CFIG_FC_REJECT;
+-			bdp->config[19] &= ~CB_CFIG_TX_FC_DIS;
+-		} else {
+-			bdp->config[16] = DFLT_FC_DELAY_LSB;
+-			bdp->config[17] = DFLT_FC_DELAY_MSB;
+-			bdp->config[19] |= CB_CFIG_FC_OPTS;
+-			bdp->config[19] &= ~CB_CFIG_TX_FC_DIS;
+-		}
+-	} else {
+-		bdp->config[16] = DFLT_NO_FC_DELAY_LSB;
+-		bdp->config[17] = DFLT_NO_FC_DELAY_MSB;
+-		bdp->config[19] &= ~CB_CFIG_FC_OPTS;
+-		bdp->config[19] |= CB_CFIG_TX_FC_DIS;
+-	}
+-	E100_CONFIG(bdp, 19);
+-	spin_unlock_bh(&(bdp->config_lock));
+-
+-	return;
+-}
+-
+-/**
+- * e100_config_promisc - configure promiscuous mode
+- * @bdp: atapter's private data struct
+- * @enable: should we enable this option or not
+- *
+- * This routine will enable or disable promiscuous mode
+- * in the adapter's config block.
+- */
+-void
+-e100_config_promisc(struct e100_private *bdp, unsigned char enable)
+-{
+-	spin_lock_bh(&(bdp->config_lock));
+-
+-	/* if in promiscuous mode, save bad frames */
+-	if (enable) {
+-
+-		if (!(bdp->config[6] & CB_CFIG_SAVE_BAD_FRAMES)) {
+-			bdp->config[6] |= CB_CFIG_SAVE_BAD_FRAMES;
+-			E100_CONFIG(bdp, 6);
+-		}
+-
+-		if (bdp->config[7] & (u8) BIT_0) {
+-			bdp->config[7] &= (u8) (~BIT_0);
+-			E100_CONFIG(bdp, 7);
+-		}
+-
+-		if (!(bdp->config[15] & CB_CFIG_PROMISCUOUS)) {
+-			bdp->config[15] |= CB_CFIG_PROMISCUOUS;
+-			E100_CONFIG(bdp, 15);
+-		}
+-
+-	} else {		/* not in promiscuous mode */
+-
+-		if (bdp->config[6] & CB_CFIG_SAVE_BAD_FRAMES) {
+-			bdp->config[6] &= ~CB_CFIG_SAVE_BAD_FRAMES;
+-			E100_CONFIG(bdp, 6);
+-		}
+-
+-		if (!(bdp->config[7] & (u8) BIT_0)) {
+-			bdp->config[7] |= (u8) (BIT_0);
+-			E100_CONFIG(bdp, 7);
+-		}
+-
+-		if (bdp->config[15] & CB_CFIG_PROMISCUOUS) {
+-			bdp->config[15] &= ~CB_CFIG_PROMISCUOUS;
+-			E100_CONFIG(bdp, 15);
+-		}
+-	}
+-
+-	spin_unlock_bh(&(bdp->config_lock));
+-}
+-
+-/**
+- * e100_config_mulcast_enbl - configure allmulti mode
+- * @bdp: atapter's private data struct
+- * @enable: should we enable this option or not
+- *
+- * This routine will enable or disable reception of all multicast packets
+- * in the adapter's config block.
+- */
+-void
+-e100_config_mulcast_enbl(struct e100_private *bdp, unsigned char enable)
+-{
+-	spin_lock_bh(&(bdp->config_lock));
+-
+-	/* this flag is used to enable receiving all multicast packet */
+-	if (enable) {
+-		if (!(bdp->config[21] & CB_CFIG_MULTICAST_ALL)) {
+-			bdp->config[21] |= CB_CFIG_MULTICAST_ALL;
+-			E100_CONFIG(bdp, 21);
+-		}
+-
+-	} else {
+-		if (bdp->config[21] & CB_CFIG_MULTICAST_ALL) {
+-			bdp->config[21] &= ~CB_CFIG_MULTICAST_ALL;
+-			E100_CONFIG(bdp, 21);
+-		}
+-	}
+-
+-	spin_unlock_bh(&(bdp->config_lock));
+-}
+-
+-/**
+- * e100_config_ifs - configure the IFS parameter
+- * @bdp: atapter's private data struct
+- *
+- * This routine will configure the adaptive IFS value
+- * in the adapter's config block. IFS values are only
+- * relevant in half duplex, so set to 0 in full duplex.
+- */
+-void
+-e100_config_ifs(struct e100_private *bdp)
+-{
+-	u8 value = 0;
+-
+-	spin_lock_bh(&(bdp->config_lock));
+-
+-	/* IFS value is only needed to be specified at half-duplex mode */
+-	if (bdp->cur_dplx_mode == HALF_DUPLEX) {
+-		value = (u8) bdp->ifs_value;
+-	}
+-
+-	if (bdp->config[2] != value) {
+-		bdp->config[2] = value;
+-		E100_CONFIG(bdp, 2);
+-	}
+-
+-	spin_unlock_bh(&(bdp->config_lock));
+-}
+-
+-/**
+- * e100_config_force_dplx - configure the forced full duplex mode
+- * @bdp: atapter's private data struct
+- *
+- * This routine will enable or disable force full duplex
+- * in the adapter's config block. If the PHY is 503, and
+- * the duplex is full, consider the adapter forced.
+- */
+-void
+-e100_config_force_dplx(struct e100_private *bdp)
+-{
+-	spin_lock_bh(&(bdp->config_lock));
+-
+-	/* We must force full duplex on if we are using PHY 0, and we are */
+-	/* supposed to run in FDX mode. We do this because the e100 has only */
+-	/* one FDX# input pin, and that pin will be connected to PHY 1. */
+-	/* Changed the 'if' condition below to fix performance problem * at 10
+-	 * full. The Phy was getting forced to full duplex while the MAC * was
+-	 * not, because the cur_dplx_mode was not being set to 2 by SetupPhy. *
+-	 * This is how the condition was, initially. * This has been changed so
+-	 * that the MAC gets forced to full duplex * simply if the user has
+-	 * forced full duplex. * * if (( bdp->phy_addr == 0 ) && (
+-	 * bdp->cur_dplx_mode == 2 )) */
+-	/* The rest of the fix is in the PhyDetect code. */
+-	if ((bdp->params.e100_speed_duplex == E100_SPEED_10_FULL) ||
+-	    (bdp->params.e100_speed_duplex == E100_SPEED_100_FULL) ||
+-	    ((bdp->phy_addr == 32) && (bdp->cur_dplx_mode == FULL_DUPLEX))) {
+-		if (!(bdp->config[19] & (u8) CB_CFIG_FORCE_FDX)) {
+-			bdp->config[19] |= (u8) CB_CFIG_FORCE_FDX;
+-			E100_CONFIG(bdp, 19);
+-		}
+-
+-	} else {
+-		if (bdp->config[19] & (u8) CB_CFIG_FORCE_FDX) {
+-			bdp->config[19] &= (u8) (~CB_CFIG_FORCE_FDX);
+-			E100_CONFIG(bdp, 19);
+-		}
+-	}
+-
+-	spin_unlock_bh(&(bdp->config_lock));
+-}
+-
+-/**
+- * e100_config_long_rx
+- * @bdp: atapter's private data struct
+- * @enable: should we enable this option or not
+- *
+- * This routine will enable or disable reception of larger packets.
+- * This is needed by VLAN implementations.
+- */
+-static void
+-e100_config_long_rx(struct e100_private *bdp, unsigned char enable)
+-{
+-	if (enable) {
+-		if (!(bdp->config[18] & CB_CFIG_LONG_RX_OK)) {
+-			bdp->config[18] |= CB_CFIG_LONG_RX_OK;
+-			E100_CONFIG(bdp, 18);
+-		}
+-
+-	} else {
+-		if ((bdp->config[18] & CB_CFIG_LONG_RX_OK)) {
+-			bdp->config[18] &= ~CB_CFIG_LONG_RX_OK;
+-			E100_CONFIG(bdp, 18);
+-		}
+-	}
+-}
+-
+-/**
+- * e100_config_wol
+- * @bdp: atapter's private data struct
+- *
+- * This sets configuration options for PHY and Magic Packet WoL 
+- */
+-void
+-e100_config_wol(struct e100_private *bdp)
+-{
+-	spin_lock_bh(&(bdp->config_lock));
+-
+-	if (bdp->wolopts & WAKE_PHY) {
+-		bdp->config[9] |= CB_LINK_STATUS_WOL;
+-	}
+-	else {
+-		/* Disable PHY WoL */
+-		bdp->config[9] &= ~CB_LINK_STATUS_WOL;
+-	}
+-
+-	if (bdp->wolopts & WAKE_MAGIC) {
+-		bdp->config[19] &= ~CB_DISABLE_MAGPAK_WAKE;
+-	}
+-	else {
+-		/* Disable Magic Packet WoL */
+-		bdp->config[19] |= CB_DISABLE_MAGPAK_WAKE;
+-	}
+-
+-	E100_CONFIG(bdp, 19);
+-	spin_unlock_bh(&(bdp->config_lock));
+-}
+-
+-void
+-e100_config_vlan_drop(struct e100_private *bdp, unsigned char enable)
+-{
+-	spin_lock_bh(&(bdp->config_lock));
+-	if (enable) {
+-		if (!(bdp->config[22] & CB_CFIG_VLAN_DROP_ENABLE)) {
+-			bdp->config[22] |= CB_CFIG_VLAN_DROP_ENABLE;
+-			E100_CONFIG(bdp, 22);
+-		}
+-
+-	} else {
+-		if ((bdp->config[22] & CB_CFIG_VLAN_DROP_ENABLE)) {
+-			bdp->config[22] &= ~CB_CFIG_VLAN_DROP_ENABLE;
+-			E100_CONFIG(bdp, 22);
+-		}
+-	}
+-	spin_unlock_bh(&(bdp->config_lock));
+-}
+-
+-/**
+- * e100_config_loopback_mode
+- * @bdp: atapter's private data struct
+- * @mode: loopback mode(phy/mac/none)
+- *
+- */
+-unsigned char
+-e100_config_loopback_mode(struct e100_private *bdp, u8 mode)
+-{
+-	unsigned char bc_changed = false;
+-	u8 config_byte;
+-
+-	spin_lock_bh(&(bdp->config_lock));
+-
+-	switch (mode) {
+-	case NO_LOOPBACK:
+-		config_byte = CB_CFIG_LOOPBACK_NORMAL;
+-		break;
+-	case MAC_LOOPBACK:
+-		config_byte = CB_CFIG_LOOPBACK_INTERNAL;
+-		break;
+-	case PHY_LOOPBACK:
+-		config_byte = CB_CFIG_LOOPBACK_EXTERNAL;
+-		break;
+-	default:
+-		printk(KERN_NOTICE "e100: e100_config_loopback_mode: "
+-		       "Invalid argument 'mode': %d\n", mode);
+-		goto exit;
+-	}
+-
+-	if ((bdp->config[10] & CB_CFIG_LOOPBACK_MODE) != config_byte) {
+-
+-		bdp->config[10] &= (~CB_CFIG_LOOPBACK_MODE);
+-		bdp->config[10] |= config_byte;
+-		E100_CONFIG(bdp, 10);
+-		bc_changed = true;
+-	}
+-
+-exit:
+-	spin_unlock_bh(&(bdp->config_lock));
+-	return bc_changed;
+-}
+-unsigned char
+-e100_config_tcb_ext_enable(struct e100_private *bdp, unsigned char enable)
+-{
+-        unsigned char bc_changed = false;
+- 
+-        spin_lock_bh(&(bdp->config_lock));
+- 
+-        if (enable) {
+-                if (bdp->config[6] & CB_CFIG_EXT_TCB_DIS) {
+- 
+-                        bdp->config[6] &= (~CB_CFIG_EXT_TCB_DIS);
+-                        E100_CONFIG(bdp, 6);
+-                        bc_changed = true;
+-                }
+- 
+-        } else {
+-                if (!(bdp->config[6] & CB_CFIG_EXT_TCB_DIS)) {
+- 
+-                        bdp->config[6] |= CB_CFIG_EXT_TCB_DIS;
+-                        E100_CONFIG(bdp, 6);
+-                        bc_changed = true;
+-                }
+-        }
+-        spin_unlock_bh(&(bdp->config_lock));
+- 
+-        return bc_changed;
+-}
+-unsigned char
+-e100_config_dynamic_tbd(struct e100_private *bdp, unsigned char enable)
+-{
+-        unsigned char bc_changed = false;
+- 
+-        spin_lock_bh(&(bdp->config_lock));
+- 
+-        if (enable) {
+-                if (!(bdp->config[7] & CB_CFIG_DYNTBD_EN)) {
+- 
+-                        bdp->config[7] |= CB_CFIG_DYNTBD_EN;
+-                        E100_CONFIG(bdp, 7);
+-                        bc_changed = true;
+-                }
+- 
+-        } else {
+-                if (bdp->config[7] & CB_CFIG_DYNTBD_EN) {
+- 
+-                        bdp->config[7] &= (~CB_CFIG_DYNTBD_EN);
+-                        E100_CONFIG(bdp, 7);
+-                        bc_changed = true;
+-                }
+-        }
+-        spin_unlock_bh(&(bdp->config_lock));
+- 
+-        return bc_changed;
+-}
+-
+--- linux-2.6.0/drivers/net/e100/e100_config.h	2003-09-27 18:57:45.000000000 -0700
++++ /dev/null	2002-08-30 16:31:37.000000000 -0700
+@@ -1,168 +0,0 @@
+-/*******************************************************************************
+-
+-  
+-  Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved.
+-  
+-  This program is free software; you can redistribute it and/or modify it 
+-  under the terms of the GNU General Public License as published by the Free 
+-  Software Foundation; either version 2 of the License, or (at your option) 
+-  any later version.
+-  
+-  This program is distributed in the hope that it will be useful, but WITHOUT 
+-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
+-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
+-  more details.
+-  
+-  You should have received a copy of the GNU General Public License along with
+-  this program; if not, write to the Free Software Foundation, Inc., 59 
+-  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+-  
+-  The full GNU General Public License is included in this distribution in the
+-  file called LICENSE.
+-  
+-  Contact Information:
+-  Linux NICS <linux.nics@intel.com>
+-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+-*******************************************************************************/
+-
+-#ifndef _E100_CONFIG_INC_
+-#define _E100_CONFIG_INC_
+-
+-#include "e100.h"
+-
+-#define E100_CONFIG(bdp, X) ((bdp)->config[0] = max_t(u8, (bdp)->config[0], (X)+1))
+-
+-#define CB_CFIG_MIN_PARAMS         8
+-
+-/* byte 0 bit definitions*/
+-#define CB_CFIG_BYTE_COUNT_MASK     BIT_0_5	/* Byte count occupies bit 5-0 */
+-
+-/* byte 1 bit definitions*/
+-#define CB_CFIG_RXFIFO_LIMIT_MASK   BIT_0_4	/* RxFifo limit mask */
+-#define CB_CFIG_TXFIFO_LIMIT_MASK   BIT_4_7	/* TxFifo limit mask */
+-
+-/* byte 2 bit definitions -- ADAPTIVE_IFS*/
+-
+-/* word 3 bit definitions -- RESERVED*/
+-/* Changed for 82558 enhancements */
+-/* byte 3 bit definitions */
+-#define CB_CFIG_MWI_EN      BIT_0	/* Enable MWI on PCI bus */
+-#define CB_CFIG_TYPE_EN     BIT_1	/* Type Enable */
+-#define CB_CFIG_READAL_EN   BIT_2	/* Enable Read Align */
+-#define CB_CFIG_TERMCL_EN   BIT_3	/* Cache line write  */
+-
+-/* byte 4 bit definitions*/
+-#define CB_CFIG_RX_MIN_DMA_MASK     BIT_0_6	/* Rx minimum DMA count mask */
+-
+-/* byte 5 bit definitions*/
+-#define CB_CFIG_TX_MIN_DMA_MASK BIT_0_6	/* Tx minimum DMA count mask */
+-#define CB_CFIG_DMBC_EN         BIT_7	/* Enable Tx/Rx min. DMA counts */
+-
+-/* Changed for 82558 enhancements */
+-/* byte 6 bit definitions*/
+-#define CB_CFIG_LATE_SCB           BIT_0	/* Update SCB After New Tx Start */
+-#define CB_CFIG_DIRECT_DMA_DIS     BIT_1	/* Direct DMA mode */
+-#define CB_CFIG_TNO_INT            BIT_2	/* Tx Not OK Interrupt */
+-#define CB_CFIG_TCO_STAT           BIT_2	/* TCO statistics in 559 and above */
+-#define CB_CFIG_CI_INT             BIT_3	/* Command Complete Interrupt */
+-#define CB_CFIG_EXT_TCB_DIS        BIT_4	/* Extended TCB */
+-#define CB_CFIG_EXT_STAT_DIS       BIT_5	/* Extended Stats */
+-#define CB_CFIG_SAVE_BAD_FRAMES    BIT_7	/* Save Bad Frames Enabled */
+-
+-/* byte 7 bit definitions*/
+-#define CB_CFIG_DISC_SHORT_FRAMES   BIT_0	/* Discard Short Frames */
+-#define CB_CFIG_DYNTBD_EN           BIT_7	/* Enable dynamic TBD */
+-/* Enable extended RFD's on D102 */
+-#define CB_CFIG_EXTENDED_RFD        BIT_5
+-
+-/* byte 8 bit definitions*/
+-#define CB_CFIG_503_MII             BIT_0	/* 503 vs. MII mode */
+-
+-/* byte 9 bit definitions -- pre-defined all zeros*/
+-#define CB_LINK_STATUS_WOL	BIT_5
+-
+-/* byte 10 bit definitions*/
+-#define CB_CFIG_NO_SRCADR       BIT_3	/* No Source Address Insertion */
+-#define CB_CFIG_PREAMBLE_LEN    BIT_4_5	/* Preamble Length */
+-#define CB_CFIG_LOOPBACK_MODE   BIT_6_7	/* Loopback Mode */
+-#define CB_CFIG_LOOPBACK_NORMAL 0
+-#define CB_CFIG_LOOPBACK_INTERNAL BIT_6
+-#define CB_CFIG_LOOPBACK_EXTERNAL BIT_6_7
+-
+-/* byte 11 bit definitions*/
+-#define CB_CFIG_LINEAR_PRIORITY     BIT_0_2	/* Linear Priority */
+-
+-/* byte 12 bit definitions*/
+-#define CB_CFIG_LINEAR_PRI_MODE     BIT_0	/* Linear Priority mode */
+-#define CB_CFIG_IFS_MASK            BIT_4_7	/* Interframe Spacing mask */
+-
+-/* byte 13 bit definitions -- pre-defined all zeros*/
+-
+-/* byte 14 bit definitions -- pre-defined 0xf2*/
+-
+-/* byte 15 bit definitions*/
+-#define CB_CFIG_PROMISCUOUS         BIT_0	/* Promiscuous Mode Enable */
+-#define CB_CFIG_BROADCAST_DIS       BIT_1	/* Broadcast Mode Disable */
+-#define CB_CFIG_CRS_OR_CDT          BIT_7	/* CRS Or CDT */
+-
+-/* byte 16 bit definitions -- pre-defined all zeros*/
+-#define DFLT_FC_DELAY_LSB  0x1f	/* Delay for outgoing Pause frames */
+-#define DFLT_NO_FC_DELAY_LSB  0x00	/* no flow control default value */
+-
+-/* byte 17 bit definitions -- pre-defined 0x40*/
+-#define DFLT_FC_DELAY_MSB  0x01	/* Delay for outgoing Pause frames */
+-#define DFLT_NO_FC_DELAY_MSB  0x40	/* no flow control default value */
+-
+-/* byte 18 bit definitions*/
+-#define CB_CFIG_STRIPPING           BIT_0	/* Padding Disabled */
+-#define CB_CFIG_PADDING             BIT_1	/* Padding Disabled */
+-#define CB_CFIG_CRC_IN_MEM          BIT_2	/* Transfer CRC To Memory */
+-
+-/* byte 19 bit definitions*/
+-#define CB_CFIG_TX_ADDR_WAKE        BIT_0	/* Address Wakeup */
+-#define CB_DISABLE_MAGPAK_WAKE      BIT_1	/* Magic Packet Wakeup disable */
+-/* Changed TX_FC_EN to TX_FC_DIS because 0 enables, 1 disables. Jul 8, 1999 */
+-#define CB_CFIG_TX_FC_DIS           BIT_2	/* Tx Flow Control Disable */
+-#define CB_CFIG_FC_RESTOP           BIT_3	/* Rx Flow Control Restop */
+-#define CB_CFIG_FC_RESTART          BIT_4	/* Rx Flow Control Restart */
+-#define CB_CFIG_FC_REJECT           BIT_5	/* Rx Flow Control Restart */
+-#define CB_CFIG_FC_OPTS (CB_CFIG_FC_RESTOP | CB_CFIG_FC_RESTART | CB_CFIG_FC_REJECT)
+-
+-/* end 82558/9 specifics */
+-
+-#define CB_CFIG_FORCE_FDX           BIT_6	/* Force Full Duplex */
+-#define CB_CFIG_FDX_ENABLE          BIT_7	/* Full Duplex Enabled */
+-
+-/* byte 20 bit definitions*/
+-#define CB_CFIG_MULTI_IA            BIT_6	/* Multiple IA Addr */
+-
+-/* byte 21 bit definitions*/
+-#define CB_CFIG_MULTICAST_ALL       BIT_3	/* Multicast All */
+-
+-/* byte 22 bit defines */
+-#define CB_CFIG_RECEIVE_GAMLA_MODE  BIT_0	/* D102 receive mode */
+-#define CB_CFIG_VLAN_DROP_ENABLE    BIT_1	/* vlan stripping */
+-
+-#define CB_CFIG_LONG_RX_OK	    BIT_3
+-
+-#define NO_LOOPBACK	0	
+-#define MAC_LOOPBACK	0x01
+-#define PHY_LOOPBACK	0x02
+-
+-/* function prototypes */
+-extern void e100_config_init(struct e100_private *bdp);
+-extern void e100_config_init_82557(struct e100_private *bdp);
+-extern unsigned char e100_force_config(struct e100_private *bdp);
+-extern unsigned char e100_config(struct e100_private *bdp);
+-extern void e100_config_fc(struct e100_private *bdp);
+-extern void e100_config_promisc(struct e100_private *bdp, unsigned char enable);
+-extern void e100_config_brdcast_dsbl(struct e100_private *bdp);
+-extern void e100_config_mulcast_enbl(struct e100_private *bdp,
+-				     unsigned char enable);
+-extern void e100_config_ifs(struct e100_private *bdp);
+-extern void e100_config_force_dplx(struct e100_private *bdp);
+-extern u8 e100_config_loopback_mode(struct e100_private *bdp, u8 mode);
+-extern u8 e100_config_dynamic_tbd(struct e100_private *bdp, u8 enable);
+-extern u8 e100_config_tcb_ext_enable(struct e100_private *bdp, u8 enable);
+-extern void e100_config_vlan_drop(struct e100_private *bdp, unsigned char enable);
+-#endif /* _E100_CONFIG_INC_ */
+--- linux-2.6.0/drivers/net/e100/e100_eeprom.c	2003-06-14 12:18:07.000000000 -0700
++++ /dev/null	2002-08-30 16:31:37.000000000 -0700
+@@ -1,565 +0,0 @@
+-/*******************************************************************************
+-
+-  
+-  Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved.
+-  
+-  This program is free software; you can redistribute it and/or modify it 
+-  under the terms of the GNU General Public License as published by the Free 
+-  Software Foundation; either version 2 of the License, or (at your option) 
+-  any later version.
+-  
+-  This program is distributed in the hope that it will be useful, but WITHOUT 
+-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
+-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
+-  more details.
+-  
+-  You should have received a copy of the GNU General Public License along with
+-  this program; if not, write to the Free Software Foundation, Inc., 59 
+-  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+-  
+-  The full GNU General Public License is included in this distribution in the
+-  file called LICENSE.
+-  
+-  Contact Information:
+-  Linux NICS <linux.nics@intel.com>
+-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+-*******************************************************************************/
+-
+-/**********************************************************************
+-*                                                                     *
+-* INTEL CORPORATION                                                   *
+-*                                                                     *
+-* This software is supplied under the terms of the license included   *
+-* above.  All use of this driver must be in accordance with the terms *
+-* of that license.                                                    *
+-*                                                                     *
+-* Module Name:  e100_eeprom.c                                         *
+-*                                                                     *
+-* Abstract:     This module contains routines to read and write to a  *
+-*               serial EEPROM                                         *
+-*                                                                     *
+-* Environment:  This file is intended to be specific to the Linux     *
+-*               operating system.                                     *
+-*                                                                     *
+-**********************************************************************/
+-#include "e100.h"
+-
+-#define CSR_EEPROM_CONTROL_FIELD(bdp) ((bdp)->scb->scb_eprm_cntrl)
+-
+-#define CSR_GENERAL_CONTROL2_FIELD(bdp) \
+-	           ((bdp)->scb->scb_ext.d102_scb.scb_gen_ctrl2)
+-
+-#define EEPROM_STALL_TIME	4
+-#define EEPROM_CHECKSUM		((u16) 0xBABA)
+-#define EEPROM_MAX_WORD_SIZE	256
+-
+-void e100_eeprom_cleanup(struct e100_private *adapter);
+-u16 e100_eeprom_calculate_chksum(struct e100_private *adapter);
+-static void e100_eeprom_write_word(struct e100_private *adapter, u16 reg,
+-				   u16 data);
+-void e100_eeprom_write_block(struct e100_private *adapter, u16 start, u16 *data,
+-			     u16 size);
+-u16 e100_eeprom_size(struct e100_private *adapter);
+-u16 e100_eeprom_read(struct e100_private *adapter, u16 reg);
+-
+-static void shift_out_bits(struct e100_private *adapter, u16 data, u16 count);
+-static u16 shift_in_bits(struct e100_private *adapter);
+-static void raise_clock(struct e100_private *adapter, u16 *x);
+-static void lower_clock(struct e100_private *adapter, u16 *x);
+-static u16 eeprom_wait_cmd_done(struct e100_private *adapter);
+-static void eeprom_stand_by(struct e100_private *adapter);
+-
+-//----------------------------------------------------------------------------------------
+-// Procedure:   eeprom_set_semaphore
+-//
+-// Description: This function set (write 1) Gamla EEPROM semaphore bit (bit 23 word 0x1C in the CSR).
+-//
+-// Arguments:
+-//      Adapter                 - Adapter context
+-//
+-// Returns:  true if success
+-//           else return false 
+-//
+-//----------------------------------------------------------------------------------------
+-
+-inline u8
+-eeprom_set_semaphore(struct e100_private *adapter)
+-{
+-	u16 data = 0;
+-	unsigned long expiration_time = jiffies + HZ / 100 + 1;
+-
+-	do {
+-		// Get current value of General Control 2
+-		data = readb(&CSR_GENERAL_CONTROL2_FIELD(adapter));
+-
+-		// Set bit 23 word 0x1C in the CSR.
+-		data |= SCB_GCR2_EEPROM_ACCESS_SEMAPHORE;
+-		writeb(data, &CSR_GENERAL_CONTROL2_FIELD(adapter));
+-
+-		// Check to see if this bit set or not.
+-		data = readb(&CSR_GENERAL_CONTROL2_FIELD(adapter));
+-
+-		if (data & SCB_GCR2_EEPROM_ACCESS_SEMAPHORE) {
+-			return true;
+-		}
+-
+-		if (time_before(jiffies, expiration_time))
+-			yield();
+-		else
+-			return false;
+-
+-	} while (true);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-// Procedure:   eeprom_reset_semaphore
+-//
+-// Description: This function reset (write 0) Gamla EEPROM semaphore bit 
+-//              (bit 23 word 0x1C in the CSR).
+-//
+-// Arguments:  struct e100_private * adapter - Adapter context
+-//----------------------------------------------------------------------------------------
+-
+-inline void
+-eeprom_reset_semaphore(struct e100_private *adapter)
+-{
+-	u16 data = 0;
+-
+-	data = readb(&CSR_GENERAL_CONTROL2_FIELD(adapter));
+-	data &= ~(SCB_GCR2_EEPROM_ACCESS_SEMAPHORE);
+-	writeb(data, &CSR_GENERAL_CONTROL2_FIELD(adapter));
+-}
+-
+-//----------------------------------------------------------------------------------------
+-// Procedure:   e100_eeprom_size
+-//
+-// Description: This routine determines the size of the EEPROM.  This value should be
+-//              checked for validity - ie. is it too big or too small.  The size returned
+-//              is then passed to the read/write functions.
+-//
+-// Returns:
+-//      Size of the eeprom, or zero if an error occurred
+-//----------------------------------------------------------------------------------------
+-u16
+-e100_eeprom_size(struct e100_private *adapter)
+-{
+-	u16 x, size = 1;	// must be one to accumulate a product
+-
+-	// if we've already stored this data, read from memory
+-	if (adapter->eeprom_size) {
+-		return adapter->eeprom_size;
+-	}
+-	// otherwise, read from the eeprom
+-	// Set EEPROM semaphore.
+-	if (adapter->rev_id >= D102_REV_ID) {
+-		if (!eeprom_set_semaphore(adapter))
+-			return 0;
+-	}
+-	// enable the eeprom by setting EECS.
+-	x = readw(&CSR_EEPROM_CONTROL_FIELD(adapter));
+-	x &= ~(EEDI | EEDO | EESK);
+-	x |= EECS;
+-	writew(x, &CSR_EEPROM_CONTROL_FIELD(adapter));
+-
+-	// write the read opcode
+-	shift_out_bits(adapter, EEPROM_READ_OPCODE, 3);
+-
+-	// experiment to discover the size of the eeprom.  request register zero
+-	// and wait for the eeprom to tell us it has accepted the entire address.
+-	x = readw(&CSR_EEPROM_CONTROL_FIELD(adapter));
+-	do {
+-		size *= 2;	// each bit of address doubles eeprom size
+-		x |= EEDO;	// set bit to detect "dummy zero"
+-		x &= ~EEDI;	// address consists of all zeros
+-
+-		writew(x, &CSR_EEPROM_CONTROL_FIELD(adapter));
+-		readw(&(adapter->scb->scb_status));
+-		udelay(EEPROM_STALL_TIME);
+-		raise_clock(adapter, &x);
+-		lower_clock(adapter, &x);
+-
+-		// check for "dummy zero"
+-		x = readw(&CSR_EEPROM_CONTROL_FIELD(adapter));
+-		if (size > EEPROM_MAX_WORD_SIZE) {
+-			size = 0;
+-			break;
+-		}
+-	} while (x & EEDO);
+-
+-	// read in the value requested
+-	(void) shift_in_bits(adapter);
+-	e100_eeprom_cleanup(adapter);
+-
+-	// Clear EEPROM Semaphore.
+-	if (adapter->rev_id >= D102_REV_ID) {
+-		eeprom_reset_semaphore(adapter);
+-	}
+-
+-	return size;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-// Procedure:   eeprom_address_size
+-//
+-// Description: determines the number of bits in an address for the eeprom acceptable
+-//              values are 64, 128, and 256
+-// Arguments: size of the eeprom
+-// Returns: bits in an address for that size eeprom
+-//----------------------------------------------------------------------------------------
+-
+-static inline int
+-eeprom_address_size(u16 size)
+-{
+-	int isize = size;
+-	
+-	return (ffs(isize) - 1);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-// Procedure:   e100_eeprom_read
+-//
+-// Description: This routine serially reads one word out of the EEPROM.
+-//
+-// Arguments:
+-//      adapter - our adapter context
+-//      reg - EEPROM word to read.
+-//
+-// Returns:
+-//      Contents of EEPROM word (reg).
+-//----------------------------------------------------------------------------------------
+-
+-u16
+-e100_eeprom_read(struct e100_private *adapter, u16 reg)
+-{
+-	u16 x, data, bits;
+-
+-	// Set EEPROM semaphore.
+-	if (adapter->rev_id >= D102_REV_ID) {
+-		if (!eeprom_set_semaphore(adapter))
+-			return 0;
+-	}
+-	// eeprom size is initialized to zero
+-	if (!adapter->eeprom_size)
+-		adapter->eeprom_size = e100_eeprom_size(adapter);
+-
+-	bits = eeprom_address_size(adapter->eeprom_size);
+-
+-	// select EEPROM, reset bits, set EECS
+-	x = readw(&CSR_EEPROM_CONTROL_FIELD(adapter));
+-
+-	x &= ~(EEDI | EEDO | EESK);
+-	x |= EECS;
+-	writew(x, &CSR_EEPROM_CONTROL_FIELD(adapter));
+-
+-	// write the read opcode and register number in that order
+-	// The opcode is 3bits in length, reg is 'bits' bits long
+-	shift_out_bits(adapter, EEPROM_READ_OPCODE, 3);
+-	shift_out_bits(adapter, reg, bits);
+-
+-	// Now read the data (16 bits) in from the selected EEPROM word
+-	data = shift_in_bits(adapter);
+-
+-	e100_eeprom_cleanup(adapter);
+-
+-	// Clear EEPROM Semaphore.
+-	if (adapter->rev_id >= D102_REV_ID) {
+-		eeprom_reset_semaphore(adapter);
+-	}
+-
+-	return data;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-// Procedure:   shift_out_bits
+-//
+-// Description: This routine shifts data bits out to the EEPROM.
+-//
+-// Arguments:
+-//      data - data to send to the EEPROM.
+-//      count - number of data bits to shift out.
+-//
+-// Returns: (none)
+-//----------------------------------------------------------------------------------------
+-
+-static void
+-shift_out_bits(struct e100_private *adapter, u16 data, u16 count)
+-{
+-	u16 x, mask;
+-
+-	mask = 1 << (count - 1);
+-	x = readw(&CSR_EEPROM_CONTROL_FIELD(adapter));
+-	x &= ~(EEDO | EEDI);
+-
+-	do {
+-		x &= ~EEDI;
+-		if (data & mask)
+-			x |= EEDI;
+-
+-		writew(x, &CSR_EEPROM_CONTROL_FIELD(adapter));
+-		readw(&(adapter->scb->scb_status)); /* flush command to card */
+-		udelay(EEPROM_STALL_TIME);
+-		raise_clock(adapter, &x);
+-		lower_clock(adapter, &x);
+-		mask = mask >> 1;
+-	} while (mask);
+-
+-	x &= ~EEDI;
+-	writew(x, &CSR_EEPROM_CONTROL_FIELD(adapter));
+-}
+-
+-//----------------------------------------------------------------------------------------
+-// Procedure:   raise_clock
+-//
+-// Description: This routine raises the EEPROM's clock input (EESK)
+-//
+-// Arguments:
+-//      x - Ptr to the EEPROM control register's current value
+-//
+-// Returns: (none)
+-//----------------------------------------------------------------------------------------
+-
+-void
+-raise_clock(struct e100_private *adapter, u16 *x)
+-{
+-	*x = *x | EESK;
+-	writew(*x, &CSR_EEPROM_CONTROL_FIELD(adapter));
+-	readw(&(adapter->scb->scb_status)); /* flush command to card */
+-	udelay(EEPROM_STALL_TIME);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-// Procedure:   lower_clock
+-//
+-// Description: This routine lower's the EEPROM's clock input (EESK)
+-//
+-// Arguments:
+-//      x - Ptr to the EEPROM control register's current value
+-//
+-// Returns: (none)
+-//----------------------------------------------------------------------------------------
+-
+-void
+-lower_clock(struct e100_private *adapter, u16 *x)
+-{
+-	*x = *x & ~EESK;
+-	writew(*x, &CSR_EEPROM_CONTROL_FIELD(adapter));
+-	readw(&(adapter->scb->scb_status)); /* flush command to card */
+-	udelay(EEPROM_STALL_TIME);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-// Procedure:   shift_in_bits
+-//
+-// Description: This routine shifts data bits in from the EEPROM.
+-//
+-// Arguments:
+-//
+-// Returns:
+-//      The contents of that particular EEPROM word
+-//----------------------------------------------------------------------------------------
+-
+-static u16
+-shift_in_bits(struct e100_private *adapter)
+-{
+-	u16 x, d, i;
+-
+-	x = readw(&CSR_EEPROM_CONTROL_FIELD(adapter));
+-	x &= ~(EEDO | EEDI);
+-	d = 0;
+-
+-	for (i = 0; i < 16; i++) {
+-		d <<= 1;
+-		raise_clock(adapter, &x);
+-
+-		x = readw(&CSR_EEPROM_CONTROL_FIELD(adapter));
+-
+-		x &= ~EEDI;
+-		if (x & EEDO)
+-			d |= 1;
+-
+-		lower_clock(adapter, &x);
+-	}
+-
+-	return d;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-// Procedure:   e100_eeprom_cleanup
+-//
+-// Description: This routine returns the EEPROM to an idle state
+-//----------------------------------------------------------------------------------------
+-
+-void
+-e100_eeprom_cleanup(struct e100_private *adapter)
+-{
+-	u16 x;
+-
+-	x = readw(&CSR_EEPROM_CONTROL_FIELD(adapter));
+-
+-	x &= ~(EECS | EEDI);
+-	writew(x, &CSR_EEPROM_CONTROL_FIELD(adapter));
+-
+-	raise_clock(adapter, &x);
+-	lower_clock(adapter, &x);
+-}
+-
+-//**********************************************************************************
+-// Procedure:   e100_eeprom_update_chksum
+-//
+-// Description: Calculates the checksum and writes it to the EEProm. 
+-//              It calculates the checksum accroding to the formula: 
+-//                              Checksum = 0xBABA - (sum of first 63 words).
+-//
+-//-----------------------------------------------------------------------------------
+-u16
+-e100_eeprom_calculate_chksum(struct e100_private *adapter)
+-{
+-	u16 idx, xsum_index, checksum = 0;
+-
+-	// eeprom size is initialized to zero
+-	if (!adapter->eeprom_size)
+-		adapter->eeprom_size = e100_eeprom_size(adapter);
+-
+-	xsum_index = adapter->eeprom_size - 1;
+-	for (idx = 0; idx < xsum_index; idx++)
+-		checksum += e100_eeprom_read(adapter, idx);
+-
+-	checksum = EEPROM_CHECKSUM - checksum;
+-	return checksum;
+-}
+-
+-//----------------------------------------------------------------------------------------
+-// Procedure:   e100_eeprom_write_word
+-//
+-// Description: This routine writes a word to a specific EEPROM location without.
+-//              taking EEPROM semaphore and updating checksum. 
+-//              Use e100_eeprom_write_block for the EEPROM update
+-// Arguments: reg - The EEPROM word that we are going to write to.
+-//            data - The data (word) that we are going to write to the EEPROM.
+-//----------------------------------------------------------------------------------------
+-static void
+-e100_eeprom_write_word(struct e100_private *adapter, u16 reg, u16 data)
+-{
+-	u16 x;
+-	u16 bits;
+-
+-	bits = eeprom_address_size(adapter->eeprom_size);
+-
+-	/* select EEPROM, mask off ASIC and reset bits, set EECS */
+-	x = readw(&CSR_EEPROM_CONTROL_FIELD(adapter));
+-	x &= ~(EEDI | EEDO | EESK);
+-	writew(x, &CSR_EEPROM_CONTROL_FIELD(adapter));
+-	readw(&(adapter->scb->scb_status)); /* flush command to card */
+-	udelay(EEPROM_STALL_TIME);
+-	x |= EECS;
+-	writew(x, &CSR_EEPROM_CONTROL_FIELD(adapter));
+-
+-	shift_out_bits(adapter, EEPROM_EWEN_OPCODE, 5);
+-	shift_out_bits(adapter, reg, (u16) (bits - 2));
+-	if (!eeprom_wait_cmd_done(adapter))
+-		return;
+-
+-	/* write the new word to the EEPROM & send the write opcode the EEPORM */
+-	shift_out_bits(adapter, EEPROM_WRITE_OPCODE, 3);
+-
+-	/* select which word in the EEPROM that we are writing to */
+-	shift_out_bits(adapter, reg, bits);
+-
+-	/* write the data to the selected EEPROM word */
+-	shift_out_bits(adapter, data, 16);
+-	if (!eeprom_wait_cmd_done(adapter))
+-		return;
+-
+-	shift_out_bits(adapter, EEPROM_EWDS_OPCODE, 5);
+-	shift_out_bits(adapter, reg, (u16) (bits - 2));
+-	if (!eeprom_wait_cmd_done(adapter))
+-		return;
+-
+-	e100_eeprom_cleanup(adapter);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-// Procedure:   e100_eeprom_write_block
+-//
+-// Description: This routine writes a block of words starting from specified EEPROM 
+-//              location and updates checksum
+-// Arguments: reg - The EEPROM word that we are going to write to.
+-//            data - The data (word) that we are going to write to the EEPROM.
+-//----------------------------------------------------------------------------------------
+-void
+-e100_eeprom_write_block(struct e100_private *adapter, u16 start, u16 *data,
+-			u16 size)
+-{
+-	u16 checksum;
+-	u16 i;
+-
+-	if (!adapter->eeprom_size)
+-		adapter->eeprom_size = e100_eeprom_size(adapter);
+-
+-	// Set EEPROM semaphore.
+-	if (adapter->rev_id >= D102_REV_ID) {
+-		if (!eeprom_set_semaphore(adapter))
+-			return;
+-	}
+-
+-	for (i = 0; i < size; i++) {
+-		e100_eeprom_write_word(adapter, start + i, data[i]);
+-	}
+-	//Update checksum
+-	checksum = e100_eeprom_calculate_chksum(adapter);
+-	e100_eeprom_write_word(adapter, (adapter->eeprom_size - 1), checksum);
+-
+-	// Clear EEPROM Semaphore.
+-	if (adapter->rev_id >= D102_REV_ID) {
+-		eeprom_reset_semaphore(adapter);
+-	}
+-}
+-
+-//----------------------------------------------------------------------------------------
+-// Procedure:   eeprom_wait_cmd_done
+-//
+-// Description: This routine waits for the the EEPROM to finish its command.  
+-//                              Specifically, it waits for EEDO (data out) to go high.
+-// Returns:     true - If the command finished
+-//              false - If the command never finished (EEDO stayed low)
+-//----------------------------------------------------------------------------------------
+-static u16
+-eeprom_wait_cmd_done(struct e100_private *adapter)
+-{
+-	u16 x;
+-	unsigned long expiration_time = jiffies + HZ / 100 + 1;
+-
+-	eeprom_stand_by(adapter);
+-
+-	do {
+-		rmb();
+-		x = readw(&CSR_EEPROM_CONTROL_FIELD(adapter));
+-		if (x & EEDO)
+-			return true;
+-		if (time_before(jiffies, expiration_time))
+-			yield();
+-		else
+-			return false;
+-	} while (true);
+-}
+-
+-//----------------------------------------------------------------------------------------
+-// Procedure:   eeprom_stand_by
+-//
+-// Description: This routine lowers the EEPROM chip select (EECS) for a few microseconds.
+-//----------------------------------------------------------------------------------------
+-static void
+-eeprom_stand_by(struct e100_private *adapter)
+-{
+-	u16 x;
+-
+-	x = readw(&CSR_EEPROM_CONTROL_FIELD(adapter));
+-	x &= ~(EECS | EESK);
+-	writew(x, &CSR_EEPROM_CONTROL_FIELD(adapter));
+-	readw(&(adapter->scb->scb_status)); /* flush command to card */
+-	udelay(EEPROM_STALL_TIME);
+-	x |= EECS;
+-	writew(x, &CSR_EEPROM_CONTROL_FIELD(adapter));
+-	readw(&(adapter->scb->scb_status)); /* flush command to card */
+-	udelay(EEPROM_STALL_TIME);
+-}
+--- linux-2.6.0/drivers/net/e100/e100.h	2003-09-27 18:57:45.000000000 -0700
++++ /dev/null	2002-08-30 16:31:37.000000000 -0700
+@@ -1,999 +0,0 @@
+-/*******************************************************************************
+-
+-  
+-  Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved.
+-  
+-  This program is free software; you can redistribute it and/or modify it 
+-  under the terms of the GNU General Public License as published by the Free 
+-  Software Foundation; either version 2 of the License, or (at your option) 
+-  any later version.
+-  
+-  This program is distributed in the hope that it will be useful, but WITHOUT 
+-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
+-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
+-  more details.
+-  
+-  You should have received a copy of the GNU General Public License along with
+-  this program; if not, write to the Free Software Foundation, Inc., 59 
+-  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+-  
+-  The full GNU General Public License is included in this distribution in the
+-  file called LICENSE.
+-  
+-  Contact Information:
+-  Linux NICS <linux.nics@intel.com>
+-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+-*******************************************************************************/
+-
+-#ifndef _E100_INC_
+-#define _E100_INC_
+-
+-#include <linux/module.h>
+-#include <linux/types.h>
+-#include <linux/init.h>
+-#include <linux/mm.h>
+-#include <linux/errno.h>
+-#include <linux/ioport.h>
+-#include <linux/pci.h>
+-#include <linux/kernel.h>
+-#include <linux/netdevice.h>
+-#include <linux/etherdevice.h>
+-#include <linux/skbuff.h>
+-#include <linux/delay.h>
+-#include <linux/timer.h>
+-#include <linux/slab.h>
+-#include <linux/interrupt.h>
+-#include <linux/string.h>
+-#include <linux/wait.h>
+-#include <linux/reboot.h>
+-#include <asm/io.h>
+-#include <asm/unaligned.h>
+-#include <asm/processor.h>
+-#include <linux/ethtool.h>
+-#include <linux/inetdevice.h>
+-#include <linux/bitops.h>
+-
+-#include <linux/if.h>
+-#include <asm/uaccess.h>
+-#include <linux/ip.h>
+-#include <linux/if_vlan.h>
+-#include <linux/mii.h>
+-
+-#define E100_CABLE_UNKNOWN	0
+-#define E100_CABLE_OK		1		
+-#define E100_CABLE_OPEN_NEAR	2	/* Open Circuit Near End  */
+-#define E100_CABLE_OPEN_FAR	3	/* Open Circuit Far End   */
+-#define E100_CABLE_SHORT_NEAR	4	/* Short Circuit Near End */
+-#define E100_CABLE_SHORT_FAR	5	/* Short Circuit Far End  */
+-
+-#define E100_REGS_LEN 2
+-/*
+- *  Configure parameters for buffers per controller.
+- *  If the machine this is being used on is a faster machine (i.e. > 150MHz)
+- *  and running on a 10MBS network then more queueing of data occurs. This
+- *  may indicate the some of the numbers below should be adjusted.  Here are
+- *  some typical numbers:
+- *                             MAX_TCB 64
+- *                             MAX_RFD 64
+- *  The default numbers give work well on most systems tests so no real
+- *  adjustments really need to take place.  Also, if the machine is connected
+- *  to a 100MBS network the numbers described above can be lowered from the
+- *  defaults as considerably less data will be queued.
+- */
+-
+-#define TX_FRAME_CNT   8	/* consecutive transmit frames per interrupt */
+-/* TX_FRAME_CNT must be less than MAX_TCB    */
+-
+-#define E100_DEFAULT_TCB   64
+-#define E100_MIN_TCB       2*TX_FRAME_CNT + 3	/* make room for at least 2 interrupts */
+-#define E100_MAX_TCB       1024
+-
+-#define E100_DEFAULT_RFD   64
+-#define E100_MIN_RFD       8
+-#define E100_MAX_RFD       1024
+-
+-#define E100_DEFAULT_XSUM         true
+-#define E100_DEFAULT_BER          ZLOCK_MAX_ERRORS
+-#define E100_DEFAULT_SPEED_DUPLEX 0
+-#define E100_DEFAULT_FC           0
+-#define E100_DEFAULT_IFS          true
+-#define E100_DEFAULT_UCODE        true
+-
+-#define TX_THRSHLD     8
+-
+-/* IFS parameters */
+-#define MIN_NUMBER_OF_TRANSMITS_100 1000
+-#define MIN_NUMBER_OF_TRANSMITS_10  100
+-
+-#define E100_MAX_NIC 16
+-
+-#define E100_MAX_SCB_WAIT	100	/* Max udelays in wait_scb */
+-#define E100_MAX_CU_IDLE_WAIT	50	/* Max udelays in wait_cus_idle */
+-
+-/* HWI feature related constant */
+-#define HWI_REGISTER_GRANULARITY        80	/* register granularity = 80 Cm */
+-#define HWI_NEAR_END_BOUNDARY           1000	/* Near end is defined as < 10 meters */
+-
+-/* CPUSAVER_BUNDLE_MAX: Sets the maximum number of frames that will be bundled.
+- * In some situations, such as the TCP windowing algorithm, it may be
+- * better to limit the growth of the bundle size than let it go as
+- * high as it can, because that could cause too much added latency.
+- * The default is six, because this is the number of packets in the
+- * default TCP window size.  A value of 1 would make CPUSaver indicate
+- * an interrupt for every frame received.  If you do not want to put
+- * a limit on the bundle size, set this value to xFFFF.
+- */
+-#define E100_DEFAULT_CPUSAVER_BUNDLE_MAX	6
+-#define E100_DEFAULT_CPUSAVER_INTERRUPT_DELAY	0x600
+-#define E100_DEFAULT_BUNDLE_SMALL_FR		false
+-
+-/* end of configurables */
+-
+-/* ====================================================================== */
+-/*                                hw                                      */
+-/* ====================================================================== */
+-
+-/* timeout for command completion */
+-#define E100_CMD_WAIT   100	/* iterations */
+-
+-struct driver_stats {
+-	struct net_device_stats net_stats;
+-
+-	unsigned long tx_late_col;
+-	unsigned long tx_ok_defrd;
+-	unsigned long tx_one_retry;
+-	unsigned long tx_mt_one_retry;
+-	unsigned long rcv_cdt_frames;
+-	unsigned long xmt_fc_pkts;
+-	unsigned long rcv_fc_pkts;
+-	unsigned long rcv_fc_unsupported;
+-	unsigned long xmt_tco_pkts;
+-	unsigned long rcv_tco_pkts;
+-	unsigned long rx_intr_pkts;
+-};
+-
+-/* TODO: kill me when we can do C99 */
+-#define false		(0)
+-#define true		(1)
+-
+-/* Changed for 82558 and 82559 enhancements */
+-/* defines for 82558/9 flow control CSR values */
+-#define DFLT_FC_THLD       0x00	/* Rx FIFO threshold of 0.5KB free  */
+-#define DFLT_FC_CMD        0x00	/* FC Command in CSR */
+-
+-/* ====================================================================== */
+-/*                              equates                                   */
+-/* ====================================================================== */
+-
+-/*
+- * These are general purpose defines 
+- */
+-
+-/* Bit Mask definitions */
+-#define BIT_0       0x0001
+-#define BIT_1       0x0002
+-#define BIT_2       0x0004
+-#define BIT_3       0x0008
+-#define BIT_4       0x0010
+-#define BIT_5       0x0020
+-#define BIT_6       0x0040
+-#define BIT_7       0x0080
+-#define BIT_8       0x0100
+-#define BIT_9       0x0200
+-#define BIT_10      0x0400
+-#define BIT_11      0x0800
+-#define BIT_12      0x1000
+-#define BIT_13      0x2000
+-#define BIT_14      0x4000
+-#define BIT_15      0x8000
+-#define BIT_28      0x10000000
+-
+-#define BIT_0_2     0x0007
+-#define BIT_0_3     0x000F
+-#define BIT_0_4     0x001F
+-#define BIT_0_5     0x003F
+-#define BIT_0_6     0x007F
+-#define BIT_0_7     0x00FF
+-#define BIT_0_8     0x01FF
+-#define BIT_0_13    0x3FFF
+-#define BIT_0_15    0xFFFF
+-#define BIT_1_2     0x0006
+-#define BIT_1_3     0x000E
+-#define BIT_2_5     0x003C
+-#define BIT_3_4     0x0018
+-#define BIT_4_5     0x0030
+-#define BIT_4_6     0x0070
+-#define BIT_4_7     0x00F0
+-#define BIT_5_7     0x00E0
+-#define BIT_5_12    0x1FE0
+-#define BIT_5_15    0xFFE0
+-#define BIT_6_7     0x00c0
+-#define BIT_7_11    0x0F80
+-#define BIT_8_10    0x0700
+-#define BIT_9_13    0x3E00
+-#define BIT_12_15   0xF000
+-#define BIT_8_15    0xFF00
+-
+-#define BIT_16_20   0x001F0000
+-#define BIT_21_25   0x03E00000
+-#define BIT_26_27   0x0C000000
+-
+-/* Transmit Threshold related constants */
+-#define DEFAULT_TX_PER_UNDERRUN         20000
+-
+-#define MAX_MULTICAST_ADDRS             64
+-#define MAX_FILTER                      16
+-
+-#define FULL_DUPLEX      2
+-#define HALF_DUPLEX      1
+-
+-/*
+- * These defines are specific to the 82557 
+- */
+-
+-/* E100 PORT functions -- lower 4 bits */
+-#define PORT_SOFTWARE_RESET         0
+-#define PORT_SELFTEST               1
+-#define PORT_SELECTIVE_RESET        2
+-#define PORT_DUMP                   3
+-
+-/* SCB Status Word bit definitions */
+-/* Interrupt status/ack fields */
+-/* ER and FCP interrupts for 82558 masks  */
+-#define SCB_STATUS_ACK_MASK        BIT_8_15	/* Status Mask */
+-#define SCB_STATUS_ACK_CX          BIT_15	/* CU Completed Action Cmd */
+-#define SCB_STATUS_ACK_FR          BIT_14	/* RU Received A Frame */
+-#define SCB_STATUS_ACK_CNA         BIT_13	/* CU Became Inactive (IDLE) */
+-#define SCB_STATUS_ACK_RNR         BIT_12	/* RU Became Not Ready */
+-#define SCB_STATUS_ACK_MDI         BIT_11	/* MDI read or write done */
+-#define SCB_STATUS_ACK_SWI         BIT_10	/* S/W generated interrupt */
+-#define SCB_STATUS_ACK_ER          BIT_9	/* Early Receive */
+-#define SCB_STATUS_ACK_FCP         BIT_8	/* Flow Control Pause */
+-
+-/*- CUS Fields */
+-#define SCB_CUS_MASK            (BIT_6 | BIT_7)	/* CUS 2-bit Mask */
+-#define SCB_CUS_IDLE            0	/* CU Idle */
+-#define SCB_CUS_SUSPEND         BIT_6	/* CU Suspended */
+-#define SCB_CUS_ACTIVE          BIT_7	/* CU Active */
+-
+-/*- RUS Fields */
+-#define SCB_RUS_IDLE            0	/* RU Idle */
+-#define SCB_RUS_MASK            BIT_2_5	/* RUS 3-bit Mask */
+-#define SCB_RUS_SUSPEND         BIT_2	/* RU Suspended */
+-#define SCB_RUS_NO_RESOURCES    BIT_3	/* RU Out Of Resources */
+-#define SCB_RUS_READY           BIT_4	/* RU Ready */
+-#define SCB_RUS_SUSP_NO_RBDS    (BIT_2 | BIT_5)	/* RU No More RBDs */
+-#define SCB_RUS_NO_RBDS         (BIT_3 | BIT_5)	/* RU No More RBDs */
+-#define SCB_RUS_READY_NO_RBDS   (BIT_4 | BIT_5)	/* RU Ready, No RBDs */
+-
+-/* SCB Command Word bit definitions */
+-/*- CUC fields */
+-/* Changing mask to 4 bits */
+-#define SCB_CUC_MASK            BIT_4_7	/* CUC 4-bit Mask */
+-#define SCB_CUC_NOOP            0
+-#define SCB_CUC_START           BIT_4	/* CU Start */
+-#define SCB_CUC_RESUME          BIT_5	/* CU Resume */
+-#define SCB_CUC_UNKNOWN         BIT_7	/* CU unknown command */
+-/* Changed for 82558 enhancements */
+-#define SCB_CUC_STATIC_RESUME   (BIT_5 | BIT_7)	/* 82558/9 Static Resume */
+-#define SCB_CUC_DUMP_ADDR       BIT_6	/* CU Dump Counters Address */
+-#define SCB_CUC_DUMP_STAT       (BIT_4 | BIT_6)	/* CU Dump stat. counters */
+-#define SCB_CUC_LOAD_BASE       (BIT_5 | BIT_6)	/* Load the CU base */
+-/* Below was defined as BIT_4_7 */
+-#define SCB_CUC_DUMP_RST_STAT   BIT_4_6	/* CU Dump & reset statistics cntrs */
+-
+-/*- RUC fields */
+-#define SCB_RUC_MASK            BIT_0_2	/* RUC 3-bit Mask */
+-#define SCB_RUC_START           BIT_0	/* RU Start */
+-#define SCB_RUC_RESUME          BIT_1	/* RU Resume */
+-#define SCB_RUC_ABORT           BIT_2	/* RU Abort */
+-#define SCB_RUC_LOAD_HDS        (BIT_0 | BIT_2)	/* Load RFD Header Data Size */
+-#define SCB_RUC_LOAD_BASE       (BIT_1 | BIT_2)	/* Load the RU base */
+-#define SCB_RUC_RBD_RESUME      BIT_0_2	/* RBD resume */
+-
+-/* Interrupt fields (assuming byte addressing) */
+-#define SCB_INT_MASK            BIT_0	/* Mask interrupts */
+-#define SCB_SOFT_INT            BIT_1	/* Generate a S/W interrupt */
+-/*  Specific Interrupt Mask Bits (upper byte of SCB Command word) */
+-#define SCB_FCP_INT_MASK        BIT_2	/* Flow Control Pause */
+-#define SCB_ER_INT_MASK         BIT_3	/* Early Receive */
+-#define SCB_RNR_INT_MASK        BIT_4	/* RU Not Ready */
+-#define SCB_CNA_INT_MASK        BIT_5	/* CU Not Active */
+-#define SCB_FR_INT_MASK         BIT_6	/* Frame Received */
+-#define SCB_CX_INT_MASK         BIT_7	/* CU eXecution w/ I-bit done */
+-#define SCB_BACHELOR_INT_MASK   BIT_2_7	/* 82558 interrupt mask bits */
+-
+-#define SCB_GCR2_EEPROM_ACCESS_SEMAPHORE BIT_7
+-
+-/* EEPROM bit definitions */
+-/*- EEPROM control register bits */
+-#define EEPROM_FLAG_ASF  0x8000
+-#define EEPROM_FLAG_GCL  0x4000
+-
+-#define EN_TRNF          0x10	/* Enable turnoff */
+-#define EEDO             0x08	/* EEPROM data out */
+-#define EEDI             0x04	/* EEPROM data in (set for writing data) */
+-#define EECS             0x02	/* EEPROM chip select (1=hi, 0=lo) */
+-#define EESK             0x01	/* EEPROM shift clock (1=hi, 0=lo) */
+-
+-/*- EEPROM opcodes */
+-#define EEPROM_READ_OPCODE          06
+-#define EEPROM_WRITE_OPCODE         05
+-#define EEPROM_ERASE_OPCODE         07
+-#define EEPROM_EWEN_OPCODE          19	/* Erase/write enable */
+-#define EEPROM_EWDS_OPCODE          16	/* Erase/write disable */
+-
+-/*- EEPROM data locations */
+-#define EEPROM_NODE_ADDRESS_BYTE_0      0
+-#define EEPROM_COMPATIBILITY_WORD       3
+-#define EEPROM_PWA_NO                   8
+-#define EEPROM_ID_WORD			0x0A
+-#define EEPROM_CONFIG_ASF		0x0D
+-#define EEPROM_SMBUS_ADDR		0x90
+-
+-#define EEPROM_SUM                      0xbaba
+-
+-// Zero Locking Algorithm definitions:
+-#define ZLOCK_ZERO_MASK		0x00F0
+-#define ZLOCK_MAX_READS		50	
+-#define ZLOCK_SET_ZERO		0x2010
+-#define ZLOCK_MAX_SLEEP		300 * HZ	
+-#define ZLOCK_MAX_ERRORS	300
+-
+-/* E100 Action Commands */
+-#define CB_IA_ADDRESS           1
+-#define CB_CONFIGURE            2
+-#define CB_MULTICAST            3
+-#define CB_TRANSMIT             4
+-#define CB_LOAD_MICROCODE       5
+-#define CB_LOAD_FILTER		8
+-#define CB_MAX_NONTX_CMD        9
+-#define CB_IPCB_TRANSMIT        9
+-
+-/* Pre-defined Filter Bits */
+-#define CB_FILTER_EL            0x80000000
+-#define CB_FILTER_FIX           0x40000000
+-#define CB_FILTER_ARP           0x08000000
+-#define CB_FILTER_IA_MATCH      0x02000000
+-
+-/* Command Block (CB) Field Definitions */
+-/*- CB Command Word */
+-#define CB_EL_BIT           BIT_15	/* CB EL Bit */
+-#define CB_S_BIT            BIT_14	/* CB Suspend Bit */
+-#define CB_I_BIT            BIT_13	/* CB Interrupt Bit */
+-#define CB_TX_SF_BIT        BIT_3	/* TX CB Flexible Mode */
+-#define CB_CMD_MASK         BIT_0_3	/* CB 4-bit CMD Mask */
+-#define CB_CID_DEFAULT      (0x1f << 8)	/* CB 5-bit CID (max value) */
+-
+-/*- CB Status Word */
+-#define CB_STATUS_MASK          BIT_12_15	/* CB Status Mask (4-bits) */
+-#define CB_STATUS_COMPLETE      BIT_15	/* CB Complete Bit */
+-#define CB_STATUS_OK            BIT_13	/* CB OK Bit */
+-#define CB_STATUS_VLAN          BIT_12 /* CB Valn detected Bit */
+-#define CB_STATUS_FAIL          BIT_11	/* CB Fail (F) Bit */
+-
+-/*misc command bits */
+-#define CB_TX_EOF_BIT           BIT_15	/* TX CB/TBD EOF Bit */
+-
+-/* Config params */
+-#define CB_CFIG_BYTE_COUNT          22	/* 22 config bytes */
+-#define CB_CFIG_D102_BYTE_COUNT    10
+-
+-/* Receive Frame Descriptor Fields */
+-
+-/*- RFD Status Bits */
+-#define RFD_RECEIVE_COLLISION   BIT_0	/* Collision detected on Receive */
+-#define RFD_IA_MATCH            BIT_1	/* Indv Address Match Bit */
+-#define RFD_RX_ERR              BIT_4	/* RX_ERR pin on Phy was set */
+-#define RFD_FRAME_TOO_SHORT     BIT_7	/* Receive Frame Short */
+-#define RFD_DMA_OVERRUN         BIT_8	/* Receive DMA Overrun */
+-#define RFD_NO_RESOURCES        BIT_9	/* No Buffer Space */
+-#define RFD_ALIGNMENT_ERROR     BIT_10	/* Alignment Error */
+-#define RFD_CRC_ERROR           BIT_11	/* CRC Error */
+-#define RFD_STATUS_OK           BIT_13	/* RFD OK Bit */
+-#define RFD_STATUS_COMPLETE     BIT_15	/* RFD Complete Bit */
+-
+-/*- RFD Command Bits*/
+-#define RFD_EL_BIT      BIT_15	/* RFD EL Bit */
+-#define RFD_S_BIT       BIT_14	/* RFD Suspend Bit */
+-#define RFD_H_BIT       BIT_4	/* Header RFD Bit */
+-#define RFD_SF_BIT      BIT_3	/* RFD Flexible Mode */
+-
+-/*- RFD misc bits*/
+-#define RFD_EOF_BIT         BIT_15	/* RFD End-Of-Frame Bit */
+-#define RFD_F_BIT           BIT_14	/* RFD Buffer Fetch Bit */
+-#define RFD_ACT_COUNT_MASK  BIT_0_13	/* RFD Actual Count Mask */
+-
+-/* Receive Buffer Descriptor Fields*/
+-#define RBD_EOF_BIT             BIT_15	/* RBD End-Of-Frame Bit */
+-#define RBD_F_BIT               BIT_14	/* RBD Buffer Fetch Bit */
+-#define RBD_ACT_COUNT_MASK      BIT_0_13	/* RBD Actual Count Mask */
+-
+-#define SIZE_FIELD_MASK     BIT_0_13	/* Size of the associated buffer */
+-#define RBD_EL_BIT          BIT_15	/* RBD EL Bit */
+-
+-/* Self Test Results*/
+-#define CB_SELFTEST_FAIL_BIT        BIT_12
+-#define CB_SELFTEST_DIAG_BIT        BIT_5
+-#define CB_SELFTEST_REGISTER_BIT    BIT_3
+-#define CB_SELFTEST_ROM_BIT         BIT_2
+-
+-#define CB_SELFTEST_ERROR_MASK ( \
+-                CB_SELFTEST_FAIL_BIT | CB_SELFTEST_DIAG_BIT | \
+-                CB_SELFTEST_REGISTER_BIT | CB_SELFTEST_ROM_BIT)
+-
+-/* adapter vendor & device ids */
+-#define PCI_OHIO_BOARD   0x10f0	/* subdevice ID, Ohio dual port nic */
+-
+-/* Values for PCI_REV_ID_REGISTER values */
+-#define D101A4_REV_ID      4	/* 82558 A4 stepping */
+-#define D101B0_REV_ID      5	/* 82558 B0 stepping */
+-#define D101MA_REV_ID      8	/* 82559 A0 stepping */
+-#define D101S_REV_ID      9	/* 82559S A-step */
+-#define D102_REV_ID      12
+-#define D102C_REV_ID     13	/* 82550 step C */
+-#define D102E_REV_ID     15
+-
+-/* ############Start of 82555 specific defines################## */
+-
+-#define PHY_82555_LED_SWITCH_CONTROL    	0x1b	/* 82555 led switch control register */
+-
+-/* 82555 led switch control reg. opcodes */
+-#define PHY_82555_LED_NORMAL_CONTROL    0	// control back to the 8255X
+-#define PHY_82555_LED_DRIVER_CONTROL    BIT_2	// the driver is in control
+-#define PHY_82555_LED_OFF               BIT_2	// activity LED is off
+-#define PHY_82555_LED_ON_559           (BIT_0 | BIT_2)	// activity LED is on for 559 and later
+-#define PHY_82555_LED_ON_PRE_559       (BIT_0 | BIT_1 | BIT_2)	// activity LED is on for 558 and before
+-
+-// Describe the state of the phy led.
+-// needed for the function : 'e100_blink_timer'
+-enum led_state_e {
+-	LED_OFF = 0,
+-	LED_ON,
+-};
+-
+-/* ############End of 82555 specific defines##################### */
+-
+-#define RFD_PARSE_BIT			BIT_3
+-#define RFD_TCP_PACKET			0x00
+-#define RFD_UDP_PACKET			0x01
+-#define TCPUDP_CHECKSUM_BIT_VALID	BIT_4
+-#define TCPUDP_CHECKSUM_VALID		BIT_5
+-#define CHECKSUM_PROTOCOL_MASK		0x03
+-
+-#define VLAN_SIZE   4
+-#define CHKSUM_SIZE 2
+-#define RFD_DATA_SIZE (ETH_FRAME_LEN + CHKSUM_SIZE + VLAN_SIZE)
+-
+-/* Bits for bdp->flags */
+-#define DF_LINK_FC_CAP     0x00000001	/* Link is flow control capable */
+-#define DF_CSUM_OFFLOAD    0x00000002
+-#define DF_UCODE_LOADED    0x00000004
+-#define USE_IPCB           0x00000008	/* set if using ipcb for transmits */
+-#define IS_BACHELOR        0x00000010	/* set if 82558 or newer board */
+-#define IS_ICH             0x00000020
+-#define DF_SPEED_FORCED    0x00000040	/* set if speed is forced */
+-#define LED_IS_ON	   0x00000080	/* LED is turned ON by the driver */
+-#define DF_LINK_FC_TX_ONLY 0x00000100	/* Received PAUSE frames are honored*/
+-
+-typedef struct net_device_stats net_dev_stats_t;
+-
+-/* needed macros */
+-/* These macros use the bdp pointer. If you use them it better be defined */
+-#define PREV_TCB_USED(X)  ((X).tail ? (X).tail - 1 : bdp->params.TxDescriptors - 1)
+-#define NEXT_TCB_TOUSE(X) ((((X) + 1) >= bdp->params.TxDescriptors) ? 0 : (X) + 1)
+-#define TCB_TO_USE(X)     ((X).tail)
+-#define TCBS_AVAIL(X)     (NEXT_TCB_TOUSE( NEXT_TCB_TOUSE((X).tail)) != (X).head)
+-
+-#define RFD_POINTER(skb,bdp)      ((rfd_t *) (((unsigned char *)((skb)->data))-((bdp)->rfd_size)))
+-#define SKB_RFD_STATUS(skb,bdp)   ((RFD_POINTER((skb),(bdp)))->rfd_header.cb_status)
+-
+-/* ====================================================================== */
+-/*                              82557                                     */
+-/* ====================================================================== */
+-
+-/* Changed for 82558 enhancement */
+-typedef struct _d101_scb_ext_t {
+-	u32 scb_rx_dma_cnt;	/* Rx DMA byte count */
+-	u8 scb_early_rx_int;	/* Early Rx DMA byte count */
+-	u8 scb_fc_thld;	/* Flow Control threshold */
+-	u8 scb_fc_xon_xoff;	/* Flow Control XON/XOFF values */
+-	u8 scb_pmdr;	/* Power Mgmt. Driver Reg */
+-} d101_scb_ext __attribute__ ((__packed__));
+-
+-/* Changed for 82559 enhancement */
+-typedef struct _d101m_scb_ext_t {
+-	u32 scb_rx_dma_cnt;	/* Rx DMA byte count */
+-	u8 scb_early_rx_int;	/* Early Rx DMA byte count */
+-	u8 scb_fc_thld;	/* Flow Control threshold */
+-	u8 scb_fc_xon_xoff;	/* Flow Control XON/XOFF values */
+-	u8 scb_pmdr;	/* Power Mgmt. Driver Reg */
+-	u8 scb_gen_ctrl;	/* General Control */
+-	u8 scb_gen_stat;	/* General Status */
+-	u16 scb_reserved;	/* Reserved */
+-	u32 scb_function_event;	/* Cardbus Function Event */
+-	u32 scb_function_event_mask;	/* Cardbus Function Mask */
+-	u32 scb_function_present_state;	/* Cardbus Function state */
+-	u32 scb_force_event;	/* Cardbus Force Event */
+-} d101m_scb_ext __attribute__ ((__packed__));
+-
+-/* Changed for 82550 enhancement */
+-typedef struct _d102_scb_ext_t {
+-	u32 scb_rx_dma_cnt;	/* Rx DMA byte count */
+-	u8 scb_early_rx_int;	/* Early Rx DMA byte count */
+-	u8 scb_fc_thld;	/* Flow Control threshold */
+-	u8 scb_fc_xon_xoff;	/* Flow Control XON/XOFF values */
+-	u8 scb_pmdr;	/* Power Mgmt. Driver Reg */
+-	u8 scb_gen_ctrl;	/* General Control */
+-	u8 scb_gen_stat;	/* General Status */
+-	u8 scb_gen_ctrl2;
+-	u8 scb_reserved;	/* Reserved */
+-	u32 scb_scheduling_reg;
+-	u32 scb_reserved2;
+-	u32 scb_function_event;	/* Cardbus Function Event */
+-	u32 scb_function_event_mask;	/* Cardbus Function Mask */
+-	u32 scb_function_present_state;	/* Cardbus Function state */
+-	u32 scb_force_event;	/* Cardbus Force Event */
+-} d102_scb_ext __attribute__ ((__packed__));
+-
+-/*
+- * 82557 status control block. this will be memory mapped & will hang of the
+- * the bdp, which hangs of the bdp. This is the brain of it.
+- */
+-typedef struct _scb_t {
+-	u16 scb_status;	/* SCB Status register */
+-	u8 scb_cmd_low;	/* SCB Command register (low byte) */
+-	u8 scb_cmd_hi;	/* SCB Command register (high byte) */
+-	u32 scb_gen_ptr;	/* SCB General pointer */
+-	u32 scb_port;	/* PORT register */
+-	u16 scb_flsh_cntrl;	/* Flash Control register */
+-	u16 scb_eprm_cntrl;	/* EEPROM control register */
+-	u32 scb_mdi_cntrl;	/* MDI Control Register */
+-	/* Changed for 82558 enhancement */
+-	union {
+-		u32 scb_rx_dma_cnt;	/* Rx DMA byte count */
+-		d101_scb_ext d101_scb;	/* 82558/9 specific fields */
+-		d101m_scb_ext d101m_scb;	/* 82559 specific fields */
+-		d102_scb_ext d102_scb;
+-	} scb_ext;
+-} scb_t __attribute__ ((__packed__));
+-
+-/* Self test
+- * This is used to dump results of the self test 
+- */
+-typedef struct _self_test_t {
+-	u32 st_sign;	/* Self Test Signature */
+-	u32 st_result;	/* Self Test Results */
+-} self_test_t __attribute__ ((__packed__));
+-
+-/* 
+- *  Statistical Counters 
+- */
+-/* 82557 counters */
+-typedef struct _basic_cntr_t {
+-	u32 xmt_gd_frames;	/* Good frames transmitted */
+-	u32 xmt_max_coll;	/* Fatal frames -- had max collisions */
+-	u32 xmt_late_coll;	/* Fatal frames -- had a late coll. */
+-	u32 xmt_uruns;	/* Xmit underruns (fatal or re-transmit) */
+-	u32 xmt_lost_crs;	/* Frames transmitted without CRS */
+-	u32 xmt_deferred;	/* Deferred transmits */
+-	u32 xmt_sngl_coll;	/* Transmits that had 1 and only 1 coll. */
+-	u32 xmt_mlt_coll;	/* Transmits that had multiple coll. */
+-	u32 xmt_ttl_coll;	/* Transmits that had 1+ collisions. */
+-	u32 rcv_gd_frames;	/* Good frames received */
+-	u32 rcv_crc_errs;	/* Aligned frames that had a CRC error */
+-	u32 rcv_algn_errs;	/* Receives that had alignment errors */
+-	u32 rcv_rsrc_err;	/* Good frame dropped cuz no resources */
+-	u32 rcv_oruns;	/* Overrun errors - bus was busy */
+-	u32 rcv_err_coll;	/* Received frms. that encountered coll. */
+-	u32 rcv_shrt_frames;	/* Received frames that were to short */
+-} basic_cntr_t;
+-
+-/* 82558 extended statistic counters */
+-typedef struct _ext_cntr_t {
+-	u32 xmt_fc_frames;
+-	u32 rcv_fc_frames;
+-	u32 rcv_fc_unsupported;
+-} ext_cntr_t;
+-
+-/* 82559 TCO statistic counters */
+-typedef struct _tco_cntr_t {
+-	u16 xmt_tco_frames;
+-	u16 rcv_tco_frames;
+-} tco_cntr_t;
+-
+-/* Structures to access thet physical dump area */
+-/* Use one of these types, according to the statisitcal counters mode,
+-   to cast the pointer to the physical dump area and access the cmd_complete
+-   DWORD. */
+-
+-/* 557-mode : only basic counters + cmd_complete */
+-typedef struct _err_cntr_557_t {
+-	basic_cntr_t basic_stats;
+-	u32 cmd_complete;
+-} err_cntr_557_t;
+-
+-/* 558-mode : basic + extended counters + cmd_complete */
+-typedef struct _err_cntr_558_t {
+-	basic_cntr_t basic_stats;
+-	ext_cntr_t extended_stats;
+-	u32 cmd_complete;
+-} err_cntr_558_t;
+-
+-/* 559-mode : basic + extended + TCO counters + cmd_complete */
+-typedef struct _err_cntr_559_t {
+-	basic_cntr_t basic_stats;
+-	ext_cntr_t extended_stats;
+-	tco_cntr_t tco_stats;
+-	u32 cmd_complete;
+-} err_cntr_559_t;
+-
+-/* This typedef defines the struct needed to hold the largest number of counters */
+-typedef err_cntr_559_t max_counters_t;
+-
+-/* Different statistical-counters mode the controller may be in */
+-typedef enum _stat_mode_t {
+-	E100_BASIC_STATS = 0,	/* 82557 stats : 16 counters / 16 dw */
+-	E100_EXTENDED_STATS,	/* 82558 stats : 19 counters / 19 dw */
+-	E100_TCO_STATS		/* 82559 stats : 21 counters / 20 dw */
+-} stat_mode_t;
+-
+-/* dump statistical counters complete codes */
+-#define DUMP_STAT_COMPLETED	0xA005
+-#define DUMP_RST_STAT_COMPLETED	0xA007
+-
+-/* Command Block (CB) Generic Header Structure*/
+-typedef struct _cb_header_t {
+-	u16 cb_status;	/* Command Block Status */
+-	u16 cb_cmd;	/* Command Block Command */
+-	u32 cb_lnk_ptr;	/* Link To Next CB */
+-} cb_header_t __attribute__ ((__packed__));
+-
+-//* Individual Address Command Block (IA_CB)*/
+-typedef struct _ia_cb_t {
+-	cb_header_t ia_cb_hdr;
+-	u8 ia_addr[ETH_ALEN];
+-} ia_cb_t __attribute__ ((__packed__));
+-
+-/* Configure Command Block (CONFIG_CB)*/
+-typedef struct _config_cb_t {
+-	cb_header_t cfg_cbhdr;
+-	u8 cfg_byte[CB_CFIG_BYTE_COUNT + CB_CFIG_D102_BYTE_COUNT];
+-} config_cb_t __attribute__ ((__packed__));
+-
+-/* MultiCast Command Block (MULTICAST_CB)*/
+-typedef struct _multicast_cb_t {
+-	cb_header_t mc_cbhdr;
+-	u16 mc_count;	/* Number of multicast addresses */
+-	u8 mc_addr[(ETH_ALEN * MAX_MULTICAST_ADDRS)];
+-} mltcst_cb_t __attribute__ ((__packed__));
+-
+-#define UCODE_MAX_DWORDS	134
+-/* Load Microcode Command Block (LOAD_UCODE_CB)*/
+-typedef struct _load_ucode_cb_t {
+-	cb_header_t load_ucode_cbhdr;
+-	u32 ucode_dword[UCODE_MAX_DWORDS];
+-} load_ucode_cb_t __attribute__ ((__packed__));
+-
+-/* Load Programmable Filter Data*/
+-typedef struct _filter_cb_t {
+-	cb_header_t filter_cb_hdr;
+-	u32 filter_data[MAX_FILTER];
+-} filter_cb_t __attribute__ ((__packed__));
+-
+-/* NON_TRANSMIT_CB -- Generic Non-Transmit Command Block 
+- */
+-typedef struct _nxmit_cb_t {
+-	union {
+-		config_cb_t config;
+-		ia_cb_t setup;
+-		load_ucode_cb_t load_ucode;
+-		mltcst_cb_t multicast;
+-		filter_cb_t filter;
+-	} ntcb;
+-} nxmit_cb_t __attribute__ ((__packed__));
+-
+-/*Block for queuing for postponed execution of the non-transmit commands*/
+-typedef struct _nxmit_cb_entry_t {
+-	struct list_head list_elem;
+-	nxmit_cb_t *non_tx_cmd;
+-	dma_addr_t dma_addr;
+-	unsigned long expiration_time;
+-} nxmit_cb_entry_t;
+-
+-/* States for postponed non tx commands execution */
+-typedef enum _non_tx_cmd_state_t {
+-	E100_NON_TX_IDLE = 0,	/* No queued NON-TX commands */
+-	E100_WAIT_TX_FINISH,	/* Wait for completion of the TX activities */
+-	E100_WAIT_NON_TX_FINISH	/* Wait for completion of the non TX command */
+-} non_tx_cmd_state_t;
+-
+-/* some defines for the ipcb */
+-#define IPCB_IP_CHECKSUM_ENABLE 	BIT_4
+-#define IPCB_TCPUDP_CHECKSUM_ENABLE	BIT_5
+-#define IPCB_TCP_PACKET 		BIT_6
+-#define IPCB_LARGESEND_ENABLE 		BIT_7
+-#define IPCB_HARDWAREPARSING_ENABLE	BIT_0
+-#define IPCB_INSERTVLAN_ENABLE 		BIT_1
+-#define IPCB_IP_ACTIVATION_DEFAULT      IPCB_HARDWAREPARSING_ENABLE
+-
+-/* Transmit Buffer Descriptor (TBD)*/
+-typedef struct _tbd_t {
+-	u32 tbd_buf_addr;	/* Physical Transmit Buffer Address */
+-	u16 tbd_buf_cnt;	/* Actual Count Of Bytes */
+-	u16 padd;
+-} tbd_t __attribute__ ((__packed__));
+-
+-/* d102 specific fields */
+-typedef struct _tcb_ipcb_t {
+-	u16 schedule_low;
+-	u8 ip_schedule;
+-	u8 ip_activation_high;
+-	u16 vlan;
+-	u8 ip_header_offset;
+-	u8 tcp_header_offset;
+-	union {
+-		u32 sec_rec_phys_addr;
+-		u32 tbd_zero_address;
+-	} tbd_sec_addr;
+-	union {
+-		u16 sec_rec_size;
+-		u16 tbd_zero_size;
+-	} tbd_sec_size;
+-	u16 total_tcp_payload;
+-} tcb_ipcb_t __attribute__ ((__packed__));
+-
+-#define E100_TBD_ARRAY_SIZE (2+MAX_SKB_FRAGS)
+-
+-/* Transmit Command Block (TCB)*/
+-struct _tcb_t {
+-	cb_header_t tcb_hdr;
+-	u32 tcb_tbd_ptr;	/* TBD address */
+-	u16 tcb_cnt;	/* Data Bytes In TCB past header */
+-	u8 tcb_thrshld;	/* TX Threshold for FIFO Extender */
+-	u8 tcb_tbd_num;
+-
+-	union {
+-		tcb_ipcb_t ipcb;	/* d102 ipcb fields */
+-		tbd_t tbd_array[E100_TBD_ARRAY_SIZE];
+-	} tcbu;
+-
+-	/* From here onward we can dump anything we want as long as the
+-	 * size of the total structure is a multiple of a paragraph
+-	 * boundary ( i.e. -16 bit aligned ).
+-	 */
+-	tbd_t *tbd_ptr;
+-
+-	u32 tcb_tbd_dflt_ptr;	/* TBD address for non-segmented packet */
+-	u32 tcb_tbd_expand_ptr;	/* TBD address for segmented packet */
+-
+-	struct sk_buff *tcb_skb;	/* the associated socket buffer */
+-	dma_addr_t tcb_phys;	/* phys addr of the TCB */
+-} __attribute__ ((__packed__));
+-
+-#define _TCB_T_
+-typedef struct _tcb_t tcb_t;
+-
+-/* Receive Frame Descriptor (RFD) - will be using the simple model*/
+-struct _rfd_t {
+-	/* 8255x */
+-	cb_header_t rfd_header;
+-	u32 rfd_rbd_ptr;	/* Receive Buffer Descriptor Addr */
+-	u16 rfd_act_cnt;	/* Number Of Bytes Received */
+-	u16 rfd_sz;	/* Number Of Bytes In RFD */
+-	/* D102 aka Gamla */
+-	u16 vlanid;
+-	u8 rcvparserstatus;
+-	u8 reserved;
+-	u16 securitystatus;
+-	u8 checksumstatus;
+-	u8 zerocopystatus;
+-	u8 pad[8];	/* data should be 16 byte aligned */
+-	u8 data[RFD_DATA_SIZE];
+-
+-} __attribute__ ((__packed__));
+-
+-#define _RFD_T_
+-typedef struct _rfd_t rfd_t;
+-
+-/* Receive Buffer Descriptor (RBD)*/
+-typedef struct _rbd_t {
+-	u16 rbd_act_cnt;	/* Number Of Bytes Received */
+-	u16 rbd_filler;
+-	u32 rbd_lnk_addr;	/* Link To Next RBD */
+-	u32 rbd_rcb_addr;	/* Receive Buffer Address */
+-	u16 rbd_sz;	/* Receive Buffer Size */
+-	u16 rbd_filler1;
+-} rbd_t __attribute__ ((__packed__));
+-
+-/*
+- * This structure is used to maintain a FIFO access to a resource that is 
+- * maintained as a circular queue. The resource to be maintained is pointed
+- * to by the "data" field in the structure below. In this driver the TCBs', 
+- * TBDs' & RFDs' are maintained  as a circular queue & are managed thru this
+- * structure.
+- */
+-typedef struct _buf_pool_t {
+-	unsigned int head;	/* index to first used resource */
+-	unsigned int tail;	/* index to last used resource */
+-	void *data;		/* points to resource pool */
+-} buf_pool_t;
+-
+-/*Rx skb holding structure*/
+-struct rx_list_elem {
+-	struct list_head list_elem;
+-	dma_addr_t dma_addr;
+-	struct sk_buff *skb;
+-};
+-
+-enum next_cu_cmd_e { RESUME_NO_WAIT = 0, RESUME_WAIT, START_WAIT };
+-enum zlock_state_e { ZLOCK_INITIAL, ZLOCK_READING, ZLOCK_SLEEPING };
+-enum tx_queue_stop_type { LONG_STOP = 0, SHORT_STOP };
+-
+-/* 64 bit aligned size */
+-#define E100_SIZE_64A(X) ((sizeof(X) + 7) & ~0x7)
+-
+-typedef struct _bd_dma_able_t {
+-	char selftest[E100_SIZE_64A(self_test_t)];
+-	char stats_counters[E100_SIZE_64A(max_counters_t)];
+-} bd_dma_able_t;
+-
+-/* bit masks for bool parameters */
+-#define PRM_XSUMRX       0x00000001
+-#define PRM_UCODE        0x00000002
+-#define PRM_FC           0x00000004
+-#define PRM_IFS          0x00000008
+-#define PRM_BUNDLE_SMALL 0x00000010
+-
+-struct cfg_params {
+-	int e100_speed_duplex;
+-	int RxDescriptors;
+-	int TxDescriptors;
+-	int IntDelay;
+-	int BundleMax;
+-	int ber;
+-	u32 b_params;
+-};
+-struct ethtool_lpbk_data{
+-        dma_addr_t dma_handle;
+-        tcb_t *tcb;
+-        rfd_t *rfd;
+-
+-};
+-
+-struct e100_private {
+-	struct vlan_group *vlgrp;
+-	u32 flags;		/* board management flags */
+-	u32 tx_per_underrun;	/* number of good tx frames per underrun */
+-	unsigned int tx_count;	/* count of tx frames, so we can request an interrupt */
+-	u8 tx_thld;		/* stores transmit threshold */
+-	u16 eeprom_size;
+-	u32 pwa_no;		/* PWA: xxxxxx-0xx */
+-	u8 perm_node_address[ETH_ALEN];
+-	struct list_head active_rx_list;	/* list of rx buffers */
+-	struct list_head rx_struct_pool;	/* pool of rx buffer struct headers */
+-	u16 rfd_size;			/* size of the adapter's RFD struct */
+-	int skb_req;			/* number of skbs neede by the adapter */
+-	u8 intr_mask;			/* mask for interrupt status */
+-
+-	void *dma_able;			/* dma allocated structs */
+-	dma_addr_t dma_able_phys;
+-	self_test_t *selftest;		/* pointer to self test area */
+-	dma_addr_t selftest_phys;	/* phys addr of selftest */
+-	max_counters_t *stats_counters;	/* pointer to stats table */
+-	dma_addr_t stat_cnt_phys;	/* phys addr of stat counter area */
+-
+-	stat_mode_t stat_mode;	/* statistics mode: extended, TCO, basic */
+-	scb_t *scb;		/* memory mapped ptr to 82557 scb */
+-
+-	tcb_t *last_tcb;	/* pointer to last tcb sent */
+-	buf_pool_t tcb_pool;	/* adapter's TCB array */
+-	dma_addr_t tcb_phys;	/* phys addr of start of TCBs */
+-
+-	u16 cur_line_speed;
+-	u16 cur_dplx_mode;
+-
+-	struct net_device *device;
+-	struct pci_dev *pdev;
+-	struct driver_stats drv_stats;
+-
+-	u8 rev_id;		/* adapter PCI revision ID */
+-
+-	unsigned int phy_addr;	/* address of PHY component */
+-	unsigned int PhyId;	/* ID of PHY component */
+-	unsigned int PhyState;	/* state for the fix squelch algorithm */
+-	unsigned int PhyDelay;	/* delay for the fix squelch algorithm */
+-
+-	/* Lock defintions for the driver */
+-	spinlock_t bd_lock;		/* board lock */
+-	spinlock_t bd_non_tx_lock;	/* Non transmit command lock  */
+-	spinlock_t config_lock;		/* config block lock */
+-	spinlock_t mdi_access_lock;	/* mdi lock */
+-
+-	struct timer_list watchdog_timer;	/* watchdog timer id */
+-
+-	/* non-tx commands parameters */
+-	struct timer_list nontx_timer_id;	/* non-tx timer id */
+-	struct list_head non_tx_cmd_list;
+-	non_tx_cmd_state_t non_tx_command_state;
+-	nxmit_cb_entry_t *same_cmd_entry[CB_MAX_NONTX_CMD];
+-
+-	enum next_cu_cmd_e next_cu_cmd;
+-
+-	/* Zero Locking Algorithm data members */
+-	enum zlock_state_e zlock_state;
+-	u8 zlock_read_data[16];	/* number of times each value 0-15 was read */
+-	u16 zlock_read_cnt;	/* counts number of reads */
+-	ulong zlock_sleep_cnt;	/* keeps track of "sleep" time */
+-
+-	u8 config[CB_CFIG_BYTE_COUNT + CB_CFIG_D102_BYTE_COUNT];
+-
+-	/* IFS params */
+-	u8 ifs_state;
+-	u8 ifs_value;
+-
+-	struct cfg_params params;	/* adapter's command line parameters */
+-
+-	u32 speed_duplex_caps;	/* adapter's speed/duplex capabilities */
+-
+-	/* WOL params for ethtool */
+-	u32 wolsupported;
+-	u32 wolopts;
+-	u16 ip_lbytes;
+-	struct ethtool_lpbk_data loopback;
+-	struct timer_list blink_timer;	/* led blink timer id */
+-
+-#ifdef CONFIG_PM
+-	u32 pci_state[16];
+-#endif
+-#ifdef E100_CU_DEBUG	
+-	u8 last_cmd;
+-	u8 last_sub_cmd;
+-#endif	
+-};
+-
+-#define E100_AUTONEG        0
+-#define E100_SPEED_10_HALF  1
+-#define E100_SPEED_10_FULL  2
+-#define E100_SPEED_100_HALF 3
+-#define E100_SPEED_100_FULL 4
+-
+-/********* function prototypes *************/
+-extern int e100_open(struct net_device *);
+-extern int e100_close(struct net_device *);
+-extern void e100_isolate_driver(struct e100_private *bdp);
+-extern unsigned char e100_hw_init(struct e100_private *);
+-extern void e100_sw_reset(struct e100_private *bdp, u32 reset_cmd);
+-extern u8 e100_start_cu(struct e100_private *bdp, tcb_t *tcb);
+-extern void e100_free_non_tx_cmd(struct e100_private *bdp,
+-				 nxmit_cb_entry_t *non_tx_cmd);
+-extern nxmit_cb_entry_t *e100_alloc_non_tx_cmd(struct e100_private *bdp);
+-extern unsigned char e100_exec_non_cu_cmd(struct e100_private *bdp,
+-					  nxmit_cb_entry_t *cmd);
+-extern unsigned char e100_selftest(struct e100_private *bdp, u32 *st_timeout,
+-				   u32 *st_result);
+-extern unsigned char e100_get_link_state(struct e100_private *bdp);
+-extern unsigned char e100_wait_scb(struct e100_private *bdp);
+-
+-extern void e100_deisolate_driver(struct e100_private *bdp, u8 full_reset);
+-extern unsigned char e100_configure_device(struct e100_private *bdp);
+-#ifdef E100_CU_DEBUG
+-extern unsigned char e100_cu_unknown_state(struct e100_private *bdp);
+-#endif
+-
+-#define ROM_TEST_FAIL		0x01
+-#define REGISTER_TEST_FAIL	0x02
+-#define SELF_TEST_FAIL		0x04
+-#define TEST_TIMEOUT		0x08
+-
+-enum test_offsets {
+-	test_link,
+-	test_eeprom,
+-	test_self_test,
+-	test_loopback_mac,
+-	test_loopback_phy,
+-	cable_diag,
+-	max_test_res,  /* must be last */
+-};
+-
+-#endif
+--- linux-2.6.0/drivers/net/e100/e100_main.c	2003-11-09 16:45:05.000000000 -0800
++++ /dev/null	2002-08-30 16:31:37.000000000 -0700
+@@ -1,4343 +0,0 @@
+-/*******************************************************************************
+-
+-  
+-  Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved.
+-  
+-  This program is free software; you can redistribute it and/or modify it 
+-  under the terms of the GNU General Public License as published by the Free 
+-  Software Foundation; either version 2 of the License, or (at your option) 
+-  any later version.
+-  
+-  This program is distributed in the hope that it will be useful, but WITHOUT 
+-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
+-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
+-  more details.
+-  
+-  You should have received a copy of the GNU General Public License along with
+-  this program; if not, write to the Free Software Foundation, Inc., 59 
+-  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+-  
+-  The full GNU General Public License is included in this distribution in the
+-  file called LICENSE.
+-  
+-  Contact Information:
+-  Linux NICS <linux.nics@intel.com>
+-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+-*******************************************************************************/
+-
+-/**********************************************************************
+-*                                                                     *
+-* INTEL CORPORATION                                                   *
+-*                                                                     *
+-* This software is supplied under the terms of the license included   *
+-* above.  All use of this driver must be in accordance with the terms *
+-* of that license.                                                    *
+-*                                                                     *
+-* Module Name:  e100_main.c                                           *
+-*                                                                     *
+-* Abstract:     Functions for the driver entry points like load,      *
+-*               unload, open and close. All board specific calls made *
+-*               by the network interface section of the driver.       *
+-*                                                                     *
+-* Environment:  This file is intended to be specific to the Linux     *
+-*               operating system.                                     *
+-*                                                                     *
+-**********************************************************************/
+-
+-/* Change Log
+- * 
+- * 2.3.30       09/21/03
+- * o Bug fix (Bugzilla 97908): Loading e100 was causing crash on Itanium2
+- *   with HP chipset
+- * o Bug fix (Bugzilla 101583): e100 can't pass traffic with ipv6
+- * o Bug fix (Bugzilla 101360): PRO/10+ can't pass traffic
+- * 
+- * 2.3.27       08/08/03
+- * o Bug fix: read skb->len after freeing skb
+- *   [Andrew Morton] akpm@zip.com.au
+- * o Bug fix: 82557 (with National PHY) timeout during init
+- *   [Adam Kropelin] akropel1@rochester.rr.com
+- * o Feature add: allow to change Wake On LAN when EEPROM disabled
+- * 
+- * 2.3.13       05/08/03
+- */
+- 
+-#include <linux/config.h>
+-#include <net/checksum.h>
+-#include <linux/tcp.h>
+-#include <linux/udp.h>
+-#include "e100.h"
+-#include "e100_ucode.h"
+-#include "e100_config.h"
+-#include "e100_phy.h"
+-
+-extern void e100_force_speed_duplex_to_phy(struct e100_private *bdp);
+-
+-static char e100_gstrings_stats[][ETH_GSTRING_LEN] = {
+-	"rx_packets", "tx_packets", "rx_bytes", "tx_bytes", "rx_errors",
+-	"tx_errors", "rx_dropped", "tx_dropped", "multicast", "collisions",
+-	"rx_length_errors", "rx_over_errors", "rx_crc_errors",
+-	"rx_frame_errors", "rx_fifo_errors", "rx_missed_errors",
+-	"tx_aborted_errors", "tx_carrier_errors", "tx_fifo_errors",
+-	"tx_heartbeat_errors", "tx_window_errors",
+-};
+-#define E100_STATS_LEN	sizeof(e100_gstrings_stats) / ETH_GSTRING_LEN
+-
+-static int e100_do_ethtool_ioctl(struct net_device *, struct ifreq *);
+-static void e100_get_speed_duplex_caps(struct e100_private *);
+-static int e100_ethtool_get_settings(struct net_device *, struct ifreq *);
+-static int e100_ethtool_set_settings(struct net_device *, struct ifreq *);
+-
+-static int e100_ethtool_get_drvinfo(struct net_device *, struct ifreq *);
+-static int e100_ethtool_eeprom(struct net_device *, struct ifreq *);
+-
+-#define E100_EEPROM_MAGIC 0x1234
+-static int e100_ethtool_glink(struct net_device *, struct ifreq *);
+-static int e100_ethtool_gregs(struct net_device *, struct ifreq *);
+-static int e100_ethtool_nway_rst(struct net_device *, struct ifreq *);
+-static int e100_ethtool_wol(struct net_device *, struct ifreq *);
+-#ifdef CONFIG_PM
+-static unsigned char e100_setup_filter(struct e100_private *bdp);
+-static void e100_do_wol(struct pci_dev *pcid, struct e100_private *bdp);
+-#endif
+-static u16 e100_get_ip_lbytes(struct net_device *dev);
+-extern void e100_config_wol(struct e100_private *bdp);
+-extern u32 e100_run_diag(struct net_device *dev, u64 *test_info, u32 flags);
+-static int e100_ethtool_test(struct net_device *, struct ifreq *);
+-static int e100_ethtool_gstrings(struct net_device *, struct ifreq *);
+-static char test_strings[][ETH_GSTRING_LEN] = {
+-	"Link test     (on/offline)",
+-	"Eeprom test   (on/offline)",
+-	"Self test        (offline)",
+-	"Mac loopback     (offline)",
+-	"Phy loopback     (offline)",
+-	"Cable diagnostic (offline)"
+-};
+-
+-static int e100_ethtool_led_blink(struct net_device *, struct ifreq *);
+-
+-static int e100_mii_ioctl(struct net_device *, struct ifreq *, int);
+-
+-static unsigned char e100_delayed_exec_non_cu_cmd(struct e100_private *,
+-						  nxmit_cb_entry_t *);
+-static void e100_free_nontx_list(struct e100_private *);
+-static void e100_non_tx_background(unsigned long);
+-static inline void e100_tx_skb_free(struct e100_private *bdp, tcb_t *tcb);
+-/* Global Data structures and variables */
+-char e100_copyright[] __devinitdata = "Copyright (c) 2003 Intel Corporation";
+-char e100_driver_version[]="2.3.30-k1";
+-const char *e100_full_driver_name = "Intel(R) PRO/100 Network Driver";
+-char e100_short_driver_name[] = "e100";
+-static int e100nics = 0;
+-static void e100_vlan_rx_register(struct net_device *netdev, struct vlan_group
+-		*grp);
+-static void e100_vlan_rx_add_vid(struct net_device *netdev, u16 vid);
+-static void e100_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);
+-
+-#ifdef CONFIG_PM
+-static int e100_notify_reboot(struct notifier_block *, unsigned long event, void *ptr);
+-static int e100_suspend(struct pci_dev *pcid, u32 state);
+-static int e100_resume(struct pci_dev *pcid);
+-static unsigned char e100_asf_enabled(struct e100_private *bdp);
+-struct notifier_block e100_notifier_reboot = {
+-        .notifier_call  = e100_notify_reboot,
+-        .next           = NULL,
+-        .priority       = 0
+-};
+-#endif
+-
+-/*********************************************************************/
+-/*! This is a GCC extension to ANSI C.
+- *  See the item "Labeled Elements in Initializers" in the section
+- *  "Extensions to the C Language Family" of the GCC documentation.
+- *********************************************************************/
+-#define E100_PARAM_INIT { [0 ... E100_MAX_NIC] = -1 }
+-
+-/* All parameters are treated the same, as an integer array of values.
+- * This macro just reduces the need to repeat the same declaration code
+- * over and over (plus this helps to avoid typo bugs).
+- */
+-#define E100_PARAM(X, S)                                        \
+-        static const int X[E100_MAX_NIC + 1] = E100_PARAM_INIT; \
+-        MODULE_PARM(X, "1-" __MODULE_STRING(E100_MAX_NIC) "i"); \
+-        MODULE_PARM_DESC(X, S);
+-
+-/* ====================================================================== */
+-static u8 e100_D101M_checksum(struct e100_private *, struct sk_buff *);
+-static u8 e100_D102_check_checksum(rfd_t *);
+-static int e100_ioctl(struct net_device *, struct ifreq *, int);
+-static int e100_change_mtu(struct net_device *, int);
+-static int e100_xmit_frame(struct sk_buff *, struct net_device *);
+-static unsigned char e100_init(struct e100_private *);
+-static int e100_set_mac(struct net_device *, void *);
+-struct net_device_stats *e100_get_stats(struct net_device *);
+-
+-static irqreturn_t e100intr(int, void *, struct pt_regs *);
+-static void e100_print_brd_conf(struct e100_private *);
+-static void e100_set_multi(struct net_device *);
+-
+-static u8 e100_pci_setup(struct pci_dev *, struct e100_private *);
+-static u8 e100_sw_init(struct e100_private *);
+-static void e100_tco_workaround(struct e100_private *);
+-static unsigned char e100_alloc_space(struct e100_private *);
+-static void e100_dealloc_space(struct e100_private *);
+-static int e100_alloc_tcb_pool(struct e100_private *);
+-static void e100_setup_tcb_pool(tcb_t *, unsigned int, struct e100_private *);
+-static void e100_free_tcb_pool(struct e100_private *);
+-static int e100_alloc_rfd_pool(struct e100_private *);
+-static void e100_free_rfd_pool(struct e100_private *);
+-
+-static void e100_rd_eaddr(struct e100_private *);
+-static void e100_rd_pwa_no(struct e100_private *);
+-extern u16 e100_eeprom_read(struct e100_private *, u16);
+-extern void e100_eeprom_write_block(struct e100_private *, u16, u16 *, u16);
+-extern u16 e100_eeprom_size(struct e100_private *);
+-u16 e100_eeprom_calculate_chksum(struct e100_private *adapter);
+-
+-static unsigned char e100_clr_cntrs(struct e100_private *);
+-static unsigned char e100_load_microcode(struct e100_private *);
+-static unsigned char e100_setup_iaaddr(struct e100_private *, u8 *);
+-static unsigned char e100_update_stats(struct e100_private *bdp);
+-
+-static void e100_start_ru(struct e100_private *);
+-static void e100_dump_stats_cntrs(struct e100_private *);
+-
+-static void e100_check_options(int board, struct e100_private *bdp);
+-static void e100_set_int_option(int *, int, int, int, int, char *);
+-static void e100_set_bool_option(struct e100_private *bdp, int, u32, int,
+-				 char *);
+-unsigned char e100_wait_exec_cmplx(struct e100_private *, u32, u8, u8);
+-void e100_exec_cmplx(struct e100_private *, u32, u8);
+-
+-/**
+- * e100_get_rx_struct - retrieve cell to hold skb buff from the pool
+- * @bdp: atapter's private data struct
+- *
+- * Returns the new cell to hold sk_buff or %NULL.
+- */
+-static inline struct rx_list_elem *
+-e100_get_rx_struct(struct e100_private *bdp)
+-{
+-	struct rx_list_elem *rx_struct = NULL;
+-
+-	if (!list_empty(&(bdp->rx_struct_pool))) {
+-		rx_struct = list_entry(bdp->rx_struct_pool.next,
+-				       struct rx_list_elem, list_elem);
+-		list_del(&(rx_struct->list_elem));
+-	}
+-
+-	return rx_struct;
+-}
+-
+-/**
+- * e100_alloc_skb - allocate an skb for the adapter
+- * @bdp: atapter's private data struct
+- *
+- * Allocates skb with enough room for rfd, and data, and reserve non-data space.
+- * Returns the new cell with sk_buff or %NULL.
+- */
+-static inline struct rx_list_elem *
+-e100_alloc_skb(struct e100_private *bdp)
+-{
+-	struct sk_buff *new_skb;
+-	u32 skb_size = sizeof (rfd_t);
+-	struct rx_list_elem *rx_struct;
+-
+-	new_skb = (struct sk_buff *) dev_alloc_skb(skb_size);
+-	if (new_skb) {
+-		/* The IP data should be 
+-		   DWORD aligned. since the ethernet header is 14 bytes long, 
+-		   we need to reserve 2 extra bytes so that the TCP/IP headers
+-		   will be DWORD aligned. */
+-		skb_reserve(new_skb, 2);
+-		if ((rx_struct = e100_get_rx_struct(bdp)) == NULL)
+-			goto err;
+-		rx_struct->skb = new_skb;
+-		rx_struct->dma_addr = pci_map_single(bdp->pdev, new_skb->data,
+-						     sizeof (rfd_t),
+-						     PCI_DMA_FROMDEVICE);
+-		if (!rx_struct->dma_addr)
+-			goto err;
+-		skb_reserve(new_skb, bdp->rfd_size);
+-		return rx_struct;
+-	} else {
+-		return NULL;
+-	}
+-
+-err:
+-	dev_kfree_skb_irq(new_skb);
+-	return NULL;
+-}
+-
+-/**
+- * e100_add_skb_to_end - add an skb to the end of our rfd list
+- * @bdp: atapter's private data struct
+- * @rx_struct: rx_list_elem with the new skb
+- *
+- * Adds a newly allocated skb to the end of our rfd list.
+- */
+-inline void
+-e100_add_skb_to_end(struct e100_private *bdp, struct rx_list_elem *rx_struct)
+-{
+-	rfd_t *rfdn;		/* The new rfd */
+-	rfd_t *rfd;		/* The old rfd */
+-	struct rx_list_elem *rx_struct_last;
+-
+-	(rx_struct->skb)->dev = bdp->device;
+-	rfdn = RFD_POINTER(rx_struct->skb, bdp);
+-	rfdn->rfd_header.cb_status = 0;
+-	rfdn->rfd_header.cb_cmd = __constant_cpu_to_le16(RFD_EL_BIT);
+-	rfdn->rfd_act_cnt = 0;
+-	rfdn->rfd_sz = __constant_cpu_to_le16(RFD_DATA_SIZE);
+-
+-	pci_dma_sync_single(bdp->pdev, rx_struct->dma_addr, bdp->rfd_size,
+-			    PCI_DMA_TODEVICE);
+-
+-	if (!list_empty(&(bdp->active_rx_list))) {
+-		rx_struct_last = list_entry(bdp->active_rx_list.prev,
+-					    struct rx_list_elem, list_elem);
+-		rfd = RFD_POINTER(rx_struct_last->skb, bdp);
+-		pci_dma_sync_single(bdp->pdev, rx_struct_last->dma_addr,
+-				    4, PCI_DMA_FROMDEVICE);
+-		put_unaligned(cpu_to_le32(rx_struct->dma_addr),
+-			      ((u32 *) (&(rfd->rfd_header.cb_lnk_ptr))));
+-
+-		pci_dma_sync_single(bdp->pdev, rx_struct_last->dma_addr,
+-				    8, PCI_DMA_TODEVICE);
+-		rfd->rfd_header.cb_cmd &=
+-			__constant_cpu_to_le16((u16) ~RFD_EL_BIT);
+-
+-		pci_dma_sync_single(bdp->pdev, rx_struct_last->dma_addr,
+-				    4, PCI_DMA_TODEVICE);
+-	}
+-
+-	list_add_tail(&(rx_struct->list_elem), &(bdp->active_rx_list));
+-}
+-
+-static inline void
+-e100_alloc_skbs(struct e100_private *bdp)
+-{
+-	for (; bdp->skb_req > 0; bdp->skb_req--) {
+-		struct rx_list_elem *rx_struct;
+-
+-		if ((rx_struct = e100_alloc_skb(bdp)) == NULL)
+-			return;
+-
+-		e100_add_skb_to_end(bdp, rx_struct);
+-	}
+-}
+-
+-void e100_tx_srv(struct e100_private *);
+-u32 e100_rx_srv(struct e100_private *);
+-
+-void e100_watchdog(struct net_device *);
+-void e100_refresh_txthld(struct e100_private *);
+-void e100_manage_adaptive_ifs(struct e100_private *);
+-void e100_clear_pools(struct e100_private *);
+-static void e100_clear_structs(struct net_device *);
+-static inline tcb_t *e100_prepare_xmit_buff(struct e100_private *,
+-					    struct sk_buff *);
+-static void e100_set_multi_exec(struct net_device *dev);
+-
+-MODULE_AUTHOR("Intel Corporation, <linux.nics@intel.com>");
+-MODULE_DESCRIPTION("Intel(R) PRO/100 Network Driver");
+-MODULE_LICENSE("GPL");
+-
+-E100_PARAM(TxDescriptors, "Number of transmit descriptors");
+-E100_PARAM(RxDescriptors, "Number of receive descriptors");
+-E100_PARAM(XsumRX, "Disable or enable Receive Checksum offload");
+-E100_PARAM(e100_speed_duplex, "Speed and Duplex settings");
+-E100_PARAM(ucode, "Disable or enable microcode loading");
+-E100_PARAM(ber, "Value for the BER correction algorithm");
+-E100_PARAM(flow_control, "Disable or enable Ethernet PAUSE frames processing");
+-E100_PARAM(IntDelay, "Value for CPU saver's interrupt delay");
+-E100_PARAM(BundleSmallFr, "Disable or enable interrupt bundling of small frames");
+-E100_PARAM(BundleMax, "Maximum number for CPU saver's packet bundling");
+-E100_PARAM(IFS, "Disable or enable the adaptive IFS algorithm");
+-
+-/**
+- * e100_exec_cmd - issue a comand
+- * @bdp: atapter's private data struct
+- * @scb_cmd_low: the command that is to be issued
+- *
+- * This general routine will issue a command to the e100.
+- */
+-static inline void
+-e100_exec_cmd(struct e100_private *bdp, u8 cmd_low)
+-{
+-	writeb(cmd_low, &(bdp->scb->scb_cmd_low));
+-	readw(&(bdp->scb->scb_status));	/* flushes last write, read-safe */
+-}
+-
+-/**
+- * e100_wait_scb - wait for SCB to clear
+- * @bdp: atapter's private data struct
+- *
+- * This routine checks to see if the e100 has accepted a command.
+- * It does so by checking the command field in the SCB, which will
+- * be zeroed by the e100 upon accepting a command.  The loop waits
+- * for up to 1 millisecond for command acceptance.
+- *
+- * Returns:
+- *      true if the SCB cleared within 1 millisecond.
+- *      false if it didn't clear within 1 millisecond
+- */
+-unsigned char
+-e100_wait_scb(struct e100_private *bdp)
+-{
+-	int i;
+-
+-	/* loop on the scb for a few times */
+-	for (i = 0; i < 100; i++) {
+-		if (!readb(&bdp->scb->scb_cmd_low))
+-			return true;
+-		cpu_relax();
+-	}
+-
+-	/* it didn't work. do it the slow way using udelay()s */
+-	for (i = 0; i < E100_MAX_SCB_WAIT; i++) {
+-		if (!readb(&bdp->scb->scb_cmd_low))
+-			return true;
+-		cpu_relax();
+-		udelay(1);
+-	}
+-
+-	return false;
+-}
+-
+-/**
+- * e100_wait_exec_simple - issue a command
+- * @bdp: atapter's private data struct
+- * @scb_cmd_low: the command that is to be issued
+- *
+- * This general routine will issue a command to the e100 after waiting for
+- * the previous command to finish.
+- *
+- * Returns:
+- *      true if the command was issued to the chip successfully
+- *      false if the command was not issued to the chip
+- */
+-inline unsigned char
+-e100_wait_exec_simple(struct e100_private *bdp, u8 scb_cmd_low)
+-{
+-	if (!e100_wait_scb(bdp)) {
+-		printk(KERN_DEBUG "e100: %s: e100_wait_exec_simple: failed\n",
+-		       bdp->device->name);
+-#ifdef E100_CU_DEBUG		
+-		printk(KERN_ERR "e100: %s: Last command (%x/%x) "
+-			"timeout\n", bdp->device->name, 
+-			bdp->last_cmd, bdp->last_sub_cmd);
+-		printk(KERN_ERR "e100: %s: Current simple command (%x) "
+-			"can't be executed\n", 
+-			bdp->device->name, scb_cmd_low);
+-#endif		
+-		return false;
+-	}
+-	e100_exec_cmd(bdp, scb_cmd_low);
+-#ifdef E100_CU_DEBUG	
+-	bdp->last_cmd = scb_cmd_low;
+-	bdp->last_sub_cmd = 0;
+-#endif	
+-	return true;
+-}
+-
+-void
+-e100_exec_cmplx(struct e100_private *bdp, u32 phys_addr, u8 cmd)
+-{
+-	writel(phys_addr, &(bdp->scb->scb_gen_ptr));
+-	readw(&(bdp->scb->scb_status));	/* flushes last write, read-safe */
+-	e100_exec_cmd(bdp, cmd);
+-}
+-
+-unsigned char
+-e100_wait_exec_cmplx(struct e100_private *bdp, u32 phys_addr, u8 cmd, u8 sub_cmd)
+-{
+-	if (!e100_wait_scb(bdp)) {
+-#ifdef E100_CU_DEBUG		
+-		printk(KERN_ERR "e100: %s: Last command (%x/%x) "
+-			"timeout\n", bdp->device->name, 
+-			bdp->last_cmd, bdp->last_sub_cmd);
+-		printk(KERN_ERR "e100: %s: Current complex command "
+-			"(%x/%x) can't be executed\n", 
+-			bdp->device->name, cmd, sub_cmd);
+-#endif		
+-		return false;
+-	}
+-	e100_exec_cmplx(bdp, phys_addr, cmd);
+-#ifdef E100_CU_DEBUG	
+-	bdp->last_cmd = cmd;
+-	bdp->last_sub_cmd = sub_cmd;
+-#endif	
+-	return true;
+-}
+-
+-inline u8
+-e100_wait_cus_idle(struct e100_private *bdp)
+-{
+-	int i;
+-
+-	/* loop on the scb for a few times */
+-	for (i = 0; i < 100; i++) {
+-		if (((readw(&(bdp->scb->scb_status)) & SCB_CUS_MASK) !=
+-		     SCB_CUS_ACTIVE)) {
+-			return true;
+-		}
+-		cpu_relax();
+-	}
+-
+-	for (i = 0; i < E100_MAX_CU_IDLE_WAIT; i++) {
+-		if (((readw(&(bdp->scb->scb_status)) & SCB_CUS_MASK) !=
+-		     SCB_CUS_ACTIVE)) {
+-			return true;
+-		}
+-		cpu_relax();
+-		udelay(1);
+-	}
+-
+-	return false;
+-}
+-
+-/**
+- * e100_disable_clear_intr - disable and clear/ack interrupts
+- * @bdp: atapter's private data struct
+- *
+- * This routine disables interrupts at the hardware, by setting
+- * the M (mask) bit in the adapter's CSR SCB command word.
+- * It also clear/ack interrupts.
+- */
+-static inline void
+-e100_disable_clear_intr(struct e100_private *bdp)
+-{
+-	u16 intr_status;
+-	/* Disable interrupts on our PCI board by setting the mask bit */
+-	writeb(SCB_INT_MASK, &bdp->scb->scb_cmd_hi);
+-	intr_status = readw(&bdp->scb->scb_status);
+-	/* ack and clear intrs */
+-	writew(intr_status, &bdp->scb->scb_status);
+-	readw(&bdp->scb->scb_status);
+-}
+-
+-/**
+- * e100_set_intr_mask - set interrupts
+- * @bdp: atapter's private data struct
+- *
+- * This routine sets interrupts at the hardware, by resetting
+- * the M (mask) bit in the adapter's CSR SCB command word
+- */
+-static inline void
+-e100_set_intr_mask(struct e100_private *bdp)
+-{
+-	writeb(bdp->intr_mask, &bdp->scb->scb_cmd_hi);
+-	readw(&(bdp->scb->scb_status)); /* flushes last write, read-safe */
+-}
+-
+-static inline void
+-e100_trigger_SWI(struct e100_private *bdp)
+-{
+-	/* Trigger interrupt on our PCI board by asserting SWI bit */
+-	writeb(SCB_SOFT_INT, &bdp->scb->scb_cmd_hi);
+-	readw(&(bdp->scb->scb_status));	/* flushes last write, read-safe */
+-}
+-
+-static int __devinit
+-e100_found1(struct pci_dev *pcid, const struct pci_device_id *ent)
+-{
+-	static int first_time = true;
+-	struct net_device *dev = NULL;
+-	struct e100_private *bdp = NULL;
+-	int rc = 0;
+-	u16 cal_checksum, read_checksum;
+-
+-	dev = alloc_etherdev(sizeof (struct e100_private));
+-	if (dev == NULL) {
+-		printk(KERN_ERR "e100: Not able to alloc etherdev struct\n");
+-		rc = -ENODEV;
+-		goto out;
+-	}
+-
+-	SET_MODULE_OWNER(dev);
+-
+-	if (first_time) {
+-		first_time = false;
+-        	printk(KERN_NOTICE "%s - version %s\n",
+-	               e100_full_driver_name, e100_driver_version);
+-		printk(KERN_NOTICE "%s\n", e100_copyright);
+-		printk(KERN_NOTICE "\n");
+-	}
+-
+-	bdp = dev->priv;
+-	bdp->pdev = pcid;
+-	bdp->device = dev;
+-
+-	pci_set_drvdata(pcid, dev);
+-	SET_NETDEV_DEV(dev, &pcid->dev);
+-
+-	bdp->flags = 0;
+-	bdp->ifs_state = 0;
+-	bdp->ifs_value = 0;
+-	bdp->scb = 0;
+-
+-	init_timer(&bdp->nontx_timer_id);
+-	bdp->nontx_timer_id.data = (unsigned long) bdp;
+-	bdp->nontx_timer_id.function = (void *) &e100_non_tx_background;
+-	INIT_LIST_HEAD(&(bdp->non_tx_cmd_list));
+-	bdp->non_tx_command_state = E100_NON_TX_IDLE;
+-
+-	init_timer(&bdp->watchdog_timer);
+-	bdp->watchdog_timer.data = (unsigned long) dev;
+-	bdp->watchdog_timer.function = (void *) &e100_watchdog;
+-
+-	if ((rc = e100_pci_setup(pcid, bdp)) != 0) {
+-		goto err_dev;
+-	}
+-
+-	if ((rc = e100_alloc_space(bdp)) != 0) {
+-		goto err_pci;
+-	}
+-
+-	if (((bdp->pdev->device > 0x1030)
+-	       && (bdp->pdev->device < 0x103F))
+-	    || ((bdp->pdev->device >= 0x1050)
+-	       && (bdp->pdev->device <= 0x1057))
+-	    || (bdp->pdev->device == 0x2449)
+-	    || (bdp->pdev->device == 0x2459)
+-	    || (bdp->pdev->device == 0x245D)) {
+-		bdp->rev_id = D101MA_REV_ID;	/* workaround for ICH3 */
+-		bdp->flags |= IS_ICH;
+-	}
+-
+-	if (bdp->rev_id == 0xff)
+-		bdp->rev_id = 1;
+-
+-	if ((u8) bdp->rev_id >= D101A4_REV_ID)
+-		bdp->flags |= IS_BACHELOR;
+-
+-	if ((u8) bdp->rev_id >= D102_REV_ID) {
+-		bdp->flags |= USE_IPCB;
+-		bdp->rfd_size = 32;
+-	} else {
+-		bdp->rfd_size = 16;
+-	}
+-
+-	dev->vlan_rx_register = e100_vlan_rx_register;
+-	dev->vlan_rx_add_vid = e100_vlan_rx_add_vid;
+-	dev->vlan_rx_kill_vid = e100_vlan_rx_kill_vid;
+-	dev->irq = pcid->irq;
+-	dev->open = &e100_open;
+-	dev->hard_start_xmit = &e100_xmit_frame;
+-	dev->stop = &e100_close;
+-	dev->change_mtu = &e100_change_mtu;
+-	dev->get_stats = &e100_get_stats;
+-	dev->set_multicast_list = &e100_set_multi;
+-	dev->set_mac_address = &e100_set_mac;
+-	dev->do_ioctl = &e100_ioctl;
+-
+-	if (bdp->flags & USE_IPCB)
+-	dev->features = NETIF_F_SG | NETIF_F_IP_CSUM |
+-			NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+-		
+-	if ((rc = register_netdev(dev)) != 0) {
+-		goto err_dealloc;
+-	}
+-
+-	e100_check_options(e100nics, bdp);
+-
+-	if (!e100_init(bdp)) {
+-		printk(KERN_ERR "e100: Failed to initialize, instance #%d\n",
+-		       e100nics);
+-		rc = -ENODEV;
+-		goto err_unregister_netdev;
+-	}
+-
+-	/* Check if checksum is valid */
+-	cal_checksum = e100_eeprom_calculate_chksum(bdp);
+-	read_checksum = e100_eeprom_read(bdp, (bdp->eeprom_size - 1));
+-	if (cal_checksum != read_checksum) {
+-                printk(KERN_ERR "e100: Corrupted EEPROM on instance #%d\n",
+-		       e100nics);
+-                rc = -ENODEV;
+-                goto err_unregister_netdev;
+-	}
+-	
+-	e100nics++;
+-
+-	e100_get_speed_duplex_caps(bdp);
+-
+-	printk(KERN_NOTICE
+-	       "e100: %s: %s\n", 
+-	       bdp->device->name, "Intel(R) PRO/100 Network Connection");
+-	e100_print_brd_conf(bdp);
+-
+-	bdp->wolsupported = 0;
+-	bdp->wolopts = 0;
+-	if (bdp->rev_id >= D101A4_REV_ID)
+-		bdp->wolsupported = WAKE_PHY | WAKE_MAGIC;
+-	if (bdp->rev_id >= D101MA_REV_ID)
+-		bdp->wolsupported |= WAKE_UCAST | WAKE_ARP;
+-	
+-	/* Check if WoL is enabled on EEPROM */
+-	if (e100_eeprom_read(bdp, EEPROM_ID_WORD) & BIT_5) {
+-		/* Magic Packet WoL is enabled on device by default */
+-		/* if EEPROM WoL bit is TRUE                        */
+-		bdp->wolopts = WAKE_MAGIC;
+-	}
+-
+-	printk(KERN_NOTICE "\n");
+-
+-	goto out;
+-
+-err_unregister_netdev:
+-	unregister_netdev(dev);
+-err_dealloc:
+-	e100_dealloc_space(bdp);
+-err_pci:
+-	iounmap(bdp->scb);
+-	pci_release_regions(pcid);
+-	pci_disable_device(pcid);
+-err_dev:
+-	pci_set_drvdata(pcid, NULL);
+-	kfree(dev);
+-out:
+-	return rc;
+-}
+-
+-/**
+- * e100_clear_structs - free resources
+- * @dev: adapter's net_device struct
+- *
+- * Free all device specific structs, unmap i/o address, etc.
+- */
+-static void __devexit
+-e100_clear_structs(struct net_device *dev)
+-{
+-	struct e100_private *bdp = dev->priv;
+-
+-	iounmap(bdp->scb);
+-	pci_release_regions(bdp->pdev);
+-	pci_disable_device(bdp->pdev);
+-
+-	e100_dealloc_space(bdp);
+-	pci_set_drvdata(bdp->pdev, NULL);
+-	free_netdev(dev);
+-}
+-
+-static void __devexit
+-e100_remove1(struct pci_dev *pcid)
+-{
+-	struct net_device *dev;
+-	struct e100_private *bdp;
+-
+-	if (!(dev = (struct net_device *) pci_get_drvdata(pcid)))
+-		return;
+-
+-	bdp = dev->priv;
+-
+-	unregister_netdev(dev);
+-
+-	e100_sw_reset(bdp, PORT_SELECTIVE_RESET);
+-
+-	if (bdp->non_tx_command_state != E100_NON_TX_IDLE) {
+-		del_timer_sync(&bdp->nontx_timer_id);
+-		e100_free_nontx_list(bdp);
+-		bdp->non_tx_command_state = E100_NON_TX_IDLE;
+-	}
+-
+-	e100_clear_structs(dev);
+-
+-	--e100nics;
+-}
+-
+-static struct pci_device_id e100_id_table[] = {
+-	{0x8086, 0x1229, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+-	{0x8086, 0x2449, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+-	{0x8086, 0x1059, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+-	{0x8086, 0x1209, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+-  	{0x8086, 0x1029, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+-	{0x8086, 0x1030, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },	
+-	{0x8086, 0x1031, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, 
+-	{0x8086, 0x1032, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+-	{0x8086, 0x1033, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, 
+-	{0x8086, 0x1034, PCI_ANY_ID, PCI_ANY_ID, 0, 0, }, 
+-	{0x8086, 0x1038, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+-	{0x8086, 0x1039, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+-	{0x8086, 0x103A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+-	{0x8086, 0x103B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+-	{0x8086, 0x103C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+-	{0x8086, 0x103D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+-	{0x8086, 0x103E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+-	{0x8086, 0x1050, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+-	{0x8086, 0x1051, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+-	{0x8086, 0x1052, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+-	{0x8086, 0x1053, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+-	{0x8086, 0x1054, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+-	{0x8086, 0x1055, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+-	{0x8086, 0x2459, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+-	{0x8086, 0x245D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
+-	{0,} /* This has to be the last entry*/
+-};
+-MODULE_DEVICE_TABLE(pci, e100_id_table);
+-
+-static struct pci_driver e100_driver = {
+-	.name         = "e100",
+-	.id_table     = e100_id_table,
+-	.probe        = e100_found1,
+-	.remove       = __devexit_p(e100_remove1),
+-#ifdef CONFIG_PM
+-	.suspend      = e100_suspend,
+-	.resume       = e100_resume,
+-#endif
+-};
+-
+-static int __init
+-e100_init_module(void)
+-{
+-	int ret;
+-        ret = pci_module_init(&e100_driver);
+-
+-	if(ret >= 0) {
+-#ifdef CONFIG_PM
+-		register_reboot_notifier(&e100_notifier_reboot);
+-#endif 
+-	}
+-
+-	return ret;
+-}
+-
+-static void __exit
+-e100_cleanup_module(void)
+-{
+-#ifdef CONFIG_PM	
+-	unregister_reboot_notifier(&e100_notifier_reboot);
+-#endif 
+-
+-	pci_unregister_driver(&e100_driver);
+-}
+-
+-module_init(e100_init_module);
+-module_exit(e100_cleanup_module);
+-
+-/**
+- * e100_check_options - check command line options
+- * @board: board number
+- * @bdp: atapter's private data struct
+- *
+- * This routine does range checking on command-line options
+- */
+-void __devinit
+-e100_check_options(int board, struct e100_private *bdp)
+-{
+-	if (board >= E100_MAX_NIC) {
+-		printk(KERN_NOTICE 
+-		       "e100: No configuration available for board #%d\n",
+-		       board);
+-		printk(KERN_NOTICE "e100: Using defaults for all values\n");
+-		board = E100_MAX_NIC;
+-	}
+-
+-	e100_set_int_option(&(bdp->params.TxDescriptors), TxDescriptors[board],
+-			    E100_MIN_TCB, E100_MAX_TCB, E100_DEFAULT_TCB,
+-			    "TxDescriptor count");
+-
+-	e100_set_int_option(&(bdp->params.RxDescriptors), RxDescriptors[board],
+-			    E100_MIN_RFD, E100_MAX_RFD, E100_DEFAULT_RFD,
+-			    "RxDescriptor count");
+-
+-	e100_set_int_option(&(bdp->params.e100_speed_duplex),
+-			    e100_speed_duplex[board], 0, 4,
+-			    E100_DEFAULT_SPEED_DUPLEX, "speed/duplex mode");
+-
+-	e100_set_int_option(&(bdp->params.ber), ber[board], 0, ZLOCK_MAX_ERRORS,
+-			    E100_DEFAULT_BER, "Bit Error Rate count");
+-
+-	e100_set_bool_option(bdp, XsumRX[board], PRM_XSUMRX, E100_DEFAULT_XSUM,
+-			     "XsumRX value");
+-
+-	/* Default ucode value depended on controller revision */
+-	if (bdp->rev_id >= D101MA_REV_ID) {
+-		e100_set_bool_option(bdp, ucode[board], PRM_UCODE,
+-				     E100_DEFAULT_UCODE, "ucode value");
+-	} else {
+-		e100_set_bool_option(bdp, ucode[board], PRM_UCODE, false,
+-				     "ucode value");
+-	}
+-
+-	e100_set_bool_option(bdp, flow_control[board], PRM_FC, E100_DEFAULT_FC,
+-			     "flow control value");
+-
+-	e100_set_bool_option(bdp, IFS[board], PRM_IFS, E100_DEFAULT_IFS,
+-			     "IFS value");
+-
+-	e100_set_bool_option(bdp, BundleSmallFr[board], PRM_BUNDLE_SMALL,
+-			     E100_DEFAULT_BUNDLE_SMALL_FR,
+-			     "CPU saver bundle small frames value");
+-
+-	e100_set_int_option(&(bdp->params.IntDelay), IntDelay[board], 0x0,
+-			    0xFFFF, E100_DEFAULT_CPUSAVER_INTERRUPT_DELAY,
+-			    "CPU saver interrupt delay value");
+-
+-	e100_set_int_option(&(bdp->params.BundleMax), BundleMax[board], 0x1,
+-			    0xFFFF, E100_DEFAULT_CPUSAVER_BUNDLE_MAX,
+-			    "CPU saver bundle max value");
+-
+-}
+-
+-/**
+- * e100_set_int_option - check and set an integer option
+- * @option: a pointer to the relevant option field
+- * @val: the value specified
+- * @min: the minimum valid value
+- * @max: the maximum valid value
+- * @default_val: the default value
+- * @name: the name of the option
+- *
+- * This routine does range checking on a command-line option.
+- * If the option's value is '-1' use the specified default.
+- * Otherwise, if the value is invalid, change it to the default.
+- */
+-void __devinit
+-e100_set_int_option(int *option, int val, int min, int max, int default_val,
+-		    char *name)
+-{
+-	if (val == -1) {	/* no value specified. use default */
+-		*option = default_val;
+-
+-	} else if ((val < min) || (val > max)) {
+-		printk(KERN_NOTICE
+-		       "e100: Invalid %s specified (%i). "
+-		       "Valid range is %i-%i\n",
+-		       name, val, min, max);
+-		printk(KERN_NOTICE "e100: Using default %s of %i\n", name,
+-		       default_val);
+-		*option = default_val;
+-	} else {
+-		printk(KERN_INFO "e100: Using specified %s of %i\n", name, val);
+-		*option = val;
+-	}
+-}
+-
+-/**
+- * e100_set_bool_option - check and set a boolean option
+- * @bdp: atapter's private data struct
+- * @val: the value specified
+- * @mask: the mask for the relevant option
+- * @default_val: the default value
+- * @name: the name of the option
+- *
+- * This routine checks a boolean command-line option.
+- * If the option's value is '-1' use the specified default.
+- * Otherwise, if the value is invalid (not 0 or 1), 
+- * change it to the default.
+- */
+-void __devinit
+-e100_set_bool_option(struct e100_private *bdp, int val, u32 mask,
+-		     int default_val, char *name)
+-{
+-	if (val == -1) {
+-		if (default_val)
+-			bdp->params.b_params |= mask;
+-
+-	} else if ((val != true) && (val != false)) {
+-		printk(KERN_NOTICE
+-		       "e100: Invalid %s specified (%i). "
+-		       "Valid values are %i/%i\n",
+-		       name, val, false, true);
+-		printk(KERN_NOTICE "e100: Using default %s of %i\n", name,
+-		       default_val);
+-
+-		if (default_val)
+-			bdp->params.b_params |= mask;
+-	} else {
+-		printk(KERN_INFO "e100: Using specified %s of %i\n", name, val);
+-		if (val)
+-			bdp->params.b_params |= mask;
+-	}
+-}
+-
+-int
+-e100_open(struct net_device *dev)
+-{
+-	struct e100_private *bdp;
+-	int rc = 0;
+-
+-	bdp = dev->priv;
+-
+-	/* setup the tcb pool */
+-	if (!e100_alloc_tcb_pool(bdp)) {
+-		rc = -ENOMEM;
+-		goto err_exit;
+-	}
+-	bdp->last_tcb = NULL;
+-
+-	bdp->tcb_pool.head = 0;
+-	bdp->tcb_pool.tail = 1;	
+-
+-	e100_setup_tcb_pool((tcb_t *) bdp->tcb_pool.data,
+-			    bdp->params.TxDescriptors, bdp);
+-
+-	if (!e100_alloc_rfd_pool(bdp)) {
+-		rc = -ENOMEM;
+-		goto err_exit;
+-	}
+-
+-	if (!e100_wait_exec_cmplx(bdp, 0, SCB_CUC_LOAD_BASE, 0)) {
+-		rc = -EAGAIN;
+-		goto err_exit;
+-	}
+-
+-	if (!e100_wait_exec_cmplx(bdp, 0, SCB_RUC_LOAD_BASE, 0)) {
+-		rc = -EAGAIN;
+-		goto err_exit;
+-	}
+-
+-	mod_timer(&(bdp->watchdog_timer), jiffies + (2 * HZ));
+-
+-	if (dev->flags & IFF_UP)
+-		/* Otherwise process may sleep forever */
+-		netif_wake_queue(dev);
+-	else
+-		netif_start_queue(dev);
+-
+-	e100_start_ru(bdp);
+-	if ((rc = request_irq(dev->irq, &e100intr, SA_SHIRQ,
+-			      dev->name, dev)) != 0) {
+-		del_timer_sync(&bdp->watchdog_timer);
+-		goto err_exit;
+-	}
+-	bdp->intr_mask = 0;
+-	e100_set_intr_mask(bdp);
+-
+-	e100_force_config(bdp);
+-
+-	goto exit;
+-
+-err_exit:
+-	e100_clear_pools(bdp);
+-exit:
+-	return rc;
+-}
+-
+-int
+-e100_close(struct net_device *dev)
+-{
+-	struct e100_private *bdp = dev->priv;
+-
+-	e100_disable_clear_intr(bdp);
+-	free_irq(dev->irq, dev);
+-	bdp->intr_mask = SCB_INT_MASK;
+-	e100_isolate_driver(bdp);
+-
+-	netif_carrier_off(bdp->device);
+-	bdp->cur_line_speed = 0;
+-	bdp->cur_dplx_mode = 0;
+-	e100_clear_pools(bdp);
+-
+-	return 0;
+-}
+-
+-static int
+-e100_change_mtu(struct net_device *dev, int new_mtu)
+-{
+-	if ((new_mtu < 68) || (new_mtu > (ETH_DATA_LEN + VLAN_SIZE)))
+-		return -EINVAL;
+-
+-	dev->mtu = new_mtu;
+-	return 0;
+-}
+-
+-static int
+-e100_xmit_frame(struct sk_buff *skb, struct net_device *dev)
+-{
+-	int rc = 0;
+-	int notify_stop = false;
+-	struct e100_private *bdp = dev->priv;
+-
+-	if (!spin_trylock(&bdp->bd_non_tx_lock)) {
+-		notify_stop = true;
+-		rc = 1;
+-		goto exit2;
+-	}
+-
+-	/* tcb list may be empty temporarily during releasing resources */
+-	if (!TCBS_AVAIL(bdp->tcb_pool) || (bdp->tcb_phys == 0) ||
+-	    (bdp->non_tx_command_state != E100_NON_TX_IDLE)) {
+-		notify_stop = true;
+-		rc = 1;
+-		goto exit1;
+-	}
+-
+-	bdp->drv_stats.net_stats.tx_bytes += skb->len;
+-
+-	e100_prepare_xmit_buff(bdp, skb);
+-
+-	dev->trans_start = jiffies;
+-
+-exit1:
+-	spin_unlock(&bdp->bd_non_tx_lock);
+-exit2:
+-	if (notify_stop) {
+-		netif_stop_queue(dev);
+-	}
+-
+-	return rc;
+-}
+-
+-/**
+- * e100_get_stats - get driver statistics
+- * @dev: adapter's net_device struct
+- *
+- * This routine is called when the OS wants the adapter's stats returned.
+- * It returns the address of the net_device_stats stucture for the device.
+- * If the statistics are currently being updated, then they might be incorrect
+- * for a short while. However, since this cannot actually cause damage, no
+- * locking is used.
+- */
+-struct net_device_stats *
+-e100_get_stats(struct net_device *dev)
+-{
+-	struct e100_private *bdp = dev->priv;
+-
+-	bdp->drv_stats.net_stats.tx_errors =
+-		bdp->drv_stats.net_stats.tx_carrier_errors +
+-		bdp->drv_stats.net_stats.tx_aborted_errors;
+-
+-	bdp->drv_stats.net_stats.rx_errors =
+-		bdp->drv_stats.net_stats.rx_crc_errors +
+-		bdp->drv_stats.net_stats.rx_frame_errors +
+-		bdp->drv_stats.net_stats.rx_length_errors +
+-		bdp->drv_stats.rcv_cdt_frames;
+-
+-	return &(bdp->drv_stats.net_stats);
+-}
+-
+-/**
+- * e100_set_mac - set the MAC address
+- * @dev: adapter's net_device struct
+- * @addr: the new address
+- *
+- * This routine sets the ethernet address of the board
+- * Returns:
+- * 0  - if successful
+- * -1 - otherwise
+- */
+-static int
+-e100_set_mac(struct net_device *dev, void *addr)
+-{
+-	struct e100_private *bdp;
+-	int rc = -1;
+-	struct sockaddr *p_sockaddr = (struct sockaddr *) addr;
+-
+-	if (!is_valid_ether_addr(p_sockaddr->sa_data))
+-		return -EADDRNOTAVAIL;
+-	bdp = dev->priv;
+-
+-	if (e100_setup_iaaddr(bdp, (u8 *) (p_sockaddr->sa_data))) {
+-		memcpy(&(dev->dev_addr[0]), p_sockaddr->sa_data, ETH_ALEN);
+-		rc = 0;
+-	}
+-
+-	return rc;
+-}
+-
+-static void
+-e100_set_multi_exec(struct net_device *dev)
+-{
+-	struct e100_private *bdp = dev->priv;
+-	mltcst_cb_t *mcast_buff;
+-	cb_header_t *cb_hdr;
+-	struct dev_mc_list *mc_list;
+-	unsigned int i;
+-	nxmit_cb_entry_t *cmd = e100_alloc_non_tx_cmd(bdp);
+-
+-	if (cmd != NULL) {
+-		mcast_buff = &((cmd->non_tx_cmd)->ntcb.multicast);
+-		cb_hdr = &((cmd->non_tx_cmd)->ntcb.multicast.mc_cbhdr);
+-	} else {
+-		return;
+-	}
+-
+-	/* initialize the multi cast command */
+-	cb_hdr->cb_cmd = __constant_cpu_to_le16(CB_MULTICAST);
+-
+-	/* now fill in the rest of the multicast command */
+-	*(u16 *) (&(mcast_buff->mc_count)) = cpu_to_le16(dev->mc_count * 6);
+-	for (i = 0, mc_list = dev->mc_list;
+-	     (i < dev->mc_count) && (i < MAX_MULTICAST_ADDRS);
+-	     i++, mc_list = mc_list->next) {
+-		/* copy into the command */
+-		memcpy(&(mcast_buff->mc_addr[i * ETH_ALEN]),
+-		       (u8 *) &(mc_list->dmi_addr), ETH_ALEN);
+-	}
+-
+-	if (!e100_exec_non_cu_cmd(bdp, cmd)) {
+-		printk(KERN_WARNING "e100: %s: Multicast setup failed\n", 
+-		       dev->name);
+-	}
+-}
+-
+-/**
+- * e100_set_multi - set multicast status
+- * @dev: adapter's net_device struct
+- *
+- * This routine is called to add or remove multicast addresses, and/or to
+- * change the adapter's promiscuous state.
+- */
+-static void
+-e100_set_multi(struct net_device *dev)
+-{
+-	struct e100_private *bdp = dev->priv;
+-	unsigned char promisc_enbl;
+-	unsigned char mulcast_enbl;
+-
+-	promisc_enbl = ((dev->flags & IFF_PROMISC) == IFF_PROMISC);
+-	mulcast_enbl = ((dev->flags & IFF_ALLMULTI) ||
+-			(dev->mc_count > MAX_MULTICAST_ADDRS));
+-
+-	e100_config_promisc(bdp, promisc_enbl);
+-	e100_config_mulcast_enbl(bdp, mulcast_enbl);
+-
+-	/* reconfigure the chip if something has changed in its config space */
+-	e100_config(bdp);
+-
+-	if (promisc_enbl || mulcast_enbl) {
+-		return;	/* no need for Multicast Cmd */
+-	}
+-
+-	/* get the multicast CB */
+-	e100_set_multi_exec(dev);
+-}
+-
+-static int
+-e100_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+-{
+-
+-	switch (cmd) {
+-
+-	case SIOCETHTOOL:
+-		return e100_do_ethtool_ioctl(dev, ifr);
+-		break;
+-
+-	case SIOCGMIIPHY:	/* Get address of MII PHY in use. */
+-	case SIOCGMIIREG:	/* Read MII PHY register. */
+-	case SIOCSMIIREG:	/* Write to MII PHY register. */
+-		return e100_mii_ioctl(dev, ifr, cmd);
+-		break;
+-
+-	default:
+-		return -EOPNOTSUPP;
+-	}
+-	return 0;
+-
+-}
+-
+-/**
+- * e100init - initialize the adapter
+- * @bdp: atapter's private data struct
+- *
+- * This routine is called when this driver is loaded. This is the initialization
+- * routine which allocates memory, configures the adapter and determines the
+- * system resources.
+- *
+- * Returns:
+- *      true: if successful
+- *      false: otherwise
+- */
+-static unsigned char __devinit
+-e100_init(struct e100_private *bdp)
+-{
+-	u32 st_timeout = 0;
+-	u32 st_result = 0;
+-	e100_sw_init(bdp);
+-
+-	if (!e100_selftest(bdp, &st_timeout, &st_result)) {
+-        	if (st_timeout) {
+-			printk(KERN_ERR "e100: selftest timeout\n");
+-		} else {
+-			printk(KERN_ERR "e100: selftest failed. Results: %x\n",
+-					st_result);
+-		}
+-		return false;
+-	}
+-	else
+-		printk(KERN_DEBUG "e100: selftest OK.\n");
+-
+-	/* read the MAC address from the eprom */
+-	e100_rd_eaddr(bdp);
+-	if (!is_valid_ether_addr(bdp->device->dev_addr)) {
+-		printk(KERN_ERR "e100: Invalid Ethernet address\n");
+-		return false;
+-	}
+-	/* read NIC's part number */
+-	e100_rd_pwa_no(bdp);
+-
+-	if (!e100_hw_init(bdp))
+-		return false;
+-	/* Interrupts are enabled after device reset */
+-	e100_disable_clear_intr(bdp);
+-
+-	return true;
+-}
+-
+-/**
+- * e100_sw_init - initialize software structs
+- * @bdp: atapter's private data struct
+- * 
+- * This routine initializes all software structures. Sets up the
+- * circular structures for the RFD's & TCB's. Allocates the per board
+- * structure for storing adapter information. The CSR is also memory 
+- * mapped in this routine.
+- *
+- * Returns :
+- *      true: if S/W was successfully initialized
+- *      false: otherwise
+- */
+-static unsigned char __devinit
+-e100_sw_init(struct e100_private *bdp)
+-{
+-	bdp->next_cu_cmd = START_WAIT;	// init the next cu state
+-
+-	/* 
+-	 * Set the value for # of good xmits per underrun. the value assigned
+-	 * here is an intelligent  suggested default. Nothing magical about it.
+-	 */
+-	bdp->tx_per_underrun = DEFAULT_TX_PER_UNDERRUN;
+-
+-	/* get the default transmit threshold value */
+-	bdp->tx_thld = TX_THRSHLD;
+-
+-	/* get the EPROM size */
+-	bdp->eeprom_size = e100_eeprom_size(bdp);
+-
+-	/* Initialize our spinlocks */
+-	spin_lock_init(&(bdp->bd_lock));
+-	spin_lock_init(&(bdp->bd_non_tx_lock));
+-	spin_lock_init(&(bdp->config_lock));
+-	spin_lock_init(&(bdp->mdi_access_lock));
+-	/* Initialize configuration data */
+-	e100_config_init(bdp);
+-
+-	return 1;
+-}
+-
+-static void __devinit
+-e100_tco_workaround(struct e100_private *bdp)
+-{
+-	int i;
+-
+-	/* Do software reset */
+-	e100_sw_reset(bdp, PORT_SOFTWARE_RESET);
+-
+-	/* Do a dummy LOAD CU BASE command. */
+-	/* This gets us out of pre-driver to post-driver. */
+-	e100_exec_cmplx(bdp, 0, SCB_CUC_LOAD_BASE);
+-
+-	/* Wait 20 msec for reset to take effect */
+-	set_current_state(TASK_UNINTERRUPTIBLE);
+-	schedule_timeout(HZ / 50 + 1);
+-
+-	/* disable interrupts since they are enabled */
+-	/* after device reset                        */
+-	e100_disable_clear_intr(bdp);
+-
+-	/* Wait for command to be cleared up to 1 sec */
+-	for (i=0; i<100; i++) {
+-		if (!readb(&bdp->scb->scb_cmd_low))
+-			break;
+-		set_current_state(TASK_UNINTERRUPTIBLE);
+-		schedule_timeout(HZ / 100 + 1);
+-	}
+-
+-	/* Wait for TCO request bit in PMDR register to be clear */
+-	for (i=0; i<50; i++) {
+-		if (!(readb(&bdp->scb->scb_ext.d101m_scb.scb_pmdr) & BIT_1))
+-			break;
+-		set_current_state(TASK_UNINTERRUPTIBLE);
+-		schedule_timeout(HZ / 100 + 1);
+-	}
+-}
+-
+-/**
+- * e100_hw_init - initialized tthe hardware
+- * @bdp: atapter's private data struct
+- *
+- * This routine performs a reset on the adapter, and configures the adapter.
+- * This includes configuring the 82557 LAN controller, validating and setting
+- * the node address, detecting and configuring the Phy chip on the adapter,
+- * and initializing all of the on chip counters.
+- *
+- * Returns:
+- *      true - If the adapter was initialized
+- *      false - If the adapter failed initialization
+- */
+-unsigned char
+-e100_hw_init(struct e100_private *bdp)
+-{
+-	if (!e100_phy_init(bdp))
+-		goto err;
+-
+-	e100_sw_reset(bdp, PORT_SELECTIVE_RESET);
+-
+-	/* Only 82559 or above needs TCO workaround */
+-	if (bdp->rev_id >= D101MA_REV_ID)
+-		e100_tco_workaround(bdp);
+-
+-	/* Load the CU BASE (set to 0, because we use linear mode) */
+-	if (!e100_wait_exec_cmplx(bdp, 0, SCB_CUC_LOAD_BASE, 0))
+-		goto err;
+-
+-	if (!e100_wait_exec_cmplx(bdp, 0, SCB_RUC_LOAD_BASE, 0))
+-		goto err;
+-
+-	/* Load interrupt microcode  */
+-	if (e100_load_microcode(bdp)) {
+-		bdp->flags |= DF_UCODE_LOADED;
+-	}
+-
+-	if ((u8) bdp->rev_id < D101A4_REV_ID)
+-		e100_config_init_82557(bdp);
+-		
+-	if (!e100_config(bdp))
+-		goto err;
+-
+-	if (!e100_setup_iaaddr(bdp, bdp->device->dev_addr))
+-		goto err;
+-
+-	/* Clear the internal counters */
+-	if (!e100_clr_cntrs(bdp))
+-		goto err;
+-
+-	/* Change for 82558 enhancement */
+-	/* If 82558/9 and if the user has enabled flow control, set up the
+-	 * Flow Control Reg. in the CSR */
+-	if ((bdp->flags & IS_BACHELOR)
+-	    && (bdp->params.b_params & PRM_FC)) {
+-		writeb(DFLT_FC_THLD, &bdp->scb->scb_ext.d101_scb.scb_fc_thld);
+-		writeb(DFLT_FC_CMD,
+-		       &bdp->scb->scb_ext.d101_scb.scb_fc_xon_xoff);
+-	}
+-
+-	return true;
+-err:
+-	printk(KERN_ERR "e100: hw init failed\n");
+-	return false;
+-}
+-
+-/**
+- * e100_setup_tcb_pool - setup TCB circular list
+- * @head: Pointer to head of the allocated TCBs
+- * @qlen: Number of elements in the queue
+- * @bdp: atapter's private data struct
+- * 
+- * This routine arranges the contigiously allocated TCB's in a circular list.
+- * Also does the one time initialization of the TCBs.
+- */
+-static void
+-e100_setup_tcb_pool(tcb_t *head, unsigned int qlen, struct e100_private *bdp)
+-{
+-	int ele_no;
+-	tcb_t *pcurr_tcb;	/* point to current tcb */
+-	u32 next_phys;		/* the next phys addr */
+-	u16 txcommand = CB_S_BIT | CB_TX_SF_BIT;
+-
+-	bdp->tx_count = 0;
+-	if (bdp->flags & USE_IPCB) {
+-		txcommand |= CB_IPCB_TRANSMIT | CB_CID_DEFAULT;
+-	} else if (bdp->flags & IS_BACHELOR) {
+-		txcommand |= CB_TRANSMIT | CB_CID_DEFAULT;
+-	} else {
+-		txcommand |= CB_TRANSMIT;
+-	}
+-
+-	for (ele_no = 0, next_phys = bdp->tcb_phys, pcurr_tcb = head;
+-	     ele_no < qlen; ele_no++, pcurr_tcb++) {
+-
+-		/* set the phys addr for this TCB, next_phys has not incr. yet */
+-		pcurr_tcb->tcb_phys = next_phys;
+-		next_phys += sizeof (tcb_t);
+-
+-		/* set the link to next tcb */
+-		if (ele_no == (qlen - 1))
+-			pcurr_tcb->tcb_hdr.cb_lnk_ptr =
+-				cpu_to_le32(bdp->tcb_phys);
+-		else
+-			pcurr_tcb->tcb_hdr.cb_lnk_ptr = cpu_to_le32(next_phys);
+-
+-		pcurr_tcb->tcb_hdr.cb_status = 0;
+-		pcurr_tcb->tcb_hdr.cb_cmd = cpu_to_le16(txcommand);
+-		pcurr_tcb->tcb_cnt = 0;	
+-		pcurr_tcb->tcb_thrshld = bdp->tx_thld;	
+-		if (ele_no < 2) {
+-			pcurr_tcb->tcb_hdr.cb_status =
+-				cpu_to_le16(CB_STATUS_COMPLETE);
+-		}
+-		pcurr_tcb->tcb_tbd_num = 1;
+-
+-		if (bdp->flags & IS_BACHELOR) {
+-			pcurr_tcb->tcb_tbd_ptr =
+-				__constant_cpu_to_le32(0xFFFFFFFF);
+-		} else {
+-			pcurr_tcb->tcb_tbd_ptr =
+-				cpu_to_le32(pcurr_tcb->tcb_phys + 0x10);
+-		}
+-
+-		if (bdp->flags & IS_BACHELOR) {
+-			pcurr_tcb->tcb_tbd_expand_ptr =
+-				cpu_to_le32(pcurr_tcb->tcb_phys + 0x20);
+-		} else {
+-			pcurr_tcb->tcb_tbd_expand_ptr =
+-				cpu_to_le32(pcurr_tcb->tcb_phys + 0x10);
+-		}
+-		pcurr_tcb->tcb_tbd_dflt_ptr = pcurr_tcb->tcb_tbd_ptr;
+-
+-		if (bdp->flags & USE_IPCB) {
+-			pcurr_tcb->tbd_ptr = &(pcurr_tcb->tcbu.tbd_array[1]);
+-			pcurr_tcb->tcbu.ipcb.ip_activation_high =
+-				IPCB_IP_ACTIVATION_DEFAULT;
+-			pcurr_tcb->tcbu.ipcb.vlan = 0;
+-		} else {
+-			pcurr_tcb->tbd_ptr = &(pcurr_tcb->tcbu.tbd_array[0]);
+-		}
+-
+-		pcurr_tcb->tcb_skb = NULL;
+-	}
+-
+-	wmb();
+-}
+-
+-/***************************************************************************/
+-/***************************************************************************/
+-/*       Memory Management Routines                                        */
+-/***************************************************************************/
+-
+-/**
+- * e100_alloc_space - allocate private driver data
+- * @bdp: atapter's private data struct
+- *
+- * This routine allocates memory for the driver. Memory allocated is for the
+- * selftest and statistics structures.
+- *
+- * Returns:
+- *      0: if the operation was successful
+- *      %-ENOMEM: if memory allocation failed
+- */
+-unsigned char __devinit
+-e100_alloc_space(struct e100_private *bdp)
+-{
+-	unsigned long off;
+-
+-	/* allocate all the dma-able structures in one call:
+-	 * selftest results, adapter stats, and non-tx cb commands */
+-	if (!(bdp->dma_able =
+-	      pci_alloc_consistent(bdp->pdev, sizeof (bd_dma_able_t),
+-				   &(bdp->dma_able_phys)))) {
+-		goto err;
+-	}
+-
+-	/* now assign the various pointers into the struct we've just allocated */
+-	off = offsetof(bd_dma_able_t, selftest);
+-
+-	bdp->selftest = (self_test_t *) (bdp->dma_able + off);
+-	bdp->selftest_phys = bdp->dma_able_phys + off;
+-
+-	off = offsetof(bd_dma_able_t, stats_counters);
+-
+-	bdp->stats_counters = (max_counters_t *) (bdp->dma_able + off);
+-	bdp->stat_cnt_phys = bdp->dma_able_phys + off;
+-
+-	return 0;
+-
+-err:
+-	printk(KERN_ERR
+-	       "e100: Failed to allocate memory\n");
+-	return -ENOMEM;
+-}
+-
+-/**
+- * e100_alloc_tcb_pool - allocate TCB circular list
+- * @bdp: atapter's private data struct
+- *
+- * This routine allocates memory for the circular list of transmit descriptors.
+- *
+- * Returns:
+- *       0: if allocation has failed.
+- *       1: Otherwise. 
+- */
+-int
+-e100_alloc_tcb_pool(struct e100_private *bdp)
+-{
+-	int stcb = sizeof (tcb_t) * bdp->params.TxDescriptors;
+-
+-	/* allocate space for the TCBs */
+-	if (!(bdp->tcb_pool.data =
+-	      pci_alloc_consistent(bdp->pdev, stcb, &bdp->tcb_phys)))
+-		return 0;
+-
+-	memset(bdp->tcb_pool.data, 0x00, stcb);
+-
+-	return 1;
+-}
+-
+-void
+-e100_free_tcb_pool(struct e100_private *bdp)
+-{
+-	tcb_t *tcb;
+-	int i;
+-	/* Return tx skbs */ 
+-	for (i = 0; i < bdp->params.TxDescriptors; i++) {
+-	  	tcb = bdp->tcb_pool.data;
+-		tcb += bdp->tcb_pool.head;
+-  		e100_tx_skb_free(bdp, tcb);
+-		if (NEXT_TCB_TOUSE(bdp->tcb_pool.head) == bdp->tcb_pool.tail)
+-		  	break;
+-		bdp->tcb_pool.head = NEXT_TCB_TOUSE(bdp->tcb_pool.head);
+-	}
+-	pci_free_consistent(bdp->pdev,
+-			    sizeof (tcb_t) * bdp->params.TxDescriptors,
+-			    bdp->tcb_pool.data, bdp->tcb_phys);
+-	bdp->tcb_pool.head = 0;
+-	bdp->tcb_pool.tail = 1;	
+-	bdp->tcb_phys = 0;
+-}
+-
+-static void
+-e100_dealloc_space(struct e100_private *bdp)
+-{
+-	if (bdp->dma_able) {
+-		pci_free_consistent(bdp->pdev, sizeof (bd_dma_able_t),
+-				    bdp->dma_able, bdp->dma_able_phys);
+-	}
+-
+-	bdp->selftest_phys = 0;
+-	bdp->stat_cnt_phys = 0;
+-	bdp->dma_able_phys = 0;
+-	bdp->dma_able = 0;
+-}
+-
+-static void
+-e100_free_rfd_pool(struct e100_private *bdp)
+-{
+-	struct rx_list_elem *rx_struct;
+-
+-	while (!list_empty(&(bdp->active_rx_list))) {
+-
+-		rx_struct = list_entry(bdp->active_rx_list.next,
+-				       struct rx_list_elem, list_elem);
+-		list_del(&(rx_struct->list_elem));
+-		pci_unmap_single(bdp->pdev, rx_struct->dma_addr,
+-				 sizeof (rfd_t), PCI_DMA_TODEVICE);
+-		dev_kfree_skb(rx_struct->skb);
+-		kfree(rx_struct);
+-	}
+-
+-	while (!list_empty(&(bdp->rx_struct_pool))) {
+-		rx_struct = list_entry(bdp->rx_struct_pool.next,
+-				       struct rx_list_elem, list_elem);
+-		list_del(&(rx_struct->list_elem));
+-		kfree(rx_struct);
+-	}
+-}
+-
+-/**
+- * e100_alloc_rfd_pool - allocate RFDs
+- * @bdp: atapter's private data struct
+- *
+- * Allocates initial pool of skb which holds both rfd and data,
+- * and return a pointer to the head of the list
+- */
+-static int
+-e100_alloc_rfd_pool(struct e100_private *bdp)
+-{
+-	struct rx_list_elem *rx_struct;
+-	int i;
+-
+-	INIT_LIST_HEAD(&(bdp->active_rx_list));
+-	INIT_LIST_HEAD(&(bdp->rx_struct_pool));
+-	bdp->skb_req = bdp->params.RxDescriptors;
+-	for (i = 0; i < bdp->skb_req; i++) {
+-		rx_struct = kmalloc(sizeof (struct rx_list_elem), GFP_ATOMIC);
+-		list_add(&(rx_struct->list_elem), &(bdp->rx_struct_pool));
+-	}
+-	e100_alloc_skbs(bdp);
+-	return !list_empty(&(bdp->active_rx_list));
+-
+-}
+-
+-void
+-e100_clear_pools(struct e100_private *bdp)
+-{
+-	bdp->last_tcb = NULL;
+-	e100_free_rfd_pool(bdp);
+-	e100_free_tcb_pool(bdp);
+-}
+-
+-/*****************************************************************************/
+-/*****************************************************************************/
+-/*      Run Time Functions                                                   */
+-/*****************************************************************************/
+-
+-/**
+- * e100_watchdog
+- * @dev: adapter's net_device struct
+- *
+- * This routine runs every 2 seconds and updates our statitics and link state,
+- * and refreshs txthld value.
+- */
+-void
+-e100_watchdog(struct net_device *dev)
+-{
+-	struct e100_private *bdp = dev->priv;
+-
+-#ifdef E100_CU_DEBUG
+-	if (e100_cu_unknown_state(bdp)) {
+-		printk(KERN_ERR "e100: %s: CU unknown state in e100_watchdog\n",
+-			dev->name);
+-	}
+-#endif	
+-	if (!netif_running(dev)) {
+-		return;
+-	}
+-
+-	/* check if link state has changed */
+-	if (e100_phy_check(bdp)) {
+-		if (netif_carrier_ok(dev)) {
+-			printk(KERN_ERR
+-			       "e100: %s NIC Link is Up %d Mbps %s duplex\n",
+-			       bdp->device->name, bdp->cur_line_speed,
+-			       (bdp->cur_dplx_mode == HALF_DUPLEX) ?
+-			       "Half" : "Full");
+-
+-			e100_config_fc(bdp);
+-			e100_config(bdp);  
+-
+-		} else {
+-			printk(KERN_ERR "e100: %s NIC Link is Down\n",
+-			       bdp->device->name);
+-		}
+-	}
+-
+-	// toggle the tx queue according to link status
+-	// this also resolves a race condition between tx & non-cu cmd flows
+-	if (netif_carrier_ok(dev)) {
+-		if (netif_running(dev))
+-			netif_wake_queue(dev);
+-	} else {
+-		if (netif_running(dev))
+-			netif_stop_queue(dev);
+-		/* When changing to non-autoneg, device may lose  */
+-		/* link with some switches. e100 will try to      */
+-		/* revover link by sending command to PHY layer   */
+-		if (bdp->params.e100_speed_duplex != E100_AUTONEG)
+-			e100_force_speed_duplex_to_phy(bdp);
+-	}
+-
+-	rmb();
+-
+-	if (e100_update_stats(bdp)) {
+-
+-		/* Check if a change in the IFS parameter is needed,
+-		   and configure the device accordingly */
+-		if (bdp->params.b_params & PRM_IFS)
+-			e100_manage_adaptive_ifs(bdp);
+-
+-		/* Now adjust our dynamic tx threshold value */
+-		e100_refresh_txthld(bdp);
+-
+-		/* Now if we are on a 557 and we havn't received any frames then we
+-		 * should issue a multicast command to reset the RU */
+-		if (bdp->rev_id < D101A4_REV_ID) {
+-			if (!(bdp->stats_counters->basic_stats.rcv_gd_frames)) {
+-				e100_set_multi(dev);
+-			}
+-		}
+-	}
+-	/* Issue command to dump statistics from device.        */
+-	/* Check for command completion on next watchdog timer. */
+-	e100_dump_stats_cntrs(bdp);
+-
+-	wmb();
+-
+-	/* relaunch watchdog timer in 2 sec */
+-	mod_timer(&(bdp->watchdog_timer), jiffies + (2 * HZ));
+-
+-	if (list_empty(&bdp->active_rx_list))
+-		e100_trigger_SWI(bdp);
+-}
+-
+-/**
+- * e100_manage_adaptive_ifs
+- * @bdp: atapter's private data struct
+- *
+- * This routine manages the adaptive Inter-Frame Spacing algorithm
+- * using a state machine.
+- */
+-void
+-e100_manage_adaptive_ifs(struct e100_private *bdp)
+-{
+-	static u16 state_table[9][4] = {	// rows are states
+-		{2, 0, 0, 0},	// state0   // column0: next state if increasing
+-		{2, 0, 5, 30},	// state1   // column1: next state if decreasing
+-		{5, 1, 5, 30},	// state2   // column2: IFS value for 100 mbit
+-		{5, 3, 0, 0},	// state3   // column3: IFS value for 10 mbit
+-		{5, 3, 10, 60},	// state4
+-		{8, 4, 10, 60},	// state5
+-		{8, 6, 0, 0},	// state6
+-		{8, 6, 20, 60},	// state7
+-		{8, 7, 20, 60}	// state8
+-	};
+-
+-	u32 transmits =
+-		le32_to_cpu(bdp->stats_counters->basic_stats.xmt_gd_frames);
+-	u32 collisions =
+-		le32_to_cpu(bdp->stats_counters->basic_stats.xmt_ttl_coll);
+-	u32 state = bdp->ifs_state;
+-	u32 old_value = bdp->ifs_value;
+-	int next_col;
+-	u32 min_transmits;
+-
+-	if (bdp->cur_dplx_mode == FULL_DUPLEX) {
+-		bdp->ifs_state = 0;
+-		bdp->ifs_value = 0;
+-
+-	} else {		/* Half Duplex */
+-		/* Set speed specific parameters */
+-		if (bdp->cur_line_speed == 100) {
+-			next_col = 2;
+-			min_transmits = MIN_NUMBER_OF_TRANSMITS_100;
+-
+-		} else {	/* 10 Mbps */
+-			next_col = 3;
+-			min_transmits = MIN_NUMBER_OF_TRANSMITS_10;
+-		}
+-
+-		if ((transmits / 32 < collisions)
+-		    && (transmits > min_transmits)) {
+-			state = state_table[state][0];	/* increment */
+-
+-		} else if (transmits < min_transmits) {
+-			state = state_table[state][1];	/* decrement */
+-		}
+-
+-		bdp->ifs_value = state_table[state][next_col];
+-		bdp->ifs_state = state;
+-	}
+-
+-	/* If the IFS value has changed, configure the device */
+-	if (bdp->ifs_value != old_value) {
+-		e100_config_ifs(bdp);
+-		e100_config(bdp);
+-	}
+-}
+-
+-/**
+- * e100intr - interrupt handler
+- * @irq: the IRQ number
+- * @dev_inst: the net_device struct
+- * @regs: registers (unused)
+- *
+- * This routine is the ISR for the e100 board. It services
+- * the RX & TX queues & starts the RU if it has stopped due
+- * to no resources.
+- */
+-irqreturn_t
+-e100intr(int irq, void *dev_inst, struct pt_regs *regs)
+-{
+-	struct net_device *dev;
+-	struct e100_private *bdp;
+-	u16 intr_status;
+-
+-	dev = dev_inst;
+-	bdp = dev->priv;
+-
+-	intr_status = readw(&bdp->scb->scb_status);
+-	/* If not my interrupt, just return */
+-	if (!(intr_status & SCB_STATUS_ACK_MASK) || (intr_status == 0xffff)) {
+-		return IRQ_NONE;
+-	}
+-
+-	/* disable and ack intr */
+-	e100_disable_clear_intr(bdp);
+-
+-	/* the device is closed, don't continue or else bad things may happen. */
+-	if (!netif_running(dev)) {
+-		e100_set_intr_mask(bdp);
+-		return IRQ_NONE;
+-	}
+-
+-	/* SWI intr (triggered by watchdog) is signal to allocate new skb buffers */
+-	if (intr_status & SCB_STATUS_ACK_SWI) {
+-		e100_alloc_skbs(bdp);
+-	}
+-
+-	/* do recv work if any */
+-	if (intr_status &
+-	    (SCB_STATUS_ACK_FR | SCB_STATUS_ACK_RNR | SCB_STATUS_ACK_SWI)) 
+-		bdp->drv_stats.rx_intr_pkts += e100_rx_srv(bdp);
+-
+-	/* clean up after tx'ed packets */
+-	if (intr_status & (SCB_STATUS_ACK_CNA | SCB_STATUS_ACK_CX))
+-		e100_tx_srv(bdp);
+-
+-	e100_set_intr_mask(bdp);
+-	return IRQ_HANDLED;
+-}
+-
+-/**
+- * e100_tx_skb_free - free TX skbs resources
+- * @bdp: atapter's private data struct
+- * @tcb: associated tcb of the freed skb
+- *
+- * This routine frees resources of TX skbs.
+- */
+-static inline void
+-e100_tx_skb_free(struct e100_private *bdp, tcb_t *tcb)
+-{
+-	if (tcb->tcb_skb) {
+-		int i;
+-		tbd_t *tbd_arr = tcb->tbd_ptr;
+-		int frags = skb_shinfo(tcb->tcb_skb)->nr_frags;
+-
+-		for (i = 0; i <= frags; i++, tbd_arr++) {
+-			pci_unmap_single(bdp->pdev,
+-					 le32_to_cpu(tbd_arr->tbd_buf_addr),
+-					 le16_to_cpu(tbd_arr->tbd_buf_cnt),
+-					 PCI_DMA_TODEVICE);
+-		}
+-		dev_kfree_skb_irq(tcb->tcb_skb);
+-		tcb->tcb_skb = NULL;
+-	}
+-}
+-
+-/**
+- * e100_tx_srv - service TX queues
+- * @bdp: atapter's private data struct
+- *
+- * This routine services the TX queues. It reclaims the TCB's & TBD's & other
+- * resources used during the transmit of this buffer. It is called from the ISR.
+- * We don't need a tx_lock since we always access buffers which were already
+- * prepared.
+- */
+-void
+-e100_tx_srv(struct e100_private *bdp)
+-{
+-	tcb_t *tcb;
+-	int i;
+-
+-	/* go over at most TxDescriptors buffers */
+-	for (i = 0; i < bdp->params.TxDescriptors; i++) {
+-		tcb = bdp->tcb_pool.data;
+-		tcb += bdp->tcb_pool.head;
+-
+-		rmb();
+-
+-		/* if the buffer at 'head' is not complete, break */
+-		if (!(tcb->tcb_hdr.cb_status &
+-		      __constant_cpu_to_le16(CB_STATUS_COMPLETE)))
+-			break;
+-
+-		/* service next buffer, clear the out of resource condition */
+-		e100_tx_skb_free(bdp, tcb);
+-
+-		if (netif_running(bdp->device))
+-			netif_wake_queue(bdp->device);
+-
+-		/* if we've caught up with 'tail', break */
+-		if (NEXT_TCB_TOUSE(bdp->tcb_pool.head) == bdp->tcb_pool.tail) {
+-			break;
+-		}
+-
+-		bdp->tcb_pool.head = NEXT_TCB_TOUSE(bdp->tcb_pool.head);
+-	}
+-}
+-
+-/**
+- * e100_rx_srv - service RX queue
+- * @bdp: atapter's private data struct
+- * @max_number_of_rfds: max number of RFDs to process
+- * @rx_congestion: flag pointer, to inform the calling function of congestion.
+- *
+- * This routine processes the RX interrupt & services the RX queues.
+- * For each successful RFD, it allocates a new msg block, links that
+- * into the RFD list, and sends the old msg upstream.
+- * The new RFD is then put at the end of the free list of RFD's.
+- * It returns the number of serviced RFDs.
+- */
+-u32
+-e100_rx_srv(struct e100_private *bdp)
+-{
+-	rfd_t *rfd;		/* new rfd, received rfd */
+-	int i;
+-	u16 rfd_status;
+-	struct sk_buff *skb;
+-	struct net_device *dev;
+-	unsigned int data_sz;
+-	struct rx_list_elem *rx_struct;
+-	u32 rfd_cnt = 0;
+-
+-	dev = bdp->device;
+-
+-	/* current design of rx is as following:
+-	 * 1. socket buffer (skb) used to pass network packet to upper layer
+-	 * 2. all HW host memory structures (like RFDs, RBDs and data buffers)
+-	 *    are placed in a skb's data room
+-	 * 3. when rx process is complete, we change skb internal pointers to exclude
+-	 *    from data area all unrelated things (RFD, RDB) and to leave
+-	 *    just rx'ed packet netto
+-	 * 4. for each skb passed to upper layer, new one is allocated instead.
+-	 * 5. if no skb left, in 2 sec another atempt to allocate skbs will be made
+-	 *    (watchdog trigger SWI intr and isr should allocate new skbs)
+-	 */
+-	for (i = 0; i < bdp->params.RxDescriptors; i++) {
+-		if (list_empty(&(bdp->active_rx_list))) {
+-			break;
+-		}
+-
+-		rx_struct = list_entry(bdp->active_rx_list.next,
+-				       struct rx_list_elem, list_elem);
+-		skb = rx_struct->skb;
+-
+-		rfd = RFD_POINTER(skb, bdp);	/* locate RFD within skb */
+-
+-		// sync only the RFD header
+-		pci_dma_sync_single(bdp->pdev, rx_struct->dma_addr,
+-				    bdp->rfd_size, PCI_DMA_FROMDEVICE);
+-		rfd_status = le16_to_cpu(rfd->rfd_header.cb_status);	/* get RFD's status */
+-		if (!(rfd_status & RFD_STATUS_COMPLETE))	/* does not contains data yet - exit */
+-			break;
+-
+-		/* to allow manipulation with current skb we need to unlink it */
+-		list_del(&(rx_struct->list_elem));
+-
+-		/* do not free & unmap badly received packet.
+-		 * move it to the end of skb list for reuse */
+-		if (!(rfd_status & RFD_STATUS_OK)) {
+-			e100_add_skb_to_end(bdp, rx_struct);
+-			continue;
+-		}
+-
+-		data_sz = min_t(u16, (le16_to_cpu(rfd->rfd_act_cnt) & 0x3fff),
+-				(sizeof (rfd_t) - bdp->rfd_size));
+-
+-		/* now sync all the data */
+-		pci_dma_sync_single(bdp->pdev, rx_struct->dma_addr,
+-				    (data_sz + bdp->rfd_size),
+-				    PCI_DMA_FROMDEVICE);
+-
+-		pci_unmap_single(bdp->pdev, rx_struct->dma_addr,
+-				 sizeof (rfd_t), PCI_DMA_FROMDEVICE);
+-
+-		list_add(&(rx_struct->list_elem), &(bdp->rx_struct_pool));
+-
+-		/* end of dma access to rfd */
+-		bdp->skb_req++;	/* incr number of requested skbs */
+-		e100_alloc_skbs(bdp);	/* and get them */
+-
+-		/* set packet size, excluding checksum (2 last bytes) if it is present */
+-		if ((bdp->flags & DF_CSUM_OFFLOAD)
+-		    && (bdp->rev_id < D102_REV_ID))
+-			skb_put(skb, (int) data_sz - 2);
+-		else
+-			skb_put(skb, (int) data_sz);
+-
+-		/* set the protocol */
+-		skb->protocol = eth_type_trans(skb, dev);
+-
+-		/* set the checksum info */
+-		if (bdp->flags & DF_CSUM_OFFLOAD) {
+-			if (bdp->rev_id >= D102_REV_ID) {
+-				skb->ip_summed = e100_D102_check_checksum(rfd);
+-			} else {
+-				skb->ip_summed = e100_D101M_checksum(bdp, skb);
+-			}
+-		} else {
+-			skb->ip_summed = CHECKSUM_NONE;
+-		}
+-
+-		bdp->drv_stats.net_stats.rx_bytes += skb->len;
+-
+-		if(bdp->vlgrp && (rfd_status & CB_STATUS_VLAN)) {
+-			vlan_hwaccel_rx(skb, bdp->vlgrp, be16_to_cpu(rfd->vlanid));
+-		} else {
+-			netif_rx(skb);
+-		}
+-		dev->last_rx = jiffies;
+-		
+-		rfd_cnt++;
+-	}			/* end of rfd loop */
+-
+-	/* restart the RU if it has stopped */
+-	if ((readw(&bdp->scb->scb_status) & SCB_RUS_MASK) != SCB_RUS_READY) {
+-		e100_start_ru(bdp);
+-	}
+-
+-	return rfd_cnt;
+-}
+-
+-void
+-e100_refresh_txthld(struct e100_private *bdp)
+-{
+-	basic_cntr_t *pstat = &(bdp->stats_counters->basic_stats);
+-
+-	/* as long as tx_per_underrun is not 0, we can go about dynamically *
+-	 * adjusting the xmit threshold. we stop doing that & resort to defaults
+-	 * * once the adjustments become meaningless. the value is adjusted by *
+-	 * dumping the error counters & checking the # of xmit underrun errors *
+-	 * we've had. */
+-	if (bdp->tx_per_underrun) {
+-		/* We are going to last values dumped from the dump statistics
+-		 * command */
+-		if (le32_to_cpu(pstat->xmt_gd_frames)) {
+-			if (le32_to_cpu(pstat->xmt_uruns)) {
+-				/* 
+-				 * if we have had more than one underrun per "DEFAULT #
+-				 * OF XMITS ALLOWED PER UNDERRUN" good xmits, raise the
+-				 * THRESHOLD.
+-				 */
+-				if ((le32_to_cpu(pstat->xmt_gd_frames) /
+-				     le32_to_cpu(pstat->xmt_uruns)) <
+-				    bdp->tx_per_underrun) {
+-					bdp->tx_thld += 3;
+-				}
+-			}
+-
+-			/* 
+-			 * if we've had less than one underrun per the DEFAULT number of
+-			 * of good xmits allowed, lower the THOLD but not less than 0 
+-			 */
+-			if (le32_to_cpu(pstat->xmt_gd_frames) >
+-			    bdp->tx_per_underrun) {
+-				bdp->tx_thld--;
+-
+-				if (bdp->tx_thld < 6)
+-					bdp->tx_thld = 6;
+-
+-			}
+-		}
+-
+-		/* end good xmits */
+-		/* 
+-		 * * if our adjustments are becoming unresonable, stop adjusting &
+-		 * resort * to defaults & pray. A THOLD value > 190 means that the
+-		 * adapter will * wait for 190*8=1520 bytes in TX FIFO before it
+-		 * starts xmit. Since * MTU is 1514, it doesn't make any sense for
+-		 * further increase. */
+-		if (bdp->tx_thld >= 190) {
+-			bdp->tx_per_underrun = 0;
+-			bdp->tx_thld = 189;
+-		}
+-	}			/* end underrun check */
+-}
+-
+-/**
+- * e100_prepare_xmit_buff - prepare a buffer for transmission
+- * @bdp: atapter's private data struct
+- * @skb: skb to send
+- *
+- * This routine prepare a buffer for transmission. It checks
+- * the message length for the appropiate size. It picks up a
+- * free tcb from the TCB pool and sets up the corresponding
+- * TBD's. If the number of fragments are more than the number
+- * of TBD/TCB it copies all the fragments in a coalesce buffer.
+- * It returns a pointer to the prepared TCB.
+- */
+-static inline tcb_t *
+-e100_prepare_xmit_buff(struct e100_private *bdp, struct sk_buff *skb)
+-{
+-	tcb_t *tcb, *prev_tcb;
+-
+-	tcb = bdp->tcb_pool.data;
+-	tcb += TCB_TO_USE(bdp->tcb_pool);
+-
+-	if (bdp->flags & USE_IPCB) {
+-		tcb->tcbu.ipcb.ip_activation_high = IPCB_IP_ACTIVATION_DEFAULT;
+-		tcb->tcbu.ipcb.ip_schedule &= ~IPCB_TCP_PACKET;
+-		tcb->tcbu.ipcb.ip_schedule &= ~IPCB_TCPUDP_CHECKSUM_ENABLE;
+-	}
+-
+-	if(bdp->vlgrp && vlan_tx_tag_present(skb)) {
+-		(tcb->tcbu).ipcb.ip_activation_high |= IPCB_INSERTVLAN_ENABLE;
+-		(tcb->tcbu).ipcb.vlan = cpu_to_be16(vlan_tx_tag_get(skb));
+-	}
+-	
+-	tcb->tcb_hdr.cb_status = 0;
+-	tcb->tcb_thrshld = bdp->tx_thld;
+-	tcb->tcb_hdr.cb_cmd |= __constant_cpu_to_le16(CB_S_BIT);
+-
+-	/* Set I (Interrupt) bit on every (TX_FRAME_CNT)th packet */
+-	if (!(++bdp->tx_count % TX_FRAME_CNT))
+-		tcb->tcb_hdr.cb_cmd |= __constant_cpu_to_le16(CB_I_BIT);
+-	else
+-		/* Clear I bit on other packets */
+-		tcb->tcb_hdr.cb_cmd &= ~__constant_cpu_to_le16(CB_I_BIT);
+-
+-	tcb->tcb_skb = skb;
+-
+-	if (skb->ip_summed == CHECKSUM_HW) {
+-		const struct iphdr *ip = skb->nh.iph;
+-
+-		if ((ip->protocol == IPPROTO_TCP) ||
+-		    (ip->protocol == IPPROTO_UDP)) {
+-
+-			tcb->tcbu.ipcb.ip_activation_high |=
+-				IPCB_HARDWAREPARSING_ENABLE;
+-			tcb->tcbu.ipcb.ip_schedule |=
+-				IPCB_TCPUDP_CHECKSUM_ENABLE;
+-
+-			if (ip->protocol == IPPROTO_TCP)
+-				tcb->tcbu.ipcb.ip_schedule |= IPCB_TCP_PACKET;
+-		}
+-	}
+-
+-	if (!skb_shinfo(skb)->nr_frags) {
+-		(tcb->tbd_ptr)->tbd_buf_addr =
+-			cpu_to_le32(pci_map_single(bdp->pdev, skb->data,
+-						   skb->len, PCI_DMA_TODEVICE));
+-		(tcb->tbd_ptr)->tbd_buf_cnt = cpu_to_le16(skb->len);
+-		tcb->tcb_tbd_num = 1;
+-		tcb->tcb_tbd_ptr = tcb->tcb_tbd_dflt_ptr;
+-	} else {
+-		int i;
+-		void *addr;
+-		tbd_t *tbd_arr_ptr = &(tcb->tbd_ptr[1]);
+-		skb_frag_t *frag = &skb_shinfo(skb)->frags[0];
+-
+-		(tcb->tbd_ptr)->tbd_buf_addr =
+-			cpu_to_le32(pci_map_single(bdp->pdev, skb->data,
+-						   skb_headlen(skb),
+-						   PCI_DMA_TODEVICE));
+-		(tcb->tbd_ptr)->tbd_buf_cnt =
+-			cpu_to_le16(skb_headlen(skb));
+-
+-		for (i = 0; i < skb_shinfo(skb)->nr_frags;
+-		     i++, tbd_arr_ptr++, frag++) {
+-
+-			addr = ((void *) page_address(frag->page) +
+-				frag->page_offset);
+-
+-			tbd_arr_ptr->tbd_buf_addr =
+-				cpu_to_le32(pci_map_single(bdp->pdev,
+-							   addr, frag->size,
+-							   PCI_DMA_TODEVICE));
+-			tbd_arr_ptr->tbd_buf_cnt = cpu_to_le16(frag->size);
+-		}
+-		tcb->tcb_tbd_num = skb_shinfo(skb)->nr_frags + 1;
+-		tcb->tcb_tbd_ptr = tcb->tcb_tbd_expand_ptr;
+-	}
+-
+-	/* clear the S-BIT on the previous tcb */
+-	prev_tcb = bdp->tcb_pool.data;
+-	prev_tcb += PREV_TCB_USED(bdp->tcb_pool);
+-	prev_tcb->tcb_hdr.cb_cmd &= __constant_cpu_to_le16((u16) ~CB_S_BIT);
+-
+-	bdp->tcb_pool.tail = NEXT_TCB_TOUSE(bdp->tcb_pool.tail);
+-
+-	wmb();
+-
+-	e100_start_cu(bdp, tcb);
+-
+-	return tcb;
+-}
+-
+-/* Changed for 82558 enhancement */
+-/**
+- * e100_start_cu - start the adapter's CU
+- * @bdp: atapter's private data struct
+- * @tcb: TCB to be transmitted
+- *
+- * This routine issues a CU Start or CU Resume command to the 82558/9.
+- * This routine was added because the prepare_ext_xmit_buff takes advantage
+- * of the 82558/9's Dynamic TBD chaining feature and has to start the CU as
+- * soon as the first TBD is ready. 
+- *
+- * e100_start_cu must be called while holding the tx_lock ! 
+- */
+-u8
+-e100_start_cu(struct e100_private *bdp, tcb_t *tcb)
+-{
+-	unsigned long lock_flag;
+-	u8 ret = true;
+-
+-	spin_lock_irqsave(&(bdp->bd_lock), lock_flag);
+-	switch (bdp->next_cu_cmd) {
+-	case RESUME_NO_WAIT:
+-		/*last cu command was a CU_RESMUE if this is a 558 or newer we don't need to
+-		 * wait for command word to clear, we reach here only if we are bachlor
+-		 */
+-		e100_exec_cmd(bdp, SCB_CUC_RESUME);
+-		break;
+-
+-	case RESUME_WAIT:
+-		if ((bdp->flags & IS_ICH) &&
+-		    (bdp->cur_line_speed == 10) &&
+-		    (bdp->cur_dplx_mode == HALF_DUPLEX)) {
+-			e100_wait_exec_simple(bdp, SCB_CUC_NOOP);
+-			udelay(1);
+-		}
+-		if ((e100_wait_exec_simple(bdp, SCB_CUC_RESUME)) &&
+-		    (bdp->flags & IS_BACHELOR) && (!(bdp->flags & IS_ICH))) {
+-			bdp->next_cu_cmd = RESUME_NO_WAIT;
+-		}
+-		break;
+-
+-	case START_WAIT:
+-		// The last command was a non_tx CU command
+-		if (!e100_wait_cus_idle(bdp))
+-			printk(KERN_DEBUG
+-			       "e100: %s: cu_start: timeout waiting for cu\n",
+-			       bdp->device->name);
+-		if (!e100_wait_exec_cmplx(bdp, (u32) (tcb->tcb_phys),
+-					  SCB_CUC_START, CB_TRANSMIT)) {
+-			printk(KERN_DEBUG
+-			       "e100: %s: cu_start: timeout waiting for scb\n",
+-			       bdp->device->name);
+-			e100_exec_cmplx(bdp, (u32) (tcb->tcb_phys),
+-					SCB_CUC_START);
+-			ret = false;
+-		}
+-
+-		bdp->next_cu_cmd = RESUME_WAIT;
+-
+-		break;
+-	}
+-
+-	/* save the last tcb */
+-	bdp->last_tcb = tcb;
+-
+-	spin_unlock_irqrestore(&(bdp->bd_lock), lock_flag);
+-	return ret;
+-}
+-
+-/* ====================================================================== */
+-/* hw                                                                     */
+-/* ====================================================================== */
+-
+-/**
+- * e100_selftest - perform H/W self test
+- * @bdp: atapter's private data struct
+- * @st_timeout: address to return timeout value, if fails
+- * @st_result: address to return selftest result, if fails
+- *
+- * This routine will issue PORT Self-test command to test the e100.
+- * The self-test will fail if the adapter's master-enable bit is not
+- * set in the PCI Command Register, or if the adapter is not seated
+- * in a PCI master-enabled slot. we also disable interrupts when the
+- * command is completed.
+- *
+- * Returns:
+- *      true: if adapter passes self_test
+- *      false: otherwise
+- */
+-unsigned char
+-e100_selftest(struct e100_private *bdp, u32 *st_timeout, u32 *st_result)
+-{
+-	u32 selftest_cmd;
+-
+-	/* initialize the nic state before running test */
+-	e100_sw_reset(bdp, PORT_SOFTWARE_RESET);
+-	/* Setup the address of the self_test area */
+-	selftest_cmd = bdp->selftest_phys;
+-
+-	/* Setup SELF TEST Command Code in D3 - D0 */
+-	selftest_cmd |= PORT_SELFTEST;
+-
+-	/* Initialize the self-test signature and results DWORDS */
+-	bdp->selftest->st_sign = 0;
+-	bdp->selftest->st_result = 0xffffffff;
+-
+-	/* Do the port command */
+-	writel(selftest_cmd, &bdp->scb->scb_port);
+-	readw(&(bdp->scb->scb_status));	/* flushes last write, read-safe */
+-
+-	/* Wait at least 10 milliseconds for the self-test to complete */
+-	set_current_state(TASK_UNINTERRUPTIBLE);
+-	schedule_timeout(HZ / 100 + 1);
+-
+-	/* disable interrupts since they are enabled */
+-	/* after device reset during selftest        */
+-	e100_disable_clear_intr(bdp);
+-
+-	/* if The First Self Test DWORD Still Zero, We've timed out. If the
+-	 * second DWORD is not zero then we have an error. */
+-	if ((bdp->selftest->st_sign == 0) || (bdp->selftest->st_result != 0)) {
+-
+-		if (st_timeout)
+-			*st_timeout = !(le32_to_cpu(bdp->selftest->st_sign));
+-
+-		if (st_result)
+-			*st_result = le32_to_cpu(bdp->selftest->st_result);
+-
+-		return false;
+-	}
+-
+-	return true;
+-}
+-
+-/**
+- * e100_setup_iaaddr - issue IA setup sommand
+- * @bdp: atapter's private data struct
+- * @eaddr: new ethernet address
+- *
+- * This routine will issue the IA setup command. This command
+- * will notify the 82557 (e100) of what its individual (node)
+- * address is. This command will be executed in polled mode.
+- *
+- * Returns:
+- *      true: if the IA setup command was successfully issued and completed
+- *      false: otherwise
+- */
+-unsigned char
+-e100_setup_iaaddr(struct e100_private *bdp, u8 *eaddr)
+-{
+-	unsigned int i;
+-	cb_header_t *ntcb_hdr;
+-	unsigned char res;
+-	nxmit_cb_entry_t *cmd;
+-
+-	if ((cmd = e100_alloc_non_tx_cmd(bdp)) == NULL) {
+-		res = false;
+-		goto exit;
+-	}
+-
+-	ntcb_hdr = (cb_header_t *) cmd->non_tx_cmd;
+-	ntcb_hdr->cb_cmd = __constant_cpu_to_le16(CB_IA_ADDRESS);
+-
+-	for (i = 0; i < ETH_ALEN; i++) {
+-		(cmd->non_tx_cmd)->ntcb.setup.ia_addr[i] = eaddr[i];
+-	}
+-
+-	res = e100_exec_non_cu_cmd(bdp, cmd);
+-	if (!res)
+-		printk(KERN_WARNING "e100: %s: IA setup failed\n", 
+-		       bdp->device->name);
+-
+-exit:
+-	return res;
+-}
+-
+-/**
+- * e100_start_ru - start the RU if needed
+- * @bdp: atapter's private data struct
+- *
+- * This routine checks the status of the 82557's receive unit(RU),
+- * and starts the RU if it was not already active.  However,
+- * before restarting the RU, the driver gives the RU the buffers
+- * it freed up during the servicing of the ISR. If there are
+- * no free buffers to give to the RU, (i.e. we have reached a
+- * no resource condition) the RU will not be started till the
+- * next ISR.
+- */
+-void
+-e100_start_ru(struct e100_private *bdp)
+-{
+-	struct rx_list_elem *rx_struct = NULL;
+-	int buffer_found = 0;
+-	struct list_head *entry_ptr;
+-
+-	list_for_each(entry_ptr, &(bdp->active_rx_list)) {
+-		rx_struct =
+-			list_entry(entry_ptr, struct rx_list_elem, list_elem);
+-		pci_dma_sync_single(bdp->pdev, rx_struct->dma_addr,
+-				    bdp->rfd_size, PCI_DMA_FROMDEVICE);
+-		if (!((SKB_RFD_STATUS(rx_struct->skb, bdp) &
+-		       __constant_cpu_to_le16(RFD_STATUS_COMPLETE)))) {
+-			buffer_found = 1;
+-			break;
+-		}
+-	}
+-
+-	/* No available buffers */
+-	if (!buffer_found) {
+-		return;
+-	}
+-
+-	spin_lock(&bdp->bd_lock);
+-
+-	if (!e100_wait_exec_cmplx(bdp, rx_struct->dma_addr, SCB_RUC_START, 0)) {
+-		printk(KERN_DEBUG
+-		       "e100: %s: start_ru: wait_scb failed\n", 
+-		       bdp->device->name);
+-		e100_exec_cmplx(bdp, rx_struct->dma_addr, SCB_RUC_START);
+-	}
+-	if (bdp->next_cu_cmd == RESUME_NO_WAIT) {
+-		bdp->next_cu_cmd = RESUME_WAIT;
+-	}
+-	spin_unlock(&bdp->bd_lock);
+-}
+-
+-/**
+- * e100_cmd_complete_location
+- * @bdp: atapter's private data struct
+- *
+- * This routine returns a pointer to the location of the command-complete
+- * DWord in the dump statistical counters area, according to the statistical
+- * counters mode (557 - basic, 558 - extended, or 559 - TCO mode).
+- * See e100_config_init() for the setting of the statistical counters mode.
+- */
+-static u32 *
+-e100_cmd_complete_location(struct e100_private *bdp)
+-{
+-	u32 *cmd_complete;
+-	max_counters_t *stats = bdp->stats_counters;
+-
+-	switch (bdp->stat_mode) {
+-	case E100_EXTENDED_STATS:
+-		cmd_complete =
+-			(u32 *) &(((err_cntr_558_t *) (stats))->cmd_complete);
+-		break;
+-
+-	case E100_TCO_STATS:
+-		cmd_complete =
+-			(u32 *) &(((err_cntr_559_t *) (stats))->cmd_complete);
+-		break;
+-
+-	case E100_BASIC_STATS:
+-	default:		
+-		cmd_complete =
+-			(u32 *) &(((err_cntr_557_t *) (stats))->cmd_complete);
+-		break;
+-	}
+-
+-	return cmd_complete;
+-}
+-
+-/**
+- * e100_clr_cntrs - clear statistics counters
+- * @bdp: atapter's private data struct
+- *
+- * This routine will clear the adapter error statistic counters.
+- *
+- * Returns:
+- *      true: if successfully cleared stat counters
+- *      false: otherwise
+- */
+-static unsigned char __devinit
+-e100_clr_cntrs(struct e100_private *bdp)
+-{
+-	volatile u32 *pcmd_complete;
+-
+-	/* clear the dump counter complete word */
+-	pcmd_complete = e100_cmd_complete_location(bdp);
+-	*pcmd_complete = 0;
+-	wmb();
+-
+-	if (!e100_wait_exec_cmplx(bdp, bdp->stat_cnt_phys, SCB_CUC_DUMP_ADDR, 0))
+-		return false;
+-
+-	/* wait 10 microseconds for the command to complete */
+-	udelay(10);
+-
+-	if (!e100_wait_exec_simple(bdp, SCB_CUC_DUMP_RST_STAT))
+-		return false;
+-
+-	if (bdp->next_cu_cmd == RESUME_NO_WAIT) {
+-		bdp->next_cu_cmd = RESUME_WAIT;
+-	}
+-
+-	return true;
+-}
+-
+-static unsigned char
+-e100_update_stats(struct e100_private *bdp)
+-{
+-	u32 *pcmd_complete;
+-	basic_cntr_t *pstat = &(bdp->stats_counters->basic_stats);
+-
+-	// check if last dump command completed
+-	pcmd_complete = e100_cmd_complete_location(bdp);
+-	if (*pcmd_complete != le32_to_cpu(DUMP_RST_STAT_COMPLETED) &&
+-	    *pcmd_complete != le32_to_cpu(DUMP_STAT_COMPLETED)) {
+-		*pcmd_complete = 0;
+-		return false;
+-	}
+-
+-	/* increment the statistics */
+-	bdp->drv_stats.net_stats.rx_packets +=
+-		le32_to_cpu(pstat->rcv_gd_frames);
+-	bdp->drv_stats.net_stats.tx_packets +=
+-		le32_to_cpu(pstat->xmt_gd_frames);
+-	bdp->drv_stats.net_stats.rx_dropped += le32_to_cpu(pstat->rcv_rsrc_err);
+-	bdp->drv_stats.net_stats.collisions += le32_to_cpu(pstat->xmt_ttl_coll);
+-	bdp->drv_stats.net_stats.rx_length_errors +=
+-		le32_to_cpu(pstat->rcv_shrt_frames);
+-	bdp->drv_stats.net_stats.rx_over_errors +=
+-		le32_to_cpu(pstat->rcv_rsrc_err);
+-	bdp->drv_stats.net_stats.rx_crc_errors +=
+-		le32_to_cpu(pstat->rcv_crc_errs);
+-	bdp->drv_stats.net_stats.rx_frame_errors +=
+-		le32_to_cpu(pstat->rcv_algn_errs);
+-	bdp->drv_stats.net_stats.rx_fifo_errors +=
+-		le32_to_cpu(pstat->rcv_oruns);
+-	bdp->drv_stats.net_stats.tx_aborted_errors +=
+-		le32_to_cpu(pstat->xmt_max_coll);
+-	bdp->drv_stats.net_stats.tx_carrier_errors +=
+-		le32_to_cpu(pstat->xmt_lost_crs);
+-	bdp->drv_stats.net_stats.tx_fifo_errors +=
+-		le32_to_cpu(pstat->xmt_uruns);
+-
+-	bdp->drv_stats.tx_late_col += le32_to_cpu(pstat->xmt_late_coll);
+-	bdp->drv_stats.tx_ok_defrd += le32_to_cpu(pstat->xmt_deferred);
+-	bdp->drv_stats.tx_one_retry += le32_to_cpu(pstat->xmt_sngl_coll);
+-	bdp->drv_stats.tx_mt_one_retry += le32_to_cpu(pstat->xmt_mlt_coll);
+-	bdp->drv_stats.rcv_cdt_frames += le32_to_cpu(pstat->rcv_err_coll);
+-
+-	if (bdp->stat_mode != E100_BASIC_STATS) {
+-		ext_cntr_t *pex_stat = &bdp->stats_counters->extended_stats;
+-
+-		bdp->drv_stats.xmt_fc_pkts +=
+-			le32_to_cpu(pex_stat->xmt_fc_frames);
+-		bdp->drv_stats.rcv_fc_pkts +=
+-			le32_to_cpu(pex_stat->rcv_fc_frames);
+-		bdp->drv_stats.rcv_fc_unsupported +=
+-			le32_to_cpu(pex_stat->rcv_fc_unsupported);
+-	}
+-
+-	if (bdp->stat_mode == E100_TCO_STATS) {
+-		tco_cntr_t *ptco_stat = &bdp->stats_counters->tco_stats;
+-
+-		bdp->drv_stats.xmt_tco_pkts +=
+-			le16_to_cpu(ptco_stat->xmt_tco_frames);
+-		bdp->drv_stats.rcv_tco_pkts +=
+-			le16_to_cpu(ptco_stat->rcv_tco_frames);
+-	}
+-
+-	*pcmd_complete = 0;
+-	return true;
+-}
+-
+-/**
+- * e100_dump_stat_cntrs
+- * @bdp: atapter's private data struct
+- *
+- * This routine will dump the board statistical counters without waiting
+- * for stat_dump to complete. Any access to this stats should verify the completion
+- * of the command
+- */
+-void
+-e100_dump_stats_cntrs(struct e100_private *bdp)
+-{
+-	unsigned long lock_flag_bd;
+-
+-	spin_lock_irqsave(&(bdp->bd_lock), lock_flag_bd);
+-
+-	/* dump h/w stats counters */
+-	if (e100_wait_exec_simple(bdp, SCB_CUC_DUMP_RST_STAT)) {
+-		if (bdp->next_cu_cmd == RESUME_NO_WAIT) {
+-			bdp->next_cu_cmd = RESUME_WAIT;
+-		}
+-	}
+-
+-	spin_unlock_irqrestore(&(bdp->bd_lock), lock_flag_bd);
+-}
+-
+-/**
+- * e100_exec_non_cu_cmd
+- * @bdp: atapter's private data struct
+- * @command: the non-cu command to execute
+- *
+- * This routine will submit a command block to be executed,
+- */
+-unsigned char
+-e100_exec_non_cu_cmd(struct e100_private *bdp, nxmit_cb_entry_t *command)
+-{
+-	cb_header_t *ntcb_hdr;
+-	unsigned long lock_flag;
+-	unsigned long expiration_time;
+-	unsigned char rc = true;
+-	u8 sub_cmd;
+-
+-	ntcb_hdr = (cb_header_t *) command->non_tx_cmd;	/* get hdr of non tcb cmd */
+-	sub_cmd = cpu_to_le16(ntcb_hdr->cb_cmd);
+-
+-	/* Set the Command Block to be the last command block */
+-	ntcb_hdr->cb_cmd |= __constant_cpu_to_le16(CB_EL_BIT);
+-	ntcb_hdr->cb_status = 0;
+-	ntcb_hdr->cb_lnk_ptr = 0;
+-
+-	wmb();
+-	if (in_interrupt())
+-		return e100_delayed_exec_non_cu_cmd(bdp, command);
+-
+-	if (netif_running(bdp->device) && netif_carrier_ok(bdp->device))
+-		return e100_delayed_exec_non_cu_cmd(bdp, command);
+-
+-	spin_lock_bh(&(bdp->bd_non_tx_lock));
+-
+-	if (bdp->non_tx_command_state != E100_NON_TX_IDLE) {
+-		goto delayed_exec;
+-	}
+-
+-	if (bdp->last_tcb) {
+-		rmb();
+-		if ((bdp->last_tcb->tcb_hdr.cb_status &
+-		     __constant_cpu_to_le16(CB_STATUS_COMPLETE)) == 0)
+-			goto delayed_exec;
+-	}
+-
+-	if ((readw(&bdp->scb->scb_status) & SCB_CUS_MASK) == SCB_CUS_ACTIVE) {
+-		goto delayed_exec;
+-	}
+-
+-	spin_lock_irqsave(&bdp->bd_lock, lock_flag);
+-
+-	if (!e100_wait_exec_cmplx(bdp, command->dma_addr, SCB_CUC_START, sub_cmd)) {
+-		spin_unlock_irqrestore(&(bdp->bd_lock), lock_flag);
+-		rc = false;
+-		goto exit;
+-	}
+-
+-	bdp->next_cu_cmd = START_WAIT;
+-	spin_unlock_irqrestore(&(bdp->bd_lock), lock_flag);
+-
+-	/* now wait for completion of non-cu CB up to 20 msec */
+-	expiration_time = jiffies + HZ / 50 + 1;
+-	rmb();
+-	while (!(ntcb_hdr->cb_status &
+-		     __constant_cpu_to_le16(CB_STATUS_COMPLETE))) {
+-
+-		if (time_before(jiffies, expiration_time)) {
+-			spin_unlock_bh(&(bdp->bd_non_tx_lock));
+-			yield();
+-			spin_lock_bh(&(bdp->bd_non_tx_lock));
+-		} else {
+-#ifdef E100_CU_DEBUG			
+-			printk(KERN_ERR "e100: %s: non-TX command (%x) "
+-				"timeout\n", bdp->device->name, sub_cmd);
+-#endif			
+-			rc = false;
+-			goto exit;
+-		}
+-		rmb();
+-	}
+-
+-exit:
+-	e100_free_non_tx_cmd(bdp, command);
+-
+-	if (netif_running(bdp->device))
+-		netif_wake_queue(bdp->device);
+-
+-	spin_unlock_bh(&(bdp->bd_non_tx_lock));
+-	return rc;
+-
+-delayed_exec:
+-	spin_unlock_bh(&(bdp->bd_non_tx_lock));
+-	return e100_delayed_exec_non_cu_cmd(bdp, command);
+-}
+-
+-/**
+- * e100_sw_reset
+- * @bdp: atapter's private data struct
+- * @reset_cmd: s/w reset or selective reset
+- *
+- * This routine will issue a software reset to the adapter. It 
+- * will also disable interrupts, as the are enabled after reset.
+- */
+-void
+-e100_sw_reset(struct e100_private *bdp, u32 reset_cmd)
+-{
+-	/* Do  a selective reset first to avoid a potential PCI hang */
+-	writel(PORT_SELECTIVE_RESET, &bdp->scb->scb_port);
+-	readw(&(bdp->scb->scb_status));	/* flushes last write, read-safe */
+-
+-	/* wait for the reset to take effect */
+-	udelay(20);
+-	if (reset_cmd == PORT_SOFTWARE_RESET) {
+-		writel(PORT_SOFTWARE_RESET, &bdp->scb->scb_port);
+-
+-		/* wait 20 micro seconds for the reset to take effect */
+-		udelay(20);
+-	}
+-
+-	/* Mask off our interrupt line -- it is unmasked after reset */
+-	e100_disable_clear_intr(bdp);
+-#ifdef E100_CU_DEBUG	
+-	bdp->last_cmd = 0;
+-	bdp->last_sub_cmd = 0;
+-#endif	
+-}
+-
+-/**
+- * e100_load_microcode - Download microsocde to controller.
+- * @bdp: atapter's private data struct
+- *
+- * This routine downloads microcode on to the controller. This
+- * microcode is available for the 82558/9, 82550. Currently the
+- * microcode handles interrupt bundling and TCO workaround.
+- *
+- * Returns:
+- *      true: if successfull
+- *      false: otherwise
+- */
+-static unsigned char
+-e100_load_microcode(struct e100_private *bdp)
+-{
+-	static struct {
+-		u8 rev_id;
+-		u32 ucode[UCODE_MAX_DWORDS + 1];
+-		int timer_dword;
+-		int bundle_dword;
+-		int min_size_dword;
+-	} ucode_opts[] = {
+-		{ D101A4_REV_ID,
+-		  D101_A_RCVBUNDLE_UCODE,
+-		  D101_CPUSAVER_TIMER_DWORD,
+-		  D101_CPUSAVER_BUNDLE_DWORD,
+-		  D101_CPUSAVER_MIN_SIZE_DWORD },
+-		{ D101B0_REV_ID,
+-		  D101_B0_RCVBUNDLE_UCODE,
+-		  D101_CPUSAVER_TIMER_DWORD,
+-		  D101_CPUSAVER_BUNDLE_DWORD,
+-		  D101_CPUSAVER_MIN_SIZE_DWORD },
+-		{ D101MA_REV_ID,
+-		  D101M_B_RCVBUNDLE_UCODE,
+-		  D101M_CPUSAVER_TIMER_DWORD,
+-		  D101M_CPUSAVER_BUNDLE_DWORD,
+-		  D101M_CPUSAVER_MIN_SIZE_DWORD },
+-		{ D101S_REV_ID,
+-		  D101S_RCVBUNDLE_UCODE,
+-		  D101S_CPUSAVER_TIMER_DWORD,
+-		  D101S_CPUSAVER_BUNDLE_DWORD,
+-		  D101S_CPUSAVER_MIN_SIZE_DWORD },
+-		{ D102_REV_ID,
+-		  D102_B_RCVBUNDLE_UCODE,
+-		  D102_B_CPUSAVER_TIMER_DWORD,
+-		  D102_B_CPUSAVER_BUNDLE_DWORD,
+-		  D102_B_CPUSAVER_MIN_SIZE_DWORD },
+-		{ D102C_REV_ID,
+-		  D102_C_RCVBUNDLE_UCODE,
+-		  D102_C_CPUSAVER_TIMER_DWORD,
+-		  D102_C_CPUSAVER_BUNDLE_DWORD,
+-		  D102_C_CPUSAVER_MIN_SIZE_DWORD },
+-		{ D102E_REV_ID,
+-		  D102_E_RCVBUNDLE_UCODE,
+-		  D102_E_CPUSAVER_TIMER_DWORD,
+-		  D102_E_CPUSAVER_BUNDLE_DWORD,
+-		  D102_E_CPUSAVER_MIN_SIZE_DWORD },
+-		{ 0, {0}, 0, 0, 0}
+-	}, *opts;
+-
+-	opts = ucode_opts;
+-
+-	/* User turned ucode loading off */
+-	if (!(bdp->params.b_params & PRM_UCODE))
+-		return false;
+-
+-	/* These controllers do not need ucode */
+-	if (bdp->flags & IS_ICH)
+-		return false;
+-
+-	/* Search for ucode match against h/w rev_id */
+-	while (opts->rev_id) {
+-		if (bdp->rev_id == opts->rev_id) {
+-			int i;
+-			u32 *ucode_dword;
+-			load_ucode_cb_t *ucode_cmd_ptr;
+-			nxmit_cb_entry_t *cmd = e100_alloc_non_tx_cmd(bdp);
+-
+-			if (cmd != NULL) {
+-				ucode_cmd_ptr =
+-					(load_ucode_cb_t *) cmd->non_tx_cmd;
+-				ucode_dword = ucode_cmd_ptr->ucode_dword;
+-			} else {
+-				return false;
+-			}
+-
+-			memcpy(ucode_dword, opts->ucode, sizeof (opts->ucode));
+-
+-			/* Insert user-tunable settings */
+-			ucode_dword[opts->timer_dword] &= 0xFFFF0000;
+-			ucode_dword[opts->timer_dword] |=
+-				(u16) bdp->params.IntDelay;
+-			ucode_dword[opts->bundle_dword] &= 0xFFFF0000;
+-			ucode_dword[opts->bundle_dword] |=
+-				(u16) bdp->params.BundleMax;
+-			ucode_dword[opts->min_size_dword] &= 0xFFFF0000;
+-			ucode_dword[opts->min_size_dword] |=
+-				(bdp->params.b_params & PRM_BUNDLE_SMALL) ?
+-				0xFFFF : 0xFF80;
+-
+-			for (i = 0; i < UCODE_MAX_DWORDS; i++)
+-				cpu_to_le32s(&(ucode_dword[i]));
+-
+-			ucode_cmd_ptr->load_ucode_cbhdr.cb_cmd =
+-				__constant_cpu_to_le16(CB_LOAD_MICROCODE);
+-
+-			return e100_exec_non_cu_cmd(bdp, cmd);
+-		}
+-		opts++;
+-	}
+-
+-	return false;
+-}
+-
+-/***************************************************************************/
+-/***************************************************************************/
+-/*       EEPROM  Functions                                                 */
+-/***************************************************************************/
+-
+-/* Read PWA (printed wired assembly) number */
+-void __devinit
+-e100_rd_pwa_no(struct e100_private *bdp)
+-{
+-	bdp->pwa_no = e100_eeprom_read(bdp, EEPROM_PWA_NO);
+-	bdp->pwa_no <<= 16;
+-	bdp->pwa_no |= e100_eeprom_read(bdp, EEPROM_PWA_NO + 1);
+-}
+-
+-/* Read the permanent ethernet address from the eprom. */
+-void __devinit
+-e100_rd_eaddr(struct e100_private *bdp)
+-{
+-	int i;
+-	u16 eeprom_word;
+-
+-	for (i = 0; i < 6; i += 2) {
+-		eeprom_word =
+-			e100_eeprom_read(bdp,
+-					 EEPROM_NODE_ADDRESS_BYTE_0 + (i / 2));
+-
+-		bdp->device->dev_addr[i] =
+-			bdp->perm_node_address[i] = (u8) eeprom_word;
+-		bdp->device->dev_addr[i + 1] =
+-			bdp->perm_node_address[i + 1] = (u8) (eeprom_word >> 8);
+-	}
+-}
+-
+-/* Check the D102 RFD flags to see if the checksum passed */
+-static unsigned char
+-e100_D102_check_checksum(rfd_t *rfd)
+-{
+-	if (((le16_to_cpu(rfd->rfd_header.cb_status)) & RFD_PARSE_BIT)
+-	    && (((rfd->rcvparserstatus & CHECKSUM_PROTOCOL_MASK) ==
+-		 RFD_TCP_PACKET)
+-		|| ((rfd->rcvparserstatus & CHECKSUM_PROTOCOL_MASK) ==
+-		    RFD_UDP_PACKET))
+-	    && (rfd->checksumstatus & TCPUDP_CHECKSUM_BIT_VALID)
+-	    && (rfd->checksumstatus & TCPUDP_CHECKSUM_VALID)) {
+-		return CHECKSUM_UNNECESSARY;
+-	}
+-	return CHECKSUM_NONE;
+-}
+-
+-/**
+- * e100_D101M_checksum
+- * @bdp: atapter's private data struct
+- * @skb: skb received
+- *
+- * Sets the skb->csum value from D101 csum found at the end of the Rx frame. The
+- * D101M sums all words in frame excluding the ethernet II header (14 bytes) so
+- * in case the packet is ethernet II and the protocol is IP, all is need is to
+- * assign this value to skb->csum.
+- */
+-static unsigned char
+-e100_D101M_checksum(struct e100_private *bdp, struct sk_buff *skb)
+-{
+-	unsigned short proto = (skb->protocol);
+-
+-	if (proto == __constant_htons(ETH_P_IP)) {
+-
+-		skb->csum = get_unaligned((u16 *) (skb->tail));
+-		return CHECKSUM_HW;
+-	}
+-	return CHECKSUM_NONE;
+-}
+-
+-/***************************************************************************/
+-/***************************************************************************/
+-/***************************************************************************/
+-/***************************************************************************/
+-/*       Auxilary Functions                                                */
+-/***************************************************************************/
+-
+-/* Print the board's configuration */
+-void __devinit
+-e100_print_brd_conf(struct e100_private *bdp)
+-{
+-	/* Print the string if checksum Offloading was enabled */
+-	if (bdp->flags & DF_CSUM_OFFLOAD)
+-		printk(KERN_NOTICE "  Hardware receive checksums enabled\n");
+-	else {
+-		if (bdp->rev_id >= D101MA_REV_ID) 
+-			printk(KERN_NOTICE "  Hardware receive checksums disabled\n");
+-	}
+-
+-	if ((bdp->flags & DF_UCODE_LOADED))
+-		printk(KERN_NOTICE "  cpu cycle saver enabled\n");
+-}
+-
+-/**
+- * e100_pci_setup - setup the adapter's PCI information
+- * @pcid: adapter's pci_dev struct
+- * @bdp: atapter's private data struct
+- *
+- * This routine sets up all PCI information for the adapter. It enables the bus
+- * master bit (some BIOS don't do this), requests memory ans I/O regions, and
+- * calls ioremap() on the adapter's memory region.
+- *
+- * Returns:
+- *      true: if successfull
+- *      false: otherwise
+- */
+-static unsigned char __devinit
+-e100_pci_setup(struct pci_dev *pcid, struct e100_private *bdp)
+-{
+-	struct net_device *dev = bdp->device;
+-	int rc = 0;
+-
+-	if ((rc = pci_enable_device(pcid)) != 0) {
+-		goto err;
+-	}
+-
+-	/* dev and ven ID have already been checked so it is our device */
+-	pci_read_config_byte(pcid, PCI_REVISION_ID, (u8 *) &(bdp->rev_id));
+-
+-	/* address #0 is a memory region */
+-	dev->mem_start = pci_resource_start(pcid, 0);
+-	dev->mem_end = dev->mem_start + sizeof (scb_t);
+-
+-	/* address #1 is a IO region */
+-	dev->base_addr = pci_resource_start(pcid, 1);
+-
+-	if ((rc = pci_request_regions(pcid, e100_short_driver_name)) != 0) {
+-		goto err_disable;
+-	}
+-
+-	pci_enable_wake(pcid, 0, 0);
+-
+-	/* if Bus Mastering is off, turn it on! */
+-	pci_set_master(pcid);
+-
+-	/* address #0 is a memory mapping */
+-	bdp->scb = (scb_t *) ioremap_nocache(dev->mem_start, sizeof (scb_t));
+-
+-	if (!bdp->scb) {
+-		printk(KERN_ERR "e100: %s: Failed to map PCI address 0x%lX\n",
+-		       dev->name, pci_resource_start(pcid, 0));
+-		rc = -ENOMEM;
+-		goto err_region;
+-	}
+-
+-	return 0;
+-
+-err_region:
+-	pci_release_regions(pcid);
+-err_disable:
+-	pci_disable_device(pcid);
+-err:
+-	return rc;
+-}
+-
+-void
+-e100_isolate_driver(struct e100_private *bdp)
+-{
+-
+-	/* Check if interface is up                              */
+-	/* NOTE: Can't use netif_running(bdp->device) because    */
+-	/* dev_close clears __LINK_STATE_START before calling    */
+-	/* e100_close (aka dev->stop)                            */
+-	if (bdp->device->flags & IFF_UP) {
+-		e100_disable_clear_intr(bdp);
+-		del_timer_sync(&bdp->watchdog_timer);
+-		netif_carrier_off(bdp->device);
+-		netif_stop_queue(bdp->device); 
+-		bdp->last_tcb = NULL;
+-	} 
+-	e100_sw_reset(bdp, PORT_SELECTIVE_RESET);
+-}
+-
+-static void
+-e100_tcb_add_C_bit(struct e100_private *bdp)
+-{
+-	tcb_t *tcb = (tcb_t *) bdp->tcb_pool.data;
+-	int i;
+-
+-	for (i = 0; i < bdp->params.TxDescriptors; i++, tcb++) {
+-		tcb->tcb_hdr.cb_status |= cpu_to_le16(CB_STATUS_COMPLETE);
+-	}
+-}
+-
+-/* 
+- * Procedure:   e100_configure_device
+- *
+- * Description: This routine will configure device
+- *
+- * Arguments:
+- *      bdp - Ptr to this card's e100_bdconfig structure
+- *
+- * Returns:
+- *        true upon success
+- *        false upon failure
+- */
+-unsigned char
+-e100_configure_device(struct e100_private *bdp)
+-{
+-	/*load CU & RU base */
+-	if (!e100_wait_exec_cmplx(bdp, 0, SCB_CUC_LOAD_BASE, 0))
+-		return false;
+-
+-	if (e100_load_microcode(bdp))
+-		bdp->flags |= DF_UCODE_LOADED;
+-
+-	if (!e100_wait_exec_cmplx(bdp, 0, SCB_RUC_LOAD_BASE, 0))
+-		return false;
+-
+-	/* Issue the load dump counters address command */
+-	if (!e100_wait_exec_cmplx(bdp, bdp->stat_cnt_phys, SCB_CUC_DUMP_ADDR, 0))
+-		return false;
+-
+-	if (!e100_setup_iaaddr(bdp, bdp->device->dev_addr)) {
+-		printk(KERN_ERR "e100: e100_configure_device: "
+-			"setup iaaddr failed\n");
+-		return false;
+-	}
+-
+-	e100_set_multi_exec(bdp->device);
+-
+-	/* Change for 82558 enhancement                                */
+-	/* If 82558/9 and if the user has enabled flow control, set up */
+-	/* flow Control Reg. in the CSR                                */
+-	if ((bdp->flags & IS_BACHELOR)
+-	    && (bdp->params.b_params & PRM_FC)) {
+-		writeb(DFLT_FC_THLD,
+-			&bdp->scb->scb_ext.d101_scb.scb_fc_thld);
+-		writeb(DFLT_FC_CMD,
+-			&bdp->scb->scb_ext.d101_scb.scb_fc_xon_xoff);
+-	}
+-
+-	e100_force_config(bdp);
+-
+-	return true;
+-}
+-
+-void
+-e100_deisolate_driver(struct e100_private *bdp, u8 full_reset)
+-{
+-	u32 cmd = full_reset ? PORT_SOFTWARE_RESET : PORT_SELECTIVE_RESET;
+-	e100_sw_reset(bdp, cmd);
+-	if (cmd == PORT_SOFTWARE_RESET) {
+-		if (!e100_configure_device(bdp))
+-			printk(KERN_ERR "e100: e100_deisolate_driver:" 
+-		       		" device configuration failed\n");
+-	} 
+-
+-	if (netif_running(bdp->device)) {
+-
+-		bdp->next_cu_cmd = START_WAIT;
+-		bdp->last_tcb = NULL;
+-
+-		e100_start_ru(bdp);
+-
+-		/* relaunch watchdog timer in 2 sec */
+-		mod_timer(&(bdp->watchdog_timer), jiffies + (2 * HZ));
+-
+-		// we must clear tcbs since we may have lost Tx intrrupt
+-		// or have unsent frames on the tcb chain
+-		e100_tcb_add_C_bit(bdp);
+-		e100_tx_srv(bdp);
+-		netif_wake_queue(bdp->device);
+-		e100_set_intr_mask(bdp);
+-	}
+-}
+-
+-static int
+-e100_do_ethtool_ioctl(struct net_device *dev, struct ifreq *ifr)
+-{
+-	struct ethtool_cmd ecmd;
+-	int rc = -EOPNOTSUPP;
+-
+-	if (copy_from_user(&ecmd, ifr->ifr_data, sizeof (ecmd.cmd)))
+-		return -EFAULT;
+-
+-	switch (ecmd.cmd) {
+-	case ETHTOOL_GSET:
+-		rc = e100_ethtool_get_settings(dev, ifr);
+-		break;
+-	case ETHTOOL_SSET:
+-		rc = e100_ethtool_set_settings(dev, ifr);
+-		break;
+-	case ETHTOOL_GDRVINFO:
+-		rc = e100_ethtool_get_drvinfo(dev, ifr);
+-		break;
+-	case ETHTOOL_GREGS:
+-		rc = e100_ethtool_gregs(dev, ifr);
+-		break;
+-	case ETHTOOL_NWAY_RST:
+-		rc = e100_ethtool_nway_rst(dev, ifr);
+-		break;
+-	case ETHTOOL_GLINK:
+-		rc = e100_ethtool_glink(dev, ifr);
+-		break;
+-	case ETHTOOL_GEEPROM:
+-	case ETHTOOL_SEEPROM:
+-		rc = e100_ethtool_eeprom(dev, ifr);
+-		break;
+-	case ETHTOOL_GSTATS: {
+-		struct {
+-			struct ethtool_stats cmd;
+-			uint64_t data[E100_STATS_LEN];
+-		} stats = { {ETHTOOL_GSTATS, E100_STATS_LEN} };
+-		struct e100_private *bdp = dev->priv;
+-		void *addr = ifr->ifr_data;
+-		int i;
+-
+-		for(i = 0; i < E100_STATS_LEN; i++)
+-			stats.data[i] =
+-				((unsigned long *)&bdp->drv_stats.net_stats)[i];
+-		if(copy_to_user(addr, &stats, sizeof(stats)))
+-			return -EFAULT;
+-		return 0;
+-	}
+-	case ETHTOOL_GWOL:
+-	case ETHTOOL_SWOL:
+-		rc = e100_ethtool_wol(dev, ifr);
+-		break;
+-	case ETHTOOL_TEST:
+-		rc = e100_ethtool_test(dev, ifr);
+-		break;
+-	case ETHTOOL_GSTRINGS:
+-		rc = e100_ethtool_gstrings(dev,ifr);
+-		break;
+-	case ETHTOOL_PHYS_ID:
+-		rc = e100_ethtool_led_blink(dev,ifr);
+-		break;
+-#ifdef	ETHTOOL_GRINGPARAM
+-	case ETHTOOL_GRINGPARAM: {
+-		struct ethtool_ringparam ering;
+-		struct e100_private *bdp = dev->priv;
+-		memset((void *) &ering, 0, sizeof(ering));
+-		ering.rx_max_pending = E100_MAX_RFD;
+-		ering.tx_max_pending = E100_MAX_TCB;
+-		ering.rx_pending = bdp->params.RxDescriptors;
+-		ering.tx_pending = bdp->params.TxDescriptors;
+-		rc = copy_to_user(ifr->ifr_data, &ering, sizeof(ering))
+-			? -EFAULT : 0;
+-		return rc;
+-	}
+-#endif
+-#ifdef	ETHTOOL_SRINGPARAM
+-	case ETHTOOL_SRINGPARAM: {
+-		struct ethtool_ringparam ering;
+-		struct e100_private *bdp = dev->priv;
+-		if (copy_from_user(&ering, ifr->ifr_data, sizeof(ering)))
+-			return -EFAULT;
+-		if (ering.rx_pending > E100_MAX_RFD 
+-		    || ering.rx_pending < E100_MIN_RFD)
+-			return -EINVAL;
+-		if (ering.tx_pending > E100_MAX_TCB 
+-		    || ering.tx_pending < E100_MIN_TCB)
+-			return -EINVAL;
+-		if (netif_running(dev)) {
+-			spin_lock_bh(&dev->xmit_lock);
+-			e100_close(dev);
+-			spin_unlock_bh(&dev->xmit_lock);
+-			/* Use new values to open interface */
+-			bdp->params.RxDescriptors = ering.rx_pending;
+-			bdp->params.TxDescriptors = ering.tx_pending;
+-			e100_hw_init(bdp);
+-			e100_open(dev);
+-		}
+-		else {
+-			bdp->params.RxDescriptors = ering.rx_pending;
+-			bdp->params.TxDescriptors = ering.tx_pending;
+-		}
+-		return 0;
+-	}
+-#endif
+-#ifdef	ETHTOOL_GPAUSEPARAM
+-	case ETHTOOL_GPAUSEPARAM: {
+-		struct ethtool_pauseparam epause;
+-		struct e100_private *bdp = dev->priv;
+-		memset((void *) &epause, 0, sizeof(epause));
+-		if ((bdp->flags & IS_BACHELOR)
+-		    && (bdp->params.b_params & PRM_FC)) {
+-			epause.autoneg = 1;
+-			if (bdp->flags && DF_LINK_FC_CAP) {
+-				epause.rx_pause = 1;
+-				epause.tx_pause = 1;
+-			}
+-			if (bdp->flags && DF_LINK_FC_TX_ONLY)
+-				epause.tx_pause = 1;
+-		}
+-		rc = copy_to_user(ifr->ifr_data, &epause, sizeof(epause))
+-			? -EFAULT : 0;
+-		return rc;
+-	}
+-#endif
+-#ifdef	ETHTOOL_SPAUSEPARAM
+-	case ETHTOOL_SPAUSEPARAM: {
+-		struct ethtool_pauseparam epause;
+-		struct e100_private *bdp = dev->priv;
+-		if (!(bdp->flags & IS_BACHELOR))
+-			return -EINVAL;
+-		if (copy_from_user(&epause, ifr->ifr_data, sizeof(epause)))
+-			return -EFAULT;
+-		if (epause.autoneg == 1)
+-			bdp->params.b_params |= PRM_FC;
+-		else
+-			bdp->params.b_params &= ~PRM_FC;
+-		if (netif_running(dev)) {
+-			spin_lock_bh(&dev->xmit_lock);
+-			e100_close(dev);
+-			spin_unlock_bh(&dev->xmit_lock);
+-			e100_hw_init(bdp);
+-			e100_open(dev);
+-		}
+-		return 0;
+-	}
+-#endif
+-#ifdef	ETHTOOL_GRXCSUM
+-	case ETHTOOL_GRXCSUM:
+-	case ETHTOOL_GTXCSUM:
+-	case ETHTOOL_GSG:
+-	{	struct ethtool_value eval;
+-		struct e100_private *bdp = dev->priv;
+-		memset((void *) &eval, 0, sizeof(eval));
+-		if ((ecmd.cmd == ETHTOOL_GRXCSUM) 
+-		    && (bdp->params.b_params & PRM_XSUMRX))
+-			eval.data = 1;
+-		else
+-			eval.data = 0;
+-		rc = copy_to_user(ifr->ifr_data, &eval, sizeof(eval))
+-			? -EFAULT : 0;
+-		return rc;
+-	}
+-#endif
+-#ifdef	ETHTOOL_SRXCSUM
+-	case ETHTOOL_SRXCSUM:
+-	case ETHTOOL_STXCSUM:
+-	case ETHTOOL_SSG:
+-	{	struct ethtool_value eval;
+-		struct e100_private *bdp = dev->priv;
+-		if (copy_from_user(&eval, ifr->ifr_data, sizeof(eval)))
+-			return -EFAULT;
+-		if (ecmd.cmd == ETHTOOL_SRXCSUM) {
+-			if (eval.data == 1) { 
+-				if (bdp->rev_id >= D101MA_REV_ID)
+-					bdp->params.b_params |= PRM_XSUMRX;
+-				else
+-					return -EINVAL;
+-			} else {
+-				if (bdp->rev_id >= D101MA_REV_ID)
+-					bdp->params.b_params &= ~PRM_XSUMRX;
+-				else
+-					return 0;
+-			}
+-		} else {
+-			if (eval.data == 1)
+-				return -EINVAL;
+-			else
+-				return 0;
+-		}
+-		if (netif_running(dev)) {
+-			spin_lock_bh(&dev->xmit_lock);
+-			e100_close(dev);
+-			spin_unlock_bh(&dev->xmit_lock);
+-			e100_hw_init(bdp);
+-			e100_open(dev);
+-		}
+-		return 0;
+-	}
+-#endif
+-	default:
+-		break;
+-	}			//switch
+-	return rc;
+-}
+-
+-static int
+-e100_ethtool_get_settings(struct net_device *dev, struct ifreq *ifr)
+-{
+-	struct e100_private *bdp;
+-	struct ethtool_cmd ecmd;
+-	u16 advert = 0;
+-
+-	memset((void *) &ecmd, 0, sizeof (ecmd));
+-
+-	bdp = dev->priv;
+-
+-	ecmd.supported = bdp->speed_duplex_caps;
+-
+-	ecmd.port =
+-		(bdp->speed_duplex_caps & SUPPORTED_TP) ? PORT_TP : PORT_FIBRE;
+-	ecmd.transceiver = XCVR_INTERNAL;
+-	ecmd.phy_address = bdp->phy_addr;
+-
+-	if (netif_carrier_ok(bdp->device)) {
+-		ecmd.speed = bdp->cur_line_speed;
+-		ecmd.duplex =
+-			(bdp->cur_dplx_mode == HALF_DUPLEX) ? DUPLEX_HALF : DUPLEX_FULL;
+-	}
+-	else {
+-		ecmd.speed = -1;
+-		ecmd.duplex = -1;
+-	}
+-
+-	ecmd.advertising = ADVERTISED_TP;
+-
+-	if (bdp->params.e100_speed_duplex == E100_AUTONEG) {
+-		ecmd.autoneg = AUTONEG_ENABLE;
+-		ecmd.advertising |= ADVERTISED_Autoneg;
+-	} else {
+-		ecmd.autoneg = AUTONEG_DISABLE;
+-	}
+-
+-	if (bdp->speed_duplex_caps & SUPPORTED_MII) {
+-		e100_mdi_read(bdp, MII_ADVERTISE, bdp->phy_addr, &advert);
+-
+-		if (advert & ADVERTISE_10HALF)
+-			ecmd.advertising |= ADVERTISED_10baseT_Half;
+-		if (advert & ADVERTISE_10FULL)
+-			ecmd.advertising |= ADVERTISED_10baseT_Full;
+-		if (advert & ADVERTISE_100HALF)
+-			ecmd.advertising |= ADVERTISED_100baseT_Half;
+-		if (advert & ADVERTISE_100FULL)
+-			ecmd.advertising |= ADVERTISED_100baseT_Full;
+-	} else {
+-		ecmd.autoneg = AUTONEG_DISABLE;
+-		ecmd.advertising &= ~ADVERTISED_Autoneg;
+-	}
+-
+-	if (copy_to_user(ifr->ifr_data, &ecmd, sizeof (ecmd)))
+-		return -EFAULT;
+-
+-	return 0;
+-}
+-
+-static int
+-e100_ethtool_set_settings(struct net_device *dev, struct ifreq *ifr)
+-{
+-	struct e100_private *bdp;
+-	int e100_new_speed_duplex;
+-	int ethtool_new_speed_duplex;
+-	struct ethtool_cmd ecmd;
+-
+-	bdp = dev->priv;
+-	if (copy_from_user(&ecmd, ifr->ifr_data, sizeof (ecmd))) {
+-		return -EFAULT;
+-	}
+-
+-	if ((ecmd.autoneg == AUTONEG_ENABLE)
+-	    && (bdp->speed_duplex_caps & SUPPORTED_Autoneg)) {
+-		bdp->params.e100_speed_duplex = E100_AUTONEG;
+-		if (netif_running(dev)) {
+-			spin_lock_bh(&dev->xmit_lock);
+-			e100_close(dev);
+-			spin_unlock_bh(&dev->xmit_lock);
+-			e100_hw_init(bdp);
+-			e100_open(dev);
+-		}
+-	} else {
+-		if (ecmd.speed == SPEED_10) {
+-			if (ecmd.duplex == DUPLEX_HALF) {
+-				e100_new_speed_duplex =
+-					E100_SPEED_10_HALF;
+-				ethtool_new_speed_duplex =
+-					SUPPORTED_10baseT_Half;
+-			} else { 
+-				e100_new_speed_duplex =
+-					E100_SPEED_10_FULL;
+-				ethtool_new_speed_duplex =
+-					SUPPORTED_10baseT_Full;
+-			} 
+-		} else { 
+-			if (ecmd.duplex == DUPLEX_HALF) {
+-				e100_new_speed_duplex =
+-					E100_SPEED_100_HALF;
+-				ethtool_new_speed_duplex =
+-					SUPPORTED_100baseT_Half;
+-			} else { 
+-				e100_new_speed_duplex =
+-					E100_SPEED_100_FULL;
+-				ethtool_new_speed_duplex =
+-					SUPPORTED_100baseT_Full;
+-			} 
+-		}
+-
+-		if (bdp->speed_duplex_caps & ethtool_new_speed_duplex) {
+-			bdp->params.e100_speed_duplex =
+-				e100_new_speed_duplex;
+-			if (netif_running(dev)) {
+-				spin_lock_bh(&dev->xmit_lock);
+-				e100_close(dev);
+-				spin_unlock_bh(&dev->xmit_lock);
+-				e100_hw_init(bdp);
+-				e100_open(dev);
+-			}
+-		} else {
+-			return -EOPNOTSUPP;
+-		} 
+-	}
+-
+-	return 0;
+-}
+-
+-static int
+-e100_ethtool_glink(struct net_device *dev, struct ifreq *ifr)
+-{
+-	struct e100_private *bdp;
+-	struct ethtool_value info;
+-
+-	memset((void *) &info, 0, sizeof (info));
+-
+-	bdp = dev->priv;
+-	info.cmd = ETHTOOL_GLINK;
+-
+-	/* Consider both PHY link and netif_running */
+-	info.data = e100_update_link_state(bdp);
+-
+-	if (copy_to_user(ifr->ifr_data, &info, sizeof (info)))
+-		return -EFAULT;
+-
+-	return 0;
+-}
+-
+-static int
+-e100_ethtool_test(struct net_device *dev, struct ifreq *ifr)
+-{
+-	struct ethtool_test *info;
+-	int rc = -EFAULT;
+-
+-	info = kmalloc(sizeof(*info) + max_test_res * sizeof(u64),
+-		       GFP_ATOMIC);
+-
+-	if (!info)
+-		return -ENOMEM;
+-
+-	memset((void *) info, 0, sizeof(*info) +
+-				 max_test_res * sizeof(u64));
+-
+-	if (copy_from_user(info, ifr->ifr_data, sizeof(*info)))
+-		goto exit;
+-
+-	info->flags = e100_run_diag(dev, info->data, info->flags);
+-
+-	if (!copy_to_user(ifr->ifr_data, info,
+-			 sizeof(*info) + max_test_res * sizeof(u64)))
+-		rc = 0;
+-exit:
+-	kfree(info);
+-	return rc;
+-}
+-
+-static int
+-e100_ethtool_gregs(struct net_device *dev, struct ifreq *ifr)
+-{
+-	struct e100_private *bdp;
+-	u32 regs_buff[E100_REGS_LEN];
+-	struct ethtool_regs regs = {ETHTOOL_GREGS};
+-	void *addr = ifr->ifr_data;
+-	u16 mdi_reg;
+-
+-	bdp = dev->priv;
+-
+-	if(copy_from_user(&regs, addr, sizeof(regs)))
+-		return -EFAULT;
+-
+-	regs.version = (1 << 24) | bdp->rev_id;
+-	regs_buff[0] = readb(&(bdp->scb->scb_cmd_hi)) << 24 |
+-		readb(&(bdp->scb->scb_cmd_low)) << 16 |
+-		readw(&(bdp->scb->scb_status));
+-	e100_mdi_read(bdp, MII_NCONFIG, bdp->phy_addr, &mdi_reg);
+-	regs_buff[1] = mdi_reg;
+-
+-	if(copy_to_user(addr, &regs, sizeof(regs)))
+-		return -EFAULT;
+-
+-	addr += offsetof(struct ethtool_regs, data);
+-	if(copy_to_user(addr, regs_buff, regs.len))
+-		return -EFAULT;
+-
+-	return 0;
+-}
+-
+-static int
+-e100_ethtool_nway_rst(struct net_device *dev, struct ifreq *ifr)
+-{
+-	struct e100_private *bdp;
+-
+-	bdp = dev->priv;
+-
+-	if ((bdp->speed_duplex_caps & SUPPORTED_Autoneg) &&
+-	    (bdp->params.e100_speed_duplex == E100_AUTONEG)) {
+-		if (netif_running(dev)) {
+-			spin_lock_bh(&dev->xmit_lock);
+-			e100_close(dev);
+-			spin_unlock_bh(&dev->xmit_lock);
+-			e100_hw_init(bdp);
+-			e100_open(dev);
+-		}
+-	} else {
+-		return -EFAULT;
+-	}
+-	return 0;
+-}
+-
+-static int
+-e100_ethtool_get_drvinfo(struct net_device *dev, struct ifreq *ifr)
+-{
+-	struct e100_private *bdp;
+-	struct ethtool_drvinfo info;
+-
+-	memset((void *) &info, 0, sizeof (info));
+-
+-	bdp = dev->priv;
+-
+-	strncpy(info.driver, e100_short_driver_name, sizeof (info.driver) - 1);
+-	strncpy(info.version, e100_driver_version, sizeof (info.version) - 1);
+-	strncpy(info.fw_version, "N/A",
+-		sizeof (info.fw_version) - 1);
+-	strncpy(info.bus_info, pci_name(bdp->pdev),
+-		sizeof (info.bus_info) - 1);
+-	info.n_stats = E100_STATS_LEN;
+-	info.regdump_len  = E100_REGS_LEN * sizeof(u32);
+-	info.eedump_len = (bdp->eeprom_size << 1);	
+-	info.testinfo_len = max_test_res;
+-	if (copy_to_user(ifr->ifr_data, &info, sizeof (info)))
+-		return -EFAULT;
+-
+-	return 0;
+-}
+-
+-static int
+-e100_ethtool_eeprom(struct net_device *dev, struct ifreq *ifr)
+-{
+-	struct e100_private *bdp;
+-	struct ethtool_eeprom ecmd;
+-	u16 eeprom_data[256];
+-	u16 *usr_eeprom_ptr;
+-	u16 first_word, last_word;
+-	int i, max_len;
+-	void *ptr;
+-	u8 *eeprom_data_bytes = (u8 *)eeprom_data;
+-
+-	bdp = dev->priv;
+-
+-	if (copy_from_user(&ecmd, ifr->ifr_data, sizeof (ecmd)))
+-		return -EFAULT;
+-
+-	usr_eeprom_ptr =
+-		(u16 *) (ifr->ifr_data + offsetof(struct ethtool_eeprom, data));
+-
+-        max_len = bdp->eeprom_size * 2;
+-        
+-        if (ecmd.offset > ecmd.offset + ecmd.len)
+-        	return -EINVAL;
+-        	
+-	if ((ecmd.offset + ecmd.len) > max_len)
+-		ecmd.len = (max_len - ecmd.offset);
+-
+-	first_word = ecmd.offset >> 1;
+-	last_word = (ecmd.offset + ecmd.len - 1) >> 1;
+-		
+-	if (first_word >= bdp->eeprom_size)
+-		return -EFAULT;
+-
+-	if (ecmd.cmd == ETHTOOL_GEEPROM) {
+-        	for(i = 0; i <= (last_word - first_word); i++)
+-			eeprom_data[i] = e100_eeprom_read(bdp, first_word + i);
+-
+-		ecmd.magic = E100_EEPROM_MAGIC;
+-
+-		if (copy_to_user(ifr->ifr_data, &ecmd, sizeof (ecmd)))
+-			return -EFAULT;
+-
+-		if(ecmd.offset & 1)
+-			eeprom_data_bytes++;
+-		if (copy_to_user(usr_eeprom_ptr, eeprom_data_bytes, ecmd.len))
+-			return -EFAULT;
+-	} else {
+-		if (ecmd.magic != E100_EEPROM_MAGIC)
+-			return -EFAULT;
+-
+-		ptr = (void *)eeprom_data;
+-        	if(ecmd.offset & 1) {
+-                	/* need modification of first changed EEPROM word */
+-                	/* only the second byte of the word is being modified */
+-			eeprom_data[0] = e100_eeprom_read(bdp, first_word);
+-                	ptr++;
+-        	}
+-        	if((ecmd.offset + ecmd.len) & 1) {
+-	                /* need modification of last changed EEPROM word */
+-	                /* only the first byte of the word is being modified */
+-			eeprom_data[last_word - first_word] = 
+-				e100_eeprom_read(bdp, last_word);
+-		}
+-        	if(copy_from_user(ptr, usr_eeprom_ptr, ecmd.len))
+-	                return -EFAULT;
+-
+-		e100_eeprom_write_block(bdp, first_word, eeprom_data,
+-					last_word - first_word + 1);
+-
+-		if (copy_to_user(ifr->ifr_data, &ecmd, sizeof (ecmd)))
+-			return -EFAULT;
+-	}
+-	return 0;
+-}
+-
+-#define E100_BLINK_INTERVAL	(HZ/4)
+-/**
+- * e100_led_control
+- * @bdp: atapter's private data struct
+- * @led_mdi_op: led operation
+- *
+- * Software control over adapter's led. The possible operations are:
+- * TURN LED OFF, TURN LED ON and RETURN LED CONTROL TO HARDWARE.
+- */
+-static void
+-e100_led_control(struct e100_private *bdp, u16 led_mdi_op)
+-{
+-	e100_mdi_write(bdp, PHY_82555_LED_SWITCH_CONTROL,
+-		       bdp->phy_addr, led_mdi_op);
+-
+-}
+-/**
+- * e100_led_blink_callback
+- * @data: pointer to atapter's private data struct
+- *
+- * Blink timer callback function. Toggles ON/OFF led status bit and calls
+- * led hardware access function. 
+- */
+-static void
+-e100_led_blink_callback(unsigned long data)
+-{
+-	struct e100_private *bdp = (struct e100_private *) data;
+-
+-	if(bdp->flags & LED_IS_ON) {
+-		bdp->flags &= ~LED_IS_ON;
+-		e100_led_control(bdp, PHY_82555_LED_OFF);
+-	} else {
+-		bdp->flags |= LED_IS_ON;
+-		if (bdp->rev_id >= D101MA_REV_ID)
+-			e100_led_control(bdp, PHY_82555_LED_ON_559);
+-		else
+-			e100_led_control(bdp, PHY_82555_LED_ON_PRE_559);
+-	}
+-
+-	mod_timer(&bdp->blink_timer, jiffies + E100_BLINK_INTERVAL);
+-}
+-/**
+- * e100_ethtool_led_blink
+- * @dev: pointer to atapter's net_device struct
+- * @ifr: pointer to ioctl request structure
+- *
+- * Blink led ioctl handler. Initialtes blink timer and sleeps until
+- * blink period expires. Than it kills timer and returns. The led control
+- * is returned back to hardware when blink timer is killed.
+- */
+-static int
+-e100_ethtool_led_blink(struct net_device *dev, struct ifreq *ifr)
+-{
+-	struct e100_private *bdp;
+-	struct ethtool_value ecmd;
+-
+-	bdp = dev->priv;
+-
+-	if (copy_from_user(&ecmd, ifr->ifr_data, sizeof (ecmd)))
+-		return -EFAULT;
+-
+-	if(!bdp->blink_timer.function) {
+-		init_timer(&bdp->blink_timer);
+-		bdp->blink_timer.function = e100_led_blink_callback;
+-		bdp->blink_timer.data = (unsigned long) bdp;
+-	}
+-
+-	mod_timer(&bdp->blink_timer, jiffies);
+-
+-	set_current_state(TASK_INTERRUPTIBLE);
+-
+-	if ((!ecmd.data) || (ecmd.data > (u32)(MAX_SCHEDULE_TIMEOUT / HZ)))
+-		ecmd.data = (u32)(MAX_SCHEDULE_TIMEOUT / HZ);
+-
+-	schedule_timeout(ecmd.data * HZ);
+-
+-	del_timer_sync(&bdp->blink_timer);
+-
+-	e100_led_control(bdp, PHY_82555_LED_NORMAL_CONTROL);
+-
+-	return 0;
+-}
+-
+-static inline int __devinit
+-e100_10BaseT_adapter(struct e100_private *bdp)
+-{
+-	return ((bdp->pdev->device == 0x1229) &&
+-		(bdp->pdev->subsystem_vendor == 0x8086) &&
+-		(bdp->pdev->subsystem_device == 0x0003));
+-}
+-
+-static void __devinit
+-e100_get_speed_duplex_caps(struct e100_private *bdp)
+-{
+-	u16 status;
+-
+-	e100_mdi_read(bdp, MII_BMSR, bdp->phy_addr, &status);
+-
+-	bdp->speed_duplex_caps = 0;
+-
+-	bdp->speed_duplex_caps |=
+-		(status & BMSR_ANEGCAPABLE) ? SUPPORTED_Autoneg : 0;
+-
+-	bdp->speed_duplex_caps |=
+-		(status & BMSR_10HALF) ? SUPPORTED_10baseT_Half : 0;
+-
+-	bdp->speed_duplex_caps |=
+-		(status & BMSR_10FULL) ? SUPPORTED_10baseT_Full : 0;
+-
+-	bdp->speed_duplex_caps |=
+-		(status & BMSR_100HALF) ? SUPPORTED_100baseT_Half : 0;
+-
+-	bdp->speed_duplex_caps |=
+-		(status & BMSR_100FULL) ? SUPPORTED_100baseT_Full : 0;
+-
+-	if (IS_NC3133(bdp))
+-		bdp->speed_duplex_caps =
+-			(SUPPORTED_FIBRE | SUPPORTED_100baseT_Full);
+-	else
+-		bdp->speed_duplex_caps |= SUPPORTED_TP;
+-
+-	if ((status == 0xFFFF) && e100_10BaseT_adapter(bdp)) {
+-		bdp->speed_duplex_caps =
+-			(SUPPORTED_10baseT_Half | SUPPORTED_TP);
+-	} else {
+-		bdp->speed_duplex_caps |= SUPPORTED_MII;
+-	}
+-
+-}
+-
+-#ifdef CONFIG_PM
+-static unsigned char
+-e100_setup_filter(struct e100_private *bdp)
+-{
+-	cb_header_t *ntcb_hdr;
+-	unsigned char res = false;
+-	nxmit_cb_entry_t *cmd;
+-
+-	if ((cmd = e100_alloc_non_tx_cmd(bdp)) == NULL) {
+-		goto exit;
+-	}
+-
+-	ntcb_hdr = (cb_header_t *) cmd->non_tx_cmd;
+-	ntcb_hdr->cb_cmd = __constant_cpu_to_le16(CB_LOAD_FILTER);
+-
+-	/* Set EL and FIX bit */
+-	(cmd->non_tx_cmd)->ntcb.filter.filter_data[0] =
+-		__constant_cpu_to_le32(CB_FILTER_EL | CB_FILTER_FIX);
+-
+-	if (bdp->wolopts & WAKE_UCAST) {
+-		(cmd->non_tx_cmd)->ntcb.filter.filter_data[0] |=
+-			__constant_cpu_to_le32(CB_FILTER_IA_MATCH);
+-	}
+-
+-	if (bdp->wolopts & WAKE_ARP) {
+-		/* Setup ARP bit and lower IP parts */
+-		/* bdp->ip_lbytes contains 2 lower bytes of IP address in network byte order */
+-		(cmd->non_tx_cmd)->ntcb.filter.filter_data[0] |=
+-			cpu_to_le32(CB_FILTER_ARP | bdp->ip_lbytes);
+-	}
+-
+-	res = e100_exec_non_cu_cmd(bdp, cmd);
+-	if (!res)
+-		printk(KERN_WARNING "e100: %s: Filter setup failed\n",
+-		       bdp->device->name);
+-
+-exit:
+-	return res;
+-
+-}
+-
+-static void
+-e100_do_wol(struct pci_dev *pcid, struct e100_private *bdp)
+-{
+-	e100_config_wol(bdp);
+-
+-	if (e100_config(bdp)) {
+-		if (bdp->wolopts & (WAKE_UCAST | WAKE_ARP))
+-			if (!e100_setup_filter(bdp))
+-				printk(KERN_ERR
+-				       "e100: WOL options failed\n");
+-	} else {
+-		printk(KERN_ERR "e100: config WOL failed\n");
+-	}
+-}
+-#endif
+-
+-static u16
+-e100_get_ip_lbytes(struct net_device *dev)
+-{
+-	struct in_ifaddr *ifa;
+-	struct in_device *in_dev;
+-	u32 res = 0;
+-
+-	in_dev = (struct in_device *) dev->ip_ptr;
+-	/* Check if any in_device bound to interface */
+-	if (in_dev) {
+-		/* Check if any IP address is bound to interface */
+-		if ((ifa = in_dev->ifa_list) != NULL) {
+-			res = __constant_ntohl(ifa->ifa_address);
+-			res = __constant_htons(res & 0x0000ffff);
+-		}
+-	}
+-	return res;
+-}
+-
+-static int
+-e100_ethtool_wol(struct net_device *dev, struct ifreq *ifr)
+-{
+-	struct e100_private *bdp;
+-	struct ethtool_wolinfo wolinfo;
+-	int res = 0;
+-
+-	bdp = dev->priv;
+-
+-	if (copy_from_user(&wolinfo, ifr->ifr_data, sizeof (wolinfo))) {
+-		return -EFAULT;
+-	}
+-
+-	switch (wolinfo.cmd) {
+-	case ETHTOOL_GWOL:
+-		wolinfo.supported = bdp->wolsupported;
+-		wolinfo.wolopts = bdp->wolopts;
+-		if (copy_to_user(ifr->ifr_data, &wolinfo, sizeof (wolinfo)))
+-			res = -EFAULT;
+-		break;
+-	case ETHTOOL_SWOL:
+-		/* If ALL requests are supported or request is DISABLE wol */
+-		if (((wolinfo.wolopts & bdp->wolsupported) == wolinfo.wolopts)
+-		    || (wolinfo.wolopts == 0)) {
+-			bdp->wolopts = wolinfo.wolopts;
+-		} else {
+-			res = -EOPNOTSUPP;
+-		}
+-		if (wolinfo.wolopts & WAKE_ARP)
+-			bdp->ip_lbytes = e100_get_ip_lbytes(dev);
+-		break;
+-	default:
+-		break;
+-	}
+-	return res;
+-}
+-
+-static int e100_ethtool_gstrings(struct net_device *dev, struct ifreq *ifr)
+-{
+-	struct ethtool_gstrings info;
+-	char *strings = NULL;
+-	char *usr_strings;
+-	int i;
+-
+-	memset((void *) &info, 0, sizeof(info));
+-
+-	usr_strings = (u8 *) (ifr->ifr_data + 
+-			      offsetof(struct ethtool_gstrings, data));
+-
+-	if (copy_from_user(&info, ifr->ifr_data, sizeof (info)))
+-		return -EFAULT;
+-
+-	switch (info.string_set) {
+-	case ETH_SS_TEST: {
+-		int ret = 0;
+-		if (info.len > max_test_res)
+-			info.len = max_test_res;
+-		strings = kmalloc(info.len * ETH_GSTRING_LEN, GFP_ATOMIC);
+-		if (!strings)
+-			return -ENOMEM;
+-		memset(strings, 0, info.len * ETH_GSTRING_LEN);
+-
+-		for (i = 0; i < info.len; i++) {
+-			sprintf(strings + i * ETH_GSTRING_LEN, "%s",
+-				test_strings[i]);
+-		}
+-		if (copy_to_user(ifr->ifr_data, &info, sizeof (info)))
+-			ret = -EFAULT;
+-		if (copy_to_user(usr_strings, strings, info.len * ETH_GSTRING_LEN))
+-			ret = -EFAULT;
+-		kfree(strings);
+-		return ret;
+-	}
+-	case ETH_SS_STATS: {
+-		char *strings = NULL;
+-		void *addr = ifr->ifr_data;
+-		info.len = E100_STATS_LEN;
+-		strings = *e100_gstrings_stats;
+-		if(copy_to_user(ifr->ifr_data, &info, sizeof(info)))
+-			return -EFAULT;
+-		addr += offsetof(struct ethtool_gstrings, data);
+-		if(copy_to_user(addr, strings,
+-		   info.len * ETH_GSTRING_LEN))
+-			return -EFAULT;
+-		return 0;
+-	}
+-	default:
+-		return -EOPNOTSUPP;
+-	}
+-}
+-
+-static int
+-e100_mii_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+-{
+-	struct e100_private *bdp;
+-	struct mii_ioctl_data *data_ptr =
+-		(struct mii_ioctl_data *) &(ifr->ifr_data);
+-
+-	bdp = dev->priv;
+-
+-	switch (cmd) {
+-	case SIOCGMIIPHY:
+-		data_ptr->phy_id = bdp->phy_addr & 0x1f;
+-		break;
+-
+-	case SIOCGMIIREG:
+-		if (!capable(CAP_NET_ADMIN))
+-			return -EPERM;
+-		e100_mdi_read(bdp, data_ptr->reg_num & 0x1f, bdp->phy_addr,
+-			      &(data_ptr->val_out));
+-		break;
+-
+-	case SIOCSMIIREG:
+-		if (!capable(CAP_NET_ADMIN))
+-			return -EPERM;
+-		/* If reg = 0 && change speed/duplex */
+-		if (data_ptr->reg_num == 0 && 
+-			(data_ptr->val_in == (BMCR_ANENABLE | BMCR_ANRESTART) /* restart cmd */
+-			|| data_ptr->val_in == (BMCR_RESET) /* reset cmd */ 
+-			|| data_ptr->val_in & (BMCR_SPEED100 | BMCR_FULLDPLX) 
+-			|| data_ptr->val_in == 0)) {
+-				if (data_ptr->val_in == (BMCR_ANENABLE | BMCR_ANRESTART)
+-					|| data_ptr->val_in == (BMCR_RESET))
+-					bdp->params.e100_speed_duplex = E100_AUTONEG;
+-				else if (data_ptr->val_in == (BMCR_SPEED100 | BMCR_FULLDPLX))
+-					bdp->params.e100_speed_duplex = E100_SPEED_100_FULL;
+-				else if (data_ptr->val_in == (BMCR_SPEED100))
+-					bdp->params.e100_speed_duplex = E100_SPEED_100_HALF;
+-				else if (data_ptr->val_in == (BMCR_FULLDPLX))
+-					bdp->params.e100_speed_duplex = E100_SPEED_10_FULL;
+-				else
+-					bdp->params.e100_speed_duplex = E100_SPEED_10_HALF;
+-				if (netif_running(dev)) {
+-					spin_lock_bh(&dev->xmit_lock);
+-					e100_close(dev);
+-					spin_unlock_bh(&dev->xmit_lock);
+-					e100_hw_init(bdp);
+-					e100_open(dev);
+-				}
+-		}
+-		else 
+-			/* Only allows changing speed/duplex */
+-			return -EINVAL;
+-		
+-		break;
+-
+-	default:
+-		return -EOPNOTSUPP;
+-	}
+-	return 0;
+-}
+-
+-nxmit_cb_entry_t *
+-e100_alloc_non_tx_cmd(struct e100_private *bdp)
+-{
+-	nxmit_cb_entry_t *non_tx_cmd_elem;
+-
+-	if (!(non_tx_cmd_elem = (nxmit_cb_entry_t *)
+-	      kmalloc(sizeof (nxmit_cb_entry_t), GFP_ATOMIC))) {
+-		return NULL;
+-	}
+-	non_tx_cmd_elem->non_tx_cmd =
+-		pci_alloc_consistent(bdp->pdev, sizeof (nxmit_cb_t),
+-				     &(non_tx_cmd_elem->dma_addr));
+-	if (non_tx_cmd_elem->non_tx_cmd == NULL) {
+-		kfree(non_tx_cmd_elem);
+-		return NULL;
+-	}
+-	return non_tx_cmd_elem;
+-}
+-
+-void
+-e100_free_non_tx_cmd(struct e100_private *bdp,
+-		     nxmit_cb_entry_t *non_tx_cmd_elem)
+-{
+-	pci_free_consistent(bdp->pdev, sizeof (nxmit_cb_t),
+-			    non_tx_cmd_elem->non_tx_cmd,
+-			    non_tx_cmd_elem->dma_addr);
+-	kfree(non_tx_cmd_elem);
+-}
+-
+-static void
+-e100_free_nontx_list(struct e100_private *bdp)
+-{
+-	nxmit_cb_entry_t *command;
+-	int i;
+-
+-	while (!list_empty(&bdp->non_tx_cmd_list)) {
+-		command = list_entry(bdp->non_tx_cmd_list.next,
+-				     nxmit_cb_entry_t, list_elem);
+-		list_del(&(command->list_elem));
+-		e100_free_non_tx_cmd(bdp, command);
+-	}
+-
+-	for (i = 0; i < CB_MAX_NONTX_CMD; i++) {
+-		bdp->same_cmd_entry[i] = NULL;
+-	}
+-}
+-
+-static unsigned char
+-e100_delayed_exec_non_cu_cmd(struct e100_private *bdp,
+-			     nxmit_cb_entry_t *command)
+-{
+-	nxmit_cb_entry_t *same_command;
+-	cb_header_t *ntcb_hdr;
+-	u16 cmd;
+-
+-	ntcb_hdr = (cb_header_t *) command->non_tx_cmd;
+-
+-	cmd = CB_CMD_MASK & le16_to_cpu(ntcb_hdr->cb_cmd);
+-
+-	spin_lock_bh(&(bdp->bd_non_tx_lock));
+-
+-	same_command = bdp->same_cmd_entry[cmd];
+-
+-	if (same_command != NULL) {
+-		memcpy((void *) (same_command->non_tx_cmd),
+-		       (void *) (command->non_tx_cmd), sizeof (nxmit_cb_t));
+-		e100_free_non_tx_cmd(bdp, command);
+-	} else {
+-		list_add_tail(&(command->list_elem), &(bdp->non_tx_cmd_list));
+-		bdp->same_cmd_entry[cmd] = command;
+-	}
+-
+-	if (bdp->non_tx_command_state == E100_NON_TX_IDLE) {
+-		bdp->non_tx_command_state = E100_WAIT_TX_FINISH;
+-		mod_timer(&(bdp->nontx_timer_id), jiffies + 1);
+-	}
+-
+-	spin_unlock_bh(&(bdp->bd_non_tx_lock));
+-	return true;
+-}
+-
+-static void
+-e100_non_tx_background(unsigned long ptr)
+-{
+-	struct e100_private *bdp = (struct e100_private *) ptr;
+-	nxmit_cb_entry_t *active_command;
+-	int restart = true;
+-	cb_header_t *non_tx_cmd;
+-	u8 sub_cmd;
+-
+-	spin_lock_bh(&(bdp->bd_non_tx_lock));
+-
+-	switch (bdp->non_tx_command_state) {
+-	case E100_WAIT_TX_FINISH:
+-		if (bdp->last_tcb != NULL) {
+-			rmb();
+-			if ((bdp->last_tcb->tcb_hdr.cb_status &
+-			     __constant_cpu_to_le16(CB_STATUS_COMPLETE)) == 0)
+-				goto exit;
+-		}
+-		if ((readw(&bdp->scb->scb_status) & SCB_CUS_MASK) ==
+-		    SCB_CUS_ACTIVE) {
+-			goto exit;
+-		}
+-		break;
+-
+-	case E100_WAIT_NON_TX_FINISH:
+-		active_command = list_entry(bdp->non_tx_cmd_list.next,
+-					    nxmit_cb_entry_t, list_elem);
+-		rmb();
+-
+-		if (((((cb_header_t *) (active_command->non_tx_cmd))->cb_status
+-		      & __constant_cpu_to_le16(CB_STATUS_COMPLETE)) == 0)
+-		    && time_before(jiffies, active_command->expiration_time)) {
+-			goto exit;
+-		} else {
+-			non_tx_cmd = (cb_header_t *) active_command->non_tx_cmd;
+-			sub_cmd = CB_CMD_MASK & le16_to_cpu(non_tx_cmd->cb_cmd);
+-#ifdef E100_CU_DEBUG			
+-			if (!(non_tx_cmd->cb_status 
+-			    & __constant_cpu_to_le16(CB_STATUS_COMPLETE)))
+-				printk(KERN_ERR "e100: %s: Queued "
+-					"command (%x) timeout\n", 
+-					bdp->device->name, sub_cmd);
+-#endif			
+-			list_del(&(active_command->list_elem));
+-			e100_free_non_tx_cmd(bdp, active_command);
+-		}
+-		break;
+-
+-	default:
+-		break;
+-	}			//switch
+-
+-	if (list_empty(&bdp->non_tx_cmd_list)) {
+-		bdp->non_tx_command_state = E100_NON_TX_IDLE;
+-		spin_lock_irq(&(bdp->bd_lock));
+-		bdp->next_cu_cmd = START_WAIT;
+-		spin_unlock_irq(&(bdp->bd_lock));
+-		restart = false;
+-		goto exit;
+-	} else {
+-		u16 cmd_type;
+-
+-		bdp->non_tx_command_state = E100_WAIT_NON_TX_FINISH;
+-		active_command = list_entry(bdp->non_tx_cmd_list.next,
+-					    nxmit_cb_entry_t, list_elem);
+-		sub_cmd = ((cb_header_t *) active_command->non_tx_cmd)->cb_cmd;
+-		spin_lock_irq(&(bdp->bd_lock));
+-		e100_wait_exec_cmplx(bdp, active_command->dma_addr,
+-				     SCB_CUC_START, sub_cmd);
+-		spin_unlock_irq(&(bdp->bd_lock));
+-		active_command->expiration_time = jiffies + HZ;
+-		cmd_type = CB_CMD_MASK &
+-			le16_to_cpu(((cb_header_t *)
+-				     (active_command->non_tx_cmd))->cb_cmd);
+-		bdp->same_cmd_entry[cmd_type] = NULL;
+-	}
+-
+-exit:
+-	if (restart) {
+-		mod_timer(&(bdp->nontx_timer_id), jiffies + 1);
+-	} else {
+-		if (netif_running(bdp->device))
+-			netif_wake_queue(bdp->device);
+-	}
+-	spin_unlock_bh(&(bdp->bd_non_tx_lock));
+-}
+-
+-static void
+-e100_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp)
+-{
+-	struct e100_private *bdp = netdev->priv;
+-
+-	e100_disable_clear_intr(bdp);
+-	bdp->vlgrp = grp;
+-
+-	if(grp) {
+-		/* enable VLAN tag insert/strip */
+-		e100_config_vlan_drop(bdp, true);
+-
+-	} else {
+-		/* disable VLAN tag insert/strip */
+-		e100_config_vlan_drop(bdp, false);
+-	}
+-
+-	e100_config(bdp);
+-	e100_set_intr_mask(bdp);
+-}
+-
+-static void
+-e100_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
+-{
+-	/* We don't do Vlan filtering */
+-	return;
+-}
+-
+-static void
+-e100_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)
+-{
+-	struct e100_private *bdp = netdev->priv;
+-
+-	if(bdp->vlgrp)
+-		bdp->vlgrp->vlan_devices[vid] = NULL;
+-	/* We don't do Vlan filtering */
+-	return;
+-}
+-
+-#ifdef CONFIG_PM
+-static int
+-e100_notify_reboot(struct notifier_block *nb, unsigned long event, void *p)
+-{
+-        struct pci_dev *pdev = NULL;
+-	
+-        switch(event) {
+-        case SYS_DOWN:
+-        case SYS_HALT:
+-        case SYS_POWER_OFF:
+-		while ((pdev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pdev)) != NULL) {
+-                        if(pci_dev_driver(pdev) == &e100_driver) {
+-				/* If net_device struct is allocated? */
+-                                if (pci_get_drvdata(pdev))
+-					e100_suspend(pdev, 3);
+-
+-			}
+-		}
+-        }
+-        return NOTIFY_DONE;
+-}
+-
+-static int
+-e100_suspend(struct pci_dev *pcid, u32 state)
+-{
+-	struct net_device *netdev = pci_get_drvdata(pcid);
+-	struct e100_private *bdp = netdev->priv;
+-
+-	e100_isolate_driver(bdp);
+-	pci_save_state(pcid, bdp->pci_state);
+-
+-	/* Enable or disable WoL */
+-	e100_do_wol(pcid, bdp);
+-	
+-	/* If wol is enabled */
+-	if (bdp->wolopts || e100_asf_enabled(bdp)) {
+-		pci_enable_wake(pcid, 3, 1);	/* Enable PME for power state D3 */
+-		pci_set_power_state(pcid, 3);	/* Set power state to D3.        */
+-	} else {
+-		/* Disable bus mastering */
+-		pci_disable_device(pcid);
+-		pci_set_power_state(pcid, state);
+-	}
+-	return 0;
+-}
+-
+-static int
+-e100_resume(struct pci_dev *pcid)
+-{
+-	struct net_device *netdev = pci_get_drvdata(pcid);
+-	struct e100_private *bdp = netdev->priv;
+-
+-	pci_set_power_state(pcid, 0);
+-	pci_enable_wake(pcid, 0, 0);	/* Clear PME status and disable PME */
+-	pci_restore_state(pcid, bdp->pci_state);
+-
+-	/* Also do device full reset because device was in D3 state */
+-	e100_deisolate_driver(bdp, true);
+-
+-	return 0;
+-}
+-
+-/**
+- * e100_asf_enabled - checks if ASF is configured on the current adaper
+- *                    by reading registers 0xD and 0x90 in the EEPROM 
+- * @bdp: atapter's private data struct
+- *
+- * Returns: true if ASF is enabled
+- */
+-static unsigned char
+-e100_asf_enabled(struct e100_private *bdp)
+-{
+-	u16 asf_reg;
+-	u16 smbus_addr_reg;
+-	if ((bdp->pdev->device >= 0x1050) && (bdp->pdev->device <= 0x1055)) {
+-		asf_reg = e100_eeprom_read(bdp, EEPROM_CONFIG_ASF);
+-		if ((asf_reg & EEPROM_FLAG_ASF)
+-		    && !(asf_reg & EEPROM_FLAG_GCL)) {
+-			smbus_addr_reg = 
+-				e100_eeprom_read(bdp, EEPROM_SMBUS_ADDR);
+-			if ((smbus_addr_reg & 0xFF) != 0xFE) 
+-				return true;
+-		}
+-	}
+-	return false;
+-}
+-#endif /* CONFIG_PM */
+-
+-#ifdef E100_CU_DEBUG
+-unsigned char
+-e100_cu_unknown_state(struct e100_private *bdp)
+-{
+-	u8 scb_cmd_low;
+-	u16 scb_status;
+-	scb_cmd_low = bdp->scb->scb_cmd_low;
+-	scb_status = le16_to_cpu(bdp->scb->scb_status);
+-	/* If CU is active and executing unknown cmd */
+-	if (scb_status & SCB_CUS_ACTIVE && scb_cmd_low & SCB_CUC_UNKNOWN)
+-		return true;
+-	else
+-		return false;
+-}
+-#endif
+-
+--- linux-2.6.0/drivers/net/e100/e100_phy.c	2003-07-13 21:44:34.000000000 -0700
++++ /dev/null	2002-08-30 16:31:37.000000000 -0700
+@@ -1,1163 +0,0 @@
+-/*******************************************************************************
+-
+-  
+-  Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved.
+-  
+-  This program is free software; you can redistribute it and/or modify it 
+-  under the terms of the GNU General Public License as published by the Free 
+-  Software Foundation; either version 2 of the License, or (at your option) 
+-  any later version.
+-  
+-  This program is distributed in the hope that it will be useful, but WITHOUT 
+-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
+-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
+-  more details.
+-  
+-  You should have received a copy of the GNU General Public License along with
+-  this program; if not, write to the Free Software Foundation, Inc., 59 
+-  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+-  
+-  The full GNU General Public License is included in this distribution in the
+-  file called LICENSE.
+-  
+-  Contact Information:
+-  Linux NICS <linux.nics@intel.com>
+-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+-*******************************************************************************/
+-
+-#include "e100_phy.h"
+-
+-void e100_handle_zlock(struct e100_private *bdp);
+-
+-/* 
+- * Procedure:	e100_mdi_write
+- *
+- * Description: This routine will write a value to the specified MII register
+- *		of an external MDI compliant device (e.g. PHY 100).  The
+- *		command will execute in polled mode.
+- *
+- * Arguments:
+- *	bdp - Ptr to this card's e100_bdconfig structure
+- *	reg_addr - The MII register that we are writing to
+- *	phy_addr - The MDI address of the Phy component.
+- *	data - The value that we are writing to the MII register.
+- *
+- * Returns:
+- *	NOTHING
+- */
+-int
+-e100_mdi_write(struct e100_private *bdp, u32 reg_addr, u32 phy_addr, u16 data)
+-{
+-	int e100_retry;
+-	u32 temp_val;
+-	unsigned int mdi_cntrl;
+-
+-	spin_lock_bh(&bdp->mdi_access_lock);
+-	temp_val = (((u32) data) | (reg_addr << 16) |
+-		    (phy_addr << 21) | (MDI_WRITE << 26));
+-	writel(temp_val, &bdp->scb->scb_mdi_cntrl);
+-	readw(&bdp->scb->scb_status);
+-
+-	/* wait 20usec before checking status */
+-	udelay(20);
+-
+-	/* poll for the mdi write to complete */
+-	e100_retry = E100_CMD_WAIT;
+-	while ((!((mdi_cntrl = readl(&bdp->scb->scb_mdi_cntrl)) & MDI_PHY_READY)) && (e100_retry)) {
+-
+-		udelay(20);
+-		e100_retry--;
+-	}
+-	spin_unlock_bh(&bdp->mdi_access_lock);
+-	if (mdi_cntrl & MDI_PHY_READY) 
+-		return 0;
+-	else {
+-		printk(KERN_ERR "e100: MDI write timeout\n");
+-		return 1;
+-	}
+-}
+-
+-/* 
+- * Procedure:	e100_mdi_read
+- *
+- * Description: This routine will read a value from the specified MII register
+- *		of an external MDI compliant device (e.g. PHY 100), and return
+- *		it to the calling routine.  The command will execute in polled
+- *		mode.
+- *
+- * Arguments:
+- *	bdp - Ptr to this card's e100_bdconfig structure
+- *	reg_addr - The MII register that we are reading from
+- *	phy_addr - The MDI address of the Phy component.
+- *
+- * Results:
+- *	data - The value that we read from the MII register.
+- *
+- * Returns:
+- *	NOTHING
+- */
+-int
+-e100_mdi_read(struct e100_private *bdp, u32 reg_addr, u32 phy_addr, u16 *data)
+-{
+-	int e100_retry;
+-	u32 temp_val;
+-	unsigned int mdi_cntrl;
+-
+-	spin_lock_bh(&bdp->mdi_access_lock);
+-	/* Issue the read command to the MDI control register. */
+-	temp_val = ((reg_addr << 16) | (phy_addr << 21) | (MDI_READ << 26));
+-	writel(temp_val, &bdp->scb->scb_mdi_cntrl);
+-	readw(&bdp->scb->scb_status);
+-
+-	/* wait 20usec before checking status */
+-	udelay(20);
+-
+-	/* poll for the mdi read to complete */
+-	e100_retry = E100_CMD_WAIT;
+-	while ((!((mdi_cntrl = readl(&bdp->scb->scb_mdi_cntrl)) & MDI_PHY_READY)) && (e100_retry)) {
+-
+-		udelay(20);
+-		e100_retry--;
+-	}
+-
+-	spin_unlock_bh(&bdp->mdi_access_lock);
+-	if (mdi_cntrl & MDI_PHY_READY) {
+-		/* return the lower word */
+-		*data = (u16) mdi_cntrl;
+-		return 0;
+-	}
+-	else {
+-		printk(KERN_ERR "e100: MDI read timeout\n");
+-		return 1;
+-	}
+-}
+-
+-static unsigned char __devinit
+-e100_phy_valid(struct e100_private *bdp, unsigned int phy_address)
+-{
+-	u16 ctrl_reg, stat_reg;
+-
+-	/* Read the MDI control register */
+-	e100_mdi_read(bdp, MII_BMCR, phy_address, &ctrl_reg);
+-
+-	/* Read the status register twice, bacause of sticky bits */
+-	e100_mdi_read(bdp, MII_BMSR, phy_address, &stat_reg);
+-	e100_mdi_read(bdp, MII_BMSR, phy_address, &stat_reg);
+-
+-	if ((ctrl_reg == 0xffff) || ((stat_reg == 0) && (ctrl_reg == 0)))
+-		return false;
+-
+-	return true;
+-}
+-
+-static void __devinit
+-e100_phy_address_detect(struct e100_private *bdp)
+-{
+-	unsigned int addr;
+-	unsigned char valid_phy_found = false;
+-
+-	if (IS_NC3133(bdp)) {
+-		bdp->phy_addr = 0;
+-		return;
+-	}
+-
+-	if (e100_phy_valid(bdp, PHY_DEFAULT_ADDRESS)) {
+-		bdp->phy_addr = PHY_DEFAULT_ADDRESS;
+-		valid_phy_found = true;
+-
+-	} else {
+-		for (addr = MIN_PHY_ADDR; addr <= MAX_PHY_ADDR; addr++) {
+-			if (e100_phy_valid(bdp, addr)) {
+-				bdp->phy_addr = addr;
+-				valid_phy_found = true;
+-				break;
+-			}
+-		}
+-	}
+-
+-	if (!valid_phy_found) {
+-		bdp->phy_addr = PHY_ADDRESS_503;
+-	}
+-}
+-
+-static void __devinit
+-e100_phy_id_detect(struct e100_private *bdp)
+-{
+-	u16 low_id_reg, high_id_reg;
+-
+-	if (bdp->phy_addr == PHY_ADDRESS_503) {
+-		bdp->PhyId = PHY_503;
+-		return;
+-	}
+-	if (!(bdp->flags & IS_ICH)) {
+-		if (bdp->rev_id >= D102_REV_ID) {
+-			bdp->PhyId = PHY_82562ET;
+-			return;
+-		}
+-	}
+-
+-	/* Read phy id from the MII register */
+-	e100_mdi_read(bdp, MII_PHYSID1, bdp->phy_addr, &low_id_reg);
+-	e100_mdi_read(bdp, MII_PHYSID2, bdp->phy_addr, &high_id_reg);
+-
+-	bdp->PhyId = ((unsigned int) low_id_reg |
+-		      ((unsigned int) high_id_reg << 16));
+-}
+-
+-static void __devinit
+-e100_phy_isolate(struct e100_private *bdp)
+-{
+-	unsigned int phy_address;
+-	u16 ctrl_reg;
+-
+-	/* Go over all phy addresses. Deisolate the selected one, and isolate
+-	 * all the rest */
+-	for (phy_address = 0; phy_address <= MAX_PHY_ADDR; phy_address++) {
+-		if (phy_address != bdp->phy_addr) {
+-			e100_mdi_write(bdp, MII_BMCR, phy_address,
+-				       BMCR_ISOLATE);
+-
+-		} else {
+-			e100_mdi_read(bdp, MII_BMCR, bdp->phy_addr, &ctrl_reg);
+-			ctrl_reg &= ~BMCR_ISOLATE;
+-			e100_mdi_write(bdp, MII_BMCR, bdp->phy_addr, ctrl_reg);
+-		}
+-
+-		udelay(100);
+-	}
+-}
+-
+-static unsigned char __devinit
+-e100_phy_specific_setup(struct e100_private *bdp)
+-{
+-	u16 misc_reg;
+-
+-	if (bdp->phy_addr == PHY_ADDRESS_503) {
+-		switch (bdp->params.e100_speed_duplex) {
+-		case E100_AUTONEG:
+-			/* The adapter can't autoneg. so set to 10/HALF */
+-			printk(KERN_INFO
+-			       "e100: 503 serial component detected which "
+-			       "cannot autonegotiate\n");
+-			printk(KERN_INFO
+-			       "e100: speed/duplex forced to "
+-			       "10Mbps / Half duplex\n");
+-			bdp->params.e100_speed_duplex = E100_SPEED_10_HALF;
+-			break;
+-
+-		case E100_SPEED_100_HALF:
+-		case E100_SPEED_100_FULL:
+-			printk(KERN_ERR
+-			       "e100: 503 serial component detected "
+-			       "which does not support 100Mbps\n");
+-			printk(KERN_ERR
+-			       "e100: Change the forced speed/duplex "
+-			       "to a supported setting\n");
+-			return false;
+-		}
+-
+-		return true;
+-	}
+-
+-	if (IS_NC3133(bdp)) {
+-		u16 int_reg;
+-
+-		/* enable 100BASE fiber interface */
+-		e100_mdi_write(bdp, MDI_NC3133_CONFIG_REG, bdp->phy_addr,
+-			       MDI_NC3133_100FX_ENABLE);
+-
+-		if ((bdp->params.e100_speed_duplex != E100_AUTONEG) &&
+-		    (bdp->params.e100_speed_duplex != E100_SPEED_100_FULL)) {
+-			/* just inform user about 100 full */
+-			printk(KERN_ERR "e100: NC3133 NIC can only run "
+-			       "at 100Mbps full duplex\n");
+-		}
+-
+-		bdp->params.e100_speed_duplex = E100_SPEED_100_FULL;
+-
+-		/* enable interrupts */
+-		e100_mdi_read(bdp, MDI_NC3133_INT_ENABLE_REG,
+-			      bdp->phy_addr, &int_reg);
+-		int_reg |= MDI_NC3133_INT_ENABLE;
+-		e100_mdi_write(bdp, MDI_NC3133_INT_ENABLE_REG,
+-			       bdp->phy_addr, int_reg);
+-	}
+-
+-	/* Handle the National TX */
+-	if ((bdp->PhyId & PHY_MODEL_REV_ID_MASK) == PHY_NSC_TX) {
+-		e100_mdi_read(bdp, NSC_CONG_CONTROL_REG,
+-			      bdp->phy_addr, &misc_reg);
+-
+-		misc_reg |= NSC_TX_CONG_TXREADY;
+-
+-		/* disable the congestion control bit in the National Phy */
+-		misc_reg &= ~NSC_TX_CONG_ENABLE;
+-
+-		e100_mdi_write(bdp, NSC_CONG_CONTROL_REG,
+-			       bdp->phy_addr, misc_reg);
+-	}
+-
+-	return true;
+-}
+-
+-/* 
+- * Procedure:	e100_phy_fix_squelch
+- *
+- * Description:
+- *	Help find link on certain rare scenarios.
+- *	NOTE: This routine must be called once per watchdog,
+- *	      and *after* setting the current link state.
+- *
+- * Arguments:
+- *	bdp - Ptr to this card's e100_bdconfig structure
+- *
+- * Returns:
+- *	NOTHING
+- */
+-static void
+-e100_phy_fix_squelch(struct e100_private *bdp)
+-{
+-	if ((bdp->PhyId != PHY_82555_TX) || (bdp->flags & DF_SPEED_FORCED))
+-		return;
+-
+-	if (netif_carrier_ok(bdp->device)) {
+-		switch (bdp->PhyState) {
+-		case 0:
+-			break;
+-		case 1:
+-			e100_mdi_write(bdp, PHY_82555_SPECIAL_CONTROL,
+-				       bdp->phy_addr, 0x0000);
+-			break;
+-		case 2:
+-			e100_mdi_write(bdp, PHY_82555_MDI_EQUALIZER_CSR,
+-				       bdp->phy_addr, 0x3000);
+-			break;
+-		}
+-		bdp->PhyState = 0;
+-		bdp->PhyDelay = 0;
+-
+-	} else if (!bdp->PhyDelay--) {
+-		switch (bdp->PhyState) {
+-		case 0:
+-			e100_mdi_write(bdp, PHY_82555_SPECIAL_CONTROL,
+-				       bdp->phy_addr, EXTENDED_SQUELCH_BIT);
+-			bdp->PhyState = 1;
+-			break;
+-		case 1:
+-			e100_mdi_write(bdp, PHY_82555_SPECIAL_CONTROL,
+-				       bdp->phy_addr, 0x0000);
+-			e100_mdi_write(bdp, PHY_82555_MDI_EQUALIZER_CSR,
+-				       bdp->phy_addr, 0x2010);
+-			bdp->PhyState = 2;
+-			break;
+-		case 2:
+-			e100_mdi_write(bdp, PHY_82555_MDI_EQUALIZER_CSR,
+-				       bdp->phy_addr, 0x3000);
+-			bdp->PhyState = 0;
+-			break;
+-		}
+-
+-		e100_mdi_write(bdp, MII_BMCR, bdp->phy_addr,
+-			       BMCR_ANENABLE | BMCR_ANRESTART);
+-		bdp->PhyDelay = 3;
+-	}
+-}
+-
+-/* 
+- * Procedure:	e100_fix_polarity
+- *
+- * Description:
+- *	Fix for 82555 auto-polarity toggle problem. With a short cable 
+- *	connecting an 82555 with an 840A link partner, if the medium is noisy,
+- *	the 82555 sometime thinks that the polarity might be wrong and so 
+- *	toggles polarity. This happens repeatedly and results in a high bit 
+- *	error rate.
+- *	NOTE: This happens only at 10 Mbps
+- *
+- * Arguments:
+- *	bdp - Ptr to this card's e100_bdconfig structure
+- *
+- * Returns:
+- *	NOTHING
+- */
+-static void __devinit
+-e100_fix_polarity(struct e100_private *bdp)
+-{
+-	u16 status;
+-	u16 errors;
+-	u16 misc_reg;
+-	int speed;
+-
+-	if ((bdp->PhyId != PHY_82555_TX) && (bdp->PhyId != PHY_82562ET) &&
+-	    (bdp->PhyId != PHY_82562EM))
+-		return;
+-
+-	/* If the user wants auto-polarity disabled, do only that and nothing *
+-	 * else. * e100_autopolarity == 0 means disable --- we do just the
+-	 * disabling * e100_autopolarity == 1 means enable  --- we do nothing at
+-	 * all * e100_autopolarity >= 2 means we do the workaround code. */
+-	/* Change for 82558 enhancement */
+-	switch (E100_AUTOPOLARITY) {
+-	case 0:
+-		e100_mdi_read(bdp, PHY_82555_SPECIAL_CONTROL,
+-			      bdp->phy_addr, &misc_reg);
+-		e100_mdi_write(bdp, PHY_82555_SPECIAL_CONTROL, bdp->phy_addr,
+-			       (u16) (misc_reg | DISABLE_AUTO_POLARITY));
+-		break;
+-
+-	case 1:
+-		e100_mdi_read(bdp, PHY_82555_SPECIAL_CONTROL,
+-			      bdp->phy_addr, &misc_reg);
+-		e100_mdi_write(bdp, PHY_82555_SPECIAL_CONTROL, bdp->phy_addr,
+-			       (u16) (misc_reg & ~DISABLE_AUTO_POLARITY));
+-		break;
+-
+-	case 2:
+-		/* we do this only if link is up */
+-		if (!netif_carrier_ok(bdp->device)) {
+-			break;
+-		}
+-
+-		e100_mdi_read(bdp, PHY_82555_CSR, bdp->phy_addr, &status);
+-		speed = (status & PHY_82555_SPEED_BIT) ? 100 : 10;
+-
+-		/* we need to do this only if speed is 10 */
+-		if (speed != 10) {
+-			break;
+-		}
+-
+-		/* see if we have any end of frame errors */
+-		e100_mdi_read(bdp, PHY_82555_EOF_COUNTER,
+-			      bdp->phy_addr, &errors);
+-
+-		/* if non-zero, wait for 100 ms before reading again */
+-		if (errors) {
+-			udelay(200);
+-			e100_mdi_read(bdp, PHY_82555_EOF_COUNTER,
+-				      bdp->phy_addr, &errors);
+-
+-			/* if non-zero again, we disable polarity */
+-			if (errors) {
+-				e100_mdi_read(bdp, PHY_82555_SPECIAL_CONTROL,
+-					      bdp->phy_addr, &misc_reg);
+-				e100_mdi_write(bdp, PHY_82555_SPECIAL_CONTROL,
+-					       bdp->phy_addr,
+-					       (u16) (misc_reg |
+-						      DISABLE_AUTO_POLARITY));
+-			}
+-		}
+-
+-		if (!errors) {
+-			/* it is safe to read the polarity now */
+-			e100_mdi_read(bdp, PHY_82555_CSR,
+-				      bdp->phy_addr, &status);
+-
+-			/* if polarity is normal, disable polarity */
+-			if (!(status & PHY_82555_POLARITY_BIT)) {
+-				e100_mdi_read(bdp, PHY_82555_SPECIAL_CONTROL,
+-					      bdp->phy_addr, &misc_reg);
+-				e100_mdi_write(bdp, PHY_82555_SPECIAL_CONTROL,
+-					       bdp->phy_addr,
+-					       (u16) (misc_reg |
+-						      DISABLE_AUTO_POLARITY));
+-			}
+-		}
+-		break;
+-
+-	default:
+-		break;
+-	}
+-}
+-
+-/* 
+- * Procedure:	e100_find_speed_duplex
+- *
+- * Description: This routine will figure out what line speed and duplex mode
+- *		the PHY is currently using.
+- *
+- * Arguments:
+- *	bdp - Ptr to this card's e100_bdconfig structure
+- *
+- * Returns:
+- *	NOTHING
+- */
+-static void
+-e100_find_speed_duplex(struct e100_private *bdp)
+-{
+-	unsigned int PhyId;
+-	u16 stat_reg, misc_reg;
+-	u16 ad_reg, lp_ad_reg;
+-
+-	PhyId = bdp->PhyId & PHY_MODEL_REV_ID_MASK;
+-
+-	/* First we should check to see if we have link */
+-	/* If we don't have a link no reason to print a speed and duplex */
+-	if (!e100_update_link_state(bdp)) {
+-		bdp->cur_line_speed = 0;
+-		bdp->cur_dplx_mode = 0;
+-		return;
+-	}
+-
+-	/* On the 82559 and later controllers, speed/duplex is part of the *
+-	 * SCB. So, we save an mdi_read and get these from the SCB. * */
+-	if (bdp->rev_id >= D101MA_REV_ID) {
+-		/* Read speed */
+-		if (readb(&bdp->scb->scb_ext.d101m_scb.scb_gen_stat) & BIT_1)
+-			bdp->cur_line_speed = 100;
+-		else
+-			bdp->cur_line_speed = 10;
+-
+-		/* Read duplex */
+-		if (readb(&bdp->scb->scb_ext.d101m_scb.scb_gen_stat) & BIT_2)
+-			bdp->cur_dplx_mode = FULL_DUPLEX;
+-		else
+-			bdp->cur_dplx_mode = HALF_DUPLEX;
+-
+-		return;
+-	}
+-
+-	/* If this is a Phy 100, then read bits 1 and 0 of extended register 0,
+-	 * to get the current speed and duplex settings. */
+-	if ((PhyId == PHY_100_A) || (PhyId == PHY_100_C) ||
+-	    (PhyId == PHY_82555_TX)) {
+-
+-		/* Read Phy 100 extended register 0 */
+-		e100_mdi_read(bdp, EXTENDED_REG_0, bdp->phy_addr, &misc_reg);
+-
+-		/* Get current speed setting */
+-		if (misc_reg & PHY_100_ER0_SPEED_INDIC)
+-			bdp->cur_line_speed = 100;
+-		else
+-			bdp->cur_line_speed = 10;
+-
+-		/* Get current duplex setting -- FDX enabled if bit is set */
+-		if (misc_reg & PHY_100_ER0_FDX_INDIC)
+-			bdp->cur_dplx_mode = FULL_DUPLEX;
+-		else
+-			bdp->cur_dplx_mode = HALF_DUPLEX;
+-
+-		return;
+-	}
+-
+-	/* See if link partner is capable of Auto-Negotiation (bit 0, reg 6) */
+-	e100_mdi_read(bdp, MII_EXPANSION, bdp->phy_addr, &misc_reg);
+-
+-	/* See if Auto-Negotiation was complete (bit 5, reg 1) */
+-	e100_mdi_read(bdp, MII_BMSR, bdp->phy_addr, &stat_reg);
+-
+-	/* If a True NWAY connection was made, then we can detect speed/dplx
+-	 * by ANDing our adapter's advertised abilities with our link partner's
+-	 * advertised ablilities, and then assuming that the highest common
+-	 * denominator was chosed by NWAY. */
+-	if ((misc_reg & EXPANSION_NWAY) && (stat_reg & BMSR_ANEGCOMPLETE)) {
+-
+-		/* Read our advertisement register */
+-		e100_mdi_read(bdp, MII_ADVERTISE, bdp->phy_addr, &ad_reg);
+-
+-		/* Read our link partner's advertisement register */
+-		e100_mdi_read(bdp, MII_LPA, bdp->phy_addr, &lp_ad_reg);
+-
+-		/* AND the two advertisement registers together, and get rid
+-		 * of any extraneous bits. */
+-		ad_reg &= (lp_ad_reg & NWAY_LP_ABILITY);
+-
+-		/* Get speed setting */
+-		if (ad_reg &
+-		    (ADVERTISE_100HALF | ADVERTISE_100FULL |
+-		     ADVERTISE_100BASE4))
+-
+-			bdp->cur_line_speed = 100;
+-		else
+-			bdp->cur_line_speed = 10;
+-
+-		/* Get duplex setting -- use priority resolution algorithm */
+-		if (ad_reg & ADVERTISE_100BASE4) {
+-			bdp->cur_dplx_mode = HALF_DUPLEX;
+-		} else if (ad_reg & ADVERTISE_100FULL) {
+-			bdp->cur_dplx_mode = FULL_DUPLEX;
+-		} else if (ad_reg & ADVERTISE_100HALF) {
+-			bdp->cur_dplx_mode = HALF_DUPLEX;
+-		} else if (ad_reg & ADVERTISE_10FULL) {
+-			bdp->cur_dplx_mode = FULL_DUPLEX;
+-		} else {
+-			bdp->cur_dplx_mode = HALF_DUPLEX;
+-		}
+-
+-		return;
+-	}
+-
+-	/* If we are connected to a dumb (non-NWAY) repeater or hub, and the
+-	 * line speed was determined automatically by parallel detection, then
+-	 * we have no way of knowing exactly what speed the PHY is set to
+-	 * unless that PHY has a propietary register which indicates speed in
+-	 * this situation. The NSC TX PHY does have such a register. Also,
+-	 * since NWAY didn't establish the connection, the duplex setting
+-	 * should HALF duplex. */
+-	bdp->cur_dplx_mode = HALF_DUPLEX;
+-
+-	if (PhyId == PHY_NSC_TX) {
+-		/* Read register 25 to get the SPEED_10 bit */
+-		e100_mdi_read(bdp, NSC_SPEED_IND_REG, bdp->phy_addr, &misc_reg);
+-
+-		/* If bit 6 was set then we're at 10Mbps */
+-		if (misc_reg & NSC_TX_SPD_INDC_SPEED)
+-			bdp->cur_line_speed = 10;
+-		else
+-			bdp->cur_line_speed = 100;
+-
+-	} else {
+-		/* If we don't know the line speed, default to 10Mbps */
+-		bdp->cur_line_speed = 10;
+-	}
+-}
+-
+-/* 
+- * Procedure: e100_force_speed_duplex
+- *
+- * Description: This routine forces line speed and duplex mode of the
+- * adapter based on the values the user has set in e100.c.
+- *
+- * Arguments:  bdp - Pointer to the e100_private structure for the board
+- *
+- * Returns: void
+- *
+- */
+-void
+-e100_force_speed_duplex(struct e100_private *bdp)
+-{
+-	u16 control;
+-	unsigned long expires;
+-
+-	bdp->flags |= DF_SPEED_FORCED;
+-
+-	e100_mdi_read(bdp, MII_BMCR, bdp->phy_addr, &control);
+-	control &= ~BMCR_ANENABLE;
+-	control &= ~BMCR_LOOPBACK;
+-
+-	switch (bdp->params.e100_speed_duplex) {
+-	case E100_SPEED_10_HALF:
+-		control &= ~BMCR_SPEED100;
+-		control &= ~BMCR_FULLDPLX;
+-		bdp->cur_line_speed = 10;
+-		bdp->cur_dplx_mode = HALF_DUPLEX;
+-		break;
+-
+-	case E100_SPEED_10_FULL:
+-		control &= ~BMCR_SPEED100;
+-		control |= BMCR_FULLDPLX;
+-		bdp->cur_line_speed = 10;
+-		bdp->cur_dplx_mode = FULL_DUPLEX;
+-		break;
+-
+-	case E100_SPEED_100_HALF:
+-		control |= BMCR_SPEED100;
+-		control &= ~BMCR_FULLDPLX;
+-		bdp->cur_line_speed = 100;
+-		bdp->cur_dplx_mode = HALF_DUPLEX;
+-		break;
+-
+-	case E100_SPEED_100_FULL:
+-		control |= BMCR_SPEED100;
+-		control |= BMCR_FULLDPLX;
+-		bdp->cur_line_speed = 100;
+-		bdp->cur_dplx_mode = FULL_DUPLEX;
+-		break;
+-	}
+-
+-	e100_mdi_write(bdp, MII_BMCR, bdp->phy_addr, control);
+-
+-	/* loop must run at least once */
+-	expires = jiffies + 2 * HZ;
+-	do {
+-		if (e100_update_link_state(bdp) || 
+-		    time_after(jiffies, expires)) {
+-			break;
+-		} else {
+-			yield();
+-		}
+-
+-	} while (true);
+-}
+-
+-void
+-e100_force_speed_duplex_to_phy(struct e100_private *bdp)
+-{
+-	u16 control;
+-
+-	e100_mdi_read(bdp, MII_BMCR, bdp->phy_addr, &control);
+-	control &= ~BMCR_ANENABLE;
+-	control &= ~BMCR_LOOPBACK;
+-
+-	switch (bdp->params.e100_speed_duplex) {
+-	case E100_SPEED_10_HALF:
+-		control &= ~BMCR_SPEED100;
+-		control &= ~BMCR_FULLDPLX;
+-		break;
+-
+-	case E100_SPEED_10_FULL:
+-		control &= ~BMCR_SPEED100;
+-		control |= BMCR_FULLDPLX;
+-		break;
+-
+-	case E100_SPEED_100_HALF:
+-		control |= BMCR_SPEED100;
+-		control &= ~BMCR_FULLDPLX;
+-		break;
+-
+-	case E100_SPEED_100_FULL:
+-		control |= BMCR_SPEED100;
+-		control |= BMCR_FULLDPLX;
+-		break;
+-	}
+-
+-	/* Send speed/duplex command to PHY layer. */
+-	e100_mdi_write(bdp, MII_BMCR, bdp->phy_addr, control);
+-}
+-
+-/* 
+- * Procedure: e100_set_fc
+- *
+- * Description: Checks the link's capability for flow control.
+- * 
+- * Arguments:  bdp - Pointer to the e100_private structure for the board
+- *		    
+- * Returns: void
+- *
+- */
+-static void
+-e100_set_fc(struct e100_private *bdp)
+-{
+-	u16 ad_reg;
+-	u16 lp_ad_reg;
+-	u16 exp_reg;
+-
+-	/* no flow control for 82557, forced links or half duplex */
+-	if (!netif_carrier_ok(bdp->device) || (bdp->flags & DF_SPEED_FORCED) ||
+-	    (bdp->cur_dplx_mode == HALF_DUPLEX) ||
+-	    !(bdp->flags & IS_BACHELOR)) {
+-
+-		bdp->flags &= ~DF_LINK_FC_CAP;
+-		return;
+-	}
+-
+-	/* See if link partner is capable of Auto-Negotiation (bit 0, reg 6) */
+-	e100_mdi_read(bdp, MII_EXPANSION, bdp->phy_addr, &exp_reg);
+-
+-	if (exp_reg & EXPANSION_NWAY) {
+-		/* Read our advertisement register */
+-		e100_mdi_read(bdp, MII_ADVERTISE, bdp->phy_addr, &ad_reg);
+-
+-		/* Read our link partner's advertisement register */
+-		e100_mdi_read(bdp, MII_LPA, bdp->phy_addr, &lp_ad_reg);
+-
+-		ad_reg &= lp_ad_reg;	/* AND the 2 ad registers */
+-
+-		if (ad_reg & NWAY_AD_FC_SUPPORTED)
+-			bdp->flags |= DF_LINK_FC_CAP;
+-		else
+-			/* If link partner is capable of autoneg, but  */
+-			/* not capable of flow control, Received PAUSE */
+-			/* frames are still honored, i.e.,             */
+-		        /* transmitted frames would be paused */
+-			/* by incoming PAUSE frames           */
+-			bdp->flags |= DF_LINK_FC_TX_ONLY;
+-
+-	} else {
+-		bdp->flags &= ~DF_LINK_FC_CAP;
+-	}
+-}
+-
+-/* 
+- * Procedure: e100_phy_check
+- * 
+- * Arguments:  bdp - Pointer to the e100_private structure for the board
+- *
+- * Returns: true if link state was changed
+- *	   false otherwise
+- *
+- */
+-unsigned char
+-e100_phy_check(struct e100_private *bdp)
+-{
+-	unsigned char old_link;
+-	unsigned char changed = false;
+-
+-	old_link = netif_carrier_ok(bdp->device) ? 1 : 0;
+-	e100_find_speed_duplex(bdp);
+-
+-	if (!old_link && netif_carrier_ok(bdp->device)) {
+-		e100_set_fc(bdp);
+-		changed = true;
+-	}
+-
+-	if (old_link && !netif_carrier_ok(bdp->device)) {
+-		/* reset the zero lock state */
+-		bdp->zlock_state = ZLOCK_INITIAL;
+-
+-		// set auto lock for phy auto-negotiation on link up
+-		if ((bdp->PhyId & PHY_MODEL_REV_ID_MASK) == PHY_82555_TX)
+-			e100_mdi_write(bdp, PHY_82555_MDI_EQUALIZER_CSR,
+-				       bdp->phy_addr, 0);
+-		changed = true;
+-	}
+-
+-	e100_phy_fix_squelch(bdp);
+-	e100_handle_zlock(bdp);
+-
+-	return changed;
+-}
+-
+-/* 
+- * Procedure:	e100_auto_neg
+- *
+- * Description: This routine will start autonegotiation and wait
+- *		     for it to complete
+- *
+- * Arguments:
+- *	bdp		- pointer to this card's e100_bdconfig structure
+- *	force_restart	- defines if autoneg should be restarted even if it
+- *			has been completed before
+- * Returns:
+- *	NOTHING
+- */
+-static void
+-e100_auto_neg(struct e100_private *bdp, unsigned char force_restart)
+-{
+-	u16 stat_reg;
+-	unsigned long expires;
+-
+-	bdp->flags &= ~DF_SPEED_FORCED;
+-
+-	e100_mdi_read(bdp, MII_BMSR, bdp->phy_addr, &stat_reg);
+-	e100_mdi_read(bdp, MII_BMSR, bdp->phy_addr, &stat_reg);
+-
+-	/* if we are capable of performing autoneg then we restart if needed */
+-	if ((stat_reg != 0xFFFF) && (stat_reg & BMSR_ANEGCAPABLE)) {
+-
+-		if ((!force_restart) &&
+-		    (stat_reg & BMSR_ANEGCOMPLETE)) {
+-			goto exit;
+-		}
+-
+-		e100_mdi_write(bdp, MII_BMCR, bdp->phy_addr,
+-			       BMCR_ANENABLE | BMCR_ANRESTART);
+-
+-		/* wait for autoneg to complete (up to 3 seconds) */
+-		expires = jiffies + HZ * 3;
+-		do {
+-			/* now re-read the value. Sticky so read twice */
+-			e100_mdi_read(bdp, MII_BMSR, bdp->phy_addr, &stat_reg);
+-			e100_mdi_read(bdp, MII_BMSR, bdp->phy_addr, &stat_reg);
+-
+-			if ((stat_reg & BMSR_ANEGCOMPLETE) ||
+-			    time_after(jiffies, expires) ) {
+-				goto exit;
+-			} else {
+-				yield();
+-			}
+-		} while (true);
+-	}
+-
+-exit:
+-	e100_find_speed_duplex(bdp);
+-}
+-
+-void
+-e100_phy_set_speed_duplex(struct e100_private *bdp, unsigned char force_restart)
+-{
+-	if (bdp->params.e100_speed_duplex == E100_AUTONEG) {
+-        	if (bdp->rev_id >= D102_REV_ID) 
+-			/* Enable MDI/MDI-X auto switching */
+-                	e100_mdi_write(bdp, MII_NCONFIG, bdp->phy_addr,
+-		                       MDI_MDIX_AUTO_SWITCH_ENABLE);
+-		e100_auto_neg(bdp, force_restart);
+-
+-	} else {
+-        	if (bdp->rev_id >= D102_REV_ID) 
+-			/* Disable MDI/MDI-X auto switching */
+-                	e100_mdi_write(bdp, MII_NCONFIG, bdp->phy_addr,
+-		                       MDI_MDIX_RESET_ALL_MASK);
+-		e100_force_speed_duplex(bdp);
+-	}
+-
+-	e100_set_fc(bdp);
+-}
+-
+-void
+-e100_phy_autoneg(struct e100_private *bdp)
+-{
+-	u16 ctrl_reg;
+-
+-	ctrl_reg = BMCR_ANENABLE | BMCR_ANRESTART | BMCR_RESET;
+-
+-	e100_mdi_write(bdp, MII_BMCR, bdp->phy_addr, ctrl_reg);
+-
+-	udelay(100);
+-}
+-
+-void
+-e100_phy_set_loopback(struct e100_private *bdp)
+-{
+-	u16 ctrl_reg;
+-	ctrl_reg = BMCR_LOOPBACK;
+-	e100_mdi_write(bdp, MII_BMCR, bdp->phy_addr, ctrl_reg);
+-		udelay(100);
+-}
+-	
+-void
+-e100_phy_reset(struct e100_private *bdp)
+-{
+-	u16 ctrl_reg;
+-	ctrl_reg = BMCR_RESET;
+-	e100_mdi_write(bdp, MII_BMCR, bdp->phy_addr, ctrl_reg);
+-	/* ieee 802.3 : The reset process shall be completed       */
+-	/* within 0.5 seconds from the settting of PHY reset bit.  */
+-	set_current_state(TASK_UNINTERRUPTIBLE);
+-	schedule_timeout(HZ / 2);
+-}
+-
+-unsigned char __devinit
+-e100_phy_init(struct e100_private *bdp)
+-{
+-	e100_phy_reset(bdp);
+-	e100_phy_address_detect(bdp);
+-	e100_phy_isolate(bdp);
+-	e100_phy_id_detect(bdp);
+-
+-	if (!e100_phy_specific_setup(bdp))
+-		return false;
+-
+-	bdp->PhyState = 0;
+-	bdp->PhyDelay = 0;
+-	bdp->zlock_state = ZLOCK_INITIAL;
+-
+-	e100_phy_set_speed_duplex(bdp, false);
+-	e100_fix_polarity(bdp);
+-
+-	return true;
+-}
+-
+-/* 
+- * Procedure: e100_get_link_state
+- * 
+- * Description: This routine checks the link status of the adapter
+- *
+- * Arguments:  bdp - Pointer to the e100_private structure for the board
+- *		    
+- *
+- * Returns: true - If a link is found
+- *		false - If there is no link
+- *
+- */
+-unsigned char
+-e100_get_link_state(struct e100_private *bdp)
+-{
+-	unsigned char link = false;
+-	u16 status;
+-
+-	/* Check link status */
+-	/* If the controller is a 82559 or later one, link status is available
+-	 * from the CSR. This avoids the mdi_read. */
+-	if (bdp->rev_id >= D101MA_REV_ID) {
+-		if (readb(&bdp->scb->scb_ext.d101m_scb.scb_gen_stat) & BIT_0) {
+-			link = true;
+-		} else {
+-			link = false;
+-		}
+-
+-	} else {
+-		/* Read the status register twice because of sticky bits */
+-		e100_mdi_read(bdp, MII_BMSR, bdp->phy_addr, &status);
+-		e100_mdi_read(bdp, MII_BMSR, bdp->phy_addr, &status);
+-
+-		if (status & BMSR_LSTATUS) {
+-			link = true;
+-		} else {
+-			link = false;
+-		}
+-	}
+-
+-	return link;
+-}
+-
+-/* 
+- * Procedure: e100_update_link_state
+- * 
+- * Description: This routine updates the link status of the adapter,
+- * 		also considering netif_running
+- *
+- * Arguments:  bdp - Pointer to the e100_private structure for the board
+- *		    
+- *
+- * Returns: true - If a link is found
+- *		false - If there is no link
+- *
+- */
+-unsigned char
+-e100_update_link_state(struct e100_private *bdp)
+-{
+-	unsigned char link;
+-
+-	/* Logical AND PHY link & netif_running */
+-	link = e100_get_link_state(bdp) && netif_running(bdp->device);
+-
+-	if (link) {
+-		if (!netif_carrier_ok(bdp->device))
+-			netif_carrier_on(bdp->device);
+-	} else {
+-		if (netif_carrier_ok(bdp->device))
+-			netif_carrier_off(bdp->device);
+-	}
+-
+-	return link;
+-}
+-
+-/**************************************************************************\
+- **
+- ** PROC NAME:     e100_handle_zlock
+- **    This function manages a state machine that controls
+- **    the driver's zero locking algorithm.
+- **    This function is called by e100_watchdog() every ~2 second.
+- ** States:
+- **    The current link handling state is stored in 
+- **    bdp->zlock_state, and is one of:
+- **    ZLOCK_INITIAL, ZLOCK_READING, ZLOCK_SLEEPING
+- **    Detailed description of the states and the transitions
+- **    between states is found below.
+- **    Note that any time the link is down / there is a reset
+- **    state will be changed outside this function to ZLOCK_INITIAL
+- ** Algorithm:
+- **    1. If link is up & 100 Mbps continue else stay in #1:
+- **    2. Set 'auto lock'
+- **    3. Read & Store 100 times 'Zero' locked in 1 sec interval
+- **    4. If max zero read >= 0xB continue else goto 1
+- **    5. Set most popular 'Zero' read in #3
+- **    6. Sleep 5 minutes
+- **    7. Read number of errors, if it is > 300 goto 2 else goto 6
+- ** Data Structures (in DRIVER_DATA):
+- **    zlock_state           - current state of the algorithm
+- **    zlock_read_cnt        - counts number of reads (up to 100)
+- **    zlock_read_data[i]    - counts number of times 'Zero' read was i, 0 <= i <= 15
+- **    zlock_sleep_cnt       - keeps track of "sleep" time (up to 300 secs = 5 minutes)
+- **                                
+- ** Parameters:    DRIVER_DATA    *bdp
+- **
+- **                bdp  - Pointer to HSM's adapter data space
+- **
+- ** Return Value:  NONE
+- **
+- ** See Also:      e100_watchdog()
+- **
+- \**************************************************************************/
+-void
+-e100_handle_zlock(struct e100_private *bdp)
+-{
+-	u16 pos;
+-	u16 eq_reg;
+-	u16 err_cnt;
+-	u8 mpz;			/* Most Popular Zero */
+-
+-	switch (bdp->zlock_state) {
+-	case ZLOCK_INITIAL:
+-
+-		if (((u8) bdp->rev_id <= D102_REV_ID) ||
+-		    !(bdp->cur_line_speed == 100) ||
+-		    !netif_carrier_ok(bdp->device)) {
+-			break;
+-		}
+-
+-		/* initialize hw and sw and start reading */
+-		e100_mdi_write(bdp, PHY_82555_MDI_EQUALIZER_CSR,
+-			       bdp->phy_addr, 0);
+-		/* reset read counters: */
+-		bdp->zlock_read_cnt = 0;
+-		for (pos = 0; pos < 16; pos++)
+-			bdp->zlock_read_data[pos] = 0;
+-		/* start reading in the next call back: */
+-		bdp->zlock_state = ZLOCK_READING;
+-
+-		/* FALL THROUGH !! */
+-
+-	case ZLOCK_READING:
+-		/* state: reading (100 times) zero locked in 1 sec interval
+-		 * prev states: ZLOCK_INITIAL
+-		 * next states: ZLOCK_INITIAL, ZLOCK_SLEEPING */
+-
+-		e100_mdi_read(bdp, PHY_82555_MDI_EQUALIZER_CSR,
+-			      bdp->phy_addr, &eq_reg);
+-		pos = (eq_reg & ZLOCK_ZERO_MASK) >> 4;
+-		bdp->zlock_read_data[pos]++;
+-		bdp->zlock_read_cnt++;
+-
+-		if (bdp->zlock_read_cnt == ZLOCK_MAX_READS) {
+-			/* check if we read a 'Zero' value of 0xB or greater */
+-			if ((bdp->zlock_read_data[0xB]) ||
+-			    (bdp->zlock_read_data[0xC]) ||
+-			    (bdp->zlock_read_data[0xD]) ||
+-			    (bdp->zlock_read_data[0xE]) ||
+-			    (bdp->zlock_read_data[0xF])) {
+-
+-				/* we've read 'Zero' value of 0xB or greater,
+-				 * find most popular 'Zero' value and lock it */
+-				mpz = 0;
+-				/* this loop finds the most popular 'Zero': */
+-				for (pos = 1; pos < 16; pos++) {
+-					if (bdp->zlock_read_data[pos] >
+-					    bdp->zlock_read_data[mpz])
+-
+-						mpz = pos;
+-				}
+-				/* now lock the most popular 'Zero': */
+-				eq_reg = (ZLOCK_SET_ZERO | mpz);
+-				e100_mdi_write(bdp,
+-					       PHY_82555_MDI_EQUALIZER_CSR,
+-					       bdp->phy_addr, eq_reg);
+-
+-				/* sleep for 5 minutes: */
+-				bdp->zlock_sleep_cnt = jiffies;
+-				bdp->zlock_state = ZLOCK_SLEEPING;
+-				/* we will be reading the # of errors after 5
+-				 * minutes, so we need to reset the error
+-				 * counters - these registers are self clearing
+-				 * on read, so read them */
+-				e100_mdi_read(bdp, PHY_82555_SYMBOL_ERR,
+-					      bdp->phy_addr, &err_cnt);
+-
+-			} else {
+-				/* we did not read a 'Zero' value of 0xB or
+-				 * above. go back to the start */
+-				bdp->zlock_state = ZLOCK_INITIAL;
+-			}
+-
+-		}
+-		break;
+-
+-	case ZLOCK_SLEEPING:
+-		/* state: sleeping for 5 minutes
+-		 * prev states: ZLOCK_READING
+-		 * next states: ZLOCK_READING, ZLOCK_SLEEPING */
+-
+-		/* if 5 minutes have passed: */
+-		if ((jiffies - bdp->zlock_sleep_cnt) >= ZLOCK_MAX_SLEEP) {
+-			/* read and sum up the number of errors:  */
+-			e100_mdi_read(bdp, PHY_82555_SYMBOL_ERR,
+-				      bdp->phy_addr, &err_cnt);
+-			/* if we've more than 300 errors (this number was
+-			 * calculated according to the spec max allowed errors
+-			 * (80 errors per 1 million frames) for 5 minutes in
+-			 * 100 Mbps (or the user specified max BER number) */
+-			if (err_cnt > bdp->params.ber) {
+-				/* start again in the next callback: */
+-				bdp->zlock_state = ZLOCK_INITIAL;
+-			} else {
+-				/* we don't have more errors than allowed,
+-				 * sleep for 5 minutes */
+-				bdp->zlock_sleep_cnt = jiffies;
+-			}
+-		}
+-		break;
+-
+-	default:
+-		break;
+-	}
+-}
+--- linux-2.6.0/drivers/net/e100/e100_phy.h	2003-06-14 12:17:59.000000000 -0700
++++ /dev/null	2002-08-30 16:31:37.000000000 -0700
+@@ -1,158 +0,0 @@
+-/*******************************************************************************
+-
+-  
+-  Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved.
+-  
+-  This program is free software; you can redistribute it and/or modify it 
+-  under the terms of the GNU General Public License as published by the Free 
+-  Software Foundation; either version 2 of the License, or (at your option) 
+-  any later version.
+-  
+-  This program is distributed in the hope that it will be useful, but WITHOUT 
+-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
+-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
+-  more details.
+-  
+-  You should have received a copy of the GNU General Public License along with
+-  this program; if not, write to the Free Software Foundation, Inc., 59 
+-  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+-  
+-  The full GNU General Public License is included in this distribution in the
+-  file called LICENSE.
+-  
+-  Contact Information:
+-  Linux NICS <linux.nics@intel.com>
+-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+-*******************************************************************************/
+-
+-#ifndef _E100_PHY_INC_
+-#define _E100_PHY_INC_
+-
+-#include "e100.h"
+-
+-/*
+- * Auto-polarity enable/disable
+- * e100_autopolarity = 0 => disable auto-polarity
+- * e100_autopolarity = 1 => enable auto-polarity
+- * e100_autopolarity = 2 => let software determine
+- */
+-#define E100_AUTOPOLARITY 2
+-
+-#define IS_NC3133(bdp) (((bdp)->pdev->subsystem_vendor == 0x0E11) && \
+-                        ((bdp)->pdev->subsystem_device == 0xB0E1))
+-
+-#define PHY_503                 0
+-#define PHY_100_A               0x000003E0
+-#define PHY_100_C               0x035002A8
+-#define PHY_NSC_TX              0x5c002000
+-#define PHY_82562ET             0x033002A8
+-#define PHY_82562EM             0x032002A8
+-#define PHY_82562EH             0x017002A8
+-#define PHY_82555_TX            0x015002a8	/* added this for 82555 */
+-#define PHY_OTHER               0xFFFF
+-#define MAX_PHY_ADDR            31
+-#define MIN_PHY_ADDR            0
+-
+-#define PHY_MODEL_REV_ID_MASK   0xFFF0FFFF
+-
+-#define PHY_DEFAULT_ADDRESS 1
+-#define PHY_ADDRESS_503 32
+-
+-/* MDI Control register bit definitions */
+-#define MDI_PHY_READY	    BIT_28	/* PHY is ready for next MDI cycle */
+-
+-#define MDI_NC3133_CONFIG_REG           0x19
+-#define MDI_NC3133_100FX_ENABLE         BIT_2
+-#define MDI_NC3133_INT_ENABLE_REG       0x17
+-#define MDI_NC3133_INT_ENABLE           BIT_1
+-
+-/* MDI Control register opcode definitions */
+-#define MDI_WRITE 1		/* Phy Write */
+-#define MDI_READ  2		/* Phy read */
+-
+-/* MDI register set*/
+-#define AUTO_NEG_NEXT_PAGE_REG	    0x07	/* Auto-negotiation next page xmit */
+-#define EXTENDED_REG_0		    0x10	/* Extended reg 0 (Phy 100 modes) */
+-#define EXTENDED_REG_1		    0x14	/* Extended reg 1 (Phy 100 error indications) */
+-#define NSC_CONG_CONTROL_REG	    0x17	/* National (TX) congestion control */
+-#define NSC_SPEED_IND_REG	    0x19	/* National (TX) speed indication */
+-
+-#define HWI_CONTROL_REG             0x1D	/* HWI Control register */
+-/* MDI/MDI-X Control Register bit definitions */
+-#define MDI_MDIX_RES_TIMER          BIT_0_3	/* minimum slot time for resolution timer */
+-#define MDI_MDIX_CONFIG_IS_OK       BIT_4	/* 1 = resolution algorithm completes OK */
+-#define MDI_MDIX_STATUS             BIT_5	/* 1 = MDIX (croos over), 0 = MDI (straight through) */
+-#define MDI_MDIX_SWITCH             BIT_6	/* 1 = Forces to MDIX, 0 = Forces to MDI */
+-#define MDI_MDIX_AUTO_SWITCH_ENABLE BIT_7	/* 1 = MDI/MDI-X feature enabled */
+-#define MDI_MDIX_CONCT_CONFIG       BIT_8	/* Sets the MDI/MDI-X connectivity configuration (test prupose only) */
+-#define MDI_MDIX_CONCT_TEST_ENABLE  BIT_9	/* 1 = Enables connectivity testing */
+-#define MDI_MDIX_RESET_ALL_MASK     0x0000
+-
+-/* HWI Control Register bit definitions */
+-#define HWI_TEST_DISTANCE           BIT_0_8	/* distance to cable problem */
+-#define HWI_TEST_HIGHZ_PROBLEM      BIT_9	/* 1 = Open Circuit */
+-#define HWI_TEST_LOWZ_PROBLEM       BIT_10	/* 1 = Short Circuit */
+-#define HWI_TEST_RESERVED           (BIT_11 | BIT_12)	/* reserved */
+-#define HWI_TEST_EXECUTE            BIT_13	/* 1 = Execute the HWI test on the PHY */
+-#define HWI_TEST_ABILITY            BIT_14	/* 1 = test passed */
+-#define HWI_TEST_ENABLE             BIT_15	/* 1 = Enables the HWI feature */
+-#define HWI_RESET_ALL_MASK          0x0000
+-
+-/* ############Start of 82555 specific defines################## */
+-
+-/* Intel 82555 specific registers */
+-#define PHY_82555_CSR		    0x10	/* 82555 CSR */
+-#define PHY_82555_SPECIAL_CONTROL   0x11	/* 82555 special control register */
+-
+-#define PHY_82555_RCV_ERR	    0x15	/* 82555 100BaseTx Receive Error
+-						 * Frame Counter */
+-#define PHY_82555_SYMBOL_ERR	    0x16	/* 82555 RCV Symbol Error Counter */
+-#define PHY_82555_PREM_EOF_ERR	    0x17	/* 82555 100BaseTx RCV Premature End
+-						 * of Frame Error Counter */
+-#define PHY_82555_EOF_COUNTER	    0x18	/* 82555 end of frame error counter */
+-#define PHY_82555_MDI_EQUALIZER_CSR 0x1a	/* 82555 specific equalizer reg. */
+-
+-/* 82555 CSR bits */
+-#define PHY_82555_SPEED_BIT    BIT_1
+-#define PHY_82555_POLARITY_BIT BIT_8
+-
+-/* 82555 equalizer reg. opcodes */
+-#define ENABLE_ZERO_FORCING  0x2010	/* write to ASD conf. reg. 0 */
+-#define DISABLE_ZERO_FORCING 0x2000	/* write to ASD conf. reg. 0 */
+-
+-/* 82555 special control reg. opcodes */
+-#define DISABLE_AUTO_POLARITY 0x0010
+-#define EXTENDED_SQUELCH_BIT  BIT_2
+-
+-/* ############End of 82555 specific defines##################### */
+-
+-/* Auto-Negotiation advertisement register bit definitions*/
+-#define NWAY_AD_FC_SUPPORTED    0x0400	/* Flow Control supported */
+-
+-/* Auto-Negotiation link partner ability register bit definitions*/
+-#define NWAY_LP_ABILITY	        0x07e0	/* technologies supported */
+-
+-/* PHY 100 Extended Register 0 bit definitions*/
+-#define PHY_100_ER0_FDX_INDIC	BIT_0	/* 1 = FDX, 0 = half duplex */
+-#define PHY_100_ER0_SPEED_INDIC BIT_1	/* 1 = 100Mbps, 0= 10Mbps */
+-
+-/* National Semiconductor TX phy congestion control register bit definitions*/
+-#define NSC_TX_CONG_TXREADY  BIT_10	/* Makes TxReady an input */
+-#define NSC_TX_CONG_ENABLE   BIT_8	/* Enables congestion control */
+-
+-/* National Semiconductor TX phy speed indication register bit definitions*/
+-#define NSC_TX_SPD_INDC_SPEED BIT_6	/* 0 = 100Mbps, 1=10Mbps */
+-
+-/************* function prototypes ************/
+-extern unsigned char e100_phy_init(struct e100_private *bdp);
+-extern unsigned char e100_update_link_state(struct e100_private *bdp);
+-extern unsigned char e100_phy_check(struct e100_private *bdp);
+-extern void e100_phy_set_speed_duplex(struct e100_private *bdp,
+-				      unsigned char force_restart);
+-extern void e100_phy_autoneg(struct e100_private *bdp);
+-extern void e100_phy_reset(struct e100_private *bdp);
+-extern void e100_phy_set_loopback(struct e100_private *bdp);
+-extern int e100_mdi_write(struct e100_private *, u32, u32, u16);
+-extern int e100_mdi_read(struct e100_private *, u32, u32, u16 *);
+-
+-#endif
+--- linux-2.6.0/drivers/net/e100/e100_test.c	2003-06-14 12:18:08.000000000 -0700
++++ /dev/null	2002-08-30 16:31:37.000000000 -0700
+@@ -1,500 +0,0 @@
+-/*******************************************************************************
+-
+-  
+-  Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved.
+-  
+-  This program is free software; you can redistribute it and/or modify it 
+-  under the terms of the GNU General Public License as published by the Free 
+-  Software Foundation; either version 2 of the License, or (at your option) 
+-  any later version.
+-  
+-  This program is distributed in the hope that it will be useful, but WITHOUT 
+-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
+-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
+-  more details.
+-  
+-  You should have received a copy of the GNU General Public License along with
+-  this program; if not, write to the Free Software Foundation, Inc., 59 
+-  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+-  
+-  The full GNU General Public License is included in this distribution in the
+-  file called LICENSE.
+-  
+-  Contact Information:
+-  Linux NICS <linux.nics@intel.com>
+-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+-*******************************************************************************/
+-
+-#include "e100_phy.h"
+-#include "e100_config.h"
+-
+-extern u16 e100_eeprom_read(struct e100_private *, u16);
+-extern int e100_wait_exec_cmplx(struct e100_private *, u32,u8, u8);
+-extern void e100_phy_reset(struct e100_private *bdp);
+-extern void e100_phy_autoneg(struct e100_private *bdp);
+-extern void e100_phy_set_loopback(struct e100_private *bdp);
+-extern void e100_force_speed_duplex(struct e100_private *bdp);
+-
+-static u8 e100_diag_selftest(struct net_device *);
+-static u8 e100_diag_eeprom(struct net_device *);
+-static u8 e100_diag_loopback(struct net_device *);
+-
+-static u8 e100_diag_one_loopback (struct net_device *, u8);
+-static u8 e100_diag_rcv_loopback_pkt(struct e100_private *);
+-static void e100_diag_config_loopback(struct e100_private *, u8, u8, u8 *,u8 *);
+-static u8 e100_diag_loopback_alloc(struct e100_private *);
+-static void e100_diag_loopback_cu_ru_exec(struct e100_private *);
+-static u8 e100_diag_check_pkt(u8 *);
+-static void e100_diag_loopback_free(struct e100_private *);
+-static int e100_cable_diag(struct e100_private *bdp);
+-
+-#define LB_PACKET_SIZE 1500
+-
+-/**
+- * e100_run_diag - main test execution handler - checks mask of requests and calls the diag routines  
+- * @dev: atapter's net device data struct
+- * @test_info: array with test request mask also used to store test results
+- *
+- * RETURNS: updated flags field of struct ethtool_test
+- */
+-u32
+-e100_run_diag(struct net_device *dev, u64 *test_info, u32 flags)
+-{
+-	struct e100_private* bdp = dev->priv;
+-	u8 test_result = 0;
+-
+-	if (!e100_get_link_state(bdp)) {
+-		test_result = ETH_TEST_FL_FAILED;
+-		test_info[test_link] = true;
+-	}
+-	if (!e100_diag_eeprom(dev)) {
+-		test_result = ETH_TEST_FL_FAILED;
+-		test_info[test_eeprom] = true;
+-	}
+-	if (flags & ETH_TEST_FL_OFFLINE) {
+-		u8 fail_mask;
+-		if (netif_running(dev)) {
+-			spin_lock_bh(&dev->xmit_lock);
+-			e100_close(dev);
+-			spin_unlock_bh(&dev->xmit_lock);
+-		}
+-		if (e100_diag_selftest(dev)) {
+-			test_result = ETH_TEST_FL_FAILED;
+-			test_info[test_self_test] = true;
+-		}
+-
+-		fail_mask = e100_diag_loopback(dev);
+-		if (fail_mask) {
+-			test_result = ETH_TEST_FL_FAILED;
+-			if (fail_mask & PHY_LOOPBACK)
+-				test_info[test_loopback_phy] = true;
+-			if (fail_mask & MAC_LOOPBACK)
+-				test_info[test_loopback_mac] = true;
+-		}
+-
+-		test_info[cable_diag] = e100_cable_diag(bdp);
+-		/* Need hw init regardless of netif_running */
+-		e100_hw_init(bdp);
+-		if (netif_running(dev)) {
+-			e100_open(dev);
+-		}
+-	}
+-	else {
+-		test_info[test_self_test] = false;
+-		test_info[test_loopback_phy] = false;
+-		test_info[test_loopback_mac] = false;
+-		test_info[cable_diag] = false;
+-	}
+-
+-	return flags | test_result;
+-}
+-
+-/**
+- * e100_diag_selftest - run hardware selftest 
+- * @dev: atapter's net device data struct
+- */
+-static u8
+-e100_diag_selftest(struct net_device *dev)
+-{
+-	struct e100_private *bdp = dev->priv;
+-	u32 st_timeout, st_result;
+-	u8 retval = 0;
+-
+-	if (!e100_selftest(bdp, &st_timeout, &st_result)) {
+-		if (!st_timeout) {
+-			if (st_result & CB_SELFTEST_REGISTER_BIT)
+-				retval |= REGISTER_TEST_FAIL;
+-			if (st_result & CB_SELFTEST_DIAG_BIT)
+-				retval |= SELF_TEST_FAIL;
+-			if (st_result & CB_SELFTEST_ROM_BIT)
+-				retval |= ROM_TEST_FAIL;
+-		} else {
+-            		retval = TEST_TIMEOUT;
+-		}
+-	}
+-
+-	return retval;
+-}
+-
+-/**
+- * e100_diag_eeprom - validate eeprom checksum correctness
+- * @dev: atapter's net device data struct
+- *
+- */
+-static u8
+-e100_diag_eeprom (struct net_device *dev)
+-{
+-	struct e100_private *bdp = dev->priv;
+-	u16 i, eeprom_sum, eeprom_actual_csm;
+-
+-	for (i = 0, eeprom_sum = 0; i < (bdp->eeprom_size - 1); i++) {
+-		eeprom_sum += e100_eeprom_read(bdp, i);
+-	}
+-
+-	eeprom_actual_csm = e100_eeprom_read(bdp, bdp->eeprom_size - 1);
+-
+-	if (eeprom_actual_csm == (u16)(EEPROM_SUM - eeprom_sum)) {
+-		return true;
+-	}
+-
+-	return false;
+-}
+-
+-/**
+- * e100_diag_loopback - performs loopback test  
+- * @dev: atapter's net device data struct
+- */
+-static u8
+-e100_diag_loopback (struct net_device *dev)
+-{
+-	u8 rc = 0;
+-
+-	printk(KERN_DEBUG "%s: PHY loopback test starts\n", dev->name);
+-	e100_hw_init(dev->priv);
+-	if (!e100_diag_one_loopback(dev, PHY_LOOPBACK)) {
+-		rc |= PHY_LOOPBACK;
+-	}
+-	printk(KERN_DEBUG "%s: PHY loopback test ends\n", dev->name);
+-
+-	printk(KERN_DEBUG "%s: MAC loopback test starts\n", dev->name);
+-	e100_hw_init(dev->priv);
+-	if (!e100_diag_one_loopback(dev, MAC_LOOPBACK)) {
+-		rc |= MAC_LOOPBACK;
+-	}
+-	printk(KERN_DEBUG "%s: MAC loopback test ends\n", dev->name);
+-
+-	return rc;
+-}
+-
+-/**
+- * e100_diag_loopback - performs loopback test  
+- * @dev: atapter's net device data struct
+- * @mode: lopback test type
+- */
+-static u8
+-e100_diag_one_loopback (struct net_device *dev, u8 mode)
+-{
+-        struct e100_private *bdp = dev->priv;
+-        u8 res = false;
+-   	u8 saved_dynamic_tbd = false;
+-   	u8 saved_extended_tcb = false;
+-
+-	if (!e100_diag_loopback_alloc(bdp))
+-		return false;
+-
+-	/* change the config block to standard tcb and the correct loopback */
+-        e100_diag_config_loopback(bdp, true, mode,
+-				  &saved_extended_tcb, &saved_dynamic_tbd);
+-
+-	e100_diag_loopback_cu_ru_exec(bdp);
+-
+-        if (e100_diag_rcv_loopback_pkt(bdp)) {
+-		res = true;
+-	}
+-
+-        e100_diag_loopback_free(bdp);
+-
+-        /* change the config block to previous tcb mode and the no loopback */
+-        e100_diag_config_loopback(bdp, false, mode,
+-				  &saved_extended_tcb, &saved_dynamic_tbd);
+-	return res;
+-}
+-
+-/**
+- * e100_diag_config_loopback - setup/clear loopback before/after lpbk test
+- * @bdp: atapter's private data struct
+- * @set_loopback: true if the function is called to set lb
+- * @loopback_mode: the loopback mode(MAC or PHY)
+- * @tcb_extended: true if need to set extended tcb mode after clean loopback
+- * @dynamic_tbd: true if needed to set dynamic tbd mode after clean loopback
+- *
+- */
+-void
+-e100_diag_config_loopback(struct e100_private* bdp,
+-			  u8 set_loopback,
+-			  u8 loopback_mode,
+-			  u8* tcb_extended,
+-			  u8* dynamic_tbd)
+-{
+-	/* if set_loopback == true - we want to clear tcb_extended/dynamic_tbd.
+-	 * the previous values are saved in the params tcb_extended/dynamic_tbd
+-	 * if set_loopback == false - we want to restore previous value.
+-	 */
+-	if (set_loopback || (*tcb_extended))
+-		  *tcb_extended = e100_config_tcb_ext_enable(bdp,*tcb_extended);
+-
+-	if (set_loopback || (*dynamic_tbd))
+-		 *dynamic_tbd = e100_config_dynamic_tbd(bdp,*dynamic_tbd);
+-
+-	if (set_loopback) {
+-		/* ICH PHY loopback is broken */
+-		if (bdp->flags & IS_ICH && loopback_mode == PHY_LOOPBACK)
+-			loopback_mode = MAC_LOOPBACK;
+-		/* Configure loopback on MAC */
+-		e100_config_loopback_mode(bdp,loopback_mode);
+-	} else {
+-		e100_config_loopback_mode(bdp,NO_LOOPBACK);
+-	}
+-
+-	e100_config(bdp);
+-
+-	if (loopback_mode == PHY_LOOPBACK) {
+-		if (set_loopback)
+-                        /* Set PHY loopback mode */
+-                        e100_phy_set_loopback(bdp);
+-		else
+-			/* Reset PHY loopback mode */
+-			e100_phy_reset(bdp);	
+-		/* Wait for PHY state change */
+-		set_current_state(TASK_UNINTERRUPTIBLE);
+-                schedule_timeout(HZ);
+-	} else { /* For MAC loopback wait 500 msec to take effect */
+-		set_current_state(TASK_UNINTERRUPTIBLE);
+-		schedule_timeout(HZ / 2);
+-	}
+-}
+-  
+-/**
+- * e100_diag_loopback_alloc - alloc & initate tcb and rfd for the loopback
+- * @bdp: atapter's private data struct
+- *
+- */
+-static u8
+-e100_diag_loopback_alloc(struct e100_private *bdp)
+-{
+-	dma_addr_t dma_handle;
+-	tcb_t *tcb;
+-	rfd_t *rfd;
+-	tbd_t *tbd;
+-
+-	/* tcb, tbd and transmit buffer are allocated */
+-	tcb = pci_alloc_consistent(bdp->pdev,
+-				   (sizeof (tcb_t) + sizeof (tbd_t) +
+-				    LB_PACKET_SIZE),
+-				   &dma_handle);
+-        if (tcb == NULL)
+-		return false;
+-
+-	memset(tcb, 0x00, sizeof (tcb_t) + sizeof (tbd_t) + LB_PACKET_SIZE);
+-	tcb->tcb_phys = dma_handle;
+-	tcb->tcb_hdr.cb_status = 0;
+-	tcb->tcb_hdr.cb_cmd =
+-		cpu_to_le16(CB_EL_BIT | CB_TRANSMIT | CB_TX_SF_BIT);
+-	/* Next command is null */
+-	tcb->tcb_hdr.cb_lnk_ptr = cpu_to_le32(0xffffffff);
+-	tcb->tcb_cnt = 0;
+-	tcb->tcb_thrshld = bdp->tx_thld;
+-	tcb->tcb_tbd_num = 1;
+-	/* Set up tcb tbd pointer */
+-	tcb->tcb_tbd_ptr = cpu_to_le32(tcb->tcb_phys + sizeof (tcb_t));
+-	tbd = (tbd_t *) ((u8 *) tcb + sizeof (tcb_t));
+-	/* Set up tbd transmit buffer */
+-	tbd->tbd_buf_addr =
+-		cpu_to_le32(le32_to_cpu(tcb->tcb_tbd_ptr) + sizeof (tbd_t));
+-	tbd->tbd_buf_cnt = __constant_cpu_to_le16(1024);
+-	/* The value of first 512 bytes is FF */
+-	memset((void *) ((u8 *) tbd + sizeof (tbd_t)), 0xFF, 512);
+-	/* The value of second 512 bytes is BA */
+-	memset((void *) ((u8 *) tbd + sizeof (tbd_t) + 512), 0xBA, 512);
+-	wmb();
+-	rfd = pci_alloc_consistent(bdp->pdev, sizeof (rfd_t), &dma_handle);
+-
+-	if (rfd == NULL) {
+-		pci_free_consistent(bdp->pdev,
+-				    sizeof (tcb_t) + sizeof (tbd_t) +
+-				    LB_PACKET_SIZE, tcb, tcb->tcb_phys);
+-		return false;
+-	}
+-
+-	memset(rfd, 0x00, sizeof (rfd_t));
+-
+-	/* init all fields in rfd */
+-	rfd->rfd_header.cb_cmd = cpu_to_le16(RFD_EL_BIT);
+-	rfd->rfd_sz = cpu_to_le16(ETH_FRAME_LEN + CHKSUM_SIZE);
+-	/* dma_handle is physical address of rfd */
+-	bdp->loopback.dma_handle = dma_handle;
+-	bdp->loopback.tcb = tcb;
+-	bdp->loopback.rfd = rfd;
+-	wmb();
+-	return true;
+-}
+-
+-/**
+- * e100_diag_loopback_cu_ru_exec - activates cu and ru to send & receive the pkt
+- * @bdp: atapter's private data struct
+- *
+- */
+-static void
+-e100_diag_loopback_cu_ru_exec(struct e100_private *bdp)
+-{
+-	/*load CU & RU base */ 
+-	if(!e100_wait_exec_cmplx(bdp, bdp->loopback.dma_handle, SCB_RUC_START, 0))
+-		printk(KERN_ERR "e100: SCB_RUC_START failed!\n");
+-
+-	bdp->next_cu_cmd = START_WAIT;
+-	e100_start_cu(bdp, bdp->loopback.tcb);
+-	bdp->last_tcb = NULL;
+-	rmb();
+-}
+-/**
+- * e100_diag_check_pkt - checks if a given packet is a loopback packet
+- * @bdp: atapter's private data struct
+- *
+- * Returns true if OK false otherwise.
+- */
+-static u8
+-e100_diag_check_pkt(u8 *datap)
+-{
+-	int i;
+-	for (i = 0; i<512; i++) {
+-		if( !((*datap)==0xFF && (*(datap + 512) == 0xBA)) ) {
+-			printk (KERN_ERR "e100: check loopback packet failed at: %x\n", i);
+-			return false;
+-			}
+-	}
+-	printk (KERN_DEBUG "e100: Check received loopback packet OK\n");
+-	return true;
+-}
+-
+-/**
+- * e100_diag_rcv_loopback_pkt - waits for receive and checks lpbk packet
+- * @bdp: atapter's private data struct
+- *
+- * Returns true if OK false otherwise.
+- */
+-static u8
+-e100_diag_rcv_loopback_pkt(struct e100_private* bdp) 
+-{    
+-	rfd_t *rfdp;
+-	u16 rfd_status;
+-	unsigned long expires = jiffies + HZ * 2;
+-
+-        rfdp =bdp->loopback.rfd;
+-
+-        rfd_status = le16_to_cpu(rfdp->rfd_header.cb_status);
+-
+-        while (!(rfd_status & RFD_STATUS_COMPLETE)) { 
+-		if (time_before(jiffies, expires)) {
+-			yield();
+-			rmb();
+-			rfd_status = le16_to_cpu(rfdp->rfd_header.cb_status);
+-		} else {
+-			break;
+-		}
+-        }
+-
+-        if (rfd_status & RFD_STATUS_COMPLETE) {
+-		printk(KERN_DEBUG "e100: Loopback packet received\n");
+-                return e100_diag_check_pkt(((u8 *)rfdp+bdp->rfd_size));
+-	}
+-	else {
+-		printk(KERN_ERR "e100: Loopback packet not received\n");
+-		return false;
+-	}
+-}
+-
+-/**
+- * e100_diag_loopback_free - free data allocated for loopback pkt send/receive
+- * @bdp: atapter's private data struct
+- *
+- */
+-static void
+-e100_diag_loopback_free (struct e100_private *bdp)
+-{
+-        pci_free_consistent(bdp->pdev,
+-			    sizeof(tcb_t) + sizeof(tbd_t) + LB_PACKET_SIZE,
+-			    bdp->loopback.tcb, bdp->loopback.tcb->tcb_phys);
+-
+-        pci_free_consistent(bdp->pdev, sizeof(rfd_t), bdp->loopback.rfd,
+-			    bdp->loopback.dma_handle);
+-}
+-
+-static int
+-e100_cable_diag(struct e100_private *bdp)
+-{	
+-	int saved_open_circut = 0xffff;
+-	int saved_short_circut = 0xffff;
+-	int saved_distance = 0xffff;
+-	int saved_same = 0;
+-	int cable_status = E100_CABLE_UNKNOWN;
+-	int i;
+-	
+-	/* If we have link, */	
+-	if (e100_get_link_state(bdp))
+-		return E100_CABLE_OK;
+-	
+-	if (bdp->rev_id < D102_REV_ID)
+-		return E100_CABLE_UNKNOWN;
+-
+-	/* Disable MDI/MDI-X auto switching */
+-        e100_mdi_write(bdp, MII_NCONFIG, bdp->phy_addr,
+-		MDI_MDIX_RESET_ALL_MASK);
+-	/* Set to 100 Full as required by cable test */
+-	e100_mdi_write(bdp, MII_BMCR, bdp->phy_addr,
+-		BMCR_SPEED100 | BMCR_FULLDPLX);
+-
+-	/* Test up to 100 times */
+-	for (i = 0; i < 100; i++) {
+-		u16 ctrl_reg;
+-		int distance, open_circut, short_circut, near_end;
+-
+-		/* Enable and execute cable test */
+-		e100_mdi_write(bdp, HWI_CONTROL_REG, bdp->phy_addr,
+-			(HWI_TEST_ENABLE | HWI_TEST_EXECUTE));
+-		/* Wait for cable test finished */
+-		set_current_state(TASK_UNINTERRUPTIBLE);
+-		schedule_timeout(HZ/100 + 1);
+-		/* Read results */
+-		e100_mdi_read(bdp, HWI_CONTROL_REG, bdp->phy_addr, &ctrl_reg);
+-		distance = ctrl_reg & HWI_TEST_DISTANCE;
+-		open_circut = ctrl_reg & HWI_TEST_HIGHZ_PROBLEM;
+-		short_circut = ctrl_reg & HWI_TEST_LOWZ_PROBLEM;
+-
+-		if ((distance == saved_distance) &&
+-	    	    (open_circut == saved_open_circut) &&
+-	    	    (short_circut == saved_short_circut)) 
+-			saved_same++;
+-		else {
+-			saved_same = 0;
+-			saved_distance = distance;
+-			saved_open_circut = open_circut;
+-			saved_short_circut = short_circut;
+-		}
+-		/* If results are the same 3 times */
+-		if (saved_same == 3) {
+-			near_end = ((distance * HWI_REGISTER_GRANULARITY) <
+-			       HWI_NEAR_END_BOUNDARY);
+-			if (open_circut)
+-				cable_status = (near_end) ? 
+-					E100_CABLE_OPEN_NEAR : E100_CABLE_OPEN_FAR;
+-			if (short_circut)
+-				cable_status = (near_end) ?
+-					E100_CABLE_SHORT_NEAR : E100_CABLE_SHORT_FAR;
+-			break;
+-		}
+-	}
+-	/* Reset cable test */
+-        e100_mdi_write(bdp, HWI_CONTROL_REG, bdp->phy_addr,					       HWI_RESET_ALL_MASK);
+-	return cable_status;
+-}
+-
+--- linux-2.6.0/drivers/net/e100/e100_ucode.h	2003-06-14 12:18:34.000000000 -0700
++++ /dev/null	2002-08-30 16:31:37.000000000 -0700
+@@ -1,365 +0,0 @@
+-/*******************************************************************************
+-
+-  
+-  Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved.
+-  
+-  This program is free software; you can redistribute it and/or modify it 
+-  under the terms of the GNU General Public License as published by the Free 
+-  Software Foundation; either version 2 of the License, or (at your option) 
+-  any later version.
+-  
+-  This program is distributed in the hope that it will be useful, but WITHOUT 
+-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
+-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
+-  more details.
+-  
+-  You should have received a copy of the GNU General Public License along with
+-  this program; if not, write to the Free Software Foundation, Inc., 59 
+-  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+-  
+-  The full GNU General Public License is included in this distribution in the
+-  file called LICENSE.
+-  
+-  Contact Information:
+-  Linux NICS <linux.nics@intel.com>
+-  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
+-*******************************************************************************/
+-
+-#ifndef _E100_UCODE_H_
+-#define _E100_UCODE_H_
+-
+-/*
+-e100_ucode.h
+-
+-This file contains the loadable micro code arrays to implement receive 
+-bundling on the D101 A-step, D101 B-step, D101M (B-step only), D101S, 
+-D102 B-step, D102 B-step with TCO work around and D102 C-step.
+-
+-Each controller has its own specific micro code array.  The array for one 
+-controller is totally incompatible with any other controller, and if used 
+-will most likely cause the controller to lock up and stop responding to 
+-the driver.  Each micro code array has its own parameter offsets (described 
+-below), and they each have their own version number.
+-*/
+-
+-/*************************************************************************
+-*  CPUSaver parameters
+-*
+-*  All CPUSaver parameters are 16-bit literals that are part of a
+-*  "move immediate value" instruction.  By changing the value of
+-*  the literal in the instruction before the code is loaded, the
+-*  driver can change algorithm.
+-*
+-*  CPUSAVER_DWORD - This is the location of the instruction that loads
+-*    the dead-man timer with its inital value.  By writing a 16-bit
+-*    value to the low word of this instruction, the driver can change
+-*    the timer value.  The current default is either x600 or x800;
+-*    experiments show that the value probably should stay within the
+-*    range of x200 - x1000.
+-*
+-*  CPUSAVER_BUNDLE_MAX_DWORD - This is the location of the instruction
+-*    that sets the maximum number of frames that will be bundled.  In
+-*    some situations, such as the TCP windowing algorithm, it may be
+-*    better to limit the growth of the bundle size than let it go as
+-*    high as it can, because that could cause too much added latency.
+-*    The default is six, because this is the number of packets in the
+-*    default TCP window size.  A value of 1 would make CPUSaver indicate
+-*    an interrupt for every frame received.  If you do not want to put
+-*    a limit on the bundle size, set this value to xFFFF.
+-*
+-*  CPUSAVER_MIN_SIZE_DWORD - This is the location of the instruction
+-*    that contains a bit-mask describing the minimum size frame that
+-*    will be bundled.  The default masks the lower 7 bits, which means
+-*    that any frame less than 128 bytes in length will not be bundled,
+-*    but will instead immediately generate an interrupt.  This does
+-*    not affect the current bundle in any way.  Any frame that is 128
+-*    bytes or large will be bundled normally.  This feature is meant
+-*    to provide immediate indication of ACK frames in a TCP environment.
+-*    Customers were seeing poor performance when a machine with CPUSaver
+-*    enabled was sending but not receiving.  The delay introduced when
+-*    the ACKs were received was enough to reduce total throughput, because
+-*    the sender would sit idle until the ACK was finally seen.
+-*
+-*    The current default is 0xFF80, which masks out the lower 7 bits.
+-*    This means that any frame which is x7F (127) bytes or smaller
+-*    will cause an immediate interrupt.  Because this value must be a 
+-*    bit mask, there are only a few valid values that can be used.  To
+-*    turn this feature off, the driver can write the value xFFFF to the
+-*    lower word of this instruction (in the same way that the other
+-*    parameters are used).  Likewise, a value of 0xF800 (2047) would
+-*    cause an interrupt to be generated for every frame, because all
+-*    standard Ethernet frames are <= 2047 bytes in length.
+-*************************************************************************/
+-
+-#ifndef UCODE_MAX_DWORDS
+-#define UCODE_MAX_DWORDS	134
+-#endif
+-
+-/********************************************************/
+-/*  CPUSaver micro code for the D101A                   */
+-/********************************************************/
+-
+-/*  Version 2.0  */
+-
+-/*  This value is the same for both A and B step of 558.  */
+-
+-#define D101_CPUSAVER_TIMER_DWORD		72
+-#define D101_CPUSAVER_BUNDLE_DWORD		UCODE_MAX_DWORDS
+-#define D101_CPUSAVER_MIN_SIZE_DWORD		UCODE_MAX_DWORDS
+-
+-#define     D101_A_RCVBUNDLE_UCODE \
+-{\
+-0x03B301BB, 0x0046FFFF, 0xFFFFFFFF, 0x051DFFFF, 0xFFFFFFFF, 0xFFFFFFFF, \
+-0x000C0001, 0x00101212, 0x000C0008, 0x003801BC, \
+-0x00000000, 0x00124818, 0x000C1000, 0x00220809, \
+-0x00010200, 0x00124818, 0x000CFFFC, 0x003803B5, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x0010009C, 0x0024B81D, 0x00130836, 0x000C0001, \
+-0x0026081C, 0x0020C81B, 0x00130824, 0x00222819, \
+-0x00101213, 0x00041000, 0x003A03B3, 0x00010200, \
+-0x00101B13, 0x00238081, 0x00213049, 0x0038003B, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x0010009C, 0x0024B83E, 0x00130826, 0x000C0001, \
+-0x0026083B, 0x00010200, 0x00134824, 0x000C0001, \
+-0x00101213, 0x00041000, 0x0038051E, 0x00101313, \
+-0x00010400, 0x00380521, 0x00050600, 0x00100824, \
+-0x00101310, 0x00041000, 0x00080600, 0x00101B10, \
+-0x0038051E, 0x00000000, 0x00000000, 0x00000000  \
+-}
+-
+-/********************************************************/
+-/*  CPUSaver micro code for the D101B                   */
+-/********************************************************/
+-
+-/*  Version 2.0  */
+-
+-#define     D101_B0_RCVBUNDLE_UCODE \
+-{\
+-0x03B401BC, 0x0047FFFF, 0xFFFFFFFF, 0x051EFFFF, 0xFFFFFFFF, 0xFFFFFFFF, \
+-0x000C0001, 0x00101B92, 0x000C0008, 0x003801BD, \
+-0x00000000, 0x00124818, 0x000C1000, 0x00220809, \
+-0x00010200, 0x00124818, 0x000CFFFC, 0x003803B6, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x0010009C, 0x0024B81D, 0x0013082F, 0x000C0001, \
+-0x0026081C, 0x0020C81B, 0x00130837, 0x00222819, \
+-0x00101B93, 0x00041000, 0x003A03B4, 0x00010200, \
+-0x00101793, 0x00238082, 0x0021304A, 0x0038003C, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x0010009C, 0x0024B83E, 0x00130826, 0x000C0001, \
+-0x0026083B, 0x00010200, 0x00134837, 0x000C0001, \
+-0x00101B93, 0x00041000, 0x0038051F, 0x00101313, \
+-0x00010400, 0x00380522, 0x00050600, 0x00100837, \
+-0x00101310, 0x00041000, 0x00080600, 0x00101790, \
+-0x0038051F, 0x00000000, 0x00000000, 0x00000000  \
+-}
+-
+-/********************************************************/
+-/*  CPUSaver micro code for the D101M (B-step only)     */
+-/********************************************************/
+-
+-/*  Version 2.10.1  */
+-
+-/*  Parameter values for the D101M B-step  */
+-#define D101M_CPUSAVER_TIMER_DWORD		78
+-#define D101M_CPUSAVER_BUNDLE_DWORD		65
+-#define D101M_CPUSAVER_MIN_SIZE_DWORD		126
+-
+-#define D101M_B_RCVBUNDLE_UCODE \
+-{\
+-0x00550215, 0xFFFF0437, 0xFFFFFFFF, 0x06A70789, 0xFFFFFFFF, 0x0558FFFF, \
+-0x000C0001, 0x00101312, 0x000C0008, 0x00380216, \
+-0x0010009C, 0x00204056, 0x002380CC, 0x00380056, \
+-0x0010009C, 0x00244C0B, 0x00000800, 0x00124818, \
+-0x00380438, 0x00000000, 0x00140000, 0x00380555, \
+-0x00308000, 0x00100662, 0x00100561, 0x000E0408, \
+-0x00134861, 0x000C0002, 0x00103093, 0x00308000, \
+-0x00100624, 0x00100561, 0x000E0408, 0x00100861, \
+-0x000C007E, 0x00222C21, 0x000C0002, 0x00103093, \
+-0x00380C7A, 0x00080000, 0x00103090, 0x00380C7A, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x0010009C, 0x00244C2D, 0x00010004, 0x00041000, \
+-0x003A0437, 0x00044010, 0x0038078A, 0x00000000, \
+-0x00100099, 0x00206C7A, 0x0010009C, 0x00244C48, \
+-0x00130824, 0x000C0001, 0x00101213, 0x00260C75, \
+-0x00041000, 0x00010004, 0x00130826, 0x000C0006, \
+-0x002206A8, 0x0013C926, 0x00101313, 0x003806A8, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x00080600, 0x00101B10, 0x00050004, 0x00100826, \
+-0x00101210, 0x00380C34, 0x00000000, 0x00000000, \
+-0x0021155B, 0x00100099, 0x00206559, 0x0010009C, \
+-0x00244559, 0x00130836, 0x000C0000, 0x00220C62, \
+-0x000C0001, 0x00101B13, 0x00229C0E, 0x00210C0E, \
+-0x00226C0E, 0x00216C0E, 0x0022FC0E, 0x00215C0E, \
+-0x00214C0E, 0x00380555, 0x00010004, 0x00041000, \
+-0x00278C67, 0x00040800, 0x00018100, 0x003A0437, \
+-0x00130826, 0x000C0001, 0x00220559, 0x00101313, \
+-0x00380559, 0x00000000, 0x00000000, 0x00000000, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x00000000, 0x00130831, 0x0010090B, 0x00124813, \
+-0x000CFF80, 0x002606AB, 0x00041000, 0x00010004, \
+-0x003806A8, 0x00000000, 0x00000000, 0x00000000, \
+-}
+-
+-/********************************************************/
+-/*  CPUSaver micro code for the D101S                   */
+-/********************************************************/
+-
+-/*  Version 1.20.1  */
+-
+-/*  Parameter values for the D101S  */
+-#define D101S_CPUSAVER_TIMER_DWORD		78
+-#define D101S_CPUSAVER_BUNDLE_DWORD		67
+-#define D101S_CPUSAVER_MIN_SIZE_DWORD		128
+-
+-#define D101S_RCVBUNDLE_UCODE \
+-{\
+-0x00550242, 0xFFFF047E, 0xFFFFFFFF, 0x06FF0818, 0xFFFFFFFF, 0x05A6FFFF, \
+-0x000C0001, 0x00101312, 0x000C0008, 0x00380243, \
+-0x0010009C, 0x00204056, 0x002380D0, 0x00380056, \
+-0x0010009C, 0x00244F8B, 0x00000800, 0x00124818, \
+-0x0038047F, 0x00000000, 0x00140000, 0x003805A3, \
+-0x00308000, 0x00100610, 0x00100561, 0x000E0408, \
+-0x00134861, 0x000C0002, 0x00103093, 0x00308000, \
+-0x00100624, 0x00100561, 0x000E0408, 0x00100861, \
+-0x000C007E, 0x00222FA1, 0x000C0002, 0x00103093, \
+-0x00380F90, 0x00080000, 0x00103090, 0x00380F90, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x0010009C, 0x00244FAD, 0x00010004, 0x00041000, \
+-0x003A047E, 0x00044010, 0x00380819, 0x00000000, \
+-0x00100099, 0x00206FFD, 0x0010009A, 0x0020AFFD, \
+-0x0010009C, 0x00244FC8, 0x00130824, 0x000C0001, \
+-0x00101213, 0x00260FF7, 0x00041000, 0x00010004, \
+-0x00130826, 0x000C0006, 0x00220700, 0x0013C926, \
+-0x00101313, 0x00380700, 0x00000000, 0x00000000, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x00080600, 0x00101B10, 0x00050004, 0x00100826, \
+-0x00101210, 0x00380FB6, 0x00000000, 0x00000000, \
+-0x002115A9, 0x00100099, 0x002065A7, 0x0010009A, \
+-0x0020A5A7, 0x0010009C, 0x002445A7, 0x00130836, \
+-0x000C0000, 0x00220FE4, 0x000C0001, 0x00101B13, \
+-0x00229F8E, 0x00210F8E, 0x00226F8E, 0x00216F8E, \
+-0x0022FF8E, 0x00215F8E, 0x00214F8E, 0x003805A3, \
+-0x00010004, 0x00041000, 0x00278FE9, 0x00040800, \
+-0x00018100, 0x003A047E, 0x00130826, 0x000C0001, \
+-0x002205A7, 0x00101313, 0x003805A7, 0x00000000, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x00000000, 0x00000000, 0x00000000, 0x00130831, \
+-0x0010090B, 0x00124813, 0x000CFF80, 0x00260703, \
+-0x00041000, 0x00010004, 0x00380700  \
+-}
+-
+-/********************************************************/
+-/*  CPUSaver micro code for the D102 B-step             */
+-/********************************************************/
+-
+-/*  Version 2.0  */
+-/*  Parameter values for the D102 B-step  */
+-#define D102_B_CPUSAVER_TIMER_DWORD		82
+-#define D102_B_CPUSAVER_BUNDLE_DWORD		106
+-#define D102_B_CPUSAVER_MIN_SIZE_DWORD		70
+-
+-#define     D102_B_RCVBUNDLE_UCODE \
+-{\
+-0x006F0276, 0x0EF71FFF, 0x0ED30F86, 0x0D250ED9, 0x1FFF1FFF, 0x1FFF04D2, \
+-0x00300001, 0x0140D871, 0x00300008, 0x00E00277, \
+-0x01406C57, 0x00816073, 0x008700FA, 0x00E00070, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x01406CBA, 0x00807F9A, 0x00901F9A, 0x0024FFFF, \
+-0x014B6F6F, 0x0030FFFE, 0x01407172, 0x01496FBA, \
+-0x014B6F72, 0x00308000, 0x01406C52, 0x00912EFC, \
+-0x00E00EF8, 0x00000000, 0x00000000, 0x00000000, \
+-0x00906F8C, 0x00900F8C, 0x00E00F87, 0x00000000, \
+-0x00906ED8, 0x01406C55, 0x00E00ED4, 0x00000000, \
+-0x01406C51, 0x0080DFC2, 0x01406C52, 0x00815FC2, \
+-0x01406C57, 0x00917FCC, 0x00E01FDD, 0x00000000, \
+-0x00822D30, 0x01406C51, 0x0080CD26, 0x01406C52, \
+-0x00814D26, 0x01406C57, 0x00916D26, 0x014C6FD7, \
+-0x00300000, 0x00841FD2, 0x00300001, 0x0140D772, \
+-0x00E012B3, 0x014C6F91, 0x0150710B, 0x01496F72, \
+-0x0030FF80, 0x00940EDD, 0x00102000, 0x00038400, \
+-0x00E00EDA, 0x00000000, 0x00000000, 0x00000000, \
+-0x01406C57, 0x00917FE9, 0x00001000, 0x00E01FE9, \
+-0x00200600, 0x0140D76F, 0x00138400, 0x01406FD8, \
+-0x0140D96F, 0x00E01FDD, 0x00038400, 0x00102000, \
+-0x00971FD7, 0x00101000, 0x00050200, 0x00E804D2, \
+-0x014C6FD8, 0x00300001, 0x00840D26, 0x0140D872, \
+-0x00E00D26, 0x014C6FD9, 0x00300001, 0x0140D972, \
+-0x00941FBD, 0x00102000, 0x00038400, 0x014C6FD8, \
+-0x00300006, 0x00840EDA, 0x014F71D8, 0x0140D872, \
+-0x00E00EDA, 0x01496F50, 0x00E004D3, 0x00000000, \
+-}
+-
+-/********************************************************/
+-/*  Micro code for the D102 C-step                      */
+-/********************************************************/
+-
+-/*  Parameter values for the D102 C-step  */
+-#define D102_C_CPUSAVER_TIMER_DWORD		46
+-#define D102_C_CPUSAVER_BUNDLE_DWORD		74
+-#define D102_C_CPUSAVER_MIN_SIZE_DWORD		54
+-
+-#define     D102_C_RCVBUNDLE_UCODE \
+-{ \
+-0x00700279, 0x0E6604E2, 0x02BF0CAE, 0x1508150C, 0x15190E5B, 0x0E840F13, \
+-0x00E014D8, 0x00000000, 0x00000000, 0x00000000, \
+-0x00E014DC, 0x00000000, 0x00000000, 0x00000000, \
+-0x00E014F4, 0x00000000, 0x00000000, 0x00000000, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x00E014E0, 0x00000000, 0x00000000, 0x00000000, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x00E014E7, 0x00000000, 0x00000000, 0x00000000, \
+-0x00141000, 0x015D6F0D, 0x00E002C0, 0x00000000, \
+-0x00200600, 0x00E0150D, 0x00000000, 0x00000000, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x0030FF80, 0x00940E6A, 0x00038200, 0x00102000, \
+-0x00E00E67, 0x00000000, 0x00000000, 0x00000000, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x00906E65, 0x00800E60, 0x00E00E5D, 0x00000000, \
+-0x00300006, 0x00E0151A, 0x00000000, 0x00000000, \
+-0x00906F19, 0x00900F19, 0x00E00F14, 0x00000000, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x01406CBA, 0x00807FDA, 0x00901FDA, 0x0024FFFF, \
+-0x014B6F6F, 0x0030FFFE, 0x01407172, 0x01496FBA, \
+-0x014B6F72, 0x00308000, 0x01406C52, 0x00912E89, \
+-0x00E00E85, 0x00000000, 0x00000000, 0x00000000  \
+-}
+-
+-/********************************************************/
+-/*  Micro code for the D102 E-step                      */
+-/********************************************************/
+-
+-/*  Parameter values for the D102 E-step  */
+-#define D102_E_CPUSAVER_TIMER_DWORD		42
+-#define D102_E_CPUSAVER_BUNDLE_DWORD		54
+-#define D102_E_CPUSAVER_MIN_SIZE_DWORD		46
+-
+-#define     D102_E_RCVBUNDLE_UCODE \
+-{\
+-0x007D028F, 0x0E4204F9, 0x14ED0C85, 0x14FA14E9, 0x1FFF1FFF, 0x1FFF1FFF, \
+-0x00E014B9, 0x00000000, 0x00000000, 0x00000000, \
+-0x00E014BD, 0x00000000, 0x00000000, 0x00000000, \
+-0x00E014D5, 0x00000000, 0x00000000, 0x00000000, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x00E014C1, 0x00000000, 0x00000000, 0x00000000, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x00000000, 0x00000000, 0x00000000, 0x00000000, \
+-0x00E014C8, 0x00000000, 0x00000000, 0x00000000, \
+-0x00200600, 0x00E014EE, 0x00000000, 0x00000000, \
+-0x0030FF80, 0x00940E46, 0x00038200, 0x00102000, \
+-0x00E00E43, 0x00000000, 0x00000000, 0x00000000, \
+-0x00300006, 0x00E014FB, 0x00000000, 0x00000000  \
+-}
+-
+-#endif /* _E100_UCODE_H_ */
+--- linux-2.6.0/drivers/net/e100/LICENSE	2003-06-14 12:18:24.000000000 -0700
++++ /dev/null	2002-08-30 16:31:37.000000000 -0700
+@@ -1,339 +0,0 @@
+-
+-"This software program is licensed subject to the GNU General Public License 
+-(GPL). Version 2, June 1991, available at 
+-<http://www.fsf.org/copyleft/gpl.html>"
+-
+-GNU General Public License 
+-
+-Version 2, June 1991
+-
+-Copyright (C) 1989, 1991 Free Software Foundation, Inc.  
+-59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+-
+-Everyone is permitted to copy and distribute verbatim copies of this license
+-document, but changing it is not allowed.
+-
+-Preamble
+-
+-The licenses for most software are designed to take away your freedom to 
+-share and change it. By contrast, the GNU General Public License is intended
+-to guarantee your freedom to share and change free software--to make sure 
+-the software is free for all its users. This General Public License applies 
+-to most of the Free Software Foundation's software and to any other program 
+-whose authors commit to using it. (Some other Free Software Foundation 
+-software is covered by the GNU Library General Public License instead.) You 
+-can apply it to your programs, too.
+-
+-When we speak of free software, we are referring to freedom, not price. Our
+-General Public Licenses are designed to make sure that you have the freedom 
+-to distribute copies of free software (and charge for this service if you 
+-wish), that you receive source code or can get it if you want it, that you 
+-can change the software or use pieces of it in new free programs; and that 
+-you know you can do these things.
+-
+-To protect your rights, we need to make restrictions that forbid anyone to 
+-deny you these rights or to ask you to surrender the rights. These 
+-restrictions translate to certain responsibilities for you if you distribute
+-copies of the software, or if you modify it.
+-
+-For example, if you distribute copies of such a program, whether gratis or 
+-for a fee, you must give the recipients all the rights that you have. You 
+-must make sure that they, too, receive or can get the source code. And you 
+-must show them these terms so they know their rights.
+- 
+-We protect your rights with two steps: (1) copyright the software, and (2) 
+-offer you this license which gives you legal permission to copy, distribute 
+-and/or modify the software. 
+-
+-Also, for each author's protection and ours, we want to make certain that 
+-everyone understands that there is no warranty for this free software. If 
+-the software is modified by someone else and passed on, we want its 
+-recipients to know that what they have is not the original, so that any 
+-problems introduced by others will not reflect on the original authors' 
+-reputations. 
+-
+-Finally, any free program is threatened constantly by software patents. We 
+-wish to avoid the danger that redistributors of a free program will 
+-individually obtain patent licenses, in effect making the program 
+-proprietary. To prevent this, we have made it clear that any patent must be 
+-licensed for everyone's free use or not licensed at all. 
+-
+-The precise terms and conditions for copying, distribution and modification 
+-follow. 
+-
+-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+-
+-0. This License applies to any program or other work which contains a notice
+-   placed by the copyright holder saying it may be distributed under the 
+-   terms of this General Public License. The "Program", below, refers to any
+-   such program or work, and a "work based on the Program" means either the 
+-   Program or any derivative work under copyright law: that is to say, a 
+-   work containing the Program or a portion of it, either verbatim or with 
+-   modifications and/or translated into another language. (Hereinafter, 
+-   translation is included without limitation in the term "modification".) 
+-   Each licensee is addressed as "you". 
+-
+-   Activities other than copying, distribution and modification are not 
+-   covered by this License; they are outside its scope. The act of running 
+-   the Program is not restricted, and the output from the Program is covered 
+-   only if its contents constitute a work based on the Program (independent 
+-   of having been made by running the Program). Whether that is true depends
+-   on what the Program does. 
+-
+-1. You may copy and distribute verbatim copies of the Program's source code 
+-   as you receive it, in any medium, provided that you conspicuously and 
+-   appropriately publish on each copy an appropriate copyright notice and 
+-   disclaimer of warranty; keep intact all the notices that refer to this 
+-   License and to the absence of any warranty; and give any other recipients 
+-   of the Program a copy of this License along with the Program. 
+-
+-   You may charge a fee for the physical act of transferring a copy, and you 
+-   may at your option offer warranty protection in exchange for a fee. 
+-
+-2. You may modify your copy or copies of the Program or any portion of it, 
+-   thus forming a work based on the Program, and copy and distribute such 
+-   modifications or work under the terms of Section 1 above, provided that 
+-   you also meet all of these conditions: 
+-
+-   * a) You must cause the modified files to carry prominent notices stating 
+-        that you changed the files and the date of any change. 
+-
+-   * b) You must cause any work that you distribute or publish, that in 
+-        whole or in part contains or is derived from the Program or any part 
+-        thereof, to be licensed as a whole at no charge to all third parties
+-        under the terms of this License. 
+-
+-   * c) If the modified program normally reads commands interactively when 
+-        run, you must cause it, when started running for such interactive 
+-        use in the most ordinary way, to print or display an announcement 
+-        including an appropriate copyright notice and a notice that there is
+-        no warranty (or else, saying that you provide a warranty) and that 
+-        users may redistribute the program under these conditions, and 
+-        telling the user how to view a copy of this License. (Exception: if 
+-        the Program itself is interactive but does not normally print such 
+-        an announcement, your work based on the Program is not required to 
+-        print an announcement.) 
+-
+-   These requirements apply to the modified work as a whole. If identifiable 
+-   sections of that work are not derived from the Program, and can be 
+-   reasonably considered independent and separate works in themselves, then 
+-   this License, and its terms, do not apply to those sections when you 
+-   distribute them as separate works. But when you distribute the same 
+-   sections as part of a whole which is a work based on the Program, the 
+-   distribution of the whole must be on the terms of this License, whose 
+-   permissions for other licensees extend to the entire whole, and thus to 
+-   each and every part regardless of who wrote it. 
+-
+-   Thus, it is not the intent of this section to claim rights or contest 
+-   your rights to work written entirely by you; rather, the intent is to 
+-   exercise the right to control the distribution of derivative or 
+-   collective works based on the Program. 
+-
+-   In addition, mere aggregation of another work not based on the Program 
+-   with the Program (or with a work based on the Program) on a volume of a 
+-   storage or distribution medium does not bring the other work under the 
+-   scope of this License. 
+-
+-3. You may copy and distribute the Program (or a work based on it, under 
+-   Section 2) in object code or executable form under the terms of Sections 
+-   1 and 2 above provided that you also do one of the following: 
+-
+-   * a) Accompany it with the complete corresponding machine-readable source 
+-        code, which must be distributed under the terms of Sections 1 and 2 
+-        above on a medium customarily used for software interchange; or, 
+-
+-   * b) Accompany it with a written offer, valid for at least three years, 
+-        to give any third party, for a charge no more than your cost of 
+-        physically performing source distribution, a complete machine-
+-        readable copy of the corresponding source code, to be distributed 
+-        under the terms of Sections 1 and 2 above on a medium customarily 
+-        used for software interchange; or, 
+-
+-   * c) Accompany it with the information you received as to the offer to 
+-        distribute corresponding source code. (This alternative is allowed 
+-        only for noncommercial distribution and only if you received the 
+-        program in object code or executable form with such an offer, in 
+-        accord with Subsection b above.) 
+-
+-   The source code for a work means the preferred form of the work for 
+-   making modifications to it. For an executable work, complete source code 
+-   means all the source code for all modules it contains, plus any 
+-   associated interface definition files, plus the scripts used to control 
+-   compilation and installation of the executable. However, as a special 
+-   exception, the source code distributed need not include anything that is 
+-   normally distributed (in either source or binary form) with the major 
+-   components (compiler, kernel, and so on) of the operating system on which
+-   the executable runs, unless that component itself accompanies the 
+-   executable. 
+-
+-   If distribution of executable or object code is made by offering access 
+-   to copy from a designated place, then offering equivalent access to copy 
+-   the source code from the same place counts as distribution of the source 
+-   code, even though third parties are not compelled to copy the source 
+-   along with the object code. 
+-
+-4. You may not copy, modify, sublicense, or distribute the Program except as
+-   expressly provided under this License. Any attempt otherwise to copy, 
+-   modify, sublicense or distribute the Program is void, and will 
+-   automatically terminate your rights under this License. However, parties 
+-   who have received copies, or rights, from you under this License will not
+-   have their licenses terminated so long as such parties remain in full 
+-   compliance. 
+-
+-5. You are not required to accept this License, since you have not signed 
+-   it. However, nothing else grants you permission to modify or distribute 
+-   the Program or its derivative works. These actions are prohibited by law 
+-   if you do not accept this License. Therefore, by modifying or 
+-   distributing the Program (or any work based on the Program), you 
+-   indicate your acceptance of this License to do so, and all its terms and
+-   conditions for copying, distributing or modifying the Program or works 
+-   based on it. 
+-
+-6. Each time you redistribute the Program (or any work based on the 
+-   Program), the recipient automatically receives a license from the 
+-   original licensor to copy, distribute or modify the Program subject to 
+-   these terms and conditions. You may not impose any further restrictions 
+-   on the recipients' exercise of the rights granted herein. You are not 
+-   responsible for enforcing compliance by third parties to this License. 
+-
+-7. If, as a consequence of a court judgment or allegation of patent 
+-   infringement or for any other reason (not limited to patent issues), 
+-   conditions are imposed on you (whether by court order, agreement or 
+-   otherwise) that contradict the conditions of this License, they do not 
+-   excuse you from the conditions of this License. If you cannot distribute 
+-   so as to satisfy simultaneously your obligations under this License and 
+-   any other pertinent obligations, then as a consequence you may not 
+-   distribute the Program at all. For example, if a patent license would 
+-   not permit royalty-free redistribution of the Program by all those who 
+-   receive copies directly or indirectly through you, then the only way you 
+-   could satisfy both it and this License would be to refrain entirely from 
+-   distribution of the Program. 
+-
+-   If any portion of this section is held invalid or unenforceable under any
+-   particular circumstance, the balance of the section is intended to apply
+-   and the section as a whole is intended to apply in other circumstances. 
+-
+-   It is not the purpose of this section to induce you to infringe any 
+-   patents or other property right claims or to contest validity of any 
+-   such claims; this section has the sole purpose of protecting the 
+-   integrity of the free software distribution system, which is implemented 
+-   by public license practices. Many people have made generous contributions
+-   to the wide range of software distributed through that system in 
+-   reliance on consistent application of that system; it is up to the 
+-   author/donor to decide if he or she is willing to distribute software 
+-   through any other system and a licensee cannot impose that choice. 
+-
+-   This section is intended to make thoroughly clear what is believed to be 
+-   a consequence of the rest of this License. 
+-
+-8. If the distribution and/or use of the Program is restricted in certain 
+-   countries either by patents or by copyrighted interfaces, the original 
+-   copyright holder who places the Program under this License may add an 
+-   explicit geographical distribution limitation excluding those countries, 
+-   so that distribution is permitted only in or among countries not thus 
+-   excluded. In such case, this License incorporates the limitation as if 
+-   written in the body of this License. 
+-
+-9. The Free Software Foundation may publish revised and/or new versions of 
+-   the General Public License from time to time. Such new versions will be 
+-   similar in spirit to the present version, but may differ in detail to 
+-   address new problems or concerns. 
+-
+-   Each version is given a distinguishing version number. If the Program 
+-   specifies a version number of this License which applies to it and "any 
+-   later version", you have the option of following the terms and 
+-   conditions either of that version or of any later version published by 
+-   the Free Software Foundation. If the Program does not specify a version 
+-   number of this License, you may choose any version ever published by the 
+-   Free Software Foundation. 
+-
+-10. If you wish to incorporate parts of the Program into other free programs
+-    whose distribution conditions are different, write to the author to ask 
+-    for permission. For software which is copyrighted by the Free Software 
+-    Foundation, write to the Free Software Foundation; we sometimes make 
+-    exceptions for this. Our decision will be guided by the two goals of 
+-    preserving the free status of all derivatives of our free software and 
+-    of promoting the sharing and reuse of software generally. 
+-
+-   NO WARRANTY
+-
+-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY 
+-    FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN 
+-    OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES 
+-    PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER 
+-    EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
+-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE 
+-    ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH 
+-    YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL 
+-    NECESSARY SERVICING, REPAIR OR CORRECTION. 
+-
+-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING 
+-    WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR 
+-    REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR 
+-    DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL 
+-    DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM 
+-    (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED 
+-    INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF 
+-    THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR 
+-    OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
+-
+-END OF TERMS AND CONDITIONS
+-
+-How to Apply These Terms to Your New Programs
+-
+-If you develop a new program, and you want it to be of the greatest 
+-possible use to the public, the best way to achieve this is to make it free 
+-software which everyone can redistribute and change under these terms. 
+-
+-To do so, attach the following notices to the program. It is safest to 
+-attach them to the start of each source file to most effectively convey the
+-exclusion of warranty; and each file should have at least the "copyright" 
+-line and a pointer to where the full notice is found. 
+-
+-one line to give the program's name and an idea of what it does.
+-Copyright (C) yyyy  name of author
+-
+-This program is free software; you can redistribute it and/or modify it 
+-under the terms of the GNU General Public License as published by the Free 
+-Software Foundation; either version 2 of the License, or (at your option) 
+-any later version.
+-
+-This program is distributed in the hope that it will be useful, but WITHOUT 
+-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
+-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
+-more details.
+-
+-You should have received a copy of the GNU General Public License along with
+-this program; if not, write to the Free Software Foundation, Inc., 59 
+-Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+-
+-Also add information on how to contact you by electronic and paper mail. 
+-
+-If the program is interactive, make it output a short notice like this when 
+-it starts in an interactive mode: 
+-
+-Gnomovision version 69, Copyright (C) year name of author Gnomovision comes 
+-with ABSOLUTELY NO WARRANTY; for details type 'show w'.  This is free 
+-software, and you are welcome to redistribute it under certain conditions; 
+-type 'show c' for details.
+-
+-The hypothetical commands 'show w' and 'show c' should show the appropriate 
+-parts of the General Public License. Of course, the commands you use may be 
+-called something other than 'show w' and 'show c'; they could even be 
+-mouse-clicks or menu items--whatever suits your program. 
+-
+-You should also get your employer (if you work as a programmer) or your 
+-school, if any, to sign a "copyright disclaimer" for the program, if 
+-necessary. Here is a sample; alter the names: 
+-
+-Yoyodyne, Inc., hereby disclaims all copyright interest in the program 
+-'Gnomovision' (which makes passes at compilers) written by James Hacker.
+-
+-signature of Ty Coon, 1 April 1989
+-Ty Coon, President of Vice
+-
+-This General Public License does not permit incorporating your program into 
+-proprietary programs. If your program is a subroutine library, you may 
+-consider it more useful to permit linking proprietary applications with the 
+-library. If this is what you want to do, use the GNU Library General Public 
+-License instead of this License.
+--- linux-2.6.0/drivers/net/e100/Makefile	2003-06-14 12:18:34.000000000 -0700
++++ /dev/null	2002-08-30 16:31:37.000000000 -0700
+@@ -1,8 +0,0 @@
+-#
+-# Makefile for the Intel's E100 ethernet driver
+-#
+-
+-obj-$(CONFIG_E100) += e100.o
+-
+-e100-objs := e100_main.o e100_config.o e100_phy.o \
+-	     e100_eeprom.o e100_test.o
+--- linux-2.6.0/drivers/net/e2100.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/e2100.c	2003-12-28 23:21:01.000000000 -0800
+@@ -95,7 +95,6 @@ static inline void mem_off(short port)
+ #define E21_BIG_RX_STOP_PG	0xF0	/* Last page +1 of RX ring */
+ #define E21_TX_START_PG		E21_RX_STOP_PG	/* First page of TX buffer */
+ 
+-int e2100_probe(struct net_device *dev);
+ static int e21_probe1(struct net_device *dev, int ioaddr);
+ 
+ static int e21_open(struct net_device *dev);
+@@ -117,10 +116,11 @@ static int e21_close(struct net_device *
+ 	station address).
+  */
+ 
+-int  __init e2100_probe(struct net_device *dev)
++static int  __init do_e2100_probe(struct net_device *dev)
+ {
+ 	int *port;
+ 	int base_addr = dev->base_addr;
++	int irq = dev->irq;
+ 
+ 	SET_MODULE_OWNER(dev);
+ 
+@@ -129,13 +129,46 @@ int  __init e2100_probe(struct net_devic
+ 	else if (base_addr != 0)	/* Don't probe at all. */
+ 		return -ENXIO;
+ 
+-	for (port = e21_probe_list; *port; port++)
++	for (port = e21_probe_list; *port; port++) {
++		dev->irq = irq;
+ 		if (e21_probe1(dev, *port) == 0)
+ 			return 0;
++	}
+ 
+ 	return -ENODEV;
+ }
+ 
++static void cleanup_card(struct net_device *dev)
++{
++	/* NB: e21_close() handles free_irq */
++	release_region(dev->base_addr, E21_IO_EXTENT);
++}
++
++struct net_device * __init e2100_probe(int unit)
++{
++	struct net_device *dev = alloc_ei_netdev();
++	int err;
++
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	sprintf(dev->name, "eth%d", unit);
++	netdev_boot_setup_check(dev);
++
++	err = do_e2100_probe(dev);
++	if (err)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	cleanup_card(dev);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
++}
++
+ static int __init e21_probe1(struct net_device *dev, int ioaddr)
+ {
+ 	int i, status, retval;
+@@ -175,13 +208,6 @@ static int __init e21_probe1(struct net_
+ 	for (i = 0; i < 6; i++)
+ 		printk(" %02X", station_addr[i]);
+ 
+-	/* Allocate dev->priv and fill in 8390 specific dev fields. */
+-	if (ethdev_init(dev)) {
+-		printk (" unable to get memory for dev->priv.\n");
+-		retval = -ENOMEM;
+-		goto out;
+-	}
+-
+ 	if (dev->irq < 2) {
+ 		int irqlist[] = {15,11,10,12,5,9,3,4}, i;
+ 		for (i = 0; i < 8; i++)
+@@ -191,8 +217,6 @@ static int __init e21_probe1(struct net_
+ 			}
+ 		if (i >= 8) {
+ 			printk(" unable to get IRQ %d.\n", dev->irq);
+-			kfree(dev->priv);
+-			dev->priv = NULL;
+ 			retval = -EAGAIN;
+ 			goto out;
+ 		}
+@@ -376,7 +400,7 @@ e21_close(struct net_device *dev)
+ 
+ #ifdef MODULE
+ #define MAX_E21_CARDS	4	/* Max number of E21 cards per module */
+-static struct net_device dev_e21[MAX_E21_CARDS];
++static struct net_device *dev_e21[MAX_E21_CARDS];
+ static int io[MAX_E21_CARDS];
+ static int irq[MAX_E21_CARDS];
+ static int mem[MAX_E21_CARDS];
+@@ -398,29 +422,35 @@ ISA device autoprobes on a running machi
+ int
+ init_module(void)
+ {
++	struct net_device *dev;
+ 	int this_dev, found = 0;
+ 
+ 	for (this_dev = 0; this_dev < MAX_E21_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_e21[this_dev];
+-		dev->irq = irq[this_dev];
+-		dev->base_addr = io[this_dev];
+-		dev->mem_start = mem[this_dev];
+-		dev->mem_end = xcvr[this_dev];	/* low 4bits = xcvr sel. */
+-		dev->init = e2100_probe;
+ 		if (io[this_dev] == 0)  {
+ 			if (this_dev != 0) break; /* only autoprobe 1st one */
+ 			printk(KERN_NOTICE "e2100.c: Presently autoprobing (not recommended) for a single card.\n");
+ 		}
+-		if (register_netdev(dev) != 0) {
+-			printk(KERN_WARNING "e2100.c: No E2100 card found (i/o = 0x%x).\n", io[this_dev]);
+-			if (found != 0) {	/* Got at least one. */
+-				return 0;
++		dev = alloc_ei_netdev();
++		if (!dev)
++			break;
++		dev->irq = irq[this_dev];
++		dev->base_addr = io[this_dev];
++		dev->mem_start = mem[this_dev];
++		dev->mem_end = xcvr[this_dev];	/* low 4bits = xcvr sel. */
++		if (do_e2100_probe(dev) == 0) {
++			if (register_netdev(dev) == 0) {
++				dev_e21[found++] = dev;
++				continue;
+ 			}
+-			return -ENXIO;
++			cleanup_card(dev);
+ 		}
+-		found++;
++		free_netdev(dev);
++		printk(KERN_WARNING "e2100.c: No E2100 card found (i/o = 0x%x).\n", io[this_dev]);
++		break;
+ 	}
+-	return 0;
++	if (found)
++		return 0;
++	return -ENXIO;
+ }
+ 
+ void
+@@ -429,13 +459,11 @@ cleanup_module(void)
+ 	int this_dev;
+ 
+ 	for (this_dev = 0; this_dev < MAX_E21_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_e21[this_dev];
+-		if (dev->priv != NULL) {
+-			void *priv = dev->priv;
+-			/* NB: e21_close() handles free_irq */
+-			release_region(dev->base_addr, E21_IO_EXTENT);
++		struct net_device *dev = dev_e21[this_dev];
++		if (dev) {
+ 			unregister_netdev(dev);
+-			kfree(priv);
++			cleanup_card(dev);
++			free_netdev(dev);
+ 		}
+ 	}
+ }
+--- linux-2.6.0/drivers/net/eepro100.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/net/eepro100.c	2003-12-28 23:21:01.000000000 -0800
+@@ -542,6 +542,7 @@ static int speedo_start_xmit(struct sk_b
+ static void speedo_refill_rx_buffers(struct net_device *dev, int force);
+ static int speedo_rx(struct net_device *dev);
+ static void speedo_tx_buffer_gc(struct net_device *dev);
++static void poll_speedo (struct net_device *dev);
+ static irqreturn_t speedo_interrupt(int irq, void *dev_instance, struct pt_regs *regs);
+ static int speedo_close(struct net_device *dev);
+ static struct net_device_stats *speedo_get_stats(struct net_device *dev);
+@@ -885,6 +886,9 @@ static int __devinit speedo_found1(struc
+ 	dev->get_stats = &speedo_get_stats;
+ 	dev->set_multicast_list = &set_rx_mode;
+ 	dev->do_ioctl = &speedo_ioctl;
++#ifdef CONFIG_NET_POLL_CONTROLLER
++	dev->poll_controller = &poll_speedo;
++#endif
+ 
+ 	if (register_netdevice(dev))
+ 		goto err_free_unlock;
+@@ -1675,6 +1679,23 @@ static irqreturn_t speedo_interrupt(int 
+ 	return IRQ_RETVAL(handled);
+ }
+ 
++#ifdef CONFIG_NET_POLL_CONTROLLER
++/*
++ * Polling 'interrupt' - used by things like netconsole to send skbs
++ * without having to re-enable interrupts. It's not called while
++ * the interrupt routine is executing.
++ */
++
++static void poll_speedo (struct net_device *dev)
++{
++	/* disable_irq is not very nice, but with the funny lockless design
++	   we have no other choice. */
++	disable_irq(dev->irq);
++	speedo_interrupt (dev->irq, dev, NULL);
++	enable_irq(dev->irq);
++}
++#endif
++
+ static inline struct RxFD *speedo_rx_alloc(struct net_device *dev, int entry)
+ {
+ 	struct speedo_private *sp = (struct speedo_private *)dev->priv;
+--- linux-2.6.0/drivers/net/eepro.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/eepro.c	2003-12-28 23:21:01.000000000 -0800
+@@ -302,9 +302,7 @@ struct eepro_local {
+ 
+ /* Index to functions, as function prototypes. */
+ 
+-extern int eepro_probe(struct net_device *dev);
+-
+-static int	eepro_probe1(struct net_device *dev, short ioaddr);
++static int	eepro_probe1(struct net_device *dev, int autoprobe);
+ static int	eepro_open(struct net_device *dev);
+ static int	eepro_send_packet(struct sk_buff *skb, struct net_device *dev);
+ static irqreturn_t eepro_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+@@ -527,10 +525,11 @@ buffer (transmit-buffer = 32K - receive-
+    If dev->base_addr == 2, allocate space for the device and return success
+    (detachable devices only).
+    */
+-int __init eepro_probe(struct net_device *dev)
++static int __init do_eepro_probe(struct net_device *dev)
+ {
+ 	int i;
+ 	int base_addr = dev->base_addr;
++	int irq = dev->irq;
+ 
+ 	SET_MODULE_OWNER(dev);
+ 
+@@ -563,24 +562,48 @@ int __init eepro_probe(struct net_device
+ #endif
+ 
+ 	if (base_addr > 0x1ff)		/* Check a single specified location. */
+-		return eepro_probe1(dev, base_addr);
++		return eepro_probe1(dev, 0);
+ 
+ 	else if (base_addr != 0)	/* Don't probe at all. */
+ 		return -ENXIO;
+ 
+-
+ 	for (i = 0; eepro_portlist[i]; i++) {
+-		int ioaddr = eepro_portlist[i];
+-
+-		if (check_region(ioaddr, EEPRO_IO_EXTENT))
+-			continue;
+-		if (eepro_probe1(dev, ioaddr) == 0)
++		dev->base_addr = eepro_portlist[i];
++		dev->irq = irq;
++		if (eepro_probe1(dev, 1) == 0)
+ 			return 0;
+ 	}
+ 
+ 	return -ENODEV;
+ }
+ 
++struct net_device * __init eepro_probe(int unit)
++{
++	struct net_device *dev = alloc_etherdev(sizeof(struct eepro_local));
++	int err;
++
++	if (!dev)
++		return ERR_PTR(-ENODEV);
++
++	SET_MODULE_OWNER(dev);
++
++	sprintf(dev->name, "eth%d", unit);
++	netdev_boot_setup_check(dev);
++
++	err = do_eepro_probe(dev);
++	if (err)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	release_region(dev->base_addr, EEPRO_IO_EXTENT);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
++}
++
+ static void __init printEEPROMInfo(short ioaddr, struct net_device *dev)
+ {
+ 	unsigned short Word;
+@@ -713,83 +736,75 @@ static void eepro_print_info (struct net
+    probes on the ISA bus.  A good device probe avoids doing writes, and
+    verifies that the correct device exists and functions.  */
+ 
+-static int __init eepro_probe1(struct net_device *dev, short ioaddr)
++static int __init eepro_probe1(struct net_device *dev, int autoprobe)
+ {
+ 	unsigned short station_addr[6], id, counter;
+-	int i, j, irqMask, retval = 0;
++	int i;
+ 	struct eepro_local *lp;
+ 	enum iftype { AUI=0, BNC=1, TPE=2 };
++	int ioaddr = dev->base_addr;
++
++	/* Grab the region so we can find another board if autoIRQ fails. */
++	if (!request_region(ioaddr, EEPRO_IO_EXTENT, dev->name)) { 
++		if (!autoprobe)
++			printk(KERN_WARNING "EEPRO: io-port 0x%04x in use \n",
++				ioaddr);
++		return -EBUSY;
++	}
+ 
+ 	/* Now, we are going to check for the signature of the
+ 	   ID_REG (register 2 of bank 0) */
+ 
+-	id=inb(ioaddr + ID_REG);
++	id = inb(ioaddr + ID_REG);
+ 
+-	if (((id) & ID_REG_MASK) != ID_REG_SIG) {
+-		retval = -ENODEV;
++	if ((id & ID_REG_MASK) != ID_REG_SIG)
+ 		goto exit;
+-	}
+ 
+-		/* We seem to have the 82595 signature, let's
+-		   play with its counter (last 2 bits of
+-		   register 2 of bank 0) to be sure. */
++	/* We seem to have the 82595 signature, let's
++	   play with its counter (last 2 bits of
++	   register 2 of bank 0) to be sure. */
+ 
+-		counter = (id & R_ROBIN_BITS);
+-
+-	if (((id=inb(ioaddr+ID_REG)) & R_ROBIN_BITS)!=(counter + 0x40)) {
+-		retval = -ENODEV;
+-		goto exit;
+-	}
++	counter = id & R_ROBIN_BITS;
+ 
+-			/* Initialize the device structure */
+-			dev->priv = kmalloc(sizeof(struct eepro_local), GFP_KERNEL);
+-	if (!dev->priv) {
+-		retval = -ENOMEM;
++	if ((inb(ioaddr + ID_REG) & R_ROBIN_BITS) != (counter + 0x40))
+ 		goto exit;
+-	}
+-
+-			memset(dev->priv, 0, sizeof(struct eepro_local));
+-
+-			lp = (struct eepro_local *)dev->priv;
+ 
+-	/* default values */
+-	lp->eepro = 0;
++	lp = (struct eepro_local *)dev->priv;
++	memset(lp, 0, sizeof(struct eepro_local));
+ 	lp->xmt_bar = XMT_BAR_PRO;
+ 	lp->xmt_lower_limit_reg = XMT_LOWER_LIMIT_REG_PRO;
+ 	lp->xmt_upper_limit_reg = XMT_UPPER_LIMIT_REG_PRO;
+ 	lp->eeprom_reg = EEPROM_REG_PRO;
++	spin_lock_init(&lp->lock);
+ 
+-			/* Now, get the ethernet hardware address from
+-			   the EEPROM */
+-			station_addr[0] = read_eeprom(ioaddr, 2, dev);
+-
+-			/* FIXME - find another way to know that we've found
+-			 * an Etherexpress 10
+-			 */
+-			if (station_addr[0] == 0x0000 ||
+-			    station_addr[0] == 0xffff) {
+-				lp->eepro = LAN595FX_10ISA;
++	/* Now, get the ethernet hardware address from
++	   the EEPROM */
++	station_addr[0] = read_eeprom(ioaddr, 2, dev);
++
++	/* FIXME - find another way to know that we've found
++	 * an Etherexpress 10
++	 */
++	if (station_addr[0] == 0x0000 || station_addr[0] == 0xffff) {
++		lp->eepro = LAN595FX_10ISA;
+ 		lp->eeprom_reg = EEPROM_REG_10;
+ 		lp->xmt_lower_limit_reg = XMT_LOWER_LIMIT_REG_10;
+ 		lp->xmt_upper_limit_reg = XMT_UPPER_LIMIT_REG_10;
+ 		lp->xmt_bar = XMT_BAR_10;
+-				station_addr[0] = read_eeprom(ioaddr, 2, dev);
+-			}
+-			station_addr[1] = read_eeprom(ioaddr, 3, dev);
+-			station_addr[2] = read_eeprom(ioaddr, 4, dev);
++		station_addr[0] = read_eeprom(ioaddr, 2, dev);
++	}
++	station_addr[1] = read_eeprom(ioaddr, 3, dev);
++	station_addr[2] = read_eeprom(ioaddr, 4, dev);
+ 
+ 	if (!lp->eepro) {
+ 		if (read_eeprom(ioaddr,7,dev)== ee_FX_INT2IRQ)
+ 			lp->eepro = 2;
+ 		else if (station_addr[2] == SA_ADDR1)
+ 			lp->eepro = 1;
+-			}
+-
+-			/* Fill in the 'dev' fields. */
+-			dev->base_addr = ioaddr;
++	}
+ 
++	/* Fill in the 'dev' fields. */
+ 	for (i=0; i < 6; i++)
+-				dev->dev_addr[i] = ((unsigned char *) station_addr)[5-i];
++		dev->dev_addr[i] = ((unsigned char *) station_addr)[5-i];
+ 
+ 	/* RX buffer must be more than 3K and less than 29K */
+ 	if (dev->mem_end < 3072 || dev->mem_end > 29696)
+@@ -798,65 +813,49 @@ static int __init eepro_probe1(struct ne
+ 	/* calculate {xmt,rcv}_{lower,upper}_limit */
+ 	eepro_recalc(dev);
+ 
+-
+-			if (GetBit( read_eeprom(ioaddr, 5, dev),ee_BNC_TPE))
+-				dev->if_port = BNC;
++	if (GetBit( read_eeprom(ioaddr, 5, dev),ee_BNC_TPE))
++		dev->if_port = BNC;
+ 	else
+ 		dev->if_port = TPE;
+ 
+-	if ((dev->irq < 2) && (lp->eepro!=0)) {
+-				i = read_eeprom(ioaddr, 1, dev);
+-				irqMask = read_eeprom(ioaddr, 7, dev);
+-				i &= 0x07; /* Mask off INT number */
+-
+-				for (j=0; ((j<16) && (i>=0)); j++) {
+-					if ((irqMask & (1<<j))!=0) {
+-						if (i==0) {
+-							dev->irq = j;
+-							break; /* found bit corresponding to irq */
+-						}
+-						i--; /* count bits set in irqMask */
+-					}
+-				}
+-				if (dev->irq < 2) {
+-			printk(KERN_ERR " Duh! invalid interrupt vector stored in EEPROM.\n");
+-			retval = -ENODEV;
+-			goto freeall;
+-				} else
+-			if (dev->irq==2) dev->irq = 9;
+-			}
+-
+-			/* Grab the region so we can find another board if autoIRQ fails. */
+-			if (!request_region(ioaddr, EEPRO_IO_EXTENT, dev->name)) { 
+-				printk(KERN_WARNING "EEPRO: io-port 0x%04x in use \n", ioaddr);
+-				goto freeall;
+-			}
+-			((struct eepro_local *)dev->priv)->lock = SPIN_LOCK_UNLOCKED;
+-
+-			dev->open               = eepro_open;
+-			dev->stop               = eepro_close;
+-			dev->hard_start_xmit    = eepro_send_packet;
+-			dev->get_stats          = eepro_get_stats;
+-			dev->set_multicast_list = &set_multicast_list;
+-			dev->tx_timeout		= eepro_tx_timeout;
+-			dev->watchdog_timeo	= TX_TIMEOUT;
+-
+-			/* Fill in the fields of the device structure with
+-			   ethernet generic values */
+-			ether_setup(dev);
+-
++ 	if (dev->irq < 2 && lp->eepro != 0) {
++ 		/* Mask off INT number */
++ 		int count = read_eeprom(ioaddr, 1, dev) & 7;
++ 		unsigned irqMask = read_eeprom(ioaddr, 7, dev);
++ 
++ 		while (count--)
++ 			irqMask &= irqMask - 1;
++ 
++ 		count = ffs(irqMask);
++ 
++ 		if (count)
++ 			dev->irq = count - 1;
++ 
++ 		if (dev->irq < 2) {
++ 			printk(KERN_ERR " Duh! illegal interrupt vector stored in EEPROM.\n");
++ 			goto exit;
++ 		} else if (dev->irq == 2) {
++ 			dev->irq = 9;
++ 		}
++ 	}
++ 
++ 	dev->open               = eepro_open;
++ 	dev->stop               = eepro_close;
++ 	dev->hard_start_xmit    = eepro_send_packet;
++ 	dev->get_stats          = eepro_get_stats;
++ 	dev->set_multicast_list = &set_multicast_list;
++ 	dev->tx_timeout		= eepro_tx_timeout;
++ 	dev->watchdog_timeo	= TX_TIMEOUT;
++ 
+ 	/* print boot time info */
+ 	eepro_print_info(dev);
+ 
+ 	/* reset 82595 */
+-			eepro_reset(ioaddr);
+-
++	eepro_reset(ioaddr);
++	return 0;
+ exit:
+-	return retval;
+-freeall:
+-	kfree(dev->priv);
+-	goto exit;
+-
++ 	release_region(dev->base_addr, EEPRO_IO_EXTENT);
++ 	return -ENODEV;
+ }
+ 
+ /* Open/initialize the board.  This is called (in the current kernel)
+@@ -1701,7 +1700,7 @@ eepro_transmit_interrupt(struct net_devi
+ #ifdef MODULE
+ 
+ #define MAX_EEPRO 8
+-static struct net_device dev_eepro[MAX_EEPRO];
++static struct net_device *dev_eepro[MAX_EEPRO];
+ 
+ static int io[MAX_EEPRO];
+ static int irq[MAX_EEPRO];
+@@ -1729,6 +1728,7 @@ MODULE_PARM_DESC(autodetect, "EtherExpre
+ int
+ init_module(void)
+ {
++	struct net_device *dev;
+ 	int i;
+ 	if (io[0] == 0 && autodetect == 0) {
+ 		printk(KERN_WARNING "eepro_init_module: Probe is very dangerous in ISA boards!\n");
+@@ -1743,17 +1743,24 @@ init_module(void)
+ 	}
+ 
+ 	for (i = 0; i < MAX_EEPRO; i++) {
+-		struct net_device *d = &dev_eepro[n_eepro];
+-		d->mem_end	= mem[i];
+-		d->base_addr	= io[i];
+-		d->irq		= irq[i];
+-		d->init		= eepro_probe;
+-
+-			if (register_netdev(d) == 0)
+-				n_eepro++;
+-			else
+-				break;
++		dev = alloc_etherdev(sizeof(struct eepro_local));
++		if (!dev)
++			break;
++
++		dev->mem_end = mem[i];
++		dev->base_addr = io[i];
++		dev->irq = irq[i];
++
++		if (do_eepro_probe(dev) == 0) {
++			if (register_netdev(dev) == 0) {
++				dev_eepro[n_eepro++] = dev;
++				continue;
++			}
++			release_region(dev->base_addr, EEPRO_IO_EXTENT);
+ 		}
++		free_netdev(dev);
++		break;
++	}
+ 
+ 	if (n_eepro)
+ 		printk(KERN_INFO "%s", version);
+@@ -1767,15 +1774,10 @@ cleanup_module(void)
+ 	int i;
+ 
+ 	for (i=0; i<n_eepro; i++) {
+-		struct net_device *d = &dev_eepro[i];
+-		unregister_netdev(d);
+-
+-		kfree(d->priv);
+-		d->priv=NULL;
+-
+-		/* If we don't do this, we can't re-insmod it later. */
+-		release_region(d->base_addr, EEPRO_IO_EXTENT);
+-
++		struct net_device *dev = dev_eepro[i];
++		unregister_netdev(dev);
++		release_region(dev->base_addr, EEPRO_IO_EXTENT);
++		free_netdev(dev);
+ 	}
+ }
+ #endif /* MODULE */
+--- linux-2.6.0/drivers/net/eexpress.c	2003-10-08 15:07:09.000000000 -0700
++++ 25/drivers/net/eexpress.c	2003-12-28 23:21:01.000000000 -0800
+@@ -244,7 +244,6 @@ static char mca_irqmap[] = { 12, 9, 3, 4
+  * Prototypes for Linux interface
+  */
+ 
+-extern int express_probe(struct net_device *dev);
+ static int eexp_open(struct net_device *dev);
+ static int eexp_close(struct net_device *dev);
+ static void eexp_timeout(struct net_device *dev);
+@@ -334,11 +333,13 @@ static inline unsigned short int SHADOW(
+  * checks for presence of EtherExpress card
+  */
+ 
+-int __init express_probe(struct net_device *dev)
++static int __init do_express_probe(struct net_device *dev)
+ {
+ 	unsigned short *port;
+ 	static unsigned short ports[] = { 0x240,0x300,0x310,0x270,0x320,0x340,0 };
+ 	unsigned short ioaddr = dev->base_addr;
++	int dev_irq = dev->irq;
++	int err;
+ 
+ 	SET_MODULE_OWNER(dev);
+ 
+@@ -391,27 +392,58 @@ int __init express_probe(struct net_devi
+ 		}
+ 	}
+ #endif
+-	if (ioaddr&0xfe00)
+-		return eexp_hw_probe(dev,ioaddr);
+-	else if (ioaddr)
++	if (ioaddr&0xfe00) {
++		if (!request_region(ioaddr, EEXP_IO_EXTENT, "EtherExpress"))
++			return -EBUSY;
++		err = eexp_hw_probe(dev,ioaddr);
++		release_region(ioaddr, EEXP_IO_EXTENT);
++		return err;
++	} else if (ioaddr)
+ 		return -ENXIO;
+ 
+ 	for (port=&ports[0] ; *port ; port++ )
+ 	{
+ 		unsigned short sum = 0;
+ 		int i;
++		if (!request_region(*port, EEXP_IO_EXTENT, "EtherExpress"))
++			continue;
+ 		for ( i=0 ; i<4 ; i++ )
+ 		{
+ 			unsigned short t;
+ 			t = inb(*port + ID_PORT);
+ 			sum |= (t>>4) << ((t & 0x03)<<2);
+ 		}
+-		if (sum==0xbaba && !eexp_hw_probe(dev,*port))
++		if (sum==0xbaba && !eexp_hw_probe(dev,*port)) {
++			release_region(*port, EEXP_IO_EXTENT);
+ 			return 0;
++		}
++		release_region(*port, EEXP_IO_EXTENT);
++		dev->irq = dev_irq;
+ 	}
+ 	return -ENODEV;
+ }
+ 
++struct net_device * __init express_probe(int unit)
++{
++	struct net_device *dev = alloc_etherdev(sizeof(struct net_local));
++	int err;
++
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	sprintf(dev->name, "eth%d", unit);
++	netdev_boot_setup_check(dev);
++
++	err = do_express_probe(dev);
++	if (!err) {
++		err = register_netdev(dev);
++		if (!err)
++			return dev;
++	}
++	free_netdev(dev);
++	return ERR_PTR(err);
++}
++
+ /*
+  * open and initialize the adapter, ready for use
+  */
+@@ -1058,7 +1090,7 @@ static int __init eexp_hw_probe(struct n
+ 	unsigned int memory_size;
+ 	int i;
+ 	unsigned short xsum = 0;
+-	struct net_local *lp;
++	struct net_local *lp = dev->priv;
+ 
+ 	printk("%s: EtherExpress 16 at %#x ",dev->name,ioaddr);
+ 
+@@ -1108,17 +1140,18 @@ static int __init eexp_hw_probe(struct n
+ 		buswidth = !((setupval & 0x400) >> 10);
+ 	}
+ 
+-	dev->priv = lp = kmalloc(sizeof(struct net_local), GFP_KERNEL);
+-	if (!dev->priv)
+-		return -ENOMEM;
+-
+-	memset(dev->priv, 0, sizeof(struct net_local));
++	memset(lp, 0, sizeof(struct net_local));
+ 	spin_lock_init(&lp->lock);
+ 
+  	printk("(IRQ %d, %s connector, %d-bit bus", dev->irq, 
+  	       eexp_ifmap[dev->if_port], buswidth?8:16);
+  
++	if (!request_region(dev->base_addr + 0x300e, 1, "EtherExpress"))
++		return -EBUSY;
++
+  	eexp_hw_set_interface(dev);
++ 
++	release_region(dev->base_addr + 0x300e, 1);
+   
+ 	/* Find out how much RAM we have on the card */
+ 	outw(0, dev->base_addr + WRITE_PTR);
+@@ -1156,7 +1189,6 @@ static int __init eexp_hw_probe(struct n
+ 		break;
+ 	default:
+ 		printk(") bad memory size (%dk).\n", memory_size);
+-		kfree(dev->priv);
+ 		return -ENODEV;
+ 		break;
+ 	}
+@@ -1171,7 +1203,6 @@ static int __init eexp_hw_probe(struct n
+ 	dev->set_multicast_list = &eexp_set_multicast;
+ 	dev->tx_timeout = eexp_timeout;
+ 	dev->watchdog_timeo = 2*HZ;
+-	ether_setup(dev);
+ 	return 0;
+ }
+ 
+@@ -1654,7 +1685,7 @@ eexp_set_multicast(struct net_device *de
+ 
+ #define EEXP_MAX_CARDS     4    /* max number of cards to support */
+ 
+-static struct net_device dev_eexp[EEXP_MAX_CARDS];
++static struct net_device *dev_eexp[EEXP_MAX_CARDS];
+ static int irq[EEXP_MAX_CARDS];
+ static int io[EEXP_MAX_CARDS];
+ 
+@@ -1671,25 +1702,30 @@ MODULE_LICENSE("GPL");
+  */
+ int init_module(void)
+ {
++	struct net_device *dev;
+ 	int this_dev, found = 0;
+ 
+ 	for (this_dev = 0; this_dev < EEXP_MAX_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_eexp[this_dev];
++		dev = alloc_etherdev(sizeof(struct net_local));
+ 		dev->irq = irq[this_dev];
+ 		dev->base_addr = io[this_dev];
+-		dev->init = express_probe;
+ 		if (io[this_dev] == 0) {
+-			if (this_dev) break;
++			if (this_dev)
++				break;
+ 			printk(KERN_NOTICE "eexpress.c: Module autoprobe not recommended, give io=xx.\n");
+ 		}
+-		if (register_netdev(dev) != 0) {
+-			printk(KERN_WARNING "eexpress.c: Failed to register card at 0x%x.\n", io[this_dev]);
+-			if (found != 0) return 0;
+-			return -ENXIO;
++		if (do_express_probe(dev) == 0 && register_netdev(dev) == 0) {
++			dev_eexp[this_dev] = dev;
++			found++;
++			continue;
+ 		}
+-		found++;
++		printk(KERN_WARNING "eexpress.c: Failed to register card at 0x%x.\n", io[this_dev]);
++		free_netdev(dev);
++		break;
+ 	}
+-	return 0;
++	if (found)
++		return 0;
++	return -ENXIO;
+ }
+ 
+ void cleanup_module(void)
+@@ -1697,11 +1733,10 @@ void cleanup_module(void)
+ 	int this_dev;
+ 
+ 	for (this_dev = 0; this_dev < EEXP_MAX_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_eexp[this_dev];
+-		if (dev->priv != NULL) {
++		struct net_device *dev = dev_eexp[this_dev];
++		if (dev) {
+ 			unregister_netdev(dev);
+-			kfree(dev->priv);
+-			dev->priv = NULL;
++			free_netdev(dev);
+ 		}
+ 	}
+ }
+--- linux-2.6.0/drivers/net/eql.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/eql.c	2003-12-28 23:21:01.000000000 -0800
+@@ -600,7 +600,7 @@ static int __init eql_init_module(void)
+ 
+ 	err = register_netdev(dev_eql);
+ 	if (err) 
+-		kfree(dev_eql);
++		free_netdev(dev_eql);
+ 	return err;
+ }
+ 
+--- linux-2.6.0/drivers/net/es3210.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/es3210.c	2003-12-28 23:21:01.000000000 -0800
+@@ -62,7 +62,6 @@ static const char version[] =
+ 
+ #include "8390.h"
+ 
+-int es_probe(struct net_device *dev);
+ static int es_probe1(struct net_device *dev, int ioaddr);
+ 
+ static int es_open(struct net_device *dev);
+@@ -125,9 +124,11 @@ static unsigned char hi_irq_map[] __init
+  *	PROM for a match against the Racal-Interlan assigned value.
+  */
+ 
+-int __init es_probe(struct net_device *dev)
++static int __init do_es_probe(struct net_device *dev)
+ {
+ 	unsigned short ioaddr = dev->base_addr;
++	int irq = dev->irq;
++	int mem_start = dev->mem_start;
+ 
+ 	SET_MODULE_OWNER(dev);
+ 
+@@ -144,13 +145,47 @@ int __init es_probe(struct net_device *d
+ 	}
+ 
+ 	/* EISA spec allows for up to 16 slots, but 8 is typical. */
+-	for (ioaddr = 0x1000; ioaddr < 0x9000; ioaddr += 0x1000)
++	for (ioaddr = 0x1000; ioaddr < 0x9000; ioaddr += 0x1000) {
+ 		if (es_probe1(dev, ioaddr) == 0)
+ 			return 0;
++		dev->irq = irq;
++		dev->mem_start = mem_start;
++	}
+ 
+ 	return -ENODEV;
+ }
+ 
++static void cleanup_card(struct net_device *dev)
++{
++	free_irq(dev->irq, dev);
++	release_region(dev->base_addr, ES_IO_EXTENT);
++}
++
++struct net_device * __init es_probe(int unit)
++{
++	struct net_device *dev = alloc_ei_netdev();
++	int err;
++
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	sprintf(dev->name, "eth%d", unit);
++	netdev_boot_setup_check(dev);
++
++	err = do_es_probe(dev);
++	if (err)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	cleanup_card(dev);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
++}
++
+ static int __init es_probe1(struct net_device *dev, int ioaddr)
+ {
+ 	int i, retval;
+@@ -240,13 +275,6 @@ static int __init es_probe1(struct net_d
+ 
+ 	printk("mem %#lx-%#lx\n", dev->mem_start, dev->mem_end-1);
+ 
+-	/* Allocate dev->priv and fill in 8390 specific dev fields. */
+-	if (ethdev_init(dev)) {
+-		printk (" unable to allocate memory for dev->priv.\n");
+-		retval = -ENOMEM;
+-		goto out1;
+-	}
+-
+ #if ES_DEBUG & ES_D_PROBE
+ 	if (inb(ioaddr + ES_CFG5))
+ 		printk("es3210: Warning - DMA channel enabled, but not used here.\n");
+@@ -376,7 +404,7 @@ static int es_close(struct net_device *d
+ #ifdef MODULE
+ #define MAX_ES_CARDS	4	/* Max number of ES3210 cards per module */
+ #define NAMELEN		8	/* # of chars for storing dev->name */
+-static struct net_device dev_es3210[MAX_ES_CARDS];
++static struct net_device *dev_es3210[MAX_ES_CARDS];
+ static int io[MAX_ES_CARDS];
+ static int irq[MAX_ES_CARDS];
+ static int mem[MAX_ES_CARDS];
+@@ -393,26 +421,32 @@ MODULE_LICENSE("GPL");
+ int
+ init_module(void)
+ {
++	struct net_device *dev;
+ 	int this_dev, found = 0;
+ 
+ 	for (this_dev = 0; this_dev < MAX_ES_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_es3210[this_dev];
++		if (io[this_dev] == 0 && this_dev != 0)
++			break;
++		dev = alloc_ei_netdev();
++		if (!dev)
++			break;
+ 		dev->irq = irq[this_dev];
+ 		dev->base_addr = io[this_dev];
+-		dev->mem_start = mem[this_dev];		/* Currently ignored by driver */
+-		dev->init = es_probe;
+-		/* Default is to only install one card. */
+-		if (io[this_dev] == 0 && this_dev != 0) break;
+-		if (register_netdev(dev) != 0) {
+-			printk(KERN_WARNING "es3210.c: No es3210 card found (i/o = 0x%x).\n", io[this_dev]);
+-			if (found != 0) {	/* Got at least one. */
+-				return 0;
++		dev->mem_start = mem[this_dev];
++		if (do_es_probe(dev) == 0) {
++			if (register_netdev(dev) == 0) {
++				dev_es3210[found++] = dev;
++				continue;
+ 			}
+-			return -ENXIO;
++			cleanup_card(dev);
+ 		}
+-		found++;
++		free_netdev(dev);
++		printk(KERN_WARNING "es3210.c: No es3210 card found (i/o = 0x%x).\n", io[this_dev]);
++		break;
+ 	}
+-	return 0;
++	if (found)
++		return 0;
++	return -ENXIO;
+ }
+ 
+ void
+@@ -421,13 +455,11 @@ cleanup_module(void)
+ 	int this_dev;
+ 
+ 	for (this_dev = 0; this_dev < MAX_ES_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_es3210[this_dev];
+-		if (dev->priv != NULL) {
+-			void *priv = dev->priv;
+-			free_irq(dev->irq, dev);
+-			release_region(dev->base_addr, ES_IO_EXTENT);
++		struct net_device *dev = dev_es3210[this_dev];
++		if (dev) {
+ 			unregister_netdev(dev);
+-			kfree(priv);
++			cleanup_card(dev);
++			free_netdev(dev);
+ 		}
+ 	}
+ }
+--- linux-2.6.0/drivers/net/eth16i.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/eth16i.c	2003-12-28 23:21:01.000000000 -0800
+@@ -369,7 +369,6 @@ static unsigned int eth32i_irqmap[] __in
+ #define NUM_OF_EISA_IRQS   8
+ 
+ static unsigned int eth16i_tx_buf_map[] = { 2048, 2048, 4096, 8192 };
+-static unsigned int boot = 1;
+ 
+ /* Use 0 for production, 1 for verification, >2 for debug */
+ #ifndef ETH16I_DEBUG
+@@ -395,8 +394,6 @@ struct eth16i_local {
+ 
+ /* Function prototypes */
+ 
+-extern int     eth16i_probe(struct net_device *dev);
+-
+ static int     eth16i_probe1(struct net_device *dev, int ioaddr);
+ static int     eth16i_check_signature(int ioaddr);
+ static int     eth16i_probe_port(int ioaddr);
+@@ -418,7 +415,7 @@ static void    eth16i_timeout(struct net
+ static void    eth16i_skip_packet(struct net_device *dev);
+ static void    eth16i_multicast(struct net_device *dev); 
+ static void    eth16i_select_regbank(unsigned char regbank, int ioaddr);
+-static void    eth16i_initialize(struct net_device *dev);
++static void    eth16i_initialize(struct net_device *dev, int boot);
+ 
+ #if 0
+ static int     eth16i_set_irq(struct net_device *dev);
+@@ -432,7 +429,7 @@ static struct net_device_stats *eth16i_g
+ 
+ static char cardname[] __initdata = "ICL EtherTeam 16i/32";
+ 
+-int __init eth16i_probe(struct net_device *dev)
++static int __init do_eth16i_probe(struct net_device *dev)
+ {
+ 	int i;
+ 	int ioaddr;
+@@ -461,14 +458,38 @@ int __init eth16i_probe(struct net_devic
+ 	return -ENODEV;
+ }
+ 
++struct net_device * __init eth16i_probe(int unit)
++{
++	struct net_device *dev = alloc_etherdev(sizeof(struct eth16i_local));
++	int err;
++
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	sprintf(dev->name, "eth%d", unit);
++	netdev_boot_setup_check(dev);
++
++	err = do_eth16i_probe(dev);
++	if (err)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	free_irq(dev->irq, dev);
++	release_region(dev->base_addr, ETH16I_IO_EXTENT);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
++}
++
+ static int __init eth16i_probe1(struct net_device *dev, int ioaddr)
+ {
+-	struct eth16i_local *lp;
++	struct eth16i_local *lp = dev->priv;
+ 	static unsigned version_printed;
+ 	int retval;
+ 
+-	boot = 1;  /* To inform initilization that we are in boot probe */
+-
+ 	/* Let's grab the region */
+ 	if (!request_region(ioaddr, ETH16I_IO_EXTENT, dev->name))
+ 		return -EBUSY;
+@@ -531,22 +552,13 @@ static int __init eth16i_probe1(struct n
+ 	eth16i_select_regbank(TRANSCEIVER_MODE_RB, ioaddr);
+ 	outb(0x38, ioaddr + TRANSCEIVER_MODE_REG); 
+ 
+-	eth16i_initialize(dev);   /* Initialize rest of the chip's registers */
++	eth16i_initialize(dev, 1); /* Initialize rest of the chip's registers */
+ 
+ 	/* Now let's same some energy by shutting down the chip ;) */
+ 	BITCLR(ioaddr + CONFIG_REG_1, POWERUP);
+ 
+ 	/* Initialize the device structure */
+-	if(dev->priv == NULL) {
+-		dev->priv = kmalloc(sizeof(struct eth16i_local), GFP_KERNEL);
+-		if(dev->priv == NULL) {
+-			free_irq(dev->irq, dev);
+-			retval = -ENOMEM;
+-			goto out;
+-		}
+-	}
+-
+-	memset(dev->priv, 0, sizeof(struct eth16i_local));
++	memset(lp, 0, sizeof(struct eth16i_local));
+ 	dev->open               = eth16i_open;
+ 	dev->stop               = eth16i_close;
+ 	dev->hard_start_xmit    = eth16i_tx;
+@@ -554,15 +566,7 @@ static int __init eth16i_probe1(struct n
+ 	dev->set_multicast_list = eth16i_multicast;
+ 	dev->tx_timeout 	= eth16i_timeout;
+ 	dev->watchdog_timeo	= TX_TIMEOUT;
+-
+-	lp = (struct eth16i_local *)dev->priv;
+ 	spin_lock_init(&lp->lock);
+-
+-	/* Fill in the fields of the device structure with ethernet values. */
+-	ether_setup(dev);
+-
+-	boot = 0;
+-
+ 	return 0;
+ out:
+ 	release_region(ioaddr, ETH16I_IO_EXTENT);
+@@ -570,7 +574,7 @@ out:
+ }
+ 
+ 
+-static void eth16i_initialize(struct net_device *dev)
++static void eth16i_initialize(struct net_device *dev, int boot)
+ {
+ 	int ioaddr = dev->base_addr;
+ 	int i, node_w = 0;
+@@ -953,7 +957,7 @@ static int eth16i_open(struct net_device
+ 	outb(0xc0 | POWERUP, ioaddr + CONFIG_REG_1);
+ 
+ 	/* Initialize the chip */
+-	eth16i_initialize(dev);  
++	eth16i_initialize(dev, 0);  
+ 
+ 	/* Set the transmit buffer size */
+ 	lp->tx_buf_size = eth16i_tx_buf_map[ETH16I_TX_BUF_SIZE & 0x03];
+@@ -1401,7 +1405,7 @@ static ushort eth16i_parse_mediatype(con
+ 
+ #define MAX_ETH16I_CARDS 4  /* Max number of Eth16i cards per module */
+ 
+-static struct net_device dev_eth16i[MAX_ETH16I_CARDS];
++static struct net_device *dev_eth16i[MAX_ETH16I_CARDS];
+ static int io[MAX_ETH16I_CARDS];
+ #if 0
+ static int irq[MAX_ETH16I_CARDS];
+@@ -1431,14 +1435,14 @@ MODULE_PARM_DESC(debug, "eth16i debug le
+ int init_module(void)
+ {
+ 	int this_dev, found = 0;
++	struct net_device *dev;
++
++	for (this_dev = 0; this_dev < MAX_ETH16I_CARDS; this_dev++) {
++		dev = alloc_etherdev(sizeof(struct eth16i_local));
++		if (!dev)
++			break;
+ 
+-	for(this_dev = 0; this_dev < MAX_ETH16I_CARDS; this_dev++)
+-	{
+-		struct net_device *dev = &dev_eth16i[this_dev];
+-	
+-		dev->irq = 0; /* irq[this_dev]; */
+ 		dev->base_addr = io[this_dev];
+-		dev->init = eth16i_probe;
+ 
+ 	        if(debug != -1)
+ 			eth16i_debug = debug;
+@@ -1448,44 +1452,43 @@ int init_module(void)
+ 
+ 		dev->if_port = eth16i_parse_mediatype(mediatype[this_dev]);
+ 
+-		if(io[this_dev] == 0)
+-		{
+-			if(this_dev != 0) break; /* Only autoprobe 1st one */
++		if(io[this_dev] == 0) {
++			if(this_dev != 0) /* Only autoprobe 1st one */
++				break;
+ 
+ 			printk(KERN_NOTICE "eth16i.c: Presently autoprobing (not recommended) for a single card.\n");
+ 		}
+ 
+-		if(register_netdev(dev) != 0)
+-		{
+-			printk(KERN_WARNING "eth16i.c No Eth16i card found (i/o = 0x%x).\n",
+-			       io[this_dev]);
+-	    
+-			if(found != 0) return 0;
+-			return -ENXIO;
++		if (do_eth16i_probe(dev) == 0) {
++			if (register_netdev(dev) == 0) {
++				dev_eth16i[found++] = dev;
++				continue;
++			}
++			free_irq(dev->irq, dev);
++			release_region(dev->base_addr, ETH16I_IO_EXTENT);
+ 		}
+-
+-		found++;
++		printk(KERN_WARNING "eth16i.c No Eth16i card found (i/o = 0x%x).\n",
++		       io[this_dev]);
++		free_netdev(dev);
++		break;
+ 	}
+-	return 0;
++	if (found)
++		return 0;
++	return -ENXIO;
+ }
+ 	
+ void cleanup_module(void)
+ {
+ 	int this_dev;
+ 
+-	for(this_dev = 0; this_dev < MAX_ETH16I_CARDS; this_dev++)
+-	{
+-		struct net_device* dev = &dev_eth16i[this_dev];
++	for(this_dev = 0; this_dev < MAX_ETH16I_CARDS; this_dev++) {
++		struct net_device *dev = dev_eth16i[this_dev];
+ 		
+-		if(dev->priv != NULL)
+-		{
++		if(dev->priv) {
+ 			unregister_netdev(dev);
+-			kfree(dev->priv);
+-			dev->priv = NULL;
+-			
+ 			free_irq(dev->irq, dev);
+ 			release_region(dev->base_addr, ETH16I_IO_EXTENT);
+-			
++			free_netdev(dev);
+ 		}
+ 	}
+ }
+--- linux-2.6.0/drivers/net/ethertap.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/net/ethertap.c	2003-12-28 23:21:01.000000000 -0800
+@@ -72,8 +72,7 @@ static int  __init ethertap_probe(int un
+ 	struct net_device *dev;
+ 	int err = -ENOMEM;
+ 
+-	dev = alloc_netdev(sizeof(struct net_local), "tap%d",
+-			   ether_setup);
++	dev = alloc_etherdev(sizeof(struct net_local));
+ 
+ 	if (!dev)
+ 		goto out;
+--- linux-2.6.0/drivers/net/ewrk3.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/ewrk3.c	2003-12-28 23:21:01.000000000 -0800
+@@ -324,25 +324,14 @@ static int Read_EEPROM(u_long iobase, u_
+ static int Write_EEPROM(short data, u_long iobase, u_char eaddr);
+ static u_char get_hw_addr(struct net_device *dev, u_char * eeprom_image, char chipType);
+ 
+-static void isa_probe(struct net_device *dev, u_long iobase);
+-static void eisa_probe(struct net_device *dev, u_long iobase);
+-static struct net_device *alloc_device(struct net_device *dev, u_long iobase);
+-static int ewrk3_dev_index(char *s);
+-static struct net_device *insert_device(struct net_device *dev, u_long iobase, int (*init) (struct net_device *));
++static int ewrk3_probe1(struct net_device *dev, u_long iobase, int irq);
++static int isa_probe(struct net_device *dev, u_long iobase);
++static int eisa_probe(struct net_device *dev, u_long iobase);
+ 
+-
+-#ifdef MODULE
+-static int autoprobed = 1, loading_module = 1;
+-
+-#else
+-static u_char irq[] =
+-{5, 0, 10, 3, 11, 9, 15, 12};
+-static int autoprobed, loading_module;
+-
+-#endif				/* MODULE */
++static u_char irq[MAX_NUM_EWRK3S+1] = {5, 0, 10, 3, 11, 9, 15, 12};
+ 
+ static char name[EWRK3_STRLEN + 1];
+-static int num_ewrk3s, num_eth;
++static int num_ewrks3s;
+ 
+ /*
+    ** Miscellaneous defines...
+@@ -352,38 +341,50 @@ static int num_ewrk3s, num_eth;
+     mdelay(1);\
+ }
+ 
+-int __init ewrk3_probe(struct net_device *dev)
++struct net_device * __init ewrk3_probe(int unit)
+ {
+-	int tmp = num_ewrk3s, status = -ENODEV;
+-	u_long iobase = dev->base_addr;
++	struct net_device *dev = alloc_etherdev(sizeof(struct ewrk3_private));
++	int err;
++
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
+ 
++	if (unit >= 0) {
++		sprintf(dev->name, "eth%d", unit);
++		netdev_boot_setup_check(dev);
++	}
+ 	SET_MODULE_OWNER(dev);
+ 
+-	if ((iobase == 0) && loading_module) {
+-		printk("Autoprobing is not supported when loading a module based driver.\n");
+-		status = -EIO;
+-	} else {		/* First probe for the Ethernet */
+-		/* Address PROM pattern */
+-		isa_probe(dev, iobase);
+-		eisa_probe(dev, iobase);
+-
+-		if ((tmp == num_ewrk3s) && (iobase != 0) && loading_module) {
+-			printk("%s: ewrk3_probe() cannot find device at 0x%04lx.\n", dev->name,
+-			       iobase);
+-		}
+-		/*
+-		   ** Walk the device list to check that at least one device
+-		   ** initialised OK
+-		 */
+-		for (; (dev->priv == NULL) && (dev->next != NULL); dev = dev->next);
++	err = ewrk3_probe1(dev, dev->base_addr, dev->irq);
++	if (err) 
++		goto out;
++	return dev;
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
++	
++}
+ 
+-		if (dev->priv)
+-			status = 0;
+-		if (iobase == 0)
+-			autoprobed = 1;
+-	}
++static int __init ewrk3_probe1(struct net_device *dev, u_long iobase, int irq)
++{
++	int err;
+ 
+-	return status;
++	dev->base_addr = iobase;
++	dev->irq = irq;
++
++	/* Address PROM pattern */
++	err = isa_probe(dev, iobase);
++	if (err != 0) 
++		err = eisa_probe(dev, iobase);
++
++	if (err)
++		return err;
++
++	err = register_netdev(dev);
++	if (err)
++		release_region(dev->base_addr, EWRK3_TOTAL_SIZE);
++
++	return err;
+ }
+ 
+ static int __init 
+@@ -396,8 +397,8 @@ ewrk3_hw_init(struct net_device *dev, u_
+ 	u_char eeprom_image[EEPROM_MAX], chksum, eisa_cr = 0;
+ 
+ 	/*
+-	   ** Stop the EWRK3. Enable the DBR ROM. Disable interrupts and remote boot.
+-	   ** This also disables the EISA_ENABLE bit in the EISA Control Register.
++	** Stop the EWRK3. Enable the DBR ROM. Disable interrupts and remote boot.
++	** This also disables the EISA_ENABLE bit in the EISA Control Register.
+ 	 */
+ 	if (iobase > 0x400)
+ 		eisa_cr = inb(EISA_CR);
+@@ -409,232 +410,210 @@ ewrk3_hw_init(struct net_device *dev, u_
+ 	icr &= 0x70;
+ 	outb(icr, EWRK3_ICR);	/* Disable all the IRQs */
+ 
+-	if (nicsr == (CSR_TXD | CSR_RXD)) {
++	if (nicsr == (CSR_TXD | CSR_RXD))
++		return -ENXIO;
+ 
+-		/* Check that the EEPROM is alive and well and not living on Pluto... */
+-		for (chksum = 0, i = 0; i < EEPROM_MAX; i += 2) {
+-			union {
+-				short val;
+-				char c[2];
+-			} tmp;
+-
+-			tmp.val = (short) Read_EEPROM(iobase, (i >> 1));
+-			eeprom_image[i] = tmp.c[0];
+-			eeprom_image[i + 1] = tmp.c[1];
+-			chksum += eeprom_image[i] + eeprom_image[i + 1];
+-		}
+-
+-		if (chksum != 0) {	/* Bad EEPROM Data! */
+-			printk("%s: Device has a bad on-board EEPROM.\n", dev->name);
+-			status = -ENXIO;
+-		} else {
+-			EthwrkSignature(name, eeprom_image);
+-			if (*name != '\0') {	/* found a EWRK3 device */
+-				dev->base_addr = iobase;
+-
+-				if (iobase > 0x400) {
+-					outb(eisa_cr, EISA_CR);		/* Rewrite the EISA CR */
+-				}
+-				lemac = eeprom_image[EEPROM_CHIPVER];
+-				cmr = inb(EWRK3_CMR);
+-
+-				if (((lemac == LeMAC) && ((cmr & CMR_NO_EEPROM) != CMR_NO_EEPROM)) ||
+-				((lemac == LeMAC2) && !(cmr & CMR_HS))) {
+-					printk("%s: %s at %#4lx", dev->name, name, iobase);
+-					hard_strapped = 1;
+-				} else if ((iobase & 0x0fff) == EWRK3_EISA_IO_PORTS) {
+-					/* EISA slot address */
+-					printk("%s: %s at %#4lx (EISA slot %ld)",
+-					       dev->name, name, iobase, ((iobase >> 12) & 0x0f));
+-				} else {	/* ISA port address */
+-					printk("%s: %s at %#4lx", dev->name, name, iobase);
+-				}
+-
+-				if (!status) {
+-					printk(", h/w address ");
+-					if (lemac != LeMAC2)
+-						DevicePresent(iobase);	/* need after EWRK3_INIT */
+-					status = get_hw_addr(dev, eeprom_image, lemac);
+-					for (i = 0; i < ETH_ALEN - 1; i++) {	/* get the ethernet addr. */
+-						printk("%2.2x:", dev->dev_addr[i]);
+-					}
+-					printk("%2.2x,\n", dev->dev_addr[i]);
+ 
+-					if (status) {
+-						printk("      which has an EEPROM CRC error.\n");
+-						status = -ENXIO;
+-					} else {
+-						if (lemac == LeMAC2) {	/* Special LeMAC2 CMR things */
+-							cmr &= ~(CMR_RA | CMR_WB | CMR_LINK | CMR_POLARITY | CMR_0WS);
+-							if (eeprom_image[EEPROM_MISC0] & READ_AHEAD)
+-								cmr |= CMR_RA;
+-							if (eeprom_image[EEPROM_MISC0] & WRITE_BEHIND)
+-								cmr |= CMR_WB;
+-							if (eeprom_image[EEPROM_NETMAN0] & NETMAN_POL)
+-								cmr |= CMR_POLARITY;
+-							if (eeprom_image[EEPROM_NETMAN0] & NETMAN_LINK)
+-								cmr |= CMR_LINK;
+-							if (eeprom_image[EEPROM_MISC0] & _0WS_ENA)
+-								cmr |= CMR_0WS;
+-						}
+-						if (eeprom_image[EEPROM_SETUP] & SETUP_DRAM)
+-							cmr |= CMR_DRAM;
+-						outb(cmr, EWRK3_CMR);
+-
+-						cr = inb(EWRK3_CR);	/* Set up the Control Register */
+-						cr |= eeprom_image[EEPROM_SETUP] & SETUP_APD;
+-						if (cr & SETUP_APD)
+-							cr |= eeprom_image[EEPROM_SETUP] & SETUP_PS;
+-						cr |= eeprom_image[EEPROM_MISC0] & FAST_BUS;
+-						cr |= eeprom_image[EEPROM_MISC0] & ENA_16;
+-						outb(cr, EWRK3_CR);
++	/* Check that the EEPROM is alive and well and not living on Pluto... */
++	for (chksum = 0, i = 0; i < EEPROM_MAX; i += 2) {
++		union {
++			short val;
++			char c[2];
++		} tmp;
++
++		tmp.val = (short) Read_EEPROM(iobase, (i >> 1));
++		eeprom_image[i] = tmp.c[0];
++		eeprom_image[i + 1] = tmp.c[1];
++		chksum += eeprom_image[i] + eeprom_image[i + 1];
++	}
++
++	if (chksum != 0) {	/* Bad EEPROM Data! */
++		printk("%s: Device has a bad on-board EEPROM.\n", dev->name);
++		return -ENXIO;
++	}
++	
++	EthwrkSignature(name, eeprom_image);
++	if (*name == '\0') 
++		return -ENXIO;
++
++	dev->base_addr = iobase;
++				
++	if (iobase > 0x400) {
++		outb(eisa_cr, EISA_CR);		/* Rewrite the EISA CR */
++	}
++	lemac = eeprom_image[EEPROM_CHIPVER];
++	cmr = inb(EWRK3_CMR);
++	
++	if (((lemac == LeMAC) && ((cmr & CMR_NO_EEPROM) != CMR_NO_EEPROM)) ||
++	    ((lemac == LeMAC2) && !(cmr & CMR_HS))) {
++		printk("%s: %s at %#4lx", dev->name, name, iobase);
++		hard_strapped = 1;
++	} else if ((iobase & 0x0fff) == EWRK3_EISA_IO_PORTS) {
++		/* EISA slot address */
++		printk("%s: %s at %#4lx (EISA slot %ld)",
++		       dev->name, name, iobase, ((iobase >> 12) & 0x0f));
++	} else {	/* ISA port address */
++		printk("%s: %s at %#4lx", dev->name, name, iobase);
++	}
++
++	printk(", h/w address ");
++	if (lemac != LeMAC2)
++		DevicePresent(iobase);	/* need after EWRK3_INIT */
++	status = get_hw_addr(dev, eeprom_image, lemac);
++	for (i = 0; i < ETH_ALEN - 1; i++) {	/* get the ethernet addr. */
++		printk("%2.2x:", dev->dev_addr[i]);
++	}
++	printk("%2.2x,\n", dev->dev_addr[i]);
++	
++	if (status) {
++		printk("      which has an EEPROM CRC error.\n");
++		return -ENXIO;
++	}
++
++	if (lemac == LeMAC2) {	/* Special LeMAC2 CMR things */
++		cmr &= ~(CMR_RA | CMR_WB | CMR_LINK | CMR_POLARITY | CMR_0WS);
++		if (eeprom_image[EEPROM_MISC0] & READ_AHEAD)
++			cmr |= CMR_RA;
++		if (eeprom_image[EEPROM_MISC0] & WRITE_BEHIND)
++			cmr |= CMR_WB;
++		if (eeprom_image[EEPROM_NETMAN0] & NETMAN_POL)
++			cmr |= CMR_POLARITY;
++		if (eeprom_image[EEPROM_NETMAN0] & NETMAN_LINK)
++			cmr |= CMR_LINK;
++		if (eeprom_image[EEPROM_MISC0] & _0WS_ENA)
++			cmr |= CMR_0WS;
++	}
++	if (eeprom_image[EEPROM_SETUP] & SETUP_DRAM)
++		cmr |= CMR_DRAM;
++	outb(cmr, EWRK3_CMR);
++	
++	cr = inb(EWRK3_CR);	/* Set up the Control Register */
++	cr |= eeprom_image[EEPROM_SETUP] & SETUP_APD;
++	if (cr & SETUP_APD)
++		cr |= eeprom_image[EEPROM_SETUP] & SETUP_PS;
++	cr |= eeprom_image[EEPROM_MISC0] & FAST_BUS;
++	cr |= eeprom_image[EEPROM_MISC0] & ENA_16;
++	outb(cr, EWRK3_CR);
+ 
+-						/*
+-						   ** Determine the base address and window length for the EWRK3
+-						   ** RAM from the memory base register.
+-						 */
+-						mem_start = inb(EWRK3_MBR);
+-						shmem_length = 0;
+-						if (mem_start != 0) {
+-							if ((mem_start >= 0x0a) && (mem_start <= 0x0f)) {
+-								mem_start *= SHMEM_64K;
+-								shmem_length = SHMEM_64K;
+-							} else if ((mem_start >= 0x14) && (mem_start <= 0x1f)) {
+-								mem_start *= SHMEM_32K;
+-								shmem_length = SHMEM_32K;
+-							} else if ((mem_start >= 0x40) && (mem_start <= 0xff)) {
+-								mem_start = mem_start * SHMEM_2K + 0x80000;
+-								shmem_length = SHMEM_2K;
+-							} else {
+-								status = -ENXIO;
+-							}
+-						}
+-						/*
+-						   ** See the top of this source code for comments about
+-						   ** uncommenting this line.
+-						 */
++	/*
++	** Determine the base address and window length for the EWRK3
++	** RAM from the memory base register.
++	*/
++	mem_start = inb(EWRK3_MBR);
++	shmem_length = 0;
++	if (mem_start != 0) {
++		if ((mem_start >= 0x0a) && (mem_start <= 0x0f)) {
++			mem_start *= SHMEM_64K;
++			shmem_length = SHMEM_64K;
++		} else if ((mem_start >= 0x14) && (mem_start <= 0x1f)) {
++			mem_start *= SHMEM_32K;
++			shmem_length = SHMEM_32K;
++		} else if ((mem_start >= 0x40) && (mem_start <= 0xff)) {
++			mem_start = mem_start * SHMEM_2K + 0x80000;
++			shmem_length = SHMEM_2K;
++		} else {
++			return -ENXIO;
++		}
++	}
++	/*
++	** See the top of this source code for comments about
++	** uncommenting this line.
++	*/
+ /*          FORCE_2K_MODE; */
++	
++	if (hard_strapped) {
++		printk("      is hard strapped.\n");
++	} else if (mem_start) {
++		printk("      has a %dk RAM window", (int) (shmem_length >> 10));
++		printk(" at 0x%.5lx", mem_start);
++	} else {
++		printk("      is in I/O only mode");
++	}
+ 
+-						if (!status) {
+-							if (hard_strapped) {
+-								printk("      is hard strapped.\n");
+-							} else if (mem_start) {
+-								printk("      has a %dk RAM window", (int) (shmem_length >> 10));
+-								printk(" at 0x%.5lx", mem_start);
+-							} else {
+-								printk("      is in I/O only mode");
+-							}
+-
+-							/* private area & initialise */
+-							dev->priv = (void *) kmalloc(sizeof(struct ewrk3_private),
+-							     GFP_KERNEL);
+-							if (dev->priv == NULL) {
+-								return -ENOMEM;
+-							}
+-							lp = (struct ewrk3_private *) dev->priv;
+-							memset(dev->priv, 0, sizeof(struct ewrk3_private));
+-							lp->shmem_base = mem_start;
+-							lp->shmem_length = shmem_length;
+-							lp->lemac = lemac;
+-							lp->hard_strapped = hard_strapped;
+-							lp->led_mask = CR_LED;
+-							spin_lock_init(&lp->hw_lock);
+-
+-							lp->mPage = 64;
+-							if (cmr & CMR_DRAM)
+-								lp->mPage <<= 1;	/* 2 DRAMS on module */
+-
+-							sprintf(lp->adapter_name, "%s (%s)", name, dev->name);
+-							request_region(iobase, EWRK3_TOTAL_SIZE, lp->adapter_name);
+-
+-							lp->irq_mask = ICR_TNEM | ICR_TXDM | ICR_RNEM | ICR_RXDM;
+-
+-							if (!hard_strapped) {
+-								/*
+-								   ** Enable EWRK3 board interrupts for autoprobing
+-								 */
+-								icr |= ICR_IE;	/* Enable interrupts */
+-								outb(icr, EWRK3_ICR);
+-
+-								/* The DMA channel may be passed in on this parameter. */
+-								dev->dma = 0;
+-
+-								/* To auto-IRQ we enable the initialization-done and DMA err,
+-								   interrupts. For now we will always get a DMA error. */
+-								if (dev->irq < 2) {
++	lp = (struct ewrk3_private *) dev->priv;
++	lp->shmem_base = mem_start;
++	lp->shmem_length = shmem_length;
++	lp->lemac = lemac;
++	lp->hard_strapped = hard_strapped;
++	lp->led_mask = CR_LED;
++	spin_lock_init(&lp->hw_lock);
++	
++	lp->mPage = 64;
++	if (cmr & CMR_DRAM)
++		lp->mPage <<= 1;	/* 2 DRAMS on module */
++	
++	sprintf(lp->adapter_name, "%s (%s)", name, dev->name);
++	
++	lp->irq_mask = ICR_TNEM | ICR_TXDM | ICR_RNEM | ICR_RXDM;
++	
++	if (!hard_strapped) {
++		/*
++		** Enable EWRK3 board interrupts for autoprobing
++		*/
++		icr |= ICR_IE;	/* Enable interrupts */
++		outb(icr, EWRK3_ICR);
++		
++		/* The DMA channel may be passed in on this parameter. */
++		dev->dma = 0;
++		
++		/* To auto-IRQ we enable the initialization-done and DMA err,
++		   interrupts. For now we will always get a DMA error. */
++		if (dev->irq < 2) {
+ #ifndef MODULE
+-									u_char irqnum;
+-									unsigned long irq_mask;
++			u_char irqnum;
++			unsigned long irq_mask;
+ 			
+ 
+-									irq_mask = probe_irq_on();
+-
+-									/*
+-									   ** Trigger a TNE interrupt.
+-									 */
+-									icr |= ICR_TNEM;
+-									outb(1, EWRK3_TDQ);	/* Write to the TX done queue */
+-									outb(icr, EWRK3_ICR);	/* Unmask the TXD interrupt */
+-
+-									irqnum = irq[((icr & IRQ_SEL) >> 4)];
+-
+-									mdelay(20);
+-									dev->irq = probe_irq_off(irq_mask);
+-									if ((dev->irq) && (irqnum == dev->irq)) {
+-										printk(" and uses IRQ%d.\n", dev->irq);
+-									} else {
+-										if (!dev->irq) {
+-											printk(" and failed to detect IRQ line.\n");
+-										} else if ((irqnum == 1) && (lemac == LeMAC2)) {
+-											printk(" and an illegal IRQ line detected.\n");
+-										} else {
+-											printk(", but incorrect IRQ line detected.\n");
+-										}
+-										status = -ENXIO;
+-									}
+-
+-									DISABLE_IRQs;	/* Mask all interrupts */
+-
+-#endif				/* MODULE */
+-								} else {
+-									printk(" and requires IRQ%d.\n", dev->irq);
+-								}
+-							}
+-							if (status)
+-								release_region(iobase, EWRK3_TOTAL_SIZE);
+-						} else {
+-							status = -ENXIO;
+-						}
+-					}
+-				}
++			irq_mask = probe_irq_on();
++			
++			/*
++			** Trigger a TNE interrupt.
++			*/
++			icr |= ICR_TNEM;
++			outb(1, EWRK3_TDQ);	/* Write to the TX done queue */
++			outb(icr, EWRK3_ICR);	/* Unmask the TXD interrupt */
++			
++			irqnum = irq[((icr & IRQ_SEL) >> 4)];
++			
++			mdelay(20);
++			dev->irq = probe_irq_off(irq_mask);
++			if ((dev->irq) && (irqnum == dev->irq)) {
++				printk(" and uses IRQ%d.\n", dev->irq);
+ 			} else {
+-				status = -ENXIO;
+-			}
+-		}
+-
+-		if (!status) {
+-			if (ewrk3_debug > 1) {
+-				printk(version);
++				if (!dev->irq) {
++					printk(" and failed to detect IRQ line.\n");
++				} else if ((irqnum == 1) && (lemac == LeMAC2)) {
++					printk(" and an illegal IRQ line detected.\n");
++				} else {
++					printk(", but incorrect IRQ line detected.\n");
++				}
++				return -ENXIO;
+ 			}
+-			/* The EWRK3-specific entries in the device structure. */
+-			dev->open = ewrk3_open;
+-			dev->hard_start_xmit = ewrk3_queue_pkt;
+-			dev->stop = ewrk3_close;
+-			dev->get_stats = ewrk3_get_stats;
+-			dev->set_multicast_list = set_multicast_list;
+-			dev->do_ioctl = ewrk3_ioctl;
+-			dev->tx_timeout = ewrk3_timeout;
+-			dev->watchdog_timeo = QUEUE_PKT_TIMEOUT;
+ 
+-			dev->mem_start = 0;
++			DISABLE_IRQs;	/* Mask all interrupts */
+ 
+-			/* Fill in the generic field of the device structure. */
+-			ether_setup(dev);
++#endif				/* MODULE */
++		} else {
++			printk(" and requires IRQ%d.\n", dev->irq);
+ 		}
+-	} else {
+-		status = -ENXIO;
+ 	}
+-	return status;
++
++	if (ewrk3_debug > 1) {
++		printk(version);
++	}
++	/* The EWRK3-specific entries in the device structure. */
++	dev->open = ewrk3_open;
++	dev->hard_start_xmit = ewrk3_queue_pkt;
++	dev->stop = ewrk3_close;
++	dev->get_stats = ewrk3_get_stats;
++	dev->set_multicast_list = set_multicast_list;
++	dev->do_ioctl = ewrk3_ioctl;
++	dev->tx_timeout = ewrk3_timeout;
++	dev->watchdog_timeo = QUEUE_PKT_TIMEOUT;
++	
++	dev->mem_start = 0;
++
++	return 0;
+ }
+ 
+ 
+@@ -1269,15 +1248,15 @@ static void SetMulticastFilter(struct ne
+ /*
+    ** ISA bus I/O device probe
+  */
+-static void __init isa_probe(struct net_device *dev, u_long ioaddr)
++static int __init isa_probe(struct net_device *dev, u_long ioaddr)
+ {
+-	int i = num_ewrk3s, maxSlots;
++	int i = num_ewrks3s, maxSlots;
++	int ret = -ENODEV;
++
+ 	u_long iobase;
+ 
+-	if (!ioaddr && autoprobed)
+-		return;		/* Been here before ! */
+ 	if (ioaddr >= 0x400)
+-		return;		/* Not ISA */
++		goto out;
+ 
+ 	if (ioaddr == 0) {	/* Autoprobing */
+ 		iobase = EWRK3_IO_BASE;		/* Get the first slot address */
+@@ -1287,38 +1266,37 @@ static void __init isa_probe(struct net_
+ 		maxSlots = i + 1;
+ 	}
+ 
+-	for (; (i < maxSlots) && (dev != NULL); iobase += EWRK3_IOP_INC, i++) {
+-		if (!check_region(iobase, EWRK3_TOTAL_SIZE)) {
++	for (; (i < maxSlots) && (dev != NULL);
++	     iobase += EWRK3_IOP_INC, i++)
++	{
++		if (request_region(iobase, EWRK3_TOTAL_SIZE, dev->name)) {
+ 			if (DevicePresent(iobase) == 0) {
+-				if ((dev = alloc_device(dev, iobase)) != NULL) {
+-					if (ewrk3_hw_init(dev, iobase) == 0) {
+-						num_ewrk3s++;
+-					}
+-					num_eth++;
+-				}
++				int irq = dev->irq;
++				ret = ewrk3_hw_init(dev, iobase);
++				if (!ret)
++					break;
++				dev->irq = irq;
+ 			}
+-		} else if (autoprobed) {
+-			printk("%s: region already allocated at 0x%04lx.\n", dev->name, iobase);
++			release_region(iobase, EWRK3_TOTAL_SIZE);
+ 		}
+ 	}
++ out:
+ 
+-	return;
++	return ret;
+ }
+ 
+ /*
+    ** EISA bus I/O device probe. Probe from slot 1 since slot 0 is usually
+    ** the motherboard.
+  */
+-static void __init eisa_probe(struct net_device *dev, u_long ioaddr)
++static int __init eisa_probe(struct net_device *dev, u_long ioaddr)
+ {
+ 	int i, maxSlots;
+ 	u_long iobase;
+-	char name[EWRK3_STRLEN];
++	int ret = -ENODEV;
+ 
+-	if (!ioaddr && autoprobed)
+-		return;		/* Been here before ! */
+ 	if (ioaddr < 0x1000)
+-		return;		/* Not EISA */
++		goto out;
+ 
+ 	if (ioaddr == 0) {	/* Autoprobing */
+ 		iobase = EISA_SLOT_INC;		/* Get the first slot address */
+@@ -1332,114 +1310,22 @@ static void __init eisa_probe(struct net
+ 
+ 	for (i = 1; (i < maxSlots) && (dev != NULL); i++, iobase += EISA_SLOT_INC) {
+ 		if (EISA_signature(name, EISA_ID) == 0) {
+-			if (!check_region(iobase, EWRK3_TOTAL_SIZE)) {
+-				if (DevicePresent(iobase) == 0) {
+-					if ((dev = alloc_device(dev, iobase)) != NULL) {
+-						if (ewrk3_hw_init(dev, iobase) == 0) {
+-							num_ewrk3s++;
+-						}
+-						num_eth++;
+-					}
+-				}
+-			} else if (autoprobed) {
+-				printk("%s: region already allocated at 0x%04lx.\n", dev->name, iobase);
++			if (request_region(iobase, EWRK3_TOTAL_SIZE, dev->name) &&
++			    DevicePresent(iobase) == 0) {
++				int irq = dev->irq;
++				ret = ewrk3_hw_init(dev, iobase);
++				if (!ret)
++					break;
++				dev->irq = irq;
+ 			}
++			release_region(iobase, EWRK3_TOTAL_SIZE);
+ 		}
+ 	}
+ 
+-	return;
++ out:
++	return ret;
+ }
+ 
+-/*
+-   ** Search the entire 'eth' device list for a fixed probe. If a match isn't
+-   ** found then check for an autoprobe or unused device location. If they
+-   ** are not available then insert a new device structure at the end of
+-   ** the current list.
+- */
+-static struct net_device * __init  alloc_device(struct net_device *dev, u_long iobase)
+-{
+-	struct net_device *adev = NULL;
+-	int fixed = 0, new_dev = 0;
+-
+-	num_eth = ewrk3_dev_index(dev->name);
+-	if (loading_module)
+-		return dev;
+-
+-	while (1) {
+-		if (((dev->base_addr == EWRK3_NDA) || (dev->base_addr == 0)) && !adev) {
+-			adev = dev;
+-		} else if ((dev->priv == NULL) && (dev->base_addr == iobase)) {
+-			fixed = 1;
+-		} else {
+-			if (dev->next == NULL) {
+-				new_dev = 1;
+-			} else if (strncmp(dev->next->name, "eth", 3) != 0) {
+-				new_dev = 1;
+-			}
+-		}
+-		if ((dev->next == NULL) || new_dev || fixed)
+-			break;
+-		dev = dev->next;
+-		num_eth++;
+-	}
+-	if (adev && !fixed) {
+-		dev = adev;
+-		num_eth = ewrk3_dev_index(dev->name);
+-		new_dev = 0;
+-	}
+-	if (((dev->next == NULL) &&
+-	     ((dev->base_addr != EWRK3_NDA) && (dev->base_addr != 0)) && !fixed) ||
+-	    new_dev) {
+-		num_eth++;	/* New device */
+-		dev = insert_device(dev, iobase, ewrk3_probe);
+-	}
+-	return dev;
+-}
+-
+-/*
+-   ** If at end of eth device list and can't use current entry, malloc
+-   ** one up. If memory could not be allocated, print an error message.
+- */
+-static struct net_device * __init
+-insert_device(struct net_device *dev, u_long iobase, int (*init) (struct net_device *))
+-{
+-	struct net_device *new;
+-
+-	new = (struct net_device *) kmalloc(sizeof(struct net_device) + 8, GFP_KERNEL);
+-	if (new == NULL) {
+-		printk("eth%d: Device not initialised, insufficient memory\n", num_eth);
+-		return NULL;
+-	} else {
+-		new->next = dev->next;
+-		dev->next = new;
+-		dev = dev->next;	/* point to the new device */
+-		if (num_eth > 9999) {
+-			sprintf(dev->name, "eth????");	/* New device name */
+-		} else {
+-			sprintf(dev->name, "eth%d", num_eth);	/* New device name */
+-		}
+-		dev->base_addr = iobase;	/* assign the io address */
+-		dev->init = init;	/* initialisation routine */
+-	}
+-
+-	return dev;
+-}
+-
+-static int __init 
+-ewrk3_dev_index(char *s)
+-{
+-	int i = 0, j = 0;
+-
+-	for (; *s; s++) {
+-		if (isdigit(*s)) {
+-			j = 1;
+-			i = (i * 10) + (*s - '0');
+-		} else if (j)
+-			break;
+-	}
+-
+-	return i;
+-}
+ 
+ /*
+    ** Read the EWRK3 EEPROM using this routine
+@@ -2074,8 +1960,7 @@ static int ewrk3_ioctl(struct net_device
+ #ifdef MODULE
+ static struct net_device *ewrk3_devs[MAX_NUM_EWRK3S];
+ static int ndevs;
+-static int io[MAX_NUM_EWRK3S+1] = { 0x300, 0, };	/* <--- EDIT THESE LINES FOR YOUR CONFIGURATION */
+-static int irq[MAX_NUM_EWRK3S+1] = { 5, 0, };		/* or use the insmod io= irq= options           */
++static int io[MAX_NUM_EWRK3S+1] = { 0x300, 0, };
+ 
+ /* '21' below should really be 'MAX_NUM_EWRK3S' */
+ MODULE_PARM(io, "0-21i");
+@@ -2083,50 +1968,39 @@ MODULE_PARM(irq, "0-21i");
+ MODULE_PARM_DESC(io, "EtherWORKS 3 I/O base address(es)");
+ MODULE_PARM_DESC(irq, "EtherWORKS 3 IRQ number(s)");
+ 
+-static void ewrk3_exit_module(void)
++static __exit void ewrk3_exit_module(void)
+ {
+ 	int i;
+ 
+ 	for( i=0; i<ndevs; i++ ) {
+ 		unregister_netdev(ewrk3_devs[i]);
+-		if (ewrk3_devs[i]->priv) {
+-			kfree(ewrk3_devs[i]->priv);
+-			ewrk3_devs[i]->priv = NULL;
+-		}
+-		ewrk3_devs[i]->irq = 0;
+-
+ 		release_region(ewrk3_devs[i]->base_addr, EWRK3_TOTAL_SIZE);
+ 		free_netdev(ewrk3_devs[i]);
+ 		ewrk3_devs[i] = NULL;
+ 	}
+ }
+ 
+-static int ewrk3_init_module(void)
++static __init int ewrk3_init_module(void)
+ {
+ 	int i=0;
+ 
+ 	while( io[i] && irq[i] ) {
+-		ewrk3_devs[ndevs] = kmalloc(sizeof(struct net_device), GFP_KERNEL);
+-		if (!ewrk3_devs[ndevs])
+-			goto error; 
+-		memset(ewrk3_devs[ndevs], 0, sizeof(struct net_device));
+-		ewrk3_devs[ndevs]->base_addr = io[i];
+-		ewrk3_devs[ndevs]->irq = irq[i];
+-		ewrk3_devs[ndevs]->init = ewrk3_probe;
+-
+-		if (register_netdev(ewrk3_devs[ndevs]) == 0)
+-			ndevs++;
+-		else
+-			kfree(ewrk3_devs[ndevs]);
++		struct net_device *dev
++			= alloc_etherdev(sizeof(struct ewrk3_private));
++
++		if (!dev)
++			break;
+ 
++		if (ewrk3_probe1(dev, io[i], irq[i]) != 0) {
++			free_netdev(dev);
++			break;
++		}
++
++		ewrk3_devs[ndevs++] = dev;
+ 		i++;
+ 	}
+ 
+ 	return ndevs ? 0 : -EIO;
+-
+-error:
+-	ewrk3_exit_module();
+-	return -ENOMEM;
+ }
+ 
+ 
+--- linux-2.6.0/drivers/net/fc/iph5526.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/fc/iph5526.c	2003-12-28 23:21:01.000000000 -0800
+@@ -259,6 +259,7 @@ static int __init iph5526_probe_pci(stru
+ 
+ static int __init fcdev_init(struct net_device *dev)
+ {
++	SET_MODULE_OWNER(dev);
+ 	dev->open = iph5526_open;
+ 	dev->stop = iph5526_close;
+ 	dev->hard_start_xmit = iph5526_send_packet;
+@@ -2896,14 +2897,12 @@ static void update_EDB_indx(struct fc_in
+ static int iph5526_open(struct net_device *dev)
+ {
+ 	netif_start_queue(dev);
+-	MOD_INC_USE_COUNT;
+ 	return 0;
+ }
+ 
+ static int iph5526_close(struct net_device *dev)
+ {
+ 	netif_stop_queue(dev);
+-	MOD_DEC_USE_COUNT;
+ 	return 0;
+ }
+ 
+--- linux-2.6.0/drivers/net/fc/iph5526_scsi.h	2003-06-14 12:18:22.000000000 -0700
++++ 25/drivers/net/fc/iph5526_scsi.h	2003-12-28 23:21:01.000000000 -0800
+@@ -25,7 +25,7 @@ int iph5526_queuecommand(Scsi_Cmnd *Cmnd
+ int iph5526_release(struct Scsi_Host *host);
+ int iph5526_abort(Scsi_Cmnd *Cmnd);
+ const char *iph5526_info(struct Scsi_Host *host);
+-int iph5526_biosparam(Disk * disk, struct block_device *n, int ip[]);
++int iph5526_biosparam(struct Scsi_Disk * disk, struct block_device *n, int ip[]);
+ 
+ #endif
+ 
+--- linux-2.6.0/drivers/net/fmv18x.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/fmv18x.c	2003-12-28 23:21:01.000000000 -0800
+@@ -57,7 +57,7 @@ static const char version[] =
+ #include <asm/io.h>
+ #include <asm/dma.h>
+ 
+-static int fmv18x_probe_list[] __initdata = {
++static unsigned fmv18x_probe_list[] __initdata = {
+ 	0x220, 0x240, 0x260, 0x280, 0x2a0, 0x2c0, 0x300, 0x340, 0
+ };
+ 
+@@ -109,8 +109,6 @@ struct net_local {
+ 
+ /* Index to functions, as function prototypes. */
+ 
+-extern int fmv18x_probe(struct net_device *dev);
+-
+ static int fmv18x_probe1(struct net_device *dev, short ioaddr);
+ static int net_open(struct net_device *dev);
+ static int net_send_packet(struct sk_buff *skb, struct net_device *dev);
+@@ -129,23 +127,50 @@ static void set_multicast_list(struct ne
+    (detachable devices only).
+    */
+ 
+-int __init fmv18x_probe(struct net_device *dev)
++static int io = 0x220;
++static int irq;
++
++struct net_device * __init fmv18x_probe(int unit)
+ {
+-	int i;
+-	int base_addr = dev->base_addr;
++	struct net_device *dev = alloc_etherdev(sizeof(struct net_local));
++	unsigned *port;
++	int err = 0;
++
++	if (!dev)
++		return ERR_PTR(-ENODEV);
++
++	if (unit >= 0) {
++		sprintf(dev->name, "eth%d", unit);
++		netdev_boot_setup_check(dev);
++		io = dev->base_addr;
++		irq = dev->irq;
++	}
+ 
+ 	SET_MODULE_OWNER(dev);
+ 
+-	if (base_addr > 0x1ff)		/* Check a single specified location. */
+-		return fmv18x_probe1(dev, base_addr);
+-	else if (base_addr != 0)	/* Don't probe at all. */
+-		return -ENXIO;
+-
+-	for (i = 0; fmv18x_probe_list[i]; i++)
+-		if (fmv18x_probe1(dev, fmv18x_probe_list[i]) == 0)
+-			return 0;
+-
+-	return -ENODEV;
++	if (io > 0x1ff) {	/* Check a single specified location. */
++		err = fmv18x_probe1(dev, io);
++	} else if (io != 0) {	/* Don't probe at all. */
++		err = -ENXIO;
++	} else {
++		for (port = fmv18x_probe_list; *port; port++)
++			if (fmv18x_probe1(dev, *port) == 0)
++				break;
++		if (!*port)
++			err = -ENODEV;
++	}
++	if (err)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	free_irq(dev->irq, dev);
++	release_region(dev->base_addr, FMV18X_IO_EXTENT);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
+ /* The Fujitsu datasheet suggests that the NIC be probed for by checking its
+@@ -160,7 +185,7 @@ static int __init fmv18x_probe1(struct n
+ {
+ 	char irqmap[4] = {3, 7, 10, 15};
+ 	char irqmap_pnp[8] = {3, 4, 5, 7, 9, 10, 11, 15};
+-	unsigned int i, irq, retval;
++	unsigned int i, retval;
+ 	struct net_local *lp;
+ 
+ 	/* Resetting the chip doesn't reset the ISA interface, so don't bother.
+@@ -170,6 +195,9 @@ static int __init fmv18x_probe1(struct n
+ 	if (!request_region(ioaddr, FMV18X_IO_EXTENT, dev->name))
+ 		return -EBUSY;
+ 
++	dev->irq = irq;
++	dev->base_addr = ioaddr;
++
+ 	/* Check I/O address configuration and Fujitsu vendor code */
+ 	if (inb(ioaddr+FJ_MACADDR  ) != 0x00
+ 	||  inb(ioaddr+FJ_MACADDR+1) != 0x00
+@@ -181,9 +209,8 @@ static int __init fmv18x_probe1(struct n
+ 	/* Check PnP mode for FMV-183/184/183A/184A. */
+ 	/* This PnP routine is very poor. IO and IRQ should be known. */
+ 	if (inb(ioaddr + FJ_STATUS1) & 0x20) {
+-		irq = dev->irq;
+ 		for (i = 0; i < 8; i++) {
+-			if (irq == irqmap_pnp[i])
++			if (dev->irq == irqmap_pnp[i])
+ 				break;
+ 		}
+ 		if (i == 8) {
+@@ -193,22 +220,19 @@ static int __init fmv18x_probe1(struct n
+ 	} else {
+ 		if (fmv18x_probe_list[inb(ioaddr + FJ_CONFIG0) & 0x07] != ioaddr)
+ 			return -ENODEV;
+-		irq = irqmap[(inb(ioaddr + FJ_CONFIG0)>>6) & 0x03];
++		dev->irq = irqmap[(inb(ioaddr + FJ_CONFIG0)>>6) & 0x03];
+ 	}
+ 
+ 	/* Snarf the interrupt vector now. */
+-	retval = request_irq(irq, &net_interrupt, 0, dev->name, dev);
++	retval = request_irq(dev->irq, &net_interrupt, 0, dev->name, dev);
+ 	if (retval) {
+ 		printk ("FMV-18x found at %#3x, but it's unusable due to a conflict on"
+-				"IRQ %d.\n", ioaddr, irq);
++				"IRQ %d.\n", ioaddr, dev->irq);
+ 		goto out;
+ 	}
+ 
+ 	printk("%s: FMV-18x found at %#3x, IRQ %d, address ", dev->name,
+-		   ioaddr, irq);
+-
+-	dev->base_addr = ioaddr;
+-	dev->irq = irq;
++		   ioaddr, dev->irq);
+ 
+ 	for(i = 0; i < 6; i++) {
+ 		unsigned char val = inb(ioaddr + FJ_MACADDR + i);
+@@ -279,14 +303,10 @@ static int __init fmv18x_probe1(struct n
+ 	dev->watchdog_timeo	= HZ/10;
+ 	dev->get_stats		= net_get_stats;
+ 	dev->set_multicast_list = set_multicast_list;
+-
+-	/* Fill in the fields of 'dev' with ethernet-generic values. */
+-
+-	ether_setup(dev);
+ 	return 0;
+ 
+ out_irq:
+-	free_irq(irq, dev);
++	free_irq(dev->irq, dev);
+ out:
+ 	release_region(ioaddr, FMV18X_IO_EXTENT);
+ 	return retval;
+@@ -413,9 +433,7 @@ static int net_send_packet(struct sk_buf
+ 		lp->tx_queue_len = 0;
+ 		dev->trans_start = jiffies;
+ 		lp->tx_started = 1;
+-	} else if (lp->tx_queue_len < 4096 - 1502)
+-		/* Yes, there is room for one more packet. */
+-	else
++	} else if (lp->tx_queue_len >= 4096 - 1502) /* No room for a packet */
+ 		netif_stop_queue(dev);
+ 
+ 	dev_kfree_skb(skb);
+@@ -628,9 +646,7 @@ static void set_multicast_list(struct ne
+ }
+ 
+ #ifdef MODULE
+-static struct net_device dev_fmv18x;
+-static int io = 0x220;
+-static int irq;
++static struct net_device *dev_fmv18x;
+ 
+ MODULE_PARM(io, "i");
+ MODULE_PARM(irq, "i");
+@@ -644,26 +660,19 @@ int init_module(void)
+ {
+ 	if (io == 0)
+ 		printk("fmv18x: You should not use auto-probing with insmod!\n");
+-	dev_fmv18x.base_addr	= io;
+-	dev_fmv18x.irq		= irq;
+-	dev_fmv18x.init		= fmv18x_probe;
+-	if (register_netdev(&dev_fmv18x) != 0) {
+-		printk("fmv18x: register_netdev() returned non-zero.\n");
+-		return -EIO;
+-	}
++	dev_fmv18x = fmv18x_probe(-1);
++	if (IS_ERR(dev_fmv18x))
++		return PTR_ERR(dev_fmv18x);
+ 	return 0;
+ }
+ 
+ void
+ cleanup_module(void)
+ {
+-	unregister_netdev(&dev_fmv18x);
+-	kfree(dev_fmv18x.priv);
+-	dev_fmv18x.priv = NULL;
+-
+-	/* If we don't do this, we can't re-insmod it later. */
+-	free_irq(dev_fmv18x.irq, &dev_fmv18x);
+-	release_region(dev_fmv18x.base_addr, FMV18X_IO_EXTENT);
++	unregister_netdev(dev_fmv18x);
++	free_irq(dev_fmv18x->irq, dev_fmv18x);
++	release_region(dev_fmv18x->base_addr, FMV18X_IO_EXTENT);
++	free_netdev(dev_fmv18x);
+ }
+ #endif /* MODULE */
+ 
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/net/forcedeth.c	2003-12-28 23:21:01.000000000 -0800
+@@ -0,0 +1,1495 @@
++/*
++ * forcedeth: Ethernet driver for NVIDIA nForce media access controllers.
++ *
++ * Note: This driver is a cleanroom reimplementation based on reverse
++ *      engineered documentation written by Carl-Daniel Hailfinger
++ *      and Andrew de Quincey. It's neither supported nor endorsed
++ *      by NVIDIA Corp. Use at your own risk.
++ *
++ * NVIDIA, nForce and other NVIDIA marks are trademarks or registered
++ * trademarks of NVIDIA Corporation in the United States and other
++ * countries.
++ *
++ * Copyright (C) 2003 Manfred Spraul
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ *
++ * Changelog:
++ * 	0.01: 05 Oct 2003: First release that compiles without warnings.
++ * 	0.02: 05 Oct 2003: Fix bug for drain_tx: do not try to free NULL skbs.
++ * 			   Check all PCI BARs for the register window.
++ * 			   udelay added to mii_rw.
++ * 	0.03: 06 Oct 2003: Initialize dev->irq.
++ * 	0.04: 07 Oct 2003: Initialize np->lock, reduce handled irqs, add printks.
++ * 	0.05: 09 Oct 2003: printk removed again, irq status print tx_timeout.
++ * 	0.06: 10 Oct 2003: MAC Address read updated, pff flag generation updated,
++ * 			   irq mask updated
++ * 	0.07: 14 Oct 2003: Further irq mask updates.
++ * 	0.08: 20 Oct 2003: rx_desc.Length initialization added, alloc_rx refill
++ * 			   added into irq handler, NULL check for drain_ring.
++ * 	0.09: 20 Oct 2003: Basic link speed irq implementation. Only handle the
++ * 			   requested interrupt sources.
++ * 	0.10: 20 Oct 2003: First cleanup for release.
++ * 	0.11: 21 Oct 2003: hexdump for tx added, rx buffer sizes increased.
++ * 			   MAC Address init fix, set_multicast cleanup.
++ * 	0.12: 23 Oct 2003: Cleanups for release.
++ * 	0.13: 25 Oct 2003: Limit for concurrent tx packets increased to 10.
++ * 			   Set link speed correctly. start rx before starting
++ * 			   tx (start_rx sets the link speed).
++ * 	0.14: 25 Oct 2003: Nic dependant irq mask.
++ * 	0.15: 08 Nov 2003: fix smp deadlock with set_multicast_list during
++ * 			   open.
++ * 	0.16: 15 Nov 2003: include file cleanup for ppc64, rx buffer size
++ * 			   increased to 1628 bytes.
++ * 	0.17: 16 Nov 2003: undo rx buffer size increase. Substract 1 from
++ * 			   the tx length.
++ * 	0.18: 17 Nov 2003: fix oops due to late initialization of dev_stats
++ * 	0.19: 29 Nov 2003: Handle RxNoBuf, detect & handle invalid mac
++ * 			   addresses, really stop rx if already running
++ * 			   in start_rx, clean up a bit.
++ * 				(C) Carl-Daniel Hailfinger
++ *
++ * Known bugs:
++ * The irq handling is wrong - no tx done interrupts are generated.
++ * This means recovery from netif_stop_queue only happens in the hw timer
++ * interrupt (1/2 second on nForce2, 1/100 second on nForce3), or if an
++ * rx packet arrives by chance.
++ */
++#define FORCEDETH_VERSION		"0.19"
++
++#include <linux/module.h>
++#include <linux/types.h>
++#include <linux/pci.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/delay.h>
++#include <linux/spinlock.h>
++#include <linux/ethtool.h>
++#include <linux/timer.h>
++#include <linux/skbuff.h>
++#include <linux/mii.h>
++#include <linux/random.h>
++#include <linux/init.h>
++
++#include <asm/io.h>
++#include <asm/uaccess.h>
++#include <asm/system.h>
++
++#if 0
++#define dprintk			printk
++#else
++#define dprintk(x...)		do { } while (0)
++#endif
++
++
++/*
++ * Hardware access:
++ */
++
++#define DEV_NEED_LASTPACKET1	0x0001
++#define DEV_IRQMASK_1		0x0002
++#define DEV_IRQMASK_2		0x0004
++
++enum {
++	NvRegIrqStatus = 0x000,
++#define NVREG_IRQSTAT_MIIEVENT	0x040
++#define NVREG_IRQSTAT_MASK		0x1ff
++	NvRegIrqMask = 0x004,
++#define NVREG_IRQ_RX			0x0002
++#define NVREG_IRQ_RX_NOBUF		0x0004
++#define NVREG_IRQ_TX_ERR		0x0008
++#define NVREG_IRQ_TX2			0x0010
++#define NVREG_IRQ_TIMER			0x0020
++#define NVREG_IRQ_LINK			0x0040
++#define NVREG_IRQ_TX1			0x0100
++#define NVREG_IRQMASK_WANTED_1		0x005f
++#define NVREG_IRQMASK_WANTED_2		0x0147
++#define NVREG_IRQ_UNKNOWN		(~(NVREG_IRQ_RX|NVREG_IRQ_RX_NOBUF|NVREG_IRQ_TX_ERR|NVREG_IRQ_TX2|NVREG_IRQ_TIMER|NVREG_IRQ_LINK|NVREG_IRQ_TX1))
++
++	NvRegUnknownSetupReg6 = 0x008,
++#define NVREG_UNKSETUP6_VAL		3
++
++	NvRegPollingInterval = 0x00c,
++	NvRegMisc1 = 0x080,
++#define NVREG_MISC1_HD		0x02
++#define NVREG_MISC1_FORCE	0x3b0f3c
++
++	NvRegTransmitterControl = 0x084,
++#define NVREG_XMITCTL_START	0x01
++	NvRegTransmitterStatus = 0x088,
++#define NVREG_XMITSTAT_BUSY	0x01
++
++	NvRegPacketFilterFlags = 0x8c,
++#define NVREG_PFF_ALWAYS	0x7F0008
++#define NVREG_PFF_PROMISC	0x80
++#define NVREG_PFF_MYADDR	0x20
++
++	NvRegOffloadConfig = 0x90,
++#define NVREG_OFFLOAD_HOMEPHY	0x601
++#define NVREG_OFFLOAD_NORMAL	0x5ee
++	NvRegReceiverControl = 0x094,
++#define NVREG_RCVCTL_START	0x01
++	NvRegReceiverStatus = 0x98,
++#define NVREG_RCVSTAT_BUSY	0x01
++
++	NvRegRandomSeed = 0x9c,
++#define NVREG_RNDSEED_MASK	0x00ff
++#define NVREG_RNDSEED_FORCE	0x7f00
++
++	NvRegUnknownSetupReg1 = 0xA0,
++#define NVREG_UNKSETUP1_VAL	0x16070f
++	NvRegUnknownSetupReg2 = 0xA4,
++#define NVREG_UNKSETUP2_VAL	0x16
++	NvRegMacAddrA = 0xA8,
++	NvRegMacAddrB = 0xAC,
++	NvRegMulticastAddrA = 0xB0,
++#define NVREG_MCASTADDRA_FORCE	0x01
++	NvRegMulticastAddrB = 0xB4,
++	NvRegMulticastMaskA = 0xB8,
++	NvRegMulticastMaskB = 0xBC,
++
++	NvRegTxRingPhysAddr = 0x100,
++	NvRegRxRingPhysAddr = 0x104,
++	NvRegRingSizes = 0x108,
++#define NVREG_RINGSZ_TXSHIFT 0
++#define NVREG_RINGSZ_RXSHIFT 16
++	NvRegUnknownTransmitterReg = 0x10c,
++	NvRegLinkSpeed = 0x110,
++#define NVREG_LINKSPEED_FORCE 0x10000
++#define NVREG_LINKSPEED_10	10
++#define NVREG_LINKSPEED_100	100
++#define NVREG_LINKSPEED_1000	1000
++	NvRegUnknownSetupReg5 = 0x130,
++#define NVREG_UNKSETUP5_BIT31	(1<<31)
++	NvRegUnknownSetupReg3 = 0x134,
++#define NVREG_UNKSETUP3_VAL1	0x200010
++	NvRegTxRxControl = 0x144,
++#define NVREG_TXRXCTL_KICK	0x0001
++#define NVREG_TXRXCTL_BIT1	0x0002
++#define NVREG_TXRXCTL_BIT2	0x0004
++#define NVREG_TXRXCTL_IDLE	0x0008
++#define NVREG_TXRXCTL_RESET	0x0010
++	NvRegMIIStatus = 0x180,
++#define NVREG_MIISTAT_ERROR		0x0001
++#define NVREG_MIISTAT_LINKCHANGE	0x0008
++#define NVREG_MIISTAT_MASK		0x000f
++#define NVREG_MIISTAT_MASK2		0x000f
++	NvRegUnknownSetupReg4 = 0x184,
++#define NVREG_UNKSETUP4_VAL	8
++
++	NvRegAdapterControl = 0x188,
++#define NVREG_ADAPTCTL_START	0x02
++#define NVREG_ADAPTCTL_LINKUP	0x04
++#define NVREG_ADAPTCTL_PHYVALID	0x4000
++#define NVREG_ADAPTCTL_RUNNING	0x100000
++#define NVREG_ADAPTCTL_PHYSHIFT	24
++	NvRegMIISpeed = 0x18c,
++#define NVREG_MIISPEED_BIT8	(1<<8)
++#define NVREG_MIIDELAY	5
++	NvRegMIIControl = 0x190,
++#define NVREG_MIICTL_INUSE	0x10000
++#define NVREG_MIICTL_WRITE	0x08000
++#define NVREG_MIICTL_ADDRSHIFT	5
++	NvRegMIIData = 0x194,
++	NvRegWakeUpFlags = 0x200,
++#define NVREG_WAKEUPFLAGS_VAL		0x7770
++#define NVREG_WAKEUPFLAGS_BUSYSHIFT	24
++#define NVREG_WAKEUPFLAGS_ENABLESHIFT	16
++#define NVREG_WAKEUPFLAGS_D3SHIFT	12
++#define NVREG_WAKEUPFLAGS_D2SHIFT	8
++#define NVREG_WAKEUPFLAGS_D1SHIFT	4
++#define NVREG_WAKEUPFLAGS_D0SHIFT	0
++#define NVREG_WAKEUPFLAGS_ACCEPT_MAGPAT		0x01
++#define NVREG_WAKEUPFLAGS_ACCEPT_WAKEUPPAT	0x02
++#define NVREG_WAKEUPFLAGS_ACCEPT_LINKCHANGE	0x04
++
++	NvRegPatternCRC = 0x204,
++	NvRegPatternMask = 0x208,
++	NvRegPowerCap = 0x268,
++#define NVREG_POWERCAP_D3SUPP	(1<<30)
++#define NVREG_POWERCAP_D2SUPP	(1<<26)
++#define NVREG_POWERCAP_D1SUPP	(1<<25)
++	NvRegPowerState = 0x26c,
++#define NVREG_POWERSTATE_POWEREDUP	0x8000
++#define NVREG_POWERSTATE_VALID		0x0100
++#define NVREG_POWERSTATE_MASK		0x0003
++#define NVREG_POWERSTATE_D0		0x0000
++#define NVREG_POWERSTATE_D1		0x0001
++#define NVREG_POWERSTATE_D2		0x0002
++#define NVREG_POWERSTATE_D3		0x0003
++};
++
++struct ring_desc {
++	u32 PacketBuffer;
++	u16 Length;
++	u16 Flags;
++};
++
++#define NV_TX_LASTPACKET	(1<<0)
++#define NV_TX_RETRYERROR	(1<<3)
++#define NV_TX_LASTPACKET1	(1<<8)
++#define NV_TX_DEFERRED		(1<<10)
++#define NV_TX_CARRIERLOST	(1<<11)
++#define NV_TX_LATECOLLISION	(1<<12)
++#define NV_TX_UNDERFLOW		(1<<13)
++#define NV_TX_ERROR		(1<<14)
++#define NV_TX_VALID		(1<<15)
++
++#define NV_RX_DESCRIPTORVALID	(1<<0)
++#define NV_RX_MISSEDFRAME	(1<<1)
++#define NV_RX_SUBSTRACT1	(1<<3)
++#define NV_RX_ERROR1		(1<<7)
++#define NV_RX_ERROR2		(1<<8)
++#define NV_RX_ERROR3		(1<<9)
++#define NV_RX_ERROR4		(1<<10)
++#define NV_RX_CRCERR		(1<<11)
++#define NV_RX_OVERFLOW		(1<<12)
++#define NV_RX_FRAMINGERR	(1<<13)
++#define NV_RX_ERROR		(1<<14)
++#define NV_RX_AVAIL		(1<<15)
++
++/* Miscelaneous hardware related defines: */
++#define NV_PCI_REGSZ		0x270
++
++/* various timeout delays: all in usec */
++#define NV_TXRX_RESET_DELAY	4
++#define NV_TXSTOP_DELAY1	10
++#define NV_TXSTOP_DELAY1MAX	500000
++#define NV_TXSTOP_DELAY2	100
++#define NV_RXSTOP_DELAY1	10
++#define NV_RXSTOP_DELAY1MAX	500000
++#define NV_RXSTOP_DELAY2	100
++#define NV_SETUP5_DELAY		5
++#define NV_SETUP5_DELAYMAX	50000
++#define NV_POWERUP_DELAY	5
++#define NV_POWERUP_DELAYMAX	5000
++#define NV_MIIBUSY_DELAY	50
++#define NV_MIIPHY_DELAY	10
++#define NV_MIIPHY_DELAYMAX	10000
++
++#define NV_WAKEUPPATTERNS	5
++#define NV_WAKEUPMASKENTRIES	4
++
++/* General driver defaults */
++#define NV_WATCHDOG_TIMEO	(2*HZ)
++#define DEFAULT_MTU		1500	/* also maximum supported, at least for now */
++
++#define RX_RING		128
++#define TX_RING		16
++/* limited to 1 packet until we understand NV_TX_LASTPACKET */
++#define TX_LIMIT_STOP	10
++#define TX_LIMIT_START	5
++
++/* rx/tx mac addr + type + vlan + align + slack*/
++#define RX_NIC_BUFSIZE		(DEFAULT_MTU + 64)
++/* even more slack */
++#define RX_ALLOC_BUFSIZE	(DEFAULT_MTU + 128)
++
++#define OOM_REFILL	(1+HZ/20)
++#define POLL_WAIT	(1+HZ/100)
++
++/*
++ * SMP locking:
++ * All hardware access under dev->priv->lock, except the performance
++ * critical parts:
++ * - rx is (pseudo-) lockless: it relies on the single-threading provided
++ * 	by the arch code for interrupts.
++ * - tx setup is lockless: it relies on dev->xmit_lock. Actual submission
++ *	needs dev->priv->lock :-(
++ * - set_multicast_list: preparation lockless, relies on dev->xmit_lock.
++ */
++
++/* in dev: base, irq */
++struct fe_priv {
++	spinlock_t lock;
++
++	/* General data:
++	 * Locking: spin_lock(&np->lock); */
++	struct net_device_stats stats;
++	int in_shutdown;
++	u32 linkspeed;
++	int duplex;
++	int phyaddr;
++
++	/* General data: RO fields */
++	dma_addr_t ring_addr;
++	struct pci_dev *pci_dev;
++	u32 orig_mac[2];
++	u32 irqmask;
++
++	/* rx specific fields.
++	 * Locking: Within irq hander or disable_irq+spin_lock(&np->lock);
++	 */
++	struct ring_desc *rx_ring;
++	unsigned int cur_rx, refill_rx;
++	struct sk_buff *rx_skbuff[RX_RING];
++	dma_addr_t rx_dma[RX_RING];
++	unsigned int rx_buf_sz;
++	struct timer_list oom_kick;
++	struct timer_list nic_poll;
++
++	/*
++	 * tx specific fields.
++	 */
++	struct ring_desc *tx_ring;
++	unsigned int next_tx, nic_tx;
++	struct sk_buff *tx_skbuff[TX_RING];
++	dma_addr_t tx_dma[TX_RING];
++	u16 tx_flags;
++};
++
++/*
++ * Maximum number of loops until we assume that a bit in the irq mask
++ * is stuck. Overridable with module param.
++ */
++static int max_interrupt_work = 5;
++
++static inline struct fe_priv *get_nvpriv(struct net_device *dev)
++{
++	return (struct fe_priv *) dev->priv;
++}
++
++static inline u8 *get_hwbase(struct net_device *dev)
++{
++	return (u8 *) dev->base_addr;
++}
++
++static inline void pci_push(u8 * base)
++{
++	/* force out pending posted writes */
++	readl(base);
++}
++
++static int reg_delay(struct net_device *dev, int offset, u32 mask, u32 target,
++				int delay, int delaymax, const char *msg)
++{
++	u8 *base = get_hwbase(dev);
++
++	pci_push(base);
++	do {
++		udelay(delay);
++		delaymax -= delay;
++		if (delaymax < 0) {
++			if (msg)
++				printk(msg);
++			return 1;
++		}
++	} while ((readl(base + offset) & mask) != target);
++	return 0;
++}
++
++#define MII_READ	(-1)
++/* mii_rw: read/write a register on the PHY.
++ *
++ * Caller must guarantee serialization
++ */
++static int mii_rw(struct net_device *dev, int addr, int miireg, int value)
++{
++	u8 *base = get_hwbase(dev);
++	int was_running;
++	u32 reg;
++	int retval;
++
++	writel(NVREG_MIISTAT_MASK, base + NvRegMIIStatus);
++	was_running = 0;
++	reg = readl(base + NvRegAdapterControl);
++	if (reg & NVREG_ADAPTCTL_RUNNING) {
++		was_running = 1;
++		writel(reg & ~NVREG_ADAPTCTL_RUNNING, base + NvRegAdapterControl);
++	}
++	reg = readl(base + NvRegMIIControl);
++	if (reg & NVREG_MIICTL_INUSE) {
++		writel(NVREG_MIICTL_INUSE, base + NvRegMIIControl);
++		udelay(NV_MIIBUSY_DELAY);
++	}
++
++	reg = NVREG_MIICTL_INUSE | (addr << NVREG_MIICTL_ADDRSHIFT) | miireg;
++	if (value != MII_READ) {
++		writel(value, base + NvRegMIIData);
++		reg |= NVREG_MIICTL_WRITE;
++	}
++	writel(reg, base + NvRegMIIControl);
++
++	if (reg_delay(dev, NvRegMIIControl, NVREG_MIICTL_INUSE, 0,
++			NV_MIIPHY_DELAY, NV_MIIPHY_DELAYMAX, NULL)) {
++		dprintk(KERN_DEBUG "%s: mii_rw of reg %d at PHY %d timed out.\n",
++				dev->name, miireg, addr);
++		retval = -1;
++	} else if (value != MII_READ) {
++		/* it was a write operation - fewer failures are detectable */
++		dprintk(KERN_DEBUG "%s: mii_rw wrote 0x%x to reg %d at PHY %d\n",
++				dev->name, value, miireg, addr);
++		retval = 0;
++	} else if (readl(base + NvRegMIIStatus) & NVREG_MIISTAT_ERROR) {
++		dprintk(KERN_DEBUG "%s: mii_rw of reg %d at PHY %d failed.\n",
++				dev->name, miireg, addr);
++		retval = -1;
++	} else {
++		/* FIXME: why is that required? */
++		udelay(50);
++		retval = readl(base + NvRegMIIData);
++		dprintk(KERN_DEBUG "%s: mii_rw read from reg %d at PHY %d: 0x%x.\n",
++				dev->name, miireg, addr, retval);
++	}
++	if (was_running) {
++		reg = readl(base + NvRegAdapterControl);
++		writel(reg | NVREG_ADAPTCTL_RUNNING, base + NvRegAdapterControl);
++	}
++	return retval;
++}
++
++static void start_rx(struct net_device *dev)
++{
++	struct fe_priv *np = get_nvpriv(dev);
++	u8 *base = get_hwbase(dev);
++
++	dprintk(KERN_DEBUG "%s: start_rx\n", dev->name);
++	/* Already running? Stop it. */
++	if (readl(base + NvRegReceiverControl) & NVREG_RCVCTL_START) {
++		writel(0, base + NvRegReceiverControl);
++		pci_push(base);
++	}
++	writel(np->linkspeed, base + NvRegLinkSpeed);
++	pci_push(base);
++	writel(NVREG_RCVCTL_START, base + NvRegReceiverControl);
++	pci_push(base);
++}
++
++static void stop_rx(struct net_device *dev)
++{
++	u8 *base = get_hwbase(dev);
++
++	dprintk(KERN_DEBUG "%s: stop_rx\n", dev->name);
++	writel(0, base + NvRegReceiverControl);
++	reg_delay(dev, NvRegReceiverStatus, NVREG_RCVSTAT_BUSY, 0,
++		       NV_RXSTOP_DELAY1, NV_RXSTOP_DELAY1MAX,
++		       KERN_INFO "stop_rx: ReceiverStatus remained busy");
++
++	udelay(NV_RXSTOP_DELAY2);
++	writel(0, base + NvRegLinkSpeed);
++}
++
++static void start_tx(struct net_device *dev)
++{
++	u8 *base = get_hwbase(dev);
++
++	dprintk(KERN_DEBUG "%s: start_tx\n", dev->name);
++	writel(NVREG_XMITCTL_START, base + NvRegTransmitterControl);
++	pci_push(base);
++}
++
++static void stop_tx(struct net_device *dev)
++{
++	u8 *base = get_hwbase(dev);
++
++	dprintk(KERN_DEBUG "%s: stop_tx\n", dev->name);
++	writel(0, base + NvRegTransmitterControl);
++	reg_delay(dev, NvRegTransmitterStatus, NVREG_XMITSTAT_BUSY, 0,
++		       NV_TXSTOP_DELAY1, NV_TXSTOP_DELAY1MAX,
++		       KERN_INFO "stop_tx: TransmitterStatus remained busy");
++
++	udelay(NV_TXSTOP_DELAY2);
++	writel(0, base + NvRegUnknownTransmitterReg);
++}
++
++static void txrx_reset(struct net_device *dev)
++{
++	u8 *base = get_hwbase(dev);
++
++	dprintk(KERN_DEBUG "%s: txrx_reset\n", dev->name);
++	writel(NVREG_TXRXCTL_BIT2 | NVREG_TXRXCTL_RESET, base + NvRegTxRxControl);
++	pci_push(base);
++	udelay(NV_TXRX_RESET_DELAY);
++	writel(NVREG_TXRXCTL_BIT2, base + NvRegTxRxControl);
++	pci_push(base);
++}
++
++/*
++ * get_stats: dev->get_stats function
++ * Get latest stats value from the nic.
++ * Called with read_lock(&dev_base_lock) held for read -
++ * only synchronized against unregister_netdevice.
++ */
++static struct net_device_stats *get_stats(struct net_device *dev)
++{
++	struct fe_priv *np = get_nvpriv(dev);
++
++	/* It seems that the nic always generates interrupts and doesn't
++	 * accumulate errors internally. Thus the current values in np->stats
++	 * are already up to date.
++	 */
++	return &np->stats;
++}
++
++
++/*
++ * nic_ioctl: dev->do_ioctl function
++ * Called with rtnl_lock held.
++ */
++static int nic_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
++{
++	return -EOPNOTSUPP;
++}
++
++/*
++ * alloc_rx: fill rx ring entries.
++ * Return 1 if the allocations for the skbs failed and the
++ * rx engine is without Available descriptors
++ */
++static int alloc_rx(struct net_device *dev)
++{
++	struct fe_priv *np = get_nvpriv(dev);
++	unsigned int refill_rx = np->refill_rx;
++
++	while (np->cur_rx != refill_rx) {
++		int nr = refill_rx % RX_RING;
++		struct sk_buff *skb;
++
++		if (np->rx_skbuff[nr] == NULL) {
++
++			skb = dev_alloc_skb(RX_ALLOC_BUFSIZE);
++			if (!skb)
++				break;
++
++			skb->dev = dev;
++			np->rx_skbuff[nr] = skb;
++		} else {
++			skb = np->rx_skbuff[nr];
++		}
++		np->rx_dma[nr] = pci_map_single(np->pci_dev, skb->data, skb->len,
++						PCI_DMA_FROMDEVICE);
++		np->rx_ring[nr].PacketBuffer = cpu_to_le32(np->rx_dma[nr]);
++		np->rx_ring[nr].Length = cpu_to_le16(RX_NIC_BUFSIZE);
++		wmb();
++		np->rx_ring[nr].Flags = cpu_to_le16(NV_RX_AVAIL);
++		dprintk(KERN_DEBUG "%s: alloc_rx: Packet  %d marked as Available\n",
++					dev->name, refill_rx);
++		refill_rx++;
++	}
++	np->refill_rx = refill_rx;
++	if (np->cur_rx - refill_rx == RX_RING)
++		return 1;
++	return 0;
++}
++
++static void do_rx_refill(unsigned long data)
++{
++	struct net_device *dev = (struct net_device *) data;
++	struct fe_priv *np = get_nvpriv(dev);
++
++	disable_irq(dev->irq);
++	if (alloc_rx(dev)) {
++		spin_lock(&np->lock);
++		if (!np->in_shutdown)
++			mod_timer(&np->oom_kick, jiffies + OOM_REFILL);
++		spin_unlock(&np->lock);
++	}
++	enable_irq(dev->irq);
++}
++
++static int init_ring(struct net_device *dev)
++{
++	struct fe_priv *np = get_nvpriv(dev);
++	int i;
++
++	np->next_tx = np->nic_tx = 0;
++	for (i = 0; i < TX_RING; i++) {
++		np->tx_ring[i].Flags = 0;
++	}
++
++	np->cur_rx = RX_RING;
++	np->refill_rx = 0;
++	for (i = 0; i < RX_RING; i++) {
++		np->rx_ring[i].Flags = 0;
++	}
++	return alloc_rx(dev);
++}
++
++static void drain_tx(struct net_device *dev)
++{
++	struct fe_priv *np = get_nvpriv(dev);
++	int i;
++	for (i = 0; i < TX_RING; i++) {
++		np->tx_ring[i].Flags = 0;
++		if (np->tx_skbuff[i]) {
++			pci_unmap_single(np->pci_dev, np->tx_dma[i],
++						np->tx_skbuff[i]->len,
++						PCI_DMA_TODEVICE);
++			dev_kfree_skb(np->tx_skbuff[i]);
++			np->tx_skbuff[i] = NULL;
++			np->stats.tx_dropped++;
++		}
++	}
++}
++
++static void drain_rx(struct net_device *dev)
++{
++	struct fe_priv *np = get_nvpriv(dev);
++	int i;
++	for (i = 0; i < RX_RING; i++) {
++		np->rx_ring[i].Flags = 0;
++		wmb();
++		if (np->rx_skbuff[i]) {
++			pci_unmap_single(np->pci_dev, np->rx_dma[i],
++						np->rx_skbuff[i]->len,
++						PCI_DMA_FROMDEVICE);
++			dev_kfree_skb(np->rx_skbuff[i]);
++			np->rx_skbuff[i] = NULL;
++		}
++	}
++}
++
++static void drain_ring(struct net_device *dev)
++{
++	drain_tx(dev);
++	drain_rx(dev);
++}
++
++/*
++ * start_xmit: dev->hard_start_xmit function
++ * Called with dev->xmit_lock held.
++ */
++static int start_xmit(struct sk_buff *skb, struct net_device *dev)
++{
++	struct fe_priv *np = get_nvpriv(dev);
++	int nr = np->next_tx % TX_RING;
++
++	np->tx_skbuff[nr] = skb;
++	np->tx_dma[nr] = pci_map_single(np->pci_dev, skb->data,skb->len,
++					PCI_DMA_TODEVICE);
++
++	np->tx_ring[nr].PacketBuffer = cpu_to_le32(np->tx_dma[nr]);
++	np->tx_ring[nr].Length = cpu_to_le16(skb->len-1);
++
++	spin_lock_irq(&np->lock);
++	wmb();
++	np->tx_ring[nr].Flags = np->tx_flags;
++	dprintk(KERN_DEBUG "%s: start_xmit: packet packet %d queued for transmission.\n",
++				dev->name, np->next_tx);
++	{
++		int j;
++		for (j=0; j<64; j++) {
++			if ((j%16) == 0)
++				dprintk("\n%03x:", j);
++			dprintk(" %02x", ((unsigned char*)skb->data)[j]);
++		}
++		dprintk("\n");
++	}
++
++	np->next_tx++;
++
++	dev->trans_start = jiffies;
++	if (np->next_tx - np->nic_tx >= TX_LIMIT_STOP)
++		netif_stop_queue(dev);
++	spin_unlock_irq(&np->lock);
++	writel(NVREG_TXRXCTL_KICK, get_hwbase(dev) + NvRegTxRxControl);
++	return 0;
++}
++
++/*
++ * tx_done: check for completed packets, release the skbs.
++ *
++ * Caller must own np->lock.
++ */
++static void tx_done(struct net_device *dev)
++{
++	struct fe_priv *np = get_nvpriv(dev);
++
++	while (np->nic_tx < np->next_tx) {
++		struct ring_desc *prd;
++		int i = np->nic_tx % TX_RING;
++
++		prd = &np->tx_ring[i];
++
++		dprintk(KERN_DEBUG "%s: tx_done: looking at packet %d, Flags 0x%x.\n",
++					dev->name, np->nic_tx, prd->Flags);
++		if (prd->Flags & cpu_to_le16(NV_TX_VALID))
++			break;
++		if (prd->Flags & cpu_to_le16(NV_TX_RETRYERROR|NV_TX_CARRIERLOST|NV_TX_LATECOLLISION|
++						NV_TX_UNDERFLOW|NV_TX_ERROR)) {
++			if (prd->Flags & cpu_to_le16(NV_TX_UNDERFLOW))
++				np->stats.tx_fifo_errors++;
++			if (prd->Flags & cpu_to_le16(NV_TX_CARRIERLOST))
++				np->stats.tx_carrier_errors++;
++			np->stats.tx_errors++;
++		} else {
++			np->stats.tx_packets++;
++			np->stats.tx_bytes += np->tx_skbuff[i]->len;
++		}
++		pci_unmap_single(np->pci_dev, np->tx_dma[i],
++					np->tx_skbuff[i]->len,
++					PCI_DMA_TODEVICE);
++		dev_kfree_skb_irq(np->tx_skbuff[i]);
++		np->tx_skbuff[i] = NULL;
++		np->nic_tx++;
++	}
++	if (np->next_tx - np->nic_tx < TX_LIMIT_START)
++		netif_wake_queue(dev);
++}
++
++/*
++ * tx_timeout: dev->tx_timeout function
++ * Called with dev->xmit_lock held.
++ */
++static void tx_timeout(struct net_device *dev)
++{
++	struct fe_priv *np = get_nvpriv(dev);
++	u8 *base = get_hwbase(dev);
++
++	dprintk(KERN_DEBUG "%s: Got tx_timeout. irq: %08x\n", dev->name,
++			readl(base + NvRegIrqStatus) & NVREG_IRQSTAT_MASK);
++
++	spin_lock_irq(&np->lock);
++
++	/* 1) stop tx engine */
++	stop_tx(dev);
++
++	/* 2) check that the packets were not sent already: */
++	tx_done(dev);
++
++	/* 3) if there are dead entries: clear everything */
++	if (np->next_tx != np->nic_tx) {
++		printk(KERN_DEBUG "%s: tx_timeout: dead entries!\n", dev->name);
++		drain_tx(dev);
++		np->next_tx = np->nic_tx = 0;
++		writel((u32) (np->ring_addr + RX_RING*sizeof(struct ring_desc)), base + NvRegTxRingPhysAddr);
++		netif_wake_queue(dev);
++	}
++
++	/* 4) restart tx engine */
++	start_tx(dev);
++	spin_unlock_irq(&np->lock);
++}
++
++static void rx_process(struct net_device *dev)
++{
++	struct fe_priv *np = get_nvpriv(dev);
++
++	for (;;) {
++		struct ring_desc *prd;
++		struct sk_buff *skb;
++		int len;
++		int i;
++		if (np->cur_rx - np->refill_rx >= RX_RING)
++			break;	/* we scanned the whole ring - do not continue */
++
++		i = np->cur_rx % RX_RING;
++		prd = &np->rx_ring[i];
++		dprintk(KERN_DEBUG "%s: rx_process: looking at packet %d, Flags 0x%x.\n",
++					dev->name, np->cur_rx, prd->Flags);
++
++		if (prd->Flags & cpu_to_le16(NV_RX_AVAIL))
++			break;	/* still owned by hardware, */
++
++		/*
++		 * the packet is for us - immediately tear down the pci mapping, and
++		 * prefetch the first cacheline of the packet.
++		 */
++		pci_unmap_single(np->pci_dev, np->rx_dma[i],
++				np->rx_skbuff[i]->len,
++				PCI_DMA_FROMDEVICE);
++		prefetch(np->rx_skbuff[i]->data);
++
++		{
++			int j;
++			dprintk(KERN_DEBUG "Dumping packet (flags 0x%x).",prd->Flags);
++			for (j=0; j<64; j++) {
++				if ((j%16) == 0)
++					dprintk("\n%03x:", j);
++				dprintk(" %02x", ((unsigned char*)np->rx_skbuff[i]->data)[j]);
++			}
++			dprintk("\n");
++		}
++		/* look at what we actually got: */
++		if (!(prd->Flags & cpu_to_le16(NV_RX_DESCRIPTORVALID)))
++			goto next_pkt;
++
++
++		len = le16_to_cpu(prd->Length);
++
++		if (prd->Flags & cpu_to_le16(NV_RX_MISSEDFRAME)) {
++			np->stats.rx_missed_errors++;
++			np->stats.rx_errors++;
++			goto next_pkt;
++		}
++		if (prd->Flags & cpu_to_le16(NV_RX_ERROR1|NV_RX_ERROR2|NV_RX_ERROR3|NV_RX_ERROR4)) {
++			np->stats.rx_errors++;
++			goto next_pkt;
++		}
++		if (prd->Flags & cpu_to_le16(NV_RX_CRCERR)) {
++			np->stats.rx_crc_errors++;
++			np->stats.rx_errors++;
++			goto next_pkt;
++		}
++		if (prd->Flags & cpu_to_le16(NV_RX_OVERFLOW)) {
++			np->stats.rx_over_errors++;
++			np->stats.rx_errors++;
++			goto next_pkt;
++		}
++		if (prd->Flags & cpu_to_le16(NV_RX_ERROR)) {
++			/* framing errors are soft errors, the rest is fatal. */
++			if (prd->Flags & cpu_to_le16(NV_RX_FRAMINGERR)) {
++				if (prd->Flags & cpu_to_le16(NV_RX_SUBSTRACT1)) {
++					len--;
++				}
++			} else {
++				np->stats.rx_errors++;
++				goto next_pkt;
++			}
++		}
++		/* got a valid packet - forward it to the network core */
++		skb = np->rx_skbuff[i];
++		np->rx_skbuff[i] = NULL;
++
++		skb_put(skb, len);
++		skb->protocol = eth_type_trans(skb, dev);
++		dprintk(KERN_DEBUG "%s: rx_process: packet %d with %d bytes, proto %d accepted.\n",
++					dev->name, np->cur_rx, len, skb->protocol);
++		netif_rx(skb);
++		dev->last_rx = jiffies;
++		np->stats.rx_packets++;
++		np->stats.rx_bytes += len;
++next_pkt:
++		np->cur_rx++;
++	}
++}
++
++/*
++ * change_mtu: dev->change_mtu function
++ * Called with dev_base_lock held for read.
++ */
++static int change_mtu(struct net_device *dev, int new_mtu)
++{
++	if (new_mtu > DEFAULT_MTU)
++		return -EINVAL;
++	dev->mtu = new_mtu;
++	return 0;
++}
++
++/*
++ * change_mtu: dev->change_mtu function
++ * Called with dev->xmit_lock held.
++ */
++static void set_multicast(struct net_device *dev)
++{
++	struct fe_priv *np = get_nvpriv(dev);
++	u8 *base = get_hwbase(dev);
++	u32 addr[2];
++	u32 mask[2];
++	u32 pff;
++
++	memset(addr, 0, sizeof(addr));
++	memset(mask, 0, sizeof(mask));
++
++	if (dev->flags & IFF_PROMISC) {
++		printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n", dev->name);
++		pff = NVREG_PFF_PROMISC;
++	} else {
++		pff = NVREG_PFF_MYADDR;
++
++		if (dev->flags & IFF_ALLMULTI || dev->mc_list) {
++			u32 alwaysOff[2];
++			u32 alwaysOn[2];
++
++			alwaysOn[0] = alwaysOn[1] = alwaysOff[0] = alwaysOff[1] = 0xffffffff;
++			if (dev->flags & IFF_ALLMULTI) {
++				alwaysOn[0] = alwaysOn[1] = alwaysOff[0] = alwaysOff[1] = 0;
++			} else {
++				struct dev_mc_list *walk;
++
++				walk = dev->mc_list;
++				while (walk != NULL) {
++					u32 a, b;
++					a = le32_to_cpu(*(u32 *) walk->dmi_addr);
++					b = le16_to_cpu(*(u16 *) (&walk->dmi_addr[4]));
++					alwaysOn[0] &= a;
++					alwaysOff[0] &= ~a;
++					alwaysOn[1] &= b;
++					alwaysOff[1] &= ~b;
++					walk = walk->next;
++				}
++			}
++			addr[0] = alwaysOn[0];
++			addr[1] = alwaysOn[1];
++			mask[0] = alwaysOn[0] | alwaysOff[0];
++			mask[1] = alwaysOn[1] | alwaysOff[1];
++		}
++	}
++	addr[0] |= NVREG_MCASTADDRA_FORCE;
++	pff |= NVREG_PFF_ALWAYS;
++	spin_lock_irq(&np->lock);
++	stop_rx(dev);
++	writel(addr[0], base + NvRegMulticastAddrA);
++	writel(addr[1], base + NvRegMulticastAddrB);
++	writel(mask[0], base + NvRegMulticastMaskA);
++	writel(mask[1], base + NvRegMulticastMaskB);
++	writel(pff, base + NvRegPacketFilterFlags);
++	start_rx(dev);
++	spin_unlock_irq(&np->lock);
++}
++
++static int update_linkspeed(struct net_device *dev)
++{
++	struct fe_priv *np = get_nvpriv(dev);
++	int adv, lpa, newls, newdup;
++
++	adv = mii_rw(dev, np->phyaddr, MII_ADVERTISE, MII_READ);
++	lpa = mii_rw(dev, np->phyaddr, MII_LPA, MII_READ);
++	dprintk(KERN_DEBUG "%s: update_linkspeed: PHY advertises 0x%04x, lpa 0x%04x.\n",
++				dev->name, adv, lpa);
++
++	/* FIXME: handle parallel detection properly, handle gigabit ethernet */
++	lpa = lpa & adv;
++	if (lpa  & LPA_100FULL) {
++		newls = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_100;
++		newdup = 1;
++	} else if (lpa & LPA_100HALF) {
++		newls = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_100;
++		newdup = 0;
++	} else if (lpa & LPA_10FULL) {
++		newls = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_10;
++		newdup = 1;
++	} else if (lpa & LPA_10HALF) {
++		newls = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_10;
++		newdup = 0;
++	} else {
++		dprintk(KERN_DEBUG "%s: bad ability %04x - falling back to 10HD.\n", dev->name, lpa);
++		newls = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_10;
++		newdup = 0;
++	}
++	if (np->duplex != newdup || np->linkspeed != newls) {
++		np->duplex = newdup;
++		np->linkspeed = newls;
++		return 1;
++	}
++	return 0;
++}
++
++static void link_irq(struct net_device *dev)
++{
++	struct fe_priv *np = get_nvpriv(dev);
++	u8 *base = get_hwbase(dev);
++	u32 miistat;
++	int miival;
++
++	miistat = readl(base + NvRegMIIStatus);
++	writel(NVREG_MIISTAT_MASK, base + NvRegMIIStatus);
++	printk(KERN_DEBUG "%s: link change notification, status 0x%x.\n", dev->name, miistat);
++
++	miival = mii_rw(dev, np->phyaddr, MII_BMSR, MII_READ);
++	if (miival & BMSR_ANEGCOMPLETE) {
++		update_linkspeed(dev);
++
++		if (netif_carrier_ok(dev)) {
++			stop_rx(dev);
++		} else {
++			netif_carrier_on(dev);
++			printk(KERN_INFO "%s: link up.\n", dev->name);
++		}
++		writel(NVREG_MISC1_FORCE | ( np->duplex ? 0 : NVREG_MISC1_HD),
++					base + NvRegMisc1);
++		start_rx(dev);
++	} else {
++		if (netif_carrier_ok(dev)) {
++			netif_carrier_off(dev);
++			printk(KERN_INFO "%s: link down.\n", dev->name);
++			stop_rx(dev);
++		}
++		writel(np->linkspeed, base + NvRegLinkSpeed);
++		pci_push(base);
++	}
++}
++
++static irqreturn_t nic_irq(int foo, void *data, struct pt_regs *regs)
++{
++	struct net_device *dev = (struct net_device *) data;
++	struct fe_priv *np = get_nvpriv(dev);
++	u8 *base = get_hwbase(dev);
++	u32 events;
++	int i;
++
++	dprintk(KERN_DEBUG "%s: nic_irq\n", dev->name);
++
++	for (i=0; ; i++) {
++		events = readl(base + NvRegIrqStatus) & NVREG_IRQSTAT_MASK;
++		writel(NVREG_IRQSTAT_MASK, base + NvRegIrqStatus);
++		pci_push(base);
++		dprintk(KERN_DEBUG "%s: irq: %08x\n", dev->name, events);
++		if (!(events & np->irqmask))
++			break;
++
++		if (events & (NVREG_IRQ_TX1|NVREG_IRQ_TX2|NVREG_IRQ_TX_ERR)) {
++			spin_lock(&np->lock);
++			tx_done(dev);
++			spin_unlock(&np->lock);
++		}
++
++		if (events & (NVREG_IRQ_RX|NVREG_IRQ_RX_NOBUF)) {
++			rx_process(dev);
++			if (alloc_rx(dev)) {
++				spin_lock(&np->lock);
++				if (!np->in_shutdown)
++					mod_timer(&np->oom_kick, jiffies + OOM_REFILL);
++				spin_unlock(&np->lock);
++			}
++		}
++
++		if (events & NVREG_IRQ_LINK) {
++			spin_lock(&np->lock);
++			link_irq(dev);
++			spin_unlock(&np->lock);
++		}
++		if (events & (NVREG_IRQ_TX_ERR)) {
++			dprintk(KERN_DEBUG "%s: received irq with events 0x%x. Probably TX fail.\n",
++						dev->name, events);
++		}
++		if (events & (NVREG_IRQ_UNKNOWN)) {
++			printk(KERN_DEBUG "%s: received irq with unknown events 0x%x. Please report\n",
++						dev->name, events);
++ 		}
++		if (i > max_interrupt_work) {
++			spin_lock(&np->lock);
++			/* disable interrupts on the nic */
++			writel(0, base + NvRegIrqMask);
++			pci_push(base);
++
++			if (!np->in_shutdown)
++				mod_timer(&np->nic_poll, jiffies + POLL_WAIT);
++			printk(KERN_DEBUG "%s: too many iterations (%d) in nic_irq.\n", dev->name, i);
++			spin_unlock(&np->lock);
++			break;
++		}
++
++	}
++	dprintk(KERN_DEBUG "%s: nic_irq completed\n", dev->name);
++
++	return IRQ_RETVAL(i);
++}
++
++static void do_nic_poll(unsigned long data)
++{
++	struct net_device *dev = (struct net_device *) data;
++	struct fe_priv *np = get_nvpriv(dev);
++	u8 *base = get_hwbase(dev);
++
++	disable_irq(dev->irq);
++	/*
++	 * reenable interrupts on the nic, we have to do this before calling
++	 * nic_irq because that may decide to do otherwise
++	 */
++	writel(np->irqmask, base + NvRegIrqMask);
++	pci_push(base);
++	nic_irq((int) 0, (void *) data, (struct pt_regs *) NULL);
++	enable_irq(dev->irq);
++}
++
++static int open(struct net_device *dev)
++{
++	struct fe_priv *np = get_nvpriv(dev);
++	u8 *base = get_hwbase(dev);
++	int ret, oom, i;
++
++	dprintk(KERN_DEBUG "forcedeth: open\n");
++
++	/* 1) erase previous misconfiguration */
++	/* 4.1-1: stop adapter: ignored, 4.3 seems to be overkill */
++	writel(NVREG_MCASTADDRA_FORCE, base + NvRegMulticastAddrA);
++	writel(0, base + NvRegMulticastAddrB);
++	writel(0, base + NvRegMulticastMaskA);
++	writel(0, base + NvRegMulticastMaskB);
++	writel(0, base + NvRegPacketFilterFlags);
++	writel(0, base + NvRegAdapterControl);
++	writel(0, base + NvRegLinkSpeed);
++	writel(0, base + NvRegUnknownTransmitterReg);
++	txrx_reset(dev);
++	writel(0, base + NvRegUnknownSetupReg6);
++
++	/* 2) initialize descriptor rings */
++	np->in_shutdown = 0;
++	oom = init_ring(dev);
++
++	/* 3) set mac address */
++	{
++		u32 mac[2];
++
++		mac[0] = (dev->dev_addr[0] <<  0) + (dev->dev_addr[1] <<  8) +
++				(dev->dev_addr[2] << 16) + (dev->dev_addr[3] << 24);
++		mac[1] = (dev->dev_addr[4] << 0) + (dev->dev_addr[5] << 8);
++
++		writel(mac[0], base + NvRegMacAddrA);
++		writel(mac[1], base + NvRegMacAddrB);
++	}
++
++	/* 4) continue setup */
++	np->linkspeed = NVREG_LINKSPEED_FORCE|NVREG_LINKSPEED_10;
++	np->duplex = 0;
++	writel(NVREG_UNKSETUP3_VAL1, base + NvRegUnknownSetupReg3);
++	writel(0, base + NvRegTxRxControl);
++	pci_push(base);
++	writel(NVREG_TXRXCTL_BIT1, base + NvRegTxRxControl);
++	reg_delay(dev, NvRegUnknownSetupReg5, NVREG_UNKSETUP5_BIT31, NVREG_UNKSETUP5_BIT31,
++			NV_SETUP5_DELAY, NV_SETUP5_DELAYMAX,
++			KERN_INFO "open: SetupReg5, Bit 31 remained off\n");
++	writel(0, base + NvRegUnknownSetupReg4);
++
++	/* 5) Find a suitable PHY */
++	writel(NVREG_MIISPEED_BIT8|NVREG_MIIDELAY, base + NvRegMIISpeed);
++	for (i = 1; i < 32; i++) {
++		int id1, id2;
++
++		id1 = mii_rw(dev, i, MII_PHYSID1, MII_READ);
++		if (id1 < 0)
++			continue;
++		id2 = mii_rw(dev, i, MII_PHYSID2, MII_READ);
++		if (id2 < 0)
++			continue;
++		dprintk(KERN_DEBUG "%s: open: Found PHY %04x:%04x at address %d.\n",
++				dev->name, id1, id2, i);
++		np->phyaddr = i;
++
++		update_linkspeed(dev);
++
++		break;
++	}
++	if (i == 32) {
++		printk(KERN_INFO "%s: open: failing due to lack of suitable PHY.\n",
++				dev->name);
++		ret = -EINVAL;
++		goto out_drain;
++	}
++
++	/* 6) continue setup */
++	writel(NVREG_MISC1_FORCE | ( np->duplex ? 0 : NVREG_MISC1_HD),
++				base + NvRegMisc1);
++	writel(readl(base + NvRegTransmitterStatus), base + NvRegTransmitterStatus);
++	writel(NVREG_PFF_ALWAYS, base + NvRegPacketFilterFlags);
++	writel(NVREG_OFFLOAD_NORMAL, base + NvRegOffloadConfig);
++
++	writel(readl(base + NvRegReceiverStatus), base + NvRegReceiverStatus);
++	get_random_bytes(&i, sizeof(i));
++	writel(NVREG_RNDSEED_FORCE | (i&NVREG_RNDSEED_MASK), base + NvRegRandomSeed);
++	writel(NVREG_UNKSETUP1_VAL, base + NvRegUnknownSetupReg1);
++	writel(NVREG_UNKSETUP2_VAL, base + NvRegUnknownSetupReg2);
++	writel(NVREG_UNKSETUP6_VAL, base + NvRegUnknownSetupReg6);
++	writel((np->phyaddr << NVREG_ADAPTCTL_PHYSHIFT)|NVREG_ADAPTCTL_PHYVALID,
++			base + NvRegAdapterControl);
++	writel(NVREG_UNKSETUP4_VAL, base + NvRegUnknownSetupReg4);
++	writel(NVREG_WAKEUPFLAGS_VAL, base + NvRegWakeUpFlags);
++
++	/* 7) start packet processing */
++	writel((u32) np->ring_addr, base + NvRegRxRingPhysAddr);
++	writel((u32) (np->ring_addr + RX_RING*sizeof(struct ring_desc)), base + NvRegTxRingPhysAddr);
++	writel( ((RX_RING-1) << NVREG_RINGSZ_RXSHIFT) + ((TX_RING-1) << NVREG_RINGSZ_TXSHIFT),
++			base + NvRegRingSizes);
++
++	i = readl(base + NvRegPowerState);
++	if ( (i & NVREG_POWERSTATE_POWEREDUP) == 0) {
++		writel(NVREG_POWERSTATE_POWEREDUP|i, base + NvRegPowerState);
++	}
++	pci_push(base);
++	udelay(10);
++	writel(readl(base + NvRegPowerState) | NVREG_POWERSTATE_VALID, base + NvRegPowerState);
++	writel(NVREG_ADAPTCTL_RUNNING, base + NvRegAdapterControl);
++
++
++	writel(0, base + NvRegIrqMask);
++	pci_push(base);
++	writel(NVREG_IRQSTAT_MASK, base + NvRegIrqStatus);
++	pci_push(base);
++	writel(NVREG_MIISTAT_MASK2, base + NvRegMIIStatus);
++	writel(NVREG_IRQSTAT_MASK, base + NvRegIrqStatus);
++	pci_push(base);
++
++	ret = request_irq(dev->irq, &nic_irq, SA_SHIRQ, dev->name, dev);
++	if (ret)
++		goto out_drain;
++
++	writel(np->irqmask, base + NvRegIrqMask);
++
++	spin_lock_irq(&np->lock);
++	writel(NVREG_MCASTADDRA_FORCE, base + NvRegMulticastAddrA);
++	writel(0, base + NvRegMulticastAddrB);
++	writel(0, base + NvRegMulticastMaskA);
++	writel(0, base + NvRegMulticastMaskB);
++	writel(NVREG_PFF_ALWAYS|NVREG_PFF_MYADDR, base + NvRegPacketFilterFlags);
++	start_rx(dev);
++	start_tx(dev);
++	netif_start_queue(dev);
++	if (oom)
++		mod_timer(&np->oom_kick, jiffies + OOM_REFILL);
++	if (!(mii_rw(dev, np->phyaddr, MII_BMSR, MII_READ) & BMSR_ANEGCOMPLETE)) {
++		printk("%s: no link during initialization.\n", dev->name);
++		netif_carrier_off(dev);
++	}
++
++	spin_unlock_irq(&np->lock);
++
++	return 0;
++out_drain:
++	drain_ring(dev);
++	return ret;
++}
++
++static int close(struct net_device *dev)
++{
++	struct fe_priv *np = get_nvpriv(dev);
++
++	spin_lock_irq(&np->lock);
++	np->in_shutdown = 1;
++	spin_unlock_irq(&np->lock);
++	synchronize_irq(dev->irq);
++
++	del_timer_sync(&np->oom_kick);
++	del_timer_sync(&np->nic_poll);
++
++	netif_stop_queue(dev);
++	spin_lock_irq(&np->lock);
++	stop_tx(dev);
++	stop_rx(dev);
++	spin_unlock_irq(&np->lock);
++
++	free_irq(dev->irq, dev);
++
++	drain_ring(dev);
++
++	/* FIXME: power down nic */
++
++	return 0;
++}
++
++static int __devinit probe_nic(struct pci_dev *pci_dev, const struct pci_device_id *id)
++{
++	struct net_device *dev;
++	struct fe_priv *np;
++	unsigned long addr;
++	u8 *base;
++	int err, i;
++
++	dev = alloc_etherdev(sizeof(struct fe_priv));
++	np = get_nvpriv(dev);
++	err = -ENOMEM;
++	if (!dev)
++		goto out;
++
++	np->pci_dev = pci_dev;
++	spin_lock_init(&np->lock);
++	SET_MODULE_OWNER(dev);
++	SET_NETDEV_DEV(dev, &pci_dev->dev);
++
++	init_timer(&np->oom_kick);
++	np->oom_kick.data = (unsigned long) dev;
++	np->oom_kick.function = &do_rx_refill;	/* timer handler */
++	init_timer(&np->nic_poll);
++	np->nic_poll.data = (unsigned long) dev;
++	np->nic_poll.function = &do_nic_poll;	/* timer handler */
++
++	err = pci_enable_device(pci_dev);
++	if (err) {
++		printk(KERN_INFO "forcedeth: pci_enable_dev failed: %d\n", err);
++		goto out_free;
++	}
++
++	pci_set_master(pci_dev);
++
++	err = pci_request_regions(pci_dev, dev->name);
++	if (err < 0)
++		goto out_disable;
++
++	err = -EINVAL;
++	addr = 0;
++	for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
++		dprintk(KERN_DEBUG "forcedeth: resource %d start %p len %ld flags 0x%08lx.\n",
++				i, (void*)pci_resource_start(pci_dev, i),
++				pci_resource_len(pci_dev, i),
++				pci_resource_flags(pci_dev, i));
++		if (pci_resource_flags(pci_dev, i) & IORESOURCE_MEM &&
++				pci_resource_len(pci_dev, i) >= NV_PCI_REGSZ) {
++			addr = pci_resource_start(pci_dev, i);
++			break;
++		}
++	}
++	if (i == DEVICE_COUNT_RESOURCE) {
++		printk(KERN_INFO "forcedeth: Couldn't find register window.\n");
++		goto out_relreg;
++	}
++
++	err = -ENOMEM;
++	dev->base_addr = (unsigned long) ioremap(addr, NV_PCI_REGSZ);
++	if (!dev->base_addr)
++		goto out_disable;
++	dev->irq = pci_dev->irq;
++	np->rx_ring = pci_alloc_consistent(pci_dev, sizeof(struct ring_desc) * (RX_RING + TX_RING),
++						&np->ring_addr);
++	if (!np->rx_ring)
++		goto out_unmap;
++	np->tx_ring = &np->rx_ring[RX_RING];
++
++	dev->open = open;
++	dev->stop = close;
++	dev->hard_start_xmit = start_xmit;
++	dev->get_stats = get_stats;
++	dev->change_mtu = change_mtu;
++	dev->set_multicast_list = set_multicast;
++	dev->do_ioctl = nic_ioctl;
++	dev->tx_timeout = tx_timeout;
++	dev->watchdog_timeo = NV_WATCHDOG_TIMEO;
++
++	pci_set_drvdata(pci_dev, dev);
++
++	err = register_netdev(dev);
++	if (err) {
++		printk(KERN_INFO "forcedeth: unable to register netdev: %d\n", err);
++		goto out_freering;
++	}
++
++	printk(KERN_INFO "%s: forcedeth.c: subsystem: %05x:%04x\n",
++			dev->name, pci_dev->subsystem_vendor, pci_dev->subsystem_device);
++
++
++	/* read the mac address */
++	base = get_hwbase(dev);
++	np->orig_mac[0] = readl(base + NvRegMacAddrA);
++	np->orig_mac[1] = readl(base + NvRegMacAddrB);
++
++	dev->dev_addr[0] = (np->orig_mac[1] >>  8) & 0xff;
++	dev->dev_addr[1] = (np->orig_mac[1] >>  0) & 0xff;
++	dev->dev_addr[2] = (np->orig_mac[0] >> 24) & 0xff;
++	dev->dev_addr[3] = (np->orig_mac[0] >> 16) & 0xff;
++	dev->dev_addr[4] = (np->orig_mac[0] >>  8) & 0xff;
++	dev->dev_addr[5] = (np->orig_mac[0] >>  0) & 0xff;
++
++	if (!is_valid_ether_addr(dev->dev_addr)) {
++		/*
++		 * Bad mac address. At least one bios sets the mac address
++		 * to 01:23:45:67:89:ab
++		 */
++		printk(KERN_ERR "%s: Invalid Mac address detected: %02x:%02x:%02x:%02x:%02x:%02x\n", dev->name,
++			dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
++			dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
++		printk(KERN_ERR "Please complain to your hardware vendor. Switching to a random MAC.\n");
++		dev->dev_addr[0] = 0x00;
++		dev->dev_addr[1] = 0x00;
++		dev->dev_addr[2] = 0x6c;
++		get_random_bytes(&dev->dev_addr[3], 3);
++	}
++
++	dprintk(KERN_DEBUG "%s: MAC Address %02x:%02x:%02x:%02x:%02x:%02x\n", dev->name,
++			dev->dev_addr[0], dev->dev_addr[1], dev->dev_addr[2],
++			dev->dev_addr[3], dev->dev_addr[4], dev->dev_addr[5]);
++
++	np->tx_flags = cpu_to_le16(NV_TX_LASTPACKET|NV_TX_LASTPACKET1|NV_TX_VALID);
++	if (id->driver_data & DEV_NEED_LASTPACKET1)
++		np->tx_flags |= cpu_to_le16(NV_TX_LASTPACKET1);
++	if (id->driver_data & DEV_IRQMASK_1)
++		np->irqmask = NVREG_IRQMASK_WANTED_1;
++	if (id->driver_data & DEV_IRQMASK_2)
++		np->irqmask = NVREG_IRQMASK_WANTED_2;
++
++	return 0;
++
++out_freering:
++	pci_free_consistent(np->pci_dev, sizeof(struct ring_desc) * (RX_RING + TX_RING),
++				np->rx_ring, np->ring_addr);
++out_unmap:
++	iounmap(get_hwbase(dev));
++out_relreg:
++	pci_release_regions(pci_dev);
++out_disable:
++	pci_disable_device(pci_dev);
++out_free:
++	kfree(dev);
++	pci_set_drvdata(pci_dev, NULL);
++out:
++	return err;
++}
++
++static void __devexit remove_nic(struct pci_dev *pci_dev)
++{
++	struct net_device *dev = pci_get_drvdata(pci_dev);
++	struct fe_priv *np = get_nvpriv(dev);
++	u8 *base = get_hwbase(dev);
++
++	unregister_netdev(dev);
++
++	/* special op: write back the misordered MAC address - otherwise
++	 * the next probe_nic would see a wrong address.
++	 */
++	writel(np->orig_mac[0], base + NvRegMacAddrA);
++	writel(np->orig_mac[1], base + NvRegMacAddrB);
++
++	/* free all structures */
++	pci_free_consistent(np->pci_dev, sizeof(struct ring_desc) * (RX_RING + TX_RING), np->rx_ring, np->ring_addr);
++	iounmap(get_hwbase(dev));
++	pci_release_regions(pci_dev);
++	pci_disable_device(pci_dev);
++	kfree(dev);
++	pci_set_drvdata(pci_dev, NULL);
++}
++
++static struct pci_device_id pci_tbl[] = {
++	{	/* nForce Ethernet Controller */
++		.vendor = PCI_VENDOR_ID_NVIDIA,
++		.device = 0x1C3,
++		.subvendor = PCI_ANY_ID,
++		.subdevice = PCI_ANY_ID,
++		.driver_data = DEV_IRQMASK_1,
++	},
++	{	/* nForce2 Ethernet Controller */
++		.vendor = PCI_VENDOR_ID_NVIDIA,
++		.device = 0x0066,
++		.subvendor = PCI_ANY_ID,
++		.subdevice = PCI_ANY_ID,
++		.driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2,
++	},
++	{	/* nForce3 Ethernet Controller */
++		.vendor = PCI_VENDOR_ID_NVIDIA,
++		.device = 0x00D6,
++		.subvendor = PCI_ANY_ID,
++		.subdevice = PCI_ANY_ID,
++		.driver_data = DEV_NEED_LASTPACKET1|DEV_IRQMASK_2,
++	},
++	{0,},
++};
++
++static struct pci_driver driver = {
++	.name = "forcedeth",
++	.id_table = pci_tbl,
++	.probe = probe_nic,
++	.remove = __devexit_p(remove_nic),
++};
++
++
++static int __init init_nic(void)
++{
++	printk(KERN_INFO "forcedeth.c: Reverse Engineered nForce ethernet driver. Version %s.\n", FORCEDETH_VERSION);
++	return pci_module_init(&driver);
++}
++
++static void __exit exit_nic(void)
++{
++	pci_unregister_driver(&driver);
++}
++
++MODULE_PARM(max_interrupt_work, "i");
++MODULE_PARM_DESC(max_interrupt_work, "forcedeth maximum events handled per interrupt");
++ 
++MODULE_AUTHOR("Manfred Spraul <manfred@colorfullife.com>");
++MODULE_DESCRIPTION("Reverse Engineered nForce ethernet driver");
++MODULE_LICENSE("GPL");
++
++MODULE_DEVICE_TABLE(pci, pci_tbl);
++
++module_init(init_nic);
++module_exit(exit_nic);
+--- linux-2.6.0/drivers/net/gt96100eth.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/gt96100eth.c	2003-12-28 23:21:01.000000000 -0800
+@@ -729,10 +729,12 @@ gt96100_probe1(int port_num)
+ 		return -EBUSY;
+ 	}
+ 
+-	dev = init_etherdev(0, sizeof(struct gt96100_private));
++	dev = alloc_etherdev(sizeof(struct gt96100_private));
++	if (!dev)
++		goto out;
+ 	gtif->dev = dev;
+ 	
+-	/* private struct aligned and zeroed by init_etherdev */
++	/* private struct aligned and zeroed by alloc_etherdev */
+ 	/* Fill in the 'dev' fields. */
+ 	dev->base_addr = gtif->iobase;
+ 	dev->irq = gtif->irq;
+@@ -740,7 +742,7 @@ gt96100_probe1(int port_num)
+ 	if ((retval = parse_mac_addr(dev, gtif->mac_str))) {
+ 		err("%s: MAC address parse failed\n", __FUNCTION__);
+ 		retval = -EINVAL;
+-		goto free_region;
++		goto out1;
+ 	}
+ 
+ 	gp = dev->priv;
+@@ -768,7 +770,7 @@ gt96100_probe1(int port_num)
+ 				       &gp->rx_ring_dma);
+ 		if (gp->rx_ring == NULL) {
+ 			retval = -ENOMEM;
+-			goto free_region;
++			goto out1;
+ 		}
+ 	
+ 		gp->tx_ring = (gt96100_td_t *)(gp->rx_ring + RX_RING_SIZE);
+@@ -781,11 +783,8 @@ gt96100_probe1(int port_num)
+ 		gp->rx_buff = dmaalloc(PKT_BUF_SZ*RX_RING_SIZE,
+ 				       &gp->rx_buff_dma);
+ 		if (gp->rx_buff == NULL) {
+-			dmafree(sizeof(gt96100_rd_t) * RX_RING_SIZE
+-				+ sizeof(gt96100_td_t) * TX_RING_SIZE,
+-				gp->rx_ring);
+ 			retval = -ENOMEM;
+-			goto free_region;
++			goto out2;
+ 		}
+ 	}
+     
+@@ -797,12 +796,8 @@ gt96100_probe1(int port_num)
+ 		gp->hash_table = (char*)dmaalloc(RX_HASH_TABLE_SIZE,
+ 						 &gp->hash_table_dma);
+ 		if (gp->hash_table == NULL) {
+-			dmafree(sizeof(gt96100_rd_t) * RX_RING_SIZE
+-				+ sizeof(gt96100_td_t) * TX_RING_SIZE,
+-				gp->rx_ring);
+-			dmafree(PKT_BUF_SZ*RX_RING_SIZE, gp->rx_buff);
+ 			retval = -ENOMEM;
+-			goto free_region;
++			goto out3;
+ 		}
+ 	}
+     
+@@ -819,14 +814,23 @@ gt96100_probe1(int port_num)
+ 	dev->tx_timeout = gt96100_tx_timeout;
+ 	dev->watchdog_timeo = GT96100ETH_TX_TIMEOUT;
+ 
+-	/* Fill in the fields of the device structure with ethernet values. */
+-	ether_setup(dev);
++	retval = register_netdev(dev);
++	if (retval)
++		goto out4;
+ 	return 0;
+ 
+- free_region:
+-	release_region(gtif->iobase, GT96100_ETH_IO_SIZE);
+-	unregister_netdev(dev);
++out4:
++	dmafree(RX_HASH_TABLE_SIZE, gp->hash_table_dma);
++out3:
++	dmafree(PKT_BUF_SZ*RX_RING_SIZE, gp->rx_buff);
++out2:
++	dmafree(sizeof(gt96100_rd_t) * RX_RING_SIZE
++		+ sizeof(gt96100_td_t) * TX_RING_SIZE,
++		gp->rx_ring);
++out1:
+ 	free_netdev (dev);
++out:
++	release_region(gtif->iobase, GT96100_ETH_IO_SIZE);
+ 	err("%s failed.  Returns %d\n", __FUNCTION__, retval);
+ 	return retval;
+ }
+@@ -1573,9 +1577,14 @@ static void gt96100_cleanup_module(void)
+ 		if (gtif->dev != NULL) {
+ 			struct gt96100_private *gp =
+ 				(struct gt96100_private *)gtif->dev->priv;
+-			release_region(gtif->iobase, gp->io_size);
+ 			unregister_netdev(gtif->dev);
+-			free_netdev (gtif->dev);
++			dmafree(RX_HASH_TABLE_SIZE, gp->hash_table_dma);
++			dmafree(PKT_BUF_SZ*RX_RING_SIZE, gp->rx_buff);
++			dmafree(sizeof(gt96100_rd_t) * RX_RING_SIZE
++				+ sizeof(gt96100_td_t) * TX_RING_SIZE,
++				gp->rx_ring);
++			free_netdev(gtif->dev);
++			release_region(gtif->iobase, gp->io_size);
+ 		}
+ 	}
+ }
+--- linux-2.6.0/drivers/net/hamradio/baycom_epp.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/hamradio/baycom_epp.c	2003-12-28 23:21:01.000000000 -0800
+@@ -1275,7 +1275,7 @@ static int baycom_ioctl(struct net_devic
+  * If dev->base_addr == 2, allocate space for the device and return success
+  * (detachable devices only).
+  */
+-static int baycom_probe(struct net_device *dev)
++static void baycom_probe(struct net_device *dev)
+ {
+ 	static char ax25_bcast[AX25_ADDR_LEN] = {
+ 		'Q' << 1, 'S' << 1, 'T' << 1, ' ' << 1, ' ' << 1, ' ' << 1, '0' << 1
+@@ -1288,9 +1288,6 @@ static int baycom_probe(struct net_devic
+ 	};
+ 	struct baycom_state *bc;
+ 
+-	if (!dev)
+-		return -ENXIO;
+-	baycom_paranoia_check(dev, "baycom_probe", -ENXIO);
+ 	/*
+ 	 * not a real probe! only initialize data structures
+ 	 */
+@@ -1332,8 +1329,6 @@ static int baycom_probe(struct net_devic
+ 
+ 	/* New style flags */
+ 	dev->flags = 0;
+-
+-	return 0;
+ }
+ 
+ /* --------------------------------------------------------------------- */
+@@ -1368,7 +1363,7 @@ static void __init baycom_epp_dev_setup(
+ 	/*
+ 	 * initialize part of the device struct
+ 	 */
+-	dev->init = baycom_probe;
++	baycom_probe(dev);
+ }
+ 
+ static int __init init_baycomepp(void)
+@@ -1401,7 +1396,7 @@ static int __init init_baycomepp(void)
+ 
+ 		if (register_netdev(dev)) {
+ 			printk(KERN_WARNING "%s: cannot register net device %s\n", bc_drvname, dev->name);
+-			kfree(dev);
++			free_netdev(dev);
+ 			break;
+ 		}
+ 		if (set_hw && baycom_setmode(dev->priv, mode[i]))
+--- linux-2.6.0/drivers/net/hamradio/bpqether.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/net/hamradio/bpqether.c	2003-12-28 23:21:01.000000000 -0800
+@@ -547,7 +547,7 @@ static int bpq_new_device(struct net_dev
+ 
+  error:
+ 	dev_put(edev);
+-	kfree(ndev);
++	free_netdev(ndev);
+ 	return err;
+ 	
+ }
+--- linux-2.6.0/drivers/net/hamradio/dmascc.c	2003-06-14 12:18:08.000000000 -0700
++++ 25/drivers/net/hamradio/dmascc.c	2003-12-28 23:21:01.000000000 -0800
+@@ -242,7 +242,7 @@ struct scc_priv {
+ struct scc_info {
+   int irq_used;
+   int twin_serial_cfg;
+-  struct net_device dev[2];
++  struct net_device *dev[2];
+   struct scc_priv priv[2];
+   struct scc_info *next;
+   spinlock_t register_lock;	/* Per device register lock */
+@@ -310,18 +310,19 @@ static void __exit dmascc_exit(void) {
+     info = first;
+ 
+     /* Unregister devices */
+-    for (i = 0; i < 2; i++) {
+-      if (info->dev[i].name)
+-	unregister_netdev(&info->dev[i]);
+-    }
++    for (i = 0; i < 2; i++)
++	unregister_netdev(info->dev[i]);
+ 
+     /* Reset board */
+     if (info->priv[0].type == TYPE_TWIN)
+-      outb(0, info->dev[0].base_addr + TWIN_SERIAL_CFG);
++      outb(0, info->dev[0]->base_addr + TWIN_SERIAL_CFG);
+     write_scc(&info->priv[0], R9, FHWRES);
+-    release_region(info->dev[0].base_addr,
++    release_region(info->dev[0]->base_addr,
+ 		   hw[info->priv[0].type].io_size);
+ 
++    for (i = 0; i < 2; i++)
++	free_netdev(info->dev[i]);
++
+     /* Free memory */
+     first = info->next;
+     kfree(info);
+@@ -443,156 +444,193 @@ static int __init dmascc_init(void) {
+ module_init(dmascc_init);
+ module_exit(dmascc_exit);
+ 
++static void dev_setup(struct net_device *dev)
++{
++	dev->type = ARPHRD_AX25;
++	dev->hard_header_len = 73;
++	dev->mtu = 1500;
++	dev->addr_len = 7;
++	dev->tx_queue_len = 64;
++	memcpy(dev->broadcast, ax25_broadcast, 7);
++	memcpy(dev->dev_addr, ax25_test, 7);
++}
++
++static int __init setup_adapter(int card_base, int type, int n)
++{
++	int i, irq, chip;
++	struct scc_info *info;
++	struct net_device *dev;
++	struct scc_priv *priv;
++	unsigned long time;
++	unsigned int irqs;
++	int tmr_base = card_base + hw[type].tmr_offset;
++	int scc_base = card_base + hw[type].scc_offset;
++	char *chipnames[] = CHIPNAMES;
++
++	/* Allocate memory */
++	info = kmalloc(sizeof(struct scc_info), GFP_KERNEL | GFP_DMA);
++	if (!info) {
++		printk(KERN_ERR "dmascc: "
++			"could not allocate memory for %s at %#3x\n",
++			hw[type].name, card_base);
++		goto out;
++	}
+ 
+-int __init setup_adapter(int card_base, int type, int n) {
+-  int i, irq, chip;
+-  struct scc_info *info;
+-  struct net_device *dev;
+-  struct scc_priv *priv;
+-  unsigned long time;
+-  unsigned int irqs;
+-  int tmr_base = card_base + hw[type].tmr_offset;
+-  int scc_base = card_base + hw[type].scc_offset;
+-  char *chipnames[] = CHIPNAMES;
+-
+-  /* Allocate memory */
+-  info = kmalloc(sizeof(struct scc_info), GFP_KERNEL | GFP_DMA);
+-  if (!info) {
+-    printk(KERN_ERR "dmascc: could not allocate memory for %s at %#3x\n",
+-	   hw[type].name, card_base);
+-    return -1;
+-  }
+-
+-  /* Initialize what is necessary for write_scc and write_scc_data */
+-  memset(info, 0, sizeof(struct scc_info));
+-  spin_lock_init(&info->register_lock);
+-  
+-  priv = &info->priv[0];
+-  priv->type = type;
+-  priv->card_base = card_base;
+-  priv->scc_cmd = scc_base + SCCA_CMD;
+-  priv->scc_data = scc_base + SCCA_DATA;
+-  priv->register_lock = &info->register_lock;
+-
+-  /* Reset SCC */
+-  write_scc(priv, R9, FHWRES | MIE | NV);
+-
+-  /* Determine type of chip by enabling SDLC/HDLC enhancements */
+-  write_scc(priv, R15, SHDLCE);
+-  if (!read_scc(priv, R15)) {
+-    /* WR7' not present. This is an ordinary Z8530 SCC. */
+-    chip = Z8530;
+-  } else {
+-    /* Put one character in TX FIFO */
+-    write_scc_data(priv, 0, 0);
+-    if (read_scc(priv, R0) & Tx_BUF_EMP) {
+-      /* TX FIFO not full. This is a Z85230 ESCC with a 4-byte FIFO. */
+-      chip = Z85230;
+-    } else {
+-      /* TX FIFO full. This is a Z85C30 SCC with a 1-byte FIFO. */
+-      chip = Z85C30;
+-    }
+-  }
+-  write_scc(priv, R15, 0);
++	/* Initialize what is necessary for write_scc and write_scc_data */
++	memset(info, 0, sizeof(struct scc_info));
+ 
+-  /* Start IRQ auto-detection */
+-  irqs = probe_irq_on();
++	info->dev[0] = alloc_netdev(0, "", dev_setup);
++	if (!info->dev[0]) {
++		printk(KERN_ERR "dmascc: "
++			"could not allocate memory for %s at %#3x\n",
++			hw[type].name, card_base);
++		goto out1;
++	}
+ 
+-  /* Enable interrupts */
+-  if (type == TYPE_TWIN) {
+-    outb(0, card_base + TWIN_DMA_CFG);
+-    inb(card_base + TWIN_CLR_TMR1);
+-    inb(card_base + TWIN_CLR_TMR2);
+-    outb((info->twin_serial_cfg = TWIN_EI), card_base + TWIN_SERIAL_CFG);
+-  } else {
+-    write_scc(priv, R15, CTSIE);
+-    write_scc(priv, R0, RES_EXT_INT);
+-    write_scc(priv, R1, EXT_INT_ENAB);
+-  }
+-
+-  /* Start timer */
+-  outb(1, tmr_base + TMR_CNT1);
+-  outb(0, tmr_base + TMR_CNT1);
+-
+-  /* Wait and detect IRQ */
+-  time = jiffies; while (jiffies - time < 2 + HZ / TMR_0_HZ);
+-  irq = probe_irq_off(irqs);
+-
+-  /* Clear pending interrupt, disable interrupts */
+-  if (type == TYPE_TWIN) {
+-    inb(card_base + TWIN_CLR_TMR1);
+-  } else {
+-    write_scc(priv, R1, 0);
+-    write_scc(priv, R15, 0);
+-    write_scc(priv, R0, RES_EXT_INT);
+-  }
++	info->dev[1] = alloc_netdev(0, "", dev_setup);
++	if (!info->dev[1]) {
++		printk(KERN_ERR "dmascc: "
++			"could not allocate memory for %s at %#3x\n",
++			hw[type].name, card_base);
++		goto out2;
++	}
++	spin_lock_init(&info->register_lock);
+ 
+-  if (irq <= 0) {
+-    printk(KERN_ERR "dmascc: could not find irq of %s at %#3x (irq=%d)\n",
+-	   hw[type].name, card_base, irq);
+-    kfree(info);
+-    return -1;
+-  }
++	priv = &info->priv[0];
++	priv->type = type;
++	priv->card_base = card_base;
++	priv->scc_cmd = scc_base + SCCA_CMD;
++	priv->scc_data = scc_base + SCCA_DATA;
++	priv->register_lock = &info->register_lock;
++
++	/* Reset SCC */
++	write_scc(priv, R9, FHWRES | MIE | NV);
++
++	/* Determine type of chip by enabling SDLC/HDLC enhancements */
++	write_scc(priv, R15, SHDLCE);
++	if (!read_scc(priv, R15)) {
++		/* WR7' not present. This is an ordinary Z8530 SCC. */
++		chip = Z8530;
++	} else {
++		/* Put one character in TX FIFO */
++		write_scc_data(priv, 0, 0);
++		if (read_scc(priv, R0) & Tx_BUF_EMP) {
++			/* TX FIFO not full. This is a Z85230 ESCC with a 4-byte FIFO. */
++			chip = Z85230;
++		} else {
++			/* TX FIFO full. This is a Z85C30 SCC with a 1-byte FIFO. */
++			chip = Z85C30;
++		}
++	}
++	write_scc(priv, R15, 0);
+ 
+-  /* Set up data structures */
+-  for (i = 0; i < 2; i++) {
+-    dev = &info->dev[i];
+-    priv = &info->priv[i];
+-    priv->type = type;
+-    priv->chip = chip;
+-    priv->dev = dev;
+-    priv->info = info;
+-    priv->channel = i;
+-    spin_lock_init(&priv->ring_lock);
+-    priv->register_lock = &info->register_lock;
+-    priv->card_base = card_base;
+-    priv->scc_cmd = scc_base + (i ? SCCB_CMD : SCCA_CMD);
+-    priv->scc_data = scc_base + (i ? SCCB_DATA : SCCA_DATA);
+-    priv->tmr_cnt = tmr_base + (i ? TMR_CNT2 : TMR_CNT1);
+-    priv->tmr_ctrl = tmr_base + TMR_CTRL;
+-    priv->tmr_mode = i ? 0xb0 : 0x70;
+-    priv->param.pclk_hz = hw[type].pclk_hz;
+-    priv->param.brg_tc = -1;
+-    priv->param.clocks = TCTRxCP | RCRTxCP;
+-    priv->param.persist = 256;
+-    priv->param.dma = -1;
+-    INIT_WORK(&priv->rx_work, rx_bh, priv);
+-    dev->priv = priv;
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
+-    if (sizeof(dev->name) == sizeof(char *)) dev->name = priv->name;
+-#endif
+-    sprintf(dev->name, "dmascc%i", 2*n+i);
+-    SET_MODULE_OWNER(dev);
+-    dev->base_addr = card_base;
+-    dev->irq = irq;
+-    dev->open = scc_open;
+-    dev->stop = scc_close;
+-    dev->do_ioctl = scc_ioctl;
+-    dev->hard_start_xmit = scc_send_packet;
+-    dev->get_stats = scc_get_stats;
+-    dev->hard_header = ax25_encapsulate;
+-    dev->rebuild_header = ax25_rebuild_header;
+-    dev->set_mac_address = scc_set_mac_address;
+-    dev->type = ARPHRD_AX25;
+-    dev->hard_header_len = 73;
+-    dev->mtu = 1500;
+-    dev->addr_len = 7;
+-    dev->tx_queue_len = 64;
+-    memcpy(dev->broadcast, ax25_broadcast, 7);
+-    memcpy(dev->dev_addr, ax25_test, 7);
+-    rtnl_lock();
+-    if (register_netdevice(dev)) {
+-      printk(KERN_ERR "dmascc: could not register %s\n", dev->name);
+-    }
+-    rtnl_unlock();
+-  }
++	/* Start IRQ auto-detection */
++	irqs = probe_irq_on();
+ 
++	/* Enable interrupts */
++	if (type == TYPE_TWIN) {
++		outb(0, card_base + TWIN_DMA_CFG);
++		inb(card_base + TWIN_CLR_TMR1);
++		inb(card_base + TWIN_CLR_TMR2);
++		info->twin_serial_cfg = TWIN_EI;
++		outb(info->twin_serial_cfg, card_base + TWIN_SERIAL_CFG);
++	} else {
++		write_scc(priv, R15, CTSIE);
++		write_scc(priv, R0, RES_EXT_INT);
++		write_scc(priv, R1, EXT_INT_ENAB);
++	}
+ 
+-  info->next = first;
+-  first = info;
+-  printk(KERN_INFO "dmascc: found %s (%s) at %#3x, irq %d\n", hw[type].name,
+-	 chipnames[chip], card_base, irq);
+-  return 0;
++	/* Start timer */
++	outb(1, tmr_base + TMR_CNT1);
++	outb(0, tmr_base + TMR_CNT1);
++
++	/* Wait and detect IRQ */
++	time = jiffies; while (jiffies - time < 2 + HZ / TMR_0_HZ);
++	irq = probe_irq_off(irqs);
++
++	/* Clear pending interrupt, disable interrupts */
++	if (type == TYPE_TWIN) {
++		inb(card_base + TWIN_CLR_TMR1);
++	} else {
++		write_scc(priv, R1, 0);
++		write_scc(priv, R15, 0);
++		write_scc(priv, R0, RES_EXT_INT);
++	}
++
++	if (irq <= 0) {
++		printk(KERN_ERR "dmascc: could not find irq of %s at %#3x (irq=%d)\n",
++			hw[type].name, card_base, irq);
++		goto out3;
++	}
++
++	/* Set up data structures */
++	for (i = 0; i < 2; i++) {
++		dev = info->dev[i];
++		priv = &info->priv[i];
++		priv->type = type;
++		priv->chip = chip;
++		priv->dev = dev;
++		priv->info = info;
++		priv->channel = i;
++		spin_lock_init(&priv->ring_lock);
++		priv->register_lock = &info->register_lock;
++		priv->card_base = card_base;
++		priv->scc_cmd = scc_base + (i ? SCCB_CMD : SCCA_CMD);
++		priv->scc_data = scc_base + (i ? SCCB_DATA : SCCA_DATA);
++		priv->tmr_cnt = tmr_base + (i ? TMR_CNT2 : TMR_CNT1);
++		priv->tmr_ctrl = tmr_base + TMR_CTRL;
++		priv->tmr_mode = i ? 0xb0 : 0x70;
++		priv->param.pclk_hz = hw[type].pclk_hz;
++		priv->param.brg_tc = -1;
++		priv->param.clocks = TCTRxCP | RCRTxCP;
++		priv->param.persist = 256;
++		priv->param.dma = -1;
++		INIT_WORK(&priv->rx_work, rx_bh, priv);
++		dev->priv = priv;
++		sprintf(dev->name, "dmascc%i", 2*n+i);
++		SET_MODULE_OWNER(dev);
++		dev->base_addr = card_base;
++		dev->irq = irq;
++		dev->open = scc_open;
++		dev->stop = scc_close;
++		dev->do_ioctl = scc_ioctl;
++		dev->hard_start_xmit = scc_send_packet;
++		dev->get_stats = scc_get_stats;
++		dev->hard_header = ax25_encapsulate;
++		dev->rebuild_header = ax25_rebuild_header;
++		dev->set_mac_address = scc_set_mac_address;
++	}
++	if (register_netdev(info->dev[0])) {
++		printk(KERN_ERR "dmascc: could not register %s\n",
++				info->dev[0]->name);
++		goto out3;
++	}
++	if (register_netdev(info->dev[1])) {
++		printk(KERN_ERR "dmascc: could not register %s\n",
++				info->dev[1]->name);
++		goto out4;
++	}
++
++
++	info->next = first;
++	first = info;
++	printk(KERN_INFO "dmascc: found %s (%s) at %#3x, irq %d\n", hw[type].name,
++	chipnames[chip], card_base, irq);
++	return 0;
++
++out4:
++	unregister_netdev(info->dev[0]);
++out3:
++	if (info->priv[0].type == TYPE_TWIN)
++		outb(0, info->dev[0]->base_addr + TWIN_SERIAL_CFG);
++	write_scc(&info->priv[0], R9, FHWRES);
++	free_netdev(info->dev[1]);
++out2:
++	free_netdev(info->dev[0]);
++out1:
++	kfree(info);
++out:
++	return -1;
+ }
+ 
+ 
+--- linux-2.6.0/drivers/net/hamradio/hdlcdrv.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/hamradio/hdlcdrv.c	2003-12-28 23:21:01.000000000 -0800
+@@ -832,7 +832,7 @@ struct net_device *hdlcdrv_register(cons
+ 	if (err < 0) {
+ 		printk(KERN_WARNING "hdlcdrv: cannot register net "
+ 		       "device %s\n", dev->name);
+-		kfree(dev);
++		free_netdev(dev);
+ 		dev = ERR_PTR(err);
+ 	}
+ 	return dev;
+--- linux-2.6.0/drivers/net/hamradio/scc.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/net/hamradio/scc.c	2003-12-28 23:22:33.000000000 -0800
+@@ -1196,11 +1196,7 @@ static void t_tail(unsigned long channel
+  	if (scc->stat.tx_state == TXS_TIMEOUT)		/* we had a timeout? */
+  	{
+  		scc->stat.tx_state = TXS_WAIT;
+-
+- 		if (scc->kiss.mintime != TIMER_OFF)	/* try it again */
+- 			scc_start_tx_timer(scc, t_dwait, scc->kiss.mintime*100);
+- 		else
+- 			scc_start_tx_timer(scc, t_dwait, 0);
++		scc_start_tx_timer(scc, t_dwait, scc->kiss.mintime*100);
+  		return;
+  	}
+  	
+@@ -1274,8 +1270,7 @@ static void t_idle(unsigned long channel
+ 	del_timer(&scc->tx_wdog);
+ 
+ 	scc_key_trx(scc, TX_OFF);
+-
+-	if (scc->kiss.mintime != TIMER_OFF)
++	if(scc->kiss.mintime)
+ 		scc_start_tx_timer(scc, t_dwait, scc->kiss.mintime*100);
+ 	scc->stat.tx_state = TXS_WAIT;
+ }
+--- linux-2.6.0/drivers/net/hamradio/yam.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/hamradio/yam.c	2003-12-28 23:21:01.000000000 -0800
+@@ -1192,7 +1192,7 @@ static void __exit yam_cleanup_driver(vo
+ 		struct net_device *dev = yam_devs[i];
+ 		if (dev) {
+ 			unregister_netdev(dev);
+-			kfree(dev);
++			free_netdev(dev);
+ 		}
+ 	}
+ 
+--- linux-2.6.0/drivers/net/hp100.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/net/hp100.c	2003-12-28 23:21:01.000000000 -0800
+@@ -118,8 +118,6 @@
+ #include <asm/bitops.h>
+ #include <asm/io.h>
+ 
+-typedef struct net_device_stats hp100_stats_t;
+-
+ #include "hp100.h"
+ 
+ /*
+@@ -130,23 +128,8 @@ typedef struct net_device_stats hp100_st
+ #define HP100_BUS_EISA    1
+ #define HP100_BUS_PCI     2
+ 
+-#ifndef PCI_DEVICE_ID_HP_J2585B
+-#define PCI_DEVICE_ID_HP_J2585B 0x1031
+-#endif
+-#ifndef PCI_VENDOR_ID_COMPEX
+-#define PCI_VENDOR_ID_COMPEX 0x11f6
+-#endif
+-#ifndef PCI_DEVICE_ID_COMPEX_ENET100VG4
+-#define PCI_DEVICE_ID_COMPEX_ENET100VG4 0x0112
+-#endif
+-#ifndef PCI_VENDOR_ID_COMPEX2
+-#define PCI_VENDOR_ID_COMPEX2 0x101a
+-#endif
+-#ifndef PCI_DEVICE_ID_COMPEX2_100VG
+-#define PCI_DEVICE_ID_COMPEX2_100VG 0x0005
+-#endif
+-
+ #define HP100_REGION_SIZE	0x20	/* for ioports */
++#define HP100_SIG_LEN		8	/* same as EISA_SIG_LEN */
+ 
+ #define HP100_MAX_PACKET_SIZE	(1536+4)
+ #define HP100_MIN_PACKET_SIZE	60
+@@ -165,20 +148,9 @@ typedef struct net_device_stats hp100_st
+  *  structures
+  */
+ 
+-struct hp100_eisa_id {
+-	u_int id;
+-	const char *name;
+-	u_char bus;
+-};
+-
+-struct hp100_pci_id {
+-	u_short vendor;
+-	u_short device;
+-};
+-
+ struct hp100_private {
+-	struct hp100_eisa_id *id;
+ 	spinlock_t lock;
++	char id[HP100_SIG_LEN];
+ 	u_short chip;
+ 	u_short soft_model;
+ 	u_int memory_size;
+@@ -196,7 +168,7 @@ struct hp100_private {
+ 	u_char mac1_mode;
+ 	u_char mac2_mode;
+ 	u_char hash_bytes[8];
+-	hp100_stats_t stats;
++	struct net_device_stats stats;
+ 
+ 	/* Rings for busmaster mode: */
+ 	hp100_ring_t *rxrhead;	/* Head (oldest) index into rxring */
+@@ -216,83 +188,36 @@ struct hp100_private {
+ /*
+  *  variables
+  */
+-
+-static struct hp100_eisa_id hp100_eisa_ids[] = {
+-
+-	/* 10/100 EISA card with revision A Cascade chip */
+-	{0x80F1F022, "HP J2577 rev A", HP100_BUS_EISA},
+-
+-	/* 10/100 ISA card with revision A Cascade chip */
+-	{0x50F1F022, "HP J2573 rev A", HP100_BUS_ISA},
+-
+-	/* 10 only EISA card with Cascade chip */
+-	{0x2019F022, "HP 27248B", HP100_BUS_EISA},
+-
+-	/* 10/100 EISA card with Cascade chip */
+-	{0x4019F022, "HP J2577", HP100_BUS_EISA},
+-
+-	/* 10/100 ISA card with Cascade chip */
+-	{0x5019F022, "HP J2573", HP100_BUS_ISA},
+-
+-	/* 10/100 EISA card with AT&T chip */
+-	{0x9019f022, "HP J2577", HP100_BUS_EISA },
+-
+-	/* 10/100 PCI card - old J2585A */
+-	{0x1030103c, "HP J2585A", HP100_BUS_PCI},
+-
+-	/* 10/100 PCI card - new J2585B - master capable */
+-	{0x1041103c, "HP J2585B", HP100_BUS_PCI},
+-
+-	/* 10 Mbit Combo Adapter */
+-	{0x1042103c, "HP J2970", HP100_BUS_PCI},
+-
+-	/* 10 Mbit 10baseT Adapter */
+-	{0x1040103c, "HP J2973", HP100_BUS_PCI},
+-
+-	/* 10/100 EISA card from Compex */
+-	{0x0103180e, "ReadyLink ENET100-VG4", HP100_BUS_EISA},
+-
+-	/* 10/100 EISA card from Compex - FreedomLine (sq5bpf) */
+-	/* Note: plhbrod@mbox.vol.cz reported that same ID have ISA */
+-	/*       version of adapter, too... */
+-	{0x0104180e, "FreedomLine 100/VG", HP100_BUS_EISA},
+-
+-	/* 10/100 PCI card from Compex - FreedomLine
+-	 *
+-	 * I think this card doesn't like aic7178 scsi controller, but
+-	 * I haven't tested this much. It works fine on diskless machines.
+-	 *                            Jacek Lipkowski <sq5bpf@acid.ch.pw.edu.pl>
+-	 */
+-	{0x021211f6, "FreedomLine 100/VG", HP100_BUS_PCI},
+-
+-	/* 10/100 PCI card from Compex (J2585A compatible) */
+-	{0x011211f6, "ReadyLink ENET100-VG4", HP100_BUS_PCI},
+-	
+-	/* 10/100 PCI card from KTI */
+-	{0x40008e2e, "KTI DP-200", HP100_BUS_PCI }
++static const char *hp100_isa_tbl[] = {
++	"HWPF150", /* HP J2573 rev A */
++	"HWP1950", /* HP J2573 */
+ };
+ 
+-#define HP100_EISA_IDS_SIZE	(sizeof(hp100_eisa_ids)/sizeof(struct hp100_eisa_id))
+-
+-#ifdef CONFIG_PCI
+-static struct hp100_pci_id hp100_pci_ids[] = {
+-	{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_J2585A},
+-	{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_J2585B},
+-	{PCI_VENDOR_ID_COMPEX, PCI_DEVICE_ID_COMPEX_ENET100VG4},
+-	{PCI_VENDOR_ID_COMPEX2, PCI_DEVICE_ID_COMPEX2_100VG}
++#ifdef CONFIG_EISA
++static struct eisa_device_id hp100_eisa_tbl[] = {
++	{ "HWPF180" }, /* HP J2577 rev A */
++	{ "HWP1920" }, /* HP 27248B */
++	{ "HWP1940" }, /* HP J2577 */
++	{ "HWP1990" }, /* HP J2577 */
++	{ "CPX0301" }, /* ReadyLink ENET100-VG4 */
++	{ "CPX0401" }, /* FreedomLine 100/VG */
+ };
++MODULE_DEVICE_TABLE(eisa, hp100_eisa_tbl);
+ #endif
+ 
+-#define HP100_PCI_IDS_SIZE	(sizeof(hp100_pci_ids)/sizeof(struct hp100_pci_id))
+-
++#ifdef CONFIG_PCI
+ static struct pci_device_id hp100_pci_tbl[] = {
+ 	{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_J2585A, PCI_ANY_ID, PCI_ANY_ID,},
+ 	{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_J2585B, PCI_ANY_ID, PCI_ANY_ID,},
++	{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_J2970A, PCI_ANY_ID, PCI_ANY_ID,},
++	{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_J2973A, PCI_ANY_ID, PCI_ANY_ID,},
+ 	{PCI_VENDOR_ID_COMPEX, PCI_DEVICE_ID_COMPEX_ENET100VG4, PCI_ANY_ID, PCI_ANY_ID,},
+ 	{PCI_VENDOR_ID_COMPEX2, PCI_DEVICE_ID_COMPEX2_100VG, PCI_ANY_ID, PCI_ANY_ID,},
++/*	{PCI_VENDOR_ID_KTI, PCI_DEVICE_ID_KTI_DP200, PCI_ANY_ID, PCI_ANY_ID }, */
+ 	{}			/* Terminating entry */
+ };
+ MODULE_DEVICE_TABLE(pci, hp100_pci_tbl);
++#endif
+ 
+ static int hp100_rx_ratio = HP100_DEFAULT_RX_RATIO;
+ static int hp100_priority_tx = HP100_DEFAULT_PRIORITY_TX;
+@@ -316,7 +241,7 @@ static int hp100_start_xmit(struct sk_bu
+ static int hp100_start_xmit_bm(struct sk_buff *skb,
+ 			       struct net_device *dev);
+ static void hp100_rx(struct net_device *dev);
+-static hp100_stats_t *hp100_get_stats(struct net_device *dev);
++static struct net_device_stats *hp100_get_stats(struct net_device *dev);
+ static void hp100_misc_interrupt(struct net_device *dev);
+ static void hp100_update_stats(struct net_device *dev);
+ static void hp100_clear_stats(struct hp100_private *lp, int ioaddr);
+@@ -370,196 +295,180 @@ static void wait(void)
+  *  since this could cause problems when the card is not installed.
+  */
+ 
+-int __init hp100_probe(struct net_device *dev)
++/*
++ * Read board id and convert to string.
++ * Effectively same code as decode_eisa_sig
++ */
++static __init const char *hp100_read_id(int ioaddr)
+ {
+-	int base_addr = dev ? dev->base_addr : 0;
+-	int ioaddr = 0;
+-	int pci_start_index = 0;
++	int i;
++	static char str[HP100_SIG_LEN];
++	unsigned char sig[4], sum;
++        unsigned short rev;
+ 
+-#ifdef HP100_DEBUG_B
+-	hp100_outw(0x4200, TRACE);
+-	printk("hp100: %s: probe\n", dev->name);
+-#endif
++	hp100_page(ID_MAC_ADDR);
++	sum = 0;
++	for (i = 0; i < 4; i++) {
++		sig[i] = hp100_inb(BOARD_ID + i);
++		sum += sig[i];
++	}
+ 
+-	if (base_addr > 0xff) {	/* Check a single specified location. */
+-		if (check_region(base_addr, HP100_REGION_SIZE))
+-			return -EINVAL;
+-		if (base_addr < 0x400)
+-			return hp100_probe1(dev, base_addr, HP100_BUS_ISA,
+-					    NULL);
+-		if (EISA_bus && base_addr >= 0x1c38 && ((base_addr - 0x1c38) & 0x3ff) == 0)
+-			return hp100_probe1(dev, base_addr, HP100_BUS_EISA, NULL);
+-#ifdef CONFIG_PCI
+-		printk("hp100: %s: You must specify card # in i/o address parameter for PCI bus...", dev->name);
+-#else
+-		return -ENODEV;
+-#endif
+-	} else
+-#ifdef CONFIG_PCI
+-		if (base_addr > 0 && base_addr < 8 + 1)
+-			pci_start_index = 0x100 | (base_addr - 1);
+-	  else
+-#endif
+-		if (base_addr != 0)
+-			return -ENXIO;
++	sum += hp100_inb(BOARD_ID + i);
++	if (sum != 0xff)
++		return NULL;	/* bad checksum */
+ 
+-	/* First: scan PCI bus(es) */
++        str[0] = ((sig[0] >> 2) & 0x1f) + ('A' - 1);
++        str[1] = (((sig[0] & 3) << 3) | (sig[1] >> 5)) + ('A' - 1);
++        str[2] = (sig[1] & 0x1f) + ('A' - 1);
++        rev = (sig[2] << 8) | sig[3];
++        sprintf(str + 3, "%04X", rev);
+ 
+-#ifdef CONFIG_PCI
+-	{
+-		int pci_index;
+-		struct pci_dev *pci_dev = NULL;
+-		int pci_id_index;
+-		u_short pci_command;
+-
+-#ifdef HP100_DEBUG_PCI
+-		printk("hp100: %s: PCI BIOS is present, checking for devices..\n", dev->name);
+-#endif
+-		pci_index = 0;
+-		for (pci_id_index = 0; pci_id_index < HP100_PCI_IDS_SIZE;
+-		     pci_id_index++) {
+-			while ((pci_dev = pci_find_device(hp100_pci_ids[pci_id_index].vendor,
+-							  hp100_pci_ids[pci_id_index].device,
+-							  pci_dev)) != NULL) {
+-				if (pci_index < (pci_start_index & 7)) {
+-					pci_index++;
+-					continue;
+-				}
+-				if (pci_enable_device(pci_dev))
+-					continue;
+-				/* found... */
+-				ioaddr = pci_resource_start(pci_dev, 0);
+-				if (check_region(ioaddr, HP100_REGION_SIZE))
+-					continue;
+-				pci_read_config_word(pci_dev, PCI_COMMAND, &pci_command);
+-				if (!(pci_command & PCI_COMMAND_IO)) {
+-#ifdef HP100_DEBUG
+-					printk("hp100: %s: PCI I/O Bit has not been set. Setting...\n", dev->name);
+-#endif
+-					pci_command |= PCI_COMMAND_IO;
+-					pci_write_config_word(pci_dev, PCI_COMMAND, pci_command);
+-				}
+-				if (!(pci_command & PCI_COMMAND_MASTER)) {
+-#ifdef HP100_DEBUG
+-					printk("hp100: %s: PCI Master Bit has not been set. Setting...\n", dev->name);
+-#endif
+-					pci_command |= PCI_COMMAND_MASTER;
+-					pci_write_config_word(pci_dev, PCI_COMMAND, pci_command);
+-				}
+-#ifdef HP100_DEBUG
+-				printk("hp100: %s: PCI adapter found at 0x%x\n", dev->name, ioaddr);
+-#endif
+-				if (hp100_probe1(dev, ioaddr, HP100_BUS_PCI, pci_dev) == 0)
+-					return 0;
+-			}
+-		}
+-	}
+-	if (pci_start_index > 0)
+-		return -ENODEV;
+-#endif /* CONFIG_PCI */
++	return str;
++}
+ 
+-	/* Second: Probe all EISA possible port regions (if EISA bus present) */
+-	for (ioaddr = 0x1c38; EISA_bus && ioaddr < 0x10000; ioaddr += 0x400) {
+-		if (check_region(ioaddr, HP100_REGION_SIZE))
+-			continue;
+-		if (hp100_probe1(dev, ioaddr, HP100_BUS_EISA, NULL) == 0)
+-			return 0;
+-	}
++static __init int hp100_isa_probe1(struct net_device *dev, int addr)
++{
++	const char *sig;
++	int i;
++
++	if (!request_region(addr, HP100_REGION_SIZE, "hp100"))
++		goto err;
++
++	sig = hp100_read_id(addr);
++	release_region(addr, HP100_REGION_SIZE);
++
++	if (sig == NULL)
++		goto err;
++
++	for (i = 0; i < ARRAY_SIZE(hp100_isa_tbl); i++) {
++		if (!strcmp(hp100_isa_tbl[i], sig)) 
++			break;
+ 
+-	/* Third: Probe all ISA possible port regions */
+-	for (ioaddr = 0x100; ioaddr < 0x400; ioaddr += 0x20) {
+-		if (check_region(ioaddr, HP100_REGION_SIZE))
+-			continue;
+-		if (hp100_probe1(dev, ioaddr, HP100_BUS_ISA, NULL) == 0)
+-			return 0;
+ 	}
+ 
++	if (i < ARRAY_SIZE(hp100_isa_tbl))
++		return hp100_probe1(dev, addr, HP100_BUS_ISA, NULL);
++ err:
+ 	return -ENODEV;
++
++}
++/*
++ * Probe for ISA board.
++ * EISA and PCI are handled by device infrastructure.
++ */
++
++static int  __init hp100_isa_probe(struct net_device *dev, int addr)
++{
++	int err = -ENODEV;
++
++	/* Probe for a specific ISA address */		
++	if (addr > 0xff && addr < 0x400)
++		err = hp100_isa_probe1(dev, addr);
++
++	else if (addr != 0) 
++		err = -ENXIO;
++
++	else {
++		/* Probe all ISA possible port regions */
++		for (addr = 0x100; addr < 0x400; addr += 0x20) {
++			err = hp100_isa_probe1(dev, addr);
++			if (!err)
++				break;
++		}
++	}
++	return err;
++}
++
++
++struct net_device * __init hp100_probe(int unit)
++{
++	struct net_device *dev = alloc_etherdev(sizeof(struct hp100_private));
++	int err;
++
++	if (!dev)
++		return ERR_PTR(-ENODEV);
++
++	SET_MODULE_OWNER(dev);
++
++#ifdef HP100_DEBUG_B
++	hp100_outw(0x4200, TRACE);
++	printk("hp100: %s: probe\n", dev->name);
++#endif
++
++	if (unit >= 0) {
++		sprintf(dev->name, "eth%d", unit);
++		netdev_boot_setup_check(dev);
++	}
++
++	err = hp100_isa_probe(dev, dev->base_addr);
++	if (err)
++		goto out;
++
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++ out1:
++	release_region(dev->base_addr, HP100_REGION_SIZE);
++ out:
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
+ static int __init hp100_probe1(struct net_device *dev, int ioaddr,
+ 			       u_char bus, struct pci_dev *pci_dev)
+ {
+ 	int i;
+-
+-	u_char uc, uc_1;
+-	u_int eisa_id;
++	int err = -ENODEV;
++	const char *eid;
+ 	u_int chip;
++	u_char uc;
+ 	u_int memory_size = 0, virt_memory_size = 0;
+ 	u_short local_mode, lsw;
+ 	short mem_mapped;
+ 	unsigned long mem_ptr_phys;
+ 	void **mem_ptr_virt;
+ 	struct hp100_private *lp;
+-	struct hp100_eisa_id *eid;
+ 
+ #ifdef HP100_DEBUG_B
+ 	hp100_outw(0x4201, TRACE);
+ 	printk("hp100: %s: probe1\n", dev->name);
+ #endif
+ 
+-	if (dev == NULL) {
+-#ifdef HP100_DEBUG
+-		printk("hp100_probe1: %s: dev == NULL ?\n", dev->name);
+-#endif
+-		return -EIO;
+-	}
++	/* memory region for programmed i/o */
++	if (!request_region(ioaddr, HP100_REGION_SIZE, "hp100"))
++		goto out1;
+ 
+-	if (hp100_inw(HW_ID) != HP100_HW_ID_CASCADE) {
+-		return -ENODEV;
+-	} else {
+-		chip = hp100_inw(PAGING) & HP100_CHIPID_MASK;
++	if (hp100_inw(HW_ID) != HP100_HW_ID_CASCADE) 
++		goto out2;
++
++	chip = hp100_inw(PAGING) & HP100_CHIPID_MASK;
+ #ifdef HP100_DEBUG
+-		if (chip == HP100_CHIPID_SHASTA)
+-			printk("hp100: %s: Shasta Chip detected. (This is a pre 802.12 chip)\n", dev->name);
+-		else if (chip == HP100_CHIPID_RAINIER)
+-			printk("hp100: %s: Rainier Chip detected. (This is a pre 802.12 chip)\n", dev->name);
+-		else if (chip == HP100_CHIPID_LASSEN)
+-			printk("hp100: %s: Lassen Chip detected.\n", dev->name);
+-		else
+-			printk("hp100: %s: Warning: Unknown CASCADE chip (id=0x%.4x).\n", dev->name, chip);
++	if (chip == HP100_CHIPID_SHASTA)
++		printk("hp100: %s: Shasta Chip detected. (This is a pre 802.12 chip)\n", dev->name);
++	else if (chip == HP100_CHIPID_RAINIER)
++		printk("hp100: %s: Rainier Chip detected. (This is a pre 802.12 chip)\n", dev->name);
++	else if (chip == HP100_CHIPID_LASSEN)
++		printk("hp100: %s: Lassen Chip detected.\n", dev->name);
++	else
++		printk("hp100: %s: Warning: Unknown CASCADE chip (id=0x%.4x).\n", dev->name, chip);
+ #endif
+-	}
+ 
+ 	dev->base_addr = ioaddr;
+ 
+-	hp100_page(ID_MAC_ADDR);
+-	for (i = uc = eisa_id = 0; i < 4; i++) {
+-		eisa_id >>= 8;
+-		uc_1 = hp100_inb(BOARD_ID + i);
+-		eisa_id |= uc_1 << 24;
+-		uc += uc_1;
+-	}
+-	uc += hp100_inb(BOARD_ID + 4);
+-
+-	if (uc != 0xff) {	/* bad checksum? */
+-		printk("hp100_probe: %s: bad EISA ID checksum at base port 0x%x\n", dev->name, ioaddr);
+-		return -ENODEV;
+-	}
+-
+-	for (i = 0; i < HP100_EISA_IDS_SIZE; i++)
+-		if (hp100_eisa_ids[i].id == eisa_id)
+-			break;
+-	if (i >= HP100_EISA_IDS_SIZE) {
+-		for (i = 0; i < HP100_EISA_IDS_SIZE; i++)
+-			if ((hp100_eisa_ids[i].id & 0xf0ffffff) == (eisa_id & 0xf0ffffff))
+-				break;
+-		if (i >= HP100_EISA_IDS_SIZE) {
+-			printk ("hp100_probe: %s: card at port 0x%x isn't known (id = 0x%x)\n", dev->name, ioaddr, eisa_id);
+-			return -ENODEV;
+-		}
+-	}
+-	eid = &hp100_eisa_ids[i];
+-	if ((eid->id & 0x0f000000) < (eisa_id & 0x0f000000)) {
+-		printk("hp100_probe: %s: newer version of card %s at port 0x%x - unsupported\n", dev->name, eid->name, ioaddr);
+-		return -ENODEV;
++	eid = hp100_read_id(ioaddr);
++	if (eid == NULL) {	/* bad checksum? */
++		printk(KERN_WARNING "hp100_probe: bad ID checksum at base port 0x%x\n", ioaddr);
++		goto out2;
+ 	}
+ 
++	hp100_page(ID_MAC_ADDR);
+ 	for (i = uc = 0; i < 7; i++)
+ 		uc += hp100_inb(LAN_ADDR + i);
+ 	if (uc != 0xff) {
+-		printk("hp100_probe: %s: bad lan address checksum (card %s at port 0x%x)\n", dev->name, eid->name, ioaddr);
+-		return -EIO;
++		printk(KERN_WARNING "hp100_probe: bad lan address checksum at port 0x%x)\n", ioaddr);
++		err = -EIO;
++		goto out2;
+ 	}
+ 
+ 	/* Make sure, that all registers are correctly updated... */
+@@ -607,17 +516,17 @@ static int __init hp100_probe1(struct ne
+ 		hp100_outw(HP100_MEM_EN | HP100_RESET_LB, OPTION_LSW);
+ 		hp100_outw(HP100_IO_EN | HP100_SET_LB, OPTION_LSW);
+ 		hp100_outw(HP100_BM_WRITE | HP100_BM_READ | HP100_RESET_HB, OPTION_LSW);
+-		printk("hp100: %s: IO mapped mode forced.\n", dev->name);
++		printk("hp100: IO mapped mode forced.\n");
+ 	} else if (local_mode == 2) {
+ 		hp100_outw(HP100_MEM_EN | HP100_SET_LB, OPTION_LSW);
+ 		hp100_outw(HP100_IO_EN | HP100_SET_LB, OPTION_LSW);
+ 		hp100_outw(HP100_BM_WRITE | HP100_BM_READ | HP100_RESET_HB, OPTION_LSW);
+-		printk("hp100: %s: Shared memory mode requested.\n", dev->name);
++		printk("hp100: Shared memory mode requested.\n");
+ 	} else if (local_mode == 4) {
+ 		if (chip == HP100_CHIPID_LASSEN) {
+ 			hp100_outw(HP100_BM_WRITE | HP100_BM_READ | HP100_SET_HB, OPTION_LSW);
+ 			hp100_outw(HP100_IO_EN | HP100_MEM_EN | HP100_RESET_LB, OPTION_LSW);
+-			printk("hp100: %s: Busmaster mode requested.\n", dev->name);
++			printk("hp100: Busmaster mode requested.\n");
+ 		}
+ 		local_mode = 1;
+ 	}
+@@ -643,7 +552,7 @@ static int __init hp100_probe1(struct ne
+ 				/* Gracefully fallback to shared memory */
+ 				goto busmasterfail;
+ 			}
+-			printk("hp100: %s: Busmaster mode enabled.\n", dev->name);
++			printk("hp100: Busmaster mode enabled.\n");
+ 			hp100_outw(HP100_MEM_EN | HP100_IO_EN | HP100_RESET_LB, OPTION_LSW);
+ 		} else {
+ 		busmasterfail:
+@@ -675,7 +584,7 @@ static int __init hp100_probe1(struct ne
+ 		mem_ptr_phys &= ~0x1fff;	/* 8k alignment */
+ 
+ 		if (bus == HP100_BUS_ISA && (mem_ptr_phys & ~0xfffff) != 0) {
+-			printk("hp100: %s: Can only use programmed i/o mode.\n", dev->name);
++			printk("hp100: Can only use programmed i/o mode.\n");
+ 			mem_ptr_phys = 0;
+ 			mem_mapped = 0;
+ 			local_mode = 3;	/* Use programmed i/o */
+@@ -699,7 +608,7 @@ static int __init hp100_probe1(struct ne
+ 			}
+ 
+ 			if (mem_ptr_virt == NULL) {	/* all ioremap tries failed */
+-				printk("hp100: %s: Failed to ioremap the PCI card memory. Will have to use i/o mapped mode.\n", dev->name);
++				printk("hp100: Failed to ioremap the PCI card memory. Will have to use i/o mapped mode.\n");
+ 				local_mode = 3;
+ 				virt_memory_size = 0;
+ 			}
+@@ -710,17 +619,14 @@ static int __init hp100_probe1(struct ne
+ 		mem_mapped = 0;
+ 		mem_ptr_phys = 0;
+ 		mem_ptr_virt = NULL;
+-		printk("hp100: %s: Using (slow) programmed i/o mode.\n", dev->name);
++		printk("hp100: Using (slow) programmed i/o mode.\n");
+ 	}
+ 
+ 	/* Initialise the "private" data structure for this card. */
+-	if ((dev->priv = kmalloc(sizeof(struct hp100_private), GFP_KERNEL)) == NULL)
+-		return -ENOMEM;
+-
+ 	lp = (struct hp100_private *) dev->priv;
+-	memset(lp, 0, sizeof(struct hp100_private));
++
+ 	spin_lock_init(&lp->lock);
+-	lp->id = eid;
++	strlcpy(lp->id, eid, HP100_SIG_LEN);
+ 	lp->chip = chip;
+ 	lp->mode = local_mode;
+ 	lp->bus = bus;
+@@ -741,9 +647,6 @@ static int __init hp100_probe1(struct ne
+ 	lp->virt_memory_size = virt_memory_size;
+ 	lp->rx_ratio = hp100_rx_ratio;	/* can be conf'd with insmod */
+ 
+-	/* memory region for programmed i/o */
+-	request_region(dev->base_addr, HP100_REGION_SIZE, eid->name);
+-
+ 	dev->open = hp100_open;
+ 	dev->stop = hp100_close;
+ 
+@@ -776,10 +679,6 @@ static int __init hp100_probe1(struct ne
+ 	/* Reset statistics (counters) */
+ 	hp100_clear_stats(lp, ioaddr);
+ 
+-	SET_MODULE_OWNER(dev);
+-	SET_NETDEV_DEV(dev, &pci_dev->dev);
+-	ether_setup(dev);
+-
+ 	/* If busmaster mode is wanted, a dma-capable memory area is needed for
+ 	 * the rx and tx PDLs 
+ 	 * PCI cards can access the whole PC memory. Therefore GFP_DMA is not
+@@ -795,8 +694,10 @@ static int __init hp100_probe1(struct ne
+ 		/* Conversion to new PCI API :
+ 		 * Pages are always aligned and zeroed, no need to it ourself.
+ 		 * Doc says should be OK for EISA bus as well - Jean II */
+-		if ((lp->page_vaddr_algn = pci_alloc_consistent(lp->pci_dev, MAX_RINGSIZE, &page_baddr)) == NULL)
+-			return -ENOMEM;
++		if ((lp->page_vaddr_algn = pci_alloc_consistent(lp->pci_dev, MAX_RINGSIZE, &page_baddr)) == NULL) {
++			err = -ENOMEM;
++			goto out2;
++		}
+ 		lp->whatever_offset = ((u_long) page_baddr) - ((u_long) lp->page_vaddr_algn);
+ 
+ #ifdef HP100_DEBUG_BM
+@@ -818,7 +719,7 @@ static int __init hp100_probe1(struct ne
+ 	lp->lan_type = hp100_sense_lan(dev);
+ 
+ 	/* Print out a message what about what we think we have probed. */
+-	printk("hp100: %s: %s at 0x%x, IRQ %d, ", dev->name, lp->id->name, ioaddr, dev->irq);
++	printk("hp100: at 0x%x, IRQ %d, ", ioaddr, dev->irq);
+ 	switch (bus) {
+ 	case HP100_BUS_EISA:
+ 		printk("EISA");
+@@ -833,7 +734,7 @@ static int __init hp100_probe1(struct ne
+ 	printk(" bus, %dk SRAM (rx/tx %d%%).\n", lp->memory_size >> 10, lp->rx_ratio);
+ 
+ 	if (lp->mode == 2) {	/* memory mapped */
+-		printk("hp100: %s: Memory area at 0x%lx-0x%lx", dev->name, mem_ptr_phys,
++		printk("hp100: Memory area at 0x%lx-0x%lx", mem_ptr_phys,
+ 				(mem_ptr_phys + (mem_ptr_phys > 0x100000 ? (u_long) lp->memory_size : 16 * 1024)) - 1);
+ 		if (mem_ptr_virt)
+ 			printk(" (virtual base %p)", mem_ptr_virt);
+@@ -843,7 +744,8 @@ static int __init hp100_probe1(struct ne
+ 		dev->mem_start = mem_ptr_phys;
+ 		dev->mem_end = mem_ptr_phys + lp->memory_size;
+ 	}
+-	printk("hp100: %s: ", dev->name);
++
++	printk("hp100: ");
+ 	if (lp->lan_type != HP100_LAN_ERR)
+ 		printk("Adapter is attached to ");
+ 	switch (lp->lan_type) {
+@@ -861,6 +763,10 @@ static int __init hp100_probe1(struct ne
+ 	}
+ 
+ 	return 0;
++out2:
++	release_region(ioaddr, HP100_REGION_SIZE);
++out1:
++	return -ENODEV;
+ }
+ 
+ /* This procedure puts the card into a stable init state */
+@@ -950,6 +856,7 @@ static void hp100_hwinit(struct net_devi
+ 	/* Finally try to log in the Hub if there may be a VG connection. */
+ 	if ((lp->lan_type == HP100_LAN_100) || (lp->lan_type == HP100_LAN_ERR))
+ 		hp100_login_to_vg_hub(dev, 0);	/* relogin */
++
+ }
+ 
+ 
+@@ -1152,7 +1059,7 @@ static int hp100_open(struct net_device 
+ 	if (request_irq(dev->irq, hp100_interrupt,
+ 			lp->bus == HP100_BUS_PCI || lp->bus ==
+ 			HP100_BUS_EISA ? SA_SHIRQ : SA_INTERRUPT,
+-			lp->id->name, dev)) {
++			"hp100", dev)) {
+ 		printk("hp100: %s: unable to get IRQ %d\n", dev->name, dev->irq);
+ 		return -EAGAIN;
+ 	}
+@@ -2054,7 +1961,7 @@ static void hp100_rx_bm(struct net_devic
+ /*
+  *  statistics
+  */
+-static hp100_stats_t *hp100_get_stats(struct net_device *dev)
++static struct net_device_stats *hp100_get_stats(struct net_device *dev)
+ {
+ 	unsigned long flags;
+ 	int ioaddr = dev->base_addr;
+@@ -2558,10 +2465,14 @@ static int hp100_sense_lan(struct net_de
+ 		return HP100_LAN_COAX;
+ 	}
+ 
+-	if ((lp->id->id == 0x02019F022) ||
+-	    (lp->id->id == 0x01042103c) || (lp->id->id == 0x01040103c))
+-		return HP100_LAN_ERR;	/* Those cards don't have a 100 Mbit connector */
+-
++	/* Those cards don't have a 100 Mbit connector */
++	if ( !strcmp(lp->id, "HWP1920")  ||
++	     (lp->pci_dev && 
++	      lp->pci_dev->vendor == PCI_VENDOR_ID && 
++	      (lp->pci_dev->device == PCI_DEVICE_ID_HP_J2970A ||
++	       lp->pci_dev->device == PCI_DEVICE_ID_HP_J2973A)))
++		return HP100_LAN_ERR;
++	
+ 	if (val_VG & HP100_LINK_CABLE_ST)	/* Can hear the HUBs tone. */
+ 		return HP100_LAN_100;
+ 	return HP100_LAN_ERR;
+@@ -2915,122 +2826,248 @@ void hp100_RegisterDump(struct net_devic
+ #endif
+ 
+ 
++static void cleanup_dev(struct net_device *d)
++{
++	struct hp100_private *p = (struct hp100_private *) d->priv;
++
++	unregister_netdev(d);
++	release_region(d->base_addr, HP100_REGION_SIZE);
++
++	if (p->mode == 1)	/* busmaster */
++		pci_free_consistent(p->pci_dev, MAX_RINGSIZE + 0x0f, 
++				    p->page_vaddr_algn, 
++				    virt_to_whatever(d, p->page_vaddr_algn));
++	if (p->mem_ptr_virt)
++		iounmap(p->mem_ptr_virt);
++
++	free_netdev(d);
++}
++
++#ifdef CONFIG_EISA
++static int __init hp100_eisa_probe (struct device *gendev)
++{
++	struct net_device *dev = alloc_etherdev(sizeof(struct hp100_private));
++	struct eisa_device *edev = to_eisa_device(gendev);
++	int err;
++
++	if (!dev)
++		return -ENOMEM;
++
++	SET_MODULE_OWNER(dev);
++	SET_NETDEV_DEV(dev, &edev->dev);
++
++	err = hp100_probe1(dev, edev->base_addr, HP100_BUS_EISA, NULL);
++	if (err)
++		goto out1;
++
++	err = register_netdev(dev);
++	if (err)
++		goto out2;
++	
++#ifdef HP100_DEBUG
++	printk("hp100: %s: EISA adapter found at 0x%x\n", dev->name, 
++	       dev->base_addr);
++#endif
++	gendev->driver_data = dev;
++	return 0;
++ out2:
++	release_region(dev->base_addr, HP100_REGION_SIZE);
++ out1:
++	free_netdev(dev);
++	return err;
++}
++
++static int __devexit hp100_eisa_remove (struct device *gendev)
++{
++	struct net_device *dev = gendev->driver_data;
++	cleanup_dev(dev);
++	return 0;
++}
++
++static struct eisa_driver hp100_eisa_driver = {
++        .id_table = hp100_eisa_tbl,
++        .driver   = {
++                .name    = "hp100",
++                .probe   = hp100_eisa_probe,
++                .remove  = __devexit_p (hp100_eisa_remove),
++        }
++};
++#endif
++
++#ifdef CONFIG_PCI
++static int __devinit hp100_pci_probe (struct pci_dev *pdev,
++				     const struct pci_device_id *ent)
++{
++	struct net_device *dev = alloc_etherdev(sizeof(struct hp100_private));
++	int ioaddr = pci_resource_start(pdev, 0);
++	u_short pci_command;
++	int err;
++	
++	if (!dev)
++		return -ENOMEM;
++
++	SET_MODULE_OWNER(dev);
++	SET_NETDEV_DEV(dev, &pdev->dev);
++
++	pci_read_config_word(pdev, PCI_COMMAND, &pci_command);
++	if (!(pci_command & PCI_COMMAND_IO)) {
++#ifdef HP100_DEBUG
++		printk("hp100: %s: PCI I/O Bit has not been set. Setting...\n", dev->name);
++#endif
++		pci_command |= PCI_COMMAND_IO;
++		pci_write_config_word(pdev, PCI_COMMAND, pci_command);
++	}
++
++	if (!(pci_command & PCI_COMMAND_MASTER)) {
++#ifdef HP100_DEBUG
++		printk("hp100: %s: PCI Master Bit has not been set. Setting...\n", dev->name);
++#endif
++		pci_command |= PCI_COMMAND_MASTER;
++		pci_write_config_word(pdev, PCI_COMMAND, pci_command);
++	}
++	
++
++	err = hp100_probe1(dev, ioaddr, HP100_BUS_PCI, pdev);
++	if (err) 
++		goto out1;
++	err = register_netdev(dev);
++	if (err)
++		goto out2;
++	
++#ifdef HP100_DEBUG
++	printk("hp100: %s: PCI adapter found at 0x%x\n", dev->name, ioaddr);
++#endif
++	pci_set_drvdata(pdev, dev);
++	return 0;
++ out2:
++	release_region(dev->base_addr, HP100_REGION_SIZE);
++ out1:
++	free_netdev(dev);
++	return err;
++}
++
++static void __devexit hp100_pci_remove (struct pci_dev *pdev)
++{
++	struct net_device *dev = pci_get_drvdata(pdev);
++
++	cleanup_dev(dev);
++}
++
++
++static struct pci_driver hp100_pci_driver = {
++	.name		= "hp100",
++	.id_table	= hp100_pci_tbl,
++	.probe		= hp100_pci_probe,
++	.remove		= __devexit_p(hp100_pci_remove),
++};
++#endif
++
+ /*
+  *  module section
+  */
+ 
+-#ifdef MODULE
+-
+ MODULE_LICENSE("GPL");
+ MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>, "
+               "Siegfried \"Frieder\" Loeffler (dg1sek) <floeff@mathematik.uni-stuttgart.de>");
+ MODULE_DESCRIPTION("HP CASCADE Architecture Driver for 100VG-AnyLan Network Adapters");
+ 
+ /*
+- * Note: if you have more than five 100vg cards in your pc, feel free to
+- * increase this value 
+- */
+-
+-#define HP100_DEVICES 5
+-
+-/*
+- * Note: to register three eisa or pci devices, use:
++ * Note: to register three isa devices, use:
+  * option hp100 hp100_port=0,0,0
+  *        to register one card at io 0x280 as eth239, use:
+- * option hp100 hp100_port=0x280 hp100_name=eth239
++ * option hp100 hp100_port=0x280
+  */
+-
++#if defined(MODULE) && defined(CONFIG_ISA)
++#define HP100_DEVICES 5
+ /* Parameters set by insmod */
+ static int hp100_port[HP100_DEVICES] = { 0, [1 ... (HP100_DEVICES-1)] = -1 };
+ MODULE_PARM(hp100_port, "1-" __MODULE_STRING(HP100_DEVICES) "i");
+ 
+-/* Allocate HP100_DEVICES strings of length IFNAMSIZ, one string for each device */
+-static char hp100_name[HP100_DEVICES][IFNAMSIZ] = { "", "", "", "", "" };
+-/* Allow insmod to write those HP100_DEVICES strings individually */
+-MODULE_PARM(hp100_name, "1-" __MODULE_STRING(HP100_DEVICES) "c" __MODULE_STRING(IFNAMSIZ));
+-
+ /* List of devices */
+ static struct net_device *hp100_devlist[HP100_DEVICES];
+ 
+-static void release_dev(int i)
++static int __init hp100_isa_init(void)
+ {
+-	struct net_device *d = hp100_devlist[i];
+-	struct hp100_private *p = (struct hp100_private *) d->priv;
++	struct net_device *dev;
++	int i, err, cards = 0;
+ 
+-	unregister_netdev(d);
+-	release_region(d->base_addr, HP100_REGION_SIZE);
++	/* Don't autoprobe ISA bus */
++	if (hp100_port[0] == 0)
++		return -ENODEV;
+ 
+-	if (p->mode == 1)	/* busmaster */
+-		pci_free_consistent(p->pci_dev, MAX_RINGSIZE + 0x0f, p->page_vaddr_algn, virt_to_whatever(d, p->page_vaddr_algn));
+-	if (p->mem_ptr_virt)
+-		iounmap(p->mem_ptr_virt);
+-	kfree(d->priv);
+-	d->priv = NULL;
+-	free_netdev(d);
+-	hp100_devlist[i] = NULL;
++	/* Loop on all possible base addresses */
++	for (i = 0; i < HP100_DEVICES && hp100_port[i] != -1; ++i) {
++		dev = alloc_etherdev(sizeof(struct hp100_private));
++		if (!dev) {
++			printk(KERN_WARNING "hp100: no memory for network device\n");
++			while (cards > 0)
++				cleanup_dev(hp100_devlist[--cards]);
++
++			return -ENOMEM;
++		}
++		SET_MODULE_OWNER(dev);
++
++		err = hp100_isa_probe(dev, hp100_port[i]);
++		if (!err) {
++			err = register_netdev(dev);
++			if (!err) 
++				hp100_devlist[cards++] = dev;
++			else
++				release_region(dev->base_addr, HP100_REGION_SIZE);
++		}
++
++		if (err)
++			free_netdev(dev);
++	}
++
++	return cards > 0 ? 0 : -ENODEV;
+ }
+ 
+-static int __init hp100_module_init(void)
++static void __exit hp100_isa_cleanup(void) 
+ {
+-	int i, cards;
++	int i;
+ 
+-#ifndef CONFIG_PCI
+-	if (hp100_port == 0 && !EISA_bus)
+-		printk("hp100: You should not use auto-probing with insmod!\n");
++	for (i = 0; i < HP100_DEVICES; i++) {
++		struct net_device *dev = hp100_devlist[i];
++		if (dev)
++			cleanup_dev(dev);
++	}
++}
++#else
++#define hp100_isa_init()	(0)
++#define hp100_isa_cleanup()	do { } while(0)
+ #endif
+ 
+-	/* Loop on all possible base addresses */
+-	i = -1;
+-	cards = 0;
+-	while ((hp100_port[++i] != -1) && (i < HP100_DEVICES)) {
+-		/* Create device and set basics args */
+-		hp100_devlist[i] = kmalloc(sizeof(struct net_device), GFP_KERNEL);
+-		if (!hp100_devlist[i])
+-			goto fail;
+-		memset(hp100_devlist[i], 0x00, sizeof(struct net_device));
+-#if LINUX_VERSION_CODE >= 0x020362	/* 2.3.99-pre7 */
+-		memcpy(hp100_devlist[i]->name, hp100_name[i], IFNAMSIZ);	/* Copy name */
+-#else
+-		hp100_devlist[i]->name = hp100_name[i];
+-#endif				/* LINUX_VERSION_CODE >= 0x020362 */
+-		hp100_devlist[i]->base_addr = hp100_port[i];
+-		hp100_devlist[i]->init = &hp100_probe;
+-
+-		/* Try to create the device */
+-		if (register_netdev(hp100_devlist[i]) != 0) {
+-			/* DeAllocate everything */
+-			/* Note: if dev->priv is mallocated, there is no way to fail */
+-			kfree(hp100_devlist[i]);
+-			hp100_devlist[i] = (struct net_device *) NULL;
+-		} else
+-			cards++;
+-	}			/* Loop over all devices */
++static int __init hp100_module_init(void)
++{
++	int err;
+ 
+-	return cards > 0 ? 0 : -ENODEV;
+-      fail:
+-	while (cards && --i)
+-		if (hp100_devlist[i]) {
+-			release_dev(i);
+-			--cards;
+-		}
+-	return -ENOMEM;
++	err = hp100_isa_init();
++
++#ifdef CONFIG_EISA
++	err |= eisa_driver_register(&hp100_eisa_driver);
++#endif
++#ifdef CONFIG_PCI
++	err |= pci_module_init(&hp100_pci_driver);
++#endif
++	return err;
+ }
+ 
++
+ static void __exit hp100_module_exit(void)
+ {
+-	int i;
+-
+-	/* TODO: Check if all skb's are released/freed. */
+-	for (i = 0; i < HP100_DEVICES; i++)
+-		if (hp100_devlist[i] != (struct net_device *) NULL)
+-			release_dev(i);
++	hp100_isa_cleanup();
++#ifdef CONFIG_EISA
++	eisa_driver_unregister (&hp100_eisa_driver);
++#endif
++#ifdef CONFIG_PCI
++	pci_unregister_driver (&hp100_pci_driver);
++#endif
+ }
+ 
+ module_init(hp100_module_init)
+ module_exit(hp100_module_exit)
+ 
+-#endif				/* MODULE */
+-
+ 
+ /*
+  * Local variables:
+--- linux-2.6.0/drivers/net/hp.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/hp.c	2003-12-28 23:21:01.000000000 -0800
+@@ -55,7 +55,6 @@ static unsigned int hppclan_portlist[] _
+ #define HP_8BSTOP_PG	0x80	/* Last page +1 of RX ring */
+ #define HP_16BSTOP_PG	0xFF	/* Same, for 16 bit cards. */
+ 
+-int hp_probe(struct net_device *dev);
+ static int hp_probe1(struct net_device *dev, int ioaddr);
+ 
+ static int hp_open(struct net_device *dev);
+@@ -79,10 +78,11 @@ static char irqmap[16] __initdata= { 0, 
+ 	Also initialize the card and fill in STATION_ADDR with the station
+ 	address. */
+ 
+-int __init hp_probe(struct net_device *dev)
++static int __init do_hp_probe(struct net_device *dev)
+ {
+ 	int i;
+ 	int base_addr = dev->base_addr;
++	int irq = dev->irq;
+ 
+ 	SET_MODULE_OWNER(dev);
+ 
+@@ -91,13 +91,46 @@ int __init hp_probe(struct net_device *d
+ 	else if (base_addr != 0)	/* Don't probe at all. */
+ 		return -ENXIO;
+ 
+-	for (i = 0; hppclan_portlist[i]; i++)
++	for (i = 0; hppclan_portlist[i]; i++) {
+ 		if (hp_probe1(dev, hppclan_portlist[i]) == 0)
+ 			return 0;
++		dev->irq = irq;
++	}
+ 
+ 	return -ENODEV;
+ }
+ 
++static void cleanup_card(struct net_device *dev)
++{
++	free_irq(dev->irq, dev);
++	release_region(dev->base_addr - NIC_OFFSET, HP_IO_EXTENT);
++}
++
++struct net_device * __init hp_probe(int unit)
++{
++	struct net_device *dev = alloc_ei_netdev();
++	int err;
++
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	sprintf(dev->name, "eth%d", unit);
++	netdev_boot_setup_check(dev);
++
++	err = do_hp_probe(dev);
++	if (err)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	cleanup_card(dev);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
++}
++
+ static int __init hp_probe1(struct net_device *dev, int ioaddr)
+ {
+ 	int i, retval, board_id, wordmode;
+@@ -131,13 +164,6 @@ static int __init hp_probe1(struct net_d
+ 	if (ei_debug  &&  version_printed++ == 0)
+ 		printk(version);
+ 
+-	/* Allocate dev->priv and fill in 8390 specific dev fields. */
+-	if (ethdev_init(dev)) {
+-		printk (" unable to get memory for dev->priv.\n");
+-		retval = -ENOMEM;
+-		goto out;
+-	}
+-
+ 	printk("%s: %s (ID %02x) at %#3x,", dev->name, name, board_id, ioaddr);
+ 
+ 	for(i = 0; i < ETHER_ADDR_LEN; i++)
+@@ -166,14 +192,14 @@ static int __init hp_probe1(struct net_d
+ 		if (*irqp == 0) {
+ 			printk(" no free IRQ lines.\n");
+ 			retval = -EBUSY;
+-			goto out1;
++			goto out;
+ 		}
+ 	} else {
+ 		if (dev->irq == 2)
+ 			dev->irq = 9;
+ 		if ((retval = request_irq(dev->irq, ei_interrupt, 0, dev->name, dev))) {
+ 			printk (" unable to get IRQ %d.\n", dev->irq);
+-			goto out1;
++			goto out;
+ 		}
+ 	}
+ 
+@@ -195,9 +221,6 @@ static int __init hp_probe1(struct net_d
+ 	hp_init_card(dev);
+ 
+ 	return 0;
+-out1:
+-	kfree(dev->priv);
+-	dev->priv = NULL;
+ out:
+ 	release_region(ioaddr, HP_IO_EXTENT);
+ 	return retval;
+@@ -372,7 +395,7 @@ hp_init_card(struct net_device *dev)
+ 
+ #ifdef MODULE
+ #define MAX_HP_CARDS	4	/* Max number of HP cards per module */
+-static struct net_device dev_hp[MAX_HP_CARDS];
++static struct net_device *dev_hp[MAX_HP_CARDS];
+ static int io[MAX_HP_CARDS];
+ static int irq[MAX_HP_CARDS];
+ 
+@@ -388,27 +411,33 @@ ISA device autoprobes on a running machi
+ int
+ init_module(void)
+ {
++	struct net_device *dev;
+ 	int this_dev, found = 0;
+ 
+ 	for (this_dev = 0; this_dev < MAX_HP_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_hp[this_dev];
+-		dev->irq = irq[this_dev];
+-		dev->base_addr = io[this_dev];
+-		dev->init = hp_probe;
+ 		if (io[this_dev] == 0)  {
+ 			if (this_dev != 0) break; /* only autoprobe 1st one */
+ 			printk(KERN_NOTICE "hp.c: Presently autoprobing (not recommended) for a single card.\n");
+ 		}
+-		if (register_netdev(dev) != 0) {
+-			printk(KERN_WARNING "hp.c: No HP card found (i/o = 0x%x).\n", io[this_dev]);
+-			if (found != 0) {	/* Got at least one. */
+-				return 0;
++		dev = alloc_ei_netdev();
++		if (!dev)
++			break;
++		dev->irq = irq[this_dev];
++		dev->base_addr = io[this_dev];
++		if (do_hp_probe(dev) == 0) {
++			if (register_netdev(dev) == 0) {
++				dev_hp[found++] = dev;
++				continue;
+ 			}
+-			return -ENXIO;
++			cleanup_card(dev);
+ 		}
+-		found++;
++		free_netdev(dev);
++		printk(KERN_WARNING "hp.c: No HP card found (i/o = 0x%x).\n", io[this_dev]);
++		break;
+ 	}
+-	return 0;
++	if (found)
++		return 0;
++	return -ENXIO;
+ }
+ 
+ void
+@@ -417,14 +446,11 @@ cleanup_module(void)
+ 	int this_dev;
+ 
+ 	for (this_dev = 0; this_dev < MAX_HP_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_hp[this_dev];
+-		if (dev->priv != NULL) {
+-			int ioaddr = dev->base_addr - NIC_OFFSET;
+-			void *priv = dev->priv;
+-			free_irq(dev->irq, dev);
+-			release_region(ioaddr, HP_IO_EXTENT);
++		struct net_device *dev = dev_hp[this_dev];
++		if (dev) {
+ 			unregister_netdev(dev);
+-			kfree(priv);
++			cleanup_card(dev);
++			free_netdev(dev);
+ 		}
+ 	}
+ }
+--- linux-2.6.0/drivers/net/hplance.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/hplance.c	2003-12-28 23:21:01.000000000 -0800
+@@ -50,8 +50,7 @@ struct hplance_private {
+  * plus board-specific init, open and close actions. 
+  * Oh, and we need to tell the generic code how to read and write LANCE registers...
+  */
+-int hplance_probe(struct net_device *dev);
+-static int hplance_init(struct net_device *dev, int scode);
++static void hplance_init(struct net_device *dev, int scode);
+ static int hplance_open(struct net_device *dev);
+ static int hplance_close(struct net_device *dev);
+ static void hplance_writerap(void *priv, unsigned short value);
+@@ -62,57 +61,61 @@ static unsigned short hplance_readrdp(vo
+ static struct hplance_private *root_hplance_dev;
+ #endif
+ 
++static void cleanup_card(struct net_device *dev)
++{
++        struct hplance_private *lp = dev->priv;
++	dio_unconfig_board(lp->scode);
++}
++
+ /* Find all the HP Lance boards and initialise them... */
+-int __init hplance_probe(struct net_device *dev)
++struct net_device * __init hplance_probe(int unit)
+ {
+-        int cards = 0, called = 0;
++	struct net_device *dev;
++
++        if (!MACH_IS_HP300)
++                return ERR_PTR(-ENODEV);
++
++	dev = alloc_etherdev(sizeof(struct hplance_private));
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	if (unit >= 0) {
++		sprintf(dev->name, "eth%d", unit);
++		netdev_boot_setup_check(dev);
++	}
+ 
+-        if (!MACH_IS_HP300 || called)
+-                return(ENODEV);
+-        called++;
++	SET_MODULE_OWNER(dev);
+         
+         /* Isn't DIO nice? */
+         for(;;)
+         {
+-                int v, scode = dio_find(DIO_ID_LAN);
++                int scode = dio_find(DIO_ID_LAN);
+                                 
+                 if (!scode)
+                         break;
+                 
+-                if(cards)
+-                        dev = NULL;      /* don't trash previous device, make a new one */
+-                cards++;
+-                
+-                v = hplance_init(dev, scode);
+-                if (v)                            /* error, abort immediately */
+-                        return v;
++		dio_config_board(scode);
++                hplance_init(dev, scode);
++		if (!register_netdev(dev)) {
++			struct hplance_private *lp = dev->priv;
++			lp->next_module = root_hplance_dev;
++			root_hplance_dev = lp;
++			return dev;
++		}
++		cleanup_card(dev);
+         }
+-        /* OK, return success, or ENODEV if we didn't find any cards */
+-        if (!cards)
+-                return -ENODEV;
+-        return 0;
++	free_netdev(dev);
++	return ERR_PTR(-ENODEV);
+ }
+ 
+ /* Initialise a single lance board at the given select code */
+-static int __init hplance_init(struct net_device *dev, int scode)
++static void __init hplance_init(struct net_device *dev, int scode)
+ {
+         const char *name = dio_scodetoname(scode);
+         void *va = dio_scodetoviraddr(scode);
+         struct hplance_private *lp;
+         int i;
+         
+-#ifdef MODULE
+-	dev = init_etherdev(0, sizeof(struct hplance_private));
+-	if (!dev)
+-		return -ENOMEM;
+-#else
+-	dev->priv = kmalloc(sizeof(struct hplance_private), GFP_KERNEL);
+-	if (dev->priv == NULL)
+-		return -ENOMEM;
+-	memset(dev->priv, 0, sizeof(struct hplance_private));
+-#endif
+-	SET_MODULE_OWNER(dev);
+-
+         printk("%s: %s; select code %d, addr", dev->name, name, scode);
+ 
+         /* reset the board */
+@@ -154,17 +157,7 @@ static int __init hplance_init(struct ne
+         lp->lance.tx_ring_mod_mask = TX_RING_MOD_MASK;
+         lp->scode = scode;
+ 	lp->base = va;
+-        ether_setup(dev);
+ 	printk(", irq %d\n", lp->lance.irq);
+-
+-#ifdef MODULE
+-        dev->ifindex = dev_new_index();
+-        lp->next_module = root_hplance_dev;
+-        root_hplance_dev = lp;
+-#endif /* MODULE */
+-
+-        dio_config_board(scode);                  /* tell bus scanning code this one's taken */
+-        return 0;
+ }
+ 
+ /* This is disgusting. We have to check the DIO status register for ack every
+@@ -227,8 +220,10 @@ static int hplance_close(struct net_devi
+ MODULE_LICENSE("GPL");
+ int init_module(void)
+ {
+-        root_lance_dev = NULL;
+-        return hplance_probe(NULL);
++	int found = 0;
++	while (!IS_ERR(hplance_probe(-1)))
++		found++;
++	return found ? 0 : -ENODEV;
+ }
+ 
+ void cleanup_module(void)
+@@ -237,8 +232,8 @@ void cleanup_module(void)
+         struct hplance_private *lp;
+         while (root_hplance_dev) {
+                 lp = root_hplance_dev->next_module;
+-                dio_unconfig_board(lp->scode);
+                 unregister_netdev(root_lance_dev->dev);
++                cleanup_card(root_lance_dev->dev);
+                 free_netdev(root_lance_dev->dev);
+                 root_lance_dev = lp;
+         }
+--- linux-2.6.0/drivers/net/hp-plus.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/hp-plus.c	2003-12-28 23:21:01.000000000 -0800
+@@ -92,7 +92,6 @@ enum HP_Option {
+ 	EnableIRQ = 4, FakeIntr = 8, BootROMEnb = 0x10, IOEnb = 0x20,
+ 	MemEnable = 0x40, ZeroWait = 0x80, MemDisable = 0x1000, };
+ 
+-int hp_plus_probe(struct net_device *dev);
+ static int hpp_probe1(struct net_device *dev, int ioaddr);
+ 
+ static void hpp_reset_8390(struct net_device *dev);
+@@ -115,10 +114,11 @@ static void hpp_io_get_8390_hdr(struct n
+ /*	Probe a list of addresses for an HP LAN+ adaptor.
+ 	This routine is almost boilerplate. */
+ 
+-int __init hp_plus_probe(struct net_device *dev)
++static int __init do_hpp_probe(struct net_device *dev)
+ {
+ 	int i;
+ 	int base_addr = dev->base_addr;
++	int irq = dev->irq;
+ 
+ 	SET_MODULE_OWNER(dev);
+ 
+@@ -127,13 +127,46 @@ int __init hp_plus_probe(struct net_devi
+ 	else if (base_addr != 0)	/* Don't probe at all. */
+ 		return -ENXIO;
+ 
+-	for (i = 0; hpplus_portlist[i]; i++)
++	for (i = 0; hpplus_portlist[i]; i++) {
+ 		if (hpp_probe1(dev, hpplus_portlist[i]) == 0)
+ 			return 0;
++		dev->irq = irq;
++	}
+ 
+ 	return -ENODEV;
+ }
+ 
++static void cleanup_card(struct net_device *dev)
++{
++	/* NB: hpp_close() handles free_irq */
++	release_region(dev->base_addr - NIC_OFFSET, HP_IO_EXTENT);
++}
++
++struct net_device * __init hp_plus_probe(int unit)
++{
++	struct net_device *dev = alloc_ei_netdev();
++	int err;
++
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	sprintf(dev->name, "eth%d", unit);
++	netdev_boot_setup_check(dev);
++
++	err = do_hpp_probe(dev);
++	if (err)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	cleanup_card(dev);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
++}
++
+ /* Do the interesting part of the probe at a single address. */
+ static int __init hpp_probe1(struct net_device *dev, int ioaddr)
+ {
+@@ -179,13 +212,6 @@ static int __init hpp_probe1(struct net_
+ 		printk(" ID %4.4x", inw(ioaddr + 12));
+ 	}
+ 
+-	/* Allocate dev->priv and fill in 8390 specific dev fields. */
+-	if (ethdev_init(dev)) {
+-		printk ("hp-plus.c: unable to allocate memory for dev->priv.\n");
+-		retval = -ENOMEM;
+-		goto out;
+-	 }
+-
+ 	/* Read the IRQ line. */
+ 	outw(HW_Page, ioaddr + HP_PAGING);
+ 	{
+@@ -400,7 +426,7 @@ hpp_mem_block_output(struct net_device *
+ 
+ #ifdef MODULE
+ #define MAX_HPP_CARDS	4	/* Max number of HPP cards per module */
+-static struct net_device dev_hpp[MAX_HPP_CARDS];
++static struct net_device *dev_hpp[MAX_HPP_CARDS];
+ static int io[MAX_HPP_CARDS];
+ static int irq[MAX_HPP_CARDS];
+ 
+@@ -416,27 +442,33 @@ ISA device autoprobes on a running machi
+ int
+ init_module(void)
+ {
++	struct net_device *dev;
+ 	int this_dev, found = 0;
+ 
+ 	for (this_dev = 0; this_dev < MAX_HPP_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_hpp[this_dev];
+-		dev->irq = irq[this_dev];
+-		dev->base_addr = io[this_dev];
+-		dev->init = hp_plus_probe;
+ 		if (io[this_dev] == 0)  {
+ 			if (this_dev != 0) break; /* only autoprobe 1st one */
+ 			printk(KERN_NOTICE "hp-plus.c: Presently autoprobing (not recommended) for a single card.\n");
+ 		}
+-		if (register_netdev(dev) != 0) {
+-			printk(KERN_WARNING "hp-plus.c: No HP-Plus card found (i/o = 0x%x).\n", io[this_dev]);
+-			if (found != 0) {	/* Got at least one. */
+-				return 0;
++		dev = alloc_ei_netdev();
++		if (!dev)
++			break;
++		dev->irq = irq[this_dev];
++		dev->base_addr = io[this_dev];
++		if (do_hpp_probe(dev) == 0) {
++			if (register_netdev(dev) == 0) {
++				dev_hpp[found++] = dev;
++				continue;
+ 			}
+-			return -ENXIO;
++			cleanup_card(dev);
+ 		}
+-		found++;
++		free_netdev(dev);
++		printk(KERN_WARNING "hp-plus.c: No HP-Plus card found (i/o = 0x%x).\n", io[this_dev]);
++		break;
+ 	}
+-	return 0;
++	if (found)
++		return 0;
++	return -ENXIO;
+ }
+ 
+ void
+@@ -445,14 +477,11 @@ cleanup_module(void)
+ 	int this_dev;
+ 
+ 	for (this_dev = 0; this_dev < MAX_HPP_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_hpp[this_dev];
+-		if (dev->priv != NULL) {
+-			int ioaddr = dev->base_addr - NIC_OFFSET;
+-			void *priv = dev->priv;
+-			/* NB: hpp_close() handles free_irq */
+-			release_region(ioaddr, HP_IO_EXTENT);
++		struct net_device *dev = dev_hpp[this_dev];
++		if (dev) {
+ 			unregister_netdev(dev);
+-			kfree(priv);
++			cleanup_card(dev);
++			free_netdev(dev);
+ 		}
+ 	}
+ }
+--- linux-2.6.0/drivers/net/hydra.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/hydra.c	2003-12-28 23:21:01.000000000 -0800
+@@ -89,13 +89,14 @@ static int __init hydra_init(unsigned lo
+     const char name[] = "NE2000";
+     int start_page, stop_page;
+     int j;
++    int err;
+ 
+     static u32 hydra_offsets[16] = {
+ 	0x00, 0x02, 0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0e,
+ 	0x10, 0x12, 0x14, 0x16, 0x18, 0x1a, 0x1c, 0x1e,
+     };
+ 
+-    dev = init_etherdev(NULL, 0);
++    dev = alloc_ei_netdev();
+     if (!dev)
+ 	return -ENOMEM;
+     SET_MODULE_OWNER(dev);
+@@ -113,13 +114,9 @@ static int __init hydra_init(unsigned lo
+ 
+     /* Install the Interrupt handler */
+     if (request_irq(IRQ_AMIGA_PORTS, ei_interrupt, SA_SHIRQ, "Hydra Ethernet",
+-		    dev))
++		    dev)) {
++	free_netdev(dev);
+ 	return -EAGAIN;
+-
+-    /* Allocate dev->priv and fill in 8390 specific dev fields. */
+-    if (ethdev_init(dev)) {
+-	printk("Unable to get memory for dev->priv.\n");
+-	return -ENOMEM;
+     }
+ 
+     printk("%s: hydra at 0x%08lx, address %02x:%02x:%02x:%02x:%02x:%02x (hydra.c " HYDRA_VERSION ")\n", dev->name, ZTWO_PADDR(board),
+@@ -146,7 +143,13 @@ static int __init hydra_init(unsigned lo
+     root_hydra_dev = dev;
+ #endif
+     NS8390_init(dev, 0);
+-    return 0;
++    err = register_netdev(dev);
++    if (!err)
++	return 0;
++
++    free_irq(IRQ_AMIGA_PORTS, dev);
++    free_netdev(dev);
++    return err;
+ }
+ 
+ static int hydra_open(struct net_device *dev)
+--- linux-2.6.0/drivers/net/ibmlana.c	2003-10-08 15:07:09.000000000 -0700
++++ 25/drivers/net/ibmlana.c	2003-12-28 23:21:01.000000000 -0800
+@@ -906,7 +906,7 @@ static void ibmlana_set_multicast_list(s
+ 
+ static int startslot;		/* counts through slots when probing multiple devices */
+ 
+-int ibmlana_probe(struct net_device *dev)
++static int ibmlana_probe(struct net_device *dev)
+ {
+ 	int force_detect = 0;
+ 	int slot, z;
+@@ -924,34 +924,21 @@ int ibmlana_probe(struct net_device *dev
+ 	if (dev->mem_start == 1)
+ 		force_detect = 1;
+ 
+-	/* search through slots */
+-	if (dev != NULL) {
+-		base = dev->mem_start;
+-		irq = dev->irq;
+-	}
+-	slot = mca_find_adapter(IBM_LANA_ID, startslot);
++	base = dev->mem_start;
++	irq = dev->irq;
+ 
+-	while (slot != -1) {
++	for (slot = startslot; (slot = mca_find_adapter(IBM_LANA_ID, slot)) != -1; slot++) {
+ 		/* deduce card addresses */
+ 		getaddrs(slot, &base, &memlen, &iobase, &irq, &medium);
+ 
+ 		/* slot already in use ? */
+-		if (mca_is_adapter_used(slot)) {
+-			slot = mca_find_adapter(IBM_LANA_ID, slot + 1);
++		if (mca_is_adapter_used(slot))
+ 			continue;
+-		}
+ 		/* were we looking for something different ? */
+-		if (dev->irq != 0 || dev->mem_start != 0) {
+-			if (dev->irq != 0 && dev->irq != irq) {
+-				slot = mca_find_adapter(IBM_LANA_ID, slot + 1);
+-				continue;
+-			}
+-			if (dev->mem_start != 0 && dev->mem_start != base) 
+-			{
+-				slot = mca_find_adapter(IBM_LANA_ID, slot + 1);
+-				continue;
+-			}
+-		}
++		if (dev->irq && dev->irq != irq)
++			continue;
++		if (dev->mem_start && dev->mem_start != base)
++			continue;
+ 		/* found something that matches */
+ 		break;
+ 	}
+@@ -977,16 +964,11 @@ int ibmlana_probe(struct net_device *dev
+ 	mca_mark_as_used(slot);
+ 
+ 	/* allocate structure */
+-	priv = dev->priv = (ibmlana_priv *) kmalloc(sizeof(ibmlana_priv), GFP_KERNEL);
+-	if (!priv) {
+-		release_region(iobase, IBM_LANA_IORANGE);
+-		return -ENOMEM;
+-	}
++	priv = dev->priv;
+ 	priv->slot = slot;
+ 	priv->realirq = irq;
+ 	priv->medium = medium;
+ 	spin_lock_init(&priv->lock);
+-	memset(&priv->stat, 0, sizeof(struct net_device_stats));
+ 
+ 	/* set base + irq for this device (irq not allocated so far) */
+ 
+@@ -1006,10 +988,6 @@ int ibmlana_probe(struct net_device *dev
+ 	dev->set_multicast_list = ibmlana_set_multicast_list;
+ 	dev->flags |= IFF_MULTICAST;
+ 
+-	/* generic setup */
+-
+-	ether_setup(dev);
+-
+ 	/* copy out MAC address */
+ 
+ 	for (z = 0; z < sizeof(dev->dev_addr); z++)
+@@ -1044,7 +1022,7 @@ int ibmlana_probe(struct net_device *dev
+ 
+ #define DEVMAX 5
+ 
+-static struct net_device moddevs[DEVMAX];
++static struct net_device *moddevs[DEVMAX];
+ static int irq;
+ static int io;
+ 
+@@ -1056,41 +1034,47 @@ MODULE_LICENSE("GPL");
+ 
+ int init_module(void)
+ {
+-	int z, res;
++	int z;
+ 
+ 	startslot = 0;
+ 	for (z = 0; z < DEVMAX; z++) {
+-		moddevs[z].init = ibmlana_probe;
+-		moddevs[z].irq = irq;
+-		moddevs[z].base_addr = io;
+-		res = register_netdev(moddevs + z);
+-		if (res != 0)
+-			return (z > 0) ? 0 : -EIO;
++		struct net_device *dev = alloc_etherdev(sizeof(ibmlana_priv));
++		if (!dev)
++			break;
++		dev->irq = irq;
++		dev->base_addr = io;
++		if (ibmlana_probe(dev)) {
++			free_netdev(dev);
++			break;
++		}
++		if (register_netdev(dev)) {
++			ibmlana_priv *priv = dev->priv;
++			release_region(dev->base_addr, IBM_LANA_IORANGE);
++			mca_mark_as_unused(priv->slot);
++			mca_set_adapter_name(priv->slot, "");
++			mca_set_adapter_procfn(priv->slot, NULL, NULL);
++			free_netdev(dev);
++			break;
++		}
++		moddevs[z] = dev;
+ 	}
+-	return 0;
++	return (z > 0) ? 0 : -EIO;
+ }
+ 
+ void cleanup_module(void)
+ {
+-	struct net_device *dev;
+-	ibmlana_priv *priv;
+ 	int z;
+-
+ 	for (z = 0; z < DEVMAX; z++) {
+-		dev = moddevs + z;
+-		if (dev->priv != NULL) {
+-			priv = (ibmlana_priv *) dev->priv;
++		struct net_device *dev = moddevs[z];
++		if (dev) {
++			ibmlana_priv *priv = (ibmlana_priv *) dev->priv;
++			unregister_netdev(dev);
+ 			/*DeinitBoard(dev); */
+-			if (dev->irq != 0)
+-				free_irq(dev->irq, dev);
+-			dev->irq = 0;
+ 			release_region(dev->base_addr, IBM_LANA_IORANGE);
+-			unregister_netdev(dev);
+ 			mca_mark_as_unused(priv->slot);
+ 			mca_set_adapter_name(priv->slot, "");
+ 			mca_set_adapter_procfn(priv->slot, NULL, NULL);
+-			kfree(dev->priv);
+-			dev->priv = NULL;
++			free_netdev(dev);
+ 		}
+ 	}
+ }
+--- linux-2.6.0/drivers/net/ibmlana.h	2003-06-14 12:18:31.000000000 -0700
++++ 25/drivers/net/ibmlana.h	2003-12-28 23:21:01.000000000 -0800
+@@ -275,7 +275,4 @@ typedef struct {
+ 
+ #endif				/* _IBM_LANA_DRIVER_ */
+ 
+-extern int ibmlana_probe(struct net_device *);
+-
+-
+ #endif	/* _IBM_LANA_INCLUDE_ */
+--- linux-2.6.0/drivers/net/irda/ali-ircc.c	2003-10-08 15:07:09.000000000 -0700
++++ 25/drivers/net/irda/ali-ircc.c	2003-12-28 23:23:01.000000000 -0800
+@@ -8,6 +8,8 @@
+  * Created at:    2000/10/16 03:46PM
+  * Modified at:   2001/1/3 02:55PM
+  * Modified by:   Benjamin Kong <benjamin_kong@ali.com.tw>
++ * Modified at:   2003/11/6 and support for ALi south-bridge chipsets M1563
++ * Modified by:   Clear Zhang <clear_zhang@ali.com.tw>
+  * 
+  *     Copyright (c) 2000 Benjamin Kong <benjamin_kong@ali.com.tw>
+  *     All Rights Reserved
+@@ -68,6 +70,7 @@ static ali_chip_t chips[] =
+ {
+ 	{ "M1543", { 0x3f0, 0x370 }, 0x51, 0x23, 0x20, 0x43, ali_ircc_probe_53, ali_ircc_init_43 },
+ 	{ "M1535", { 0x3f0, 0x370 }, 0x51, 0x23, 0x20, 0x53, ali_ircc_probe_53, ali_ircc_init_53 },
++	{ "M1563", { 0x3f0, 0x370 }, 0x51, 0x23, 0x20, 0x63, ali_ircc_probe_53, ali_ircc_init_53 },
+ 	{ NULL }
+ };
+ 
+@@ -1331,7 +1334,7 @@ static int ali_ircc_net_open(struct net_
+ 	}
+ 	
+ 	/* Turn on interrups */
+-	outb(UART_IER_RLSI | UART_IER_RDI |UART_IER_THRI, iobase+UART_IER);
++	outb(UART_IER_RDI , iobase+UART_IER);
+ 
+ 	/* Ready to play! */
+ 	netif_start_queue(dev); //benjamin by irport
+--- linux-2.6.0/drivers/net/ixgb/ixgb_main.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/ixgb/ixgb_main.c	2003-12-28 23:21:01.000000000 -0800
+@@ -446,7 +446,7 @@ ixgb_probe(struct pci_dev *pdev, const s
+ 	iounmap(adapter->hw.hw_addr);
+       err_ioremap:
+ 	pci_release_regions(pdev);
+-	kfree(netdev);
++	free_netdev(netdev);
+       err_alloc_etherdev:
+ 	return -ENOMEM;
+ }
+--- linux-2.6.0/drivers/net/jazzsonic.c	2003-06-14 12:18:06.000000000 -0700
++++ 25/drivers/net/jazzsonic.c	2003-12-28 23:21:01.000000000 -0800
+@@ -80,7 +80,6 @@ static unsigned short known_revisions[] 
+ 
+ /* Index to functions, as function prototypes. */
+ 
+-extern int sonic_probe(struct net_device *dev);
+ static int sonic_probe1(struct net_device *dev, unsigned int base_addr,
+                         unsigned int irq);
+ 
+@@ -89,29 +88,57 @@ static int sonic_probe1(struct net_devic
+  * Probe for a SONIC ethernet controller on a Mips Jazz board.
+  * Actually probing is superfluous but we're paranoid.
+  */
+-int __init sonic_probe(struct net_device *dev)
++struct net_device * __init sonic_probe(int unit)
+ {
+-	unsigned int base_addr = dev ? dev->base_addr : 0;
++	struct net_device *dev;
++	struct sonic_local *lp;
++	unsigned int base_addr;
++	int err = 0;
+ 	int i;
+ 
+ 	/*
+ 	 * Don't probe if we're not running on a Jazz board.
+ 	 */
+ 	if (mips_machgroup != MACH_GROUP_JAZZ)
+-		return -ENODEV;
+-	if (base_addr >= KSEG0)	/* Check a single specified location. */
+-		return sonic_probe1(dev, base_addr, dev->irq);
+-	else if (base_addr != 0)	/* Don't probe at all. */
+-		return -ENXIO;
+-
+-	for (i = 0; sonic_portlist[i].port; i++) {
+-		int base_addr = sonic_portlist[i].port;
+-		if (check_region(base_addr, 0x100))
+-			continue;
+-		if (sonic_probe1(dev, base_addr, sonic_portlist[i].irq) == 0)
+-			return 0;
++		return ERR_PTR(-ENODEV);
++
++	dev = alloc_etherdev(0);
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	sprintf(dev->name, "eth%d", unit);
++	netdev_boot_setup_check(dev);
++	base_addr = dev->base_addr;
++
++	if (base_addr >= KSEG0)	{ /* Check a single specified location. */
++		err = sonic_probe1(dev, base_addr, dev->irq);
++	} else if (base_addr != 0) { /* Don't probe at all. */
++		err = -ENXIO;
++	} else {
++		for (i = 0; sonic_portlist[i].port; i++) {
++			int io = sonic_portlist[i].port;
++			if (sonic_probe1(dev, io, sonic_portlist[i].irq) == 0)
++				break;
++		}
++		if (!sonic_portlist[i].port)
++			err = -ENODEV;
+ 	}
+-	return -ENODEV;
++	if (err)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	lp = dev->priv;
++	vdma_free(lp->rba_laddr);
++	kfree(lp->rba);
++	vdma_free(lp->cda_laddr);
++	kfree(lp);
++	release_region(dev->base_addr, 0x100);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
+ static int __init sonic_probe1(struct net_device *dev, unsigned int base_addr,
+@@ -121,8 +148,11 @@ static int __init sonic_probe1(struct ne
+ 	unsigned int silicon_revision;
+ 	unsigned int val;
+ 	struct sonic_local *lp;
++	int err = -ENODEV;
+ 	int i;
+ 
++	if (!request_region(base_addr, 0x100, dev->name))
++		return -EBUSY;
+ 	/*
+ 	 * get the Silicon Revision ID. If this is one of the known
+ 	 * one assume that we found a SONIC ethernet controller at
+@@ -140,12 +170,9 @@ static int __init sonic_probe1(struct ne
+ 	if (known_revisions[i] == 0xffff) {
+ 		printk("SONIC ethernet controller not found (0x%4x)\n",
+ 		       silicon_revision);
+-		return -ENODEV;
++		goto out;
+ 	}
+     
+-	if (!request_region(base_addr, 0x100, dev->name))
+-		return -EBUSY;
+-
+ 	if (sonic_debug  &&  version_printed++ == 0)
+ 		printk(version);
+ 
+@@ -175,6 +202,8 @@ static int __init sonic_probe1(struct ne
+ 	}
+ 
+ 	printk(" IRQ %d\n", irq);
++
++	err = -ENOMEM;
+     
+ 	/* Initialize the device structure. */
+ 	if (dev->priv == NULL) {
+@@ -196,7 +225,7 @@ static int __init sonic_probe1(struct ne
+ 		if (lp == NULL) {
+ 			printk("%s: couldn't allocate memory for descriptors\n",
+ 			       dev->name);
+-			return -ENOMEM;
++			goto out;
+ 		}
+ 
+ 		memset(lp, 0, sizeof(struct sonic_local));
+@@ -206,7 +235,7 @@ static int __init sonic_probe1(struct ne
+ 		if (lp->cda_laddr == ~0UL) {
+ 			printk("%s: couldn't get DMA page entry for "
+ 			       "descriptors\n", dev->name);
+-			return -ENOMEM;
++			goto out1;
+ 		}
+ 
+ 		lp->tda_laddr = lp->cda_laddr + sizeof (lp->cda);
+@@ -219,7 +248,7 @@ static int __init sonic_probe1(struct ne
+ 		if (!lp->rba) {
+ 			printk("%s: couldn't allocate receive buffers\n",
+ 			       dev->name);
+-			return -ENOMEM;
++			goto out2;
+ 		}
+ 
+ 		/* get virtual dma address */
+@@ -228,7 +257,7 @@ static int __init sonic_probe1(struct ne
+ 		if (lp->rba_laddr == ~0UL) {
+ 			printk("%s: couldn't get DMA page entry for receive "
+ 			       "buffers\n",dev->name);
+-			return -ENOMEM;
++			goto out3;
+ 		}
+ 
+ 		/* now convert pointer to KSEG1 pointer */
+@@ -252,9 +281,16 @@ static int __init sonic_probe1(struct ne
+ 	SONIC_WRITE(SONIC_FAET,0xffff);
+ 	SONIC_WRITE(SONIC_MPT,0xffff);
+ 
+-	/* Fill in the fields of the device structure with ethernet values. */
+-	ether_setup(dev);
+ 	return 0;
++out3:
++	kfree(lp->rba);
++out2:
++	vdma_free(lp->cda_laddr);
++out1:
++	kfree(lp);
++out:
++	release_region(base_addr, 0x100);
++	return err;
+ }
+ 
+ /*
+--- linux-2.6.0/drivers/net/Kconfig	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/net/Kconfig	2003-12-28 23:21:01.000000000 -0800
+@@ -657,7 +657,7 @@ config ELMC
+ 
+ config ELMC_II
+ 	tristate "3c527 \"EtherLink/MC 32\" support (EXPERIMENTAL)"
+-	depends on NET_VENDOR_3COM && MCA && EXPERIMENTAL && BROKEN_ON_SMP
++	depends on NET_VENDOR_3COM && MCA && MCA_LEGACY
+ 	help
+ 	  If you have a network (Ethernet) card of this type, say Y and read
+ 	  the Ethernet-HOWTO, available from
+@@ -1283,6 +1283,19 @@ config B44
+ 	  <file:Documentation/networking/net-modules.txt>.  The module will be
+ 	  called b44.
+ 
++config FORCEDETH
++	tristate "Reverse Engineered nForce Ethernet support (EXPERIMENTAL)"
++	depends on NET_PCI && PCI && EXPERIMENTAL
++	help
++	  If you have a network (Ethernet) controller of this type, say Y and
++	  read the Ethernet-HOWTO, available from
++	  <http://www.tldp.org/docs.html#howto>.
++
++	  To compile this driver as a module, choose M here and read
++	  <file:Documentation/networking/net-modules.txt>.  The module will be
++	  called forcedeth.
++
++
+ config CS89x0
+ 	tristate "CS89x0 support"
+ 	depends on NET_PCI && ISA
+@@ -1341,8 +1354,9 @@ config EEPRO100_PIO
+ 	  say N.
+ 
+ config E100
+-	tristate "EtherExpressPro/100 support (e100, Alternate Intel driver)"
++	tristate "Intel(R) PRO/100+ support"
+ 	depends on NET_PCI && PCI
++	select MII
+ 	---help---
+ 	  This driver supports Intel(R) PRO/100 family of adapters, which 
+ 	  includes:
+@@ -1415,6 +1429,10 @@ config E100
+ 	  <file:Documentation/networking/net-modules.txt>.  The module
+ 	  will be called e100.
+ 
++config E100_NAPI
++	bool "Use Rx Polling (NAPI)"
++	depends on E100
++
+ config LNE390
+ 	tristate "Mylex EISA LNE390A/B support (EXPERIMENTAL)"
+ 	depends on NET_PCI && EISA && EXPERIMENTAL
+@@ -1564,6 +1582,24 @@ config 8139_OLD_RX_RESET
+ 	  experience problems, you can enable this option to restore the
+ 	  old RX-reset behavior.  If unsure, say N.
+ 
++config 8139_RXBUF_IDX
++	int "Receive ring size (0 => 8K, 1 => 16K, 2 => 32K, 3 => 64K)"
++	depends on 8139TOO
++	range 0 3
++	default 1 if EMBEDDED || SH_DREAMCAST
++	default 2
++	help
++	   The 8139too driver has a fixed area of memory for receiving data.
++	   The default value is adequate for most systems. The 64KB 
++	   ring size has hardware issues that may cause problems.
++	   Values:
++		0  => 8 KB 
++		1  => 16 KB embedded systems
++		2  => 32 KB default for most systems
++		3  => 64 KB 
++	   If unsure, use the default 2.
++
++
+ config SIS900
+ 	tristate "SiS 900/7016 PCI Fast Ethernet Adapter support"
+ 	depends on NET_PCI && PCI
+@@ -1957,9 +1993,11 @@ config SK98LIN
+ 	    - EG1032 v2 Instant Gigabit Network Adapter
+ 	    - EG1064 v2 Instant Gigabit Network Adapter
+ 	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Abit)
++	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Albatron)
+ 	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Asus)
+ 	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (ECS)
+ 	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Epox)
++	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Foxconn)
+ 	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Gigabyte)
+ 	    - Marvell 88E8001 Gigabit LOM Ethernet Adapter (Iwill)
+ 	    - Marvell RDK-8001 Adapter
+@@ -2005,8 +2043,10 @@ config SK98LIN
+ 	  Questions concerning this driver may be addressed to:
+ 	      linux@syskonnect.de
+ 	  
+-	  To compile this driver as a module, choose M here: the module
+-	  will be called sk98lin.  This is recommended.
++	  If you want to compile this driver as a module ( = code which can be
++	  inserted in and removed from the running kernel whenever you want),
++	  say M here and read Documentation/modules.txt. This is recommended.
++	  The module will be called sk98lin. This is recommended.
+ 
+ config TIGON3
+ 	tristate "Broadcom Tigon3 support"
+@@ -2441,6 +2481,13 @@ config SHAPER
+ 	  To compile this driver as a module, choose M here: the module
+ 	  will be called shaper.  If unsure, say N.
+ 
++config NETCONSOLE
++	tristate "Network console logging support (EXPERIMENTAL)"
++	depends on NETDEVICES && EXPERIMENTAL
++	---help---
++	If you want to log kernel messages over the network, enable this.
++	See Documentation/networking/netconsole.txt for details.
++
+ source "drivers/net/wan/Kconfig"
+ 
+ source "drivers/net/pcmcia/Kconfig"
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/net/kgdb_eth.c	2003-12-28 23:21:09.000000000 -0800
+@@ -0,0 +1,131 @@
++/*
++ * Network interface GDB stub
++ *
++ * Written by San Mehat (nettwerk@biodome.org)
++ * Based upon 'gdbserial' by David Grothe (dave@gcom.com)
++ * and Scott Foehner (sfoehner@engr.sgi.com)
++ *
++ * Twiddled for 2.6 by Robert Walsh <rjwalsh@durables.org>
++ * and wangdi <wangdi@clusterfs.com>.
++ *
++ * Refactored for netpoll API by Matt Mackall <mpm@selenic.com>
++ *
++ */
++
++#include <linux/sched.h>
++#include <linux/interrupt.h>
++#include <linux/config.h>
++#include <linux/string.h>
++#include <linux/netpoll.h>
++
++#include <asm/system.h>
++#include <asm/kgdb.h>
++#include <asm/io.h>
++#include <asm/bitops.h>
++#include <asm/system.h>
++#include <asm/irq.h>
++#include <asm/atomic.h>
++
++#define IN_BUF_SIZE 512 /* power of 2, please */
++#define OUT_BUF_SIZE 256
++
++static char in_buf[IN_BUF_SIZE], out_buf[OUT_BUF_SIZE];
++static int in_head, in_tail, out_count;
++static atomic_t in_count;
++int kgdboe = 0; /* Default to tty mode */
++
++extern void set_debug_traps(void);
++extern void breakpoint(void);
++static void rx_hook(struct netpoll *np, int port, char *msg, int len);
++
++static struct netpoll np = {
++	.name = "kgdboe",
++	.dev_name = "eth0",
++	.rx_hook = rx_hook,
++	.local_port = 6443,
++	.remote_port = 6442,
++	.remote_mac = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
++};
++
++int eth_getDebugChar(void)
++{
++	int chr;
++
++	while (atomic_read(&in_count) == 0)
++		netpoll_poll(&np);
++
++	chr = in_buf[in_tail++];
++	in_tail &= (IN_BUF_SIZE - 1);
++	atomic_dec(&in_count);
++	return chr;
++}
++
++void eth_flushDebugChar(void)
++{
++	if(out_count && np.dev) {
++		netpoll_send_udp(&np, out_buf, out_count);
++		out_count = 0;
++	}
++}
++
++void eth_putDebugChar(int chr)
++{
++	out_buf[out_count++] = chr;
++	if(out_count == OUT_BUF_SIZE)
++		eth_flushDebugChar();
++}
++
++static void rx_hook(struct netpoll *np, int port, char *msg, int len)
++{
++	int i;
++
++	np->remote_port = port;
++
++	/* Is this gdb trying to attach? */
++	if (!netpoll_trap() && len == 8 && !strncmp(msg, "$Hc-1#09", 8))
++		kgdb_schedule_breakpoint();
++
++	for (i = 0; i < len; i++) {
++		if (msg[i] == 3)
++			kgdb_schedule_breakpoint();
++
++		if (atomic_read(&in_count) >= IN_BUF_SIZE) {
++			/* buffer overflow, clear it */
++			in_head = in_tail = 0;
++			atomic_set(&in_count, 0);
++			break;
++		}
++		in_buf[in_head++] = msg[i];
++		in_head &= (IN_BUF_SIZE - 1);
++		atomic_inc(&in_count);
++	}
++}
++
++static int option_setup(char *opt)
++{
++	return netpoll_parse_options(&np, opt);
++}
++
++__setup("kgdboe=", option_setup);
++
++static int init_kgdboe(void)
++{
++#ifdef CONFIG_SMP
++	if (num_online_cpus() > CONFIG_NO_KGDB_CPUS) {
++		printk("kgdb: too manu cpus. Cannot enable debugger with more than %d cpus\n", CONFIG_NO_KGDB_CPUS);
++		return -1;
++	}
++#endif
++
++	set_debug_traps();
++
++	if(!np.remote_ip || netpoll_setup(&np))
++		return 1;
++
++	kgdboe = 1;
++	printk(KERN_INFO "kgdb: debugging over ethernet enabled\n");
++
++	return 0;
++}
++
++module_init(init_kgdboe);
+--- linux-2.6.0/drivers/net/lance.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/lance.c	2003-12-28 23:21:01.000000000 -0800
+@@ -59,8 +59,8 @@ static const char version[] = "lance.c:v
+ #include <asm/dma.h>
+ 
+ static unsigned int lance_portlist[] __initdata = { 0x300, 0x320, 0x340, 0x360, 0};
+-int lance_probe(struct net_device *dev);
+ static int lance_probe1(struct net_device *dev, int ioaddr, int irq, int options);
++static int __init do_lance_probe(struct net_device *dev);
+ 
+ #ifdef LANCE_DEBUG
+ static int lance_debug = LANCE_DEBUG;
+@@ -274,7 +274,6 @@ enum {OLD_LANCE = 0, PCNET_ISA=1, PCNET_
+ static unsigned char lance_need_isa_bounce_buffers = 1;
+ 
+ static int lance_open(struct net_device *dev);
+-static int lance_open_fail(struct net_device *dev);
+ static void lance_init_ring(struct net_device *dev, int mode);
+ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev);
+ static int lance_rx(struct net_device *dev);
+@@ -286,10 +285,21 @@ static void lance_tx_timeout (struct net
+ 
+ 
+ 
++static void cleanup_card(struct net_device *dev)
++{
++	struct lance_private *lp = dev->priv;
++	if (dev->dma != 4)
++		free_dma(dev->dma);
++	release_region(dev->base_addr, LANCE_TOTAL_SIZE);
++	kfree(lp->tx_bounce_buffs);
++	kfree((void*)lp->rx_buffs);
++	kfree(lp);
++}
++
+ #ifdef MODULE
+ #define MAX_CARDS		8	/* Max number of interfaces (cards) per module */
+ 
+-static struct net_device dev_lance[MAX_CARDS];
++static struct net_device *dev_lance[MAX_CARDS];
+ static int io[MAX_CARDS];
+ static int dma[MAX_CARDS];
+ static int irq[MAX_CARDS];
+@@ -305,28 +315,35 @@ MODULE_PARM_DESC(lance_debug, "LANCE/PCn
+ 
+ int init_module(void)
+ {
++	struct net_device *dev;
+ 	int this_dev, found = 0;
+ 
+ 	for (this_dev = 0; this_dev < MAX_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_lance[this_dev];
+-		dev->irq = irq[this_dev];
+-		dev->base_addr = io[this_dev];
+-		dev->dma = dma[this_dev];
+-		dev->init = lance_probe;
+ 		if (io[this_dev] == 0)  {
+-			if (this_dev != 0) break; /* only complain once */
++			if (this_dev != 0) /* only complain once */
++				break;
+ 			printk(KERN_NOTICE "lance.c: Module autoprobing not allowed. Append \"io=0xNNN\" value(s).\n");
+ 			return -EPERM;
+ 		}
+-		if (register_netdev(dev) != 0) {
+-			printk(KERN_WARNING "lance.c: No PCnet/LANCE card found (i/o = 0x%x).\n", io[this_dev]);
+-			if (found != 0) return 0;	/* Got at least one. */
+-			return -ENXIO;
++		dev = alloc_etherdev(0);
++		if (!dev)
++			break;
++		dev->irq = irq[this_dev];
++		dev->base_addr = io[this_dev];
++		dev->dma = dma[this_dev];
++		if (do_lance_probe(dev) == 0) {
++			if (register_netdev(dev) == 0) {
++				dev_lance[found++] = dev;
++				continue;
++			}
++			cleanup_card(dev);
+ 		}
+-		found++;
++		free_netdev(dev);
++		break;
+ 	}
+-
+-	return 0;
++	if (found != 0)
++		return 0;
++	return -ENXIO;
+ }
+ 
+ void cleanup_module(void)
+@@ -334,13 +351,11 @@ void cleanup_module(void)
+ 	int this_dev;
+ 
+ 	for (this_dev = 0; this_dev < MAX_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_lance[this_dev];
+-		if (dev->priv != NULL) {
++		struct net_device *dev = dev_lance[this_dev];
++		if (dev) {
+ 			unregister_netdev(dev);	
+-			free_dma(dev->dma);
+-			release_region(dev->base_addr, LANCE_TOTAL_SIZE);
+-			kfree(dev->priv);
+-			dev->priv = NULL;
++			cleanup_card(dev);
++			free_netdev(dev);
+ 		}
+ 	}
+ }
+@@ -352,7 +367,7 @@ MODULE_LICENSE("GPL");
+    board probes now that kmalloc() can allocate ISA DMA-able regions.
+    This also allows the LANCE driver to be used as a module.
+    */
+-int __init lance_probe(struct net_device *dev)
++static int __init do_lance_probe(struct net_device *dev)
+ {
+ 	int *port, result;
+ 
+@@ -387,6 +402,31 @@ int __init lance_probe(struct net_device
+ 	return -ENODEV;
+ }
+ 
++struct net_device * __init lance_probe(int unit)
++{
++	struct net_device *dev = alloc_etherdev(0);
++	int err;
++
++	if (!dev)
++		return ERR_PTR(-ENODEV);
++
++	sprintf(dev->name, "eth%d", unit);
++	netdev_boot_setup_check(dev);
++
++	err = do_lance_probe(dev);
++	if (err)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	cleanup_card(dev);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
++}
++
+ static int __init lance_probe1(struct net_device *dev, int ioaddr, int irq, int options)
+ {
+ 	struct lance_private *lp;
+@@ -398,6 +438,7 @@ static int __init lance_probe1(struct ne
+ 	int hp_builtin = 0;			/* HP on-board ethernet. */
+ 	static int did_version;			/* Already printed version info. */
+ 	unsigned long flags;
++	int err = -ENOMEM;
+ 
+ 	/* First we look for special cases.
+ 	   Check for HP's on-board ethernet by looking for 'HP' in the BIOS.
+@@ -432,7 +473,7 @@ static int __init lance_probe1(struct ne
+ 	outw(88, ioaddr+LANCE_ADDR);
+ 	if (inw(ioaddr+LANCE_ADDR) != 88) {
+ 		lance_version = 0;
+-	} else {							/* Good, it's a newer chip. */
++	} else {			/* Good, it's a newer chip. */
+ 		int chip_version = inw(ioaddr+LANCE_DATA);
+ 		outw(89, ioaddr+LANCE_ADDR);
+ 		chip_version |= inw(ioaddr+LANCE_DATA) << 16;
+@@ -447,13 +488,9 @@ static int __init lance_probe1(struct ne
+ 		}
+ 	}
+ 
+-	/* We can't use init_etherdev() to allocate dev->priv because it must
++	/* We can't allocate dev->priv from alloc_etherdev() because it must
+ 	   a ISA DMA-able region. */
+-	dev = init_etherdev(dev, 0);
+-	if (!dev)
+-		return -ENOMEM;
+ 	SET_MODULE_OWNER(dev);
+-	dev->open = lance_open_fail;
+ 	chipname = chip_table[lance_version].name;
+ 	printk("%s: %s at %#3x,", dev->name, chipname, ioaddr);
+ 
+@@ -465,8 +502,7 @@ static int __init lance_probe1(struct ne
+ 	dev->base_addr = ioaddr;
+ 	/* Make certain the data structures used by the LANCE are aligned and DMAble. */
+ 		
+-	lp = (struct lance_private *)(((unsigned long)kmalloc(sizeof(*lp)+7,
+-					   GFP_DMA | GFP_KERNEL)+7) & ~7);
++	lp = kmalloc(sizeof(*lp), GFP_DMA | GFP_KERNEL);
+ 	if(lp==NULL)
+ 		return -ENODEV;
+ 	if (lance_debug > 6) printk(" (#0x%05lx)", (unsigned long)lp);
+@@ -486,7 +522,7 @@ static int __init lance_probe1(struct ne
+ 		lp->tx_bounce_buffs = NULL;
+ 
+ 	lp->chip_version = lance_version;
+-	lp->devlock = SPIN_LOCK_UNLOCKED;
++	spin_lock_init(&lp->devlock);
+ 
+ 	lp->init_block.mode = 0x0003;		/* Disable Rx and Tx. */
+ 	for (i = 0; i < 6; i++)
+@@ -540,6 +576,7 @@ static int __init lance_probe1(struct ne
+ 		dma_channels = ((inb(DMA1_STAT_REG) >> 4) & 0x0f) |
+ 			(inb(DMA2_STAT_REG) & 0xf0);
+ 	}
++	err = -ENODEV;
+ 	if (dev->irq >= 2)
+ 		printk(" assigned IRQ %d", dev->irq);
+ 	else if (lance_version != 0)  {	/* 7990 boards need DMA detection first. */
+@@ -559,7 +596,7 @@ static int __init lance_probe1(struct ne
+ 			printk(", probed IRQ %d", dev->irq);
+ 		else {
+ 			printk(", failed to detect IRQ line.\n");
+-			return -ENODEV;
++			goto out_tx;
+ 		}
+ 
+ 		/* Check for the initialization done bit, 0x0100, which means
+@@ -573,7 +610,7 @@ static int __init lance_probe1(struct ne
+ 	} else if (dev->dma) {
+ 		if (request_dma(dev->dma, chipname)) {
+ 			printk("DMA %d allocation failed.\n", dev->dma);
+-			return -ENODEV;
++			goto out_tx;
+ 		} else
+ 			printk(", assigned DMA %d.\n", dev->dma);
+ 	} else {			/* OK, we have to auto-DMA. */
+@@ -613,7 +650,7 @@ static int __init lance_probe1(struct ne
+ 		}
+ 		if (i == 4) {			/* Failure: bail. */
+ 			printk("DMA detection failed.\n");
+-			return -ENODEV;
++			goto out_tx;
+ 		}
+ 	}
+ 
+@@ -629,7 +666,7 @@ static int __init lance_probe1(struct ne
+ 		dev->irq = probe_irq_off(irq_mask);
+ 		if (dev->irq == 0) {
+ 			printk("  Failed to detect the 7990 IRQ line.\n");
+-			return -ENODEV;
++			goto out_dma;
+ 		}
+ 		printk("  Auto-IRQ detected IRQ%d.\n", dev->irq);
+ 	}
+@@ -655,18 +692,18 @@ static int __init lance_probe1(struct ne
+ 	dev->watchdog_timeo = TX_TIMEOUT;
+ 
+ 	return 0;
+-out_rx:	kfree((void*)lp->rx_buffs);
+-out_lp:	kfree(lp);
+-	return -ENOMEM;
+-}
+-
+-static int
+-lance_open_fail(struct net_device *dev)
+-{
+-	return -ENODEV;
++out_dma:
++	if (dev->dma != 4)
++		free_dma(dev->dma);
++out_tx:
++	kfree(lp->tx_bounce_buffs);
++out_rx:
++	kfree((void*)lp->rx_buffs);
++out_lp:
++	kfree(lp);
++	return err;
+ }
+ 
+-
+ 
+ static int
+ lance_open(struct net_device *dev)
+--- linux-2.6.0/drivers/net/lasi_82596.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/lasi_82596.c	2003-12-28 23:21:01.000000000 -0800
+@@ -1149,12 +1149,11 @@ static void print_eth(unsigned char *add
+ 
+ #define LAN_PROM_ADDR	0xF0810000
+ 
+-static int __devinit i82596_probe(struct net_device *dev)
++static int __devinit i82596_probe(struct net_device *dev,
++				  struct device *gen_dev)
+ {
+ 	int i;
+ 	struct i596_private *lp;
+-	/* we're going to overwrite dev->priv, so pull the device out */
+-	struct device *gen_dev = dev->priv;
+ 	char eth_addr[6];
+ 	dma_addr_t dma_addr;
+ 
+@@ -1204,7 +1203,6 @@ static int __devinit i82596_probe(struct
+ 		return -ENOMEM;
+ 	}
+ 
+-	ether_setup(dev);
+ 	DEB(DEB_PROBE,printk("%s: 82596 at %#3lx,", dev->name, dev->base_addr));
+ 
+ 	for (i = 0; i < 6; i++)
+@@ -1537,12 +1535,19 @@ lan_init_chip(struct parisc_device *dev)
+ 
+ 	netdevice->base_addr = dev->hpa;
+ 	netdevice->irq = dev->irq;
+-	netdevice->init = i82596_probe;
+-	netdevice->priv = &dev->dev;
++
++	retval = i82596_probe(netdevice, &dev->dev);
++	if (retval) {
++		free_netdev(netdevice);
++		return -ENODEV;
++	}
+ 
+ 	retval = register_netdev(netdevice);
+ 	if (retval) {
++		struct i596_private *lp = netdevice->priv;
+ 		printk(KERN_WARNING __FILE__ ": register_netdevice ret'd %d\n", retval);
++		dma_free_noncoherent(lp->dev, sizeof(struct i596_private), 
++				    (void *)netdevice->mem_start, lp->dma_addr);
+ 		free_netdev(netdevice);
+ 		return -ENODEV;
+ 	};
+--- linux-2.6.0/drivers/net/lne390.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/lne390.c	2003-12-28 23:21:01.000000000 -0800
+@@ -49,7 +49,6 @@ static const char *version =
+ 
+ #include "8390.h"
+ 
+-int lne390_probe(struct net_device *dev);
+ static int lne390_probe1(struct net_device *dev, int ioaddr);
+ 
+ static int lne390_open(struct net_device *dev);
+@@ -103,9 +102,11 @@ static unsigned int shmem_mapB[] __initd
+  *	PROM for a match against the value assigned to Mylex.
+  */
+ 
+-int __init lne390_probe(struct net_device *dev)
++static int __init do_lne390_probe(struct net_device *dev)
+ {
+ 	unsigned short ioaddr = dev->base_addr;
++	int irq = dev->irq;
++	int mem_start = dev->mem_start;
+ 	int ret;
+ 
+ 	SET_MODULE_OWNER(dev);
+@@ -135,11 +136,46 @@ int __init lne390_probe(struct net_devic
+ 		if (lne390_probe1(dev, ioaddr) == 0)
+ 			return 0;
+ 		release_region(ioaddr, LNE390_IO_EXTENT);
++		dev->irq = irq;
++		dev->mem_start = mem_start;
+ 	}
+ 
+ 	return -ENODEV;
+ }
+ 
++static void cleanup_card(struct net_device *dev)
++{
++	free_irq(dev->irq, dev);
++	release_region(dev->base_addr, LNE390_IO_EXTENT);
++	if (ei_status.reg0)
++		iounmap((void *)dev->mem_start);
++}
++
++struct net_device * __init lne390_probe(int unit)
++{
++	struct net_device *dev = alloc_ei_netdev();
++	int err;
++
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	sprintf(dev->name, "eth%d", unit);
++	netdev_boot_setup_check(dev);
++
++	err = do_lne390_probe(dev);
++	if (err)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	cleanup_card(dev);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
++}
++
+ static int __init lne390_probe1(struct net_device *dev, int ioaddr)
+ {
+ 	int i, revision, ret;
+@@ -174,11 +210,6 @@ static int __init lne390_probe1(struct n
+ 		return -ENODEV;
+ 	}
+ #endif
+-	/* Allocate dev->priv and fill in 8390 specific dev fields. */
+-	if (ethdev_init(dev)) {
+-		printk ("lne390.c: unable to allocate memory for dev->priv!\n");
+-		return -ENOMEM;
+-	}
+ 
+ 	printk("lne390.c: LNE390%X in EISA slot %d, address", 0xa+revision, ioaddr/0x1000);
+ 	for(i = 0; i < ETHER_ADDR_LEN; i++)
+@@ -199,8 +230,6 @@ static int __init lne390_probe1(struct n
+ 
+ 	if ((ret = request_irq(dev->irq, ei_interrupt, 0, dev->name, dev))) {
+ 		printk (" unable to get IRQ %d.\n", dev->irq);
+-		kfree(dev->priv);
+-		dev->priv = NULL;
+ 		return ret;
+ 	}
+ 
+@@ -274,8 +303,6 @@ static int __init lne390_probe1(struct n
+ 	return 0;
+ cleanup:
+ 	free_irq(dev->irq, dev);
+-	kfree(dev->priv);
+-	dev->priv = NULL;
+ 	return ret;
+ }
+ 
+@@ -373,7 +400,7 @@ static int lne390_close(struct net_devic
+ 
+ #ifdef MODULE
+ #define MAX_LNE_CARDS	4	/* Max number of LNE390 cards per module */
+-static struct net_device dev_lne[MAX_LNE_CARDS];
++static struct net_device *dev_lne[MAX_LNE_CARDS];
+ static int io[MAX_LNE_CARDS];
+ static int irq[MAX_LNE_CARDS];
+ static int mem[MAX_LNE_CARDS];
+@@ -389,26 +416,32 @@ MODULE_LICENSE("GPL");
+ 
+ int init_module(void)
+ {
++	struct net_device *dev;
+ 	int this_dev, found = 0;
+ 
+ 	for (this_dev = 0; this_dev < MAX_LNE_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_lne[this_dev];
++		if (io[this_dev] == 0 && this_dev != 0)
++			break;
++		dev = alloc_ei_netdev();
++		if (!dev)
++			break;
+ 		dev->irq = irq[this_dev];
+ 		dev->base_addr = io[this_dev];
+ 		dev->mem_start = mem[this_dev];
+-		dev->init = lne390_probe;
+-		/* Default is to only install one card. */
+-		if (io[this_dev] == 0 && this_dev != 0) break;
+-		if (register_netdev(dev) != 0) {
+-			printk(KERN_WARNING "lne390.c: No LNE390 card found (i/o = 0x%x).\n", io[this_dev]);
+-			if (found != 0) {	/* Got at least one. */
+-				return 0;
++		if (do_lne390_probe(dev) == 0) {
++			if (register_netdev(dev) == 0) {
++				dev_lne[found++] = dev;
++				continue;
+ 			}
+-			return -ENXIO;
++			cleanup_card(dev);
+ 		}
+-		found++;
+-	}
+-	return 0;
++		free_netdev(dev);
++		printk(KERN_WARNING "lne390.c: No LNE390 card found (i/o = 0x%x).\n", io[this_dev]);
++		break;
++	}
++	if (found)
++		return 0;
++	return -ENXIO;
+ }
+ 
+ void cleanup_module(void)
+@@ -416,15 +449,11 @@ void cleanup_module(void)
+ 	int this_dev;
+ 
+ 	for (this_dev = 0; this_dev < MAX_LNE_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_lne[this_dev];
+-		if (dev->priv != NULL) {
+-			void *priv = dev->priv;
+-			free_irq(dev->irq, dev);
+-			release_region(dev->base_addr, LNE390_IO_EXTENT);
+-			if (ei_status.reg0)
+-				iounmap((void *)dev->mem_start);
++		struct net_device *dev = dev_lne[this_dev];
++		if (dev) {
+ 			unregister_netdev(dev);
+-			kfree(priv);
++			cleanup_card(dev);
++			free_netdev(dev);
+ 		}
+ 	}
+ }
+--- linux-2.6.0/drivers/net/lp486e.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/lp486e.c	2003-12-28 23:21:01.000000000 -0800
+@@ -1314,18 +1314,23 @@ static int io = IOADDR;
+ static int irq = IRQ;
+ 
+ static int __init lp486e_init_module(void) {
+-	struct net_device *dev;
+-
+-	dev = alloc_etherdev(sizeof(struct i596_private));
++	int err;
++	struct net_device *dev = alloc_etherdev(sizeof(struct i596_private));
+ 	if (!dev)
+ 		return -ENOMEM;
+ 
+ 	dev->irq = irq;
+ 	dev->base_addr = io;
+-	dev->init = lp486e_probe;
+-	if (register_netdev(dev) != 0) {
++	err = lp486e_probe(dev);
++	if (err) {
++		free_netdev(dev);
++		return err;
++	}
++	err = register_netdev(dev);
++	if (err) {
++		release_region(dev->base_addr, LP486E_TOTAL_SIZE);
+ 		free_netdev(dev);
+-		return -EIO;
++		return err;
+ 	}
+ 	dev_lp486e = dev;
+ 	full_duplex = 0;
+--- linux-2.6.0/drivers/net/mac8390.c	2003-10-08 15:07:09.000000000 -0700
++++ 25/drivers/net/mac8390.c	2003-12-28 23:21:01.000000000 -0800
+@@ -124,11 +124,10 @@ static int useresources[] = {
+ static char version[] __initdata =
+ 	"mac8390.c: v0.4 2001-05-15 David Huggins-Daines <dhd@debian.org> and others\n";
+ 		
+-extern int mac8390_probe(struct net_device * dev);
+ extern enum mac8390_type mac8390_ident(struct nubus_dev * dev);
+ extern int mac8390_memsize(unsigned long membase);
+ extern int mac8390_memtest(struct net_device * dev);
+-extern int mac8390_initdev(struct net_device * dev, struct nubus_dev * ndev,
++static int mac8390_initdev(struct net_device * dev, struct nubus_dev * ndev,
+ 			   enum mac8390_type type);
+ 
+ static int mac8390_open(struct net_device * dev);
+@@ -223,43 +222,43 @@ int __init mac8390_memsize(unsigned long
+  	return i * 0x1000;
+ }
+ 
+-static int probed __initdata = 0;
+-
+-int __init mac8390_probe(struct net_device * dev)
++struct net_device * __init mac8390_probe(int unit)
+ {
++	struct net_device *dev;
+ 	volatile unsigned short *i;
+-	int boards_found = 0;
+ 	int version_disp = 0;
+ 	struct nubus_dev * ndev = NULL;
++	int err = -ENODEV;
+ 	
+ 	struct nubus_dir dir;
+ 	struct nubus_dirent ent;
+ 	int offset;
++	static unsigned int slots;
+ 
+ 	enum mac8390_type cardtype;
+ 
+-	if (probed)
+-		return -ENODEV;
+-	probed++;
+-
+ 	/* probably should check for Nubus instead */
+ 
+ 	if (!MACH_IS_MAC)
+-		return -ENODEV;
++		return ERR_PTR(-ENODEV);
++
++	dev = alloc_ei_netdev();
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	if (unit >= 0)
++		sprintf(dev->name, "eth%d", unit);
++
++ 	SET_MODULE_OWNER(dev);
+ 
+ 	while ((ndev = nubus_find_type(NUBUS_CAT_NETWORK, NUBUS_TYPE_ETHERNET, ndev))) {
+-		
+-		dev = NULL;
+-		
+-		if ((cardtype = mac8390_ident(ndev)) == MAC8390_NONE)
++		/* Have we seen it already? */
++		if (slots & (1<<ndev->board->slot))
+ 			continue;
++		slots |= 1<<ndev->board->slot;
+ 
+-		dev = init_etherdev(dev, 0);
+-		if (dev == NULL) {
+-			printk(KERN_ERR "Unable to allocate etherdev"
+-					"structure!\n");
+-			return -ENOMEM;
+-		}
++		if ((cardtype = mac8390_ident(ndev)) == MAC8390_NONE)
++			continue;
+ 
+ 		if (version_disp == 0) {
+ 			version_disp = 1;
+@@ -358,21 +357,25 @@ int __init mac8390_probe(struct net_devi
+ 					printk(KERN_ERR "Card type %s is"
+ 							" unsupported, sorry\n",
+ 					       cardname[cardtype]);
+-					return -ENODEV;
++					continue;
+ 			}
+ 		}
+ 
+ 		/* Do the nasty 8390 stuff */
+-		if (mac8390_initdev(dev, ndev, cardtype))
+-			continue;
+-		boards_found++;
++		if (!mac8390_initdev(dev, ndev, cardtype))
++			break;
+ 	}
+ 
+-	/* We're outta here */
+-	if (boards_found > 0)
+-		return 0;
+-	else
+-		return -ENODEV;
++	if (!ndev)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out;
++	return dev;
++
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
+ #ifdef MODULE
+@@ -380,26 +383,39 @@ MODULE_AUTHOR("David Huggins-Daines <dhd
+ MODULE_DESCRIPTION("Macintosh NS8390-based Nubus Ethernet driver");
+ MODULE_LICENSE("GPL");
+ 
++/* overkill, of course */
++static struct net_device *dev_mac8390[15];
+ int init_module(void)
+ {
+-	if (mac8390_probe(NULL)) {
++	int i;
++	for (i = 0; i < 15; i++) {
++		struct net_device *dev = mac8390_probe(-1);
++		if (IS_ERR(dev))
++			break;
++		dev_mac890[i] = dev;
++	}
++	if (!i) {
+ 		printk(KERN_NOTICE "mac8390.c: No useable cards found, driver NOT installed.\n");
+ 		return -ENODEV;
+ 	}
+-	lock_8390_module();
+ 	return 0;
+ }
+ 
+ void cleanup_module(void)
+ {
+-	/* FIXME: should probably keep track of net_device structs
+-           somewhere and unregister them here? */
+-	unlock_8390_module();
++	int i;
++	for (i = 0; i < 15; i++) {
++		struct net_device *dev = dev_mac890[i];
++		if (dev) {
++			unregister_netdev(dev);
++			free_netdev(dev);
++		}
++	}
+ }
+ 
+ #endif /* MODULE */
+ 
+-int __init mac8390_initdev(struct net_device * dev, struct nubus_dev * ndev,
++static int __init mac8390_initdev(struct net_device * dev, struct nubus_dev * ndev,
+ 			    enum mac8390_type type)
+ {
+ 	static u32 fwrd4_offsets[16]={
+@@ -423,12 +439,6 @@ int __init mac8390_initdev(struct net_de
+ 
+ 	int access_bitmode;
+ 	
+-	/* 8390 specific init for dev - allocates dev->priv */
+-	if (ethdev_init(dev)) {
+-		printk(KERN_ERR "%s: Unable to allocate memory for dev->priv!\n", dev->name);
+-		return -ENOMEM;
+-	}
+-
+ 	/* Now fill in our stuff */
+ 	dev->open = &mac8390_open;
+ 	dev->stop = &mac8390_close;
+@@ -529,7 +539,6 @@ static int mac8390_open(struct net_devic
+ 		printk ("%s: unable to get IRQ %d.\n", dev->name, dev->irq);
+ 		return -EAGAIN;
+ 	}	
+-	MOD_INC_USE_COUNT;
+ 	return 0;
+ }
+ 
+@@ -537,7 +546,6 @@ static int mac8390_close(struct net_devi
+ {
+ 	free_irq(dev->irq, dev);
+ 	ei_close(dev);
+-	MOD_DEC_USE_COUNT;
+ 	return 0;
+ }
+ 
+--- linux-2.6.0/drivers/net/mac89x0.c	2003-06-14 12:18:21.000000000 -0700
++++ 25/drivers/net/mac89x0.c	2003-12-28 23:21:01.000000000 -0800
+@@ -123,7 +123,6 @@ struct net_local {
+ 
+ /* Index to functions, as function prototypes. */
+ 
+-extern int mac89x0_probe(struct net_device *dev);
+ #if 0
+ extern void reset_chip(struct net_device *dev);
+ #endif
+@@ -170,8 +169,9 @@ writereg(struct net_device *dev, int por
+ 
+ /* Probe for the CS8900 card in slot E.  We won't bother looking
+    anywhere else until we have a really good reason to do so. */
+-int __init mac89x0_probe(struct net_device *dev)
++struct net_device * __init mac89x0_probe(int unit)
+ {
++	struct net_device *dev;
+ 	static int once_is_enough;
+ 	struct net_local *lp;
+ 	static unsigned version_printed;
+@@ -179,18 +179,28 @@ int __init mac89x0_probe(struct net_devi
+ 	unsigned rev_type = 0;
+ 	unsigned long ioaddr;
+ 	unsigned short sig;
++	int err = -ENODEV;
++
++	dev = alloc_etherdev(sizeof(struct net_local));
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	if (unit >= 0) {
++		sprintf(dev->name, "eth%d", unit);
++		netdev_boot_setup_check(dev);
++	}
+ 
+ 	SET_MODULE_OWNER(dev);
+ 
+ 	if (once_is_enough)
+-		return -ENODEV;
++		goto out;
+ 	once_is_enough = 1;
+ 
+ 	/* We might have to parameterize this later */
+ 	slot = 0xE;
+ 	/* Get out now if there's a real NuBus card in slot E */
+ 	if (nubus_find_slot(slot, NULL) != NULL)
+-		return -ENODEV;	
++		goto out;
+ 
+ 	/* The pseudo-ISA bits always live at offset 0x300 (gee,
+            wonder why...) */
+@@ -206,21 +216,15 @@ int __init mac89x0_probe(struct net_devi
+ 		local_irq_restore(flags);
+ 
+ 		if (!card_present)
+-			return -ENODEV;
++			goto out;
+ 	}
+ 
+ 	nubus_writew(0, ioaddr + ADD_PORT);
+ 	sig = nubus_readw(ioaddr + DATA_PORT);
+ 	if (sig != swab16(CHIP_EISA_ID_SIG))
+-		return -ENODEV;
++		goto out;
+ 
+ 	/* Initialize the net_device structure. */
+-	if (dev->priv == NULL) {
+-		dev->priv = kmalloc(sizeof(struct net_local), GFP_KERNEL);
+-		if (!dev->priv)
+-			return -ENOMEM;
+-                memset(dev->priv, 0, sizeof(struct net_local));
+-        }
+ 	lp = (struct net_local *)dev->priv;
+ 
+ 	/* Fill in the 'dev' fields. */
+@@ -258,9 +262,7 @@ int __init mac89x0_probe(struct net_devi
+ 	/* Try to read the MAC address */
+ 	if ((readreg(dev, PP_SelfST) & (EEPROM_PRESENT | EEPROM_OK)) == 0) {
+ 		printk("\nmac89x0: No EEPROM, giving up now.\n");
+-		kfree(dev->priv);
+-		dev->priv = NULL;
+-		return -ENODEV;
++		goto out1;
+         } else {
+                 for (i = 0; i < ETH_ALEN; i += 2) {
+ 			/* Big-endian (why??!) */
+@@ -277,6 +279,7 @@ int __init mac89x0_probe(struct net_devi
+ 	for (i = 0; i < ETH_ALEN; i++)
+ 		printk("%2.2x%s", dev->dev_addr[i],
+ 		       ((i < ETH_ALEN-1) ? ":" : ""));
++	printk("\n");
+ 
+ 	dev->open		= net_open;
+ 	dev->stop		= net_close;
+@@ -285,11 +288,15 @@ int __init mac89x0_probe(struct net_devi
+ 	dev->set_multicast_list = &set_multicast_list;
+ 	dev->set_mac_address = &set_mac_address;
+ 
+-	/* Fill in the fields of the net_device structure with ethernet values. */
+-	ether_setup(dev);
+-
+-	printk("\n");
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
+ 	return 0;
++out1:
++	nubus_writew(0, dev->base_addr + ADD_PORT);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
+ #if 0
+@@ -619,7 +626,7 @@ static int set_mac_address(struct net_de
+ 
+ #ifdef MODULE
+ 
+-static struct net_device dev_cs89x0;
++static struct net_device *dev_cs89x0;
+ static int debug;
+ 
+ MODULE_PARM(debug, "i");
+@@ -630,36 +637,20 @@ int
+ init_module(void)
+ {
+ 	net_debug = debug;
+-        dev_cs89x0.init = mac89x0_probe;
+-        dev_cs89x0.priv = kmalloc(sizeof(struct net_local), GFP_KERNEL);
+-	if (!dev_cs89x0.priv)
+-		return -ENOMEM;
+-	memset(dev_cs89x0.priv, 0, sizeof(struct net_local));
+-
+-        if (register_netdev(&dev_cs89x0) != 0) {
++        dev_cs89x0 = mac89x0_probe(-1);
++	if (IS_ERR(dev_cs89x0)) {
+                 printk(KERN_WARNING "mac89x0.c: No card found\n");
+-		kfree(dev_cs89x0.priv);
+-                return -ENXIO;
+-        }
++		return PTR_ERR(dev_cs89x0);
++	}
+ 	return 0;
+ }
+ 
+ void
+ cleanup_module(void)
+ {
+-
+-#endif
+-#ifdef MODULE
+-	nubus_writew(0, dev_cs89x0.base_addr + ADD_PORT);
+-#endif
+-#ifdef MODULE
+-
+-        if (dev_cs89x0.priv != NULL) {
+-                /* Free up the private structure, or leak memory :-)  */
+-                unregister_netdev(&dev_cs89x0);
+-                kfree(dev_cs89x0.priv);
+-                dev_cs89x0.priv = NULL;	/* gets re-allocated by cs89x0_probe1 */
+-        }
++	unregister_netdev(dev_cs89x0);
++	nubus_writew(0, dev_cs89x0->base_addr + ADD_PORT);
++	free_netdev(dev_cs89x0);
+ }
+ #endif /* MODULE */
+ 
+--- linux-2.6.0/drivers/net/mace.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/mace.c	2003-12-28 23:21:01.000000000 -0800
+@@ -142,6 +142,10 @@ static void __init mace_probe1(struct de
+ 		}
+ 	}
+ 
++	/*
++	 * lazy allocation - it's a driver-wide thing and it will live until
++	 * the unload, but we don't allocate it until it's needed
++	 */
+ 	if (dummy_buf == NULL) {
+ 		dummy_buf = kmalloc(RX_BUFLEN+2, GFP_KERNEL);
+ 		if (dummy_buf == NULL) {
+@@ -150,7 +154,7 @@ static void __init mace_probe1(struct de
+ 		}
+ 	}
+ 
+-	dev = init_etherdev(0, PRIV_BYTES);
++	dev = alloc_etherdev(PRIV_BYTES);
+ 	if (!dev)
+ 		return;
+ 	SET_MODULE_OWNER(dev);
+@@ -160,16 +164,16 @@ static void __init mace_probe1(struct de
+ 	
+ 	if (!request_OF_resource(mace, 0, " (mace)")) {
+ 		printk(KERN_ERR "MACE: can't request IO resource !\n");
+-		goto err_out;
++		goto out1;
+ 	}
+ 	if (!request_OF_resource(mace, 1, " (mace tx dma)")) {
+ 		printk(KERN_ERR "MACE: can't request TX DMA resource !\n");
+-		goto err_out;
++		goto out2;
+ 	}
+ 
+ 	if (!request_OF_resource(mace, 2, " (mace tx dma)")) {
+ 		printk(KERN_ERR "MACE: can't request RX DMA resource !\n");
+-		goto err_out;
++		goto out3;
+ 	}
+ 
+ 	dev->base_addr = mace->addrs[0].address;
+@@ -229,30 +233,42 @@ static void __init mace_probe1(struct de
+ 	dev->set_multicast_list = mace_set_multicast;
+ 	dev->set_mac_address = mace_set_address;
+ 
+-	ether_setup(dev);
+-
+ 	mace_reset(dev);
+ 
+-	if (request_irq(dev->irq, mace_interrupt, 0, "MACE", dev))
++	if (request_irq(dev->irq, mace_interrupt, 0, "MACE", dev)) {
+ 		printk(KERN_ERR "MACE: can't get irq %d\n", dev->irq);
++		goto out4;
++	}
+ 	if (request_irq(mace->intrs[1].line, mace_txdma_intr, 0, "MACE-txdma",
+-			dev))
++			dev)) {
+ 		printk(KERN_ERR "MACE: can't get irq %d\n", mace->intrs[1].line);
++		goto out5;
++	}
+ 	if (request_irq(mace->intrs[2].line, mace_rxdma_intr, 0, "MACE-rxdma",
+-			dev))
++			dev)) {
+ 		printk(KERN_ERR "MACE: can't get irq %d\n", mace->intrs[2].line);
++		goto out6;
++	}
++	if (register_netdev(dev) != 0)
++		goto out7;
+ 
+ 	mp->next_mace = mace_devs;
+ 	mace_devs = dev;
+ 	return;
+ 	
+-err_out:
+-	unregister_netdev(dev);
+-	if (mp->of_node) {
+-		release_OF_resource(mp->of_node, 0);
+-		release_OF_resource(mp->of_node, 1);
+-		release_OF_resource(mp->of_node, 2);
+-	}
++out7:
++	free_irq(mp->rx_dma_intr, dev);
++out6:
++	free_irq(mp->tx_dma_intr, dev);
++out5:
++	free_irq(dev->irq, dev);
++out4:
++	release_OF_resource(mp->of_node, 2);
++out3:
++	release_OF_resource(mp->of_node, 1);
++out2:
++	release_OF_resource(mp->of_node, 0);
++out1:
+ 	free_netdev(dev);
+ }
+ 
+@@ -975,7 +991,7 @@ static void __exit mace_cleanup (void)
+ 		release_OF_resource(mp->of_node, 1);
+ 		release_OF_resource(mp->of_node, 2);
+ 
+-		kfree(dev);
++		free_netdev(dev);
+     }
+     if (dummy_buf != NULL) {
+ 		kfree(dummy_buf);
+--- linux-2.6.0/drivers/net/macmace.c	2003-06-14 12:18:07.000000000 -0700
++++ 25/drivers/net/macmace.c	2003-12-28 23:21:01.000000000 -0800
+@@ -180,7 +180,7 @@ static void mace_dma_off(struct net_devi
+  * model of Macintrash has a MACE (AV macintoshes)
+  */
+  
+-int mace_probe(struct net_device *unused)
++struct net_device *mace_probe(int unit)
+ {
+ 	int j;
+ 	struct mace_data *mp;
+@@ -188,13 +188,19 @@ int mace_probe(struct net_device *unused
+ 	struct net_device *dev;
+ 	unsigned char checksum = 0;
+ 	static int found = 0;
++	int err;
+ 	
+-	if (found || macintosh_config->ether_type != MAC_ETHER_MACE) return -ENODEV;
++	if (found || macintosh_config->ether_type != MAC_ETHER_MACE)
++		return ERR_PTR(-ENODEV);
+ 
+ 	found = 1;	/* prevent 'finding' one on every device probe */
+ 
+-	dev = init_etherdev(0, PRIV_BYTES);
+-	if (!dev) return -ENOMEM;
++	dev = alloc_etherdev(PRIV_BYTES);
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	if (unit >= 0)
++		sprintf(dev->name, "eth%d", unit);
+ 
+ 	mp = (struct mace_data *) dev->priv;
+ 	dev->base_addr = (u32)MACE_BASE;
+@@ -221,7 +227,10 @@ int mace_probe(struct net_device *unused
+ 		checksum ^= bitrev(addr[j<<4]);
+ 	}
+ 	
+-	if (checksum != 0xFF) return -ENODEV;
++	if (checksum != 0xFF) {
++		free_netdev(dev);
++		return ERR_PTR(-ENODEV);
++	}
+ 
+ 	memset(&mp->stats, 0, sizeof(mp->stats));
+ 
+@@ -234,13 +243,16 @@ int mace_probe(struct net_device *unused
+ 	dev->set_multicast_list	= mace_set_multicast;
+ 	dev->set_mac_address	= mace_set_address;
+ 
+-	ether_setup(dev);
+-
+ 	printk(KERN_INFO "%s: 68K MACE, hardware address %.2X", dev->name, dev->dev_addr[0]);
+ 	for (j = 1 ; j < 6 ; j++) printk(":%.2X", dev->dev_addr[j]);
+ 	printk("\n");
+ 
+-	return 0;
++	err = register_netdev(dev);
++	if (!err)
++		return dev;
++
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
+ /*
+--- linux-2.6.0/drivers/net/macsonic.c	2003-07-27 12:14:39.000000000 -0700
++++ 25/drivers/net/macsonic.c	2003-12-28 23:21:01.000000000 -0800
+@@ -74,7 +74,6 @@ static int sonic_version_printed;
+ 
+ static int reg_offset;
+ 
+-extern int macsonic_probe(struct net_device* dev);
+ extern int mac_onboard_sonic_probe(struct net_device* dev);
+ extern int mac_nubus_sonic_probe(struct net_device* dev);
+ 
+@@ -110,14 +109,38 @@ enum macsonic_type {
+ 
+ #define SONIC_READ_PROM(addr) nubus_readb(prom_addr+addr)
+ 
+-int __init macsonic_probe(struct net_device* dev)
++struct net_device * __init macsonic_probe(int unit)
+ {
+-	int rv;
++	struct net_device *dev = alloc_etherdev(0);
++	int err;
++
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	if (unit >= 0)
++		sprintf(dev->name, "eth%d", unit);
++
++ 	SET_MODULE_OWNER(dev);
+ 
+ 	/* This will catch fatal stuff like -ENOMEM as well as success */
+-	if ((rv = mac_onboard_sonic_probe(dev)) != -ENODEV)
+-		return rv;
+-	return mac_nubus_sonic_probe(dev);
++	err = mac_onboard_sonic_probe(dev);
++	if (err == 0)
++		goto found;
++	if (err != -ENODEV)
++		goto out;
++	err = mac_nubus_sonic_probe(dev);
++	if (err)
++		goto out;
++found:
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	kfree(dev->priv);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
+ /*
+@@ -195,6 +218,7 @@ int __init macsonic_init(struct net_devi
+ 	if ((lp->rba = (char *)
+ 	     kmalloc(SONIC_NUM_RRS * SONIC_RBSIZE, GFP_KERNEL | GFP_DMA)) == NULL) {
+ 		printk(KERN_ERR "%s: couldn't allocate receive buffers\n", dev->name);
++		dev->priv = NULL;
+ 		kfree(lp);
+ 		return -ENOMEM;
+ 	}
+@@ -229,8 +253,6 @@ int __init macsonic_init(struct net_devi
+ 	sonic_write(dev, SONIC_FAET, 0xffff);
+ 	sonic_write(dev, SONIC_MPT, 0xffff);
+ 
+-	/* Fill in the fields of the device structure with ethernet values. */
+-	ether_setup(dev);
+ 	return 0;
+ }
+ 
+@@ -344,30 +366,6 @@ int __init mac_onboard_sonic_probe(struc
+ 
+ 	printk("yes\n");	
+ 
+-	if (dev) {
+-		dev = init_etherdev(dev, sizeof(struct sonic_local));
+-		if (!dev)
+-			return -ENOMEM;
+-		/* methinks this will always be true but better safe than sorry */
+-		if (dev->priv == NULL) {
+-			dev->priv = kmalloc(sizeof(struct sonic_local), GFP_KERNEL);
+-			if (!dev->priv)
+-				return -ENOMEM;
+-		}
+-	} else {
+-		dev = init_etherdev(NULL, sizeof(struct sonic_local));
+-	}
+-
+-	if (dev == NULL)
+-		return -ENOMEM;
+-
+-	if(dev->priv) {
+-		printk("%s: warning! sonic entering with priv already allocated!\n",
+-		       dev->name);
+-		printk("%s: discarding, will attempt to reallocate\n", dev->name);
+-		dev->priv = NULL;
+-	}
+-
+ 	/* Danger!  My arms are flailing wildly!  You *must* set this
+            before using sonic_read() */
+ 
+@@ -497,7 +495,6 @@ int __init mac_nubus_sonic_probe(struct 
+ {
+ 	static int slots;
+ 	struct nubus_dev* ndev = NULL;
+-	struct sonic_local* lp;
+ 	unsigned long base_addr, prom_addr;
+ 	u16 sonic_dcr;
+ 	int id;
+@@ -567,25 +564,6 @@ int __init mac_nubus_sonic_probe(struct 
+ 		return -ENODEV;
+ 	}
+ 
+-	if (dev) {
+-		dev = init_etherdev(dev, sizeof(struct sonic_local));
+-		if (!dev)
+-			return -ENOMEM;
+-		/* methinks this will always be true but better safe than sorry */
+-		if (dev->priv == NULL) {
+-			dev->priv = kmalloc(sizeof(struct sonic_local), GFP_KERNEL);
+-			if (!dev->priv) /* FIXME: kfree dev if necessary */
+-				return -ENOMEM;
+-		}
+-	} else {
+-		dev = init_etherdev(NULL, sizeof(struct sonic_local));
+-	}
+-
+-	if (dev == NULL)
+-		return -ENOMEM;
+-
+-	lp = (struct sonic_local*) dev->priv;
+-	memset(lp, 0, sizeof(struct sonic_local));
+ 	/* Danger!  My arms are flailing wildly!  You *must* set this
+            before using sonic_read() */
+ 	dev->base_addr = base_addr;
+@@ -631,8 +609,7 @@ int __init mac_nubus_sonic_probe(struct 
+ }
+ 
+ #ifdef MODULE
+-static char namespace[16] = "";
+-static struct net_device dev_macsonic;
++static struct net_device *dev_macsonic;
+ 
+ MODULE_PARM(sonic_debug, "i");
+ MODULE_PARM_DESC(sonic_debug, "macsonic debug level (1-4)");
+@@ -641,24 +618,20 @@ MODULE_LICENSE("GPL");
+ int
+ init_module(void)
+ {
+-        dev_macsonic.name = namespace;
+-        dev_macsonic.init = macsonic_probe;
+-
+-        if (register_netdev(&dev_macsonic) != 0) {
++        dev_macsonic = macsonic_probe(-1);
++	if (IS_ERR(dev_macsonic)) {
+                 printk(KERN_WARNING "macsonic.c: No card found\n");
+-                return -ENXIO;
+-        }
++		return PTR_ERR(dev_macsonic);
++	}
+ 	return 0;
+ }
+ 
+ void
+ cleanup_module(void)
+ {
+-        if (dev_macsonic.priv != NULL) {
+-                unregister_netdev(&dev_macsonic);
+-                kfree(dev_macsonic.priv);
+-                dev_macsonic.priv = NULL;
+-        }
++	unregister_netdev(dev_macsonic);
++	kfree(dev_macsonic->priv);
++	free_netdev(dev_macsonic);
+ }
+ #endif /* MODULE */
+ 
+--- linux-2.6.0/drivers/net/Makefile	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/net/Makefile	2003-12-28 23:21:09.000000000 -0800
+@@ -8,7 +8,6 @@ ifeq ($(CONFIG_ISDN_PPP),y)
+   obj-$(CONFIG_ISDN) += slhc.o
+ endif
+ 
+-obj-$(CONFIG_E100) += e100/
+ obj-$(CONFIG_E1000) += e1000/
+ obj-$(CONFIG_IXGB) += ixgb/
+ obj-$(CONFIG_BONDING) += bonding/
+@@ -39,6 +38,7 @@ obj-$(CONFIG_TYPHOON) += typhoon.o
+ obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
+ obj-$(CONFIG_PCNET32) += pcnet32.o
+ obj-$(CONFIG_EEPRO100) += eepro100.o
++obj-$(CONFIG_E100) += e100.o
+ obj-$(CONFIG_TLAN) += tlan.o
+ obj-$(CONFIG_EPIC100) += epic100.o
+ obj-$(CONFIG_SIS190) += sis190.o
+@@ -95,6 +95,7 @@ obj-$(CONFIG_LNE390) += lne390.o 8390.o
+ obj-$(CONFIG_NE3210) += ne3210.o 8390.o
+ obj-$(CONFIG_NET_SB1250_MAC) += sb1250-mac.o
+ obj-$(CONFIG_B44) += b44.o
++obj-$(CONFIG_FORCEDETH) += forcedeth.o
+ 
+ obj-$(CONFIG_PPP) += ppp_generic.o slhc.o
+ obj-$(CONFIG_PPP_ASYNC) += ppp_async.o
+@@ -111,7 +112,6 @@ endif
+ obj-$(CONFIG_DUMMY) += dummy.o
+ obj-$(CONFIG_DE600) += de600.o
+ obj-$(CONFIG_DE620) += de620.o
+-obj-$(CONFIG_AT1500) += lance.o
+ obj-$(CONFIG_LANCE) += lance.o
+ obj-$(CONFIG_SUN3_82586) += sun3_82586.o
+ obj-$(CONFIG_SUN3LANCE) += sun3lance.o
+@@ -188,3 +188,6 @@ obj-$(CONFIG_NET_TULIP) += tulip/
+ obj-$(CONFIG_HAMRADIO) += hamradio/
+ obj-$(CONFIG_IRDA) += irda/
+ 
++# Must come after all NICs that might use them
++obj-$(CONFIG_NETCONSOLE) += netconsole.o
++obj-$(CONFIG_KGDB) += kgdb_eth.o
+--- linux-2.6.0/drivers/net/meth.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/meth.c	2003-12-28 23:21:01.000000000 -0800
+@@ -95,7 +95,6 @@ typedef struct meth_private {
+     spinlock_t meth_lock;
+ } meth_private;
+ 
+-extern struct net_device meth_devs[];
+ void meth_tx_timeout (struct net_device *dev);
+ void meth_interrupt(int irq, void *dev_id, struct pt_regs *pregs);
+         
+@@ -762,17 +761,16 @@ struct net_device_stats *meth_stats(stru
+ 
+ /*
+  * The init function (sometimes called probe).
+- * It is invoked by register_netdev()
+  */
+-int meth_init(struct net_device *dev)
++static struct net_device *meth_init(struct net_device *dev)
+ {
++	struct net_device *dev;
+ 	meth_private *priv;
+ 	int ret;
+-	/* 
+-	 * Then, assign other fields in dev, using ether_setup() and some
+-	 * hand assignments
+-	 */
+-	ether_setup(dev); /* assign some of the fields */
++
++	dev = alloc_etherdev(sizeof(struct meth_private));
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
+ 
+ 	dev->open            = meth_open;
+ 	dev->stop            = meth_release;
+@@ -787,16 +785,8 @@ int meth_init(struct net_device *dev)
+ 	dev->irq		 = MACE_ETHERNET_IRQ;
+ 	SET_MODULE_OWNER(dev);
+ 
+-	/*
+-	 * Then, allocate the priv field. This encloses the statistics
+-	 * and a few private fields.
+-	 */
+-	priv = kmalloc(sizeof(struct meth_private), GFP_KERNEL);
+-	if (priv == NULL)
+-		return -ENOMEM;
+-	dev->priv=priv;
+-	memset(priv, 0, sizeof(struct meth_private));
+-	spin_lock_init(&((struct meth_private *) dev->priv)->meth_lock);
++	priv = dev->priv;
++	spin_lock_init(&priv->meth_lock);
+ 	/*
+ 	 * Make the usual checks: check_region(), probe irq, ...  -ENODEV
+ 	 * should be returned if no device found.  No resource should be
+@@ -807,28 +797,41 @@ int meth_init(struct net_device *dev)
+ 	priv->phy_addr = -1; /* No phy is known yet... */
+ 
+ 	/* Initialize the hardware */
+-	if((ret=meth_reset(dev)) < 0)
+-	        return ret;
++	ret = meth_reset(dev);
++	if (ret < 0)
++		goto out;
+ 
+ 	/* Allocate the ring buffers */
+-	if((ret=meth_init_tx_ring(priv))<0||(ret=meth_init_rx_ring(priv))<0){
+-		meth_free_tx_ring(priv);
+-		meth_free_rx_ring(priv);
+-		return ret;
+-	}
++	ret = meth_init_tx_ring(priv);
++	if (ret < 0)
++		goto out;
++
++	ret = meth_init_rx_ring(priv);
++	if (ret < 0)
++		goto out1;
++
++	ret = register_netdev(dev);
++	if (ret)
++		goto out2;
+ 
+ 	printk("SGI O2 Fast Ethernet rev. %ld\n", priv->regs->mac_ctrl >> 29);
+ 
+-    return 0;
++	return ret;
++
++out2:
++	meth_free_rx_ring(priv);
++out1:
++	meth_free_tx_ring(priv);
++out:
++	free_netdev(dev);
++	return ERR_PTR(ret);
+ }
+ 
+ /*
+  * The devices
+  */
+ 
+-struct net_device meth_devs[1] = {
+-    { init: meth_init, }  /* init, nothing more */
+-};
++struct net_device *meth_dev;
+ 
+ /*
+  * Finally, the module stuff
+@@ -836,23 +839,19 @@ struct net_device meth_devs[1] = {
+ 
+ int meth_init_module(void)
+ {
+-	int result, device_present = 0;
+-
+-	strcpy(meth_devs[0].name, "eth%d");
+-
+-	if ( (result = register_netdev(meth_devs)) )
+-		printk("meth: error %i registering device \"%s\"\n",
+-		       result, meth_devs->name);
+-	else device_present++;
+-	
+-	return device_present ? 0 : -ENODEV;
++	meth_dev = meth_init();
++	if (IS_ERR(meth_dev))
++		return PTR_ERR(meth_dev);
++	return 0;
+ }
+ 
+ void meth_cleanup(void)
+ {
+-    kfree(meth_devs->priv);
+-    unregister_netdev(meth_devs);
+-    return;
++	meth_private *priv = meth_dev->priv;
++	unregister_netdev(meth_dev);
++	meth_free_rx_ring(priv);
++	meth_free_tx_ring(priv);
++	free_netdev(meth_dev);
+ }
+ 
+ module_init(meth_init_module);
+--- linux-2.6.0/drivers/net/mvme147.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/mvme147.c	2003-12-28 23:21:01.000000000 -0800
+@@ -41,7 +41,7 @@
+ struct m147lance_private {
+ 	struct lance_private lance;
+ 	void *base;
+-	void *ram;
++	unsigned long ram;
+ };
+ 
+ /* function prototypes... This is easy because all the grot is in the
+@@ -49,7 +49,6 @@ struct m147lance_private {
+  * plus board-specific init, open and close actions.
+  * Oh, and we need to tell the generic code how to read and write LANCE registers...
+  */
+-int mvme147lance_probe(struct net_device *dev);
+ static int m147lance_open(struct net_device *dev);
+ static int m147lance_close(struct net_device *dev);
+ static void m147lance_writerap(struct m147lance_private *lp, unsigned short value);
+@@ -60,29 +59,29 @@ typedef void (*writerap_t)(void *, unsig
+ typedef void (*writerdp_t)(void *, unsigned short);
+ typedef unsigned short (*readrdp_t)(void *);
+ 
+-#ifdef MODULE
+-static struct m147lance_private *root_m147lance_dev;
+-#endif
+-
+ /* Initialise the one and only on-board 7990 */
+-int __init mvme147lance_probe(struct net_device *dev)
++struct net_device * __init mvme147lance_probe(int unit)
+ {
++	struct net_device *dev;
+ 	static int called;
+ 	static const char name[] = "MVME147 LANCE";
+ 	struct m147lance_private *lp;
+ 	u_long *addr;
+ 	u_long address;
++	int err;
+ 
+ 	if (!MACH_IS_MVME147 || called)
+-		return -ENODEV;
++		return ERR_PTR(-ENODEV);
+ 	called++;
+ 
+-	SET_MODULE_OWNER(dev);
++	dev = alloc_etherdev(sizeof(struct m147lance_private));
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
+ 
+-	dev->priv = kmalloc(sizeof(struct m147lance_private), GFP_KERNEL);
+-	if (dev->priv == NULL)
+-		return -ENOMEM;
+-	memset(dev->priv, 0, sizeof(struct m147lance_private));
++	if (unit >= 0)
++		sprintf(dev->name, "eth%d", unit);
++
++	SET_MODULE_OWNER(dev);
+ 
+ 	/* Fill the dev fields */
+ 	dev->base_addr = (unsigned long)MVME147_LANCE_BASE;
+@@ -114,11 +113,12 @@ int __init mvme147lance_probe(struct net
+ 		dev->dev_addr[5]);
+ 
+ 	lp = (struct m147lance_private *)dev->priv;
+-	lp->ram = (void *)__get_dma_pages(GFP_ATOMIC, 3);	/* 16K */
++	lp->ram = __get_dma_pages(GFP_ATOMIC, 3);	/* 16K */
+ 	if (!lp->ram)
+ 	{
+ 		printk("%s: No memory for LANCE buffers\n", dev->name);
+-		return -ENODEV;
++		free_netdev(dev);
++		return ERR_PTR(-ENOMEM);
+ 	}
+ 
+ 	lp->lance.name = (char*)name;                   /* discards const, shut up gcc */
+@@ -134,15 +134,15 @@ int __init mvme147lance_probe(struct net
+ 	lp->lance.lance_log_tx_bufs = LANCE_LOG_TX_BUFFERS;
+ 	lp->lance.rx_ring_mod_mask = RX_RING_MOD_MASK;
+ 	lp->lance.tx_ring_mod_mask = TX_RING_MOD_MASK;
+-	ether_setup(dev);
+ 
+-#ifdef MODULE
+-	dev->ifindex = dev_new_index();
+-	lp->next_module = root_m147lance_dev;
+-	root_m147lance_dev = lp;
+-#endif /* MODULE */
++	err = register_netdev(dev);
++	if (err) {
++		free_pages(lp->ram, 3);
++		free_netdev(dev);
++		return ERR_PTR(err);
++	}
+ 
+-	return 0;
++	return dev;
+ }
+ 
+ static void m147lance_writerap(struct m147lance_private *lp, unsigned short value)
+@@ -185,23 +185,21 @@ static int m147lance_close(struct net_de
+ #ifdef MODULE
+ MODULE_LICENSE("GPL");
+ 
++static struct net_device *dev_mvme147_lance;
+ int init_module(void)
+ {
+-	root_lance_dev = NULL;
+-	return mvme147lance_probe(NULL);
++	dev_mvme147_lance = mvme147lance_probe(-1);
++	if (IS_ERR(dev_mvme147_lance))
++		return PTR_ERR(dev_mvme147_lance);
++	return 0;
+ }
+ 
+ void cleanup_module(void)
+ {
+-	/* Walk the chain of devices, unregistering them */
+-	struct m147lance_private *lp;
+-	while (root_m147lance_dev) {
+-		lp = root_m147lance_dev->next_module;
+-		unregister_netdev(root_lance_dev->dev);
+-		free_pages(lp->ram, 3);
+-		free_netdev(root_lance_dev->dev);
+-		root_lance_dev = lp;
+-	}
++	struct m147lance_private *lp = dev_mvme147_lance->priv;
++	unregister_netdev(dev_mvme147_lance);
++	free_pages(lp->ram, 3);
++	free_netdev(dev_mvme147_lance);
+ }
+ 
+ #endif /* MODULE */
+--- linux-2.6.0/drivers/net/natsemi.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/net/natsemi.c	2003-12-28 23:21:01.000000000 -0800
+@@ -765,19 +765,13 @@ static int __devinit natsemi_probe1 (str
+ 	SET_NETDEV_DEV(dev, &pdev->dev);
+ 
+ 	i = pci_request_regions(pdev, dev->name);
+-	if (i) {
+-		free_netdev(dev);
+-		return i;
+-	}
++	if (i)
++		goto err_pci_request_regions;
+ 
+-	{
+-		void *mmio = ioremap (ioaddr, iosize);
+-		if (!mmio) {
+-			pci_release_regions(pdev);
+-			free_netdev(dev);
+-			return -ENOMEM;
+-		}
+-		ioaddr = (unsigned long) mmio;
++	ioaddr = (unsigned long) ioremap (ioaddr, iosize);
++	if (!ioaddr) {
++		i = -ENOMEM;
++		goto err_ioremap;
+ 	}
+ 
+ 	/* Work around the dropped serial bit. */
+@@ -835,13 +829,9 @@ static int __devinit natsemi_probe1 (str
+ 		dev->mtu = mtu;
+ 
+ 	i = register_netdev(dev);
+-	if (i) {
+-		pci_release_regions(pdev);
+-		unregister_netdev(dev);
+-		free_netdev(dev);
+-		pci_set_drvdata(pdev, NULL);
+-		return i;
+-	}
++	if (i)
++		goto err_register_netdev;
++
+ 	netif_carrier_off(dev);
+ 
+ 	if (netif_msg_drv(np)) {
+@@ -878,6 +868,17 @@ static int __devinit natsemi_probe1 (str
+ 
+ 
+ 	return 0;
++
++ err_register_netdev:
++	iounmap ((void *) dev->base_addr);
++
++ err_ioremap:
++	pci_release_regions(pdev);
++	pci_set_drvdata(pdev, NULL);
++
++ err_pci_request_regions:
++	free_netdev(dev);
++	return i;
+ }
+ 
+ 
+--- linux-2.6.0/drivers/net/ne2.c	2003-10-08 15:07:09.000000000 -0700
++++ 25/drivers/net/ne2.c	2003-12-28 23:21:01.000000000 -0800
+@@ -242,7 +242,7 @@ static unsigned int __init dlink_get_eep
+  * Note that at boot, this probe only picks up one card at a time.
+  */
+ 
+-int __init ne2_probe(struct net_device *dev)
++static int __init do_ne2_probe(struct net_device *dev)
+ {
+ 	static int current_mca_slot = -1;
+ 	int i;
+@@ -262,16 +262,52 @@ int __init ne2_probe(struct net_device *
+ 			mca_find_unused_adapter(ne2_adapters[i].id, 0);
+ 
+ 		if((current_mca_slot != MCA_NOTFOUND) && !adapter_found) {
++			int res;
+ 			mca_set_adapter_name(current_mca_slot, 
+ 					ne2_adapters[i].name);
+ 			mca_mark_as_used(current_mca_slot);
+ 			
+-			return ne2_probe1(dev, current_mca_slot);
++			res = ne2_probe1(dev, current_mca_slot);
++			if (res)
++				mca_mark_as_unused(current_mca_slot);
++			return res;
+ 		}
+ 	}
+ 	return -ENODEV;
+ }
+ 
++static void cleanup_card(struct net_device *dev)
++{
++	mca_mark_as_unused(ei_status.priv);
++	mca_set_adapter_procfn( ei_status.priv, NULL, NULL);
++	free_irq(dev->irq, dev);
++	release_region(dev->base_addr, NE_IO_EXTENT);
++}
++
++struct net_device * __init ne2_probe(int unit)
++{
++	struct net_device *dev = alloc_ei_netdev();
++	int err;
++
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	sprintf(dev->name, "eth%d", unit);
++	netdev_boot_setup_check(dev);
++
++	err = do_ne2_probe(dev);
++	if (err)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	cleanup_card(dev);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
++}
+ 
+ static int ne2_procinfo(char *buf, int slot, struct net_device *dev)
+ {
+@@ -443,14 +479,6 @@ static int __init ne2_probe1(struct net_
+ 
+ 	dev->base_addr = base_addr;
+ 
+-	/* Allocate dev->priv and fill in 8390 specific dev fields. */
+-	if (ethdev_init(dev)) {
+-		printk (" unable to get memory for dev->priv.\n");
+-		free_irq(dev->irq, dev);
+-		retval = -ENOMEM;
+-		goto out;
+-	}
+-
+ 	for(i = 0; i < ETHER_ADDR_LEN; i++) {
+ 		printk(" %2.2x", SA_prom[i]);
+ 		dev->dev_addr[i] = SA_prom[i];
+@@ -735,7 +763,7 @@ retry:
+ 
+ #ifdef MODULE
+ #define MAX_NE_CARDS	4	/* Max number of NE cards per module */
+-static struct net_device dev_ne[MAX_NE_CARDS];
++static struct net_device *dev_ne[MAX_NE_CARDS];
+ static int io[MAX_NE_CARDS];
+ static int irq[MAX_NE_CARDS];
+ static int bad[MAX_NE_CARDS];	/* 0xbad = bad sig or no reset ack */
+@@ -754,23 +782,30 @@ MODULE_PARM_DESC(bad, "(ignored)");
+ 
+ int init_module(void)
+ {
++	struct net_device *dev;
+ 	int this_dev, found = 0;
+ 
+ 	for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_ne[this_dev];
++		dev = alloc_ei_netdev();
++		if (!dev)
++			break;
+ 		dev->irq = irq[this_dev];
+ 		dev->mem_end = bad[this_dev];
+ 		dev->base_addr = io[this_dev];
+-		dev->init = ne2_probe;
+-		if (register_netdev(dev) != 0) {
+-			if (found != 0) return 0;   /* Got at least one. */
+-
+-			printk(KERN_WARNING "ne2.c: No NE/2 card found.\n");
+-			return -ENXIO;
++		if (do_ne2_probe(dev) == 0) {
++			if (register_netdev(dev) == 0) {
++				dev_ne[found++] = dev;
++				continue;
++			}
++			cleanup_card(dev);
+ 		}
+-		found++;
++		free_netdev(dev);
++		break;
+ 	}
+-	return 0;
++	if (found)
++		return 0;
++	printk(KERN_WARNING "ne2.c: No NE/2 card found\n");
++	return -ENXIO;
+ }
+ 
+ void cleanup_module(void)
+@@ -778,14 +813,11 @@ void cleanup_module(void)
+ 	int this_dev;
+ 
+ 	for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_ne[this_dev];
+-		if (dev->priv != NULL) {
+-			mca_mark_as_unused(ei_status.priv);
+-			mca_set_adapter_procfn( ei_status.priv, NULL, NULL);
+-			kfree(dev->priv);
+-			free_irq(dev->irq, dev);
+-			release_region(dev->base_addr, NE_IO_EXTENT);
++		struct net_device *dev = dev_ne[this_dev];
++		if (dev) {
+ 			unregister_netdev(dev);
++			cleanup_card(dev);
++			free_netdev(dev);
+ 		}
+ 	}
+ }
+--- linux-2.6.0/drivers/net/ne2k_cbus.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/ne2k_cbus.c	2003-12-28 23:21:01.000000000 -0800
+@@ -78,7 +78,6 @@ bad_clone_list[] __initdata = {
+ 
+ #include "ne2k_cbus.h"
+ 
+-int ne_probe(struct net_device *dev);
+ static int ne_probe1(struct net_device *dev, int ioaddr);
+ static int ne_open(struct net_device *dev);
+ static int ne_close(struct net_device *dev);
+@@ -113,9 +112,10 @@ static void ne_block_output(struct net_d
+ 	E2010	 starts at 0x100 and ends at 0x4000.
+ 	E2010-x starts at 0x100 and ends at 0xffff.  */
+ 
+-int __init ne_probe(struct net_device *dev)
++static int __init do_ne_probe(struct net_device *dev)
+ {
+ 	unsigned int base_addr = dev->base_addr;
++	int irq = dev->irq;
+ 
+ 	SET_MODULE_OWNER(dev);
+ 
+@@ -135,7 +135,7 @@ int __init ne_probe(struct net_device *d
+ 		if (ei_debug > 2)
+ 			printk(KERN_DEBUG "ne_probe(): call ne_probe_cbus(base_addr=0x%x)\n", base_addr);
+ 
+-		result = ne_probe_cbus(dev, hw, base_addr);
++		result = ne_probe_cbus(dev, hw, base_addr, irq);
+ 		if (result != 0)
+ 			ne2k_cbus_destroy(dev);
+ 
+@@ -156,13 +156,13 @@ int __init ne_probe(struct net_device *d
+ 		if (hw && hw->hwtype) {
+ 			const unsigned short *plist;
+ 			for (plist = hw->portlist; *plist; plist++)
+-				if (ne_probe_cbus(dev, hw, *plist) == 0)
++				if (ne_probe_cbus(dev, hw, *plist, irq) == 0)
+ 					return 0;
+ 		} else {
+ 			for (hw = &ne2k_cbus_hwinfo_list[0]; hw->hwtype; hw++) {
+ 				const unsigned short *plist;
+ 				for (plist = hw->portlist; *plist; plist++)
+-					if (ne_probe_cbus(dev, hw, *plist) == 0)
++					if (ne_probe_cbus(dev, hw, *plist, irq) == 0)
+ 						return 0;
+ 			}
+ 		}
+@@ -174,7 +174,45 @@ int __init ne_probe(struct net_device *d
+ 	return -ENODEV;
+ }
+ 
+-static int __init ne_probe_cbus(struct net_device *dev, const struct ne2k_cbus_hwinfo *hw, int ioaddr)
++static void cleanup_card(struct net_device *dev)
++{
++	const struct ne2k_cbus_region *rlist;
++	const struct ne2k_cbus_hwinfo *hw = ne2k_cbus_get_hwinfo((int)(dev->mem_start & NE2K_CBUS_HARDWARE_TYPE_MASK));
++
++	free_irq(dev->irq, dev);
++	for (rlist = hw->regionlist; rlist->range; rlist++) {
++		release_region(dev->base_addr + rlist->start,
++				rlist->range);
++	}
++	ne2k_cbus_destroy(dev);
++}
++
++struct net_device * __init ne_probe(int unit)
++{
++	struct net_device *dev = alloc_ei_netdev();
++	int err;
++
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	sprintf(dev->name, "eth%d", unit);
++	netdev_boot_setup_check(dev);
++
++	err = do_ne_probe(dev);
++	if (err)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	cleanup_card(dev);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
++}
++
++static int __init ne_probe_cbus(struct net_device *dev, const struct ne2k_cbus_hwinfo *hw, int ioaddr, int irq)
+ {
+ 	if (ei_debug > 2)
+ 		printk(KERN_DEBUG "ne_probe_cbus(): entered. (called from %p)\n",
+@@ -182,6 +220,7 @@ static int __init ne_probe_cbus(struct n
+ 
+ 	if (hw && hw->hwtype) {
+ 		ne2k_cbus_set_hwtype(dev, hw, ioaddr);
++		dev->irq = irq;
+ 		return ne_probe1(dev, ioaddr);
+ 	} else {
+ 		/* auto detect */
+@@ -189,6 +228,7 @@ static int __init ne_probe_cbus(struct n
+ 		printk(KERN_DEBUG "ne_probe_cbus(): try to determine hardware types.\n");
+ 		for (hw = &ne2k_cbus_hwinfo_list[0]; hw->hwtype; hw++) {
+ 			ne2k_cbus_set_hwtype(dev, hw, ioaddr);
++			dev->irq = irq;
+ 			if (ne_probe1(dev, ioaddr) == 0)
+ 				return 0;
+ 		}
+@@ -301,11 +341,12 @@ static int __init ne_probe1(struct net_d
+ 		if (ei_debug > 2)
+ 			printk(" [CNET98EL-specific initialize...");
+ 		outb_p(E8390_NODMA | E8390_STOP, ioaddr + E8390_CMD); /* 0x20|0x1 */
++		ret = -ENODEV;
+ 		i = inb(ioaddr);
+ 		if ((i & ~0x2) != (0x20 | 0x01))
+-			return -ENODEV;
++			goto err_out;
+ 		if ((inb(ioaddr + 0x7) & 0x80) != 0x80)
+-			return -ENODEV;
++			goto err_out;
+ 		outb_p(E8390_RXOFF, ioaddr + EN0_RXCR); /* out(ioaddr+0xc, 0x20) */
+ 		/* outb_p(ENDCFG_WTS|ENDCFG_FT1|ENDCFG_LS, ioaddr+EN0_DCFG); */
+ 		outb_p(ENDCFG_WTS | 0x48, ioaddr + EN0_DCFG); /* 0x49 */
+@@ -330,7 +371,7 @@ static int __init ne_probe1(struct net_d
+ 			if (ei_debug > 2)
+ 				printk("] ");
+ 			printk("memory failure at %x\n", i);
+-			return -ENODEV;
++			goto err_out;
+ 		}
+ 		if (ei_debug > 2)
+ 			printk(" good...");
+@@ -338,7 +379,7 @@ static int __init ne_probe1(struct net_d
+ 			if (ei_debug > 2)
+ 				printk("] ");
+ 			printk("IRQ must be specified for C-NET(98)E/L. probe failed.\n");
+-			return -ENODEV;
++			goto err_out;
+ 		}
+ 		outb((dev->irq > 5) ? (dev->irq & 4):(dev->irq >> 1), ioaddr + (0x2 | 0x400));
+ 		outb(0x7e, ioaddr + (0x4 | 0x400));
+@@ -457,14 +498,6 @@ static int __init ne_probe1(struct net_d
+ 		goto err_out;
+ 	}
+ 
+-	/* Allocate dev->priv and fill in 8390 specific dev fields. */
+-	if (ethdev_init(dev))
+-	{
+-        	printk (" unable to get memory for dev->priv.\n");
+-        	ret = -ENOMEM;
+-		goto err_out;
+-	}
+-
+ 	/* Snarf the interrupt now.  There's no point in waiting since we cannot
+ 	   share and the board will usually be enabled. */
+ 	ret = request_irq(dev->irq, ei_interrupt, 0, name, dev);
+@@ -779,7 +812,7 @@ retry:
+ 
+ #ifdef MODULE
+ #define MAX_NE_CARDS	4	/* Max number of NE cards per module */
+-static struct net_device dev_ne[MAX_NE_CARDS];
++static struct net_device *dev_ne[MAX_NE_CARDS];
+ static int io[MAX_NE_CARDS];
+ static int irq[MAX_NE_CARDS];
+ static int bad[MAX_NE_CARDS];	/* 0xbad = bad sig or no reset ack */
+@@ -806,26 +839,32 @@ int init_module(void)
+ 	int this_dev, found = 0;
+ 
+ 	for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_ne[this_dev];
++		struct net_device *dev = alloc_ei_netdev();
++		if (!dev)
++			break;
+ 		dev->irq = irq[this_dev];
+ 		dev->mem_end = bad[this_dev];
+ 		dev->base_addr = io[this_dev];
+ 		dev->mem_start = hwtype[this_dev];
+-		dev->init = ne_probe;
+-		if (register_netdev(dev) == 0) {
+-			found++;
+-			continue;
+-		}
+-		if (found != 0) { 	/* Got at least one. */
+-			return 0;
++		if (do_ne_probe(dev) == 0) {
++			if (register_netdev(dev) == 0) {
++				dev_ne[found++] = dev;
++				continue;
++			}
++			cleanup_card(dev);
+ 		}
++		free_netdev(dev);
++		if (found)
++			break;
+ 		if (io[this_dev] != 0)
+ 			printk(KERN_WARNING "ne2k_cbus: No NE*000 card found at i/o = %#x\n", io[this_dev]);
+ 		else
+-			printk(KERN_NOTICE "ne2k_cbus: You must supply \"io=0xNNN\" value(s) for C-Bus cards.\n");
++			printk(KERN_NOTICE "ne.c: You must supply \"io=0xNNN\" value(s) for ISA cards.\n");
+ 		return -ENXIO;
+ 	}
+-	return 0;
++	if (found)
++		return 0;
++ 	return -ENODEV;
+ }
+ 
+ void cleanup_module(void)
+@@ -833,18 +872,11 @@ void cleanup_module(void)
+ 	int this_dev;
+ 
+ 	for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_ne[this_dev];
+-		if (dev->priv != NULL) {
+-			const struct ne2k_cbus_region *rlist;
+-			const struct ne2k_cbus_hwinfo *hw = ne2k_cbus_get_hwinfo((int)(dev->mem_start & NE2K_CBUS_HARDWARE_TYPE_MASK));
+-
+-			free_irq(dev->irq, dev);
+-			for (rlist = hw->regionlist; rlist->range; rlist++) {
+-				release_region(dev->base_addr + rlist->start,
+-						rlist->range);
+-			}
++		struct net_device *dev = dev_ne[this_dev];
++		if (dev) {
+ 			unregister_netdev(dev);
+-			ne2k_cbus_destroy(dev);
++			cleanup_card(dev);
++			free_netdev(dev);
+ 		}
+ 	}
+ }
+--- linux-2.6.0/drivers/net/ne2k_cbus.h	2003-06-14 12:17:57.000000000 -0700
++++ 25/drivers/net/ne2k_cbus.h	2003-12-28 23:21:01.000000000 -0800
+@@ -477,5 +477,5 @@ static void __init ne2k_cbus_writemem(st
+ }
+ #endif
+ 
+-static int ne_probe_cbus(struct net_device *dev, const struct ne2k_cbus_hwinfo *hw, int ioaddr);
++static int ne_probe_cbus(struct net_device *dev, const struct ne2k_cbus_hwinfo *hw, int ioaddr, int irq);
+ /* End of ne2k_cbus.h */
+--- linux-2.6.0/drivers/net/ne2k-pci.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/ne2k-pci.c	2003-12-28 23:21:01.000000000 -0800
+@@ -115,6 +115,7 @@ enum ne2k_pci_chipsets {
+ 	CH_Winbond_W89C940F,
+ 	CH_Holtek_HT80232,
+ 	CH_Holtek_HT80229,
++	CH_Winbond_89C940_8c4a,
+ };
+ 
+ 
+@@ -132,6 +133,7 @@ static struct {
+ 	{"Winbond W89C940F", 0},
+ 	{"Holtek HT80232", ONLY_16BIT_IO | HOLTEK_FDX},
+ 	{"Holtek HT80229", ONLY_32BIT_IO | HOLTEK_FDX | STOP_PG_0x60 },
++	{"Winbond W89C940(misprogrammed)", 0},
+ 	{0,}
+ };
+ 
+@@ -147,6 +149,7 @@ static struct pci_device_id ne2k_pci_tbl
+ 	{ 0x1050, 0x5a5a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Winbond_W89C940F },
+ 	{ 0x12c3, 0x0058, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Holtek_HT80232 },
+ 	{ 0x12c3, 0x5598, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Holtek_HT80229 },
++	{ 0x8c4a, 0x1980, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Winbond_89C940_8c4a },
+ 	{ 0, }
+ };
+ MODULE_DEVICE_TABLE(pci, ne2k_pci_tbl);
+--- linux-2.6.0/drivers/net/ne3210.c	2003-10-08 15:07:09.000000000 -0700
++++ 25/drivers/net/ne3210.c	2003-12-28 23:21:01.000000000 -0800
+@@ -111,12 +111,6 @@ static int __init ne3210_eisa_probe (str
+ 	device->driver_data = dev;
+ 	ioaddr = edev->base_addr;
+ 
+-	if (ethdev_init (dev)) {
+-		printk ("ne3210.c: unable to allocate memory for dev->priv!\n");
+-		retval = -ENOMEM;
+-		goto out;
+-	}
+-
+ 	if (!request_region(ioaddr, NE3210_IO_EXTENT, dev->name)) {
+ 		retval = -EBUSY;
+ 		goto out;
+@@ -357,24 +351,6 @@ static struct eisa_driver ne3210_eisa_dr
+ 	},
+ };
+ 
+-#ifdef MODULE
+-#if 0
+-#define MAX_NE3210_CARDS	4	/* Max number of NE3210 cards per module */
+-static struct net_device dev_ne3210[MAX_NE3210_CARDS];
+-static int io[MAX_NE3210_CARDS];
+-static int irq[MAX_NE3210_CARDS];
+-static int mem[MAX_NE3210_CARDS];
+-
+-MODULE_PARM(io, "1-" __MODULE_STRING(MAX_NE3210_CARDS) "i");
+-MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_NE3210_CARDS) "i");
+-MODULE_PARM(mem, "1-" __MODULE_STRING(MAX_NE3210_CARDS) "i");
+-MODULE_PARM_DESC(io, "I/O base address(es)");
+-MODULE_PARM_DESC(irq, "IRQ number(s)");
+-MODULE_PARM_DESC(mem, "memory base address(es)");
+-#endif
+-#endif /* MODULE */
+-
+-
+ MODULE_DESCRIPTION("NE3210 EISA Ethernet driver");
+ MODULE_LICENSE("GPL");
+ 
+--- linux-2.6.0/drivers/net/ne.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/ne.c	2003-12-28 23:21:01.000000000 -0800
+@@ -126,7 +126,6 @@ bad_clone_list[] __initdata = {
+ #define NESM_START_PG	0x40	/* First page of TX buffer */
+ #define NESM_STOP_PG	0x80	/* Last page +1 of RX ring */
+ 
+-int ne_probe(struct net_device *dev);
+ static int ne_probe1(struct net_device *dev, int ioaddr);
+ static int ne_probe_isapnp(struct net_device *dev);
+ 
+@@ -163,9 +162,10 @@ static void ne_block_output(struct net_d
+ 	E2010	 starts at 0x100 and ends at 0x4000.
+ 	E2010-x starts at 0x100 and ends at 0xffff.  */
+ 
+-int __init ne_probe(struct net_device *dev)
++static int __init do_ne_probe(struct net_device *dev)
+ {
+ 	unsigned int base_addr = dev->base_addr;
++	int irq = dev->irq;
+ 
+ 	SET_MODULE_OWNER(dev);
+ 
+@@ -183,6 +183,7 @@ int __init ne_probe(struct net_device *d
+ 	/* Last resort. The semi-risky ISA auto-probe. */
+ 	for (base_addr = 0; netcard_portlist[base_addr] != 0; base_addr++) {
+ 		int ioaddr = netcard_portlist[base_addr];
++		dev->irq = irq;
+ 		if (ne_probe1(dev, ioaddr) == 0)
+ 			return 0;
+ 	}
+@@ -191,6 +192,40 @@ int __init ne_probe(struct net_device *d
+ 	return -ENODEV;
+ }
+ 
++static void cleanup_card(struct net_device *dev)
++{
++	struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv;
++	if (idev)
++		pnp_device_detach(idev);
++	free_irq(dev->irq, dev);
++	release_region(dev->base_addr, NE_IO_EXTENT);
++}
++
++struct net_device * __init ne_probe(int unit)
++{
++	struct net_device *dev = alloc_ei_netdev();
++	int err;
++
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	sprintf(dev->name, "eth%d", unit);
++	netdev_boot_setup_check(dev);
++
++	err = do_ne_probe(dev);
++	if (err)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	cleanup_card(dev);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
++}
++
+ static int __init ne_probe_isapnp(struct net_device *dev)
+ {
+ 	int i;
+@@ -425,20 +460,12 @@ static int __init ne_probe1(struct net_d
+ 		goto err_out;
+ 	}
+ 
+-	/* Allocate dev->priv and fill in 8390 specific dev fields. */
+-	if (ethdev_init(dev))
+-	{
+-        	printk (" unable to get memory for dev->priv.\n");
+-        	ret = -ENOMEM;
+-		goto err_out;
+-	}
+-
+ 	/* Snarf the interrupt now.  There's no point in waiting since we cannot
+ 	   share and the board will usually be enabled. */
+ 	ret = request_irq(dev->irq, ei_interrupt, 0, name, dev);
+ 	if (ret) {
+ 		printk (" unable to get IRQ %d (errno=%d).\n", dev->irq, ret);
+-		goto err_out_kfree;
++		goto err_out;
+ 	}
+ 
+ 	dev->base_addr = ioaddr;
+@@ -472,9 +499,6 @@ static int __init ne_probe1(struct net_d
+ 	NS8390_init(dev, 0);
+ 	return 0;
+ 
+-err_out_kfree:
+-	kfree(dev->priv);
+-	dev->priv = NULL;
+ err_out:
+ 	release_region(ioaddr, NE_IO_EXTENT);
+ 	return ret;
+@@ -734,7 +758,7 @@ retry:
+ 
+ #ifdef MODULE
+ #define MAX_NE_CARDS	4	/* Max number of NE cards per module */
+-static struct net_device dev_ne[MAX_NE_CARDS];
++static struct net_device *dev_ne[MAX_NE_CARDS];
+ static int io[MAX_NE_CARDS];
+ static int irq[MAX_NE_CARDS];
+ static int bad[MAX_NE_CARDS];	/* 0xbad = bad sig or no reset ack */
+@@ -758,25 +782,31 @@ int init_module(void)
+ 	int this_dev, found = 0;
+ 
+ 	for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_ne[this_dev];
++		struct net_device *dev = alloc_ei_netdev();
++		if (!dev)
++			break;
+ 		dev->irq = irq[this_dev];
+ 		dev->mem_end = bad[this_dev];
+ 		dev->base_addr = io[this_dev];
+-		dev->init = ne_probe;
+-		if (register_netdev(dev) == 0) {
+-			found++;
+-			continue;
+-		}
+-		if (found != 0) { 	/* Got at least one. */
+-			return 0;
++		if (do_ne_probe(dev) == 0) {
++			if (register_netdev(dev) == 0) {
++				dev_ne[found++] = dev;
++				continue;
++			}
++			cleanup_card(dev);
+ 		}
++		free_netdev(dev);
++		if (found)
++			break;
+ 		if (io[this_dev] != 0)
+ 			printk(KERN_WARNING "ne.c: No NE*000 card found at i/o = %#x\n", io[this_dev]);
+ 		else
+ 			printk(KERN_NOTICE "ne.c: You must supply \"io=0xNNN\" value(s) for ISA cards.\n");
+ 		return -ENXIO;
+ 	}
+-	return 0;
++	if (found)
++		return 0;
++	return -ENODEV;
+ }
+ 
+ void cleanup_module(void)
+@@ -784,16 +814,11 @@ void cleanup_module(void)
+ 	int this_dev;
+ 
+ 	for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_ne[this_dev];
+-		if (dev->priv != NULL) {
+-			void *priv = dev->priv;
+-			struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv;
+-			if (idev)
+-				pnp_device_detach(idev);
+-			free_irq(dev->irq, dev);
+-			release_region(dev->base_addr, NE_IO_EXTENT);
++		struct net_device *dev = dev_ne[this_dev];
++		if (dev) {
+ 			unregister_netdev(dev);
+-			kfree(priv);
++			cleanup_card(dev);
++			free_netdev(dev);
+ 		}
+ 	}
+ }
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/net/netconsole.c	2003-12-28 23:21:01.000000000 -0800
+@@ -0,0 +1,120 @@
++/*
++ *  linux/drivers/net/netconsole.c
++ *
++ *  Copyright (C) 2001  Ingo Molnar <mingo@redhat.com>
++ *
++ *  This file contains the implementation of an IRQ-safe, crash-safe
++ *  kernel console implementation that outputs kernel messages to the
++ *  network.
++ *
++ * Modification history:
++ *
++ * 2001-09-17    started by Ingo Molnar.
++ * 2003-08-11    2.6 port by Matt Mackall
++ *               simplified options
++ *               generic card hooks
++ *               works non-modular
++ * 2003-09-07    rewritten with netpoll api
++ */
++
++/****************************************************************
++ *      This program is free software; you can redistribute it and/or modify
++ *      it under the terms of the GNU General Public License as published by
++ *      the Free Software Foundation; either version 2, or (at your option)
++ *      any later version.
++ *
++ *      This program is distributed in the hope that it will be useful,
++ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *      GNU General Public License for more details.
++ *
++ *      You should have received a copy of the GNU General Public License
++ *      along with this program; if not, write to the Free Software
++ *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ *
++ ****************************************************************/
++
++#include <linux/mm.h>
++#include <linux/tty.h>
++#include <linux/init.h>
++#include <linux/module.h>
++#include <linux/console.h>
++#include <linux/tty_driver.h>
++#include <linux/module.h>
++#include <linux/moduleparam.h>
++#include <linux/string.h>
++#include <linux/sysrq.h>
++#include <linux/smp.h>
++#include <linux/netpoll.h>
++
++MODULE_AUTHOR("Maintainer: Matt Mackall <mpm@selenic.com>");
++MODULE_DESCRIPTION("Console driver for network interfaces");
++MODULE_LICENSE("GPL");
++
++static char config[256];
++module_param_string(netconsole, config, 256, 0);
++MODULE_PARM_DESC(netconsole, " netconsole=[src-port]@[src-ip]/[dev],[tgt-port]@<tgt-ip>/[tgt-macaddr]\n");
++
++static struct netpoll np = {
++	.name = "netconsole",
++	.dev_name = "eth0",
++	.local_port = 6665,
++	.remote_port = 6666,
++	.remote_mac = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
++};
++
++#define MAX_PRINT_CHUNK 1000
++
++static void write_msg(struct console *con, const char *msg, unsigned int len)
++{
++	int frag, left;
++	unsigned long flags;
++
++	if (!np.dev)
++		return;
++
++	local_irq_save(flags);
++
++	for(left = len; left; ) {
++		frag = min(left, MAX_PRINT_CHUNK);
++		netpoll_send_udp(&np, msg, frag);
++		msg += frag;
++		left -= frag;
++	}
++
++	local_irq_restore(flags);
++}
++
++static struct console netconsole = {
++	.flags = CON_ENABLED | CON_PRINTBUFFER,
++	.write = write_msg
++};
++
++static int option_setup(char *opt)
++{
++	return netpoll_parse_options(&np, opt);
++}
++
++__setup("netconsole=", option_setup);
++
++static int init_netconsole(void)
++{
++	if(strlen(config) && option_setup(config))
++		return 1;
++
++	if(!np.remote_ip || netpoll_setup(&np))
++		return 1;
++
++	register_console(&netconsole);
++	printk(KERN_INFO "netconsole: network logging started\n");
++	return 0;
++}
++
++static void cleanup_netconsole(void)
++{
++	unregister_console(&netconsole);
++	netpoll_cleanup(&np);
++}
++
++module_init(init_netconsole);
++module_exit(cleanup_netconsole);
+--- linux-2.6.0/drivers/net/net_init.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/net/net_init.c	2003-12-28 23:21:01.000000000 -0800
+@@ -73,23 +73,28 @@
+ struct net_device *alloc_netdev(int sizeof_priv, const char *mask,
+ 				       void (*setup)(struct net_device *))
+ {
++	void *p;
+ 	struct net_device *dev;
+ 	int alloc_size;
+ 
+-	/* ensure 32-byte alignment of the private area */
+-	alloc_size = sizeof (*dev) + sizeof_priv + 31;
++	/* ensure 32-byte alignment of both the device and private area */
+ 
+-	dev = (struct net_device *) kmalloc (alloc_size, GFP_KERNEL);
+-	if (dev == NULL)
+-	{
+-		printk(KERN_ERR "alloc_dev: Unable to allocate device memory.\n");
++	alloc_size = (sizeof(struct net_device) + 31) & ~31;
++	alloc_size += sizeof_priv + 31;
++
++	p = kmalloc (alloc_size, GFP_KERNEL);
++	if (!p) {
++		printk(KERN_ERR "alloc_dev: Unable to allocate device.\n");
+ 		return NULL;
+ 	}
+ 
+-	memset(dev, 0, alloc_size);
++	memset(p, 0, alloc_size);
++
++	dev = (struct net_device *)(((long)p + 31) & ~31);
++	dev->padded = (char *)dev - (char *)p;
+ 
+ 	if (sizeof_priv)
+-		dev->priv = (void *) (((long)(dev + 1) + 31) & ~31);
++		dev->priv = netdev_priv(dev);
+ 
+ 	setup(dev);
+ 	strcpy(dev->name, mask);
+--- linux-2.6.0/drivers/net/ni5010.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/ni5010.c	2003-12-28 23:21:01.000000000 -0800
+@@ -82,7 +82,7 @@ static unsigned int bufsize_rcv;
+ 
+ #ifndef FULL_IODETECT
+ /* A zero-terminated list of I/O addresses to be probed. */
+-static unsigned int ni5010_portlist[] __initdata =
++static unsigned int ports[] __initdata =
+ 	{ 0x300, 0x320, 0x340, 0x360, 0x380, 0x3a0, 0 };
+ #endif
+ 
+@@ -95,13 +95,11 @@ static unsigned int ni5010_portlist[] __
+ struct ni5010_local {
+ 	struct net_device_stats stats;
+ 	int o_pkt_size;
+-	int i_pkt_size;
+ 	spinlock_t lock;
+ };
+ 
+ /* Index to functions, as function prototypes. */
+ 
+-extern int 	ni5010_probe(struct net_device *dev);
+ static int	ni5010_probe1(struct net_device *dev, int ioaddr);
+ static int	ni5010_open(struct net_device *dev);
+ static int	ni5010_send_packet(struct sk_buff *skb, struct net_device *dev);
+@@ -120,38 +118,58 @@ static void 	chipset_init(struct net_dev
+ static void	dump_packet(void *buf, int len);
+ static void 	ni5010_show_registers(struct net_device *dev);
+ 
++static int io;
++static int irq;
+ 
+-int __init ni5010_probe(struct net_device *dev)
++struct net_device * __init ni5010_probe(int unit)
+ {
++	struct net_device *dev = alloc_etherdev(sizeof(struct ni5010_local));
+ 	int *port;
+-	int base_addr = dev->base_addr;
++	int err = 0;
+ 
+-        PRINTK2((KERN_DEBUG "%s: Entering ni5010_probe\n", dev->name));
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
+ 
+-	SET_MODULE_OWNER(dev);
++	if (unit >= 0) {
++		sprintf(dev->name, "eth%d", unit);
++		netdev_boot_setup_check(dev);
++		io = dev->base_addr;
++		irq = dev->irq;
++	}
+ 
+-	if (base_addr > 0x1ff)		/* Check a single specified location. */
+-		return ni5010_probe1(dev, base_addr);
+-	else if (base_addr != 0)	/* Don't probe at all. */
+-		return -ENXIO;
++	PRINTK2((KERN_DEBUG "%s: Entering ni5010_probe\n", dev->name));
+ 
++	SET_MODULE_OWNER(dev);
++
++	if (io > 0x1ff)	{	/* Check a single specified location. */
++		err = ni5010_probe1(dev, io);
++	} else if (io != 0) {	/* Don't probe at all. */
++		err = -ENXIO;
++	} else {
+ #ifdef FULL_IODETECT
+-		for (int ioaddr=0x200; ioaddr<0x400; ioaddr+=0x20) {
+-			if (check_region(ioaddr, NI5010_IO_EXTENT))
+-				continue;
+-			if (ni5010_probe1(dev, ioaddr) == 0)
+-				return 0;
+-		}
++		for (io=0x200; io<0x400 && ni5010_probe1(dev, io) ; io+=0x20)
++			;
++		if (io == 0x400)
++			err = -ENODEV;
++
+ #else
+-		for (port = ni5010_portlist; *port; port++) {
+-			int ioaddr = *port;
+-			if (check_region(ioaddr, NI5010_IO_EXTENT))
+-				continue;
+-			if (ni5010_probe1(dev, ioaddr) == 0)
+-				return 0;
+-		}
++		for (port = ports; *port && ni5010_probe1(dev, *port); port++)
++			;
++		if (!*port)
++			err = -ENODEV;
+ #endif	/* FULL_IODETECT */
+-	return -ENODEV;
++	}
++	if (err)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	release_region(dev->base_addr, NI5010_IO_EXTENT);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
+ static inline int rd_port(int ioaddr)
+@@ -188,9 +206,17 @@ static void __init trigger_irq(int ioadd
+ static int __init ni5010_probe1(struct net_device *dev, int ioaddr)
+ {
+ 	static unsigned version_printed;
++	struct ni5010_local *lp;
+ 	int i;
+ 	unsigned int data = 0;
+ 	int boguscount = 40;
++	int err = -ENODEV;
++
++	dev->base_addr = ioaddr;
++	dev->irq = irq;
++
++	if (!request_region(ioaddr, NI5010_IO_EXTENT, boardname))
++		return -EBUSY;
+ 
+ 	/*
+ 	 * This is no "official" probe method, I've rather tested which
+@@ -205,36 +231,40 @@ static int __init ni5010_probe1(struct n
+ 	 *
+ 	 *   - Andreas
+ 	 */
+-	
++
+  	PRINTK2((KERN_DEBUG "%s: entering ni5010_probe1(%#3x)\n", 
+  		dev->name, ioaddr));
+ 
+-	if (inb(ioaddr+0) == 0xff) return -ENODEV;
++	if (inb(ioaddr+0) == 0xff)
++		goto out;
+ 
+ 	while ( (rd_port(ioaddr) & rd_port(ioaddr) & rd_port(ioaddr) &
+ 		 rd_port(ioaddr) & rd_port(ioaddr) & rd_port(ioaddr)) != 0xff)
+ 	{
+-		if (boguscount-- == 0) return -ENODEV;
++		if (boguscount-- == 0)
++			goto out;
+ 	}
+ 
+ 	PRINTK2((KERN_DEBUG "%s: I/O #1 passed!\n", dev->name));
+ 
+ 	for (i=0; i<32; i++)
+ 		if ( (data = rd_port(ioaddr)) != 0xff) break;
+-	if (data==0xff) return -ENODEV;
++	if (data==0xff)
++		goto out;
+ 
+ 	PRINTK2((KERN_DEBUG "%s: I/O #2 passed!\n", dev->name));
+ 
+-	if (		(data == SA_ADDR0) &&
+-	     (rd_port(ioaddr) == SA_ADDR1) &&
+-	     (rd_port(ioaddr) == SA_ADDR2) ) {
+-		for (i=0; i<4; i++) rd_port(ioaddr);
+-		if ( (rd_port(ioaddr) != NI5010_MAGICVAL1) ||
+-		     (rd_port(ioaddr) != NI5010_MAGICVAL2) ) {
+-		     	return -ENODEV;
+-		}
+-	} else return -ENODEV;
+-	
++	if ((data != SA_ADDR0) || (rd_port(ioaddr) != SA_ADDR1) ||
++	    (rd_port(ioaddr) != SA_ADDR2))
++		goto out;
++
++	for (i=0; i<4; i++)
++		rd_port(ioaddr);
++
++	if ( (rd_port(ioaddr) != NI5010_MAGICVAL1) ||
++	     (rd_port(ioaddr) != NI5010_MAGICVAL2) )
++		goto out;
++
+ 	PRINTK2((KERN_DEBUG "%s: I/O #3 passed!\n", dev->name));
+ 
+ 	if (NI5010_DEBUG && version_printed++ == 0)
+@@ -267,8 +297,9 @@ static int __init ni5010_probe1(struct n
+ 		PRINTK2((KERN_DEBUG "%s: I/O #6 passed!\n", dev->name));
+ 
+ 		if (dev->irq == 0) {
++			err = -EAGAIN;
+ 			printk(KERN_WARNING "%s: no IRQ found!\n", dev->name);
+-			return -EAGAIN;
++			goto out;
+ 		}
+ 		PRINTK2((KERN_DEBUG "%s: I/O #7 passed!\n", dev->name));
+ 	} else if (dev->irq == 2) {
+@@ -278,19 +309,9 @@ static int __init ni5010_probe1(struct n
+ 	PRINTK2((KERN_DEBUG "%s: I/O #9 passed!\n", dev->name));
+ 
+ 	/* DMA is not supported (yet?), so no use detecting it */
++	lp = (struct ni5010_local*)dev->priv;
+ 
+-	if (dev->priv == NULL) {
+-		struct ni5010_local* lp;
+-
+-		dev->priv = kmalloc(sizeof(struct ni5010_local), GFP_KERNEL|GFP_DMA);
+-		if (dev->priv == NULL) {
+-			printk(KERN_WARNING "%s: Failed to allocate private memory\n", dev->name);
+-			return -ENOMEM;
+-		}
+-
+-		lp = (struct ni5010_local*)dev->priv;
+-		spin_lock_init(&lp->lock);
+-	}
++	spin_lock_init(&lp->lock);
+ 
+ 	PRINTK2((KERN_DEBUG "%s: I/O #10 passed!\n", dev->name));
+ 
+@@ -315,9 +336,6 @@ static int __init ni5010_probe1(struct n
+ 	}
+         printk("// bufsize rcv/xmt=%d/%d\n", bufsize_rcv, NI5010_BUFSIZE);
+ 	memset(dev->priv, 0, sizeof(struct ni5010_local));
+-
+-	/* Grab the region so we can find another board if autoIRQ fails. */
+-	request_region(ioaddr, NI5010_IO_EXTENT, boardname);
+ 	
+ 	dev->open		= ni5010_open;
+ 	dev->stop		= ni5010_close;
+@@ -327,9 +345,6 @@ static int __init ni5010_probe1(struct n
+ 	dev->tx_timeout		= ni5010_timeout;
+ 	dev->watchdog_timeo	= HZ/20;
+ 
+-	/* Fill in the fields of the device structure with ethernet values. */
+-	ether_setup(dev);
+-	
+ 	dev->flags &= ~IFF_MULTICAST;	/* Multicast doesn't work */
+ 
+ 	/* Shut up the ni5010 */
+@@ -345,6 +360,9 @@ static int __init ni5010_probe1(struct n
+ 	printk(KERN_INFO "Join the NI5010 driver development team!\n");
+ 	printk(KERN_INFO "Mail to a.mohr@mailto.de or jvbest@wi.leidenuniv.nl\n");
+ 	return 0;
++out:
++	release_region(dev->base_addr, NI5010_IO_EXTENT);
++	return err;
+ }
+ 
+ /* 
+@@ -513,6 +531,7 @@ static void ni5010_rx(struct net_device 
+ 	int ioaddr = dev->base_addr;
+ 	unsigned char rcv_stat;
+ 	struct sk_buff *skb;
++	int i_pkt_size;
+ 	
+ 	PRINTK2((KERN_DEBUG "%s: entering ni5010_rx()\n", dev->name)); 
+ 	
+@@ -532,17 +551,17 @@ static void ni5010_rx(struct net_device 
+ 	
+         outb(0xff, EDLC_RCLR);  /* Clear the interrupt */
+ 
+-	lp->i_pkt_size = inw(IE_RCNT);
+-	if (lp->i_pkt_size > ETH_FRAME_LEN || lp->i_pkt_size < 10 ) {
++	i_pkt_size = inw(IE_RCNT);
++	if (i_pkt_size > ETH_FRAME_LEN || i_pkt_size < 10 ) {
+ 		PRINTK((KERN_DEBUG "%s: Packet size error, packet size = %#4.4x\n", 
+-			dev->name, lp->i_pkt_size));
++			dev->name, i_pkt_size));
+ 		lp->stats.rx_errors++;
+ 		lp->stats.rx_length_errors++;
+ 		return;
+ 	}
+ 
+ 	/* Malloc up new buffer. */
+-	skb = dev_alloc_skb(lp->i_pkt_size + 3);
++	skb = dev_alloc_skb(i_pkt_size + 3);
+ 	if (skb == NULL) {
+ 		printk(KERN_WARNING "%s: Memory squeeze, dropping packet.\n", dev->name);
+ 		lp->stats.rx_dropped++;
+@@ -555,7 +574,7 @@ static void ni5010_rx(struct net_device 
+ 	/* Read packet into buffer */
+         outb(MM_MUX, IE_MMODE); /* Rcv buffer to system bus */
+ 	outw(0, IE_GP);	/* Seek to beginning of packet */
+-	insb(IE_RBUF, skb_put(skb, lp->i_pkt_size), lp->i_pkt_size); 
++	insb(IE_RBUF, skb_put(skb, i_pkt_size), i_pkt_size); 
+ 	
+ 	if (NI5010_DEBUG >= 4) 
+ 		dump_packet(skb->data, skb->len); 
+@@ -564,10 +583,10 @@ static void ni5010_rx(struct net_device 
+ 	netif_rx(skb);
+ 	dev->last_rx = jiffies;
+ 	lp->stats.rx_packets++;
+-	lp->stats.rx_bytes += lp->i_pkt_size;
++	lp->stats.rx_bytes += i_pkt_size;
+ 
+ 	PRINTK2((KERN_DEBUG "%s: Received packet, size=%#4.4x\n", 
+-		dev->name, lp->i_pkt_size));
++		dev->name, i_pkt_size));
+ 	
+ }
+ 
+@@ -697,10 +716,10 @@ static void hardware_send_packet(struct 
+ 	
+ 	if (NI5010_DEBUG > 3) dump_packet(buf, length);
+ 
+-        buf_offs = NI5010_BUFSIZE - length - pad;
+-        lp->o_pkt_size = length + pad;
++	buf_offs = NI5010_BUFSIZE - length - pad;
+ 
+ 	spin_lock_irqsave(&lp->lock, flags);
++	lp->o_pkt_size = length + pad;
+ 
+ 	outb(0, EDLC_RMASK);	/* Mask all receive interrupts */
+ 	outb(0, IE_MMODE);	/* Put Xmit buffer on system bus */
+@@ -745,9 +764,7 @@ static void ni5010_show_registers(struct
+ }
+ 
+ #ifdef MODULE
+-static struct net_device dev_ni5010;
+-static int io;
+-static int irq;
++static struct net_device *dev_ni5010;
+ 
+ MODULE_PARM(io, "i");
+ MODULE_PARM(irq, "i");
+@@ -756,8 +773,6 @@ MODULE_PARM_DESC(irq, "ni5010 IRQ number
+ 
+ int init_module(void)
+ {
+-	int result;
+-	
+ 	PRINTK2((KERN_DEBUG "%s: entering init_module\n", boardname));
+ 	/*
+ 	if(io <= 0 || irq == 0){
+@@ -771,29 +786,18 @@ int init_module(void)
+ 	}
+ 
+ 	PRINTK2((KERN_DEBUG "%s: init_module irq=%#2x, io=%#3x\n", boardname, irq, io));
+-        dev_ni5010.irq=irq;
+-        dev_ni5010.base_addr=io;
+-	dev_ni5010.init=ni5010_probe;
+-        if ((result = register_netdev(&dev_ni5010)) != 0) {
+-        	PRINTK((KERN_WARNING "%s: register_netdev returned %d.\n", 
+-        		boardname, result));
+-                return -EIO;
+-        }
++	dev_ni5010 = ni5010_probe(-1);
++	if (IS_ERR(dev_ni5010))
++		return PTR_ERR(dev_ni5010);
+         return 0;
+ }
+ 
+-void
+-cleanup_module(void)
++void cleanup_module(void)
+ {
+ 	PRINTK2((KERN_DEBUG "%s: entering cleanup_module\n", boardname));
+-
+-        unregister_netdev(&dev_ni5010);
+-
+-	release_region(dev_ni5010.base_addr, NI5010_IO_EXTENT);
+-	if (dev_ni5010.priv != NULL){
+-	        kfree(dev_ni5010.priv);
+-	        dev_ni5010.priv = NULL;
+-	}
++	unregister_netdev(dev_ni5010);
++	release_region(dev_ni5010->base_addr, NI5010_IO_EXTENT);
++	free_netdev(dev_ni5010);
+ }
+ #endif /* MODULE */
+ MODULE_LICENSE("GPL");
+--- linux-2.6.0/drivers/net/ni52.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/ni52.c	2003-12-28 23:21:01.000000000 -0800
+@@ -354,50 +354,76 @@ static void alloc586(struct net_device *
+ 	memset((char *)p->scb,0,sizeof(struct scb_struct));
+ }
+ 
++/* set: io,irq,memstart,memend or set it when calling insmod */
++static int irq=9;
++static int io=0x300;
++static long memstart;	/* e.g 0xd0000 */
++static long memend;	/* e.g 0xd4000 */
++
+ /**********************************************
+  * probe the ni5210-card
+  */
+-int __init ni52_probe(struct net_device *dev)
++struct net_device * __init ni52_probe(int unit)
+ {
+-#ifndef MODULE
+-	int *port;
++	struct net_device *dev = alloc_etherdev(sizeof(struct priv));
+ 	static int ports[] = {0x300, 0x280, 0x360 , 0x320 , 0x340, 0};
+-#endif
+-	int base_addr = dev->base_addr;
+-
+-	SET_MODULE_OWNER(dev);
++	int *port;
++	int err = 0;
+ 
+-	if (base_addr > 0x1ff)		/* Check a single specified location. */
+-		return ni52_probe1(dev, base_addr);
+-	else if (base_addr > 0)		/* Don't probe at all. */
+-		return -ENXIO;
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
+ 
+-#ifdef MODULE
+-	printk("%s: no autoprobing allowed for modules.\n",dev->name);
+-#else
+-	for (port = ports; *port; port++) {
+-		int ioaddr = *port;
+-		dev->base_addr = ioaddr;
+-		if (ni52_probe1(dev, ioaddr) == 0)
+-			return 0;
++	if (unit >= 0) {
++		sprintf(dev->name, "eth%d", unit);
++		netdev_boot_setup_check(dev);
++		io = dev->base_addr;
++		irq = dev->irq;
++		memstart = dev->mem_start;
++		memend = dev->mem_end;
+ 	}
+ 
+-#ifdef FULL_IO_PROBE
+-	for(dev->base_addr=0x200; dev->base_addr<0x400; dev->base_addr+=8)
+-		if (ni52_probe1(dev, dev->base_addr) == 0)
+-			return 0;
+-#endif
++	SET_MODULE_OWNER(dev);
+ 
++	if (io > 0x1ff)	{	/* Check a single specified location. */
++		err = ni52_probe1(dev, io);
++	} else if (io > 0) {		/* Don't probe at all. */
++		err = -ENXIO;
++	} else {
++		for (port = ports; *port && ni52_probe1(dev, *port) ; port++)
++			;
++		if (*port)
++			goto got_it;
++#ifdef FULL_IO_PROBE
++		for (io = 0x200; io < 0x400 && ni52_probe1(dev, io); io += 8)
++			;
++		if (io < 0x400)
++			goto got_it;
+ #endif
+-
+-	dev->base_addr = base_addr;
+-	return -ENODEV;
++		err = -ENODEV;
++	}
++	if (err)
++		goto out;
++got_it:
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	release_region(dev->base_addr, NI52_TOTAL_SIZE);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
+ static int __init ni52_probe1(struct net_device *dev,int ioaddr)
+ {
+ 	int i, size, retval;
+ 
++	dev->base_addr = ioaddr;
++	dev->irq = irq;
++	dev->mem_start = memstart;
++	dev->mem_end = memend;
++
+ 	if (!request_region(ioaddr, NI52_TOTAL_SIZE, dev->name))
+ 		return -EBUSY;
+ 
+@@ -416,7 +442,7 @@ static int __init ni52_probe1(struct net
+ 		goto out;
+ 	}
+ 
+-	printk("%s: NI5210 found at %#3lx, ",dev->name,dev->base_addr);
++	printk(KERN_INFO "%s: NI5210 found at %#3lx, ",dev->name,dev->base_addr);
+ 
+ 	/*
+ 	 * check (or search) IO-Memory, 8K and 16K
+@@ -469,13 +495,6 @@ static int __init ni52_probe1(struct net
+ 	dev->mem_end = dev->mem_start + size; /* set mem_end showed by 'ifconfig' */
+ #endif
+ 
+-	dev->priv = (void *) kmalloc(sizeof(struct priv),GFP_KERNEL);
+-	if(dev->priv == NULL) {
+-		printk("%s: Ooops .. can't allocate private driver memory.\n",dev->name);
+-		retval = -ENOMEM;
+-		goto out;
+-	}
+-																	/* warning: we don't free it on errors */
+ 	memset((char *) dev->priv,0,sizeof(struct priv));
+ 
+ 	((struct priv *) (dev->priv))->memtop = isa_bus_to_virt(dev->mem_start) + size;
+@@ -503,8 +522,6 @@ static int __init ni52_probe1(struct net
+ 		if(!dev->irq)
+ 		{
+ 			printk("?autoirq, Failed to detect IRQ line!\n");
+-			kfree(dev->priv);
+-			dev->priv = NULL;
+ 			retval = -EAGAIN;
+ 			goto out;
+ 		}
+@@ -526,8 +543,6 @@ static int __init ni52_probe1(struct net
+ 
+ 	dev->if_port 		= 0;
+ 
+-	ether_setup(dev);
+-
+ 	return 0;
+ out:
+ 	release_region(ioaddr, NI52_TOTAL_SIZE);
+@@ -1295,13 +1310,7 @@ static void set_multicast_list(struct ne
+ }
+ 
+ #ifdef MODULE
+-static struct net_device dev_ni52;
+-
+-/* set: io,irq,memstart,memend or set it when calling insmod */
+-static int irq=9;
+-static int io=0x300;
+-static long memstart;	/* e.g 0xd0000 */
+-static long memend;	/* e.g 0xd4000 */
++static struct net_device *dev_ni52;
+ 
+ MODULE_PARM(io, "i");
+ MODULE_PARM(irq, "i");
+@@ -1318,22 +1327,17 @@ int init_module(void)
+ 		printk("ni52: Autoprobing not allowed for modules.\nni52: Set symbols 'io' 'irq' 'memstart' and 'memend'\n");
+ 		return -ENODEV;
+ 	}
+-	dev_ni52.init = ni52_probe;
+-	dev_ni52.irq = irq;
+-	dev_ni52.base_addr = io;
+-	dev_ni52.mem_end = memend;
+-	dev_ni52.mem_start = memstart;
+-	if (register_netdev(&dev_ni52) != 0)
+-		return -EIO;
++	dev_ni52 = ni52_probe(-1);
++	if (IS_ERR(dev_ni52))
++		return PTR_ERR(dev_ni52);
+ 	return 0;
+ }
+ 
+ void cleanup_module(void)
+ {
+-	release_region(dev_ni52.base_addr, NI52_TOTAL_SIZE);
+-	unregister_netdev(&dev_ni52);
+-	kfree(dev_ni52.priv);
+-	dev_ni52.priv = NULL;
++	unregister_netdev(dev_ni52);
++	release_region(dev_ni52->base_addr, NI52_TOTAL_SIZE);
++	free_netdev(dev_ni52);
+ }
+ #endif /* MODULE */
+ 
+--- linux-2.6.0/drivers/net/ni65.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/ni65.c	2003-12-28 23:21:01.000000000 -0800
+@@ -343,29 +343,64 @@ static int ni65_close(struct net_device 
+ 	return 0;
+ }
+ 
++static void cleanup_card(struct net_device *dev)
++{
++	struct priv *p = (struct priv *) dev->priv;
++	disable_dma(dev->dma);
++	free_dma(dev->dma);
++	release_region(dev->base_addr, cards[p->cardno].total_size);
++	ni65_free_buffer(p);
++}
++
++/* set: io,irq,dma or set it when calling insmod */
++static int irq;
++static int io;
++static int dma;
++
+ /*
+  * Probe The Card (not the lance-chip)
+  */
+-#ifdef MODULE
+-static
+-#endif
+-int __init ni65_probe(struct net_device *dev)
++struct net_device * __init ni65_probe(int unit)
+ {
+-	int *port;
++	struct net_device *dev = alloc_etherdev(0);
+ 	static int ports[] = {0x360,0x300,0x320,0x340, 0};
++	int *port;
++	int err = 0;
+ 
+-	if (dev->base_addr > 0x1ff)          /* Check a single specified location. */
+-		 return ni65_probe1(dev, dev->base_addr);
+-	else if (dev->base_addr > 0)         /* Don't probe at all. */
+-		 return -ENXIO;
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
+ 
+-	for (port = ports; *port; port++)
+-	{
+-		if (ni65_probe1(dev, *port) == 0)
+-			 return 0;
+-	}
+-
+-	return -ENODEV;
++	if (unit >= 0) {
++		sprintf(dev->name, "eth%d", unit);
++		netdev_boot_setup_check(dev);
++		irq = dev->irq;
++		dma = dev->dma;
++	} else {
++		dev->base_addr = io;
++	}
++
++	if (dev->base_addr > 0x1ff) { /* Check a single specified location. */
++		err = ni65_probe1(dev, dev->base_addr);
++	} else if (dev->base_addr > 0) { /* Don't probe at all. */
++		err = -ENXIO;
++	} else {
++		for (port = ports; *port && ni65_probe1(dev, *port); port++)
++			;
++		if (!*port)
++			err = -ENODEV;
++	}
++	if (err)
++		goto out;
++
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	cleanup_card(dev);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
+ /*
+@@ -377,6 +412,9 @@ static int __init ni65_probe1(struct net
+ 	struct priv *p;
+ 	unsigned long flags;
+ 
++	dev->irq = irq;
++	dev->dma = dma;
++
+ 	for(i=0;i<NUM_CARDS;i++) {
+ 		if(!request_region(ioaddr, cards[i].total_size, cards[i].cardname))
+ 			continue;
+@@ -521,9 +559,6 @@ static int __init ni65_probe1(struct net
+ 	dev->watchdog_timeo	= HZ/2;
+ 	dev->get_stats		= ni65_get_stats;
+ 	dev->set_multicast_list = set_multicast_list;
+-
+-	ether_setup(dev);
+-
+ 	return 0; /* everything is OK */
+ }
+ 
+@@ -1213,12 +1248,7 @@ static void set_multicast_list(struct ne
+ }
+ 
+ #ifdef MODULE
+-static struct net_device dev_ni65 = { .base_addr = 0x360, .irq = 9, .init = ni65_probe };
+-
+-/* set: io,irq,dma or set it when calling insmod */
+-static int irq;
+-static int io;
+-static int dma;
++static struct net_device *dev_ni65;
+ 
+ MODULE_PARM(irq, "i");
+ MODULE_PARM(io, "i");
+@@ -1229,26 +1259,15 @@ MODULE_PARM_DESC(dma, "ni6510 ISA DMA ch
+ 
+ int init_module(void)
+ {
+-	dev_ni65.irq = irq;
+-	dev_ni65.dma = dma;
+-	dev_ni65.base_addr = io;
+-	if (register_netdev(&dev_ni65) != 0)
+-		return -EIO;
+-	return 0;
++ 	dev_ni65 = ni65_probe(-1);
++	return IS_ERR(dev_ni65) ? PTR_ERR(dev_ni65) : 0;
+ }
+ 
+ void cleanup_module(void)
+ {
+-	struct priv *p;
+-	p = (struct priv *) dev_ni65.priv;
+-	if(!p)
+-		BUG();
+-	disable_dma(dev_ni65.dma);
+-	free_dma(dev_ni65.dma);
+-	unregister_netdev(&dev_ni65);
+-	release_region(dev_ni65.base_addr,cards[p->cardno].total_size);
+-	ni65_free_buffer(p);
+-	dev_ni65.priv = NULL;
++ 	unregister_netdev(dev_ni65);
++ 	cleanup_card(dev_ni65);
++ 	free_netdev(dev_ni65);
+ }
+ #endif /* MODULE */
+ 
+--- linux-2.6.0/drivers/net/ns83820.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/ns83820.c	2003-12-28 23:21:01.000000000 -0800
+@@ -374,19 +374,6 @@ static int lnksts = 0;		/* CFG_LNKSTS bi
+ #define LINK_DOWN		0x02
+ #define LINK_UP			0x04
+ 
+-#define __kick_rx(dev)	writel(CR_RXE, dev->base + CR)
+-
+-#define kick_rx(dev) do { \
+-	dprintk("kick_rx: maybe kicking\n"); \
+-	if (test_and_clear_bit(0, &dev->rx_info.idle)) { \
+-		dprintk("actually kicking\n"); \
+-		writel(dev->rx_info.phy_descs + (4 * DESC_SIZE * dev->rx_info.next_rx), dev->base + RXDP); \
+-		if (dev->rx_info.next_rx == dev->rx_info.next_empty) \
+-			printk(KERN_DEBUG "%s: uh-oh: next_rx == next_empty???\n", dev->net_dev.name);\
+-		__kick_rx(dev); \
+-	} \
+-} while(0)
+-
+ #ifdef USE_64BIT_ADDR
+ #define HW_ADDR_LEN	8
+ #define desc_addr_set(desc, addr)				\
+@@ -438,7 +425,6 @@ struct rx_info {
+ 
+ 
+ struct ns83820 {
+-	struct net_device	net_dev;	/* must be first */
+ 	struct net_device_stats	stats;
+ 	u8			*base;
+ 
+@@ -478,6 +464,29 @@ struct ns83820 {
+ 	struct timer_list	tx_watchdog;
+ };
+ 
++static inline struct ns83820 *PRIV(struct net_device *dev)
++{
++	return netdev_priv(dev);
++}
++
++#define __kick_rx(dev)	writel(CR_RXE, dev->base + CR)
++
++static inline void kick_rx(struct net_device *ndev)
++{
++	struct ns83820 *dev = PRIV(ndev);
++	dprintk("kick_rx: maybe kicking\n");
++	if (test_and_clear_bit(0, &dev->rx_info.idle)) {
++		dprintk("actually kicking\n");
++		writel(dev->rx_info.phy_descs +
++			(4 * DESC_SIZE * dev->rx_info.next_rx),
++		       dev->base + RXDP);
++		if (dev->rx_info.next_rx == dev->rx_info.next_empty)
++			printk(KERN_DEBUG "%s: uh-oh: next_rx == next_empty???\n",
++				ndev->name);
++		__kick_rx(dev);
++	}
++}
++
+ //free = (tx_done_idx + NR_TX_DESC-2 - free_idx) % NR_TX_DESC
+ #define start_tx_okay(dev)	\
+ 	(((NR_TX_DESC-2 + dev->tx_done_idx - dev->tx_free_idx) % NR_TX_DESC) > MIN_TX_DESC_FREE)
+@@ -546,15 +555,16 @@ static inline int ns83820_add_rx_skb(str
+ 	return 0;
+ }
+ 
+-static inline int rx_refill(struct ns83820 *dev, int gfp)
++static inline int rx_refill(struct net_device *ndev, int gfp)
+ {
++	struct ns83820 *dev = PRIV(ndev);
+ 	unsigned i;
+ 	unsigned long flags = 0;
+ 
+ 	if (unlikely(nr_rx_empty(dev) <= 2))
+ 		return 0;
+ 
+-	dprintk("rx_refill(%p)\n", dev);
++	dprintk("rx_refill(%p)\n", ndev);
+ 	if (gfp == GFP_ATOMIC)
+ 		spin_lock_irqsave(&dev->rx_info.lock, flags);
+ 	for (i=0; i<NR_RX_DESC; i++) {
+@@ -570,7 +580,7 @@ static inline int rx_refill(struct ns838
+ 		res &= 0xf;
+ 		skb_reserve(skb, res);
+ 
+-		skb->dev = &dev->net_dev;
++		skb->dev = ndev;
+ 		if (gfp != GFP_ATOMIC)
+ 			spin_lock_irqsave(&dev->rx_info.lock, flags);
+ 		res = ns83820_add_rx_skb(dev, skb);
+@@ -587,20 +597,21 @@ static inline int rx_refill(struct ns838
+ 	return i ? 0 : -ENOMEM;
+ }
+ 
+-static void FASTCALL(rx_refill_atomic(struct ns83820 *dev));
+-static void rx_refill_atomic(struct ns83820 *dev)
++static void FASTCALL(rx_refill_atomic(struct net_device *ndev));
++static void rx_refill_atomic(struct net_device *ndev)
+ {
+-	rx_refill(dev, GFP_ATOMIC);
++	rx_refill(ndev, GFP_ATOMIC);
+ }
+ 
+ /* REFILL */
+ static inline void queue_refill(void *_dev)
+ {
+-	struct ns83820 *dev = _dev;
++	struct net_device *ndev = _dev;
++	struct ns83820 *dev = PRIV(ndev);
+ 
+-	rx_refill(dev, GFP_KERNEL);
++	rx_refill(ndev, GFP_KERNEL);
+ 	if (dev->rx_info.up)
+-		kick_rx(dev);
++		kick_rx(ndev);
+ }
+ 
+ static inline void clear_rx_desc(struct ns83820 *dev, unsigned i)
+@@ -608,9 +619,10 @@ static inline void clear_rx_desc(struct 
+ 	build_rx_desc(dev, dev->rx_info.descs + (DESC_SIZE * i), 0, 0, CMDSTS_OWN, 0);
+ }
+ 
+-static void FASTCALL(phy_intr(struct ns83820 *dev));
+-static void phy_intr(struct ns83820 *dev)
++static void FASTCALL(phy_intr(struct net_device *ndev));
++static void phy_intr(struct net_device *ndev)
+ {
++	struct ns83820 *dev = PRIV(ndev);
+ 	static char *speeds[] = { "10", "100", "1000", "1000(?)", "1000F" };
+ 	u32 cfg, new_cfg;
+ 	u32 tbisr, tanar, tanlpar;
+@@ -688,27 +700,28 @@ static void phy_intr(struct ns83820 *dev
+ 
+ 	if (newlinkstate & LINK_UP
+ 	    && dev->linkstate != newlinkstate) {
+-		netif_start_queue(&dev->net_dev);
+-		netif_wake_queue(&dev->net_dev);
++		netif_start_queue(ndev);
++		netif_wake_queue(ndev);
+ 		printk(KERN_INFO "%s: link now %s mbps, %s duplex and up.\n",
+-			dev->net_dev.name,
++			ndev->name,
+ 			speeds[speed],
+ 			fullduplex ? "full" : "half");
+ 	} else if (newlinkstate & LINK_DOWN
+ 		   && dev->linkstate != newlinkstate) {
+-		netif_stop_queue(&dev->net_dev);
+-		printk(KERN_INFO "%s: link now down.\n", dev->net_dev.name);
++		netif_stop_queue(ndev);
++		printk(KERN_INFO "%s: link now down.\n", ndev->name);
+ 	}
+ 
+ 	dev->linkstate = newlinkstate;
+ }
+ 
+-static int ns83820_setup_rx(struct ns83820 *dev)
++static int ns83820_setup_rx(struct net_device *ndev)
+ {
++	struct ns83820 *dev = PRIV(ndev);
+ 	unsigned i;
+ 	int ret;
+ 
+-	dprintk("ns83820_setup_rx(%p)\n", dev);
++	dprintk("ns83820_setup_rx(%p)\n", ndev);
+ 
+ 	dev->rx_info.idle = 1;
+ 	dev->rx_info.next_rx = 0;
+@@ -721,7 +734,7 @@ static int ns83820_setup_rx(struct ns838
+ 	writel(0, dev->base + RXDP_HI);
+ 	writel(dev->rx_info.phy_descs, dev->base + RXDP);
+ 
+-	ret = rx_refill(dev, GFP_KERNEL);
++	ret = rx_refill(ndev, GFP_KERNEL);
+ 	if (!ret) {
+ 		dprintk("starting receiver\n");
+ 		/* prevent the interrupt handler from stomping on us */
+@@ -734,7 +747,7 @@ static int ns83820_setup_rx(struct ns838
+ 
+ 		dev->rx_info.up = 1;
+ 
+-		phy_intr(dev);
++		phy_intr(ndev);
+ 
+ 		/* Okay, let it rip */
+ 		spin_lock_irq(&dev->misc_lock);
+@@ -753,7 +766,7 @@ static int ns83820_setup_rx(struct ns838
+ 		writel(1, dev->base + IER);
+ 		spin_unlock_irq(&dev->misc_lock);
+ 
+-		kick_rx(dev);
++		kick_rx(ndev);
+ 
+ 		spin_unlock_irq(&dev->rx_info.lock);
+ 	}
+@@ -793,37 +806,39 @@ static void ns83820_cleanup_rx(struct ns
+ 	}
+ }
+ 
+-static void FASTCALL(ns83820_rx_kick(struct ns83820 *dev));
+-static void ns83820_rx_kick(struct ns83820 *dev)
++static void FASTCALL(ns83820_rx_kick(struct net_device *ndev));
++static void ns83820_rx_kick(struct net_device *ndev)
+ {
++	struct ns83820 *dev = PRIV(ndev);
+ 	/*if (nr_rx_empty(dev) >= NR_RX_DESC/4)*/ {
+ 		if (dev->rx_info.up) {
+-			rx_refill_atomic(dev);
+-			kick_rx(dev);
++			rx_refill_atomic(ndev);
++			kick_rx(ndev);
+ 		}
+ 	}
+ 
+ 	if (dev->rx_info.up && nr_rx_empty(dev) > NR_RX_DESC*3/4)
+ 		schedule_work(&dev->tq_refill);
+ 	else
+-		kick_rx(dev);
++		kick_rx(ndev);
+ 	if (dev->rx_info.idle)
+-		printk(KERN_DEBUG "%s: BAD\n", dev->net_dev.name);
++		printk(KERN_DEBUG "%s: BAD\n", ndev->name);
+ }
+ 
+ /* rx_irq
+  *	
+  */
+-static void FASTCALL(rx_irq(struct ns83820 *dev));
+-static void rx_irq(struct ns83820 *dev)
++static void FASTCALL(rx_irq(struct net_device *ndev));
++static void rx_irq(struct net_device *ndev)
+ {
++	struct ns83820 *dev = PRIV(ndev);
+ 	struct rx_info *info = &dev->rx_info;
+ 	unsigned next_rx;
+ 	u32 cmdsts, *desc;
+ 	unsigned long flags;
+ 	int nr = 0;
+ 
+-	dprintk("rx_irq(%p)\n", dev);
++	dprintk("rx_irq(%p)\n", ndev);
+ 	dprintk("rxdp: %08x, descs: %08lx next_rx[%d]: %p next_empty[%d]: %p\n",
+ 		readl(dev->base + RXDP),
+ 		(long)(dev->rx_info.phy_descs),
+@@ -873,7 +888,7 @@ static void rx_irq(struct ns83820 *dev)
+ 			} else {
+ 				skb->ip_summed = CHECKSUM_NONE;
+ 			}
+-			skb->protocol = eth_type_trans(skb, &dev->net_dev);
++			skb->protocol = eth_type_trans(skb, ndev);
+ 			if (NET_RX_DROP == netif_rx(skb)) {
+ netdev_mangle_me_harder_failed:
+ 				dev->stats.rx_dropped ++;
+@@ -899,8 +914,9 @@ out:
+ 
+ static void rx_action(unsigned long _dev)
+ {
+-	struct ns83820 *dev = (void *)_dev;
+-	rx_irq(dev);
++	struct net_device *ndev = (void *)_dev;
++	struct ns83820 *dev = PRIV(ndev);
++	rx_irq(ndev);
+ 	writel(ihr, dev->base + IHR);
+ 
+ 	spin_lock_irq(&dev->misc_lock);
+@@ -908,8 +924,8 @@ static void rx_action(unsigned long _dev
+ 	writel(dev->IMR_cache, dev->base + IMR);
+ 	spin_unlock_irq(&dev->misc_lock);
+ 
+-	rx_irq(dev);
+-	ns83820_rx_kick(dev);
++	rx_irq(ndev);
++	ns83820_rx_kick(ndev);
+ }
+ 
+ /* Packet Transmit code
+@@ -924,13 +940,14 @@ static inline void kick_tx(struct ns8382
+ /* No spinlock needed on the transmit irq path as the interrupt handler is
+  * serialized.
+  */
+-static void do_tx_done(struct ns83820 *dev)
++static void do_tx_done(struct net_device *ndev)
+ {
++	struct ns83820 *dev = PRIV(ndev);
+ 	u32 cmdsts, tx_done_idx, *desc;
+ 
+ 	spin_lock_irq(&dev->tx_lock);
+ 
+-	dprintk("do_tx_done(%p)\n", dev);
++	dprintk("do_tx_done(%p)\n", ndev);
+ 	tx_done_idx = dev->tx_done_idx;
+ 	desc = dev->tx_descs + (tx_done_idx * DESC_SIZE);
+ 
+@@ -980,10 +997,10 @@ static void do_tx_done(struct ns83820 *d
+ 	/* Allow network stack to resume queueing packets after we've
+ 	 * finished transmitting at least 1/4 of the packets in the queue.
+ 	 */
+-	if (netif_queue_stopped(&dev->net_dev) && start_tx_okay(dev)) {
+-		dprintk("start_queue(%p)\n", dev);
+-		netif_start_queue(&dev->net_dev);
+-		netif_wake_queue(&dev->net_dev);
++	if (netif_queue_stopped(ndev) && start_tx_okay(dev)) {
++		dprintk("start_queue(%p)\n", ndev);
++		netif_start_queue(ndev);
++		netif_wake_queue(ndev);
+ 	}
+ 	spin_unlock_irq(&dev->tx_lock);
+ }
+@@ -1015,9 +1032,9 @@ static void ns83820_cleanup_tx(struct ns
+  * while trying to track down a bug in either the zero copy code or
+  * the tx fifo (hence the MAX_FRAG_LEN).
+  */
+-static int ns83820_hard_start_xmit(struct sk_buff *skb, struct net_device *_dev)
++static int ns83820_hard_start_xmit(struct sk_buff *skb, struct net_device *ndev)
+ {
+-	struct ns83820 *dev = (struct ns83820 *)_dev;
++	struct ns83820 *dev = PRIV(ndev);
+ 	u32 free_idx, cmdsts, extsts;
+ 	int nr_free, nr_frags;
+ 	unsigned tx_done_idx, last_idx;
+@@ -1033,10 +1050,10 @@ static int ns83820_hard_start_xmit(struc
+ 	nr_frags =  skb_shinfo(skb)->nr_frags;
+ again:
+ 	if (unlikely(dev->CFG_cache & CFG_LNKSTS)) {
+-		netif_stop_queue(&dev->net_dev);
++		netif_stop_queue(ndev);
+ 		if (unlikely(dev->CFG_cache & CFG_LNKSTS))
+ 			return 1;
+-		netif_start_queue(&dev->net_dev);
++		netif_start_queue(ndev);
+ 	}
+ 
+ 	last_idx = free_idx = dev->tx_free_idx;
+@@ -1044,13 +1061,13 @@ again:
+ 	nr_free = (tx_done_idx + NR_TX_DESC-2 - free_idx) % NR_TX_DESC;
+ 	nr_free -= 1;
+ 	if (nr_free <= nr_frags) {
+-		dprintk("stop_queue - not enough(%p)\n", dev);
+-		netif_stop_queue(&dev->net_dev);
++		dprintk("stop_queue - not enough(%p)\n", ndev);
++		netif_stop_queue(ndev);
+ 
+ 		/* Check again: we may have raced with a tx done irq */
+ 		if (dev->tx_done_idx != tx_done_idx) {
+-			dprintk("restart queue(%p)\n", dev);
+-			netif_start_queue(&dev->net_dev);
++			dprintk("restart queue(%p)\n", ndev);
++			netif_start_queue(ndev);
+ 			goto again;
+ 		}
+ 		return 1;
+@@ -1063,8 +1080,8 @@ again:
+ 
+ 	nr_free -= nr_frags;
+ 	if (nr_free < MIN_TX_DESC_FREE) {
+-		dprintk("stop_queue - last entry(%p)\n", dev);
+-		netif_stop_queue(&dev->net_dev);
++		dprintk("stop_queue - last entry(%p)\n", ndev);
++		netif_stop_queue(ndev);
+ 		stopped = 1;
+ 	}
+ 
+@@ -1136,10 +1153,10 @@ again:
+ 
+ 	/* Check again: we may have raced with a tx done irq */
+ 	if (stopped && (dev->tx_done_idx != tx_done_idx) && start_tx_okay(dev))
+-		netif_start_queue(&dev->net_dev);
++		netif_start_queue(ndev);
+ 
+ 	/* set the transmit start time to catch transmit timeouts */
+-	dev->net_dev.trans_start = jiffies;
++	ndev->trans_start = jiffies;
+ 	return 0;
+ }
+ 
+@@ -1161,9 +1178,9 @@ static void ns83820_update_stats(struct 
+ 	dev->stats.tx_carrier_errors	+= readl(base + 0x88) & 0xff;
+ }
+ 
+-static struct net_device_stats *ns83820_get_stats(struct net_device *_dev)
++static struct net_device_stats *ns83820_get_stats(struct net_device *ndev)
+ {
+-	struct ns83820 *dev = (void *)_dev;
++	struct ns83820 *dev = PRIV(ndev);
+ 
+ 	/* somewhat overkill */
+ 	spin_lock_irq(&dev->misc_lock);
+@@ -1213,9 +1230,9 @@ static int ns83820_ethtool_ioctl (struct
+ 	return -EOPNOTSUPP;
+ }
+ 
+-static int ns83820_ioctl(struct net_device *_dev, struct ifreq *rq, int cmd)
++static int ns83820_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
+ {
+-	struct ns83820 *dev = (struct ns83820 *)_dev;
++	struct ns83820 *dev = PRIV(ndev);
+ 
+ 	switch(cmd) {
+ 	case SIOCETHTOOL:
+@@ -1233,23 +1250,25 @@ static void ns83820_mib_isr(struct ns838
+ 	spin_unlock(&dev->misc_lock);
+ }
+ 
+-static void ns83820_do_isr(struct ns83820 *dev, u32 isr);
++static void ns83820_do_isr(struct net_device *ndev, u32 isr);
+ static irqreturn_t ns83820_irq(int foo, void *data, struct pt_regs *regs)
+ {
+-	struct ns83820 *dev = data;
++	struct net_device *ndev = data;
++	struct ns83820 *dev = PRIV(ndev);
+ 	u32 isr;
+-	dprintk("ns83820_irq(%p)\n", dev);
++	dprintk("ns83820_irq(%p)\n", ndev);
+ 
+ 	dev->ihr = 0;
+ 
+ 	isr = readl(dev->base + ISR);
+ 	dprintk("irq: %08x\n", isr);
+-	ns83820_do_isr(dev, isr);
++	ns83820_do_isr(ndev, isr);
+ 	return IRQ_HANDLED;
+ }
+ 
+-static void ns83820_do_isr(struct ns83820 *dev, u32 isr)
++static void ns83820_do_isr(struct net_device *ndev, u32 isr)
+ {
++	struct ns83820 *dev = PRIV(ndev);
+ #ifdef DEBUG
+ 	if (isr & ~(ISR_PHY | ISR_RXDESC | ISR_RXEARLY | ISR_RXOK | ISR_RXERR | ISR_TXIDLE | ISR_TXOK | ISR_TXDESC))
+ 		Dprintk("odd isr? 0x%08x\n", isr);
+@@ -1258,7 +1277,7 @@ static void ns83820_do_isr(struct ns8382
+ 	if (ISR_RXIDLE & isr) {
+ 		dev->rx_info.idle = 1;
+ 		Dprintk("oh dear, we are idle\n");
+-		ns83820_rx_kick(dev);
++		ns83820_rx_kick(ndev);
+ 	}
+ 
+ 	if ((ISR_RXDESC | ISR_RXOK) & isr) {
+@@ -1270,12 +1289,12 @@ static void ns83820_do_isr(struct ns8382
+ 		spin_unlock_irq(&dev->misc_lock);
+ 
+ 		tasklet_schedule(&dev->rx_tasklet);
+-		//rx_irq(dev);
++		//rx_irq(ndev);
+ 		//writel(4, dev->base + IHR);
+ 	}
+ 
+ 	if ((ISR_RXIDLE | ISR_RXORN | ISR_RXDESC | ISR_RXOK | ISR_RXERR) & isr)
+-		ns83820_rx_kick(dev);
++		ns83820_rx_kick(ndev);
+ 
+ 	if (unlikely(ISR_RXSOVR & isr)) {
+ 		//printk("overrun: rxsovr\n");
+@@ -1297,7 +1316,7 @@ static void ns83820_do_isr(struct ns8382
+ 		txdp -= dev->tx_phy_descs;
+ 		dev->tx_idx = txdp / (DESC_SIZE * 4);
+ 		if (dev->tx_idx >= NR_TX_DESC) {
+-			printk(KERN_ALERT "%s: BUG -- txdp out of range\n", dev->net_dev.name);
++			printk(KERN_ALERT "%s: BUG -- txdp out of range\n", ndev->name);
+ 			dev->tx_idx = 0;
+ 		}
+ 		/* The may have been a race between a pci originated read
+@@ -1313,7 +1332,7 @@ static void ns83820_do_isr(struct ns8382
+ 	 * work has accumulated
+ 	 */
+ 	if ((ISR_TXDESC | ISR_TXIDLE | ISR_TXOK | ISR_TXERR) & isr) {
+-		do_tx_done(dev);
++		do_tx_done(ndev);
+ 
+ 		/* Disable TxOk if there are no outstanding tx packets.
+ 		 */
+@@ -1345,7 +1364,7 @@ static void ns83820_do_isr(struct ns8382
+ 
+ 	/* PHY: Link up/down/negotiation state change */
+ 	if (unlikely(ISR_PHY & isr))
+-		phy_intr(dev);
++		phy_intr(ndev);
+ 
+ #if 0	/* Still working on the interrupt mitigation strategy */
+ 	if (dev->ihr)
+@@ -1363,9 +1382,9 @@ static void ns83820_do_reset(struct ns83
+ 	Dprintk("okay!\n");
+ }
+ 
+-static int ns83820_stop(struct net_device *_dev)
++static int ns83820_stop(struct net_device *ndev)
+ {
+-	struct ns83820 *dev = (struct ns83820 *)_dev;
++	struct ns83820 *dev = PRIV(ndev);
+ 
+ 	/* FIXME: protect against interrupt handler? */
+ 	del_timer_sync(&dev->tx_watchdog);
+@@ -1392,10 +1411,9 @@ static int ns83820_stop(struct net_devic
+ 	return 0;
+ }
+ 
+-static void ns83820_do_isr(struct ns83820 *dev, u32 isr);
+-static void ns83820_tx_timeout(struct net_device *_dev)
++static void ns83820_tx_timeout(struct net_device *ndev)
+ {
+-	struct ns83820 *dev = (struct ns83820 *)_dev;
++	struct ns83820 *dev = PRIV(ndev);
+         u32 tx_done_idx, *desc;
+ 	unsigned long flags;
+ 
+@@ -1405,7 +1423,7 @@ static void ns83820_tx_timeout(struct ne
+ 	desc = dev->tx_descs + (tx_done_idx * DESC_SIZE);
+ 
+ 	printk(KERN_INFO "%s: tx_timeout: tx_done_idx=%d free_idx=%d cmdsts=%08x\n",
+-		dev->net_dev.name,
++		ndev->name,
+ 		tx_done_idx, dev->tx_free_idx, le32_to_cpu(desc[DESC_CMDSTS]));
+ 
+ #if defined(DEBUG)
+@@ -1413,17 +1431,17 @@ static void ns83820_tx_timeout(struct ne
+ 		u32 isr;
+ 		isr = readl(dev->base + ISR);
+ 		printk("irq: %08x imr: %08x\n", isr, dev->IMR_cache);
+-		ns83820_do_isr(dev, isr);
++		ns83820_do_isr(ndev, isr);
+ 	}
+ #endif
+ 
+-	do_tx_done(dev);
++	do_tx_done(ndev);
+ 
+ 	tx_done_idx = dev->tx_done_idx;
+ 	desc = dev->tx_descs + (tx_done_idx * DESC_SIZE);
+ 
+ 	printk(KERN_INFO "%s: after: tx_done_idx=%d free_idx=%d cmdsts=%08x\n",
+-		dev->net_dev.name,
++		ndev->name,
+ 		tx_done_idx, dev->tx_free_idx, le32_to_cpu(desc[DESC_CMDSTS]));
+ 
+ 	local_irq_restore(flags);
+@@ -1431,7 +1449,8 @@ static void ns83820_tx_timeout(struct ne
+ 
+ static void ns83820_tx_watch(unsigned long data)
+ {
+-	struct ns83820 *dev = (void *)data;
++	struct net_device *ndev = (void *)data;
++	struct ns83820 *dev = PRIV(ndev);
+ 
+ #if defined(DEBUG)
+ 	printk("ns83820_tx_watch: %u %u %d\n",
+@@ -1439,21 +1458,21 @@ static void ns83820_tx_watch(unsigned lo
+ 		);
+ #endif
+ 
+-	if (time_after(jiffies, dev->net_dev.trans_start + 1*HZ) &&
++	if (time_after(jiffies, ndev->trans_start + 1*HZ) &&
+ 	    dev->tx_done_idx != dev->tx_free_idx) {
+ 		printk(KERN_DEBUG "%s: ns83820_tx_watch: %u %u %d\n",
+-			dev->net_dev.name,
++			ndev->name,
+ 			dev->tx_done_idx, dev->tx_free_idx,
+ 			atomic_read(&dev->nr_tx_skbs));
+-		ns83820_tx_timeout(&dev->net_dev);
++		ns83820_tx_timeout(ndev);
+ 	}
+ 
+ 	mod_timer(&dev->tx_watchdog, jiffies + 2*HZ);
+ }
+ 
+-static int ns83820_open(struct net_device *_dev)
++static int ns83820_open(struct net_device *ndev)
+ {
+-	struct ns83820 *dev = (struct ns83820 *)_dev;
++	struct ns83820 *dev = PRIV(ndev);
+ 	unsigned i;
+ 	u32 desc;
+ 	int ret;
+@@ -1462,7 +1481,7 @@ static int ns83820_open(struct net_devic
+ 
+ 	writel(0, dev->base + PQCR);
+ 
+-	ret = ns83820_setup_rx(dev);
++	ret = ns83820_setup_rx(ndev);
+ 	if (ret)
+ 		goto failed;
+ 
+@@ -1481,16 +1500,16 @@ static int ns83820_open(struct net_devic
+ 	writel(desc, dev->base + TXDP);
+ 
+ 	init_timer(&dev->tx_watchdog);
+-	dev->tx_watchdog.data = (unsigned long)dev;
++	dev->tx_watchdog.data = (unsigned long)ndev;
+ 	dev->tx_watchdog.function = ns83820_tx_watch;
+ 	mod_timer(&dev->tx_watchdog, jiffies + 2*HZ);
+ 
+-	netif_start_queue(&dev->net_dev);	/* FIXME: wait for phy to come up */
++	netif_start_queue(ndev);	/* FIXME: wait for phy to come up */
+ 
+ 	return 0;
+ 
+ failed:
+-	ns83820_stop(_dev);
++	ns83820_stop(ndev);
+ 	return ret;
+ }
+ 
+@@ -1513,28 +1532,28 @@ static void ns83820_getmac(struct ns8382
+ 	}
+ }
+ 
+-static int ns83820_change_mtu(struct net_device *_dev, int new_mtu)
++static int ns83820_change_mtu(struct net_device *ndev, int new_mtu)
+ {
+ 	if (new_mtu > RX_BUF_SIZE)
+ 		return -EINVAL;
+-	_dev->mtu = new_mtu;
++	ndev->mtu = new_mtu;
+ 	return 0;
+ }
+ 
+-static void ns83820_set_multicast(struct net_device *_dev)
++static void ns83820_set_multicast(struct net_device *ndev)
+ {
+-	struct ns83820 *dev = (void *)_dev;
++	struct ns83820 *dev = PRIV(ndev);
+ 	u8 *rfcr = dev->base + RFCR;
+ 	u32 and_mask = 0xffffffff;
+ 	u32 or_mask = 0;
+ 	u32 val;
+ 
+-	if (dev->net_dev.flags & IFF_PROMISC)
++	if (ndev->flags & IFF_PROMISC)
+ 		or_mask |= RFCR_AAU | RFCR_AAM;
+ 	else
+ 		and_mask &= ~(RFCR_AAU | RFCR_AAM);
+ 
+-	if (dev->net_dev.flags & IFF_ALLMULTI)
++	if (ndev->flags & IFF_ALLMULTI)
+ 		or_mask |= RFCR_AAM;
+ 	else
+ 		and_mask &= ~RFCR_AAM;
+@@ -1547,14 +1566,15 @@ static void ns83820_set_multicast(struct
+ 	spin_unlock_irq(&dev->misc_lock);
+ }
+ 
+-static void ns83820_run_bist(struct ns83820 *dev, const char *name, u32 enable, u32 done, u32 fail)
++static void ns83820_run_bist(struct net_device *ndev, const char *name, u32 enable, u32 done, u32 fail)
+ {
++	struct ns83820 *dev = PRIV(ndev);
+ 	int timed_out = 0;
+ 	long start;
+ 	u32 status;
+ 	int loops = 0;
+ 
+-	dprintk("%s: start %s\n", dev->net_dev.name, name);
++	dprintk("%s: start %s\n", ndev->name, name);
+ 
+ 	start = jiffies;
+ 
+@@ -1578,12 +1598,12 @@ static void ns83820_run_bist(struct ns83
+ 
+ 	if (status & fail)
+ 		printk(KERN_INFO "%s: %s failed! (0x%08x & 0x%08x)\n",
+-			dev->net_dev.name, name, status, fail);
++			ndev->name, name, status, fail);
+ 	else if (timed_out)
+ 		printk(KERN_INFO "%s: run_bist %s timed out! (%08x)\n",
+-			dev->net_dev.name, name, status);
++			ndev->name, name, status);
+ 
+-	dprintk("%s: done %s in %d loops\n", dev->net_dev.name, name, loops);
++	dprintk("%s: done %s in %d loops\n", ndev->name, name, loops);
+ }
+ 
+ #ifdef PHY_CODE_IS_FINISHED
+@@ -1706,8 +1726,9 @@ static unsigned ns83820_mii_write_reg(st
+ 	return data;
+ }
+ 
+-static void ns83820_probe_phy(struct ns83820 *dev)
++static void ns83820_probe_phy(struct net_device *ndev)
+ {
++	struct ns83820 *dev = PRIV(ndev);
+ 	static int first;
+ 	int i;
+ #define MII_PHYIDR1	0x02
+@@ -1734,11 +1755,11 @@ static void ns83820_probe_phy(struct ns8
+ 		b = ns83820_mii_read_reg(dev, i, MII_PHYIDR2);
+ 
+ 		//printk("%s: phy %d: 0x%04x 0x%04x\n",
+-		//	dev->net_dev.name, i, a, b);
++		//	ndev->name, i, a, b);
+ 
+ 		for (j=0; j<0x16; j+=4) {
+ 			dprintk("%s: [0x%02x] %04x %04x %04x %04x\n",
+-				dev->net_dev.name, j,
++				ndev->name, j,
+ 				ns83820_mii_read_reg(dev, i, 0 + j),
+ 				ns83820_mii_read_reg(dev, i, 1 + j),
+ 				ns83820_mii_read_reg(dev, i, 2 + j),
+@@ -1763,6 +1784,7 @@ static void ns83820_probe_phy(struct ns8
+ 
+ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_device_id *id)
+ {
++	struct net_device *ndev;
+ 	struct ns83820 *dev;
+ 	long addr;
+ 	int err;
+@@ -1778,7 +1800,8 @@ static int __devinit ns83820_init_one(st
+ 		return -ENODEV;
+ 	}
+ 
+-	dev = (struct ns83820 *)alloc_etherdev((sizeof *dev) - (sizeof dev->net_dev));
++	ndev = alloc_etherdev(sizeof(struct ns83820));
++	dev = PRIV(ndev);
+ 	err = -ENOMEM;
+ 	if (!dev)
+ 		goto out;
+@@ -1790,12 +1813,11 @@ static int __devinit ns83820_init_one(st
+ 
+ 	dev->ee.cache = &dev->MEAR_cache;
+ 	dev->ee.lock = &dev->misc_lock;
+-	SET_MODULE_OWNER(dev->net_dev);
+-	SET_NETDEV_DEV(&dev->net_dev, &pci_dev->dev);
+-	dev->net_dev.priv = dev;
++	SET_MODULE_OWNER(ndev);
++	SET_NETDEV_DEV(ndev, &pci_dev->dev);
+ 
+-	INIT_WORK(&dev->tq_refill, queue_refill, dev);
+-	tasklet_init(&dev->rx_tasklet, rx_action, (unsigned long)dev);
++	INIT_WORK(&dev->tq_refill, queue_refill, ndev);
++	tasklet_init(&dev->rx_tasklet, rx_action, (unsigned long)ndev);
+ 
+ 	err = pci_enable_device(pci_dev);
+ 	if (err) {
+@@ -1829,55 +1851,63 @@ static int __devinit ns83820_init_one(st
+ 		0);
+ 
+ 	err = request_irq(pci_dev->irq, ns83820_irq, SA_SHIRQ,
+-			  dev->net_dev.name, dev);
++			  ndev->name, ndev);
+ 	if (err) {
+ 		printk(KERN_INFO "ns83820: unable to register irq %d\n",
+ 			pci_dev->irq);
+ 		goto out_disable;
+ 	}
+ 
+-	err = register_netdev(&dev->net_dev);
+-	if (err) {
+-		printk(KERN_INFO "ns83820: unable to register netdev: %d\n", err);
++	/*
++	 * FIXME: we are holding rtnl_lock() over obscenely long area only
++	 * because some of the setup code uses dev->name.  It's Wrong(tm) -
++	 * we should be using driver-specific names for all that stuff.
++	 * For now that will do, but we really need to come back and kill
++	 * most of the dev_alloc_name() users later.
++	 */
++	rtnl_lock();
++	err = dev_alloc_name(ndev, ndev->name);
++	if (err < 0) {
++		printk(KERN_INFO "ns83820: unable to get netdev name: %d\n", err);
+ 		goto out_free_irq;
+ 	}
+ 
+ 	printk("%s: ns83820.c: 0x22c: %08x, subsystem: %04x:%04x\n",
+-		dev->net_dev.name, le32_to_cpu(readl(dev->base + 0x22c)),
++		ndev->name, le32_to_cpu(readl(dev->base + 0x22c)),
+ 		pci_dev->subsystem_vendor, pci_dev->subsystem_device);
+ 
+-	dev->net_dev.open = ns83820_open;
+-	dev->net_dev.stop = ns83820_stop;
+-	dev->net_dev.hard_start_xmit = ns83820_hard_start_xmit;
+-	dev->net_dev.get_stats = ns83820_get_stats;
+-	dev->net_dev.change_mtu = ns83820_change_mtu;
+-	dev->net_dev.set_multicast_list = ns83820_set_multicast;
+-	dev->net_dev.do_ioctl = ns83820_ioctl;
+-	dev->net_dev.tx_timeout = ns83820_tx_timeout;
+-	dev->net_dev.watchdog_timeo = 5 * HZ;
++	ndev->open = ns83820_open;
++	ndev->stop = ns83820_stop;
++	ndev->hard_start_xmit = ns83820_hard_start_xmit;
++	ndev->get_stats = ns83820_get_stats;
++	ndev->change_mtu = ns83820_change_mtu;
++	ndev->set_multicast_list = ns83820_set_multicast;
++	ndev->do_ioctl = ns83820_ioctl;
++	ndev->tx_timeout = ns83820_tx_timeout;
++	ndev->watchdog_timeo = 5 * HZ;
+ 
+-	pci_set_drvdata(pci_dev, dev);
++	pci_set_drvdata(pci_dev, ndev);
+ 
+ 	ns83820_do_reset(dev, CR_RST);
+ 
+ 	/* Must reset the ram bist before running it */
+ 	writel(PTSCR_RBIST_RST, dev->base + PTSCR);
+-	ns83820_run_bist(dev, "sram bist",   PTSCR_RBIST_EN,
++	ns83820_run_bist(ndev, "sram bist",   PTSCR_RBIST_EN,
+ 			 PTSCR_RBIST_DONE, PTSCR_RBIST_FAIL);
+-	ns83820_run_bist(dev, "eeprom bist", PTSCR_EEBIST_EN, 0,
++	ns83820_run_bist(ndev, "eeprom bist", PTSCR_EEBIST_EN, 0,
+ 			 PTSCR_EEBIST_FAIL);
+-	ns83820_run_bist(dev, "eeprom load", PTSCR_EELOAD_EN, 0, 0);
++	ns83820_run_bist(ndev, "eeprom load", PTSCR_EELOAD_EN, 0, 0);
+ 
+ 	/* I love config registers */
+ 	dev->CFG_cache = readl(dev->base + CFG);
+ 
+ 	if ((dev->CFG_cache & CFG_PCI64_DET)) {
+ 		printk(KERN_INFO "%s: detected 64 bit PCI data bus.\n",
+-			dev->net_dev.name);
++			ndev->name);
+ 		/*dev->CFG_cache |= CFG_DATA64_EN;*/
+ 		if (!(dev->CFG_cache & CFG_DATA64_EN))
+ 			printk(KERN_INFO "%s: EEPROM did not enable 64 bit bus.  Disabled.\n",
+-				dev->net_dev.name);
++				ndev->name);
+ 	} else
+ 		dev->CFG_cache &= ~(CFG_DATA64_EN);
+ 
+@@ -1905,7 +1935,7 @@ static int __devinit ns83820_init_one(st
+ 	/* setup optical transceiver if we have one */
+ 	if (dev->CFG_cache & CFG_TBI_EN) {
+ 		printk(KERN_INFO "%s: enabling optical transceiver\n",
+-			dev->net_dev.name);
++			ndev->name);
+ 		writel(readl(dev->base + GPIOR) | 0x3e8, dev->base + GPIOR);
+ 
+ 		/* setup auto negotiation feature advertisement */
+@@ -1926,7 +1956,7 @@ static int __devinit ns83820_init_one(st
+ 	dprintk("CFG: %08x\n", dev->CFG_cache);
+ 
+ 	if (reset_phy) {
+-		printk(KERN_INFO "%s: resetting phy\n", dev->net_dev.name);
++		printk(KERN_INFO "%s: resetting phy\n", ndev->name);
+ 		writel(dev->CFG_cache | CFG_PHY_RST, dev->base + CFG);
+ 		set_current_state(TASK_UNINTERRUPTIBLE);
+ 		schedule_timeout((HZ+99)/100);
+@@ -1996,37 +2026,49 @@ static int __devinit ns83820_init_one(st
+ 	/* Disable Wake On Lan */
+ 	writel(0, dev->base + WCSR);
+ 
+-	ns83820_getmac(dev, dev->net_dev.dev_addr);
++	ns83820_getmac(dev, ndev->dev_addr);
+ 
+ 	/* Yes, we support dumb IP checksum on transmit */
+-	dev->net_dev.features |= NETIF_F_SG;
+-	dev->net_dev.features |= NETIF_F_IP_CSUM;
++	ndev->features |= NETIF_F_SG;
++	ndev->features |= NETIF_F_IP_CSUM;
+ 
+ 	if (using_dac) {
+ 		printk(KERN_INFO "%s: using 64 bit addressing.\n",
+-			dev->net_dev.name);
+-		dev->net_dev.features |= NETIF_F_HIGHDMA;
++			ndev->name);
++		ndev->features |= NETIF_F_HIGHDMA;
+ 	}
+ 
+ 	printk(KERN_INFO "%s: ns83820 v" VERSION ": DP83820 v%u.%u: %02x:%02x:%02x:%02x:%02x:%02x io=0x%08lx irq=%d f=%s\n",
+-		dev->net_dev.name,
++		ndev->name,
+ 		(unsigned)readl(dev->base + SRR) >> 8,
+ 		(unsigned)readl(dev->base + SRR) & 0xff,
+-		dev->net_dev.dev_addr[0], dev->net_dev.dev_addr[1],
+-		dev->net_dev.dev_addr[2], dev->net_dev.dev_addr[3],
+-		dev->net_dev.dev_addr[4], dev->net_dev.dev_addr[5],
++		ndev->dev_addr[0], ndev->dev_addr[1],
++		ndev->dev_addr[2], ndev->dev_addr[3],
++		ndev->dev_addr[4], ndev->dev_addr[5],
+ 		addr, pci_dev->irq,
+-		(dev->net_dev.features & NETIF_F_HIGHDMA) ? "h,sg" : "sg"
++		(ndev->features & NETIF_F_HIGHDMA) ? "h,sg" : "sg"
+ 		);
+ 
+ #ifdef PHY_CODE_IS_FINISHED
+-	ns83820_probe_phy(dev);
++	ns83820_probe_phy(ndev);
+ #endif
+ 
++	err = register_netdevice(ndev);
++	if (err) {
++		printk(KERN_INFO "ns83820: unable to register netdev: %d\n", err);
++		goto out_cleanup;
++	}
++	rtnl_unlock();
++
+ 	return 0;
+ 
++out_cleanup:
++	writel(0, dev->base + IMR);	/* paranoia */
++	writel(0, dev->base + IER);
++	readl(dev->base + IER);
+ out_free_irq:
+-	free_irq(pci_dev->irq, dev);
++	rtnl_unlock();
++	free_irq(pci_dev->irq, ndev);
+ out_disable:
+ 	if (dev->base)
+ 		iounmap(dev->base);
+@@ -2034,7 +2076,7 @@ out_disable:
+ 	pci_free_consistent(pci_dev, 4 * DESC_SIZE * NR_RX_DESC, dev->rx_info.descs, dev->rx_info.phy_descs);
+ 	pci_disable_device(pci_dev);
+ out_free:
+-	kfree(dev);
++	free_netdev(ndev);
+ 	pci_set_drvdata(pci_dev, NULL);
+ out:
+ 	return err;
+@@ -2042,24 +2084,25 @@ out:
+ 
+ static void __devexit ns83820_remove_one(struct pci_dev *pci_dev)
+ {
+-	struct ns83820	*dev = pci_get_drvdata(pci_dev);
++	struct net_device *ndev = pci_get_drvdata(pci_dev);
++	struct ns83820 *dev = PRIV(ndev); /* ok even if NULL */
+ 
+-	if (!dev)			/* paranoia */
++	if (!ndev)			/* paranoia */
+ 		return;
+ 
+ 	writel(0, dev->base + IMR);	/* paranoia */
+ 	writel(0, dev->base + IER);
+ 	readl(dev->base + IER);
+ 
+-	unregister_netdev(&dev->net_dev);
+-	free_irq(dev->pci_dev->irq, dev);
++	unregister_netdev(ndev);
++	free_irq(dev->pci_dev->irq, ndev);
+ 	iounmap(dev->base);
+ 	pci_free_consistent(dev->pci_dev, 4 * DESC_SIZE * NR_TX_DESC,
+ 			dev->tx_descs, dev->tx_phy_descs);
+ 	pci_free_consistent(dev->pci_dev, 4 * DESC_SIZE * NR_RX_DESC,
+ 			dev->rx_info.descs, dev->rx_info.phy_descs);
+ 	pci_disable_device(dev->pci_dev);
+-	free_netdev(&dev->net_dev);
++	free_netdev(ndev);
+ 	pci_set_drvdata(pci_dev, NULL);
+ }
+ 
+--- linux-2.6.0/drivers/net/oaknet.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/oaknet.c	2003-12-28 23:21:01.000000000 -0800
+@@ -94,8 +94,8 @@ static int __init oaknet_init(void)
+ {
+ 	register int i;
+ 	int reg0, regd;
+-	int ret;
+-	struct net_device tmp, *dev = NULL;
++	int ret = -ENOMEM;
++	struct net_device *dev;
+ #if 0
+ 	unsigned long ioaddr = OAKNET_IO_BASE; 
+ #else
+@@ -105,17 +105,14 @@ static int __init oaknet_init(void)
+ 
+ 	if (!ioaddr)
+ 		return -ENOMEM;
+-	/*
+-	 * This MUST happen here because of the nic_* macros
+-	 * which have an implicit dependency on dev->base_addr.
+-	 */
+ 
+-	tmp.base_addr = ioaddr;
+-	dev = &tmp;
++	dev = alloc_ei_netdev();
++	if (!dev)
++		goto out_unmap;
+ 
+ 	ret = -EBUSY;
+ 	if (!request_region(OAKNET_IO_BASE, OAKNET_IO_SIZE, name))
+-		goto out_unmap;
++		goto out_dev;
+ 
+ 	/* Quick register check to see if the device is really there. */
+ 
+@@ -144,17 +141,7 @@ static int __init oaknet_init(void)
+ 		goto out_region;
+ 	}
+ 
+-	/*
+-	 * We're not using the old-style probing API, so we have to allocate
+-	 * our own device structure.
+-	 */
+-
+-	dev = init_etherdev(NULL, 0);
+-	ret = -ENOMEM;
+-	if (!dev)
+-		goto out_region;
+ 	SET_MODULE_OWNER(dev);
+-	oaknet_devs = dev;
+ 
+ 	/*
+ 	 * This controller is on an embedded board, so the base address
+@@ -164,14 +151,6 @@ static int __init oaknet_init(void)
+ 	dev->base_addr = ioaddr;
+ 	dev->irq = OAKNET_INT;
+ 
+-	/* Allocate 8390-specific device-private area and fields. */
+-
+-	ret = -ENOMEM;
+-	if (ethdev_init(dev)) {
+-		printk(" unable to get memory for dev->priv.\n");
+-		goto out_dev;
+-	}
+-
+ 	/*
+ 	 * Disable all chip interrupts for now and ACK all pending
+ 	 * interrupts.
+@@ -186,7 +165,7 @@ static int __init oaknet_init(void)
+ 	if (request_irq(dev->irq, ei_interrupt, 0, name, dev)) {
+ 		printk("%s: unable to request interrupt %d.\n",
+ 		       dev->name, dev->irq);
+-		goto out_priv;
++		goto out_region;
+ 	}
+ 
+ 	/* Tell the world about what and where we've found. */
+@@ -215,15 +194,19 @@ static int __init oaknet_init(void)
+ 	dev->stop = oaknet_close;
+ 
+ 	NS8390_init(dev, FALSE);
++	ret = register_netdev(dev);
++	if (ret)
++		goto out_irq;
++	
++	oaknet_devs = dev;
++	return 0;
+ 
+-	return (0);
+-out_priv:
+-	kfree(dev->priv);
+-out_dev:
+-	unregister_netdev(dev);
+-	kfree(dev);
++out_irq;
++	free_irq(dev->irq, dev);
+ out_region:
+ 	release_region(OAKNET_IO_BASE, OAKNET_IO_SIZE);
++out_dev:
++	free_netdev(dev);
+ out_unmap:
+ 	iounmap(ioaddr);
+ 	return ret;
+@@ -662,38 +645,18 @@ oaknet_dma_error(struct net_device *dev,
+ }
+ 
+ /*
+- * Oak Ethernet module load interface.
+- */
+-static int __init oaknet_init_module (void)
+-{
+-	if (oaknet_devs != NULL)
+-		return (-EBUSY);
+-
+-	return (oaknet_init());
+-}
+-
+-/*
+  * Oak Ethernet module unload interface.
+  */
+ static void __exit oaknet_cleanup_module (void)
+ {
+-	if (oaknet_devs == NULL)
+-		return;
+-
+-	if (oaknet_devs->priv != NULL) {
+-		int ioaddr = oaknet_devs->base_addr;
+-		void *priv = oaknet_devs->priv;
+-		free_irq(oaknet_devs->irq, oaknet_devs);
+-		release_region(ioaddr, OAKNET_IO_SIZE);
+-		iounmap(ioaddr);
+-		unregister_netdev(oaknet_dev);
+-		free_netdev(priv);
+-	}
+-
+ 	/* Convert to loop once driver supports multiple devices. */
+-	kfree(oaknet_devs);
++	unregister_netdev(oaknet_dev);
++	free_irq(oaknet_devs->irq, oaknet_devs);
++	release_region(oaknet_devs->base_addr, OAKNET_IO_SIZE);
++	iounmap(ioaddr);
++	free_netdev(oaknet_devs);
+ }
+ 
+-module_init(oaknet_init_module);
++module_init(oaknet_init);
+ module_exit(oaknet_cleanup_module);
+ MODULE_LICENSE("GPL");
+--- linux-2.6.0/drivers/net/pci-skeleton.c	2003-12-17 21:20:02.000000000 -0800
++++ 25/drivers/net/pci-skeleton.c	2003-12-28 23:21:01.000000000 -0800
+@@ -730,7 +730,7 @@ err_out_free_res:
+ #endif
+ 	pci_release_regions (pdev);
+ err_out:
+-	kfree (dev);
++	free_netdev (dev);
+ 	DPRINTK ("EXIT, returning %d\n", rc);
+ 	return rc;
+ }
+--- linux-2.6.0/drivers/net/pcmcia/3c574_cs.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/pcmcia/3c574_cs.c	2003-12-28 23:22:53.000000000 -0800
+@@ -330,7 +330,7 @@ static dev_link_t *tc574_attach(void)
+ 	client_reg.event_handler = &tc574_event;
+ 	client_reg.Version = 0x0210;
+ 	client_reg.event_callback_args.client_data = link;
+-	ret = CardServices(RegisterClient, &link->handle, &client_reg);
++	ret = pcmcia_register_client(&link->handle, &client_reg);
+ 	if (ret != 0) {
+ 		cs_error(link->handle, RegisterClient, ret);
+ 		tc574_detach(link);
+@@ -362,23 +362,17 @@ static void tc574_detach(dev_link_t *lin
+ 	if (*linkp == NULL)
+ 	return;
+ 
+-	if (link->state & DEV_CONFIG) {
++	if (link->state & DEV_CONFIG)
+ 		tc574_release(link);
+-		if (link->state & DEV_STALE_CONFIG)
+-			return;
+-	}
+ 
+ 	if (link->handle)
+-		CardServices(DeregisterClient, link->handle);
++		pcmcia_deregister_client(link->handle);
+ 
+ 	/* Unlink device structure, free bits */
+ 	*linkp = link->next;
+-	if (link->dev) {
++	if (link->dev)
+ 		unregister_netdev(dev);
+-		free_netdev(dev);
+-	} else 
+-		kfree(dev);
+-
++	free_netdev(dev);
+ } /* tc574_detach */
+ 
+ /*
+@@ -387,8 +381,8 @@ static void tc574_detach(dev_link_t *lin
+ 	ethernet device available to the system.
+ */
+ 
+-#define CS_CHECK(fn, args...) \
+-while ((last_ret=CardServices(last_fn=(fn), args))!=0) goto cs_failed
++#define CS_CHECK(fn, ret) \
++  do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+ 
+ static void tc574_config(dev_link_t *link)
+ {
+@@ -409,12 +403,12 @@ static void tc574_config(dev_link_t *lin
+ 
+ 	tuple.Attributes = 0;
+ 	tuple.DesiredTuple = CISTPL_CONFIG;
+-	CS_CHECK(GetFirstTuple, handle, &tuple);
++	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+ 	tuple.TupleData = (cisdata_t *)buf;
+ 	tuple.TupleDataMax = 64;
+ 	tuple.TupleOffset = 0;
+-	CS_CHECK(GetTupleData, handle, &tuple);
+-	CS_CHECK(ParseTuple, handle, &tuple, &parse);
++	CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
++	CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+ 	link->conf.ConfigBase = parse.config.base;
+ 	link->conf.Present = parse.config.rmask[0];
+ 
+@@ -424,15 +418,15 @@ static void tc574_config(dev_link_t *lin
+ 	link->io.IOAddrLines = 16;
+ 	for (i = j = 0; j < 0x400; j += 0x20) {
+ 		link->io.BasePort1 = j ^ 0x300;
+-		i = CardServices(RequestIO, link->handle, &link->io);
++		i = pcmcia_request_io(link->handle, &link->io);
+ 		if (i == CS_SUCCESS) break;
+ 	}
+ 	if (i != CS_SUCCESS) {
+ 		cs_error(link->handle, RequestIO, i);
+ 		goto failed;
+ 	}
+-	CS_CHECK(RequestIRQ, link->handle, &link->irq);
+-	CS_CHECK(RequestConfiguration, link->handle, &link->conf);
++	CS_CHECK(RequestIRQ, pcmcia_request_irq(link->handle, &link->irq));
++	CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link->handle, &link->conf));
+ 
+ 	dev->irq = link->irq.AssignedIRQ;
+ 	dev->base_addr = link->io.BasePort1;
+@@ -451,8 +445,8 @@ static void tc574_config(dev_link_t *lin
+ 	   the hardware address.  The future products may include a modem chip
+ 	   and put the address in the CIS. */
+ 	tuple.DesiredTuple = 0x88;
+-	if (CardServices(GetFirstTuple, handle, &tuple) == CS_SUCCESS) {
+-		CardServices(GetTupleData, handle, &tuple);
++	if (pcmcia_get_first_tuple(handle, &tuple) == CS_SUCCESS) {
++		pcmcia_get_tuple_data(handle, &tuple);
+ 		for (i = 0; i < 3; i++)
+ 			phys_addr[i] = htons(buf[i]);
+ 	} else {
+@@ -466,9 +460,9 @@ static void tc574_config(dev_link_t *lin
+ 		}
+ 	}
+ 	tuple.DesiredTuple = CISTPL_VERS_1;
+-	if (CardServices(GetFirstTuple, handle, &tuple) == CS_SUCCESS &&
+-		CardServices(GetTupleData, handle, &tuple) == CS_SUCCESS &&
+-		CardServices(ParseTuple, handle, &tuple, &parse) == CS_SUCCESS) {
++	if (pcmcia_get_first_tuple(handle, &tuple) == CS_SUCCESS &&
++		pcmcia_get_tuple_data(handle, &tuple) == CS_SUCCESS &&
++		pcmcia_parse_tuple(handle, &tuple, &parse) == CS_SUCCESS) {
+ 		cardname = parse.version_1.str + parse.version_1.ofs[1];
+ 	} else
+ 		cardname = "3Com 3c574";
+@@ -557,21 +551,11 @@ static void tc574_release(dev_link_t *li
+ {
+ 	DEBUG(0, "3c574_release(0x%p)\n", link);
+ 
+-	if (link->open) {
+-		DEBUG(1, "3c574_cs: release postponed, '%s' still open\n",
+-			  link->dev->dev_name);
+-		link->state |= DEV_STALE_CONFIG;
+-		return;
+-	}
+-
+-	CardServices(ReleaseConfiguration, link->handle);
+-	CardServices(ReleaseIO, link->handle, &link->io);
+-	CardServices(ReleaseIRQ, link->handle, &link->irq);
++	pcmcia_release_configuration(link->handle);
++	pcmcia_release_io(link->handle, &link->io);
++	pcmcia_release_irq(link->handle, &link->irq);
+ 
+ 	link->state &= ~DEV_CONFIG;
+-
+-	if (link->state & DEV_STALE_CONFIG)
+-		tc574_detach(link);
+ }
+ 
+ /*
+@@ -608,7 +592,7 @@ static int tc574_event(event_t event, in
+ 		if (link->state & DEV_CONFIG) {
+ 			if (link->open)
+ 				netif_device_detach(dev);
+-			CardServices(ReleaseConfiguration, link->handle);
++			pcmcia_release_configuration(link->handle);
+ 		}
+ 		break;
+ 	case CS_EVENT_PM_RESUME:
+@@ -616,7 +600,7 @@ static int tc574_event(event_t event, in
+ 		/* Fall through... */
+ 	case CS_EVENT_CARD_RESET:
+ 		if (link->state & DEV_CONFIG) {
+-			CardServices(RequestConfiguration, link->handle, &link->conf);
++			pcmcia_request_configuration(link->handle, &link->conf);
+ 			if (link->open) {
+ 				tc574_reset(dev);
+ 				netif_device_attach(dev);
+@@ -1092,8 +1076,12 @@ static struct net_device_stats *el3_get_
+ {
+ 	struct el3_private *lp = (struct el3_private *)dev->priv;
+ 
+-	if (netif_device_present(dev))
++	if (netif_device_present(dev)) {
++		unsigned long flags;
++		spin_lock_irqsave(&lp->window_lock, flags);
+ 		update_stats(dev);
++		spin_unlock_irqrestore(&lp->window_lock, flags);
++	}
+ 	return &lp->stats;
+ }
+ 
+@@ -1105,7 +1093,6 @@ static void update_stats(struct net_devi
+ {
+ 	struct el3_private *lp = (struct el3_private *)dev->priv;
+ 	ioaddr_t ioaddr = dev->base_addr;
+-	unsigned long flags;
+ 	u8 rx, tx, up;
+ 
+ 	DEBUG(2, "%s: updating the statistics.\n", dev->name);
+@@ -1113,8 +1100,6 @@ static void update_stats(struct net_devi
+ 	if (inw(ioaddr+EL3_STATUS) == 0xffff) /* No card. */
+ 		return;
+ 		
+-	spin_lock_irqsave(&lp->window_lock, flags);
+-
+ 	/* Unlike the 3c509 we need not turn off stats updates while reading. */
+ 	/* Switch to the stats window, and read everything. */
+ 	EL3WINDOW(6);
+@@ -1139,7 +1124,6 @@ static void update_stats(struct net_devi
+ 	lp->stats.tx_bytes 			+= tx + ((up & 0xf0) << 12);
+ 
+ 	EL3WINDOW(1);
+-	spin_unlock_irqrestore(&lp->window_lock, flags);
+ }
+ 
+ static int el3_rx(struct net_device *dev, int worklimit)
+@@ -1281,6 +1265,8 @@ static int el3_close(struct net_device *
+ 	DEBUG(2, "%s: shutting down ethercard.\n", dev->name);
+ 	
+ 	if (DEV_OK(link)) {
++		unsigned long flags;
++
+ 		/* Turn off statistics ASAP.  We update lp->stats below. */
+ 		outw(StatsDisable, ioaddr + EL3_CMD);
+ 		
+@@ -1290,15 +1276,15 @@ static int el3_close(struct net_device *
+ 		
+ 		/* Note: Switching to window 0 may disable the IRQ. */
+ 		EL3WINDOW(0);
+-		
++		spin_lock_irqsave(&lp->window_lock, flags);
+ 		update_stats(dev);
++		spin_unlock_irqrestore(&lp->window_lock, flags);
+ 	}
+ 
+ 	link->open--;
+ 	netif_stop_queue(dev);
+ 	del_timer_sync(&lp->media);
+-	if (link->state & DEV_STALE_CONFIG)
+-		tc574_release(link);
++
+ 	return 0;
+ }
+ 
+--- linux-2.6.0/drivers/net/pcmcia/3c589_cs.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/pcmcia/3c589_cs.c	2003-12-28 23:22:53.000000000 -0800
+@@ -244,7 +244,7 @@ static dev_link_t *tc589_attach(void)
+     client_reg.event_handler = &tc589_event;
+     client_reg.Version = 0x0210;
+     client_reg.event_callback_args.client_data = link;
+-    ret = CardServices(RegisterClient, &link->handle, &client_reg);
++    ret = pcmcia_register_client(&link->handle, &client_reg);
+     if (ret != 0) {
+ 	cs_error(link->handle, RegisterClient, ret);
+ 	tc589_detach(link);
+@@ -276,23 +276,17 @@ static void tc589_detach(dev_link_t *lin
+     if (*linkp == NULL)
+ 	return;
+ 
+-    if (link->state & DEV_CONFIG) {
++    if (link->state & DEV_CONFIG)
+ 	tc589_release(link);
+-	if (link->state & DEV_STALE_CONFIG)
+-	    return;
+-    }
+     
+     if (link->handle)
+-	CardServices(DeregisterClient, link->handle);
++	pcmcia_deregister_client(link->handle);
+     
+     /* Unlink device structure, free bits */
+     *linkp = link->next;
+-    if (link->dev) {
++    if (link->dev)
+ 	unregister_netdev(dev);
+-	free_netdev(dev);
+-    } else
+-        kfree(dev);
+-    
++    free_netdev(dev);
+ } /* tc589_detach */
+ 
+ /*======================================================================
+@@ -303,8 +297,8 @@ static void tc589_detach(dev_link_t *lin
+     
+ ======================================================================*/
+ 
+-#define CS_CHECK(fn, args...) \
+-while ((last_ret=CardServices(last_fn=(fn), args))!=0) goto cs_failed
++#define CS_CHECK(fn, ret) \
++do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+ 
+ static void tc589_config(dev_link_t *link)
+ {
+@@ -323,20 +317,20 @@ static void tc589_config(dev_link_t *lin
+     phys_addr = (u16 *)dev->dev_addr;
+     tuple.Attributes = 0;
+     tuple.DesiredTuple = CISTPL_CONFIG;
+-    CS_CHECK(GetFirstTuple, handle, &tuple);
++    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+     tuple.TupleData = (cisdata_t *)buf;
+     tuple.TupleDataMax = sizeof(buf);
+     tuple.TupleOffset = 0;
+-    CS_CHECK(GetTupleData, handle, &tuple);
+-    CS_CHECK(ParseTuple, handle, &tuple, &parse);
++    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
++    CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+     link->conf.ConfigBase = parse.config.base;
+     link->conf.Present = parse.config.rmask[0];
+     
+     /* Is this a 3c562? */
+     tuple.DesiredTuple = CISTPL_MANFID;
+     tuple.Attributes = TUPLE_RETURN_COMMON;
+-    if ((CardServices(GetFirstTuple, handle, &tuple) == CS_SUCCESS) &&
+-	(CardServices(GetTupleData, handle, &tuple) == CS_SUCCESS)) {
++    if ((pcmcia_get_first_tuple(handle, &tuple) == CS_SUCCESS) &&
++	(pcmcia_get_tuple_data(handle, &tuple) == CS_SUCCESS)) {
+ 	if (le16_to_cpu(buf[0]) != MANFID_3COM)
+ 	    printk(KERN_INFO "3c589_cs: hmmm, is this really a "
+ 		   "3Com card??\n");
+@@ -351,15 +345,15 @@ static void tc589_config(dev_link_t *lin
+     for (i = j = 0; j < 0x400; j += 0x10) {
+ 	if (multi && (j & 0x80)) continue;
+ 	link->io.BasePort1 = j ^ 0x300;
+-	i = CardServices(RequestIO, link->handle, &link->io);
++	i = pcmcia_request_io(link->handle, &link->io);
+ 	if (i == CS_SUCCESS) break;
+     }
+     if (i != CS_SUCCESS) {
+ 	cs_error(link->handle, RequestIO, i);
+ 	goto failed;
+     }
+-    CS_CHECK(RequestIRQ, link->handle, &link->irq);
+-    CS_CHECK(RequestConfiguration, link->handle, &link->conf);
++    CS_CHECK(RequestIRQ, pcmcia_request_irq(link->handle, &link->irq));
++    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link->handle, &link->conf));
+ 	
+     dev->irq = link->irq.AssignedIRQ;
+     dev->base_addr = link->io.BasePort1;
+@@ -374,8 +368,8 @@ static void tc589_config(dev_link_t *lin
+     /* The 3c589 has an extra EEPROM for configuration info, including
+        the hardware address.  The 3c562 puts the address in the CIS. */
+     tuple.DesiredTuple = 0x88;
+-    if (CardServices(GetFirstTuple, handle, &tuple) == CS_SUCCESS) {
+-	CardServices(GetTupleData, handle, &tuple);
++    if (pcmcia_get_first_tuple(handle, &tuple) == CS_SUCCESS) {
++	pcmcia_get_tuple_data(handle, &tuple);
+ 	for (i = 0; i < 3; i++)
+ 	    phys_addr[i] = htons(buf[i]);
+     } else {
+@@ -433,21 +427,11 @@ static void tc589_release(dev_link_t *li
+ {
+     DEBUG(0, "3c589_release(0x%p)\n", link);
+     
+-    if (link->open) {
+-	DEBUG(1, "3c589_cs: release postponed, '%s' still open\n",
+-	      link->dev->dev_name);
+-	link->state |= DEV_STALE_CONFIG;
+-	return;
+-    }
+-    
+-    CardServices(ReleaseConfiguration, link->handle);
+-    CardServices(ReleaseIO, link->handle, &link->io);
+-    CardServices(ReleaseIRQ, link->handle, &link->irq);
++    pcmcia_release_configuration(link->handle);
++    pcmcia_release_io(link->handle, &link->io);
++    pcmcia_release_irq(link->handle, &link->irq);
+     
+     link->state &= ~DEV_CONFIG;
+-
+-    if (link->state & DEV_STALE_CONFIG)
+-	    tc589_detach(link);
+ }
+ 
+ /*======================================================================
+@@ -486,7 +470,7 @@ static int tc589_event(event_t event, in
+ 	if (link->state & DEV_CONFIG) {
+ 	    if (link->open)
+ 		netif_device_detach(dev);
+-	    CardServices(ReleaseConfiguration, link->handle);
++	    pcmcia_release_configuration(link->handle);
+ 	}
+ 	break;
+     case CS_EVENT_PM_RESUME:
+@@ -494,7 +478,7 @@ static int tc589_event(event_t event, in
+ 	/* Fall through... */
+     case CS_EVENT_CARD_RESET:
+ 	if (link->state & DEV_CONFIG) {
+-	    CardServices(RequestConfiguration, link->handle, &link->conf);
++	    pcmcia_request_configuration(link->handle, &link->conf);
+ 	    if (link->open) {
+ 		tc589_reset(dev);
+ 		netif_device_attach(dev);
+@@ -1076,8 +1060,6 @@ static int el3_close(struct net_device *
+     link->open--;
+     netif_stop_queue(dev);
+     del_timer_sync(&lp->media);
+-    if (link->state & DEV_STALE_CONFIG)
+-	     tc589_release(link);
+     
+     return 0;
+ }
+--- linux-2.6.0/drivers/net/pcmcia/axnet_cs.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/pcmcia/axnet_cs.c	2003-12-28 23:22:53.000000000 -0800
+@@ -119,7 +119,7 @@ static void axnet_detach(dev_link_t *);
+ static dev_info_t dev_info = "axnet_cs";
+ static dev_link_t *dev_list;
+ 
+-static int axdev_init(struct net_device *dev);
++static void axdev_setup(struct net_device *dev);
+ static void AX88190_init(struct net_device *dev, int startp);
+ static int ax_open(struct net_device *dev);
+ static int ax_close(struct net_device *dev);
+@@ -128,7 +128,6 @@ static irqreturn_t ax_interrupt(int irq,
+ /*====================================================================*/
+ 
+ typedef struct axnet_dev_t {
+-    struct net_device	dev;	/* so &dev == &axnet_dev_t */
+     dev_link_t		link;
+     dev_node_t		node;
+     caddr_t		base;
+@@ -140,16 +139,10 @@ typedef struct axnet_dev_t {
+     int			flags;
+ } axnet_dev_t;
+ 
+-/*======================================================================
+-
+-    We never need to do anything when a axnet device is "initialized"
+-    by the net software, because we only register already-found cards.
+-
+-======================================================================*/
+-
+-static int axnet_init(struct net_device *dev)
++static inline axnet_dev_t *PRIV(struct net_device *dev)
+ {
+-    return 0;
++	void *p = (char *)netdev_priv(dev) + sizeof(struct ei_device);
++	return p;
+ }
+ 
+ /*======================================================================
+@@ -170,12 +163,15 @@ static dev_link_t *axnet_attach(void)
+ 
+     DEBUG(0, "axnet_attach()\n");
+ 
+-    /* Create new ethernet device */
+-    info = kmalloc(sizeof(*info), GFP_KERNEL);
+-    if (!info) return NULL;
+-    memset(info, 0, sizeof(*info));
+-    link = &info->link; dev = &info->dev;
+-    link->priv = info;
++    dev = alloc_netdev(sizeof(struct ei_device) + sizeof(axnet_dev_t),
++			"eth%d", axdev_setup);
++
++    if (!dev)
++	return NULL;
++
++    info = PRIV(dev);
++    link = &info->link;
++    link->priv = dev;
+     link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
+     link->irq.IRQInfo1 = IRQ_INFO2_VALID|IRQ_LEVEL_ID;
+     if (irq_list[0] == -1)
+@@ -186,8 +182,6 @@ static dev_link_t *axnet_attach(void)
+     link->conf.Attributes = CONF_ENABLE_IRQ;
+     link->conf.IntType = INT_MEMORY_AND_IO;
+ 
+-    axdev_init(dev);
+-    dev->init = &axnet_init;
+     dev->open = &axnet_open;
+     dev->stop = &axnet_close;
+     dev->do_ioctl = &axnet_ioctl;
+@@ -205,7 +199,7 @@ static dev_link_t *axnet_attach(void)
+     client_reg.event_handler = &axnet_event;
+     client_reg.Version = 0x0210;
+     client_reg.event_callback_args.client_data = link;
+-    ret = CardServices(RegisterClient, &link->handle, &client_reg);
++    ret = pcmcia_register_client(&link->handle, &client_reg);
+     if (ret != CS_SUCCESS) {
+ 	cs_error(link->handle, RegisterClient, ret);
+ 	axnet_detach(link);
+@@ -226,7 +220,7 @@ static dev_link_t *axnet_attach(void)
+ 
+ static void axnet_detach(dev_link_t *link)
+ {
+-    axnet_dev_t *info = link->priv;
++    struct net_device *dev = link->priv;
+     dev_link_t **linkp;
+ 
+     DEBUG(0, "axnet_detach(0x%p)\n", link);
+@@ -237,23 +231,17 @@ static void axnet_detach(dev_link_t *lin
+     if (*linkp == NULL)
+ 	return;
+ 
+-    if (link->state & DEV_CONFIG) {
++    if (link->state & DEV_CONFIG)
+ 	axnet_release(link);
+-	if (link->state & DEV_STALE_CONFIG)
+-	    return;
+-    }
+ 
+     if (link->handle)
+-	CardServices(DeregisterClient, link->handle);
++	pcmcia_deregister_client(link->handle);
+ 
+     /* Unlink device structure, free bits */
+     *linkp = link->next;
+-    if (link->dev) {
+-	unregister_netdev(&info->dev);
+-	free_netdev(&info->dev);
+-    } else
+-	kfree(info);
+-
++    if (link->dev)
++	unregister_netdev(dev);
++    free_netdev(dev);
+ } /* axnet_detach */
+ 
+ /*======================================================================
+@@ -313,11 +301,8 @@ static int get_prom(dev_link_t *link)
+ 
+ ======================================================================*/
+ 
+-#define CS_CHECK(fn, args...) \
+-while ((last_ret=CardServices(last_fn=(fn), args))!=0) goto cs_failed
+-
+-#define CFG_CHECK(fn, args...) \
+-if (CardServices(fn, args) != 0) goto next_entry
++#define CS_CHECK(fn, ret) \
++do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+ 
+ static int try_io_port(dev_link_t *link)
+ {
+@@ -340,20 +325,20 @@ static int try_io_port(dev_link_t *link)
+ 	for (j = 0; j < 0x400; j += 0x20) {
+ 	    link->io.BasePort1 = j ^ 0x300;
+ 	    link->io.BasePort2 = (j ^ 0x300) + 0x10;
+-	    ret = CardServices(RequestIO, link->handle, &link->io);
++	    ret = pcmcia_request_io(link->handle, &link->io);
+ 	    if (ret == CS_SUCCESS) return ret;
+ 	}
+ 	return ret;
+     } else {
+-	return CardServices(RequestIO, link->handle, &link->io);
++	return pcmcia_request_io(link->handle, &link->io);
+     }
+ }
+ 
+ static void axnet_config(dev_link_t *link)
+ {
+     client_handle_t handle = link->handle;
+-    axnet_dev_t *info = link->priv;
+-    struct net_device *dev = &info->dev;
++    struct net_device *dev = link->priv;
++    axnet_dev_t *info = PRIV(dev);
+     tuple_t tuple;
+     cisparse_t parse;
+     int i, j, last_ret, last_fn;
+@@ -367,9 +352,9 @@ static void axnet_config(dev_link_t *lin
+     tuple.TupleDataMax = sizeof(buf);
+     tuple.TupleOffset = 0;
+     tuple.DesiredTuple = CISTPL_CONFIG;
+-    CS_CHECK(GetFirstTuple, handle, &tuple);
+-    CS_CHECK(GetTupleData, handle, &tuple);
+-    CS_CHECK(ParseTuple, handle, &tuple, &parse);
++    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
++    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
++    CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+     link->conf.ConfigBase = parse.config.base;
+     /* don't trust the CIS on this; Linksys got it wrong */
+     link->conf.Present = 0x63;
+@@ -378,19 +363,19 @@ static void axnet_config(dev_link_t *lin
+     link->state |= DEV_CONFIG;
+ 
+     /* Look up current Vcc */
+-    CS_CHECK(GetConfigurationInfo, handle, &conf);
++    CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(handle, &conf));
+     link->conf.Vcc = conf.Vcc;
+ 
+     tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+     tuple.Attributes = 0;
+-    CS_CHECK(GetFirstTuple, handle, &tuple);
++    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+     while (last_ret == CS_SUCCESS) {
+ 	cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
+ 	cistpl_io_t *io = &(parse.cftable_entry.io);
+ 	
+-	CFG_CHECK(GetTupleData, handle, &tuple);
+-	CFG_CHECK(ParseTuple, handle, &tuple, &parse);
+-	if ((cfg->index == 0) || (cfg->io.nwin == 0))
++	if (pcmcia_get_tuple_data(handle, &tuple) != 0 ||
++		pcmcia_parse_tuple(handle, &tuple, &parse) != 0 ||
++		cfg->index == 0 || cfg->io.nwin == 0)
+ 	    goto next_entry;
+ 	
+ 	link->conf.ConfigIndex = 0x05;
+@@ -411,32 +396,27 @@ static void axnet_config(dev_link_t *lin
+ 	    if (last_ret == CS_SUCCESS) break;
+ 	}
+     next_entry:
+-	last_ret = CardServices(GetNextTuple, handle, &tuple);
++	last_ret = pcmcia_get_next_tuple(handle, &tuple);
+     }
+     if (last_ret != CS_SUCCESS) {
+ 	cs_error(handle, RequestIO, last_ret);
+ 	goto failed;
+     }
+ 
+-    CS_CHECK(RequestIRQ, handle, &link->irq);
++    CS_CHECK(RequestIRQ, pcmcia_request_irq(handle, &link->irq));
+     
+     if (link->io.NumPorts2 == 8) {
+ 	link->conf.Attributes |= CONF_ENABLE_SPKR;
+ 	link->conf.Status = CCSR_AUDIO_ENA;
+     }
+     
+-    CS_CHECK(RequestConfiguration, handle, &link->conf);
++    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(handle, &link->conf));
+     dev->irq = link->irq.AssignedIRQ;
+     dev->base_addr = link->io.BasePort1;
+-    if (register_netdev(dev) != 0) {
+-	printk(KERN_NOTICE "axnet_cs: register_netdev() failed\n");
+-	goto failed;
+-    }
+ 
+     if (!get_prom(link)) {
+ 	printk(KERN_NOTICE "axnet_cs: this is not an AX88190 card!\n");
+ 	printk(KERN_NOTICE "axnet_cs: use pcnet_cs instead.\n");
+-	unregister_netdev(dev);
+ 	goto failed;
+     }
+ 
+@@ -451,7 +431,6 @@ static void axnet_config(dev_link_t *lin
+     ei_status.block_output = &block_output;
+ 
+     strcpy(info->node.dev_name, dev->name);
+-    link->dev = &info->node;
+ 
+     if (inb(dev->base_addr + AXNET_TEST) != 0)
+ 	info->flags |= IS_AX88790;
+@@ -476,7 +455,7 @@ static void axnet_config(dev_link_t *lin
+        Bit 2 of CCSR is active low. */ 
+     if (i == 32) {
+ 	conf_reg_t reg = { 0, CS_WRITE, CISREG_CCSR, 0x04 };
+- 	CardServices(AccessConfigurationRegister, link->handle, &reg);
++ 	pcmcia_access_configuration_register(link->handle, &reg);
+ 	for (i = 0; i < 32; i++) {
+ 	    j = mdio_read(dev->base_addr + AXNET_MII_EEP, i, 1);
+ 	    if ((j != 0) && (j != 0xffff)) break;
+@@ -490,6 +469,12 @@ static void axnet_config(dev_link_t *lin
+ 	printk(KERN_NOTICE "  No MII transceivers found!\n");
+     }
+ 
++    if (register_netdev(dev) != 0) {
++	printk(KERN_NOTICE "axnet_cs: register_netdev() failed\n");
++	goto failed;
++    }
++
++    link->dev = &info->node;
+     link->state &= ~DEV_CONFIG_PENDING;
+     return;
+ 
+@@ -513,21 +498,11 @@ static void axnet_release(dev_link_t *li
+ {
+     DEBUG(0, "axnet_release(0x%p)\n", link);
+ 
+-    if (link->open) {
+-	DEBUG(1, "axnet_cs: release postponed, '%s' still open\n",
+-	      ((axnet_dev_t *)(link->priv))->node.dev_name);
+-	link->state |= DEV_STALE_CONFIG;
+-	return;
+-    }
+-
+-    CardServices(ReleaseConfiguration, link->handle);
+-    CardServices(ReleaseIO, link->handle, &link->io);
+-    CardServices(ReleaseIRQ, link->handle, &link->irq);
++    pcmcia_release_configuration(link->handle);
++    pcmcia_release_io(link->handle, &link->io);
++    pcmcia_release_irq(link->handle, &link->irq);
+ 
+     link->state &= ~DEV_CONFIG;
+-
+-    if (link->state & DEV_STALE_CONFIG)
+-	    axnet_detach(link);
+ }
+ 
+ /*======================================================================
+@@ -543,7 +518,7 @@ static int axnet_event(event_t event, in
+ 		       event_callback_args_t *args)
+ {
+     dev_link_t *link = args->client_data;
+-    axnet_dev_t *info = link->priv;
++    struct net_device *dev = link->priv;
+ 
+     DEBUG(2, "axnet_event(0x%06x)\n", event);
+ 
+@@ -551,7 +526,7 @@ static int axnet_event(event_t event, in
+     case CS_EVENT_CARD_REMOVAL:
+ 	link->state &= ~DEV_PRESENT;
+ 	if (link->state & DEV_CONFIG) {
+-	    netif_device_detach(&info->dev);
++	    netif_device_detach(dev);
+ 	    axnet_release(link);
+ 	}
+ 	break;
+@@ -565,7 +540,7 @@ static int axnet_event(event_t event, in
+     case CS_EVENT_RESET_PHYSICAL:
+ 	if (link->state & DEV_CONFIG) {
+ 	    if (link->open)
+-		netif_device_detach(&info->dev);
++		netif_device_detach(dev);
+ 	    CardServices(ReleaseConfiguration, link->handle);
+ 	}
+ 	break;
+@@ -574,11 +549,11 @@ static int axnet_event(event_t event, in
+ 	/* Fall through... */
+     case CS_EVENT_CARD_RESET:
+ 	if (link->state & DEV_CONFIG) {
+-	    CardServices(RequestConfiguration, link->handle, &link->conf);
++	    pcmcia_request_configuration(link->handle, &link->conf);
+ 	    if (link->open) {
+-		axnet_reset_8390(&info->dev);
+-		AX88190_init(&info->dev, 1);
+-		netif_device_attach(&info->dev);
++		axnet_reset_8390(dev);
++		AX88190_init(dev, 1);
++		netif_device_attach(dev);
+ 	    }
+ 	}
+ 	break;
+@@ -648,7 +623,7 @@ static void mdio_write(ioaddr_t addr, in
+ 
+ static int axnet_open(struct net_device *dev)
+ {
+-    axnet_dev_t *info = (axnet_dev_t *)dev;
++    axnet_dev_t *info = PRIV(dev);
+     dev_link_t *link = &info->link;
+     
+     DEBUG(2, "axnet_open('%s')\n", dev->name);
+@@ -663,7 +638,7 @@ static int axnet_open(struct net_device 
+     info->link_status = 0x00;
+     init_timer(&info->watchdog);
+     info->watchdog.function = &ei_watchdog;
+-    info->watchdog.data = (u_long)info;
++    info->watchdog.data = (u_long)dev;
+     info->watchdog.expires = jiffies + HZ;
+     add_timer(&info->watchdog);
+ 
+@@ -674,7 +649,7 @@ static int axnet_open(struct net_device 
+ 
+ static int axnet_close(struct net_device *dev)
+ {
+-    axnet_dev_t *info = (axnet_dev_t *)dev;
++    axnet_dev_t *info = PRIV(dev);
+     dev_link_t *link = &info->link;
+ 
+     DEBUG(2, "axnet_close('%s')\n", dev->name);
+@@ -685,8 +660,6 @@ static int axnet_close(struct net_device
+     link->open--;
+     netif_stop_queue(dev);
+     del_timer_sync(&info->watchdog);
+-    if (link->state & DEV_STALE_CONFIG)
+-	axnet_release(link);
+ 
+     return 0;
+ } /* axnet_close */
+@@ -726,15 +699,15 @@ static void axnet_reset_8390(struct net_
+ 
+ static irqreturn_t ei_irq_wrapper(int irq, void *dev_id, struct pt_regs *regs)
+ {
+-    axnet_dev_t *info = dev_id;
+-    info->stale = 0;
++    struct net_device *dev = dev_id;
++    PRIV(dev)->stale = 0;
+     return ax_interrupt(irq, dev_id, regs);
+ }
+ 
+ static void ei_watchdog(u_long arg)
+ {
+-    axnet_dev_t *info = (axnet_dev_t *)(arg);
+-    struct net_device *dev = &info->dev;
++    struct net_device *dev = (struct net_device *)(arg);
++    axnet_dev_t *info = PRIV(dev);
+     ioaddr_t nic_base = dev->base_addr;
+     ioaddr_t mii_addr = nic_base + AXNET_MII_EEP;
+     u_short link;
+@@ -804,7 +777,7 @@ static struct ethtool_ops netdev_ethtool
+ 
+ static int axnet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+ {
+-    axnet_dev_t *info = (axnet_dev_t *)dev;
++    axnet_dev_t *info = PRIV(dev);
+     u16 *data = (u16 *)&rq->ifr_data;
+     ioaddr_t mii_addr = dev->base_addr + AXNET_MII_EEP;
+     switch (cmd) {
+@@ -1053,14 +1026,7 @@ static void do_set_multicast_list(struct
+ static int ax_open(struct net_device *dev)
+ {
+ 	unsigned long flags;
+-	struct ei_device *ei_local = (struct ei_device *) dev->priv;
+-
+-	/* This can't happen unless somebody forgot to call axdev_init(). */
+-	if (ei_local == NULL) 
+-	{
+-		printk(KERN_EMERG "%s: ax_open passed a non-existent device!\n", dev->name);
+-		return -ENXIO;
+-	}
++	struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
+ 
+ #ifdef HAVE_TX_TIMEOUT
+ 	/* The card I/O part of the driver (e.g. 3c503) can hook a Tx timeout
+@@ -1086,7 +1052,7 @@ static int ax_open(struct net_device *de
+ 	return 0;
+ }
+ 
+-#define dev_lock(dev) (((struct ei_device *)(dev)->priv)->page_lock)
++#define dev_lock(dev) (((struct ei_device *)netdev_priv(dev))->page_lock)
+ 
+ /**
+  * ax_close - shut down network device
+@@ -1120,7 +1086,7 @@ int ax_close(struct net_device *dev)
+ void ei_tx_timeout(struct net_device *dev)
+ {
+ 	long e8390_base = dev->base_addr;
+-	struct ei_device *ei_local = (struct ei_device *) dev->priv;
++	struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
+ 	int txsr, isr, tickssofar = jiffies - dev->trans_start;
+ 	unsigned long flags;
+ 
+@@ -1166,7 +1132,7 @@ void ei_tx_timeout(struct net_device *de
+ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
+ {
+ 	long e8390_base = dev->base_addr;
+-	struct ei_device *ei_local = (struct ei_device *) dev->priv;
++	struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
+ 	int length, send_length, output_page;
+ 	unsigned long flags;
+ 	u8 packet[ETH_ZLEN];
+@@ -1312,7 +1278,7 @@ static irqreturn_t ax_interrupt(int irq,
+ 	}
+     
+ 	e8390_base = dev->base_addr;
+-	ei_local = (struct ei_device *) dev->priv;
++	ei_local = (struct ei_device *) netdev_priv(dev);
+ 
+ 	/*
+ 	 *	Protect the irq test too.
+@@ -1424,7 +1390,7 @@ static irqreturn_t ax_interrupt(int irq,
+ static void ei_tx_err(struct net_device *dev)
+ {
+ 	long e8390_base = dev->base_addr;
+-	struct ei_device *ei_local = (struct ei_device *) dev->priv;
++	struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
+ 	unsigned char txsr = inb_p(e8390_base+EN0_TSR);
+ 	unsigned char tx_was_aborted = txsr & (ENTSR_ABT+ENTSR_FU);
+ 
+@@ -1465,7 +1431,7 @@ static void ei_tx_err(struct net_device 
+ static void ei_tx_intr(struct net_device *dev)
+ {
+ 	long e8390_base = dev->base_addr;
+-	struct ei_device *ei_local = (struct ei_device *) dev->priv;
++	struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
+ 	int status = inb(e8390_base + EN0_TSR);
+     
+ 	/*
+@@ -1546,7 +1512,7 @@ static void ei_tx_intr(struct net_device
+ static void ei_receive(struct net_device *dev)
+ {
+ 	long e8390_base = dev->base_addr;
+-	struct ei_device *ei_local = (struct ei_device *) dev->priv;
++	struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
+ 	unsigned char rxing_page, this_frame, next_frame;
+ 	unsigned short current_offset;
+ 	int rx_pkt_count = 0;
+@@ -1666,7 +1632,7 @@ static void ei_rx_overrun(struct net_dev
+ 	axnet_dev_t *info = (axnet_dev_t *)dev;
+ 	long e8390_base = dev->base_addr;
+ 	unsigned char was_txing, must_resend = 0;
+-	struct ei_device *ei_local = (struct ei_device *) dev->priv;
++	struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
+     
+ 	/*
+ 	 * Record whether a Tx was in progress and then issue the
+@@ -1733,7 +1699,7 @@ static void ei_rx_overrun(struct net_dev
+ static struct net_device_stats *get_stats(struct net_device *dev)
+ {
+ 	long ioaddr = dev->base_addr;
+-	struct ei_device *ei_local = (struct ei_device *) dev->priv;
++	struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
+ 	unsigned long flags;
+     
+ 	/* If the card is stopped, just return the present stats. */
+@@ -1786,39 +1752,30 @@ static void set_multicast_list(struct ne
+ }	
+ 
+ /**
+- * axdev_init - init rest of 8390 device struct
++ * axdev_setup - init rest of 8390 device struct
+  * @dev: network device structure to init
+  *
+  * Initialize the rest of the 8390 device structure.  Do NOT __init
+  * this, as it is used by 8390 based modular drivers too.
+  */
+ 
+-static int axdev_init(struct net_device *dev)
++static void axdev_setup(struct net_device *dev)
+ {
++	struct ei_device *ei_local;
+ 	if (ei_debug > 1)
+ 		printk(version_8390);
+     
+ 	SET_MODULE_OWNER(dev);
+ 
+-	if (dev->priv == NULL) 
+-	{
+-		struct ei_device *ei_local;
+ 		
+-		dev->priv = kmalloc(sizeof(struct ei_device), GFP_KERNEL);
+-		if (dev->priv == NULL)
+-			return -ENOMEM;
+-		memset(dev->priv, 0, sizeof(struct ei_device));
+-		ei_local = (struct ei_device *)dev->priv;
+-		spin_lock_init(&ei_local->page_lock);
+-	}
++	ei_local = (struct ei_device *)netdev_priv(dev);
++	spin_lock_init(&ei_local->page_lock);
+     
+ 	dev->hard_start_xmit = &ei_start_xmit;
+ 	dev->get_stats	= get_stats;
+ 	dev->set_multicast_list = &set_multicast_list;
+ 
+ 	ether_setup(dev);
+-        
+-	return 0;
+ }
+ 
+ /* This page of functions should be 8390 generic */
+@@ -1834,9 +1791,9 @@ static int axdev_init(struct net_device 
+ 
+ static void AX88190_init(struct net_device *dev, int startp)
+ {
+-	axnet_dev_t *info = (axnet_dev_t *)dev;
++	axnet_dev_t *info = PRIV(dev);
+ 	long e8390_base = dev->base_addr;
+-	struct ei_device *ei_local = (struct ei_device *) dev->priv;
++	struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
+ 	int i;
+ 	int endcfg = ei_local->word16 ? (0x48 | ENDCFG_WTS) : 0x48;
+     
+@@ -1905,7 +1862,7 @@ static void NS8390_trigger_send(struct n
+ 								int start_page)
+ {
+ 	long e8390_base = dev->base_addr;
+- 	struct ei_device *ei_local __attribute((unused)) = (struct ei_device *) dev->priv;
++ 	struct ei_device *ei_local __attribute((unused)) = (struct ei_device *) netdev_priv(dev);
+     
+ 	if (inb_p(e8390_base) & E8390_TRANS) 
+ 	{
+--- linux-2.6.0/drivers/net/pcmcia/com20020_cs.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/pcmcia/com20020_cs.c	2003-12-28 23:22:53.000000000 -0800
+@@ -145,20 +145,6 @@ typedef struct com20020_dev_t {
+     dev_node_t          node;
+ } com20020_dev_t;
+ 
+-static void com20020_setup(struct net_device *dev)
+-{
+-	struct arcnet_local *lp = dev->priv;
+-
+-	lp->timeout = timeout;
+-	lp->backplane = backplane;
+-	lp->clockp = clockp;
+-	lp->clockm = clockm & 3;
+-	lp->hw.owner = THIS_MODULE;
+-
+-	/* fill in our module parameters as defaults */
+-	dev->dev_addr[0] = node;
+-}
+-
+ /*======================================================================
+ 
+     com20020_attach() creates an "instance" of the driver, allocating
+@@ -187,14 +173,21 @@ static dev_link_t *com20020_attach(void)
+     if (!info)
+ 	goto fail_alloc_info;
+ 
+-    dev = alloc_netdev(sizeof(struct arcnet_local), "arc%d",
+-		       com20020_setup);
++    dev = alloc_arcdev("");
+     if (!dev)
+ 	goto fail_alloc_dev;
+ 
+     memset(info, 0, sizeof(struct com20020_dev_t));
+     memset(link, 0, sizeof(struct dev_link_t));
+     lp = dev->priv;
++    lp->timeout = timeout;
++    lp->backplane = backplane;
++    lp->clockp = clockp;
++    lp->clockm = clockm & 3;
++    lp->hw.owner = THIS_MODULE;
++
++    /* fill in our module parameters as defaults */
++    dev->dev_addr[0] = node;
+ 
+     link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+     link->io.NumPorts1 = 16;
+@@ -227,7 +220,7 @@ static dev_link_t *com20020_attach(void)
+     client_reg.event_handler = &com20020_event;
+     client_reg.Version = 0x0210;
+     client_reg.event_callback_args.client_data = link;
+-    ret = CardServices(RegisterClient, &link->handle, &client_reg);
++    ret = pcmcia_register_client(&link->handle, &client_reg);
+     if (ret != 0) {
+         cs_error(link->handle, RegisterClient, ret);
+         com20020_detach(link);
+@@ -270,14 +263,11 @@ static void com20020_detach(dev_link_t *
+ 
+     dev = info->dev;
+ 
+-    if (link->state & DEV_CONFIG) {
++    if (link->state & DEV_CONFIG)
+         com20020_release(link);
+-        if (link->state & DEV_STALE_CONFIG)
+-            return;
+-    }
+ 
+     if (link->handle)
+-        CardServices(DeregisterClient, link->handle);
++        pcmcia_deregister_client(link->handle);
+ 
+     /* Unlink device structure, free bits */
+     DEBUG(1,"unlinking...\n");
+@@ -293,6 +283,8 @@ static void com20020_detach(dev_link_t *
+ 
+ 		if (netif_running(dev))
+ 		    dev->stop(dev);
++
++		unregister_netdev(dev);
+ 	    
+ 		/*
+ 		 * this is necessary because we register our IRQ separately
+@@ -300,10 +292,7 @@ static void com20020_detach(dev_link_t *
+ 		 */
+ 		if (dev->irq)
+ 		    free_irq(dev->irq, dev);
+-		
+ 		/* ...but I/O ports are done automatically by card services */
+-		
+-		unregister_netdev(dev);
+ 	    }
+ 	    
+ 	    DEBUG(1,"kfree...\n");
+@@ -325,8 +314,8 @@ static void com20020_detach(dev_link_t *
+ 
+ ======================================================================*/
+ 
+-#define CS_CHECK(fn, args...) \
+-while ((last_ret=CardServices(last_fn=(fn), args))!=0) goto cs_failed
++#define CS_CHECK(fn, ret) \
++do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+ 
+ static void com20020_config(dev_link_t *link)
+ {
+@@ -353,9 +342,9 @@ static void com20020_config(dev_link_t *
+     tuple.TupleDataMax = 64;
+     tuple.TupleOffset = 0;
+     tuple.DesiredTuple = CISTPL_CONFIG;
+-    CS_CHECK(GetFirstTuple, handle, &tuple);
+-    CS_CHECK(GetTupleData, handle, &tuple);
+-    CS_CHECK(ParseTuple, handle, &tuple, &parse);
++    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
++    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
++    CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+     link->conf.ConfigBase = parse.config.base;
+ 
+     /* Configure card */
+@@ -368,13 +357,13 @@ static void com20020_config(dev_link_t *
+ 	for (ioaddr = 0x100; ioaddr < 0x400; ioaddr += 0x10)
+ 	{
+ 	    link->io.BasePort1 = ioaddr;
+-	    i = CardServices(RequestIO, link->handle, &link->io);
++	    i = pcmcia_request_io(link->handle, &link->io);
+ 	    if (i == CS_SUCCESS)
+ 		break;
+ 	}
+     }
+     else
+-	i = CardServices(RequestIO, link->handle, &link->io);
++	i = pcmcia_request_io(link->handle, &link->io);
+     
+     if (i != CS_SUCCESS)
+     {
+@@ -388,7 +377,7 @@ static void com20020_config(dev_link_t *
+     DEBUG(1,"arcnet: request IRQ %d (%Xh/%Xh)\n",
+ 	   link->irq.AssignedIRQ,
+ 	   link->irq.IRQInfo1, link->irq.IRQInfo2);
+-    i = CardServices(RequestIRQ, link->handle, &link->irq);
++    i = pcmcia_request_irq(link->handle, &link->irq);
+     if (i != CS_SUCCESS)
+     {
+ 	DEBUG(1,"arcnet: requestIRQ failed totally!\n");
+@@ -397,7 +386,7 @@ static void com20020_config(dev_link_t *
+ 
+     dev->irq = link->irq.AssignedIRQ;
+ 
+-    CS_CHECK(RequestConfiguration, link->handle, &link->conf);
++    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link->handle, &link->conf));
+ 
+     if (com20020_check(dev))
+     {
+@@ -447,21 +436,11 @@ static void com20020_release(dev_link_t 
+ 
+     DEBUG(0, "com20020_release(0x%p)\n", link);
+ 
+-    if (link->open) {
+-	DEBUG(1,"postpone...\n");
+-	DEBUG(1, "com20020_cs: release postponed, device stll open\n");
+-        link->state |= DEV_STALE_CONFIG;
+-        return;
+-    }
+-
+-    CardServices(ReleaseConfiguration, link->handle);
+-    CardServices(ReleaseIO, link->handle, &link->io);
+-    CardServices(ReleaseIRQ, link->handle, &link->irq);
++    pcmcia_release_configuration(link->handle);
++    pcmcia_release_io(link->handle, &link->io);
++    pcmcia_release_irq(link->handle, &link->irq);
+ 
+     link->state &= ~(DEV_CONFIG | DEV_RELEASE_PENDING);
+-
+-    if (link->state & DEV_STALE_CONFIG)
+-	    com20020_detach(link);
+ }
+ 
+ /*======================================================================
+@@ -502,7 +481,7 @@ static int com20020_event(event_t event,
+             if (link->open) {
+                 netif_device_detach(dev);
+             }
+-            CardServices(ReleaseConfiguration, link->handle);
++            pcmcia_release_configuration(link->handle);
+         }
+         break;
+     case CS_EVENT_PM_RESUME:
+@@ -510,7 +489,7 @@ static int com20020_event(event_t event,
+         /* Fall through... */
+     case CS_EVENT_CARD_RESET:
+         if (link->state & DEV_CONFIG) {
+-            CardServices(RequestConfiguration, link->handle, &link->conf);
++            pcmcia_request_configuration(link->handle, &link->conf);
+             if (link->open) {
+ 		int ioaddr = dev->base_addr;
+ 		struct arcnet_local *lp = (struct arcnet_local *)dev->priv;
+--- linux-2.6.0/drivers/net/pcmcia/fmvj18x_cs.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/net/pcmcia/fmvj18x_cs.c	2003-12-28 23:22:53.000000000 -0800
+@@ -307,7 +307,7 @@ static dev_link_t *fmvj18x_attach(void)
+     client_reg.event_handler = &fmvj18x_event;
+     client_reg.Version = 0x0210;
+     client_reg.event_callback_args.client_data = link;
+-    ret = CardServices(RegisterClient, &link->handle, &client_reg);
++    ret = pcmcia_register_client(&link->handle, &client_reg);
+     if (ret != 0) {
+ 	cs_error(link->handle, RegisterClient, ret);
+ 	fmvj18x_detach(link);
+@@ -332,30 +332,24 @@ static void fmvj18x_detach(dev_link_t *l
+     if (*linkp == NULL)
+ 	return;
+ 
+-    if (link->state & DEV_CONFIG) {
++    if (link->state & DEV_CONFIG)
+ 	fmvj18x_release(link);
+-	if (link->state & DEV_STALE_CONFIG)
+-	    return;
+-    }
+ 
+     /* Break the link with Card Services */
+     if (link->handle)
+-	CardServices(DeregisterClient, link->handle);
++	pcmcia_deregister_client(link->handle);
+     
+     /* Unlink device structure, free pieces */
+     *linkp = link->next;
+-    if (link->dev) {
++    if (link->dev)
+ 	unregister_netdev(dev);
+-	free_netdev(dev);
+-    } else
+-    	kfree(dev);
+-    
++    free_netdev(dev);
+ } /* fmvj18x_detach */
+ 
+ /*====================================================================*/
+ 
+-#define CS_CHECK(fn, args...) \
+-while ((last_ret=CardServices(last_fn=(fn), args))!=0) goto cs_failed
++#define CS_CHECK(fn, ret) \
++do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+ 
+ static int mfc_try_io_port(dev_link_t *link)
+ {
+@@ -369,7 +363,7 @@ static int mfc_try_io_port(dev_link_t *l
+ 	    link->io.NumPorts2 = 0;
+ 	    printk(KERN_NOTICE "fmvj18x_cs: out of resource for serial\n");
+ 	}
+-	ret = CardServices(RequestIO, link->handle, &link->io);
++	ret = pcmcia_request_io(link->handle, &link->io);
+ 	if (ret == CS_SUCCESS) return ret;
+     }
+     return ret;
+@@ -385,7 +379,7 @@ static int ungermann_try_io_port(dev_lin
+     */
+     for (ioaddr = 0x300; ioaddr < 0x3e0; ioaddr += 0x20) {
+ 	link->io.BasePort1 = ioaddr;
+-	ret = CardServices(RequestIO, link->handle, &link->io);
++	ret = pcmcia_request_io(link->handle, &link->io);
+ 	if (ret == CS_SUCCESS) {
+ 	    /* calculate ConfigIndex value */
+ 	    link->conf.ConfigIndex = 
+@@ -417,12 +411,12 @@ static void fmvj18x_config(dev_link_t *l
+        registers.
+     */
+     tuple.DesiredTuple = CISTPL_CONFIG;
+-    CS_CHECK(GetFirstTuple, handle, &tuple);
++    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+     tuple.TupleData = (u_char *)buf;
+     tuple.TupleDataMax = 64;
+     tuple.TupleOffset = 0;
+-    CS_CHECK(GetTupleData, handle, &tuple);
+-    CS_CHECK(ParseTuple, handle, &tuple, &parse);
++    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
++    CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+     
+     /* Configure card */
+     link->state |= DEV_CONFIG;
+@@ -432,16 +426,16 @@ static void fmvj18x_config(dev_link_t *l
+ 
+     tuple.DesiredTuple = CISTPL_FUNCE;
+     tuple.TupleOffset = 0;
+-    if (CardServices(GetFirstTuple, handle, &tuple) == CS_SUCCESS) {
++    if (pcmcia_get_first_tuple(handle, &tuple) == CS_SUCCESS) {
+ 	/* Yes, I have CISTPL_FUNCE. Let's check CISTPL_MANFID */
+ 	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+-	CS_CHECK(GetFirstTuple, handle, &tuple);
+-	CS_CHECK(GetTupleData, handle, &tuple);
+-	CS_CHECK(ParseTuple, handle, &tuple, &parse);
++	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
++	CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
++	CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+ 	link->conf.ConfigIndex = parse.cftable_entry.index;
+ 	tuple.DesiredTuple = CISTPL_MANFID;
+-	if (CardServices(GetFirstTuple, handle, &tuple) == CS_SUCCESS)
+-	    CS_CHECK(GetTupleData, handle, &tuple);
++	if (pcmcia_get_first_tuple(handle, &tuple) == CS_SUCCESS)
++	    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
+ 	else
+ 	    buf[0] = 0xffff;
+ 	switch (le16_to_cpu(buf[0])) {
+@@ -449,7 +443,7 @@ static void fmvj18x_config(dev_link_t *l
+ 	    cardtype = TDK;
+ 	    if (le16_to_cpu(buf[1]) == PRODID_TDK_CF010) {
+ 		cs_status_t status;
+-		CardServices(GetStatus, handle, &status);
++		pcmcia_get_status(handle, &status);
+ 		if (status.CardState & CS_EVENT_3VCARD)
+ 		    link->conf.Vcc = 33; /* inserted in 3.3V slot */
+ 	    } else if (le16_to_cpu(buf[1]) == PRODID_TDK_GN3410) {
+@@ -478,8 +472,8 @@ static void fmvj18x_config(dev_link_t *l
+     } else {
+ 	/* old type card */
+ 	tuple.DesiredTuple = CISTPL_MANFID;
+-	if (CardServices(GetFirstTuple, handle, &tuple) == CS_SUCCESS)
+-	    CS_CHECK(GetTupleData, handle, &tuple);
++	if (pcmcia_get_first_tuple(handle, &tuple) == CS_SUCCESS)
++	    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
+ 	else
+ 	    buf[0] = 0xffff;
+ 	switch (le16_to_cpu(buf[0])) {
+@@ -510,10 +504,10 @@ static void fmvj18x_config(dev_link_t *l
+ 	ret = ungermann_try_io_port(link);
+ 	if (ret != CS_SUCCESS) goto cs_failed;
+     } else { 
+-	CS_CHECK(RequestIO, link->handle, &link->io);
++	CS_CHECK(RequestIO, pcmcia_request_io(link->handle, &link->io));
+     }
+-    CS_CHECK(RequestIRQ, link->handle, &link->irq);
+-    CS_CHECK(RequestConfiguration, link->handle, &link->conf);
++    CS_CHECK(RequestIRQ, pcmcia_request_irq(link->handle, &link->irq));
++    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link->handle, &link->conf));
+     dev->irq = link->irq.AssignedIRQ;
+     dev->base_addr = link->io.BasePort1;
+     if (register_netdev(dev) != 0) {
+@@ -546,17 +540,17 @@ static void fmvj18x_config(dev_link_t *l
+     case CONTEC:
+ 	tuple.DesiredTuple = CISTPL_FUNCE;
+ 	tuple.TupleOffset = 0;
+-	CS_CHECK(GetFirstTuple, handle, &tuple);
++	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+ 	tuple.TupleOffset = 0;
+-	CS_CHECK(GetTupleData, handle, &tuple);
++	CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
+ 	if (cardtype == MBH10304) {
+ 	    /* MBH10304's CIS_FUNCE is corrupted */
+ 	    node_id = &(tuple.TupleData[5]);
+ 	    card_name = "FMV-J182";
+ 	} else {
+ 	    while (tuple.TupleData[0] != CISTPL_FUNCE_LAN_NODE_ID ) {
+-		CS_CHECK(GetNextTuple, handle, &tuple) ;
+-		CS_CHECK(GetTupleData, handle, &tuple) ;
++		CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(handle, &tuple));
++		CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
+ 	    }
+ 	    node_id = &(tuple.TupleData[2]);
+ 	    if( cardtype == TDK ) {
+@@ -633,8 +627,7 @@ static int fmvj18x_get_hwinfo(dev_link_t
+     req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE;
+     req.Base = 0; req.Size = 0;
+     req.AccessSpeed = 0;
+-    link->win = (window_handle_t)link->handle;
+-    i = CardServices(RequestWindow, &link->win, &req);
++    i = pcmcia_request_window(&link->handle, &req, &link->win);
+     if (i != CS_SUCCESS) {
+ 	cs_error(link->handle, RequestWindow, i);
+ 	return -1;
+@@ -643,7 +636,7 @@ static int fmvj18x_get_hwinfo(dev_link_t
+     base = ioremap(req.Base, req.Size);
+     mem.Page = 0;
+     mem.CardOffset = 0;
+-    CardServices(MapMemPage, link->win, &mem);
++    pcmcia_map_mem_page(link->win, &mem);
+ 
+     /*
+      *  MBH10304 CISTPL_FUNCE_LAN_NODE_ID format
+@@ -668,7 +661,7 @@ static int fmvj18x_get_hwinfo(dev_link_t
+     }
+ 
+     iounmap(base);
+-    j = CardServices(ReleaseWindow, link->win);
++    j = pcmcia_release_window(link->win);
+     if (j != CS_SUCCESS)
+ 	cs_error(link->handle, ReleaseWindow, j);
+     return (i != 0x200) ? 0 : -1;
+@@ -689,8 +682,7 @@ static int fmvj18x_setup_mfc(dev_link_t 
+     req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE;
+     req.Base = 0; req.Size = 0;
+     req.AccessSpeed = 0;
+-    link->win = (window_handle_t)link->handle;
+-    i = CardServices(RequestWindow, &link->win, &req);
++    i = pcmcia_request_window(&link->handle, &req, &link->win);
+     if (i != CS_SUCCESS) {
+ 	cs_error(link->handle, RequestWindow, i);
+ 	return -1;
+@@ -699,7 +691,7 @@ static int fmvj18x_setup_mfc(dev_link_t 
+     base = ioremap(req.Base, req.Size);
+     mem.Page = 0;
+     mem.CardOffset = 0;
+-    CardServices(MapMemPage, link->win, &mem);
++    pcmcia_map_mem_page(link->win, &mem);
+ 
+     ioaddr = dev->base_addr;
+     writeb(0x47, base+0x800);	/* Config Option Register of LAN */
+@@ -712,7 +704,7 @@ static int fmvj18x_setup_mfc(dev_link_t 
+     writeb(0x8, base+0x822);	/* Config and Status Register */
+ 
+     iounmap(base);
+-    j = CardServices(ReleaseWindow, link->win);
++    j = pcmcia_release_window(link->win);
+     if (j != CS_SUCCESS)
+ 	cs_error(link->handle, ReleaseWindow, j);
+     return 0;
+@@ -725,27 +717,13 @@ static void fmvj18x_release(dev_link_t *
+ 
+     DEBUG(0, "fmvj18x_release(0x%p)\n", link);
+ 
+-    /*
+-       If the device is currently in use, we won't release until it
+-       is actually closed.
+-    */
+-    if (link->open) {
+-	DEBUG(1, "fmvj18x_cs: release postponed, '%s' "
+-	      "still open\n", link->dev->dev_name);
+-	link->state |= DEV_STALE_CONFIG;
+-	return;
+-    }
+-
+     /* Don't bother checking to see if these succeed or not */
+-    CardServices(ReleaseWindow, link->win);
+-    CardServices(ReleaseConfiguration, link->handle);
+-    CardServices(ReleaseIO, link->handle, &link->io);
+-    CardServices(ReleaseIRQ, link->handle, &link->irq);
++    pcmcia_release_window(link->win);
++    pcmcia_release_configuration(link->handle);
++    pcmcia_release_io(link->handle, &link->io);
++    pcmcia_release_irq(link->handle, &link->irq);
+     
+     link->state &= ~DEV_CONFIG;
+-
+-    if (link->state & DEV_STALE_CONFIG)
+-	    fmvj18x_detach(link);
+ }
+ 
+ /*====================================================================*/
+@@ -777,7 +755,7 @@ static int fmvj18x_event(event_t event, 
+ 	if (link->state & DEV_CONFIG) {
+ 	    if (link->open)
+ 		netif_device_detach(dev);
+-	    CardServices(ReleaseConfiguration, link->handle);
++	    pcmcia_release_configuration(link->handle);
+ 	}
+ 	break;
+     case CS_EVENT_PM_RESUME:
+@@ -785,7 +763,7 @@ static int fmvj18x_event(event_t event, 
+ 	/* Fall through... */
+     case CS_EVENT_CARD_RESET:
+ 	if (link->state & DEV_CONFIG) {
+-	    CardServices(RequestConfiguration, link->handle, &link->conf);
++	    pcmcia_request_configuration(link->handle, &link->conf);
+ 	    if (link->open) {
+ 		fjn_reset(dev);
+ 		netif_device_attach(dev);
+@@ -1253,8 +1231,6 @@ static int fjn_close(struct net_device *
+ 	outb(INTR_OFF, ioaddr + LAN_CTRL);
+ 
+     link->open--;
+-    if (link->state & DEV_STALE_CONFIG)
+-	    fmvj18x_release(link);
+ 
+     return 0;
+ } /* fjn_close */
+--- linux-2.6.0/drivers/net/pcmcia/ibmtr_cs.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/net/pcmcia/ibmtr_cs.c	2003-12-28 23:22:53.000000000 -0800
+@@ -125,8 +125,7 @@ static void ibmtr_detach(dev_link_t *);
+ 
+ static dev_link_t *dev_list;
+ 
+-extern int ibmtr_probe(struct net_device *dev);
+-extern int trdev_init(struct net_device *dev);
++extern int ibmtr_probe_card(struct net_device *dev);
+ extern irqreturn_t tok_interrupt (int irq, void *dev_id, struct pt_regs *regs);
+ 
+ /*====================================================================*/
+@@ -199,7 +198,6 @@ static dev_link_t *ibmtr_attach(void)
+ 
+     link->irq.Instance = info->dev = dev;
+     
+-    dev->init = &ibmtr_probe;
+     SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
+ 
+     /* Register with Card Services */
+@@ -214,7 +212,7 @@ static dev_link_t *ibmtr_attach(void)
+     client_reg.event_handler = &ibmtr_event;
+     client_reg.Version = 0x0210;
+     client_reg.event_callback_args.client_data = link;
+-    ret = CardServices(RegisterClient, &link->handle, &client_reg);
++    ret = pcmcia_register_client(&link->handle, &client_reg);
+     if (ret != 0) {
+         cs_error(link->handle, RegisterClient, ret);
+ 	goto out_detach;
+@@ -253,22 +251,22 @@ static void ibmtr_detach(dev_link_t *lin
+         return;
+ 
+     dev = info->dev;
++
++    if (link->dev)
++	unregister_netdev(dev);
++
+     {
+ 	struct tok_info *ti = (struct tok_info *)dev->priv;
+ 	del_timer_sync(&(ti->tr_timer));
+     }
+-    if (link->state & DEV_CONFIG) {
++    if (link->state & DEV_CONFIG)
+         ibmtr_release(link);
+-        if (link->state & DEV_STALE_CONFIG)
+-            return;
+-    }
+ 
+     if (link->handle)
+-        CardServices(DeregisterClient, link->handle);
++        pcmcia_deregister_client(link->handle);
+ 
+     /* Unlink device structure, free bits */
+     *linkp = link->next;
+-    unregister_netdev(dev);
+     free_netdev(dev);
+     kfree(info); 
+ } /* ibmtr_detach */
+@@ -281,8 +279,8 @@ static void ibmtr_detach(dev_link_t *lin
+ 
+ ======================================================================*/
+ 
+-#define CS_CHECK(fn, args...) \
+-while ((last_ret=CardServices(last_fn=(fn), args))!=0) goto cs_failed
++#define CS_CHECK(fn, ret) \
++do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+ 
+ static void ibmtr_config(dev_link_t *link)
+ {
+@@ -304,9 +302,9 @@ static void ibmtr_config(dev_link_t *lin
+     tuple.TupleDataMax = 64;
+     tuple.TupleOffset = 0;
+     tuple.DesiredTuple = CISTPL_CONFIG;
+-    CS_CHECK(GetFirstTuple, handle, &tuple);
+-    CS_CHECK(GetTupleData, handle, &tuple);
+-    CS_CHECK(ParseTuple, handle, &tuple, &parse);
++    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
++    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
++    CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+     link->conf.ConfigBase = parse.config.base;
+ 
+     /* Configure card */
+@@ -318,18 +316,18 @@ static void ibmtr_config(dev_link_t *lin
+ 
+     /* Try PRIMARY card at 0xA20-0xA23 */
+     link->io.BasePort1 = 0xA20;
+-    i = CardServices(RequestIO, link->handle, &link->io);
++    i = pcmcia_request_io(link->handle, &link->io);
+     if (i == CS_SUCCESS) {
+ 	memcpy(info->node.dev_name, "tr0\0", 4);
+     } else {
+ 	/* Couldn't get 0xA20-0xA23.  Try ALTERNATE at 0xA24-0xA27. */
+ 	link->io.BasePort1 = 0xA24;
+-	CS_CHECK(RequestIO, link->handle, &link->io);
++	CS_CHECK(RequestIO, pcmcia_request_io(link->handle, &link->io));
+ 	memcpy(info->node.dev_name, "tr1\0", 4);
+     }
+     dev->base_addr = link->io.BasePort1;
+ 
+-    CS_CHECK(RequestIRQ, link->handle, &link->irq);
++    CS_CHECK(RequestIRQ, pcmcia_request_irq(link->handle, &link->irq));
+     dev->irq = link->irq.AssignedIRQ;
+     ti->irq = link->irq.AssignedIRQ;
+     ti->global_int_enable=GLOBAL_INT_ENABLE+((dev->irq==9) ? 2 : dev->irq);
+@@ -340,12 +338,11 @@ static void ibmtr_config(dev_link_t *lin
+     req.Base = 0; 
+     req.Size = 0x2000;
+     req.AccessSpeed = 250;
+-    link->win = (window_handle_t)link->handle;
+-    CS_CHECK(RequestWindow, &link->win, &req);
++    CS_CHECK(RequestWindow, pcmcia_request_window(&link->handle, &req, &link->win));
+ 
+     mem.CardOffset = mmiobase;
+     mem.Page = 0;
+-    CS_CHECK(MapMemPage, link->win, &mem);
++    CS_CHECK(MapMemPage, pcmcia_map_mem_page(link->win, &mem));
+     ti->mmio = ioremap(req.Base, req.Size);
+ 
+     /* Allocate the SRAM memory window */
+@@ -354,24 +351,23 @@ static void ibmtr_config(dev_link_t *lin
+     req.Base = 0;
+     req.Size = sramsize * 1024;
+     req.AccessSpeed = 250;
+-    info->sram_win_handle = (window_handle_t)link->handle;
+-    CS_CHECK(RequestWindow, &info->sram_win_handle, &req);
++    CS_CHECK(RequestWindow, pcmcia_request_window(&link->handle, &req, &info->sram_win_handle));
+ 
+     mem.CardOffset = srambase;
+     mem.Page = 0;
+-    CS_CHECK(MapMemPage, info->sram_win_handle, &mem);
++    CS_CHECK(MapMemPage, pcmcia_map_mem_page(info->sram_win_handle, &mem));
+ 
+     ti->sram_base = mem.CardOffset >> 12;
+     ti->sram_virt = (u_long)ioremap(req.Base, req.Size);
+ 
+-    CS_CHECK(RequestConfiguration, link->handle, &link->conf);
++    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link->handle, &link->conf));
+ 
+     /*  Set up the Token-Ring Controller Configuration Register and
+         turn on the card.  Check the "Local Area Network Credit Card
+         Adapters Technical Reference"  SC30-3585 for this info.  */
+     ibmtr_hw_setup(dev, mmiobase);
+ 
+-    i = register_netdev(dev);
++    i = ibmtr_probe_card(dev);
+     
+     if (i != 0) {
+ 	printk(KERN_NOTICE "ibmtr_cs: register_netdev() failed\n");
+@@ -412,27 +408,17 @@ static void ibmtr_release(dev_link_t *li
+ 
+     DEBUG(0, "ibmtr_release(0x%p)\n", link);
+ 
+-    if (link->open) {
+-	DEBUG(1, "ibmtr_cs: release postponed, '%s' "
+-	      "still open\n", info->node.dev_name);
+-        link->state |= DEV_STALE_CONFIG;
+-        return;
+-    }
+-
+-    CardServices(ReleaseConfiguration, link->handle);
+-    CardServices(ReleaseIO, link->handle, &link->io);
+-    CardServices(ReleaseIRQ, link->handle, &link->irq);
++    pcmcia_release_configuration(link->handle);
++    pcmcia_release_io(link->handle, &link->io);
++    pcmcia_release_irq(link->handle, &link->irq);
+     if (link->win) {
+ 	struct tok_info *ti = dev->priv;
+ 	iounmap((void *)ti->mmio);
+-	CardServices(ReleaseWindow, link->win);
+-	CardServices(ReleaseWindow, info->sram_win_handle);
++	pcmcia_release_window(link->win);
++	pcmcia_release_window(info->sram_win_handle);
+     }
+ 
+     link->state &= ~DEV_CONFIG;
+-
+-    if (link->state & DEV_STALE_CONFIG)
+-	    ibmtr_detach(link);
+ }
+ 
+ /*======================================================================
+@@ -474,7 +460,7 @@ static int ibmtr_event(event_t event, in
+         if (link->state & DEV_CONFIG) {
+             if (link->open)
+ 		netif_device_detach(dev);
+-            CardServices(ReleaseConfiguration, link->handle);
++            pcmcia_release_configuration(link->handle);
+         }
+         break;
+     case CS_EVENT_PM_RESUME:
+@@ -482,9 +468,9 @@ static int ibmtr_event(event_t event, in
+         /* Fall through... */
+     case CS_EVENT_CARD_RESET:
+         if (link->state & DEV_CONFIG) {
+-            CardServices(RequestConfiguration, link->handle, &link->conf);
++            pcmcia_request_configuration(link->handle, &link->conf);
+             if (link->open) {
+-		(dev->init)(dev);
++		ibmtr_probe(dev);	/* really? */
+ 		netif_device_attach(dev);
+             }
+         }
+--- linux-2.6.0/drivers/net/pcmcia/nmclan_cs.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/pcmcia/nmclan_cs.c	2003-12-28 23:22:53.000000000 -0800
+@@ -520,7 +520,7 @@ static dev_link_t *nmclan_attach(void)
+     client_reg.event_handler = &nmclan_event;
+     client_reg.Version = 0x0210;
+     client_reg.event_callback_args.client_data = link;
+-    ret = CardServices(RegisterClient, &link->handle, &client_reg);
++    ret = pcmcia_register_client(&link->handle, &client_reg);
+     if (ret != 0) {
+ 	cs_error(link->handle, RegisterClient, ret);
+ 	nmclan_detach(link);
+@@ -551,23 +551,17 @@ static void nmclan_detach(dev_link_t *li
+     if (*linkp == NULL)
+ 	return;
+ 
+-    if (link->state & DEV_CONFIG) {
++    if (link->state & DEV_CONFIG)
+ 	nmclan_release(link);
+-	if (link->state & DEV_STALE_CONFIG)
+-	    return;
+-    }
+ 
+     if (link->handle)
+-	CardServices(DeregisterClient, link->handle);
++	pcmcia_deregister_client(link->handle);
+ 
+     /* Unlink device structure, free bits */
+     *linkp = link->next;
+-    if (link->dev) {
++    if (link->dev)
+ 	unregister_netdev(dev);
+-	free_netdev(dev);
+-    } else
+-	kfree(dev);
+-
++    free_netdev(dev);
+ } /* nmclan_detach */
+ 
+ /* ----------------------------------------------------------------------------
+@@ -706,8 +700,8 @@ nmclan_config
+ 	ethernet device available to the system.
+ ---------------------------------------------------------------------------- */
+ 
+-#define CS_CHECK(fn, args...) \
+-while ((last_ret=CardServices(last_fn=(fn), args))!=0) goto cs_failed
++#define CS_CHECK(fn, ret) \
++  do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+ 
+ static void nmclan_config(dev_link_t *link)
+ {
+@@ -727,17 +721,17 @@ static void nmclan_config(dev_link_t *li
+   tuple.TupleDataMax = 64;
+   tuple.TupleOffset = 0;
+   tuple.DesiredTuple = CISTPL_CONFIG;
+-  CS_CHECK(GetFirstTuple, handle, &tuple);
+-  CS_CHECK(GetTupleData, handle, &tuple);
+-  CS_CHECK(ParseTuple, handle, &tuple, &parse);
++  CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
++  CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
++  CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+   link->conf.ConfigBase = parse.config.base;
+ 
+   /* Configure card */
+   link->state |= DEV_CONFIG;
+ 
+-  CS_CHECK(RequestIO, handle, &link->io);
+-  CS_CHECK(RequestIRQ, handle, &link->irq);
+-  CS_CHECK(RequestConfiguration, handle, &link->conf);
++  CS_CHECK(RequestIO, pcmcia_request_io(handle, &link->io));
++  CS_CHECK(RequestIRQ, pcmcia_request_irq(handle, &link->irq));
++  CS_CHECK(RequestConfiguration, pcmcia_request_configuration(handle, &link->conf));
+   dev->irq = link->irq.AssignedIRQ;
+   dev->base_addr = link->io.BasePort1;
+   i = register_netdev(dev);
+@@ -753,8 +747,8 @@ static void nmclan_config(dev_link_t *li
+   tuple.TupleData = buf;
+   tuple.TupleDataMax = 64;
+   tuple.TupleOffset = 0;
+-  CS_CHECK(GetFirstTuple, handle, &tuple);
+-  CS_CHECK(GetTupleData, handle, &tuple);
++  CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
++  CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
+   memcpy(dev->dev_addr, tuple.TupleData, ETHER_ADDR_LEN);
+ 
+   /* Verify configuration by reading the MACE ID. */
+@@ -812,21 +806,11 @@ static void nmclan_release(dev_link_t *l
+ 
+   DEBUG(0, "nmclan_release(0x%p)\n", link);
+ 
+-  if (link->open) {
+-    DEBUG(1, "nmclan_cs: release postponed, '%s' "
+-	  "still open\n", link->dev->dev_name);
+-    link->state |= DEV_STALE_CONFIG;
+-    return;
+-  }
+-
+-  CardServices(ReleaseConfiguration, link->handle);
+-  CardServices(ReleaseIO, link->handle, &link->io);
+-  CardServices(ReleaseIRQ, link->handle, &link->irq);
++  pcmcia_release_configuration(link->handle);
++  pcmcia_release_io(link->handle, &link->io);
++  pcmcia_release_irq(link->handle, &link->irq);
+ 
+   link->state &= ~DEV_CONFIG;
+-
+-  if (link->state & DEV_STALE_CONFIG)
+-	  nmclan_detach(link);
+ }
+ 
+ /* ----------------------------------------------------------------------------
+@@ -863,7 +847,7 @@ static int nmclan_event(event_t event, i
+       if (link->state & DEV_CONFIG) {
+ 	if (link->open)
+ 	  netif_device_detach(dev);
+-	CardServices(ReleaseConfiguration, link->handle);
++	pcmcia_release_configuration(link->handle);
+       }
+       break;
+     case CS_EVENT_PM_RESUME:
+@@ -871,7 +855,7 @@ static int nmclan_event(event_t event, i
+       /* Fall through... */
+     case CS_EVENT_CARD_RESET:
+       if (link->state & DEV_CONFIG) {
+-	CardServices(RequestConfiguration, link->handle, &link->conf);
++	pcmcia_request_configuration(link->handle, &link->conf);
+ 	if (link->open) {
+ 	  nmclan_reset(dev);
+ 	  netif_device_attach(dev);
+@@ -903,7 +887,7 @@ static void nmclan_reset(struct net_devi
+   reg.Action = CS_READ;
+   reg.Offset = CISREG_COR;
+   reg.Value = 0;
+-  CardServices(AccessConfigurationRegister, link->handle, &reg);
++  pcmcia_access_configuration_register(link->handle, &reg);
+   OrigCorValue = reg.Value;
+ 
+   /* Reset Xilinx */
+@@ -912,12 +896,12 @@ static void nmclan_reset(struct net_devi
+   DEBUG(1, "nmclan_reset: OrigCorValue=0x%lX, resetting...\n",
+ 	OrigCorValue);
+   reg.Value = COR_SOFT_RESET;
+-  CardServices(AccessConfigurationRegister, link->handle, &reg);
++  pcmcia_access_configuration_register(link->handle, &reg);
+   /* Need to wait for 20 ms for PCMCIA to finish reset. */
+ 
+   /* Restore original COR configuration index */
+   reg.Value = COR_LEVEL_REQ | (OrigCorValue & COR_CONFIG_MASK);
+-  CardServices(AccessConfigurationRegister, link->handle, &reg);
++  pcmcia_access_configuration_register(link->handle, &reg);
+   /* Xilinx is now completely reset along with the MACE chip. */
+   lp->tx_free_frames=AM2150_MAX_TX_FRAMES;
+ 
+@@ -993,8 +977,6 @@ static int mace_close(struct net_device 
+ 
+   link->open--;
+   netif_stop_queue(dev);
+-  if (link->state & DEV_STALE_CONFIG)
+-	  nmclan_release(link);
+ 
+   return 0;
+ } /* mace_close */
+@@ -1046,7 +1028,7 @@ static void mace_tx_timeout(struct net_d
+   printk(KERN_NOTICE "%s: transmit timed out -- ", dev->name);
+ #if RESET_ON_TIMEOUT
+   printk("resetting card\n");
+-  CardServices(ResetCard, link->handle);
++  pcmcia_reset_card(link->handle, NULL);
+ #else /* #if RESET_ON_TIMEOUT */
+   printk("NOT resetting card\n");
+ #endif /* #if RESET_ON_TIMEOUT */
+--- linux-2.6.0/drivers/net/pcmcia/pcnet_cs.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/net/pcmcia/pcnet_cs.c	2003-12-28 23:22:53.000000000 -0800
+@@ -11,7 +11,7 @@
+ 
+     Copyright (C) 1999 David A. Hinds -- dahinds@users.sourceforge.net
+ 
+-    pcnet_cs.c 1.149 2002/06/29 06:27:37
++    pcnet_cs.c 1.153 2003/11/09 18:53:09
+     
+     The network driver code is based on Donald Becker's NE2000 code:
+ 
+@@ -74,7 +74,7 @@ static int pc_debug = PCMCIA_DEBUG;
+ MODULE_PARM(pc_debug, "i");
+ #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
+ static char *version =
+-"pcnet_cs.c 1.149 2002/06/29 06:27:37 (David Hinds)";
++"pcnet_cs.c 1.153 2003/11/09 18:53:09 (David Hinds)";
+ #else
+ #define DEBUG(n, args...)
+ #endif
+@@ -224,7 +224,6 @@ static hw_info_t dl10019_info = { 0, 0, 
+ static hw_info_t dl10022_info = { 0, 0, 0, 0, IS_DL10022|HAS_MII };
+ 
+ typedef struct pcnet_dev_t {
+-    struct net_device	dev;	/* so &dev == &pcnet_dev_t */
+     dev_link_t		link;
+     dev_node_t		node;
+     u_int		flags;
+@@ -237,16 +236,10 @@ typedef struct pcnet_dev_t {
+     u_long		mii_reset;
+ } pcnet_dev_t;
+ 
+-/*======================================================================
+-
+-    We never need to do anything when a pcnet device is "initialized"
+-    by the net software, because we only register already-found cards.
+-
+-======================================================================*/
+-
+-static int pcnet_init(struct net_device *dev)
++static inline pcnet_dev_t *PRIV(struct net_device *dev)
+ {
+-    return 0;
++	char *p = netdev_priv(dev);
++	return (pcnet_dev_t *)(p + sizeof(struct ei_device));
+ }
+ 
+ /*======================================================================
+@@ -268,11 +261,11 @@ static dev_link_t *pcnet_attach(void)
+     DEBUG(0, "pcnet_attach()\n");
+ 
+     /* Create new ethernet device */
+-    info = kmalloc(sizeof(*info), GFP_KERNEL);
+-    if (!info) return NULL;
+-    memset(info, 0, sizeof(*info));
+-    link = &info->link; dev = &info->dev;
+-    link->priv = info;
++    dev = __alloc_ei_netdev(sizeof(pcnet_dev_t));
++    if (!dev) return NULL;
++    info = PRIV(dev);
++    link = &info->link;
++    link->priv = dev;
+ 
+     link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
+     link->irq.IRQInfo1 = IRQ_INFO2_VALID|IRQ_LEVEL_ID;
+@@ -284,9 +277,7 @@ static dev_link_t *pcnet_attach(void)
+     link->conf.Attributes = CONF_ENABLE_IRQ;
+     link->conf.IntType = INT_MEMORY_AND_IO;
+ 
+-    ethdev_init(dev);
+     SET_MODULE_OWNER(dev);
+-    dev->init = &pcnet_init;
+     dev->open = &pcnet_open;
+     dev->stop = &pcnet_close;
+     dev->set_config = &set_config;
+@@ -303,7 +294,7 @@ static dev_link_t *pcnet_attach(void)
+     client_reg.event_handler = &pcnet_event;
+     client_reg.Version = 0x0210;
+     client_reg.event_callback_args.client_data = link;
+-    ret = CardServices(RegisterClient, &link->handle, &client_reg);
++    ret = pcmcia_register_client(&link->handle, &client_reg);
+     if (ret != CS_SUCCESS) {
+ 	cs_error(link->handle, RegisterClient, ret);
+ 	pcnet_detach(link);
+@@ -324,7 +315,7 @@ static dev_link_t *pcnet_attach(void)
+ 
+ static void pcnet_detach(dev_link_t *link)
+ {
+-    pcnet_dev_t *info = link->priv;
++    struct net_device *dev = link->priv;
+     dev_link_t **linkp;
+ 
+     DEBUG(0, "pcnet_detach(0x%p)\n", link);
+@@ -335,23 +326,17 @@ static void pcnet_detach(dev_link_t *lin
+     if (*linkp == NULL)
+ 	return;
+ 
+-    if (link->state & DEV_CONFIG) {
++    if (link->state & DEV_CONFIG)
+ 	pcnet_release(link);
+-	if (link->state & DEV_STALE_CONFIG)
+-	    return;
+-    }
+ 
+     if (link->handle)
+-	CardServices(DeregisterClient, link->handle);
++	pcmcia_deregister_client(link->handle);
+ 
+     /* Unlink device structure, free bits */
+     *linkp = link->next;
+-    if (link->dev) {
+-	unregister_netdev(&info->dev);
+-	free_netdev(&info->dev);
+-    } else
+-	 kfree(info);
+-
++    if (link->dev)
++	unregister_netdev(dev);
++    free_netdev(dev);
+ } /* pcnet_detach */
+ 
+ /*======================================================================
+@@ -373,8 +358,7 @@ static hw_info_t *get_hwinfo(dev_link_t 
+     req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE;
+     req.Base = 0; req.Size = 0;
+     req.AccessSpeed = 0;
+-    link->win = (window_handle_t)link->handle;
+-    i = CardServices(RequestWindow, &link->win, &req);
++    i = pcmcia_request_window(&link->handle, &req, &link->win);
+     if (i != CS_SUCCESS) {
+ 	cs_error(link->handle, RequestWindow, i);
+ 	return NULL;
+@@ -384,7 +368,7 @@ static hw_info_t *get_hwinfo(dev_link_t 
+     mem.Page = 0;
+     for (i = 0; i < NR_INFO; i++) {
+ 	mem.CardOffset = hw_info[i].offset & ~(req.Size-1);
+-	CardServices(MapMemPage, link->win, &mem);
++	pcmcia_map_mem_page(link->win, &mem);
+ 	base = &virt[hw_info[i].offset & (req.Size-1)];
+ 	if ((readb(base+0) == hw_info[i].a0) &&
+ 	    (readb(base+2) == hw_info[i].a1) &&
+@@ -397,7 +381,7 @@ static hw_info_t *get_hwinfo(dev_link_t 
+     }
+     
+     iounmap(virt);
+-    j = CardServices(ReleaseWindow, link->win);
++    j = pcmcia_release_window(link->win);
+     if (j != CS_SUCCESS)
+ 	cs_error(link->handle, ReleaseWindow, j);
+     return (i < NR_INFO) ? hw_info+i : NULL;
+@@ -544,11 +528,8 @@ static hw_info_t *get_hwired(dev_link_t 
+ 
+ ======================================================================*/
+ 
+-#define CS_CHECK(fn, args...) \
+-while ((last_ret=CardServices(last_fn=(fn), args))!=0) goto cs_failed
+-
+-#define CFG_CHECK(fn, args...) \
+-if (CardServices(fn, args) != 0) goto next_entry
++#define CS_CHECK(fn, ret) \
++do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+ 
+ static int try_io_port(dev_link_t *link)
+ {
+@@ -571,20 +552,20 @@ static int try_io_port(dev_link_t *link)
+ 	for (j = 0; j < 0x400; j += 0x20) {
+ 	    link->io.BasePort1 = j ^ 0x300;
+ 	    link->io.BasePort2 = (j ^ 0x300) + 0x10;
+-	    ret = CardServices(RequestIO, link->handle, &link->io);
++	    ret = pcmcia_request_io(link->handle, &link->io);
+ 	    if (ret == CS_SUCCESS) return ret;
+ 	}
+ 	return ret;
+     } else {
+-	return CardServices(RequestIO, link->handle, &link->io);
++	return pcmcia_request_io(link->handle, &link->io);
+     }
+ }
+ 
+ static void pcnet_config(dev_link_t *link)
+ {
+     client_handle_t handle = link->handle;
+-    pcnet_dev_t *info = link->priv;
+-    struct net_device *dev = &info->dev;
++    struct net_device *dev = link->priv;
++    pcnet_dev_t *info = PRIV(dev);
+     tuple_t tuple;
+     cisparse_t parse;
+     int i, last_ret, last_fn, start_pg, stop_pg, cm_offset;
+@@ -600,9 +581,9 @@ static void pcnet_config(dev_link_t *lin
+     tuple.TupleDataMax = sizeof(buf);
+     tuple.TupleOffset = 0;
+     tuple.DesiredTuple = CISTPL_CONFIG;
+-    CS_CHECK(GetFirstTuple, handle, &tuple);
+-    CS_CHECK(GetTupleData, handle, &tuple);
+-    CS_CHECK(ParseTuple, handle, &tuple, &parse);
++    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
++    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
++    CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+     link->conf.ConfigBase = parse.config.base;
+     link->conf.Present = parse.config.rmask[0];
+ 
+@@ -610,28 +591,28 @@ static void pcnet_config(dev_link_t *lin
+     link->state |= DEV_CONFIG;
+ 
+     /* Look up current Vcc */
+-    CS_CHECK(GetConfigurationInfo, handle, &conf);
++    CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(handle, &conf));
+     link->conf.Vcc = conf.Vcc;
+ 
+     tuple.DesiredTuple = CISTPL_MANFID;
+     tuple.Attributes = TUPLE_RETURN_COMMON;
+-    if ((CardServices(GetFirstTuple, handle, &tuple) == CS_SUCCESS) &&
+- 	(CardServices(GetTupleData, handle, &tuple) == CS_SUCCESS)) {
++    if ((pcmcia_get_first_tuple(handle, &tuple) == CS_SUCCESS) &&
++ 	(pcmcia_get_tuple_data(handle, &tuple) == CS_SUCCESS)) {
+ 	manfid = le16_to_cpu(buf[0]);
+ 	prodid = le16_to_cpu(buf[1]);
+     }
+     
+     tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+     tuple.Attributes = 0;
+-    CS_CHECK(GetFirstTuple, handle, &tuple);
++    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+     while (last_ret == CS_SUCCESS) {
+ 	cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
+ 	cistpl_io_t *io = &(parse.cftable_entry.io);
+ 	
+-	CFG_CHECK(GetTupleData, handle, &tuple);
+-	CFG_CHECK(ParseTuple, handle, &tuple, &parse);
+-	if ((cfg->index == 0) || (cfg->io.nwin == 0))
+-	    goto next_entry;
++	if (pcmcia_get_tuple_data(handle, &tuple) != 0 ||
++			pcmcia_parse_tuple(handle, &tuple, &parse) != 0 ||
++			cfg->index == 0 || cfg->io.nwin == 0)
++		goto next_entry;
+ 	
+ 	link->conf.ConfigIndex = cfg->index;
+ 	/* For multifunction cards, by convention, we configure the
+@@ -653,14 +634,14 @@ static void pcnet_config(dev_link_t *lin
+ 	    if (last_ret == CS_SUCCESS) break;
+ 	}
+     next_entry:
+-	last_ret = CardServices(GetNextTuple, handle, &tuple);
++	last_ret = pcmcia_get_next_tuple(handle, &tuple);
+     }
+     if (last_ret != CS_SUCCESS) {
+ 	cs_error(handle, RequestIO, last_ret);
+ 	goto failed;
+     }
+ 
+-    CS_CHECK(RequestIRQ, handle, &link->irq);
++    CS_CHECK(RequestIRQ, pcmcia_request_irq(handle, &link->irq));
+     
+     if (link->io.NumPorts2 == 8) {
+ 	link->conf.Attributes |= CONF_ENABLE_SPKR;
+@@ -670,7 +651,7 @@ static void pcnet_config(dev_link_t *lin
+ 	(prodid == PRODID_IBM_HOME_AND_AWAY))
+ 	link->conf.ConfigIndex |= 0x10;
+     
+-    CS_CHECK(RequestConfiguration, handle, &link->conf);
++    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(handle, &link->conf));
+     dev->irq = link->irq.AssignedIRQ;
+     dev->base_addr = link->io.BasePort1;
+     if (info->flags & HAS_MISC_REG) {
+@@ -786,29 +767,19 @@ failed:
+ 
+ static void pcnet_release(dev_link_t *link)
+ {
+-    pcnet_dev_t *info = link->priv;
++    pcnet_dev_t *info = PRIV(link->priv);
+ 
+     DEBUG(0, "pcnet_release(0x%p)\n", link);
+ 
+-    if (link->open) {
+-	DEBUG(1, "pcnet_cs: release postponed, '%s' still open\n",
+-	      info->node.dev_name);
+-	link->state |= DEV_STALE_CONFIG;
+-	return;
+-    }
+-
+     if (info->flags & USE_SHMEM) {
+ 	iounmap(info->base);
+-	CardServices(ReleaseWindow, link->win);
++	pcmcia_release_window(link->win);
+     }
+-    CardServices(ReleaseConfiguration, link->handle);
+-    CardServices(ReleaseIO, link->handle, &link->io);
+-    CardServices(ReleaseIRQ, link->handle, &link->irq);
++    pcmcia_release_configuration(link->handle);
++    pcmcia_release_io(link->handle, &link->io);
++    pcmcia_release_irq(link->handle, &link->irq);
+ 
+     link->state &= ~DEV_CONFIG;
+-
+-    if (link->state & DEV_STALE_CONFIG)
+-	    pcnet_detach(link);
+ }
+ 
+ /*======================================================================
+@@ -824,7 +795,7 @@ static int pcnet_event(event_t event, in
+ 		       event_callback_args_t *args)
+ {
+     dev_link_t *link = args->client_data;
+-    pcnet_dev_t *info = link->priv;
++    struct net_device *dev = link->priv;
+ 
+     DEBUG(2, "pcnet_event(0x%06x)\n", event);
+ 
+@@ -832,7 +803,7 @@ static int pcnet_event(event_t event, in
+     case CS_EVENT_CARD_REMOVAL:
+ 	link->state &= ~DEV_PRESENT;
+ 	if (link->state & DEV_CONFIG) {
+-	    netif_device_detach(&info->dev);
++	    netif_device_detach(dev);
+ 	    pcnet_release(link);
+ 	}
+ 	break;
+@@ -846,8 +817,8 @@ static int pcnet_event(event_t event, in
+     case CS_EVENT_RESET_PHYSICAL:
+ 	if (link->state & DEV_CONFIG) {
+ 	    if (link->open)
+-		netif_device_detach(&info->dev);
+-	    CardServices(ReleaseConfiguration, link->handle);
++		netif_device_detach(dev);
++	    pcmcia_release_configuration(link->handle);
+ 	}
+ 	break;
+     case CS_EVENT_PM_RESUME:
+@@ -855,11 +826,11 @@ static int pcnet_event(event_t event, in
+ 	/* Fall through... */
+     case CS_EVENT_CARD_RESET:
+ 	if (link->state & DEV_CONFIG) {
+-	    CardServices(RequestConfiguration, link->handle, &link->conf);
++	    pcmcia_request_configuration(link->handle, &link->conf);
+ 	    if (link->open) {
+-		pcnet_reset_8390(&info->dev);
+-		NS8390_init(&info->dev, 1);
+-		netif_device_attach(&info->dev);
++		pcnet_reset_8390(dev);
++		NS8390_init(dev, 1);
++		netif_device_attach(dev);
+ 	    }
+ 	}
+ 	break;
+@@ -871,13 +842,15 @@ static int pcnet_event(event_t event, in
+ 
+     MII interface support for DL10019 and DL10022 based cards
+ 
+-    On the DL10019, the MII IO direction bit is 0x10; on  the DL10022
++    On the DL10019, the MII IO direction bit is 0x10; on the DL10022
+     it is 0x20.  Setting both bits seems to work on both card types.
+ 
+ ======================================================================*/
+ 
+ #define DLINK_GPIO		0x1c
+ #define DLINK_DIAG		0x1d
++#define DLINK_EEPROM		0x1e
++
+ #define MDIO_SHIFT_CLK		0x80
+ #define MDIO_DATA_OUT		0x40
+ #define MDIO_DIR_WRITE		0x30
+@@ -940,12 +913,104 @@ static void mdio_reset(ioaddr_t addr, in
+     outb_p(0x00, addr);
+ }
+ 
++/*======================================================================
++
++    EEPROM access routines for DL10019 and DL10022 based cards
++
++======================================================================*/
++
++#define EE_EEP		0x40
++#define EE_ASIC		0x10
++#define EE_CS		0x08
++#define EE_CK		0x04
++#define EE_DO		0x02
++#define EE_DI		0x01
++#define EE_ADOT		0x01	/* DataOut for ASIC */
++#define EE_READ_CMD	0x06
++
++#define DL19FDUPLX	0x0400	/* DL10019 Full duplex mode */
++
++static int read_eeprom(ioaddr_t ioaddr, int location)
++{
++    int i, retval = 0;
++    ioaddr_t ee_addr = ioaddr + DLINK_EEPROM;
++    int read_cmd = location | (EE_READ_CMD << 8);
++
++    outb(0, ee_addr);
++    outb(EE_EEP|EE_CS, ee_addr);
++
++    /* Shift the read command bits out. */
++    for (i = 10; i >= 0; i--) {
++	short dataval = (read_cmd & (1 << i)) ? EE_DO : 0;
++	outb_p(EE_EEP|EE_CS|dataval, ee_addr);
++	outb_p(EE_EEP|EE_CS|dataval|EE_CK, ee_addr);
++    }
++    outb(EE_EEP|EE_CS, ee_addr);
++
++    for (i = 16; i > 0; i--) {
++	outb_p(EE_EEP|EE_CS | EE_CK, ee_addr);
++	retval = (retval << 1) | ((inb(ee_addr) & EE_DI) ? 1 : 0);
++	outb_p(EE_EEP|EE_CS, ee_addr);
++    }
++
++    /* Terminate the EEPROM access. */
++    outb(0, ee_addr);
++    return retval;
++}
++
++/*
++    The internal ASIC registers can be changed by EEPROM READ access
++    with EE_ASIC bit set.
++    In ASIC mode, EE_ADOT is used to output the data to the ASIC.
++*/
++
++static void write_asic(ioaddr_t ioaddr, int location, short asic_data)
++{
++	int i;
++	ioaddr_t ee_addr = ioaddr + DLINK_EEPROM;
++	short dataval;
++	int read_cmd = location | (EE_READ_CMD << 8);
++
++	asic_data |= read_eeprom(ioaddr, location);
++
++	outb(0, ee_addr);
++	outb(EE_ASIC|EE_CS|EE_DI, ee_addr);
++
++	read_cmd = read_cmd >> 1;
++
++	/* Shift the read command bits out. */
++	for (i = 9; i >= 0; i--) {
++		dataval = (read_cmd & (1 << i)) ? EE_DO : 0;
++		outb_p(EE_ASIC|EE_CS|EE_DI|dataval, ee_addr);
++		outb_p(EE_ASIC|EE_CS|EE_DI|dataval|EE_CK, ee_addr);
++		outb_p(EE_ASIC|EE_CS|EE_DI|dataval, ee_addr);
++	}
++	// sync
++	outb(EE_ASIC|EE_CS, ee_addr);
++	outb(EE_ASIC|EE_CS|EE_CK, ee_addr);
++	outb(EE_ASIC|EE_CS, ee_addr);
++
++	for (i = 15; i >= 0; i--) {
++		dataval = (asic_data & (1 << i)) ? EE_ADOT : 0;
++		outb_p(EE_ASIC|EE_CS|dataval, ee_addr);
++		outb_p(EE_ASIC|EE_CS|dataval|EE_CK, ee_addr);
++		outb_p(EE_ASIC|EE_CS|dataval, ee_addr);
++	}
++
++	/* Terminate the ASIC access. */
++	outb(EE_ASIC|EE_DI, ee_addr);
++	outb(EE_ASIC|EE_DI| EE_CK, ee_addr);
++	outb(EE_ASIC|EE_DI, ee_addr);
++
++	outb(0, ee_addr);
++}
++
+ /*====================================================================*/
+ 
+ static void set_misc_reg(struct net_device *dev)
+ {
+     ioaddr_t nic_base = dev->base_addr;
+-    pcnet_dev_t *info = (pcnet_dev_t *)dev;
++    pcnet_dev_t *info = PRIV(dev);
+     u_char tmp;
+     
+     if (info->flags & HAS_MISC_REG) {
+@@ -975,7 +1040,7 @@ static void set_misc_reg(struct net_devi
+ 
+ static void mii_phy_probe(struct net_device *dev)
+ {
+-    pcnet_dev_t *info = (pcnet_dev_t *)dev;	
++    pcnet_dev_t *info = PRIV(dev);
+     ioaddr_t mii_addr = dev->base_addr + DLINK_GPIO;
+     int i;
+     u_int tmp, phyid;
+@@ -999,7 +1064,7 @@ static void mii_phy_probe(struct net_dev
+ 
+ static int pcnet_open(struct net_device *dev)
+ {
+-    pcnet_dev_t *info = (pcnet_dev_t *)dev;
++    pcnet_dev_t *info = PRIV(dev);
+     dev_link_t *link = &info->link;
+     
+     DEBUG(2, "pcnet_open('%s')\n", dev->name);
+@@ -1016,7 +1081,7 @@ static int pcnet_open(struct net_device 
+     info->link_status = 0x00;
+     init_timer(&info->watchdog);
+     info->watchdog.function = &ei_watchdog;
+-    info->watchdog.data = (u_long)info;
++    info->watchdog.data = (u_long)dev;
+     info->watchdog.expires = jiffies + HZ;
+     add_timer(&info->watchdog);
+ 
+@@ -1027,7 +1092,7 @@ static int pcnet_open(struct net_device 
+ 
+ static int pcnet_close(struct net_device *dev)
+ {
+-    pcnet_dev_t *info = (pcnet_dev_t *)dev;
++    pcnet_dev_t *info = PRIV(dev);
+     dev_link_t *link = &info->link;
+ 
+     DEBUG(2, "pcnet_close('%s')\n", dev->name);
+@@ -1038,8 +1103,6 @@ static int pcnet_close(struct net_device
+     link->open--;
+     netif_stop_queue(dev);
+     del_timer_sync(&info->watchdog);
+-    if (link->state & DEV_STALE_CONFIG)
+-	    pcnet_release(link);
+ 
+     return 0;
+ } /* pcnet_close */
+@@ -1080,7 +1143,7 @@ static void pcnet_reset_8390(struct net_
+ 
+ static int set_config(struct net_device *dev, struct ifmap *map)
+ {
+-    pcnet_dev_t *info = (pcnet_dev_t *)dev;
++    pcnet_dev_t *info = PRIV(dev);
+     if ((map->port != (u_char)(-1)) && (map->port != dev->if_port)) {
+ 	if (!(info->flags & HAS_MISC_REG))
+ 	    return -EOPNOTSUPP;
+@@ -1098,7 +1161,8 @@ static int set_config(struct net_device 
+ 
+ static irqreturn_t ei_irq_wrapper(int irq, void *dev_id, struct pt_regs *regs)
+ {
+-    pcnet_dev_t *info = dev_id;
++    struct net_device *dev = dev_id;
++    pcnet_dev_t *info = PRIV(dev);
+     info->stale = 0;
+     ei_interrupt(irq, dev_id, regs);
+     /* FIXME! Was it really ours? */
+@@ -1107,8 +1171,8 @@ static irqreturn_t ei_irq_wrapper(int ir
+ 
+ static void ei_watchdog(u_long arg)
+ {
+-    pcnet_dev_t *info = (pcnet_dev_t *)(arg);
+-    struct net_device *dev = &info->dev;
++    struct net_device *dev = (struct net_device *)arg;
++    pcnet_dev_t *info = PRIV(dev);
+     ioaddr_t nic_base = dev->base_addr;
+     ioaddr_t mii_addr = nic_base + DLINK_GPIO;
+     u_short link;
+@@ -1154,6 +1218,9 @@ static void ei_watchdog(u_long arg)
+ 	if (link && (info->flags & IS_DL10022)) {
+ 	    /* Disable collision detection on full duplex links */
+ 	    outb((p & 0x0140) ? 4 : 0, nic_base + DLINK_DIAG);
++	} else if (link && (info->flags & IS_DL10019)) {
++	    /* Disable collision detection on full duplex links */
++	    write_asic(dev->base_addr, 4, (p & 0x140) ? DL19FDUPLX : 0);
+ 	}
+ 	if (link) {
+ 	    if (info->phy_id == info->eth_phy) {
+@@ -1208,7 +1275,7 @@ static struct ethtool_ops netdev_ethtool
+ 
+ static int ei_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+ {
+-    pcnet_dev_t *info = (pcnet_dev_t *)dev;
++    pcnet_dev_t *info = PRIV(dev);
+     u16 *data = (u16 *)&rq->ifr_data;
+     ioaddr_t mii_addr = dev->base_addr + DLINK_GPIO;
+     switch (cmd) {
+@@ -1319,7 +1386,7 @@ static void dma_block_output(struct net_
+ 			     const u_char *buf, const int start_page)
+ {
+     ioaddr_t nic_base = dev->base_addr;
+-    pcnet_dev_t *info = (pcnet_dev_t *)dev;
++    pcnet_dev_t *info = PRIV(dev);
+ #ifdef PCMCIA_DEBUG
+     int retries = 0;
+ #endif
+@@ -1505,7 +1572,7 @@ static int setup_shmem_window(dev_link_t
+ 			      int stop_pg, int cm_offset)
+ {
+     struct net_device *dev = link->priv;
+-    pcnet_dev_t *info = link->priv;
++    pcnet_dev_t *info = PRIV(dev);
+     win_req_t req;
+     memreq_t mem;
+     int i, window_size, offset, last_ret, last_fn;
+@@ -1523,14 +1590,13 @@ static int setup_shmem_window(dev_link_t
+     req.Attributes |= WIN_USE_WAIT;
+     req.Base = 0; req.Size = window_size;
+     req.AccessSpeed = mem_speed;
+-    link->win = (window_handle_t)link->handle;
+-    CS_CHECK(RequestWindow, &link->win, &req);
++    CS_CHECK(RequestWindow, pcmcia_request_window(&link->handle, &req, &link->win));
+ 
+     mem.CardOffset = (start_pg << 8) + cm_offset;
+     offset = mem.CardOffset % window_size;
+     mem.CardOffset -= offset;
+     mem.Page = 0;
+-    CS_CHECK(MapMemPage, link->win, &mem);
++    CS_CHECK(MapMemPage, pcmcia_map_mem_page(link->win, &mem));
+ 
+     /* Try scribbling on the buffer */
+     info->base = ioremap(req.Base, window_size);
+@@ -1542,7 +1608,7 @@ static int setup_shmem_window(dev_link_t
+     pcnet_reset_8390(dev);
+     if (i != (TX_PAGES<<8)) {
+ 	iounmap(info->base);
+-	CardServices(ReleaseWindow, link->win);
++	pcmcia_release_window(link->win);
+ 	info->base = NULL; link->win = NULL;
+ 	goto failed;
+     }
+--- linux-2.6.0/drivers/net/pcmcia/smc91c92_cs.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/pcmcia/smc91c92_cs.c	2003-12-28 23:22:53.000000000 -0800
+@@ -379,7 +379,7 @@ static dev_link_t *smc91c92_attach(void)
+     client_reg.event_handler = &smc91c92_event;
+     client_reg.Version = 0x0210;
+     client_reg.event_callback_args.client_data = link;
+-    ret = CardServices(RegisterClient, &link->handle, &client_reg);
++    ret = pcmcia_register_client(&link->handle, &client_reg);
+     if (ret != 0) {
+ 	cs_error(link->handle, RegisterClient, ret);
+ 	smc91c92_detach(link);
+@@ -411,23 +411,17 @@ static void smc91c92_detach(dev_link_t *
+     if (*linkp == NULL)
+ 	return;
+ 
+-    if (link->state & DEV_CONFIG) {
++    if (link->state & DEV_CONFIG)
+ 	smc91c92_release(link);
+-	if (link->state & DEV_STALE_CONFIG)
+-	    return;
+-    }
+ 
+     if (link->handle)
+-	CardServices(DeregisterClient, link->handle);
++	pcmcia_deregister_client(link->handle);
+ 
+     /* Unlink device structure, free bits */
+     *linkp = link->next;
+-    if (link->dev) {
++    if (link->dev)
+ 	unregister_netdev(dev);
+-	free_netdev(dev);
+-    } else
+-	kfree(dev);
+-
++    free_netdev(dev);
+ } /* smc91c92_detach */
+ 
+ /*====================================================================*/
+@@ -453,19 +447,27 @@ static int cvt_ascii_address(struct net_
+ 
+ /*====================================================================*/
+ 
+-static int get_tuple(int fn, client_handle_t handle, tuple_t *tuple,
+-		     cisparse_t *parse)
++static int first_tuple(client_handle_t handle, tuple_t *tuple,
++		cisparse_t *parse)
+ {
+-    int i;
+-    i = CardServices(fn, handle, tuple);
+-    if (i != CS_SUCCESS) return i;
+-    i = CardServices(GetTupleData, handle, tuple);
+-    if (i != CS_SUCCESS) return i;
+-    return CardServices(ParseTuple, handle, tuple, parse);
++	int i;
++
++	if ((i = pcmcia_get_first_tuple(handle, tuple)) != CS_SUCCESS ||
++			(i = pcmcia_get_tuple_data(handle, tuple)) != CS_SUCCESS)
++		return i;
++	return pcmcia_parse_tuple(handle, tuple, parse);
+ }
+ 
+-#define first_tuple(a, b, c) get_tuple(GetFirstTuple, a, b, c)
+-#define next_tuple(a, b, c) get_tuple(GetNextTuple, a, b, c)
++static int next_tuple(client_handle_t handle, tuple_t *tuple,
++		cisparse_t *parse)
++{
++	int i;
++
++	if ((i = pcmcia_get_next_tuple(handle, tuple)) != CS_SUCCESS ||
++			(i = pcmcia_get_tuple_data(handle, tuple)) != CS_SUCCESS)
++		return i;
++	return pcmcia_parse_tuple(handle, tuple, parse);
++}
+ 
+ /*======================================================================
+ 
+@@ -534,7 +536,7 @@ static int mhz_mfc_config(dev_link_t *li
+ 	for (k = 0; k < 0x400; k += 0x10) {
+ 	    if (k & 0x80) continue;
+ 	    link->io.BasePort1 = k ^ 0x300;
+-	    i = CardServices(RequestIO, link->handle, &link->io);
++	    i = pcmcia_request_io(link->handle, &link->io);
+ 	    if (i == CS_SUCCESS) break;
+ 	}
+ 	if (i == CS_SUCCESS) break;
+@@ -548,15 +550,14 @@ static int mhz_mfc_config(dev_link_t *li
+     req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE;
+     req.Base = req.Size = 0;
+     req.AccessSpeed = 0;
+-    link->win = (window_handle_t)link->handle;
+-    i = CardServices(RequestWindow, &link->win, &req);
++    i = pcmcia_request_window(&link->handle, &req, &link->win);
+     if (i != CS_SUCCESS)
+ 	return i;
+     smc->base = ioremap(req.Base, req.Size);
+     mem.CardOffset = mem.Page = 0;
+     if (smc->manfid == MANFID_MOTOROLA)
+ 	mem.CardOffset = link->conf.ConfigBase;
+-    i = CardServices(MapMemPage, link->win, &mem);
++    i = pcmcia_map_mem_page(link->win, &mem);
+ 
+     if ((i == CS_SUCCESS)
+ 	&& (smc->manfid == MANFID_MEGAHERTZ)
+@@ -594,9 +595,9 @@ static int mhz_setup(dev_link_t *link)
+ 
+     /* Another possibility: for the EM3288, in a special tuple */
+     tuple.DesiredTuple = 0x81;
+-    if (CardServices(GetFirstTuple, handle, &tuple) != CS_SUCCESS)
++    if (pcmcia_get_first_tuple(handle, &tuple) != CS_SUCCESS)
+ 	return -1;
+-    if (CardServices(GetTupleData, handle, &tuple) != CS_SUCCESS)
++    if (pcmcia_get_tuple_data(handle, &tuple) != CS_SUCCESS)
+ 	return -1;
+     buf[12] = '\0';
+     if (cvt_ascii_address(dev, buf) == 0)
+@@ -690,7 +691,7 @@ static int smc_config(dev_link_t *link)
+ 	    link->conf.ConfigIndex = cf->index;
+ 	    link->io.BasePort1 = cf->io.win[0].base;
+ 	    link->io.IOAddrLines = cf->io.flags & CISTPL_IO_LINES_MASK;
+-	    i = CardServices(RequestIO, link->handle, &link->io);
++	    i = pcmcia_request_io(link->handle, &link->io);
+ 	    if (i == CS_SUCCESS) break;
+ 	}
+ 	i = next_tuple(link->handle, &tuple, &parse);
+@@ -763,14 +764,14 @@ static int osi_config(dev_link_t *link)
+ 
+     for (i = j = 0; j < 4; j++) {
+ 	link->io.BasePort2 = com[j];
+-	i = CardServices(RequestIO, link->handle, &link->io);
++	i = pcmcia_request_io(link->handle, &link->io);
+ 	if (i == CS_SUCCESS) break;
+     }
+     if (i != CS_SUCCESS) {
+ 	/* Fallback: turn off hard decode */
+ 	link->conf.ConfigIndex = 0x03;
+ 	link->io.NumPorts2 = 0;
+-	i = CardServices(RequestIO, link->handle, &link->io);
++	i = pcmcia_request_io(link->handle, &link->io);
+     }
+     dev->base_addr = link->io.BasePort1 + 0x10;
+     return i;
+@@ -791,12 +792,12 @@ static int osi_setup(dev_link_t *link, u
+ 
+     /* Read the station address from tuple 0x90, subtuple 0x04 */
+     tuple.DesiredTuple = 0x90;
+-    i = CardServices(GetFirstTuple, handle, &tuple);
++    i = pcmcia_get_first_tuple(handle, &tuple);
+     while (i == CS_SUCCESS) {
+-	i = CardServices(GetTupleData, handle, &tuple);
++	i = pcmcia_get_tuple_data(handle, &tuple);
+ 	if ((i != CS_SUCCESS) || (buf[0] == 0x04))
+ 	    break;
+-	i = CardServices(GetNextTuple, handle, &tuple);
++	i = pcmcia_get_next_tuple(handle, &tuple);
+     }
+     if (i != CS_SUCCESS)
+ 	return -1;
+@@ -869,9 +870,9 @@ static int check_sig(dev_link_t *link)
+ 	printk(KERN_INFO "smc91c92_cs: using 8-bit IO window.\n");
+ 	args.client_data = link;
+ 	smc91c92_event(CS_EVENT_RESET_PHYSICAL, 0, &args);
+-	CardServices(ReleaseIO, link->handle, &link->io);
++	pcmcia_release_io(link->handle, &link->io);
+ 	link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+-	CardServices(RequestIO, link->handle, &link->io);
++	pcmcia_request_io(link->handle, &link->io);
+ 	smc91c92_event(CS_EVENT_CARD_RESET, 0, &args);
+ 	return check_sig(link);
+     }
+@@ -936,9 +937,9 @@ static void smc91c92_config(dev_link_t *
+     }
+     CS_EXIT_TEST(i, RequestIO, config_failed);
+ 
+-    i = CardServices(RequestIRQ, link->handle, &link->irq);
++    i = pcmcia_request_irq(link->handle, &link->irq);
+     CS_EXIT_TEST(i, RequestIRQ, config_failed);
+-    i = CardServices(RequestConfiguration, link->handle, &link->conf);
++    i = pcmcia_request_configuration(link->handle, &link->conf);
+     CS_EXIT_TEST(i, RequestConfiguration, config_failed);
+ 
+     if (smc->manfid == MANFID_MOTOROLA)
+@@ -1063,27 +1064,17 @@ static void smc91c92_release(dev_link_t 
+ 
+     DEBUG(0, "smc91c92_release(0x%p)\n", link);
+ 
+-    if (link->open) {
+-	DEBUG(1, "smc91c92_cs: release postponed, '%s' still open\n",
+-	      link->dev->dev_name);
+-	link->state |= DEV_STALE_CONFIG;
+-	return;
+-    }
+-
+-    CardServices(ReleaseConfiguration, link->handle);
+-    CardServices(ReleaseIO, link->handle, &link->io);
+-    CardServices(ReleaseIRQ, link->handle, &link->irq);
++    pcmcia_release_configuration(link->handle);
++    pcmcia_release_io(link->handle, &link->io);
++    pcmcia_release_irq(link->handle, &link->irq);
+     if (link->win) {
+ 	struct net_device *dev = link->priv;
+ 	struct smc_private *smc = dev->priv;
+ 	iounmap(smc->base);
+-	CardServices(ReleaseWindow, link->win);
++	pcmcia_release_window(link->win);
+     }
+ 
+     link->state &= ~DEV_CONFIG;
+-
+-    if (link->state & DEV_STALE_CONFIG)
+-	    smc91c92_detach(link);
+ }
+ 
+ /*======================================================================
+@@ -1124,7 +1115,7 @@ static int smc91c92_event(event_t event,
+ 	if (link->state & DEV_CONFIG) {
+ 	    if (link->open)
+ 		netif_device_detach(dev);
+-	    CardServices(ReleaseConfiguration, link->handle);
++	    pcmcia_release_configuration(link->handle);
+ 	}
+ 	break;
+     case CS_EVENT_PM_RESUME:
+@@ -1135,7 +1126,7 @@ static int smc91c92_event(event_t event,
+ 	    if ((smc->manfid == MANFID_MEGAHERTZ) &&
+ 		(smc->cardid == PRODID_MEGAHERTZ_EM3288))
+ 		mhz_3288_power(link);
+-	    CardServices(RequestConfiguration, link->handle, &link->conf);
++	    pcmcia_request_configuration(link->handle, &link->conf);
+ 	    if (smc->manfid == MANFID_MOTOROLA)
+ 		mot_config(link);
+ 	    if ((smc->manfid == MANFID_OSITECH) &&
+@@ -1309,8 +1300,6 @@ static int smc_close(struct net_device *
+ 
+     link->open--;
+     del_timer_sync(&smc->media);
+-    if (link->state & DEV_STALE_CONFIG)
+-	    smc91c92_release(link);
+ 
+     return 0;
+ } /* smc_close */
+--- linux-2.6.0/drivers/net/pcmcia/xirc2ps_cs.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/pcmcia/xirc2ps_cs.c	2003-12-28 23:22:53.000000000 -0800
+@@ -391,28 +391,27 @@ static int do_stop(struct net_device *de
+ 
+ /*=============== Helper functions =========================*/
+ static int
+-get_tuple_data(int fn, client_handle_t handle, tuple_t *tuple)
++first_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
+ {
+-    int err;
++	int err;
+ 
+-    if ((err=CardServices(fn, handle, tuple)))
++	if ((err = pcmcia_get_first_tuple(handle, tuple)) == 0 &&
++			(err = pcmcia_get_tuple_data(handle, tuple)) == 0)
++		err = pcmcia_parse_tuple(handle, tuple, parse);
+ 	return err;
+-    return CardServices(GetTupleData, handle, tuple);
+ }
+ 
+ static int
+-get_tuple(int fn, client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
++next_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
+ {
+-    int err;
++	int err;
+ 
+-    if ((err=get_tuple_data(fn, handle, tuple)))
++	if ((err = pcmcia_get_next_tuple(handle, tuple)) == 0 &&
++			(err = pcmcia_get_tuple_data(handle, tuple)) == 0)
++		err = pcmcia_parse_tuple(handle, tuple, parse);
+ 	return err;
+-    return CardServices(ParseTuple, handle, tuple, parse);
+ }
+ 
+-#define first_tuple(a, b, c) get_tuple(GetFirstTuple, a, b, c)
+-#define next_tuple(a, b, c)  get_tuple(GetNextTuple, a, b, c)
+-
+ #define SelectPage(pgnr)   outb((pgnr), ioaddr + XIRCREG_PR)
+ #define GetByte(reg)	   ((unsigned)inb(ioaddr + (reg)))
+ #define GetWord(reg)	   ((unsigned)inw(ioaddr + (reg)))
+@@ -636,7 +635,7 @@ xirc2ps_attach(void)
+     client_reg.event_handler = &xirc2ps_event;
+     client_reg.Version = 0x0210;
+     client_reg.event_callback_args.client_data = link;
+-    if ((err = CardServices(RegisterClient, &link->handle, &client_reg))) {
++    if ((err = pcmcia_register_client(&link->handle, &client_reg))) {
+ 	cs_error(link->handle, RegisterClient, err);
+ 	xirc2ps_detach(link);
+ 	return NULL;
+@@ -680,16 +679,13 @@ xirc2ps_detach(dev_link_t * link)
+ 
+     /* Break the link with Card Services */
+     if (link->handle)
+-	CardServices(DeregisterClient, link->handle);
++	pcmcia_deregister_client(link->handle);
+ 
+     /* Unlink device structure, free it */
+     *linkp = link->next;
+-    if (link->dev) {
++    if (link->dev)
+ 	unregister_netdev(dev);
+-	free_netdev(dev);
+-    } else
+-	kfree(dev);
+-
++    free_netdev(dev);
+ } /* xirc2ps_detach */
+ 
+ /****************
+@@ -887,7 +883,8 @@ xirc2ps_config(dev_link_t * link)
+     }
+     if (err) { /* not found: try to get the node-id from tuple 0x89 */
+ 	tuple.DesiredTuple = 0x89;  /* data layout looks like tuple 0x22 */
+-	if (!(err = get_tuple_data(GetFirstTuple, handle, &tuple))) {
++	if ((err = pcmcia_get_first_tuple(handle, &tuple)) == 0 &&
++		(err = pcmcia_get_tuple_data(handle, &tuple)) == 0) {
+ 	    if (tuple.TupleDataLen == 8 && *buf == CISTPL_FUNCE_LAN_NODE_ID)
+ 		memcpy(&parse, buf, 8);
+ 	    else
+@@ -953,8 +950,7 @@ xirc2ps_config(dev_link_t * link)
+ 			link->conf.ConfigIndex = cf->index ;
+ 			link->io.BasePort2 = cf->io.win[0].base;
+ 			link->io.BasePort1 = ioaddr;
+-			if (!(err=CardServices(RequestIO, link->handle,
+-								&link->io)))
++			if (!(err=pcmcia_request_io(link->handle, &link->io)))
+ 			    goto port_found;
+ 		    }
+ 		}
+@@ -976,8 +972,7 @@ xirc2ps_config(dev_link_t * link)
+ 			link->io.BasePort1 = link->io.BasePort2
+ 				    + (pass ? (cf->index & 0x20 ? -24:8)
+ 					    : (cf->index & 0x20 ?   8:-24));
+-			if (!(err=CardServices(RequestIO, link->handle,
+-								&link->io)))
++			if (!(err=pcmcia_request_io(link->handle, &link->io)))
+ 			    goto port_found;
+ 		    }
+ 		}
+@@ -992,11 +987,11 @@ xirc2ps_config(dev_link_t * link)
+ 	link->io.NumPorts1 = 16;
+ 	for (ioaddr = 0x300; ioaddr < 0x400; ioaddr += 0x10) {
+ 	    link->io.BasePort1 = ioaddr;
+-	    if (!(err=CardServices(RequestIO, link->handle, &link->io)))
++	    if (!(err=pcmcia_request_io(link->handle, &link->io)))
+ 		goto port_found;
+ 	}
+ 	link->io.BasePort1 = 0; /* let CS decide */
+-	if ((err=CardServices(RequestIO, link->handle, &link->io))) {
++	if ((err=pcmcia_request_io(link->handle, &link->io))) {
+ 	    cs_error(link->handle, RequestIO, err);
+ 	    goto config_error;
+ 	}
+@@ -1009,7 +1004,7 @@ xirc2ps_config(dev_link_t * link)
+      * Now allocate an interrupt line.	Note that this does not
+      * actually assign a handler to the interrupt.
+      */
+-    if ((err=CardServices(RequestIRQ, link->handle, &link->irq))) {
++    if ((err=pcmcia_request_irq(link->handle, &link->irq))) {
+ 	cs_error(link->handle, RequestIRQ, err);
+ 	goto config_error;
+     }
+@@ -1018,8 +1013,7 @@ xirc2ps_config(dev_link_t * link)
+      * This actually configures the PCMCIA socket -- setting up
+      * the I/O windows and the interrupt mapping.
+      */
+-    if ((err=CardServices(RequestConfiguration,
+-			  link->handle, &link->conf))) {
++    if ((err=pcmcia_request_configuration(link->handle, &link->conf))) {
+ 	cs_error(link->handle, RequestConfiguration, err);
+ 	goto config_error;
+     }
+@@ -1037,16 +1031,14 @@ xirc2ps_config(dev_link_t * link)
+ 	reg.Action = CS_WRITE;
+ 	reg.Offset = CISREG_IOBASE_0;
+ 	reg.Value = link->io.BasePort2 & 0xff;
+-	if ((err = CardServices(AccessConfigurationRegister, link->handle,
+-				&reg))) {
++	if ((err = pcmcia_access_configuration_register(link->handle, &reg))) {
+ 	    cs_error(link->handle, AccessConfigurationRegister, err);
+ 	    goto config_error;
+ 	}
+ 	reg.Action = CS_WRITE;
+ 	reg.Offset = CISREG_IOBASE_1;
+ 	reg.Value = (link->io.BasePort2 >> 8) & 0xff;
+-	if ((err = CardServices(AccessConfigurationRegister, link->handle,
+-				&reg))) {
++	if ((err = pcmcia_access_configuration_register(link->handle, &reg))) {
+ 	    cs_error(link->handle, AccessConfigurationRegister, err);
+ 	    goto config_error;
+ 	}
+@@ -1058,15 +1050,14 @@ xirc2ps_config(dev_link_t * link)
+ 	req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE;
+ 	req.Base = req.Size = 0;
+ 	req.AccessSpeed = 0;
+-	link->win = (window_handle_t)link->handle;
+-	if ((err = CardServices(RequestWindow, &link->win, &req))) {
++	if ((err = pcmcia_request_window(&link->handle, &req, &link->win))) {
+ 	    cs_error(link->handle, RequestWindow, err);
+ 	    goto config_error;
+ 	}
+ 	local->dingo_ccr = ioremap(req.Base,0x1000) + 0x0800;
+ 	mem.CardOffset = 0x0;
+ 	mem.Page = 0;
+-	if ((err = CardServices(MapMemPage, link->win, &mem))) {
++	if ((err = pcmcia_map_mem_page(link->win, &mem))) {
+ 	    cs_error(link->handle, MapMemPage, err);
+ 	    goto config_error;
+ 	}
+@@ -1171,11 +1162,11 @@ xirc2ps_release(dev_link_t *link)
+ 	local_info_t *local = dev->priv;
+ 	if (local->dingo)
+ 	    iounmap(local->dingo_ccr - 0x0800);
+-	CardServices(ReleaseWindow, link->win);
++	pcmcia_release_window(link->win);
+     }
+-    CardServices(ReleaseConfiguration, link->handle);
+-    CardServices(ReleaseIO, link->handle, &link->io);
+-    CardServices(ReleaseIRQ, link->handle, &link->irq);
++    pcmcia_release_configuration(link->handle);
++    pcmcia_release_io(link->handle, &link->io);
++    pcmcia_release_irq(link->handle, &link->irq);
+     link->state &= ~DEV_CONFIG;
+ 
+ } /* xirc2ps_release */
+@@ -1227,7 +1218,7 @@ xirc2ps_event(event_t event, int priorit
+ 		netif_device_detach(dev);
+ 		do_powerdown(dev);
+ 	    }
+-	    CardServices(ReleaseConfiguration, link->handle);
++	    pcmcia_release_configuration(link->handle);
+ 	}
+ 	break;
+     case CS_EVENT_PM_RESUME:
+@@ -1235,7 +1226,7 @@ xirc2ps_event(event_t event, int priorit
+ 	/* Fall through... */
+     case CS_EVENT_CARD_RESET:
+ 	if (link->state & DEV_CONFIG) {
+-	    CardServices(RequestConfiguration, link->handle, &link->conf);
++	    pcmcia_request_configuration(link->handle, &link->conf);
+ 	    if (link->open) {
+ 		do_reset(dev,1);
+ 		netif_device_attach(dev);
+--- linux-2.6.0/drivers/net/pcnet32.c	2003-12-17 21:20:02.000000000 -0800
++++ 25/drivers/net/pcnet32.c	2003-12-28 23:21:01.000000000 -0800
+@@ -456,6 +456,14 @@ static struct pcnet32_access pcnet32_dwi
+     .reset	= pcnet32_dwio_reset
+ };
+ 
++#ifdef CONFIG_NET_POLL_CONTROLLER
++static void pcnet32_poll_controller(struct net_device *dev)
++{ 
++	disable_irq(dev->irq);
++	pcnet32_interrupt(0, dev, NULL);
++	enable_irq(dev->irq);
++} 
++#endif
+ 
+ 
+ /* only probes for non-PCI devices, the rest are handled by 
+@@ -805,12 +813,16 @@ pcnet32_probe1(unsigned long ioaddr, uns
+     dev->do_ioctl = &pcnet32_ioctl;
+     dev->tx_timeout = pcnet32_tx_timeout;
+     dev->watchdog_timeo = (5*HZ);
++#ifdef CONFIG_NET_POLL_CONTROLLER
++    dev->poll_controller = pcnet32_poll_controller;
++#endif    
++
++    /* Fill in the generic fields of the device structure. */
++    if (register_netdev(dev))
++	goto err_free_consistent;
+ 
+     lp->next = pcnet32_dev;
+     pcnet32_dev = dev;
+-
+-    /* Fill in the generic fields of the device structure. */
+-    register_netdev(dev);
+     printk(KERN_INFO "%s: registered as %s\n",dev->name, lp->name);
+     cards_found++;
+     return 0;
+--- linux-2.6.0/drivers/net/plip.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/plip.c	2003-12-28 23:21:01.000000000 -0800
+@@ -277,19 +277,11 @@ inline static unsigned char read_status 
+    then calls us here.
+ 
+    */
+-static int
++static void
+ plip_init_netdev(struct net_device *dev)
+ {
+ 	struct net_local *nl = dev->priv;
+ 
+-	printk(KERN_INFO "%s", version);
+-	if (dev->irq != -1)
+-		printk(KERN_INFO "%s: Parallel port at %#3lx, using IRQ %d.\n",
+-		       dev->name, dev->base_addr, dev->irq);
+-	else
+-		printk(KERN_INFO "%s: Parallel port at %#3lx, not using IRQ.\n",
+-		       dev->name, dev->base_addr);
+-
+ 	/* Then, override parts of it */
+ 	dev->hard_start_xmit	 = plip_tx_packet;
+ 	dev->open		 = plip_open;
+@@ -323,8 +315,6 @@ plip_init_netdev(struct net_device *dev)
+ 		INIT_WORK(&nl->timer, (void (*)(void *))plip_timer_bh, dev);
+ 
+ 	spin_lock_init(&nl->lock);
+-
+-	return 0;
+ }
+ 
+ /* Bottom half handler for the delayed request.
+@@ -1282,14 +1272,13 @@ static void plip_attach (struct parport 
+ 		}
+ 
+ 		sprintf(name, "plip%d", unit);
+-		dev = alloc_netdev(sizeof(struct net_local), name, 
+-				   ether_setup);
++		dev = alloc_etherdev(sizeof(struct net_local));
+ 		if (!dev) {
+ 			printk(KERN_ERR "plip: memory squeeze\n");
+ 			return;
+ 		}
+ 		
+-		dev->init = plip_init_netdev;
++		strcpy(dev->name, name);
+ 
+ 		SET_MODULE_OWNER(dev);
+ 		dev->irq = port->irq;
+@@ -1306,17 +1295,35 @@ static void plip_attach (struct parport 
+ 
+ 		if (!nl->pardev) {
+ 			printk(KERN_ERR "%s: parport_register failed\n", name);
+-			kfree(dev);
++			goto err_free_dev;
+ 			return;
+ 		}
+ 
++		plip_init_netdev(dev);
++
+ 		if (register_netdev(dev)) {
+ 			printk(KERN_ERR "%s: network register failed\n", name);
+-			kfree(dev);
+-		} else {
+-			dev_plip[unit++] = dev;
++			goto err_parport_unregister;
+ 		}
++
++		printk(KERN_INFO "%s", version);
++		if (dev->irq != -1)
++			printk(KERN_INFO "%s: Parallel port at %#3lx, "
++					 "using IRQ %d.\n",
++				         dev->name, dev->base_addr, dev->irq);
++		else
++			printk(KERN_INFO "%s: Parallel port at %#3lx, "
++					 "not using IRQ.\n",
++					 dev->name, dev->base_addr);
++		dev_plip[unit++] = dev;
+ 	}
++	return;
++
++err_parport_unregister:
++	parport_unregister_device(nl->pardev);
++err_free_dev:
++	free_netdev(dev);
++	return;
+ }
+ 
+ /* plip_detach() is called (by the parport code) when a port is
+--- linux-2.6.0/drivers/net/ppp_async.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/ppp_async.c	2003-12-28 23:22:46.000000000 -0800
+@@ -16,8 +16,6 @@
+  * Part of the code in this driver was inspired by the old async-only
+  * PPP driver, written by Michael Callahan and Al Longyear, and
+  * subsequently hacked by Paul Mackerras.
+- *
+- * ==FILEVERSION 20020125==
+  */
+ 
+ #include <linux/module.h>
+@@ -61,6 +59,9 @@ struct asyncppp {
+ 
+ 	struct sk_buff	*rpkt;
+ 	int		lcp_fcs;
++	struct sk_buff_head rqueue;
++
++	struct tasklet_struct tsk;
+ 
+ 	atomic_t	refcnt;
+ 	struct semaphore dead_sem;
+@@ -74,8 +75,9 @@ struct asyncppp {
+ #define XMIT_BUSY	2
+ 
+ /* State bits */
+-#define SC_TOSS		0x20000000
+-#define SC_ESCAPE	0x40000000
++#define SC_TOSS		1
++#define SC_ESCAPE	2
++#define SC_PREV_ERROR	4
+ 
+ /* Bits in rbits */
+ #define SC_RCV_BITS	(SC_RCV_B7_1|SC_RCV_B7_0|SC_RCV_ODDP|SC_RCV_EVNP)
+@@ -97,6 +99,8 @@ static void ppp_async_input(struct async
+ 			    char *flags, int count);
+ static int ppp_async_ioctl(struct ppp_channel *chan, unsigned int cmd,
+ 			   unsigned long arg);
++static void ppp_async_process(unsigned long arg);
++
+ static void async_lcp_peek(struct asyncppp *ap, unsigned char *data,
+ 			   int len, int inbound);
+ 
+@@ -165,6 +169,9 @@ ppp_asynctty_open(struct tty_struct *tty
+ 	ap->olim = ap->obuf;
+ 	ap->lcp_fcs = -1;
+ 
++	skb_queue_head_init(&ap->rqueue);
++	tasklet_init(&ap->tsk, ppp_async_process, (unsigned long) ap);
++
+ 	atomic_set(&ap->refcnt, 1);
+ 	init_MUTEX_LOCKED(&ap->dead_sem);
+ 
+@@ -214,10 +221,12 @@ ppp_asynctty_close(struct tty_struct *tt
+ 	 */
+ 	if (!atomic_dec_and_test(&ap->refcnt))
+ 		down(&ap->dead_sem);
++	tasklet_kill(&ap->tsk);
+ 
+ 	ppp_unregister_channel(&ap->chan);
+ 	if (ap->rpkt != 0)
+ 		kfree_skb(ap->rpkt);
++	skb_queue_purge(&ap->rqueue);
+ 	if (ap->tpkt != 0)
+ 		kfree_skb(ap->tpkt);
+ 	kfree(ap);
+@@ -316,17 +325,24 @@ ppp_asynctty_room(struct tty_struct *tty
+ 	return 65535;
+ }
+ 
++/*
++ * This can now be called from hard interrupt level as well
++ * as soft interrupt level or mainline.
++ */
+ static void
+ ppp_asynctty_receive(struct tty_struct *tty, const unsigned char *buf,
+-		  char *flags, int count)
++		  char *cflags, int count)
+ {
+ 	struct asyncppp *ap = ap_get(tty);
++	unsigned long flags;
+ 
+ 	if (ap == 0)
+ 		return;
+-	spin_lock_bh(&ap->recv_lock);
+-	ppp_async_input(ap, buf, flags, count);
+-	spin_unlock_bh(&ap->recv_lock);
++	spin_lock_irqsave(&ap->recv_lock, flags);
++	ppp_async_input(ap, buf, cflags, count);
++	spin_unlock_irqrestore(&ap->recv_lock, flags);
++	if (skb_queue_len(&ap->rqueue))
++		tasklet_schedule(&ap->tsk);
+ 	ap_put(ap);
+ 	if (test_and_clear_bit(TTY_THROTTLED, &tty->flags)
+ 	    && tty->driver->unthrottle)
+@@ -341,8 +357,8 @@ ppp_asynctty_wakeup(struct tty_struct *t
+ 	clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
+ 	if (ap == 0)
+ 		return;
+-	if (ppp_async_push(ap))
+-		ppp_output_wakeup(&ap->chan);
++	set_bit(XMIT_WAKEUP, &ap->xmit_flags);
++	tasklet_schedule(&ap->tsk);
+ 	ap_put(ap);
+ }
+ 
+@@ -396,9 +412,9 @@ ppp_async_ioctl(struct ppp_channel *chan
+ 		if (get_user(val, (int *) arg))
+ 			break;
+ 		ap->flags = val & ~SC_RCV_BITS;
+-		spin_lock_bh(&ap->recv_lock);
++		spin_lock_irq(&ap->recv_lock);
+ 		ap->rbits = val & SC_RCV_BITS;
+-		spin_unlock_bh(&ap->recv_lock);
++		spin_unlock_irq(&ap->recv_lock);
+ 		err = 0;
+ 		break;
+ 
+@@ -460,6 +476,28 @@ ppp_async_ioctl(struct ppp_channel *chan
+ }
+ 
+ /*
++ * This is called at softirq level to deliver received packets
++ * to the ppp_generic code, and to tell the ppp_generic code
++ * if we can accept more output now.
++ */
++static void ppp_async_process(unsigned long arg)
++{
++	struct asyncppp *ap = (struct asyncppp *) arg;
++	struct sk_buff *skb;
++
++	/* process received packets */
++	while ((skb = skb_dequeue(&ap->rqueue)) != NULL) {
++		if (skb->cb[0])
++			ppp_input_error(&ap->chan, 0);
++		ppp_input(&ap->chan, skb);
++	}
++
++	/* try to push more stuff out */
++	if (test_bit(XMIT_WAKEUP, &ap->xmit_flags) && ppp_async_push(ap))
++		ppp_output_wakeup(&ap->chan);
++}
++
++/*
+  * Procedures for encapsulation and framing.
+  */
+ 
+@@ -641,7 +679,6 @@ ppp_async_push(struct asyncppp *ap)
+ 	struct tty_struct *tty = ap->tty;
+ 	int tty_stuffed = 0;
+ 
+-	set_bit(XMIT_WAKEUP, &ap->xmit_flags);
+ 	/*
+ 	 * We can get called recursively here if the tty write
+ 	 * function calls our wakeup function.  This can happen
+@@ -752,22 +789,19 @@ scan_ordinary(struct asyncppp *ap, const
+ }
+ 
+ /* called when a flag is seen - do end-of-packet processing */
+-static inline void
++static void
+ process_input_packet(struct asyncppp *ap)
+ {
+ 	struct sk_buff *skb;
+ 	unsigned char *p;
+ 	unsigned int len, fcs, proto;
+-	int code = 0;
+ 
+ 	skb = ap->rpkt;
+-	ap->rpkt = 0;
+-	if ((ap->state & (SC_TOSS | SC_ESCAPE)) || skb == 0) {
+-		ap->state &= ~(SC_TOSS | SC_ESCAPE);
+-		if (skb != 0)
+-			kfree_skb(skb);
+-		return;
+-	}
++	if (ap->state & (SC_TOSS | SC_ESCAPE))
++		goto err;
++
++	if (skb == NULL)
++		return;		/* 0-length packet */
+ 
+ 	/* check the FCS */
+ 	p = skb->data;
+@@ -801,20 +835,18 @@ process_input_packet(struct asyncppp *ap
+ 			async_lcp_peek(ap, p, skb->len, 1);
+ 	}
+ 
+-	/* all OK, give it to the generic layer */
+-	ppp_input(&ap->chan, skb);
++	/* queue the frame to be processed */
++	skb->cb[0] = ap->state;
++	skb_queue_tail(&ap->rqueue, skb);
++	ap->rpkt = 0;
++	ap->state = 0;
+ 	return;
+ 
+  err:
+-	kfree_skb(skb);
+-	ppp_input_error(&ap->chan, code);
+-}
+-
+-static inline void
+-input_error(struct asyncppp *ap, int code)
+-{
+-	ap->state |= SC_TOSS;
+-	ppp_input_error(&ap->chan, code);
++	/* frame had an error, remember that, reset SC_TOSS & SC_ESCAPE */
++	ap->state = SC_PREV_ERROR;
++	if (skb)
++		skb_trim(skb, 0);
+ }
+ 
+ /* called when the tty driver has data for us. */
+@@ -856,7 +888,7 @@ ppp_async_input(struct asyncppp *ap, con
+ 		}
+ 		if (f != 0) {
+ 			/* start tossing */
+-			input_error(ap, f);
++			ap->state |= SC_TOSS;
+ 
+ 		} else if (n > 0 && (ap->state & SC_TOSS) == 0) {
+ 			/* stuff the chars in the skb */
+@@ -872,7 +904,7 @@ ppp_async_input(struct asyncppp *ap, con
+ 			}
+ 			if (n > skb_tailroom(skb)) {
+ 				/* packet overflowed MRU */
+-				input_error(ap, 1);
++				ap->state |= SC_TOSS;
+ 			} else {
+ 				sp = skb_put(skb, n);
+ 				memcpy(sp, buf, n);
+@@ -909,7 +941,7 @@ ppp_async_input(struct asyncppp *ap, con
+ 
+  nomem:
+ 	printk(KERN_ERR "PPPasync: no memory (input pkt)\n");
+-	input_error(ap, 0);
++	ap->state |= SC_TOSS;
+ }
+ 
+ /*
+--- linux-2.6.0/drivers/net/ppp_generic.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/ppp_generic.c	2003-12-28 23:21:01.000000000 -0800
+@@ -917,19 +917,14 @@ ppp_net_ioctl(struct net_device *dev, st
+ 	return err;
+ }
+ 
+-static int
+-ppp_net_init(struct net_device *dev)
++static void ppp_setup(struct net_device *dev)
+ {
+ 	dev->hard_header_len = PPP_HDRLEN;
+ 	dev->mtu = PPP_MTU;
+-	dev->hard_start_xmit = ppp_start_xmit;
+-	dev->get_stats = ppp_net_stats;
+-	dev->do_ioctl = ppp_net_ioctl;
+ 	dev->addr_len = 0;
+ 	dev->tx_queue_len = 3;
+ 	dev->type = ARPHRD_PPP;
+ 	dev->flags = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST;
+-	return 0;
+ }
+ 
+ /*
+@@ -2272,23 +2267,13 @@ ppp_create_interface(int unit, int *retp
+ 	int i;
+ 
+ 	ppp = kmalloc(sizeof(struct ppp), GFP_KERNEL);
+-	if (ppp == 0)
+-		goto err;
+-	dev = kmalloc(sizeof(struct net_device), GFP_KERNEL);
+-	if (dev == 0)
+-		goto err;
++	if (!ppp)
++		goto out;
++	dev = alloc_netdev(0, "", ppp_setup);
++	if (!dev)
++		goto out1;
+ 	memset(ppp, 0, sizeof(struct ppp));
+-	memset(dev, 0, sizeof(struct net_device));
+ 
+-	ret = -EEXIST;
+-	down(&all_ppp_sem);
+-	if (unit < 0)
+-		unit = cardmap_find_first_free(all_ppp_units);
+-	else if (cardmap_get(all_ppp_units, unit) != NULL)
+-		goto err_unlock;	/* unit already exists */
+-
+-	/* Initialize the new ppp unit */
+-	ppp->file.index = unit;
+ 	ppp->mru = PPP_MRU;
+ 	init_ppp_file(&ppp->file, INTERFACE);
+ 	ppp->file.hdrlen = PPP_HDRLEN - 2;	/* don't count proto bytes */
+@@ -2301,20 +2286,29 @@ ppp_create_interface(int unit, int *retp
+ 	ppp->minseq = -1;
+ 	skb_queue_head_init(&ppp->mrq);
+ #endif /* CONFIG_PPP_MULTILINK */
+-
+ 	ppp->dev = dev;
+-	dev->init = ppp_net_init;
+-	sprintf(dev->name, "ppp%d", unit);
+ 	dev->priv = ppp;
+-	dev->destructor = free_netdev;
+ 
+-	rtnl_lock();
+-	ret = register_netdevice(dev);
+-	rtnl_unlock();
++	dev->hard_start_xmit = ppp_start_xmit;
++	dev->get_stats = ppp_net_stats;
++	dev->do_ioctl = ppp_net_ioctl;
++
++	ret = -EEXIST;
++	down(&all_ppp_sem);
++	if (unit < 0)
++		unit = cardmap_find_first_free(all_ppp_units);
++	else if (cardmap_get(all_ppp_units, unit) != NULL)
++		goto out2;	/* unit already exists */
++
++	/* Initialize the new ppp unit */
++	ppp->file.index = unit;
++	sprintf(dev->name, "ppp%d", unit);
++
++	ret = register_netdev(dev);
+ 	if (ret != 0) {
+ 		printk(KERN_ERR "PPP: couldn't register device %s (%d)\n",
+ 		       dev->name, ret);
+-		goto err_unlock;
++		goto out2;
+ 	}
+ 
+ 	atomic_inc(&ppp_unit_count);
+@@ -2323,14 +2317,13 @@ ppp_create_interface(int unit, int *retp
+ 	*retp = 0;
+ 	return ppp;
+ 
+- err_unlock:
++out2:
+ 	up(&all_ppp_sem);
+- err:
++	free_netdev(dev);
++out1:
++	kfree(ppp);
++out:
+ 	*retp = ret;
+-	if (ppp)
+-		kfree(ppp);
+-	if (dev)
+-		kfree(dev);
+ 	return NULL;
+ }
+ 
+@@ -2361,8 +2354,10 @@ static void ppp_shutdown_interface(struc
+ 	ppp->dev = 0;
+ 	ppp_unlock(ppp);
+ 	/* This will call dev_close() for us. */
+-	if (dev)
++	if (dev) {
+ 		unregister_netdev(dev);
++		free_netdev(dev);
++	}
+ 	cardmap_set(&all_ppp_units, ppp->file.index, NULL);
+ 	ppp->file.dead = 1;
+ 	ppp->owner = NULL;
+--- linux-2.6.0/drivers/net/pppoe.c	2003-11-26 13:53:35.000000000 -0800
++++ 25/drivers/net/pppoe.c	2003-12-28 23:22:25.000000000 -0800
+@@ -1151,3 +1151,4 @@ module_exit(pppoe_exit);
+ MODULE_AUTHOR("Michal Ostrowski <mostrows@speakeasy.net>");
+ MODULE_DESCRIPTION("PPP over Ethernet driver");
+ MODULE_LICENSE("GPL");
++MODULE_ALIAS_NETPROTO(PF_PPPOX);
+--- linux-2.6.0/drivers/net/r8169.c	2003-12-17 21:20:02.000000000 -0800
++++ 25/drivers/net/r8169.c	2003-12-28 23:21:01.000000000 -0800
+@@ -56,9 +56,11 @@ VERSION 1.2	<2002/11/30>
+ 	        printk( "Assertion failed! %s,%s,%s,line=%d\n",	\
+         	#expr,__FILE__,__FUNCTION__,__LINE__);		\
+         }
++#define dprintk(fmt, args...)	do { printk(PFX fmt, ## args) } while (0)
+ #else
+ #define assert(expr) do {} while (0)
+-#endif
++#define dprintk(fmt, args...)	do {} while (0)
++#endif /* RTL8169_DEBUG */
+ 
+ /* media options */
+ #define MAX_UNITS 8
+@@ -89,9 +91,12 @@ static int multicast_filter_limit = 32;
+ #define NUM_TX_DESC	64	/* Number of Tx descriptor registers */
+ #define NUM_RX_DESC	64	/* Number of Rx descriptor registers */
+ #define RX_BUF_SIZE	1536	/* Rx Buffer size */
++#define R8169_TX_RING_BYTES	(NUM_TX_DESC * sizeof(struct TxDesc))
++#define R8169_RX_RING_BYTES	(NUM_RX_DESC * sizeof(struct RxDesc))
+ 
+ #define RTL_MIN_IO_SIZE 0x80
+-#define TX_TIMEOUT  (6*HZ)
++#define RTL8169_TX_TIMEOUT	(6*HZ)
++#define RTL8169_PHY_TIMEOUT	(HZ) 
+ 
+ /* write/read MMIO register */
+ #define RTL_W8(reg, val8)	writeb ((val8), ioaddr + (reg))
+@@ -101,11 +106,35 @@ static int multicast_filter_limit = 32;
+ #define RTL_R16(reg)		readw (ioaddr + (reg))
+ #define RTL_R32(reg)		((unsigned long) readl (ioaddr + (reg)))
+ 
+-static struct {
++enum mac_version {
++	RTL_GIGA_MAC_VER_B = 0x00,
++	/* RTL_GIGA_MAC_VER_C = 0x03, */
++	RTL_GIGA_MAC_VER_D = 0x01,
++	RTL_GIGA_MAC_VER_E = 0x02
++};
++
++enum phy_version {
++	RTL_GIGA_PHY_VER_C = 0x03, /* PHY Reg 0x03 bit0-3 == 0x0000 */
++	RTL_GIGA_PHY_VER_D = 0x04, /* PHY Reg 0x03 bit0-3 == 0x0000 */
++	RTL_GIGA_PHY_VER_E = 0x05, /* PHY Reg 0x03 bit0-3 == 0x0000 */
++	RTL_GIGA_PHY_VER_F = 0x06, /* PHY Reg 0x03 bit0-3 == 0x0001 */
++	RTL_GIGA_PHY_VER_G = 0x07, /* PHY Reg 0x03 bit0-3 == 0x0002 */
++};
++
++
++#define _R(NAME,MAC,MASK) \
++	{ .name = NAME, .mac_version = MAC, .RxConfigMask = MASK }
++
++const static struct {
+ 	const char *name;
+-} board_info[] __devinitdata = {
+-	{
+-"RealTek RTL8169 Gigabit Ethernet"},};
++	u8 mac_version;
++	u32 RxConfigMask;	/* Clears the bits supported by this chip */
++} rtl_chip_info[] __devinitdata = {
++	_R("RTL8169",		RTL_GIGA_MAC_VER_B, 0xff7e1880),
++	_R("RTL8169s/8110s",	RTL_GIGA_MAC_VER_D, 0xff7e1880),
++	_R("RTL8169s/8110s",	RTL_GIGA_MAC_VER_E, 0xff7e1880)
++};
++#undef _R
+ 
+ static struct pci_device_id rtl8169_pci_tbl[] = {
+ 	{0x10ec, 0x8169, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+@@ -114,6 +143,8 @@ static struct pci_device_id rtl8169_pci_
+ 
+ MODULE_DEVICE_TABLE(pci, rtl8169_pci_tbl);
+ 
++static int rx_copybreak = 200;
++
+ enum RTL8169_registers {
+ 	MAC0 = 0,		/* Ethernet hardware address. */
+ 	MAR0 = 8,		/* Multicast filter. */
+@@ -242,14 +273,6 @@ enum RTL8169_register_content {
+ 	TBILinkOK = 0x02000000,
+ };
+ 
+-const static struct {
+-	const char *name;
+-	u8 version;		/* depend on RTL8169 docs */
+-	u32 RxConfigMask;	/* should clear the bits supported by this chip */
+-} rtl_chip_info[] = {
+-	{
+-"RTL-8169", 0x00, 0xff7e1880,},};
+-
+ enum _DescStatusBit {
+ 	OWNbit = 0x80000000,
+ 	EORbit = 0x40000000,
+@@ -257,6 +280,8 @@ enum _DescStatusBit {
+ 	LSbit = 0x10000000,
+ };
+ 
++#define RsvdMask	0x3fffc000
++
+ struct TxDesc {
+ 	u32 status;
+ 	u32 vlan_tag;
+@@ -277,28 +302,33 @@ struct rtl8169_private {
+ 	struct net_device_stats stats;	/* statistics of net device */
+ 	spinlock_t lock;	/* spin lock flag */
+ 	int chipset;
+-	unsigned long cur_rx;	/* Index into the Rx descriptor buffer of next Rx pkt. */
+-	unsigned long cur_tx;	/* Index into the Tx descriptor buffer of next Rx pkt. */
+-	unsigned long dirty_tx;
+-	unsigned char *TxDescArrays;	/* Index of Tx Descriptor buffer */
+-	unsigned char *RxDescArrays;	/* Index of Rx Descriptor buffer */
++	int mac_version;
++	int phy_version;
++	u32 cur_rx; /* Index into the Rx descriptor buffer of next Rx pkt. */
++	u32 cur_tx; /* Index into the Tx descriptor buffer of next Rx pkt. */
++	u32 dirty_rx;
++	u32 dirty_tx;
+ 	struct TxDesc *TxDescArray;	/* Index of 256-alignment Tx Descriptor buffer */
+ 	struct RxDesc *RxDescArray;	/* Index of 256-alignment Rx Descriptor buffer */
+-	unsigned char *RxBufferRings;	/* Index of Rx Buffer  */
+-	unsigned char *RxBufferRing[NUM_RX_DESC];	/* Index of Rx Buffer array */
++	dma_addr_t TxPhyAddr;
++	dma_addr_t RxPhyAddr;
++	struct sk_buff *Rx_skbuff[NUM_RX_DESC];	/* Rx data buffers */
+ 	struct sk_buff *Tx_skbuff[NUM_TX_DESC];	/* Index of Transmit data buffer */
++	struct timer_list timer;
++	unsigned long phy_link_down_cnt;
+ };
+ 
+ MODULE_AUTHOR("Realtek");
+ MODULE_DESCRIPTION("RealTek RTL-8169 Gigabit Ethernet driver");
+ MODULE_PARM(media, "1-" __MODULE_STRING(MAX_UNITS) "i");
++MODULE_PARM(rx_copybreak, "i");
+ MODULE_LICENSE("GPL");
+ 
+ static int rtl8169_open(struct net_device *dev);
+ static int rtl8169_start_xmit(struct sk_buff *skb, struct net_device *dev);
+ static irqreturn_t rtl8169_interrupt(int irq, void *dev_instance,
+ 			      struct pt_regs *regs);
+-static void rtl8169_init_ring(struct net_device *dev);
++static int rtl8169_init_ring(struct net_device *dev);
+ static void rtl8169_hw_start(struct net_device *dev);
+ static int rtl8169_close(struct net_device *dev);
+ static void rtl8169_set_rx_mode(struct net_device *dev);
+@@ -306,11 +336,15 @@ static void rtl8169_tx_timeout(struct ne
+ static struct net_device_stats *rtl8169_get_stats(struct net_device *netdev);
+ 
+ static const u16 rtl8169_intr_mask =
+-    SYSErr | PCSTimeout | RxUnderrun | RxOverflow | RxFIFOOver | TxErr | TxOK |
+-    RxErr | RxOK;
++    RxUnderrun | RxOverflow | RxFIFOOver | TxErr | TxOK | RxErr | RxOK;
+ static const unsigned int rtl8169_rx_config =
+     (RX_FIFO_THRESH << RxCfgFIFOShift) | (RX_DMA_BURST << RxCfgDMAShift);
+ 
++#define PHY_Cap_10_Half_Or_Less PHY_Cap_10_Half
++#define PHY_Cap_10_Full_Or_Less PHY_Cap_10_Full | PHY_Cap_10_Half_Or_Less
++#define PHY_Cap_100_Half_Or_Less PHY_Cap_100_Half | PHY_Cap_10_Full_Or_Less
++#define PHY_Cap_100_Full_Or_Less PHY_Cap_100_Full | PHY_Cap_100_Half_Or_Less
++
+ void
+ mdio_write(void *ioaddr, int RegAddr, int value)
+ {
+@@ -342,13 +376,258 @@ mdio_read(void *ioaddr, int RegAddr)
+ 		if (RTL_R32(PHYAR) & 0x80000000) {
+ 			value = (int) (RTL_R32(PHYAR) & 0xFFFF);
+ 			break;
+-		} else {
+-			udelay(100);
+ 		}
++		udelay(100);
+ 	}
+ 	return value;
+ }
+ 
++static void rtl8169_write_gmii_reg_bit(void *ioaddr, int reg, int bitnum,
++				       int bitval)
++{
++	int val;
++
++	val = mdio_read(ioaddr, reg);
++	val = (bitval == 1) ?
++		val | (bitval << bitnum) :  val & ~(0x0001 << bitnum);
++	mdio_write(ioaddr, reg, val & 0xffff); 
++}
++
++static void rtl8169_get_mac_version(struct rtl8169_private *tp, void *ioaddr)
++{
++	const struct {
++		u32 mask;
++		int mac_version;
++	} mac_info[] = {
++		{ 0x1 << 26,	RTL_GIGA_MAC_VER_E },
++		{ 0x1 << 23,	RTL_GIGA_MAC_VER_D }, 
++		{ 0x00000000,	RTL_GIGA_MAC_VER_B } /* Catch-all */
++	}, *p = mac_info;
++	u32 reg;
++
++	reg = RTL_R32(TxConfig) & 0x7c800000;
++	while ((reg & p->mask) != p->mask)
++		p++;
++	tp->mac_version = p->mac_version;
++}
++
++static void rtl8169_print_mac_version(struct rtl8169_private *tp)
++{
++	struct {
++		int version;
++		char *msg;
++	} mac_print[] = {
++		{ RTL_GIGA_MAC_VER_E, "RTL_GIGA_MAC_VER_E" },
++		{ RTL_GIGA_MAC_VER_D, "RTL_GIGA_MAC_VER_D" },
++		{ RTL_GIGA_MAC_VER_B, "RTL_GIGA_MAC_VER_B" },
++		{ 0, NULL }
++	}, *p;
++
++	for (p = mac_print; p->msg; p++) {
++		if (tp->mac_version == p->version) {
++			dprintk("mac_version == %s (%04d)\n", p->msg,
++				  p->version);
++			return;
++		}
++	}
++	dprintk("mac_version == Unknown\n");
++}
++
++static void rtl8169_get_phy_version(struct rtl8169_private *tp, void *ioaddr)
++{
++	const struct {
++		u16 mask;
++		u16 set;
++		int phy_version;
++	} phy_info[] = {
++		{ 0x000f, 0x0002, RTL_GIGA_PHY_VER_G },
++		{ 0x000f, 0x0001, RTL_GIGA_PHY_VER_F },
++		{ 0x000f, 0x0000, RTL_GIGA_PHY_VER_E },
++		{ 0x0000, 0x0000, RTL_GIGA_PHY_VER_D } /* Catch-all */
++	}, *p = phy_info;
++	u16 reg;
++
++	reg = mdio_read(ioaddr, 3) & 0xffff;
++	while ((reg & p->mask) != p->set)
++		p++;
++	tp->phy_version = p->phy_version;
++}
++
++static void rtl8169_print_phy_version(struct rtl8169_private *tp)
++{
++	struct {
++		int version;
++		char *msg;
++		u32 reg;
++	} phy_print[] = {
++		{ RTL_GIGA_PHY_VER_G, "RTL_GIGA_PHY_VER_G", 0x0002 },
++		{ RTL_GIGA_PHY_VER_F, "RTL_GIGA_PHY_VER_F", 0x0001 },
++		{ RTL_GIGA_PHY_VER_E, "RTL_GIGA_PHY_VER_E", 0x0000 },
++		{ RTL_GIGA_PHY_VER_D, "RTL_GIGA_PHY_VER_D", 0x0000 },
++		{ 0, NULL, 0x0000 }
++	}, *p;
++
++	for (p = phy_print; p->msg; p++) {
++		if (tp->phy_version == p->version) {
++			dprintk("phy_version == %s (%04x)\n", p->msg, p->reg);
++			return;
++		}
++	}
++	dprintk("phy_version == Unknown\n");
++}
++
++static void rtl8169_hw_phy_config(struct net_device *dev)
++{
++	struct rtl8169_private *tp = dev->priv;
++	void *ioaddr = tp->mmio_addr;
++	struct {
++		u16 regs[5]; /* Beware of bit-sign propagation */
++	} phy_magic[5] = { {
++		{ 0x0000,	//w 4 15 12 0
++		  0x00a1,	//w 3 15 0 00a1
++		  0x0008,	//w 2 15 0 0008
++		  0x1020,	//w 1 15 0 1020
++		  0x1000 } },{	//w 0 15 0 1000
++		{ 0x7000,	//w 4 15 12 7
++		  0xff41,	//w 3 15 0 ff41
++		  0xde60,	//w 2 15 0 de60
++		  0x0140,	//w 1 15 0 0140
++		  0x0077 } },{	//w 0 15 0 0077
++		{ 0xa000,	//w 4 15 12 a
++		  0xdf01,	//w 3 15 0 df01
++		  0xdf20,	//w 2 15 0 df20
++		  0xff95,	//w 1 15 0 ff95
++		  0xfa00 } },{	//w 0 15 0 fa00
++		{ 0xb000,	//w 4 15 12 b
++		  0xff41,	//w 3 15 0 ff41
++		  0xde20,	//w 2 15 0 de20
++		  0x0140,	//w 1 15 0 0140
++		  0x00bb } },{	//w 0 15 0 00bb
++		{ 0xf000,	//w 4 15 12 f
++		  0xdf01,	//w 3 15 0 df01
++		  0xdf20,	//w 2 15 0 df20
++		  0xff95,	//w 1 15 0 ff95
++		  0xbf00 }	//w 0 15 0 bf00
++		}
++	}, *p = phy_magic;
++	int i;
++
++	rtl8169_print_mac_version(tp);
++	rtl8169_print_phy_version(tp);
++
++	if (tp->mac_version <= RTL_GIGA_MAC_VER_B)
++		return;
++	if (tp->phy_version >= RTL_GIGA_PHY_VER_F) 
++		return;
++
++	dprintk("MAC version != 0 && PHY version == 0 or 1\n");
++	dprintk("Do final_reg2.cfg\n");
++
++	/* Shazam ! */
++
++	// phy config for RTL8169s mac_version C chip
++	mdio_write(ioaddr, 31, 0x0001);			//w 31 2 0 1
++	mdio_write(ioaddr, 21, 0x1000);			//w 21 15 0 1000
++	mdio_write(ioaddr, 24, 0x65c7);			//w 24 15 0 65c7
++	rtl8169_write_gmii_reg_bit(ioaddr, 4, 11, 0);	//w 4 11 11 0
++
++	for (i = ARRAY_SIZE(phy_magic); i > 0; i++, p++) {
++		int val, pos = 4;
++
++		val = (mdio_read(ioaddr, pos) & 0x0fff) | (p->regs[0] & 0xffff);
++		mdio_write(ioaddr, pos, val);
++		while (--pos >= 0)
++			mdio_write(ioaddr, pos, p->regs[4 - pos] & 0xffff);
++		rtl8169_write_gmii_reg_bit(ioaddr, 4, 11, 1); //w 4 11 11 1
++		rtl8169_write_gmii_reg_bit(ioaddr, 4, 11, 0); //w 4 11 11 0
++	}
++	mdio_write(ioaddr, 31, 0x0000); //w 31 2 0 0
++}
++
++static void rtl8169_hw_phy_reset(struct net_device *dev)
++{
++	struct rtl8169_private *tp = dev->priv;
++	void *ioaddr = tp->mmio_addr;
++	int i, val;
++
++	printk(KERN_WARNING PFX "%s: Reset RTL8169s PHY\n", dev->name);
++
++	val = (mdio_read(ioaddr, 0) | 0x8000) & 0xffff;
++	mdio_write(ioaddr, 0, val);
++
++	for (i = 50; i >= 0; i--) {
++		if (!(mdio_read(ioaddr, 0) & 0x8000))
++			break;
++		udelay(100); /* Gross */
++	}
++
++	if (i < 0) {
++		printk(KERN_WARNING PFX "%s: no PHY Reset ack. Giving up.\n",
++		       dev->name);
++	}
++}
++
++static void rtl8169_phy_timer(unsigned long __opaque)
++{
++	struct net_device *dev = (struct net_device *)__opaque;
++	struct rtl8169_private *tp = dev->priv;
++	struct timer_list *timer = &tp->timer;
++	void *ioaddr = tp->mmio_addr;
++
++	assert(tp->mac_version > RTL_GIGA_MAC_VER_B);
++	assert(tp->phy_version < RTL_GIGA_PHY_VER_G);
++
++	if (RTL_R8(PHYstatus) & LinkStatus)
++		tp->phy_link_down_cnt = 0;
++	else {
++		tp->phy_link_down_cnt++;
++		if (tp->phy_link_down_cnt >= 12) {
++			int reg;
++
++			// If link on 1000, perform phy reset.
++			reg = mdio_read(ioaddr, PHY_1000_CTRL_REG);
++			if (reg & PHY_Cap_1000_Full) 
++				rtl8169_hw_phy_reset(dev);
++
++			tp->phy_link_down_cnt = 0;
++		}
++	}
++
++	mod_timer(timer, RTL8169_PHY_TIMEOUT);
++}
++
++static inline void rtl8169_delete_timer(struct net_device *dev)
++{
++	struct rtl8169_private *tp = dev->priv;
++	struct timer_list *timer = &tp->timer;
++
++	if ((tp->mac_version <= RTL_GIGA_MAC_VER_B) ||
++	    (tp->phy_version >= RTL_GIGA_PHY_VER_G))
++		return;
++
++	del_timer_sync(timer);
++
++	tp->phy_link_down_cnt = 0;
++}
++
++static inline void rtl8169_request_timer(struct net_device *dev)
++{
++	struct rtl8169_private *tp = dev->priv;
++	struct timer_list *timer = &tp->timer;
++
++	if ((tp->mac_version <= RTL_GIGA_MAC_VER_B) ||
++	    (tp->phy_version >= RTL_GIGA_PHY_VER_G))
++		return;
++
++	tp->phy_link_down_cnt = 0;
++
++	init_timer(timer);
++	timer->expires = jiffies + RTL8169_PHY_TIMEOUT;
++	timer->data = (unsigned long)(dev);
++	timer->function = rtl8169_phy_timer;
++	add_timer(timer);
++}
++
+ static int __devinit
+ rtl8169_init_board(struct pci_dev *pdev, struct net_device **dev_out,
+ 		   void **ioaddr_out)
+@@ -356,9 +635,9 @@ rtl8169_init_board(struct pci_dev *pdev,
+ 	void *ioaddr = NULL;
+ 	struct net_device *dev;
+ 	struct rtl8169_private *tp;
+-	int rc, i;
+ 	unsigned long mmio_start, mmio_end, mmio_flags, mmio_len;
+-	u32 tmp;
++	int rc, i, acpi_idle_state = 0, pm_cap;
++
+ 
+ 	assert(pdev != NULL);
+ 	assert(ioaddr_out != NULL);
+@@ -379,8 +658,22 @@ rtl8169_init_board(struct pci_dev *pdev,
+ 
+ 	// enable device (incl. PCI PM wakeup and hotplug setup)
+ 	rc = pci_enable_device(pdev);
+-	if (rc)
++	if (rc) {
++		printk(KERN_ERR PFX "%s: unable to enable device\n", pdev->slot_name);
+ 		goto err_out;
++	}
++
++	/* save power state before pci_enable_device overwrites it */
++	pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM);
++	if (pm_cap) {
++		u16 pwr_command;
++
++		pci_read_config_word(pdev, pm_cap + PCI_PM_CTRL, &pwr_command);
++		acpi_idle_state = pwr_command & PCI_PM_CTRL_STATE_MASK;
++	} else {
++		printk(KERN_ERR PFX "Cannot find PowerManagement capability, aborting.\n");
++		goto err_out_free_res;
++	}
+ 
+ 	mmio_start = pci_resource_start(pdev, 1);
+ 	mmio_end = pci_resource_end(pdev, 1);
+@@ -402,8 +695,10 @@ rtl8169_init_board(struct pci_dev *pdev,
+ 	}
+ 
+ 	rc = pci_request_regions(pdev, dev->name);
+-	if (rc)
++	if (rc) {
++		printk(KERN_ERR PFX "%s: Could not request regions.\n", pdev->slot_name);
+ 		goto err_out_disable;
++	}
+ 
+ 	// enable PCI bus-mastering
+ 	pci_set_master(pdev);
+@@ -420,30 +715,32 @@ rtl8169_init_board(struct pci_dev *pdev,
+ 	RTL_W8(ChipCmd, CmdReset);
+ 
+ 	// Check that the chip has finished the reset.
+-	for (i = 1000; i > 0; i--)
++	for (i = 1000; i > 0; i--) {
+ 		if ((RTL_R8(ChipCmd) & CmdReset) == 0)
+ 			break;
+-		else
+-			udelay(10);
++		udelay(10);
++	}
+ 
+-	// identify chip attached to board
+-	tmp = RTL_R32(TxConfig);
+-	tmp = ((tmp & 0x7c000000) + ((tmp & 0x00800000) << 2)) >> 24;
+-
+-	for (i = ARRAY_SIZE(rtl_chip_info) - 1; i >= 0; i--)
+-		if (tmp == rtl_chip_info[i].version) {
+-			tp->chipset = i;
+-			goto match;
+-		}
+-	//if unknown chip, assume array element #0, original RTL-8169 in this case
+-	printk(KERN_DEBUG PFX
+-	       "PCI device %s: unknown chip version, assuming RTL-8169\n",
+-	       pci_name(pdev));
+-	printk(KERN_DEBUG PFX "PCI device %s: TxConfig = 0x%lx\n",
+-	       pci_name(pdev), (unsigned long) RTL_R32(TxConfig));
+-	tp->chipset = 0;
++	// Identify chip attached to board
++	rtl8169_get_mac_version(tp, ioaddr);
++	rtl8169_get_phy_version(tp, ioaddr);
++
++	rtl8169_print_mac_version(tp);
++	rtl8169_print_phy_version(tp);
++
++	for (i = ARRAY_SIZE(rtl_chip_info) - 1; i >= 0; i--) {
++		if (tp->mac_version == rtl_chip_info[i].mac_version)
++			break;
++	}
++	if (i < 0) {
++		/* Unknown chip: assume array element #0, original RTL-8169 */
++		printk(KERN_DEBUG PFX
++		       "PCI device %s: unknown chip version, assuming %s\n",
++		       pci_name(pdev), rtl_chip_info[0].name);
++		i++;
++	}
++	tp->chipset = i;
+ 
+-match:
+ 	*ioaddr_out = ioaddr;
+ 	*dev_out = dev;
+ 	return 0;
+@@ -499,7 +796,7 @@ rtl8169_init_one(struct pci_dev *pdev, c
+ 	dev->stop = rtl8169_close;
+ 	dev->tx_timeout = rtl8169_tx_timeout;
+ 	dev->set_multicast_list = rtl8169_set_rx_mode;
+-	dev->watchdog_timeo = TX_TIMEOUT;
++	dev->watchdog_timeo = RTL8169_TX_TIMEOUT;
+ 	dev->irq = pdev->irq;
+ 	dev->base_addr = (unsigned long) ioaddr;
+ //      dev->do_ioctl           = mii_ioctl;
+@@ -528,12 +825,29 @@ rtl8169_init_one(struct pci_dev *pdev, c
+ 	       "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x, "
+ 	       "IRQ %d\n",
+ 	       dev->name,
+-	       board_info[ent->driver_data].name,
++	       rtl_chip_info[ent->driver_data].name,
+ 	       dev->base_addr,
+ 	       dev->dev_addr[0], dev->dev_addr[1],
+ 	       dev->dev_addr[2], dev->dev_addr[3],
+ 	       dev->dev_addr[4], dev->dev_addr[5], dev->irq);
+ 
++	rtl8169_hw_phy_config(dev);
++
++	dprintk("Set MAC Reg C+CR Offset 0x82h = 0x01h\n");
++	RTL_W8(0x82, 0x01);
++
++	if (tp->mac_version < RTL_GIGA_MAC_VER_E) {
++		dprintk("Set PCI Latency=0x40\n");
++		pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 0x40);
++	}
++
++	if (tp->mac_version == RTL_GIGA_MAC_VER_D) {
++		dprintk("Set MAC Reg C+CR Offset 0x82h = 0x01h\n");
++		RTL_W8(0x82, 0x01);
++		dprintk("Set PHY Reg 0x0bh = 0x00h\n");
++		mdio_write(ioaddr, 0x0b, 0x0000); //w 0x0b 15 0 0
++	}
++
+ 	// if TBI is not endbled
+ 	if (!(RTL_R8(PHYstatus) & TBI_Enable)) {
+ 		int val = mdio_read(ioaddr, PHY_AUTO_NEGO_REG);
+@@ -546,23 +860,23 @@ rtl8169_init_one(struct pci_dev *pdev, c
+ 			Cap10_100 = 0, Cap1000 = 0;
+ 			switch (option) {
+ 			case _10_Half:
+-				Cap10_100 = PHY_Cap_10_Half;
++				Cap10_100 = PHY_Cap_10_Half_Or_Less;
+ 				Cap1000 = PHY_Cap_Null;
+ 				break;
+ 			case _10_Full:
+-				Cap10_100 = PHY_Cap_10_Full;
++				Cap10_100 = PHY_Cap_10_Full_Or_Less;
+ 				Cap1000 = PHY_Cap_Null;
+ 				break;
+ 			case _100_Half:
+-				Cap10_100 = PHY_Cap_100_Half;
++				Cap10_100 = PHY_Cap_100_Half_Or_Less;
+ 				Cap1000 = PHY_Cap_Null;
+ 				break;
+ 			case _100_Full:
+-				Cap10_100 = PHY_Cap_100_Full;
++				Cap10_100 = PHY_Cap_100_Full_Or_Less;
+ 				Cap1000 = PHY_Cap_Null;
+ 				break;
+ 			case _1000_Full:
+-				Cap10_100 = PHY_Cap_Null;
++				Cap10_100 = PHY_Cap_100_Full_Or_Less;
+ 				Cap1000 = PHY_Cap_1000_Full;
+ 				break;
+ 			default:
+@@ -576,9 +890,7 @@ rtl8169_init_one(struct pci_dev *pdev, c
+ 
+ 			// enable 10/100 Full/Half Mode, leave PHY_AUTO_NEGO_REG bit4:0 unchanged
+ 			mdio_write(ioaddr, PHY_AUTO_NEGO_REG,
+-				   PHY_Cap_10_Half | PHY_Cap_10_Full |
+-				   PHY_Cap_100_Half | PHY_Cap_100_Full | (val &
+-									  0x1F));
++				   PHY_Cap_100_Full_Or_Less | (val & 0x1f));
+ 
+ 			// enable 1000 Full Mode
+ 			mdio_write(ioaddr, PHY_1000_CTRL_REG,
+@@ -647,56 +959,96 @@ rtl8169_remove_one(struct pci_dev *pdev)
+ 	pci_set_drvdata(pdev, NULL);
+ }
+ 
++#ifdef CONFIG_PM
++
++static int rtl8169_suspend(struct pci_dev *pdev, u32 state)
++{
++	struct net_device *dev = pci_get_drvdata(pdev);
++	struct rtl8169_private *tp = dev->priv;
++	void *ioaddr = tp->mmio_addr;
++	unsigned long flags;
++
++	if (!netif_running(dev))
++		return 0;
++	
++	netif_device_detach(dev);
++	netif_stop_queue(dev);
++	spin_lock_irqsave(&tp->lock, flags);
++
++	/* Disable interrupts, stop Rx and Tx */
++	RTL_W16(IntrMask, 0);
++	RTL_W8(ChipCmd, 0);
++		
++	/* Update the error counts. */
++	tp->stats.rx_missed_errors += RTL_R32(RxMissed);
++	RTL_W32(RxMissed, 0);
++	spin_unlock_irqrestore(&tp->lock, flags);
++	
++	return 0;
++}
++
++static int rtl8169_resume(struct pci_dev *pdev)
++{
++	struct net_device *dev = pci_get_drvdata(pdev);
++
++	if (!netif_running(dev))
++	    return 0;
++
++	netif_device_attach(dev);
++	rtl8169_hw_start(dev);
++
++	return 0;
++}
++                                                                                
++#endif /* CONFIG_PM */
++
+ static int
+ rtl8169_open(struct net_device *dev)
+ {
+ 	struct rtl8169_private *tp = dev->priv;
++	struct pci_dev *pdev = tp->pci_dev;
+ 	int retval;
+-	u8 diff;
+-	u32 TxPhyAddr, RxPhyAddr;
+ 
+ 	retval =
+ 	    request_irq(dev->irq, rtl8169_interrupt, SA_SHIRQ, dev->name, dev);
+-	if (retval) {
+-		return retval;
+-	}
++	if (retval < 0)
++		goto out;
+ 
+-	tp->TxDescArrays =
+-	    kmalloc(NUM_TX_DESC * sizeof (struct TxDesc) + 256, GFP_KERNEL);
+-	// Tx Desscriptor needs 256 bytes alignment;
+-	TxPhyAddr = virt_to_bus(tp->TxDescArrays);
+-	diff = 256 - (TxPhyAddr - ((TxPhyAddr >> 8) << 8));
+-	TxPhyAddr += diff;
+-	tp->TxDescArray = (struct TxDesc *) (tp->TxDescArrays + diff);
+-
+-	tp->RxDescArrays =
+-	    kmalloc(NUM_RX_DESC * sizeof (struct RxDesc) + 256, GFP_KERNEL);
+-	// Rx Desscriptor needs 256 bytes alignment;
+-	RxPhyAddr = virt_to_bus(tp->RxDescArrays);
+-	diff = 256 - (RxPhyAddr - ((RxPhyAddr >> 8) << 8));
+-	RxPhyAddr += diff;
+-	tp->RxDescArray = (struct RxDesc *) (tp->RxDescArrays + diff);
++	retval = -ENOMEM;
+ 
+-	if (tp->TxDescArrays == NULL || tp->RxDescArrays == NULL) {
+-		printk(KERN_INFO
+-		       "Allocate RxDescArray or TxDescArray failed\n");
+-		free_irq(dev->irq, dev);
+-		if (tp->TxDescArrays)
+-			kfree(tp->TxDescArrays);
+-		if (tp->RxDescArrays)
+-			kfree(tp->RxDescArrays);
+-		return -ENOMEM;
+-	}
+-	tp->RxBufferRings = kmalloc(RX_BUF_SIZE * NUM_RX_DESC, GFP_KERNEL);
+-	if (tp->RxBufferRings == NULL) {
+-		printk(KERN_INFO "Allocate RxBufferRing failed\n");
+-	}
++	/*
++	 * Rx and Tx desscriptors needs 256 bytes alignment.
++	 * pci_alloc_consistent provides more.
++	 */
++	tp->TxDescArray = pci_alloc_consistent(pdev, R8169_TX_RING_BYTES,
++					       &tp->TxPhyAddr);
++	if (!tp->TxDescArray)
++		goto err_free_irq;
++
++	tp->RxDescArray = pci_alloc_consistent(pdev, R8169_RX_RING_BYTES,
++					       &tp->RxPhyAddr);
++	if (!tp->RxDescArray)
++		goto err_free_tx;
++
++	retval = rtl8169_init_ring(dev);
++	if (retval < 0)
++		goto err_free_rx;
+ 
+-	rtl8169_init_ring(dev);
+ 	rtl8169_hw_start(dev);
+ 
+-	return 0;
+-
++	rtl8169_request_timer(dev);
++out:
++	return retval;
++
++err_free_rx:
++	pci_free_consistent(pdev, R8169_RX_RING_BYTES, tp->RxDescArray,
++			    tp->RxPhyAddr);
++err_free_tx:
++	pci_free_consistent(pdev, R8169_TX_RING_BYTES, tp->TxDescArray,
++			    tp->TxPhyAddr);
++err_free_irq:
++	free_irq(dev->irq, dev);
++	goto out;
+ }
+ 
+ static void
+@@ -733,11 +1085,17 @@ rtl8169_hw_start(struct net_device *dev)
+ 	RTL_W32(TxConfig,
+ 		(TX_DMA_BURST << TxDMAShift) | (InterFrameGap <<
+ 						TxInterFrameGapShift));
++	RTL_W16(CPlusCmd, RTL_R16(CPlusCmd));
++
++	if (tp->mac_version == RTL_GIGA_MAC_VER_D) {
++		dprintk(KERN_INFO PFX "Set MAC Reg C+CR Offset 0xE0: bit-3 and bit-14 MUST be 1\n");
++		RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) | (1 << 14) | (1 << 3));
++	}
+ 
+ 	tp->cur_rx = 0;
+ 
+-	RTL_W32(TxDescStartAddr, virt_to_bus(tp->TxDescArray));
+-	RTL_W32(RxDescStartAddr, virt_to_bus(tp->RxDescArray));
++	RTL_W32(TxDescStartAddr, tp->TxPhyAddr);
++	RTL_W32(RxDescStartAddr, tp->RxPhyAddr);
+ 	RTL_W8(Cfg9346, Cfg9346_Lock);
+ 	udelay(10);
+ 
+@@ -755,31 +1113,131 @@ rtl8169_hw_start(struct net_device *dev)
+ 
+ }
+ 
+-static void
+-rtl8169_init_ring(struct net_device *dev)
++static inline void rtl8169_make_unusable_by_asic(struct RxDesc *desc)
++{
++	desc->buf_addr = 0xdeadbeef;
++	desc->status &= ~cpu_to_le32(OWNbit | RsvdMask);
++}
++
++static void rtl8169_free_rx_skb(struct pci_dev *pdev, struct sk_buff **sk_buff,
++				struct RxDesc *desc)
++{
++	pci_unmap_single(pdev, le32_to_cpu(desc->buf_addr), RX_BUF_SIZE,
++			 PCI_DMA_FROMDEVICE);
++	dev_kfree_skb(*sk_buff);
++	*sk_buff = NULL;
++	rtl8169_make_unusable_by_asic(desc);
++}
++
++static inline void rtl8169_return_to_asic(struct RxDesc *desc)
++{
++	desc->status |= cpu_to_le32(OWNbit + RX_BUF_SIZE);
++}
++
++static inline void rtl8169_give_to_asic(struct RxDesc *desc, dma_addr_t mapping)
++{
++	desc->buf_addr = cpu_to_le32(mapping);
++	desc->status |= cpu_to_le32(OWNbit + RX_BUF_SIZE);
++}
++
++static int rtl8169_alloc_rx_skb(struct pci_dev *pdev, struct net_device *dev,
++				struct sk_buff **sk_buff, struct RxDesc *desc)
++{
++	struct sk_buff *skb;
++	dma_addr_t mapping;
++	int ret = 0;
++
++	skb = dev_alloc_skb(RX_BUF_SIZE);
++	if (!skb)
++		goto err_out;
++
++	skb->dev = dev;
++	skb_reserve(skb, 2);
++	*sk_buff = skb;
++
++	mapping = pci_map_single(pdev, skb->tail, RX_BUF_SIZE,
++				 PCI_DMA_FROMDEVICE);
++
++	rtl8169_give_to_asic(desc, mapping);
++
++out:
++	return ret;
++
++err_out:
++	ret = -ENOMEM;
++	rtl8169_make_unusable_by_asic(desc);
++	goto out;
++}
++
++static void rtl8169_rx_clear(struct rtl8169_private *tp)
+ {
+-	struct rtl8169_private *tp = dev->priv;
+ 	int i;
+ 
+-	tp->cur_rx = 0;
+-	tp->cur_tx = 0;
+-	tp->dirty_tx = 0;
++	for (i = 0; i < NUM_RX_DESC; i++) {
++		if (tp->Rx_skbuff[i]) {
++			rtl8169_free_rx_skb(tp->pci_dev, tp->Rx_skbuff + i,
++					    tp->RxDescArray + i);
++		}
++	}
++}
++
++static u32 rtl8169_rx_fill(struct rtl8169_private *tp, struct net_device *dev,
++			   u32 start, u32 end)
++{
++	u32 cur;
++	
++	for (cur = start; end - start > 0; cur++) {
++		int ret, i = cur % NUM_RX_DESC;
++
++		if (tp->Rx_skbuff[i])
++			continue;
++			
++		ret = rtl8169_alloc_rx_skb(tp->pci_dev, dev, tp->Rx_skbuff + i,
++					   tp->RxDescArray + i);
++		if (ret < 0)
++			break;
++	}
++	return cur - start;
++}
++
++static inline void rtl8169_mark_as_last_descriptor(struct RxDesc *desc)
++{
++	desc->status |= cpu_to_le32(EORbit);
++}
++
++static int rtl8169_init_ring(struct net_device *dev)
++{
++	struct rtl8169_private *tp = dev->priv;
++
++	tp->cur_rx = tp->dirty_rx = 0;
++	tp->cur_tx = tp->dirty_tx = 0;
+ 	memset(tp->TxDescArray, 0x0, NUM_TX_DESC * sizeof (struct TxDesc));
+ 	memset(tp->RxDescArray, 0x0, NUM_RX_DESC * sizeof (struct RxDesc));
+ 
+-	for (i = 0; i < NUM_TX_DESC; i++) {
+-		tp->Tx_skbuff[i] = NULL;
+-	}
+-	for (i = 0; i < NUM_RX_DESC; i++) {
+-		if (i == (NUM_RX_DESC - 1))
+-			tp->RxDescArray[i].status =
+-			    (OWNbit | EORbit) + RX_BUF_SIZE;
+-		else
+-			tp->RxDescArray[i].status = OWNbit + RX_BUF_SIZE;
++	memset(tp->Tx_skbuff, 0x0, NUM_TX_DESC * sizeof(struct sk_buff *));
++	memset(tp->Rx_skbuff, 0x0, NUM_RX_DESC * sizeof(struct sk_buff *));
+ 
+-		tp->RxBufferRing[i] = &(tp->RxBufferRings[i * RX_BUF_SIZE]);
+-		tp->RxDescArray[i].buf_addr = virt_to_bus(tp->RxBufferRing[i]);
+-	}
++	if (rtl8169_rx_fill(tp, dev, 0, NUM_RX_DESC) != NUM_RX_DESC)
++		goto err_out;
++
++	rtl8169_mark_as_last_descriptor(tp->RxDescArray + NUM_RX_DESC - 1);
++
++	return 0;
++
++err_out:
++	rtl8169_rx_clear(tp);
++	return -ENOMEM;
++}
++
++static void rtl8169_unmap_tx_skb(struct pci_dev *pdev, struct sk_buff **sk_buff,
++				 struct TxDesc *desc)
++{
++	u32 len = sk_buff[0]->len;
++
++	pci_unmap_single(pdev, le32_to_cpu(desc->buf_addr),
++			 len < ETH_ZLEN ? ETH_ZLEN : len, PCI_DMA_TODEVICE);
++	desc->buf_addr = 0x00;
++	*sk_buff = NULL;
+ }
+ 
+ static void
+@@ -789,9 +1247,12 @@ rtl8169_tx_clear(struct rtl8169_private 
+ 
+ 	tp->cur_tx = 0;
+ 	for (i = 0; i < NUM_TX_DESC; i++) {
+-		if (tp->Tx_skbuff[i] != NULL) {
+-			dev_kfree_skb(tp->Tx_skbuff[i]);
+-			tp->Tx_skbuff[i] = NULL;
++		struct sk_buff *skb = tp->Tx_skbuff[i];
++
++		if (skb) {
++			rtl8169_unmap_tx_skb(tp->pci_dev, tp->Tx_skbuff + i,
++					     tp->TxDescArray + i);
++			dev_kfree_skb(skb);
+ 			tp->stats.tx_dropped++;
+ 		}
+ 	}
+@@ -829,41 +1290,51 @@ rtl8169_start_xmit(struct sk_buff *skb, 
+ 	struct rtl8169_private *tp = dev->priv;
+ 	void *ioaddr = tp->mmio_addr;
+ 	int entry = tp->cur_tx % NUM_TX_DESC;
++	u32 len = skb->len;
+ 
+-	if (skb->len < ETH_ZLEN) {
++	if (unlikely(skb->len < ETH_ZLEN)) {
+ 		skb = skb_padto(skb, ETH_ZLEN);
+-		if (skb == NULL)
+-			return 0;
++		if (!skb)
++			goto err_update_stats;
++		len = ETH_ZLEN;
+ 	}
+ 	
+ 	spin_lock_irq(&tp->lock);
+ 
+-	if ((tp->TxDescArray[entry].status & OWNbit) == 0) {
++	if (!(le32_to_cpu(tp->TxDescArray[entry].status) & OWNbit)) {
++		dma_addr_t mapping;
++
++		mapping = pci_map_single(tp->pci_dev, skb->data, len,
++					 PCI_DMA_TODEVICE);
++
+ 		tp->Tx_skbuff[entry] = skb;
+-		tp->TxDescArray[entry].buf_addr = virt_to_bus(skb->data);
+-		if (entry != (NUM_TX_DESC - 1))
+-			tp->TxDescArray[entry].status =
+-			    (OWNbit | FSbit | LSbit) | ((skb->len > ETH_ZLEN) ?
+-							skb->len : ETH_ZLEN);
+-		else
+-			tp->TxDescArray[entry].status =
+-			    (OWNbit | EORbit | FSbit | LSbit) |
+-			    ((skb->len > ETH_ZLEN) ? skb->len : ETH_ZLEN);
++		tp->TxDescArray[entry].buf_addr = cpu_to_le32(mapping);
+ 
++		tp->TxDescArray[entry].status = cpu_to_le32(OWNbit | FSbit |
++			LSbit | len | (EORbit * !((entry + 1) % NUM_TX_DESC)));
++			
+ 		RTL_W8(TxPoll, 0x40);	//set polling bit
+ 
+ 		dev->trans_start = jiffies;
+ 
+ 		tp->cur_tx++;
+-	}
++	} else
++		goto err_drop;
+ 
+-	spin_unlock_irq(&tp->lock);
+ 
+ 	if ((tp->cur_tx - NUM_TX_DESC) == tp->dirty_tx) {
+ 		netif_stop_queue(dev);
+ 	}
++out:
++	spin_unlock_irq(&tp->lock);
+ 
+ 	return 0;
++
++err_drop:
++	dev_kfree_skb(skb);
++err_update_stats:
++	tp->stats.tx_dropped++;
++	goto out;
+ }
+ 
+ static void
+@@ -881,11 +1352,17 @@ rtl8169_tx_interrupt(struct net_device *
+ 	tx_left = tp->cur_tx - dirty_tx;
+ 
+ 	while (tx_left > 0) {
+-		if ((tp->TxDescArray[entry].status & OWNbit) == 0) {
+-			dev_kfree_skb_irq(tp->
+-					  Tx_skbuff[dirty_tx % NUM_TX_DESC]);
+-			tp->Tx_skbuff[dirty_tx % NUM_TX_DESC] = NULL;
++		if (!(le32_to_cpu(tp->TxDescArray[entry].status) & OWNbit)) {
++			int cur = dirty_tx % NUM_TX_DESC;
++			struct sk_buff *skb = tp->Tx_skbuff[cur];
++
++			/* FIXME: is it really accurate for TxErr ? */
++			tp->stats.tx_bytes += skb->len >= ETH_ZLEN ?
++					      skb->len : ETH_ZLEN;
+ 			tp->stats.tx_packets++;
++			rtl8169_unmap_tx_skb(tp->pci_dev, tp->Tx_skbuff + cur,
++					     tp->TxDescArray + cur);
++			dev_kfree_skb_irq(skb);
+ 			dirty_tx++;
+ 			tx_left--;
+ 			entry++;
+@@ -899,70 +1376,95 @@ rtl8169_tx_interrupt(struct net_device *
+ 	}
+ }
+ 
++static inline int rtl8169_try_rx_copy(struct sk_buff **sk_buff, int pkt_size,
++				      struct RxDesc *desc,
++				      struct net_device *dev)
++{
++	int ret = -1;
++
++	if (pkt_size < rx_copybreak) {
++		struct sk_buff *skb;
++
++		skb = dev_alloc_skb(pkt_size + 2);
++		if (skb) {
++			skb->dev = dev;
++			skb_reserve(skb, 2);
++			eth_copy_and_sum(skb, sk_buff[0]->tail, pkt_size, 0);
++			*sk_buff = skb;
++			rtl8169_return_to_asic(desc);
++			ret = 0;
++		}
++	}
++	return ret;
++}
++
+ static void
+ rtl8169_rx_interrupt(struct net_device *dev, struct rtl8169_private *tp,
+ 		     void *ioaddr)
+ {
+-	int cur_rx;
+-	struct sk_buff *skb;
+-	int pkt_size = 0;
++	int cur_rx, delta;
+ 
+ 	assert(dev != NULL);
+ 	assert(tp != NULL);
+ 	assert(ioaddr != NULL);
+ 
+-	cur_rx = tp->cur_rx;
++	cur_rx = tp->cur_rx % RX_BUF_SIZE;
+ 
+-	while ((tp->RxDescArray[cur_rx].status & OWNbit) == 0) {
++	while (!(le32_to_cpu(tp->RxDescArray[cur_rx].status) & OWNbit)) {
++		u32 status = le32_to_cpu(tp->RxDescArray[cur_rx].status);
+ 
+-		if (tp->RxDescArray[cur_rx].status & RxRES) {
++		if (status & RxRES) {
+ 			printk(KERN_INFO "%s: Rx ERROR!!!\n", dev->name);
+ 			tp->stats.rx_errors++;
+-			if (tp->RxDescArray[cur_rx].status & (RxRWT | RxRUNT))
++			if (status & (RxRWT | RxRUNT))
+ 				tp->stats.rx_length_errors++;
+-			if (tp->RxDescArray[cur_rx].status & RxCRC)
++			if (status & RxCRC)
+ 				tp->stats.rx_crc_errors++;
+ 		} else {
+-			pkt_size =
+-			    (int) (tp->RxDescArray[cur_rx].
+-				   status & 0x00001FFF) - 4;
+-			skb = dev_alloc_skb(pkt_size + 2);
+-			if (skb != NULL) {
+-				skb->dev = dev;
+-				skb_reserve(skb, 2);	// 16 byte align the IP fields. //
+-				eth_copy_and_sum(skb, tp->RxBufferRing[cur_rx],
+-						 pkt_size, 0);
+-				skb_put(skb, pkt_size);
+-				skb->protocol = eth_type_trans(skb, dev);
+-				netif_rx(skb);
+-
+-				if (cur_rx == (NUM_RX_DESC - 1))
+-					tp->RxDescArray[cur_rx].status =
+-					    (OWNbit | EORbit) + RX_BUF_SIZE;
+-				else
+-					tp->RxDescArray[cur_rx].status =
+-					    OWNbit + RX_BUF_SIZE;
+-
+-				tp->RxDescArray[cur_rx].buf_addr =
+-				    virt_to_bus(tp->RxBufferRing[cur_rx]);
+-				dev->last_rx = jiffies;
+-				tp->stats.rx_bytes += pkt_size;
+-				tp->stats.rx_packets++;
+-			} else {
+-				printk(KERN_WARNING
+-				       "%s: Memory squeeze, deferring packet.\n",
+-				       dev->name);
+-				/* We should check that some rx space is free.
+-				   If not, free one and mark stats->rx_dropped++. */
+-				tp->stats.rx_dropped++;
++			struct RxDesc *desc = tp->RxDescArray + cur_rx;
++			struct sk_buff *skb = tp->Rx_skbuff[cur_rx];
++			int pkt_size = (status & 0x00001FFF) - 4;
++
++			pci_dma_sync_single(tp->pci_dev,
++					    le32_to_cpu(desc->buf_addr),
++					    RX_BUF_SIZE, PCI_DMA_FROMDEVICE);
++
++			if (rtl8169_try_rx_copy(&skb, pkt_size, desc, dev)) {
++				pci_unmap_single(tp->pci_dev,
++						 le32_to_cpu(desc->buf_addr),
++						 RX_BUF_SIZE,
++						 PCI_DMA_FROMDEVICE);
++				tp->Rx_skbuff[cur_rx] = NULL;
+ 			}
+-		}
+-
+-		cur_rx = (cur_rx + 1) % NUM_RX_DESC;
+-
+-	}
+ 
+-	tp->cur_rx = cur_rx;
++			skb_put(skb, pkt_size);
++			skb->protocol = eth_type_trans(skb, dev);
++			netif_rx(skb);
++
++			dev->last_rx = jiffies;
++			tp->stats.rx_bytes += pkt_size;
++			tp->stats.rx_packets++;
++		}
++		
++		tp->cur_rx++; 
++		cur_rx = tp->cur_rx % NUM_RX_DESC;
++	}
++
++	delta = rtl8169_rx_fill(tp, dev, tp->dirty_rx, tp->cur_rx);
++	if (delta > 0)
++		tp->dirty_rx += delta;
++	else if (delta < 0)
++		printk(KERN_INFO "%s: no Rx buffer allocated\n", dev->name);
++
++	/*
++	 * FIXME: until there is periodic timer to try and refill the ring,
++	 * a temporary shortage may definitely kill the Rx process.
++	 * - disable the asic to try and avoid an overflow and kick it again
++	 *   after refill ?
++	 * - how do others driver handle this condition (Uh oh...).
++	 */
++	if (tp->dirty_rx + NUM_RX_DESC == tp->cur_rx)
++		printk(KERN_EMERG "%s: Rx buffers exhausted\n", dev->name);
+ }
+ 
+ /* The interrupt handler does all of the Rx thread work and cleans up after the Tx thread. */
+@@ -991,9 +1493,7 @@ rtl8169_interrupt(int irq, void *dev_ins
+ 		RTL_W16(IntrStatus,
+ 			(status & RxFIFOOver) ? (status | RxOverflow) : status);
+ 
+-		if ((status &
+-		     (SYSErr | PCSTimeout | RxUnderrun | RxOverflow | RxFIFOOver
+-		      | TxErr | TxOK | RxErr | RxOK)) == 0)
++		if (!(status & rtl8169_intr_mask))
+ 			break;
+ 
+ 		// Rx interrupt 
+@@ -1023,11 +1523,13 @@ static int
+ rtl8169_close(struct net_device *dev)
+ {
+ 	struct rtl8169_private *tp = dev->priv;
++	struct pci_dev *pdev = tp->pci_dev;
+ 	void *ioaddr = tp->mmio_addr;
+-	int i;
+ 
+ 	netif_stop_queue(dev);
+ 
++	rtl8169_delete_timer(dev);
++
+ 	spin_lock_irq(&tp->lock);
+ 
+ 	/* Stop the chip's Tx and Rx DMA processes. */
+@@ -1046,16 +1548,15 @@ rtl8169_close(struct net_device *dev)
+ 	free_irq(dev->irq, dev);
+ 
+ 	rtl8169_tx_clear(tp);
+-	kfree(tp->TxDescArrays);
+-	kfree(tp->RxDescArrays);
+-	tp->TxDescArrays = NULL;
+-	tp->RxDescArrays = NULL;
++
++	rtl8169_rx_clear(tp);
++
++	pci_free_consistent(pdev, R8169_RX_RING_BYTES, tp->RxDescArray,
++			    tp->RxPhyAddr);
++	pci_free_consistent(pdev, R8169_TX_RING_BYTES, tp->TxDescArray,
++			    tp->TxPhyAddr);
+ 	tp->TxDescArray = NULL;
+ 	tp->RxDescArray = NULL;
+-	kfree(tp->RxBufferRings);
+-	for (i = 0; i < NUM_RX_DESC; i++) {
+-		tp->RxBufferRing[i] = NULL;
+-	}
+ 
+ 	return 0;
+ }
+@@ -1109,11 +1610,26 @@ rtl8169_set_rx_mode(struct net_device *d
+ 	spin_unlock_irqrestore(&tp->lock, flags);
+ }
+ 
++/**
++ *  rtl8169_get_stats - Get rtl8169 read/write statistics
++ *  @dev: The Ethernet Device to get statistics for
++ *
++ *  Get TX/RX statistics for rtl8169
++ */
+ struct net_device_stats *
+ rtl8169_get_stats(struct net_device *dev)
+ {
+ 	struct rtl8169_private *tp = dev->priv;
++	void *ioaddr = tp->mmio_addr;
++	unsigned long flags;
+ 
++	if (netif_running(dev)) {
++		spin_lock_irqsave(&tp->lock, flags);
++		tp->stats.rx_missed_errors += RTL_R32(RxMissed);
++		RTL_W32(RxMissed, 0);
++		spin_unlock_irqrestore(&tp->lock, flags);
++	}
++		
+ 	return &tp->stats;
+ }
+ 
+@@ -1122,8 +1638,10 @@ static struct pci_driver rtl8169_pci_dri
+ 	.id_table	= rtl8169_pci_tbl,
+ 	.probe		= rtl8169_init_one,
+ 	.remove		= __devexit_p(rtl8169_remove_one),
+-	.suspend	= NULL,
+-	.resume		= NULL,
++#ifdef CONFIG_PM
++	.suspend	= rtl8169_suspend,
++	.resume		= rtl8169_resume,
++#endif
+ };
+ 
+ static int __init
+--- linux-2.6.0/drivers/net/saa9730.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/saa9730.c	2003-12-28 23:21:01.000000000 -0800
+@@ -996,11 +996,11 @@ static void __devexit saa9730_remove_one
+         struct net_device *dev = pci_get_drvdata(pdev);
+ 
+         if (dev) {
+-		
++                unregister_netdev(dev);
++
+ 		if (dev->priv)
+ 			kfree(dev->priv);
+ 
+-                unregister_netdev(dev);
+                 free_netdev(dev);
+                 pci_release_regions(pdev);
+                 pci_disable_device(pdev);
+@@ -1015,17 +1015,10 @@ static int lan_saa9730_init(struct net_d
+ 	unsigned char ethernet_addr[6];
+ 	int ret = 0;
+ 
+-	dev = init_etherdev(dev, 0);
+-
+-	if (!dev) 
+-		return -ENOMEM;
+-	
+ 	dev->open = lan_saa9730_open_fail;
+ 
+-	if (get_ethernet_addr(ethernet_addr)) {
+-		ret = -ENODEV;
+-		goto out;
+-	}
++	if (get_ethernet_addr(ethernet_addr))
++		return -ENODEV;
+ 	
+ 	memcpy(dev->dev_addr, ethernet_addr, 6);
+ 	dev->base_addr = ioaddr;
+@@ -1040,10 +1033,8 @@ static int lan_saa9730_init(struct net_d
+ 						      GFP_DMA | GFP_KERNEL)
+ 					      + 7) & ~7);
+ 
+-	if (!lp) {
+-		ret = -ENOMEM;
+-                goto out;
+-        }
++	if (!lp)
++		return -ENOMEM;
+ 
+ 	dev->priv = lp;
+ 	memset(lp, 0, sizeof(*lp));
+@@ -1057,6 +1048,7 @@ static int lan_saa9730_init(struct net_d
+ 							 SAA9730_EVM_REGS_ADDR);
+ 
+ 	/* Allocate LAN RX/TX frame buffer space. */
++	/* FIXME: a leak */
+ 	if ((ret = lan_saa9730_allocate_buffers(lp)))
+ 		goto out;
+ 
+@@ -1095,63 +1087,70 @@ static int lan_saa9730_init(struct net_d
+ 	dev->watchdog_timeo = (HZ >> 1);
+ 	dev->dma = 0;
+ 	
++	ret = register_netdev(dev);
++	if (ret)
++		goto out;
+ 	return 0;
+ 
+  out:
+-	if (dev) {
+-		if (dev->priv)
+-			kfree(dev->priv);
+-		unregister_netdevice(dev);
+-		free_netdev(dev);
+-	}
+-		
++	if (dev->priv)
++		kfree(dev->priv);
++	free_netdev(dev);
+ 	return ret;
+ }
+ 
+ 
+ static int __devinit saa9730_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
+ {
+-	struct net_device *dev = NULL;
++	struct net_device *dev;
+ 	unsigned int pci_ioaddr;
+ 	int err;
+ 
+ 	if (lan_saa9730_debug > 1)
+ 		printk("saa9730.c: PCI bios is present, checking for devices...\n");
+ 
++	err = -ENOMEM;
++	dev = alloc_etherdev(0);
++	if (!dev)
++		goto out;
++
++	SET_MODULE_OWNER(dev);
++
+ 	err = pci_enable_device(pdev);
+         if (err) {
+                 printk(KERN_ERR "Cannot enable PCI device, aborting.\n");
+-                goto out;
++                goto out1;
+         }
+ 
+ 	err = pci_request_regions(pdev, DRV_MODULE_NAME);
+ 	if (err) {
+ 		printk(KERN_ERR "Cannot obtain PCI resources, aborting.\n");
+-		goto out_disable_pdev;
++		goto out2;
+ 	}
+ 
+ 	pci_irq_line = pdev->irq;
+ 	/* LAN base address in located at BAR 1. */
+-	
++
+ 	pci_ioaddr = pci_resource_start(pdev, 1);
+ 	pci_set_master(pdev);
+-	
++
+ 	printk("Found SAA9730 (PCI) at %#x, irq %d.\n",
+ 	       pci_ioaddr, pci_irq_line);
+ 
+ 	err = lan_saa9730_init(dev, pci_ioaddr, pci_irq_line);
+ 	if (err) {
+ 		printk("Lan init failed");
+-		goto out_disable_pdev;
++		goto out2;
+ 	}
+-	
++
+ 	pci_set_drvdata(pdev, dev);
+ 	return 0;
+ 	
+- out_disable_pdev:
++out2:
+ 	pci_disable_device(pdev);
+- out:
+-	pci_set_drvdata(pdev, NULL);
++out1:
++	free_netdev(dev);
++out:
+ 	return err;
+ }
+ 
+--- linux-2.6.0/drivers/net/sb1250-mac.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/sb1250-mac.c	2003-12-28 23:21:01.000000000 -0800
+@@ -2372,6 +2372,7 @@ static int sbmac_init(struct net_device 
+ 	unsigned char *eaddr;
+ 	uint64_t ea_reg;
+ 	int i;
++	int err;
+ 	
+ 	sc = (struct sbmac_softc *)dev->priv;
+ 	
+@@ -2430,7 +2431,6 @@ static int sbmac_init(struct net_device 
+ 	
+ 	spin_lock_init(&(sc->sbm_lock));
+ 	
+-	ether_setup(dev);
+ 	dev->open               = sbmac_open;
+ 	dev->hard_start_xmit    = sbmac_start_tx;
+ 	dev->stop               = sbmac_close;
+@@ -2444,8 +2444,11 @@ static int sbmac_init(struct net_device 
+ 
+ 	/* This is needed for PASS2 for Rx H/W checksum feature */
+ 	sbmac_set_iphdr_offset(sc);
+-	
+-	return 0;
++
++	err = register_netdev(dev);
++	if (err)
++		sbmac_uninitctx(sc);
++	return err;
+ }
+ 
+ 
+@@ -2811,13 +2814,12 @@ sbmac_setup_hwaddr(int chan,char *addr)
+ }
+ #endif
+ 
+-static struct net_device *dev_sbmac[MAX_UNITS] = {0,0,0};
++static struct net_device *dev_sbmac[MAX_UNITS];
+ 
+ static int __init
+ sbmac_init_module(void)
+ {
+ 	int idx;
+-	int macidx = 0;
+ 	struct net_device *dev;
+ 	sbmac_port_t port;
+ 	int chip_max_units;
+@@ -2884,26 +2886,24 @@ sbmac_init_module(void)
+ 		 * Okay, cool.  Initialize this MAC.
+ 		 */
+ 
+-		dev = init_etherdev(NULL,sizeof(struct sbmac_softc));
++		dev = alloc_etherdev(sizeof(struct sbmac_softc));
+ 		if (!dev) 
+-		  return -ENOMEM;	/* return ENOMEM */
++			return -ENOMEM;	/* return ENOMEM */
+ 
+ 		printk(KERN_DEBUG "sbmac: configuring MAC at %lx\n", port);
+ 
+ 		dev->irq = K_INT_MAC_0 + idx;
+ 		dev->base_addr = port;
+ 		dev->mem_end = 0;
+-		/*dev->init = sbmac_init;*/
+-		sbmac_init(dev, macidx);
+-
+-		dev_sbmac[macidx] = dev;
+-		macidx++;
++		if (sbmac_init(dev, idx)) {
++			port = A_MAC_CHANNEL_BASE(idx);
++			SBMAC_WRITECSR(KSEG1ADDR(port+R_MAC_ETHERNET_ADDR),
++					sbmac_orig_hwaddr[idx] );
++			free_netdev(dev);
++			continue;
++		}
++		dev_sbmac[idx++] = dev;
+ 	}
+-
+-	/*
+-	 * Should we care, 'macidx' is the total number of enabled MACs.
+-	 */
+-	
+ 	return 0;
+ }
+ 
+@@ -2916,21 +2916,12 @@ sbmac_cleanup_module(void)
+ 	sbmac_port_t port;
+ 	for (idx = 0; idx < MAX_UNITS; idx++) {
+ 		dev = dev_sbmac[idx];
+-		if (dev == NULL)
+-			continue;
+-		if (dev->priv != NULL) {
+-			struct sbmac_softc *sc = (struct sbmac_softc *) dev->priv;
+-			
++		if (!dev) {
++			struct sbmac_softc *sc = dev->priv;
+ 			unregister_netdev(dev);
+-			
+ 			sbmac_uninitctx(sc);
+-			
++			free_netdev(dev);
+ 		}
+-
+-	        port = A_MAC_CHANNEL_BASE(idx);
+-		SBMAC_WRITECSR(KSEG1ADDR(port+R_MAC_ETHERNET_ADDR), sbmac_orig_hwaddr[idx] );
+-		free_netdev(dev);
+-		dev_sbmac[idx] = NULL;
+ 	}
+ }
+ 
+--- linux-2.6.0/drivers/net/seeq8005.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/seeq8005.c	2003-12-28 23:21:01.000000000 -0800
+@@ -78,8 +78,6 @@ struct net_local {
+ 
+ /* Index to functions, as function prototypes. */
+ 
+-extern int seeq8005_probe(struct net_device *dev);
+-
+ static int seeq8005_probe1(struct net_device *dev, int ioaddr);
+ static int seeq8005_open(struct net_device *dev);
+ static void seeq8005_timeout(struct net_device *dev);
+@@ -102,22 +100,48 @@ static inline void wait_for_buffer(struc
+    If dev->base_addr == 1, always return failure.
+    */
+ 
+-int __init 
+-seeq8005_probe(struct net_device *dev)
+-{
+-	int i;
+-	int base_addr = dev ? dev->base_addr : 0;
+-
+-	if (base_addr > 0x1ff)		/* Check a single specified location. */
+-		return seeq8005_probe1(dev, base_addr);
+-	else if (base_addr != 0)	/* Don't probe at all. */
+-		return -ENXIO;
+-
+-	for (i = 0; seeq8005_portlist[i]; i++)
+-		if (seeq8005_probe1(dev, seeq8005_portlist[i]) == 0)
+-			return 0;
++static int io = 0x320;
++static int irq = 10;
+ 
+-	return -ENODEV;
++struct net_device * __init seeq8005_probe(int unit)
++{
++	struct net_device *dev = alloc_etherdev(sizeof(struct net_local));
++	unsigned *port;
++	int err = 0;
++
++	if (!dev)
++		return ERR_PTR(-ENODEV);
++
++	if (unit >= 0) {
++		sprintf(dev->name, "eth%d", unit);
++		netdev_boot_setup_check(dev);
++		io = dev->base_addr;
++		irq = dev->irq;
++	}
++
++	if (io > 0x1ff) {	/* Check a single specified location. */
++		err = seeq8005_probe1(dev, io);
++	} else if (io != 0) {	/* Don't probe at all. */
++		err = -ENXIO;
++	} else {
++		for (port = seeq8005_portlist; *port; port++) {
++			if (seeq8005_probe1(dev, *port) == 0)
++				break;
++		}
++		if (!*port)
++			err = -ENODEV;
++	}
++	if (err)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	release_region(dev->base_addr, SEEQ8005_IO_EXTENT);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
+ /* This is the real probe routine.  Linux has a history of friendly device
+@@ -274,6 +298,7 @@ static int __init seeq8005_probe1(struct
+ 
+ 	/* Fill in the 'dev' fields. */
+ 	dev->base_addr = ioaddr;
++	dev->irq = irq;
+ 
+ 	/* Retrieve and print the ethernet address. */
+ 	for (i = 0; i < 6; i++)
+@@ -307,13 +332,6 @@ static int __init seeq8005_probe1(struct
+ 		 }
+ 	}
+ #endif
+-
+-	/* Initialize the device structure. */
+-	dev->priv = kmalloc(sizeof(struct net_local), GFP_KERNEL);
+-	if (dev->priv == NULL)
+-		return -ENOMEM;
+-	memset(dev->priv, 0, sizeof(struct net_local));
+-
+ 	dev->open		= seeq8005_open;
+ 	dev->stop		= seeq8005_close;
+ 	dev->hard_start_xmit 	= seeq8005_send_packet;
+@@ -321,10 +339,6 @@ static int __init seeq8005_probe1(struct
+ 	dev->watchdog_timeo	= HZ/20;
+ 	dev->get_stats		= seeq8005_get_stats;
+ 	dev->set_multicast_list = set_multicast_list;
+-
+-	/* Fill in the fields of the device structure with ethernet values. */
+-	ether_setup(dev);
+-	
+ 	dev->flags &= ~IFF_MULTICAST;
+ 
+ 	return 0;
+@@ -721,9 +735,7 @@ inline void wait_for_buffer(struct net_d
+ 	
+ #ifdef MODULE
+ 
+-static struct net_device dev_seeq = { .init = seeq8005_probe };
+-static int io = 0x320;
+-static int irq = 10;
++static struct net_device *dev_seeq;
+ MODULE_LICENSE("GPL");
+ MODULE_PARM(io, "i");
+ MODULE_PARM(irq, "i");
+@@ -732,28 +744,17 @@ MODULE_PARM_DESC(irq, "SEEQ 8005 IRQ num
+ 
+ int init_module(void)
+ {
+-	dev_seeq.irq=irq;
+-	dev_seeq.base_addr=io;
+-	if (register_netdev(&dev_seeq) != 0)
+-		return -EIO;
++	dev_seeq = seeq8005_probe(-1);
++	if (IS_ERR(dev_seeq))
++		return PTR_ERR(dev_seeq);
+ 	return 0;
+ }
+ 
+ void cleanup_module(void)
+ {
+-	unregister_netdev(&dev_seeq);
+-
+-	/*
+-	 *	Free up the private structure, or leak memory :-)
+-	 */
+-
+-	kfree(dev_seeq.priv);
+-	dev_seeq.priv = NULL;	/* gets re-allocated by el1_probe1 */
+-
+-	/*
+-	 *	If we don't do this, we can't re-insmod it later.
+-	 */
+-	release_region(dev_seeq.base_addr, SEEQ8005_IO_EXTENT);
++	unregister_netdev(dev_seeq);
++	release_region(dev_seeq->base_addr, SEEQ8005_IO_EXTENT);
++	free_netdev(dev_seeq);
+ }
+ 
+ #endif /* MODULE */
+--- linux-2.6.0/drivers/net/sgiseeq.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/sgiseeq.c	2003-12-28 23:21:01.000000000 -0800
+@@ -600,6 +600,7 @@ int sgiseeq_init(struct hpc3_regs* regs,
+ {
+ 	struct net_device *dev;
+ 	struct sgiseeq_private *sp;
++	int err = -ENOMEM;
+ 	int i;
+ 	
+ 	sp = (struct sgiseeq_private *) get_zeroed_page(GFP_KERNEL);
+@@ -609,19 +610,17 @@ int sgiseeq_init(struct hpc3_regs* regs,
+ 		return -ENOMEM;
+ 	}
+ 
+-	dev = init_etherdev(NULL, 0);
++	dev = alloc_etherdev(0);
+ 	if (!dev) {
+ 		printk (KERN_ERR
+ 			"Seeq8003: Could not allocate memory for device.\n");
+-		free_page((unsigned long) sp);
+-		return -ENOMEM;
++		goto out;
+ 	}
+ 
+ 	if (request_irq(irq, sgiseeq_interrupt, 0, sgiseeqstr, dev)) {
+-		printk(KERN_ERR "Seeq8003: Can't get irq %d\n", dev->irq);
+-		free_page((unsigned long) sp);
+-		unregister_netdev(dev);
+-		return -EAGAIN;
++		printk(KERN_ERR "Seeq8003: Can't get irq %d\n", irq);
++		err = -EAGAIN;
++		goto out1;
+ 	}
+ 
+ 	printk(KERN_INFO "%s: SGI Seeq8003 ", dev->name);
+@@ -637,6 +636,8 @@ int sgiseeq_init(struct hpc3_regs* regs,
+ 	}
+ 	printk("\n");
+ 
++	SET_MODULE_OWNER(dev);
++
+ 	dev->priv = sp;
+ #ifdef DEBUG
+ 	gpriv = sp;
+@@ -677,12 +678,22 @@ int sgiseeq_init(struct hpc3_regs* regs,
+ 	dev->set_multicast_list   = sgiseeq_set_multicast;
+ 	dev->irq                  = irq;
+ 	dev->dma                  = 0;
+-	ether_setup(dev);
++
++	err = register_netdev(dev);
++	if (err)
++		goto out2;
+ 
+ 	sp->next_module = root_sgiseeq_dev;
+ 	root_sgiseeq_dev = dev;
+ 
+ 	return 0;
++out2:
++	free_irq(dev->irq, dev);
++out1:
++	free_netdev(dev);
++out:
++	free_page((unsigned long) sp);
++	return err;
+ }
+ 
+ static int __init sgiseeq_probe(void)
+@@ -701,9 +712,9 @@ static void __exit sgiseeq_exit(void)
+ 	while (dev) {
+ 		sp = (struct sgiseeq_private *) dev->priv;
+ 		next = sp->next_module;
++		unregister_netdev(dev);
+ 		free_irq(dev->irq, dev);
+ 		free_page((unsigned long) sp);
+-		unregister_netdev(dev);
+ 		free_netdev(dev);
+ 		dev = next;
+ 	}
+--- linux-2.6.0/drivers/net/shaper.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/shaper.c	2003-12-28 23:21:01.000000000 -0800
+@@ -718,8 +718,10 @@ static int __init shaper_init(void)
+ 		if (!dev) 
+ 			break;
+ 
+-		if (register_netdev(dev))
++		if (register_netdev(dev)) {
++			free_netdev(dev);
+ 			break;
++		}
+ 
+ 		devs[i] = dev;
+ 		shapers_registered++;
+@@ -737,9 +739,12 @@ static void __exit shaper_exit (void)
+ {
+ 	int i;
+ 
+-	for (i = 0; i < shapers_registered; i++)
+-		if (devs[i])
++	for (i = 0; i < shapers_registered; i++) {
++		if (devs[i]) {
+ 			unregister_netdev(devs[i]);
++			free_netdev(devs[i]);
++		}
++	}
+ 
+ 	kfree(devs);
+ 	devs = NULL;
+--- linux-2.6.0/drivers/net/sis900.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/net/sis900.c	2003-12-28 23:22:01.000000000 -0800
+@@ -18,10 +18,11 @@
+    preliminary Rev. 1.0 Jan. 18, 1998
+    http://www.sis.com.tw/support/databook.htm
+ 
++   Rev 1.08.07 Nov.  2 2003 Daniele Venzano <webvenza@libero.it> add suspend/resume support
+    Rev 1.08.06 Sep. 24 2002 Mufasa Yang bug fix for Tx timeout & add SiS963 support
+-   Rev 1.08.05 Jun. 6 2002 Mufasa Yang bug fix for read_eeprom & Tx descriptor over-boundary 
++   Rev 1.08.05 Jun.  6 2002 Mufasa Yang bug fix for read_eeprom & Tx descriptor over-boundary
+    Rev 1.08.04 Apr. 25 2002 Mufasa Yang <mufasa@sis.com.tw> added SiS962 support
+-   Rev 1.08.03 Feb. 1 2002 Matt Domsch <Matt_Domsch@dell.com> update to use library crc32 function
++   Rev 1.08.03 Feb.  1 2002 Matt Domsch <Matt_Domsch@dell.com> update to use library crc32 function
+    Rev 1.08.02 Nov. 30 2001 Hui-Fen Hsu workaround for EDB & bug fix for dhcp problem
+    Rev 1.08.01 Aug. 25 2001 Hui-Fen Hsu update for 630ET & workaround for ICS1893 PHY
+    Rev 1.08.00 Jun. 11 2001 Hui-Fen Hsu workaround for RTL8201 PHY and some bug fix
+@@ -72,7 +73,7 @@
+ #include "sis900.h"
+ 
+ #define SIS900_MODULE_NAME "sis900"
+-#define SIS900_DRV_VERSION "v1.08.06 9/24/2002"
++#define SIS900_DRV_VERSION "v1.08.07 11/02/2003"
+ 
+ static char version[] __devinitdata =
+ KERN_INFO "sis900.c: " SIS900_DRV_VERSION "\n";
+@@ -169,6 +170,7 @@ struct sis900_private {
+ 
+ 	unsigned int tx_full;			/* The Tx queue is full.    */
+ 	u8 host_bridge_rev;
++	u32 pci_state[16];
+ };
+ 
+ MODULE_AUTHOR("Jim Huang <cmhuang@sis.com.tw>, Ollie Lho <ollie@sis.com.tw>");
+@@ -305,7 +307,7 @@ static int __devinit sis635_get_mac_addr
+ 		*( ((u16 *)net_dev->dev_addr) + i) = inw(ioaddr + rfdr);
+ 	}
+ 
+-	/* enable packet filitering */
++	/* enable packet filtering */
+ 	outl(rfcrSave | RFEN, rfcr + ioaddr);
+ 
+ 	return 1;
+@@ -994,7 +996,7 @@ sis900_init_rxfilter (struct net_device 
+ 		}
+ 	}
+ 
+-	/* enable packet filitering */
++	/* enable packet filtering */
+ 	outl(rfcrSave | RFEN, rfcr + ioaddr);
+ }
+ 
+@@ -1466,7 +1468,7 @@ static void sis900_tx_timeout(struct net
+  *	@net_dev: the net device to transmit with
+  *
+  *	Set the transmit buffer descriptor, 
+- *	and write TxENA to enable transimt state machine.
++ *	and write TxENA to enable transmit state machine.
+  *	tell upper layer if the buffer is full
+  */
+ 
+@@ -2184,11 +2186,72 @@ static void __devexit sis900_remove(stru
+ 	pci_set_drvdata(pci_dev, NULL);
+ }
+ 
++#ifdef CONFIG_PM
++
++static int sis900_suspend(struct pci_dev *pci_dev, u32 state)
++{
++	struct net_device *net_dev = pci_get_drvdata(pci_dev);
++	struct sis900_private *sis_priv = net_dev->priv;
++	long ioaddr = net_dev->base_addr;
++
++	if(!netif_running(net_dev))
++		return 0;
++
++	netif_stop_queue(net_dev);
++
++	/* Stop the chip's Tx and Rx Status Machine */
++	outl(RxDIS | TxDIS | inl(ioaddr + cr), ioaddr + cr);
++
++	pci_set_power_state(pci_dev, 3);
++	pci_save_state(pci_dev, sis_priv->pci_state);
++
++	return 0;
++}
++
++static int sis900_resume(struct pci_dev *pci_dev)
++{
++	struct net_device *net_dev = pci_get_drvdata(pci_dev);
++	struct sis900_private *sis_priv = net_dev->priv;
++	long ioaddr = net_dev->base_addr;
++
++	if(!netif_running(net_dev))
++		return 0;
++	pci_restore_state(pci_dev, sis_priv->pci_state);
++	pci_set_power_state(pci_dev, 0);
++
++	sis900_init_rxfilter(net_dev);
++
++	sis900_init_tx_ring(net_dev);
++	sis900_init_rx_ring(net_dev);
++
++	set_rx_mode(net_dev);
++
++	netif_device_attach(net_dev);
++	netif_start_queue(net_dev);
++
++	/* Workaround for EDB */
++	sis900_set_mode(ioaddr, HW_SPEED_10_MBPS, FDX_CAPABLE_HALF_SELECTED);
++
++	/* Enable all known interrupts by setting the interrupt mask. */
++	outl((RxSOVR|RxORN|RxERR|RxOK|TxURN|TxERR|TxIDLE), ioaddr + imr);
++	outl(RxENA | inl(ioaddr + cr), ioaddr + cr);
++	outl(IE, ioaddr + ier);
++
++	sis900_check_mode(net_dev, sis_priv->mii);
++
++	return 0;
++}
++#endif /* CONFIG_PM */
++
+ static struct pci_driver sis900_pci_driver = {
+ 	.name		= SIS900_MODULE_NAME,
+ 	.id_table	= sis900_pci_tbl,
+ 	.probe		= sis900_probe,
+ 	.remove		= __devexit_p(sis900_remove),
++#ifdef CONFIG_PM
++	.suspend	= sis900_suspend,
++	.resume		= sis900_resume,
++#endif /* CONFIG_PM */
+ };
+ 
+ static int __init sis900_init_module(void)
+--- linux-2.6.0/drivers/net/sk98lin/h/skcsum.h	2003-06-14 12:17:57.000000000 -0700
++++ 25/drivers/net/sk98lin/h/skcsum.h	2003-12-28 23:21:01.000000000 -0800
+@@ -2,8 +2,8 @@
+  *
+  * Name:	skcsum.h
+  * Project:	GEnesis - SysKonnect SK-NET Gigabit Ethernet (SK-98xx)
+- * 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: skcsum.h,v $
++ *	Revision 1.10  2003/08/20 13:59:57  mschmid
++ *	Changed notation of #ifndef SkCsCalculateChecksum to
++ *	#ifndef SK_CS_CALCULATE_CHECKSUM
++ *	
+  *	Revision 1.9  2001/02/06 11:21:39  rassmann
+  *	Editorial changes.
+  *	
+@@ -226,11 +230,11 @@ typedef struct s_CsPacketInfo {
+ 
+ /* function prototypes ********************************************************/
+ 
+-#ifndef SkCsCalculateChecksum
++#ifndef SK_CS_CALCULATE_CHECKSUM
+ extern unsigned SkCsCalculateChecksum(
+ 	void		*pData,
+ 	unsigned	Length);
+-#endif
++#endif /* SK_CS_CALCULATE_CHECKSUM */
+ 
+ extern int SkCsEvent(
+ 	SK_AC		*pAc,
+--- linux-2.6.0/drivers/net/sk98lin/h/skdrv1st.h	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/sk98lin/h/skdrv1st.h	2003-12-28 23:21:01.000000000 -0800
+@@ -2,15 +2,16 @@
+  *
+  * Name:	skdrv1st.h
+  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
+- * 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
+  *
+  ******************************************************************************/
+ 
+ /******************************************************************************
+  *
+- *	(C)Copyright 1998-2003 SysKonnect GmbH.
++ *	(C)Copyright 1998-2002 SysKonnect GmbH.
++ *	(C)Copyright 2002-2003 Marvell.
+  *
+  *	This program is free software; you can redistribute it and/or modify
+  *	it under the terms of the GNU General Public License as published by
+@@ -26,6 +27,15 @@
+  * History:
+  *
+  *	$Log: skdrv1st.h,v $
++ *	Revision 1.4  2003/11/12 14:28:14  rroesler
++ *	Fix: use dedicated ip_fast_csum() on X86_64 systems
++ *	
++ *	Revision 1.3  2003/10/07 08:16:52  mlindner
++ *	Fix: Copyright changes
++ *	
++ *	Revision 1.2  2003/09/29 12:05:59  mlindner
++ *	Fix: Added define SK_CS_CALCULSTE_CHECKSUM
++ *	
+  *	Revision 1.1  2003/07/21 07:22:43  rroesler
+  *	Fix: Re-Enter after CVS crash
+  *	
+@@ -110,6 +120,9 @@
+ #ifndef __INC_SKDRV1ST_H
+ #define __INC_SKDRV1ST_H
+ 
++/* Check kernel version */
++#include <linux/version.h>
++
+ typedef struct s_AC	SK_AC;
+ 
+ /* Set card versions */
+@@ -124,17 +137,15 @@ typedef struct s_AC	SK_AC;
+ #define SK_PNMI_READ_U32(p,v)		memcpy((char*)&(v),(char*)(p),4)
+ #define SK_PNMI_READ_U64(p,v)		memcpy((char*)&(v),(char*)(p),8)
+ 
+-#define SkCsCalculateChecksum(p,l)	((~ip_compute_csum(p, l)) & 0xffff)
+-
+ #define SK_ADDR_EQUAL(a1,a2)		(!memcmp(a1,a2,6))
+ 
+-
+ #if !defined(__OPTIMIZE__)  ||  !defined(__KERNEL__)
+ #warning  You must compile this file with the correct options!
+ #warning  See the last lines of the source file.
+ #error You must compile this driver with "-O".
+ #endif
+ 
++#include <linux/version.h>
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/string.h>
+@@ -154,6 +165,13 @@ typedef struct s_AC	SK_AC;
+ #include <asm/uaccess.h>
+ #include <net/checksum.h>
+ 
++#define SK_CS_CALCULATE_CHECKSUM
++#ifndef CONFIG_X86_64
++#define SkCsCalculateChecksum(p,l)	((~ip_compute_csum(p, l)) & 0xffff)
++#else
++#define SkCsCalculateChecksum(p,l)	((~ip_fast_csum(p, l)) & 0xffff)
++#endif
++
+ #include	"h/sktypes.h"
+ #include	"h/skerror.h"
+ #include	"h/skdebug.h"
+--- linux-2.6.0/drivers/net/sk98lin/h/skdrv2nd.h	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/sk98lin/h/skdrv2nd.h	2003-12-28 23:21:01.000000000 -0800
+@@ -2,15 +2,16 @@
+  *
+  * Name:	skdrv2nd.h
+  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
+- * 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
+  *
+  ******************************************************************************/
+ 
+ /******************************************************************************
+  *
+- *	(C)Copyright 1998-2003 SysKonnect GmbH.
++ *	(C)Copyright 1998-2002 SysKonnect GmbH.
++ *	(C)Copyright 2002-2003 Marvell.
+  *
+  *	This program is free software; you can redistribute it and/or modify
+  *	it under the terms of the GNU General Public License as published by
+@@ -26,6 +27,27 @@
+  * History:
+  *
+  *	$Log: skdrv2nd.h,v $
++ *	Revision 1.10  2003/12/11 16:04:45  mlindner
++ *	Add: New pnmi data backup structure
++ *	
++ *	Revision 1.9  2003/11/10 09:31:37  rroesler
++ *	Add: pnmiBackup structure for DIAG backup restore
++ *	
++ *	Revision 1.8  2003/10/22 14:18:32  rroesler
++ *	Fix: DIAG handling for DualNet cards
++ *	
++ *	Revision 1.7  2003/10/07 09:34:59  mlindner
++ *	Add: New defines for lower and upper range values (interrupt moderation)
++ *	
++ *	Revision 1.6  2003/10/07 08:16:51  mlindner
++ *	Fix: Copyright changes
++ *	
++ *	Revision 1.5  2003/09/01 13:10:39  rroesler
++ *	Add: Prototypes for DIAG Attach/Detach functions
++ *	
++ *	Revision 1.4  2003/09/01 12:33:38  rroesler
++ *	Add: Defines for optimized DIAG interaction
++ *	
+  *	Revision 1.3  2003/08/12 16:51:18  mlindner
+  *	Fix: UDP and TCP Proto checks
+  *	Fix: UDP header offset
+@@ -206,6 +228,11 @@ extern int		SkPciWriteCfgWord(SK_AC*, in
+ extern int		SkPciWriteCfgByte(SK_AC*, int, SK_U8);
+ extern int		SkDrvEvent(SK_AC*, SK_IOC IoC, SK_U32, SK_EVPARA);
+ 
++#ifdef SK_DIAG_SUPPORT
++extern int		SkDrvEnterDiagMode(SK_AC *pAc);
++extern int		SkDrvLeaveDiagMode(SK_AC *pAc);
++#endif
++
+ struct s_DrvRlmtMbuf {
+ 	SK_MBUF		*pNext;		/* Pointer to next RLMT Mbuf. */
+ 	SK_U8		*pData;		/* Data buffer (virtually contig.). */
+@@ -247,6 +274,7 @@ struct s_DrvRlmtMbuf {
+ #define		SK_IOCTL_SETMIB		(SK_IOCTL_BASE + 1)
+ #define		SK_IOCTL_PRESETMIB	(SK_IOCTL_BASE + 2)
+ #define		SK_IOCTL_GEN		(SK_IOCTL_BASE + 3)
++#define		SK_IOCTL_DIAG		(SK_IOCTL_BASE + 4)
+ 
+ typedef struct s_IOCTL	SK_GE_IOCTL;
+ 
+@@ -462,6 +490,9 @@ struct s_RxPort {
+ #define C_INTS_PER_SEC_DEFAULT      2000 
+ #define C_INT_MOD_ENABLE_PERCENTAGE   50 /* if higher 50% enable */
+ #define C_INT_MOD_DISABLE_PERCENTAGE  50 /* if lower 50% disable */
++#define C_INT_MOD_IPS_LOWER_RANGE     30
++#define C_INT_MOD_IPS_UPPER_RANGE     40000
++
+ 
+ typedef struct s_DynIrqModInfo  DIM_INFO;
+ struct s_DynIrqModInfo {
+@@ -493,6 +524,11 @@ typedef struct s_PerStrm	PER_STRM;
+ 
+ #define SK_ALLOC_IRQ	0x00000001
+ 
++#ifdef SK_DIAG_SUPPORT
++#define	DIAG_ACTIVE		1
++#define	DIAG_NOTACTIVE		0
++#endif
++
+ /****************************************************************************
+  * Per board structure / Adapter Context structure:
+  *	Allocated within attach(9e) and freed within detach(9e).
+@@ -563,9 +599,18 @@ struct s_AC  {
+ 	int		PortUp;
+ 	int		PortDown;
+ 	int		ChipsetType;	/*  Chipset family type 
+-							 *  0 == Genesis family support
+-							 *  1 == Yukon family support
+-							 */
++					 *  0 == Genesis family support
++					 *  1 == Yukon family support
++					 */
++#ifdef SK_DIAG_SUPPORT
++	SK_U32		DiagModeActive;		/* is diag active?	*/
++	SK_BOOL		DiagFlowCtrl;		/* for control purposes	*/
++	SK_PNMI_STRUCT_DATA PnmiBackup;		/* backup structure for all Pnmi-Data */
++	SK_BOOL         WasIfUp[SK_MAX_MACS];   /* for OpenClose while 
++						 * DIAG is busy with NIC 
++						 */
++#endif
++
+ };
+ 
+ 
+--- linux-2.6.0/drivers/net/sk98lin/h/skgehw.h	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/net/sk98lin/h/skgehw.h	2003-12-28 23:21:01.000000000 -0800
+@@ -2,8 +2,8 @@
+  *
+  * Name:	skgehw.h
+  * Project:	Gigabit Ethernet Adapters, Common Modules
+- * 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: skgehw.h,v $
++ * Revision 1.56  2003/09/23 09:01:00  malthoff
++ * Minor change: Define I2C device size constants as long.
++ *
++ * Revision 1.55  2003/09/16 14:03:34  rschmidt
++ * Added define for YUKON-Lite Rev. A1,A2 Chip Revision
++ * Moved defines for PHY power down modes to skgeinit.h
++ * Editorial changes
++ *
++ * Revision 1.54  2003/09/16 07:37:58  mschmid
++ * Added defines for Marvell PHY low power modes
++ *
+  * Revision 1.53  2003/07/04 12:39:01  rschmidt
+  * Added SK_FAR to pointers in XM_IN32() and GM_IN32() macros (for PXE)
+  * Editorial changes
+@@ -84,7 +95,7 @@
+  * Editorial changes
+  *
+  * Revision 1.39  2002/06/10 09:37:07  rschmidt
+- * Added macros for the ADDR-Modul
++ * Added macros for the ADDR-Module
+  *
+  * Revision 1.38  2002/06/05 08:15:19  rschmidt
+  * Added defines for WOL Registers
+@@ -628,12 +639,12 @@ extern "C" {
+ #define B2_FAR			0x0120	/* 32 bit	Flash-Prom Addr Reg/Cnt */
+ #define B2_FDP			0x0124	/*  8 bit	Flash-Prom Data Port */
+ 	/* 0x0125 - 0x0127:	reserved */
+-#define B2_LD_CRTL		0x0128	/*  8 bit	EPROM loader control register */
++#define B2_LD_CTRL		0x0128	/*  8 bit	EPROM loader control register */
+ #define B2_LD_TEST		0x0129	/*  8 bit	EPROM loader test register */
+ 	/* 0x012a - 0x012f:	reserved */
+ #define B2_TI_INI		0x0130	/* 32 bit	Timer Init Value */
+ #define B2_TI_VAL		0x0134	/* 32 bit	Timer Value */
+-#define B2_TI_CRTL		0x0138	/*  8 bit	Timer Control */
++#define B2_TI_CTRL		0x0138	/*  8 bit	Timer Control */
+ #define B2_TI_TEST		0x0139	/*  8 Bit	Timer Test */
+ 	/* 0x013a - 0x013f:	reserved */
+ #define B2_IRQM_INI		0x0140	/* 32 bit	IRQ Moderation Timer Init Reg.*/
+@@ -1021,7 +1032,7 @@ extern "C" {
+ 								/* Bit 7:	reserved */
+ #define RAP_RAP			0x3f	/* Bit 6..0:	0 = block 0,..,6f = block 6f */
+ 
+-/*	B0_CTST		16 bit	Control/Status register */
++/*	B0_CTST			16 bit	Control/Status register */
+ 								/* Bit 15..14:	reserved */
+ #define CS_CLK_RUN_HOT	BIT_13S		/* CLK_RUN hot m. (YUKON-Lite only) */
+ #define CS_CLK_RUN_RST	BIT_12S		/* CLK_RUN reset  (YUKON-Lite only) */
+@@ -1038,7 +1049,7 @@ extern "C" {
+ #define CS_RST_CLR		BIT_1S		/* Clear Software reset	*/
+ #define CS_RST_SET		BIT_0S		/* Set   Software reset	*/
+ 
+-/*	B0_LED		 8 Bit	LED register */
++/*	B0_LED			 8 Bit	LED register */
+ 								/* Bit  7.. 2:	reserved */
+ #define LED_STAT_ON		BIT_1S		/* Status LED on	*/
+ #define LED_STAT_OFF	BIT_0S		/* Status LED off	*/
+@@ -1053,9 +1064,9 @@ extern "C" {
+ #define PC_VCC_ON		BIT_1       /* Switch VCC On  */
+ #define PC_VCC_OFF		BIT_0       /* Switch VCC Off */
+ 
+-/*	B0_ISRC		32 bit	Interrupt Source Register */
+-/*	B0_IMSK		32 bit	Interrupt Mask Register */
+-/*	B0_SP_ISRC	32 bit	Special Interrupt Source Reg */
++/*	B0_ISRC			32 bit	Interrupt Source Register */
++/*	B0_IMSK			32 bit	Interrupt Mask Register */
++/*	B0_SP_ISRC		32 bit	Special Interrupt Source Reg */
+ /*	B2_IRQM_MSK 	32 bit	IRQ Moderation Mask */
+ #define IS_ALL_MSK		0xbfffffffUL	/* All Interrupt bits */
+ #define IS_HW_ERR		BIT_31		/* Interrupt HW Error */
+@@ -1099,9 +1110,9 @@ extern "C" {
+ #define IS_XA2_C		BIT_0		/* Q_XA2 Encoding Error */
+ 
+ 
+-/*	B0_HWE_ISRC	32 bit	HW Error Interrupt Src Reg */
+-/*	B0_HWE_IMSK	32 bit	HW Error Interrupt Mask Reg */
+-/*	B2_IRQM_HWE_MSK 32 bit	IRQ Moderation HW Error Mask */
++/*	B0_HWE_ISRC		32 bit	HW Error Interrupt Src Reg */
++/*	B0_HWE_IMSK		32 bit	HW Error Interrupt Mask Reg */
++/*	B2_IRQM_HWE_MSK	32 bit	IRQ Moderation HW Error Mask */
+ #define IS_ERR_MSK		0x00000fffL	/* 		All Error bits */
+ 								/* Bit 31..14:	reserved */
+ #define IS_IRQ_TIST_OV	BIT_13	/* Time Stamp Timer Overflow (YUKON only) */
+@@ -1119,29 +1130,32 @@ extern "C" {
+ #define IS_R1_PAR_ERR	BIT_1	/* Queue R1 Parity Error */
+ #define IS_R2_PAR_ERR	BIT_0	/* Queue R2 Parity Error */
+ 
+-/*	B2_CONN_TYP	 8 bit	Connector type */
+-/*	B2_PMD_TYP	 8 bit	PMD type */
++/*	B2_CONN_TYP		 8 bit	Connector type */
++/*	B2_PMD_TYP		 8 bit	PMD type */
+ /*	Values of connector and PMD type comply to SysKonnect internal std */
+ 
+-/*	B2_MAC_CFG	 8 bit	MAC Configuration / Chip Revision */
++/*	B2_MAC_CFG		 8 bit	MAC Configuration / Chip Revision */
+ #define CFG_CHIP_R_MSK	(0xf<<4)	/* Bit 7.. 4: Chip Revision */
+ 									/* Bit 3.. 2:	reserved */
+ #define CFG_DIS_M2_CLK	BIT_1S		/* Disable Clock for 2nd MAC */
+ #define CFG_SNG_MAC		BIT_0S		/* MAC Config: 0=2 MACs / 1=1 MAC*/
+ 
+-/*	B2_CHIP_ID	 8 bit 	Chip Identification Number */
++/*	B2_CHIP_ID		 8 bit 	Chip Identification Number */
+ #define CHIP_ID_GENESIS		0x0a	/* Chip ID for GENESIS */
+ #define CHIP_ID_YUKON		0xb0	/* Chip ID for YUKON */
+-#define CHIP_ID_YUKON_LITE	0xb1	/* Chip ID for YUKON-Lite (Rev. A1) */
++#define CHIP_ID_YUKON_LITE	0xb1	/* Chip ID for YUKON-Lite (Rev. A1-A3) */
+ #define CHIP_ID_YUKON_LP	0xb2	/* Chip ID for YUKON-LP */
+ 
+-/*	B2_FAR		32 bit	Flash-Prom Addr Reg/Cnt */
++#define CHIP_REV_YU_LITE_A1	3		/* Chip Rev. for YUKON-Lite A1,A2 */
++#define CHIP_REV_YU_LITE_A3	7		/* Chip Rev. for YUKON-Lite A3 */
++
++/*	B2_FAR			32 bit	Flash-Prom Addr Reg/Cnt */
+ #define FAR_ADDR		0x1ffffL	/* Bit 16.. 0:	FPROM Address mask */
+ 
+-/*	B2_LD_CRTL	 8 bit	EPROM loader control register */
++/*	B2_LD_CTRL		 8 bit	EPROM loader control register */
+ /*	Bits are currently reserved */
+ 
+-/*	B2_LD_TEST	 8 bit	EPROM loader test register */
++/*	B2_LD_TEST		 8 bit	EPROM loader test register */
+ 								/* Bit 7.. 4:	reserved */
+ #define LD_T_ON			BIT_3S	/* Loader Test mode on */
+ #define LD_T_OFF		BIT_2S	/* Loader Test mode off */
+@@ -1151,16 +1165,16 @@ extern "C" {
+ /*
+  *	Timer Section
+  */
+-/*	B2_TI_CRTL	 8 bit	Timer control */
++/*	B2_TI_CTRL		 8 bit	Timer control */
+ /*	B2_IRQM_CTRL	 8 bit	IRQ Moderation Timer Control */
+ 								/* Bit 7.. 3:	reserved */
+ #define TIM_START		BIT_2S	/* Start Timer */
+ #define TIM_STOP		BIT_1S	/* Stop  Timer */
+ #define TIM_CLR_IRQ		BIT_0S	/* Clear Timer IRQ (!IRQM) */
+ 
+-/*	B2_TI_TEST	 8 Bit	Timer Test */
++/*	B2_TI_TEST		 8 Bit	Timer Test */
+ /*	B2_IRQM_TEST	 8 bit	IRQ Moderation Timer Test */
+-/*	B28_DPT_TST	 8 bit	Descriptor Poll Timer Test Reg */
++/*	B28_DPT_TST		 8 bit	Descriptor Poll Timer Test Reg */
+ 								/* Bit 7.. 3:	reserved */
+ #define TIM_T_ON		BIT_2S	/* Test mode on */
+ #define TIM_T_OFF		BIT_1S	/* Test mode off */
+@@ -1197,7 +1211,7 @@ extern "C" {
+ #define TST_FRC_APERR_1M64	BIT_1S	/* AddrPERR on 1. phase */
+ #define TST_FRC_APERR_2M64	BIT_0S	/* AddrPERR on 2. phase */
+ 
+-/*	B2_GP_IO	32 bit	General Purpose I/O Register */
++/*	B2_GP_IO		32 bit	General Purpose I/O Register */
+ 							/* Bit 31..26:	reserved */
+ #define GP_DIR_9	BIT_25	/* IO_9 direct, 0=In/1=Out */
+ #define GP_DIR_8	BIT_24	/* IO_8 direct, 0=In/1=Out */
+@@ -1221,28 +1235,28 @@ extern "C" {
+ #define GP_IO_1		BIT_1	/* IO_1 pin */
+ #define GP_IO_0		BIT_0	/* IO_0 pin */
+ 
+-/*	B2_I2C_CTRL	32 bit	I2C HW Control Register */
++/*	B2_I2C_CTRL		32 bit	I2C HW Control Register */
+ #define I2C_FLAG		BIT_31		/* Start read/write if WR */
+ #define I2C_ADDR		(0x7fffL<<16)	/* Bit 30..16:	Addr to be RD/WR */
+ #define I2C_DEV_SEL		(0x7fL<<9)		/* Bit 15.. 9:	I2C Device Select */
+ 								/* Bit	8.. 5:	reserved	*/
+ #define I2C_BURST_LEN	BIT_4		/* Burst Len, 1/4 bytes */
+-#define I2C_DEV_SIZE	(7L<<1)		/* Bit	3.. 1:	I2C Device Size	*/
+-#define I2C_025K_DEV	(0L<<1)		/*		0: 256 Bytes or smal. */
+-#define I2C_05K_DEV		(1L<<1)		/* 		1: 512	Bytes	*/
+-#define I2C_1K_DEV		(2L<<1)		/*		2: 1024 Bytes	*/
+-#define I2C_2K_DEV		(3L<<1)		/*		3: 2048	Bytes	*/
+-#define I2C_4K_DEV		(4L<<1)		/*		4: 4096 Bytes	*/
+-#define I2C_8K_DEV		(5L<<1)		/*		5: 8192 Bytes	*/
+-#define I2C_16K_DEV		(6L<<1)		/*		6: 16384 Bytes	*/
+-#define I2C_32K_DEV		(7L<<1)		/*		7: 32768 Bytes	*/
++#define I2C_DEV_SIZE	(7<<1)		/* Bit	3.. 1:	I2C Device Size	*/
++#define I2C_025K_DEV	(0<<1)		/*		0: 256 Bytes or smal. */
++#define I2C_05K_DEV		(1<<1)		/* 		1: 512	Bytes	*/
++#define I2C_1K_DEV		(2<<1)		/*		2: 1024 Bytes	*/
++#define I2C_2K_DEV		(3<<1)		/*		3: 2048	Bytes	*/
++#define I2C_4K_DEV		(4<<1)		/*		4: 4096 Bytes	*/
++#define I2C_8K_DEV		(5<<1)		/*		5: 8192 Bytes	*/
++#define I2C_16K_DEV		(6<<1)		/*		6: 16384 Bytes	*/
++#define I2C_32K_DEV		(7<<1)		/*		7: 32768 Bytes	*/
+ #define I2C_STOP		BIT_0		/* Interrupt I2C transfer */
+ 
+-/*	B2_I2C_IRQ	32 bit	I2C HW IRQ Register */
++/*	B2_I2C_IRQ		32 bit	I2C HW IRQ Register */
+ 								/* Bit 31.. 1	reserved */
+ #define I2C_CLR_IRQ		BIT_0	/* Clear I2C IRQ */
+ 
+-/*	B2_I2C_SW	32 bit (8 bit access)	I2C HW SW Port Register */
++/*	B2_I2C_SW		32 bit (8 bit access)	I2C HW SW Port Register */
+ 								/* Bit  7.. 3:	reserved */
+ #define I2C_DATA_DIR	BIT_2S		/* direction of I2C_DATA */
+ #define I2C_DATA		BIT_1S		/* I2C Data Port	*/
+@@ -1254,27 +1268,27 @@ extern "C" {
+ #define I2C_SENS_ADDR	LM80_ADDR	/* I2C Sensor Address, (Volt and Temp)*/
+ 
+ 
+-/*	B2_BSC_CTRL	 8 bit	Blink Source Counter Control */
++/*	B2_BSC_CTRL		 8 bit	Blink Source Counter Control */
+ 							/* Bit  7.. 2:	reserved */
+ #define BSC_START	BIT_1S		/* Start Blink Source Counter */
+ #define BSC_STOP	BIT_0S		/* Stop  Blink Source Counter */
+ 
+-/*	B2_BSC_STAT	 8 bit	Blink Source Counter Status */
++/*	B2_BSC_STAT		 8 bit	Blink Source Counter Status */
+ 							/* Bit  7.. 1:	reserved */
+ #define BSC_SRC		BIT_0S		/* Blink Source, 0=Off / 1=On */
+ 
+-/*	B2_BSC_TST	16 bit	Blink Source Counter Test Reg */
++/*	B2_BSC_TST		16 bit	Blink Source Counter Test Reg */
+ #define BSC_T_ON	BIT_2S		/* Test mode on */
+ #define BSC_T_OFF	BIT_1S		/* Test mode off */
+ #define BSC_T_STEP	BIT_0S		/* Test step */
+ 
+ 
+-/*	B3_RAM_ADDR	32 bit	RAM Address, to read or write */
++/*	B3_RAM_ADDR		32 bit	RAM Address, to read or write */
+ 					/* Bit 31..19:	reserved */
+ #define RAM_ADR_RAN	0x0007ffffL	/* Bit 18.. 0:	RAM Address Range */
+ 
+ /* RAM Interface Registers */
+-/*	B3_RI_CTRL	16 bit	RAM Iface Control Register */
++/*	B3_RI_CTRL		16 bit	RAM Iface Control Register */
+ 								/* Bit 15..10:	reserved */
+ #define RI_CLR_RD_PERR	BIT_9S	/* Clear IRQ RAM Read Parity Err */
+ #define RI_CLR_WR_PERR	BIT_8S	/* Clear IRQ RAM Write Parity Err*/
+@@ -1282,7 +1296,7 @@ extern "C" {
+ #define RI_RST_CLR		BIT_1S	/* Clear RAM Interface Reset */
+ #define RI_RST_SET		BIT_0S	/* Set   RAM Interface Reset */
+ 
+-/*	B3_RI_TEST	 8 bit	RAM Iface Test Register */
++/*	B3_RI_TEST		 8 bit	RAM Iface Test Register */
+ 								/* Bit 15.. 4:	reserved */
+ #define RI_T_EV			BIT_3S	/* Timeout Event occured */
+ #define RI_T_ON			BIT_2S	/* Timeout Timer Test On */
+@@ -1309,7 +1323,7 @@ extern "C" {
+ #define MA_DIS_REC_RX1	BIT_0S	/* Disable Recovery Timer RX1 */
+ 
+ /* Packet Arbiter Registers */
+-/*	B3_PA_CTRL	16 bit	Packet Arbiter Ctrl Register */
++/*	B3_PA_CTRL		16 bit	Packet Arbiter Ctrl Register */
+ 								/* Bit 15..14:	reserved */
+ #define PA_CLR_TO_TX2	BIT_13S	/* Clear IRQ Packet Timeout TX2 */
+ #define PA_CLR_TO_TX1	BIT_12S	/* Clear IRQ Packet Timeout TX1 */
+@@ -1332,7 +1346,7 @@ extern "C" {
+ /* Rx/Tx Path related Arbiter Test Registers */
+ /*	B3_MA_TO_TEST	16 bit	MAC Arbiter Timeout Test Reg */
+ /*	B3_MA_RC_TEST	16 bit	MAC Arbiter Recovery Test Reg */
+-/*	B3_PA_TEST	16 bit	Packet Arbiter Test Register */
++/*	B3_PA_TEST		16 bit	Packet Arbiter Test Register */
+ /*			Bit 15, 11, 7, and 3 are reserved in B3_PA_TEST */
+ #define TX2_T_EV	BIT_15S		/* TX2 Timeout/Recv Event occured */
+ #define TX2_T_ON	BIT_14S		/* TX2 Timeout/Recv Timer Test On */
+@@ -1353,14 +1367,14 @@ extern "C" {
+ 
+ 
+ /* Transmit Arbiter Registers MAC 1 and 2, use MR_ADDR() to access */
+-/*	TXA_ITI_INI	32 bit	Tx Arb Interval Timer Init Val */
+-/*	TXA_ITI_VAL	32 bit	Tx Arb Interval Timer Value */
+-/*	TXA_LIM_INI	32 bit	Tx Arb Limit Counter Init Val */
+-/*	TXA_LIM_VAL	32 bit	Tx Arb Limit Counter Value */
++/*	TXA_ITI_INI		32 bit	Tx Arb Interval Timer Init Val */
++/*	TXA_ITI_VAL		32 bit	Tx Arb Interval Timer Value */
++/*	TXA_LIM_INI		32 bit	Tx Arb Limit Counter Init Val */
++/*	TXA_LIM_VAL		32 bit	Tx Arb Limit Counter Value */
+ 								/* Bit 31..24:	reserved */
+ #define TXA_MAX_VAL	0x00ffffffUL/* Bit 23.. 0:	Max TXA Timer/Cnt Val */
+ 
+-/*	TXA_CTRL	 8 bit	Tx Arbiter Control Register */
++/*	TXA_CTRL		 8 bit	Tx Arbiter Control Register */
+ #define TXA_ENA_FSYNC	BIT_7S	/* Enable  force of sync Tx queue */
+ #define TXA_DIS_FSYNC	BIT_6S	/* Disable force of sync Tx queue */
+ #define TXA_ENA_ALLOC	BIT_5S	/* Enable  alloc of free bandwidth */
+@@ -1370,7 +1384,7 @@ extern "C" {
+ #define TXA_ENA_ARB		BIT_1S	/* Enable  Tx Arbiter */
+ #define TXA_DIS_ARB		BIT_0S	/* Disable Tx Arbiter */
+ 
+-/*	TXA_TEST	 8 bit	Tx Arbiter Test Register */
++/*	TXA_TEST		 8 bit	Tx Arbiter Test Register */
+ 								/* Bit 7.. 6:	reserved */
+ #define TXA_INT_T_ON	BIT_5S	/* Tx Arb Interval Timer Test On */
+ #define TXA_INT_T_OFF	BIT_4S	/* Tx Arb Interval Timer Test Off */
+@@ -1379,22 +1393,22 @@ extern "C" {
+ #define TXA_LIM_T_OFF	BIT_1S	/* Tx Arb Limit Timer Test Off */
+ #define TXA_LIM_T_STEP	BIT_0S	/* Tx Arb Limit Timer Step */
+ 
+-/*	TXA_STAT	 8 bit	Tx Arbiter Status Register */
++/*	TXA_STAT		 8 bit	Tx Arbiter Status Register */
+ 								/* Bit 7.. 1:	reserved */
+ #define TXA_PRIO_XS		BIT_0S	/* sync queue has prio to send */
+ 
+-/*	Q_BC	32 bit	Current Byte Counter */
++/*	Q_BC			32 bit	Current Byte Counter */
+ 								/* Bit 31..16:	reserved */
+ #define BC_MAX			0xffff	/* Bit 15.. 0:	Byte counter */
+ 
+ /* BMU Control Status Registers */
+-/*	B0_R1_CSR	32 bit	BMU Ctrl/Stat Rx Queue 1 */
+-/*	B0_R2_CSR	32 bit	BMU Ctrl/Stat Rx Queue 2 */
+-/*	B0_XA1_CSR	32 bit	BMU Ctrl/Stat Sync Tx Queue 1 */
+-/*	B0_XS1_CSR	32 bit	BMU Ctrl/Stat Async Tx Queue 1 */
+-/*	B0_XA2_CSR	32 bit	BMU Ctrl/Stat Sync Tx Queue 2 */
+-/*	B0_XS2_CSR	32 bit	BMU Ctrl/Stat Async Tx Queue 2 */
+-/*	Q_CSR		32 bit	BMU Control/Status Register */
++/*	B0_R1_CSR		32 bit	BMU Ctrl/Stat Rx Queue 1 */
++/*	B0_R2_CSR		32 bit	BMU Ctrl/Stat Rx Queue 2 */
++/*	B0_XA1_CSR		32 bit	BMU Ctrl/Stat Sync Tx Queue 1 */
++/*	B0_XS1_CSR		32 bit	BMU Ctrl/Stat Async Tx Queue 1 */
++/*	B0_XA2_CSR		32 bit	BMU Ctrl/Stat Sync Tx Queue 2 */
++/*	B0_XS2_CSR		32 bit	BMU Ctrl/Stat Async Tx Queue 2 */
++/*	Q_CSR			32 bit	BMU Control/Status Register */
+ 								/* Bit 31..25:	reserved */
+ #define CSR_SV_IDLE		BIT_24		/* BMU SM Idle */
+ 								/* Bit 23..22:	reserved */
+@@ -1428,7 +1442,7 @@ extern "C" {
+ 						CSR_SV_RUN | CSR_DREAD_RUN | CSR_DWRITE_RUN |\
+ 						CSR_TRANS_RUN)
+ 
+-/*	Q_F	32 bit	Flag Register */
++/*	Q_F				32 bit	Flag Register */
+ 									/* Bit 31..28:	reserved */
+ #define F_ALM_FULL		BIT_27		/* Rx FIFO: almost full */
+ #define F_EMPTY			BIT_27		/* Tx FIFO: empty flag */
+@@ -1439,17 +1453,17 @@ extern "C" {
+ 									/* Bit 15..11: 	reserved */
+ #define F_WATER_MARK	0x0007ffL	/* Bit 10.. 0:	Watermark */
+ 
+-/*	Q_T1	32 bit	Test Register 1 */
++/*	Q_T1			32 bit	Test Register 1 */
+ /*		Holds four State Machine control Bytes */
+-#define SM_CRTL_SV_MSK	(0xffL<<24)	/* Bit 31..24:	Control Supervisor SM */
+-#define SM_CRTL_RD_MSK	(0xffL<<16)	/* Bit 23..16:	Control Read Desc SM */
+-#define SM_CRTL_WR_MSK	(0xffL<<8)	/* Bit 15.. 8:	Control Write Desc SM */
+-#define SM_CRTL_TR_MSK	0xffL		/* Bit	7.. 0:	Control Transfer SM */
+-
+-/*	Q_T1_TR	 8 bit	Test Register 1 Transfer SM */
+-/*	Q_T1_WR	 8 bit	Test Register 1 Write Descriptor SM */
+-/*	Q_T1_RD	 8 bit	Test Register 1 Read Descriptor SM */
+-/*	Q_T1_SV	 8 bit	Test Register 1 Supervisor SM */
++#define SM_CTRL_SV_MSK	(0xffL<<24)	/* Bit 31..24:	Control Supervisor SM */
++#define SM_CTRL_RD_MSK	(0xffL<<16)	/* Bit 23..16:	Control Read Desc SM */
++#define SM_CTRL_WR_MSK	(0xffL<<8)	/* Bit 15.. 8:	Control Write Desc SM */
++#define SM_CTRL_TR_MSK	0xffL		/* Bit	7.. 0:	Control Transfer SM */
++
++/*	Q_T1_TR			 8 bit	Test Register 1 Transfer SM */
++/*	Q_T1_WR			 8 bit	Test Register 1 Write Descriptor SM */
++/*	Q_T1_RD			 8 bit	Test Register 1 Read Descriptor SM */
++/*	Q_T1_SV			 8 bit	Test Register 1 Supervisor SM */
+ 
+ /* The control status byte of each machine looks like ... */
+ #define SM_STATE		0xf0	/* Bit 7.. 4:	State which shall be loaded */
+@@ -1459,7 +1473,7 @@ extern "C" {
+ #define SM_STEP			BIT_0S	/* Step the State Machine */
+ /* The encoding of the states is not supported by the Diagnostics Tool */
+ 
+-/*	Q_T2	32 bit	Test Register 2	*/
++/*	Q_T2			32 bit	Test Register 2	*/
+ 								/* Bit 31.. 8:	reserved */
+ #define T2_AC_T_ON		BIT_7	/* Address Counter Test Mode on */
+ #define T2_AC_T_OFF		BIT_6	/* Address Counter Test Mode off */
+@@ -1470,23 +1484,23 @@ extern "C" {
+ #define T2_STEP02		BIT_1	/* Inc AC/Dec BC by 2 */
+ #define T2_STEP01		BIT_0	/* Inc AC/Dec BC by 1 */
+ 
+-/*	Q_T3	32 bit	Test Register 3	*/
++/*	Q_T3			32 bit	Test Register 3	*/
+ 								/* Bit 31.. 7:	reserved */
+ #define T3_MUX_MSK		(7<<4)	/* Bit  6.. 4:	Mux Position */
+ 								/* Bit  3:	reserved */
+ #define T3_VRAM_MSK		7		/* Bit  2.. 0:	Virtual RAM Buffer Address */
+ 
+ /* RAM Buffer Register Offsets, use RB_ADDR(Queue, Offs) to access */
+-/*	RB_START	32 bit	RAM Buffer Start Address */
+-/*	RB_END		32 bit	RAM Buffer End Address */
+-/*	RB_WP		32 bit	RAM Buffer Write Pointer */
+-/*	RB_RP		32 bit	RAM Buffer Read Pointer */
+-/*	RB_RX_UTPP	32 bit	Rx Upper Threshold, Pause Pack */
+-/*	RB_RX_LTPP	32 bit	Rx Lower Threshold, Pause Pack */
+-/*	RB_RX_UTHP	32 bit	Rx Upper Threshold, High Prio */
+-/*	RB_RX_LTHP	32 bit	Rx Lower Threshold, High Prio */
+-/*	RB_PC		32 bit	RAM Buffer Packet Counter */
+-/*	RB_LEV		32 bit	RAM Buffer Level Register */
++/*	RB_START		32 bit	RAM Buffer Start Address */
++/*	RB_END			32 bit	RAM Buffer End Address */
++/*	RB_WP			32 bit	RAM Buffer Write Pointer */
++/*	RB_RP			32 bit	RAM Buffer Read Pointer */
++/*	RB_RX_UTPP		32 bit	Rx Upper Threshold, Pause Pack */
++/*	RB_RX_LTPP		32 bit	Rx Lower Threshold, Pause Pack */
++/*	RB_RX_UTHP		32 bit	Rx Upper Threshold, High Prio */
++/*	RB_RX_LTHP		32 bit	Rx Lower Threshold, High Prio */
++/*	RB_PC			32 bit	RAM Buffer Packet Counter */
++/*	RB_LEV			32 bit	RAM Buffer Level Register */
+ 				/* Bit 31..19:	reserved */
+ #define RB_MSK	0x0007ffff	/* Bit 18.. 0:	RAM Buffer Pointer Bits */
+ 
+@@ -1519,17 +1533,17 @@ extern "C" {
+ 
+ /* Receive and Transmit MAC FIFO Registers (GENESIS only) */
+ 
+-/*	RX_MFF_EA	32 bit	Receive MAC FIFO End Address */
+-/*	RX_MFF_WP	32 bit 	Receive MAC FIFO Write Pointer */
+-/*	RX_MFF_RP	32 bit	Receive MAC FIFO Read Pointer */
+-/*	RX_MFF_PC	32 bit	Receive MAC FIFO Packet Counter */
+-/*	RX_MFF_LEV	32 bit	Receive MAC FIFO Level */
+-/*	TX_MFF_EA	32 bit	Transmit MAC FIFO End Address */
+-/*	TX_MFF_WP	32 bit 	Transmit MAC FIFO Write Pointer */
+-/*	TX_MFF_WSP	32 bit	Transmit MAC FIFO WR Shadow Pointer */
+-/*	TX_MFF_RP	32 bit	Transmit MAC FIFO Read Pointer */
+-/*	TX_MFF_PC	32 bit	Transmit MAC FIFO Packet Cnt */
+-/*	TX_MFF_LEV	32 bit	Transmit MAC FIFO Level */
++/*	RX_MFF_EA		32 bit	Receive MAC FIFO End Address */
++/*	RX_MFF_WP		32 bit 	Receive MAC FIFO Write Pointer */
++/*	RX_MFF_RP		32 bit	Receive MAC FIFO Read Pointer */
++/*	RX_MFF_PC		32 bit	Receive MAC FIFO Packet Counter */
++/*	RX_MFF_LEV		32 bit	Receive MAC FIFO Level */
++/*	TX_MFF_EA		32 bit	Transmit MAC FIFO End Address */
++/*	TX_MFF_WP		32 bit 	Transmit MAC FIFO Write Pointer */
++/*	TX_MFF_WSP		32 bit	Transmit MAC FIFO WR Shadow Pointer */
++/*	TX_MFF_RP		32 bit	Transmit MAC FIFO Read Pointer */
++/*	TX_MFF_PC		32 bit	Transmit MAC FIFO Packet Cnt */
++/*	TX_MFF_LEV		32 bit	Transmit MAC FIFO Level */
+ 								/* Bit 31.. 6:	reserved */
+ #define MFF_MSK			0x007fL	/* Bit	5.. 0:	MAC FIFO Address/Ptr Bits */
+ 
+@@ -1682,7 +1696,7 @@ extern "C" {
+ 
+ #define RX_GMF_FL_THR_DEF	0x0a	/* Rx GMAC FIFO Flush Threshold default */
+ 
+-/*	GMAC_TI_ST_CTRL		  8 bit	Time Stamp Timer Ctrl Reg (YUKON only) */
++/*	GMAC_TI_ST_CTRL	 8 bit	Time Stamp Timer Ctrl Reg (YUKON only) */
+ 								/* Bit 7.. 3:	reserved */
+ #define GMT_ST_START	BIT_2S		/* Start Time Stamp Timer */
+ #define GMT_ST_STOP		BIT_1S		/* Stop  Time Stamp Timer */
+@@ -1766,13 +1780,13 @@ extern "C" {
+ #define GMAC_DEF_MSK	(GM_IS_TX_CO_OV | GM_IS_RX_CO_OV | \
+ 						GM_IS_TX_FF_UR)
+ 
+-/*	GMAC_LINK_CTRL		16 bit	GMAC Link Control Reg (YUKON only) */
++/*	GMAC_LINK_CTRL	16 bit	GMAC Link Control Reg (YUKON only) */
+ 						/* Bits 15.. 2:	reserved */
+ #define GMLC_RST_CLR	BIT_1S		/* Clear GMAC Link Reset */
+ #define GMLC_RST_SET	BIT_0S		/* Set   GMAC Link Reset */
+ 
+ 
+-/*	WOL_CTRL_STAT		16 bit	WOL Control/Status Reg */
++/*	WOL_CTRL_STAT	16 bit	WOL Control/Status Reg */
+ #define WOL_CTL_LINK_CHG_OCC			BIT_15S
+ #define WOL_CTL_MAGIC_PKT_OCC			BIT_14S
+ #define WOL_CTL_PATTERN_OCC				BIT_13S
+@@ -1801,7 +1815,7 @@ extern "C" {
+ 	WOL_CTL_DIS_PATTERN_UNIT |		\
+ 	WOL_CTL_DIS_MAGIC_PKT_UNIT)
+ 
+-/*	WOL_MATCH_CTL		 8 bit	WOL Match Control Reg */
++/*	WOL_MATCH_CTL	 8 bit	WOL Match Control Reg */
+ #define WOL_CTL_PATT_ENA(x)				(BIT_0 << (x))
+ 
+ #define SK_NUM_WOL_PATTERN		7
+--- linux-2.6.0/drivers/net/sk98lin/h/skgehwt.h	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/net/sk98lin/h/skgehwt.h	2003-12-28 23:21:01.000000000 -0800
+@@ -1,9 +1,9 @@
+ /******************************************************************************
+  *
+  * Name:	skhwt.h
+- * Project:	Gigabit Ethernet Adapters, Schedule-Modul
+- * Version:	$Revision: 1.6 $
+- * Date:	$Date: 2003/05/13 17:57:48 $
++ * Project:	Gigabit Ethernet Adapters, Event Scheduler Module
++ * 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: skgehwt.h,v $
++ *	Revision 1.7  2003/09/16 12:55:08  rschmidt
++ *	Editorial changes
++ *	
+  *	Revision 1.6  2003/05/13 17:57:48  mkarl
+  *	Editorial changes.
+  *	
+@@ -34,7 +37,7 @@
+  *	Changed license header to GPL.
+  *	
+  *	Revision 1.4  1998/08/19 09:50:58  gklug
+- *	fix: remove struct keyword from c-code (see CCC) add typedefs
++ *	fix: remove struct keyword from C-code (see CCC) add typedefs
+  *	
+  *	Revision 1.3  1998/08/14 07:09:29  gklug
+  *	fix: chg pAc -> pAC
+@@ -44,10 +47,6 @@
+  *	
+  *	Revision 1.1  1998/08/07 09:32:58  gklug
+  *	first version
+- *	
+- *	
+- *	
+- *	
+  *
+  ******************************************************************************/
+ 
+@@ -64,14 +63,14 @@
+  * - use in Adapters context name pAC->Hwt
+  */
+ typedef	struct s_Hwt {
+-	SK_U32		TStart ;	/* HWT start */
+-	SK_U32		TStop ;		/* HWT stop */
+-	int		TActive ;	/* HWT: flag : active/inactive */
++	SK_U32		TStart;	/* HWT start */
++	SK_U32		TStop;	/* HWT stop */
++	int		TActive;	/* HWT: flag : active/inactive */
+ } SK_HWT;
+ 
+ extern void SkHwtInit(SK_AC *pAC, SK_IOC Ioc);
+ extern void SkHwtStart(SK_AC *pAC, SK_IOC Ioc, SK_U32 Time);
+ extern void SkHwtStop(SK_AC *pAC, SK_IOC Ioc);
+-extern SK_U32 SkHwtRead(SK_AC *pAC,SK_IOC Ioc);
++extern SK_U32 SkHwtRead(SK_AC *pAC, SK_IOC Ioc);
+ extern void SkHwtIsr(SK_AC *pAC, SK_IOC Ioc);
+ #endif	/* _SKGEHWT_H_ */
+--- linux-2.6.0/drivers/net/sk98lin/h/skgei2c.h	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/net/sk98lin/h/skgei2c.h	2003-12-28 23:21:01.000000000 -0800
+@@ -1,16 +1,17 @@
+ /******************************************************************************
+  *
+  * Name:	skgei2c.h
+- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
+- * 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.25 $
++ * Date:	$Date: 2003/10/20 09:06:05 $
++ * Purpose:	Special defines for TWSI
+  *
+  ******************************************************************************/
+ 
+ /******************************************************************************
+  *
+- *	(C)Copyright 1998-2002 SysKonnect GmbH.
++ *	(C)Copyright 1998-2002 SysKonnect.
++ *	(C)Copyright 2002-2003 Marvell.
+  *
+  *	This program is free software; you can redistribute it and/or modify
+  *	it under the terms of the GNU General Public License as published by
+@@ -26,6 +27,12 @@
+  * History:
+  *
+  *	$Log: skgei2c.h,v $
++ *	Revision 1.25  2003/10/20 09:06:05  rschmidt
++ *	Editorial changes.
++ *	
++ *	Revision 1.24  2003/09/23 09:31:15  malthoff
++ *	Parameter dev_size added to macro definition of SK_I2C_CTL.
++ *	
+  *	Revision 1.23  2002/12/19 14:34:27  rschmidt
+  *	Added cast in macros SK_I2C_SET_BIT() and SK_I2C_CLR_BIT()
+  *	Editorial changes (TWSI)
+@@ -107,8 +114,6 @@
+  *	Revision 1.1  1998/07/17 11:27:56  gklug
+  *	Created.
+  *
+- *
+- *
+  ******************************************************************************/
+ 
+ /*
+@@ -121,12 +126,13 @@
+ /*
+  * Macros to access the B2_I2C_CTRL
+  */
+-#define SK_I2C_CTL(IoC, flag, dev, reg, burst) \
++#define SK_I2C_CTL(IoC, flag, dev, dev_size, reg, burst) \
+ 	SK_OUT32(IoC, B2_I2C_CTRL,\
+ 		(flag ? 0x80000000UL : 0x0L) | \
+-		(((SK_U32) reg << 16) & I2C_ADDR) | \
+-		(((SK_U32) dev << 9) & I2C_DEV_SEL) | \
+-		(( burst << 4) & I2C_BURST_LEN))
++		(((SK_U32)reg << 16) & I2C_ADDR) | \
++		(((SK_U32)dev << 9) & I2C_DEV_SEL) | \
++		(dev_size & I2C_DEV_SIZE) | \
++		((burst << 4) & I2C_BURST_LEN))
+ 
+ #define SK_I2C_STOP(IoC) {				\
+ 	SK_U32	I2cCtrl;				\
+@@ -166,42 +172,42 @@
+  */
+ #define	SK_LM80_VT_LSB		22	/* 22mV LSB resolution */
+ #define	SK_LM80_TEMP_LSB	10	/* 1 degree LSB resolution */
+-#define	SK_LM80_TEMPEXT_LSB	5	/* 0.5 degree LSB resolution for the
+-					 * extension value
+-					 */
+-#define SK_LM80_FAN_FAKTOR	((22500L*60)/(1*2))
+-/* formula: counter = (22500*60)/(rpm * divisor * pulses/2)
++#define	SK_LM80_TEMPEXT_LSB	 5	/* 0.5 degree LSB resolution for ext. val. */
++
++/*
++ * formula: counter = (22500*60)/(rpm * divisor * pulses/2)
+  * assuming: 6500rpm, 4 pulses, divisor 1
+  */
++#define SK_LM80_FAN_FAKTOR	((22500L*60)/(1*2))
+ 
+ /*
+  * Define sensor management data
+- * Maximum is reached on copperfield with dual Broadcom.
++ * Maximum is reached on Genesis copper dual port and Yukon-64
+  * Board specific maximum is in pAC->I2c.MaxSens
+  */
+ #define	SK_MAX_SENSORS	8	/* maximal no. of installed sensors */
+ #define	SK_MIN_SENSORS	5	/* minimal no. of installed sensors */
+ 
+ /*
+- * To watch the statemachine (JS) use the timer in two ways instead of one as hitherto
++ * To watch the state machine (SM) use the timer in two ways
++ * instead of one as hitherto
+  */
+-#define	SK_TIMER_WATCH_STATEMACHINE	0	/* Watch the statemachine to finish in a specific time */
+-#define	SK_TIMER_NEW_GAUGING    	1	/* Start a new gauging when timer expires */
+-
++#define	SK_TIMER_WATCH_SM		0	/* Watch the SM to finish in a spec. time */
++#define	SK_TIMER_NEW_GAUGING	1	/* Start a new gauging when timer expires */
+ 
+ /*
+- * Defines for the individual Thresholds
++ * Defines for the individual thresholds
+  */
+ 
+ /* Temperature sensor */
+-#define	SK_SEN_TEMP_HIGH_ERR    800	/* Temperature High Err  Threshold */
++#define	SK_SEN_TEMP_HIGH_ERR	800	/* Temperature High Err  Threshold */
+ #define	SK_SEN_TEMP_HIGH_WARN	700	/* Temperature High Warn Threshold */
+ #define	SK_SEN_TEMP_LOW_WARN	100	/* Temperature Low  Warn Threshold */
+-#define	SK_SEN_TEMP_LOW_ERR       0	/* Temperature Low  Err  Threshold */
++#define	SK_SEN_TEMP_LOW_ERR		  0	/* Temperature Low  Err  Threshold */
+ 
+ /* VCC which should be 5 V */
+-#define	SK_SEN_PCI_5V_HIGH_ERR  	5588	/* Voltage PCI High Err  Threshold */
+-#define	SK_SEN_PCI_5V_HIGH_WARN     5346	/* Voltage PCI High Warn Threshold */
++#define	SK_SEN_PCI_5V_HIGH_ERR		5588	/* Voltage PCI High Err  Threshold */
++#define	SK_SEN_PCI_5V_HIGH_WARN		5346	/* Voltage PCI High Warn Threshold */
+ #define	SK_SEN_PCI_5V_LOW_WARN		4664	/* Voltage PCI Low  Warn Threshold */
+ #define	SK_SEN_PCI_5V_LOW_ERR		4422	/* Voltage PCI Low  Err  Threshold */
+ 
+@@ -229,17 +235,16 @@
+ #define	SK_SEN_PCI_IO_3V3_HIGH_ERR	3850	/* + 15% V PCI-IO High Err Threshold */
+ #define	SK_SEN_PCI_IO_3V3_HIGH_WARN	3674	/* + 10% V PCI-IO High Warn Threshold */
+ 					/*		3300	mVolt */
+-#define	SK_SEN_PCI_IO_3V3_LOW_WARN  2926	/* - 10% V PCI-IO Low Warn Threshold */
+-#define	SK_SEN_PCI_IO_3V3_LOW_ERR   2772	/* - 15% V PCI-IO Low Err  Threshold */
+-
++#define	SK_SEN_PCI_IO_3V3_LOW_WARN	2926	/* - 10% V PCI-IO Low Warn Threshold */
++#define	SK_SEN_PCI_IO_3V3_LOW_ERR	2772	/* - 15% V PCI-IO Low Err  Threshold */
+ 
+ /*
+  * VDD voltage
+  */
+-#define	SK_SEN_VDD_HIGH_ERR	    3630	/* Voltage ASIC High Err  Threshold */
+-#define	SK_SEN_VDD_HIGH_WARN    3476	/* Voltage ASIC High Warn Threshold */
+-#define	SK_SEN_VDD_LOW_WARN     3146	/* Voltage ASIC Low  Warn Threshold */
+-#define	SK_SEN_VDD_LOW_ERR      2970	/* Voltage ASIC Low  Err  Threshold */
++#define	SK_SEN_VDD_HIGH_ERR		3630	/* Voltage ASIC High Err  Threshold */
++#define	SK_SEN_VDD_HIGH_WARN	3476	/* Voltage ASIC High Warn Threshold */
++#define	SK_SEN_VDD_LOW_WARN		3146	/* Voltage ASIC Low  Warn Threshold */
++#define	SK_SEN_VDD_LOW_ERR		2970	/* Voltage ASIC Low  Err  Threshold */
+ 
+ /*
+  * PHY PLL 3V3 voltage
+@@ -255,8 +260,8 @@
+ #define	SK_SEN_VAUX_3V3_HIGH_ERR	3630	/* Voltage VAUX High Err Threshold */
+ #define	SK_SEN_VAUX_3V3_HIGH_WARN	3476	/* Voltage VAUX High Warn Threshold */
+ #define	SK_SEN_VAUX_3V3_LOW_WARN	3146	/* Voltage VAUX Low Warn Threshold */
+-#define	SK_SEN_VAUX_3V3_LOW_ERR	    2970	/* Voltage VAUX Low Err Threshold */
+-#define	SK_SEN_VAUX_0V_WARN_ERR	       0	/* if VAUX not present */
++#define	SK_SEN_VAUX_3V3_LOW_ERR		2970	/* Voltage VAUX Low Err Threshold */
++#define	SK_SEN_VAUX_0V_WARN_ERR		   0	/* if VAUX not present */
+ #define	SK_SEN_VAUX_RANGE_LIMITER	1000	/* 1000 mV range delimiter */
+ 
+ /*
+@@ -270,7 +275,7 @@
+ /*
+  * ASIC Core 1V5 voltage (YUKON only)
+  */
+-#define	SK_SEN_CORE_1V5_HIGH_ERR    1650	/* Voltage ASIC Core High Err Threshold */
++#define	SK_SEN_CORE_1V5_HIGH_ERR	1650	/* Voltage ASIC Core High Err Threshold */
+ #define	SK_SEN_CORE_1V5_HIGH_WARN	1575	/* Voltage ASIC Core High Warn Threshold */
+ #define	SK_SEN_CORE_1V5_LOW_WARN	1425	/* Voltage ASIC Core Low Warn Threshold */
+ #define	SK_SEN_CORE_1V5_LOW_ERR 	1350	/* Voltage ASIC Core Low Err Threshold */
+@@ -285,8 +290,8 @@
+  */
+ #define	SK_SEN_FAN_HIGH_ERR		20000	/* FAN Speed High Err Threshold */
+ #define	SK_SEN_FAN_HIGH_WARN	20000	/* FAN Speed High Warn Threshold */
+-#define	SK_SEN_FAN_LOW_WARN 	5200	/* FAN Speed Low Warn Threshold */
+-#define	SK_SEN_FAN_LOW_ERR		4550	/* FAN Speed Low Err Threshold */
++#define	SK_SEN_FAN_LOW_WARN		 5200	/* FAN Speed Low Warn Threshold */
++#define	SK_SEN_FAN_LOW_ERR		 4550	/* FAN Speed Low Err Threshold */
+ 
+ /*
+  * Some Voltages need dynamic thresholds
+--- linux-2.6.0/drivers/net/sk98lin/h/skgeinit.h	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/sk98lin/h/skgeinit.h	2003-12-28 23:21:01.000000000 -0800
+@@ -2,8 +2,8 @@
+  *
+  * Name:	skgeinit.h
+  * Project:	Gigabit Ethernet Adapters, Common Modules
+- * 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: 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()
++ *	Editorial changes
++ *	
++ *	Revision 1.82  2003/09/16 07:18:36  mschmid
++ *	Added members to port structure for MAC control
++ *	- PMacColThres
++ *	- PMacJamLen
++ *	- PMacJamIpgVal
++ *	- PMacJamIpgData
++ *	- PMacIpgData
++ *	- PMacLimit4
++ *	Added PHY power state to port structure
++ *	- PPhyPowerState
++ *	Added function prototypes to enter and leave low power modes
++ *	
+  *	Revision 1.81  2003/07/04 12:30:38  rschmidt
+  *	Added SK_FAR to pointers in MAC statistic functions (for PXE)
+  *	Editorial changes
+@@ -594,6 +611,13 @@ extern "C" {
+ #define SK_PRT_INIT		2	/* the port is initialized */
+ #define SK_PRT_RUN		3	/* the port has an active link */
+ 
++/* PHY power down modes */
++#define PHY_PM_OPERATIONAL_MODE		0	/* PHY operational mode */
++#define PHY_PM_DEEP_SLEEP			1	/* coma mode --> minimal power */
++#define PHY_PM_IEEE_POWER_DOWN		2	/* IEEE 22.2.4.1.5 compl. power down */
++#define PHY_PM_ENERGY_DETECT		3	/* energy detect */
++#define PHY_PM_ENERGY_DETECT_PLUS	4	/* energy detect plus */
++
+ /* Default receive frame limit for Workaround of XMAC Errata */
+ #define SK_DEF_RX_WA_LIM	SK_CONSTU64(100)
+ 
+@@ -685,6 +709,13 @@ typedef	struct s_GePort {
+ 	SK_U8	PCableLen;		/* Cable Length */
+ 	SK_U8	PMdiPairLen[4];	/* MDI[0..3] Pair Length */
+ 	SK_U8	PMdiPairSts[4];	/* MDI[0..3] Pair Diagnostic Status */
++	SK_U8	PPhyPowerState;	/* PHY current power state */
++	int		PMacColThres;	/* MAC Collision Threshold */
++	int		PMacJamLen;		/* MAC Jam length */
++	int		PMacJamIpgVal;	/* MAC Jam IPG */
++	int		PMacJamIpgData;	/* MAC IPG Jam to Data */
++	int		PMacIpgData;	/* MAC Data IPG */
++	SK_BOOL PMacLimit4;		/* reset collision counter and backoff algorithm */
+ } SK_GEPORT;
+ 
+ /*
+@@ -865,6 +896,11 @@ extern void	SkMacHardRst(
+ 	SK_IOC	IoC,
+ 	int		Port);
+ 
++extern void	SkMacClearRst(
++	SK_AC	*pAC,
++	SK_IOC	IoC,
++	int		Port);
++
+ extern void	SkXmInitMac(
+ 	SK_AC	*pAC,
+ 	SK_IOC	IoC,
+@@ -1040,6 +1076,17 @@ extern int SkGmCableDiagStatus(
+ 	int		Port,
+ 	SK_BOOL	StartTest);
+ 
++extern int SkGmEnterLowPowerMode(
++	SK_AC	*pAC,
++	SK_IOC	IoC,
++	int		Port,
++	SK_U8	Mode);
++
++extern int SkGmLeaveLowPowerMode(
++	SK_AC	*pAC,
++	SK_IOC	IoC,
++	int		Port);
++
+ #ifdef SK_DIAG
+ extern void	SkGePhyRead(
+ 	SK_AC	*pAC,
+@@ -1101,6 +1148,7 @@ extern int	SkGeInitAssignRamToQueues();
+ extern void SkMacRxTxDisable();
+ extern void	SkMacSoftRst();
+ extern void	SkMacHardRst();
++extern void	SkMacClearRst();
+ extern void SkMacInitPhy();
+ extern int  SkMacRxTxEnable();
+ extern void SkMacPromiscMode();
+@@ -1131,6 +1179,8 @@ extern int	SkGmResetCounter();
+ extern int	SkXmOverflowStatus();
+ extern int	SkGmOverflowStatus();
+ extern int	SkGmCableDiagStatus();
++extern int	SkGmEnterLowPowerMode();
++extern int	SkGmLeaveLowPowerMode();
+ 
+ #ifdef SK_DIAG
+ extern void	SkGePhyRead();
+--- linux-2.6.0/drivers/net/sk98lin/h/skgepnmi.h	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/net/sk98lin/h/skgepnmi.h	2003-12-28 23:21:01.000000000 -0800
+@@ -2,8 +2,8 @@
+  *
+  * Name:	skgepnmi.h
+  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
+- * 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: skgepnmi.h,v $
++ *	Revision 1.62  2003/08/15 12:31:52  tschilli
++ *	Added new OIDs:
++ *	OID_SKGE_DRIVER_RELDATE
++ *	OID_SKGE_DRIVER_FILENAME
++ *	OID_SKGE_CHIPID
++ *	OID_SKGE_RAMSIZE
++ *	OID_SKGE_VAUXAVAIL
++ *	OID_SKGE_PHY_TYPE
++ *	OID_SKGE_PHY_LP_MODE
++ *	
++ *	Added new define SK_DIAG_ATTACHED for OID_SKGE_DIAG_MODE handling.
++ *	
+  *	Revision 1.61  2003/05/23 12:53:52  tschilli
+  *	Generic PNMI IOCTL subcommands added.
+  *	Function prototype SkPnmiGenIoctl() added.
+@@ -568,15 +580,23 @@
+ #define OID_SKGE_ALL_DATA				0xFF020190
+ 
+ /* Defines for VCT. */
+-#define OID_SKGE_VCT_GET			0xFF020200
+-#define OID_SKGE_VCT_SET			0xFF020201
+-#define OID_SKGE_VCT_STATUS			0xFF020202
++#define OID_SKGE_VCT_GET				0xFF020200
++#define OID_SKGE_VCT_SET				0xFF020201
++#define OID_SKGE_VCT_STATUS				0xFF020202
+ 
+ #ifdef SK_DIAG_SUPPORT
+ /* Defines for driver DIAG mode. */
+-#define OID_SKGE_DIAG_MODE			0xFF020204
++#define OID_SKGE_DIAG_MODE				0xFF020204
+ #endif /* SK_DIAG_SUPPORT */
+ 
++/* New OIDs */
++#define OID_SKGE_DRIVER_RELDATE			0xFF020210
++#define OID_SKGE_DRIVER_FILENAME		0xFF020211
++#define OID_SKGE_CHIPID					0xFF020212
++#define OID_SKGE_RAMSIZE				0xFF020213
++#define OID_SKGE_VAUXAVAIL				0xFF020214
++#define OID_SKGE_PHY_TYPE				0xFF020215
++#define OID_SKGE_PHY_LP_MODE			0xFF020216
+ 
+ /* VCT struct to store a backup copy of VCT data after a port reset. */
+ typedef struct s_PnmiVct {
+@@ -613,6 +633,12 @@ typedef struct s_PnmiVct {
+ #define OID_SKGE_TRAP_RLMT_PORT_UP		523
+ #define OID_SKGE_TRAP_RLMT_SEGMENTATION	524
+ 
++#ifdef SK_DIAG_SUPPORT
++/* Defines for driver DIAG mode. */
++#define SK_DIAG_ATTACHED	2
++#define SK_DIAG_RUNNING		1
++#define SK_DIAG_IDLE		0
++#endif /* SK_DIAG_SUPPORT */
+ 
+ /*
+  * Generic PNMI IOCTL subcommand definitions.
+@@ -730,6 +756,14 @@ typedef struct s_PnmiVct {
+ #define SK_PNMI_ERR051MSG	"SkPnmiEvent: Port switch suspicious"
+ #define SK_PNMI_ERR052		(SK_ERRBASE_PNMI + 52)
+ #define SK_PNMI_ERR052MSG	""
++#define SK_PNMI_ERR053		(SK_ERRBASE_PNMI + 53)
++#define SK_PNMI_ERR053MSG	"General: Driver release date not initialized"
++#define SK_PNMI_ERR054		(SK_ERRBASE_PNMI + 54)
++#define SK_PNMI_ERR054MSG	"General: Driver release date string too long"
++#define SK_PNMI_ERR055		(SK_ERRBASE_PNMI + 55)
++#define SK_PNMI_ERR055MSG	"General: Driver file name not initialized"
++#define SK_PNMI_ERR056		(SK_ERRBASE_PNMI + 56)
++#define SK_PNMI_ERR056MSG	"General: Driver file name string too long"
+ 
+ /*
+  * Management counter macros called by the driver
+@@ -740,6 +774,11 @@ typedef struct s_PnmiVct {
+ #define SK_PNMI_SET_DRIVER_VER(pAC,v)	((pAC)->Pnmi.pDriverVersion = \
+ 	(char *)(v))
+ 
++#define SK_PNMI_SET_DRIVER_RELDATE(pAC,v)	((pAC)->Pnmi.pDriverReleaseDate = \
++	(char *)(v))
++
++#define SK_PNMI_SET_DRIVER_FILENAME(pAC,v)	((pAC)->Pnmi.pDriverFileName = \
++	(char *)(v))
+ 
+ #define SK_PNMI_CNT_TX_QUEUE_LEN(pAC,v,p) \
+ 	{ \
+@@ -916,6 +955,8 @@ typedef struct s_PnmiConf {
+ 	char			ConfMacFactoryAddr[6];
+ 	SK_U8			ConfPMD;
+ 	SK_U8			ConfConnector;
++	SK_U32			ConfPhyType;
++	SK_U32			ConfPhyMode;
+ 	SK_U8			ConfLinkCapability;
+ 	SK_U8			ConfLinkMode;
+ 	SK_U8			ConfLinkModeStatus;
+@@ -964,9 +1005,14 @@ typedef struct s_PnmiStrucData {
+ 	SK_U32			DeviceType;
+ 	char			DriverDescr[SK_PNMI_STRINGLEN1];
+ 	char			DriverVersion[SK_PNMI_STRINGLEN2];
++	char			DriverReleaseDate[SK_PNMI_STRINGLEN1];
++	char			DriverFileName[SK_PNMI_STRINGLEN1];
+ 	char			HwDescr[SK_PNMI_STRINGLEN1];
+ 	char			HwVersion[SK_PNMI_STRINGLEN2];
+ 	SK_U16			Chipset;
++	SK_U32			ChipId;
++	SK_U8			VauxAvail;
++	SK_U32			RamSize;
+ 	SK_U32			MtuSize;
+ 	SK_U32			Action;
+ 	SK_U32			TestResult;
+@@ -1090,6 +1136,8 @@ typedef struct s_PnmiData {
+ 
+ 	char			*pDriverDescription;
+ 	char			*pDriverVersion;
++	char			*pDriverReleaseDate;
++	char			*pDriverFileName;
+ 
+ 	int				MacUpdatedFlag;
+ 	int				RlmtUpdatedFlag;
+@@ -1119,6 +1167,9 @@ typedef struct s_PnmiData {
+ 	SK_U8		VctStatus[SK_MAX_MACS];
+ 	SK_PNMI_VCT	VctBackup[SK_MAX_MACS];
+ 	SK_PNMI_VCT_TIMER VctTimeout[SK_MAX_MACS];
++#ifdef SK_DIAG_SUPPORT
++	SK_U32			DiagAttached;
++#endif /* SK_DIAG_SUPPORT */
+ } SK_PNMI;
+ 
+ 
+--- linux-2.6.0/drivers/net/sk98lin/h/ski2c.h	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/net/sk98lin/h/ski2c.h	2003-12-28 23:21:01.000000000 -0800
+@@ -1,16 +1,17 @@
+ /******************************************************************************
+  *
+  * Name:	ski2c.h
+- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
+- * Version:	$Revision: 1.34 $
+- * Date:	$Date: 2003/01/28 09:11:21 $
++ * Project:	Gigabit Ethernet Adapters, TWSI-Module
++ * Version:	$Revision: 1.35 $
++ * Date:	$Date: 2003/10/20 09:06:30 $
+  * Purpose:	Defines to access Voltage and Temperature Sensor
+  *
+  ******************************************************************************/
+ 
+ /******************************************************************************
+  *
+- *	(C)Copyright 1998-2003 SysKonnect GmbH.
++ *	(C)Copyright 1998-2002 SysKonnect.
++ *	(C)Copyright 2002-2003 Marvell.
+  *
+  *	This program is free software; you can redistribute it and/or modify
+  *	it under the terms of the GNU General Public License as published by
+@@ -26,6 +27,10 @@
+  * History:
+  *
+  *	$Log: ski2c.h,v $
++ *	Revision 1.35  2003/10/20 09:06:30  rschmidt
++ *	Added prototypes for SkI2cRead() and SkI2cWrite().
++ *	Editorial changes.
++ *	
+  *	Revision 1.34  2003/01/28 09:11:21  rschmidt
+  *	Editorial changes
+  *	
+@@ -137,7 +142,6 @@
+  *	Revision 1.1  1998/06/19 14:30:10  malthoff
+  *	Created. Sources taken from ML Project.
+  *
+- *
+  ******************************************************************************/
+ 
+ /*
+@@ -252,7 +256,7 @@ struct	s_Sensor {
+ 	SK_I32	SenThreWarnLow;		/* Lower warning Threshold of the sensor */
+ 	int		SenErrFlag;			/* Sensor indicated an error */
+ 	SK_BOOL	SenInit;			/* Is sensor initialized ? */
+-	SK_U64	SenErrCts;			/* Error  trap counter */
++	SK_U64	SenErrCts;			/* Error trap counter */
+ 	SK_U64	SenWarnCts;			/* Warning trap counter */
+ 	SK_U64	SenBegErrTS;		/* Begin error timestamp */
+ 	SK_U64	SenBegWarnTS;		/* Begin warning timestamp */
+@@ -279,13 +283,17 @@ typedef	struct	s_I2c {
+ #endif /* !SK_DIAG */
+ } SK_I2C;
+ 
++extern int SkI2cInit(SK_AC *pAC, SK_IOC IoC, int Level);
++extern int SkI2cWrite(SK_AC *pAC, SK_IOC IoC, SK_U32 Data, int Dev, int Size,
++					   int Reg, int Burst);
+ extern int SkI2cReadSensor(SK_AC *pAC, SK_IOC IoC, SK_SENSOR *pSen);
+-#ifndef SK_DIAG
++#ifdef SK_DIAG
++extern	SK_U32 SkI2cRead(SK_AC *pAC, SK_IOC IoC, int Dev, int Size, int Reg,
++						 int Burst);
++#else /* !SK_DIAG */
+ extern int SkI2cEvent(SK_AC *pAC, SK_IOC IoC, SK_U32 Event, SK_EVPARA Para);
+-extern int SkI2cInit(SK_AC *pAC, SK_IOC IoC, int Level);
+ extern void SkI2cWaitIrq(SK_AC *pAC, SK_IOC IoC);
+ extern void SkI2cIsr(SK_AC *pAC, SK_IOC IoC);
+-
+-#endif
++#endif /* !SK_DIAG */
+ #endif /* n_SKI2C_H */
+ 
+--- linux-2.6.0/drivers/net/sk98lin/h/skqueue.h	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/net/sk98lin/h/skqueue.h	2003-12-28 23:21:01.000000000 -0800
+@@ -1,9 +1,9 @@
+ /******************************************************************************
+  *
+  * Name:	skqueue.h
+- * Project:	Gigabit Ethernet Adapters, Schedule-Modul
+- * Version:	$Revision: 1.15 $
+- * Date:	$Date: 2003/05/13 17:54:57 $
++ * Project:	Gigabit Ethernet Adapters, Event Scheduler Module
++ * Version:	$Revision: 1.16 $
++ * Date:	$Date: 2003/09/16 12:50:32 $
+  * Purpose:	Defines for the Event queue
+  *
+  ******************************************************************************/
+@@ -27,6 +27,9 @@
+  * History:
+  *
+  *	$Log: skqueue.h,v $
++ *	Revision 1.16  2003/09/16 12:50:32  rschmidt
++ *	Editorial changes
++ *	
+  *	Revision 1.15  2003/05/13 17:54:57  mkarl
+  *	Editorial changes.
+  *	
+@@ -47,7 +50,7 @@
+  *	add: typedef SK_QUEUE
+  *	
+  *	Revision 1.9  1998/08/19 09:50:59  gklug
+- *	fix: remove struct keyword from c-code (see CCC) add typedefs
++ *	fix: remove struct keyword from C-code (see CCC) add typedefs
+  *	
+  *	Revision 1.8  1998/08/18 07:00:01  gklug
+  *	fix: SK_PTR not defined use void * instead.
+@@ -74,8 +77,6 @@
+  *	Revision 1.1  1998/07/30 14:52:12  gklug
+  *	Initial version.
+  *	Defines Event Classes, Event structs and queue management variables.
+- *	
+- *	
+  *
+  ******************************************************************************/
+ 
+@@ -92,7 +93,7 @@
+  */
+ #define	SKGE_DRV	1	/* Driver Event Class */
+ #define	SKGE_RLMT	2	/* RLMT Event Class */
+-#define	SKGE_I2C	3	/* i2C Event Class */
++#define	SKGE_I2C	3	/* I2C Event Class */
+ #define	SKGE_PNMI	4	/* PNMI Event Class */
+ #define	SKGE_CSUM	5	/* Checksum Event Class */
+ #define	SKGE_HWAC	6	/* Hardware Access Event Class */
+@@ -121,25 +122,25 @@ typedef	union u_EvPara {
+  * Event Queue
+  *	skqueue.c
+  * events are class/value pairs
+- *	class	is addressee, e.g. RMT, PCM etc.
++ *	class	is addressee, e.g. RLMT, PNMI etc.
+  *	value	is command, e.g. line state change, ring op change etc.
+  */
+ typedef	struct s_EventElem {
+-	SK_U32		Class ;			/* Event class */
+-	SK_U32		Event ;			/* Event value */
+-	SK_EVPARA	Para ;			/* Event parameter */
++	SK_U32		Class;			/* Event class */
++	SK_U32		Event;			/* Event value */
++	SK_EVPARA	Para;			/* Event parameter */
+ } SK_EVENTELEM;
+ 
+ typedef	struct s_Queue {
+ 	SK_EVENTELEM	EvQueue[SK_MAX_EVENT];
+-	SK_EVENTELEM	*EvPut ;
+-	SK_EVENTELEM	*EvGet ;
++	SK_EVENTELEM	*EvPut;
++	SK_EVENTELEM	*EvGet;
+ } SK_QUEUE;
+ 
+ extern	void SkEventInit(SK_AC *pAC, SK_IOC Ioc, int Level);
+ extern	void SkEventQueue(SK_AC *pAC, SK_U32 Class, SK_U32 Event,
+ 	SK_EVPARA Para);
+-extern	int SkEventDispatcher(SK_AC *pAC,SK_IOC Ioc);
++extern	int SkEventDispatcher(SK_AC *pAC, SK_IOC Ioc);
+ 
+ 
+ /* Define Error Numbers and messages */
+--- linux-2.6.0/drivers/net/sk98lin/h/sktimer.h	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/net/sk98lin/h/sktimer.h	2003-12-28 23:21:01.000000000 -0800
+@@ -1,9 +1,9 @@
+ /******************************************************************************
+  *
+  * Name:	sktimer.h
+- * Project:	Gigabit Ethernet Adapters, Schedule-Modul
+- * Version:	$Revision: 1.10 $
+- * Date:	$Date: 2003/05/13 17:56:44 $
++ * Project:	Gigabit Ethernet Adapters, Event Scheduler Module
++ * Version:	$Revision: 1.11 $
++ * Date:	$Date: 2003/09/16 12:58:18 $
+  * Purpose:	Defines for the timer functions
+  *
+  ******************************************************************************/
+@@ -27,6 +27,9 @@
+  * History:
+  *
+  *	$Log: sktimer.h,v $
++ *	Revision 1.11  2003/09/16 12:58:18  rschmidt
++ *	Editorial changes
++ *	
+  *	Revision 1.10  2003/05/13 17:56:44  mkarl
+  *	Editorial changes.
+  *	
+@@ -40,7 +43,7 @@
+  *	fix: SK_TIMCTRL needs to be defined
+  *	
+  *	Revision 1.6  1998/08/19 09:51:00  gklug
+- *	fix: remove struct keyword from c-code (see CCC) add typedefs
++ *	fix: remove struct keyword from C-code (see CCC) add typedefs
+  *	
+  *	Revision 1.5  1998/08/17 13:43:21  gklug
+  *	chg: Parameter will be union of 64bit para, 2 times SK_U32 or SK_PTR
+@@ -78,25 +81,25 @@
+ typedef	struct s_Timer SK_TIMER;
+ 
+ struct s_Timer {
+-	SK_TIMER	*TmNext ;	/* linked list */
+-	SK_U32		TmClass ;	/* Timer Event class */
+-	SK_U32		TmEvent ;	/* Timer Event value */
+-	SK_EVPARA	TmPara ;	/* Timer Event parameter */
+-	SK_U32		TmDelta ;	/* delta time */
+-	int		TmActive ;	/* flag : active/inactive */
+-} ;
++	SK_TIMER	*TmNext;	/* linked list */
++	SK_U32		TmClass;	/* Timer Event class */
++	SK_U32		TmEvent;	/* Timer Event value */
++	SK_EVPARA	TmPara;		/* Timer Event parameter */
++	SK_U32		TmDelta;	/* delta time */
++	int			TmActive;	/* flag: active/inactive */
++};
+ 
+ /*
+  * Timer control struct.
+  * - use in Adapters context name pAC->Tim
+  */
+ typedef	struct s_TimCtrl {
+-	SK_TIMER	*StQueue ;	/* Head of Timer queue */
+-} SK_TIMCTRL ;
++	SK_TIMER	*StQueue;	/* Head of Timer queue */
++} SK_TIMCTRL;
+ 
+-extern void SkTimerInit(SK_AC *pAC,SK_IOC Ioc, int Level);
+-extern void SkTimerStop(SK_AC *pAC,SK_IOC Ioc,SK_TIMER *pTimer);
+-extern void SkTimerStart(SK_AC *pAC,SK_IOC Ioc,SK_TIMER *pTimer,
+-	SK_U32 Time,SK_U32 Class,SK_U32 Event,SK_EVPARA Para);
+-extern void SkTimerDone(SK_AC *pAC,SK_IOC Ioc);
++extern void SkTimerInit(SK_AC *pAC, SK_IOC Ioc, int Level);
++extern void SkTimerStop(SK_AC *pAC, SK_IOC Ioc, SK_TIMER *pTimer);
++extern void SkTimerStart(SK_AC *pAC, SK_IOC Ioc, SK_TIMER *pTimer,
++	SK_U32 Time, SK_U32 Class, SK_U32 Event, SK_EVPARA Para);
++extern void SkTimerDone(SK_AC *pAC, SK_IOC Ioc);
+ #endif	/* _SKTIMER_H_ */
+--- linux-2.6.0/drivers/net/sk98lin/h/sktypes.h	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/sk98lin/h/sktypes.h	2003-12-28 23:21:01.000000000 -0800
+@@ -2,15 +2,16 @@
+  *
+  * Name:	sktypes.h
+  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
+- * 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
+  *
+  ******************************************************************************/
+ 
+ /******************************************************************************
+  *
+- *	(C)Copyright 1998-2003 SysKonnect GmbH.
++ *	(C)Copyright 1998-2002 SysKonnect GmbH.
++ *	(C)Copyright 2002-2003 Marvell.
+  *
+  *	This program is free software; you can redistribute it and/or modify
+  *	it under the terms of the GNU General Public License as published by
+@@ -26,6 +27,9 @@
+  * History:
+  *
+  *	$Log: sktypes.h,v $
++ *	Revision 1.2  2003/10/07 08:16:51  mlindner
++ *	Fix: Copyright changes
++ *	
+  *	Revision 1.1  2003/07/21 07:26:01  rroesler
+  *	Fix: Re-Enter after CVS crash
+  *	
+--- linux-2.6.0/drivers/net/sk98lin/h/skversion.h	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/sk98lin/h/skversion.h	2003-12-28 23:21:01.000000000 -0800
+@@ -2,15 +2,16 @@
+  *
+  * Name:	version.h
+  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
+- * 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
+  *
+  ******************************************************************************/
+ 
+ /******************************************************************************
+  *
+- *	(C)Copyright 1998-2003 SysKonnect GmbH.
++ *	(C)Copyright 1998-2002 SysKonnect GmbH.
++ *	(C)Copyright 2002-2003 Marvell.
+  *
+  *	This program is free software; you can redistribute it and/or modify
+  *	it under the terms of the GNU General Public License as published by
+@@ -25,6 +26,12 @@
+  *
+  * History:
+  *	$Log: skversion.h,v $
++ *	Revision 1.5  2003/10/07 08:16:51  mlindner
++ *	Fix: Copyright changes
++ *	
++ *	Revision 1.4  2003/09/22 08:40:10  mlindner
++ *	Add: Added DRIVER_FILE_NAME and DRIVER_REL_DATE
++ *	
+  *	Revision 1.3  2003/08/25 13:34:48  mlindner
+  *	Fix: Lint changes
+  *	
+@@ -54,12 +61,14 @@
+ #ifdef	lint
+ static const char SysKonnectFileId[] = "@(#) (C) SysKonnect GmbH.";
+ static const char SysKonnectBuildNumber[] =
+-	"@(#)SK-BUILD: 6.18 PL: 01"; 
++	"@(#)SK-BUILD: 6.21 PL: 01"; 
+ #endif	/* !defined(lint) */
+ 
+-#define BOOT_STRING	"sk98lin: Network Device Driver v6.18\n" \
++#define BOOT_STRING	"sk98lin: Network Device Driver v6.21\n" \
+ 			"(C)Copyright 1999-2003 Marvell(R)."
+ 
+-#define VER_STRING	"6.18"
++#define VER_STRING	"6.21"
++#define DRIVER_FILE_NAME	"sk98lin"
++#define DRIVER_REL_DATE		"Dec-15-2003"
+ 
+ 
+--- linux-2.6.0/drivers/net/sk98lin/h/xmac_ii.h	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/net/sk98lin/h/xmac_ii.h	2003-12-28 23:21:01.000000000 -0800
+@@ -2,8 +2,8 @@
+  *
+  * Name:	xmac_ii.h
+  * Project:	Gigabit Ethernet Adapters, Common Modules
+- * 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: 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
++ *	Editorial changes
++ *	
++ *	Revision 1.51  2003/09/23 09:04:27  malthoff
++ *	Add bit definitions for PHY_MARV_EXT_P_STAT.
++ *	
++ *	Revision 1.50  2003/09/16 14:15:07  rschmidt
++ *	Added defines for Extended PHY Specific Control
++ *	Editorial changes
++ *	
++ *	Revision 1.49  2003/09/16 07:22:46  mschmid
++ *	Added defines for Marvell PHY energy detect modes
++ *	Added macros for MAC parameter setting in port structure
++ *	
+  *	Revision 1.48  2003/05/13 17:17:55  mkarl
+  *	Editorial changes.
+  *	
+@@ -676,7 +692,7 @@ extern "C" {
+ #define PHY_XMAC_AUNE_LP	0x05	/* 16 bit r/o	Link Partner Abi Reg */
+ #define PHY_XMAC_AUNE_EXP	0x06	/* 16 bit r/o	Auto-Neg. Expansion Reg */
+ #define PHY_XMAC_NEPG		0x07	/* 16 bit r/w	Next Page Register */
+-#define PHY_XMAC_NEPG_LP	0x08	/* 16 bit r/o	Next Page Link P Reg */
++#define PHY_XMAC_NEPG_LP	0x08	/* 16 bit r/o	Next Page Link Partner */
+ 	/* 0x09 - 0x0e:		reserved */
+ #define PHY_XMAC_EXT_STAT	0x0f	/* 16 bit r/o	Ext Status Register */
+ #define PHY_XMAC_RES_ABI	0x10	/* 16 bit r/o	PHY Resolved Ability */
+@@ -693,7 +709,7 @@ extern "C" {
+ #define PHY_BCOM_AUNE_LP	0x05	/* 16 bit r/o	Link Part Ability Reg */
+ #define PHY_BCOM_AUNE_EXP	0x06	/* 16 bit r/o	Auto-Neg. Expansion Reg */
+ #define PHY_BCOM_NEPG		0x07	/* 16 bit r/w	Next Page Register */
+-#define PHY_BCOM_NEPG_LP	0x08	/* 16 bit r/o	Next Page Link P Reg */
++#define PHY_BCOM_NEPG_LP	0x08	/* 16 bit r/o	Next Page Link Partner */
+ 	/* Broadcom-specific registers */
+ #define PHY_BCOM_1000T_CTRL	0x09	/* 16 bit r/w	1000Base-T Ctrl Reg */
+ #define PHY_BCOM_1000T_STAT	0x0a	/* 16 bit r/o	1000Base-T Status Reg */
+@@ -702,7 +718,7 @@ extern "C" {
+ #define PHY_BCOM_P_EXT_CTRL	0x10	/* 16 bit r/w	PHY Extended Ctrl Reg */
+ #define PHY_BCOM_P_EXT_STAT	0x11	/* 16 bit r/o	PHY Extended Stat Reg */
+ #define PHY_BCOM_RE_CTR		0x12	/* 16 bit r/w	Receive Error Counter */
+-#define PHY_BCOM_FC_CTR		0x13	/* 16 bit r/w	False Carr Sense Cnt */
++#define PHY_BCOM_FC_CTR		0x13	/* 16 bit r/w	False Carrier Sense Cnt */
+ #define PHY_BCOM_RNO_CTR	0x14	/* 16 bit r/w	Receiver NOT_OK Cnt */
+ 	/* 0x15 - 0x17:		reserved */
+ #define PHY_BCOM_AUX_CTRL	0x18	/* 16 bit r/w	Auxiliary Control Reg */
+@@ -724,7 +740,7 @@ extern "C" {
+ #define PHY_MARV_AUNE_LP	0x05	/* 16 bit r/o	Link Part Ability Reg */
+ #define PHY_MARV_AUNE_EXP	0x06	/* 16 bit r/o	Auto-Neg. Expansion Reg */
+ #define PHY_MARV_NEPG		0x07	/* 16 bit r/w	Next Page Register */
+-#define PHY_MARV_NEPG_LP	0x08	/* 16 bit r/o	Next Page Link P Reg */
++#define PHY_MARV_NEPG_LP	0x08	/* 16 bit r/o	Next Page Link Partner */
+ 	/* Marvel-specific registers */
+ #define PHY_MARV_1000T_CTRL	0x09	/* 16 bit r/w	1000Base-T Ctrl Reg */
+ #define PHY_MARV_1000T_STAT	0x0a	/* 16 bit r/o	1000Base-T Status Reg */
+@@ -757,7 +773,7 @@ extern "C" {
+ #define PHY_LONE_AUNE_LP	0x05	/* 16 bit r/o	Link Part Ability Reg */
+ #define PHY_LONE_AUNE_EXP	0x06	/* 16 bit r/o	Auto-Neg. Expansion Reg */
+ #define PHY_LONE_NEPG		0x07	/* 16 bit r/w	Next Page Register */
+-#define PHY_LONE_NEPG_LP	0x08	/* 16 bit r/o	Next Page Link Partner*/
++#define PHY_LONE_NEPG_LP	0x08	/* 16 bit r/o	Next Page Link Partner */
+ 	/* Level One-specific registers */
+ #define PHY_LONE_1000T_CTRL	0x09	/* 16 bit r/w	1000Base-T Control Reg*/
+ #define PHY_LONE_1000T_STAT	0x0a	/* 16 bit r/o	1000Base-T Status Reg */
+@@ -804,12 +820,13 @@ extern "C" {
+ /*
+  * PHY bit definitions
+  * Bits defined as PHY_X_..., PHY_B_..., PHY_L_... or PHY_N_... are
+- * Xmac/Broadcom/LevelOne/National-specific.
++ * XMAC/Broadcom/LevelOne/National/Marvell-specific.
+  * All other are general.
+  */
+ 
+ /*****  PHY_XMAC_CTRL	16 bit r/w	PHY Control Register *****/
+ /*****  PHY_BCOM_CTRL	16 bit r/w	PHY Control Register *****/
++/*****  PHY_MARV_CTRL	16 bit r/w	PHY Status Register *****/
+ /*****  PHY_LONE_CTRL	16 bit r/w	PHY Control Register *****/
+ #define PHY_CT_RESET	(1<<15)	/* Bit 15: (sc)	clear all PHY related regs */
+ #define PHY_CT_LOOP		(1<<14)	/* Bit 14:	enable Loopback over PHY */
+@@ -909,27 +926,20 @@ extern "C" {
+ 
+ /*****  PHY_XMAC_AUNE_EXP	16 bit r/o	Auto-Negotiation Expansion Reg *****/
+ 								/* Bit 15..4:	reserved */
+-#define PHY_AN_LP_NP	(1<<3)	/* Bit  3:	Link Partner can Next Page */
+-#define PHY_AN_LOC_NP	(1<<2)	/* Bit  2:	Local PHY can Next Page */
+-#define PHY_AN_RX_PG	(1<<1)	/* Bit  1:	Page Received */
++#define PHY_ANE_LP_NP	(1<<3)	/* Bit  3:	Link Partner can Next Page */
++#define PHY_ANE_LOC_NP	(1<<2)	/* Bit  2:	Local PHY can Next Page */
++#define PHY_ANE_RX_PG	(1<<1)	/* Bit  1:	Page Received */
+ 								/* Bit  0:	reserved */
+ 
+ /*****  PHY_BCOM_AUNE_EXP	16 bit r/o	Auto-Negotiation Expansion Reg *****/
+-								/* Bit 15..5:	reserved */
+-#define PHY_B_AN_PDF	(1<<4)	/* Bit  4:	Parallel Detection Fault */
+-/*	PHY_AN_LP_NP		(see XMAC) Bit  3:	Link Partner can Next Page */
+-/*	PHY_AN_LOC_NP		(see XMAC) Bit  2:	Local PHY can Next Page */
+-/*	PHY_AN_RX_PG		(see XMAC) Bit  1:	Page Received */
+-#define PHY_B_AN_LP_CAP	(1<<0)	/* Bit  0:	Link Partner Auto-Neg. Cap. */ 	
+-
+ /*****  PHY_LONE_AUNE_EXP	16 bit r/o	Auto-Negotiation Expansion Reg *****/
+-#define PHY_L_AN_BP		(1<<5)	/* Bit  5:	Base Page Indication */
+-#define PHY_L_AN_PDF	(1<<4)	/* Bit  4:	Parallel Detection Fault */
+-/*	PHY_AN_LP_NP		(see XMAC) Bit  3:	Link Partner can Next Page */
+-/*	PHY_AN_LOC_NP		(see XMAC) Bit  2:	Local PHY can Next Page */
+-/*	PHY_AN_RX_PG		(see XMAC) Bit  1:	Page Received */
+-#define PHY_B_AN_LP_CAP	(1<<0)	/* Bit  0:	Link Partner Auto-Neg. Cap. */ 	
+-
++/*****  PHY_MARV_AUNE_EXP	16 bit r/o	Auto-Negotiation Expansion Reg *****/
++								/* Bit 15..5:	reserved */
++#define PHY_ANE_PAR_DF	(1<<4)	/* Bit  4:	Parallel Detection Fault */
++/*	PHY_ANE_LP_NP		(see XMAC) Bit  3:	Link Partner can Next Page */
++/*	PHY_ANE_LOC_NP		(see XMAC) Bit  2:	Local PHY can Next Page */
++/*	PHY_ANE_RX_PG		(see XMAC) Bit  1:	Page Received */
++#define PHY_ANE_LP_CAP	(1<<0)	/* Bit  0:	Link Partner Auto-Neg. Cap. */ 	
+ 
+ /*****  PHY_XMAC_NEPG		16 bit r/w	Next Page Register *****/
+ /*****  PHY_BCOM_NEPG		16 bit r/w	Next Page Register *****/
+@@ -958,7 +968,7 @@ extern "C" {
+ #define PHY_X_RS_HD		(1<<6)	/* Bit  6:	Half Duplex Mode selected */
+ #define PHY_X_RS_FD		(1<<5)	/* Bit  5:	Full Duplex Mode selected */
+ #define PHY_X_RS_ABLMIS (1<<4)	/* Bit  4:	duplex or pause cap mismatch */
+-#define PHY_X_RS_PAUMIS (1<<3)	/* Bit  3:	pause capability missmatch */
++#define PHY_X_RS_PAUMIS (1<<3)	/* Bit  3:	pause capability mismatch */
+ 								/* Bit  2..0:	reserved */
+ /*
+  * Remote Fault Bits (PHY_X_AN_RFB) encoding
+@@ -990,6 +1000,7 @@ extern "C" {
+ 									/* Bit  7..0:	reserved */
+ 
+ /*****  PHY_BCOM_1000T_STAT	16 bit r/o	1000Base-T Status Reg *****/
++/*****  PHY_MARV_1000T_STAT	16 bit r/o	1000Base-T Status Reg *****/
+ #define PHY_B_1000S_MSF		(1<<15)	/* Bit 15:	Master/Slave Fault */
+ #define PHY_B_1000S_MSR		(1<<14)	/* Bit 14:	Master/Slave Result */
+ #define PHY_B_1000S_LRS		(1<<13)	/* Bit 13:	Local Receiver Status */
+@@ -1309,7 +1320,6 @@ extern "C" {
+ 									/* Bit  7..0:	reserved */
+ 
+ /*****  PHY_MARV_PHY_CTRL	16 bit r/w	PHY Specific Ctrl Reg *****/
+-
+ #define PHY_M_PC_TX_FFD_MSK	(3<<14)	/* Bit 15..14:	Tx FIFO Depth Mask */
+ #define PHY_M_PC_RX_FFD_MSK	(3<<12)	/* Bit 13..12:	Rx FIFO Depth Mask */
+ #define PHY_M_PC_ASS_CRS_TX	(1<<11)	/* Bit 11:	Assert CRS on Transmit */
+@@ -1323,6 +1333,9 @@ extern "C" {
+ #define PHY_M_PC_POL_R_DIS	(1<<1)	/* Bit  1:	Polarity Reversal Disabled */
+ #define PHY_M_PC_DIS_JABBER	(1<<0)	/* Bit  0:	Disable Jabber */
+ 
++#define PHY_M_PC_EN_DET			SHIFT8(2)	/* Energy Detect (Mode 1) */
++#define PHY_M_PC_EN_DET_PLUS	SHIFT8(3)	/* Energy Detect Plus (Mode 2) */
++
+ #define PHY_M_PC_MDI_XMODE(x)	SHIFT5(x)	
+ #define PHY_M_PC_MAN_MDI	0    	/* 00 = Manual MDI configuration */
+ #define PHY_M_PC_MAN_MDIX	1		/* 01 = Manual MDIX configuration */
+@@ -1373,6 +1386,7 @@ extern "C" {
+ #define PHY_M_EC_M_DSC_MSK	(3<<10)	/* Bit 11..10:	Master downshift counter */
+ #define PHY_M_EC_S_DSC_MSK	(3<<8)	/* Bit  9.. 8:	Slave  downshift counter */
+ #define PHY_M_EC_MAC_S_MSK	(7<<4)	/* Bit  6.. 4:	Def. MAC interface speed */
++#define PHY_M_EC_FIB_AN_ENA	(1<<3)	/* Bit  3:	Fiber Auto-Neg. Enable */
+ 
+ #define PHY_M_EC_M_DSC(x)		SHIFT10(x)	/* 00=1x; 01=2x; 10=3x; 11=4x */
+ #define PHY_M_EC_S_DSC(x)		SHIFT8(x)	/* 00=dis; 01=1x; 10=2x; 11=3x */
+@@ -1434,6 +1448,18 @@ extern "C" {
+ #define PHY_M_EC2_FO_BOOST	(1<<3)	/* Bit  3:	Fiber Output Boost */
+ #define PHY_M_EC2_FO_AM_MSK	7		/* Bit  2.. 0:	Fiber Output Amplitude */
+ 
++/*****	PHY_MARV_EXT_P_STAT 16 bit r/w	Ext. PHY Specific Status *****/
++#define PHY_M_FC_AUTO_SEL	(1<<15)	/* Bit 15:	Fiber/Copper Auto Sel. dis. */
++#define PHY_M_FC_AN_REG_ACC (1<<14) /* Bit 14:	Fiber/Copper Autoneg. reg acc */
++#define PHY_M_FC_RESULUTION (1<<13)	/* Bit 13:	Fiber/Copper Resulution */
++#define PHY_M_SER_IF_AN_BP  (1<<12) /* Bit 12:	Ser IF autoneg. bypass enable */
++#define PHY_M_SER_IF_BP_ST	(1<<11) /* Bit 11:	Ser IF autoneg. bypass status */
++#define PHY_M_IRQ_POLARITY	(1<<10) /* Bit 10:	IRQ polarity */
++									/* Bit 9..4: reserved */
++#define PHY_M_UNDOC1		(1<< 7) /* undocumented bit !! */
++#define PHY_M_MODE_MASK		(0xf<<0)/* Bit 3..0: copy of HWCFG MODE[3:0] */
++
++
+ /*****  PHY_MARV_CABLE_DIAG	16 bit r/o	Cable Diagnostic Reg *****/
+ #define PHY_M_CABD_ENA_TEST	(1<<15)	/* Bit 15:	Enable Test */
+ #define PHY_M_CABD_STAT_MSK	(3<<13)	/* Bit 14..13:	Status */
+@@ -1531,7 +1557,7 @@ extern "C" {
+ #define GM_RXF_SHT \
+ 			(GM_MIB_CNT_BASE + 80)	/* Frames <64 Byte Received OK */
+ #define GM_RXE_FRAG \
+-			(GM_MIB_CNT_BASE + 88)	/* Frames <64 Byte Receeived with FCS Err */
++			(GM_MIB_CNT_BASE + 88)	/* Frames <64 Byte Received with FCS Err */
+ #define GM_RXF_64B \
+ 			(GM_MIB_CNT_BASE + 96)	/* 64 Byte Rx Frame */
+ #define GM_RXF_127B \
+@@ -1606,7 +1632,6 @@ extern "C" {
+  */
+ 
+ /*	GM_GP_STAT	16 bit r/o	General Purpose Status Register */
+-
+ #define GM_GPSR_SPEED		(1<<15) /* Bit 15:	Port Speed (1 = 100 Mbps) */
+ #define GM_GPSR_DUPLEX		(1<<14) /* Bit 14:	Duplex Mode (1 = Full) */
+ #define GM_GPSR_FC_TX_DIS	(1<<13) /* Bit 13:	Tx Flow-Control Mode Disabled */
+@@ -1646,11 +1671,14 @@ extern "C" {
+ 							 GM_GPCR_AU_SPD_DIS)
+ 	
+ /*	GM_TX_CTRL				16 bit r/w	Transmit Control Register */
+-
+ #define GM_TXCR_FORCE_JAM	(1<<15)	/* Bit 15:	Force Jam / Flow-Control */
+ #define GM_TXCR_CRC_DIS		(1<<14)	/* Bit 14:	Disable insertion of CRC */
+ #define GM_TXCR_PAD_DIS		(1<<13)	/* Bit 13:	Disable padding of packets */
+-#define GM_TXCR_COL_THR		(4<<10)	/* Bit 12..10:	Collision Threshold */
++#define GM_TXCR_COL_THR_MSK	(1<<10)	/* Bit 12..10:	Collision Threshold */
++
++#define TX_COL_THR(x)		(SHIFT10(x) & GM_TXCR_COL_THR_MSK)
++
++#define TX_COL_DEF			0x04
+ 	
+ /*	GM_RX_CTRL				16 bit r/w	Receive Control Register */
+ #define GM_RXCR_UCF_ENA		(1<<15)	/* Bit 15:	Enable Unicast filtering */
+@@ -1663,35 +1691,41 @@ extern "C" {
+ #define GM_TXPA_JAMIPG_MSK	(0x1f<<9)	/* Bit 13..9:	Jam IPG */
+ #define GM_TXPA_JAMDAT_MSK	(0x1f<<4)	/* Bit  8..4:	IPG Jam to Data */
+ 								/* Bit  3..0:	reserved */
+-#define JAM_LEN_VAL(x)		SHIFT14(x)
+-#define JAM_IPG_VAL(x)		SHIFT9(x)
+-#define IPG_JAM_DATA(x)		SHIFT4(x)
++
++#define TX_JAM_LEN_VAL(x)	(SHIFT14(x) & GM_TXPA_JAMLEN_MSK)
++#define TX_JAM_IPG_VAL(x)	(SHIFT9(x) & GM_TXPA_JAMIPG_MSK)
++#define TX_IPG_JAM_DATA(x)	(SHIFT4(x) & GM_TXPA_JAMDAT_MSK)
++
++#define TX_JAM_LEN_DEF		0x03
++#define TX_JAM_IPG_DEF		0x0b
++#define TX_IPG_JAM_DEF		0x1c
+ 
+ /*	GM_SERIAL_MODE			16 bit r/w	Serial Mode Register */
+-#define GM_SMOD_DATABL_MSK	(0x1f<<11)	/* Bit 15..11:	Data Blinder */
++#define GM_SMOD_DATABL_MSK	(0x1f<<11)	/* Bit 15..11:	Data Blinder (r/o) */
+ #define GM_SMOD_LIMIT_4		(1<<10)	/* Bit 10:	4 consecutive Tx trials */
+ #define GM_SMOD_VLAN_ENA	(1<<9)	/* Bit  9:	Enable VLAN  (Max. Frame Len) */
+ #define GM_SMOD_JUMBO_ENA	(1<<8)	/* Bit  8:	Enable Jumbo (Max. Frame Len) */
+ 								/* Bit  7..5:	reserved */
+ #define GM_SMOD_IPG_MSK		0x1f	/* Bit 4..0:	Inter-Packet Gap (IPG) */
+ 	
+-#define DATA_BLIND_VAL(x)	SHIFT11(x)
+-#define DATA_BLIND_FAST_ETH	0x1c
+-#define DATA_BLIND_GIGABIT	4
++#define DATA_BLIND_VAL(x)	(SHIFT11(x) & GM_SMOD_DATABL_MSK)
++#define DATA_BLIND_DEF		0x04
+ 
+-#define IPG_VAL_FAST_ETH	0x1e
+-#define IPG_VAL_GIGABIT		6
++#define IPG_DATA_VAL(x)		(x & GM_SMOD_IPG_MSK)
++#define IPG_DATA_DEF		0x1e
+ 
+ /*	GM_SMI_CTRL				16 bit r/w	SMI Control Register */
+-
+-#define GM_SMI_CT_PHY_AD(x)	SHIFT11(x)
+-#define GM_SMI_CT_REG_AD(x)	SHIFT6(x)
++#define GM_SMI_CT_PHY_A_MSK	(0x1f<<11)	/* Bit 15..11:	PHY Device Address */
++#define GM_SMI_CT_REG_A_MSK	(0x1f<<6)	/* Bit 10.. 6:	PHY Register Address */
+ #define GM_SMI_CT_OP_RD		(1<<5)	/* Bit  5:	OpCode Read (0=Write)*/
+ #define GM_SMI_CT_RD_VAL	(1<<4)	/* Bit  4:	Read Valid (Read completed) */
+ #define GM_SMI_CT_BUSY		(1<<3)	/* Bit  3:	Busy (Operation in progress) */
+ 								/* Bit   2..0:	reserved */
+ 	
+-/*	GM_PHY_ADDR				16 bit r/w	GPHY Address Register */
++#define GM_SMI_CT_PHY_AD(x)	(SHIFT11(x) & GM_SMI_CT_PHY_A_MSK)
++#define GM_SMI_CT_REG_AD(x)	(SHIFT6(x) & GM_SMI_CT_REG_A_MSK)
++
++	/*	GM_PHY_ADDR				16 bit r/w	GPHY Address Register */
+ 								/* Bit  15..6:	reserved */
+ #define GM_PAR_MIB_CLR		(1<<5)	/* Bit  5:	Set MIB Clear Counter Mode */
+ #define GM_PAR_MIB_TST		(1<<4)	/* Bit  4:	MIB Load Counter (Test Mode) */
+--- linux-2.6.0/drivers/net/sk98lin/Makefile	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/net/sk98lin/Makefile	2003-12-28 23:21:01.000000000 -0800
+@@ -76,7 +76,7 @@ endif
+ # SK_DBGCAT_DRV_INT_SRC         0x04000000      interrupts sources
+ # SK_DBGCAT_DRV_EVENT           0x08000000      driver events
+ 
+-EXTRA_CFLAGS += -Idrivers/net/sk98lin -DSK_USE_CSUM -DGENESIS -DYUKON $(DBGDEF) $(SKPARAM)
++EXTRA_CFLAGS += -Idrivers/net/sk98lin -DSK_DIAG_SUPPORT -DSK_USE_CSUM -DGENESIS -DYUKON $(DBGDEF) $(SKPARAM)
+ 
+ clean:
+ 	rm -f core *.o *.a *.s
+--- linux-2.6.0/drivers/net/sk98lin/skcsum.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/net/sk98lin/skcsum.c	2003-12-28 23:21:01.000000000 -0800
+@@ -2,8 +2,8 @@
+  *
+  * Name:	skcsum.c
+  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
+- * 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: skcsum.c,v $
++ *	Revision 1.12  2003/08/20 13:55:53  mschmid
++ *	Changed notation of #ifndef SkCsCalculateChecksum to
++ *	#ifndef SK_CS_CALCULATE_CHECKSUM
++ *	
+  *	Revision 1.11  2003/03/11 14:05:55  rschmidt
+  *	Replaced memset() by macro SK_MEMSET()
+  *	Editorial changes
+@@ -78,7 +82,7 @@
+ 
+ #ifndef lint
+ static const char SysKonnectFileId[] =
+-	"@(#) $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 */
+ 
+ /******************************************************************************
+@@ -791,7 +795,7 @@ int			NetNumber)
+ 	*pChecksum2Offset = SKCS_MAC_HEADER_SIZE + SKCS_IP_HEADER_SIZE;
+ }	/* SkCsSetReceiveFlags */
+ 
+-#ifndef SkCsCalculateChecksum
++#ifndef SK_CS_CALCULATE_CHECKSUM
+ 
+ /******************************************************************************
+  *
+@@ -856,7 +860,7 @@ unsigned	Length)		/* Length of data. */
+ 	return ((unsigned) Checksum);
+ }	/* SkCsCalculateChecksum */
+ 
+-#endif /* SkCsCalculateChecksum */
++#endif /* SK_CS_CALCULATE_CHECKSUM */
+ 
+ /******************************************************************************
+  *
+--- linux-2.6.0/drivers/net/sk98lin/skdim.c	2003-10-08 15:07:09.000000000 -0700
++++ 25/drivers/net/sk98lin/skdim.c	2003-12-28 23:21:01.000000000 -0800
+@@ -2,8 +2,8 @@
+  *
+  * Name:	skdim.c
+  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
+- * 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
+  *
+  ******************************************************************************/
+@@ -11,6 +11,7 @@
+ /******************************************************************************
+  *
+  *	(C)Copyright 1998-2002 SysKonnect GmbH.
++ *	(C)Copyright 2002-2003 Marvell.
+  *
+  *	This program is free software; you can redistribute it and/or modify
+  *	it under the terms of the GNU General Public License as published by
+@@ -26,6 +27,15 @@
+  * History:
+  *	
+  *	$Log: skdim.c,v $
++ *	Revision 1.5  2003/11/28 12:55:40  rroesler
++ *	Fix: support for new process timing interface added
++ *	
++ *	Revision 1.4  2003/10/10 10:58:56  mlindner
++ *	Fix: CPU detection under the kernel 2.6
++ *	
++ *	Revision 1.3  2003/10/07 08:17:08  mlindner
++ *	Fix: Copyright changes
++ *	
+  *	Revision 1.2  2003/08/21 12:35:05  mlindner
+  *	Fix: Corrected CPU detection and compile errors on single CPU machines
+  *	
+@@ -62,7 +72,7 @@
+ 
+ #ifndef	lint
+ static const char SysKonnectFileId[] =
+-	"@(#) $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
+@@ -327,7 +337,9 @@ GetCurrentSystemLoad(SK_AC *pAC) {
+ 	**
+ 	**      struct kernel_stat kstat
+ 	**
+-	** is not marked as an exported symbol
++	** is not marked as an exported symbol in the file
++	**
++	**      kernel/ksyms.c 
+ 	**
+ 	** As a consequence, using this driver as KLM is not possible
+ 	** and any access of the structure kernel_stat via the 
+--- linux-2.6.0/drivers/net/sk98lin/skge.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/net/sk98lin/skge.c	2003-12-28 23:21:01.000000000 -0800
+@@ -1,35 +1,20 @@
+ /******************************************************************************
+  *
+- * Name:    skge.c
++ * Name:	skge.c
+  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
+- * 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
+  *
+  ******************************************************************************/
+ 
+ /******************************************************************************
+  *
+- *	(C)Copyright 1998-2003 SysKonnect GmbH.
++ *	(C)Copyright 1998-2002 SysKonnect GmbH.
++ *	(C)Copyright 2002-2003 Marvell.
+  *
+- *	Driver for SysKonnect Gigabit Ethernet Server Adapters:
+- *
+- *	SK-9871 (single link 1000Base-ZX)
+- *	SK-9872 (dual link   1000Base-ZX)
+- *	SK-9861 (single link 1000Base-SX, VF45 Volition Plug)
+- *	SK-9862 (dual link   1000Base-SX, VF45 Volition Plug)
+- *	SK-9841 (single link 1000Base-LX)
+- *	SK-9842 (dual link   1000Base-LX)
+- *	SK-9843 (single link 1000Base-SX)
+- *	SK-9844 (dual link   1000Base-SX)
+- *	SK-9821 (single link 1000Base-T)
+- *	SK-9822 (dual link   1000Base-T)
+- *	SK-9881 (single link 1000Base-SX V2 LC)
+- *	SK-9871 (single link 1000Base-ZX V2)
+- *	SK-9861 (single link 1000Base-SX V2, VF45 Volition Plug)
+- *	SK-9841 (single link 1000Base-LX V2)
+- *	SK-9843 (single link 1000Base-SX V2)
+- *	SK-9821 (single link 1000Base-T V2)
++ *	Driver for Marvell Yukon chipset and SysKonnect Gigabit Ethernet 
++ *      Server Adapters.
+  *
+  *	Created 10-Feb-1999, based on Linux' acenic.c, 3c59x.c and
+  *	SysKonnects GEnesis Solaris driver
+@@ -56,6 +41,87 @@
+  * History:
+  *
+  *	$Log: skge.c,v $
++ *	Revision 1.42  2003/12/12 10:05:43  mlindner
++ *	Fix: Format of error message corrected
++ *	
++ *	Revision 1.41  2003/12/11 16:03:57  mlindner
++ *	Fix: Create backup from pnmi data structure
++ *	
++ *	Revision 1.40  2003/12/11 12:14:48  mlindner
++ *	Fix: Initalize Board before network configuration
++ *	Fix: Change device names to driver name
++ *	
++ *	Revision 1.39  2003/12/10 08:57:38  rroesler
++ *	Fix: Modifications regarding try_module_get() and capable()
++ *	
++ *	Revision 1.38  2003/12/01 17:16:50  mlindner
++ *	Fix: Remove useless register_netdev
++ *	
++ *	Revision 1.37  2003/12/01 17:11:30  mlindner
++ *	Fix: Register net device before SkGeBoardInit
++ *	
++ *	Revision 1.36  2003/11/28 13:04:27  rroesler
++ *	Fix: do not print interface status in case DIAG is used
++ *	
++ *	Revision 1.35  2003/11/17 14:41:06  mlindner
++ *	Fix: Endif command
++ *	
++ *	Revision 1.34  2003/11/17 13:29:05  mlindner
++ *	Fix: Editorial changes
++ *	
++ *	Revision 1.33  2003/11/14 14:56:54  rroesler
++ *	Fix: corrected compilation warnings kernel 2.2
++ *	
++ *	Revision 1.32  2003/11/13 14:18:47  rroesler
++ *	Fix: added latest changes regarding the use of the proc system
++ *	
++ *	Revision 1.31  2003/11/13 09:28:35  rroesler
++ *	Fix: removed kernel warning 'driver changed get_stats after register'
++ *	
++ *	Revision 1.30  2003/11/11 13:15:27  rroesler
++ *	Fix: use suitables kernel usage count macros when using the diag
++ *	
++ *	Revision 1.29  2003/11/10 09:38:26  rroesler
++ *	Fix: restore PNMI structure backup for DIAG actions
++ *	
++ *	Revision 1.28  2003/11/07 17:28:45  rroesler
++ *	Fix: Additions for the LeaveDiagMode
++ *	
++ *	Revision 1.27  2003/11/03 13:21:14  mlindner
++ *	Add: SkGeBuffPad function for padding to ensure the trailing bytes exist
++ *	
++ *	Revision 1.26  2003/10/30 09:20:40  mlindner
++ *	Fix: Control bit check
++ *	
++ *	Revision 1.25  2003/10/29 07:43:37  rroesler
++ *	Fix: Implemented full None values handling for parameter Moderation
++ *	
++ *	Revision 1.24  2003/10/22 14:18:12  rroesler
++ *	Fix: DIAG handling for DualNet cards
++ *	
++ *	Revision 1.23  2003/10/17 10:05:13  mlindner
++ *	Add: New blinkmode for Morvell cards
++ *	
++ *	Revision 1.22  2003/10/15 12:31:25  rroesler
++ *	Fix: Corrected bugreport #10954 (Linux System crash when using vlans)
++ *	
++ *	Revision 1.21  2003/10/07 12:32:28  mlindner
++ *	Fix: Editorial changes
++ *	
++ *	Revision 1.20  2003/10/07 12:22:40  mlindner
++ *	Fix: Compiler warnings
++ *	
++ *	Revision 1.19  2003/10/07 09:33:40  mlindner
++ *	Fix: No warnings for illegal values of Mod and IntsPerSec
++ *	Fix: Speed 100 in Half Duplex not allowed for Yukon
++ *	Fix: PrefPort=B not allowed on single NICs
++ *	
++ *	Revision 1.18  2003/10/07 08:17:08  mlindner
++ *	Fix: Copyright changes
++ *	
++ *	Revision 1.17  2003/09/29 12:06:59  mlindner
++ *	*** empty log message ***
++ *	
+  *	Revision 1.16  2003/09/23 11:07:35  mlindner
+  *	Fix: IO-control return race condition
+  *	Fix: Interrupt moderation value check
+@@ -68,6 +134,12 @@
+  *	Add: Yukon Plus changes (ChipID, PCI...)
+  *	Fix: TCP and UDP Checksum calculation
+  *	
++ *	Revision 1.13  2003/09/01 13:30:08  rroesler
++ *	Fix: Corrected missing defines
++ *	
++ *	Revision 1.12  2003/09/01 13:12:02  rroesler
++ *	Add: Code for improved DIAG Attach/Detach interface
++ *	
+  *	Revision 1.11  2003/08/26 16:05:19  mlindner
+  *	Fix: Compiler warnings (void *)
+  *	
+@@ -406,7 +478,6 @@
+  *	<linux/module.h>
+  *
+  *	"h/skdrv1st.h"
+- *		<linux/version.h>
+  *		<linux/types.h>
+  *		<linux/kernel.h>
+  *		<linux/string.h>
+@@ -568,6 +639,12 @@ static void	StartDrvCleanupTimer(SK_AC *
+ static void	StopDrvCleanupTimer(SK_AC *pAC);
+ static int	XmitFrameSG(SK_AC*, TX_PORT*, struct sk_buff*);
+ 
++#ifdef SK_DIAG_SUPPORT
++static SK_U32   ParseDeviceNbrFromSlotName(const char *SlotName);
++static int      SkDrvInitAdapter(SK_AC *pAC, int devNbr);
++static int      SkDrvDeInitAdapter(SK_AC *pAC, int devNbr);
++#endif
++
+ /*******************************************************************************
+  *
+  * Extern Function Prototypes
+@@ -576,8 +653,8 @@ static int	XmitFrameSG(SK_AC*, TX_PORT*,
+ 
+ #ifdef CONFIG_PROC_FS
+ static const char 	SK_Root_Dir_entry[] = "sk98lin";
+-static struct		proc_dir_entry *pSkRootDir;
+-extern struct		file_operations sk_proc_fops;
++static struct		proc_dir_entry *pSkRootDir = NULL;
++extern struct	file_operations sk_proc_fops;
+ #endif
+ 
+ extern void SkDimEnableModerationIfNeeded(SK_AC *pAC);	
+@@ -595,12 +672,19 @@ static void	DumpLong(char*, int);
+ static const char *BootString = BOOT_STRING;
+ struct SK_NET_DEVICE *SkGeRootDev = NULL;
+ static int probed __initdata = 0;
++static SK_BOOL DoPrintInterfaceChange = SK_TRUE;
+ 
+ /* local variables **********************************************************/
+ static uintptr_t TxQueueAddr[SK_MAX_MACS][2] = {{0x680, 0x600},{0x780, 0x700}};
+ static uintptr_t RxQueueAddr[SK_MAX_MACS] = {0x400, 0x480};
+ 
+ 
++#ifdef CONFIG_PROC_FS
++static struct proc_dir_entry	*pSkRootDir;
++#endif
++
++
++
+ /*****************************************************************************
+  *
+  * 	skge_probe - find all SK-98xx adapters
+@@ -626,6 +710,7 @@ static int __init skge_probe (void)
+ 	SK_BOOL BootStringCount = SK_FALSE;
+ 	int			retval;
+ #ifdef CONFIG_PROC_FS
++	int			proc_root_initialized = 0;
+ 	struct proc_dir_entry	*pProcFile;
+ #endif
+ 
+@@ -700,6 +785,7 @@ static int __init skge_probe (void)
+ 		dev->stop =		&SkGeClose;
+ 		dev->hard_start_xmit =	&SkGeXmit;
+ 		dev->get_stats =	&SkGeStats;
++		dev->last_stats =	&SkGeStats;
+ 		dev->set_multicast_list = &SkGeSetRxMode;
+ 		dev->set_mac_address =	&SkGeSetMacAddr;
+ 		dev->do_ioctl =		&SkGeIoctl;
+@@ -718,15 +804,13 @@ static int __init skge_probe (void)
+ #endif
+ 
+ 		pAC->Index = boards_found;
++
+ 		if (SkGeBoardInit(dev, pAC)) {
+-			FreeResources(dev);
+ 			free_netdev(dev);
+ 			continue;
+ 		}
+ 
+-		memcpy((caddr_t) &dev->dev_addr,
+-			(caddr_t) &pAC->Addr.Net[0].CurrentMacAddress, 6);
+-
++		/* Register net device */
+ 		if (register_netdev(dev)) {
+ 			printk(KERN_ERR "SKGE: Could not register device.\n");
+ 			FreeResources(dev);
+@@ -734,6 +818,25 @@ static int __init skge_probe (void)
+ 			continue;
+ 		}
+ 
++		/* Print adapter specific string from vpd */
++		ProductStr(pAC);
++		printk("%s: %s\n", dev->name, pAC->DeviceStr);
++
++		/* Print configuration settings */
++		printk("      PrefPort:%c  RlmtMode:%s\n",
++			'A' + pAC->Rlmt.Net[0].Port[pAC->Rlmt.Net[0].PrefPort]->PortNumber,
++			(pAC->RlmtMode==0)  ? "Check Link State" :
++			((pAC->RlmtMode==1) ? "Check Link State" :
++			((pAC->RlmtMode==3) ? "Check Local Port" :
++			((pAC->RlmtMode==7) ? "Check Segmentation" :
++			((pAC->RlmtMode==17) ? "Dual Check Link State" :"Error")))));
++
++		SkGeYellowLED(pAC, pAC->IoBase, 1);
++
++
++		memcpy((caddr_t) &dev->dev_addr,
++			(caddr_t) &pAC->Addr.Net[0].CurrentMacAddress, 6);
++
+ 		/* First adapter... Create proc and print message */
+ #ifdef CONFIG_PROC_FS
+ 		if (!DeviceFound) {
+@@ -744,25 +847,27 @@ static int __init skge_probe (void)
+ 			/*Create proc (directory)*/
+ 			if(!pSkRootDir) {
+ 				pSkRootDir = proc_mkdir(SK_Root_Dir_entry, proc_net);
+-				if (!pSkRootDir) 
++				if (!pSkRootDir) {
+ 					printk(KERN_WARNING "%s: Unable to create /proc/net/%s",
+-					       dev->name, SK_Root_Dir_entry);
+-				else
++						dev->name, SK_Root_Dir_entry);
++				} else {
+ 					pSkRootDir->owner = THIS_MODULE;
++				}
+ 			}
+ 		}
+-		
++
+ 		/* Create proc file */
+-		if (pSkRootDir 
+-		    && (pProcFile = create_proc_entry(dev->name, S_IRUGO,
+-						      pSkRootDir))) {
++		if (pSkRootDir && 
++			(pProcFile = create_proc_entry(dev->name, S_IRUGO,
++				pSkRootDir))) {
+ 			pProcFile->proc_fops = &sk_proc_fops;
+-			pProcFile->data = dev;
++			pProcFile->data      = dev;
+ 		}
++
+ #endif
+ 
+ 		pNet->PortNr = 0;
+-		pNet->NetNr = 0;
++		pNet->NetNr  = 0;
+ 
+ 		boards_found++;
+ 
+@@ -774,23 +879,24 @@ static int __init skge_probe (void)
+ 				break;
+ 			}
+ 
+-			pAC->dev[1] = dev;
+-			pNet = dev->priv;
+-			pNet->PortNr = 1;
+-			pNet->NetNr = 1;
+-			pNet->pAC = pAC;
+-			pNet->Mtu = 1500;
+-			pNet->Up = 0;
+-
+-			dev->open =		&SkGeOpen;
+-			dev->stop =		&SkGeClose;
+-			dev->hard_start_xmit =	&SkGeXmit;
+-			dev->get_stats =	&SkGeStats;
++			pAC->dev[1]   = dev;
++			pNet          = dev->priv;
++			pNet->PortNr  = 1;
++			pNet->NetNr   = 1;
++			pNet->pAC     = pAC;
++			pNet->Mtu     = 1500;
++			pNet->Up      = 0;
++
++			dev->open               = &SkGeOpen;
++			dev->stop               = &SkGeClose;
++			dev->hard_start_xmit    = &SkGeXmit;
++			dev->get_stats          = &SkGeStats;
++			dev->last_stats         = &SkGeStats;
+ 			dev->set_multicast_list = &SkGeSetRxMode;
+-			dev->set_mac_address =	&SkGeSetMacAddr;
+-			dev->do_ioctl =		&SkGeIoctl;
+-			dev->change_mtu =	&SkGeChangeMtu;
+-			dev->flags &= 		~IFF_RUNNING;
++			dev->set_mac_address    = &SkGeSetMacAddr;
++			dev->do_ioctl           = &SkGeIoctl;
++			dev->change_mtu         = &SkGeChangeMtu;
++			dev->flags             &= ~IFF_RUNNING;
+ 
+ #ifdef SK_ZEROCOPY
+ #ifdef USE_SK_TX_CHECKSUM
+@@ -802,34 +908,39 @@ static int __init skge_probe (void)
+ #endif
+ 
+ 			if (register_netdev(dev)) {
+-				printk(KERN_ERR "SKGE: Could not register "
+-				       "second port.\n");
++				printk(KERN_ERR "SKGE: Could not register device.\n");
+ 				free_netdev(dev);
+ 				pAC->dev[1] = pAC->dev[0];
+ 			} else {
+ #ifdef CONFIG_PROC_FS
+ 				if (pSkRootDir 
+ 				    && (pProcFile = create_proc_entry(dev->name, 
+-								      S_IRUGO,
+-								      pSkRootDir))) {
++								S_IRUGO, pSkRootDir))) {
+ 					pProcFile->proc_fops = &sk_proc_fops;
+-					pProcFile->data = dev;
++					pProcFile->data      = dev;
+ 				}
+ #endif
+ 
+-				memcpy((caddr_t) &dev->dev_addr,
+-				       (caddr_t) &pAC->Addr.Net[1].CurrentMacAddress, 6);
++			memcpy((caddr_t) &dev->dev_addr,
++			(caddr_t) &pAC->Addr.Net[1].CurrentMacAddress, 6);
+ 	
+-				printk("%s: %s\n", dev->name, pAC->DeviceStr);
+-				printk("      PrefPort:B  RlmtMode:Dual Check Link State\n");
++			printk("%s: %s\n", dev->name, pAC->DeviceStr);
++			printk("      PrefPort:B  RlmtMode:Dual Check Link State\n");
+ 			}
+ 		}
+ 
+-
+ 		/* Save the hardware revision */
+ 		pAC->HWRevision = (((pAC->GIni.GIPciHwRev >> 4) & 0x0F)*10) +
+ 			(pAC->GIni.GIPciHwRev & 0x0F);
+ 
++		/* Set driver globals */
++		pAC->Pnmi.pDriverFileName    = DRIVER_FILE_NAME;
++		pAC->Pnmi.pDriverReleaseDate = DRIVER_REL_DATE;
++
++		SK_MEMSET(&(pAC->PnmiBackup), 0, sizeof(SK_PNMI_STRUCT_DATA));
++		SK_MEMCPY(&(pAC->PnmiBackup), &(pAC->PnmiStruct), 
++				sizeof(SK_PNMI_STRUCT_DATA));
++
+ 		/*
+ 		 * This is bollocks, but we need to tell the net-init
+ 		 * code that it shall go for the next device.
+@@ -849,7 +960,6 @@ static int __init skge_probe (void)
+ } /* skge_probe */
+ 
+ 
+-
+ /*****************************************************************************
+  *
+  * 	SkGeInitPCI - Init the PCI resources
+@@ -1143,7 +1253,7 @@ SK_EVPARA EvPara;
+ 
+ 		if ((pAC->GIni.GIMacsFound == 2) && pAC->RlmtNets == 2){
+ 			unregister_netdev(pAC->dev[1]);
+-			kfree(pAC->dev[1]);
++			free_netdev(pAC->dev[1]);
+ 		}
+ 
+ 		FreeResources(SkGeRootDev);
+@@ -1161,8 +1271,7 @@ SK_EVPARA EvPara;
+ 
+ #ifdef CONFIG_PROC_FS
+ 	/* clear proc-dir */
+-	if (pSkRootDir) 
+-		remove_proc_entry(pSkRootDir->name, proc_net);
++	remove_proc_entry(pSkRootDir->name, proc_net);
+ #endif
+ 
+ } /* skge_cleanup_module */
+@@ -1224,7 +1333,7 @@ SK_BOOL	DualNet;
+ 	SkAddrInit( pAC, pAC->IoBase, SK_INIT_DATA);
+ 	SkRlmtInit( pAC, pAC->IoBase, SK_INIT_DATA);
+ 	SkTimerInit(pAC, pAC->IoBase, SK_INIT_DATA);
+-	
++
+ 	pAC->BoardLevel = SK_INIT_DATA;
+ 	pAC->RxBufSize  = ETH_BUF_SIZE;
+ 
+@@ -1236,7 +1345,7 @@ SK_BOOL	DualNet;
+ 	/* level 1 init common modules here (HW init) */
+ 	spin_lock_irqsave(&pAC->SlowPathLock, Flags);
+ 	if (SkGeInit(pAC, pAC->IoBase, SK_INIT_IO) != 0) {
+-		printk("HWInit (1) failed.\n");
++		printk("sk98lin: HWInit (1) failed.\n");
+ 		spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
+ 		return(-EAGAIN);
+ 	}
+@@ -1268,14 +1377,14 @@ SK_BOOL	DualNet;
+ 		Ret = request_irq(dev->irq, SkGeIsrOnePort, SA_SHIRQ,
+ 			pAC->Name, dev);
+ 	} else {
+-		printk(KERN_WARNING "%s: Illegal number of ports: %d\n",
+-		       dev->name, pAC->GIni.GIMacsFound);
++		printk(KERN_WARNING "sk98lin: Illegal number of ports: %d\n",
++		       pAC->GIni.GIMacsFound);
+ 		return -EAGAIN;
+ 	}
+ 
+ 	if (Ret) {
+-		printk(KERN_WARNING "%s: Requested IRQ %d is busy.\n",
+-		       dev->name, dev->irq);
++		printk(KERN_WARNING "sk98lin: Requested IRQ %d is busy.\n",
++		       dev->irq);
+ 		return -EAGAIN;
+ 	}
+ 	pAC->AllocFlag |= SK_ALLOC_IRQ;
+@@ -1303,25 +1412,10 @@ SK_BOOL	DualNet;
+ 		pAC->ActivePort,
+ 		DualNet)) {
+ 		BoardFreeMem(pAC);
+-		printk("SkGeInitAssignRamToQueues failed.\n");
++		printk("sk98lin: SkGeInitAssignRamToQueues failed.\n");
+ 		return(-EAGAIN);
+ 	}
+ 
+-	/* Print adapter specific string from vpd */
+-	ProductStr(pAC);
+-	printk("%s: %s\n", dev->name, pAC->DeviceStr);
+-
+-	/* Print configuration settings */
+-	printk("      PrefPort:%c  RlmtMode:%s\n",
+-		'A' + pAC->Rlmt.Net[0].Port[pAC->Rlmt.Net[0].PrefPort]->PortNumber,
+-		(pAC->RlmtMode==0)  ? "Check Link State" :
+-		((pAC->RlmtMode==1) ? "Check Link State" :
+-		((pAC->RlmtMode==3) ? "Check Local Port" :
+-		((pAC->RlmtMode==7) ? "Check Segmentation" :
+-		((pAC->RlmtMode==17) ? "Dual Check Link State" :"Error")))));
+-
+-	SkGeYellowLED(pAC, pAC->IoBase, 1);
+-
+ 	/*
+ 	 * Register the device here
+ 	 */
+@@ -1879,14 +1973,26 @@ struct SK_NET_DEVICE	*dev)
+ 	SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
+ 		("SkGeOpen: pAC=0x%lX:\n", (unsigned long)pAC));
+ 
++#ifdef SK_DIAG_SUPPORT
++	if (pAC->DiagModeActive == DIAG_ACTIVE) {
++		if (pAC->Pnmi.DiagAttached == SK_DIAG_RUNNING) {
++			return (-1);   /* still in use by diag; deny actions */
++		} 
++	}
++#endif
++
++	if (!try_module_get(THIS_MODULE)) {
++		return (-1);	/* increase of usage count not possible */
++	}
+ 
+ 	/* Set blink mode */
+-	if (pAC->PciDev->vendor == 0x1186)
++	if ((pAC->PciDev->vendor == 0x1186) || (pAC->PciDev->vendor == 0x11ab ))
+ 		pAC->GIni.GILedBlinkCtrl = OEM_CONFIG_VALUE;
+ 
+ 	if (pAC->BoardLevel == SK_INIT_DATA) {
+ 		/* level 1 init common modules here */
+ 		if (SkGeInit(pAC, pAC->IoBase, SK_INIT_IO) != 0) {
++			module_put(THIS_MODULE); /* decrease usage count */
+ 			printk("%s: HWInit (1) failed.\n", pAC->dev[pNet->PortNr]->name);
+ 			return (-1);
+ 		}
+@@ -1902,6 +2008,7 @@ struct SK_NET_DEVICE	*dev)
+ 	if (pAC->BoardLevel != SK_INIT_RUN) {
+ 		/* tschilling: Level 2 init modules here, check return value. */
+ 		if (SkGeInit(pAC, pAC->IoBase, SK_INIT_RUN) != 0) {
++			module_put(THIS_MODULE); /* decrease usage count */
+ 			printk("%s: HWInit (2) failed.\n", pAC->dev[pNet->PortNr]->name);
+ 			return (-1);
+ 		}
+@@ -1953,7 +2060,6 @@ struct SK_NET_DEVICE	*dev)
+ 	pAC->MaxPorts++;
+ 	pNet->Up = 1;
+ 
+-	try_module_get(THIS_MODULE);
+ 
+ 	SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
+ 		("SkGeOpen suceeded\n"));
+@@ -1976,26 +2082,50 @@ struct SK_NET_DEVICE	*dev)
+ static int SkGeClose(
+ struct SK_NET_DEVICE	*dev)
+ {
+-	DEV_NET			*pNet;
+-	SK_AC			*pAC;
++	DEV_NET		*pNet;
++	DEV_NET		*newPtrNet;
++	SK_AC		*pAC;
+ 
+ 	unsigned long	Flags;		/* for spin lock */
+-	int				i;
+-	int				PortIdx;
+-	SK_EVPARA		EvPara;
++	int		i;
++	int		PortIdx;
++	SK_EVPARA	EvPara;
++
++	SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
++		("SkGeClose: pAC=0x%lX ", (unsigned long)pAC));
+ 
+-	netif_stop_queue(dev);
+ 	pNet = (DEV_NET*) dev->priv;
+ 	pAC = pNet->pAC;
+ 
++#ifdef SK_DIAG_SUPPORT
++	if (pAC->DiagModeActive == DIAG_ACTIVE) {
++		if (pAC->DiagFlowCtrl == SK_FALSE) {
++			module_put(THIS_MODULE);
++			/* 
++			** notify that the interface which has been closed
++			** by operator interaction must not be started up 
++			** again when the DIAG has finished. 
++			*/
++			newPtrNet = (DEV_NET *) pAC->dev[0]->priv;
++			if (newPtrNet == pNet) {
++				pAC->WasIfUp[0] = SK_FALSE;
++			} else {
++				pAC->WasIfUp[1] = SK_FALSE;
++			}
++			return 0; /* return to system everything is fine... */
++		} else {
++			pAC->DiagFlowCtrl = SK_FALSE;
++		}
++	}
++#endif
++
++	netif_stop_queue(dev);
++
+ 	if (pAC->RlmtNets == 1)
+ 		PortIdx = pAC->ActivePort;
+ 	else
+ 		PortIdx = pNet->NetNr;
+ 
+-	SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
+-		("SkGeClose: pAC=0x%lX ", (unsigned long)pAC));
+-
+         StopDrvCleanupTimer(pAC);
+ 
+ 	/*
+@@ -2053,6 +2183,10 @@ struct SK_NET_DEVICE	*dev)
+ 	SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
+ 		("SkGeClose: done "));
+ 
++	SK_MEMSET(&(pAC->PnmiBackup), 0, sizeof(SK_PNMI_STRUCT_DATA));
++	SK_MEMCPY(&(pAC->PnmiBackup), &(pAC->PnmiStruct), 
++			sizeof(SK_PNMI_STRUCT_DATA));
++
+ 	pAC->MaxPorts--;
+ 	pNet->Up = 0;
+ 
+@@ -2199,9 +2333,10 @@ struct sk_buff	*pMessage)	/* pointer to 
+ 	** This is to resolve faulty padding by the HW with 0xaa bytes.
+ 	*/
+ 	if (BytesSend < C_LEN_ETHERNET_MINSIZE) {
+-	    skb_put(pMessage, (C_LEN_ETHERNET_MINSIZE-BytesSend));
+-	    SK_MEMSET( ((char *)(pMessage->data))+BytesSend,
+-	            0, C_LEN_ETHERNET_MINSIZE-BytesSend);
++		if ((pMessage = skb_padto(pMessage, C_LEN_ETHERNET_MINSIZE)) == NULL) {
++			return 0;
++		}
++		pMessage->len = C_LEN_ETHERNET_MINSIZE;
+ 	}
+ 
+ 	/* 
+@@ -3318,6 +3453,16 @@ SK_EVPARA 	EvPara;
+ 		return -EINVAL;
+ 	}
+ 
++#ifdef SK_DIAG_SUPPORT
++	if (pAC->DiagModeActive == DIAG_ACTIVE) {
++		if (pAC->DiagFlowCtrl == SK_FALSE) {
++			return -1; /* still in use, deny any actions of MTU */
++		} else {
++			pAC->DiagFlowCtrl = SK_FALSE;
++		}
++	}
++#endif
++
+ 	pNet->Mtu = NewMtu;
+ 	pOtherNet = (DEV_NET*)pAC->dev[1 - pNet->NetNr]->priv;
+ 	if ((pOtherNet->Mtu>1500) && (NewMtu<=1500) && (pOtherNet->Up==1)) {
+@@ -3537,11 +3682,20 @@ unsigned long	Flags;			/* for spin lock 
+ 	SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
+ 		("SkGeStats starts now...\n"));
+ 	pPnmiStruct = &pAC->PnmiStruct;
+-        memset(pPnmiStruct, 0, sizeof(SK_PNMI_STRUCT_DATA));
++
++#ifdef SK_DIAG_SUPPORT
++        if ((pAC->DiagModeActive == DIAG_NOTACTIVE) &&
++                (pAC->BoardLevel == SK_INIT_RUN)) {
++#endif
++        SK_MEMSET(pPnmiStruct, 0, sizeof(SK_PNMI_STRUCT_DATA));
+         spin_lock_irqsave(&pAC->SlowPathLock, Flags);
+         Size = SK_PNMI_STRUCT_SIZE;
+ 		SkPnmiGetStruct(pAC, pAC->IoBase, pPnmiStruct, &Size, pNet->NetNr);
+         spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
++#ifdef SK_DIAG_SUPPORT
++	}
++#endif
++
+         pPnmiStat = &pPnmiStruct->Stat[0];
+         pPnmiConf = &pPnmiStruct->Conf[0];
+ 
+@@ -3604,7 +3758,7 @@ static int SkGeIoctl(struct SK_NET_DEVIC
+ DEV_NET		*pNet;
+ SK_AC		*pAC;
+ void		*pMemBuf;
+-
++struct pci_dev  *pdev = NULL;
+ SK_GE_IOCTL	Ioctl;
+ unsigned int	Err = 0;
+ int		Size = 0;
+@@ -3671,6 +3825,45 @@ int		HeaderLength = sizeof(SK_U32) + siz
+ fault_gen:
+ 		kfree(pMemBuf); /* cleanup everything */
+ 		break;
++#ifdef SK_DIAG_SUPPORT
++       case SK_IOCTL_DIAG:
++		if (!capable(CAP_NET_ADMIN)) return -EPERM;
++		if (Ioctl.Len < (sizeof(pAC->PnmiStruct) + HeaderLength)) {
++			Length = Ioctl.Len;
++		} else {
++			Length = sizeof(pAC->PnmiStruct) + HeaderLength;
++		}
++		if (NULL == (pMemBuf = kmalloc(Length, GFP_KERNEL))) {
++			return -ENOMEM;
++		}
++		if(copy_from_user(pMemBuf, Ioctl.pData, Length)) {
++			Err = -EFAULT;
++			goto fault_diag;
++		}
++		pdev = pAC->PciDev;
++		Length = 3 * sizeof(SK_U32);  /* Error, Bus and Device */
++		/* 
++		** While coding this new IOCTL interface, only a few lines of code
++		** are to to be added. Therefore no dedicated function has been 
++		** added. If more functionality is added, a separate function 
++		** should be used...
++		*/
++		* ((SK_U32 *)pMemBuf) = 0;
++		* ((SK_U32 *)pMemBuf + 1) = pdev->bus->number;
++		* ((SK_U32 *)pMemBuf + 2) = ParseDeviceNbrFromSlotName(pdev->slot_name);
++		if(copy_to_user(Ioctl.pData, pMemBuf, Length) ) {
++			Err = -EFAULT;
++			goto fault_diag;
++		}
++		Ioctl.Len = Length;
++		if(copy_to_user(rq->ifr_data, &Ioctl, sizeof(SK_GE_IOCTL))) {
++			Err = -EFAULT;
++			goto fault_diag;
++		}
++fault_diag:
++		kfree(pMemBuf); /* cleanup everything */
++		break;
++#endif
+ 	default:
+ 		Err = -EOPNOTSUPP;
+ 	}
+@@ -3826,10 +4019,9 @@ int	Capabilities[3][3] =
+ 				(strcmp(ConType[pAC->Index],"Auto")!=0) &&
+ 				(strcmp(ConType[pAC->Index],"")!=0)) {
+ 				/* Set the speed parameter back */
+-					printk("%s: Illegal value \"%s\" " 
++					printk("sk98lin: Illegal value \"%s\" " 
+ 							"for ConType."
+ 							" Using Auto.\n", 
+-							pAC->dev[0]->name, 
+ 							ConType[pAC->Index]);
+ 
+ 					sprintf(ConType[pAC->Index], "Auto");	
+@@ -3873,8 +4065,8 @@ int	Capabilities[3][3] =
+ 			M_CurrPort.PLinkSpeed    = SK_LSPEED_10MBPS;
+ 		    }
+                 } else { 
+-		    printk("%s: Illegal value \"%s\" for ConType\n", 
+-			pAC->dev[0]->name, ConType[pAC->Index]);
++		    printk("sk98lin: Illegal value \"%s\" for ConType\n", 
++			ConType[pAC->Index]);
+ 		    IsConTypeDefined = SK_FALSE; /* Wrong ConType defined */
+ 		}
+         } else {
+@@ -3898,8 +4090,8 @@ int	Capabilities[3][3] =
+ 		} else if (strcmp(Speed_A[pAC->Index],"1000")==0) {
+ 		    LinkSpeed = SK_LSPEED_1000MBPS;
+ 		} else {
+-		    printk("%s: Illegal value \"%s\" for Speed_A\n",
+-			pAC->dev[0]->name, Speed_A[pAC->Index]);
++		    printk("sk98lin: Illegal value \"%s\" for Speed_A\n",
++			Speed_A[pAC->Index]);
+ 		    IsLinkSpeedDefined = SK_FALSE;
+ 		}
+ 	} else {
+@@ -3913,9 +4105,9 @@ int	Capabilities[3][3] =
+ 	if (((!pAC->ChipsetType) || (pAC->GIni.GICopperType != SK_TRUE)) &&
+ 		((LinkSpeed != SK_LSPEED_AUTO) &&
+ 		(LinkSpeed != SK_LSPEED_1000MBPS))) {
+-		printk("%s: Illegal value for Speed_A. "
++		printk("sk98lin: Illegal value for Speed_A. "
+ 			"Not a copper card or GE V2 card\n    Using "
+-			"speed 1000\n", pAC->dev[0]->name);
++			"speed 1000\n");
+ 		LinkSpeed = SK_LSPEED_1000MBPS;
+ 	}
+ 	
+@@ -3945,8 +4137,8 @@ int	Capabilities[3][3] =
+ 		} else if (strcmp(AutoNeg_A[pAC->Index],"Sense")==0) {
+ 		    AutoNeg = AN_SENS;
+ 		} else {
+-		    printk("%s: Illegal value \"%s\" for AutoNeg_A\n",
+-			pAC->dev[0]->name, AutoNeg_A[pAC->Index]);
++		    printk("sk98lin: Illegal value \"%s\" for AutoNeg_A\n",
++			AutoNeg_A[pAC->Index]);
+ 		}
+ 	}
+ 
+@@ -3964,33 +4156,32 @@ int	Capabilities[3][3] =
+ 		} else if (strcmp(DupCap_A[pAC->Index],"Half")==0) {
+ 		    DuplexCap = DC_HALF;
+ 		} else {
+-		    printk("%s: Illegal value \"%s\" for DupCap_A\n",
+-			pAC->dev[0]->name, DupCap_A[pAC->Index]);
++		    printk("sk98lin: Illegal value \"%s\" for DupCap_A\n",
++			DupCap_A[pAC->Index]);
+ 		}
+ 	}
+-	
++
+ 	/* 
+ 	** Check for illegal combinations 
+ 	*/
+-	if ((LinkSpeed = SK_LSPEED_1000MBPS) &&
++	if ((LinkSpeed == SK_LSPEED_1000MBPS) &&
+ 		((DuplexCap == SK_LMODE_STAT_AUTOHALF) ||
+ 		(DuplexCap == SK_LMODE_STAT_HALF)) &&
+ 		(pAC->ChipsetType)) {
+-		    printk("%s: Half Duplex not possible with Gigabit speed!\n"
+-					"    Using Full Duplex.\n",
+-				pAC->dev[0]->name);
++		    printk("sk98lin: Half Duplex not possible with Gigabit speed!\n"
++					"    Using Full Duplex.\n");
+ 				DuplexCap = DC_FULL;
+ 	}
+ 
+ 	if ( AutoSet && AutoNeg==AN_SENS && DupSet) {
+-		printk("%s, Port A: DuplexCapabilities"
+-			" ignored using Sense mode\n", pAC->dev[0]->name);
++		printk("sk98lin, Port A: DuplexCapabilities"
++			" ignored using Sense mode\n");
+ 	}
+ 
+ 	if (AutoSet && AutoNeg==AN_OFF && DupSet && DuplexCap==DC_BOTH){
+-		printk("%s, Port A: Illegal combination"
++		printk("sk98lin: Port A: Illegal combination"
+ 			" of values AutoNeg. and DuplexCap.\n    Using "
+-			"Full Duplex\n", pAC->dev[0]->name);
++			"Full Duplex\n");
+ 		DuplexCap = DC_FULL;
+ 	}
+ 
+@@ -3999,10 +4190,9 @@ int	Capabilities[3][3] =
+ 	}
+ 	
+ 	if (!AutoSet && DupSet) {
+-		printk("%s, Port A: Duplex setting not"
++		printk("sk98lin: Port A: Duplex setting not"
+ 			" possible in\n    default AutoNegotiation mode"
+-			" (Sense).\n    Using AutoNegotiation On\n",
+-			pAC->dev[0]->name);
++			" (Sense).\n    Using AutoNegotiation On\n");
+ 		AutoNeg = AN_ON;
+ 	}
+ 	
+@@ -4029,8 +4219,8 @@ int	Capabilities[3][3] =
+ 		} else if (strcmp(FlowCtrl_A[pAC->Index],"None")==0) {
+ 		    FlowCtrl = SK_FLOW_MODE_NONE;
+ 		} else {
+-		    printk("%s: Illegal value \"%s\" for FlowCtrl_A\n",
+-                        pAC->dev[0]->name, FlowCtrl_A[pAC->Index]);
++		    printk("sk98lin: Illegal value \"%s\" for FlowCtrl_A\n",
++                        FlowCtrl_A[pAC->Index]);
+ 		    IsFlowCtrlDefined = SK_FALSE;
+ 		}
+ 	} else {
+@@ -4039,9 +4229,9 @@ int	Capabilities[3][3] =
+ 
+ 	if (IsFlowCtrlDefined) {
+ 	    if ((AutoNeg == AN_OFF) && (FlowCtrl != SK_FLOW_MODE_NONE)) {
+-		printk("%s, Port A: FlowControl"
++		printk("sk98lin: Port A: FlowControl"
+ 			" impossible without AutoNegotiation,"
+-			" disabled\n", pAC->dev[0]->name);
++			" disabled\n");
+ 		FlowCtrl = SK_FLOW_MODE_NONE;
+ 	    }
+ 	    pAC->GIni.GP[0].PFlowCtrlMode = FlowCtrl;
+@@ -4061,8 +4251,8 @@ int	Capabilities[3][3] =
+ 		} else if (strcmp(Role_A[pAC->Index],"Slave")==0) {
+ 		    MSMode = SK_MS_MODE_SLAVE;
+ 		} else {
+-		    printk("%s: Illegal value \"%s\" for Role_A\n",
+-			pAC->dev[0]->name, Role_A[pAC->Index]);
++		    printk("sk98lin: Illegal value \"%s\" for Role_A\n",
++			Role_A[pAC->Index]);
+ 		    IsRoleDefined = SK_FALSE;
+ 		}
+ 	} else {
+@@ -4097,8 +4287,8 @@ int	Capabilities[3][3] =
+ 		} else if (strcmp(Speed_B[pAC->Index],"1000")==0) {
+ 		    LinkSpeed = SK_LSPEED_1000MBPS;
+ 		} else {
+-		    printk("%s: Illegal value \"%s\" for Speed_B\n",
+-			pAC->dev[1]->name, Speed_B[pAC->Index]);
++		    printk("sk98lin: Illegal value \"%s\" for Speed_B\n",
++			Speed_B[pAC->Index]);
+ 		    IsLinkSpeedDefined = SK_FALSE;
+ 		}
+ 	} else {
+@@ -4112,9 +4302,9 @@ int	Capabilities[3][3] =
+ 	if (((!pAC->ChipsetType) || (pAC->GIni.GICopperType != SK_TRUE)) &&
+ 		((LinkSpeed != SK_LSPEED_AUTO) &&
+ 		(LinkSpeed != SK_LSPEED_1000MBPS))) {
+-		printk("%s: Illegal value for Speed_B. "
++		printk("sk98lin: Illegal value for Speed_B. "
+ 			"Not a copper card or GE V2 card\n    Using "
+-			"speed 1000\n", pAC->dev[1]->name);
++			"speed 1000\n");
+ 		LinkSpeed = SK_LSPEED_1000MBPS;
+ 	}
+ 
+@@ -4144,8 +4334,8 @@ int	Capabilities[3][3] =
+ 		} else if (strcmp(AutoNeg_B[pAC->Index],"Sense")==0) {
+ 		    AutoNeg = AN_SENS;
+ 		} else {
+-		    printk("%s: Illegal value \"%s\" for AutoNeg_B\n",
+-			pAC->dev[0]->name, AutoNeg_B[pAC->Index]);
++		    printk("sk98lin: Illegal value \"%s\" for AutoNeg_B\n",
++			AutoNeg_B[pAC->Index]);
+ 		}
+ 	}
+ 
+@@ -4163,8 +4353,8 @@ int	Capabilities[3][3] =
+ 		} else if (strcmp(DupCap_B[pAC->Index],"Half")==0) {
+ 		    DuplexCap = DC_HALF;
+ 		} else {
+-		    printk("%s: Illegal value \"%s\" for DupCap_B\n",
+-			pAC->dev[0]->name, DupCap_B[pAC->Index]);
++		    printk("sk98lin: Illegal value \"%s\" for DupCap_B\n",
++			DupCap_B[pAC->Index]);
+ 		}
+ 	}
+ 
+@@ -4172,25 +4362,24 @@ int	Capabilities[3][3] =
+ 	/* 
+ 	** Check for illegal combinations 
+ 	*/
+-	if ((LinkSpeed = SK_LSPEED_1000MBPS) &&
++	if ((LinkSpeed == SK_LSPEED_1000MBPS) &&
+ 		((DuplexCap == SK_LMODE_STAT_AUTOHALF) ||
+ 		(DuplexCap == SK_LMODE_STAT_HALF)) &&
+ 		(pAC->ChipsetType)) {
+-		    printk("%s: Half Duplex not possible with Gigabit speed!\n"
+-					"    Using Full Duplex.\n",
+-				pAC->dev[1]->name);
++		    printk("sk98lin: Half Duplex not possible with Gigabit speed!\n"
++					"    Using Full Duplex.\n");
+ 				DuplexCap = DC_FULL;
+ 	}
+ 
+ 	if (AutoSet && AutoNeg==AN_SENS && DupSet) {
+-		printk("%s, Port B: DuplexCapabilities"
+-			" ignored using Sense mode\n", pAC->dev[1]->name);
++		printk("sk98lin, Port B: DuplexCapabilities"
++			" ignored using Sense mode\n");
+ 	}
+ 
+ 	if (AutoSet && AutoNeg==AN_OFF && DupSet && DuplexCap==DC_BOTH){
+-		printk("%s, Port B: Illegal combination"
++		printk("sk98lin: Port B: Illegal combination"
+ 			" of values AutoNeg. and DuplexCap.\n    Using "
+-			"Full Duplex\n", pAC->dev[1]->name);
++			"Full Duplex\n");
+ 		DuplexCap = DC_FULL;
+ 	}
+ 
+@@ -4199,10 +4388,9 @@ int	Capabilities[3][3] =
+ 	}
+ 	
+ 	if (!AutoSet && DupSet) {
+-		printk("%s, Port B: Duplex setting not"
++		printk("sk98lin: Port B: Duplex setting not"
+ 			" possible in\n    default AutoNegotiation mode"
+-			" (Sense).\n    Using AutoNegotiation On\n",
+-			pAC->dev[1]->name);
++			" (Sense).\n    Using AutoNegotiation On\n");
+ 		AutoNeg = AN_ON;
+ 	}
+ 
+@@ -4229,8 +4417,8 @@ int	Capabilities[3][3] =
+ 		} else if (strcmp(FlowCtrl_B[pAC->Index],"None")==0) {
+ 		    FlowCtrl = SK_FLOW_MODE_NONE;
+ 		} else {
+-		    printk("%s: Illegal value \"%s\" for FlowCtrl_B\n",
+-			pAC->dev[0]->name, FlowCtrl_B[pAC->Index]);
++		    printk("sk98lin: Illegal value \"%s\" for FlowCtrl_B\n",
++			FlowCtrl_B[pAC->Index]);
+ 		    IsFlowCtrlDefined = SK_FALSE;
+ 		}
+ 	} else {
+@@ -4239,9 +4427,9 @@ int	Capabilities[3][3] =
+ 
+ 	if (IsFlowCtrlDefined) {
+ 	    if ((AutoNeg == AN_OFF) && (FlowCtrl != SK_FLOW_MODE_NONE)) {
+-		printk("%s, Port B: FlowControl"
++		printk("sk98lin: Port B: FlowControl"
+ 			" impossible without AutoNegotiation,"
+-			" disabled\n", pAC->dev[1]->name);
++			" disabled\n");
+ 		FlowCtrl = SK_FLOW_MODE_NONE;
+ 	    }
+ 	    pAC->GIni.GP[1].PFlowCtrlMode = FlowCtrl;
+@@ -4261,8 +4449,8 @@ int	Capabilities[3][3] =
+ 		} else if (strcmp(Role_B[pAC->Index],"Slave")==0) {
+ 		    MSMode = SK_MS_MODE_SLAVE;
+ 		} else {
+-		    printk("%s: Illegal value \"%s\" for Role_B\n",
+-			pAC->dev[1]->name, Role_B[pAC->Index]);
++		    printk("sk98lin: Illegal value \"%s\" for Role_B\n",
++			Role_B[pAC->Index]);
+ 		    IsRoleDefined = SK_FALSE;
+ 		}
+ 	} else {
+@@ -4280,28 +4468,37 @@ int	Capabilities[3][3] =
+ 	if (PrefPort != NULL && pAC->Index<SK_MAX_CARD_PARAM &&
+ 		PrefPort[pAC->Index] != NULL) {
+ 		if (strcmp(PrefPort[pAC->Index],"") == 0) { /* Auto */
+-		    pAC->ActivePort             =  0;
+-		    pAC->Rlmt.Net[0].Preference = -1; /* auto */
+-		    pAC->Rlmt.Net[0].PrefPort   =  0;
++			pAC->ActivePort             =  0;
++			pAC->Rlmt.Net[0].Preference = -1; /* auto */
++			pAC->Rlmt.Net[0].PrefPort   =  0;
+ 		} else if (strcmp(PrefPort[pAC->Index],"A") == 0) {
+-		    /*
+-		    ** do not set ActivePort here, thus a port
+-		    ** switch is issued after net up.
+-		    */
+-		    Port                        = 0;
+-		    pAC->Rlmt.Net[0].Preference = Port;
+-		    pAC->Rlmt.Net[0].PrefPort   = Port;
++			/*
++			** do not set ActivePort here, thus a port
++			** switch is issued after net up.
++			*/
++			Port                        = 0;
++			pAC->Rlmt.Net[0].Preference = Port;
++			pAC->Rlmt.Net[0].PrefPort   = Port;
+ 		} else if (strcmp(PrefPort[pAC->Index],"B") == 0) {
+-		    /*
+-		    ** do not set ActivePort here, thus a port
+-		    ** switch is issued after net up.
+-		    */
+-		    Port                        = 1;
+-		    pAC->Rlmt.Net[0].Preference = Port;
+-		    pAC->Rlmt.Net[0].PrefPort   = Port;
++			/*
++			** do not set ActivePort here, thus a port
++			** switch is issued after net up.
++			*/
++			if (pAC->GIni.GIMacsFound == 1) {
++				printk("sk98lin: Illegal value \"B\" for PrefPort.\n"
++					"      Port B not available on single port adapters.\n");
++
++				pAC->ActivePort             =  0;
++				pAC->Rlmt.Net[0].Preference = -1; /* auto */
++				pAC->Rlmt.Net[0].PrefPort   =  0;
++			} else {
++				Port                        = 1;
++				pAC->Rlmt.Net[0].Preference = Port;
++				pAC->Rlmt.Net[0].PrefPort   = Port;
++			}
+ 		} else {
+-		    printk("%s: Illegal value \"%s\" for PrefPort\n",
+-			pAC->dev[0]->name, PrefPort[pAC->Index]);
++		    printk("sk98lin: Illegal value \"%s\" for PrefPort\n",
++			PrefPort[pAC->Index]);
+ 		}
+ 	}
+ 
+@@ -4325,9 +4522,9 @@ int	Capabilities[3][3] =
+ 			pAC->RlmtMode = SK_RLMT_CHECK_LINK;
+ 			pAC->RlmtNets = 2;
+ 		} else {
+-		    printk("%s: Illegal value \"%s\" for"
++		    printk("sk98lin: Illegal value \"%s\" for"
+ 			" RlmtMode, using default\n", 
+-			pAC->dev[0]->name, RlmtMode[pAC->Index]);
++			RlmtMode[pAC->Index]);
+ 			pAC->RlmtMode = 0;
+ 		}
+ 	} else {
+@@ -4338,97 +4535,111 @@ int	Capabilities[3][3] =
+ 	** Check the interrupt moderation parameters
+ 	*/
+ 	if (Moderation[pAC->Index] != NULL) {
+-	    if (strcmp(Moderation[pAC->Index], "Static") == 0) {
+-                pAC->DynIrqModInfo.IntModTypeSelect = C_INT_MOD_STATIC;
+-	    } else if (strcmp(Moderation[pAC->Index], "Dynamic") == 0) {
+-	        pAC->DynIrqModInfo.IntModTypeSelect = C_INT_MOD_DYNAMIC;
+-	    } else {
+-	        pAC->DynIrqModInfo.IntModTypeSelect = C_INT_MOD_NONE;
+-	    }
++		if (strcmp(Moderation[pAC->Index], "") == 0) {
++			pAC->DynIrqModInfo.IntModTypeSelect = C_INT_MOD_NONE;
++		} else if (strcmp(Moderation[pAC->Index], "Static") == 0) {
++			pAC->DynIrqModInfo.IntModTypeSelect = C_INT_MOD_STATIC;
++		} else if (strcmp(Moderation[pAC->Index], "Dynamic") == 0) {
++			pAC->DynIrqModInfo.IntModTypeSelect = C_INT_MOD_DYNAMIC;
++		} else if (strcmp(Moderation[pAC->Index], "None") == 0) {
++			pAC->DynIrqModInfo.IntModTypeSelect = C_INT_MOD_NONE;
++		} else {
++	   		printk("sk98lin: Illegal value \"%s\" for Moderation.\n"
++				"      Disable interrupt moderation.\n",
++				Moderation[pAC->Index]);
++			pAC->DynIrqModInfo.IntModTypeSelect = C_INT_MOD_NONE;
++		}
+ 	} else {
+-	    pAC->DynIrqModInfo.IntModTypeSelect = C_INT_MOD_NONE;
++		pAC->DynIrqModInfo.IntModTypeSelect = C_INT_MOD_NONE;
+ 	}
+ 
+ 	if (Stats[pAC->Index] != NULL) {
+-	    if (strcmp(Stats[pAC->Index], "Yes") == 0) {
+-	        pAC->DynIrqModInfo.DisplayStats = SK_TRUE;
+-	    } else {
+-		pAC->DynIrqModInfo.DisplayStats = SK_FALSE;
+-	    }
++		if (strcmp(Stats[pAC->Index], "Yes") == 0) {
++			pAC->DynIrqModInfo.DisplayStats = SK_TRUE;
++		} else {
++			pAC->DynIrqModInfo.DisplayStats = SK_FALSE;
++		}
+ 	} else {
+-	    pAC->DynIrqModInfo.DisplayStats = SK_FALSE;
++		pAC->DynIrqModInfo.DisplayStats = SK_FALSE;
+ 	}
+ 
+-        if (ModerationMask[pAC->Index] != NULL) {
+-           if (strcmp(ModerationMask[pAC->Index], "Rx") == 0) {
+-               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_ONLY;
+-           } else if (strcmp(ModerationMask[pAC->Index], "Tx") == 0) {
+-               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_TX_ONLY;
+-           } else if (strcmp(ModerationMask[pAC->Index], "Sp") == 0) {
+-               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_SP_ONLY;
+-           } else if (strcmp(ModerationMask[pAC->Index], "RxSp") == 0) {
+-               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_SP_RX;
+-           } else if (strcmp(ModerationMask[pAC->Index], "SpRx") == 0) {
+-               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_SP_RX;
+-           } else if (strcmp(ModerationMask[pAC->Index], "RxTx") == 0) {
+-               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_TX_RX;
+-           } else if (strcmp(ModerationMask[pAC->Index], "TxRx") == 0) {
+-               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_TX_RX;
+-           } else if (strcmp(ModerationMask[pAC->Index], "TxSp") == 0) {
+-               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_SP_TX;
+-           } else if (strcmp(ModerationMask[pAC->Index], "SpTx") == 0) {
+-               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_SP_TX;
+-           } else if (strcmp(ModerationMask[pAC->Index], "RxTxSp") == 0) {
+-               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_TX_SP;
+-           } else if (strcmp(ModerationMask[pAC->Index], "RxSpTx") == 0) {
+-               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_TX_SP;
+-           } else if (strcmp(ModerationMask[pAC->Index], "TxRxSp") == 0) {
+-               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_TX_SP;
+-           } else if (strcmp(ModerationMask[pAC->Index], "TxSpRx") == 0) {
+-               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_TX_SP;
+-           } else if (strcmp(ModerationMask[pAC->Index], "SpTxRx") == 0) {
+-               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_TX_SP;
+-           } else if (strcmp(ModerationMask[pAC->Index], "SpRxTx") == 0) {
+-               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_TX_SP;
+-           } else { /* some rubbish */
+-               pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_ONLY;
+-           }
+-        } else {  /* operator has stated nothing */
+-           pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_TX_RX;
+-        }
+-
+-        if (AutoSizing[pAC->Index] != NULL) {
+-           if (strcmp(AutoSizing[pAC->Index], "On") == 0) {
+-               pAC->DynIrqModInfo.AutoSizing = SK_FALSE;
+-           } else {
+-               pAC->DynIrqModInfo.AutoSizing = SK_FALSE;
+-           }
+-        } else {  /* operator has stated nothing */
+-           pAC->DynIrqModInfo.AutoSizing = SK_FALSE;
+-        }
++	if (ModerationMask[pAC->Index] != NULL) {
++		if (strcmp(ModerationMask[pAC->Index], "Rx") == 0) {
++			pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_ONLY;
++		} else if (strcmp(ModerationMask[pAC->Index], "Tx") == 0) {
++			pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_TX_ONLY;
++		} else if (strcmp(ModerationMask[pAC->Index], "Sp") == 0) {
++			pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_SP_ONLY;
++		} else if (strcmp(ModerationMask[pAC->Index], "RxSp") == 0) {
++			pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_SP_RX;
++		} else if (strcmp(ModerationMask[pAC->Index], "SpRx") == 0) {
++			pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_SP_RX;
++		} else if (strcmp(ModerationMask[pAC->Index], "RxTx") == 0) {
++			pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_TX_RX;
++		} else if (strcmp(ModerationMask[pAC->Index], "TxRx") == 0) {
++			pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_TX_RX;
++		} else if (strcmp(ModerationMask[pAC->Index], "TxSp") == 0) {
++			pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_SP_TX;
++		} else if (strcmp(ModerationMask[pAC->Index], "SpTx") == 0) {
++			pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_SP_TX;
++		} else if (strcmp(ModerationMask[pAC->Index], "RxTxSp") == 0) {
++			pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_TX_SP;
++		} else if (strcmp(ModerationMask[pAC->Index], "RxSpTx") == 0) {
++			pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_TX_SP;
++		} else if (strcmp(ModerationMask[pAC->Index], "TxRxSp") == 0) {
++			pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_TX_SP;
++		} else if (strcmp(ModerationMask[pAC->Index], "TxSpRx") == 0) {
++			pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_TX_SP;
++		} else if (strcmp(ModerationMask[pAC->Index], "SpTxRx") == 0) {
++			pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_TX_SP;
++		} else if (strcmp(ModerationMask[pAC->Index], "SpRxTx") == 0) {
++			pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_TX_SP;
++		} else { /* some rubbish */
++			pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_RX_ONLY;
++		}
++	} else {  /* operator has stated nothing */
++		pAC->DynIrqModInfo.MaskIrqModeration = IRQ_MASK_TX_RX;
++	}
++
++	if (AutoSizing[pAC->Index] != NULL) {
++		if (strcmp(AutoSizing[pAC->Index], "On") == 0) {
++			pAC->DynIrqModInfo.AutoSizing = SK_FALSE;
++		} else {
++			pAC->DynIrqModInfo.AutoSizing = SK_FALSE;
++		}
++	} else {  /* operator has stated nothing */
++		pAC->DynIrqModInfo.AutoSizing = SK_FALSE;
++	}
+ 
+-        if (IntsPerSec[pAC->Index] != 0) {
+-           if ((IntsPerSec[pAC->Index]< 30) || (IntsPerSec[pAC->Index]> 40000)) {
+-              pAC->DynIrqModInfo.MaxModIntsPerSec = C_INTS_PER_SEC_DEFAULT;
+-           } else {
+-              pAC->DynIrqModInfo.MaxModIntsPerSec = IntsPerSec[pAC->Index];
+-           }
+-        } else {
+-           pAC->DynIrqModInfo.MaxModIntsPerSec = C_INTS_PER_SEC_DEFAULT;
+-        }
++	if (IntsPerSec[pAC->Index] != 0) {
++		if ((IntsPerSec[pAC->Index]< C_INT_MOD_IPS_LOWER_RANGE) || 
++			(IntsPerSec[pAC->Index] > C_INT_MOD_IPS_UPPER_RANGE)) {
++	   		printk("sk98lin: Illegal value \"%d\" for IntsPerSec. (Range: %d - %d)\n"
++				"      Using default value of %i.\n", 
++				IntsPerSec[pAC->Index],
++				C_INT_MOD_IPS_LOWER_RANGE,
++				C_INT_MOD_IPS_UPPER_RANGE,
++				C_INTS_PER_SEC_DEFAULT);
++			pAC->DynIrqModInfo.MaxModIntsPerSec = C_INTS_PER_SEC_DEFAULT;
++		} else {
++			pAC->DynIrqModInfo.MaxModIntsPerSec = IntsPerSec[pAC->Index];
++		}
++	} else {
++		pAC->DynIrqModInfo.MaxModIntsPerSec = C_INTS_PER_SEC_DEFAULT;
++	}
+ 
+-        /*
++	/*
+ 	** Evaluate upper and lower moderation threshold
+ 	*/
+-        pAC->DynIrqModInfo.MaxModIntsPerSecUpperLimit =
+-            pAC->DynIrqModInfo.MaxModIntsPerSec +
+-            (pAC->DynIrqModInfo.MaxModIntsPerSec / 2);
+-
+-        pAC->DynIrqModInfo.MaxModIntsPerSecLowerLimit =
+-            pAC->DynIrqModInfo.MaxModIntsPerSec -
+-            (pAC->DynIrqModInfo.MaxModIntsPerSec / 2);
++	pAC->DynIrqModInfo.MaxModIntsPerSecUpperLimit =
++		pAC->DynIrqModInfo.MaxModIntsPerSec +
++		(pAC->DynIrqModInfo.MaxModIntsPerSec / 2);
++
++	pAC->DynIrqModInfo.MaxModIntsPerSecLowerLimit =
++		pAC->DynIrqModInfo.MaxModIntsPerSec -
++		(pAC->DynIrqModInfo.MaxModIntsPerSec / 2);
+ 
+-        pAC->DynIrqModInfo.PrevTimeVal = jiffies;  /* initial value */
++	pAC->DynIrqModInfo.PrevTimeVal = jiffies;  /* initial value */
+ 
+ 
+ } /* GetConfiguration */
+@@ -4826,6 +5037,10 @@ SK_BOOL		DualNet;
+ 		FromPort = Param.Para32[0];
+ 		SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
+ 			("NET UP EVENT, Port: %d ", Param.Para32[0]));
++		/* Mac update */
++		SkAddrMcUpdate(pAC,IoC, FromPort);
++
++		if (DoPrintInterfaceChange) {
+ 		printk("%s: network connection up using"
+ 			" port %c\n", pAC->dev[Param.Para32[0]]->name, 'A'+Param.Para32[0]);
+ 
+@@ -4841,8 +5056,6 @@ SK_BOOL		DualNet;
+ 			printk("    speed:           unknown\n");
+ 		}
+ 
+-		/* Mac update */
+-		SkAddrMcUpdate(pAC,IoC, FromPort);
+ 
+ 		Stat = pAC->GIni.GP[FromPort].PLinkModeStatus;
+ 		if (Stat == SK_LMODE_STAT_AUTOHALF ||
+@@ -4920,6 +5133,9 @@ SK_BOOL		DualNet;
+ 			printk("    rx-checksum:     disabled\n");
+ #endif
+ 
++		} else {
++                        DoPrintInterfaceChange = SK_TRUE;
++                }
+ 	
+ 		if ((Param.Para32[0] != pAC->ActivePort) &&
+ 			(pAC->RlmtNets == 1)) {
+@@ -4937,7 +5153,12 @@ SK_BOOL		DualNet;
+ 		/* action list 7 */
+ 		SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_EVENT,
+ 			("NET DOWN EVENT "));
+-		printk("%s: network connection down\n", pAC->dev[Param.Para32[1]]->name);
++		if (DoPrintInterfaceChange) {
++			printk("%s: network connection down\n", 
++				pAC->dev[Param.Para32[1]]->name);
++		} else {
++			DoPrintInterfaceChange = SK_TRUE;
++		}
+ 		pAC->dev[Param.Para32[1]]->flags &= ~IFF_RUNNING;
+ 		break;
+ 	case SK_DRV_SWITCH_HARD: /* SK_U32 FromPortIdx SK_U32 ToPortIdx */
+@@ -5122,6 +5343,231 @@ char	ClassStr[80];
+ 
+ } /* SkErrorLog */
+ 
++#ifdef SK_DIAG_SUPPORT
++
++/*****************************************************************************
++ *
++ *	SkDrvEnterDiagMode - handles DIAG attach request
++ *
++ * Description:
++ *	Notify the kernel to NOT access the card any longer due to DIAG
++ *	Deinitialize the Card
++ *
++ * Returns:
++ *	int
++ */
++int SkDrvEnterDiagMode(
++SK_AC   *pAc)   /* pointer to adapter context */
++{
++	SK_AC   *pAC  = NULL;
++	DEV_NET *pNet = NULL;
++
++	pNet = (DEV_NET *) pAc->dev[0]->priv;
++	pAC = pNet->pAC;
++
++	SK_MEMCPY(&(pAc->PnmiBackup), &(pAc->PnmiStruct), 
++			sizeof(SK_PNMI_STRUCT_DATA));
++
++	pAC->DiagModeActive = DIAG_ACTIVE;
++	if (pAC->BoardLevel > SK_INIT_DATA) {
++		if (pNet->Up) {
++			pAC->WasIfUp[0] = SK_TRUE;
++			pAC->DiagFlowCtrl = SK_TRUE; /* for SkGeClose      */
++			DoPrintInterfaceChange = SK_FALSE;
++			SkDrvDeInitAdapter(pAC, 0);  /* performs SkGeClose */
++		} else {
++			pAC->WasIfUp[0] = SK_FALSE;
++		}
++		if (pNet != (DEV_NET *) pAc->dev[1]->priv) {
++			pNet = (DEV_NET *) pAc->dev[1]->priv;
++			if (pNet->Up) {
++				pAC->WasIfUp[1] = SK_TRUE;
++				pAC->DiagFlowCtrl = SK_TRUE; /* for SkGeClose */
++				DoPrintInterfaceChange = SK_FALSE;
++				SkDrvDeInitAdapter(pAC, 1);  /* do SkGeClose  */
++			} else {
++				pAC->WasIfUp[1] = SK_FALSE;
++			}
++		}
++		pAC->BoardLevel = SK_INIT_DATA;
++	}
++	return(0);
++}
++
++/*****************************************************************************
++ *
++ *	SkDrvLeaveDiagMode - handles DIAG detach request
++ *
++ * Description:
++ *	Notify the kernel to may access the card again after use by DIAG
++ *	Initialize the Card
++ *
++ * Returns:
++ * 	int
++ */
++int SkDrvLeaveDiagMode(
++SK_AC   *pAc)   /* pointer to adapter control context */
++{ 
++	SK_MEMCPY(&(pAc->PnmiStruct), &(pAc->PnmiBackup), 
++			sizeof(SK_PNMI_STRUCT_DATA));
++	pAc->DiagModeActive    = DIAG_NOTACTIVE;
++	pAc->Pnmi.DiagAttached = SK_DIAG_IDLE;
++        if (pAc->WasIfUp[0] == SK_TRUE) {
++                pAc->DiagFlowCtrl = SK_TRUE; /* for SkGeClose */
++		DoPrintInterfaceChange = SK_FALSE;
++                SkDrvInitAdapter(pAc, 0);    /* first device  */
++        }
++        if (pAc->WasIfUp[1] == SK_TRUE) {
++                pAc->DiagFlowCtrl = SK_TRUE; /* for SkGeClose */
++		DoPrintInterfaceChange = SK_FALSE;
++                SkDrvInitAdapter(pAc, 1);    /* second device */
++        }
++	return(0);
++}
++
++/*****************************************************************************
++ *
++ *	ParseDeviceNbrFromSlotName - Evaluate PCI device number
++ *
++ * Description:
++ * 	This function parses the PCI slot name information string and will
++ *	retrieve the devcie number out of it. The slot_name maintianed by
++ *	linux is in the form of '02:0a.0', whereas the first two characters 
++ *	represent the bus number in hex (in the sample above this is 
++ *	pci bus 0x02) and the next two characters the device number (0x0a).
++ *
++ * Returns:
++ *	SK_U32: The device number from the PCI slot name
++ */ 
++
++static SK_U32 ParseDeviceNbrFromSlotName(
++const char *SlotName)   /* pointer to pci slot name eg. '02:0a.0' */
++{
++	char	*CurrCharPos	= (char *) SlotName;
++	int	FirstNibble	= -1;
++	int	SecondNibble	= -1;
++	SK_U32	Result		=  0;
++
++	while (*CurrCharPos != '\0') {
++		if (*CurrCharPos == ':') { 
++			while (*CurrCharPos != '.') {
++				CurrCharPos++;  
++				if (	(*CurrCharPos >= '0') && 
++					(*CurrCharPos <= '9')) {
++					if (FirstNibble == -1) {
++						/* dec. value for '0' */
++						FirstNibble = *CurrCharPos - 48;
++					} else {
++						SecondNibble = *CurrCharPos - 48;
++					}  
++				} else if (	(*CurrCharPos >= 'a') && 
++						(*CurrCharPos <= 'f')  ) {
++					if (FirstNibble == -1) {
++						FirstNibble = *CurrCharPos - 87; 
++					} else {
++						SecondNibble = *CurrCharPos - 87; 
++					}
++				} else {
++					Result = 0;
++				}
++			}
++
++			Result = FirstNibble;
++			Result = Result << 4; /* first nibble is higher one */
++			Result = Result | SecondNibble;
++		}
++		CurrCharPos++;   /* next character */
++	}
++	return (Result);
++}
++
++/****************************************************************************
++ *
++ *	SkDrvDeInitAdapter - deinitialize adapter (this function is only 
++ *				called if Diag attaches to that card)
++ *
++ * Description:
++ *	Close initialized adapter.
++ *
++ * Returns:
++ *	0 - on success
++ *	error code - on error
++ */
++static int SkDrvDeInitAdapter(
++SK_AC   *pAC,		/* pointer to adapter context   */
++int      devNbr)	/* what device is to be handled */
++{
++	struct SK_NET_DEVICE *dev;
++
++	dev = pAC->dev[devNbr];
++
++	/*
++	** Function SkGeClose() uses MOD_DEC_USE_COUNT (2.2/2.4)
++	** or module_put() (2.6) to decrease the number of users for
++	** a device, but if a device is to be put under control of 
++	** the DIAG, that count is OK already and does not need to 
++	** be adapted! Hence the opposite MOD_INC_USE_COUNT or 
++	** try_module_get() needs to be used again to correct that.
++	*/
++	if (!try_module_get(THIS_MODULE)) {
++		return (-1);
++	}
++
++	if (SkGeClose(dev) != 0) {
++		module_put(THIS_MODULE);
++		return (-1);
++	}
++	return (0);
++
++} /* SkDrvDeInitAdapter() */
++
++/****************************************************************************
++ *
++ *	SkDrvInitAdapter - Initialize adapter (this function is only 
++ *				called if Diag deattaches from that card)
++ *
++ * Description:
++ *	Close initialized adapter.
++ *
++ * Returns:
++ *	0 - on success
++ *	error code - on error
++ */
++static int SkDrvInitAdapter(
++SK_AC   *pAC,		/* pointer to adapter context   */
++int      devNbr)	/* what device is to be handled */
++{
++	struct SK_NET_DEVICE *dev;
++
++	dev = pAC->dev[devNbr];
++
++	if (SkGeOpen(dev) != 0) {
++		return (-1);
++	} else {
++		/*
++		** Function SkGeOpen() uses MOD_INC_USE_COUNT (2.2/2.4) 
++		** or try_module_get() (2.6) to increase the number of 
++		** users for a device, but if a device was just under 
++		** control of the DIAG, that count is OK already and 
++		** does not need to be adapted! Hence the opposite 
++		** MOD_DEC_USE_COUNT or module_put() needs to be used 
++		** again to correct that.
++		*/
++		module_put(THIS_MODULE);
++	}
++
++	/*
++	** Use correct MTU size and indicate to kernel TX queue can be started
++	*/ 
++	if (SkGeChangeMtu(dev, dev->mtu) != 0) {
++		return (-1);
++	} 
++	return (0);
++
++} /* SkDrvInitAdapter */
++
++#endif
++
+ #ifdef DEBUG
+ /****************************************************************************/
+ /* "debug only" section *****************************************************/
+--- linux-2.6.0/drivers/net/sk98lin/skgehwt.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/net/sk98lin/skgehwt.c	2003-12-28 23:21:01.000000000 -0800
+@@ -1,10 +1,10 @@
+ /******************************************************************************
+  *
+  * Name:	skgehwt.c
+- * Project:	Gigabit Ethernet Adapters, Common Modules
+- * 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.15 $
++ * Date:	$Date: 2003/09/16 13:41:23 $
++ * Purpose:	Hardware Timer
+  *
+  ******************************************************************************/
+ 
+@@ -27,6 +27,10 @@
+  * History:
+  *
+  *	$Log: skgehwt.c,v $
++ *	Revision 1.15  2003/09/16 13:41:23  rschmidt
++ *	Added (C) Marvell to SysKonnectFileId
++ *	Editorial changes
++ *	
+  *	Revision 1.14  2003/05/13 18:01:58  mkarl
+  *	Editorial changes.
+  *	
+@@ -69,19 +73,15 @@
+  *	
+  *	Revision 1.1  1998/08/05 11:28:36  gklug
+  *	first version: adapted from SMT/FDDI
+- *	
+- *	
+- *	
+  *
+  ******************************************************************************/
+ 
+-
+ /*
+-	Event queue and dispatcher
+-*/
++ *	Event queue and dispatcher
++ */
+ #if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
+ static const char SysKonnectFileId[] =
+-	"$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 */
+@@ -89,10 +89,7 @@ static const char SysKonnectFileId[] =
+ 
+ #ifdef __C2MAN__
+ /*
+-	Hardware Timer function queue management.
+-
+-	General Description:
+-
++ *   Hardware Timer function queue management.
+  */
+ intro()
+ {}
+@@ -117,9 +114,9 @@ SK_IOC	Ioc)	/* IoContext */
+ {
+ 	pAC->Hwt.TStart = 0 ;
+ 	pAC->Hwt.TStop	= 0 ;
+-	pAC->Hwt.TActive = SK_FALSE ;
++	pAC->Hwt.TActive = SK_FALSE;
+ 
+-	SkHwtStop(pAC,Ioc) ;
++	SkHwtStop(pAC, Ioc);
+ }
+ 
+ /*
+@@ -132,28 +129,29 @@ SK_AC	*pAC,	/* Adapters context */
+ SK_IOC	Ioc,	/* IoContext */
+ SK_U32	Time)	/* Time in units of 16us to load the timer with. */
+ {
+-	SK_U32	Cnt ;
++	SK_U32	Cnt;
+ 
+ 	if (Time > SK_HWT_MAX)
+-		Time = SK_HWT_MAX ;
++		Time = SK_HWT_MAX;
+ 
+-	pAC->Hwt.TStart = Time ;
+-	pAC->Hwt.TStop = 0L ;
++	pAC->Hwt.TStart = Time;
++	pAC->Hwt.TStop = 0L;
+ 
+-	Cnt = Time ;
++	Cnt = Time;
+ 
+ 	/*
+ 	 * if time < 16 us
+ 	 *	time = 16 us
+ 	 */
+ 	if (!Cnt) {
+-		Cnt++ ;
++		Cnt++;
+ 	}
+ 
+-	SK_OUT32(Ioc, B2_TI_INI, Cnt * SK_HWT_FAC) ;
+-	SK_OUT16(Ioc, B2_TI_CRTL, TIM_START) ;	/* Start timer. */
++	SK_OUT32(Ioc, B2_TI_INI, Cnt * SK_HWT_FAC);
++	
++	SK_OUT16(Ioc, B2_TI_CTRL, TIM_START);	/* Start timer. */
+ 
+-	pAC->Hwt.TActive = SK_TRUE ;
++	pAC->Hwt.TActive = SK_TRUE;
+ }
+ 
+ /*
+@@ -164,10 +162,11 @@ void	SkHwtStop(
+ SK_AC	*pAC,	/* Adapters context */
+ SK_IOC	Ioc)	/* IoContext */
+ {
+-	SK_OUT16(Ioc, B2_TI_CRTL, TIM_STOP) ;
+-	SK_OUT16(Ioc, B2_TI_CRTL, TIM_CLR_IRQ) ;
++	SK_OUT16(Ioc, B2_TI_CTRL, TIM_STOP);
++	
++	SK_OUT16(Ioc, B2_TI_CTRL, TIM_CLR_IRQ);
+ 
+-	pAC->Hwt.TActive = SK_FALSE ;
++	pAC->Hwt.TActive = SK_FALSE;
+ }
+ 
+ 
+@@ -182,26 +181,31 @@ SK_U32	SkHwtRead(
+ SK_AC	*pAC,	/* Adapters context */
+ SK_IOC	Ioc)	/* IoContext */
+ {
+-	SK_U32	TRead ;
+-	SK_U32	IStatus ;
++	SK_U32	TRead;
++	SK_U32	IStatus;
+ 
+ 	if (pAC->Hwt.TActive) {
+-		SkHwtStop(pAC,Ioc) ;
++		
++		SkHwtStop(pAC, Ioc);
+ 
+ 		SK_IN32(Ioc, B2_TI_VAL, &TRead);
+ 		TRead /= SK_HWT_FAC;
+ 
+ 		SK_IN32(Ioc, B0_ISRC, &IStatus);
+ 
+-		/* Check if timer expired (or wraparound). */
++		/* Check if timer expired (or wraped around) */
+ 		if ((TRead > pAC->Hwt.TStart) || (IStatus & IS_TIMINT)) {
+-			SkHwtStop(pAC,Ioc) ;
+-			pAC->Hwt.TStop = pAC->Hwt.TStart ;
+-		} else {
+-			pAC->Hwt.TStop = pAC->Hwt.TStart - TRead ;
++			
++			SkHwtStop(pAC, Ioc);
++			
++			pAC->Hwt.TStop = pAC->Hwt.TStart;
++		}
++		else {
++			
++			pAC->Hwt.TStop = pAC->Hwt.TStart - TRead;
+ 		}
+ 	}
+-	return (pAC->Hwt.TStop) ;
++	return(pAC->Hwt.TStop);
+ }
+ 
+ /*
+@@ -211,9 +215,11 @@ void	SkHwtIsr(
+ SK_AC	*pAC,	/* Adapters context */
+ SK_IOC	Ioc)	/* IoContext */
+ {
+-	SkHwtStop(pAC,Ioc);
++	SkHwtStop(pAC, Ioc);
++	
+ 	pAC->Hwt.TStop = pAC->Hwt.TStart;
+-	SkTimerDone(pAC,Ioc) ;
++	
++	SkTimerDone(pAC, Ioc);
+ }
+ 
+ /* End of file */
+--- linux-2.6.0/drivers/net/sk98lin/skgeinit.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/net/sk98lin/skgeinit.c	2003-12-28 23:21:01.000000000 -0800
+@@ -2,8 +2,8 @@
+  *
+  * Name:	skgeinit.c
+  * Project:	Gigabit Ethernet Adapters, Common Modules
+- * 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: 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().
++ *	Added define SK_PHY_LP_MODE around power saving mode in SkGeDeInit().
++ *	Added check for VAUX available before switch power to VAUX.
++ *	
++ *	Revision 1.96  2003/09/18 14:02:41  rroesler
++ *	Add: Perform a hardreset of MACs in GeDeInit()
++ *	
++ *	Revision 1.95  2003/09/16 14:26:59  rschmidt
++ *	Added switch power to VCC (WA for VAUX problem) in SkGeInit1().
++ *	Fixed setting PHY to coma mode and D3 power state in SkGeDeInit().
++ *	Editorial changes.
++ *	
++ *	Revision 1.94  2003/09/16 07:17:10  mschmid
++ *	Added init for new members in port structure for MAC control
++ *	- PMacColThres
++ *	- PMacJamLen
++ *	- PMacJamIpgVal
++ *	- PMacJamIpgData
++ *	- PMacIpgData
++ *	- PMacLimit4
++ *	Added init for PHY power state in port structure
++ *	- PPhyPowerState
++ *	Added shutdown handling for Yukon Plus in SkGeDeInit()
++ *	
+  *	Revision 1.93  2003/05/28 15:44:43  rschmidt
+  *	Added check for chip Id on WOL WA for chip Rev. A.
+  *	Added setting of GILevel in SkGeDeInit().
+@@ -446,7 +472,7 @@
+ 
+ #if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
+ static const char SysKonnectFileId[] =
+-	"@(#) $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 {
+@@ -1013,8 +1039,6 @@ int		Port)		/* Port Index (MAC_1 + n) */
+ 	 *	- enable the FIFO
+ 	 */
+ 	
+-	Word = (SK_U16)GMF_RX_CTRL_DEF;
+-	
+ #ifdef GENESIS
+ 	if (pAC->GIni.GIGenesis) {
+ 		/* Configure Rx MAC FIFO */
+@@ -1039,6 +1063,8 @@ int		Port)		/* Port Index (MAC_1 + n) */
+ 		/* set Rx GMAC FIFO Flush Mask */
+ 		SK_OUT16(IoC, MR_ADDR(Port, RX_GMF_FL_MSK), (SK_U16)RX_FF_FL_DEF_MSK);
+ 		
++		Word = (SK_U16)GMF_RX_CTRL_DEF;
++
+ 		/* disable Rx GMAC FIFO Flush for YUKON-Lite Rev. A0 only */
+ 		if (pAC->GIni.GIYukonLite && pAC->GIni.GIChipId == CHIP_ID_YUKON) {
+ 
+@@ -1809,6 +1835,13 @@ SK_IOC	IoC)		/* IO context */
+ 		pPrt->PAutoNegFail = SK_FALSE;
+ 		pPrt->PHWLinkUp = SK_FALSE;
+ 		pPrt->PLinkBroken = SK_TRUE; /* See WA code */
++		pPrt->PPhyPowerState = PHY_PM_OPERATIONAL_MODE;
++		pPrt->PMacColThres = TX_COL_DEF;
++		pPrt->PMacJamLen = TX_JAM_LEN_DEF;
++		pPrt->PMacJamIpgVal	= TX_JAM_IPG_DEF;
++		pPrt->PMacJamIpgData = TX_IPG_JAM_DEF;
++		pPrt->PMacIpgData = IPG_DATA_DEF;
++		pPrt->PMacLimit4 = SK_FALSE;
+ 	}
+ 
+ 	pAC->GIni.GIPortUsage = SK_RED_LINK;
+@@ -1963,7 +1996,7 @@ SK_IOC	IoC)		/* IO context */
+ 	/* restore CLK_RUN bits */
+ 	SK_OUT16(IoC, B0_CTST, (SK_U16)(CtrlStat &
+ 		(CS_CLK_RUN_HOT | CS_CLK_RUN_RST | CS_CLK_RUN_ENA)));
+-	
++
+ 	/* read Chip Identification Number */
+ 	SK_IN8(IoC, B2_CHIP_ID, &Byte);
+ 	pAC->GIni.GIChipId = Byte;
+@@ -2053,6 +2086,10 @@ SK_IOC	IoC)		/* IO context */
+ 			}
+ 		}
+ 
++		/* switch power to VCC (WA for VAUX problem) */
++		SK_OUT8(IoC, B0_POWER_CTRL, (SK_U8)(PC_VAUX_ENA | PC_VCC_ENA |
++			PC_VAUX_OFF | PC_VCC_ON));
++
+ 		/* read the Interrupt source */
+ 		SK_IN32(IoC, B0_ISRC, &DWord);
+ 		
+@@ -2395,6 +2432,11 @@ SK_IOC	IoC)		/* IO context */
+ 	int	i;
+ 	SK_U16	Word;
+ 
++#ifdef SK_PHY_LP_MODE
++	SK_U8	Byte;
++	SK_U16	PmCtlSts;
++#endif /* SK_PHY_LP_MODE */
++
+ #if (!defined(SK_SLIM) && !defined(VCPU))
+ 	/* ensure I2C is ready */
+ 	SkI2cWaitIrq(pAC, IoC);
+@@ -2409,6 +2451,38 @@ SK_IOC	IoC)		/* IO context */
+ 		}
+ 	}
+ 
++#ifdef SK_PHY_LP_MODE
++    /*
++	 * for power saving purposes within mobile environments
++	 * we set the PHY to coma mode and switch to D3 power state.
++	 */
++	if (pAC->GIni.GIYukonLite &&
++		pAC->GIni.GIChipRev == CHIP_REV_YU_LITE_A3) {
++
++		/* for all ports switch PHY to coma mode */
++		for (i = 0; i < pAC->GIni.GIMacsFound; i++) {
++			
++			SkGmEnterLowPowerMode(pAC, IoC, i, PHY_PM_DEEP_SLEEP);
++		}
++
++		if (pAC->GIni.GIVauxAvail) {
++			/* switch power to VAUX */
++			Byte = PC_VAUX_ENA | PC_VCC_ENA | PC_VAUX_ON | PC_VCC_OFF;
++
++			SK_OUT8(IoC, B0_POWER_CTRL, Byte);
++		}
++		
++		/* switch to D3 state */
++		SK_IN16(IoC, PCI_C(PCI_PM_CTL_STS), &PmCtlSts);
++
++		PmCtlSts |= PCI_PM_STATE_D3;
++
++		SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_ON);
++
++		SK_OUT16(IoC, PCI_C(PCI_PM_CTL_STS), PmCtlSts);
++	}
++#endif /* SK_PHY_LP_MODE */
++
+ 	/* Reset all bits in the PCI STATUS register */
+ 	/*
+ 	 * Note: PCI Cfg cycles cannot be used, because they are not
+--- linux-2.6.0/drivers/net/sk98lin/skgemib.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/net/sk98lin/skgemib.c	2003-12-28 23:21:01.000000000 -0800
+@@ -2,8 +2,8 @@
+  *
+  * Name:	skgemib.c
+  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
+- * 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: 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.
++ *	
++ *	Revision 1.10  2003/08/15 12:28:59  tschilli
++ *	Added new OIDs:
++ *	OID_SKGE_DRIVER_RELDATE
++ *	OID_SKGE_DRIVER_FILENAME
++ *	OID_SKGE_CHIPID
++ *	OID_SKGE_RAMSIZE
++ *	OID_SKGE_VAUXAVAIL
++ *	OID_SKGE_PHY_TYPE
++ *	OID_SKGE_PHY_LP_MODE
++ *	
+  *	Revision 1.9  2003/05/23 12:55:20  tschilli
+  *	OID_SKGE_BOARDLEVEL added.
+  *	
+@@ -356,6 +369,16 @@ PNMI_STATIC const SK_PNMI_TAB_ENTRY IdTa
+ 		0,
+ 		SK_PNMI_MAI_OFF(DriverVersion),
+ 		SK_PNMI_RO, General, 0},
++	{OID_SKGE_DRIVER_RELDATE,
++		1,
++		0,
++		SK_PNMI_MAI_OFF(DriverReleaseDate),
++		SK_PNMI_RO, General, 0},
++	{OID_SKGE_DRIVER_FILENAME,
++		1,
++		0,
++		SK_PNMI_MAI_OFF(DriverFileName),
++		SK_PNMI_RO, General, 0},
+ 	{OID_SKGE_HW_DESCR,
+ 		1,
+ 		0,
+@@ -371,6 +394,21 @@ PNMI_STATIC const SK_PNMI_TAB_ENTRY IdTa
+ 		0,
+ 		SK_PNMI_MAI_OFF(Chipset),
+ 		SK_PNMI_RO, General, 0},
++	{OID_SKGE_CHIPID,
++		1,
++		0,
++		SK_PNMI_MAI_OFF(ChipId),
++		SK_PNMI_RO, General, 0},
++	{OID_SKGE_RAMSIZE,
++		1,
++		0,
++		SK_PNMI_MAI_OFF(RamSize),
++		SK_PNMI_RO, General, 0},
++	{OID_SKGE_VAUXAVAIL,
++		1,
++		0,
++		SK_PNMI_MAI_OFF(VauxAvail),
++		SK_PNMI_RO, General, 0},
+ 	{OID_SKGE_ACTION,
+ 		1,
+ 		0,
+@@ -876,6 +914,18 @@ PNMI_STATIC const SK_PNMI_TAB_ENTRY IdTa
+ 		sizeof(SK_PNMI_CONF),
+ 		SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfConnector),
+ 		SK_PNMI_RO, MacPrivateConf, 0},
++	{OID_SKGE_PHY_TYPE,
++		SK_PNMI_MAC_ENTRIES,
++		sizeof(SK_PNMI_CONF),
++		SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfPhyType),
++		SK_PNMI_RO, MacPrivateConf, 0},
++#ifdef SK_PHY_LP_MODE
++		{OID_SKGE_PHY_LP_MODE,
++		SK_PNMI_MAC_ENTRIES,
++		sizeof(SK_PNMI_CONF),
++		SK_PNMI_OFF(Conf) + SK_PNMI_CNF_OFF(ConfPhyMode),
++		SK_PNMI_RW, MacPrivateConf, 0},
++#endif	
+ 	{OID_SKGE_LINK_CAP,
+ 		SK_PNMI_MAC_ENTRIES,
+ 		sizeof(SK_PNMI_CONF),
+--- linux-2.6.0/drivers/net/sk98lin/skgepnmi.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/net/sk98lin/skgepnmi.c	2003-12-28 23:21:01.000000000 -0800
+@@ -2,8 +2,8 @@
+  *
+  * Name:	skgepnmi.c
+  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
+- * 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: 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.
++ *	
++ *	Revision 1.110  2003/08/15 12:28:04  tschilli
++ *	Added new OIDs:
++ *	OID_SKGE_DRIVER_RELDATE
++ *	OID_SKGE_DRIVER_FILENAME
++ *	OID_SKGE_CHIPID
++ *	OID_SKGE_RAMSIZE
++ *	OID_SKGE_VAUXAVAIL
++ *	OID_SKGE_PHY_TYPE
++ *	OID_SKGE_PHY_LP_MODE
++ *	
++ *	Added SK_DIAG_ATTACHED handling for OID_SKGE_DIAG_MODE in DiagActions().
++ *	
+  *	Revision 1.109  2003/07/17 14:15:24  tschilli
+  *	Bug in SkPnmiGenIoctl() fixed.
+  *	
+@@ -471,7 +487,7 @@
+ 
+ #ifndef _lint
+ static const char SysKonnectFileId[] =
+-	"@(#) $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"
+@@ -4008,14 +4024,6 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
+ #endif /* SK_NDIS_64BIT_CTR */
+ 		break;
+ 
+-	case OID_SKGE_BOARDLEVEL:
+-		if (*pLen < sizeof(SK_U32)) {
+-
+-			*pLen = sizeof(SK_U32);
+-			return (SK_PNMI_ERR_TOO_SHORT);
+-		}
+-		break;
+-
+ 	case OID_SKGE_PORT_NUMBER:
+ 	case OID_SKGE_DEVICE_TYPE:
+ 	case OID_SKGE_RESULT:
+@@ -4023,6 +4031,9 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
+ 	case OID_GEN_TRANSMIT_QUEUE_LENGTH:
+ 	case OID_SKGE_TRAP_NUMBER:
+ 	case OID_SKGE_MDB_VERSION:
++	case OID_SKGE_BOARDLEVEL:
++	case OID_SKGE_CHIPID:
++	case OID_SKGE_RAMSIZE:
+ 		if (*pLen < sizeof(SK_U32)) {
+ 
+ 			*pLen = sizeof(SK_U32);
+@@ -4043,6 +4054,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
+ 	case OID_SKGE_BUS_WIDTH:
+ 	case OID_SKGE_SENSOR_NUMBER:
+ 	case OID_SKGE_CHKSM_NUMBER:
++	case OID_SKGE_VAUXAVAIL:
+ 		if (*pLen < sizeof(SK_U8)) {
+ 
+ 			*pLen = sizeof(SK_U8);
+@@ -4234,6 +4246,66 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
+ 		*pLen = Len;
+ 		break;
+ 
++	case OID_SKGE_DRIVER_RELDATE:
++		if (pAC->Pnmi.pDriverReleaseDate == NULL) {
++
++			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR030,
++				SK_PNMI_ERR053MSG);
++
++			*pLen = 0;
++			return (SK_PNMI_ERR_GENERAL);
++		}
++
++		Len = SK_STRLEN(pAC->Pnmi.pDriverReleaseDate) + 1;
++		if (Len > SK_PNMI_STRINGLEN1) {
++
++			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR031,
++				SK_PNMI_ERR054MSG);
++
++			*pLen = 0;
++			return (SK_PNMI_ERR_GENERAL);
++		}
++
++		if (*pLen < Len) {
++
++			*pLen = Len;
++			return (SK_PNMI_ERR_TOO_SHORT);
++		}
++		*pBuf = (char)(Len - 1);
++		SK_MEMCPY(pBuf + 1, pAC->Pnmi.pDriverReleaseDate, Len - 1);
++		*pLen = Len;
++		break;
++
++	case OID_SKGE_DRIVER_FILENAME:
++		if (pAC->Pnmi.pDriverFileName == NULL) {
++
++			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR030,
++				SK_PNMI_ERR055MSG);
++
++			*pLen = 0;
++			return (SK_PNMI_ERR_GENERAL);
++		}
++
++		Len = SK_STRLEN(pAC->Pnmi.pDriverFileName) + 1;
++		if (Len > SK_PNMI_STRINGLEN1) {
++
++			SK_ERR_LOG(pAC, SK_ERRCL_SW, SK_PNMI_ERR031,
++				SK_PNMI_ERR056MSG);
++
++			*pLen = 0;
++			return (SK_PNMI_ERR_GENERAL);
++		}
++
++		if (*pLen < Len) {
++
++			*pLen = Len;
++			return (SK_PNMI_ERR_TOO_SHORT);
++		}
++		*pBuf = (char)(Len - 1);
++		SK_MEMCPY(pBuf + 1, pAC->Pnmi.pDriverFileName, Len - 1);
++		*pLen = Len;
++		break;
++
+ 	case OID_SKGE_HW_DESCR:
+ 		/*
+ 		 * The hardware description is located in the VPD. This
+@@ -4291,8 +4363,25 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
+ 		*pLen = sizeof(SK_U16);
+ 		break;
+ 
++	case OID_SKGE_CHIPID:
++		Val32 = pAC->GIni.GIChipId;
++		SK_PNMI_STORE_U32(pBuf, Val32);
++		*pLen = sizeof(SK_U32);
++		break;
++
++	case OID_SKGE_RAMSIZE:
++		Val32 = pAC->GIni.GIRamSize;
++		SK_PNMI_STORE_U32(pBuf, Val32);
++		*pLen = sizeof(SK_U32);
++		break;
++
++	case OID_SKGE_VAUXAVAIL:
++		*pBuf = (char) pAC->GIni.GIVauxAvail;
++		*pLen = sizeof(char);
++		break;
++
+ 	case OID_SKGE_BUS_TYPE:
+-		*pBuf = (char)SK_PNMI_BUS_PCI;
++		*pBuf = (char) SK_PNMI_BUS_PCI;
+ 		*pLen = sizeof(char);
+ 		break;
+ 
+@@ -5435,6 +5524,9 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
+ 		case OID_SKGE_SPEED_CAP:
+ 		case OID_SKGE_SPEED_MODE:
+ 		case OID_SKGE_SPEED_STATUS:
++#ifdef SK_PHY_LP_MODE
++		case OID_SKGE_PHY_LP_MODE:
++#endif
+ 			if (*pLen < (Limit - LogPortIndex) * sizeof(SK_U8)) {
+ 
+ 				*pLen = (Limit - LogPortIndex) * sizeof(SK_U8);
+@@ -5443,6 +5535,7 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
+ 			break;
+ 
+         case OID_SKGE_MTU:
++        case OID_SKGE_PHY_TYPE:
+ 			if (*pLen < (Limit - LogPortIndex) * sizeof(SK_U32)) {
+ 
+ 				*pLen = (Limit - LogPortIndex) * sizeof(SK_U32);
+@@ -5488,6 +5581,49 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
+ 				Offset += sizeof(char);
+ 				break;
+ 
++			case OID_SKGE_PHY_TYPE:
++				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
++					if (LogPortIndex == 0) {
++						continue;
++					}
++					else {
++						/* Get value for physical ports */
++						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(
++							pAC, LogPortIndex);
++						Val32 = pAC->GIni.GP[PhysPortIndex].PhyType;
++						SK_PNMI_STORE_U32(pBufPtr, Val32);
++					}
++				}
++				else { /* DualNetMode */
++					
++					Val32 = pAC->GIni.GP[NetIndex].PhyType;
++					SK_PNMI_STORE_U32(pBufPtr, Val32);
++				}
++				Offset += sizeof(SK_U32);
++				break;
++
++#ifdef SK_PHY_LP_MODE
++			case OID_SKGE_PHY_LP_MODE:
++				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
++					if (LogPortIndex == 0) {
++						continue;
++					}
++					else {
++						/* Get value for physical ports */
++						PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(pAC, LogPortIndex);
++						Val8 = (SK_U8) pAC->GIni.GP[PhysPortIndex].PPhyPowerState;
++						*pBufPtr = Val8;
++					}
++				}
++				else { /* DualNetMode */
++					
++					Val8 = (SK_U8) pAC->GIni.GP[PhysPortIndex].PPhyPowerState;
++					*pBufPtr = Val8;
++				}
++				Offset += sizeof(SK_U8);
++				break;
++#endif
++
+ 			case OID_SKGE_LINK_CAP:
+ 				if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
+ 					if (LogPortIndex == 0) {
+@@ -5804,6 +5940,16 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
+ 		}
+ 		break;
+ 
++#ifdef SK_PHY_LP_MODE
++	case OID_SKGE_PHY_LP_MODE:
++		if (*pLen < Limit - LogPortIndex) {
++
++			*pLen = Limit - LogPortIndex;
++			return (SK_PNMI_ERR_TOO_SHORT);
++		}
++		break;
++#endif
++
+ 	case OID_SKGE_MTU:
+ 		if (*pLen < sizeof(SK_U32)) {
+ 
+@@ -6160,6 +6306,116 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
+ 
+ 			Offset += sizeof(SK_U32);
+ 			break;
++		
++#ifdef SK_PHY_LP_MODE
++		case OID_SKGE_PHY_LP_MODE:
++			/* The preset ends here */
++			if (Action == SK_PNMI_PRESET) {
++
++				return (SK_PNMI_ERR_OK);
++			}
++
++			if (!pAC->Pnmi.DualNetActiveFlag) { /* SingleNetMode */
++				if (LogPortIndex == 0) {
++					Offset = 0;
++					continue;
++				}
++				else {
++					/* Set value for physical ports */
++					PhysPortIndex = SK_PNMI_PORT_LOG2PHYS(pAC, LogPortIndex);
++
++					switch (*(pBuf + Offset)) {
++						case 0:
++							/* If LowPowerMode is active, we can leave it. */
++							if (pAC->GIni.GP[PhysPortIndex].PPhyPowerState) {
++
++								Val32 = SkGmLeaveLowPowerMode(pAC, IoC, PhysPortIndex);
++								
++								if (pAC->GIni.GP[PhysPortIndex].PPhyPowerState < 3)	{
++									
++									SkDrvInitAdapter(pAC);
++								}
++								break;
++							}
++							else {
++								*pLen = 0;
++								return (SK_PNMI_ERR_GENERAL);
++							}
++						case 1:
++						case 2:
++						case 3:
++						case 4:
++							/* If no LowPowerMode is active, we can enter it. */
++							if (!pAC->GIni.GP[PhysPortIndex].PPhyPowerState) {
++
++								if ((*(pBuf + Offset)) < 3)	{
++								
++									SkDrvDeInitAdapter(pAC);
++								}
++
++								Val32 = SkGmEnterLowPowerMode(pAC, IoC, PhysPortIndex, *pBuf);
++								break;
++							}
++							else {
++								*pLen = 0;
++								return (SK_PNMI_ERR_GENERAL);
++							}
++						default:
++							*pLen = 0;
++							return (SK_PNMI_ERR_BAD_VALUE);
++					}
++				}
++			}
++			else { /* DualNetMode */
++				
++				switch (*(pBuf + Offset)) {
++					case 0:
++						/* If we are in a LowPowerMode, we can leave it. */
++						if (pAC->GIni.GP[PhysPortIndex].PPhyPowerState) {
++
++							Val32 = SkGmLeaveLowPowerMode(pAC, IoC, PhysPortIndex);
++							
++							if (pAC->GIni.GP[PhysPortIndex].PPhyPowerState < 3)	{
++
++								SkDrvInitAdapter(pAC);
++							}
++							break;
++						}
++						else {
++							*pLen = 0;
++							return (SK_PNMI_ERR_GENERAL);
++						}
++					
++					case 1:
++					case 2:
++					case 3:
++					case 4:
++						/* If we are not already in LowPowerMode, we can enter it. */
++						if (!pAC->GIni.GP[PhysPortIndex].PPhyPowerState) {
++
++							if ((*(pBuf + Offset)) < 3)	{
++
++								SkDrvDeInitAdapter(pAC);
++							}
++							else {
++
++								Val32 = SkGmEnterLowPowerMode(pAC, IoC, PhysPortIndex, *pBuf);
++							}
++							break;
++						}
++						else {
++							*pLen = 0;
++							return (SK_PNMI_ERR_GENERAL);
++						}
++					
++					default:
++						*pLen = 0;
++						return (SK_PNMI_ERR_BAD_VALUE);
++				}
++			}
++			Offset += sizeof(SK_U8);
++			break;
++#endif
+ 
+ 		default:
+             SK_DBG_MSG(pAC, SK_DBGMOD_PNMI, SK_DBGCAT_ERR,
+@@ -6318,6 +6574,7 @@ char *pBuf)		/* Buffer used for the mana
+ 	unsigned int	PhysPortMax;
+ 	unsigned int	PhysPortIndex;
+ 	SK_U8		Val8;
++	SK_U32		Val32;
+ 	SK_BOOL		PortActiveFlag;
+ 	SK_GEPORT	*pPrt;
+ 
+@@ -6340,6 +6597,14 @@ char *pBuf)		/* Buffer used for the mana
+ 
+ 		switch (Id) {
+ 
++		case OID_SKGE_PHY_TYPE:
++			/* Check if it is the first active port */
++			if (*pBuf == 0) {
++				Val32 = pPrt->PhyType;
++				SK_PNMI_STORE_U32(pBuf, Val32);
++				continue;
++			}
++
+ 		case OID_SKGE_LINK_CAP:
+ 
+ 			/*
+@@ -7974,6 +8239,7 @@ unsigned int TableIndex, /* Index to the
+ SK_U32 NetIndex)	/* NetIndex (0..n), in single net mode always zero */
+ {
+ 
++	SK_U32	DiagStatus;
+ 	SK_U32	RetCode = SK_PNMI_ERR_GENERAL;
+ 
+ 	/*
+@@ -8012,7 +8278,8 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
+ 		switch (Id) {
+ 
+ 		case OID_SKGE_DIAG_MODE:
+-			SK_PNMI_STORE_U32(pBuf, pAC->DiagModeActive);
++			DiagStatus = pAC->Pnmi.DiagAttached;
++			SK_PNMI_STORE_U32(pBuf, DiagStatus);
+ 			*pLen = sizeof(SK_U32);	
+ 			RetCode = SK_PNMI_ERR_OK;
+ 			break;
+@@ -8022,7 +8289,6 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
+ 			RetCode = SK_PNMI_ERR_GENERAL;
+ 			break;
+ 		}
+-
+ 		return (RetCode); 
+ 	}
+ 
+@@ -8039,23 +8305,84 @@ SK_U32 NetIndex)	/* NetIndex (0..n), in 
+ 
+ 			/* Handle the SET. */
+ 			switch (*pBuf) {
+-		
++
++				/* Attach the DIAG to this adapter. */
++				case SK_DIAG_ATTACHED:
++					/* Check if we come from running */
++					if (pAC->Pnmi.DiagAttached == SK_DIAG_RUNNING) {
++
++						RetCode = SkDrvLeaveDiagMode(pAC);
++
++					}
++					else if (pAC->Pnmi.DiagAttached == SK_DIAG_IDLE) {
++
++						RetCode = SK_PNMI_ERR_OK;
++					}	
++					
++					else {
++
++						RetCode = SK_PNMI_ERR_GENERAL;
++
++					}
++					
++					if (RetCode == SK_PNMI_ERR_OK) {
++
++						pAC->Pnmi.DiagAttached = SK_DIAG_ATTACHED;
++					}
++					break;
++
+ 				/* Enter the DIAG mode in the driver. */
+-				case 1:
+-					/* If DiagMode is not active, we can enter it. */
+-					if (!pAC->DiagModeActive) {
++				case SK_DIAG_RUNNING:
++					RetCode = SK_PNMI_ERR_OK;
++					
++					/*
++					 * If DiagAttached is set, we can tell the driver
++					 * to enter the DIAG mode.
++					 */
++					if (pAC->Pnmi.DiagAttached == SK_DIAG_ATTACHED) {
++						/* If DiagMode is not active, we can enter it. */
++						if (!pAC->DiagModeActive) {
+ 
+-						RetCode = SkDrvEnterDiagMode(pAC);	
++							RetCode = SkDrvEnterDiagMode(pAC); 
++						}
++						else {
++
++							RetCode = SK_PNMI_ERR_GENERAL;
++						}
+ 					}
+ 					else {
+ 
+ 						RetCode = SK_PNMI_ERR_GENERAL;
+ 					}
++					
++					if (RetCode == SK_PNMI_ERR_OK) {
++
++						pAC->Pnmi.DiagAttached = SK_DIAG_RUNNING;
++					}
+ 					break;
+ 
+-				/* Leave the DIAG mode in the driver. */
+-				case 0:
+-					RetCode = SkDrvLeaveDiagMode(pAC);	
++				case SK_DIAG_IDLE:
++					/* Check if we come from running */
++					if (pAC->Pnmi.DiagAttached == SK_DIAG_RUNNING) {
++
++						RetCode = SkDrvLeaveDiagMode(pAC);
++
++					}
++					else if (pAC->Pnmi.DiagAttached == SK_DIAG_ATTACHED) {
++
++						RetCode = SK_PNMI_ERR_OK;
++					}	
++					
++					else {
++
++						RetCode = SK_PNMI_ERR_GENERAL;
++
++					}
++
++					if (RetCode == SK_PNMI_ERR_OK) {
++
++						pAC->Pnmi.DiagAttached = SK_DIAG_IDLE;
++					}
+ 					break;
+ 
+ 				default:
+--- linux-2.6.0/drivers/net/sk98lin/skgesirq.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/net/sk98lin/skgesirq.c	2003-12-28 23:21:01.000000000 -0800
+@@ -2,8 +2,8 @@
+  *
+  * Name:	skgesirq.c
+  * Project:	Gigabit Ethernet Adapters, Common Modules
+- * 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: 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.
++ *	Avoided port check up in reset state (eg. coma mode).
++ *	Editorial changes.
++ *	
+  *	Revision 1.91  2003/07/04 12:46:22  rschmidt
+  *	Added debug messages in SkGePortCheckUpGmac().
+  *	Added error log message and new driver event SK_DRV_DOWNSHIFT_DET
+@@ -410,7 +416,7 @@
+ 
+ #if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
+ static const char SysKonnectFileId[] =
+-	"@(#) $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 */
+@@ -490,7 +496,7 @@ int		Port)	/* Port Index (MAC_1 + n) */
+ 		("AutoSensing: First mode %d on Port %d\n",
+ 		(int)SK_LMODE_AUTOFULL, Port));
+ 
+-	pPrt->PLinkMode = SK_LMODE_AUTOFULL;
++	pPrt->PLinkMode = (SK_U8)SK_LMODE_AUTOFULL;
+ 
+ 	return;
+ }	/* SkHWInitDefSense */
+@@ -606,7 +612,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
+ 	/* Reset Port stati */
+     pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_UNKNOWN;
+     pPrt->PFlowCtrlStatus = (SK_U8)SK_FLOW_STAT_NONE;
+-	pPrt->PLinkSpeedUsed = SK_LSPEED_STAT_INDETERMINATED;
++	pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_INDETERMINATED;
+ 
+ 	/* Re-init Phy especially when the AutoSense default is set now */
+ 	SkMacInitPhy(pAC, IoC, Port, SK_FALSE);
+@@ -655,19 +661,19 @@ int		Port)	/* Port Index (MAC_1 + n) */
+ 		case SK_LSPEED_AUTO:
+ 			/* default is 1000 Mbps */
+ 		case SK_LSPEED_1000MBPS:
+-			pPrt->PLinkSpeedUsed = SK_LSPEED_STAT_1000MBPS;
++			pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_1000MBPS;
+ 			break;
+ 		case SK_LSPEED_100MBPS:
+-			pPrt->PLinkSpeedUsed = SK_LSPEED_STAT_100MBPS;
++			pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_100MBPS;
+ 			break;
+ 		case SK_LSPEED_10MBPS:
+-			pPrt->PLinkSpeedUsed = SK_LSPEED_STAT_10MBPS;
++			pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_10MBPS;
+ 			break;
+ 		}
+ 
+ 		/* Set Link Mode Status */
+ 		if (pPrt->PLinkMode == SK_LMODE_FULL) {
+-			pPrt->PLinkModeStatus = SK_LMODE_STAT_FULL;
++			pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_FULL;
+ 		}
+ 		else {
+             pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_HALF;
+@@ -1598,8 +1604,7 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
+ 			 * (clear Page Received bit if set)
+ 			 */
+ 			SkXmPhyRead(pAC, IoC, Port, PHY_XMAC_AUNE_EXP, &ExtStat);
+-			SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+-				("AutoNeg done Port %d\n", Port));
++			
+ 			return(SK_HW_PS_LINK);
+ 		}
+ 		
+@@ -1870,7 +1875,7 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
+ 	SkMacAutoNegLipaPhy(pAC, IoC, Port, PhyStat);
+ 	
+ 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+-		("AutoNeg: %d, PhyStat: 0x%04X\n", AutoNeg, PhyStat));
++		("CheckUp Port %d, PhyStat: 0x%04X\n", Port, PhyStat));
+ 
+ 	SkXmPhyRead(pAC, IoC, Port, PHY_BCOM_1000T_STAT, &ResAb);
+ 
+@@ -1897,8 +1902,11 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
+ 
+ 	if (AutoNeg) {
+ 		if ((PhyStat & PHY_ST_AN_OVER) != 0) {
++			
+ 			SkHWLinkUp(pAC, IoC, Port);
++			
+ 			Done = SkMacAutoNegDone(pAC, IoC, Port);
++			
+ 			if (Done != SK_AND_OK) {
+ #ifdef DEBUG
+ 				/* Get PHY parameters, for debugging only */
+@@ -1924,9 +1932,6 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
+ 						(void *)NULL);
+ 				}
+ #endif /* DEBUG */
+-				
+-				SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+-					("AutoNeg done Port %d\n", Port));
+ 				return(SK_HW_PS_LINK);
+ 			}
+ 		}
+@@ -1989,9 +1994,22 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
+ 	SK_U16		PhySpecStat;/* PHY Specific Status */
+ 	SK_U16		ResAb;		/* Master/Slave resolution */
+ 	SK_EVPARA	Para;
++#ifdef DEBUG
++	SK_U16		Word;		/* I/O helper */
++#endif /* DEBUG */
+ 
+ 	pPrt = &pAC->GIni.GP[Port];
+ 
++	if (pPrt->PHWLinkUp) {
++		return(SK_HW_PS_NONE);
++	}
++
++	/* Read PHY Status */
++	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_STAT, &PhyStat);
++
++	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
++		("CheckUp Port %d, PhyStat: 0x%04X\n", Port, PhyStat));
++
+ 	/* Read PHY Interrupt Status */
+ 	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_INT_STAT, &PhyIsrc);
+ 
+@@ -2005,16 +2023,6 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
+ 			("Link Speed Changed, PhyIsrc: 0x%04X\n", PhyIsrc));
+ 	}
+ 
+-	if (pPrt->PHWLinkUp) {
+-		return(SK_HW_PS_NONE);
+-	}
+-
+-	/* Read PHY Status */
+-	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_STAT, &PhyStat);
+-
+-	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+-		("AutoNeg: %d, PhyStat: 0x%04X\n", AutoNeg, PhyStat));
+-
+ 	SkMacAutoNegLipaPhy(pAC, IoC, Port, PhyStat);
+ 	
+ 	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_1000T_STAT, &ResAb);
+@@ -2034,7 +2042,20 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
+ 	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_STAT, &PhySpecStat);
+ 	
+ 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+-		("AutoNeg: %d, PhySpecStat: 0x%04X\n", AutoNeg, PhySpecStat));
++		("Phy1000BT: 0x%04X, PhySpecStat: 0x%04X\n", ResAb, PhySpecStat));
++
++#ifdef DEBUG
++	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_AUNE_EXP, &Word);
++
++	if ((PhyIsrc & PHY_M_IS_AN_PR) != 0 || (Word & PHY_ANE_RX_PG) != 0 ||
++		(PhySpecStat & PHY_M_PS_PAGE_REC) != 0)  {
++		/* Read PHY Next Page Link Partner */
++		SkGmPhyRead(pAC, IoC, Port, PHY_MARV_NEPG_LP, &Word);
++
++		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
++			("Page Received, NextPage: 0x%04X\n", Word));
++	}
++#endif /* DEBUG */
+ 
+ 	if ((PhySpecStat & PHY_M_PS_LINK_UP) == 0) {
+ 		return(SK_HW_PS_NONE);
+@@ -2069,8 +2090,6 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
+ 				return(SK_HW_PS_RESTART);
+ 			}
+ 			
+-			SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+-				("AutoNeg done Port %d\n", Port));
+ 			return(SK_HW_PS_LINK);
+ 		}
+ 	}
+@@ -2179,8 +2198,6 @@ SK_BOOL	AutoNeg)	/* Is Auto-negotiation 
+ 				 * extra link down/ups
+ 				 */
+ 				SkXmPhyRead(pAC, IoC, Port, PHY_LONE_INT_STAT, &ExtStat);
+-				SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+-					("AutoNeg done Port %d\n", Port));
+ 				return(SK_HW_PS_LINK);
+ 			}
+ 		}
+@@ -2278,8 +2295,14 @@ SK_EVPARA	Para)		/* Event specific Param
+ 
+ 	switch (Event) {
+ 	case SK_HWEV_WATIM:
+-		/* Check whether port came up */
+-		PortStat = SkGePortCheckUp(pAC, IoC, (int)Port);
++		if (pPrt->PState == SK_PRT_RESET) {
++		
++			PortStat = SK_HW_PS_NONE;
++		}
++		else {
++			/* Check whether port came up */
++			PortStat = SkGePortCheckUp(pAC, IoC, (int)Port);
++		}
+ 
+ 		switch (PortStat) {
+ 		case SK_HW_PS_RESTART:
+--- linux-2.6.0/drivers/net/sk98lin/ski2c.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/net/sk98lin/ski2c.c	2003-12-28 23:21:01.000000000 -0800
+@@ -1,16 +1,17 @@
+ /******************************************************************************
+  *
+  * Name:	ski2c.c
+- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
+- * Version:	$Revision: 1.57 $
+- * Date:	$Date: 2003/01/28 09:17:38 $
++ * Project:	Gigabit Ethernet Adapters, TWSI-Module
++ * Version:	$Revision: 1.59 $
++ * Date:	$Date: 2003/10/20 09:07:25 $
+  * Purpose:	Functions to access Voltage and Temperature Sensor
+  *
+  ******************************************************************************/
+ 
+ /******************************************************************************
+  *
+- *	(C)Copyright 1998-2003 SysKonnect GmbH.
++ *	(C)Copyright 1998-2002 SysKonnect.
++ *	(C)Copyright 2002-2003 Marvell.
+  *
+  *	This program is free software; you can redistribute it and/or modify
+  *	it under the terms of the GNU General Public License as published by
+@@ -26,6 +27,14 @@
+  * History:
+  *
+  *	$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.
++ *	
++ *	Revision 1.58  2003/09/23 09:22:53  malthoff
++ *	Parameter I2cDevSize added in SkI2cRead and SkI2cWrite to
++ *	support larger devices on the TWSI bus.
++ *	
+  *	Revision 1.57  2003/01/28 09:17:38  rschmidt
+  *	Fixed handling for sensors on YUKON Fiber.
+  *	Editorial changes.
+@@ -224,15 +233,15 @@
+  *	Created. Sources taken from ML Projekt.
+  *	Sources have to be reworked for GE.
+  *
+- *
+  ******************************************************************************/
+ 
+-
+ /*
+  *	I2C Protocol
+  */
++#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
+ static const char SysKonnectFileId[] =
+-	"$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 */
+ #include "h/lm80.h"
+@@ -312,7 +321,7 @@ intro()
+ {}
+ #endif
+ 
+-#ifdef	SK_DIAG
++#ifdef SK_DIAG
+ /*
+  * I2C Fast Mode timing values used by the LM80.
+  * If new devices are added to the I2C bus the timing values have to be checked.
+@@ -516,7 +525,6 @@ SK_IOC IoC)	/* I/O Context */
+ {
+ 	/*
+ 	 * Received bit must be zero.
+-	 *
+ 	 */
+ 	SkI2cSndBit(IoC, 0);
+ }	/* SkI2cSndAck */
+@@ -590,7 +598,7 @@ int		Rw)		/* Read / Write Flag */
+ 	return(SkI2cSndByte(IoC, (Addr<<1) | Rw));
+ }	/* SkI2cSndDev */
+ 
+-#endif	/* SK_DIAG */
++#endif /* SK_DIAG */
+ 
+ /*----------------- I2C CTRL Register Functions ----------*/
+ 
+@@ -620,7 +628,7 @@ int		Event)	/* complete event to wait fo
+ 			SK_I2C_STOP(IoC);
+ #ifndef SK_DIAG
+ 			SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_I2C_E002, SKERR_I2C_E002MSG);
+-#endif	/* !SK_DIAG */
++#endif /* !SK_DIAG */
+ 			return(1);
+ 		}
+ 		
+@@ -661,15 +669,19 @@ SK_IOC	IoC)	/* I/O Context */
+ 	}
+ 
+ 	StartTime = SkOsGetTime(pAC);
++	
+ 	do {
+ 		if (SkOsGetTime(pAC) - StartTime > SK_TICKS_PER_SEC / 8) {
++			
+ 			SK_I2C_STOP(IoC);
+ #ifndef SK_DIAG
+ 			SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_I2C_E016, SKERR_I2C_E016MSG);
+-#endif	/* !SK_DIAG */
++#endif /* !SK_DIAG */
+ 			return;
+ 		}
++		
+ 		SK_IN32(IoC, B0_ISRC, &IrqSrc);
++
+ 	} while ((IrqSrc & IS_I2C_READY) == 0);
+ 
+ 	pSen->SenState = SK_SEN_IDLE;
+@@ -687,18 +699,19 @@ SK_AC	*pAC,		/* Adapter Context */
+ SK_IOC	IoC,		/* I/O Context */
+ SK_U32	I2cData,	/* I2C Data to write */
+ int		I2cDev,		/* I2C Device Address */
++int		I2cDevSize, /* I2C Device Size (e.g. I2C_025K_DEV or I2C_2K_DEV) */
+ int		I2cReg,		/* I2C Device Register Address */
+ int		I2cBurst)	/* I2C Burst Flag */
+ {
+ 	SK_OUT32(IoC, B2_I2C_DATA, I2cData);
+-	SK_I2C_CTL(IoC, I2C_WRITE, I2cDev, I2cReg, I2cBurst);
++	
++	SK_I2C_CTL(IoC, I2C_WRITE, I2cDev, I2cDevSize, I2cReg, I2cBurst);
+ 	
+ 	return(SkI2cWait(pAC, IoC, I2C_WRITE));
+ }	/* SkI2cWrite*/
+ 
+ 
+ #ifdef	SK_DIAG
+-
+ /*
+  * reads a single byte or 4 bytes from the I2C device
+  *
+@@ -708,23 +721,24 @@ SK_U32 SkI2cRead(
+ SK_AC	*pAC,		/* Adapter Context */
+ SK_IOC	IoC,		/* I/O Context */
+ int		I2cDev,		/* I2C Device Address */
++int		I2cDevSize, /* I2C Device Size (e.g. I2C_025K_DEV or I2C_2K_DEV) */
+ int		I2cReg,		/* I2C Device Register Address */
+ int		I2cBurst)	/* I2C Burst Flag */
+ {
+ 	SK_U32	Data;
+ 
+ 	SK_OUT32(IoC, B2_I2C_DATA, 0);
+-	SK_I2C_CTL(IoC, I2C_READ, I2cDev, I2cReg, I2cBurst);
++	SK_I2C_CTL(IoC, I2C_READ, I2cDev, I2cDevSize, I2cReg, I2cBurst);
+ 	
+ 	if (SkI2cWait(pAC, IoC, I2C_READ) != 0) {
+ 		w_print("%s\n", SKERR_I2C_E002MSG);
+ 	}
+ 	
+ 	SK_IN32(IoC, B2_I2C_DATA, &Data);
++	
+ 	return(Data);
+ }	/* SkI2cRead */
+-
+-#endif	/* SK_DIAG */
++#endif /* SK_DIAG */
+ 
+ 
+ /*
+@@ -745,9 +759,10 @@ SK_SENSOR	*pSen)	/* Sensor to be read */
+     if (pSen->SenRead != NULL) {
+         return((*pSen->SenRead)(pAC, IoC, pSen));
+     }
+-    else
++	else {
+         return(0); /* no success */
+-}	/* SkI2cReadSensor*/
++	}
++}	/* SkI2cReadSensor */
+ 
+ /*
+  * Do the Init state 0 initialization
+@@ -761,12 +776,12 @@ SK_AC	*pAC)	/* Adapter Context */
+ 	pAC->I2c.CurrSens = 0;
+ 	
+ 	/* Begin with timeout control for state machine */
+-	pAC->I2c.TimerMode = SK_TIMER_WATCH_STATEMACHINE;
++	pAC->I2c.TimerMode = SK_TIMER_WATCH_SM;
+ 	
+ 	/* Set sensor number to zero */
+ 	pAC->I2c.MaxSens = 0;
+ 
+-#ifndef	SK_DIAG
++#ifndef SK_DIAG
+ 	/* Initialize Number of Dummy Reads */
+ 	pAC->I2c.DummyReads = SK_MAX_SENSORS;
+ #endif
+@@ -840,19 +855,20 @@ SK_IOC	IoC)	/* I/O Context */
+     }
+ 
+ 	/* Check for 64 Bit Yukon without sensors */
+-	if (SkI2cWrite(pAC, IoC, 0, LM80_ADDR, LM80_CFG, 0) != 0) {
++	if (SkI2cWrite(pAC, IoC, 0, LM80_ADDR, I2C_025K_DEV, LM80_CFG, 0) != 0) {
+         return(0);
+     }
+ 
+-	(void)SkI2cWrite(pAC, IoC, 0xff, LM80_ADDR, LM80_IMSK_1, 0);
++	(void)SkI2cWrite(pAC, IoC, 0xffUL, LM80_ADDR, I2C_025K_DEV, LM80_IMSK_1, 0);
+ 	
+-	(void)SkI2cWrite(pAC, IoC, 0xff, LM80_ADDR, LM80_IMSK_2, 0);
++	(void)SkI2cWrite(pAC, IoC, 0xffUL, LM80_ADDR, I2C_025K_DEV, LM80_IMSK_2, 0);
+ 	
+-	(void)SkI2cWrite(pAC, IoC, 0, LM80_ADDR, LM80_FAN_CTRL, 0);
++	(void)SkI2cWrite(pAC, IoC, 0, LM80_ADDR, I2C_025K_DEV, LM80_FAN_CTRL, 0);
+ 	
+-	(void)SkI2cWrite(pAC, IoC, 0, LM80_ADDR, LM80_TEMP_CTRL, 0);
++	(void)SkI2cWrite(pAC, IoC, 0, LM80_ADDR, I2C_025K_DEV, LM80_TEMP_CTRL, 0);
+ 	
+-	(void)SkI2cWrite(pAC, IoC, LM80_CFG_START, LM80_ADDR, LM80_CFG, 0);
++	(void)SkI2cWrite(pAC, IoC, (SK_U32)LM80_CFG_START, LM80_ADDR, I2C_025K_DEV,
++		LM80_CFG, 0);
+ 	
+ 	/*
+ 	 * MaxSens has to be updated here, because PhyType is not
+@@ -957,7 +973,7 @@ SK_IOC	IoC)	/* I/O Context */
+ 				pAC->I2c.SenTable[i].SenThreErrLow = SK_SEN_PHY_2V5_LOW_ERR;
+ 			}
+ 			else {
+-				pAC->I2c.SenTable[i].SenDesc = "Voltage ASIC-Co 1V5";
++				pAC->I2c.SenTable[i].SenDesc = "Voltage Core 1V5";
+ 				pAC->I2c.SenTable[i].SenThreErrHigh = SK_SEN_CORE_1V5_HIGH_ERR;
+ 				pAC->I2c.SenTable[i].SenThreWarnHigh = SK_SEN_CORE_1V5_HIGH_WARN;
+ 				pAC->I2c.SenTable[i].SenThreWarnLow = SK_SEN_CORE_1V5_LOW_WARN;
+@@ -1015,9 +1031,9 @@ SK_IOC	IoC)	/* I/O Context */
+ 		pAC->I2c.SenTable[i].SenDev = LM80_ADDR;
+ 	}
+ 
+-#ifndef	SK_DIAG
++#ifndef SK_DIAG
+ 	pAC->I2c.DummyReads = pAC->I2c.MaxSens;
+-#endif	/* !SK_DIAG */
++#endif /* !SK_DIAG */
+ 	
+ 	/* Clear I2C IRQ */
+ 	SK_OUT32(IoC, B2_I2C_IRQ, I2C_CLR_IRQ);
+@@ -1208,15 +1224,13 @@ SK_SENSOR	*pSen)
+ 			pSen->SenLastErrLogTS = CurrTime;
+ 
+ 			if (pSen->SenType == SK_SEN_TEMP) {
+-				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E011,
+-					SKERR_I2C_E011MSG);
+-			} else if (pSen->SenType == SK_SEN_VOLT) {
+-				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E012,
+-					SKERR_I2C_E012MSG);
+-			} else
+-			{
+-				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E015,
+-					SKERR_I2C_E015MSG);
++				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E011, SKERR_I2C_E011MSG);
++			}
++			else if (pSen->SenType == SK_SEN_VOLT) {
++				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E012, SKERR_I2C_E012MSG);
++			}
++			else {
++				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E015, SKERR_I2C_E015MSG);
+ 			}
+ 		}
+ 	}
+@@ -1235,8 +1249,7 @@ SK_SENSOR	*pSen)
+ 			/* This state is the former one */
+ 
+ 			/* So check first whether we have to send a trap */
+-			if (pSen->SenLastWarnTrapTS + SK_SEN_WARN_TR_HOLD >
+-			    CurrTime) {
++			if (pSen->SenLastWarnTrapTS + SK_SEN_WARN_TR_HOLD > CurrTime) {
+ 				/*
+ 				 * Do NOT send the Trap. The hold back time
+ 				 * has to run out first.
+@@ -1245,8 +1258,7 @@ SK_SENSOR	*pSen)
+ 			}
+ 
+ 			/* Check now whether we have to log an Error */
+-			if (pSen->SenLastWarnLogTS + SK_SEN_WARN_LOG_HOLD >
+-			    CurrTime) {
++			if (pSen->SenLastWarnLogTS + SK_SEN_WARN_LOG_HOLD > CurrTime) {
+ 				/*
+ 				 * Do NOT log the error. The hold back time
+ 				 * has to run out first.
+@@ -1277,15 +1289,13 @@ SK_SENSOR	*pSen)
+ 			pSen->SenLastWarnLogTS = CurrTime;
+ 
+ 			if (pSen->SenType == SK_SEN_TEMP) {
+-				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E009,
+-					SKERR_I2C_E009MSG);
+-			} else if (pSen->SenType == SK_SEN_VOLT) {
+-				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E010,
+-					SKERR_I2C_E010MSG);
+-			} else
+-			{
+-				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E014,
+-					SKERR_I2C_E014MSG);
++				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E009, SKERR_I2C_E009MSG);
++			}
++			else if (pSen->SenType == SK_SEN_VOLT) {
++				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E010, SKERR_I2C_E010MSG);
++			}
++			else {
++				SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E014, SKERR_I2C_E014MSG);
+ 			}
+ 		}
+ 	}
+@@ -1317,7 +1327,7 @@ SK_SENSOR	*pSen)
+ 		}
+ 	}
+ 	
+-#if 0
++#ifdef TEST_ONLY
+     /* Dynamic thresholds also for VAUX of LM80 sensor */
+ 	if (pSen->SenInit == SK_SEN_DYN_INIT_VAUX) {
+ 
+@@ -1359,7 +1369,7 @@ SK_SENSOR	*pSen)
+ 	if (pSen->SenInit != SK_SEN_DYN_INIT_NONE) {
+ 		SK_ERR_LOG(pAC, SK_ERRCL_HW, SKERR_I2C_E013, SKERR_I2C_E013MSG);
+ 	}
+-}	/* SkI2cCheckSensor*/
++}	/* SkI2cCheckSensor */
+ 
+ 
+ /*
+@@ -1390,7 +1400,7 @@ SK_EVPARA	Para)	/* Event specific Parame
+ 
+ 		if (ReadComplete) {
+ 			/* Check sensor against defined thresholds */
+-			SkI2cCheckSensor (pAC, pSen);
++			SkI2cCheckSensor(pAC, pSen);
+ 
+ 			/* Increment Current sensor and set appropriate Timeout */
+ 			pAC->I2c.CurrSens++;
+@@ -1414,7 +1424,7 @@ SK_EVPARA	Para)	/* Event specific Parame
+ 			/* Start Timer */
+ 			ParaLocal.Para64 = (SK_U64)0;
+ 
+-			pAC->I2c.TimerMode = SK_TIMER_WATCH_STATEMACHINE;
++			pAC->I2c.TimerMode = SK_TIMER_WATCH_SM;
+ 
+             SkTimerStart(pAC, IoC, &pAC->I2c.SenTimer, SK_I2C_TIM_WATCH,
+ 				SKGE_I2C, SK_I2CEV_TIM, ParaLocal);
+@@ -1431,7 +1441,7 @@ SK_EVPARA	Para)	/* Event specific Parame
+ 
+ 			if (ReadComplete) {
+ 				/* Check sensor against defined thresholds */
+-				SkI2cCheckSensor (pAC, pSen);
++				SkI2cCheckSensor(pAC, pSen);
+ 
+ 				/* Increment Current sensor and set appropriate Timeout */
+ 				pAC->I2c.CurrSens++;
+@@ -1496,4 +1506,4 @@ SK_EVPARA	Para)	/* Event specific Parame
+ 	return(0);
+ }	/* SkI2cEvent*/
+ 
+-#endif	/* !SK_DIAG */
++#endif /* !SK_DIAG */
+--- linux-2.6.0/drivers/net/sk98lin/sklm80.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/net/sk98lin/sklm80.c	2003-12-28 23:21:01.000000000 -0800
+@@ -1,16 +1,17 @@
+ /******************************************************************************
+  *
+  * Name:	sklm80.c
+- * Project:	GEnesis, PCI Gigabit Ethernet Adapter
+- * 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.22 $
++ * Date:	$Date: 2003/10/20 09:08:21 $
++ * Purpose:	Functions to access Voltage and Temperature Sensor (LM80)
+  *
+  ******************************************************************************/
+ 
+ /******************************************************************************
+  *
+- *	(C)Copyright 1998-2002 SysKonnect GmbH.
++ *	(C)Copyright 1998-2002 SysKonnect.
++ *	(C)Copyright 2002-2003 Marvell.
+  *
+  *	This program is free software; you can redistribute it and/or modify
+  *	it under the terms of the GNU General Public License as published by
+@@ -26,15 +27,21 @@
+  * History:
+  *
+  *	$Log: sklm80.c,v $
++ *	Revision 1.22  2003/10/20 09:08:21  rschmidt
++ *	Editorial changes.
++ *	
++ *	Revision 1.21  2003/09/23 09:29:04  malthoff
++ *	Parameter Dev_Size added to macro SK_I2C_CTL.
++ *	
+  *	Revision 1.20  2002/08/13 09:16:27  rschmidt
+  *	Changed return value for SkLm80ReadSensor() back to 'int'
+- *	Editorial changes
++ *	Editorial changes.
+  *	
+  *	Revision 1.19  2002/08/06 09:43:31  jschmalz
+- *	Extensions and changes for Yukon
++ *	Extensions and changes for Yukon.
+  *	
+  *	Revision 1.18  2002/08/02 12:26:57  rschmidt
+- *	Editorial changes
++ *	Editorial changes.
+  *	
+  *	Revision 1.17  1999/11/22 13:35:51  cgoos
+  *	Changed license header to GPL.
+@@ -93,16 +100,15 @@
+  *	Revision 1.1  1998/07/17 09:57:12  gklug
+  *	initial version
+  *
+- *
+- *
+  ******************************************************************************/
+ 
+-
+ /*
+ 	LM80 functions
+ */
++#if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
+ static const char SysKonnectFileId[] =
+-	"$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 */
+ #include "h/lm80.h"
+@@ -202,7 +208,7 @@ SK_SENSOR	*pSen)	/* Sensor to be read */
+ 	switch (pSen->SenState) {
+ 	case SK_SEN_IDLE:
+ 		/* Send address to ADDR register */
+-		SK_I2C_CTL(IoC, I2C_READ, pSen->SenDev, pSen->SenReg, 0);
++		SK_I2C_CTL(IoC, I2C_READ, pSen->SenDev, I2C_025K_DEV, pSen->SenReg, 0);
+ 
+ 		pSen->SenState = SK_SEN_VALUE ;
+ 		BREAK_OR_WAIT(pAC, IoC, I2C_READ);
+@@ -250,7 +256,7 @@ SK_SENSOR	*pSen)	/* Sensor to be read */
+ 			(pSen->SenValue % SK_LM80_TEMP_LSB);
+ 
+ 		/* Send address to ADDR register */
+-		SK_I2C_CTL(IoC, I2C_READ, pSen->SenDev, LM80_TEMP_CTRL, 0);
++		SK_I2C_CTL(IoC, I2C_READ, pSen->SenDev, I2C_025K_DEV, LM80_TEMP_CTRL, 0);
+ 
+ 		pSen->SenState = SK_SEN_VALEXT ;
+ 		BREAK_OR_WAIT(pAC, IoC, I2C_READ);
+@@ -284,3 +290,4 @@ SK_SENSOR	*pSen)	/* Sensor to be read */
+ 	/* Not completed */
+ 	return(0);
+ }
++
+--- linux-2.6.0/drivers/net/sk98lin/skproc.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/sk98lin/skproc.c	2003-12-28 23:21:01.000000000 -0800
+@@ -1,16 +1,17 @@
+ /******************************************************************************
+  *
+- * Name:    skproc.c
++ * Name:	skproc.c
+  * Project:	GEnesis, PCI Gigabit Ethernet Adapter
+- * 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
+  *
+  ******************************************************************************/
+  
+ /******************************************************************************
+  *
+- *	(C)Copyright 1998-2003 SysKonnect GmbH.
++ *	(C)Copyright 1998-2002 SysKonnect GmbH.
++ *	(C)Copyright 2002-2003 Marvell.
+  *
+  *	This program is free software; you can redistribute it and/or modify
+  *	it under the terms of the GNU General Public License as published by
+@@ -28,6 +29,33 @@
+  * History:
+  *
+  *	$Log: skproc.c,v $
++ *	Revision 1.11  2003/12/11 16:03:57  mlindner
++ *	Fix: Create backup from pnmi data structure
++ *	
++ *	Revision 1.10  2003/11/19 16:25:36  mlindner
++ *	Fix: Print output as 64-bit digit
++ *	
++ *	Revision 1.9  2003/11/17 13:29:05  mlindner
++ *	Fix: Editorial changes
++ *	
++ *	Revision 1.8  2003/11/13 14:18:48  rroesler
++ *	Fix: added latest changes regarding the use of the proc system
++ *	
++ *	Revision 1.7  2003/11/10 09:35:07  rroesler
++ *	Fix: diag backup restore of PNMI structure
++ *	
++ *	Revision 1.6  2003/11/07 17:31:39  rroesler
++ *	Add: security counter for the proc file system
++ *	
++ *	Revision 1.5  2003/10/07 08:17:08  mlindner
++ *	Fix: Copyright changes
++ *	
++ *	Revision 1.4  2003/09/01 15:29:24  mlindner
++ *	Fix: Editorial changes
++ *	
++ *	Revision 1.3  2003/08/29 12:30:58  mlindner
++ *	Add: Version entry in the proc file system
++ *	
+  *	Revision 1.2  2003/08/12 16:45:29  mlindner
+  *	Add: Removed SkNumber and SkDoDiv
+  *	Add: Counter output as (unsigned long long)
+@@ -94,223 +122,350 @@
+ 
+ #include "h/skdrv1st.h"
+ #include "h/skdrv2nd.h"
++#include "h/skversion.h"
+ 
+-#ifdef CONFIG_PROC_FS
++extern struct SK_NET_DEVICE *SkGeRootDev;
++static int sk_proc_print(void *writePtr, char *format, ...);
++static void sk_gen_browse(void *buffer);
++int len;
+ 
+-extern struct net_device	*SkGeRootDev;
++static int sk_seq_show(struct seq_file *seq, void *v);
++static int sk_proc_open(struct inode *inode, struct file *file);
++struct file_operations sk_proc_fops = {
++	.owner		= THIS_MODULE,
++	.open		= sk_proc_open,
++	.read		= seq_read,
++	.llseek		= seq_lseek,
++	.release	= single_release,
++};
++struct net_device *currDev = NULL;
+ 
+-static int sk_seq_show(struct seq_file *seq, void *v)
++/*****************************************************************************
++ *
++ * 	sk_gen_browse -generic  print "summaries" entry 
++ *
++ * Description:
++ *  This function fills the proc entry with statistic data about 
++ *  the ethernet device.
++ *  
++ * Returns: -
++ *	
++ */
++static void sk_gen_browse(void *buffer)
+ {
+-	struct net_device *dev = seq->private;
+-	DEV_NET		*pNet = dev->priv;
+-	SK_AC		*pAC = pNet->pAC;
+-	SK_PNMI_STRUCT_DATA *pPnmiStruct = &pAC->PnmiStruct;
+-	SK_PNMI_STAT	*pPnmiStat = &pPnmiStruct->Stat[0];
+-	int unit = !(pAC->dev[0] == dev);
+-	int i;
+-	char sens_msg[50];
+-
+-	seq_printf(seq,
+-		   "\nDetailed statistic for device %s\n",
+-		   dev->name);
+-	seq_printf(seq,
+-		   "=======================================\n");
+-	
+-	/* Board statistics */
+-	seq_printf(seq, 
+-		   "\nBoard statistics\n\n");
+-	seq_printf(seq,
+-		   "Active Port                    %c\n",
+-		   'A' + pAC->Rlmt.Net[unit].Port[pAC->Rlmt.
+-						 Net[unit].PrefPort]->PortNumber);
+-	seq_printf(seq,
+-		   "Preferred Port                 %c\n",
+-		   'A' + pAC->Rlmt.Net[unit].Port[pAC->Rlmt.
+-						 Net[unit].PrefPort]->PortNumber);
+-
+-	seq_printf(seq,
+-		   "Bus speed (MHz)                %d\n",
+-		   pPnmiStruct->BusSpeed);
+-
+-	seq_printf(seq,
+-		   "Bus width (Bit)                %d\n",
+-		   pPnmiStruct->BusWidth);
+-	seq_printf(seq,
+-		   "Hardware revision              v%d.%d\n",
+-		   (pAC->GIni.GIPciHwRev >> 4) & 0x0F,
+-		   pAC->GIni.GIPciHwRev & 0x0F);
+-
+-	/* Print sensor informations */
+-	for (i=0; i < pAC->I2c.MaxSens; i ++) {
+-		/* Check type */
+-		switch (pAC->I2c.SenTable[i].SenType) {
+-		case 1:
+-			strcpy(sens_msg, pAC->I2c.SenTable[i].SenDesc);
+-			strcat(sens_msg, " (C)");
+-			seq_printf(seq,
+-				   "%-25s      %d.%02d\n",
+-				   sens_msg,
+-				   pAC->I2c.SenTable[i].SenValue / 10,
+-				   pAC->I2c.SenTable[i].SenValue % 10);
+-
+-			strcpy(sens_msg, pAC->I2c.SenTable[i].SenDesc);
+-			strcat(sens_msg, " (F)");
+-			seq_printf(seq,
+-				   "%-25s      %d.%02d\n",
+-				   sens_msg,
+-				   ((((pAC->I2c.SenTable[i].SenValue)
+-				      *10)*9)/5 + 3200)/100,
+-				   ((((pAC->I2c.SenTable[i].SenValue)
+-				      *10)*9)/5 + 3200) % 10);
+-			break;
+-		case 2:
+-			strcpy(sens_msg, pAC->I2c.SenTable[i].SenDesc);
+-			strcat(sens_msg, " (V)");
+-			seq_printf(seq,
+-				   "%-25s      %d.%03d\n",
+-				   sens_msg,
+-				   pAC->I2c.SenTable[i].SenValue / 1000,
+-				   pAC->I2c.SenTable[i].SenValue % 1000);
+-			break;
+-		case 3:
+-			strcpy(sens_msg, pAC->I2c.SenTable[i].SenDesc);
+-			strcat(sens_msg, " (rpm)");
+-			seq_printf(seq,
+-				   "%-25s      %d\n",
+-				   sens_msg,
+-				   pAC->I2c.SenTable[i].SenValue);
+-			break;
+-		default:
+-			break;
++	struct SK_NET_DEVICE	*SkgeProcDev = SkGeRootDev;
++	struct SK_NET_DEVICE	*next;
++	SK_PNMI_STRUCT_DATA 	*pPnmiStruct;
++	SK_PNMI_STAT		*pPnmiStat;
++	unsigned long		Flags;	
++	unsigned int		Size;
++	DEV_NET			*pNet;
++	SK_AC			*pAC;
++	char			sens_msg[50];
++	int			MaxSecurityCount = 0;
++	int 			t;
++	int 			i;
++
++	while (SkgeProcDev) {
++		MaxSecurityCount++;
++		if (MaxSecurityCount > 100) {
++			printk("Max limit for sk_proc_read security counter!\n");
++			return;
+ 		}
+-	}
++		pNet = (DEV_NET*) SkgeProcDev->priv;
++		pAC = pNet->pAC;
++		next = pAC->Next;
++		pPnmiStruct = &pAC->PnmiStruct;
++		/* NetIndex in GetStruct is now required, zero is only dummy */
++
++		for (t=pAC->GIni.GIMacsFound; t > 0; t--) {
++			if ((pAC->GIni.GIMacsFound == 2) && pAC->RlmtNets == 1)
++				t--;
++
++			spin_lock_irqsave(&pAC->SlowPathLock, Flags);
++			Size = SK_PNMI_STRUCT_SIZE;
++#ifdef SK_DIAG_SUPPORT
++			if (pAC->BoardLevel == SK_INIT_DATA) {
++				SK_MEMCPY(&(pAC->PnmiStruct), &(pAC->PnmiBackup), sizeof(SK_PNMI_STRUCT_DATA));
++				if (pAC->DiagModeActive == DIAG_NOTACTIVE) {
++					pAC->Pnmi.DiagAttached = SK_DIAG_IDLE;
++				}
++			} else {
++				SkPnmiGetStruct(pAC, pAC->IoBase, pPnmiStruct, &Size, t-1);
++			}
++#else
++			SkPnmiGetStruct(pAC, pAC->IoBase, 
++				pPnmiStruct, &Size, t-1);
++#endif
++			spin_unlock_irqrestore(&pAC->SlowPathLock, Flags);
++	
++			if (strcmp(pAC->dev[t-1]->name, currDev->name) == 0) {
++				pPnmiStat = &pPnmiStruct->Stat[0];
++				len = sk_proc_print(buffer, 
++					"\nDetailed statistic for device %s\n",
++					pAC->dev[t-1]->name);
++				len += sk_proc_print(buffer,
++					"=======================================\n");
++	
++				/* Board statistics */
++				len += sk_proc_print(buffer, 
++					"\nBoard statistics\n\n");
++				len += sk_proc_print(buffer,
++					"Active Port                    %c\n",
++					'A' + pAC->Rlmt.Net[t-1].Port[pAC->Rlmt.
++					Net[t-1].PrefPort]->PortNumber);
++				len += sk_proc_print(buffer,
++					"Preferred Port                 %c\n",
++					'A' + pAC->Rlmt.Net[t-1].Port[pAC->Rlmt.
++					Net[t-1].PrefPort]->PortNumber);
++
++				len += sk_proc_print(buffer,
++					"Bus speed (MHz)                %d\n",
++					pPnmiStruct->BusSpeed);
++
++				len += sk_proc_print(buffer,
++					"Bus width (Bit)                %d\n",
++					pPnmiStruct->BusWidth);
++				len += sk_proc_print(buffer,
++					"Driver version                 %s\n",
++					VER_STRING);
++				len += sk_proc_print(buffer,
++					"Hardware revision              v%d.%d\n",
++					(pAC->GIni.GIPciHwRev >> 4) & 0x0F,
++					pAC->GIni.GIPciHwRev & 0x0F);
++
++				/* Print sensor informations */
++				for (i=0; i < pAC->I2c.MaxSens; i ++) {
++					/* Check type */
++					switch (pAC->I2c.SenTable[i].SenType) {
++					case 1:
++						strcpy(sens_msg, pAC->I2c.SenTable[i].SenDesc);
++						strcat(sens_msg, " (C)");
++						len += sk_proc_print(buffer,
++							"%-25s      %d.%02d\n",
++							sens_msg,
++							pAC->I2c.SenTable[i].SenValue / 10,
++							pAC->I2c.SenTable[i].SenValue % 10);
++
++						strcpy(sens_msg, pAC->I2c.SenTable[i].SenDesc);
++						strcat(sens_msg, " (F)");
++						len += sk_proc_print(buffer,
++							"%-25s      %d.%02d\n",
++							sens_msg,
++							((((pAC->I2c.SenTable[i].SenValue)
++							*10)*9)/5 + 3200)/100,
++							((((pAC->I2c.SenTable[i].SenValue)
++							*10)*9)/5 + 3200) % 10);
++						break;
++					case 2:
++						strcpy(sens_msg, pAC->I2c.SenTable[i].SenDesc);
++						strcat(sens_msg, " (V)");
++						len += sk_proc_print(buffer,
++							"%-25s      %d.%03d\n",
++							sens_msg,
++							pAC->I2c.SenTable[i].SenValue / 1000,
++							pAC->I2c.SenTable[i].SenValue % 1000);
++						break;
++					case 3:
++						strcpy(sens_msg, pAC->I2c.SenTable[i].SenDesc);
++						strcat(sens_msg, " (rpm)");
++						len += sk_proc_print(buffer,
++							"%-25s      %d\n",
++							sens_msg,
++							pAC->I2c.SenTable[i].SenValue);
++						break;
++					default:
++						break;
++					}
++				}
+ 				
+-	/*Receive statistics */
+-	seq_printf(seq, 
+-		   "\nReceive statistics\n\n");
+-
+-	seq_printf(seq,
+-		   "Received bytes                 %Ld\n",
+-		   (unsigned long long) pPnmiStat->StatRxOctetsOkCts);
+-	seq_printf(seq,
+-		   "Received packets               %Ld\n",
+-		   (unsigned long long) pPnmiStat->StatRxOkCts);
++				/*Receive statistics */
++				len += sk_proc_print(buffer, 
++				"\nReceive statistics\n\n");
++
++				len += sk_proc_print(buffer,
++					"Received bytes                 %Lu\n",
++					(unsigned long long) pPnmiStat->StatRxOctetsOkCts);
++				len += sk_proc_print(buffer,
++					"Received packets               %Lu\n",
++					(unsigned long long) pPnmiStat->StatRxOkCts);
+ #if 0
+-	if (pAC->GIni.GP[0].PhyType == SK_PHY_XMAC && 
+-	    pAC->HWRevision < 12) {
+-		pPnmiStruct->InErrorsCts = pPnmiStruct->InErrorsCts - 
+-			pPnmiStat->StatRxShortsCts;
+-		pPnmiStat->StatRxShortsCts = 0;
+-	}
++				if (pAC->GIni.GP[0].PhyType == SK_PHY_XMAC && 
++					pAC->HWRevision < 12) {
++					pPnmiStruct->InErrorsCts = pPnmiStruct->InErrorsCts - 
++						pPnmiStat->StatRxShortsCts;
++					pPnmiStat->StatRxShortsCts = 0;
++				}
+ #endif
+-	if (pNet->Mtu > 1500) 
+-		pPnmiStruct->InErrorsCts = pPnmiStruct->InErrorsCts -
+-			pPnmiStat->StatRxTooLongCts;
+-
+-	seq_printf(seq,
+-		   "Receive errors                 %Ld\n",
+-		   (unsigned long long) pPnmiStruct->InErrorsCts);
+-	seq_printf(seq,
+-		   "Receive dropped                %Ld\n",
+-		   (unsigned long long) pPnmiStruct->RxNoBufCts);
+-	seq_printf(seq,
+-		   "Received multicast             %Ld\n",
+-		   (unsigned long long) pPnmiStat->StatRxMulticastOkCts);
+-	seq_printf(seq,
+-		   "Receive error types\n");
+-	seq_printf(seq,
+-		   "   length                      %Ld\n",
+-		   (unsigned long long) pPnmiStat->StatRxRuntCts);
+-	seq_printf(seq,
+-		   "   buffer overflow             %Ld\n",
+-		   (unsigned long long) pPnmiStat->StatRxFifoOverflowCts);
+-	seq_printf(seq,
+-		   "   bad crc                     %Ld\n",
+-		   (unsigned long long) pPnmiStat->StatRxFcsCts);
+-	seq_printf(seq,
+-		   "   framing                     %Ld\n",
+-		   (unsigned long long) pPnmiStat->StatRxFramingCts);
+-	seq_printf(seq,
+-		   "   missed frames               %Ld\n",
+-		   (unsigned long long) pPnmiStat->StatRxMissedCts);
+-
+-	if (pNet->Mtu > 1500)
+-		pPnmiStat->StatRxTooLongCts = 0;
+-
+-	seq_printf(seq,
+-		   "   too long                    %Ld\n",
+-		   (unsigned long long) pPnmiStat->StatRxTooLongCts);					
+-	seq_printf(seq,
+-		   "   carrier extension           %Ld\n",
+-		   (unsigned long long) pPnmiStat->StatRxCextCts);				
+-	seq_printf(seq,
+-		   "   too short                   %Ld\n",
+-		   (unsigned long long) pPnmiStat->StatRxShortsCts);				
+-	seq_printf(seq,
+-		   "   symbol                      %Ld\n",
+-		   (unsigned long long) pPnmiStat->StatRxSymbolCts);				
+-	seq_printf(seq,
+-		   "   LLC MAC size                %Ld\n",
+-		   (unsigned long long) pPnmiStat->StatRxIRLengthCts);				
+-	seq_printf(seq,
+-		   "   carrier event               %Ld\n",
+-		   (unsigned long long) pPnmiStat->StatRxCarrierCts);				
+-	seq_printf(seq,
+-		   "   jabber                      %Ld\n",
+-		   (unsigned long long) pPnmiStat->StatRxJabberCts);				
+-
+-
+-	/*Transmit statistics */
+-	seq_printf(seq, 
+-		   "\nTransmit statistics\n\n");
++				if (pNet->Mtu > 1500) 
++					pPnmiStruct->InErrorsCts = pPnmiStruct->InErrorsCts -
++						pPnmiStat->StatRxTooLongCts;
++
++				len += sk_proc_print(buffer,
++					"Receive errors                 %Lu\n",
++					(unsigned long long) pPnmiStruct->InErrorsCts);
++				len += sk_proc_print(buffer,
++					"Receive dropped                %Lu\n",
++					(unsigned long long) pPnmiStruct->RxNoBufCts);
++				len += sk_proc_print(buffer,
++					"Received multicast             %Lu\n",
++					(unsigned long long) pPnmiStat->StatRxMulticastOkCts);
++				len += sk_proc_print(buffer,
++					"Receive error types\n");
++				len += sk_proc_print(buffer,
++					"   length                      %Lu\n",
++					(unsigned long long) pPnmiStat->StatRxRuntCts);
++				len += sk_proc_print(buffer,
++					"   buffer overflow             %Lu\n",
++					(unsigned long long) pPnmiStat->StatRxFifoOverflowCts);
++				len += sk_proc_print(buffer,
++					"   bad crc                     %Lu\n",
++					(unsigned long long) pPnmiStat->StatRxFcsCts);
++				len += sk_proc_print(buffer,
++					"   framing                     %Lu\n",
++					(unsigned long long) pPnmiStat->StatRxFramingCts);
++				len += sk_proc_print(buffer,
++					"   missed frames               %Lu\n",
++					(unsigned long long) pPnmiStat->StatRxMissedCts);
++
++				if (pNet->Mtu > 1500)
++					pPnmiStat->StatRxTooLongCts = 0;
++
++				len += sk_proc_print(buffer,
++					"   too long                    %Lu\n",
++					(unsigned long long) pPnmiStat->StatRxTooLongCts);					
++				len += sk_proc_print(buffer,
++					"   carrier extension           %Lu\n",
++					(unsigned long long) pPnmiStat->StatRxCextCts);				
++				len += sk_proc_print(buffer,
++					"   too short                   %Lu\n",
++					(unsigned long long) pPnmiStat->StatRxShortsCts);				
++				len += sk_proc_print(buffer,
++					"   symbol                      %Lu\n",
++					(unsigned long long) pPnmiStat->StatRxSymbolCts);				
++				len += sk_proc_print(buffer,
++					"   LLC MAC size                %Lu\n",
++					(unsigned long long) pPnmiStat->StatRxIRLengthCts);				
++				len += sk_proc_print(buffer,
++					"   carrier event               %Lu\n",
++					(unsigned long long) pPnmiStat->StatRxCarrierCts);				
++				len += sk_proc_print(buffer,
++					"   jabber                      %Lu\n",
++					(unsigned long long) pPnmiStat->StatRxJabberCts);				
++
++
++				/*Transmit statistics */
++				len += sk_proc_print(buffer, 
++				"\nTransmit statistics\n\n");
+ 				
+-	seq_printf(seq,
+-		   "Transmited bytes               %Ld\n",
+-		   (unsigned long long) pPnmiStat->StatTxOctetsOkCts);
+-	seq_printf(seq,
+-		   "Transmited packets             %Ld\n",
+-		   (unsigned long long) pPnmiStat->StatTxOkCts);
+-	seq_printf(seq,
+-		   "Transmit errors                %Ld\n",
+-		   (unsigned long long) pPnmiStat->StatTxSingleCollisionCts);
+-	seq_printf(seq,
+-		   "Transmit dropped               %Ld\n",
+-		   (unsigned long long) pPnmiStruct->TxNoBufCts);
+-	seq_printf(seq,
+-		   "Transmit collisions            %Ld\n",
+-		   (unsigned long long) pPnmiStat->StatTxSingleCollisionCts);
+-	seq_printf(seq,
+-		   "Transmit error types\n");
+-	seq_printf(seq,
+-		   "   excessive collision         %ld\n",
+-		   pAC->stats.tx_aborted_errors);
+-	seq_printf(seq,
+-		   "   carrier                     %Ld\n",
+-		   (unsigned long long) pPnmiStat->StatTxCarrierCts);
+-	seq_printf(seq,
+-		   "   fifo underrun               %Ld\n",
+-		   (unsigned long long) pPnmiStat->StatTxFifoUnderrunCts);
+-	seq_printf(seq,
+-		   "   heartbeat                   %Ld\n",
+-		   (unsigned long long) pPnmiStat->StatTxCarrierCts);
+-	seq_printf(seq,
+-		   "   window                      %ld\n",
+-		   pAC->stats.tx_window_errors);
++				len += sk_proc_print(buffer,
++					"Transmited bytes               %Lu\n",
++					(unsigned long long) pPnmiStat->StatTxOctetsOkCts);
++				len += sk_proc_print(buffer,
++					"Transmited packets             %Lu\n",
++					(unsigned long long) pPnmiStat->StatTxOkCts);
++				len += sk_proc_print(buffer,
++					"Transmit errors                %Lu\n",
++					(unsigned long long) pPnmiStat->StatTxSingleCollisionCts);
++				len += sk_proc_print(buffer,
++					"Transmit dropped               %Lu\n",
++					(unsigned long long) pPnmiStruct->TxNoBufCts);
++				len += sk_proc_print(buffer,
++					"Transmit collisions            %Lu\n",
++					(unsigned long long) pPnmiStat->StatTxSingleCollisionCts);
++				len += sk_proc_print(buffer,
++					"Transmit error types\n");
++				len += sk_proc_print(buffer,
++					"   excessive collision         %ld\n",
++					pAC->stats.tx_aborted_errors);
++				len += sk_proc_print(buffer,
++					"   carrier                     %Lu\n",
++					(unsigned long long) pPnmiStat->StatTxCarrierCts);
++				len += sk_proc_print(buffer,
++					"   fifo underrun               %Lu\n",
++					(unsigned long long) pPnmiStat->StatTxFifoUnderrunCts);
++				len += sk_proc_print(buffer,
++					"   heartbeat                   %Lu\n",
++					(unsigned long long) pPnmiStat->StatTxCarrierCts);
++				len += sk_proc_print(buffer,
++					"   window                      %ld\n",
++					pAC->stats.tx_window_errors);
+ 				
+-	return 0;
++			} /* if (strcmp(pACname, currDeviceName) == 0) */
++		}
++		SkgeProcDev = next;
++	}
+ }
+ 
++/*****************************************************************************
++ *
++ *      sk_proc_print -generic line print  
++ *
++ * Description:
++ *  This function fills the proc entry with statistic data about 
++ *  the ethernet device.
++ *  
++ * Returns: number of bytes written
++ *      
++ */ 
++static int sk_proc_print(void *writePtr, char *format, ...)
++{   
++#define MAX_LEN_SINGLE_LINE 256
++	char     str[MAX_LEN_SINGLE_LINE];
++	va_list  a_start;
++	int      lenght = 0;
++
++	struct seq_file *seq = (struct seq_file *) writePtr;
++
++	SK_MEMSET(str, 0, MAX_LEN_SINGLE_LINE);
++
++	va_start(a_start, format);
++	vsprintf(str, format, a_start);
++	va_end(a_start);
++
++	lenght = strlen(str);
+ 
++	seq_printf(seq, str);
++	return lenght;
++}
++
++/*****************************************************************************
++ *
++ *      sk_seq_show - show proc information of a particular adapter
++ *
++ * Description:
++ *  This function fills the proc entry with statistic data about 
++ *  the ethernet device. It invokes the generic sk_gen_browse() to
++ *  print out all items one per one.
++ *  
++ * Returns: number of bytes written
++ *      
++ */
++static int sk_seq_show(struct seq_file *seq, void *v)
++{
++    void *castedBuffer = (void *) seq;
++    currDev = seq->private;
++    sk_gen_browse(castedBuffer);
++    return 0;
++}
++
++/*****************************************************************************
++ *
++ *      sk_proc_open - register the show function when proc is open'ed
++ *  
++ * Description:
++ *  This function is called whenever a sk98lin proc file is queried.
++ *  
++ * Returns: the return value of single_open()
++ *      
++ */
+ static int sk_proc_open(struct inode *inode, struct file *file)
+ {
+-	return single_open(file, sk_seq_show, PDE(inode)->data);
++    return single_open(file, sk_seq_show, PDE(inode)->data);
+ }
+ 
+-struct file_operations sk_proc_fops = {
+-	.owner = THIS_MODULE,
+-	.open  = sk_proc_open,
+-	.read  = seq_read,
+-	.llseek = seq_lseek,
+-	.release = single_release,
+-};
+-#endif
++/*******************************************************************************
++ *
++ * End of file
++ *
++ ******************************************************************************/
+--- linux-2.6.0/drivers/net/sk98lin/skqueue.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/net/sk98lin/skqueue.c	2003-12-28 23:21:01.000000000 -0800
+@@ -1,9 +1,9 @@
+ /******************************************************************************
+  *
+  * Name:	skqueue.c
+- * Project:	Gigabit Ethernet Adapters, Schedule-Modul
+- * Version:	$Revision: 1.19 $
+- * Date:	$Date: 2003/05/13 18:00:07 $
++ * Project:	Gigabit Ethernet Adapters, Event Scheduler Module
++ * Version:	$Revision: 1.20 $
++ * Date:	$Date: 2003/09/16 13:44:00 $
+  * Purpose:	Management of an event queue.
+  *
+  ******************************************************************************/
+@@ -27,6 +27,10 @@
+  * History:
+  *
+  *	$Log: skqueue.c,v $
++ *	Revision 1.20  2003/09/16 13:44:00  rschmidt
++ *	Added (C) Marvell to SysKonnectFileId
++ *	Editorial changes
++ *	
+  *	Revision 1.19  2003/05/13 18:00:07  mkarl
+  *	Removed calls to RLMT, TWSI, and PNMI for SLIM driver (SK_SLIM).
+  *	Editorial changes.
+@@ -85,18 +89,16 @@
+  *	
+  *	Revision 1.1  1998/07/30 15:14:01  gklug
+  *	Initial version. Adapted from SMT
+- *	
+- *	
+  *
+  ******************************************************************************/
+ 
+ 
+ /*
+-	Event queue and dispatcher
+-*/
++ *	Event queue and dispatcher
++ */
+ #if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
+ static const char SysKonnectFileId[] =
+-	"$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 */
+@@ -124,11 +126,11 @@ intro()
+ void	SkEventInit(
+ SK_AC	*pAC,	/* Adapter context */
+ SK_IOC	Ioc,	/* IO context */
+-int	Level)	/* Init level */
++int		Level)	/* Init level */
+ {
+ 	switch (Level) {
+ 	case SK_INIT_DATA:
+-		pAC->Event.EvPut = pAC->Event.EvGet = pAC->Event.EvQueue ;
++		pAC->Event.EvPut = pAC->Event.EvGet = pAC->Event.EvQueue;
+ 		break;
+ 	default:
+ 		break;
+@@ -144,14 +146,15 @@ SK_U32		Class,	/* Event Class */
+ SK_U32		Event,	/* Event to be queued */
+ SK_EVPARA	Para)	/* Event parameter */
+ {
+-	pAC->Event.EvPut->Class = Class ;
+-	pAC->Event.EvPut->Event = Event ;
+-	pAC->Event.EvPut->Para = Para ;
++	pAC->Event.EvPut->Class = Class;
++	pAC->Event.EvPut->Event = Event;
++	pAC->Event.EvPut->Para = Para;
++	
+ 	if (++pAC->Event.EvPut == &pAC->Event.EvQueue[SK_MAX_EVENT])
+-		pAC->Event.EvPut = pAC->Event.EvQueue ;
++		pAC->Event.EvPut = pAC->Event.EvQueue;
+ 
+ 	if (pAC->Event.EvPut == pAC->Event.EvGet) {
+-		SK_ERR_LOG(pAC, SK_ERRCL_NORES, SKERR_Q_E001, SKERR_Q_E001MSG) ;
++		SK_ERR_LOG(pAC, SK_ERRCL_NORES, SKERR_Q_E001, SKERR_Q_E001MSG);
+ 	}
+ }
+ 
+@@ -168,77 +171,79 @@ int	SkEventDispatcher(
+ SK_AC	*pAC,	/* Adapters Context */
+ SK_IOC	Ioc)	/* Io context */
+ {
+-	SK_EVENTELEM	*pEv ;	/* pointer into queue */
+-	SK_U32			Class ;
+-	int			Rtv ;
+-
+-	pEv = pAC->Event.EvGet ;
+-	PRINTF("dispatch get %x put %x\n",pEv,pAC->Event.ev_put) ;
++	SK_EVENTELEM	*pEv;	/* pointer into queue */
++	SK_U32			Class;
++	int			Rtv;
++
++	pEv = pAC->Event.EvGet;
++	
++	PRINTF("dispatch get %x put %x\n", pEv, pAC->Event.ev_put);
++	
+ 	while (pEv != pAC->Event.EvPut) {
+-		PRINTF("dispatch Class %d Event %d\n",pEv->Class,pEv->Event) ;
+-		switch(Class = pEv->Class) {
++		PRINTF("dispatch Class %d Event %d\n", pEv->Class, pEv->Event);
++
++		switch (Class = pEv->Class) {
+ #ifndef SK_USE_LAC_EV
+ #ifndef SK_SLIM
+-		case SKGE_RLMT :	/* RLMT Event */
+-			Rtv = SkRlmtEvent(pAC,Ioc,pEv->Event,pEv->Para);
+-			break ;
+-		case SKGE_I2C :		/* I2C Event */
+-			Rtv = SkI2cEvent(pAC,Ioc,pEv->Event,pEv->Para);
+-			break ;
+-		case SKGE_PNMI :
+-			Rtv = SkPnmiEvent(pAC,Ioc,pEv->Event,pEv->Para);
+-			break ;
++		case SKGE_RLMT:		/* RLMT Event */
++			Rtv = SkRlmtEvent(pAC, Ioc, pEv->Event, pEv->Para);
++			break;
++		case SKGE_I2C:		/* I2C Event */
++			Rtv = SkI2cEvent(pAC, Ioc, pEv->Event, pEv->Para);
++			break;
++		case SKGE_PNMI:		/* PNMI Event */
++			Rtv = SkPnmiEvent(pAC, Ioc, pEv->Event, pEv->Para);
++			break;
+ #endif	/* not SK_SLIM */
+ #endif	/* not SK_USE_LAC_EV */
+-		case SKGE_DRV :		/* Driver Event */
+-			Rtv = SkDrvEvent(pAC,Ioc,pEv->Event,pEv->Para);
+-			break ;
+-#ifndef SK_USE_SW_TIMER        
+-		case SKGE_HWAC :
+-			Rtv = SkGeSirqEvent(pAC,Ioc,pEv->Event,pEv->Para);
+-			break ;
++		case SKGE_DRV:		/* Driver Event */
++			Rtv = SkDrvEvent(pAC, Ioc, pEv->Event, pEv->Para);
++			break;
++#ifndef SK_USE_SW_TIMER
++		case SKGE_HWAC:
++			Rtv = SkGeSirqEvent(pAC, Ioc, pEv->Event, pEv->Para);
++			break;
+ #else /* !SK_USE_SW_TIMER */
+-        case SKGE_SWT : 
+-			Rtv = SkSwtEvent(pAC,Ioc,pEv->Event,pEv->Para);
+-			break ;
++        case SKGE_SWT :
++			Rtv = SkSwtEvent(pAC, Ioc, pEv->Event, pEv->Para);
++			break;
+ #endif /* !SK_USE_SW_TIMER */
+-#ifdef SK_USE_LAC_EV        
++#ifdef SK_USE_LAC_EV
+ 		case SKGE_LACP :
+-			Rtv = SkLacpEvent(pAC,Ioc,pEv->Event,pEv->Para);
+-			break ;
++			Rtv = SkLacpEvent(pAC, Ioc, pEv->Event, pEv->Para);
++			break;
+ 		case SKGE_RSF :
+-			Rtv = SkRsfEvent(pAC,Ioc,pEv->Event,pEv->Para);
+-			break ;
++			Rtv = SkRsfEvent(pAC, Ioc, pEv->Event, pEv->Para);
++			break;
+ 		case SKGE_MARKER :
+-			Rtv = SkMarkerEvent(pAC,Ioc,pEv->Event,pEv->Para);
+-			break ;
++			Rtv = SkMarkerEvent(pAC, Ioc, pEv->Event, pEv->Para);
++			break;
+ 		case SKGE_FD :
+-			Rtv = SkFdEvent(pAC,Ioc,pEv->Event,pEv->Para);
+-			break ;
++			Rtv = SkFdEvent(pAC, Ioc, pEv->Event, pEv->Para);
++			break;
+ #endif /* SK_USE_LAC_EV */
+ #ifdef	SK_USE_CSUM
+ 		case SKGE_CSUM :
+-			Rtv = SkCsEvent(pAC,Ioc,pEv->Event,pEv->Para);
+-			break ;
++			Rtv = SkCsEvent(pAC, Ioc, pEv->Event, pEv->Para);
++			break;
+ #endif	/* SK_USE_CSUM */
+ 		default :
+-			SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_Q_E002,
+-				SKERR_Q_E002MSG) ;
++			SK_ERR_LOG(pAC, SK_ERRCL_SW, SKERR_Q_E002, SKERR_Q_E002MSG);
+ 			Rtv = 0;
+ 		}
+ 
+ 		if (Rtv != 0) {
+-			return(Rtv) ;
++			return(Rtv);
+ 		}
+ 
+ 		if (++pEv == &pAC->Event.EvQueue[SK_MAX_EVENT])
+-			pEv = pAC->Event.EvQueue ;
++			pEv = pAC->Event.EvQueue;
+ 
+ 		/* Renew get: it is used in queue_events to detect overruns */
+ 		pAC->Event.EvGet = pEv;
+ 	}
+ 
+-	return(0) ;
++	return(0);
+ }
+ 
+ /* End of file */
+--- linux-2.6.0/drivers/net/sk98lin/sktimer.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/net/sk98lin/sktimer.c	2003-12-28 23:21:01.000000000 -0800
+@@ -1,9 +1,9 @@
+ /******************************************************************************
+  *
+  * Name:	sktimer.c
+- * Project:	Gigabit Ethernet Adapters, Schedule-Modul
+- * Version:	$Revision: 1.13 $
+- * Date:	$Date: 2003/05/13 18:01:01 $
++ * Project:	Gigabit Ethernet Adapters, Event Scheduler Module
++ * Version:	$Revision: 1.14 $
++ * Date:	$Date: 2003/09/16 13:46:51 $
+  * Purpose:	High level timer functions.
+  *
+  ******************************************************************************/
+@@ -27,6 +27,10 @@
+  * History:
+  *
+  *	$Log: sktimer.c,v $
++ *	Revision 1.14  2003/09/16 13:46:51  rschmidt
++ *	Added (C) Marvell to SysKonnectFileId
++ *	Editorial changes
++ *	
+  *	Revision 1.13  2003/05/13 18:01:01  mkarl
+  *	Editorial changes.
+  *	
+@@ -68,19 +72,16 @@
+  *	
+  *	Revision 1.1  1998/08/05 11:27:55  gklug
+  *	first version: adapted from SMT
+- *	
+- *	
+- *	
+  *
+  ******************************************************************************/
+ 
+ 
+ /*
+-	Event queue and dispatcher
+-*/
++ *	Event queue and dispatcher
++ */
+ #if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
+ static const char SysKonnectFileId[] =
+-	"$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 */
+@@ -110,14 +111,14 @@ static void timer_done(SK_AC *pAC,SK_IOC
+ void	SkTimerInit(
+ SK_AC	*pAC,		/* Adapters context */
+ SK_IOC	Ioc,		/* IoContext */
+-int	Level)		/* Init Level */
++int		Level)		/* Init Level */
+ {
+ 	switch (Level) {
+ 	case SK_INIT_DATA:
+-		pAC->Tim.StQueue = 0 ;
++		pAC->Tim.StQueue = 0;
+ 		break;
+ 	case SK_INIT_IO:
+-		SkHwtInit(pAC,Ioc) ;
++		SkHwtInit(pAC, Ioc);
+ 		SkTimerDone(pAC, Ioc);
+ 		break;
+ 	default:
+@@ -134,31 +135,34 @@ SK_AC		*pAC,		/* Adapters context */
+ SK_IOC		Ioc,		/* IoContext */
+ SK_TIMER	*pTimer)	/* Timer Pointer to be started */
+ {
+-	SK_TIMER	**ppTimPrev ;
+-	SK_TIMER	*pTm ;
++	SK_TIMER	**ppTimPrev;
++	SK_TIMER	*pTm;
+ 
+ 	/*
+ 	 * remove timer from queue
+ 	 */
+-	pTimer->TmActive = SK_FALSE ;
++	pTimer->TmActive = SK_FALSE;
++	
+ 	if (pAC->Tim.StQueue == pTimer && !pTimer->TmNext) {
+-		SkHwtStop(pAC,Ioc) ;
++		SkHwtStop(pAC, Ioc);
+ 	}
+-	for (ppTimPrev = &pAC->Tim.StQueue ; (pTm = *ppTimPrev) ;
++	
++	for (ppTimPrev = &pAC->Tim.StQueue; (pTm = *ppTimPrev);
+ 		ppTimPrev = &pTm->TmNext ) {
++		
+ 		if (pTm == pTimer) {
+ 			/*
+ 			 * Timer found in queue
+ 			 * - dequeue it and
+ 			 * - correct delta of the next timer
+ 			 */
+-			*ppTimPrev = pTm->TmNext ;
++			*ppTimPrev = pTm->TmNext;
+ 
+ 			if (pTm->TmNext) {
+ 				/* correct delta of next timer in queue */
+-				pTm->TmNext->TmDelta += pTm->TmDelta ;
++				pTm->TmNext->TmDelta += pTm->TmDelta;
+ 			}
+-			return ;
++			return;
+ 		}
+ 	}
+ }
+@@ -175,65 +179,67 @@ SK_U32		Class,		/* Event Class for this 
+ SK_U32		Event,		/* Event Value for this timer */
+ SK_EVPARA	Para)		/* Event Parameter for this timer */
+ {
+-	SK_TIMER	**ppTimPrev ;
+-	SK_TIMER	*pTm ;
+-	SK_U32		Delta ;
++	SK_TIMER	**ppTimPrev;
++	SK_TIMER	*pTm;
++	SK_U32		Delta;
+ 
+-	Time /= 16 ;		/* input is uS, clock ticks are 16uS */
++	Time /= 16;		/* input is uS, clock ticks are 16uS */
++	
+ 	if (!Time)
+-		Time = 1 ;
++		Time = 1;
+ 
+-	SkTimerStop(pAC,Ioc,pTimer) ;
++	SkTimerStop(pAC, Ioc, pTimer);
+ 
+-	pTimer->TmClass = Class ;
+-	pTimer->TmEvent = Event ;
+-	pTimer->TmPara = Para ;
+-	pTimer->TmActive = SK_TRUE ;
++	pTimer->TmClass = Class;
++	pTimer->TmEvent = Event;
++	pTimer->TmPara = Para;
++	pTimer->TmActive = SK_TRUE;
+ 
+ 	if (!pAC->Tim.StQueue) {
+ 		/* First Timer to be started */
+-		pAC->Tim.StQueue = pTimer ;
+-		pTimer->TmNext = 0 ;
+-		pTimer->TmDelta = Time ;
+-		SkHwtStart(pAC,Ioc,Time) ;
+-		return ;
++		pAC->Tim.StQueue = pTimer;
++		pTimer->TmNext = 0;
++		pTimer->TmDelta = Time;
++		
++		SkHwtStart(pAC, Ioc, Time);
++		
++		return;
+ 	}
+ 
+ 	/*
+ 	 * timer correction
+ 	 */
+-	timer_done(pAC,Ioc,0) ;
++	timer_done(pAC, Ioc, 0);
+ 
+ 	/*
+ 	 * find position in queue
+ 	 */
+-	Delta = 0 ;
+-	for (ppTimPrev = &pAC->Tim.StQueue ; (pTm = *ppTimPrev) ;
++	Delta = 0;
++	for (ppTimPrev = &pAC->Tim.StQueue; (pTm = *ppTimPrev);
+ 		ppTimPrev = &pTm->TmNext ) {
++		
+ 		if (Delta + pTm->TmDelta > Time) {
+ 			/* Position found */
+ 			/* Here the timer needs to be inserted. */
+-			break ;
++			break;
+ 		}
+-		Delta += pTm->TmDelta ;
++		Delta += pTm->TmDelta;
+ 	}
+ 
+ 	/* insert in queue */
+-	*ppTimPrev = pTimer ;
+-	pTimer->TmNext = pTm ;
+-	pTimer->TmDelta = Time - Delta ;
++	*ppTimPrev = pTimer;
++	pTimer->TmNext = pTm;
++	pTimer->TmDelta = Time - Delta;
+ 
+ 	if (pTm) {
+ 		/* There is a next timer
+ 		 * -> correct its Delta value.
+ 		 */
+-		pTm->TmDelta -= pTimer->TmDelta ;
++		pTm->TmDelta -= pTimer->TmDelta;
+ 	}
+ 
+-	/*
+-	 * start new with first
+-	 */
+-	SkHwtStart(pAC,Ioc,pAC->Tim.StQueue->TmDelta) ;
++	/* restart with first */
++	SkHwtStart(pAC, Ioc, pAC->Tim.StQueue->TmDelta);
+ }
+ 
+ 
+@@ -241,55 +247,56 @@ void	SkTimerDone(
+ SK_AC	*pAC,		/* Adapters context */
+ SK_IOC	Ioc)		/* IoContext */
+ {
+-	timer_done(pAC,Ioc,1) ;
++	timer_done(pAC, Ioc, 1);
+ }
+ 
+ 
+ static void	timer_done(
+ SK_AC	*pAC,		/* Adapters context */
+ SK_IOC	Ioc,		/* IoContext */
+-int	Restart)	/* Do we need to restart the Hardware timer ? */
++int		Restart)	/* Do we need to restart the Hardware timer ? */
+ {
+-	SK_U32		Delta ;
+-	SK_TIMER	*pTm ;
+-	SK_TIMER	*pTComp ;	/* Timer completed now now */
+-	SK_TIMER	**ppLast ;	/* Next field of Last timer to be deq */
+-	int		Done = 0 ;
+-
+-	Delta = SkHwtRead(pAC,Ioc) ;
+-	ppLast = &pAC->Tim.StQueue ;
+-	pTm = pAC->Tim.StQueue ;
++	SK_U32		Delta;
++	SK_TIMER	*pTm;
++	SK_TIMER	*pTComp;	/* Timer completed now now */
++	SK_TIMER	**ppLast;	/* Next field of Last timer to be deq */
++	int		Done = 0;
++
++	Delta = SkHwtRead(pAC, Ioc);
++	
++	ppLast = &pAC->Tim.StQueue;
++	pTm = pAC->Tim.StQueue;
+ 	while (pTm && !Done) {
+ 		if (Delta >= pTm->TmDelta) {
+ 			/* Timer ran out */
+-			pTm->TmActive = SK_FALSE ;
+-			Delta -= pTm->TmDelta ;
+-			ppLast = &pTm->TmNext ;
+-			pTm = pTm->TmNext ;
+-		} else {
++			pTm->TmActive = SK_FALSE;
++			Delta -= pTm->TmDelta;
++			ppLast = &pTm->TmNext;
++			pTm = pTm->TmNext;
++		}
++		else {
+ 			/* We found the first timer that did not run out */
+-			pTm->TmDelta -= Delta ;
+-			Delta = 0 ;
+-			Done = 1 ;
++			pTm->TmDelta -= Delta;
++			Delta = 0;
++			Done = 1;
+ 		}
+ 	}
+-	*ppLast = 0 ;
++	*ppLast = 0;
+ 	/*
+ 	 * pTm points to the first Timer that did not run out.
+ 	 * StQueue points to the first Timer that run out.
+ 	 */
+ 
+-	for ( pTComp = pAC->Tim.StQueue ; pTComp ; pTComp = pTComp->TmNext) {
+-		SkEventQueue(pAC,pTComp->TmClass, pTComp->TmEvent,
+-			pTComp->TmPara) ;
++	for ( pTComp = pAC->Tim.StQueue; pTComp; pTComp = pTComp->TmNext) {
++		SkEventQueue(pAC,pTComp->TmClass, pTComp->TmEvent, pTComp->TmPara);
+ 	}
+ 
+ 	/* Set head of timer queue to the first timer that did not run out */
+-	pAC->Tim.StQueue = pTm ;
++	pAC->Tim.StQueue = pTm;
+ 
+ 	if (Restart && pAC->Tim.StQueue) {
+ 		/* Restart HW timer */
+-		SkHwtStart(pAC,Ioc,pAC->Tim.StQueue->TmDelta) ;
++		SkHwtStart(pAC, Ioc, pAC->Tim.StQueue->TmDelta);
+ 	}
+ }
+ 
+--- linux-2.6.0/drivers/net/sk98lin/skxmac2.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/net/sk98lin/skxmac2.c	2003-12-28 23:21:01.000000000 -0800
+@@ -2,8 +2,8 @@
+  *
+  * Name:	skxmac2.c
+  * Project:	Gigabit Ethernet Adapters, Common Modules
+- * 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: 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().
++ *	Editorial changes.
++ *	
++ *	Revision 1.101  2003/09/16 14:49:07  rschmidt
++ *	Added routines SkGmClearRst(), SkXmClearRst, SkMacClearRst().
++ *	Added WA code for Yukon-Lite's COMA mode in SkGmHardRst().
++ *	Replaced PCI-Config R/W through internal access.
++ *	Fixed return from coma mode in SkGmLeaveLowPowerMode().
++ *	Fixed compiler warnings for different types.
++ *	Editorial changes.
++ *	
++ *	Revision 1.100  2003/09/16 07:09:11  mschmid
++ *	Added functions SkGmEnterLowPowerMode() and
++ *	SkGmLeaveLowPowerMode()
++ *	
+  *	Revision 1.99  2003/07/11 12:19:33  rschmidt
+  *	Reduced init values for Master & Slave downshift counters to
+  *	minimum values.
+@@ -164,7 +181,7 @@
+  *	Revision 1.74  2002/08/12 14:00:17  rschmidt
+  *	Replaced usage of Broadcom PHY Ids with defines.
+  *	Corrected error messages in SkGmMacStatistic().
+- *	Made SkMacPromiscMode() public for ADDR-Modul.
++ *	Made SkMacPromiscMode() public for ADDR-Module.
+  *	Editorial changes.
+  *	
+  *	Revision 1.73  2002/08/08 16:26:24  rschmidt
+@@ -475,7 +492,7 @@ typedef struct s_PhyHack {
+ 
+ #if (defined(DEBUG) || ((!defined(LINT)) && (!defined(SK_SLIM))))
+ static const char SysKonnectFileId[] =
+-	"@(#) $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
+@@ -1343,7 +1360,7 @@ int		Port)	/* Port Index (MAC_1 + n) */
+  * Description:
+  *	The XMAC of the specified 'Port' and all connected devices
+  *	(PHY and SERDES) will receive a reset signal on its *Reset pins.
+- *	External PHYs must be reset be clearing a bit in the GPIO register
++ *	External PHYs must be reset by clearing a bit in the GPIO register
+  *  (Timing requirements: Broadcom: 400ns, Level One: none, National: 80ns).
+  *
+  * ATTENTION:
+@@ -1386,23 +1403,62 @@ int		Port)	/* Port Index (MAC_1 + n) */
+ 
+ 	/* For external PHYs there must be special handling */
+ 	if (pAC->GIni.GP[Port].PhyType != SK_PHY_XMAC) {
+-		/* reset external PHY */
++		
+ 		SK_IN32(IoC, B2_GP_IO, &Reg);
++		
+ 		if (Port == 0) {
+-			Reg |= GP_DIR_0; /* set to output */
+-			Reg &= ~GP_IO_0;
++			Reg |= GP_DIR_0; 	/* set to output */
++			Reg &= ~GP_IO_0;	/* set PHY reset (active low) */
+ 		}
+ 		else {
+-			Reg |= GP_DIR_2; /* set to output */
+-			Reg &= ~GP_IO_2;
++			Reg |= GP_DIR_2;	/* set to output */
++			Reg &= ~GP_IO_2;	/* set PHY reset (active low) */
+ 		}
++		/* reset external PHY */
+ 		SK_OUT32(IoC, B2_GP_IO, Reg);
+ 
+ 		/* short delay */
+ 		SK_IN32(IoC, B2_GP_IO, &Reg);
+ 	}
+-
+ }	/* SkXmHardRst */
++
++
++/******************************************************************************
++ *
++ *	SkXmClearRst() - Release the PHY & XMAC reset
++ *
++ * Description:
++ *
++ * Returns:
++ *	nothing
++ */
++static void SkXmClearRst(
++SK_AC	*pAC,	/* adapter context */
++SK_IOC	IoC,	/* IO context */
++int		Port)	/* Port Index (MAC_1 + n) */
++{
++	SK_U32	DWord;
++	
++	/* clear HW reset */
++	SK_OUT16(IoC, MR_ADDR(Port, TX_MFF_CTRL1), MFF_CLR_MAC_RST);
++
++	if (pAC->GIni.GP[Port].PhyType != SK_PHY_XMAC) {
++
++		SK_IN32(IoC, B2_GP_IO, &DWord);
++
++		if (Port == 0) {
++			DWord |= (GP_DIR_0 | GP_IO_0); /* set to output */
++		}
++		else {
++			DWord |= (GP_DIR_2 | GP_IO_2); /* set to output */
++		}
++		/* Clear PHY reset */
++		SK_OUT32(IoC, B2_GP_IO, DWord);
++
++		/* Enable GMII interface */
++		XM_OUT16(IoC, Port, XM_HW_CFG, XM_HW_GMII_MD);
++	}
++}	/* SkXmClearRst */
+ #endif /* GENESIS */
+ 
+ 
+@@ -1452,10 +1508,6 @@ int		Port)	/* Port Index (MAC_1 + n) */
+  *
+  * Description:
+  *
+- * ATTENTION:
+- * 	It is absolutely necessary to reset the SW_RST Bit first
+- *	before calling this function.
+- *
+  * Returns:
+  *	nothing
+  */
+@@ -1464,6 +1516,20 @@ SK_AC	*pAC,	/* adapter context */
+ SK_IOC	IoC,	/* IO context */
+ int		Port)	/* Port Index (MAC_1 + n) */
+ {
++	SK_U32	DWord;
++	
++	/* WA code for COMA mode */
++	if (pAC->GIni.GIYukonLite &&
++		pAC->GIni.GIChipRev == CHIP_REV_YU_LITE_A3) {
++		
++		SK_IN32(IoC, B2_GP_IO, &DWord);
++
++		DWord |= (GP_DIR_9 | GP_IO_9);
++
++		/* set PHY reset */
++		SK_OUT32(IoC, B2_GP_IO, DWord);
++	}
++
+ 	/* set GPHY Control reset */
+ 	SK_OUT32(IoC, MR_ADDR(Port, GPHY_CTRL), GPC_RST_SET);
+ 
+@@ -1471,6 +1537,73 @@ int		Port)	/* Port Index (MAC_1 + n) */
+ 	SK_OUT32(IoC, MR_ADDR(Port, GMAC_CTRL), GMC_RST_SET);
+ 
+ }	/* SkGmHardRst */
++
++
++/******************************************************************************
++ *
++ *	SkGmClearRst() - Release the GPHY & GMAC reset
++ *
++ * Description:
++ *
++ * Returns:
++ *	nothing
++ */
++static void SkGmClearRst(
++SK_AC	*pAC,	/* adapter context */
++SK_IOC	IoC,	/* IO context */
++int		Port)	/* Port Index (MAC_1 + n) */
++{
++	SK_U32	DWord;
++	
++#ifdef XXX
++		/* clear GMAC Control reset */
++		SK_OUT32(IoC, MR_ADDR(Port, GMAC_CTRL), GMC_RST_CLR);
++
++		/* set GMAC Control reset */
++		SK_OUT32(IoC, MR_ADDR(Port, GMAC_CTRL), GMC_RST_SET);
++#endif /* XXX */
++
++	/* WA code for COMA mode */
++	if (pAC->GIni.GIYukonLite &&
++		pAC->GIni.GIChipRev == CHIP_REV_YU_LITE_A3) {
++		
++		SK_IN32(IoC, B2_GP_IO, &DWord);
++
++		DWord |= GP_DIR_9;		/* set to output */
++		DWord &= ~GP_IO_9;		/* clear PHY reset (active high) */
++
++		/* clear PHY reset */
++		SK_OUT32(IoC, B2_GP_IO, DWord);
++	}
++
++	/* set HWCFG_MODE */
++	DWord = GPC_INT_POL_HI | GPC_DIS_FC | GPC_DIS_SLEEP |
++		GPC_ENA_XC | GPC_ANEG_ADV_ALL_M | GPC_ENA_PAUSE |
++		(pAC->GIni.GICopperType ? GPC_HWCFG_GMII_COP :
++		GPC_HWCFG_GMII_FIB);
++
++	/* set GPHY Control reset */
++	SK_OUT32(IoC, MR_ADDR(Port, GPHY_CTRL), DWord | GPC_RST_SET);
++
++	/* release GPHY Control reset */
++	SK_OUT32(IoC, MR_ADDR(Port, GPHY_CTRL), DWord | GPC_RST_CLR);
++
++#ifdef VCPU
++	VCpuWait(9000);
++#endif /* VCPU */
++
++	/* clear GMAC Control reset */
++	SK_OUT32(IoC, MR_ADDR(Port, GMAC_CTRL), GMC_PAUSE_ON | GMC_RST_CLR);
++
++#ifdef VCPU
++	VCpuWait(2000);
++	
++	SK_IN32(IoC, MR_ADDR(Port, GPHY_CTRL), &DWord);
++			
++	SK_IN32(IoC, B0_ISRC, &DWord);
++#endif /* VCPU */
++
++}	/* SkGmClearRst */
+ #endif /* YUKON */
+ 
+ 
+@@ -1553,6 +1686,38 @@ int		Port)	/* Port Index (MAC_1 + n) */
+ }	/* SkMacHardRst */
+ 
+ 
++/******************************************************************************
++ *
++ *	SkMacClearRst() - Clear the MAC reset
++ *
++ * Description:	calls a clear MAC reset routine dep. on board type
++ *
++ * Returns:
++ *	nothing
++ */
++void SkMacClearRst(
++SK_AC	*pAC,	/* adapter context */
++SK_IOC	IoC,	/* IO context */
++int		Port)	/* Port Index (MAC_1 + n) */
++{
++	
++#ifdef GENESIS
++	if (pAC->GIni.GIGenesis) {
++		
++		SkXmClearRst(pAC, IoC, Port);
++	}
++#endif /* GENESIS */
++	
++#ifdef YUKON
++	if (pAC->GIni.GIYukon) {
++		
++		SkGmClearRst(pAC, IoC, Port);
++	}
++#endif /* YUKON */
++
++}	/* SkMacClearRst */
++
++
+ #ifdef GENESIS
+ /******************************************************************************
+  *
+@@ -1574,7 +1739,6 @@ SK_IOC	IoC,		/* IO context */
+ int		Port)		/* Port Index (MAC_1 + n) */
+ {
+ 	SK_GEPORT	*pPrt;
+-	SK_U32		Reg;
+ 	int			i;
+ 	SK_U16		SWord;
+ 
+@@ -1594,32 +1758,10 @@ int		Port)		/* Port Index (MAC_1 + n) */
+ 	}
+ 
+ 	if (pPrt->PState == SK_PRT_RESET) {
+-		/*
+-		 * clear HW reset
+-		 * Note: The SW reset is self clearing, therefore there is
+-		 *	 nothing to do here.
+-		 */
+-		SK_OUT16(IoC, MR_ADDR(Port, TX_MFF_CTRL1), MFF_CLR_MAC_RST);
+ 
+-		/* Ensure that XMAC reset release is done (errata from LReinbold?) */
+-		SK_IN16(IoC, MR_ADDR(Port, TX_MFF_CTRL1), &SWord);
++		SkXmClearRst(pAC, IoC, Port);
+ 
+-		/* Clear PHY reset */
+ 		if (pPrt->PhyType != SK_PHY_XMAC) {
+-
+-			SK_IN32(IoC, B2_GP_IO, &Reg);
+-			
+-			if (Port == 0) {
+-				Reg |= (GP_DIR_0 | GP_IO_0); /* set to output */
+-			}
+-			else {
+-				Reg |= (GP_DIR_2 | GP_IO_2); /* set to output */
+-			}
+-			SK_OUT32(IoC, B2_GP_IO, Reg);
+-
+-			/* Enable GMII interface */
+-			XM_OUT16(IoC, Port, XM_HW_CFG, XM_HW_GMII_MD);
+-
+ 			/* read Id from external PHY (all have the same address) */
+ 			SkXmPhyRead(pAC, IoC, Port, PHY_XMAC_ID1, &pPrt->PhyId1);
+ 
+@@ -1831,43 +1973,11 @@ int		Port)		/* Port Index (MAC_1 + n) */
+ 	}
+ 
+ 	if (pPrt->PState == SK_PRT_RESET) {
+-		/* set GPHY Control reset */
+-		SK_OUT32(IoC, MR_ADDR(Port, GPHY_CTRL), GPC_RST_SET);
+-
+-		/* set GMAC Control reset */
+-		SK_OUT32(IoC, MR_ADDR(Port, GMAC_CTRL), GMC_RST_SET);
+-
+-#ifdef XXX
+-		/* clear GMAC Control reset */
+-		SK_OUT32(IoC, MR_ADDR(Port, GMAC_CTRL), GMC_RST_CLR);
+-
+-		/* set GMAC Control reset */
+-		SK_OUT32(IoC, MR_ADDR(Port, GMAC_CTRL), GMC_RST_SET);
+-#endif /* XXX */
+-
+-		/* set HWCFG_MODE */
+-		DWord = GPC_INT_POL_HI | GPC_DIS_FC | GPC_DIS_SLEEP |
+-			GPC_ENA_XC | GPC_ANEG_ADV_ALL_M | GPC_ENA_PAUSE |
+-			(pAC->GIni.GICopperType ? GPC_HWCFG_GMII_COP :
+-			GPC_HWCFG_GMII_FIB);
+-
+-		/* set GPHY Control reset */
+-		SK_OUT32(IoC, MR_ADDR(Port, GPHY_CTRL), DWord | GPC_RST_SET);
+-
+-		/* release GPHY Control reset */
+-		SK_OUT32(IoC, MR_ADDR(Port, GPHY_CTRL), DWord | GPC_RST_CLR);
+-
+-#ifdef VCPU
+-		VCpuWait(9000);
+-#endif /* VCPU */
+-
+-		/* clear GMAC Control reset */
+-		SK_OUT32(IoC, MR_ADDR(Port, GMAC_CTRL), GMC_PAUSE_ON | GMC_RST_CLR);
+-
+-#ifdef VCPU
+-		VCpuWait(2000);
+-#endif /* VCPU */
++		
++		SkGmHardRst(pAC, IoC, Port);
+ 
++		SkGmClearRst(pAC, IoC, Port);
++		
+ 		/* Auto-negotiation ? */
+ 		if (pPrt->PLinkMode == SK_LMODE_HALF || pPrt->PLinkMode == SK_LMODE_FULL) {
+ 			/* Auto-negotiation disabled */
+@@ -1906,6 +2016,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
+ 			SWord |= GM_GPCR_DUP_FULL;
+ 		}
+ 
++		/* flow-control settings */
+ 		switch (pPrt->PFlowCtrlMode) {
+ 		case SK_FLOW_MODE_NONE:
+ 			/* set Pause Off */
+@@ -1940,7 +2051,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
+ 	(void)SkGmResetCounter(pAC, IoC, Port);
+ 
+ 	/* setup Transmit Control Register */
+-	GM_OUT16(IoC, Port, GM_TX_CTRL, GM_TXCR_COL_THR);
++	GM_OUT16(IoC, Port, GM_TX_CTRL, TX_COL_THR(pPrt->PMacColThres));
+ 
+ 	/* setup Receive Control Register */
+ 	GM_OUT16(IoC, Port, GM_RX_CTRL, GM_RXCR_UCF_ENA | GM_RXCR_MCF_ENA |
+@@ -1954,7 +2065,9 @@ int		Port)		/* Port Index (MAC_1 + n) */
+ 	GM_IN16(IoC, Port, GM_TX_PARAM, &SWord);
+ #endif /* VCPU */
+ 
+-    SWord = (SK_U16)(JAM_LEN_VAL(3) | JAM_IPG_VAL(11) | IPG_JAM_DATA(26));
++    SWord = TX_JAM_LEN_VAL(pPrt->PMacJamLen) |
++			TX_JAM_IPG_VAL(pPrt->PMacJamIpgVal) |
++			TX_IPG_JAM_DATA(pPrt->PMacJamIpgData);
+ 	
+ 	GM_OUT16(IoC, Port, GM_TX_PARAM, SWord);
+ 
+@@ -1963,7 +2076,12 @@ int		Port)		/* Port Index (MAC_1 + n) */
+ 	GM_IN16(IoC, Port, GM_SERIAL_MODE, &SWord);
+ #endif /* VCPU */
+ 	
+-	SWord = GM_SMOD_VLAN_ENA | IPG_VAL_FAST_ETH;
++	SWord = GM_SMOD_VLAN_ENA | IPG_DATA_VAL(pPrt->PMacIpgData);
++
++	if (pPrt->PMacLimit4) {
++		/* reset of collision counter after 4 consecutive collisions */
++		SWord |= GM_SMOD_LIMIT_4;
++	}
+ 
+ 	if (pAC->GIni.GIPortUsage == SK_JUMBO_LINK) {
+ 		/* enable jumbo mode (Max. Frame Length = 9018) */
+@@ -2021,11 +2139,13 @@ int		Port)		/* Port Index (MAC_1 + n) */
+ 	GM_OUT16(IoC, Port, GM_RX_IRQ_MSK, 0);
+ 	GM_OUT16(IoC, Port, GM_TR_IRQ_MSK, 0);
+ 
++#if defined(SK_DIAG) || defined(DEBUG)
+ 	/* read General Purpose Status */
+ 	GM_IN16(IoC, Port, GM_GP_STAT, &SWord);
+ 	
+ 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+-		("MAC Stat Reg=0x%04X\n", SWord));
++		("MAC Stat Reg.=0x%04X\n", SWord));
++#endif /* SK_DIAG || DEBUG */
+ 
+ #ifdef SK_DIAG
+ 	c_print("MAC Stat Reg=0x%04X\n", SWord);
+@@ -2226,6 +2346,7 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
+ 				SKERR_HWI_E015MSG);
+ 		}
+ 
++		/* Set Flow-control capabilities */
+ 		switch (pPrt->PFlowCtrlMode) {
+ 		case SK_FLOW_MODE_NONE:
+ 			Ctrl |= PHY_X_P_NO_PAUSE;
+@@ -2306,7 +2427,9 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
+ 		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+ 			("InitPhyBcom: no auto-negotiation Port %d\n", Port));
+ 		/* Set DuplexMode in Config register */
+-		Ctrl1 |= (pPrt->PLinkMode == SK_LMODE_FULL ? PHY_CT_DUP_MD : 0);
++		if (pPrt->PLinkMode == SK_LMODE_FULL) {
++			Ctrl1 |= PHY_CT_DUP_MD;
++		}
+ 
+ 		/* Determine Master/Slave manually if not already done */
+ 		if (pPrt->PMSMode == SK_MS_MODE_AUTO) {
+@@ -2346,6 +2469,7 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
+ 				SKERR_HWI_E015MSG);
+ 		}
+ 
++		/* Set Flow-control capabilities */
+ 		switch (pPrt->PFlowCtrlMode) {
+ 		case SK_FLOW_MODE_NONE:
+ 			Ctrl3 |= PHY_B_P_NO_PAUSE;
+@@ -2375,12 +2499,12 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
+ 	/* Write 1000Base-T Control Register */
+ 	SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_1000T_CTRL, Ctrl2);
+ 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+-		("1000B-T Ctrl Reg=0x%04X\n", Ctrl2));
++		("Set 1000B-T Ctrl Reg=0x%04X\n", Ctrl2));
+ 	
+ 	/* Write AutoNeg Advertisement Register */
+ 	SkXmPhyWrite(pAC, IoC, Port, PHY_BCOM_AUNE_ADV, Ctrl3);
+ 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+-		("Auto-Neg.Adv.Reg=0x%04X\n", Ctrl3));
++		("Set Auto-Neg.Adv.Reg=0x%04X\n", Ctrl3));
+ 	
+ 	if (DoLoop) {
+ 		/* Set the Phy Loopback bit, too */
+@@ -2409,6 +2533,281 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
+ 
+ 
+ #ifdef YUKON
++#ifndef SK_SLIM
++/******************************************************************************
++ *
++ *	SkGmEnterLowPowerMode()
++ *
++ * Description:	
++ *	This function sets the Marvell Alaska PHY to the low power mode
++ *	given by parameter mode.
++ *	The following low power modes are available:
++ *		
++ *		- Coma Mode (Deep Sleep):
++ *			Power consumption: ~15 - 30 mW
++ *			The PHY cannot wake up on its own.
++ *
++ *		- IEEE 22.2.4.1.5 compatible power down mode
++ *			Power consumption: ~240 mW
++ *			The PHY cannot wake up on its own.
++ *
++ *		- energy detect mode
++ *			Power consumption: ~160 mW
++ *			The PHY can wake up on its own by detecting activity
++ *			on the CAT 5 cable.
++ *
++ *		- energy detect plus mode
++ *			Power consumption: ~150 mW
++ *			The PHY can wake up on its own by detecting activity
++ *			on the CAT 5 cable.
++ *			Connected devices can be woken up by sending normal link
++ *			pulses every one second.
++ *
++ * Note:
++ *
++ * Returns:
++ *		0: ok
++ *		1: error
++ */
++int SkGmEnterLowPowerMode(
++SK_AC	*pAC,		/* adapter context */
++SK_IOC	IoC,		/* IO context */
++int		Port,		/* Port Index (e.g. MAC_1) */
++SK_U8	Mode)		/* low power mode */
++{
++	SK_U16	Word;
++	SK_U32	DWord;
++	SK_U8	LastMode;
++	int		Ret = 0;
++
++	if (pAC->GIni.GIYukonLite &&
++	    pAC->GIni.GIChipRev == CHIP_REV_YU_LITE_A3) {
++
++		/* save current power mode */
++		LastMode = pAC->GIni.GP[Port].PPhyPowerState;
++		pAC->GIni.GP[Port].PPhyPowerState = Mode;
++
++		switch (Mode) {
++			/* coma mode (deep sleep) */
++			case PHY_PM_DEEP_SLEEP:
++				/* setup General Purpose Control Register */
++				GM_OUT16(IoC, 0, GM_GP_CTRL, GM_GPCR_FL_PASS |
++					GM_GPCR_SPEED_100 | GM_GPCR_AU_ALL_DIS);
++
++				/* apply COMA mode workaround */
++				SkGmPhyWrite(pAC, IoC, Port, 29, 0x001f);
++				SkGmPhyWrite(pAC, IoC, Port, 30, 0xfff3);
++
++				SK_IN32(IoC, PCI_C(PCI_OUR_REG_1), &DWord);
++
++				SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_ON);
++				
++				/* Set PHY to Coma Mode */
++				SK_OUT32(IoC, PCI_C(PCI_OUR_REG_1), DWord | PCI_PHY_COMA);
++				
++				SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
++
++			break;
++			
++			/* IEEE 22.2.4.1.5 compatible power down mode */
++			case PHY_PM_IEEE_POWER_DOWN:
++				/*
++				 * - disable MAC 125 MHz clock
++				 * - allow MAC power down
++				 */
++				SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_CTRL, &Word);
++				Word |= PHY_M_PC_DIS_125CLK;
++				Word &=	~PHY_M_PC_MAC_POW_UP;
++				SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL, Word);
++
++				/*
++				 * register changes must be followed by a software
++				 * reset to take effect
++				 */
++				SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CTRL, &Word);
++				Word |= PHY_CT_RESET;
++				SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_CTRL, Word);
++
++				/* switch IEEE compatible power down mode on */
++				SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CTRL, &Word);
++				Word |= PHY_CT_PDOWN;
++				SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_CTRL, Word);
++			break;
++
++			/* energy detect and energy detect plus mode */
++			case PHY_PM_ENERGY_DETECT:
++			case PHY_PM_ENERGY_DETECT_PLUS:
++				/*
++				 * - disable MAC 125 MHz clock
++				 */
++				SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_CTRL, &Word);
++				Word |= PHY_M_PC_DIS_125CLK;
++				SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL, Word);
++				
++				/* activate energy detect mode 1 */
++				SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_CTRL, &Word);
++
++				/* energy detect mode */
++				if (Mode == PHY_PM_ENERGY_DETECT) {
++					Word |= PHY_M_PC_EN_DET;
++				}
++				/* energy detect plus mode */
++				else {
++					Word |= PHY_M_PC_EN_DET_PLUS;
++				}
++
++				SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL, Word);
++
++				/*
++				 * reinitialize the PHY to force a software reset
++				 * which is necessary after the register settings
++				 * for the energy detect modes.
++				 * Furthermore reinitialisation prevents that the
++				 * PHY is running out of a stable state.
++				 */
++				SkGmInitPhyMarv(pAC, IoC, Port, SK_FALSE);
++			break;
++
++			/* don't change current power mode */
++			default:
++				pAC->GIni.GP[Port].PPhyPowerState = LastMode;
++				Ret = 1;
++			break;
++		}
++	}
++	/* low power modes are not supported by this chip */
++	else {
++		Ret = 1;
++	}
++
++	return(Ret);
++
++}	/* SkGmEnterLowPowerMode */
++
++/******************************************************************************
++ *
++ *	SkGmLeaveLowPowerMode()
++ *
++ * Description:	
++ *	Leave the current low power mode and switch to normal mode
++ *
++ * Note:
++ *
++ * Returns:
++ *		0:	ok
++ *		1:	error
++ */
++int SkGmLeaveLowPowerMode(
++SK_AC	*pAC,		/* adapter context */
++SK_IOC	IoC,		/* IO context */
++int		Port)		/* Port Index (e.g. MAC_1) */
++{
++	SK_U32	DWord;
++	SK_U16	Word;
++	SK_U8	LastMode;
++	int		Ret = 0;
++
++	if (pAC->GIni.GIYukonLite &&
++		pAC->GIni.GIChipRev == CHIP_REV_YU_LITE_A3) {
++
++		/* save current power mode */
++		LastMode = pAC->GIni.GP[Port].PPhyPowerState;
++		pAC->GIni.GP[Port].PPhyPowerState = PHY_PM_OPERATIONAL_MODE;
++
++		switch (LastMode) {
++			/* coma mode (deep sleep) */
++			case PHY_PM_DEEP_SLEEP:
++				SK_IN32(IoC, PCI_C(PCI_OUR_REG_1), &DWord);
++
++				SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_ON);
++				
++				/* Release PHY from Coma Mode */
++				SK_OUT32(IoC, PCI_C(PCI_OUR_REG_1), DWord & ~PCI_PHY_COMA);
++				
++				SK_OUT8(IoC, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
++				
++				SK_IN32(IoC, B2_GP_IO, &DWord);
++
++				/* set to output */
++				DWord |= (GP_DIR_9 | GP_IO_9);
++
++				/* set PHY reset */
++				SK_OUT32(IoC, B2_GP_IO, DWord);
++
++				DWord &= ~GP_IO_9; /* clear PHY reset (active high) */
++
++				/* clear PHY reset */
++				SK_OUT32(IoC, B2_GP_IO, DWord);
++			break;
++			
++			/* IEEE 22.2.4.1.5 compatible power down mode */
++			case PHY_PM_IEEE_POWER_DOWN:
++				/*
++				 * - enable MAC 125 MHz clock
++				 * - set MAC power up
++				 */
++				SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_CTRL, &Word);
++				Word &= ~PHY_M_PC_DIS_125CLK;
++				Word |=	PHY_M_PC_MAC_POW_UP;
++				SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL, Word);
++
++				/*
++				 * register changes must be followed by a software
++				 * reset to take effect
++				 */
++				SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CTRL, &Word);
++				Word |= PHY_CT_RESET;
++				SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_CTRL, Word);
++
++				/* switch IEEE compatible power down mode off */
++				SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CTRL, &Word);
++				Word &= ~PHY_CT_PDOWN;
++				SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_CTRL, Word);
++			break;
++
++			/* energy detect and energy detect plus mode */
++			case PHY_PM_ENERGY_DETECT:
++			case PHY_PM_ENERGY_DETECT_PLUS:
++				/*
++				 * - enable MAC 125 MHz clock
++				 */
++				SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_CTRL, &Word);
++				Word &= ~PHY_M_PC_DIS_125CLK;
++				SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL, Word);
++				
++				/* disable energy detect mode */
++				SkGmPhyRead(pAC, IoC, Port, PHY_MARV_PHY_CTRL, &Word);
++				Word &= ~PHY_M_PC_EN_DET_MSK;
++				SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL, Word);
++
++				/*
++				 * reinitialize the PHY to force a software reset
++				 * which is necessary after the register settings
++				 * for the energy detect modes.
++				 * Furthermore reinitialisation prevents that the
++				 * PHY is running out of a stable state.
++				 */
++				SkGmInitPhyMarv(pAC, IoC, Port, SK_FALSE);
++			break;
++
++			/* don't change current power mode */
++			default:
++				pAC->GIni.GP[Port].PPhyPowerState = LastMode;
++				Ret = 1;
++			break;
++		}
++	}
++	/* low power modes are not supported by this chip */
++	else {
++		Ret = 1;
++	}
++
++	return(Ret);
++
++}	/* SkGmLeaveLowPowerMode */
++#endif /* !SK_SLIM */
++
++
+ /******************************************************************************
+  *
+  *	SkGmInitPhyMarv() - Initialize the Marvell Phy registers
+@@ -2457,7 +2856,6 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
+ 	VCPUprintf(0, "SkGmInitPhyMarv(), Port=%u, DoLoop=%u\n",
+ 		Port, DoLoop);
+ #else /* VCPU */
+-	
+ 	if (DoLoop) {
+ 		/* Set 'MAC Power up'-bit, set Manual MDI configuration */
+ 		SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_PHY_CTRL,
+@@ -2475,16 +2873,20 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
+ 	
+ 		SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_EXT_CTRL, ExtPhyCtrl);
+ 		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+-			("Ext. PHY Ctrl=0x%04X\n", ExtPhyCtrl));
++			("Set Ext. PHY Ctrl=0x%04X\n", ExtPhyCtrl));
+ 	}
+ 
+ 	/* Read PHY Control */
+ 	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_CTRL, &PhyCtrl);
+ 
++	if (!AutoNeg) {
++		/* Disable Auto-negotiation */
++		PhyCtrl &= ~PHY_CT_ANE;
++	}
++
+ 	PhyCtrl |= PHY_CT_RESET;
+ 	/* Assert software reset */
+ 	SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_CTRL, PhyCtrl);
+-
+ #endif /* VCPU */
+ 
+ 	PhyCtrl = 0 /* PHY_CT_COL_TST */;
+@@ -2533,13 +2935,9 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
+ 		if (!DoLoop) {
+ 			PhyCtrl |= PHY_CT_RESET;
+ 		}
+-		/*
+-		 * Do NOT enable Auto-negotiation here. This would hold
+-		 * the link down because no IDLES are transmitted
+-		 */
+ 	}
+ 	else {
+-		PhyCtrl |= PHY_CT_ANE;
++		/* Set Auto-negotiation advertisement */
+ 		
+ 		if (pAC->GIni.GICopperType) {
+ 			/* Set Speed capabilities */
+@@ -2554,6 +2952,7 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
+ 				break;
+ 			case SK_LSPEED_100MBPS:
+ 				AutoNegAdv |= PHY_M_AN_100_FD | PHY_M_AN_100_HD |
++					/* advertise 10Base-T also */
+ 					PHY_M_AN_10_FD | PHY_M_AN_10_HD;
+ 				break;
+ 			case SK_LSPEED_10MBPS:
+@@ -2581,7 +2980,7 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
+ 					SKERR_HWI_E015MSG);
+ 			}
+ 			
+-			/* Set Auto-negotiation advertisement */
++			/* Set Flow-control capabilities */
+ 			switch (pPrt->PFlowCtrlMode) {
+ 			case SK_FLOW_MODE_NONE:
+ 				AutoNegAdv |= PHY_B_P_NO_PAUSE;
+@@ -2618,7 +3017,7 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
+ 					SKERR_HWI_E015MSG);
+ 			}
+ 			
+-			/* Set Auto-negotiation advertisement */
++			/* Set Flow-control capabilities */
+ 			switch (pPrt->PFlowCtrlMode) {
+ 			case SK_FLOW_MODE_NONE:
+ 				AutoNegAdv |= PHY_M_P_NO_PAUSE_X;
+@@ -2640,7 +3039,7 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
+ 
+ 		if (!DoLoop) {
+ 			/* Restart Auto-negotiation */
+-			PhyCtrl |= PHY_CT_RE_CFG;
++			PhyCtrl |= PHY_CT_ANE | PHY_CT_RE_CFG;
+ 		}
+ 	}
+ 	
+@@ -2659,12 +3058,12 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
+ 	/* Write 1000Base-T Control Register */
+ 	SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_1000T_CTRL, C1000BaseT);
+ 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+-		("1000B-T Ctrl=0x%04X\n", C1000BaseT));
++		("Set 1000B-T Ctrl =0x%04X\n", C1000BaseT));
+ 	
+ 	/* Write AutoNeg Advertisement Register */
+ 	SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_AUNE_ADV, AutoNegAdv);
+ 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+-		("Auto-Neg.Ad.=0x%04X\n", AutoNegAdv));
++		("Set Auto-Neg.Adv.=0x%04X\n", AutoNegAdv));
+ #endif /* VCPU */
+ 	
+ 	if (DoLoop) {
+@@ -2694,6 +3093,8 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
+ 
+ 	/* Write to the PHY Control register */
+ 	SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_CTRL, PhyCtrl);
++	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
++		("Set PHY Ctrl Reg.=0x%04X\n", PhyCtrl));
+ 
+ #ifdef VCPU
+ 	VCpuWait(2000);
+@@ -2712,7 +3113,7 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
+ 	SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_LED_CTRL, LedCtrl);
+ 
+ 	if ((pAC->GIni.GILedBlinkCtrl & SK_LED_LINK100_ON) != 0) {
+-		/* only in forced 100Mbps mode */
++		/* only in forced 100 Mbps mode */
+ 		if (!AutoNeg && pPrt->PLinkSpeed == SK_LSPEED_100MBPS) {
+ 
+ 			SkGmPhyWrite(pAC, IoC, Port, PHY_MARV_LED_OVER,
+@@ -2741,7 +3142,7 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
+ 	/* Read AutoNeg Advertisement Register */
+ 	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_AUNE_ADV, &AutoNegAdv);
+ 	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+-		("Auto-Neg. Ad.=0x%04X\n", AutoNegAdv));
++		("Auto-Neg.Adv.=0x%04X\n", AutoNegAdv));
+ 	
+ 	/* Read Ext. PHY Specific Control */
+ 	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_EXT_CTRL, &ExtPhyCtrl);
+@@ -2818,13 +3219,15 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
+ 	/* Auto-negotiation ? */
+ 	if (pPrt->PLinkMode == SK_LMODE_HALF || pPrt->PLinkMode == SK_LMODE_FULL) {
+ 		/*
+-		 * level one spec say: "1000Mbps: manual mode not allowed"
++		 * level one spec say: "1000 Mbps: manual mode not allowed"
+ 		 * but lets see what happens...
+ 		 */
+ 		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+ 			("InitPhyLone: no auto-negotiation Port %d\n", Port));
+ 		/* Set DuplexMode in Config register */
+-		Ctrl1 = (pPrt->PLinkMode == SK_LMODE_FULL ? PHY_CT_DUP_MD : 0);
++		if (pPrt->PLinkMode == SK_LMODE_FULL) {
++			Ctrl1 |= PHY_CT_DUP_MD;
++		}
+ 
+ 		/* Determine Master/Slave manually if not already done */
+ 		if (pPrt->PMSMode == SK_MS_MODE_AUTO) {
+@@ -2857,6 +3260,7 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
+ 				SKERR_HWI_E015MSG);
+ 		}
+ 
++		/* Set Flow-control capabilities */
+ 		switch (pPrt->PFlowCtrlMode) {
+ 		case SK_FLOW_MODE_NONE:
+ 			Ctrl3 |= PHY_L_P_NO_PAUSE;
+@@ -2877,7 +3281,6 @@ SK_BOOL	DoLoop)		/* Should a Phy LoopBac
+ 
+ 		/* Restart Auto-negotiation */
+ 		Ctrl1 = PHY_CT_ANE | PHY_CT_RE_CFG;
+-
+ 	}
+ 	
+ 	/* Write 1000Base-T Control Register */
+@@ -3019,10 +3422,10 @@ int		Port)		/* Port Index (MAC_1 + n) */
+ 
+ 	/* Check Duplex mismatch */
+ 	if ((ResAb & (PHY_X_RS_HD | PHY_X_RS_FD)) == PHY_X_RS_FD) {
+-		pPrt->PLinkModeStatus = SK_LMODE_STAT_AUTOFULL;
++		pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_AUTOFULL;
+ 	}
+ 	else if ((ResAb & (PHY_X_RS_HD | PHY_X_RS_FD)) == PHY_X_RS_HD) {
+-		pPrt->PLinkModeStatus = SK_LMODE_STAT_AUTOHALF;
++		pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_AUTOHALF;
+ 	}
+ 	else {
+ 		/* Error */
+@@ -3055,7 +3458,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
+ 		/* PAUSE mismatch -> no PAUSE */
+ 		pPrt->PFlowCtrlStatus = SK_FLOW_STAT_NONE;
+ 	}
+-	pPrt->PLinkSpeedUsed = SK_LSPEED_STAT_1000MBPS;
++	pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_1000MBPS;
+ 
+ 	return(SK_AND_OK);
+ }	/* SkXmAutoNegDoneXmac */
+@@ -3110,10 +3513,10 @@ int		Port)		/* Port Index (MAC_1 + n) */
+ 
+ 	/* Check Duplex mismatch */
+ 	if ((AuxStat & PHY_B_AS_AN_RES_MSK) == PHY_B_RES_1000FD) {
+-		pPrt->PLinkModeStatus = SK_LMODE_STAT_AUTOFULL;
++		pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_AUTOFULL;
+ 	}
+ 	else if ((AuxStat & PHY_B_AS_AN_RES_MSK) == PHY_B_RES_1000HD) {
+-		pPrt->PLinkModeStatus = SK_LMODE_STAT_AUTOHALF;
++		pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_AUTOHALF;
+ 	}
+ 	else {
+ 		/* Error */
+@@ -3156,7 +3559,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
+ 		/* PAUSE mismatch -> no PAUSE */
+ 		pPrt->PFlowCtrlStatus = SK_FLOW_STAT_NONE;
+ 	}
+-	pPrt->PLinkSpeedUsed = SK_LSPEED_STAT_1000MBPS;
++	pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_1000MBPS;
+ 
+ 	return(SK_AND_OK);
+ }	/* SkXmAutoNegDoneBcom */
+@@ -3192,6 +3595,8 @@ int		Port)		/* Port Index (MAC_1 + n) */
+ 
+ 	/* Get PHY parameters */
+ 	SkGmPhyRead(pAC, IoC, Port, PHY_MARV_AUNE_LP, &LPAb);
++	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
++		("Link P.Abil.=0x%04X\n", LPAb));
+ 	
+ 	if ((LPAb & PHY_M_AN_RF) != 0) {
+ 		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+@@ -3222,15 +3627,15 @@ int		Port)		/* Port Index (MAC_1 + n) */
+ 		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
+ 			("AutoNegFail: Speed & Duplex not resolved, Port %d\n", Port));
+ 		pPrt->PAutoNegFail = SK_TRUE;
+-		pPrt->PLinkModeStatus = SK_LMODE_STAT_UNKNOWN;
++		pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_UNKNOWN;
+ 		return(SK_AND_DUP_CAP);
+ 	}
+ 	
+ 	if ((AuxStat & PHY_M_PS_FULL_DUP) != 0) {
+-		pPrt->PLinkModeStatus = SK_LMODE_STAT_AUTOFULL;
++		pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_AUTOFULL;
+ 	}
+ 	else {
+-		pPrt->PLinkModeStatus = SK_LMODE_STAT_AUTOHALF;
++		pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_AUTOHALF;
+ 	}
+ 	
+ 	/* Check PAUSE mismatch ??? */
+@@ -3255,13 +3660,13 @@ int		Port)		/* Port Index (MAC_1 + n) */
+ 	/* set used link speed */
+ 	switch ((unsigned)(AuxStat & PHY_M_PS_SPEED_MSK)) {
+ 	case (unsigned)PHY_M_PS_SPEED_1000:
+-		pPrt->PLinkSpeedUsed = SK_LSPEED_STAT_1000MBPS;
++		pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_1000MBPS;
+ 		break;
+ 	case PHY_M_PS_SPEED_100:
+-		pPrt->PLinkSpeedUsed = SK_LSPEED_STAT_100MBPS;
++		pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_100MBPS;
+ 		break;
+ 	default:
+-		pPrt->PLinkSpeedUsed = SK_LSPEED_STAT_10MBPS;
++		pPrt->PLinkSpeedUsed = (SK_U8)SK_LSPEED_STAT_10MBPS;
+ 	}
+ 
+ 	return(SK_AND_OK);
+@@ -3312,10 +3717,10 @@ int		Port)		/* Port Index (MAC_1 + n) */
+ 
+ 	/* Check Duplex mismatch */
+ 	if ((QuickStat & PHY_L_QS_DUP_MOD) != 0) {
+-		pPrt->PLinkModeStatus = SK_LMODE_STAT_AUTOFULL;
++		pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_AUTOFULL;
+ 	}
+ 	else {
+-		pPrt->PLinkModeStatus = SK_LMODE_STAT_AUTOHALF;
++		pPrt->PLinkModeStatus = (SK_U8)SK_LMODE_STAT_AUTOHALF;
+ 	}
+ 	
+ 	/* Check Master/Slave resolution */
+@@ -3338,6 +3743,7 @@ int		Port)		/* Port Index (MAC_1 + n) */
+ 	/* We are using IEEE 802.3z/D5.0 Table 37-4 */
+ 	/* we must manually resolve the abilities here */
+ 	pPrt->PFlowCtrlStatus = SK_FLOW_STAT_NONE;
++	
+ 	switch (pPrt->PFlowCtrlMode) {
+ 	case SK_FLOW_MODE_NONE:
+ 		/* default */
+@@ -3457,6 +3863,9 @@ int		Port)		/* Port Index (MAC_1 + n) */
+ 		return(Rtv);
+ 	}
+ 
++	SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_CTRL,
++		("AutoNeg done Port %d\n", Port));
++	
+ 	/* We checked everything and may now enable the link */
+ 	pPrt->PAutoNegFail = SK_FALSE;
+ 
+--- linux-2.6.0/drivers/net/skfp/skfddi.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/skfp/skfddi.c	2003-12-28 23:21:01.000000000 -0800
+@@ -39,12 +39,6 @@
+  *   are skfddi.c, h/types.h, h/osdef1st.h, h/targetos.h.
+  *   The others belong to the SysKonnect FDDI Hardware Module and
+  *   should better not be changed.
+- * NOTE:
+- *   Compiling this driver produces some warnings, but I did not fix
+- *   this, because the Hardware Module source is used for different
+- *   drivers, and fixing it for Linux might bring problems on other
+- *   projects. To keep the source common for all those drivers (and
+- *   thus simplify fixes to it), please do not clean it up!
+  *
+  * Modification History:
+  *              Date            Name    Description
+@@ -58,6 +52,7 @@
+  *		07-May-00	DM	64 bit fixes, new dma interface
+  *		31-Jul-03	DB	Audit copy_*_user in skfp_ioctl
+  *					  Daniele Bellucci <bellucda@tiscali.it>
++ *		03-Dec-03	SH	Convert to PCI device model
+  *
+  * Compilation options (-Dxxx):
+  *              DRIVERDEBUG     print lots of messages to log file
+@@ -70,7 +65,7 @@
+ 
+ /* Version information string - should be updated prior to */
+ /* each new release!!! */
+-#define VERSION		"2.06"
++#define VERSION		"2.07"
+ 
+ static const char *boot_msg = 
+ 	"SysKonnect FDDI PCI Adapter driver v" VERSION " for\n"
+@@ -80,15 +75,11 @@ static const char *boot_msg = 
+ 
+ #include <linux/module.h>
+ #include <linux/kernel.h>
+-#include <linux/string.h>
+-#include <linux/ptrace.h>
+ #include <linux/errno.h>
+ #include <linux/ioport.h>
+ #include <linux/slab.h>
+ #include <linux/interrupt.h>
+ #include <linux/pci.h>
+-#include <linux/delay.h>
+-#include <linux/ctype.h>	// isdigit
+ #include <linux/netdevice.h>
+ #include <linux/fddidevice.h>
+ #include <linux/skbuff.h>
+@@ -106,17 +97,7 @@ static const char *boot_msg = 
+ #include	"h/smtstate.h"
+ 
+ 
+-// Define global routines
+-int skfp_probe(struct net_device *dev);
+-
+-
+ // Define module-wide (static) routines
+-static struct net_device *alloc_device(struct net_device *dev, u_long iobase);
+-static struct net_device *insert_device(struct net_device *dev,
+-				    int (*init) (struct net_device *));
+-static int fddi_dev_index(unsigned char *s);
+-static void init_dev(struct net_device *dev, u_long iobase);
+-static void link_modules(struct net_device *dev, struct net_device *tmp);
+ static int skfp_driver_init(struct net_device *dev);
+ static int skfp_open(struct net_device *dev);
+ static int skfp_close(struct net_device *dev);
+@@ -193,15 +174,6 @@ MODULE_AUTHOR("Mirko Lindner <mlindner@s
+ // Define module-wide (static) variables
+ 
+ static int num_boards;	/* total number of adapters configured */
+-static int num_fddi;
+-static int autoprobed;
+-
+-#ifdef MODULE
+-static struct net_device *unlink_modules(struct net_device *p);
+-static int loading_module = 1;
+-#else
+-static int loading_module;
+-#endif				// MODULE
+ 
+ #ifdef DRIVERDEBUG
+ #define PRINTK(s, args...) printk(s, ## args)
+@@ -212,9 +184,9 @@ static int loading_module;
+ #define PRIV(dev) (&(((struct s_smc *)dev->priv)->os))
+ 
+ /*
+- * ==============
+- * = skfp_probe =
+- * ==============
++ * =================
++ * = skfp_init_one =
++ * =================
+  *   
+  * Overview:
+  *   Probes for supported FDDI PCI controllers
+@@ -223,30 +195,11 @@ static int loading_module;
+  *   Condition code
+  *       
+  * Arguments:
+- *   dev - pointer to device information
++ *   pdev - pointer to PCI device information
+  *
+  * Functional Description:
+- *   This routine is called by the OS for each FDDI device name (fddi0,
+- *   fddi1,...,fddi6, fddi7) specified in drivers/net/Space.c.
+- *   If loaded as a module, it will detect and initialize all 
+- *   adapters the first time it is called.
+- *
+- *   Let's say that skfp_probe() is getting called to initialize fddi0.
+- *   Furthermore, let's say there are three supported controllers in the
+- *   system.  Before skfp_probe() leaves, devices fddi0, fddi1, and fddi2
+- *   will be initialized and a global flag will be set to indicate that
+- *   skfp_probe() has already been called.
+- *
+- *   However...the OS doesn't know that we've already initialized
+- *   devices fddi1 and fddi2 so skfp_probe() gets called again and again
+- *   until it reaches the end of the device list for FDDI (presently,
+- *   fddi7).  It's important that the driver "pretend" to probe for
+- *   devices fddi1 and fddi2 and return success.  Devices fddi3
+- *   through fddi7 will return failure since they weren't initialized.
+- *
+- *   This algorithm seems to work for the time being.  As other FDDI
+- *   drivers are written for Linux, a more generic approach (perhaps
+- *   similar to the Ethernet card approach) may need to be implemented.
++ *   This is now called by PCI driver registration process
++ *   for each board found.
+  *   
+  * Return Codes:
+  *   0           - This device (fddi0, fddi1, etc) configured successfully
+@@ -259,374 +212,176 @@ static int loading_module;
+  *   initialized and the board resources are read and stored in
+  *   the device structure.
+  */
+-int skfp_probe(struct net_device *dev)
++static int skfp_init_one(struct pci_dev *pdev,
++				const struct pci_device_id *ent)
+ {
+-	int i;			/* used in for loops */
+-	struct pci_dev *pdev = NULL;	/* PCI device structure */
+-#ifndef MEM_MAPPED_IO
+-	u16 port;		/* temporary I/O (port) address */
+-	int port_len;		/* length of port address range (in bytes) */
+-#else
+-	unsigned long port;
+-#endif
+-	u16 command;	/* PCI Configuration space Command register val */
++	struct net_device *dev;
+ 	struct s_smc *smc;	/* board pointer */
+-	struct net_device *tmp = dev;
+-	u8 first_dev_used = 0;
+-	u16 SubSysId;
++	u32 port, len;
++	int err;
+ 
+-	PRINTK(KERN_INFO "entering skfp_probe\n");
+-
+-	/*
+-	 * Verify whether we're going through skfp_probe() again
+-	 *
+-	 * If so, see if we're going through for a subsequent fddi device that
+-	 * we've already initialized.  If we are, return success (0).  If not,
+-	 * return failure (-ENODEV).
+-	 */
+-
+-	if (autoprobed) {
+-		PRINTK(KERN_INFO "Already entered skfp_probe\n");
+-		if (dev != NULL) {
+-			if ((strncmp(dev->name, "fddi", 4) == 0) &&
+-			    (dev->base_addr != 0)) {
+-				return (0);
+-			}
+-			return (-ENODEV);
+-		}
+-	}
+-	autoprobed = 1;		/* set global flag */
++	PRINTK(KERN_INFO "entering skfp_init_one\n");
+ 
+-	printk("%s\n", boot_msg);
++	if (num_boards == 0) 
++		printk("%s\n", boot_msg);
+ 
+-	/* Scan for Syskonnect FDDI PCI controllers */
+-	for (i = 0; i < SKFP_MAX_NUM_BOARDS; i++) {	// scan for PCI cards
+-		PRINTK(KERN_INFO "Check device %d\n", i);
+-		if ((pdev=pci_find_device(PCI_VENDOR_ID_SK, PCI_DEVICE_ID_SK_FP,
+-			pdev)) == 0) {
+-			break;
+-		}
+-		if (pci_enable_device(pdev))
+-			continue;
++	err = pci_enable_device(pdev);
++	if (err)
++		goto err_out1;
+ 
+-#ifndef MEM_MAPPED_IO
+-		/* Verify that I/O enable bit is set (PCI slot is enabled) */
+-		pci_read_config_word(pdev, PCI_COMMAND, &command);
+-		if ((command & PCI_COMMAND_IO) == 0) {
+-			PRINTK("I/O enable bit not set!");
+-			PRINTK(" Verify that slot is enabled\n");
+-			continue;
+-		}
+ 
+-		/* Turn off memory mapped space and enable mastering */
++#ifdef MEM_MAPPED_IO
++	if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) {
++		printk(KERN_ERR "skfp: region is not an MMIO resource\n");
++		err = -EIO;
++		goto err_out1;
++	}
++	port = pci_resource_start(pdev, 0);
++	len = pci_resource_len(pdev, 0);
+ 
+-		PRINTK(KERN_INFO "Command Reg: %04x\n", command);
+-		command |= PCI_COMMAND_MASTER;
+-		command &= ~PCI_COMMAND_MEMORY;
+-		pci_write_config_word(pdev, PCI_COMMAND, command);
+-
+-		/* Read I/O base address from PCI Configuration Space */
+-
+-		pci_read_config_word(pdev, PCI_BASE_ADDRESS_1, &port);
+-		port &= PCI_BASE_ADDRESS_IO_MASK; // clear I/O bit (bit 0)
+-
+-		/* Verify port address range is not already being used */
+-
+-		port_len = FP_IO_LEN;
+-		if (check_region(port, port_len) != 0) {
+-			printk("I/O range allocated to adapter");
+-			printk(" (0x%X-0x%X) is already being used!\n", port,
+-			       (port + port_len - 1));
+-			continue;
+-		}
++	if (len < 0x4000) {
++		printk(KERN_ERR "skfp: Invalid PCI region size: %d\n", len);
++		err = -EIO;
++		goto err_out1;
++	}
+ #else
+-		/* Verify that MEM enable bit is set (PCI slot is enabled) */
+-		pci_read_config_word(pdev, PCI_COMMAND, &command);
+-		if ((command & PCI_COMMAND_MEMORY) == 0) {
+-			PRINTK("MEMORY-I/O enable bit not set!");
+-			PRINTK(" Verify that slot is enabled\n");
+-			continue;
+-		}
+-
+-		/* Turn off IO mapped space and enable mastering */
+-
+-		PRINTK(KERN_INFO "Command Reg: %04x\n", command);
+-		command |= PCI_COMMAND_MASTER;
+-		command &= ~PCI_COMMAND_IO;
+-		pci_write_config_word(pdev, PCI_COMMAND, command);
+-
+-		port = pci_resource_start(pdev, 0);
+-
+-		port = (unsigned long)ioremap(port, 0x4000);
+-		if (!port){
+-			printk("skfp:  Unable to map MEMORY register, "
+-			"FDDI adapter will be disabled.\n");
+-			break;
+-		}
+-#endif
+-
+-		if ((!loading_module) || first_dev_used) {
+-			/* Allocate a device structure for this adapter */
+-			tmp = alloc_device(dev, port);
+-		}
+-		first_dev_used = 1;	// only significant first time
+-
+-		pci_read_config_word(pdev, PCI_SUBSYSTEM_ID, &SubSysId);
+-
+-		if (tmp != NULL) {
+-			if (loading_module)
+-				link_modules(dev, tmp);
+-			dev = tmp;
+-			init_dev(dev, port);
+-			dev->irq = pdev->irq;
+-
+-			/* Initialize board structure with bus-specific info */
+-
+-			smc = (struct s_smc *) dev->priv;
+-			smc->os.dev = dev;
+-			smc->os.bus_type = SK_BUS_TYPE_PCI;
+-			smc->os.pdev = *pdev;
+-			smc->os.QueueSkb = MAX_TX_QUEUE_LEN;
+-			smc->os.MaxFrameSize = MAX_FRAME_SIZE;
+-			smc->os.dev = dev;
+-			smc->hw.slot = -1;
+-			smc->os.ResetRequested = FALSE;
+-			skb_queue_head_init(&smc->os.SendSkbQueue);
+-
+-			if (skfp_driver_init(dev) == 0) {
+-				// only increment global board 
+-				// count on success
+-				num_boards++;
+-				request_region(dev->base_addr,
+-					       FP_IO_LEN, dev->name);
+-				if ((SubSysId & 0xff00) == 0x5500 ||
+-					(SubSysId & 0xff00) == 0x5800) {
+-				printk("%s: SysKonnect FDDI PCI adapter"
+-				       " found (SK-%04X)\n", dev->name,
+-					SubSysId);
+-				} else {
+-				printk("%s: FDDI PCI adapter found\n",
+-					dev->name);
+-				}
+-			} else {
+-				kfree(dev);
+-				i = SKFP_MAX_NUM_BOARDS;	// stop search
+-
+-			}
+-
+-		}		// if (dev != NULL)
+-
+-	}			// for SKFP_MAX_NUM_BOARDS
+-
+-	/*
+-	 * If we're at this point we're going through skfp_probe() for the
+-	 * first time. Return success (0) if we've initialized 1 or more
+-	 * boards. Otherwise, return failure (-ENODEV).
+-	 */
+-
+-	if (num_boards > 0)
+-		return (0);
+-	else {
+-		printk("no SysKonnect FDDI adapter found\n");
+-		return (-ENODEV);
++	if (!(pci_resource_flags(pdev, 1) & IO_RESOURCE_IO)) {
++		printk(KERN_ERR "skfp: region is not PIO resource\n");
++		err = -EIO;
++		goto err_out1;
+ 	}
+-}				// skfp_probe
+-
+-
+-/************************
+- *
+- * Search the entire 'fddi' device list for a fixed probe. If a match isn't
+- * found then check for an autoprobe or unused device location. If they
+- * are not available then insert a new device structure at the end of
+- * the current list.
+- *
+- ************************/
+-static struct net_device *alloc_device(struct net_device *dev, u_long iobase)
+-{
+-	struct net_device *adev = NULL;
+-	int fixed = 0, new_dev = 0;
+-
+-	PRINTK(KERN_INFO "entering alloc_device\n");
+-	if (!dev)
+-		return dev;
+ 
+-	num_fddi = fddi_dev_index(dev->name);
+-	if (loading_module) {
+-		num_fddi++;
+-		dev = insert_device(dev, skfp_probe);
+-		return dev;
++	port = pci_resource_start(pdev, 1);
++	len = pci_resource_len(pdev, 1);
++	if (len < FP_IO_LEN) {
++		printk(KERN_ERR "skfp: Invalid PCI region size: %d\n",
++		       io_len);
++		err = -EIO;
++		goto err_out1;
+ 	}
+-	while (1) {
+-		if (((dev->base_addr == NO_ADDRESS) ||
+-		     (dev->base_addr == 0)) && !adev) {
+-			adev = dev;
+-		} else if ((dev->priv == NULL) && (dev->base_addr == iobase)) {
+-			fixed = 1;
+-		} else {
+-			if (dev->next == NULL) {
+-				new_dev = 1;
+-			} else if (strncmp(dev->next->name, "fddi", 4) != 0) {
+-				new_dev = 1;
+-			}
+-		}
+-		if ((dev->next == NULL) || new_dev || fixed)
+-			break;
+-		dev = dev->next;
+-		num_fddi++;
+-	}			// while (1)
+-
+-	if (adev && !fixed) {
+-		dev = adev;
+-		num_fddi = fddi_dev_index(dev->name);
+-		new_dev = 0;
+-	}
+-	if (((dev->next == NULL) && ((dev->base_addr != NO_ADDRESS) &&
+-				     (dev->base_addr != 0)) && !fixed) ||
+-	    new_dev) {
+-		num_fddi++;	/* New device */
+-		dev = insert_device(dev, skfp_probe);
+-	}
+-	if (dev) {
+-		if (!dev->priv) {
+-			/* Allocate space for private board structure */
+-			dev->priv = (void *) kmalloc(sizeof(struct s_smc),
+-						     GFP_KERNEL);
+-			if (dev->priv == NULL) {
+-				printk("%s: Could not allocate memory for",
+-					dev->name);
+-				printk(" private board structure!\n");
+-				return (NULL);
+-			}
+-			/* clear structure */
+-			memset(dev->priv, 0, sizeof(struct s_smc));
+-		}
++#endif
++	err = pci_request_regions(pdev, "skfddi");
++	if (err)
++		goto err_out1;
++
++	pci_set_master(pdev);
++
++	dev = alloc_fddidev(sizeof(struct s_smc));
++	if (!dev) {
++		printk(KERN_ERR "skfp: Unable to allocate fddi device, "
++				"FDDI adapter will be disabled.\n");
++		err = -ENOMEM;
++		goto err_out2;
++	}
++
++#ifdef MEM_MAPPED_IO
++	dev->base_addr = (unsigned long) ioremap(port, len);
++	if (!dev->base_addr) {
++		printk(KERN_ERR "skfp:  Unable to map MEMORY register, "
++				"FDDI adapter will be disabled.\n");
++		err = -EIO;
++		goto err_out3;
+ 	}
+-	return dev;
+-}				// alloc_device
+-
+-
+-
+-/************************
+- *
+- * Initialize device structure
+- *
+- ************************/
+-static void init_dev(struct net_device *dev, u_long iobase)
+-{
+-	/* Initialize new device structure */
+-
+-	dev->mem_end = 0;	/* shared memory isn't used */
+-	dev->mem_start = 0;	/* shared memory isn't used */
+-	dev->base_addr = iobase;	/* save port (I/O) base address */
+-	dev->if_port = 0;	/* not applicable to FDDI adapters */
+-	dev->dma = 0;		/* Bus Master DMA doesn't require channel */
+-	dev->irq = 0;
+-
+-	netif_start_queue(dev);
++#else
++	dev->base_addr = port;
++#endif
+ 
++	dev->irq = pdev->irq;
+ 	dev->get_stats = &skfp_ctl_get_stats;
+ 	dev->open = &skfp_open;
+ 	dev->stop = &skfp_close;
+ 	dev->hard_start_xmit = &skfp_send_pkt;
+-	dev->hard_header = NULL;	/* set in fddi_setup() */
+-	dev->rebuild_header = NULL;	/* set in fddi_setup() */
+ 	dev->set_multicast_list = &skfp_ctl_set_multicast_list;
+ 	dev->set_mac_address = &skfp_ctl_set_mac_address;
+ 	dev->do_ioctl = &skfp_ioctl;
+-	dev->set_config = NULL;	/* not supported for now &&& */
+ 	dev->header_cache_update = NULL;	/* not supported */
+-	dev->change_mtu = NULL;	/* set in fddi_setup() */
+ 
+ 	SET_MODULE_OWNER(dev);
++	SET_NETDEV_DEV(dev, &pdev->dev);
+ 
+-	/* Initialize remaining device structure information */
+-	fddi_setup(dev);
+-}				// init_device
+-
+-
+-/************************
+- *
+- * If at end of fddi device list and can't use current entry, malloc
+- * one up. If memory could not be allocated, print an error message.
+- *
+-************************/
+-static struct net_device *insert_device(struct net_device *dev,
+-				    int (*init) (struct net_device *))
+-{
+-	struct net_device *new;
+-	int len;
+-
+-	PRINTK(KERN_INFO "entering insert_device\n");
+-	len = sizeof(struct net_device) + sizeof(struct s_smc);
+-	new = (struct net_device *) kmalloc(len, GFP_KERNEL);
+-	if (new == NULL) {
+-		printk("fddi%d: Device not initialised, insufficient memory\n",
+-		       num_fddi);
+-		return NULL;
+-	} else {
+-		memset((char *) new, 0, len);
+-		new->priv = (struct s_smc *) (new + 1);
+-		new->init = init;	/* initialisation routine */
+-		if (!loading_module) {
+-			new->next = dev->next;
+-			dev->next = new;
+-		}
+-		/* create new device name */
+-		if (num_fddi > 999) {
+-			sprintf(new->name, "fddi????");
+-		} else {
+-			sprintf(new->name, "fddi%d", num_fddi);
+-		}
+-	}
+-	return new;
+-}				// insert_device
+-
+-
+-/************************
+- *
+- * Get the number of a "fddiX" string
+- *
+- ************************/
+-static int fddi_dev_index(unsigned char *s)
+-{
+-	int i = 0, j = 0;
+-
+-	for (; *s; s++) {
+-		if (isdigit(*s)) {
+-			j = 1;
+-			i = (i * 10) + (*s - '0');
+-		} else if (j)
+-			break;
+-	}
+-	return i;
+-}				// fddi_dev_index
++	/* Initialize board structure with bus-specific info */
++	smc = (struct s_smc *) dev->priv;
++	smc->os.dev = dev;
++	smc->os.bus_type = SK_BUS_TYPE_PCI;
++	smc->os.pdev = *pdev;
++	smc->os.QueueSkb = MAX_TX_QUEUE_LEN;
++	smc->os.MaxFrameSize = MAX_FRAME_SIZE;
++	smc->os.dev = dev;
++	smc->hw.slot = -1;
++	smc->os.ResetRequested = FALSE;
++	skb_queue_head_init(&smc->os.SendSkbQueue);
++
++	err = skfp_driver_init(dev);
++	if (err)
++		goto err_out4;
++
++	err = register_netdev(dev);
++	if (err)
++		goto err_out5;
++
++	++num_boards;
++	pci_set_drvdata(pdev, dev);
++
++	if ((pdev->subsystem_device & 0xff00) == 0x5500 ||
++	    (pdev->subsystem_device & 0xff00) == 0x5800) 
++		printk("%s: SysKonnect FDDI PCI adapter"
++		       " found (SK-%04X)\n", dev->name,	
++		       pdev->subsystem_device);
++	else
++		printk("%s: FDDI PCI adapter found\n", dev->name);
+ 
++	return 0;
++err_out5:
++	if (smc->os.SharedMemAddr) 
++		pci_free_consistent(pdev, smc->os.SharedMemSize,
++				    smc->os.SharedMemAddr, 
++				    smc->os.SharedMemDMA);
++	pci_free_consistent(pdev, MAX_FRAME_SIZE,
++			    smc->os.LocalRxBuffer, smc->os.LocalRxBufferDMA);
++err_out4:
++#ifdef MEM_MAPPED_IO
++	iounmap((void *) dev->base_addr);
++#endif
++err_out3:
++	free_netdev(dev);
++err_out2:
++	pci_release_regions(pdev);
++err_out1:
++	return err;
++}
+ 
+-/************************
+- *
+- * Used if loaded as module only. Link the device structures
+- * together. Needed to release them all at unload.
+- *
+-************************/
+-static void link_modules(struct net_device *dev, struct net_device *tmp)
++/*
++ * Called for each adapter board from pci_unregister_driver
++ */
++static void __devexit skfp_remove_one(struct pci_dev *pdev)
+ {
+-	struct net_device *p = dev;
++	struct net_device *p = pci_get_drvdata(pdev);
++	struct s_smc *lp = p->priv;
+ 
+-	if (p) {
+-		while (((struct s_smc *) (p->priv))->os.next_module) {
+-			p = ((struct s_smc *) (p->priv))->os.next_module;
+-		}
++	unregister_netdev(p);
+ 
+-		if (dev != tmp) {
+-			((struct s_smc *) (p->priv))->os.next_module = tmp;
+-		} else {
+-			((struct s_smc *) (p->priv))->os.next_module = NULL;
+-		}
++	if (lp->os.SharedMemAddr) {
++		pci_free_consistent(&lp->os.pdev,
++				    lp->os.SharedMemSize,
++				    lp->os.SharedMemAddr,
++				    lp->os.SharedMemDMA);
++		lp->os.SharedMemAddr = NULL;
++	}
++	if (lp->os.LocalRxBuffer) {
++		pci_free_consistent(&lp->os.pdev,
++				    MAX_FRAME_SIZE,
++				    lp->os.LocalRxBuffer,
++				    lp->os.LocalRxBufferDMA);
++		lp->os.LocalRxBuffer = NULL;
+ 	}
+-	return;
+-}				// link_modules
+-
++#ifdef MEM_MAPPED_IO
++	iounmap((void *) p->base_addr);
++#endif
++	pci_release_regions(pdev);
++	free_netdev(p);
+ 
++	pci_set_drvdata(pdev, NULL);
++}
+ 
+ /*
+  * ====================
+@@ -653,11 +408,11 @@ static void link_modules(struct net_devi
+  *    0 - initialization succeeded
+  *   -1 - initialization failed
+  */
+-static int skfp_driver_init(struct net_device *dev)
++static  int skfp_driver_init(struct net_device *dev)
+ {
+ 	struct s_smc *smc = (struct s_smc *) dev->priv;
+ 	skfddi_priv *bp = PRIV(dev);
+-	u8 val;			/* used for I/O read/writes */
++	int err = -EIO;
+ 
+ 	PRINTK(KERN_INFO "entering skfp_driver_init\n");
+ 
+@@ -666,9 +421,7 @@ static int skfp_driver_init(struct net_d
+ 	smc->hw.iop = dev->base_addr;
+ 
+ 	// Get the interrupt level from the PCI Configuration Table
+-	val = dev->irq;
+-
+-	smc->hw.irq = val;
++	smc->hw.irq = dev->irq;
+ 
+ 	spin_lock_init(&bp->DriverLock);
+ 	
+@@ -738,7 +491,7 @@ fail:
+ 				    bp->LocalRxBuffer, bp->LocalRxBufferDMA);
+ 		bp->LocalRxBuffer = NULL;
+ 	}
+-	return (-1);
++	return err;
+ }				// skfp_driver_init
+ 
+ 
+@@ -766,14 +519,15 @@ fail:
+ static int skfp_open(struct net_device *dev)
+ {
+ 	struct s_smc *smc = (struct s_smc *) dev->priv;
++	int err;
+ 
+ 	PRINTK(KERN_INFO "entering skfp_open\n");
+ 	/* Register IRQ - support shared interrupts by passing device ptr */
+-	if (request_irq(dev->irq, (void *) skfp_interrupt, SA_SHIRQ,
+-			dev->name, dev)) {
+-		printk("%s: Requested IRQ %d is busy\n", dev->name, dev->irq);
+-		return (-EAGAIN);
+-	}
++	err = request_irq(dev->irq, (void *) skfp_interrupt, SA_SHIRQ,
++			  dev->name, dev);
++	if (err)
++		return err;
++
+ 	/*
+ 	 * Set current address to factory MAC address
+ 	 *
+@@ -797,6 +551,7 @@ static int skfp_open(struct net_device *
+ 	/* Disable promiscuous filter settings */
+ 	mac_drv_rx_mode(smc, RX_DISABLE_PROMISC);
+ 
++	netif_start_queue(dev);
+ 	return (0);
+ }				// skfp_open
+ 
+@@ -831,7 +586,6 @@ static int skfp_open(struct net_device *
+ static int skfp_close(struct net_device *dev)
+ {
+ 	struct s_smc *smc = (struct s_smc *) dev->priv;
+-	struct sk_buff *skb;
+ 	skfddi_priv *bp = PRIV(dev);
+ 
+ 	CLI_FBI();
+@@ -844,13 +598,8 @@ static int skfp_close(struct net_device 
+ 	/* Deregister (free) IRQ */
+ 	free_irq(dev->irq, dev);
+ 
+-	for (;;) {
+-		skb = skb_dequeue(&bp->SendSkbQueue);
+-		if (skb == NULL)
+-			break;
+-		bp->QueueSkb++;
+-		dev_kfree_skb(skb);
+-	}
++	skb_queue_purge(&bp->SendSkbQueue);
++	bp->QueueSkb = MAX_TX_QUEUE_LEN;
+ 
+ 	return (0);
+ }				// skfp_close
+@@ -1285,6 +1034,8 @@ static int skfp_ioctl(struct net_device 
+ 		break;
+ 	default:
+ 		printk("ioctl for %s: unknow cmd: %04x\n", dev->name, ioc.cmd);
++		status = -EOPNOTSUPP;
++
+ 	}			// switch
+ 
+ 	return status;
+@@ -2538,63 +2289,21 @@ void drv_reset_indication(struct s_smc *
+ 
+ }				// drv_reset_indication
+ 
+-
+-static struct net_device *mdev;
++static struct pci_driver skfddi_pci_driver = {
++	.name		= "skfddi",
++	.id_table	= skfddi_pci_tbl,
++	.probe		= skfp_init_one,
++	.remove		= __devexit_p(skfp_remove_one),
++};
+ 
+ static int __init skfd_init(void)
+ {
+-	struct net_device *p;
+-
+-	if ((mdev = insert_device(NULL, skfp_probe)) == NULL)
+-		return -ENOMEM;
+-
+-	for (p = mdev; p != NULL; p = ((struct s_smc *)p->priv)->os.next_module) {
+-		if (register_netdev(p) != 0) {
+-			printk("skfddi init_module failed\n");
+-			return -EIO;
+-		}
+-	}
+-
+-	return 0;
++	return pci_module_init(&skfddi_pci_driver);
+ }
+ 
+-static struct net_device *unlink_modules(struct net_device *p)
+-{
+-	struct net_device *next = NULL;
+-
+-	if (p->priv) {		/* Private areas allocated? */
+-		struct s_smc *lp = (struct s_smc *) p->priv;
+-
+-		next = lp->os.next_module;
+-
+-		if (lp->os.SharedMemAddr) {
+-			pci_free_consistent(&lp->os.pdev,
+-					    lp->os.SharedMemSize,
+-					    lp->os.SharedMemAddr,
+-					    lp->os.SharedMemDMA);
+-			lp->os.SharedMemAddr = NULL;
+-		}
+-		if (lp->os.LocalRxBuffer) {
+-			pci_free_consistent(&lp->os.pdev,
+-					    MAX_FRAME_SIZE,
+-					    lp->os.LocalRxBuffer,
+-					    lp->os.LocalRxBufferDMA);
+-			lp->os.LocalRxBuffer = NULL;
+-		}
+-		release_region(p->base_addr, 
+-			(lp->os.bus_type == SK_BUS_TYPE_PCI ? FP_IO_LEN : 0));
+-	}
+-	unregister_netdev(p);
+-	printk("%s: unloaded\n", p->name);
+-	free_netdev(p);		/* Free the device structure */
+-
+-	return next;
+-}				// unlink_modules
+-
+ static void __exit skfd_exit(void)
+ {
+-	while (mdev)
+-		mdev = unlink_modules(mdev);
++	pci_unregister_driver(&skfddi_pci_driver);
+ }
+ 
+ module_init(skfd_init);
+--- linux-2.6.0/drivers/net/sk_g16.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/sk_g16.c	2003-12-28 23:21:01.000000000 -0800
+@@ -457,8 +457,6 @@ struct priv
+ /* static variables */
+ 
+ static SK_RAM *board;  /* pointer to our memory mapped board components */
+-static struct net_device *SK_dev;
+-unsigned long SK_ioaddr;
+ static spinlock_t SK_lock = SPIN_LOCK_UNLOCKED;
+ 
+ /* Macros */
+@@ -472,7 +470,6 @@ static spinlock_t SK_lock = SPIN_LOCK_UN
+  * See for short explanation of each function its definitions header.
+  */
+ 
+-int          SK_init(struct net_device *dev);
+ static int   SK_probe(struct net_device *dev, short ioaddr);
+ 
+ static void  SK_timeout(struct net_device *dev);
+@@ -530,84 +527,71 @@ void SK_print_ram(struct net_device *dev
+  *     YY/MM/DD  uid  Description
+ -*/
+ 
++static int io;	/* 0 == probe */
++
+ /* 
+  * Check for a network adaptor of this type, and return '0' if one exists.
+  * If dev->base_addr == 0, probe all likely locations.
+  * If dev->base_addr == 1, always return failure.
+  */
+ 
+-int __init SK_init(struct net_device *dev)
++struct net_device * __init SK_init(int unit)
+ {
+-	int ioaddr;			   /* I/O port address used for POS regs */
+ 	int *port, ports[] = SK_IO_PORTS;  /* SK_G16 supported ports */
+ 	static unsigned version_printed;
++	struct net_device *dev = alloc_etherdev(sizeof(struct priv));
++	int err = -ENODEV;
++
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
+ 
+-	/* get preconfigured base_addr from dev which is done in Space.c */
+-	int base_addr = dev->base_addr; 
++	if (unit >= 0) {
++		sprintf(dev->name, "eth%d", unit);
++		netdev_boot_setup_check(dev);
++		io = dev->base_addr;
++	}
+ 
+ 	if (version_printed++ == 0)
+ 	        PRINTK(("%s: %s", SK_NAME, rcsid));
+ 
+-	if (base_addr > 0x0ff)        /* Check a single specified address */
+-	{
+-	    int rc = -ENODEV;
+-
+-	    ioaddr = base_addr;
+-
+-	    /* Check if on specified address is a SK_G16 */
+-	    if (!request_region(ioaddr, ETHERCARD_TOTAL_SIZE, "sk_g16"))
+-	    	return -EBUSY;
+-
+-	    if ( (inb(SK_POS0) == SK_IDLOW) ||
+-		 (inb(SK_POS1) == SK_IDHIGH) )  
+-	    {
+-		rc = SK_probe(dev, ioaddr);
+-	    }
++	if (io > 0xff) {        /* Check a single specified address */
++		err = -EBUSY;
++		/* Check if on specified address is a SK_G16 */
++		if (request_region(io, ETHERCARD_TOTAL_SIZE, "sk_g16")) {
++			err = SK_probe(dev, io);
++			if (!err)
++				goto got_it;
++			release_region(io, ETHERCARD_TOTAL_SIZE);
++		}
++	} else if (io > 0) {       /* Don't probe at all */
++		err = -ENXIO;
++	} else {
++		/* Autoprobe base_addr */
++		for (port = &ports[0]; *port; port++) {
++			io = *port;
++
++			/* Check if I/O Port region is used by another board */
++			if (!request_region(io, ETHERCARD_TOTAL_SIZE, "sk_g16"))
++				continue;       /* Try next Port address */
++
++			/* Check if at ioaddr is a SK_G16 */
++			if (SK_probe(dev, io) == 0)
++				goto got_it;
+ 
+-	    if (rc)
+-	        release_region(ioaddr, ETHERCARD_TOTAL_SIZE);
+-	    return rc;
++			release_region(io, ETHERCARD_TOTAL_SIZE);
++		}
+ 	}
+-	else if (base_addr > 0)       /* Don't probe at all */
+-	{
+-		return -ENXIO;
++err_out:
++	free_netdev(dev);
++	return ERR_PTR(err);
++
++got_it:
++	err = register_netdev(dev);
++	if (err) {
++		release_region(dev->base_addr, ETHERCARD_TOTAL_SIZE);
++		goto err_out;
+ 	}
+-
+-	/* Autoprobe base_addr */
+-
+-	for (port = &ports[0]; *port; port++) 
+-	{
+-	    ioaddr = *port;           /* we need ioaddr for accessing POS regs */
+-
+-	    /* Check if I/O Port region is used by another board */
+-
+-	    if (!request_region(ioaddr, ETHERCARD_TOTAL_SIZE, "sk_g16"))
+-	    {
+-		continue;             /* Try next Port address */
+-	    }
+-
+-	    /* Check if at ioaddr is a SK_G16 */
+-
+-	    if ( !(inb(SK_POS0) == SK_IDLOW) ||
+-		 !(inb(SK_POS1) == SK_IDHIGH) )
+-	    {
+-	        release_region(ioaddr, ETHERCARD_TOTAL_SIZE);
+-		continue;             /* Try next Port address */
+-	    }
+-
+-	    dev->base_addr = ioaddr;  /* Set I/O Port Address */
+-
+-	    if (SK_probe(dev, ioaddr) == 0)  
+-	    {
+-		return 0; /* Card found and initialized */
+-	    }
+-
+-	    release_region(ioaddr, ETHERCARD_TOTAL_SIZE);
+-	}
+-
+-	dev->base_addr = base_addr;   /* Write back original base_addr */
+-
+-	return -ENODEV;                /* Failed to find or init driver */
++	return dev;
+ 
+ } /* End of SK_init */
+ 
+@@ -620,54 +604,25 @@ MODULE_PARM_DESC(io, "0 to probe common 
+ 
+ 
+ #ifdef MODULE
+-static int io;	/* 0 == probe */
++
++static struct net_device *SK_dev;
+ 
+ static int __init SK_init_module (void)
+ {
+-	int rc;
+-	
+-	SK_dev = init_etherdev (NULL, 0);
+-	if (!SK_dev)
+-		return -ENOMEM;
+-	
+-	SK_dev->base_addr = io;
+-
+-	rc = SK_init (SK_dev);
+-	if (rc) {
+-		unregister_netdev (SK_dev);
+-		kfree (SK_dev);
+-		SK_dev = NULL;
+-	}
+-	
+-	return rc;
++ 	SK_dev = SK_init(-1);
++ 	return IS_ERR(SK_dev) ? PTR_ERR(SK_dev) : 0;
+ }
+-#endif /* MODULE */
+-
+ 
+ static void __exit SK_cleanup_module (void)
+ {
+-	if (SK_dev) {
+-		if (SK_dev->priv) {
+-			kfree(SK_dev->priv);
+-			SK_dev->priv = NULL;
+-		}
+-		unregister_netdev(SK_dev);
+-		free_netdev(SK_dev);
+-		SK_dev = NULL;
+-	}
+-	if (SK_ioaddr) {
+-		release_region(SK_ioaddr, ETHERCARD_TOTAL_SIZE);
+-		SK_ioaddr = 0;
+-	}
+-		
++ 	unregister_netdev(SK_dev);
++ 	release_region(SK_dev->base_addr, ETHERCARD_TOTAL_SIZE);
++ 	free_netdev(SK_dev);
+ }
+ 
+-
+-#ifdef MODULE
+ module_init(SK_init_module);
+-#endif
+ module_exit(SK_cleanup_module);
+-
++#endif
+ 
+ 
+ /*-
+@@ -695,7 +650,11 @@ int __init SK_probe(struct net_device *d
+     int sk_addr_flag = 0;   /* SK ADDR correct? 1 - no, 0 - yes */
+     unsigned int rom_addr;  /* used to store RAM address used for POS_ADDR */
+ 
+-    struct priv *p;         /* SK_G16 private structure */
++    struct priv *p = dev->priv;         /* SK_G16 private structure */
++
++    if (inb(SK_POS0) != SK_IDLOW || inb(SK_POS1) != SK_IDHIGH)
++	return -ENODEV;
++    dev->base_addr = ioaddr;
+ 
+     if (SK_ADDR & 0x3fff || SK_ADDR < 0xa0000)
+     {
+@@ -837,12 +796,6 @@ int __init SK_probe(struct net_device *d
+ 	    dev->dev_addr[4],
+ 	    dev->dev_addr[5]);
+ 
+-    /* Allocate memory for private structure */
+-    p = dev->priv = (void *) kmalloc(sizeof(struct priv), GFP_KERNEL);
+-    if (p == NULL) {
+-	   printk("%s: ERROR - no memory for driver data!\n", dev->name);
+-	   return -ENOMEM;
+-    }
+     memset((char *) dev->priv, 0, sizeof(struct priv)); /* clear memory */
+ 
+     /* Assign our Device Driver functions */
+@@ -856,10 +809,6 @@ int __init SK_probe(struct net_device *d
+     dev->watchdog_timeo		= HZ/7;
+ 
+ 
+-    /* Set the generic fields of the device structure */
+-
+-    ether_setup(dev);
+-    
+     dev->flags &= ~IFF_MULTICAST;
+ 
+     /* Initialize private structure */
+@@ -884,12 +833,7 @@ int __init SK_probe(struct net_device *d
+     SK_print_pos(dev, "End of SK_probe");
+     SK_print_ram(dev);
+ #endif 
+-
+-    SK_dev = dev;
+-    SK_ioaddr = ioaddr;
+-
+     return 0;                            /* Initialization done */
+-
+ } /* End of SK_probe() */
+ 
+ 
+@@ -1280,7 +1224,7 @@ static int SK_send_packet(struct sk_buff
+ 
+ 	memcpy_toio((tmdp->u.buffer & 0x00ffffff), skb->data, skb->len);
+ 	if (len != skb->len)
+-		memcpy_toio((tmdp->u.buffer & 0x00ffffff) + sb->len, pad, len-skb->len);
++		memcpy_toio((tmdp->u.buffer & 0x00ffffff) + skb->len, pad, len-skb->len);
+ 
+ 	writew(-len, &tmdp->blen);            /* set length to transmit */
+ 
+--- linux-2.6.0/drivers/net/sk_mca.c	2003-10-08 15:07:09.000000000 -0700
++++ 25/drivers/net/sk_mca.c	2003-12-28 23:21:01.000000000 -0800
+@@ -1022,18 +1022,39 @@ static void skmca_set_multicast_list(str
+ 
+ static int startslot;		/* counts through slots when probing multiple devices */
+ 
+-int __init skmca_probe(struct net_device *dev)
++static void cleanup_card(struct net_device *dev)
+ {
++	skmca_priv *priv = dev->priv;
++	DeinitBoard(dev);
++	if (dev->irq != 0)
++		free_irq(dev->irq, dev);
++	mca_mark_as_unused(priv->slot);
++	mca_set_adapter_procfn(priv->slot, NULL, NULL);
++}
++
++struct net_device * __init skmca_probe(int unit)
++{
++	struct net_device *dev;
+ 	int force_detect = 0;
+ 	int junior, slot, i;
+ 	int base = 0, irq = 0;
+ 	skmca_priv *priv;
+ 	skmca_medium medium;
++	int err;
+ 
+ 	/* can't work without an MCA bus ;-) */
+ 
+ 	if (MCA_bus == 0)
+-		return -ENODEV;
++		return ERR_PTR(-ENODEV);
++
++	dev = alloc_etherdev(sizeof(skmca_priv));
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	if (unit >= 0) {
++		sprintf(dev->name, "eth%d", unit);
++		netdev_boot_setup_check(dev);
++	}
+ 
+ 	SET_MODULE_OWNER(dev);
+ 
+@@ -1044,37 +1065,24 @@ int __init skmca_probe(struct net_device
+ 
+ 	/* search through slots */
+ 
+-	if (dev != NULL) {
+-		base = dev->mem_start;
+-		irq = dev->irq;
+-	}
+-	slot = dofind(&junior, startslot);
+-
+-	while (slot != -1) {
++	base = dev->mem_start;
++	irq = dev->base_addr;
++	for (slot = startslot; (slot = dofind(&junior, slot)) != -1; slot++) {
+ 		/* deduce card addresses */
+ 
+ 		getaddrs(slot, junior, &base, &irq, &medium);
+ 
+ 		/* slot already in use ? */
+ 
+-		if (mca_is_adapter_used(slot)) {
+-			slot = dofind(&junior, slot + 1);
++		if (mca_is_adapter_used(slot))
+ 			continue;
+-		}
+ 
+ 		/* were we looking for something different ? */
+ 
+-		if ((dev->irq != 0) || (dev->mem_start != 0)) {
+-			if ((dev->irq != 0) && (dev->irq != irq)) {
+-				slot = dofind(&junior, slot + 1);
+-				continue;
+-			}
+-			if ((dev->mem_start != 0)
+-			    && (dev->mem_start != base)) {
+-				slot = dofind(&junior, slot + 1);
+-				continue;
+-			}
+-		}
++		if (dev->irq && dev->irq != irq)
++			continue;
++		if (dev->mem_start && dev->mem_start != base)
++			continue;
+ 
+ 		/* found something that matches */
+ 
+@@ -1083,8 +1091,10 @@ int __init skmca_probe(struct net_device
+ 
+ 	/* nothing found ? */
+ 
+-	if (slot == -1)
+-		return ((base != 0) || (irq != 0)) ? ENXIO : ENODEV;
++	if (slot == -1) {
++		free_netdev(dev);
++		return (base || irq) ? ERR_PTR(-ENXIO) : ERR_PTR(-ENODEV);
++	}
+ 
+ 	/* make procfs entries */
+ 
+@@ -1102,17 +1112,14 @@ int __init skmca_probe(struct net_device
+ 	       junior ? "Junior MC2" : "MC2+", slot + 1);
+ 
+ 	/* allocate structure */
+-	priv = dev->priv =
+-	    (skmca_priv *) kmalloc(sizeof(skmca_priv), GFP_KERNEL);
+-	if (!priv)
+-		return -ENOMEM;
++	priv = dev->priv;
+ 	priv->slot = slot;
+ 	priv->macbase = base + 0x3fc0;
+ 	priv->ioregaddr = base + 0x3ff0;
+ 	priv->ctrladdr = base + 0x3ff2;
+ 	priv->cmdaddr = base + 0x3ff3;
+ 	priv->medium = medium;
+-	memset(&(priv->stat), 0, sizeof(struct net_device_stats));
++	memset(&priv->stat, 0, sizeof(struct net_device_stats));
+ 	spin_lock_init(&priv->lock);
+ 
+ 	/* set base + irq for this device (irq not allocated so far) */
+@@ -1146,9 +1153,6 @@ int __init skmca_probe(struct net_device
+ 	dev->set_multicast_list = skmca_set_multicast_list;
+ 	dev->flags |= IFF_MULTICAST;
+ 
+-	/* generic setup */
+-	ether_setup(dev);
+-
+ 	/* copy out MAC address */
+ 	for (i = 0; i < 6; i++)
+ 		dev->dev_addr[i] = SKMCA_READB(priv->macbase + (i << 1));
+@@ -1167,7 +1171,13 @@ int __init skmca_probe(struct net_device
+ 
+ 	startslot = slot + 1;
+ 
+-	return 0;
++	err = register_netdev(dev);
++	if (err) {
++		cleanup_card(dev);
++		free_netdev(dev);
++		dev = ERR_PTR(err);
++	}
++	return dev;
+ }
+ 
+ /* ------------------------------------------------------------------------
+@@ -1179,51 +1189,34 @@ MODULE_LICENSE("GPL");
+ 
+ #define DEVMAX 5
+ 
+-static struct net_device moddevs[DEVMAX] = {
+-	{ .name = "    ", .init = skmca_probe },
+-	{ .name = "    ", .init = skmca_probe },
+-	{ .name = "    ", .init = skmca_probe },
+-	{ .name = "    ", .init = skmca_probe },
+-	{ .name = "    ", .init = skmca_probe }
+-};
+-
+-int irq;
+-int io;
++static struct net_device *moddevs[DEVMAX];
+ 
+ int init_module(void)
+ {
+-	int z, res;
++	int z;
+ 
+ 	startslot = 0;
+ 	for (z = 0; z < DEVMAX; z++) {
+-		strcpy(moddevs[z].name, "     ");
+-		res = register_netdev(moddevs + z);
+-		if (res != 0)
+-			return (z > 0) ? 0 : -EIO;
++		struct net_device *dev = skmca_probe(-1);
++		if (IS_ERR(dev))
++			break;
++		moddevs[z] = dev;
+ 	}
+-
++	if (!z)
++		return -EIO;
+ 	return 0;
+ }
+ 
+ void cleanup_module(void)
+ {
+-	struct net_device *dev;
+-	skmca_priv *priv;
+ 	int z;
+ 
+ 	for (z = 0; z < DEVMAX; z++) {
+-		dev = moddevs + z;
+-		if (dev->priv != NULL) {
+-			priv = (skmca_priv *) dev->priv;
+-			DeinitBoard(dev);
+-			if (dev->irq != 0)
+-				free_irq(dev->irq, dev);
+-			dev->irq = 0;
++		struct net_device *dev = moddevs[z];
++		if (dev) {
+ 			unregister_netdev(dev);
+-			mca_mark_as_unused(priv->slot);
+-			mca_set_adapter_procfn(priv->slot, NULL, NULL);
+-			kfree(dev->priv);
+-			dev->priv = NULL;
++			cleanup_card(dev);
++			free_netdev(dev);
+ 		}
+ 	}
+ }
+--- linux-2.6.0/drivers/net/sk_mca.h	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/sk_mca.h	2003-12-28 23:21:01.000000000 -0800
+@@ -178,7 +178,4 @@ typedef struct {		/* LANCE Rx descriptor
+ 
+ #endif				/* _SK_MCA_DRIVER_ */
+ 
+-extern int skmca_probe(struct net_device *);
+-
+-
+ #endif	/* _SK_MCA_INCLUDE_ */
+--- linux-2.6.0/drivers/net/smc9194.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/smc9194.c	2003-12-28 23:21:01.000000000 -0800
+@@ -191,7 +191,7 @@ struct smc_local {
+  .
+  . NB:This shouldn't be static since it is referred to externally.
+ */
+-int smc_init(struct net_device *dev);
++struct net_device *smc_init(int unit);
+ 
+ /*
+  . The kernel calls this function when someone wants to use the device,
+@@ -672,7 +672,7 @@ static void smc_hardware_send_packet( st
+ 
+ /*-------------------------------------------------------------------------
+  |
+- | smc_init( struct net_device * dev )
++ | smc_init(int unit)
+  |   Input parameters:
+  |	dev->base_addr == 0, try to find all possible locations
+  |	dev->base_addr == 1, return failure code
+@@ -680,31 +680,56 @@ static void smc_hardware_send_packet( st
+  |	dev->base_addr == <anything else>   this is the address to check
+  |
+  |   Output:
+- |	0 --> there is a device
+- |	anything else, error
++ |	pointer to net_device or ERR_PTR(error)
+  |
+  ---------------------------------------------------------------------------
+ */
+-int __init smc_init(struct net_device *dev)
++static int io;
++static int irq;
++static int ifport;
++
++struct net_device * __init smc_init(int unit)
+ {
+-	int i;
+-	int base_addr = dev->base_addr;
++	struct net_device *dev = alloc_etherdev(sizeof(struct smc_local));
++	unsigned *port;
++	int err = 0;
++
++	if (!dev)
++		return ERR_PTR(-ENODEV);
++
++	if (unit >= 0) {
++		sprintf(dev->name, "eth%d", unit);
++		netdev_boot_setup_check(dev);
++		io = dev->base_addr;
++		irq = dev->irq;
++	}
+ 
+ 	SET_MODULE_OWNER(dev);
+ 
+-	/*  try a specific location */
+-	if (base_addr > 0x1ff)
+-		return smc_probe(dev, base_addr);
+-	else if (base_addr != 0)
+-		return -ENXIO;
+-
+-	/* check every ethernet address */
+-	for (i = 0; smc_portlist[i]; i++)
+-		if (smc_probe(dev, smc_portlist[i]) == 0)
+-			return 0;
+-
+-	/* couldn't find anything */
+-	return -ENODEV;
++	if (io > 0x1ff) {	/* Check a single specified location. */
++		err = smc_probe(dev, io);
++	} else if (io != 0) {	/* Don't probe at all. */
++		err = -ENXIO;
++	} else {
++		for (port = smc_portlist; *port; port++) {
++			if (smc_probe(dev, *port) == 0)
++				break;
++		}
++		if (!*port)
++			err = -ENODEV;
++	}
++	if (err)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	free_irq(dev->irq, dev);
++	release_region(dev->base_addr, SMC_IO_EXTENT);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
+ /*----------------------------------------------------------------------
+@@ -821,6 +846,9 @@ static int __init smc_probe(struct net_d
+ 	if (!request_region(ioaddr, SMC_IO_EXTENT, dev->name))
+ 		return -EBUSY;
+ 
++	dev->irq = irq;
++	dev->if_port = ifport;
++
+ 	/* First, see if the high byte is 0x33 */
+ 	bank = inw( ioaddr + BANK_SELECT );
+ 	if ( (bank & 0xFF00) != 0x3300 ) {
+@@ -969,28 +997,14 @@ static int __init smc_probe(struct net_d
+ 		printk("%2.2x:", dev->dev_addr[i] );
+ 	printk("%2.2x \n", dev->dev_addr[5] );
+ 
+-
+-	/* Initialize the private structure. */
+-	if (dev->priv == NULL) {
+-		dev->priv = kmalloc(sizeof(struct smc_local), GFP_KERNEL);
+-		if (dev->priv == NULL) {
+-			retval = -ENOMEM;
+-			goto err_out;
+-		}
+-	}
+ 	/* set the private data to zero by default */
+ 	memset(dev->priv, 0, sizeof(struct smc_local));
+ 
+-	/* Fill in the fields of the device structure with ethernet values. */
+-	ether_setup(dev);
+-
+ 	/* Grab the IRQ */
+       	retval = request_irq(dev->irq, &smc_interrupt, 0, dev->name, dev);
+       	if (retval) {
+ 		printk("%s: unable to get IRQ %d (irqval=%d).\n", dev->name,
+ 			dev->irq, retval);
+-		kfree(dev->priv);
+-		dev->priv = NULL;
+   	  	goto err_out;
+       	}
+ 
+@@ -1524,10 +1538,7 @@ static void smc_set_multicast_list(struc
+ 
+ #ifdef MODULE
+ 
+-static struct net_device devSMC9194;
+-static int io;
+-static int irq;
+-static int ifport;
++static struct net_device *devSMC9194;
+ MODULE_LICENSE("GPL");
+ 
+ MODULE_PARM(io, "i");
+@@ -1539,32 +1550,23 @@ MODULE_PARM_DESC(ifport, "SMC 99194 inte
+ 
+ int init_module(void)
+ {
+-	int result;
+-
+ 	if (io == 0)
+ 		printk(KERN_WARNING
+ 		CARDNAME": You shouldn't use auto-probing with insmod!\n" );
+ 
+ 	/* copy the parameters from insmod into the device structure */
+-	devSMC9194.base_addr = io;
+-	devSMC9194.irq       = irq;
+-	devSMC9194.if_port	= ifport;
+-	devSMC9194.init   	= smc_init;
+-	if ((result = register_netdev(&devSMC9194)) != 0)
+-		return result;
+-
++	devSMC9194 = smc_init(-1);
++	if (IS_ERR(devSMC9194))
++		return PTR_ERR(devSMC9194);
+ 	return 0;
+ }
+ 
+ void cleanup_module(void)
+ {
+-	unregister_netdev(&devSMC9194);
+-
+-	free_irq(devSMC9194.irq, &devSMC9194);
+-	release_region(devSMC9194.base_addr, SMC_IO_EXTENT);
+-
+-	if (devSMC9194.priv)
+-		kfree(devSMC9194.priv);
++	unregister_netdev(devSMC9194);
++	free_irq(devSMC9194->irq, devSMC9194);
++	release_region(devSMC9194->base_addr, SMC_IO_EXTENT);
++	free_netdev(devSMC9194);
+ }
+ 
+ #endif /* MODULE */
+--- linux-2.6.0/drivers/net/smc-mca.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/smc-mca.c	2003-12-28 23:21:01.000000000 -0800
+@@ -202,22 +202,18 @@ int __init ultramca_probe(struct device 
+ 		return -ENXIO;
+ 
+         /* Adapter found. */
+-	dev  = alloc_etherdev(0);
++	dev  = alloc_ei_netdev();
+ 	if(!dev)
+ 		return -ENODEV;
+ 
+ 	SET_MODULE_OWNER(dev);
+ 	SET_NETDEV_DEV(dev, gen_dev);
+-
+-	rc = register_netdev(dev);
+-	if (rc)
+-		goto err_free_netdev;
+-
+-	printk(KERN_INFO "%s: %s found in slot %d\n",
+-	       dev->name, smc_mca_adapter_names[adapter], slot + 1);
+-
+ 	mca_device_set_name(mca_dev, smc_mca_adapter_names[adapter]);
+ 	mca_device_set_claim(mca_dev, 1);
++
++	printk(KERN_INFO "smc_mca: %s found in slot %d\n",
++		       smc_mca_adapter_names[adapter], slot + 1);
++
+ 	ultra_found++;
+ 
+ 	dev->base_addr = ioaddr = mca_device_transform_ioport(mca_dev, tbase);
+@@ -266,18 +262,18 @@ int __init ultramca_probe(struct device 
+ 	/* sanity check, shouldn't happen */
+ 	if (dev->mem_start == 0) {
+ 		rc = -ENODEV;
+-		goto err_unregister_netdev;
++		goto err_unclaim;
+ 	}
+ 
+ 	if (!request_region(ioaddr, ULTRA_IO_EXTENT, dev->name)) {
+ 		rc = -ENODEV;
+-		goto err_unregister_netdev;
++		goto err_unclaim;
+ 	}
+ 
+ 	reg4 = inb(ioaddr + 4) & 0x7f;
+ 	outb(reg4, ioaddr + 4);
+ 
+-	printk(KERN_INFO "%s: Parameters: %#3x,", dev->name, ioaddr);
++	printk(KERN_INFO "smc_mca[%d]: Parameters: %#3x,", slot + 1, ioaddr);
+ 
+ 	for (i = 0; i < 6; i++)
+ 		printk(" %2.2X", dev->dev_addr[i] = inb(ioaddr + 8 + i));
+@@ -299,14 +295,6 @@ int __init ultramca_probe(struct device 
+ 
+ 	outb(reg4, ioaddr + 4);
+ 
+-	/* Allocate dev->priv and fill in 8390 specific dev fields.
+-	 */
+-
+-	rc = ethdev_init(dev);
+-	if (rc) {
+-		printk (", no memory for dev->priv.\n");
+-		goto err_release_region;
+-	}
+ 	gen_dev->driver_data = dev;
+ 
+ 	/* The 8390 isn't at the base address, so fake the offset
+@@ -339,13 +327,16 @@ int __init ultramca_probe(struct device 
+ 
+ 	NS8390_init(dev, 0);
+ 
++	rc = register_netdev(dev);
++	if (rc)
++		goto err_release_region;
++
+ 	return 0;
+ 
+ err_release_region:
+ 	release_region(ioaddr, ULTRA_IO_EXTENT);
+-err_unregister_netdev:
+-	unregister_netdev(dev);
+-err_free_netdev:
++err_unclaim:
++	mca_device_set_claim(mca_dev, 0);
+ 	free_netdev(dev);
+ 	return rc;
+ }
+@@ -463,14 +454,14 @@ static int ultramca_remove(struct device
+ 	struct mca_device *mca_dev = to_mca_device(gen_dev);
+ 	struct net_device *dev = (struct net_device *)gen_dev->driver_data;
+ 
+-	if(dev && dev->priv) {
++	if (dev) {
+ 		/* NB: ultra_close_card() does free_irq */
+ 		int ioaddr = dev->base_addr - ULTRA_NIC_OFFSET;
+ 
++		unregister_netdev(dev);
+ 		mca_device_set_claim(mca_dev, 0);
+ 		release_region(ioaddr, ULTRA_IO_EXTENT);
+-		unregister_netdev(dev);
+-		kfree(dev->priv);
++		free_netdev(dev);
+ 	}
+ 	return 0;
+ }
+--- linux-2.6.0/drivers/net/smc-ultra32.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/smc-ultra32.c	2003-12-28 23:21:01.000000000 -0800
+@@ -61,7 +61,6 @@ static const char *version = "smc-ultra3
+ 
+ #include "8390.h"
+ 
+-int ultra32_probe(struct net_device *dev);
+ static int ultra32_probe1(struct net_device *dev, int ioaddr);
+ static int ultra32_open(struct net_device *dev);
+ static void ultra32_reset_8390(struct net_device *dev);
+@@ -98,26 +97,59 @@ static int ultra32_close(struct net_devi
+ #define ULTRA32_CFG6	(-0x15)	/* 0xc8b */
+ #define ULTRA32_CFG7	0x0d	/* 0xcad */
+ 
++static void cleanup_card(struct net_device *dev)
++{
++	int ioaddr = dev->base_addr - ULTRA32_NIC_OFFSET;
++	/* NB: ultra32_close_card() does free_irq */
++	release_region(ioaddr, ULTRA32_IO_EXTENT);
++}
+ 
+ /*	Probe for the Ultra32.  This looks like a 8013 with the station
+ 	address PROM at I/O ports <base>+8 to <base>+13, with a checksum
+ 	following.
+ */
+ 
+-int __init ultra32_probe(struct net_device *dev)
++struct net_device * __init ultra32_probe(int unit)
+ {
+-	int ioaddr;
+-
+-	if (!EISA_bus) return -ENODEV;
++	struct net_device *dev;
++	int base;
++	int irq;
++	int err = -ENODEV;
++
++	if (!EISA_bus)
++		return ERR_PTR(-ENODEV);
++
++	dev = alloc_ei_netdev();
++
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	if (unit >= 0) {
++		sprintf(dev->name, "eth%d", unit);
++		netdev_boot_setup_check(dev);
++	}
+ 
+ 	SET_MODULE_OWNER(dev);
+ 
+-	/* EISA spec allows for up to 16 slots, but 8 is typical. */
+-	for (ioaddr = 0x1000 + ULTRA32_BASE; ioaddr < 0x9000; ioaddr += 0x1000)
+-		if (ultra32_probe1(dev, ioaddr) == 0)
+-			return 0;
++	irq = dev->irq;
+ 
+-	return -ENODEV;
++	/* EISA spec allows for up to 16 slots, but 8 is typical. */
++	for (base = 0x1000 + ULTRA32_BASE; base < 0x9000; base += 0x1000) {
++		if (ultra32_probe1(dev, base) == 0)
++			break;
++		dev->irq = irq;
++	}
++	if (base >= 0x9000)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	cleanup_card(dev);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
+ static int __init ultra32_probe1(struct net_device *dev, int ioaddr)
+@@ -210,13 +242,6 @@ static int __init ultra32_probe1(struct 
+ 		dev->irq = irq;
+ 	}
+ 
+-	/* Allocate dev->priv and fill in 8390 specific dev fields. */
+-	if (ethdev_init(dev)) {
+-		printk (", no memory for dev->priv.\n");
+-                retval = -ENOMEM;
+-		goto out;
+-        }
+-
+ 	/* The 8390 isn't at the base address, so fake the offset */
+ 	dev->base_addr = ioaddr + ULTRA32_NIC_OFFSET;
+ 
+@@ -380,7 +405,7 @@ static void ultra32_block_output(struct 
+ 
+ #ifdef MODULE
+ #define MAX_ULTRA32_CARDS   4	/* Max number of Ultra cards per module */
+-static struct net_device dev_ultra[MAX_ULTRA32_CARDS];
++static struct net_device *dev_ultra[MAX_ULTRA32_CARDS];
+ 
+ MODULE_DESCRIPTION("SMC Ultra32 EISA ethernet driver");
+ MODULE_LICENSE("GPL");
+@@ -390,18 +415,15 @@ int init_module(void)
+ 	int this_dev, found = 0;
+ 
+ 	for (this_dev = 0; this_dev < MAX_ULTRA32_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_ultra[this_dev];
+-		dev->init = ultra32_probe;
+-		if (register_netdev(dev) != 0) {
+-			if (found > 0) { /* Got at least one. */
+-				return 0;
+-			}
+-			printk(KERN_WARNING "smc-ultra32.c: No SMC Ultra32 found.\n");
+-			return -ENXIO;
+-		}
+-		found++;
++		struct net_device *dev = ultra32_probe(-1);
++		if (IS_ERR(dev))
++			break;
++		dev_ultra[found++] = dev;
+ 	}
+-	return 0;
++	if (found)
++		return 0;
++	printk(KERN_WARNING "smc-ultra32.c: No SMC Ultra32 found.\n");
++	return -ENXIO;
+ }
+ 
+ void cleanup_module(void)
+@@ -409,14 +431,11 @@ void cleanup_module(void)
+ 	int this_dev;
+ 
+ 	for (this_dev = 0; this_dev < MAX_ULTRA32_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_ultra[this_dev];
+-		if (dev->priv != NULL) {
+-			int ioaddr = dev->base_addr - ULTRA32_NIC_OFFSET;
+-			void *priv = dev->priv;
+-			/* NB: ultra32_close_card() does free_irq */
+-			release_region(ioaddr, ULTRA32_IO_EXTENT);
++		struct net_device *dev = dev_ultra[this_dev];
++		if (dev) {
+ 			unregister_netdev(dev);
+-			kfree(priv);
++			cleanup_card(dev);
++			free_netdev(dev);
+ 		}
+ 	}
+ }
+--- linux-2.6.0/drivers/net/smc-ultra.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/smc-ultra.c	2003-12-28 23:21:01.000000000 -0800
+@@ -76,7 +76,6 @@ static const char version[] =
+ static unsigned int ultra_portlist[] __initdata =
+ {0x200, 0x220, 0x240, 0x280, 0x300, 0x340, 0x380, 0};
+ 
+-int ultra_probe(struct net_device *dev);
+ static int ultra_probe1(struct net_device *dev, int ioaddr);
+ 
+ #ifdef __ISAPNP__
+@@ -122,18 +121,30 @@ MODULE_DEVICE_TABLE(isapnp, ultra_device
+ #define ULTRA_IO_EXTENT 32
+ #define EN0_ERWCNT		0x08	/* Early receive warning count. */
+ 
++#ifdef CONFIG_NET_POLL_CONTROLLER
++static void ultra_poll(struct net_device *dev)
++{
++	disable_irq(dev->irq);
++	ei_interrupt(dev->irq, dev, NULL);
++	enable_irq(dev->irq);
++}
++#endif
+ /*	Probe for the Ultra.  This looks like a 8013 with the station
+ 	address PROM at I/O ports <base>+8 to <base>+13, with a checksum
+ 	following.
+ */
+ 
+-int __init ultra_probe(struct net_device *dev)
++static int __init do_ultra_probe(struct net_device *dev)
+ {
+ 	int i;
+ 	int base_addr = dev->base_addr;
++	int irq = dev->irq;
+ 
+ 	SET_MODULE_OWNER(dev);
+ 
++#ifdef CONFIG_NET_POLL_CONTROLLER
++	dev->poll_controller = &ultra_poll;
++#endif
+ 	if (base_addr > 0x1ff)		/* Check a single specified location. */
+ 		return ultra_probe1(dev, base_addr);
+ 	else if (base_addr != 0)	/* Don't probe at all. */
+@@ -147,13 +158,51 @@ int __init ultra_probe(struct net_device
+ 	printk(KERN_NOTICE "smc-ultra.c: No ISAPnP cards found, trying standard ones...\n");
+ #endif
+ 
+-	for (i = 0; ultra_portlist[i]; i++)
++	for (i = 0; ultra_portlist[i]; i++) {
++		dev->irq = irq;
+ 		if (ultra_probe1(dev, ultra_portlist[i]) == 0)
+ 			return 0;
++	}
+ 
+ 	return -ENODEV;
+ }
+ 
++static void cleanup_card(struct net_device *dev)
++{
++	/* NB: ultra_close_card() does free_irq */
++#ifdef __ISAPNP__
++	struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv;
++	if (idev)
++		pnp_device_detach(idev);
++#endif
++	release_region(dev->base_addr - ULTRA_NIC_OFFSET, ULTRA_IO_EXTENT);
++}
++
++struct net_device * __init ultra_probe(int unit)
++{
++	struct net_device *dev = alloc_ei_netdev();
++	int err;
++
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	sprintf(dev->name, "eth%d", unit);
++	netdev_boot_setup_check(dev);
++
++	err = do_ultra_probe(dev);
++	if (err)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	cleanup_card(dev);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
++}
++
+ static int __init ultra_probe1(struct net_device *dev, int ioaddr)
+ {
+ 	int i, retval;
+@@ -226,13 +275,6 @@ static int __init ultra_probe1(struct ne
+ 		eeprom_irq = 1;
+ 	}
+ 
+-	/* Allocate dev->priv and fill in 8390 specific dev fields. */
+-	if (ethdev_init(dev)) {
+-		printk (", no memory for dev->priv.\n");
+-                retval = -ENOMEM;
+-		goto out;
+-        }
+-
+ 	/* The 8390 isn't at the base address, so fake the offset */
+ 	dev->base_addr = ioaddr+ULTRA_NIC_OFFSET;
+ 
+@@ -500,7 +542,7 @@ ultra_close_card(struct net_device *dev)
+ 
+ #ifdef MODULE
+ #define MAX_ULTRA_CARDS	4	/* Max number of Ultra cards per module */
+-static struct net_device dev_ultra[MAX_ULTRA_CARDS];
++static struct net_device *dev_ultra[MAX_ULTRA_CARDS];
+ static int io[MAX_ULTRA_CARDS];
+ static int irq[MAX_ULTRA_CARDS];
+ 
+@@ -516,26 +558,33 @@ ISA device autoprobes on a running machi
+ int
+ init_module(void)
+ {
++	struct net_device *dev;
+ 	int this_dev, found = 0;
+ 
+ 	for (this_dev = 0; this_dev < MAX_ULTRA_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_ultra[this_dev];
+-		dev->irq = irq[this_dev];
+-		dev->base_addr = io[this_dev];
+-		dev->init = ultra_probe;
+ 		if (io[this_dev] == 0)  {
+ 			if (this_dev != 0) break; /* only autoprobe 1st one */
+ 			printk(KERN_NOTICE "smc-ultra.c: Presently autoprobing (not recommended) for a single card.\n");
+ 		}
+-		if (register_netdev(dev) != 0) {
+-			printk(KERN_WARNING "smc-ultra.c: No SMC Ultra card found (i/o = 0x%x).\n", io[this_dev]);
+-			if (found != 0) return 0;	/* Got at least one. */
+-			return -ENXIO;
++		dev = alloc_ei_netdev();
++		if (!dev)
++			break;
++		dev->irq = irq[this_dev];
++		dev->base_addr = io[this_dev];
++		if (do_ultra_probe(dev) == 0) {
++			if (register_netdev(dev) == 0) {
++				dev_ultra[found++] = dev;
++				continue;
++			}
++			cleanup_card(dev);
+ 		}
+-		found++;
++		free_netdev(dev);
++		printk(KERN_WARNING "smc-ultra.c: No SMC Ultra card found (i/o = 0x%x).\n", io[this_dev]);
++		break;
+ 	}
+-
+-	return 0;
++	if (found)
++		return 0;
++	return -ENXIO;
+ }
+ 
+ void
+@@ -544,20 +593,11 @@ cleanup_module(void)
+ 	int this_dev;
+ 
+ 	for (this_dev = 0; this_dev < MAX_ULTRA_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_ultra[this_dev];
+-		if (dev->priv != NULL) {
+-			/* NB: ultra_close_card() does free_irq */
+-			int ioaddr = dev->base_addr - ULTRA_NIC_OFFSET;
+-
+-#ifdef __ISAPNP__
+-			struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv;
+-			if (idev)
+-				pnp_device_detach(idev);
+-#endif
+-
++		struct net_device *dev = dev_ultra[this_dev];
++		if (dev) {
+ 			unregister_netdev(dev);
+-			release_region(ioaddr, ULTRA_IO_EXTENT);
+-			kfree(dev->priv);
++			cleanup_card(dev);
++			free_netdev(dev);
+ 		}
+ 	}
+ }
+--- linux-2.6.0/drivers/net/Space.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/net/Space.c	2003-12-28 23:21:06.000000000 -0800
+@@ -40,63 +40,62 @@
+    ethernet adaptor have the name "eth[0123...]".
+    */
+ 
+-extern int ne2_probe(struct net_device *dev);
+-extern int hp100_probe(struct net_device *dev);
+-extern int ultra_probe(struct net_device *dev);
+-extern int ultra32_probe(struct net_device *dev);
+-extern int wd_probe(struct net_device *dev);
+-extern int el2_probe(struct net_device *dev);
+-extern int ne_probe(struct net_device *dev);
+-extern int hp_probe(struct net_device *dev);
+-extern int hp_plus_probe(struct net_device *dev);
+-extern int express_probe(struct net_device *);
+-extern int eepro_probe(struct net_device *);
+-extern int at1500_probe(struct net_device *);
+-extern int at1700_probe(struct net_device *);
+-extern int fmv18x_probe(struct net_device *);
+-extern int eth16i_probe(struct net_device *);
+-extern int i82596_probe(struct net_device *);
+-extern int ewrk3_probe(struct net_device *);
+-extern int el1_probe(struct net_device *);
+-extern int wavelan_probe(struct net_device *);
+-extern int arlan_probe(struct net_device *);
+-extern int el16_probe(struct net_device *);
+-extern int elmc_probe(struct net_device *);
+-extern int skmca_probe(struct net_device *);
+-extern int elplus_probe(struct net_device *);
+-extern int ac3200_probe(struct net_device *);
+-extern int es_probe(struct net_device *);
+-extern int lne390_probe(struct net_device *);
+-extern int e2100_probe(struct net_device *);
+-extern int ni5010_probe(struct net_device *);
+-extern int ni52_probe(struct net_device *);
+-extern int ni65_probe(struct net_device *);
+-extern int sonic_probe(struct net_device *);
+-extern int SK_init(struct net_device *);
+-extern int seeq8005_probe(struct net_device *);
+-extern int smc_init( struct net_device * );
+-extern int atarilance_probe(struct net_device *);
+-extern int sun3lance_probe(struct net_device *);
+-extern int sun3_82586_probe(struct net_device *);
+-extern int apne_probe(struct net_device *);
+-extern int bionet_probe(struct net_device *);
+-extern int pamsnet_probe(struct net_device *);
+-extern int cs89x0_probe(struct net_device *dev);
+-extern int hplance_probe(struct net_device *dev);
+-extern int bagetlance_probe(struct net_device *);
+-extern int mvme147lance_probe(struct net_device *dev);
+-extern int tc515_probe(struct net_device *dev);
+-extern int lance_probe(struct net_device *dev);
+-extern int mace_probe(struct net_device *dev);
+-extern int macsonic_probe(struct net_device *dev);
+-extern int mac8390_probe(struct net_device *dev);
+-extern int mac89x0_probe(struct net_device *dev);
+-extern int mc32_probe(struct net_device *dev);
++extern struct net_device *ne2_probe(int unit);
++extern struct net_device *hp100_probe(int unit);
++extern struct net_device *ultra_probe(int unit);
++extern struct net_device *ultra32_probe(int unit);
++extern struct net_device *wd_probe(int unit);
++extern struct net_device *el2_probe(int unit);
++extern struct net_device *ne_probe(int unit);
++extern struct net_device *hp_probe(int unit);
++extern struct net_device *hp_plus_probe(int unit);
++extern struct net_device *express_probe(int unit);
++extern struct net_device *eepro_probe(int unit);
++extern struct net_device *at1700_probe(int unit);
++extern struct net_device *fmv18x_probe(int unit);
++extern struct net_device *eth16i_probe(int unit);
++extern struct net_device *i82596_probe(int unit);
++extern struct net_device *ewrk3_probe(int unit);
++extern struct net_device *el1_probe(int unit);
++extern struct net_device *wavelan_probe(int unit);
++extern struct net_device *arlan_probe(int unit);
++extern struct net_device *el16_probe(int unit);
++extern struct net_device *elmc_probe(int unit);
++extern struct net_device *skmca_probe(int unit);
++extern struct net_device *elplus_probe(int unit);
++extern struct net_device *ac3200_probe(int unit);
++extern struct net_device *es_probe(int unit);
++extern struct net_device *lne390_probe(int unit);
++extern struct net_device *e2100_probe(int unit);
++extern struct net_device *ni5010_probe(int unit);
++extern struct net_device *ni52_probe(int unit);
++extern struct net_device *ni65_probe(int unit);
++extern struct net_device *sonic_probe(int unit);
++extern struct net_device *SK_init(int unit);
++extern struct net_device *seeq8005_probe(int unit);
++extern struct net_device *smc_init(int unit);
++extern struct net_device *atarilance_probe(int unit);
++extern struct net_device *sun3lance_probe(int unit);
++extern struct net_device *sun3_82586_probe(int unit);
++extern struct net_device *apne_probe(int unit);
++extern struct net_device *bionet_probe(int unit);
++extern struct net_device *pamsnet_probe(int unit);
++extern struct net_device *cs89x0_probe(int unit);
++extern struct net_device *hplance_probe(int unit);
++extern struct net_device *bagetlance_probe(int unit);
++extern struct net_device *mvme147lance_probe(int unit);
++extern struct net_device *tc515_probe(int unit);
++extern struct net_device *lance_probe(int unit);
++extern struct net_device *mace_probe(int unit);
++extern struct net_device *macsonic_probe(int unit);
++extern struct net_device *mac8390_probe(int unit);
++extern struct net_device *mac89x0_probe(int unit);
++extern struct net_device *mc32_probe(int unit);
+ extern struct net_device *cops_probe(int unit);
+ extern struct net_device *ltpc_probe(void);
+   
+ /* Detachable devices ("pocket adaptors") */
+-extern int de620_probe(struct net_device *);
++extern struct net_device *de620_probe(int unit);
+ 
+ /* Fibre Channel adapters */
+ extern int iph5526_probe(struct net_device *dev);
+@@ -104,33 +103,22 @@ extern int iph5526_probe(struct net_devi
+ /* SBNI adapters */
+ extern int sbni_probe(int unit);
+ 
+-struct devprobe
+-{
+-	int (*probe)(struct net_device *dev);
++struct devprobe2 {
++	struct net_device *(*probe)(int unit);
+ 	int status;	/* non-zero if autoprobe has failed */
+ };
+ 
+-/*
+- * probe_list walks a list of probe functions and calls each so long
+- * as a non-zero ioaddr is given, or as long as it hasn't already failed 
+- * to find a card in the past (as recorded by "status") when asked to
+- * autoprobe (i.e. a probe that fails to find a card when autoprobing
+- * will not be asked to autoprobe again).  It exits when a card is found.
+- */
+-static int __init probe_list(struct net_device *dev, struct devprobe *plist)
++static int __init probe_list2(int unit, struct devprobe2 *p, int autoprobe)
+ {
+-	struct devprobe *p = plist;
+-	unsigned long base_addr = dev->base_addr;
+-
+-	while (p->probe != NULL) {
+-		if (base_addr && p->probe(dev) == 0) 	/* probe given addr */
++	struct net_device *dev;
++	for (; p->probe; p++) {
++		if (autoprobe && p->status)
++			continue;
++		dev = p->probe(unit);
++		if (!IS_ERR(dev))
+ 			return 0;
+-		else if (p->status == 0) {		/* has autoprobe failed yet? */
+-			p->status = p->probe(dev);	/* no, try autoprobe */
+-			if (p->status == 0)
+-				return 0;
+-		}
+-		p++;
++		if (autoprobe)
++			p->status = PTR_ERR(dev);
+ 	}
+ 	return -ENODEV;
+ }
+@@ -141,7 +129,8 @@ static int __init probe_list(struct net_
+  * drivers that probe for EISA cards (in the ISA group).  These are the
+  * legacy EISA only driver probes, and also the legacy PCI probes
+  */
+-static struct devprobe eisa_probes[] __initdata = {
++
++static struct devprobe2 eisa_probes[] __initdata = {
+ #ifdef CONFIG_ULTRA32 
+ 	{ultra32_probe, 0},	
+ #endif
+@@ -157,8 +146,7 @@ static struct devprobe eisa_probes[] __i
+ 	{NULL, 0},
+ };
+ 
+-
+-static struct devprobe mca_probes[] __initdata = {
++static struct devprobe2 mca_probes[] __initdata = {
+ #ifdef CONFIG_NE2_MCA
+ 	{ne2_probe, 0},
+ #endif
+@@ -178,7 +166,7 @@ static struct devprobe mca_probes[] __in
+  * ISA probes that touch addresses < 0x400 (including those that also
+  * look for EISA/PCI/MCA cards in addition to ISA cards).
+  */
+-static struct devprobe isa_probes[] __initdata = {
++static struct devprobe2 isa_probes[] __initdata = {
+ #ifdef CONFIG_HP100 		/* ISA, EISA & PCI */
+ 	{hp100_probe, 0},
+ #endif	
+@@ -215,9 +203,6 @@ static struct devprobe isa_probes[] __in
+ #ifdef CONFIG_SEEQ8005 
+ 	{seeq8005_probe, 0},
+ #endif
+-#ifdef CONFIG_AT1500
+-	{at1500_probe, 0},
+-#endif
+ #ifdef CONFIG_CS89x0
+  	{cs89x0_probe, 0},
+ #endif
+@@ -272,14 +257,14 @@ static struct devprobe isa_probes[] __in
+ 	{NULL, 0},
+ };
+ 
+-static struct devprobe parport_probes[] __initdata = {
++static struct devprobe2 parport_probes[] __initdata = {
+ #ifdef CONFIG_DE620		/* D-Link DE-620 adapter */
+ 	{de620_probe, 0},
+ #endif
+ 	{NULL, 0},
+ };
+ 
+-static struct devprobe m68k_probes[] __initdata = {
++static struct devprobe2 m68k_probes[] __initdata = {
+ #ifdef CONFIG_ATARILANCE	/* Lance-based Atari ethernet boards */
+ 	{atarilance_probe, 0},
+ #endif
+@@ -319,7 +304,7 @@ static struct devprobe m68k_probes[] __i
+ 	{NULL, 0},
+ };
+ 
+-static struct devprobe mips_probes[] __initdata = {
++static struct devprobe2 mips_probes[] __initdata = {
+ #ifdef CONFIG_MIPS_JAZZ_SONIC
+ 	{sonic_probe, 0},
+ #endif
+@@ -334,83 +319,65 @@ static struct devprobe mips_probes[] __i
+  * per bus interface. This drives the legacy devices only for now.
+  */
+  
+-static int __init ethif_probe(int unit)
++static void __init ethif_probe2(int unit)
+ {
+-	struct net_device *dev;
+-	int err = -ENODEV;
++	unsigned long base_addr = netdev_boot_base("eth", unit);
+ 
+-	dev = alloc_etherdev(0);
+-	if (!dev)
+-		return -ENOMEM;
+-
+-	sprintf(dev->name, "eth%d", unit);
+-	netdev_boot_setup_check(dev);
+-
+-	/* 
+-	 * Backwards compatibility - historically an I/O base of 1 was 
+-	 * used to indicate not to probe for this ethN interface 
+-	 */
+-	if (dev->base_addr == 1) {
+-		free_netdev(dev);
+-		return -ENXIO;
+-	}
+-
+-	/* 
+-	 * The arch specific probes are 1st so that any on-board ethernet
+-	 * will be probed before other ISA/EISA/MCA/PCI bus cards.
+-	 */
+-	if (probe_list(dev, m68k_probes) == 0 ||
+-	    probe_list(dev, mips_probes) == 0 ||
+-	    probe_list(dev, eisa_probes) == 0 ||
+-	    probe_list(dev, mca_probes) == 0 ||
+-	    probe_list(dev, isa_probes) == 0 ||
+-	    probe_list(dev, parport_probes) == 0) 
+-		err = register_netdev(dev);
+-
+-	if (err)
+-		free_netdev(dev);
+-	return err;
++	if (base_addr == 1)
++		return;
+ 
++	(void)(	probe_list2(unit, m68k_probes, base_addr == 0) &&
++		probe_list2(unit, mips_probes, base_addr == 0) &&
++		probe_list2(unit, eisa_probes, base_addr == 0) &&
++		probe_list2(unit, mca_probes, base_addr == 0) &&
++		probe_list2(unit, isa_probes, base_addr == 0) &&
++		probe_list2(unit, parport_probes, base_addr == 0));
+ }
+ 
+ #ifdef CONFIG_TR
+ /* Token-ring device probe */
+-extern int ibmtr_probe(struct net_device *);
+-extern int sk_isa_probe(struct net_device *);
+-extern int proteon_probe(struct net_device *);
+-extern int smctr_probe(struct net_device *);
++extern int ibmtr_probe_card(struct net_device *);
++extern struct net_device *sk_isa_probe(int unit);
++extern struct net_device *proteon_probe(int unit);
++extern struct net_device *smctr_probe(int unit);
++
++static struct devprobe2 tr_probes2[] __initdata = {
++#ifdef CONFIG_SKISA
++	{sk_isa_probe, 0},
++#endif
++#ifdef CONFIG_PROTEON
++	{proteon_probe, 0},
++#endif
++#ifdef CONFIG_SMCTR
++	{smctr_probe, 0},
++#endif
++	{NULL, 0},
++};
+ 
+ static __init int trif_probe(int unit)
+ {
+-	struct net_device *dev;
+ 	int err = -ENODEV;
+-	
+-	dev = alloc_trdev(0);
++#ifdef CONFIG_IBMTR
++	struct net_device *dev = alloc_trdev(0);
+ 	if (!dev)
+ 		return -ENOMEM;
+ 
+ 	sprintf(dev->name, "tr%d", unit);
+ 	netdev_boot_setup_check(dev);
+-	if (
+-#ifdef CONFIG_IBMTR
+-	    ibmtr_probe(dev) == 0  ||
+-#endif
+-#ifdef CONFIG_SKISA
+-	    sk_isa_probe(dev) == 0 || 
+-#endif
+-#ifdef CONFIG_PROTEON
+-	    proteon_probe(dev) == 0 ||
+-#endif
+-#ifdef CONFIG_SMCTR
+-	    smctr_probe(dev) == 0 ||
+-#endif
+-	    0 ) 
+-		err = register_netdev(dev);
+-		
++	err = ibmtr_probe_card(dev);
+ 	if (err)
+ 		free_netdev(dev);
++#endif
+ 	return err;
++}
++
++static void __init trif_probe2(int unit)
++{
++	unsigned long base_addr = netdev_boot_base("tr", unit);
+ 
++	if (base_addr == 1)
++		return;
++	probe_list2(unit, tr_probes2, base_addr == 0);
+ }
+ #endif
+ 
+@@ -437,10 +404,11 @@ static int __init net_olddevs_init(void)
+ #endif
+ #ifdef CONFIG_TR
+ 	for (num = 0; num < 8; ++num)
+-		trif_probe(num);
++		if (!trif_probe(num))
++			trif_probe2(num);
+ #endif
+ 	for (num = 0; num < 8; ++num)
+-		ethif_probe(num);
++		ethif_probe2(num);
+ 
+ #ifdef CONFIG_COPS
+ 	cops_probe(0);
+--- linux-2.6.0/drivers/net/starfire.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/net/starfire.c	2003-12-28 23:21:01.000000000 -0800
+@@ -139,7 +139,6 @@ TODO:	bugfixes (no bugs known as of righ
+ #include <linux/config.h>
+ #include <linux/version.h>
+ #include <linux/module.h>
+-#include <asm/io.h>
+ #include <linux/kernel.h>
+ #include <linux/pci.h>
+ #include <linux/netdevice.h>
+--- linux-2.6.0/drivers/net/stnic.c	2003-06-14 12:18:25.000000000 -0700
++++ 25/drivers/net/stnic.c	2003-12-28 23:21:01.000000000 -0800
+@@ -98,28 +98,20 @@ STNIC_WRITE (int reg, byte val)
+   STNIC_DELAY ();
+ }
+ 
+-int __init stnic_probe(void)
++static int __init stnic_probe(void)
+ {
+   struct net_device *dev;
+-  int i;
++  int i, err;
+ 
+   /* If we are not running on a SolutionEngine, give up now */
+   if (! MACH_SE)
+     return -ENODEV;
+ 
+   /* New style probing API */
+-  dev = init_etherdev (NULL, 0);
++  dev = alloc_ei_netdev();
+   if (!dev)
+   	return -ENOMEM;
+   SET_MODULE_OWNER(dev);
+-  stnic_dev = dev;
+-
+-  /* Allocate dev->priv and fill in 8390 specific dev fields. */
+-  if (ethdev_init (dev))
+-    {
+-      printk (KERN_EMERG "Unable to get memory for dev->priv.\n");
+-      return -ENOMEM;
+-    }
+ 
+ #ifdef CONFIG_SH_STANDARD_BIOS 
+   sh_bios_get_node_addr (stnic_eadr);
+@@ -135,13 +127,11 @@ int __init stnic_probe(void)
+ 
+   /* Snarf the interrupt now.  There's no point in waiting since we cannot
+      share and the board will usually be enabled. */
+-  i = request_irq (dev->irq, ei_interrupt, 0, dev->name, dev);
+-  if (i)  {
++  err = request_irq (dev->irq, ei_interrupt, 0, dev->name, dev);
++  if (err)  {
+       printk (KERN_EMERG " unable to get IRQ %d.\n", dev->irq);
+-      unregister_netdev(dev);
+-      kfree(dev->priv);
+-      kfree(dev);
+-      return i;
++      free_netdev(dev);
++      return err;
+     }
+ 
+   ei_status.name = dev->name;
+@@ -162,6 +152,14 @@ int __init stnic_probe(void)
+ 
+   stnic_init (dev);
+ 
++  err = register_netdev(dev);
++  if (err) {
++    free_irq(dev->irq, dev);
++    free_netdev(dev);
++    return err;
++  }
++  stnic_dev = dev;
++
+   printk (KERN_INFO "NS ST-NIC 83902A\n");
+ 
+   return 0;
+@@ -305,15 +303,13 @@ stnic_init (struct net_device *dev)
+   return;
+ }
+ 
+-/* Hardware interrupt handler.  */
+-extern void ei_interrupt (int irq, void *dev_id, struct pt_regs *regs);
+-
+-void
+-do_stnic_intr (int irq, void *dev_id, struct pt_regs *regs)
++static void __exit stnic_cleanup(void)
+ {
+-  ei_interrupt (0, stnic_dev, regs);
++	unregister_netdev(stnic_dev);
++	free_irq(stnic_dev->irq, stnic_dev);
++	free_netdev(stnic_dev);
+ }
+ 
+ module_init(stnic_probe);
+-/* No cleanup routine. */
++module_exit(stnic_cleanup);
+ MODULE_LICENSE("GPL");
+--- linux-2.6.0/drivers/net/sun3_82586.c	2003-06-14 12:18:22.000000000 -0700
++++ 25/drivers/net/sun3_82586.c	2003-12-28 23:21:01.000000000 -0800
+@@ -55,6 +55,7 @@ static int fifo=0x8;	/* don't change */
+ 
+ #define DEBUG       /* debug on */
+ #define SYSBUSVAL 0 /* 16 Bit */
++#define SUN3_82586_TOTAL_SIZE	PAGE_SIZE
+ 
+ #define sun3_attn586()  {*(volatile unsigned char *)(dev->base_addr) |= IEOB_ATTEN; *(volatile unsigned char *)(dev->base_addr) &= ~IEOB_ATTEN;}
+ #define sun3_reset586() {*(volatile unsigned char *)(dev->base_addr) = 0; udelay(100); *(volatile unsigned char *)(dev->base_addr) = IEOB_NORSET;}
+@@ -277,10 +278,12 @@ static void alloc586(struct net_device *
+ 	memset((char *)p->scb,0,sizeof(struct scb_struct));
+ }
+ 
+-int __init sun3_82586_probe(struct net_device *dev)
++struct net_device * __init sun3_82586_probe(int unit)
+ {
++	struct net_device *dev;
+ 	unsigned long ioaddr;
+ 	static int found = 0;
++	int err = -ENOMEM;
+ 	
+ 	/* check that this machine has an onboard 82586 */
+ 	switch(idprom->id_machtype) {
+@@ -290,31 +293,51 @@ int __init sun3_82586_probe(struct net_d
+ 		break;
+ 
+ 	default:
+-		return(-ENODEV);
++		return ERR_PTR(-ENODEV);
+ 	}
+ 
+-	if(found)
+-		return -ENODEV;
++	if (found)
++		return ERR_PTR(-ENODEV);
+ 	
+-	ioaddr = (unsigned long)ioremap(IE_OBIO, PAGE_SIZE);
++	ioaddr = (unsigned long)ioremap(IE_OBIO, SUN3_82586_TOTAL_SIZE);
++	if (!ioaddr)
++		return ERR_PTR(-ENOMEM);
+ 	found = 1;
+ 	
++	dev = alloc_etherdev(sizeof(struct priv));
++	if (!dev)
++		goto out;
++	if (unit >= 0) {
++		sprintf(dev->name, "eth%d", unit);
++		netdev_boot_setup_check(dev);
++	}
+ 	SET_MODULE_OWNER(dev);
+ 
+ 	dev->irq = IE_IRQ;
+ 	dev->base_addr = ioaddr;
+-	if(sun3_82586_probe1(dev, ioaddr) == 0)
+-		return 0;
+-
+-	return -ENODEV;
++	err = sun3_82586_probe1(dev, ioaddr);
++	if (err)
++		goto out1;
++	err = register_netdev(dev);
++	if (err)
++		goto out2;
++	return dev;
++
++out2:
++	release_region(ioaddr, SUN3_82586_TOTAL_SIZE);
++out1:
++	free_netdev(dev);
++out:
++	iounmap((void *)ioaddr);
++	return ERR_PTR(err);
+ }
+ 
+ static int __init sun3_82586_probe1(struct net_device *dev,int ioaddr)
+ {
+ 	int i, size, retval;
+ 
+-//	if (!request_region(ioaddr, SUN3_82586_TOTAL_SIZE, dev->name))
+-//		return -EBUSY;
++	if (!request_region(ioaddr, SUN3_82586_TOTAL_SIZE, dev->name))
++		return -EBUSY;
+ 
+ 	/* copy in the ethernet address from the prom */
+ 	for(i = 0; i < 6 ; i++)
+@@ -341,16 +364,6 @@ static int __init sun3_82586_probe1(stru
+ 		goto out;
+ 	}
+ 
+-	dev->priv = (void *) kmalloc(sizeof(struct priv),GFP_KERNEL);
+-	if(dev->priv == NULL) {
+-		printk("%s: Ooops .. can't allocate private driver memory.\n",dev->name);
+-		retval = -ENOMEM;
+-		goto out;
+-	}
+-
+-	/* warning: we don't free it on errors */
+-	memset((char *) dev->priv,0,sizeof(struct priv));
+-
+ 	((struct priv *) (dev->priv))->memtop = (char *)dvma_btov(dev->mem_start);
+ 	((struct priv *) (dev->priv))->base = (unsigned long) dvma_btov(0);
+ 	alloc586(dev);
+@@ -374,11 +387,9 @@ static int __init sun3_82586_probe1(stru
+ 	dev->set_multicast_list = set_multicast_list;
+ 
+ 	dev->if_port 		= 0;
+-
+-	ether_setup(dev);
+-
+ 	return 0;
+ out:
++	release_region(ioaddr, SUN3_82586_TOTAL_SIZE);
+ 	return retval;
+ }
+ 
+@@ -1138,21 +1149,23 @@ static void set_multicast_list(struct ne
+ 
+ #ifdef MODULE
+ #error This code is not currently supported as a module
+-static struct net_device dev_sun3_82586;
++static struct net_device *dev_sun3_82586;
+ 
+ int init_module(void)
+ {
+-	dev_sun3_82586.init = sun3_82586_probe;
+-	if (register_netdev(&dev_sun3_82586) != 0)
+-		return -EIO;
++	dev_sun3_82586 = sun3_82586_probe(-1);
++	if (IS_ERR(dev_sun3_82586))
++		return PTR_ERR(dev_sun3_82586);
+ 	return 0;
+ }
+ 
+ void cleanup_module(void)
+ {
+-	unregister_netdev(&dev_sun3_82586);
+-	kfree(dev_sun3_82586.priv);
+-	dev_sun3_82586.priv = NULL;
++	unsigned long ioaddr = dev_sun3_82586->base_addr;
++	unregister_netdev(dev_sun3_82586);
++	release_region(ioaddr, SUN3_82586_TOTAL_SIZE);
++	iounmap((void *)ioaddr);
++	free_netdev(dev_sun3_82586);
+ }
+ #endif /* MODULE */
+ 
+--- linux-2.6.0/drivers/net/sun3lance.c	2003-06-14 12:18:32.000000000 -0700
++++ 25/drivers/net/sun3lance.c	2003-12-28 23:21:01.000000000 -0800
+@@ -246,9 +246,11 @@ static void set_multicast_list( struct n
+ 
+ /************************* End of Prototypes **************************/
+ 
+-int __init sun3lance_probe( struct net_device *dev )
+-{	
++struct net_device * __init sun3lance_probe(int unit)
++{
++	struct net_device *dev;
+ 	static int found;
++	int err = -ENODEV;
+ 
+ 	/* check that this machine has an onboard lance */
+ 	switch(idprom->id_machtype) {
+@@ -259,18 +261,37 @@ int __init sun3lance_probe( struct net_d
+ 		break;
+ 
+ 	default:
+-		return(-ENODEV);
++		return ERR_PTR(-ENODEV);
+ 	}
+ 
+-	if(found)
+-		return(-ENODEV);
++	if (found)
++		return ERR_PTR(-ENODEV);
+ 
+-	if (lance_probe(dev)) {
+-			found = 1;
+-			return( 0 );
++	dev = alloc_etherdev(sizeof(struct lance_private));
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++	if (unit >= 0) {
++		sprintf(dev->name, "eth%d", unit);
++		netdev_boot_setup_check(dev);
+ 	}
++	SET_MODULE_OWNER(dev);
++
++	if (!lance_probe(dev))
++		goto out;
+ 
+-	return( -ENODEV );
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	found = 1;
++	return dev;
++
++out1:
++#ifdef CONFIG_SUN3
++	iounmap((void *)dev->base_addr);
++#endif
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
+ static int __init lance_probe( struct net_device *dev)
+@@ -285,6 +306,8 @@ static int __init lance_probe( struct ne
+ 
+ #ifdef CONFIG_SUN3
+ 	ioaddr = (unsigned long)ioremap(LANCE_OBIO, PAGE_SIZE);
++	if (!ioaddr)
++		return 0;
+ #else
+ 	ioaddr = SUN3X_LANCE;
+ #endif
+@@ -303,17 +326,15 @@ static int __init lance_probe( struct ne
+ 		ioaddr_probe[0] = tmp1;
+ 		ioaddr_probe[1] = tmp2;
+ 
++#ifdef CONFIG_SUN3
++		iounmap((void *)ioaddr);
++#endif
+ 		return 0;
+ 	}
+ 
+-	init_etherdev( dev, sizeof(struct lance_private) );
+-	if (!dev->priv) {
+-		dev->priv = kmalloc( sizeof(struct lance_private), GFP_KERNEL );
+-		if (!dev->priv)
+-			return 0;
+-	}
+ 	lp = (struct lance_private *)dev->priv;
+ 
++	/* XXX - leak? */
+ 	MEM = dvma_malloc_align(sizeof(struct lance_memory), 0x10000);
+ 
+ 	lp->iobase = (volatile unsigned short *)ioaddr;
+@@ -921,32 +942,24 @@ static void set_multicast_list( struct n
+ 
+ 
+ #ifdef MODULE
+-static char devicename[9];
+ 
+-static struct net_device sun3lance_dev =
+-{
+-	devicename,	/* filled in by register_netdev() */
+-	0, 0, 0, 0,	/* memory */
+-	0, 0,		/* base, irq */
+-	0, 0, 0, NULL, sun3lance_probe,
+-};
++static struct net_device *sun3lance_dev;
+ 
+ int init_module(void)
+ {
+-	int err;
+-
+-	if ((err = register_netdev( &sun3lance_dev ))) {
+-		if (err == -EIO)  {
+-			printk( "SUN3 Lance not detected.  Module not loaded.\n");
+-		}
+-		return( err );
+-	}
+-	return( 0 );
++	sun3lance_dev = sun3lance_probe(-1);
++	if (IS_ERR(sun3lance_dev))
++		return PTR_ERR(sun3lance_dev);
++	return 0;
+ }
+ 
+ void cleanup_module(void)
+ {
+-	unregister_netdev( &sun3lance_dev );
++	unregister_netdev(sun3lance_dev);
++#ifdef CONFIG_SUN3
++	iounmap((void *)sun3lance_dev->base_addr);
++#endif
++	free_netdev(sun3lance_dev);
+ }
+ 
+ #endif /* MODULE */
+--- linux-2.6.0/drivers/net/tc35815.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/tc35815.c	2003-12-28 23:21:01.000000000 -0800
+@@ -463,7 +463,6 @@ static void	tc35815_set_multicast_list(s
+ static void 	tc35815_chip_reset(struct net_device *dev);
+ static void 	tc35815_chip_init(struct net_device *dev);
+ static void 	tc35815_phy_chip_init(struct net_device *dev);
+-static int 	tc35815_proc_info(char *buffer, char **start, off_t offset, int length, int *eof, void *data);
+ 
+ /* A list of all installed tc35815 devices. */
+ static struct net_device *root_tc35815_dev = NULL;
+@@ -482,78 +481,76 @@ int
+ tc35815_probe(struct pci_dev *pdev,
+ 		const struct pci_device_id *ent)
+ {
+-	static int called = 0;
+ 	int err = 0;
+ 	int ret;
++	unsigned long pci_memaddr;
++	unsigned int pci_irq_line;
+ 
+-	if (called)
+-		return -ENODEV;
+-	called++;
++	printk(KERN_INFO "tc35815_probe: found device %#08x.%#08x\n", ent->vendor, ent->device);
+ 
+-	if (pdev) {
+-		unsigned int pci_memaddr;
+-		unsigned int pci_irq_line;
++	err = pci_enable_device(pdev);
++	if (err)
++		return err;
+ 
+-		printk(KERN_INFO "tc35815_probe: found device %#08x.%#08x\n", ent->vendor, ent->device);
++        pci_memaddr = pci_resource_start (pdev, 1);
+ 
+-	        pci_memaddr = pci_resource_start (pdev, 1);
++        printk(KERN_INFO "    pci_memaddr=%#08lx  resource_flags=%#08lx\n", pci_memaddr, pci_resource_flags (pdev, 0));
+ 
+-	        printk(KERN_INFO "    pci_memaddr=%#08lx  resource_flags=%#08lx\n", pci_memaddr, pci_resource_flags (pdev, 0));
++	if (!pci_memaddr) {
++		printk(KERN_WARNING "no PCI MEM resources, aborting\n");
++		ret = -ENODEV;
++		goto err_out;
++	}
++	pci_irq_line = pdev->irq;
++	/* irq disabled. */
++	if (pci_irq_line == 0) {
++		printk(KERN_WARNING "no PCI irq, aborting\n");
++		ret = -ENODEV;
++		goto err_out;
++	}
+ 
+-		if (!pci_memaddr) {
+-			printk(KERN_WARNING "no PCI MEM resources, aborting\n");
+-			return -ENODEV;
+-		}
+-		pci_irq_line = pdev->irq;
+-		/* irq disabled. */
+-		if (pci_irq_line == 0) {
+-			printk(KERN_WARNING "no PCI irq, aborting\n");
+-			return -ENODEV;
+-		}
++	ret =  tc35815_probe1(pdev, pci_memaddr, pci_irq_line);
++	if (ret)
++		goto err_out;
+ 
+-		ret =  tc35815_probe1(pdev, pci_memaddr, pci_irq_line);
++	pci_set_master(pdev);
+ 
+-		if (!ret) {
+-			if ((err = pci_enable_device(pdev)) < 0) {
+-			    printk(KERN_ERR "tc35815_probe: failed to enable device -- err=%d\n", err);
+-			    return err;
+-			}
+-			pci_set_master(pdev);
+-		}
++	return 0;
+ 
+-		return ret;
+-	}
+-	return -ENODEV;
++err_out:
++	pci_disable_device(pdev);
++	return ret;
+ }
+ 
+ static int __devinit tc35815_probe1(struct pci_dev *pdev, unsigned int base_addr, unsigned int irq)
+ {
+ 	static unsigned version_printed = 0;
+-	int i;
++	int i, ret;
+ 	struct tc35815_local *lp;
+ 	struct tc35815_regs *tr;
+ 	struct net_device *dev;
+ 
+ 	/* Allocate a new 'dev' if needed. */
+-	dev = init_etherdev(NULL, sizeof(struct tc35815_local));
++	dev = alloc_etherdev(sizeof(struct tc35815_local));
+ 	if (dev == NULL)
+ 		return -ENOMEM;
+ 
+ 	/*
+-	 * init_etherdev allocs and zeros dev->priv
++	 * alloc_etherdev allocs and zeros dev->priv
+ 	 */
+ 	lp = dev->priv;
+ 
+ 	if (tc35815_debug  &&  version_printed++ == 0)
+ 		printk(KERN_DEBUG "%s", version);
+ 
+-	printk(KERN_INFO "%s: %s found at %#x, irq %d\n",
+-	       dev->name, cardname, base_addr, irq);
+-
+ 	/* Fill in the 'dev' fields. */
+ 	dev->irq = irq;
+ 	dev->base_addr = (unsigned long)ioremap(base_addr,
+ 						sizeof(struct tc35815_regs));
++	if (!dev->base_addr) {
++		ret = -ENOMEM;
++		goto err_out;
++	}
+ 	tr = (struct tc35815_regs*)dev->base_addr;
+ 
+ 	tc35815_chip_reset(dev);
+@@ -570,9 +567,6 @@ static int __devinit tc35815_probe1(stru
+ 		dev->dev_addr[i] = data & 0xff;
+ 		dev->dev_addr[i+1] = data >> 8;
+ 	}
+-	for (i = 0; i < 6; i++)
+-		printk(" %2.2x", dev->dev_addr[i]);
+-	printk("\n");
+ 
+ 	/* Initialize the device structure. */
+ 	lp->pdev = pdev;
+@@ -594,8 +588,6 @@ static int __devinit tc35815_probe1(stru
+ 
+ 	/* do auto negotiation */
+ 	tc35815_phy_chip_init(dev);
+-	printk(KERN_INFO "%s: linkspeed %dMbps, %s Duplex\n",
+-	       dev->name, lp->linkspeed, lp->fullduplex ? "Full" : "Half");
+ 
+ 	dev->open		= tc35815_open;
+ 	dev->stop		= tc35815_close;
+@@ -604,20 +596,34 @@ static int __devinit tc35815_probe1(stru
+ 	dev->hard_start_xmit	= tc35815_send_packet;
+ 	dev->get_stats		= tc35815_get_stats;
+ 	dev->set_multicast_list = tc35815_set_multicast_list;
++	SET_MODULE_OWNER(dev);
+ 
+-#if 0	/* XXX called in init_etherdev */
+-	/* Fill in the fields of the device structure with ethernet values. */
+-	ether_setup(dev);
+-#endif
++	ret = register_netdev(dev);
++	if (ret)
++		goto err_out_iounmap;
++
++	printk(KERN_INFO "%s: %s found at %#x, irq %d, MAC",
++	       dev->name, cardname, base_addr, irq);
++	for (i = 0; i < 6; i++)
++		printk(" %2.2x", dev->dev_addr[i]);
++	printk("\n");
++	printk(KERN_INFO "%s: linkspeed %dMbps, %s Duplex\n",
++	       dev->name, lp->linkspeed, lp->fullduplex ? "Full" : "Half");
+ 
+ 	return 0;
++
++err_out_iounmap:
++	iounmap((void *) dev->base_addr);
++err_out:
++	free_netdev(dev);
++	return ret;
+ }
+ 
+ 
+ static int
+ tc35815_init_queues(struct net_device *dev)
+ {
+-	struct tc35815_local *lp = (struct tc35815_local *)dev->priv;
++	struct tc35815_local *lp = dev->priv;
+ 	int i;
+ 	unsigned long fd_addr;
+ 
+@@ -702,7 +708,7 @@ tc35815_init_queues(struct net_device *d
+ static void
+ tc35815_clear_queues(struct net_device *dev)
+ {
+-	struct tc35815_local *lp = (struct tc35815_local *)dev->priv;
++	struct tc35815_local *lp = dev->priv;
+ 	int i;
+ 
+ 	for (i = 0; i < TX_FD_NUM; i++) {
+@@ -719,7 +725,7 @@ tc35815_clear_queues(struct net_device *
+ static void
+ tc35815_free_queues(struct net_device *dev)
+ {
+-	struct tc35815_local *lp = (struct tc35815_local *)dev->priv;
++	struct tc35815_local *lp = dev->priv;
+ 	int i;
+ 
+ 	if (lp->tfd_base) {
+@@ -805,7 +811,7 @@ dump_frfd(struct FrFD *fd)
+ static void
+ panic_queues(struct net_device *dev)
+ {
+-	struct tc35815_local *lp = (struct tc35815_local *)dev->priv;
++	struct tc35815_local *lp = dev->priv;
+ 	int i;
+ 
+ 	printk("TxFD base %p, start %d, end %d\n",
+@@ -823,6 +829,7 @@ panic_queues(struct net_device *dev)
+ 	panic("%s: Illegal queue state.", dev->name);
+ }
+ 
++#if 0
+ static void print_buf(char *add, int length)
+ {
+ 	int i;
+@@ -839,6 +846,7 @@ static void print_buf(char *add, int len
+ 	}
+ 	printk("\n");
+ }
++#endif
+ 
+ static void print_eth(char *add)
+ {
+@@ -864,7 +872,7 @@ static void print_eth(char *add)
+ static int
+ tc35815_open(struct net_device *dev)
+ {
+-	struct tc35815_local *lp = (struct tc35815_local *)dev->priv;
++	struct tc35815_local *lp = dev->priv;
+ 	/*
+ 	 * This is used if the interrupt line can turned off (shared).
+ 	 * See 3c503.c for an example of selecting the IRQ at config-time.
+@@ -888,19 +896,17 @@ tc35815_open(struct net_device *dev)
+ 	lp->tbusy = 0;
+ 	netif_start_queue(dev);
+ 
+-	MOD_INC_USE_COUNT;
+-
+ 	return 0;
+ }
+ 
+ static void tc35815_tx_timeout(struct net_device *dev)
+ {
+-	struct tc35815_local *lp = (struct tc35815_local *)dev->priv;
++	struct tc35815_local *lp = dev->priv;
+ 	struct tc35815_regs *tr = (struct tc35815_regs *)dev->base_addr;
+-	int flags;
++	unsigned long flags;
+ 
+ 	spin_lock_irqsave(&lp->lock, flags);
+-	printk(KERN_WARNING "%s: transmit timed out, status %#x\n",
++	printk(KERN_WARNING "%s: transmit timed out, status %#lx\n",
+ 	       dev->name, tc_readl(&tr->Tx_Stat));
+ 	/* Try to restart the adaptor. */
+ 	tc35815_chip_reset(dev);
+@@ -914,7 +920,7 @@ static void tc35815_tx_timeout(struct ne
+ 
+ static int tc35815_send_packet(struct sk_buff *skb, struct net_device *dev)
+ {
+-	struct tc35815_local *lp = (struct tc35815_local *)dev->priv;
++	struct tc35815_local *lp = dev->priv;
+ 	struct tc35815_regs *tr = (struct tc35815_regs *)dev->base_addr;
+ 
+ 	if (netif_queue_stopped(dev)) {
+@@ -925,7 +931,7 @@ static int tc35815_send_packet(struct sk
+ 		int tickssofar = jiffies - dev->trans_start;
+ 		if (tickssofar < 5)
+ 			return 1;
+-		printk(KERN_WARNING "%s: transmit timed out, status %#x\n",
++		printk(KERN_WARNING "%s: transmit timed out, status %#lx\n",
+ 		       dev->name, tc_readl(&tr->Tx_Stat));
+ 		/* Try to restart the adaptor. */
+ 		tc35815_chip_reset(dev);
+@@ -947,7 +953,7 @@ static int tc35815_send_packet(struct sk
+ 		short length = ETH_ZLEN < skb->len ? skb->len : ETH_ZLEN;
+ 		unsigned char *buf = skb->data;
+ 		struct TxFD *txfd = &lp->tfd_base[lp->tfd_start];
+-		int flags;
++		unsigned long flags;
+ 		lp->stats.tx_bytes += skb->len;
+ 
+ 
+@@ -1051,7 +1057,7 @@ static irqreturn_t tc35815_interrupt(int
+ 	}
+ 
+ 	tr = (struct tc35815_regs*)dev->base_addr;
+-	lp = (struct tc35815_local *)dev->priv;
++	lp = dev->priv;
+ 
+ 	do {
+ 		status = tc_readl(&tr->Int_Src);
+@@ -1107,7 +1113,7 @@ static irqreturn_t tc35815_interrupt(int
+ static void
+ tc35815_rx(struct net_device *dev)
+ {
+-	struct tc35815_local *lp = (struct tc35815_local *)dev->priv;
++	struct tc35815_local *lp = dev->priv;
+ 	struct tc35815_regs *tr = (struct tc35815_regs*)dev->base_addr;
+ 	unsigned int fdctl;
+ 	int i;
+@@ -1157,7 +1163,9 @@ tc35815_rx(struct net_device *dev)
+ 				offset += len;
+ 				cur_bd++;
+ 			}
+-	//		print_buf(data,pkt_len);
++#if 0
++			print_buf(data,pkt_len);
++#endif
+ 			if (tc35815_debug > 3)
+ 				print_eth(data);
+ 			skb->protocol = eth_type_trans(skb, dev);
+@@ -1247,7 +1255,7 @@ tc35815_rx(struct net_device *dev)
+ static void
+ tc35815_check_tx_stat(struct net_device *dev, int status)
+ {
+-	struct tc35815_local *lp = (struct tc35815_local *)dev->priv;
++	struct tc35815_local *lp = dev->priv;
+ 	const char *msg = NULL;
+ 
+ 	/* count collisions */
+@@ -1304,7 +1312,7 @@ tc35815_check_tx_stat(struct net_device 
+ static void
+ tc35815_txdone(struct net_device *dev)
+ {
+-	struct tc35815_local *lp = (struct tc35815_local *)dev->priv;
++	struct tc35815_local *lp = dev->priv;
+ 	struct tc35815_regs *tr = (struct tc35815_regs*)dev->base_addr;
+ 	struct TxFD *txfd;
+ 	unsigned int fdctl;
+@@ -1379,7 +1387,7 @@ tc35815_txdone(struct net_device *dev)
+ static int
+ tc35815_close(struct net_device *dev)
+ {
+-	struct tc35815_local *lp = (struct tc35815_local *)dev->priv;
++	struct tc35815_local *lp = dev->priv;
+ 
+ 	lp->tbusy = 1;
+ 	netif_stop_queue(dev);
+@@ -1391,8 +1399,6 @@ tc35815_close(struct net_device *dev)
+ 
+ 	tc35815_free_queues(dev);
+ 
+-	MOD_DEC_USE_COUNT;
+-
+ 	return 0;
+ }
+ 
+@@ -1402,7 +1408,7 @@ tc35815_close(struct net_device *dev)
+  */
+ static struct net_device_stats *tc35815_get_stats(struct net_device *dev)
+ {
+-	struct tc35815_local *lp = (struct tc35815_local *)dev->priv;
++	struct tc35815_local *lp = dev->priv;
+ 	struct tc35815_regs *tr = (struct tc35815_regs*)dev->base_addr;
+ 	unsigned long flags;
+ 
+@@ -1456,7 +1462,7 @@ static void tc35815_set_cam_entry(struct
+ 		int i;
+ 		for (i = cam_index / 4; i < cam_index / 4 + 2; i++) {
+ 			tc_writel(i * 4, &tr->CAM_Adr);
+-			printk("CAM 0x%x: %08x",
++			printk("CAM 0x%x: %08lx",
+ 			       i * 4, tc_readl(&tr->CAM_Data));
+ 		}
+ 	}
+@@ -1513,9 +1519,9 @@ tc35815_set_multicast_list(struct net_de
+ 
+ static unsigned long tc_phy_read(struct net_device *dev, struct tc35815_regs *tr, int phy, int phy_reg)
+ {
+-	struct tc35815_local *lp = (struct tc35815_local *)dev->priv;
++	struct tc35815_local *lp = dev->priv;
+ 	unsigned long data;
+-	int flags;
++	unsigned long flags;
+ 	
+ 	spin_lock_irqsave(&lp->lock, flags);
+ 
+@@ -1529,8 +1535,8 @@ static unsigned long tc_phy_read(struct 
+ 
+ static void tc_phy_write(struct net_device *dev, unsigned long d, struct tc35815_regs *tr, int phy, int phy_reg)
+ {
+-	struct tc35815_local *lp = (struct tc35815_local *)dev->priv;
+-	int flags;
++	struct tc35815_local *lp = dev->priv;
++	unsigned long flags;
+ 
+ 	spin_lock_irqsave(&lp->lock, flags);
+ 
+@@ -1543,7 +1549,7 @@ static void tc_phy_write(struct net_devi
+ 
+ static void tc35815_phy_chip_init(struct net_device *dev)
+ {
+-	struct tc35815_local *lp = (struct tc35815_local *)dev->priv;
++	struct tc35815_local *lp = dev->priv;
+ 	struct tc35815_regs *tr = (struct tc35815_regs*)dev->base_addr;
+ 	static int first = 1;
+ 	unsigned short ctl;
+@@ -1648,9 +1654,9 @@ static void tc35815_chip_reset(struct ne
+ 
+ static void tc35815_chip_init(struct net_device *dev)
+ {
+-	struct tc35815_local *lp = (struct tc35815_local *)dev->priv;
++	struct tc35815_local *lp = dev->priv;
+ 	struct tc35815_regs *tr = (struct tc35815_regs*)dev->base_addr;
+-	int flags;
++	unsigned long flags;
+ 	unsigned long txctl = TX_CTL_CMD;
+ 
+ 	tc35815_phy_chip_init(dev);
+@@ -1696,40 +1702,6 @@ static void tc35815_chip_init(struct net
+ 	spin_unlock_irqrestore(&lp->lock, flags);
+ }
+ 
+-static int tc35815_proc_info(char *buffer, char **start, off_t offset, int length, int *eof, void *data)
+-{
+-	int len = 0;
+-	off_t pos = 0;
+-	off_t begin = 0;
+-	struct net_device *dev;
+-
+-	len += sprintf(buffer, "TC35815 statistics:\n");
+-	for (dev = root_tc35815_dev; dev; dev = ((struct tc35815_local *)dev->priv)->next_module) {
+-		struct tc35815_local *lp = (struct tc35815_local *)dev->priv;
+-		len += sprintf(buffer + len,
+-			       "%s: tx_ints %d, rx_ints %d, max_tx_qlen %d\n",
+-			       dev->name,
+-			       lp->lstats.tx_ints,
+-			       lp->lstats.rx_ints,
+-			       lp->lstats.max_tx_qlen);
+-		pos = begin + len;
+-
+-		if (pos < offset) {
+-			len = 0;
+-			begin = pos;
+-		}
+-    
+-		if (pos > offset+length) break;
+-	}
+-
+-	*start = buffer + (offset - begin);
+-	len -= (offset - begin);
+-  
+-	if (len > length) len = length;
+-  
+-	return len;
+-}
+-
+ /* XXX */
+ void
+ tc35815_killall(void)
+--- linux-2.6.0/drivers/net/tg3.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/net/tg3.c	2003-12-28 23:21:01.000000000 -0800
+@@ -56,8 +56,8 @@
+ 
+ #define DRV_MODULE_NAME		"tg3"
+ #define PFX DRV_MODULE_NAME	": "
+-#define DRV_MODULE_VERSION	"2.3"
+-#define DRV_MODULE_RELDATE	"November 5, 2003"
++#define DRV_MODULE_VERSION	"2.4"
++#define DRV_MODULE_RELDATE	"December 2, 2003"
+ 
+ #define TG3_DEF_MAC_MODE	0
+ #define TG3_DEF_RX_MODE		0
+@@ -176,6 +176,10 @@ static struct pci_device_id tg3_pci_tbl[
+ 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+ 	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5901_2,
+ 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
++	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5704S_2,
++	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
++	{ PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5705F,
++	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+ 	{ PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9DXX,
+ 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0UL },
+ 	{ PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9MXX,
+@@ -2475,6 +2479,13 @@ static irqreturn_t tg3_interrupt(int irq
+ static int tg3_init_hw(struct tg3 *);
+ static int tg3_halt(struct tg3 *);
+ 
++#ifdef CONFIG_NET_POLL_CONTROLLER
++static void tg3_poll_controller(struct net_device *dev)
++{
++	tg3_interrupt(dev->irq, dev, NULL);
++}
++#endif
++
+ static void tg3_reset_task(void *_data)
+ {
+ 	struct tg3 *tp = _data;
+@@ -2688,7 +2699,13 @@ static int tg3_start_xmit_4gbug(struct s
+ 				mss |= (tsflags << 11);
+ 			}
+ 		} else {
+-			mss += tcp_opt_len;
++			if (tcp_opt_len || skb->nh.iph->ihl > 5) {
++				int tsflags;
++
++				tsflags = ((skb->nh.iph->ihl - 5) +
++					   (tcp_opt_len >> 2));
++				base_flags |= tsflags << 12;
++			}
+ 		}
+ 	}
+ #else
+@@ -2895,7 +2912,13 @@ static int tg3_start_xmit(struct sk_buff
+ 				mss |= (tsflags << 11);
+ 			}
+ 		} else {
+-			mss += tcp_opt_len;
++			if (tcp_opt_len || skb->nh.iph->ihl > 5) {
++				int tsflags;
++
++				tsflags = ((skb->nh.iph->ihl - 5) +
++					   (tcp_opt_len >> 2));
++				base_flags |= tsflags << 12;
++			}
+ 		}
+ 	}
+ #else
+@@ -3860,180 +3883,181 @@ static int tg3_load_5701_a0_firmware_fix
+ #if TG3_TSO_SUPPORT != 0
+ 
+ #define TG3_TSO_FW_RELEASE_MAJOR	0x1
+-#define TG3_TSO_FW_RELASE_MINOR		0x3
++#define TG3_TSO_FW_RELASE_MINOR		0x4
+ #define TG3_TSO_FW_RELEASE_FIX		0x0
+ #define TG3_TSO_FW_START_ADDR		0x08000000
+ #define TG3_TSO_FW_TEXT_ADDR		0x08000000
+-#define TG3_TSO_FW_TEXT_LEN		0x1ac0
+-#define TG3_TSO_FW_RODATA_ADDR		0x08001650
++#define TG3_TSO_FW_TEXT_LEN		0x1a90
++#define TG3_TSO_FW_RODATA_ADDR		0x08001a900
+ #define TG3_TSO_FW_RODATA_LEN		0x60
+-#define TG3_TSO_FW_DATA_ADDR		0x080016a0
++#define TG3_TSO_FW_DATA_ADDR		0x08001b20
+ #define TG3_TSO_FW_DATA_LEN		0x20
+-#define TG3_TSO_FW_SBSS_ADDR		0x080016c0
++#define TG3_TSO_FW_SBSS_ADDR		0x08001b40
+ #define TG3_TSO_FW_SBSS_LEN		0x2c
+-#define TG3_TSO_FW_BSS_ADDR		0x080016e0
+-#define TG3_TSO_FW_BSS_LEN		0x890
++#define TG3_TSO_FW_BSS_ADDR		0x08001b70
++#define TG3_TSO_FW_BSS_LEN		0x894
+ 
+ static u32 tg3TsoFwText[] = {
+ 	0x00000000, 0x10000003, 0x00000000, 0x0000000d, 0x0000000d, 0x3c1d0800,
+ 	0x37bd4000, 0x03a0f021, 0x3c100800, 0x26100000, 0x0e000010, 0x00000000,
+ 	0x0000000d, 0x00000000, 0x00000000, 0x00000000, 0x27bdffe0, 0x3c04fefe,
+-	0xafbf0018, 0x0e0005e0, 0x34840002, 0x0e000670, 0x00000000, 0x3c030800,
+-	0x90631b78, 0x24020002, 0x3c040800, 0x24841acc, 0x14620003, 0x24050001,
+-	0x3c040800, 0x24841ac0, 0x24060002, 0x00003821, 0xafa00010, 0x0e000684,
++	0xafbf0018, 0x0e0005d4, 0x34840002, 0x0e000664, 0x00000000, 0x3c030800,
++	0x90631b58, 0x24020002, 0x3c040800, 0x24841a9c, 0x14620003, 0x24050001,
++	0x3c040800, 0x24841a90, 0x24060003, 0x00003821, 0xafa00010, 0x0e000678,
+ 	0xafa00014, 0x8f625c50, 0x34420001, 0xaf625c50, 0x8f625c90, 0x34420001,
+ 	0xaf625c90, 0x2402ffff, 0x0e000034, 0xaf625404, 0x8fbf0018, 0x03e00008,
+-	0x27bd0020, 0x00000000, 0x00000000, 0x00000000, 0x27bdffe0, 0xafbf0018,
+-	0xafb10014, 0x0e000052, 0xafb00010, 0x24110001, 0x8f706820, 0x32020100,
+-	0x10400003, 0x00000000, 0x0e0000b2, 0x00000000, 0x8f706820, 0x32022000,
+-	0x10400004, 0x32020001, 0x0e0001e3, 0x24040001, 0x32020001, 0x10400003,
+-	0x00000000, 0x0e00009a, 0x00000000, 0x0a00003a, 0xaf715028, 0x8fbf0018,
+-	0x8fb10014, 0x8fb00010, 0x03e00008, 0x27bd0020, 0x27bdffe0, 0x3c040800,
+-	0x24841ae0, 0x00002821, 0x00003021, 0x00003821, 0xafbf0018, 0xafa00010,
+-	0x0e000684, 0xafa00014, 0x3c040800, 0x248423e8, 0xa4800000, 0x3c010800,
+-	0xa0201ba8, 0x3c010800, 0xac201bac, 0x3c010800, 0xac201bb0, 0x3c010800,
+-	0xac201bb4, 0x3c010800, 0xac201bbc, 0x3c010800, 0xac201bc8, 0x3c010800,
+-	0xac201bcc, 0x8f624434, 0x3c010800, 0xac221b98, 0x8f624438, 0x3c010800,
+-	0xac221b9c, 0x8f624410, 0xac80f7a8, 0x3c010800, 0xac201b94, 0x3c010800,
+-	0xac2023f0, 0x3c010800, 0xac2023d8, 0x3c010800, 0xac2023dc, 0x3c010800,
+-	0xac202410, 0x3c010800, 0xac221ba0, 0x8f620068, 0x24030007, 0x00021702,
+-	0x10430005, 0x00000000, 0x8f620068, 0x00021702, 0x14400004, 0x24020001,
+-	0x3c010800, 0x0a00008e, 0xac20241c, 0xac820034, 0x3c040800, 0x24841aec,
+-	0x3c050800, 0x8ca5241c, 0x00003021, 0x00003821, 0xafa00010, 0x0e000684,
+-	0xafa00014, 0x8fbf0018, 0x03e00008, 0x27bd0020, 0x27bdffe0, 0x3c040800,
+-	0x24841af8, 0x00002821, 0x00003021, 0x00003821, 0xafbf0018, 0xafa00010,
+-	0x0e000684, 0xafa00014, 0x0e000052, 0x00000000, 0x0e0000ab, 0x00002021,
+-	0x8fbf0018, 0x03e00008, 0x27bd0020, 0x24020001, 0x8f636820, 0x00821004,
+-	0x00021027, 0x00621824, 0x03e00008, 0xaf636820, 0x27bdffd0, 0xafbf002c,
+-	0xafb60028, 0xafb50024, 0xafb40020, 0xafb3001c, 0xafb20018, 0xafb10014,
+-	0xafb00010, 0x8f665c5c, 0x3c030800, 0x24631bcc, 0x8c620000, 0x14460005,
+-	0x3c0200ff, 0x3c020800, 0x90421ba8, 0x14400115, 0x3c0200ff, 0x3442fff8,
+-	0x00c28824, 0xac660000, 0x00111902, 0x306300ff, 0x30c20003, 0x000211c0,
+-	0x00623825, 0x00e02821, 0x00061602, 0x3c030800, 0x90631ba8, 0x3044000f,
+-	0x1460002b, 0x00804021, 0x24020001, 0x3c010800, 0xa0221ba8, 0x00071100,
+-	0x00821025, 0x3c010800, 0xac201bac, 0x3c010800, 0xac201bb0, 0x3c010800,
+-	0xac201bb4, 0x3c010800, 0xac201bbc, 0x3c010800, 0xac201bc8, 0x3c010800,
+-	0xac201bc0, 0x3c010800, 0xac201bc4, 0x3c010800, 0xa42223e8, 0x9623000c,
+-	0x30628000, 0x10400008, 0x30627fff, 0x2442003e, 0x3c010800, 0xa4221ba6,
+-	0x24020001, 0x3c010800, 0x0a0000f9, 0xac222404, 0x24620036, 0x3c010800,
+-	0xa4221ba6, 0x3c010800, 0xac202404, 0x3c010800, 0xac202400, 0x3c010800,
+-	0x0a000101, 0xac202408, 0x9622000c, 0x3c010800, 0xa42223fc, 0x3c040800,
+-	0x24841bac, 0x8c820000, 0x00021100, 0x3c010800, 0x00220821, 0xac311bd8,
+-	0x8c820000, 0x00021100, 0x3c010800, 0x00220821, 0xac261bdc, 0x8c820000,
+-	0x24a30001, 0x306701ff, 0x00021100, 0x3c010800, 0x00220821, 0xac271be0,
+-	0x8c820000, 0x00021100, 0x3c010800, 0x00220821, 0xac281be4, 0x96230008,
+-	0x3c020800, 0x8c421bbc, 0x00432821, 0x3c010800, 0xac251bbc, 0x9622000a,
+-	0x30420004, 0x14400018, 0x00071100, 0x8f630c14, 0x3063000f, 0x2c620002,
+-	0x1440000b, 0x3c02c000, 0x8f630c14, 0x3c020800, 0x8c421b50, 0x3063000f,
+-	0x24420001, 0x3c010800, 0xac221b50, 0x2c620002, 0x1040fff7, 0x3c02c000,
+-	0x00c21825, 0xaf635c5c, 0x8f625c50, 0x30420002, 0x10400014, 0x00000000,
+-	0x0a000133, 0x00000000, 0x3c030800, 0x8c631b90, 0x3c040800, 0x94841ba4,
+-	0x01021025, 0x3c010800, 0xa42223ea, 0x24020001, 0x3c010800, 0xac221bc8,
+-	0x24630001, 0x0085202a, 0x3c010800, 0x10800003, 0xac231b90, 0x3c010800,
+-	0xa4251ba4, 0x3c060800, 0x24c61bac, 0x8cc20000, 0x24420001, 0xacc20000,
+-	0x28420080, 0x14400005, 0x00000000, 0x0e00065e, 0x24040002, 0x0a0001d9,
+-	0x00000000, 0x3c020800, 0x8c421bc8, 0x1040007f, 0x24020001, 0x3c040800,
+-	0x90841ba8, 0x14820077, 0x24020003, 0x3c150800, 0x96b51ba6, 0x3c050800,
+-	0x8ca51bbc, 0x32a3ffff, 0x00a3102a, 0x14400073, 0x00000000, 0x14a30003,
+-	0x00000000, 0x3c010800, 0xac242400, 0x10600061, 0x00009021, 0x24d60004,
+-	0x0060a021, 0x24d30014, 0x8ec20000, 0x00028100, 0x3c110800, 0x02308821,
+-	0x0e00062d, 0x8e311bd8, 0x00403021, 0x10c00059, 0x00000000, 0x9628000a,
+-	0x31020040, 0x10400004, 0x2407180c, 0x8e22000c, 0x2407188c, 0xacc20018,
+-	0x31021000, 0x10400004, 0x34e32000, 0x00081040, 0x3042c000, 0x00623825,
+-	0x3c030800, 0x00701821, 0x8c631be0, 0x3c020800, 0x00501021, 0x8c421be4,
+-	0x00031d00, 0x00021400, 0x00621825, 0xacc30014, 0x8ec30004, 0x96220008,
+-	0x00432023, 0x3242ffff, 0x3083ffff, 0x00431021, 0x0282102a, 0x14400002,
+-	0x02b22823, 0x00802821, 0x8e620000, 0x30a4ffff, 0x00441021, 0xae620000,
+-	0x8e220000, 0xacc20000, 0x8e220004, 0x8e63fff4, 0x00431021, 0xacc20004,
+-	0xa4c5000e, 0x8e62fff4, 0x00441021, 0xae62fff4, 0x96230008, 0x0043102a,
+-	0x14400005, 0x02459021, 0x8e62fff0, 0xae60fff4, 0x24420001, 0xae62fff0,
+-	0xacc00008, 0x3242ffff, 0x14540008, 0x24020305, 0x31020080, 0x54400001,
+-	0x34e70010, 0x24020905, 0xa4c2000c, 0x0a0001bc, 0x34e70020, 0xa4c2000c,
+-	0x3c020800, 0x8c422400, 0x10400003, 0x3c024b65, 0x0a0001c4, 0x34427654,
+-	0x3c02b49a, 0x344289ab, 0xacc2001c, 0x30e2ffff, 0xacc20010, 0x0e0005aa,
+-	0x00c02021, 0x3242ffff, 0x0054102b, 0x1440ffa4, 0x00000000, 0x24020002,
+-	0x3c010800, 0x0a0001d9, 0xa0221ba8, 0x8ec2083c, 0x24420001, 0x0a0001d9,
+-	0xaec2083c, 0x14820003, 0x00000000, 0x0e0004b9, 0x00000000, 0x8fbf002c,
++	0x27bd0020, 0x00000000, 0x00000000, 0x00000000, 0x27bdffe0, 0xafbf001c,
++	0xafb20018, 0xafb10014, 0x0e00005b, 0xafb00010, 0x24120002, 0x24110001,
++	0x8f706820, 0x32020100, 0x10400003, 0x00000000, 0x0e0000bb, 0x00000000,
++	0x8f706820, 0x32022000, 0x10400004, 0x32020001, 0x0e0001ef, 0x24040001,
++	0x32020001, 0x10400003, 0x00000000, 0x0e0000a3, 0x00000000, 0x3c020800,
++	0x90421b88, 0x14520003, 0x00000000, 0x0e0004bf, 0x00000000, 0x0a00003c,
++	0xaf715028, 0x8fbf001c, 0x8fb20018, 0x8fb10014, 0x8fb00010, 0x03e00008,
++	0x27bd0020, 0x27bdffe0, 0x3c040800, 0x24841ab0, 0x00002821, 0x00003021,
++	0x00003821, 0xafbf0018, 0xafa00010, 0x0e000678, 0xafa00014, 0x3c040800,
++	0x248423c8, 0xa4800000, 0x3c010800, 0xa0201b88, 0x3c010800, 0xac201b8c,
++	0x3c010800, 0xac201b90, 0x3c010800, 0xac201b94, 0x3c010800, 0xac201b9c,
++	0x3c010800, 0xac201ba8, 0x3c010800, 0xac201bac, 0x8f624434, 0x3c010800,
++	0xac221b78, 0x8f624438, 0x3c010800, 0xac221b7c, 0x8f624410, 0xac80f7a8,
++	0x3c010800, 0xac201b74, 0x3c010800, 0xac2023d0, 0x3c010800, 0xac2023b8,
++	0x3c010800, 0xac2023bc, 0x3c010800, 0xac2023f0, 0x3c010800, 0xac221b80,
++	0x8f620068, 0x24030007, 0x00021702, 0x10430005, 0x00000000, 0x8f620068,
++	0x00021702, 0x14400004, 0x24020001, 0x3c010800, 0x0a000097, 0xac2023fc,
++	0xac820034, 0x3c040800, 0x24841abc, 0x3c050800, 0x8ca523fc, 0x00003021,
++	0x00003821, 0xafa00010, 0x0e000678, 0xafa00014, 0x8fbf0018, 0x03e00008,
++	0x27bd0020, 0x27bdffe0, 0x3c040800, 0x24841ac8, 0x00002821, 0x00003021,
++	0x00003821, 0xafbf0018, 0xafa00010, 0x0e000678, 0xafa00014, 0x0e00005b,
++	0x00000000, 0x0e0000b4, 0x00002021, 0x8fbf0018, 0x03e00008, 0x27bd0020,
++	0x24020001, 0x8f636820, 0x00821004, 0x00021027, 0x00621824, 0x03e00008,
++	0xaf636820, 0x27bdffd0, 0xafbf002c, 0xafb60028, 0xafb50024, 0xafb40020,
++	0xafb3001c, 0xafb20018, 0xafb10014, 0xafb00010, 0x8f675c5c, 0x3c030800,
++	0x24631bac, 0x8c620000, 0x14470005, 0x3c0200ff, 0x3c020800, 0x90421b88,
++	0x14400118, 0x3c0200ff, 0x3442fff8, 0x00e28824, 0xac670000, 0x00111902,
++	0x306300ff, 0x30e20003, 0x000211c0, 0x00622825, 0x00a04021, 0x00071602,
++	0x3c030800, 0x90631b88, 0x3044000f, 0x14600036, 0x00804821, 0x24020001,
++	0x3c010800, 0xa0221b88, 0x00051100, 0x00821025, 0x3c010800, 0xac201b8c,
++	0x3c010800, 0xac201b90, 0x3c010800, 0xac201b94, 0x3c010800, 0xac201b9c,
++	0x3c010800, 0xac201ba8, 0x3c010800, 0xac201ba0, 0x3c010800, 0xac201ba4,
++	0x3c010800, 0xa42223c8, 0x9622000c, 0x30437fff, 0x3c010800, 0xa4222400,
++	0x30428000, 0x3c010800, 0xa4231bb6, 0x10400005, 0x24020001, 0x3c010800,
++	0xac2223e4, 0x0a000102, 0x2406003e, 0x24060036, 0x3c010800, 0xac2023e4,
++	0x9622000a, 0x3c030800, 0x94631bb6, 0x3c010800, 0xac2023e0, 0x3c010800,
++	0xac2023e8, 0x00021302, 0x00021080, 0x00c21021, 0x00621821, 0x3c010800,
++	0xa42223c0, 0x3c010800, 0x0a000115, 0xa4231b86, 0x9622000c, 0x3c010800,
++	0xa42223dc, 0x3c040800, 0x24841b8c, 0x8c820000, 0x00021100, 0x3c010800,
++	0x00220821, 0xac311bb8, 0x8c820000, 0x00021100, 0x3c010800, 0x00220821,
++	0xac271bbc, 0x8c820000, 0x25030001, 0x306601ff, 0x00021100, 0x3c010800,
++	0x00220821, 0xac261bc0, 0x8c820000, 0x00021100, 0x3c010800, 0x00220821,
++	0xac291bc4, 0x96230008, 0x3c020800, 0x8c421b9c, 0x00432821, 0x3c010800,
++	0xac251b9c, 0x9622000a, 0x30420004, 0x14400018, 0x00061100, 0x8f630c14,
++	0x3063000f, 0x2c620002, 0x1440000b, 0x3c02c000, 0x8f630c14, 0x3c020800,
++	0x8c421b30, 0x3063000f, 0x24420001, 0x3c010800, 0xac221b30, 0x2c620002,
++	0x1040fff7, 0x3c02c000, 0x00e21825, 0xaf635c5c, 0x8f625c50, 0x30420002,
++	0x10400014, 0x00000000, 0x0a000147, 0x00000000, 0x3c030800, 0x8c631b70,
++	0x3c040800, 0x94841b84, 0x01221025, 0x3c010800, 0xa42223ca, 0x24020001,
++	0x3c010800, 0xac221ba8, 0x24630001, 0x0085202a, 0x3c010800, 0x10800003,
++	0xac231b70, 0x3c010800, 0xa4251b84, 0x3c060800, 0x24c61b8c, 0x8cc20000,
++	0x24420001, 0xacc20000, 0x28420080, 0x14400005, 0x00000000, 0x0e000652,
++	0x24040002, 0x0a0001e5, 0x00000000, 0x3c020800, 0x8c421ba8, 0x10400077,
++	0x24020001, 0x3c050800, 0x90a51b88, 0x14a20071, 0x00000000, 0x3c150800,
++	0x96b51b86, 0x3c040800, 0x8c841b9c, 0x32a3ffff, 0x0083102a, 0x1440006b,
++	0x00000000, 0x14830003, 0x00000000, 0x3c010800, 0xac2523e0, 0x1060005b,
++	0x00009021, 0x24d60004, 0x0060a021, 0x24d30014, 0x8ec20000, 0x00028100,
++	0x3c110800, 0x02308821, 0x0e000621, 0x8e311bb8, 0x00402821, 0x10a00053,
++	0x00000000, 0x9628000a, 0x31020040, 0x10400004, 0x2407180c, 0x8e22000c,
++	0x2407188c, 0xaca20018, 0x3c030800, 0x00701821, 0x8c631bc0, 0x3c020800,
++	0x00501021, 0x8c421bc4, 0x00031d00, 0x00021400, 0x00621825, 0xaca30014,
++	0x8ec30004, 0x96220008, 0x00432023, 0x3242ffff, 0x3083ffff, 0x00431021,
++	0x0282102a, 0x14400002, 0x02b23023, 0x00803021, 0x8e620000, 0x30c4ffff,
++	0x00441021, 0xae620000, 0x8e220000, 0xaca20000, 0x8e220004, 0x8e63fff4,
++	0x00431021, 0xaca20004, 0xa4a6000e, 0x8e62fff4, 0x00441021, 0xae62fff4,
++	0x96230008, 0x0043102a, 0x14400005, 0x02469021, 0x8e62fff0, 0xae60fff4,
++	0x24420001, 0xae62fff0, 0xaca00008, 0x3242ffff, 0x14540008, 0x24020305,
++	0x31020080, 0x54400001, 0x34e70010, 0x24020905, 0xa4a2000c, 0x0a0001ca,
++	0x34e70020, 0xa4a2000c, 0x3c020800, 0x8c4223e0, 0x10400003, 0x3c024b65,
++	0x0a0001d2, 0x34427654, 0x3c02b49a, 0x344289ab, 0xaca2001c, 0x30e2ffff,
++	0xaca20010, 0x0e00059f, 0x00a02021, 0x3242ffff, 0x0054102b, 0x1440ffaa,
++	0x00000000, 0x24020002, 0x3c010800, 0x0a0001e5, 0xa0221b88, 0x8ec2083c,
++	0x24420001, 0x0a0001e5, 0xaec2083c, 0x0e0004bf, 0x00000000, 0x8fbf002c,
+ 	0x8fb60028, 0x8fb50024, 0x8fb40020, 0x8fb3001c, 0x8fb20018, 0x8fb10014,
+ 	0x8fb00010, 0x03e00008, 0x27bd0030, 0x27bdffd0, 0xafbf0028, 0xafb30024,
+ 	0xafb20020, 0xafb1001c, 0xafb00018, 0x8f725c9c, 0x3c0200ff, 0x3442fff8,
+-	0x3c060800, 0x24c61bc4, 0x02428824, 0x9623000e, 0x8cc20000, 0x00431021,
+-	0xacc20000, 0x8e220010, 0x30420020, 0x14400011, 0x00809821, 0x0e000643,
++	0x3c060800, 0x24c61ba4, 0x02428824, 0x9623000e, 0x8cc20000, 0x00431021,
++	0xacc20000, 0x8e220010, 0x30420020, 0x14400011, 0x00809821, 0x0e000637,
+ 	0x02202021, 0x3c02c000, 0x02421825, 0xaf635c9c, 0x8f625c90, 0x30420002,
+ 	0x10400121, 0x00000000, 0xaf635c9c, 0x8f625c90, 0x30420002, 0x1040011c,
+-	0x00000000, 0x0a000200, 0x00000000, 0x8e240008, 0x8e230014, 0x00041402,
++	0x00000000, 0x0a00020c, 0x00000000, 0x8e240008, 0x8e230014, 0x00041402,
+ 	0x000241c0, 0x00031502, 0x304201ff, 0x2442ffff, 0x3042007f, 0x00031942,
+ 	0x30637800, 0x00021100, 0x24424000, 0x00625021, 0x9542000a, 0x3084ffff,
+-	0x30420008, 0x104000b3, 0x000429c0, 0x3c020800, 0x8c422410, 0x1440002d,
+-	0x25050008, 0x95020014, 0x3c010800, 0xa42223e0, 0x8d070010, 0x00071402,
+-	0x3c010800, 0xa42223e2, 0x3c010800, 0xa42723e4, 0x9502000e, 0x30e3ffff,
+-	0x00431023, 0x3c010800, 0xac222418, 0x8f626800, 0x3c030010, 0x00431024,
+-	0x10400005, 0x00000000, 0x9503001a, 0x9502001c, 0x0a000235, 0x00431021,
+-	0x9502001a, 0x3c010800, 0xac22240c, 0x3c02c000, 0x02421825, 0x3c010800,
+-	0xac282410, 0x3c010800, 0xac322414, 0xaf635c9c, 0x8f625c90, 0x30420002,
++	0x30420008, 0x104000b3, 0x000429c0, 0x3c020800, 0x8c4223f0, 0x1440002d,
++	0x25050008, 0x95020014, 0x3c010800, 0xa42223c0, 0x8d070010, 0x00071402,
++	0x3c010800, 0xa42223c2, 0x3c010800, 0xa42723c4, 0x9502000e, 0x30e3ffff,
++	0x00431023, 0x3c010800, 0xac2223f8, 0x8f626800, 0x3c030010, 0x00431024,
++	0x10400005, 0x00000000, 0x9503001a, 0x9502001c, 0x0a000241, 0x00431021,
++	0x9502001a, 0x3c010800, 0xac2223ec, 0x3c02c000, 0x02421825, 0x3c010800,
++	0xac2823f0, 0x3c010800, 0xac3223f4, 0xaf635c9c, 0x8f625c90, 0x30420002,
+ 	0x104000df, 0x00000000, 0xaf635c9c, 0x8f625c90, 0x30420002, 0x104000da,
+-	0x00000000, 0x0a000242, 0x00000000, 0x9502000e, 0x3c030800, 0x946323e4,
++	0x00000000, 0x0a00024e, 0x00000000, 0x9502000e, 0x3c030800, 0x946323c4,
+ 	0x00434823, 0x3123ffff, 0x2c620008, 0x1040001c, 0x00000000, 0x95020014,
+ 	0x24420028, 0x00a22821, 0x00031042, 0x1840000b, 0x00002021, 0x24c60848,
+ 	0x00403821, 0x94a30000, 0x8cc20000, 0x24840001, 0x00431021, 0xacc20000,
+ 	0x0087102a, 0x1440fff9, 0x24a50002, 0x31220001, 0x1040001f, 0x3c024000,
+-	0x3c040800, 0x2484240c, 0xa0a00001, 0x94a30000, 0x8c820000, 0x00431021,
+-	0x0a000281, 0xac820000, 0x8f626800, 0x3c030010, 0x00431024, 0x10400009,
+-	0x00000000, 0x9502001a, 0x3c030800, 0x8c63240c, 0x00431021, 0x3c010800,
+-	0xac22240c, 0x0a000282, 0x3c024000, 0x9502001a, 0x9504001c, 0x3c030800,
+-	0x8c63240c, 0x00441023, 0x00621821, 0x3c010800, 0xac23240c, 0x3c024000,
++	0x3c040800, 0x248423ec, 0xa0a00001, 0x94a30000, 0x8c820000, 0x00431021,
++	0x0a00028d, 0xac820000, 0x8f626800, 0x3c030010, 0x00431024, 0x10400009,
++	0x00000000, 0x9502001a, 0x3c030800, 0x8c6323ec, 0x00431021, 0x3c010800,
++	0xac2223ec, 0x0a00028e, 0x3c024000, 0x9502001a, 0x9504001c, 0x3c030800,
++	0x8c6323ec, 0x00441023, 0x00621821, 0x3c010800, 0xac2323ec, 0x3c024000,
+ 	0x02421825, 0xaf635c9c, 0x8f625c90, 0x30420002, 0x1440fffc, 0x00000000,
+-	0x9542000a, 0x30420010, 0x10400095, 0x00000000, 0x3c060800, 0x24c62410,
+-	0x3c020800, 0x944223e4, 0x8cc50000, 0x3c040800, 0x8c842418, 0x24420030,
+-	0x00a22821, 0x94a20004, 0x3c030800, 0x8c63240c, 0x00441023, 0x00621821,
++	0x9542000a, 0x30420010, 0x10400095, 0x00000000, 0x3c060800, 0x24c623f0,
++	0x3c020800, 0x944223c4, 0x8cc50000, 0x3c040800, 0x8c8423f8, 0x24420030,
++	0x00a22821, 0x94a20004, 0x3c030800, 0x8c6323ec, 0x00441023, 0x00621821,
+ 	0x00603821, 0x00032402, 0x30e2ffff, 0x00823821, 0x00071402, 0x00e23821,
+-	0x00071027, 0x3c010800, 0xac23240c, 0xa4a20006, 0x3c030800, 0x8c632414,
++	0x00071027, 0x3c010800, 0xac2323ec, 0xa4a20006, 0x3c030800, 0x8c6323f4,
+ 	0x3c0200ff, 0x3442fff8, 0x00628824, 0x96220008, 0x24040001, 0x24034000,
+ 	0x000241c0, 0x00e01021, 0xa502001a, 0xa500001c, 0xacc00000, 0x3c010800,
+-	0xac241b70, 0xaf635cb8, 0x8f625cb0, 0x30420002, 0x10400003, 0x00000000,
+-	0x3c010800, 0xac201b70, 0x8e220008, 0xaf625cb8, 0x8f625cb0, 0x30420002,
+-	0x10400003, 0x00000000, 0x3c010800, 0xac201b70, 0x3c020800, 0x8c421b70,
+-	0x1040ffec, 0x00000000, 0x3c040800, 0x0e000643, 0x8c842414, 0x0a000320,
+-	0x00000000, 0x3c030800, 0x90631ba8, 0x24020002, 0x14620003, 0x3c034b65,
+-	0x0a0002d7, 0x00008021, 0x8e22001c, 0x34637654, 0x10430002, 0x24100002,
+-	0x24100001, 0x01002021, 0x0e000346, 0x02003021, 0x24020003, 0x3c010800,
+-	0xa0221ba8, 0x24020002, 0x1202000a, 0x24020001, 0x3c030800, 0x8c632400,
+-	0x10620006, 0x00000000, 0x3c020800, 0x944223e8, 0x00021400, 0x0a000315,
+-	0xae220014, 0x3c040800, 0x248423ea, 0x94820000, 0x00021400, 0xae220014,
+-	0x3c020800, 0x8c421bcc, 0x3c03c000, 0x3c010800, 0xa0201ba8, 0x00431025,
++	0xac241b50, 0xaf635cb8, 0x8f625cb0, 0x30420002, 0x10400003, 0x00000000,
++	0x3c010800, 0xac201b50, 0x8e220008, 0xaf625cb8, 0x8f625cb0, 0x30420002,
++	0x10400003, 0x00000000, 0x3c010800, 0xac201b50, 0x3c020800, 0x8c421b50,
++	0x1040ffec, 0x00000000, 0x3c040800, 0x0e000637, 0x8c8423f4, 0x0a00032c,
++	0x00000000, 0x3c030800, 0x90631b88, 0x24020002, 0x14620003, 0x3c034b65,
++	0x0a0002e3, 0x00008021, 0x8e22001c, 0x34637654, 0x10430002, 0x24100002,
++	0x24100001, 0x01002021, 0x0e000352, 0x02003021, 0x24020003, 0x3c010800,
++	0xa0221b88, 0x24020002, 0x1202000a, 0x24020001, 0x3c030800, 0x8c6323e0,
++	0x10620006, 0x00000000, 0x3c020800, 0x944223c8, 0x00021400, 0x0a000321,
++	0xae220014, 0x3c040800, 0x248423ca, 0x94820000, 0x00021400, 0xae220014,
++	0x3c020800, 0x8c421bac, 0x3c03c000, 0x3c010800, 0xa0201b88, 0x00431025,
+ 	0xaf625c5c, 0x8f625c50, 0x30420002, 0x10400009, 0x00000000, 0x2484f7e2,
+ 	0x8c820000, 0x00431025, 0xaf625c5c, 0x8f625c50, 0x30420002, 0x1440fffa,
+-	0x00000000, 0x3c020800, 0x24421b94, 0x8c430000, 0x24630001, 0xac430000,
++	0x00000000, 0x3c020800, 0x24421b74, 0x8c430000, 0x24630001, 0xac430000,
+ 	0x8f630c14, 0x3063000f, 0x2c620002, 0x1440000c, 0x3c024000, 0x8f630c14,
+-	0x3c020800, 0x8c421b50, 0x3063000f, 0x24420001, 0x3c010800, 0xac221b50,
++	0x3c020800, 0x8c421b30, 0x3063000f, 0x24420001, 0x3c010800, 0xac221b30,
+ 	0x2c620002, 0x1040fff7, 0x00000000, 0x3c024000, 0x02421825, 0xaf635c9c,
+ 	0x8f625c90, 0x30420002, 0x1440fffc, 0x00000000, 0x12600003, 0x00000000,
+-	0x0e0004b9, 0x00000000, 0x8fbf0028, 0x8fb30024, 0x8fb20020, 0x8fb1001c,
+-	0x8fb00018, 0x03e00008, 0x27bd0030, 0x8f634450, 0x3c040800, 0x24841b98,
++	0x0e0004bf, 0x00000000, 0x8fbf0028, 0x8fb30024, 0x8fb20020, 0x8fb1001c,
++	0x8fb00018, 0x03e00008, 0x27bd0030, 0x8f634450, 0x3c040800, 0x24841b78,
+ 	0x8c820000, 0x00031c02, 0x0043102b, 0x14400007, 0x3c038000, 0x8c840004,
+ 	0x8f624450, 0x00021c02, 0x0083102b, 0x1040fffc, 0x3c038000, 0xaf634444,
+ 	0x8f624444, 0x00431024, 0x1440fffd, 0x00000000, 0x8f624448, 0x03e00008,
+ 	0x3042ffff, 0x3c024000, 0x00822025, 0xaf645c38, 0x8f625c30, 0x30420002,
+ 	0x1440fffc, 0x00000000, 0x03e00008, 0x00000000, 0x27bdffe0, 0x00805821,
+-	0x14c00017, 0x256e0008, 0x3c020800, 0x8c422404, 0x1040000a, 0x2402003e,
+-	0x3c010800, 0xa42223e0, 0x24020016, 0x3c010800, 0xa42223e2, 0x2402002a,
+-	0x3c010800, 0x0a000360, 0xa42223e4, 0x95620014, 0x3c010800, 0xa42223e0,
+-	0x8d670010, 0x00071402, 0x3c010800, 0xa42223e2, 0x3c010800, 0xa42723e4,
+-	0x3c040800, 0x948423e4, 0x3c030800, 0x946323e2, 0x95cf0006, 0x3c020800,
+-	0x944223e0, 0x00832023, 0x01e2c023, 0x3065ffff, 0x24a20028, 0x01c24821,
++	0x14c00011, 0x256e0008, 0x3c020800, 0x8c4223e4, 0x10400007, 0x24020016,
++	0x3c010800, 0xa42223c2, 0x2402002a, 0x3c010800, 0x0a000366, 0xa42223c4,
++	0x8d670010, 0x00071402, 0x3c010800, 0xa42223c2, 0x3c010800, 0xa42723c4,
++	0x3c040800, 0x948423c4, 0x3c030800, 0x946323c2, 0x95cf0006, 0x3c020800,
++	0x944223c0, 0x00832023, 0x01e2c023, 0x3065ffff, 0x24a20028, 0x01c24821,
+ 	0x3082ffff, 0x14c0001a, 0x01226021, 0x9582000c, 0x3042003f, 0x3c010800,
+-	0xa42223e6, 0x95820004, 0x95830006, 0x3c010800, 0xac2023f4, 0x3c010800,
+-	0xac2023f8, 0x00021400, 0x00431025, 0x3c010800, 0xac221bd0, 0x95220004,
+-	0x3c010800, 0xa4221bd4, 0x95230002, 0x01e51023, 0x0043102a, 0x10400010,
+-	0x24020001, 0x3c010800, 0x0a000394, 0xac222408, 0x3c030800, 0x8c6323f8,
+-	0x3c020800, 0x94421bd4, 0x00431021, 0xa5220004, 0x3c020800, 0x94421bd0,
+-	0xa5820004, 0x3c020800, 0x8c421bd0, 0xa5820006, 0x3c020800, 0x8c422400,
+-	0x3c0d0800, 0x8dad23f4, 0x3c0a0800, 0x144000e5, 0x8d4a23f8, 0x3c020800,
+-	0x94421bd4, 0x004a1821, 0x3063ffff, 0x0062182b, 0x24020002, 0x10c2000d,
+-	0x01435023, 0x3c020800, 0x944223e6, 0x30420009, 0x10400008, 0x00000000,
+-	0x9582000c, 0x3042fff6, 0xa582000c, 0x3c020800, 0x944223e6, 0x30420009,
+-	0x01a26823, 0x3c020800, 0x8c422408, 0x1040004a, 0x01203821, 0x3c020800,
+-	0x944223e2, 0x00004021, 0xa520000a, 0x01e21023, 0xa5220002, 0x3082ffff,
++	0xa42223c6, 0x95820004, 0x95830006, 0x3c010800, 0xac2023d4, 0x3c010800,
++	0xac2023d8, 0x00021400, 0x00431025, 0x3c010800, 0xac221bb0, 0x95220004,
++	0x3c010800, 0xa4221bb4, 0x95230002, 0x01e51023, 0x0043102a, 0x10400010,
++	0x24020001, 0x3c010800, 0x0a00039a, 0xac2223e8, 0x3c030800, 0x8c6323d8,
++	0x3c020800, 0x94421bb4, 0x00431021, 0xa5220004, 0x3c020800, 0x94421bb0,
++	0xa5820004, 0x3c020800, 0x8c421bb0, 0xa5820006, 0x3c020800, 0x8c4223e0,
++	0x3c0d0800, 0x8dad23d4, 0x3c0a0800, 0x144000e5, 0x8d4a23d8, 0x3c020800,
++	0x94421bb4, 0x004a1821, 0x3063ffff, 0x0062182b, 0x24020002, 0x10c2000d,
++	0x01435023, 0x3c020800, 0x944223c6, 0x30420009, 0x10400008, 0x00000000,
++	0x9582000c, 0x3042fff6, 0xa582000c, 0x3c020800, 0x944223c6, 0x30420009,
++	0x01a26823, 0x3c020800, 0x8c4223e8, 0x1040004a, 0x01203821, 0x3c020800,
++	0x944223c2, 0x00004021, 0xa520000a, 0x01e21023, 0xa5220002, 0x3082ffff,
+ 	0x00021042, 0x18400008, 0x00003021, 0x00401821, 0x94e20000, 0x25080001,
+ 	0x00c23021, 0x0103102a, 0x1440fffb, 0x24e70002, 0x00061c02, 0x30c2ffff,
+ 	0x00623021, 0x00061402, 0x00c23021, 0x00c02821, 0x00061027, 0xa522000a,
+@@ -4044,131 +4068,127 @@ static u32 tg3TsoFwText[] = {
+ 	0x30e2007f, 0x14400006, 0x25080001, 0x8d630000, 0x3c02007f, 0x3442ff80,
+ 	0x00625824, 0x25670008, 0x0109102a, 0x1440fff3, 0x00000000, 0x30820001,
+ 	0x10400005, 0x00061c02, 0xa0e00001, 0x94e20000, 0x00c23021, 0x00061c02,
+-	0x30c2ffff, 0x00623021, 0x00061402, 0x00c23021, 0x0a000479, 0x30c6ffff,
+-	0x24020002, 0x14c20081, 0x00000000, 0x3c020800, 0x8c42241c, 0x14400007,
+-	0x00000000, 0x3c020800, 0x944223e2, 0x95230002, 0x01e21023, 0x10620077,
+-	0x00000000, 0x3c020800, 0x944223e2, 0x01e21023, 0xa5220002, 0x3c020800,
+-	0x8c42241c, 0x1040001a, 0x31e3ffff, 0x8dc70010, 0x3c020800, 0x94421ba6,
++	0x30c2ffff, 0x00623021, 0x00061402, 0x00c23021, 0x0a00047f, 0x30c6ffff,
++	0x24020002, 0x14c20081, 0x00000000, 0x3c020800, 0x8c4223fc, 0x14400007,
++	0x00000000, 0x3c020800, 0x944223c2, 0x95230002, 0x01e21023, 0x10620077,
++	0x00000000, 0x3c020800, 0x944223c2, 0x01e21023, 0xa5220002, 0x3c020800,
++	0x8c4223fc, 0x1040001a, 0x31e3ffff, 0x8dc70010, 0x3c020800, 0x94421b86,
+ 	0x00e04021, 0x00072c02, 0x00aa2021, 0x00431023, 0x00823823, 0x00072402,
+ 	0x30e2ffff, 0x00823821, 0x00071027, 0xa522000a, 0x3102ffff, 0x3c040800,
+-	0x948423e4, 0x00453023, 0x00e02821, 0x00641823, 0x006d1821, 0x00c33021,
+-	0x00061c02, 0x30c2ffff, 0x0a000479, 0x00623021, 0x01203821, 0x00004021,
++	0x948423c4, 0x00453023, 0x00e02821, 0x00641823, 0x006d1821, 0x00c33021,
++	0x00061c02, 0x30c2ffff, 0x0a00047f, 0x00623021, 0x01203821, 0x00004021,
+ 	0x3082ffff, 0x00021042, 0x18400008, 0x00003021, 0x00401821, 0x94e20000,
+ 	0x25080001, 0x00c23021, 0x0103102a, 0x1440fffb, 0x24e70002, 0x00061c02,
+ 	0x30c2ffff, 0x00623021, 0x00061402, 0x00c23021, 0x00c02821, 0x00061027,
+ 	0xa522000a, 0x00003021, 0x2527000c, 0x00004021, 0x94e20000, 0x25080001,
+ 	0x00c23021, 0x2d020004, 0x1440fffb, 0x24e70002, 0x95220002, 0x00004021,
+ 	0x91230009, 0x00442023, 0x01803821, 0x3082ffff, 0xa4e00010, 0x3c040800,
+-	0x948423e4, 0x00621821, 0x00c33021, 0x00061c02, 0x30c2ffff, 0x00623021,
+-	0x00061c02, 0x3c020800, 0x944223e0, 0x00c34821, 0x00441023, 0x00021fc2,
++	0x948423c4, 0x00621821, 0x00c33021, 0x00061c02, 0x30c2ffff, 0x00623021,
++	0x00061c02, 0x3c020800, 0x944223c0, 0x00c34821, 0x00441023, 0x00021fc2,
+ 	0x00431021, 0x00021043, 0x18400010, 0x00003021, 0x00402021, 0x94e20000,
+ 	0x24e70002, 0x00c23021, 0x30e2007f, 0x14400006, 0x25080001, 0x8d630000,
+ 	0x3c02007f, 0x3442ff80, 0x00625824, 0x25670008, 0x0104102a, 0x1440fff3,
+-	0x00000000, 0x3c020800, 0x944223fc, 0x00c23021, 0x3122ffff, 0x00c23021,
++	0x00000000, 0x3c020800, 0x944223dc, 0x00c23021, 0x3122ffff, 0x00c23021,
+ 	0x00061c02, 0x30c2ffff, 0x00623021, 0x00061402, 0x00c23021, 0x00c04021,
+-	0x00061027, 0xa5820010, 0xadc00014, 0x0a000499, 0xadc00000, 0x8dc70010,
++	0x00061027, 0xa5820010, 0xadc00014, 0x0a00049f, 0xadc00000, 0x8dc70010,
+ 	0x00e04021, 0x11400007, 0x00072c02, 0x00aa3021, 0x00061402, 0x30c3ffff,
+ 	0x00433021, 0x00061402, 0x00c22821, 0x00051027, 0xa522000a, 0x3c030800,
+-	0x946323e4, 0x3102ffff, 0x01e21021, 0x00433023, 0x00cd3021, 0x00061c02,
++	0x946323c4, 0x3102ffff, 0x01e21021, 0x00433023, 0x00cd3021, 0x00061c02,
+ 	0x30c2ffff, 0x00623021, 0x00061402, 0x00c23021, 0x00c04021, 0x00061027,
+ 	0xa5820010, 0x3102ffff, 0x00051c00, 0x00431025, 0xadc20010, 0x3c020800,
+-	0x8c422404, 0x10400002, 0x25e2fff2, 0xa5c20034, 0x3c020800, 0x8c4223f8,
+-	0x3c040800, 0x8c8423f4, 0x24420001, 0x3c010800, 0xac2223f8, 0x3c020800,
+-	0x8c421bd0, 0x3303ffff, 0x00832021, 0x3c010800, 0xac2423f4, 0x00431821,
+-	0x0062102b, 0x10400003, 0x2482ffff, 0x3c010800, 0xac2223f4, 0x3c010800,
+-	0xac231bd0, 0x03e00008, 0x27bd0020, 0x27bdffb8, 0x3c050800, 0x24a51ba8,
++	0x8c4223e4, 0x10400002, 0x25e2fff2, 0xa5c20034, 0x3c020800, 0x8c4223d8,
++	0x3c040800, 0x8c8423d4, 0x24420001, 0x3c010800, 0xac2223d8, 0x3c020800,
++	0x8c421bb0, 0x3303ffff, 0x00832021, 0x3c010800, 0xac2423d4, 0x00431821,
++	0x0062102b, 0x10400003, 0x2482ffff, 0x3c010800, 0xac2223d4, 0x3c010800,
++	0xac231bb0, 0x03e00008, 0x27bd0020, 0x27bdffb8, 0x3c050800, 0x24a51b86,
+ 	0xafbf0044, 0xafbe0040, 0xafb7003c, 0xafb60038, 0xafb50034, 0xafb40030,
+-	0xafb3002c, 0xafb20028, 0xafb10024, 0xafb00020, 0x90a30000, 0x24020003,
+-	0x146200d5, 0x00000000, 0x3c090800, 0x95291ba6, 0x3c020800, 0x944223e0,
+-	0x3c030800, 0x8c631bc0, 0x3c040800, 0x8c841bbc, 0x01221023, 0x0064182a,
+-	0xa7a9001e, 0x106000c8, 0xa7a20016, 0x24be0020, 0x97b6001e, 0x24b30018,
+-	0x24b70014, 0x8fc20000, 0x14400008, 0x00000000, 0x8fc2fff8, 0x97a30016,
+-	0x8fc4fff4, 0x00431021, 0x0082202a, 0x148000ba, 0x00000000, 0x97d50818,
+-	0x32a2ffff, 0x104000ad, 0x00009021, 0x0040a021, 0x00008821, 0x0e00062d,
+-	0x00000000, 0x00403021, 0x14c00007, 0x00000000, 0x3c020800, 0x8c4223ec,
+-	0x24420001, 0x3c010800, 0x0a00059e, 0xac2223ec, 0x3c100800, 0x02118021,
+-	0x8e101bd8, 0x9608000a, 0x31020040, 0x10400004, 0x2407180c, 0x8e02000c,
+-	0x2407188c, 0xacc20018, 0x31021000, 0x10400004, 0x34e32000, 0x00081040,
+-	0x3042c000, 0x00623825, 0x31020080, 0x54400001, 0x34e70010, 0x3c020800,
+-	0x00511021, 0x8c421be0, 0x3c030800, 0x00711821, 0x8c631be4, 0x00021500,
+-	0x00031c00, 0x00431025, 0xacc20014, 0x96040008, 0x3242ffff, 0x00821021,
+-	0x0282102a, 0x14400002, 0x02b22823, 0x00802821, 0x8e020000, 0x02459021,
+-	0xacc20000, 0x8e020004, 0x00c02021, 0x26310010, 0xac820004, 0x30e2ffff,
+-	0xac800008, 0xa485000e, 0xac820010, 0x24020305, 0x0e0005aa, 0xa482000c,
+-	0x3242ffff, 0x0054102b, 0x1440ffc0, 0x3242ffff, 0x0a000596, 0x00000000,
+-	0x8e620000, 0x8e63fffc, 0x0043102a, 0x1040006c, 0x00000000, 0x8e62fff0,
+-	0x00028900, 0x3c100800, 0x02118021, 0x0e00062d, 0x8e101bd8, 0x00403021,
+-	0x14c00005, 0x00000000, 0x8e62082c, 0x24420001, 0x0a00059e, 0xae62082c,
+-	0x9608000a, 0x31020040, 0x10400004, 0x2407180c, 0x8e02000c, 0x2407188c,
+-	0xacc20018, 0x31021000, 0x10400004, 0x34e32000, 0x00081040, 0x3042c000,
+-	0x00623825, 0x3c020800, 0x00511021, 0x8c421be0, 0x3c030800, 0x00711821,
+-	0x8c631be4, 0x00021500, 0x00031c00, 0x00431025, 0xacc20014, 0x8e63fff4,
+-	0x96020008, 0x00432023, 0x3242ffff, 0x3083ffff, 0x00431021, 0x02c2102a,
+-	0x10400003, 0x00802821, 0x97a9001e, 0x01322823, 0x8e620000, 0x30a4ffff,
+-	0x00441021, 0xae620000, 0xa4c5000e, 0x8e020000, 0xacc20000, 0x8e020004,
+-	0x8e63fff4, 0x00431021, 0xacc20004, 0x8e63fff4, 0x96020008, 0x00641821,
+-	0x0062102a, 0x14400006, 0x02459021, 0x8e62fff0, 0xae60fff4, 0x24420001,
+-	0x0a000579, 0xae62fff0, 0xae63fff4, 0xacc00008, 0x3242ffff, 0x10560003,
+-	0x31020004, 0x10400006, 0x24020305, 0x31020080, 0x54400001, 0x34e70010,
+-	0x34e70020, 0x24020905, 0xa4c2000c, 0x8ee30000, 0x8ee20004, 0x14620007,
+-	0x3c02b49a, 0x8ee20860, 0x54400001, 0x34e70400, 0x3c024b65, 0x0a000590,
+-	0x34427654, 0x344289ab, 0xacc2001c, 0x30e2ffff, 0xacc20010, 0x0e0005aa,
+-	0x00c02021, 0x3242ffff, 0x0056102b, 0x1440ff96, 0x00000000, 0x8e620000,
+-	0x8e63fffc, 0x0043102a, 0x1440ff3e, 0x00000000, 0x8fbf0044, 0x8fbe0040,
+-	0x8fb7003c, 0x8fb60038, 0x8fb50034, 0x8fb40030, 0x8fb3002c, 0x8fb20028,
+-	0x8fb10024, 0x8fb00020, 0x03e00008, 0x27bd0048, 0x27bdffe8, 0xafbf0014,
+-	0xafb00010, 0x8f624450, 0x8f634410, 0x0a0005b9, 0x00808021, 0x8f626820,
+-	0x30422000, 0x10400003, 0x00000000, 0x0e0001e3, 0x00002021, 0x8f624450,
+-	0x8f634410, 0x3042ffff, 0x0043102b, 0x1440fff5, 0x00000000, 0x8f630c14,
+-	0x3063000f, 0x2c620002, 0x1440000b, 0x00000000, 0x8f630c14, 0x3c020800,
+-	0x8c421b50, 0x3063000f, 0x24420001, 0x3c010800, 0xac221b50, 0x2c620002,
+-	0x1040fff7, 0x00000000, 0xaf705c18, 0x8f625c10, 0x30420002, 0x10400009,
+-	0x00000000, 0x8f626820, 0x30422000, 0x1040fff8, 0x00000000, 0x0e0001e3,
+-	0x00002021, 0x0a0005cc, 0x00000000, 0x8fbf0014, 0x8fb00010, 0x03e00008,
+-	0x27bd0018, 0x00000000, 0x00000000, 0x00000000, 0x27bdffe8, 0x3c1bc000,
++	0xafb3002c, 0xafb20028, 0xafb10024, 0xafb00020, 0x94a90000, 0x3c020800,
++	0x944223c0, 0x3c030800, 0x8c631ba0, 0x3c040800, 0x8c841b9c, 0x01221023,
++	0x0064182a, 0xa7a9001e, 0x106000bc, 0xa7a20016, 0x24be0022, 0x97b6001e,
++	0x24b3001a, 0x24b70016, 0x8fc20000, 0x14400008, 0x00000000, 0x8fc2fff8,
++	0x97a30016, 0x8fc4fff4, 0x00431021, 0x0082202a, 0x148000ae, 0x00000000,
++	0x97d50818, 0x32a2ffff, 0x104000a1, 0x00009021, 0x0040a021, 0x00008821,
++	0x0e000621, 0x00000000, 0x00403021, 0x14c00007, 0x00000000, 0x3c020800,
++	0x8c4223cc, 0x24420001, 0x3c010800, 0x0a000593, 0xac2223cc, 0x3c100800,
++	0x02118021, 0x8e101bb8, 0x9608000a, 0x31020040, 0x10400004, 0x2407180c,
++	0x8e02000c, 0x2407188c, 0xacc20018, 0x31020080, 0x54400001, 0x34e70010,
++	0x3c020800, 0x00511021, 0x8c421bc0, 0x3c030800, 0x00711821, 0x8c631bc4,
++	0x00021500, 0x00031c00, 0x00431025, 0xacc20014, 0x96040008, 0x3242ffff,
++	0x00821021, 0x0282102a, 0x14400002, 0x02b22823, 0x00802821, 0x8e020000,
++	0x02459021, 0xacc20000, 0x8e020004, 0x00c02021, 0x26310010, 0xac820004,
++	0x30e2ffff, 0xac800008, 0xa485000e, 0xac820010, 0x24020305, 0x0e00059f,
++	0xa482000c, 0x3242ffff, 0x0054102b, 0x1440ffc6, 0x3242ffff, 0x0a00058b,
++	0x00000000, 0x8e620000, 0x8e63fffc, 0x0043102a, 0x10400066, 0x00000000,
++	0x8e62fff0, 0x00028900, 0x3c100800, 0x02118021, 0x0e000621, 0x8e101bb8,
++	0x00403021, 0x14c00005, 0x00000000, 0x8e62082c, 0x24420001, 0x0a000593,
++	0xae62082c, 0x9608000a, 0x31020040, 0x10400004, 0x2407180c, 0x8e02000c,
++	0x2407188c, 0xacc20018, 0x3c020800, 0x00511021, 0x8c421bc0, 0x3c030800,
++	0x00711821, 0x8c631bc4, 0x00021500, 0x00031c00, 0x00431025, 0xacc20014,
++	0x8e63fff4, 0x96020008, 0x00432023, 0x3242ffff, 0x3083ffff, 0x00431021,
++	0x02c2102a, 0x10400003, 0x00802821, 0x97a9001e, 0x01322823, 0x8e620000,
++	0x30a4ffff, 0x00441021, 0xae620000, 0xa4c5000e, 0x8e020000, 0xacc20000,
++	0x8e020004, 0x8e63fff4, 0x00431021, 0xacc20004, 0x8e63fff4, 0x96020008,
++	0x00641821, 0x0062102a, 0x14400006, 0x02459021, 0x8e62fff0, 0xae60fff4,
++	0x24420001, 0x0a00056e, 0xae62fff0, 0xae63fff4, 0xacc00008, 0x3242ffff,
++	0x10560003, 0x31020004, 0x10400006, 0x24020305, 0x31020080, 0x54400001,
++	0x34e70010, 0x34e70020, 0x24020905, 0xa4c2000c, 0x8ee30000, 0x8ee20004,
++	0x14620007, 0x3c02b49a, 0x8ee20860, 0x54400001, 0x34e70400, 0x3c024b65,
++	0x0a000585, 0x34427654, 0x344289ab, 0xacc2001c, 0x30e2ffff, 0xacc20010,
++	0x0e00059f, 0x00c02021, 0x3242ffff, 0x0056102b, 0x1440ff9c, 0x00000000,
++	0x8e620000, 0x8e63fffc, 0x0043102a, 0x1440ff4a, 0x00000000, 0x8fbf0044,
++	0x8fbe0040, 0x8fb7003c, 0x8fb60038, 0x8fb50034, 0x8fb40030, 0x8fb3002c,
++	0x8fb20028, 0x8fb10024, 0x8fb00020, 0x03e00008, 0x27bd0048, 0x27bdffe8,
++	0xafbf0014, 0xafb00010, 0x8f624450, 0x8f634410, 0x0a0005ae, 0x00808021,
++	0x8f626820, 0x30422000, 0x10400003, 0x00000000, 0x0e0001ef, 0x00002021,
++	0x8f624450, 0x8f634410, 0x3042ffff, 0x0043102b, 0x1440fff5, 0x00000000,
++	0x8f630c14, 0x3063000f, 0x2c620002, 0x1440000b, 0x00000000, 0x8f630c14,
++	0x3c020800, 0x8c421b30, 0x3063000f, 0x24420001, 0x3c010800, 0xac221b30,
++	0x2c620002, 0x1040fff7, 0x00000000, 0xaf705c18, 0x8f625c10, 0x30420002,
++	0x10400009, 0x00000000, 0x8f626820, 0x30422000, 0x1040fff8, 0x00000000,
++	0x0e0001ef, 0x00002021, 0x0a0005c1, 0x00000000, 0x8fbf0014, 0x8fb00010,
++	0x03e00008, 0x27bd0018, 0x00000000, 0x00000000, 0x27bdffe8, 0x3c1bc000,
+ 	0xafbf0014, 0xafb00010, 0xaf60680c, 0x8f626804, 0x34420082, 0xaf626804,
+-	0x8f634000, 0x24020b50, 0x3c010800, 0xac221b64, 0x24020b78, 0x3c010800,
+-	0xac221b74, 0x34630002, 0xaf634000, 0x0e00060d, 0x00808021, 0x3c010800,
+-	0xa0221b78, 0x304200ff, 0x24030002, 0x14430005, 0x00000000, 0x3c020800,
+-	0x8c421b64, 0x0a000600, 0xac5000c0, 0x3c020800, 0x8c421b64, 0xac5000bc,
+-	0x8f624434, 0x8f634438, 0x8f644410, 0x3c010800, 0xac221b6c, 0x3c010800,
+-	0xac231b7c, 0x3c010800, 0xac241b68, 0x8fbf0014, 0x8fb00010, 0x03e00008,
++	0x8f634000, 0x24020b50, 0x3c010800, 0xac221b44, 0x24020b78, 0x3c010800,
++	0xac221b54, 0x34630002, 0xaf634000, 0x0e000601, 0x00808021, 0x3c010800,
++	0xa0221b58, 0x304200ff, 0x24030002, 0x14430005, 0x00000000, 0x3c020800,
++	0x8c421b44, 0x0a0005f4, 0xac5000c0, 0x3c020800, 0x8c421b44, 0xac5000bc,
++	0x8f624434, 0x8f634438, 0x8f644410, 0x3c010800, 0xac221b4c, 0x3c010800,
++	0xac231b5c, 0x3c010800, 0xac241b48, 0x8fbf0014, 0x8fb00010, 0x03e00008,
+ 	0x27bd0018, 0x3c040800, 0x8c870000, 0x3c03aa55, 0x3463aa55, 0x3c06c003,
+ 	0xac830000, 0x8cc20000, 0x14430007, 0x24050002, 0x3c0355aa, 0x346355aa,
+ 	0xac830000, 0x8cc20000, 0x50430001, 0x24050001, 0x3c020800, 0xac470000,
+ 	0x03e00008, 0x00a01021, 0x27bdfff8, 0x18800009, 0x00002821, 0x8f63680c,
+ 	0x8f62680c, 0x1043fffe, 0x00000000, 0x24a50001, 0x00a4102a, 0x1440fff9,
+-	0x00000000, 0x03e00008, 0x27bd0008, 0x8f634450, 0x3c020800, 0x8c421b6c,
+-	0x00031c02, 0x0043102b, 0x14400008, 0x3c038000, 0x3c040800, 0x8c841b7c,
++	0x00000000, 0x03e00008, 0x27bd0008, 0x8f634450, 0x3c020800, 0x8c421b4c,
++	0x00031c02, 0x0043102b, 0x14400008, 0x3c038000, 0x3c040800, 0x8c841b5c,
+ 	0x8f624450, 0x00021c02, 0x0083102b, 0x1040fffc, 0x3c038000, 0xaf634444,
+ 	0x8f624444, 0x00431024, 0x1440fffd, 0x00000000, 0x8f624448, 0x03e00008,
+ 	0x3042ffff, 0x3082ffff, 0x2442e000, 0x2c422001, 0x14400003, 0x3c024000,
+-	0x0a000650, 0x2402ffff, 0x00822025, 0xaf645c38, 0x8f625c30, 0x30420002,
++	0x0a000644, 0x2402ffff, 0x00822025, 0xaf645c38, 0x8f625c30, 0x30420002,
+ 	0x1440fffc, 0x00001021, 0x03e00008, 0x00000000, 0x8f624450, 0x3c030800,
+-	0x8c631b68, 0x0a000659, 0x3042ffff, 0x8f624450, 0x3042ffff, 0x0043102b,
++	0x8c631b48, 0x0a00064d, 0x3042ffff, 0x8f624450, 0x3042ffff, 0x0043102b,
+ 	0x1440fffc, 0x00000000, 0x03e00008, 0x00000000, 0x27bdffe0, 0x00802821,
+-	0x3c040800, 0x24841b10, 0x00003021, 0x00003821, 0xafbf0018, 0xafa00010,
+-	0x0e000684, 0xafa00014, 0x0a000668, 0x00000000, 0x8fbf0018, 0x03e00008,
++	0x3c040800, 0x24841ae0, 0x00003021, 0x00003821, 0xafbf0018, 0xafa00010,
++	0x0e000678, 0xafa00014, 0x0a00065c, 0x00000000, 0x8fbf0018, 0x03e00008,
+ 	0x27bd0020, 0x00000000, 0x00000000, 0x00000000, 0x3c020800, 0x34423000,
+-	0x3c030800, 0x34633000, 0x3c040800, 0x348437ff, 0x3c010800, 0xac221b84,
+-	0x24020040, 0x3c010800, 0xac221b88, 0x3c010800, 0xac201b80, 0xac600000,
++	0x3c030800, 0x34633000, 0x3c040800, 0x348437ff, 0x3c010800, 0xac221b64,
++	0x24020040, 0x3c010800, 0xac221b68, 0x3c010800, 0xac201b60, 0xac600000,
+ 	0x24630004, 0x0083102b, 0x5040fffd, 0xac600000, 0x03e00008, 0x00000000,
+-	0x00804821, 0x8faa0010, 0x3c020800, 0x8c421b80, 0x3c040800, 0x8c841b88,
+-	0x8fab0014, 0x24430001, 0x0044102b, 0x3c010800, 0xac231b80, 0x14400003,
+-	0x00004021, 0x3c010800, 0xac201b80, 0x3c020800, 0x8c421b80, 0x3c030800,
+-	0x8c631b84, 0x91240000, 0x00021140, 0x00431021, 0x00481021, 0x25080001,
+-	0xa0440000, 0x29020008, 0x1440fff4, 0x25290001, 0x3c020800, 0x8c421b80,
+-	0x3c030800, 0x8c631b84, 0x8f64680c, 0x00021140, 0x00431021, 0xac440008,
++	0x00804821, 0x8faa0010, 0x3c020800, 0x8c421b60, 0x3c040800, 0x8c841b68,
++	0x8fab0014, 0x24430001, 0x0044102b, 0x3c010800, 0xac231b60, 0x14400003,
++	0x00004021, 0x3c010800, 0xac201b60, 0x3c020800, 0x8c421b60, 0x3c030800,
++	0x8c631b64, 0x91240000, 0x00021140, 0x00431021, 0x00481021, 0x25080001,
++	0xa0440000, 0x29020008, 0x1440fff4, 0x25290001, 0x3c020800, 0x8c421b60,
++	0x3c030800, 0x8c631b64, 0x8f64680c, 0x00021140, 0x00431021, 0xac440008,
+ 	0xac45000c, 0xac460010, 0xac470014, 0xac4a0018, 0x03e00008, 0xac4b001c,
+ 	0x00000000, 0x00000000,
+ };
+ 
+ u32 tg3TsoFwRodata[] = {
+-	0x4d61696e, 0x43707542, 0x00000000, 0x4d61696e, 0x43707541,
+-	0x00000000, 0x00000000, 0x00000000, 0x73746b6f, 0x66666c64,
+-	0x496e0000, 0x73746b6f, 0x66662a2a, 0x00000000, 0x53774576,
+-	0x656e7430, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+-	0x66617461, 0x6c457272, 0x00000000, 0x00000000, 0x00000000
++	0x4d61696e, 0x43707542, 0x00000000, 0x4d61696e, 0x43707541, 0x00000000,
++	0x00000000, 0x00000000, 0x73746b6f, 0x66666c64, 0x496e0000, 0x73746b6f,
++	0x66662a2a, 0x00000000, 0x53774576, 0x656e7430, 0x00000000, 0x00000000,
++	0x00000000, 0x00000000, 0x66617461, 0x6c457272, 0x00000000, 0x00000000,
+ };
+ 
+ #if 0 /* All zeros, don't eat up space with it. */
+@@ -4541,7 +4561,10 @@ static int tg3_reset_hw(struct tg3 *tp)
+ 
+ 	tg3_chip_reset(tp);
+ 
+-	tw32(GRC_MODE, tp->grc_mode);
++	val = tr32(GRC_MODE);
++	val &= GRC_MODE_HOST_STACKUP;
++	tw32(GRC_MODE, val | tp->grc_mode);
++
+ 	tg3_write_mem(tp,
+ 		      NIC_SRAM_FIRMWARE_MBOX,
+ 		      NIC_SRAM_FIRMWARE_MBOX_MAGIC1);
+@@ -4597,17 +4620,6 @@ static int tg3_reset_hw(struct tg3 *tp)
+ 	 */
+ 	tg3_init_rings(tp);
+ 
+-	/* Clear statistics/status block in chip, and status block in ram. */
+-	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705) {
+-		for (i = NIC_SRAM_STATS_BLK;
+-	     	     i < NIC_SRAM_STATUS_BLK + TG3_HW_STATUS_SIZE;
+-	     	     i += sizeof(u32)) {
+-			tg3_write_mem(tp, i, 0);
+-			udelay(40);
+-		}
+-	}
+-	memset(tp->hw_status, 0, TG3_HW_STATUS_SIZE);
+-
+ 	/* This value is determined during the probe time DMA
+ 	 * engine test, tg3_test_dma.
+ 	 */
+@@ -4706,6 +4718,17 @@ static int tg3_reset_hw(struct tg3 *tp)
+ 		return -ENODEV;
+ 	}
+ 
++	/* Clear statistics/status block in chip, and status block in ram. */
++	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705) {
++		for (i = NIC_SRAM_STATS_BLK;
++	     	     i < NIC_SRAM_STATUS_BLK + TG3_HW_STATUS_SIZE;
++	     	     i += sizeof(u32)) {
++			tg3_write_mem(tp, i, 0);
++			udelay(40);
++		}
++	}
++	memset(tp->hw_status, 0, TG3_HW_STATUS_SIZE);
++
+ 	/* Setup replenish threshold. */
+ 	tw32(RCVBDI_STD_THRESH, tp->rx_pending / 8);
+ 
+@@ -5760,14 +5783,20 @@ static void __tg3_set_rx_mode(struct net
+ 
+ 	rx_mode = tp->rx_mode & ~(RX_MODE_PROMISC |
+ 				  RX_MODE_KEEP_VLAN_TAG);
++
++	/* When ASF is in use, we always keep the RX_MODE_KEEP_VLAN_TAG
++	 * flag clear.
++	 */
+ #if TG3_VLAN_TAG_USED
+-	if (!tp->vlgrp)
++	if (!tp->vlgrp &&
++	    !(tp->tg3_flags & TG3_FLAG_ENABLE_ASF))
+ 		rx_mode |= RX_MODE_KEEP_VLAN_TAG;
+ #else
+ 	/* By definition, VLAN is disabled always in this
+ 	 * case.
+ 	 */
+-	rx_mode |= RX_MODE_KEEP_VLAN_TAG;
++	if (!(tp->tg3_flags & TG3_FLAG_ENABLE_ASF))
++		rx_mode |= RX_MODE_KEEP_VLAN_TAG;
+ #endif
+ 
+ 	if (dev->flags & IFF_PROMISC) {
+@@ -6402,25 +6431,22 @@ struct subsys_tbl_ent {
+ 
+ static struct subsys_tbl_ent subsys_id_to_phy_id[] = {
+ 	/* Broadcom boards. */
+-	{ 0x14e4, 0x1644, PHY_ID_BCM5401 }, /* BCM95700A6 */
+-	{ 0x14e4, 0x0001, PHY_ID_BCM5701 }, /* BCM95701A5 */
+-	{ 0x14e4, 0x0002, PHY_ID_BCM8002 }, /* BCM95700T6 */
+-	{ 0x14e4, 0x0003, PHY_ID_SERDES  }, /* BCM95700A9 */
+-	{ 0x14e4, 0x0005, PHY_ID_BCM5701 }, /* BCM95701T1 */
+-	{ 0x14e4, 0x0006, PHY_ID_BCM5701 }, /* BCM95701T8 */
+-	{ 0x14e4, 0x0007, PHY_ID_SERDES  }, /* BCM95701A7 */
+-	{ 0x14e4, 0x0008, PHY_ID_BCM5701 }, /* BCM95701A10 */
+-	{ 0x14e4, 0x8008, PHY_ID_BCM5701 }, /* BCM95701A12 */
+-	{ 0x14e4, 0x0009, PHY_ID_BCM5701 }, /* BCM95703Ax1 */
+-	{ 0x14e4, 0x8009, PHY_ID_BCM5701 }, /* BCM95703Ax2 */
++	{ PCI_VENDOR_ID_BROADCOM, 0x1644, PHY_ID_BCM5401 }, /* BCM95700A6 */
++	{ PCI_VENDOR_ID_BROADCOM, 0x0001, PHY_ID_BCM5701 }, /* BCM95701A5 */
++	{ PCI_VENDOR_ID_BROADCOM, 0x0002, PHY_ID_BCM8002 }, /* BCM95700T6 */
++	{ PCI_VENDOR_ID_BROADCOM, 0x0003, PHY_ID_SERDES  }, /* BCM95700A9 */
++	{ PCI_VENDOR_ID_BROADCOM, 0x0005, PHY_ID_BCM5701 }, /* BCM95701T1 */
++	{ PCI_VENDOR_ID_BROADCOM, 0x0006, PHY_ID_BCM5701 }, /* BCM95701T8 */
++	{ PCI_VENDOR_ID_BROADCOM, 0x0007, PHY_ID_SERDES  }, /* BCM95701A7 */
++	{ PCI_VENDOR_ID_BROADCOM, 0x0008, PHY_ID_BCM5701 }, /* BCM95701A10 */
++	{ PCI_VENDOR_ID_BROADCOM, 0x8008, PHY_ID_BCM5701 }, /* BCM95701A12 */
++	{ PCI_VENDOR_ID_BROADCOM, 0x0009, PHY_ID_BCM5701 }, /* BCM95703Ax1 */
++	{ PCI_VENDOR_ID_BROADCOM, 0x8009, PHY_ID_BCM5701 }, /* BCM95703Ax2 */
+ 
+ 	/* 3com boards. */
+ 	{ PCI_VENDOR_ID_3COM, 0x1000, PHY_ID_BCM5401 }, /* 3C996T */
+ 	{ PCI_VENDOR_ID_3COM, 0x1006, PHY_ID_BCM5701 }, /* 3C996BT */
+-	/* { PCI_VENDOR_ID_3COM, 0x1002, PHY_ID_XXX },     3C996CT */
+-	/* { PCI_VENDOR_ID_3COM, 0x1003, PHY_ID_XXX },     3C997T */
+ 	{ PCI_VENDOR_ID_3COM, 0x1004, PHY_ID_SERDES  }, /* 3C996SX */
+-	/* { PCI_VENDOR_ID_3COM, 0x1005, PHY_ID_XXX },     3C997SZ */
+ 	{ PCI_VENDOR_ID_3COM, 0x1007, PHY_ID_BCM5701 }, /* 3C1000T */
+ 	{ PCI_VENDOR_ID_3COM, 0x1008, PHY_ID_BCM5701 }, /* 3C940BR01 */
+ 
+@@ -6435,7 +6461,10 @@ static struct subsys_tbl_ent subsys_id_t
+ 	{ PCI_VENDOR_ID_COMPAQ, 0x009a, PHY_ID_BCM5701 }, /* BANSHEE_2 */
+ 	{ PCI_VENDOR_ID_COMPAQ, 0x007d, PHY_ID_SERDES  }, /* CHANGELING */
+ 	{ PCI_VENDOR_ID_COMPAQ, 0x0085, PHY_ID_BCM5701 }, /* NC7780 */
+-	{ PCI_VENDOR_ID_COMPAQ, 0x0099, PHY_ID_BCM5701 }  /* NC7780_2 */
++	{ PCI_VENDOR_ID_COMPAQ, 0x0099, PHY_ID_BCM5701 }, /* NC7780_2 */
++
++	/* IBM boards. */
++	{ PCI_VENDOR_ID_IBM, 0x0281, PHY_ID_SERDES } /* IBM??? */
+ };
+ 
+ static int __devinit tg3_phy_probe(struct tg3 *tp)
+@@ -6716,6 +6745,7 @@ static int __devinit tg3_get_invariants(
+ 	u32 misc_ctrl_reg;
+ 	u32 cacheline_sz_reg;
+ 	u32 pci_state_reg, grc_misc_cfg;
++	u32 val;
+ 	u16 pci_cmd;
+ 	int err;
+ 
+@@ -6912,7 +6942,9 @@ static int __devinit tg3_get_invariants(
+ 	udelay(40);
+ 
+ 	/* Initialize data/descriptor byte/word swapping. */
+-	tw32(GRC_MODE, tp->grc_mode);
++	val = tr32(GRC_MODE);
++	val &= GRC_MODE_HOST_STACKUP;
++	tw32(GRC_MODE, val | tp->grc_mode);
+ 
+ 	tg3_switch_clocks(tp);
+ 
+@@ -6975,7 +7007,8 @@ static int __devinit tg3_get_invariants(
+ 	    (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 &&
+ 	     tp->pdev->vendor == PCI_VENDOR_ID_BROADCOM &&
+ 	     (tp->pdev->device == PCI_DEVICE_ID_TIGON3_5901 ||
+-	      tp->pdev->device == PCI_DEVICE_ID_TIGON3_5901_2)))
++	      tp->pdev->device == PCI_DEVICE_ID_TIGON3_5901_2 ||
++	      tp->pdev->device == PCI_DEVICE_ID_TIGON3_5705F)))
+ 		tp->tg3_flags |= TG3_FLAG_10_100_ONLY;
+ 
+ 	err = tg3_phy_probe(tp);
+@@ -7636,6 +7669,9 @@ static int __devinit tg3_init_one(struct
+ 	dev->watchdog_timeo = TG3_TX_TIMEOUT;
+ 	dev->change_mtu = tg3_change_mtu;
+ 	dev->irq = pdev->irq;
++#ifdef CONFIG_NET_POLL_CONTROLLER
++	dev->poll_controller = tg3_poll_controller;
++#endif
+ 
+ 	err = tg3_get_invariants(tp);
+ 	if (err) {
+--- linux-2.6.0/drivers/net/tlan.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/net/tlan.c	2003-12-28 23:21:01.000000000 -0800
+@@ -814,6 +814,14 @@ static void  __init TLan_EisaProbe (void
+ 
+ } /* TLan_EisaProbe */
+ 
++#ifdef CONFIG_NET_POLL_CONTROLLER
++static void TLan_Poll(struct net_device *dev)
++{
++	disable_irq(dev->irq);
++	TLan_HandleInterrupt(dev->irq, dev, NULL);
++	enable_irq(dev->irq);
++}
++#endif
+ 
+ 	
+ 
+@@ -893,6 +901,9 @@ static int TLan_Init( struct net_device 
+ 	dev->get_stats = &TLan_GetStats;
+ 	dev->set_multicast_list = &TLan_SetMulticastList;
+ 	dev->do_ioctl = &TLan_ioctl;
++#ifdef CONFIG_NET_POLL_CONTROLLER
++	dev->poll_controller = &TLan_Poll;
++#endif
+ 	dev->tx_timeout = &TLan_tx_timeout;
+ 	dev->watchdog_timeo = TX_TIMEOUT;
+ 
+--- linux-2.6.0/drivers/net/tokenring/3c359.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/tokenring/3c359.c	2003-12-28 23:21:01.000000000 -0800
+@@ -314,7 +314,6 @@ int __devinit xl_probe(struct pci_dev *p
+ 
+ 	dev->irq=pdev->irq;
+ 	dev->base_addr=pci_resource_start(pdev,0) ; 
+-	dev->init=NULL ; /* Must be null with new api, otherwise get called twice */
+ 	xl_priv->xl_card_name = pci_name(pdev);
+ 	xl_priv->xl_mmio=ioremap(pci_resource_start(pdev,1), XL_IO_SPACE);
+ 	xl_priv->pdev = pdev ; 
+@@ -332,7 +331,7 @@ int __devinit xl_probe(struct pci_dev *p
+ 		
+ 	if((i = xl_init(dev))) {
+ 		iounmap(xl_priv->xl_mmio) ; 
+-		kfree(dev) ; 
++		free_netdev(dev) ; 
+ 		pci_release_regions(pdev) ; 
+ 		return i ; 
+ 	}				
+@@ -352,7 +351,7 @@ int __devinit xl_probe(struct pci_dev *p
+ 		printk(KERN_ERR "3C359, register netdev failed\n") ;  
+ 		pci_set_drvdata(pdev,NULL) ; 
+ 		iounmap(xl_priv->xl_mmio) ; 
+-		kfree(dev) ; 
++		free_netdev(dev) ; 
+ 		pci_release_regions(pdev) ; 
+ 		return i ; 
+ 	}
+--- linux-2.6.0/drivers/net/tokenring/abyss.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/tokenring/abyss.c	2003-12-28 23:21:01.000000000 -0800
+@@ -181,7 +181,7 @@ err_out_irq:
+ err_out_region:
+ 	release_region(pci_ioaddr, ABYSS_IO_EXTENT);
+ err_out_trdev:
+-	kfree(dev);
++	free_netdev(dev);
+ 	return ret;
+ }
+ 
+--- linux-2.6.0/drivers/net/tokenring/ibmtr.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/net/tokenring/ibmtr.c	2003-12-28 23:21:01.000000000 -0800
+@@ -187,7 +187,7 @@ char __devinit *adapter_def(char type)
+ #define TRC_INITV 0x02		/*  verbose init trace points     */
+ unsigned char ibmtr_debug_trace = 0;
+ 
+-int 		ibmtr_probe(struct net_device *dev);
++static int 	ibmtr_probe(struct net_device *dev);
+ static int	ibmtr_probe1(struct net_device *dev, int ioaddr);
+ static unsigned char get_sram_size(struct tok_info *adapt_info);
+ static int 	trdev_init(struct net_device *dev);
+@@ -313,6 +313,39 @@ static void __devinit find_turbo_adapter
+ 	}
+ }
+ 
++static void ibmtr_cleanup_card(struct net_device *dev)
++{
++	if (dev->base_addr) {
++		outb(0,dev->base_addr+ADAPTRESET);
++		
++		schedule_timeout(TR_RST_TIME); /* wait 50ms */
++
++		outb(0,dev->base_addr+ADAPTRESETREL);
++	}
++
++#ifndef PCMCIA
++	free_irq(dev->irq, dev);
++	release_region(dev->base_addr, IBMTR_IO_EXTENT);
++
++	{ 
++		struct tok_info *ti = (struct tok_info *) dev->priv;
++		iounmap((u32 *)ti->mmio);
++		iounmap((u32 *)ti->sram_virt);
++	}
++#endif		
++}
++
++int ibmtr_probe_card(struct net_device *dev)
++{
++	int err = ibmtr_probe(dev);
++	if (!err) {
++		err = register_netdev(dev);
++		if (err)
++			ibmtr_cleanup_card(dev);
++	}
++	return err;
++}
++
+ /****************************************************************************
+  *	ibmtr_probe():  Routine specified in the network device structure
+  *	to probe for an IBM Token Ring Adapter.  Routine outline:
+@@ -325,7 +358,7 @@ static void __devinit find_turbo_adapter
+  *	which references it.
+  ****************************************************************************/
+ 
+-int __devinit ibmtr_probe(struct net_device *dev)
++static int ibmtr_probe(struct net_device *dev)
+ {
+ 	int i;
+ 	int base_addr = dev->base_addr;
+@@ -1925,23 +1958,24 @@ static int __init ibmtr_init(void)
+ 	find_turbo_adapters(io);
+ 
+ 	for (i = 0; io[i] && (i < IBMTR_MAX_ADAPTERS); i++) {
++		struct net_device *dev;
+ 		irq[i] = 0;
+ 		mem[i] = 0;
+-		dev_ibmtr[i] = alloc_trdev(sizeof(struct tok_info));
+-		if (dev_ibmtr[i] == NULL) { 
++		dev = alloc_trdev(sizeof(struct tok_info));
++		if (dev == NULL) { 
+ 			if (i == 0)
+ 				return -ENOMEM;
+ 			break;
+ 		}
+-		dev_ibmtr[i]->base_addr = io[i];
+-		dev_ibmtr[i]->irq = irq[i];
+-		dev_ibmtr[i]->mem_start = mem[i];
+-		dev_ibmtr[i]->init = &ibmtr_probe;
+-		if (register_netdev(dev_ibmtr[i]) != 0) {
+-			kfree(dev_ibmtr[i]);
+-			dev_ibmtr[i] = NULL;
++		dev->base_addr = io[i];
++		dev->irq = irq[i];
++		dev->mem_start = mem[i];
++
++		if (ibmtr_probe_card(dev)) {
++			free_netdev(dev);
+ 			continue;
+ 		}
++		dev_ibmtr[i] = dev;
+ 		count++;
+ 	}
+ 	if (count) return 0;
+@@ -1957,27 +1991,9 @@ static void __exit ibmtr_cleanup(void)
+ 	for (i = 0; i < IBMTR_MAX_ADAPTERS; i++){
+ 		if (!dev_ibmtr[i])
+ 			continue;
+-		if (dev_ibmtr[i]->base_addr) {
+-			outb(0,dev_ibmtr[i]->base_addr+ADAPTRESET);
+-			
+-			schedule_timeout(TR_RST_TIME); /* wait 50ms */
+-
+-                        outb(0,dev_ibmtr[i]->base_addr+ADAPTRESETREL);
+-                }
+-
+ 		unregister_netdev(dev_ibmtr[i]);
+-		free_irq(dev_ibmtr[i]->irq, dev_ibmtr[i]);
+-		release_region(dev_ibmtr[i]->base_addr, IBMTR_IO_EXTENT);
+-#ifndef PCMCIA
+-		{ 
+-			struct tok_info *ti = (struct tok_info *)
+-				dev_ibmtr[i]->priv;
+-			iounmap((u32 *)ti->mmio);
+-			iounmap((u32 *)ti->sram_virt);
+-		}
+-#endif		
++		ibmtr_cleanup_card(dev_ibmtr[i]);
+ 		free_netdev(dev_ibmtr[i]);
+-		dev_ibmtr[i] = NULL;
+ 	}
+ }
+ module_exit(ibmtr_cleanup);
+--- linux-2.6.0/drivers/net/tokenring/madgemc.c	2003-10-08 15:07:09.000000000 -0700
++++ 25/drivers/net/tokenring/madgemc.c	2003-12-28 23:21:01.000000000 -0800
+@@ -197,7 +197,7 @@ static int __init madgemc_probe(void)
+ 		card = kmalloc(sizeof(struct madgemc_card), GFP_KERNEL);
+ 		if (card==NULL) {
+ 			printk("madgemc: unable to allocate card struct\n");
+-			kfree(dev);
++			free_netdev(dev);
+ 			if (madgemc_card_list)
+ 				return 0;
+ 			return -1;
+@@ -360,7 +360,7 @@ static int __init madgemc_probe(void)
+ 			
+ 			kfree(card);
+ 			tmsdev_term(dev);
+-			kfree(dev);
++			free_netdev(dev);
+ 			if (madgemc_card_list)
+ 				return 0;
+ 			return -1;
+@@ -399,7 +399,7 @@ static int __init madgemc_probe(void)
+ 			       MADGEMC_IO_EXTENT); 
+ 	getout1:
+ 		kfree(card);
+-		kfree(dev);
++		free_netdev(dev);
+ 		slot++;
+ 	}
+ 
+--- linux-2.6.0/drivers/net/tokenring/olympic.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/tokenring/olympic.c	2003-12-28 23:21:01.000000000 -0800
+@@ -228,7 +228,6 @@ static int __devinit olympic_probe(struc
+ #endif
+ 	dev->irq=pdev->irq;
+ 	dev->base_addr=pci_resource_start(pdev, 0);
+-	dev->init=NULL; /* Must be NULL otherwise we get called twice */
+ 	olympic_priv->olympic_card_name = pci_name(pdev);
+ 	olympic_priv->pdev = pdev; 
+ 	olympic_priv->olympic_mmio = ioremap(pci_resource_start(pdev,1),256);
+--- linux-2.6.0/drivers/net/tokenring/proteon.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/tokenring/proteon.c	2003-12-28 23:21:01.000000000 -0800
+@@ -63,7 +63,7 @@ static int dmalist[] __initdata = {
+ 
+ static char cardname[] = "Proteon 1392\0";
+ 
+-int proteon_probe(struct net_device *dev);
++struct net_device *proteon_probe(int unit);
+ static int proteon_open(struct net_device *dev);
+ static int proteon_close(struct net_device *dev);
+ static void proteon_read_eeprom(struct net_device *dev);
+@@ -89,80 +89,69 @@ static void proteon_sifwritew(struct net
+ 	outw(val, dev->base_addr + reg);
+ }
+ 
+-struct proteon_card {
+-	struct net_device *dev;
+-	struct proteon_card *next;
+-};
+-
+-static struct proteon_card *proteon_card_list;
+-
+-static int __init proteon_probe1(int ioaddr)
++static int __init proteon_probe1(struct net_device *dev, int ioaddr)
+ {
+ 	unsigned char chk1, chk2;
+ 	int i;
+ 
++	if (!request_region(ioaddr, PROTEON_IO_EXTENT, cardname))
++		return -ENODEV;
++		
++
+ 	chk1 = inb(ioaddr + 0x1f);      /* Get Proteon ID reg 1 */
+-	if (chk1 != 0x1f)
+-		return (-1);
++	if (chk1 != 0x1f) 
++		goto nodev;
++
+ 	chk1 = inb(ioaddr + 0x1e) & 0x07;       /* Get Proteon ID reg 0 */
+ 	for (i=0; i<16; i++) {
+ 		chk2 = inb(ioaddr + 0x1e) & 0x07;
+ 		if (((chk1 + 1) & 0x07) != chk2)
+-			return (-1);
++			goto nodev;
+ 		chk1 = chk2;
+ 	}
++
++	dev->base_addr = ioaddr;
+ 	return (0);
++nodev:
++	release_region(ioaddr, PROTEON_IO_EXTENT); 
++	return -ENODEV;
+ }
+ 
+-int __init proteon_probe(struct net_device *dev)
++struct net_device * __init proteon_probe(int unit)
+ {
+-        static int versionprinted;
++	struct net_device *dev = alloc_trdev(sizeof(struct net_local));
+ 	struct net_local *tp;
+-	int i,j;
+-	struct proteon_card *card;
+-
+-#ifndef MODULE
+-	netdev_boot_setup_check(dev);
+-	tr_setup(dev);
+-#endif
++        static int versionprinted;
++	const unsigned *port;
++	int j,err = 0;
+ 
+-	SET_MODULE_OWNER(dev);
+-	if (!dev->base_addr)
+-	{
+-		for(i = 0; portlist[i]; i++)
+-		{
+-			if (!request_region(portlist[i], PROTEON_IO_EXTENT, cardname))
+-				continue;
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
+ 
+-			if(proteon_probe1(portlist[i]))
+-			{
+-				release_region(dev->base_addr, PROTEON_IO_EXTENT); 
+-				continue;
+-			}
++	if (unit >= 0) {
++		sprintf(dev->name, "tr%d", unit);
++		netdev_boot_setup_check(dev);
++	}
+ 
+-			dev->base_addr = portlist[i];
+-			break;
++	SET_MODULE_OWNER(dev);
++	if (dev->base_addr)	/* probe specific location */
++		err = proteon_probe1(dev, dev->base_addr);
++	else {
++		for (port = portlist; *port; port++) {
++			err = proteon_probe1(dev, *port);
++			if (!err)
++				break;
+ 		}
+-		if(!dev->base_addr)
+-			return -1;
+ 	}
+-	else
+-	{
+-		if (!request_region(dev->base_addr, PROTEON_IO_EXTENT, cardname))
+-			return -1;
+-
+-		if(proteon_probe1(dev->base_addr))
+-		{
+-			release_region(dev->base_addr, PROTEON_IO_EXTENT); 
+-			return -1;
+-  		}
+-	} 
++	if (err)
++		goto out4;
+ 
+ 	/* At this point we have found a valid card. */
+ 
+ 	if (versionprinted++ == 0)
+ 		printk(KERN_DEBUG "%s", version);
+ 
++	err = -EIO;
+ 	if (tmsdev_init(dev, ISA_MAX_ADDRESS, NULL))
+ 		goto out4;
+ 
+@@ -264,14 +253,11 @@ int __init proteon_probe(struct net_devi
+ 	printk(KERN_DEBUG "%s:    IO: %#4lx  IRQ: %d  DMA: %d\n",
+ 	       dev->name, dev->base_addr, dev->irq, dev->dma);
+ 		
+-	/* Enlist in the card list */
+-	card = kmalloc(sizeof(struct proteon_card), GFP_KERNEL);
+-	if (!card)
++	err = register_netdev(dev);
++	if (err)
+ 		goto out;
+-	card->next = proteon_card_list;
+-	proteon_card_list = card;
+-	card->dev = dev;
+-	return 0;
++
++	return dev;
+ out:
+ 	free_dma(dev->dma);
+ out2:
+@@ -280,7 +266,8 @@ out3:
+ 	tmsdev_term(dev);
+ out4:
+ 	release_region(dev->base_addr, PROTEON_IO_EXTENT); 
+-	return -1;
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
+ /*
+@@ -370,50 +357,50 @@ MODULE_PARM(io, "1-" __MODULE_STRING(ISA
+ MODULE_PARM(irq, "1-" __MODULE_STRING(ISATR_MAX_ADAPTERS) "i");
+ MODULE_PARM(dma, "1-" __MODULE_STRING(ISATR_MAX_ADAPTERS) "i");
+ 
+-static int __init setup_card(unsigned long io, unsigned irq, unsigned char dma)
++static struct net_device *proteon_dev[ISATR_MAX_ADAPTERS];
++
++static struct net_device * __init setup_card(unsigned long io, unsigned irq, unsigned char dma)
+ {
+-	int res = -ENOMEM;
+-	struct proteon_card *this_card;
+-	struct net_device *dev = alloc_trdev(0);
+-
+-	if (dev) {
+-		dev->base_addr = io;
+-		dev->irq       = irq;
+-		dev->dma       = dma;
+-		res = -ENODEV;
+-		if (proteon_probe(dev) == 0) {
+-			res = register_netdev(dev);
+-			if (!res)
+-				return 0;
+-			release_region(dev->base_addr, PROTEON_IO_EXTENT);
+-			free_irq(dev->irq, dev);
+-			free_dma(dev->dma);
+-			tmsdev_term(dev);
+-			this_card = proteon_card_list;
+-			proteon_card_list = this_card->next;
+-			kfree(this_card);
+-		}
+-		kfree(dev);
+-	}
+-	return res;
++	struct net_device *dev = alloc_trdev(sizeof(struct net_local));
++	int err;
++
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	dev->irq = irq;
++	dev->dma = dma;
++	err = proteon_probe1(dev, io);
++	if (err) 
++		goto out;
++		
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++ out1:
++	release_region(dev->base_addr, PROTEON_IO_EXTENT);
++	free_irq(dev->irq, dev);
++	free_dma(dev->dma);
++	tmsdev_term(dev);
++ out:
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
+ int init_module(void)
+ {
+-	int i, num;
++	struct net_device *dev;
++	int i, num = 0;
+ 
+-	num = 0;
+-	if (io[0]) { /* Only probe addresses from command line */
+-		for (i = 0; i < ISATR_MAX_ADAPTERS ; i++) {
+-			if (io[i] && setup_card(io[i], irq[i], dma[i]) == 0)
+-				num++;
+-		}
+-	} else {
+-		for(i = 0; num < ISATR_MAX_ADAPTERS && portlist[i]; i++) {
+-			if (setup_card(portlist[i], irq[num], dma[num]) == 0)
+-				num++;
++	for (i = 0; i < ISATR_MAX_ADAPTERS ; i++) {
++		dev = io[0] ? setup_card(io[i], irq[i], dma[i])
++			: proteon_probe(-1);
++		if (!IS_ERR(dev)) {
++			proteon_dev[i] = dev;
++			++num;
+ 		}
+ 	}
++
+ 	printk(KERN_NOTICE "proteon.c: %d cards found.\n", num);
+ 	/* Probe for cards. */
+ 	if (num == 0) {
+@@ -425,11 +412,13 @@ int init_module(void)
+ 
+ void cleanup_module(void)
+ {
+-	struct net_device *dev;
+-	struct proteon_card *this_card;
++	int i;
+ 
+-	while (proteon_card_list) {
+-		dev = proteon_card_list->dev;
++	for (i = 0; i < ISATR_MAX_ADAPTERS ; i++) {
++		struct net_device *dev = proteon_dev[i];
++		
++		if (!dev) 
++			continue;
+ 		
+ 		unregister_netdev(dev);
+ 		release_region(dev->base_addr, PROTEON_IO_EXTENT);
+@@ -437,9 +426,6 @@ void cleanup_module(void)
+ 		free_dma(dev->dma);
+ 		tmsdev_term(dev);
+ 		free_netdev(dev);
+-		this_card = proteon_card_list;
+-		proteon_card_list = this_card->next;
+-		kfree(this_card);
+ 	}
+ }
+ #endif /* MODULE */
+--- linux-2.6.0/drivers/net/tokenring/skisa.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/tokenring/skisa.c	2003-12-28 23:21:01.000000000 -0800
+@@ -56,7 +56,7 @@ static unsigned int portlist[] __initdat
+ /* A zero-terminated list of IRQs to be probed. 
+  * Used again after initial probe for sktr_chipset_init, called from sktr_open.
+  */
+-static unsigned short irqlist[] = {
++static const unsigned short irqlist[] = {
+ 	3, 5, 9, 10, 11, 12, 15,
+ 	0
+ };
+@@ -69,7 +69,6 @@ static int dmalist[] __initdata = {
+ 
+ static char isa_cardname[] = "SK NET TR 4/16 ISA\0";
+ 
+-int sk_isa_probe(struct net_device *dev);
+ static int sk_isa_open(struct net_device *dev);
+ static int sk_isa_close(struct net_device *dev);
+ static void sk_isa_read_eeprom(struct net_device *dev);
+@@ -95,17 +94,14 @@ static void sk_isa_sifwritew(struct net_
+ 	outw(val, dev->base_addr + reg);
+ }
+ 
+-struct sk_isa_card {
+-	struct net_device *dev;
+-	struct sk_isa_card *next;
+-};
+-
+-static struct sk_isa_card *sk_isa_card_list;
+ 
+-static int __init sk_isa_probe1(int ioaddr)
++static int __init sk_isa_probe1(struct net_device *dev, int ioaddr)
+ {
+ 	unsigned char old, chk1, chk2;
+ 
++	if (!request_region(ioaddr, SK_ISA_IO_EXTENT, isa_cardname))
++		return -ENODEV;
++
+ 	old = inb(ioaddr + SIFADR);	/* Get the old SIFADR value */
+ 
+ 	chk1 = 0;	/* Begin with check value 0 */
+@@ -122,8 +118,10 @@ static int __init sk_isa_probe1(int ioad
+ 		chk2 = inb(ioaddr + SIFADD);
+ 		chk2 ^= 0x0FE;
+ 
+-		if(chk1 != chk2)
+-			return (-1);	/* No adapter */
++		if(chk1 != chk2) {
++			release_region(ioaddr, SK_ISA_IO_EXTENT);
++			return -ENODEV;
++		}
+ 
+ 		chk1 -= 2;
+ 	} while(chk1 != 0);	/* Repeat 128 times (all byte values) */
+@@ -131,58 +129,45 @@ static int __init sk_isa_probe1(int ioad
+     	/* Restore the SIFADR value */
+ 	outb(old, ioaddr + SIFADR);
+ 
+-	return (0);
++	dev->base_addr = ioaddr;
++	return 0;
+ }
+ 
+-int __init sk_isa_probe(struct net_device *dev)
++struct net_device * __init sk_isa_probe(int unit)
+ {
+-        static int versionprinted;
++	struct net_device *dev = alloc_trdev(sizeof(struct net_local));
+ 	struct net_local *tp;
+-	int i,j;
+-	struct sk_isa_card *card;
++        static int versionprinted;
++	const unsigned *port;
++	int j, err = 0;
+ 
+-#ifndef MODULE
+-	netdev_boot_setup_check(dev);
+-	tr_setup(dev);
+-#endif
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
+ 
+-	SET_MODULE_OWNER(dev);
+-	if (!dev->base_addr)
+-	{
+-		for(i = 0; portlist[i]; i++)
+-		{
+-			if (!request_region(portlist[i], SK_ISA_IO_EXTENT, isa_cardname))
+-				continue;
+-
+-			if(sk_isa_probe1(portlist[i]))
+-			{
+-				release_region(dev->base_addr, SK_ISA_IO_EXTENT); 
+-				continue;
+-			}
++	if (unit >= 0) {
++		sprintf(dev->name, "tr%d", unit);
++		netdev_boot_setup_check(dev);
++	}
+ 
+-			dev->base_addr = portlist[i];
+-			break;
++	SET_MODULE_OWNER(dev);
++	if (dev->base_addr)	/* probe specific location */
++		err = sk_isa_probe1(dev, dev->base_addr);
++	else {
++		for (port = portlist; *port; port++) {
++			err = sk_isa_probe1(dev, *port);
++			if (!err)
++				break;
+ 		}
+-		if(!dev->base_addr)
+-			return -1;
+ 	}
+-	else
+-	{
+-		if (!request_region(dev->base_addr, SK_ISA_IO_EXTENT, isa_cardname))
+-			return -1;
+-
+-		if(sk_isa_probe1(dev->base_addr))
+-		{
+-			release_region(dev->base_addr, SK_ISA_IO_EXTENT); 
+-			return -1;
+-  		}
+-	} 
++	if (err)
++		goto out4;
+ 
+ 	/* At this point we have found a valid card. */
+ 
+ 	if (versionprinted++ == 0)
+ 		printk(KERN_DEBUG "%s", version);
+ 
++	err = -EIO;
+ 	if (tmsdev_init(dev, ISA_MAX_ADDRESS, NULL))
+ 		goto out4;
+ 
+@@ -284,14 +269,11 @@ int __init sk_isa_probe(struct net_devic
+ 	printk(KERN_DEBUG "%s:    IO: %#4lx  IRQ: %d  DMA: %d\n",
+ 	       dev->name, dev->base_addr, dev->irq, dev->dma);
+ 		
+-	/* Enlist in the card list */
+-	card = kmalloc(sizeof(struct sk_isa_card), GFP_KERNEL);
+-	if (!card)
++	err = register_netdev(dev);
++	if (err)
+ 		goto out;
+-	card->next = sk_isa_card_list;
+-	sk_isa_card_list = card;
+-	card->dev = dev;
+-	return 0;
++
++	return dev;
+ out:
+ 	free_dma(dev->dma);
+ out2:
+@@ -300,7 +282,8 @@ out3:
+ 	tmsdev_term(dev);
+ out4:
+ 	release_region(dev->base_addr, SK_ISA_IO_EXTENT); 
+-	return -1;
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
+ /*
+@@ -373,6 +356,8 @@ static int sk_isa_close(struct net_devic
+ 
+ #define ISATR_MAX_ADAPTERS 3
+ 
++static struct net_device *sk_isa_dev[ISATR_MAX_ADAPTERS];
++
+ static int io[ISATR_MAX_ADAPTERS];
+ static int irq[ISATR_MAX_ADAPTERS];
+ static int dma[ISATR_MAX_ADAPTERS];
+@@ -383,50 +368,54 @@ MODULE_PARM(io, "1-" __MODULE_STRING(ISA
+ MODULE_PARM(irq, "1-" __MODULE_STRING(ISATR_MAX_ADAPTERS) "i");
+ MODULE_PARM(dma, "1-" __MODULE_STRING(ISATR_MAX_ADAPTERS) "i");
+ 
+-static int __init setup_card(unsigned long io, unsigned irq, unsigned char dma)
++static struct net_device * __init setup_card(unsigned long io, unsigned irq, unsigned char dma)
+ {
+-	int res = -ENOMEM;
+-	struct sk_isa_card *this_card;
+-	struct net_device *dev = alloc_trdev(0);
+-
+-	if (dev) {
+-		dev->base_addr = io;
+-		dev->irq       = irq;
+-		dev->dma       = dma;
+-		res = -ENODEV;
+-		if (sk_isa_probe(dev) == 0) {
+-			res = register_netdev(dev);
+-			if (!res)
+-				return 0;
+-			release_region(dev->base_addr, SK_ISA_IO_EXTENT);
+-			free_irq(dev->irq, dev);
+-			free_dma(dev->dma);
+-			tmsdev_term(dev);
+-			this_card = sk_isa_card_list;
+-			sk_isa_card_list = this_card->next;
+-			kfree(this_card);
+-		}
+-		kfree(dev);
+-	}
+-	return res;
++	struct net_device *dev = alloc_trdev(sizeof(struct net_local));
++	int err;
++
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	dev->base_addr = io;
++	dev->irq       = irq;
++	dev->dma       = dma;
++
++	err = sk_isa_probe1(dev, io);
++	if (err)
++		goto out;
++
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++
++ out1:
++	release_region(dev->base_addr, SK_ISA_IO_EXTENT);
++	free_irq(dev->irq, dev);
++	free_dma(dev->dma);
++	tmsdev_term(dev);
++ out:
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
+ int init_module(void)
+ {
++	struct net_device *dev;
+ 	int i, num;
+ 
+ 	num = 0;
+-	if (io[0]) { /* Only probe addresses from command line */
+-		for (i = 0; i < ISATR_MAX_ADAPTERS ; i++) {
+-			if (io[i] && setup_card(io[i], irq[i], dma[i]) == 0)
+-				num++;
+-		}
+-	} else {
+-		for(i = 0; num < ISATR_MAX_ADAPTERS && portlist[i]; i++) {
+-			if (setup_card(portlist[i], irq[num], dma[num]) == 0)
+-				num++;
++	for (i = 0; i < ISATR_MAX_ADAPTERS ; i++) {
++		if (io[0])  /* Only probe addresses from command line */
++			dev = setup_card(io[i], irq[i], dma[i]);
++		else
++			dev = sk_isa_probe(-1);
++		if (!IS_ERR(dev)) {
++			sk_isa_dev[i] = dev;
++			++num;
+ 		}
+ 	}
++
+ 	printk(KERN_NOTICE "skisa.c: %d cards found.\n", num);
+ 	/* Probe for cards. */
+ 	if (num == 0) {
+@@ -438,11 +427,13 @@ int init_module(void)
+ 
+ void cleanup_module(void)
+ {
+-	struct net_device *dev;
+-	struct sk_isa_card *this_card;
++	int i;
++
++	for (i = 0; i < ISATR_MAX_ADAPTERS ; i++) {
++		struct net_device *dev = sk_isa_dev[i];
+ 
+-	while (sk_isa_card_list) {
+-		dev = sk_isa_card_list->dev;
++		if (!dev) 
++			continue;
+ 		
+ 		unregister_netdev(dev);
+ 		release_region(dev->base_addr, SK_ISA_IO_EXTENT);
+@@ -450,9 +441,6 @@ void cleanup_module(void)
+ 		free_dma(dev->dma);
+ 		tmsdev_term(dev);
+ 		free_netdev(dev);
+-		this_card = sk_isa_card_list;
+-		sk_isa_card_list = this_card->next;
+-		kfree(this_card);
+ 	}
+ }
+ #endif /* MODULE */
+--- linux-2.6.0/drivers/net/tokenring/smctr.c	2003-10-08 15:07:09.000000000 -0700
++++ 25/drivers/net/tokenring/smctr.c	2003-12-28 23:21:01.000000000 -0800
+@@ -69,13 +69,6 @@ static const char cardname[] = "smctr";
+ 
+ #define SMCTR_IO_EXTENT   20
+ 
+-/* A zero-terminated list of I/O addresses to be probed. */
+-static unsigned int smctr_portlist[] __initdata = {
+-        0x200, 0x220, 0x240, 0x260, 0x280, 0x2A0, 0x2C0, 0x2E0, 0x300,
+-        0x320, 0x340, 0x360, 0x380,
+-        0
+-};
+-
+ #ifdef CONFIG_MCA
+ static unsigned int smctr_posid = 0x6ec6;
+ #endif
+@@ -219,7 +212,7 @@ static int smctr_open(struct net_device 
+ static int smctr_open_tr(struct net_device *dev);
+ 
+ /* P */
+-int __init smctr_probe (struct net_device *dev);
++struct net_device *smctr_probe(int unit);
+ static int __init smctr_probe1(struct net_device *dev, int ioaddr);
+ static int smctr_process_rx_packet(MAC_HEADER *rmf, __u16 size,
+         struct net_device *dev, __u16 rx_status);
+@@ -729,10 +722,6 @@ static int smctr_close(struct net_device
+ 
+ 	netif_stop_queue(dev);
+ 	
+-#ifdef MODULE
+-        MOD_DEC_USE_COUNT;
+-#endif
+-
+ 	tp->cleanup = 1;
+ 
+         /* Check to see if adapter is already in a closed state. */
+@@ -3490,10 +3479,6 @@ static int smctr_open(struct net_device 
+         if(err < 0)
+                 return (err);
+ 
+-#ifdef MODULE
+-        MOD_INC_USE_COUNT;
+-#endif
+-
+         return (err);
+ }
+ 
+@@ -3591,71 +3576,72 @@ out:
+         return (err);
+ }
+ 
+-/* Check for a network adapter of this type, and return '0 if one exists.
+- * If dev->base_addr == 0, probe all likely locations.
+- * If dev->base_addr == 1, always return failure.
++/* Check for a network adapter of this type, 
++ * and return device structure if one exists.
+  */
+-int __init smctr_probe (struct net_device *dev)
++struct net_device __init *smctr_probe(int unit)
+ {
+-        int i;
+-        int base_addr;
+-
+-#ifndef MODULE
+-	netdev_boot_setup_check(dev);
+-	tr_setup(dev);
+-#endif
++	struct net_device *dev = alloc_trdev(sizeof(struct net_local));
++	static const unsigned ports[] = {
++		0x200, 0x220, 0x240, 0x260, 0x280, 0x2A0, 0x2C0, 0x2E0, 0x300,
++		0x320, 0x340, 0x360, 0x380, 0
++	};
++	const unsigned *port;
++        int err = 0;
+ 
+-        base_addr = dev->base_addr;
+-        if(base_addr > 0x1ff)    /* Check a single specified location. */
+-                return (smctr_probe1(dev, base_addr));
+-        else if(base_addr != 0)  /* Don't probe at all. */
+-                return (-ENXIO);
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
+ 
+-        for(i = 0; smctr_portlist[i]; i++)
+-        {
+-                int ioaddr = smctr_portlist[i];
+-                if (!smctr_probe1(dev, ioaddr))
+-                        return (0);
+-        }
++	SET_MODULE_OWNER(dev);
+ 
+-        return (-ENODEV);
+-}
++	if (unit >= 0) {
++		sprintf(dev->name, "tr%d", unit);
++		netdev_boot_setup_check(dev);
++	}
+ 
+-static void cleanup_card(struct net_device *dev)
+-{
++        if (dev->base_addr > 0x1ff)    /* Check a single specified location. */
++		err = smctr_probe1(dev, dev->base_addr);
++        else if(dev->base_addr != 0)  /* Don't probe at all. */
++                err =-ENXIO;
++	else {
++		for (port = ports; *port; port++) {
++			err = smctr_probe1(dev, *port);
++			if (!err)
++				break;
++		}
++	}
++	if (err)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
+ #ifdef CONFIG_MCA
+-	struct net_local *tp = (struct net_local *)dev->priv;
+-	if (tp->slot_num)
++	{ struct net_local *tp = (struct net_local *)dev->priv;
++	  if (tp->slot_num)
+ 		mca_mark_as_unused(tp->slot_num);
++	}
+ #endif
+ 	release_region(dev->base_addr, SMCTR_IO_EXTENT);
+-	if (dev->irq)
+-		free_irq(dev->irq, dev);
+-	if (dev->priv)
+-		kfree(dev->priv);
++	free_irq(dev->irq, dev);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
+ }
+ 
++
+ static int __init smctr_probe1(struct net_device *dev, int ioaddr)
+ {
+         static unsigned version_printed;
+-        struct net_local *tp;
++        struct net_local *tp = dev->priv;
+         int err;
+         __u32 *ram;
+ 
+         if(smctr_debug && version_printed++ == 0)
+                 printk(version);
+ 
+-        /* Setup this devices private information structure */
+-        tp = (struct net_local *)kmalloc(sizeof(struct net_local),
+-                GFP_KERNEL);
+-        if(tp == NULL) {
+-		err = -ENOMEM;
+-		goto out;
+-	}
+-        memset(tp, 0, sizeof(struct net_local));
+         spin_lock_init(&tp->lock);
+-        
+-        dev->priv = tp;
+         dev->base_addr = ioaddr;
+ 
+ 	/* Actually detect an adapter now. */
+@@ -3664,7 +3650,7 @@ static int __init smctr_probe1(struct ne
+         {
+ 		if ((err = smctr_chk_mca(dev)) < 0) {
+ 			err = -ENODEV;
+-			goto out_tp;
++			goto out;
+ 		}
+         }
+ 
+@@ -3679,7 +3665,6 @@ static int __init smctr_probe1(struct ne
+         if(err != UCODE_PRESENT && err != SUCCESS)
+         {
+                 printk(KERN_ERR "%s: Firmware load failed (%d)\n", dev->name, err);
+-		cleanup_card(dev);
+ 		err = -EIO;
+ 		goto out;
+         }
+@@ -3704,8 +3689,6 @@ static int __init smctr_probe1(struct ne
+         dev->set_multicast_list = &smctr_set_multicast_list;
+         return (0);
+ 
+-out_tp:
+-	kfree(tp);
+ out:
+ 	return err;
+ }
+@@ -5677,47 +5660,59 @@ static int smctr_wait_while_cbusy(struct
+ static struct net_device* dev_smctr[SMCTR_MAX_ADAPTERS];
+ static int io[SMCTR_MAX_ADAPTERS];
+ static int irq[SMCTR_MAX_ADAPTERS];
+-static int mem[SMCTR_MAX_ADAPTERS];
+ 
+ MODULE_LICENSE("GPL");
+ 
+-MODULE_PARM(io,  "1-" __MODULE_STRING(SMCTR_MAX_ADAPTERS) "i");
++MODULE_PARM(io, "1-" __MODULE_STRING(SMCTR_MAX_ADAPTERS) "i");
+ MODULE_PARM(irq, "1-" __MODULE_STRING(SMCTR_MAX_ADAPTERS) "i");
+-MODULE_PARM(mem, "1-" __MODULE_STRING(SMCTR_MAX_ADAPTERS) "i");
+-MODULE_PARM(ringspeed, "1-" __MODULE_STRING(SMCTR_MAX_ADAPTERS) "i");
++MODULE_PARM(ringspeed, "i");
++
++static struct net_device *setup_card(int n)
++{
++	struct net_device *dev = alloc_trdev(sizeof(struct net_local));
++	int err;
++	
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	dev->irq = irq[n];
++	err = smctr_probe1(dev, io[n]);
++	if (err) 
++		goto out;
++		
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++ out1:
++#ifdef CONFIG_MCA
++	{ struct net_local *tp = (struct net_local *)dev->priv;
++	  if (tp->slot_num)
++		mca_mark_as_unused(tp->slot_num);
++	}
++#endif
++	release_region(dev->base_addr, SMCTR_IO_EXTENT);
++	free_irq(dev->irq, dev);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
++}
++			
+ 
+ int init_module(void)
+ {
+-        int i;
++        int i, found = 0;
++	struct net_device *dev;
+ 
+         for(i = 0; i < SMCTR_MAX_ADAPTERS; i++) {
+-		struct net_device *dev = alloc_trdev(0);
+-                irq[i] = 0;
+-                mem[i] = 0;
+-		if (!dev)
+-			return -ENOMEM;
+-                dev->base_addr = io[i];
+-                dev->irq       = irq[i];
+-                dev->mem_start = mem[i];
+-
+-		if (smctr_probe(dev) != 0) {
+-                        kfree(dev);
+-                        if (i == 0) {
+-                                printk(KERN_ERR "%s: smctr_probe failed.\n",
+-                                        cardname);
+-                                return -EIO;
+-                        }
+-			return 0;
+-                }
+-		if (register_netdev(dev) != 0) {
+-                        cleanup_card(dev);
+-			kfree(dev);
+-			continue;
+-                }
+-                dev_smctr[i] = dev;
++		dev = io[0]? setup_card(i) : smctr_probe(-1);
++		if (!IS_ERR(dev)) {
++			++found;
++			dev_smctr[i] = dev;
++		}
+         }
+ 
+-        return (0);
++        return found ? 0 : -ENODEV;
+ }
+ 
+ void cleanup_module(void)
+@@ -5726,9 +5721,20 @@ void cleanup_module(void)
+ 
+         for(i = 0; i < SMCTR_MAX_ADAPTERS; i++) {
+ 		struct net_device *dev = dev_smctr[i];
++
+ 		if (dev) {
++
+ 			unregister_netdev(dev);
+-			cleanup_card(dev);
++#ifdef CONFIG_MCA
++			{ struct net_local *tp = dev->priv;
++			if (tp->slot_num)
++				mca_mark_as_unused(tp->slot_num);
++			}
++#endif
++			release_region(dev->base_addr, SMCTR_IO_EXTENT);
++			if (dev->irq)
++				free_irq(dev->irq, dev);
++
+ 			free_netdev(dev);
+ 		}
+         }
+--- linux-2.6.0/drivers/net/tokenring/tms380tr.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/tokenring/tms380tr.c	2003-12-28 23:21:01.000000000 -0800
+@@ -147,7 +147,6 @@ static void 	tms380tr_hardware_send_pack
+ 			struct net_local* tp);
+ /* "I" */
+ static int 	tms380tr_init_adapter(struct net_device *dev);
+-static int 	tms380tr_init_card(struct net_device *dev);
+ static void 	tms380tr_init_ipb(struct net_local *tp);
+ static void 	tms380tr_init_net_local(struct net_device *dev);
+ static void 	tms380tr_init_opb(struct net_device *dev);
+@@ -232,15 +231,6 @@ static int madgemc_sifprobe(struct net_d
+ }
+ #endif
+ 
+-/* Dummy function */
+-static int tms380tr_init_card(struct net_device *dev)
+-{
+-	if(tms380tr_debug > 3)
+-		printk(KERN_DEBUG "%s: tms380tr_init_card\n", dev->name);
+-
+-	return (0);
+-}
+-
+ /*
+  * Open/initialize the board. This is called sometime after
+  * booting when the 'ifconfig' program is run.
+@@ -2386,7 +2376,6 @@ int tmsdev_init(struct net_device *dev, 
+ 	}
+ 	
+ 	/* These can be overridden by the card driver if needed */
+-	dev->init		= tms380tr_init_card;
+ 	dev->open		= tms380tr_open;
+ 	dev->stop		= tms380tr_close;
+ 	dev->do_ioctl		= NULL; 
+--- linux-2.6.0/drivers/net/tokenring/tmspci.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/tokenring/tmspci.c	2003-12-28 23:21:01.000000000 -0800
+@@ -179,7 +179,7 @@ err_out_irq:
+ err_out_region:
+ 	release_region(pci_ioaddr, TMS_PCI_IO_EXTENT);
+ err_out_trdev:
+-	kfree(dev);
++	free_netdev(dev);
+ 	return ret;
+ }
+ 
+--- linux-2.6.0/drivers/net/tulip/de2104x.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/tulip/de2104x.c	2003-12-28 23:21:01.000000000 -0800
+@@ -2084,7 +2084,7 @@ err_out_res:
+ err_out_disable:
+ 	pci_disable_device(pdev);
+ err_out_free:
+-	kfree(dev);
++	free_netdev(dev);
+ 	return rc;
+ }
+ 
+--- linux-2.6.0/drivers/net/tulip/dmfe.c	2003-09-08 13:58:58.000000000 -0700
++++ 25/drivers/net/tulip/dmfe.c	2003-12-28 23:21:01.000000000 -0800
+@@ -457,7 +457,7 @@ err_out_disable:
+ 	pci_disable_device(pdev);
+ err_out_free:
+ 	pci_set_drvdata(pdev, NULL);
+-	kfree(dev);
++	free_netdev(dev);
+ 
+ 	return err;
+ }
+--- linux-2.6.0/drivers/net/tulip/interrupt.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/net/tulip/interrupt.c	2003-12-28 23:21:01.000000000 -0800
+@@ -19,13 +19,13 @@
+ #include <linux/etherdevice.h>
+ #include <linux/pci.h>
+ 
+-
+ int tulip_rx_copybreak;
+ unsigned int tulip_max_interrupt_work;
+ 
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-
++#ifdef CONFIG_TULIP_NAPI_HW_MITIGATION
+ #define MIT_SIZE 15
++#define MIT_TABLE 15 /* We use 0 or max */
++
+ unsigned int mit_table[MIT_SIZE+1] =
+ {
+         /*  CRS11 21143 hardware Mitigation Control Interrupt
+@@ -99,16 +99,28 @@ int tulip_refill_rx(struct net_device *d
+ 	return refilled;
+ }
+ 
++#ifdef CONFIG_TULIP_NAPI
+ 
+-static int tulip_rx(struct net_device *dev)
++void oom_timer(unsigned long data)
++{
++        struct net_device *dev = (struct net_device *)data;
++	netif_rx_schedule(dev);
++}
++
++int tulip_poll(struct net_device *dev, int *budget)
+ {
+ 	struct tulip_private *tp = (struct tulip_private *)dev->priv;
+ 	int entry = tp->cur_rx % RX_RING_SIZE;
+-	int rx_work_limit = tp->dirty_rx + RX_RING_SIZE - tp->cur_rx;
++	int rx_work_limit = *budget;
+ 	int received = 0;
+ 
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-        int drop = 0, mit_sel = 0;
++	if (!netif_running(dev))
++		goto done;
++
++	if (rx_work_limit > dev->quota)
++		rx_work_limit = dev->quota;
++
++#ifdef CONFIG_TULIP_NAPI_HW_MITIGATION
+ 
+ /* that one buffer is needed for mit activation; or might be a
+    bug in the ring buffer code; check later -- JHS*/
+@@ -119,6 +131,237 @@ static int tulip_rx(struct net_device *d
+ 	if (tulip_debug > 4)
+ 		printk(KERN_DEBUG " In tulip_rx(), entry %d %8.8x.\n", entry,
+ 			   tp->rx_ring[entry].status);
++
++       do {
++               /* Acknowledge current RX interrupt sources. */
++               outl((RxIntr | RxNoBuf), dev->base_addr + CSR5);
++ 
++ 
++               /* If we own the next entry, it is a new packet. Send it up. */
++               while ( ! (tp->rx_ring[entry].status & cpu_to_le32(DescOwned))) {
++                       s32 status = le32_to_cpu(tp->rx_ring[entry].status);
++ 
++ 
++                       if (tp->dirty_rx + RX_RING_SIZE == tp->cur_rx)
++                               break;
++ 
++                       if (tulip_debug > 5)
++                               printk(KERN_DEBUG "%s: In tulip_rx(), entry %d %8.8x.\n",
++                                      dev->name, entry, status);
++                       if (--rx_work_limit < 0)
++                               goto not_done;
++ 
++                       if ((status & 0x38008300) != 0x0300) {
++                               if ((status & 0x38000300) != 0x0300) {
++                                /* Ingore earlier buffers. */
++                                       if ((status & 0xffff) != 0x7fff) {
++                                               if (tulip_debug > 1)
++                                                       printk(KERN_WARNING "%s: Oversized Ethernet frame "
++                                                              "spanned multiple buffers, status %8.8x!\n",
++                                                              dev->name, status);
++                                               tp->stats.rx_length_errors++;
++                                       }
++                               } else if (status & RxDescFatalErr) {
++                                /* There was a fatal error. */
++                                       if (tulip_debug > 2)
++                                               printk(KERN_DEBUG "%s: Receive error, Rx status %8.8x.\n",
++                                                      dev->name, status);
++                                       tp->stats.rx_errors++; /* end of a packet.*/
++                                       if (status & 0x0890) tp->stats.rx_length_errors++;
++                                       if (status & 0x0004) tp->stats.rx_frame_errors++;
++                                       if (status & 0x0002) tp->stats.rx_crc_errors++;
++                                       if (status & 0x0001) tp->stats.rx_fifo_errors++;
++                               }
++                       } else {
++                               /* Omit the four octet CRC from the length. */
++                               short pkt_len = ((status >> 16) & 0x7ff) - 4;
++                               struct sk_buff *skb;
++  
++#ifndef final_version
++                               if (pkt_len > 1518) {
++                                       printk(KERN_WARNING "%s: Bogus packet size of %d (%#x).\n",
++                                              dev->name, pkt_len, pkt_len);
++                                       pkt_len = 1518;
++                                       tp->stats.rx_length_errors++;
++                               }
++#endif
++                               /* Check if the packet is long enough to accept without copying
++                                  to a minimally-sized skbuff. */
++                               if (pkt_len < tulip_rx_copybreak
++                                   && (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
++                                       skb->dev = dev;
++                                       skb_reserve(skb, 2);    /* 16 byte align the IP header */
++                                       pci_dma_sync_single(tp->pdev,
++                                                           tp->rx_buffers[entry].mapping,
++                                                           pkt_len, PCI_DMA_FROMDEVICE);
++#if ! defined(__alpha__)
++                                       eth_copy_and_sum(skb, tp->rx_buffers[entry].skb->tail,
++                                                        pkt_len, 0);
++                                       skb_put(skb, pkt_len);
++#else
++                                       memcpy(skb_put(skb, pkt_len),
++                                              tp->rx_buffers[entry].skb->tail,
++                                              pkt_len);
++#endif
++                               } else {        /* Pass up the skb already on the Rx ring. */
++                                       char *temp = skb_put(skb = tp->rx_buffers[entry].skb,
++                                                            pkt_len);
++  
++#ifndef final_version
++                                       if (tp->rx_buffers[entry].mapping !=
++                                           le32_to_cpu(tp->rx_ring[entry].buffer1)) {
++                                               printk(KERN_ERR "%s: Internal fault: The skbuff addresses "
++                                                      "do not match in tulip_rx: %08x vs. %08x %p / %p.\n",
++                                                      dev->name,
++                                                      le32_to_cpu(tp->rx_ring[entry].buffer1),
++                                                      tp->rx_buffers[entry].mapping,
++                                                      skb->head, temp);
++                                       }
++#endif
++  
++                                       pci_unmap_single(tp->pdev, tp->rx_buffers[entry].mapping,
++                                                        PKT_BUF_SZ, PCI_DMA_FROMDEVICE);
++  
++                                       tp->rx_buffers[entry].skb = NULL;
++                                       tp->rx_buffers[entry].mapping = 0;
++                               }
++                               skb->protocol = eth_type_trans(skb, dev);
++  
++                               netif_receive_skb(skb);
++ 
++                               dev->last_rx = jiffies;
++                               tp->stats.rx_packets++;
++                               tp->stats.rx_bytes += pkt_len;
++                       }
++                       received++;
++
++                       entry = (++tp->cur_rx) % RX_RING_SIZE;
++                       if (tp->cur_rx - tp->dirty_rx > RX_RING_SIZE/4)
++                               tulip_refill_rx(dev);
++ 
++                }
++ 
++               /* New ack strategy... irq does not ack Rx any longer
++                  hopefully this helps */
++ 
++               /* Really bad things can happen here... If new packet arrives
++                * and an irq arrives (tx or just due to occasionally unset
++                * mask), it will be acked by irq handler, but new thread
++                * is not scheduled. It is major hole in design.
++                * No idea how to fix this if "playing with fire" will fail
++                * tomorrow (night 011029). If it will not fail, we won
++                * finally: amount of IO did not increase at all. */
++       } while ((inl(dev->base_addr + CSR5) & RxIntr));
++ 
++done:
++ 
++ #ifdef CONFIG_TULIP_NAPI_HW_MITIGATION
++  
++          /* We use this simplistic scheme for IM. It's proven by
++             real life installations. We can have IM enabled
++            continuesly but this would cause unnecessary latency. 
++            Unfortunely we can't use all the NET_RX_* feedback here. 
++            This would turn on IM for devices that is not contributing 
++            to backlog congestion with unnecessary latency. 
++  
++             We monitor the the device RX-ring and have:
++  
++             HW Interrupt Mitigation either ON or OFF.
++  
++            ON:  More then 1 pkt received (per intr.) OR we are dropping 
++             OFF: Only 1 pkt received
++            
++             Note. We only use min and max (0, 15) settings from mit_table */
++  
++  
++          if( tp->flags &  HAS_INTR_MITIGATION) {
++                 if( received > 1 ) {
++                         if( ! tp->mit_on ) {
++                                 tp->mit_on = 1;
++                                 outl(mit_table[MIT_TABLE], dev->base_addr + CSR11);
++                         }
++                  }
++                 else {
++                         if( tp->mit_on ) {
++                                 tp->mit_on = 0;
++                                 outl(0, dev->base_addr + CSR11);
++                         }
++                  }
++          }
++
++#endif /* CONFIG_TULIP_NAPI_HW_MITIGATION */
++ 
++         dev->quota -= received;
++         *budget -= received;
++ 
++         tulip_refill_rx(dev);
++         
++         /* If RX ring is not full we are out of memory. */
++         if (tp->rx_buffers[tp->dirty_rx % RX_RING_SIZE].skb == NULL) goto oom;
++ 
++         /* Remove us from polling list and enable RX intr. */
++ 
++         netif_rx_complete(dev);
++         outl(tulip_tbl[tp->chip_id].valid_intrs, dev->base_addr+CSR7);
++ 
++         /* The last op happens after poll completion. Which means the following:
++          * 1. it can race with disabling irqs in irq handler
++          * 2. it can race with dise/enabling irqs in other poll threads
++          * 3. if an irq raised after beginning loop, it will be immediately
++          *    triggered here.
++          *
++          * Summarizing: the logic results in some redundant irqs both
++          * due to races in masking and due to too late acking of already
++          * processed irqs. But it must not result in losing events.
++          */
++ 
++         return 0;
++ 
++ not_done:
++         if (!received) {
++
++                 received = dev->quota; /* Not to happen */
++         }
++         dev->quota -= received;
++         *budget -= received;
++ 
++         if (tp->cur_rx - tp->dirty_rx > RX_RING_SIZE/2 ||
++             tp->rx_buffers[tp->dirty_rx % RX_RING_SIZE].skb == NULL)
++                 tulip_refill_rx(dev);
++ 
++         if (tp->rx_buffers[tp->dirty_rx % RX_RING_SIZE].skb == NULL) goto oom;
++ 
++         return 1;
++ 
++ 
++ oom:    /* Executed with RX ints disabled */
++ 
++         
++         /* Start timer, stop polling, but do not enable rx interrupts. */
++         mod_timer(&tp->oom_timer, jiffies+1);
++       
++         /* Think: timer_pending() was an explicit signature of bug.
++          * Timer can be pending now but fired and completed
++          * before we did netif_rx_complete(). See? We would lose it. */
++ 
++         /* remove ourselves from the polling list */
++         netif_rx_complete(dev);
++ 
++         return 0;
++}
++
++#else /* CONFIG_TULIP_NAPI */
++
++static int tulip_rx(struct net_device *dev)
++{
++	struct tulip_private *tp = (struct tulip_private *)dev->priv;
++	int entry = tp->cur_rx % RX_RING_SIZE;
++	int rx_work_limit = tp->dirty_rx + RX_RING_SIZE - tp->cur_rx;
++	int received = 0;
++
++	if (tulip_debug > 4)
++		printk(KERN_DEBUG " In tulip_rx(), entry %d %8.8x.\n", entry,
++			   tp->rx_ring[entry].status);
+ 	/* If we own the next entry, it is a new packet. Send it up. */
+ 	while ( ! (tp->rx_ring[entry].status & cpu_to_le32(DescOwned))) {
+ 		s32 status = le32_to_cpu(tp->rx_ring[entry].status);
+@@ -163,11 +406,6 @@ static int tulip_rx(struct net_device *d
+ 			}
+ #endif
+ 
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-                        drop = atomic_read(&netdev_dropping);
+-                        if (drop)
+-                                goto throttle;
+-#endif
+ 			/* Check if the packet is long enough to accept without copying
+ 			   to a minimally-sized skbuff. */
+ 			if (pkt_len < tulip_rx_copybreak
+@@ -209,44 +447,9 @@ static int tulip_rx(struct net_device *d
+ 				tp->rx_buffers[entry].mapping = 0;
+ 			}
+ 			skb->protocol = eth_type_trans(skb, dev);
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-                        mit_sel =
+-#endif
+-			netif_rx(skb);
+ 
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-                        switch (mit_sel) {
+-                        case NET_RX_SUCCESS:
+-                        case NET_RX_CN_LOW:
+-                        case NET_RX_CN_MOD:
+-                                break;
+-
+-                        case NET_RX_CN_HIGH:
+-                                rx_work_limit -= NET_RX_CN_HIGH; /* additional*/
+-                                break;
+-                        case NET_RX_DROP:
+-                                rx_work_limit = -1;
+-                                break;
+-                        default:
+-                                printk("unknown feedback return code %d\n", mit_sel);
+-                                break;
+-                        }
++			netif_rx(skb);
+ 
+-                        drop = atomic_read(&netdev_dropping);
+-                        if (drop) {
+-throttle:
+-                                rx_work_limit = -1;
+-                                mit_sel = NET_RX_DROP;
+-
+-                                if (tp->fc_bit) {
+-                                        long ioaddr = dev->base_addr;
+-
+-                                        /* disable Rx & RxNoBuf ints. */
+-                                        outl(tulip_tbl[tp->chip_id].valid_intrs&RX_A_NBF_STOP, ioaddr + CSR7);
+-                                        set_bit(tp->fc_bit, &netdev_fc_xoff);
+-                                }
+-                        }
+-#endif
+ 			dev->last_rx = jiffies;
+ 			tp->stats.rx_packets++;
+ 			tp->stats.rx_bytes += pkt_len;
+@@ -254,42 +457,9 @@ throttle:
+ 		received++;
+ 		entry = (++tp->cur_rx) % RX_RING_SIZE;
+ 	}
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-
+-        /* We use this simplistic scheme for IM. It's proven by
+-           real life installations. We can have IM enabled
+-           continuesly but this would cause unnecessary latency.
+-           Unfortunely we can't use all the NET_RX_* feedback here.
+-           This would turn on IM for devices that is not contributing
+-           to backlog congestion with unnecessary latency.
+-
+-           We monitor the device RX-ring and have:
+-
+-           HW Interrupt Mitigation either ON or OFF.
+-
+-           ON:  More then 1 pkt received (per intr.) OR we are dropping
+-           OFF: Only 1 pkt received
+-
+-           Note. We only use min and max (0, 15) settings from mit_table */
+-
+-
+-        if( tp->flags &  HAS_INTR_MITIGATION) {
+-                if((received > 1 || mit_sel == NET_RX_DROP)
+-                   && tp->mit_sel != 15 ) {
+-                        tp->mit_sel = 15;
+-                        tp->mit_change = 1; /* Force IM change */
+-                }
+-                if((received <= 1 && mit_sel != NET_RX_DROP) && tp->mit_sel != 0 ) {
+-                        tp->mit_sel = 0;
+-                        tp->mit_change = 1; /* Force IM change */
+-                }
+-        }
+-
+-        return RX_RING_SIZE+1; /* maxrx+1 */
+-#else
+ 	return received;
+-#endif
+ }
++#endif  /* CONFIG_TULIP_NAPI */
+ 
+ static inline unsigned int phy_interrupt (struct net_device *dev)
+ {
+@@ -323,7 +493,6 @@ irqreturn_t tulip_interrupt(int irq, voi
+ 	struct tulip_private *tp = (struct tulip_private *)dev->priv;
+ 	long ioaddr = dev->base_addr;
+ 	int csr5;
+-	int entry;
+ 	int missed;
+ 	int rx = 0;
+ 	int tx = 0;
+@@ -331,6 +500,11 @@ irqreturn_t tulip_interrupt(int irq, voi
+ 	int maxrx = RX_RING_SIZE;
+ 	int maxtx = TX_RING_SIZE;
+ 	int maxoi = TX_RING_SIZE;
++#ifdef CONFIG_TULIP_NAPI
++	int rxd = 0;
++#else
++	int entry;
++#endif
+ 	unsigned int work_count = tulip_max_interrupt_work;
+ 	unsigned int handled = 0;
+ 
+@@ -346,22 +520,41 @@ irqreturn_t tulip_interrupt(int irq, voi
+ 	tp->nir++;
+ 
+ 	do {
++
++#ifdef CONFIG_TULIP_NAPI
++
++		if (!rxd && (csr5 & (RxIntr | RxNoBuf))) {
++			rxd++;
++			/* Mask RX intrs and add the device to poll list. */
++			outl(tulip_tbl[tp->chip_id].valid_intrs&~RxPollInt, ioaddr + CSR7);
++			netif_rx_schedule(dev);
++			
++			if (!(csr5&~(AbnormalIntr|NormalIntr|RxPollInt|TPLnkPass)))
++                               break;
++		}
++		
++               /* Acknowledge the interrupt sources we handle here ASAP
++                  the poll function does Rx and RxNoBuf acking */
++		
++		outl(csr5 & 0x0001ff3f, ioaddr + CSR5);
++
++#else 
+ 		/* Acknowledge all of the current interrupt sources ASAP. */
+ 		outl(csr5 & 0x0001ffff, ioaddr + CSR5);
+ 
+-		if (tulip_debug > 4)
+-			printk(KERN_DEBUG "%s: interrupt  csr5=%#8.8x new csr5=%#8.8x.\n",
+-				   dev->name, csr5, inl(dev->base_addr + CSR5));
+ 
+ 		if (csr5 & (RxIntr | RxNoBuf)) {
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-                        if ((!tp->fc_bit) ||
+-			    (!test_bit(tp->fc_bit, &netdev_fc_xoff)))
+-#endif
+ 				rx += tulip_rx(dev);
+ 			tulip_refill_rx(dev);
+ 		}
+ 
++#endif /*  CONFIG_TULIP_NAPI */
++		
++		if (tulip_debug > 4)
++			printk(KERN_DEBUG "%s: interrupt  csr5=%#8.8x new csr5=%#8.8x.\n",
++			       dev->name, csr5, inl(dev->base_addr + CSR5));
++		
++
+ 		if (csr5 & (TxNoBuf | TxDied | TxIntr | TimerInt)) {
+ 			unsigned int dirty_tx;
+ 
+@@ -462,15 +655,8 @@ irqreturn_t tulip_interrupt(int irq, voi
+ 			}
+ 			if (csr5 & RxDied) {		/* Missed a Rx frame. */
+                                 tp->stats.rx_missed_errors += inl(ioaddr + CSR8) & 0xffff;
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-				if (tp->fc_bit && !test_bit(tp->fc_bit, &netdev_fc_xoff)) {
+-					tp->stats.rx_errors++;
+-					tulip_start_rxtx(tp);
+-				}
+-#else
+ 				tp->stats.rx_errors++;
+ 				tulip_start_rxtx(tp);
+-#endif
+ 			}
+ 			/*
+ 			 * NB: t21142_lnk_change() does a del_timer_sync(), so be careful if this
+@@ -504,10 +690,6 @@ irqreturn_t tulip_interrupt(int irq, voi
+ 			if (tulip_debug > 2)
+ 				printk(KERN_ERR "%s: Re-enabling interrupts, %8.8x.\n",
+ 					   dev->name, csr5);
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-                        if (tp->fc_bit && (test_bit(tp->fc_bit, &netdev_fc_xoff)))
+-                          if (net_ratelimit()) printk("BUG!! enabling interrupt when FC off (timerintr.) \n");
+-#endif
+ 			outl(tulip_tbl[tp->chip_id].valid_intrs, ioaddr + CSR7);
+ 			tp->ttimer = 0;
+ 			oi++;
+@@ -520,16 +702,9 @@ irqreturn_t tulip_interrupt(int irq, voi
+                        /* Acknowledge all interrupt sources. */
+                         outl(0x8001ffff, ioaddr + CSR5);
+                         if (tp->flags & HAS_INTR_MITIGATION) {
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-                                if(tp->mit_change) {
+-                                        outl(mit_table[tp->mit_sel], ioaddr + CSR11);
+-                                        tp->mit_change = 0;
+-                                }
+-#else
+                      /* Josip Loncaric at ICASE did extensive experimentation
+ 			to develop a good interrupt mitigation setting.*/
+                                 outl(0x8b240000, ioaddr + CSR11);
+-#endif
+                         } else if (tp->chip_id == LC82C168) {
+ 				/* the LC82C168 doesn't have a hw timer.*/
+ 				outl(0x00, ioaddr + CSR7);
+@@ -537,10 +712,8 @@ irqreturn_t tulip_interrupt(int irq, voi
+ 			} else {
+                           /* Mask all interrupting sources, set timer to
+ 				re-enable. */
+-#ifndef CONFIG_NET_HW_FLOWCONTROL
+                                 outl(((~csr5) & 0x0001ebef) | AbnormalIntr | TimerInt, ioaddr + CSR7);
+                                 outl(0x0012, ioaddr + CSR11);
+-#endif
+                         }
+ 			break;
+ 		}
+@@ -550,6 +723,21 @@ irqreturn_t tulip_interrupt(int irq, voi
+ 			break;
+ 
+ 		csr5 = inl(ioaddr + CSR5);
++
++#ifdef CONFIG_TULIP_NAPI
++		if (rxd)
++			csr5 &= ~RxPollInt;
++	} while ((csr5 & (TxNoBuf | 
++			  TxDied | 
++			  TxIntr | 
++			  TimerInt |
++			  /* Abnormal intr. */
++			  RxDied | 
++			  TxFIFOUnderflow | 
++			  TxJabber | 
++			  TPLnkFail |  
++			  SytemError )) != 0);
++#else 
+ 	} while ((csr5 & (NormalIntr|AbnormalIntr)) != 0);
+ 
+ 	tulip_refill_rx(dev);
+@@ -574,6 +762,7 @@ irqreturn_t tulip_interrupt(int irq, voi
+ 			}
+ 		}
+ 	}
++#endif /* CONFIG_TULIP_NAPI */
+ 
+ 	if ((missed = inl(ioaddr + CSR8) & 0x1ffff)) {
+ 		tp->stats.rx_dropped += missed & 0x10000 ? 0x10000 : missed;
+--- linux-2.6.0/drivers/net/tulip/Kconfig	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/net/tulip/Kconfig	2003-12-28 23:21:01.000000000 -0800
+@@ -68,6 +68,26 @@ config TULIP_MMIO
+ 	  obscure bugs if your mainboard has memory controller timing issues.
+ 	  If in doubt, say N.
+ 
++config TULIP_NAPI
++	bool "Use NAPI RX polling "
++	depends on TULIP
++	---help---
++	  This is of useful for servers and routers dealing with high network loads.
++ 
++	  See <file:Documentation/networking/NAPI_HOWTO.txt>.
++
++	  If in doubt, say N.
++
++config TULIP_NAPI_HW_MITIGATION
++	bool "Use Interrupt Mitigation "
++	depends on TULIP_NAPI
++	---help---
++	  Use HW to reduce RX interrupts. Not strict necessary since NAPI reduces
++	  RX interrupts but itself. Although this reduces RX interrupts even at
++	  low levels traffic at the cost of a small latency.
++
++	  If in doubt, say Y.
++
+ config DE4X5
+ 	tristate "Generic DECchip & DIGITAL EtherWORKS PCI/EISA"
+ 	depends on NET_TULIP && (PCI || EISA)
+--- linux-2.6.0/drivers/net/tulip/tulip_core.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/net/tulip/tulip_core.c	2003-12-28 23:21:01.000000000 -0800
+@@ -14,11 +14,17 @@
+ 
+ */
+ 
++#include <linux/config.h>
++
+ #define DRV_NAME	"tulip"
++#ifdef CONFIG_TULIP_NAPI
++#define DRV_VERSION    "1.1.13-NAPI" /* Keep at least for test */
++#else
+ #define DRV_VERSION	"1.1.13"
++#endif
+ #define DRV_RELDATE	"May 11, 2002"
+ 
+-#include <linux/config.h>
++
+ #include <linux/module.h>
+ #include "tulip.h"
+ #include <linux/pci.h>
+@@ -247,7 +253,7 @@ static void tulip_down(struct net_device
+ static struct net_device_stats *tulip_get_stats(struct net_device *dev);
+ static int private_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
+ static void set_rx_mode(struct net_device *dev);
+-
++static void poll_tulip(struct net_device *dev);
+ 
+ 
+ static void tulip_set_power_state (struct tulip_private *tp,
+@@ -466,29 +472,16 @@ media_picked:
+ 	   to an alternate media type. */
+ 	tp->timer.expires = RUN_AT(next_tick);
+ 	add_timer(&tp->timer);
+-}
+-
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-/* Enable receiver */
+-void tulip_xon(struct net_device *dev)
+-{
+-        struct tulip_private *tp = (struct tulip_private *)dev->priv;
+-
+-        clear_bit(tp->fc_bit, &netdev_fc_xoff);
+-        if (netif_running(dev)){
+-
+-                tulip_refill_rx(dev);
+-                outl(tulip_tbl[tp->chip_id].valid_intrs,  dev->base_addr+CSR7);
+-        }
+-}
++#ifdef CONFIG_TULIP_NAPI
++	init_timer(&tp->oom_timer);
++        tp->oom_timer.data = (unsigned long)dev;
++        tp->oom_timer.function = oom_timer;
+ #endif
++}
+ 
+ static int
+ tulip_open(struct net_device *dev)
+ {
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-        struct tulip_private *tp = (struct tulip_private *)dev->priv;
+-#endif
+ 	int retval;
+ 
+ 	if ((retval = request_irq(dev->irq, &tulip_interrupt, SA_SHIRQ, dev->name, dev)))
+@@ -498,10 +491,6 @@ tulip_open(struct net_device *dev)
+ 
+ 	tulip_up (dev);
+ 
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-        tp->fc_bit = netdev_register_fc(dev, tulip_xon);
+-#endif
+-
+ 	netif_start_queue (dev);
+ 
+ 	return 0;
+@@ -582,10 +571,7 @@ static void tulip_tx_timeout(struct net_
+ #endif
+ 
+ 	/* Stop and restart the chip's Tx processes . */
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-        if (tp->fc_bit && test_bit(tp->fc_bit,&netdev_fc_xoff))
+-                printk("BUG tx_timeout restarting rx when fc on\n");
+-#endif
++
+ 	tulip_restart_rxtx(tp);
+ 	/* Trigger an immediate transmit demand. */
+ 	outl(0, ioaddr + CSR1);
+@@ -742,7 +728,9 @@ static void tulip_down (struct net_devic
+ 	unsigned long flags;
+ 
+ 	del_timer_sync (&tp->timer);
+-
++#ifdef CONFIG_TULIP_NAPI
++	del_timer_sync (&tp->oom_timer);
++#endif
+ 	spin_lock_irqsave (&tp->lock, flags);
+ 
+ 	/* Disable interrupts by clearing the interrupt mask. */
+@@ -781,13 +769,6 @@ static int tulip_close (struct net_devic
+ 
+ 	netif_stop_queue (dev);
+ 
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-        if (tp->fc_bit) {
+-                int bit = tp->fc_bit;
+-                tp->fc_bit = 0;
+-                netdev_unregister_fc(bit);
+-        }
+-#endif
+ 	tulip_down (dev);
+ 
+ 	if (tulip_debug > 1)
+@@ -1629,10 +1610,17 @@ static int __devinit tulip_init_one (str
+ 	dev->hard_start_xmit = tulip_start_xmit;
+ 	dev->tx_timeout = tulip_tx_timeout;
+ 	dev->watchdog_timeo = TX_TIMEOUT;
++#ifdef CONFIG_TULIP_NAPI
++	dev->poll = tulip_poll;
++	dev->weight = 16;
++#endif
+ 	dev->stop = tulip_close;
+ 	dev->get_stats = tulip_get_stats;
+ 	dev->do_ioctl = private_ioctl;
+ 	dev->set_multicast_list = set_rx_mode;
++#ifdef CONFIG_NET_POLL_CONTROLLER
++	dev->poll_controller = &poll_tulip;
++#endif
+ 
+ 	if (register_netdev(dev))
+ 		goto err_out_free_ring;
+@@ -1725,7 +1713,7 @@ err_out_free_res:
+ 	pci_release_regions (pdev);
+ 
+ err_out_free_netdev:
+-	kfree (dev);
++	free_netdev (dev);
+ 	return -ENODEV;
+ }
+ 
+@@ -1789,6 +1777,22 @@ static void __devexit tulip_remove_one (
+ 	/* pci_power_off (pdev, -1); */
+ }
+ 
++#ifdef CONFIG_NET_POLL_CONTROLLER
++/*
++ * Polling 'interrupt' - used by things like netconsole to send skbs
++ * without having to re-enable interrupts. It's not called while
++ * the interrupt routine is executing.
++ */
++
++static void poll_tulip (struct net_device *dev)
++{
++	/* disable_irq here is not very nice, but with the lockless
++	   interrupt handler we have no other choice. */
++	disable_irq(dev->irq);
++	tulip_interrupt (dev->irq, dev, NULL);
++	enable_irq(dev->irq);
++}
++#endif
+ 
+ static struct pci_driver tulip_driver = {
+ 	.name		= DRV_NAME,
+--- linux-2.6.0/drivers/net/tulip/tulip.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/net/tulip/tulip.h	2003-12-28 23:21:01.000000000 -0800
+@@ -126,6 +126,7 @@ enum pci_cfg_driver_reg {
+ 	CFDD_Snooze = (1 << 30),
+ };
+ 
++#define RxPollInt (RxIntr|RxNoBuf|RxDied|RxJabber)
+ 
+ /* The bits in the CSR5 status registers, mostly interrupt sources. */
+ enum status_bits {
+@@ -251,9 +252,9 @@ enum t21143_csr6_bits {
+    Making the Tx ring too large decreases the effectiveness of channel
+    bonding and packet priority.
+    There are no ill effects from too-large receive rings. */
+-#define TX_RING_SIZE	16
+-#define RX_RING_SIZE	32
+ 
++#define TX_RING_SIZE	32
++#define RX_RING_SIZE	128 
+ #define MEDIA_MASK     31
+ 
+ #define PKT_BUF_SZ		1536	/* Size of each temporary Rx buffer. */
+@@ -343,17 +344,15 @@ struct tulip_private {
+ 	int flags;
+ 	struct net_device_stats stats;
+ 	struct timer_list timer;	/* Media selection timer. */
++	struct timer_list oom_timer;    /* Out of memory timer. */
+ 	u32 mc_filter[2];
+ 	spinlock_t lock;
+ 	spinlock_t mii_lock;
+ 	unsigned int cur_rx, cur_tx;	/* The next free ring entry */
+ 	unsigned int dirty_rx, dirty_tx;	/* The ring entries to be free()ed. */
+ 
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-#define RX_A_NBF_STOP 0xffffff3f /* To disable RX and RX-NOBUF ints. */
+-        int fc_bit;
+-        int mit_sel;
+-        int mit_change; /* Signal for Interrupt Mitigtion */
++#ifdef 	CONFIG_TULIP_NAPI_HW_MITIGATION
++        int mit_on;
+ #endif
+ 	unsigned int full_duplex:1;	/* Full-duplex operation requested. */
+ 	unsigned int full_duplex_lock:1;
+@@ -415,6 +414,10 @@ extern unsigned int tulip_max_interrupt_
+ extern int tulip_rx_copybreak;
+ irqreturn_t tulip_interrupt(int irq, void *dev_instance, struct pt_regs *regs);
+ int tulip_refill_rx(struct net_device *dev);
++#ifdef CONFIG_TULIP_NAPI
++int tulip_poll(struct net_device *dev, int *budget);
++#endif
++
+ 
+ /* media.c */
+ int tulip_mdio_read(struct net_device *dev, int phy_id, int location);
+@@ -438,6 +441,7 @@ extern int tulip_debug;
+ extern const char * const medianame[];
+ extern const char tulip_media_cap[];
+ extern struct tulip_chip_table tulip_tbl[];
++void oom_timer(unsigned long data);
+ extern u8 t21040_csr13[];
+ 
+ #ifndef USE_IO_OPS
+--- linux-2.6.0/drivers/net/tulip/winbond-840.c	2003-09-08 13:58:58.000000000 -0700
++++ 25/drivers/net/tulip/winbond-840.c	2003-12-28 23:21:01.000000000 -0800
+@@ -530,7 +530,7 @@ err_out_free_res:
+ #endif
+ 	pci_release_regions(pdev);
+ err_out_netdev:
+-	kfree (dev);
++	free_netdev (dev);
+ 	return -ENODEV;
+ }
+ 
+--- linux-2.6.0/drivers/net/tulip/xircom_tulip_cb.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/tulip/xircom_tulip_cb.c	2003-12-28 23:21:01.000000000 -0800
+@@ -648,8 +648,7 @@ err_out_cleardev:
+ 	pci_set_drvdata(pdev, NULL);
+ 	pci_release_regions(pdev);
+ err_out_free_netdev:
+-	unregister_netdev(dev);
+-	kfree(dev);
++	free_netdev(dev);
+ 	return -ENODEV;
+ }
+ 
+--- linux-2.6.0/drivers/net/tun.c	2003-09-08 13:58:58.000000000 -0700
++++ 25/drivers/net/tun.c	2003-12-28 23:21:01.000000000 -0800
+@@ -377,6 +377,7 @@ static struct tun_struct *tun_get_by_nam
+ static int tun_set_iff(struct file *file, struct ifreq *ifr)
+ {
+ 	struct tun_struct *tun;
++	struct net_device *dev;
+ 	int err;
+ 
+ 	tun = tun_get_by_name(ifr->ifr_name);
+@@ -394,7 +395,6 @@ static int tun_set_iff(struct file *file
+ 	else {
+ 		char *name;
+ 		unsigned long flags = 0;
+-		struct net_device *dev;
+ 
+ 		err = -EINVAL;
+ 
+@@ -424,16 +424,13 @@ static int tun_set_iff(struct file *file
+ 
+ 		if (strchr(dev->name, '%')) {
+ 			err = dev_alloc_name(dev, dev->name);
+-			if (err < 0) {
+-				kfree(dev);
+-				goto failed;
+-			}
++			if (err < 0)
++				goto err_free_dev;
+ 		}
+ 
+-		if ((err = register_netdevice(tun->dev))) {
+-			kfree(dev);
+-			goto failed;
+-		}
++		err = register_netdevice(tun->dev);
++		if (err < 0)
++			goto err_free_dev;
+ 	
+ 		list_add(&tun->list, &tun_dev_list);
+ 	}
+@@ -451,6 +448,9 @@ static int tun_set_iff(struct file *file
+ 
+ 	strcpy(ifr->ifr_name, tun->dev->name);
+ 	return 0;
++
++ err_free_dev:
++	free_netdev(dev);
+  failed:
+ 	return err;
+ }
+--- linux-2.6.0/drivers/net/typhoon.c	2003-09-08 13:58:58.000000000 -0700
++++ 25/drivers/net/typhoon.c	2003-12-28 23:21:01.000000000 -0800
+@@ -85,8 +85,8 @@ static const int multicast_filter_limit 
+ #define PKT_BUF_SZ		1536
+ 
+ #define DRV_MODULE_NAME		"typhoon"
+-#define DRV_MODULE_VERSION 	"1.5.1"
+-#define DRV_MODULE_RELDATE	"03/06/26"
++#define DRV_MODULE_VERSION 	"1.5.2"
++#define DRV_MODULE_RELDATE	"03/11/25"
+ #define PFX			DRV_MODULE_NAME ": "
+ #define ERR_PFX			KERN_ERR PFX
+ 
+@@ -127,7 +127,7 @@ static const int multicast_filter_limit 
+ static char version[] __devinitdata =
+     "typhoon.c: version " DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
+ 
+-MODULE_AUTHOR("David Dillow <dillowd@y12.doe.gov>");
++MODULE_AUTHOR("David Dillow <dave@thedillows.org>");
+ MODULE_LICENSE("GPL");
+ MODULE_DESCRIPTION("3Com Typhoon Family (3C990, 3CR990, and variants)");
+ MODULE_PARM(rx_copybreak, "i");
+@@ -146,11 +146,12 @@ struct typhoon_card_info {
+ 	int capabilities;
+ };
+ 
+-#define TYPHOON_CRYPTO_NONE		0
+-#define TYPHOON_CRYPTO_DES		1
+-#define TYPHOON_CRYPTO_3DES		2
+-#define	TYPHOON_CRYPTO_VARIABLE		4
+-#define TYPHOON_FIBER			8
++#define TYPHOON_CRYPTO_NONE		0x00
++#define TYPHOON_CRYPTO_DES		0x01
++#define TYPHOON_CRYPTO_3DES		0x02
++#define	TYPHOON_CRYPTO_VARIABLE		0x04
++#define TYPHOON_FIBER			0x08
++#define TYPHOON_WAKEUP_NEEDS_RESET	0x10
+ 
+ enum typhoon_cards {
+ 	TYPHOON_TX = 0, TYPHOON_TX95, TYPHOON_TX97, TYPHOON_SVR,
+@@ -307,7 +308,8 @@ enum state_values {
+ /* We'll wait up to six seconds for a reset, and half a second normally.
+  */
+ #define TYPHOON_UDELAY			50
+-#define TYPHOON_RESET_TIMEOUT		(6 * HZ)
++#define TYPHOON_RESET_TIMEOUT_SLEEP	(6 * HZ)
++#define TYPHOON_RESET_TIMEOUT_NOSLEEP	((6 * 1000000) / TYPHOON_UDELAY)
+ #define TYPHOON_WAIT_TIMEOUT		((1000000 / 2) / TYPHOON_UDELAY)
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 28)
+@@ -375,10 +377,12 @@ static int
+ typhoon_reset(unsigned long ioaddr, int wait_type)
+ {
+ 	int i, err = 0;
+-	int timeout = TYPHOON_RESET_TIMEOUT;
++	int timeout;
+ 
+ 	if(wait_type == WaitNoSleep)
+-		timeout = (timeout * 1000000) / (HZ * TYPHOON_UDELAY);
++		timeout = TYPHOON_RESET_TIMEOUT_NOSLEEP;
++	else
++		timeout = TYPHOON_RESET_TIMEOUT_SLEEP;
+ 
+ 	writel(TYPHOON_INTR_ALL, ioaddr + TYPHOON_REG_INTR_MASK);
+ 	writel(TYPHOON_INTR_ALL, ioaddr + TYPHOON_REG_INTR_STATUS);
+@@ -1858,6 +1862,11 @@ typhoon_sleep(struct typhoon *tp, int st
+ 	if(typhoon_wait_status(ioaddr, TYPHOON_STATUS_SLEEPING) < 0)
+ 		return -ETIMEDOUT;
+ 
++	/* Since we cannot monitor the status of the link while sleeping,
++	 * tell the world it went away.
++	 */
++	netif_carrier_off(tp->dev);
++
+ 	pci_enable_wake(tp->pdev, state, 1);
+ 	pci_disable_device(pdev);
+ 	return pci_set_power_state(pdev, state);
+@@ -1872,8 +1881,13 @@ typhoon_wakeup(struct typhoon *tp, int w
+ 	pci_set_power_state(pdev, 0);
+ 	pci_restore_state(pdev, tp->pci_state);
+ 
++	/* Post 2.x.x versions of the Sleep Image require a reset before
++	 * we can download the Runtime Image. But let's not make users of
++	 * the old firmware pay for the reset.
++	 */
+ 	writel(TYPHOON_BOOTCMD_WAKEUP, ioaddr + TYPHOON_REG_COMMAND);
+-	if(typhoon_wait_status(ioaddr, TYPHOON_STATUS_WAITING_FOR_HOST) < 0)
++	if(typhoon_wait_status(ioaddr, TYPHOON_STATUS_WAITING_FOR_HOST) < 0 ||
++			(tp->capabilities & TYPHOON_WAKEUP_NEEDS_RESET))
+ 		return typhoon_reset(ioaddr, wait_type);
+ 
+ 	return 0;
+@@ -2251,7 +2265,7 @@ typhoon_init_one(struct pci_dev *pdev, c
+ 	void *shared;
+ 	dma_addr_t shared_dma;
+ 	struct cmd_desc xp_cmd;
+-	struct resp_desc xp_resp;
++	struct resp_desc xp_resp[3];
+ 	int i;
+ 	int err = 0;
+ 
+@@ -2380,15 +2394,15 @@ typhoon_init_one(struct pci_dev *pdev, c
+ 	}
+ 
+ 	INIT_COMMAND_WITH_RESPONSE(&xp_cmd, TYPHOON_CMD_READ_MAC_ADDRESS);
+-	if(typhoon_issue_command(tp, 1, &xp_cmd, 1, &xp_resp) < 0) {
++	if(typhoon_issue_command(tp, 1, &xp_cmd, 1, xp_resp) < 0) {
+ 		printk(ERR_PFX "%s: cannot read MAC address\n",
+ 		       pci_name(pdev));
+ 		err = -EIO;
+ 		goto error_out_reset;
+ 	}
+ 
+-	*(u16 *)&dev->dev_addr[0] = htons(le16_to_cpu(xp_resp.parm1));
+-	*(u32 *)&dev->dev_addr[2] = htonl(le32_to_cpu(xp_resp.parm2));
++	*(u16 *)&dev->dev_addr[0] = htons(le16_to_cpu(xp_resp[0].parm1));
++	*(u32 *)&dev->dev_addr[2] = htonl(le32_to_cpu(xp_resp[0].parm2));
+ 
+ 	if(!is_valid_ether_addr(dev->dev_addr)) {
+ 		printk(ERR_PFX "%s: Could not obtain valid ethernet address, "
+@@ -2396,6 +2410,28 @@ typhoon_init_one(struct pci_dev *pdev, c
+ 		goto error_out_reset;
+ 	}
+ 
++	/* Read the Sleep Image version last, so the response is valid
++	 * later when we print out the version reported.
++	 */
++	INIT_COMMAND_WITH_RESPONSE(&xp_cmd, TYPHOON_CMD_READ_VERSIONS);
++	if(typhoon_issue_command(tp, 1, &xp_cmd, 3, xp_resp) < 0) {
++		printk(ERR_PFX "%s: Could not get Sleep Image version\n",
++			pdev->slot_name);
++		goto error_out_reset;
++	}
++
++	tp->capabilities = typhoon_card_info[card_id].capabilities;
++	tp->xcvr_select = TYPHOON_XCVR_AUTONEG;
++
++	/* Typhoon 1.0 Sleep Images return one response descriptor to the
++	 * READ_VERSIONS command. Those versions are OK after waking up
++	 * from sleep without needing a reset. Typhoon 1.1+ Sleep Images
++	 * seem to need a little extra help to get started. Since we don't
++	 * know how to nudge it along, just kick it.
++	 */
++	if(xp_resp[0].numDesc != 0)
++		tp->capabilities |= TYPHOON_WAKEUP_NEEDS_RESET;
++
+ 	if(typhoon_sleep(tp, 3, 0) < 0) {
+ 		printk(ERR_PFX "%s: cannot put adapter to sleep\n",
+ 		       pci_name(pdev));
+@@ -2403,9 +2439,6 @@ typhoon_init_one(struct pci_dev *pdev, c
+ 		goto error_out_reset;
+ 	}
+ 
+-	tp->capabilities = typhoon_card_info[card_id].capabilities;
+-	tp->xcvr_select = TYPHOON_XCVR_AUTONEG;
+-
+ 	/* The chip-specific entries in the device structure. */
+ 	dev->open		= typhoon_open;
+ 	dev->hard_start_xmit	= typhoon_start_tx;
+@@ -2442,6 +2475,32 @@ typhoon_init_one(struct pci_dev *pdev, c
+ 		printk("%2.2x:", dev->dev_addr[i]);
+ 	printk("%2.2x\n", dev->dev_addr[i]);
+ 
++	/* xp_resp still contains the response to the READ_VERSIONS command.
++	 * For debugging, let the user know what version he has.
++	 */
++	if(xp_resp[0].numDesc == 0) {
++		/* This is the Typhoon 1.0 type Sleep Image, last 16 bits
++		 * of version is Month/Day of build.
++		 */
++		u16 monthday = le32_to_cpu(xp_resp[0].parm2) & 0xffff;
++		printk(KERN_INFO "%s: Typhoon 1.0 Sleep Image built "
++			"%02u/%02u/2000\n", dev->name, monthday >> 8,
++			monthday & 0xff);
++	} else if(xp_resp[0].numDesc == 2) {
++		/* This is the Typhoon 1.1+ type Sleep Image
++		 */
++		u32 sleep_ver = le32_to_cpu(xp_resp[0].parm2);
++		u8 *ver_string = (u8 *) &xp_resp[1];
++		ver_string[25] = 0;
++		printk(KERN_INFO "%s: Typhoon 1.1+ Sleep Image version "
++			"%u.%u.%u.%u %s\n", dev->name, HIPQUAD(sleep_ver),
++			ver_string);
++	} else {
++		printk(KERN_WARNING "%s: Unknown Sleep Image version "
++			"(%u:%04x)\n", dev->name, xp_resp[0].numDesc,
++			le32_to_cpu(xp_resp[0].parm2));
++	}
++		
+ 	return 0;
+ 
+ error_out_reset:
+--- linux-2.6.0/drivers/net/via-rhine.c	2003-09-08 13:58:58.000000000 -0700
++++ 25/drivers/net/via-rhine.c	2003-12-28 23:21:06.000000000 -0800
+@@ -615,6 +615,15 @@ static void __devinit reload_eeprom(long
+ 			break;
+ }
+ 
++#ifdef CONFIG_NET_POLL_CONTROLLER
++static void via_rhine_poll(struct net_device *dev)
++{
++	disable_irq(dev->irq);
++	via_rhine_interrupt(dev->irq, (void *)dev, NULL);
++	enable_irq(dev->irq);
++}
++#endif
++
+ static int __devinit via_rhine_init_one (struct pci_dev *pdev,
+ 					 const struct pci_device_id *ent)
+ {
+@@ -784,6 +793,9 @@ static int __devinit via_rhine_init_one 
+ 	dev->ethtool_ops = &netdev_ethtool_ops;
+ 	dev->tx_timeout = via_rhine_tx_timeout;
+ 	dev->watchdog_timeo = TX_TIMEOUT;
++#ifdef CONFIG_NET_POLL_CONTROLLER
++	dev->poll_controller = via_rhine_poll;
++#endif
+ 	if (np->drv_flags & ReqTxAlign)
+ 		dev->features |= NETIF_F_SG|NETIF_F_HW_CSUM;
+ 
+--- linux-2.6.0/drivers/net/wan/cosa.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/net/wan/cosa.c	2003-12-28 23:21:01.000000000 -0800
+@@ -594,40 +594,47 @@ err_out:	
+ 
+ /*---------- SPPP/HDLC netdevice ---------- */
+ 
++static void cosa_setup(struct net_device *d)
++{
++	d->open = cosa_sppp_open;
++	d->stop = cosa_sppp_close;
++	d->hard_start_xmit = cosa_sppp_tx;
++	d->do_ioctl = cosa_sppp_ioctl;
++	d->get_stats = cosa_net_stats;
++	d->tx_timeout = cosa_sppp_timeout;
++	d->watchdog_timeo = TX_TIMEOUT;
++}
++
+ static void sppp_channel_init(struct channel_data *chan)
+ {
+ 	struct net_device *d;
+ 	chan->if_ptr = &chan->pppdev;
+-	chan->pppdev.dev = kmalloc(sizeof(struct net_device), GFP_KERNEL);
+-	memset(chan->pppdev.dev, 0, sizeof(struct net_device));
++	d = alloc_netdev(0, chan->name, cosa_setup);
++	if (!d) {
++		printk(KERN_WARNING "%s: alloc_netdev failed.\n", chan->name);
++		return;
++	}
++	chan->pppdev.dev = d;
+ 	sppp_attach(&chan->pppdev);
+-	d=chan->pppdev.dev;
+-	strcpy(d->name, chan->name);
+ 	d->base_addr = chan->cosa->datareg;
+ 	d->irq = chan->cosa->irq;
+ 	d->dma = chan->cosa->dma;
+ 	d->priv = chan;
+-	d->init = NULL;
+-	d->open = cosa_sppp_open;
+-	d->stop = cosa_sppp_close;
+-	d->hard_start_xmit = cosa_sppp_tx;
+-	d->do_ioctl = cosa_sppp_ioctl;
+-	d->get_stats = cosa_net_stats;
+-	d->tx_timeout = cosa_sppp_timeout;
+-	d->watchdog_timeo = TX_TIMEOUT;
+ 	if (register_netdev(d)) {
+ 		printk(KERN_WARNING "%s: register_netdev failed.\n", d->name);
+-		sppp_detach(chan->pppdev.dev);
+-		free_netdev(chan->pppdev.dev);
++		sppp_detach(d);
++		free_netdev(d);
++		chan->pppdev.dev = NULL;
+ 		return;
+ 	}
+ }
+ 
+ static void sppp_channel_delete(struct channel_data *chan)
+ {
+-	sppp_detach(chan->pppdev.dev);
+ 	unregister_netdev(chan->pppdev.dev);
++	sppp_detach(chan->pppdev.dev);
+ 	free_netdev(chan->pppdev.dev);
++	chan->pppdev.dev = NULL;
+ }
+ 
+ static int cosa_sppp_open(struct net_device *d)
+--- linux-2.6.0/drivers/net/wan/cycx_drv.c	2003-09-08 13:58:58.000000000 -0700
++++ 25/drivers/net/wan/cycx_drv.c	2003-12-28 23:22:33.000000000 -0800
+@@ -425,8 +425,8 @@ static int load_cyc2x(struct cycx_hw *hw
+ 	if (cksum != cfm->checksum) {
+ 		printk(KERN_ERR "%s:%s: firmware corrupted!\n",
+ 				modname, __FUNCTION__);
+-		printk(KERN_ERR " cdsize = 0x%lx (expected 0x%lx)\n",
+-				len - sizeof(struct cycx_firmware) - 1,
++		printk(KERN_ERR " cdsize = 0x%x (expected 0x%x)\n",
++				len - (int)sizeof(struct cycx_firmware) - 1,
+ 				cfm->info.codesize);
+ 		printk(KERN_ERR " chksum = 0x%x (expected 0x%x)\n",
+ 				cksum, cfm->checksum);
+--- linux-2.6.0/drivers/net/wan/farsync.c	2003-10-08 15:07:09.000000000 -0700
++++ 25/drivers/net/wan/farsync.c	2003-12-28 23:21:01.000000000 -0800
+@@ -1313,8 +1313,6 @@ fst_open ( struct net_device *dev )
+         if ( err )
+                 return err;
+ 
+-        MOD_INC_USE_COUNT;
+-
+         fst_openport ( dev_to_port ( dev ));
+         netif_wake_queue ( dev );
+         return 0;
+@@ -1326,7 +1324,6 @@ fst_close ( struct net_device *dev )
+         netif_stop_queue ( dev );
+         fst_closeport ( dev_to_port ( dev ));
+         hdlc_close ( dev_to_hdlc  ( dev ));
+-        MOD_DEC_USE_COUNT;
+         return 0;
+ }
+ 
+--- linux-2.6.0/drivers/net/wan/hd64572.h	2003-06-14 12:18:28.000000000 -0700
++++ 25/drivers/net/wan/hd64572.h	2003-12-28 23:21:01.000000000 -0800
+@@ -23,8 +23,8 @@
+  *
+  */
+ 
+-#ifndef _HD64572_H
+-#define _HD64572_H
++#ifndef __HD64572_H
++#define __HD64572_H
+ 
+ /* Illegal Access Register */
+ #define	ILAR	0x00
+@@ -59,6 +59,9 @@
+ #define IR0_M(val, chan)	((val)<<(8*(chan)))		/* Int MSCI */
+ 
+ /* MSCI Channel Registers */
++#define MSCI0_OFFSET 0x00
++#define MSCI1_OFFSET 0x80
++
+ #define MD0	0x138	/* Mode reg 0 */
+ #define MD1	0x139	/* Mode reg 1 */
+ #define MD2	0x13a	/* Mode reg 2 */
+@@ -107,6 +110,11 @@
+ #define RCR	0x156	/* Rx DMA Critical Request Reg */
+ 
+ /* Timer Registers */
++#define TIMER0RX_OFFSET 0x00
++#define TIMER0TX_OFFSET 0x10
++#define TIMER1RX_OFFSET 0x20
++#define TIMER1TX_OFFSET 0x30
++
+ #define TCNTL	0x200	/* Timer Upcounter L */
+ #define TCNTH	0x201	/* Timer Upcounter H */
+ #define TCONRL	0x204	/* Timer Constant Register L */
+@@ -132,6 +140,11 @@
+ #define DCR_TX(chan)	(0x59 + 2*chan)	/* DMA Command Reg (Tx) */
+ 
+ /* DMA Channel Registers */
++#define DMAC0RX_OFFSET 0x00
++#define DMAC0TX_OFFSET 0x20
++#define DMAC1RX_OFFSET 0x40
++#define DMAC1TX_OFFSET 0x60
++
+ #define DARL	0x80	/* Dest Addr Register L (single-block, RX only) */
+ #define DARH	0x81	/* Dest Addr Register H (single-block, RX only) */
+ #define DARB	0x82	/* Dest Addr Register B (single-block, RX only) */
+@@ -166,7 +179,17 @@ typedef struct {
+ 	unsigned char	filler[5];	/* alignment filler (16 bytes) */ 
+ } pcsca_bd_t;
+ 
+-/* 
++/* Block Descriptor Structure */
++typedef struct {
++	u32 cp;			/* pointer to next block descriptor */
++	u32 bp;			/* buffer pointer */
++	u16 len;		/* data length */
++	u8 stat;		/* status */
++	u8 unused;		/* pads to 4-byte boundary */
++}pkt_desc;
++
++
++/*
+ 	Descriptor Status definitions:
+ 
+ 	Bit	Transmission	Reception
+@@ -190,6 +213,23 @@ typedef struct {
+ #define DST_SHRT	0x40	/* Short Frame  */
+ #define DST_EOM		0x80	/* End of Message  */
+ 
++/* Packet Descriptor Status bits */
++
++#define ST_TX_EOM     0x80	/* End of frame */
++#define ST_TX_UNDRRUN 0x08
++#define ST_TX_OWNRSHP 0x02
++#define ST_TX_EOT     0x01	/* End of transmition */
++
++#define ST_RX_EOM     0x80	/* End of frame */
++#define ST_RX_SHORT   0x40	/* Short frame */
++#define ST_RX_ABORT   0x20	/* Abort */
++#define ST_RX_RESBIT  0x10	/* Residual bit */
++#define ST_RX_OVERRUN 0x08	/* Overrun */
++#define ST_RX_CRC     0x04	/* CRC */
++#define ST_RX_OWNRSHP 0x02
++
++#define ST_ERROR_MASK 0x7C
++
+ /* Status Counter Registers */
+ #define CMCR	0x158	/* Counter Master Ctl Reg */
+ #define TECNTL	0x160	/* Tx EOM Counter L */
+@@ -246,11 +286,25 @@ typedef struct {
+ #define MD0_BIT_SYNC	0x80
+ #define MD0_TRANSP	0xc0
+ 
++#define MD0_HDLC        0x80	/* Bit-sync HDLC mode */
++
++#define MD0_CRC_NONE	0x00
++#define MD0_CRC_16_0	0x04
++#define MD0_CRC_16	0x05
++#define MD0_CRC_ITU32	0x06
++#define MD0_CRC_ITU	0x07
++
+ #define MD1_NOADDR	0x00
+ #define MD1_SADDR1	0x40
+ #define MD1_SADDR2	0x80
+ #define MD1_DADDR	0xc0
+ 
++#define MD2_NRZI_IEEE	0x40
++#define MD2_MANCHESTER	0x80
++#define MD2_FM_MARK	0xA0
++#define MD2_FM_SPACE	0xC0
++#define MD2_LOOPBACK	0x03	/* Local data Loopback */
++
+ #define MD2_F_DUPLEX	0x00
+ #define MD2_AUTO_ECHO	0x01
+ #define MD2_LOOP_HI_Z	0x02
+@@ -274,6 +328,10 @@ typedef struct {
+ #define CTL_URSKP	0x40
+ #define CTL_URCT	0x80
+ 
++#define CTL_NORTS	0x01
++#define CTL_NODTR	0x02
++#define CTL_IDLE	0x10
++
+ #define	RXS_BR0		0x01
+ #define	RXS_BR1		0x02
+ #define	RXS_BR2		0x04
+@@ -302,6 +360,12 @@ typedef struct {
+ #define	EXS_TES1	0x20
+ #define	EXS_TES2	0x40
+ 
++#define CLK_BRG_MASK	0x0F
++#define CLK_PIN_OUT	0x80
++#define CLK_LINE    	0x00	/* clock line input */
++#define CLK_BRG     	0x40	/* internal baud rate generator */
++#define CLK_TX_RXCLK	0x60	/* TX clock from RX clock */
++
+ #define CMD_RX_RST	0x11
+ #define CMD_RX_ENA	0x12
+ #define CMD_RX_DIS	0x13
+@@ -324,6 +388,10 @@ typedef struct {
+ #define CMD_SRCH_MODE	0x31
+ #define CMD_NOP		0x00
+ 
++#define CMD_RESET	0x21
++#define CMD_TX_ENABLE	0x02
++#define CMD_RX_ENABLE	0x12
++
+ #define ST0_RXRDY	0x01
+ #define ST0_TXRDY	0x02
+ #define ST0_RXINTB	0x20
+@@ -374,6 +442,8 @@ typedef struct {
+ #define IE0_RXINTB	0x20
+ #define IE0_RXINTA	0x40
+ #define IE0_TXINT	0x80
++#define IE0_UDRN	0x00008000 /* TX underrun MSCI interrupt enable */
++#define IE0_CDCD	0x00000400 /* CD level change interrupt enable */
+ 
+ #define IE1_IDLD	0x01
+ #define IE1_ABTD	0x02
+@@ -424,14 +494,28 @@ typedef struct {
+ #define DIR_EOM		0x40
+ #define DIR_EOT		0x80
+ 
++#define DIR_REFE	0x04
++#define DIR_UDRFE	0x04
++#define DIR_COAE	0x08
++#define DIR_COFE	0x10
++#define DIR_BOFE	0x20
++#define DIR_EOME	0x40
++#define DIR_EOTE	0x80
++
+ #define DMR_CNTE	0x02
+ #define DMR_NF		0x04
+ #define DMR_SEOME	0x08
+ #define DMR_TMOD	0x10
+ 
++#define DMER_DME        0x80	/* DMA Master Enable */
++
+ #define DCR_SW_ABT	0x01
+ #define DCR_FCT_CLR	0x02
+ 
++#define DCR_ABORT	0x01
++#define DCR_CLEAR_EOF	0x02
++
++#define PCR_COTE	0x80
+ #define PCR_PR0		0x01
+ #define PCR_PR1		0x02
+ #define PCR_PR2		0x04
+@@ -440,4 +524,4 @@ typedef struct {
+ #define PCR_OSB		0x40
+ #define PCR_BURST	0x80
+ 
+-#endif /* (_HD64572_H) */
++#endif /* (__HD64572_H) */
+--- linux-2.6.0/drivers/net/wan/Kconfig	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/wan/Kconfig	2003-12-28 23:23:06.000000000 -0800
+@@ -325,6 +325,21 @@ config HDLC_X25
+ comment "X.25/LAPB support is disabled"
+ 	depends on WAN && HDLC && (LAPB!=m || HDLC!=m) && LAPB!=y
+ 
++config PCI200SYN
++	tristate "Goramo PCI200SYN support"
++	depends on HDLC && PCI
++	help
++	  This driver is for PCI200SYN cards made by Goramo sp. j.
++	  If you have such a card, say Y here and see
++	  <http://hq.pm.waw.pl/pub/hdlc/>
++
++	  If you want to compile the driver as a module ( = code which can be
++	  inserted in and removed from the running kernel whenever you want),
++	  say M here and read <file:Documentation/modules.txt>.  The module
++	  will be called pci200syn.
++
++	  If unsure, say N here.
++
+ config WANXL
+ 	tristate "SBE Inc. wanXL support"
+ 	depends on HDLC && PCI
+@@ -334,7 +349,7 @@ config WANXL
+ 
+ 	  If you want to compile the driver as a module ( = code which can be
+ 	  inserted in and removed from the running kernel whenever you want),
+-	  say M here and read <file:Documentation/modules.txt>.  The module
++	  say M here and read <file:Documentation/kbuild/modules.txt>.  The module
+ 	  will be called wanxl.
+ 
+ 	  If unsure, say N here.
+@@ -467,7 +482,7 @@ config SDLA
+ 	  Say Y here if you need a driver for the Sangoma S502A, S502E, and
+ 	  S508 Frame Relay Access Devices. These are multi-protocol cards, but
+ 	  only frame relay is supported by the driver at this time. Please
+-	  read <file:Documentation/framerelay.txt>.
++	  read <file:Documentation/networking/framerelay.txt>.
+ 
+ 	  To compile this driver as a module, choose M here: the module will be
+ 	  called sdla.
+--- linux-2.6.0/drivers/net/wan/lmc/lmc_main.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/wan/lmc/lmc_main.c	2003-12-28 23:21:01.000000000 -0800
+@@ -78,30 +78,22 @@
+ #include "lmc_debug.h"
+ #include "lmc_proto.h"
+ 
+-
+-static int Lmc_Count = 0;
+-static struct net_device *Lmc_root_dev = NULL;
+-static u8 cards_found = 0;
+-
+ static int lmc_first_load = 0;
+ 
+-int LMC_PKT_BUF_SZ = 1542;
++static int LMC_PKT_BUF_SZ = 1542;
+ 
+-#ifdef MODULE
+ static struct pci_device_id lmc_pci_tbl[] = {
+-    { 0x1011, 0x009, 0x1379, PCI_ANY_ID, 0, 0, 0},
+-    { 0, }
++	{ PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_FAST,
++	  PCI_VENDOR_ID_LMC, PCI_ANY_ID },
++	{ PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_TULIP_FAST,
++	  PCI_ANY_ID, PCI_VENDOR_ID_LMC },
++	{ 0 }
+ };
+ 
+ MODULE_DEVICE_TABLE(pci, lmc_pci_tbl);
+-
+ MODULE_LICENSE("GPL");
+-#endif
+ 
+ 
+-int lmc_probe_fake(struct net_device *dev);
+-static struct net_device *lmc_probe1(struct net_device *dev, unsigned long ioaddr, unsigned int irq,
+-				 int chip_id, int subdevice, int board_idx);
+ static int lmc_start_xmit(struct sk_buff *skb, struct net_device *dev);
+ static int lmc_start_xmit(struct sk_buff *skb, struct net_device *dev);
+ static int lmc_rx (struct net_device *dev);
+@@ -115,12 +107,9 @@ static void lmc_softreset(lmc_softc_t * 
+ static void lmc_running_reset(struct net_device *dev);
+ static int lmc_ifdown(struct net_device * const);
+ static void lmc_watchdog(unsigned long data);
+-static int lmc_init(struct net_device * const);
+ static void lmc_reset(lmc_softc_t * const sc);
+ static void lmc_dec_reset(lmc_softc_t * const sc);
+ static void lmc_driver_timeout(struct net_device *dev);
+-int lmc_setup(void);
+-
+ 
+ /*
+  * linux reserves 16 device specific IOCTLs.  We call them
+@@ -815,67 +804,77 @@ kick_timer:
+ 
+ }
+ 
+-static int lmc_init(struct net_device * const dev) /*fold00*/
++static void lmc_setup(struct net_device * const dev) /*fold00*/
+ {
+-    lmc_trace(dev, "lmc_init in");
+-    lmc_trace(dev, "lmc_init out");
+-	
+-    return 0;
++    lmc_trace(dev, "lmc_setup in");
++
++    dev->type = ARPHRD_HDLC;
++    dev->hard_start_xmit = lmc_start_xmit;
++    dev->open = lmc_open;
++    dev->stop = lmc_close;
++    dev->get_stats = lmc_get_stats;
++    dev->do_ioctl = lmc_ioctl;
++    dev->set_config = lmc_set_config;
++    dev->tx_timeout = lmc_driver_timeout;
++    dev->watchdog_timeo = (HZ); /* 1 second */
++    
++    lmc_trace(dev, "lmc_setup out");
+ }
+ 
+-/* This initializes each card from lmc_probe() */
+-static struct net_device *lmc_probe1 (struct net_device *dev, unsigned long ioaddr, unsigned int irq, /*fold00*/
+-                                  int chip_id, int subdevice, int board_idx)
++
++static int __devinit lmc_init_one(struct pci_dev *pdev,
++				  const struct pci_device_id *ent)
+ {
+-    lmc_softc_t *sc = NULL;
++    struct net_device *dev;
++    lmc_softc_t *sc;
++    u16 subdevice;
+     u_int16_t AdapModelNum;
+-
+-    /*
+-     * Allocate our own device structure
+-     */
+-
+-    dev = kmalloc (sizeof (struct net_device)+8, GFP_KERNEL);
+-    if (dev == NULL){
+-        printk (KERN_ERR "lmc: kmalloc for device failed\n");
+-        return NULL;
+-    }
+-    memset (dev, 0, sizeof (struct net_device));
+-
++    int err = -ENOMEM;
++    static int cards_found;
+ #ifndef GCOM
+-    /*
+-     *	Switch to common hdlc%d naming. We name by type not by vendor
+-     */
+-    
+-    dev_alloc_name(dev, "hdlc%d");
++    /* We name by type not by vendor */
++    static const char lmcname[] = "hdlc%d";
+ #else
+-    /*
++    /* 
+      * GCOM uses LMC vendor name so that clients can know which card
+      * to attach to.
+      */
+-    dev_alloc_name(dev, "lmc%d");
++    static const char lmcname[] = "lmc%d";
+ #endif
+ 
+-    lmc_trace(dev, "lmc_probe1 in");
++
++    /*
++     * Allocate our own device structure
++     */
++    dev = alloc_netdev(sizeof(lmc_softc_t), lmcname, lmc_setup);
++    if (!dev) {
++        printk (KERN_ERR "lmc:alloc_netdev for device failed\n");
++	goto out1;
++    }
++ 
++    lmc_trace(dev, "lmc_init_one in");
++
++    err = pci_enable_device(pdev);
++    if (err) {
++	    printk(KERN_ERR "lmc: pci enable failed:%d\n", err);
++	    goto out2;
++    }
+     
+-    Lmc_Count++;
++    if (pci_request_regions(pdev, "lmc")) {
++	    printk(KERN_ERR "lmc: pci_request_region failed\n");
++	    err = -EIO;
++	    goto out3;
++    }
++
++    pci_set_drvdata(pdev, dev);
+ 
+     if(lmc_first_load == 0){
+-        printk(KERN_INFO "Lan Media Corporation WAN Driver Version %d.%d.%d\n",DRIVER_MAJOR_VERSION, DRIVER_MINOR_VERSION,DRIVER_SUB_VERSION);
++        printk(KERN_INFO "Lan Media Corporation WAN Driver Version %d.%d.%d\n",
++	       DRIVER_MAJOR_VERSION, DRIVER_MINOR_VERSION,DRIVER_SUB_VERSION);
+         lmc_first_load = 1;
+     }
+     
+-    /*
+-     * Allocate space for the private data structure
+-     */
+-
+-    sc = kmalloc (sizeof (lmc_softc_t), GFP_KERNEL);
+-    if (sc == NULL) {
+-        printk (KERN_WARNING "%s: Cannot allocate memory for device state\n",
+-                dev->name);
+-        return (NULL);
+-    }
+-    memset (sc, 0, sizeof (lmc_softc_t));
+-    dev->priv = sc;
++    sc = dev->priv;
+     sc->lmc_device = dev;
+     sc->name = dev->name;
+ 
+@@ -883,8 +882,12 @@ static struct net_device *lmc_probe1 (st
+     /* An ioctl can cause a subsequent detach for raw frame interface */
+     sc->if_type = LMC_PPP;
+     sc->check = 0xBEAFCAFE;
+-    dev->base_addr = ioaddr;
+-    dev->irq = irq;
++    dev->base_addr = pci_resource_start(pdev, 0);
++    dev->irq = pdev->irq;
++
++    SET_MODULE_OWNER(dev);
++    SET_NETDEV_DEV(dev, &pdev->dev);
++
+     /*
+      * This will get the protocol layer ready and do any 1 time init's
+      * Must have a valid sc and dev structure
+@@ -893,19 +896,6 @@ static struct net_device *lmc_probe1 (st
+ 
+     lmc_proto_attach(sc);
+ 
+-    /* Just fill in the entries for the device */
+-
+-    dev->init = lmc_init;
+-    dev->type = ARPHRD_HDLC;
+-    dev->hard_start_xmit = lmc_start_xmit;
+-    dev->open = lmc_open;
+-    dev->stop = lmc_close;
+-    dev->get_stats = lmc_get_stats;
+-    dev->do_ioctl = lmc_ioctl;
+-    dev->set_config = lmc_set_config;
+-    dev->tx_timeout = lmc_driver_timeout;
+-    dev->watchdog_timeo = (HZ); /* 1 second */
+-    
+     /*
+      * Why were we changing this???
+      dev->tx_queue_len = 100;
+@@ -914,44 +904,45 @@ static struct net_device *lmc_probe1 (st
+     /* Init the spin lock so can call it latter */
+ 
+     spin_lock_init(&sc->lmc_lock);
++    pci_set_master(pdev);
+ 
+-    printk ("%s: detected at %lx, irq %d\n", dev->name, ioaddr, dev->irq);
++    printk ("%s: detected at %lx, irq %d\n", dev->name,
++	    dev->base_addr, dev->irq);
+ 
+     if (register_netdev (dev) != 0) {
+         printk (KERN_ERR "%s: register_netdev failed.\n", dev->name);
+-        lmc_proto_detach(sc);
+-        kfree (dev->priv);
+-        kfree (dev);
+-        return NULL;
++	goto out4;
+     }
+ 
+-    /*
+-     * Request the region of registers we need, so that
+-     * later on, no one else will take our card away from
+-     * us.
+-     */
+-    request_region (ioaddr, LMC_REG_RANGE, dev->name);
+-
+     sc->lmc_cardtype = LMC_CARDTYPE_UNKNOWN;
+     sc->lmc_timing = LMC_CTL_CLOCK_SOURCE_EXT;
+ 
++    /*
++     *
++     * Check either the subvendor or the subdevice, some systems reverse
++     * the setting in the bois, seems to be version and arch dependent?
++     * Fix the error, exchange the two values 
++     */
++    if ((subdevice = pdev->subsystem_device) == PCI_VENDOR_ID_LMC)
++	    subdevice = pdev->subsystem_vendor;
++
+     switch (subdevice) {
+-    case PCI_PRODUCT_LMC_HSSI:
++    case PCI_DEVICE_ID_LMC_HSSI:
+         printk ("%s: LMC HSSI\n", dev->name);
+         sc->lmc_cardtype = LMC_CARDTYPE_HSSI;
+         sc->lmc_media = &lmc_hssi_media;
+         break;
+-    case PCI_PRODUCT_LMC_DS3:
++    case PCI_DEVICE_ID_LMC_DS3:
+         printk ("%s: LMC DS3\n", dev->name);
+         sc->lmc_cardtype = LMC_CARDTYPE_DS3;
+         sc->lmc_media = &lmc_ds3_media;
+         break;
+-    case PCI_PRODUCT_LMC_SSI:
++    case PCI_DEVICE_ID_LMC_SSI:
+         printk ("%s: LMC SSI\n", dev->name);
+         sc->lmc_cardtype = LMC_CARDTYPE_SSI;
+         sc->lmc_media = &lmc_ssi_media;
+         break;
+-    case PCI_PRODUCT_LMC_T1:
++    case PCI_DEVICE_ID_LMC_T1:
+         printk ("%s: LMC T1\n", dev->name);
+         sc->lmc_cardtype = LMC_CARDTYPE_T1;
+         sc->lmc_media = &lmc_t1_media;
+@@ -976,13 +967,13 @@ static struct net_device *lmc_probe1 (st
+     AdapModelNum = (lmc_mii_readreg (sc, 0, 3) & 0x3f0) >> 4;
+ 
+     if ((AdapModelNum == LMC_ADAP_T1
+-         && subdevice == PCI_PRODUCT_LMC_T1) ||		/* detect LMC1200 */
++         && subdevice == PCI_DEVICE_ID_LMC_T1) ||	/* detect LMC1200 */
+         (AdapModelNum == LMC_ADAP_SSI
+-         && subdevice == PCI_PRODUCT_LMC_SSI) ||	/* detect LMC1000 */
++         && subdevice == PCI_DEVICE_ID_LMC_SSI) ||	/* detect LMC1000 */
+         (AdapModelNum == LMC_ADAP_DS3
+-         && subdevice == PCI_PRODUCT_LMC_DS3) ||	/* detect LMC5245 */
++         && subdevice == PCI_DEVICE_ID_LMC_DS3) ||	/* detect LMC5245 */
+         (AdapModelNum == LMC_ADAP_HSSI
+-         && subdevice == PCI_PRODUCT_LMC_HSSI))
++         && subdevice == PCI_DEVICE_ID_LMC_HSSI))
+     {				/* detect LMC5200 */
+ 
+     }
+@@ -996,10 +987,7 @@ static struct net_device *lmc_probe1 (st
+      */
+     LMC_CSR_WRITE (sc, csr_gp_timer, 0xFFFFFFFFUL);
+ 
+-    sc->board_idx = board_idx;
+-
+-    memset (&sc->stats, 0, sizeof (struct lmc_statistics));
+-
++    sc->board_idx = cards_found++;
+     sc->stats.check = STATCHECK;
+     sc->stats.version_size = (DRIVER_VERSION << 16) +
+         sizeof (struct lmc_statistics);
+@@ -1008,105 +996,40 @@ static struct net_device *lmc_probe1 (st
+     sc->lmc_ok = 0;
+     sc->last_link_status = 0;
+ 
+-    lmc_trace(dev, "lmc_probe1 out");
+-
+-    return dev;
+-}
+-
+-
+-/* This is the entry point.  This is what is called immediately. */
+-/* This goes out and finds the card */
++    lmc_trace(dev, "lmc_init_one out");
++    return 0;
+ 
+-int lmc_probe_fake(struct net_device *dev) /*fold00*/
+-{
+-    lmc_probe(NULL);
+-    /* Return 1 to unloaded bogus device */
+-    return 1;
++ out4:
++    lmc_proto_detach(sc);
++ out3:
++    if (pdev) {
++	    pci_release_regions(pdev);
++	    pci_set_drvdata(pdev, NULL);
++    }
++ out2:
++    free_netdev(dev);
++ out1:
++    return err;
+ }
+ 
+-int lmc_probe (struct net_device *dev) /*fold00*/
++/*
++ * Called from pci when removing module.
++ */
++static void __devexit lmc_remove_one (struct pci_dev *pdev)
+ {
+-    int pci_index = 0;
+-    unsigned long pci_ioaddr;
+-    unsigned int pci_irq_line;
+-    u16 vendor, subvendor, device, subdevice;
+-    u32 foundaddr = 0;
+-    u8 intcf = 0;
+-    struct pci_dev *pdev = NULL;
+-
+-    /* Loop basically until we don't find anymore. */
+-    while ((pdev = pci_find_class (PCI_CLASS_NETWORK_ETHERNET << 8, pdev))) {
+-	if (pci_enable_device(pdev))
+-		break;
+-
+-        vendor = pdev->vendor;
+-        device = pdev->device;
+-        pci_irq_line = pdev->irq;
+-        pci_ioaddr = pci_resource_start (pdev, 0);
+-	subvendor = pdev->subsystem_vendor;
+-	subdevice = pdev->subsystem_device;
+-
+-	pci_set_master (pdev);
+-
+-        /*
+-         * Make sure it's the correct card.  CHECK SUBVENDOR ID!
+-         * There are lots of tulip's out there.
+-         * Also check the region of registers we will soon be
+-         * poking, to make sure no one else has reserved them.
+-         * This prevents taking someone else's device.
+-         *
+-         * Check either the subvendor or the subdevice, some systems reverse
+-         * the setting in the bois, seems to be version and arch dependent?
+-         * Fix the two variables
+-         *
+-         */
+-        if (!(check_region (pci_ioaddr, LMC_REG_RANGE)) &&
+-            (vendor == CORRECT_VENDOR_ID) &&
+-            (device == CORRECT_DEV_ID) &&
+-            ((subvendor == PCI_VENDOR_LMC)  || (subdevice == PCI_VENDOR_LMC))){
+-            struct net_device *cur, *prev = NULL;
+-
+-            /* Fix the error, exchange the two values */
+-            if(subdevice == PCI_VENDOR_LMC){
+-                subdevice = subvendor;
+-                subvendor = PCI_VENDOR_LMC ;
+-            }
+-
+-            /* Make the call to actually setup this card */
+-            dev = lmc_probe1 (dev, pci_ioaddr, pci_irq_line,
+-                              device, subdevice, cards_found);
+-            if (dev == NULL) {
+-                printk ("lmc_probe: lmc_probe1 failed\n");
+-                goto lmc_probe_next_card;
+-            }
+-            /* insert the device into the chain of lmc devices */
+-            for (cur = Lmc_root_dev;
+-                 cur != NULL;
+-                 cur = ((lmc_softc_t *) cur->priv)->next_module) {
+-                prev = cur;
+-            }
+-
+-            if (prev == NULL)
+-                Lmc_root_dev = dev;
+-            else
+-                ((lmc_softc_t *) prev->priv)->next_module = dev;
+-
+-            ((lmc_softc_t *) dev->priv)->next_module = NULL;
+-            /* end insert */
+-
+-            foundaddr = dev->base_addr;
+-
+-            cards_found++;
+-            intcf++;
+-        }
+-    lmc_probe_next_card:
+-        pci_index++;
++    struct net_device *dev = pci_get_drvdata(pdev);
++    
++    if (dev) {
++	    lmc_softc_t *sc = dev->priv;
++	    
++	    printk("%s: removing...\n", dev->name);
++	    lmc_proto_detach(sc);
++	    unregister_netdev(dev);
++	    free_netdev(dev);
++	    pci_release_regions(pdev);
++	    pci_disable_device(pdev);
++	    pci_set_drvdata(pdev, NULL);
+     }
+-
+-    if (cards_found < 1)
+-        return -1;
+-
+-    return foundaddr;
+ }
+ 
+ /* After this is called, packets can be sent.
+@@ -1181,8 +1104,6 @@ static int lmc_open (struct net_device *
+     
+     sc->stats.tx_tbusy0++ ;
+ 
+-    MOD_INC_USE_COUNT;
+-
+     /*
+      * select what interrupts we want to get
+      */
+@@ -1352,7 +1273,6 @@ static int lmc_ifdown (struct net_device
+ 
+     lmc_trace(dev, "lmc_ifdown out");
+ 
+-    MOD_DEC_USE_COUNT;
+     return 0;
+ }
+ 
+@@ -1850,12 +1770,11 @@ skip_out_of_mem:
+ 
+ static struct net_device_stats *lmc_get_stats (struct net_device *dev) /*fold00*/
+ {
+-    lmc_softc_t *sc;
++    lmc_softc_t *sc = dev->priv;
+     unsigned long flags;
+ 
+     lmc_trace(dev, "lmc_get_stats in");
+ 
+-    sc = dev->priv;
+ 
+     spin_lock_irqsave(&sc->lmc_lock, flags);
+ 
+@@ -1868,58 +1787,21 @@ static struct net_device_stats *lmc_get_
+     return (struct net_device_stats *) &sc->stats;
+ }
+ 
++static struct pci_driver lmc_driver = {
++	.name		= "lmc",
++	.id_table	= lmc_pci_tbl,
++	.probe		= lmc_init_one,
++	.remove		= __devexit_p(lmc_remove_one),
++};
++
+ static int __init init_lmc(void)
+ {
+-    printk ("lmc: module loaded\n");
+-
+-    /* Have lmc_probe search for all the cards, and allocate devices */
+-    if (lmc_probe (NULL) < 0)
+-        return -EIO;
+-
+-    return 0;
++    return pci_module_init(&lmc_driver);
+ }
+ 
+ static void __exit exit_lmc(void)
+ {
+-    struct net_device *dev, *next;
+-    lmc_softc_t *sc;
+-
+-    /* we have no pointer to our devices, since they are all dynamically
+-     * allocated.  So, here we loop through all the network devices
+-     * looking for ours.  When found, dispose of them properly.
+-     */
+-
+-    for (dev = Lmc_root_dev;
+-         dev != NULL;
+-         dev = next )
+-    {
+-
+-        next = ((lmc_softc_t *) dev->priv)->next_module; /* get it now before we deallocate it */
+-        printk ("%s: removing...\n", dev->name);
+-
+-        /* close the syncppp stuff, and release irq. Close is run on unreg net */
+-        lmc_close (dev);
+-	sc = dev->priv;
+-        if (sc != NULL)
+-            lmc_proto_detach(sc);
+-
+-        /* Remove the device from the linked list */
+-        unregister_netdev (dev);
+-
+-        /* Let go of the io region */;
+-        release_region (dev->base_addr, LMC_REG_RANGE);
+-
+-        /* free our allocated structures. */
+-        kfree (dev->priv);
+-        dev->priv = NULL;
+-
+-        free_netdev (dev);
+-        dev = NULL;
+-    }
+-
+-
+-    Lmc_root_dev = NULL;
+-    printk ("lmc module unloaded\n");
++    pci_unregister_driver(&lmc_driver);
+ }
+ 
+ module_init(init_lmc);
+@@ -2326,8 +2208,3 @@ bug_out:
+ 
+ 
+ }
+-
+-int lmc_setup(void) { /*FOLD00*/
+-   return lmc_probe(NULL);
+-}
+-
+--- linux-2.6.0/drivers/net/wan/lmc/lmc_var.h	2003-06-14 12:18:09.000000000 -0700
++++ 25/drivers/net/wan/lmc/lmc_var.h	2003-12-28 23:21:01.000000000 -0800
+@@ -390,7 +390,7 @@ struct lmc___softc {
+ 	struct timer_list	timer;
+ 	lmc_ctl_t		ictl;
+ 	u_int32_t		TxDescriptControlInit;  
+-	struct net_device		*next_module;   /* Link to the next module  */
++
+ 	int                     tx_TimeoutInd; /* additional driver state */
+ 	int                     tx_TimeoutDisplay;
+ 	unsigned int		lastlmc_taint_tx;
+@@ -519,18 +519,7 @@ struct lmc___softc {
+ #define TULIP_CMD_RECEIVEALL 0x40000000L
+ #endif
+ 
+-
+-/* PCI register values */
+-#define CORRECT_VENDOR_ID    0x1011
+-#define CORRECT_DEV_ID       9
+-
+-#define PCI_VENDOR_LMC		0x1376
+-#define PCI_PRODUCT_LMC_HSSI	0x0003
+-#define PCI_PRODUCT_LMC_DS3	0x0004
+-#define PCI_PRODUCT_LMC_SSI	0x0005
+-#define PCI_PRODUCT_LMC_T1      0x0006
+-
+-/* Adapcter module number */
++/* Adapter module number */
+ #define LMC_ADAP_HSSI           2
+ #define LMC_ADAP_DS3            3
+ #define LMC_ADAP_SSI            4
+--- linux-2.6.0/drivers/net/wan/Makefile	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/wan/Makefile	2003-12-28 23:21:01.000000000 -0800
+@@ -67,6 +67,7 @@ endif
+ obj-$(CONFIG_N2)		+= n2.o
+ obj-$(CONFIG_C101)		+= c101.o
+ obj-$(CONFIG_WANXL)		+= wanxl.o
++obj-$(CONFIG_PCI200SYN)		+= pci200syn.o
+ 
+ ifeq ($(CONFIG_WANXL_BUILD_FIRMWARE),y)
+ ifeq ($(ARCH),m68k)
+--- linux-2.6.0/drivers/net/wan/pc300_drv.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/wan/pc300_drv.c	2003-12-28 23:21:01.000000000 -0800
+@@ -3165,7 +3165,6 @@ int cpc_open(struct net_device *dev)
+ 		return result;
+ 	}
+ 
+-	MOD_INC_USE_COUNT;
+ 	sprintf(ifr.ifr_name, "%s", dev->name);
+ 	cpc_opench(d);
+ 	netif_start_queue(dev);
+@@ -3201,7 +3200,6 @@ int cpc_close(struct net_device *dev)
+ 	}
+ #endif
+ 
+-	MOD_DEC_USE_COUNT;
+ 	return 0;
+ }
+ 
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/net/wan/pci200syn.c	2003-12-28 23:21:01.000000000 -0800
+@@ -0,0 +1,475 @@
++/*
++ * Goramo PCI200SYN synchronous serial card driver for Linux
++ *
++ * Copyright (C) 2002-2003 Krzysztof Halasa <khc@pm.waw.pl>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of version 2 of the GNU General Public License
++ * as published by the Free Software Foundation.
++ *
++ * For information see http://hq.pm.waw.pl/hdlc/
++ *
++ * Sources of information:
++ *    Hitachi HD64572 SCA-II User's Manual
++ *    PLX Technology Inc. PCI9052 Data Book
++ */
++
++#include <linux/module.h>
++#include <linux/kernel.h>
++#include <linux/slab.h>
++#include <linux/sched.h>
++#include <linux/types.h>
++#include <linux/fcntl.h>
++#include <linux/in.h>
++#include <linux/string.h>
++#include <linux/errno.h>
++#include <linux/init.h>
++#include <linux/ioport.h>
++#include <linux/moduleparam.h>
++#include <linux/netdevice.h>
++#include <linux/hdlc.h>
++#include <linux/pci.h>
++#include <asm/delay.h>
++#include <asm/io.h>
++
++#include "hd64572.h"
++
++static const char* version = "Goramo PCI200SYN driver version: 1.16";
++static const char* devname = "PCI200SYN";
++
++#undef DEBUG_PKT
++#define DEBUG_RINGS
++
++#define PCI200SYN_PLX_SIZE	0x80	/* PLX control window size (128b) */
++#define PCI200SYN_SCA_SIZE	0x400	/* SCA window size (1Kb) */
++#define ALL_PAGES_ALWAYS_MAPPED
++#define NEED_DETECT_RAM
++#define NEED_SCA_MSCI_INTR
++#define MAX_TX_BUFFERS		10
++
++static int pci_clock_freq = 33000000;
++#define CLOCK_BASE pci_clock_freq
++
++#define PCI_VENDOR_ID_GORAMO	0x10B5	/* uses PLX:9050 ID - this card	*/
++#define PCI_DEVICE_ID_PCI200SYN	0x9050	/* doesn't have its own ID	*/
++
++
++/*
++ *      PLX PCI9052 local configuration and shared runtime registers.
++ *      This structure can be used to access 9052 registers (memory mapped).
++ */
++typedef struct {
++	u32 loc_addr_range[4];	/* 00-0Ch : Local Address Ranges */
++	u32 loc_rom_range;	/* 10h : Local ROM Range */
++	u32 loc_addr_base[4];	/* 14-20h : Local Address Base Addrs */
++	u32 loc_rom_base;	/* 24h : Local ROM Base */
++	u32 loc_bus_descr[4];	/* 28-34h : Local Bus Descriptors */
++	u32 rom_bus_descr;	/* 38h : ROM Bus Descriptor */
++	u32 cs_base[4];		/* 3C-48h : Chip Select Base Addrs */
++	u32 intr_ctrl_stat;	/* 4Ch : Interrupt Control/Status */
++	u32 init_ctrl;		/* 50h : EEPROM ctrl, Init Ctrl, etc */
++}plx9052;
++
++
++
++typedef struct port_s {
++	hdlc_device hdlc;	/* HDLC device struct - must be first */
++	struct card_s *card;
++	spinlock_t lock;	/* TX lock */
++	sync_serial_settings settings;
++	int rxpart;		/* partial frame received, next frame invalid*/
++	unsigned short encoding;
++	unsigned short parity;
++	u16 rxin;		/* rx ring buffer 'in' pointer */
++	u16 txin;		/* tx ring buffer 'in' and 'last' pointers */
++	u16 txlast;
++	u8 rxs, txs, tmc;	/* SCA registers */
++	u8 phy_node;		/* physical port # - 0 or 1 */
++}port_t;
++
++
++
++typedef struct card_s {
++	u8* rambase;		/* buffer memory base (virtual) */
++	u8* scabase;		/* SCA memory base (virtual) */
++	plx9052* plxbase;	/* PLX registers memory base (virtual) */
++	u16 rx_ring_buffers;	/* number of buffers in a ring */
++	u16 tx_ring_buffers;
++	u16 buff_offset;	/* offset of first buffer of first channel */
++	u8 irq;			/* interrupt request level */
++
++	port_t ports[2];
++}card_t;
++
++
++#define sca_in(reg, card)	     readb(card->scabase + (reg))
++#define sca_out(value, reg, card)    writeb(value, card->scabase + (reg))
++#define sca_inw(reg, card)	     readw(card->scabase + (reg))
++#define sca_outw(value, reg, card)   writew(value, card->scabase + (reg))
++#define sca_inl(reg, card)	     readl(card->scabase + (reg))
++#define sca_outl(value, reg, card)   writel(value, card->scabase + (reg))
++
++#define port_to_card(port)	     (port->card)
++#define log_node(port)		     (port->phy_node)
++#define phy_node(port)		     (port->phy_node)
++#define winbase(card)		     (card->rambase)
++#define get_port(card, port)	     (&card->ports[port])
++#define sca_flush(card)		     (sca_in(IER0, card));
++
++static inline void new_memcpy_toio(char *dest, char *src, int length)
++{
++	int len;
++	do {
++		len = length > 256 ? 256 : length;
++		memcpy_toio(dest, src, len);
++		dest += len;
++		src += len;
++		length -= len;
++		readb(dest);
++	} while (len);
++}
++
++#undef memcpy_toio
++#define memcpy_toio new_memcpy_toio
++
++#include "hd6457x.c"
++
++
++static void pci200_set_iface(port_t *port)
++{
++	card_t *card = port->card;
++	u16 msci = get_msci(port);
++	u8 rxs = port->rxs & CLK_BRG_MASK;
++	u8 txs = port->txs & CLK_BRG_MASK;
++
++	sca_out(EXS_TES1, (phy_node(port) ? MSCI1_OFFSET : MSCI0_OFFSET) + EXS,
++		port_to_card(port));
++	switch(port->settings.clock_type) {
++	case CLOCK_INT:
++		rxs |= CLK_BRG; /* BRG output */
++		txs |= CLK_PIN_OUT | CLK_TX_RXCLK; /* RX clock */
++		break;
++
++	case CLOCK_TXINT:
++		rxs |= CLK_LINE; /* RXC input */
++		txs |= CLK_PIN_OUT | CLK_BRG; /* BRG output */
++		break;
++
++	case CLOCK_TXFROMRX:
++		rxs |= CLK_LINE; /* RXC input */
++		txs |= CLK_PIN_OUT | CLK_TX_RXCLK; /* RX clock */
++		break;
++
++	default:		/* EXTernal clock */
++		rxs |= CLK_LINE; /* RXC input */
++		txs |= CLK_PIN_OUT | CLK_LINE; /* TXC input */
++		break;
++	}
++
++	port->rxs = rxs;
++	port->txs = txs;
++	sca_out(rxs, msci + RXS, card);
++	sca_out(txs, msci + TXS, card);
++	sca_set_port(port);
++}
++
++
++
++static int pci200_open(struct net_device *dev)
++{
++	hdlc_device *hdlc = dev_to_hdlc(dev);
++	port_t *port = hdlc_to_port(hdlc);
++
++	int result = hdlc_open(hdlc);
++	if (result)
++		return result;
++
++	sca_open(hdlc);
++	pci200_set_iface(port);
++	sca_flush(port_to_card(port));
++	return 0;
++}
++
++
++
++static int pci200_close(struct net_device *dev)
++{
++	hdlc_device *hdlc = dev_to_hdlc(dev);
++	sca_close(hdlc);
++	sca_flush(port_to_card(dev_to_port(dev)));
++	hdlc_close(hdlc);
++	return 0;
++}
++
++
++
++static int pci200_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
++{
++	const size_t size = sizeof(sync_serial_settings);
++	sync_serial_settings new_line, *line = ifr->ifr_settings.ifs_ifsu.sync;
++	hdlc_device *hdlc = dev_to_hdlc(dev);
++	port_t *port = hdlc_to_port(hdlc);
++
++#ifdef DEBUG_RINGS
++	if (cmd == SIOCDEVPRIVATE) {
++		sca_dump_rings(hdlc);
++		return 0;
++	}
++#endif
++	if (cmd != SIOCWANDEV)
++		return hdlc_ioctl(dev, ifr, cmd);
++
++	switch(ifr->ifr_settings.type) {
++	case IF_GET_IFACE:
++		ifr->ifr_settings.type = IF_IFACE_V35;
++		if (ifr->ifr_settings.size < size) {
++			ifr->ifr_settings.size = size; /* data size wanted */
++			return -ENOBUFS;
++		}
++		if (copy_to_user(line, &port->settings, size))
++			return -EFAULT;
++		return 0;
++
++	case IF_IFACE_V35:
++	case IF_IFACE_SYNC_SERIAL:
++		if (!capable(CAP_NET_ADMIN))
++			return -EPERM;
++
++		if (copy_from_user(&new_line, line, size))
++			return -EFAULT;
++
++		if (new_line.clock_type != CLOCK_EXT &&
++		    new_line.clock_type != CLOCK_TXFROMRX &&
++		    new_line.clock_type != CLOCK_INT &&
++		    new_line.clock_type != CLOCK_TXINT)
++		return -EINVAL;	/* No such clock setting */
++
++		if (new_line.loopback != 0 && new_line.loopback != 1)
++			return -EINVAL;
++
++		memcpy(&port->settings, &new_line, size); /* Update settings */
++		pci200_set_iface(port);
++		sca_flush(port_to_card(port));
++		return 0;
++
++	default:
++		return hdlc_ioctl(dev, ifr, cmd);
++	}
++}
++
++
++
++static void pci200_pci_remove_one(struct pci_dev *pdev)
++{
++	int i;
++	card_t *card = pci_get_drvdata(pdev);
++
++	for(i = 0; i < 2; i++)
++		if (card->ports[i].card)
++			unregister_hdlc_device(&card->ports[i].hdlc);
++
++	if (card->irq)
++		free_irq(card->irq, card);
++
++	if (card->rambase)
++		iounmap(card->rambase);
++	if (card->scabase)
++		iounmap(card->scabase);
++	if (card->plxbase)
++		iounmap(card->plxbase);
++
++	pci_release_regions(pdev);
++	pci_disable_device(pdev);
++	pci_set_drvdata(pdev, NULL);
++	kfree(card);
++}
++
++
++
++static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
++					 const struct pci_device_id *ent)
++{
++	card_t *card;
++	u8 rev_id;
++	u32 *p;
++	int i;
++	u32 ramsize;
++	u32 ramphys;		/* buffer memory base */
++	u32 scaphys;		/* SCA memory base */
++	u32 plxphys;		/* PLX registers memory base */
++
++#ifndef MODULE
++	static int printed_version;
++	if (!printed_version++)
++		printk(KERN_INFO "%s\n", version);
++#endif
++
++	i = pci_enable_device(pdev);
++	if (i)
++		return i;
++
++	i = pci_request_regions(pdev, "PCI200SYN");
++	if (i) {
++		pci_disable_device(pdev);
++		return i;
++	}
++
++	card = kmalloc(sizeof(card_t), GFP_KERNEL);
++	if (card == NULL) {
++		printk(KERN_ERR "pci200syn: unable to allocate memory\n");
++		pci_release_regions(pdev);
++		pci_disable_device(pdev);
++		return -ENOBUFS;
++	}
++	memset(card, 0, sizeof(card_t));
++	pci_set_drvdata(pdev, card);
++
++	pci_read_config_byte(pdev, PCI_REVISION_ID, &rev_id);
++	if (pci_resource_len(pdev, 0) != PCI200SYN_PLX_SIZE ||
++	    pci_resource_len(pdev, 2) != PCI200SYN_SCA_SIZE ||
++	    pci_resource_len(pdev, 3) < 16384) {
++		printk(KERN_ERR "pci200syn: invalid card EEPROM parameters\n");
++		pci200_pci_remove_one(pdev);
++		return -EFAULT;
++	}
++
++	plxphys = pci_resource_start(pdev,0) & PCI_BASE_ADDRESS_MEM_MASK;
++	card->plxbase = ioremap(plxphys, PCI200SYN_PLX_SIZE);
++
++	scaphys = pci_resource_start(pdev,2) & PCI_BASE_ADDRESS_MEM_MASK;
++	card->scabase = ioremap(scaphys, PCI200SYN_SCA_SIZE);
++
++	ramphys = pci_resource_start(pdev,3) & PCI_BASE_ADDRESS_MEM_MASK;
++	card->rambase = ioremap(ramphys, pci_resource_len(pdev,3));
++
++	if (card->plxbase == NULL ||
++	    card->scabase == NULL ||
++	    card->rambase == NULL) {
++		printk(KERN_ERR "pci200syn: ioremap() failed\n");
++		pci200_pci_remove_one(pdev);
++	}
++
++	/* Reset PLX */
++	p = &card->plxbase->init_ctrl;
++	writel(readl(p) | 0x40000000, p);
++	readl(p);		/* Flush the write - do not use sca_flush */
++	udelay(1);
++
++	writel(readl(p) & ~0x40000000, p);
++	readl(p);		/* Flush the write - do not use sca_flush */
++	udelay(1);
++
++	ramsize = sca_detect_ram(card, card->rambase,
++				 pci_resource_len(pdev, 3));
++
++	/* number of TX + RX buffers for one port - this is dual port card */
++	i = ramsize / (2 * (sizeof(pkt_desc) + HDLC_MAX_MRU));
++	card->tx_ring_buffers = min(i / 2, MAX_TX_BUFFERS);
++	card->rx_ring_buffers = i - card->tx_ring_buffers;
++
++	card->buff_offset = 2 * sizeof(pkt_desc) * (card->tx_ring_buffers +
++						    card->rx_ring_buffers);
++
++	printk(KERN_INFO "pci200syn: %u KB RAM at 0x%x, IRQ%u, using %u TX +"
++	       " %u RX packets rings\n", ramsize / 1024, ramphys,
++	       pdev->irq, card->tx_ring_buffers, card->rx_ring_buffers);
++
++	if (card->tx_ring_buffers < 1) {
++		printk(KERN_ERR "pci200syn: RAM test failed\n");
++		pci200_pci_remove_one(pdev);
++		return -EFAULT;
++	}
++
++	/* Enable interrupts on the PCI bridge */
++	p = &card->plxbase->intr_ctrl_stat;
++	writew(readw(p) | 0x0040, p);
++
++	/* Allocate IRQ */
++	if(request_irq(pdev->irq, sca_intr, SA_SHIRQ, devname, card)) {
++		printk(KERN_WARNING "pci200syn: could not allocate IRQ%d.\n",
++		       pdev->irq);
++		pci200_pci_remove_one(pdev);
++		return -EBUSY;
++	}
++	card->irq = pdev->irq;
++
++	sca_init(card, 0);
++
++	for(i = 0; i < 2; i++) {
++		port_t *port = &card->ports[i];
++		struct net_device *dev = hdlc_to_dev(&port->hdlc);
++		port->phy_node = i;
++
++		spin_lock_init(&port->lock);
++		SET_MODULE_OWNER(dev);
++		dev->irq = card->irq;
++		dev->mem_start = ramphys;
++		dev->mem_end = ramphys + ramsize - 1;
++		dev->tx_queue_len = 50;
++		dev->do_ioctl = pci200_ioctl;
++		dev->open = pci200_open;
++		dev->stop = pci200_close;
++		port->hdlc.attach = sca_attach;
++		port->hdlc.xmit = sca_xmit;
++		port->settings.clock_type = CLOCK_EXT;
++		if(register_hdlc_device(&port->hdlc)) {
++			printk(KERN_ERR "pci200syn: unable to register hdlc "
++			       "device\n");
++			pci200_pci_remove_one(pdev);
++			return -ENOBUFS;
++		}
++		port->card = card;
++		sca_init_sync_port(port);	/* Set up SCA memory */
++
++		printk(KERN_INFO "%s: PCI200SYN node %d\n",
++		       hdlc_to_name(&port->hdlc), port->phy_node);
++	}
++
++	sca_flush(card);
++	return 0;
++}
++
++
++
++static struct pci_device_id pci200_pci_tbl[] __devinitdata = {
++	{ PCI_VENDOR_ID_GORAMO, PCI_DEVICE_ID_PCI200SYN, PCI_ANY_ID,
++	  PCI_ANY_ID, 0, 0, 0 },
++	{ 0, }
++};
++
++
++static struct pci_driver pci200_pci_driver = {
++	name:	  "PCI200SYN",
++	id_table: pci200_pci_tbl,
++	probe:	  pci200_pci_init_one,
++	remove:	  pci200_pci_remove_one,
++};
++
++
++static int __init pci200_init_module(void)
++{
++#ifdef MODULE
++	printk(KERN_INFO "%s\n", version);
++#endif
++	if (pci_clock_freq < 1000000 || pci_clock_freq > 80000000) {
++		printk(KERN_ERR "pci200syn: Invalid PCI clock frequency\n");
++		return -EINVAL;
++	}
++	return pci_module_init(&pci200_pci_driver);
++}
++
++
++
++static void __exit pci200_cleanup_module(void)
++{
++	pci_unregister_driver(&pci200_pci_driver);
++}
++
++MODULE_AUTHOR("Krzysztof Halasa <khc@pm.waw.pl>");
++MODULE_DESCRIPTION("Goramo PCI200SYN serial port driver");
++MODULE_LICENSE("GPL v2");
++MODULE_DEVICE_TABLE(pci, pci200_pci_tbl);
++module_param(pci_clock_freq, int, 0444);
++MODULE_PARM_DESC(pci_clock_freq, "System PCI clock frequency in Hz");
++module_init(pci200_init_module);
++module_exit(pci200_cleanup_module);
+--- linux-2.6.0/drivers/net/wan/x25_asy.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/wan/x25_asy.c	2003-12-28 23:21:01.000000000 -0800
+@@ -94,7 +94,7 @@ static struct x25_asy *x25_asy_alloc(voi
+ 			return sl;
+ 		} else {
+ 			printk("x25_asy_alloc() - register_netdev() failure.\n");
+-			kfree(dev);
++			free_netdev(dev);
+ 		}
+ 	}
+ 	return NULL;
+--- linux-2.6.0/drivers/net/wd.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/wd.c	2003-12-28 23:21:01.000000000 -0800
+@@ -47,7 +47,6 @@ static const char version[] =
+ static unsigned int wd_portlist[] __initdata =
+ {0x300, 0x280, 0x380, 0x240, 0};
+ 
+-int wd_probe(struct net_device *dev);
+ static int wd_probe1(struct net_device *dev, int ioaddr);
+ 
+ static int wd_open(struct net_device *dev);
+@@ -83,11 +82,14 @@ static int wd_close(struct net_device *d
+ 	The wd_probe1() routine initializes the card and fills the
+ 	station address field. */
+ 
+-int __init wd_probe(struct net_device *dev)
++static int __init do_wd_probe(struct net_device *dev)
+ {
+ 	int i;
+ 	struct resource *r;
+ 	int base_addr = dev->base_addr;
++	int irq = dev->irq;
++	int mem_start = dev->mem_start;
++	int mem_end = dev->mem_end;
+ 
+ 	SET_MODULE_OWNER(dev);
+ 
+@@ -115,11 +117,45 @@ int __init wd_probe(struct net_device *d
+ 			return 0;
+ 		}
+ 		release_region(ioaddr, WD_IO_EXTENT);
++		dev->irq = irq;
++		dev->mem_start = mem_start;
++		dev->mem_end = mem_end;
+ 	}
+ 
+ 	return -ENODEV;
+ }
+ 
++static void cleanup_card(struct net_device *dev)
++{
++	free_irq(dev->irq, dev);
++	release_region(dev->base_addr - WD_NIC_OFFSET, WD_IO_EXTENT);
++}
++
++struct net_device * __init wd_probe(int unit)
++{
++	struct net_device *dev = alloc_ei_netdev();
++	int err;
++
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	sprintf(dev->name, "eth%d", unit);
++	netdev_boot_setup_check(dev);
++
++	err = do_wd_probe(dev);
++	if (err)
++		goto out;
++	err = register_netdev(dev);
++	if (err)
++		goto out1;
++	return dev;
++out1:
++	cleanup_card(dev);
++out:
++	free_netdev(dev);
++	return ERR_PTR(err);
++}
++
+ static int __init wd_probe1(struct net_device *dev, int ioaddr)
+ {
+ 	int i;
+@@ -262,19 +298,11 @@ static int __init wd_probe1(struct net_d
+ 	} else if (dev->irq == 2)		/* Fixup bogosity: IRQ2 is really IRQ9 */
+ 		dev->irq = 9;
+ 
+-	/* Allocate dev->priv and fill in 8390 specific dev fields. */
+-	if (ethdev_init(dev)) {
+-		printk (" unable to get memory for dev->priv.\n");
+-		return -ENOMEM;
+-	}
+-
+ 	/* Snarf the interrupt now.  There's no point in waiting since we cannot
+ 	   share and the board will usually be enabled. */
+ 	i = request_irq(dev->irq, ei_interrupt, 0, dev->name, dev);
+ 	if (i) {
+ 		printk (" unable to get IRQ %d.\n", dev->irq);
+-		kfree(dev->priv);
+-		dev->priv = NULL;
+ 		return i;
+ 	}
+ 
+@@ -446,7 +474,7 @@ wd_close(struct net_device *dev)
+ 
+ #ifdef MODULE
+ #define MAX_WD_CARDS	4	/* Max number of wd cards per module */
+-static struct net_device dev_wd[MAX_WD_CARDS];
++static struct net_device *dev_wd[MAX_WD_CARDS];
+ static int io[MAX_WD_CARDS];
+ static int irq[MAX_WD_CARDS];
+ static int mem[MAX_WD_CARDS];
+@@ -468,29 +496,35 @@ ISA device autoprobes on a running machi
+ int
+ init_module(void)
+ {
++	struct net_device *dev;
+ 	int this_dev, found = 0;
+ 
+ 	for (this_dev = 0; this_dev < MAX_WD_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_wd[this_dev];
+-		dev->irq = irq[this_dev];
+-		dev->base_addr = io[this_dev];
+-		dev->mem_start = mem[this_dev];
+-		dev->mem_end = mem_end[this_dev];
+-		dev->init = wd_probe;
+ 		if (io[this_dev] == 0)  {
+ 			if (this_dev != 0) break; /* only autoprobe 1st one */
+ 			printk(KERN_NOTICE "wd.c: Presently autoprobing (not recommended) for a single card.\n");
+ 		}
+-		if (register_netdev(dev) != 0) {
+-			printk(KERN_WARNING "wd.c: No wd80x3 card found (i/o = 0x%x).\n", io[this_dev]);
+-			if (found != 0) {	/* Got at least one. */
+-				return 0;
++		dev = alloc_ei_netdev();
++		if (!dev)
++			break;
++		dev->irq = irq[this_dev];
++		dev->base_addr = io[this_dev];
++		dev->mem_start = mem[this_dev];
++		dev->mem_end = mem_end[this_dev];
++		if (do_wd_probe(dev) == 0) {
++			if (register_netdev(dev) == 0) {
++				dev_wd[found++] = dev;
++				continue;
+ 			}
+-			return -ENXIO;
++			cleanup_card(dev);
+ 		}
+-		found++;
+-	}
+-	return 0;
++		free_netdev(dev);
++		printk(KERN_WARNING "wd.c: No wd80x3 card found (i/o = 0x%x).\n", io[this_dev]);
++		break;
++	}
++	if (found)
++		return 0;
++	return -ENXIO;
+ }
+ 
+ void
+@@ -499,14 +533,11 @@ cleanup_module(void)
+ 	int this_dev;
+ 
+ 	for (this_dev = 0; this_dev < MAX_WD_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_wd[this_dev];
+-		if (dev->priv != NULL) {
+-			void *priv = dev->priv;
+-			int ioaddr = dev->base_addr - WD_NIC_OFFSET;
+-			free_irq(dev->irq, dev);
+-			release_region(ioaddr, WD_IO_EXTENT);
++		struct net_device *dev = dev_wd[this_dev];
++		if (dev) {
+ 			unregister_netdev(dev);
+-			kfree(priv);
++			cleanup_card(dev);
++			free_netdev(dev);
+ 		}
+ 	}
+ }
+--- linux-2.6.0/drivers/net/wireless/airo.c	2003-12-17 21:20:02.000000000 -0800
++++ 25/drivers/net/wireless/airo.c	2003-12-28 23:21:01.000000000 -0800
+@@ -1027,7 +1027,6 @@ struct airo_info {
+ #define FLAG_802_11	7
+ #define FLAG_PENDING_XMIT 9
+ #define FLAG_PENDING_XMIT11 10
+-#define FLAG_PCI	11
+ #define JOB_MASK	0x1ff0000
+ #define JOB_DIE		16
+ #define JOB_XMIT	17
+@@ -4623,7 +4622,6 @@ static int __devinit airo_pci_probe(stru
+ 		return -ENODEV;
+ 
+ 	pci_set_drvdata(pdev, dev);
+-	set_bit (FLAG_PCI, &((struct airo_info *)dev->priv)->flags);
+ 	return 0;
+ }
+ 
+@@ -4653,7 +4651,7 @@ static int __init airo_init_module( void
+ 
+ #ifdef CONFIG_PCI
+ 	printk( KERN_INFO "airo:  Probing for PCI adapters\n" );
+-	pci_module_init(&airo_driver);
++	pci_register_driver(&airo_driver);
+ 	printk( KERN_INFO "airo:  Finished probing for PCI adapters\n" );
+ #endif
+ 
+@@ -4665,22 +4663,15 @@ static int __init airo_init_module( void
+ 
+ static void __exit airo_cleanup_module( void )
+ {
+-	int is_pci = 0;
+ 	while( airo_devices ) {
+ 		printk( KERN_INFO "airo: Unregistering %s\n", airo_devices->dev->name );
+-#ifdef CONFIG_PCI
+-		if (test_bit(FLAG_PCI, &((struct airo_info *)airo_devices->dev->priv)->flags))
+-			is_pci = 1;
+-#endif
+ 		stop_airo_card( airo_devices->dev, 1 );
+ 	}
+ 	remove_proc_entry("aironet", proc_root_driver);
+ 
+-	if (is_pci) {
+ #ifdef CONFIG_PCI
+-		pci_unregister_driver(&airo_driver);
++	pci_unregister_driver(&airo_driver);
+ #endif
+-	}
+ }
+ 
+ #ifdef WIRELESS_EXT
+--- linux-2.6.0/drivers/net/wireless/airo_cs.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/wireless/airo_cs.c	2003-12-28 23:22:53.000000000 -0800
+@@ -233,7 +233,7 @@ static dev_link_t *airo_attach(void)
+ 	client_reg.event_handler = &airo_event;
+ 	client_reg.Version = 0x0210;
+ 	client_reg.event_callback_args.client_data = link;
+-	ret = CardServices(RegisterClient, &link->handle, &client_reg);
++	ret = pcmcia_register_client(&link->handle, &client_reg);
+ 	if (ret != 0) {
+ 		cs_error(link->handle, RegisterClient, ret);
+ 		airo_detach(link);
+@@ -277,7 +277,7 @@ static void airo_detach(dev_link_t *link
+ 	
+ 	/* Break the link with Card Services */
+ 	if (link->handle)
+-		CardServices(DeregisterClient, link->handle);
++		pcmcia_deregister_client(link->handle);
+ 	
+ 	
+ 	
+@@ -298,11 +298,8 @@ static void airo_detach(dev_link_t *link
+   
+   ======================================================================*/
+ 
+-#define CS_CHECK(fn, args...) \
+-while ((last_ret=CardServices(last_fn=(fn),args))!=0) goto cs_failed
+-
+-#define CFG_CHECK(fn, args...) \
+-if (CardServices(fn, args) != 0) goto next_entry
++#define CS_CHECK(fn, ret) \
++do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+ 
+ static void airo_config(dev_link_t *link)
+ {
+@@ -329,9 +326,9 @@ static void airo_config(dev_link_t *link
+ 	tuple.TupleData = buf;
+ 	tuple.TupleDataMax = sizeof(buf);
+ 	tuple.TupleOffset = 0;
+-	CS_CHECK(GetFirstTuple, handle, &tuple);
+-	CS_CHECK(GetTupleData, handle, &tuple);
+-	CS_CHECK(ParseTuple, handle, &tuple, &parse);
++	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
++	CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
++	CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+ 	link->conf.ConfigBase = parse.config.base;
+ 	link->conf.Present = parse.config.rmask[0];
+ 	
+@@ -351,12 +348,13 @@ static void airo_config(dev_link_t *link
+ 	  will only use the CIS to fill in implementation-defined details.
+ 	*/
+ 	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+-	CS_CHECK(GetFirstTuple, handle, &tuple);
++	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+ 	while (1) {
+ 		cistpl_cftable_entry_t dflt = { 0 };
+ 		cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
+-		CFG_CHECK(GetTupleData, handle, &tuple);
+-		CFG_CHECK(ParseTuple, handle, &tuple, &parse);
++		if (pcmcia_get_tuple_data(handle, &tuple) != 0 ||
++				pcmcia_parse_tuple(handle, &tuple, &parse) != 0)
++			goto next_entry;
+ 		
+ 		if (cfg->flags & CISTPL_CFTABLE_DEFAULT) dflt = *cfg;
+ 		if (cfg->index == 0) goto next_entry;
+@@ -405,7 +403,8 @@ static void airo_config(dev_link_t *link
+ 		}
+ 		
+ 		/* This reserves IO space but doesn't actually enable it */
+-		CFG_CHECK(RequestIO, link->handle, &link->io); 
++		if (pcmcia_request_io(link->handle, &link->io) != 0)
++			goto next_entry;
+ 		
+ 		/*
+ 		  Now set up a common memory window, if needed.  There is room
+@@ -425,16 +424,17 @@ static void airo_config(dev_link_t *link
+ 			req.Base = mem->win[0].host_addr;
+ 			req.Size = mem->win[0].len;
+ 			req.AccessSpeed = 0;
+-			link->win = (window_handle_t)link->handle;
+-			CFG_CHECK(RequestWindow, &link->win, &req);
++			if (pcmcia_request_window(&link->handle, &req, &link->win) != 0)
++				goto next_entry;
+ 			map.Page = 0; map.CardOffset = mem->win[0].card_addr;
+-			CFG_CHECK(MapMemPage, link->win, &map);
++			if (pcmcia_map_mem_page(link->win, &map) != 0)
++				goto next_entry;
+ 		}
+ 		/* If we got this far, we're cool! */
+ 		break;
+ 		
+ 	next_entry:
+-		CS_CHECK(GetNextTuple, handle, &tuple);
++		CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(handle, &tuple));
+ 	}
+ 	
+     /*
+@@ -443,14 +443,14 @@ static void airo_config(dev_link_t *link
+       irq structure is initialized.
+     */
+ 	if (link->conf.Attributes & CONF_ENABLE_IRQ)
+-		CS_CHECK(RequestIRQ, link->handle, &link->irq);
++		CS_CHECK(RequestIRQ, pcmcia_request_irq(link->handle, &link->irq));
+ 	
+ 	/*
+ 	  This actually configures the PCMCIA socket -- setting up
+ 	  the I/O windows and the interrupt mapping, and putting the
+ 	  card and host interface into "Memory and IO" mode.
+ 	*/
+-	CS_CHECK(RequestConfiguration, link->handle, &link->conf);
++	CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link->handle, &link->conf));
+ 	((local_info_t*)link->priv)->eth_dev = 
+ 		init_airo_card( link->irq.AssignedIRQ,
+ 				link->io.BasePort1, 1 );
+@@ -526,12 +526,12 @@ static void airo_release(dev_link_t *lin
+ 	
+ 	/* Don't bother checking to see if these succeed or not */
+ 	if (link->win)
+-		CardServices(ReleaseWindow, link->win);
+-	CardServices(ReleaseConfiguration, link->handle);
++		pcmcia_release_window(link->win);
++	pcmcia_release_configuration(link->handle);
+ 	if (link->io.NumPorts1)
+-		CardServices(ReleaseIO, link->handle, &link->io);
++		pcmcia_release_io(link->handle, &link->io);
+ 	if (link->irq.AssignedIRQ)
+-		CardServices(ReleaseIRQ, link->handle, &link->irq);
++		pcmcia_release_irq(link->handle, &link->irq);
+ 	link->state &= ~DEV_CONFIG;
+ 
+ 	if (link->state & DEV_STALE_CONFIG)
+@@ -576,7 +576,7 @@ static int airo_event(event_t event, int
+ 	case CS_EVENT_RESET_PHYSICAL:
+ 		if (link->state & DEV_CONFIG) {
+ 			netif_device_detach(local->eth_dev);
+-			CardServices(ReleaseConfiguration, link->handle);
++			pcmcia_release_configuration(link->handle);
+ 		}
+ 		break;
+ 	case CS_EVENT_PM_RESUME:
+@@ -584,7 +584,7 @@ static int airo_event(event_t event, int
+ 		/* Fall through... */
+ 	case CS_EVENT_CARD_RESET:
+ 		if (link->state & DEV_CONFIG) {
+-			CardServices(RequestConfiguration, link->handle, &link->conf);
++			pcmcia_request_configuration(link->handle, &link->conf);
+ 			reset_airo_card(local->eth_dev);
+ 			netif_device_attach(local->eth_dev);
+ 		}
+--- linux-2.6.0/drivers/net/wireless/airport.c	2003-09-08 13:58:58.000000000 -0700
++++ 25/drivers/net/wireless/airport.c	2003-12-28 23:21:01.000000000 -0800
+@@ -216,7 +216,7 @@ airport_attach(struct macio_dev *mdev, c
+ 
+ 	if (! request_OF_resource(of_node, 0, " (airport)")) {
+ 		printk(KERN_ERR "airport: can't request IO resource !\n");
+-		kfree(dev);
++		free_netdev(dev);
+ 		return -ENODEV;
+ 	}
+ 
+--- linux-2.6.0/drivers/net/wireless/arlan.h	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/wireless/arlan.h	2003-12-28 23:21:01.000000000 -0800
+@@ -57,12 +57,8 @@ extern int     arlan_command(struct net_
+  
+ #define SIDUNKNOWN -1
+ #define radioNodeIdUNKNOWN -1
+-#define encryptionKeyUNKNOWN '\0';
+ #define irqUNKNOWN 0
+-#define memUNKNOWN 0
+ #define debugUNKNOWN 0
+-#define probeUNKNOWN 1
+-#define numDevicesUNKNOWN 1
+ #define testMemoryUNKNOWN 1
+ #define spreadingCodeUNKNOWN 0
+ #define channelNumberUNKNOWN 0
+@@ -82,6 +78,8 @@ extern int     arlan_command(struct net_
+ 	#define ARLAN_DEBUG(a,b) 
+ #endif
+ 
++#define ARLAN_SHMEM_SIZE	0x2000
++
+ struct arlan_shmem
+ {
+       /* Header Signature */ 
+--- linux-2.6.0/drivers/net/wireless/arlan-main.c	2003-10-08 15:07:09.000000000 -0700
++++ 25/drivers/net/wireless/arlan-main.c	2003-12-28 23:21:01.000000000 -0800
+@@ -19,9 +19,7 @@ struct net_device *arlan_device[MAX_ARLA
+ static int SID = SIDUNKNOWN;
+ static int radioNodeId = radioNodeIdUNKNOWN;
+ static char encryptionKey[12] = {'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'};
+-static int mem = memUNKNOWN;
+ int arlan_debug = debugUNKNOWN;
+-static int numDevices = numDevicesUNKNOWN;
+ static int spreadingCode = spreadingCodeUNKNOWN;
+ static int channelNumber = channelNumberUNKNOWN;
+ static int channelSet = channelSetUNKNOWN;
+@@ -45,9 +43,7 @@ static int mdebug;
+ 
+ MODULE_PARM(irq, "i");
+ MODULE_PARM(mem, "i");
+-MODULE_PARM(probe, "i");
+ MODULE_PARM(arlan_debug, "i");
+-MODULE_PARM(numDevices, "i");
+ MODULE_PARM(testMemory, "i");
+ MODULE_PARM(spreadingCode, "i");
+ MODULE_PARM(channelNumber, "i");
+@@ -69,9 +65,7 @@ MODULE_PARM(arlan_entry_and_exit_debug, 
+ MODULE_PARM(arlan_EEPROM_bad, "i");
+ MODULE_PARM_DESC(irq, "(unused)");
+ MODULE_PARM_DESC(mem, "Arlan memory address for single device probing");
+-MODULE_PARM_DESC(probe, "Arlan probe at initialization (0-1)");
+ MODULE_PARM_DESC(arlan_debug, "Arlan debug enable (0-1)");
+-MODULE_PARM_DESC(numDevices, "Number of Arlan devices; ignored if >1");
+ MODULE_PARM_DESC(testMemory, "(unused)");
+ MODULE_PARM_DESC(mdebug, "Arlan multicast debugging (0-1)");
+ MODULE_PARM_DESC(retries, "Arlan maximum packet retransmisions");
+@@ -88,7 +82,6 @@ MODULE_PARM_DESC(arlan_entry_and_exit_de
+ struct arlan_conf_stru arlan_conf[MAX_ARLANS];
+ static int arlans_found;
+ 
+-static  int 	arlan_probe_here(struct net_device *dev, int ioaddr);
+ static  int 	arlan_open(struct net_device *dev);
+ static  int 	arlan_tx(struct sk_buff *skb, struct net_device *dev);
+ static  irqreturn_t arlan_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+@@ -975,24 +968,27 @@ static int lastFoundAt = 0xbe000;
+  * probes on the ISA bus. A good device probes avoids doing writes, and
+  * verifies that the correct device exists and functions.
+  */
+-
+-static int __init arlan_check_fingerprint(int memaddr)
++#define ARLAN_SHMEM_SIZE	0x2000
++static int __init arlan_check_fingerprint(unsigned long memaddr)
+ {
+-	static char probeText[] = "TELESYSTEM SLW INC.    ARLAN \0";
+-	char tempBuf[49];
++	static const char probeText[] = "TELESYSTEM SLW INC.    ARLAN \0";
+ 	volatile struct arlan_shmem *arlan = (struct arlan_shmem *) memaddr;
++	unsigned long paddr = virt_to_phys((void *) memaddr);
++	char tempBuf[49];
+ 
+ 	ARLAN_DEBUG_ENTRY("arlan_check_fingerprint");
+-	if (check_mem_region(virt_to_phys((void *)memaddr),0x2000 )){
+-		// printk(KERN_WARNING "arlan: memory region %lx excluded from probing \n",virt_to_phys((void*)memaddr));
++
++	if (!request_mem_region(paddr, ARLAN_SHMEM_SIZE, "arlan")) {
++		// printk(KERN_WARNING "arlan: memory region %lx excluded from probing \n",paddr);
+ 		return -ENODEV;
+ 	}
++
+ 	memcpy_fromio(tempBuf, arlan->textRegion, 29);
+ 	tempBuf[30] = 0;
+ 
+ 	/* check for card at this address */
+ 	if (0 != strncmp(tempBuf, probeText, 29)){
+-// not 		release_mem_region(virt_to_phys((void*)memaddr),0x2000);
++ 		release_mem_region(paddr, ARLAN_SHMEM_SIZE);
+ 		return -ENODEV;
+ 	}
+ 
+@@ -1000,51 +996,8 @@ static int __init arlan_check_fingerprin
+ 	ARLAN_DEBUG_EXIT("arlan_check_fingerprint");
+ 
+ 	return 0;
+-
+-
+-}
+-
+-static int __init arlan_probe_everywhere(struct net_device *dev)
+-{
+-	int m;
+-	int probed = 0;
+-	int found = 0;
+-
+-	SET_MODULE_OWNER(dev);
+-
+-	ARLAN_DEBUG_ENTRY("arlan_probe_everywhere");
+-	if (mem != 0 && numDevices == 1)	/* Check a single specified location. */
+-	{
+-		if (arlan_probe_here(dev, (int) phys_to_virt(  mem) ) == 0)
+-			return 0;
+-		else
+-			return -ENODEV;
+-	}
+-	for (m = (int)phys_to_virt(lastFoundAt) + 0x2000; m <= (int)phys_to_virt(0xDE000); m += 0x2000)
+-	{
+-		if (arlan_probe_here(dev, m) == 0)
+-		{
+-			found++;
+-			lastFoundAt = (int)virt_to_phys((void*)m);
+-			break;
+-		}
+-		probed++;
+-	}
+-	if (found == 0 && probed != 0)
+-	{
+-		if (lastFoundAt == 0xbe000)
+-			printk(KERN_ERR "arlan: No Arlan devices found \n");
+-		return -ENODEV;
+-	}
+-	else
+-		return 0;
+-
+-	ARLAN_DEBUG_EXIT("arlan_probe_everywhere");
+-
+-	return -ENODEV;
+ }
+ 
+-
+ static int arlan_change_mtu(struct net_device *dev, int new_mtu)
+ {
+ 	struct arlan_private *priv = dev->priv;
+@@ -1085,47 +1038,15 @@ static int arlan_mac_addr(struct net_dev
+ 
+ 
+ 
+-
+-static int __init
+-	      arlan_allocate_device(int num, struct net_device *devs)
++static int __init arlan_setup_device(struct net_device *dev, int num)
+ {
++	struct arlan_private *ap = dev->priv;
++	int err;
+ 
+-	struct net_device *dev;
+-	struct arlan_private *ap;
++	ARLAN_DEBUG_ENTRY("arlan_setup_device");
+ 
+-	ARLAN_DEBUG_ENTRY("arlan_allocate_device");
++	ap->conf = (struct arlan_shmem *)(ap+1);
+ 
+-	if (!devs) {
+-		dev = init_etherdev(0, sizeof(struct arlan_private) + sizeof(struct arlan_shmem));
+-		if (!dev) {
+-			printk(KERN_ERR "ARLAN: init_etherdev failed\n");
+-			return 0;
+-		}
+-		ap = dev->priv;
+-		ap->conf = dev->priv + sizeof(struct arlan_private);
+-		ap->init_etherdev_alloc = 1;
+-	} else {
+-		dev = devs;
+-		dev->priv = kmalloc(sizeof(struct arlan_private) + sizeof(struct arlan_shmem), GFP_KERNEL);
+-		if (!dev->priv) {
+-			printk(KERN_ERR "ARLAN: kmalloc of dev->priv failed\n");
+-			return 0;
+-		}
+-		ap = dev->priv;
+-		ap->conf = dev->priv + sizeof(struct arlan_private);
+-		memset(ap, 0, sizeof(*ap));
+-	}
+-
+-	/* Fill in the 'dev' fields. */
+-	dev->base_addr = 0;
+-	dev->mem_start = 0;
+-	dev->mem_end = 0;
+-	dev->mtu = 1500;
+-	dev->flags = 0;		/* IFF_BROADCAST & IFF_MULTICAST & IFF_PROMISC; */
+-	dev->irq = 0;
+-	dev->dma = 0;
+-	dev->tx_queue_len = tx_queue_len;
+-	ether_setup(dev);
+ 	dev->tx_queue_len = tx_queue_len;
+ 	dev->open = arlan_open;
+ 	dev->stop = arlan_close;
+@@ -1138,41 +1059,45 @@ static int __init
+ 	dev->watchdog_timeo = 3*HZ;
+ 	
+ 	ap->irq_test_done = 0;
+-	arlan_device[num] = dev;
+ 	ap->Conf = &arlan_conf[num];
+ 
+ 	ap->Conf->pre_Command_Wait = 40;
+ 	ap->Conf->rx_tweak1 = 30;
+ 	ap->Conf->rx_tweak2 = 0;
+ 
+-	ARLAN_DEBUG_EXIT("arlan_allocate_device");
+-	return (int) dev;
+-}
+ 
++	err = register_netdev(dev);
++	if (err) {
++		release_mem_region(virt_to_phys((void *) dev->mem_start), 
++			   ARLAN_SHMEM_SIZE);
++		free_netdev(dev);
++		return err;
++	}
++	arlan_device[num] = dev;
++	ARLAN_DEBUG_EXIT("arlan_setup_device");
++	return 0;
++}
+ 
+-static int __init arlan_probe_here(struct net_device *dev, int memaddr)
++static int __init arlan_probe_here(struct net_device *dev, 
++				   unsigned long memaddr)
+ {
+-	volatile struct arlan_shmem *arlan;
++	struct arlan_private *ap = dev->priv;
+ 
+ 	ARLAN_DEBUG_ENTRY("arlan_probe_here");
+ 
+ 	if (arlan_check_fingerprint(memaddr))
+ 		return -ENODEV;
+ 
+-	printk(KERN_NOTICE "%s: Arlan found at %x, \n ", dev->name, (int) virt_to_phys((void*)memaddr));
+-
+-	if (!arlan_allocate_device(arlans_found, dev))
+-		return -1;
+-
+-	((struct arlan_private *) dev->priv)->card = (struct arlan_shmem *) memaddr;
+-	arlan = (void *) memaddr;
++	printk(KERN_NOTICE "%s: Arlan found at %x, \n ", dev->name, 
++	       (int) virt_to_phys((void*)memaddr));
+ 
++	ap->card = (void *) memaddr;
+ 	dev->mem_start = memaddr;
+-	dev->mem_end = memaddr + 0x1FFF;
++	dev->mem_end = memaddr + ARLAN_SHMEM_SIZE-1;
+ 
+ 	if (dev->irq < 2)
+ 	{
+-		READSHM(dev->irq, arlan->irqLevel, u_char);
++		READSHM(dev->irq, ap->card->irqLevel, u_char);
+ 	} else if (dev->irq == 2)
+ 		dev->irq = 9;
+ 
+@@ -1183,8 +1108,6 @@ static int __init arlan_probe_here(struc
+ }
+ 
+ 
+-
+-
+ static int arlan_open(struct net_device *dev)
+ {
+ 	struct arlan_private *priv = dev->priv;
+@@ -1193,12 +1116,6 @@ static int arlan_open(struct net_device 
+ 
+ 	ARLAN_DEBUG_ENTRY("arlan_open");
+ 
+-	if (dev->mem_start == 0)
+-		ret = arlan_probe_everywhere(dev);
+-	if (ret != 0)
+-		return ret;
+-
+-	arlan = priv->card;
+ 	ret = request_irq(dev->irq, &arlan_interrupt, 0, dev->name, dev);
+ 	if (ret)
+ 	{
+@@ -1768,14 +1685,9 @@ static int arlan_close(struct net_device
+ {
+ 	struct arlan_private *priv = dev->priv;
+ 
+-	if (!priv)
+-	{
+-		printk(KERN_CRIT "arlan: No Device priv \n");
+-		return 0;
+-	}
+ 	ARLAN_DEBUG_ENTRY("arlan_close");
+ 
+-	del_timer(&priv->timer);
++	del_timer_sync(&priv->timer);
+ 
+ 	arlan_command(dev, ARLAN_COMMAND_POWERDOWN);
+ 
+@@ -1867,39 +1779,70 @@ static void arlan_set_multicast(struct n
+ }
+ 
+ 
+-int __init arlan_probe(struct net_device *dev)
++struct net_device * __init arlan_probe(int unit)
+ {
+-	printk("Arlan driver %s\n", arlan_version);
++	struct net_device *dev;
++	int err;
++	int m;
+ 
+-	if (arlan_probe_everywhere(dev))
+-		return -ENODEV;
++	ARLAN_DEBUG_ENTRY("arlan_probe");
+ 
+-	arlans_found++;
+-	return 0;
+-}
++	if (arlans_found == MAX_ARLANS)
++		return ERR_PTR(-ENODEV);
+ 
+-#ifdef  MODULE
++	/* 
++	 * Reserve space for local data and a copy of the shared memory
++	 * that is used by the /proc interface.
++	 */
++	dev = alloc_etherdev(sizeof(struct arlan_private)
++			     + sizeof(struct arlan_shmem));
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
+ 
+-static int probe = probeUNKNOWN;
++	SET_MODULE_OWNER(dev);
+ 
+-static int __init arlan_find_devices(void)
+-{
+-	int m;
+-	int found = 0;
++	if (unit >= 0) {
++		sprintf(dev->name, "eth%d", unit);
++		netdev_boot_setup_check(dev);
++		
++		if (dev->mem_start) {
++			if (arlan_probe_here(dev, dev->mem_start) == 0)
++				goto found;
++			goto not_found;
++		}
++			
++	}
+ 
+-	ARLAN_DEBUG_ENTRY("arlan_find_devices");
+-	if (mem != 0 && numDevices == 1)	/* Check a single specified location. */
+-		return 1;
+-	for (m =(int) phys_to_virt(0xc0000); m <=(int) phys_to_virt(0xDE000); m += 0x2000)
++
++	for (m = (int)phys_to_virt(lastFoundAt) + ARLAN_SHMEM_SIZE; 
++	     m <= (int)phys_to_virt(0xDE000); 
++	     m += ARLAN_SHMEM_SIZE)
+ 	{
+-		if (arlan_check_fingerprint(m) == 0)
+-			found++;
++		if (arlan_probe_here(dev, m) == 0)
++		{
++			lastFoundAt = (int)virt_to_phys((void*)m);
++			goto found;
++		}
+ 	}
+-	ARLAN_DEBUG_EXIT("arlan_find_devices");
+ 
+-	return found;
++	if (lastFoundAt == 0xbe000)
++		printk(KERN_ERR "arlan: No Arlan devices found \n");
++
++ not_found:
++	free_netdev(dev);
++	return ERR_PTR(-ENODEV);
++
++ found:
++	err = arlan_setup_device(dev, arlans_found);
++	if (err)
++		dev = ERR_PTR(err);
++	else if (!arlans_found++)
++		printk(KERN_INFO "Arlan driver %s\n", arlan_version);
++
++	return dev;
+ }
+ 
++#ifdef  MODULE
+ int init_module(void)
+ {
+ 	int i = 0;
+@@ -1909,21 +1852,11 @@ int init_module(void)
+ 	if (channelSet != channelSetUNKNOWN || channelNumber != channelNumberUNKNOWN || systemId != systemIdUNKNOWN)
+ 		return -EINVAL;
+ 
+-	numDevices = arlan_find_devices();
+-	if (numDevices == 0)
+-		return -ENODEV;
+-
+-	for (i = 0; i < numDevices && i < MAX_ARLANS; i++)
+-	{
+-		if (!arlan_allocate_device(i, NULL))
+-			return -ENOMEM;
++	for (i = 0; i < MAX_ARLANS; i++) {
++		struct net_device *dev = arlan_probe(i);
+ 
+-		if (arlan_device[i] == NULL)
+-			return -ENOMEM;
+-
+-		if (probe)
+-			arlan_probe_everywhere(arlan_device[i]);
+-//		arlan_command(arlan_device[i], ARLAN_COMMAND_POWERDOWN );
++		if (IS_ERR(dev)) 
++			return PTR_ERR(dev);
+ 	}
+ 	init_arlan_proc();
+ 	printk(KERN_INFO "Arlan driver %s\n", arlan_version);
+@@ -1935,7 +1868,7 @@ int init_module(void)
+ void cleanup_module(void)
+ {
+ 	int i = 0;
+-	struct arlan_private *ap;
++	struct net_device *dev;
+ 
+ 	ARLAN_DEBUG_ENTRY("cleanup_module");
+ 
+@@ -1946,22 +1879,18 @@ void cleanup_module(void)
+ 
+ 	for (i = 0; i < MAX_ARLANS; i++)
+ 	{
+-		if (arlan_device[i])
+-		{
+-			arlan_command(arlan_device[i], ARLAN_COMMAND_POWERDOWN );
+-
+-//			release_mem_region(virt_to_phys(arlan_device[i]->mem_start), 0x2000 );
+-			unregister_netdev(arlan_device[i]);
+-			ap = arlan_device[i]->priv;
+-			if (ap->init_etherdev_alloc) {
+-				free_netdev(arlan_device[i]);
+-				arlan_device[i] = NULL;
+-			} else {
+-				kfree(ap);
+-				ap = NULL;
+-			}
++		dev = arlan_device[i];
++		if (dev) {
++			arlan_command(dev, ARLAN_COMMAND_POWERDOWN );
++
++			unregister_netdev(dev);
++			release_mem_region(virt_to_phys((void *) dev->mem_start), 
++					   ARLAN_SHMEM_SIZE);
++			free_netdev(dev);
++			arlan_device[i] = NULL;
+ 		}
+ 	}
++
+ 	ARLAN_DEBUG_EXIT("cleanup_module");
+ }
+ 
+--- linux-2.6.0/drivers/net/wireless/atmel.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/net/wireless/atmel.c	2003-12-28 23:21:01.000000000 -0800
+@@ -748,13 +748,13 @@ static int start_tx (struct sk_buff *skb
+ 	
+ 	if(priv->station_state != STATION_STATE_READY) {
+ 		priv->stats.tx_errors++;
+-		return 0;
++		goto done;
+ 	}
+ 	
+ 	if (priv->card && priv->present_callback && 
+ 	    !(*priv->present_callback)(priv->card)) {
+ 		priv->stats.tx_errors++;
+-		return 0;
++		goto done;
+ 	}
+ 	
+ 	/* first ensure the timer func cannot run */
+@@ -804,6 +804,8 @@ static int start_tx (struct sk_buff *skb
+ 	
+ 	spin_unlock_irqrestore(&priv->irqlock, flags);
+ 	spin_unlock_bh(&priv->timerlock);
++
++done:
+ 	dev_kfree_skb(skb);
+ 	
+ 	return 0;	
+@@ -1441,7 +1443,7 @@ struct net_device *init_atmel_card( unsi
+  err_out_irq:
+ 	free_irq(dev->irq, dev);
+  err_out_free:
+-	kfree(dev);
++	free_netdev(dev);
+ 	return NULL;
+ }
+ 
+--- linux-2.6.0/drivers/net/wireless/atmel_cs.c	2003-10-17 15:58:03.000000000 -0700
++++ 25/drivers/net/wireless/atmel_cs.c	2003-12-28 23:22:53.000000000 -0800
+@@ -246,7 +246,7 @@ static dev_link_t *atmel_attach(void)
+ 	client_reg.event_handler = &atmel_event;
+ 	client_reg.Version = 0x0210;
+ 	client_reg.event_callback_args.client_data = link;
+-	ret = CardServices(RegisterClient, &link->handle, &client_reg);
++	ret = pcmcia_register_client(&link->handle, &client_reg);
+ 	if (ret != 0) {
+ 		cs_error(link->handle, RegisterClient, ret);
+ 		atmel_detach(link);
+@@ -282,7 +282,7 @@ static void atmel_detach(dev_link_t *lin
+ 		
+ 	/* Break the link with Card Services */
+ 	if (link->handle)
+-		CardServices(DeregisterClient, link->handle);
++		pcmcia_deregister_client(link->handle);
+ 
+ 	/* Unlink device structure, free pieces */
+ 	*linkp = link->next;
+@@ -299,11 +299,8 @@ static void atmel_detach(dev_link_t *lin
+   
+   ======================================================================*/
+ 
+-#define CS_CHECK(fn, args...) \
+-while ((last_ret=CardServices(last_fn=(fn),args))!=0) goto cs_failed
+-
+-#define CFG_CHECK(fn, args...) \
+-if (CardServices(fn, args) != 0) goto next_entry
++#define CS_CHECK(fn, ret) \
++do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+ 
+ /* Call-back function to interrogate PCMCIA-specific information
+    about the current existance of the card */
+@@ -372,11 +369,11 @@ static void atmel_config(dev_link_t *lin
+ 	tuple.TupleOffset = 0;
+ 	
+ 	tuple.DesiredTuple = CISTPL_MANFID;
+-	if (CardServices(GetFirstTuple, handle, &tuple) == 0) {
++	if (pcmcia_get_first_tuple(handle, &tuple) == 0) {
+ 		int i;
+ 		cistpl_manfid_t *manfid;
+-		CS_CHECK(GetTupleData, handle, &tuple);
+-		CS_CHECK(ParseTuple, handle, &tuple, &parse);
++		CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
++		CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+ 		manfid = &(parse.manfid);
+ 		for (i = 0; i < sizeof(card_table)/sizeof(card_table[0]); i++) {
+ 			if (!card_table[i].ver1 &&
+@@ -389,11 +386,11 @@ static void atmel_config(dev_link_t *lin
+ 	}
+ 
+ 	tuple.DesiredTuple = CISTPL_VERS_1;
+-	if (!done && (CardServices(GetFirstTuple, handle, &tuple) == 0)) {
++	if (!done && (pcmcia_get_first_tuple(handle, &tuple) == 0)) {
+ 		int i, j, k;
+ 		cistpl_vers_1_t *ver1;
+-		CS_CHECK(GetTupleData, handle, &tuple);
+-		CS_CHECK(ParseTuple, handle, &tuple, &parse);
++		CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
++		CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+ 		ver1 = &(parse.version_1);
+ 		
+ 		for (i = 0; i < sizeof(card_table)/sizeof(card_table[0]); i++) {
+@@ -429,9 +426,9 @@ static void atmel_config(dev_link_t *lin
+ 	  registers.
+ 	*/
+ 	tuple.DesiredTuple = CISTPL_CONFIG;
+-	CS_CHECK(GetFirstTuple, handle, &tuple);
+-	CS_CHECK(GetTupleData, handle, &tuple);
+-	CS_CHECK(ParseTuple, handle, &tuple, &parse);
++	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
++	CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
++	CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+ 	link->conf.ConfigBase = parse.config.base;
+ 	link->conf.Present = parse.config.rmask[0];
+ 	
+@@ -451,12 +448,13 @@ static void atmel_config(dev_link_t *lin
+ 	  will only use the CIS to fill in implementation-defined details.
+ 	*/
+ 	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+-	CS_CHECK(GetFirstTuple, handle, &tuple);
++	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+ 	while (1) {
+ 		cistpl_cftable_entry_t dflt = { 0 };
+ 		cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
+-		CFG_CHECK(GetTupleData, handle, &tuple);
+-		CFG_CHECK(ParseTuple, handle, &tuple, &parse);
++		if (pcmcia_get_tuple_data(handle, &tuple) != 0 ||
++				pcmcia_parse_tuple(handle, &tuple, &parse) != 0)
++			goto next_entry;
+ 		
+ 		if (cfg->flags & CISTPL_CFTABLE_DEFAULT) dflt = *cfg;
+ 		if (cfg->index == 0) goto next_entry;
+@@ -505,12 +503,14 @@ static void atmel_config(dev_link_t *lin
+ 		}
+ 		
+ 		/* This reserves IO space but doesn't actually enable it */
+-		CFG_CHECK(RequestIO, link->handle, &link->io); 
++		if (pcmcia_request_io(link->handle, &link->io) != 0)
++			goto next_entry;
++
+ 		/* If we got this far, we're cool! */
+ 		break;
+ 		
+ 	next_entry:
+-		CS_CHECK(GetNextTuple, handle, &tuple);
++		CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(handle, &tuple));
+ 	}
+ 	
+ 	/*
+@@ -519,14 +519,14 @@ static void atmel_config(dev_link_t *lin
+ 	  irq structure is initialized.
+ 	*/
+ 	if (link->conf.Attributes & CONF_ENABLE_IRQ)
+-		CS_CHECK(RequestIRQ, link->handle, &link->irq);
++		CS_CHECK(RequestIRQ, pcmcia_request_irq(link->handle, &link->irq));
+ 	
+ 	/*
+ 	  This actually configures the PCMCIA socket -- setting up
+ 	  the I/O windows and the interrupt mapping, and putting the
+ 	  card and host interface into "Memory and IO" mode.
+ 	*/
+-	CS_CHECK(RequestConfiguration, link->handle, &link->conf);
++	CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link->handle, &link->conf));
+ 	
+ 	if (link->irq.AssignedIRQ == 0) {
+ 		printk(KERN_ALERT 
+@@ -602,11 +602,11 @@ static void atmel_release(dev_link_t *li
+ 	((local_info_t*)link->priv)->eth_dev = 0; 
+ 	
+ 	/* Don't bother checking to see if these succeed or not */
+-	CardServices(ReleaseConfiguration, link->handle);
++	pcmcia_release_configuration(link->handle);
+ 	if (link->io.NumPorts1)
+-		CardServices(ReleaseIO, link->handle, &link->io);
++		pcmcia_release_io(link->handle, &link->io);
+ 	if (link->irq.AssignedIRQ)
+-		CardServices(ReleaseIRQ, link->handle, &link->irq);
++		pcmcia_release_irq(link->handle, &link->irq);
+ 	link->state &= ~DEV_CONFIG;
+ }
+ 
+@@ -648,7 +648,7 @@ static int atmel_event(event_t event, in
+ 	case CS_EVENT_RESET_PHYSICAL:
+ 		if (link->state & DEV_CONFIG) {
+ 			netif_device_detach(local->eth_dev);
+-			CardServices(ReleaseConfiguration, link->handle);
++			pcmcia_release_configuration(link->handle);
+ 		}
+ 		break;
+ 	case CS_EVENT_PM_RESUME:
+@@ -656,7 +656,7 @@ static int atmel_event(event_t event, in
+ 		/* Fall through... */
+ 	case CS_EVENT_CARD_RESET:
+ 		if (link->state & DEV_CONFIG) {
+-			CardServices(RequestConfiguration, link->handle, &link->conf);
++			pcmcia_request_configuration(link->handle, &link->conf);
+ 			reset_atmel_card(local->eth_dev);
+ 			netif_device_attach(local->eth_dev);
+ 		}
+--- linux-2.6.0/drivers/net/wireless/netwave_cs.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/wireless/netwave_cs.c	2003-12-28 23:22:53.000000000 -0800
+@@ -513,7 +513,7 @@ static dev_link_t *netwave_attach(void)
+     client_reg.event_handler = &netwave_event;
+     client_reg.Version = 0x0210;
+     client_reg.event_callback_args.client_data = link;
+-    ret = CardServices(RegisterClient, &link->handle, &client_reg);
++    ret = pcmcia_register_client(&link->handle, &client_reg);
+     if (ret != 0) {
+ 	cs_error(link->handle, RegisterClient, ret);
+ 	netwave_detach(link);
+@@ -555,7 +555,7 @@ static void netwave_detach(dev_link_t *l
+ 	
+     /* Break the link with Card Services */
+     if (link->handle)
+-	CardServices(DeregisterClient, link->handle);
++	pcmcia_deregister_client(link->handle);
+     
+     /* Locate device structure */
+     for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next)
+@@ -998,8 +998,8 @@ static int netwave_ioctl(struct net_devi
+  *
+  */
+ 
+-#define CS_CHECK(fn, args...) \
+-while ((last_ret=CardServices(last_fn=(fn), args))!=0) goto cs_failed
++#define CS_CHECK(fn, ret) \
++do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+ 
+ static void netwave_pcmcia_config(dev_link_t *link) {
+     client_handle_t handle = link->handle;
+@@ -1024,9 +1024,9 @@ static void netwave_pcmcia_config(dev_li
+     tuple.TupleDataMax = 64;
+     tuple.TupleOffset = 0;
+     tuple.DesiredTuple = CISTPL_CONFIG;
+-    CS_CHECK(GetFirstTuple, handle, &tuple);
+-    CS_CHECK(GetTupleData, handle, &tuple);
+-    CS_CHECK(ParseTuple, handle, &tuple, &parse);
++    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
++    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
++    CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+     link->conf.ConfigBase = parse.config.base;
+     link->conf.Present = parse.config.rmask[0];
+ 
+@@ -1040,7 +1040,7 @@ static void netwave_pcmcia_config(dev_li
+      */
+     for (i = j = 0x0; j < 0x400; j += 0x20) {
+ 	link->io.BasePort1 = j ^ 0x300;
+-	i = CardServices(RequestIO, link->handle, &link->io);
++	i = pcmcia_request_io(link->handle, &link->io);
+ 	if (i == CS_SUCCESS) break;
+     }
+     if (i != CS_SUCCESS) {
+@@ -1052,13 +1052,13 @@ static void netwave_pcmcia_config(dev_li
+      *  Now allocate an interrupt line.  Note that this does not
+      *  actually assign a handler to the interrupt.
+      */
+-    CS_CHECK(RequestIRQ, handle, &link->irq);
++    CS_CHECK(RequestIRQ, pcmcia_request_irq(handle, &link->irq));
+ 
+     /*
+      *  This actually configures the PCMCIA socket -- setting up
+      *  the I/O windows and the interrupt mapping.
+      */
+-    CS_CHECK(RequestConfiguration, handle, &link->conf);
++    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(handle, &link->conf));
+ 
+     /*
+      *  Allocate a 32K memory window.  Note that the dev_link_t
+@@ -1071,10 +1071,9 @@ static void netwave_pcmcia_config(dev_li
+     req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_CM|WIN_ENABLE;
+     req.Base = 0; req.Size = 0x8000;
+     req.AccessSpeed = mem_speed;
+-    link->win = (window_handle_t)link->handle;
+-    CS_CHECK(RequestWindow, &link->win, &req);
++    CS_CHECK(RequestWindow, pcmcia_request_window(&link->handle, &req, &link->win));
+     mem.CardOffset = 0x20000; mem.Page = 0; 
+-    CS_CHECK(MapMemPage, link->win, &mem);
++    CS_CHECK(MapMemPage, pcmcia_map_mem_page(link->win, &mem));
+ 
+     /* Store base address of the common window frame */
+     ramBase = ioremap(req.Base, 0x8000);
+@@ -1145,11 +1144,11 @@ static void netwave_release(dev_link_t *
+     /* Don't bother checking to see if these succeed or not */
+     if (link->win) {
+ 	iounmap(priv->ramBase);
+-	CardServices(ReleaseWindow, link->win);
++	pcmcia_release_window(link->win);
+     }
+-    CardServices(ReleaseConfiguration, link->handle);
+-    CardServices(ReleaseIO, link->handle, &link->io);
+-    CardServices(ReleaseIRQ, link->handle, &link->irq);
++    pcmcia_release_configuration(link->handle);
++    pcmcia_release_io(link->handle, &link->io);
++    pcmcia_release_irq(link->handle, &link->irq);
+ 
+     link->state &= ~DEV_CONFIG;
+ 
+@@ -1201,7 +1200,7 @@ static int netwave_event(event_t event, 
+ 	if (link->state & DEV_CONFIG) {
+ 	    if (link->open)
+ 		netif_device_detach(dev);
+-	    CardServices(ReleaseConfiguration, link->handle);
++	    pcmcia_release_configuration(link->handle);
+ 	}
+ 	break;
+     case CS_EVENT_PM_RESUME:
+@@ -1209,7 +1208,7 @@ static int netwave_event(event_t event, 
+ 	/* Fall through... */
+     case CS_EVENT_CARD_RESET:
+ 	if (link->state & DEV_CONFIG) {
+-	    CardServices(RequestConfiguration, link->handle, &link->conf);
++	    pcmcia_request_configuration(link->handle, &link->conf);
+ 	    if (link->open) {
+ 		netwave_reset(dev);
+ 		netif_device_attach(dev);
+--- linux-2.6.0/drivers/net/wireless/orinoco_cs.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/wireless/orinoco_cs.c	2003-12-28 23:22:53.000000000 -0800
+@@ -131,7 +131,7 @@ orinoco_cs_hard_reset(struct orinoco_pri
+ 	/* We need atomic ops here, because we're not holding the lock */
+ 	set_bit(0, &card->hard_reset_in_progress);
+ 
+-	err = CardServices(ResetCard, link->handle, NULL);
++	err = pcmcia_reset_card(link->handle, NULL);
+ 	if (err)
+ 		return err;
+ 
+@@ -150,7 +150,7 @@ static void
+ orinoco_cs_error(client_handle_t handle, int func, int ret)
+ {
+ 	error_info_t err = { func, ret };
+-	CardServices(ReportError, handle, &err);
++	pcmcia_report_error(handle, &err);
+ }
+ 
+ /*
+@@ -214,7 +214,7 @@ orinoco_cs_attach(void)
+ 	client_reg.Version = 0x0210; /* FIXME: what does this mean? */
+ 	client_reg.event_callback_args.client_data = link;
+ 
+-	ret = CardServices(RegisterClient, &link->handle, &client_reg);
++	ret = pcmcia_register_client(&link->handle, &client_reg);
+ 	if (ret != CS_SUCCESS) {
+ 		orinoco_cs_error(link->handle, RegisterClient, ret);
+ 		orinoco_cs_detach(link);
+@@ -250,7 +250,7 @@ orinoco_cs_detach(dev_link_t * link)
+ 
+ 	/* Break the link with Card Services */
+ 	if (link->handle)
+-		CardServices(DeregisterClient, link->handle);
++		pcmcia_deregister_client(link->handle);
+ 
+ 	/* Unlink device structure, and free it */
+ 	*linkp = link->next;
+@@ -269,11 +269,8 @@ orinoco_cs_detach(dev_link_t * link)
+  * device available to the system.
+  */
+ 
+-#define CS_CHECK(fn, args...) \
+-	while ((last_ret=CardServices(last_fn=(fn),args))!=0) goto cs_failed
+-
+-#define CFG_CHECK(fn, args...) \
+-	if (CardServices(fn, args) != 0) goto next_entry
++#define CS_CHECK(fn, ret) \
++do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+ 
+ static void
+ orinoco_cs_config(dev_link_t *link)
+@@ -290,7 +287,7 @@ orinoco_cs_config(dev_link_t *link)
+ 	tuple_t tuple;
+ 	cisparse_t parse;
+ 
+-	CS_CHECK(ValidateCIS, handle, &info);
++	CS_CHECK(ValidateCIS, pcmcia_validate_cis(handle, &info));
+ 
+ 	/*
+ 	 * This reads the card's CONFIG tuple to find its
+@@ -301,9 +298,9 @@ orinoco_cs_config(dev_link_t *link)
+ 	tuple.TupleData = buf;
+ 	tuple.TupleDataMax = sizeof(buf);
+ 	tuple.TupleOffset = 0;
+-	CS_CHECK(GetFirstTuple, handle, &tuple);
+-	CS_CHECK(GetTupleData, handle, &tuple);
+-	CS_CHECK(ParseTuple, handle, &tuple, &parse);
++	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
++	CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
++	CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+ 	link->conf.ConfigBase = parse.config.base;
+ 	link->conf.Present = parse.config.rmask[0];
+ 
+@@ -311,7 +308,7 @@ orinoco_cs_config(dev_link_t *link)
+ 	link->state |= DEV_CONFIG;
+ 
+ 	/* Look up the current Vcc */
+-	CS_CHECK(GetConfigurationInfo, handle, &conf);
++	CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(handle, &conf));
+ 	link->conf.Vcc = conf.Vcc;
+ 
+ 	/*
+@@ -329,13 +326,14 @@ orinoco_cs_config(dev_link_t *link)
+ 	 * implementation-defined details.
+ 	 */
+ 	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+-	CS_CHECK(GetFirstTuple, handle, &tuple);
++	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+ 	while (1) {
+ 		cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
+ 		cistpl_cftable_entry_t dflt = { .index = 0 };
+ 
+-		CFG_CHECK(GetTupleData, handle, &tuple);
+-		CFG_CHECK(ParseTuple, handle, &tuple, &parse);
++		if (pcmcia_get_tuple_data(handle, &tuple) != 0 ||
++				pcmcia_parse_tuple(handle, &tuple, &parse) != 0)
++			goto next_entry;
+ 
+ 		if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
+ 			dflt = *cfg;
+@@ -400,7 +398,8 @@ orinoco_cs_config(dev_link_t *link)
+ 			}
+ 
+ 			/* This reserves IO space but doesn't actually enable it */
+-			CFG_CHECK(RequestIO, link->handle, &link->io);
++			if (pcmcia_request_io(link->handle, &link->io) != 0)
++				goto next_entry;
+ 		}
+ 
+ 
+@@ -410,8 +409,8 @@ orinoco_cs_config(dev_link_t *link)
+ 		
+ 	next_entry:
+ 		if (link->io.NumPorts1)
+-			CardServices(ReleaseIO, link->handle, &link->io);
+-		last_ret = CardServices(GetNextTuple, handle, &tuple);
++			pcmcia_release_io(link->handle, &link->io);
++		last_ret = pcmcia_get_next_tuple(handle, &tuple);
+ 		if (last_ret  == CS_NO_MORE_ITEMS) {
+ 			printk(KERN_ERR "GetNextTuple().  No matching CIS configuration, "
+ 			       "maybe you need the ignore_cis_vcc=1 parameter.\n");
+@@ -438,7 +437,7 @@ orinoco_cs_config(dev_link_t *link)
+   		link->irq.Handler = orinoco_interrupt; 
+   		link->irq.Instance = dev; 
+ 		
+-		CS_CHECK(RequestIRQ, link->handle, &link->irq);
++		CS_CHECK(RequestIRQ, pcmcia_request_irq(link->handle, &link->irq));
+ 	}
+ 
+ 	/* We initialize the hermes structure before completing PCMCIA
+@@ -452,7 +451,7 @@ orinoco_cs_config(dev_link_t *link)
+ 	 * the I/O windows and the interrupt mapping, and putting the
+ 	 * card and host interface into "Memory and IO" mode.
+ 	 */
+-	CS_CHECK(RequestConfiguration, link->handle, &link->conf);
++	CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link->handle, &link->conf));
+ 
+ 	/* Ok, we have the configuration, prepare to register the netdev */
+ 	dev->base_addr = link->io.BasePort1;
+@@ -521,11 +520,11 @@ orinoco_cs_release(dev_link_t *link)
+ 	spin_unlock_irqrestore(&priv->lock, flags);
+ 
+ 	/* Don't bother checking to see if these succeed or not */
+-	CardServices(ReleaseConfiguration, link->handle);
++	pcmcia_release_configuration(link->handle);
+ 	if (link->io.NumPorts1)
+-		CardServices(ReleaseIO, link->handle, &link->io);
++		pcmcia_release_io(link->handle, &link->io);
+ 	if (link->irq.AssignedIRQ)
+-		CardServices(ReleaseIRQ, link->handle, &link->irq);
++		pcmcia_release_irq(link->handle, &link->irq);
+ 	link->state &= ~DEV_CONFIG;
+ }				/* orinoco_cs_release */
+ 
+@@ -587,7 +586,7 @@ orinoco_cs_event(event_t event, int prio
+ 				spin_unlock_irqrestore(&priv->lock, flags);
+ 			}
+ 
+-			CardServices(ReleaseConfiguration, link->handle);
++			pcmcia_release_configuration(link->handle);
+ 		}
+ 		break;
+ 
+@@ -598,8 +597,7 @@ orinoco_cs_event(event_t event, int prio
+ 		if (link->state & DEV_CONFIG) {
+ 			/* FIXME: should we double check that this is
+ 			 * the same card as we had before */
+-			CardServices(RequestConfiguration, link->handle,
+-				     &link->conf);
++			pcmcia_request_configuration(link->handle, &link->conf);
+ 
+ 			if (! test_bit(0, &card->hard_reset_in_progress)) {
+ 				err = orinoco_reinit_firmware(dev);
+--- linux-2.6.0/drivers/net/wireless/orinoco_pci.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/wireless/orinoco_pci.c	2003-12-28 23:21:01.000000000 -0800
+@@ -261,7 +261,7 @@ static int orinoco_pci_init_one(struct p
+ 		if (dev->irq)
+ 			free_irq(dev->irq, dev);
+ 
+-		kfree(dev);
++		free_netdev(dev);
+ 	}
+ 
+ 	if (pci_ioaddr)
+@@ -360,6 +360,7 @@ static int orinoco_pci_resume(struct pci
+ }
+ 
+ static struct pci_device_id orinoco_pci_pci_id_table[] = {
++	{0x1260, 0x3872, PCI_ANY_ID, PCI_ANY_ID,},
+ 	{0x1260, 0x3873, PCI_ANY_ID, PCI_ANY_ID,},
+ 	{0,},
+ };
+--- linux-2.6.0/drivers/net/wireless/orinoco_plx.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/wireless/orinoco_plx.c	2003-12-28 23:21:01.000000000 -0800
+@@ -263,7 +263,7 @@ static int orinoco_plx_init_one(struct p
+ 		if (dev->irq)
+ 			free_irq(dev->irq, dev);
+ 		
+-		kfree(dev);
++		free_netdev(dev);
+ 	}
+ 
+ 	if (pccard_ioaddr)
+--- linux-2.6.0/drivers/net/wireless/orinoco_tmd.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/wireless/orinoco_tmd.c	2003-12-28 23:21:01.000000000 -0800
+@@ -157,7 +157,7 @@ static int orinoco_tmd_init_one(struct p
+ 		if (dev->irq)
+ 			free_irq(dev->irq, dev);
+ 		
+-		kfree(dev);
++		free_netdev(dev);
+ 	}
+ 
+ 	if (pccard_ioaddr)
+--- linux-2.6.0/drivers/net/wireless/ray_cs.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/wireless/ray_cs.c	2003-12-28 23:22:53.000000000 -0800
+@@ -344,19 +344,14 @@ static dev_link_t *ray_attach(void)
+ 	    return NULL;
+ 
+     /* Allocate space for private device-specific data */
+-    dev = kmalloc(sizeof(struct net_device), GFP_KERNEL);
++    dev = alloc_etherdev(sizeof(ray_dev_t));
+ 
+     if (!dev)
+ 	    goto fail_alloc_dev;
+ 
+-    local = kmalloc(sizeof(ray_dev_t), GFP_KERNEL);
+-
+-    if (!local)
+-	    goto fail_alloc_local;
++    local = dev->priv;
+ 
+     memset(link, 0, sizeof(struct dev_link_t));
+-    memset(dev, 0, sizeof(struct net_device));
+-    memset(local, 0, sizeof(ray_dev_t));
+ 
+     /* The io structure describes IO port mapping. None used here */
+     link->io.NumPorts1 = 0;
+@@ -379,7 +374,6 @@ static dev_link_t *ray_attach(void)
+     link->priv = dev;
+     link->irq.Instance = dev;
+     
+-    dev->priv = local;
+     local->finder = link;
+     local->card_status = CARD_INSERTED;
+     local->authentication_state = UNAUTHENTICATED;
+@@ -401,7 +395,6 @@ static dev_link_t *ray_attach(void)
+ 
+     DEBUG(2,"ray_cs ray_attach calling ether_setup.)\n");
+     SET_MODULE_OWNER(dev);
+-    ether_setup(dev);
+     dev->init = &ray_dev_init;
+     dev->open = &ray_open;
+     dev->stop = &ray_dev_close;
+@@ -420,7 +413,7 @@ static dev_link_t *ray_attach(void)
+     client_reg.Version = 0x0210;
+     client_reg.event_callback_args.client_data = link;
+ 
+-    DEBUG(2,"ray_cs ray_attach calling CardServices(RegisterClient...)\n");
++    DEBUG(2,"ray_cs ray_attach calling pcmcia_register_client(...)\n");
+ 
+     init_timer(&local->timer);
+ 
+@@ -434,8 +427,6 @@ static dev_link_t *ray_attach(void)
+     DEBUG(2,"ray_cs ray_attach ending\n");
+     return link;
+ 
+-fail_alloc_local:
+-    kfree(dev);
+ fail_alloc_dev:
+     kfree(link);
+     return NULL;
+@@ -478,9 +469,7 @@ static void ray_detach(dev_link_t *link)
+     if (link->priv) {
+         struct net_device *dev = link->priv;
+ 	if (link->dev) unregister_netdev(dev);
+-        if (dev->priv)
+-            kfree(dev->priv);
+-        kfree(link->priv);
++        free_netdev(dev);
+     }
+     kfree(link);
+     DEBUG(2,"ray_cs ray_detach ending\n");
+@@ -490,8 +479,8 @@ static void ray_detach(dev_link_t *link)
+     is received, to configure the PCMCIA socket, and to make the
+     ethernet device available to the system.
+ =============================================================================*/
+-#define CS_CHECK(fn, args...) \
+-while ((last_ret=fn(args))!=0) goto cs_failed
++#define CS_CHECK(fn, ret) \
++do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+ #define MAX_TUPLE_SIZE 128
+ static void ray_config(dev_link_t *link)
+ {
+@@ -510,23 +499,23 @@ static void ray_config(dev_link_t *link)
+ 
+     /* This reads the card's CONFIG tuple to find its configuration regs */
+     tuple.DesiredTuple = CISTPL_CONFIG;
+-    CS_CHECK(pcmcia_get_first_tuple, handle, &tuple);
++    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+     tuple.TupleData = buf;
+     tuple.TupleDataMax = MAX_TUPLE_SIZE;
+     tuple.TupleOffset = 0;
+-    CS_CHECK(pcmcia_get_tuple_data, handle, &tuple);
+-    CS_CHECK(pcmcia_parse_tuple, handle, &tuple, &parse);
++    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
++    CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+     link->conf.ConfigBase = parse.config.base;
+     link->conf.Present = parse.config.rmask[0];
+ 
+     /* Determine card type and firmware version */
+     buf[0] = buf[MAX_TUPLE_SIZE - 1] = 0;
+     tuple.DesiredTuple = CISTPL_VERS_1;
+-    CS_CHECK(pcmcia_get_first_tuple, handle, &tuple);
++    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+     tuple.TupleData = buf;
+     tuple.TupleDataMax = MAX_TUPLE_SIZE;
+     tuple.TupleOffset = 2;
+-    CS_CHECK(pcmcia_get_tuple_data, handle, &tuple);
++    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
+ 
+     for (i=0; i<tuple.TupleDataLen - 4; i++) 
+         if (buf[i] == 0) buf[i] = ' ';
+@@ -538,22 +527,22 @@ static void ray_config(dev_link_t *link)
+     /* Now allocate an interrupt line.  Note that this does not
+        actually assign a handler to the interrupt.
+     */
+-    CS_CHECK(pcmcia_request_irq, link->handle, &link->irq);
++    CS_CHECK(RequestIRQ, pcmcia_request_irq(link->handle, &link->irq));
+     dev->irq = link->irq.AssignedIRQ;
+     
+     /* This actually configures the PCMCIA socket -- setting up
+        the I/O windows and the interrupt mapping.
+     */
+-    CS_CHECK(pcmcia_request_configuration, link->handle, &link->conf);
++    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link->handle, &link->conf));
+ 
+ /*** Set up 32k window for shared memory (transmit and control) ************/
+     req.Attributes = WIN_DATA_WIDTH_8 | WIN_MEMORY_TYPE_CM | WIN_ENABLE | WIN_USE_WAIT;
+     req.Base = 0;
+     req.Size = 0x8000;
+     req.AccessSpeed = ray_mem_speed;
+-    CS_CHECK(pcmcia_request_window, &link->handle, &req, &link->win);
++    CS_CHECK(RequestWindow, pcmcia_request_window(&link->handle, &req, &link->win));
+     mem.CardOffset = 0x0000; mem.Page = 0;
+-    CS_CHECK(pcmcia_map_mem_page, link->win, &mem);
++    CS_CHECK(MapMemPage, pcmcia_map_mem_page(link->win, &mem));
+     local->sram = (UCHAR *)(ioremap(req.Base,req.Size));
+ 
+ /*** Set up 16k window for shared memory (receive buffer) ***************/
+@@ -561,9 +550,9 @@ static void ray_config(dev_link_t *link)
+     req.Base = 0;
+     req.Size = 0x4000;
+     req.AccessSpeed = ray_mem_speed;
+-    CS_CHECK(pcmcia_request_window, &link->handle, &req, &local->rmem_handle);
++    CS_CHECK(RequestWindow, pcmcia_request_window(&link->handle, &req, &local->rmem_handle));
+     mem.CardOffset = 0x8000; mem.Page = 0;
+-    CS_CHECK(pcmcia_map_mem_page, local->rmem_handle, &mem);
++    CS_CHECK(MapMemPage, pcmcia_map_mem_page(local->rmem_handle, &mem));
+     local->rmem = (UCHAR *)(ioremap(req.Base,req.Size));
+ 
+ /*** Set up window for attribute memory ***********************************/
+@@ -571,9 +560,9 @@ static void ray_config(dev_link_t *link)
+     req.Base = 0;
+     req.Size = 0x1000;
+     req.AccessSpeed = ray_mem_speed;
+-    CS_CHECK(pcmcia_request_window, &link->handle, &req, &local->amem_handle);
++    CS_CHECK(RequestWindow, pcmcia_request_window(&link->handle, &req, &local->amem_handle));
+     mem.CardOffset = 0x0000; mem.Page = 0;
+-    CS_CHECK(pcmcia_map_mem_page, local->amem_handle, &mem);
++    CS_CHECK(MapMemPage, pcmcia_map_mem_page(local->amem_handle, &mem));
+     local->amem = (UCHAR *)(ioremap(req.Base,req.Size));
+ 
+     DEBUG(3,"ray_config sram=%p\n",local->sram);
+--- linux-2.6.0/drivers/net/wireless/strip.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/wireless/strip.c	2003-12-28 23:21:01.000000000 -0800
+@@ -2564,7 +2564,7 @@ static void strip_free(struct strip *str
+ 
+ 	strip_info->magic = 0;
+ 
+-	kfree(strip_info->dev);
++	free_netdev(strip_info->dev);
+ }
+ 
+ 
+--- linux-2.6.0/drivers/net/wireless/wavelan.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/wireless/wavelan.c	2003-12-28 23:21:01.000000000 -0800
+@@ -153,7 +153,7 @@ static inline void wv_16_on(unsigned lon
+  * Disable interrupts on the WaveLAN hardware.
+  * (called by wv_82586_stop())
+  */
+-static inline void wv_ints_off(device * dev)
++static inline void wv_ints_off(struct net_device * dev)
+ {
+ 	net_local *lp = (net_local *) dev->priv;
+ 	unsigned long ioaddr = dev->base_addr;
+@@ -167,7 +167,7 @@ static inline void wv_ints_off(device * 
+  * Enable interrupts on the WaveLAN hardware.
+  * (called by wv_hw_reset())
+  */
+-static inline void wv_ints_on(device * dev)
++static inline void wv_ints_on(struct net_device * dev)
+ {
+ 	net_local *lp = (net_local *) dev->priv;
+ 	unsigned long ioaddr = dev->base_addr;
+@@ -268,7 +268,7 @@ static inline u16 psa_crc(u8 * psa,	/* T
+ /*
+  * update the checksum field in the Wavelan's PSA
+  */
+-static void update_psa_checksum(device * dev, unsigned long ioaddr, u16 hacr)
++static void update_psa_checksum(struct net_device * dev, unsigned long ioaddr, u16 hacr)
+ {
+ #ifdef SET_PSA_CRC
+ 	psa_t psa;
+@@ -547,7 +547,7 @@ static inline void obram_write(unsigned 
+ /*
+  * Acknowledge the reading of the status issued by the i82586.
+  */
+-static void wv_ack(device * dev)
++static void wv_ack(struct net_device * dev)
+ {
+ 	net_local *lp = (net_local *) dev->priv;
+ 	unsigned long ioaddr = dev->base_addr;
+@@ -589,7 +589,7 @@ static void wv_ack(device * dev)
+  * Set channel attention bit and busy wait until command has
+  * completed, then acknowledge completion of the command.
+  */
+-static inline int wv_synchronous_cmd(device * dev, const char *str)
++static inline int wv_synchronous_cmd(struct net_device * dev, const char *str)
+ {
+ 	net_local *lp = (net_local *) dev->priv;
+ 	unsigned long ioaddr = dev->base_addr;
+@@ -636,7 +636,7 @@ static inline int wv_synchronous_cmd(dev
+  * Check if done, and if OK.
+  */
+ static inline int
+-wv_config_complete(device * dev, unsigned long ioaddr, net_local * lp)
++wv_config_complete(struct net_device * dev, unsigned long ioaddr, net_local * lp)
+ {
+ 	unsigned short mcs_addr;
+ 	unsigned short status;
+@@ -703,7 +703,7 @@ wv_config_complete(device * dev, unsigne
+  * (called in wavelan_interrupt()).
+  * Note : the spinlock is already grabbed for us.
+  */
+-static int wv_complete(device * dev, unsigned long ioaddr, net_local * lp)
++static int wv_complete(struct net_device * dev, unsigned long ioaddr, net_local * lp)
+ {
+ 	int nreaped = 0;
+ 
+@@ -845,7 +845,7 @@ if (lp->tx_n_in_use > 0)
+  * wavelan_interrupt is not an option), so you may experience
+  * delays sometimes.
+  */
+-static inline void wv_82586_reconfig(device * dev)
++static inline void wv_82586_reconfig(struct net_device * dev)
+ {
+ 	net_local *lp = (net_local *) dev->priv;
+ 	unsigned long flags;
+@@ -954,7 +954,7 @@ static void wv_psa_show(psa_t * p)
+  * Print the formatted status of the Modem Management Controller.
+  * This function needs to be completed.
+  */
+-static void wv_mmc_show(device * dev)
++static void wv_mmc_show(struct net_device * dev)
+ {
+ 	unsigned long ioaddr = dev->base_addr;
+ 	net_local *lp = (net_local *) dev->priv;
+@@ -1137,7 +1137,7 @@ static void wv_scb_show(unsigned long io
+ /*
+  * Print the formatted status of the i82586's receive unit.
+  */
+-static void wv_ru_show(device * dev)
++static void wv_ru_show(struct net_device * dev)
+ {
+ 	/* net_local *lp = (net_local *) dev->priv; */
+ 
+@@ -1154,7 +1154,7 @@ static void wv_ru_show(device * dev)
+ /*
+  * Display info about one control block of the i82586 memory.
+  */
+-static void wv_cu_show_one(device * dev, net_local * lp, int i, u16 p)
++static void wv_cu_show_one(struct net_device * dev, net_local * lp, int i, u16 p)
+ {
+ 	unsigned long ioaddr;
+ 	ac_tx_t actx;
+@@ -1183,7 +1183,7 @@ static void wv_cu_show_one(device * dev,
+ /*
+  * Print status of the command unit of the i82586.
+  */
+-static void wv_cu_show(device * dev)
++static void wv_cu_show(struct net_device * dev)
+ {
+ 	net_local *lp = (net_local *) dev->priv;
+ 	unsigned int i;
+@@ -1209,7 +1209,7 @@ static void wv_cu_show(device * dev)
+ /*
+  * Print the formatted status of the WaveLAN PCMCIA device driver.
+  */
+-static void wv_dev_show(device * dev)
++static void wv_dev_show(struct net_device * dev)
+ {
+ 	printk(KERN_DEBUG "dev:");
+ 	printk(" state=%lX,", dev->state);
+@@ -1223,7 +1223,7 @@ static void wv_dev_show(device * dev)
+  * Print the formatted status of the WaveLAN PCMCIA device driver's
+  * private information.
+  */
+-static void wv_local_show(device * dev)
++static void wv_local_show(struct net_device * dev)
+ {
+ 	net_local *lp;
+ 
+@@ -1285,7 +1285,7 @@ static inline void wv_packet_info(u8 * p
+  * This is the information which is displayed by the driver at startup.
+  * There are lots of flags for configuring it to your liking.
+  */
+-static inline void wv_init_info(device * dev)
++static inline void wv_init_info(struct net_device * dev)
+ {
+ 	short ioaddr = dev->base_addr;
+ 	net_local *lp = (net_local *) dev->priv;
+@@ -1395,7 +1395,7 @@ static inline void wv_init_info(device *
+  * card open or closed.
+  * Used when the user read /proc/net/dev
+  */
+-static en_stats *wavelan_get_stats(device * dev)
++static en_stats *wavelan_get_stats(struct net_device * dev)
+ {
+ #ifdef DEBUG_IOCTL_TRACE
+ 	printk(KERN_DEBUG "%s: <>wavelan_get_stats()\n", dev->name);
+@@ -1412,7 +1412,7 @@ static en_stats *wavelan_get_stats(devic
+  * num_addrs > 0	Multicast mode, receive normal and MC packets,
+  *			and do best-effort filtering.
+  */
+-static void wavelan_set_multicast_list(device * dev)
++static void wavelan_set_multicast_list(struct net_device * dev)
+ {
+ 	net_local *lp = (net_local *) dev->priv;
+ 
+@@ -1485,7 +1485,7 @@ static void wavelan_set_multicast_list(d
+  * (Note : it was a nice way to test the reconfigure stuff...)
+  */
+ #ifdef SET_MAC_ADDRESS
+-static int wavelan_set_mac_address(device * dev, void *addr)
++static int wavelan_set_mac_address(struct net_device * dev, void *addr)
+ {
+ 	struct sockaddr *mac = addr;
+ 
+@@ -1724,7 +1724,7 @@ static inline int wv_frequency_list(unsi
+  * address with our list, and if they match, get the statistics.
+  * Sorry, but this function really needs the wireless extensions.
+  */
+-static inline void wl_spy_gather(device * dev,
++static inline void wl_spy_gather(struct net_device * dev,
+ 				 u8 *	mac,	/* MAC address */
+ 				 u8 *	stats)	/* Statistics to gather */
+ {
+@@ -1750,7 +1750,7 @@ static inline void wl_spy_gather(device 
+  * With this histogram you may detect if one WaveLAN is really weak,
+  * or you may also calculate the mean and standard deviation of the level.
+  */
+-static inline void wl_his_gather(device * dev, u8 * stats)
++static inline void wl_his_gather(struct net_device * dev, u8 * stats)
+ {				/* Statistics to gather */
+ 	net_local *lp = (net_local *) dev->priv;
+ 	u8 level = stats[0] & MMR_SIGNAL_LVL;
+@@ -2415,7 +2415,7 @@ static const struct iw_handler_def	wavel
+  * Get wireless statistics.
+  * Called by /proc/net/wireless
+  */
+-static iw_stats *wavelan_get_wireless_stats(device * dev)
++static iw_stats *wavelan_get_wireless_stats(struct net_device * dev)
+ {
+ 	unsigned long ioaddr = dev->base_addr;
+ 	net_local *lp = (net_local *) dev->priv;
+@@ -2492,7 +2492,7 @@ static iw_stats *wavelan_get_wireless_st
+  * (called by wv_packet_rcv())
+  */
+ static inline void
+-wv_packet_read(device * dev, u16 buf_off, int sksize)
++wv_packet_read(struct net_device * dev, u16 buf_off, int sksize)
+ {
+ 	net_local *lp = (net_local *) dev->priv;
+ 	unsigned long ioaddr = dev->base_addr;
+@@ -2587,7 +2587,7 @@ wv_packet_read(device * dev, u16 buf_off
+  * (called in wavelan_interrupt()).
+  * Note : the spinlock is already grabbed for us.
+  */
+-static inline void wv_receive(device * dev)
++static inline void wv_receive(struct net_device * dev)
+ {
+ 	unsigned long ioaddr = dev->base_addr;
+ 	net_local *lp = (net_local *) dev->priv;
+@@ -2770,7 +2770,7 @@ static inline void wv_receive(device * d
+  *
+  * (called in wavelan_packet_xmit())
+  */
+-static inline int wv_packet_write(device * dev, void *buf, short length)
++static inline int wv_packet_write(struct net_device * dev, void *buf, short length)
+ {
+ 	net_local *lp = (net_local *) dev->priv;
+ 	unsigned long ioaddr = dev->base_addr;
+@@ -2901,7 +2901,7 @@ static inline int wv_packet_write(device
+  * the packet.  We also prevent reentrance.  Then we call the function
+  * to send the packet.
+  */
+-static int wavelan_packet_xmit(struct sk_buff *skb, device * dev)
++static int wavelan_packet_xmit(struct sk_buff *skb, struct net_device * dev)
+ {
+ 	net_local *lp = (net_local *) dev->priv;
+ 	unsigned long flags;
+@@ -2966,7 +2966,7 @@ static int wavelan_packet_xmit(struct sk
+  * Routine to initialize the Modem Management Controller.
+  * (called by wv_hw_reset())
+  */
+-static inline int wv_mmc_init(device * dev)
++static inline int wv_mmc_init(struct net_device * dev)
+ {
+ 	unsigned long ioaddr = dev->base_addr;
+ 	net_local *lp = (net_local *) dev->priv;
+@@ -3138,7 +3138,7 @@ static inline int wv_mmc_init(device * d
+  * Start the receive unit.
+  * (called by wv_hw_reset())
+  */
+-static inline int wv_ru_start(device * dev)
++static inline int wv_ru_start(struct net_device * dev)
+ {
+ 	net_local *lp = (net_local *) dev->priv;
+ 	unsigned long ioaddr = dev->base_addr;
+@@ -3230,7 +3230,7 @@ static inline int wv_ru_start(device * d
+  *
+  * (called by wv_hw_reset())
+  */
+-static inline int wv_cu_start(device * dev)
++static inline int wv_cu_start(struct net_device * dev)
+ {
+ 	net_local *lp = (net_local *) dev->priv;
+ 	unsigned long ioaddr = dev->base_addr;
+@@ -3331,7 +3331,7 @@ static inline int wv_cu_start(device * d
+  *
+  * (called by wv_hw_reset())
+  */
+-static inline int wv_82586_start(device * dev)
++static inline int wv_82586_start(struct net_device * dev)
+ {
+ 	net_local *lp = (net_local *) dev->priv;
+ 	unsigned long ioaddr = dev->base_addr;
+@@ -3463,7 +3463,7 @@ static inline int wv_82586_start(device 
+  *
+  * (called by wv_hw_reset(), wv_82586_reconfig(), wavelan_packet_xmit())
+  */
+-static void wv_82586_config(device * dev)
++static void wv_82586_config(struct net_device * dev)
+ {
+ 	net_local *lp = (net_local *) dev->priv;
+ 	unsigned long ioaddr = dev->base_addr;
+@@ -3643,7 +3643,7 @@ static void wv_82586_config(device * dev
+  * WaveLAN controller (i82586).
+  * (called by wavelan_close())
+  */
+-static inline void wv_82586_stop(device * dev)
++static inline void wv_82586_stop(struct net_device * dev)
+ {
+ 	net_local *lp = (net_local *) dev->priv;
+ 	unsigned long ioaddr = dev->base_addr;
+@@ -3680,7 +3680,7 @@ static inline void wv_82586_stop(device 
+  *	5. Start the LAN controller's receive unit
+  * (called by wavelan_interrupt(), wavelan_watchdog() & wavelan_open())
+  */
+-static int wv_hw_reset(device * dev)
++static int wv_hw_reset(struct net_device * dev)
+ {
+ 	net_local *lp = (net_local *) dev->priv;
+ 	unsigned long ioaddr = dev->base_addr;
+@@ -3770,7 +3770,7 @@ static int wv_check_ioaddr(unsigned long
+  */
+ static irqreturn_t wavelan_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+ {
+-	device *dev;
++	struct net_device *dev;
+ 	unsigned long ioaddr;
+ 	net_local *lp;
+ 	u16 hasr;
+@@ -3923,7 +3923,7 @@ static irqreturn_t wavelan_interrupt(int
+  * kernel.  If the transmission completes, this timer is disabled. If
+  * the timer expires, we are called and we try to unlock the hardware.
+  */
+-static void wavelan_watchdog(device *	dev)
++static void wavelan_watchdog(struct net_device *	dev)
+ {
+ 	net_local *	lp = (net_local *)dev->priv;
+ 	u_long		ioaddr = dev->base_addr;
+@@ -4003,7 +4003,7 @@ static void wavelan_watchdog(device *	de
+  * Configure and start up the WaveLAN PCMCIA adaptor.
+  * Called by NET3 when it "opens" the device.
+  */
+-static int wavelan_open(device * dev)
++static int wavelan_open(struct net_device * dev)
+ {
+ 	net_local *	lp = (net_local *)dev->priv;
+ 	unsigned long	flags;
+@@ -4058,7 +4058,7 @@ static int wavelan_open(device * dev)
+  * Shut down the WaveLAN ISA card.
+  * Called by NET3 when it "closes" the device.
+  */
+-static int wavelan_close(device * dev)
++static int wavelan_close(struct net_device * dev)
+ {
+ 	net_local *lp = (net_local *) dev->priv;
+ 	unsigned long flags;
+@@ -4091,12 +4091,24 @@ static int wavelan_close(device * dev)
+  * device structure
+  * (called by wavelan_probe() and via init_module()).
+  */
+-static int __init wavelan_config(device * dev)
++static int __init wavelan_config(struct net_device *dev, unsigned short ioaddr)
+ {
+-	unsigned long ioaddr = dev->base_addr;
+ 	u8 irq_mask;
+ 	int irq;
+ 	net_local *lp;
++	mac_addr mac;
++	int err;
++
++	if (!request_region(ioaddr, sizeof(ha_t), "wavelan"))
++		return -EADDRINUSE;
++
++	err = wv_check_ioaddr(ioaddr, mac);
++	if (err)
++		goto out;
++
++	memcpy(dev->dev_addr, mac, 6);
++
++	dev->base_addr = ioaddr;
+ 
+ #ifdef DEBUG_CALLBACK_TRACE
+ 	printk(KERN_DEBUG "%s: ->wavelan_config(dev=0x%x, ioaddr=0x%lx)\n",
+@@ -4136,25 +4148,18 @@ static int __init wavelan_config(device 
+ 		       "%s: wavelan_config(): could not wavelan_map_irq(%d).\n",
+ 		       dev->name, irq_mask);
+ #endif
+-		return -EAGAIN;
++		err = -EAGAIN;
++		goto out;
+ 	}
+ 
+ 	dev->irq = irq;
+ 
+-	if (!request_region(ioaddr, sizeof(ha_t), "wavelan"))
+-		return -EBUSY;
+-
+ 	dev->mem_start = 0x0000;
+ 	dev->mem_end = 0x0000;
+ 	dev->if_port = 0;
+ 
+ 	/* Initialize device structures */
+-	dev->priv = kmalloc(sizeof(net_local), GFP_KERNEL);
+-	if (dev->priv == NULL) {
+-		release_region(ioaddr, sizeof(ha_t));
+-		return -ENOMEM;
+-	}
+-	memset(dev->priv, 0x00, sizeof(net_local));
++	memset(dev->priv, 0, sizeof(net_local));
+ 	lp = (net_local *) dev->priv;
+ 
+ 	/* Back link to the device structure. */
+@@ -4172,12 +4177,6 @@ static int __init wavelan_config(device 
+ 	/* Init spinlock */
+ 	spin_lock_init(&lp->spinlock);
+ 
+-	/*
+-	 * Fill in the fields of the device structure
+-	 * with generic Ethernet values.
+-	 */
+-	ether_setup(dev);
+-
+ 	SET_MODULE_OWNER(dev);
+ 	dev->open = wavelan_open;
+ 	dev->stop = wavelan_close;
+@@ -4204,6 +4203,9 @@ static int __init wavelan_config(device 
+ 	printk(KERN_DEBUG "%s: <-wavelan_config()\n", dev->name);
+ #endif
+ 	return 0;
++out:
++	release_region(ioaddr, sizeof(ha_t));
++	return err;
+ }
+ 
+ /*------------------------------------------------------------------*/
+@@ -4214,19 +4216,13 @@ static int __init wavelan_config(device 
+  * We follow the example in drivers/net/ne.c.
+  * (called in "Space.c")
+  */
+-int __init wavelan_probe(device * dev)
++struct net_device * __init wavelan_probe(int unit)
+ {
++	struct net_device *dev;
+ 	short base_addr;
+-	mac_addr mac;		/* MAC address (check existence of WaveLAN) */
++	int def_irq;
+ 	int i;
+-	int r;
+-
+-#ifdef DEBUG_CALLBACK_TRACE
+-	printk(KERN_DEBUG
+-	       "%s: ->wavelan_probe(dev=0x%x (base_addr=0x%x))\n",
+-	       dev->name, (unsigned int) dev,
+-	       (unsigned int) dev->base_addr);
+-#endif
++	int r = 0;
+ 
+ #ifdef	STRUCT_CHECK
+ 	if (wv_struct_check() != (char *) NULL) {
+@@ -4237,8 +4233,20 @@ int __init wavelan_probe(device * dev)
+ 	}
+ #endif				/* STRUCT_CHECK */
+ 
+-	/* Check the value of the command line parameter for base address. */
++	dev = alloc_etherdev(sizeof(net_local));
++	if (!dev)
++		return ERR_PTR(-ENOMEM);
++
++	sprintf(dev->name, "eth%d", unit);
++	netdev_boot_setup_check(dev);
+ 	base_addr = dev->base_addr;
++	def_irq = dev->irq;
++
++#ifdef DEBUG_CALLBACK_TRACE
++	printk(KERN_DEBUG
++	       "%s: ->wavelan_probe(dev=%p (base_addr=0x%x))\n",
++	       dev->name, dev, (unsigned int) dev->base_addr);
++#endif
+ 
+ 	/* Don't probe at all. */
+ 	if (base_addr < 0) {
+@@ -4247,16 +4255,9 @@ int __init wavelan_probe(device * dev)
+ 		       "%s: wavelan_probe(): invalid base address\n",
+ 		       dev->name);
+ #endif
+-		return -ENXIO;
+-	}
+-
+-	/* Check a single specified location. */
+-	if (base_addr > 0x100) {
+-		/* Check if there is something at this base address */
+-		if ((r = wv_check_ioaddr(base_addr, mac)) == 0) {
+-			memcpy(dev->dev_addr, mac, 6);	/* Copy MAC address. */
+-			r = wavelan_config(dev);
+-		}
++		r = -ENXIO;
++	} else if (base_addr > 0x100) { /* Check a single specified location. */
++		r = wavelan_config(dev, base_addr);
+ #ifdef DEBUG_CONFIG_INFO
+ 		if (r != 0)
+ 			printk(KERN_DEBUG
+@@ -4267,35 +4268,33 @@ int __init wavelan_probe(device * dev)
+ #ifdef DEBUG_CALLBACK_TRACE
+ 		printk(KERN_DEBUG "%s: <-wavelan_probe()\n", dev->name);
+ #endif
+-		return r;
+-	}
+-
+-	/* Scan all possible addresses of the WaveLAN hardware. */
+-	for (i = 0; i < NELS(iobase); i++) {
+-		/* Check whether there is something at this base address. */
+-		if (wv_check_ioaddr(iobase[i], mac) == 0) {
+-			dev->base_addr = iobase[i];	/* Copy base address. */
+-			memcpy(dev->dev_addr, mac, 6);	/* Copy MAC address. */
+-			if (wavelan_config(dev) == 0) {
++	} else { /* Scan all possible addresses of the WaveLAN hardware. */
++		for (i = 0; i < NELS(iobase); i++) {
++			dev->irq = def_irq;
++			if (wavelan_config(dev, iobase[i]) == 0) {
+ #ifdef DEBUG_CALLBACK_TRACE
+ 				printk(KERN_DEBUG
+ 				       "%s: <-wavelan_probe()\n",
+ 				       dev->name);
+ #endif
+-				return 0;
++				break;
+ 			}
+ 		}
++		if (i == NELS(iobase))
++			r = -ENODEV;
+ 	}
+-
+-	/* We may have touched base_addr.  Another driver may not like it. */
+-	dev->base_addr = base_addr;
+-
+-#ifdef DEBUG_CONFIG_INFO
+-	printk(KERN_DEBUG "%s: wavelan_probe(): no device found\n",
+-	       dev->name);
+-#endif
+-
+-	return -ENODEV;
++	if (r) 
++		goto out;
++	r = register_netdev(dev);
++	if (r)
++		goto out1;
++	return dev;
++out1:
++	release_region(dev->base_addr, sizeof(ha_t));
++	wavelan_list = wavelan_list->next;
++out:
++	free_netdev(dev);
++	return ERR_PTR(r);
+ }
+ 
+ /****************************** MODULE ******************************/
+@@ -4311,7 +4310,6 @@ int __init wavelan_probe(device * dev)
+  */
+ int init_module(void)
+ {
+-	mac_addr mac;		/* MAC address (check WaveLAN existence) */
+ 	int ret = -EIO;		/* Return error if no cards found */
+ 	int i;
+ 
+@@ -4337,38 +4335,28 @@ int init_module(void)
+ 	/* Loop on all possible base addresses. */
+ 	i = -1;
+ 	while ((io[++i] != 0) && (i < NELS(io))) {
+-		/* Check if there is something at this base address. */
+-		if (wv_check_ioaddr(io[i], mac) == 0) {
+-			device *dev;
+-
+-			/* Create device and set basic arguments. */
+-			dev =
+-			    kmalloc(sizeof(struct net_device), GFP_KERNEL);
+-			if (dev == NULL) {
+-				ret = -ENOMEM;
+-				break;
+-			}
+-			memset(dev, 0x00, sizeof(struct net_device));
+-			memcpy(dev->name, name[i], IFNAMSIZ);	/* Copy name */
+-			dev->base_addr = io[i];
+-			dev->irq = irq[i];
+-			dev->init = &wavelan_config;
+-			memcpy(dev->dev_addr, mac, 6);	/* Copy MAC address. */
++		struct net_device *dev = alloc_etherdev(sizeof(net_local));
++		if (!dev)
++			break;
++		memcpy(dev->name, name[i], IFNAMSIZ);	/* Copy name */
++		dev->base_addr = io[i];
++		dev->irq = irq[i];
+ 
+-			/* Try to create the device. */
++		/* Check if there is something at this base address. */
++		if (wavelan_config(dev, io[i]) == 0) {
+ 			if (register_netdev(dev) != 0) {
+-				/* Deallocate everything. */
+-				/* Note: if dev->priv is mallocated, there is no way to fail. */
+-				kfree(dev);
++				release_region(dev->base_addr, sizeof(ha_t));
++				wavelan_list = wavelan_list->next;
+ 			} else {
+-				/* If at least one device OK, we do not fail */
+ 				ret = 0;
++				continue;
+ 			}
+-		}		/* if there is something at the address */
+-	}			/* Loop on all addresses. */
++		}
++		free_netdev(dev);
++	}
+ 
+ #ifdef DEBUG_CONFIG_ERROR
+-	if (wavelan_list == (net_local *) NULL)
++	if (!wavelan_list)
+ 		printk(KERN_WARNING
+ 		       "WaveLAN init_module(): no device found\n");
+ #endif
+@@ -4390,26 +4378,19 @@ void cleanup_module(void)
+ #endif
+ 
+ 	/* Loop on all devices and release them. */
+-	while (wavelan_list != (net_local *) NULL) {
+-		device *dev = wavelan_list->dev;
++	while (wavelan_list) {
++		struct net_device *dev = wavelan_list->dev;
+ 
+ #ifdef DEBUG_CONFIG_INFO
+ 		printk(KERN_DEBUG
+ 		       "%s: cleanup_module(): removing device at 0x%x\n",
+ 		       dev->name, (unsigned int) dev);
+ #endif
+-
+-		/* Release the ioport region. */
+-		release_region(dev->base_addr, sizeof(ha_t));
+-
+-		/* Definitely remove the device. */
+ 		unregister_netdev(dev);
+ 
+-		/* Unlink the device. */
++		release_region(dev->base_addr, sizeof(ha_t));
+ 		wavelan_list = wavelan_list->next;
+ 
+-		/* Free pieces. */
+-		kfree(dev->priv);
+ 		free_netdev(dev);
+ 	}
+ 
+--- linux-2.6.0/drivers/net/wireless/wavelan_cs.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/wireless/wavelan_cs.c	2003-12-28 23:21:01.000000000 -0800
+@@ -131,7 +131,7 @@ hacr_write_slow(u_long	base,
+  * Read the Parameter Storage Area from the WaveLAN card's memory
+  */
+ static void
+-psa_read(device *	dev,
++psa_read(struct net_device *	dev,
+ 	 int		o,	/* offset in PSA */
+ 	 u_char *	b,	/* buffer to fill */
+ 	 int		n)	/* size to read */
+@@ -155,7 +155,7 @@ psa_read(device *	dev,
+  * Write the Paramter Storage Area to the WaveLAN card's memory
+  */
+ static void
+-psa_write(device *	dev,
++psa_write(struct net_device *	dev,
+ 	  int		o,	/* Offset in psa */
+ 	  u_char *	b,	/* Buffer in memory */
+ 	  int		n)	/* Length of buffer */
+@@ -229,7 +229,7 @@ psa_crc(unsigned char *	psa,	/* The PSA 
+  * update the checksum field in the Wavelan's PSA
+  */
+ static void
+-update_psa_checksum(device *	dev)
++update_psa_checksum(struct net_device *	dev)
+ {
+ #ifdef SET_PSA_CRC
+   psa_t		psa;
+@@ -753,7 +753,7 @@ void wv_roam_handover(wavepoint_history 
+ }
+ 
+ /* Called when a WavePoint beacon is received */
+-static inline void wl_roam_gather(device *  dev,
++static inline void wl_roam_gather(struct net_device *  dev,
+ 				  u_char *  hdr,   /* Beacon header */
+ 				  u_char *  stats) /* SNR, Signal quality 
+ 						      of packet */
+@@ -831,7 +831,7 @@ static inline int WAVELAN_BEACON(unsigne
+  *  wv_82593_config() & wv_diag())
+  */
+ static int
+-wv_82593_cmd(device *	dev,
++wv_82593_cmd(struct net_device *	dev,
+ 	     char *	str,
+ 	     int	cmd,
+ 	     int	result)
+@@ -942,7 +942,7 @@ wv_82593_cmd(device *	dev,
+  * status for the WaveLAN.
+  */
+ static inline int
+-wv_diag(device *	dev)
++wv_diag(struct net_device *	dev)
+ {
+   int		ret = FALSE;
+ 
+@@ -963,7 +963,7 @@ wv_diag(device *	dev)
+  * The return value is the address to use for next the call.
+  */
+ static int
+-read_ringbuf(device *	dev,
++read_ringbuf(struct net_device *	dev,
+ 	     int	addr,
+ 	     char *	buf,
+ 	     int	len)
+@@ -1004,10 +1004,10 @@ read_ringbuf(device *	dev,
+  * some delay sometime...
+  */
+ static inline void
+-wv_82593_reconfig(device *	dev)
++wv_82593_reconfig(struct net_device *	dev)
+ {
+   net_local *		lp = (net_local *)dev->priv;
+-  dev_link_t *		link = ((net_local *) dev->priv)->link;
++  dev_link_t *		link = lp->link;
+   unsigned long		flags;
+ 
+   /* Arm the flag, will be cleard in wv_82593_config() */
+@@ -1132,7 +1132,7 @@ wv_psa_show(psa_t *	p)
+  * This function need to be completed...
+  */
+ static void
+-wv_mmc_show(device *	dev)
++wv_mmc_show(struct net_device *	dev)
+ {
+   ioaddr_t	base = dev->base_addr;
+   net_local *	lp = (net_local *)dev->priv;
+@@ -1222,7 +1222,7 @@ wv_mmc_show(device *	dev)
+  * Print the formatted status of the i82593's receive unit.
+  */
+ static void
+-wv_ru_show(device *	dev)
++wv_ru_show(struct net_device *	dev)
+ {
+   net_local *lp = (net_local *) dev->priv;
+ 
+@@ -1241,7 +1241,7 @@ wv_ru_show(device *	dev)
+  * Print the formatted status of the WaveLAN PCMCIA device driver.
+  */
+ static void
+-wv_dev_show(device *	dev)
++wv_dev_show(struct net_device *	dev)
+ {
+   printk(KERN_DEBUG "dev:");
+   printk(" state=%lX,", dev->state);
+@@ -1256,7 +1256,7 @@ wv_dev_show(device *	dev)
+  * private information.
+  */
+ static void
+-wv_local_show(device *	dev)
++wv_local_show(struct net_device *	dev)
+ {
+   net_local *lp;
+ 
+@@ -1314,7 +1314,7 @@ wv_packet_info(u_char *		p,		/* Packet t
+  * There  is a lot of flag to configure it at your will...
+  */
+ static inline void
+-wv_init_info(device *	dev)
++wv_init_info(struct net_device *	dev)
+ {
+   ioaddr_t	base = dev->base_addr;
+   psa_t		psa;
+@@ -1412,7 +1412,7 @@ wv_init_info(device *	dev)
+  * Used when the user read /proc/net/dev
+  */
+ static en_stats	*
+-wavelan_get_stats(device *	dev)
++wavelan_get_stats(struct net_device *	dev)
+ {
+ #ifdef DEBUG_IOCTL_TRACE
+   printk(KERN_DEBUG "%s: <>wavelan_get_stats()\n", dev->name);
+@@ -1431,7 +1431,7 @@ wavelan_get_stats(device *	dev)
+  */
+ 
+ static void
+-wavelan_set_multicast_list(device *	dev)
++wavelan_set_multicast_list(struct net_device *	dev)
+ {
+   net_local *	lp = (net_local *) dev->priv;
+ 
+@@ -1529,7 +1529,7 @@ wavelan_set_multicast_list(device *	dev)
+  */
+ #ifdef SET_MAC_ADDRESS
+ static int
+-wavelan_set_mac_address(device *	dev,
++wavelan_set_mac_address(struct net_device *	dev,
+ 			void *		addr)
+ {
+   struct sockaddr *	mac = addr;
+@@ -1796,7 +1796,7 @@ wv_frequency_list(u_long	base,	/* i/o po
+  * Sorry, but this function really need wireless extensions...
+  */
+ static inline void
+-wl_spy_gather(device *	dev,
++wl_spy_gather(struct net_device *	dev,
+ 	      u_char *	mac,		/* MAC address */
+ 	      u_char *	stats)		/* Statistics to gather */
+ {
+@@ -1823,7 +1823,7 @@ wl_spy_gather(device *	dev,
+  * or you may also calculate the mean and standard deviation of the level...
+  */
+ static inline void
+-wl_his_gather(device *	dev,
++wl_his_gather(struct net_device *	dev,
+ 	      u_char *	stats)		/* Statistics to gather */
+ {
+   net_local *	lp = (net_local *) dev->priv;
+@@ -2785,7 +2785,7 @@ wavelan_ioctl(struct net_device *	dev,	/
+  * Called by /proc/net/wireless...
+  */
+ static iw_stats *
+-wavelan_get_wireless_stats(device *	dev)
++wavelan_get_wireless_stats(struct net_device *	dev)
+ {
+   ioaddr_t		base = dev->base_addr;
+   net_local *		lp = (net_local *) dev->priv;
+@@ -2847,7 +2847,7 @@ wavelan_get_wireless_stats(device *	dev)
+  * (called by wv_packet_rcv())
+  */
+ static inline int
+-wv_start_of_frame(device *	dev,
++wv_start_of_frame(struct net_device *	dev,
+ 		  int		rfp,	/* end of frame */
+ 		  int		wrap)	/* start of buffer */
+ {
+@@ -2909,7 +2909,7 @@ wv_start_of_frame(device *	dev,
+  * (called by wv_packet_rcv())
+  */
+ static inline void
+-wv_packet_read(device *		dev,
++wv_packet_read(struct net_device *		dev,
+ 	       int		fd_p,
+ 	       int		sksize)
+ {
+@@ -3012,7 +3012,7 @@ wv_packet_read(device *		dev,
+  * Note : the spinlock is already grabbed for us and irq are disabled.
+  */
+ static inline void
+-wv_packet_rcv(device *	dev)
++wv_packet_rcv(struct net_device *	dev)
+ {
+   ioaddr_t	base = dev->base_addr;
+   net_local *	lp = (net_local *) dev->priv;
+@@ -3146,7 +3146,7 @@ wv_packet_rcv(device *	dev)
+  * (called in wavelan_packet_xmit())
+  */
+ static inline void
+-wv_packet_write(device *	dev,
++wv_packet_write(struct net_device *	dev,
+ 		void *		buf,
+ 		short		length)
+ {
+@@ -3209,7 +3209,7 @@ wv_packet_write(device *	dev,
+  */
+ static int
+ wavelan_packet_xmit(struct sk_buff *	skb,
+-		    device *		dev)
++		    struct net_device *		dev)
+ {
+   net_local *		lp = (net_local *)dev->priv;
+   unsigned long		flags;
+@@ -3273,7 +3273,7 @@ wavelan_packet_xmit(struct sk_buff *	skb
+  * (called by wv_hw_config())
+  */
+ static inline int
+-wv_mmc_init(device *	dev)
++wv_mmc_init(struct net_device *	dev)
+ {
+   ioaddr_t	base = dev->base_addr;
+   psa_t		psa;
+@@ -3467,7 +3467,7 @@ wv_mmc_init(device *	dev)
+  * (called in wv_ru_start() and wavelan_close() and wavelan_event())
+  */
+ static int
+-wv_ru_stop(device *	dev)
++wv_ru_stop(struct net_device *	dev)
+ {
+   ioaddr_t	base = dev->base_addr;
+   net_local *	lp = (net_local *) dev->priv;
+@@ -3530,7 +3530,7 @@ wv_ru_stop(device *	dev)
+  * (called in wv_hw_reset() & wavelan_open())
+  */
+ static int
+-wv_ru_start(device *	dev)
++wv_ru_start(struct net_device *	dev)
+ {
+   ioaddr_t	base = dev->base_addr;
+   net_local *	lp = (net_local *) dev->priv;
+@@ -3618,7 +3618,7 @@ wv_ru_start(device *	dev)
+  * (called by wv_hw_config(), wv_82593_reconfig() & wavelan_packet_xmit())
+  */
+ static int
+-wv_82593_config(device *	dev)
++wv_82593_config(struct net_device *	dev)
+ {
+   ioaddr_t			base = dev->base_addr;
+   net_local *			lp = (net_local *) dev->priv;
+@@ -3792,7 +3792,7 @@ wv_82593_config(device *	dev)
+  * (called by wv_config())
+  */
+ static inline int
+-wv_pcmcia_reset(device *	dev)
++wv_pcmcia_reset(struct net_device *	dev)
+ {
+   int		i;
+   conf_reg_t	reg = { 0, CS_READ, CISREG_COR, 0 };
+@@ -3854,7 +3854,7 @@ wv_pcmcia_reset(device *	dev)
+  * (called by wavelan_event() & wv_hw_reset())
+  */
+ static int
+-wv_hw_config(device *	dev)
++wv_hw_config(struct net_device *	dev)
+ {
+   net_local *		lp = (net_local *) dev->priv;
+   ioaddr_t		base = dev->base_addr;
+@@ -3961,7 +3961,7 @@ wv_hw_config(device *	dev)
+  * (called by wavelan_event(), wavelan_watchdog() and wavelan_open())
+  */
+ static inline void
+-wv_hw_reset(device *	dev)
++wv_hw_reset(struct net_device *	dev)
+ {
+   net_local *	lp = (net_local *) dev->priv;
+ 
+@@ -4004,7 +4004,7 @@ wv_pcmcia_config(dev_link_t *	link)
+   memreq_t		mem;
+ 
+   handle = link->handle;
+-  dev = (device *) link->priv;
++  dev = (struct net_device *) link->priv;
+ 
+ #ifdef DEBUG_CONFIG_TRACE
+   printk(KERN_DEBUG "->wv_pcmcia_config(0x%p)\n", link);
+@@ -4150,7 +4150,7 @@ wv_pcmcia_config(dev_link_t *	link)
+ static void
+ wv_pcmcia_release(dev_link_t *link)
+ {
+-  device *	dev = (device *) link->priv;
++  struct net_device *	dev = (struct net_device *) link->priv;
+ 
+ #ifdef DEBUG_CONFIG_TRACE
+   printk(KERN_DEBUG "%s: -> wv_pcmcia_release(0x%p)\n", dev->name, link);
+@@ -4200,13 +4200,13 @@ wavelan_interrupt(int		irq,
+ 		  void *	dev_id,
+ 		  struct pt_regs * regs)
+ {
+-  device *	dev;
++  struct net_device *	dev;
+   net_local *	lp;
+   ioaddr_t	base;
+   int		status0;
+   u_int		tx_status;
+ 
+-  if((dev = (device *)dev_id) == (device *) NULL)
++  if ((dev = dev_id) == NULL)
+     {
+ #ifdef DEBUG_INTERRUPT_ERROR
+       printk(KERN_WARNING "wavelan_interrupt(): irq %d for unknown device.\n",
+@@ -4467,7 +4467,7 @@ wavelan_interrupt(int		irq,
+  * deal with the multiple Tx buffers...
+  */
+ static void
+-wavelan_watchdog(device *	dev)
++wavelan_watchdog(struct net_device *	dev)
+ {
+   net_local *		lp = (net_local *) dev->priv;
+   ioaddr_t		base = dev->base_addr;
+@@ -4542,7 +4542,7 @@ wavelan_watchdog(device *	dev)
+  * Called by NET3 when it "open" the device.
+  */
+ static int
+-wavelan_open(device *	dev)
++wavelan_open(struct net_device *	dev)
+ {
+   dev_link_t *	link = ((net_local *) dev->priv)->link;
+   net_local *	lp = (net_local *)dev->priv;
+@@ -4597,7 +4597,7 @@ wavelan_open(device *	dev)
+  * Called by NET3 when it "close" the device.
+  */
+ static int
+-wavelan_close(device *	dev)
++wavelan_close(struct net_device *	dev)
+ {
+   dev_link_t *	link = ((net_local *) dev->priv)->link;
+   ioaddr_t	base = dev->base_addr;
+@@ -4661,7 +4661,7 @@ wavelan_attach(void)
+ {
+   client_reg_t	client_reg;	/* Register with cardmgr */
+   dev_link_t *	link;		/* Info for cardmgr */
+-  device *	dev;		/* Interface generic data */
++  struct net_device *	dev;		/* Interface generic data */
+   net_local *	lp;		/* Interface specific data */
+   int		i, ret;
+ 
+@@ -4699,22 +4699,14 @@ wavelan_attach(void)
+   dev_list = link;
+ 
+   /* Allocate the generic data structure */
+-  dev = kmalloc(sizeof(struct net_device), GFP_KERNEL);
++  dev = alloc_etherdev(sizeof(net_local));
+   if (!dev) {
+       kfree(link);
+       return NULL;
+   }
+-  memset(dev, 0x00, sizeof(struct net_device));
+   link->priv = link->irq.Instance = dev;
+ 
+-  /* Allocate the wavelan-specific data structure. */
+-  dev->priv = lp = (net_local *) kmalloc(sizeof(net_local), GFP_KERNEL);
+-  if (!lp) {
+-      kfree(link);
+-      kfree(dev);
+-      return NULL;
+-  }
+-  memset(lp, 0x00, sizeof(net_local));
++  lp = dev->priv;
+ 
+   /* Init specific data */
+   lp->configured = 0;
+@@ -4732,9 +4724,6 @@ wavelan_attach(void)
+   lp->link = link;
+   lp->dev = dev;
+ 
+-  /* Standard setup for generic data */
+-  ether_setup(dev);
+-
+   /* wavelan NET3 callbacks */
+   SET_MODULE_OWNER(dev);
+   dev->open = &wavelan_open;
+@@ -4852,22 +4841,16 @@ wavelan_detach(dev_link_t *	link)
+   /* Free pieces */
+   if(link->priv)
+     {
+-      device *	dev = (device *) link->priv;
++      struct net_device *	dev = (struct net_device *) link->priv;
+ 
+       /* Remove ourselves from the kernel list of ethernet devices */
+       /* Warning : can't be called from interrupt, timer or wavelan_close() */
+-      if(link->dev != NULL)
++      if (link->dev)
+ 	unregister_netdev(dev);
+       link->dev = NULL;
+-
+-      if(dev->priv)
+-	{
+-	  /* Sound strange, but safe... */
+-	  ((net_local *) dev->priv)->link = (dev_link_t *) NULL;
+-	  ((net_local *) dev->priv)->dev = (device *) NULL;
+-	  kfree(dev->priv);
+-	}
+-      kfree(link->priv);
++      ((net_local *) dev->priv)->link = NULL;
++      ((net_local *) dev->priv)->dev = NULL;
++      free_netdev(dev);
+     }
+   kfree(link);
+ 
+@@ -4889,7 +4872,7 @@ wavelan_event(event_t		event,		/* The ev
+ 	      event_callback_args_t *	args)
+ {
+   dev_link_t *	link = (dev_link_t *) args->client_data;
+-  device *	dev = (device *) link->priv;
++  struct net_device *	dev = (struct net_device *) link->priv;
+ 
+ #ifdef DEBUG_CALLBACK_TRACE
+   printk(KERN_DEBUG "->wavelan_event(): %s\n",
+--- linux-2.6.0/drivers/net/wireless/wavelan_cs.p.h	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/wireless/wavelan_cs.p.h	2003-12-28 23:21:01.000000000 -0800
+@@ -588,7 +588,6 @@ struct wavepoint_table
+ /****************************** TYPES ******************************/
+ 
+ /* Shortcuts */
+-typedef struct net_device	device;
+ typedef struct net_device_stats	en_stats;
+ typedef struct iw_statistics	iw_stats;
+ typedef struct iw_quality	iw_qual;
+@@ -611,7 +610,7 @@ typedef u_char		mac_addr[WAVELAN_ADDR_SI
+ struct net_local
+ {
+   dev_node_t 	node;		/* ???? What is this stuff ???? */
+-  device *	dev;		/* Reverse link... */
++  struct net_device *	dev;		/* Reverse link... */
+   spinlock_t	spinlock;	/* Serialize access to the hardware (SMP) */
+   dev_link_t *	link;		/* pcmcia structure */
+   en_stats	stats;		/* Ethernet interface statistics */
+@@ -673,11 +672,11 @@ static inline void
+ 	hacr_write_slow(u_long,
+ 		   u_char);
+ static void
+-	psa_read(device *,	/* Read the Parameter Storage Area */
++	psa_read(struct net_device *,	/* Read the Parameter Storage Area */
+ 		 int,		/* offset in PSA */
+ 		 u_char *,	/* buffer to fill */
+ 		 int),		/* size to read */
+-	psa_write(device *,	/* Write to the PSA */
++	psa_write(struct net_device *,	/* Write to the PSA */
+ 		  int,		/* Offset in psa */
+ 		  u_char *,	/* Buffer in memory */
+ 		  int);		/* Length of buffer */
+@@ -707,57 +706,57 @@ static void
+ 		 int);		/* number of registers */
+ /* ---------------------- I82593 SUBROUTINES ----------------------- */
+ static int
+-	wv_82593_cmd(device *,	/* synchronously send a command to i82593 */ 
++	wv_82593_cmd(struct net_device *,	/* synchronously send a command to i82593 */ 
+ 		     char *,
+ 		     int,
+ 		     int);
+ static inline int
+-	wv_diag(device *);	/* Diagnostique the i82593 */
++	wv_diag(struct net_device *);	/* Diagnostique the i82593 */
+ static int
+-	read_ringbuf(device *,	/* Read a receive buffer */
++	read_ringbuf(struct net_device *,	/* Read a receive buffer */
+ 		     int,
+ 		     char *,
+ 		     int);
+ static inline void
+-	wv_82593_reconfig(device *);	/* Reconfigure the controller */
++	wv_82593_reconfig(struct net_device *);	/* Reconfigure the controller */
+ /* ------------------- DEBUG & INFO SUBROUTINES ------------------- */
+ static inline void
+-	wv_init_info(device *);	/* display startup info */
++	wv_init_info(struct net_device *);	/* display startup info */
+ /* ------------------- IOCTL, STATS & RECONFIG ------------------- */
+ static en_stats	*
+-	wavelan_get_stats(device *);	/* Give stats /proc/net/dev */
++	wavelan_get_stats(struct net_device *);	/* Give stats /proc/net/dev */
+ /* ----------------------- PACKET RECEPTION ----------------------- */
+ static inline int
+-	wv_start_of_frame(device *,	/* Seek beggining of current frame */
++	wv_start_of_frame(struct net_device *,	/* Seek beggining of current frame */
+ 			  int,	/* end of frame */
+ 			  int);	/* start of buffer */
+ static inline void
+-	wv_packet_read(device *,	/* Read a packet from a frame */
++	wv_packet_read(struct net_device *,	/* Read a packet from a frame */
+ 		       int,
+ 		       int),
+-	wv_packet_rcv(device *);	/* Read all packets waiting */
++	wv_packet_rcv(struct net_device *);	/* Read all packets waiting */
+ /* --------------------- PACKET TRANSMISSION --------------------- */
+ static inline void
+-	wv_packet_write(device *,	/* Write a packet to the Tx buffer */
++	wv_packet_write(struct net_device *,	/* Write a packet to the Tx buffer */
+ 			void *,
+ 			short);
+ static int
+ 	wavelan_packet_xmit(struct sk_buff *,	/* Send a packet */
+-			    device *);
++			    struct net_device *);
+ /* -------------------- HARDWARE CONFIGURATION -------------------- */
+ static inline int
+-	wv_mmc_init(device *);	/* Initialize the modem */
++	wv_mmc_init(struct net_device *);	/* Initialize the modem */
+ static int
+-	wv_ru_stop(device *),	/* Stop the i82593 receiver unit */
+-	wv_ru_start(device *);	/* Start the i82593 receiver unit */
++	wv_ru_stop(struct net_device *),	/* Stop the i82593 receiver unit */
++	wv_ru_start(struct net_device *);	/* Start the i82593 receiver unit */
+ static int
+-	wv_82593_config(device *);	/* Configure the i82593 */
++	wv_82593_config(struct net_device *);	/* Configure the i82593 */
+ static inline int
+-	wv_pcmcia_reset(device *);	/* Reset the pcmcia interface */
++	wv_pcmcia_reset(struct net_device *);	/* Reset the pcmcia interface */
+ static int
+-	wv_hw_config(device *);	/* Reset & configure the whole hardware */
++	wv_hw_config(struct net_device *);	/* Reset & configure the whole hardware */
+ static inline void
+-	wv_hw_reset(device *);	/* Same, + start receiver unit */
++	wv_hw_reset(struct net_device *);	/* Same, + start receiver unit */
+ static inline int
+ 	wv_pcmcia_config(dev_link_t *);	/* Configure the pcmcia interface */
+ static void
+@@ -768,11 +767,11 @@ static irqreturn_t
+ 			  void *,
+ 			  struct pt_regs *);
+ static void
+-	wavelan_watchdog(device *);	/* Transmission watchdog */
++	wavelan_watchdog(struct net_device *);	/* Transmission watchdog */
+ /* ------------------- CONFIGURATION CALLBACKS ------------------- */
+ static int
+-	wavelan_open(device *),		/* Open the device */
+-	wavelan_close(device *);	/* Close the device */
++	wavelan_open(struct net_device *),		/* Open the device */
++	wavelan_close(struct net_device *);	/* Close the device */
+ static dev_link_t *
+ 	wavelan_attach(void);		/* Create a new device */
+ static void
+--- linux-2.6.0/drivers/net/wireless/wavelan.p.h	2003-06-14 12:18:28.000000000 -0700
++++ 25/drivers/net/wireless/wavelan.p.h	2003-12-28 23:21:01.000000000 -0800
+@@ -469,7 +469,6 @@ static const char	*version	= "wavelan.c 
+ /****************************** TYPES ******************************/
+ 
+ /* Shortcuts */
+-typedef struct net_device		device;
+ typedef struct net_device_stats	en_stats;
+ typedef struct iw_statistics	iw_stats;
+ typedef struct iw_quality	iw_qual;
+@@ -492,7 +491,7 @@ typedef u_char		mac_addr[WAVELAN_ADDR_SI
+ struct net_local
+ {
+   net_local *	next;		/* linked list of the devices */
+-  device *	dev;		/* reverse link */
++  struct net_device *	dev;		/* reverse link */
+   spinlock_t	spinlock;	/* Serialize access to the hardware (SMP) */
+   en_stats	stats;		/* Ethernet interface statistics */
+   int		nresets;	/* number of hardware resets */
+@@ -542,8 +541,8 @@ static inline void
+ 		  u_short),	/* hacr   */
+ 	wv_16_on(u_long,	/* ioaddr */
+ 		 u_short),	/* hacr   */
+-	wv_ints_off(device *),
+-	wv_ints_on(device *);
++	wv_ints_off(struct net_device *),
++	wv_ints_on(struct net_device *);
+ /* ----------------- MODEM MANAGEMENT SUBROUTINES ----------------- */
+ static void
+ 	psa_read(u_long,	/* Read the Parameter Storage Area. */
+@@ -592,57 +591,57 @@ static inline void
+ 		    u_char *,	/* b */
+ 		    int);	/* n */
+ static void
+-	wv_ack(device *);
++	wv_ack(struct net_device *);
+ static inline int
+-	wv_synchronous_cmd(device *,
++	wv_synchronous_cmd(struct net_device *,
+ 			   const char *),
+-	wv_config_complete(device *,
++	wv_config_complete(struct net_device *,
+ 			   u_long,
+ 			   net_local *);
+ static int
+-	wv_complete(device *,
++	wv_complete(struct net_device *,
+ 		    u_long,
+ 		    net_local *);
+ static inline void
+-	wv_82586_reconfig(device *);
++	wv_82586_reconfig(struct net_device *);
+ /* ------------------- DEBUG & INFO SUBROUTINES ------------------- */
+ #ifdef DEBUG_I82586_SHOW
+ static void
+ 	wv_scb_show(unsigned short);
+ #endif
+ static inline void
+-	wv_init_info(device *);	/* display startup info */
++	wv_init_info(struct net_device *);	/* display startup info */
+ /* ------------------- IOCTL, STATS & RECONFIG ------------------- */
+ static en_stats	*
+-	wavelan_get_stats(device *);	/* Give stats /proc/net/dev */
++	wavelan_get_stats(struct net_device *);	/* Give stats /proc/net/dev */
+ static void
+-	wavelan_set_multicast_list(device *);
++	wavelan_set_multicast_list(struct net_device *);
+ /* ----------------------- PACKET RECEPTION ----------------------- */
+ static inline void
+-	wv_packet_read(device *,	/* Read a packet from a frame. */
++	wv_packet_read(struct net_device *,	/* Read a packet from a frame. */
+ 		       u_short,
+ 		       int),
+-	wv_receive(device *);	/* Read all packets waiting. */
++	wv_receive(struct net_device *);	/* Read all packets waiting. */
+ /* --------------------- PACKET TRANSMISSION --------------------- */
+ static inline int
+-	wv_packet_write(device *,	/* Write a packet to the Tx buffer. */
++	wv_packet_write(struct net_device *,	/* Write a packet to the Tx buffer. */
+ 			void *,
+ 			short);
+ static int
+ 	wavelan_packet_xmit(struct sk_buff *,	/* Send a packet. */
+-			    device *);
++			    struct net_device *);
+ /* -------------------- HARDWARE CONFIGURATION -------------------- */
+ static inline int
+-	wv_mmc_init(device *),		/* Initialize the modem. */
+-	wv_ru_start(device *),		/* Start the i82586 receiver unit. */
+-	wv_cu_start(device *),		/* Start the i82586 command unit. */
+-	wv_82586_start(device *);	/* Start the i82586. */
++	wv_mmc_init(struct net_device *),	/* Initialize the modem. */
++	wv_ru_start(struct net_device *),	/* Start the i82586 receiver unit. */
++	wv_cu_start(struct net_device *),	/* Start the i82586 command unit. */
++	wv_82586_start(struct net_device *);	/* Start the i82586. */
+ static void
+-	wv_82586_config(device *);	/* Configure the i82586. */
++	wv_82586_config(struct net_device *);	/* Configure the i82586. */
+ static inline void
+-	wv_82586_stop(device *);
++	wv_82586_stop(struct net_device *);
+ static int
+-	wv_hw_reset(device *),		/* Reset the WaveLAN hardware. */
++	wv_hw_reset(struct net_device *),	/* Reset the WaveLAN hardware. */
+ 	wv_check_ioaddr(u_long,		/* ioaddr */
+ 			u_char *);	/* mac address (read) */
+ /* ---------------------- INTERRUPT HANDLING ---------------------- */
+@@ -651,14 +650,13 @@ static irqreturn_t
+ 			  void *,
+ 			  struct pt_regs *);
+ static void
+-	wavelan_watchdog(device *);	/* transmission watchdog */
++	wavelan_watchdog(struct net_device *);	/* transmission watchdog */
+ /* ------------------- CONFIGURATION CALLBACKS ------------------- */
+ static int
+-	wavelan_open(device *),		/* Open the device. */
+-	wavelan_close(device *),	/* Close the device. */
+-	wavelan_config(device *);	/* Configure one device. */
+-extern int
+-	wavelan_probe(device *);	/* See Space.c. */
++	wavelan_open(struct net_device *),	/* Open the device. */
++	wavelan_close(struct net_device *),	/* Close the device. */
++	wavelan_config(struct net_device *, unsigned short);/* Configure one device. */
++extern struct net_device *wavelan_probe(int unit);	/* See Space.c. */
+ 
+ /**************************** VARIABLES ****************************/
+ 
+--- linux-2.6.0/drivers/net/wireless/wl3501_cs.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/wireless/wl3501_cs.c	2003-12-28 23:22:53.000000000 -0800
+@@ -1449,18 +1449,6 @@ fail:
+ 	goto out;
+ }
+ 
+-/**
+- * wl3501_init - "initialize" board
+- * @dev - network device
+- *
+- * We never need to do anything when a wl3501 device is "initialized" by the net
+- * software, because we only register already-found cards.
+- */
+-static int wl3501_init(struct net_device *dev)
+-{
+-	return 0;
+-}
+-
+ struct net_device_stats *wl3501_get_stats(struct net_device *dev)
+ {
+ 	struct wl3501_card *this = dev->priv;
+@@ -1586,7 +1574,7 @@ static void wl3501_detach(dev_link_t *li
+ 
+ 	/* Break the link with Card Services */
+ 	if (link->handle)
+-		CardServices(DeregisterClient, link->handle);
++		pcmcia_deregister_client(link->handle);
+ 
+ 	/* Unlink device structure, free pieces */
+ 	*linkp = link->next;
+@@ -2056,7 +2044,6 @@ static dev_link_t *wl3501_attach(void)
+ 	dev = alloc_etherdev(sizeof(struct wl3501_card));
+ 	if (!dev)
+ 		goto out_link;
+-	dev->init		= wl3501_init;
+ 	dev->open		= wl3501_open;
+ 	dev->stop		= wl3501_close;
+ 	dev->hard_start_xmit	= wl3501_hard_start_xmit;
+@@ -2083,7 +2070,7 @@ static dev_link_t *wl3501_attach(void)
+ 	client_reg.event_handler = wl3501_event;
+ 	client_reg.Version	 = 0x0210;
+ 	client_reg.event_callback_args.client_data = link;
+-	ret = CardServices(RegisterClient, &link->handle, &client_reg);
++	ret = pcmcia_register_client(&link->handle, &client_reg);
+ 	if (ret) {
+ 		cs_error(link->handle, RegisterClient, ret);
+ 		wl3501_detach(link);
+@@ -2097,8 +2084,8 @@ out_link:
+ 	goto out;
+ }
+ 
+-#define CS_CHECK(fn, args...) \
+-while ((last_ret = CardServices(last_fn = (fn), args)) != 0) goto cs_failed
++#define CS_CHECK(fn, ret) \
++do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+ 
+ /**
+  * wl3501_config - configure the PCMCIA socket and make eth device available
+@@ -2121,12 +2108,12 @@ static void wl3501_config(dev_link_t *li
+ 	/* This reads the card's CONFIG tuple to find its config registers. */
+ 	tuple.Attributes	= 0;
+ 	tuple.DesiredTuple	= CISTPL_CONFIG;
+-	CS_CHECK(GetFirstTuple, handle, &tuple);
++	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+ 	tuple.TupleData		= bf;
+ 	tuple.TupleDataMax	= sizeof(bf);
+ 	tuple.TupleOffset	= 0;
+-	CS_CHECK(GetTupleData, handle, &tuple);
+-	CS_CHECK(ParseTuple, handle, &tuple, &parse);
++	CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
++	CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+ 	link->conf.ConfigBase	= parse.config.base;
+ 	link->conf.Present	= parse.config.rmask[0];
+ 
+@@ -2142,7 +2129,7 @@ static void wl3501_config(dev_link_t *li
+ 		 * 0x200-0x2ff, and so on, because this seems safer */
+ 		link->io.BasePort1 = j;
+ 		link->io.BasePort2 = link->io.BasePort1 + 0x10;
+-		i = CardServices(RequestIO, link->handle, &link->io);
++		i = pcmcia_request_io(link->handle, &link->io);
+ 		if (i == CS_SUCCESS)
+ 			break;
+ 	}
+@@ -2154,12 +2141,12 @@ static void wl3501_config(dev_link_t *li
+ 	/* Now allocate an interrupt line. Note that this does not actually
+ 	 * assign a handler to the interrupt. */
+ 
+-	CS_CHECK(RequestIRQ, link->handle, &link->irq);
++	CS_CHECK(RequestIRQ, pcmcia_request_irq(link->handle, &link->irq));
+ 
+ 	/* This actually configures the PCMCIA socket -- setting up the I/O
+ 	 * windows and the interrupt mapping.  */
+ 
+-	CS_CHECK(RequestConfiguration, link->handle, &link->conf);
++	CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link->handle, &link->conf));
+ 
+ 	dev->irq = link->irq.AssignedIRQ;
+ 	dev->base_addr = link->io.BasePort1;
+@@ -2249,9 +2236,9 @@ static void wl3501_release(dev_link_t *l
+ 	}
+ 
+ 	/* Don't bother checking to see if these succeed or not */
+-	CardServices(ReleaseConfiguration, link->handle);
+-	CardServices(ReleaseIO, link->handle, &link->io);
+-	CardServices(ReleaseIRQ, link->handle, &link->irq);
++	pcmcia_release_configuration(link->handle);
++	pcmcia_release_io(link->handle, &link->io);
++	pcmcia_release_irq(link->handle, &link->irq);
+ 	link->state &= ~DEV_CONFIG;
+ 
+ 	if (link->state & DEV_STALE_CONFIG)
+@@ -2301,7 +2288,7 @@ static int wl3501_event(event_t event, i
+ 		if (link->state & DEV_CONFIG) {
+ 			if (link->open)
+ 				netif_device_detach(dev);
+-			CardServices(ReleaseConfiguration, link->handle);
++			pcmcia_release_configuration(link->handle);
+ 		}
+ 		break;
+ 	case CS_EVENT_PM_RESUME:
+@@ -2310,8 +2297,7 @@ static int wl3501_event(event_t event, i
+ 		/* Fall through... */
+ 	case CS_EVENT_CARD_RESET:
+ 		if (link->state & DEV_CONFIG) {
+-			CardServices(RequestConfiguration, link->handle,
+-				     &link->conf);
++			pcmcia_request_configuration(link->handle, &link->conf);
+ 			if (link->open) {
+ 				wl3501_reset(dev);
+ 				netif_device_attach(dev);
+--- linux-2.6.0/drivers/net/znet.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/znet.c	2003-12-28 23:21:01.000000000 -0800
+@@ -372,10 +372,8 @@ static int __init znet_probe (void)
+ 	struct znet_private *znet;
+ 	struct net_device *dev;
+ 	char *p;
++	int err = -ENOMEM;
+ 
+-	if (znet_dev)				/* Only look for a single adaptor */
+-		return -ENODEV;
+-	
+ 	/* This code scans the region 0xf0000 to 0xfffff for a "NETIDBLK". */
+ 	for(p = (char *)phys_to_virt(0xf0000); p < (char *)phys_to_virt(0x100000); p++)
+ 		if (*p == 'N'  &&  strncmp(p, "NETIDBLK", 8) == 0)
+@@ -387,12 +385,14 @@ static int __init znet_probe (void)
+ 		return -ENODEV;
+ 	}
+ 
+-	if (!(znet_dev = dev = init_etherdev(0, sizeof(struct znet_private))))
+-			return -ENOMEM;
++	dev = alloc_etherdev(sizeof(struct znet_private));
++	if (!dev)
++		return -ENOMEM;
++
++	SET_MODULE_OWNER (dev);
+ 
+ 	znet = dev->priv;
+ 
+-	SET_MODULE_OWNER (dev);
+ 	netinfo = (struct netidblk *)p;
+ 	dev->base_addr = netinfo->iobase1;
+ 	dev->irq = netinfo->irq1;
+@@ -430,7 +430,7 @@ static int __init znet_probe (void)
+ 	znet->io_size  = 2;
+ 
+ 	if (!(znet->rx_start = kmalloc (DMA_BUF_SIZE, GFP_KERNEL | GFP_DMA)))
+-		goto free_netdev;
++		goto free_dev;
+ 	if (!(znet->tx_start = kmalloc (DMA_BUF_SIZE, GFP_KERNEL | GFP_DMA)))
+ 		goto free_rx;
+ 
+@@ -452,19 +452,19 @@ static int __init znet_probe (void)
+ 	dev->set_multicast_list = &znet_set_multicast_list;
+ 	dev->tx_timeout = znet_tx_timeout;
+ 	dev->watchdog_timeo = TX_TIMEOUT;
+-
++	err = register_netdev(dev);
++	if (err)
++		goto free_tx;
++	znet_dev = dev;
+ 	return 0;
+ 
+  free_tx:
+-	kfree (znet->tx_start);
++	kfree(znet->tx_start);
+  free_rx:
+-	kfree (znet->rx_start);
+- free_netdev:
+-	unregister_netdev (dev);
+-	kfree (dev);
+-	znet_dev = NULL;
+-
+-	return -ENOMEM;
++	kfree(znet->rx_start);
++ free_dev:
++	free_netdev(dev);
++	return err;
+ }
+ 
+ 
+@@ -934,16 +934,14 @@ static void update_stop_hit(short ioaddr
+ 
+ static __exit void znet_cleanup (void)
+ {
+-#ifdef MODULE
+ 	if (znet_dev) {
+ 		struct znet_private *znet = znet_dev->priv;
+ 
++		unregister_netdev (znet_dev);
+ 		kfree (znet->rx_start);
+ 		kfree (znet->tx_start);
+-		unregister_netdev (znet_dev);
+ 		free_netdev (znet_dev);
+ 	}
+-#endif
+ }
+ 
+ module_init (znet_probe);
+--- linux-2.6.0/drivers/net/zorro8390.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/zorro8390.c	2003-12-28 23:21:01.000000000 -0800
+@@ -103,18 +103,18 @@ static int __init zorro8390_probe(void)
+ 	    continue;
+ 	board = z->resource.start;
+ 	ioaddr = board+cards[i].offset;
+-	dev = init_etherdev(0, 0);
+-	SET_MODULE_OWNER(dev);
++	dev = alloc_ei_netdev();
+ 	if (!dev)
+ 	    return -ENOMEM;
++	SET_MODULE_OWNER(dev);
+ 	if (!request_mem_region(ioaddr, NE_IO_EXTENT*2, dev->name)) {
+-	    kfree(dev);
++	    free_netdev(dev);
+ 	    continue;
+ 	}
+ 	if ((err = zorro8390_init(dev, board, cards[i].name,
+ 				  ZTWO_VADDR(ioaddr)))) {
+ 	    release_mem_region(ioaddr, NE_IO_EXTENT*2);
+-	    kfree(dev);
++	    free_netdev(dev);
+ 	    return err;
+ 	}
+ 	err = 0;
+@@ -129,6 +129,7 @@ static int __init zorro8390_init(struct 
+ 				 const char *name, unsigned long ioaddr)
+ {
+     int i;
++    int err;
+     unsigned char SA_prom[32];
+     int start_page, stop_page;
+     static u32 zorro8390_offsets[16] = {
+@@ -195,12 +196,6 @@ static int __init zorro8390_init(struct 
+     i = request_irq(IRQ_AMIGA_PORTS, ei_interrupt, SA_SHIRQ, dev->name, dev);
+     if (i) return i;
+ 
+-    /* Allocate dev->priv and fill in 8390 specific dev fields. */
+-    if (ethdev_init(dev)) {
+-	printk("Unable to get memory for dev->priv.\n");
+-	return -ENOMEM;
+-    }
+-
+     for(i = 0; i < ETHER_ADDR_LEN; i++) {
+ #ifdef DEBUG
+ 	printk(" %2.2x", SA_prom[i]);
+@@ -232,7 +227,10 @@ static int __init zorro8390_init(struct 
+     root_zorro8390_dev = dev;
+ #endif
+     NS8390_init(dev, 0);
+-    return 0;
++    err = register_netdev(dev);
++    if (err)
++	free_irq(IRQ_AMIGA_PORTS, dev);
++    return err;
+ }
+ 
+ static int zorro8390_open(struct net_device *dev)
+--- linux-2.6.0/drivers/parport/parport_cs.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/parport/parport_cs.c	2003-12-28 23:22:54.000000000 -0800
+@@ -151,7 +151,7 @@ static dev_link_t *parport_attach(void)
+     client_reg.event_handler = &parport_event;
+     client_reg.Version = 0x0210;
+     client_reg.event_callback_args.client_data = link;
+-    ret = CardServices(RegisterClient, &link->handle, &client_reg);
++    ret = pcmcia_register_client(&link->handle, &client_reg);
+     if (ret != CS_SUCCESS) {
+ 	cs_error(link->handle, RegisterClient, ret);
+ 	parport_detach(link);
+@@ -187,7 +187,7 @@ static void parport_detach(dev_link_t *l
+ 	parport_cs_release(link);
+     
+     if (link->handle) {
+-	ret = CardServices(DeregisterClient, link->handle);
++	ret = pcmcia_deregister_client(link->handle);
+ 	if (ret != CS_SUCCESS)
+ 	    cs_error(link->handle, DeregisterClient, ret);
+     }
+@@ -206,11 +206,8 @@ static void parport_detach(dev_link_t *l
+ 
+ ======================================================================*/
+ 
+-#define CS_CHECK(fn, args...) \
+-while ((last_ret=CardServices(last_fn=(fn), args))!=0) goto cs_failed
+-
+-#define CFG_CHECK(fn, args...) \
+-if (CardServices(fn, args) != 0) goto next_entry
++#define CS_CHECK(fn, ret) \
++do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+ 
+ void parport_config(dev_link_t *link)
+ {
+@@ -231,9 +228,9 @@ void parport_config(dev_link_t *link)
+     tuple.TupleOffset = 0; tuple.TupleDataMax = 255;
+     tuple.Attributes = 0;
+     tuple.DesiredTuple = CISTPL_CONFIG;
+-    CS_CHECK(GetFirstTuple, handle, &tuple);
+-    CS_CHECK(GetTupleData, handle, &tuple);
+-    CS_CHECK(ParseTuple, handle, &tuple, &parse);
++    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
++    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
++    CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+     link->conf.ConfigBase = parse.config.base;
+     link->conf.Present = parse.config.rmask[0];
+     
+@@ -241,14 +238,15 @@ void parport_config(dev_link_t *link)
+     link->state |= DEV_CONFIG;
+ 
+     /* Not sure if this is right... look up the current Vcc */
+-    CS_CHECK(GetConfigurationInfo, handle, &conf);
++    CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(handle, &conf));
+     
+     tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+     tuple.Attributes = 0;
+-    CS_CHECK(GetFirstTuple, handle, &tuple);
++    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+     while (1) {
+-	CFG_CHECK(GetTupleData, handle, &tuple);
+-	CFG_CHECK(ParseTuple, handle, &tuple, &parse);
++	if (pcmcia_get_tuple_data(handle, &tuple) != 0 ||
++		pcmcia_parse_tuple(handle, &tuple, &parse) != 0)
++	    goto next_entry;
+ 
+ 	if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) {
+ 	    cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt.io;
+@@ -262,18 +260,19 @@ void parport_config(dev_link_t *link)
+ 		link->io.BasePort2 = io->win[1].base;
+ 		link->io.NumPorts2 = io->win[1].len;
+ 	    }
+-	    CFG_CHECK(RequestIO, link->handle, &link->io);
++	    if (pcmcia_request_io(link->handle, &link->io) != 0)
++		goto next_entry;
+ 	    /* If we've got this far, we're done */
+ 	    break;
+ 	}
+ 	
+     next_entry:
+ 	if (cfg->flags & CISTPL_CFTABLE_DEFAULT) dflt = *cfg;
+-	CS_CHECK(GetNextTuple, handle, &tuple);
++	CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(handle, &tuple));
+     }
+     
+-    CS_CHECK(RequestIRQ, handle, &link->irq);
+-    CS_CHECK(RequestConfiguration, handle, &link->conf);
++    CS_CHECK(RequestIRQ, pcmcia_request_irq(handle, &link->irq));
++    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(handle, &link->conf));
+ 
+     release_region(link->io.BasePort1, link->io.NumPorts1);
+     if (link->io.NumPorts2)
+@@ -335,9 +334,9 @@ void parport_cs_release(dev_link_t *link
+     info->ndev = 0;
+     link->dev = NULL;
+     
+-    CardServices(ReleaseConfiguration, link->handle);
+-    CardServices(ReleaseIO, link->handle, &link->io);
+-    CardServices(ReleaseIRQ, link->handle, &link->irq);
++    pcmcia_release_configuration(link->handle);
++    pcmcia_release_io(link->handle, &link->io);
++    pcmcia_release_irq(link->handle, &link->irq);
+     
+     link->state &= ~DEV_CONFIG;
+ 
+@@ -372,14 +371,14 @@ int parport_event(event_t event, int pri
+ 	/* Fall through... */
+     case CS_EVENT_RESET_PHYSICAL:
+ 	if (link->state & DEV_CONFIG)
+-	    CardServices(ReleaseConfiguration, link->handle);
++	    pcmcia_release_configuration(link->handle);
+ 	break;
+     case CS_EVENT_PM_RESUME:
+ 	link->state &= ~DEV_SUSPEND;
+ 	/* Fall through... */
+     case CS_EVENT_CARD_RESET:
+ 	if (DEV_OK(link))
+-	    CardServices(RequestConfiguration, link->handle, &link->conf);
++	    pcmcia_request_configuration(link->handle, &link->conf);
+ 	break;
+     }
+     return 0;
+--- linux-2.6.0/drivers/pci/Makefile	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/pci/Makefile	2003-12-28 23:21:44.000000000 -0800
+@@ -27,6 +27,7 @@ obj-$(CONFIG_PPC64) += setup-bus.o
+ obj-$(CONFIG_SGI_IP27) += setup-irq.o
+ obj-$(CONFIG_SGI_IP32) += setup-irq.o
+ obj-$(CONFIG_X86_VISWS) += setup-irq.o
++obj-$(CONFIG_PCI_USE_VECTOR) += msi.o
+ 
+ # Cardbus & CompactPCI use setup-bus
+ obj-$(CONFIG_HOTPLUG) += setup-bus.o
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/pci/msi.c	2003-12-28 23:21:44.000000000 -0800
+@@ -0,0 +1,1068 @@
++/*
++ * linux/drivers/pci/msi.c
++ */
++
++#include <linux/mm.h>
++#include <linux/irq.h>
++#include <linux/interrupt.h>
++#include <linux/init.h>
++#include <linux/config.h>
++#include <linux/ioport.h>
++#include <linux/smp_lock.h>
++#include <linux/pci.h>
++#include <linux/proc_fs.h>
++
++#include <asm/errno.h>
++#include <asm/io.h>
++#include <asm/smp.h>
++#include <asm/desc.h>
++#include <asm/io_apic.h>
++#include <mach_apic.h>
++
++#include <linux/pci_msi.h>
++
++_DEFINE_DBG_BUFFER
++
++static spinlock_t msi_lock = SPIN_LOCK_UNLOCKED;
++static struct msi_desc* msi_desc[NR_IRQS] = { [0 ... NR_IRQS-1] = NULL };
++static kmem_cache_t* msi_cachep;
++
++static int pci_msi_enable = 1;
++static int nr_alloc_vectors = 0;
++static int nr_released_vectors = 0;
++static int nr_reserved_vectors = NR_HP_RESERVED_VECTORS;
++static int nr_msix_devices = 0;
++
++#ifndef CONFIG_X86_IO_APIC
++int vector_irq[NR_IRQS] = { [0 ... NR_IRQS -1] = -1};
++u8 irq_vector[NR_IRQS] = { FIRST_DEVICE_VECTOR , 0 };
++#endif
++
++static void msi_cache_ctor(void *p, kmem_cache_t *cache, unsigned long flags)
++{
++	memset(p, 0, NR_IRQS * sizeof(struct msi_desc));
++}
++
++static int msi_cache_init(void)
++{
++	msi_cachep = kmem_cache_create("msi_cache",
++			NR_IRQS * sizeof(struct msi_desc),
++		       	0, SLAB_HWCACHE_ALIGN, msi_cache_ctor, NULL);
++	if (!msi_cachep)
++		return -ENOMEM;
++
++	return 0;
++}
++
++static void msi_set_mask_bit(unsigned int vector, int flag)
++{
++	struct msi_desc *entry;
++
++	entry = (struct msi_desc *)msi_desc[vector];
++	if (!entry || !entry->dev || !entry->mask_base)
++		return;
++	switch (entry->msi_attrib.type) {
++	case PCI_CAP_ID_MSI:
++	{
++		int		pos;
++		unsigned int	mask_bits;
++
++		pos = entry->mask_base;
++	        entry->dev->bus->ops->read(entry->dev->bus, entry->dev->devfn,
++				pos, 4, &mask_bits);
++		mask_bits &= ~(1);
++		mask_bits |= flag;
++	        entry->dev->bus->ops->write(entry->dev->bus, entry->dev->devfn,
++				pos, 4, mask_bits);
++		break;
++	}
++	case PCI_CAP_ID_MSIX:
++	{
++		int offset = entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +
++			PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET;
++		writel(flag, entry->mask_base + offset);
++		break;
++	}
++	default:
++		break;
++	}
++}
++
++#ifdef CONFIG_SMP
++static void set_msi_affinity(unsigned int vector, cpumask_t cpu_mask)
++{
++	struct msi_desc *entry;
++	struct msg_address address;
++	unsigned int dest_id;
++
++	entry = (struct msi_desc *)msi_desc[vector];
++	if (!entry || !entry->dev)
++		return;
++
++	switch (entry->msi_attrib.type) {
++	case PCI_CAP_ID_MSI:
++	{
++		int pos;
++
++   		if (!(pos = pci_find_capability(entry->dev, PCI_CAP_ID_MSI)))
++			return;
++
++	        entry->dev->bus->ops->read(entry->dev->bus, entry->dev->devfn,
++			msi_lower_address_reg(pos), 4,
++			&address.lo_address.value);
++		dest_id = (address.lo_address.u.dest_id &
++			MSI_ADDRESS_HEADER_MASK) |
++			(cpu_mask_to_apicid(cpu_mask) << MSI_TARGET_CPU_SHIFT);
++		address.lo_address.u.dest_id = dest_id;
++		entry->msi_attrib.current_cpu = cpu_mask_to_apicid(cpu_mask);
++		entry->dev->bus->ops->write(entry->dev->bus, entry->dev->devfn,
++			msi_lower_address_reg(pos), 4,
++			address.lo_address.value);
++		break;
++	}
++	case PCI_CAP_ID_MSIX:
++	{
++		int offset = entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +
++			PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET;
++
++		address.lo_address.value = readl(entry->mask_base + offset);
++		dest_id = (address.lo_address.u.dest_id &
++			MSI_ADDRESS_HEADER_MASK) |
++			(cpu_mask_to_apicid(cpu_mask) << MSI_TARGET_CPU_SHIFT);
++		address.lo_address.u.dest_id = dest_id;
++		entry->msi_attrib.current_cpu = cpu_mask_to_apicid(cpu_mask);
++		writel(address.lo_address.value, entry->mask_base + offset);
++		break;
++	}
++	default:
++		break;
++	}
++}
++
++static inline void move_msi(int vector)
++{
++	if (!cpus_empty(pending_irq_balance_cpumask[vector])) {
++		set_msi_affinity(vector, pending_irq_balance_cpumask[vector]);
++		cpus_clear(pending_irq_balance_cpumask[vector]);
++	}
++}
++#endif
++
++static void mask_MSI_irq(unsigned int vector)
++{
++	msi_set_mask_bit(vector, 1);
++}
++
++static void unmask_MSI_irq(unsigned int vector)
++{
++	msi_set_mask_bit(vector, 0);
++}
++
++static unsigned int startup_msi_irq_wo_maskbit(unsigned int vector)
++{
++	return 0;	/* never anything pending */
++}
++
++static void pci_disable_msi(unsigned int vector);
++static void shutdown_msi_irq(unsigned int vector)
++{
++	pci_disable_msi(vector);
++}
++
++#define shutdown_msi_irq_wo_maskbit	shutdown_msi_irq
++static void enable_msi_irq_wo_maskbit(unsigned int vector) {}
++static void disable_msi_irq_wo_maskbit(unsigned int vector) {}
++static void ack_msi_irq_wo_maskbit(unsigned int vector) {}
++static void end_msi_irq_wo_maskbit(unsigned int vector)
++{
++	move_msi(vector);
++	ack_APIC_irq();
++}
++
++static unsigned int startup_msi_irq_w_maskbit(unsigned int vector)
++{
++	unmask_MSI_irq(vector);
++	return 0;	/* never anything pending */
++}
++
++#define shutdown_msi_irq_w_maskbit	shutdown_msi_irq
++#define enable_msi_irq_w_maskbit	unmask_MSI_irq
++#define disable_msi_irq_w_maskbit	mask_MSI_irq
++#define ack_msi_irq_w_maskbit		mask_MSI_irq
++
++static void end_msi_irq_w_maskbit(unsigned int vector)
++{
++	move_msi(vector);
++	unmask_MSI_irq(vector);
++	ack_APIC_irq();
++}
++
++/*
++ * Interrupt Type for MSI-X PCI/PCI-X/PCI-Express Devices,
++ * which implement the MSI-X Capability Structure.
++ */
++static struct hw_interrupt_type msix_irq_type = {
++	.typename	= "PCI MSI-X",
++	.startup	= startup_msi_irq_w_maskbit,
++	.shutdown	= shutdown_msi_irq_w_maskbit,
++	.enable		= enable_msi_irq_w_maskbit,
++	.disable	= disable_msi_irq_w_maskbit,
++	.ack		= ack_msi_irq_w_maskbit,
++	.end		= end_msi_irq_w_maskbit,
++	.set_affinity	= set_msi_irq_affinity
++};
++
++/*
++ * Interrupt Type for MSI PCI/PCI-X/PCI-Express Devices,
++ * which implement the MSI Capability Structure with
++ * Mask-and-Pending Bits.
++ */
++static struct hw_interrupt_type msi_irq_w_maskbit_type = {
++	.typename	= "PCI MSI",
++	.startup	= startup_msi_irq_w_maskbit,
++	.shutdown	= shutdown_msi_irq_w_maskbit,
++	.enable		= enable_msi_irq_w_maskbit,
++	.disable	= disable_msi_irq_w_maskbit,
++	.ack		= ack_msi_irq_w_maskbit,
++	.end		= end_msi_irq_w_maskbit,
++	.set_affinity	= set_msi_irq_affinity
++};
++
++/*
++ * Interrupt Type for MSI PCI/PCI-X/PCI-Express Devices,
++ * which implement the MSI Capability Structure without
++ * Mask-and-Pending Bits.
++ */
++static struct hw_interrupt_type msi_irq_wo_maskbit_type = {
++	.typename	= "PCI MSI",
++	.startup	= startup_msi_irq_wo_maskbit,
++	.shutdown	= shutdown_msi_irq_wo_maskbit,
++	.enable		= enable_msi_irq_wo_maskbit,
++	.disable	= disable_msi_irq_wo_maskbit,
++	.ack		= ack_msi_irq_wo_maskbit,
++	.end		= end_msi_irq_wo_maskbit,
++	.set_affinity	= set_msi_irq_affinity
++};
++
++static void msi_data_init(struct msg_data *msi_data,
++			  unsigned int vector)
++{
++	memset(msi_data, 0, sizeof(struct msg_data));
++	msi_data->vector = (u8)vector;
++	msi_data->delivery_mode = MSI_DELIVERY_MODE;
++	msi_data->level = MSI_LEVEL_MODE;
++	msi_data->trigger = MSI_TRIGGER_MODE;
++}
++
++static void msi_address_init(struct msg_address *msi_address)
++{
++	unsigned int	dest_id;
++
++	memset(msi_address, 0, sizeof(struct msg_address));
++	msi_address->hi_address = (u32)0;
++	dest_id = (MSI_ADDRESS_HEADER << MSI_ADDRESS_HEADER_SHIFT) |
++		 (MSI_TARGET_CPU << MSI_TARGET_CPU_SHIFT);
++	msi_address->lo_address.u.dest_mode = MSI_LOGICAL_MODE;
++	msi_address->lo_address.u.redirection_hint = MSI_REDIRECTION_HINT_MODE;
++	msi_address->lo_address.u.dest_id = dest_id;
++}
++
++static int pci_vector_resources(void)
++{
++	static int res = -EINVAL;
++	int nr_free_vectors;
++
++	if (res == -EINVAL) {
++		int i, repeat;
++		for (i = NR_REPEATS; i > 0; i--) {
++			if ((FIRST_DEVICE_VECTOR + i * 8) > FIRST_SYSTEM_VECTOR)
++				continue;
++			break;
++		}
++		i++;
++		repeat = (FIRST_SYSTEM_VECTOR - FIRST_DEVICE_VECTOR)/i;
++		res = i * repeat - NR_RESERVED_VECTORS + 1;
++	}
++
++	nr_free_vectors = res + nr_released_vectors - nr_alloc_vectors;
++
++	return nr_free_vectors;
++}
++
++int assign_irq_vector(int irq)
++{
++	static int current_vector = FIRST_DEVICE_VECTOR, offset = 0;
++
++	if (irq != MSI_AUTO && IO_APIC_VECTOR(irq) > 0)
++		return IO_APIC_VECTOR(irq);
++next:
++	current_vector += 8;
++	if (current_vector == SYSCALL_VECTOR)
++		goto next;
++
++	if (current_vector > FIRST_SYSTEM_VECTOR) {
++		offset++;
++		current_vector = FIRST_DEVICE_VECTOR + offset;
++	}
++
++	if (current_vector == FIRST_SYSTEM_VECTOR)
++		return -ENOSPC;
++
++	vector_irq[current_vector] = irq;
++	if (irq != MSI_AUTO)
++		IO_APIC_VECTOR(irq) = current_vector;
++
++	nr_alloc_vectors++;
++
++	return current_vector;
++}
++
++static int assign_msi_vector(void)
++{
++	static int new_vector_avail = 1;
++	int vector;
++	unsigned long flags;
++
++	/*
++	 * msi_lock is provided to ensure that successful allocation of MSI
++	 * vector is assigned unique among drivers.
++	 */
++	spin_lock_irqsave(&msi_lock, flags);
++	if (!(pci_vector_resources() > 0)) {
++		spin_unlock_irqrestore(&msi_lock, flags);
++		return -EBUSY;
++	}
++
++	if (!new_vector_avail) {
++		/*
++	 	 * vector_irq[] = -1 indicates that this specific vector is:
++	 	 * - assigned for MSI (since MSI have no associated IRQ) or
++	 	 * - assigned for legacy if less than 16, or
++	 	 * - having no corresponding 1:1 vector-to-IOxAPIC IRQ mapping
++	 	 * vector_irq[] = 0 indicates that this vector, previously
++		 * assigned for MSI, is freed by hotplug removed operations.
++		 * This vector will be reused for any subsequent hotplug added
++		 * operations.
++	 	 * vector_irq[] > 0 indicates that this vector is assigned for
++		 * IOxAPIC IRQs. This vector and its value provides a 1-to-1
++		 * vector-to-IOxAPIC IRQ mapping.
++	 	 */
++		for (vector = FIRST_DEVICE_VECTOR; vector < NR_IRQS; vector++) {
++			if (vector_irq[vector] != 0)
++				continue;
++			vector_irq[vector] = -1;
++			nr_released_vectors--;
++			spin_unlock_irqrestore(&msi_lock, flags);
++			return vector;
++		}
++		spin_unlock_irqrestore(&msi_lock, flags);
++		return -EBUSY;
++	}
++
++	vector = assign_irq_vector(MSI_AUTO);
++	if (vector  == (FIRST_SYSTEM_VECTOR - 8))
++		new_vector_avail = 0;
++
++	spin_unlock_irqrestore(&msi_lock, flags);
++	return vector;
++}
++
++static int get_new_vector(void)
++{
++	int vector;
++
++	if ((vector = assign_msi_vector()) > 0)
++		set_intr_gate(vector, interrupt[vector]);
++
++	return vector;
++}
++
++static int msi_init(void)
++{
++	static int status = -ENOMEM;
++
++	if (!status)
++		return status;
++
++	if ((status = msi_cache_init()) < 0) {
++		pci_msi_enable = 0;
++		printk(KERN_INFO "WARNING: MSI INIT FAILURE\n");
++		return status;
++	}
++	printk(KERN_INFO "MSI INIT SUCCESS\n");
++
++	return status;
++}
++
++static int get_msi_vector(struct pci_dev *dev)
++{
++	return get_new_vector();
++}
++
++static struct msi_desc* alloc_msi_entry(void)
++{
++	struct msi_desc *entry;
++
++	entry = (struct msi_desc*) kmem_cache_alloc(msi_cachep, SLAB_KERNEL);
++	if (!entry)
++		return NULL;
++
++	memset(entry, 0, sizeof(struct msi_desc));
++	entry->link.tail = entry->link.head = 0;	/* single message */
++	entry->dev = NULL;
++
++	return entry;
++}
++
++static void attach_msi_entry(struct msi_desc *entry, int vector)
++{
++	unsigned long flags;
++
++	spin_lock_irqsave(&msi_lock, flags);
++	msi_desc[vector] = entry;
++	spin_unlock_irqrestore(&msi_lock, flags);
++}
++
++static void irq_handler_init(int cap_id, int pos, int mask)
++{
++	spin_lock(&irq_desc[pos].lock);
++	if (cap_id == PCI_CAP_ID_MSIX)
++		irq_desc[pos].handler = &msix_irq_type;
++	else {
++		if (!mask)
++			irq_desc[pos].handler = &msi_irq_wo_maskbit_type;
++		else
++			irq_desc[pos].handler = &msi_irq_w_maskbit_type;
++	}
++	spin_unlock(&irq_desc[pos].lock);
++}
++
++static void enable_msi_mode(struct pci_dev *dev, int pos, int type)
++{
++	u32 control;
++
++	dev->bus->ops->read(dev->bus, dev->devfn,
++		msi_control_reg(pos), 2, &control);
++	if (type == PCI_CAP_ID_MSI) {
++		/* Set enabled bits to single MSI & enable MSI_enable bit */
++		msi_enable(control, 1);
++	        dev->bus->ops->write(dev->bus, dev->devfn,
++			msi_control_reg(pos), 2, control);
++	} else {
++		msix_enable(control);
++	        dev->bus->ops->write(dev->bus, dev->devfn,
++			msi_control_reg(pos), 2, control);
++	}
++    	if (pci_find_capability(dev, PCI_CAP_ID_EXP)) {
++		/* PCI Express Endpoint device detected */
++		u32 cmd;
++	        dev->bus->ops->read(dev->bus, dev->devfn, PCI_COMMAND, 2, &cmd);
++		cmd |= PCI_COMMAND_INTX_DISABLE;
++	        dev->bus->ops->write(dev->bus, dev->devfn, PCI_COMMAND, 2, cmd);
++	}
++}
++
++static void disable_msi_mode(struct pci_dev *dev, int pos, int type)
++{
++	u32 control;
++
++	dev->bus->ops->read(dev->bus, dev->devfn,
++		msi_control_reg(pos), 2, &control);
++	if (type == PCI_CAP_ID_MSI) {
++		/* Set enabled bits to single MSI & enable MSI_enable bit */
++		msi_disable(control);
++	        dev->bus->ops->write(dev->bus, dev->devfn,
++			msi_control_reg(pos), 2, control);
++	} else {
++		msix_disable(control);
++	        dev->bus->ops->write(dev->bus, dev->devfn,
++			msi_control_reg(pos), 2, control);
++	}
++    	if (pci_find_capability(dev, PCI_CAP_ID_EXP)) {
++		/* PCI Express Endpoint device detected */
++		u32 cmd;
++	        dev->bus->ops->read(dev->bus, dev->devfn, PCI_COMMAND, 2, &cmd);
++		cmd &= ~PCI_COMMAND_INTX_DISABLE;
++	        dev->bus->ops->write(dev->bus, dev->devfn, PCI_COMMAND, 2, cmd);
++	}
++}
++
++static int msi_lookup_vector(struct pci_dev *dev)
++{
++	int vector;
++	unsigned long flags;
++
++	spin_lock_irqsave(&msi_lock, flags);
++	for (vector = FIRST_DEVICE_VECTOR; vector < NR_IRQS; vector++) {
++		if (!msi_desc[vector] || msi_desc[vector]->dev != dev ||
++			msi_desc[vector]->msi_attrib.entry_nr ||
++			msi_desc[vector]->msi_attrib.default_vector != dev->irq)
++			continue;	/* not entry 0, skip */
++		spin_unlock_irqrestore(&msi_lock, flags);
++		/* This pre-assigned entry-0 MSI vector for this device
++		   already exits. Override dev->irq with this vector */
++		dev->irq = vector;
++		return 0;
++	}
++	spin_unlock_irqrestore(&msi_lock, flags);
++
++	return -EACCES;
++}
++
++void pci_scan_msi_device(struct pci_dev *dev)
++{
++	if (!dev)
++		return;
++
++   	if (pci_find_capability(dev, PCI_CAP_ID_MSIX) > 0) {
++		nr_reserved_vectors++;
++		nr_msix_devices++;
++	} else if (pci_find_capability(dev, PCI_CAP_ID_MSI) > 0)
++		nr_reserved_vectors++;
++}
++
++/**
++ * msi_capability_init - configure device's MSI capability structure
++ * @dev: pointer to the pci_dev data structure of MSI device function
++ *
++ * Setup the MSI capability structure of device funtion with a single
++ * MSI vector, regardless of device function is capable of handling
++ * multiple messages. A return of zero indicates the successful setup
++ * of an entry zero with the new MSI vector or non-zero for otherwise.
++ **/
++static int msi_capability_init(struct pci_dev *dev)
++{
++	struct msi_desc *entry;
++	struct msg_address address;
++	struct msg_data data;
++	int pos, vector;
++	u32 control;
++
++   	pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
++	if (!pos)
++		return -EINVAL;
++
++	dev->bus->ops->read(dev->bus, dev->devfn, msi_control_reg(pos),
++		2, &control);
++	if (control & PCI_MSI_FLAGS_ENABLE)
++		return 0;
++
++	if (!msi_lookup_vector(dev)) {
++		/* Lookup Sucess */
++		enable_msi_mode(dev, pos, PCI_CAP_ID_MSI);
++		return 0;
++	}
++	/* MSI Entry Initialization */
++	if (!(entry = alloc_msi_entry()))
++		return -ENOMEM;
++
++	if ((vector = get_msi_vector(dev)) < 0) {
++		kmem_cache_free(msi_cachep, entry);
++		return -EBUSY;
++	}
++	entry->msi_attrib.type = PCI_CAP_ID_MSI;
++	entry->msi_attrib.entry_nr = 0;
++	entry->msi_attrib.maskbit = is_mask_bit_support(control);
++	entry->msi_attrib.default_vector = dev->irq;
++	dev->irq = vector;	/* save default pre-assigned ioapic vector */
++	entry->dev = dev;
++	if (is_mask_bit_support(control)) {
++		entry->mask_base = msi_mask_bits_reg(pos,
++				is_64bit_address(control));
++	}
++	/* Replace with MSI handler */
++	irq_handler_init(PCI_CAP_ID_MSI, vector, entry->msi_attrib.maskbit);
++	/* Configure MSI capability structure */
++	msi_address_init(&address);
++	msi_data_init(&data, vector);
++	entry->msi_attrib.current_cpu = ((address.lo_address.u.dest_id >>
++				MSI_TARGET_CPU_SHIFT) & MSI_TARGET_CPU_MASK);
++	dev->bus->ops->write(dev->bus, dev->devfn, msi_lower_address_reg(pos),
++				4, address.lo_address.value);
++	if (is_64bit_address(control)) {
++		dev->bus->ops->write(dev->bus, dev->devfn,
++			msi_upper_address_reg(pos), 4, address.hi_address);
++		dev->bus->ops->write(dev->bus, dev->devfn,
++			msi_data_reg(pos, 1), 2, *((u32*)&data));
++	} else
++		dev->bus->ops->write(dev->bus, dev->devfn,
++			msi_data_reg(pos, 0), 2, *((u32*)&data));
++	if (entry->msi_attrib.maskbit) {
++		unsigned int maskbits, temp;
++		/* All MSIs are unmasked by default, Mask them all */
++	        dev->bus->ops->read(dev->bus, dev->devfn,
++			msi_mask_bits_reg(pos, is_64bit_address(control)), 4,
++			&maskbits);
++		temp = (1 << multi_msi_capable(control));
++		temp = ((temp - 1) & ~temp);
++		maskbits |= temp;
++		dev->bus->ops->write(dev->bus, dev->devfn,
++			msi_mask_bits_reg(pos, is_64bit_address(control)), 4,
++			maskbits);
++	}
++	attach_msi_entry(entry, vector);
++	/* Set MSI enabled bits	 */
++	enable_msi_mode(dev, pos, PCI_CAP_ID_MSI);
++
++	return 0;
++}
++
++/**
++ * msix_capability_init - configure device's MSI-X capability
++ * @dev: pointer to the pci_dev data structure of MSI-X device function
++ *
++ * Setup the MSI-X capability structure of device funtion with a
++ * single MSI-X vector. A return of zero indicates the successful setup
++ * of an entry zero with the new MSI-X vector or non-zero for otherwise.
++ * To request for additional MSI-X vectors, the device drivers are
++ * required to utilize the following supported APIs:
++ * 1) msi_alloc_vectors(...) for requesting one or more MSI-X vectors
++ * 2) msi_free_vectors(...) for releasing one or more MSI-X vectors
++ *    back to PCI subsystem before calling free_irq(...)
++ **/
++static int msix_capability_init(struct pci_dev	*dev)
++{
++	struct msi_desc *entry;
++	struct msg_address address;
++	struct msg_data data;
++	int vector = 0, pos, dev_msi_cap;
++	u32 phys_addr, table_offset;
++	u32 control;
++	u8 bir;
++	void *base;
++
++   	pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);
++	if (!pos)
++		return -EINVAL;
++
++	/* Request & Map MSI-X table region */
++	dev->bus->ops->read(dev->bus, dev->devfn, msi_control_reg(pos), 2,
++		&control);
++	if (control & PCI_MSIX_FLAGS_ENABLE)
++		return 0;
++
++	if (!msi_lookup_vector(dev)) {
++		/* Lookup Sucess */
++		enable_msi_mode(dev, pos, PCI_CAP_ID_MSIX);
++		return 0;
++	}
++
++	dev_msi_cap = multi_msix_capable(control);
++	dev->bus->ops->read(dev->bus, dev->devfn,
++		msix_table_offset_reg(pos), 4, &table_offset);
++	bir = (u8)(table_offset & PCI_MSIX_FLAGS_BIRMASK);
++	phys_addr = pci_resource_start (dev, bir);
++	phys_addr += (u32)(table_offset & ~PCI_MSIX_FLAGS_BIRMASK);
++	if (!request_mem_region(phys_addr,
++		dev_msi_cap * PCI_MSIX_ENTRY_SIZE,
++		"MSI-X iomap Failure"))
++		return -ENOMEM;
++	base = ioremap_nocache(phys_addr, dev_msi_cap * PCI_MSIX_ENTRY_SIZE);
++	if (base == NULL)
++		goto free_region;
++	/* MSI Entry Initialization */
++	entry = alloc_msi_entry();
++	if (!entry)
++		goto free_iomap;
++	if ((vector = get_msi_vector(dev)) < 0)
++		goto free_entry;
++
++	entry->msi_attrib.type = PCI_CAP_ID_MSIX;
++	entry->msi_attrib.entry_nr = 0;
++	entry->msi_attrib.maskbit = 1;
++	entry->msi_attrib.default_vector = dev->irq;
++	dev->irq = vector;	/* save default pre-assigned ioapic vector */
++	entry->dev = dev;
++	entry->mask_base = (unsigned long)base;
++	/* Replace with MSI handler */
++	irq_handler_init(PCI_CAP_ID_MSIX, vector, 1);
++	/* Configure MSI-X capability structure */
++	msi_address_init(&address);
++	msi_data_init(&data, vector);
++	entry->msi_attrib.current_cpu = ((address.lo_address.u.dest_id >>
++				MSI_TARGET_CPU_SHIFT) & MSI_TARGET_CPU_MASK);
++	writel(address.lo_address.value, base + PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET);
++	writel(address.hi_address, base + PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET);
++	writel(*(u32*)&data, base + PCI_MSIX_ENTRY_DATA_OFFSET);
++	/* Initialize all entries from 1 up to 0 */
++	for (pos = 1; pos < dev_msi_cap; pos++) {
++		writel(0, base + pos * PCI_MSIX_ENTRY_SIZE +
++			PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET);
++		writel(0, base + pos * PCI_MSIX_ENTRY_SIZE +
++			PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET);
++		writel(0, base + pos * PCI_MSIX_ENTRY_SIZE +
++			PCI_MSIX_ENTRY_DATA_OFFSET);
++	}
++	attach_msi_entry(entry, vector);
++	/* Set MSI enabled bits	 */
++	enable_msi_mode(dev, pos, PCI_CAP_ID_MSIX);
++
++	return 0;
++
++free_entry:
++	kmem_cache_free(msi_cachep, entry);
++free_iomap:
++	iounmap(base);
++free_region:
++	release_mem_region(phys_addr, dev_msi_cap * PCI_MSIX_ENTRY_SIZE);
++
++	return ((vector < 0) ? -EBUSY : -ENOMEM);
++}
++
++/**
++ * pci_enable_msi - configure device's MSI(X) capability structure
++ * @dev: pointer to the pci_dev data structure of MSI(X) device function
++ *
++ * Setup the MSI/MSI-X capability structure of device function with
++ * a single MSI(X) vector upon its software driver call to request for
++ * MSI(X) mode enabled on its hardware device function. A return of zero
++ * indicates the successful setup of an entry zero with the new MSI(X)
++ * vector or non-zero for otherwise.
++ **/
++int pci_enable_msi(struct pci_dev* dev)
++{
++	int status = -EINVAL;
++
++	if (!pci_msi_enable || !dev)
++ 		return status;
++
++	if (msi_init() < 0)
++		return -ENOMEM;
++
++	if ((status = msix_capability_init(dev)) == -EINVAL)
++		status = msi_capability_init(dev);
++	if (!status)
++		nr_reserved_vectors--;
++
++	return status;
++}
++
++static int msi_free_vector(struct pci_dev* dev, int vector);
++static void pci_disable_msi(unsigned int vector)
++{
++	int head, tail, type, default_vector;
++	struct msi_desc *entry;
++	struct pci_dev *dev;
++	unsigned long flags;
++
++	spin_lock_irqsave(&msi_lock, flags);
++	entry = msi_desc[vector];
++	if (!entry || !entry->dev) {
++		spin_unlock_irqrestore(&msi_lock, flags);
++		return;
++	}
++	dev = entry->dev;
++	type = entry->msi_attrib.type;
++	head = entry->link.head;
++	tail = entry->link.tail;
++	default_vector = entry->msi_attrib.default_vector;
++	spin_unlock_irqrestore(&msi_lock, flags);
++
++	disable_msi_mode(dev, pci_find_capability(dev, type), type);
++	/* Restore dev->irq to its default pin-assertion vector */
++	dev->irq = default_vector;
++	if (type == PCI_CAP_ID_MSIX && head != tail) {
++		/* Bad driver, which do not call msi_free_vectors before exit.
++		   We must do a cleanup here */
++		while (1) {
++			spin_lock_irqsave(&msi_lock, flags);
++			entry = msi_desc[vector];
++			head = entry->link.head;
++			tail = entry->link.tail;
++			spin_unlock_irqrestore(&msi_lock, flags);
++			if (tail == head)
++				break;
++			if (msi_free_vector(dev, entry->link.tail))
++				break;
++		}
++	}
++}
++
++static int msi_alloc_vector(struct pci_dev* dev, int head)
++{
++	struct msi_desc *entry;
++	struct msg_address address;
++	struct msg_data data;
++	int i, offset, pos, dev_msi_cap, vector;
++	u32 low_address, control;
++	unsigned long base = 0L;
++	unsigned long flags;
++
++	spin_lock_irqsave(&msi_lock, flags);
++	entry = msi_desc[dev->irq];
++	if (!entry) {
++		spin_unlock_irqrestore(&msi_lock, flags);
++		return -EINVAL;
++	}
++	base = entry->mask_base;
++	spin_unlock_irqrestore(&msi_lock, flags);
++
++   	pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);
++	dev->bus->ops->read(dev->bus, dev->devfn, msi_control_reg(pos),
++		2, &control);
++	dev_msi_cap = multi_msix_capable(control);
++	for (i = 1; i < dev_msi_cap; i++) {
++		if (!(low_address = readl(base + i * PCI_MSIX_ENTRY_SIZE)))
++			 break;
++	}
++	if (i >= dev_msi_cap)
++		return -EINVAL;
++
++	/* MSI Entry Initialization */
++	if (!(entry = alloc_msi_entry()))
++		return -ENOMEM;
++
++	if ((vector = get_new_vector()) < 0) {
++		kmem_cache_free(msi_cachep, entry);
++		return vector;
++	}
++	entry->msi_attrib.type = PCI_CAP_ID_MSIX;
++	entry->msi_attrib.entry_nr = i;
++	entry->msi_attrib.maskbit = 1;
++	entry->dev = dev;
++	entry->link.head = head;
++	entry->mask_base = base;
++	irq_handler_init(PCI_CAP_ID_MSIX, vector, 1);
++	/* Configure MSI-X capability structure */
++	msi_address_init(&address);
++	msi_data_init(&data, vector);
++	entry->msi_attrib.current_cpu = ((address.lo_address.u.dest_id >>
++				MSI_TARGET_CPU_SHIFT) & MSI_TARGET_CPU_MASK);
++	offset = entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE;
++	writel(address.lo_address.value, base + offset +
++		PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET);
++	writel(address.hi_address, base + offset +
++		PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET);
++	writel(*(u32*)&data, base + offset + PCI_MSIX_ENTRY_DATA_OFFSET);
++	writel(1, base + offset + PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET);
++	attach_msi_entry(entry, vector);
++
++	return vector;
++}
++
++static int msi_free_vector(struct pci_dev* dev, int vector)
++{
++	struct msi_desc *entry;
++	int entry_nr, type;
++	unsigned long base = 0L;
++	unsigned long flags;
++
++	spin_lock_irqsave(&msi_lock, flags);
++	entry = msi_desc[vector];
++	if (!entry || entry->dev != dev) {
++		spin_unlock_irqrestore(&msi_lock, flags);
++		return -EINVAL;
++	}
++	type = entry->msi_attrib.type;
++	entry_nr = entry->msi_attrib.entry_nr;
++	base = entry->mask_base;
++	if (entry->link.tail != entry->link.head) {
++		msi_desc[entry->link.head]->link.tail = entry->link.tail;
++		if (entry->link.tail)
++			msi_desc[entry->link.tail]->link.head = entry->link.head;
++	}
++	entry->dev = NULL;
++	vector_irq[vector] = 0;
++	nr_released_vectors++;
++	msi_desc[vector] = NULL;
++	spin_unlock_irqrestore(&msi_lock, flags);
++
++	kmem_cache_free(msi_cachep, entry);
++	if (type == PCI_CAP_ID_MSIX) {
++		int offset;
++
++		offset = entry_nr * PCI_MSIX_ENTRY_SIZE;
++		writel(1, base + offset + PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET);
++		writel(0, base + offset + PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET);
++	}
++
++	return 0;
++}
++
++/**
++ * msi_alloc_vectors - allocate additional MSI-X vectors
++ * @dev: pointer to the pci_dev data structure of MSI-X device function
++ * @vector: pointer to an array of new allocated MSI-X vectors
++ * @nvec: number of MSI-X vectors requested for allocation by device driver
++ *
++ * Allocate additional MSI-X vectors requested by device driver. A
++ * return of zero indicates the successful setup of MSI-X capability
++ * structure with new allocated MSI-X vectors or non-zero for otherwise.
++ **/
++int msi_alloc_vectors(struct pci_dev* dev, int *vector, int nvec)
++{
++	struct msi_desc *entry;
++	int i, head, pos, vec, free_vectors, alloc_vectors;
++	int *vectors = (int *)vector;
++	u32 control;
++	unsigned long flags;
++
++	if (!pci_msi_enable || !dev)
++ 		return -EINVAL;
++
++   	if (!(pos = pci_find_capability(dev, PCI_CAP_ID_MSIX)))
++ 		return -EINVAL;
++
++	dev->bus->ops->read(dev->bus, dev->devfn, msi_control_reg(pos), 			2, &control);
++	if (nvec > multi_msix_capable(control))
++		return -EINVAL;
++
++	spin_lock_irqsave(&msi_lock, flags);
++	entry = msi_desc[dev->irq];
++	if (!entry || entry->dev != dev ||		/* legal call */
++	   entry->msi_attrib.type != PCI_CAP_ID_MSIX || /* must be MSI-X */
++	   entry->link.head != entry->link.tail) {	/* already multi */
++		spin_unlock_irqrestore(&msi_lock, flags);
++		return -EINVAL;
++	}
++	/*
++	 * msi_lock is provided to ensure that enough vectors resources are
++	 * available before granting.
++	 */
++	free_vectors = pci_vector_resources();
++	/* Ensure that each MSI/MSI-X device has one vector reserved by
++	   default to avoid any MSI-X driver to take all available
++ 	   resources */
++	free_vectors -= nr_reserved_vectors;
++	/* Find the average of free vectors among MSI-X devices */
++	if (nr_msix_devices > 0)
++		free_vectors /= nr_msix_devices;
++	spin_unlock_irqrestore(&msi_lock, flags);
++
++	if (nvec > free_vectors)
++		return -EBUSY;
++
++	alloc_vectors = 0;
++	head = dev->irq;
++	for (i = 0; i < nvec; i++) {
++		if ((vec = msi_alloc_vector(dev, head)) < 0)
++			break;
++		*(vectors + i) = vec;
++		head = vec;
++		alloc_vectors++;
++	}
++	if (alloc_vectors != nvec) {
++		for (i = 0; i < alloc_vectors; i++) {
++			vec = *(vectors + i);
++			msi_free_vector(dev, vec);
++		}
++		spin_lock_irqsave(&msi_lock, flags);
++		msi_desc[dev->irq]->link.tail = msi_desc[dev->irq]->link.head;
++		spin_unlock_irqrestore(&msi_lock, flags);
++		return -EBUSY;
++	}
++	if (nr_msix_devices > 0)
++		nr_msix_devices--;
++
++	return 0;
++}
++
++/**
++ * msi_free_vectors - reclaim MSI-X vectors to unused state
++ * @dev: pointer to the pci_dev data structure of MSI-X device function
++ * @vector: pointer to an array of released MSI-X vectors
++ * @nvec: number of MSI-X vectors requested for release by device driver
++ *
++ * Reclaim MSI-X vectors released by device driver to unused state,
++ * which may be used later on. A return of zero indicates the
++ * success or non-zero for otherwise. Device driver should call this
++ * before calling function free_irq.
++ **/
++int msi_free_vectors(struct pci_dev* dev, int *vector, int nvec)
++{
++	struct msi_desc *entry;
++	int i;
++	unsigned long flags;
++
++	if (!pci_msi_enable)
++ 		return -EINVAL;
++
++	spin_lock_irqsave(&msi_lock, flags);
++	entry = msi_desc[dev->irq];
++	if (!entry || entry->dev != dev ||
++	   	entry->msi_attrib.type != PCI_CAP_ID_MSIX ||
++		entry->link.head == entry->link.tail) {	/* Nothing to free */
++		spin_unlock_irqrestore(&msi_lock, flags);
++		return -EINVAL;
++	}
++	spin_unlock_irqrestore(&msi_lock, flags);
++
++	for (i = 0; i < nvec; i++) {
++		if (*(vector + i) == dev->irq)
++			continue;/* Don't free entry 0 if mistaken by driver */
++		msi_free_vector(dev, *(vector + i));
++	}
++
++	return 0;
++}
++
++/**
++ * msi_remove_pci_irq_vectors - reclaim MSI(X) vectors to unused state
++ * @dev: pointer to the pci_dev data structure of MSI(X) device function
++ *
++ * Being called during hotplug remove, from which the device funciton
++ * is hot-removed. All previous assigned MSI/MSI-X vectors, if
++ * allocated for this device function, are reclaimed to unused state,
++ * which may be used later on.
++ **/
++void msi_remove_pci_irq_vectors(struct pci_dev* dev)
++{
++	struct msi_desc *entry;
++	int type, temp;
++	unsigned long flags;
++
++	if (!pci_msi_enable || !dev)
++ 		return;
++
++   	if (!pci_find_capability(dev, PCI_CAP_ID_MSI)) {
++   		if (!pci_find_capability(dev, PCI_CAP_ID_MSIX))
++			return;
++	}
++	temp = dev->irq;
++	if (msi_lookup_vector(dev))
++		return;
++
++	spin_lock_irqsave(&msi_lock, flags);
++	entry = msi_desc[dev->irq];
++	if (!entry || entry->dev != dev) {
++		spin_unlock_irqrestore(&msi_lock, flags);
++		return;
++	}
++	type = entry->msi_attrib.type;
++	spin_unlock_irqrestore(&msi_lock, flags);
++
++	msi_free_vector(dev, dev->irq);
++	if (type == PCI_CAP_ID_MSIX) {
++		int i, pos, dev_msi_cap;
++		u32 phys_addr, table_offset;
++		u32 control;
++		u8 bir;
++
++   		pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);
++		dev->bus->ops->read(dev->bus, dev->devfn, msi_control_reg(pos), 			2, &control);
++		dev_msi_cap = multi_msix_capable(control);
++		dev->bus->ops->read(dev->bus, dev->devfn,
++			msix_table_offset_reg(pos), 4, &table_offset);
++		bir = (u8)(table_offset & PCI_MSIX_FLAGS_BIRMASK);
++		phys_addr = pci_resource_start (dev, bir);
++		phys_addr += (u32)(table_offset & ~PCI_MSIX_FLAGS_BIRMASK);
++		for (i = FIRST_DEVICE_VECTOR; i < NR_IRQS; i++) {
++			spin_lock_irqsave(&msi_lock, flags);
++			if (!msi_desc[i] || msi_desc[i]->dev != dev) {
++				spin_unlock_irqrestore(&msi_lock, flags);
++				continue;
++			}
++			spin_unlock_irqrestore(&msi_lock, flags);
++			msi_free_vector(dev, i);
++		}
++		writel(1, entry->mask_base + PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET);
++		iounmap((void*)entry->mask_base);
++		release_mem_region(phys_addr, dev_msi_cap * PCI_MSIX_ENTRY_SIZE);
++	}
++	dev->irq = temp;
++	nr_reserved_vectors++;
++}
++
++EXPORT_SYMBOL(pci_enable_msi);
++EXPORT_SYMBOL(msi_alloc_vectors);
++EXPORT_SYMBOL(msi_free_vectors);
+--- linux-2.6.0/drivers/pci/pci.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/pci/pci.c	2003-12-28 23:21:47.000000000 -0800
+@@ -223,6 +223,8 @@ pci_set_power_state(struct pci_dev *dev,
+ 	int pm;
+ 	u16 pmcsr;
+ 
++	might_sleep();
++
+ 	/* bound the state we're entering */
+ 	if (state > 3) state = 3;
+ 
+--- linux-2.6.0/drivers/pci/pci.ids	2003-09-08 13:58:58.000000000 -0700
++++ 25/drivers/pci/pci.ids	2003-12-28 23:21:01.000000000 -0800
+@@ -3247,8 +3247,6 @@
+ 		1148 5061  SK-9861 V2.0 Gigabit Ethernet 1000Base-SX Adapter
+ 		1148 5071  SK-9871 V2.0 Gigabit Ethernet 1000Base-ZX Adapter
+ 		1148 9521  SK-9521 10/100/1000Base-T Adapter
+-	4400 SK-9Dxx Gigabit Ethernet Adapter
+-	4500 SK-9Mxx Gigabit Ethernet Adapter
+ 1149  Win System Corporation
+ 114a  VMIC
+ 	5579  VMIPCI-5579 (Reflective Memory Card)
+@@ -3540,7 +3538,22 @@
+ 11ab  Galileo Technology Ltd.
+ 	0146  GT-64010/64010A System Controller
+ 	4320  Gigabit Ethernet Adapter
+-		11ab 9521  Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Adapter
++		1019 0f38  Marvell 88E8001 Gigabit LOM Ethernet Adapter (ECS)
++		1019 8001  Marvell 88E8001 Gigabit LOM Ethernet Adapter (ECS)
++		1043 173c  Marvell 88E8001 Gigabit LOM Ethernet Adapter (Asus)
++		1043 811a  Marvell 88E8001 Gigabit LOM Ethernet Adapter (Asus)
++		105b 0c19  Marvell 88E8001 Gigabit LOM Ethernet Adapter (Foxconn)
++		10b8 b452  SMC EZ Card 1000 (SMC9452TXV.2)
++		11ab 0121  Marvell RDK-8001 Adapter
++		11ab 0321  Marvell RDK-8003 Adapter
++		11ab 1021  Marvell RDK-8010 Adapter
++		11ab 5021  Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Adapter (64 bit)
++		11ab 9521  Marvell Yukon Gigabit Ethernet 10/100/1000Base-T Adapter (32 bit)
++		1458 e000  Marvell 88E8001 Gigabit LOM Ethernet Adapter (Gigabyte)
++		147b 1406  Marvell 88E8001 Gigabit LOM Ethernet Adapter (Abit)
++		15d4 0047  Marvell 88E8001 Gigabit LOM Ethernet Adapter (Iwill)
++		1695 9025  Marvell 88E8001 Gigabit LOM Ethernet Adapter (Epox)
++		17f2 1c03  Marvell 88E8001 Gigabit LOM Ethernet Adapter (Albatron)
+ 	4611  GT-64115 System Controller
+ 	4620  GT-64120/64120A/64121A System Controller
+ 	4801  GT-48001
+@@ -3803,8 +3816,6 @@
+ 	0802  Rocketport UPCI 8 port w/external I/F
+ 	0803  Rocketport UPCI 16 port w/external I/F
+ 	0805  Rocketport UPCI 8 port w/octa cable
+-	080C  RocketModem III 8 port
+-	080D  RocketModem III 4 port
+ 	0903  Rocketport Compact PCI 16 port w/external I/F
+ 11ff  Scion Corporation
+ 1200  CSS Corporation
+@@ -5312,11 +5323,13 @@
+ 		10b7 2000  3C998-T Dual Port 10/100/1000 PCI-X
+ 		10b7 3000  3C999-T Quad Port 10/100/1000 PCI-X
+ 		1166 1648  NetXtreme CIOB-E 1000Base-T
++	1649  NetXtreme BCM5704S Gigabit Ethernet
+ 	164d  NetXtreme BCM5702FE Gigabit Ethernet
+ 	1653  NetXtreme BCM5705 Gigabit Ethernet
+ 	1654  NetXtreme BCM5705 Gigabit Ethernet
+ 	165d  NetXtreme BCM5705M Gigabit Ethernet
+ 	165e  NetXtreme BCM5705M Gigabit Ethernet
++	166e  NetXtreme BCM5705F Gigabit Ethernet
+ 	1696  NetXtreme BCM5782 Gigabit Ethernet
+ 		14e4 000d  NetXtreme BCM5782 1000Base-T
+ 	169c  NetXtreme BCM5788 Gigabit Ethernet
+--- linux-2.6.0/drivers/pci/probe.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/pci/probe.c	2003-12-28 23:21:44.000000000 -0800
+@@ -176,7 +176,7 @@ void __devinit pci_read_bridge_bases(str
+ 		limit |= (io_limit_hi << 16);
+ 	}
+ 
+-	if (base && base <= limit) {
++	if (base <= limit) {
+ 		res->flags = (io_base_lo & PCI_IO_RANGE_TYPE_MASK) | IORESOURCE_IO;
+ 		res->start = base;
+ 		res->end = limit + 0xfff;
+@@ -187,7 +187,7 @@ void __devinit pci_read_bridge_bases(str
+ 	pci_read_config_word(dev, PCI_MEMORY_LIMIT, &mem_limit_lo);
+ 	base = (mem_base_lo & PCI_MEMORY_RANGE_MASK) << 16;
+ 	limit = (mem_limit_lo & PCI_MEMORY_RANGE_MASK) << 16;
+-	if (base && base <= limit) {
++	if (base <= limit) {
+ 		res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM;
+ 		res->start = base;
+ 		res->end = limit + 0xfffff;
+@@ -213,7 +213,7 @@ void __devinit pci_read_bridge_bases(str
+ 		}
+ #endif
+ 	}
+-	if (base && base <= limit) {
++	if (base <= limit) {
+ 		res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM | IORESOURCE_PREFETCH;
+ 		res->start = base;
+ 		res->end = limit + 0xfffff;
+@@ -552,6 +552,7 @@ int __devinit pci_scan_slot(struct pci_b
+ 		struct pci_dev *dev;
+ 
+ 		dev = pci_scan_device(bus, devfn);
++		pci_scan_msi_device(dev);
+ 		if (func == 0) {
+ 			if (!dev)
+ 				break;
+--- linux-2.6.0/drivers/pci/proc.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/pci/proc.c	2003-12-28 23:22:13.000000000 -0800
+@@ -25,7 +25,7 @@ proc_bus_pci_lseek(struct file *file, lo
+ {
+ 	loff_t new = -1;
+ 
+-	lock_kernel();
++	down(&file->f_dentry->d_inode->i_sem);
+ 	switch (whence) {
+ 	case 0:
+ 		new = off;
+@@ -37,10 +37,12 @@ proc_bus_pci_lseek(struct file *file, lo
+ 		new = PCI_CFG_SPACE_SIZE + off;
+ 		break;
+ 	}
+-	unlock_kernel();
+ 	if (new < 0 || new > PCI_CFG_SPACE_SIZE)
+-		return -EINVAL;
+-	return (file->f_pos = new);
++		new = -EINVAL;
++	else
++		file->f_pos = new;
++	up(&file->f_dentry->d_inode->i_sem);
++	return new;
+ }
+ 
+ static ssize_t
+--- linux-2.6.0/drivers/pci/remove.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/pci/remove.c	2003-12-28 23:21:44.000000000 -0800
+@@ -14,6 +14,8 @@ static void pci_free_resources(struct pc
+ {
+ 	int i;
+ 
++ 	msi_remove_pci_irq_vectors(dev);
++
+ 	for (i = 0; i < PCI_NUM_RESOURCES; i++) {
+ 		struct resource *res = dev->resource + i;
+ 		if (res->parent)
+--- linux-2.6.0/drivers/pci/setup-res.c	2003-11-23 19:03:00.000000000 -0800
++++ 25/drivers/pci/setup-res.c	2003-12-28 23:23:02.000000000 -0800
+@@ -84,6 +84,10 @@ pci_update_resource(struct pci_dev *dev,
+ 			       pci_name(dev), resno, new, check);
+ 		}
+ 	}
++	res->flags &= ~IORESOURCE_UNSET;
++	DBGC((KERN_INFO "PCI: moved device %s resource %d (%lx) to %x\n",
++		dev->slot_name, resno, res->flags,
++		new & ~PCI_REGION_FLAG_MASK));
+ }
+ 
+ int __init
+--- linux-2.6.0/drivers/pcmcia/cistpl.c	2003-09-08 13:58:58.000000000 -0700
++++ 25/drivers/pcmcia/cistpl.c	2003-12-28 23:22:48.000000000 -0800
+@@ -341,8 +341,11 @@ void destroy_cis_cache(struct pcmcia_soc
+ int verify_cis_cache(struct pcmcia_socket *s)
+ {
+ 	struct cis_cache_entry *cis;
+-	char buf[256];
++	char *buf;
+ 
++	buf = kmalloc(256, GFP_KERNEL);
++	if (buf == NULL)
++		return -1;
+ 	list_for_each_entry(cis, &s->cis_cache, node) {
+ 		int len = cis->len;
+ 
+@@ -355,9 +358,12 @@ int verify_cis_cache(struct pcmcia_socke
+ #endif
+ 			read_cis_mem(s, cis->attr, cis->addr, len, buf);
+ 
+-		if (memcmp(buf, cis->cache, len) != 0)
++		if (memcmp(buf, cis->cache, len) != 0) {
++			kfree(buf);
+ 			return -1;
++		}
+ 	}
++	kfree(buf);
+ 	return 0;
+ }
+ 
+@@ -1404,19 +1410,24 @@ int pcmcia_parse_tuple(client_handle_t h
+ int read_tuple(client_handle_t handle, cisdata_t code, void *parse)
+ {
+     tuple_t tuple;
+-    cisdata_t buf[255];
++    cisdata_t *buf;
+     int ret;
+-    
++
++    buf = kmalloc(256, GFP_KERNEL);
++    if (buf == NULL)
++	return CS_OUT_OF_RESOURCE;
+     tuple.DesiredTuple = code;
+     tuple.Attributes = TUPLE_RETURN_COMMON;
+     ret = pcmcia_get_first_tuple(handle, &tuple);
+-    if (ret != CS_SUCCESS) return ret;
++    if (ret != CS_SUCCESS) goto done;
+     tuple.TupleData = buf;
+     tuple.TupleOffset = 0;
+-    tuple.TupleDataMax = sizeof(buf);
++    tuple.TupleDataMax = 255;
+     ret = pcmcia_get_tuple_data(handle, &tuple);
+-    if (ret != CS_SUCCESS) return ret;
++    if (ret != CS_SUCCESS) goto done;
+     ret = pcmcia_parse_tuple(handle, &tuple, parse);
++done:
++    kfree(buf);
+     return ret;
+ }
+ 
+@@ -1432,50 +1443,61 @@ int read_tuple(client_handle_t handle, c
+ 
+ int pcmcia_validate_cis(client_handle_t handle, cisinfo_t *info)
+ {
+-    tuple_t tuple;
+-    cisparse_t p;
++    tuple_t *tuple;
++    cisparse_t *p;
+     int ret, reserved, dev_ok = 0, ident_ok = 0;
+ 
+     if (CHECK_HANDLE(handle))
+ 	return CS_BAD_HANDLE;
++    tuple = kmalloc(sizeof(*tuple), GFP_KERNEL);
++    if (tuple == NULL)
++	return CS_OUT_OF_RESOURCE;
++    p = kmalloc(sizeof(*p), GFP_KERNEL);
++    if (p == NULL) {
++	kfree(tuple);
++	return CS_OUT_OF_RESOURCE;
++    }
+ 
+     info->Chains = reserved = 0;
+-    tuple.DesiredTuple = RETURN_FIRST_TUPLE;
+-    tuple.Attributes = TUPLE_RETURN_COMMON;
+-    ret = pcmcia_get_first_tuple(handle, &tuple);
++    tuple->DesiredTuple = RETURN_FIRST_TUPLE;
++    tuple->Attributes = TUPLE_RETURN_COMMON;
++    ret = pcmcia_get_first_tuple(handle, tuple);
+     if (ret != CS_SUCCESS)
+-	return CS_SUCCESS;
++	goto done;
+ 
+     /* First tuple should be DEVICE; we should really have either that
+        or a CFTABLE_ENTRY of some sort */
+-    if ((tuple.TupleCode == CISTPL_DEVICE) ||
+-	(read_tuple(handle, CISTPL_CFTABLE_ENTRY, &p) == CS_SUCCESS) ||
+-	(read_tuple(handle, CISTPL_CFTABLE_ENTRY_CB, &p) == CS_SUCCESS))
++    if ((tuple->TupleCode == CISTPL_DEVICE) ||
++	(read_tuple(handle, CISTPL_CFTABLE_ENTRY, p) == CS_SUCCESS) ||
++	(read_tuple(handle, CISTPL_CFTABLE_ENTRY_CB, p) == CS_SUCCESS))
+ 	dev_ok++;
+ 
+     /* All cards should have a MANFID tuple, and/or a VERS_1 or VERS_2
+        tuple, for card identification.  Certain old D-Link and Linksys
+        cards have only a broken VERS_2 tuple; hence the bogus test. */
+-    if ((read_tuple(handle, CISTPL_MANFID, &p) == CS_SUCCESS) ||
+-	(read_tuple(handle, CISTPL_VERS_1, &p) == CS_SUCCESS) ||
+-	(read_tuple(handle, CISTPL_VERS_2, &p) != CS_NO_MORE_ITEMS))
++    if ((read_tuple(handle, CISTPL_MANFID, p) == CS_SUCCESS) ||
++	(read_tuple(handle, CISTPL_VERS_1, p) == CS_SUCCESS) ||
++	(read_tuple(handle, CISTPL_VERS_2, p) != CS_NO_MORE_ITEMS))
+ 	ident_ok++;
+ 
+     if (!dev_ok && !ident_ok)
+-	return CS_SUCCESS;
++	goto done;
+ 
+     for (info->Chains = 1; info->Chains < MAX_TUPLES; info->Chains++) {
+-	ret = pcmcia_get_next_tuple(handle, &tuple);
++	ret = pcmcia_get_next_tuple(handle, tuple);
+ 	if (ret != CS_SUCCESS) break;
+-	if (((tuple.TupleCode > 0x23) && (tuple.TupleCode < 0x40)) ||
+-	    ((tuple.TupleCode > 0x47) && (tuple.TupleCode < 0x80)) ||
+-	    ((tuple.TupleCode > 0x90) && (tuple.TupleCode < 0xff)))
++	if (((tuple->TupleCode > 0x23) && (tuple->TupleCode < 0x40)) ||
++	    ((tuple->TupleCode > 0x47) && (tuple->TupleCode < 0x80)) ||
++	    ((tuple->TupleCode > 0x90) && (tuple->TupleCode < 0xff)))
+ 	    reserved++;
+     }
+     if ((info->Chains == MAX_TUPLES) || (reserved > 5) ||
+ 	((!dev_ok || !ident_ok) && (info->Chains > 10)))
+ 	info->Chains = 0;
+ 
++done:
++    kfree(tuple);
++    kfree(p);
+     return CS_SUCCESS;
+ }
+ 
+--- linux-2.6.0/drivers/pcmcia/cs.c	2003-10-08 15:07:09.000000000 -0700
++++ 25/drivers/pcmcia/cs.c	2003-12-28 23:22:54.000000000 -0800
+@@ -1916,7 +1916,7 @@ int pcmcia_request_irq(client_handle_t h
+ {
+     struct pcmcia_socket *s;
+     config_t *c;
+-    int ret = 0, irq = 0;
++    int ret = CS_IN_USE, irq = 0;
+     
+     if (CHECK_HANDLE(handle))
+ 	return CS_BAD_HANDLE;
+@@ -1928,13 +1928,9 @@ int pcmcia_request_irq(client_handle_t h
+ 	return CS_CONFIGURATION_LOCKED;
+     if (c->state & CONFIG_IRQ_REQ)
+ 	return CS_IN_USE;
+-    
+-    /* Short cut: if there are no ISA interrupts, then it is PCI */
+-    if (!s->irq_mask) {
+-	irq = s->pci_irq;
+-	ret = (irq) ? 0 : CS_IN_USE;
++
+ #ifdef CONFIG_PCMCIA_PROBE
+-    } else if (s->irq.AssignedIRQ != 0) {
++    if (s->irq.AssignedIRQ != 0) {
+ 	/* If the interrupt is already assigned, it must match */
+ 	irq = s->irq.AssignedIRQ;
+ 	if (req->IRQInfo1 & IRQ_INFO2_VALID) {
+@@ -1943,7 +1939,6 @@ int pcmcia_request_irq(client_handle_t h
+ 	} else
+ 	    ret = ((req->IRQInfo1&IRQ_MASK) == irq) ? 0 : CS_BAD_ARGS;
+     } else {
+-	ret = CS_IN_USE;
+ 	if (req->IRQInfo1 & IRQ_INFO2_VALID) {
+ 	    u_int try, mask = req->IRQInfo2 & s->irq_mask;
+ 	    for (try = 0; try < 2; try++) {
+@@ -1958,12 +1953,13 @@ int pcmcia_request_irq(client_handle_t h
+ 	    irq = req->IRQInfo1 & IRQ_MASK;
+ 	    ret = try_irq(req->Attributes, irq, 1);
+ 	}
+-#else
+-    } else {
+-	ret = CS_UNSUPPORTED_MODE;
++    }
+ #endif
++    if (ret != 0) {
++	if (!s->pci_irq)
++	    return ret;
++	irq = s->pci_irq;
+     }
+-    if (ret != 0) return ret;
+ 
+     if (req->Attributes & IRQ_HANDLE_PRESENT) {
+ 	if (request_irq(irq, req->Handler,
+@@ -2293,149 +2289,6 @@ int pcmcia_report_error(client_handle_t 
+     return CS_SUCCESS;
+ } /* report_error */
+ 
+-/*====================================================================*/
+-
+-int CardServices(int func, void *a1, void *a2, void *a3)
+-{
+-
+-#ifdef PCMCIA_DEBUG
+-    if (pc_debug > 2) {
+-	int i;
+-	for (i = 0; i < SERVICE_COUNT; i++)
+-	    if (service_table[i].key == func) break;
+-	if (i < SERVICE_COUNT)
+-	    printk(KERN_DEBUG "cs: CardServices(%s, 0x%p, 0x%p)\n",
+-		   service_table[i].msg, a1, a2);
+-	else
+-	    printk(KERN_DEBUG "cs: CardServices(Unknown func %d, "
+-		   "0x%p, 0x%p)\n", func, a1, a2);
+-    }
+-#endif
+-    switch (func) {
+-    case AccessConfigurationRegister:
+-	return pcmcia_access_configuration_register(a1, a2); break;
+-    case AdjustResourceInfo:
+-	return pcmcia_adjust_resource_info(a1, a2); break;
+-    case CheckEraseQueue:
+-	return pcmcia_check_erase_queue(a1); break;
+-    case CloseMemory:
+-	return pcmcia_close_memory(a1); break;
+-    case CopyMemory:
+-	return pcmcia_copy_memory(a1, a2); break;
+-    case DeregisterClient:
+-	return pcmcia_deregister_client(a1); break;
+-    case DeregisterEraseQueue:
+-	return pcmcia_deregister_erase_queue(a1); break;
+-    case GetFirstClient:
+-	return pcmcia_get_first_client(a1, a2); break;
+-    case GetCardServicesInfo:
+-	return pcmcia_get_card_services_info(a1); break;
+-    case GetConfigurationInfo:
+-	return pcmcia_get_configuration_info(a1, a2); break;
+-    case GetNextClient:
+-	return pcmcia_get_next_client(a1, a2); break;
+-    case GetFirstRegion:
+-	return pcmcia_get_first_region(a1, a2); break;
+-    case GetFirstTuple:
+-	return pcmcia_get_first_tuple(a1, a2); break;
+-    case GetNextRegion:
+-	return pcmcia_get_next_region(a1, a2); break;
+-    case GetNextTuple:
+-	return pcmcia_get_next_tuple(a1, a2); break;
+-    case GetStatus:
+-	return pcmcia_get_status(a1, a2); break;
+-    case GetTupleData:
+-	return pcmcia_get_tuple_data(a1, a2); break;
+-    case MapMemPage:
+-	return pcmcia_map_mem_page(a1, a2); break;
+-    case ModifyConfiguration:
+-	return pcmcia_modify_configuration(a1, a2); break;
+-    case ModifyWindow:
+-	return pcmcia_modify_window(a1, a2); break;
+-    case OpenMemory:
+-/*	return pcmcia_open_memory(a1, a2); */
+-    {
+-	memory_handle_t m;
+-        int ret = pcmcia_open_memory(a1, a2, &m);
+-        *(memory_handle_t *)a1 = m;
+-	return  ret;
+-    }
+-        break;
+-    case ParseTuple:
+-	return pcmcia_parse_tuple(a1, a2, a3); break;
+-    case ReadMemory:
+-	return pcmcia_read_memory(a1, a2, a3); break;
+-    case RegisterClient:
+-	return pcmcia_register_client(a1, a2); break;
+-    case RegisterEraseQueue:
+-    {
+-	eraseq_handle_t w;
+-        int ret = pcmcia_register_erase_queue(a1, a2, &w);
+-        *(eraseq_handle_t *)a1 = w;
+-	return  ret;
+-    }
+-        break;
+-/*	return pcmcia_register_erase_queue(a1, a2); break; */
+-
+-	return pcmcia_register_mtd(a1, a2); break;
+-    case ReleaseConfiguration:
+-	return pcmcia_release_configuration(a1); break;
+-    case ReleaseIO:
+-	return pcmcia_release_io(a1, a2); break;
+-    case ReleaseIRQ:
+-	return pcmcia_release_irq(a1, a2); break;
+-    case ReleaseWindow:
+-	return pcmcia_release_window(a1); break;
+-    case RequestConfiguration:
+-	return pcmcia_request_configuration(a1, a2); break;
+-    case RequestIO:
+-	return pcmcia_request_io(a1, a2); break;
+-    case RequestIRQ:
+-	return pcmcia_request_irq(a1, a2); break;
+-    case RequestWindow:
+-    {
+-	window_handle_t w;
+-        int ret = pcmcia_request_window(a1, a2, &w);
+-        *(window_handle_t *)a1 = w;
+-	return  ret;
+-    }
+-        break;
+-    case ResetCard:
+-	return pcmcia_reset_card(a1, a2); break;
+-    case SetEventMask:
+-	return pcmcia_set_event_mask(a1, a2); break;
+-    case ValidateCIS:
+-	return pcmcia_validate_cis(a1, a2); break;
+-    case WriteMemory:
+-	return pcmcia_write_memory(a1, a2, a3); break;
+-    case BindDevice:
+-	return pcmcia_bind_device(a1); break;
+-    case BindMTD:
+-	return pcmcia_bind_mtd(a1); break;
+-    case ReportError:
+-	return pcmcia_report_error(a1, a2); break;
+-    case SuspendCard:
+-	return pcmcia_suspend_card(a1, a2); break;
+-    case ResumeCard:
+-	return pcmcia_resume_card(a1, a2); break;
+-    case EjectCard:
+-	return pcmcia_eject_card(a1, a2); break;
+-    case InsertCard:
+-	return pcmcia_insert_card(a1, a2); break;
+-    case ReplaceCIS:
+-	return pcmcia_replace_cis(a1, a2); break;
+-    case GetFirstWindow:
+-	return pcmcia_get_first_window(a1, a2); break;
+-    case GetNextWindow:
+-	return pcmcia_get_next_window(a1, a2); break;
+-    case GetMemPage:
+-	return pcmcia_get_mem_page(a1, a2); break;
+-    default:
+-	return CS_UNSUPPORTED_FUNCTION; break;
+-    }
+-    
+-} /* CardServices */
+-
+ /*======================================================================
+ 
+     OS-specific module glue goes here
+@@ -2493,7 +2346,6 @@ EXPORT_SYMBOL(pcmcia_validate_cis);
+ EXPORT_SYMBOL(pcmcia_write_memory);
+ 
+ EXPORT_SYMBOL(dead_socket);
+-EXPORT_SYMBOL(CardServices);
+ EXPORT_SYMBOL(MTDHelperEntry);
+ EXPORT_SYMBOL(pcmcia_parse_events);
+ 
+--- linux-2.6.0/drivers/pcmcia/i82365.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/pcmcia/i82365.c	2003-12-28 23:22:48.000000000 -0800
+@@ -42,7 +42,6 @@
+ #include <linux/timer.h>
+ #include <linux/sched.h>
+ #include <linux/slab.h>
+-#include <linux/pci.h>
+ #include <linux/ioport.h>
+ #include <linux/delay.h>
+ #include <linux/workqueue.h>
+@@ -188,10 +187,6 @@ static struct timer_list poll_timer;
+ 
+ /*====================================================================*/
+ 
+-/* Default settings for PCI command configuration register */
+-#define CMD_DFLT (PCI_COMMAND_IO|PCI_COMMAND_MEMORY| \
+-		  PCI_COMMAND_MASTER|PCI_COMMAND_WAIT)
+-
+ /* These definitions must match the pcic table! */
+ typedef enum pcic_id {
+     IS_I82365A, IS_I82365B, IS_I82365DF,
+@@ -202,15 +197,10 @@ typedef enum pcic_id {
+ /* Flags for classifying groups of controllers */
+ #define IS_VADEM	0x0001
+ #define IS_CIRRUS	0x0002
+-#define IS_TI		0x0004
+-#define IS_O2MICRO	0x0008
+ #define IS_VIA		0x0010
+-#define IS_TOPIC	0x0020
+-#define IS_RICOH	0x0040
+ #define IS_UNKNOWN	0x0400
+ #define IS_VG_PWR	0x0800
+ #define IS_DF_PWR	0x1000
+-#define IS_PCI		0x2000
+ #define IS_ALIVE	0x8000
+ 
+ typedef struct pcic_t {
+@@ -351,26 +341,24 @@ static u_int __init cirrus_set_opts(u_sh
+     if (has_ring == -1) has_ring = 1;
+     flip(p->misc2, PD67_MC2_IRQ15_RI, has_ring);
+     flip(p->misc2, PD67_MC2_DYNAMIC_MODE, dynamic_mode);
++    flip(p->misc2, PD67_MC2_FREQ_BYPASS, freq_bypass);
+     if (p->misc2 & PD67_MC2_IRQ15_RI)
+ 	strcat(buf, " [ring]");
+     if (p->misc2 & PD67_MC2_DYNAMIC_MODE)
+ 	strcat(buf, " [dyn mode]");
++    if (p->misc2 & PD67_MC2_FREQ_BYPASS)
++	strcat(buf, " [freq bypass]");
+     if (p->misc1 & PD67_MC1_INPACK_ENA)
+ 	strcat(buf, " [inpack]");
+-    if (!(t->flags & IS_PCI)) {
+-	if (p->misc2 & PD67_MC2_IRQ15_RI)
+-	    mask &= ~0x8000;
+-	if (has_led > 0) {
+-	    strcat(buf, " [led]");
+-	    mask &= ~0x1000;
+-	}
+-	if (has_dma > 0) {
+-	    strcat(buf, " [dma]");
+-	    mask &= ~0x0600;
+-	flip(p->misc2, PD67_MC2_FREQ_BYPASS, freq_bypass);
+-	if (p->misc2 & PD67_MC2_FREQ_BYPASS)
+-	    strcat(buf, " [freq bypass]");
+-	}
++    if (p->misc2 & PD67_MC2_IRQ15_RI)
++	mask &= ~0x8000;
++    if (has_led > 0) {
++	strcat(buf, " [led]");
++	mask &= ~0x1000;
++    }
++    if (has_dma > 0) {
++	strcat(buf, " [dma]");
++	mask &= ~0x0600;
+     }
+     if (!(t->flags & IS_VIA)) {
+ 	if (setup_time >= 0)
+@@ -540,7 +528,6 @@ static u_int __init test_irq(u_short soc
+     return (irq_hits != 1);
+ }
+ 
+-
+ static u_int __init isa_scan(u_short sock, u_int mask0)
+ {
+     u_int mask1 = 0;
+@@ -585,7 +572,6 @@ static u_int __init isa_scan(u_short soc
+     return mask1;
+ }
+ 
+-
+ /*====================================================================*/
+ 
+ /* Time conversion functions */
+@@ -597,7 +583,6 @@ static int to_cycles(int ns)
+ 
+ /*====================================================================*/
+ 
+-
+ static int __init identify(u_short port, u_short sock)
+ {
+     u_char val;
+@@ -700,7 +685,7 @@ static void __init add_socket(u_short po
+ static void __init add_pcic(int ns, int type)
+ {
+     u_int mask = 0, i, base;
+-    int use_pci = 0, isa_irq = 0;
++    int isa_irq = 0;
+     struct i82365_socket *t = &socket[sockets-ns];
+ 
+     base = sockets-ns;
+@@ -721,17 +706,16 @@ static void __init add_pcic(int ns, int 
+     mask &= I365_MASK & set_bridge_opts(base, ns);
+     /* Scan for ISA interrupts */
+     mask = isa_scan(base, mask);
+-    printk(KERN_INFO "    PCI card interrupts,");
+         
+     /* Poll if only two interrupts available */
+-    if (!use_pci && !poll_interval) {
++    if (!poll_interval) {
+ 	u_int tmp = (mask & 0xff20);
+ 	tmp = tmp & (tmp-1);
+ 	if ((tmp & (tmp-1)) == 0)
+ 	    poll_interval = HZ;
+     }
+     /* Only try an ISA cs_irq if this is the first controller */
+-    if (!use_pci && !grab_irq && (cs_irq || !poll_interval)) {
++    if (!grab_irq && (cs_irq || !poll_interval)) {
+ 	/* Avoid irq 12 unless it is explicitly requested */
+ 	u_int cs_mask = mask & ((cs_irq) ? (1<<cs_irq) : ~(1<<12));
+ 	for (cs_irq = 15; cs_irq > 0; cs_irq--)
+@@ -745,7 +729,7 @@ static void __init add_pcic(int ns, int 
+ 	}
+     }
+     
+-    if (!use_pci && !isa_irq) {
++    if (!isa_irq) {
+ 	if (poll_interval == 0)
+ 	    poll_interval = HZ;
+ 	printk(" polling interval = %d ms\n",
+@@ -763,10 +747,8 @@ static void __init add_pcic(int ns, int 
+ 
+ } /* add_pcic */
+ 
+-
+ /*====================================================================*/
+ 
+-
+ #ifdef CONFIG_PNP
+ static struct isapnp_device_id id_table[] __initdata = {
+ 	{ 	ISAPNP_ANY_ID, ISAPNP_ANY_ID, ISAPNP_VENDOR('P', 'N', 'P'),
+@@ -832,7 +814,9 @@ static void __init isa_probe(void)
+ 	    }
+ 	}
+     } else {
+-	for (i = 0; i < (extra_sockets ? 8 : 4); i += 2) {
++	for (i = 0; i < 8; i += 2) {
++	    if (sockets && !extra_sockets && (i == 4))
++		break;
+ 	    port = i365_base + 2*(i>>2);
+ 	    sock = (i & 3);
+ 	    id = identify(port, sock);
+@@ -856,7 +840,6 @@ static void __init isa_probe(void)
+     }
+ }
+ 
+-
+ /*====================================================================*/
+ 
+ static irqreturn_t pcic_interrupt(int irq, void *dev,
+@@ -872,8 +855,7 @@ static irqreturn_t pcic_interrupt(int ir
+     for (j = 0; j < 20; j++) {
+ 	active = 0;
+ 	for (i = 0; i < sockets; i++) {
+-	    if ((socket[i].cs_irq != irq) &&
+-		(socket[i].socket.pci_irq != irq))
++	    if (socket[i].cs_irq != irq)
+ 		continue;
+ 	    handled = 1;
+ 	    ISA_LOCK(i, flags);
+@@ -911,7 +893,6 @@ static irqreturn_t pcic_interrupt(int ir
+ static void pcic_interrupt_wrapper(u_long data)
+ {
+     pcic_interrupt(0, NULL, NULL);
+-    init_timer(&poll_timer);
+     poll_timer.expires = jiffies + poll_interval;
+     add_timer(&poll_timer);
+ }
+@@ -1039,7 +1020,7 @@ static int i365_set_socket(u_short sock,
+     
+     /* IO card, RESET flag, IO interrupt */
+     reg = t->intr;
+-    if (state->io_irq != t->socket.pci_irq) reg |= state->io_irq;
++    reg |= state->io_irq;
+     reg |= (state->flags & SS_RESET) ? 0 : I365_PC_RESET;
+     reg |= (state->flags & SS_IOCARD) ? I365_PC_IOCARD : 0;
+     i365_set(sock, I365_INTCTL, reg);
+@@ -1177,8 +1158,7 @@ static int i365_set_mem_map(u_short sock
+     if ((map > 4) || (mem->card_start > 0x3ffffff) ||
+ 	(mem->sys_start > mem->sys_stop) || (mem->speed > 1000))
+ 	return -EINVAL;
+-    if (!(socket[sock].flags & IS_PCI) &&
+-	((mem->sys_start > 0xffffff) || (mem->sys_stop > 0xffffff)))
++    if ((mem->sys_start > 0xffffff) || (mem->sys_stop > 0xffffff))
+ 	return -EINVAL;
+ 	
+     /* Turn off the window before changing anything */
+@@ -1211,6 +1191,7 @@ static int i365_set_mem_map(u_short sock
+     return 0;
+ } /* i365_set_mem_map */
+ 
++#if 0 /* driver model ordering issue */
+ /*======================================================================
+ 
+     Routines for accessing socket information and register dumps via
+@@ -1250,6 +1231,7 @@ static ssize_t show_exca(struct class_de
+ 
+ static CLASS_DEVICE_ATTR(exca, S_IRUGO, show_exca, NULL);
+ static CLASS_DEVICE_ATTR(info, S_IRUGO, show_info, NULL);
++#endif
+ 
+ /*====================================================================*/
+ 
+@@ -1385,7 +1367,7 @@ static int __init init_i82365(void)
+     if (driver_register(&i82365_driver))
+ 	return -1;
+ 
+-    printk(KERN_INFO "Intel PCIC probe: ");
++    printk(KERN_INFO "Intel ISA PCIC probe: ");
+     sockets = 0;
+ 
+     isa_probe();
+@@ -1414,10 +1396,12 @@ static int __init init_i82365(void)
+ 			    pcmcia_unregister_socket(&socket[i].socket);
+ 		    break;
+ 	    }
++#if 0 /* driver model ordering issue */
+ 	   class_device_create_file(&socket[i].socket.dev,
+ 			   	    &class_device_attr_info);
+ 	   class_device_create_file(&socket[i].socket.dev,
+ 			   	    &class_device_attr_exca);
++#endif
+     }
+ 
+     /* Finally, schedule a polling interrupt */
+--- linux-2.6.0/drivers/pcmcia/yenta_socket.c	2003-11-23 19:03:01.000000000 -0800
++++ 25/drivers/pcmcia/yenta_socket.c	2003-12-28 23:22:47.000000000 -0800
+@@ -30,7 +30,7 @@
+ 
+ 
+ #if 0
+-#define DEBUG(x,args...)	printk("%s: " x, __FUNCTION__, ##args)
++#define DEBUG(x,args...)	printk(KERN_DEBUG "%s: " x, __FUNCTION__, ##args)
+ #else
+ #define DEBUG(x,args...)
+ #endif
+@@ -779,7 +779,7 @@ static void yenta_get_socket_capabilitie
+ 	socket->socket.irq_mask = yenta_probe_irq(socket, isa_irq_mask);
+ 	socket->socket.cb_dev = socket->dev;
+ 
+-	printk(KERN_INFO "Yenta: ISA IRQ list %04x, PCI irq%d\n",
++	printk(KERN_INFO "Yenta: ISA IRQ mask 0x%04x, PCI irq %d\n",
+ 	       socket->socket.irq_mask, socket->cb_irq);
+ }
+ 
+@@ -860,7 +860,7 @@ static int __devinit yenta_probe (struct
+ 		goto disable;
+ 
+ 	if (!pci_resource_start(dev, 0)) {
+-		printk("No cardbus resource!\n");
++		printk(KERN_ERR "No cardbus resource!\n");
+ 		ret = -ENODEV;
+ 		goto release;
+ 	}
+@@ -916,7 +916,7 @@ static int __devinit yenta_probe (struct
+ 
+ 	/* Figure out what the dang thing can do for the PCMCIA layer... */
+ 	yenta_get_socket_capabilities(socket, isa_interrupts);
+-	printk("Socket status: %08x\n", cb_readl(socket, CB_SOCKET_STATE));
++	printk(KERN_INFO "Socket status: %08x\n", cb_readl(socket, CB_SOCKET_STATE));
+ 
+ 	/* Register it with the pcmcia layer.. */
+ 	ret = pcmcia_register_socket(&socket->socket);
+--- linux-2.6.0/drivers/pnp/isapnp/core.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/pnp/isapnp/core.c	2003-12-28 23:22:08.000000000 -0800
+@@ -890,11 +890,9 @@ static int __init isapnp_build_device_li
+ 			header[4], header[5], header[6], header[7], header[8]);
+ 		printk(KERN_DEBUG "checksum = 0x%x\n", checksum);
+ #endif
+-		/* Don't be strict on the checksum, here !
+-                   e.g. 'SCM SwapBox Plug and Play' has header[8]==0 (should be: b7)*/
+-		if (header[8] == 0)
+-			;
+-		else if (checksum == 0x00 || checksum != header[8])	/* not valid CSN */
++		/* Per Section 6.1 of the Plug and Play ISA Specification (Version 1.0a), */
++		/* Bit[7] of Vendor ID Byte 0 must be 0 */
++		if (header[0] & 0x80)	/* not valid CSN */
+ 			continue;
+ 		if ((card = isapnp_alloc(sizeof(struct pnp_card))) == NULL)
+ 			continue;
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/pnp/isapnp/Kconfig	2003-12-28 23:22:08.000000000 -0800
+@@ -0,0 +1,11 @@
++#
++# ISA Plug and Play configuration
++#
++config ISAPNP
++	bool "ISA Plug and Play support (EXPERIMENTAL)"
++	depends on PNP && EXPERIMENTAL
++	help
++	  Say Y here if you would like support for ISA Plug and Play devices.
++	  Some information is in <file:Documentation/isapnp.txt>.
++
++	  If unsure, say Y.
+--- linux-2.6.0/drivers/pnp/Kconfig	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/pnp/Kconfig	2003-12-28 23:22:08.000000000 -0800
+@@ -30,33 +30,9 @@ config PNP_DEBUG
+ comment "Protocols"
+ 	depends on PNP
+ 
+-config ISAPNP
+-	bool "ISA Plug and Play support (EXPERIMENTAL)"
+-	depends on PNP && EXPERIMENTAL
+-	help
+-	  Say Y here if you would like support for ISA Plug and Play devices.
+-	  Some information is in <file:Documentation/isapnp.txt>.
++source "drivers/pnp/isapnp/Kconfig"
+ 
+-	  If unsure, say Y.
+-
+-config PNPBIOS
+-	bool "Plug and Play BIOS support (EXPERIMENTAL)"
+-	depends on PNP && EXPERIMENTAL
+-	---help---
+-	  Linux uses the PNPBIOS as defined in "Plug and Play BIOS
+-	  Specification Version 1.0A May 5, 1994" to autodetect built-in
+-	  mainboard resources (e.g. parallel port resources).
+-
+-	  Some features (e.g. event notification, docking station information,
+-	  ISAPNP services) are not used.
+-
+-	  Note: ACPI is expected to supersede PNPBIOS some day, currently it
+-	  co-exists nicely.
+-
+-	  See latest pcmcia-cs (stand-alone package) for a nice "lspnp" tools,
+-	  or have a look at /proc/bus/pnp.
+-
+-	  If unsure, say Y.
++source "drivers/pnp/pnpbios/Kconfig"
+ 
+ endmenu
+ 
+--- linux-2.6.0/drivers/pnp/pnpbios/bioscalls.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/pnp/pnpbios/bioscalls.c	2003-12-28 23:23:01.000000000 -0800
+@@ -493,7 +493,7 @@ static int __pnp_bios_read_escd(char *da
+ 	if (!pnp_bios_present())
+ 		return ESCD_FUNCTION_NOT_SUPPORTED;
+ 	status = call_pnp_bios(PNP_READ_ESCD, 0, PNP_TS1, PNP_TS2, PNP_DS, 0, 0, 0,
+-			       data, 65536, (void *)nvram_base, 65536);
++			       data, 65536, __va((void *)nvram_base), 65536);
+ 	return status;
+ }
+ 
+@@ -516,7 +516,7 @@ static int pnp_bios_write_escd(char *dat
+ 	if (!pnp_bios_present())
+ 		return ESCD_FUNCTION_NOT_SUPPORTED;
+ 	status = call_pnp_bios(PNP_WRITE_ESCD, 0, PNP_TS1, PNP_TS2, PNP_DS, 0, 0, 0,
+-			       data, 65536, nvram_base, 65536);
++			       data, 65536, __va((void *)nvram_base), 65536);
+ 	return status;
+ }
+ #endif
+--- linux-2.6.0/drivers/pnp/pnpbios/core.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/pnp/pnpbios/core.c	2003-12-28 23:22:07.000000000 -0800
+@@ -353,16 +353,8 @@ static void __init build_devlist(void)
+ 
+ 	for(nodenum=0; nodenum<0xff; ) {
+ 		u8 thisnodenum = nodenum;
+-		/* eventually we will want to use PNPMODE_STATIC here but for now
+-		 * dynamic will help us catch buggy bioses to add to the blacklist.
+-		 */
+-		if (!pnpbios_dont_use_current_config) {
+-			if (pnp_bios_get_dev_node(&nodenum, (char )PNPMODE_DYNAMIC, node))
+-				break;
+-		} else {
+-			if (pnp_bios_get_dev_node(&nodenum, (char )PNPMODE_STATIC, node))
+-				break;
+-		}
++		if (pnp_bios_get_dev_node(&nodenum, (char )PNPMODE_STATIC, node))
++			break;
+ 		nodes_got++;
+ 		dev =  pnpbios_kmalloc(sizeof (struct pnp_dev), GFP_KERNEL);
+ 		if (!dev)
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/pnp/pnpbios/Kconfig	2003-12-28 23:22:08.000000000 -0800
+@@ -0,0 +1,41 @@
++#
++# Plug and Play BIOS configuration
++#
++config PNPBIOS
++	bool "Plug and Play BIOS support (EXPERIMENTAL)"
++	depends on PNP && EXPERIMENTAL
++	---help---
++	  Linux uses the PNPBIOS as defined in "Plug and Play BIOS
++	  Specification Version 1.0A May 5, 1994" to autodetect built-in
++	  mainboard resources (e.g. parallel port resources).
++
++	  Some features (e.g. event notification, docking station information,
++	  ISAPNP services) are not currently implemented.
++
++	  If you would like the kernel to detect and allocate resources to
++	  your mainboard devices (on some systems they are disabled by the
++	  BIOS) say Y here.  Also the PNPBIOS can help prevent resource
++	  conflicts between mainboard devices and other bus devices.
++
++	  Note: ACPI is expected to supersede PNPBIOS some day, currently it
++	  co-exists nicely.  If you have a non-ISA system that supports ACPI,
++	  you probably don't need PNPBIOS support.
++
++config PNPBIOS_PROC_FS
++	bool "Plug and Play BIOS /proc interface"
++	depends on PNPBIOS && PROC_FS
++	---help---
++	  If you say Y here and to "/proc file system support", you will be
++	  able to directly access the PNPBIOS.  This includes resource
++	  allocation, ESCD, and other PNPBIOS services.  Using this
++	  interface is potentially dangerous because the PNPBIOS driver will
++	  not be notified of any resource changes made by writting directly.
++	  Also some buggy systems will fault when accessing certain features
++	  in the PNPBIOS /proc interface (e.g. ESCD).
++
++	  See the latest pcmcia-cs (stand-alone package) for a nice set of
++	  PNPBIOS /proc interface tools (lspnp and setpnp).
++
++	  Unless you are debugging or have other specific reasons, it is
++	  recommended that you say N here.
++
+--- linux-2.6.0/drivers/pnp/pnpbios/Makefile	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/pnp/pnpbios/Makefile	2003-12-28 23:22:08.000000000 -0800
+@@ -2,6 +2,6 @@
+ # Makefile for the kernel PNPBIOS driver.
+ #
+ 
+-pnpbios-proc-$(CONFIG_PROC_FS) = proc.o
++pnpbios-proc-$(CONFIG_PNPBIOS_PROC_FS) = proc.o
+ 
+ obj-y := core.o bioscalls.o rsparser.o $(pnpbios-proc-y)
+--- linux-2.6.0/drivers/pnp/pnpbios/pnpbios.h	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/pnp/pnpbios/pnpbios.h	2003-12-28 23:22:08.000000000 -0800
+@@ -36,7 +36,7 @@ extern void pnpid32_to_pnpid(u32 id, cha
+ extern void pnpbios_print_status(const char * module, u16 status);
+ extern void pnpbios_calls_init(union pnp_bios_install_struct * header);
+ 
+-#ifdef CONFIG_PROC_FS
++#ifdef CONFIG_PNPBIOS_PROC_FS
+ extern int pnpbios_interface_attach_device(struct pnp_bios_node * node);
+ extern int pnpbios_proc_init (void);
+ extern void pnpbios_proc_exit (void);
+@@ -44,4 +44,4 @@ extern void pnpbios_proc_exit (void);
+ static inline int pnpbios_interface_attach_device(struct pnp_bios_node * node) { return 0; }
+ static inline int pnpbios_proc_init (void) { return 0; }
+ static inline void pnpbios_proc_exit (void) { ; }
+-#endif /* CONFIG_PROC */
++#endif /* CONFIG_PNPBIOS_PROC_FS */
+--- linux-2.6.0/drivers/s390/block/dasd.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/s390/block/dasd.c	2003-12-28 23:21:17.000000000 -0800
+@@ -1643,9 +1643,9 @@ dasd_flush_request_queue(struct dasd_dev
+ }
+ 
+ static int
+-dasd_open(struct inode *inp, struct file *filp)
++dasd_open(struct block_device *bdev, struct file *filp)
+ {
+-	struct gendisk *disk = inp->i_bdev->bd_disk;
++	struct gendisk *disk = bdev->bd_disk;
+ 	struct dasd_device *device = disk->private_data;
+ 	int rc;
+ 
+@@ -1676,10 +1676,8 @@ out:
+ 	return rc;
+ }
+ 
+-static int
+-dasd_release(struct inode *inp, struct file *filp)
++static int dasd_release(struct gendisk *disk)
+ {
+-	struct gendisk *disk = inp->i_bdev->bd_disk;
+ 	struct dasd_device *device = disk->private_data;
+ 
+ 	if (device->state < DASD_STATE_BASIC) {
+--- linux-2.6.0/drivers/s390/block/dasd_int.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/s390/block/dasd_int.h	2003-12-28 23:21:12.000000000 -0800
+@@ -493,7 +493,7 @@ int  dasd_ioctl_init(void);
+ void dasd_ioctl_exit(void);
+ int  dasd_ioctl_no_register(struct module *, int, dasd_ioctl_fn_t);
+ int  dasd_ioctl_no_unregister(struct module *, int, dasd_ioctl_fn_t);
+-int  dasd_ioctl(struct inode *, struct file *, unsigned int, unsigned long);
++int  dasd_ioctl(struct block_device *, struct file *, unsigned int, unsigned long);
+ 
+ /* externals in dasd_proc.c */
+ int dasd_proc_init(void);
+--- linux-2.6.0/drivers/s390/block/dasd_ioctl.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/s390/block/dasd_ioctl.c	2003-12-28 23:21:12.000000000 -0800
+@@ -78,10 +78,9 @@ dasd_ioctl_no_unregister(struct module *
+ }
+ 
+ int
+-dasd_ioctl(struct inode *inp, struct file *filp,
++dasd_ioctl(struct block_device *bdev, struct file *filp,
+ 	   unsigned int no, unsigned long data)
+ {
+-	struct block_device *bdev = inp->i_bdev;
+ 	struct dasd_device *device = bdev->bd_disk->private_data;
+ 	struct dasd_ioctl *ioctl;
+ 	const char *dir;
+--- linux-2.6.0/drivers/s390/block/xpram.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/s390/block/xpram.c	2003-12-28 23:21:12.000000000 -0800
+@@ -328,7 +328,7 @@ fail:
+ 	return 0;
+ }
+ 
+-static int xpram_ioctl (struct inode *inode, struct file *filp,
++static int xpram_ioctl (struct block_device *bdev, struct file *filp,
+ 		 unsigned int cmd, unsigned long arg)
+ {
+ 	struct hd_geometry *geo;
+--- linux-2.6.0/drivers/s390/char/tape_block.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/s390/char/tape_block.c	2003-12-28 23:21:17.000000000 -0800
+@@ -27,8 +27,8 @@
+ /*
+  * file operation structure for tape block frontend
+  */
+-static int tapeblock_open(struct inode *, struct file *);
+-static int tapeblock_release(struct inode *, struct file *);
++static int tapeblock_open(block_device *, struct file *);
++static int tapeblock_release(struct gendisk *);
+ 
+ static struct block_device_operations tapeblock_fops = {
+ 	.owner		= THIS_MODULE,
+@@ -299,9 +299,9 @@ static int tapeblock_mediumdetect(struct
+  * Block frontend tape device open function.
+  */
+ static int
+-tapeblock_open(struct inode *inode, struct file *filp)
++tapeblock_open(struct block_device *bdev, struct file *filp)
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
++	struct gendisk *disk = bdev->bd_disk;
+ 	struct tape_device *device = disk->private_data;
+ 	int rc;
+ 
+@@ -336,9 +336,8 @@ tapeblock_open(struct inode *inode, stru
+  * Block frontend tape device release function.
+  */
+ static int
+-tapeblock_release(struct inode *inode, struct file *filp)
++tapeblock_release(struct gendisk *disk)
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
+ 	struct tape_device *device = disk->private_data;
+ 
+ 	tape_release(device);
+--- linux-2.6.0/drivers/s390/net/qeth.c	2003-10-08 15:07:09.000000000 -0700
++++ 25/drivers/s390/net/qeth.c	2003-12-28 23:21:01.000000000 -0800
+@@ -9739,28 +9739,28 @@ static int
+ qeth_get_internal_functions(void)
+ {
+ 	struct net_device *dev;
+-
+-	dev = (struct net_device *) kmalloc(sizeof (struct net_device),
+-					    GFP_KERNEL);
++#ifdef CONFIG_NET_ETHERNET
++	dev = alloc_etherdev(0);
+ 	if (!dev) {
+ 		PRINT_ERR("Not enough memory for internal functions.\n");
+ 		return -ENOMEM;
+ 	}
+-#ifdef CONFIG_NET_ETHERNET
+-	ether_setup(dev);
+ 	qeth_my_eth_header = dev->hard_header;
+ 	qeth_my_eth_rebuild_header = dev->rebuild_header;
+ 	qeth_my_eth_header_cache = dev->hard_header_cache;
+ 	qeth_my_eth_header_cache_update = dev->header_cache_update;
++	free_netdev(dev);
+ #endif
+ #ifdef CONFIG_TR
+-	tr_setup(dev);
++	dev = alloc_trdev(0);
++	if (!dev) {
++		PRINT_ERR("Not enough memory for internal functions.\n");
++		return -ENOMEM;
++	}
+ 	qeth_my_tr_header = dev->hard_header;
+ 	qeth_my_tr_rebuild_header = dev->rebuild_header;
++	free_netdev(dev);
+ #endif
+-
+-	kfree(dev);
+-
+ 	return 0;
+ }
+ 
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic7770.c	2003-08-08 22:55:13.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aic7770.c	2003-12-28 23:21:39.000000000 -0800
+@@ -37,9 +37,7 @@
+  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  * POSSIBILITY OF SUCH DAMAGES.
+  *
+- * $Id: //depot/aic7xxx/aic7xxx/aic7770.c#30 $
+- *
+- * $FreeBSD$
++ * $Id: //depot/aic7xxx/aic7xxx/aic7770.c#34 $
+  */
+ 
+ #ifdef __linux__
+@@ -47,6 +45,8 @@
+ #include "aic7xxx_inline.h"
+ #include "aic7xxx_93cx6.h"
+ #else
++#include <sys/cdefs.h>
++__FBSDID("$FreeBSD$");
+ #include <dev/aic7xxx/aic7xxx_osm.h>
+ #include <dev/aic7xxx/aic7xxx_inline.h>
+ #include <dev/aic7xxx/aic7xxx_93cx6.h>
+@@ -67,8 +67,7 @@ static ahc_device_setup_t ahc_aic7770_VL
+ static ahc_device_setup_t ahc_aic7770_EISA_setup;;
+ static ahc_device_setup_t ahc_aic7770_setup;
+ 
+-
+-struct aic7770_identity aic7770_ident_table [] =
++struct aic7770_identity aic7770_ident_table[] =
+ {
+ 	{
+ 		ID_AHA_274x,
+@@ -83,6 +82,12 @@ struct aic7770_identity aic7770_ident_ta
+ 		ahc_aic7770_VL_setup
+ 	},
+ 	{
++		ID_AHA_284x,
++		0xFFFFFFFE,
++		"Adaptec 284X SCSI adapter (BIOS Disabled)",
++		ahc_aic7770_VL_setup
++	},
++	{
+ 		ID_OLV_274x,
+ 		0xFFFFFFFF,
+ 		"Adaptec (Olivetti OEM) 274X SCSI adapter",
+@@ -154,7 +159,7 @@ aic7770_config(struct ahc_softc *ahc, st
+ 	ahc->bus_suspend = aic7770_suspend;
+ 	ahc->bus_resume = aic7770_resume;
+ 
+-	error = ahc_reset(ahc);
++	error = ahc_reset(ahc, /*reinit*/FALSE);
+ 	if (error != 0)
+ 		return (error);
+ 
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic7770_osm.c	2003-06-14 12:18:25.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aic7770_osm.c	2003-12-28 23:21:39.000000000 -0800
+@@ -1,7 +1,7 @@
+ /*
+  * Linux driver attachment glue for aic7770 based controllers.
+  *
+- * Copyright (c) 2000-2001 Adaptec Inc.
++ * Copyright (c) 2000-2003 Adaptec Inc.
+  * All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+@@ -36,27 +36,90 @@
+  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  * POSSIBILITY OF SUCH DAMAGES.
+  *
+- * $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"
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
++#include <linux/device.h>
++#include <linux/eisa.h>
++
++#define EISA_MFCTR_CHAR0(ID) (char)(((ID>>26) & 0x1F) | '@')  /* Bits 26-30 */
++#define EISA_MFCTR_CHAR1(ID) (char)(((ID>>21) & 0x1F) | '@')  /* Bits 21-25 */
++#define EISA_MFCTR_CHAR2(ID) (char)(((ID>>16) & 0x1F) | '@')  /* Bits 16-20 */
++#define EISA_PRODUCT_ID(ID)  (short)((ID>>4)  & 0xFFF)        /* Bits  4-15 */
++#define EISA_REVISION_ID(ID) (uint8_t)(ID & 0x0F)             /* Bits  0-3  */
++
++static int aic7770_eisa_dev_probe(struct device *dev);
++static int aic7770_eisa_dev_remove(struct device *dev);
++static struct eisa_driver aic7770_driver = {
++	.driver = {
++		.name   = "aic7xxx",
++		.probe  = aic7770_eisa_dev_probe,
++		.remove = aic7770_eisa_dev_remove,
++	}
++};
++
++typedef  struct device *aic7770_dev_t;
++#else
+ #define MINSLOT			1
+ #define NUMSLOTS		16
+ #define IDOFFSET		0x80
+ 
+-int
+-aic7770_linux_probe(Scsi_Host_Template *template)
++typedef void *aic7770_dev_t;
++#endif
++
++static int aic7770_linux_config(struct aic7770_identity *entry,
++				aic7770_dev_t dev, u_int eisaBase);
++
++void
++ahc_linux_eisa_init(void)
+ {
+-#if defined(__i386__) || defined(__alpha__)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
++	struct eisa_device_id *eid;
++	struct aic7770_identity *id;
++	int i;
++
++	if (aic7xxx_probe_eisa_vl == 0)
++		return;
++
++	/*
++	 * Linux requires the EISA IDs to be specified in
++	 * the EISA ID string format.  Perform the conversion
++	 * and setup a table with a NUL terminal entry.
++	 */
++	aic7770_driver.id_table = malloc(sizeof(struct eisa_device_id) *
++					 (ahc_num_aic7770_devs + 1),
++					 M_DEVBUF, M_NOWAIT);
++	if (aic7770_driver.id_table == NULL)
++		return;
++
++	for (eid = (struct eisa_device_id *)aic7770_driver.id_table,
++	     id = aic7770_ident_table, i = 0;
++	     i < ahc_num_aic7770_devs; eid++, id++, i++) {
++
++		sprintf(eid->sig, "%c%c%c%03X%01X",
++			EISA_MFCTR_CHAR0(id->full_id),
++			EISA_MFCTR_CHAR1(id->full_id),
++			EISA_MFCTR_CHAR2(id->full_id),
++			EISA_PRODUCT_ID(id->full_id),
++			EISA_REVISION_ID(id->full_id));
++		eid->driver_data = i;
++	}
++	eid->sig[0] = 0;
++
++	eisa_driver_register(&aic7770_driver);
++#else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) */
+ 	struct aic7770_identity *entry;
+-	struct ahc_softc *ahc;
+-	int i, slot;
+-	int eisaBase;
+-	int found;
++	u_int  slot;
++	u_int  eisaBase;
++	u_int  i;
++
++	if (aic7xxx_probe_eisa_vl == 0)
++		return;
+ 
+ 	eisaBase = 0x1000 + AHC_EISA_SLOT_OFFSET;
+-	found = 0;
+ 	for (slot = 1; slot < NUMSLOTS; eisaBase+=0x1000, slot++) {
+ 		uint32_t eisa_id;
+ 		size_t	 id_size;
+@@ -83,45 +146,65 @@ aic7770_linux_probe(Scsi_Host_Template *
+ 			continue;  /* no EISA card in slot */
+ 
+ 		entry = aic7770_find_device(eisa_id);
+-		if (entry != NULL) {
+-			char	 buf[80];
+-			char	*name;
+-			int	 error;
+-
+-			/*
+-			 * Allocate a softc for this card and
+-			 * set it up for attachment by our
+-			 * common detect routine.
+-			 */
+-			sprintf(buf, "ahc_eisa:%d", slot);
+-			name = malloc(strlen(buf) + 1, M_DEVBUF, M_NOWAIT);
+-			if (name == NULL)
+-				break;
+-			strcpy(name, buf);
+-			ahc = ahc_alloc(template, name);
+-			if (ahc == NULL) {
+-				/*
+-				 * If we can't allocate this one,
+-				 * chances are we won't be able to
+-				 * allocate future card structures.
+-				 */
+-				break;
+-			}
+-			error = aic7770_config(ahc, entry, eisaBase);
+-			if (error != 0) {
+-				ahc->bsh.ioport = 0;
+-				ahc_free(ahc);
+-				continue;
+-			}
+-			found++;
+-		}
++		if (entry != NULL)
++			aic7770_linux_config(entry, NULL, eisaBase);
++	}
++#endif
++}
++
++void
++ahc_linux_eisa_exit(void)
++{
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
++	if (aic7xxx_probe_eisa_vl == 0)
++		return;
++
++	if (aic7770_driver.id_table != NULL) {
++		eisa_driver_unregister(&aic7770_driver);
++		free(aic7770_driver.id_table, M_DEVBUF);
+ 	}
+-	return (found);
+-#else
+-	return (0);
+ #endif
+ }
+ 
++static int
++aic7770_linux_config(struct aic7770_identity *entry, aic7770_dev_t dev,
++		     u_int eisaBase)
++{
++	struct	ahc_softc *ahc;
++	char	buf[80];
++	char   *name;
++	int	error;
++
++	/*
++	 * Allocate a softc for this card and
++	 * set it up for attachment by our
++	 * common detect routine.
++	 */
++	sprintf(buf, "ahc_eisa:%d", eisaBase >> 12);
++	name = malloc(strlen(buf) + 1, M_DEVBUF, M_NOWAIT);
++	if (name == NULL)
++		return (ENOMEM);
++	strcpy(name, buf);
++	ahc = ahc_alloc(&aic7xxx_driver_template, name);
++	if (ahc == NULL) {
++		free(name, M_DEVBUF);
++		return (ENOMEM);
++	}
++	ahc->dev_softc = dev;
++	error = aic7770_config(ahc, entry, eisaBase);
++	if (error != 0) {
++		ahc->bsh.ioport = 0;
++		ahc_free(ahc);
++		return (error);
++	}
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
++	dev->driver_data = (void *)ahc;
++	if (aic7xxx_detect_complete)
++		error = ahc_linux_register_host(ahc, &aic7xxx_driver_template);
++#endif
++	return (error);
++}
++
+ int
+ aic7770_map_registers(struct ahc_softc *ahc, u_int port)
+ {
+@@ -129,6 +212,8 @@ aic7770_map_registers(struct ahc_softc *
+ 	 * Lock out other contenders for our i/o space.
+ 	 */
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
++	if (check_region(port, AHC_EISA_IOSIZE) != 0)
++		return (ENOMEM);
+ 	request_region(port, AHC_EISA_IOSIZE, "aic7xxx");
+ #else
+ 	if (request_region(port, AHC_EISA_IOSIZE, "aic7xxx") == 0)
+@@ -155,3 +240,43 @@ aic7770_map_int(struct ahc_softc *ahc, u
+ 	
+ 	return (-error);
+ }
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
++static int
++aic7770_eisa_dev_probe(struct device *dev)
++{
++	struct eisa_device *edev;
++
++	edev = to_eisa_device(dev);
++	return (aic7770_linux_config(aic7770_ident_table + edev->id.driver_data,
++				    dev, edev->base_addr+AHC_EISA_SLOT_OFFSET));
++}
++
++static int
++aic7770_eisa_dev_remove(struct device *dev)
++{
++	struct ahc_softc *ahc;
++	u_long l;
++
++	/*
++	 * We should be able to just perform
++	 * the free directly, but check our
++	 * list for extra sanity.
++	 */
++	ahc_list_lock(&l);
++	ahc = ahc_find_softc((struct ahc_softc *)dev->driver_data);
++	if (ahc != NULL) {
++		u_long s;
++
++		TAILQ_REMOVE(&ahc_tailq, ahc, links);
++		ahc_list_unlock(&l);
++		ahc_lock(ahc, &s);
++		ahc_intr_enable(ahc, FALSE);
++		ahc_unlock(ahc, &s);
++		ahc_free(ahc);
++	} else
++		ahc_list_unlock(&l);
++
++	return (0);
++}
++#endif
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic79xx_core.c	2003-06-14 12:17:55.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aic79xx_core.c	2003-12-28 23:21:39.000000000 -0800
+@@ -37,9 +37,7 @@
+  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  * POSSIBILITY OF SUCH DAMAGES.
+  *
+- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#194 $
+- *
+- * $FreeBSD$
++ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#224 $
+  */
+ 
+ #ifdef __linux__
+@@ -47,6 +45,8 @@
+ #include "aic79xx_inline.h"
+ #include "aicasm/aicasm_insformat.h"
+ #else
++#include <sys/cdefs.h>
++__FBSDID("$FreeBSD$");
+ #include <dev/aic7xxx/aic79xx_osm.h>
+ #include <dev/aic7xxx/aic79xx_inline.h>
+ #include <dev/aic7xxx/aicasm/aicasm_insformat.h>
+@@ -224,6 +224,14 @@ static u_int		ahd_resolve_seqaddr(struct
+ static void		ahd_download_instr(struct ahd_softc *ahd,
+ 					   u_int instrptr, uint8_t *dconsts);
+ static int		ahd_probe_stack_size(struct ahd_softc *ahd);
++static void		ahd_other_scb_timeout(struct ahd_softc *ahd,
++					      struct scb *scb,
++					      struct scb *other_scb);
++static int		ahd_scb_active_in_fifo(struct ahd_softc *ahd,
++					       struct scb *scb);
++static void		ahd_run_data_fifo(struct ahd_softc *ahd,
++					  struct scb *scb);
++
+ #ifdef AHD_TARGET_MODE
+ static void		ahd_queue_lstate_event(struct ahd_softc *ahd,
+ 					       struct ahd_tmode_lstate *lstate,
+@@ -328,10 +336,7 @@ ahd_restart(struct ahd_softc *ahd)
+ 	/* Always allow reselection */
+ 	ahd_outb(ahd, SCSISEQ1,
+ 		 ahd_inb(ahd, SCSISEQ_TEMPLATE) & (ENSELI|ENRSELI|ENAUTOATNP));
+-	/* Ensure that no DMA operations are in progress */
+ 	ahd_set_modes(ahd, AHD_MODE_CCHAN, AHD_MODE_CCHAN);
+-	ahd_outb(ahd, SCBHCNT, 0);
+-	ahd_outb(ahd, CCSCBCTL, CCSCBRESET);
+ 	ahd_outb(ahd, SEQCTL0, FASTMODE|SEQRESET);
+ 	ahd_unpause(ahd);
+ }
+@@ -371,31 +376,119 @@ ahd_flush_qoutfifo(struct ahd_softc *ahd
+ 	u_int		next_scbid;
+ 
+ 	saved_modes = ahd_save_modes(ahd);
+-	ahd_set_modes(ahd, AHD_MODE_CCHAN, AHD_MODE_CCHAN);
++
++	/*
++	 * Flush the good status FIFO for completed packetized commands.
++	 */
++	ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI);
+ 	saved_scbptr = ahd_get_scbptr(ahd);
++	while ((ahd_inb(ahd, LQISTAT2) & LQIGSAVAIL) != 0) {
++		u_int fifo_mode;
++		u_int i;
++		
++		scbid = ahd_inw(ahd, GSFIFO);
++		scb = ahd_lookup_scb(ahd, scbid);
++		if (scb == NULL) {
++			printf("%s: Warning - GSFIFO SCB %d invalid\n",
++			       ahd_name(ahd), scbid);
++			continue;
++		}
++		/*
++		 * Determine if this transaction is still active in
++		 * any FIFO.  If it is, we must flush that FIFO to
++		 * the host before completing the  command.
++		 */
++		fifo_mode = 0;
++rescan_fifos:
++		for (i = 0; i < 2; i++) {
++			/* Toggle to the other mode. */
++			fifo_mode ^= 1;
++			ahd_set_modes(ahd, fifo_mode, fifo_mode);
++
++			if (ahd_scb_active_in_fifo(ahd, scb) == 0)
++				continue;
++
++			ahd_run_data_fifo(ahd, scb);
++
++			/*
++			 * Running this FIFO may cause a CFG4DATA for
++			 * this same transaction to assert in the other
++			 * FIFO or a new snapshot SAVEPTRS interrupt
++			 * in this FIFO.  Even running a FIFO may not
++			 * clear the transaction if we are still waiting
++			 * for data to drain to the host. We must loop
++			 * until the transaction is not active in either
++			 * FIFO just to be sure.  Reset our loop counter
++			 * so we will visit both FIFOs again before
++			 * declaring this transaction finished.  We
++			 * also delay a bit so that status has a chance
++			 * to change before we look at this FIFO again.
++			 */
++			aic_delay(200);
++			goto rescan_fifos;
++		}
++		ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI);
++		ahd_set_scbptr(ahd, scbid);
++		if ((ahd_inb_scbram(ahd, SCB_SGPTR) & SG_LIST_NULL) == 0
++		 && ((ahd_inb_scbram(ahd, SCB_SGPTR) & SG_FULL_RESID) != 0
++		  || (ahd_inb_scbram(ahd, SCB_RESIDUAL_SGPTR)
++		      & SG_LIST_NULL) != 0)) {
++			u_int comp_head;
++
++			/*
++			 * The transfer completed with a residual.
++			 * Place this SCB on the complete DMA list
++			 * so that we update our in-core copy of the
++			 * SCB before completing the command.
++			 */
++			ahd_outb(ahd, SCB_SCSI_STATUS, 0);
++			ahd_outb(ahd, SCB_SGPTR,
++				 ahd_inb_scbram(ahd, SCB_SGPTR)
++				 | SG_STATUS_VALID);
++			ahd_outw(ahd, SCB_TAG, SCB_GET_TAG(scb));
++			comp_head = ahd_inw(ahd, COMPLETE_DMA_SCB_HEAD);
++			ahd_outw(ahd, SCB_NEXT_COMPLETE, comp_head);
++			ahd_outw(ahd, COMPLETE_DMA_SCB_HEAD, SCB_GET_TAG(scb));
++		} else
++			ahd_complete_scb(ahd, scb);
++	}
++	ahd_set_scbptr(ahd, saved_scbptr);
++
++	/*
++	 * Setup for command channel portion of flush.
++	 */
++	ahd_set_modes(ahd, AHD_MODE_CCHAN, AHD_MODE_CCHAN);
+ 
+ 	/*
+ 	 * Wait for any inprogress DMA to complete and clear DMA state
+ 	 * if this if for an SCB in the qinfifo.
+ 	 */
+-	while ((ccscbctl = ahd_inb(ahd, CCSCBCTL) & (CCARREN|CCSCBEN)) != 0) {
++	while (((ccscbctl = ahd_inb(ahd, CCSCBCTL)) & (CCARREN|CCSCBEN)) != 0) {
+ 
+ 		if ((ccscbctl & (CCSCBDIR|CCARREN)) == (CCSCBDIR|CCARREN)) {
+ 			if ((ccscbctl & ARRDONE) != 0)
+ 				break;
+ 		} else if ((ccscbctl & CCSCBDONE) != 0)
+ 			break;
+-		ahd_delay(200);
++		aic_delay(200);
+ 	}
+-	if ((ccscbctl & CCSCBDIR) != 0)
++	/*
++	 * We leave the sequencer to cleanup in the case of DMA's to
++	 * update the qoutfifo.  In all other cases (DMA's to the
++	 * chip or a push of an SCB from the COMPLETE_DMA_SCB list),
++	 * we disable the DMA engine so that the sequencer will not
++	 * attempt to handle the DMA completion.
++	 */
++	if ((ccscbctl & CCSCBDIR) != 0 || (ccscbctl & ARRDONE) != 0)
+ 		ahd_outb(ahd, CCSCBCTL, ccscbctl & ~(CCARREN|CCSCBEN));
+ 
+ 	/*
+-	 * Complete any SCBs that just finished being
+-	 * DMA'ed into the qoutfifo.
++	 * Complete any SCBs that just finished
++	 * being DMA'ed into the qoutfifo.
+ 	 */
+ 	ahd_run_qoutfifo(ahd);
+ 
++	saved_scbptr = ahd_get_scbptr(ahd);
+ 	/*
+ 	 * Manually update/complete any completed SCBs that are waiting to be
+ 	 * DMA'ed back up to the host.
+@@ -438,31 +531,272 @@ ahd_flush_qoutfifo(struct ahd_softc *ahd
+ 		scbid = next_scbid;
+ 	}
+ 	ahd_outw(ahd, COMPLETE_SCB_HEAD, SCB_LIST_NULL);
+-	ahd_set_scbptr(ahd, saved_scbptr);
+-
+-	/*
+-	 * Flush the good status FIFO for compelted packetized commands.
+-	 */
+-	ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI);
+-	while ((ahd_inb(ahd, LQISTAT2) & LQIGSAVAIL) != 0) {
+-		scbid = (ahd_inb(ahd, GSFIFO+1) << 8)
+-		      | ahd_inb(ahd, GSFIFO);
+-		scb = ahd_lookup_scb(ahd, scbid);
+-		if (scb == NULL) {
+-			printf("%s: Warning - GSFIFO SCB %d invalid\n",
+-			       ahd_name(ahd), scbid);
+-			continue;
+-		}
+-		ahd_complete_scb(ahd, scb);
+-	}
+ 
+ 	/*
+ 	 * Restore state.
+ 	 */
++	ahd_set_scbptr(ahd, saved_scbptr);
+ 	ahd_restore_modes(ahd, saved_modes);
+ 	ahd->flags |= AHD_UPDATE_PEND_CMDS;
+ }
+ 
++/*
++ * Determine if an SCB for a packetized transaction
++ * is active in a FIFO.
++ */
++static int
++ahd_scb_active_in_fifo(struct ahd_softc *ahd, struct scb *scb)
++{
++
++	/*
++	 * The FIFO is only active for our transaction if
++	 * the SCBPTR matches the SCB's ID and the firmware
++	 * has installed a handler for the FIFO or we have
++	 * a pending SAVEPTRS or CFG4DATA interrupt.
++	 */
++	if (ahd_get_scbptr(ahd) != SCB_GET_TAG(scb)
++	 || ((ahd_inb(ahd, LONGJMP_ADDR+1) & INVALID_ADDR) != 0
++	  && (ahd_inb(ahd, SEQINTSRC) & (CFG4DATA|SAVEPTRS)) == 0))
++		return (0);
++
++	return (1);
++}
++
++/*
++ * Run a data fifo to completion for a transaction we know
++ * has completed across the SCSI bus (good status has been
++ * received).  We are already set to the correct FIFO mode
++ * on entry to this routine.
++ *
++ * This function attempts to operate exactly as the firmware
++ * would when running this FIFO.  Care must be taken to update
++ * this routine any time the firmware's FIFO algorithm is
++ * changed.
++ */
++static void
++ahd_run_data_fifo(struct ahd_softc *ahd, struct scb *scb)
++{
++	u_int seqintsrc;
++
++	seqintsrc = ahd_inb(ahd, SEQINTSRC);
++	if ((seqintsrc & CFG4DATA) != 0) {
++		uint32_t datacnt;
++		uint32_t sgptr;
++
++		/*
++		 * Clear full residual flag.
++		 */
++		sgptr = ahd_inl_scbram(ahd, SCB_SGPTR) & ~SG_FULL_RESID;
++		ahd_outb(ahd, SCB_SGPTR, sgptr);
++
++		/*
++		 * Load datacnt and address.
++		 */
++		datacnt = ahd_inl_scbram(ahd, SCB_DATACNT);
++		if ((datacnt & AHD_DMA_LAST_SEG) != 0) {
++			sgptr |= LAST_SEG;
++			ahd_outb(ahd, SG_STATE, 0);
++		} else
++			ahd_outb(ahd, SG_STATE, LOADING_NEEDED);
++		ahd_outq(ahd, HADDR, ahd_inq_scbram(ahd, SCB_DATAPTR));
++		ahd_outl(ahd, HCNT, datacnt & AHD_SG_LEN_MASK);
++		ahd_outb(ahd, SG_CACHE_PRE, sgptr);
++		ahd_outb(ahd, DFCNTRL, PRELOADEN|SCSIEN|HDMAEN);
++
++		/*
++		 * Initialize Residual Fields.
++		 */
++		ahd_outb(ahd, SCB_RESIDUAL_DATACNT+3, datacnt >> 24);
++		ahd_outl(ahd, SCB_RESIDUAL_SGPTR, sgptr & SG_PTR_MASK);
++
++		/*
++		 * Mark the SCB as having a FIFO in use.
++		 */
++		ahd_outb(ahd, SCB_FIFO_USE_COUNT,
++			 ahd_inb_scbram(ahd, SCB_FIFO_USE_COUNT) + 1);
++
++		/*
++		 * Install a "fake" handler for this FIFO.
++		 */
++		ahd_outw(ahd, LONGJMP_ADDR, 0);
++
++		/*
++		 * Notify the hardware that we have satisfied
++		 * this sequencer interrupt.
++		 */
++		ahd_outb(ahd, CLRSEQINTSRC, CLRCFG4DATA);
++	} else if ((seqintsrc & SAVEPTRS) != 0) {
++		uint32_t sgptr;
++		uint32_t resid;
++
++		if ((ahd_inb(ahd, LONGJMP_ADDR+1)&INVALID_ADDR) != 0) {
++			/*
++			 * Snapshot Save Pointers.  All that
++			 * is necessary to clear the snapshot
++			 * is a CLRCHN.
++			 */
++			goto clrchn;
++		}
++
++		/*
++		 * Disable S/G fetch so the DMA engine
++		 * is available to future users.
++		 */
++		if ((ahd_inb(ahd, SG_STATE) & FETCH_INPROG) != 0)
++			ahd_outb(ahd, CCSGCTL, 0);
++		ahd_outb(ahd, SG_STATE, 0);
++
++		/*
++		 * Flush the data FIFO.  Strickly only
++		 * necessary for Rev A parts.
++		 */
++		ahd_outb(ahd, DFCNTRL, ahd_inb(ahd, DFCNTRL) | FIFOFLUSH);
++
++		/*
++		 * Calculate residual.
++		 */
++		sgptr = ahd_inl_scbram(ahd, SCB_RESIDUAL_SGPTR);
++		resid = ahd_inl(ahd, SHCNT);
++		resid |= ahd_inb_scbram(ahd, SCB_RESIDUAL_DATACNT+3) << 24;
++		ahd_outl(ahd, SCB_RESIDUAL_DATACNT, resid);
++		if ((ahd_inb(ahd, SG_CACHE_SHADOW) & LAST_SEG) == 0) {
++			/*
++			 * Must back up to the correct S/G element.
++			 * Typically this just means resetting our
++			 * low byte to the offset in the SG_CACHE,
++			 * but if we wrapped, we have to correct
++			 * the other bytes of the sgptr too.
++			 */
++			if ((ahd_inb(ahd, SG_CACHE_SHADOW) & 0x80) != 0
++			 && (sgptr & 0x80) == 0)
++				sgptr -= 0x100;
++			sgptr &= ~0xFF;
++			sgptr |= ahd_inb(ahd, SG_CACHE_SHADOW)
++			       & SG_ADDR_MASK;
++			ahd_outl(ahd, SCB_RESIDUAL_SGPTR, sgptr);
++			ahd_outb(ahd, SCB_RESIDUAL_DATACNT + 3, 0);
++		} else if ((resid & AHD_SG_LEN_MASK) == 0) {
++			ahd_outb(ahd, SCB_RESIDUAL_SGPTR,
++				 sgptr | SG_LIST_NULL);
++		}
++		/*
++		 * Save Pointers.
++		 */
++		ahd_outq(ahd, SCB_DATAPTR, ahd_inq(ahd, SHADDR));
++		ahd_outl(ahd, SCB_DATACNT, resid);
++		ahd_outl(ahd, SCB_SGPTR, sgptr);
++		ahd_outb(ahd, CLRSEQINTSRC, CLRSAVEPTRS);
++		ahd_outb(ahd, SEQIMODE,
++			 ahd_inb(ahd, SEQIMODE) | ENSAVEPTRS);
++		/*
++		 * If the data is to the SCSI bus, we are
++		 * done, otherwise wait for FIFOEMP.
++		 */
++		if ((ahd_inb(ahd, DFCNTRL) & DIRECTION) != 0)
++			goto clrchn;
++	} else if ((ahd_inb(ahd, SG_STATE) & LOADING_NEEDED) != 0) {
++		uint32_t sgptr;
++		uint64_t data_addr;
++		uint32_t data_len;
++		u_int	 dfcntrl;
++
++		/*
++		 * Disable S/G fetch so the DMA engine
++		 * is available to future users.  We won't
++		 * be using the DMA engine to load segments.
++		 */
++		if ((ahd_inb(ahd, SG_STATE) & FETCH_INPROG) != 0) {
++			ahd_outb(ahd, CCSGCTL, 0);
++			ahd_outb(ahd, SG_STATE, LOADING_NEEDED);
++		}
++
++		/*
++		 * Wait for the DMA engine to notice that the
++		 * host transfer is enabled and that there is
++		 * space in the S/G FIFO for new segments before
++		 * loading more segments.
++		 */
++		if ((ahd_inb(ahd, DFSTATUS) & PRELOAD_AVAIL) != 0
++		 && (ahd_inb(ahd, DFCNTRL) & HDMAENACK) != 0) {
++
++			/*
++			 * Determine the offset of the next S/G
++			 * element to load.
++			 */
++			sgptr = ahd_inl_scbram(ahd, SCB_RESIDUAL_SGPTR);
++			sgptr &= SG_PTR_MASK;
++			if ((ahd->flags & AHD_64BIT_ADDRESSING) != 0) {
++				struct ahd_dma64_seg *sg;
++
++				sg = ahd_sg_bus_to_virt(ahd, scb, sgptr);
++				data_addr = sg->addr;
++				data_len = sg->len;
++				sgptr += sizeof(*sg);
++			} else {
++				struct	ahd_dma_seg *sg;
++
++				sg = ahd_sg_bus_to_virt(ahd, scb, sgptr);
++				data_addr = sg->len & AHD_SG_HIGH_ADDR_MASK;
++				data_addr <<= 8;
++				data_addr |= sg->addr;
++				data_len = sg->len;
++				sgptr += sizeof(*sg);
++			}
++
++			/*
++			 * Update residual information.
++			 */
++			ahd_outb(ahd, SCB_RESIDUAL_DATACNT+3, data_len >> 24);
++			ahd_outl(ahd, SCB_RESIDUAL_SGPTR, sgptr);
++
++			/*
++			 * Load the S/G.
++			 */
++			if (data_len & AHD_DMA_LAST_SEG) {
++				sgptr |= LAST_SEG;
++				ahd_outb(ahd, SG_STATE, 0);
++			}
++			ahd_outq(ahd, HADDR, data_addr);
++			ahd_outl(ahd, HCNT, data_len & AHD_SG_LEN_MASK);
++			ahd_outb(ahd, SG_CACHE_PRE, sgptr & 0xFF);
++
++			/*
++			 * Advertise the segment to the hardware.
++			 */
++			dfcntrl = ahd_inb(ahd, DFCNTRL)|PRELOADEN|HDMAEN;
++			if ((ahd->features & AHD_NEW_DFCNTRL_OPTS) != 0) {
++				/*
++				 * Use SCSIENWRDIS so that SCSIEN
++				 * is never modified by this
++				 * operation.
++				 */
++				dfcntrl |= SCSIENWRDIS;
++			}
++			ahd_outb(ahd, DFCNTRL, dfcntrl);
++		}
++	} else if ((ahd_inb(ahd, SG_CACHE_SHADOW) & LAST_SEG_DONE) != 0) {
++
++		/*
++		 * Transfer completed to the end of SG list
++		 * and has flushed to the host.
++		 */
++		ahd_outb(ahd, SCB_SGPTR,
++			 ahd_inb_scbram(ahd, SCB_SGPTR) | SG_LIST_NULL);
++		goto clrchn;
++	} else if ((ahd_inb(ahd, DFSTATUS) & FIFOEMP) != 0) {
++clrchn:
++		/*
++		 * Clear any handler for this FIFO, decrement
++		 * the FIFO use count for the SCB, and release
++		 * the FIFO.
++		 */
++		ahd_outb(ahd, LONGJMP_ADDR + 1, INVALID_ADDR);
++		ahd_outb(ahd, SCB_FIFO_USE_COUNT,
++			 ahd_inb_scbram(ahd, SCB_FIFO_USE_COUNT) - 1);
++		ahd_outb(ahd, DFFSXFRCTL, CLRCHN);
++	}
++}
++
+ void
+ ahd_run_qoutfifo(struct ahd_softc *ahd)
+ {
+@@ -476,7 +810,7 @@ ahd_run_qoutfifo(struct ahd_softc *ahd)
+ 	while ((ahd->qoutfifo[ahd->qoutfifonext]
+ 	     & QOUTFIFO_ENTRY_VALID_LE) == ahd->qoutfifonext_valid_tag) {
+ 
+-		scb_index = ahd_le16toh(ahd->qoutfifo[ahd->qoutfifonext]
++		scb_index = aic_le16toh(ahd->qoutfifo[ahd->qoutfifonext]
+ 				      & ~QOUTFIFO_ENTRY_VALID_LE);
+ 		scb = ahd_lookup_scb(ahd, scb_index);
+ 		if (scb == NULL) {
+@@ -556,26 +890,6 @@ ahd_handle_seqint(struct ahd_softc *ahd,
+ 		       ahd_name(ahd), seqintcode);
+ #endif
+ 	switch (seqintcode) {
+-	case BAD_SCB_STATUS:
+-	{
+-		struct	scb *scb;
+-		u_int	scbid;
+-		int	cmds_pending;
+-
+-		scbid = ahd_get_scbptr(ahd);
+-		scb = ahd_lookup_scb(ahd, scbid);
+-		if (scb != NULL) {
+-			ahd_complete_scb(ahd, scb);
+-		} else {
+-			printf("%s: WARNING no command for scb %d "
+-			       "(bad status)\n", ahd_name(ahd), scbid);
+-			ahd_dump_card_state(ahd);
+-		}
+-		cmds_pending = ahd_inw(ahd, CMDS_PENDING);
+-		if (cmds_pending > 0)
+-			ahd_outw(ahd, CMDS_PENDING, cmds_pending - 1);
+-		break;
+-	}
+ 	case ENTERING_NONPACK:
+ 	{
+ 		struct	scb *scb;
+@@ -589,7 +903,7 @@ ahd_handle_seqint(struct ahd_softc *ahd,
+ 			/*
+ 			 * Somehow need to know if this
+ 			 * is from a selection or reselection.
+-			 * From that, we can termine target
++			 * From that, we can determine target
+ 			 * ID so we at least have an I_T nexus.
+ 			 */
+ 		} else {
+@@ -740,11 +1054,11 @@ ahd_handle_seqint(struct ahd_softc *ahd,
+ 			ahd_outb(ahd, SAVED_LUN, 0);
+ 			ahd_outb(ahd, SEQ_FLAGS, 0);
+ 			ahd_assert_atn(ahd);
+-			scb->flags &= ~(SCB_PACKETIZED);
++			scb->flags &= ~SCB_PACKETIZED;
+ 			scb->flags |= SCB_ABORT|SCB_CMDPHASE_ABORT;
+ 			ahd_freeze_devq(ahd, scb);
+-			ahd_set_transaction_status(scb, CAM_REQUEUE_REQ);
+-			ahd_freeze_scb(scb);
++			aic_set_transaction_status(scb, CAM_REQUEUE_REQ);
++			aic_freeze_scb(scb);
+ 
+ 			/*
+ 			 * Allow the sequencer to continue with
+@@ -796,7 +1110,8 @@ ahd_handle_seqint(struct ahd_softc *ahd,
+ 			 * attempt to complete this bogus SCB.
+ 			 */
+ 			ahd_outb(ahd, SCB_CONTROL,
+-				 ahd_inb(ahd, SCB_CONTROL) & ~STATUS_RCVD);
++				 ahd_inb_scbram(ahd, SCB_CONTROL)
++				 & ~STATUS_RCVD);
+ 		}
+ 		break;
+ 	}
+@@ -991,7 +1306,7 @@ ahd_handle_seqint(struct ahd_softc *ahd,
+ 			       "NumSGs = %d.\n",
+ 			       ahd_inb(ahd, SEQ_FLAGS) & DPHASE
+ 			       ? "Have" : "Haven't",
+-			       ahd_get_transfer_length(scb), scb->sg_count);
++			       aic_get_transfer_length(scb), scb->sg_count);
+ 			ahd_dump_sglist(scb);
+ 		}
+ #endif
+@@ -1001,8 +1316,8 @@ ahd_handle_seqint(struct ahd_softc *ahd,
+ 		 * target does a command complete.
+ 		 */
+ 		ahd_freeze_devq(ahd, scb);
+-		ahd_set_transaction_status(scb, CAM_DATA_RUN_ERR);
+-		ahd_freeze_scb(scb);
++		aic_set_transaction_status(scb, CAM_DATA_RUN_ERR);
++		aic_freeze_scb(scb);
+ 		break;
+ 	}
+ 	case MKMSG_FAILED:
+@@ -1029,7 +1344,7 @@ ahd_handle_seqint(struct ahd_softc *ahd,
+ 					   ROLE_INITIATOR, /*status*/0,
+ 					   SEARCH_REMOVE);
+ 		ahd_outb(ahd, SCB_CONTROL,
+-			 ahd_inb(ahd, SCB_CONTROL) & ~MK_MESSAGE);
++			 ahd_inb_scbram(ahd, SCB_CONTROL) & ~MK_MESSAGE);
+ 		break;
+ 	}
+ 	case TASKMGMT_FUNC_COMPLETE:
+@@ -1263,7 +1578,7 @@ ahd_handle_scsiint(struct ahd_softc *ahd
+ 			 */
+ 			ahd_scb_devinfo(ahd, &devinfo, scb);
+ 			ahd_force_renegotiation(ahd, &devinfo);
+-			ahd_set_transaction_status(scb, CAM_SEL_TIMEOUT);
++			aic_set_transaction_status(scb, CAM_SEL_TIMEOUT);
+ 			ahd_freeze_devq(ahd, scb);
+ 		}
+ 		ahd_outb(ahd, CLRINT, CLRSCSIINT);
+@@ -1710,8 +2025,8 @@ ahd_handle_pkt_busfree(struct ahd_softc 
+ 			}
+ 			scb->crc_retry_count++;
+ 		} else {
+-			ahd_set_transaction_status(scb, CAM_UNCOR_PARITY);
+-			ahd_freeze_scb(scb);
++			aic_set_transaction_status(scb, CAM_UNCOR_PARITY);
++			aic_freeze_scb(scb);
+ 			ahd_freeze_devq(ahd, scb);
+ 		}
+ 		/* Return unpausing the sequencer. */
+@@ -1853,7 +2168,7 @@ ahd_handle_nonpkt_busfree(struct ahd_sof
+ 			 && ahd_match_scb(ahd, scb, target, 'A',
+ 					  CAM_LUN_WILDCARD, SCB_LIST_NULL,
+ 					  ROLE_INITIATOR))
+-				ahd_set_transaction_status(scb, CAM_REQ_CMP);
++				aic_set_transaction_status(scb, CAM_REQ_CMP);
+ #endif
+ 			ahd_handle_devreset(ahd, &devinfo, CAM_LUN_WILDCARD,
+ 					    CAM_BDR_SENT, "Bus Device Reset",
+@@ -1880,21 +2195,32 @@ ahd_handle_nonpkt_busfree(struct ahd_sof
+ 			tinfo->goal.ppr_options = 0;
+ 			ahd_qinfifo_requeue_tail(ahd, scb);
+ 			printerror = 0;
+-		} else if ((ahd_sent_msg(ahd, AHDMSG_EXT, MSG_EXT_WDTR, FALSE)
+-			 || ahd_sent_msg(ahd, AHDMSG_EXT, MSG_EXT_SDTR, FALSE))
++		} else if (ahd_sent_msg(ahd, AHDMSG_EXT, MSG_EXT_WDTR, FALSE)
+ 			&& ppr_busfree == 0) {
+ 			/*
+-			 * Negotiation Rejected.  Go-async and
++			 * Negotiation Rejected.  Go-narrow and
+ 			 * retry command.
+ 			 */
+ #ifdef AHD_DEBUG
+ 			if ((ahd_debug & AHD_SHOW_MESSAGES) != 0)
+-				printf("Negotiation rejected busfree.\n");
++				printf("WDTR negotiation rejected busfree.\n");
+ #endif
+ 			ahd_set_width(ahd, &devinfo,
+ 				      MSG_EXT_WDTR_BUS_8_BIT,
+ 				      AHD_TRANS_CUR|AHD_TRANS_GOAL,
+ 				      /*paused*/TRUE);
++			ahd_qinfifo_requeue_tail(ahd, scb);
++			printerror = 0;
++		} else if (ahd_sent_msg(ahd, AHDMSG_EXT, MSG_EXT_SDTR, FALSE)
++			&& ppr_busfree == 0) {
++			/*
++			 * Negotiation Rejected.  Go-async and
++			 * retry command.
++			 */
++#ifdef AHD_DEBUG
++			if ((ahd_debug & AHD_SHOW_MESSAGES) != 0)
++				printf("SDTR negotiation rejected busfree.\n");
++#endif
+ 			ahd_set_syncrate(ahd, &devinfo,
+ 					/*period*/0, /*offset*/0,
+ 					/*ppr_options*/0,
+@@ -1933,8 +2259,8 @@ ahd_handle_nonpkt_busfree(struct ahd_sof
+ 	 && ((ahd->msg_flags & MSG_FLAG_EXPECT_PPR_BUSFREE) != 0)) {
+ 
+ 		ahd_freeze_devq(ahd, scb);
+-		ahd_set_transaction_status(scb, CAM_REQUEUE_REQ);
+-		ahd_freeze_scb(scb);
++		aic_set_transaction_status(scb, CAM_REQUEUE_REQ);
++		aic_freeze_scb(scb);
+ 		if ((ahd->msg_flags & MSG_FLAG_IU_REQ_CHANGED) != 0) {
+ 			ahd_abort_scbs(ahd, SCB_GET_TARGET(ahd, scb),
+ 				       SCB_GET_CHANNEL(ahd, scb),
+@@ -1978,8 +2304,7 @@ ahd_handle_nonpkt_busfree(struct ahd_sof
+ 		       "PRGMCNT == 0x%x\n",
+ 		       ahd_lookup_phase_entry(lastphase)->phasemsg,
+ 		       aborted,
+-		       ahd_inb(ahd, PRGMCNT)
+-			| (ahd_inb(ahd, PRGMCNT+1) << 8));
++		       ahd_inw(ahd, PRGMCNT));
+ 		ahd_dump_card_state(ahd);
+ 	}
+ 	/* Always restart the sequencer. */
+@@ -2023,7 +2348,7 @@ ahd_handle_proto_violation(struct ahd_so
+ 		printf("No SCB found during protocol violation\n");
+ 		goto proto_violation_reset;
+ 	} else {
+-		ahd_set_transaction_status(scb, CAM_SEQUENCE_FAIL);
++		aic_set_transaction_status(scb, CAM_SEQUENCE_FAIL);
+ 		if ((seq_flags & NO_CDB_SENT) != 0) {
+ 			ahd_print_path(ahd, scb);
+ 			printf("No or incomplete CDB sent to device.\n");
+@@ -2142,8 +2467,7 @@ ahd_clear_critical_section(struct ahd_so
+ 		u_int	i;
+ 
+ 		ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI);
+-		seqaddr = ahd_inb(ahd, CURADDR)
+-			| (ahd_inb(ahd, CURADDR+1) << 8);
++		seqaddr = ahd_inw(ahd, CURADDR);
+ 
+ 		cs = ahd->critical_sections;
+ 		for (i = 0; i < ahd->num_critical_sections; i++, cs++) {
+@@ -2187,8 +2511,14 @@ ahd_clear_critical_section(struct ahd_so
+ 			ahd_outb(ahd, LQOMODE0, 0);
+ 			ahd_outb(ahd, LQOMODE1, 0);
+ 			ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI);
+-  			simode1 = ahd_inb(ahd, SIMODE1);
+-  			ahd_outb(ahd, SIMODE1, ENBUSFREE);
++			simode1 = ahd_inb(ahd, SIMODE1);
++			/*
++			 * We don't clear ENBUSFREE.  Unfortunately
++			 * we cannot re-enable busfree detection within
++			 * the current connection, so we must leave it
++			 * on while single stepping.
++			 */
++			ahd_outb(ahd, SIMODE1, simode1 & ENBUSFREE);
+ 			ahd_outb(ahd, SEQCTL0, ahd_inb(ahd, SEQCTL0) | STEP);
+ 			stepping = TRUE;
+ 		}
+@@ -2196,9 +2526,8 @@ ahd_clear_critical_section(struct ahd_so
+ 		ahd_outb(ahd, CLRINT, CLRSCSIINT);
+ 		ahd_set_modes(ahd, ahd->saved_src_mode, ahd->saved_dst_mode);
+ 		ahd_outb(ahd, HCNTRL, ahd->unpause);
+-		do {
+-			ahd_delay(200);
+-		} while (!ahd_is_paused(ahd));
++		while (!ahd_is_paused(ahd))
++			aic_delay(200);
+ 		ahd_update_modes(ahd);
+ 	}
+ 	if (stepping) {
+@@ -2274,10 +2603,10 @@ ahd_print_scb(struct scb *scb)
+ 	for (i = 0; i < sizeof(hscb->shared_data.idata.cdb); i++)
+ 		printf("%#02x", hscb->shared_data.idata.cdb[i]);
+ 	printf("        dataptr:%#x%x datacnt:%#x sgptr:%#x tag:%#x\n",
+-	       (uint32_t)((ahd_le64toh(hscb->dataptr) >> 32) & 0xFFFFFFFF),
+-	       (uint32_t)(ahd_le64toh(hscb->dataptr) & 0xFFFFFFFF),
+-	       ahd_le32toh(hscb->datacnt),
+-	       ahd_le32toh(hscb->sgptr),
++	       (uint32_t)((aic_le64toh(hscb->dataptr) >> 32) & 0xFFFFFFFF),
++	       (uint32_t)(aic_le64toh(hscb->dataptr) & 0xFFFFFFFF),
++	       aic_le32toh(hscb->datacnt),
++	       aic_le32toh(hscb->sgptr),
+ 	       SCB_GET_TAG(scb));
+ 	ahd_dump_sglist(scb);
+ }
+@@ -2296,8 +2625,8 @@ ahd_dump_sglist(struct scb *scb)
+ 				uint64_t addr;
+ 				uint32_t len;
+ 
+-				addr = ahd_le64toh(sg_list[i].addr);
+-				len = ahd_le32toh(sg_list[i].len);
++				addr = aic_le64toh(sg_list[i].addr);
++				len = aic_le32toh(sg_list[i].len);
+ 				printf("sg[%d] - Addr 0x%x%x : Length %d%s\n",
+ 				       i,
+ 				       (uint32_t)((addr >> 32) & 0xFFFFFFFF),
+@@ -2313,11 +2642,11 @@ ahd_dump_sglist(struct scb *scb)
+ 			for (i = 0; i < scb->sg_count; i++) {
+ 				uint32_t len;
+ 
+-				len = ahd_le32toh(sg_list[i].len);
++				len = aic_le32toh(sg_list[i].len);
+ 				printf("sg[%d] - Addr 0x%x%x : Length %d%s\n",
+ 				       i,
+-				       (len >> 24) & SG_HIGH_ADDR_BITS,
+-				       ahd_le32toh(sg_list[i].addr),
++				       (len & AHD_SG_HIGH_ADDR_MASK) >> 24,
++				       aic_le32toh(sg_list[i].addr),
+ 				       len & AHD_SG_LEN_MASK,
+ 				       len & AHD_DMA_LAST_SEG ? " Last" : "");
+ 			}
+@@ -2859,14 +3188,25 @@ ahd_update_neg_table(struct ahd_softc *a
+ 		iocell_opts[AHD_PRECOMP_SLEW_INDEX] &= ~AHD_PRECOMP_MASK;
+ 
+ 		if ((ahd->features & AHD_NEW_IOCELL_OPTS) != 0
+-		 && (ppr_opts & MSG_EXT_PPR_DT_REQ) != 0) {
++		 && (ppr_opts & MSG_EXT_PPR_DT_REQ) != 0
++		 && (ppr_opts & MSG_EXT_PPR_IU_REQ) == 0) {
+ 			/*
+ 			 * Slow down our CRC interval to be
+-			 * compatible with devices that can't
+-			 * handle a CRC at full speed.
++			 * compatible with non-packetized
++			 * U160 devices that can't handle a
++			 * CRC at full speed.
+ 			 */
+ 			con_opts |= ENSLOWCRC;
+ 		}
++
++		if ((ahd->bugs & AHD_PACED_NEGTABLE_BUG) != 0) {
++			/*
++			 * On H2A4, revert to a slower slewrate
++			 * on non-paced transfers.
++			 */
++			iocell_opts[AHD_PRECOMP_SLEW_INDEX] &=
++			    ~AHD_SLEWRATE_MASK;
++		}
+ 	}
+ 
+ 	ahd_outb(ahd, ANNEXCOL, AHD_ANNEXCOL_PRECOMP_SLEW);
+@@ -2904,7 +3244,7 @@ ahd_update_pending_scbs(struct ahd_softc
+ {
+ 	struct		scb *pending_scb;
+ 	int		pending_scb_count;
+-	int		i;
++	u_int		scb_tag;
+ 	int		paused;
+ 	u_int		saved_scbptr;
+ 	ahd_mode_state	saved_modes;
+@@ -2962,17 +3302,14 @@ ahd_update_pending_scbs(struct ahd_softc
+ 	ahd_outb(ahd, SCSISEQ0, ahd_inb(ahd, SCSISEQ0) & ~ENSELO);
+ 	saved_scbptr = ahd_get_scbptr(ahd);
+ 	/* Ensure that the hscbs down on the card match the new information */
+-	for (i = 0; i < ahd->scb_data.maxhscbs; i++) {
++	for (scb_tag = 0; scb_tag < ahd->scb_data.maxhscbs; scb_tag++) {
+ 		struct	hardware_scb *pending_hscb;
+ 		u_int	control;
+-		u_int	scb_tag;
+ 
+-		ahd_set_scbptr(ahd, i);
+-		scb_tag = i;
+ 		pending_scb = ahd_lookup_scb(ahd, scb_tag);
+ 		if (pending_scb == NULL)
+ 			continue;
+-
++		ahd_set_scbptr(ahd, scb_tag);
+ 		pending_hscb = pending_scb->hscb;
+ 		control = ahd_inb_scbram(ahd, SCB_CONTROL);
+ 		control &= ~MK_MESSAGE;
+@@ -3187,7 +3524,7 @@ ahd_setup_initiator_msgout(struct ahd_so
+ 		       devinfo->target_mask);
+ 		panic("SCB = %d, SCB Control = %x:%x, MSG_OUT = %x "
+ 		      "SCB flags = %x", SCB_GET_TAG(scb), scb->hscb->control,
+-		      ahd_inb(ahd, SCB_CONTROL), ahd_inb(ahd, MSG_OUT),
++		      ahd_inb_scbram(ahd, SCB_CONTROL), ahd_inb(ahd, MSG_OUT),
+ 		      scb->flags);
+ 	}
+ 
+@@ -3232,6 +3569,7 @@ ahd_build_transfer_msg(struct ahd_softc 
+ 	 * may change.
+ 	 */
+ 	period = tinfo->goal.period;
++	offset = tinfo->goal.offset;
+ 	ppr_options = tinfo->goal.ppr_options;
+ 	/* Target initiated PPR is not allowed in the SCSI spec */
+ 	if (devinfo->role == ROLE_TARGET)
+@@ -3239,7 +3577,7 @@ ahd_build_transfer_msg(struct ahd_softc 
+ 	ahd_devlimited_syncrate(ahd, tinfo, &period,
+ 				&ppr_options, devinfo->role);
+ 	dowide = tinfo->curr.width != tinfo->goal.width;
+-	dosync = tinfo->curr.period != period;
++	dosync = tinfo->curr.offset != offset || tinfo->curr.period != period;
+ 	/*
+ 	 * Only use PPR if we have options that need it, even if the device
+ 	 * claims to support it.  There might be an expander in the way
+@@ -3249,7 +3587,7 @@ ahd_build_transfer_msg(struct ahd_softc 
+ 
+ 	if (!dowide && !dosync && !doppr) {
+ 		dowide = tinfo->goal.width != MSG_EXT_WDTR_BUS_8_BIT;
+-		dosync = tinfo->goal.period != 0;
++		dosync = tinfo->goal.offset != 0;
+ 	}
+ 
+ 	if (!dowide && !dosync && !doppr) {
+@@ -3725,8 +4063,13 @@ reswitch:
+ 		if ((ahd->msg_flags & MSG_FLAG_PACKETIZED) != 0) {
+ 			printf("%s: Returning to Idle Loop\n",
+ 			       ahd_name(ahd));
+-			ahd_outb(ahd, LASTPHASE, P_BUSFREE);
+ 			ahd_clear_msg_state(ahd);
++
++			/*
++			 * Perform the equivalent of a clear_target_state.
++			 */
++			ahd_outb(ahd, LASTPHASE, P_BUSFREE);
++			ahd_outb(ahd, SEQ_FLAGS, NOT_IDENTIFIED|NO_CDB_SENT);
+ 			ahd_outb(ahd, SEQCTL0, FASTMODE|SEQRESET);
+ 		} else {
+ 			ahd_clear_msg_state(ahd);
+@@ -3983,22 +4326,30 @@ ahd_parse_msg(struct ahd_softc *ahd, str
+ 				response = TRUE;
+ 				sending_reply = TRUE;
+ 			}
++			/*
++			 * After a wide message, we are async, but
++			 * some devices don't seem to honor this portion
++			 * of the spec.  Force a renegotiation of the
++			 * sync component of our transfer agreement even
++			 * if our goal is async.  By updating our width
++			 * after forcing the negotiation, we avoid
++			 * renegotiating for width.
++			 */
++			ahd_update_neg_request(ahd, devinfo, tstate,
++					       tinfo, AHD_NEG_ALWAYS);
+ 			ahd_set_width(ahd, devinfo, bus_width,
+ 				      AHD_TRANS_ACTIVE|AHD_TRANS_GOAL,
+ 				      /*paused*/TRUE);
+-			/* After a wide message, we are async */
+-			ahd_set_syncrate(ahd, devinfo, /*period*/0,
+-					 /*offset*/0, /*ppr_options*/0,
+-					 AHD_TRANS_ACTIVE, /*paused*/TRUE);
+ 			if (sending_reply == FALSE && reject == FALSE) {
+ 
+-				if (tinfo->goal.offset) {
+-					ahd->msgout_index = 0;
+-					ahd->msgout_len = 0;
+-					ahd_build_transfer_msg(ahd, devinfo);
+-					ahd->msgout_index = 0;
+-					response = TRUE;
+-				}
++				/*
++				 * We will always have an SDTR to send.
++				 */
++				ahd->msgout_index = 0;
++				ahd->msgout_len = 0;
++				ahd_build_transfer_msg(ahd, devinfo);
++				ahd->msgout_index = 0;
++				response = TRUE;
+ 			}
+ 			done = MSGLOOP_MSGCOMPLETE;
+ 			break;
+@@ -4326,7 +4677,7 @@ ahd_handle_msg_reject(struct ahd_softc *
+ 		ahd_outb(ahd, SCB_CONTROL,
+ 			 ahd_inb_scbram(ahd, SCB_CONTROL) & mask);
+ 	 	scb->hscb->control &= mask;
+-		ahd_set_transaction_tag(scb, /*enabled*/FALSE,
++		aic_set_transaction_tag(scb, /*enabled*/FALSE,
+ 					/*type*/MSG_SIMPLE_TASK);
+ 		ahd_outb(ahd, MSG_OUT, MSG_IDENTIFYFLAG);
+ 		ahd_assert_atn(ahd);
+@@ -4384,7 +4735,7 @@ ahd_handle_ign_wide_residue(struct ahd_s
+ 	 * Perhaps add datadir to some spare bits in the hscb?
+ 	 */
+ 	if ((ahd_inb(ahd, SEQ_FLAGS) & DPHASE) == 0
+-	 || ahd_get_transfer_dir(scb) != CAM_DIR_IN) {
++	 || aic_get_transfer_dir(scb) != CAM_DIR_IN) {
+ 		/*
+ 		 * Ignore the message if we haven't
+ 		 * seen an appropriate data phase yet.
+@@ -4401,7 +4752,8 @@ ahd_handle_ign_wide_residue(struct ahd_s
+ 
+ 		sgptr = ahd_inb_scbram(ahd, SCB_RESIDUAL_SGPTR);
+ 		if ((sgptr & SG_LIST_NULL) != 0
+-		 && (ahd_inb(ahd, SCB_TASK_ATTRIBUTE) & SCB_XFERLEN_ODD) != 0) {
++		 && (ahd_inb_scbram(ahd, SCB_TASK_ATTRIBUTE)
++		     & SCB_XFERLEN_ODD) != 0) {
+ 			/*
+ 			 * If the residual occurred on the last
+ 			 * transfer and the transfer request was
+@@ -4438,18 +4790,18 @@ ahd_handle_ign_wide_residue(struct ahd_s
+ 				 * to load so we must go back one.
+ 				 */
+ 				sg--;
+-				sglen = ahd_le32toh(sg->len) & AHD_SG_LEN_MASK;
++				sglen = aic_le32toh(sg->len) & AHD_SG_LEN_MASK;
+ 				if (sg != scb->sg_list
+ 				 && sglen < (data_cnt & AHD_SG_LEN_MASK)) {
+ 
+ 					sg--;
+-					sglen = ahd_le32toh(sg->len);
++					sglen = aic_le32toh(sg->len);
+ 					/*
+ 					 * Preserve High Address and SG_LIST
+ 					 * bits while setting the count to 1.
+ 					 */
+ 					data_cnt = 1|(sglen&(~AHD_SG_LEN_MASK));
+-					data_addr = ahd_le64toh(sg->addr)
++					data_addr = aic_le64toh(sg->addr)
+ 						  + (sglen & AHD_SG_LEN_MASK)
+ 						  - 1;
+ 
+@@ -4471,18 +4823,18 @@ ahd_handle_ign_wide_residue(struct ahd_s
+ 				 * to load so we must go back one.
+ 				 */
+ 				sg--;
+-				sglen = ahd_le32toh(sg->len) & AHD_SG_LEN_MASK;
++				sglen = aic_le32toh(sg->len) & AHD_SG_LEN_MASK;
+ 				if (sg != scb->sg_list
+ 				 && sglen < (data_cnt & AHD_SG_LEN_MASK)) {
+ 
+ 					sg--;
+-					sglen = ahd_le32toh(sg->len);
++					sglen = aic_le32toh(sg->len);
+ 					/*
+ 					 * Preserve High Address and SG_LIST
+ 					 * bits while setting the count to 1.
+ 					 */
+ 					data_cnt = 1|(sglen&(~AHD_SG_LEN_MASK));
+-					data_addr = ahd_le32toh(sg->addr)
++					data_addr = aic_le32toh(sg->addr)
+ 						  + (sglen & AHD_SG_LEN_MASK)
+ 						  - 1;
+ 
+@@ -4502,7 +4854,8 @@ ahd_handle_ign_wide_residue(struct ahd_s
+ 			 * correct for subsequent data transfers.
+ 			 */
+ 			ahd_outb(ahd, SCB_TASK_ATTRIBUTE,
+-			    ahd_inb(ahd, SCB_TASK_ATTRIBUTE) ^ SCB_XFERLEN_ODD);
++			    ahd_inb_scbram(ahd, SCB_TASK_ATTRIBUTE)
++			    ^ SCB_XFERLEN_ODD);
+ 
+ 			ahd_outl(ahd, SCB_RESIDUAL_SGPTR, sgptr);
+ 			ahd_outl(ahd, SCB_RESIDUAL_DATACNT, data_cnt);
+@@ -4542,9 +4895,8 @@ ahd_reinitialize_dataptrs(struct ahd_sof
+ 	 */
+ 	ahd_outb(ahd, DFFSXFRCTL, CLRCHN);
+ 	wait = 1000;
+-	do {
+-		ahd_delay(100);
+-	} while (--wait && !(ahd_inb(ahd, MDFFSTAT) & FIFOFREE));
++	while (--wait && !(ahd_inb(ahd, MDFFSTAT) & FIFOFREE))
++		aic_delay(100);
+ 	if (wait == 0) {
+ 		ahd_print_path(ahd, scb);
+ 		printf("ahd_reinitialize_dataptrs: Forcing FIFO free.\n");
+@@ -4560,10 +4912,7 @@ ahd_reinitialize_dataptrs(struct ahd_sof
+ 	 * Determine initial values for data_addr and data_cnt
+ 	 * for resuming the data phase.
+ 	 */
+-	sgptr = (ahd_inb_scbram(ahd, SCB_RESIDUAL_SGPTR + 3) << 24)
+-	      | (ahd_inb_scbram(ahd, SCB_RESIDUAL_SGPTR + 2) << 16)
+-	      | (ahd_inb_scbram(ahd, SCB_RESIDUAL_SGPTR + 1) << 8)
+-	      |	ahd_inb_scbram(ahd, SCB_RESIDUAL_SGPTR);
++	sgptr = ahd_inl_scbram(ahd, SCB_RESIDUAL_SGPTR);
+ 	sgptr &= SG_PTR_MASK;
+ 
+ 	resid = (ahd_inb_scbram(ahd, SCB_RESIDUAL_DATACNT + 2) << 16)
+@@ -4578,13 +4927,10 @@ ahd_reinitialize_dataptrs(struct ahd_sof
+ 		/* The residual sg_ptr always points to the next sg */
+ 		sg--;
+ 
+-		dataptr = ahd_le64toh(sg->addr)
+-			+ (ahd_le32toh(sg->len) & AHD_SG_LEN_MASK)
++		dataptr = aic_le64toh(sg->addr)
++			+ (aic_le32toh(sg->len) & AHD_SG_LEN_MASK)
+ 			- resid;
+-		ahd_outb(ahd, HADDR + 7, dataptr >> 56);
+-		ahd_outb(ahd, HADDR + 6, dataptr >> 48);
+-		ahd_outb(ahd, HADDR + 5, dataptr >> 40);
+-		ahd_outb(ahd, HADDR + 4, dataptr >> 32);
++		ahd_outl(ahd, HADDR + 4, dataptr >> 32);
+ 	} else {
+ 		struct	 ahd_dma_seg *sg;
+ 
+@@ -4593,16 +4939,13 @@ ahd_reinitialize_dataptrs(struct ahd_sof
+ 		/* The residual sg_ptr always points to the next sg */
+ 		sg--;
+ 
+-		dataptr = ahd_le32toh(sg->addr)
+-			+ (ahd_le32toh(sg->len) & AHD_SG_LEN_MASK)
++		dataptr = aic_le32toh(sg->addr)
++			+ (aic_le32toh(sg->len) & AHD_SG_LEN_MASK)
+ 			- resid;
+ 		ahd_outb(ahd, HADDR + 4,
+-			 (ahd_le32toh(sg->len) & ~AHD_SG_LEN_MASK) >> 24);
++			 (aic_le32toh(sg->len) & ~AHD_SG_LEN_MASK) >> 24);
+ 	}
+-	ahd_outb(ahd, HADDR + 3, dataptr >> 24);
+-	ahd_outb(ahd, HADDR + 2, dataptr >> 16);
+-	ahd_outb(ahd, HADDR + 1, dataptr >> 8);
+-	ahd_outb(ahd, HADDR, dataptr);
++	ahd_outl(ahd, HADDR, dataptr);
+ 	ahd_outb(ahd, HCNT + 2, resid >> 16);
+ 	ahd_outb(ahd, HCNT + 1, resid >> 8);
+ 	ahd_outb(ahd, HCNT, resid);
+@@ -4796,8 +5139,8 @@ ahd_alloc(void *platform_arg, char *name
+ 	ahd->bugs = AHD_BUGNONE;
+ 	ahd->flags = AHD_SPCHK_ENB_A|AHD_RESET_BUS_A|AHD_TERM_ENB_A
+ 		   | AHD_EXTENDED_TRANS_A|AHD_STPWLEVEL_A;
+-	ahd_timer_init(&ahd->reset_timer);
+-	ahd_timer_init(&ahd->stat_timer);
++	aic_timer_init(&ahd->reset_timer);
++	aic_timer_init(&ahd->stat_timer);
+ 	ahd->int_coalescing_timer = AHD_INT_COALESCING_TIMER_DEFAULT;
+ 	ahd->int_coalescing_maxcmds = AHD_INT_COALESCING_MAXCMDS_DEFAULT;
+ 	ahd->int_coalescing_mincmds = AHD_INT_COALESCING_MINCMDS_DEFAULT;
+@@ -4833,24 +5176,24 @@ ahd_softc_insert(struct ahd_softc *ahd)
+ {
+ 	struct ahd_softc *list_ahd;
+ 
+-#if AHD_PCI_CONFIG > 0
++#if AIC_PCI_CONFIG > 0
+ 	/*
+ 	 * Second Function PCI devices need to inherit some
+ 	 * settings from function 0.
+ 	 */
+ 	if ((ahd->features & AHD_MULTI_FUNC) != 0) {
+ 		TAILQ_FOREACH(list_ahd, &ahd_tailq, links) {
+-			ahd_dev_softc_t list_pci;
+-			ahd_dev_softc_t pci;
++			aic_dev_softc_t list_pci;
++			aic_dev_softc_t pci;
+ 
+ 			list_pci = list_ahd->dev_softc;
+ 			pci = ahd->dev_softc;
+-			if (ahd_get_pci_slot(list_pci) == ahd_get_pci_slot(pci)
+-			 && ahd_get_pci_bus(list_pci) == ahd_get_pci_bus(pci)) {
++			if (aic_get_pci_slot(list_pci) == aic_get_pci_slot(pci)
++			 && aic_get_pci_bus(list_pci) == aic_get_pci_bus(pci)) {
+ 				struct ahd_softc *master;
+ 				struct ahd_softc *slave;
+ 
+-				if (ahd_get_pci_function(list_pci) == 0) {
++				if (aic_get_pci_function(list_pci) == 0) {
+ 					master = list_ahd;
+ 					slave = ahd;
+ 				} else {
+@@ -4915,27 +5258,27 @@ ahd_free(struct ahd_softc *ahd)
+ {
+ 	int i;
+ 
++	ahd_terminate_recovery_thread(ahd);
+ 	switch (ahd->init_level) {
+ 	default:
+ 	case 5:
+ 		ahd_shutdown(ahd);
+-		TAILQ_REMOVE(&ahd_tailq, ahd, links);
+ 		/* FALLTHROUGH */
+ 	case 4:
+-		ahd_dmamap_unload(ahd, ahd->shared_data_dmat,
+-				  ahd->shared_data_dmamap);
++		aic_dmamap_unload(ahd, ahd->shared_data_dmat,
++				  ahd->shared_data_map.dmamap);
+ 		/* FALLTHROUGH */
+ 	case 3:
+-		ahd_dmamem_free(ahd, ahd->shared_data_dmat, ahd->qoutfifo,
+-				ahd->shared_data_dmamap);
+-		ahd_dmamap_destroy(ahd, ahd->shared_data_dmat,
+-				   ahd->shared_data_dmamap);
++		aic_dmamem_free(ahd, ahd->shared_data_dmat, ahd->qoutfifo,
++				ahd->shared_data_map.dmamap);
++		aic_dmamap_destroy(ahd, ahd->shared_data_dmat,
++				   ahd->shared_data_map.dmamap);
+ 		/* FALLTHROUGH */
+ 	case 2:
+-		ahd_dma_tag_destroy(ahd, ahd->shared_data_dmat);
++		aic_dma_tag_destroy(ahd, ahd->shared_data_dmat);
+ 	case 1:
+ #ifndef __linux__
+-		ahd_dma_tag_destroy(ahd, ahd->buffer_dmat);
++		aic_dma_tag_destroy(ahd, ahd->buffer_dmat);
+ #endif
+ 		break;
+ 	case 0:
+@@ -4943,7 +5286,7 @@ ahd_free(struct ahd_softc *ahd)
+ 	}
+ 
+ #ifndef __linux__
+-	ahd_dma_tag_destroy(ahd, ahd->parent_dmat);
++	aic_dma_tag_destroy(ahd, ahd->parent_dmat);
+ #endif
+ 	ahd_platform_free(ahd);
+ 	ahd_fini_scbdata(ahd);
+@@ -4996,19 +5339,24 @@ ahd_shutdown(void *arg)
+ 	/*
+ 	 * Stop periodic timer callbacks.
+ 	 */
+-	ahd_timer_stop(&ahd->reset_timer);
+-	ahd_timer_stop(&ahd->stat_timer);
++	aic_timer_stop(&ahd->reset_timer);
++	aic_timer_stop(&ahd->stat_timer);
+ 
+ 	/* This will reset most registers to 0, but not all */
+-	ahd_reset(ahd);
++	ahd_reset(ahd, /*reinit*/FALSE);
+ }
+ 
+ /*
+  * Reset the controller and record some information about it
+- * that is only available just after a reset.
++ * that is only available just after a reset.  If "reinit" is
++ * non-zero, this reset occured after initial configuration
++ * and the caller requests that the chip be fully reinitialized
++ * to a runable state.  Chip interrupts are *not* enabled after
++ * a reinitialization.  The caller must enable interrupts via
++ * ahd_intr_enable().
+  */
+ int
+-ahd_reset(struct ahd_softc *ahd)
++ahd_reset(struct ahd_softc *ahd, int reinit)
+ {
+ 	u_int	 sxfrctl1;
+ 	int	 wait;
+@@ -5024,7 +5372,7 @@ ahd_reset(struct ahd_softc *ahd)
+ 	ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI);
+ 	sxfrctl1 = ahd_inb(ahd, SXFRCTL1);
+ 
+-	cmd = ahd_pci_read_config(ahd->dev_softc, PCIR_COMMAND, /*bytes*/2);
++	cmd = aic_pci_read_config(ahd->dev_softc, PCIR_COMMAND, /*bytes*/2);
+ 	if ((ahd->bugs & AHD_PCIX_CHIPRST_BUG) != 0) {
+ 		uint32_t mod_cmd;
+ 
+@@ -5038,7 +5386,7 @@ ahd_reset(struct ahd_softc *ahd)
+ 		 * PERR and SERR responses during the CHIPRST.
+ 		 */
+ 		mod_cmd = cmd & ~(PCIM_CMD_PERRESPEN|PCIM_CMD_SERRESPEN);
+-		ahd_pci_write_config(ahd->dev_softc, PCIR_COMMAND,
++		aic_pci_write_config(ahd->dev_softc, PCIR_COMMAND,
+ 				     mod_cmd, /*bytes*/2);
+ 	}
+ 	ahd_outb(ahd, HCNTRL, CHIPRST | ahd->pause);
+@@ -5051,7 +5399,7 @@ ahd_reset(struct ahd_softc *ahd)
+ 	 */
+ 	wait = 1000;
+ 	do {
+-		ahd_delay(1000);
++		aic_delay(1000);
+ 	} while (--wait && !(ahd_inb(ahd, HCNTRL) & CHIPRSTACK));
+ 
+ 	if (wait == 0) {
+@@ -5065,9 +5413,9 @@ ahd_reset(struct ahd_softc *ahd)
+ 		 * Clear any latched PCI error status and restore
+ 		 * previous SERR and PERR response enables.
+ 		 */
+-		ahd_pci_write_config(ahd->dev_softc, PCIR_STATUS + 1,
++		aic_pci_write_config(ahd->dev_softc, PCIR_STATUS + 1,
+ 				     0xFF, /*bytes*/1);
+-		ahd_pci_write_config(ahd->dev_softc, PCIR_COMMAND,
++		aic_pci_write_config(ahd->dev_softc, PCIR_COMMAND,
+ 				     cmd, /*bytes*/2);
+ 	}
+ 
+@@ -5101,7 +5449,7 @@ ahd_reset(struct ahd_softc *ahd)
+ 	 * If a recovery action has forced a chip reset,
+ 	 * re-initialize the chip to our liking.
+ 	 */
+-	if (ahd->init_level > 0)
++	if (reinit != 0)
+ 		ahd_chip_init(ahd);
+ 
+ 	return (0);
+@@ -5194,7 +5542,7 @@ ahd_init_scbdata(struct ahd_softc *ahd)
+ 	 */
+ 
+ 	/* DMA tag for our hardware scb structures */
+-	if (ahd_dma_tag_create(ahd, ahd->parent_dmat, /*alignment*/1,
++	if (aic_dma_tag_create(ahd, ahd->parent_dmat, /*alignment*/1,
+ 			       /*boundary*/BUS_SPACE_MAXADDR_32BIT + 1,
+ 			       /*lowaddr*/BUS_SPACE_MAXADDR_32BIT,
+ 			       /*highaddr*/BUS_SPACE_MAXADDR,
+@@ -5208,7 +5556,7 @@ ahd_init_scbdata(struct ahd_softc *ahd)
+ 	scb_data->init_level++;
+ 
+ 	/* DMA tag for our S/G structures. */
+-	if (ahd_dma_tag_create(ahd, ahd->parent_dmat, /*alignment*/8,
++	if (aic_dma_tag_create(ahd, ahd->parent_dmat, /*alignment*/8,
+ 			       /*boundary*/BUS_SPACE_MAXADDR_32BIT + 1,
+ 			       /*lowaddr*/BUS_SPACE_MAXADDR_32BIT,
+ 			       /*highaddr*/BUS_SPACE_MAXADDR,
+@@ -5227,7 +5575,7 @@ ahd_init_scbdata(struct ahd_softc *ahd)
+ 	scb_data->init_level++;
+ 
+ 	/* DMA tag for our sense buffers.  We allocate in page sized chunks */
+-	if (ahd_dma_tag_create(ahd, ahd->parent_dmat, /*alignment*/1,
++	if (aic_dma_tag_create(ahd, ahd->parent_dmat, /*alignment*/1,
+ 			       /*boundary*/BUS_SPACE_MAXADDR_32BIT + 1,
+ 			       /*lowaddr*/BUS_SPACE_MAXADDR_32BIT,
+ 			       /*highaddr*/BUS_SPACE_MAXADDR,
+@@ -5315,13 +5663,13 @@ ahd_fini_scbdata(struct ahd_softc *ahd)
+ 
+ 		while ((sns_map = SLIST_FIRST(&scb_data->sense_maps)) != NULL) {
+ 			SLIST_REMOVE_HEAD(&scb_data->sense_maps, links);
+-			ahd_dmamap_unload(ahd, scb_data->sense_dmat,
++			aic_dmamap_unload(ahd, scb_data->sense_dmat,
+ 					  sns_map->dmamap);
+-			ahd_dmamem_free(ahd, scb_data->sense_dmat,
++			aic_dmamem_free(ahd, scb_data->sense_dmat,
+ 					sns_map->vaddr, sns_map->dmamap);
+ 			free(sns_map, M_DEVBUF);
+ 		}
+-		ahd_dma_tag_destroy(ahd, scb_data->sense_dmat);
++		aic_dma_tag_destroy(ahd, scb_data->sense_dmat);
+ 		/* FALLTHROUGH */
+ 	}
+ 	case 6:
+@@ -5330,13 +5678,13 @@ ahd_fini_scbdata(struct ahd_softc *ahd)
+ 
+ 		while ((sg_map = SLIST_FIRST(&scb_data->sg_maps)) != NULL) {
+ 			SLIST_REMOVE_HEAD(&scb_data->sg_maps, links);
+-			ahd_dmamap_unload(ahd, scb_data->sg_dmat,
++			aic_dmamap_unload(ahd, scb_data->sg_dmat,
+ 					  sg_map->dmamap);
+-			ahd_dmamem_free(ahd, scb_data->sg_dmat,
++			aic_dmamem_free(ahd, scb_data->sg_dmat,
+ 					sg_map->vaddr, sg_map->dmamap);
+ 			free(sg_map, M_DEVBUF);
+ 		}
+-		ahd_dma_tag_destroy(ahd, scb_data->sg_dmat);
++		aic_dma_tag_destroy(ahd, scb_data->sg_dmat);
+ 		/* FALLTHROUGH */
+ 	}
+ 	case 5:
+@@ -5345,13 +5693,13 @@ ahd_fini_scbdata(struct ahd_softc *ahd)
+ 
+ 		while ((hscb_map = SLIST_FIRST(&scb_data->hscb_maps)) != NULL) {
+ 			SLIST_REMOVE_HEAD(&scb_data->hscb_maps, links);
+-			ahd_dmamap_unload(ahd, scb_data->hscb_dmat,
++			aic_dmamap_unload(ahd, scb_data->hscb_dmat,
+ 					  hscb_map->dmamap);
+-			ahd_dmamem_free(ahd, scb_data->hscb_dmat,
++			aic_dmamem_free(ahd, scb_data->hscb_dmat,
+ 					hscb_map->vaddr, hscb_map->dmamap);
+ 			free(hscb_map, M_DEVBUF);
+ 		}
+-		ahd_dma_tag_destroy(ahd, scb_data->hscb_dmat);
++		aic_dma_tag_destroy(ahd, scb_data->hscb_dmat);
+ 		/* FALLTHROUGH */
+ 	}
+ 	case 4:
+@@ -5382,6 +5730,7 @@ ahd_setup_iocell_workaround(struct ahd_s
+ 		printf("%s: Setting up iocell workaround\n", ahd_name(ahd));
+ #endif
+ 	ahd_restore_modes(ahd, saved_modes);
++	ahd->flags &= ~AHD_HAD_FIRST_SEL;
+ }
+ 
+ static void
+@@ -5390,6 +5739,8 @@ ahd_iocell_first_selection(struct ahd_so
+ 	ahd_mode_state	saved_modes;
+ 	u_int		sblkctl;
+ 
++	if ((ahd->flags & AHD_HAD_FIRST_SEL) != 0)
++		return;
+ 	saved_modes = ahd_save_modes(ahd);
+ 	ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI);
+ 	sblkctl = ahd_inb(ahd, SBLKCTL);
+@@ -5409,6 +5760,7 @@ ahd_iocell_first_selection(struct ahd_so
+ 	ahd_outb(ahd, SIMODE0, ahd_inb(ahd, SIMODE0) & ~(ENSELDO|ENSELDI));
+ 	ahd_outb(ahd, CLRINT, CLRSCSIINT);
+ 	ahd_restore_modes(ahd, saved_modes);
++	ahd->flags |= AHD_HAD_FIRST_SEL;
+ }
+ 
+ /*************************** SCB Management ***********************************/
+@@ -5552,7 +5904,7 @@ ahd_free_scb(struct ahd_softc *ahd, stru
+ 				 scb, links.le);
+ 	}
+ 
+-	ahd_platform_scb_free(ahd, scb);
++	aic_platform_scb_free(ahd, scb);
+ }
+ 
+ void
+@@ -5583,7 +5935,7 @@ ahd_alloc_scbs(struct ahd_softc *ahd)
+ 		offset = (PAGE_SIZE / sizeof(*hscb)) - scb_data->scbs_left;
+ 		hscb_map = SLIST_FIRST(&scb_data->hscb_maps);
+ 		hscb = &((struct hardware_scb *)hscb_map->vaddr)[offset];
+-		hscb_busaddr = hscb_map->physaddr + (offset * sizeof(*hscb));
++		hscb_busaddr = hscb_map->busaddr + (offset * sizeof(*hscb));
+ 	} else {
+ 		hscb_map = malloc(sizeof(*hscb_map), M_DEVBUF, M_NOWAIT);
+ 
+@@ -5591,7 +5943,7 @@ ahd_alloc_scbs(struct ahd_softc *ahd)
+ 			return;
+ 
+ 		/* Allocate the next batch of hardware SCBs */
+-		if (ahd_dmamem_alloc(ahd, scb_data->hscb_dmat,
++		if (aic_dmamem_alloc(ahd, scb_data->hscb_dmat,
+ 				     (void **)&hscb_map->vaddr,
+ 				     BUS_DMA_NOWAIT, &hscb_map->dmamap) != 0) {
+ 			free(hscb_map, M_DEVBUF);
+@@ -5600,12 +5952,12 @@ ahd_alloc_scbs(struct ahd_softc *ahd)
+ 
+ 		SLIST_INSERT_HEAD(&scb_data->hscb_maps, hscb_map, links);
+ 
+-		ahd_dmamap_load(ahd, scb_data->hscb_dmat, hscb_map->dmamap,
++		aic_dmamap_load(ahd, scb_data->hscb_dmat, hscb_map->dmamap,
+ 				hscb_map->vaddr, PAGE_SIZE, ahd_dmamap_cb,
+-				&hscb_map->physaddr, /*flags*/0);
++				&hscb_map->busaddr, /*flags*/0);
+ 
+ 		hscb = (struct hardware_scb *)hscb_map->vaddr;
+-		hscb_busaddr = hscb_map->physaddr;
++		hscb_busaddr = hscb_map->busaddr;
+ 		scb_data->scbs_left = PAGE_SIZE / sizeof(*hscb);
+ 	}
+ 
+@@ -5616,7 +5968,7 @@ ahd_alloc_scbs(struct ahd_softc *ahd)
+ 		       - scb_data->sgs_left) * ahd_sglist_size(ahd);
+ 		sg_map = SLIST_FIRST(&scb_data->sg_maps);
+ 		segs = sg_map->vaddr + offset;
+-		sg_busaddr = sg_map->physaddr + offset;
++		sg_busaddr = sg_map->busaddr + offset;
+ 	} else {
+ 		sg_map = malloc(sizeof(*sg_map), M_DEVBUF, M_NOWAIT);
+ 
+@@ -5624,7 +5976,7 @@ ahd_alloc_scbs(struct ahd_softc *ahd)
+ 			return;
+ 
+ 		/* Allocate the next batch of S/G lists */
+-		if (ahd_dmamem_alloc(ahd, scb_data->sg_dmat,
++		if (aic_dmamem_alloc(ahd, scb_data->sg_dmat,
+ 				     (void **)&sg_map->vaddr,
+ 				     BUS_DMA_NOWAIT, &sg_map->dmamap) != 0) {
+ 			free(sg_map, M_DEVBUF);
+@@ -5633,12 +5985,12 @@ ahd_alloc_scbs(struct ahd_softc *ahd)
+ 
+ 		SLIST_INSERT_HEAD(&scb_data->sg_maps, sg_map, links);
+ 
+-		ahd_dmamap_load(ahd, scb_data->sg_dmat, sg_map->dmamap,
++		aic_dmamap_load(ahd, scb_data->sg_dmat, sg_map->dmamap,
+ 				sg_map->vaddr, ahd_sglist_allocsize(ahd),
+-				ahd_dmamap_cb, &sg_map->physaddr, /*flags*/0);
++				ahd_dmamap_cb, &sg_map->busaddr, /*flags*/0);
+ 
+ 		segs = sg_map->vaddr;
+-		sg_busaddr = sg_map->physaddr;
++		sg_busaddr = sg_map->busaddr;
+ 		scb_data->sgs_left =
+ 		    ahd_sglist_allocsize(ahd) / ahd_sglist_size(ahd);
+ #ifdef AHD_DEBUG
+@@ -5653,7 +6005,7 @@ ahd_alloc_scbs(struct ahd_softc *ahd)
+ 		offset = PAGE_SIZE - (AHD_SENSE_BUFSIZE * scb_data->sense_left);
+ 		sense_map = SLIST_FIRST(&scb_data->sense_maps);
+ 		sense_data = sense_map->vaddr + offset;
+-		sense_busaddr = sense_map->physaddr + offset;
++		sense_busaddr = sense_map->busaddr + offset;
+ 	} else {
+ 		sense_map = malloc(sizeof(*sense_map), M_DEVBUF, M_NOWAIT);
+ 
+@@ -5661,7 +6013,7 @@ ahd_alloc_scbs(struct ahd_softc *ahd)
+ 			return;
+ 
+ 		/* Allocate the next batch of sense buffers */
+-		if (ahd_dmamem_alloc(ahd, scb_data->sense_dmat,
++		if (aic_dmamem_alloc(ahd, scb_data->sense_dmat,
+ 				     (void **)&sense_map->vaddr,
+ 				     BUS_DMA_NOWAIT, &sense_map->dmamap) != 0) {
+ 			free(sense_map, M_DEVBUF);
+@@ -5670,12 +6022,12 @@ ahd_alloc_scbs(struct ahd_softc *ahd)
+ 
+ 		SLIST_INSERT_HEAD(&scb_data->sense_maps, sense_map, links);
+ 
+-		ahd_dmamap_load(ahd, scb_data->sense_dmat, sense_map->dmamap,
++		aic_dmamap_load(ahd, scb_data->sense_dmat, sense_map->dmamap,
+ 				sense_map->vaddr, PAGE_SIZE, ahd_dmamap_cb,
+-				&sense_map->physaddr, /*flags*/0);
++				&sense_map->busaddr, /*flags*/0);
+ 
+ 		sense_data = sense_map->vaddr;
+-		sense_busaddr = sense_map->physaddr;
++		sense_busaddr = sense_map->busaddr;
+ 		scb_data->sense_left = PAGE_SIZE / AHD_SENSE_BUFSIZE;
+ #ifdef AHD_DEBUG
+ 		if (ahd_debug & AHD_SHOW_MEMORY)
+@@ -5716,7 +6068,7 @@ ahd_alloc_scbs(struct ahd_softc *ahd)
+ 		next_scb->sense_busaddr = sense_busaddr;
+ 		memset(hscb, 0, sizeof(*hscb));
+ 		next_scb->hscb = hscb;
+-		hscb->hscb_busaddr = ahd_htole32(hscb_busaddr);
++		hscb->hscb_busaddr = aic_htole32(hscb_busaddr);
+ 
+ 		/*
+ 		 * The sequencer always starts with the second entry.
+@@ -5731,7 +6083,7 @@ ahd_alloc_scbs(struct ahd_softc *ahd)
+ 		next_scb->ahd_softc = ahd;
+ 		next_scb->flags = SCB_FLAG_NONE;
+ #ifndef __linux__
+-		error = ahd_dmamap_create(ahd, ahd->buffer_dmat, /*flags*/0,
++		error = aic_dmamap_create(ahd, ahd->buffer_dmat, /*flags*/0,
+ 					  &next_scb->dmamap);
+ 		if (error != 0) {
+ 			free(next_scb, M_DEVBUF);
+@@ -5739,7 +6091,7 @@ ahd_alloc_scbs(struct ahd_softc *ahd)
+ 			break;
+ 		}
+ #endif
+-		next_scb->hscb->tag = ahd_htole16(scb_data->numscbs);
++		next_scb->hscb->tag = aic_htole16(scb_data->numscbs);
+ 		col_tag = scb_data->numscbs ^ 0x100;
+ 		next_scb->col_scb = ahd_find_scb_by_tag(ahd, col_tag);
+ 		if (next_scb->col_scb != NULL)
+@@ -5799,7 +6151,6 @@ static const char *termstat_strings[] = 
+ int
+ ahd_init(struct ahd_softc *ahd)
+ {
+-	uint8_t		*base_vaddr;
+ 	uint8_t		*next_vaddr;
+ 	bus_addr_t	 next_baddr;
+ 	size_t		 driver_data_size;
+@@ -5842,7 +6193,7 @@ ahd_init(struct ahd_softc *ahd)
+ 
+ #ifndef __linux__
+ 	/* DMA tag for mapping buffers into device visible space. */
+-	if (ahd_dma_tag_create(ahd, ahd->parent_dmat, /*alignment*/1,
++	if (aic_dma_tag_create(ahd, ahd->parent_dmat, /*alignment*/1,
+ 			       /*boundary*/BUS_SPACE_MAXADDR_32BIT + 1,
+ 			       /*lowaddr*/ahd->flags & AHD_39BIT_ADDRESSING
+ 					? (bus_addr_t)0x7FFFFFFFFFULL
+@@ -5873,7 +6224,7 @@ ahd_init(struct ahd_softc *ahd)
+ 		driver_data_size += AHD_TMODE_CMDS * sizeof(struct target_cmd);
+ 	if ((ahd->bugs & AHD_PKT_BITBUCKET_BUG) != 0)
+ 		driver_data_size += PKT_OVERRUN_BUFSIZE;
+-	if (ahd_dma_tag_create(ahd, ahd->parent_dmat, /*alignment*/1,
++	if (aic_dma_tag_create(ahd, ahd->parent_dmat, /*alignment*/1,
+ 			       /*boundary*/BUS_SPACE_MAXADDR_32BIT + 1,
+ 			       /*lowaddr*/BUS_SPACE_MAXADDR_32BIT,
+ 			       /*highaddr*/BUS_SPACE_MAXADDR,
+@@ -5888,21 +6239,24 @@ ahd_init(struct ahd_softc *ahd)
+ 	ahd->init_level++;
+ 
+ 	/* Allocation of driver data */
+-	if (ahd_dmamem_alloc(ahd, ahd->shared_data_dmat,
+-			     (void **)&base_vaddr,
+-			     BUS_DMA_NOWAIT, &ahd->shared_data_dmamap) != 0) {
++	if (aic_dmamem_alloc(ahd, ahd->shared_data_dmat,
++			     (void **)&ahd->shared_data_map.vaddr,
++			     BUS_DMA_NOWAIT,
++			     &ahd->shared_data_map.dmamap) != 0) {
+ 		return (ENOMEM);
+ 	}
+ 
+ 	ahd->init_level++;
+ 
+ 	/* And permanently map it in */
+-	ahd_dmamap_load(ahd, ahd->shared_data_dmat, ahd->shared_data_dmamap,
+-			base_vaddr, driver_data_size, ahd_dmamap_cb,
+-			&ahd->shared_data_busaddr, /*flags*/0);
+-	ahd->qoutfifo = (uint16_t *)base_vaddr;
++	aic_dmamap_load(ahd, ahd->shared_data_dmat, ahd->shared_data_map.dmamap,
++			ahd->shared_data_map.vaddr, driver_data_size,
++			ahd_dmamap_cb, &ahd->shared_data_map.busaddr,
++			/*flags*/0);
++	ahd->qoutfifo = (uint16_t *)ahd->shared_data_map.vaddr;
+ 	next_vaddr = (uint8_t *)&ahd->qoutfifo[AHD_QOUT_SIZE];
+-	next_baddr = ahd->shared_data_busaddr + AHD_QOUT_SIZE*sizeof(uint16_t);
++	next_baddr = ahd->shared_data_map.busaddr
++		   + AHD_QOUT_SIZE*sizeof(uint16_t);
+ 	if ((ahd->features & AHD_TARGETMODE) != 0) {
+ 		ahd->targetcmds = (struct target_cmd *)next_vaddr;
+ 		next_vaddr += AHD_TMODE_CMDS * sizeof(struct target_cmd);
+@@ -5923,7 +6277,8 @@ ahd_init(struct ahd_softc *ahd)
+ 	 * specially from the DMA safe memory chunk used for the QOUTFIFO.
+ 	 */
+ 	ahd->next_queued_hscb = (struct hardware_scb *)next_vaddr;
+-	ahd->next_queued_hscb->hscb_busaddr = ahd_htole32(next_baddr);
++	ahd->next_queued_hscb_map = &ahd->shared_data_map;
++	ahd->next_queued_hscb->hscb_busaddr = aic_htole32(next_baddr);
+ 
+ 	ahd->init_level++;
+ 
+@@ -6014,7 +6369,7 @@ ahd_init(struct ahd_softc *ahd)
+ 	}
+ init_done:
+ 	ahd_restart(ahd);
+-	ahd_timer_reset(&ahd->stat_timer, AHD_STAT_UPDATE_US,
++	aic_timer_reset(&ahd->stat_timer, AHD_STAT_UPDATE_US,
+ 			ahd_stat_timer, ahd);
+ 	return (0);
+ }
+@@ -6075,7 +6430,7 @@ ahd_chip_init(struct ahd_softc *ahd)
+ 	for (wait = 10000;
+ 	     (ahd_inb(ahd, SBLKCTL) & (ENAB40|ENAB20)) == 0 && wait;
+ 	     wait--)
+-		ahd_delay(100);
++		aic_delay(100);
+ 
+ 	/* Clear any false bus resets due to the transceivers settling */
+ 	ahd_outb(ahd, CLRSINT1, CLRSCSIRSTI);
+@@ -6174,7 +6529,7 @@ ahd_chip_init(struct ahd_softc *ahd)
+ 		ahd_outb(ahd, LUNLEN,
+ 			 sizeof(ahd->next_queued_hscb->pkt_long_lun) - 1);
+ 	} else {
+-		ahd_outb(ahd, LUNLEN, sizeof(ahd->next_queued_hscb->lun) - 1);
++		ahd_outb(ahd, LUNLEN, LUNLEN_SINGLE_LEVEL_LUN);
+ 	}
+ 	ahd_outb(ahd, CDBLIMIT, SCB_CDB_LEN_PTR - 1);
+ 	ahd_outb(ahd, MAXCMD, 0xFF);
+@@ -6215,6 +6570,7 @@ ahd_chip_init(struct ahd_softc *ahd)
+ 	ahd_outb(ahd, CLRSINT3, NTRAMPERR|OSRAMPERR);
+ 	ahd_outb(ahd, CLRINT, CLRSCSIINT);
+ 
++#if NEEDS_MORE_TESTING
+ 	/*
+ 	 * Always enable abort on incoming L_Qs if this feature is
+ 	 * supported.  We use this to catch invalid SCB references.
+@@ -6222,6 +6578,7 @@ ahd_chip_init(struct ahd_softc *ahd)
+ 	if ((ahd->bugs & AHD_ABORT_LQI_BUG) == 0)
+ 		ahd_outb(ahd, LQCTL1, ABORTPENDING);
+ 	else
++#endif
+ 		ahd_outb(ahd, LQCTL1, 0);
+ 
+ 	/* All of our queues are empty */
+@@ -6271,15 +6628,9 @@ ahd_chip_init(struct ahd_softc *ahd)
+ 	/*
+ 	 * Tell the sequencer where it can find our arrays in memory.
+ 	 */
+-	busaddr = ahd->shared_data_busaddr;
+-	ahd_outb(ahd, SHARED_DATA_ADDR, busaddr & 0xFF);
+-	ahd_outb(ahd, SHARED_DATA_ADDR + 1, (busaddr >> 8) & 0xFF);
+-	ahd_outb(ahd, SHARED_DATA_ADDR + 2, (busaddr >> 16) & 0xFF);
+-	ahd_outb(ahd, SHARED_DATA_ADDR + 3, (busaddr >> 24) & 0xFF);
+-	ahd_outb(ahd, QOUTFIFO_NEXT_ADDR, busaddr & 0xFF);
+-	ahd_outb(ahd, QOUTFIFO_NEXT_ADDR + 1, (busaddr >> 8) & 0xFF);
+-	ahd_outb(ahd, QOUTFIFO_NEXT_ADDR + 2, (busaddr >> 16) & 0xFF);
+-	ahd_outb(ahd, QOUTFIFO_NEXT_ADDR + 3, (busaddr >> 24) & 0xFF);
++	busaddr = ahd->shared_data_map.busaddr;
++	ahd_outl(ahd, SHARED_DATA_ADDR, busaddr);
++	ahd_outl(ahd, QOUTFIFO_NEXT_ADDR, busaddr);
+ 
+ 	/*
+ 	 * Setup the allowed SCSI Sequences based on operational mode.
+@@ -6327,11 +6678,8 @@ ahd_chip_init(struct ahd_softc *ahd)
+ 	/*
+ 	 * Tell the sequencer which SCB will be the next one it receives.
+ 	 */
+-	busaddr = ahd_le32toh(ahd->next_queued_hscb->hscb_busaddr);
+-	ahd_outb(ahd, NEXT_QUEUED_SCB_ADDR + 0, busaddr & 0xFF);
+-	ahd_outb(ahd, NEXT_QUEUED_SCB_ADDR + 1, (busaddr >> 8) & 0xFF);
+-	ahd_outb(ahd, NEXT_QUEUED_SCB_ADDR + 2, (busaddr >> 16) & 0xFF);
+-	ahd_outb(ahd, NEXT_QUEUED_SCB_ADDR + 3, (busaddr >> 24) & 0xFF);
++	busaddr = aic_le32toh(ahd->next_queued_hscb->hscb_busaddr);
++	ahd_outl(ahd, NEXT_QUEUED_SCB_ADDR, busaddr);
+ 
+ 	/*
+ 	 * Default to coalescing disabled.
+@@ -6652,6 +7000,12 @@ ahd_pause_and_flushwork(struct ahd_softc
+ 		struct scb *waiting_scb;
+ 
+ 		ahd_unpause(ahd);
++		/*
++		 * Give the sequencer some time to service
++		 * any active selections.
++		 */
++		aic_delay(200);
++
+ 		ahd_intr(ahd);
+ 		ahd_pause(ahd);
+ 		ahd_clear_critical_section(ahd);
+@@ -6703,141 +7057,24 @@ ahd_pause_and_flushwork(struct ahd_softc
+ int
+ ahd_suspend(struct ahd_softc *ahd)
+ {
+-#if 0
+-	uint8_t *ptr;
+-	int	 i;
+ 
+ 	ahd_pause_and_flushwork(ahd);
+ 
+-	if (LIST_FIRST(&ahd->pending_scbs) != NULL)
+-		return (EBUSY);
+-
+-#if AHD_TARGET_MODE
+-	/*
+-	 * XXX What about ATIOs that have not yet been serviced?
+-	 * Perhaps we should just refuse to be suspended if we
+-	 * are acting in a target role.
+-	 */
+-	if (ahd->pending_device != NULL)
++	if (LIST_FIRST(&ahd->pending_scbs) != NULL) {
++		ahd_unpause(ahd);
+ 		return (EBUSY);
+-#endif
+-
+-	/* Save volatile registers */
+-	ahd->suspend_state.channel[0].scsiseq = ahd_inb(ahd, SCSISEQ0);
+-	ahd->suspend_state.channel[0].sxfrctl0 = ahd_inb(ahd, SXFRCTL0);
+-	ahd->suspend_state.channel[0].sxfrctl1 = ahd_inb(ahd, SXFRCTL1);
+-	ahd->suspend_state.channel[0].simode0 = ahd_inb(ahd, SIMODE0);
+-	ahd->suspend_state.channel[0].simode1 = ahd_inb(ahd, SIMODE1);
+-	ahd->suspend_state.channel[0].seltimer = ahd_inb(ahd, SELTIMER);
+-	ahd->suspend_state.channel[0].seqctl = ahd_inb(ahd, SEQCTL0);
+-	ahd->suspend_state.dscommand0 = ahd_inb(ahd, DSCOMMAND0);
+-	ahd->suspend_state.dspcistatus = ahd_inb(ahd, DSPCISTATUS);
+-
+-	if ((ahd->features & AHD_DT) != 0) {
+-		u_int sfunct;
+-
+-		sfunct = ahd_inb(ahd, SFUNCT) & ~ALT_MODE;
+-		ahd_outb(ahd, SFUNCT, sfunct | ALT_MODE);
+-		ahd->suspend_state.optionmode = ahd_inb(ahd, OPTIONMODE);
+-		ahd_outb(ahd, SFUNCT, sfunct);
+-		ahd->suspend_state.crccontrol1 = ahd_inb(ahd, CRCCONTROL1);
+-	}
+-
+-	if ((ahd->features & AHD_MULTI_FUNC) != 0)
+-		ahd->suspend_state.scbbaddr = ahd_inb(ahd, SCBBADDR);
+-
+-	if ((ahd->features & AHD_ULTRA2) != 0)
+-		ahd->suspend_state.dff_thrsh = ahd_inb(ahd, DFF_THRSH);
+-
+-	ptr = ahd->suspend_state.scratch_ram;
+-	for (i = 0; i < 64; i++)
+-		*ptr++ = ahd_inb(ahd, SRAM_BASE + i);
+-
+-	if ((ahd->features & AHD_MORE_SRAM) != 0) {
+-		for (i = 0; i < 16; i++)
+-			*ptr++ = ahd_inb(ahd, TARG_OFFSET + i);
+-	}
+-
+-	ptr = ahd->suspend_state.btt;
+-	for (i = 0;i < AHD_NUM_TARGETS; i++) {
+-		int j;
+-
+-		for (j = 0;j < AHD_NUM_LUNS_NONPKT; j++) {
+-			u_int tcl;
+-
+-			tcl = BUILD_TCL_RAW(i, 'A', j);
+-			*ptr = ahd_find_busy_tcl(ahd, tcl);
+-		}
+ 	}
+ 	ahd_shutdown(ahd);
+-#endif
+ 	return (0);
+ }
+ 
+ int
+ ahd_resume(struct ahd_softc *ahd)
+ {
+-#if 0
+-	uint8_t *ptr;
+-	int	 i;
+-
+-	ahd_reset(ahd);
+-
+-	ahd_build_free_scb_list(ahd);
+-
+-	/* Restore volatile registers */
+-	ahd_outb(ahd, SCSISEQ0, ahd->suspend_state.channel[0].scsiseq);
+-	ahd_outb(ahd, SXFRCTL0, ahd->suspend_state.channel[0].sxfrctl0);
+-	ahd_outb(ahd, SXFRCTL1, ahd->suspend_state.channel[0].sxfrctl1);
+-	ahd_outb(ahd, SIMODE0, ahd->suspend_state.channel[0].simode0);
+-	ahd_outb(ahd, SIMODE1, ahd->suspend_state.channel[0].simode1);
+-	ahd_outb(ahd, SELTIMER, ahd->suspend_state.channel[0].seltimer);
+-	ahd_outb(ahd, SEQCTL0, ahd->suspend_state.channel[0].seqctl);
+-	if ((ahd->features & AHD_ULTRA2) != 0)
+-		ahd_outb(ahd, SCSIID_ULTRA2, ahd->our_id);
+-	else
+-		ahd_outb(ahd, SCSIID, ahd->our_id);
+-
+-	ahd_outb(ahd, DSCOMMAND0, ahd->suspend_state.dscommand0);
+-	ahd_outb(ahd, DSPCISTATUS, ahd->suspend_state.dspcistatus);
+-
+-	if ((ahd->features & AHD_DT) != 0) {
+-		u_int sfunct;
+ 
+-		sfunct = ahd_inb(ahd, SFUNCT) & ~ALT_MODE;
+-		ahd_outb(ahd, SFUNCT, sfunct | ALT_MODE);
+-		ahd_outb(ahd, OPTIONMODE, ahd->suspend_state.optionmode);
+-		ahd_outb(ahd, SFUNCT, sfunct);
+-		ahd_outb(ahd, CRCCONTROL1, ahd->suspend_state.crccontrol1);
+-	}
+-
+-	if ((ahd->features & AHD_MULTI_FUNC) != 0)
+-		ahd_outb(ahd, SCBBADDR, ahd->suspend_state.scbbaddr);
+-
+-	if ((ahd->features & AHD_ULTRA2) != 0)
+-		ahd_outb(ahd, DFF_THRSH, ahd->suspend_state.dff_thrsh);
+-
+-	ptr = ahd->suspend_state.scratch_ram;
+-	for (i = 0; i < 64; i++)
+-		ahd_outb(ahd, SRAM_BASE + i, *ptr++);
+-
+-	if ((ahd->features & AHD_MORE_SRAM) != 0) {
+-		for (i = 0; i < 16; i++)
+-			ahd_outb(ahd, TARG_OFFSET + i, *ptr++);
+-	}
+-
+-	ptr = ahd->suspend_state.btt;
+-	for (i = 0;i < AHD_NUM_TARGETS; i++) {
+-		int j;
+-
+-		for (j = 0;j < AHD_NUM_LUNS; j++) {
+-			u_int tcl;
+-
+-			tcl = BUILD_TCL(i << 4, j);
+-			ahd_busy_tcl(ahd, tcl, *ptr);
+-		}
+-	}
+-#endif
++	ahd_reset(ahd, /*reinit*/TRUE);
++	ahd_intr_enable(ahd, TRUE); 
++	ahd_restart(ahd);
+ 	return (0);
+ }
+ 
+@@ -6980,11 +7217,8 @@ ahd_qinfifo_requeue(struct ahd_softc *ah
+ 	if (prev_scb == NULL) {
+ 		uint32_t busaddr;
+ 
+-		busaddr = ahd_le32toh(scb->hscb->hscb_busaddr);
+-		ahd_outb(ahd, NEXT_QUEUED_SCB_ADDR + 0, busaddr & 0xFF);
+-		ahd_outb(ahd, NEXT_QUEUED_SCB_ADDR + 1, (busaddr >> 8) & 0xFF);
+-		ahd_outb(ahd, NEXT_QUEUED_SCB_ADDR + 2, (busaddr >> 16) & 0xFF);
+-		ahd_outb(ahd, NEXT_QUEUED_SCB_ADDR + 3, (busaddr >> 24) & 0xFF);
++		busaddr = aic_le32toh(scb->hscb->hscb_busaddr);
++		ahd_outl(ahd, NEXT_QUEUED_SCB_ADDR, busaddr);
+ 	} else {
+ 		prev_scb->hscb->next_hscb_busaddr = scb->hscb->hscb_busaddr;
+ 		ahd_sync_scb(ahd, prev_scb, 
+@@ -7090,11 +7324,8 @@ ahd_search_qinfifo(struct ahd_softc *ahd
+ 	 * for removal will be re-added to the queue as we go.
+ 	 */
+ 	ahd->qinfifonext = qinstart;
+-	busaddr = ahd_le32toh(ahd->next_queued_hscb->hscb_busaddr);
+-	ahd_outb(ahd, NEXT_QUEUED_SCB_ADDR + 0, busaddr & 0xFF);
+-	ahd_outb(ahd, NEXT_QUEUED_SCB_ADDR + 1, (busaddr >> 8) & 0xFF);
+-	ahd_outb(ahd, NEXT_QUEUED_SCB_ADDR + 2, (busaddr >> 16) & 0xFF);
+-	ahd_outb(ahd, NEXT_QUEUED_SCB_ADDR + 3, (busaddr >> 24) & 0xFF);
++	busaddr = aic_le32toh(ahd->next_queued_hscb->hscb_busaddr);
++	ahd_outl(ahd, NEXT_QUEUED_SCB_ADDR, busaddr);
+ 
+ 	while (qinpos != qintail) {
+ 		scb = ahd_lookup_scb(ahd, ahd->qinfifo[qinpos]);
+@@ -7115,13 +7346,13 @@ ahd_search_qinfifo(struct ahd_softc *ahd
+ 				cam_status ostat;
+ 				cam_status cstat;
+ 
+-				ostat = ahd_get_transaction_status(scb);
++				ostat = aic_get_transaction_status(scb);
+ 				if (ostat == CAM_REQ_INPROG)
+-					ahd_set_transaction_status(scb,
++					aic_set_transaction_status(scb,
+ 								   status);
+-				cstat = ahd_get_transaction_status(scb);
++				cstat = aic_get_transaction_status(scb);
+ 				if (cstat != CAM_REQ_CMP)
+-					ahd_freeze_scb(scb);
++					aic_freeze_scb(scb);
+ 				if ((scb->flags & SCB_ACTIVE) == 0)
+ 					printf("Inactive SCB in qinfifo\n");
+ 				ahd_done(ahd, scb);
+@@ -7257,12 +7488,12 @@ ahd_search_scb_list(struct ahd_softc *ah
+ 			cam_status ostat;
+ 			cam_status cstat;
+ 
+-			ostat = ahd_get_transaction_status(scb);
++			ostat = aic_get_transaction_status(scb);
+ 			if (ostat == CAM_REQ_INPROG)
+-				ahd_set_transaction_status(scb, status);
+-			cstat = ahd_get_transaction_status(scb);
++				aic_set_transaction_status(scb, status);
++			cstat = aic_get_transaction_status(scb);
+ 			if (cstat != CAM_REQ_CMP)
+-				ahd_freeze_scb(scb);
++				aic_freeze_scb(scb);
+ 			if ((scb->flags & SCB_ACTIVE) == 0)
+ 				printf("Inactive SCB in Waiting List\n");
+ 			ahd_done(ahd, scb);
+@@ -7453,11 +7684,11 @@ ahd_abort_scbs(struct ahd_softc *ahd, in
+ 		if (ahd_match_scb(ahd, scbp, target, channel, lun, tag, role)) {
+ 			cam_status ostat;
+ 
+-			ostat = ahd_get_transaction_status(scbp);
++			ostat = aic_get_transaction_status(scbp);
+ 			if (ostat == CAM_REQ_INPROG)
+-				ahd_set_transaction_status(scbp, status);
+-			if (ahd_get_transaction_status(scbp) != CAM_REQ_CMP)
+-				ahd_freeze_scb(scbp);
++				aic_set_transaction_status(scbp, status);
++			if (aic_get_transaction_status(scbp) != CAM_REQ_CMP)
++				aic_freeze_scb(scbp);
+ 			if ((scbp->flags & SCB_ACTIVE) == 0)
+ 				printf("Inactive SCB on pending list\n");
+ 			ahd_done(ahd, scbp);
+@@ -7479,9 +7710,12 @@ ahd_reset_current_bus(struct ahd_softc *
+ 	ahd_outb(ahd, SIMODE1, ahd_inb(ahd, SIMODE1) & ~ENSCSIRST);
+ 	scsiseq = ahd_inb(ahd, SCSISEQ0) & ~(ENSELO|ENARBO|SCSIRSTO);
+ 	ahd_outb(ahd, SCSISEQ0, scsiseq | SCSIRSTO);
+-	ahd_delay(AHD_BUSRESET_DELAY);
++	ahd_flush_device_writes(ahd);
++	aic_delay(AHD_BUSRESET_DELAY);
+ 	/* Turn off the bus reset */
+ 	ahd_outb(ahd, SCSISEQ0, scsiseq);
++	ahd_flush_device_writes(ahd);
++	aic_delay(AHD_BUSRESET_DELAY);
+ 	if ((ahd->bugs & AHD_SCSIRST_BUG) != 0) {
+ 		/*
+ 		 * 2A Razor #474
+@@ -7489,8 +7723,7 @@ ahd_reset_current_bus(struct ahd_softc *
+ 		 * SCSI bus resets that we initiate, so
+ 		 * we must reset the chip.
+ 		 */
+-		ahd_delay(AHD_BUSRESET_DELAY);
+-		ahd_reset(ahd);
++		ahd_reset(ahd, /*reinit*/TRUE);
+ 		ahd_intr_enable(ahd, /*enable*/TRUE);
+ 		AHD_ASSERT_MODES(ahd, AHD_MODE_SCSI_MSK, AHD_MODE_SCSI_MSK);
+ 	}
+@@ -7550,7 +7783,7 @@ ahd_reset_channel(struct ahd_softc *ahd,
+ 		ahd_outb(ahd, DFCNTRL,
+ 			 ahd_inb(ahd, DFCNTRL) & ~(SCSIEN|HDMAEN));
+ 		while ((ahd_inb(ahd, DFCNTRL) & HDMAENACK) != 0)
+-			ahd_delay(10);
++			aic_delay(10);
+ 		/*
+ 		 * Set CURRFIFO to the now inactive channel.
+ 		 */
+@@ -7563,7 +7796,7 @@ ahd_reset_channel(struct ahd_softc *ahd,
+ 	 */
+ 	ahd_clear_msg_state(ahd);
+ 	ahd_outb(ahd, SIMODE1,
+-		 ahd_inb(ahd, SIMODE1) & ~(ENBUSFREE|ENSCSIRST|ENBUSFREE));
++		 ahd_inb(ahd, SIMODE1) & ~(ENBUSFREE|ENSCSIRST));
+ 
+ 	if (initiate_reset)
+ 		ahd_reset_current_bus(ahd);
+@@ -7645,8 +7878,8 @@ ahd_reset_channel(struct ahd_softc *ahd,
+ 	 */
+ 	if ((ahd->flags & AHD_RESET_POLL_ACTIVE) == 0) {
+ 		ahd->flags |= AHD_RESET_POLL_ACTIVE;
+-		ahd_freeze_simq(ahd);
+-		ahd_timer_reset(&ahd->reset_timer, 0, ahd_reset_poll, ahd);
++		aic_freeze_simq(ahd);
++		aic_timer_reset(&ahd->reset_timer, 0, ahd_reset_poll, ahd);
+ 	}
+ 	return (found);
+ }
+@@ -7674,7 +7907,7 @@ ahd_reset_poll(void *arg)
+ 	ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI);
+ 	ahd_outb(ahd, CLRSINT1, CLRSCSIRSTI);
+ 	if ((ahd_inb(ahd, SSTAT1) & SCSIRSTI) != 0) {
+-		ahd_timer_reset(&ahd->reset_timer, AHD_RESET_POLL_US,
++		aic_timer_reset(&ahd->reset_timer, AHD_RESET_POLL_US,
+ 				ahd_reset_poll, ahd);
+ 		ahd_unpause(ahd);
+ 		ahd_unlock(ahd, &s);
+@@ -7689,7 +7922,7 @@ ahd_reset_poll(void *arg)
+ 	ahd_unpause(ahd);
+ 	ahd->flags &= ~AHD_RESET_POLL_ACTIVE;
+ 	ahd_unlock(ahd, &s);
+-	ahd_release_simq(ahd);
++	aic_release_simq(ahd);
+ 	ahd_list_unlock(&l);
+ }
+ 
+@@ -7732,7 +7965,7 @@ ahd_stat_timer(void *arg)
+ 	ahd->cmdcmplt_bucket = (ahd->cmdcmplt_bucket+1) & (AHD_STAT_BUCKETS-1);
+ 	ahd->cmdcmplt_total -= ahd->cmdcmplt_counts[ahd->cmdcmplt_bucket];
+ 	ahd->cmdcmplt_counts[ahd->cmdcmplt_bucket] = 0;
+-	ahd_timer_reset(&ahd->stat_timer, AHD_STAT_UPDATE_US,
++	aic_timer_reset(&ahd->stat_timer, AHD_STAT_UPDATE_US,
+ 			ahd_stat_timer, ahd);
+ 	ahd_unlock(ahd, &s);
+ 	ahd_list_unlock(&l);
+@@ -7753,8 +7986,9 @@ ahd_handle_scb_status(struct ahd_softc *
+ void
+ ahd_handle_scsi_status(struct ahd_softc *ahd, struct scb *scb)
+ {
+-	struct hardware_scb *hscb;
+-	u_int  qfreeze_cnt;
++	struct	hardware_scb *hscb;
++	u_int	qfreeze_cnt;
++	int	paused;
+ 
+ 	/*
+ 	 * The sequencer freezes its select-out queue
+@@ -7764,9 +7998,16 @@ ahd_handle_scsi_status(struct ahd_softc 
+ 	 */
+ 	hscb = scb->hscb; 
+ 
++	if (ahd_is_paused(ahd)) {
++		paused = 1;
++	} else {
++		paused = 0;
++		ahd_pause(ahd);
++	}
++
+ 	/* Freeze the queue until the client sees the error. */
+ 	ahd_freeze_devq(ahd, scb);
+-	ahd_freeze_scb(scb);
++	aic_freeze_scb(scb);
+ 	qfreeze_cnt = ahd_inw(ahd, QFREEZE_COUNT);
+ 	if (qfreeze_cnt == 0) {
+ 		printf("%s: Bad status with 0 qfreeze count!\n", ahd_name(ahd));
+@@ -7778,6 +8019,9 @@ ahd_handle_scsi_status(struct ahd_softc 
+ 		ahd_outb(ahd, SEQ_FLAGS2,
+ 			 ahd_inb(ahd, SEQ_FLAGS2) & ~SELECTOUT_QFROZEN);
+ 
++	if (paused == 0)
++		ahd_unpause(ahd);
++
+ 	/* Don't want to clobber the original sense code */
+ 	if ((scb->flags & SCB_SENSE) != 0) {
+ 		/*
+@@ -7785,12 +8029,12 @@ ahd_handle_scsi_status(struct ahd_softc 
+ 		 * a normal command completion.
+ 		 */
+ 		scb->flags &= ~SCB_SENSE;
+-		ahd_set_transaction_status(scb, CAM_AUTOSENSE_FAIL);
++		aic_set_transaction_status(scb, CAM_AUTOSENSE_FAIL);
+ 		ahd_done(ahd, scb);
+ 		return;
+ 	}
+-	ahd_set_transaction_status(scb, CAM_SCSI_STATUS_ERROR);
+-	ahd_set_scsi_status(scb, hscb->shared_data.istatus.scsi_status);
++	aic_set_transaction_status(scb, CAM_SCSI_STATUS_ERROR);
++	aic_set_scsi_status(scb, hscb->shared_data.istatus.scsi_status);
+ 	switch (hscb->shared_data.istatus.scsi_status) {
+ 	case STATUS_PKT_SENSE:
+ 	{
+@@ -7798,7 +8042,7 @@ ahd_handle_scsi_status(struct ahd_softc 
+ 
+ 		ahd_sync_sense(ahd, scb, BUS_DMASYNC_POSTREAD);
+ 		siu = (struct scsi_status_iu_header *)scb->sense_data;
+-		ahd_set_scsi_status(scb, siu->status);
++		aic_set_scsi_status(scb, siu->status);
+ #ifdef AHD_DEBUG
+ 		if ((ahd_debug & AHD_SHOW_SENSE) != 0) {
+ 			ahd_print_path(ahd, scb);
+@@ -7839,7 +8083,7 @@ ahd_handle_scsi_status(struct ahd_softc 
+ 				}
+ 			}
+ 			if (siu->status == SCSI_STATUS_OK)
+-				ahd_set_transaction_status(scb,
++				aic_set_transaction_status(scb,
+ 							   CAM_REQ_CMP_ERR);
+ 		}
+ 		if ((siu->flags & SIU_SNSVALID) != 0) {
+@@ -7869,7 +8113,7 @@ ahd_handle_scsi_status(struct ahd_softc 
+ 		}
+ #endif
+ 
+-		if (ahd_perform_autosense(scb) == 0)
++		if (aic_perform_autosense(scb) == 0)
+ 			break;
+ 
+ 		ahd_compile_devinfo(&devinfo, SCB_GET_OUR_ID(scb),
+@@ -7897,7 +8141,7 @@ ahd_handle_scsi_status(struct ahd_softc 
+ #endif
+ 		scb->sg_count = 0;
+ 		sg = ahd_sg_setup(ahd, scb, sg, ahd_get_sense_bufaddr(ahd, scb),
+-				  ahd_get_sense_bufsize(ahd, scb),
++				  aic_get_sense_bufsize(ahd, scb),
+ 				  /*last*/TRUE);
+ 		sc->opcode = REQUEST_SENSE;
+ 		sc->byte2 = 0;
+@@ -7906,7 +8150,7 @@ ahd_handle_scsi_status(struct ahd_softc 
+ 			sc->byte2 = SCB_GET_LUN(scb) << 5;
+ 		sc->unused[0] = 0;
+ 		sc->unused[1] = 0;
+-		sc->length = ahd_get_sense_bufsize(ahd, scb);
++		sc->length = aic_get_sense_bufsize(ahd, scb);
+ 		sc->control = 0;
+ 
+ 		/*
+@@ -7926,7 +8170,7 @@ ahd_handle_scsi_status(struct ahd_softc 
+ 		 * errors will be reported before any data
+ 		 * phases occur.
+ 		 */
+-		if (ahd_get_residual(scb) == ahd_get_transfer_length(scb)) {
++		if (aic_get_residual(scb) == aic_get_transfer_length(scb)) {
+ 			ahd_update_neg_request(ahd, &devinfo,
+ 					       tstate, targ_info,
+ 					       AHD_NEG_IF_NON_ASYNC);
+@@ -7945,7 +8189,7 @@ ahd_handle_scsi_status(struct ahd_softc 
+ 		 * Ensure we have enough time to actually
+ 		 * retrieve the sense.
+ 		 */
+-		ahd_scb_timer_reset(scb, 5 * 1000000);
++		aic_scb_timer_reset(scb, 5 * 1000000);
+ 		break;
+ 	}
+ 	case SCSI_STATUS_OK:
+@@ -7987,7 +8231,7 @@ ahd_calc_residual(struct ahd_softc *ahd,
+ 	 */
+ 
+ 	hscb = scb->hscb;
+-	sgptr = ahd_le32toh(hscb->sgptr);
++	sgptr = aic_le32toh(hscb->sgptr);
+ 	if ((sgptr & SG_STATUS_VALID) == 0)
+ 		/* Case 1 */
+ 		return;
+@@ -8004,10 +8248,10 @@ ahd_calc_residual(struct ahd_softc *ahd,
+ 	 * regardless of the role for this SCB.
+ 	 */
+ 	spkt = &hscb->shared_data.istatus;
+-	resid_sgptr = ahd_le32toh(spkt->residual_sgptr);
++	resid_sgptr = aic_le32toh(spkt->residual_sgptr);
+ 	if ((sgptr & SG_FULL_RESID) != 0) {
+ 		/* Case 3 */
+-		resid = ahd_get_transfer_length(scb);
++		resid = aic_get_transfer_length(scb);
+ 	} else if ((resid_sgptr & SG_LIST_NULL) != 0) {
+ 		/* Case 4 */
+ 		return;
+@@ -8016,8 +8260,8 @@ ahd_calc_residual(struct ahd_softc *ahd,
+ 		printf("data overrun detected Tag == 0x%x.\n",
+ 		       SCB_GET_TAG(scb));
+ 		ahd_freeze_devq(ahd, scb);
+-		ahd_set_transaction_status(scb, CAM_DATA_RUN_ERR);
+-		ahd_freeze_scb(scb);
++		aic_set_transaction_status(scb, CAM_DATA_RUN_ERR);
++		aic_freeze_scb(scb);
+ 		return;
+ 	} else if ((resid_sgptr & ~SG_PTR_MASK) != 0) {
+ 		panic("Bogus resid sgptr value 0x%x\n", resid_sgptr);
+@@ -8029,7 +8273,7 @@ ahd_calc_residual(struct ahd_softc *ahd,
+ 		 * Remainder of the SG where the transfer
+ 		 * stopped.  
+ 		 */
+-		resid = ahd_le32toh(spkt->residual_datacnt) & AHD_SG_LEN_MASK;
++		resid = aic_le32toh(spkt->residual_datacnt) & AHD_SG_LEN_MASK;
+ 		sg = ahd_sg_bus_to_virt(ahd, scb, resid_sgptr & SG_PTR_MASK);
+ 
+ 		/* The residual sg_ptr always points to the next sg */
+@@ -8040,15 +8284,15 @@ ahd_calc_residual(struct ahd_softc *ahd,
+ 		 * SG segments that are after the SG where
+ 		 * the transfer stopped.
+ 		 */
+-		while ((ahd_le32toh(sg->len) & AHD_DMA_LAST_SEG) == 0) {
++		while ((aic_le32toh(sg->len) & AHD_DMA_LAST_SEG) == 0) {
+ 			sg++;
+-			resid += ahd_le32toh(sg->len) & AHD_SG_LEN_MASK;
++			resid += aic_le32toh(sg->len) & AHD_SG_LEN_MASK;
+ 		}
+ 	}
+ 	if ((scb->flags & SCB_SENSE) == 0)
+-		ahd_set_residual(scb, resid);
++		aic_set_residual(scb, resid);
+ 	else
+-		ahd_set_sense_residual(scb, resid);
++		aic_set_sense_residual(scb, resid);
+ 
+ #ifdef AHD_DEBUG
+ 	if ((ahd_debug & AHD_SHOW_MISC) != 0) {
+@@ -8160,8 +8404,7 @@ ahd_dumpseq(struct ahd_softc* ahd)
+ 	max_prog = 2048;
+ 
+ 	ahd_outb(ahd, SEQCTL0, PERRORDIS|FAILDIS|FASTMODE|LOADRAM);
+-	ahd_outb(ahd, PRGMCNT, 0);
+-	ahd_outb(ahd, PRGMCNT+1, 0);
++	ahd_outw(ahd, PRGMCNT, 0);
+ 	for (i = 0; i < max_prog; i++) {
+ 		uint8_t ins_bytes[4];
+ 
+@@ -8276,8 +8519,7 @@ ahd_loadseq(struct ahd_softc *ahd)
+ 	downloaded = 0;
+ 	skip_addr = 0;
+ 	ahd_outb(ahd, SEQCTL0, PERRORDIS|FAILDIS|FASTMODE|LOADRAM);
+-	ahd_outb(ahd, PRGMCNT, 0);
+-	ahd_outb(ahd, PRGMCNT+1, 0);
++	ahd_outw(ahd, PRGMCNT, 0);
+ 
+ 	for (i = 0; i < sizeof(seqprog)/4; i++) {
+ 		if (ahd_check_patch(ahd, &cur_patch, i, &skip_addr) == 0) {
+@@ -8406,7 +8648,7 @@ ahd_download_instr(struct ahd_softc *ahd
+ 	/*
+ 	 * The firmware is always compiled into a little endian format.
+ 	 */
+-	instr.integer = ahd_le32toh(*(uint32_t*)&seqprog[instrptr * 4]);
++	instr.integer = aic_le32toh(*(uint32_t*)&seqprog[instrptr * 4]);
+ 
+ 	fmt1_ins = &instr.format1;
+ 	fmt3_ins = NULL;
+@@ -8454,7 +8696,7 @@ ahd_download_instr(struct ahd_softc *ahd
+ 			instr.format1.parity = 1;
+ 
+ 		/* The sequencer is a little endian cpu */
+-		instr.integer = ahd_htole32(instr.integer);
++		instr.integer = aic_htole32(instr.integer);
+ 		ahd_outsb(ahd, SEQRAM, instr.bytes, 4);
+ 		break;
+ 	}
+@@ -8580,11 +8822,15 @@ ahd_dump_card_state(struct ahd_softc *ah
+ 	printf(">>>>>>>>>>>>>>>>>> Dump Card State Begins <<<<<<<<<<<<<<<<<\n"
+ 	       "%s: Dumping Card State at program address 0x%x Mode 0x%x\n",
+ 	       ahd_name(ahd), 
+-	       ahd_inb(ahd, CURADDR) | (ahd_inb(ahd, CURADDR+1) << 8),
++	       ahd_inw(ahd, CURADDR),
+ 	       ahd_build_mode_state(ahd, ahd->saved_src_mode,
+ 				    ahd->saved_dst_mode));
+ 	if (paused)
+ 		printf("Card was paused\n");
++
++	if (ahd_check_cmdcmpltqueues(ahd))
++		printf("Completions are pending\n");
++
+ 	/*
+ 	 * Mode independent registers.
+ 	 */
+@@ -8634,10 +8880,12 @@ ahd_dump_card_state(struct ahd_softc *ah
+ 		if (i++ > AHD_SCB_MAX)
+ 			break;
+ 		cur_col = printf("\n%3d FIFO_USE[0x%x] ", SCB_GET_TAG(scb),
+-				 ahd_inb(ahd, SCB_FIFO_USE_COUNT));
++				 ahd_inb_scbram(ahd, SCB_FIFO_USE_COUNT));
+ 		ahd_set_scbptr(ahd, SCB_GET_TAG(scb));
+-		ahd_scb_control_print(ahd_inb(ahd, SCB_CONTROL), &cur_col, 60);
+-		ahd_scb_scsiid_print(ahd_inb(ahd, SCB_SCSIID), &cur_col, 60);
++		ahd_scb_control_print(ahd_inb_scbram(ahd, SCB_CONTROL),
++				      &cur_col, 60);
++		ahd_scb_scsiid_print(ahd_inb_scbram(ahd, SCB_SCSIID),
++				     &cur_col, 60);
+ 	}
+ 	printf("\nTotal %d\n", i);
+ 
+@@ -8666,7 +8914,7 @@ ahd_dump_card_state(struct ahd_softc *ah
+ 	while (!SCBID_IS_NULL(scb_index) && i++ < AHD_SCB_MAX) {
+ 		ahd_set_scbptr(ahd, scb_index);
+ 		printf("%d ", scb_index);
+-		scb_index = ahd_inw(ahd, SCB_NEXT_COMPLETE);
++		scb_index = ahd_inw_scbram(ahd, SCB_NEXT_COMPLETE);
+ 	}
+ 	printf("\n");
+ 
+@@ -8676,7 +8924,7 @@ ahd_dump_card_state(struct ahd_softc *ah
+ 	while (!SCBID_IS_NULL(scb_index) && i++ < AHD_SCB_MAX) {
+ 		ahd_set_scbptr(ahd, scb_index);
+ 		printf("%d ", scb_index);
+-		scb_index = ahd_inw(ahd, SCB_NEXT_COMPLETE);
++		scb_index = ahd_inw_scbram(ahd, SCB_NEXT_COMPLETE);
+ 	}
+ 	printf("\n");
+ 
+@@ -8687,7 +8935,7 @@ ahd_dump_card_state(struct ahd_softc *ah
+ 	while (!SCBID_IS_NULL(scb_index) && i++ < AHD_SCB_MAX) {
+ 		ahd_set_scbptr(ahd, scb_index);
+ 		printf("%d ", scb_index);
+-		scb_index = ahd_inw(ahd, SCB_NEXT_COMPLETE);
++		scb_index = ahd_inw_scbram(ahd, SCB_NEXT_COMPLETE);
+ 	}
+ 	printf("\n");
+ 	ahd_set_scbptr(ahd, saved_scb_index);
+@@ -8766,15 +9014,16 @@ ahd_dump_card_state(struct ahd_softc *ah
+ 	       ahd_name(ahd), ahd_inw(ahd, REG0), ahd_inw(ahd, SINDEX),
+ 	       ahd_inw(ahd, DINDEX));
+ 	printf("%s: SCBPTR == 0x%x, SCB_NEXT == 0x%x, SCB_NEXT2 == 0x%x\n",
+-	       ahd_name(ahd), ahd_get_scbptr(ahd), ahd_inw(ahd, SCB_NEXT),
+-	       ahd_inw(ahd, SCB_NEXT2));
++	       ahd_name(ahd), ahd_get_scbptr(ahd),
++	       ahd_inw_scbram(ahd, SCB_NEXT),
++	       ahd_inw_scbram(ahd, SCB_NEXT2));
+ 	printf("CDB %x %x %x %x %x %x\n",
+-	       ahd_inb(ahd, SCB_CDB_STORE),
+-	       ahd_inb(ahd, SCB_CDB_STORE+1),
+-	       ahd_inb(ahd, SCB_CDB_STORE+2),
+-	       ahd_inb(ahd, SCB_CDB_STORE+3),
+-	       ahd_inb(ahd, SCB_CDB_STORE+4),
+-	       ahd_inb(ahd, SCB_CDB_STORE+5));
++	       ahd_inb_scbram(ahd, SCB_CDB_STORE),
++	       ahd_inb_scbram(ahd, SCB_CDB_STORE+1),
++	       ahd_inb_scbram(ahd, SCB_CDB_STORE+2),
++	       ahd_inb_scbram(ahd, SCB_CDB_STORE+3),
++	       ahd_inb_scbram(ahd, SCB_CDB_STORE+4),
++	       ahd_inb_scbram(ahd, SCB_CDB_STORE+5));
+ 	printf("STACK:");
+ 	for (i = 0; i < ahd->stack_size; i++) {
+ 		ahd->saved_stack[i] =
+@@ -8806,16 +9055,292 @@ ahd_dump_scbs(struct ahd_softc *ahd)
+ 		ahd_set_scbptr(ahd, i);
+ 		printf("%3d", i);
+ 		printf("(CTRL 0x%x ID 0x%x N 0x%x N2 0x%x SG 0x%x, RSG 0x%x)\n",
+-		       ahd_inb(ahd, SCB_CONTROL),
+-		       ahd_inb(ahd, SCB_SCSIID), ahd_inw(ahd, SCB_NEXT),
+-		       ahd_inw(ahd, SCB_NEXT2), ahd_inl(ahd, SCB_SGPTR),
+-		       ahd_inl(ahd, SCB_RESIDUAL_SGPTR));
++		       ahd_inb_scbram(ahd, SCB_CONTROL),
++		       ahd_inb_scbram(ahd, SCB_SCSIID),
++		       ahd_inw_scbram(ahd, SCB_NEXT),
++		       ahd_inw_scbram(ahd, SCB_NEXT2),
++		       ahd_inl_scbram(ahd, SCB_SGPTR),
++		       ahd_inl_scbram(ahd, SCB_RESIDUAL_SGPTR));
+ 	}
+ 	printf("\n");
+ 	ahd_set_scbptr(ahd, saved_scb_index);
+ 	ahd_restore_modes(ahd, saved_modes);
+ }
+ 
++
++/*************************** Timeout Handling *********************************/
++void
++ahd_timeout(struct scb *scb)
++{
++	struct ahd_softc *ahd;
++
++	ahd = scb->ahd_softc;
++	if ((scb->flags & SCB_ACTIVE) != 0) {
++		if ((scb->flags & SCB_TIMEDOUT) == 0) {
++			LIST_INSERT_HEAD(&ahd->timedout_scbs, scb,
++					 timedout_links);
++			scb->flags |= SCB_TIMEDOUT;
++		}
++		ahd_wakeup_recovery_thread(ahd);
++	}
++}
++
++/*
++ * ahd_recover_commands determines if any of the commands that have currently
++ * timedout are the root cause for this timeout.  Innocent commands are given
++ * a new timeout while we wait for the command executing on the bus to timeout.
++ * This routine is invoked from a thread context so we are allowed to sleep.
++ * Our lock is not held on entry.
++ */
++void
++ahd_recover_commands(struct ahd_softc *ahd)
++{
++	struct	scb *scb;
++	struct	scb *active_scb;
++	long	s;
++	int	found;
++	int	was_paused;
++	u_int	active_scbptr;
++	u_int	last_phase;
++
++	ahd_lock(ahd, &s);
++
++	/*
++	 * Pause the controller and manually flush any
++	 * commands that have just completed but that our
++	 * interrupt handler has yet to see.
++	 */
++	was_paused = ahd_is_paused(ahd);
++	ahd_pause_and_flushwork(ahd);
++
++	if (LIST_EMPTY(&ahd->timedout_scbs) != 0) {
++		/*
++		 * The timedout commands have already
++		 * completed.  This typically means
++		 * that either the timeout value was on
++		 * the hairy edge of what the device
++		 * requires or - more likely - interrupts
++		 * are not happening.
++		 */
++		printf("%s: Timedout SCBs already complete. "
++		       "Interrupts may not be functioning.\n", ahd_name(ahd));
++		ahd_unpause(ahd);
++		ahd_unlock(ahd, &s);
++		return;
++	}
++
++	printf("%s: Recovery Initiated - Card was %spaused\n", ahd_name(ahd),
++	       was_paused ? "" : "not ");
++	ahd_dump_card_state(ahd);
++
++	/*
++	 * Determine identity of SCB acting on the bus.
++	 * This test only catches non-packetized transactions.
++	 * Due to the fleeting nature of packetized operations,
++	 * we can't easily determine that a packetized operation
++	 * is on the bus.
++	 */
++	ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI);
++	last_phase = ahd_inb(ahd, LASTPHASE);
++	active_scbptr = ahd_get_scbptr(ahd);
++	active_scb = NULL;
++	if (last_phase != P_BUSFREE
++	 || (ahd_inb(ahd, SEQ_FLAGS) & NOT_IDENTIFIED) == 0)
++		active_scb = ahd_lookup_scb(ahd, active_scbptr);
++
++	while ((scb = LIST_FIRST(&ahd->timedout_scbs)) != NULL) {
++		int	target;
++		int	lun;
++		char	channel;
++
++		target = SCB_GET_TARGET(ahd, scb);
++		channel = SCB_GET_CHANNEL(ahd, scb);
++		lun = SCB_GET_LUN(scb);
++
++		ahd_print_path(ahd, scb);
++		printf("SCB 0x%x - timed out\n", scb->hscb->tag);
++
++		if (scb->flags & (SCB_DEVICE_RESET|SCB_ABORT)) {
++			/*
++			 * Been down this road before.
++			 * Do a full bus reset.
++			 */
++			aic_set_transaction_status(scb, CAM_CMD_TIMEOUT);
++bus_reset:
++			found = ahd_reset_channel(ahd, channel,
++						  /*Initiate Reset*/TRUE);
++			printf("%s: Issued Channel %c Bus Reset. "
++			       "%d SCBs aborted\n", ahd_name(ahd), channel,
++			       found);
++			continue;
++		}
++
++		/*
++		 * Remove the command from the timedout list in
++		 * preparation for requeing it.
++		 */
++		LIST_REMOVE(scb, timedout_links);
++		scb->flags &= ~SCB_TIMEDOUT;
++
++		if (active_scb != NULL) {
++
++			if (active_scb != scb) {
++				/*
++				 * If the active SCB is not us, assume that
++				 * the active SCB has a longer timeout than
++				 * the timedout SCB, and wait for the active
++				 * SCB to timeout.
++				 */ 
++				ahd_other_scb_timeout(ahd, scb, active_scb);
++				continue;
++			} 
++
++			/*
++			 * We're active on the bus, so assert ATN
++			 * and hope that the target responds.
++			 */
++			ahd_set_recoveryscb(ahd, active_scb);
++                	active_scb->flags |= SCB_RECOVERY_SCB|SCB_DEVICE_RESET;
++			ahd_outb(ahd, MSG_OUT, HOST_MSG);
++			ahd_outb(ahd, SCSISIGO, last_phase|ATNO);
++			ahd_print_path(ahd, active_scb);
++			printf("BDR message in message buffer\n");
++			aic_scb_timer_reset(scb, 2 * 1000000);
++			break;
++		} else if (last_phase != P_BUSFREE
++			&& ahd_inb(ahd, SCSIPHASE) == 0) {
++			/*
++			 * SCB is not identified, there
++			 * is no pending REQ, and the sequencer
++			 * has not seen a busfree.  Looks like
++			 * a stuck connection waiting to
++			 * go busfree.  Reset the bus.
++			 */
++			printf("%s: Connection stuck awaiting busfree or "
++			       "Identify Msg.\n", ahd_name(ahd));
++			goto bus_reset;
++		} else if (ahd_search_qinfifo(ahd, target, channel, lun,
++					      scb->hscb->tag, ROLE_INITIATOR,
++					      /*status*/0, SEARCH_COUNT) > 0) {
++
++			/*
++			 * We haven't even gone out on the bus
++			 * yet, so the timeout must be due to
++			 * some other command.  Reset the timer
++			 * and go on.
++			 */
++			ahd_other_scb_timeout(ahd, scb, scb);
++		} else {
++			/*
++			 * This SCB is for a disconnected transaction
++			 * and we haven't found a better candidate on
++			 * the bus to explain this timeout.
++			 */
++			ahd_set_recoveryscb(ahd, scb);
++
++			/*
++			 * Actually re-queue this SCB in an attempt
++			 * to select the device before it reconnects.
++			 * In either case (selection or reselection),
++			 * we will now issue a target reset to the
++			 * timed-out device.
++			 *
++			 * Set the MK_MESSAGE control bit indicating
++			 * that we desire to send a message.  We
++			 * also set the disconnected flag since
++			 * in the paging case there is no guarantee
++			 * that our SCB control byte matches the
++			 * version on the card.  We don't want the
++			 * sequencer to abort the command thinking
++			 * an unsolicited reselection occurred.
++			 */
++			scb->flags |= SCB_DEVICE_RESET;
++			scb->hscb->cdb_len = 0;
++			scb->hscb->task_attribute = 0;
++			scb->hscb->task_management = SIU_TASKMGMT_ABORT_TASK;
++
++			ahd_set_scbptr(ahd, SCB_GET_TAG(scb));
++			if ((scb->flags & SCB_PACKETIZED) != 0) {
++				/*
++				 * Mark the SCB has having an outstanding
++				 * task management function.  Should the command
++				 * complete normally before the task management
++				 * function can be sent, the host will be
++				 * notified to abort our requeued SCB.
++				 */
++				ahd_outb(ahd, SCB_TASK_MANAGEMENT,
++					 scb->hscb->task_management);
++			} else {
++				/*
++				 * If non-packetized, set the MK_MESSAGE control
++				 * bit indicating that we desire to send a
++				 * message.  We also set the disconnected flag
++				 * since there is no guarantee that our SCB
++				 * control byte matches the version on the
++				 * card.  We don't want the sequencer to abort
++				 * the command thinking an unsolicited
++				 * reselection occurred.
++				 */
++				scb->hscb->control |= MK_MESSAGE|DISCONNECTED;
++
++				/*
++				 * The sequencer will never re-reference the
++				 * in-core SCB.  To make sure we are notified
++				 * during reslection, set the MK_MESSAGE flag in
++				 * the card's copy of the SCB.
++				 */
++				ahd_outb(ahd, SCB_CONTROL,
++					 ahd_inb(ahd, SCB_CONTROL)|MK_MESSAGE);
++			}
++
++			/*
++			 * Clear out any entries in the QINFIFO first
++			 * so we are the next SCB for this target
++			 * to run.
++			 */
++			ahd_search_qinfifo(ahd, target, channel, lun,
++					   SCB_LIST_NULL, ROLE_INITIATOR,
++					   CAM_REQUEUE_REQ, SEARCH_COMPLETE);
++			ahd_qinfifo_requeue_tail(ahd, scb);
++			ahd_set_scbptr(ahd, active_scbptr);
++			ahd_print_path(ahd, scb);
++			printf("Queuing a BDR SCB\n");
++			aic_scb_timer_reset(scb, 2 * 1000000);
++			break;
++		}
++	}
++	
++	/*
++	 * Any remaining SCBs were not the "culprit", so remove
++	 * them from the timeout list.  The timer for these commands
++	 * will be reset once the recovery SCB completes.
++	 */
++	while ((scb = LIST_FIRST(&ahd->timedout_scbs)) != NULL) {
++
++		LIST_REMOVE(scb, timedout_links);
++		scb->flags &= ~SCB_TIMEDOUT;
++	}
++
++	ahd_unpause(ahd);
++	ahd_unlock(ahd, &s);
++}
++
++static void
++ahd_other_scb_timeout(struct ahd_softc *ahd, struct scb *scb,
++		      struct scb *other_scb)
++{
++	u_int	newtimeout;
++
++	ahd_print_path(ahd, scb);
++	printf("Other SCB Timeout%s",
++ 	       (scb->flags & SCB_OTHERTCL_TIMEOUT) != 0
++	       ? " again\n" : "\n");
++	scb->flags |= SCB_OTHERTCL_TIMEOUT;
++	newtimeout = MAX(aic_get_timeout(other_scb),
++			 aic_get_timeout(scb));
++	aic_scb_timer_reset(scb, newtimeout);
++}
++
+ /**************************** Flexport Logic **********************************/
+ /*
+  * Read count 16bit words from 16bit word address start_addr from the
+@@ -8922,9 +9447,9 @@ ahd_wait_seeprom(struct ahd_softc *ahd)
+ {
+ 	int cnt;
+ 
+-	cnt = 20;
++	cnt = 5000;
+ 	while ((ahd_inb(ahd, SEESTAT) & (SEEARBACK|SEEBUSY)) != 0 && --cnt)
+-		ahd_delay(5);
++		aic_delay(5);
+ 
+ 	if (cnt == 0)
+ 		return (ETIMEDOUT);
+@@ -9066,7 +9591,7 @@ ahd_wait_flexport(struct ahd_softc *ahd)
+ 	AHD_ASSERT_MODES(ahd, AHD_MODE_SCSI_MSK, AHD_MODE_SCSI_MSK);
+ 	cnt = 1000000 * 2 / 5;
+ 	while ((ahd_inb(ahd, BRDCTL) & FLXARBACK) == 0 && --cnt)
+-		ahd_delay(5);
++		aic_delay(5);
+ 
+ 	if (cnt == 0)
+ 		return (ETIMEDOUT);
+@@ -9192,6 +9717,7 @@ ahd_handle_en_lun(struct ahd_softc *ahd,
+ 			ahd->flags &= ~AHD_INITIATORROLE;
+ 		ahd_pause(ahd);
+ 		ahd_loadseq(ahd);
++		ahd_restart(ahd);
+ 		ahd_unlock(ahd, &s);
+ 	}
+ 	cel = &ccb->cel;
+@@ -9267,13 +9793,9 @@ ahd_handle_en_lun(struct ahd_softc *ahd,
+ 			if ((ahd->features & AHD_MULTI_TID) != 0) {
+ 				u_int targid_mask;
+ 
+-				targid_mask = ahd_inb(ahd, TARGID)
+-					    | (ahd_inb(ahd, TARGID + 1) << 8);
+-
++				targid_mask = ahd_inw(ahd, TARGID);
+ 				targid_mask |= target_mask;
+-				ahd_outb(ahd, TARGID, targid_mask);
+-				ahd_outb(ahd, TARGID+1, (targid_mask >> 8));
+-				
++				ahd_outw(ahd, TARGID, targid_mask);
+ 				ahd_update_scsiid(ahd, targid_mask);
+ 			} else {
+ 				u_int our_id;
+@@ -9387,14 +9909,9 @@ ahd_handle_en_lun(struct ahd_softc *ahd,
+ 				if (ahd->features & AHD_MULTI_TID) {
+ 					u_int targid_mask;
+ 
+-					targid_mask = ahd_inb(ahd, TARGID)
+-						    | (ahd_inb(ahd, TARGID + 1)
+-						       << 8);
+-
++					targid_mask = ahd_inw(ahd, TARGID);
+ 					targid_mask &= ~target_mask;
+-					ahd_outb(ahd, TARGID, targid_mask);
+-					ahd_outb(ahd, TARGID+1,
+-					 	 (targid_mask >> 8));
++					ahd_outw(ahd, TARGID, targid_mask);
+ 					ahd_update_scsiid(ahd, targid_mask);
+ 				}
+ 			}
+@@ -9425,6 +9942,11 @@ ahd_handle_en_lun(struct ahd_softc *ahd,
+ 				ahd->flags |= AHD_INITIATORROLE;
+ 				ahd_pause(ahd);
+ 				ahd_loadseq(ahd);
++				ahd_restart(ahd);
++				/*
++				 * Unpaused.  The extra unpause
++				 * that follows is harmless.
++				 */
+ 			}
+ 		}
+ 		ahd_unpause(ahd);
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic79xx.h	2003-06-14 12:18:25.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aic79xx.h	2003-12-28 23:21:39.000000000 -0800
+@@ -37,7 +37,7 @@
+  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  * POSSIBILITY OF SUCH DAMAGES.
+  *
+- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#90 $
++ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#101 $
+  *
+  * $FreeBSD$
+  */
+@@ -74,9 +74,9 @@ struct scb_platform_data;
+ #define ALL_TARGETS_MASK 0xFFFF
+ #define INITIATOR_WILDCARD	(~0)
+ #define	SCB_LIST_NULL		0xFF00
+-#define	SCB_LIST_NULL_LE	(ahd_htole16(SCB_LIST_NULL))
++#define	SCB_LIST_NULL_LE	(aic_htole16(SCB_LIST_NULL))
+ #define QOUTFIFO_ENTRY_VALID 0x8000
+-#define QOUTFIFO_ENTRY_VALID_LE (ahd_htole16(0x8000))
++#define QOUTFIFO_ENTRY_VALID_LE (aic_htole16(0x8000))
+ #define SCBID_IS_NULL(scbid) (((scbid) & 0xFF00 ) == SCB_LIST_NULL)
+ 
+ #define SCSIID_TARGET(ahd, scsiid)	\
+@@ -118,7 +118,7 @@ struct scb_platform_data;
+ 	((lun) | ((target) << 8))
+ 
+ #define SCB_GET_TAG(scb) \
+-	ahd_le16toh(scb->hscb->tag)
++	aic_le16toh(scb->hscb->tag)
+ 
+ #ifndef	AHD_TARGET_MODE
+ #undef	AHD_TMODE_ENABLE
+@@ -229,8 +229,10 @@ typedef enum {
+ 	AHD_RTI			= 0x04000,/* Retained Training Support */
+ 	AHD_NEW_IOCELL_OPTS	= 0x08000,/* More Signal knobs in the IOCELL */
+ 	AHD_NEW_DFCNTRL_OPTS	= 0x10000,/* SCSIENWRDIS bit */
++	AHD_FAST_CDB_DELIVERY	= 0x20000,/* CDB acks released to Output Sync */
+ 	AHD_REMOVABLE		= 0x00000,/* Hot-Swap supported - None so far*/
+ 	AHD_AIC7901_FE		= AHD_FENONE,
++	AHD_AIC7901A_FE		= AHD_FENONE,
+ 	AHD_AIC7902_FE		= AHD_MULTI_FUNC
+ } ahd_feature;
+ 
+@@ -372,7 +374,9 @@ typedef enum {
+ 	AHD_HP_BOARD	      = 0x100000,
+ 	AHD_RESET_POLL_ACTIVE = 0x200000,
+ 	AHD_UPDATE_PEND_CMDS  = 0x400000,
+-	AHD_RUNNING_QOUTFIFO  = 0x800000
++	AHD_RUNNING_QOUTFIFO  = 0x800000,
++	AHD_HAD_FIRST_SEL     = 0x1000000,
++	AHD_SHUTDOWN_RECOVERY = 0x2000000 /* Terminate recovery thread. */
+ } ahd_flag;
+ 
+ /************************* Hardware  SCB Definition ***************************/
+@@ -494,21 +498,21 @@ struct hardware_scb {
+  *	  transfer.
+  */ 
+ #define SG_PTR_MASK	0xFFFFFFF8
+-/*16*/	uint64_t dataptr;
+-/*24*/	uint32_t datacnt;	/* Byte 3 is spare. */
+-/*28*/	uint32_t sgptr;
+-/*32*/	uint32_t hscb_busaddr;
+-/*36*/	uint32_t next_hscb_busaddr;
+-/*40*/	uint8_t  control;	/* See SCB_CONTROL in aic79xx.reg for details */
+-/*41*/	uint8_t	 scsiid;	/*
++/*16*/	uint16_t tag;		/* Reused by Sequencer. */
++/*18*/	uint8_t  control;	/* See SCB_CONTROL in aic79xx.reg for details */
++/*19*/	uint8_t	 scsiid;	/*
+ 				 * Selection out Id
+ 				 * Our Id (bits 0-3) Their ID (bits 4-7)
+ 				 */
+-/*42*/	uint8_t  lun;
+-/*43*/	uint8_t  task_attribute;
+-/*44*/	uint8_t  cdb_len;
+-/*45*/	uint8_t  task_management;
+-/*46*/	uint16_t tag;		/* Reused by Sequencer. */
++/*20*/	uint8_t  lun;
++/*21*/	uint8_t  task_attribute;
++/*22*/	uint8_t  cdb_len;
++/*23*/	uint8_t  task_management;
++/*24*/	uint64_t dataptr;
++/*32*/	uint32_t datacnt;	/* Byte 3 is spare. */
++/*36*/	uint32_t sgptr;
++/*40*/	uint32_t hscb_busaddr;
++/*44*/	uint32_t next_hscb_busaddr;
+ /********** Long lun field only downloaded for full 8 byte lun support ********/
+ /*48*/  uint8_t	 pkt_long_lun[8];
+ /******* Fields below are not Downloaded (Sequencer may use for scratch) ******/
+@@ -546,7 +550,7 @@ struct ahd_dma64_seg {
+ 
+ struct map_node {
+ 	bus_dmamap_t		 dmamap;
+-	bus_addr_t		 physaddr;
++	bus_addr_t		 busaddr;
+ 	uint8_t			*vaddr;
+ 	SLIST_ENTRY(map_node)	 links;
+ };
+@@ -588,12 +592,16 @@ typedef enum {
+ 	SCB_PKT_SENSE		= 0x02000,
+ 	SCB_CMDPHASE_ABORT	= 0x04000,
+ 	SCB_ON_COL_LIST		= 0x08000,
+-	SCB_SILENT		= 0x10000 /*
++	SCB_SILENT		= 0x10000,/*
+ 					   * Be quiet about transmission type
+ 					   * errors.  They are expected and we
+ 					   * don't want to upset the user.  This
+ 					   * flag is typically used during DV.
+ 					   */
++	SCB_TIMEDOUT		= 0x20000/*
++					  * SCB has timed out and is on the
++					  * timedout list.
++					  */
+ } scb_flag;
+ 
+ struct scb {
+@@ -610,8 +618,9 @@ struct scb {
+ 	} links2;
+ #define pending_links links2.le
+ #define collision_links links2.le
++	LIST_ENTRY(scb)		  timedout_links;
+ 	struct scb		 *col_scb;
+-	ahd_io_ctx_t		  io_ctx;
++	aic_io_ctx_t		  io_ctx;
+ 	struct ahd_softc	 *ahd_softc;
+ 	scb_flag		  flags;
+ #ifndef __linux__
+@@ -1059,6 +1068,7 @@ struct ahd_softc {
+ 	struct scb_data		  scb_data;
+ 
+ 	struct hardware_scb	 *next_queued_hscb;
++	struct map_node		 *next_queued_hscb_map;
+ 
+ 	/*
+ 	 * SCBs that have been sent to the controller
+@@ -1066,6 +1076,11 @@ struct ahd_softc {
+ 	LIST_HEAD(, scb)	  pending_scbs;
+ 
+ 	/*
++	 * SCBs whose timeout routine has been called.
++	 */
++	LIST_HEAD(, scb)	  timedout_scbs;
++
++	/*
+ 	 * Current register window mode information.
+ 	 */
+ 	ahd_mode		  dst_mode;
+@@ -1086,7 +1101,7 @@ struct ahd_softc {
+ 	/*
+ 	 * Platform specific device information.
+ 	 */
+-	ahd_dev_softc_t		  dev_softc;
++	aic_dev_softc_t		  dev_softc;
+ 
+ 	/*
+ 	 * Bus specific device information.
+@@ -1116,8 +1131,8 @@ struct ahd_softc {
+ 	/*
+ 	 * Timer handles for timer driven callbacks.
+ 	 */
+-	ahd_timer_t		  reset_timer;
+-	ahd_timer_t		  stat_timer;
++	aic_timer_t		  reset_timer;
++	aic_timer_t		  stat_timer;
+ 
+ 	/*
+ 	 * Statistics.
+@@ -1194,8 +1209,7 @@ struct ahd_softc {
+ 	 */
+ 	bus_dma_tag_t		  parent_dmat;
+ 	bus_dma_tag_t		  shared_data_dmat;
+-	bus_dmamap_t		  shared_data_dmamap;
+-	bus_addr_t		  shared_data_busaddr;
++	struct map_node		  shared_data_map;
+ 
+ 	/* Information saved through suspend/resume cycles */
+ 	struct ahd_suspend_state  suspend_state;
+@@ -1296,9 +1310,9 @@ struct ahd_devinfo {
+ };
+ 
+ /****************************** PCI Structures ********************************/
+-#define AHD_PCI_IOADDR0	PCIR_MAPS	/* I/O BAR*/
+-#define AHD_PCI_MEMADDR	(PCIR_MAPS + 4)	/* Memory BAR */
+-#define AHD_PCI_IOADDR1	(PCIR_MAPS + 12)/* Second I/O BAR */
++#define AHD_PCI_IOADDR0	PCIR_BAR(0)	/* I/O BAR*/
++#define AHD_PCI_MEMADDR	PCIR_BAR(1)	/* Memory BAR */
++#define AHD_PCI_IOADDR1	PCIR_BAR(3)	/* Second I/O BAR */
+ 
+ typedef int (ahd_device_setup_t)(struct ahd_softc *);
+ 
+@@ -1338,7 +1352,7 @@ ahd_unbusy_tcl(struct ahd_softc *ahd, u_
+ }
+ 
+ /***************************** PCI Front End *********************************/
+-struct	ahd_pci_identity *ahd_find_pci_device(ahd_dev_softc_t);
++struct	ahd_pci_identity *ahd_find_pci_device(aic_dev_softc_t);
+ int			  ahd_pci_config(struct ahd_softc *,
+ 					 struct ahd_pci_identity *);
+ int	ahd_pci_test_register_access(struct ahd_softc *);
+@@ -1379,13 +1393,13 @@ struct scb		*ahd_get_scb(struct ahd_soft
+ void			 ahd_free_scb(struct ahd_softc *ahd, struct scb *scb);
+ void			 ahd_alloc_scbs(struct ahd_softc *ahd);
+ void			 ahd_free(struct ahd_softc *ahd);
+-int			 ahd_reset(struct ahd_softc *ahd);
++int			 ahd_reset(struct ahd_softc *ahd, int reinit);
+ void			 ahd_shutdown(void *arg);
+-int			ahd_write_flexport(struct ahd_softc *ahd,
+-					   u_int addr, u_int value);
+-int			ahd_read_flexport(struct ahd_softc *ahd, u_int addr,
+-					  uint8_t *value);
+-int			ahd_wait_flexport(struct ahd_softc *ahd);
++int			 ahd_write_flexport(struct ahd_softc *ahd,
++					    u_int addr, u_int value);
++int			 ahd_read_flexport(struct ahd_softc *ahd, u_int addr,
++					   uint8_t *value);
++int			 ahd_wait_flexport(struct ahd_softc *ahd);
+ 
+ /*************************** Interrupt Services *******************************/
+ void			ahd_pci_intr(struct ahd_softc *ahd);
+@@ -1430,6 +1444,8 @@ void			ahd_handle_scsi_status(struct ahd
+ 					       struct scb *scb);
+ void			ahd_calc_residual(struct ahd_softc *ahd,
+ 					  struct scb *scb);
++void			ahd_timeout(struct scb *scb);
++void			ahd_recover_commands(struct ahd_softc *ahd);
+ /*************************** Utility Functions ********************************/
+ struct ahd_phase_table_entry*
+ 			ahd_lookup_phase_entry(int phase);
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic79xx_inline.h	2003-06-14 12:18:09.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aic79xx_inline.h	2003-12-28 23:21:39.000000000 -0800
+@@ -37,7 +37,7 @@
+  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  * POSSIBILITY OF SUCH DAMAGES.
+  *
+- * $Id: //depot/aic7xxx/aic7xxx/aic79xx_inline.h#50 $
++ * $Id: //depot/aic7xxx/aic7xxx/aic79xx_inline.h#55 $
+  *
+  * $FreeBSD$
+  */
+@@ -250,15 +250,15 @@ ahd_sg_setup(struct ahd_softc *ahd, stru
+ 		struct ahd_dma64_seg *sg;
+ 
+ 		sg = (struct ahd_dma64_seg *)sgptr;
+-		sg->addr = ahd_htole64(addr);
+-		sg->len = ahd_htole32(len | (last ? AHD_DMA_LAST_SEG : 0));
++		sg->addr = aic_htole64(addr);
++		sg->len = aic_htole32(len | (last ? AHD_DMA_LAST_SEG : 0));
+ 		return (sg + 1);
+ 	} else {
+ 		struct ahd_dma_seg *sg;
+ 
+ 		sg = (struct ahd_dma_seg *)sgptr;
+-		sg->addr = ahd_htole32(addr & 0xFFFFFFFF);
+-		sg->len = ahd_htole32(len | ((addr >> 8) & 0x7F000000)
++		sg->addr = aic_htole32(addr & 0xFFFFFFFF);
++		sg->len = aic_htole32(len | ((addr >> 8) & 0x7F000000)
+ 				    | (last ? AHD_DMA_LAST_SEG : 0));
+ 		return (sg + 1);
+ 	}
+@@ -273,7 +273,7 @@ ahd_setup_scb_common(struct ahd_softc *a
+ 		/* XXX what about ACA??  It is type 4, but TAG_TYPE == 0x3. */
+ 		scb->hscb->task_attribute = scb->hscb->control & SCB_TAG_TYPE;
+ 	} else {
+-		if (ahd_get_transfer_length(scb) & 0x01)
++		if (aic_get_transfer_length(scb) & 0x01)
+ 			scb->hscb->task_attribute = SCB_XFERLEN_ODD;
+ 		else
+ 			scb->hscb->task_attribute = 0;
+@@ -282,7 +282,7 @@ ahd_setup_scb_common(struct ahd_softc *a
+ 	if (scb->hscb->cdb_len <= MAX_CDB_LEN_WITH_SENSE_ADDR
+ 	 || (scb->hscb->cdb_len & SCB_CDB_LEN_PTR) != 0)
+ 		scb->hscb->shared_data.idata.cdb_plus_saddr.sense_addr =
+-		    ahd_htole32(scb->sense_busaddr);
++		    aic_htole32(scb->sense_busaddr);
+ }
+ 
+ static __inline void
+@@ -308,8 +308,8 @@ ahd_setup_data_scb(struct ahd_softc *ahd
+ 		if ((ahd->flags & AHD_39BIT_ADDRESSING) != 0) {
+ 			uint64_t high_addr;
+ 
+-			high_addr = ahd_le32toh(sg->len) & 0x7F000000;
+-			scb->hscb->dataptr |= ahd_htole64(high_addr << 8);
++			high_addr = aic_le32toh(sg->len) & 0x7F000000;
++			scb->hscb->dataptr |= aic_htole64(high_addr << 8);
+ 		}
+ 		scb->hscb->datacnt = sg->len;
+ 	}
+@@ -319,13 +319,13 @@ ahd_setup_data_scb(struct ahd_softc *ahd
+ 	 * sequencer will clear as soon as a data transfer
+ 	 * occurs.
+ 	 */
+-	scb->hscb->sgptr = ahd_htole32(scb->sg_list_busaddr|SG_FULL_RESID);
++	scb->hscb->sgptr = aic_htole32(scb->sg_list_busaddr|SG_FULL_RESID);
+ }
+ 
+ static __inline void
+ ahd_setup_noxfer_scb(struct ahd_softc *ahd, struct scb *scb)
+ {
+-	scb->hscb->sgptr = ahd_htole32(SG_LIST_NULL);
++	scb->hscb->sgptr = aic_htole32(SG_LIST_NULL);
+ 	scb->hscb->dataptr = 0;
+ 	scb->hscb->datacnt = 0;
+ }
+@@ -383,7 +383,7 @@ ahd_sg_virt_to_bus(struct ahd_softc *ahd
+ static __inline void
+ ahd_sync_scb(struct ahd_softc *ahd, struct scb *scb, int op)
+ {
+-	ahd_dmamap_sync(ahd, ahd->scb_data.hscb_dmat,
++	aic_dmamap_sync(ahd, ahd->scb_data.hscb_dmat,
+ 			scb->hscb_map->dmamap,
+ 			/*offset*/(uint8_t*)scb->hscb - scb->hscb_map->vaddr,
+ 			/*len*/sizeof(*scb->hscb), op);
+@@ -395,7 +395,7 @@ ahd_sync_sglist(struct ahd_softc *ahd, s
+ 	if (scb->sg_count == 0)
+ 		return;
+ 
+-	ahd_dmamap_sync(ahd, ahd->scb_data.sg_dmat,
++	aic_dmamap_sync(ahd, ahd->scb_data.sg_dmat,
+ 			scb->sg_map->dmamap,
+ 			/*offset*/scb->sg_list_busaddr - ahd_sg_size(ahd),
+ 			/*len*/ahd_sg_size(ahd) * scb->sg_count, op);
+@@ -404,7 +404,7 @@ ahd_sync_sglist(struct ahd_softc *ahd, s
+ static __inline void
+ ahd_sync_sense(struct ahd_softc *ahd, struct scb *scb, int op)
+ {
+-	ahd_dmamap_sync(ahd, ahd->scb_data.sense_dmat,
++	aic_dmamap_sync(ahd, ahd->scb_data.sense_dmat,
+ 			scb->sense_map->dmamap,
+ 			/*offset*/scb->sense_busaddr,
+ 			/*len*/AHD_SENSE_BUFSIZE, op);
+@@ -455,6 +455,8 @@ static __inline u_int	ahd_inb_scbram(str
+ static __inline u_int	ahd_inw_scbram(struct ahd_softc *ahd, u_int offset);
+ static __inline uint32_t
+ 			ahd_inl_scbram(struct ahd_softc *ahd, u_int offset);
++static __inline uint64_t
++			ahd_inq_scbram(struct ahd_softc *ahd, u_int offset);
+ static __inline void	ahd_swap_with_next_hscb(struct ahd_softc *ahd,
+ 						struct scb *scb);
+ static __inline void	ahd_queue_scb(struct ahd_softc *ahd, struct scb *scb);
+@@ -470,7 +472,7 @@ ahd_complete_scb(struct ahd_softc *ahd, 
+ {
+ 	uint32_t sgptr;
+ 
+-	sgptr = ahd_le32toh(scb->hscb->sgptr);
++	sgptr = aic_le32toh(scb->hscb->sgptr);
+ 	if ((sgptr & SG_STATUS_VALID) != 0)
+ 		ahd_handle_scb_status(ahd, scb);
+ 	else
+@@ -486,7 +488,7 @@ ahd_update_residual(struct ahd_softc *ah
+ {
+ 	uint32_t sgptr;
+ 
+-	sgptr = ahd_le32toh(scb->hscb->sgptr);
++	sgptr = aic_le32toh(scb->hscb->sgptr);
+ 	if ((sgptr & SG_STATUS_VALID) != 0)
+ 		ahd_calc_residual(ahd, scb);
+ }
+@@ -520,12 +522,21 @@ do {								\
+ static __inline uint16_t
+ ahd_inw(struct ahd_softc *ahd, u_int port)
+ {
++	/*
++	 * Read high byte first as some registers increment
++	 * or have other side effects when the low byte is
++	 * read.
++	 */
+ 	return ((ahd_inb(ahd, port+1) << 8) | ahd_inb(ahd, port));
+ }
+ 
+ static __inline void
+ ahd_outw(struct ahd_softc *ahd, u_int port, u_int value)
+ {
++	/*
++	 * Write low byte first to accomodate registers
++	 * such as PRGMCNT where the order maters.
++	 */
+ 	ahd_outb(ahd, port, value & 0xFF);
+ 	ahd_outb(ahd, port+1, (value >> 8) & 0xFF);
+ }
+@@ -697,10 +708,15 @@ ahd_inw_scbram(struct ahd_softc *ahd, u_
+ static __inline uint32_t
+ ahd_inl_scbram(struct ahd_softc *ahd, u_int offset)
+ {
+-	return (ahd_inb_scbram(ahd, offset)
+-	      | (ahd_inb_scbram(ahd, offset+1) << 8)
+-	      | (ahd_inb_scbram(ahd, offset+2) << 16)
+-	      | (ahd_inb_scbram(ahd, offset+3) << 24));
++	return (ahd_inw_scbram(ahd, offset)
++	      | (ahd_inw_scbram(ahd, offset+2) << 16));
++}
++
++static __inline uint64_t
++ahd_inq_scbram(struct ahd_softc *ahd, u_int offset)
++{
++	return (ahd_inl_scbram(ahd, offset)
++	      | ((uint64_t)ahd_inl_scbram(ahd, offset+4)) << 32);
+ }
+ 
+ static __inline struct scb *
+@@ -720,7 +736,8 @@ ahd_lookup_scb(struct ahd_softc *ahd, u_
+ static __inline void
+ ahd_swap_with_next_hscb(struct ahd_softc *ahd, struct scb *scb)
+ {
+-	struct hardware_scb *q_hscb;
++	struct	 hardware_scb *q_hscb;
++	struct	 map_node *q_hscb_map;
+ 	uint32_t saved_hscb_busaddr;
+ 
+ 	/*
+@@ -736,6 +753,7 @@ ahd_swap_with_next_hscb(struct ahd_softc
+ 	 * locate the correct SCB by SCB_TAG.
+ 	 */
+ 	q_hscb = ahd->next_queued_hscb;
++	q_hscb_map = ahd->next_queued_hscb_map;
+ 	saved_hscb_busaddr = q_hscb->hscb_busaddr;
+ 	memcpy(q_hscb, scb->hscb, sizeof(*scb->hscb));
+ 	q_hscb->hscb_busaddr = saved_hscb_busaddr;
+@@ -743,7 +761,9 @@ ahd_swap_with_next_hscb(struct ahd_softc
+ 
+ 	/* Now swap HSCB pointers. */
+ 	ahd->next_queued_hscb = scb->hscb;
++	ahd->next_queued_hscb_map = scb->hscb_map;
+ 	scb->hscb = q_hscb;
++	scb->hscb_map = q_hscb_map;
+ 
+ 	/* Now define the mapping from tag to SCB in the scbindex */
+ 	ahd->scb_data.scbindex[SCB_GET_TAG(scb)] = scb;
+@@ -783,13 +803,13 @@ ahd_queue_scb(struct ahd_softc *ahd, str
+ 	if ((ahd_debug & AHD_SHOW_QUEUE) != 0) {
+ 		uint64_t host_dataptr;
+ 
+-		host_dataptr = ahd_le64toh(scb->hscb->dataptr);
++		host_dataptr = aic_le64toh(scb->hscb->dataptr);
+ 		printf("%s: Queueing SCB 0x%x bus addr 0x%x - 0x%x%x/0x%x\n",
+ 		       ahd_name(ahd),
+-		       SCB_GET_TAG(scb), ahd_le32toh(scb->hscb->hscb_busaddr),
++		       SCB_GET_TAG(scb), aic_le32toh(scb->hscb->hscb_busaddr),
+ 		       (u_int)((host_dataptr >> 32) & 0xFFFFFFFF),
+ 		       (u_int)(host_dataptr & 0xFFFFFFFF),
+-		       ahd_le32toh(scb->hscb->datacnt));
++		       aic_le32toh(scb->hscb->datacnt));
+ 	}
+ #endif
+ 	/* Tell the adapter about the newly queued SCB */
+@@ -817,8 +837,8 @@ static __inline int	ahd_intr(struct ahd_
+ static __inline void
+ ahd_sync_qoutfifo(struct ahd_softc *ahd, int op)
+ {
+-	ahd_dmamap_sync(ahd, ahd->shared_data_dmat, ahd->shared_data_dmamap,
+-			/*offset*/0, /*len*/AHC_SCB_MAX * sizeof(uint16_t), op);
++	aic_dmamap_sync(ahd, ahd->shared_data_dmat, ahd->shared_data_map.dmamap,
++			/*offset*/0, /*len*/AHD_SCB_MAX * sizeof(uint16_t), op);
+ }
+ 
+ static __inline void
+@@ -826,8 +846,8 @@ ahd_sync_tqinfifo(struct ahd_softc *ahd,
+ {
+ #ifdef AHD_TARGET_MODE
+ 	if ((ahd->flags & AHD_TARGETROLE) != 0) {
+-		ahd_dmamap_sync(ahd, ahd->shared_data_dmat,
+-				ahd->shared_data_dmamap,
++		aic_dmamap_sync(ahd, ahd->shared_data_dmat,
++				ahd->shared_data_map.dmamap,
+ 				ahd_targetcmd_offset(ahd, 0),
+ 				sizeof(struct target_cmd) * AHD_TMODE_CMDS,
+ 				op);
+@@ -847,7 +867,7 @@ ahd_check_cmdcmpltqueues(struct ahd_soft
+ 	u_int retval;
+ 
+ 	retval = 0;
+-	ahd_dmamap_sync(ahd, ahd->shared_data_dmat, ahd->shared_data_dmamap,
++	aic_dmamap_sync(ahd, ahd->shared_data_dmat, ahd->shared_data_map.dmamap,
+ 			/*offset*/ahd->qoutfifonext, /*len*/2,
+ 			BUS_DMASYNC_POSTREAD);
+ 	if ((ahd->qoutfifo[ahd->qoutfifonext]
+@@ -856,8 +876,8 @@ ahd_check_cmdcmpltqueues(struct ahd_soft
+ #ifdef AHD_TARGET_MODE
+ 	if ((ahd->flags & AHD_TARGETROLE) != 0
+ 	 && (ahd->flags & AHD_TQINFIFO_BLOCKED) == 0) {
+-		ahd_dmamap_sync(ahd, ahd->shared_data_dmat,
+-				ahd->shared_data_dmamap,
++		aic_dmamap_sync(ahd, ahd->shared_data_dmat,
++				ahd->shared_data_map.dmamap,
+ 				ahd_targetcmd_offset(ahd, ahd->tqinfifofnext),
+ 				/*len*/sizeof(struct target_cmd),
+ 				BUS_DMASYNC_POSTREAD);
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic79xx_osm.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aic79xx_osm.c	2003-12-28 23:21:39.000000000 -0800
+@@ -1,7 +1,7 @@
+ /*
+  * Adaptec AIC79xx device driver for Linux.
+  *
+- * $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.
+@@ -62,6 +62,16 @@
+ 
+ #include <linux/mm.h>		/* For fetching system memory size */
+ 
++/************************* Magic SysReq Support *******************************/
++static struct aic_sysrq_key_op ahd_sysrq_op =
++{
++	aic_sysrq_handler,
++	"aic79xxstatedump",
++	"Dump aic79xx controller information to Console"
++};
++
++static int ahd_sysrq_key;
++
+ /*
+  * Lock protecting manipulation of the ahd softc list.
+  */
+@@ -425,7 +435,7 @@ static char *aic79xx = NULL;
+ static char dummy_buffer[60] = "Please don't trounce on me insmod!!\n";
+ 
+ MODULE_AUTHOR("Maintainer: Justin T. Gibbs <gibbs@scsiguy.com>");
+-MODULE_DESCRIPTION("Adaptec Aic77XX/78XX SCSI Host Bus Adapter driver");
++MODULE_DESCRIPTION("Adaptec Aic790X U320 SCSI Host Bus Adapter driver");
+ #ifdef MODULE_LICENSE
+ MODULE_LICENSE("Dual BSD/GPL");
+ #endif
+@@ -466,7 +476,7 @@ MODULE_PARM_DESC(aic79xx,
+ #endif
+ 
+ static void ahd_linux_handle_scsi_status(struct ahd_softc *,
+-					 struct ahd_linux_device *,
++					 struct aic_linux_device *,
+ 					 struct scb *);
+ static void ahd_linux_queue_cmd_complete(struct ahd_softc *ahd,
+ 					 Scsi_Cmnd *cmd);
+@@ -478,21 +488,20 @@ static void ahd_linux_initialize_scsi_bu
+ static void ahd_linux_size_nseg(void);
+ static void ahd_linux_thread_run_complete_queue(struct ahd_softc *ahd);
+ static void ahd_linux_start_dv(struct ahd_softc *ahd);
+-static void ahd_linux_dv_timeout(struct scsi_cmnd *cmd);
+ static int  ahd_linux_dv_thread(void *data);
+ static void ahd_linux_kill_dv_thread(struct ahd_softc *ahd);
+ static void ahd_linux_dv_target(struct ahd_softc *ahd, u_int target);
+ static void ahd_linux_dv_transition(struct ahd_softc *ahd,
+ 				    struct scsi_cmnd *cmd,
+ 				    struct ahd_devinfo *devinfo,
+-				    struct ahd_linux_target *targ);
++				    struct aic_linux_target *targ);
+ static void ahd_linux_dv_fill_cmd(struct ahd_softc *ahd,
+ 				  struct scsi_cmnd *cmd,
+ 				  struct ahd_devinfo *devinfo);
+ static void ahd_linux_dv_inq(struct ahd_softc *ahd,
+ 			     struct scsi_cmnd *cmd,
+ 			     struct ahd_devinfo *devinfo,
+-			     struct ahd_linux_target *targ,
++			     struct aic_linux_target *targ,
+ 			     u_int request_length);
+ static void ahd_linux_dv_tur(struct ahd_softc *ahd,
+ 			     struct scsi_cmnd *cmd,
+@@ -500,19 +509,19 @@ static void ahd_linux_dv_tur(struct ahd_
+ static void ahd_linux_dv_rebd(struct ahd_softc *ahd,
+ 			      struct scsi_cmnd *cmd,
+ 			      struct ahd_devinfo *devinfo,
+-			      struct ahd_linux_target *targ);
++			      struct aic_linux_target *targ);
+ static void ahd_linux_dv_web(struct ahd_softc *ahd,
+ 			     struct scsi_cmnd *cmd,
+ 			     struct ahd_devinfo *devinfo,
+-			     struct ahd_linux_target *targ);
++			     struct aic_linux_target *targ);
+ static void ahd_linux_dv_reb(struct ahd_softc *ahd,
+ 			     struct scsi_cmnd *cmd,
+ 			     struct ahd_devinfo *devinfo,
+-			     struct ahd_linux_target *targ);
++			     struct aic_linux_target *targ);
+ static void ahd_linux_dv_su(struct ahd_softc *ahd,
+ 			    struct scsi_cmnd *cmd,
+ 			    struct ahd_devinfo *devinfo,
+-			    struct ahd_linux_target *targ);
++			    struct aic_linux_target *targ);
+ static __inline int
+ 	   ahd_linux_dv_fallback(struct ahd_softc *ahd,
+ 				 struct ahd_devinfo *devinfo);
+@@ -520,103 +529,57 @@ static int ahd_linux_fallback(struct ahd
+ 			      struct ahd_devinfo *devinfo);
+ static __inline int ahd_linux_dv_fallback(struct ahd_softc *ahd,
+ 					  struct ahd_devinfo *devinfo);
+-static void ahd_linux_dv_complete(Scsi_Cmnd *cmd);
+-static void ahd_linux_generate_dv_pattern(struct ahd_linux_target *targ);
++static void ahd_linux_generate_dv_pattern(struct aic_linux_target *targ);
+ static u_int ahd_linux_user_tagdepth(struct ahd_softc *ahd,
+ 				     struct ahd_devinfo *devinfo);
+ static u_int ahd_linux_user_dv_setting(struct ahd_softc *ahd);
+ static void ahd_linux_setup_user_rd_strm_settings(struct ahd_softc *ahd);
+-static void ahd_linux_device_queue_depth(struct ahd_softc *ahd,
+-					 struct ahd_linux_device *dev);
+-static struct ahd_linux_target*	ahd_linux_alloc_target(struct ahd_softc*,
++static void aic_linux_device_queue_depth(struct ahd_softc *ahd,
++					 struct aic_linux_device *dev);
++static struct aic_linux_target*	ahd_linux_alloc_target(struct ahd_softc*,
+ 						       u_int, u_int);
+ static void			ahd_linux_free_target(struct ahd_softc*,
+-						      struct ahd_linux_target*);
+-static struct ahd_linux_device*	ahd_linux_alloc_device(struct ahd_softc*,
+-						       struct ahd_linux_target*,
++						      struct aic_linux_target*);
++static struct aic_linux_device*	ahd_linux_alloc_device(struct ahd_softc*,
++						       struct aic_linux_target*,
+ 						       u_int);
+ static void			ahd_linux_free_device(struct ahd_softc*,
+-						      struct ahd_linux_device*);
+-static void ahd_linux_run_device_queue(struct ahd_softc*,
+-				       struct ahd_linux_device*);
++						      struct aic_linux_device*);
+ static void ahd_linux_setup_tag_info_global(char *p);
+ static aic_option_callback_t ahd_linux_setup_tag_info;
+ static aic_option_callback_t ahd_linux_setup_rd_strm_info;
+ static aic_option_callback_t ahd_linux_setup_dv;
+ static aic_option_callback_t ahd_linux_setup_iocell_info;
+ static int ahd_linux_next_unit(void);
+-static void ahd_runq_tasklet(unsigned long data);
+ static int aic79xx_setup(char *c);
+ 
+ /****************************** Inlines ***************************************/
+ static __inline void ahd_schedule_completeq(struct ahd_softc *ahd);
+-static __inline void ahd_schedule_runq(struct ahd_softc *ahd);
+-static __inline void ahd_setup_runq_tasklet(struct ahd_softc *ahd);
+-static __inline void ahd_teardown_runq_tasklet(struct ahd_softc *ahd);
+-static __inline struct ahd_linux_device*
++static __inline struct aic_linux_device*
+ 		     ahd_linux_get_device(struct ahd_softc *ahd, u_int channel,
+ 					  u_int target, u_int lun, int alloc);
+-static struct ahd_cmd *ahd_linux_run_complete_queue(struct ahd_softc *ahd);
+-static __inline void ahd_linux_check_device_queue(struct ahd_softc *ahd,
+-						  struct ahd_linux_device *dev);
+-static __inline struct ahd_linux_device *
+-		     ahd_linux_next_device_to_run(struct ahd_softc *ahd);
+-static __inline void ahd_linux_run_device_queues(struct ahd_softc *ahd);
+ static __inline void ahd_linux_unmap_scb(struct ahd_softc*, struct scb*);
+-
+-static __inline int ahd_linux_map_seg(struct ahd_softc *ahd, struct scb *scb,
+-		 		      struct ahd_dma_seg *sg,
+-				      bus_addr_t addr, bus_size_t len);
++static __inline struct ahd_dma_seg*
++		     ahd_linux_sg_setup(struct ahd_softc *ahd, struct scb *scb,
++					struct ahd_dma_seg *sg, bus_addr_t addr,
++					bus_size_t len, int last_seg);
+ 
+ static __inline void
+ ahd_schedule_completeq(struct ahd_softc *ahd)
+ {
+-	if ((ahd->platform_data->flags & AHD_RUN_CMPLT_Q_TIMER) == 0) {
+-		ahd->platform_data->flags |= AHD_RUN_CMPLT_Q_TIMER;
++	if ((ahd->platform_data->flags & AIC_RUN_CMPLT_Q_TIMER) == 0) {
++		ahd->platform_data->flags |= AIC_RUN_CMPLT_Q_TIMER;
+ 		ahd->platform_data->completeq_timer.expires = jiffies;
+ 		add_timer(&ahd->platform_data->completeq_timer);
+ 	}
+ }
+ 
+-/*
+- * Must be called with our lock held.
+- */
+-static __inline void
+-ahd_schedule_runq(struct ahd_softc *ahd)
+-{
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+-	tasklet_schedule(&ahd->platform_data->runq_tasklet);
+-#else
+-	/*
+-	 * Tasklets are not available, so run inline.
+-	 */
+-	ahd_runq_tasklet((unsigned long)ahd);
+-#endif
+-}
+-
+-static __inline
+-void ahd_setup_runq_tasklet(struct ahd_softc *ahd)
+-{
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+-	tasklet_init(&ahd->platform_data->runq_tasklet, ahd_runq_tasklet,
+-		     (unsigned long)ahd);
+-#endif
+-}
+-
+-static __inline void
+-ahd_teardown_runq_tasklet(struct ahd_softc *ahd)
+-{
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+-	tasklet_kill(&ahd->platform_data->runq_tasklet);
+-#endif
+-}
+-
+-static __inline struct ahd_linux_device*
++static __inline struct aic_linux_device*
+ ahd_linux_get_device(struct ahd_softc *ahd, u_int channel, u_int target,
+ 		     u_int lun, int alloc)
+ {
+-	struct ahd_linux_target *targ;
+-	struct ahd_linux_device *dev;
++	struct aic_linux_target *targ;
++	struct aic_linux_device *dev;
+ 	u_int target_offset;
+ 
+ 	target_offset = target;
+@@ -638,10 +601,10 @@ ahd_linux_get_device(struct ahd_softc *a
+ }
+ 
+ #define AHD_LINUX_MAX_RETURNED_ERRORS 4
+-static struct ahd_cmd *
++static struct aic_cmd *
+ ahd_linux_run_complete_queue(struct ahd_softc *ahd)
+ {	
+-	struct	ahd_cmd *acmd;
++	struct	aic_cmd *acmd;
+ 	u_long	done_flags;
+ 	int	with_errors;
+ 
+@@ -666,7 +629,7 @@ ahd_linux_run_complete_queue(struct ahd_
+ 			     acmd, acmd_links.tqe);
+ 		cmd = &acmd_scsi_cmd(acmd);
+ 		cmd->host_scribble = NULL;
+-		if (ahd_cmd_get_transaction_status(cmd) != DID_OK
++		if (aic_cmd_get_transaction_status(cmd) != DID_OK
+ 		 || (cmd->result & 0xFF) != SCSI_STATUS_OK)
+ 			with_errors++;
+ 
+@@ -677,46 +640,6 @@ ahd_linux_run_complete_queue(struct ahd_
+ }
+ 
+ static __inline void
+-ahd_linux_check_device_queue(struct ahd_softc *ahd,
+-			     struct ahd_linux_device *dev)
+-{
+-	if ((dev->flags & AHD_DEV_FREEZE_TIL_EMPTY) != 0
+-	 && dev->active == 0) {
+-		dev->flags &= ~AHD_DEV_FREEZE_TIL_EMPTY;
+-		dev->qfrozen--;
+-	}
+-
+-	if (TAILQ_FIRST(&dev->busyq) == NULL
+-	 || dev->openings == 0 || dev->qfrozen != 0)
+-		return;
+-
+-	ahd_linux_run_device_queue(ahd, dev);
+-}
+-
+-static __inline struct ahd_linux_device *
+-ahd_linux_next_device_to_run(struct ahd_softc *ahd)
+-{
+-	
+-	if ((ahd->flags & AHD_RESOURCE_SHORTAGE) != 0
+-	 || (ahd->platform_data->qfrozen != 0
+-	  && AHD_DV_SIMQ_FROZEN(ahd) == 0))
+-		return (NULL);
+-	return (TAILQ_FIRST(&ahd->platform_data->device_runq));
+-}
+-
+-static __inline void
+-ahd_linux_run_device_queues(struct ahd_softc *ahd)
+-{
+-	struct ahd_linux_device *dev;
+-
+-	while ((dev = ahd_linux_next_device_to_run(ahd)) != NULL) {
+-		TAILQ_REMOVE(&ahd->platform_data->device_runq, dev, links);
+-		dev->flags &= ~AHD_DEV_ON_RUN_LIST;
+-		ahd_linux_check_device_queue(ahd, dev);
+-	}
+-}
+-
+-static __inline void
+ ahd_linux_unmap_scb(struct ahd_softc *ahd, struct scb *scb)
+ {
+ 	Scsi_Cmnd *cmd;
+@@ -729,34 +652,22 @@ ahd_linux_unmap_scb(struct ahd_softc *ah
+ 		struct scatterlist *sg;
+ 
+ 		sg = (struct scatterlist *)cmd->request_buffer;
+-		pci_unmap_sg(ahd->dev_softc, sg, cmd->use_sg, direction);
++		aic_unmap_sg(ahd, sg, cmd->use_sg, direction);
+ 	} else if (cmd->request_bufflen != 0) {
+-		pci_unmap_single(ahd->dev_softc,
++		aic_unmap_single(ahd,
+ 				 scb->platform_data->buf_busaddr,
+ 				 cmd->request_bufflen, direction);
+ 	}
+ }
+ 
+-static __inline int
+-ahd_linux_map_seg(struct ahd_softc *ahd, struct scb *scb,
+-		  struct ahd_dma_seg *sg, bus_addr_t addr, bus_size_t len)
++static __inline struct ahd_dma_seg*
++ahd_linux_sg_setup(struct ahd_softc *ahd, struct scb *scb,
++		   struct ahd_dma_seg *sg, bus_addr_t addr,
++		   bus_size_t len, int last_seg)
+ {
+-	int	 consumed;
+-
+-	if ((scb->sg_count + 1) > AHD_NSEG)
+-		panic("Too few segs for dma mapping.  "
+-		      "Increase AHD_NSEG\n");
+-
+-	consumed = 1;
+-	sg->addr = ahd_htole32(addr & 0xFFFFFFFF);
++	sg = ahd_sg_setup(ahd, scb, sg, addr, len, last_seg);
+ 	scb->platform_data->xfer_len += len;
+-
+-	if (sizeof(bus_addr_t) > 4
+-	 && (ahd->flags & AHD_39BIT_ADDRESSING) != 0)
+-		len |= (addr >> 8) & AHD_SG_HIGH_ADDR_MASK;
+-
+-	sg->len = ahd_htole32(len);
+-	return (consumed);
++	return (sg);
+ }
+ 
+ /******************************** Macros **************************************/
+@@ -797,7 +708,7 @@ static int	   ahd_linux_abort(Scsi_Cmnd 
+  * number of segments needed for the current transfer.  Since the code that
+  * sizes the SCSI malloc pool does not take into consideration fragmentation
+  * of the pool, executing transactions numbering just a fraction of our
+- * concurrent transaction limit with SG list lengths aproaching AHC_NSEG will
++ * concurrent transaction limit with SG list lengths aproaching AHD_NSEG will
+  * quickly depleat the SCSI malloc pool of usable space.  Unfortunately, the
+  * mid-layer does not properly handle this scsi malloc failures for the S/G
+  * array and the result can be a lockup of the I/O subsystem.  We try to size
+@@ -848,6 +759,165 @@ ahd_linux_size_nseg(void)
+ #endif
+ }
+ 
++/************************** Error Recovery ************************************/
++static int ahd_linux_recovery_thread(void *arg);
++
++static int
++ahd_linux_recovery_thread(void *arg)
++{
++	struct ahd_softc *ahd;
++	u_long s;
++
++	ahd = (struct ahd_softc *)arg;
++
++	/*
++	 * Complete thread creation.
++	 */
++	lock_kernel();
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,60)
++	/*
++	 * Don't care about any signals.
++	 */
++	siginitsetinv(&current->blocked, 0);
++
++	daemonize();
++	sprintf(current->comm, "ahd_recovery_%d", ahd->unit);
++#else
++	daemonize("ahd_recovery_%d", ahd->unit);
++#endif
++	unlock_kernel();
++
++	while (1) {
++
++		/*
++		 * Use down_interruptible() rather than down() to
++		 * avoid inclusion in the load average.
++		 */
++		down_interruptible(&ahd->platform_data->recovery_sem);
++
++		ahd_lock(ahd, &s);
++		if ((ahd->flags & AHD_SHUTDOWN_RECOVERY) != 0) {
++			ahd_unlock(ahd, &s);
++			break;
++		}
++
++		/*
++		 * Don't bother the recovery handler if the
++		 * list has been cleared by a previous run
++		 * of the handler.  This can happen when
++		 * several SCBs timeout before our handler
++		 * can run causing our semaphore to be up'ed
++		 * repeatedly.  The extra calls need to be
++		 * avoided so that the recovery handler doesn't
++		 * confuse this case with timeouts occuring
++		 * due to interrupts failing to function.
++		 */
++		if (LIST_EMPTY(&ahd->timedout_scbs) != 0) {
++			ahd_unlock(ahd, &s);
++			continue;
++		}
++
++		ahd_unlock(ahd, &s);
++		ahd_recover_commands(ahd);
++
++		/*
++		 * Process any pent up completions.
++		 */
++		ahd_lock(ahd, &s);
++		aic_schedule_runq(ahd);
++		ahd_linux_run_complete_queue(ahd);
++		ahd_unlock(ahd, &s);
++	}
++	up(&ahd->platform_data->recovery_ending_sem);
++	return(0);
++}
++
++int
++ahd_spawn_recovery_thread(struct ahd_softc *ahd)
++{
++	ahd->platform_data->recovery_pid =
++	    kernel_thread(ahd_linux_recovery_thread, ahd, 0);
++	
++	if (ahd->platform_data->recovery_pid < 0)
++		return (-ahd->platform_data->recovery_pid);
++
++	return (0);
++}
++
++void
++ahd_terminate_recovery_thread(struct ahd_softc *ahd)
++{
++	u_long s;
++
++	ahd_lock(ahd, &s);
++	if (ahd->platform_data->recovery_pid != 0) {
++		ahd->flags |= AHD_SHUTDOWN_RECOVERY;
++		ahd_unlock(ahd, &s);
++		up(&ahd->platform_data->recovery_sem);
++
++		/*
++		 * Use the recovery_ending_sem as an indicator that
++		 * the dv thread is exiting.  Note that the dv
++		 * thread must still return after performing
++		 * the up on our semaphore before it has
++		 * completely exited this module.  Unfortunately,
++		 * there seems to be no easy way to wait for the
++		 * exit of a thread for which you are not the
++		 * parent (dv threads are parented by init).
++		 * Cross your fingers...
++		 */
++		down(&ahd->platform_data->recovery_ending_sem);
++
++		/*
++		 * Mark the recovery thread as already dead.  This
++		 * avoids attempting to kill it a second time.
++		 * This is necessary because we must kill the
++		 * our threads before calling ahd_free() in the
++		 * module shutdown case to avoid bogus locking
++		 * in the SCSI mid-layer, but when ahd_free() is
++		 * called without killing the DV thread in the
++		 * instance detach case, so ahd_platform_free()
++		 * calls us again to verify that the DV thread
++		 * is dead.
++		 */
++		ahd->platform_data->recovery_pid = 0;
++	} else {
++		ahd_unlock(ahd, &s);
++	}
++}
++
++void
++ahd_set_recoveryscb(struct ahd_softc *ahd, struct scb *scb)
++{
++	if ((scb->flags & SCB_RECOVERY_SCB) == 0) {
++		struct scb *list_scb;
++
++		scb->flags |= SCB_RECOVERY_SCB;
++
++		/*
++		 * Take all queued, but not sent SCBs out of the equation.
++		 * Also ensure that no new commands are queued to us while we
++		 * try to fix this problem.
++		 */
++		if ((scb->platform_data->flags & AIC_RELEASE_SIMQ) == 0) {
++			aic_freeze_simq(ahd);
++			scb->platform_data->flags |= AIC_RELEASE_SIMQ;
++		}
++
++		/*
++		 * Go through all of our pending SCBs and remove
++		 * any scheduled timeouts for them.  We will reschedule
++		 * them after we've successfully fixed this problem.
++		 */
++		LIST_FOREACH(list_scb, &ahd->pending_scbs, pending_links) {
++
++			scsi_delete_timer(list_scb->io_ctx);
++			list_scb->platform_data->flags &= ~AIC_TIMEOUT_ACTIVE;
++		}
++	}
++}
++
++/********************** Host Template Entry Points ****************************/
+ /*
+  * Try to detect an Adaptec 79XX controller.
+  */
+@@ -870,7 +940,7 @@ ahd_linux_detect(Scsi_Host_Template *tem
+ 	 * that some of our hacks^H^H^H^H^Hassumptions aren't
+ 	 * violated.
+ 	 */
+-	if (offsetof(struct ahd_cmd_internal, end)
++	if (offsetof(struct aic_cmd_internal, end)
+ 	  > offsetof(struct scsi_cmnd, host_scribble)) {
+ 		printf("ahd_linux_detect: SCSI data structures changed.\n");
+ 		printf("ahd_linux_detect: Unable to attach\n");
+@@ -938,7 +1008,6 @@ ahd_linux_release(struct Scsi_Host * hos
+ 	struct ahd_softc *ahd;
+ 	u_long l;
+ 
+-	ahd_list_lock(&l);
+ 	if (host != NULL) {
+ 
+ 		/*
+@@ -946,17 +1015,20 @@ ahd_linux_release(struct Scsi_Host * hos
+ 		 * the free directly, but check our
+ 		 * list for extra sanity.
+ 		 */
++		ahd_list_lock(&l);
+ 		ahd = ahd_find_softc(*(struct ahd_softc **)host->hostdata);
+ 		if (ahd != NULL) {
+ 			u_long s;
+ 
++			TAILQ_REMOVE(&ahd_tailq, ahd, links);
++			ahd_list_unlock(&l);
+ 			ahd_lock(ahd, &s);
+ 			ahd_intr_enable(ahd, FALSE);
+ 			ahd_unlock(ahd, &s);
+ 			ahd_free(ahd);
+-		}
++		} else
++			ahd_list_unlock(&l);
+ 	}
+-	ahd_list_unlock(&l);
+ 	return (0);
+ }
+ #endif
+@@ -996,7 +1068,7 @@ static int
+ ahd_linux_queue(Scsi_Cmnd * cmd, void (*scsi_done) (Scsi_Cmnd *))
+ {
+ 	struct	 ahd_softc *ahd;
+-	struct	 ahd_linux_device *dev;
++	struct	 aic_linux_device *dev;
+ 	u_long	 flags;
+ 
+ 	ahd = *(struct ahd_softc **)cmd->device->host->hostdata;
+@@ -1015,9 +1087,9 @@ ahd_linux_queue(Scsi_Cmnd * cmd, void (*
+ 	 * perform DV.
+ 	 */
+ 	if (ahd->platform_data->qfrozen != 0
+-	 && AHD_DV_CMD(cmd) == 0) {
++	 && AIC_DV_CMD(cmd) == 0) {
+ 
+-		ahd_cmd_set_transaction_status(cmd, CAM_REQUEUE_REQ);
++		aic_cmd_set_transaction_status(cmd, CAM_REQUEUE_REQ);
+ 		ahd_linux_queue_cmd_complete(ahd, cmd);
+ 		ahd_schedule_completeq(ahd);
+ 		ahd_midlayer_entrypoint_unlock(ahd, &flags);
+@@ -1027,7 +1099,8 @@ ahd_linux_queue(Scsi_Cmnd * cmd, void (*
+ 				   cmd->device->id, cmd->device->lun,
+ 				   /*alloc*/TRUE);
+ 	if (dev == NULL) {
+-		ahd_cmd_set_transaction_status(cmd, CAM_RESRC_UNAVAIL);
++
++		aic_cmd_set_transaction_status(cmd, CAM_RESRC_UNAVAIL);
+ 		ahd_linux_queue_cmd_complete(ahd, cmd);
+ 		ahd_schedule_completeq(ahd);
+ 		ahd_midlayer_entrypoint_unlock(ahd, &flags);
+@@ -1035,14 +1108,30 @@ ahd_linux_queue(Scsi_Cmnd * cmd, void (*
+ 		       ahd_name(ahd));
+ 		return (0);
+ 	}
+-	if (cmd->cmd_len > MAX_CDB_LEN)
+-		return (-EINVAL);
++
++	if (cmd->cmd_len > MAX_CDB_LEN) {
++
++		aic_cmd_set_transaction_status(cmd, CAM_REQ_INVALID);
++		ahd_linux_queue_cmd_complete(ahd, cmd);
++		ahd_schedule_completeq(ahd);
++		ahd_midlayer_entrypoint_unlock(ahd, &flags);
++		printf("%s: aic79xx_linux_queue -"
++		       "CDB length of %d exceeds max!\n",
++		       ahd_name(ahd), cmd->cmd_len);
++		return (0);
++	}
++
++	/*
++	 * We perform our own timeout handling.
++	 */
++	scsi_delete_timer(cmd);
++
+ 	cmd->result = CAM_REQ_INPROG << 16;
+-	TAILQ_INSERT_TAIL(&dev->busyq, (struct ahd_cmd *)cmd, acmd_links.tqe);
+-	if ((dev->flags & AHD_DEV_ON_RUN_LIST) == 0) {
++	TAILQ_INSERT_TAIL(&dev->busyq, (struct aic_cmd *)cmd, acmd_links.tqe);
++	if ((dev->flags & AIC_DEV_ON_RUN_LIST) == 0) {
+ 		TAILQ_INSERT_TAIL(&ahd->platform_data->device_runq, dev, links);
+-		dev->flags |= AHD_DEV_ON_RUN_LIST;
+-		ahd_linux_run_device_queues(ahd);
++		dev->flags |= AIC_DEV_ON_RUN_LIST;
++		aic_linux_run_device_queues(ahd);
+ 	}
+ 	ahd_midlayer_entrypoint_unlock(ahd, &flags);
+ 	return (0);
+@@ -1064,7 +1153,7 @@ static int
+ ahd_linux_slave_configure(Scsi_Device *device)
+ {
+ 	struct	ahd_softc *ahd;
+-	struct	ahd_linux_device *dev;
++	struct	aic_linux_device *dev;
+ 	u_long	flags;
+ 
+ 	ahd = *((struct ahd_softc **)device->host->hostdata);
+@@ -1080,10 +1169,10 @@ ahd_linux_slave_configure(Scsi_Device *d
+ 				   device->id, device->lun,
+ 				   /*alloc*/TRUE);
+ 	if (dev != NULL) {
+-		dev->flags &= ~AHD_DEV_UNCONFIGURED;
+-		dev->flags |= AHD_DEV_SLAVE_CONFIGURED;
++		dev->flags &= ~AIC_DEV_UNCONFIGURED;
++		dev->flags |= AIC_DEV_SLAVE_CONFIGURED;
+ 		dev->scsi_device = device;
+-		ahd_linux_device_queue_depth(ahd, dev);
++		aic_linux_device_queue_depth(ahd, dev);
+ 	}
+ 	ahd_midlayer_entrypoint_unlock(ahd, &flags);
+ 	return (0);
+@@ -1093,7 +1182,7 @@ static void
+ ahd_linux_slave_destroy(Scsi_Device *device)
+ {
+ 	struct	ahd_softc *ahd;
+-	struct	ahd_linux_device *dev;
++	struct	aic_linux_device *dev;
+ 	u_long	flags;
+ 
+ 	ahd = *((struct ahd_softc **)device->host->hostdata);
+@@ -1112,11 +1201,10 @@ ahd_linux_slave_destroy(Scsi_Device *dev
+ 	 * the refcounting process.
+ 	 */
+ 	if (dev != NULL
+-	 && (dev->flags & AHD_DEV_SLAVE_CONFIGURED) != 0) {
+-		dev->flags |= AHD_DEV_UNCONFIGURED;
++	 && (dev->flags & AIC_DEV_SLAVE_CONFIGURED) != 0) {
++		dev->flags |= AIC_DEV_UNCONFIGURED;
+ 		if (TAILQ_EMPTY(&dev->busyq)
+-		 && dev->active == 0
+-		 && (dev->flags & AHD_DEV_TIMER_ACTIVE) == 0)
++		 && dev->active == 0)
+ 			ahd_linux_free_device(ahd, dev);
+ 	}
+ 	ahd_midlayer_entrypoint_unlock(ahd, &flags);
+@@ -1156,7 +1244,7 @@ ahd_linux_select_queue_depth(struct Scsi
+ 			continue;
+ 
+ 		if (device->host == host) {
+-			struct	 ahd_linux_device *dev;
++			struct	 aic_linux_device *dev;
+ 
+ 			/*
+ 			 * Since Linux has attached to the device, configure
+@@ -1167,13 +1255,13 @@ ahd_linux_select_queue_depth(struct Scsi
+ 						   device->id, device->lun,
+ 						   /*alloc*/TRUE);
+ 			if (dev != NULL) {
+-				dev->flags &= ~AHD_DEV_UNCONFIGURED;
++				dev->flags &= ~AIC_DEV_UNCONFIGURED;
+ 				dev->scsi_device = device;
+-				ahd_linux_device_queue_depth(ahd, dev);
++				aic_linux_device_queue_depth(ahd, dev);
+ 				device->queue_depth = dev->openings
+ 						    + dev->active;
+-				if ((dev->flags & (AHD_DEV_Q_BASIC
+-						| AHD_DEV_Q_TAGGED)) == 0) {
++				if ((dev->flags & (AIC_DEV_Q_BASIC
++						| AIC_DEV_Q_TAGGED)) == 0) {
+ 					/*
+ 					 * We allow the OS to queue 2 untagged
+ 					 * transactions to us at any time even
+@@ -1262,9 +1350,9 @@ static int
+ ahd_linux_abort(Scsi_Cmnd *cmd)
+ {
+ 	struct ahd_softc *ahd;
+-	struct ahd_cmd *acmd;
+-	struct ahd_cmd *list_acmd;
+-	struct ahd_linux_device *dev;
++	struct aic_cmd *acmd;
++	struct aic_cmd *list_acmd;
++	struct aic_linux_device *dev;
+ 	struct scb *pending_scb;
+ 	u_long s;
+ 	u_int  saved_scbptr;
+@@ -1282,7 +1370,7 @@ ahd_linux_abort(Scsi_Cmnd *cmd)
+ 	paused = FALSE;
+ 	wait = FALSE;
+ 	ahd = *(struct ahd_softc **)cmd->device->host->hostdata;
+-	acmd = (struct ahd_cmd *)cmd;
++	acmd = (struct aic_cmd *)cmd;
+ 
+ 	printf("%s:%d:%d:%d: Attempting to abort cmd %p:",
+ 	       ahd_name(ahd), cmd->device->channel, cmd->device->id,
+@@ -1341,6 +1429,17 @@ ahd_linux_abort(Scsi_Cmnd *cmd)
+ 		       cmd->device->lun);
+ 		TAILQ_REMOVE(&dev->busyq, list_acmd, acmd_links.tqe);
+ 		cmd->result = DID_ABORT << 16;
++		/*
++		 * The completion handler believes that
++		 * commands without active timers running
++		 * have lost the race of completing before
++		 * their timer expires.  Since commands in
++		 * our busy queues do not have timers running,
++		 * appease the mid-layer by adding a timer
++		 * now.  This timer will be immediately
++		 * canceled by the midlayer.
++		 */
++		scsi_add_timer(cmd, 60*HZ, aic_linux_midlayer_timeout);
+ 		ahd_linux_queue_cmd_complete(ahd, cmd);
+ 		retval = SUCCESS;
+ 		goto done;
+@@ -1516,7 +1615,7 @@ done:
+ 		struct timer_list timer;
+ 		int ret;
+ 
+-		pending_scb->platform_data->flags |= AHD_SCB_UP_EH_SEM;
++		pending_scb->platform_data->flags |= AIC_SCB_UP_EH_SEM;
+ 		spin_unlock_irq(&ahd->platform_data->spin_lock);
+ 		init_timer(&timer);
+ 		timer.data = (u_long)pending_scb;
+@@ -1533,7 +1632,7 @@ done:
+ 		}
+ 		spin_lock_irq(&ahd->platform_data->spin_lock);
+ 	}
+-	ahd_schedule_runq(ahd);
++	aic_schedule_runq(ahd);
+ 	ahd_linux_run_complete_queue(ahd);
+ 	ahd_midlayer_entrypoint_unlock(ahd, &s);
+ 	return (retval);
+@@ -1554,7 +1653,7 @@ ahd_linux_dev_reset(Scsi_Cmnd *cmd)
+ {
+ 	struct	ahd_softc *ahd;
+ 	struct	scsi_cmnd *recovery_cmd;
+-	struct	ahd_linux_device *dev;
++	struct	aic_linux_device *dev;
+ 	struct	ahd_initiator_tinfo *tinfo;
+ 	struct	ahd_tmode_tstate *tstate;
+ 	struct	scb *scb;
+@@ -1592,9 +1691,11 @@ ahd_linux_dev_reset(Scsi_Cmnd *cmd)
+ 	recovery_cmd->host_scribble = (char *)scb;
+ 	scb->io_ctx = recovery_cmd;
+ 	scb->platform_data->dev = dev;
++	scb->platform_data->flags = 0;
+ 	scb->sg_count = 0;
+-	ahd_set_residual(scb, 0);
+-	ahd_set_sense_residual(scb, 0);
++	aic_set_residual(scb, 0);
++	aic_set_sense_residual(scb, 0);
++	scb->platform_data->xfer_len = 0;
+ 	hscb = scb->hscb;
+ 	hscb->control = 0;
+ 	hscb->scsiid = BUILD_SCSIID(ahd, cmd);
+@@ -1613,7 +1714,7 @@ ahd_linux_dev_reset(Scsi_Cmnd *cmd)
+ 	LIST_INSERT_HEAD(&ahd->pending_scbs, scb, pending_links);
+ 	ahd_queue_scb(ahd, scb);
+ 
+-	scb->platform_data->flags |= AHD_SCB_UP_EH_SEM;
++	scb->platform_data->flags |= AIC_SCB_UP_EH_SEM;
+ 	spin_unlock_irq(&ahd->platform_data->spin_lock);
+ 	init_timer(&timer);
+ 	timer.data = (u_long)scb;
+@@ -1629,7 +1730,7 @@ ahd_linux_dev_reset(Scsi_Cmnd *cmd)
+ 		retval = FAILED;
+ 	}
+ 	spin_lock_irq(&ahd->platform_data->spin_lock);
+-	ahd_schedule_runq(ahd);
++	aic_schedule_runq(ahd);
+ 	ahd_linux_run_complete_queue(ahd);
+ 	ahd_midlayer_entrypoint_unlock(ahd, &s);
+ 	printf("%s: Device reset returning 0x%x\n", ahd_name(ahd), retval);
+@@ -1665,189 +1766,8 @@ ahd_linux_bus_reset(Scsi_Cmnd *cmd)
+ 	return (SUCCESS);
+ }
+ 
+-Scsi_Host_Template aic79xx_driver_template = {
+-	.module			= THIS_MODULE,
+-	.name			= "aic79xx",
+-	.proc_info		= ahd_linux_proc_info,
+-	.info			= ahd_linux_info,
+-	.queuecommand		= ahd_linux_queue,
+-	.eh_abort_handler	= ahd_linux_abort,
+-	.eh_device_reset_handler = ahd_linux_dev_reset,
+-	.eh_bus_reset_handler	= ahd_linux_bus_reset,
+-#if defined(__i386__)
+-	.bios_param		= ahd_linux_biosparam,
+-#endif
+-	.can_queue		= AHD_MAX_QUEUE,
+-	.this_id		= -1,
+-	.cmd_per_lun		= 2,
+-	.use_clustering		= ENABLE_CLUSTERING,
+-	.slave_alloc		= ahd_linux_slave_alloc,
+-	.slave_configure	= ahd_linux_slave_configure,
+-	.slave_destroy		= ahd_linux_slave_destroy,
+-};
+-
+-/**************************** Tasklet Handler *********************************/
+-
+-/*
+- * In 2.4.X and above, this routine is called from a tasklet,
+- * so we must re-acquire our lock prior to executing this code.
+- * In all prior kernels, ahd_schedule_runq() calls this routine
+- * directly and ahd_schedule_runq() is called with our lock held.
+- */
+-static void
+-ahd_runq_tasklet(unsigned long data)
+-{
+-	struct ahd_softc* ahd;
+-	struct ahd_linux_device *dev;
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+-	u_long flags;
+-#endif
+-
+-	ahd = (struct ahd_softc *)data;
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+-	ahd_lock(ahd, &flags);
+-#endif
+-	while ((dev = ahd_linux_next_device_to_run(ahd)) != NULL) {
+-	
+-		TAILQ_REMOVE(&ahd->platform_data->device_runq, dev, links);
+-		dev->flags &= ~AHD_DEV_ON_RUN_LIST;
+-		ahd_linux_check_device_queue(ahd, dev);
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+-		/* Yeild to our interrupt handler */
+-		ahd_unlock(ahd, &flags);
+-		ahd_lock(ahd, &flags);
+-#endif
+-	}
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+-	ahd_unlock(ahd, &flags);
+-#endif
+-}
+-
+-/******************************** Bus DMA *************************************/
+-int
+-ahd_dma_tag_create(struct ahd_softc *ahd, bus_dma_tag_t parent,
+-		   bus_size_t alignment, bus_size_t boundary,
+-		   bus_addr_t lowaddr, bus_addr_t highaddr,
+-		   bus_dma_filter_t *filter, void *filterarg,
+-		   bus_size_t maxsize, int nsegments,
+-		   bus_size_t maxsegsz, int flags, bus_dma_tag_t *ret_tag)
+-{
+-	bus_dma_tag_t dmat;
+-
+-	dmat = malloc(sizeof(*dmat), M_DEVBUF, M_NOWAIT);
+-	if (dmat == NULL)
+-		return (ENOMEM);
+-
+-	/*
+-	 * Linux is very simplistic about DMA memory.  For now don't
+-	 * maintain all specification information.  Once Linux supplies
+-	 * better facilities for doing these operations, or the
+-	 * needs of this particular driver change, we might need to do
+-	 * more here.
+-	 */
+-	dmat->alignment = alignment;
+-	dmat->boundary = boundary;
+-	dmat->maxsize = maxsize;
+-	*ret_tag = dmat;
+-	return (0);
+-}
+-
+-void
+-ahd_dma_tag_destroy(struct ahd_softc *ahd, bus_dma_tag_t dmat)
+-{
+-	free(dmat, M_DEVBUF);
+-}
+-
+-int
+-ahd_dmamem_alloc(struct ahd_softc *ahd, bus_dma_tag_t dmat, void** vaddr,
+-		 int flags, bus_dmamap_t *mapp)
+-{
+-	bus_dmamap_t map;
+-
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
+-	map = malloc(sizeof(*map), M_DEVBUF, M_NOWAIT);
+-	if (map == NULL)
+-		return (ENOMEM);
+-	/*
+-	 * Although we can dma data above 4GB, our
+-	 * "consistent" memory is below 4GB for
+-	 * space efficiency reasons (only need a 4byte
+-	 * address).  For this reason, we have to reset
+-	 * our dma mask when doing allocations.
+-	 */
+-	if (ahd->dev_softc != NULL)
+-		ahd_pci_set_dma_mask(ahd->dev_softc, 0xFFFFFFFF);
+-	*vaddr = pci_alloc_consistent(ahd->dev_softc,
+-				      dmat->maxsize, &map->bus_addr);
+-	if (ahd->dev_softc != NULL)
+-		ahd_pci_set_dma_mask(ahd->dev_softc,
+-				     ahd->platform_data->hw_dma_mask);
+-#else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0) */
+-	/*
+-	 * At least in 2.2.14, malloc is a slab allocator so all
+-	 * allocations are aligned.  We assume for these kernel versions
+-	 * that all allocations will be bellow 4Gig, physically contiguous,
+-	 * and accessible via DMA by the controller.
+-	 */
+-	map = NULL; /* No additional information to store */
+-	*vaddr = malloc(dmat->maxsize, M_DEVBUF, M_NOWAIT);
+-#endif
+-	if (*vaddr == NULL)
+-		return (ENOMEM);
+-	*mapp = map;
+-	return(0);
+-}
+-
+-void
+-ahd_dmamem_free(struct ahd_softc *ahd, bus_dma_tag_t dmat,
+-		void* vaddr, bus_dmamap_t map)
+-{
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
+-	pci_free_consistent(ahd->dev_softc, dmat->maxsize,
+-			    vaddr, map->bus_addr);
+-#else
+-	free(vaddr, M_DEVBUF);
+-#endif
+-}
+-
+-int
+-ahd_dmamap_load(struct ahd_softc *ahd, bus_dma_tag_t dmat, bus_dmamap_t map,
+-		void *buf, bus_size_t buflen, bus_dmamap_callback_t *cb,
+-		void *cb_arg, int flags)
+-{
+-	/*
+-	 * Assume for now that this will only be used during
+-	 * initialization and not for per-transaction buffer mapping.
+-	 */
+-	bus_dma_segment_t stack_sg;
+-
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
+-	stack_sg.ds_addr = map->bus_addr;
+-#else
+-#define VIRT_TO_BUS(a) (uint32_t)virt_to_bus((void *)(a))
+-	stack_sg.ds_addr = VIRT_TO_BUS(buf);
+-#endif
+-	stack_sg.ds_len = dmat->maxsize;
+-	cb(cb_arg, &stack_sg, /*nseg*/1, /*error*/0);
+-	return (0);
+-}
+-
+-void
+-ahd_dmamap_destroy(struct ahd_softc *ahd, bus_dma_tag_t dmat, bus_dmamap_t map)
+-{
+-	/*
+-	 * The map may is NULL in our < 2.3.X implementation.
+-	 */
+-	if (map != NULL)
+-		free(map, M_DEVBUF);
+-}
+-
+-int
+-ahd_dmamap_unload(struct ahd_softc *ahd, bus_dma_tag_t dmat, bus_dmamap_t map)
+-{
+-	/* Nothing to do */
+-	return (0);
+-}
++Scsi_Host_Template aic79xx_driver_template = 
++	AIC_TEMPLATE_INITIALIZER("aic79xx", /*max_sectors*/8192);
+ 
+ /********************* Platform Dependent Functions ***************************/
+ /*
+@@ -1883,19 +1803,19 @@ ahd_softc_comp(struct ahd_softc *lahd, s
+ 
+ 	/* Still equal.  Sort by bus/slot/func. */
+ 	if (aic79xx_reverse_scan != 0)
+-		value = ahd_get_pci_bus(lahd->dev_softc)
+-		      - ahd_get_pci_bus(rahd->dev_softc);
++		value = aic_get_pci_bus(lahd->dev_softc)
++		      - aic_get_pci_bus(rahd->dev_softc);
+ 	else
+-		value = ahd_get_pci_bus(rahd->dev_softc)
+-		      - ahd_get_pci_bus(lahd->dev_softc);
++		value = aic_get_pci_bus(rahd->dev_softc)
++		      - aic_get_pci_bus(lahd->dev_softc);
+ 	if (value != 0)
+ 		return (value);
+ 	if (aic79xx_reverse_scan != 0)
+-		value = ahd_get_pci_slot(lahd->dev_softc)
+-		      - ahd_get_pci_slot(rahd->dev_softc);
++		value = aic_get_pci_slot(lahd->dev_softc)
++		      - aic_get_pci_slot(rahd->dev_softc);
+ 	else
+-		value = ahd_get_pci_slot(rahd->dev_softc)
+-		      - ahd_get_pci_slot(lahd->dev_softc);
++		value = aic_get_pci_slot(rahd->dev_softc)
++		      - aic_get_pci_slot(lahd->dev_softc);
+ 	if (value != 0)
+ 		return (value);
+ 
+@@ -2072,9 +1992,16 @@ ahd_linux_register_host(struct ahd_softc
+ 	char	*new_name;
+ 	u_long	s;
+ 	u_long	target;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
++	int	error;
++#endif
+ 
+ 	template->name = ahd->description;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+ 	host = scsi_host_alloc(template, sizeof(struct ahd_softc *));
++#else
++	host = scsi_register(template, sizeof(struct ahd_softc *));
++#endif
+ 	if (host == NULL)
+ 		return (ENOMEM);
+ 
+@@ -2083,8 +2010,12 @@ ahd_linux_register_host(struct ahd_softc
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+ 	scsi_assign_lock(host, &ahd->platform_data->spin_lock);
+ #elif AHD_SCSI_HAS_HOST_LOCK != 0
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,21)
++	host->host_lock = &ahd->platform_data->spin_lock;
++#else
+ 	host->lock = &ahd->platform_data->spin_lock;
+ #endif
++#endif
+ 	ahd->platform_data->host = host;
+ 	host->can_queue = AHD_MAX_QUEUE;
+ 	host->cmd_per_lun = 2;
+@@ -2110,13 +2041,20 @@ ahd_linux_register_host(struct ahd_softc
+ 	ahd_linux_setup_user_rd_strm_settings(ahd);
+ 	ahd_linux_initialize_scsi_bus(ahd);
+ 	ahd_unlock(ahd, &s);
++	ahd_sysrq_key = aic_install_sysrq(&ahd_sysrq_op);
++	ahd_spawn_recovery_thread(ahd);
++	if (ahd->platform_data->recovery_pid < 0) {
++		printf("%s: Failed to create recovery thread, error= %d\n",
++		       ahd_name(ahd), ahd->platform_data->recovery_pid);
++		return (-ahd->platform_data->recovery_pid);
++	}
+ 	ahd->platform_data->dv_pid = kernel_thread(ahd_linux_dv_thread, ahd, 0);
+-	ahd_lock(ahd, &s);
+ 	if (ahd->platform_data->dv_pid < 0) {
+ 		printf("%s: Failed to create DV thread, error= %d\n",
+ 		       ahd_name(ahd), ahd->platform_data->dv_pid);
+ 		return (-ahd->platform_data->dv_pid);
+ 	}
++	ahd_lock(ahd, &s);
+ 	/*
+ 	 * Initially allocate *all* of our linux target objects
+ 	 * so that the DV thread will scan them all in parallel
+@@ -2136,7 +2074,7 @@ ahd_linux_register_host(struct ahd_softc
+ 		 * It is expected that either an external application
+ 		 * or a modified kernel will be used to probe this
+ 		 * ID if it is appropriate.  To accommodate these
+-		 * installations, ahc_linux_alloc_target() will allocate
++		 * installations, ahd_linux_alloc_target() will allocate
+ 		 * for our ID if asked to do so.
+ 		 */
+ 		if (target == ahd->our_id) 
+@@ -2149,7 +2087,9 @@ ahd_linux_register_host(struct ahd_softc
+ 	ahd_unlock(ahd, &s);
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+-	scsi_add_host(host, &ahd->dev_softc->dev); /* XXX handle failure */
++	error = scsi_add_host(host, ahd->dev_softc);
++	if (error != 0)
++		return (-error);
+ 	scsi_scan_host(host);
+ #endif
+ 	return (0);
+@@ -2225,17 +2165,6 @@ ahd_linux_initialize_scsi_bus(struct ahd
+ 		ahd_update_neg_request(ahd, &devinfo, tstate,
+ 				       tinfo, AHD_NEG_ALWAYS);
+ 	}
+-	/* Give the bus some time to recover */
+-	if ((ahd->flags & AHD_RESET_BUS_A) != 0) {
+-		ahd_freeze_simq(ahd);
+-		init_timer(&ahd->platform_data->reset_timer);
+-		ahd->platform_data->reset_timer.data = (u_long)ahd;
+-		ahd->platform_data->reset_timer.expires =
+-		    jiffies + (AIC79XX_RESET_DELAY * HZ)/1000;
+-		ahd->platform_data->reset_timer.function =
+-		    (ahd_linux_callback_t *)ahd_release_simq;
+-		add_timer(&ahd->platform_data->reset_timer);
+-	}
+ }
+ 
+ int
+@@ -2248,24 +2177,32 @@ ahd_platform_alloc(struct ahd_softc *ahd
+ 	memset(ahd->platform_data, 0, sizeof(struct ahd_platform_data));
+ 	TAILQ_INIT(&ahd->platform_data->completeq);
+ 	TAILQ_INIT(&ahd->platform_data->device_runq);
+-	ahd->platform_data->irq = AHD_LINUX_NOIRQ;
++	ahd->platform_data->irq = AIC_LINUX_NOIRQ;
+ 	ahd->platform_data->hw_dma_mask = 0xFFFFFFFF;
+ 	ahd_lockinit(ahd);
+ 	ahd_done_lockinit(ahd);
++	init_timer(&ahd->platform_data->bus_settle_timer);
++	ahd->platform_data->bus_settle_timer.data = (u_long)ahd;
++	ahd->platform_data->bus_settle_timer.function =
++	    (aic_linux_callback_t *)aic_bus_settle_complete;
+ 	init_timer(&ahd->platform_data->completeq_timer);
+ 	ahd->platform_data->completeq_timer.data = (u_long)ahd;
+ 	ahd->platform_data->completeq_timer.function =
+-	    (ahd_linux_callback_t *)ahd_linux_thread_run_complete_queue;
++	    (aic_linux_callback_t *)ahd_linux_thread_run_complete_queue;
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
+ 	init_MUTEX_LOCKED(&ahd->platform_data->eh_sem);
+ 	init_MUTEX_LOCKED(&ahd->platform_data->dv_sem);
+ 	init_MUTEX_LOCKED(&ahd->platform_data->dv_cmd_sem);
++	init_MUTEX_LOCKED(&ahd->platform_data->recovery_sem);
++	init_MUTEX_LOCKED(&ahd->platform_data->recovery_ending_sem);
+ #else
+ 	ahd->platform_data->eh_sem = MUTEX_LOCKED;
+ 	ahd->platform_data->dv_sem = MUTEX_LOCKED;
+ 	ahd->platform_data->dv_cmd_sem = MUTEX_LOCKED;
++	ahd->platform_data->recovery_sem = MUTEX_LOCKED;
++	ahd->platform_data->recovery_ending_sem = MUTEX_LOCKED;
+ #endif
+-	ahd_setup_runq_tasklet(ahd);
++	aic_setup_tasklets(ahd);
+ 	ahd->seltime = (aic79xx_seltime & 0x3) << 4;
+ 	return (0);
+ }
+@@ -2273,19 +2210,22 @@ ahd_platform_alloc(struct ahd_softc *ahd
+ void
+ ahd_platform_free(struct ahd_softc *ahd)
+ {
+-	struct ahd_linux_target *targ;
+-	struct ahd_linux_device *dev;
++	struct aic_linux_target *targ;
++	struct aic_linux_device *dev;
+ 	int i, j;
+ 
++	aic_remove_sysrq(ahd_sysrq_key, &ahd_sysrq_op);
+ 	if (ahd->platform_data != NULL) {
+ 		del_timer_sync(&ahd->platform_data->completeq_timer);
+ 		ahd_linux_kill_dv_thread(ahd);
+-		ahd_teardown_runq_tasklet(ahd);
++		aic_teardown_tasklets(ahd);
+ 		if (ahd->platform_data->host != NULL) {
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+ 			scsi_remove_host(ahd->platform_data->host);
+-#endif
+ 			scsi_host_put(ahd->platform_data->host);
++#else
++			scsi_unregister(ahd->platform_data->host);
++#endif
+ 		}
+ 
+ 		/* destroy all of the device and target objects */
+@@ -2299,6 +2239,7 @@ ahd_platform_free(struct ahd_softc *ahd)
+ 					if (targ->devices[j] == NULL)
+ 						continue;
+ 					dev = targ->devices[j];
++					del_timer_sync(&dev->timer);
+ 					ahd_linux_free_device(ahd, dev);
+ 				}
+ 				/*
+@@ -2309,7 +2250,7 @@ ahd_platform_free(struct ahd_softc *ahd)
+ 			}
+ 		}
+ 
+-		if (ahd->platform_data->irq != AHD_LINUX_NOIRQ)
++		if (ahd->platform_data->irq != AIC_LINUX_NOIRQ)
+ 			free_irq(ahd->platform_data->irq, ahd);
+ 		if (ahd->tags[0] == BUS_SPACE_PIO
+ 		 && ahd->bshs[0].ioport != 0)
+@@ -2377,7 +2318,7 @@ void
+ ahd_platform_set_tags(struct ahd_softc *ahd, struct ahd_devinfo *devinfo,
+ 		      ahd_queue_alg alg)
+ {
+-	struct ahd_linux_device *dev;
++	struct aic_linux_device *dev;
+ 	int was_queuing;
+ 	int now_queuing;
+ 
+@@ -2386,27 +2327,27 @@ ahd_platform_set_tags(struct ahd_softc *
+ 				   devinfo->lun, /*alloc*/FALSE);
+ 	if (dev == NULL)
+ 		return;
+-	was_queuing = dev->flags & (AHD_DEV_Q_BASIC|AHD_DEV_Q_TAGGED);
++	was_queuing = dev->flags & (AIC_DEV_Q_BASIC|AIC_DEV_Q_TAGGED);
+ 	switch (alg) {
+ 	default:
+ 	case AHD_QUEUE_NONE:
+ 		now_queuing = 0;
+ 		break; 
+ 	case AHD_QUEUE_BASIC:
+-		now_queuing = AHD_DEV_Q_BASIC;
++		now_queuing = AIC_DEV_Q_BASIC;
+ 		break;
+ 	case AHD_QUEUE_TAGGED:
+-		now_queuing = AHD_DEV_Q_TAGGED;
++		now_queuing = AIC_DEV_Q_TAGGED;
+ 		break;
+ 	}
+-	if ((dev->flags & AHD_DEV_FREEZE_TIL_EMPTY) == 0
++	if ((dev->flags & AIC_DEV_FREEZE_TIL_EMPTY) == 0
+ 	 && (was_queuing != now_queuing)
+ 	 && (dev->active != 0)) {
+-		dev->flags |= AHD_DEV_FREEZE_TIL_EMPTY;
++		dev->flags |= AIC_DEV_FREEZE_TIL_EMPTY;
+ 		dev->qfrozen++;
+ 	}
+ 
+-	dev->flags &= ~(AHD_DEV_Q_BASIC|AHD_DEV_Q_TAGGED|AHD_DEV_PERIODIC_OTAG);
++	dev->flags &= ~(AIC_DEV_Q_BASIC|AIC_DEV_Q_TAGGED|AIC_DEV_PERIODIC_OTAG);
+ 	if (now_queuing) {
+ 		u_int usertags;
+ 
+@@ -2426,11 +2367,11 @@ ahd_platform_set_tags(struct ahd_softc *
+ 			 */
+ 			dev->openings = 1;
+ 		} else if (alg == AHD_QUEUE_TAGGED) {
+-			dev->flags |= AHD_DEV_Q_TAGGED;
++			dev->flags |= AIC_DEV_Q_TAGGED;
+ 			if (aic79xx_periodic_otag != 0)
+-				dev->flags |= AHD_DEV_PERIODIC_OTAG;
++				dev->flags |= AIC_DEV_PERIODIC_OTAG;
+ 		} else
+-			dev->flags |= AHD_DEV_Q_BASIC;
++			dev->flags |= AIC_DEV_Q_BASIC;
+ 	} else {
+ 		/* We can only have one opening. */
+ 		dev->maxtags = 0;
+@@ -2438,13 +2379,13 @@ ahd_platform_set_tags(struct ahd_softc *
+ 	}
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+ 	if (dev->scsi_device != NULL) {
+-		switch ((dev->flags & (AHD_DEV_Q_BASIC|AHD_DEV_Q_TAGGED))) {
+-		case AHD_DEV_Q_BASIC:
++		switch ((dev->flags & (AIC_DEV_Q_BASIC|AIC_DEV_Q_TAGGED))) {
++		case AIC_DEV_Q_BASIC:
+ 			scsi_adjust_queue_depth(dev->scsi_device,
+ 						MSG_SIMPLE_TASK,
+ 						dev->openings + dev->active);
+ 			break;
+-		case AHD_DEV_Q_TAGGED:
++		case AIC_DEV_Q_TAGGED:
+ 			scsi_adjust_queue_depth(dev->scsi_device,
+ 						MSG_ORDERED_TASK,
+ 						dev->openings + dev->active);
+@@ -2497,9 +2438,9 @@ ahd_platform_abort_scbs(struct ahd_softc
+ 	for (; targ < maxtarg; targ++) {
+ 
+ 		for (; clun < maxlun; clun++) {
+-			struct ahd_linux_device *dev;
+-			struct ahd_busyq *busyq;
+-			struct ahd_cmd *acmd;
++			struct aic_linux_device *dev;
++			struct aic_busyq *busyq;
++			struct aic_cmd *acmd;
+ 
+ 			dev = ahd_linux_get_device(ahd, /*chan*/0, targ,
+ 						   clun, /*alloc*/FALSE);
+@@ -2515,6 +2456,18 @@ ahd_platform_abort_scbs(struct ahd_softc
+ 					     acmd_links.tqe);
+ 				count++;
+ 				cmd->result = status << 16;
++				/*
++				 * The completion handler believes that
++				 * commands without active timers running
++				 * have lost the race of completing before
++				 * their timer expires.  Since commands in
++				 * our busy queues do not have timers running,
++				 * appease the mid-layer by adding a timer
++				 * now.  This timer will be immediately
++				 * canceled by the midlayer.
++				 */
++				scsi_add_timer(cmd, 60*HZ,
++					       aic_linux_midlayer_timeout);
+ 				ahd_linux_queue_cmd_complete(ahd, cmd);
+ 			}
+ 		}
+@@ -2530,7 +2483,7 @@ ahd_linux_thread_run_complete_queue(stru
+ 
+ 	ahd_lock(ahd, &flags);
+ 	del_timer(&ahd->platform_data->completeq_timer);
+-	ahd->platform_data->flags &= ~AHD_RUN_CMPLT_Q_TIMER;
++	ahd->platform_data->flags &= ~AIC_RUN_CMPLT_Q_TIMER;
+ 	ahd_linux_run_complete_queue(ahd);
+ 	ahd_unlock(ahd, &flags);
+ }
+@@ -2543,14 +2496,23 @@ ahd_linux_start_dv(struct ahd_softc *ahd
+ 	 * Freeze the simq and signal ahd_linux_queue to not let any
+ 	 * more commands through
+ 	 */
+-	if ((ahd->platform_data->flags & AHD_DV_ACTIVE) == 0) {
++	if ((ahd->platform_data->flags & AIC_DV_ACTIVE) == 0) {
+ #ifdef AHD_DEBUG
+ 		if (ahd_debug & AHD_SHOW_DV)
+ 			printf("%s: Starting DV\n", ahd_name(ahd));
+ #endif
+ 
+-		ahd->platform_data->flags |= AHD_DV_ACTIVE;
+-		ahd_freeze_simq(ahd);
++		ahd->platform_data->flags |= AIC_DV_ACTIVE;
++
++		/*
++		 * Prevent upper layer from sending any
++		 * commands to us.
++		 */
++		aic_freeze_simq(ahd);
++		scsi_block_requests(ahd->platform_data->host);
++		ahd_platform_abort_scbs(ahd, CAM_TARGET_WILDCARD, ALL_CHANNELS,
++					CAM_LUN_WILDCARD, SCB_LIST_NULL,
++					ROLE_INITIATOR, CAM_REQUEUE_REQ);
+ 
+ 		/* Wake up the DV kthread */
+ 		up(&ahd->platform_data->dv_sem);
+@@ -2589,6 +2551,7 @@ ahd_linux_dv_thread(void *data)
+ 	unlock_kernel();
+ 
+ 	while (1) {
++
+ 		/*
+ 		 * Use down_interruptible() rather than down() to
+ 		 * avoid inclusion in the load average.
+@@ -2597,7 +2560,7 @@ ahd_linux_dv_thread(void *data)
+ 
+ 		/* Check to see if we've been signaled to exit */
+ 		ahd_lock(ahd, &s);
+-		if ((ahd->platform_data->flags & AHD_DV_SHUTDOWN) != 0) {
++		if ((ahd->platform_data->flags & AIC_DV_SHUTDOWN) != 0) {
+ 			ahd_unlock(ahd, &s);
+ 			break;
+ 		}
+@@ -2614,7 +2577,7 @@ ahd_linux_dv_thread(void *data)
+ 		 */
+ 		ahd_lock(ahd, &s);
+ 		while (LIST_FIRST(&ahd->pending_scbs) != NULL) {
+-			ahd->platform_data->flags |= AHD_DV_WAIT_SIMQ_EMPTY;
++			ahd->platform_data->flags |= AIC_DV_WAIT_SIMQ_EMPTY;
+ 			ahd_unlock(ahd, &s);
+ 			down_interruptible(&ahd->platform_data->dv_sem);
+ 			ahd_lock(ahd, &s);
+@@ -2624,8 +2587,8 @@ ahd_linux_dv_thread(void *data)
+ 		 * Wait for the SIMQ to be released so that DV is the
+ 		 * only reason the queue is frozen.
+ 		 */
+-		while (AHD_DV_SIMQ_FROZEN(ahd) == 0) {
+-			ahd->platform_data->flags |= AHD_DV_WAIT_SIMQ_RELEASE;
++		while (AIC_DV_SIMQ_FROZEN(ahd) == 0) {
++			ahd->platform_data->flags |= AIC_DV_WAIT_SIMQ_RELEASE;
+ 			ahd_unlock(ahd, &s);
+ 			down_interruptible(&ahd->platform_data->dv_sem);
+ 			ahd_lock(ahd, &s);
+@@ -2636,14 +2599,17 @@ ahd_linux_dv_thread(void *data)
+ 			ahd_linux_dv_target(ahd, target);
+ 
+ 		ahd_lock(ahd, &s);
+-		ahd->platform_data->flags &= ~AHD_DV_ACTIVE;
+-		ahd_unlock(ahd, &s);
++		ahd->platform_data->flags &= ~AIC_DV_ACTIVE;
+ 
+ 		/*
+ 		 * Release the SIMQ so that normal commands are
+ 		 * allowed to continue on the bus.
+ 		 */
+-		ahd_release_simq(ahd);
++		aic_release_simq_locked(ahd);
++
++		ahd_unlock(ahd, &s);
++
++		scsi_unblock_requests(ahd->platform_data->host);
+ 	}
+ 	up(&ahd->platform_data->eh_sem);
+ 	return (0);
+@@ -2656,7 +2622,7 @@ ahd_linux_kill_dv_thread(struct ahd_soft
+ 
+ 	ahd_lock(ahd, &s);
+ 	if (ahd->platform_data->dv_pid != 0) {
+-		ahd->platform_data->flags |= AHD_DV_SHUTDOWN;
++		ahd->platform_data->flags |= AIC_DV_SHUTDOWN;
+ 		ahd_unlock(ahd, &s);
+ 		up(&ahd->platform_data->dv_sem);
+ 
+@@ -2676,10 +2642,10 @@ ahd_linux_kill_dv_thread(struct ahd_soft
+ 		/*
+ 		 * Mark the dv thread as already dead.  This
+ 		 * avoids attempting to kill it a second time.
+-		 * This is necessary because we must kill the
+-		 * DV thread before calling ahd_free() in the
++		 * This is necessary because we must kill our
++		 * threads before calling ahd_free() in the
+ 		 * module shutdown case to avoid bogus locking
+-		 * in the SCSI mid-layer, but we ahd_free() is
++		 * in the SCSI mid-layer, but when ahd_free() is
+ 		 * called without killing the DV thread in the
+ 		 * instance detach case, so ahd_platform_free()
+ 		 * calls us again to verify that the DV thread
+@@ -2699,10 +2665,10 @@ ahd_linux_kill_dv_thread(struct ahd_soft
+ 	ahd_set_dv_state(ahd, targ, newstate, __LINE__)
+ 
+ static __inline void
+-ahd_set_dv_state(struct ahd_softc *ahd, struct ahd_linux_target *targ,
+-		 ahd_dv_state newstate, u_int line)
++ahd_set_dv_state(struct ahd_softc *ahd, struct aic_linux_target *targ,
++		 aic_dv_state newstate, u_int line)
+ {
+-	ahd_dv_state oldstate;
++	aic_dv_state oldstate;
+ 
+ 	oldstate = targ->dv_state;
+ #ifdef AHD_DEBUG
+@@ -2722,7 +2688,7 @@ static void
+ ahd_linux_dv_target(struct ahd_softc *ahd, u_int target_offset)
+ {
+ 	struct	 ahd_devinfo devinfo;
+-	struct	 ahd_linux_target *targ;
++	struct	 aic_linux_target *targ;
+ 	struct	 scsi_cmnd *cmd;
+ 	struct	 scsi_device *scsi_dev;
+ 	struct	 scsi_sense_data *sense;
+@@ -2736,7 +2702,7 @@ ahd_linux_dv_target(struct ahd_softc *ah
+ 	echo_size = 0;
+ 	ahd_lock(ahd, &s);
+ 	targ = ahd->platform_data->targets[target_offset];
+-	if (targ == NULL || (targ->flags & AHD_DV_REQUIRED) == 0) {
++	if (targ == NULL || (targ->flags & AIC_DV_REQUIRED) == 0) {
+ 		ahd_unlock(ahd, &s);
+ 		return;
+ 	}
+@@ -2759,14 +2725,14 @@ ahd_linux_dv_target(struct ahd_softc *ah
+ 	scsi_dev->channel = devinfo.channel - 'A';
+ 	ahd->platform_data->dv_scsi_dev = scsi_dev;
+ 
+-	AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_INQ_SHORT_ASYNC);
++	AHD_SET_DV_STATE(ahd, targ, AIC_DV_STATE_INQ_SHORT_ASYNC);
+ 
+-	while (targ->dv_state != AHD_DV_STATE_EXIT) {
++	while (targ->dv_state != AIC_DV_STATE_EXIT) {
+ 		timeout = AHD_LINUX_DV_TIMEOUT;
+ 		switch (targ->dv_state) {
+-		case AHD_DV_STATE_INQ_SHORT_ASYNC:
+-		case AHD_DV_STATE_INQ_ASYNC:
+-		case AHD_DV_STATE_INQ_ASYNC_VERIFY:
++		case AIC_DV_STATE_INQ_SHORT_ASYNC:
++		case AIC_DV_STATE_INQ_ASYNC:
++		case AIC_DV_STATE_INQ_ASYNC_VERIFY:
+ 			/*
+ 			 * Set things to async narrow to reduce the
+ 			 * chance that the INQ will fail.
+@@ -2778,36 +2744,36 @@ ahd_linux_dv_target(struct ahd_softc *ah
+ 				      AHD_TRANS_GOAL, /*paused*/FALSE);
+ 			ahd_unlock(ahd, &s);
+ 			timeout = 10 * HZ;
+-			targ->flags &= ~AHD_INQ_VALID;
++			targ->flags &= ~AIC_INQ_VALID;
+ 			/* FALLTHROUGH */
+-		case AHD_DV_STATE_INQ_VERIFY:
++		case AIC_DV_STATE_INQ_VERIFY:
+ 		{
+ 			u_int inq_len;
+ 
+-			if (targ->dv_state == AHD_DV_STATE_INQ_SHORT_ASYNC)
++			if (targ->dv_state == AIC_DV_STATE_INQ_SHORT_ASYNC)
+ 				inq_len = AHD_LINUX_DV_INQ_SHORT_LEN;
+ 			else
+ 				inq_len = targ->inq_data->additional_length + 5;
+ 			ahd_linux_dv_inq(ahd, cmd, &devinfo, targ, inq_len);
+ 			break;
+ 		}
+-		case AHD_DV_STATE_TUR:
+-		case AHD_DV_STATE_BUSY:
++		case AIC_DV_STATE_TUR:
++		case AIC_DV_STATE_BUSY:
+ 			timeout = 5 * HZ;
+ 			ahd_linux_dv_tur(ahd, cmd, &devinfo);
+ 			break;
+-		case AHD_DV_STATE_REBD:
++		case AIC_DV_STATE_REBD:
+ 			ahd_linux_dv_rebd(ahd, cmd, &devinfo, targ);
+ 			break;
+-		case AHD_DV_STATE_WEB:
++		case AIC_DV_STATE_WEB:
+ 			ahd_linux_dv_web(ahd, cmd, &devinfo, targ);
+ 			break;
+ 
+-		case AHD_DV_STATE_REB:
++		case AIC_DV_STATE_REB:
+ 			ahd_linux_dv_reb(ahd, cmd, &devinfo, targ);
+ 			break;
+ 
+-		case AHD_DV_STATE_SU:
++		case AIC_DV_STATE_SU:
+ 			ahd_linux_dv_su(ahd, cmd, &devinfo, targ);
+ 			timeout = 50 * HZ;
+ 			break;
+@@ -2819,8 +2785,6 @@ ahd_linux_dv_target(struct ahd_softc *ah
+ 		}
+ 
+ 		/* Queue the command and wait for it to complete */
+-		/* Abuse eh_timeout in the scsi_cmnd struct for our purposes */
+-		init_timer(&cmd->eh_timeout);
+ #ifdef AHD_DEBUG
+ 		if ((ahd_debug & AHD_SHOW_MESSAGES) != 0)
+ 			/*
+@@ -2830,7 +2794,9 @@ ahd_linux_dv_target(struct ahd_softc *ah
+ 			 */
+ 			timeout += HZ;
+ #endif
+-		scsi_add_timer(cmd, timeout, ahd_linux_dv_timeout);
++		init_timer(&cmd->eh_timeout);
++		cmd->timeout_per_command = timeout;
++
+ 		/*
+ 		 * In 2.5.X, it is assumed that all calls from the
+ 		 * "midlayer" (which we are emulating) will have the
+@@ -2849,13 +2815,14 @@ ahd_linux_dv_target(struct ahd_softc *ah
+ 		spin_unlock_irqrestore(&io_request_lock, s);
+ #endif
+ 		down_interruptible(&ahd->platform_data->dv_cmd_sem);
++
+ 		/*
+ 		 * Wait for the SIMQ to be released so that DV is the
+ 		 * only reason the queue is frozen.
+ 		 */
+ 		ahd_lock(ahd, &s);
+-		while (AHD_DV_SIMQ_FROZEN(ahd) == 0) {
+-			ahd->platform_data->flags |= AHD_DV_WAIT_SIMQ_RELEASE;
++		while (AIC_DV_SIMQ_FROZEN(ahd) == 0) {
++			ahd->platform_data->flags |= AIC_DV_WAIT_SIMQ_RELEASE;
+ 			ahd_unlock(ahd, &s);
+ 			down_interruptible(&ahd->platform_data->dv_sem);
+ 			ahd_lock(ahd, &s);
+@@ -2866,7 +2833,7 @@ ahd_linux_dv_target(struct ahd_softc *ah
+ 	}
+ 
+ out:
+-	if ((targ->flags & AHD_INQ_VALID) != 0
++	if ((targ->flags & AIC_INQ_VALID) != 0
+ 	 && ahd_linux_get_device(ahd, devinfo.channel - 'A',
+ 				 devinfo.target, devinfo.lun,
+ 				 /*alloc*/FALSE) == NULL) {
+@@ -2877,7 +2844,7 @@ out:
+ 		 * parameters found in the inquiry string.
+ 		 */
+ 		ahd_linux_filter_inquiry(ahd, &devinfo);
+-		if ((targ->flags & (AHD_BASIC_DV|AHD_ENHANCED_DV)) != 0) {
++		if ((targ->flags & (AIC_BASIC_DV|AIC_ENHANCED_DV)) != 0) {
+ 			ahd_print_devinfo(ahd, &devinfo);
+ 			printf("DV failed to configure device.  "
+ 			       "Please file a bug report against "
+@@ -2902,7 +2869,7 @@ out:
+ 		free(targ->dv_buffer1, M_DEVBUF);
+ 		targ->dv_buffer1 = NULL;
+ 	}
+-	targ->flags &= ~AHD_DV_REQUIRED;
++	targ->flags &= ~AIC_DV_REQUIRED;
+ 	if (targ->refcount == 0)
+ 		ahd_linux_free_target(ahd, targ);
+ 	ahd_unlock(ahd, &s);
+@@ -2911,13 +2878,13 @@ out:
+ static void
+ ahd_linux_dv_transition(struct ahd_softc *ahd, struct scsi_cmnd *cmd,
+ 			struct ahd_devinfo *devinfo,
+-			struct ahd_linux_target *targ)
++			struct aic_linux_target *targ)
+ {
+ 	u_int32_t status;
+ 
+ 	status = aic_error_action(cmd, targ->inq_data,
+-				  ahd_cmd_get_transaction_status(cmd),
+-				  ahd_cmd_get_scsi_status(cmd));
++				  aic_cmd_get_transaction_status(cmd),
++				  aic_cmd_get_scsi_status(cmd));
+ 
+ 	
+ #ifdef AHD_DEBUG
+@@ -2930,8 +2897,8 @@ ahd_linux_dv_transition(struct ahd_softc
+ #endif
+ 
+ 	switch (targ->dv_state) {
+-	case AHD_DV_STATE_INQ_SHORT_ASYNC:
+-	case AHD_DV_STATE_INQ_ASYNC:
++	case AIC_DV_STATE_INQ_SHORT_ASYNC:
++	case AIC_DV_STATE_INQ_ASYNC:
+ 		switch (status & SS_MASK) {
+ 		case SS_NOP:
+ 		{
+@@ -2940,21 +2907,21 @@ ahd_linux_dv_transition(struct ahd_softc
+ 		}
+ 		case SS_INQ_REFRESH:
+ 			AHD_SET_DV_STATE(ahd, targ,
+-					 AHD_DV_STATE_INQ_SHORT_ASYNC);
++					 AIC_DV_STATE_INQ_SHORT_ASYNC);
+ 			break;
+ 		case SS_TUR:
+ 		case SS_RETRY:
+ 			AHD_SET_DV_STATE(ahd, targ, targ->dv_state);
+-			if (ahd_cmd_get_transaction_status(cmd)
++			if (aic_cmd_get_transaction_status(cmd)
+ 			 == CAM_REQUEUE_REQ)
+ 				targ->dv_state_retry--;
+ 			if ((status & SS_ERRMASK) == EBUSY)
+-				AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_BUSY);
++				AHD_SET_DV_STATE(ahd, targ, AIC_DV_STATE_BUSY);
+ 			if (targ->dv_state_retry < 10)
+ 				break;
+ 			/* FALLTHROUGH */
+ 		default:
+-			AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
++			AHD_SET_DV_STATE(ahd, targ, AIC_DV_STATE_EXIT);
+ #ifdef AHD_DEBUG
+ 			if (ahd_debug & AHD_SHOW_DV) {
+ 				ahd_print_devinfo(ahd, devinfo);
+@@ -2964,7 +2931,7 @@ ahd_linux_dv_transition(struct ahd_softc
+ 			break;
+ 		}
+ 		break;
+-	case AHD_DV_STATE_INQ_ASYNC_VERIFY:
++	case AIC_DV_STATE_INQ_ASYNC_VERIFY:
+ 		switch (status & SS_MASK) {
+ 		case SS_NOP:
+ 		{
+@@ -2978,12 +2945,12 @@ ahd_linux_dv_transition(struct ahd_softc
+ 				 * Try from the top again.
+ 				 */
+ 				AHD_SET_DV_STATE(ahd, targ,
+-						 AHD_DV_STATE_INQ_SHORT_ASYNC);
++						 AIC_DV_STATE_INQ_SHORT_ASYNC);
+ 				break;
+ 			}
+ 
+ 			AHD_SET_DV_STATE(ahd, targ, targ->dv_state+1);
+-			targ->flags |= AHD_INQ_VALID;
++			targ->flags |= AIC_INQ_VALID;
+ 			if (ahd_linux_user_dv_setting(ahd) == 0)
+ 				break;
+ 
+@@ -2996,33 +2963,33 @@ ahd_linux_dv_transition(struct ahd_softc
+ 			default:
+ 			case SID_SPI_CLOCK_ST:
+ 				/* Assume only basic DV is supported. */
+-				targ->flags |= AHD_BASIC_DV;
++				targ->flags |= AIC_BASIC_DV;
+ 				break;
+ 			case SID_SPI_CLOCK_DT:
+ 			case SID_SPI_CLOCK_DT_ST:
+-				targ->flags |= AHD_ENHANCED_DV;
++				targ->flags |= AIC_ENHANCED_DV;
+ 				break;
+ 			}
+ 			break;
+ 		}
+ 		case SS_INQ_REFRESH:
+ 			AHD_SET_DV_STATE(ahd, targ,
+-					 AHD_DV_STATE_INQ_SHORT_ASYNC);
++					 AIC_DV_STATE_INQ_SHORT_ASYNC);
+ 			break;
+ 		case SS_TUR:
+ 		case SS_RETRY:
+ 			AHD_SET_DV_STATE(ahd, targ, targ->dv_state);
+-			if (ahd_cmd_get_transaction_status(cmd)
++			if (aic_cmd_get_transaction_status(cmd)
+ 			 == CAM_REQUEUE_REQ)
+ 				targ->dv_state_retry--;
+ 
+ 			if ((status & SS_ERRMASK) == EBUSY)
+-				AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_BUSY);
++				AHD_SET_DV_STATE(ahd, targ, AIC_DV_STATE_BUSY);
+ 			if (targ->dv_state_retry < 10)
+ 				break;
+ 			/* FALLTHROUGH */
+ 		default:
+-			AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
++			AHD_SET_DV_STATE(ahd, targ, AIC_DV_STATE_EXIT);
+ #ifdef AHD_DEBUG
+ 			if (ahd_debug & AHD_SHOW_DV) {
+ 				ahd_print_devinfo(ahd, devinfo);
+@@ -3032,14 +2999,14 @@ ahd_linux_dv_transition(struct ahd_softc
+ 			break;
+ 		}
+ 		break;
+-	case AHD_DV_STATE_INQ_VERIFY:
++	case AIC_DV_STATE_INQ_VERIFY:
+ 		switch (status & SS_MASK) {
+ 		case SS_NOP:
+ 		{
+ 
+ 			if (memcmp(targ->inq_data, targ->dv_buffer,
+ 				   AHD_LINUX_DV_INQ_LEN) == 0) {
+-				AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
++				AHD_SET_DV_STATE(ahd, targ, AIC_DV_STATE_EXIT);
+ 				break;
+ 			}
+ 
+@@ -3061,7 +3028,7 @@ ahd_linux_dv_transition(struct ahd_softc
+ #endif
+ 
+ 			if (ahd_linux_dv_fallback(ahd, devinfo) != 0) {
+-				AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
++				AHD_SET_DV_STATE(ahd, targ, AIC_DV_STATE_EXIT);
+ 				break;
+ 			}
+ 			/*
+@@ -3074,18 +3041,18 @@ ahd_linux_dv_transition(struct ahd_softc
+ 		}
+ 		case SS_INQ_REFRESH:
+ 			AHD_SET_DV_STATE(ahd, targ,
+-					 AHD_DV_STATE_INQ_SHORT_ASYNC);
++					 AIC_DV_STATE_INQ_SHORT_ASYNC);
+ 			break;
+ 		case SS_TUR:
+ 		case SS_RETRY:
+ 			AHD_SET_DV_STATE(ahd, targ, targ->dv_state);
+-			if (ahd_cmd_get_transaction_status(cmd)
++			if (aic_cmd_get_transaction_status(cmd)
+ 			 == CAM_REQUEUE_REQ) {
+ 				targ->dv_state_retry--;
+ 			} else if ((status & SSQ_FALLBACK) != 0) {
+ 				if (ahd_linux_dv_fallback(ahd, devinfo) != 0) {
+ 					AHD_SET_DV_STATE(ahd, targ,
+-							 AHD_DV_STATE_EXIT);
++							 AIC_DV_STATE_EXIT);
+ 					break;
+ 				}
+ 				/*
+@@ -3094,12 +3061,12 @@ ahd_linux_dv_transition(struct ahd_softc
+ 				 */
+ 				targ->dv_state_retry = 0;
+ 			} else if ((status & SS_ERRMASK) == EBUSY)
+-				AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_BUSY);
++				AHD_SET_DV_STATE(ahd, targ, AIC_DV_STATE_BUSY);
+ 			if (targ->dv_state_retry < 10)
+ 				break;
+ 			/* FALLTHROUGH */
+ 		default:
+-			AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
++			AHD_SET_DV_STATE(ahd, targ, AIC_DV_STATE_EXIT);
+ #ifdef AHD_DEBUG
+ 			if (ahd_debug & AHD_SHOW_DV) {
+ 				ahd_print_devinfo(ahd, devinfo);
+@@ -3110,33 +3077,33 @@ ahd_linux_dv_transition(struct ahd_softc
+ 		}
+ 		break;
+ 
+-	case AHD_DV_STATE_TUR:
++	case AIC_DV_STATE_TUR:
+ 		switch (status & SS_MASK) {
+ 		case SS_NOP:
+-			if ((targ->flags & AHD_BASIC_DV) != 0) {
++			if ((targ->flags & AIC_BASIC_DV) != 0) {
+ 				ahd_linux_filter_inquiry(ahd, devinfo);
+ 				AHD_SET_DV_STATE(ahd, targ,
+-						 AHD_DV_STATE_INQ_VERIFY);
+-			} else if ((targ->flags & AHD_ENHANCED_DV) != 0) {
+-				AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_REBD);
++						 AIC_DV_STATE_INQ_VERIFY);
++			} else if ((targ->flags & AIC_ENHANCED_DV) != 0) {
++				AHD_SET_DV_STATE(ahd, targ, AIC_DV_STATE_REBD);
+ 			} else {
+-				AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
++				AHD_SET_DV_STATE(ahd, targ, AIC_DV_STATE_EXIT);
+ 			}
+ 			break;
+ 		case SS_RETRY:
+ 		case SS_TUR:
+ 			if ((status & SS_ERRMASK) == EBUSY) {
+-				AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_BUSY);
++				AHD_SET_DV_STATE(ahd, targ, AIC_DV_STATE_BUSY);
+ 				break;
+ 			}
+ 			AHD_SET_DV_STATE(ahd, targ, targ->dv_state);
+-			if (ahd_cmd_get_transaction_status(cmd)
++			if (aic_cmd_get_transaction_status(cmd)
+ 			 == CAM_REQUEUE_REQ) {
+ 				targ->dv_state_retry--;
+ 			} else if ((status & SSQ_FALLBACK) != 0) {
+ 				if (ahd_linux_dv_fallback(ahd, devinfo) != 0) {
+ 					AHD_SET_DV_STATE(ahd, targ,
+-							 AHD_DV_STATE_EXIT);
++							 AIC_DV_STATE_EXIT);
+ 					break;
+ 				}
+ 				/*
+@@ -3152,7 +3119,7 @@ ahd_linux_dv_transition(struct ahd_softc
+ 					printf("DV TUR reties exhausted\n");
+ 				}
+ #endif
+-				AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
++				AHD_SET_DV_STATE(ahd, targ, AIC_DV_STATE_EXIT);
+ 				break;
+ 			}
+ 			if (status & SSQ_DELAY)
+@@ -3160,25 +3127,25 @@ ahd_linux_dv_transition(struct ahd_softc
+ 
+ 			break;
+ 		case SS_START:
+-			AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_SU);
++			AHD_SET_DV_STATE(ahd, targ, AIC_DV_STATE_SU);
+ 			break;
+ 		case SS_INQ_REFRESH:
+ 			AHD_SET_DV_STATE(ahd, targ,
+-					 AHD_DV_STATE_INQ_SHORT_ASYNC);
++					 AIC_DV_STATE_INQ_SHORT_ASYNC);
+ 			break;
+ 		default:
+-			AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
++			AHD_SET_DV_STATE(ahd, targ, AIC_DV_STATE_EXIT);
+ 			break;
+ 		}
+ 		break;
+ 
+-	case AHD_DV_STATE_REBD:
++	case AIC_DV_STATE_REBD:
+ 		switch (status & SS_MASK) {
+ 		case SS_NOP:
+ 		{
+ 			uint32_t echo_size;
+ 
+-			AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_WEB);
++			AHD_SET_DV_STATE(ahd, targ, AIC_DV_STATE_WEB);
+ 			echo_size = scsi_3btoul(&targ->dv_buffer[1]);
+ 			echo_size &= 0x1FFF;
+ #ifdef AHD_DEBUG
+@@ -3188,7 +3155,17 @@ ahd_linux_dv_transition(struct ahd_softc
+ 			}
+ #endif
+ 			if (echo_size == 0) {
+-				AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
++				/*
++				 * Fall back to basic DV.
++				 */
++				if (bootverbose) {
++					ahd_print_devinfo(ahd, devinfo);
++					printf("Echo Buffer unavailable.  "
++					       "Performing basic DV.\n");
++				}
++				targ->flags &= ~AIC_ENHANCED_DV;
++				targ->flags |= AIC_BASIC_DV;
++				AHD_SET_DV_STATE(ahd, targ, AIC_DV_STATE_TUR);
+ 				break;
+ 			}
+ 
+@@ -3203,11 +3180,11 @@ ahd_linux_dv_transition(struct ahd_softc
+ 		}
+ 		case SS_INQ_REFRESH:
+ 			AHD_SET_DV_STATE(ahd, targ,
+-					 AHD_DV_STATE_INQ_SHORT_ASYNC);
++					 AIC_DV_STATE_INQ_SHORT_ASYNC);
+ 			break;
+ 		case SS_RETRY:
+ 			AHD_SET_DV_STATE(ahd, targ, targ->dv_state);
+-			if (ahd_cmd_get_transaction_status(cmd)
++			if (aic_cmd_get_transaction_status(cmd)
+ 			 == CAM_REQUEUE_REQ)
+ 				targ->dv_state_retry--;
+ 			if (targ->dv_state_retry <= 10)
+@@ -3226,30 +3203,30 @@ ahd_linux_dv_transition(struct ahd_softc
+ 			 * and try level 1 DV.
+ 			 */
+ 			ahd_linux_filter_inquiry(ahd, devinfo);
+-			AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_INQ_VERIFY);
++			AHD_SET_DV_STATE(ahd, targ, AIC_DV_STATE_INQ_VERIFY);
+ 			targ->dv_echo_size = 0;
+ 			break;
+ 		}
+ 		break;
+ 
+-	case AHD_DV_STATE_WEB:
++	case AIC_DV_STATE_WEB:
+ 		switch (status & SS_MASK) {
+ 		case SS_NOP:
+-			AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_REB);
++			AHD_SET_DV_STATE(ahd, targ, AIC_DV_STATE_REB);
+ 			break;
+ 		case SS_INQ_REFRESH:
+ 			AHD_SET_DV_STATE(ahd, targ,
+-					 AHD_DV_STATE_INQ_SHORT_ASYNC);
++					 AIC_DV_STATE_INQ_SHORT_ASYNC);
+ 			break;
+ 		case SS_RETRY:
+ 			AHD_SET_DV_STATE(ahd, targ, targ->dv_state);
+-			if (ahd_cmd_get_transaction_status(cmd)
++			if (aic_cmd_get_transaction_status(cmd)
+ 			 == CAM_REQUEUE_REQ) {
+ 				targ->dv_state_retry--;
+ 			} else if ((status & SSQ_FALLBACK) != 0) {
+ 				if (ahd_linux_dv_fallback(ahd, devinfo) != 0) {
+ 					AHD_SET_DV_STATE(ahd, targ,
+-							 AHD_DV_STATE_EXIT);
++							 AIC_DV_STATE_EXIT);
+ 					break;
+ 				}
+ 				/*
+@@ -3268,22 +3245,22 @@ ahd_linux_dv_transition(struct ahd_softc
+ 			}
+ #endif
+ 		default:
+-			AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
++			AHD_SET_DV_STATE(ahd, targ, AIC_DV_STATE_EXIT);
+ 			break;
+ 		}
+ 		break;
+ 
+-	case AHD_DV_STATE_REB:
++	case AIC_DV_STATE_REB:
+ 		switch (status & SS_MASK) {
+ 		case SS_NOP:
+ 			if (memcmp(targ->dv_buffer, targ->dv_buffer1,
+ 				   targ->dv_echo_size) != 0) {
+ 				if (ahd_linux_dv_fallback(ahd, devinfo) != 0)
+ 					AHD_SET_DV_STATE(ahd, targ,
+-							 AHD_DV_STATE_EXIT);
++							 AIC_DV_STATE_EXIT);
+ 				else
+ 					AHD_SET_DV_STATE(ahd, targ,
+-							 AHD_DV_STATE_WEB);
++							 AIC_DV_STATE_WEB);
+ 				break;
+ 			}
+ 			
+@@ -3295,24 +3272,24 @@ ahd_linux_dv_transition(struct ahd_softc
+ 				free(targ->dv_buffer1, M_DEVBUF);
+ 				targ->dv_buffer1 = NULL;
+ 			}
+-			AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
++			AHD_SET_DV_STATE(ahd, targ, AIC_DV_STATE_EXIT);
+ 			break;
+ 		case SS_INQ_REFRESH:
+ 			AHD_SET_DV_STATE(ahd, targ,
+-					 AHD_DV_STATE_INQ_SHORT_ASYNC);
++					 AIC_DV_STATE_INQ_SHORT_ASYNC);
+ 			break;
+ 		case SS_RETRY:
+ 			AHD_SET_DV_STATE(ahd, targ, targ->dv_state);
+-			if (ahd_cmd_get_transaction_status(cmd)
++			if (aic_cmd_get_transaction_status(cmd)
+ 			 == CAM_REQUEUE_REQ) {
+ 				targ->dv_state_retry--;
+ 			} else if ((status & SSQ_FALLBACK) != 0) {
+ 				if (ahd_linux_dv_fallback(ahd, devinfo) != 0) {
+ 					AHD_SET_DV_STATE(ahd, targ,
+-							 AHD_DV_STATE_EXIT);
++							 AIC_DV_STATE_EXIT);
+ 					break;
+ 				}
+-				AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_WEB);
++				AHD_SET_DV_STATE(ahd, targ, AIC_DV_STATE_WEB);
+ 			}
+ 			if (targ->dv_state_retry <= 10) {
+ 				if ((status & (SSQ_DELAY_RANDOM|SSQ_DELAY))!= 0)
+@@ -3327,35 +3304,35 @@ ahd_linux_dv_transition(struct ahd_softc
+ #endif
+ 			/* FALLTHROUGH */
+ 		default:
+-			AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
++			AHD_SET_DV_STATE(ahd, targ, AIC_DV_STATE_EXIT);
+ 			break;
+ 		}
+ 		break;
+ 
+-	case AHD_DV_STATE_SU:
++	case AIC_DV_STATE_SU:
+ 		switch (status & SS_MASK) {
+ 		case SS_NOP:
+ 		case SS_INQ_REFRESH:
+ 			AHD_SET_DV_STATE(ahd, targ,
+-					 AHD_DV_STATE_INQ_SHORT_ASYNC);
++					 AIC_DV_STATE_INQ_SHORT_ASYNC);
+ 			break;
+ 		default:
+-			AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
++			AHD_SET_DV_STATE(ahd, targ, AIC_DV_STATE_EXIT);
+ 			break;
+ 		}
+ 		break;
+ 
+-	case AHD_DV_STATE_BUSY:
++	case AIC_DV_STATE_BUSY:
+ 		switch (status & SS_MASK) {
+ 		case SS_NOP:
+ 		case SS_INQ_REFRESH:
+ 			AHD_SET_DV_STATE(ahd, targ,
+-					 AHD_DV_STATE_INQ_SHORT_ASYNC);
++					 AIC_DV_STATE_INQ_SHORT_ASYNC);
+ 			break;
+ 		case SS_TUR:
+ 		case SS_RETRY:
+ 			AHD_SET_DV_STATE(ahd, targ, targ->dv_state);
+-			if (ahd_cmd_get_transaction_status(cmd)
++			if (aic_cmd_get_transaction_status(cmd)
+ 			 == CAM_REQUEUE_REQ) {
+ 				targ->dv_state_retry--;
+ 			} else if (targ->dv_state_retry < 60) {
+@@ -3368,11 +3345,11 @@ ahd_linux_dv_transition(struct ahd_softc
+ 					printf("DV BUSY reties exhausted\n");
+ 				}
+ #endif
+-				AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
++				AHD_SET_DV_STATE(ahd, targ, AIC_DV_STATE_EXIT);
+ 			}
+ 			break;
+ 		default:
+-			AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
++			AHD_SET_DV_STATE(ahd, targ, AIC_DV_STATE_EXIT);
+ 			break;
+ 		}
+ 		break;
+@@ -3380,7 +3357,7 @@ ahd_linux_dv_transition(struct ahd_softc
+ 	default:
+ 		printf("%s: Invalid DV completion state %d\n", ahd_name(ahd),
+ 		       targ->dv_state);
+-		AHD_SET_DV_STATE(ahd, targ, AHD_DV_STATE_EXIT);
++		AHD_SET_DV_STATE(ahd, targ, AIC_DV_STATE_EXIT);
+ 		break;
+ 	}
+ }
+@@ -3400,7 +3377,7 @@ ahd_linux_dv_fill_cmd(struct ahd_softc *
+  */
+ static void
+ ahd_linux_dv_inq(struct ahd_softc *ahd, struct scsi_cmnd *cmd,
+-		 struct ahd_devinfo *devinfo, struct ahd_linux_target *targ,
++		 struct ahd_devinfo *devinfo, struct aic_linux_target *targ,
+ 		 u_int request_length)
+ {
+ 
+@@ -3413,7 +3390,7 @@ ahd_linux_dv_inq(struct ahd_softc *ahd, 
+ 	if (targ->inq_data == NULL)
+ 		targ->inq_data = malloc(AHD_LINUX_DV_INQ_LEN,
+ 					M_DEVBUF, M_WAITOK);
+-	if (targ->dv_state > AHD_DV_STATE_INQ_ASYNC) {
++	if (targ->dv_state > AIC_DV_STATE_INQ_ASYNC) {
+ 		if (targ->dv_buffer != NULL)
+ 			free(targ->dv_buffer, M_DEVBUF);
+ 		targ->dv_buffer = malloc(AHD_LINUX_DV_INQ_LEN,
+@@ -3426,7 +3403,7 @@ ahd_linux_dv_inq(struct ahd_softc *ahd, 
+ 	cmd->cmnd[0] = INQUIRY;
+ 	cmd->cmnd[4] = request_length;
+ 	cmd->request_bufflen = request_length;
+-	if (targ->dv_state > AHD_DV_STATE_INQ_ASYNC)
++	if (targ->dv_state > AIC_DV_STATE_INQ_ASYNC)
+ 		cmd->request_buffer = targ->dv_buffer;
+ 	else
+ 		cmd->request_buffer = targ->inq_data;
+@@ -3455,7 +3432,7 @@ ahd_linux_dv_tur(struct ahd_softc *ahd, 
+ 
+ static void
+ ahd_linux_dv_rebd(struct ahd_softc *ahd, struct scsi_cmnd *cmd,
+-		 struct ahd_devinfo *devinfo, struct ahd_linux_target *targ)
++		 struct ahd_devinfo *devinfo, struct aic_linux_target *targ)
+ {
+ 
+ #ifdef AHD_DEBUG
+@@ -3480,7 +3457,7 @@ ahd_linux_dv_rebd(struct ahd_softc *ahd,
+ 
+ static void
+ ahd_linux_dv_web(struct ahd_softc *ahd, struct scsi_cmnd *cmd,
+-		 struct ahd_devinfo *devinfo, struct ahd_linux_target *targ)
++		 struct ahd_devinfo *devinfo, struct aic_linux_target *targ)
+ {
+ 
+ #ifdef AHD_DEBUG
+@@ -3502,7 +3479,7 @@ ahd_linux_dv_web(struct ahd_softc *ahd, 
+ 
+ static void
+ ahd_linux_dv_reb(struct ahd_softc *ahd, struct scsi_cmnd *cmd,
+-		 struct ahd_devinfo *devinfo, struct ahd_linux_target *targ)
++		 struct ahd_devinfo *devinfo, struct aic_linux_target *targ)
+ {
+ 
+ #ifdef AHD_DEBUG
+@@ -3525,7 +3502,7 @@ ahd_linux_dv_reb(struct ahd_softc *ahd, 
+ static void
+ ahd_linux_dv_su(struct ahd_softc *ahd, struct scsi_cmnd *cmd,
+ 		struct ahd_devinfo *devinfo,
+-		struct ahd_linux_target *targ)
++		struct aic_linux_target *targ)
+ {
+ 	u_int le;
+ 
+@@ -3560,7 +3537,7 @@ ahd_linux_dv_fallback(struct ahd_softc *
+ static int
+ ahd_linux_fallback(struct ahd_softc *ahd, struct ahd_devinfo *devinfo)
+ {
+-	struct	ahd_linux_target *targ;
++	struct	aic_linux_target *targ;
+ 	struct	ahd_initiator_tinfo *tinfo;
+ 	struct	ahd_transinfo *goal;
+ 	struct	ahd_tmode_tstate *tstate;
+@@ -3731,7 +3708,7 @@ ahd_linux_fallback(struct ahd_softc *ahd
+ 	return (0);
+ }
+ 
+-static void
++void
+ ahd_linux_dv_timeout(struct scsi_cmnd *cmd)
+ {
+ 	struct	ahd_softc *ahd;
+@@ -3765,29 +3742,18 @@ ahd_linux_dv_timeout(struct scsi_cmnd *c
+ 	 * error code.
+ 	 */
+ 	if ((scb->flags & SCB_SENSE) != 0)
+-		ahd_set_transaction_status(scb, CAM_AUTOSENSE_FAIL);
++		aic_set_transaction_status(scb, CAM_AUTOSENSE_FAIL);
+ 	else
+-		ahd_set_transaction_status(scb, CAM_CMD_TIMEOUT);
++		aic_set_transaction_status(scb, CAM_CMD_TIMEOUT);
+ 	ahd_reset_channel(ahd, cmd->device->channel + 'A', /*initiate*/TRUE);
+ 
+-	/*
+-	 * Add a minimal bus settle delay for devices that are slow to
+-	 * respond after bus resets.
+-	 */
+-	ahd_freeze_simq(ahd);
+-	init_timer(&ahd->platform_data->reset_timer);
+-	ahd->platform_data->reset_timer.data = (u_long)ahd;
+-	ahd->platform_data->reset_timer.expires = jiffies + HZ / 2;
+-	ahd->platform_data->reset_timer.function =
+-	    (ahd_linux_callback_t *)ahd_release_simq;
+-	add_timer(&ahd->platform_data->reset_timer);
+-	if (ahd_linux_next_device_to_run(ahd) != NULL)
+-		ahd_schedule_runq(ahd);
++	if (aic_linux_next_device_to_run(ahd) != NULL)
++		aic_schedule_runq(ahd);
+ 	ahd_linux_run_complete_queue(ahd);
+ 	ahd_unlock(ahd, &flags);
+ }
+ 
+-static void
++void
+ ahd_linux_dv_complete(struct scsi_cmnd *cmd)
+ {
+ 	struct ahd_softc *ahd;
+@@ -3809,7 +3775,7 @@ ahd_linux_dv_complete(struct scsi_cmnd *
+ }
+ 
+ static void
+-ahd_linux_generate_dv_pattern(struct ahd_linux_target *targ)
++ahd_linux_generate_dv_pattern(struct aic_linux_target *targ)
+ {
+ 	uint16_t b;
+ 	u_int	 i;
+@@ -3975,8 +3941,8 @@ ahd_linux_setup_user_rd_strm_settings(st
+  * Determines the queue depth for a given device.
+  */
+ static void
+-ahd_linux_device_queue_depth(struct ahd_softc *ahd,
+-			     struct ahd_linux_device *dev)
++aic_linux_device_queue_depth(struct ahd_softc *ahd,
++			     struct aic_linux_device *dev)
+ {
+ 	struct	ahd_devinfo devinfo;
+ 	u_int	tags;
+@@ -3999,10 +3965,10 @@ ahd_linux_device_queue_depth(struct ahd_
+ 	}
+ }
+ 
+-static void
+-ahd_linux_run_device_queue(struct ahd_softc *ahd, struct ahd_linux_device *dev)
++void
++ahd_linux_run_device_queue(struct ahd_softc *ahd, struct aic_linux_device *dev)
+ {
+-	struct	 ahd_cmd *acmd;
++	struct	 aic_cmd *acmd;
+ 	struct	 scsi_cmnd *cmd;
+ 	struct	 scb *scb;
+ 	struct	 hardware_scb *hscb;
+@@ -4011,7 +3977,7 @@ ahd_linux_run_device_queue(struct ahd_so
+ 	u_int	 col_idx;
+ 	uint16_t mask;
+ 
+-	if ((dev->flags & AHD_DEV_ON_RUN_LIST) != 0)
++	if ((dev->flags & AIC_DEV_ON_RUN_LIST) != 0)
+ 		panic("running device on run list");
+ 
+ 	while ((acmd = TAILQ_FIRST(&dev->busyq)) != NULL
+@@ -4022,11 +3988,11 @@ ahd_linux_run_device_queue(struct ahd_so
+ 		 * running is because the whole controller Q is frozen.
+ 		 */
+ 		if (ahd->platform_data->qfrozen != 0
+-		 && AHD_DV_SIMQ_FROZEN(ahd) == 0) {
++		 && AIC_DV_SIMQ_FROZEN(ahd) == 0) {
+ 
+ 			TAILQ_INSERT_TAIL(&ahd->platform_data->device_runq,
+ 					  dev, links);
+-			dev->flags |= AHD_DEV_ON_RUN_LIST;
++			dev->flags |= AIC_DEV_ON_RUN_LIST;
+ 			return;
+ 		}
+ 
+@@ -4037,7 +4003,7 @@ ahd_linux_run_device_queue(struct ahd_so
+ 		 */
+ 		tinfo = ahd_fetch_transinfo(ahd, 'A', ahd->our_id,
+ 					    cmd->device->id, &tstate);
+-		if ((dev->flags & (AHD_DEV_Q_TAGGED|AHD_DEV_Q_BASIC)) == 0
++		if ((dev->flags & (AIC_DEV_Q_TAGGED|AIC_DEV_Q_BASIC)) == 0
+ 		 || (tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ) != 0) {
+ 			col_idx = AHD_NEVER_COL_IDX;
+ 		} else {
+@@ -4047,13 +4013,14 @@ ahd_linux_run_device_queue(struct ahd_so
+ 		if ((scb = ahd_get_scb(ahd, col_idx)) == NULL) {
+ 			TAILQ_INSERT_TAIL(&ahd->platform_data->device_runq,
+ 					 dev, links);
+-			dev->flags |= AHD_DEV_ON_RUN_LIST;
++			dev->flags |= AIC_DEV_ON_RUN_LIST;
+ 			ahd->flags |= AHD_RESOURCE_SHORTAGE;
+ 			return;
+ 		}
+ 		TAILQ_REMOVE(&dev->busyq, acmd, acmd_links.tqe);
+ 		scb->io_ctx = cmd;
+ 		scb->platform_data->dev = dev;
++		scb->platform_data->flags = 0;
+ 		hscb = scb->hscb;
+ 		cmd->host_scribble = (char *)scb;
+ 
+@@ -4069,7 +4036,7 @@ ahd_linux_run_device_queue(struct ahd_so
+ 		if ((ahd->user_discenable & mask) != 0)
+ 			hscb->control |= DISCENB;
+ 
+-	 	if (AHD_DV_CMD(cmd) != 0)
++	 	if (AIC_DV_CMD(cmd) != 0)
+ 			scb->flags |= SCB_SILENT;
+ 
+ 		if ((tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ) != 0)
+@@ -4080,7 +4047,7 @@ ahd_linux_run_device_queue(struct ahd_so
+ 			scb->hscb->control |= MK_MESSAGE;
+ 		}
+ 
+-		if ((dev->flags & (AHD_DEV_Q_TAGGED|AHD_DEV_Q_BASIC)) != 0) {
++		if ((dev->flags & (AIC_DEV_Q_TAGGED|AIC_DEV_Q_BASIC)) != 0) {
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+ 			int	msg_bytes;
+ 			uint8_t tag_msgs[2];
+@@ -4092,8 +4059,8 @@ ahd_linux_run_device_queue(struct ahd_so
+ 					dev->commands_since_idle_or_otag = 0;
+ 			} else
+ #endif
+-			if (dev->commands_since_idle_or_otag == AHD_OTAG_THRESH
+-			 && (dev->flags & AHD_DEV_Q_TAGGED) != 0) {
++			if (dev->commands_since_idle_or_otag == AIC_OTAG_THRESH
++			 && (dev->flags & AIC_DEV_Q_TAGGED) != 0) {
+ 				hscb->control |= MSG_ORDERED_TASK;
+ 				dev->commands_since_idle_or_otag = 0;
+ 			} else {
+@@ -4105,8 +4072,9 @@ ahd_linux_run_device_queue(struct ahd_so
+ 		memcpy(hscb->shared_data.idata.cdb, cmd->cmnd, hscb->cdb_len);
+ 
+ 		scb->sg_count = 0;
+-		ahd_set_residual(scb, 0);
+-		ahd_set_sense_residual(scb, 0);
++		aic_set_residual(scb, 0);
++		aic_set_sense_residual(scb, 0);
++		scb->platform_data->xfer_len = 0;
+ 		if (cmd->use_sg != 0) {
+ 			void	*sg;
+ 			struct	 scatterlist *cur_seg;
+@@ -4115,18 +4083,15 @@ ahd_linux_run_device_queue(struct ahd_so
+ 
+ 			cur_seg = (struct scatterlist *)cmd->request_buffer;
+ 			dir = scsi_to_pci_dma_dir(cmd->sc_data_direction);
+-			nseg = pci_map_sg(ahd->dev_softc, cur_seg,
+-					  cmd->use_sg, dir);
+-			scb->platform_data->xfer_len = 0;
++			nseg = aic_map_sg(ahd, cur_seg, cmd->use_sg, dir);
+ 			for (sg = scb->sg_list; nseg > 0; nseg--, cur_seg++) {
+ 				bus_addr_t addr;
+ 				bus_size_t len;
+ 
+ 				addr = sg_dma_address(cur_seg);
+ 				len = sg_dma_len(cur_seg);
+-				scb->platform_data->xfer_len += len;
+-				sg = ahd_sg_setup(ahd, scb, sg, addr, len,
+-						  /*last*/nseg == 1);
++				sg = ahd_linux_sg_setup(ahd, scb, sg, addr, len,
++							/*last*/nseg == 1);
+ 			}
+ 		} else if (cmd->request_bufflen != 0) {
+ 			void *sg;
+@@ -4135,13 +4100,13 @@ ahd_linux_run_device_queue(struct ahd_so
+ 
+ 			sg = scb->sg_list;
+ 			dir = scsi_to_pci_dma_dir(cmd->sc_data_direction);
+-			addr = pci_map_single(ahd->dev_softc,
++			addr = aic_map_single(ahd,
+ 					      cmd->request_buffer,
+ 					      cmd->request_bufflen, dir);
+-			scb->platform_data->xfer_len = cmd->request_bufflen;
+ 			scb->platform_data->buf_busaddr = addr;
+-			sg = ahd_sg_setup(ahd, scb, sg, addr,
+-					  cmd->request_bufflen, /*last*/TRUE);
++			sg = ahd_linux_sg_setup(ahd, scb, sg, addr,
++						cmd->request_bufflen,
++						/*last*/TRUE);
+ 		}
+ 
+ 		LIST_INSERT_HEAD(&ahd->pending_scbs, scb, pending_links);
+@@ -4157,9 +4122,10 @@ ahd_linux_run_device_queue(struct ahd_so
+ 				dev->target->cmds_since_error = 0;
+ 		}
+ 
+-		if ((dev->flags & AHD_DEV_PERIODIC_OTAG) != 0)
++		if ((dev->flags & AIC_DEV_PERIODIC_OTAG) != 0)
+ 			dev->commands_since_idle_or_otag++;
+ 		scb->flags |= SCB_ACTIVE;
++		aic_scb_timer_start(scb);
+ 		ahd_queue_scb(ahd, scb);
+ 	}
+ }
+@@ -4177,8 +4143,8 @@ ahd_linux_isr(int irq, void *dev_id, str
+ 	ahd = (struct ahd_softc *) dev_id;
+ 	ahd_lock(ahd, &flags); 
+ 	ours = ahd_intr(ahd);
+-	if (ahd_linux_next_device_to_run(ahd) != NULL)
+-		ahd_schedule_runq(ahd);
++	if (aic_linux_next_device_to_run(ahd) != NULL)
++		aic_schedule_runq(ahd);
+ 	ahd_linux_run_complete_queue(ahd);
+ 	ahd_unlock(ahd, &flags);
+ 	return IRQ_RETVAL(ours);
+@@ -4192,10 +4158,10 @@ ahd_platform_flushwork(struct ahd_softc 
+ 		;
+ }
+ 
+-static struct ahd_linux_target*
++static struct aic_linux_target*
+ ahd_linux_alloc_target(struct ahd_softc *ahd, u_int channel, u_int target)
+ {
+-	struct ahd_linux_target *targ;
++	struct aic_linux_target *targ;
+ 
+ 	targ = malloc(sizeof(*targ), M_DEVBUF, M_NOWAIT);
+ 	if (targ == NULL)
+@@ -4203,14 +4169,14 @@ ahd_linux_alloc_target(struct ahd_softc 
+ 	memset(targ, 0, sizeof(*targ));
+ 	targ->channel = channel;
+ 	targ->target = target;
+-	targ->ahd = ahd;
+-	targ->flags = AHD_DV_REQUIRED;
++	targ->softc = ahd;
++	targ->flags = AIC_DV_REQUIRED;
+ 	ahd->platform_data->targets[target] = targ;
+ 	return (targ);
+ }
+ 
+ static void
+-ahd_linux_free_target(struct ahd_softc *ahd, struct ahd_linux_target *targ)
++ahd_linux_free_target(struct ahd_softc *ahd, struct aic_linux_target *targ)
+ {
+ 	struct ahd_devinfo devinfo;
+ 	struct ahd_initiator_tinfo *tinfo;
+@@ -4246,11 +4212,11 @@ ahd_linux_free_target(struct ahd_softc *
+ 	free(targ, M_DEVBUF);
+ }
+ 
+-static struct ahd_linux_device*
++static struct aic_linux_device*
+ ahd_linux_alloc_device(struct ahd_softc *ahd,
+-		 struct ahd_linux_target *targ, u_int lun)
++		 struct aic_linux_target *targ, u_int lun)
+ {
+-	struct ahd_linux_device *dev;
++	struct aic_linux_device *dev;
+ 
+ 	dev = malloc(sizeof(*dev), M_DEVBUG, M_NOWAIT);
+ 	if (dev == NULL)
+@@ -4258,7 +4224,7 @@ ahd_linux_alloc_device(struct ahd_softc 
+ 	memset(dev, 0, sizeof(*dev));
+ 	init_timer(&dev->timer);
+ 	TAILQ_INIT(&dev->busyq);
+-	dev->flags = AHD_DEV_UNCONFIGURED;
++	dev->flags = AIC_DEV_UNCONFIGURED;
+ 	dev->lun = lun;
+ 	dev->target = targ;
+ 
+@@ -4281,9 +4247,9 @@ ahd_linux_alloc_device(struct ahd_softc 
+ }
+ 
+ static void
+-ahd_linux_free_device(struct ahd_softc *ahd, struct ahd_linux_device *dev)
++ahd_linux_free_device(struct ahd_softc *ahd, struct aic_linux_device *dev)
+ {
+-	struct ahd_linux_target *targ;
++	struct aic_linux_target *targ;
+ 
+ 	del_timer(&dev->timer);
+ 	targ = dev->target;
+@@ -4291,7 +4257,7 @@ ahd_linux_free_device(struct ahd_softc *
+ 	free(dev, M_DEVBUF);
+ 	targ->refcount--;
+ 	if (targ->refcount == 0
+-	 && (targ->flags & AHD_DV_REQUIRED) == 0)
++	 && (targ->flags & AIC_DV_REQUIRED) == 0)
+ 		ahd_linux_free_target(ahd, targ);
+ }
+ 
+@@ -4303,7 +4269,7 @@ ahd_send_async(struct ahd_softc *ahd, ch
+ 	case AC_TRANSFER_NEG:
+ 	{
+ 		char	buf[80];
+-		struct	ahd_linux_target *targ;
++		struct	aic_linux_target *targ;
+ 		struct	info_str info;
+ 		struct	ahd_initiator_tinfo *tinfo;
+ 		struct	ahd_tmode_tstate *tstate;
+@@ -4391,6 +4357,20 @@ ahd_send_async(struct ahd_softc *ahd, ch
+ 					      channel - 'A');
+ 		}
+ #endif
++		/*
++		 * Add a minimal bus settle delay for devices that are slow to
++		 * respond after bus resets.
++		 */
++		if ((ahd->platform_data->flags & AIC_BUS_SETTLE_TIMER) == 0) {
++			aic_freeze_simq(ahd);
++			ahd->platform_data->flags |= AIC_BUS_SETTLE_TIMER;
++			ahd->platform_data->bus_settle_timer.expires =
++			    jiffies + (AIC79XX_RESET_DELAY * HZ)/1000;
++			add_timer(&ahd->platform_data->bus_settle_timer);
++		} else {
++			mod_timer(&ahd->platform_data->bus_settle_timer,
++				  jiffies + (AIC79XX_RESET_DELAY * HZ)/1000);
++		}
+                 break;
+         default:
+                 panic("ahd_send_async: Unexpected async event");
+@@ -4404,14 +4384,18 @@ void
+ ahd_done(struct ahd_softc *ahd, struct scb *scb)
+ {
+ 	Scsi_Cmnd *cmd;
+-	struct	  ahd_linux_device *dev;
++	struct	  aic_linux_device *dev;
+ 
+ 	if ((scb->flags & SCB_ACTIVE) == 0) {
+ 		printf("SCB %d done'd twice\n", SCB_GET_TAG(scb));
+ 		ahd_dump_card_state(ahd);
+ 		panic("Stopping for safety");
+ 	}
++
+ 	LIST_REMOVE(scb, pending_links);
++	if ((scb->flags & SCB_TIMEDOUT) != 0)
++		LIST_REMOVE(scb, timedout_links);
++
+ 	cmd = scb->io_ctx;
+ 	dev = scb->platform_data->dev;
+ 	dev->active--;
+@@ -4429,11 +4413,11 @@ ahd_done(struct ahd_softc *ahd, struct s
+ 	 * the sense buffer looks "sane".
+ 	 */
+ 	cmd->sense_buffer[0] = 0;
+-	if (ahd_get_transaction_status(scb) == CAM_REQ_INPROG) {
++	if (aic_get_transaction_status(scb) == CAM_REQ_INPROG) {
+ 		uint32_t amount_xferred;
+ 
+ 		amount_xferred =
+-		    ahd_get_transfer_length(scb) - ahd_get_residual(scb);
++		    aic_get_transfer_length(scb) - aic_get_residual(scb);
+ 		if ((scb->flags & SCB_TRANSMISSION_ERROR) != 0) {
+ #ifdef AHD_DEBUG
+ 			if ((ahd_debug & AHD_SHOW_MISC) != 0) {
+@@ -4441,7 +4425,17 @@ ahd_done(struct ahd_softc *ahd, struct s
+ 				printf("Set CAM_UNCOR_PARITY\n");
+ 			}
+ #endif
+-			ahd_set_transaction_status(scb, CAM_UNCOR_PARITY);
++			aic_set_transaction_status(scb, CAM_UNCOR_PARITY);
++#ifdef AHD_REPORT_UNDERFLOWS
++		/*
++		 * This code is disabled by default as some
++		 * clients of the SCSI system do not properly
++		 * initialize the underflow parameter.  This
++		 * results in spurious termination of commands
++		 * that complete as expected (e.g. underflow is
++		 * allowed as command can return variable amounts
++		 * of data.
++		 */
+ 		} else if (amount_xferred < scb->io_ctx->underflow) {
+ 			u_int i;
+ 
+@@ -4453,30 +4447,31 @@ ahd_done(struct ahd_softc *ahd, struct s
+ 			ahd_print_path(ahd, scb);
+ 			printf("Saw underflow (%ld of %ld bytes). "
+ 			       "Treated as error\n",
+-				ahd_get_residual(scb),
+-				ahd_get_transfer_length(scb));
+-			ahd_set_transaction_status(scb, CAM_DATA_RUN_ERR);
++				aic_get_residual(scb),
++				aic_get_transfer_length(scb));
++			aic_set_transaction_status(scb, CAM_DATA_RUN_ERR);
++#endif
+ 		} else {
+-			ahd_set_transaction_status(scb, CAM_REQ_CMP);
++			aic_set_transaction_status(scb, CAM_REQ_CMP);
+ 		}
+-	} else if (ahd_get_transaction_status(scb) == CAM_SCSI_STATUS_ERROR) {
++	} else if (aic_get_transaction_status(scb) == CAM_SCSI_STATUS_ERROR) {
+ 		ahd_linux_handle_scsi_status(ahd, dev, scb);
+-	} else if (ahd_get_transaction_status(scb) == CAM_SEL_TIMEOUT) {
+-		dev->flags |= AHD_DEV_UNCONFIGURED;
+-		if (AHD_DV_CMD(cmd) == FALSE)
+-			dev->target->flags &= ~AHD_DV_REQUIRED;
++	} else if (aic_get_transaction_status(scb) == CAM_SEL_TIMEOUT) {
++		dev->flags |= AIC_DEV_UNCONFIGURED;
++		if (AIC_DV_CMD(cmd) == FALSE)
++			dev->target->flags &= ~AIC_DV_REQUIRED;
+ 	}
+ 	/*
+ 	 * Start DV for devices that require it assuming the first command
+ 	 * sent does not result in a selection timeout.
+ 	 */
+-	if (ahd_get_transaction_status(scb) != CAM_SEL_TIMEOUT
+-	 && (dev->target->flags & AHD_DV_REQUIRED) != 0)
++	if (aic_get_transaction_status(scb) != CAM_SEL_TIMEOUT
++	 && (dev->target->flags & AIC_DV_REQUIRED) != 0)
+ 		ahd_linux_start_dv(ahd);
+ 
+ 	if (dev->openings == 1
+-	 && ahd_get_transaction_status(scb) == CAM_REQ_CMP
+-	 && ahd_get_scsi_status(scb) != SCSI_STATUS_QUEUE_FULL)
++	 && aic_get_transaction_status(scb) == CAM_REQ_CMP
++	 && aic_get_scsi_status(scb) != SCSI_STATUS_QUEUE_FULL)
+ 		dev->tag_success_count++;
+ 	/*
+ 	 * Some devices deal with temporary internal resource
+@@ -4485,7 +4480,7 @@ ahd_done(struct ahd_softc *ahd, struct s
+ 	 * back to our previous queue depth.
+ 	 */
+ 	if ((dev->openings + dev->active) < dev->maxtags
+-	 && dev->tag_success_count > AHD_TAG_SUCCESS_INTERVAL) {
++	 && dev->tag_success_count > AIC_TAG_SUCCESS_INTERVAL) {
+ 		dev->tag_success_count = 0;
+ 		dev->openings++;
+ 	}
+@@ -4494,39 +4489,68 @@ ahd_done(struct ahd_softc *ahd, struct s
+ 		dev->commands_since_idle_or_otag = 0;
+ 
+ 	if (TAILQ_EMPTY(&dev->busyq)) {
+-		if ((dev->flags & AHD_DEV_UNCONFIGURED) != 0
+-		 && dev->active == 0
+-		 && (dev->flags & AHD_DEV_TIMER_ACTIVE) == 0)
++		if ((dev->flags & AIC_DEV_UNCONFIGURED) != 0
++		 && dev->active == 0)
+ 			ahd_linux_free_device(ahd, dev);
+-	} else if ((dev->flags & AHD_DEV_ON_RUN_LIST) == 0) {
++	} else if ((dev->flags & AIC_DEV_ON_RUN_LIST) == 0) {
+ 		TAILQ_INSERT_TAIL(&ahd->platform_data->device_runq, dev, links);
+-		dev->flags |= AHD_DEV_ON_RUN_LIST;
++		dev->flags |= AIC_DEV_ON_RUN_LIST;
+ 	}
+ 
+ 	if ((scb->flags & SCB_RECOVERY_SCB) != 0) {
+ 		printf("Recovery SCB completes\n");
+-		if (ahd_get_transaction_status(scb) == CAM_BDR_SENT
+-		 || ahd_get_transaction_status(scb) == CAM_REQ_ABORTED)
+-			ahd_set_transaction_status(scb, CAM_CMD_TIMEOUT);
+-		if ((scb->platform_data->flags & AHD_SCB_UP_EH_SEM) != 0) {
+-			scb->platform_data->flags &= ~AHD_SCB_UP_EH_SEM;
++		if (aic_get_transaction_status(scb) == CAM_BDR_SENT
++		 || aic_get_transaction_status(scb) == CAM_REQ_ABORTED)
++			aic_set_transaction_status(scb, CAM_CMD_TIMEOUT);
++		if ((scb->platform_data->flags & AIC_SCB_UP_EH_SEM) != 0) {
++			scb->platform_data->flags &= ~AIC_SCB_UP_EH_SEM;
+ 			up(&ahd->platform_data->eh_sem);
++		} else {
++			struct  scb *list_scb;
++
++			/*
++			 * We were able to complete the command successfully,
++			 * so reinstate the timeouts for all other pending
++			 * commands.
++			 */
++			LIST_FOREACH(list_scb,
++				     &ahd->pending_scbs, pending_links) {
++
++				aic_scb_timer_start(list_scb);
++                	}
+ 		}
+ 	}
+ 
++	if ((scb->platform_data->flags & AIC_TIMEOUT_ACTIVE) == 0) {
++		/*
++		 * The completion handler believes that
++		 * commands without active timers running
++		 * have lost the race of completing before
++		 * their timer expires.  Since commands in
++		 * our busy queues do not have timers running,
++		 * appease the mid-layer by adding a timer
++		 * now.  This timer will be immediately
++		 * canceled by the midlayer.
++		 */
++		scsi_add_timer(cmd, 60*HZ, aic_linux_midlayer_timeout);
++	}
++
++	if ((scb->platform_data->flags & AIC_RELEASE_SIMQ) != 0)
++		aic_release_simq_locked(ahd);
++
+ 	ahd_free_scb(ahd, scb);
+ 	ahd_linux_queue_cmd_complete(ahd, cmd);
+ 
+-	if ((ahd->platform_data->flags & AHD_DV_WAIT_SIMQ_EMPTY) != 0
++	if ((ahd->platform_data->flags & AIC_DV_WAIT_SIMQ_EMPTY) != 0
+ 	 && LIST_FIRST(&ahd->pending_scbs) == NULL) {
+-		ahd->platform_data->flags &= ~AHD_DV_WAIT_SIMQ_EMPTY;
++		ahd->platform_data->flags &= ~AIC_DV_WAIT_SIMQ_EMPTY;
+ 		up(&ahd->platform_data->dv_sem);
+ 	}
+ }
+ 
+ static void
+ ahd_linux_handle_scsi_status(struct ahd_softc *ahd,
+-			     struct ahd_linux_device *dev, struct scb *scb)
++			     struct aic_linux_device *dev, struct scb *scb)
+ {
+ 	struct	ahd_devinfo devinfo;
+ 
+@@ -4546,7 +4570,7 @@ ahd_linux_handle_scsi_status(struct ahd_
+ 	 * we don't clobber the device with too many
+ 	 * commands.
+ 	 */
+-	switch (ahd_get_scsi_status(scb)) {
++	switch (aic_get_scsi_status(scb)) {
+ 	default:
+ 		break;
+ 	case SCSI_STATUS_CHECK_COND:
+@@ -4560,13 +4584,15 @@ ahd_linux_handle_scsi_status(struct ahd_
+ 		 */
+ 		cmd = scb->io_ctx;
+ 		if ((scb->flags & (SCB_SENSE|SCB_PKT_SENSE)) != 0) {
+-			struct scsi_status_iu_header *siu;
+-			u_int sense_size;
+-			u_int sense_offset;
++			struct	scsi_status_iu_header *siu;
++			struct	scsi_sense_data *sense;
++			u_int	sense_size;
++			u_int	sense_offset;
++			int	error_code, sense_key, asc, ascq;
+ 
+ 			if (scb->flags & SCB_SENSE) {
+ 				sense_size = MIN(sizeof(struct scsi_sense_data)
+-					       - ahd_get_sense_residual(scb),
++					       - aic_get_sense_residual(scb),
+ 						 sizeof(cmd->sense_buffer));
+ 				sense_offset = 0;
+ 			} else {
+@@ -4581,10 +4607,10 @@ ahd_linux_handle_scsi_status(struct ahd_
+ 				sense_offset = SIU_SENSE_OFFSET(siu);
+ 			}
+ 
++			sense = (struct scsi_sense_data *)
++			    (ahd_get_sense_buf(ahd, scb) + sense_offset);
+ 			memset(cmd->sense_buffer, 0, sizeof(cmd->sense_buffer));
+-			memcpy(cmd->sense_buffer,
+-			       ahd_get_sense_buf(ahd, scb)
+-			       + sense_offset, sense_size);
++			memcpy(cmd->sense_buffer, sense, sense_size);
+ 			cmd->result |= (DRIVER_SENSE << 24);
+ 
+ #ifdef AHD_DEBUG
+@@ -4601,6 +4627,23 @@ ahd_linux_handle_scsi_status(struct ahd_
+ 				printf("\n");
+ 			}
+ #endif
++			/*
++			 * If this is not a DV command and the target
++			 * provides some status that makes us believe
++			 * that the target has changed (power on reset,
++			 * etc.) kick off a DV scan to re-validate the
++			 * device.
++			 */
++	 		if (AIC_DV_CMD(cmd) != 0)
++				break;
++
++			scsi_extract_sense(sense, &error_code,
++					   &sense_key, &asc, &ascq);
++			if (error_code == SSD_CURRENT_ERROR
++			 && sense_key == SSD_KEY_UNIT_ATTENTION
++			 && asc == 0x29
++			 && (ascq == 0 || ascq == 1))
++				dev->target->flags |= AIC_DV_REQUIRED;
+ 		}
+ 		break;
+ 	}
+@@ -4640,7 +4683,7 @@ ahd_linux_handle_scsi_status(struct ahd_
+ 				 * this device.
+ 				 */
+ 				if (dev->last_queuefull_same_count
+-				 == AHD_LOCK_TAGS_COUNT) {
++				 == AIC_LOCK_TAGS_COUNT) {
+ 					dev->maxtags = dev->active;
+ 					ahd_print_path(ahd, scb);
+ 					printf("Locking max tag count at %d\n",
+@@ -4650,10 +4693,10 @@ ahd_linux_handle_scsi_status(struct ahd_
+ 				dev->tags_on_last_queuefull = dev->active;
+ 				dev->last_queuefull_same_count = 0;
+ 			}
+-			ahd_set_transaction_status(scb, CAM_REQUEUE_REQ);
+-			ahd_set_scsi_status(scb, SCSI_STATUS_OK);
++			aic_set_transaction_status(scb, CAM_REQUEUE_REQ);
++			aic_set_scsi_status(scb, SCSI_STATUS_OK);
+ 			ahd_platform_set_tags(ahd, &devinfo,
+-				     (dev->flags & AHD_DEV_Q_BASIC)
++				     (dev->flags & AIC_DEV_Q_BASIC)
+ 				   ? AHD_QUEUE_BASIC : AHD_QUEUE_TAGGED);
+ 			break;
+ 		}
+@@ -4663,9 +4706,9 @@ ahd_linux_handle_scsi_status(struct ahd_
+ 		 */
+ 		dev->openings = 1;
+ 		ahd_platform_set_tags(ahd, &devinfo,
+-			     (dev->flags & AHD_DEV_Q_BASIC)
++			     (dev->flags & AIC_DEV_Q_BASIC)
+ 			   ? AHD_QUEUE_BASIC : AHD_QUEUE_TAGGED);
+-		ahd_set_scsi_status(scb, SCSI_STATUS_BUSY);
++		aic_set_scsi_status(scb, SCSI_STATUS_BUSY);
+ 		/* FALLTHROUGH */
+ 	}
+ 	case SCSI_STATUS_BUSY:
+@@ -4673,13 +4716,13 @@ ahd_linux_handle_scsi_status(struct ahd_
+ 		 * Set a short timer to defer sending commands for
+ 		 * a bit since Linux will not delay in this case.
+ 		 */
+-		if ((dev->flags & AHD_DEV_TIMER_ACTIVE) != 0) {
++		if ((dev->flags & AIC_DEV_TIMER_ACTIVE) != 0) {
+ 			printf("%s:%c:%d: Device Timer still active during "
+ 			       "busy processing\n", ahd_name(ahd),
+ 				dev->target->channel, dev->target->target);
+ 			break;
+ 		}
+-		dev->flags |= AHD_DEV_TIMER_ACTIVE;
++		dev->flags |= AIC_DEV_TIMER_ACTIVE;
+ 		dev->qfrozen++;
+ 		init_timer(&dev->timer);
+ 		dev->timer.data = (u_long)dev;
+@@ -4705,9 +4748,9 @@ ahd_linux_queue_cmd_complete(struct ahd_
+ 	 * not guarantee the order that aborted commands will be
+ 	 * returned to us.
+ 	 */
+-	struct ahd_completeq *completeq;
+-	struct ahd_cmd *list_cmd;
+-	struct ahd_cmd *acmd;
++	struct aic_completeq *completeq;
++	struct aic_cmd *list_cmd;
++	struct aic_cmd *acmd;
+ 
+ 	/*
+ 	 * Map CAM error codes into Linux Error codes.  We
+@@ -4715,13 +4758,13 @@ ahd_linux_queue_cmd_complete(struct ahd_
+ 	 * full error information available when making
+ 	 * state change decisions.
+ 	 */
+-	if (AHD_DV_CMD(cmd) == FALSE) {
++	if (AIC_DV_CMD(cmd) == FALSE) {
+ 		uint32_t status;
+ 		u_int new_status;
+ 
+-		status = ahd_cmd_get_transaction_status(cmd);
++		status = aic_cmd_get_transaction_status(cmd);
+ 		if (status != CAM_REQ_CMP) {
+-			struct ahd_linux_device *dev;
++			struct aic_linux_device *dev;
+ 			struct ahd_devinfo devinfo;
+ 			cam_status cam_status;
+ 			uint32_t action;
+@@ -4741,8 +4784,8 @@ ahd_linux_queue_cmd_complete(struct ahd_
+ 					    dev->target->channel == 0 ? 'A':'B',
+ 					    ROLE_INITIATOR);
+ 
+-			scsi_status = ahd_cmd_get_scsi_status(cmd);
+-			cam_status = ahd_cmd_get_transaction_status(cmd);
++			scsi_status = aic_cmd_get_scsi_status(cmd);
++			cam_status = aic_cmd_get_transaction_status(cmd);
+ 			action = aic_error_action(cmd, dev->target->inq_data,
+ 						  cam_status, scsi_status);
+ 			if ((action & SSQ_FALLBACK) != 0) {
+@@ -4785,7 +4828,17 @@ no_fallback:
+ 			new_status = DID_PARITY;
+ 			break;
+ 		case CAM_CMD_TIMEOUT:
+-			new_status = DID_TIME_OUT;
++			/*
++			 *  Returning DID_TIME_OUT will 
++			 *  wake up the error recovery
++			 *  thread instead of doing the
++			 *  command retry we desire. Since
++			 *  we have already recovered the
++			 *  command, returning DID_ERROR
++			 *  will cause a retry up to the
++			 *  retry limit for this command.
++			 */
++			new_status = DID_ERROR;
+ 			break;
+ 		case CAM_UA_ABORT:
+ 		case CAM_REQ_CMP_ERR:
+@@ -4815,7 +4868,7 @@ no_fallback:
+ 			if (cmd->retries > 0)
+ 				cmd->retries--;
+ 			new_status = DID_OK;
+-			ahd_cmd_set_scsi_status(cmd, SCSI_STATUS_CHECK_COND);
++			aic_cmd_set_scsi_status(cmd, SCSI_STATUS_CHECK_COND);
+ 			cmd->result |= (DRIVER_SENSE << 24);
+ 			memset(cmd->sense_buffer, 0,
+ 			       sizeof(cmd->sense_buffer));
+@@ -4829,12 +4882,12 @@ no_fallback:
+ 			break;
+ 		}
+ 
+-		ahd_cmd_set_transaction_status(cmd, new_status);
++		aic_cmd_set_transaction_status(cmd, new_status);
+ 	}
+ 
+ 	completeq = &ahd->platform_data->completeq;
+ 	list_cmd = TAILQ_FIRST(completeq);
+-	acmd = (struct ahd_cmd *)cmd;
++	acmd = (struct aic_cmd *)cmd;
+ 	while (list_cmd != NULL
+ 	    && acmd_scsi_cmd(list_cmd).serial_number
+ 	     < acmd_scsi_cmd(acmd).serial_number)
+@@ -4854,7 +4907,7 @@ ahd_linux_filter_inquiry(struct ahd_soft
+ 	struct	ahd_transinfo *goal;
+ 	struct	ahd_transinfo *curr;
+ 	struct	ahd_tmode_tstate *tstate;
+-	struct	ahd_linux_device *dev;
++	struct	aic_linux_device *dev;
+ 	u_int	width;
+ 	u_int	period;
+ 	u_int	offset;
+@@ -4876,9 +4929,9 @@ ahd_linux_filter_inquiry(struct ahd_soft
+ 	sid = (struct scsi_inquiry_data *)dev->target->inq_data;
+ 	if (SID_QUAL(sid) == SID_QUAL_LU_CONNECTED) {
+ 
+-		dev->flags &= ~AHD_DEV_UNCONFIGURED;
++		dev->flags &= ~AIC_DEV_UNCONFIGURED;
+ 	} else {
+-		dev->flags |= AHD_DEV_UNCONFIGURED;
++		dev->flags |= AIC_DEV_UNCONFIGURED;
+ 		return;
+ 	}
+ 
+@@ -4944,48 +4997,6 @@ ahd_linux_filter_inquiry(struct ahd_soft
+ 			 AHD_TRANS_GOAL, /*paused*/FALSE);
+ }
+ 
+-void
+-ahd_freeze_simq(struct ahd_softc *ahd)
+-{
+-	ahd->platform_data->qfrozen++;
+-	if (ahd->platform_data->qfrozen == 1) {
+-		scsi_block_requests(ahd->platform_data->host);
+-		ahd_platform_abort_scbs(ahd, CAM_TARGET_WILDCARD, ALL_CHANNELS,
+-					CAM_LUN_WILDCARD, SCB_LIST_NULL,
+-					ROLE_INITIATOR, CAM_REQUEUE_REQ);
+-	}
+-}
+-
+-void
+-ahd_release_simq(struct ahd_softc *ahd)
+-{
+-	u_long s;
+-	int    unblock_reqs;
+-
+-	unblock_reqs = 0;
+-	ahd_lock(ahd, &s);
+-	if (ahd->platform_data->qfrozen > 0)
+-		ahd->platform_data->qfrozen--;
+-	if (ahd->platform_data->qfrozen == 0) {
+-		unblock_reqs = 1;
+-	}
+-	if (AHD_DV_SIMQ_FROZEN(ahd)
+-	 && ((ahd->platform_data->flags & AHD_DV_WAIT_SIMQ_RELEASE) != 0)) {
+-		ahd->platform_data->flags &= ~AHD_DV_WAIT_SIMQ_RELEASE;
+-		up(&ahd->platform_data->dv_sem);
+-	}
+-	ahd_schedule_runq(ahd);
+-	ahd_unlock(ahd, &s);
+-	/*
+-	 * There is still a race here.  The mid-layer
+-	 * should keep its own freeze count and use
+-	 * a bottom half handler to run the queues
+-	 * so we can unblock with our own lock held.
+-	 */
+-	if (unblock_reqs)
+-		scsi_unblock_requests(ahd->platform_data->host);
+-}
+-
+ static void
+ ahd_linux_sem_timeout(u_long arg)
+ {
+@@ -4996,8 +5007,8 @@ ahd_linux_sem_timeout(u_long arg)
+ 	scb = (struct scb *)arg;
+ 	ahd = scb->ahd_softc;
+ 	ahd_lock(ahd, &s);
+-	if ((scb->platform_data->flags & AHD_SCB_UP_EH_SEM) != 0) {
+-		scb->platform_data->flags &= ~AHD_SCB_UP_EH_SEM;
++	if ((scb->platform_data->flags & AIC_SCB_UP_EH_SEM) != 0) {
++		scb->platform_data->flags &= ~AIC_SCB_UP_EH_SEM;
+ 		up(&ahd->platform_data->eh_sem);
+ 	}
+ 	ahd_unlock(ahd, &s);
+@@ -5006,20 +5017,21 @@ ahd_linux_sem_timeout(u_long arg)
+ static void
+ ahd_linux_dev_timed_unfreeze(u_long arg)
+ {
+-	struct ahd_linux_device *dev;
++	struct aic_linux_device *dev;
+ 	struct ahd_softc *ahd;
+ 	u_long s;
+ 
+-	dev = (struct ahd_linux_device *)arg;
+-	ahd = dev->target->ahd;
++	dev = (struct aic_linux_device *)arg;
++	ahd = dev->target->softc;
+ 	ahd_lock(ahd, &s);
+-	dev->flags &= ~AHD_DEV_TIMER_ACTIVE;
++	dev->flags &= ~AIC_DEV_TIMER_ACTIVE;
+ 	if (dev->qfrozen > 0)
+ 		dev->qfrozen--;
+ 	if (dev->qfrozen == 0
+-	 && (dev->flags & AHD_DEV_ON_RUN_LIST) == 0)
++	 && (dev->flags & AIC_DEV_ON_RUN_LIST) == 0)
+ 		ahd_linux_run_device_queue(ahd, dev);
+-	if ((dev->flags & AHD_DEV_UNCONFIGURED) != 0
++	if ((dev->flags & AIC_DEV_UNCONFIGURED) != 0
++	 && TAILQ_EMPTY(&dev->busyq)
+ 	 && dev->active == 0)
+ 		ahd_linux_free_device(ahd, dev);
+ 	ahd_unlock(ahd, &s);
+@@ -5028,17 +5040,26 @@ ahd_linux_dev_timed_unfreeze(u_long arg)
+ void
+ ahd_platform_dump_card_state(struct ahd_softc *ahd)
+ {
+-	struct ahd_linux_device *dev;
++	struct Scsi_Host *host;
++	struct aic_linux_device *dev;
+ 	int target;
+ 	int maxtarget;
+ 	int lun;
+ 	int i;
+ 
++	host = ahd->platform_data->host;
++	printf("%s: Host Status: Failed(%d) %s%s%s\n",
++	       ahd_name(ahd),
++	       host->host_failed,
++	       host->eh_active ? "eh_active " : "",
++	       host->host_blocked ? "host_blocked " : "",
++	       host->host_self_blocked ? "host_self_blocked " : "");
++	       
+ 	maxtarget = (ahd->features & AHD_WIDE) ? 15 : 7;
+ 	for (target = 0; target <=maxtarget; target++) {
+ 
+ 		for (lun = 0; lun < AHD_NUM_LUNS; lun++) {
+-			struct ahd_cmd *acmd;
++			struct aic_cmd *acmd;
+ 
+ 			dev = ahd_linux_get_device(ahd, 0, target,
+ 						   lun, /*alloc*/FALSE);
+@@ -5077,20 +5098,18 @@ static void __exit
+ ahd_linux_exit(void)
+ {
+ 	struct ahd_softc *ahd;
+-	u_long l;
+ 
+ 	/*
+-	 * Shutdown DV threads before going into the SCSI mid-layer.
++	 * Shutdown our threads before going into the SCSI mid-layer.
+ 	 * This avoids situations where the mid-layer locks the entire
+ 	 * kernel so that waiting for our DV threads to exit leads
+ 	 * to deadlock.
+ 	 */
+-	ahd_list_lock(&l);
+ 	TAILQ_FOREACH(ahd, &ahd_tailq, links) {
+ 
+ 		ahd_linux_kill_dv_thread(ahd);
++		ahd_terminate_recovery_thread(ahd);
+ 	}
+-	ahd_list_unlock(&l);
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ 	/*
+ 	 * In 2.4 we have to unregister from the PCI core _after_
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic79xx_osm.h	2003-07-27 12:14:39.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aic79xx_osm.h	2003-12-28 23:21:39.000000000 -0800
+@@ -36,51 +36,22 @@
+  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  * POSSIBILITY OF SUCH DAMAGES.
+  *
+- * $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_
+ #define _AIC79XX_LINUX_H_
+ 
+-#include <linux/types.h>
+-#include <linux/blkdev.h>
+-#include <linux/delay.h>
+-#include <linux/ioport.h>
+-#include <linux/pci.h>
+-#include <linux/smp_lock.h>
+ #include <linux/version.h>
+-#include <linux/module.h>
+-#include <asm/byteorder.h>
+-#include <asm/io.h>
+ 
+ #ifndef KERNEL_VERSION
+ #define KERNEL_VERSION(x,y,z) (((x)<<16)+((y)<<8)+(z))
+ #endif
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+-#include <linux/interrupt.h> /* For tasklet support. */
+ #include <linux/config.h>
+-#include <linux/slab.h>
+-#else
+-#include <linux/malloc.h>
+ #endif
+ 
+-/* Core SCSI definitions */
+-#define AIC_LIB_PREFIX ahd
+-#include "scsi.h"
+-#include "hosts.h"
+-
+-/* Name space conflict with BSD queue macros */
+-#ifdef LIST_HEAD
+-#undef LIST_HEAD
+-#endif
+-
+-#include "cam.h"
+-#include "queue.h"
+-#include "scsi_message.h"
+-#include "scsi_iu.h"
+-#include "aiclib.h"
+-
+ /*********************************** Debugging ********************************/
+ #ifdef CONFIG_AIC79XX_DEBUG_ENABLE
+ #ifdef CONFIG_AIC79XX_DEBUG_MASK
+@@ -96,188 +67,27 @@
+ /* No debugging code. */
+ #endif
+ 
+-/********************************** Misc Macros *******************************/
+-#define	roundup(x, y)   ((((x)+((y)-1))/(y))*(y))
+-#define	powerof2(x)	((((x)-1)&(x))==0)
+-
+-/************************* Forward Declarations *******************************/
+-struct ahd_softc;
+-typedef struct pci_dev *ahd_dev_softc_t;
+-typedef Scsi_Cmnd      *ahd_io_ctx_t;
+-
+-/******************************* Byte Order ***********************************/
+-#define ahd_htobe16(x)	cpu_to_be16(x)
+-#define ahd_htobe32(x)	cpu_to_be32(x)
+-#define ahd_htobe64(x)	cpu_to_be64(x)
+-#define ahd_htole16(x)	cpu_to_le16(x)
+-#define ahd_htole32(x)	cpu_to_le32(x)
+-#define ahd_htole64(x)	cpu_to_le64(x)
+-
+-#define ahd_be16toh(x)	be16_to_cpu(x)
+-#define ahd_be32toh(x)	be32_to_cpu(x)
+-#define ahd_be64toh(x)	be64_to_cpu(x)
+-#define ahd_le16toh(x)	le16_to_cpu(x)
+-#define ahd_le32toh(x)	le32_to_cpu(x)
+-#define ahd_le64toh(x)	le64_to_cpu(x)
+-
+-#ifndef LITTLE_ENDIAN
+-#define LITTLE_ENDIAN 1234
+-#endif
+-
+-#ifndef BIG_ENDIAN
+-#define BIG_ENDIAN 4321
+-#endif
+-
+-#ifndef BYTE_ORDER
+-#if defined(__BIG_ENDIAN)
+-#define BYTE_ORDER BIG_ENDIAN
+-#endif
+-#if defined(__LITTLE_ENDIAN)
+-#define BYTE_ORDER LITTLE_ENDIAN
+-#endif
+-#endif /* BYTE_ORDER */
+-
+-/************************* Configuration Data *********************************/
+-extern uint32_t aic79xx_allow_memio;
+-extern int aic79xx_detect_complete;
+-extern Scsi_Host_Template aic79xx_driver_template;
+-
+-/***************************** Bus Space/DMA **********************************/
+-
+-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,2,17)
+-typedef dma_addr_t bus_addr_t;
+-#else
+-typedef uint32_t bus_addr_t;
+-#endif
+-typedef uint32_t bus_size_t;
+-
+-typedef enum {
+-	BUS_SPACE_MEMIO,
+-	BUS_SPACE_PIO
+-} bus_space_tag_t;
+-
+-typedef union {
+-	u_long		  ioport;
+-	volatile uint8_t *maddr;
+-} bus_space_handle_t;
+-
+-typedef struct bus_dma_segment
+-{
+-	bus_addr_t	ds_addr;
+-	bus_size_t	ds_len;
+-} bus_dma_segment_t;
+-
+-struct ahd_linux_dma_tag
+-{
+-	bus_size_t	alignment;
+-	bus_size_t	boundary;
+-	bus_size_t	maxsize;
+-};
+-typedef struct ahd_linux_dma_tag* bus_dma_tag_t;
+-
+-struct ahd_linux_dmamap
+-{
+-	bus_addr_t	bus_addr;
+-};
+-typedef struct ahd_linux_dmamap* bus_dmamap_t;
+-
+-typedef int bus_dma_filter_t(void*, bus_addr_t);
+-typedef void bus_dmamap_callback_t(void *, bus_dma_segment_t *, int, int);
+-
+-#define BUS_DMA_WAITOK		0x0
+-#define BUS_DMA_NOWAIT		0x1
+-#define BUS_DMA_ALLOCNOW	0x2
+-#define BUS_DMA_LOAD_SEGS	0x4	/*
+-					 * Argument is an S/G list not
+-					 * a single buffer.
+-					 */
+-
+-#define BUS_SPACE_MAXADDR	0xFFFFFFFF
+-#define BUS_SPACE_MAXADDR_32BIT	0xFFFFFFFF
+-#define BUS_SPACE_MAXSIZE_32BIT	0xFFFFFFFF
+-
+-int	ahd_dma_tag_create(struct ahd_softc *, bus_dma_tag_t /*parent*/,
+-			   bus_size_t /*alignment*/, bus_size_t /*boundary*/,
+-			   bus_addr_t /*lowaddr*/, bus_addr_t /*highaddr*/,
+-			   bus_dma_filter_t*/*filter*/, void */*filterarg*/,
+-			   bus_size_t /*maxsize*/, int /*nsegments*/,
+-			   bus_size_t /*maxsegsz*/, int /*flags*/,
+-			   bus_dma_tag_t */*dma_tagp*/);
+-
+-void	ahd_dma_tag_destroy(struct ahd_softc *, bus_dma_tag_t /*tag*/);
+-
+-int	ahd_dmamem_alloc(struct ahd_softc *, bus_dma_tag_t /*dmat*/,
+-			 void** /*vaddr*/, int /*flags*/,
+-			 bus_dmamap_t* /*mapp*/);
+-
+-void	ahd_dmamem_free(struct ahd_softc *, bus_dma_tag_t /*dmat*/,
+-			void* /*vaddr*/, bus_dmamap_t /*map*/);
+-
+-void	ahd_dmamap_destroy(struct ahd_softc *, bus_dma_tag_t /*tag*/,
+-			   bus_dmamap_t /*map*/);
+-
+-int	ahd_dmamap_load(struct ahd_softc *ahd, bus_dma_tag_t /*dmat*/,
+-			bus_dmamap_t /*map*/, void * /*buf*/,
+-			bus_size_t /*buflen*/, bus_dmamap_callback_t *,
+-			void */*callback_arg*/, int /*flags*/);
+-
+-int	ahd_dmamap_unload(struct ahd_softc *, bus_dma_tag_t, bus_dmamap_t);
+-
+-/*
+- * Operations performed by ahd_dmamap_sync().
+- */
+-#define BUS_DMASYNC_PREREAD	0x01	/* pre-read synchronization */
+-#define BUS_DMASYNC_POSTREAD	0x02	/* post-read synchronization */
+-#define BUS_DMASYNC_PREWRITE	0x04	/* pre-write synchronization */
+-#define BUS_DMASYNC_POSTWRITE	0x08	/* post-write synchronization */
+-
+-/*
+- * XXX
+- * ahd_dmamap_sync is only used on buffers allocated with
+- * the pci_alloc_consistent() API.  Although I'm not sure how
+- * this works on architectures with a write buffer, Linux does
+- * not have an API to sync "coherent" memory.  Perhaps we need
+- * to do an mb()?
+- */
+-#define ahd_dmamap_sync(ahd, dma_tag, dmamap, offset, len, op)
+-
+-/************************** Timer DataStructures ******************************/
+-typedef struct timer_list ahd_timer_t;
+-
+ /********************************** Includes **********************************/
++/* Core SCSI definitions */
++#define AIC_LIB_PREFIX ahd
++#define AIC_CONST_PREFIX AHD
++
+ #ifdef CONFIG_AIC79XX_REG_PRETTY_PRINT
+ #define AIC_DEBUG_REGISTERS 1
+ #else
+ #define AIC_DEBUG_REGISTERS 0
+ #endif
+-#include "aic79xx.h"
+-
+-/***************************** Timer Facilities *******************************/
+-#define ahd_timer_init init_timer
+-#define ahd_timer_stop del_timer_sync
+-typedef void ahd_linux_callback_t (u_long);  
+-static __inline void ahd_timer_reset(ahd_timer_t *timer, u_int usec,
+-				     ahd_callback_t *func, void *arg);
+-static __inline void ahd_scb_timer_reset(struct scb *scb, u_int usec);
+-
+-static __inline void
+-ahd_timer_reset(ahd_timer_t *timer, u_int usec, ahd_callback_t *func, void *arg)
+-{
+-	struct ahd_softc *ahd;
++#define AIC_CORE_INCLUDE "aic79xx.h"
++#include "aiclib.h"
+ 
+-	ahd = (struct ahd_softc *)arg;
+-	del_timer(timer);
+-	timer->data = (u_long)arg;
+-	timer->expires = jiffies + (usec * HZ)/1000000;
+-	timer->function = (ahd_linux_callback_t*)func;
+-	add_timer(timer);
+-}
++/************************* Configuration Data *********************************/
++extern uint32_t aic79xx_allow_memio;
++extern int aic79xx_detect_complete;
++extern Scsi_Host_Template aic79xx_driver_template;
+ 
+-static __inline void
+-ahd_scb_timer_reset(struct scb *scb, u_int usec)
+-{
+-	mod_timer(&scb->io_ctx->eh_timeout, jiffies + (usec * HZ)/1000000);
+-}
++/***************************** Domain Validation ******************************/
++void ahd_linux_dv_complete(Scsi_Cmnd *cmd);
++void ahd_linux_dv_timeout(struct scsi_cmnd *cmd);
+ 
+ /***************************** SMP support ************************************/
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,17)
+@@ -292,193 +102,7 @@ ahd_scb_timer_reset(struct scb *scb, u_i
+ #define AHD_SCSI_HAS_HOST_LOCK 0
+ #endif
+ 
+-#define AIC79XX_DRIVER_VERSION "1.3.9"
+-
+-/**************************** Front End Queues ********************************/
+-/*
+- * Data structure used to cast the Linux struct scsi_cmnd to something
+- * that allows us to use the queue macros.  The linux structure has
+- * plenty of space to hold the links fields as required by the queue
+- * macros, but the queue macors require them to have the correct type.
+- */
+-struct ahd_cmd_internal {
+-	/* Area owned by the Linux scsi layer. */
+-	uint8_t	private[offsetof(struct scsi_cmnd, SCp.Status)];
+-	union {
+-		STAILQ_ENTRY(ahd_cmd)	ste;
+-		LIST_ENTRY(ahd_cmd)	le;
+-		TAILQ_ENTRY(ahd_cmd)	tqe;
+-	} links;
+-	uint32_t			end;
+-};
+-
+-struct ahd_cmd {
+-	union {
+-		struct ahd_cmd_internal	icmd;
+-		struct scsi_cmnd	scsi_cmd;
+-	} un;
+-};
+-
+-#define acmd_icmd(cmd) ((cmd)->un.icmd)
+-#define acmd_scsi_cmd(cmd) ((cmd)->un.scsi_cmd)
+-#define acmd_links un.icmd.links
+-
+-/*************************** Device Data Structures ***************************/
+-/*
+- * A per probed device structure used to deal with some error recovery
+- * scenarios that the Linux mid-layer code just doesn't know how to
+- * handle.  The structure allocated for a device only becomes persistent
+- * after a successfully completed inquiry command to the target when
+- * that inquiry data indicates a lun is present.
+- */
+-TAILQ_HEAD(ahd_busyq, ahd_cmd);
+-typedef enum {
+-	AHD_DEV_UNCONFIGURED	 = 0x01,
+-	AHD_DEV_FREEZE_TIL_EMPTY = 0x02, /* Freeze queue until active == 0 */
+-	AHD_DEV_TIMER_ACTIVE	 = 0x04, /* Our timer is active */
+-	AHD_DEV_ON_RUN_LIST	 = 0x08, /* Queued to be run later */
+-	AHD_DEV_Q_BASIC		 = 0x10, /* Allow basic device queuing */
+-	AHD_DEV_Q_TAGGED	 = 0x20, /* Allow full SCSI2 command queueing */
+-	AHD_DEV_PERIODIC_OTAG	 = 0x40, /* Send OTAG to prevent starvation */
+-	AHD_DEV_SLAVE_CONFIGURED = 0x80	 /* slave_configure() has been called */
+-} ahd_linux_dev_flags;
+-
+-struct ahd_linux_target;
+-struct ahd_linux_device {
+-	TAILQ_ENTRY(ahd_linux_device) links;
+-	struct			ahd_busyq busyq;
+-
+-	/*
+-	 * The number of transactions currently
+-	 * queued to the device.
+-	 */
+-	int			active;
+-
+-	/*
+-	 * The currently allowed number of 
+-	 * transactions that can be queued to
+-	 * the device.  Must be signed for
+-	 * conversion from tagged to untagged
+-	 * mode where the device may have more
+-	 * than one outstanding active transaction.
+-	 */
+-	int			openings;
+-
+-	/*
+-	 * A positive count indicates that this
+-	 * device's queue is halted.
+-	 */
+-	u_int			qfrozen;
+-	
+-	/*
+-	 * Cumulative command counter.
+-	 */
+-	u_long			commands_issued;
+-
+-	/*
+-	 * The number of tagged transactions when
+-	 * running at our current opening level
+-	 * that have been successfully received by
+-	 * this device since the last QUEUE FULL.
+-	 */
+-	u_int			tag_success_count;
+-#define AHD_TAG_SUCCESS_INTERVAL 50
+-
+-	ahd_linux_dev_flags	flags;
+-
+-	/*
+-	 * Per device timer.
+-	 */
+-	struct timer_list	timer;
+-
+-	/*
+-	 * The high limit for the tags variable.
+-	 */
+-	u_int			maxtags;
+-
+-	/*
+-	 * The computed number of tags outstanding
+-	 * at the time of the last QUEUE FULL event.
+-	 */
+-	u_int			tags_on_last_queuefull;
+-
+-	/*
+-	 * How many times we have seen a queue full
+-	 * with the same number of tags.  This is used
+-	 * to stop our adaptive queue depth algorithm
+-	 * on devices with a fixed number of tags.
+-	 */
+-	u_int			last_queuefull_same_count;
+-#define AHD_LOCK_TAGS_COUNT 50
+-
+-	/*
+-	 * How many transactions have been queued
+-	 * without the device going idle.  We use
+-	 * this statistic to determine when to issue
+-	 * an ordered tag to prevent transaction
+-	 * starvation.  This statistic is only updated
+-	 * if the AHD_DEV_PERIODIC_OTAG flag is set
+-	 * on this device.
+-	 */
+-	u_int			commands_since_idle_or_otag;
+-#define AHD_OTAG_THRESH	500
+-
+-	int			lun;
+-	Scsi_Device	       *scsi_device;
+-	struct			ahd_linux_target *target;
+-};
+-
+-typedef enum {
+-	AHD_DV_REQUIRED		 = 0x01,
+-	AHD_INQ_VALID		 = 0x02,
+-	AHD_BASIC_DV		 = 0x04,
+-	AHD_ENHANCED_DV		 = 0x08
+-} ahd_linux_targ_flags;
+-
+-/* DV States */
+-typedef enum {
+-	AHD_DV_STATE_EXIT = 0,
+-	AHD_DV_STATE_INQ_SHORT_ASYNC,
+-	AHD_DV_STATE_INQ_ASYNC,
+-	AHD_DV_STATE_INQ_ASYNC_VERIFY,
+-	AHD_DV_STATE_TUR,
+-	AHD_DV_STATE_REBD,
+-	AHD_DV_STATE_INQ_VERIFY,
+-	AHD_DV_STATE_WEB,
+-	AHD_DV_STATE_REB,
+-	AHD_DV_STATE_SU,
+-	AHD_DV_STATE_BUSY
+-} ahd_dv_state;
+-
+-struct ahd_linux_target {
+-	struct ahd_linux_device	 *devices[AHD_NUM_LUNS];
+-	int			  channel;
+-	int			  target;
+-	int			  refcount;
+-	struct ahd_transinfo	  last_tinfo;
+-	struct ahd_softc	 *ahd;
+-	ahd_linux_targ_flags	  flags;
+-	struct scsi_inquiry_data *inq_data;
+-	/*
+-	 * The next "fallback" period to use for narrow/wide transfers.
+-	 */
+-	uint8_t			  dv_next_narrow_period;
+-	uint8_t			  dv_next_wide_period;
+-	uint8_t			  dv_max_width;
+-	uint8_t			  dv_max_ppr_options;
+-	uint8_t			  dv_last_ppr_options;
+-	u_int			  dv_echo_size;
+-	ahd_dv_state		  dv_state;
+-	u_int			  dv_state_retry;
+-	uint8_t			 *dv_buffer;
+-	uint8_t			 *dv_buffer1;
+-
+-	/*
+-	 * Cumulative counter of errors.
+-	 */
+-	u_long			errors_detected;
+-	u_long			cmds_since_error;
+-};
++#define AIC79XX_DRIVER_VERSION "2.0.5"
+ 
+ /********************* Definitions Required by the Core ***********************/
+ /*
+@@ -500,100 +124,21 @@ extern u_int ahd_linux_nseg;
+ #define	AHD_NSEG 128
+ #endif
+ 
+-/*
+- * Per-SCB OSM storage.
+- */
+-typedef enum {
+-	AHD_SCB_UP_EH_SEM = 0x1
+-} ahd_linux_scb_flags;
+-
+-struct scb_platform_data {
+-	struct ahd_linux_device	*dev;
+-	bus_addr_t		 buf_busaddr;
+-	uint32_t		 xfer_len;
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)
+-	uint32_t		 resid;		/* Transfer residual */
+-#endif
+-	uint32_t		 sense_resid;	/* Auto-Sense residual */
+-	ahd_linux_scb_flags	 flags;
+-};
+-
+-/*
+- * Define a structure used for each host adapter.  All members are
+- * aligned on a boundary >= the size of the member to honor the
+- * alignment restrictions of the various platforms supported by
+- * this driver.
+- */
+-typedef enum {
+-	AHD_DV_WAIT_SIMQ_EMPTY	 = 0x01,
+-	AHD_DV_WAIT_SIMQ_RELEASE = 0x02,
+-	AHD_DV_ACTIVE		 = 0x04,
+-	AHD_DV_SHUTDOWN		 = 0x08,
+-	AHD_RUN_CMPLT_Q_TIMER	 = 0x10
+-} ahd_linux_softc_flags;
+-
+-TAILQ_HEAD(ahd_completeq, ahd_cmd);
+-
+-struct ahd_platform_data {
+-	/*
+-	 * Fields accessed from interrupt context.
+-	 */
+-	struct ahd_linux_target *targets[AHD_NUM_TARGETS]; 
+-	TAILQ_HEAD(, ahd_linux_device) device_runq;
+-	struct ahd_completeq	 completeq;
+-
+-	spinlock_t		 spin_lock;
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+-	struct tasklet_struct	 runq_tasklet;
+-#endif
+-	u_int			 qfrozen;
+-	pid_t			 dv_pid;
+-	struct timer_list	 completeq_timer;
+-	struct timer_list	 reset_timer;
+-	struct timer_list	 stats_timer;
+-	struct semaphore	 eh_sem;
+-	struct semaphore	 dv_sem;
+-	struct semaphore	 dv_cmd_sem;	/* XXX This needs to be in
+-						 * the target struct
+-						 */
+-	struct scsi_device	*dv_scsi_dev;
+-	struct Scsi_Host        *host;		/* pointer to scsi host */
+-#define AHD_LINUX_NOIRQ	((uint32_t)~0)
+-	uint32_t		 irq;		/* IRQ for this adapter */
+-	uint32_t		 bios_address;
+-	uint32_t		 mem_busaddr;	/* Mem Base Addr */
+-	bus_addr_t		 hw_dma_mask;
+-	ahd_linux_softc_flags	 flags;
+-};
+-
+-/************************** OS Utility Wrappers *******************************/
+-#define printf printk
+-#define M_NOWAIT GFP_ATOMIC
+-#define M_WAITOK 0
+-#define malloc(size, type, flags) kmalloc(size, flags)
+-#define free(ptr, type) kfree(ptr)
+-
+-static __inline void ahd_delay(long);
+-static __inline void
+-ahd_delay(long usec)
+-{
+-	/*
+-	 * udelay on Linux can have problems for
+-	 * multi-millisecond waits.  Wait at most
+-	 * 1024us per call.
+-	 */
+-	while (usec > 0) {
+-		udelay(usec % 1024);
+-		usec -= 1024;
+-	}
+-}
+-
++/************************** Error Recovery ************************************/
++static __inline void	ahd_wakeup_recovery_thread(struct ahd_softc *ahd); 
++  
++static __inline void
++ahd_wakeup_recovery_thread(struct ahd_softc *ahd)
++{ 
++	up(&ahd->platform_data->recovery_sem);
++}
++ 
++int			ahd_spawn_recovery_thread(struct ahd_softc *ahd);
++void			ahd_terminate_recovery_thread(struct ahd_softc *ahd);
++void			ahd_set_recoveryscb(struct ahd_softc *ahd,
++					    struct scb *scb);
+ 
+ /***************************** Low Level I/O **********************************/
+-#if defined(__powerpc__) || defined(__i386__) || defined(__ia64__)
+-#define MMAPIO
+-#endif
+-
+ static __inline uint8_t ahd_inb(struct ahd_softc * ahd, long port);
+ static __inline uint16_t ahd_inw_atomic(struct ahd_softc * ahd, long port);
+ static __inline void ahd_outb(struct ahd_softc * ahd, long port, uint8_t val);
+@@ -603,21 +148,18 @@ static __inline void ahd_outsb(struct ah
+ 			       uint8_t *, int count);
+ static __inline void ahd_insb(struct ahd_softc * ahd, long port,
+ 			       uint8_t *, int count);
++static __inline void ahd_flush_device_writes(struct ahd_softc *);
+ 
+ static __inline uint8_t
+ ahd_inb(struct ahd_softc * ahd, long port)
+ {
+ 	uint8_t x;
+-#ifdef MMAPIO
+ 
+ 	if (ahd->tags[0] == BUS_SPACE_MEMIO) {
+ 		x = readb(ahd->bshs[0].maddr + port);
+ 	} else {
+ 		x = inb(ahd->bshs[(port) >> 8].ioport + ((port) & 0xFF));
+ 	}
+-#else
+-	x = inb(ahd->bshs[(port) >> 8].ioport + ((port) & 0xFF));
+-#endif
+ 	mb();
+ 	return (x);
+ }
+@@ -626,16 +168,12 @@ static __inline uint16_t
+ ahd_inw_atomic(struct ahd_softc * ahd, long port)
+ {
+ 	uint8_t x;
+-#ifdef MMAPIO
+ 
+ 	if (ahd->tags[0] == BUS_SPACE_MEMIO) {
+ 		x = readw(ahd->bshs[0].maddr + port);
+ 	} else {
+ 		x = inw(ahd->bshs[(port) >> 8].ioport + ((port) & 0xFF));
+ 	}
+-#else
+-	x = inw(ahd->bshs[(port) >> 8].ioport + ((port) & 0xFF));
+-#endif
+ 	mb();
+ 	return (x);
+ }
+@@ -643,30 +181,22 @@ ahd_inw_atomic(struct ahd_softc * ahd, l
+ static __inline void
+ ahd_outb(struct ahd_softc * ahd, long port, uint8_t val)
+ {
+-#ifdef MMAPIO
+ 	if (ahd->tags[0] == BUS_SPACE_MEMIO) {
+ 		writeb(val, ahd->bshs[0].maddr + port);
+ 	} else {
+ 		outb(val, ahd->bshs[(port) >> 8].ioport + (port & 0xFF));
+ 	}
+-#else
+-	outb(val, ahd->bshs[(port) >> 8].ioport + (port & 0xFF));
+-#endif
+ 	mb();
+ }
+ 
+ static __inline void
+ ahd_outw_atomic(struct ahd_softc * ahd, long port, uint16_t val)
+ {
+-#ifdef MMAPIO
+ 	if (ahd->tags[0] == BUS_SPACE_MEMIO) {
+ 		writew(val, ahd->bshs[0].maddr + port);
+ 	} else {
+ 		outw(val, ahd->bshs[(port) >> 8].ioport + (port & 0xFF));
+ 	}
+-#else
+-	outw(val, ahd->bshs[(port) >> 8].ioport + (port & 0xFF));
+-#endif
+ 	mb();
+ }
+ 
+@@ -698,6 +228,13 @@ ahd_insb(struct ahd_softc * ahd, long po
+ 		*array++ = ahd_inb(ahd, port);
+ }
+ 
++static __inline void
++ahd_flush_device_writes(struct ahd_softc *ahd)
++{
++	/* XXX Is this sufficient for all architectures??? */
++	ahd_inb(ahd, INTSTAT);
++}
++
+ /**************************** Initialization **********************************/
+ int		ahd_linux_register_host(struct ahd_softc *,
+ 					Scsi_Host_Template *);
+@@ -826,384 +363,29 @@ ahd_list_unlock(unsigned long *flags)
+ }
+ 
+ /******************************* PCI Definitions ******************************/
+-/*
+- * PCIM_xxx: mask to locate subfield in register
+- * PCIR_xxx: config register offset
+- * PCIC_xxx: device class
+- * PCIS_xxx: device subclass
+- * PCIP_xxx: device programming interface
+- * PCIV_xxx: PCI vendor ID (only required to fixup ancient devices)
+- * PCID_xxx: device ID
+- */
+-#define PCIR_DEVVENDOR		0x00
+-#define PCIR_VENDOR		0x00
+-#define PCIR_DEVICE		0x02
+-#define PCIR_COMMAND		0x04
+-#define PCIM_CMD_PORTEN		0x0001
+-#define PCIM_CMD_MEMEN		0x0002
+-#define PCIM_CMD_BUSMASTEREN	0x0004
+-#define PCIM_CMD_MWRICEN	0x0010
+-#define PCIM_CMD_PERRESPEN	0x0040
+-#define	PCIM_CMD_SERRESPEN	0x0100
+-#define PCIR_STATUS		0x06
+-#define PCIR_REVID		0x08
+-#define PCIR_PROGIF		0x09
+-#define PCIR_SUBCLASS		0x0a
+-#define PCIR_CLASS		0x0b
+-#define PCIR_CACHELNSZ		0x0c
+-#define PCIR_LATTIMER		0x0d
+-#define PCIR_HEADERTYPE		0x0e
+-#define PCIM_MFDEV		0x80
+-#define PCIR_BIST		0x0f
+-#define PCIR_CAP_PTR		0x34
+-
+-/* config registers for header type 0 devices */
+-#define PCIR_MAPS	0x10
+-#define PCIR_SUBVEND_0	0x2c
+-#define PCIR_SUBDEV_0	0x2e
+-
+-/****************************** PCI-X definitions *****************************/
+-#define PCIXR_COMMAND	0x96
+-#define PCIXR_DEVADDR	0x98
+-#define PCIXM_DEVADDR_FNUM	0x0003	/* Function Number */
+-#define PCIXM_DEVADDR_DNUM	0x00F8	/* Device Number */
+-#define PCIXM_DEVADDR_BNUM	0xFF00	/* Bus Number */
+-#define PCIXR_STATUS	0x9A
+-#define PCIXM_STATUS_64BIT	0x0001	/* Active 64bit connection to device. */
+-#define PCIXM_STATUS_133CAP	0x0002	/* Device is 133MHz capable */
+-#define PCIXM_STATUS_SCDISC	0x0004	/* Split Completion Discarded */
+-#define PCIXM_STATUS_UNEXPSC	0x0008	/* Unexpected Split Completion */
+-#define PCIXM_STATUS_CMPLEXDEV	0x0010	/* Device Complexity (set == bridge) */
+-#define PCIXM_STATUS_MAXMRDBC	0x0060	/* Maximum Burst Read Count */
+-#define PCIXM_STATUS_MAXSPLITS	0x0380	/* Maximum Split Transactions */
+-#define PCIXM_STATUS_MAXCRDS	0x1C00	/* Maximum Cumulative Read Size */
+-#define PCIXM_STATUS_RCVDSCEM	0x2000	/* Received a Split Comp w/Error msg */
+-
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+ extern struct pci_driver aic79xx_pci_driver;
+ #endif
+ 
+-typedef enum
+-{
+-	AHD_POWER_STATE_D0,
+-	AHD_POWER_STATE_D1,
+-	AHD_POWER_STATE_D2,
+-	AHD_POWER_STATE_D3
+-} ahd_power_state;
+-
+-void ahd_power_state_change(struct ahd_softc *ahd,
+-			    ahd_power_state new_state);
+-
+ /******************************* PCI Routines *********************************/
+ int			 ahd_linux_pci_init(void);
+ void			 ahd_linux_pci_exit(void);
+ int			 ahd_pci_map_registers(struct ahd_softc *ahd);
+ int			 ahd_pci_map_int(struct ahd_softc *ahd);
+ 
+-static __inline uint32_t ahd_pci_read_config(ahd_dev_softc_t pci,
+-					     int reg, int width);
+-
+-static __inline uint32_t
+-ahd_pci_read_config(ahd_dev_softc_t pci, int reg, int width)
+-{
+-	switch (width) {
+-	case 1:
+-	{
+-		uint8_t retval;
+-
+-		pci_read_config_byte(pci, reg, &retval);
+-		return (retval);
+-	}
+-	case 2:
+-	{
+-		uint16_t retval;
+-		pci_read_config_word(pci, reg, &retval);
+-		return (retval);
+-	}
+-	case 4:
+-	{
+-		uint32_t retval;
+-		pci_read_config_dword(pci, reg, &retval);
+-		return (retval);
+-	}
+-	default:
+-		panic("ahd_pci_read_config: Read size too big");
+-		/* NOTREACHED */
+-		return (0);
+-	}
+-}
+-
+-static __inline void ahd_pci_write_config(ahd_dev_softc_t pci,
+-					  int reg, uint32_t value,
+-					  int width);
+-
+-static __inline void
+-ahd_pci_write_config(ahd_dev_softc_t pci, int reg, uint32_t value, int width)
+-{
+-	switch (width) {
+-	case 1:
+-		pci_write_config_byte(pci, reg, value);
+-		break;
+-	case 2:
+-		pci_write_config_word(pci, reg, value);
+-		break;
+-	case 4:
+-		pci_write_config_dword(pci, reg, value);
+-		break;
+-	default:
+-		panic("ahd_pci_write_config: Write size too big");
+-		/* NOTREACHED */
+-	}
+-}
+-
+-static __inline int ahd_get_pci_function(ahd_dev_softc_t);
+-static __inline int
+-ahd_get_pci_function(ahd_dev_softc_t pci)
+-{
+-	return (PCI_FUNC(pci->devfn));
+-}
+-
+-static __inline int ahd_get_pci_slot(ahd_dev_softc_t);
+-static __inline int
+-ahd_get_pci_slot(ahd_dev_softc_t pci)
+-{
+-	return (PCI_SLOT(pci->devfn));
+-}
+-
+-static __inline int ahd_get_pci_bus(ahd_dev_softc_t);
+-static __inline int
+-ahd_get_pci_bus(ahd_dev_softc_t pci)
+-{
+-	return (pci->bus->number);
+-}
+-
+-static __inline void ahd_flush_device_writes(struct ahd_softc *);
+-static __inline void
+-ahd_flush_device_writes(struct ahd_softc *ahd)
+-{
+-	/* XXX Is this sufficient for all architectures??? */
+-	ahd_inb(ahd, INTSTAT);
+-}
+-
+-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,3,0)
+-#define pci_map_sg(pdev, sg_list, nseg, direction) (nseg)
+-#define pci_unmap_sg(pdev, sg_list, nseg, direction)
+-#define sg_dma_address(sg) (VIRT_TO_BUS((sg)->address))
+-#define sg_dma_len(sg) ((sg)->length)
+-#define pci_map_single(pdev, buffer, bufflen, direction) \
+-	(VIRT_TO_BUS(buffer))
+-#define pci_unmap_single(pdev, buffer, buflen, direction)
+-#endif
+-
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,3)
+-#define ahd_pci_set_dma_mask pci_set_dma_mask
+-#else
+-/*
+- * Always "return" 0 for success.
+- */
+-#define ahd_pci_set_dma_mask(dev_softc, mask)	\
+-	(((dev_softc)->dma_mask = mask) && 0)
+-#endif
+ /**************************** Proc FS Support *********************************/
+-int	ahd_linux_proc_info(struct Scsi_Host *, char *, char **, off_t, int, int);
+-
+-/*************************** Domain Validation ********************************/
+-#define AHD_DV_CMD(cmd) ((cmd)->scsi_done == ahd_linux_dv_complete)
+-#define AHD_DV_SIMQ_FROZEN(ahd)					\
+-	((((ahd)->platform_data->flags & AHD_DV_ACTIVE) != 0)	\
+-	 && (ahd)->platform_data->qfrozen == 1)
+-
+-/*********************** Transaction Access Wrappers **************************/
+-static __inline void ahd_cmd_set_transaction_status(Scsi_Cmnd *, uint32_t);
+-static __inline void ahd_set_transaction_status(struct scb *, uint32_t);
+-static __inline void ahd_cmd_set_scsi_status(Scsi_Cmnd *, uint32_t);
+-static __inline void ahd_set_scsi_status(struct scb *, uint32_t);
+-static __inline uint32_t ahd_cmd_get_transaction_status(Scsi_Cmnd *cmd);
+-static __inline uint32_t ahd_get_transaction_status(struct scb *);
+-static __inline uint32_t ahd_cmd_get_scsi_status(Scsi_Cmnd *cmd);
+-static __inline uint32_t ahd_get_scsi_status(struct scb *);
+-static __inline void ahd_set_transaction_tag(struct scb *, int, u_int);
+-static __inline u_long ahd_get_transfer_length(struct scb *);
+-static __inline int ahd_get_transfer_dir(struct scb *);
+-static __inline void ahd_set_residual(struct scb *, u_long);
+-static __inline void ahd_set_sense_residual(struct scb *scb, u_long resid);
+-static __inline u_long ahd_get_residual(struct scb *);
+-static __inline u_long ahd_get_sense_residual(struct scb *);
+-static __inline int ahd_perform_autosense(struct scb *);
+-static __inline uint32_t ahd_get_sense_bufsize(struct ahd_softc *,
+-					       struct scb *);
+-static __inline void ahd_notify_xfer_settings_change(struct ahd_softc *,
+-						     struct ahd_devinfo *);
+-static __inline void ahd_platform_scb_free(struct ahd_softc *ahd,
+-					   struct scb *scb);
+-static __inline void ahd_freeze_scb(struct scb *scb);
+-
+-static __inline
+-void ahd_cmd_set_transaction_status(Scsi_Cmnd *cmd, uint32_t status)
+-{
+-	cmd->result &= ~(CAM_STATUS_MASK << 16);
+-	cmd->result |= status << 16;
+-}
+-
+-static __inline
+-void ahd_set_transaction_status(struct scb *scb, uint32_t status)
+-{
+-	ahd_cmd_set_transaction_status(scb->io_ctx,status);
+-}
+-
+-static __inline
+-void ahd_cmd_set_scsi_status(Scsi_Cmnd *cmd, uint32_t status)
+-{
+-	cmd->result &= ~0xFFFF;
+-	cmd->result |= status;
+-}
+-
+-static __inline
+-void ahd_set_scsi_status(struct scb *scb, uint32_t status)
+-{
+-	ahd_cmd_set_scsi_status(scb->io_ctx, status);
+-}
+-
+-static __inline
+-uint32_t ahd_cmd_get_transaction_status(Scsi_Cmnd *cmd)
+-{
+-	return ((cmd->result >> 16) & CAM_STATUS_MASK);
+-}
+-
+-static __inline
+-uint32_t ahd_get_transaction_status(struct scb *scb)
+-{
+-	return (ahd_cmd_get_transaction_status(scb->io_ctx));
+-}
+-
+-static __inline
+-uint32_t ahd_cmd_get_scsi_status(Scsi_Cmnd *cmd)
+-{
+-	return (cmd->result & 0xFFFF);
+-}
+-
+-static __inline
+-uint32_t ahd_get_scsi_status(struct scb *scb)
+-{
+-	return (ahd_cmd_get_scsi_status(scb->io_ctx));
+-}
+-
+-static __inline
+-void ahd_set_transaction_tag(struct scb *scb, int enabled, u_int type)
+-{
+-	/*
+-	 * Nothing to do for linux as the incoming transaction
+-	 * has no concept of tag/non tagged, etc.
+-	 */
+-}
+-
+-static __inline
+-u_long ahd_get_transfer_length(struct scb *scb)
+-{
+-	return (scb->platform_data->xfer_len);
+-}
+-
+-static __inline
+-int ahd_get_transfer_dir(struct scb *scb)
+-{
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,40)
+-	return (scb->io_ctx->sc_data_direction);
+-#else
+-	if (scb->io_ctx->bufflen == 0)
+-		return (CAM_DIR_NONE);
+-
+-	switch(scb->io_ctx->cmnd[0]) {
+-	case 0x08:  /* READ(6)  */
+-	case 0x28:  /* READ(10) */
+-	case 0xA8:  /* READ(12) */
+-		return (CAM_DIR_IN);
+-        case 0x0A:  /* WRITE(6)  */
+-        case 0x2A:  /* WRITE(10) */
+-        case 0xAA:  /* WRITE(12) */
+-		return (CAM_DIR_OUT);
+-        default:
+-		return (CAM_DIR_NONE);
+-        }
+-#endif
+-}
+-
+-static __inline
+-void ahd_set_residual(struct scb *scb, u_long resid)
+-{
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
+-	scb->io_ctx->resid = resid;
+-#else
+-	scb->platform_data->resid = resid;
+-#endif
+-}
+-
+-static __inline
+-void ahd_set_sense_residual(struct scb *scb, u_long resid)
+-{
+-	scb->platform_data->sense_resid = resid;
+-}
+-
+-static __inline
+-u_long ahd_get_residual(struct scb *scb)
+-{
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
+-	return (scb->io_ctx->resid);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
++int	ahd_linux_proc_info(char *, char **, off_t, int, int, int);
+ #else
+-	return (scb->platform_data->resid);
++int	ahd_linux_proc_info(struct Scsi_Host *, char *, char **,
++			    off_t, int, int);
+ #endif
+-}
+-
+-static __inline
+-u_long ahd_get_sense_residual(struct scb *scb)
+-{
+-	return (scb->platform_data->sense_resid);
+-}
+-
+-static __inline
+-int ahd_perform_autosense(struct scb *scb)
+-{
+-	/*
+-	 * We always perform autosense in Linux.
+-	 * On other platforms this is set on a
+-	 * per-transaction basis.
+-	 */
+-	return (1);
+-}
+-
+-static __inline uint32_t
+-ahd_get_sense_bufsize(struct ahd_softc *ahd, struct scb *scb)
+-{
+-	return (sizeof(struct scsi_sense_data));
+-}
+-
+-static __inline void
+-ahd_notify_xfer_settings_change(struct ahd_softc *ahd,
+-				struct ahd_devinfo *devinfo)
+-{
+-	/* Nothing to do here for linux */
+-}
+-
+-static __inline void
+-ahd_platform_scb_free(struct ahd_softc *ahd, struct scb *scb)
+-{
+-	ahd->flags &= ~AHD_RESOURCE_SHORTAGE;
+-}
+ 
++/*********************** Transaction Access Wrappers **************************/
+ int	ahd_platform_alloc(struct ahd_softc *ahd, void *platform_arg);
+ void	ahd_platform_free(struct ahd_softc *ahd);
+ void	ahd_platform_init(struct ahd_softc *ahd);
+ void	ahd_platform_freeze_devq(struct ahd_softc *ahd, struct scb *scb);
+-void	ahd_freeze_simq(struct ahd_softc *ahd);
+-void	ahd_release_simq(struct ahd_softc *ahd);
+-
+-static __inline void
+-ahd_freeze_scb(struct scb *scb)
+-{
+-	if ((scb->io_ctx->result & (CAM_DEV_QFRZN << 16)) == 0) {
+-                scb->io_ctx->result |= CAM_DEV_QFRZN << 16;
+-                scb->platform_data->dev->qfrozen++;
+-        }
+-}
+ 
+ void	ahd_platform_set_tags(struct ahd_softc *ahd,
+ 			      struct ahd_devinfo *devinfo, ahd_queue_alg);
+@@ -1221,9 +403,9 @@ void	ahd_print_path(struct ahd_softc *, 
+ void	ahd_platform_dump_card_state(struct ahd_softc *ahd);
+ 
+ #ifdef CONFIG_PCI
+-#define AHD_PCI_CONFIG 1
++#define AIC_PCI_CONFIG 1
+ #else
+-#define AHD_PCI_CONFIG 0
++#define AIC_PCI_CONFIG 0
+ #endif
+ #define bootverbose aic79xx_verbose
+ extern uint32_t aic79xx_verbose;
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic79xx_osm_pci.c	2003-09-08 13:58:58.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aic79xx_osm_pci.c	2003-12-28 23:21:39.000000000 -0800
+@@ -36,12 +36,18 @@
+  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  * POSSIBILITY OF SUCH DAMAGES.
+  *
+- * $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"
+ #include "aic79xx_inline.h"
+ 
++/*
++ * Include aiclib_pci.c as part of our
++ * "module dependencies are hard" work around.
++ */
++#include "aiclib_pci.c"
++
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
+ struct pci_device_id
+ {
+@@ -52,11 +58,9 @@ static int	ahd_linux_pci_dev_probe(struc
+ 					const struct pci_device_id *ent);
+ static int	ahd_linux_pci_reserve_io_regions(struct ahd_softc *ahd,
+ 						 u_long *base, u_long *base2);
+-#ifdef MMAPIO
+ static int	ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd,
+ 						 u_long *bus_addr,
+ 						 uint8_t **maddr);
+-#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+ static void	ahd_linux_pci_dev_remove(struct pci_dev *pdev);
+ 
+@@ -94,12 +98,14 @@ ahd_linux_pci_dev_remove(struct pci_dev 
+ 	if (ahd != NULL) {
+ 		u_long s;
+ 
++		TAILQ_REMOVE(&ahd_tailq, ahd, links);
++		ahd_list_unlock(&l);
+ 		ahd_lock(ahd, &s);
+ 		ahd_intr_enable(ahd, FALSE);
+ 		ahd_unlock(ahd, &s);
+ 		ahd_free(ahd);
+-	}
+-	ahd_list_unlock(&l);
++	} else
++		ahd_list_unlock(&l);
+ }
+ #endif /* !LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0) */
+ 
+@@ -108,7 +114,7 @@ ahd_linux_pci_dev_probe(struct pci_dev *
+ {
+ 	char		 buf[80];
+ 	struct		 ahd_softc *ahd;
+-	ahd_dev_softc_t	 pci;
++	aic_dev_softc_t	 dev;
+ 	struct		 ahd_pci_identity *entry;
+ 	char		*name;
+ 	int		 error;
+@@ -119,7 +125,7 @@ ahd_linux_pci_dev_probe(struct pci_dev *
+ 	TAILQ_FOREACH(ahd, &ahd_tailq, links) {
+ 		struct pci_dev *probed_pdev;
+ 
+-		probed_pdev = ahd->dev_softc;
++		probed_pdev = aic_pci_dev(ahd);
+ 		if (probed_pdev->bus->number == pdev->bus->number
+ 		 && probed_pdev->devfn == pdev->devfn)
+ 			break;
+@@ -129,8 +135,8 @@ ahd_linux_pci_dev_probe(struct pci_dev *
+ 		return (-ENODEV);
+ 	}
+ 
+-	pci = pdev;
+-	entry = ahd_find_pci_device(pci);
++	dev = aic_pci_dev_to_dev(pdev);
++	entry = ahd_find_pci_device(dev);
+ 	if (entry == NULL)
+ 		return (-ENODEV);
+ 
+@@ -140,9 +146,9 @@ ahd_linux_pci_dev_probe(struct pci_dev *
+ 	 * common detect routine.
+ 	 */
+ 	sprintf(buf, "ahd_pci:%d:%d:%d",
+-		ahd_get_pci_bus(pci),
+-		ahd_get_pci_slot(pci),
+-		ahd_get_pci_function(pci));
++		aic_get_pci_bus(dev),
++		aic_get_pci_slot(dev),
++		aic_get_pci_function(dev));
+ 	name = malloc(strlen(buf) + 1, M_DEVBUF, M_NOWAIT);
+ 	if (name == NULL)
+ 		return (-ENOMEM);
+@@ -150,6 +156,7 @@ ahd_linux_pci_dev_probe(struct pci_dev *
+ 	ahd = ahd_alloc(NULL, name);
+ 	if (ahd == NULL)
+ 		return (-ENOMEM);
++	ahd->dev_softc = dev;
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+ 	if (pci_enable_device(pdev)) {
+ 		ahd_free(ahd);
+@@ -163,23 +170,22 @@ ahd_linux_pci_dev_probe(struct pci_dev *
+ 		bus_addr_t mask_39bit;
+ 
+ 		memsize = ahd_linux_get_memsize();
+-		mask_64bit = (bus_addr_t)(0xFFFFFFFFFFFFFFFFULL&(bus_addr_t)~0);
+-		mask_39bit = (bus_addr_t)(0x7FFFFFFFFFULL&(bus_addr_t)~0);
++		mask_64bit = (bus_addr_t)0xFFFFFFFFFFFFFFFFULL;
++		mask_39bit = (bus_addr_t)0x7FFFFFFFFFULL;
+ 		if (memsize >= 0x8000000000ULL
+-	 	 && ahd_pci_set_dma_mask(pdev, mask_64bit) == 0) {
++	 	 && aic_set_dma_mask(ahd, mask_64bit) == 0) {
+ 			ahd->flags |= AHD_64BIT_ADDRESSING;
+ 			ahd->platform_data->hw_dma_mask = mask_64bit;
+ 		} else if (memsize > 0x80000000
+-			&& ahd_pci_set_dma_mask(pdev, mask_39bit) == 0) {
++			&& aic_set_dma_mask(ahd, mask_39bit) == 0) {
+ 			ahd->flags |= AHD_39BIT_ADDRESSING;
+ 			ahd->platform_data->hw_dma_mask = mask_39bit;
+ 		}
+ 	} else {
+-		ahd_pci_set_dma_mask(pdev, 0xFFFFFFFF);
++		aic_set_dma_mask(ahd, 0xFFFFFFFF);
+ 		ahd->platform_data->hw_dma_mask = 0xFFFFFFFF;
+ 	}
+ #endif
+-	ahd->dev_softc = pci;
+ 	error = ahd_pci_config(ahd, entry);
+ 	if (error != 0) {
+ 		ahd_free(ahd);
+@@ -218,10 +224,8 @@ ahd_linux_pci_init(void)
+ 	pdev = NULL;
+ 	class = PCI_CLASS_STORAGE_SCSI << 8;
+ 	while ((pdev = pci_find_class(class, pdev)) != NULL) {
+-		ahd_dev_softc_t pci;
+ 		int error;
+ 
+-		pci = pdev;
+ 		error = ahd_linux_pci_dev_probe(pdev, /*pci_devid*/NULL);
+ 		if (error == 0)
+ 			found++;
+@@ -240,17 +244,18 @@ static int
+ ahd_linux_pci_reserve_io_regions(struct ahd_softc *ahd, u_long *base,
+ 				 u_long *base2)
+ {
++
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
+-	*base = pci_resource_start(ahd->dev_softc, 0);
++	*base = pci_resource_start(aic_pci_dev(ahd), 0);
+ 	/*
+ 	 * This is really the 3rd bar and should be at index 2,
+ 	 * but the Linux PCI code doesn't know how to "count" 64bit
+ 	 * bars.
+ 	 */
+-	*base2 = pci_resource_start(ahd->dev_softc, 3);
++	*base2 = pci_resource_start(aic_pci_dev(ahd), 3);
+ #else
+-	*base = ahd_pci_read_config(ahd->dev_softc, AHD_PCI_IOADDR0, 4);
+-	*base2 = ahd_pci_read_config(ahd->dev_softc, AHD_PCI_IOADDR1, 4);
++	*base = aic_pci_read_config(ahd->dev_softc, AHD_PCI_IOADDR0, 4);
++	*base2 = aic_pci_read_config(ahd->dev_softc, AHD_PCI_IOADDR1, 4);
+ 	*base &= PCI_BASE_ADDRESS_IO_MASK;
+ 	*base2 &= PCI_BASE_ADDRESS_IO_MASK;
+ #endif
+@@ -273,7 +278,6 @@ ahd_linux_pci_reserve_io_regions(struct 
+ 	return (0);
+ }
+ 
+-#ifdef MMAPIO
+ static int
+ ahd_linux_pci_reserve_mem_region(struct ahd_softc *ahd,
+ 				 u_long *bus_addr,
+@@ -292,11 +296,11 @@ ahd_linux_pci_reserve_mem_region(struct 
+ 
+ 	error = 0;
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
+-	start = pci_resource_start(ahd->dev_softc, 1);
++	start = pci_resource_start(aic_pci_dev(ahd), 1);
+ 	base_page = start & PAGE_MASK;
+ 	base_offset = start - base_page;
+ #else
+-	start = ahd_pci_read_config(ahd->dev_softc, PCIR_MAPS+4, 4);
++	start = aic_pci_read_config(ahd->dev_softc, PCIR_MAPS+4, 4);
+ 	base_offset = start & PCI_BASE_ADDRESS_MEM_MASK;
+ 	base_page = base_offset & PAGE_MASK;
+ 	base_offset -= base_page;
+@@ -321,7 +325,6 @@ ahd_linux_pci_reserve_mem_region(struct 
+ 		error = ENOMEM;
+ 	return (error);
+ }
+-#endif
+ 
+ int
+ ahd_pci_map_registers(struct ahd_softc *ahd)
+@@ -334,11 +337,10 @@ ahd_pci_map_registers(struct ahd_softc *
+ 	/*
+ 	 * If its allowed, we prefer memory mapped access.
+ 	 */
+-	command = ahd_pci_read_config(ahd->dev_softc, PCIR_COMMAND, 4);
++	command = aic_pci_read_config(ahd->dev_softc, PCIR_COMMAND, 4);
+ 	command &= ~(PCIM_CMD_PORTEN|PCIM_CMD_MEMEN);
+ 	base = 0;
+ 	maddr = NULL;
+-#ifdef MMAPIO
+ 	error = ahd_linux_pci_reserve_mem_region(ahd, &base, &maddr);
+ 	if (error == 0) {
+ 		ahd->platform_data->mem_busaddr = base;
+@@ -346,16 +348,16 @@ ahd_pci_map_registers(struct ahd_softc *
+ 		ahd->bshs[0].maddr = maddr;
+ 		ahd->tags[1] = BUS_SPACE_MEMIO;
+ 		ahd->bshs[1].maddr = maddr + 0x100;
+-		ahd_pci_write_config(ahd->dev_softc, PCIR_COMMAND,
++		aic_pci_write_config(ahd->dev_softc, PCIR_COMMAND,
+ 				     command | PCIM_CMD_MEMEN, 4);
+ 
+ 		if (ahd_pci_test_register_access(ahd) != 0) {
+ 
+ 			printf("aic79xx: PCI Device %d:%d:%d "
+ 			       "failed memory mapped test.  Using PIO.\n",
+-			       ahd_get_pci_bus(ahd->dev_softc),
+-			       ahd_get_pci_slot(ahd->dev_softc),
+-			       ahd_get_pci_function(ahd->dev_softc));
++			       aic_get_pci_bus(ahd->dev_softc),
++			       aic_get_pci_slot(ahd->dev_softc),
++			       aic_get_pci_function(ahd->dev_softc));
+ 			iounmap((void *)((u_long)maddr & PAGE_MASK));
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+ 			release_mem_region(ahd->platform_data->mem_busaddr,
+@@ -368,12 +370,11 @@ ahd_pci_map_registers(struct ahd_softc *
+ 	} else if (bootverbose) {
+ 		printf("aic79xx: PCI%d:%d:%d MEM region 0x%lx "
+ 		       "unavailable. Cannot memory map device.\n",
+-		       ahd_get_pci_bus(ahd->dev_softc),
+-		       ahd_get_pci_slot(ahd->dev_softc),
+-		       ahd_get_pci_function(ahd->dev_softc),
++		       aic_get_pci_bus(ahd->dev_softc),
++		       aic_get_pci_slot(ahd->dev_softc),
++		       aic_get_pci_function(ahd->dev_softc),
+ 		       base);
+ 	}
+-#endif
+ 
+ 	if (maddr == NULL) {
+ 		u_long	 base2;
+@@ -388,13 +389,13 @@ ahd_pci_map_registers(struct ahd_softc *
+ 		} else {
+ 			printf("aic79xx: PCI%d:%d:%d IO regions 0x%lx and 0x%lx"
+ 			       "unavailable. Cannot map device.\n",
+-			       ahd_get_pci_bus(ahd->dev_softc),
+-			       ahd_get_pci_slot(ahd->dev_softc),
+-			       ahd_get_pci_function(ahd->dev_softc),
++			       aic_get_pci_bus(ahd->dev_softc),
++			       aic_get_pci_slot(ahd->dev_softc),
++			       aic_get_pci_function(ahd->dev_softc),
+ 			       base, base2);
+ 		}
+ 	}
+-	ahd_pci_write_config(ahd->dev_softc, PCIR_COMMAND, command, 4);
++	aic_pci_write_config(ahd->dev_softc, PCIR_COMMAND, command, 4);
+ 	return (error);
+ }
+ 
+@@ -403,49 +404,10 @@ ahd_pci_map_int(struct ahd_softc *ahd)
+ {
+ 	int error;
+ 
+-	error = request_irq(ahd->dev_softc->irq, ahd_linux_isr,
++	error = request_irq(aic_pci_dev(ahd)->irq, ahd_linux_isr,
+ 			    SA_SHIRQ, "aic79xx", ahd);
+ 	if (error == 0)
+-		ahd->platform_data->irq = ahd->dev_softc->irq;
++		ahd->platform_data->irq = aic_pci_dev(ahd)->irq;
+ 	
+ 	return (-error);
+ }
+-
+-void
+-ahd_power_state_change(struct ahd_softc *ahd, ahd_power_state new_state)
+-{
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+-	pci_set_power_state(ahd->dev_softc, new_state);
+-#else
+-	uint32_t cap;
+-	u_int cap_offset;
+-
+-	/*
+-	 * Traverse the capability list looking for
+-	 * the power management capability.
+-	 */
+-	cap = 0;
+-	cap_offset = ahd_pci_read_config(ahd->dev_softc,
+-					 PCIR_CAP_PTR, /*bytes*/1);
+-	while (cap_offset != 0) {
+-
+-		cap = ahd_pci_read_config(ahd->dev_softc,
+-					  cap_offset, /*bytes*/4);
+-		if ((cap & 0xFF) == 1
+-		 && ((cap >> 16) & 0x3) > 0) {
+-			uint32_t pm_control;
+-
+-			pm_control = ahd_pci_read_config(ahd->dev_softc,
+-							 cap_offset + 4,
+-							 /*bytes*/4);
+-			pm_control &= ~0x3;
+-			pm_control |= new_state;
+-			ahd_pci_write_config(ahd->dev_softc,
+-					     cap_offset + 4,
+-					     pm_control, /*bytes*/2);
+-			break;
+-		}
+-		cap_offset = (cap >> 8) & 0xFF;
+-	}
+-#endif 
+-}
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic79xx_pci.c	2003-06-14 12:18:09.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aic79xx_pci.c	2003-12-28 23:21:39.000000000 -0800
+@@ -38,15 +38,15 @@
+  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  * POSSIBILITY OF SUCH DAMAGES.
+  *
+- * $Id: //depot/aic7xxx/aic7xxx/aic79xx_pci.c#73 $
+- *
+- * $FreeBSD$
++ * $Id: //depot/aic7xxx/aic7xxx/aic79xx_pci.c#84 $
+  */
+ 
+ #ifdef __linux__
+ #include "aic79xx_osm.h"
+ #include "aic79xx_inline.h"
+ #else
++#include <sys/cdefs.h>
++__FBSDID("$FreeBSD$");
+ #include <dev/aic7xxx/aic79xx_osm.h>
+ #include <dev/aic7xxx/aic79xx_inline.h>
+ #endif
+@@ -75,13 +75,13 @@ ahd_compose_id(u_int device, u_int vendo
+ #define ID_AHA_29320ALP			0x8017900500449005ull
+ 
+ #define ID_AIC7901A			0x801E9005FFFF9005ull
+-#define ID_AHA_29320			0x8012900500429005ull
+-#define ID_AHA_29320B			0x8013900500439005ull
+ #define ID_AHA_29320LP			0x8014900500449005ull
+ 
+ #define ID_AIC7902			0x801F9005FFFF9005ull
+ #define ID_AIC7902_B			0x801D9005FFFF9005ull
+ #define ID_AHA_39320			0x8010900500409005ull
++#define ID_AHA_29320			0x8012900500429005ull
++#define ID_AHA_29320B			0x8013900500439005ull
+ #define ID_AHA_39320_B			0x8015900500409005ull
+ #define ID_AHA_39320A			0x8016900500409005ull
+ #define ID_AHA_39320D			0x8011900500419005ull
+@@ -117,6 +117,7 @@ ahd_compose_id(u_int device, u_int vendo
+ static ahd_device_setup_t ahd_aic7901_setup;
+ static ahd_device_setup_t ahd_aic7901A_setup;
+ static ahd_device_setup_t ahd_aic7902_setup;
++static ahd_device_setup_t ahd_aic790X_setup;
+ 
+ struct ahd_pci_identity ahd_pci_ident_table [] =
+ {
+@@ -135,24 +136,24 @@ struct ahd_pci_identity ahd_pci_ident_ta
+ 	},
+ 	/* aic7901A based controllers */
+ 	{
+-		ID_AHA_29320,
++		ID_AHA_29320LP,
+ 		ID_ALL_MASK,
+-		"Adaptec 29320 Ultra320 SCSI adapter",
++		"Adaptec 29320LP Ultra320 SCSI adapter",
+ 		ahd_aic7901A_setup
+ 	},
++	/* aic7902 based controllers */	
+ 	{
+-		ID_AHA_29320B,
++		ID_AHA_29320,
+ 		ID_ALL_MASK,
+-		"Adaptec 29320B Ultra320 SCSI adapter",
+-		ahd_aic7901A_setup
++		"Adaptec 29320 Ultra320 SCSI adapter",
++		ahd_aic7902_setup
+ 	},
+ 	{
+-		ID_AHA_29320LP,
++		ID_AHA_29320B,
+ 		ID_ALL_MASK,
+-		"Adaptec 29320LP Ultra320 SCSI adapter",
+-		ahd_aic7901A_setup
++		"Adaptec 29320B Ultra320 SCSI adapter",
++		ahd_aic7902_setup
+ 	},
+-	/* aic7902 based controllers */	
+ 	{
+ 		ID_AHA_39320,
+ 		ID_ALL_MASK,
+@@ -195,18 +196,6 @@ struct ahd_pci_identity ahd_pci_ident_ta
+ 		"Adaptec (HP OEM) 39320D Ultra320 SCSI adapter",
+ 		ahd_aic7902_setup
+ 	},
+-	{
+-		ID_AHA_29320,
+-		ID_ALL_MASK,
+-		"Adaptec 29320 Ultra320 SCSI adapter",
+-		ahd_aic7902_setup
+-	},
+-	{
+-		ID_AHA_29320B,
+-		ID_ALL_MASK,
+-		"Adaptec 29320B Ultra320 SCSI adapter",
+-		ahd_aic7902_setup
+-	},
+ 	/* Generic chip probes for devices we don't know 'exactly' */
+ 	{
+ 		ID_AIC7901 & ID_DEV_VENDOR_MASK,
+@@ -274,7 +263,7 @@ static void	ahd_configure_termination(st
+ static void	ahd_pci_split_intr(struct ahd_softc *ahd, u_int intstat);
+ 
+ struct ahd_pci_identity *
+-ahd_find_pci_device(ahd_dev_softc_t pci)
++ahd_find_pci_device(aic_dev_softc_t pci)
+ {
+ 	uint64_t  full_id;
+ 	uint16_t  device;
+@@ -284,10 +273,10 @@ ahd_find_pci_device(ahd_dev_softc_t pci)
+ 	struct	  ahd_pci_identity *entry;
+ 	u_int	  i;
+ 
+-	vendor = ahd_pci_read_config(pci, PCIR_DEVVENDOR, /*bytes*/2);
+-	device = ahd_pci_read_config(pci, PCIR_DEVICE, /*bytes*/2);
+-	subvendor = ahd_pci_read_config(pci, PCIR_SUBVEND_0, /*bytes*/2);
+-	subdevice = ahd_pci_read_config(pci, PCIR_SUBDEV_0, /*bytes*/2);
++	vendor = aic_pci_read_config(pci, PCIR_DEVVENDOR, /*bytes*/2);
++	device = aic_pci_read_config(pci, PCIR_DEVICE, /*bytes*/2);
++	subvendor = aic_pci_read_config(pci, PCIR_SUBVEND_0, /*bytes*/2);
++	subdevice = aic_pci_read_config(pci, PCIR_SUBDEV_0, /*bytes*/2);
+ 	full_id = ahd_compose_id(device,
+ 				 vendor,
+ 				 subdevice,
+@@ -320,7 +309,7 @@ ahd_pci_config(struct ahd_softc *ahd, st
+ 	/*
+ 	 * Record if this is an HP board.
+ 	 */
+-	subvendor = ahd_pci_read_config(ahd->dev_softc,
++	subvendor = aic_pci_read_config(ahd->dev_softc,
+ 					PCIR_SUBVEND_0, /*bytes*/2);
+ 	if (subvendor == SUBID_HP)
+ 		ahd->flags |= AHD_HP_BOARD;
+@@ -329,7 +318,7 @@ ahd_pci_config(struct ahd_softc *ahd, st
+ 	if (error != 0)
+ 		return (error);
+ 	
+-	devconfig = ahd_pci_read_config(ahd->dev_softc, DEVCONFIG, /*bytes*/4);
++	devconfig = aic_pci_read_config(ahd->dev_softc, DEVCONFIG, /*bytes*/4);
+ 	if ((devconfig & PCIXINITPAT) == PCIXINIT_PCI33_66) {
+ 		ahd->chip |= AHD_PCI;
+ 		/* Disable PCIX workarounds when running in PCI mode. */
+@@ -339,7 +328,7 @@ ahd_pci_config(struct ahd_softc *ahd, st
+ 	}
+ 	ahd->bus_description = pci_bus_modes[PCI_BUS_MODES_INDEX(devconfig)];
+ 
+-	ahd_power_state_change(ahd, AHD_POWER_STATE_D0);
++	aic_power_state_change(ahd, AIC_POWER_STATE_D0);
+ 
+ 	error = ahd_pci_map_registers(ahd);
+ 	if (error != 0)
+@@ -357,17 +346,17 @@ ahd_pci_config(struct ahd_softc *ahd, st
+ 		if (bootverbose)
+ 			printf("%s: Enabling 39Bit Addressing\n",
+ 			       ahd_name(ahd));
+-		devconfig = ahd_pci_read_config(ahd->dev_softc,
++		devconfig = aic_pci_read_config(ahd->dev_softc,
+ 						DEVCONFIG, /*bytes*/4);
+ 		devconfig |= DACEN;
+-		ahd_pci_write_config(ahd->dev_softc, DEVCONFIG,
++		aic_pci_write_config(ahd->dev_softc, DEVCONFIG,
+ 				     devconfig, /*bytes*/4);
+ 	}
+ 	
+ 	/* Ensure busmastering is enabled */
+-	command = ahd_pci_read_config(ahd->dev_softc, PCIR_COMMAND, /*bytes*/2);
++	command = aic_pci_read_config(ahd->dev_softc, PCIR_COMMAND, /*bytes*/2);
+ 	command |= PCIM_CMD_BUSMASTEREN;
+-	ahd_pci_write_config(ahd->dev_softc, PCIR_COMMAND, command, /*bytes*/2);
++	aic_pci_write_config(ahd->dev_softc, PCIR_COMMAND, command, /*bytes*/2);
+ 
+ 	error = ahd_softc_init(ahd);
+ 	if (error != 0)
+@@ -375,12 +364,12 @@ ahd_pci_config(struct ahd_softc *ahd, st
+ 
+ 	ahd->bus_intr = ahd_pci_intr;
+ 
+-	error = ahd_reset(ahd);
++	error = ahd_reset(ahd, /*reinit*/FALSE);
+ 	if (error != 0)
+ 		return (ENXIO);
+ 
+ 	ahd->pci_cachesize =
+-	    ahd_pci_read_config(ahd->dev_softc, CSIZE_LATTIME,
++	    aic_pci_read_config(ahd->dev_softc, CSIZE_LATTIME,
+ 				/*bytes*/1) & CACHESIZE;
+ 	ahd->pci_cachesize *= 4;
+ 
+@@ -418,9 +407,11 @@ ahd_pci_config(struct ahd_softc *ahd, st
+ int
+ ahd_pci_test_register_access(struct ahd_softc *ahd)
+ {
+-	uint32_t	cmd;
+-	int		error;
+-	uint8_t		hcntrl;
++	uint32_t cmd;
++	u_int	 targpcistat;
++	u_int	 pci_status1;
++	int	 error;
++	uint8_t	 hcntrl;
+ 
+ 	error = EIO;
+ 
+@@ -428,8 +419,8 @@ ahd_pci_test_register_access(struct ahd_
+ 	 * Enable PCI error interrupt status, but suppress NMIs
+ 	 * generated by SERR raised due to target aborts.
+ 	 */
+-	cmd = ahd_pci_read_config(ahd->dev_softc, PCIR_COMMAND, /*bytes*/2);
+-	ahd_pci_write_config(ahd->dev_softc, PCIR_COMMAND,
++	cmd = aic_pci_read_config(ahd->dev_softc, PCIR_COMMAND, /*bytes*/2);
++	aic_pci_write_config(ahd->dev_softc, PCIR_COMMAND,
+ 			     cmd & ~PCIM_CMD_SERRESPEN, /*bytes*/2);
+ 
+ 	/*
+@@ -449,11 +440,25 @@ ahd_pci_test_register_access(struct ahd_
+ 	 * or read prefetching could be initiated by the
+ 	 * CPU or host bridge.  Our device does not support
+ 	 * either, so look for data corruption and/or flaged
+-	 * PCI errors.
++	 * PCI errors.  First pause without causing another
++	 * chip reset.
+ 	 */
++	hcntrl &= ~CHIPRST;
+ 	ahd_outb(ahd, HCNTRL, hcntrl|PAUSE);
+ 	while (ahd_is_paused(ahd) == 0)
+ 		;
++
++	/* Clear any PCI errors that occurred before our driver attached. */
++	ahd_set_modes(ahd, AHD_MODE_CFG, AHD_MODE_CFG);
++	targpcistat = ahd_inb(ahd, TARGPCISTAT);
++	ahd_outb(ahd, TARGPCISTAT, targpcistat);
++	pci_status1 = aic_pci_read_config(ahd->dev_softc,
++					  PCIR_STATUS + 1, /*bytes*/1);
++	aic_pci_write_config(ahd->dev_softc, PCIR_STATUS + 1,
++			     pci_status1, /*bytes*/1);
++	ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI);
++	ahd_outb(ahd, CLRINT, CLRPCIINT);
++
+ 	ahd_outb(ahd, SEQCTL0, PERRORDIS);
+ 	ahd_outl(ahd, SRAM_BASE, 0x5aa555aa);
+ 	if (ahd_inl(ahd, SRAM_BASE) != 0x5aa555aa)
+@@ -472,23 +477,20 @@ ahd_pci_test_register_access(struct ahd_
+ 
+ fail:
+ 	if ((ahd_inb(ahd, INTSTAT) & PCIINT) != 0) {
+-		u_int targpcistat;
+-		u_int pci_status1;
+ 
+ 		ahd_set_modes(ahd, AHD_MODE_CFG, AHD_MODE_CFG);
+ 		targpcistat = ahd_inb(ahd, TARGPCISTAT);
+ 
+ 		/* Silently clear any latched errors. */
+ 		ahd_outb(ahd, TARGPCISTAT, targpcistat);
+-		pci_status1 = ahd_pci_read_config(ahd->dev_softc,
++		pci_status1 = aic_pci_read_config(ahd->dev_softc,
+ 						  PCIR_STATUS + 1, /*bytes*/1);
+-		ahd_pci_write_config(ahd->dev_softc, PCIR_STATUS + 1,
++		aic_pci_write_config(ahd->dev_softc, PCIR_STATUS + 1,
+ 				     pci_status1, /*bytes*/1);
+ 		ahd_outb(ahd, CLRINT, CLRPCIINT);
+ 	}
+-
+ 	ahd_outb(ahd, SEQCTL0, PERRORDIS|FAILDIS);
+-	ahd_pci_write_config(ahd->dev_softc, PCIR_COMMAND, cmd, /*bytes*/2);
++	aic_pci_write_config(ahd->dev_softc, PCIR_COMMAND, cmd, /*bytes*/2);
+ 	return (error);
+ }
+ 
+@@ -637,14 +639,14 @@ ahd_configure_termination(struct ahd_sof
+ 	uint8_t	 termctl;
+ 	uint32_t devconfig;
+ 
+-	devconfig = ahd_pci_read_config(ahd->dev_softc, DEVCONFIG, /*bytes*/4);
++	devconfig = aic_pci_read_config(ahd->dev_softc, DEVCONFIG, /*bytes*/4);
+ 	devconfig &= ~STPWLEVEL;
+ 	if ((ahd->flags & AHD_STPWLEVEL_A) != 0)
+ 		devconfig |= STPWLEVEL;
+ 	if (bootverbose)
+ 		printf("%s: STPWLEVEL is %s\n",
+ 		       ahd_name(ahd), (devconfig & STPWLEVEL) ? "on" : "off");
+-	ahd_pci_write_config(ahd->dev_softc, DEVCONFIG, devconfig, /*bytes*/4);
++	aic_pci_write_config(ahd->dev_softc, DEVCONFIG, devconfig, /*bytes*/4);
+  
+ 	/* Make sure current sensing is off. */
+ 	if ((ahd->flags & AHD_CURRENT_SENSING) != 0) {
+@@ -689,6 +691,7 @@ ahd_configure_termination(struct ahd_sof
+ 	 * Now set the termination based on what we found.
+ 	 */
+ 	sxfrctl1 = ahd_inb(ahd, SXFRCTL1) & ~STPWEN;
++	ahd->flags &= ~AHD_TERM_ENB_A;
+ 	if ((termctl & FLX_TERMCTL_ENPRILOW) != 0) {
+ 		ahd->flags |= AHD_TERM_ENB_A;
+ 		sxfrctl1 |= STPWEN;
+@@ -821,9 +824,9 @@ ahd_pci_intr(struct ahd_softc *ahd)
+ 			}
+ 		}	
+ 	}
+-	pci_status1 = ahd_pci_read_config(ahd->dev_softc,
++	pci_status1 = aic_pci_read_config(ahd->dev_softc,
+ 					  PCIR_STATUS + 1, /*bytes*/1);
+-	ahd_pci_write_config(ahd->dev_softc, PCIR_STATUS + 1,
++	aic_pci_write_config(ahd->dev_softc, PCIR_STATUS + 1,
+ 			     pci_status1, /*bytes*/1);
+ 	ahd_restore_modes(ahd, saved_modes);
+ 	ahd_outb(ahd, CLRINT, CLRPCIINT);
+@@ -845,7 +848,7 @@ ahd_pci_split_intr(struct ahd_softc *ahd
+ 	 * Check for splits in all modes.  Modes 0 and 1
+ 	 * additionally have SG engine splits to look at.
+ 	 */
+-	pcix_status = ahd_pci_read_config(ahd->dev_softc, PCIXR_STATUS,
++	pcix_status = aic_pci_read_config(ahd->dev_softc, PCIXR_STATUS,
+ 					  /*bytes*/2);
+ 	printf("%s: PCI Split Interrupt - PCI-X status = 0x%x\n",
+ 	       ahd_name(ahd), pcix_status);
+@@ -894,7 +897,7 @@ ahd_pci_split_intr(struct ahd_softc *ahd
+ 	/*
+ 	 * Clear PCI-X status bits.
+ 	 */
+-	ahd_pci_write_config(ahd->dev_softc, PCIXR_STATUS,
++	aic_pci_write_config(ahd->dev_softc, PCIXR_STATUS,
+ 			     pcix_status, /*bytes*/2);
+ 	ahd_outb(ahd, CLRINT, CLRSPLTINT);
+ 	ahd_restore_modes(ahd, saved_modes);
+@@ -903,44 +906,44 @@ ahd_pci_split_intr(struct ahd_softc *ahd
+ static int
+ ahd_aic7901_setup(struct ahd_softc *ahd)
+ {
+-	int error;
+ 
+-	error = ahd_aic7902_setup(ahd);
+-	if (error != 0)
+-		return (error);
+ 	ahd->chip = AHD_AIC7901;
+-	return (0);
++	ahd->features = AHD_AIC7901_FE;
++	return (ahd_aic790X_setup(ahd));
+ }
+ 
+ static int
+ ahd_aic7901A_setup(struct ahd_softc *ahd)
+ {
+-	int error;
+ 
+-	error = ahd_aic7902_setup(ahd);
+-	if (error != 0)
+-		return (error);
+ 	ahd->chip = AHD_AIC7901A;
+-	return (0);
++	ahd->features = AHD_AIC7901A_FE;
++	return (ahd_aic790X_setup(ahd));
+ }
+ 
+ static int
+ ahd_aic7902_setup(struct ahd_softc *ahd)
+ {
+-	ahd_dev_softc_t pci;
++	ahd->chip = AHD_AIC7902;
++	ahd->features = AHD_AIC7902_FE;
++	return (ahd_aic790X_setup(ahd));
++}
++
++static int
++ahd_aic790X_setup(struct ahd_softc *ahd)
++{
++	aic_dev_softc_t pci;
+ 	u_int rev;
+ 
+ 	pci = ahd->dev_softc;
+-	rev = ahd_pci_read_config(pci, PCIR_REVID, /*bytes*/1);
++	rev = aic_pci_read_config(pci, PCIR_REVID, /*bytes*/1);
+ 	if (rev < ID_AIC7902_PCI_REV_A4) {
+ 		printf("%s: Unable to attach to unsupported chip revision %d\n",
+ 		       ahd_name(ahd), rev);
+-		ahd_pci_write_config(pci, PCIR_COMMAND, 0, /*bytes*/2);
++		aic_pci_write_config(pci, PCIR_COMMAND, 0, /*bytes*/2);
+ 		return (ENXIO);
+ 	}
+-	ahd->channel = ahd_get_pci_function(pci) + 'A';
+-	ahd->chip = AHD_AIC7902;
+-	ahd->features = AHD_AIC7902_FE;
++	ahd->channel = aic_get_pci_function(pci) + 'A';
+ 	if (rev < ID_AIC7902_PCI_REV_B0) {
+ 		/*
+ 		 * Enable A series workarounds.
+@@ -968,9 +971,14 @@ ahd_aic7902_setup(struct ahd_softc *ahd)
+ 		u_int devconfig1;
+ 
+ 		ahd->features |= AHD_RTI|AHD_NEW_IOCELL_OPTS
+-			      |  AHD_NEW_DFCNTRL_OPTS;
+-		ahd->bugs |= AHD_LQOOVERRUN_BUG|AHD_ABORT_LQI_BUG
+-			  |  AHD_INTCOLLISION_BUG|AHD_EARLY_REQ_BUG;
++			      |  AHD_NEW_DFCNTRL_OPTS|AHD_FAST_CDB_DELIVERY;
++		ahd->bugs |= AHD_LQOOVERRUN_BUG|AHD_EARLY_REQ_BUG;
++
++		/*
++		 * Some issues have been resolved in the 7901B.
++		 */
++		if ((ahd->features & AHD_MULTI_FUNC) != 0)
++			ahd->bugs |= AHD_INTCOLLISION_BUG|AHD_ABORT_LQI_BUG;
+ 
+ 		/*
+ 		 * IO Cell paramter setup.
+@@ -985,10 +993,10 @@ ahd_aic7902_setup(struct ahd_softc *ahd)
+ 		 * XXX - Find out exactly what this does from the hardware
+ 		 * 	 folks!
+ 		 */
+-		devconfig1 = ahd_pci_read_config(pci, DEVCONFIG1, /*bytes*/1);
+-		ahd_pci_write_config(pci, DEVCONFIG1,
++		devconfig1 = aic_pci_read_config(pci, DEVCONFIG1, /*bytes*/1);
++		aic_pci_write_config(pci, DEVCONFIG1,
+ 				     devconfig1|PREQDIS, /*bytes*/1);
+-		devconfig1 = ahd_pci_read_config(pci, DEVCONFIG1, /*bytes*/1);
++		devconfig1 = aic_pci_read_config(pci, DEVCONFIG1, /*bytes*/1);
+ 	}
+ 
+ 	return (0);
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic79xx_proc.c	2003-06-14 12:18:29.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aic79xx_proc.c	2003-12-28 23:21:39.000000000 -0800
+@@ -37,7 +37,7 @@
+  * String handling code courtesy of Gerard Roudier's <groudier@club-internet.fr>
+  * sym driver.
+  *
+- * $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"
+@@ -49,7 +49,7 @@ static void	ahd_dump_target_state(struct
+ 				      u_int our_id, char channel,
+ 				      u_int target_id, u_int target_offset);
+ static void	ahd_dump_device_state(struct info_str *info,
+-				      struct ahd_linux_device *dev);
++				      struct aic_linux_device *dev);
+ static int	ahd_proc_write_seeprom(struct ahd_softc *ahd,
+ 				       char *buffer, int length);
+ 
+@@ -166,7 +166,7 @@ ahd_dump_target_state(struct ahd_softc *
+ 		      u_int our_id, char channel, u_int target_id,
+ 		      u_int target_offset)
+ {
+-	struct	ahd_linux_target *targ;
++	struct	aic_linux_target *targ;
+ 	struct	ahd_initiator_tinfo *tinfo;
+ 	struct	ahd_tmode_tstate *tstate;
+ 	int	lun;
+@@ -187,7 +187,7 @@ ahd_dump_target_state(struct ahd_softc *
+ 	copy_info(info, "\tTransmission Errors %ld\n", targ->errors_detected);
+ 
+ 	for (lun = 0; lun < AHD_NUM_LUNS; lun++) {
+-		struct ahd_linux_device *dev;
++		struct aic_linux_device *dev;
+ 
+ 		dev = targ->devices[lun];
+ 
+@@ -199,7 +199,7 @@ ahd_dump_target_state(struct ahd_softc *
+ }
+ 
+ static void
+-ahd_dump_device_state(struct info_str *info, struct ahd_linux_device *dev)
++ahd_dump_device_state(struct info_str *info, struct aic_linux_device *dev)
+ {
+ 	copy_info(info, "\tChannel %c Target %d Lun %d Settings\n",
+ 		  dev->target->channel + 'A', dev->target->target, dev->lun);
+@@ -278,8 +278,13 @@ done:
+  * Return information to handle /proc support for the driver.
+  */
+ int
+-ahd_linux_proc_info(struct Scsi_Host *shost, char *buffer, char **start, off_t offset,
+-		  int length, int inout)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
++ahd_linux_proc_info(char *buffer, char **start, off_t offset,
++		    int length, int hostno, int inout)
++#else
++ahd_linux_proc_info(struct Scsi_Host *shost, char *buffer, char **start,
++		    off_t offset, int length, int inout)
++#endif
+ {
+ 	struct	ahd_softc *ahd;
+ 	struct	info_str info;
+@@ -291,10 +296,14 @@ ahd_linux_proc_info(struct Scsi_Host *sh
+ 
+ 	retval = -EINVAL;
+ 	ahd_list_lock(&l);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ 	TAILQ_FOREACH(ahd, &ahd_tailq, links) {
+-		if (ahd->platform_data->host == shost)
++		if (ahd->platform_data->host->host_no == hostno)
+ 			break;
+ 	}
++#else
++	ahd = ahd_find_softc(*(struct ahd_softc **)shost->hostdata);
++#endif
+ 
+ 	if (ahd == NULL)
+ 		goto done;
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic79xx.reg	2003-06-14 12:18:34.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aic79xx.reg	2003-12-28 23:21:39.000000000 -0800
+@@ -39,7 +39,7 @@
+  *
+  * $FreeBSD$
+  */
+-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
+@@ -1377,7 +1377,10 @@ register LUNLEN {
+ 	address			0x030
+ 	access_mode	RW
+ 	modes		M_CFG
++	mask		ILUNLEN	0x0F
++	mask		TLUNLEN	0xF0
+ }
++const LUNLEN_SINGLE_LEVEL_LUN 0xF
+ 
+ /*
+  * CDB Limit
+@@ -3797,32 +3800,8 @@ scb {
+ 		size	4
+ 		alias	SCB_NEXT_COMPLETE
+ 	}
+-	SCB_DATAPTR {
+-		size	8
+-	}
+-	SCB_DATACNT {
+-		/*
+-		 * The last byte is really the high address bits for
+-		 * the data address.
+-		 */
+-		size	4
+-		field	SG_LAST_SEG		0x80	/* In the fourth byte */
+-		field	SG_HIGH_ADDR_BITS	0x7F	/* In the fourth byte */
+-	}
+-	SCB_SGPTR {
+-		size	4
+-		field	SG_STATUS_VALID	0x04	/* In the first byte */
+-		field	SG_FULL_RESID	0x02	/* In the first byte */
+-		field	SG_LIST_NULL	0x01	/* In the first byte */
+-	}
+-	SCB_BUSADDR {
+-		size	4
+-	}
+-	SCB_NEXT {
+-		alias	SCB_NEXT_SCB_BUSADDR
+-		size	2
+-	}
+-	SCB_NEXT2 {
++	SCB_TAG {
++		alias	SCB_FIFO_USE_COUNT
+ 		size	2
+ 	}
+ 	SCB_CONTROL {
+@@ -3859,8 +3838,32 @@ scb {
+ 	SCB_TASK_MANAGEMENT {
+ 		size	1
+ 	}
+-	SCB_TAG {
+-		alias	SCB_FIFO_USE_COUNT
++	SCB_DATAPTR {
++		size	8
++	}
++	SCB_DATACNT {
++		/*
++		 * The last byte is really the high address bits for
++		 * the data address.
++		 */
++		size	4
++		field	SG_LAST_SEG		0x80	/* In the fourth byte */
++		field	SG_HIGH_ADDR_BITS	0x7F	/* In the fourth byte */
++	}
++	SCB_SGPTR {
++		size	4
++		field	SG_STATUS_VALID	0x04	/* In the first byte */
++		field	SG_FULL_RESID	0x02	/* In the first byte */
++		field	SG_LIST_NULL	0x01	/* In the first byte */
++	}
++	SCB_BUSADDR {
++		size	4
++	}
++	SCB_NEXT {
++		alias	SCB_NEXT_SCB_BUSADDR
++		size	2
++	}
++	SCB_NEXT2 {
+ 		size	2
+ 	}
+ 	SCB_SPARE {
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic79xx_reg.h_shipped	2003-06-14 12:18:51.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aic79xx_reg.h_shipped	2003-12-28 23:21:39.000000000 -0800
+@@ -2,8 +2,8 @@
+  * DO NOT EDIT - This file is automatically generated
+  *		 from the following source files:
+  *
+- * $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 {
+@@ -2239,94 +2239,94 @@ ahd_reg_print_t ahd_scb_sense_busaddr_pr
+ #endif
+ 
+ #if AIC_DEBUG_REGISTERS
+-ahd_reg_print_t ahd_scb_dataptr_print;
++ahd_reg_print_t ahd_scb_tag_print;
+ #else
+-#define ahd_scb_dataptr_print(regvalue, cur_col, wrap) \
+-    ahd_print_register(NULL, 0, "SCB_DATAPTR", 0x190, regvalue, cur_col, wrap)
++#define ahd_scb_tag_print(regvalue, cur_col, wrap) \
++    ahd_print_register(NULL, 0, "SCB_TAG", 0x190, regvalue, cur_col, wrap)
+ #endif
+ 
+ #if AIC_DEBUG_REGISTERS
+-ahd_reg_print_t ahd_scb_datacnt_print;
++ahd_reg_print_t ahd_scb_control_print;
+ #else
+-#define ahd_scb_datacnt_print(regvalue, cur_col, wrap) \
+-    ahd_print_register(NULL, 0, "SCB_DATACNT", 0x198, regvalue, cur_col, wrap)
++#define ahd_scb_control_print(regvalue, cur_col, wrap) \
++    ahd_print_register(NULL, 0, "SCB_CONTROL", 0x192, regvalue, cur_col, wrap)
+ #endif
+ 
+ #if AIC_DEBUG_REGISTERS
+-ahd_reg_print_t ahd_scb_sgptr_print;
++ahd_reg_print_t ahd_scb_scsiid_print;
+ #else
+-#define ahd_scb_sgptr_print(regvalue, cur_col, wrap) \
+-    ahd_print_register(NULL, 0, "SCB_SGPTR", 0x19c, regvalue, cur_col, wrap)
++#define ahd_scb_scsiid_print(regvalue, cur_col, wrap) \
++    ahd_print_register(NULL, 0, "SCB_SCSIID", 0x193, regvalue, cur_col, wrap)
+ #endif
+ 
+ #if AIC_DEBUG_REGISTERS
+-ahd_reg_print_t ahd_scb_busaddr_print;
++ahd_reg_print_t ahd_scb_lun_print;
+ #else
+-#define ahd_scb_busaddr_print(regvalue, cur_col, wrap) \
+-    ahd_print_register(NULL, 0, "SCB_BUSADDR", 0x1a0, regvalue, cur_col, wrap)
++#define ahd_scb_lun_print(regvalue, cur_col, wrap) \
++    ahd_print_register(NULL, 0, "SCB_LUN", 0x194, regvalue, cur_col, wrap)
+ #endif
+ 
+ #if AIC_DEBUG_REGISTERS
+-ahd_reg_print_t ahd_scb_next_print;
++ahd_reg_print_t ahd_scb_task_attribute_print;
+ #else
+-#define ahd_scb_next_print(regvalue, cur_col, wrap) \
+-    ahd_print_register(NULL, 0, "SCB_NEXT", 0x1a4, regvalue, cur_col, wrap)
++#define ahd_scb_task_attribute_print(regvalue, cur_col, wrap) \
++    ahd_print_register(NULL, 0, "SCB_TASK_ATTRIBUTE", 0x195, regvalue, cur_col, wrap)
+ #endif
+ 
+ #if AIC_DEBUG_REGISTERS
+-ahd_reg_print_t ahd_scb_next2_print;
++ahd_reg_print_t ahd_scb_cdb_len_print;
+ #else
+-#define ahd_scb_next2_print(regvalue, cur_col, wrap) \
+-    ahd_print_register(NULL, 0, "SCB_NEXT2", 0x1a6, regvalue, cur_col, wrap)
++#define ahd_scb_cdb_len_print(regvalue, cur_col, wrap) \
++    ahd_print_register(NULL, 0, "SCB_CDB_LEN", 0x196, regvalue, cur_col, wrap)
+ #endif
+ 
+ #if AIC_DEBUG_REGISTERS
+-ahd_reg_print_t ahd_scb_control_print;
++ahd_reg_print_t ahd_scb_task_management_print;
+ #else
+-#define ahd_scb_control_print(regvalue, cur_col, wrap) \
+-    ahd_print_register(NULL, 0, "SCB_CONTROL", 0x1a8, regvalue, cur_col, wrap)
++#define ahd_scb_task_management_print(regvalue, cur_col, wrap) \
++    ahd_print_register(NULL, 0, "SCB_TASK_MANAGEMENT", 0x197, regvalue, cur_col, wrap)
+ #endif
+ 
+ #if AIC_DEBUG_REGISTERS
+-ahd_reg_print_t ahd_scb_scsiid_print;
++ahd_reg_print_t ahd_scb_dataptr_print;
+ #else
+-#define ahd_scb_scsiid_print(regvalue, cur_col, wrap) \
+-    ahd_print_register(NULL, 0, "SCB_SCSIID", 0x1a9, regvalue, cur_col, wrap)
++#define ahd_scb_dataptr_print(regvalue, cur_col, wrap) \
++    ahd_print_register(NULL, 0, "SCB_DATAPTR", 0x198, regvalue, cur_col, wrap)
+ #endif
+ 
+ #if AIC_DEBUG_REGISTERS
+-ahd_reg_print_t ahd_scb_lun_print;
++ahd_reg_print_t ahd_scb_datacnt_print;
+ #else
+-#define ahd_scb_lun_print(regvalue, cur_col, wrap) \
+-    ahd_print_register(NULL, 0, "SCB_LUN", 0x1aa, regvalue, cur_col, wrap)
++#define ahd_scb_datacnt_print(regvalue, cur_col, wrap) \
++    ahd_print_register(NULL, 0, "SCB_DATACNT", 0x1a0, regvalue, cur_col, wrap)
+ #endif
+ 
+ #if AIC_DEBUG_REGISTERS
+-ahd_reg_print_t ahd_scb_task_attribute_print;
++ahd_reg_print_t ahd_scb_sgptr_print;
+ #else
+-#define ahd_scb_task_attribute_print(regvalue, cur_col, wrap) \
+-    ahd_print_register(NULL, 0, "SCB_TASK_ATTRIBUTE", 0x1ab, regvalue, cur_col, wrap)
++#define ahd_scb_sgptr_print(regvalue, cur_col, wrap) \
++    ahd_print_register(NULL, 0, "SCB_SGPTR", 0x1a4, regvalue, cur_col, wrap)
+ #endif
+ 
+ #if AIC_DEBUG_REGISTERS
+-ahd_reg_print_t ahd_scb_cdb_len_print;
++ahd_reg_print_t ahd_scb_busaddr_print;
+ #else
+-#define ahd_scb_cdb_len_print(regvalue, cur_col, wrap) \
+-    ahd_print_register(NULL, 0, "SCB_CDB_LEN", 0x1ac, regvalue, cur_col, wrap)
++#define ahd_scb_busaddr_print(regvalue, cur_col, wrap) \
++    ahd_print_register(NULL, 0, "SCB_BUSADDR", 0x1a8, regvalue, cur_col, wrap)
+ #endif
+ 
+ #if AIC_DEBUG_REGISTERS
+-ahd_reg_print_t ahd_scb_task_management_print;
++ahd_reg_print_t ahd_scb_next_print;
+ #else
+-#define ahd_scb_task_management_print(regvalue, cur_col, wrap) \
+-    ahd_print_register(NULL, 0, "SCB_TASK_MANAGEMENT", 0x1ad, regvalue, cur_col, wrap)
++#define ahd_scb_next_print(regvalue, cur_col, wrap) \
++    ahd_print_register(NULL, 0, "SCB_NEXT", 0x1ac, regvalue, cur_col, wrap)
+ #endif
+ 
+ #if AIC_DEBUG_REGISTERS
+-ahd_reg_print_t ahd_scb_tag_print;
++ahd_reg_print_t ahd_scb_next2_print;
+ #else
+-#define ahd_scb_tag_print(regvalue, cur_col, wrap) \
+-    ahd_print_register(NULL, 0, "SCB_TAG", 0x1ae, regvalue, cur_col, wrap)
++#define ahd_scb_next2_print(regvalue, cur_col, wrap) \
++    ahd_print_register(NULL, 0, "SCB_NEXT2", 0x1ae, regvalue, cur_col, wrap)
+ #endif
+ 
+ #if AIC_DEBUG_REGISTERS
+@@ -2557,6 +2557,8 @@ ahd_reg_print_t ahd_scb_disconnected_lis
+ #define	SHORTTHRESH     		0x2f
+ 
+ #define	LUNLEN          		0x30
++#define		TLUNLEN         	0xf0
++#define		ILUNLEN         	0x0f
+ 
+ #define	CDBLIMIT        		0x31
+ 
+@@ -3648,25 +3650,10 @@ ahd_reg_print_t ahd_scb_disconnected_lis
+ #define	SCB_SENSE_BUSADDR		0x18c
+ #define	SCB_NEXT_COMPLETE		0x18c
+ 
+-#define	SCB_DATAPTR     		0x190
+-
+-#define	SCB_DATACNT     		0x198
+-#define		SG_LAST_SEG     	0x80
+-#define		SG_HIGH_ADDR_BITS	0x7f
+-
+-#define	SCB_SGPTR       		0x19c
+-#define		SG_STATUS_VALID 	0x04
+-#define		SG_FULL_RESID   	0x02
+-#define		SG_LIST_NULL    	0x01
++#define	SCB_TAG         		0x190
++#define	SCB_FIFO_USE_COUNT		0x190
+ 
+-#define	SCB_BUSADDR     		0x1a0
+-
+-#define	SCB_NEXT        		0x1a4
+-#define	SCB_NEXT_SCB_BUSADDR		0x1a4
+-
+-#define	SCB_NEXT2       		0x1a6
+-
+-#define	SCB_CONTROL     		0x1a8
++#define	SCB_CONTROL     		0x192
+ #define		TARGET_SCB      	0x80
+ #define		DISCENB         	0x40
+ #define		TAG_ENB         	0x20
+@@ -3675,23 +3662,38 @@ ahd_reg_print_t ahd_scb_disconnected_lis
+ #define		DISCONNECTED    	0x04
+ #define		SCB_TAG_TYPE    	0x03
+ 
+-#define	SCB_SCSIID      		0x1a9
++#define	SCB_SCSIID      		0x193
+ #define		TID             	0xf0
+ #define		OID             	0x0f
+ 
+-#define	SCB_LUN         		0x1aa
++#define	SCB_LUN         		0x194
+ #define		LID             	0xff
+ 
+-#define	SCB_TASK_ATTRIBUTE		0x1ab
++#define	SCB_TASK_ATTRIBUTE		0x195
+ #define		SCB_XFERLEN_ODD 	0x01
+ 
+-#define	SCB_CDB_LEN     		0x1ac
++#define	SCB_CDB_LEN     		0x196
+ #define		SCB_CDB_LEN_PTR 	0x80
+ 
+-#define	SCB_TASK_MANAGEMENT		0x1ad
++#define	SCB_TASK_MANAGEMENT		0x197
++
++#define	SCB_DATAPTR     		0x198
++
++#define	SCB_DATACNT     		0x1a0
++#define		SG_LAST_SEG     	0x80
++#define		SG_HIGH_ADDR_BITS	0x7f
++
++#define	SCB_SGPTR       		0x1a4
++#define		SG_STATUS_VALID 	0x04
++#define		SG_FULL_RESID   	0x02
++#define		SG_LIST_NULL    	0x01
++
++#define	SCB_BUSADDR     		0x1a8
++
++#define	SCB_NEXT        		0x1ac
++#define	SCB_NEXT_SCB_BUSADDR		0x1ac
+ 
+-#define	SCB_TAG         		0x1ae
+-#define	SCB_FIFO_USE_COUNT		0x1ae
++#define	SCB_NEXT2       		0x1ae
+ 
+ #define	SCB_SPARE       		0x1b0
+ #define	SCB_PKT_LUN     		0x1b0
+@@ -3720,6 +3722,7 @@ ahd_reg_print_t ahd_scb_disconnected_lis
+ #define	AHD_PRECOMP_CUTBACK_29	0x06
+ #define	AHD_NUM_PER_DEV_ANNEXCOLS	0x04
+ #define	B_CURRFIFO_0	0x02
++#define	LUNLEN_SINGLE_LEVEL_LUN	0x0f
+ #define	NVRAM_SCB_OFFSET	0x2c
+ #define	AHD_TIMER_MAX_US	0x18ffe7
+ #define	AHD_TIMER_MAX_TICKS	0xffff
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic79xx_reg_print.c_shipped	2003-06-14 12:17:56.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aic79xx_reg_print.c_shipped	2003-12-28 23:21:39.000000000 -0800
+@@ -2,8 +2,8 @@
+  * DO NOT EDIT - This file is automatically generated
+  *		 from the following source files:
+  *
+- * $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"
+@@ -489,10 +489,15 @@ ahd_shortthresh_print(u_int regvalue, u_
+ 	    0x2f, regvalue, cur_col, wrap));
+ }
+ 
++static ahd_reg_parse_entry_t LUNLEN_parse_table[] = {
++	{ "ILUNLEN",		0x0f, 0x0f },
++	{ "TLUNLEN",		0xf0, 0xf0 }
++};
++
+ int
+ ahd_lunlen_print(u_int regvalue, u_int *cur_col, u_int wrap)
+ {
+-	return (ahd_print_register(NULL, 0, "LUNLEN",
++	return (ahd_print_register(LUNLEN_parse_table, 2, "LUNLEN",
+ 	    0x30, regvalue, cur_col, wrap));
+ }
+ 
+@@ -3486,58 +3491,12 @@ ahd_scb_sense_busaddr_print(u_int regval
+ }
+ 
+ int
+-ahd_scb_dataptr_print(u_int regvalue, u_int *cur_col, u_int wrap)
++ahd_scb_tag_print(u_int regvalue, u_int *cur_col, u_int wrap)
+ {
+-	return (ahd_print_register(NULL, 0, "SCB_DATAPTR",
++	return (ahd_print_register(NULL, 0, "SCB_TAG",
+ 	    0x190, regvalue, cur_col, wrap));
+ }
+ 
+-static ahd_reg_parse_entry_t SCB_DATACNT_parse_table[] = {
+-	{ "SG_HIGH_ADDR_BITS",	0x7f, 0x7f },
+-	{ "SG_LAST_SEG",	0x80, 0x80 }
+-};
+-
+-int
+-ahd_scb_datacnt_print(u_int regvalue, u_int *cur_col, u_int wrap)
+-{
+-	return (ahd_print_register(SCB_DATACNT_parse_table, 2, "SCB_DATACNT",
+-	    0x198, regvalue, cur_col, wrap));
+-}
+-
+-static ahd_reg_parse_entry_t SCB_SGPTR_parse_table[] = {
+-	{ "SG_LIST_NULL",	0x01, 0x01 },
+-	{ "SG_FULL_RESID",	0x02, 0x02 },
+-	{ "SG_STATUS_VALID",	0x04, 0x04 }
+-};
+-
+-int
+-ahd_scb_sgptr_print(u_int regvalue, u_int *cur_col, u_int wrap)
+-{
+-	return (ahd_print_register(SCB_SGPTR_parse_table, 3, "SCB_SGPTR",
+-	    0x19c, regvalue, cur_col, wrap));
+-}
+-
+-int
+-ahd_scb_busaddr_print(u_int regvalue, u_int *cur_col, u_int wrap)
+-{
+-	return (ahd_print_register(NULL, 0, "SCB_BUSADDR",
+-	    0x1a0, regvalue, cur_col, wrap));
+-}
+-
+-int
+-ahd_scb_next_print(u_int regvalue, u_int *cur_col, u_int wrap)
+-{
+-	return (ahd_print_register(NULL, 0, "SCB_NEXT",
+-	    0x1a4, regvalue, cur_col, wrap));
+-}
+-
+-int
+-ahd_scb_next2_print(u_int regvalue, u_int *cur_col, u_int wrap)
+-{
+-	return (ahd_print_register(NULL, 0, "SCB_NEXT2",
+-	    0x1a6, regvalue, cur_col, wrap));
+-}
+-
+ static ahd_reg_parse_entry_t SCB_CONTROL_parse_table[] = {
+ 	{ "SCB_TAG_TYPE",	0x03, 0x03 },
+ 	{ "DISCONNECTED",	0x04, 0x04 },
+@@ -3552,7 +3511,7 @@ int
+ ahd_scb_control_print(u_int regvalue, u_int *cur_col, u_int wrap)
+ {
+ 	return (ahd_print_register(SCB_CONTROL_parse_table, 7, "SCB_CONTROL",
+-	    0x1a8, regvalue, cur_col, wrap));
++	    0x192, regvalue, cur_col, wrap));
+ }
+ 
+ static ahd_reg_parse_entry_t SCB_SCSIID_parse_table[] = {
+@@ -3564,7 +3523,7 @@ int
+ ahd_scb_scsiid_print(u_int regvalue, u_int *cur_col, u_int wrap)
+ {
+ 	return (ahd_print_register(SCB_SCSIID_parse_table, 2, "SCB_SCSIID",
+-	    0x1a9, regvalue, cur_col, wrap));
++	    0x193, regvalue, cur_col, wrap));
+ }
+ 
+ static ahd_reg_parse_entry_t SCB_LUN_parse_table[] = {
+@@ -3575,14 +3534,18 @@ int
+ ahd_scb_lun_print(u_int regvalue, u_int *cur_col, u_int wrap)
+ {
+ 	return (ahd_print_register(SCB_LUN_parse_table, 1, "SCB_LUN",
+-	    0x1aa, regvalue, cur_col, wrap));
++	    0x194, regvalue, cur_col, wrap));
+ }
+ 
++static ahd_reg_parse_entry_t SCB_TASK_ATTRIBUTE_parse_table[] = {
++	{ "SCB_XFERLEN_ODD",	0x01, 0x01 }
++};
++
+ int
+ ahd_scb_task_attribute_print(u_int regvalue, u_int *cur_col, u_int wrap)
+ {
+-	return (ahd_print_register(NULL, 0, "SCB_TASK_ATTRIBUTE",
+-	    0x1ab, regvalue, cur_col, wrap));
++	return (ahd_print_register(SCB_TASK_ATTRIBUTE_parse_table, 1, "SCB_TASK_ATTRIBUTE",
++	    0x195, regvalue, cur_col, wrap));
+ }
+ 
+ static ahd_reg_parse_entry_t SCB_CDB_LEN_parse_table[] = {
+@@ -3593,20 +3556,66 @@ int
+ ahd_scb_cdb_len_print(u_int regvalue, u_int *cur_col, u_int wrap)
+ {
+ 	return (ahd_print_register(SCB_CDB_LEN_parse_table, 1, "SCB_CDB_LEN",
+-	    0x1ac, regvalue, cur_col, wrap));
++	    0x196, regvalue, cur_col, wrap));
+ }
+ 
+ int
+ ahd_scb_task_management_print(u_int regvalue, u_int *cur_col, u_int wrap)
+ {
+ 	return (ahd_print_register(NULL, 0, "SCB_TASK_MANAGEMENT",
+-	    0x1ad, regvalue, cur_col, wrap));
++	    0x197, regvalue, cur_col, wrap));
+ }
+ 
+ int
+-ahd_scb_tag_print(u_int regvalue, u_int *cur_col, u_int wrap)
++ahd_scb_dataptr_print(u_int regvalue, u_int *cur_col, u_int wrap)
+ {
+-	return (ahd_print_register(NULL, 0, "SCB_TAG",
++	return (ahd_print_register(NULL, 0, "SCB_DATAPTR",
++	    0x198, regvalue, cur_col, wrap));
++}
++
++static ahd_reg_parse_entry_t SCB_DATACNT_parse_table[] = {
++	{ "SG_HIGH_ADDR_BITS",	0x7f, 0x7f },
++	{ "SG_LAST_SEG",	0x80, 0x80 }
++};
++
++int
++ahd_scb_datacnt_print(u_int regvalue, u_int *cur_col, u_int wrap)
++{
++	return (ahd_print_register(SCB_DATACNT_parse_table, 2, "SCB_DATACNT",
++	    0x1a0, regvalue, cur_col, wrap));
++}
++
++static ahd_reg_parse_entry_t SCB_SGPTR_parse_table[] = {
++	{ "SG_LIST_NULL",	0x01, 0x01 },
++	{ "SG_FULL_RESID",	0x02, 0x02 },
++	{ "SG_STATUS_VALID",	0x04, 0x04 }
++};
++
++int
++ahd_scb_sgptr_print(u_int regvalue, u_int *cur_col, u_int wrap)
++{
++	return (ahd_print_register(SCB_SGPTR_parse_table, 3, "SCB_SGPTR",
++	    0x1a4, regvalue, cur_col, wrap));
++}
++
++int
++ahd_scb_busaddr_print(u_int regvalue, u_int *cur_col, u_int wrap)
++{
++	return (ahd_print_register(NULL, 0, "SCB_BUSADDR",
++	    0x1a8, regvalue, cur_col, wrap));
++}
++
++int
++ahd_scb_next_print(u_int regvalue, u_int *cur_col, u_int wrap)
++{
++	return (ahd_print_register(NULL, 0, "SCB_NEXT",
++	    0x1ac, regvalue, cur_col, wrap));
++}
++
++int
++ahd_scb_next2_print(u_int regvalue, u_int *cur_col, u_int wrap)
++{
++	return (ahd_print_register(NULL, 0, "SCB_NEXT2",
+ 	    0x1ae, regvalue, cur_col, wrap));
+ }
+ 
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic79xx.seq	2003-06-14 12:18:30.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aic79xx.seq	2003-12-28 23:21:39.000000000 -0800
+@@ -40,7 +40,7 @@
+  * $FreeBSD$
+  */
+ 
+-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_"
+ 
+@@ -90,6 +90,13 @@ idle_loop_check_nonpackreq:
+ 	test	SSTAT2, NONPACKREQ jz . + 2;
+ 	call	unexpected_nonpkt_phase_find_ctxt;
+ 	if ((ahd->bugs & AHD_FAINT_LED_BUG) != 0) {
++		/*
++		 * On Rev A. hardware, the busy LED is only
++		 * turned on automaically during selections
++		 * and re-selections.  Make the LED status
++		 * more useful by forcing it to be on so
++		 * long as one of our data FIFOs is active.
++		 */
+ 		and	A, FIFO0FREE|FIFO1FREE, DFFSTAT;
+ 		cmp	A, FIFO0FREE|FIFO1FREE jne . + 3;
+ 		and	SBLKCTL, ~DIAGLEDEN|DIAGLEDON;
+@@ -101,9 +108,9 @@ idle_loop_check_nonpackreq:
+ 	call	idle_loop_cchan;
+ 	jmp	idle_loop;
+ 
+-BEGIN_CRITICAL;
+ idle_loop_gsfifo:
+ 	SET_MODE(M_SCSI, M_SCSI)
++BEGIN_CRITICAL;
+ idle_loop_gsfifo_in_scsi_mode:
+ 	test	LQISTAT2, LQIGSAVAIL jz return;
+ 	/*
+@@ -152,25 +159,28 @@ END_CRITICAL;
+ 
+ idle_loop_service_fifos:
+ 	SET_MODE(M_DFF0, M_DFF0)
++BEGIN_CRITICAL;
+ 	test	LONGJMP_ADDR[1], INVALID_ADDR jnz idle_loop_next_fifo;
+ 	call	longjmp;
++END_CRITICAL;
+ idle_loop_next_fifo:
+ 	SET_MODE(M_DFF1, M_DFF1)
++BEGIN_CRITICAL;
+ 	test	LONGJMP_ADDR[1], INVALID_ADDR jz longjmp;
++END_CRITICAL;
+ return:
+ 	ret;
+ 
+ idle_loop_cchan:
+ 	SET_MODE(M_CCHAN, M_CCHAN)
+ 	test	QOFF_CTLSTA, HS_MAILBOX_ACT jz	hs_mailbox_empty;
+-	mov	LOCAL_HS_MAILBOX, HS_MAILBOX;
+ 	or	QOFF_CTLSTA, HS_MAILBOX_ACT;
++	mov	LOCAL_HS_MAILBOX, HS_MAILBOX;
+ hs_mailbox_empty:
+ BEGIN_CRITICAL;
+ 	test	CCSCBCTL, CCARREN|CCSCBEN jz scbdma_idle;
+ 	test	CCSCBCTL, CCSCBDIR jnz fetch_new_scb_inprog;
+ 	test	CCSCBCTL, CCSCBDONE jz return;
+-END_CRITICAL;
+ 	/* FALLTHROUGH */
+ scbdma_tohost_done:
+ 	test	CCSCBCTL, CCARREN jz fill_qoutfifo_dmadone;
+@@ -180,26 +190,18 @@ scbdma_tohost_done:
+ 	 * bad SCSI status (currently only for underruns), we
+ 	 * queue the SCB for normal completion.  Otherwise, we
+ 	 * wait until any select-out activity has halted, and
+-	 * then notify the host so that the transaction can be
+-	 * dealt with.
++	 * then queue the completion.
+ 	 */
+-	test	SCB_SCSI_STATUS, 0xff jnz scbdma_notify_host;
+-	and	CCSCBCTL, ~(CCARREN|CCSCBEN);
+-	bmov	COMPLETE_DMA_SCB_HEAD, SCB_NEXT_COMPLETE, 2;
+-	bmov	SCB_NEXT_COMPLETE, COMPLETE_SCB_HEAD, 2;
+-	bmov	COMPLETE_SCB_HEAD, SCBPTR, 2 ret;
+-scbdma_notify_host:
++	test	SCB_SCSI_STATUS, 0xff jz scbdma_queue_completion;
+ 	SET_MODE(M_SCSI, M_SCSI)
+ 	test	SCSISEQ0, ENSELO jnz return;
+ 	test	SSTAT0, (SELDO|SELINGO) jnz return;
+ 	SET_MODE(M_CCHAN, M_CCHAN)
+-	/*
+-	 * Remove SCB and notify host.
+-	 */
++scbdma_queue_completion:
+ 	and	CCSCBCTL, ~(CCARREN|CCSCBEN);
+ 	bmov	COMPLETE_DMA_SCB_HEAD, SCB_NEXT_COMPLETE, 2;
+-	SET_SEQINTCODE(BAD_SCB_STATUS)
+-	ret;
++	bmov	SCB_NEXT_COMPLETE, COMPLETE_SCB_HEAD, 2;
++	bmov	COMPLETE_SCB_HEAD, SCBPTR, 2 ret;
+ fill_qoutfifo_dmadone:
+ 	and	CCSCBCTL, ~(CCARREN|CCSCBEN);
+ 	call	qoutfifo_updated;
+@@ -208,6 +210,7 @@ fill_qoutfifo_dmadone:
+ 	test	QOFF_CTLSTA, SDSCB_ROLLOVR jz return;
+ 	bmov	QOUTFIFO_NEXT_ADDR, SHARED_DATA_ADDR, 4;
+ 	xor	QOUTFIFO_ENTRY_VALID_TAG, QOUTFIFO_ENTRY_VALID_TOGGLE ret;
++END_CRITICAL;
+ 
+ qoutfifo_updated:
+ 	/*
+@@ -276,7 +279,7 @@ fetch_new_scb_done:
+ 	 * knows the correct location to store the SCB.
+ 	 * Set it to zero before processing the SCB.
+ 	 */
+-	mov	SCB_FIFO_USE_COUNT, ALLZEROS;
++	clr	SCB_FIFO_USE_COUNT;
+ 	/* Update the next SCB address to download. */
+ 	bmov	NEXT_QUEUED_SCB_ADDR, SCB_NEXT_SCB_BUSADDR, 4;
+ 	mvi	SCB_NEXT[1], SCB_LIST_NULL;
+@@ -490,14 +493,30 @@ allocate_fifo1:
+ SET_SRC_MODE	M_SCSI;
+ SET_DST_MODE	M_SCSI;
+ select_in:
++	if ((ahd->bugs & AHD_FAINT_LED_BUG) != 0) {
++		/*
++		 * On Rev A. hardware, the busy LED is only
++		 * turned on automaically during selections
++		 * and re-selections.  Make the LED status
++		 * more useful by forcing it to be on from
++		 * the point of selection until our idle
++		 * loop determines that neither of our FIFOs
++		 * are busy.  This handles the non-packetized
++		 * case nicely as we will not return to the
++		 * idle loop until the busfree at the end of
++		 * each transaction.
++		 */
++		or	SBLKCTL, DIAGLEDEN|DIAGLEDON;
++	}
+ 	if ((ahd->bugs & AHD_BUSFREEREV_BUG) != 0) {
+ 		/*
+-		 * This exposes a window whereby a
+-		 * busfree just after a selection will
+-		 * be missed, but there is no other safe
+-		 * way to enable busfree detection if
+-		 * the busfreerev function is broken.
++		 * Test to ensure that the bus has not
++		 * already gone free prior to clearing
++		 * any stale busfree status.  This avoids
++		 * a window whereby a busfree just after
++		 * a selection could be missed.
+ 		 */
++		test	SCSISIGI, BSYI jz . + 2;
+ 		mvi	CLRSINT1,CLRBUSFREE;
+ 		or	SIMODE1, ENBUSFREE;
+ 	}
+@@ -527,6 +546,21 @@ SET_SRC_MODE	M_SCSI;
+ SET_DST_MODE	M_SCSI;
+ select_out:
+ BEGIN_CRITICAL;
++	if ((ahd->bugs & AHD_FAINT_LED_BUG) != 0) {
++		/*
++		 * On Rev A. hardware, the busy LED is only
++		 * turned on automaically during selections
++		 * and re-selections.  Make the LED status
++		 * more useful by forcing it to be on from
++		 * the point of re-selection until our idle
++		 * loop determines that neither of our FIFOs
++		 * are busy.  This handles the non-packetized
++		 * case nicely as we will not return to the
++		 * idle loop until the busfree at the end of
++		 * each transaction.
++		 */
++		or	SBLKCTL, DIAGLEDEN|DIAGLEDON;
++	}
+ 	/* Clear out all SCBs that have been successfully sent. */
+ 	if ((ahd->bugs & AHD_SENT_SCB_UPDATE_BUG) != 0) {
+ 		/*
+@@ -582,9 +616,6 @@ found_last_sent_scb:
+ 		bmov	CURRSCB, SCBPTR, 2;
+ curscb_ww_done:
+ 	} else {
+-		/*
+-		 * Untested - Verify with Rev B.
+-		 */
+ 		bmov	SCBPTR, CURRSCB, 2;
+ 	}
+ 
+@@ -651,12 +682,13 @@ select_out_non_packetized:
+ 	and     SCSISEQ0, ~ENSELO;
+ 	if ((ahd->bugs & AHD_BUSFREEREV_BUG) != 0) {
+ 		/*
+-		 * This exposes a window whereby a
+-		 * busfree just after a selection will
+-		 * be missed, but there is no other safe
+-		 * way to enable busfree detection if
+-		 * the busfreerev function is broken.
++		 * Test to ensure that the bus has not
++		 * already gone free prior to clearing
++		 * any stale busfree status.  This avoids
++		 * a window whereby a busfree just after
++		 * a selection could be missed.
+ 		 */
++		test	SCSISIGI, BSYI jz . + 2;
+ 		mvi	CLRSINT1,CLRBUSFREE;
+ 		or	SIMODE1, ENBUSFREE;
+ 	}
+@@ -729,13 +761,38 @@ p_command_embedded:
+ 	mvi	DFCNTRL, SCSIEN;
+ p_command_xfer:
+ 	and	SEQ_FLAGS, ~NO_CDB_SENT;
+-	test	DFCNTRL, SCSIEN jnz .;
++	if ((ahd->features & AHD_FAST_CDB_DELIVERY) != 0) {
++		/*
++		 * To speed up CDB delivery in Rev B, all CDB acks
++		 * are "released" to the output sync as soon as the
++		 * command phase starts.  There is only one problem
++		 * with this approach.  If the target changes phase
++		 * before all data are sent, we have left over acks
++		 * that can go out on the bus in a data phase.  Due
++		 * to other chip contraints, this only happens if
++		 * the target goes to data-in, but if the acks go
++		 * out before we can test SDONE, we'll think that
++		 * the transfer has completed successfully.  Work
++		 * around this by taking advantage of the 400ns or
++		 * 800ns dead time between command phase and the REQ
++		 * of the new phase.  If the transfer has completed
++		 * successfully, SCSIEN should fall *long* before we
++		 * see a phase change.  We thus treat any phasemiss
++		 * that occurs before SCSIEN falls as an incomplete
++		 * transfer.
++		 */
++		test	SSTAT1, PHASEMIS jnz p_command_xfer_failed;
++		test	DFCNTRL, SCSIEN jnz . - 1;
++	} else {
++		test	DFCNTRL, SCSIEN jnz .;
++	}
+ 	/*
+ 	 * DMA Channel automatically disabled.
+ 	 * Don't allow a data phase if the command
+ 	 * was not fully transferred.
+ 	 */
+ 	test	SSTAT2, SDONE jnz ITloop;
++p_command_xfer_failed:
+ 	or	SEQ_FLAGS, NO_CDB_SENT;
+ 	jmp	ITloop;
+ 
+@@ -1061,8 +1118,10 @@ queue_scb_completion:
+ 	test	SCB_SGPTR, SG_FULL_RESID jnz upload_scb;/* Never xfered */
+ 	test	SCB_RESIDUAL_SGPTR, SG_LIST_NULL jz upload_scb;
+ complete:
++BEGIN_CRITICAL;
+ 	bmov	SCB_NEXT_COMPLETE, COMPLETE_SCB_HEAD, 2;
+ 	bmov	COMPLETE_SCB_HEAD, SCBPTR, 2 ret;
++END_CRITICAL;
+ bad_status:
+ 	cmp	SCB_SCSI_STATUS, STATUS_PKT_SENSE je upload_scb;
+ 	call	freeze_queue;
+@@ -1073,9 +1132,11 @@ upload_scb:
+ 	 * it on the host.
+ 	 */
+ 	bmov	SCB_TAG, SCBPTR, 2;
++BEGIN_CRITICAL;
+ 	bmov	SCB_NEXT_COMPLETE, COMPLETE_DMA_SCB_HEAD, 2;
+ 	bmov	COMPLETE_DMA_SCB_HEAD, SCBPTR, 2;
+ 	or	SCB_SGPTR, SG_STATUS_VALID ret;
++END_CRITICAL;
+ 
+ /*
+  * Is it a disconnect message?  Set a flag in the SCB to remind us
+@@ -1122,8 +1183,18 @@ SET_DST_MODE	M_DFF1;
+ await_busfree_clrchn:
+ 	mvi	DFFSXFRCTL, CLRCHN;
+ await_busfree_not_m_dff:
+-	call	clear_target_state;
++	/* clear target specific flags */
++	mvi	SEQ_FLAGS, NOT_IDENTIFIED|NO_CDB_SENT;
+ 	test	SSTAT1,REQINIT|BUSFREE	jz .;
++	/*
++	 * We only set BUSFREE status once either a new
++	 * phase has been detected or we are really
++	 * BUSFREE.  This allows the driver to know
++	 * that we are active on the bus even though
++	 * no identified transaction exists should a
++	 * timeout occur while awaiting busfree.
++	 */
++	mvi	LASTPHASE, P_BUSFREE;
+ 	test	SSTAT1, BUSFREE jnz idle_loop;
+ 	SET_SEQINTCODE(MISSED_BUSFREE)
+ 
+@@ -1178,11 +1249,6 @@ msgin_rdptrs_get_fifo:
+ 	call	allocate_fifo;
+ 	jmp	mesgin_done;
+ 
+-clear_target_state:
+-	mvi	LASTPHASE, P_BUSFREE;
+-	/* clear target specific flags */
+-	mvi	SEQ_FLAGS, NOT_IDENTIFIED|NO_CDB_SENT ret;
+-
+ phase_lock:     
+ 	if ((ahd->bugs & AHD_EARLY_REQ_BUG) != 0) {
+ 		/*
+@@ -1634,7 +1700,7 @@ export seq_isr:
+ 		 * savepointer in the current FIFO.  We do this so that
+ 		 * a pending CTXTDONE or SAVEPTR is visible in the active
+ 		 * FIFO.  This status is the only way we can detect if we
+-		 * have lost the race (e.g. host paused us) and our attepts
++		 * have lost the race (e.g. host paused us) and our attempts
+ 		 * to disable the channel occurred after all REQs were
+ 		 * already seen and acked (REQINIT never comes true).
+ 		 */
+@@ -1643,7 +1709,7 @@ export seq_isr:
+ 		test	DFCNTRL, DIRECTION jz interrupt_return;
+ 		and	DFCNTRL, ~SCSIEN;
+ snapshot_wait_data_valid:
+-		test	SEQINTSRC, (CTXTDONE|SAVEPTRS) jnz snapshot_data_valid;
++		test	SEQINTSRC, (CTXTDONE|SAVEPTRS) jnz interrupt_return;
+ 		test	SSTAT1, REQINIT	jz snapshot_wait_data_valid;
+ snapshot_data_valid:
+ 		or	DFCNTRL, SCSIEN;
+@@ -1810,7 +1876,6 @@ pkt_saveptrs_check_status:
+ 	dec	SCB_FIFO_USE_COUNT;
+ 	test	SCB_CONTROL, STATUS_RCVD jnz pkt_complete_scb_if_fifos_idle;
+ 	mvi	DFFSXFRCTL, CLRCHN ret;
+-END_CRITICAL;
+ 
+ /*
+  * LAST_SEG_DONE status has been seen in the current FIFO.
+@@ -1819,7 +1884,6 @@ END_CRITICAL;
+  * Check for overrun and see if we can complete this command.
+  */
+ pkt_last_seg_done:
+-BEGIN_CRITICAL;
+ 	/*
+ 	 * Mark transfer as completed.
+ 	 */
+@@ -1959,12 +2023,14 @@ SET_DST_MODE	M_SCSI;
+ 	test	SSTAT0, SELDO jnz return;
+ 	mvi	SCBPTR[1], SCB_LIST_NULL;
+ unexpected_nonpkt_phase:
+-	test	MODE_PTR, ~(MK_MODE(M_DFF1, M_DFF1)) jnz . + 3;
++	test	MODE_PTR, ~(MK_MODE(M_DFF1, M_DFF1))
++		jnz unexpected_nonpkt_mode_cleared;
+ SET_SRC_MODE	M_DFF0;
+ SET_DST_MODE	M_DFF0;
+ 	or	LONGJMP_ADDR[1], INVALID_ADDR;
+ 	dec	SCB_FIFO_USE_COUNT;
+ 	mvi	DFFSXFRCTL, CLRCHN;
++unexpected_nonpkt_mode_cleared:
+ 	mvi	CLRSINT2, CLRNONPACKREQ;
+ 	test	SCSIPHASE, ~(MSG_IN_PHASE|MSG_OUT_PHASE) jnz illegal_phase;
+ 	SET_SEQINTCODE(ENTERING_NONPACK)
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic79xx_seq.h_shipped	2003-06-14 12:18:48.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aic79xx_seq.h_shipped	2003-12-28 23:21:39.000000000 -0800
+@@ -2,25 +2,25 @@
+  * DO NOT EDIT - This file is automatically generated
+  *		 from the following source files:
+  *
+- * $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,
+-	0x00, 0xea, 0x50, 0x59,
++	0x00, 0xea, 0x46, 0x59,
+ 	0x01, 0xea, 0x04, 0x30,
+ 	0xff, 0x04, 0x0c, 0x78,
+-	0x19, 0xea, 0x50, 0x59,
++	0x19, 0xea, 0x46, 0x59,
+ 	0x19, 0xea, 0x04, 0x00,
+-	0x33, 0xea, 0x44, 0x59,
++	0x33, 0xea, 0x3a, 0x59,
+ 	0x33, 0xea, 0x00, 0x00,
+ 	0x60, 0x3a, 0x1a, 0x68,
+ 	0x04, 0x47, 0x1b, 0x68,
+ 	0xff, 0x21, 0x1b, 0x70,
+-	0x40, 0x4b, 0x92, 0x69,
+-	0x00, 0xe2, 0x54, 0x59,
+-	0x40, 0x4b, 0x92, 0x69,
+-	0x20, 0x4b, 0x82, 0x69,
++	0x40, 0x4b, 0x8c, 0x69,
++	0x00, 0xe2, 0x4a, 0x59,
++	0x40, 0x4b, 0x8c, 0x69,
++	0x20, 0x4b, 0x78, 0x69,
+ 	0xfc, 0x42, 0x24, 0x78,
+ 	0x10, 0x40, 0x24, 0x78,
+ 	0x00, 0xe2, 0xc4, 0x5d,
+@@ -35,70 +35,65 @@ static uint8_t seqprog[] = {
+ 	0x00, 0xe2, 0x56, 0x58,
+ 	0x00, 0xe2, 0x66, 0x58,
+ 	0x00, 0xe2, 0x06, 0x40,
+-	0x33, 0xea, 0x44, 0x59,
++	0x33, 0xea, 0x3a, 0x59,
+ 	0x33, 0xea, 0x00, 0x00,
+ 	0x01, 0x52, 0x64, 0x78,
+ 	0x02, 0x58, 0x50, 0x31,
+ 	0xff, 0xea, 0x10, 0x0b,
+-	0xff, 0xad, 0x4f, 0x78,
++	0xff, 0x97, 0x4f, 0x78,
+ 	0x50, 0x4b, 0x4a, 0x68,
+ 	0xbf, 0x3a, 0x74, 0x08,
+-	0x14, 0xea, 0x50, 0x59,
++	0x14, 0xea, 0x46, 0x59,
+ 	0x14, 0xea, 0x04, 0x00,
+-	0x08, 0xa8, 0x51, 0x03,
+-	0xff, 0xae, 0x3f, 0x68,
+-	0x00, 0xe2, 0x56, 0x5b,
++	0x08, 0x92, 0x25, 0x03,
++	0xff, 0x90, 0x3f, 0x68,
++	0x00, 0xe2, 0x58, 0x5b,
+ 	0x00, 0xe2, 0x3e, 0x40,
+-	0x00, 0xea, 0x44, 0x59,
++	0x00, 0xea, 0x3a, 0x59,
+ 	0x01, 0xea, 0x00, 0x30,
+ 	0x80, 0xf9, 0x5e, 0x68,
+-	0x00, 0xe2, 0x42, 0x59,
+-	0x11, 0xea, 0x44, 0x59,
++	0x00, 0xe2, 0x38, 0x59,
++	0x11, 0xea, 0x3a, 0x59,
+ 	0x11, 0xea, 0x00, 0x00,
+-	0x80, 0xf9, 0x42, 0x79,
++	0x80, 0xf9, 0x38, 0x79,
+ 	0xff, 0xea, 0xd4, 0x0d,
+-	0x22, 0xea, 0x44, 0x59,
++	0x22, 0xea, 0x3a, 0x59,
+ 	0x22, 0xea, 0x00, 0x00,
+ 	0x10, 0x16, 0x70, 0x78,
+-	0x01, 0x0b, 0xa2, 0x32,
+ 	0x10, 0x16, 0x2c, 0x00,
+-	0x18, 0xad, 0x00, 0x79,
+-	0x04, 0xad, 0xca, 0x68,
++	0x01, 0x0b, 0xa2, 0x32,
++	0x18, 0xad, 0xf6, 0x78,
++	0x04, 0xad, 0xc0, 0x68,
+ 	0x80, 0xad, 0x64, 0x78,
+-	0x10, 0xad, 0x98, 0x78,
+-	0xff, 0x88, 0x83, 0x68,
+-	0xe7, 0xad, 0x5a, 0x09,
+-	0x02, 0x8c, 0x59, 0x32,
+-	0x02, 0x28, 0x19, 0x33,
+-	0x02, 0xa8, 0x50, 0x36,
+-	0x33, 0xea, 0x44, 0x59,
++	0x10, 0xad, 0x8e, 0x78,
++	0xff, 0x88, 0x87, 0x78,
++	0x33, 0xea, 0x3a, 0x59,
+ 	0x33, 0xea, 0x00, 0x00,
+ 	0x40, 0x3a, 0x64, 0x68,
+ 	0x50, 0x4b, 0x64, 0x68,
+-	0x22, 0xea, 0x44, 0x59,
++	0x22, 0xea, 0x3a, 0x59,
+ 	0x22, 0xea, 0x00, 0x00,
+ 	0xe7, 0xad, 0x5a, 0x09,
+ 	0x02, 0x8c, 0x59, 0x32,
+-	0x1a, 0xea, 0x50, 0x59,
+-	0x1a, 0xea, 0x04, 0x00,
+-	0xff, 0xea, 0xd4, 0x0d,
++	0x02, 0x28, 0x19, 0x33,
++	0x02, 0xa8, 0x50, 0x36,
+ 	0xe7, 0xad, 0x5a, 0x09,
+-	0x00, 0xe2, 0xa6, 0x58,
++	0x00, 0xe2, 0x9c, 0x58,
+ 	0xff, 0xea, 0x56, 0x02,
+ 	0x04, 0x7c, 0x78, 0x32,
+ 	0x20, 0x16, 0x64, 0x78,
+ 	0x04, 0x38, 0x79, 0x32,
+ 	0x80, 0x37, 0x6f, 0x16,
+-	0xff, 0x2d, 0xb5, 0x60,
+-	0xff, 0x29, 0xb5, 0x60,
+-	0x40, 0x51, 0xc5, 0x78,
+-	0xff, 0x4f, 0xb5, 0x68,
++	0xff, 0x2d, 0xab, 0x60,
++	0xff, 0x29, 0xab, 0x60,
++	0x40, 0x51, 0xbb, 0x78,
++	0xff, 0x4f, 0xab, 0x68,
+ 	0xff, 0x4d, 0xc1, 0x19,
+ 	0x00, 0x4e, 0xd5, 0x19,
+-	0x00, 0xe2, 0xc4, 0x50,
++	0x00, 0xe2, 0xba, 0x50,
+ 	0x01, 0x4c, 0xc1, 0x31,
+ 	0x00, 0x50, 0xd5, 0x19,
+-	0x00, 0xe2, 0xc4, 0x48,
++	0x00, 0xe2, 0xba, 0x48,
+ 	0x80, 0x18, 0x64, 0x78,
+ 	0x02, 0x4a, 0x1d, 0x30,
+ 	0x10, 0xea, 0x18, 0x00,
+@@ -113,30 +108,30 @@ static uint8_t seqprog[] = {
+ 	0xff, 0xea, 0xc0, 0x09,
+ 	0x01, 0x4e, 0x9d, 0x1a,
+ 	0x00, 0x4f, 0x9f, 0x22,
+-	0x01, 0xaa, 0x6d, 0x33,
+-	0x01, 0xea, 0x5c, 0x33,
+-	0x04, 0xa4, 0x49, 0x32,
+-	0xff, 0xea, 0x4a, 0x03,
+-	0xff, 0xea, 0x4e, 0x03,
++	0x01, 0x94, 0x6d, 0x33,
++	0xff, 0xea, 0x20, 0x0b,
++	0x04, 0xac, 0x49, 0x32,
++	0xff, 0xea, 0x5a, 0x03,
++	0xff, 0xea, 0x5e, 0x03,
+ 	0x01, 0x10, 0xd4, 0x31,
+-	0x10, 0xa8, 0xf5, 0x68,
+-	0x3d, 0xa9, 0xc5, 0x29,
++	0x10, 0x92, 0xeb, 0x68,
++	0x3d, 0x93, 0xc5, 0x29,
+ 	0xfe, 0xe2, 0xc4, 0x09,
+ 	0x01, 0xea, 0xc6, 0x01,
+ 	0x02, 0xe2, 0xc8, 0x31,
+ 	0x02, 0xec, 0x50, 0x31,
+ 	0x02, 0xa0, 0xda, 0x31,
+-	0xff, 0xa9, 0xf4, 0x70,
+-	0x02, 0xa0, 0x48, 0x37,
+-	0xff, 0x21, 0xfd, 0x70,
++	0xff, 0xa9, 0xea, 0x70,
++	0x02, 0xa0, 0x58, 0x37,
++	0xff, 0x21, 0xf3, 0x70,
+ 	0x02, 0x22, 0x51, 0x31,
+-	0x02, 0xa0, 0x4c, 0x33,
++	0x02, 0xa0, 0x5c, 0x33,
+ 	0x02, 0xa0, 0x44, 0x36,
+ 	0x02, 0xa0, 0x40, 0x32,
+ 	0x02, 0xa0, 0x44, 0x36,
+-	0x04, 0x47, 0x05, 0x69,
+-	0x40, 0x16, 0x30, 0x69,
+-	0xff, 0x2d, 0x35, 0x61,
++	0x04, 0x47, 0xfb, 0x68,
++	0x40, 0x16, 0x26, 0x69,
++	0xff, 0x2d, 0x2b, 0x61,
+ 	0xff, 0x29, 0x65, 0x70,
+ 	0x01, 0x37, 0xc1, 0x31,
+ 	0x02, 0x28, 0x55, 0x32,
+@@ -149,20 +144,20 @@ static uint8_t seqprog[] = {
+ 	0x01, 0x50, 0xa1, 0x1a,
+ 	0xff, 0x4e, 0x9d, 0x1a,
+ 	0xff, 0x4f, 0x9f, 0x22,
+-	0xff, 0x8d, 0x29, 0x71,
+-	0x80, 0xac, 0x28, 0x71,
+-	0x20, 0x16, 0x28, 0x69,
++	0xff, 0x8d, 0x1f, 0x71,
++	0x80, 0xac, 0x1e, 0x71,
++	0x20, 0x16, 0x1e, 0x69,
+ 	0x02, 0x8c, 0x51, 0x31,
+-	0x00, 0xe2, 0x12, 0x41,
++	0x00, 0xe2, 0x08, 0x41,
+ 	0x01, 0xac, 0x08, 0x31,
+ 	0x09, 0xea, 0x5a, 0x01,
+ 	0x02, 0x8c, 0x51, 0x32,
+ 	0xff, 0xea, 0x1a, 0x07,
+ 	0x04, 0x24, 0xf9, 0x30,
+-	0x1d, 0xea, 0x3a, 0x41,
++	0x1d, 0xea, 0x30, 0x41,
+ 	0x02, 0x2c, 0x51, 0x31,
+-	0x04, 0xa0, 0xf9, 0x30,
+-	0x19, 0xea, 0x3a, 0x41,
++	0x04, 0xa8, 0xf9, 0x30,
++	0x19, 0xea, 0x30, 0x41,
+ 	0x06, 0xea, 0x08, 0x81,
+ 	0x01, 0xe2, 0x5a, 0x35,
+ 	0x02, 0xf2, 0xf0, 0x35,
+@@ -179,26 +174,28 @@ static uint8_t seqprog[] = {
+ 	0x02, 0x20, 0xbd, 0x30,
+ 	0x02, 0x20, 0xb9, 0x30,
+ 	0x02, 0x20, 0x51, 0x31,
+-	0x4c, 0xa9, 0xd7, 0x28,
+-	0x10, 0xa8, 0x63, 0x79,
++	0x4c, 0x93, 0xd7, 0x28,
++	0x10, 0x92, 0x59, 0x79,
+ 	0x01, 0x6b, 0xc0, 0x30,
+ 	0x02, 0x64, 0xc8, 0x00,
+ 	0x40, 0x3a, 0x74, 0x04,
+ 	0x00, 0xe2, 0x56, 0x58,
+-	0x33, 0xea, 0x44, 0x59,
++	0x33, 0xea, 0x3a, 0x59,
+ 	0x33, 0xea, 0x00, 0x00,
+ 	0x30, 0x3f, 0xc0, 0x09,
+-	0x30, 0xe0, 0x64, 0x61,
+-	0x20, 0x3f, 0x7a, 0x69,
+-	0x10, 0x3f, 0x64, 0x79,
++	0x30, 0xe0, 0x5a, 0x61,
++	0x20, 0x3f, 0x70, 0x69,
++	0x10, 0x3f, 0x5a, 0x79,
+ 	0x02, 0xea, 0x7e, 0x00,
+-	0x00, 0xea, 0x44, 0x59,
++	0x00, 0xea, 0x3a, 0x59,
+ 	0x01, 0xea, 0x00, 0x30,
+ 	0x02, 0x48, 0x51, 0x35,
+ 	0x01, 0xea, 0x7e, 0x00,
+-	0x11, 0xea, 0x44, 0x59,
++	0x11, 0xea, 0x3a, 0x59,
+ 	0x11, 0xea, 0x00, 0x00,
+ 	0x02, 0x48, 0x51, 0x35,
++	0xc0, 0x4a, 0x94, 0x00,
++	0x04, 0x41, 0x7e, 0x79,
+ 	0x08, 0xea, 0x98, 0x00,
+ 	0x08, 0x57, 0xae, 0x00,
+ 	0x08, 0x3c, 0x78, 0x00,
+@@ -206,11 +203,12 @@ static uint8_t seqprog[] = {
+ 	0x0f, 0x67, 0xc0, 0x09,
+ 	0x00, 0x34, 0x69, 0x02,
+ 	0x20, 0xea, 0x96, 0x00,
+-	0x00, 0xe2, 0xf8, 0x41,
+-	0x40, 0x3a, 0xae, 0x69,
++	0x00, 0xe2, 0xf6, 0x41,
++	0xc0, 0x4a, 0x94, 0x00,
++	0x40, 0x3a, 0xaa, 0x69,
+ 	0x02, 0x55, 0x06, 0x68,
+-	0x02, 0x56, 0xae, 0x69,
+-	0xff, 0x5b, 0xae, 0x61,
++	0x02, 0x56, 0xaa, 0x69,
++	0xff, 0x5b, 0xaa, 0x61,
+ 	0x02, 0x20, 0x51, 0x31,
+ 	0x80, 0xea, 0xb2, 0x01,
+ 	0x44, 0xea, 0x00, 0x00,
+@@ -218,146 +216,149 @@ static uint8_t seqprog[] = {
+ 	0x33, 0xea, 0x00, 0x00,
+ 	0xff, 0xea, 0xb2, 0x09,
+ 	0xff, 0xe0, 0xc0, 0x19,
+-	0xff, 0xe0, 0xb0, 0x79,
+-	0x02, 0xa4, 0x51, 0x31,
+-	0x00, 0xe2, 0xa6, 0x41,
++	0xff, 0xe0, 0xac, 0x79,
++	0x02, 0xac, 0x51, 0x31,
++	0x00, 0xe2, 0xa2, 0x41,
+ 	0x02, 0x5e, 0x50, 0x31,
+ 	0x02, 0xa8, 0xb8, 0x30,
+ 	0x02, 0x5c, 0x50, 0x31,
+-	0xff, 0xa5, 0xc1, 0x71,
+-	0x02, 0xa4, 0x41, 0x31,
++	0xff, 0xad, 0xbd, 0x71,
++	0x02, 0xac, 0x41, 0x31,
+ 	0x02, 0x22, 0x51, 0x31,
+-	0x02, 0xa0, 0x4c, 0x33,
++	0x02, 0xa0, 0x5c, 0x33,
+ 	0x02, 0xa0, 0x44, 0x32,
+-	0x00, 0xe2, 0xca, 0x41,
+-	0x10, 0xa8, 0xcb, 0x69,
+-	0x3d, 0xa9, 0xc9, 0x29,
++	0x00, 0xe2, 0xc6, 0x41,
++	0x10, 0x92, 0xc7, 0x69,
++	0x3d, 0x93, 0xc9, 0x29,
+ 	0x01, 0xe4, 0xc8, 0x01,
+ 	0x01, 0xea, 0xca, 0x01,
+ 	0xff, 0xea, 0xda, 0x01,
+ 	0x02, 0x20, 0x51, 0x31,
+-	0x02, 0xa6, 0x41, 0x32,
+-	0xff, 0x21, 0xd3, 0x61,
++	0x02, 0xae, 0x41, 0x32,
++	0xff, 0x21, 0xcf, 0x61,
+ 	0xff, 0xea, 0x46, 0x02,
+ 	0x02, 0x5c, 0x50, 0x31,
+ 	0x40, 0xea, 0x96, 0x00,
+ 	0x02, 0x56, 0xcc, 0x6d,
+ 	0x01, 0x55, 0xcc, 0x6d,
+-	0x10, 0xa8, 0xdf, 0x79,
+-	0x10, 0x40, 0xe8, 0x69,
+-	0x01, 0x56, 0xe8, 0x79,
+-	0xff, 0xad, 0x07, 0x78,
+-	0x13, 0xea, 0x50, 0x59,
++	0x10, 0x92, 0xdb, 0x79,
++	0x10, 0x40, 0xe4, 0x69,
++	0x01, 0x56, 0xe4, 0x79,
++	0xff, 0x97, 0x07, 0x78,
++	0x13, 0xea, 0x46, 0x59,
+ 	0x13, 0xea, 0x04, 0x00,
+ 	0x00, 0xe2, 0x06, 0x40,
+ 	0xbf, 0x3a, 0x74, 0x08,
++	0x04, 0x41, 0xea, 0x79,
+ 	0x08, 0xea, 0x98, 0x00,
+ 	0x08, 0x57, 0xae, 0x00,
+-	0x01, 0xa9, 0x69, 0x32,
+-	0x01, 0xaa, 0x6b, 0x32,
++	0x01, 0x93, 0x69, 0x32,
++	0x01, 0x94, 0x6b, 0x32,
+ 	0x40, 0xea, 0x66, 0x02,
+ 	0x08, 0x3c, 0x78, 0x00,
+ 	0x80, 0xea, 0x62, 0x02,
+ 	0x00, 0xe2, 0xb8, 0x5b,
+ 	0x01, 0x36, 0xc1, 0x31,
+ 	0x9f, 0xe0, 0x4c, 0x7c,
+-	0x80, 0xe0, 0x0c, 0x72,
+-	0xa0, 0xe0, 0x44, 0x72,
+-	0xc0, 0xe0, 0x3a, 0x72,
+-	0xe0, 0xe0, 0x74, 0x72,
+-	0x01, 0xea, 0x50, 0x59,
++	0x80, 0xe0, 0x0a, 0x72,
++	0xa0, 0xe0, 0x46, 0x72,
++	0xc0, 0xe0, 0x3c, 0x72,
++	0xe0, 0xe0, 0x76, 0x72,
++	0x01, 0xea, 0x46, 0x59,
+ 	0x01, 0xea, 0x04, 0x00,
+-	0x00, 0xe2, 0xf8, 0x41,
+-	0x80, 0x33, 0x13, 0x7a,
+-	0x03, 0xea, 0x50, 0x59,
++	0x00, 0xe2, 0xf6, 0x41,
++	0x80, 0x33, 0x11, 0x7a,
++	0x03, 0xea, 0x46, 0x59,
+ 	0x03, 0xea, 0x04, 0x00,
+-	0xee, 0x00, 0x1a, 0x6a,
++	0xee, 0x00, 0x18, 0x6a,
+ 	0x05, 0xea, 0xb4, 0x00,
+-	0x33, 0xea, 0x44, 0x59,
++	0x33, 0xea, 0x3a, 0x59,
+ 	0x33, 0xea, 0x00, 0x00,
+ 	0x02, 0xa8, 0x90, 0x32,
+-	0x00, 0xe2, 0x6a, 0x59,
+-	0xef, 0xac, 0xd5, 0x19,
+-	0x00, 0xe2, 0x2a, 0x52,
++	0x00, 0xe2, 0x60, 0x59,
++	0xef, 0x96, 0xd5, 0x19,
++	0x00, 0xe2, 0x28, 0x52,
+ 	0x09, 0x80, 0xe1, 0x30,
+ 	0x02, 0xea, 0x36, 0x00,
+ 	0xa8, 0xea, 0x32, 0x00,
+-	0x00, 0xe2, 0x30, 0x42,
+-	0x01, 0xac, 0xd1, 0x30,
++	0x00, 0xe2, 0x2e, 0x42,
++	0x01, 0x96, 0xd1, 0x30,
+ 	0x10, 0x80, 0x89, 0x31,
+ 	0x20, 0xea, 0x32, 0x00,
+ 	0xbf, 0x33, 0x67, 0x0a,
+-	0x20, 0x19, 0x32, 0x6a,
+-	0x02, 0x4d, 0xf8, 0x69,
++	0x10, 0x4c, 0x38, 0x6a,
++	0x20, 0x19, 0x30, 0x6a,
++	0x20, 0x19, 0x34, 0x6a,
++	0x02, 0x4d, 0xf6, 0x69,
+ 	0x40, 0x33, 0x67, 0x02,
+-	0x00, 0xe2, 0xf8, 0x41,
+-	0x80, 0x33, 0xb5, 0x6a,
++	0x00, 0xe2, 0xf6, 0x41,
++	0x80, 0x33, 0xb7, 0x6a,
+ 	0x01, 0x44, 0x10, 0x33,
+-	0x08, 0xa8, 0x51, 0x03,
+-	0x00, 0xe2, 0xf8, 0x41,
++	0x08, 0x92, 0x25, 0x03,
++	0x00, 0xe2, 0xf6, 0x41,
+ 	0x10, 0xea, 0x80, 0x00,
+ 	0x01, 0x31, 0xc5, 0x31,
+-	0x80, 0xe2, 0x60, 0x62,
+-	0x10, 0xa8, 0x85, 0x6a,
+-	0xc0, 0xaa, 0xc5, 0x01,
+-	0x40, 0xa8, 0x51, 0x6a,
++	0x80, 0xe2, 0x62, 0x62,
++	0x10, 0x92, 0x87, 0x6a,
++	0xc0, 0x94, 0xc5, 0x01,
++	0x40, 0x92, 0x53, 0x6a,
+ 	0xbf, 0xe2, 0xc4, 0x09,
+-	0x20, 0xa8, 0x65, 0x7a,
++	0x20, 0x92, 0x67, 0x7a,
+ 	0x01, 0xe2, 0x88, 0x30,
+ 	0x00, 0xe2, 0xb8, 0x5b,
+-	0xa0, 0x36, 0x6d, 0x62,
+-	0x23, 0xa8, 0x89, 0x08,
++	0xa0, 0x36, 0x6f, 0x62,
++	0x23, 0x92, 0x89, 0x08,
+ 	0x00, 0xe2, 0xb8, 0x5b,
+-	0xa0, 0x36, 0x6d, 0x62,
+-	0x00, 0xa8, 0x64, 0x42,
+-	0xff, 0xe2, 0x64, 0x62,
+-	0x00, 0xe2, 0x84, 0x42,
++	0xa0, 0x36, 0x6f, 0x62,
++	0x00, 0xa8, 0x66, 0x42,
++	0xff, 0xe2, 0x66, 0x62,
++	0x00, 0xe2, 0x86, 0x42,
+ 	0x40, 0xea, 0x98, 0x00,
+ 	0x01, 0xe2, 0x88, 0x30,
+ 	0x00, 0xe2, 0xb8, 0x5b,
+-	0xa0, 0x36, 0x43, 0x72,
++	0xa0, 0x36, 0x45, 0x72,
+ 	0x40, 0xea, 0x98, 0x00,
+ 	0x01, 0x31, 0x89, 0x32,
+ 	0x08, 0xea, 0x62, 0x02,
+-	0x00, 0xe2, 0xf8, 0x41,
++	0x00, 0xe2, 0xf6, 0x41,
+ 	0xe0, 0xea, 0xd4, 0x5b,
+-	0x80, 0xe0, 0xc0, 0x6a,
+-	0x04, 0xe0, 0x66, 0x73,
+-	0x02, 0xe0, 0x96, 0x73,
+-	0x00, 0xea, 0x1e, 0x73,
+-	0x03, 0xe0, 0xa6, 0x73,
+-	0x23, 0xe0, 0x96, 0x72,
+-	0x08, 0xe0, 0xbc, 0x72,
++	0x80, 0xe0, 0xc2, 0x6a,
++	0x04, 0xe0, 0x68, 0x73,
++	0x02, 0xe0, 0x9a, 0x73,
++	0x00, 0xea, 0x20, 0x73,
++	0x03, 0xe0, 0xaa, 0x73,
++	0x23, 0xe0, 0x98, 0x72,
++	0x08, 0xe0, 0xbe, 0x72,
+ 	0x00, 0xe2, 0xb8, 0x5b,
+-	0x07, 0xea, 0x50, 0x59,
++	0x07, 0xea, 0x46, 0x59,
+ 	0x07, 0xea, 0x04, 0x00,
+-	0x08, 0x42, 0xf9, 0x71,
+-	0x04, 0x42, 0x93, 0x62,
++	0x08, 0x42, 0xf7, 0x71,
++	0x04, 0x42, 0x95, 0x62,
+ 	0x01, 0x43, 0x89, 0x30,
+-	0x00, 0xe2, 0x84, 0x42,
++	0x00, 0xe2, 0x86, 0x42,
+ 	0x01, 0x44, 0xd4, 0x31,
+-	0x00, 0xe2, 0x84, 0x42,
++	0x00, 0xe2, 0x86, 0x42,
+ 	0x01, 0x00, 0x60, 0x32,
+-	0x33, 0xea, 0x44, 0x59,
++	0x33, 0xea, 0x3a, 0x59,
+ 	0x33, 0xea, 0x00, 0x00,
+ 	0x4c, 0x34, 0xc1, 0x28,
+ 	0x01, 0x64, 0xc0, 0x31,
+-	0x00, 0x30, 0x45, 0x59,
++	0x00, 0x30, 0x3b, 0x59,
+ 	0x01, 0x30, 0x01, 0x30,
+-	0x01, 0xe0, 0xba, 0x7a,
++	0x01, 0xe0, 0xbc, 0x7a,
+ 	0xa0, 0xea, 0xca, 0x5b,
+-	0x01, 0xa0, 0xba, 0x62,
+-	0x01, 0x84, 0xaf, 0x7a,
+-	0x01, 0xab, 0xbd, 0x6a,
+-	0x05, 0xea, 0x50, 0x59,
++	0x01, 0xa0, 0xbc, 0x62,
++	0x01, 0x84, 0xb1, 0x7a,
++	0x01, 0x95, 0xbf, 0x6a,
++	0x05, 0xea, 0x46, 0x59,
+ 	0x05, 0xea, 0x04, 0x00,
+-	0x00, 0xe2, 0xbc, 0x42,
+-	0x03, 0xea, 0x50, 0x59,
++	0x00, 0xe2, 0xbe, 0x42,
++	0x03, 0xea, 0x46, 0x59,
+ 	0x03, 0xea, 0x04, 0x00,
+-	0x00, 0xe2, 0xbc, 0x42,
++	0x00, 0xe2, 0xbe, 0x42,
+ 	0x07, 0xea, 0xdc, 0x5b,
+ 	0x01, 0x44, 0xd4, 0x31,
+-	0x00, 0xe2, 0xf8, 0x41,
++	0x00, 0xe2, 0xf6, 0x41,
+ 	0x3f, 0xe0, 0x6a, 0x0a,
+ 	0xc0, 0x34, 0xc1, 0x09,
+ 	0x00, 0x35, 0x51, 0x01,
+@@ -368,54 +369,54 @@ static uint8_t seqprog[] = {
+ 	0x01, 0xea, 0xc6, 0x01,
+ 	0x02, 0xe2, 0xc8, 0x31,
+ 	0x02, 0xec, 0x40, 0x31,
+-	0xff, 0xa1, 0xdc, 0x72,
++	0xff, 0xa1, 0xde, 0x72,
+ 	0x02, 0xe8, 0xda, 0x31,
+ 	0x02, 0xa0, 0x50, 0x31,
+-	0x00, 0xe2, 0xfe, 0x42,
++	0x00, 0xe2, 0x00, 0x43,
+ 	0x80, 0x33, 0x67, 0x02,
+ 	0x01, 0x44, 0xd4, 0x31,
+ 	0x00, 0xe2, 0xb8, 0x5b,
+ 	0x01, 0x33, 0x67, 0x02,
+-	0xe0, 0x36, 0x19, 0x63,
++	0xe0, 0x36, 0x1b, 0x63,
+ 	0x02, 0x33, 0x67, 0x02,
+-	0x20, 0x46, 0x12, 0x63,
++	0x20, 0x46, 0x14, 0x63,
+ 	0xff, 0xea, 0x52, 0x09,
+ 	0xa8, 0xea, 0xca, 0x5b,
+-	0x04, 0xa8, 0xf9, 0x7a,
++	0x04, 0x92, 0xfb, 0x7a,
+ 	0x01, 0x34, 0xc1, 0x31,
+-	0x00, 0xa9, 0xf9, 0x62,
++	0x00, 0x93, 0xfb, 0x62,
+ 	0x01, 0x35, 0xc1, 0x31,
+-	0x00, 0xaa, 0x03, 0x73,
++	0x00, 0x94, 0x05, 0x73,
+ 	0x01, 0xa9, 0x52, 0x11,
+-	0xff, 0xa9, 0xee, 0x6a,
+-	0x00, 0xe2, 0x12, 0x43,
++	0xff, 0xa9, 0xf0, 0x6a,
++	0x00, 0xe2, 0x14, 0x43,
+ 	0x10, 0x33, 0x67, 0x02,
+-	0x04, 0xa8, 0x13, 0x7b,
+-	0xfb, 0xa8, 0x51, 0x0b,
++	0x04, 0x92, 0x15, 0x7b,
++	0xfb, 0x92, 0x25, 0x0b,
+ 	0xff, 0xea, 0x66, 0x0a,
+-	0x01, 0x9c, 0x0d, 0x6b,
++	0x01, 0xa4, 0x0f, 0x6b,
+ 	0x02, 0xa8, 0x90, 0x32,
+-	0x00, 0xe2, 0x6a, 0x59,
+-	0x10, 0xa8, 0xbd, 0x7a,
++	0x00, 0xe2, 0x60, 0x59,
++	0x10, 0x92, 0xbf, 0x7a,
+ 	0xff, 0xea, 0xdc, 0x5b,
+-	0x00, 0xe2, 0xbc, 0x42,
+-	0x04, 0xea, 0x50, 0x59,
++	0x00, 0xe2, 0xbe, 0x42,
++	0x04, 0xea, 0x46, 0x59,
+ 	0x04, 0xea, 0x04, 0x00,
+-	0x00, 0xe2, 0xbc, 0x42,
+-	0x04, 0xea, 0x50, 0x59,
++	0x00, 0xe2, 0xbe, 0x42,
++	0x04, 0xea, 0x46, 0x59,
+ 	0x04, 0xea, 0x04, 0x00,
+-	0x00, 0xe2, 0xf8, 0x41,
+-	0x08, 0xa8, 0xb5, 0x7a,
+-	0xc0, 0x33, 0x29, 0x7b,
+-	0x80, 0x33, 0xb5, 0x6a,
+-	0xff, 0x88, 0x29, 0x6b,
+-	0x40, 0x33, 0xb5, 0x6a,
+-	0x10, 0xa8, 0x2f, 0x7b,
+-	0x0a, 0xea, 0x50, 0x59,
++	0x00, 0xe2, 0xf6, 0x41,
++	0x08, 0x92, 0xb7, 0x7a,
++	0xc0, 0x33, 0x2b, 0x7b,
++	0x80, 0x33, 0xb7, 0x6a,
++	0xff, 0x88, 0x2b, 0x6b,
++	0x40, 0x33, 0xb7, 0x6a,
++	0x10, 0x92, 0x31, 0x7b,
++	0x0a, 0xea, 0x46, 0x59,
+ 	0x0a, 0xea, 0x04, 0x00,
+-	0x00, 0xe2, 0x4e, 0x5b,
+-	0x00, 0xe2, 0x82, 0x43,
+-	0x50, 0x4b, 0x36, 0x6b,
++	0x00, 0xe2, 0x50, 0x5b,
++	0x00, 0xe2, 0x84, 0x43,
++	0x50, 0x4b, 0x38, 0x6b,
+ 	0xbf, 0x3a, 0x74, 0x08,
+ 	0x01, 0xe0, 0xf4, 0x31,
+ 	0xff, 0xea, 0xc0, 0x09,
+@@ -425,25 +426,25 @@ static uint8_t seqprog[] = {
+ 	0x01, 0xfa, 0xc0, 0x35,
+ 	0x02, 0xa8, 0x84, 0x32,
+ 	0x02, 0xea, 0xb4, 0x00,
+-	0x33, 0xea, 0x44, 0x59,
++	0x33, 0xea, 0x3a, 0x59,
+ 	0x33, 0xea, 0x00, 0x00,
+ 	0x02, 0x42, 0x51, 0x31,
+-	0xff, 0xae, 0x65, 0x68,
+-	0xff, 0x88, 0x5b, 0x6b,
+-	0x01, 0x9c, 0x57, 0x6b,
+-	0x02, 0x9c, 0x5f, 0x6b,
+-	0x01, 0x84, 0x5f, 0x7b,
++	0xff, 0x90, 0x65, 0x68,
++	0xff, 0x88, 0x5d, 0x6b,
++	0x01, 0xa4, 0x59, 0x6b,
++	0x02, 0xa4, 0x61, 0x6b,
++	0x01, 0x84, 0x61, 0x7b,
+ 	0x02, 0x28, 0x19, 0x33,
+ 	0x02, 0xa8, 0x50, 0x36,
+-	0xff, 0x88, 0x5f, 0x73,
+-	0x00, 0xe2, 0x32, 0x5b,
+-	0x02, 0xa8, 0x5c, 0x33,
++	0xff, 0x88, 0x61, 0x73,
++	0x00, 0xe2, 0x34, 0x5b,
++	0x02, 0xa8, 0x20, 0x33,
+ 	0x02, 0x2c, 0x19, 0x33,
+ 	0x02, 0xa8, 0x58, 0x32,
+-	0x04, 0x9c, 0x39, 0x07,
+-	0xc0, 0x33, 0xb5, 0x6a,
+-	0x04, 0xa8, 0x51, 0x03,
+-	0x20, 0xa8, 0x83, 0x6b,
++	0x04, 0xa4, 0x49, 0x07,
++	0xc0, 0x33, 0xb7, 0x6a,
++	0x04, 0x92, 0x25, 0x03,
++	0x20, 0x92, 0x85, 0x6b,
+ 	0x02, 0xa8, 0x40, 0x31,
+ 	0xc0, 0x34, 0xc1, 0x09,
+ 	0x00, 0x35, 0x51, 0x01,
+@@ -458,30 +459,29 @@ static uint8_t seqprog[] = {
+ 	0xf7, 0x57, 0xae, 0x08,
+ 	0x08, 0xea, 0x98, 0x00,
+ 	0x01, 0x44, 0xd4, 0x31,
+-	0xee, 0x00, 0x8c, 0x6b,
++	0xee, 0x00, 0x8e, 0x6b,
+ 	0x02, 0xea, 0xb4, 0x00,
+-	0x00, 0xe2, 0xb4, 0x5b,
+-	0x09, 0x4c, 0x8e, 0x7b,
++	0xc0, 0xea, 0x66, 0x02,
++	0x09, 0x4c, 0x90, 0x7b,
++	0x01, 0xea, 0x6c, 0x02,
+ 	0x08, 0x4c, 0x06, 0x68,
+-	0x0b, 0xea, 0x50, 0x59,
++	0x0b, 0xea, 0x46, 0x59,
+ 	0x0b, 0xea, 0x04, 0x00,
+ 	0x01, 0x44, 0xd4, 0x31,
+-	0x20, 0x33, 0xf9, 0x79,
+-	0x00, 0xe2, 0x9e, 0x5b,
+-	0x00, 0xe2, 0xf8, 0x41,
+-	0x01, 0x84, 0xa3, 0x7b,
+-	0x01, 0x9c, 0x39, 0x07,
+-	0x08, 0x60, 0x20, 0x33,
+-	0x08, 0x80, 0x31, 0x37,
++	0x20, 0x33, 0xf7, 0x79,
++	0x00, 0xe2, 0xa2, 0x5b,
++	0x00, 0xe2, 0xf6, 0x41,
++	0x01, 0x84, 0xa7, 0x7b,
++	0x01, 0xa4, 0x49, 0x07,
++	0x08, 0x60, 0x30, 0x33,
++	0x08, 0x80, 0x41, 0x37,
+ 	0xdf, 0x33, 0x67, 0x0a,
+-	0xee, 0x00, 0xb0, 0x6b,
++	0xee, 0x00, 0xb4, 0x6b,
+ 	0x05, 0xea, 0xb4, 0x00,
+-	0x33, 0xea, 0x44, 0x59,
++	0x33, 0xea, 0x3a, 0x59,
+ 	0x33, 0xea, 0x00, 0x00,
+-	0x00, 0xe2, 0x6a, 0x59,
+-	0x00, 0xe2, 0xbc, 0x42,
+-	0x01, 0xea, 0x6c, 0x02,
+-	0xc0, 0xea, 0x66, 0x06,
++	0x00, 0xe2, 0x60, 0x59,
++	0x00, 0xe2, 0xbe, 0x42,
+ 	0xff, 0x42, 0xc4, 0x6b,
+ 	0x01, 0x41, 0xb8, 0x6b,
+ 	0x02, 0x41, 0xb8, 0x7b,
+@@ -495,7 +495,7 @@ static uint8_t seqprog[] = {
+ 	0xff, 0x42, 0xcc, 0x7b,
+ 	0x04, 0x4c, 0xcc, 0x6b,
+ 	0xe0, 0x41, 0x6c, 0x0a,
+-	0xe0, 0x36, 0xf9, 0x61,
++	0xe0, 0x36, 0xf7, 0x61,
+ 	0xff, 0xea, 0xca, 0x09,
+ 	0x01, 0xe2, 0xc8, 0x31,
+ 	0x01, 0x46, 0xda, 0x35,
+@@ -542,42 +542,42 @@ static uint8_t seqprog[] = {
+ 	0x01, 0xac, 0xd4, 0x99,
+ 	0x00, 0xe2, 0x64, 0x50,
+ 	0xfe, 0xa6, 0x4c, 0x0d,
+-	0x0b, 0x90, 0xe1, 0x30,
+-	0xfd, 0x9c, 0x49, 0x09,
+-	0x80, 0x9b, 0x39, 0x7c,
++	0x0b, 0x98, 0xe1, 0x30,
++	0xfd, 0xa4, 0x49, 0x09,
++	0x80, 0xa3, 0x39, 0x7c,
+ 	0x02, 0xa4, 0x48, 0x01,
+ 	0x01, 0xa4, 0x36, 0x30,
+ 	0xa8, 0xea, 0x32, 0x00,
+-	0xfd, 0x9c, 0x39, 0x0b,
+-	0x05, 0x9b, 0x07, 0x33,
++	0xfd, 0xa4, 0x49, 0x0b,
++	0x05, 0xa3, 0x07, 0x33,
+ 	0x80, 0x83, 0x45, 0x6c,
+ 	0x02, 0xea, 0x4c, 0x05,
+ 	0xff, 0xea, 0x4c, 0x0d,
+-	0x00, 0xe2, 0x3e, 0x59,
++	0x00, 0xe2, 0x34, 0x59,
+ 	0x02, 0xa6, 0xe6, 0x6b,
+ 	0x80, 0xf9, 0xf2, 0x05,
+ 	0xc0, 0x33, 0x53, 0x7c,
+-	0x03, 0xea, 0x50, 0x59,
++	0x03, 0xea, 0x46, 0x59,
+ 	0x03, 0xea, 0x04, 0x00,
+ 	0x20, 0x33, 0x77, 0x7c,
+ 	0x01, 0x84, 0x5d, 0x6c,
+-	0x06, 0xea, 0x50, 0x59,
++	0x06, 0xea, 0x46, 0x59,
+ 	0x06, 0xea, 0x04, 0x00,
+ 	0x00, 0xe2, 0x7a, 0x44,
+ 	0x01, 0x00, 0x60, 0x32,
+ 	0xee, 0x00, 0x66, 0x6c,
+ 	0x05, 0xea, 0xb4, 0x00,
+-	0x33, 0xea, 0x44, 0x59,
++	0x33, 0xea, 0x3a, 0x59,
+ 	0x33, 0xea, 0x00, 0x00,
+ 	0x80, 0x3d, 0x7a, 0x00,
+ 	0xfc, 0x42, 0x68, 0x7c,
+ 	0x7f, 0x3d, 0x7a, 0x08,
+-	0x00, 0x30, 0x45, 0x59,
++	0x00, 0x30, 0x3b, 0x59,
+ 	0x01, 0x30, 0x01, 0x30,
+-	0x09, 0xea, 0x50, 0x59,
++	0x09, 0xea, 0x46, 0x59,
+ 	0x09, 0xea, 0x04, 0x00,
+-	0x00, 0xe2, 0xf8, 0x41,
+-	0x01, 0x9c, 0x5d, 0x6c,
++	0x00, 0xe2, 0xf6, 0x41,
++	0x01, 0xa4, 0x5d, 0x6c,
+ 	0x00, 0xe2, 0x30, 0x5c,
+ 	0x20, 0x33, 0x67, 0x02,
+ 	0x01, 0x00, 0x60, 0x32,
+@@ -586,7 +586,7 @@ static uint8_t seqprog[] = {
+ 	0x00, 0xe2, 0x56, 0x58,
+ 	0x00, 0xe2, 0x66, 0x58,
+ 	0x00, 0xe2, 0x3a, 0x58,
+-	0x00, 0x30, 0x45, 0x59,
++	0x00, 0x30, 0x3b, 0x59,
+ 	0x01, 0x30, 0x01, 0x30,
+ 	0x20, 0x19, 0x82, 0x6c,
+ 	0x00, 0xe2, 0xb2, 0x5c,
+@@ -601,11 +601,11 @@ static uint8_t seqprog[] = {
+ 	0x03, 0x42, 0x4c, 0x6c,
+ 	0x00, 0xe2, 0xe0, 0x5b,
+ 	0x80, 0xf9, 0xf2, 0x01,
+-	0x04, 0x33, 0xf9, 0x79,
+-	0x00, 0xe2, 0xf8, 0x41,
++	0x04, 0x33, 0xf7, 0x79,
++	0x00, 0xe2, 0xf6, 0x41,
+ 	0x08, 0x5d, 0xba, 0x6c,
+ 	0x00, 0xe2, 0x56, 0x58,
+-	0x00, 0x30, 0x45, 0x59,
++	0x00, 0x30, 0x3b, 0x59,
+ 	0x01, 0x30, 0x01, 0x30,
+ 	0x02, 0x1b, 0xaa, 0x7c,
+ 	0x08, 0x5d, 0xb8, 0x7c,
+@@ -619,7 +619,7 @@ static uint8_t seqprog[] = {
+ 	0xf8, 0x1b, 0x08, 0x0b,
+ 	0xff, 0xea, 0x06, 0x0b,
+ 	0x03, 0x68, 0x00, 0x37,
+-	0x00, 0xe2, 0xc4, 0x58,
++	0x00, 0xe2, 0xba, 0x58,
+ 	0x10, 0xea, 0x18, 0x00,
+ 	0xf9, 0xd9, 0xb2, 0x0d,
+ 	0x01, 0xd9, 0xb2, 0x05,
+@@ -631,7 +631,7 @@ static uint8_t seqprog[] = {
+ 	0x11, 0x00, 0x00, 0x10,
+ 	0x04, 0x19, 0x08, 0x7d,
+ 	0xdf, 0x19, 0x32, 0x08,
+-	0x60, 0x5b, 0xe6, 0x6c,
++	0x60, 0x5b, 0x08, 0x6d,
+ 	0x01, 0x4c, 0xe2, 0x7c,
+ 	0x20, 0x19, 0x32, 0x00,
+ 	0x01, 0xd9, 0xb2, 0x05,
+@@ -641,29 +641,29 @@ static uint8_t seqprog[] = {
+ 	0x08, 0x5b, 0x0a, 0x6d,
+ 	0x20, 0x5b, 0xfa, 0x6c,
+ 	0x02, 0x5b, 0x2a, 0x6d,
+-	0x0e, 0xea, 0x50, 0x59,
++	0x0e, 0xea, 0x46, 0x59,
+ 	0x0e, 0xea, 0x04, 0x00,
+ 	0x80, 0xf9, 0xea, 0x6c,
+ 	0xdf, 0x5c, 0xb8, 0x08,
+ 	0x01, 0xd9, 0xb2, 0x05,
+-	0x01, 0x9c, 0xe5, 0x6d,
++	0x01, 0xa4, 0xe5, 0x6d,
+ 	0x00, 0xe2, 0x30, 0x5c,
+ 	0x00, 0xe2, 0x34, 0x5d,
+-	0x01, 0xae, 0x5d, 0x1b,
++	0x01, 0x90, 0x21, 0x1b,
+ 	0x01, 0xd9, 0xb2, 0x05,
+-	0x00, 0xe2, 0x32, 0x5b,
+-	0xf3, 0xac, 0xd5, 0x19,
++	0x00, 0xe2, 0x34, 0x5b,
++	0xf3, 0x96, 0xd5, 0x19,
+ 	0x00, 0xe2, 0x18, 0x55,
+-	0x80, 0xac, 0x19, 0x6d,
+-	0x0f, 0xea, 0x50, 0x59,
++	0x80, 0x96, 0x19, 0x6d,
++	0x0f, 0xea, 0x46, 0x59,
+ 	0x0f, 0xea, 0x04, 0x00,
+ 	0x00, 0xe2, 0x20, 0x45,
+ 	0x04, 0x8c, 0xe1, 0x30,
+ 	0x01, 0xea, 0xf2, 0x00,
+ 	0x02, 0xea, 0x36, 0x00,
+ 	0xa8, 0xea, 0x32, 0x00,
+-	0xff, 0xad, 0x27, 0x7d,
+-	0x14, 0xea, 0x50, 0x59,
++	0xff, 0x97, 0x27, 0x7d,
++	0x14, 0xea, 0x46, 0x59,
+ 	0x14, 0xea, 0x04, 0x00,
+ 	0x00, 0xe2, 0x96, 0x5d,
+ 	0x01, 0xd9, 0xb2, 0x05,
+@@ -673,14 +673,14 @@ static uint8_t seqprog[] = {
+ 	0x00, 0xe2, 0x8e, 0x5d,
+ 	0x01, 0xd9, 0xb2, 0x05,
+ 	0x02, 0xa6, 0x44, 0x7d,
+-	0x00, 0xe2, 0x3e, 0x59,
++	0x00, 0xe2, 0x34, 0x59,
+ 	0x20, 0x5b, 0x52, 0x6d,
+ 	0xfc, 0x42, 0x3e, 0x7d,
+ 	0x10, 0x40, 0x40, 0x6d,
+ 	0x20, 0x4d, 0x42, 0x7d,
+ 	0x08, 0x5d, 0x52, 0x6d,
+ 	0x02, 0xa6, 0xe6, 0x6b,
+-	0x00, 0xe2, 0x3e, 0x59,
++	0x00, 0xe2, 0x34, 0x59,
+ 	0x20, 0x5b, 0x52, 0x6d,
+ 	0x01, 0x1b, 0x72, 0x6d,
+ 	0xfc, 0x42, 0x4e, 0x7d,
+@@ -690,22 +690,22 @@ static uint8_t seqprog[] = {
+ 	0x02, 0x19, 0x32, 0x00,
+ 	0x01, 0x5b, 0x40, 0x31,
+ 	0x00, 0xe2, 0xb2, 0x5c,
+-	0x00, 0xe2, 0x9e, 0x5b,
++	0x00, 0xe2, 0xa2, 0x5b,
+ 	0x20, 0xea, 0xb6, 0x00,
+ 	0x00, 0xe2, 0xe0, 0x5b,
+ 	0x20, 0x5c, 0xb8, 0x00,
+ 	0x04, 0x19, 0x68, 0x6d,
+ 	0x01, 0x1a, 0x68, 0x6d,
+-	0x00, 0xe2, 0x3e, 0x59,
++	0x00, 0xe2, 0x34, 0x59,
+ 	0x01, 0x1a, 0x64, 0x78,
+ 	0x80, 0xf9, 0xf2, 0x01,
+ 	0x20, 0xa0, 0xcc, 0x7d,
+-	0xff, 0xae, 0x5d, 0x1b,
+-	0x08, 0xa8, 0x43, 0x6b,
++	0xff, 0x90, 0x21, 0x1b,
++	0x08, 0x92, 0x45, 0x6b,
+ 	0x02, 0xea, 0xb4, 0x04,
+-	0x01, 0x9c, 0x39, 0x03,
++	0x01, 0xa4, 0x49, 0x03,
+ 	0x40, 0x5b, 0x82, 0x6d,
+-	0x00, 0xe2, 0x3e, 0x59,
++	0x00, 0xe2, 0x34, 0x59,
+ 	0x40, 0x5b, 0x82, 0x6d,
+ 	0x04, 0x5d, 0xe6, 0x7d,
+ 	0x01, 0x1a, 0xe6, 0x7d,
+@@ -714,14 +714,14 @@ static uint8_t seqprog[] = {
+ 	0x04, 0x5d, 0xe6, 0x7d,
+ 	0x01, 0x1a, 0xe6, 0x7d,
+ 	0x80, 0xf9, 0xf2, 0x01,
+-	0xff, 0xae, 0x5d, 0x1b,
+-	0x08, 0xa8, 0x43, 0x6b,
++	0xff, 0x90, 0x21, 0x1b,
++	0x08, 0x92, 0x45, 0x6b,
+ 	0x02, 0xea, 0xb4, 0x04,
+-	0x00, 0xe2, 0x3e, 0x59,
++	0x00, 0xe2, 0x34, 0x59,
+ 	0x01, 0x1b, 0x64, 0x78,
+ 	0x80, 0xf9, 0xf2, 0x01,
+ 	0x02, 0xea, 0xb4, 0x04,
+-	0x00, 0xe2, 0x3e, 0x59,
++	0x00, 0xe2, 0x34, 0x59,
+ 	0x01, 0x1b, 0xaa, 0x6d,
+ 	0x40, 0x5b, 0xb8, 0x7d,
+ 	0x01, 0x1b, 0xaa, 0x6d,
+@@ -729,45 +729,45 @@ static uint8_t seqprog[] = {
+ 	0x01, 0x1a, 0x64, 0x78,
+ 	0x80, 0xf9, 0xf2, 0x01,
+ 	0xff, 0xea, 0x10, 0x03,
+-	0x08, 0xa8, 0x51, 0x03,
+-	0x00, 0xe2, 0x42, 0x43,
++	0x08, 0x92, 0x25, 0x03,
++	0x00, 0xe2, 0x44, 0x43,
+ 	0x01, 0x1a, 0xb4, 0x7d,
+ 	0x40, 0x5b, 0xb0, 0x7d,
+ 	0x01, 0x1a, 0x9e, 0x6d,
+ 	0xfc, 0x42, 0x64, 0x78,
+ 	0x01, 0x1a, 0xb8, 0x6d,
+-	0x10, 0xea, 0x50, 0x59,
++	0x10, 0xea, 0x46, 0x59,
+ 	0x10, 0xea, 0x04, 0x00,
+ 	0xfc, 0x42, 0x64, 0x78,
+ 	0x10, 0x40, 0xbe, 0x6d,
+ 	0x20, 0x4d, 0x64, 0x78,
+ 	0x40, 0x5b, 0x9e, 0x6d,
+ 	0x01, 0x1a, 0x64, 0x78,
+-	0x01, 0xae, 0x5d, 0x1b,
++	0x01, 0x90, 0x21, 0x1b,
+ 	0x30, 0x3f, 0xc0, 0x09,
+ 	0x30, 0xe0, 0x64, 0x60,
+ 	0x40, 0x4b, 0x64, 0x68,
+ 	0xff, 0xea, 0x52, 0x01,
+-	0xee, 0x00, 0xd2, 0x6d,
++	0xee, 0x00, 0xd4, 0x6d,
+ 	0x80, 0xf9, 0xf2, 0x01,
+-	0xff, 0xae, 0x5d, 0x1b,
++	0xff, 0x90, 0x21, 0x1b,
+ 	0x02, 0xea, 0xb4, 0x00,
+ 	0x20, 0xea, 0x9a, 0x00,
+ 	0xf3, 0x42, 0xde, 0x6d,
+-	0x12, 0xea, 0x50, 0x59,
++	0x12, 0xea, 0x46, 0x59,
+ 	0x12, 0xea, 0x04, 0x00,
+-	0x00, 0xe2, 0xf8, 0x41,
+-	0x0d, 0xea, 0x50, 0x59,
++	0x00, 0xe2, 0xf6, 0x41,
++	0x0d, 0xea, 0x46, 0x59,
+ 	0x0d, 0xea, 0x04, 0x00,
+-	0x00, 0xe2, 0xf8, 0x41,
+-	0x01, 0xae, 0x5d, 0x1b,
+-	0x11, 0xea, 0x50, 0x59,
++	0x00, 0xe2, 0xf6, 0x41,
++	0x01, 0x90, 0x21, 0x1b,
++	0x11, 0xea, 0x46, 0x59,
+ 	0x11, 0xea, 0x04, 0x00,
+-	0x00, 0xe2, 0x32, 0x5b,
++	0x00, 0xe2, 0x34, 0x5b,
+ 	0x08, 0x5a, 0xb4, 0x00,
+ 	0x00, 0xe2, 0x0c, 0x5e,
+ 	0xa8, 0xea, 0x32, 0x00,
+-	0x00, 0xe2, 0x3e, 0x59,
++	0x00, 0xe2, 0x34, 0x59,
+ 	0x80, 0x1a, 0xfa, 0x7d,
+ 	0x00, 0xe2, 0x0c, 0x5e,
+ 	0x80, 0x19, 0x32, 0x00,
+@@ -776,9 +776,9 @@ static uint8_t seqprog[] = {
+ 	0x20, 0x4d, 0x64, 0x78,
+ 	0x02, 0x84, 0x09, 0x03,
+ 	0x40, 0x5b, 0xcc, 0x7d,
+-	0xff, 0xae, 0x5d, 0x1b,
++	0xff, 0x90, 0x21, 0x1b,
+ 	0x80, 0xf9, 0xf2, 0x01,
+-	0x08, 0xa8, 0x43, 0x6b,
++	0x08, 0x92, 0x45, 0x6b,
+ 	0x02, 0xea, 0xb4, 0x04,
+ 	0x01, 0x38, 0xe1, 0x30,
+ 	0x05, 0x39, 0xe3, 0x98,
+@@ -794,12 +794,20 @@ static uint8_t seqprog[] = {
+ };
+ 
+ typedef int ahd_patch_func_t (struct ahd_softc *ahd);
++static ahd_patch_func_t ahd_patch23_func;
++
++static int
++ahd_patch23_func(struct ahd_softc *ahd)
++{
++	return ((ahd->bugs & AHD_PKT_BITBUCKET_BUG) != 0);
++}
++
+ static ahd_patch_func_t ahd_patch22_func;
+ 
+ static int
+ ahd_patch22_func(struct ahd_softc *ahd)
+ {
+-	return ((ahd->bugs & AHD_PKT_BITBUCKET_BUG) != 0);
++	return ((ahd->bugs & AHD_PKT_BITBUCKET_BUG) == 0);
+ }
+ 
+ static ahd_patch_func_t ahd_patch21_func;
+@@ -807,7 +815,7 @@ static ahd_patch_func_t ahd_patch21_func
+ static int
+ ahd_patch21_func(struct ahd_softc *ahd)
+ {
+-	return ((ahd->bugs & AHD_PKT_BITBUCKET_BUG) == 0);
++	return ((ahd->features & AHD_RTI) == 0);
+ }
+ 
+ static ahd_patch_func_t ahd_patch20_func;
+@@ -815,7 +823,7 @@ static ahd_patch_func_t ahd_patch20_func
+ static int
+ ahd_patch20_func(struct ahd_softc *ahd)
+ {
+-	return ((ahd->features & AHD_RTI) == 0);
++	return ((ahd->flags & AHD_INITIATORROLE) != 0);
+ }
+ 
+ static ahd_patch_func_t ahd_patch19_func;
+@@ -823,7 +831,7 @@ static ahd_patch_func_t ahd_patch19_func
+ static int
+ ahd_patch19_func(struct ahd_softc *ahd)
+ {
+-	return ((ahd->flags & AHD_INITIATORROLE) != 0);
++	return ((ahd->flags & AHD_TARGETROLE) != 0);
+ }
+ 
+ static ahd_patch_func_t ahd_patch18_func;
+@@ -831,7 +839,7 @@ static ahd_patch_func_t ahd_patch18_func
+ static int
+ ahd_patch18_func(struct ahd_softc *ahd)
+ {
+-	return ((ahd->flags & AHD_TARGETROLE) != 0);
++	return ((ahd->bugs & AHD_AUTOFLUSH_BUG) != 0);
+ }
+ 
+ static ahd_patch_func_t ahd_patch17_func;
+@@ -839,7 +847,7 @@ static ahd_patch_func_t ahd_patch17_func
+ static int
+ ahd_patch17_func(struct ahd_softc *ahd)
+ {
+-	return ((ahd->bugs & AHD_AUTOFLUSH_BUG) != 0);
++	return ((ahd->features & AHD_NEW_DFCNTRL_OPTS) != 0);
+ }
+ 
+ static ahd_patch_func_t ahd_patch16_func;
+@@ -847,7 +855,7 @@ static ahd_patch_func_t ahd_patch16_func
+ static int
+ ahd_patch16_func(struct ahd_softc *ahd)
+ {
+-	return ((ahd->features & AHD_NEW_DFCNTRL_OPTS) != 0);
++	return ((ahd->flags & AHD_39BIT_ADDRESSING) != 0);
+ }
+ 
+ static ahd_patch_func_t ahd_patch15_func;
+@@ -855,7 +863,7 @@ static ahd_patch_func_t ahd_patch15_func
+ static int
+ ahd_patch15_func(struct ahd_softc *ahd)
+ {
+-	return ((ahd->flags & AHD_39BIT_ADDRESSING) != 0);
++	return ((ahd->flags & AHD_64BIT_ADDRESSING) != 0);
+ }
+ 
+ static ahd_patch_func_t ahd_patch14_func;
+@@ -863,7 +871,7 @@ static ahd_patch_func_t ahd_patch14_func
+ static int
+ ahd_patch14_func(struct ahd_softc *ahd)
+ {
+-	return ((ahd->flags & AHD_64BIT_ADDRESSING) != 0);
++	return ((ahd->features & AHD_NEW_DFCNTRL_OPTS) == 0);
+ }
+ 
+ static ahd_patch_func_t ahd_patch13_func;
+@@ -871,7 +879,7 @@ static ahd_patch_func_t ahd_patch13_func
+ static int
+ ahd_patch13_func(struct ahd_softc *ahd)
+ {
+-	return ((ahd->features & AHD_NEW_DFCNTRL_OPTS) == 0);
++	return ((ahd->bugs & AHD_REG_SLOW_SETTLE_BUG) != 0);
+ }
+ 
+ static ahd_patch_func_t ahd_patch12_func;
+@@ -879,7 +887,7 @@ static ahd_patch_func_t ahd_patch12_func
+ static int
+ ahd_patch12_func(struct ahd_softc *ahd)
+ {
+-	return ((ahd->bugs & AHD_REG_SLOW_SETTLE_BUG) != 0);
++	return ((ahd->bugs & AHD_EARLY_REQ_BUG) != 0);
+ }
+ 
+ static ahd_patch_func_t ahd_patch11_func;
+@@ -887,7 +895,7 @@ static ahd_patch_func_t ahd_patch11_func
+ static int
+ ahd_patch11_func(struct ahd_softc *ahd)
+ {
+-	return ((ahd->bugs & AHD_EARLY_REQ_BUG) != 0);
++	return ((ahd->bugs & AHD_BUSFREEREV_BUG) == 0);
+ }
+ 
+ static ahd_patch_func_t ahd_patch10_func;
+@@ -895,7 +903,7 @@ static ahd_patch_func_t ahd_patch10_func
+ static int
+ ahd_patch10_func(struct ahd_softc *ahd)
+ {
+-	return ((ahd->bugs & AHD_BUSFREEREV_BUG) == 0);
++	return ((ahd->flags & AHD_SEQUENCER_DEBUG) != 0);
+ }
+ 
+ static ahd_patch_func_t ahd_patch9_func;
+@@ -903,7 +911,7 @@ static ahd_patch_func_t ahd_patch9_func;
+ static int
+ ahd_patch9_func(struct ahd_softc *ahd)
+ {
+-	return ((ahd->flags & AHD_SEQUENCER_DEBUG) != 0);
++	return ((ahd->features & AHD_FAST_CDB_DELIVERY) != 0);
+ }
+ 
+ static ahd_patch_func_t ahd_patch8_func;
+@@ -1003,73 +1011,75 @@ static struct patch {
+ 	{ ahd_patch0_func, 48, 1, 1 },
+ 	{ ahd_patch2_func, 51, 1, 2 },
+ 	{ ahd_patch0_func, 52, 1, 1 },
++	{ ahd_patch2_func, 61, 1, 2 },
++	{ ahd_patch0_func, 62, 1, 1 },
+ 	{ ahd_patch2_func, 65, 1, 2 },
+ 	{ ahd_patch0_func, 66, 1, 1 },
+-	{ ahd_patch2_func, 69, 1, 2 },
+-	{ ahd_patch0_func, 70, 1, 1 },
+-	{ ahd_patch1_func, 73, 1, 2 },
+-	{ ahd_patch0_func, 74, 1, 1 },
+-	{ ahd_patch4_func, 107, 1, 1 },
+-	{ ahd_patch2_func, 162, 6, 1 },
+-	{ ahd_patch1_func, 168, 2, 1 },
+-	{ ahd_patch5_func, 170, 1, 1 },
+-	{ ahd_patch2_func, 179, 1, 2 },
+-	{ ahd_patch0_func, 180, 1, 1 },
+-	{ ahd_patch6_func, 181, 2, 2 },
+-	{ ahd_patch0_func, 183, 6, 3 },
+-	{ ahd_patch2_func, 186, 1, 2 },
+-	{ ahd_patch0_func, 187, 1, 1 },
+-	{ ahd_patch2_func, 190, 1, 2 },
+-	{ ahd_patch0_func, 191, 1, 1 },
+-	{ ahd_patch7_func, 193, 2, 1 },
+-	{ ahd_patch5_func, 201, 16, 2 },
+-	{ ahd_patch0_func, 217, 1, 1 },
+-	{ ahd_patch8_func, 237, 2, 1 },
+-	{ ahd_patch1_func, 241, 1, 2 },
+-	{ ahd_patch0_func, 242, 1, 1 },
+-	{ ahd_patch7_func, 245, 2, 1 },
+-	{ ahd_patch1_func, 259, 1, 2 },
+-	{ ahd_patch0_func, 260, 1, 1 },
+-	{ ahd_patch1_func, 263, 1, 2 },
+-	{ ahd_patch0_func, 264, 1, 1 },
+-	{ ahd_patch2_func, 267, 1, 2 },
+-	{ ahd_patch0_func, 268, 1, 1 },
+-	{ ahd_patch1_func, 323, 1, 2 },
+-	{ ahd_patch0_func, 324, 1, 1 },
+-	{ ahd_patch2_func, 332, 1, 2 },
+-	{ ahd_patch0_func, 333, 1, 1 },
+-	{ ahd_patch2_func, 336, 1, 2 },
+-	{ ahd_patch0_func, 337, 1, 1 },
+-	{ ahd_patch1_func, 343, 1, 2 },
+-	{ ahd_patch0_func, 344, 1, 1 },
+-	{ ahd_patch1_func, 346, 1, 2 },
+-	{ ahd_patch0_func, 347, 1, 1 },
+-	{ ahd_patch9_func, 366, 1, 1 },
+-	{ ahd_patch9_func, 369, 1, 1 },
+-	{ ahd_patch9_func, 371, 1, 1 },
+-	{ ahd_patch9_func, 383, 1, 1 },
+-	{ ahd_patch1_func, 393, 1, 2 },
+-	{ ahd_patch0_func, 394, 1, 1 },
+-	{ ahd_patch1_func, 396, 1, 2 },
+-	{ ahd_patch0_func, 397, 1, 1 },
+-	{ ahd_patch1_func, 405, 1, 2 },
+-	{ ahd_patch0_func, 406, 1, 1 },
+-	{ ahd_patch2_func, 419, 1, 2 },
+-	{ ahd_patch0_func, 420, 1, 1 },
+-	{ ahd_patch10_func, 450, 1, 1 },
+-	{ ahd_patch1_func, 457, 1, 2 },
+-	{ ahd_patch0_func, 458, 1, 1 },
+-	{ ahd_patch2_func, 470, 1, 2 },
+-	{ ahd_patch0_func, 471, 1, 1 },
+-	{ ahd_patch11_func, 476, 6, 2 },
++	{ ahd_patch4_func, 102, 1, 1 },
++	{ ahd_patch2_func, 157, 6, 1 },
++	{ ahd_patch1_func, 163, 2, 1 },
++	{ ahd_patch5_func, 165, 1, 1 },
++	{ ahd_patch2_func, 174, 1, 2 },
++	{ ahd_patch0_func, 175, 1, 1 },
++	{ ahd_patch6_func, 176, 2, 2 },
++	{ ahd_patch0_func, 178, 6, 3 },
++	{ ahd_patch2_func, 181, 1, 2 },
++	{ ahd_patch0_func, 182, 1, 1 },
++	{ ahd_patch2_func, 185, 1, 2 },
++	{ ahd_patch0_func, 186, 1, 1 },
++	{ ahd_patch3_func, 188, 1, 1 },
++	{ ahd_patch7_func, 189, 3, 1 },
++	{ ahd_patch3_func, 198, 1, 1 },
++	{ ahd_patch5_func, 199, 16, 2 },
++	{ ahd_patch0_func, 215, 1, 1 },
++	{ ahd_patch8_func, 235, 2, 1 },
++	{ ahd_patch1_func, 239, 1, 2 },
++	{ ahd_patch0_func, 240, 1, 1 },
++	{ ahd_patch7_func, 243, 3, 1 },
++	{ ahd_patch1_func, 258, 1, 2 },
++	{ ahd_patch0_func, 259, 1, 1 },
++	{ ahd_patch1_func, 262, 1, 2 },
++	{ ahd_patch0_func, 263, 1, 1 },
++	{ ahd_patch2_func, 266, 1, 2 },
++	{ ahd_patch0_func, 267, 1, 1 },
++	{ ahd_patch9_func, 280, 2, 2 },
++	{ ahd_patch0_func, 282, 1, 1 },
++	{ ahd_patch1_func, 324, 1, 2 },
++	{ ahd_patch0_func, 325, 1, 1 },
++	{ ahd_patch2_func, 333, 1, 2 },
++	{ ahd_patch0_func, 334, 1, 1 },
++	{ ahd_patch2_func, 337, 1, 2 },
++	{ ahd_patch0_func, 338, 1, 1 },
++	{ ahd_patch1_func, 344, 1, 2 },
++	{ ahd_patch0_func, 345, 1, 1 },
++	{ ahd_patch1_func, 347, 1, 2 },
++	{ ahd_patch0_func, 348, 1, 1 },
++	{ ahd_patch10_func, 367, 1, 1 },
++	{ ahd_patch10_func, 370, 1, 1 },
++	{ ahd_patch10_func, 372, 1, 1 },
++	{ ahd_patch10_func, 384, 1, 1 },
++	{ ahd_patch1_func, 394, 1, 2 },
++	{ ahd_patch0_func, 395, 1, 1 },
++	{ ahd_patch1_func, 397, 1, 2 },
++	{ ahd_patch0_func, 398, 1, 1 },
++	{ ahd_patch1_func, 406, 1, 2 },
++	{ ahd_patch0_func, 407, 1, 1 },
++	{ ahd_patch2_func, 420, 1, 2 },
++	{ ahd_patch0_func, 421, 1, 1 },
++	{ ahd_patch11_func, 451, 1, 1 },
++	{ ahd_patch1_func, 459, 1, 2 },
++	{ ahd_patch0_func, 460, 1, 1 },
++	{ ahd_patch2_func, 472, 1, 2 },
++	{ ahd_patch0_func, 473, 1, 1 },
++	{ ahd_patch12_func, 476, 6, 2 },
+ 	{ ahd_patch0_func, 482, 1, 1 },
+-	{ ahd_patch12_func, 505, 1, 1 },
+-	{ ahd_patch13_func, 514, 1, 1 },
+-	{ ahd_patch14_func, 515, 1, 2 },
++	{ ahd_patch13_func, 505, 1, 1 },
++	{ ahd_patch14_func, 514, 1, 1 },
++	{ ahd_patch15_func, 515, 1, 2 },
+ 	{ ahd_patch0_func, 516, 1, 1 },
+-	{ ahd_patch15_func, 519, 1, 1 },
+-	{ ahd_patch14_func, 520, 1, 1 },
+-	{ ahd_patch16_func, 531, 1, 2 },
++	{ ahd_patch16_func, 519, 1, 1 },
++	{ ahd_patch15_func, 520, 1, 1 },
++	{ ahd_patch17_func, 531, 1, 2 },
+ 	{ ahd_patch0_func, 532, 1, 1 },
+ 	{ ahd_patch1_func, 551, 1, 2 },
+ 	{ ahd_patch0_func, 552, 1, 1 },
+@@ -1083,25 +1093,25 @@ static struct patch {
+ 	{ ahd_patch0_func, 569, 1, 1 },
+ 	{ ahd_patch2_func, 580, 1, 2 },
+ 	{ ahd_patch0_func, 581, 1, 1 },
+-	{ ahd_patch17_func, 585, 1, 1 },
+-	{ ahd_patch18_func, 590, 1, 1 },
+-	{ ahd_patch19_func, 591, 2, 1 },
+-	{ ahd_patch18_func, 595, 1, 2 },
++	{ ahd_patch18_func, 585, 1, 1 },
++	{ ahd_patch19_func, 590, 1, 1 },
++	{ ahd_patch20_func, 591, 2, 1 },
++	{ ahd_patch19_func, 595, 1, 2 },
+ 	{ ahd_patch0_func, 596, 1, 1 },
+ 	{ ahd_patch2_func, 599, 1, 2 },
+ 	{ ahd_patch0_func, 600, 1, 1 },
+ 	{ ahd_patch2_func, 615, 1, 2 },
+ 	{ ahd_patch0_func, 616, 1, 1 },
+-	{ ahd_patch20_func, 617, 14, 1 },
++	{ ahd_patch21_func, 617, 14, 1 },
+ 	{ ahd_patch1_func, 635, 1, 2 },
+ 	{ ahd_patch0_func, 636, 1, 1 },
+-	{ ahd_patch20_func, 637, 1, 1 },
++	{ ahd_patch21_func, 637, 1, 1 },
+ 	{ ahd_patch1_func, 649, 1, 2 },
+ 	{ ahd_patch0_func, 650, 1, 1 },
+ 	{ ahd_patch1_func, 657, 1, 2 },
+ 	{ ahd_patch0_func, 658, 1, 1 },
+-	{ ahd_patch17_func, 681, 1, 1 },
+-	{ ahd_patch17_func, 719, 1, 1 },
++	{ ahd_patch18_func, 681, 1, 1 },
++	{ ahd_patch18_func, 719, 1, 1 },
+ 	{ ahd_patch1_func, 730, 1, 2 },
+ 	{ ahd_patch0_func, 731, 1, 1 },
+ 	{ ahd_patch1_func, 748, 1, 2 },
+@@ -1110,11 +1120,11 @@ static struct patch {
+ 	{ ahd_patch0_func, 752, 1, 1 },
+ 	{ ahd_patch1_func, 755, 1, 2 },
+ 	{ ahd_patch0_func, 756, 1, 1 },
+-	{ ahd_patch21_func, 758, 1, 2 },
++	{ ahd_patch22_func, 758, 1, 2 },
+ 	{ ahd_patch0_func, 759, 2, 1 },
+-	{ ahd_patch22_func, 762, 4, 2 },
++	{ ahd_patch23_func, 762, 4, 2 },
+ 	{ ahd_patch0_func, 766, 1, 1 },
+-	{ ahd_patch22_func, 774, 11, 1 }
++	{ ahd_patch23_func, 774, 11, 1 }
+ };
+ 
+ static struct cs {
+@@ -1123,15 +1133,18 @@ static struct cs {
+ } critical_sections[] = {
+ 	{ 11, 12 },
+ 	{ 13, 14 },
+-	{ 29, 42 },
+-	{ 56, 59 },
+-	{ 101, 128 },
+-	{ 129, 157 },
+-	{ 159, 162 },
+-	{ 170, 178 },
+-	{ 201, 250 },
+-	{ 681, 697 },
+-	{ 697, 711 },
++	{ 31, 42 },
++	{ 45, 47 },
++	{ 49, 50 },
++	{ 56, 78 },
++	{ 96, 123 },
++	{ 124, 152 },
++	{ 154, 157 },
++	{ 165, 173 },
++	{ 198, 249 },
++	{ 428, 430 },
++	{ 433, 436 },
++	{ 681, 711 },
+ 	{ 721, 725 }
+ };
+ 
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic7xxx_93cx6.c	2003-06-14 12:18:35.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aic7xxx_93cx6.c	2003-12-28 23:21:39.000000000 -0800
+@@ -28,9 +28,7 @@
+  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+  * SUCH DAMAGE.
+  *
+- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_93cx6.c#17 $
+- *
+- * $FreeBSD$
++ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_93cx6.c#19 $
+  */
+ 
+ /*
+@@ -64,7 +62,6 @@
+  *   is preceded by an initial zero (leading 0, followed by 16-bits, MSB
+  *   first).  The clock cycling from low to high initiates the next data
+  *   bit to be sent from the chip.
+- *
+  */
+ 
+ #ifdef __linux__
+@@ -72,6 +69,8 @@
+ #include "aic7xxx_inline.h"
+ #include "aic7xxx_93cx6.h"
+ #else
++#include <sys/cdefs.h>
++__FBSDID("$FreeBSD$");
+ #include <dev/aic7xxx/aic7xxx_osm.h>
+ #include <dev/aic7xxx/aic7xxx_inline.h>
+ #include <dev/aic7xxx/aic7xxx_93cx6.h>
+@@ -81,14 +80,22 @@
+  * Right now, we only have to read the SEEPROM.  But we make it easier to
+  * add other 93Cx6 functions.
+  */
+-static struct seeprom_cmd {
++struct seeprom_cmd {
+   	uint8_t len;
+- 	uint8_t bits[9];
+-} seeprom_read = {3, {1, 1, 0}};
++ 	uint8_t bits[11];
++};
+ 
++/* Short opcodes for the c46 */
+ static struct seeprom_cmd seeprom_ewen = {9, {1, 0, 0, 1, 1, 0, 0, 0, 0}};
+ static struct seeprom_cmd seeprom_ewds = {9, {1, 0, 0, 0, 0, 0, 0, 0, 0}};
++
++/* Long opcodes for the C56/C66 */
++static struct seeprom_cmd seeprom_long_ewen = {11, {1, 0, 0, 1, 1, 0, 0, 0, 0}};
++static struct seeprom_cmd seeprom_long_ewds = {11, {1, 0, 0, 0, 0, 0, 0, 0, 0}};
++
++/* Common opcodes */
+ static struct seeprom_cmd seeprom_write = {3, {1, 0, 1}};
++static struct seeprom_cmd seeprom_read  = {3, {1, 1, 0}};
+ 
+ /*
+  * Wait for the SEERDY to go high; about 800 ns.
+@@ -222,12 +229,25 @@ int
+ ahc_write_seeprom(struct seeprom_descriptor *sd, uint16_t *buf,
+ 		  u_int start_addr, u_int count)
+ {
++	struct seeprom_cmd *ewen, *ewds;
+ 	uint16_t v;
+ 	uint8_t temp;
+ 	int i, k;
+ 
+ 	/* Place the chip into write-enable mode */
+-	send_seeprom_cmd(sd, &seeprom_ewen);
++	if (sd->sd_chip == C46) {
++		ewen = &seeprom_ewen;
++		ewds = &seeprom_ewds;
++	} else if (sd->sd_chip == C56_66) {
++		ewen = &seeprom_long_ewen;
++		ewds = &seeprom_long_ewds;
++	} else {
++		printf("ahc_write_seeprom: unsupported seeprom type %d\n",
++		       sd->sd_chip);
++		return (0);
++	}
++
++	send_seeprom_cmd(sd, ewen);
+ 	reset_seeprom(sd);
+ 
+ 	/* Write all requested data out to the seeprom. */
+@@ -277,7 +297,7 @@ ahc_write_seeprom(struct seeprom_descrip
+ 	}
+ 
+ 	/* Put the chip back into write-protect mode */
+-	send_seeprom_cmd(sd, &seeprom_ewds);
++	send_seeprom_cmd(sd, ewds);
+ 	reset_seeprom(sd);
+ 
+ 	return (1);
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic7xxx_core.c	2003-06-14 12:18:09.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aic7xxx_core.c	2003-12-28 23:21:39.000000000 -0800
+@@ -37,9 +37,7 @@
+  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  * POSSIBILITY OF SUCH DAMAGES.
+  *
+- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.c#131 $
+- *
+- * $FreeBSD$
++ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.c#147 $
+  */
+ 
+ #ifdef __linux__
+@@ -47,6 +45,8 @@
+ #include "aic7xxx_inline.h"
+ #include "aicasm/aicasm_insformat.h"
+ #else
++#include <sys/cdefs.h>
++__FBSDID("$FreeBSD$");
+ #include <dev/aic7xxx/aic7xxx_osm.h>
+ #include <dev/aic7xxx/aic7xxx_inline.h>
+ #include <dev/aic7xxx/aicasm/aicasm_insformat.h>
+@@ -320,7 +320,7 @@ ahc_run_qoutfifo(struct ahc_softc *ahc)
+ 			 */
+ 			modnext = ahc->qoutfifonext & ~0x3;
+ 			*((uint32_t *)(&ahc->qoutfifo[modnext])) = 0xFFFFFFFFUL;
+-			ahc_dmamap_sync(ahc, ahc->shared_data_dmat,
++			aic_dmamap_sync(ahc, ahc->shared_data_dmat,
+ 					ahc->shared_data_dmamap,
+ 					/*offset*/modnext, /*len*/4,
+ 					BUS_DMASYNC_PREREAD);
+@@ -458,14 +458,14 @@ ahc_handle_seqint(struct ahc_softc *ahc,
+ 			 * complete.
+ 			 */
+ 			scb->flags &= ~SCB_SENSE;
+-			ahc_set_transaction_status(scb, CAM_AUTOSENSE_FAIL);
++			aic_set_transaction_status(scb, CAM_AUTOSENSE_FAIL);
+ 			break;
+ 		}
+-		ahc_set_transaction_status(scb, CAM_SCSI_STATUS_ERROR);
++		aic_set_transaction_status(scb, CAM_SCSI_STATUS_ERROR);
+ 		/* Freeze the queue until the client sees the error. */
+ 		ahc_freeze_devq(ahc, scb);
+-		ahc_freeze_scb(scb);
+-		ahc_set_scsi_status(scb, hscb->shared_data.status.scsi_status);
++		aic_freeze_scb(scb);
++		aic_set_scsi_status(scb, hscb->shared_data.status.scsi_status);
+ 		switch (hscb->shared_data.status.scsi_status) {
+ 		case SCSI_STATUS_OK:
+ 			printf("%s: Interrupted for staus of 0???\n",
+@@ -487,7 +487,7 @@ ahc_handle_seqint(struct ahc_softc *ahc,
+ 			}
+ #endif
+ 
+-			if (ahc_perform_autosense(scb) == 0)
++			if (aic_perform_autosense(scb) == 0)
+ 				break;
+ 
+ 			targ_info = ahc_fetch_transinfo(ahc,
+@@ -509,12 +509,12 @@ ahc_handle_seqint(struct ahc_softc *ahc,
+ 			}
+ #endif
+ 			sg->addr = ahc_get_sense_bufaddr(ahc, scb);
+-			sg->len = ahc_get_sense_bufsize(ahc, scb);
++			sg->len = aic_get_sense_bufsize(ahc, scb);
+ 			sg->len |= AHC_DMA_LAST_SEG;
+ 
+ 			/* Fixup byte order */
+-			sg->addr = ahc_htole32(sg->addr);
+-			sg->len = ahc_htole32(sg->len);
++			sg->addr = aic_htole32(sg->addr);
++			sg->len = aic_htole32(sg->len);
+ 
+ 			sc->opcode = REQUEST_SENSE;
+ 			sc->byte2 = 0;
+@@ -543,8 +543,8 @@ ahc_handle_seqint(struct ahc_softc *ahc,
+ 			 * errors will be reported before any data
+ 			 * phases occur.
+ 			 */
+-			if (ahc_get_residual(scb) 
+-			 == ahc_get_transfer_length(scb)) {
++			if (aic_get_residual(scb) 
++			 == aic_get_transfer_length(scb)) {
+ 				ahc_update_neg_request(ahc, &devinfo,
+ 						       tstate, targ_info,
+ 						       AHC_NEG_IF_NON_ASYNC);
+@@ -558,7 +558,7 @@ ahc_handle_seqint(struct ahc_softc *ahc,
+ 			hscb->dataptr = sg->addr; 
+ 			hscb->datacnt = sg->len;
+ 			hscb->sgptr = scb->sg_list_phys | SG_FULL_RESID;
+-			hscb->sgptr = ahc_htole32(hscb->sgptr);
++			hscb->sgptr = aic_htole32(hscb->sgptr);
+ 			scb->sg_count = 1;
+ 			scb->flags |= SCB_SENSE;
+ 			ahc_qinfifo_requeue_tail(ahc, scb);
+@@ -567,7 +567,7 @@ ahc_handle_seqint(struct ahc_softc *ahc,
+ 			 * Ensure we have enough time to actually
+ 			 * retrieve the sense.
+ 			 */
+-			ahc_scb_timer_reset(scb, 5 * 1000000);
++			aic_scb_timer_reset(scb, 5 * 1000000);
+ 			break;
+ 		}
+ 		default:
+@@ -768,7 +768,7 @@ ahc_handle_seqint(struct ahc_softc *ahc,
+ 					if ((ahc_inb(ahc, SCSISIGI)
+ 					  & (CDI|MSGI)) != 0)
+ 						break;
+-					ahc_delay(100);
++					aic_delay(100);
+ 				}
+ 				ahc_outb(ahc, SXFRCTL1,
+ 					 ahc_inb(ahc, SXFRCTL1) & ~BITBUCKET);
+@@ -782,7 +782,7 @@ ahc_handle_seqint(struct ahc_softc *ahc,
+ 					scb_index = ahc_inb(ahc, SCB_TAG);
+ 					scb = ahc_lookup_scb(ahc, scb_index);
+ 					if (scb != NULL)
+-						ahc_set_transaction_status(scb,
++						aic_set_transaction_status(scb,
+ 						    CAM_UNCOR_PARITY);
+ 					ahc_reset_channel(ahc, devinfo.channel, 
+ 							  /*init reset*/TRUE);
+@@ -820,16 +820,16 @@ ahc_handle_seqint(struct ahc_softc *ahc,
+ 		ahc_print_path(ahc, scb);
+ 		printf("%s seen Data Phase.  Length = %ld.  NumSGs = %d.\n",
+ 		       ahc_inb(ahc, SEQ_FLAGS) & DPHASE ? "Have" : "Haven't",
+-		       ahc_get_transfer_length(scb), scb->sg_count);
++		       aic_get_transfer_length(scb), scb->sg_count);
+ 		if (scb->sg_count > 0) {
+ 			for (i = 0; i < scb->sg_count; i++) {
+ 
+ 				printf("sg[%d] - Addr 0x%x%x : Length %d\n",
+ 				       i,
+-				       (ahc_le32toh(scb->sg_list[i].len) >> 24
++				       (aic_le32toh(scb->sg_list[i].len) >> 24
+ 				        & SG_HIGH_ADDR_BITS),
+-				       ahc_le32toh(scb->sg_list[i].addr),
+-				       ahc_le32toh(scb->sg_list[i].len)
++				       aic_le32toh(scb->sg_list[i].addr),
++				       aic_le32toh(scb->sg_list[i].len)
+ 				       & AHC_SG_LEN_MASK);
+ 			}
+ 		}
+@@ -839,12 +839,12 @@ ahc_handle_seqint(struct ahc_softc *ahc,
+ 		 */
+ 		ahc_freeze_devq(ahc, scb);
+ 		if ((scb->flags & SCB_SENSE) == 0) {
+-			ahc_set_transaction_status(scb, CAM_DATA_RUN_ERR);
++			aic_set_transaction_status(scb, CAM_DATA_RUN_ERR);
+ 		} else {
+ 			scb->flags &= ~SCB_SENSE;
+-			ahc_set_transaction_status(scb, CAM_AUTOSENSE_FAIL);
++			aic_set_transaction_status(scb, CAM_AUTOSENSE_FAIL);
+ 		}
+-		ahc_freeze_scb(scb);
++		aic_freeze_scb(scb);
+ 
+ 		if ((ahc->features & AHC_ULTRA2) != 0) {
+ 			/*
+@@ -1188,7 +1188,7 @@ ahc_handle_scsiint(struct ahc_softc *ahc
+ 			 */
+ 			ahc_scb_devinfo(ahc, &devinfo, scb);
+ 			ahc_force_renegotiation(ahc, &devinfo);
+-			ahc_set_transaction_status(scb, CAM_SEL_TIMEOUT);
++			aic_set_transaction_status(scb, CAM_SEL_TIMEOUT);
+ 			ahc_freeze_devq(ahc, scb);
+ 		}
+ 		ahc_outb(ahc, CLRINT, CLRSCSIINT);
+@@ -1270,7 +1270,7 @@ ahc_handle_scsiint(struct ahc_softc *ahc
+ 						  CAM_LUN_WILDCARD,
+ 						  SCB_LIST_NULL,
+ 						  ROLE_INITIATOR)) {
+-					ahc_set_transaction_status(scb, CAM_REQ_CMP);
++					aic_set_transaction_status(scb, CAM_REQ_CMP);
+ 				}
+ #endif
+ 				ahc_compile_devinfo(&devinfo,
+@@ -1304,17 +1304,23 @@ ahc_handle_scsiint(struct ahc_softc *ahc
+ 				ahc_qinfifo_requeue_tail(ahc, scb);
+ 				printerror = 0;
+ 			} else if (ahc_sent_msg(ahc, AHCMSG_EXT,
+-						MSG_EXT_WDTR, FALSE)
+-				|| ahc_sent_msg(ahc, AHCMSG_EXT,
+-						MSG_EXT_SDTR, FALSE)) {
++						MSG_EXT_WDTR, FALSE)) {
+ 				/*
+-				 * Negotiation Rejected.  Go-async and
++				 * Negotiation Rejected.  Go-narrow and
+ 				 * retry command.
+ 				 */
+ 				ahc_set_width(ahc, &devinfo,
+ 					      MSG_EXT_WDTR_BUS_8_BIT,
+ 					      AHC_TRANS_CUR|AHC_TRANS_GOAL,
+ 					      /*paused*/TRUE);
++				ahc_qinfifo_requeue_tail(ahc, scb);
++				printerror = 0;
++			} else if (ahc_sent_msg(ahc, AHCMSG_EXT,
++						MSG_EXT_SDTR, FALSE)) {
++				/*
++				 * Negotiation Rejected.  Go-async and
++				 * retry command.
++				 */
+ 				ahc_set_syncrate(ahc, &devinfo,
+ 						/*syncrate*/NULL,
+ 						/*period*/0, /*offset*/0,
+@@ -1463,7 +1469,7 @@ ahc_clear_critical_section(struct ahc_so
+ 				 * current connection, so we must
+ 				 * leave it on while single stepping.
+ 				 */
+-				ahc_outb(ahc, SIMODE1, ENBUSFREE);
++				ahc_outb(ahc, SIMODE1, simode1 & ENBUSFREE);
+ 			else
+ 				ahc_outb(ahc, SIMODE1, 0);
+ 			ahc_outb(ahc, CLRINT, CLRSCSIINT);
+@@ -1476,7 +1482,7 @@ ahc_clear_critical_section(struct ahc_so
+ 		}
+ 		ahc_outb(ahc, HCNTRL, ahc->unpause);
+ 		while (!ahc_is_paused(ahc))
+-			ahc_delay(200);
++			aic_delay(200);
+ 	}
+ 	if (stepping) {
+ 		ahc_outb(ahc, SIMODE0, simode0);
+@@ -1524,18 +1530,18 @@ ahc_print_scb(struct scb *scb)
+ 	for (i = 0; i < sizeof(hscb->shared_data.cdb); i++)
+ 		printf("%#02x", hscb->shared_data.cdb[i]);
+ 	printf("        dataptr:%#x datacnt:%#x sgptr:%#x tag:%#x\n",
+-		ahc_le32toh(hscb->dataptr),
+-		ahc_le32toh(hscb->datacnt),
+-		ahc_le32toh(hscb->sgptr),
++		aic_le32toh(hscb->dataptr),
++		aic_le32toh(hscb->datacnt),
++		aic_le32toh(hscb->sgptr),
+ 		hscb->tag);
+ 	if (scb->sg_count > 0) {
+ 		for (i = 0; i < scb->sg_count; i++) {
+ 			printf("sg[%d] - Addr 0x%x%x : Length %d\n",
+ 			       i,
+-			       (ahc_le32toh(scb->sg_list[i].len) >> 24
++			       (aic_le32toh(scb->sg_list[i].len) >> 24
+ 			        & SG_HIGH_ADDR_BITS),
+-			       ahc_le32toh(scb->sg_list[i].addr),
+-			       ahc_le32toh(scb->sg_list[i].len));
++			       aic_le32toh(scb->sg_list[i].addr),
++			       aic_le32toh(scb->sg_list[i].len));
+ 		}
+ 	}
+ }
+@@ -2373,6 +2379,7 @@ ahc_build_transfer_msg(struct ahc_softc 
+ 	 * may change.
+ 	 */
+ 	period = tinfo->goal.period;
++	offset = tinfo->goal.offset;
+ 	ppr_options = tinfo->goal.ppr_options;
+ 	/* Target initiated PPR is not allowed in the SCSI spec */
+ 	if (devinfo->role == ROLE_TARGET)
+@@ -2380,7 +2387,7 @@ ahc_build_transfer_msg(struct ahc_softc 
+ 	rate = ahc_devlimited_syncrate(ahc, tinfo, &period,
+ 				       &ppr_options, devinfo->role);
+ 	dowide = tinfo->curr.width != tinfo->goal.width;
+-	dosync = tinfo->curr.period != period;
++	dosync = tinfo->curr.offset != offset || tinfo->curr.period != period;
+ 	/*
+ 	 * Only use PPR if we have options that need it, even if the device
+ 	 * claims to support it.  There might be an expander in the way
+@@ -2568,7 +2575,7 @@ ahc_handle_proto_violation(struct ahc_so
+ 		printf("No SCB found during protocol violation\n");
+ 		goto proto_violation_reset;
+ 	} else {
+-		ahc_set_transaction_status(scb, CAM_SEQUENCE_FAIL);
++		aic_set_transaction_status(scb, CAM_SEQUENCE_FAIL);
+ 		if ((seq_flags & NO_CDB_SENT) != 0) {
+ 			ahc_print_path(ahc, scb);
+ 			printf("No or incomplete CDB sent to device.\n");
+@@ -3176,23 +3183,30 @@ ahc_parse_msg(struct ahc_softc *ahc, str
+ 				response = TRUE;
+ 				sending_reply = TRUE;
+ 			}
++			/*
++			 * After a wide message, we are async, but
++			 * some devices don't seem to honor this portion
++			 * of the spec.  Force a renegotiation of the
++			 * sync component of our transfer agreement even
++			 * if our goal is async.  By updating our width
++			 * after forcing the negotiation, we avoid
++			 * renegotiating for width.
++			 */
++			ahc_update_neg_request(ahc, devinfo, tstate,
++					       tinfo, AHC_NEG_ALWAYS);
+ 			ahc_set_width(ahc, devinfo, bus_width,
+ 				      AHC_TRANS_ACTIVE|AHC_TRANS_GOAL,
+ 				      /*paused*/TRUE);
+-			/* After a wide message, we are async */
+-			ahc_set_syncrate(ahc, devinfo,
+-					 /*syncrate*/NULL, /*period*/0,
+-					 /*offset*/0, /*ppr_options*/0,
+-					 AHC_TRANS_ACTIVE, /*paused*/TRUE);
+ 			if (sending_reply == FALSE && reject == FALSE) {
+ 
+-				if (tinfo->goal.offset) {
+-					ahc->msgout_index = 0;
+-					ahc->msgout_len = 0;
+-					ahc_build_transfer_msg(ahc, devinfo);
+-					ahc->msgout_index = 0;
+-					response = TRUE;
+-				}
++				/*
++				 * We will always have an SDTR to send.
++				 */
++				ahc->msgout_index = 0;
++				ahc->msgout_len = 0;
++				ahc_build_transfer_msg(ahc, devinfo);
++				ahc->msgout_index = 0;
++				response = TRUE;
+ 			}
+ 			done = MSGLOOP_MSGCOMPLETE;
+ 			break;
+@@ -3499,7 +3513,7 @@ ahc_handle_msg_reject(struct ahc_softc *
+ 		ahc_outb(ahc, SCB_CONTROL,
+ 			 ahc_inb(ahc, SCB_CONTROL) & mask);
+ 	 	scb->hscb->control &= mask;
+-		ahc_set_transaction_tag(scb, /*enabled*/FALSE,
++		aic_set_transaction_tag(scb, /*enabled*/FALSE,
+ 					/*type*/MSG_SIMPLE_TASK);
+ 		ahc_outb(ahc, MSG_OUT, MSG_IDENTIFYFLAG);
+ 		ahc_assert_atn(ahc);
+@@ -3556,7 +3570,7 @@ ahc_handle_ign_wide_residue(struct ahc_s
+ 	 * Perhaps add datadir to some spare bits in the hscb?
+ 	 */
+ 	if ((ahc_inb(ahc, SEQ_FLAGS) & DPHASE) == 0
+-	 || ahc_get_transfer_dir(scb) != CAM_DIR_IN) {
++	 || aic_get_transfer_dir(scb) != CAM_DIR_IN) {
+ 		/*
+ 		 * Ignore the message if we haven't
+ 		 * seen an appropriate data phase yet.
+@@ -3612,18 +3626,18 @@ ahc_handle_ign_wide_residue(struct ahc_s
+ 			 * to load so we must go back one.
+ 			 */
+ 			sg--;
+-			sglen = ahc_le32toh(sg->len) & AHC_SG_LEN_MASK;
++			sglen = aic_le32toh(sg->len) & AHC_SG_LEN_MASK;
+ 			if (sg != scb->sg_list
+ 			 && sglen < (data_cnt & AHC_SG_LEN_MASK)) {
+ 
+ 				sg--;
+-				sglen = ahc_le32toh(sg->len);
++				sglen = aic_le32toh(sg->len);
+ 				/*
+ 				 * Preserve High Address and SG_LIST bits
+ 				 * while setting the count to 1.
+ 				 */
+ 				data_cnt = 1 | (sglen & (~AHC_SG_LEN_MASK));
+-				data_addr = ahc_le32toh(sg->addr)
++				data_addr = aic_le32toh(sg->addr)
+ 					  + (sglen & AHC_SG_LEN_MASK) - 1;
+ 
+ 				/*
+@@ -3679,8 +3693,8 @@ ahc_reinitialize_dataptrs(struct ahc_sof
+ 	      | (ahc_inb(ahc, SCB_RESIDUAL_DATACNT + 1) << 8)
+ 	      | ahc_inb(ahc, SCB_RESIDUAL_DATACNT);
+ 
+-	dataptr = ahc_le32toh(sg->addr)
+-		+ (ahc_le32toh(sg->len) & AHC_SG_LEN_MASK)
++	dataptr = aic_le32toh(sg->addr)
++		+ (aic_le32toh(sg->len) & AHC_SG_LEN_MASK)
+ 		- resid;
+ 	if ((ahc->flags & AHC_39BIT_ADDRESSING) != 0) {
+ 		u_int dscommand1;
+@@ -3688,7 +3702,7 @@ ahc_reinitialize_dataptrs(struct ahc_sof
+ 		dscommand1 = ahc_inb(ahc, DSCOMMAND1);
+ 		ahc_outb(ahc, DSCOMMAND1, dscommand1 | HADDLDSEL0);
+ 		ahc_outb(ahc, HADDR,
+-			 (ahc_le32toh(sg->len) >> 24) & SG_HIGH_ADDR_BITS);
++			 (aic_le32toh(sg->len) >> 24) & SG_HIGH_ADDR_BITS);
+ 		ahc_outb(ahc, DSCOMMAND1, dscommand1);
+ 	}
+ 	ahc_outb(ahc, HADDR + 3, dataptr >> 24);
+@@ -3869,7 +3883,7 @@ ahc_softc_insert(struct ahc_softc *ahc)
+ {
+ 	struct ahc_softc *list_ahc;
+ 
+-#if AHC_PCI_CONFIG > 0
++#if AIC_PCI_CONFIG > 0
+ 	/*
+ 	 * Second Function PCI devices need to inherit some
+ 	 * settings from function 0.
+@@ -3877,17 +3891,17 @@ ahc_softc_insert(struct ahc_softc *ahc)
+ 	if ((ahc->chip & AHC_BUS_MASK) == AHC_PCI
+ 	 && (ahc->features & AHC_MULTI_FUNC) != 0) {
+ 		TAILQ_FOREACH(list_ahc, &ahc_tailq, links) {
+-			ahc_dev_softc_t list_pci;
+-			ahc_dev_softc_t pci;
++			aic_dev_softc_t list_pci;
++			aic_dev_softc_t pci;
+ 
+ 			list_pci = list_ahc->dev_softc;
+ 			pci = ahc->dev_softc;
+-			if (ahc_get_pci_slot(list_pci) == ahc_get_pci_slot(pci)
+-			 && ahc_get_pci_bus(list_pci) == ahc_get_pci_bus(pci)) {
++			if (aic_get_pci_slot(list_pci) == aic_get_pci_slot(pci)
++			 && aic_get_pci_bus(list_pci) == aic_get_pci_bus(pci)) {
+ 				struct ahc_softc *master;
+ 				struct ahc_softc *slave;
+ 
+-				if (ahc_get_pci_function(list_pci) == 0) {
++				if (aic_get_pci_function(list_pci) == 0) {
+ 					master = list_ahc;
+ 					slave = ahc;
+ 				} else {
+@@ -3955,27 +3969,27 @@ ahc_free(struct ahc_softc *ahc)
+ {
+ 	int i;
+ 
++	ahc_terminate_recovery_thread(ahc);
+ 	switch (ahc->init_level) {
+ 	default:
+ 	case 5:
+ 		ahc_shutdown(ahc);
+-		TAILQ_REMOVE(&ahc_tailq, ahc, links);
+ 		/* FALLTHROUGH */
+ 	case 4:
+-		ahc_dmamap_unload(ahc, ahc->shared_data_dmat,
++		aic_dmamap_unload(ahc, ahc->shared_data_dmat,
+ 				  ahc->shared_data_dmamap);
+ 		/* FALLTHROUGH */
+ 	case 3:
+-		ahc_dmamem_free(ahc, ahc->shared_data_dmat, ahc->qoutfifo,
++		aic_dmamem_free(ahc, ahc->shared_data_dmat, ahc->qoutfifo,
+ 				ahc->shared_data_dmamap);
+-		ahc_dmamap_destroy(ahc, ahc->shared_data_dmat,
++		aic_dmamap_destroy(ahc, ahc->shared_data_dmat,
+ 				   ahc->shared_data_dmamap);
+ 		/* FALLTHROUGH */
+ 	case 2:
+-		ahc_dma_tag_destroy(ahc, ahc->shared_data_dmat);
++		aic_dma_tag_destroy(ahc, ahc->shared_data_dmat);
+ 	case 1:
+ #ifndef __linux__
+-		ahc_dma_tag_destroy(ahc, ahc->buffer_dmat);
++		aic_dma_tag_destroy(ahc, ahc->buffer_dmat);
+ #endif
+ 		break;
+ 	case 0:
+@@ -3983,7 +3997,7 @@ ahc_free(struct ahc_softc *ahc)
+ 	}
+ 
+ #ifndef __linux__
+-	ahc_dma_tag_destroy(ahc, ahc->parent_dmat);
++	aic_dma_tag_destroy(ahc, ahc->parent_dmat);
+ #endif
+ 	ahc_platform_free(ahc);
+ 	ahc_fini_scbdata(ahc);
+@@ -4033,7 +4047,7 @@ ahc_shutdown(void *arg)
+ 	ahc = (struct ahc_softc *)arg;
+ 
+ 	/* This will reset most registers to 0, but not all */
+-	ahc_reset(ahc);
++	ahc_reset(ahc, /*reinit*/FALSE);
+ 	ahc_outb(ahc, SCSISEQ, 0);
+ 	ahc_outb(ahc, SXFRCTL0, 0);
+ 	ahc_outb(ahc, DSPCISTATUS, 0);
+@@ -4044,10 +4058,15 @@ ahc_shutdown(void *arg)
+ 
+ /*
+  * Reset the controller and record some information about it
+- * that is only available just after a reset.
++ * that is only available just after a reset.  If "reinit" is
++ * non-zero, this reset occured after initial configuration
++ * and the caller requests that the chip be fully reinitialized
++ * to a runable state.  Chip interrupts are *not* enabled after
++ * a reinitialization.  The caller must enable interrupts via
++ * ahc_intr_enable().
+  */
+ int
+-ahc_reset(struct ahc_softc *ahc)
++ahc_reset(struct ahc_softc *ahc, int reinit)
+ {
+ 	u_int	sblkctl;
+ 	u_int	sxfrctl1_a, sxfrctl1_b;
+@@ -4060,14 +4079,6 @@ ahc_reset(struct ahc_softc *ahc)
+ 	 * to disturb the integrity of the bus.
+ 	 */
+ 	ahc_pause(ahc);
+-	if ((ahc_inb(ahc, HCNTRL) & CHIPRST) != 0) {
+-		/*
+-		 * The chip has not been initialized since
+-		 * PCI/EISA/VLB bus reset.  Don't trust
+-		 * "left over BIOS data".
+-		 */
+-		ahc->flags |= AHC_NO_BIOS_INIT;
+-	}
+ 	sxfrctl1_b = 0;
+ 	if ((ahc->chip & AHC_CHIPID_MASK) == AHC_AIC7770) {
+ 		u_int sblkctl;
+@@ -4093,7 +4104,7 @@ ahc_reset(struct ahc_softc *ahc)
+ 	 */
+ 	wait = 1000;
+ 	do {
+-		ahc_delay(1000);
++		aic_delay(1000);
+ 	} while (--wait && !(ahc_inb(ahc, HCNTRL) & CHIPRSTACK));
+ 
+ 	if (wait == 0) {
+@@ -4143,7 +4154,7 @@ ahc_reset(struct ahc_softc *ahc)
+ 	ahc_outb(ahc, SXFRCTL1, sxfrctl1_a);
+ 
+ 	error = 0;
+-	if (ahc->init_level > 0)
++	if (reinit != 0)
+ 		/*
+ 		 * If a recovery action has forced a chip reset,
+ 		 * re-initialize the chip to our liking.
+@@ -4273,7 +4284,7 @@ ahc_init_scbdata(struct ahc_softc *ahc)
+ 	 */
+ 
+ 	/* DMA tag for our hardware scb structures */
+-	if (ahc_dma_tag_create(ahc, ahc->parent_dmat, /*alignment*/1,
++	if (aic_dma_tag_create(ahc, ahc->parent_dmat, /*alignment*/1,
+ 			       /*boundary*/BUS_SPACE_MAXADDR_32BIT + 1,
+ 			       /*lowaddr*/BUS_SPACE_MAXADDR_32BIT,
+ 			       /*highaddr*/BUS_SPACE_MAXADDR,
+@@ -4288,7 +4299,7 @@ ahc_init_scbdata(struct ahc_softc *ahc)
+ 	scb_data->init_level++;
+ 
+ 	/* Allocation for our hscbs */
+-	if (ahc_dmamem_alloc(ahc, scb_data->hscb_dmat,
++	if (aic_dmamem_alloc(ahc, scb_data->hscb_dmat,
+ 			     (void **)&scb_data->hscbs,
+ 			     BUS_DMA_NOWAIT, &scb_data->hscb_dmamap) != 0) {
+ 		goto error_exit;
+@@ -4297,7 +4308,7 @@ ahc_init_scbdata(struct ahc_softc *ahc)
+ 	scb_data->init_level++;
+ 
+ 	/* And permanently map them */
+-	ahc_dmamap_load(ahc, scb_data->hscb_dmat, scb_data->hscb_dmamap,
++	aic_dmamap_load(ahc, scb_data->hscb_dmat, scb_data->hscb_dmamap,
+ 			scb_data->hscbs,
+ 			AHC_SCB_MAX_ALLOC * sizeof(struct hardware_scb),
+ 			ahc_dmamap_cb, &scb_data->hscb_busaddr, /*flags*/0);
+@@ -4305,7 +4316,7 @@ ahc_init_scbdata(struct ahc_softc *ahc)
+ 	scb_data->init_level++;
+ 
+ 	/* DMA tag for our sense buffers */
+-	if (ahc_dma_tag_create(ahc, ahc->parent_dmat, /*alignment*/1,
++	if (aic_dma_tag_create(ahc, ahc->parent_dmat, /*alignment*/1,
+ 			       /*boundary*/BUS_SPACE_MAXADDR_32BIT + 1,
+ 			       /*lowaddr*/BUS_SPACE_MAXADDR_32BIT,
+ 			       /*highaddr*/BUS_SPACE_MAXADDR,
+@@ -4320,7 +4331,7 @@ ahc_init_scbdata(struct ahc_softc *ahc)
+ 	scb_data->init_level++;
+ 
+ 	/* Allocate them */
+-	if (ahc_dmamem_alloc(ahc, scb_data->sense_dmat,
++	if (aic_dmamem_alloc(ahc, scb_data->sense_dmat,
+ 			     (void **)&scb_data->sense,
+ 			     BUS_DMA_NOWAIT, &scb_data->sense_dmamap) != 0) {
+ 		goto error_exit;
+@@ -4329,7 +4340,7 @@ ahc_init_scbdata(struct ahc_softc *ahc)
+ 	scb_data->init_level++;
+ 
+ 	/* And permanently map them */
+-	ahc_dmamap_load(ahc, scb_data->sense_dmat, scb_data->sense_dmamap,
++	aic_dmamap_load(ahc, scb_data->sense_dmat, scb_data->sense_dmamap,
+ 			scb_data->sense,
+ 			AHC_SCB_MAX_ALLOC * sizeof(struct scsi_sense_data),
+ 			ahc_dmamap_cb, &scb_data->sense_busaddr, /*flags*/0);
+@@ -4337,7 +4348,7 @@ ahc_init_scbdata(struct ahc_softc *ahc)
+ 	scb_data->init_level++;
+ 
+ 	/* DMA tag for our S/G structures.  We allocate in page sized chunks */
+-	if (ahc_dma_tag_create(ahc, ahc->parent_dmat, /*alignment*/8,
++	if (aic_dma_tag_create(ahc, ahc->parent_dmat, /*alignment*/8,
+ 			       /*boundary*/BUS_SPACE_MAXADDR_32BIT + 1,
+ 			       /*lowaddr*/BUS_SPACE_MAXADDR_32BIT,
+ 			       /*highaddr*/BUS_SPACE_MAXADDR,
+@@ -4394,35 +4405,35 @@ ahc_fini_scbdata(struct ahc_softc *ahc)
+ 
+ 		while ((sg_map = SLIST_FIRST(&scb_data->sg_maps))!= NULL) {
+ 			SLIST_REMOVE_HEAD(&scb_data->sg_maps, links);
+-			ahc_dmamap_unload(ahc, scb_data->sg_dmat,
++			aic_dmamap_unload(ahc, scb_data->sg_dmat,
+ 					  sg_map->sg_dmamap);
+-			ahc_dmamem_free(ahc, scb_data->sg_dmat,
++			aic_dmamem_free(ahc, scb_data->sg_dmat,
+ 					sg_map->sg_vaddr,
+ 					sg_map->sg_dmamap);
+ 			free(sg_map, M_DEVBUF);
+ 		}
+-		ahc_dma_tag_destroy(ahc, scb_data->sg_dmat);
++		aic_dma_tag_destroy(ahc, scb_data->sg_dmat);
+ 	}
+ 	case 6:
+-		ahc_dmamap_unload(ahc, scb_data->sense_dmat,
++		aic_dmamap_unload(ahc, scb_data->sense_dmat,
+ 				  scb_data->sense_dmamap);
+ 	case 5:
+-		ahc_dmamem_free(ahc, scb_data->sense_dmat, scb_data->sense,
++		aic_dmamem_free(ahc, scb_data->sense_dmat, scb_data->sense,
+ 				scb_data->sense_dmamap);
+-		ahc_dmamap_destroy(ahc, scb_data->sense_dmat,
++		aic_dmamap_destroy(ahc, scb_data->sense_dmat,
+ 				   scb_data->sense_dmamap);
+ 	case 4:
+-		ahc_dma_tag_destroy(ahc, scb_data->sense_dmat);
++		aic_dma_tag_destroy(ahc, scb_data->sense_dmat);
+ 	case 3:
+-		ahc_dmamap_unload(ahc, scb_data->hscb_dmat,
++		aic_dmamap_unload(ahc, scb_data->hscb_dmat,
+ 				  scb_data->hscb_dmamap);
+ 	case 2:
+-		ahc_dmamem_free(ahc, scb_data->hscb_dmat, scb_data->hscbs,
++		aic_dmamem_free(ahc, scb_data->hscb_dmat, scb_data->hscbs,
+ 				scb_data->hscb_dmamap);
+-		ahc_dmamap_destroy(ahc, scb_data->hscb_dmat,
++		aic_dmamap_destroy(ahc, scb_data->hscb_dmat,
+ 				   scb_data->hscb_dmamap);
+ 	case 1:
+-		ahc_dma_tag_destroy(ahc, scb_data->hscb_dmat);
++		aic_dma_tag_destroy(ahc, scb_data->hscb_dmat);
+ 		break;
+ 	case 0:
+ 		break;
+@@ -4455,7 +4466,7 @@ ahc_alloc_scbs(struct ahc_softc *ahc)
+ 		return;
+ 
+ 	/* Allocate S/G space for the next batch of SCBS */
+-	if (ahc_dmamem_alloc(ahc, scb_data->sg_dmat,
++	if (aic_dmamem_alloc(ahc, scb_data->sg_dmat,
+ 			     (void **)&sg_map->sg_vaddr,
+ 			     BUS_DMA_NOWAIT, &sg_map->sg_dmamap) != 0) {
+ 		free(sg_map, M_DEVBUF);
+@@ -4464,7 +4475,7 @@ ahc_alloc_scbs(struct ahc_softc *ahc)
+ 
+ 	SLIST_INSERT_HEAD(&scb_data->sg_maps, sg_map, links);
+ 
+-	ahc_dmamap_load(ahc, scb_data->sg_dmat, sg_map->sg_dmamap,
++	aic_dmamap_load(ahc, scb_data->sg_dmat, sg_map->sg_dmamap,
+ 			sg_map->sg_vaddr, PAGE_SIZE, ahc_dmamap_cb,
+ 			&sg_map->sg_physaddr, /*flags*/0);
+ 
+@@ -4491,9 +4502,9 @@ ahc_alloc_scbs(struct ahc_softc *ahc)
+ 		 */
+ 		next_scb->sg_list_phys = physaddr + sizeof(struct ahc_dma_seg);
+ 		next_scb->ahc_softc = ahc;
+-		next_scb->flags = SCB_FREE;
++		next_scb->flags = SCB_FLAG_NONE;
+ #ifndef __linux__
+-		error = ahc_dmamap_create(ahc, ahc->buffer_dmat, /*flags*/0,
++		error = aic_dmamap_create(ahc, ahc->buffer_dmat, /*flags*/0,
+ 					  &next_scb->dmamap);
+ 		if (error != 0)
+ 			break;
+@@ -4725,14 +4736,12 @@ ahc_chip_init(struct ahc_softc *ahc)
+ 		 * never settle, so don't complain if we
+ 		 * fail here.
+ 		 */
+-		ahc_pause(ahc);
+ 		for (wait = 5000;
+ 		     (ahc_inb(ahc, SBLKCTL) & (ENAB40|ENAB20)) == 0 && wait;
+ 		     wait--)
+-			ahc_delay(100);
+-		ahc_unpause(ahc);
++			aic_delay(100);
+ 	}
+-
++	ahc_restart(ahc);
+ 	return (0);
+ }
+ 
+@@ -4743,6 +4752,7 @@ int
+ ahc_init(struct ahc_softc *ahc)
+ {
+ 	int	 max_targ;
++	int	 error;
+ 	u_int	 i;
+ 	u_int	 scsi_conf;
+ 	u_int	 ultraenb;
+@@ -4800,7 +4810,7 @@ ahc_init(struct ahc_softc *ahc)
+ 
+ #ifndef __linux__
+ 	/* DMA tag for mapping buffers into device visible space. */
+-	if (ahc_dma_tag_create(ahc, ahc->parent_dmat, /*alignment*/1,
++	if (aic_dma_tag_create(ahc, ahc->parent_dmat, /*alignment*/1,
+ 			       /*boundary*/BUS_SPACE_MAXADDR_32BIT + 1,
+ 			       /*lowaddr*/ahc->flags & AHC_39BIT_ADDRESSING
+ 					? (bus_addr_t)0x7FFFFFFFFFULL
+@@ -4831,7 +4841,7 @@ ahc_init(struct ahc_softc *ahc)
+ 	if ((ahc->features & AHC_TARGETMODE) != 0)
+ 		driver_data_size += AHC_TMODE_CMDS * sizeof(struct target_cmd)
+ 				 + /*DMA WideOdd Bug Buffer*/1;
+-	if (ahc_dma_tag_create(ahc, ahc->parent_dmat, /*alignment*/1,
++	if (aic_dma_tag_create(ahc, ahc->parent_dmat, /*alignment*/1,
+ 			       /*boundary*/BUS_SPACE_MAXADDR_32BIT + 1,
+ 			       /*lowaddr*/BUS_SPACE_MAXADDR_32BIT,
+ 			       /*highaddr*/BUS_SPACE_MAXADDR,
+@@ -4846,7 +4856,7 @@ ahc_init(struct ahc_softc *ahc)
+ 	ahc->init_level++;
+ 
+ 	/* Allocation of driver data */
+-	if (ahc_dmamem_alloc(ahc, ahc->shared_data_dmat,
++	if (aic_dmamem_alloc(ahc, ahc->shared_data_dmat,
+ 			     (void **)&ahc->qoutfifo,
+ 			     BUS_DMA_NOWAIT, &ahc->shared_data_dmamap) != 0) {
+ 		return (ENOMEM);
+@@ -4855,7 +4865,7 @@ ahc_init(struct ahc_softc *ahc)
+ 	ahc->init_level++;
+ 
+ 	/* And permanently map it in */
+-	ahc_dmamap_load(ahc, ahc->shared_data_dmat, ahc->shared_data_dmamap,
++	aic_dmamap_load(ahc, ahc->shared_data_dmat, ahc->shared_data_dmamap,
+ 			ahc->qoutfifo, driver_data_size, ahc_dmamap_cb,
+ 			&ahc->shared_data_busaddr, /*flags*/0);
+ 
+@@ -4898,6 +4908,13 @@ ahc_init(struct ahc_softc *ahc)
+ 		}
+ 	}
+ 
++	/*
++	 * Fire up a recovery thread for this controller.
++	 */
++	error = ahc_spawn_recovery_thread(ahc);
++	if (error != 0)
++		return (error);
++
+ 	if (ahc->scb_data->maxhscbs < AHC_SCB_MAX_ALLOC) {
+ 		ahc->flags |= AHC_PAGESCBS;
+ 	} else {
+@@ -5095,8 +5112,14 @@ ahc_pause_and_flushwork(struct ahc_softc
+ 	ahc->flags |= AHC_ALL_INTERRUPTS;
+ 	paused = FALSE;
+ 	do {
+-		if (paused)
++		if (paused) {
+ 			ahc_unpause(ahc);
++			/*
++			 * Give the sequencer some time to service
++			 * any active selections.
++			 */
++			aic_delay(200);
++		}
+ 		ahc_intr(ahc);
+ 		ahc_pause(ahc);
+ 		paused = TRUE;
+@@ -5145,7 +5168,9 @@ int
+ ahc_resume(struct ahc_softc *ahc)
+ {
+ 
+-	ahc_reset(ahc);
++	ahc_reset(ahc, /*reinit*/TRUE);
++	ahc_intr_enable(ahc, TRUE); 
++	ahc_restart(ahc);
+ 	return (0);
+ }
+ 
+@@ -5380,12 +5405,12 @@ ahc_search_qinfifo(struct ahc_softc *ahc
+ 				cam_status ostat;
+ 				cam_status cstat;
+ 
+-				ostat = ahc_get_transaction_status(scb);
++				ostat = aic_get_transaction_status(scb);
+ 				if (ostat == CAM_REQ_INPROG)
+-					ahc_set_transaction_status(scb, status);
+-				cstat = ahc_get_transaction_status(scb);
++					aic_set_transaction_status(scb, status);
++				cstat = aic_get_transaction_status(scb);
+ 				if (cstat != CAM_REQ_CMP)
+-					ahc_freeze_scb(scb);
++					aic_freeze_scb(scb);
+ 				if ((scb->flags & SCB_ACTIVE) == 0)
+ 					printf("Inactive SCB in qinfifo\n");
+ 				ahc_done(ahc, scb);
+@@ -5492,13 +5517,13 @@ ahc_search_qinfifo(struct ahc_softc *ahc
+ 				cam_status ostat;
+ 				cam_status cstat;
+ 
+-				ostat = ahc_get_transaction_status(scb);
++				ostat = aic_get_transaction_status(scb);
+ 				if (ostat == CAM_REQ_INPROG)
+-					ahc_set_transaction_status(scb,
++					aic_set_transaction_status(scb,
+ 								   status);
+-				cstat = ahc_get_transaction_status(scb);
++				cstat = aic_get_transaction_status(scb);
+ 				if (cstat != CAM_REQ_CMP)
+-					ahc_freeze_scb(scb);
++					aic_freeze_scb(scb);
+ 				if ((scb->flags & SCB_ACTIVE) == 0)
+ 					printf("Inactive SCB in Waiting List\n");
+ 				ahc_done(ahc, scb);
+@@ -5520,7 +5545,7 @@ ahc_search_qinfifo(struct ahc_softc *ahc
+ 	}
+ 	ahc_outb(ahc, SCBPTR, curscbptr);
+ 
+-	found += ahc_search_untagged_queues(ahc, /*ahc_io_ctx_t*/NULL, target,
++	found += ahc_search_untagged_queues(ahc, /*aic_io_ctx_t*/NULL, target,
+ 					    channel, lun, status, action);
+ 
+ 	if (action == SEARCH_COMPLETE)
+@@ -5529,7 +5554,7 @@ ahc_search_qinfifo(struct ahc_softc *ahc
+ }
+ 
+ int
+-ahc_search_untagged_queues(struct ahc_softc *ahc, ahc_io_ctx_t ctx,
++ahc_search_untagged_queues(struct ahc_softc *ahc, aic_io_ctx_t ctx,
+ 			   int target, char channel, int lun, uint32_t status,
+ 			   ahc_search_action action)
+ {
+@@ -5600,12 +5625,12 @@ ahc_search_untagged_queues(struct ahc_so
+ 				cam_status ostat;
+ 				cam_status cstat;
+ 
+-				ostat = ahc_get_transaction_status(scb);
++				ostat = aic_get_transaction_status(scb);
+ 				if (ostat == CAM_REQ_INPROG)
+-					ahc_set_transaction_status(scb, status);
+-				cstat = ahc_get_transaction_status(scb);
++					aic_set_transaction_status(scb, status);
++				cstat = aic_get_transaction_status(scb);
+ 				if (cstat != CAM_REQ_CMP)
+-					ahc_freeze_scb(scb);
++					aic_freeze_scb(scb);
+ 				if ((scb->flags & SCB_ACTIVE) == 0)
+ 					printf("Inactive SCB in untaggedQ\n");
+ 				ahc_done(ahc, scb);
+@@ -5904,11 +5929,11 @@ ahc_abort_scbs(struct ahc_softc *ahc, in
+ 		if (ahc_match_scb(ahc, scbp, target, channel, lun, tag, role)) {
+ 			cam_status ostat;
+ 
+-			ostat = ahc_get_transaction_status(scbp);
++			ostat = aic_get_transaction_status(scbp);
+ 			if (ostat == CAM_REQ_INPROG)
+-				ahc_set_transaction_status(scbp, status);
+-			if (ahc_get_transaction_status(scbp) != CAM_REQ_CMP)
+-				ahc_freeze_scb(scbp);
++				aic_set_transaction_status(scbp, status);
++			if (aic_get_transaction_status(scbp) != CAM_REQ_CMP)
++				aic_freeze_scb(scbp);
+ 			if ((scbp->flags & SCB_ACTIVE) == 0)
+ 				printf("Inactive SCB on pending list\n");
+ 			ahc_done(ahc, scbp);
+@@ -5930,7 +5955,7 @@ ahc_reset_current_bus(struct ahc_softc *
+ 	scsiseq = ahc_inb(ahc, SCSISEQ);
+ 	ahc_outb(ahc, SCSISEQ, scsiseq | SCSIRSTO);
+ 	ahc_flush_device_writes(ahc);
+-	ahc_delay(AHC_BUSRESET_DELAY);
++	aic_delay(AHC_BUSRESET_DELAY);
+ 	/* Turn off the bus reset */
+ 	ahc_outb(ahc, SCSISEQ, scsiseq & ~SCSIRSTO);
+ 
+@@ -6137,7 +6162,7 @@ ahc_calc_residual(struct ahc_softc *ahc,
+ 	 */
+ 
+ 	hscb = scb->hscb;
+-	sgptr = ahc_le32toh(hscb->sgptr);
++	sgptr = aic_le32toh(hscb->sgptr);
+ 	if ((sgptr & SG_RESID_VALID) == 0)
+ 		/* Case 1 */
+ 		return;
+@@ -6148,10 +6173,10 @@ ahc_calc_residual(struct ahc_softc *ahc,
+ 		return;
+ 
+ 	spkt = &hscb->shared_data.status;
+-	resid_sgptr = ahc_le32toh(spkt->residual_sg_ptr);
++	resid_sgptr = aic_le32toh(spkt->residual_sg_ptr);
+ 	if ((sgptr & SG_FULL_RESID) != 0) {
+ 		/* Case 3 */
+-		resid = ahc_get_transfer_length(scb);
++		resid = aic_get_transfer_length(scb);
+ 	} else if ((resid_sgptr & SG_LIST_NULL) != 0) {
+ 		/* Case 4 */
+ 		return;
+@@ -6164,7 +6189,7 @@ ahc_calc_residual(struct ahc_softc *ahc,
+ 		 * Remainder of the SG where the transfer
+ 		 * stopped.  
+ 		 */
+-		resid = ahc_le32toh(spkt->residual_datacnt) & AHC_SG_LEN_MASK;
++		resid = aic_le32toh(spkt->residual_datacnt) & AHC_SG_LEN_MASK;
+ 		sg = ahc_sg_bus_to_virt(scb, resid_sgptr & SG_PTR_MASK);
+ 
+ 		/* The residual sg_ptr always points to the next sg */
+@@ -6175,15 +6200,15 @@ ahc_calc_residual(struct ahc_softc *ahc,
+ 		 * SG segments that are after the SG where
+ 		 * the transfer stopped.
+ 		 */
+-		while ((ahc_le32toh(sg->len) & AHC_DMA_LAST_SEG) == 0) {
++		while ((aic_le32toh(sg->len) & AHC_DMA_LAST_SEG) == 0) {
+ 			sg++;
+-			resid += ahc_le32toh(sg->len) & AHC_SG_LEN_MASK;
++			resid += aic_le32toh(sg->len) & AHC_SG_LEN_MASK;
+ 		}
+ 	}
+ 	if ((scb->flags & SCB_SENSE) == 0)
+-		ahc_set_residual(scb, resid);
++		aic_set_residual(scb, resid);
+ 	else
+-		ahc_set_sense_residual(scb, resid);
++		aic_set_sense_residual(scb, resid);
+ 
+ #ifdef AHC_DEBUG
+ 	if ((ahc_debug & AHC_SHOW_MISC) != 0) {
+@@ -6407,7 +6432,6 @@ ahc_loadseq(struct ahc_softc *ahc)
+ 		memcpy(ahc->critical_sections, cs_table, cs_count);
+ 	}
+ 	ahc_outb(ahc, SEQCTL, PERRORDIS|FAILDIS|FASTMODE);
+-	ahc_restart(ahc);
+ 
+ 	if (bootverbose) {
+ 		printf(" %d instructions downloaded\n", downloaded);
+@@ -6464,7 +6488,7 @@ ahc_download_instr(struct ahc_softc *ahc
+ 	/*
+ 	 * The firmware is always compiled into a little endian format.
+ 	 */
+-	instr.integer = ahc_le32toh(*(uint32_t*)&seqprog[instrptr * 4]);
++	instr.integer = aic_le32toh(*(uint32_t*)&seqprog[instrptr * 4]);
+ 
+ 	fmt1_ins = &instr.format1;
+ 	fmt3_ins = NULL;
+@@ -6569,7 +6593,7 @@ ahc_download_instr(struct ahc_softc *ahc
+ 			}
+ 		}
+ 		/* The sequencer is a little endian cpu */
+-		instr.integer = ahc_htole32(instr.integer);
++		instr.integer = aic_htole32(instr.integer);
+ 		ahc_outsb(ahc, SEQRAM, instr.bytes, 4);
+ 		break;
+ 	default:
+@@ -6809,6 +6833,324 @@ ahc_dump_card_state(struct ahc_softc *ah
+ 		ahc_unpause(ahc);
+ }
+ 
++/*************************** Timeout Handling *********************************/
++void
++ahc_timeout(struct scb *scb)
++{
++	struct ahc_softc *ahc;
++
++	ahc = scb->ahc_softc;
++	if ((scb->flags & SCB_ACTIVE) != 0) {
++		if ((scb->flags & SCB_TIMEDOUT) == 0) {
++			LIST_INSERT_HEAD(&ahc->timedout_scbs, scb,
++					 timedout_links);
++			scb->flags |= SCB_TIMEDOUT;
++		}
++		ahc_wakeup_recovery_thread(ahc);
++	}
++}
++
++/*
++ * ahc_recover_commands determines if any of the commands that have currently
++ * timedout are the root cause for this timeout.  Innocent commands are given
++ * a new timeout while we wait for the command executing on the bus to timeout.
++ * This routine is invoked from a thread context so we are allowed to sleep.
++ * Our lock is not held on entry.
++ */
++void
++ahc_recover_commands(struct ahc_softc *ahc)
++{
++	struct	scb *scb;
++	long	s;
++	int	found;
++	int	restart_needed;
++	u_int	last_phase;
++
++	ahc_lock(ahc, &s);
++
++	/*
++	 * Pause the controller and manually flush any
++	 * commands that have just completed but that our
++	 * interrupt handler has yet to see.
++	 */
++	ahc_pause_and_flushwork(ahc);
++
++	if (LIST_EMPTY(&ahc->timedout_scbs) != 0) {
++		/*
++		 * The timedout commands have already
++		 * completed.  This typically means
++		 * that either the timeout value was on
++		 * the hairy edge of what the device
++		 * requires or - more likely - interrupts
++		 * are not happening.
++		 */
++		printf("%s: Timedout SCBs already complete. "
++		       "Interrupts may not be functioning.\n", ahc_name(ahc));
++		ahc_unpause(ahc);
++		ahc_unlock(ahc, &s);
++		return;
++	}
++
++	restart_needed = 0;
++	printf("%s: Recovery Initiated\n", ahc_name(ahc));
++	ahc_dump_card_state(ahc);
++
++	last_phase = ahc_inb(ahc, LASTPHASE);
++	while ((scb = LIST_FIRST(&ahc->timedout_scbs)) != NULL) {
++		u_int	active_scb_index;
++		u_int	saved_scbptr;
++		int	target;
++		int	lun;
++		int	i;
++		char	channel;
++
++		target = SCB_GET_TARGET(ahc, scb);
++		channel = SCB_GET_CHANNEL(ahc, scb);
++		lun = SCB_GET_LUN(scb);
++
++		ahc_print_path(ahc, scb);
++		printf("SCB 0x%x - timed out\n", scb->hscb->tag);
++		if (scb->sg_count > 0) {
++			for (i = 0; i < scb->sg_count; i++) {
++				printf("sg[%d] - Addr 0x%x : Length %d\n",
++				       i,
++				       scb->sg_list[i].addr,
++				       scb->sg_list[i].len & AHC_SG_LEN_MASK);
++			}
++		}
++		if (scb->flags & (SCB_DEVICE_RESET|SCB_ABORT)) {
++			/*
++			 * Been down this road before.
++			 * Do a full bus reset.
++			 */
++			aic_set_transaction_status(scb, CAM_CMD_TIMEOUT);
++bus_reset:
++			found = ahc_reset_channel(ahc, channel,
++						  /*Initiate Reset*/TRUE);
++			printf("%s: Issued Channel %c Bus Reset. "
++			       "%d SCBs aborted\n", ahc_name(ahc), channel,
++			       found);
++			continue;
++		}
++
++		/*
++		 * Remove the command from the timedout list in
++		 * preparation for requeing it.
++		 */
++		LIST_REMOVE(scb, timedout_links);
++		scb->flags &= ~SCB_TIMEDOUT;
++
++		/*
++		 * If we are a target, transition to bus free and report
++		 * the timeout.
++		 * 
++		 * The target/initiator that is holding up the bus may not
++		 * be the same as the one that triggered this timeout
++		 * (different commands have different timeout lengths).
++		 * If the bus is idle and we are actiing as the initiator
++		 * for this request, queue a BDR message to the timed out
++		 * target.  Otherwise, if the timed out transaction is
++		 * active:
++		 *   Initiator transaction:
++		 *	Stuff the message buffer with a BDR message and assert
++		 *	ATN in the hopes that the target will let go of the bus
++		 *	and go to the mesgout phase.  If this fails, we'll
++		 *	get another timeout 2 seconds later which will attempt
++		 *	a bus reset.
++		 *
++		 *   Target transaction:
++		 *	Transition to BUS FREE and report the error.
++		 *	It's good to be the target!
++		 */
++		saved_scbptr = ahc_inb(ahc, SCBPTR);
++		active_scb_index = ahc_inb(ahc, SCB_TAG);
++
++		if ((ahc_inb(ahc, SEQ_FLAGS) & NOT_IDENTIFIED) == 0
++		  && (active_scb_index < ahc->scb_data->numscbs)) {
++			struct scb *active_scb;
++
++			/*
++			 * If the active SCB is not us, assume that
++			 * the active SCB has a longer timeout than
++			 * the timedout SCB, and wait for the active
++			 * SCB to timeout.
++			 */ 
++			active_scb = ahc_lookup_scb(ahc, active_scb_index);
++			if (active_scb != scb) {
++				u_int	newtimeout;
++
++				ahc_print_path(ahc, scb);
++				printf("Other SCB Timeout%s",
++			 	       (scb->flags & SCB_OTHERTCL_TIMEOUT) != 0
++				       ? " again\n" : "\n");
++				scb->flags |= SCB_OTHERTCL_TIMEOUT;
++				newtimeout =
++				    MAX(aic_get_timeout(active_scb),
++					aic_get_timeout(scb));
++				aic_scb_timer_reset(scb, newtimeout);
++				continue;
++			} 
++
++			/* It's us */
++			if ((scb->flags & SCB_TARGET_SCB) != 0) {
++
++				/*
++				 * Send back any queued up transactions
++				 * and properly record the error condition.
++				 */
++				ahc_abort_scbs(ahc, SCB_GET_TARGET(ahc, scb),
++					       SCB_GET_CHANNEL(ahc, scb),
++					       SCB_GET_LUN(scb),
++					       scb->hscb->tag,
++					       ROLE_TARGET,
++					       CAM_CMD_TIMEOUT);
++
++				/* Will clear us from the bus */
++				restart_needed = 1;
++				break;
++			}
++
++			ahc_set_recoveryscb(ahc, active_scb);
++			ahc_outb(ahc, MSG_OUT, HOST_MSG);
++			ahc_outb(ahc, SCSISIGO, last_phase|ATNO);
++			ahc_print_path(ahc, active_scb);
++			printf("BDR message in message buffer\n");
++			active_scb->flags |= SCB_DEVICE_RESET;
++			aic_scb_timer_reset(scb, 2 * 1000000);
++		} else if (last_phase != P_BUSFREE
++			&& (ahc_inb(ahc, SSTAT1) & REQINIT) == 0) {
++			/*
++			 * SCB is not identified, there
++			 * is no pending REQ, and the sequencer
++			 * has not seen a busfree.  Looks like
++			 * a stuck connection waiting to
++			 * go busfree.  Reset the bus.
++			 */
++			printf("%s: Connection stuck awaiting busfree or "
++			       "Identify Msg.\n", ahc_name(ahc));
++			goto bus_reset;
++		} else {
++			int	 disconnected;
++
++			if (last_phase != P_BUSFREE
++			 && (ahc_inb(ahc, SSTAT0) & TARGET) != 0) {
++				/* Hung target selection.  Goto busfree */
++				printf("%s: Hung target selection\n",
++				       ahc_name(ahc));
++				restart_needed = 1;
++				break;
++			}
++
++			/* XXX Shouldn't panic.  Just punt instead? */
++			if ((scb->flags & SCB_TARGET_SCB) != 0)
++				panic("Timed-out target SCB but bus idle");
++
++			if (ahc_search_qinfifo(ahc, target, channel, lun,
++					       scb->hscb->tag, ROLE_INITIATOR,
++					       /*status*/0, SEARCH_COUNT) > 0) {
++				disconnected = FALSE;
++			} else {
++				disconnected = TRUE;
++			}
++
++			if (disconnected) {
++
++				ahc_set_recoveryscb(ahc, scb);
++				/*
++				 * Actually re-queue this SCB in an attempt
++				 * to select the device before it reconnects.
++				 * In either case (selection or reselection),
++				 * we will now issue a target reset to the
++				 * timed-out device.
++				 *
++				 * Set the MK_MESSAGE control bit indicating
++				 * that we desire to send a message.  We
++				 * also set the disconnected flag since
++				 * in the paging case there is no guarantee
++				 * that our SCB control byte matches the
++				 * version on the card.  We don't want the
++				 * sequencer to abort the command thinking
++				 * an unsolicited reselection occurred.
++				 */
++				scb->hscb->control |= MK_MESSAGE|DISCONNECTED;
++				scb->flags |= SCB_DEVICE_RESET;
++
++				/*
++				 * Remove any cached copy of this SCB in the
++				 * disconnected list in preparation for the
++				 * queuing of our abort SCB.  We use the
++				 * same element in the SCB, SCB_NEXT, for
++				 * both the qinfifo and the disconnected list.
++				 */
++				ahc_search_disc_list(ahc, target, channel,
++						     lun, scb->hscb->tag,
++						     /*stop_on_first*/TRUE,
++						     /*remove*/TRUE,
++						     /*save_state*/FALSE);
++
++				/*
++				 * In the non-paging case, the sequencer will
++				 * never re-reference the in-core SCB.
++				 * To make sure we are notified during
++				 * reslection, set the MK_MESSAGE flag in
++				 * the card's copy of the SCB.
++				 */
++				if ((ahc->flags & AHC_PAGESCBS) == 0) {
++					ahc_outb(ahc, SCBPTR, scb->hscb->tag);
++					ahc_outb(ahc, SCB_CONTROL,
++						 ahc_inb(ahc, SCB_CONTROL)
++						| MK_MESSAGE);
++				}
++
++				/*
++				 * Clear out any entries in the QINFIFO first
++				 * so we are the next SCB for this target
++				 * to run.
++				 */
++				ahc_search_qinfifo(ahc,
++						   SCB_GET_TARGET(ahc, scb),
++						   channel, SCB_GET_LUN(scb),
++						   SCB_LIST_NULL,
++						   ROLE_INITIATOR,
++						   CAM_REQUEUE_REQ,
++						   SEARCH_COMPLETE);
++				ahc_print_path(ahc, scb);
++				printf("Queuing a BDR SCB\n");
++				ahc_qinfifo_requeue_tail(ahc, scb);
++				ahc_outb(ahc, SCBPTR, saved_scbptr);
++				aic_scb_timer_reset(scb, 2 * 1000000);
++			} else {
++				/* Go "immediatly" to the bus reset */
++				/* This shouldn't happen */
++				ahc_set_recoveryscb(ahc, scb);
++				ahc_print_path(ahc, scb);
++				printf("SCB %d: Immediate reset.  "
++					"Flags = 0x%x\n", scb->hscb->tag,
++					scb->flags);
++				goto bus_reset;
++			}
++		}
++		break;
++	}
++	
++	/*
++	 * Any remaining SCBs were not the "culprit", so remove
++	 * them from the timeout list.  The timer for these commands
++	 * will be reset once the recovery SCB completes.
++	 */
++	while ((scb = LIST_FIRST(&ahc->timedout_scbs)) != NULL) {
++
++		LIST_REMOVE(scb, timedout_links);
++		scb->flags &= ~SCB_TIMEDOUT;
++	}
++
++	if (restart_needed)
++		ahc_restart(ahc);
++	else
++		ahc_unpause(ahc);
++	ahc_unlock(ahc, &s);
++}
++
+ /************************* Target Mode ****************************************/
+ #ifdef AHC_TARGET_MODE
+ cam_status
+@@ -6968,11 +7310,12 @@ ahc_handle_en_lun(struct ahc_softc *ahc,
+ 			 */
+ 			ahc->flags = saved_flags;
+ 			(void)ahc_loadseq(ahc);
+-			ahc_unpause(ahc);
++			ahc_restart(ahc);
+ 			ahc_unlock(ahc, &s);
+ 			ccb->ccb_h.status = CAM_FUNC_NOTAVAIL;
+ 			return;
+ 		}
++		ahc_restart(ahc);
+ 		ahc_unlock(ahc, &s);
+ 	}
+ 	cel = &ccb->cel;
+@@ -7207,12 +7550,16 @@ ahc_handle_en_lun(struct ahc_softc *ahc,
+ 				printf("Configuring Initiator Mode\n");
+ 				ahc->flags &= ~AHC_TARGETROLE;
+ 				ahc->flags |= AHC_INITIATORROLE;
+-				ahc_pause(ahc);
+ 				/*
+ 				 * Returning to a configuration that
+ 				 * fit previously will always succeed.
+ 				 */
+ 				(void)ahc_loadseq(ahc);
++				ahc_restart(ahc);
++				/*
++				 * Unpaused.  The extra unpause
++				 * that follows is harmless.
++				 */
+ 			}
+ 		}
+ 		ahc_unpause(ahc);
+@@ -7282,7 +7629,7 @@ ahc_run_tqinfifo(struct ahc_softc *ahc, 
+ 			break;
+ 
+ 		cmd->cmd_valid = 0;
+-		ahc_dmamap_sync(ahc, ahc->shared_data_dmat,
++		aic_dmamap_sync(ahc, ahc->shared_data_dmat,
+ 				ahc->shared_data_dmamap,
+ 				ahc_targetcmd_offset(ahc, ahc->tqinfifonext),
+ 				sizeof(struct target_cmd),
+@@ -7419,7 +7766,7 @@ ahc_handle_target_cmd(struct ahc_softc *
+ 		       initiator, target, lun, ahc->pending_device);
+ #endif
+ 		ahc->pending_device = lstate;
+-		ahc_freeze_ccb((union ccb *)atio);
++		aic_freeze_ccb((union ccb *)atio);
+ 		atio->ccb_h.flags |= CAM_DIS_DISCONNECT;
+ 	}
+ 	xpt_done((union ccb*)atio);
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic7xxx.h	2003-06-14 12:18:22.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aic7xxx.h	2003-12-28 23:21:39.000000000 -0800
+@@ -37,7 +37,7 @@
+  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  * POSSIBILITY OF SUCH DAMAGES.
+  *
+- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.h#77 $
++ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.h#85 $
+  *
+  * $FreeBSD$
+  */
+@@ -243,7 +243,7 @@ typedef enum {
+ 	 */
+ 	AHC_AIC7850_FE	= AHC_SPIOCAP|AHC_AUTOPAUSE|AHC_TARGETMODE|AHC_ULTRA,
+ 	AHC_AIC7860_FE	= AHC_AIC7850_FE,
+-	AHC_AIC7870_FE	= AHC_TARGETMODE,
++	AHC_AIC7870_FE	= AHC_TARGETMODE|AHC_AUTOPAUSE,
+ 	AHC_AIC7880_FE	= AHC_AIC7870_FE|AHC_ULTRA,
+ 	/*
+ 	 * Although we have space for both the initiator and
+@@ -366,7 +366,8 @@ typedef enum {
+ 	AHC_SCB_CONFIG_USED   = 0x4000000, /* No SEEPROM but SCB2 had info. */
+ 	AHC_NO_BIOS_INIT      = 0x8000000, /* No BIOS left over settings. */
+ 	AHC_DISABLE_PCI_PERR  = 0x10000000,
+-	AHC_HAS_TERM_LOGIC    = 0x20000000
++	AHC_HAS_TERM_LOGIC    = 0x20000000,
++	AHC_SHUTDOWN_RECOVERY = 0x40000000 /* Terminate recovery thread. */
+ } ahc_flag;
+ 
+ /************************* Hardware  SCB Definition ***************************/
+@@ -411,6 +412,7 @@ struct target_data {
+ 	uint8_t  initiator_tag;		/* Initiator's transaction tag */
+ };
+ 
++#define MAX_CDB_LEN 16
+ struct hardware_scb {
+ /*0*/	union {
+ 		/*
+@@ -530,7 +532,7 @@ struct sg_map_node {
+  * The current state of this SCB.
+  */
+ typedef enum {
+-	SCB_FREE		= 0x0000,
++	SCB_FLAG_NONE		= 0x0000,
+ 	SCB_OTHERTCL_TIMEOUT	= 0x0002,/*
+ 					  * Another device was active
+ 					  * during the first timeout for
+@@ -560,12 +562,16 @@ typedef enum {
+ 					  * to report the error.
+ 					  */
+ 	SCB_TARGET_SCB		= 0x2000,
+-	SCB_SILENT		= 0x4000 /*
++	SCB_SILENT		= 0x4000,/*
+ 					  * Be quiet about transmission type
+ 					  * errors.  They are expected and we
+ 					  * don't want to upset the user.  This
+ 					  * flag is typically used during DV.
+ 					  */
++	SCB_TIMEDOUT		= 0x8000 /*
++					  * SCB has timed out and is on the
++					  * timedout list.
++					  */
+ } scb_flag;
+ 
+ struct scb {
+@@ -575,7 +581,8 @@ struct scb {
+ 		TAILQ_ENTRY(scb)  tqe;
+ 	} links;
+ 	LIST_ENTRY(scb)		  pending_links;
+-	ahc_io_ctx_t		  io_ctx;
++	LIST_ENTRY(scb)		  timedout_links;
++	aic_io_ctx_t		  io_ctx;
+ 	struct ahc_softc	 *ahc_softc;
+ 	scb_flag		  flags;
+ #ifndef __linux__
+@@ -929,6 +936,11 @@ struct ahc_softc {
+ 	LIST_HEAD(, scb)	  pending_scbs;
+ 
+ 	/*
++	 * SCBs whose timeout routine has been called.
++	 */
++	LIST_HEAD(, scb)	  timedout_scbs;
++
++	/*
+ 	 * Counting lock for deferring the release of additional
+ 	 * untagged transactions from the untagged_queues.  When
+ 	 * the lock is decremented to 0, all queues in the
+@@ -958,7 +970,7 @@ struct ahc_softc {
+ 	/*
+ 	 * Platform specific device information.
+ 	 */
+-	ahc_dev_softc_t		  dev_softc;
++	aic_dev_softc_t		  dev_softc;
+ 
+ 	/*
+ 	 * Bus specific device information.
+@@ -1135,6 +1147,9 @@ struct ahc_devinfo {
+ };
+ 
+ /****************************** PCI Structures ********************************/
++#define	AHC_PCI_IOADDR  PCIR_BAR(0)	/* I/O Address */
++#define	AHC_PCI_MEMADDR PCIR_BAR(1)	/* Mem I/O Address */
++
+ typedef int (ahc_device_setup_t)(struct ahc_softc *);
+ 
+ struct ahc_pci_identity {
+@@ -1143,17 +1158,17 @@ struct ahc_pci_identity {
+ 	char			*name;
+ 	ahc_device_setup_t	*setup;
+ };
+-extern struct ahc_pci_identity ahc_pci_ident_table [];
++extern struct ahc_pci_identity ahc_pci_ident_table[];
+ extern const u_int ahc_num_pci_devs;
+ 
+ /***************************** VL/EISA Declarations ***************************/
+ struct aic7770_identity {
+ 	uint32_t		 full_id;
+ 	uint32_t		 id_mask;
+-	char			*name;
++	const char		*name;
+ 	ahc_device_setup_t	*setup;
+ };
+-extern struct aic7770_identity aic7770_ident_table [];
++extern struct aic7770_identity aic7770_ident_table[];
+ extern const int ahc_num_aic7770_devs;
+ 
+ #define AHC_EISA_SLOT_OFFSET	0xc00
+@@ -1167,7 +1182,7 @@ void			ahc_busy_tcl(struct ahc_softc *ah
+ 				     u_int tcl, u_int busyid);
+ 
+ /***************************** PCI Front End *********************************/
+-struct ahc_pci_identity	*ahc_find_pci_device(ahc_dev_softc_t);
++struct ahc_pci_identity	*ahc_find_pci_device(aic_dev_softc_t);
+ int			 ahc_pci_config(struct ahc_softc *,
+ 					struct ahc_pci_identity *);
+ int			 ahc_pci_test_register_access(struct ahc_softc *);
+@@ -1205,7 +1220,7 @@ void			 ahc_set_unit(struct ahc_softc *,
+ void			 ahc_set_name(struct ahc_softc *, char *);
+ void			 ahc_alloc_scbs(struct ahc_softc *ahc);
+ void			 ahc_free(struct ahc_softc *ahc);
+-int			 ahc_reset(struct ahc_softc *ahc);
++int			 ahc_reset(struct ahc_softc *ahc, int reinit);
+ void			 ahc_shutdown(void *arg);
+ 
+ /*************************** Interrupt Services *******************************/
+@@ -1231,7 +1246,7 @@ int			ahc_search_qinfifo(struct ahc_soft
+ 					   role_t role, uint32_t status,
+ 					   ahc_search_action action);
+ int			ahc_search_untagged_queues(struct ahc_softc *ahc,
+-						   ahc_io_ctx_t ctx,
++						   aic_io_ctx_t ctx,
+ 						   int target, char channel,
+ 						   int lun, uint32_t status,
+ 						   ahc_search_action action);
+@@ -1248,6 +1263,8 @@ int			ahc_abort_scbs(struct ahc_softc *a
+ void			ahc_restart(struct ahc_softc *ahc);
+ void			ahc_calc_residual(struct ahc_softc *ahc,
+ 					  struct scb *scb);
++void			ahc_timeout(struct scb *scb);
++void			ahc_recover_commands(struct ahc_softc *ahc);
+ /*************************** Utility Functions ********************************/
+ struct ahc_phase_table_entry*
+ 			ahc_lookup_phase_entry(int phase);
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic7xxx_inline.h	2003-06-14 12:18:51.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aic7xxx_inline.h	2003-12-28 23:21:39.000000000 -0800
+@@ -37,7 +37,7 @@
+  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  * POSSIBILITY OF SUCH DAMAGES.
+  *
+- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_inline.h#43 $
++ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_inline.h#47 $
+  *
+  * $FreeBSD$
+  */
+@@ -196,7 +196,7 @@ ahc_hscb_busaddr(struct ahc_softc *ahc, 
+ static __inline void
+ ahc_sync_scb(struct ahc_softc *ahc, struct scb *scb, int op)
+ {
+-	ahc_dmamap_sync(ahc, ahc->scb_data->hscb_dmat,
++	aic_dmamap_sync(ahc, ahc->scb_data->hscb_dmat,
+ 			ahc->scb_data->hscb_dmamap,
+ 			/*offset*/(scb->hscb - ahc->hscbs) * sizeof(*scb->hscb),
+ 			/*len*/sizeof(*scb->hscb), op);
+@@ -208,7 +208,7 @@ ahc_sync_sglist(struct ahc_softc *ahc, s
+ 	if (scb->sg_count == 0)
+ 		return;
+ 
+-	ahc_dmamap_sync(ahc, ahc->scb_data->sg_dmat, scb->sg_map->sg_dmamap,
++	aic_dmamap_sync(ahc, ahc->scb_data->sg_dmat, scb->sg_map->sg_dmamap,
+ 			/*offset*/(scb->sg_list - scb->sg_map->sg_vaddr)
+ 				* sizeof(struct ahc_dma_seg),
+ 			/*len*/sizeof(struct ahc_dma_seg) * scb->sg_count, op);
+@@ -272,7 +272,7 @@ ahc_update_residual(struct ahc_softc *ah
+ {
+ 	uint32_t sgptr;
+ 
+-	sgptr = ahc_le32toh(scb->hscb->sgptr);
++	sgptr = aic_le32toh(scb->hscb->sgptr);
+ 	if ((sgptr & SG_RESID_VALID) != 0)
+ 		ahc_calc_residual(ahc, scb);
+ }
+@@ -383,13 +383,13 @@ ahc_free_scb(struct ahc_softc *ahc, stru
+ 	hscb = scb->hscb;
+ 	/* Clean up for the next user */
+ 	ahc->scb_data->scbindex[hscb->tag] = NULL;
+-	scb->flags = SCB_FREE;
++	scb->flags = SCB_FLAG_NONE;
+ 	hscb->control = 0;
+ 
+ 	SLIST_INSERT_HEAD(&ahc->scb_data->free_scbs, scb, links.sle);
+ 
+ 	/* Notify the OSM that a resource is now available. */
+-	ahc_platform_scb_free(ahc, scb);
++	aic_platform_scb_free(ahc, scb);
+ }
+ 
+ static __inline struct scb *
+@@ -427,7 +427,7 @@ ahc_swap_with_next_hscb(struct ahc_softc
+ 	memcpy(q_hscb, scb->hscb, sizeof(*scb->hscb));
+ 	if ((scb->flags & SCB_CDB32_PTR) != 0) {
+ 		q_hscb->shared_data.cdb_ptr =
+-		    ahc_htole32(ahc_hscb_busaddr(ahc, q_hscb->tag)
++		    aic_htole32(ahc_hscb_busaddr(ahc, q_hscb->tag)
+ 			      + offsetof(struct hardware_scb, cdb32));
+ 	}
+ 	q_hscb->tag = saved_tag;
+@@ -458,7 +458,7 @@ ahc_queue_scb(struct ahc_softc *ahc, str
+ 	 * Setup data "oddness".
+ 	 */
+ 	scb->hscb->lun &= LID;
+-	if (ahc_get_transfer_length(scb) & 0x1)
++	if (aic_get_transfer_length(scb) & 0x1)
+ 		scb->hscb->lun |= SCB_XFERLEN_ODD;
+ 
+ 	/*
+@@ -512,7 +512,7 @@ static __inline int	ahc_intr(struct ahc_
+ static __inline void
+ ahc_sync_qoutfifo(struct ahc_softc *ahc, int op)
+ {
+-	ahc_dmamap_sync(ahc, ahc->shared_data_dmat, ahc->shared_data_dmamap,
++	aic_dmamap_sync(ahc, ahc->shared_data_dmat, ahc->shared_data_dmamap,
+ 			/*offset*/0, /*len*/256, op);
+ }
+ 
+@@ -521,7 +521,7 @@ ahc_sync_tqinfifo(struct ahc_softc *ahc,
+ {
+ #ifdef AHC_TARGET_MODE
+ 	if ((ahc->flags & AHC_TARGETROLE) != 0) {
+-		ahc_dmamap_sync(ahc, ahc->shared_data_dmat,
++		aic_dmamap_sync(ahc, ahc->shared_data_dmat,
+ 				ahc->shared_data_dmamap,
+ 				ahc_targetcmd_offset(ahc, 0),
+ 				sizeof(struct target_cmd) * AHC_TMODE_CMDS,
+@@ -542,7 +542,7 @@ ahc_check_cmdcmpltqueues(struct ahc_soft
+ 	u_int retval;
+ 
+ 	retval = 0;
+-	ahc_dmamap_sync(ahc, ahc->shared_data_dmat, ahc->shared_data_dmamap,
++	aic_dmamap_sync(ahc, ahc->shared_data_dmat, ahc->shared_data_dmamap,
+ 			/*offset*/ahc->qoutfifonext, /*len*/1,
+ 			BUS_DMASYNC_POSTREAD);
+ 	if (ahc->qoutfifo[ahc->qoutfifonext] != SCB_LIST_NULL)
+@@ -550,7 +550,7 @@ ahc_check_cmdcmpltqueues(struct ahc_soft
+ #ifdef AHC_TARGET_MODE
+ 	if ((ahc->flags & AHC_TARGETROLE) != 0
+ 	 && (ahc->flags & AHC_TQINFIFO_BLOCKED) == 0) {
+-		ahc_dmamap_sync(ahc, ahc->shared_data_dmat,
++		aic_dmamap_sync(ahc, ahc->shared_data_dmat,
+ 				ahc->shared_data_dmamap,
+ 				ahc_targetcmd_offset(ahc, ahc->tqinfifofnext),
+ 				/*len*/sizeof(struct target_cmd),
+@@ -593,7 +593,7 @@ ahc_intr(struct ahc_softc *ahc)
+ 	}
+ 
+ 	if ((intstat & INT_PEND) == 0) {
+-#if AHC_PCI_CONFIG > 0
++#if AIC_PCI_CONFIG > 0
+ 		if (ahc->unsolicited_ints > 500) {
+ 			ahc->unsolicited_ints = 0;
+ 			if ((ahc->chip & AHC_PCI) != 0
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic7xxx_osm.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aic7xxx_osm.c	2003-12-28 23:21:40.000000000 -0800
+@@ -1,7 +1,7 @@
+ /*
+  * Adaptec AIC7xxx device driver for Linux.
+  *
+- * $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.
+@@ -139,7 +139,16 @@
+ #endif
+ 
+ #include <linux/mm.h>		/* For fetching system memory size */
+-#include <linux/blkdev.h>		/* For block_size() */
++
++/************************* Magic SysReq Support *******************************/
++static struct aic_sysrq_key_op ahc_sysrq_op =
++{
++	aic_sysrq_handler,
++	"aic7xxxstatedump",
++	"Dump aic7xxx controller information to Console"
++};
++
++static int ahc_sysrq_key;
+ 
+ /*
+  * Lock protecting manipulation of the ahc softc list.
+@@ -293,7 +302,7 @@ static adapter_tag_info_t aic7xxx_tag_in
+ #define AIC7XXX_CONFIGED_DV -1
+ #endif
+ 
+-static uint8_t aic7xxx_dv_settings[] =
++static int8_t aic7xxx_dv_settings[] =
+ {
+ 	AIC7XXX_CONFIGED_DV,
+ 	AIC7XXX_CONFIGED_DV,
+@@ -391,9 +400,9 @@ static uint32_t aic7xxx_pci_parity = ~0;
+  * would result in never finding any devices :)
+  */
+ #ifndef CONFIG_AIC7XXX_PROBE_EISA_VL
+-static uint32_t aic7xxx_probe_eisa_vl;
++uint32_t aic7xxx_probe_eisa_vl;
+ #else
+-static uint32_t aic7xxx_probe_eisa_vl = ~0;
++uint32_t aic7xxx_probe_eisa_vl = ~0;
+ #endif
+ 
+ /*
+@@ -482,35 +491,32 @@ MODULE_PARM_DESC(aic7xxx,
+ #endif
+ 
+ static void ahc_linux_handle_scsi_status(struct ahc_softc *,
+-					 struct ahc_linux_device *,
++					 struct aic_linux_device *,
+ 					 struct scb *);
+ static void ahc_linux_queue_cmd_complete(struct ahc_softc *ahc,
+ 					 Scsi_Cmnd *cmd);
+ static void ahc_linux_filter_inquiry(struct ahc_softc*, struct ahc_devinfo*);
+ static void ahc_linux_sem_timeout(u_long arg);
+-static void ahc_linux_freeze_simq(struct ahc_softc *ahc);
+-static void ahc_linux_release_simq(u_long arg);
+ static void ahc_linux_dev_timed_unfreeze(u_long arg);
+ static int  ahc_linux_queue_recovery_cmd(Scsi_Cmnd *cmd, scb_flag flag);
+ static void ahc_linux_initialize_scsi_bus(struct ahc_softc *ahc);
+ static void ahc_linux_size_nseg(void);
+ static void ahc_linux_thread_run_complete_queue(struct ahc_softc *ahc);
+ static void ahc_linux_start_dv(struct ahc_softc *ahc);
+-static void ahc_linux_dv_timeout(struct scsi_cmnd *cmd);
+ static int  ahc_linux_dv_thread(void *data);
+ static void ahc_linux_kill_dv_thread(struct ahc_softc *ahc);
+ static void ahc_linux_dv_target(struct ahc_softc *ahc, u_int target);
+ static void ahc_linux_dv_transition(struct ahc_softc *ahc,
+ 				    struct scsi_cmnd *cmd,
+ 				    struct ahc_devinfo *devinfo,
+-				    struct ahc_linux_target *targ);
++				    struct aic_linux_target *targ);
+ static void ahc_linux_dv_fill_cmd(struct ahc_softc *ahc,
+ 				  struct scsi_cmnd *cmd,
+ 				  struct ahc_devinfo *devinfo);
+ static void ahc_linux_dv_inq(struct ahc_softc *ahc,
+ 			     struct scsi_cmnd *cmd,
+ 			     struct ahc_devinfo *devinfo,
+-			     struct ahc_linux_target *targ,
++			     struct aic_linux_target *targ,
+ 			     u_int request_length);
+ static void ahc_linux_dv_tur(struct ahc_softc *ahc,
+ 			     struct scsi_cmnd *cmd,
+@@ -518,58 +524,48 @@ static void ahc_linux_dv_tur(struct ahc_
+ static void ahc_linux_dv_rebd(struct ahc_softc *ahc,
+ 			      struct scsi_cmnd *cmd,
+ 			      struct ahc_devinfo *devinfo,
+-			      struct ahc_linux_target *targ);
++			      struct aic_linux_target *targ);
+ static void ahc_linux_dv_web(struct ahc_softc *ahc,
+ 			     struct scsi_cmnd *cmd,
+ 			     struct ahc_devinfo *devinfo,
+-			     struct ahc_linux_target *targ);
++			     struct aic_linux_target *targ);
+ static void ahc_linux_dv_reb(struct ahc_softc *ahc,
+ 			     struct scsi_cmnd *cmd,
+ 			     struct ahc_devinfo *devinfo,
+-			     struct ahc_linux_target *targ);
++			     struct aic_linux_target *targ);
+ static void ahc_linux_dv_su(struct ahc_softc *ahc,
+ 			    struct scsi_cmnd *cmd,
+ 			    struct ahc_devinfo *devinfo,
+-			    struct ahc_linux_target *targ);
++			    struct aic_linux_target *targ);
+ static int ahc_linux_fallback(struct ahc_softc *ahc,
+ 			      struct ahc_devinfo *devinfo);
+-static void ahc_linux_dv_complete(Scsi_Cmnd *cmd);
+-static void ahc_linux_generate_dv_pattern(struct ahc_linux_target *targ);
++static void ahc_linux_generate_dv_pattern(struct aic_linux_target *targ);
+ static u_int ahc_linux_user_tagdepth(struct ahc_softc *ahc,
+ 				     struct ahc_devinfo *devinfo);
+ static u_int ahc_linux_user_dv_setting(struct ahc_softc *ahc);
+-static void ahc_linux_device_queue_depth(struct ahc_softc *ahc,
+-					 struct ahc_linux_device *dev);
+-static struct ahc_linux_target*	ahc_linux_alloc_target(struct ahc_softc*,
++static void aic_linux_device_queue_depth(struct ahc_softc *ahc,
++					 struct aic_linux_device *dev);
++static struct aic_linux_target*	ahc_linux_alloc_target(struct ahc_softc*,
+ 						       u_int, u_int);
+ static void			ahc_linux_free_target(struct ahc_softc*,
+-						      struct ahc_linux_target*);
+-static struct ahc_linux_device*	ahc_linux_alloc_device(struct ahc_softc*,
+-						       struct ahc_linux_target*,
++						      struct aic_linux_target*);
++static struct aic_linux_device*	ahc_linux_alloc_device(struct ahc_softc*,
++						       struct aic_linux_target*,
+ 						       u_int);
+ static void			ahc_linux_free_device(struct ahc_softc*,
+-						      struct ahc_linux_device*);
+-static void ahc_linux_run_device_queue(struct ahc_softc*,
+-				       struct ahc_linux_device*);
++						      struct aic_linux_device*);
+ static void ahc_linux_setup_tag_info_global(char *p);
+ static aic_option_callback_t ahc_linux_setup_tag_info;
+ static aic_option_callback_t ahc_linux_setup_dv;
+ static int  aic7xxx_setup(char *s);
+ static int  ahc_linux_next_unit(void);
+-static void ahc_runq_tasklet(unsigned long data);
+-static struct ahc_cmd *ahc_linux_run_complete_queue(struct ahc_softc *ahc);
++static struct aic_cmd *ahc_linux_run_complete_queue(struct ahc_softc *ahc);
+ 
+ /********************************* Inlines ************************************/
+-static __inline void ahc_schedule_runq(struct ahc_softc *ahc);
+-static __inline struct ahc_linux_device*
++static __inline struct aic_linux_device*
+ 		     ahc_linux_get_device(struct ahc_softc *ahc, u_int channel,
+ 					  u_int target, u_int lun, int alloc);
+ static __inline void ahc_schedule_completeq(struct ahc_softc *ahc);
+-static __inline void ahc_linux_check_device_queue(struct ahc_softc *ahc,
+-						  struct ahc_linux_device *dev);
+-static __inline struct ahc_linux_device *
+-		     ahc_linux_next_device_to_run(struct ahc_softc *ahc);
+-static __inline void ahc_linux_run_device_queues(struct ahc_softc *ahc);
+ static __inline void ahc_linux_unmap_scb(struct ahc_softc*, struct scb*);
+ 
+ static __inline int ahc_linux_map_seg(struct ahc_softc *ahc, struct scb *scb,
+@@ -579,35 +575,19 @@ static __inline int ahc_linux_map_seg(st
+ static __inline void
+ ahc_schedule_completeq(struct ahc_softc *ahc)
+ {
+-	if ((ahc->platform_data->flags & AHC_RUN_CMPLT_Q_TIMER) == 0) {
+-		ahc->platform_data->flags |= AHC_RUN_CMPLT_Q_TIMER;
++	if ((ahc->platform_data->flags & AIC_RUN_CMPLT_Q_TIMER) == 0) {
++		ahc->platform_data->flags |= AIC_RUN_CMPLT_Q_TIMER;
+ 		ahc->platform_data->completeq_timer.expires = jiffies;
+ 		add_timer(&ahc->platform_data->completeq_timer);
+ 	}
+ }
+ 
+-/*
+- * Must be called with our lock held.
+- */
+-static __inline void
+-ahc_schedule_runq(struct ahc_softc *ahc)
+-{
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+-	tasklet_schedule(&ahc->platform_data->runq_tasklet);
+-#else
+-	/*
+-	 * Tasklets are not available, so run inline.
+-	 */
+-	ahc_runq_tasklet((unsigned long)ahc);
+-#endif
+-}
+-
+-static __inline struct ahc_linux_device*
++static __inline struct aic_linux_device*
+ ahc_linux_get_device(struct ahc_softc *ahc, u_int channel, u_int target,
+ 		     u_int lun, int alloc)
+ {
+-	struct ahc_linux_target *targ;
+-	struct ahc_linux_device *dev;
++	struct aic_linux_target *targ;
++	struct aic_linux_device *dev;
+ 	u_int target_offset;
+ 
+ 	target_offset = target;
+@@ -629,10 +609,10 @@ ahc_linux_get_device(struct ahc_softc *a
+ }
+ 
+ #define AHC_LINUX_MAX_RETURNED_ERRORS 4
+-static struct ahc_cmd *
++static struct aic_cmd *
+ ahc_linux_run_complete_queue(struct ahc_softc *ahc)
+ {
+-	struct	ahc_cmd *acmd;
++	struct	aic_cmd *acmd;
+ 	u_long	done_flags;
+ 	int	with_errors;
+ 
+@@ -657,7 +637,7 @@ ahc_linux_run_complete_queue(struct ahc_
+ 			     acmd, acmd_links.tqe);
+ 		cmd = &acmd_scsi_cmd(acmd);
+ 		cmd->host_scribble = NULL;
+-		if (ahc_cmd_get_transaction_status(cmd) != DID_OK
++		if (aic_cmd_get_transaction_status(cmd) != DID_OK
+ 		 || (cmd->result & 0xFF) != SCSI_STATUS_OK)
+ 			with_errors++;
+ 
+@@ -666,47 +646,6 @@ ahc_linux_run_complete_queue(struct ahc_
+ 	ahc_done_unlock(ahc, &done_flags);
+ 	return (acmd);
+ }
+-
+-static __inline void
+-ahc_linux_check_device_queue(struct ahc_softc *ahc,
+-			     struct ahc_linux_device *dev)
+-{
+-	if ((dev->flags & AHC_DEV_FREEZE_TIL_EMPTY) != 0
+-	 && dev->active == 0) {
+-		dev->flags &= ~AHC_DEV_FREEZE_TIL_EMPTY;
+-		dev->qfrozen--;
+-	}
+-
+-	if (TAILQ_FIRST(&dev->busyq) == NULL
+-	 || dev->openings == 0 || dev->qfrozen != 0)
+-		return;
+-
+-	ahc_linux_run_device_queue(ahc, dev);
+-}
+-
+-static __inline struct ahc_linux_device *
+-ahc_linux_next_device_to_run(struct ahc_softc *ahc)
+-{
+-	
+-	if ((ahc->flags & AHC_RESOURCE_SHORTAGE) != 0
+-	 || (ahc->platform_data->qfrozen != 0
+-	  && AHC_DV_SIMQ_FROZEN(ahc) == 0))
+-		return (NULL);
+-	return (TAILQ_FIRST(&ahc->platform_data->device_runq));
+-}
+-
+-static __inline void
+-ahc_linux_run_device_queues(struct ahc_softc *ahc)
+-{
+-	struct ahc_linux_device *dev;
+-
+-	while ((dev = ahc_linux_next_device_to_run(ahc)) != NULL) {
+-		TAILQ_REMOVE(&ahc->platform_data->device_runq, dev, links);
+-		dev->flags &= ~AHC_DEV_ON_RUN_LIST;
+-		ahc_linux_check_device_queue(ahc, dev);
+-	}
+-}
+-
+ static __inline void
+ ahc_linux_unmap_scb(struct ahc_softc *ahc, struct scb *scb)
+ {
+@@ -718,10 +657,10 @@ ahc_linux_unmap_scb(struct ahc_softc *ah
+ 		struct scatterlist *sg;
+ 
+ 		sg = (struct scatterlist *)cmd->request_buffer;
+-		pci_unmap_sg(ahc->dev_softc, sg, cmd->use_sg,
++		aic_unmap_sg(ahc, sg, cmd->use_sg,
+ 			     scsi_to_pci_dma_dir(cmd->sc_data_direction));
+ 	} else if (cmd->request_bufflen != 0) {
+-		pci_unmap_single(ahc->dev_softc,
++		aic_unmap_single(ahc,
+ 				 scb->platform_data->buf_busaddr,
+ 				 cmd->request_bufflen,
+ 				 scsi_to_pci_dma_dir(cmd->sc_data_direction));
+@@ -739,20 +678,19 @@ ahc_linux_map_seg(struct ahc_softc *ahc,
+ 		      "Increase AHC_NSEG\n");
+ 
+ 	consumed = 1;
+-	sg->addr = ahc_htole32(addr & 0xFFFFFFFF);
++	sg->addr = aic_htole32(addr & 0xFFFFFFFF);
+ 	scb->platform_data->xfer_len += len;
+ 
+ 	if (sizeof(bus_addr_t) > 4
+ 	 && (ahc->flags & AHC_39BIT_ADDRESSING) != 0)
+ 		len |= (addr >> 8) & AHC_SG_HIGH_ADDR_MASK;
+ 
+-	sg->len = ahc_htole32(len);
++	sg->len = aic_htole32(len);
+ 	return (consumed);
+ }
+ 
+ /************************  Host template entry points *************************/
+ static int	   ahc_linux_detect(Scsi_Host_Template *);
+-static int	   ahc_linux_release(struct Scsi_Host *);
+ static int	   ahc_linux_queue(Scsi_Cmnd *, void (*)(Scsi_Cmnd *));
+ static const char *ahc_linux_info(struct Scsi_Host *);
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+@@ -765,6 +703,7 @@ static int	   ahc_linux_biosparam(struct
+ 				       sector_t, int[]);
+ #endif
+ #else
++static int	   ahc_linux_release(struct Scsi_Host *);
+ static void	   ahc_linux_select_queue_depth(struct Scsi_Host *host,
+ 						Scsi_Device *scsi_devs);
+ #if defined(__i386__)
+@@ -836,6 +775,164 @@ ahc_linux_size_nseg(void)
+ #endif
+ }
+ 
++/************************** Error Recovery ************************************/
++static int ahc_linux_recovery_thread(void *arg);
++
++static int
++ahc_linux_recovery_thread(void *arg)
++{
++	struct ahc_softc *ahc;
++	u_long s;
++
++	ahc = (struct ahc_softc *)arg;
++
++	/*
++	 * Complete thread creation.
++	 */
++	lock_kernel();
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,60)
++	/*
++	 * Don't care about any signals.
++	 */
++	siginitsetinv(&current->blocked, 0);
++
++	daemonize();
++	sprintf(current->comm, "ahc_recovery_%d", ahc->unit);
++#else
++	daemonize("ahc_recovery_%d", ahc->unit);
++#endif
++	unlock_kernel();
++
++	while (1) {
++
++		/*
++		 * Use down_interruptible() rather than down() to
++		 * avoid inclusion in the load average.
++		 */
++		down_interruptible(&ahc->platform_data->recovery_sem);
++
++		ahc_lock(ahc, &s);
++		if ((ahc->flags & AHC_SHUTDOWN_RECOVERY) != 0) {
++			ahc_unlock(ahc, &s);
++			break;
++		}
++
++		/*
++		 * Don't bother the recovery handler if the
++		 * list has been cleared by a previous run
++		 * of the handler.  This can happen when
++		 * several SCBs timeout before our handler
++		 * can run causing our semaphore to be up'ed
++		 * repeatedly.  The extra calls need to be
++		 * avoided so that the recovery handler doesn't
++		 * confuse this case with timeouts occuring
++		 * due to interrupts failing to function.
++		 */
++		if (LIST_EMPTY(&ahc->timedout_scbs) != 0) {
++			ahc_unlock(ahc, &s);
++			continue;
++		}
++		ahc_unlock(ahc, &s);
++		ahc_recover_commands(ahc);
++
++		/*
++		 * Process any pent up completions.
++		 */
++		ahc_lock(ahc, &s);
++		aic_schedule_runq(ahc);
++		ahc_linux_run_complete_queue(ahc);
++		ahc_unlock(ahc, &s);
++	}
++	up(&ahc->platform_data->recovery_ending_sem);
++	return(0);
++}
++
++int
++ahc_spawn_recovery_thread(struct ahc_softc *ahc)
++{
++	ahc->platform_data->recovery_pid =
++	    kernel_thread(ahc_linux_recovery_thread, ahc, 0);
++
++	if (ahc->platform_data->recovery_pid < 0)
++		return (-ahc->platform_data->recovery_pid);
++
++	return (0);
++}
++
++void
++ahc_terminate_recovery_thread(struct ahc_softc *ahc)
++{
++	u_long s;
++
++	ahc_lock(ahc, &s);
++	if (ahc->platform_data->recovery_pid != 0) {
++		ahc->flags |= AHC_SHUTDOWN_RECOVERY;
++		ahc_unlock(ahc, &s);
++		up(&ahc->platform_data->recovery_sem);
++
++		/*
++		 * Use the recovery_ending_sem as an indicator that
++		 * the dv thread is exiting.  Note that the dv
++		 * thread must still return after performing
++		 * the up on our semaphore before it has
++		 * completely exited this module.  Unfortunately,
++		 * there seems to be no easy way to wait for the
++		 * exit of a thread for which you are not the
++		 * parent (dv threads are parented by init).
++		 * Cross your fingers...
++		 */
++		down(&ahc->platform_data->recovery_ending_sem);
++
++		/*
++		 * Mark the recovery thread as already dead.  This
++		 * avoids attempting to kill it a second time.
++		 * This is necessary because we must kill the
++		 * our threads before calling ahc_free() in the
++		 * module shutdown case to avoid bogus locking
++		 * in the SCSI mid-layer, but when ahc_free() is
++		 * called without killing the DV thread in the
++		 * instance detach case, so ahc_platform_free()
++		 * calls us again to verify that the DV thread
++		 * is dead.
++		 */
++		ahc->platform_data->recovery_pid = 0;
++	} else {
++		ahc_unlock(ahc, &s);
++	}
++}
++
++void
++ahc_set_recoveryscb(struct ahc_softc *ahc, struct scb *scb)
++{
++	if ((scb->flags & SCB_RECOVERY_SCB) == 0) {
++		struct scb *list_scb;
++
++		scb->flags |= SCB_RECOVERY_SCB;
++
++		/*
++		 * Take all queued, but not sent SCBs out of the equation.
++		 * Also ensure that no new commands are queued to us while we
++		 * try to fix this problem.
++		 */
++		if ((scb->platform_data->flags & AIC_RELEASE_SIMQ) == 0) {
++			aic_freeze_simq(ahc);
++			scb->platform_data->flags |= AIC_RELEASE_SIMQ;
++		}
++
++		/*
++		 * Go through all of our pending SCBs and remove
++		 * any scheduled timeouts for them.  We will reschedule
++		 * them after we've successfully fixed this problem.
++		 */
++		LIST_FOREACH(list_scb, &ahc->pending_scbs, pending_links) {
++
++			scsi_delete_timer(list_scb->io_ctx);
++			list_scb->platform_data->flags &= ~AIC_TIMEOUT_ACTIVE;
++		}
++	}
++}
++
++/************************ Linux Entry Points **********************************/
+ /*
+  * Try to detect an Adaptec 7XXX controller.
+  */
+@@ -858,7 +955,7 @@ ahc_linux_detect(Scsi_Host_Template *tem
+ 	 * that some of our hacks^H^H^H^H^Hassumptions aren't
+ 	 * violated.
+ 	 */
+-	if (offsetof(struct ahc_cmd_internal, end)
++	if (offsetof(struct aic_cmd_internal, end)
+ 	  > offsetof(struct scsi_cmnd, host_scribble)) {
+ 		printf("ahc_linux_detect: SCSI data structures changed.\n");
+ 		printf("ahc_linux_detect: Unable to attach\n");
+@@ -895,8 +992,9 @@ ahc_linux_detect(Scsi_Host_Template *tem
+ 	ahc_linux_pci_init();
+ #endif
+ 
+-	if (aic7xxx_probe_eisa_vl != 0)
+-		aic7770_linux_probe(template);
++#ifdef CONFIG_EISA
++	ahc_linux_eisa_init();
++#endif
+ 
+ 	/*
+ 	 * Register with the SCSI layer all
+@@ -915,6 +1013,7 @@ ahc_linux_detect(Scsi_Host_Template *tem
+ 	return (found);
+ }
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ /*
+  * Free the passed in Scsi_Host memory structures prior to unloading the
+  * module.
+@@ -925,7 +1024,6 @@ ahc_linux_release(struct Scsi_Host * hos
+ 	struct ahc_softc *ahc;
+ 	u_long l;
+ 
+-	ahc_list_lock(&l);
+ 	if (host != NULL) {
+ 
+ 		/*
+@@ -933,19 +1031,23 @@ ahc_linux_release(struct Scsi_Host * hos
+ 		 * the free directly, but check our
+ 		 * list for extra sanity.
+ 		 */
++		ahc_list_lock(&l);
+ 		ahc = ahc_find_softc(*(struct ahc_softc **)host->hostdata);
+ 		if (ahc != NULL) {
+ 			u_long s;
+ 
++			TAILQ_REMOVE(&ahc_tailq, ahc, links);
++			ahc_list_unlock(&l);
+ 			ahc_lock(ahc, &s);
+ 			ahc_intr_enable(ahc, FALSE);
+ 			ahc_unlock(ahc, &s);
+ 			ahc_free(ahc);
+-		}
++		} else
++			ahc_list_unlock(&l);
+ 	}
+-	ahc_list_unlock(&l);
+ 	return (0);
+ }
++#endif
+ 
+ /*
+  * Return a string describing the driver.
+@@ -982,7 +1084,7 @@ static int
+ ahc_linux_queue(Scsi_Cmnd * cmd, void (*scsi_done) (Scsi_Cmnd *))
+ {
+ 	struct	 ahc_softc *ahc;
+-	struct	 ahc_linux_device *dev;
++	struct	 aic_linux_device *dev;
+ 	u_long	 flags;
+ 
+ 	ahc = *(struct ahc_softc **)cmd->device->host->hostdata;
+@@ -1001,9 +1103,9 @@ ahc_linux_queue(Scsi_Cmnd * cmd, void (*
+ 	 * perform DV.
+ 	 */
+ 	if (ahc->platform_data->qfrozen != 0
+-	 && AHC_DV_CMD(cmd) == 0) {
++	 && AIC_DV_CMD(cmd) == 0) {
+ 
+-		ahc_cmd_set_transaction_status(cmd, CAM_REQUEUE_REQ);
++		aic_cmd_set_transaction_status(cmd, CAM_REQUEUE_REQ);
+ 		ahc_linux_queue_cmd_complete(ahc, cmd);
+ 		ahc_schedule_completeq(ahc);
+ 		ahc_midlayer_entrypoint_unlock(ahc, &flags);
+@@ -1012,7 +1114,8 @@ ahc_linux_queue(Scsi_Cmnd * cmd, void (*
+ 	dev = ahc_linux_get_device(ahc, cmd->device->channel, cmd->device->id,
+ 				   cmd->device->lun, /*alloc*/TRUE);
+ 	if (dev == NULL) {
+-		ahc_cmd_set_transaction_status(cmd, CAM_RESRC_UNAVAIL);
++
++		aic_cmd_set_transaction_status(cmd, CAM_RESRC_UNAVAIL);
+ 		ahc_linux_queue_cmd_complete(ahc, cmd);
+ 		ahc_schedule_completeq(ahc);
+ 		ahc_midlayer_entrypoint_unlock(ahc, &flags);
+@@ -1020,12 +1123,30 @@ ahc_linux_queue(Scsi_Cmnd * cmd, void (*
+ 		       ahc_name(ahc));
+ 		return (0);
+ 	}
++
++	if (cmd->cmd_len > MAX_CDB_LEN) {
++
++		aic_cmd_set_transaction_status(cmd, CAM_REQ_INVALID);
++		ahc_linux_queue_cmd_complete(ahc, cmd);
++		ahc_schedule_completeq(ahc);
++		ahc_midlayer_entrypoint_unlock(ahc, &flags);
++		printf("%s: aic7xxx_linux_queue -"
++		       "CDB length of %d exceeds max!\n",
++		       ahc_name(ahc), cmd->cmd_len);
++		return (0);
++	}
++
++	/*
++	 * We perform our own timeout handling.
++	 */
++	scsi_delete_timer(cmd);
++
+ 	cmd->result = CAM_REQ_INPROG << 16;
+-	TAILQ_INSERT_TAIL(&dev->busyq, (struct ahc_cmd *)cmd, acmd_links.tqe);
+-	if ((dev->flags & AHC_DEV_ON_RUN_LIST) == 0) {
++	TAILQ_INSERT_TAIL(&dev->busyq, (struct aic_cmd *)cmd, acmd_links.tqe);
++	if ((dev->flags & AIC_DEV_ON_RUN_LIST) == 0) {
+ 		TAILQ_INSERT_TAIL(&ahc->platform_data->device_runq, dev, links);
+-		dev->flags |= AHC_DEV_ON_RUN_LIST;
+-		ahc_linux_run_device_queues(ahc);
++		dev->flags |= AIC_DEV_ON_RUN_LIST;
++		aic_linux_run_device_queues(ahc);
+ 	}
+ 	ahc_midlayer_entrypoint_unlock(ahc, &flags);
+ 	return (0);
+@@ -1047,7 +1168,7 @@ static int
+ ahc_linux_slave_configure(Scsi_Device *device)
+ {
+ 	struct	ahc_softc *ahc;
+-	struct	ahc_linux_device *dev;
++	struct	aic_linux_device *dev;
+ 	u_long	flags;
+ 
+ 	ahc = *((struct ahc_softc **)device->host->hostdata);
+@@ -1063,9 +1184,9 @@ ahc_linux_slave_configure(Scsi_Device *d
+ 				   device->id, device->lun,
+ 				   /*alloc*/TRUE);
+ 	if (dev != NULL) {
+-		dev->flags &= ~AHC_DEV_UNCONFIGURED;
++		dev->flags &= ~AIC_DEV_UNCONFIGURED;
+ 		dev->scsi_device = device;
+-		ahc_linux_device_queue_depth(ahc, dev);
++		aic_linux_device_queue_depth(ahc, dev);
+ 	}
+ 	ahc_midlayer_entrypoint_unlock(ahc, &flags);
+ 	return (0);
+@@ -1075,7 +1196,7 @@ static void
+ ahc_linux_slave_destroy(Scsi_Device *device)
+ {
+ 	struct	ahc_softc *ahc;
+-	struct	ahc_linux_device *dev;
++	struct	aic_linux_device *dev;
+ 	u_long	flags;
+ 
+ 	ahc = *((struct ahc_softc **)device->host->hostdata);
+@@ -1093,11 +1214,10 @@ ahc_linux_slave_destroy(Scsi_Device *dev
+ 	 * the refcounting process.
+ 	 */
+ 	if (dev != NULL
+-	 && (dev->flags & AHC_DEV_SLAVE_CONFIGURED) != 0) {
+-		dev->flags |= AHC_DEV_UNCONFIGURED;
++	 && (dev->flags & AIC_DEV_SLAVE_CONFIGURED) != 0) {
++		dev->flags |= AIC_DEV_UNCONFIGURED;
+ 		if (TAILQ_EMPTY(&dev->busyq)
+-		 && dev->active == 0
+-	 	 && (dev->flags & AHC_DEV_TIMER_ACTIVE) == 0)
++		 && dev->active == 0)
+ 			ahc_linux_free_device(ahc, dev);
+ 	}
+ 	ahc_midlayer_entrypoint_unlock(ahc, &flags);
+@@ -1136,7 +1256,7 @@ ahc_linux_select_queue_depth(struct Scsi
+ 			continue;
+ 
+ 		if (device->host == host) {
+-			struct	 ahc_linux_device *dev;
++			struct	 aic_linux_device *dev;
+ 
+ 			/*
+ 			 * Since Linux has attached to the device, configure
+@@ -1147,13 +1267,13 @@ ahc_linux_select_queue_depth(struct Scsi
+ 						   device->id, device->lun,
+ 						   /*alloc*/TRUE);
+ 			if (dev != NULL) {
+-				dev->flags &= ~AHC_DEV_UNCONFIGURED;
++				dev->flags &= ~AIC_DEV_UNCONFIGURED;
+ 				dev->scsi_device = device;
+-				ahc_linux_device_queue_depth(ahc, dev);
++				aic_linux_device_queue_depth(ahc, dev);
+ 				device->queue_depth = dev->openings
+ 						    + dev->active;
+-				if ((dev->flags & (AHC_DEV_Q_BASIC
+-						| AHC_DEV_Q_TAGGED)) == 0) {
++				if ((dev->flags & (AIC_DEV_Q_BASIC
++						| AIC_DEV_Q_TAGGED)) == 0) {
+ 					/*
+ 					 * We allow the OS to queue 2 untagged
+ 					 * transactions to us at any time even
+@@ -1291,63 +1411,8 @@ ahc_linux_bus_reset(Scsi_Cmnd *cmd)
+ 	return SUCCESS;
+ }
+ 
+-Scsi_Host_Template aic7xxx_driver_template = {
+-	.module			= THIS_MODULE,
+-	.name			= "aic7xxx",
+-	.proc_info		= ahc_linux_proc_info,
+-	.info			= ahc_linux_info,
+-	.queuecommand		= ahc_linux_queue,
+-	.eh_abort_handler	= ahc_linux_abort,
+-	.eh_device_reset_handler = ahc_linux_dev_reset,
+-	.eh_bus_reset_handler	= ahc_linux_bus_reset,
+-#if defined(__i386__)
+-	.bios_param		= ahc_linux_biosparam,
+-#endif
+-	.can_queue		= AHC_MAX_QUEUE,
+-	.this_id		= -1,
+-	.cmd_per_lun		= 2,
+-	.use_clustering		= ENABLE_CLUSTERING,
+-	.slave_alloc		= ahc_linux_slave_alloc,
+-	.slave_configure	= ahc_linux_slave_configure,
+-	.slave_destroy		= ahc_linux_slave_destroy,
+-};
+-
+-/**************************** Tasklet Handler *********************************/
+-
+-/*
+- * In 2.4.X and above, this routine is called from a tasklet,
+- * so we must re-acquire our lock prior to executing this code.
+- * In all prior kernels, ahc_schedule_runq() calls this routine
+- * directly and ahc_schedule_runq() is called with our lock held.
+- */
+-static void
+-ahc_runq_tasklet(unsigned long data)
+-{
+-	struct ahc_softc* ahc;
+-	struct ahc_linux_device *dev;
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+-	u_long flags;
+-#endif
+-
+-	ahc = (struct ahc_softc *)data;
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+-	ahc_lock(ahc, &flags);
+-#endif
+-	while ((dev = ahc_linux_next_device_to_run(ahc)) != NULL) {
+-	
+-		TAILQ_REMOVE(&ahc->platform_data->device_runq, dev, links);
+-		dev->flags &= ~AHC_DEV_ON_RUN_LIST;
+-		ahc_linux_check_device_queue(ahc, dev);
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+-		/* Yeild to our interrupt handler */
+-		ahc_unlock(ahc, &flags);
+-		ahc_lock(ahc, &flags);
+-#endif
+-	}
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+-	ahc_unlock(ahc, &flags);
+-#endif
+-}
++Scsi_Host_Template aic7xxx_driver_template =
++	AIC_TEMPLATE_INITIALIZER("aic7xxx", /* max_sectors*/8192);
+ 
+ /******************************** Macros **************************************/
+ #define BUILD_SCSIID(ahc, cmd)						    \
+@@ -1355,132 +1420,6 @@ ahc_runq_tasklet(unsigned long data)
+ 	| (((cmd)->device->channel == 0) ? (ahc)->our_id : (ahc)->our_id_b) \
+ 	| (((cmd)->device->channel == 0) ? 0 : TWIN_CHNLB))
+ 
+-/******************************** Bus DMA *************************************/
+-int
+-ahc_dma_tag_create(struct ahc_softc *ahc, bus_dma_tag_t parent,
+-		   bus_size_t alignment, bus_size_t boundary,
+-		   bus_addr_t lowaddr, bus_addr_t highaddr,
+-		   bus_dma_filter_t *filter, void *filterarg,
+-		   bus_size_t maxsize, int nsegments,
+-		   bus_size_t maxsegsz, int flags, bus_dma_tag_t *ret_tag)
+-{
+-	bus_dma_tag_t dmat;
+-
+-	dmat = malloc(sizeof(*dmat), M_DEVBUF, M_NOWAIT);
+-	if (dmat == NULL)
+-		return (ENOMEM);
+-
+-	/*
+-	 * Linux is very simplistic about DMA memory.  For now don't
+-	 * maintain all specification information.  Once Linux supplies
+-	 * better facilities for doing these operations, or the
+-	 * needs of this particular driver change, we might need to do
+-	 * more here.
+-	 */
+-	dmat->alignment = alignment;
+-	dmat->boundary = boundary;
+-	dmat->maxsize = maxsize;
+-	*ret_tag = dmat;
+-	return (0);
+-}
+-
+-void
+-ahc_dma_tag_destroy(struct ahc_softc *ahc, bus_dma_tag_t dmat)
+-{
+-	free(dmat, M_DEVBUF);
+-}
+-
+-int
+-ahc_dmamem_alloc(struct ahc_softc *ahc, bus_dma_tag_t dmat, void** vaddr,
+-		 int flags, bus_dmamap_t *mapp)
+-{
+-	bus_dmamap_t map;
+-
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
+-	map = malloc(sizeof(*map), M_DEVBUF, M_NOWAIT);
+-	if (map == NULL)
+-		return (ENOMEM);
+-	/*
+-	 * Although we can dma data above 4GB, our
+-	 * "consistent" memory is below 4GB for
+-	 * space efficiency reasons (only need a 4byte
+-	 * address).  For this reason, we have to reset
+-	 * our dma mask when doing allocations.
+-	 */
+-	if (ahc->dev_softc != NULL)
+-		ahc_pci_set_dma_mask(ahc->dev_softc, 0xFFFFFFFF);
+-	*vaddr = pci_alloc_consistent(ahc->dev_softc,
+-				      dmat->maxsize, &map->bus_addr);
+-	if (ahc->dev_softc != NULL)
+-		ahc_pci_set_dma_mask(ahc->dev_softc,
+-				     ahc->platform_data->hw_dma_mask);
+-#else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0) */
+-	/*
+-	 * At least in 2.2.14, malloc is a slab allocator so all
+-	 * allocations are aligned.  We assume for these kernel versions
+-	 * that all allocations will be bellow 4Gig, physically contiguous,
+-	 * and accessible via DMA by the controller.
+-	 */
+-	map = NULL; /* No additional information to store */
+-	*vaddr = malloc(dmat->maxsize, M_DEVBUF, M_NOWAIT);
+-#endif
+-	if (*vaddr == NULL)
+-		return (ENOMEM);
+-	*mapp = map;
+-	return(0);
+-}
+-
+-void
+-ahc_dmamem_free(struct ahc_softc *ahc, bus_dma_tag_t dmat,
+-		void* vaddr, bus_dmamap_t map)
+-{
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
+-	pci_free_consistent(ahc->dev_softc, dmat->maxsize,
+-			    vaddr, map->bus_addr);
+-#else
+-	free(vaddr, M_DEVBUF);
+-#endif
+-}
+-
+-int
+-ahc_dmamap_load(struct ahc_softc *ahc, bus_dma_tag_t dmat, bus_dmamap_t map,
+-		void *buf, bus_size_t buflen, bus_dmamap_callback_t *cb,
+-		void *cb_arg, int flags)
+-{
+-	/*
+-	 * Assume for now that this will only be used during
+-	 * initialization and not for per-transaction buffer mapping.
+-	 */
+-	bus_dma_segment_t stack_sg;
+-
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
+-	stack_sg.ds_addr = map->bus_addr;
+-#else
+-#define VIRT_TO_BUS(a) (uint32_t)virt_to_bus((void *)(a))
+-	stack_sg.ds_addr = VIRT_TO_BUS(buf);
+-#endif
+-	stack_sg.ds_len = dmat->maxsize;
+-	cb(cb_arg, &stack_sg, /*nseg*/1, /*error*/0);
+-	return (0);
+-}
+-
+-void
+-ahc_dmamap_destroy(struct ahc_softc *ahc, bus_dma_tag_t dmat, bus_dmamap_t map)
+-{
+-	/*
+-	 * The map may is NULL in our < 2.3.X implementation.
+-	 */
+-	if (map != NULL)
+-		free(map, M_DEVBUF);
+-}
+-
+-int
+-ahc_dmamap_unload(struct ahc_softc *ahc, bus_dma_tag_t dmat, bus_dmamap_t map)
+-{
+-	/* Nothing to do */
+-	return (0);
+-}
+-
+ /********************* Platform Dependent Functions ***************************/
+ /*
+  * Compare "left hand" softc with "right hand" softc, returning:
+@@ -1525,24 +1464,25 @@ ahc_softc_comp(struct ahc_softc *lahc, s
+ 
+ 	/* Still equal.  Sort by BIOS address, ioport, or bus/slot/func. */
+ 	switch (rvalue) {
++#ifdef CONFIG_PCI
+ 	case AHC_PCI:
+ 	{
+ 		char primary_channel;
+ 
+ 		if (aic7xxx_reverse_scan != 0)
+-			value = ahc_get_pci_bus(lahc->dev_softc)
+-			      - ahc_get_pci_bus(rahc->dev_softc);
++			value = aic_get_pci_bus(lahc->dev_softc)
++			      - aic_get_pci_bus(rahc->dev_softc);
+ 		else
+-			value = ahc_get_pci_bus(rahc->dev_softc)
+-			      - ahc_get_pci_bus(lahc->dev_softc);
++			value = aic_get_pci_bus(rahc->dev_softc)
++			      - aic_get_pci_bus(lahc->dev_softc);
+ 		if (value != 0)
+ 			break;
+ 		if (aic7xxx_reverse_scan != 0)
+-			value = ahc_get_pci_slot(lahc->dev_softc)
+-			      - ahc_get_pci_slot(rahc->dev_softc);
++			value = aic_get_pci_slot(lahc->dev_softc)
++			      - aic_get_pci_slot(rahc->dev_softc);
+ 		else
+-			value = ahc_get_pci_slot(rahc->dev_softc)
+-			      - ahc_get_pci_slot(lahc->dev_softc);
++			value = aic_get_pci_slot(rahc->dev_softc)
++			      - aic_get_pci_slot(lahc->dev_softc);
+ 		if (value != 0)
+ 			break;
+ 		/*
+@@ -1557,6 +1497,8 @@ ahc_softc_comp(struct ahc_softc *lahc, s
+ 			value = 1;
+ 		break;
+ 	}
++#endif
++#ifdef CONFIG_EISA
+ 	case AHC_EISA:
+ 		if ((rahc->flags & AHC_BIOS_ENABLED) != 0) {
+ 			value = rahc->platform_data->bios_address
+@@ -1566,6 +1508,7 @@ ahc_softc_comp(struct ahc_softc *lahc, s
+ 			      - lahc->bsh.ioport; 
+ 		}
+ 		break;
++#endif
+ 	default:
+ 		panic("ahc_softc_sort: invalid bus type");
+ 	}
+@@ -1699,9 +1642,16 @@ ahc_linux_register_host(struct ahc_softc
+ 	char	*new_name;
+ 	u_long	 s;
+ 	u_int	 targ_offset;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
++	int	 error;
++#endif
+ 
+ 	template->name = ahc->description;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+ 	host = scsi_host_alloc(template, sizeof(struct ahc_softc *));
++#else
++	host = scsi_register(template, sizeof(struct ahc_softc *));
++#endif
+ 	if (host == NULL)
+ 		return (ENOMEM);
+ 
+@@ -1710,8 +1660,12 @@ ahc_linux_register_host(struct ahc_softc
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+ 	scsi_assign_lock(host, &ahc->platform_data->spin_lock);
+ #elif AHC_SCSI_HAS_HOST_LOCK != 0
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,21)
++	host->host_lock = &ahc->platform_data->spin_lock;
++#else
+ 	host->lock = &ahc->platform_data->spin_lock;
+ #endif
++#endif
+ 	ahc->platform_data->host = host;
+ 	host->can_queue = AHC_MAX_QUEUE;
+ 	host->cmd_per_lun = 2;
+@@ -1736,13 +1690,20 @@ ahc_linux_register_host(struct ahc_softc
+ #endif
+ 	ahc_linux_initialize_scsi_bus(ahc);
+ 	ahc_unlock(ahc, &s);
++	ahc_sysrq_key = aic_install_sysrq(&ahc_sysrq_op);
++	ahc_spawn_recovery_thread(ahc);
++	if (ahc->platform_data->recovery_pid < 0) {
++		printf("%s: Failed to create recovery thread, error= %d\n",
++		       ahc_name(ahc), ahc->platform_data->recovery_pid);
++		return (-ahc->platform_data->recovery_pid);
++	}
+ 	ahc->platform_data->dv_pid = kernel_thread(ahc_linux_dv_thread, ahc, 0);
+-	ahc_lock(ahc, &s);
+ 	if (ahc->platform_data->dv_pid < 0) {
+ 		printf("%s: Failed to create DV thread, error= %d\n",
+ 		       ahc_name(ahc), ahc->platform_data->dv_pid);
+ 		return (-ahc->platform_data->dv_pid);
+ 	}
++	ahc_lock(ahc, &s);
+ 	/*
+ 	 * Initially allocate *all* of our linux target objects
+ 	 * so that the DV thread will scan them all in parallel
+@@ -1787,7 +1748,9 @@ ahc_linux_register_host(struct ahc_softc
+ 	ahc_unlock(ahc, &s);
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+-	scsi_add_host(host, (ahc->dev_softc ? &ahc->dev_softc->dev : NULL)); /* XXX handle failure */
++	error = scsi_add_host(host, ahc->dev_softc);
++	if (error != 0)
++		return (-error);
+ 	scsi_scan_host(host);
+ #endif
+ 	return (0);
+@@ -1885,17 +1848,6 @@ ahc_linux_initialize_scsi_bus(struct ahc
+ 		ahc_update_neg_request(ahc, &devinfo, tstate,
+ 				       tinfo, AHC_NEG_ALWAYS);
+ 	}
+-	/* Give the bus some time to recover */
+-	if ((ahc->flags & (AHC_RESET_BUS_A|AHC_RESET_BUS_B)) != 0) {
+-		ahc_linux_freeze_simq(ahc);
+-		init_timer(&ahc->platform_data->reset_timer);
+-		ahc->platform_data->reset_timer.data = (u_long)ahc;
+-		ahc->platform_data->reset_timer.expires =
+-		    jiffies + (AIC7XXX_RESET_DELAY * HZ)/1000;
+-		ahc->platform_data->reset_timer.function =
+-		    ahc_linux_release_simq;
+-		add_timer(&ahc->platform_data->reset_timer);
+-	}
+ }
+ 
+ int
+@@ -1909,27 +1861,32 @@ ahc_platform_alloc(struct ahc_softc *ahc
+ 	memset(ahc->platform_data, 0, sizeof(struct ahc_platform_data));
+ 	TAILQ_INIT(&ahc->platform_data->completeq);
+ 	TAILQ_INIT(&ahc->platform_data->device_runq);
+-	ahc->platform_data->irq = AHC_LINUX_NOIRQ;
++	ahc->platform_data->irq = AIC_LINUX_NOIRQ;
+ 	ahc->platform_data->hw_dma_mask = 0xFFFFFFFF;
+ 	ahc_lockinit(ahc);
+ 	ahc_done_lockinit(ahc);
++	init_timer(&ahc->platform_data->bus_settle_timer);
++	ahc->platform_data->bus_settle_timer.data = (u_long)ahc;
++	ahc->platform_data->bus_settle_timer.function =
++	    (aic_linux_callback_t *)aic_bus_settle_complete;
+ 	init_timer(&ahc->platform_data->completeq_timer);
+ 	ahc->platform_data->completeq_timer.data = (u_long)ahc;
+ 	ahc->platform_data->completeq_timer.function =
+-	    (ahc_linux_callback_t *)ahc_linux_thread_run_complete_queue;
++	    (aic_linux_callback_t *)ahc_linux_thread_run_complete_queue;
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
+ 	init_MUTEX_LOCKED(&ahc->platform_data->eh_sem);
+ 	init_MUTEX_LOCKED(&ahc->platform_data->dv_sem);
+ 	init_MUTEX_LOCKED(&ahc->platform_data->dv_cmd_sem);
++	init_MUTEX_LOCKED(&ahc->platform_data->recovery_sem);
++	init_MUTEX_LOCKED(&ahc->platform_data->recovery_ending_sem);
+ #else
+ 	ahc->platform_data->eh_sem = MUTEX_LOCKED;
+ 	ahc->platform_data->dv_sem = MUTEX_LOCKED;
+ 	ahc->platform_data->dv_cmd_sem = MUTEX_LOCKED;
++	ahc->platform_data->recovery_sem = MUTEX_LOCKED;
++	ahc->platform_data->recovery_ending_sem = MUTEX_LOCKED;
+ #endif
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+-	tasklet_init(&ahc->platform_data->runq_tasklet, ahc_runq_tasklet,
+-		     (unsigned long)ahc);
+-#endif
++	aic_setup_tasklets(ahc);
+ 	ahc->seltime = (aic7xxx_seltime & 0x3) << 4;
+ 	ahc->seltime_b = (aic7xxx_seltime & 0x3) << 4;
+ 	if (aic7xxx_pci_parity == 0)
+@@ -1941,21 +1898,22 @@ ahc_platform_alloc(struct ahc_softc *ahc
+ void
+ ahc_platform_free(struct ahc_softc *ahc)
+ {
+-	struct ahc_linux_target *targ;
+-	struct ahc_linux_device *dev;
++	struct aic_linux_target *targ;
++	struct aic_linux_device *dev;
+ 	int i, j;
+ 
++	aic_remove_sysrq(ahc_sysrq_key, &ahc_sysrq_op);
+ 	if (ahc->platform_data != NULL) {
+ 		del_timer_sync(&ahc->platform_data->completeq_timer);
+ 		ahc_linux_kill_dv_thread(ahc);
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+-		tasklet_kill(&ahc->platform_data->runq_tasklet);
+-#endif
++		aic_teardown_tasklets(ahc);
+ 		if (ahc->platform_data->host != NULL) {
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+ 			scsi_remove_host(ahc->platform_data->host);
+-#endif
+ 			scsi_host_put(ahc->platform_data->host);
++#else
++			scsi_unregister(ahc->platform_data->host);
++#endif
+ 		}
+ 
+ 		/* destroy all of the device and target objects */
+@@ -1969,6 +1927,7 @@ ahc_platform_free(struct ahc_softc *ahc)
+ 					if (targ->devices[j] == NULL)
+ 						continue;
+ 					dev = targ->devices[j];
++					del_timer_sync(&dev->timer);
+ 					ahc_linux_free_device(ahc, dev);
+ 				}
+ 				/*
+@@ -1979,7 +1938,7 @@ ahc_platform_free(struct ahc_softc *ahc)
+  			}
+  		}
+ 
+-		if (ahc->platform_data->irq != AHC_LINUX_NOIRQ)
++		if (ahc->platform_data->irq != AIC_LINUX_NOIRQ)
+ 			free_irq(ahc->platform_data->irq, ahc);
+ 		if (ahc->tag == BUS_SPACE_PIO
+ 		 && ahc->bsh.ioport != 0)
+@@ -2024,7 +1983,7 @@ void
+ ahc_platform_set_tags(struct ahc_softc *ahc, struct ahc_devinfo *devinfo,
+ 		      ahc_queue_alg alg)
+ {
+-	struct ahc_linux_device *dev;
++	struct aic_linux_device *dev;
+ 	int was_queuing;
+ 	int now_queuing;
+ 
+@@ -2033,27 +1992,27 @@ ahc_platform_set_tags(struct ahc_softc *
+ 				   devinfo->lun, /*alloc*/FALSE);
+ 	if (dev == NULL)
+ 		return;
+-	was_queuing = dev->flags & (AHC_DEV_Q_BASIC|AHC_DEV_Q_TAGGED);
++	was_queuing = dev->flags & (AIC_DEV_Q_BASIC|AIC_DEV_Q_TAGGED);
+ 	switch (alg) {
+ 	default:
+ 	case AHC_QUEUE_NONE:
+ 		now_queuing = 0;
+ 		break; 
+ 	case AHC_QUEUE_BASIC:
+-		now_queuing = AHC_DEV_Q_BASIC;
++		now_queuing = AIC_DEV_Q_BASIC;
+ 		break;
+ 	case AHC_QUEUE_TAGGED:
+-		now_queuing = AHC_DEV_Q_TAGGED;
++		now_queuing = AIC_DEV_Q_TAGGED;
+ 		break;
+ 	}
+-	if ((dev->flags & AHC_DEV_FREEZE_TIL_EMPTY) == 0
++	if ((dev->flags & AIC_DEV_FREEZE_TIL_EMPTY) == 0
+ 	 && (was_queuing != now_queuing)
+ 	 && (dev->active != 0)) {
+-		dev->flags |= AHC_DEV_FREEZE_TIL_EMPTY;
++		dev->flags |= AIC_DEV_FREEZE_TIL_EMPTY;
+ 		dev->qfrozen++;
+ 	}
+ 
+-	dev->flags &= ~(AHC_DEV_Q_BASIC|AHC_DEV_Q_TAGGED|AHC_DEV_PERIODIC_OTAG);
++	dev->flags &= ~(AIC_DEV_Q_BASIC|AIC_DEV_Q_TAGGED|AIC_DEV_PERIODIC_OTAG);
+ 	if (now_queuing) {
+ 		u_int usertags;
+ 
+@@ -2073,11 +2032,11 @@ ahc_platform_set_tags(struct ahc_softc *
+ 			 */
+ 			dev->openings = 1;
+ 		} else if (alg == AHC_QUEUE_TAGGED) {
+-			dev->flags |= AHC_DEV_Q_TAGGED;
++			dev->flags |= AIC_DEV_Q_TAGGED;
+ 			if (aic7xxx_periodic_otag != 0)
+-				dev->flags |= AHC_DEV_PERIODIC_OTAG;
++				dev->flags |= AIC_DEV_PERIODIC_OTAG;
+ 		} else
+-			dev->flags |= AHC_DEV_Q_BASIC;
++			dev->flags |= AIC_DEV_Q_BASIC;
+ 	} else {
+ 		/* We can only have one opening. */
+ 		dev->maxtags = 0;
+@@ -2085,13 +2044,13 @@ ahc_platform_set_tags(struct ahc_softc *
+ 	}
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+ 	if (dev->scsi_device != NULL) {
+-		switch ((dev->flags & (AHC_DEV_Q_BASIC|AHC_DEV_Q_TAGGED))) {
+-		case AHC_DEV_Q_BASIC:
++		switch ((dev->flags & (AIC_DEV_Q_BASIC|AIC_DEV_Q_TAGGED))) {
++		case AIC_DEV_Q_BASIC:
+ 			scsi_adjust_queue_depth(dev->scsi_device,
+ 						MSG_SIMPLE_TASK,
+ 						dev->openings + dev->active);
+ 			break;
+-		case AHC_DEV_Q_TAGGED:
++		case AIC_DEV_Q_TAGGED:
+ 			scsi_adjust_queue_depth(dev->scsi_device,
+ 						MSG_ORDERED_TASK,
+ 						dev->openings + dev->active);
+@@ -2155,9 +2114,9 @@ ahc_platform_abort_scbs(struct ahc_softc
+ 		for (; targ < maxtarg; targ++) {
+ 
+ 			for (; clun < maxlun; clun++) {
+-				struct ahc_linux_device *dev;
+-				struct ahc_busyq *busyq;
+-				struct ahc_cmd *acmd;
++				struct aic_linux_device *dev;
++				struct aic_busyq *busyq;
++				struct aic_cmd *acmd;
+ 
+ 				dev = ahc_linux_get_device(ahc, chan,
+ 							   targ, clun,
+@@ -2174,6 +2133,20 @@ ahc_platform_abort_scbs(struct ahc_softc
+ 						     acmd_links.tqe);
+ 					count++;
+ 					cmd->result = status << 16;
++					/*
++					 * The completion handler believes that
++					 * commands without active timers
++					 * running have lost the race of
++					 * completing before their timer
++					 * expires.  Since commands in our
++					 * busy queues do not have timers
++					 * running, appease the mid-layer by
++					 * adding a timer now.  This timer will
++					 * be immediately canceled by the
++					 * midlayer.
++					 */
++					scsi_add_timer(cmd, 60*HZ,
++					    aic_linux_midlayer_timeout);
+ 					ahc_linux_queue_cmd_complete(ahc, cmd);
+ 				}
+ 			}
+@@ -2190,7 +2163,7 @@ ahc_linux_thread_run_complete_queue(stru
+ 
+ 	ahc_lock(ahc, &flags);
+ 	del_timer(&ahc->platform_data->completeq_timer);
+-	ahc->platform_data->flags &= ~AHC_RUN_CMPLT_Q_TIMER;
++	ahc->platform_data->flags &= ~AIC_RUN_CMPLT_Q_TIMER;
+ 	ahc_linux_run_complete_queue(ahc);
+ 	ahc_unlock(ahc, &flags);
+ }
+@@ -2203,14 +2176,23 @@ ahc_linux_start_dv(struct ahc_softc *ahc
+ 	 * Freeze the simq and signal ahc_linux_queue to not let any
+ 	 * more commands through.
+ 	 */
+-	if ((ahc->platform_data->flags & AHC_DV_ACTIVE) == 0) {
++	if ((ahc->platform_data->flags & AIC_DV_ACTIVE) == 0) {
+ #ifdef AHC_DEBUG
+ 		if (ahc_debug & AHC_SHOW_DV)
+ 			printf("%s: Waking DV thread\n", ahc_name(ahc));
+ #endif
+ 
+-		ahc->platform_data->flags |= AHC_DV_ACTIVE;
+-		ahc_linux_freeze_simq(ahc);
++		ahc->platform_data->flags |= AIC_DV_ACTIVE;
++
++		/*
++		 * Prevent upper layer from sending any
++		 * commands to us.
++		 */
++		aic_freeze_simq(ahc);
++		scsi_block_requests(ahc->platform_data->host);
++		ahc_platform_abort_scbs(ahc, CAM_TARGET_WILDCARD, ALL_CHANNELS,
++					CAM_LUN_WILDCARD, SCB_LIST_NULL,
++					ROLE_INITIATOR, CAM_REQUEUE_REQ);
+ 
+ 		/* Wake up the DV kthread */
+ 		up(&ahc->platform_data->dv_sem);
+@@ -2224,7 +2206,7 @@ ahc_linux_kill_dv_thread(struct ahc_soft
+ 
+ 	ahc_lock(ahc, &s);
+ 	if (ahc->platform_data->dv_pid != 0) {
+-		ahc->platform_data->flags |= AHC_DV_SHUTDOWN;
++		ahc->platform_data->flags |= AIC_DV_SHUTDOWN;
+ 		ahc_unlock(ahc, &s);
+ 		up(&ahc->platform_data->dv_sem);
+ 
+@@ -2299,7 +2281,7 @@ ahc_linux_dv_thread(void *data)
+ 
+ 		/* Check to see if we've been signaled to exit */
+ 		ahc_lock(ahc, &s);
+-		if ((ahc->platform_data->flags & AHC_DV_SHUTDOWN) != 0) {
++		if ((ahc->platform_data->flags & AIC_DV_SHUTDOWN) != 0) {
+ 			ahc_unlock(ahc, &s);
+ 			break;
+ 		}
+@@ -2316,7 +2298,7 @@ ahc_linux_dv_thread(void *data)
+ 		 */
+ 		ahc_lock(ahc, &s);
+ 		while (LIST_FIRST(&ahc->pending_scbs) != NULL) {
+-			ahc->platform_data->flags |= AHC_DV_WAIT_SIMQ_EMPTY;
++			ahc->platform_data->flags |= AIC_DV_WAIT_SIMQ_EMPTY;
+ 			ahc_unlock(ahc, &s);
+ 			down_interruptible(&ahc->platform_data->dv_sem);
+ 			ahc_lock(ahc, &s);
+@@ -2326,8 +2308,8 @@ ahc_linux_dv_thread(void *data)
+ 		 * Wait for the SIMQ to be released so that DV is the
+ 		 * only reason the queue is frozen.
+ 		 */
+-		while (AHC_DV_SIMQ_FROZEN(ahc) == 0) {
+-			ahc->platform_data->flags |= AHC_DV_WAIT_SIMQ_RELEASE;
++		while (AIC_DV_SIMQ_FROZEN(ahc) == 0) {
++			ahc->platform_data->flags |= AIC_DV_WAIT_SIMQ_RELEASE;
+ 			ahc_unlock(ahc, &s);
+ 			down_interruptible(&ahc->platform_data->dv_sem);
+ 			ahc_lock(ahc, &s);
+@@ -2338,14 +2320,16 @@ ahc_linux_dv_thread(void *data)
+ 			ahc_linux_dv_target(ahc, target);
+ 
+ 		ahc_lock(ahc, &s);
+-		ahc->platform_data->flags &= ~AHC_DV_ACTIVE;
+-		ahc_unlock(ahc, &s);
++		ahc->platform_data->flags &= ~AIC_DV_ACTIVE;
+ 
+ 		/*
+ 		 * Release the SIMQ so that normal commands are
+ 		 * allowed to continue on the bus.
+ 		 */
+-		ahc_linux_release_simq((u_long)ahc);
++		aic_release_simq_locked(ahc);
++		ahc_unlock(ahc, &s);
++
++		scsi_unblock_requests(ahc->platform_data->host);
+ 	}
+ 	up(&ahc->platform_data->eh_sem);
+ 	return (0);
+@@ -2359,10 +2343,10 @@ ahc_linux_dv_thread(void *data)
+ 	ahc_set_dv_state(ahc, targ, newstate, __LINE__)
+ 
+ static __inline void
+-ahc_set_dv_state(struct ahc_softc *ahc, struct ahc_linux_target *targ,
+-		 ahc_dv_state newstate, u_int line)
++ahc_set_dv_state(struct ahc_softc *ahc, struct aic_linux_target *targ,
++		 aic_dv_state newstate, u_int line)
+ {
+-	ahc_dv_state oldstate;
++	aic_dv_state oldstate;
+ 
+ 	oldstate = targ->dv_state;
+ #ifdef AHC_DEBUG
+@@ -2382,7 +2366,7 @@ static void
+ ahc_linux_dv_target(struct ahc_softc *ahc, u_int target_offset)
+ {
+ 	struct	 ahc_devinfo devinfo;
+-	struct	 ahc_linux_target *targ;
++	struct	 aic_linux_target *targ;
+ 	struct	 scsi_cmnd *cmd;
+ 	struct	 scsi_device *scsi_dev;
+ 	struct	 scsi_sense_data *sense;
+@@ -2396,7 +2380,7 @@ ahc_linux_dv_target(struct ahc_softc *ah
+ 	echo_size = 0;
+ 	ahc_lock(ahc, &s);
+ 	targ = ahc->platform_data->targets[target_offset];
+-	if (targ == NULL || (targ->flags & AHC_DV_REQUIRED) == 0) {
++	if (targ == NULL || (targ->flags & AIC_DV_REQUIRED) == 0) {
+ 		ahc_unlock(ahc, &s);
+ 		return;
+ 	}
+@@ -2421,14 +2405,14 @@ ahc_linux_dv_target(struct ahc_softc *ah
+ 	scsi_dev->channel = devinfo.channel - 'A';
+ 	ahc->platform_data->dv_scsi_dev = scsi_dev;
+ 
+-	AHC_SET_DV_STATE(ahc, targ, AHC_DV_STATE_INQ_SHORT_ASYNC);
++	AHC_SET_DV_STATE(ahc, targ, AIC_DV_STATE_INQ_SHORT_ASYNC);
+ 
+-	while (targ->dv_state != AHC_DV_STATE_EXIT) {
++	while (targ->dv_state != AIC_DV_STATE_EXIT) {
+ 		timeout = AHC_LINUX_DV_TIMEOUT;
+ 		switch (targ->dv_state) {
+-		case AHC_DV_STATE_INQ_SHORT_ASYNC:
+-		case AHC_DV_STATE_INQ_ASYNC:
+-		case AHC_DV_STATE_INQ_ASYNC_VERIFY:
++		case AIC_DV_STATE_INQ_SHORT_ASYNC:
++		case AIC_DV_STATE_INQ_ASYNC:
++		case AIC_DV_STATE_INQ_ASYNC_VERIFY:
+ 			/*
+ 			 * Set things to async narrow to reduce the
+ 			 * chance that the INQ will fail.
+@@ -2440,36 +2424,36 @@ ahc_linux_dv_target(struct ahc_softc *ah
+ 				      AHC_TRANS_GOAL, /*paused*/FALSE);
+ 			ahc_unlock(ahc, &s);
+ 			timeout = 10 * HZ;
+-			targ->flags &= ~AHC_INQ_VALID;
++			targ->flags &= ~AIC_INQ_VALID;
+ 			/* FALLTHROUGH */
+-		case AHC_DV_STATE_INQ_VERIFY:
++		case AIC_DV_STATE_INQ_VERIFY:
+ 		{
+ 			u_int inq_len;
+ 
+-			if (targ->dv_state == AHC_DV_STATE_INQ_SHORT_ASYNC)
++			if (targ->dv_state == AIC_DV_STATE_INQ_SHORT_ASYNC)
+ 				inq_len = AHC_LINUX_DV_INQ_SHORT_LEN;
+ 			else
+ 				inq_len = targ->inq_data->additional_length + 5;
+ 			ahc_linux_dv_inq(ahc, cmd, &devinfo, targ, inq_len);
+ 			break;
+ 		}
+-		case AHC_DV_STATE_TUR:
+-		case AHC_DV_STATE_BUSY:
++		case AIC_DV_STATE_TUR:
++		case AIC_DV_STATE_BUSY:
+ 			timeout = 5 * HZ;
+ 			ahc_linux_dv_tur(ahc, cmd, &devinfo);
+ 			break;
+-		case AHC_DV_STATE_REBD:
++		case AIC_DV_STATE_REBD:
+ 			ahc_linux_dv_rebd(ahc, cmd, &devinfo, targ);
+ 			break;
+-		case AHC_DV_STATE_WEB:
++		case AIC_DV_STATE_WEB:
+ 			ahc_linux_dv_web(ahc, cmd, &devinfo, targ);
+ 			break;
+ 
+-		case AHC_DV_STATE_REB:
++		case AIC_DV_STATE_REB:
+ 			ahc_linux_dv_reb(ahc, cmd, &devinfo, targ);
+ 			break;
+ 
+-		case AHC_DV_STATE_SU:
++		case AIC_DV_STATE_SU:
+ 			ahc_linux_dv_su(ahc, cmd, &devinfo, targ);
+ 			timeout = 50 * HZ;
+ 			break;
+@@ -2481,8 +2465,6 @@ ahc_linux_dv_target(struct ahc_softc *ah
+ 		}
+ 
+ 		/* Queue the command and wait for it to complete */
+-		/* Abuse eh_timeout in the scsi_cmnd struct for our purposes */
+-		init_timer(&cmd->eh_timeout);
+ #ifdef AHC_DEBUG
+ 		if ((ahc_debug & AHC_SHOW_MESSAGES) != 0)
+ 			/*
+@@ -2492,7 +2474,9 @@ ahc_linux_dv_target(struct ahc_softc *ah
+ 			 */
+ 			timeout += HZ;
+ #endif
+-		scsi_add_timer(cmd, timeout, ahc_linux_dv_timeout);
++		init_timer(&cmd->eh_timeout);
++		cmd->timeout_per_command = timeout;
++
+ 		/*
+ 		 * In 2.5.X, it is assumed that all calls from the
+ 		 * "midlayer" (which we are emulating) will have the
+@@ -2516,8 +2500,8 @@ ahc_linux_dv_target(struct ahc_softc *ah
+ 		 * only reason the queue is frozen.
+ 		 */
+ 		ahc_lock(ahc, &s);
+-		while (AHC_DV_SIMQ_FROZEN(ahc) == 0) {
+-			ahc->platform_data->flags |= AHC_DV_WAIT_SIMQ_RELEASE;
++		while (AIC_DV_SIMQ_FROZEN(ahc) == 0) {
++			ahc->platform_data->flags |= AIC_DV_WAIT_SIMQ_RELEASE;
+ 			ahc_unlock(ahc, &s);
+ 			down_interruptible(&ahc->platform_data->dv_sem);
+ 			ahc_lock(ahc, &s);
+@@ -2528,7 +2512,7 @@ ahc_linux_dv_target(struct ahc_softc *ah
+ 	}
+ 
+ out:
+-	if ((targ->flags & AHC_INQ_VALID) != 0
++	if ((targ->flags & AIC_INQ_VALID) != 0
+ 	 && ahc_linux_get_device(ahc, devinfo.channel - 'A',
+ 				 devinfo.target, devinfo.lun,
+ 				 /*alloc*/FALSE) == NULL) {
+@@ -2539,7 +2523,7 @@ out:
+ 		 * parameters found in the inquiry string.
+ 		 */
+ 		ahc_linux_filter_inquiry(ahc, &devinfo);
+-		if ((targ->flags & (AHC_BASIC_DV|AHC_ENHANCED_DV)) != 0) {
++		if ((targ->flags & (AIC_BASIC_DV|AIC_ENHANCED_DV)) != 0) {
+ 			ahc_print_devinfo(ahc, &devinfo);
+ 			printf("DV failed to configure device.  "
+ 			       "Please file a bug report against "
+@@ -2564,7 +2548,7 @@ out:
+ 		free(targ->dv_buffer1, M_DEVBUF);
+ 		targ->dv_buffer1 = NULL;
+ 	}
+-	targ->flags &= ~AHC_DV_REQUIRED;
++	targ->flags &= ~AIC_DV_REQUIRED;
+ 	if (targ->refcount == 0)
+ 		ahc_linux_free_target(ahc, targ);
+ 	ahc_unlock(ahc, &s);
+@@ -2573,13 +2557,13 @@ out:
+ static void
+ ahc_linux_dv_transition(struct ahc_softc *ahc, struct scsi_cmnd *cmd,
+ 			struct ahc_devinfo *devinfo,
+-			struct ahc_linux_target *targ)
++			struct aic_linux_target *targ)
+ {
+ 	u_int32_t status;
+ 
+ 	status = aic_error_action(cmd, targ->inq_data,
+-				  ahc_cmd_get_transaction_status(cmd),
+-				  ahc_cmd_get_scsi_status(cmd));
++				  aic_cmd_get_transaction_status(cmd),
++				  aic_cmd_get_scsi_status(cmd));
+ 	
+ #ifdef AHC_DEBUG
+ 	if (ahc_debug & AHC_SHOW_DV) {
+@@ -2591,8 +2575,8 @@ ahc_linux_dv_transition(struct ahc_softc
+ #endif
+ 
+ 	switch (targ->dv_state) {
+-	case AHC_DV_STATE_INQ_SHORT_ASYNC:
+-	case AHC_DV_STATE_INQ_ASYNC:
++	case AIC_DV_STATE_INQ_SHORT_ASYNC:
++	case AIC_DV_STATE_INQ_ASYNC:
+ 		switch (status & SS_MASK) {
+ 		case SS_NOP:
+ 		{
+@@ -2601,21 +2585,21 @@ ahc_linux_dv_transition(struct ahc_softc
+ 		}
+ 		case SS_INQ_REFRESH:
+ 			AHC_SET_DV_STATE(ahc, targ,
+-					 AHC_DV_STATE_INQ_SHORT_ASYNC);
++					 AIC_DV_STATE_INQ_SHORT_ASYNC);
+ 			break;
+ 		case SS_TUR:
+ 		case SS_RETRY:
+ 			AHC_SET_DV_STATE(ahc, targ, targ->dv_state);
+-			if (ahc_cmd_get_transaction_status(cmd)
++			if (aic_cmd_get_transaction_status(cmd)
+ 			 == CAM_REQUEUE_REQ)
+ 				targ->dv_state_retry--;
+ 			if ((status & SS_ERRMASK) == EBUSY)
+-				AHC_SET_DV_STATE(ahc, targ, AHC_DV_STATE_BUSY);
++				AHC_SET_DV_STATE(ahc, targ, AIC_DV_STATE_BUSY);
+ 			if (targ->dv_state_retry < 10)
+ 				break;
+ 			/* FALLTHROUGH */
+ 		default:
+-			AHC_SET_DV_STATE(ahc, targ, AHC_DV_STATE_EXIT);
++			AHC_SET_DV_STATE(ahc, targ, AIC_DV_STATE_EXIT);
+ #ifdef AHC_DEBUG
+ 			if (ahc_debug & AHC_SHOW_DV) {
+ 				ahc_print_devinfo(ahc, devinfo);
+@@ -2625,7 +2609,7 @@ ahc_linux_dv_transition(struct ahc_softc
+ 			break;
+ 		}
+ 		break;
+-	case AHC_DV_STATE_INQ_ASYNC_VERIFY:
++	case AIC_DV_STATE_INQ_ASYNC_VERIFY:
+ 		switch (status & SS_MASK) {
+ 		case SS_NOP:
+ 		{
+@@ -2639,12 +2623,12 @@ ahc_linux_dv_transition(struct ahc_softc
+ 				 * Try from the top again.
+ 				 */
+ 				AHC_SET_DV_STATE(ahc, targ,
+-						 AHC_DV_STATE_INQ_SHORT_ASYNC);
++						 AIC_DV_STATE_INQ_SHORT_ASYNC);
+ 				break;
+ 			}
+ 
+ 			AHC_SET_DV_STATE(ahc, targ, targ->dv_state+1);
+-			targ->flags |= AHC_INQ_VALID;
++			targ->flags |= AIC_INQ_VALID;
+ 			if (ahc_linux_user_dv_setting(ahc) == 0)
+ 				break;
+ 
+@@ -2657,33 +2641,33 @@ ahc_linux_dv_transition(struct ahc_softc
+ 			default:
+ 			case SID_SPI_CLOCK_ST:
+ 				/* Assume only basic DV is supported. */
+-				targ->flags |= AHC_BASIC_DV;
++				targ->flags |= AIC_BASIC_DV;
+ 				break;
+ 			case SID_SPI_CLOCK_DT:
+ 			case SID_SPI_CLOCK_DT_ST:
+-				targ->flags |= AHC_ENHANCED_DV;
++				targ->flags |= AIC_ENHANCED_DV;
+ 				break;
+ 			}
+ 			break;
+ 		}
+ 		case SS_INQ_REFRESH:
+ 			AHC_SET_DV_STATE(ahc, targ,
+-					 AHC_DV_STATE_INQ_SHORT_ASYNC);
++					 AIC_DV_STATE_INQ_SHORT_ASYNC);
+ 			break;
+ 		case SS_TUR:
+ 		case SS_RETRY:
+ 			AHC_SET_DV_STATE(ahc, targ, targ->dv_state);
+-			if (ahc_cmd_get_transaction_status(cmd)
++			if (aic_cmd_get_transaction_status(cmd)
+ 			 == CAM_REQUEUE_REQ)
+ 				targ->dv_state_retry--;
+ 
+ 			if ((status & SS_ERRMASK) == EBUSY)
+-				AHC_SET_DV_STATE(ahc, targ, AHC_DV_STATE_BUSY);
++				AHC_SET_DV_STATE(ahc, targ, AIC_DV_STATE_BUSY);
+ 			if (targ->dv_state_retry < 10)
+ 				break;
+ 			/* FALLTHROUGH */
+ 		default:
+-			AHC_SET_DV_STATE(ahc, targ, AHC_DV_STATE_EXIT);
++			AHC_SET_DV_STATE(ahc, targ, AIC_DV_STATE_EXIT);
+ #ifdef AHC_DEBUG
+ 			if (ahc_debug & AHC_SHOW_DV) {
+ 				ahc_print_devinfo(ahc, devinfo);
+@@ -2693,14 +2677,14 @@ ahc_linux_dv_transition(struct ahc_softc
+ 			break;
+ 		}
+ 		break;
+-	case AHC_DV_STATE_INQ_VERIFY:
++	case AIC_DV_STATE_INQ_VERIFY:
+ 		switch (status & SS_MASK) {
+ 		case SS_NOP:
+ 		{
+ 
+ 			if (memcmp(targ->inq_data, targ->dv_buffer,
+ 				   AHC_LINUX_DV_INQ_LEN) == 0) {
+-				AHC_SET_DV_STATE(ahc, targ, AHC_DV_STATE_EXIT);
++				AHC_SET_DV_STATE(ahc, targ, AIC_DV_STATE_EXIT);
+ 				break;
+ 			}
+ #ifdef AHC_DEBUG
+@@ -2721,7 +2705,7 @@ ahc_linux_dv_transition(struct ahc_softc
+ #endif
+ 
+ 			if (ahc_linux_fallback(ahc, devinfo) != 0) {
+-				AHC_SET_DV_STATE(ahc, targ, AHC_DV_STATE_EXIT);
++				AHC_SET_DV_STATE(ahc, targ, AIC_DV_STATE_EXIT);
+ 				break;
+ 			}
+ 			/*
+@@ -2734,18 +2718,18 @@ ahc_linux_dv_transition(struct ahc_softc
+ 		}
+ 		case SS_INQ_REFRESH:
+ 			AHC_SET_DV_STATE(ahc, targ,
+-					 AHC_DV_STATE_INQ_SHORT_ASYNC);
++					 AIC_DV_STATE_INQ_SHORT_ASYNC);
+ 			break;
+ 		case SS_TUR:
+ 		case SS_RETRY:
+ 			AHC_SET_DV_STATE(ahc, targ, targ->dv_state);
+-			if (ahc_cmd_get_transaction_status(cmd)
++			if (aic_cmd_get_transaction_status(cmd)
+ 			 == CAM_REQUEUE_REQ) {
+ 				targ->dv_state_retry--;
+ 			} else if ((status & SSQ_FALLBACK) != 0) {
+ 				if (ahc_linux_fallback(ahc, devinfo) != 0) {
+ 					AHC_SET_DV_STATE(ahc, targ,
+-							 AHC_DV_STATE_EXIT);
++							 AIC_DV_STATE_EXIT);
+ 					break;
+ 				}
+ 				/*
+@@ -2754,12 +2738,12 @@ ahc_linux_dv_transition(struct ahc_softc
+ 				 */
+ 				targ->dv_state_retry = 0;
+ 			} else if ((status & SS_ERRMASK) == EBUSY)
+-				AHC_SET_DV_STATE(ahc, targ, AHC_DV_STATE_BUSY);
++				AHC_SET_DV_STATE(ahc, targ, AIC_DV_STATE_BUSY);
+ 			if (targ->dv_state_retry < 10)
+ 				break;
+ 			/* FALLTHROUGH */
+ 		default:
+-			AHC_SET_DV_STATE(ahc, targ, AHC_DV_STATE_EXIT);
++			AHC_SET_DV_STATE(ahc, targ, AIC_DV_STATE_EXIT);
+ #ifdef AHC_DEBUG
+ 			if (ahc_debug & AHC_SHOW_DV) {
+ 				ahc_print_devinfo(ahc, devinfo);
+@@ -2770,33 +2754,33 @@ ahc_linux_dv_transition(struct ahc_softc
+ 		}
+ 		break;
+ 
+-	case AHC_DV_STATE_TUR:
++	case AIC_DV_STATE_TUR:
+ 		switch (status & SS_MASK) {
+ 		case SS_NOP:
+-			if ((targ->flags & AHC_BASIC_DV) != 0) {
++			if ((targ->flags & AIC_BASIC_DV) != 0) {
+ 				ahc_linux_filter_inquiry(ahc, devinfo);
+ 				AHC_SET_DV_STATE(ahc, targ,
+-						 AHC_DV_STATE_INQ_VERIFY);
+-			} else if ((targ->flags & AHC_ENHANCED_DV) != 0) {
+-				AHC_SET_DV_STATE(ahc, targ, AHC_DV_STATE_REBD);
++						 AIC_DV_STATE_INQ_VERIFY);
++			} else if ((targ->flags & AIC_ENHANCED_DV) != 0) {
++				AHC_SET_DV_STATE(ahc, targ, AIC_DV_STATE_REBD);
+ 			} else {
+-				AHC_SET_DV_STATE(ahc, targ, AHC_DV_STATE_EXIT);
++				AHC_SET_DV_STATE(ahc, targ, AIC_DV_STATE_EXIT);
+ 			}
+ 			break;
+ 		case SS_RETRY:
+ 		case SS_TUR:
+ 			if ((status & SS_ERRMASK) == EBUSY) {
+-				AHC_SET_DV_STATE(ahc, targ, AHC_DV_STATE_BUSY);
++				AHC_SET_DV_STATE(ahc, targ, AIC_DV_STATE_BUSY);
+ 				break;
+ 			}
+ 			AHC_SET_DV_STATE(ahc, targ, targ->dv_state);
+-			if (ahc_cmd_get_transaction_status(cmd)
++			if (aic_cmd_get_transaction_status(cmd)
+ 			 == CAM_REQUEUE_REQ) {
+ 				targ->dv_state_retry--;
+ 			} else if ((status & SSQ_FALLBACK) != 0) {
+ 				if (ahc_linux_fallback(ahc, devinfo) != 0) {
+ 					AHC_SET_DV_STATE(ahc, targ,
+-							 AHC_DV_STATE_EXIT);
++							 AIC_DV_STATE_EXIT);
+ 					break;
+ 				}
+ 				/*
+@@ -2812,7 +2796,7 @@ ahc_linux_dv_transition(struct ahc_softc
+ 					printf("DV TUR reties exhausted\n");
+ 				}
+ #endif
+-				AHC_SET_DV_STATE(ahc, targ, AHC_DV_STATE_EXIT);
++				AHC_SET_DV_STATE(ahc, targ, AIC_DV_STATE_EXIT);
+ 				break;
+ 			}
+ 			if (status & SSQ_DELAY)
+@@ -2820,25 +2804,25 @@ ahc_linux_dv_transition(struct ahc_softc
+ 
+ 			break;
+ 		case SS_START:
+-			AHC_SET_DV_STATE(ahc, targ, AHC_DV_STATE_SU);
++			AHC_SET_DV_STATE(ahc, targ, AIC_DV_STATE_SU);
+ 			break;
+ 		case SS_INQ_REFRESH:
+ 			AHC_SET_DV_STATE(ahc, targ,
+-					 AHC_DV_STATE_INQ_SHORT_ASYNC);
++					 AIC_DV_STATE_INQ_SHORT_ASYNC);
+ 			break;
+ 		default:
+-			AHC_SET_DV_STATE(ahc, targ, AHC_DV_STATE_EXIT);
++			AHC_SET_DV_STATE(ahc, targ, AIC_DV_STATE_EXIT);
+ 			break;
+ 		}
+ 		break;
+ 
+-	case AHC_DV_STATE_REBD:
++	case AIC_DV_STATE_REBD:
+ 		switch (status & SS_MASK) {
+ 		case SS_NOP:
+ 		{
+ 			uint32_t echo_size;
+ 
+-			AHC_SET_DV_STATE(ahc, targ, AHC_DV_STATE_WEB);
++			AHC_SET_DV_STATE(ahc, targ, AIC_DV_STATE_WEB);
+ 			echo_size = scsi_3btoul(&targ->dv_buffer[1]);
+ 			echo_size &= 0x1FFF;
+ #ifdef AHC_DEBUG
+@@ -2848,7 +2832,17 @@ ahc_linux_dv_transition(struct ahc_softc
+ 			}
+ #endif
+ 			if (echo_size == 0) {
+-				AHC_SET_DV_STATE(ahc, targ, AHC_DV_STATE_EXIT);
++				/*
++				 * Fall back to basic DV.
++				 */
++				if (bootverbose) {
++					ahc_print_devinfo(ahc, devinfo);
++					printf("Echo Buffer unavailable.  "
++					       "Performing basic DV.\n");
++				}
++				targ->flags &= ~AIC_ENHANCED_DV;
++				targ->flags |= AIC_BASIC_DV;
++				AHC_SET_DV_STATE(ahc, targ, AIC_DV_STATE_TUR);
+ 				break;
+ 			}
+ 
+@@ -2863,11 +2857,11 @@ ahc_linux_dv_transition(struct ahc_softc
+ 		}
+ 		case SS_INQ_REFRESH:
+ 			AHC_SET_DV_STATE(ahc, targ,
+-					 AHC_DV_STATE_INQ_SHORT_ASYNC);
++					 AIC_DV_STATE_INQ_SHORT_ASYNC);
+ 			break;
+ 		case SS_RETRY:
+ 			AHC_SET_DV_STATE(ahc, targ, targ->dv_state);
+-			if (ahc_cmd_get_transaction_status(cmd)
++			if (aic_cmd_get_transaction_status(cmd)
+ 			 == CAM_REQUEUE_REQ)
+ 				targ->dv_state_retry--;
+ 			if (targ->dv_state_retry <= 10)
+@@ -2886,30 +2880,30 @@ ahc_linux_dv_transition(struct ahc_softc
+ 			 * and try level 1 DV.
+ 			 */
+ 			ahc_linux_filter_inquiry(ahc, devinfo);
+-			AHC_SET_DV_STATE(ahc, targ, AHC_DV_STATE_INQ_VERIFY);
++			AHC_SET_DV_STATE(ahc, targ, AIC_DV_STATE_INQ_VERIFY);
+ 			targ->dv_echo_size = 0;
+ 			break;
+ 		}
+ 		break;
+ 
+-	case AHC_DV_STATE_WEB:
++	case AIC_DV_STATE_WEB:
+ 		switch (status & SS_MASK) {
+ 		case SS_NOP:
+-			AHC_SET_DV_STATE(ahc, targ, AHC_DV_STATE_REB);
++			AHC_SET_DV_STATE(ahc, targ, AIC_DV_STATE_REB);
+ 			break;
+ 		case SS_INQ_REFRESH:
+ 			AHC_SET_DV_STATE(ahc, targ,
+-					 AHC_DV_STATE_INQ_SHORT_ASYNC);
++					 AIC_DV_STATE_INQ_SHORT_ASYNC);
+ 			break;
+ 		case SS_RETRY:
+ 			AHC_SET_DV_STATE(ahc, targ, targ->dv_state);
+-			if (ahc_cmd_get_transaction_status(cmd)
++			if (aic_cmd_get_transaction_status(cmd)
+ 			 == CAM_REQUEUE_REQ) {
+ 				targ->dv_state_retry--;
+ 			} else if ((status & SSQ_FALLBACK) != 0) {
+ 				if (ahc_linux_fallback(ahc, devinfo) != 0) {
+ 					AHC_SET_DV_STATE(ahc, targ,
+-							 AHC_DV_STATE_EXIT);
++							 AIC_DV_STATE_EXIT);
+ 					break;
+ 				}
+ 				/*
+@@ -2928,22 +2922,22 @@ ahc_linux_dv_transition(struct ahc_softc
+ 			}
+ #endif
+ 		default:
+-			AHC_SET_DV_STATE(ahc, targ, AHC_DV_STATE_EXIT);
++			AHC_SET_DV_STATE(ahc, targ, AIC_DV_STATE_EXIT);
+ 			break;
+ 		}
+ 		break;
+ 
+-	case AHC_DV_STATE_REB:
++	case AIC_DV_STATE_REB:
+ 		switch (status & SS_MASK) {
+ 		case SS_NOP:
+ 			if (memcmp(targ->dv_buffer, targ->dv_buffer1,
+ 				   targ->dv_echo_size) != 0) {
+ 				if (ahc_linux_fallback(ahc, devinfo) != 0)
+ 					AHC_SET_DV_STATE(ahc, targ,
+-							 AHC_DV_STATE_EXIT);
++							 AIC_DV_STATE_EXIT);
+ 				else
+ 					AHC_SET_DV_STATE(ahc, targ,
+-							 AHC_DV_STATE_WEB);
++							 AIC_DV_STATE_WEB);
+ 				break;
+ 			}
+ 			
+@@ -2955,24 +2949,24 @@ ahc_linux_dv_transition(struct ahc_softc
+ 				free(targ->dv_buffer1, M_DEVBUF);
+ 				targ->dv_buffer1 = NULL;
+ 			}
+-			AHC_SET_DV_STATE(ahc, targ, AHC_DV_STATE_EXIT);
++			AHC_SET_DV_STATE(ahc, targ, AIC_DV_STATE_EXIT);
+ 			break;
+ 		case SS_INQ_REFRESH:
+ 			AHC_SET_DV_STATE(ahc, targ,
+-					 AHC_DV_STATE_INQ_SHORT_ASYNC);
++					 AIC_DV_STATE_INQ_SHORT_ASYNC);
+ 			break;
+ 		case SS_RETRY:
+ 			AHC_SET_DV_STATE(ahc, targ, targ->dv_state);
+-			if (ahc_cmd_get_transaction_status(cmd)
++			if (aic_cmd_get_transaction_status(cmd)
+ 			 == CAM_REQUEUE_REQ) {
+ 				targ->dv_state_retry--;
+ 			} else if ((status & SSQ_FALLBACK) != 0) {
+ 				if (ahc_linux_fallback(ahc, devinfo) != 0) {
+ 					AHC_SET_DV_STATE(ahc, targ,
+-							 AHC_DV_STATE_EXIT);
++							 AIC_DV_STATE_EXIT);
+ 					break;
+ 				}
+-				AHC_SET_DV_STATE(ahc, targ, AHC_DV_STATE_WEB);
++				AHC_SET_DV_STATE(ahc, targ, AIC_DV_STATE_WEB);
+ 			}
+ 			if (targ->dv_state_retry <= 10) {
+ 				if ((status & (SSQ_DELAY_RANDOM|SSQ_DELAY))!= 0)
+@@ -2987,35 +2981,35 @@ ahc_linux_dv_transition(struct ahc_softc
+ #endif
+ 			/* FALLTHROUGH */
+ 		default:
+-			AHC_SET_DV_STATE(ahc, targ, AHC_DV_STATE_EXIT);
++			AHC_SET_DV_STATE(ahc, targ, AIC_DV_STATE_EXIT);
+ 			break;
+ 		}
+ 		break;
+ 
+-	case AHC_DV_STATE_SU:
++	case AIC_DV_STATE_SU:
+ 		switch (status & SS_MASK) {
+ 		case SS_NOP:
+ 		case SS_INQ_REFRESH:
+ 			AHC_SET_DV_STATE(ahc, targ,
+-					 AHC_DV_STATE_INQ_SHORT_ASYNC);
++					 AIC_DV_STATE_INQ_SHORT_ASYNC);
+ 			break;
+ 		default:
+-			AHC_SET_DV_STATE(ahc, targ, AHC_DV_STATE_EXIT);
++			AHC_SET_DV_STATE(ahc, targ, AIC_DV_STATE_EXIT);
+ 			break;
+ 		}
+ 		break;
+ 
+-	case AHC_DV_STATE_BUSY:
++	case AIC_DV_STATE_BUSY:
+ 		switch (status & SS_MASK) {
+ 		case SS_NOP:
+ 		case SS_INQ_REFRESH:
+ 			AHC_SET_DV_STATE(ahc, targ,
+-					 AHC_DV_STATE_INQ_SHORT_ASYNC);
++					 AIC_DV_STATE_INQ_SHORT_ASYNC);
+ 			break;
+ 		case SS_TUR:
+ 		case SS_RETRY:
+ 			AHC_SET_DV_STATE(ahc, targ, targ->dv_state);
+-			if (ahc_cmd_get_transaction_status(cmd)
++			if (aic_cmd_get_transaction_status(cmd)
+ 			 == CAM_REQUEUE_REQ) {
+ 				targ->dv_state_retry--;
+ 			} else if (targ->dv_state_retry < 60) {
+@@ -3028,11 +3022,11 @@ ahc_linux_dv_transition(struct ahc_softc
+ 					printf("DV BUSY reties exhausted\n");
+ 				}
+ #endif
+-				AHC_SET_DV_STATE(ahc, targ, AHC_DV_STATE_EXIT);
++				AHC_SET_DV_STATE(ahc, targ, AIC_DV_STATE_EXIT);
+ 			}
+ 			break;
+ 		default:
+-			AHC_SET_DV_STATE(ahc, targ, AHC_DV_STATE_EXIT);
++			AHC_SET_DV_STATE(ahc, targ, AIC_DV_STATE_EXIT);
+ 			break;
+ 		}
+ 		break;
+@@ -3040,7 +3034,7 @@ ahc_linux_dv_transition(struct ahc_softc
+ 	default:
+ 		printf("%s: Invalid DV completion state %d\n", ahc_name(ahc),
+ 		       targ->dv_state);
+-		AHC_SET_DV_STATE(ahc, targ, AHC_DV_STATE_EXIT);
++		AHC_SET_DV_STATE(ahc, targ, AIC_DV_STATE_EXIT);
+ 		break;
+ 	}
+ }
+@@ -3060,7 +3054,7 @@ ahc_linux_dv_fill_cmd(struct ahc_softc *
+  */
+ static void
+ ahc_linux_dv_inq(struct ahc_softc *ahc, struct scsi_cmnd *cmd,
+-		 struct ahc_devinfo *devinfo, struct ahc_linux_target *targ,
++		 struct ahc_devinfo *devinfo, struct aic_linux_target *targ,
+ 		 u_int request_length)
+ {
+ 
+@@ -3073,7 +3067,7 @@ ahc_linux_dv_inq(struct ahc_softc *ahc, 
+ 	if (targ->inq_data == NULL)
+ 		targ->inq_data = malloc(AHC_LINUX_DV_INQ_LEN,
+ 					M_DEVBUF, M_WAITOK);
+-	if (targ->dv_state > AHC_DV_STATE_INQ_ASYNC) {
++	if (targ->dv_state > AIC_DV_STATE_INQ_ASYNC) {
+ 		if (targ->dv_buffer != NULL)
+ 			free(targ->dv_buffer, M_DEVBUF);
+ 		targ->dv_buffer = malloc(AHC_LINUX_DV_INQ_LEN,
+@@ -3086,7 +3080,7 @@ ahc_linux_dv_inq(struct ahc_softc *ahc, 
+ 	cmd->cmnd[0] = INQUIRY;
+ 	cmd->cmnd[4] = request_length;
+ 	cmd->request_bufflen = request_length;
+-	if (targ->dv_state > AHC_DV_STATE_INQ_ASYNC)
++	if (targ->dv_state > AIC_DV_STATE_INQ_ASYNC)
+ 		cmd->request_buffer = targ->dv_buffer;
+ 	else
+ 		cmd->request_buffer = targ->inq_data;
+@@ -3115,7 +3109,7 @@ ahc_linux_dv_tur(struct ahc_softc *ahc, 
+ 
+ static void
+ ahc_linux_dv_rebd(struct ahc_softc *ahc, struct scsi_cmnd *cmd,
+-		 struct ahc_devinfo *devinfo, struct ahc_linux_target *targ)
++		 struct ahc_devinfo *devinfo, struct aic_linux_target *targ)
+ {
+ 
+ #ifdef AHC_DEBUG
+@@ -3140,7 +3134,7 @@ ahc_linux_dv_rebd(struct ahc_softc *ahc,
+ 
+ static void
+ ahc_linux_dv_web(struct ahc_softc *ahc, struct scsi_cmnd *cmd,
+-		 struct ahc_devinfo *devinfo, struct ahc_linux_target *targ)
++		 struct ahc_devinfo *devinfo, struct aic_linux_target *targ)
+ {
+ 
+ #ifdef AHC_DEBUG
+@@ -3162,7 +3156,7 @@ ahc_linux_dv_web(struct ahc_softc *ahc, 
+ 
+ static void
+ ahc_linux_dv_reb(struct ahc_softc *ahc, struct scsi_cmnd *cmd,
+-		 struct ahc_devinfo *devinfo, struct ahc_linux_target *targ)
++		 struct ahc_devinfo *devinfo, struct aic_linux_target *targ)
+ {
+ 
+ #ifdef AHC_DEBUG
+@@ -3185,7 +3179,7 @@ ahc_linux_dv_reb(struct ahc_softc *ahc, 
+ static void
+ ahc_linux_dv_su(struct ahc_softc *ahc, struct scsi_cmnd *cmd,
+ 		struct ahc_devinfo *devinfo,
+-		struct ahc_linux_target *targ)
++		struct aic_linux_target *targ)
+ {
+ 	u_int le;
+ 
+@@ -3207,7 +3201,7 @@ ahc_linux_dv_su(struct ahc_softc *ahc, s
+ static int
+ ahc_linux_fallback(struct ahc_softc *ahc, struct ahc_devinfo *devinfo)
+ {
+-	struct	ahc_linux_target *targ;
++	struct	aic_linux_target *targ;
+ 	struct	ahc_initiator_tinfo *tinfo;
+ 	struct	ahc_transinfo *goal;
+ 	struct	ahc_tmode_tstate *tstate;
+@@ -3386,7 +3380,7 @@ ahc_linux_fallback(struct ahc_softc *ahc
+ 	return (0);
+ }
+ 
+-static void
++void
+ ahc_linux_dv_timeout(struct scsi_cmnd *cmd)
+ {
+ 	struct	ahc_softc *ahc;
+@@ -3420,29 +3414,19 @@ ahc_linux_dv_timeout(struct scsi_cmnd *c
+ 	 * error code.
+ 	 */
+ 	if ((scb->flags & SCB_SENSE) != 0)
+-		ahc_set_transaction_status(scb, CAM_AUTOSENSE_FAIL);
++		aic_set_transaction_status(scb, CAM_AUTOSENSE_FAIL);
+ 	else
+-		ahc_set_transaction_status(scb, CAM_CMD_TIMEOUT);
++		aic_set_transaction_status(scb, CAM_CMD_TIMEOUT);
+ 	ahc_reset_channel(ahc, cmd->device->channel + 'A', /*initiate*/TRUE);
+ 
+-	/*
+-	 * Add a minimal bus settle delay for devices that are slow to
+-	 * respond after bus resets.
+-	 */
+-	ahc_linux_freeze_simq(ahc);
+-	init_timer(&ahc->platform_data->reset_timer);
+-	ahc->platform_data->reset_timer.data = (u_long)ahc;
+-	ahc->platform_data->reset_timer.expires = jiffies + HZ / 2;
+-	ahc->platform_data->reset_timer.function =
+-	    (ahc_linux_callback_t *)ahc_linux_release_simq;
+-	add_timer(&ahc->platform_data->reset_timer);
+-	if (ahc_linux_next_device_to_run(ahc) != NULL)
+-		ahc_schedule_runq(ahc);
++	if (aic_linux_next_device_to_run(ahc) != NULL)
++		aic_schedule_runq(ahc);
++
+ 	ahc_linux_run_complete_queue(ahc);
+ 	ahc_unlock(ahc, &flags);
+ }
+ 
+-static void
++void
+ ahc_linux_dv_complete(struct scsi_cmnd *cmd)
+ {
+ 	struct ahc_softc *ahc;
+@@ -3464,7 +3448,7 @@ ahc_linux_dv_complete(struct scsi_cmnd *
+ }
+ 
+ static void
+-ahc_linux_generate_dv_pattern(struct ahc_linux_target *targ)
++ahc_linux_generate_dv_pattern(struct aic_linux_target *targ)
+ {
+ 	uint16_t b;
+ 	u_int	 i;
+@@ -3596,8 +3580,8 @@ ahc_linux_user_dv_setting(struct ahc_sof
+  * Determines the queue depth for a given device.
+  */
+ static void
+-ahc_linux_device_queue_depth(struct ahc_softc *ahc,
+-			     struct ahc_linux_device *dev)
++aic_linux_device_queue_depth(struct ahc_softc *ahc,
++			     struct aic_linux_device *dev)
+ {
+ 	struct	ahc_devinfo devinfo;
+ 	u_int	tags;
+@@ -3621,10 +3605,10 @@ ahc_linux_device_queue_depth(struct ahc_
+ 	}
+ }
+ 
+-static void
+-ahc_linux_run_device_queue(struct ahc_softc *ahc, struct ahc_linux_device *dev)
++void
++ahc_linux_run_device_queue(struct ahc_softc *ahc, struct aic_linux_device *dev)
+ {
+-	struct	 ahc_cmd *acmd;
++	struct	 aic_cmd *acmd;
+ 	struct	 scsi_cmnd *cmd;
+ 	struct	 scb *scb;
+ 	struct	 hardware_scb *hscb;
+@@ -3632,7 +3616,7 @@ ahc_linux_run_device_queue(struct ahc_so
+ 	struct	 ahc_tmode_tstate *tstate;
+ 	uint16_t mask;
+ 
+-	if ((dev->flags & AHC_DEV_ON_RUN_LIST) != 0)
++	if ((dev->flags & AIC_DEV_ON_RUN_LIST) != 0)
+ 		panic("running device on run list");
+ 
+ 	while ((acmd = TAILQ_FIRST(&dev->busyq)) != NULL
+@@ -3643,10 +3627,10 @@ ahc_linux_run_device_queue(struct ahc_so
+ 		 * running is because the whole controller Q is frozen.
+ 		 */
+ 		if (ahc->platform_data->qfrozen != 0
+-	 	 && AHC_DV_SIMQ_FROZEN(ahc) == 0) {
++	 	 && AIC_DV_SIMQ_FROZEN(ahc) == 0) {
+ 			TAILQ_INSERT_TAIL(&ahc->platform_data->device_runq,
+ 					  dev, links);
+-			dev->flags |= AHC_DEV_ON_RUN_LIST;
++			dev->flags |= AIC_DEV_ON_RUN_LIST;
+ 			return;
+ 		}
+ 		/*
+@@ -3655,7 +3639,7 @@ ahc_linux_run_device_queue(struct ahc_so
+ 		if ((scb = ahc_get_scb(ahc)) == NULL) {
+ 			TAILQ_INSERT_TAIL(&ahc->platform_data->device_runq,
+ 					 dev, links);
+-			dev->flags |= AHC_DEV_ON_RUN_LIST;
++			dev->flags |= AIC_DEV_ON_RUN_LIST;
+ 			ahc->flags |= AHC_RESOURCE_SHORTAGE;
+ 			return;
+ 		}
+@@ -3663,6 +3647,7 @@ ahc_linux_run_device_queue(struct ahc_so
+ 		cmd = &acmd_scsi_cmd(acmd);
+ 		scb->io_ctx = cmd;
+ 		scb->platform_data->dev = dev;
++		scb->platform_data->flags = 0;
+ 		hscb = scb->hscb;
+ 		cmd->host_scribble = (char *)scb;
+ 
+@@ -3684,7 +3669,7 @@ ahc_linux_run_device_queue(struct ahc_so
+ 		if ((ahc->user_discenable & mask) != 0)
+ 			hscb->control |= DISCENB;
+ 
+-	 	if (AHC_DV_CMD(cmd) != 0)
++	 	if (AIC_DV_CMD(cmd) != 0)
+ 			scb->flags |= SCB_SILENT;
+ 
+ 		if ((tstate->auto_negotiate & mask) != 0) {
+@@ -3692,7 +3677,7 @@ ahc_linux_run_device_queue(struct ahc_so
+ 			scb->hscb->control |= MK_MESSAGE;
+ 		}
+ 
+-		if ((dev->flags & (AHC_DEV_Q_TAGGED|AHC_DEV_Q_BASIC)) != 0) {
++		if ((dev->flags & (AIC_DEV_Q_TAGGED|AIC_DEV_Q_BASIC)) != 0) {
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+ 			int	msg_bytes;
+ 			uint8_t tag_msgs[2];
+@@ -3704,8 +3689,8 @@ ahc_linux_run_device_queue(struct ahc_so
+ 					dev->commands_since_idle_or_otag = 0;
+ 			} else
+ #endif
+-			if (dev->commands_since_idle_or_otag == AHC_OTAG_THRESH
+-			 && (dev->flags & AHC_DEV_Q_TAGGED) != 0) {
++			if (dev->commands_since_idle_or_otag == AIC_OTAG_THRESH
++			 && (dev->flags & AIC_DEV_Q_TAGGED) != 0) {
+ 				hscb->control |= MSG_ORDERED_TASK;
+ 				dev->commands_since_idle_or_otag = 0;
+ 			} else {
+@@ -3722,8 +3707,8 @@ ahc_linux_run_device_queue(struct ahc_so
+ 		}
+ 
+ 		scb->platform_data->xfer_len = 0;
+-		ahc_set_residual(scb, 0);
+-		ahc_set_sense_residual(scb, 0);
++		aic_set_residual(scb, 0);
++		aic_set_sense_residual(scb, 0);
+ 		scb->sg_count = 0;
+ 		if (cmd->use_sg != 0) {
+ 			struct	ahc_dma_seg *sg;
+@@ -3732,7 +3717,7 @@ ahc_linux_run_device_queue(struct ahc_so
+ 			int	nseg;
+ 
+ 			cur_seg = (struct scatterlist *)cmd->request_buffer;
+-			nseg = pci_map_sg(ahc->dev_softc, cur_seg, cmd->use_sg,
++			nseg = aic_map_sg(ahc, cur_seg, cmd->use_sg,
+ 			    scsi_to_pci_dma_dir(cmd->sc_data_direction));
+ 			end_seg = cur_seg + nseg;
+ 			/* Copy the segments into the SG list. */
+@@ -3755,13 +3740,13 @@ ahc_linux_run_device_queue(struct ahc_so
+ 				cur_seg++;
+ 			}
+ 			sg--;
+-			sg->len |= ahc_htole32(AHC_DMA_LAST_SEG);
++			sg->len |= aic_htole32(AHC_DMA_LAST_SEG);
+ 
+ 			/*
+ 			 * Reset the sg list pointer.
+ 			 */
+ 			scb->hscb->sgptr =
+-			    ahc_htole32(scb->sg_list_phys | SG_FULL_RESID);
++			    aic_htole32(scb->sg_list_phys | SG_FULL_RESID);
+ 
+ 			/*
+ 			 * Copy the first SG into the "current"
+@@ -3774,7 +3759,7 @@ ahc_linux_run_device_queue(struct ahc_so
+ 			bus_addr_t addr;
+ 
+ 			sg = scb->sg_list;
+-			addr = pci_map_single(ahc->dev_softc,
++			addr = aic_map_single(ahc,
+ 			       cmd->request_buffer,
+ 			       cmd->request_bufflen,
+ 			       scsi_to_pci_dma_dir(cmd->sc_data_direction));
+@@ -3782,13 +3767,13 @@ ahc_linux_run_device_queue(struct ahc_so
+ 			scb->sg_count = ahc_linux_map_seg(ahc, scb,
+ 							  sg, addr,
+ 							  cmd->request_bufflen);
+-			sg->len |= ahc_htole32(AHC_DMA_LAST_SEG);
++			sg->len |= aic_htole32(AHC_DMA_LAST_SEG);
+ 
+ 			/*
+ 			 * Reset the sg list pointer.
+ 			 */
+ 			scb->hscb->sgptr =
+-			    ahc_htole32(scb->sg_list_phys | SG_FULL_RESID);
++			    aic_htole32(scb->sg_list_phys | SG_FULL_RESID);
+ 
+ 			/*
+ 			 * Copy the first SG into the "current"
+@@ -3797,7 +3782,7 @@ ahc_linux_run_device_queue(struct ahc_so
+ 			scb->hscb->dataptr = sg->addr;
+ 			scb->hscb->datacnt = sg->len;
+ 		} else {
+-			scb->hscb->sgptr = ahc_htole32(SG_LIST_NULL);
++			scb->hscb->sgptr = aic_htole32(SG_LIST_NULL);
+ 			scb->hscb->dataptr = 0;
+ 			scb->hscb->datacnt = 0;
+ 			scb->sg_count = 0;
+@@ -3808,7 +3793,7 @@ ahc_linux_run_device_queue(struct ahc_so
+ 		dev->openings--;
+ 		dev->active++;
+ 		dev->commands_issued++;
+-		if ((dev->flags & AHC_DEV_PERIODIC_OTAG) != 0)
++		if ((dev->flags & AIC_DEV_PERIODIC_OTAG) != 0)
+ 			dev->commands_since_idle_or_otag++;
+ 
+ 		/*
+@@ -3830,6 +3815,7 @@ ahc_linux_run_device_queue(struct ahc_so
+ 				continue;
+ 		}
+ 		scb->flags |= SCB_ACTIVE;
++		aic_scb_timer_start(scb);
+ 		ahc_queue_scb(ahc, scb);
+ 	}
+ }
+@@ -3847,8 +3833,8 @@ ahc_linux_isr(int irq, void *dev_id, str
+ 	ahc = (struct ahc_softc *) dev_id;
+ 	ahc_lock(ahc, &flags); 
+ 	ours = ahc_intr(ahc);
+-	if (ahc_linux_next_device_to_run(ahc) != NULL)
+-		ahc_schedule_runq(ahc);
++	if (aic_linux_next_device_to_run(ahc) != NULL)
++		aic_schedule_runq(ahc);
+ 	ahc_linux_run_complete_queue(ahc);
+ 	ahc_unlock(ahc, &flags);
+ 	return IRQ_RETVAL(ours);
+@@ -3862,10 +3848,10 @@ ahc_platform_flushwork(struct ahc_softc 
+ 		;
+ }
+ 
+-static struct ahc_linux_target*
++static struct aic_linux_target*
+ ahc_linux_alloc_target(struct ahc_softc *ahc, u_int channel, u_int target)
+ {
+-	struct ahc_linux_target *targ;
++	struct aic_linux_target *targ;
+ 	u_int target_offset;
+ 
+ 	target_offset = target;
+@@ -3878,14 +3864,14 @@ ahc_linux_alloc_target(struct ahc_softc 
+ 	memset(targ, 0, sizeof(*targ));
+ 	targ->channel = channel;
+ 	targ->target = target;
+-	targ->ahc = ahc;
+-	targ->flags = AHC_DV_REQUIRED;
++	targ->softc = ahc;
++	targ->flags = AIC_DV_REQUIRED;
+ 	ahc->platform_data->targets[target_offset] = targ;
+ 	return (targ);
+ }
+ 
+ static void
+-ahc_linux_free_target(struct ahc_softc *ahc, struct ahc_linux_target *targ)
++ahc_linux_free_target(struct ahc_softc *ahc, struct aic_linux_target *targ)
+ {
+ 	struct ahc_devinfo devinfo;
+ 	struct ahc_initiator_tinfo *tinfo;
+@@ -3925,11 +3911,11 @@ ahc_linux_free_target(struct ahc_softc *
+ 	free(targ, M_DEVBUF);
+ }
+ 
+-static struct ahc_linux_device*
++static struct aic_linux_device*
+ ahc_linux_alloc_device(struct ahc_softc *ahc,
+-		 struct ahc_linux_target *targ, u_int lun)
++		 struct aic_linux_target *targ, u_int lun)
+ {
+-	struct ahc_linux_device *dev;
++	struct aic_linux_device *dev;
+ 
+ 	dev = malloc(sizeof(*dev), M_DEVBUG, M_NOWAIT);
+ 	if (dev == NULL)
+@@ -3937,7 +3923,7 @@ ahc_linux_alloc_device(struct ahc_softc 
+ 	memset(dev, 0, sizeof(*dev));
+ 	init_timer(&dev->timer);
+ 	TAILQ_INIT(&dev->busyq);
+-	dev->flags = AHC_DEV_UNCONFIGURED;
++	dev->flags = AIC_DEV_UNCONFIGURED;
+ 	dev->lun = lun;
+ 	dev->target = targ;
+ 
+@@ -3960,17 +3946,17 @@ ahc_linux_alloc_device(struct ahc_softc 
+ }
+ 
+ static void
+-ahc_linux_free_device(struct ahc_softc *ahc, struct ahc_linux_device *dev)
++ahc_linux_free_device(struct ahc_softc *ahc, struct aic_linux_device *dev)
+ {
+-	struct ahc_linux_target *targ;
++	struct aic_linux_target *targ;
+ 
+-	del_timer_sync(&dev->timer);
++	del_timer(&dev->timer);
+ 	targ = dev->target;
+ 	targ->devices[dev->lun] = NULL;
+ 	free(dev, M_DEVBUF);
+ 	targ->refcount--;
+ 	if (targ->refcount == 0
+-	 && (targ->flags & AHC_DV_REQUIRED) == 0)
++	 && (targ->flags & AIC_DV_REQUIRED) == 0)
+ 		ahc_linux_free_target(ahc, targ);
+ }
+ 
+@@ -3982,7 +3968,7 @@ ahc_send_async(struct ahc_softc *ahc, ch
+ 	case AC_TRANSFER_NEG:
+ 	{
+ 		char	buf[80];
+-		struct	ahc_linux_target *targ;
++		struct	aic_linux_target *targ;
+ 		struct	info_str info;
+ 		struct	ahc_initiator_tinfo *tinfo;
+ 		struct	ahc_tmode_tstate *tstate;
+@@ -4076,6 +4062,20 @@ ahc_send_async(struct ahc_softc *ahc, ch
+ 					      channel - 'A');
+ 		}
+ #endif
++		/*
++		 * Add a minimal bus settle delay for devices that are slow to
++		 * respond after bus resets.
++		 */
++		if ((ahc->platform_data->flags & AIC_BUS_SETTLE_TIMER) == 0) {
++			aic_freeze_simq(ahc);
++			ahc->platform_data->flags |= AIC_BUS_SETTLE_TIMER;
++			ahc->platform_data->bus_settle_timer.expires =
++			    jiffies + (AIC7XXX_RESET_DELAY * HZ)/1000;
++			add_timer(&ahc->platform_data->bus_settle_timer);
++		} else {
++			mod_timer(&ahc->platform_data->bus_settle_timer,
++				  jiffies + (AIC7XXX_RESET_DELAY * HZ)/1000);
++		}
+                 break;
+         default:
+                 panic("ahc_send_async: Unexpected async event");
+@@ -4089,9 +4089,11 @@ void
+ ahc_done(struct ahc_softc *ahc, struct scb *scb)
+ {
+ 	Scsi_Cmnd *cmd;
+-	struct	   ahc_linux_device *dev;
++	struct	   aic_linux_device *dev;
+ 
+ 	LIST_REMOVE(scb, pending_links);
++	if ((scb->flags & SCB_TIMEDOUT) != 0)
++		LIST_REMOVE(scb, timedout_links);
+ 	if ((scb->flags & SCB_UNTAGGEDQ) != 0) {
+ 		struct scb_tailq *untagged_q;
+ 		int target_offset;
+@@ -4124,11 +4126,11 @@ ahc_done(struct ahc_softc *ahc, struct s
+ 	 * the sense buffer looks "sane".
+ 	 */
+ 	cmd->sense_buffer[0] = 0;
+-	if (ahc_get_transaction_status(scb) == CAM_REQ_INPROG) {
++	if (aic_get_transaction_status(scb) == CAM_REQ_INPROG) {
+ 		uint32_t amount_xferred;
+ 
+ 		amount_xferred =
+-		    ahc_get_transfer_length(scb) - ahc_get_residual(scb);
++		    aic_get_transfer_length(scb) - aic_get_residual(scb);
+ 		if ((scb->flags & SCB_TRANSMISSION_ERROR) != 0) {
+ #ifdef AHC_DEBUG
+ 			if ((ahc_debug & AHC_SHOW_MISC) != 0) {
+@@ -4136,7 +4138,17 @@ ahc_done(struct ahc_softc *ahc, struct s
+ 				printf("Set CAM_UNCOR_PARITY\n");
+ 			}
+ #endif
+-			ahc_set_transaction_status(scb, CAM_UNCOR_PARITY);
++			aic_set_transaction_status(scb, CAM_UNCOR_PARITY);
++#ifdef AHC_REPORT_UNDERFLOWS
++		/*
++		 * This code is disabled by default as some
++		 * clients of the SCSI system do not properly
++		 * initialize the underflow parameter.  This
++		 * results in spurious termination of commands
++		 * that complete as expected (e.g. underflow is
++		 * allowed as command can return variable amounts
++		 * of data.
++		 */
+ 		} else if (amount_xferred < scb->io_ctx->underflow) {
+ 			u_int i;
+ 
+@@ -4148,30 +4160,31 @@ ahc_done(struct ahc_softc *ahc, struct s
+ 			ahc_print_path(ahc, scb);
+ 			printf("Saw underflow (%ld of %ld bytes). "
+ 			       "Treated as error\n",
+-				ahc_get_residual(scb),
+-				ahc_get_transfer_length(scb));
+-			ahc_set_transaction_status(scb, CAM_DATA_RUN_ERR);
++				aic_get_residual(scb),
++				aic_get_transfer_length(scb));
++			aic_set_transaction_status(scb, CAM_DATA_RUN_ERR);
++#endif
+ 		} else {
+-			ahc_set_transaction_status(scb, CAM_REQ_CMP);
++			aic_set_transaction_status(scb, CAM_REQ_CMP);
+ 		}
+-	} else if (ahc_get_transaction_status(scb) == CAM_SCSI_STATUS_ERROR) {
++	} else if (aic_get_transaction_status(scb) == CAM_SCSI_STATUS_ERROR) {
+ 		ahc_linux_handle_scsi_status(ahc, dev, scb);
+-	} else if (ahc_get_transaction_status(scb) == CAM_SEL_TIMEOUT) {
+-		dev->flags |= AHC_DEV_UNCONFIGURED;
+-		if (AHC_DV_CMD(cmd) == FALSE)
+-			dev->target->flags &= ~AHC_DV_REQUIRED;
++	} else if (aic_get_transaction_status(scb) == CAM_SEL_TIMEOUT) {
++		dev->flags |= AIC_DEV_UNCONFIGURED;
++		if (AIC_DV_CMD(cmd) == FALSE)
++			dev->target->flags &= ~AIC_DV_REQUIRED;
+ 	}
+ 	/*
+ 	 * Start DV for devices that require it assuming the first command
+ 	 * sent does not result in a selection timeout.
+ 	 */
+-	if (ahc_get_transaction_status(scb) != CAM_SEL_TIMEOUT
+-	 && (dev->target->flags & AHC_DV_REQUIRED) != 0)
++	if (aic_get_transaction_status(scb) != CAM_SEL_TIMEOUT
++	 && (dev->target->flags & AIC_DV_REQUIRED) != 0)
+ 		ahc_linux_start_dv(ahc);
+ 
+ 	if (dev->openings == 1
+-	 && ahc_get_transaction_status(scb) == CAM_REQ_CMP
+-	 && ahc_get_scsi_status(scb) != SCSI_STATUS_QUEUE_FULL)
++	 && aic_get_transaction_status(scb) == CAM_REQ_CMP
++	 && aic_get_scsi_status(scb) != SCSI_STATUS_QUEUE_FULL)
+ 		dev->tag_success_count++;
+ 	/*
+ 	 * Some devices deal with temporary internal resource
+@@ -4180,7 +4193,7 @@ ahc_done(struct ahc_softc *ahc, struct s
+ 	 * back to our previous queue depth.
+ 	 */
+ 	if ((dev->openings + dev->active) < dev->maxtags
+-	 && dev->tag_success_count > AHC_TAG_SUCCESS_INTERVAL) {
++	 && dev->tag_success_count > AIC_TAG_SUCCESS_INTERVAL) {
+ 		dev->tag_success_count = 0;
+ 		dev->openings++;
+ 	}
+@@ -4189,32 +4202,61 @@ ahc_done(struct ahc_softc *ahc, struct s
+ 		dev->commands_since_idle_or_otag = 0;
+ 
+ 	if (TAILQ_EMPTY(&dev->busyq)) {
+-		if ((dev->flags & AHC_DEV_UNCONFIGURED) != 0
+-		 && dev->active == 0
+-	 	 && (dev->flags & AHC_DEV_TIMER_ACTIVE) == 0)
++		if ((dev->flags & AIC_DEV_UNCONFIGURED) != 0
++		 && dev->active == 0)
+ 			ahc_linux_free_device(ahc, dev);
+-	} else if ((dev->flags & AHC_DEV_ON_RUN_LIST) == 0) {
++	} else if ((dev->flags & AIC_DEV_ON_RUN_LIST) == 0) {
+ 		TAILQ_INSERT_TAIL(&ahc->platform_data->device_runq, dev, links);
+-		dev->flags |= AHC_DEV_ON_RUN_LIST;
++		dev->flags |= AIC_DEV_ON_RUN_LIST;
+ 	}
+ 
+ 	if ((scb->flags & SCB_RECOVERY_SCB) != 0) {
+ 		printf("Recovery SCB completes\n");
+-		if (ahc_get_transaction_status(scb) == CAM_BDR_SENT
+-		 || ahc_get_transaction_status(scb) == CAM_REQ_ABORTED)
+-			ahc_set_transaction_status(scb, CAM_CMD_TIMEOUT);
+-		if ((ahc->platform_data->flags & AHC_UP_EH_SEMAPHORE) != 0) {
+-			ahc->platform_data->flags &= ~AHC_UP_EH_SEMAPHORE;
++		if (aic_get_transaction_status(scb) == CAM_BDR_SENT
++		 || aic_get_transaction_status(scb) == CAM_REQ_ABORTED)
++			aic_set_transaction_status(scb, CAM_CMD_TIMEOUT);
++		if ((scb->platform_data->flags & AIC_SCB_UP_EH_SEM) != 0) {
++			scb->platform_data->flags &= ~AIC_SCB_UP_EH_SEM;
+ 			up(&ahc->platform_data->eh_sem);
++		} else {
++			struct  scb *list_scb;
++
++			/*
++			 * We were able to complete the command successfully,
++			 * so reinstate the timeouts for all other pending
++			 * commands.
++			 */
++			LIST_FOREACH(list_scb,
++				     &ahc->pending_scbs, pending_links) {
++
++				aic_scb_timer_start(list_scb);
++                	}
+ 		}
+ 	}
+ 
++	if ((scb->platform_data->flags & AIC_TIMEOUT_ACTIVE) == 0) {
++		/*
++		 * The completion handler believes that
++		 * commands without active timers running
++		 * have lost the race of completing before
++		 * their timer expires.  Since commands in
++		 * our busy queues do not have timers running,
++		 * appease the mid-layer by adding a timer
++		 * now.  This timer will be immediately
++		 * canceled by the midlayer.
++		 */
++		scsi_add_timer(cmd, 60*HZ, aic_linux_midlayer_timeout);
++	}
++
++	if ((scb->platform_data->flags & AIC_RELEASE_SIMQ) != 0)
++		aic_release_simq_locked(ahc);
++
+ 	ahc_free_scb(ahc, scb);
+ 	ahc_linux_queue_cmd_complete(ahc, cmd);
+ 
+-	if ((ahc->platform_data->flags & AHC_DV_WAIT_SIMQ_EMPTY) != 0
++	if ((ahc->platform_data->flags & AIC_DV_WAIT_SIMQ_EMPTY) != 0
+ 	 && LIST_FIRST(&ahc->pending_scbs) == NULL) {
+-		ahc->platform_data->flags &= ~AHC_DV_WAIT_SIMQ_EMPTY;
++		ahc->platform_data->flags &= ~AIC_DV_WAIT_SIMQ_EMPTY;
+ 		up(&ahc->platform_data->dv_sem);
+ 	}
+ 		
+@@ -4222,7 +4264,7 @@ ahc_done(struct ahc_softc *ahc, struct s
+ 
+ static void
+ ahc_linux_handle_scsi_status(struct ahc_softc *ahc,
+-			     struct ahc_linux_device *dev, struct scb *scb)
++			     struct aic_linux_device *dev, struct scb *scb)
+ {
+ 	struct	ahc_devinfo devinfo;
+ 
+@@ -4242,7 +4284,7 @@ ahc_linux_handle_scsi_status(struct ahc_
+ 	 * we don't clobber the device with too many
+ 	 * commands.
+ 	 */
+-	switch (ahc_get_scsi_status(scb)) {
++	switch (aic_get_scsi_status(scb)) {
+ 	default:
+ 		break;
+ 	case SCSI_STATUS_CHECK_COND:
+@@ -4256,13 +4298,15 @@ ahc_linux_handle_scsi_status(struct ahc_
+ 		 */
+ 		cmd = scb->io_ctx;
+ 		if (scb->flags & SCB_SENSE) {
+-			u_int sense_size;
++			struct	scsi_sense_data *sense;
++			u_int	sense_size;
++			int	error_code, sense_key, asc, ascq;
+ 
++			sense = ahc_get_sense_buf(ahc, scb);
+ 			sense_size = MIN(sizeof(struct scsi_sense_data)
+-				       - ahc_get_sense_residual(scb),
++				       - aic_get_sense_residual(scb),
+ 					 sizeof(cmd->sense_buffer));
+-			memcpy(cmd->sense_buffer,
+-			       ahc_get_sense_buf(ahc, scb), sense_size);
++			memcpy(cmd->sense_buffer, sense, sense_size);
+ 			if (sense_size < sizeof(cmd->sense_buffer))
+ 				memset(&cmd->sense_buffer[sense_size], 0,
+ 				       sizeof(cmd->sense_buffer) - sense_size);
+@@ -4281,6 +4325,23 @@ ahc_linux_handle_scsi_status(struct ahc_
+ 				printf("\n");
+ 			}
+ #endif
++			/*
++			 * If this is not a DV command and the target
++			 * provides some status that makes us believe
++			 * that the target has changed (power on reset,
++			 * etc.) kick off a DV scan to re-validate the
++			 * device.
++			 */
++	 		if (AIC_DV_CMD(cmd) != 0)
++				break;
++
++			scsi_extract_sense(sense, &error_code,
++					   &sense_key, &asc, &ascq);
++			if (error_code == SSD_CURRENT_ERROR
++			 && sense_key == SSD_KEY_UNIT_ATTENTION
++			 && asc == 0x29
++			 && (ascq == 0 || ascq == 1))
++				dev->target->flags |= AIC_DV_REQUIRED;
+ 		}
+ 		break;
+ 	}
+@@ -4317,7 +4378,7 @@ ahc_linux_handle_scsi_status(struct ahc_
+ 				 * this device.
+ 				 */
+ 				if (dev->last_queuefull_same_count
+-				 == AHC_LOCK_TAGS_COUNT) {
++				 == AIC_LOCK_TAGS_COUNT) {
+ 					dev->maxtags = dev->active;
+ 					ahc_print_path(ahc, scb);
+ 					printf("Locking max tag count at %d\n",
+@@ -4327,10 +4388,10 @@ ahc_linux_handle_scsi_status(struct ahc_
+ 				dev->tags_on_last_queuefull = dev->active;
+ 				dev->last_queuefull_same_count = 0;
+ 			}
+-			ahc_set_transaction_status(scb, CAM_REQUEUE_REQ);
+-			ahc_set_scsi_status(scb, SCSI_STATUS_OK);
++			aic_set_transaction_status(scb, CAM_REQUEUE_REQ);
++			aic_set_scsi_status(scb, SCSI_STATUS_OK);
+ 			ahc_platform_set_tags(ahc, &devinfo,
+-				     (dev->flags & AHC_DEV_Q_BASIC)
++				     (dev->flags & AIC_DEV_Q_BASIC)
+ 				   ? AHC_QUEUE_BASIC : AHC_QUEUE_TAGGED);
+ 			break;
+ 		}
+@@ -4339,9 +4400,9 @@ ahc_linux_handle_scsi_status(struct ahc_
+ 		 * as if the target returned BUSY SCSI status.
+ 		 */
+ 		dev->openings = 1;
+-		ahc_set_scsi_status(scb, SCSI_STATUS_BUSY);
++		aic_set_scsi_status(scb, SCSI_STATUS_BUSY);
+ 		ahc_platform_set_tags(ahc, &devinfo,
+-			     (dev->flags & AHC_DEV_Q_BASIC)
++			     (dev->flags & AIC_DEV_Q_BASIC)
+ 			   ? AHC_QUEUE_BASIC : AHC_QUEUE_TAGGED);
+ 		/* FALLTHROUGH */
+ 	}
+@@ -4351,13 +4412,13 @@ ahc_linux_handle_scsi_status(struct ahc_
+ 		 * Set a short timer to defer sending commands for
+ 		 * a bit since Linux will not delay in this case.
+ 		 */
+-		if ((dev->flags & AHC_DEV_TIMER_ACTIVE) != 0) {
++		if ((dev->flags & AIC_DEV_TIMER_ACTIVE) != 0) {
+ 			printf("%s:%c:%d: Device Timer still active during "
+ 			       "busy processing\n", ahc_name(ahc),
+ 				dev->target->channel, dev->target->target);
+ 			break;
+ 		}
+-		dev->flags |= AHC_DEV_TIMER_ACTIVE;
++		dev->flags |= AIC_DEV_TIMER_ACTIVE;
+ 		dev->qfrozen++;
+ 		init_timer(&dev->timer);
+ 		dev->timer.data = (u_long)dev;
+@@ -4384,9 +4445,9 @@ ahc_linux_queue_cmd_complete(struct ahc_
+ 	 * not guarantee the order that aborted commands will be
+ 	 * returned to us.
+ 	 */
+-	struct ahc_completeq *completeq;
+-	struct ahc_cmd *list_cmd;
+-	struct ahc_cmd *acmd;
++	struct aic_completeq *completeq;
++	struct aic_cmd *list_cmd;
++	struct aic_cmd *acmd;
+ 
+ 	/*
+ 	 * Map CAM error codes into Linux Error codes.  We
+@@ -4394,10 +4455,10 @@ ahc_linux_queue_cmd_complete(struct ahc_
+ 	 * full error information available when making
+ 	 * state change decisions.
+ 	 */
+-	if (AHC_DV_CMD(cmd) == FALSE) {
++	if (AIC_DV_CMD(cmd) == FALSE) {
+ 		u_int new_status;
+ 
+-		switch (ahc_cmd_get_transaction_status(cmd)) {
++		switch (aic_cmd_get_transaction_status(cmd)) {
+ 		case CAM_REQ_INPROG:
+ 		case CAM_REQ_CMP:
+ 		case CAM_SCSI_STATUS_ERROR:
+@@ -4424,7 +4485,17 @@ ahc_linux_queue_cmd_complete(struct ahc_
+ 			new_status = DID_PARITY;
+ 			break;
+ 		case CAM_CMD_TIMEOUT:
+-			new_status = DID_TIME_OUT;
++			/*
++			 *  Returning DID_TIME_OUT will 
++			 *  wake up the error recovery
++			 *  thread instead of doing the
++			 *  command retry we desire. Since
++			 *  we have already recovered the
++			 *  command, returning DID_ERROR
++			 *  will cause a retry up to the
++			 *  retry limit for this command.
++			 */
++			new_status = DID_ERROR;
+ 			break;
+ 		case CAM_UA_ABORT:
+ 		case CAM_REQ_CMP_ERR:
+@@ -4454,7 +4525,7 @@ ahc_linux_queue_cmd_complete(struct ahc_
+ 			if (cmd->retries > 0)
+ 				cmd->retries--;
+ 			new_status = DID_OK;
+-			ahc_cmd_set_scsi_status(cmd, SCSI_STATUS_CHECK_COND);
++			aic_cmd_set_scsi_status(cmd, SCSI_STATUS_CHECK_COND);
+ 			cmd->result |= (DRIVER_SENSE << 24);
+ 			memset(cmd->sense_buffer, 0,
+ 			       sizeof(cmd->sense_buffer));
+@@ -4468,12 +4539,12 @@ ahc_linux_queue_cmd_complete(struct ahc_
+ 			break;
+ 		}
+ 
+-		ahc_cmd_set_transaction_status(cmd, new_status);
++		aic_cmd_set_transaction_status(cmd, new_status);
+ 	}
+ 
+ 	completeq = &ahc->platform_data->completeq;
+ 	list_cmd = TAILQ_FIRST(completeq);
+-	acmd = (struct ahc_cmd *)cmd;
++	acmd = (struct aic_cmd *)cmd;
+ 	while (list_cmd != NULL
+ 	    && acmd_scsi_cmd(list_cmd).serial_number
+ 	     < acmd_scsi_cmd(acmd).serial_number)
+@@ -4494,7 +4565,7 @@ ahc_linux_filter_inquiry(struct ahc_soft
+ 	struct	ahc_transinfo *curr;
+ 	struct	ahc_tmode_tstate *tstate;
+ 	struct	ahc_syncrate *syncrate;
+-	struct	ahc_linux_device *dev;
++	struct	aic_linux_device *dev;
+ 	u_int	maxsync;
+ 	u_int	width;
+ 	u_int	period;
+@@ -4517,9 +4588,9 @@ ahc_linux_filter_inquiry(struct ahc_soft
+ 	sid = (struct scsi_inquiry_data *)dev->target->inq_data;
+ 	if (SID_QUAL(sid) == SID_QUAL_LU_CONNECTED) {
+ 
+-		dev->flags &= ~AHC_DEV_UNCONFIGURED;
++		dev->flags &= ~AIC_DEV_UNCONFIGURED;
+ 	} else {
+-		dev->flags |= AHC_DEV_UNCONFIGURED;
++		dev->flags |= AIC_DEV_UNCONFIGURED;
+ 		return;
+ 	}
+ 
+@@ -4596,82 +4667,38 @@ ahc_linux_filter_inquiry(struct ahc_soft
+ static void
+ ahc_linux_sem_timeout(u_long arg)
+ {
++	struct	scb *scb;
+ 	struct	ahc_softc *ahc;
+ 	u_long	s;
+ 
+-	ahc = (struct ahc_softc *)arg;
+-
++	scb = (struct scb *)arg;
++	ahc = scb->ahc_softc;
+ 	ahc_lock(ahc, &s);
+-	if ((ahc->platform_data->flags & AHC_UP_EH_SEMAPHORE) != 0) {
+-		ahc->platform_data->flags &= ~AHC_UP_EH_SEMAPHORE;
++	if ((scb->platform_data->flags & AIC_SCB_UP_EH_SEM) != 0) {
++		scb->platform_data->flags &= ~AIC_SCB_UP_EH_SEM;
+ 		up(&ahc->platform_data->eh_sem);
+ 	}
+ 	ahc_unlock(ahc, &s);
+ }
+ 
+ static void
+-ahc_linux_freeze_simq(struct ahc_softc *ahc)
+-{
+-	ahc->platform_data->qfrozen++;
+-	if (ahc->platform_data->qfrozen == 1) {
+-		scsi_block_requests(ahc->platform_data->host);
+-
+-		/* XXX What about Twin channels? */
+-		ahc_platform_abort_scbs(ahc, CAM_TARGET_WILDCARD, ALL_CHANNELS,
+-					CAM_LUN_WILDCARD, SCB_LIST_NULL,
+-					ROLE_INITIATOR, CAM_REQUEUE_REQ);
+-	}
+-}
+-
+-static void
+-ahc_linux_release_simq(u_long arg)
+-{
+-	struct ahc_softc *ahc;
+-	u_long s;
+-	int    unblock_reqs;
+-
+-	ahc = (struct ahc_softc *)arg;
+-
+-	unblock_reqs = 0;
+-	ahc_lock(ahc, &s);
+-	if (ahc->platform_data->qfrozen > 0)
+-		ahc->platform_data->qfrozen--;
+-	if (ahc->platform_data->qfrozen == 0)
+-		unblock_reqs = 1;
+-	if (AHC_DV_SIMQ_FROZEN(ahc)
+-	 && ((ahc->platform_data->flags & AHC_DV_WAIT_SIMQ_RELEASE) != 0)) {
+-		ahc->platform_data->flags &= ~AHC_DV_WAIT_SIMQ_RELEASE;
+-		up(&ahc->platform_data->dv_sem);
+-	}
+-	ahc_schedule_runq(ahc);
+-	ahc_unlock(ahc, &s);
+-	/*
+-	 * There is still a race here.  The mid-layer
+-	 * should keep its own freeze count and use
+-	 * a bottom half handler to run the queues
+-	 * so we can unblock with our own lock held.
+-	 */
+-	if (unblock_reqs)
+-		scsi_unblock_requests(ahc->platform_data->host);
+-}
+-
+-static void
+ ahc_linux_dev_timed_unfreeze(u_long arg)
+ {
+-	struct ahc_linux_device *dev;
++	struct aic_linux_device *dev;
+ 	struct ahc_softc *ahc;
+ 	u_long s;
+ 
+-	dev = (struct ahc_linux_device *)arg;
+-	ahc = dev->target->ahc;
++	dev = (struct aic_linux_device *)arg;
++	ahc = dev->target->softc;
+ 	ahc_lock(ahc, &s);
+-	dev->flags &= ~AHC_DEV_TIMER_ACTIVE;
++	dev->flags &= ~AIC_DEV_TIMER_ACTIVE;
+ 	if (dev->qfrozen > 0)
+ 		dev->qfrozen--;
+ 	if (dev->qfrozen == 0
+-	 && (dev->flags & AHC_DEV_ON_RUN_LIST) == 0)
++	 && (dev->flags & AIC_DEV_ON_RUN_LIST) == 0)
+ 		ahc_linux_run_device_queue(ahc, dev);
+-	if (TAILQ_EMPTY(&dev->busyq)
++	if ((dev->flags & AIC_DEV_UNCONFIGURED) != 0
++	 && TAILQ_EMPTY(&dev->busyq)
+ 	 && dev->active == 0)
+ 		ahc_linux_free_device(ahc, dev);
+ 	ahc_unlock(ahc, &s);
+@@ -4681,9 +4708,9 @@ static int
+ ahc_linux_queue_recovery_cmd(Scsi_Cmnd *cmd, scb_flag flag)
+ {
+ 	struct ahc_softc *ahc;
+-	struct ahc_cmd *acmd;
+-	struct ahc_cmd *list_acmd;
+-	struct ahc_linux_device *dev;
++	struct aic_cmd *acmd;
++	struct aic_cmd *list_acmd;
++	struct aic_linux_device *dev;
+ 	struct scb *pending_scb;
+ 	u_long s;
+ 	u_int  saved_scbptr;
+@@ -4701,7 +4728,7 @@ ahc_linux_queue_recovery_cmd(Scsi_Cmnd *
+ 	paused = FALSE;
+ 	wait = FALSE;
+ 	ahc = *(struct ahc_softc **)cmd->device->host->hostdata;
+-	acmd = (struct ahc_cmd *)cmd;
++	acmd = (struct aic_cmd *)cmd;
+ 
+ 	printf("%s:%d:%d:%d: Attempting to queue a%s message\n",
+ 	       ahc_name(ahc), cmd->device->channel,
+@@ -4763,13 +4790,24 @@ ahc_linux_queue_recovery_cmd(Scsi_Cmnd *
+ 		if (flag == SCB_ABORT) {
+ 			TAILQ_REMOVE(&dev->busyq, list_acmd, acmd_links.tqe);
+ 			cmd->result = DID_ABORT << 16;
++			/*
++			 * The completion handler believes that
++			 * commands without active timers running
++			 * have lost the race of completing before
++			 * their timer expires.  Since commands in our
++			 * busy queues do not have timers running,
++			 * appease the mid-layer by adding a timer
++			 * now.  This timer will be immediately
++			 * canceled by the midlayer.
++			 */
++			scsi_add_timer(cmd, 60*HZ, aic_linux_midlayer_timeout);
+ 			ahc_linux_queue_cmd_complete(ahc, cmd);
+ 			retval = SUCCESS;
+ 			goto done;
+ 		}
+ 	}
+ 
+-	if ((dev->flags & (AHC_DEV_Q_BASIC|AHC_DEV_Q_TAGGED)) == 0
++	if ((dev->flags & (AIC_DEV_Q_BASIC|AIC_DEV_Q_TAGGED)) == 0
+ 	 && ahc_search_untagged_queues(ahc, cmd, cmd->device->id,
+ 				       cmd->device->channel + 'A',
+ 				       cmd->device->lun,
+@@ -4985,10 +5023,10 @@ done:
+ 		struct timer_list timer;
+ 		int ret;
+ 
+-		ahc->platform_data->flags |= AHC_UP_EH_SEMAPHORE;
++		pending_scb->platform_data->flags |= AIC_SCB_UP_EH_SEM;
+ 		spin_unlock_irq(&ahc->platform_data->spin_lock);
+ 		init_timer(&timer);
+-		timer.data = (u_long)ahc;
++		timer.data = (u_long)pending_scb;
+ 		timer.expires = jiffies + (5 * HZ);
+ 		timer.function = ahc_linux_sem_timeout;
+ 		add_timer(&timer);
+@@ -5002,7 +5040,7 @@ done:
+ 		}
+ 		spin_lock_irq(&ahc->platform_data->spin_lock);
+ 	}
+-	ahc_schedule_runq(ahc);
++	aic_schedule_runq(ahc);
+ 	ahc_linux_run_complete_queue(ahc);
+ 	ahc_midlayer_entrypoint_unlock(ahc, &s);
+ 	return (retval);
+@@ -5011,7 +5049,8 @@ done:
+ void
+ ahc_platform_dump_card_state(struct ahc_softc *ahc)
+ {
+-	struct ahc_linux_device *dev;
++	struct Scsi_Host *host;
++	struct aic_linux_device *dev;
+ 	int channel;
+ 	int maxchannel;
+ 	int target;
+@@ -5019,6 +5058,14 @@ ahc_platform_dump_card_state(struct ahc_
+ 	int lun;
+ 	int i;
+ 
++	host = ahc->platform_data->host;
++	printf("%s: Host Status: Failed(%d) %s%s%s\n",
++	       ahc_name(ahc),
++	       host->host_failed,
++	       host->eh_active ? "eh_active " : "",
++	       host->host_blocked ? "host_blocked " : "",
++	       host->host_self_blocked ? "host_self_blocked " : "");
++	       
+ 	maxchannel = (ahc->features & AHC_TWIN) ? 1 : 0;
+ 	maxtarget = (ahc->features & AHC_WIDE) ? 15 : 7;
+ 	for (channel = 0; channel <= maxchannel; channel++) {
+@@ -5026,7 +5073,7 @@ ahc_platform_dump_card_state(struct ahc_
+ 		for (target = 0; target <=maxtarget; target++) {
+ 
+ 			for (lun = 0; lun < AHC_NUM_LUNS; lun++) {
+-				struct ahc_cmd *acmd;
++				struct aic_cmd *acmd;
+ 
+ 				dev = ahc_linux_get_device(ahc, channel, target,
+ 							   lun, /*alloc*/FALSE);
+@@ -5068,41 +5115,33 @@ static void __exit
+ ahc_linux_exit(void)
+ {
+ 	struct ahc_softc *ahc;
+-	u_long l;
+ 
+ 	/*
+-	 * Shutdown DV threads before going into the SCSI mid-layer.
++	 * Shutdown our threads before going into the SCSI mid-layer.
+ 	 * This avoids situations where the mid-layer locks the entire
+ 	 * kernel so that waiting for our DV threads to exit leads
+ 	 * to deadlock.
+ 	 */
+-	ahc_list_lock(&l);
+ 	TAILQ_FOREACH(ahc, &ahc_tailq, links) {
+ 
+ 		ahc_linux_kill_dv_thread(ahc);
++		ahc_terminate_recovery_thread(ahc);
+ 	}
+-	ahc_list_unlock(&l);
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+-
+-	ahc_linux_pci_exit();
+-
+-	/*
+-	 * Get rid of the non-pci devices.  
+-	 *
+-	 * XXX(hch): switch over eisa support to new LDM-based API
+-	 */
+-	TAILQ_FOREACH(ahc, &ahc_tailq, links)
+-		ahc_linux_release(ahc->platform_data->host);
+-#else
+-	scsi_unregister_module(MODULE_SCSI_HA, &aic7xxx_driver_template);
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ 	/*
+ 	 * In 2.4 we have to unregister from the PCI core _after_
+ 	 * unregistering from the scsi midlayer to avoid dangling
+ 	 * references.
+ 	 */
++	scsi_unregister_module(MODULE_SCSI_HA, &aic7xxx_driver_template);
++#endif
++#ifdef CONFIG_PCI
+ 	ahc_linux_pci_exit();
+ #endif
++#ifdef CONFIG_EISA
++	ahc_linux_eisa_exit();
++#endif
+ }
+ 
+ module_init(ahc_linux_init);
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic7xxx_osm.h	2003-07-27 12:14:39.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aic7xxx_osm.h	2003-12-28 23:21:40.000000000 -0800
+@@ -53,50 +53,22 @@
+  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  * POSSIBILITY OF SUCH DAMAGES.
+  *
+- * $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_
+ #define _AIC7XXX_LINUX_H_
+ 
+-#include <linux/types.h>
+-#include <linux/blkdev.h>
+-#include <linux/delay.h>
+-#include <linux/ioport.h>
+-#include <linux/pci.h>
+-#include <linux/smp_lock.h>
+ #include <linux/version.h>
+-#include <linux/module.h>
+-#include <asm/byteorder.h>
+-#include <asm/io.h>
+ 
+ #ifndef KERNEL_VERSION
+ #define KERNEL_VERSION(x,y,z) (((x)<<16)+((y)<<8)+(z))
+ #endif
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+-#include <linux/interrupt.h> /* For tasklet support. */
+ #include <linux/config.h>
+-#include <linux/slab.h>
+-#else
+-#include <linux/malloc.h>
+ #endif
+ 
+-/* Core SCSI definitions */
+-#define AIC_LIB_PREFIX ahc
+-#include "scsi.h"
+-#include "hosts.h"
+-
+-/* Name space conflict with BSD queue macros */
+-#ifdef LIST_HEAD
+-#undef LIST_HEAD
+-#endif
+-
+-#include "cam.h"
+-#include "queue.h"
+-#include "scsi_message.h"
+-#include "aiclib.h"
+-
+ /*********************************** Debugging ********************************/
+ #ifdef CONFIG_AIC7XXX_DEBUG_ENABLE
+ #ifdef CONFIG_AIC7XXX_DEBUG_MASK
+@@ -111,42 +83,18 @@
+ /* No debugging code. */
+ #endif
+ 
+-/************************* Forward Declarations *******************************/
+-struct ahc_softc;
+-typedef struct pci_dev *ahc_dev_softc_t;
+-typedef Scsi_Cmnd      *ahc_io_ctx_t;
+-
+-/******************************* Byte Order ***********************************/
+-#define ahc_htobe16(x)	cpu_to_be16(x)
+-#define ahc_htobe32(x)	cpu_to_be32(x)
+-#define ahc_htobe64(x)	cpu_to_be64(x)
+-#define ahc_htole16(x)	cpu_to_le16(x)
+-#define ahc_htole32(x)	cpu_to_le32(x)
+-#define ahc_htole64(x)	cpu_to_le64(x)
+-
+-#define ahc_be16toh(x)	be16_to_cpu(x)
+-#define ahc_be32toh(x)	be32_to_cpu(x)
+-#define ahc_be64toh(x)	be64_to_cpu(x)
+-#define ahc_le16toh(x)	le16_to_cpu(x)
+-#define ahc_le32toh(x)	le32_to_cpu(x)
+-#define ahc_le64toh(x)	le64_to_cpu(x)
+-
+-#ifndef LITTLE_ENDIAN
+-#define LITTLE_ENDIAN 1234
+-#endif
+-
+-#ifndef BIG_ENDIAN
+-#define BIG_ENDIAN 4321
+-#endif
++/********************************** Includes **********************************/
++/* Core SCSI definitions */
++#define AIC_LIB_PREFIX ahc
++#define AIC_CONST_PREFIX AHC
+ 
+-#ifndef BYTE_ORDER
+-#if defined(__BIG_ENDIAN)
+-#define BYTE_ORDER BIG_ENDIAN
+-#endif
+-#if defined(__LITTLE_ENDIAN)
+-#define BYTE_ORDER LITTLE_ENDIAN
++#ifdef CONFIG_AIC7XXX_REG_PRETTY_PRINT
++#define AIC_DEBUG_REGISTERS 1
++#else
++#define AIC_DEBUG_REGISTERS 0
+ #endif
+-#endif /* BYTE_ORDER */
++#define	AIC_CORE_INCLUDE "aic7xxx.h"
++#include "aiclib.h"
+ 
+ /************************* Configuration Data *********************************/
+ extern u_int aic7xxx_no_probe;
+@@ -154,142 +102,9 @@ extern u_int aic7xxx_allow_memio;
+ extern int aic7xxx_detect_complete;
+ extern Scsi_Host_Template aic7xxx_driver_template;
+ 
+-/***************************** Bus Space/DMA **********************************/
+-
+-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,2,17)
+-typedef dma_addr_t bus_addr_t;
+-#else
+-typedef uint32_t bus_addr_t;
+-#endif
+-typedef uint32_t bus_size_t;
+-
+-typedef enum {
+-	BUS_SPACE_MEMIO,
+-	BUS_SPACE_PIO
+-} bus_space_tag_t;
+-
+-typedef union {
+-	u_long		  ioport;
+-	volatile uint8_t *maddr;
+-} bus_space_handle_t;
+-
+-typedef struct bus_dma_segment
+-{
+-	bus_addr_t	ds_addr;
+-	bus_size_t	ds_len;
+-} bus_dma_segment_t;
+-
+-struct ahc_linux_dma_tag
+-{
+-	bus_size_t	alignment;
+-	bus_size_t	boundary;
+-	bus_size_t	maxsize;
+-};
+-typedef struct ahc_linux_dma_tag* bus_dma_tag_t;
+-
+-struct ahc_linux_dmamap
+-{
+-	bus_addr_t	bus_addr;
+-};
+-typedef struct ahc_linux_dmamap* bus_dmamap_t;
+-
+-typedef int bus_dma_filter_t(void*, bus_addr_t);
+-typedef void bus_dmamap_callback_t(void *, bus_dma_segment_t *, int, int);
+-
+-#define BUS_DMA_WAITOK		0x0
+-#define BUS_DMA_NOWAIT		0x1
+-#define BUS_DMA_ALLOCNOW	0x2
+-#define BUS_DMA_LOAD_SEGS	0x4	/*
+-					 * Argument is an S/G list not
+-					 * a single buffer.
+-					 */
+-
+-#define BUS_SPACE_MAXADDR	0xFFFFFFFF
+-#define BUS_SPACE_MAXADDR_32BIT	0xFFFFFFFF
+-#define BUS_SPACE_MAXSIZE_32BIT	0xFFFFFFFF
+-
+-int	ahc_dma_tag_create(struct ahc_softc *, bus_dma_tag_t /*parent*/,
+-			   bus_size_t /*alignment*/, bus_size_t /*boundary*/,
+-			   bus_addr_t /*lowaddr*/, bus_addr_t /*highaddr*/,
+-			   bus_dma_filter_t*/*filter*/, void */*filterarg*/,
+-			   bus_size_t /*maxsize*/, int /*nsegments*/,
+-			   bus_size_t /*maxsegsz*/, int /*flags*/,
+-			   bus_dma_tag_t */*dma_tagp*/);
+-
+-void	ahc_dma_tag_destroy(struct ahc_softc *, bus_dma_tag_t /*tag*/);
+-
+-int	ahc_dmamem_alloc(struct ahc_softc *, bus_dma_tag_t /*dmat*/,
+-			 void** /*vaddr*/, int /*flags*/,
+-			 bus_dmamap_t* /*mapp*/);
+-
+-void	ahc_dmamem_free(struct ahc_softc *, bus_dma_tag_t /*dmat*/,
+-			void* /*vaddr*/, bus_dmamap_t /*map*/);
+-
+-void	ahc_dmamap_destroy(struct ahc_softc *, bus_dma_tag_t /*tag*/,
+-			   bus_dmamap_t /*map*/);
+-
+-int	ahc_dmamap_load(struct ahc_softc *ahc, bus_dma_tag_t /*dmat*/,
+-			bus_dmamap_t /*map*/, void * /*buf*/,
+-			bus_size_t /*buflen*/, bus_dmamap_callback_t *,
+-			void */*callback_arg*/, int /*flags*/);
+-
+-int	ahc_dmamap_unload(struct ahc_softc *, bus_dma_tag_t, bus_dmamap_t);
+-
+-/*
+- * Operations performed by ahc_dmamap_sync().
+- */
+-#define BUS_DMASYNC_PREREAD	0x01	/* pre-read synchronization */
+-#define BUS_DMASYNC_POSTREAD	0x02	/* post-read synchronization */
+-#define BUS_DMASYNC_PREWRITE	0x04	/* pre-write synchronization */
+-#define BUS_DMASYNC_POSTWRITE	0x08	/* post-write synchronization */
+-
+-/*
+- * XXX
+- * ahc_dmamap_sync is only used on buffers allocated with
+- * the pci_alloc_consistent() API.  Although I'm not sure how
+- * this works on architectures with a write buffer, Linux does
+- * not have an API to sync "coherent" memory.  Perhaps we need
+- * to do an mb()?
+- */
+-#define ahc_dmamap_sync(ahc, dma_tag, dmamap, offset, len, op)
+-
+-/************************** Timer DataStructures ******************************/
+-typedef struct timer_list ahc_timer_t;
+-
+-/********************************** Includes **********************************/
+-#ifdef CONFIG_AIC7XXX_REG_PRETTY_PRINT
+-#define AIC_DEBUG_REGISTERS 1
+-#else
+-#define AIC_DEBUG_REGISTERS 0
+-#endif
+-#include "aic7xxx.h"
+-
+-/***************************** Timer Facilities *******************************/
+-#define ahc_timer_init init_timer
+-#define ahc_timer_stop del_timer_sync
+-typedef void ahc_linux_callback_t (u_long);  
+-static __inline void ahc_timer_reset(ahc_timer_t *timer, int usec,
+-				     ahc_callback_t *func, void *arg);
+-static __inline void ahc_scb_timer_reset(struct scb *scb, u_int usec);
+-
+-static __inline void
+-ahc_timer_reset(ahc_timer_t *timer, int usec, ahc_callback_t *func, void *arg)
+-{
+-	struct ahc_softc *ahc;
+-
+-	ahc = (struct ahc_softc *)arg;
+-	del_timer(timer);
+-	timer->data = (u_long)arg;
+-	timer->expires = jiffies + (usec * HZ)/1000000;
+-	timer->function = (ahc_linux_callback_t*)func;
+-	add_timer(timer);
+-}
+-
+-static __inline void
+-ahc_scb_timer_reset(struct scb *scb, u_int usec)
+-{
+-	mod_timer(&scb->io_ctx->eh_timeout, jiffies + (usec * HZ)/1000000);
+-}
++/***************************** Domain Validation ******************************/
++void ahc_linux_dv_complete(Scsi_Cmnd *cmd);
++void ahc_linux_dv_timeout(struct scsi_cmnd *cmd);
+ 
+ /***************************** SMP support ************************************/
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,17)
+@@ -304,187 +119,7 @@ ahc_scb_timer_reset(struct scb *scb, u_i
+ #define AHC_SCSI_HAS_HOST_LOCK 0
+ #endif
+ 
+-#define AIC7XXX_DRIVER_VERSION "6.2.35"
+-
+-/**************************** Front End Queues ********************************/
+-/*
+- * Data structure used to cast the Linux struct scsi_cmnd to something
+- * that allows us to use the queue macros.  The linux structure has
+- * plenty of space to hold the links fields as required by the queue
+- * macros, but the queue macors require them to have the correct type.
+- */
+-struct ahc_cmd_internal {
+-	/* Area owned by the Linux scsi layer. */
+-	uint8_t	private[offsetof(struct scsi_cmnd, SCp.Status)];
+-	union {
+-		STAILQ_ENTRY(ahc_cmd)	ste;
+-		LIST_ENTRY(ahc_cmd)	le;
+-		TAILQ_ENTRY(ahc_cmd)	tqe;
+-	} links;
+-	uint32_t			end;
+-};
+-
+-struct ahc_cmd {
+-	union {
+-		struct ahc_cmd_internal	icmd;
+-		struct scsi_cmnd	scsi_cmd;
+-	} un;
+-};
+-
+-#define acmd_icmd(cmd) ((cmd)->un.icmd)
+-#define acmd_scsi_cmd(cmd) ((cmd)->un.scsi_cmd)
+-#define acmd_links un.icmd.links
+-
+-/*************************** Device Data Structures ***************************/
+-/*
+- * A per probed device structure used to deal with some error recovery
+- * scenarios that the Linux mid-layer code just doesn't know how to
+- * handle.  The structure allocated for a device only becomes persistent
+- * after a successfully completed inquiry command to the target when
+- * that inquiry data indicates a lun is present.
+- */
+-TAILQ_HEAD(ahc_busyq, ahc_cmd);
+-typedef enum {
+-	AHC_DEV_UNCONFIGURED	 = 0x01,
+-	AHC_DEV_FREEZE_TIL_EMPTY = 0x02, /* Freeze queue until active == 0 */
+-	AHC_DEV_TIMER_ACTIVE	 = 0x04, /* Our timer is active */
+-	AHC_DEV_ON_RUN_LIST	 = 0x08, /* Queued to be run later */
+-	AHC_DEV_Q_BASIC		 = 0x10, /* Allow basic device queuing */
+-	AHC_DEV_Q_TAGGED	 = 0x20, /* Allow full SCSI2 command queueing */
+-	AHC_DEV_PERIODIC_OTAG	 = 0x40, /* Send OTAG to prevent starvation */
+-	AHC_DEV_SLAVE_CONFIGURED = 0x80	 /* slave_configure() has been called */
+-} ahc_linux_dev_flags;
+-
+-struct ahc_linux_target;
+-struct ahc_linux_device {
+-	TAILQ_ENTRY(ahc_linux_device) links;
+-	struct		ahc_busyq busyq;
+-
+-	/*
+-	 * The number of transactions currently
+-	 * queued to the device.
+-	 */
+-	int			active;
+-
+-	/*
+-	 * The currently allowed number of 
+-	 * transactions that can be queued to
+-	 * the device.  Must be signed for
+-	 * conversion from tagged to untagged
+-	 * mode where the device may have more
+-	 * than one outstanding active transaction.
+-	 */
+-	int			openings;
+-
+-	/*
+-	 * A positive count indicates that this
+-	 * device's queue is halted.
+-	 */
+-	u_int			qfrozen;
+-	
+-	/*
+-	 * Cumulative command counter.
+-	 */
+-	u_long			commands_issued;
+-
+-	/*
+-	 * The number of tagged transactions when
+-	 * running at our current opening level
+-	 * that have been successfully received by
+-	 * this device since the last QUEUE FULL.
+-	 */
+-	u_int			tag_success_count;
+-#define AHC_TAG_SUCCESS_INTERVAL 50
+-
+-	ahc_linux_dev_flags	flags;
+-
+-	/*
+-	 * Per device timer.
+-	 */
+-	struct timer_list	timer;
+-
+-	/*
+-	 * The high limit for the tags variable.
+-	 */
+-	u_int			maxtags;
+-
+-	/*
+-	 * The computed number of tags outstanding
+-	 * at the time of the last QUEUE FULL event.
+-	 */
+-	u_int			tags_on_last_queuefull;
+-
+-	/*
+-	 * How many times we have seen a queue full
+-	 * with the same number of tags.  This is used
+-	 * to stop our adaptive queue depth algorithm
+-	 * on devices with a fixed number of tags.
+-	 */
+-	u_int			last_queuefull_same_count;
+-#define AHC_LOCK_TAGS_COUNT 50
+-
+-	/*
+-	 * How many transactions have been queued
+-	 * without the device going idle.  We use
+-	 * this statistic to determine when to issue
+-	 * an ordered tag to prevent transaction
+-	 * starvation.  This statistic is only updated
+-	 * if the AHC_DEV_PERIODIC_OTAG flag is set
+-	 * on this device.
+-	 */
+-	u_int			commands_since_idle_or_otag;
+-#define AHC_OTAG_THRESH	500
+-
+-	int			lun;
+-	Scsi_Device	       *scsi_device;
+-	struct			ahc_linux_target *target;
+-};
+-
+-typedef enum {
+-	AHC_DV_REQUIRED		 = 0x01,
+-	AHC_INQ_VALID		 = 0x02,
+-	AHC_BASIC_DV		 = 0x04,
+-	AHC_ENHANCED_DV		 = 0x08
+-} ahc_linux_targ_flags;
+-
+-/* DV States */
+-typedef enum {
+-	AHC_DV_STATE_EXIT = 0,
+-	AHC_DV_STATE_INQ_SHORT_ASYNC,
+-	AHC_DV_STATE_INQ_ASYNC,
+-	AHC_DV_STATE_INQ_ASYNC_VERIFY,
+-	AHC_DV_STATE_TUR,
+-	AHC_DV_STATE_REBD,
+-	AHC_DV_STATE_INQ_VERIFY,
+-	AHC_DV_STATE_WEB,
+-	AHC_DV_STATE_REB,
+-	AHC_DV_STATE_SU,
+-	AHC_DV_STATE_BUSY
+-} ahc_dv_state;
+-
+-struct ahc_linux_target {
+-	struct ahc_linux_device	 *devices[AHC_NUM_LUNS];
+-	int			  channel;
+-	int			  target;
+-	int			  refcount;
+-	struct ahc_transinfo	  last_tinfo;
+-	struct ahc_softc	 *ahc;
+-	ahc_linux_targ_flags	  flags;
+-	struct scsi_inquiry_data *inq_data;
+-	/*
+-	 * The next "fallback" period to use for narrow/wide transfers.
+-	 */
+-	uint8_t			  dv_next_narrow_period;
+-	uint8_t			  dv_next_wide_period;
+-	uint8_t			  dv_max_width;
+-	uint8_t			  dv_max_ppr_options;
+-	uint8_t			  dv_last_ppr_options;
+-	u_int			  dv_echo_size;
+-	ahc_dv_state		  dv_state;
+-	u_int			  dv_state_retry;
+-	char			 *dv_buffer;
+-	char			 *dv_buffer1;
+-};
++#define AIC7XXX_DRIVER_VERSION "6.3.4"
+ 
+ /********************* Definitions Required by the Core ***********************/
+ /*
+@@ -506,120 +141,39 @@ extern u_int ahc_linux_nseg;
+ #define	AHC_NSEG 128
+ #endif
+ 
+-/*
+- * Per-SCB OSM storage.
+- */
+-typedef enum {
+-	AHC_UP_EH_SEMAPHORE = 0x1
+-} ahc_linux_scb_flags;
+-
+-struct scb_platform_data {
+-	struct ahc_linux_device	*dev;
+-	bus_addr_t		 buf_busaddr;
+-	uint32_t		 xfer_len;
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)
+-	uint32_t		 resid;		/* Transfer residual */
+-#endif
+-	uint32_t		 sense_resid;	/* Auto-Sense residual */
+-	ahc_linux_scb_flags	 flags;
+-};
+-
+-/*
+- * Define a structure used for each host adapter.  All members are
+- * aligned on a boundary >= the size of the member to honor the
+- * alignment restrictions of the various platforms supported by
+- * this driver.
+- */
+-typedef enum {
+-	AHC_DV_WAIT_SIMQ_EMPTY	 = 0x01,
+-	AHC_DV_WAIT_SIMQ_RELEASE = 0x02,
+-	AHC_DV_ACTIVE		 = 0x04,
+-	AHC_DV_SHUTDOWN		 = 0x08,
+-	AHC_RUN_CMPLT_Q_TIMER	 = 0x10
+-} ahc_linux_softc_flags;
+-
+-TAILQ_HEAD(ahc_completeq, ahc_cmd);
+-
+-struct ahc_platform_data {
+-	/*
+-	 * Fields accessed from interrupt context.
+-	 */
+-	struct ahc_linux_target *targets[AHC_NUM_TARGETS]; 
+-	TAILQ_HEAD(, ahc_linux_device) device_runq;
+-	struct ahc_completeq	 completeq;
+-
+-	spinlock_t		 spin_lock;
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+-	struct tasklet_struct	 runq_tasklet;
+-#endif
+-	u_int			 qfrozen;
+-	pid_t			 dv_pid;
+-	struct timer_list	 completeq_timer;
+-	struct timer_list	 reset_timer;
+-	struct semaphore	 eh_sem;
+-	struct semaphore	 dv_sem;
+-	struct semaphore	 dv_cmd_sem;	/* XXX This needs to be in
+-						 * the target struct
+-						 */
+-	struct scsi_device	*dv_scsi_dev;
+-	struct Scsi_Host        *host;		/* pointer to scsi host */
+-#define AHC_LINUX_NOIRQ	((uint32_t)~0)
+-	uint32_t		 irq;		/* IRQ for this adapter */
+-	uint32_t		 bios_address;
+-	uint32_t		 mem_busaddr;	/* Mem Base Addr */
+-	bus_addr_t		 hw_dma_mask;
+-	ahc_linux_softc_flags	 flags;
+-};
+-
+-/************************** OS Utility Wrappers *******************************/
+-#define printf printk
+-#define M_NOWAIT GFP_ATOMIC
+-#define M_WAITOK 0
+-#define malloc(size, type, flags) kmalloc(size, flags)
+-#define free(ptr, type) kfree(ptr)
+-
+-static __inline void ahc_delay(long);
+-static __inline void
+-ahc_delay(long usec)
+-{
+-	/*
+-	 * udelay on Linux can have problems for
+-	 * multi-millisecond waits.  Wait at most
+-	 * 1024us per call.
+-	 */
+-	while (usec > 0) {
+-		udelay(usec % 1024);
+-		usec -= 1024;
+-	}
+-}
+-
++/************************** Error Recovery ************************************/
++static __inline void	ahc_wakeup_recovery_thread(struct ahc_softc *ahc); 
++  
++static __inline void
++ahc_wakeup_recovery_thread(struct ahc_softc *ahc)
++{ 
++	up(&ahc->platform_data->recovery_sem);
++}
++ 
++int			ahc_spawn_recovery_thread(struct ahc_softc *ahc);
++void			ahc_terminate_recovery_thread(struct ahc_softc *ahc);
++void			ahc_set_recoveryscb(struct ahc_softc *ahc,
++					    struct scb *scb);
+ 
+ /***************************** Low Level I/O **********************************/
+-#if defined(__powerpc__) || defined(__i386__) || defined(__ia64__)
+-#define MMAPIO
+-#endif
+-
+ static __inline uint8_t ahc_inb(struct ahc_softc * ahc, long port);
+ static __inline void ahc_outb(struct ahc_softc * ahc, long port, uint8_t val);
+ static __inline void ahc_outsb(struct ahc_softc * ahc, long port,
+ 			       uint8_t *, int count);
+ static __inline void ahc_insb(struct ahc_softc * ahc, long port,
+ 			       uint8_t *, int count);
++static __inline void ahc_flush_device_writes(struct ahc_softc *);
+ 
+ static __inline uint8_t
+ ahc_inb(struct ahc_softc * ahc, long port)
+ {
+ 	uint8_t x;
+-#ifdef MMAPIO
+ 
+ 	if (ahc->tag == BUS_SPACE_MEMIO) {
+ 		x = readb(ahc->bsh.maddr + port);
+ 	} else {
+ 		x = inb(ahc->bsh.ioport + port);
+ 	}
+-#else
+-	x = inb(ahc->bsh.ioport + port);
+-#endif
+ 	mb();
+ 	return (x);
+ }
+@@ -627,15 +181,11 @@ ahc_inb(struct ahc_softc * ahc, long por
+ static __inline void
+ ahc_outb(struct ahc_softc * ahc, long port, uint8_t val)
+ {
+-#ifdef MMAPIO
+ 	if (ahc->tag == BUS_SPACE_MEMIO) {
+ 		writeb(val, ahc->bsh.maddr + port);
+ 	} else {
+ 		outb(val, ahc->bsh.ioport + port);
+ 	}
+-#else
+-	outb(val, ahc->bsh.ioport + port);
+-#endif
+ 	mb();
+ }
+ 
+@@ -667,6 +217,13 @@ ahc_insb(struct ahc_softc * ahc, long po
+ 		*array++ = ahc_inb(ahc, port);
+ }
+ 
++static __inline void
++ahc_flush_device_writes(struct ahc_softc *ahc)
++{
++	/* XXX Is this sufficient for all architectures??? */
++	ahc_inb(ahc, INTSTAT);
++}
++
+ /**************************** Initialization **********************************/
+ int		ahc_linux_register_host(struct ahc_softc *,
+ 					Scsi_Host_Template *);
+@@ -795,174 +352,41 @@ ahc_list_unlock(unsigned long *flags)
+ }
+ 
+ /******************************* PCI Definitions ******************************/
+-/*
+- * PCIM_xxx: mask to locate subfield in register
+- * PCIR_xxx: config register offset
+- * PCIC_xxx: device class
+- * PCIS_xxx: device subclass
+- * PCIP_xxx: device programming interface
+- * PCIV_xxx: PCI vendor ID (only required to fixup ancient devices)
+- * PCID_xxx: device ID
+- */
+-#define PCIR_DEVVENDOR		0x00
+-#define PCIR_VENDOR		0x00
+-#define PCIR_DEVICE		0x02
+-#define PCIR_COMMAND		0x04
+-#define PCIM_CMD_PORTEN		0x0001
+-#define PCIM_CMD_MEMEN		0x0002
+-#define PCIM_CMD_BUSMASTEREN	0x0004
+-#define PCIM_CMD_MWRICEN	0x0010
+-#define PCIM_CMD_PERRESPEN	0x0040
+-#define	PCIM_CMD_SERRESPEN	0x0100
+-#define PCIR_STATUS		0x06
+-#define PCIR_REVID		0x08
+-#define PCIR_PROGIF		0x09
+-#define PCIR_SUBCLASS		0x0a
+-#define PCIR_CLASS		0x0b
+-#define PCIR_CACHELNSZ		0x0c
+-#define PCIR_LATTIMER		0x0d
+-#define PCIR_HEADERTYPE		0x0e
+-#define PCIM_MFDEV		0x80
+-#define PCIR_BIST		0x0f
+-#define PCIR_CAP_PTR		0x34
+-
+-/* config registers for header type 0 devices */
+-#define PCIR_MAPS	0x10
+-#define PCIR_SUBVEND_0	0x2c
+-#define PCIR_SUBDEV_0	0x2e
+-
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+ extern struct pci_driver aic7xxx_pci_driver;
+ #endif
+ 
+-typedef enum
+-{
+-	AHC_POWER_STATE_D0,
+-	AHC_POWER_STATE_D1,
+-	AHC_POWER_STATE_D2,
+-	AHC_POWER_STATE_D3
+-} ahc_power_state;
+-
+-void ahc_power_state_change(struct ahc_softc *ahc,
+-			    ahc_power_state new_state);
+ /**************************** VL/EISA Routines ********************************/
+-int			 aic7770_linux_probe(Scsi_Host_Template *);
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) \
++  && (defined(__i386__) || defined(__alpha__)) \
++  && (!defined(CONFIG_EISA)))
++#define CONFIG_EISA
++#endif
++
++#ifdef CONFIG_EISA
++extern uint32_t aic7xxx_probe_eisa_vl;
++void			 ahc_linux_eisa_init(void);
++void			 ahc_linux_eisa_exit(void);
+ int			 aic7770_map_registers(struct ahc_softc *ahc,
+ 					       u_int port);
+ int			 aic7770_map_int(struct ahc_softc *ahc, u_int irq);
++#endif
+ 
+ /******************************* PCI Routines *********************************/
++#ifdef CONFIG_PCI
+ int			 ahc_linux_pci_init(void);
+ void			 ahc_linux_pci_exit(void);
+ int			 ahc_pci_map_registers(struct ahc_softc *ahc);
+ int			 ahc_pci_map_int(struct ahc_softc *ahc);
++#endif 
+ 
+-static __inline uint32_t ahc_pci_read_config(ahc_dev_softc_t pci,
+-					     int reg, int width);
+-
+-static __inline uint32_t
+-ahc_pci_read_config(ahc_dev_softc_t pci, int reg, int width)
+-{
+-	switch (width) {
+-	case 1:
+-	{
+-		uint8_t retval;
+-
+-		pci_read_config_byte(pci, reg, &retval);
+-		return (retval);
+-	}
+-	case 2:
+-	{
+-		uint16_t retval;
+-		pci_read_config_word(pci, reg, &retval);
+-		return (retval);
+-	}
+-	case 4:
+-	{
+-		uint32_t retval;
+-		pci_read_config_dword(pci, reg, &retval);
+-		return (retval);
+-	}
+-	default:
+-		panic("ahc_pci_read_config: Read size too big");
+-		/* NOTREACHED */
+-		return (0);
+-	}
+-}
+-
+-static __inline void ahc_pci_write_config(ahc_dev_softc_t pci,
+-					  int reg, uint32_t value,
+-					  int width);
+-
+-static __inline void
+-ahc_pci_write_config(ahc_dev_softc_t pci, int reg, uint32_t value, int width)
+-{
+-	switch (width) {
+-	case 1:
+-		pci_write_config_byte(pci, reg, value);
+-		break;
+-	case 2:
+-		pci_write_config_word(pci, reg, value);
+-		break;
+-	case 4:
+-		pci_write_config_dword(pci, reg, value);
+-		break;
+-	default:
+-		panic("ahc_pci_write_config: Write size too big");
+-		/* NOTREACHED */
+-	}
+-}
+-
+-static __inline int ahc_get_pci_function(ahc_dev_softc_t);
+-static __inline int
+-ahc_get_pci_function(ahc_dev_softc_t pci)
+-{
+-	return (PCI_FUNC(pci->devfn));
+-}
+-
+-static __inline int ahc_get_pci_slot(ahc_dev_softc_t);
+-static __inline int
+-ahc_get_pci_slot(ahc_dev_softc_t pci)
+-{
+-	return (PCI_SLOT(pci->devfn));
+-}
+-
+-static __inline int ahc_get_pci_bus(ahc_dev_softc_t);
+-static __inline int
+-ahc_get_pci_bus(ahc_dev_softc_t pci)
+-{
+-	return (pci->bus->number);
+-}
+-
+-static __inline void ahc_flush_device_writes(struct ahc_softc *);
+-static __inline void
+-ahc_flush_device_writes(struct ahc_softc *ahc)
+-{
+-	/* XXX Is this sufficient for all architectures??? */
+-	ahc_inb(ahc, INTSTAT);
+-}
+-
+-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,3,0)
+-#define pci_map_sg(pdev, sg_list, nseg, direction) (nseg)
+-#define pci_unmap_sg(pdev, sg_list, nseg, direction)
+-#define sg_dma_address(sg) (VIRT_TO_BUS((sg)->address))
+-#define sg_dma_len(sg) ((sg)->length)
+-#define pci_map_single(pdev, buffer, bufflen, direction) \
+-	(VIRT_TO_BUS(buffer))
+-#define pci_unmap_single(pdev, buffer, buflen, direction)
+-#endif
+-
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,3)
+-#define ahc_pci_set_dma_mask pci_set_dma_mask
++/**************************** Proc FS Support *********************************/
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
++int	ahc_linux_proc_info(char *, char **, off_t, int, int, int);
+ #else
+-/*
+- * Always "return" 0 for success.
+- */
+-#define ahc_pci_set_dma_mask(dev_softc, mask)  			\
+-	(((dev_softc)->dma_mask = mask) && 0)
++int	ahc_linux_proc_info(struct Scsi_Host *, char *, char **,
++			    off_t, int, int);
+ #endif
+-/**************************** Proc FS Support *********************************/
+-int	ahc_linux_proc_info(struct Scsi_Host *, char *, char **, off_t, int, int);
+ 
+ /*************************** Domain Validation ********************************/
+ #define AHC_DV_CMD(cmd) ((cmd)->scsi_done == ahc_linux_dv_complete)
+@@ -971,194 +395,9 @@ int	ahc_linux_proc_info(struct Scsi_Host
+ 	 && (ahc)->platform_data->qfrozen == 1)
+ 
+ /*********************** Transaction Access Wrappers *************************/
+-static __inline void ahc_cmd_set_transaction_status(Scsi_Cmnd *, uint32_t);
+-static __inline void ahc_set_transaction_status(struct scb *, uint32_t);
+-static __inline void ahc_cmd_set_scsi_status(Scsi_Cmnd *, uint32_t);
+-static __inline void ahc_set_scsi_status(struct scb *, uint32_t);
+-static __inline uint32_t ahc_cmd_get_transaction_status(Scsi_Cmnd *cmd);
+-static __inline uint32_t ahc_get_transaction_status(struct scb *);
+-static __inline uint32_t ahc_cmd_get_scsi_status(Scsi_Cmnd *cmd);
+-static __inline uint32_t ahc_get_scsi_status(struct scb *);
+-static __inline void ahc_set_transaction_tag(struct scb *, int, u_int);
+-static __inline u_long ahc_get_transfer_length(struct scb *);
+-static __inline int ahc_get_transfer_dir(struct scb *);
+-static __inline void ahc_set_residual(struct scb *, u_long);
+-static __inline void ahc_set_sense_residual(struct scb *scb, u_long resid);
+-static __inline u_long ahc_get_residual(struct scb *);
+-static __inline u_long ahc_get_sense_residual(struct scb *);
+-static __inline int ahc_perform_autosense(struct scb *);
+-static __inline uint32_t ahc_get_sense_bufsize(struct ahc_softc *,
+-					       struct scb *);
+-static __inline void ahc_notify_xfer_settings_change(struct ahc_softc *,
+-						     struct ahc_devinfo *);
+-static __inline void ahc_platform_scb_free(struct ahc_softc *ahc,
+-					   struct scb *scb);
+-static __inline void ahc_freeze_scb(struct scb *scb);
+-
+-static __inline
+-void ahc_cmd_set_transaction_status(Scsi_Cmnd *cmd, uint32_t status)
+-{
+-	cmd->result &= ~(CAM_STATUS_MASK << 16);
+-	cmd->result |= status << 16;
+-}
+-
+-static __inline
+-void ahc_set_transaction_status(struct scb *scb, uint32_t status)
+-{
+-	ahc_cmd_set_transaction_status(scb->io_ctx,status);
+-}
+-
+-static __inline
+-void ahc_cmd_set_scsi_status(Scsi_Cmnd *cmd, uint32_t status)
+-{
+-	cmd->result &= ~0xFFFF;
+-	cmd->result |= status;
+-}
+-
+-static __inline
+-void ahc_set_scsi_status(struct scb *scb, uint32_t status)
+-{
+-	ahc_cmd_set_scsi_status(scb->io_ctx, status);
+-}
+-
+-static __inline
+-uint32_t ahc_cmd_get_transaction_status(Scsi_Cmnd *cmd)
+-{
+-	return ((cmd->result >> 16) & CAM_STATUS_MASK);
+-}
+-
+-static __inline
+-uint32_t ahc_get_transaction_status(struct scb *scb)
+-{
+-	return (ahc_cmd_get_transaction_status(scb->io_ctx));
+-}
+-
+-static __inline
+-uint32_t ahc_cmd_get_scsi_status(Scsi_Cmnd *cmd)
+-{
+-	return (cmd->result & 0xFFFF);
+-}
+-
+-static __inline
+-uint32_t ahc_get_scsi_status(struct scb *scb)
+-{
+-	return (ahc_cmd_get_scsi_status(scb->io_ctx));
+-}
+-
+-static __inline
+-void ahc_set_transaction_tag(struct scb *scb, int enabled, u_int type)
+-{
+-	/*
+-	 * Nothing to do for linux as the incoming transaction
+-	 * has no concept of tag/non tagged, etc.
+-	 */
+-}
+-
+-static __inline
+-u_long ahc_get_transfer_length(struct scb *scb)
+-{
+-	return (scb->platform_data->xfer_len);
+-}
+-
+-static __inline
+-int ahc_get_transfer_dir(struct scb *scb)
+-{
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,40)
+-	return (scb->io_ctx->sc_data_direction);
+-#else
+-	if (scb->io_ctx->bufflen == 0)
+-		return (CAM_DIR_NONE);
+-
+-	switch(scb->io_ctx->cmnd[0]) {
+-	case 0x08:  /* READ(6)  */
+-	case 0x28:  /* READ(10) */
+-	case 0xA8:  /* READ(12) */
+-		return (CAM_DIR_IN);
+-        case 0x0A:  /* WRITE(6)  */
+-        case 0x2A:  /* WRITE(10) */
+-        case 0xAA:  /* WRITE(12) */
+-		return (CAM_DIR_OUT);
+-        default:
+-		return (CAM_DIR_NONE);
+-        }
+-#endif
+-}
+-
+-static __inline
+-void ahc_set_residual(struct scb *scb, u_long resid)
+-{
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
+-	scb->io_ctx->resid = resid;
+-#else
+-	scb->platform_data->resid = resid;
+-#endif
+-}
+-
+-static __inline
+-void ahc_set_sense_residual(struct scb *scb, u_long resid)
+-{
+-	scb->platform_data->sense_resid = resid;
+-}
+-
+-static __inline
+-u_long ahc_get_residual(struct scb *scb)
+-{
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
+-	return (scb->io_ctx->resid);
+-#else
+-	return (scb->platform_data->resid);
+-#endif
+-}
+-
+-static __inline
+-u_long ahc_get_sense_residual(struct scb *scb)
+-{
+-	return (scb->platform_data->sense_resid);
+-}
+-
+-static __inline
+-int ahc_perform_autosense(struct scb *scb)
+-{
+-	/*
+-	 * We always perform autosense in Linux.
+-	 * On other platforms this is set on a
+-	 * per-transaction basis.
+-	 */
+-	return (1);
+-}
+-
+-static __inline uint32_t
+-ahc_get_sense_bufsize(struct ahc_softc *ahc, struct scb *scb)
+-{
+-	return (sizeof(struct scsi_sense_data));
+-}
+-
+-static __inline void
+-ahc_notify_xfer_settings_change(struct ahc_softc *ahc,
+-				struct ahc_devinfo *devinfo)
+-{
+-	/* Nothing to do here for linux */
+-}
+-
+-static __inline void
+-ahc_platform_scb_free(struct ahc_softc *ahc, struct scb *scb)
+-{
+-	ahc->flags &= ~AHC_RESOURCE_SHORTAGE;
+-}
+-
+ int	ahc_platform_alloc(struct ahc_softc *ahc, void *platform_arg);
+ void	ahc_platform_free(struct ahc_softc *ahc);
+ void	ahc_platform_freeze_devq(struct ahc_softc *ahc, struct scb *scb);
+-
+-static __inline void
+-ahc_freeze_scb(struct scb *scb)
+-{
+-	if ((scb->io_ctx->result & (CAM_DEV_QFRZN << 16)) == 0) {
+-                scb->io_ctx->result |= CAM_DEV_QFRZN << 16;
+-                scb->platform_data->dev->qfrozen++;
+-        }
+-}
+-
+ void	ahc_platform_set_tags(struct ahc_softc *ahc,
+ 			      struct ahc_devinfo *devinfo, ahc_queue_alg);
+ int	ahc_platform_abort_scbs(struct ahc_softc *ahc, int target,
+@@ -1175,9 +414,9 @@ void	ahc_print_path(struct ahc_softc *, 
+ void	ahc_platform_dump_card_state(struct ahc_softc *ahc);
+ 
+ #ifdef CONFIG_PCI
+-#define AHC_PCI_CONFIG 1
++#define AIC_PCI_CONFIG 1
+ #else
+-#define AHC_PCI_CONFIG 0
++#define AIC_PCI_CONFIG 0
+ #endif
+ #define bootverbose aic7xxx_verbose
+ extern u_int aic7xxx_verbose;
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c	2003-12-28 23:21:40.000000000 -0800
+@@ -36,11 +36,17 @@
+  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  * POSSIBILITY OF SUCH DAMAGES.
+  *
+- * $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"
+ 
++/*
++ * Include aiclib_pci.c as part of our
++ * "module dependencies are hard" work around.
++ */
++#include "aiclib_pci.c"
++
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
+ struct pci_device_id
+ {
+@@ -51,11 +57,9 @@ static int	ahc_linux_pci_dev_probe(struc
+ 					const struct pci_device_id *ent);
+ static int	ahc_linux_pci_reserve_io_region(struct ahc_softc *ahc,
+ 						u_long *base);
+-#ifdef MMAPIO
+ static int	ahc_linux_pci_reserve_mem_region(struct ahc_softc *ahc,
+ 						 u_long *bus_addr,
+ 						 uint8_t **maddr);
+-#endif /* MMAPIO */
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+ static void	ahc_linux_pci_dev_remove(struct pci_dev *pdev);
+ 
+@@ -97,12 +101,14 @@ ahc_linux_pci_dev_remove(struct pci_dev 
+ 	if (ahc != NULL) {
+ 		u_long s;
+ 
++		TAILQ_REMOVE(&ahc_tailq, ahc, links);
++		ahc_list_unlock(&l);
+ 		ahc_lock(ahc, &s);
+ 		ahc_intr_enable(ahc, FALSE);
+ 		ahc_unlock(ahc, &s);
+ 		ahc_free(ahc);
+-	}
+-	ahc_list_unlock(&l);
++	} else
++		ahc_list_unlock(&l);
+ }
+ #endif /* !LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0) */
+ 
+@@ -112,7 +118,7 @@ ahc_linux_pci_dev_probe(struct pci_dev *
+ 	char		 buf[80];
+ 	bus_addr_t	 mask_39bit;
+ 	struct		 ahc_softc *ahc;
+-	ahc_dev_softc_t	 pci;
++	aic_dev_softc_t	 dev;
+ 	struct		 ahc_pci_identity *entry;
+ 	char		*name;
+ 	int		 error;
+@@ -123,7 +129,7 @@ ahc_linux_pci_dev_probe(struct pci_dev *
+ 	TAILQ_FOREACH(ahc, &ahc_tailq, links) {
+ 		struct pci_dev *probed_pdev;
+ 
+-		probed_pdev = ahc->dev_softc;
++		probed_pdev = aic_dev_to_pci_dev(ahc->dev_softc);
+ 		if (probed_pdev->bus->number == pdev->bus->number
+ 		 && probed_pdev->devfn == pdev->devfn)
+ 			break;
+@@ -133,8 +139,8 @@ ahc_linux_pci_dev_probe(struct pci_dev *
+ 		return (-ENODEV);
+ 	}
+ 
+-	pci = pdev;
+-	entry = ahc_find_pci_device(pci);
++	dev = aic_pci_dev_to_dev(pdev);
++	entry = ahc_find_pci_device(dev);
+ 	if (entry == NULL)
+ 		return (-ENODEV);
+ 
+@@ -144,9 +150,9 @@ ahc_linux_pci_dev_probe(struct pci_dev *
+ 	 * common detect routine.
+ 	 */
+ 	sprintf(buf, "ahc_pci:%d:%d:%d",
+-		ahc_get_pci_bus(pci),
+-		ahc_get_pci_slot(pci),
+-		ahc_get_pci_function(pci));
++		aic_get_pci_bus(dev),
++		aic_get_pci_slot(dev),
++		aic_get_pci_function(dev));
+ 	name = malloc(strlen(buf) + 1, M_DEVBUF, M_NOWAIT);
+ 	if (name == NULL)
+ 		return (-ENOMEM);
+@@ -154,6 +160,8 @@ ahc_linux_pci_dev_probe(struct pci_dev *
+ 	ahc = ahc_alloc(NULL, name);
+ 	if (ahc == NULL)
+ 		return (-ENOMEM);
++	ahc->dev_softc = dev;
++
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+ 	if (pci_enable_device(pdev)) {
+ 		ahc_free(ahc);
+@@ -161,18 +169,17 @@ ahc_linux_pci_dev_probe(struct pci_dev *
+ 	}
+ 	pci_set_master(pdev);
+ 
+-	mask_39bit = (bus_addr_t)(0x7FFFFFFFFFULL & (bus_addr_t)~0);
++	mask_39bit = (bus_addr_t)0x7FFFFFFFFFULL;
+ 	if (sizeof(bus_addr_t) > 4
+ 	 && ahc_linux_get_memsize() > 0x80000000
+-	 && ahc_pci_set_dma_mask(pdev, mask_39bit) == 0) {
++	 && aic_set_dma_mask(ahc, mask_39bit) == 0) {
+ 		ahc->flags |= AHC_39BIT_ADDRESSING;
+ 		ahc->platform_data->hw_dma_mask = mask_39bit;
+ 	} else {
+-		ahc_pci_set_dma_mask(pdev, 0xFFFFFFFF);
++		aic_set_dma_mask(ahc, 0xFFFFFFFF);
+ 		ahc->platform_data->hw_dma_mask = 0xFFFFFFFF;
+ 	}
+ #endif
+-	ahc->dev_softc = pci;
+ 	error = ahc_pci_config(ahc, entry);
+ 	if (error != 0) {
+ 		ahc_free(ahc);
+@@ -211,10 +218,8 @@ ahc_linux_pci_init(void)
+ 	pdev = NULL;
+ 	class = PCI_CLASS_STORAGE_SCSI << 8;
+ 	while ((pdev = pci_find_class(class, pdev)) != NULL) {
+-		ahc_dev_softc_t pci;
+ 		int error;
+ 
+-		pci = pdev;
+ 		error = ahc_linux_pci_dev_probe(pdev, /*pci_devid*/NULL);
+ 		if (error == 0)
+ 			found++;
+@@ -236,9 +241,9 @@ ahc_linux_pci_reserve_io_region(struct a
+ 		return (ENOMEM);
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
+-	*base = pci_resource_start(ahc->dev_softc, 0);
++	*base = pci_resource_start(aic_pci_dev(ahc), 0);
+ #else
+-	*base = ahc_pci_read_config(ahc->dev_softc, PCIR_MAPS, 4);
++	*base = aic_pci_read_config(ahc->dev_softc, PCIR_MAPS, 4);
+ 	*base &= PCI_BASE_ADDRESS_IO_MASK;
+ #endif
+ 	if (*base == 0)
+@@ -254,7 +259,6 @@ ahc_linux_pci_reserve_io_region(struct a
+ 	return (0);
+ }
+ 
+-#ifdef MMAPIO
+ static int
+ ahc_linux_pci_reserve_mem_region(struct ahc_softc *ahc,
+ 				 u_long *bus_addr,
+@@ -267,11 +271,11 @@ ahc_linux_pci_reserve_mem_region(struct 
+ 
+ 	error = 0;
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
+-	start = pci_resource_start(ahc->dev_softc, 1);
++	start = pci_resource_start(aic_pci_dev(ahc), 1);
+ 	base_page = start & PAGE_MASK;
+ 	base_offset = start - base_page;
+ #else
+-	start = ahc_pci_read_config(ahc->dev_softc, PCIR_MAPS+4, 4);
++	start = aic_pci_read_config(ahc->dev_softc, PCIR_MAPS+4, 4);
+ 	base_offset = start & PCI_BASE_ADDRESS_MEM_MASK;
+ 	base_page = base_offset & PAGE_MASK;
+ 	base_offset -= base_page;
+@@ -296,7 +300,6 @@ ahc_linux_pci_reserve_mem_region(struct 
+ 		error = ENOMEM;
+ 	return (error);
+ }
+-#endif /* MMAPIO */
+ 
+ int
+ ahc_pci_map_registers(struct ahc_softc *ahc)
+@@ -309,17 +312,16 @@ ahc_pci_map_registers(struct ahc_softc *
+ 	/*
+ 	 * If its allowed, we prefer memory mapped access.
+ 	 */
+-	command = ahc_pci_read_config(ahc->dev_softc, PCIR_COMMAND, 4);
++	command = aic_pci_read_config(ahc->dev_softc, PCIR_COMMAND, 4);
+ 	command &= ~(PCIM_CMD_PORTEN|PCIM_CMD_MEMEN);
+ 	base = 0;
+ 	maddr = NULL;
+-#ifdef MMAPIO
+ 	error = ahc_linux_pci_reserve_mem_region(ahc, &base, &maddr);
+ 	if (error == 0) {
+ 		ahc->platform_data->mem_busaddr = base;
+ 		ahc->tag = BUS_SPACE_MEMIO;
+ 		ahc->bsh.maddr = maddr;
+-		ahc_pci_write_config(ahc->dev_softc, PCIR_COMMAND,
++		aic_pci_write_config(ahc->dev_softc, PCIR_COMMAND,
+ 				     command | PCIM_CMD_MEMEN, 4);
+ 
+ 		/*
+@@ -330,9 +332,9 @@ ahc_pci_map_registers(struct ahc_softc *
+ 
+ 			printf("aic7xxx: PCI Device %d:%d:%d "
+ 			       "failed memory mapped test.  Using PIO.\n",
+-			       ahc_get_pci_bus(ahc->dev_softc),
+-			       ahc_get_pci_slot(ahc->dev_softc),
+-			       ahc_get_pci_function(ahc->dev_softc));
++			       aic_get_pci_bus(ahc->dev_softc),
++			       aic_get_pci_slot(ahc->dev_softc),
++			       aic_get_pci_function(ahc->dev_softc));
+ 			iounmap((void *)((u_long)maddr & PAGE_MASK));
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+ 			release_mem_region(ahc->platform_data->mem_busaddr,
+@@ -345,12 +347,11 @@ ahc_pci_map_registers(struct ahc_softc *
+ 	} else {
+ 		printf("aic7xxx: PCI%d:%d:%d MEM region 0x%lx "
+ 		       "unavailable. Cannot memory map device.\n",
+-		       ahc_get_pci_bus(ahc->dev_softc),
+-		       ahc_get_pci_slot(ahc->dev_softc),
+-		       ahc_get_pci_function(ahc->dev_softc),
++		       aic_get_pci_bus(ahc->dev_softc),
++		       aic_get_pci_slot(ahc->dev_softc),
++		       aic_get_pci_function(ahc->dev_softc),
+ 		       base);
+ 	}
+-#endif /* MMAPIO */
+ 
+ 	/*
+ 	 * We always prefer memory mapped access.
+@@ -358,20 +359,20 @@ ahc_pci_map_registers(struct ahc_softc *
+ 	if (maddr == NULL) {
+ 
+ 		error = ahc_linux_pci_reserve_io_region(ahc, &base);
+-		if (error == 0) {
++		if (error == 0 && ahc_pci_test_register_access(ahc) == 0) {
+ 			ahc->tag = BUS_SPACE_PIO;
+ 			ahc->bsh.ioport = base;
+ 			command |= PCIM_CMD_PORTEN;
+ 		} else {
+ 			printf("aic7xxx: PCI%d:%d:%d IO region 0x%lx[0..255] "
+ 			       "unavailable. Cannot map device.\n",
+-			       ahc_get_pci_bus(ahc->dev_softc),
+-			       ahc_get_pci_slot(ahc->dev_softc),
+-			       ahc_get_pci_function(ahc->dev_softc),
++			       aic_get_pci_bus(ahc->dev_softc),
++			       aic_get_pci_slot(ahc->dev_softc),
++			       aic_get_pci_function(ahc->dev_softc),
+ 			       base);
+ 		}
+ 	}
+-	ahc_pci_write_config(ahc->dev_softc, PCIR_COMMAND, command, 4);
++	aic_pci_write_config(ahc->dev_softc, PCIR_COMMAND, command, 4);
+ 	return (error);
+ }
+ 
+@@ -380,49 +381,10 @@ ahc_pci_map_int(struct ahc_softc *ahc)
+ {
+ 	int error;
+ 
+-	error = request_irq(ahc->dev_softc->irq, ahc_linux_isr,
++	error = request_irq(aic_pci_dev(ahc)->irq, ahc_linux_isr,
+ 			    SA_SHIRQ, "aic7xxx", ahc);
+ 	if (error == 0)
+-		ahc->platform_data->irq = ahc->dev_softc->irq;
++		ahc->platform_data->irq = aic_pci_dev(ahc)->irq;
+ 	
+ 	return (-error);
+ }
+-
+-void
+-ahc_power_state_change(struct ahc_softc *ahc, ahc_power_state new_state)
+-{
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
+-	pci_set_power_state(ahc->dev_softc, new_state);
+-#else
+-	uint32_t cap;
+-	u_int cap_offset;
+-
+-	/*
+-	 * Traverse the capability list looking for
+-	 * the power management capability.
+-	 */
+-	cap = 0;
+-	cap_offset = ahc_pci_read_config(ahc->dev_softc,
+-					 PCIR_CAP_PTR, /*bytes*/1);
+-	while (cap_offset != 0) {
+-
+-		cap = ahc_pci_read_config(ahc->dev_softc,
+-					  cap_offset, /*bytes*/4);
+-		if ((cap & 0xFF) == 1
+-		 && ((cap >> 16) & 0x3) > 0) {
+-			uint32_t pm_control;
+-
+-			pm_control = ahc_pci_read_config(ahc->dev_softc,
+-							 cap_offset + 4,
+-							 /*bytes*/4);
+-			pm_control &= ~0x3;
+-			pm_control |= new_state;
+-			ahc_pci_write_config(ahc->dev_softc,
+-					     cap_offset + 4,
+-					     pm_control, /*bytes*/2);
+-			break;
+-		}
+-		cap_offset = (cap >> 8) & 0xFF;
+-	}
+-#endif 
+-}
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic7xxx_pci.c	2003-06-14 12:17:57.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aic7xxx_pci.c	2003-12-28 23:21:40.000000000 -0800
+@@ -39,9 +39,7 @@
+  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  * POSSIBILITY OF SUCH DAMAGES.
+  *
+- * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#66 $
+- *
+- * $FreeBSD$
++ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#78 $
+  */
+ 
+ #ifdef __linux__
+@@ -49,14 +47,13 @@
+ #include "aic7xxx_inline.h"
+ #include "aic7xxx_93cx6.h"
+ #else
++#include <sys/cdefs.h>
++__FBSDID("$FreeBSD$");
+ #include <dev/aic7xxx/aic7xxx_osm.h>
+ #include <dev/aic7xxx/aic7xxx_inline.h>
+ #include <dev/aic7xxx/aic7xxx_93cx6.h>
+ #endif
+ 
+-#define AHC_PCI_IOADDR	PCIR_MAPS	/* I/O Address */
+-#define AHC_PCI_MEMADDR	(PCIR_MAPS + 4)	/* Mem I/O Address */
+-
+ static __inline uint64_t
+ ahc_compose_id(u_int device, u_int vendor, u_int subdevice, u_int subvendor)
+ {
+@@ -76,7 +73,7 @@ ahc_compose_id(u_int device, u_int vendo
+ #define ID_9005_SISL_MASK		0x000FFFFF00000000ull
+ #define ID_9005_SISL_ID			0x0005900500000000ull
+ #define ID_AIC7850			0x5078900400000000ull
+-#define ID_AHA_2902_04_10_15_20_30C	0x5078900478509004ull
++#define ID_AHA_2902_04_10_15_20C_30C	0x5078900478509004ull
+ #define ID_AIC7855			0x5578900400000000ull
+ #define ID_AIC7859			0x3860900400000000ull
+ #define ID_AHA_2930CU			0x3860900438699004ull
+@@ -133,6 +130,7 @@ ahc_compose_id(u_int device, u_int vendo
+ #define ID_AHA_29160C			0x0080900562209005ull
+ #define ID_AHA_29160B			0x00809005E2209005ull
+ #define ID_AHA_19160B			0x0081900562A19005ull
++#define ID_AHA_2915_30LP		0x0082900502109005ull
+ 
+ #define ID_AIC7896			0x005F9005FFFF9005ull
+ #define ID_AIC7896_ARO			0x00539005FFFF9005ull
+@@ -245,9 +243,9 @@ struct ahc_pci_identity ahc_pci_ident_ta
+ {
+ 	/* aic7850 based controllers */
+ 	{
+-		ID_AHA_2902_04_10_15_20_30C,
++		ID_AHA_2902_04_10_15_20C_30C,
+ 		ID_ALL_MASK,
+-		"Adaptec 2902/04/10/15/20/30C SCSI adapter",
++		"Adaptec 2902/04/10/15/20C/30C SCSI adapter",
+ 		ahc_aic785X_setup
+ 	},
+ 	/* aic7860 based controllers */
+@@ -470,6 +468,12 @@ struct ahc_pci_identity ahc_pci_ident_ta
+ 		"Adaptec aic7892 Ultra160 SCSI adapter (ARO)",
+ 		ahc_aic7892_setup
+ 	},
++	{
++		ID_AHA_2915_30LP,
++		ID_ALL_MASK,
++		"Adaptec 2915/30LP Ultra160 SCSI adapter",
++		ahc_aic7892_setup
++	},
+ 	/* aic7895 based controllers */	
+ 	{
+ 		ID_AHA_2940U_DUAL,
+@@ -738,7 +742,7 @@ ahc_9005_subdevinfo_valid(uint16_t devic
+ }
+ 
+ struct ahc_pci_identity *
+-ahc_find_pci_device(ahc_dev_softc_t pci)
++ahc_find_pci_device(aic_dev_softc_t pci)
+ {
+ 	uint64_t  full_id;
+ 	uint16_t  device;
+@@ -748,10 +752,10 @@ ahc_find_pci_device(ahc_dev_softc_t pci)
+ 	struct	  ahc_pci_identity *entry;
+ 	u_int	  i;
+ 
+-	vendor = ahc_pci_read_config(pci, PCIR_DEVVENDOR, /*bytes*/2);
+-	device = ahc_pci_read_config(pci, PCIR_DEVICE, /*bytes*/2);
+-	subvendor = ahc_pci_read_config(pci, PCIR_SUBVEND_0, /*bytes*/2);
+-	subdevice = ahc_pci_read_config(pci, PCIR_SUBDEV_0, /*bytes*/2);
++	vendor = aic_pci_read_config(pci, PCIR_DEVVENDOR, /*bytes*/2);
++	device = aic_pci_read_config(pci, PCIR_DEVICE, /*bytes*/2);
++	subvendor = aic_pci_read_config(pci, PCIR_SUBVEND_0, /*bytes*/2);
++	subdevice = aic_pci_read_config(pci, PCIR_SUBDEV_0, /*bytes*/2);
+ 	full_id = ahc_compose_id(device, vendor, subdevice, subvendor);
+ 
+ 	/*
+@@ -761,7 +765,7 @@ ahc_find_pci_device(ahc_dev_softc_t pci)
+ 	 * to sanity check it prior to accepting the subdevice
+ 	 * ID as valid.
+ 	 */
+-	if (ahc_get_pci_function(pci) > 0
++	if (aic_get_pci_function(pci) > 0
+ 	 && ahc_9005_subdevinfo_valid(vendor, device, subvendor, subdevice)
+ 	 && SUBID_9005_MFUNCENB(subdevice) == 0)
+ 		return (NULL);
+@@ -798,7 +802,7 @@ ahc_pci_config(struct ahc_softc *ahc, st
+ 	ahc->chip |= AHC_PCI;
+ 	ahc->description = entry->name;
+ 
+-	ahc_power_state_change(ahc, AHC_POWER_STATE_D0);
++	aic_power_state_change(ahc, AIC_POWER_STATE_D0);
+ 
+ 	error = ahc_pci_map_registers(ahc);
+ 	if (error != 0)
+@@ -812,7 +816,7 @@ ahc_pci_config(struct ahc_softc *ahc, st
+ 	 */
+ 	ahc_intr_enable(ahc, FALSE);
+ 
+-	devconfig = ahc_pci_read_config(ahc->dev_softc, DEVCONFIG, /*bytes*/4);
++	devconfig = aic_pci_read_config(ahc->dev_softc, DEVCONFIG, /*bytes*/4);
+ 
+ 	/*
+ 	 * If we need to support high memory, enable dual
+@@ -831,13 +835,13 @@ ahc_pci_config(struct ahc_softc *ahc, st
+ 	/* Ensure that pci error generation, a test feature, is disabled. */
+ 	devconfig |= PCIERRGENDIS;
+ 
+-	ahc_pci_write_config(ahc->dev_softc, DEVCONFIG, devconfig, /*bytes*/4);
++	aic_pci_write_config(ahc->dev_softc, DEVCONFIG, devconfig, /*bytes*/4);
+ 
+ 	/* Ensure busmastering is enabled */
+-	command = ahc_pci_read_config(ahc->dev_softc, PCIR_COMMAND, /*bytes*/2);
++	command = aic_pci_read_config(ahc->dev_softc, PCIR_COMMAND, /*bytes*/2);
+ 	command |= PCIM_CMD_BUSMASTEREN;
+ 
+-	ahc_pci_write_config(ahc->dev_softc, PCIR_COMMAND, command, /*bytes*/2);
++	aic_pci_write_config(ahc->dev_softc, PCIR_COMMAND, command, /*bytes*/2);
+ 
+ 	/* On all PCI adapters, we allow SCB paging */
+ 	ahc->flags |= AHC_PAGESCBS;
+@@ -877,7 +881,7 @@ ahc_pci_config(struct ahc_softc *ahc, st
+ 		scsiseq = 0;
+ 	}
+ 
+-	error = ahc_reset(ahc);
++	error = ahc_reset(ahc, /*reinit*/FALSE);
+ 	if (error != 0)
+ 		return (ENXIO);
+ 
+@@ -920,14 +924,14 @@ ahc_pci_config(struct ahc_softc *ahc, st
+ 	ahc_outb(ahc, DSCOMMAND0, dscommand0);
+ 
+ 	ahc->pci_cachesize =
+-	    ahc_pci_read_config(ahc->dev_softc, CSIZE_LATTIME,
++	    aic_pci_read_config(ahc->dev_softc, CSIZE_LATTIME,
+ 				/*bytes*/1) & CACHESIZE;
+ 	ahc->pci_cachesize *= 4;
+ 
+ 	if ((ahc->bugs & AHC_PCI_2_1_RETRY_BUG) != 0
+ 	 && ahc->pci_cachesize == 4) {
+ 
+-		ahc_pci_write_config(ahc->dev_softc, CSIZE_LATTIME,
++		aic_pci_write_config(ahc->dev_softc, CSIZE_LATTIME,
+ 				     0, /*bytes*/1);
+ 		ahc->pci_cachesize = 0;
+ 	}
+@@ -939,7 +943,7 @@ ahc_pci_config(struct ahc_softc *ahc, st
+ 	if ((ahc->features & AHC_ULTRA) != 0) {
+ 		uint32_t devconfig;
+ 
+-		devconfig = ahc_pci_read_config(ahc->dev_softc,
++		devconfig = aic_pci_read_config(ahc->dev_softc,
+ 						DEVCONFIG, /*bytes*/4);
+ 		if ((devconfig & REXTVALID) == 0)
+ 			ahc->features &= ~AHC_ULTRA;
+@@ -1005,11 +1009,11 @@ ahc_pci_config(struct ahc_softc *ahc, st
+ 	 * that occur during runtime and resume events.
+ 	 */
+ 	ahc->bus_softc.pci_softc.devconfig =
+-	    ahc_pci_read_config(ahc->dev_softc, DEVCONFIG, /*bytes*/4);
++	    aic_pci_read_config(ahc->dev_softc, DEVCONFIG, /*bytes*/4);
+ 	ahc->bus_softc.pci_softc.command =
+-	    ahc_pci_read_config(ahc->dev_softc, PCIR_COMMAND, /*bytes*/1);
++	    aic_pci_read_config(ahc->dev_softc, PCIR_COMMAND, /*bytes*/1);
+ 	ahc->bus_softc.pci_softc.csize_lattime =
+-	    ahc_pci_read_config(ahc->dev_softc, CSIZE_LATTIME, /*bytes*/1);
++	    aic_pci_read_config(ahc->dev_softc, CSIZE_LATTIME, /*bytes*/1);
+ 	ahc->bus_softc.pci_softc.dscommand0 = ahc_inb(ahc, DSCOMMAND0);
+ 	ahc->bus_softc.pci_softc.dspcistatus = ahc_inb(ahc, DSPCISTATUS);
+ 	if ((ahc->features & AHC_DT) != 0) {
+@@ -1063,7 +1067,7 @@ ahc_ext_scbram_present(struct ahc_softc 
+ 	uint32_t devconfig;
+ 
+ 	chip = ahc->chip & AHC_CHIPID_MASK;
+-	devconfig = ahc_pci_read_config(ahc->dev_softc,
++	devconfig = aic_pci_read_config(ahc->dev_softc,
+ 					DEVCONFIG, /*bytes*/4);
+ 	single_user = (devconfig & MPORTMODE) != 0;
+ 
+@@ -1101,13 +1105,13 @@ ahc_scbram_config(struct ahc_softc *ahc,
+ 		 * Set the SCB Base addr (highest address bit)
+ 		 * depending on which channel we are.
+ 		 */
+-		ahc_outb(ahc, SCBBADDR, ahc_get_pci_function(ahc->dev_softc));
++		ahc_outb(ahc, SCBBADDR, aic_get_pci_function(ahc->dev_softc));
+ 	}
+ 
+ 	ahc->flags &= ~AHC_LSCBS_ENABLED;
+ 	if (large)
+ 		ahc->flags |= AHC_LSCBS_ENABLED;
+-	devconfig = ahc_pci_read_config(ahc->dev_softc, DEVCONFIG, /*bytes*/4);
++	devconfig = aic_pci_read_config(ahc->dev_softc, DEVCONFIG, /*bytes*/4);
+ 	if ((ahc->features & AHC_ULTRA2) != 0) {
+ 		u_int dscommand0;
+ 
+@@ -1140,7 +1144,7 @@ ahc_scbram_config(struct ahc_softc *ahc,
+ 	else
+ 		devconfig &= ~EXTSCBPEN;
+ 
+-	ahc_pci_write_config(ahc->dev_softc, DEVCONFIG, devconfig, /*bytes*/4);
++	aic_pci_write_config(ahc->dev_softc, DEVCONFIG, devconfig, /*bytes*/4);
+ }
+ 
+ /*
+@@ -1263,8 +1267,8 @@ ahc_pci_test_register_access(struct ahc_
+ 	 * Enable PCI error interrupt status, but suppress NMIs
+ 	 * generated by SERR raised due to target aborts.
+ 	 */
+-	cmd = ahc_pci_read_config(ahc->dev_softc, PCIR_COMMAND, /*bytes*/2);
+-	ahc_pci_write_config(ahc->dev_softc, PCIR_COMMAND,
++	cmd = aic_pci_read_config(ahc->dev_softc, PCIR_COMMAND, /*bytes*/2);
++	aic_pci_write_config(ahc->dev_softc, PCIR_COMMAND,
+ 			     cmd & ~PCIM_CMD_SERRESPEN, /*bytes*/2);
+ 
+ 	/*
+@@ -1276,26 +1280,46 @@ ahc_pci_test_register_access(struct ahc_
+ 	 * use for this test.
+ 	 */
+ 	hcntrl = ahc_inb(ahc, HCNTRL);
++
+ 	if (hcntrl == 0xFF)
+ 		goto fail;
+ 
++	if ((hcntrl & CHIPRST) != 0) {
++		/*
++		 * The chip has not been initialized since
++		 * PCI/EISA/VLB bus reset.  Don't trust
++		 * "left over BIOS data".
++		 */
++		ahc->flags |= AHC_NO_BIOS_INIT;
++	}
++
+ 	/*
+ 	 * Next create a situation where write combining
+ 	 * or read prefetching could be initiated by the
+ 	 * CPU or host bridge.  Our device does not support
+ 	 * either, so look for data corruption and/or flagged
+-	 * PCI errors.
++	 * PCI errors.  First pause without causing another
++	 * chip reset.
+ 	 */
++	hcntrl &= ~CHIPRST;
+ 	ahc_outb(ahc, HCNTRL, hcntrl|PAUSE);
+ 	while (ahc_is_paused(ahc) == 0)
+ 		;
++
++	/* Clear any PCI errors that occurred before our driver attached. */
++	status1 = aic_pci_read_config(ahc->dev_softc,
++				      PCIR_STATUS + 1, /*bytes*/1);
++	aic_pci_write_config(ahc->dev_softc, PCIR_STATUS + 1,
++			     status1, /*bytes*/1);
++	ahc_outb(ahc, CLRINT, CLRPARERR);
++
+ 	ahc_outb(ahc, SEQCTL, PERRORDIS);
+ 	ahc_outb(ahc, SCBPTR, 0);
+ 	ahc_outl(ahc, SCB_BASE, 0x5aa555aa);
+ 	if (ahc_inl(ahc, SCB_BASE) != 0x5aa555aa)
+ 		goto fail;
+ 
+-	status1 = ahc_pci_read_config(ahc->dev_softc,
++	status1 = aic_pci_read_config(ahc->dev_softc,
+ 				      PCIR_STATUS + 1, /*bytes*/1);
+ 	if ((status1 & STA) != 0)
+ 		goto fail;
+@@ -1304,13 +1328,13 @@ ahc_pci_test_register_access(struct ahc_
+ 
+ fail:
+ 	/* Silently clear any latched errors. */
+-	status1 = ahc_pci_read_config(ahc->dev_softc,
++	status1 = aic_pci_read_config(ahc->dev_softc,
+ 				      PCIR_STATUS + 1, /*bytes*/1);
+-	ahc_pci_write_config(ahc->dev_softc, PCIR_STATUS + 1,
++	aic_pci_write_config(ahc->dev_softc, PCIR_STATUS + 1,
+ 			     status1, /*bytes*/1);
+ 	ahc_outb(ahc, CLRINT, CLRPARERR);
+ 	ahc_outb(ahc, SEQCTL, PERRORDIS|FAILDIS);
+-	ahc_pci_write_config(ahc->dev_softc, PCIR_COMMAND, cmd, /*bytes*/2);
++	aic_pci_write_config(ahc->dev_softc, PCIR_COMMAND, cmd, /*bytes*/2);
+ 	return (error);
+ }
+ 
+@@ -1380,6 +1404,10 @@ check_extport(struct ahc_softc *ahc, u_i
+ 			sd.sd_chip = C56_66;
+ 		}
+ 		ahc_release_seeprom(&sd);
++
++		/* Remember the SEEPROM type for later */
++		if (sd.sd_chip == C56_66)
++			ahc->flags |= AHC_LARGE_SEEPROM;
+ 	}
+ 
+ 	if (!have_seeprom) {
+@@ -1565,12 +1593,12 @@ ahc_parse_pci_eeprom(struct ahc_softc *a
+ 		uint32_t devconfig;
+ 
+ 		/* Honor the STPWLEVEL settings */
+-		devconfig = ahc_pci_read_config(ahc->dev_softc,
++		devconfig = aic_pci_read_config(ahc->dev_softc,
+ 						DEVCONFIG, /*bytes*/4);
+ 		devconfig &= ~STPWLEVEL;
+ 		if ((sc->bios_control & CFSTPWLEVEL) != 0)
+ 			devconfig |= STPWLEVEL;
+-		ahc_pci_write_config(ahc->dev_softc, DEVCONFIG,
++		aic_pci_write_config(ahc->dev_softc, DEVCONFIG,
+ 				     devconfig, /*bytes*/4);
+ 	}
+ 	/* Set SCSICONF info */
+@@ -1883,10 +1911,10 @@ aic785X_cable_detect(struct ahc_softc *a
+ 	ahc_outb(ahc, SPIOCAP, spiocap);
+ 	ahc_outb(ahc, BRDCTL, BRDRW|BRDCS);
+ 	ahc_flush_device_writes(ahc);
+-	ahc_delay(500);
++	aic_delay(500);
+ 	ahc_outb(ahc, BRDCTL, 0);
+ 	ahc_flush_device_writes(ahc);
+-	ahc_delay(500);
++	aic_delay(500);
+ 	brdctl = ahc_inb(ahc, BRDCTL);
+ 	*internal50_present = (brdctl & BRDDAT5) ? 0 : 1;
+ 	*externalcable_present = (brdctl & BRDDAT6) ? 0 : 1;
+@@ -1912,7 +1940,7 @@ ahc_acquire_seeprom(struct ahc_softc *ah
+ 	SEEPROM_OUTB(sd, sd->sd_MS);
+ 	wait = 1000;  /* 1 second timeout in msec */
+ 	while (--wait && ((SEEPROM_STATUS_INB(sd) & sd->sd_RDY) == 0)) {
+-		ahc_delay(1000);  /* delay 1 msec */
++		aic_delay(1000);  /* delay 1 msec */
+ 	}
+ 	if ((SEEPROM_STATUS_INB(sd) & sd->sd_RDY) == 0) {
+ 		SEEPROM_OUTB(sd, 0); 
+@@ -1992,7 +2020,7 @@ ahc_pci_intr(struct ahc_softc *ahc)
+ 	if ((error & PCIERRSTAT) == 0)
+ 		return;
+ 
+-	status1 = ahc_pci_read_config(ahc->dev_softc,
++	status1 = aic_pci_read_config(ahc->dev_softc,
+ 				      PCIR_STATUS + 1, /*bytes*/1);
+ 
+ 	printf("%s: PCI error Interrupt at seqaddr = 0x%x\n",
+@@ -2022,7 +2050,7 @@ ahc_pci_intr(struct ahc_softc *ahc)
+ 	}
+ 
+ 	/* Clear latched errors. */
+-	ahc_pci_write_config(ahc->dev_softc, PCIR_STATUS + 1,
++	aic_pci_write_config(ahc->dev_softc, PCIR_STATUS + 1,
+ 			     status1, /*bytes*/1);
+ 
+ 	if ((status1 & (DPE|SSE|RMA|RTA|STA|DPR)) == 0) {
+@@ -2083,7 +2111,7 @@ static int
+ ahc_pci_resume(struct ahc_softc *ahc)
+ {
+ 
+-	ahc_power_state_change(ahc, AHC_POWER_STATE_D0);
++	aic_power_state_change(ahc, AIC_POWER_STATE_D0);
+ 
+ 	/*
+ 	 * We assume that the OS has restored our register
+@@ -2091,11 +2119,11 @@ ahc_pci_resume(struct ahc_softc *ahc)
+ 	 * that the OS doesn't know about and rely on our chip
+ 	 * reset handler to handle the rest.
+ 	 */
+-	ahc_pci_write_config(ahc->dev_softc, DEVCONFIG, /*bytes*/4,
++	aic_pci_write_config(ahc->dev_softc, DEVCONFIG, /*bytes*/4,
+ 			     ahc->bus_softc.pci_softc.devconfig);
+-	ahc_pci_write_config(ahc->dev_softc, PCIR_COMMAND, /*bytes*/1,
++	aic_pci_write_config(ahc->dev_softc, PCIR_COMMAND, /*bytes*/1,
+ 			     ahc->bus_softc.pci_softc.command);
+-	ahc_pci_write_config(ahc->dev_softc, CSIZE_LATTIME, /*bytes*/1,
++	aic_pci_write_config(ahc->dev_softc, CSIZE_LATTIME, /*bytes*/1,
+ 			     ahc->bus_softc.pci_softc.csize_lattime);
+ 	if ((ahc->flags & AHC_HAS_TERM_LOGIC) != 0) {
+ 		struct	seeprom_descriptor sd;
+@@ -2118,7 +2146,7 @@ ahc_pci_resume(struct ahc_softc *ahc)
+ static int
+ ahc_aic785X_setup(struct ahc_softc *ahc)
+ {
+-	ahc_dev_softc_t pci;
++	aic_dev_softc_t pci;
+ 	uint8_t rev;
+ 
+ 	pci = ahc->dev_softc;
+@@ -2126,7 +2154,7 @@ ahc_aic785X_setup(struct ahc_softc *ahc)
+ 	ahc->chip = AHC_AIC7850;
+ 	ahc->features = AHC_AIC7850_FE;
+ 	ahc->bugs |= AHC_TMODE_WIDEODD_BUG|AHC_CACHETHEN_BUG|AHC_PCI_MWI_BUG;
+-	rev = ahc_pci_read_config(pci, PCIR_REVID, /*bytes*/1);
++	rev = aic_pci_read_config(pci, PCIR_REVID, /*bytes*/1);
+ 	if (rev >= 1)
+ 		ahc->bugs |= AHC_PCI_2_1_RETRY_BUG;
+ 	ahc->instruction_ram_size = 512;
+@@ -2136,7 +2164,7 @@ ahc_aic785X_setup(struct ahc_softc *ahc)
+ static int
+ ahc_aic7860_setup(struct ahc_softc *ahc)
+ {
+-	ahc_dev_softc_t pci;
++	aic_dev_softc_t pci;
+ 	uint8_t rev;
+ 
+ 	pci = ahc->dev_softc;
+@@ -2144,7 +2172,7 @@ ahc_aic7860_setup(struct ahc_softc *ahc)
+ 	ahc->chip = AHC_AIC7860;
+ 	ahc->features = AHC_AIC7860_FE;
+ 	ahc->bugs |= AHC_TMODE_WIDEODD_BUG|AHC_CACHETHEN_BUG|AHC_PCI_MWI_BUG;
+-	rev = ahc_pci_read_config(pci, PCIR_REVID, /*bytes*/1);
++	rev = aic_pci_read_config(pci, PCIR_REVID, /*bytes*/1);
+ 	if (rev >= 1)
+ 		ahc->bugs |= AHC_PCI_2_1_RETRY_BUG;
+ 	ahc->instruction_ram_size = 512;
+@@ -2211,7 +2239,7 @@ ahc_aha494X_setup(struct ahc_softc *ahc)
+ static int
+ ahc_aic7880_setup(struct ahc_softc *ahc)
+ {
+-	ahc_dev_softc_t pci;
++	aic_dev_softc_t pci;
+ 	uint8_t rev;
+ 
+ 	pci = ahc->dev_softc;
+@@ -2219,7 +2247,7 @@ ahc_aic7880_setup(struct ahc_softc *ahc)
+ 	ahc->chip = AHC_AIC7880;
+ 	ahc->features = AHC_AIC7880_FE;
+ 	ahc->bugs |= AHC_TMODE_WIDEODD_BUG;
+-	rev = ahc_pci_read_config(pci, PCIR_REVID, /*bytes*/1);
++	rev = aic_pci_read_config(pci, PCIR_REVID, /*bytes*/1);
+ 	if (rev >= 1) {
+ 		ahc->bugs |= AHC_PCI_2_1_RETRY_BUG;
+ 	} else {
+@@ -2262,7 +2290,7 @@ ahc_aha398XU_setup(struct ahc_softc *ahc
+ static int
+ ahc_aic7890_setup(struct ahc_softc *ahc)
+ {
+-	ahc_dev_softc_t pci;
++	aic_dev_softc_t pci;
+ 	uint8_t rev;
+ 
+ 	pci = ahc->dev_softc;
+@@ -2270,7 +2298,7 @@ ahc_aic7890_setup(struct ahc_softc *ahc)
+ 	ahc->chip = AHC_AIC7890;
+ 	ahc->features = AHC_AIC7890_FE;
+ 	ahc->flags |= AHC_NEWEEPROM_FMT;
+-	rev = ahc_pci_read_config(pci, PCIR_REVID, /*bytes*/1);
++	rev = aic_pci_read_config(pci, PCIR_REVID, /*bytes*/1);
+ 	if (rev == 0)
+ 		ahc->bugs |= AHC_AUTOFLUSH_BUG|AHC_CACHETHEN_BUG;
+ 	ahc->instruction_ram_size = 768;
+@@ -2293,15 +2321,15 @@ ahc_aic7892_setup(struct ahc_softc *ahc)
+ static int
+ ahc_aic7895_setup(struct ahc_softc *ahc)
+ {
+-	ahc_dev_softc_t pci;
++	aic_dev_softc_t pci;
+ 	uint8_t rev;
+ 
+ 	pci = ahc->dev_softc;
+-	ahc->channel = ahc_get_pci_function(pci) == 1 ? 'B' : 'A';
++	ahc->channel = aic_get_pci_function(pci) == 1 ? 'B' : 'A';
+ 	/*
+ 	 * The 'C' revision of the aic7895 has a few additional features.
+ 	 */
+-	rev = ahc_pci_read_config(pci, PCIR_REVID, /*bytes*/1);
++	rev = aic_pci_read_config(pci, PCIR_REVID, /*bytes*/1);
+ 	if (rev >= 4) {
+ 		ahc->chip = AHC_AIC7895C;
+ 		ahc->features = AHC_AIC7895C_FE;
+@@ -2317,9 +2345,9 @@ ahc_aic7895_setup(struct ahc_softc *ahc)
+ 		 * we have.  Disabling MWI reduces performance, so
+ 		 * turn it on again.
+ 		 */
+-		command = ahc_pci_read_config(pci, PCIR_COMMAND, /*bytes*/1);
++		command = aic_pci_read_config(pci, PCIR_COMMAND, /*bytes*/1);
+ 		command |= PCIM_CMD_MWRICEN;
+-		ahc_pci_write_config(pci, PCIR_COMMAND, command, /*bytes*/1);
++		aic_pci_write_config(pci, PCIR_COMMAND, command, /*bytes*/1);
+ 		ahc->bugs |= AHC_PCI_MWI_BUG;
+ 	}
+ 	/*
+@@ -2336,10 +2364,10 @@ ahc_aic7895_setup(struct ahc_softc *ahc)
+ 	 * Cachesize must also be zero due to stray DAC
+ 	 * problem when sitting behind some bridges.
+ 	 */
+-	ahc_pci_write_config(pci, CSIZE_LATTIME, 0, /*bytes*/1);
+-	devconfig = ahc_pci_read_config(pci, DEVCONFIG, /*bytes*/1);
++	aic_pci_write_config(pci, CSIZE_LATTIME, 0, /*bytes*/1);
++	devconfig = aic_pci_read_config(pci, DEVCONFIG, /*bytes*/1);
+ 	devconfig |= MRDCEN;
+-	ahc_pci_write_config(pci, DEVCONFIG, devconfig, /*bytes*/1);
++	aic_pci_write_config(pci, DEVCONFIG, devconfig, /*bytes*/1);
+ #endif
+ 	ahc->flags |= AHC_NEWEEPROM_FMT;
+ 	ahc->instruction_ram_size = 512;
+@@ -2349,10 +2377,10 @@ ahc_aic7895_setup(struct ahc_softc *ahc)
+ static int
+ ahc_aic7896_setup(struct ahc_softc *ahc)
+ {
+-	ahc_dev_softc_t pci;
++	aic_dev_softc_t pci;
+ 
+ 	pci = ahc->dev_softc;
+-	ahc->channel = ahc_get_pci_function(pci) == 1 ? 'B' : 'A';
++	ahc->channel = aic_get_pci_function(pci) == 1 ? 'B' : 'A';
+ 	ahc->chip = AHC_AIC7896;
+ 	ahc->features = AHC_AIC7896_FE;
+ 	ahc->flags |= AHC_NEWEEPROM_FMT;
+@@ -2364,10 +2392,10 @@ ahc_aic7896_setup(struct ahc_softc *ahc)
+ static int
+ ahc_aic7899_setup(struct ahc_softc *ahc)
+ {
+-	ahc_dev_softc_t pci;
++	aic_dev_softc_t pci;
+ 
+ 	pci = ahc->dev_softc;
+-	ahc->channel = ahc_get_pci_function(pci) == 1 ? 'B' : 'A';
++	ahc->channel = aic_get_pci_function(pci) == 1 ? 'B' : 'A';
+ 	ahc->chip = AHC_AIC7899;
+ 	ahc->features = AHC_AIC7899_FE;
+ 	ahc->flags |= AHC_NEWEEPROM_FMT;
+@@ -2398,10 +2426,10 @@ ahc_raid_setup(struct ahc_softc *ahc)
+ static int
+ ahc_aha394XX_setup(struct ahc_softc *ahc)
+ {
+-	ahc_dev_softc_t pci;
++	aic_dev_softc_t pci;
+ 
+ 	pci = ahc->dev_softc;
+-	switch (ahc_get_pci_slot(pci)) {
++	switch (aic_get_pci_slot(pci)) {
+ 	case AHC_394X_SLOT_CHANNEL_A:
+ 		ahc->channel = 'A';
+ 		break;
+@@ -2411,7 +2439,7 @@ ahc_aha394XX_setup(struct ahc_softc *ahc
+ 	default:
+ 		printf("adapter at unexpected slot %d\n"
+ 		       "unable to map to a channel\n",
+-		       ahc_get_pci_slot(pci));
++		       aic_get_pci_slot(pci));
+ 		ahc->channel = 'A';
+ 	}
+ 	return (0);
+@@ -2420,10 +2448,10 @@ ahc_aha394XX_setup(struct ahc_softc *ahc
+ static int
+ ahc_aha398XX_setup(struct ahc_softc *ahc)
+ {
+-	ahc_dev_softc_t pci;
++	aic_dev_softc_t pci;
+ 
+ 	pci = ahc->dev_softc;
+-	switch (ahc_get_pci_slot(pci)) {
++	switch (aic_get_pci_slot(pci)) {
+ 	case AHC_398X_SLOT_CHANNEL_A:
+ 		ahc->channel = 'A';
+ 		break;
+@@ -2436,7 +2464,7 @@ ahc_aha398XX_setup(struct ahc_softc *ahc
+ 	default:
+ 		printf("adapter at unexpected slot %d\n"
+ 		       "unable to map to a channel\n",
+-		       ahc_get_pci_slot(pci));
++		       aic_get_pci_slot(pci));
+ 		ahc->channel = 'A';
+ 		break;
+ 	}
+@@ -2447,10 +2475,10 @@ ahc_aha398XX_setup(struct ahc_softc *ahc
+ static int
+ ahc_aha494XX_setup(struct ahc_softc *ahc)
+ {
+-	ahc_dev_softc_t pci;
++	aic_dev_softc_t pci;
+ 
+ 	pci = ahc->dev_softc;
+-	switch (ahc_get_pci_slot(pci)) {
++	switch (aic_get_pci_slot(pci)) {
+ 	case AHC_494X_SLOT_CHANNEL_A:
+ 		ahc->channel = 'A';
+ 		break;
+@@ -2466,7 +2494,7 @@ ahc_aha494XX_setup(struct ahc_softc *ahc
+ 	default:
+ 		printf("adapter at unexpected slot %d\n"
+ 		       "unable to map to a channel\n",
+-		       ahc_get_pci_slot(pci));
++		       aic_get_pci_slot(pci));
+ 		ahc->channel = 'A';
+ 	}
+ 	ahc->flags |= AHC_LARGE_SEEPROM;
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic7xxx_proc.c	2003-06-14 12:17:56.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aic7xxx_proc.c	2003-12-28 23:21:40.000000000 -0800
+@@ -37,7 +37,7 @@
+  * String handling code courtesy of Gerard Roudier's <groudier@club-internet.fr>
+  * sym driver.
+  *
+- * $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"
+@@ -50,7 +50,7 @@ static void	ahc_dump_target_state(struct
+ 				      u_int our_id, char channel,
+ 				      u_int target_id, u_int target_offset);
+ static void	ahc_dump_device_state(struct info_str *info,
+-				      struct ahc_linux_device *dev);
++				      struct aic_linux_device *dev);
+ static int	ahc_proc_write_seeprom(struct ahc_softc *ahc,
+ 				       char *buffer, int length);
+ 
+@@ -141,7 +141,7 @@ ahc_dump_target_state(struct ahc_softc *
+ 		      u_int our_id, char channel, u_int target_id,
+ 		      u_int target_offset)
+ {
+-	struct	ahc_linux_target *targ;
++	struct	aic_linux_target *targ;
+ 	struct	ahc_initiator_tinfo *tinfo;
+ 	struct	ahc_tmode_tstate *tstate;
+ 	int	lun;
+@@ -163,7 +163,7 @@ ahc_dump_target_state(struct ahc_softc *
+ 	ahc_format_transinfo(info, &tinfo->curr);
+ 
+ 	for (lun = 0; lun < AHC_NUM_LUNS; lun++) {
+-		struct ahc_linux_device *dev;
++		struct aic_linux_device *dev;
+ 
+ 		dev = targ->devices[lun];
+ 
+@@ -175,7 +175,7 @@ ahc_dump_target_state(struct ahc_softc *
+ }
+ 
+ static void
+-ahc_dump_device_state(struct info_str *info, struct ahc_linux_device *dev)
++ahc_dump_device_state(struct info_str *info, struct aic_linux_device *dev)
+ {
+ 	copy_info(info, "\tChannel %c Target %d Lun %d Settings\n",
+ 		  dev->target->channel + 'A', dev->target->target, dev->lun);
+@@ -204,7 +204,8 @@ ahc_proc_write_seeprom(struct ahc_softc 
+ 		ahc_pause(ahc);
+ 
+ 	if (length != sizeof(struct seeprom_config)) {
+-		printf("ahc_proc_write_seeprom: incorrect buffer size\n");
++		printf("ahc_proc_write_seeprom: incorrect buffer size %d\n",
++		       length);
+ 		goto done;
+ 	}
+ 
+@@ -215,7 +216,7 @@ ahc_proc_write_seeprom(struct ahc_softc 
+ 	}
+ 
+ 	sd.sd_ahc = ahc;
+-#if AHC_PCI_CONFIG > 0
++#if AIC_PCI_CONFIG > 0
+ 	if ((ahc->chip & AHC_PCI) != 0) {
+ 		sd.sd_control_offset = SEECTL;
+ 		sd.sd_status_offset = SEECTL;
+@@ -271,7 +272,7 @@ ahc_proc_write_seeprom(struct ahc_softc 
+ 				  sizeof(struct seeprom_config)/2);
+ 		ahc_read_seeprom(&sd, (uint16_t *)ahc->seep_config,
+ 				 start_addr, sizeof(struct seeprom_config)/2);
+-#if AHC_PCI_CONFIG > 0
++#if AIC_PCI_CONFIG > 0
+ 		if ((ahc->chip & AHC_VL) == 0)
+ 			ahc_release_seeprom(&sd);
+ #endif
+@@ -289,8 +290,13 @@ done:
+  * Return information to handle /proc support for the driver.
+  */
+ int
+-ahc_linux_proc_info(struct Scsi_Host *shost, char *buffer, char **start, off_t offset,
+-		  int length, int inout)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
++ahc_linux_proc_info(char *buffer, char **start, off_t offset,
++		    int length, int hostno, int inout)
++#else
++ahc_linux_proc_info(struct Scsi_Host *shost, char *buffer, char **start,
++		    off_t offset, int length, int inout)
++#endif
+ {
+ 	struct	ahc_softc *ahc;
+ 	struct	info_str info;
+@@ -302,10 +308,14 @@ ahc_linux_proc_info(struct Scsi_Host *sh
+ 
+ 	retval = -EINVAL;
+ 	ahc_list_lock(&s);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ 	TAILQ_FOREACH(ahc, &ahc_tailq, links) {
+-		if (ahc->platform_data->host == shost)
++		if (ahc->platform_data->host->host_no == hostno)
+ 			break;
+ 	}
++#else
++	ahc = ahc_find_softc(*(struct ahc_softc **)shost->hostdata);
++#endif
+ 
+ 	if (ahc == NULL)
+ 		goto done;
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic7xxx.reg	2003-06-14 12:18:51.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aic7xxx.reg	2003-12-28 23:21:40.000000000 -0800
+@@ -39,7 +39,7 @@
+  *
+  * $FreeBSD$
+  */
+-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
+@@ -1306,7 +1306,6 @@ scratch_ram {
+ 	 */
+ 	MWI_RESIDUAL {
+ 		size		1
+-		alias	TARG_IMMEDIATE_SCB
+ 	}
+ 	/*
+ 	 * SCBID of the next SCB to be started by the controller.
+@@ -1461,6 +1460,7 @@ scratch_ram {
+ 	 */
+ 	LAST_MSG {
+ 		size		1
++		alias	TARG_IMMEDIATE_SCB
+ 	}
+ 
+ 	/*
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic7xxx_reg.h_shipped	2003-06-14 12:18:24.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aic7xxx_reg.h_shipped	2003-12-28 23:21:40.000000000 -0800
+@@ -2,8 +2,8 @@
+  * DO NOT EDIT - This file is automatically generated
+  *		 from the following source files:
+  *
+- * $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 {
+@@ -1298,7 +1298,6 @@ ahc_reg_print_t ahc_sg_cache_pre_print;
+ #define	CMDSIZE_TABLE_TAIL		0x34
+ 
+ #define	MWI_RESIDUAL    		0x38
+-#define	TARG_IMMEDIATE_SCB		0x38
+ 
+ #define	NEXT_QUEUED_SCB 		0x39
+ 
+@@ -1380,6 +1379,7 @@ ahc_reg_print_t ahc_sg_cache_pre_print;
+ #define	RETURN_2        		0x52
+ 
+ #define	LAST_MSG        		0x53
++#define	TARG_IMMEDIATE_SCB		0x53
+ 
+ #define	SCSISEQ_TEMPLATE		0x54
+ #define		ENSELO          	0x40
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic7xxx_reg_print.c_shipped	2003-06-14 12:18:22.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aic7xxx_reg_print.c_shipped	2003-12-28 23:21:40.000000000 -0800
+@@ -2,8 +2,8 @@
+  * DO NOT EDIT - This file is automatically generated
+  *		 from the following source files:
+  *
+- * $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"
+@@ -747,13 +747,6 @@ ahc_scsiseq_template_print(u_int regvalu
+ 	    0x54, regvalue, cur_col, wrap));
+ }
+ 
+-int
+-ahc_data_count_odd_print(u_int regvalue, u_int *cur_col, u_int wrap)
+-{
+-	return (ahc_print_register(NULL, 0, "DATA_COUNT_ODD",
+-	    0x55, regvalue, cur_col, wrap));
+-}
+-
+ static ahc_reg_parse_entry_t HA_274_BIOSGLOBAL_parse_table[] = {
+ 	{ "HA_274_EXTENDED_TRANS",0x01, 0x01 }
+ };
+@@ -1416,13 +1409,14 @@ ahc_scb_scsiid_print(u_int regvalue, u_i
+ }
+ 
+ static ahc_reg_parse_entry_t SCB_LUN_parse_table[] = {
+-	{ "LID",		0xff, 0xff }
++	{ "SCB_XFERLEN_ODD",	0x80, 0x80 },
++	{ "LID",		0x3f, 0x3f }
+ };
+ 
+ int
+ ahc_scb_lun_print(u_int regvalue, u_int *cur_col, u_int wrap)
+ {
+-	return (ahc_print_register(SCB_LUN_parse_table, 1, "SCB_LUN",
++	return (ahc_print_register(SCB_LUN_parse_table, 2, "SCB_LUN",
+ 	    0xba, regvalue, cur_col, wrap));
+ }
+ 
+@@ -1662,28 +1656,26 @@ ahc_dff_thrsh_print(u_int regvalue, u_in
+ static ahc_reg_parse_entry_t SG_CACHE_SHADOW_parse_table[] = {
+ 	{ "LAST_SEG_DONE",	0x01, 0x01 },
+ 	{ "LAST_SEG",		0x02, 0x02 },
+-	{ "ODD_SEG",		0x04, 0x04 },
+ 	{ "SG_ADDR_MASK",	0xf8, 0xf8 }
+ };
+ 
+ int
+ ahc_sg_cache_shadow_print(u_int regvalue, u_int *cur_col, u_int wrap)
+ {
+-	return (ahc_print_register(SG_CACHE_SHADOW_parse_table, 4, "SG_CACHE_SHADOW",
++	return (ahc_print_register(SG_CACHE_SHADOW_parse_table, 3, "SG_CACHE_SHADOW",
+ 	    0xfc, regvalue, cur_col, wrap));
+ }
+ 
+ static ahc_reg_parse_entry_t SG_CACHE_PRE_parse_table[] = {
+ 	{ "LAST_SEG_DONE",	0x01, 0x01 },
+ 	{ "LAST_SEG",		0x02, 0x02 },
+-	{ "ODD_SEG",		0x04, 0x04 },
+ 	{ "SG_ADDR_MASK",	0xf8, 0xf8 }
+ };
+ 
+ int
+ ahc_sg_cache_pre_print(u_int regvalue, u_int *cur_col, u_int wrap)
+ {
+-	return (ahc_print_register(SG_CACHE_PRE_parse_table, 4, "SG_CACHE_PRE",
++	return (ahc_print_register(SG_CACHE_PRE_parse_table, 3, "SG_CACHE_PRE",
+ 	    0xfc, regvalue, cur_col, wrap));
+ }
+ 
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic7xxx.seq	2003-06-14 12:18:30.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aic7xxx.seq	2003-12-28 23:21:40.000000000 -0800
+@@ -40,7 +40,7 @@
+  * $FreeBSD$
+  */
+ 
+-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_"
+ 
+@@ -679,6 +679,7 @@ await_busfree:
+ 		clr	SCSIBUSL;	/* Prevent bit leakage durint SELTO */
+ 	}
+ 	and	SXFRCTL0, ~SPIOEN;
++	mvi	SEQ_FLAGS, NOT_IDENTIFIED|NO_CDB_SENT;
+ 	test	SSTAT1,REQINIT|BUSFREE	jz .;
+ 	test	SSTAT1, BUSFREE jnz poll_for_work;
+ 	mvi	MISSED_BUSFREE call set_seqint;
+@@ -1097,7 +1098,7 @@ ultra2_dmahalt:
+ 		test	SCB_RESIDUAL_DATACNT[3], SG_LAST_SEG jz dma_mid_sg;
+ 		if ((ahc->flags & AHC_TARGETROLE) != 0) {
+ 			test	SSTAT0, TARGET jz dma_last_sg;
+-			if ((ahc->flags & AHC_TMODE_WIDEODD_BUG) != 0) {
++			if ((ahc->bugs & AHC_TMODE_WIDEODD_BUG) != 0) {
+ 				test	DMAPARAMS, DIRECTION jz dma_mid_sg;
+ 			}
+ 		}
+--- linux-2.6.0/drivers/scsi/aic7xxx/aic7xxx_seq.h_shipped	2003-06-14 12:18:52.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aic7xxx_seq.h_shipped	2003-12-28 23:21:40.000000000 -0800
+@@ -2,13 +2,13 @@
+  * DO NOT EDIT - This file is automatically generated
+  *		 from the following source files:
+  *
+- * $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,
+ 	0xf7, 0x11, 0x22, 0x08,
+-	0x00, 0x65, 0xec, 0x59,
++	0x00, 0x65, 0xee, 0x59,
+ 	0xf7, 0x01, 0x02, 0x08,
+ 	0xff, 0x6a, 0x24, 0x08,
+ 	0x40, 0x00, 0x40, 0x68,
+@@ -21,15 +21,15 @@ static uint8_t seqprog[] = {
+ 	0x01, 0x4d, 0xc8, 0x30,
+ 	0x00, 0x4c, 0x12, 0x70,
+ 	0x01, 0x39, 0xa2, 0x30,
+-	0x00, 0x6a, 0xc0, 0x5e,
++	0x00, 0x6a, 0xc2, 0x5e,
+ 	0x01, 0x51, 0x20, 0x31,
+ 	0x01, 0x57, 0xae, 0x00,
+ 	0x0d, 0x6a, 0x76, 0x00,
+-	0x00, 0x51, 0x12, 0x5e,
++	0x00, 0x51, 0x14, 0x5e,
+ 	0x01, 0x51, 0xc8, 0x30,
+ 	0x00, 0x39, 0xc8, 0x60,
+ 	0x00, 0xbb, 0x30, 0x70,
+-	0xc1, 0x6a, 0xd8, 0x5e,
++	0xc1, 0x6a, 0xda, 0x5e,
+ 	0x01, 0xbf, 0x72, 0x30,
+ 	0x01, 0x40, 0x7e, 0x31,
+ 	0x01, 0x90, 0x80, 0x30,
+@@ -49,10 +49,10 @@ static uint8_t seqprog[] = {
+ 	0x08, 0x6a, 0x78, 0x00,
+ 	0x01, 0x50, 0xc8, 0x30,
+ 	0xe0, 0x6a, 0xcc, 0x00,
+-	0x48, 0x6a, 0xfc, 0x5d,
++	0x48, 0x6a, 0xfe, 0x5d,
+ 	0x01, 0x6a, 0xdc, 0x01,
+ 	0x88, 0x6a, 0xcc, 0x00,
+-	0x48, 0x6a, 0xfc, 0x5d,
++	0x48, 0x6a, 0xfe, 0x5d,
+ 	0x01, 0x6a, 0x26, 0x01,
+ 	0xf0, 0x19, 0x7a, 0x08,
+ 	0x0f, 0x18, 0xc8, 0x08,
+@@ -93,7 +93,7 @@ static uint8_t seqprog[] = {
+ 	0x00, 0x65, 0x20, 0x41,
+ 	0x02, 0x57, 0xae, 0x00,
+ 	0x00, 0x65, 0x9e, 0x40,
+-	0x61, 0x6a, 0xd8, 0x5e,
++	0x61, 0x6a, 0xda, 0x5e,
+ 	0x08, 0x51, 0x20, 0x71,
+ 	0x02, 0x0b, 0xb2, 0x78,
+ 	0x00, 0x65, 0xae, 0x40,
+@@ -106,7 +106,7 @@ static uint8_t seqprog[] = {
+ 	0x80, 0x3d, 0x7a, 0x00,
+ 	0x20, 0x6a, 0x16, 0x00,
+ 	0x00, 0x65, 0xcc, 0x41,
+-	0x00, 0x65, 0xb2, 0x5e,
++	0x00, 0x65, 0xb4, 0x5e,
+ 	0x00, 0x65, 0x12, 0x40,
+ 	0x20, 0x11, 0xd2, 0x68,
+ 	0x20, 0x6a, 0x18, 0x00,
+@@ -140,27 +140,27 @@ static uint8_t seqprog[] = {
+ 	0x80, 0x0b, 0xc4, 0x79,
+ 	0x12, 0x01, 0x02, 0x00,
+ 	0x01, 0xab, 0xac, 0x30,
+-	0xe4, 0x6a, 0x6e, 0x5d,
++	0xe4, 0x6a, 0x70, 0x5d,
+ 	0x40, 0x6a, 0x16, 0x00,
+-	0x80, 0x3e, 0x84, 0x5d,
++	0x80, 0x3e, 0x86, 0x5d,
+ 	0x20, 0xb8, 0x18, 0x79,
+-	0x20, 0x6a, 0x84, 0x5d,
+-	0x00, 0xab, 0x84, 0x5d,
++	0x20, 0x6a, 0x86, 0x5d,
++	0x00, 0xab, 0x86, 0x5d,
+ 	0x01, 0xa9, 0x78, 0x30,
+ 	0x10, 0xb8, 0x20, 0x79,
+-	0xe4, 0x6a, 0x6e, 0x5d,
++	0xe4, 0x6a, 0x70, 0x5d,
+ 	0x00, 0x65, 0xae, 0x40,
+ 	0x10, 0x03, 0x3c, 0x69,
+ 	0x08, 0x3c, 0x5a, 0x69,
+ 	0x04, 0x3c, 0x92, 0x69,
+ 	0x02, 0x3c, 0x98, 0x69,
+ 	0x01, 0x3c, 0x44, 0x79,
+-	0xff, 0x6a, 0x70, 0x00,
++	0xff, 0x6a, 0xa6, 0x00,
+ 	0x00, 0x65, 0xa4, 0x59,
+-	0x00, 0x6a, 0xc0, 0x5e,
+-	0xff, 0x38, 0x30, 0x71,
++	0x00, 0x6a, 0xc2, 0x5e,
++	0xff, 0x53, 0x30, 0x71,
+ 	0x0d, 0x6a, 0x76, 0x00,
+-	0x00, 0x38, 0x12, 0x5e,
++	0x00, 0x53, 0x14, 0x5e,
+ 	0x00, 0x65, 0xea, 0x58,
+ 	0x12, 0x01, 0x02, 0x00,
+ 	0x00, 0x65, 0x18, 0x41,
+@@ -168,10 +168,10 @@ static uint8_t seqprog[] = {
+ 	0x00, 0x65, 0xf2, 0x58,
+ 	0xfd, 0x57, 0xae, 0x08,
+ 	0x00, 0x65, 0xae, 0x40,
+-	0xe4, 0x6a, 0x6e, 0x5d,
++	0xe4, 0x6a, 0x70, 0x5d,
+ 	0x20, 0x3c, 0x4a, 0x79,
+-	0x02, 0x6a, 0x84, 0x5d,
+-	0x04, 0x6a, 0x84, 0x5d,
++	0x02, 0x6a, 0x86, 0x5d,
++	0x04, 0x6a, 0x86, 0x5d,
+ 	0x01, 0x03, 0x4c, 0x69,
+ 	0xf7, 0x11, 0x22, 0x08,
+ 	0xff, 0x6a, 0x24, 0x08,
+@@ -182,13 +182,13 @@ static uint8_t seqprog[] = {
+ 	0x80, 0x86, 0xc8, 0x08,
+ 	0x01, 0x4f, 0xc8, 0x30,
+ 	0x00, 0x50, 0x6c, 0x61,
+-	0xc4, 0x6a, 0x6e, 0x5d,
++	0xc4, 0x6a, 0x70, 0x5d,
+ 	0x40, 0x3c, 0x68, 0x79,
+-	0x28, 0x6a, 0x84, 0x5d,
++	0x28, 0x6a, 0x86, 0x5d,
+ 	0x00, 0x65, 0x4c, 0x41,
+-	0x08, 0x6a, 0x84, 0x5d,
++	0x08, 0x6a, 0x86, 0x5d,
+ 	0x00, 0x65, 0x4c, 0x41,
+-	0x84, 0x6a, 0x6e, 0x5d,
++	0x84, 0x6a, 0x70, 0x5d,
+ 	0x00, 0x65, 0xf2, 0x58,
+ 	0x01, 0x66, 0xc8, 0x30,
+ 	0x01, 0x64, 0xd8, 0x31,
+@@ -208,16 +208,16 @@ static uint8_t seqprog[] = {
+ 	0xf7, 0x3c, 0x78, 0x08,
+ 	0x00, 0x65, 0x20, 0x41,
+ 	0x40, 0xaa, 0x7e, 0x10,
+-	0x04, 0xaa, 0x6e, 0x5d,
+-	0x00, 0x65, 0x56, 0x42,
+-	0xc4, 0x6a, 0x6e, 0x5d,
++	0x04, 0xaa, 0x70, 0x5d,
++	0x00, 0x65, 0x58, 0x42,
++	0xc4, 0x6a, 0x70, 0x5d,
+ 	0xc0, 0x6a, 0x7e, 0x00,
+-	0x00, 0xa8, 0x84, 0x5d,
++	0x00, 0xa8, 0x86, 0x5d,
+ 	0xe4, 0x6a, 0x06, 0x00,
+-	0x00, 0x6a, 0x84, 0x5d,
++	0x00, 0x6a, 0x86, 0x5d,
+ 	0x00, 0x65, 0x4c, 0x41,
+ 	0x10, 0x3c, 0xa8, 0x69,
+-	0x00, 0xbb, 0x8a, 0x44,
++	0x00, 0xbb, 0x8c, 0x44,
+ 	0x18, 0x6a, 0xda, 0x01,
+ 	0x01, 0x69, 0xd8, 0x31,
+ 	0x1c, 0x6a, 0xd0, 0x01,
+@@ -227,31 +227,32 @@ static uint8_t seqprog[] = {
+ 	0x01, 0x93, 0x26, 0x01,
+ 	0x03, 0x6a, 0x2a, 0x01,
+ 	0x01, 0x69, 0x32, 0x31,
+-	0x1c, 0x6a, 0xe0, 0x5d,
++	0x1c, 0x6a, 0xe2, 0x5d,
+ 	0x0a, 0x93, 0x26, 0x01,
+-	0x00, 0x65, 0xa8, 0x5e,
++	0x00, 0x65, 0xaa, 0x5e,
+ 	0x01, 0x50, 0xa0, 0x18,
+ 	0x02, 0x6a, 0x22, 0x05,
+ 	0x1a, 0x01, 0x02, 0x00,
+ 	0x80, 0x6a, 0x74, 0x00,
+ 	0x40, 0x6a, 0x78, 0x00,
+ 	0x40, 0x6a, 0x16, 0x00,
+-	0x00, 0x65, 0xd8, 0x5d,
++	0x00, 0x65, 0xda, 0x5d,
+ 	0x01, 0x3f, 0xc8, 0x30,
+-	0xbf, 0x64, 0x56, 0x7a,
+-	0x80, 0x64, 0x9e, 0x73,
+-	0xa0, 0x64, 0x00, 0x74,
+-	0xc0, 0x64, 0xf4, 0x73,
+-	0xe0, 0x64, 0x30, 0x74,
+-	0x01, 0x6a, 0xd8, 0x5e,
++	0xbf, 0x64, 0x58, 0x7a,
++	0x80, 0x64, 0xa0, 0x73,
++	0xa0, 0x64, 0x02, 0x74,
++	0xc0, 0x64, 0xf6, 0x73,
++	0xe0, 0x64, 0x32, 0x74,
++	0x01, 0x6a, 0xda, 0x5e,
+ 	0x00, 0x65, 0xcc, 0x41,
+ 	0xf7, 0x11, 0x22, 0x08,
+ 	0x01, 0x06, 0xd4, 0x30,
+ 	0xff, 0x6a, 0x24, 0x08,
+ 	0xf7, 0x01, 0x02, 0x08,
+-	0x09, 0x0c, 0xe6, 0x79,
++	0xc0, 0x6a, 0x78, 0x00,
++	0x09, 0x0c, 0xe8, 0x79,
+ 	0x08, 0x0c, 0x04, 0x68,
+-	0xb1, 0x6a, 0xd8, 0x5e,
++	0xb1, 0x6a, 0xda, 0x5e,
+ 	0xff, 0x6a, 0x26, 0x09,
+ 	0x12, 0x01, 0x02, 0x00,
+ 	0x02, 0x6a, 0x08, 0x30,
+@@ -264,29 +265,29 @@ static uint8_t seqprog[] = {
+ 	0x00, 0xa5, 0x4a, 0x21,
+ 	0x00, 0xa6, 0x4c, 0x21,
+ 	0x00, 0xa7, 0x4e, 0x25,
+-	0x08, 0xeb, 0xdc, 0x7e,
+-	0x80, 0xeb, 0x06, 0x7a,
++	0x08, 0xeb, 0xde, 0x7e,
++	0x80, 0xeb, 0x08, 0x7a,
+ 	0xff, 0x6a, 0xd6, 0x09,
+-	0x08, 0xeb, 0x0a, 0x6a,
++	0x08, 0xeb, 0x0c, 0x6a,
+ 	0xff, 0x6a, 0xd4, 0x0c,
+-	0x80, 0xa3, 0xdc, 0x6e,
+-	0x88, 0xeb, 0x20, 0x72,
+-	0x08, 0xeb, 0xdc, 0x6e,
+-	0x04, 0xea, 0x24, 0xe2,
+-	0x08, 0xee, 0xdc, 0x6e,
++	0x80, 0xa3, 0xde, 0x6e,
++	0x88, 0xeb, 0x22, 0x72,
++	0x08, 0xeb, 0xde, 0x6e,
++	0x04, 0xea, 0x26, 0xe2,
++	0x08, 0xee, 0xde, 0x6e,
+ 	0x04, 0x6a, 0xd0, 0x81,
+ 	0x05, 0xa4, 0xc0, 0x89,
+ 	0x03, 0xa5, 0xc2, 0x31,
+ 	0x09, 0x6a, 0xd6, 0x05,
+-	0x00, 0x65, 0x08, 0x5a,
++	0x00, 0x65, 0x0a, 0x5a,
+ 	0x06, 0xa4, 0xd4, 0x89,
+-	0x80, 0x94, 0xdc, 0x7e,
++	0x80, 0x94, 0xde, 0x7e,
+ 	0x07, 0xe9, 0x10, 0x31,
+ 	0x01, 0xe9, 0x46, 0x31,
+-	0x00, 0xa3, 0xba, 0x5e,
+-	0x00, 0x65, 0xfa, 0x59,
++	0x00, 0xa3, 0xbc, 0x5e,
++	0x00, 0x65, 0xfc, 0x59,
+ 	0x01, 0xa4, 0xca, 0x30,
+-	0x80, 0xa3, 0x34, 0x7a,
++	0x80, 0xa3, 0x36, 0x7a,
+ 	0x02, 0x65, 0xca, 0x00,
+ 	0x01, 0x65, 0xf8, 0x31,
+ 	0x80, 0x93, 0x26, 0x01,
+@@ -294,162 +295,162 @@ static uint8_t seqprog[] = {
+ 	0x01, 0x8c, 0xc8, 0x30,
+ 	0x00, 0x88, 0xc8, 0x18,
+ 	0x02, 0x64, 0xc8, 0x88,
+-	0xff, 0x64, 0xdc, 0x7e,
+-	0xff, 0x8d, 0x4a, 0x6a,
+-	0xff, 0x8e, 0x4a, 0x6a,
++	0xff, 0x64, 0xde, 0x7e,
++	0xff, 0x8d, 0x4c, 0x6a,
++	0xff, 0x8e, 0x4c, 0x6a,
+ 	0x03, 0x8c, 0xd4, 0x98,
+-	0x00, 0x65, 0xdc, 0x56,
++	0x00, 0x65, 0xde, 0x56,
+ 	0x01, 0x64, 0x70, 0x30,
+ 	0xff, 0x64, 0xc8, 0x10,
+ 	0x01, 0x64, 0xc8, 0x18,
+ 	0x00, 0x8c, 0x18, 0x19,
+ 	0xff, 0x8d, 0x1a, 0x21,
+ 	0xff, 0x8e, 0x1c, 0x25,
+-	0xc0, 0x3c, 0x5a, 0x7a,
+-	0x21, 0x6a, 0xd8, 0x5e,
++	0xc0, 0x3c, 0x5c, 0x7a,
++	0x21, 0x6a, 0xda, 0x5e,
+ 	0xa8, 0x6a, 0x76, 0x00,
+ 	0x79, 0x6a, 0x76, 0x00,
+-	0x40, 0x3f, 0x62, 0x6a,
++	0x40, 0x3f, 0x64, 0x6a,
+ 	0x04, 0x3b, 0x76, 0x00,
+ 	0x04, 0x6a, 0xd4, 0x81,
+-	0x20, 0x3c, 0x6a, 0x7a,
+-	0x51, 0x6a, 0xd8, 0x5e,
+-	0x00, 0x65, 0x82, 0x42,
++	0x20, 0x3c, 0x6c, 0x7a,
++	0x51, 0x6a, 0xda, 0x5e,
++	0x00, 0x65, 0x84, 0x42,
+ 	0x20, 0x3c, 0x78, 0x00,
+-	0x00, 0xb3, 0xba, 0x5e,
++	0x00, 0xb3, 0xbc, 0x5e,
+ 	0x07, 0xac, 0x10, 0x31,
+ 	0x05, 0xb3, 0x46, 0x31,
+ 	0x88, 0x6a, 0xcc, 0x00,
+-	0xac, 0x6a, 0xee, 0x5d,
++	0xac, 0x6a, 0xf0, 0x5d,
+ 	0xa3, 0x6a, 0xcc, 0x00,
+-	0xb3, 0x6a, 0xf2, 0x5d,
+-	0x00, 0x65, 0x3a, 0x5a,
++	0xb3, 0x6a, 0xf4, 0x5d,
++	0x00, 0x65, 0x3c, 0x5a,
+ 	0xfd, 0xa4, 0x48, 0x09,
+ 	0x03, 0x8c, 0x10, 0x30,
+-	0x00, 0x65, 0xe6, 0x5d,
+-	0x01, 0xa4, 0x94, 0x7a,
++	0x00, 0x65, 0xe8, 0x5d,
++	0x01, 0xa4, 0x96, 0x7a,
+ 	0x04, 0x3b, 0x76, 0x08,
+ 	0x01, 0x3b, 0x26, 0x31,
+ 	0x80, 0x02, 0x04, 0x00,
+-	0x10, 0x0c, 0x8a, 0x7a,
+-	0x03, 0x9e, 0x8c, 0x6a,
++	0x10, 0x0c, 0x8c, 0x7a,
++	0x03, 0x9e, 0x8e, 0x6a,
+ 	0x7f, 0x02, 0x04, 0x08,
+-	0x91, 0x6a, 0xd8, 0x5e,
++	0x91, 0x6a, 0xda, 0x5e,
+ 	0x00, 0x65, 0xcc, 0x41,
+ 	0x01, 0xa4, 0xca, 0x30,
+-	0x80, 0xa3, 0x9a, 0x7a,
++	0x80, 0xa3, 0x9c, 0x7a,
+ 	0x02, 0x65, 0xca, 0x00,
+ 	0x01, 0x65, 0xf8, 0x31,
+ 	0x01, 0x3b, 0x26, 0x31,
+-	0x00, 0x65, 0x0e, 0x5a,
+-	0x01, 0xfc, 0xa8, 0x6a,
+-	0x80, 0x0b, 0x9e, 0x6a,
+-	0x10, 0x0c, 0x9e, 0x7a,
+-	0x20, 0x93, 0x9e, 0x6a,
++	0x00, 0x65, 0x10, 0x5a,
++	0x01, 0xfc, 0xaa, 0x6a,
++	0x80, 0x0b, 0xa0, 0x6a,
++	0x10, 0x0c, 0xa0, 0x7a,
++	0x20, 0x93, 0xa0, 0x6a,
+ 	0x02, 0x93, 0x26, 0x01,
+-	0x02, 0xfc, 0xb2, 0x7a,
+-	0x40, 0x0d, 0xc6, 0x6a,
++	0x02, 0xfc, 0xb4, 0x7a,
++	0x40, 0x0d, 0xc8, 0x6a,
+ 	0x01, 0xa4, 0x48, 0x01,
+-	0x00, 0x65, 0xc6, 0x42,
+-	0x40, 0x0d, 0xb8, 0x6a,
+-	0x00, 0x65, 0x0e, 0x5a,
+-	0x00, 0x65, 0xaa, 0x42,
+-	0x80, 0xfc, 0xc2, 0x7a,
+-	0x80, 0xa4, 0xc2, 0x6a,
++	0x00, 0x65, 0xc8, 0x42,
++	0x40, 0x0d, 0xba, 0x6a,
++	0x00, 0x65, 0x10, 0x5a,
++	0x00, 0x65, 0xac, 0x42,
++	0x80, 0xfc, 0xc4, 0x7a,
++	0x80, 0xa4, 0xc4, 0x6a,
+ 	0xff, 0xa5, 0x4a, 0x19,
+ 	0xff, 0xa6, 0x4c, 0x21,
+ 	0xff, 0xa7, 0x4e, 0x21,
+ 	0xf8, 0xfc, 0x48, 0x09,
+ 	0x7f, 0xa3, 0x46, 0x09,
+-	0x04, 0x3b, 0xe2, 0x6a,
++	0x04, 0x3b, 0xe4, 0x6a,
+ 	0x02, 0x93, 0x26, 0x01,
+-	0x01, 0x94, 0xc8, 0x7a,
+-	0x01, 0x94, 0xc8, 0x7a,
+-	0x01, 0x94, 0xc8, 0x7a,
+-	0x01, 0x94, 0xc8, 0x7a,
+-	0x01, 0x94, 0xc8, 0x7a,
+-	0x01, 0xa4, 0xe0, 0x7a,
+-	0x01, 0xfc, 0xd6, 0x7a,
+-	0x01, 0x94, 0xe2, 0x6a,
+-	0x01, 0x94, 0xe2, 0x6a,
+-	0x01, 0x94, 0xe2, 0x6a,
+-	0x00, 0x65, 0x82, 0x42,
+-	0x01, 0x94, 0xe0, 0x7a,
+-	0x10, 0x94, 0xe2, 0x6a,
++	0x01, 0x94, 0xca, 0x7a,
++	0x01, 0x94, 0xca, 0x7a,
++	0x01, 0x94, 0xca, 0x7a,
++	0x01, 0x94, 0xca, 0x7a,
++	0x01, 0x94, 0xca, 0x7a,
++	0x01, 0xa4, 0xe2, 0x7a,
++	0x01, 0xfc, 0xd8, 0x7a,
++	0x01, 0x94, 0xe4, 0x6a,
++	0x01, 0x94, 0xe4, 0x6a,
++	0x01, 0x94, 0xe4, 0x6a,
++	0x00, 0x65, 0x84, 0x42,
++	0x01, 0x94, 0xe2, 0x7a,
++	0x10, 0x94, 0xe4, 0x6a,
+ 	0xd7, 0x93, 0x26, 0x09,
+-	0x28, 0x93, 0xe6, 0x6a,
++	0x28, 0x93, 0xe8, 0x6a,
+ 	0x01, 0x85, 0x0a, 0x01,
+-	0x02, 0xfc, 0xee, 0x6a,
++	0x02, 0xfc, 0xf0, 0x6a,
+ 	0x01, 0x14, 0x46, 0x31,
+ 	0xff, 0x6a, 0x10, 0x09,
+ 	0xfe, 0x85, 0x0a, 0x09,
+-	0xff, 0x38, 0xfc, 0x6a,
+-	0x80, 0xa3, 0xfc, 0x7a,
+-	0x80, 0x0b, 0xfa, 0x7a,
+-	0x04, 0x3b, 0xfc, 0x7a,
++	0xff, 0x38, 0xfe, 0x6a,
++	0x80, 0xa3, 0xfe, 0x7a,
++	0x80, 0x0b, 0xfc, 0x7a,
++	0x04, 0x3b, 0xfe, 0x7a,
+ 	0xbf, 0x3b, 0x76, 0x08,
+ 	0x01, 0x3b, 0x26, 0x31,
+-	0x00, 0x65, 0x0e, 0x5a,
+-	0x01, 0x0b, 0x0a, 0x6b,
+-	0x10, 0x0c, 0xfe, 0x7a,
+-	0x04, 0x93, 0x08, 0x6b,
+-	0x01, 0x94, 0x06, 0x7b,
+-	0x10, 0x94, 0x08, 0x6b,
++	0x00, 0x65, 0x10, 0x5a,
++	0x01, 0x0b, 0x0c, 0x6b,
++	0x10, 0x0c, 0x00, 0x7b,
++	0x04, 0x93, 0x0a, 0x6b,
++	0x01, 0x94, 0x08, 0x7b,
++	0x10, 0x94, 0x0a, 0x6b,
+ 	0xc7, 0x93, 0x26, 0x09,
+ 	0x01, 0x99, 0xd4, 0x30,
+-	0x38, 0x93, 0x0c, 0x6b,
+-	0xff, 0x08, 0x5a, 0x6b,
+-	0xff, 0x09, 0x5a, 0x6b,
+-	0xff, 0x0a, 0x5a, 0x6b,
+-	0xff, 0x38, 0x28, 0x7b,
++	0x38, 0x93, 0x0e, 0x6b,
++	0xff, 0x08, 0x5c, 0x6b,
++	0xff, 0x09, 0x5c, 0x6b,
++	0xff, 0x0a, 0x5c, 0x6b,
++	0xff, 0x38, 0x2a, 0x7b,
+ 	0x04, 0x14, 0x10, 0x31,
+ 	0x01, 0x38, 0x18, 0x31,
+ 	0x02, 0x6a, 0x1a, 0x31,
+ 	0x88, 0x6a, 0xcc, 0x00,
+-	0x14, 0x6a, 0xf4, 0x5d,
+-	0x00, 0x38, 0xe0, 0x5d,
++	0x14, 0x6a, 0xf6, 0x5d,
++	0x00, 0x38, 0xe2, 0x5d,
+ 	0xff, 0x6a, 0x70, 0x08,
+-	0x00, 0x65, 0x54, 0x43,
+-	0x80, 0xa3, 0x2e, 0x7b,
++	0x00, 0x65, 0x56, 0x43,
++	0x80, 0xa3, 0x30, 0x7b,
+ 	0x01, 0xa4, 0x48, 0x01,
+-	0x00, 0x65, 0x5a, 0x43,
+-	0x08, 0xeb, 0x34, 0x7b,
+-	0x00, 0x65, 0x0e, 0x5a,
+-	0x08, 0xeb, 0x30, 0x6b,
++	0x00, 0x65, 0x5c, 0x43,
++	0x08, 0xeb, 0x36, 0x7b,
++	0x00, 0x65, 0x10, 0x5a,
++	0x08, 0xeb, 0x32, 0x6b,
+ 	0x07, 0xe9, 0x10, 0x31,
+ 	0x01, 0xe9, 0xca, 0x30,
+ 	0x01, 0x65, 0x46, 0x31,
+-	0x00, 0x6a, 0xba, 0x5e,
++	0x00, 0x6a, 0xbc, 0x5e,
+ 	0x88, 0x6a, 0xcc, 0x00,
+-	0xa4, 0x6a, 0xf4, 0x5d,
+-	0x08, 0x6a, 0xe0, 0x5d,
++	0xa4, 0x6a, 0xf6, 0x5d,
++	0x08, 0x6a, 0xe2, 0x5d,
+ 	0x0d, 0x93, 0x26, 0x01,
+-	0x00, 0x65, 0xa8, 0x5e,
++	0x00, 0x65, 0xaa, 0x5e,
+ 	0x88, 0x6a, 0xcc, 0x00,
+-	0x00, 0x65, 0x8a, 0x5e,
++	0x00, 0x65, 0x8c, 0x5e,
+ 	0x01, 0x99, 0x46, 0x31,
+-	0x00, 0xa3, 0xba, 0x5e,
++	0x00, 0xa3, 0xbc, 0x5e,
+ 	0x01, 0x88, 0x10, 0x31,
+-	0x00, 0x65, 0x3a, 0x5a,
+-	0x00, 0x65, 0xfa, 0x59,
++	0x00, 0x65, 0x3c, 0x5a,
++	0x00, 0x65, 0xfc, 0x59,
+ 	0x03, 0x8c, 0x10, 0x30,
+-	0x00, 0x65, 0xe6, 0x5d,
+-	0x80, 0x0b, 0x82, 0x6a,
+-	0x80, 0x0b, 0x62, 0x6b,
+-	0x01, 0x0c, 0x5c, 0x7b,
+-	0x10, 0x0c, 0x82, 0x7a,
+-	0x03, 0x9e, 0x82, 0x6a,
+-	0x00, 0x65, 0x04, 0x5a,
+-	0x00, 0x6a, 0xba, 0x5e,
+-	0x01, 0xa4, 0x82, 0x6b,
+-	0xff, 0x38, 0x78, 0x7b,
++	0x00, 0x65, 0xe8, 0x5d,
++	0x80, 0x0b, 0x84, 0x6a,
++	0x80, 0x0b, 0x64, 0x6b,
++	0x01, 0x0c, 0x5e, 0x7b,
++	0x10, 0x0c, 0x84, 0x7a,
++	0x03, 0x9e, 0x84, 0x6a,
++	0x00, 0x65, 0x06, 0x5a,
++	0x00, 0x6a, 0xbc, 0x5e,
++	0x01, 0xa4, 0x84, 0x6b,
++	0xff, 0x38, 0x7a, 0x7b,
+ 	0x01, 0x38, 0xc8, 0x30,
+ 	0x00, 0x08, 0x40, 0x19,
+ 	0xff, 0x6a, 0xc8, 0x08,
+ 	0x00, 0x09, 0x42, 0x21,
+ 	0x00, 0x0a, 0x44, 0x21,
+ 	0xff, 0x6a, 0x70, 0x08,
+-	0x00, 0x65, 0x7a, 0x43,
++	0x00, 0x65, 0x7c, 0x43,
+ 	0x03, 0x08, 0x40, 0x31,
+ 	0x03, 0x08, 0x40, 0x31,
+ 	0x01, 0x08, 0x40, 0x31,
+@@ -461,16 +462,16 @@ static uint8_t seqprog[] = {
+ 	0x04, 0x3c, 0xcc, 0x79,
+ 	0xfb, 0x3c, 0x78, 0x08,
+ 	0x04, 0x93, 0x20, 0x79,
+-	0x01, 0x0c, 0x8e, 0x6b,
++	0x01, 0x0c, 0x90, 0x6b,
+ 	0x80, 0xba, 0x20, 0x79,
+ 	0x80, 0x04, 0x20, 0x79,
+-	0xe4, 0x6a, 0x6e, 0x5d,
+-	0x23, 0x6a, 0x84, 0x5d,
+-	0x01, 0x6a, 0x84, 0x5d,
++	0xe4, 0x6a, 0x70, 0x5d,
++	0x23, 0x6a, 0x86, 0x5d,
++	0x01, 0x6a, 0x86, 0x5d,
+ 	0x00, 0x65, 0x20, 0x41,
+ 	0x00, 0x65, 0xcc, 0x41,
+-	0x80, 0x3c, 0xa2, 0x7b,
+-	0x21, 0x6a, 0xd8, 0x5e,
++	0x80, 0x3c, 0xa4, 0x7b,
++	0x21, 0x6a, 0xda, 0x5e,
+ 	0x01, 0xbc, 0x18, 0x31,
+ 	0x02, 0x6a, 0x1a, 0x31,
+ 	0x02, 0x6a, 0xf8, 0x01,
+@@ -480,16 +481,16 @@ static uint8_t seqprog[] = {
+ 	0xff, 0x6a, 0x12, 0x08,
+ 	0xff, 0x6a, 0x14, 0x08,
+ 	0xf3, 0xbc, 0xd4, 0x18,
+-	0xa0, 0x6a, 0xc8, 0x53,
++	0xa0, 0x6a, 0xca, 0x53,
+ 	0x04, 0xa0, 0x10, 0x31,
+ 	0xac, 0x6a, 0x26, 0x01,
+ 	0x04, 0xa0, 0x10, 0x31,
+ 	0x03, 0x08, 0x18, 0x31,
+ 	0x88, 0x6a, 0xcc, 0x00,
+-	0xa0, 0x6a, 0xf4, 0x5d,
+-	0x00, 0xbc, 0xe0, 0x5d,
++	0xa0, 0x6a, 0xf6, 0x5d,
++	0x00, 0xbc, 0xe2, 0x5d,
+ 	0x3d, 0x6a, 0x26, 0x01,
+-	0x00, 0x65, 0xe0, 0x43,
++	0x00, 0x65, 0xe2, 0x43,
+ 	0xff, 0x6a, 0x10, 0x09,
+ 	0xa4, 0x6a, 0x26, 0x01,
+ 	0x0c, 0xa0, 0x32, 0x31,
+@@ -499,128 +500,128 @@ static uint8_t seqprog[] = {
+ 	0x36, 0x6a, 0x26, 0x01,
+ 	0x02, 0x93, 0x26, 0x01,
+ 	0x35, 0x6a, 0x26, 0x01,
+-	0x00, 0x65, 0x9c, 0x5e,
+-	0x00, 0x65, 0x9c, 0x5e,
++	0x00, 0x65, 0x9e, 0x5e,
++	0x00, 0x65, 0x9e, 0x5e,
+ 	0x02, 0x93, 0x26, 0x01,
+ 	0xbf, 0x3c, 0x78, 0x08,
+-	0x04, 0x0b, 0xe6, 0x6b,
+-	0x10, 0x0c, 0xe2, 0x7b,
+-	0x01, 0x03, 0xe6, 0x6b,
+-	0x20, 0x93, 0xe8, 0x6b,
+-	0x04, 0x0b, 0xee, 0x6b,
++	0x04, 0x0b, 0xe8, 0x6b,
++	0x10, 0x0c, 0xe4, 0x7b,
++	0x01, 0x03, 0xe8, 0x6b,
++	0x20, 0x93, 0xea, 0x6b,
++	0x04, 0x0b, 0xf0, 0x6b,
+ 	0x40, 0x3c, 0x78, 0x00,
+ 	0xc7, 0x93, 0x26, 0x09,
+-	0x38, 0x93, 0xf0, 0x6b,
++	0x38, 0x93, 0xf2, 0x6b,
+ 	0x00, 0x65, 0xcc, 0x41,
+-	0x80, 0x3c, 0x56, 0x6c,
++	0x80, 0x3c, 0x58, 0x6c,
+ 	0x01, 0x06, 0x50, 0x31,
+ 	0x80, 0xb8, 0x70, 0x01,
+ 	0x00, 0x65, 0xcc, 0x41,
+ 	0x10, 0x3f, 0x06, 0x00,
+ 	0x10, 0x6a, 0x06, 0x00,
+ 	0x01, 0x3a, 0xca, 0x30,
+-	0x80, 0x65, 0x1c, 0x64,
+-	0x10, 0xb8, 0x40, 0x6c,
++	0x80, 0x65, 0x1e, 0x64,
++	0x10, 0xb8, 0x42, 0x6c,
+ 	0xc0, 0x3e, 0xca, 0x00,
+-	0x40, 0xb8, 0x0c, 0x6c,
++	0x40, 0xb8, 0x0e, 0x6c,
+ 	0xbf, 0x65, 0xca, 0x08,
+-	0x20, 0xb8, 0x20, 0x7c,
++	0x20, 0xb8, 0x22, 0x7c,
+ 	0x01, 0x65, 0x0c, 0x30,
+-	0x00, 0x65, 0xd8, 0x5d,
+-	0xa0, 0x3f, 0x28, 0x64,
++	0x00, 0x65, 0xda, 0x5d,
++	0xa0, 0x3f, 0x2a, 0x64,
+ 	0x23, 0xb8, 0x0c, 0x08,
+-	0x00, 0x65, 0xd8, 0x5d,
+-	0xa0, 0x3f, 0x28, 0x64,
+-	0x00, 0xbb, 0x20, 0x44,
+-	0xff, 0x65, 0x20, 0x64,
+-	0x00, 0x65, 0x40, 0x44,
++	0x00, 0x65, 0xda, 0x5d,
++	0xa0, 0x3f, 0x2a, 0x64,
++	0x00, 0xbb, 0x22, 0x44,
++	0xff, 0x65, 0x22, 0x64,
++	0x00, 0x65, 0x42, 0x44,
+ 	0x40, 0x6a, 0x18, 0x00,
+ 	0x01, 0x65, 0x0c, 0x30,
+-	0x00, 0x65, 0xd8, 0x5d,
+-	0xa0, 0x3f, 0xfc, 0x73,
++	0x00, 0x65, 0xda, 0x5d,
++	0xa0, 0x3f, 0xfe, 0x73,
+ 	0x40, 0x6a, 0x18, 0x00,
+ 	0x01, 0x3a, 0xa6, 0x30,
+ 	0x08, 0x6a, 0x74, 0x00,
+ 	0x00, 0x65, 0xcc, 0x41,
+-	0x64, 0x6a, 0x68, 0x5d,
+-	0x80, 0x64, 0xd8, 0x6c,
+-	0x04, 0x64, 0x9a, 0x74,
+-	0x02, 0x64, 0xaa, 0x74,
+-	0x00, 0x6a, 0x60, 0x74,
+-	0x03, 0x64, 0xc8, 0x74,
+-	0x23, 0x64, 0x48, 0x74,
+-	0x08, 0x64, 0x5c, 0x74,
+-	0x61, 0x6a, 0xd8, 0x5e,
+-	0x00, 0x65, 0xd8, 0x5d,
++	0x64, 0x6a, 0x6a, 0x5d,
++	0x80, 0x64, 0xda, 0x6c,
++	0x04, 0x64, 0x9c, 0x74,
++	0x02, 0x64, 0xac, 0x74,
++	0x00, 0x6a, 0x62, 0x74,
++	0x03, 0x64, 0xca, 0x74,
++	0x23, 0x64, 0x4a, 0x74,
++	0x08, 0x64, 0x5e, 0x74,
++	0x61, 0x6a, 0xda, 0x5e,
++	0x00, 0x65, 0xda, 0x5d,
+ 	0x08, 0x51, 0xce, 0x71,
+-	0x00, 0x65, 0x40, 0x44,
+-	0x80, 0x04, 0x5a, 0x7c,
+-	0x51, 0x6a, 0x5e, 0x5d,
+-	0x01, 0x51, 0x5a, 0x64,
+-	0x01, 0xa4, 0x52, 0x7c,
+-	0x80, 0xba, 0x5c, 0x6c,
+-	0x41, 0x6a, 0xd8, 0x5e,
+-	0x00, 0x65, 0x5c, 0x44,
+-	0x21, 0x6a, 0xd8, 0x5e,
+-	0x00, 0x65, 0x5c, 0x44,
+-	0x07, 0x6a, 0x54, 0x5d,
++	0x00, 0x65, 0x42, 0x44,
++	0x80, 0x04, 0x5c, 0x7c,
++	0x51, 0x6a, 0x60, 0x5d,
++	0x01, 0x51, 0x5c, 0x64,
++	0x01, 0xa4, 0x54, 0x7c,
++	0x80, 0xba, 0x5e, 0x6c,
++	0x41, 0x6a, 0xda, 0x5e,
++	0x00, 0x65, 0x5e, 0x44,
++	0x21, 0x6a, 0xda, 0x5e,
++	0x00, 0x65, 0x5e, 0x44,
++	0x07, 0x6a, 0x56, 0x5d,
+ 	0x01, 0x06, 0xd4, 0x30,
+ 	0x00, 0x65, 0xcc, 0x41,
+-	0x80, 0xb8, 0x56, 0x7c,
+-	0xc0, 0x3c, 0x6a, 0x7c,
+-	0x80, 0x3c, 0x56, 0x6c,
+-	0xff, 0xa8, 0x6a, 0x6c,
+-	0x40, 0x3c, 0x56, 0x6c,
+-	0x10, 0xb8, 0x6e, 0x7c,
+-	0xa1, 0x6a, 0xd8, 0x5e,
+-	0x01, 0xb4, 0x74, 0x6c,
+-	0x02, 0xb4, 0x76, 0x6c,
+-	0x01, 0xa4, 0x76, 0x7c,
+-	0xff, 0xa8, 0x86, 0x7c,
++	0x80, 0xb8, 0x58, 0x7c,
++	0xc0, 0x3c, 0x6c, 0x7c,
++	0x80, 0x3c, 0x58, 0x6c,
++	0xff, 0xa8, 0x6c, 0x6c,
++	0x40, 0x3c, 0x58, 0x6c,
++	0x10, 0xb8, 0x70, 0x7c,
++	0xa1, 0x6a, 0xda, 0x5e,
++	0x01, 0xb4, 0x76, 0x6c,
++	0x02, 0xb4, 0x78, 0x6c,
++	0x01, 0xa4, 0x78, 0x7c,
++	0xff, 0xa8, 0x88, 0x7c,
+ 	0x04, 0xb4, 0x68, 0x01,
+ 	0x01, 0x6a, 0x76, 0x00,
+-	0x00, 0xbb, 0x12, 0x5e,
+-	0xff, 0xa8, 0x86, 0x7c,
+-	0x71, 0x6a, 0xd8, 0x5e,
+-	0x40, 0x51, 0x86, 0x64,
+-	0x00, 0x65, 0xb2, 0x5e,
++	0x00, 0xbb, 0x14, 0x5e,
++	0xff, 0xa8, 0x88, 0x7c,
++	0x71, 0x6a, 0xda, 0x5e,
++	0x40, 0x51, 0x88, 0x64,
++	0x00, 0x65, 0xb4, 0x5e,
+ 	0x00, 0x65, 0xde, 0x41,
+-	0x00, 0xbb, 0x8a, 0x5c,
++	0x00, 0xbb, 0x8c, 0x5c,
+ 	0x00, 0x65, 0xde, 0x41,
+-	0x00, 0x65, 0xb2, 0x5e,
++	0x00, 0x65, 0xb4, 0x5e,
+ 	0x01, 0x65, 0xa2, 0x30,
+ 	0x01, 0xf8, 0xc8, 0x30,
+ 	0x01, 0x4e, 0xc8, 0x30,
+-	0x00, 0x6a, 0xb6, 0xdd,
+-	0x00, 0x51, 0xc8, 0x5d,
++	0x00, 0x6a, 0xb8, 0xdd,
++	0x00, 0x51, 0xca, 0x5d,
+ 	0x01, 0x4e, 0x9c, 0x18,
+ 	0x02, 0x6a, 0x22, 0x05,
+-	0xc0, 0x3c, 0x56, 0x6c,
++	0xc0, 0x3c, 0x58, 0x6c,
+ 	0x04, 0xb8, 0x70, 0x01,
+-	0x00, 0x65, 0xd4, 0x5e,
++	0x00, 0x65, 0xd6, 0x5e,
+ 	0x20, 0xb8, 0xde, 0x69,
+ 	0x01, 0xbb, 0xa2, 0x30,
+ 	0x3f, 0xba, 0x7c, 0x08,
+-	0x00, 0xb9, 0xce, 0x5c,
++	0x00, 0xb9, 0xd0, 0x5c,
+ 	0x00, 0x65, 0xde, 0x41,
+ 	0x01, 0x06, 0xd4, 0x30,
+ 	0x20, 0x3c, 0xcc, 0x79,
+-	0x20, 0x3c, 0x5c, 0x7c,
+-	0x01, 0xa4, 0xb8, 0x7c,
++	0x20, 0x3c, 0x5e, 0x7c,
++	0x01, 0xa4, 0xba, 0x7c,
+ 	0x01, 0xb4, 0x68, 0x01,
+ 	0x00, 0x65, 0xcc, 0x41,
+-	0x00, 0x65, 0x5c, 0x44,
++	0x00, 0x65, 0x5e, 0x44,
+ 	0x04, 0x14, 0x58, 0x31,
+ 	0x01, 0x06, 0xd4, 0x30,
+ 	0x08, 0xa0, 0x60, 0x31,
+ 	0xac, 0x6a, 0xcc, 0x00,
+-	0x14, 0x6a, 0xf4, 0x5d,
++	0x14, 0x6a, 0xf6, 0x5d,
+ 	0x01, 0x06, 0xd4, 0x30,
+-	0xa0, 0x6a, 0xec, 0x5d,
++	0xa0, 0x6a, 0xee, 0x5d,
+ 	0x00, 0x65, 0xcc, 0x41,
+ 	0xdf, 0x3c, 0x78, 0x08,
+ 	0x12, 0x01, 0x02, 0x00,
+-	0x00, 0x65, 0x5c, 0x44,
++	0x00, 0x65, 0x5e, 0x44,
+ 	0x4c, 0x65, 0xcc, 0x28,
+ 	0x01, 0x3e, 0x20, 0x31,
+ 	0xd0, 0x66, 0xcc, 0x18,
+@@ -631,102 +632,102 @@ static uint8_t seqprog[] = {
+ 	0xd0, 0x65, 0xca, 0x18,
+ 	0x01, 0x3e, 0x20, 0x31,
+ 	0x30, 0x65, 0xd4, 0x18,
+-	0x00, 0x65, 0xe6, 0x4c,
++	0x00, 0x65, 0xe8, 0x4c,
+ 	0xe1, 0x6a, 0x22, 0x01,
+ 	0xff, 0x6a, 0xd4, 0x08,
+ 	0x20, 0x65, 0xd4, 0x18,
+-	0x00, 0x65, 0xee, 0x54,
++	0x00, 0x65, 0xf0, 0x54,
+ 	0xe1, 0x6a, 0x22, 0x01,
+ 	0xff, 0x6a, 0xd4, 0x08,
+ 	0x20, 0x65, 0xca, 0x18,
+ 	0xe0, 0x65, 0xd4, 0x18,
+-	0x00, 0x65, 0xf8, 0x4c,
++	0x00, 0x65, 0xfa, 0x4c,
+ 	0xe1, 0x6a, 0x22, 0x01,
+ 	0xff, 0x6a, 0xd4, 0x08,
+ 	0xd0, 0x65, 0xd4, 0x18,
+-	0x00, 0x65, 0x00, 0x55,
++	0x00, 0x65, 0x02, 0x55,
+ 	0xe1, 0x6a, 0x22, 0x01,
+ 	0xff, 0x6a, 0xd4, 0x08,
+ 	0x01, 0x6c, 0xa2, 0x30,
+-	0xff, 0x51, 0x12, 0x75,
+-	0x00, 0x51, 0x8e, 0x5d,
++	0xff, 0x51, 0x14, 0x75,
++	0x00, 0x51, 0x90, 0x5d,
+ 	0x01, 0x51, 0x20, 0x31,
+-	0x00, 0x65, 0x34, 0x45,
++	0x00, 0x65, 0x36, 0x45,
+ 	0x3f, 0xba, 0xc8, 0x08,
+-	0x00, 0x3e, 0x34, 0x75,
+-	0x00, 0x65, 0xb0, 0x5e,
++	0x00, 0x3e, 0x36, 0x75,
++	0x00, 0x65, 0xb2, 0x5e,
+ 	0x80, 0x3c, 0x78, 0x00,
+ 	0x01, 0x06, 0xd4, 0x30,
+-	0x00, 0x65, 0xd8, 0x5d,
++	0x00, 0x65, 0xda, 0x5d,
+ 	0x01, 0x3c, 0x78, 0x00,
+-	0xe0, 0x3f, 0x50, 0x65,
++	0xe0, 0x3f, 0x52, 0x65,
+ 	0x02, 0x3c, 0x78, 0x00,
+-	0x20, 0x12, 0x50, 0x65,
+-	0x51, 0x6a, 0x5e, 0x5d,
+-	0x00, 0x51, 0x8e, 0x5d,
+-	0x51, 0x6a, 0x5e, 0x5d,
++	0x20, 0x12, 0x52, 0x65,
++	0x51, 0x6a, 0x60, 0x5d,
++	0x00, 0x51, 0x90, 0x5d,
++	0x51, 0x6a, 0x60, 0x5d,
+ 	0x01, 0x51, 0x20, 0x31,
+ 	0x04, 0x3c, 0x78, 0x00,
+ 	0x01, 0xb9, 0xc8, 0x30,
+-	0x00, 0x3d, 0x4e, 0x65,
++	0x00, 0x3d, 0x50, 0x65,
+ 	0x08, 0x3c, 0x78, 0x00,
+ 	0x3f, 0xba, 0xc8, 0x08,
+-	0x00, 0x3e, 0x4e, 0x65,
++	0x00, 0x3e, 0x50, 0x65,
+ 	0x10, 0x3c, 0x78, 0x00,
+-	0x04, 0xb8, 0x4e, 0x7d,
++	0x04, 0xb8, 0x50, 0x7d,
+ 	0xfb, 0xb8, 0x70, 0x09,
+-	0x20, 0xb8, 0x44, 0x6d,
++	0x20, 0xb8, 0x46, 0x6d,
+ 	0x01, 0x90, 0xc8, 0x30,
+ 	0xff, 0x6a, 0xa2, 0x00,
+-	0x00, 0x3d, 0xce, 0x5c,
++	0x00, 0x3d, 0xd0, 0x5c,
+ 	0x01, 0x64, 0x20, 0x31,
+ 	0xff, 0x6a, 0x78, 0x08,
+ 	0x00, 0x65, 0xea, 0x58,
+-	0x10, 0xb8, 0x5c, 0x7c,
+-	0xff, 0x6a, 0x54, 0x5d,
+-	0x00, 0x65, 0x5c, 0x44,
+-	0x00, 0x65, 0xb0, 0x5e,
+-	0x31, 0x6a, 0xd8, 0x5e,
+-	0x00, 0x65, 0x5c, 0x44,
++	0x10, 0xb8, 0x5e, 0x7c,
++	0xff, 0x6a, 0x56, 0x5d,
++	0x00, 0x65, 0x5e, 0x44,
++	0x00, 0x65, 0xb2, 0x5e,
++	0x31, 0x6a, 0xda, 0x5e,
++	0x00, 0x65, 0x5e, 0x44,
+ 	0x10, 0x3f, 0x06, 0x00,
+ 	0x10, 0x6a, 0x06, 0x00,
+ 	0x01, 0x65, 0x74, 0x34,
+-	0x81, 0x6a, 0xd8, 0x5e,
+-	0x00, 0x65, 0x60, 0x45,
++	0x81, 0x6a, 0xda, 0x5e,
++	0x00, 0x65, 0x62, 0x45,
+ 	0x01, 0x06, 0xd4, 0x30,
+-	0x01, 0x0c, 0x60, 0x7d,
+-	0x04, 0x0c, 0x5a, 0x6d,
++	0x01, 0x0c, 0x62, 0x7d,
++	0x04, 0x0c, 0x5c, 0x6d,
+ 	0xe0, 0x03, 0x7e, 0x08,
+ 	0xe0, 0x3f, 0xcc, 0x61,
+ 	0x01, 0x65, 0xcc, 0x30,
+ 	0x01, 0x12, 0xda, 0x34,
+ 	0x01, 0x06, 0xd4, 0x34,
+-	0x01, 0x03, 0x6e, 0x6d,
++	0x01, 0x03, 0x70, 0x6d,
+ 	0x40, 0x03, 0xcc, 0x08,
+ 	0x01, 0x65, 0x06, 0x30,
+ 	0x40, 0x65, 0xc8, 0x08,
+-	0x00, 0x66, 0x7c, 0x75,
+-	0x40, 0x65, 0x7c, 0x7d,
+-	0x00, 0x65, 0x7c, 0x5d,
++	0x00, 0x66, 0x7e, 0x75,
++	0x40, 0x65, 0x7e, 0x7d,
++	0x00, 0x65, 0x7e, 0x5d,
+ 	0xff, 0x6a, 0xd4, 0x08,
+ 	0xff, 0x6a, 0xd4, 0x08,
+ 	0xff, 0x6a, 0xd4, 0x08,
+ 	0xff, 0x6a, 0xd4, 0x0c,
+ 	0x08, 0x01, 0x02, 0x00,
+-	0x02, 0x0b, 0x86, 0x7d,
++	0x02, 0x0b, 0x88, 0x7d,
+ 	0x01, 0x65, 0x0c, 0x30,
+-	0x02, 0x0b, 0x8a, 0x7d,
++	0x02, 0x0b, 0x8c, 0x7d,
+ 	0xf7, 0x01, 0x02, 0x0c,
+ 	0x01, 0x65, 0xc8, 0x30,
+-	0xff, 0x41, 0xae, 0x75,
++	0xff, 0x41, 0xb0, 0x75,
+ 	0x01, 0x41, 0x20, 0x31,
+ 	0xff, 0x6a, 0xa4, 0x00,
+-	0x00, 0x65, 0x9e, 0x45,
+-	0xff, 0xbf, 0xae, 0x75,
++	0x00, 0x65, 0xa0, 0x45,
++	0xff, 0xbf, 0xb0, 0x75,
+ 	0x01, 0x90, 0xa4, 0x30,
+ 	0x01, 0xbf, 0x20, 0x31,
+-	0x00, 0xbb, 0x98, 0x65,
+-	0xff, 0x52, 0xac, 0x75,
++	0x00, 0xbb, 0x9a, 0x65,
++	0xff, 0x52, 0xae, 0x75,
+ 	0x01, 0xbf, 0xcc, 0x30,
+ 	0x01, 0x90, 0xca, 0x30,
+ 	0x01, 0x52, 0x20, 0x31,
+@@ -734,28 +735,28 @@ static uint8_t seqprog[] = {
+ 	0x01, 0x65, 0x20, 0x35,
+ 	0x01, 0xbf, 0x82, 0x34,
+ 	0x01, 0x64, 0xa2, 0x30,
+-	0x00, 0x6a, 0xc0, 0x5e,
++	0x00, 0x6a, 0xc2, 0x5e,
+ 	0x0d, 0x6a, 0x76, 0x00,
+-	0x00, 0x51, 0x12, 0x46,
++	0x00, 0x51, 0x14, 0x46,
+ 	0x01, 0x65, 0xa4, 0x30,
+ 	0xe0, 0x6a, 0xcc, 0x00,
+-	0x48, 0x6a, 0x06, 0x5e,
++	0x48, 0x6a, 0x08, 0x5e,
+ 	0x01, 0x6a, 0xd0, 0x01,
+ 	0x01, 0x6a, 0xdc, 0x05,
+ 	0x88, 0x6a, 0xcc, 0x00,
+-	0x48, 0x6a, 0x06, 0x5e,
+-	0x01, 0x6a, 0xe0, 0x5d,
++	0x48, 0x6a, 0x08, 0x5e,
++	0x01, 0x6a, 0xe2, 0x5d,
+ 	0x01, 0x6a, 0x26, 0x05,
+ 	0x01, 0x65, 0xd8, 0x31,
+ 	0x09, 0xee, 0xdc, 0x01,
+-	0x80, 0xee, 0xcc, 0x7d,
++	0x80, 0xee, 0xce, 0x7d,
+ 	0xff, 0x6a, 0xdc, 0x0d,
+ 	0x01, 0x65, 0x32, 0x31,
+ 	0x0a, 0x93, 0x26, 0x01,
+-	0x00, 0x65, 0xa8, 0x46,
+-	0x81, 0x6a, 0xd8, 0x5e,
+-	0x01, 0x0c, 0xd8, 0x7d,
+-	0x04, 0x0c, 0xd6, 0x6d,
++	0x00, 0x65, 0xaa, 0x46,
++	0x81, 0x6a, 0xda, 0x5e,
++	0x01, 0x0c, 0xda, 0x7d,
++	0x04, 0x0c, 0xd8, 0x6d,
+ 	0xe0, 0x03, 0x06, 0x08,
+ 	0xe0, 0x03, 0x7e, 0x0c,
+ 	0x01, 0x65, 0x18, 0x31,
+@@ -774,7 +775,7 @@ static uint8_t seqprog[] = {
+ 	0x01, 0x6c, 0xda, 0x34,
+ 	0x3d, 0x64, 0xa4, 0x28,
+ 	0x55, 0x64, 0xc8, 0x28,
+-	0x00, 0x65, 0x06, 0x46,
++	0x00, 0x65, 0x08, 0x46,
+ 	0x2e, 0x64, 0xa4, 0x28,
+ 	0x66, 0x64, 0xc8, 0x28,
+ 	0x00, 0x6c, 0xda, 0x18,
+@@ -785,63 +786,63 @@ static uint8_t seqprog[] = {
+ 	0x00, 0x6c, 0xda, 0x24,
+ 	0x01, 0x65, 0xc8, 0x30,
+ 	0xe0, 0x6a, 0xcc, 0x00,
+-	0x44, 0x6a, 0x02, 0x5e,
++	0x44, 0x6a, 0x04, 0x5e,
+ 	0x01, 0x90, 0xe2, 0x31,
+-	0x04, 0x3b, 0x26, 0x7e,
++	0x04, 0x3b, 0x28, 0x7e,
+ 	0x30, 0x6a, 0xd0, 0x01,
+ 	0x20, 0x6a, 0xd0, 0x01,
+ 	0x1d, 0x6a, 0xdc, 0x01,
+-	0xdc, 0xee, 0x22, 0x66,
+-	0x00, 0x65, 0x3e, 0x46,
++	0xdc, 0xee, 0x24, 0x66,
++	0x00, 0x65, 0x40, 0x46,
+ 	0x20, 0x6a, 0xd0, 0x01,
+ 	0x01, 0x6a, 0xdc, 0x01,
+ 	0x20, 0xa0, 0xd8, 0x31,
+ 	0x09, 0xee, 0xdc, 0x01,
+-	0x80, 0xee, 0x2e, 0x7e,
++	0x80, 0xee, 0x30, 0x7e,
+ 	0x11, 0x6a, 0xdc, 0x01,
+-	0x50, 0xee, 0x32, 0x66,
++	0x50, 0xee, 0x34, 0x66,
+ 	0x20, 0x6a, 0xd0, 0x01,
+ 	0x09, 0x6a, 0xdc, 0x01,
+-	0x88, 0xee, 0x38, 0x66,
++	0x88, 0xee, 0x3a, 0x66,
+ 	0x19, 0x6a, 0xdc, 0x01,
+-	0xd8, 0xee, 0x3c, 0x66,
++	0xd8, 0xee, 0x3e, 0x66,
+ 	0xff, 0x6a, 0xdc, 0x09,
+-	0x18, 0xee, 0x40, 0x6e,
++	0x18, 0xee, 0x42, 0x6e,
+ 	0xff, 0x6a, 0xd4, 0x0c,
+ 	0x88, 0x6a, 0xcc, 0x00,
+-	0x44, 0x6a, 0x02, 0x5e,
+-	0x20, 0x6a, 0xe0, 0x5d,
++	0x44, 0x6a, 0x04, 0x5e,
++	0x20, 0x6a, 0xe2, 0x5d,
+ 	0x01, 0x3b, 0x26, 0x31,
+-	0x04, 0x3b, 0x5a, 0x6e,
++	0x04, 0x3b, 0x5c, 0x6e,
+ 	0xa0, 0x6a, 0xca, 0x00,
+ 	0x20, 0x65, 0xc8, 0x18,
+-	0x00, 0x65, 0x98, 0x5e,
+-	0x00, 0x65, 0x52, 0x66,
++	0x00, 0x65, 0x9a, 0x5e,
++	0x00, 0x65, 0x54, 0x66,
+ 	0x0a, 0x93, 0x26, 0x01,
+-	0x00, 0x65, 0xa8, 0x46,
++	0x00, 0x65, 0xaa, 0x46,
+ 	0xa0, 0x6a, 0xcc, 0x00,
+ 	0xff, 0x6a, 0xc8, 0x08,
+-	0x20, 0x94, 0x5e, 0x6e,
+-	0x10, 0x94, 0x60, 0x6e,
+-	0x08, 0x94, 0x7a, 0x6e,
+-	0x08, 0x94, 0x7a, 0x6e,
+-	0x08, 0x94, 0x7a, 0x6e,
++	0x20, 0x94, 0x60, 0x6e,
++	0x10, 0x94, 0x62, 0x6e,
++	0x08, 0x94, 0x7c, 0x6e,
++	0x08, 0x94, 0x7c, 0x6e,
++	0x08, 0x94, 0x7c, 0x6e,
+ 	0xff, 0x8c, 0xc8, 0x10,
+ 	0xc1, 0x64, 0xc8, 0x18,
+ 	0xf8, 0x64, 0xc8, 0x08,
+ 	0x01, 0x99, 0xda, 0x30,
+-	0x00, 0x66, 0x6e, 0x66,
+-	0xc0, 0x66, 0xaa, 0x76,
++	0x00, 0x66, 0x70, 0x66,
++	0xc0, 0x66, 0xac, 0x76,
+ 	0x60, 0x66, 0xc8, 0x18,
+ 	0x3d, 0x64, 0xc8, 0x28,
+-	0x00, 0x65, 0x5e, 0x46,
++	0x00, 0x65, 0x60, 0x46,
+ 	0xf7, 0x93, 0x26, 0x09,
+-	0x08, 0x93, 0x7c, 0x6e,
++	0x08, 0x93, 0x7e, 0x6e,
+ 	0x00, 0x62, 0xc4, 0x18,
+-	0x00, 0x65, 0xa8, 0x5e,
+-	0x00, 0x65, 0x88, 0x5e,
+-	0x00, 0x65, 0x88, 0x5e,
+-	0x00, 0x65, 0x88, 0x5e,
++	0x00, 0x65, 0xaa, 0x5e,
++	0x00, 0x65, 0x8a, 0x5e,
++	0x00, 0x65, 0x8a, 0x5e,
++	0x00, 0x65, 0x8a, 0x5e,
+ 	0x01, 0x99, 0xda, 0x30,
+ 	0x01, 0x99, 0xda, 0x30,
+ 	0x01, 0x99, 0xda, 0x30,
+@@ -858,11 +859,11 @@ static uint8_t seqprog[] = {
+ 	0x01, 0x6c, 0x32, 0x31,
+ 	0x01, 0x6c, 0x32, 0x31,
+ 	0x01, 0x6c, 0x32, 0x35,
+-	0x08, 0x94, 0xa8, 0x7e,
++	0x08, 0x94, 0xaa, 0x7e,
+ 	0xf7, 0x93, 0x26, 0x09,
+-	0x08, 0x93, 0xac, 0x6e,
++	0x08, 0x93, 0xae, 0x6e,
+ 	0xff, 0x6a, 0xd4, 0x0c,
+-	0x04, 0xb8, 0xd4, 0x6e,
++	0x04, 0xb8, 0xd6, 0x6e,
+ 	0x01, 0x42, 0x7e, 0x31,
+ 	0xff, 0x6a, 0x76, 0x01,
+ 	0x01, 0x90, 0x84, 0x34,
+@@ -870,14 +871,14 @@ static uint8_t seqprog[] = {
+ 	0x01, 0x85, 0x0a, 0x01,
+ 	0x7f, 0x65, 0x10, 0x09,
+ 	0xfe, 0x85, 0x0a, 0x0d,
+-	0xff, 0x42, 0xd0, 0x66,
+-	0xff, 0x41, 0xc8, 0x66,
+-	0xd1, 0x6a, 0xd8, 0x5e,
++	0xff, 0x42, 0xd2, 0x66,
++	0xff, 0x41, 0xca, 0x66,
++	0xd1, 0x6a, 0xda, 0x5e,
+ 	0xff, 0x6a, 0xca, 0x04,
+ 	0x01, 0x41, 0x20, 0x31,
+ 	0x01, 0xbf, 0x82, 0x30,
+ 	0x01, 0x6a, 0x76, 0x00,
+-	0x00, 0xbb, 0x12, 0x46,
++	0x00, 0xbb, 0x14, 0x46,
+ 	0x01, 0x42, 0x20, 0x31,
+ 	0x01, 0xbf, 0x84, 0x34,
+ 	0x01, 0x41, 0x7e, 0x31,
+@@ -941,7 +942,7 @@ static ahc_patch_func_t ahc_patch17_func
+ static int
+ ahc_patch17_func(struct ahc_softc *ahc)
+ {
+-	return ((ahc->flags & AHC_TMODE_WIDEODD_BUG) != 0);
++	return ((ahc->bugs & AHC_TMODE_WIDEODD_BUG) != 0);
+ }
+ 
+ static ahc_patch_func_t ahc_patch16_func;
+@@ -1142,152 +1143,152 @@ static struct patch {
+ 	{ ahc_patch0_func, 196, 1, 1 },
+ 	{ ahc_patch9_func, 212, 6, 2 },
+ 	{ ahc_patch0_func, 218, 6, 1 },
+-	{ ahc_patch8_func, 226, 20, 2 },
++	{ ahc_patch8_func, 226, 21, 2 },
+ 	{ ahc_patch1_func, 241, 1, 1 },
+-	{ ahc_patch1_func, 248, 1, 2 },
+-	{ ahc_patch0_func, 249, 2, 2 },
+-	{ ahc_patch11_func, 250, 1, 1 },
+-	{ ahc_patch9_func, 258, 27, 3 },
+-	{ ahc_patch1_func, 274, 10, 2 },
+-	{ ahc_patch13_func, 277, 1, 1 },
+-	{ ahc_patch14_func, 285, 14, 1 },
+-	{ ahc_patch1_func, 301, 1, 2 },
+-	{ ahc_patch0_func, 302, 1, 1 },
+-	{ ahc_patch9_func, 305, 1, 1 },
+-	{ ahc_patch13_func, 310, 1, 1 },
+-	{ ahc_patch9_func, 311, 2, 2 },
+-	{ ahc_patch0_func, 313, 4, 1 },
+-	{ ahc_patch14_func, 317, 1, 1 },
+-	{ ahc_patch15_func, 319, 2, 3 },
+-	{ ahc_patch9_func, 319, 1, 2 },
+-	{ ahc_patch0_func, 320, 1, 1 },
+-	{ ahc_patch6_func, 325, 1, 2 },
+-	{ ahc_patch0_func, 326, 1, 1 },
+-	{ ahc_patch1_func, 330, 47, 11 },
+-	{ ahc_patch6_func, 337, 2, 4 },
+-	{ ahc_patch7_func, 337, 1, 1 },
+-	{ ahc_patch8_func, 338, 1, 1 },
+-	{ ahc_patch0_func, 339, 1, 1 },
+-	{ ahc_patch16_func, 340, 1, 1 },
+-	{ ahc_patch6_func, 356, 6, 3 },
+-	{ ahc_patch16_func, 356, 5, 1 },
+-	{ ahc_patch0_func, 362, 7, 1 },
+-	{ ahc_patch13_func, 372, 5, 1 },
+-	{ ahc_patch0_func, 377, 52, 17 },
+-	{ ahc_patch14_func, 377, 1, 1 },
+-	{ ahc_patch7_func, 379, 2, 2 },
+-	{ ahc_patch17_func, 380, 1, 1 },
+-	{ ahc_patch9_func, 383, 1, 1 },
+-	{ ahc_patch18_func, 390, 1, 1 },
+-	{ ahc_patch14_func, 395, 9, 3 },
+-	{ ahc_patch9_func, 396, 3, 2 },
+-	{ ahc_patch0_func, 399, 3, 1 },
+-	{ ahc_patch9_func, 407, 6, 2 },
+-	{ ahc_patch0_func, 413, 9, 2 },
+-	{ ahc_patch13_func, 413, 1, 1 },
+-	{ ahc_patch13_func, 422, 2, 1 },
+-	{ ahc_patch14_func, 424, 1, 1 },
+-	{ ahc_patch9_func, 426, 1, 2 },
+-	{ ahc_patch0_func, 427, 1, 1 },
+-	{ ahc_patch7_func, 428, 1, 1 },
++	{ ahc_patch1_func, 249, 1, 2 },
++	{ ahc_patch0_func, 250, 2, 2 },
++	{ ahc_patch11_func, 251, 1, 1 },
++	{ ahc_patch9_func, 259, 27, 3 },
++	{ ahc_patch1_func, 275, 10, 2 },
++	{ ahc_patch13_func, 278, 1, 1 },
++	{ ahc_patch14_func, 286, 14, 1 },
++	{ ahc_patch1_func, 302, 1, 2 },
++	{ ahc_patch0_func, 303, 1, 1 },
++	{ ahc_patch9_func, 306, 1, 1 },
++	{ ahc_patch13_func, 311, 1, 1 },
++	{ ahc_patch9_func, 312, 2, 2 },
++	{ ahc_patch0_func, 314, 4, 1 },
++	{ ahc_patch14_func, 318, 1, 1 },
++	{ ahc_patch15_func, 320, 2, 3 },
++	{ ahc_patch9_func, 320, 1, 2 },
++	{ ahc_patch0_func, 321, 1, 1 },
++	{ ahc_patch6_func, 326, 1, 2 },
++	{ ahc_patch0_func, 327, 1, 1 },
++	{ ahc_patch1_func, 331, 47, 11 },
++	{ ahc_patch6_func, 338, 2, 4 },
++	{ ahc_patch7_func, 338, 1, 1 },
++	{ ahc_patch8_func, 339, 1, 1 },
++	{ ahc_patch0_func, 340, 1, 1 },
++	{ ahc_patch16_func, 341, 1, 1 },
++	{ ahc_patch6_func, 357, 6, 3 },
++	{ ahc_patch16_func, 357, 5, 1 },
++	{ ahc_patch0_func, 363, 7, 1 },
++	{ ahc_patch13_func, 373, 5, 1 },
++	{ ahc_patch0_func, 378, 52, 17 },
++	{ ahc_patch14_func, 378, 1, 1 },
++	{ ahc_patch7_func, 380, 2, 2 },
++	{ ahc_patch17_func, 381, 1, 1 },
++	{ ahc_patch9_func, 384, 1, 1 },
++	{ ahc_patch18_func, 391, 1, 1 },
++	{ ahc_patch14_func, 396, 9, 3 },
++	{ ahc_patch9_func, 397, 3, 2 },
++	{ ahc_patch0_func, 400, 3, 1 },
++	{ ahc_patch9_func, 408, 6, 2 },
++	{ ahc_patch0_func, 414, 9, 2 },
++	{ ahc_patch13_func, 414, 1, 1 },
++	{ ahc_patch13_func, 423, 2, 1 },
++	{ ahc_patch14_func, 425, 1, 1 },
++	{ ahc_patch9_func, 427, 1, 2 },
++	{ ahc_patch0_func, 428, 1, 1 },
+ 	{ ahc_patch7_func, 429, 1, 1 },
+-	{ ahc_patch8_func, 430, 3, 3 },
+-	{ ahc_patch6_func, 431, 1, 2 },
+-	{ ahc_patch0_func, 432, 1, 1 },
+-	{ ahc_patch9_func, 433, 1, 1 },
+-	{ ahc_patch15_func, 434, 1, 2 },
+-	{ ahc_patch13_func, 434, 1, 1 },
+-	{ ahc_patch14_func, 436, 9, 4 },
+-	{ ahc_patch9_func, 436, 1, 1 },
+-	{ ahc_patch9_func, 443, 2, 1 },
+-	{ ahc_patch0_func, 445, 4, 3 },
+-	{ ahc_patch9_func, 445, 1, 2 },
+-	{ ahc_patch0_func, 446, 3, 1 },
+-	{ ahc_patch1_func, 450, 2, 1 },
+-	{ ahc_patch7_func, 452, 10, 2 },
+-	{ ahc_patch0_func, 462, 1, 1 },
+-	{ ahc_patch8_func, 463, 118, 22 },
+-	{ ahc_patch1_func, 465, 3, 2 },
+-	{ ahc_patch0_func, 468, 5, 3 },
+-	{ ahc_patch9_func, 468, 2, 2 },
+-	{ ahc_patch0_func, 470, 3, 1 },
+-	{ ahc_patch1_func, 475, 2, 2 },
+-	{ ahc_patch0_func, 477, 6, 3 },
+-	{ ahc_patch9_func, 477, 2, 2 },
+-	{ ahc_patch0_func, 479, 3, 1 },
+-	{ ahc_patch1_func, 485, 2, 2 },
+-	{ ahc_patch0_func, 487, 9, 7 },
+-	{ ahc_patch9_func, 487, 5, 6 },
+-	{ ahc_patch19_func, 487, 1, 2 },
+-	{ ahc_patch0_func, 488, 1, 1 },
+-	{ ahc_patch19_func, 490, 1, 2 },
+-	{ ahc_patch0_func, 491, 1, 1 },
+-	{ ahc_patch0_func, 492, 4, 1 },
+-	{ ahc_patch6_func, 497, 3, 2 },
+-	{ ahc_patch0_func, 500, 1, 1 },
+-	{ ahc_patch6_func, 510, 1, 2 },
+-	{ ahc_patch0_func, 511, 1, 1 },
+-	{ ahc_patch20_func, 548, 7, 1 },
+-	{ ahc_patch3_func, 583, 1, 2 },
+-	{ ahc_patch0_func, 584, 1, 1 },
+-	{ ahc_patch21_func, 587, 1, 1 },
+-	{ ahc_patch8_func, 589, 106, 33 },
+-	{ ahc_patch4_func, 591, 1, 1 },
+-	{ ahc_patch1_func, 597, 2, 2 },
+-	{ ahc_patch0_func, 599, 1, 1 },
+-	{ ahc_patch1_func, 602, 1, 2 },
+-	{ ahc_patch0_func, 603, 1, 1 },
+-	{ ahc_patch9_func, 604, 3, 3 },
+-	{ ahc_patch15_func, 605, 1, 1 },
+-	{ ahc_patch0_func, 607, 4, 1 },
+-	{ ahc_patch19_func, 616, 2, 2 },
+-	{ ahc_patch0_func, 618, 1, 1 },
+-	{ ahc_patch19_func, 622, 10, 3 },
+-	{ ahc_patch5_func, 624, 8, 1 },
+-	{ ahc_patch0_func, 632, 9, 2 },
+-	{ ahc_patch5_func, 633, 8, 1 },
+-	{ ahc_patch4_func, 643, 1, 2 },
+-	{ ahc_patch0_func, 644, 1, 1 },
+-	{ ahc_patch19_func, 645, 1, 2 },
+-	{ ahc_patch0_func, 646, 3, 2 },
+-	{ ahc_patch4_func, 648, 1, 1 },
+-	{ ahc_patch5_func, 649, 1, 1 },
+-	{ ahc_patch5_func, 652, 1, 1 },
+-	{ ahc_patch5_func, 654, 1, 1 },
+-	{ ahc_patch4_func, 656, 2, 2 },
+-	{ ahc_patch0_func, 658, 2, 1 },
+-	{ ahc_patch5_func, 660, 1, 1 },
+-	{ ahc_patch5_func, 663, 1, 1 },
+-	{ ahc_patch5_func, 666, 1, 1 },
+-	{ ahc_patch19_func, 670, 1, 1 },
+-	{ ahc_patch19_func, 673, 1, 1 },
+-	{ ahc_patch4_func, 679, 1, 1 },
+-	{ ahc_patch6_func, 682, 1, 2 },
+-	{ ahc_patch0_func, 683, 1, 1 },
+-	{ ahc_patch7_func, 695, 16, 1 },
+-	{ ahc_patch4_func, 711, 20, 1 },
+-	{ ahc_patch9_func, 732, 4, 2 },
+-	{ ahc_patch0_func, 736, 4, 1 },
+-	{ ahc_patch9_func, 740, 4, 2 },
+-	{ ahc_patch0_func, 744, 3, 1 },
+-	{ ahc_patch6_func, 750, 1, 1 },
+-	{ ahc_patch22_func, 752, 14, 1 },
+-	{ ahc_patch7_func, 766, 3, 1 },
+-	{ ahc_patch9_func, 778, 24, 8 },
+-	{ ahc_patch19_func, 782, 1, 2 },
+-	{ ahc_patch0_func, 783, 1, 1 },
+-	{ ahc_patch15_func, 788, 4, 2 },
+-	{ ahc_patch0_func, 792, 7, 3 },
+-	{ ahc_patch23_func, 792, 5, 2 },
+-	{ ahc_patch0_func, 797, 2, 1 },
+-	{ ahc_patch0_func, 802, 42, 3 },
+-	{ ahc_patch18_func, 814, 18, 2 },
+-	{ ahc_patch0_func, 832, 1, 1 },
+-	{ ahc_patch4_func, 856, 1, 1 },
+-	{ ahc_patch4_func, 857, 3, 2 },
+-	{ ahc_patch0_func, 860, 1, 1 },
+-	{ ahc_patch13_func, 861, 3, 1 },
+-	{ ahc_patch4_func, 864, 12, 1 }
++	{ ahc_patch7_func, 430, 1, 1 },
++	{ ahc_patch8_func, 431, 3, 3 },
++	{ ahc_patch6_func, 432, 1, 2 },
++	{ ahc_patch0_func, 433, 1, 1 },
++	{ ahc_patch9_func, 434, 1, 1 },
++	{ ahc_patch15_func, 435, 1, 2 },
++	{ ahc_patch13_func, 435, 1, 1 },
++	{ ahc_patch14_func, 437, 9, 4 },
++	{ ahc_patch9_func, 437, 1, 1 },
++	{ ahc_patch9_func, 444, 2, 1 },
++	{ ahc_patch0_func, 446, 4, 3 },
++	{ ahc_patch9_func, 446, 1, 2 },
++	{ ahc_patch0_func, 447, 3, 1 },
++	{ ahc_patch1_func, 451, 2, 1 },
++	{ ahc_patch7_func, 453, 10, 2 },
++	{ ahc_patch0_func, 463, 1, 1 },
++	{ ahc_patch8_func, 464, 118, 22 },
++	{ ahc_patch1_func, 466, 3, 2 },
++	{ ahc_patch0_func, 469, 5, 3 },
++	{ ahc_patch9_func, 469, 2, 2 },
++	{ ahc_patch0_func, 471, 3, 1 },
++	{ ahc_patch1_func, 476, 2, 2 },
++	{ ahc_patch0_func, 478, 6, 3 },
++	{ ahc_patch9_func, 478, 2, 2 },
++	{ ahc_patch0_func, 480, 3, 1 },
++	{ ahc_patch1_func, 486, 2, 2 },
++	{ ahc_patch0_func, 488, 9, 7 },
++	{ ahc_patch9_func, 488, 5, 6 },
++	{ ahc_patch19_func, 488, 1, 2 },
++	{ ahc_patch0_func, 489, 1, 1 },
++	{ ahc_patch19_func, 491, 1, 2 },
++	{ ahc_patch0_func, 492, 1, 1 },
++	{ ahc_patch0_func, 493, 4, 1 },
++	{ ahc_patch6_func, 498, 3, 2 },
++	{ ahc_patch0_func, 501, 1, 1 },
++	{ ahc_patch6_func, 511, 1, 2 },
++	{ ahc_patch0_func, 512, 1, 1 },
++	{ ahc_patch20_func, 549, 7, 1 },
++	{ ahc_patch3_func, 584, 1, 2 },
++	{ ahc_patch0_func, 585, 1, 1 },
++	{ ahc_patch21_func, 588, 1, 1 },
++	{ ahc_patch8_func, 590, 106, 33 },
++	{ ahc_patch4_func, 592, 1, 1 },
++	{ ahc_patch1_func, 598, 2, 2 },
++	{ ahc_patch0_func, 600, 1, 1 },
++	{ ahc_patch1_func, 603, 1, 2 },
++	{ ahc_patch0_func, 604, 1, 1 },
++	{ ahc_patch9_func, 605, 3, 3 },
++	{ ahc_patch15_func, 606, 1, 1 },
++	{ ahc_patch0_func, 608, 4, 1 },
++	{ ahc_patch19_func, 617, 2, 2 },
++	{ ahc_patch0_func, 619, 1, 1 },
++	{ ahc_patch19_func, 623, 10, 3 },
++	{ ahc_patch5_func, 625, 8, 1 },
++	{ ahc_patch0_func, 633, 9, 2 },
++	{ ahc_patch5_func, 634, 8, 1 },
++	{ ahc_patch4_func, 644, 1, 2 },
++	{ ahc_patch0_func, 645, 1, 1 },
++	{ ahc_patch19_func, 646, 1, 2 },
++	{ ahc_patch0_func, 647, 3, 2 },
++	{ ahc_patch4_func, 649, 1, 1 },
++	{ ahc_patch5_func, 650, 1, 1 },
++	{ ahc_patch5_func, 653, 1, 1 },
++	{ ahc_patch5_func, 655, 1, 1 },
++	{ ahc_patch4_func, 657, 2, 2 },
++	{ ahc_patch0_func, 659, 2, 1 },
++	{ ahc_patch5_func, 661, 1, 1 },
++	{ ahc_patch5_func, 664, 1, 1 },
++	{ ahc_patch5_func, 667, 1, 1 },
++	{ ahc_patch19_func, 671, 1, 1 },
++	{ ahc_patch19_func, 674, 1, 1 },
++	{ ahc_patch4_func, 680, 1, 1 },
++	{ ahc_patch6_func, 683, 1, 2 },
++	{ ahc_patch0_func, 684, 1, 1 },
++	{ ahc_patch7_func, 696, 16, 1 },
++	{ ahc_patch4_func, 712, 20, 1 },
++	{ ahc_patch9_func, 733, 4, 2 },
++	{ ahc_patch0_func, 737, 4, 1 },
++	{ ahc_patch9_func, 741, 4, 2 },
++	{ ahc_patch0_func, 745, 3, 1 },
++	{ ahc_patch6_func, 751, 1, 1 },
++	{ ahc_patch22_func, 753, 14, 1 },
++	{ ahc_patch7_func, 767, 3, 1 },
++	{ ahc_patch9_func, 779, 24, 8 },
++	{ ahc_patch19_func, 783, 1, 2 },
++	{ ahc_patch0_func, 784, 1, 1 },
++	{ ahc_patch15_func, 789, 4, 2 },
++	{ ahc_patch0_func, 793, 7, 3 },
++	{ ahc_patch23_func, 793, 5, 2 },
++	{ ahc_patch0_func, 798, 2, 1 },
++	{ ahc_patch0_func, 803, 42, 3 },
++	{ ahc_patch18_func, 815, 18, 2 },
++	{ ahc_patch0_func, 833, 1, 1 },
++	{ ahc_patch4_func, 857, 1, 1 },
++	{ ahc_patch4_func, 858, 3, 2 },
++	{ ahc_patch0_func, 861, 1, 1 },
++	{ ahc_patch13_func, 862, 3, 1 },
++	{ ahc_patch4_func, 865, 12, 1 }
+ };
+ 
+ static struct cs {
+@@ -1296,11 +1297,11 @@ static struct cs {
+ } critical_sections[] = {
+ 	{ 11, 18 },
+ 	{ 21, 30 },
+-	{ 711, 727 },
+-	{ 857, 860 },
+-	{ 864, 870 },
+-	{ 872, 874 },
+-	{ 874, 876 }
++	{ 712, 728 },
++	{ 858, 861 },
++	{ 865, 871 },
++	{ 873, 875 },
++	{ 875, 877 }
+ };
+ 
+ static const int num_critical_sections = sizeof(critical_sections)
+--- linux-2.6.0/drivers/scsi/aic7xxx/aicasm/aicasm.c	2003-06-14 12:18:06.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aicasm/aicasm.c	2003-12-28 23:21:40.000000000 -0800
+@@ -37,7 +37,7 @@
+  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  * POSSIBILITY OF SUCH DAMAGES.
+  *
+- * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm.c#22 $
++ * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm.c#23 $
+  *
+  * $FreeBSD$
+  */
+@@ -609,10 +609,10 @@ output_listing(char *ifilename)
+ 
+ 		while (line < cur_instr->srcline) {
+ 			fgets(buf, sizeof(buf), ifile);
+-				fprintf(listfile, "\t\t%s", buf);
++				fprintf(listfile, "             \t%s", buf);
+ 				line++;
+ 		}
+-		fprintf(listfile, "%03x %02x%02x%02x%02x", instrptr,
++		fprintf(listfile, "%04x %02x%02x%02x%02x", instrptr,
+ #if BYTE_ORDER == LITTLE_ENDIAN
+ 			cur_instr->format.bytes[0],
+ 			cur_instr->format.bytes[1],
+@@ -624,14 +624,23 @@ output_listing(char *ifilename)
+ 			cur_instr->format.bytes[1],
+ 			cur_instr->format.bytes[0]);
+ #endif
+-		fgets(buf, sizeof(buf), ifile);
+-		fprintf(listfile, "\t%s", buf);
+-		line++;
++		/*
++		 * Macro expansions can cause several instructions
++		 * to be output for a single source line.  Only
++		 * advance the line once in these cases.
++		 */
++		if (line == cur_instr->srcline) {
++			fgets(buf, sizeof(buf), ifile);
++			fprintf(listfile, "\t%s", buf);
++			line++;
++		} else {
++			fprintf(listfile, "\n");
++		}
+ 		instrptr++;
+ 	}
+ 	/* Dump the remainder of the file */
+ 	while(fgets(buf, sizeof(buf), ifile) != NULL)
+-		fprintf(listfile, "\t\t%s", buf);
++		fprintf(listfile, "             %s", buf);
+ 
+ 	fclose(ifile);
+ }
+--- linux-2.6.0/drivers/scsi/aic7xxx/aicasm/aicasm_macro_scan.l	2003-06-14 12:18:09.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aicasm/aicasm_macro_scan.l	2003-12-28 23:21:40.000000000 -0800
+@@ -38,7 +38,7 @@
+  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  * POSSIBILITY OF SUCH DAMAGES.
+  *
+- * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_macro_scan.l#7 $
++ * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_macro_scan.l#8 $
+  *
+  * $FreeBSD$
+  */
+@@ -78,6 +78,7 @@ MCARG		[^(), \t]+
+ \n			{
+ 				++yylineno;
+ 			}
++\r			;
+ <ARGLIST>{SPACE}	;
+ <ARGLIST>\(		{
+ 				parren_count++;
+--- linux-2.6.0/drivers/scsi/aic7xxx/aicasm/aicasm_scan.l	2003-06-14 12:18:29.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aicasm/aicasm_scan.l	2003-12-28 23:21:40.000000000 -0800
+@@ -38,7 +38,7 @@
+  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  * POSSIBILITY OF SUCH DAMAGES.
+  *
+- * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_scan.l#18 $
++ * $Id: //depot/aic7xxx/aic7xxx/aicasm/aicasm_scan.l#19 $
+  *
+  * $FreeBSD$
+  */
+@@ -87,6 +87,7 @@ MBODY		((\\[^\n])*[^\n\\]*)+
+ 
+ %%
+ \n			{ ++yylineno; }
++\r			;
+ "/*"			{ BEGIN COMMENT;  /* Enter comment eating state */ }
+ <COMMENT>"/*"		{ fprintf(stderr, "Warning! Comment within comment."); }
+ <COMMENT>\n		{ ++yylineno; }
+@@ -114,6 +115,7 @@ if[ \t]*\(		{
+ 				}
+ 			}
+ <CEXPR>\n		{ ++yylineno; }
++<CEXPR>\r		;
+ <CEXPR>[^()\n]+	{
+ 				char *yptr;
+ 
+@@ -359,6 +361,7 @@ else			{ return T_ELSE; }
+ 				/* Eat escaped newlines. */
+ 				++yylineno;
+ 			}
++<MACROBODY>\r		;
+ <MACROBODY>\n		{
+ 				/* Macros end on the first unescaped newline. */
+ 				BEGIN INITIAL;
+@@ -369,10 +372,17 @@ else			{ return T_ELSE; }
+ 			}
+ <MACROBODY>{MBODY}	{
+ 				char *yptr;
++				char c;
+ 
+ 				yptr = yytext;
+-				while (*yptr)
+-					*string_buf_ptr++ = *yptr++;
++				while (c = *yptr++) {
++					/*
++					 * Strip carriage returns.
++					 */
++					if (c == '\r')
++						continue;
++					*string_buf_ptr++ = c;
++				}
+ 			}
+ {WORD}\(		{
+ 				char *yptr;
+--- linux-2.6.0/drivers/scsi/aic7xxx/aicasm/Makefile	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/scsi/aic7xxx/aicasm/Makefile	2003-12-28 23:21:40.000000000 -0800
+@@ -49,11 +49,19 @@ aicdb.h:
+ clean:
+ 	rm -f $(clean-files)
+ 
++# Create a dependency chain in generated files
++# to avoid concurrent invocations of the single
++# rule that builds them all.
++aicasm_gram.c: aicasm_gram.h
+ aicasm_gram.c aicasm_gram.h: aicasm_gram.y
+ 	$(YACC) $(YFLAGS) -b $(<:.y=) $<
+ 	mv $(<:.y=).tab.c $(<:.y=.c)
+ 	mv $(<:.y=).tab.h $(<:.y=.h)
+ 
++# Create a dependency chain in generated files
++# to avoid concurrent invocations of the single
++# rule that builds them all.
++aicasm_macro_gram.c: aicasm_macro_gram.h
+ aicasm_macro_gram.c aicasm_macro_gram.h: aicasm_macro_gram.y
+ 	$(YACC) $(YFLAGS) -b $(<:.y=) -p mm $<
+ 	mv $(<:.y=).tab.c $(<:.y=.c)
+--- 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$
+  */
+ 
+-#include <linux/blkdev.h>
+-#include <linux/delay.h>
+-#include <linux/version.h>
+-
+-/* Core SCSI definitions */
+-#include "scsi.h"
+-#include "hosts.h"
+-#include "aiclib.h"
+-#include "cam.h"
+-
+ #ifndef FALSE
+ #define FALSE   0
+ #endif /* FALSE */
+@@ -1410,3 +1400,336 @@ aic_parse_brace_option(char *opt_name, c
+ 	}
+ 	return (opt_arg);
+ }
++
++/************************* Magic SysReq Support *******************************/
++void
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
++aic_sysrq_handler(int key, struct pt_regs *unused, struct kbd_struct *unused1,
++		  struct tty_struct *unused2)
++#else
++aic_sysrq_handler(int key, struct pt_regs *unused, struct tty_struct *unused2)
++#endif
++{
++#ifdef CONFIG_MAGIC_SYSRQ
++	struct aic_softc *aic;
++	u_long l;
++
++	aic_list_lock(&l);
++
++	TAILQ_FOREACH(aic, &aic_tailq, links) {
++		u_long s;
++
++		aic_lock(aic, &s);
++		aic_dump_card_state(aic);
++		aic_unlock(aic, &s);
++	}
++	aic_list_unlock(&l);
++#endif
++}
++
++int
++aic_install_sysrq(struct aic_sysrq_key_op *key_op)
++{
++#ifdef CONFIG_MAGIC_SYSRQ
++	char *str;
++	int len;
++	int i;
++
++	str = key_op->help_msg;
++	len = strlen(str);
++	for (i = 0; i < len; i++) {
++		int key;
++
++		key = str[i];
++		if (register_sysrq_key(key, key_op) == 0) {
++
++			if (key >= 'a' && key <= 'z')
++				str[i] = key + ('A' - 'a');
++			return (key);
++		}
++	}
++#endif
++	return (0);
++}
++
++void
++aic_remove_sysrq(int key, struct aic_sysrq_key_op *key_op)
++{
++#ifdef CONFIG_MAGIC_SYSRQ
++	unregister_sysrq_key(key, key_op);
++#endif
++}
++
++/******************************** Bus DMA *************************************/
++int
++aic_dma_tag_create(struct aic_softc *aic, bus_dma_tag_t parent,
++		   bus_size_t alignment, bus_size_t boundary,
++		   bus_addr_t lowaddr, bus_addr_t highaddr,
++		   bus_dma_filter_t *filter, void *filterarg,
++		   bus_size_t maxsize, int nsegments,
++		   bus_size_t maxsegsz, int flags, bus_dma_tag_t *ret_tag)
++{
++	bus_dma_tag_t dmat;
++
++	dmat = malloc(sizeof(*dmat), M_DEVBUF, M_NOWAIT);
++	if (dmat == NULL)
++		return (ENOMEM);
++
++	/*
++	 * Linux is very simplistic about DMA memory.  For now don't
++	 * maintain all specification information.  Once Linux supplies
++	 * better facilities for doing these operations, or the
++	 * needs of this particular driver change, we might need to do
++	 * more here.
++	 */
++	dmat->alignment = alignment;
++	dmat->boundary = boundary;
++	dmat->maxsize = maxsize;
++	*ret_tag = dmat;
++	return (0);
++}
++
++void
++aic_dma_tag_destroy(struct aic_softc *aic, bus_dma_tag_t dmat)
++{
++	free(dmat, M_DEVBUF);
++}
++
++int
++aic_dmamem_alloc(struct aic_softc *aic, bus_dma_tag_t dmat, void** vaddr,
++		 int flags, bus_dmamap_t *mapp)
++{
++	bus_dmamap_t map;
++
++	map = malloc(sizeof(*map), M_DEVBUF, M_NOWAIT);
++	if (map == NULL)
++		return (ENOMEM);
++	/*
++	 * Although we can dma data above 4GB, our
++	 * coherent memory is below 4GB for
++	 * space efficiency reasons (only need a 4byte
++	 * address).  For this reason, we have to reset
++	 * our dma mask when doing allocations.
++	 */
++	aic_set_dma_mask(aic, 0xFFFFFFFF);
++	*vaddr = aic_alloc_coherent(aic, dmat->maxsize, &map->bus_addr);
++	aic_set_dma_mask(aic, aic->platform_data->hw_dma_mask);
++	if (*vaddr == NULL)
++		return (ENOMEM);
++	*mapp = map;
++	return(0);
++}
++
++void
++aic_dmamem_free(struct aic_softc *aic, bus_dma_tag_t dmat,
++		void* vaddr, bus_dmamap_t map)
++{
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
++	aic_free_coherent(aic, dmat->maxsize, vaddr, map->bus_addr);
++#else
++	free(vaddr, M_DEVBUF);
++#endif
++}
++
++int
++aic_dmamap_load(struct aic_softc *aic, bus_dma_tag_t dmat, bus_dmamap_t map,
++		void *buf, bus_size_t buflen, bus_dmamap_callback_t *cb,
++		void *cb_arg, int flags)
++{
++	/*
++	 * Assume for now that this will only be used during
++	 * initialization and not for per-transaction buffer mapping.
++	 */
++	bus_dma_segment_t stack_sg;
++
++	stack_sg.ds_addr = map->bus_addr;
++	stack_sg.ds_len = dmat->maxsize;
++	cb(cb_arg, &stack_sg, /*nseg*/1, /*error*/0);
++	return (0);
++}
++
++void
++aic_dmamap_destroy(struct aic_softc *aic, bus_dma_tag_t dmat, bus_dmamap_t map)
++{
++	free(map, M_DEVBUF);
++}
++
++int
++aic_dmamap_unload(struct aic_softc *aic, bus_dma_tag_t dmat, bus_dmamap_t map)
++{
++	/* Nothing to do */
++	return (0);
++}
++
++/***************************** Queue Handling ********************************/
++/*
++ * In 2.4.X and above, this routine is called from a tasklet,
++ * so we must re-acquire our lock prior to executing this code.
++ * In all prior kernels, aic_schedule_runq() calls this routine
++ * directly and aic_schedule_runq() is called with our lock held.
++ */
++void
++aic_runq_tasklet(unsigned long data)
++{
++	struct aic_softc* aic;
++	struct aic_linux_device *dev;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
++	u_long flags;
++#endif
++
++	aic = (struct aic_softc *)data;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
++	aic_lock(aic, &flags);
++#endif
++	while ((dev = aic_linux_next_device_to_run(aic)) != NULL) {
++	
++		TAILQ_REMOVE(&aic->platform_data->device_runq, dev, links);
++		dev->flags &= ~AIC_DEV_ON_RUN_LIST;
++		aic_linux_check_device_queue(aic, dev);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
++		/* Yeild to our interrupt handler */
++		aic_unlock(aic, &flags);
++		aic_lock(aic, &flags);
++#endif
++	}
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
++	aic_unlock(aic, &flags);
++#endif
++}
++
++void
++aic_unblock_tasklet(unsigned long data)
++{
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
++	struct aic_softc* aic;
++
++	aic = (struct aic_softc *)data;
++	scsi_unblock_requests(aic->platform_data->host);
++#else
++#error "Fix 2.2.X Kernel Support"
++#endif
++}
++
++void
++aic_bus_settle_complete(u_long data)
++{
++	struct aic_softc *aic;
++	u_long s;
++
++	aic = (struct aic_softc *)data;
++	/*
++	 * Guard against our bottom half scheduling another
++	 * bus settle delay just as our timer runs.  If this
++	 * occurs, do nothing.  The newly scheduled timer will
++	 * take care of things.
++	 */
++	aic_lock(aic, &s);
++	if (timer_pending(&aic->platform_data->bus_settle_timer) == 0) {
++		aic->platform_data->flags &= ~AIC_BUS_SETTLE_TIMER;
++		aic_release_simq_locked(aic);
++	}
++	aic_unlock(aic, &s);
++}
++
++void
++aic_freeze_simq(struct aic_softc *aic)
++{
++	aic->platform_data->qfrozen++;
++	if (aic->platform_data->qfrozen == 1)
++		scsi_block_requests(aic->platform_data->host);
++}
++
++void
++aic_release_simq(struct aic_softc *aic)
++{
++	u_long s;
++
++	aic_lock(aic, &s);
++	aic_release_simq_locked(aic);
++	aic_unlock(aic, &s);
++}
++
++void
++aic_release_simq_locked(struct aic_softc *aic)
++{
++
++	if (aic->platform_data->qfrozen > 0)
++		aic->platform_data->qfrozen--;
++	if (AIC_DV_SIMQ_FROZEN(aic)
++	 && ((aic->platform_data->flags & AIC_DV_WAIT_SIMQ_RELEASE) != 0)) {
++		aic->platform_data->flags &= ~AIC_DV_WAIT_SIMQ_RELEASE;
++		up(&aic->platform_data->dv_sem);
++	}
++	if (aic->platform_data->qfrozen == 0) {
++		aic_schedule_unblock(aic);
++		aic_schedule_runq(aic);
++	}
++}
++
++/***************************** Timer Facilities *******************************/
++void
++aic_platform_timeout(struct scsi_cmnd *cmd)
++{
++
++	if (AIC_DV_CMD(cmd) != 0) {
++
++		aic_linux_dv_timeout(cmd);
++	} else {
++		struct	scb *scb;
++		struct	aic_softc *aic;
++		u_long	s;
++
++		scb = (struct scb *)cmd->host_scribble;
++		aic = scb->aic_softc;
++		aic_lock(aic, &s);
++
++		if (scb == NULL
++		 || scb->flags == SCB_FLAG_NONE) {
++			int done_late;
++
++			/*
++			 * Handle timeout/completion races.
++			 * If the command is still sitting on
++			 * our completion queue, just re-instate
++			 * the timeout.  If we've already completed
++			 * the command, the function pointer in our
++			 * timer will be cleared and we will need to
++			 * additionally complete it again to the mid-layer.
++			 *
++			 * Since done_late is cleared by adding a
++			 * timer, we must save off its value first.
++			 */
++			done_late = cmd->eh_timeout.function == NULL;
++			scsi_add_timer(cmd, 60*HZ, aic_linux_midlayer_timeout);
++			if (done_late)
++				cmd->scsi_done(cmd);
++		} else if ((scb->platform_data->flags & AIC_TIMEOUT_ACTIVE)) {
++
++			/*
++			 * Handle the case of timeouts that expire just
++			 * as we delete timers during recovery by skipping
++			 * SCBs that don't have timers active.
++			 */
++			scb->platform_data->flags &= ~AIC_TIMEOUT_ACTIVE;
++
++			/*
++			 * We must clear out the function pointer so that
++			 * scsi_add_timer does not believe that a del_timer
++			 * is required before setting up a new timer for
++			 * this command.
++			 */
++			scb->io_ctx->eh_timeout.function = NULL;
++			aic_timeout(scb);
++		}
++		aic_unlock(aic, &s);
++	}
++}
++
++void
++aic_linux_midlayer_timeout(struct scsi_cmnd *cmd)
++{
++	struct aic_softc *aic;
++
++	aic = *(struct aic_softc **)cmd->device->host->hostdata;
++	printf("%s: midlayer_timeout\n", aic_name(aic));
++}
+--- linux-2.6.0/drivers/scsi/aic7xxx/aiclib.h	2003-06-14 12:17:57.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aiclib.h	2003-12-28 23:21:40.000000000 -0800
+@@ -1,4 +1,5 @@
+ /*
++ * SCSI definitions...
+  * Largely written by Julian Elischer (julian@tfs.com)
+  * for TRW Financial Systems.
+  *
+@@ -57,6 +58,42 @@
+ #ifndef	_AICLIB_H
+ #define _AICLIB_H
+ 
++#include <linux/types.h>
++#include <linux/delay.h>
++#include <linux/ioport.h>
++#include <linux/pci.h>
++#include <linux/smp_lock.h>
++#include <linux/module.h>
++#include <asm/byteorder.h>
++#include <asm/io.h>
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
++#include <linux/slab.h>
++#else
++#include <linux/malloc.h>
++#endif
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
++#include <linux/interrupt.h> /* For tasklet support. */
++#endif
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
++#include <linux/blk.h>
++#endif
++#include <linux/blkdev.h>
++
++#include "scsi.h"
++#include "hosts.h"
++
++/* Name space conflict with BSD queue macros */
++#ifdef LIST_HEAD
++#undef LIST_HEAD
++#endif
++#include "cam.h"
++#include "queue.h"
++#include "scsi_message.h"
++#include "scsi_iu.h"
++
+ /*
+  * Linux Interrupt Support.
+  */
+@@ -66,9 +103,731 @@ typedef void irqreturn_t;
+ #endif
+ 
+ /*
+- * SCSI command format
++ * Linux Timer Support.
++ */
++#define AIC_USECS_PER_JIFFY (1000000/HZ)
++
++/**************************** Module Library Hack *****************************/
++/*
++ * What we'd like to do is have a single "scsi library" module that both the
++ * aic7xxx and aic79xx drivers could load and depend on.  A cursory examination
++ * of implementing module dependencies in Linux (handling the install and
++ * initrd cases) does not look promissing.  For now, we just duplicate this
++ * code in both drivers using a simple symbol renaming scheme that hides this
++ * hack from the drivers.
++ */
++#define AIC_LIB_ENTRY_CONCAT(x, prefix)	prefix ## x
++#define	AIC_LIB_ENTRY_EXPAND(x, prefix) AIC_LIB_ENTRY_CONCAT(x, prefix)
++#define AIC_LIB_ENTRY(x)		AIC_LIB_ENTRY_EXPAND(x, AIC_LIB_PREFIX)
++
++#define AIC_CONST_ENTRY(x)		AIC_LIB_ENTRY_EXPAND(x,AIC_CONST_PREFIX)
++
++#define	aic_sense_desc			AIC_LIB_ENTRY(_sense_desc)
++#define	aic_sense_error_action		AIC_LIB_ENTRY(_sense_error_action)
++#define	aic_error_action		AIC_LIB_ENTRY(_error_action)
++#define	aic_op_desc			AIC_LIB_ENTRY(_op_desc)
++#define	aic_cdb_string			AIC_LIB_ENTRY(_cdb_string)
++#define aic_print_inquiry		AIC_LIB_ENTRY(_print_inquiry)
++#define aic_calc_syncsrate		AIC_LIB_ENTRY(_calc_syncrate)
++#define	aic_calc_syncparam		AIC_LIB_ENTRY(_calc_syncparam)
++#define	aic_calc_speed			AIC_LIB_ENTRY(_calc_speed)
++#define	aic_inquiry_match		AIC_LIB_ENTRY(_inquiry_match)
++#define	aic_static_inquiry_match	AIC_LIB_ENTRY(_static_inquiry_match)
++#define	aic_parse_brace_option		AIC_LIB_ENTRY(_parse_brace_option)
++#define	aic_power_state_change		AIC_LIB_ENTRY(_power_state_change)
++#define	aic_sysrq_handler		AIC_LIB_ENTRY(_sysrq_handler)
++#define	aic_install_sysrq		AIC_LIB_ENTRY(_install_sysrq)
++#define	aic_remove_sysrq		AIC_LIB_ENTRY(_remove_sysrq)
++#define	aic_list_lock			AIC_LIB_ENTRY(_list_lock)
++#define	aic_list_unlock			AIC_LIB_ENTRY(_list_unlock)
++#define	aic_lock			AIC_LIB_ENTRY(_lock)
++#define	aic_unlock			AIC_LIB_ENTRY(_unlock)
++#define	aic_dump_card_state		AIC_LIB_ENTRY(_dump_card_state)
++#define	aic_linux_dv_complete		AIC_LIB_ENTRY(_linux_dv_complete)
++#define	aic_linux_run_device_queue	AIC_LIB_ENTRY(_linux_run_device_queue)
++#define	aic_linux_dv_timeout		AIC_LIB_ENTRY(_linux_dv_timeout)
++#define	aic_linux_midlayer_timeout	AIC_LIB_ENTRY(_linux_midlayer_timeout)
++#define	aic_freeze_simq			AIC_LIB_ENTRY(_freeze_simq)
++#define	aic_bus_settle_complete		AIC_LIB_ENTRY(_bus_settle_complete)
++#define	aic_release_simq		AIC_LIB_ENTRY(_release_simq)
++#define	aic_release_simq		AIC_LIB_ENTRY(_release_simq)
++#define	aic_release_simq_locked		AIC_LIB_ENTRY(_release_simq_locked)
++#define	aic_dma_tag_create		AIC_LIB_ENTRY(_dma_tag_create)
++#define	aic_dma_tag_destroy		AIC_LIB_ENTRY(_dma_tag_destroy)
++#define	aic_dmamem_alloc		AIC_LIB_ENTRY(_dmamem_alloc)
++#define	aic_dmamem_free			AIC_LIB_ENTRY(_dmamem_free)
++#define	aic_dmamap_create		AIC_LIB_ENTRY(_dmamap_create)
++#define	aic_dmamap_destroy		AIC_LIB_ENTRY(_dmamap_destroy)
++#define	aic_dmamap_load			AIC_LIB_ENTRY(_dmamap_load)
++#define	aic_dmamap_unload		AIC_LIB_ENTRY(_dmamap_unload)
++#define	aic_dmamap_destroy		AIC_LIB_ENTRY(_dmamap_destroy)
++#define	aic_timeout			AIC_LIB_ENTRY(_timeout)
++#define	aic_runq_tasklet		AIC_LIB_ENTRY(_runq_tasklet)
++#define	aic_unblock_tasklet		AIC_LIB_ENTRY(_unblock_tasklet)
++#define	aic_platform_timeout		AIC_LIB_ENTRY(_platform_timeout)
++#define	aic_name			AIC_LIB_ENTRY(_name)
++
++#define	aic_tailq			AIC_LIB_ENTRY(_tailq)
++#define	aic_softc			AIC_LIB_ENTRY(_softc)
++#define	aic_transinfo			AIC_LIB_ENTRY(_transinfo)
++#define	aic_platform_data		AIC_LIB_ENTRY(_platform_data)
++#define	aic_devinfo			AIC_LIB_ENTRY(_devinfo)
++#define	aic_callback_t			AIC_LIB_ENTRY(_callback_t)
++
++#define	AIC_NUM_LUNS			AIC_CONST_ENTRY(_NUM_LUNS)
++#define	AIC_NUM_TARGETS			AIC_CONST_ENTRY(_NUM_TARGETS)
++#define	AIC_RESOURCE_SHORTAGE		AIC_CONST_ENTRY(_RESOURCE_SHORTAGE)
++
++/*************************** Forward Declarations *****************************/
++struct aic_softc;
++
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0)
++typedef struct device *aic_dev_softc_t;
++#else
++typedef struct pci_dev *aic_dev_softc_t;
++#endif
++typedef Scsi_Cmnd     *aic_io_ctx_t;
++
++/*************************** Timer DataStructures *****************************/
++typedef struct timer_list aic_timer_t;
++
++/***************************** Bus Space/DMA **********************************/
++
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,2,17)
++typedef dma_addr_t bus_addr_t;
++#else
++typedef uint32_t bus_addr_t;
++#endif
++typedef uint32_t bus_size_t;
++
++typedef enum {
++	BUS_SPACE_MEMIO,
++	BUS_SPACE_PIO
++} bus_space_tag_t;
++
++typedef union {
++	u_long		  ioport;
++	volatile uint8_t *maddr;
++} bus_space_handle_t;
++
++typedef struct bus_dma_segment
++{
++	bus_addr_t	ds_addr;
++	bus_size_t	ds_len;
++} bus_dma_segment_t;
++
++struct aic_linux_dma_tag
++{
++	bus_size_t	alignment;
++	bus_size_t	boundary;
++	bus_size_t	maxsize;
++};
++typedef struct aic_linux_dma_tag* bus_dma_tag_t;
++
++struct aic_linux_dmamap
++{
++	bus_addr_t	bus_addr;
++};
++typedef struct aic_linux_dmamap* bus_dmamap_t;
++
++typedef int bus_dma_filter_t(void*, bus_addr_t);
++typedef void bus_dmamap_callback_t(void *, bus_dma_segment_t *, int, int);
++
++#define BUS_DMA_WAITOK		0x0
++#define BUS_DMA_NOWAIT		0x1
++#define BUS_DMA_ALLOCNOW	0x2
++#define BUS_DMA_LOAD_SEGS	0x4	/*
++					 * Argument is an S/G list not
++					 * a single buffer.
++					 */
++
++#define BUS_SPACE_MAXADDR	0xFFFFFFFF
++#define BUS_SPACE_MAXADDR_32BIT	0xFFFFFFFF
++#define BUS_SPACE_MAXSIZE_32BIT	0xFFFFFFFF
++
++int	aic_dma_tag_create(struct aic_softc *, bus_dma_tag_t /*parent*/,
++			   bus_size_t /*alignment*/, bus_size_t /*boundary*/,
++			   bus_addr_t /*lowaddr*/, bus_addr_t /*highaddr*/,
++			   bus_dma_filter_t*/*filter*/, void */*filterarg*/,
++			   bus_size_t /*maxsize*/, int /*nsegments*/,
++			   bus_size_t /*maxsegsz*/, int /*flags*/,
++			   bus_dma_tag_t */*dma_tagp*/);
++
++void	aic_dma_tag_destroy(struct aic_softc *, bus_dma_tag_t /*tag*/);
++
++int	aic_dmamem_alloc(struct aic_softc *, bus_dma_tag_t /*dmat*/,
++			 void** /*vaddr*/, int /*flags*/,
++			 bus_dmamap_t* /*mapp*/);
++
++void	aic_dmamem_free(struct aic_softc *, bus_dma_tag_t /*dmat*/,
++			void* /*vaddr*/, bus_dmamap_t /*map*/);
++
++void	aic_dmamap_destroy(struct aic_softc *, bus_dma_tag_t /*tag*/,
++			   bus_dmamap_t /*map*/);
++
++int	aic_dmamap_load(struct aic_softc *aic, bus_dma_tag_t /*dmat*/,
++			bus_dmamap_t /*map*/, void * /*buf*/,
++			bus_size_t /*buflen*/, bus_dmamap_callback_t *,
++			void */*callback_arg*/, int /*flags*/);
++
++int	aic_dmamap_unload(struct aic_softc *, bus_dma_tag_t, bus_dmamap_t);
++
++/*
++ * Operations performed by aic_dmamap_sync().
+  */
++#define BUS_DMASYNC_PREREAD	0x01	/* pre-read synchronization */
++#define BUS_DMASYNC_POSTREAD	0x02	/* post-read synchronization */
++#define BUS_DMASYNC_PREWRITE	0x04	/* pre-write synchronization */
++#define BUS_DMASYNC_POSTWRITE	0x08	/* post-write synchronization */
++
++/*
++ * XXX
++ * aic_dmamap_sync is only used on buffers allocated with
++ * the pci_alloc_consistent() API.  Although I'm not sure how
++ * this works on architectures with a write buffer, Linux does
++ * not have an API to sync "coherent" memory.  Perhaps we need
++ * to do an mb()?
++ */
++#define aic_dmamap_sync(aic, dma_tag, dmamap, offset, len, op)
++
++/*************************** Linux DMA Wrappers *******************************/
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
++#define	aic_alloc_coherent(aic, size, bus_addr_ptr) \
++	dma_alloc_coherent(aic->dev_softc, size, bus_addr_ptr, /*flag*/0)
++
++#define	aic_free_coherent(aic, size, vaddr, bus_addr) \
++	dma_free_coherent(aic->dev_softc, size, vaddr, bus_addr)
++
++#define	aic_map_single(aic, buf, size, direction) \
++	dma_map_single(aic->dev_softc, buf, size, direction)
++
++#define	aic_unmap_single(aic, busaddr, size, direction) \
++	dma_unmap_single(aic->dev_softc, busaddr, size, direction)
++
++#define	aic_map_sg(aic, sg_list, num_sg, direction) \
++	dma_map_sg(aic->dev_softc, sg_list, num_sg, direction)
++
++#define	aic_unmap_sg(aic, sg_list, num_sg, direction) \
++	dma_unmap_sg(aic->dev_softc, sg_list, num_sg, direction)
++
++#elif LINUX_VERSION_CODE > KERNEL_VERSION(2,3,0)
++
++#define	aic_alloc_coherent(aic, size, bus_addr_ptr) \
++	pci_alloc_consistent(aic->dev_softc, size, bus_addr_ptr)
++
++#define	aic_free_coherent(aic, size, vaddr, bus_addr) \
++	pci_free_consistent(aic->dev_softc, size, vaddr, bus_addr)
++
++#define	aic_map_single(aic, buf, size, direction) \
++	pci_map_single(aic->dev_softc, buf, size, direction)
++
++#define	aic_unmap_single(aic, busaddr, size, direction) \
++	pci_unmap_single(aic->dev_softc, busaddr, size, direction)
++
++#define	aic_map_sg(aic, sg_list, num_sg, direction) \
++	pci_map_sg(aic->dev_softc, sg_list, num_sg, direction)
++
++#define	aic_unmap_sg(aic, sg_list, num_sg, direction) \
++	pci_unmap_sg(aic->dev_softc, sg_list, num_sg, direction)
++
++#else
++
++static __inline void *aic_alloc_coherent(struct aic_softc *aic,
++					 bus_size_t size, bus_addr_t *baddrp);
++
++/*
++ * At least in 2.2.14, malloc is a slab allocator so all
++ * allocations are aligned.  We assume for these kernel versions
++ * that all allocations will be bellow 4Gig, physically contiguous,
++ * and accessible via DMA by the controller.
++ */
++static __inline void *
++aic_alloc_coherent(struct aic_softc *aic, bus_size_t size, bus_addr_t *baddrp)
++{
++	void *vaddr;
++
++	vaddr_ = malloc(size, M_DEVBUF, M_NOWAIT);
++	if (vaddr != NULL)
++		*baddrp = virt_to_bus(vaddr);
++	return (vaddr);
++}
++
++#define	aic_free_coherent(aic, size, vaddr, bus_addr) \
++	free(vaddr, M_DEVBUF)
++
++#define aic_map_sg(pdev, sg_list, nseg, direction) (nseg)
++#define aic_unmap_sg(pdev, sg_list, nseg, direction)
++#define aic_map_single(pdev, buffer, bufflen, direction) \
++	(VIRT_TO_BUS(buffer))
++#define aic_unmap_single(pdev, buffer, buflen, direction)
++#define sg_dma_address(sg) (VIRT_TO_BUS((sg)->address))
++#define sg_dma_len(sg) ((sg)->length)
++#endif
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
++
++#define aic_set_dma_mask(aic, mask) dma_set_mask(aic->dev_softc, mask)
++
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,3)
++
++/*
++ * Device softc is NULL for EISA devices.
++ */
++#define aic_set_dma_mask(aic, mask) 			\
++	((aic)->dev_softc == NULL ? 0 : pci_set_dma_mask(aic->dev_softc, mask))
++
++#else
++/*
++ * Device softc is NULL for EISA devices.
++ * Always "return" 0 for success.
++ */
++#define aic_set_dma_mask(aic, mask)			\
++    (((aic)->dev_softc == NULL)				\
++     ? 0						\
++     : (((aic)->dev_softc->dma_mask = mask) && 0))
++#endif
++
++/************************* Host Template Macros *******************************/
++#if defined CONFIG_HIGHIO
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,10)
++/* Assume RedHat Distribution with its different HIGHIO conventions. */
++#define	AIC_TEMPLATE_DMA_SETTINGS()	\
++	.can_dma_32		= 1,	\
++	.single_sg_okay		= 1,
++#else
++#define	AIC_TEMPLATE_DMA_SETTINGS()	\
++	.highmem_io		= 1,
++#endif
++#else
++#define	AIC_TEMPLATE_DMA_SETTINGS()
++#endif
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,7)
++#define	AIC_TEMPLATE_MAX_SECTORS(sectors) \
++	.max_sectors		= (sectors),
++#else
++#define	AIC_TEMPLATE_MAX_SECTORS(sectors)
++#endif
++
++#if defined(__i386__)
++#define	AIC_TEMPLATE_BIOSPARAM() \
++	.bios_param		= AIC_LIB_ENTRY(_linux_biosparam),
++#else
++#define	AIC_TEMPLATE_BIOSPARAM()
++#endif
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
++#define	AIC_TEMPLATE_VERSIONED_ENTRIES() \
++	.slave_alloc		= AIC_LIB_ENTRY(_linux_slave_alloc), \
++	.slave_configure	= AIC_LIB_ENTRY(_linux_slave_configure), \
++	.slave_destroy		= AIC_LIB_ENTRY(_linux_slave_destroy)
++#else
++#define	AIC_TEMPLATE_VERSIONED_ENTRIES() \
++	.detect			= AIC_LIB_ENTRY(_linux_detect), \
++	.release		= AIC_LIB_ENTRY(_linux_release), \
++	.select_queue_depths	= AIC_LIB_ENTRY(_linux_select_queue_depth), \
++	.use_new_eh_code	= 1
++#endif
++
++#define AIC_TEMPLATE_INITIALIZER(NAME, MAX_SECTORS)			\
++{									\
++	.module			= THIS_MODULE,				\
++	.name			= NAME,					\
++	.proc_info		= AIC_LIB_ENTRY(_linux_proc_info),	\
++	.info			= AIC_LIB_ENTRY(_linux_info),		\
++	.queuecommand		= AIC_LIB_ENTRY(_linux_queue),		\
++	.eh_abort_handler	= AIC_LIB_ENTRY(_linux_abort),		\
++	.eh_device_reset_handler = AIC_LIB_ENTRY(_linux_dev_reset),	\
++	.eh_bus_reset_handler	= AIC_LIB_ENTRY(_linux_bus_reset),	\
++	.can_queue		= AIC_CONST_ENTRY(_MAX_QUEUE),		\
++	.this_id		= -1,					\
++	.cmd_per_lun		= 2,					\
++	.use_clustering		= ENABLE_CLUSTERING,			\
++	AIC_TEMPLATE_MAX_SECTORS(MAX_SECTORS)				\
++	AIC_TEMPLATE_DMA_SETTINGS()					\
++	AIC_TEMPLATE_BIOSPARAM()					\
++	AIC_TEMPLATE_VERSIONED_ENTRIES()				\
++}
++
++/************************** OS Utility Wrappers *******************************/
++#define printf printk
++#define M_NOWAIT GFP_ATOMIC
++#define M_WAITOK 0
++#define malloc(size, type, flags) kmalloc(size, flags)
++#define free(ptr, type) kfree(ptr)
++
++static __inline void aic_delay(long);
++static __inline void
++aic_delay(long usec)
++{
++	/*
++	 * udelay on Linux can have problems for
++	 * multi-millisecond waits.  Wait at most
++	 * 1024us per call.
++	 */
++	while (usec > 0) {
++		udelay(usec % 1024);
++		usec -= 1024;
++	}
++}
++
++/********************************** Misc Macros *******************************/
++#define	roundup(x, y)   ((((x)+((y)-1))/(y))*(y))
++#define	powerof2(x)	((((x)-1)&(x))==0)
++
++/******************************* Byte Order ***********************************/
++#define aic_htobe16(x)	cpu_to_be16(x)
++#define aic_htobe32(x)	cpu_to_be32(x)
++#define aic_htobe64(x)	cpu_to_be64(x)
++#define aic_htole16(x)	cpu_to_le16(x)
++#define aic_htole32(x)	cpu_to_le32(x)
++#define aic_htole64(x)	cpu_to_le64(x)
++
++#define aic_be16toh(x)	be16_to_cpu(x)
++#define aic_be32toh(x)	be32_to_cpu(x)
++#define aic_be64toh(x)	be64_to_cpu(x)
++#define aic_le16toh(x)	le16_to_cpu(x)
++#define aic_le32toh(x)	le32_to_cpu(x)
++#define aic_le64toh(x)	le64_to_cpu(x)
++
++#ifndef LITTLE_ENDIAN
++#define LITTLE_ENDIAN 1234
++#endif
++
++#ifndef BIG_ENDIAN
++#define BIG_ENDIAN 4321
++#endif
++
++#ifndef BYTE_ORDER
++#if defined(__BIG_ENDIAN)
++#define BYTE_ORDER BIG_ENDIAN
++#endif
++#if defined(__LITTLE_ENDIAN)
++#define BYTE_ORDER LITTLE_ENDIAN
++#endif
++#endif /* BYTE_ORDER */
++
++/********************************* Core Includes ******************************/
++#include AIC_CORE_INCLUDE
++
++/**************************** Front End Queues ********************************/
++/*
++ * Data structure used to cast the Linux struct scsi_cmnd to something
++ * that allows us to use the queue macros.  The linux structure has
++ * plenty of space to hold the links fields as required by the queue
++ * macros, but the queue macors require them to have the correct type.
++ */
++struct aic_cmd_internal {
++	/* Area owned by the Linux scsi layer. */
++	uint8_t	private[offsetof(struct scsi_cmnd, SCp.Status)];
++	union {
++		STAILQ_ENTRY(aic_cmd)	ste;
++		LIST_ENTRY(aic_cmd)	le;
++		TAILQ_ENTRY(aic_cmd)	tqe;
++	} links;
++	uint32_t			end;
++};
++
++struct aic_cmd {
++	union {
++		struct aic_cmd_internal	icmd;
++		struct scsi_cmnd	scsi_cmd;
++	} un;
++};
++
++#define acmd_icmd(cmd) ((cmd)->un.icmd)
++#define acmd_scsi_cmd(cmd) ((cmd)->un.scsi_cmd)
++#define acmd_links un.icmd.links
++
++/*************************** Device Data Structures ***************************/
++/*
++ * A per probed device structure used to deal with some error recovery
++ * scenarios that the Linux mid-layer code just doesn't know how to
++ * handle.  The structure allocated for a device only becomes persistent
++ * after a successfully completed inquiry command to the target when
++ * that inquiry data indicates a lun is present.
++ */
++TAILQ_HEAD(aic_busyq, aic_cmd);
++typedef enum {
++	AIC_DEV_UNCONFIGURED	 = 0x01,
++	AIC_DEV_FREEZE_TIL_EMPTY = 0x02, /* Freeze queue until active == 0 */
++	AIC_DEV_TIMER_ACTIVE	 = 0x04, /* Our timer is active */
++	AIC_DEV_ON_RUN_LIST	 = 0x08, /* Queued to be run later */
++	AIC_DEV_Q_BASIC		 = 0x10, /* Allow basic device queuing */
++	AIC_DEV_Q_TAGGED	 = 0x20, /* Allow full SCSI2 command queueing */
++	AIC_DEV_PERIODIC_OTAG	 = 0x40, /* Send OTAG to prevent starvation */
++	AIC_DEV_SLAVE_CONFIGURED = 0x80	 /* slave_configure() has been called */
++} aic_linux_dev_flags;
++
++struct aic_linux_target;
++struct aic_linux_device {
++	TAILQ_ENTRY(aic_linux_device) links;
++	struct			aic_busyq busyq;
++
++	/*
++	 * The number of transactions currently
++	 * queued to the device.
++	 */
++	int			active;
++
++	/*
++	 * The currently allowed number of 
++	 * transactions that can be queued to
++	 * the device.  Must be signed for
++	 * conversion from tagged to untagged
++	 * mode where the device may have more
++	 * than one outstanding active transaction.
++	 */
++	int			openings;
++
++	/*
++	 * A positive count indicates that this
++	 * device's queue is halted.
++	 */
++	u_int			qfrozen;
++	
++	/*
++	 * Cumulative command counter.
++	 */
++	u_long			commands_issued;
++
++	/*
++	 * The number of tagged transactions when
++	 * running at our current opening level
++	 * that have been successfully received by
++	 * this device since the last QUEUE FULL.
++	 */
++	u_int			tag_success_count;
++#define AIC_TAG_SUCCESS_INTERVAL 50
++
++	aic_linux_dev_flags	flags;
++
++	/*
++	 * Per device timer.
++	 */
++	struct timer_list	timer;
++
++	/*
++	 * The high limit for the tags variable.
++	 */
++	u_int			maxtags;
++
++	/*
++	 * The computed number of tags outstanding
++	 * at the time of the last QUEUE FULL event.
++	 */
++	u_int			tags_on_last_queuefull;
++
++	/*
++	 * How many times we have seen a queue full
++	 * with the same number of tags.  This is used
++	 * to stop our adaptive queue depth algorithm
++	 * on devices with a fixed number of tags.
++	 */
++	u_int			last_queuefull_same_count;
++#define AIC_LOCK_TAGS_COUNT 50
++
++	/*
++	 * How many transactions have been queued
++	 * without the device going idle.  We use
++	 * this statistic to determine when to issue
++	 * an ordered tag to prevent transaction
++	 * starvation.  This statistic is only updated
++	 * if the AIC_DEV_PERIODIC_OTAG flag is set
++	 * on this device.
++	 */
++	u_int			commands_since_idle_or_otag;
++#define AIC_OTAG_THRESH	500
++
++	int			lun;
++	Scsi_Device	       *scsi_device;
++	struct			aic_linux_target *target;
++};
++
++typedef enum {
++	AIC_DV_REQUIRED		 = 0x01,
++	AIC_INQ_VALID		 = 0x02,
++	AIC_BASIC_DV		 = 0x04,
++	AIC_ENHANCED_DV		 = 0x08
++} aic_linux_targ_flags;
++
++/* DV States */
++typedef enum {
++	AIC_DV_STATE_EXIT = 0,
++	AIC_DV_STATE_INQ_SHORT_ASYNC,
++	AIC_DV_STATE_INQ_ASYNC,
++	AIC_DV_STATE_INQ_ASYNC_VERIFY,
++	AIC_DV_STATE_TUR,
++	AIC_DV_STATE_REBD,
++	AIC_DV_STATE_INQ_VERIFY,
++	AIC_DV_STATE_WEB,
++	AIC_DV_STATE_REB,
++	AIC_DV_STATE_SU,
++	AIC_DV_STATE_BUSY
++} aic_dv_state;
++
++struct aic_linux_target {
++	struct aic_linux_device	 *devices[AIC_NUM_LUNS];
++	int			  channel;
++	int			  target;
++	int			  refcount;
++	struct aic_transinfo	  last_tinfo;
++	struct aic_softc	 *softc;
++	aic_linux_targ_flags	  flags;
++	struct scsi_inquiry_data *inq_data;
++	/*
++	 * The next "fallback" period to use for narrow/wide transfers.
++	 */
++	uint8_t			  dv_next_narrow_period;
++	uint8_t			  dv_next_wide_period;
++	uint8_t			  dv_max_width;
++	uint8_t			  dv_max_ppr_options;
++	uint8_t			  dv_last_ppr_options;
++	u_int			  dv_echo_size;
++	aic_dv_state		  dv_state;
++	u_int			  dv_state_retry;
++	uint8_t			 *dv_buffer;
++	uint8_t			 *dv_buffer1;
++
++	/*
++	 * Cumulative counter of errors.
++	 */
++	u_long			errors_detected;
++	u_long			cmds_since_error;
++};
++
++/*************** OSM Dependent Components of Core Datastructures **************/
++/*
++ * Per-SCB OSM storage.
++ */
++typedef enum {
++	AIC_SCB_UP_EH_SEM	= 0x1,
++	AIC_TIMEOUT_ACTIVE	= 0x2,
++	AIC_RELEASE_SIMQ	= 0x4
++} aic_linux_scb_flags;
++
++struct scb_platform_data {
++	struct aic_linux_device	*dev;
++	bus_addr_t		 buf_busaddr;
++	uint32_t		 xfer_len;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)
++	uint32_t		 resid;		/* Transfer residual */
++#endif
++	uint32_t		 sense_resid;	/* Auto-Sense residual */
++	aic_linux_scb_flags	 flags;
++};
++
++/*
++ * Define a structure used for each host adapter.  All members are
++ * aligned on a boundary >= the size of the member to honor the
++ * alignment restrictions of the various platforms supported by
++ * this driver.
++ */
++typedef enum {
++	AIC_DV_WAIT_SIMQ_EMPTY	 = 0x01,
++	AIC_DV_WAIT_SIMQ_RELEASE = 0x02,
++	AIC_DV_ACTIVE		 = 0x04,
++	AIC_DV_SHUTDOWN		 = 0x08,
++	AIC_RUN_CMPLT_Q_TIMER	 = 0x10,
++	AIC_BUS_SETTLE_TIMER	 = 0x20
++} aic_linux_softc_flags;
++
++TAILQ_HEAD(aic_completeq, aic_cmd);
++
++struct aic_platform_data {
++	/*
++	 * Fields accessed from interrupt context.
++	 */
++	struct aic_linux_target *targets[AIC_NUM_TARGETS]; 
++	TAILQ_HEAD(, aic_linux_device) device_runq;
++	struct aic_completeq	 completeq;
++
++	spinlock_t		 spin_lock;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
++	struct tasklet_struct	 runq_tasklet;
++	struct tasklet_struct	 unblock_tasklet;
++#endif
++	u_int			 qfrozen;
++	pid_t			 dv_pid;
++	pid_t			 recovery_pid;
++	struct timer_list	 completeq_timer;
++	struct timer_list	 bus_settle_timer;
++	struct timer_list	 stats_timer;
++	struct semaphore	 eh_sem;
++	struct semaphore	 dv_sem;
++	struct semaphore	 dv_cmd_sem;
++	struct semaphore	 recovery_sem;
++	struct semaphore	 recovery_ending_sem;
++	struct scsi_device	*dv_scsi_dev;
++	struct Scsi_Host        *host;		/* pointer to scsi host */
++#define AIC_LINUX_NOIRQ	((uint32_t)~0)
++	uint32_t		 irq;		/* IRQ for this adapter */
++	uint32_t		 bios_address;
++	uint32_t		 mem_busaddr;	/* Mem Base Addr */
++	bus_addr_t		 hw_dma_mask;
++	aic_linux_softc_flags	 flags;
++};
++
++/***************************** Timer Facilities *******************************/
++typedef void aic_linux_callback_t (u_long);  
++void aic_platform_timeout(struct scsi_cmnd *);
++void aic_linux_midlayer_timeout(struct scsi_cmnd *);
++
++#define aic_timer_init init_timer
++#define aic_timer_stop del_timer_sync
++static __inline void aic_timer_reset(aic_timer_t *timer, uint32_t usec,
++				     aic_callback_t *func, void *arg);
++static __inline uint32_t aic_get_timeout(struct scb *);
++static __inline void aic_scb_timer_start(struct scb *scb);
++static __inline void aic_scb_timer_reset(struct scb *scb, uint32_t usec);
+ 
++static __inline void
++aic_timer_reset(aic_timer_t *timer, uint32_t usec,
++		aic_callback_t *func, void *arg)
++{
++	struct aic_softc *aic;
++
++	aic = (struct aic_softc *)arg;
++	del_timer(timer);
++	timer->data = (u_long)arg;
++	timer->expires = jiffies + (usec / AIC_USECS_PER_JIFFY);
++	timer->function = (aic_linux_callback_t*)func;
++	add_timer(timer);
++}
++
++static __inline uint32_t
++aic_get_timeout(struct scb *scb)
++{
++
++	/*
++	 * Convert from jiffies to usec.
++	 */
++	return (scb->io_ctx->timeout_per_command * AIC_USECS_PER_JIFFY);
++}
++
++static __inline void
++aic_scb_timer_start(struct scb *scb)
++{
++	scb->platform_data->flags |= AIC_TIMEOUT_ACTIVE;
++	scsi_add_timer(scb->io_ctx, scb->io_ctx->timeout_per_command,
++		       aic_platform_timeout);
++}
++
++static __inline void
++aic_scb_timer_reset(struct scb *scb, uint32_t usec)
++{
++	/*
++	 * Restore timer data that is clobbered by scsi_delete_timer().
++	 */
++	scb->io_ctx->eh_timeout.data = (unsigned long)scb->io_ctx;
++	scb->io_ctx->eh_timeout.function =
++	    (void (*)(unsigned long))aic_platform_timeout;
++	scb->platform_data->flags |= AIC_TIMEOUT_ACTIVE;
++	mod_timer(&scb->io_ctx->eh_timeout,
++		  jiffies + (usec / AIC_USECS_PER_JIFFY));
++}
++
++/************************* SCSI command formats *******************************/
+ /*
+  * Define dome bits that are in ALL (or a lot of) scsi commands
+  */
+@@ -865,6 +1624,368 @@ typedef enum {
+ 
+ extern const char *scsi_sense_key_text[];
+ 
++/*************************** Domain Validation ********************************/
++#define AIC_DV_CMD(cmd) ((cmd)->scsi_done == aic_linux_dv_complete)
++#define AIC_DV_SIMQ_FROZEN(aic)					\
++	((((aic)->platform_data->flags & AIC_DV_ACTIVE) != 0)	\
++	 && (aic)->platform_data->qfrozen == 1)
++
++/*********************** Transaction Access Wrappers **************************/
++static __inline void aic_cmd_set_transaction_status(Scsi_Cmnd *, uint32_t);
++static __inline void aic_set_transaction_status(struct scb *, uint32_t);
++static __inline void aic_cmd_set_scsi_status(Scsi_Cmnd *, uint32_t);
++static __inline void aic_set_scsi_status(struct scb *, uint32_t);
++static __inline uint32_t aic_cmd_get_transaction_status(Scsi_Cmnd *cmd);
++static __inline uint32_t aic_get_transaction_status(struct scb *);
++static __inline uint32_t aic_cmd_get_scsi_status(Scsi_Cmnd *cmd);
++static __inline uint32_t aic_get_scsi_status(struct scb *);
++static __inline void aic_set_transaction_tag(struct scb *, int, u_int);
++static __inline u_long aic_get_transfer_length(struct scb *);
++static __inline int aic_get_transfer_dir(struct scb *);
++static __inline void aic_set_residual(struct scb *, u_long);
++static __inline void aic_set_sense_residual(struct scb *scb, u_long resid);
++static __inline u_long aic_get_residual(struct scb *);
++static __inline u_long aic_get_sense_residual(struct scb *);
++static __inline int aic_perform_autosense(struct scb *);
++static __inline uint32_t aic_get_sense_bufsize(struct aic_softc *,
++					       struct scb *);
++static __inline void aic_notify_xfer_settings_change(struct aic_softc *,
++						     struct aic_devinfo *);
++static __inline void aic_platform_scb_free(struct aic_softc *aic,
++					   struct scb *scb);
++static __inline void aic_freeze_scb(struct scb *scb);
++
++static __inline
++void aic_cmd_set_transaction_status(Scsi_Cmnd *cmd, uint32_t status)
++{
++	cmd->result &= ~(CAM_STATUS_MASK << 16);
++	cmd->result |= status << 16;
++}
++
++static __inline
++void aic_set_transaction_status(struct scb *scb, uint32_t status)
++{
++	aic_cmd_set_transaction_status(scb->io_ctx,status);
++}
++
++static __inline
++void aic_cmd_set_scsi_status(Scsi_Cmnd *cmd, uint32_t status)
++{
++	cmd->result &= ~0xFFFF;
++	cmd->result |= status;
++}
++
++static __inline
++void aic_set_scsi_status(struct scb *scb, uint32_t status)
++{
++	aic_cmd_set_scsi_status(scb->io_ctx, status);
++}
++
++static __inline
++uint32_t aic_cmd_get_transaction_status(Scsi_Cmnd *cmd)
++{
++	return ((cmd->result >> 16) & CAM_STATUS_MASK);
++}
++
++static __inline
++uint32_t aic_get_transaction_status(struct scb *scb)
++{
++	return (aic_cmd_get_transaction_status(scb->io_ctx));
++}
++
++static __inline
++uint32_t aic_cmd_get_scsi_status(Scsi_Cmnd *cmd)
++{
++	return (cmd->result & 0xFFFF);
++}
++
++static __inline
++uint32_t aic_get_scsi_status(struct scb *scb)
++{
++	return (aic_cmd_get_scsi_status(scb->io_ctx));
++}
++
++static __inline
++void aic_set_transaction_tag(struct scb *scb, int enabled, u_int type)
++{
++	/*
++	 * Nothing to do for linux as the incoming transaction
++	 * has no concept of tag/non tagged, etc.
++	 */
++}
++
++static __inline
++u_long aic_get_transfer_length(struct scb *scb)
++{
++	return (scb->platform_data->xfer_len);
++}
++
++static __inline
++int aic_get_transfer_dir(struct scb *scb)
++{
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,40)
++	return (scb->io_ctx->sc_data_direction);
++#else
++	if (scb->io_ctx->bufflen == 0)
++		return (CAM_DIR_NONE);
++
++	switch(scb->io_ctx->cmnd[0]) {
++	case 0x08:  /* READ(6)  */
++	case 0x28:  /* READ(10) */
++	case 0xA8:  /* READ(12) */
++		return (CAM_DIR_IN);
++        case 0x0A:  /* WRITE(6)  */
++        case 0x2A:  /* WRITE(10) */
++        case 0xAA:  /* WRITE(12) */
++		return (CAM_DIR_OUT);
++        default:
++		return (CAM_DIR_NONE);
++        }
++#endif
++}
++
++static __inline
++void aic_set_residual(struct scb *scb, u_long resid)
++{
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
++	scb->io_ctx->resid = resid;
++#else
++	scb->platform_data->resid = resid;
++#endif
++}
++
++static __inline
++void aic_set_sense_residual(struct scb *scb, u_long resid)
++{
++	scb->platform_data->sense_resid = resid;
++}
++
++static __inline
++u_long aic_get_residual(struct scb *scb)
++{
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
++	return (scb->io_ctx->resid);
++#else
++	return (scb->platform_data->resid);
++#endif
++}
++
++static __inline
++u_long aic_get_sense_residual(struct scb *scb)
++{
++	return (scb->platform_data->sense_resid);
++}
++
++static __inline
++int aic_perform_autosense(struct scb *scb)
++{
++	/*
++	 * We always perform autosense in Linux.
++	 * On other platforms this is set on a
++	 * per-transaction basis.
++	 */
++	return (1);
++}
++
++static __inline uint32_t
++aic_get_sense_bufsize(struct aic_softc *aic, struct scb *scb)
++{
++	return (sizeof(struct scsi_sense_data));
++}
++
++static __inline void
++aic_notify_xfer_settings_change(struct aic_softc *aic,
++				struct aic_devinfo *devinfo)
++{
++	/* Nothing to do here for linux */
++}
++
++static __inline void
++aic_platform_scb_free(struct aic_softc *aic, struct scb *scb)
++{
++	aic->flags &= ~AIC_RESOURCE_SHORTAGE;
++}
++
++static __inline void
++aic_freeze_scb(struct scb *scb)
++{
++	if ((scb->io_ctx->result & (CAM_DEV_QFRZN << 16)) == 0) {
++                scb->io_ctx->result |= CAM_DEV_QFRZN << 16;
++                scb->platform_data->dev->qfrozen++;
++        }
++}
++
++/******************************* PCI Definitions ******************************/
++/*
++ * PCIM_xxx: mask to locate subfield in register
++ * PCIR_xxx: config register offset
++ * PCIC_xxx: device class
++ * PCIS_xxx: device subclass
++ * PCIP_xxx: device programming interface
++ * PCIV_xxx: PCI vendor ID (only required to fixup ancient devices)
++ * PCID_xxx: device ID
++ */
++#define PCIR_DEVVENDOR		0x00
++#define PCIR_VENDOR		0x00
++#define PCIR_DEVICE		0x02
++#define PCIR_COMMAND		0x04
++#define PCIM_CMD_PORTEN		0x0001
++#define PCIM_CMD_MEMEN		0x0002
++#define PCIM_CMD_BUSMASTEREN	0x0004
++#define PCIM_CMD_MWRICEN	0x0010
++#define PCIM_CMD_PERRESPEN	0x0040
++#define	PCIM_CMD_SERRESPEN	0x0100
++#define PCIR_STATUS		0x06
++#define PCIR_REVID		0x08
++#define PCIR_PROGIF		0x09
++#define PCIR_SUBCLASS		0x0a
++#define PCIR_CLASS		0x0b
++#define PCIR_CACHELNSZ		0x0c
++#define PCIR_LATTIMER		0x0d
++#define PCIR_HEADERTYPE		0x0e
++#define PCIM_MFDEV		0x80
++#define PCIR_BIST		0x0f
++#define PCIR_CAP_PTR		0x34
++
++/* config registers for header type 0 devices */
++#define PCIR_MAPS	0x10
++#define PCIR_BARS	PCIR_MAPS
++#define PCIR_BAR(x)	(PCIR_BARS + (x) * 4)
++#define PCIR_SUBVEND_0	0x2c
++#define PCIR_SUBDEV_0	0x2e
++
++typedef enum
++{
++	AIC_POWER_STATE_D0,
++	AIC_POWER_STATE_D1,
++	AIC_POWER_STATE_D2,
++	AIC_POWER_STATE_D3
++} aic_power_state;
++
++/****************************** PCI-X definitions *****************************/
++#define PCIXR_COMMAND	0x96
++#define PCIXR_DEVADDR	0x98
++#define PCIXM_DEVADDR_FNUM	0x0003	/* Function Number */
++#define PCIXM_DEVADDR_DNUM	0x00F8	/* Device Number */
++#define PCIXM_DEVADDR_BNUM	0xFF00	/* Bus Number */
++#define PCIXR_STATUS	0x9A
++#define PCIXM_STATUS_64BIT	0x0001	/* Active 64bit connection to device. */
++#define PCIXM_STATUS_133CAP	0x0002	/* Device is 133MHz capable */
++#define PCIXM_STATUS_SCDISC	0x0004	/* Split Completion Discarded */
++#define PCIXM_STATUS_UNEXPSC	0x0008	/* Unexpected Split Completion */
++#define PCIXM_STATUS_CMPLEXDEV	0x0010	/* Device Complexity (set == bridge) */
++#define PCIXM_STATUS_MAXMRDBC	0x0060	/* Maximum Burst Read Count */
++#define PCIXM_STATUS_MAXSPLITS	0x0380	/* Maximum Split Transactions */
++#define PCIXM_STATUS_MAXCRDS	0x1C00	/* Maximum Cumulative Read Size */
++#define PCIXM_STATUS_RCVDSCEM	0x2000	/* Received a Split Comp w/Error msg */
++
++/**************************** KObject Wrappers ********************************/
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
++#define	aic_dev_to_pci_dev(dev)		to_pci_dev(dev)
++#define	aic_dev_to_eisa_dev(dev)	to_eisa_dev(dev)
++#define	aic_pci_dev_to_dev(pci)		(&pci->dev)
++#define	aic_eisa_dev_to_dev(eisa)	(&eisa->dev)
++#else
++#define	aic_dev_to_pci_dev(dev)		(dev)
++#define	aic_dev_to_eisa_dev(dev)	(NULL)
++#define	aic_pci_dev_to_dev(pci)		(pci)
++#define	aic_eisa_dev_to_dev(eisa)	(NULL)
++#endif
++
++#define	aic_pci_dev(aic)		aic_dev_to_pci_dev((aic)->dev_softc)
++#define	aic_eisa_dev(aic)		aic_dev_to_eisa_dev((aic)->dev_softc)
++/***************************** PCI Routines ***********************************/
++static __inline uint32_t aic_pci_read_config(aic_dev_softc_t dev,
++					     int reg, int width);
++static __inline void aic_pci_write_config(aic_dev_softc_t dev,
++					  int reg, uint32_t value,
++					  int width);
++static __inline int aic_get_pci_function(aic_dev_softc_t);
++static __inline int aic_get_pci_slot(aic_dev_softc_t);
++static __inline int aic_get_pci_bus(aic_dev_softc_t);
++
++static __inline uint32_t
++aic_pci_read_config(aic_dev_softc_t dev, int reg, int width)
++{
++	struct pci_dev *pci;
++
++	pci = aic_dev_to_pci_dev(dev);
++	switch (width) {
++	case 1:
++	{
++		uint8_t retval;
++
++		pci_read_config_byte(pci, reg, &retval);
++		return (retval);
++	}
++	case 2:
++	{
++		uint16_t retval;
++		pci_read_config_word(pci, reg, &retval);
++		return (retval);
++	}
++	case 4:
++	{
++		uint32_t retval;
++		pci_read_config_dword(pci, reg, &retval);
++		return (retval);
++	}
++	default:
++		panic("aic_pci_read_config: Read size too big");
++		/* NOTREACHED */
++		return (0);
++	}
++}
++
++static __inline void
++aic_pci_write_config(aic_dev_softc_t dev, int reg, uint32_t value, int width)
++{
++	struct pci_dev *pci;
++
++	pci = aic_dev_to_pci_dev(dev);
++	switch (width) {
++	case 1:
++		pci_write_config_byte(pci, reg, value);
++		break;
++	case 2:
++		pci_write_config_word(pci, reg, value);
++		break;
++	case 4:
++		pci_write_config_dword(pci, reg, value);
++		break;
++	default:
++		panic("aic_pci_write_config: Write size too big");
++		/* NOTREACHED */
++	}
++}
++
++static __inline int
++aic_get_pci_function(aic_dev_softc_t dev)
++{
++	struct pci_dev *pci;
++
++	pci = aic_dev_to_pci_dev(dev);
++	return (PCI_FUNC(pci->devfn));
++}
++
++static __inline int
++aic_get_pci_slot(aic_dev_softc_t dev)
++{
++	struct pci_dev *pci;
++
++	pci = aic_dev_to_pci_dev(dev);
++	return (PCI_SLOT(pci->devfn));
++}
++
++static __inline int
++aic_get_pci_bus(aic_dev_softc_t dev)
++{
++	struct pci_dev *pci;
++
++	pci = aic_dev_to_pci_dev(dev);
++	return (pci->bus->number);
++}
++
+ /************************* Large Disk Handling ********************************/
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ static __inline int aic_sector_div(u_long capacity, int heads, int sectors);
+@@ -886,34 +2007,31 @@ aic_sector_div(sector_t capacity, int he
+ }
+ #endif
+ 
+-/**************************** Module Library Hack *****************************/
+-/*
+- * What we'd like to do is have a single "scsi library" module that both the
+- * aic7xxx and aic79xx drivers could load and depend on.  A cursory examination
+- * of implementing module dependencies in Linux (handling the install and
+- * initrd cases) does not look promissing.  For now, we just duplicate this
+- * code in both drivers using a simple symbol renaming scheme that hides this
+- * hack from the drivers.
+- */
+-#define AIC_LIB_ENTRY_CONCAT(x, prefix)	prefix ## x
+-#define	AIC_LIB_ENTRY_EXPAND(x, prefix) AIC_LIB_ENTRY_CONCAT(x, prefix)
+-#define AIC_LIB_ENTRY(x)		AIC_LIB_ENTRY_EXPAND(x, AIC_LIB_PREFIX)
++/************************* Magic SysReq Support *******************************/
++#include <linux/sysrq.h>
+ 
+-#define	aic_sense_desc			AIC_LIB_ENTRY(_sense_desc)
+-#define	aic_sense_error_action		AIC_LIB_ENTRY(_sense_error_action)
+-#define	aic_error_action		AIC_LIB_ENTRY(_error_action)
+-#define	aic_op_desc			AIC_LIB_ENTRY(_op_desc)
+-#define	aic_cdb_string			AIC_LIB_ENTRY(_cdb_string)
+-#define aic_print_inquiry		AIC_LIB_ENTRY(_print_inquiry)
+-#define aic_calc_syncsrate		AIC_LIB_ENTRY(_calc_syncrate)
+-#define	aic_calc_syncparam		AIC_LIB_ENTRY(_calc_syncparam)
+-#define	aic_calc_speed			AIC_LIB_ENTRY(_calc_speed)
+-#define	aic_inquiry_match		AIC_LIB_ENTRY(_inquiry_match)
+-#define	aic_static_inquiry_match	AIC_LIB_ENTRY(_static_inquiry_match)
+-#define	aic_parse_brace_option		AIC_LIB_ENTRY(_parse_brace_option)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
++typedef void aic_sysrq_handler_t (int, struct pt_regs *, struct kbd_struct *,
++				  struct tty_struct *);
++#else
++typedef void aic_sysrq_handler_t (int, struct pt_regs *, struct tty_struct *);
++#endif
+ 
+-/******************************************************************************/
++#ifdef CONFIG_MAGIC_SYSRQ
++#define	aic_sysrq_key_op sysrq_key_op
++#else
++struct aic_sysrq_key_op {
++	aic_sysrq_handler_t *handler;
++	char *help_msg;
++	char *action_msg;
++};
++#endif
+ 
++aic_sysrq_handler_t	aic_sysrq_handler;
++int			aic_install_sysrq(struct aic_sysrq_key_op *);
++void			aic_remove_sysrq(int key,
++					 struct aic_sysrq_key_op *key_op);
++/************************ SCSI Library Functions *****************************/
+ void			aic_sense_desc(int /*sense_key*/, int /*asc*/,
+ 				       int /*ascq*/, struct scsi_inquiry_data*,
+ 				       const char** /*sense_key_desc*/,
+@@ -1043,4 +2161,115 @@ scsi_4btoul(uint8_t *bytes)
+ 	return (rv);
+ }
+ 
++/******************************* PCI Funcitons ********************************/
++void aic_power_state_change(struct aic_softc *aic, aic_power_state new_state);
++
++/******************************* Queue Handling *******************************/
++void		     aic_runq_tasklet(unsigned long data);
++void		     aic_unblock_tasklet(unsigned long data);
++void		     aic_linux_run_device_queue(struct aic_softc*,
++						struct aic_linux_device*);
++void		     aic_bus_settle_complete(u_long data);
++void		     aic_freeze_simq(struct aic_softc *aic);
++void		     aic_release_simq(struct aic_softc *aic);
++void		     aic_release_simq_locked(struct aic_softc *aic);
++static __inline void aic_schedule_runq(struct aic_softc *aic);
++static __inline void aic_schedule_unblock(struct aic_softc *aic);
++static __inline struct aic_linux_device *
++		     aic_linux_next_device_to_run(struct aic_softc *aic);
++static __inline void aic_linux_check_device_queue(struct aic_softc *aic,
++						  struct aic_linux_device *dev);
++static __inline void aic_linux_run_device_queues(struct aic_softc *aic);
++
++/*
++ * Must be called with our lock held.
++ */
++static __inline void
++aic_schedule_runq(struct aic_softc *aic)
++{
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
++	tasklet_schedule(&aic->platform_data->runq_tasklet);
++#else
++	/*
++	 * Tasklets are not available, so run inline.
++	 */
++	aic_runq_tasklet((unsigned long)aic);
++#endif
++}
++
++static __inline void
++aic_schedule_unblock(struct aic_softc *aic)
++{
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
++	tasklet_schedule(&aic->platform_data->unblock_tasklet);
++#else
++#error "Fix 2.2.X Kernel Support"
++#endif
++}
++
++static __inline struct aic_linux_device *
++aic_linux_next_device_to_run(struct aic_softc *aic)
++{
++	
++	if ((aic->flags & AIC_RESOURCE_SHORTAGE) != 0
++	 || (aic->platform_data->qfrozen != 0
++	  && AIC_DV_SIMQ_FROZEN(aic) == 0))
++		return (NULL);
++	return (TAILQ_FIRST(&aic->platform_data->device_runq));
++}
++
++static __inline void
++aic_linux_check_device_queue(struct aic_softc *aic,
++			     struct aic_linux_device *dev)
++{
++	if ((dev->flags & AIC_DEV_FREEZE_TIL_EMPTY) != 0
++	 && dev->active == 0) {
++		dev->flags &= ~AIC_DEV_FREEZE_TIL_EMPTY;
++		dev->qfrozen--;
++	}
++
++	if (TAILQ_FIRST(&dev->busyq) == NULL
++	 || dev->openings == 0 || dev->qfrozen != 0)
++		return;
++
++	aic_linux_run_device_queue(aic, dev);
++}
++
++static __inline void
++aic_linux_run_device_queues(struct aic_softc *aic)
++{
++	struct aic_linux_device *dev;
++
++	while ((dev = aic_linux_next_device_to_run(aic)) != NULL) {
++		TAILQ_REMOVE(&aic->platform_data->device_runq, dev, links);
++		dev->flags &= ~AIC_DEV_ON_RUN_LIST;
++		aic_linux_check_device_queue(aic, dev);
++	}
++}
++
++/****************************** Tasklet Support *******************************/
++static __inline void	aic_setup_tasklets(struct aic_softc *aic);
++static __inline void	aic_teardown_tasklets(struct aic_softc *aic);
++
++static __inline void
++aic_setup_tasklets(struct aic_softc *aic)
++{
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
++	tasklet_init(&aic->platform_data->runq_tasklet, aic_runq_tasklet,
++		     (unsigned long)aic);
++	tasklet_init(&aic->platform_data->unblock_tasklet, aic_unblock_tasklet,
++		     (unsigned long)aic);
++#endif
++}
++
++static __inline void
++aic_teardown_tasklets(struct aic_softc *aic)
++{
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
++	tasklet_kill(&aic->platform_data->runq_tasklet);
++	tasklet_kill(&aic->platform_data->unblock_tasklet);
++#endif
++}
++
++
+ #endif /*_AICLIB_H */
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aiclib_pci.c	2003-12-28 23:21:40.000000000 -0800
+@@ -0,0 +1,79 @@
++/*
++ * Implementation of Utility functions for PCI controller types.
++ *
++ * Copyright (c) 2000-2003 Adaptec Inc.
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
++ *    substantially similar to the "NO WARRANTY" disclaimer below
++ *    ("Disclaimer") and any redistribution must be conditioned upon
++ *    including a substantially similar Disclaimer requirement for further
++ *    binary redistribution.
++ * 3. Neither the names of the above-listed copyright holders nor the names
++ *    of any contributors may be used to endorse or promote products derived
++ *    from this software without specific prior written permission.
++ *
++ * Alternatively, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2 as published by the Free
++ * Software Foundation.
++ *
++ * NO WARRANTY
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
++ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
++ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
++ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
++ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++ * POSSIBILITY OF SUCH DAMAGES.
++ *
++ * $Id: //depot/aic7xxx/linux/drivers/scsi/aic7xxx/aic79xx_osm_pci.c#25 $
++ */
++
++void
++aic_power_state_change(struct aic_softc *aic, aic_power_state new_state)
++{
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
++	pci_set_power_state(aic_dev_to_pci_dev(aic->dev_softc), new_state);
++#else
++	uint32_t cap;
++	u_int cap_offset;
++
++	/*
++	 * Traverse the capability list looking for
++	 * the power management capability.
++	 */
++	cap = 0;
++	cap_offset = aic_pci_read_config(aic->dev_softc,
++					 PCIR_CAP_PTR, /*bytes*/1);
++	while (cap_offset != 0) {
++
++		cap = aic_pci_read_config(aic->dev_softc,
++					  cap_offset, /*bytes*/4);
++		if ((cap & 0xFF) == 1
++		 && ((cap >> 16) & 0x3) > 0) {
++			uint32_t pm_control;
++
++			pm_control = aic_pci_read_config(aic->dev_softc,
++							 cap_offset + 4,
++							 /*bytes*/4);
++			pm_control &= ~0x3;
++			pm_control |= new_state;
++			aic_pci_write_config(aic->dev_softc,
++					     cap_offset + 4,
++					     pm_control, /*bytes*/2);
++			break;
++		}
++		cap_offset = (cap >> 8) & 0xFF;
++	}
++#endif 
++}
+--- linux-2.6.0/drivers/scsi/aic7xxx/Kconfig.aic7xxx	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/Kconfig.aic7xxx	2003-12-28 23:21:40.000000000 -0800
+@@ -1,18 +1,16 @@
+ #
+ # AIC7XXX and AIC79XX 2.5.X Kernel configuration File.
+-# $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)"
++	depends on PCI || EISA
+ 	---help---
+ 	This driver supports all of Adaptec's Fast through Ultra 160 PCI
+ 	based SCSI controllers as well as the aic7770 based EISA and VLB
+ 	SCSI controllers (the 274x and 284x series).  For AAA and ARO based
+ 	configurations, only SCSI functionality is provided.
+ 
+-	To compile this driver as a module, choose M here: the
+-	module will be called aic7xxx.
+-
+ config AIC7XXX_CMDS_PER_DEVICE
+ 	int "Maximum number of TCQ commands per device"
+ 	depends on SCSI_AIC7XXX
+@@ -50,7 +48,7 @@ config AIC7XXX_RESET_DELAY_MS
+ 
+ config AIC7XXX_PROBE_EISA_VL
+ 	bool "Probe for EISA and VL AIC7XXX Adapters"
+-	depends on SCSI_AIC7XXX
++	depends on SCSI_AIC7XXX && EISA
+ 	help
+ 	Probe for EISA and VLB Aic7xxx controllers.  In many newer systems,
+ 	the invasive probes necessary to detect these controllers can cause
+--- linux-2.6.0/drivers/scsi/aic7xxx/Makefile	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/scsi/aic7xxx/Makefile	2003-12-28 23:21:40.000000000 -0800
+@@ -1,7 +1,7 @@
+ #
+ # Makefile for the Linux aic7xxx SCSI driver.
+ #
+-# $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
+@@ -12,15 +12,15 @@ obj-$(CONFIG_SCSI_AIC79XX)	+= aic79xx.o
+ 
+ # Core Fast -> U160 files
+ aic7xxx-y					+= aic7xxx_core.o	\
+-						   aic7xxx_93cx6.o	\
+-						   aic7770.o
++						   aic7xxx_93cx6.o
++aic7xxx-$(CONFIG_EISA)				+= aic7770.o
+ aic7xxx-$(CONFIG_PCI)				+= aic7xxx_pci.o
+ aic7xxx-$(CONFIG_AIC7XXX_REG_PRETTY_PRINT)	+= aic7xxx_reg_print.o
+ 
+ # Platform Specific Fast -> U160 Files
+ aic7xxx-y					+= aic7xxx_osm.o	\
+-						   aic7xxx_proc.o	\
+-						   aic7770_osm.o
++						   aic7xxx_proc.o
++aic7xxx-$(CONFIG_EISA)				+= aic7770_osm.o
+ aic7xxx-$(CONFIG_PCI)				+= aic7xxx_osm_pci.o
+ 
+ # Core U320 files
+@@ -58,6 +58,13 @@ aicasm-7xxx-opts-$(CONFIG_AIC7XXX_REG_PR
+ 	-p $(obj)/aic7xxx_reg_print.c -i aic7xxx_osm.h
+ 
+ ifeq ($(CONFIG_AIC7XXX_BUILD_FIRMWARE),y)
++# Create a dependency chain in generated files
++# to avoid concurrent invocations of the single
++# rule that builds them all.
++aic7xxx_seq.h: aic7xxx_reg.h
++ifeq ($(CONFIG_AIC7XXX_REG_PRETTY_PRINT),y)
++aic7xxx_reg.h: aic7xxx_reg_print.c
++endif
+ $(aic7xxx-gen-y): $(src)/aic7xxx.seq $(src)/aic7xxx.reg $(obj)/aicasm/aicasm
+ 	$(obj)/aicasm/aicasm -I$(src) -r $(obj)/aic7xxx_reg.h \
+ 			      $(aicasm-7xxx-opts-y) -o $(obj)/aic7xxx_seq.h \
+@@ -72,6 +79,13 @@ aicasm-79xx-opts-$(CONFIG_AIC79XX_REG_PR
+ 	-p $(obj)/aic79xx_reg_print.c -i aic79xx_osm.h
+ 
+ ifeq ($(CONFIG_AIC79XX_BUILD_FIRMWARE),y)
++# Create a dependency chain in generated files
++# to avoid concurrent invocations of the single
++# rule that builds them all.
++aic79xx_seq.h: aic79xx_reg.h
++ifeq ($(CONFIG_AIC79XX_REG_PRETTY_PRINT),y)
++aic79xx_reg.h: aic79xx_reg_print.c
++endif
+ $(aic79xx-gen-y): $(src)/aic79xx.seq $(src)/aic79xx.reg $(obj)/aicasm/aicasm
+ 	$(obj)/aicasm/aicasm -I$(src) -r $(obj)/aic79xx_reg.h \
+ 			      $(aicasm-79xx-opts-y) -o $(obj)/aic79xx_seq.h \
+--- linux-2.6.0/drivers/scsi/aic7xxx_old/aic7xxx_proc.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/scsi/aic7xxx_old/aic7xxx_proc.c	2003-12-28 23:21:41.000000000 -0800
+@@ -90,9 +90,7 @@ aic7xxx_proc_info ( struct Scsi_Host *HB
+   unsigned char i;
+   unsigned char tindex;
+ 
+-  HBAptr = NULL;
+-
+-  for(p=first_aic7xxx; p->host != HBAptr; p=p->next)
++  for(p=first_aic7xxx; p && p->host != HBAptr; p=p->next)
+     ;
+ 
+   if (!p)
+--- linux-2.6.0/drivers/scsi/BusLogic.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/scsi/BusLogic.c	2003-12-28 23:22:18.000000000 -0800
+@@ -3462,6 +3462,18 @@ static boolean BusLogic_WriteOutgoingMai
+   return false;
+ }
+ 
++/* Error Handling (EH) support */
++
++static int BusLogic_host_reset(Scsi_Cmnd *SCpnt)
++{
++	BusLogic_HostAdapter_T *HostAdapter =
++		(BusLogic_HostAdapter_T *) SCpnt->device->host->hostdata;
++
++	/* printk("BusLogic_host_reset\n"); */
++	HostAdapter->HostAdapterExternalReset = 1;
++	BusLogic_ResetHostAdapter(HostAdapter, NULL, 0);
++	return SUCCESS;
++}
+ 
+ /*
+   BusLogic_QueueCommand creates a CCB for Command and places it into an
+@@ -4589,220 +4601,8 @@ static boolean BusLogic_ParseKeyword(cha
+   adapters whereas the remaining options apply individually only to the
+   selected host adapter.
+ 
+-  The BusLogic Driver Probing Options comprise the following:
+-
+-  IO:<integer>
+-
+-    The "IO:" option specifies an ISA I/O Address to be probed for a non-PCI
+-    MultiMaster Host Adapter.  If neither "IO:" nor "NoProbeISA" options are
+-    specified, then the standard list of BusLogic MultiMaster ISA I/O Addresses
+-    will be probed (0x330, 0x334, 0x230, 0x234, 0x130, and 0x134).  Multiple
+-    "IO:" options may be specified to precisely determine the I/O Addresses to
+-    be probed, but the probe order will always follow the standard list.
+-
+-  NoProbe
+-
+-    The "NoProbe" option disables all probing and therefore no BusLogic Host
+-    Adapters will be detected.
+-
+-  NoProbeISA
+-
+-    The "NoProbeISA" option disables probing of the standard BusLogic ISA I/O
+-    Addresses and therefore only PCI MultiMaster and FlashPoint Host Adapters
+-    will be detected.
+-
+-  NoProbePCI
+-
+-    The "NoProbePCI" options disables the interrogation of PCI Configuration
+-    Space and therefore only ISA Multimaster Host Adapters will be detected, as
+-    well as PCI Multimaster Host Adapters that have their ISA Compatible I/O
+-    Port set to "Primary" or "Alternate".
+-
+-  NoSortPCI
+-
+-    The "NoSortPCI" option forces PCI MultiMaster Host Adapters to be
+-    enumerated in the order provided by the PCI BIOS, ignoring any setting of
+-    the AutoSCSI "Use Bus And Device # For PCI Scanning Seq." option.
+-
+-  MultiMasterFirst
+-
+-    The "MultiMasterFirst" option forces MultiMaster Host Adapters to be probed
+-    before FlashPoint Host Adapters.  By default, if both FlashPoint and PCI
+-    MultiMaster Host Adapters are present, this driver will probe for
+-    FlashPoint Host Adapters first unless the BIOS primary disk is controlled
+-    by the first PCI MultiMaster Host Adapter, in which case MultiMaster Host
+-    Adapters will be probed first.
+-
+-  FlashPointFirst
+-
+-    The "FlashPointFirst" option forces FlashPoint Host Adapters to be probed
+-    before MultiMaster Host Adapters.
+-
+-  The BusLogic Driver Tagged Queuing Options allow for explicitly specifying
+-  the Queue Depth and whether Tagged Queuing is permitted for each Target
+-  Device (assuming that the Target Device supports Tagged Queuing).  The Queue
+-  Depth is the number of SCSI Commands that are allowed to be concurrently
+-  presented for execution (either to the Host Adapter or Target Device).  Note
+-  that explicitly enabling Tagged Queuing may lead to problems; the option to
+-  enable or disable Tagged Queuing is provided primarily to allow disabling
+-  Tagged Queuing on Target Devices that do not implement it correctly.  The
+-  following options are available:
+-
+-  QueueDepth:<integer>
+-
+-    The "QueueDepth:" or QD:" option specifies the Queue Depth to use for all
+-    Target Devices that support Tagged Queuing, as well as the maximum Queue
+-    Depth for devices that do not support Tagged Queuing.  If no Queue Depth
+-    option is provided, the Queue Depth will be determined automatically based
+-    on the Host Adapter's Total Queue Depth and the number, type, speed, and
+-    capabilities of the detected Target Devices.  For Host Adapters that
+-    require ISA Bounce Buffers, the Queue Depth is automatically set by default
+-    to BusLogic_TaggedQueueDepthBB or BusLogic_UntaggedQueueDepthBB to avoid
+-    excessive preallocation of DMA Bounce Buffer memory.  Target Devices that
+-    do not support Tagged Queuing always have their Queue Depth set to
+-    BusLogic_UntaggedQueueDepth or BusLogic_UntaggedQueueDepthBB, unless a
+-    lower Queue Depth option is provided.  A Queue Depth of 1 automatically
+-    disables Tagged Queuing.
+-
+-  QueueDepth:[<integer>,<integer>...]
+-
+-    The "QueueDepth:[...]" or "QD:[...]" option specifies the Queue Depth
+-    individually for each Target Device.  If an <integer> is omitted, the
+-    associated Target Device will have its Queue Depth selected automatically.
+-
+-  TaggedQueuing:Default
+-
+-    The "TaggedQueuing:Default" or "TQ:Default" option permits Tagged Queuing
+-    based on the firmware version of the BusLogic Host Adapter and based on
+-    whether the Queue Depth allows queuing multiple commands.
+-
+-  TaggedQueuing:Enable
+-
+-    The "TaggedQueuing:Enable" or "TQ:Enable" option enables Tagged Queuing for
+-    all Target Devices on this Host Adapter, overriding any limitation that
+-    would otherwise be imposed based on the Host Adapter firmware version.
+-
+-  TaggedQueuing:Disable
+-
+-    The "TaggedQueuing:Disable" or "TQ:Disable" option disables Tagged Queuing
+-    for all Target Devices on this Host Adapter.
+-
+-  TaggedQueuing:<Target-Spec>
+-
+-    The "TaggedQueuing:<Target-Spec>" or "TQ:<Target-Spec>" option controls
+-    Tagged Queuing individually for each Target Device.  <Target-Spec> is a
+-    sequence of "Y", "N", and "X" characters.  "Y" enables Tagged Queuing, "N"
+-    disables Tagged Queuing, and "X" accepts the default based on the firmware
+-    version.  The first character refers to Target Device 0, the second to
+-    Target Device 1, and so on; if the sequence of "Y", "N", and "X" characters
+-    does not cover all the Target Devices, unspecified characters are assumed
+-    to be "X".
+-
+-  The BusLogic Driver Error Recovery Option allows for explicitly specifying
+-  the Error Recovery action to be performed when BusLogic_ResetCommand is
+-  called due to a SCSI Command failing to complete successfully.  The following
+-  options are available:
+-
+-  ErrorRecovery:Default
+-
+-    The "ErrorRecovery:Default" or "ER:Default" option selects between the Hard
+-    Reset and Bus Device Reset options based on the recommendation of the SCSI
+-    Subsystem.
+-
+-  ErrorRecovery:HardReset
+-
+-    The "ErrorRecovery:HardReset" or "ER:HardReset" option will initiate a Host
+-    Adapter Hard Reset which also causes a SCSI Bus Reset.
+-
+-  ErrorRecovery:BusDeviceReset
+-
+-    The "ErrorRecovery:BusDeviceReset" or "ER:BusDeviceReset" option will send
+-    a Bus Device Reset message to the individual Target Device causing the
+-    error.  If Error Recovery is again initiated for this Target Device and no
+-    SCSI Command to this Target Device has completed successfully since the Bus
+-    Device Reset message was sent, then a Hard Reset will be attempted.
+-
+-  ErrorRecovery:None
+-
+-    The "ErrorRecovery:None" or "ER:None" option suppresses Error Recovery.
+-    This option should only be selected if a SCSI Bus Reset or Bus Device Reset
+-    will cause the Target Device or a critical operation to suffer a complete
+-    and unrecoverable failure.
+-
+-  ErrorRecovery:<Target-Spec>
+-
+-    The "ErrorRecovery:<Target-Spec>" or "ER:<Target-Spec>" option controls
+-    Error Recovery individually for each Target Device.  <Target-Spec> is a
+-    sequence of "D", "H", "B", and "N" characters.  "D" selects Default, "H"
+-    selects Hard Reset, "B" selects Bus Device Reset, and "N" selects None.
+-    The first character refers to Target Device 0, the second to Target Device
+-    1, and so on; if the sequence of "D", "H", "B", and "N" characters does not
+-    cover all the possible Target Devices, unspecified characters are assumed
+-    to be "D".
+-
+-  The BusLogic Driver Miscellaneous Options comprise the following:
+-
+-  BusSettleTime:<seconds>
+-
+-    The "BusSettleTime:" or "BST:" option specifies the Bus Settle Time in
+-    seconds.  The Bus Settle Time is the amount of time to wait between a Host
+-    Adapter Hard Reset which initiates a SCSI Bus Reset and issuing any SCSI
+-    Commands.  If unspecified, it defaults to BusLogic_DefaultBusSettleTime.
+-
+-  InhibitTargetInquiry
+-
+-    The "InhibitTargetInquiry" option inhibits the execution of an Inquire
+-    Target Devices or Inquire Installed Devices command on MultiMaster Host
+-    Adapters.  This may be necessary with some older Target Devices that do not
+-    respond correctly when Logical Units above 0 are addressed.
+-
+-  The BusLogic Driver Debugging Options comprise the following:
+-
+-  TraceProbe
+-
+-    The "TraceProbe" option enables tracing of Host Adapter Probing.
+-
+-  TraceHardwareReset
+-
+-    The "TraceHardwareReset" option enables tracing of Host Adapter Hardware
+-    Reset.
+-
+-  TraceConfiguration
+-
+-    The "TraceConfiguration" option enables tracing of Host Adapter
+-    Configuration.
+-
+-  TraceErrors
+-
+-    The "TraceErrors" option enables tracing of SCSI Commands that return an
+-    error from the Target Device.  The CDB and Sense Data will be printed for
+-    each SCSI Command that fails.
+-
+-  Debug
+-
+-    The "Debug" option enables all debugging options.
+-
+-  The following examples demonstrate setting the Queue Depth for Target Devices
+-  1 and 2 on the first host adapter to 7 and 15, the Queue Depth for all Target
+-  Devices on the second host adapter to 31, and the Bus Settle Time on the
+-  second host adapter to 30 seconds.
+-
+-  Linux Kernel Command Line:
+-
+-    linux BusLogic=QueueDepth:[,7,15];QueueDepth:31,BusSettleTime:30
+-
+-  LILO Linux Boot Loader (in /etc/lilo.conf):
+-
+-    append = "BusLogic=QueueDepth:[,7,15];QueueDepth:31,BusSettleTime:30"
+-
+-  INSMOD Loadable Kernel Module Installation Facility:
+-
+-    insmod BusLogic.o \
+-	'BusLogic="QueueDepth:[,7,15];QueueDepth:31,BusSettleTime:30"'
+-
+-  NOTE: Module Utilities 2.1.71 or later is required for correct parsing
+-	of driver options containing commas.
+-
++  The BusLogic Driver Probing Options are described in
++  <file:Documentation/scsi/BusLogic.txt>.
+ */
+ 
+ static int __init BusLogic_ParseDriverOptions(char *OptionsString)
+@@ -5126,6 +4926,7 @@ static SCSI_Host_Template_T driver_templ
+ 	.queuecommand		= BusLogic_QueueCommand,
+ 	.slave_configure	= BusLogic_SlaveConfigure,
+ 	.bios_param		= BusLogic_BIOSDiskParameters,
++	.eh_host_reset_handler	= BusLogic_host_reset,
+ 	.unchecked_isa_dma	= 1,
+ 	.max_sectors		= 128,
+ 	.use_clustering		= ENABLE_CLUSTERING,
+--- linux-2.6.0/drivers/scsi/hosts.c	2003-11-23 19:03:01.000000000 -0800
++++ 25/drivers/scsi/hosts.c	2003-12-28 23:22:30.000000000 -0800
+@@ -109,7 +109,7 @@ int scsi_add_host(struct Scsi_Host *shos
+ 	}
+ 
+ 	if (!shost->shost_gendev.parent)
+-		shost->shost_gendev.parent = dev ? dev : &legacy_bus;
++		shost->shost_gendev.parent = dev ? dev : &platform_bus;
+ 
+ 	error = device_add(&shost->shost_gendev);
+ 	if (error)
+--- linux-2.6.0/drivers/scsi/ide-scsi.c	2003-12-17 21:20:02.000000000 -0800
++++ 25/drivers/scsi/ide-scsi.c	2003-12-28 23:21:17.000000000 -0800
+@@ -636,24 +636,23 @@ static ide_driver_t idescsi_driver = {
+ 	.drives			= LIST_HEAD_INIT(idescsi_driver.drives),
+ };
+ 
+-static int idescsi_ide_open(struct inode *inode, struct file *filp)
++static int idescsi_ide_open(struct block_device *bdev, struct file *filp)
+ {
+-	ide_drive_t *drive = inode->i_bdev->bd_disk->private_data;
++	ide_drive_t *drive = bdev->bd_disk->private_data;
+ 	drive->usage++;
+ 	return 0;
+ }
+ 
+-static int idescsi_ide_release(struct inode *inode, struct file *filp)
++static int idescsi_ide_release(struct gendisk *disk)
+ {
+-	ide_drive_t *drive = inode->i_bdev->bd_disk->private_data;
++	ide_drive_t *drive = disk->private_data;
+ 	drive->usage--;
+ 	return 0;
+ }
+ 
+-static int idescsi_ide_ioctl(struct inode *inode, struct file *file,
++static int idescsi_ide_ioctl(struct block_device *bdev, struct file *file,
+ 			unsigned int cmd, unsigned long arg)
+ {
+-	struct block_device *bdev = inode->i_bdev;
+ 	return generic_ide_ioctl(bdev, cmd, arg);
+ }
+ 
+--- linux-2.6.0/drivers/scsi/Kconfig	2003-11-23 19:03:01.000000000 -0800
++++ 25/drivers/scsi/Kconfig	2003-12-28 23:21:49.000000000 -0800
+@@ -55,6 +55,14 @@ config BLK_DEV_SD
+ 	  In this case, do not compile the driver for your SCSI host adapter
+ 	  (below) as a module either.
+ 
++config MAX_SD_DISKS
++	int "Maximum number of SCSI disks to support (256-8192)"
++	depends on BLK_DEV_SD
++	default "256"
++	help
++	The maximum number SCSI disks to support. Default is 256.
++	Change this value if you want kernel to support lots of SCSI devices.
++
+ config CHR_DEV_ST
+ 	tristate "SCSI tape support"
+ 	depends on SCSI
+@@ -911,37 +919,34 @@ config SCSI_SYM53C8XX_DMA_ADDRESSING_MOD
+ 	depends on SCSI_SYM53C8XX_2
+ 	default "1"
+ 	---help---
+-	  This option only applies to PCI-SCSI chip that are PCI DAC capable 
+-	  (875A, 895A, 896, 1010-33, 1010-66, 1000).
++	  This option only applies to PCI-SCSI chips that are PCI DAC
++	  capable (875A, 895A, 896, 1010-33, 1010-66, 1000).
+ 
+-	  When set to 0, only PCI 32 bit DMA addressing (SAC) will be performed.
+-	  When set to 1, 40 bit DMA addressing (with upper 24 bits of address 
+-	  set to zero) is supported. The addressable range is here 1 TB.
+-	  When set to 2, full 64 bits of address for DMA are supported, but only
+-	  16 segments of 4 GB can be addressed. The addressable range is so 
+-	  limited to 64 GB.
+-
+-	  The safest value is 0 (32 bit DMA addressing) that is guessed to still 
+-	  fit most of real machines.
+-
+-	  The preferred value 1 (40 bit DMA addressing) should make happy 
+-	  properly engineered PCI DAC capable host bridges. You may configure
+-	  this option for Intel platforms with more than 4 GB of memory.
+-
+-	  The still experimental value 2 (64 bit DMA addressing with 16 x 4GB 
+-	  segments limitation) can be used on systems that require PCI address 
+-	  bits past bit 39 to be set for the addressing of memory using PCI 
+-	  DAC cycles.
++	  When set to 0, the driver will program the chip to only perform
++	  32-bit DMA.  When set to 1, the chip will be able to perform DMA
++	  to addresses up to 1TB.  When set to 2, the driver supports the
++	  full 64-bit DMA address range, but can only address 16 segments
++	  of 4 GB each.  This limits the total addressable range to 64 GB.
++
++	  Most machines with less than 4GB of memory should use a setting
++	  of 0 for best performance.  If your machine has 4GB of memory
++	  or more, you should set this option to 1 (the default).
++
++	  The still experimental value 2 (64 bit DMA addressing with 16
++	  x 4GB segments limitation) can be used on systems that require
++	  PCI address bits past bit 39 to be set for the addressing of
++	  memory using PCI DAC cycles.
+ 
+ config SCSI_SYM53C8XX_DEFAULT_TAGS
+ 	int "default tagged command queue depth"
+ 	depends on SCSI_SYM53C8XX_2
+ 	default "16"
+ 	help
+-	  This is the default value of the command queue depth the driver will 
+-	  announce to the generic SCSI layer for devices that support tagged 
+-	  command queueing. This value can be changed from the boot command line.
+-	  This is a soft limit that cannot exceed CONFIG_SCSI_SYM53C8XX_MAX_TAGS.
++	  This is the default value of the command queue depth the
++	  driver will announce to the generic SCSI layer for devices
++	  that support tagged command queueing. This value can be changed
++	  from the boot command line.  This is a soft limit that cannot
++	  exceed CONFIG_SCSI_SYM53C8XX_MAX_TAGS.
+ 
+ config SCSI_SYM53C8XX_MAX_TAGS
+ 	int "maximum number of queued commands"
+@@ -954,11 +959,12 @@ config SCSI_SYM53C8XX_MAX_TAGS
+ 	  This value is used as a compiled-in hard limit.
+ 
+ config SCSI_SYM53C8XX_IOMAPPED
+-	bool "use normal IO"
++	bool "use port IO"
+ 	depends on SCSI_SYM53C8XX_2
+ 	help
+-	  If you say Y here, the driver will preferently use normal IO rather than 
+-	  memory mapped IO.
++	  If you say Y here, the driver will use port IO to access
++	  the card.  This is significantly slower then using memory
++	  mapped IO.  Most people should answer N.
+ 
+ config SCSI_ZALON
+ 	tristate "Zalon SCSI support"
+--- linux-2.6.0/drivers/scsi/pcmcia/aha152x_stub.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/scsi/pcmcia/aha152x_stub.c	2003-12-28 23:22:54.000000000 -0800
+@@ -153,7 +153,7 @@ static dev_link_t *aha152x_attach(void)
+ 	CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
+     client_reg.Version = 0x0210;
+     client_reg.event_callback_args.client_data = link;
+-    ret = CardServices(RegisterClient, &link->handle, &client_reg);
++    ret = pcmcia_register_client(&link->handle, &client_reg);
+     if (ret != 0) {
+ 	cs_error(link->handle, RegisterClient, ret);
+ 	aha152x_detach(link);
+@@ -181,7 +181,7 @@ static void aha152x_detach(dev_link_t *l
+ 	aha152x_release_cs(link);
+ 
+     if (link->handle)
+-	CardServices(DeregisterClient, link->handle);
++	pcmcia_deregister_client(link->handle);
+     
+     /* Unlink device structure, free bits */
+     *linkp = link->next;
+@@ -191,11 +191,8 @@ static void aha152x_detach(dev_link_t *l
+ 
+ /*====================================================================*/
+ 
+-#define CS_CHECK(fn, args...) \
+-while ((last_ret=CardServices(last_fn=(fn), args))!=0) goto cs_failed
+-
+-#define CFG_CHECK(fn, args...) \
+-if (CardServices(fn, args) != 0) goto next_entry
++#define CS_CHECK(fn, ret) \
++do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+ 
+ static void aha152x_config_cs(dev_link_t *link)
+ {
+@@ -214,19 +211,20 @@ static void aha152x_config_cs(dev_link_t
+     tuple.TupleData = tuple_data;
+     tuple.TupleDataMax = 64;
+     tuple.TupleOffset = 0;
+-    CS_CHECK(GetFirstTuple, handle, &tuple);
+-    CS_CHECK(GetTupleData, handle, &tuple);
+-    CS_CHECK(ParseTuple, handle, &tuple, &parse);
++    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
++    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
++    CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+     link->conf.ConfigBase = parse.config.base;
+ 
+     /* Configure card */
+     link->state |= DEV_CONFIG;
+ 
+     tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+-    CS_CHECK(GetFirstTuple, handle, &tuple);
++    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+     while (1) {
+-	CFG_CHECK(GetTupleData, handle, &tuple);
+-	CFG_CHECK(ParseTuple, handle, &tuple, &parse);
++	if (pcmcia_get_tuple_data(handle, &tuple) != 0 ||
++		pcmcia_parse_tuple(handle, &tuple, &parse) != 0)
++	    goto next_entry;
+ 	/* For New Media T&J, look for a SCSI window */
+ 	if (parse.cftable_entry.io.win[0].len >= 0x20)
+ 	    link->io.BasePort1 = parse.cftable_entry.io.win[0].base;
+@@ -236,15 +234,15 @@ static void aha152x_config_cs(dev_link_t
+ 	if ((parse.cftable_entry.io.nwin > 0) &&
+ 	    (link->io.BasePort1 < 0xffff)) {
+ 	    link->conf.ConfigIndex = parse.cftable_entry.index;
+-	    i = CardServices(RequestIO, handle, &link->io);
++	    i = pcmcia_request_io(handle, &link->io);
+ 	    if (i == CS_SUCCESS) break;
+ 	}
+     next_entry:
+-	CS_CHECK(GetNextTuple, handle, &tuple);
++	CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(handle, &tuple));
+     }
+     
+-    CS_CHECK(RequestIRQ, handle, &link->irq);
+-    CS_CHECK(RequestConfiguration, handle, &link->conf);
++    CS_CHECK(RequestIRQ, pcmcia_request_irq(handle, &link->irq));
++    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(handle, &link->conf));
+     
+     /* A bad hack... */
+     release_region(link->io.BasePort1, link->io.NumPorts1);
+@@ -291,9 +289,9 @@ static void aha152x_release_cs(dev_link_
+ 	scsi_remove_host(info->host);
+ 	link->dev = NULL;
+     
+-	CardServices(ReleaseConfiguration, link->handle);
+-	CardServices(ReleaseIO, link->handle, &link->io);
+-	CardServices(ReleaseIRQ, link->handle, &link->irq);
++	pcmcia_release_configuration(link->handle);
++	pcmcia_release_io(link->handle, &link->io);
++	pcmcia_release_irq(link->handle, &link->irq);
+     
+ 	link->state &= ~DEV_CONFIG;
+ 	scsi_unregister(info->host);
+@@ -322,7 +320,7 @@ static int aha152x_event(event_t event, 
+ 	/* Fall through... */
+     case CS_EVENT_RESET_PHYSICAL:
+ 	if (link->state & DEV_CONFIG)
+-	    CardServices(ReleaseConfiguration, link->handle);
++	    pcmcia_release_configuration(link->handle);
+ 	break;
+     case CS_EVENT_PM_RESUME:
+ 	link->state &= ~DEV_SUSPEND;
+@@ -330,7 +328,7 @@ static int aha152x_event(event_t event, 
+     case CS_EVENT_CARD_RESET:
+ 	if (link->state & DEV_CONFIG) {
+ 	    Scsi_Cmnd tmp;
+-	    CardServices(RequestConfiguration, link->handle, &link->conf);
++	    pcmcia_request_configuration(link->handle, &link->conf);
+ 	    tmp.device->host = info->host;
+ 	    aha152x_host_reset(&tmp);
+ 	}
+--- linux-2.6.0/drivers/scsi/pcmcia/fdomain_stub.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/scsi/pcmcia/fdomain_stub.c	2003-12-28 23:22:54.000000000 -0800
+@@ -142,7 +142,7 @@ static dev_link_t *fdomain_attach(void)
+ 	CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
+     client_reg.Version = 0x0210;
+     client_reg.event_callback_args.client_data = link;
+-    ret = CardServices(RegisterClient, &link->handle, &client_reg);
++    ret = pcmcia_register_client(&link->handle, &client_reg);
+     if (ret != 0) {
+ 	cs_error(link->handle, RegisterClient, ret);
+ 	fdomain_detach(link);
+@@ -170,7 +170,7 @@ static void fdomain_detach(dev_link_t *l
+ 	fdomain_release(link);
+ 
+     if (link->handle)
+-	CardServices(DeregisterClient, link->handle);
++	pcmcia_deregister_client(link->handle);
+     
+     /* Unlink device structure, free bits */
+     *linkp = link->next;
+@@ -180,11 +180,8 @@ static void fdomain_detach(dev_link_t *l
+ 
+ /*====================================================================*/
+ 
+-#define CS_CHECK(fn, args...) \
+-while ((last_ret=CardServices(last_fn=(fn), args))!=0) goto cs_failed
+-
+-#define CFG_CHECK(fn, args...) \
+-if (CardServices(fn, args) != 0) goto next_entry
++#define CS_CHECK(fn, ret) \
++do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+ 
+ static void fdomain_config(dev_link_t *link)
+ {
+@@ -203,29 +200,30 @@ static void fdomain_config(dev_link_t *l
+     tuple.TupleData = tuple_data;
+     tuple.TupleDataMax = 64;
+     tuple.TupleOffset = 0;
+-    CS_CHECK(GetFirstTuple, handle, &tuple);
+-    CS_CHECK(GetTupleData, handle, &tuple);
+-    CS_CHECK(ParseTuple, handle, &tuple, &parse);
++    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
++    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
++    CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+     link->conf.ConfigBase = parse.config.base;
+ 
+     /* Configure card */
+     link->state |= DEV_CONFIG;
+     
+     tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+-    CS_CHECK(GetFirstTuple, handle, &tuple);
++    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+     while (1) {
+-	CFG_CHECK(GetTupleData, handle, &tuple);
+-	CFG_CHECK(ParseTuple, handle, &tuple, &parse);
++	if (pcmcia_get_tuple_data(handle, &tuple) != 0 ||
++		pcmcia_parse_tuple(handle, &tuple, &parse) != 0)
++	    goto next_entry;
+ 	link->conf.ConfigIndex = parse.cftable_entry.index;
+ 	link->io.BasePort1 = parse.cftable_entry.io.win[0].base;
+-	i = CardServices(RequestIO, handle, &link->io);
++	i = pcmcia_request_io(handle, &link->io);
+ 	if (i == CS_SUCCESS) break;
+     next_entry:
+-	CS_CHECK(GetNextTuple, handle, &tuple);
++	CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(handle, &tuple));
+     }
+ 
+-    CS_CHECK(RequestIRQ, handle, &link->irq);
+-    CS_CHECK(RequestConfiguration, handle, &link->conf);
++    CS_CHECK(RequestIRQ, pcmcia_request_irq(handle, &link->irq));
++    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(handle, &link->conf));
+     
+     /* A bad hack... */
+     release_region(link->io.BasePort1, link->io.NumPorts1);
+@@ -271,9 +269,9 @@ static void fdomain_release(dev_link_t *
+     scsi_remove_host(info->host);
+     link->dev = NULL;
+     
+-    CardServices(ReleaseConfiguration, link->handle);
+-    CardServices(ReleaseIO, link->handle, &link->io);
+-    CardServices(ReleaseIRQ, link->handle, &link->irq);
++    pcmcia_release_configuration(link->handle);
++    pcmcia_release_io(link->handle, &link->io);
++    pcmcia_release_irq(link->handle, &link->irq);
+ 
+     scsi_unregister(info->host);
+ 
+@@ -304,14 +302,14 @@ static int fdomain_event(event_t event, 
+ 	/* Fall through... */
+     case CS_EVENT_RESET_PHYSICAL:
+ 	if (link->state & DEV_CONFIG)
+-	    CardServices(ReleaseConfiguration, link->handle);
++	    pcmcia_release_configuration(link->handle);
+ 	break;
+     case CS_EVENT_PM_RESUME:
+ 	link->state &= ~DEV_SUSPEND;
+ 	/* Fall through... */
+     case CS_EVENT_CARD_RESET:
+ 	if (link->state & DEV_CONFIG) {
+-	    CardServices(RequestConfiguration, link->handle, &link->conf);
++	    pcmcia_request_configuration(link->handle, &link->conf);
+ 	    fdomain_16x0_bus_reset(NULL);
+ 	}
+ 	break;
+--- linux-2.6.0/drivers/scsi/pcmcia/nsp_cs.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/scsi/pcmcia/nsp_cs.c	2003-12-28 23:22:54.000000000 -0800
+@@ -1681,7 +1681,7 @@ static dev_link_t *nsp_cs_attach(void)
+ 	client_reg.event_handler = &nsp_cs_event;
+ 	client_reg.Version	 = 0x0210;
+ 	client_reg.event_callback_args.client_data = link;
+-	ret = CardServices(RegisterClient, &link->handle, &client_reg);
++	ret = pcmcia_register_client(&link->handle, &client_reg);
+ 	if (ret != CS_SUCCESS) {
+ 		cs_error(link->handle, RegisterClient, ret);
+ 		nsp_cs_detach(link);
+@@ -1721,7 +1721,7 @@ static void nsp_cs_detach(dev_link_t *li
+ 
+ 	/* Break the link with Card Services */
+ 	if (link->handle) {
+-		CardServices(DeregisterClient, link->handle);
++		pcmcia_deregister_client(link->handle);
+ 	}
+ 
+ 	/* Unlink device structure, free bits */
+@@ -1737,10 +1737,8 @@ static void nsp_cs_detach(dev_link_t *li
+     is received, to configure the PCMCIA socket, and to make the
+     ethernet device available to the system.
+ ======================================================================*/
+-#define CS_CHECK(fn, args...) \
+-while ((last_ret=CardServices(last_fn=(fn),args))!=0) goto cs_failed
+-#define CFG_CHECK(fn, args...) \
+-if (CardServices(fn, args) != 0) goto next_entry
++#define CS_CHECK(fn, ret) \
++do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+ /*====================================================================*/
+ static void nsp_cs_config(dev_link_t *link)
+ {
+@@ -1768,9 +1766,9 @@ static void nsp_cs_config(dev_link_t *li
+ 	tuple.TupleData	      = tuple_data;
+ 	tuple.TupleDataMax    = sizeof(tuple_data);
+ 	tuple.TupleOffset     = 0;
+-	CS_CHECK(GetFirstTuple, handle, &tuple);
+-	CS_CHECK(GetTupleData,	handle, &tuple);
+-	CS_CHECK(ParseTuple,	handle, &tuple, &parse);
++	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
++	CS_CHECK(GetTupleData,	pcmcia_get_tuple_data(handle, &tuple));
++	CS_CHECK(ParseTuple,	pcmcia_parse_tuple(handle, &tuple, &parse));
+ 	link->conf.ConfigBase = parse.config.base;
+ 	link->conf.Present    = parse.config.rmask[0];
+ 
+@@ -1778,16 +1776,17 @@ static void nsp_cs_config(dev_link_t *li
+ 	link->state	      |= DEV_CONFIG;
+ 
+ 	/* Look up the current Vcc */
+-	CS_CHECK(GetConfigurationInfo, handle, &conf);
++	CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(handle, &conf));
+ 	link->conf.Vcc = conf.Vcc;
+ 
+ 	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+-	CS_CHECK(GetFirstTuple, handle, &tuple);
++	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+ 	while (1) {
+ 		cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
+ 
+-		CFG_CHECK(GetTupleData, handle, &tuple);
+-		CFG_CHECK(ParseTuple,	handle, &tuple, &parse);
++		if (pcmcia_get_tuple_data(handle, &tuple) != 0 ||
++				pcmcia_parse_tuple(handle, &tuple, &parse) != 0)
++			goto next_entry;
+ 
+ 		if (cfg->flags & CISTPL_CFTABLE_DEFAULT) { dflt = *cfg; }
+ 		if (cfg->index == 0) { goto next_entry; }
+@@ -1842,7 +1841,8 @@ static void nsp_cs_config(dev_link_t *li
+ 				link->io.NumPorts2 = io->win[1].len;
+ 			}
+ 			/* This reserves IO space but doesn't actually enable it */
+-			CFG_CHECK(RequestIO, link->handle, &link->io);
++			if (pcmcia_request_io(link->handle, &link->io) != 0)
++				goto next_entry;
+ 		}
+ 
+ 		if ((cfg->mem.nwin > 0) || (dflt.mem.nwin > 0)) {
+@@ -1856,10 +1856,11 @@ static void nsp_cs_config(dev_link_t *li
+ 				req.Size = 0x1000;
+ 			}
+ 			req.AccessSpeed = 0;
+-			link->win = (window_handle_t)link->handle;
+-			CFG_CHECK(RequestWindow, &link->win, &req);
++			if (pcmcia_request_window(&link->handle, &req, &link->win) != 0)
++				goto next_entry;
+ 			map.Page = 0; map.CardOffset = mem->win[0].card_addr;
+-			CFG_CHECK(MapMemPage, link->win, &map);
++			if (pcmcia_map_mem_page(link->win, &map) != 0)
++				goto next_entry;
+ 
+ 			data->MmioAddress = (unsigned long)ioremap_nocache(req.Base, req.Size);
+ 			data->MmioLength  = req.Size;
+@@ -1871,15 +1872,15 @@ static void nsp_cs_config(dev_link_t *li
+ 		nsp_dbg(NSP_DEBUG_INIT, "next");
+ 
+ 		if (link->io.NumPorts1) {
+-			CardServices(ReleaseIO, link->handle, &link->io);
++			pcmcia_release_io(link->handle, &link->io);
+ 		}
+-		CS_CHECK(GetNextTuple, handle, &tuple);
++		CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(handle, &tuple));
+ 	}
+ 
+ 	if (link->conf.Attributes & CONF_ENABLE_IRQ) {
+-		CS_CHECK(RequestIRQ, link->handle, &link->irq);
++		CS_CHECK(RequestIRQ, pcmcia_request_irq(link->handle, &link->irq));
+ 	}
+-	CS_CHECK(RequestConfiguration, handle, &link->conf);
++	CS_CHECK(RequestConfiguration, pcmcia_request_configuration(handle, &link->conf));
+ 
+ 	if (free_ports) {
+ 		if (link->io.BasePort1) {
+@@ -2007,7 +2008,6 @@ static void nsp_cs_config(dev_link_t *li
+ 	return;
+ } /* nsp_cs_config */
+ #undef CS_CHECK
+-#undef CFG_CHECK
+ 
+ 
+ /*======================================================================
+@@ -2042,14 +2042,14 @@ static void nsp_cs_release(dev_link_t *l
+ 		if (data != NULL) {
+ 			iounmap((void *)(data->MmioAddress));
+ 		}
+-		CardServices(ReleaseWindow, link->win);
++		pcmcia_release_window(link->win);
+ 	}
+-	CardServices(ReleaseConfiguration,  link->handle);
++	pcmcia_release_configuration(link->handle);
+ 	if (link->io.NumPorts1) {
+-		CardServices(ReleaseIO,     link->handle, &link->io);
++		pcmcia_release_io(link->handle, &link->io);
+ 	}
+ 	if (link->irq.AssignedIRQ) {
+-		CardServices(ReleaseIRQ,    link->handle, &link->irq);
++		pcmcia_release_irq(link->handle, &link->irq);
+ 	}
+ 	link->state &= ~DEV_CONFIG;
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,2))
+@@ -2119,7 +2119,7 @@ static int nsp_cs_event(event_t		       
+ 
+ 		info->stop = 1;
+ 		if (link->state & DEV_CONFIG) {
+-			CardServices(ReleaseConfiguration, link->handle);
++			pcmcia_release_configuration(link->handle);
+ 		}
+ 		break;
+ 
+@@ -2130,7 +2130,7 @@ static int nsp_cs_event(event_t		       
+ 	case CS_EVENT_CARD_RESET:
+ 		nsp_dbg(NSP_DEBUG_INIT, "event: reset");
+ 		if (link->state & DEV_CONFIG) {
+-			CardServices(RequestConfiguration, link->handle, &link->conf);
++			pcmcia_request_configuration(link->handle, &link->conf);
+ 		}
+ 		info->stop = 0;
+ 
+@@ -2177,7 +2177,7 @@ static int __init nsp_cs_init(void)
+ 	servinfo_t serv;
+ 
+ 	nsp_msg(KERN_INFO, "loading...");
+-	CardServices(GetCardServicesInfo, &serv);
++	pcmcia_get_card_services_info(&serv);
+ 	if (serv.Revision != CS_RELEASE_CODE) {
+ 		nsp_msg(KERN_DEBUG, "Card Services release does not match!");
+ 		return -EINVAL;
+--- linux-2.6.0/drivers/scsi/pcmcia/nsp_cs.h	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/scsi/pcmcia/nsp_cs.h	2003-12-28 23:22:54.000000000 -0800
+@@ -457,7 +457,7 @@ static inline struct Scsi_Host *scsi_hos
+ static void cs_error(client_handle_t handle, int func, int ret)
+ {
+ 	error_info_t err = { func, ret };
+-	CardServices(ReportError, handle, &err);
++	pcmcia_report_error(handle, &err);
+ }
+ 
+ /* scatter-gather table */
+--- linux-2.6.0/drivers/scsi/pcmcia/qlogic_stub.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/scsi/pcmcia/qlogic_stub.c	2003-12-28 23:22:54.000000000 -0800
+@@ -140,7 +140,7 @@ static dev_link_t *qlogic_attach(void)
+ 	client_reg.EventMask = CS_EVENT_RESET_REQUEST | CS_EVENT_CARD_RESET | CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL | CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
+ 	client_reg.Version = 0x0210;
+ 	client_reg.event_callback_args.client_data = link;
+-	ret = CardServices(RegisterClient, &link->handle, &client_reg);
++	ret = pcmcia_register_client(&link->handle, &client_reg);
+ 	if (ret != 0) {
+ 		cs_error(link->handle, RegisterClient, ret);
+ 		qlogic_detach(link);
+@@ -169,7 +169,7 @@ static void qlogic_detach(dev_link_t * l
+ 		qlogic_release(link);
+ 
+ 	if (link->handle)
+-		CardServices(DeregisterClient, link->handle);
++		pcmcia_deregister_client(link->handle);
+ 
+ 	/* Unlink device structure, free bits */
+ 	*linkp = link->next;
+@@ -179,11 +179,8 @@ static void qlogic_detach(dev_link_t * l
+ 
+ /*====================================================================*/
+ 
+-#define CS_CHECK(fn, args...) \
+-while ((last_ret=CardServices(last_fn=(fn), args))!=0) goto cs_failed
+-
+-#define CFG_CHECK(fn, args...) \
+-if (CardServices(fn, args) != 0) goto next_entry
++#define CS_CHECK(fn, ret) \
++do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+ 
+ static void qlogic_config(dev_link_t * link)
+ {
+@@ -201,37 +198,38 @@ static void qlogic_config(dev_link_t * l
+ 	tuple.TupleDataMax = 64;
+ 	tuple.TupleOffset = 0;
+ 	tuple.DesiredTuple = CISTPL_CONFIG;
+-	CS_CHECK(GetFirstTuple, handle, &tuple);
+-	CS_CHECK(GetTupleData, handle, &tuple);
+-	CS_CHECK(ParseTuple, handle, &tuple, &parse);
++	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
++	CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
++	CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+ 	link->conf.ConfigBase = parse.config.base;
+ 
+ 	tuple.DesiredTuple = CISTPL_MANFID;
+-	if ((CardServices(GetFirstTuple, handle, &tuple) == CS_SUCCESS) && (CardServices(GetTupleData, handle, &tuple) == CS_SUCCESS))
++	if ((pcmcia_get_first_tuple(handle, &tuple) == CS_SUCCESS) && (pcmcia_get_tuple_data(handle, &tuple) == CS_SUCCESS))
+ 		info->manf_id = le16_to_cpu(tuple.TupleData[0]);
+ 
+ 	/* Configure card */
+ 	link->state |= DEV_CONFIG;
+ 
+ 	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+-	CS_CHECK(GetFirstTuple, handle, &tuple);
++	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+ 	while (1) {
+-		CFG_CHECK(GetTupleData, handle, &tuple);
+-		CFG_CHECK(ParseTuple, handle, &tuple, &parse);
++		if (pcmcia_get_tuple_data(handle, &tuple) != 0 ||
++				pcmcia_parse_tuple(handle, &tuple, &parse) != 0)
++			goto next_entry;
+ 		link->conf.ConfigIndex = parse.cftable_entry.index;
+ 		link->io.BasePort1 = parse.cftable_entry.io.win[0].base;
+ 		link->io.NumPorts1 = parse.cftable_entry.io.win[0].len;
+ 		if (link->io.BasePort1 != 0) {
+-			i = CardServices(RequestIO, handle, &link->io);
++			i = pcmcia_request_io(handle, &link->io);
+ 			if (i == CS_SUCCESS)
+ 				break;
+ 		}
+ 	      next_entry:
+-		CS_CHECK(GetNextTuple, handle, &tuple);
++		CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(handle, &tuple));
+ 	}
+ 
+-	CS_CHECK(RequestIRQ, handle, &link->irq);
+-	CS_CHECK(RequestConfiguration, handle, &link->conf);
++	CS_CHECK(RequestIRQ, pcmcia_request_irq(handle, &link->irq));
++	CS_CHECK(RequestConfiguration, pcmcia_request_configuration(handle, &link->conf));
+ 
+ 	if ((info->manf_id == MANFID_MACNICA) || (info->manf_id == MANFID_PIONEER) || (info->manf_id == 0x0098)) {
+ 		/* set ATAcmd */
+@@ -284,9 +282,9 @@ static void qlogic_release(dev_link_t *l
+ 	scsi_remove_host(info->host);
+ 	link->dev = NULL;
+ 
+-	CardServices(ReleaseConfiguration, link->handle);
+-	CardServices(ReleaseIO, link->handle, &link->io);
+-	CardServices(ReleaseIRQ, link->handle, &link->irq);
++	pcmcia_release_configuration(link->handle);
++	pcmcia_release_io(link->handle, &link->io);
++	pcmcia_release_irq(link->handle, &link->irq);
+ 
+ 	scsi_unregister(info->host);
+ 
+@@ -316,7 +314,7 @@ static int qlogic_event(event_t event, i
+ 		/* Fall through... */
+ 	case CS_EVENT_RESET_PHYSICAL:
+ 		if (link->state & DEV_CONFIG)
+-			CardServices(ReleaseConfiguration, link->handle);
++			pcmcia_release_configuration(link->handle);
+ 		break;
+ 	case CS_EVENT_PM_RESUME:
+ 		link->state &= ~DEV_SUSPEND;
+@@ -324,7 +322,7 @@ static int qlogic_event(event_t event, i
+ 	case CS_EVENT_CARD_RESET:
+ 		if (link->state & DEV_CONFIG) {
+ 			scsi_info_t *info = link->priv;
+-			CardServices(RequestConfiguration, link->handle, &link->conf);
++			pcmcia_request_configuration(link->handle, &link->conf);
+ 			if ((info->manf_id == MANFID_MACNICA) || (info->manf_id == MANFID_PIONEER) || (info->manf_id == 0x0098)) {
+ 				outb(0x80, link->io.BasePort1 + 0xd);
+ 				outb(0x24, link->io.BasePort1 + 0x9);
+--- linux-2.6.0/drivers/scsi/qla1280.c	2003-12-17 21:20:02.000000000 -0800
++++ 25/drivers/scsi/qla1280.c	2003-12-28 23:21:38.000000000 -0800
+@@ -4,6 +4,7 @@
+ * QLogic  QLA1280 (Ultra2)  and  QLA12160 (Ultra3) SCSI driver
+ * Copyright (C) 2000 Qlogic Corporation (www.qlogic.com)
+ * Copyright (C) 2001-2003 Jes Sorensen, Wild Open Source Inc.
++* Copyright (C) 2003 Christoph Hellwig
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+@@ -16,13 +17,17 @@
+ * General Public License for more details.
+ *
+ ******************************************************************************/
+-#define QLA1280_VERSION      "3.23.37.1"
++#define QLA1280_VERSION      "3.23.38.1"
+ /*****************************************************************************
+     Revision History:
+     Rev  3.23.37.1 December 17, 2003, Jes Sorensen
+ 	- Delete completion queue from srb if mailbox command failed to
+ 	  to avoid qla1280_done completeting qla1280_error_action's
+ 	  obsolete context
++    Rev  3.23.38 October 18, 2003, Christoph Hellwig
++	- Convert to new-style hotplugable driver for 2.6
++	- Fix missing scsi_unregister/scsi_host_put on HBA removal
++	- Kill some of cruft
+     Rev  3.23.37 October 1, 2003, Jes Sorensen
+ 	- Make MMIO depend on CONFIG_X86_VISWS instead of yet another
+ 	  random CONFIG option
+@@ -341,9 +346,6 @@
+  * Compile time Options:
+  *            0 - Disable and 1 - Enable
+  */
+-#define  QL1280_LUN_SUPPORT	0
+-#define  WATCHDOGTIMER		0
+-
+ #define  DEBUG_QLA1280_INTR	0
+ #define  DEBUG_PRINT_NVRAM	0
+ #define  DEBUG_QLA1280		0
+@@ -423,6 +425,14 @@ scsi_adjust_queue_depth(Scsi_Device *dev
+ 	}
+ 	device->queue_depth = depth;
+ }
++static inline struct Scsi_Host *scsi_host_alloc(Scsi_Host_Template *t, size_t s)
++{
++	return scsi_register(t, s);
++}
++static inline void scsi_host_put(struct Scsi_Host *h)
++{
++	scsi_unregister(h);
++}
+ #else
+ #define HOST_LOCK			ha->host->host_lock
+ #endif
+@@ -435,30 +445,23 @@ scsi_adjust_queue_depth(Scsi_Device *dev
+ #define ia64_platform_is(foo)		(!strcmp(x, platform_name))
+ #endif
+ 
++static int qla1280_probe_one(struct pci_dev *, const struct pci_device_id *);
++static void qla1280_remove_one(struct pci_dev *);
++
+ /*
+  *  QLogic Driver Support Function Prototypes.
+  */
+ static void qla1280_done(struct scsi_qla_host *, struct srb **, struct srb **);
+-static void qla1280_done_q_put(struct srb *, struct srb **, struct srb **);
+-static int qla1280_slave_configure(Scsi_Device *);
+ #if LINUX_VERSION_CODE < 0x020545
+-static void qla1280_select_queue_depth(struct Scsi_Host *, Scsi_Device *);
+ static void qla1280_get_target_options(struct scsi_cmnd *, struct scsi_qla_host *);
+ #endif
+-
+-static int qla1280_return_status(struct response * sts, Scsi_Cmnd * cp);
+-static void qla1280_mem_free(struct scsi_qla_host *ha);
+ static int qla1280_get_token(char *);
+ static int qla1280_setup(char *s) __init;
+-static inline void qla1280_enable_intrs(struct scsi_qla_host *);
+-static inline void qla1280_disable_intrs(struct scsi_qla_host *);
+ 
+ /*
+  *  QLogic ISP1280 Hardware Support Function Prototypes.
+  */
+-static int qla1280_initialize_adapter(struct scsi_qla_host *ha);
+ static int qla1280_isp_firmware(struct scsi_qla_host *);
+-static int qla1280_pci_config(struct scsi_qla_host *);
+ static int qla1280_chip_diag(struct scsi_qla_host *);
+ static int qla1280_setup_chip(struct scsi_qla_host *);
+ static int qla1280_init_rings(struct scsi_qla_host *);
+@@ -477,7 +480,6 @@ static void qla1280_poll(struct scsi_qla
+ static void qla1280_reset_adapter(struct scsi_qla_host *);
+ static void qla1280_marker(struct scsi_qla_host *, int, int, int, u8);
+ static void qla1280_isp_cmd(struct scsi_qla_host *);
+-irqreturn_t qla1280_intr_handler(int, void *, struct pt_regs *);
+ static void qla1280_isr(struct scsi_qla_host *, struct srb **, struct srb **);
+ static void qla1280_rst_aen(struct scsi_qla_host *);
+ static void qla1280_status_entry(struct scsi_qla_host *, struct response *,
+@@ -490,11 +492,9 @@ static uint16_t qla1280_debounce_registe
+ static request_t *qla1280_req_pkt(struct scsi_qla_host *);
+ static int qla1280_check_for_dead_scsi_bus(struct scsi_qla_host *,
+ 					   unsigned int);
+-static int qla1280_mem_alloc(struct scsi_qla_host *ha);
+-
+-static void qla12160_get_target_parameters(struct scsi_qla_host *,
++static void qla1280_get_target_parameters(struct scsi_qla_host *,
+ 					   Scsi_Device *);
+-static int qla12160_set_target_parameters(struct scsi_qla_host *, int, int);
++static int qla1280_set_target_parameters(struct scsi_qla_host *, int, int);
+ 
+ 
+ static struct qla_driver_setup driver_setup __initdata;
+@@ -529,10 +529,6 @@ qla1280_data_direction(struct scsi_cmnd 
+ 	return flags;
+ }
+ 		
+-#if QL1280_LUN_SUPPORT
+-static void qla1280_enable_lun(struct scsi_qla_host *, int, int);
+-#endif
+-
+ #if DEBUG_QLA1280
+ static void __qla1280_print_scsi_cmd(Scsi_Cmnd * cmd);
+ static void __qla1280_dump_buffer(char *, int);
+@@ -551,8 +547,6 @@ MODULE_PARM(qla1280, "s");
+ __setup("qla1280=", qla1280_setup);
+ #endif
+ 
+-MODULE_LICENSE("GPL");
+-
+ 
+ /* We use the Scsi_Pointer structure that's included with each command
+  * SCSI_Cmnd as a scratchpad for our SRB.
+@@ -576,28 +570,23 @@ MODULE_LICENSE("GPL");
+ #define	CMD_RESULT(Cmnd)	Cmnd->result
+ #define	CMD_HANDLE(Cmnd)	Cmnd->host_scribble
+ #if LINUX_VERSION_CODE < 0x020545
+-#define	CMD_HOST(Cmnd)		Cmnd->host
+ #define CMD_REQUEST(Cmnd)	Cmnd->request.cmd
+-#define SCSI_BUS_32(Cmnd)	Cmnd->channel
+-#define SCSI_TCN_32(Cmnd)	Cmnd->target
+-#define SCSI_LUN_32(Cmnd)	Cmnd->lun
+ #else
+-#define	CMD_HOST(Cmnd)		Cmnd->device->host
+ #define CMD_REQUEST(Cmnd)	Cmnd->request->cmd
++#endif
++
++#define CMD_HOST(Cmnd)		Cmnd->device->host
+ #define SCSI_BUS_32(Cmnd)	Cmnd->device->channel
+ #define SCSI_TCN_32(Cmnd)	Cmnd->device->id
+ #define SCSI_LUN_32(Cmnd)	Cmnd->device->lun
+-#endif
++
+ 
+ /*****************************************/
+ /*   ISP Boards supported by this driver */
+ /*****************************************/
+ 
+-#define NUM_OF_ISP_DEVICES	6
+-
+ struct qla_boards {
+ 	unsigned char name[9];	/* Board ID String */
+-	unsigned long device_id;	/* Device PCI ID   */
+ 	int numPorts;		/* Number of SCSI ports */
+ 	unsigned short *fwcode;	/* pointer to FW array         */
+ 	unsigned short *fwlen;	/* number of words in array    */
+@@ -605,28 +594,38 @@ struct qla_boards {
+ 	unsigned char *fwver;	/* Ptr to F/W version array    */
+ };
+ 
+-struct qla_boards ql1280_board_tbl[NUM_OF_ISP_DEVICES] = {
+-	/* Name ,  Board PCI Device ID,         Number of ports */
+-	{"QLA12160", PCI_DEVICE_ID_QLOGIC_ISP12160, 2,
+-	 &fw12160i_code01[0], &fw12160i_length01,
++/* NOTE: qla1280_pci_tbl and ql1280_board_tbl must be in the same order */
++static struct pci_device_id qla1280_pci_tbl[] = {
++	{PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP12160,
++		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
++	{PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP1080,
++		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1},
++	{PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP1240,
++		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2},
++	{PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP1280,
++		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3},
++	{PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP10160,
++		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4},
++	{0,}
++};
++MODULE_DEVICE_TABLE(pci, qla1280_pci_tbl);
++
++static struct qla_boards ql1280_board_tbl[] = {
++	/* Name ,  Number of ports, FW details */
++	{"QLA12160", 2, &fw12160i_code01[0], &fw12160i_length01,
+ 	 &fw12160i_addr01, &fw12160i_version_str[0]},
+-	{"QLA1080", PCI_DEVICE_ID_QLOGIC_ISP1080, 1,
+-	 &fw1280ei_code01[0], &fw1280ei_length01,
++	{"QLA1080", 1, &fw1280ei_code01[0], &fw1280ei_length01,
+ 	 &fw1280ei_addr01, &fw1280ei_version_str[0]},
+-	{"QLA1240", PCI_DEVICE_ID_QLOGIC_ISP1240, 2,
+-	 &fw1280ei_code01[0], &fw1280ei_length01,
++	{"QLA1240", 2, &fw1280ei_code01[0], &fw1280ei_length01,
+ 	 &fw1280ei_addr01, &fw1280ei_version_str[0]},
+-	{"QLA1280", PCI_DEVICE_ID_QLOGIC_ISP1280, 2,
+-	 &fw1280ei_code01[0], &fw1280ei_length01,
++	{"QLA1280", 2, &fw1280ei_code01[0], &fw1280ei_length01,
+ 	 &fw1280ei_addr01, &fw1280ei_version_str[0]},
+-	{"QLA10160", PCI_DEVICE_ID_QLOGIC_ISP10160, 1,
+-	 &fw12160i_code01[0], &fw12160i_length01,
++	{"QLA10160", 1, &fw12160i_code01[0], &fw12160i_length01,
+ 	 &fw12160i_addr01, &fw12160i_version_str[0]},
+-	{"        ", 0, 0}
++	{"        ", 0}
+ };
+ 
+ static int qla1280_verbose = 1;
+-static struct scsi_qla_host *qla1280_hostlist;
+ static int qla1280_buffer_size;
+ static char *qla1280_buffer;
+ 
+@@ -675,31 +674,19 @@ static int qla1280_proc_info(struct Scsi
+ 	int size = 0;
+ 	int len = 0;
+ 	struct qla_boards *bdp;
+-#ifdef BOGUS_QUEUE
+-	struct scsi_lu *up;
+-	uint32_t b, t, l;
+-#endif
+-#if LINUX_VERSION_CODE >= 0x020600
+-	ha = (struct scsi_qla_host *)host->hostdata;
+-#else
++#if LINUX_VERSION_CODE < 0x020600
+ 	struct Scsi_Host *host;
+-	/* Find the host that was specified */
+-	for (ha = qla1280_hostlist; (ha != NULL)
+-		     && ha->host->host_no != hostno; ha = ha->next) ;
+-
+-	/* if host wasn't found then exit */
+-	if (!ha) {
+-		size =  sprintf(buffer, "Can't find adapter for host "
+-				"number %d\n", hostno);
+-		if (size > length) {
+-			return size;
+-		} else {
+-			return 0;
+-		}
++
++	for (host = scsi_hostlist; host; host = host->next) {
++		if (host->host_no == hostno)
++			goto found;
+ 	}
+ 
+-	host = ha->host;
++	return -ESRCH;
++
++ found:
+ #endif
++	ha = (struct scsi_qla_host *)host->hostdata;
+ 
+ 	if (inout)
+ 		return -ENOSYS;
+@@ -753,51 +740,6 @@ static int qla1280_proc_info(struct Scsi
+ 	size = sprintf(PROC_BUF, "\n");	/* 1       */
+ 	len += size;
+ 
+-	size = sprintf(PROC_BUF, "SCSI device Information:\n");
+-	len += size;
+-#ifdef BOGUS_QUEUE
+-	/* scan for all equipment stats */
+-	for (b = 0; b < MAX_BUSES; b++)
+-		for (t = 0; t < MAX_TARGETS; t++) {
+-			for (l = 0; l < MAX_LUNS; l++) {
+-				up = LU_Q(ha, b, t, l);
+-				if (up == NULL)
+-					continue;
+-				/* unused device/lun */
+-				if (up->io_cnt == 0 || up->io_cnt < 2)
+-					continue;
+-				/* total reads since boot */
+-				/* total writes since boot */
+-				/* total requests since boot  */
+-				size = sprintf (PROC_BUF,
+-						"(%2d:%2d:%2d): Total reqs %ld,",
+-						b, t, l, up->io_cnt);
+-				len += size;
+-				/* current number of pending requests */
+-				size =	sprintf(PROC_BUF, " Pend reqs %d,",
+-						up->q_outcnt);
+-				len += size;
+-#if 0
+-				/* avg response time */
+-				size = sprintf(PROC_BUF, " Avg resp time %ld%%,",
+-					       (up->resp_time / up->io_cnt) *
+-					       100);
+-				len += size;
+-
+-				/* avg active time */
+-				size = sprintf(PROC_BUF,
+-					       " Avg active time %ld%%\n",
+-					       (up->act_time / up->io_cnt) * 100);
+-#else
+-				size = sprintf(PROC_BUF, "\n");
+-#endif
+-				len += size;
+-			}
+-			if (len >= qla1280_buffer_size)
+-				break;
+-		}
+-#endif
+-
+ 	if (len >= qla1280_buffer_size) {
+ 		printk(KERN_WARNING
+ 		       "qla1280: Overflow buffer in qla1280_proc.c\n");
+@@ -875,312 +817,6 @@ static int qla1280_read_nvram(struct scs
+ 	return chksum;
+ }
+ 
+-
+-/**************************************************************************
+- * qla1280_do_device_init
+- *    This routine will register the device with the SCSI subsystem,
+- *    initialize the host adapter structure and call the device init
+- *    routines.
+- *
+- * Input:
+- *     pdev      - pointer to struct pci_dev for adapter
+- *     template  - pointer to SCSI template
+- *     devnum    - the device number
+- *     bdp       - pointer to struct _qlaboards
+- *     num_hosts - the host number
+- *
+- * Returns:
+- *  host - pointer to SCSI host structure
+- **************************************************************************/
+-struct Scsi_Host *
+-qla1280_do_device_init(struct pci_dev *pdev, Scsi_Host_Template * template,
+-		       int devnum, struct qla_boards *bdp, int num_hosts)
+-{
+-	struct Scsi_Host *host;
+-	struct scsi_qla_host *ha;
+-
+-	printk(KERN_INFO "qla1280: %s found on PCI bus %i, dev %i\n",
+-	       bdp->name, pdev->bus->number, PCI_SLOT(pdev->devfn));
+-
+-	host = scsi_register(template, sizeof(struct scsi_qla_host));
+-	if (!host) {
+-		printk(KERN_WARNING
+-		       "qla1280: Failed to register host, aborting.\n");
+-		goto error;
+-	}
+-
+-#if LINUX_VERSION_CODE < 0x020545
+-	scsi_set_pci_device(host, pdev);
+-#else
+-	scsi_set_device(host, &pdev->dev);
+-#endif
+-	ha = (struct scsi_qla_host *)host->hostdata;
+-	/* Clear our data area */
+-	memset(ha, 0, sizeof(struct scsi_qla_host));
+-	/* Sanitize the information from PCI BIOS.  */
+-	host->irq = pdev->irq;
+-	ha->pci_bus = pdev->bus->number;
+-	ha->pci_device_fn = pdev->devfn;
+-	ha->pdev = pdev;
+-	ha->device_id = bdp->device_id;
+-	ha->devnum = devnum;	/* specifies microcode load address */
+-
+-	if (qla1280_mem_alloc(ha)) {
+-		printk(KERN_INFO "qla1x160: Failed to get memory\n");
+-		goto error_scsi_unregister;
+-	}
+-
+-	ha->ports = bdp->numPorts;
+-	/* following needed for all cases of OS versions */
+-	ha->host = host;
+-	ha->host_no = host->host_no;
+-
+-	host->can_queue = 0xfffff;	/* unlimited  */
+-	host->cmd_per_lun = 1;
+-	host->base = (unsigned long)ha->mmpbase;
+-	host->max_channel = bdp->numPorts - 1;
+-	host->max_lun = MAX_LUNS - 1;
+-	host->max_id = MAX_TARGETS;
+-	host->max_sectors = 1024;
+-#if LINUX_VERSION_CODE < 0x020545
+-	host->select_queue_depths = qla1280_select_queue_depth;
+-#endif
+-
+-	ha->instance = num_hosts;
+-	host->unique_id = ha->instance;
+-
+-	if (qla1280_pci_config(ha)) {
+-		printk(KERN_INFO "qla1x160: Unable to configure PCI\n");
+-		goto error_mem_alloced;
+-	}
+-
+-	/* Disable ISP interrupts. */
+-	qla1280_disable_intrs(ha);
+-
+-	/* Register the IRQ with Linux (sharable) */
+-	if (request_irq(host->irq, qla1280_intr_handler, SA_SHIRQ,
+-			"qla1280", ha)) {
+-		printk("qla1280 : Failed to reserve interrupt %d already "
+-		       "in use\n", host->irq);
+-		goto error_iounmap;
+-	}
+-#if !MEMORY_MAPPED_IO
+-	/* Register the I/O space with Linux */
+-	if (!request_region(host->io_port, 0xff, "qla1280")) {
+-		printk("qla1280: Failed to reserve i/o region 0x%04lx-0x%04lx"
+-		       " already in use\n",
+-		       host->io_port, host->io_port + 0xff);
+-		goto error_free_irq;
+-	}
+-#endif
+-
+-	/* load the F/W, read paramaters, and init the H/W */
+-	if (qla1280_initialize_adapter(ha)) {
+-		printk(KERN_INFO "qla1x160: Failed to initialize adapter\n");
+-		goto error_release_region;
+-	}
+-
+-	/* set our host ID  (need to do something about our two IDs) */
+-	host->this_id = ha->bus_settings[0].id;
+-
+-	return host;
+-
+- error_release_region:
+-#if !MEMORY_MAPPED_IO
+-	release_region(host->io_port, 0xff);
+- error_free_irq:
+-#endif
+-	free_irq(host->irq, ha);
+- error_iounmap:
+-#if MEMORY_MAPPED_IO
+-	if (ha->mmpbase)
+-		iounmap((void *)(((unsigned long) ha->mmpbase) & PAGE_MASK));
+-#endif
+- error_mem_alloced:
+-	qla1280_mem_free(ha);
+- error_scsi_unregister:
+-	scsi_unregister(host);
+- error:
+-	return NULL;
+-}
+-
+-/**************************************************************************
+- * qla1280_detect
+- *    This routine will probe for Qlogic 1280 SCSI host adapters.
+- *    It returns the number of host adapters of a particular
+- *    type that were found.	 It also initialize all data necessary for
+- *    the driver.  It is passed-in the host number, so that it
+- *    knows where its first entry is in the scsi_hosts[] array.
+- *
+- * Input:
+- *     template - pointer to SCSI template
+- *
+- * Returns:
+- *  num - number of host adapters found.
+- **************************************************************************/
+-static int
+-qla1280_detect(Scsi_Host_Template * template)
+-{
+-	struct pci_dev *pdev = NULL;
+-	struct Scsi_Host *host;
+-	struct scsi_qla_host *ha, *cur_ha;
+-	struct qla_boards *bdp;
+-	uint16_t subsys_vendor, subsys_device;
+-	int num_hosts = 0;
+-	int devnum = 0;
+-
+-	ENTER("qla1280_detect");
+-
+-	if (sizeof(struct srb) > sizeof(Scsi_Pointer)) {
+-		printk(KERN_WARNING
+-		       "qla1280_detect: [WARNING] struct srb too big\n");
+-		return 0;
+-	}
+-#ifdef MODULE
+-	/*
+-	 * If we are called as a module, the qla1280 pointer may not be null
+-	 * and it would point to our bootup string, just like on the lilo
+-	 * command line.  IF not NULL, then process this config string with
+-	 * qla1280_setup
+-	 *
+-	 * Boot time Options
+-	 * To add options at boot time add a line to your lilo.conf file like:
+-	 * append="qla1280=verbose,max_tags:{{255,255,255,255},{255,255,255,255}}"
+-	 * which will result in the first four devices on the first two
+-	 * controllers being set to a tagged queue depth of 32.
+-	 */
+-	if (qla1280)
+-		qla1280_setup(qla1280);
+-#endif
+-
+-	bdp = &ql1280_board_tbl[0];
+-	qla1280_hostlist = NULL;
+-	template->proc_name = "qla1280";
+-
+-	/* First Initialize QLA12160 on PCI Bus 1 Dev 2 */
+-	while ((pdev = pci_find_subsys(PCI_VENDOR_ID_QLOGIC, bdp->device_id,
+-				       PCI_ANY_ID, PCI_ANY_ID, pdev))) {
+-
+-		/* find QLA12160 device on PCI bus=1 slot=2 */
+-		if ((pdev->bus->number != 1) || (PCI_SLOT(pdev->devfn) != 2))
+-			continue;
+-
+-		/* Bypass all AMI SUBSYS VENDOR IDs */
+-		if (pdev->subsystem_vendor == PCI_VENDOR_ID_AMI) {
+-			printk(KERN_INFO
+-			       "qla1x160: Skip AMI SubSys Vendor ID Chip\n");
+-			continue;
+-		}
+-
+-		if (pci_enable_device(pdev))
+-			goto find_devices;
+-
+-		host = qla1280_do_device_init(pdev, template, devnum,
+-					      bdp, num_hosts);
+-		if (!host)
+-			continue;
+-		ha = (struct scsi_qla_host *)host->hostdata;
+-
+-		/* this preferred device will always be the first one found */
+-		cur_ha = qla1280_hostlist = ha;
+-		num_hosts++;
+-	}
+-
+- find_devices:
+-
+-	pdev = NULL;
+-	/* Try and find each different type of adapter we support */
+-	for (devnum = 0; bdp->device_id != 0 && devnum < NUM_OF_ISP_DEVICES;
+-	     devnum++, bdp++) {
+-		/* PCI_SUBSYSTEM_IDS supported */
+-		while ((pdev = pci_find_subsys(PCI_VENDOR_ID_QLOGIC,
+-					       bdp->device_id, PCI_ANY_ID,
+-					       PCI_ANY_ID, pdev))) {
+-			if (pci_enable_device(pdev))
+-				continue;
+-			/* found an adapter */
+-			subsys_vendor = pdev->subsystem_vendor;
+-			subsys_device = pdev->subsystem_device;
+-
+-			/*
+-			 * skip QLA12160 already initialized on
+-			 * PCI Bus 1 Dev 2 since we already initialized
+-			 * and presented it
+-			 */
+-			if ((bdp->device_id == PCI_DEVICE_ID_QLOGIC_ISP12160)&&
+-			    (pdev->bus->number == 1) &&
+-			    (PCI_SLOT(pdev->devfn) == 2))
+-				continue;
+-
+-			/* Bypass all AMI SUBSYS VENDOR IDs */
+-			if (subsys_vendor == PCI_VENDOR_ID_AMI) {
+-				printk(KERN_INFO
+-				       "qla1x160: Skip AMI SubSys Vendor ID Chip\n");
+-				continue;
+-			}
+-			dprintk(1, "qla1x160: Supported Device Found VID=%x "
+-			       "DID=%x SSVID=%x SSDID=%x\n", pdev->vendor,
+-			       pdev->device, subsys_vendor, subsys_device);
+-
+-			host = qla1280_do_device_init(pdev, template,
+-						      devnum, bdp, num_hosts);
+-			if (!host)
+-				continue;
+-			ha = (struct scsi_qla_host *)host->hostdata;
+-
+-			if (qla1280_hostlist == NULL) {
+-				cur_ha = qla1280_hostlist = ha;
+-			} else {
+-				cur_ha = qla1280_hostlist;
+-				while (cur_ha->next != NULL)
+-					cur_ha = cur_ha->next;
+-				cur_ha->next = ha;
+-			}
+-			num_hosts++;
+-		}		/* end of WHILE */
+-	}			/* end of FOR */
+-
+-	LEAVE("qla1280_detect");
+-	return num_hosts;
+-}
+-
+-/**************************************************************************
+- *   qla1280_release
+- *   Free the passed in Scsi_Host memory structures prior to unloading the
+- *   module.
+- **************************************************************************/
+-static int
+-qla1280_release(struct Scsi_Host *host)
+-{
+-	struct scsi_qla_host *ha = (struct scsi_qla_host *)host->hostdata;
+-
+-	ENTER("qla1280_release");
+-
+-	if (!ha->flags.online)
+-		return 0;
+-
+-	/* turn-off interrupts on the card */
+-	WRT_REG_WORD(&ha->iobase->ictrl, 0);
+-
+-	/* Detach interrupts */
+-	if (host->irq)
+-		free_irq(host->irq, ha);
+-
+-#if MEMORY_MAPPED_IO
+-	if (ha->mmpbase)
+-		iounmap(ha->mmpbase);
+-#else
+-	/* release io space registers  */
+-	if (host->io_port)
+-		release_region(host->io_port, 0xff);
+-#endif				/* MEMORY_MAPPED_IO */
+-
+-	qla1280_mem_free(ha);
+-
+-	ENTER("qla1280_release");
+-	return 0;
+-}
+-
+ /**************************************************************************
+  *   qla1280_info
+  *     Return a string describing the driver.
+@@ -1197,11 +833,11 @@ qla1280_info(struct Scsi_Host *host)
+ 	ha = (struct scsi_qla_host *)host->hostdata;
+ 	bdp = &ql1280_board_tbl[ha->devnum];
+ 	memset(bp, 0, sizeof(qla1280_scsi_name_buffer));
++
+ 	sprintf (bp,
+-		 "QLogic %s PCI to SCSI Host Adapter: bus %d device %d irq %d\n"
++		 "QLogic %s PCI to SCSI Host Adapter\n"
+ 		 "       Firmware version: %2d.%02d.%02d, Driver version %s",
+-		 &bdp->name[0], ha->pci_bus, (ha->pci_device_fn & 0xf8) >> 3,
+-		 host->irq, bdp->fwver[0], bdp->fwver[1], bdp->fwver[2],
++		 &bdp->name[0], bdp->fwver[0], bdp->fwver[1], bdp->fwver[2],
+ 		 QLA1280_VERSION);
+ 	return bp;
+ }
+@@ -1220,38 +856,19 @@ qla1280_info(struct Scsi_Host *host)
+ static int
+ qla1280_queuecommand(Scsi_Cmnd * cmd, void (*fn) (Scsi_Cmnd *))
+ {
+-	struct scsi_qla_host *ha;
+-	struct srb *sp;
+-	struct Scsi_Host *host;
+-	int bus, target, lun;
+-	int status;
+-
+-	/*ENTER("qla1280_queuecommand");
+-	 */
+-	dprintk(2, "qla1280_queuecommand(): jiffies %li\n", jiffies);
+-
+-	host = CMD_HOST(cmd);
+-	ha = (struct scsi_qla_host *)host->hostdata;
++	struct Scsi_Host *host = cmd->device->host;
++	struct scsi_qla_host *ha = (struct scsi_qla_host *)host->hostdata;
++	struct srb *sp = (struct srb *)&cmd->SCp;
+ 
+-	/* send command to adapter */
+-	sp = (struct srb *)CMD_SP(cmd);
+-	sp->cmd = cmd;
+ 	cmd->scsi_done = fn;
++	sp->cmd = cmd;
+ 	sp->flags = 0;
+ 
+ 	qla1280_print_scsi_cmd(5, cmd);
+ 
+-	/* Generate LU queue on bus, target, LUN */
+-	bus = SCSI_BUS_32(cmd);
+-	target = SCSI_TCN_32(cmd);
+-	lun = SCSI_LUN_32(cmd);
+ 	if (ha->flags.enable_64bit_addressing)
+-		status = qla1280_64bit_start_scsi(ha, sp);
+-	else
+-		status = qla1280_32bit_start_scsi(ha, sp);
+-
+-	/*LEAVE("qla1280_queuecommand"); */
+-	return status;
++		return qla1280_64bit_start_scsi(ha, sp);
++	return qla1280_32bit_start_scsi(ha, sp);
+ }
+ 
+ enum action {
+@@ -1564,29 +1181,105 @@ qla1280_biosparam(struct scsi_device *sd
+ 	unsigned long capacity = disk->capacity;
+ #endif
+ 
+-	heads = 64;
+-	sectors = 32;
+-	cylinders = (unsigned long)capacity / (heads * sectors);
+-	if (cylinders > 1024) {
+-		heads = 255;
+-		sectors = 63;
+-		cylinders = (unsigned long)capacity / (heads * sectors);
+-		/* if (cylinders > 1023)
+-		   cylinders = 1023; */
++	heads = 64;
++	sectors = 32;
++	cylinders = (unsigned long)capacity / (heads * sectors);
++	if (cylinders > 1024) {
++		heads = 255;
++		sectors = 63;
++		cylinders = (unsigned long)capacity / (heads * sectors);
++		/* if (cylinders > 1023)
++		   cylinders = 1023; */
++	}
++
++	geom[0] = heads;
++	geom[1] = sectors;
++	geom[2] = cylinders;
++
++	return 0;
++}
++
++#if LINUX_VERSION_CODE < 0x020600
++static int
++qla1280_detect(Scsi_Host_Template *template)
++{
++	struct pci_device_id *id = &qla1280_pci_tbl[0];
++	struct pci_dev *pdev = NULL;
++	int num_hosts = 0;
++
++	if (sizeof(struct srb) > sizeof(Scsi_Pointer)) {
++		printk(KERN_WARNING
++		       "qla1280: struct srb too big, aborting\n");
++		return 0;
++	}
++
++#ifdef MODULE
++	/*
++	 * If we are called as a module, the qla1280 pointer may not be null
++	 * and it would point to our bootup string, just like on the lilo
++	 * command line.  IF not NULL, then process this config string with
++	 * qla1280_setup
++	 *
++	 * Boot time Options
++	 * To add options at boot time add a line to your lilo.conf file like:
++	 * append="qla1280=verbose,max_tags:{{255,255,255,255},{255,255,255,255}}"
++	 * which will result in the first four devices on the first two
++	 * controllers being set to a tagged queue depth of 32.
++	 */
++	if (qla1280)
++		qla1280_setup(qla1280);
++#endif
++
++	/* First Initialize QLA12160 on PCI Bus 1 Dev 2 */
++	while ((pdev = pci_find_device(id->vendor, id->device, pdev))) {
++		if (pdev->bus->number == 1 && PCI_SLOT(pdev->devfn) == 2) {
++			if (!qla1280_probe_one(pdev, id))
++				num_hosts++;
++		}
++	}
++
++	pdev = NULL;
++	/* Try and find each different type of adapter we support */
++	for (id = &qla1280_pci_tbl[0]; id->device; id++) {
++		while ((pdev = pci_find_device(id->vendor, id->device, pdev))) {
++			/*
++			 * skip QLA12160 already initialized on
++			 * PCI Bus 1 Dev 2 since we already initialized
++			 * and presented it
++			 */
++			if (id->device == PCI_DEVICE_ID_QLOGIC_ISP12160 &&
++			    pdev->bus->number == 1 &&
++			    PCI_SLOT(pdev->devfn) == 2)
++				continue;
++
++			if (!qla1280_probe_one(pdev, id))
++				num_hosts++;
++		}
+ 	}
+ 
+-	geom[0] = heads;
+-	geom[1] = sectors;
+-	geom[2] = cylinders;
++	return num_hosts;
++}
++
++/*
++ * This looks a bit ugly as we could just pass down host to
++ * qla1280_remove_one, but I want to keep qla1280_release purely a wrapper
++ * around pci_driver::remove as used from 2.6 onwards.
++ */
++static int
++qla1280_release(struct Scsi_Host *host)
++{
++	struct scsi_qla_host *ha = (struct scsi_qla_host *)host->hostdata;
+ 
++	qla1280_remove_one(ha->pdev);
+ 	return 0;
+ }
++#endif
+ 
+ /**************************************************************************
+  * qla1280_intr_handler
+  *   Handles the H/W interrupt
+  **************************************************************************/
+-irqreturn_t
++static irqreturn_t
+ qla1280_intr_handler(int irq, void *dev_id, struct pt_regs *regs)
+ {
+ 	struct scsi_qla_host *ha;
+@@ -1624,7 +1317,7 @@ qla1280_intr_handler(int irq, void *dev_
+ 
+ 
+ static int
+-qla12160_set_target_parameters(struct scsi_qla_host *ha, int bus, int target)
++qla1280_set_target_parameters(struct scsi_qla_host *ha, int bus, int target)
+ {
+ 	uint8_t mr;
+ 	uint16_t mb[MAILBOX_REGISTER_COUNT];
+@@ -1633,8 +1326,8 @@ qla12160_set_target_parameters(struct sc
+ 
+ 	nv = &ha->nvram;
+ 
+-	if (ha->device_id == PCI_DEVICE_ID_QLOGIC_ISP12160 ||
+-	    ha->device_id == PCI_DEVICE_ID_QLOGIC_ISP10160)
++	if (ha->pdev->device == PCI_DEVICE_ID_QLOGIC_ISP12160 ||
++	    ha->pdev->device == PCI_DEVICE_ID_QLOGIC_ISP10160)
+ 		is1x160 = 1;
+ 	else
+ 		is1x160 = 0;
+@@ -1721,8 +1414,8 @@ qla1280_slave_configure(Scsi_Device *dev
+ 	    (driver_setup.wide_mask &&
+ 	     (~driver_setup.wide_mask & (1 << target))))
+ 		nv->bus[bus].target[target].parameter.f.enable_wide = 0;
+-	if (ha->device_id == PCI_DEVICE_ID_QLOGIC_ISP12160 ||
+-	    ha->device_id == PCI_DEVICE_ID_QLOGIC_ISP10160) {
++	if (ha->pdev->device == PCI_DEVICE_ID_QLOGIC_ISP12160 ||
++	    ha->pdev->device == PCI_DEVICE_ID_QLOGIC_ISP10160) {
+ 		if (driver_setup.no_ppr ||
+ 		    (driver_setup.ppr_mask &&
+ 		     (~driver_setup.ppr_mask & (1 << target))))
+@@ -1730,11 +1423,9 @@ qla1280_slave_configure(Scsi_Device *dev
+ 	}
+ 
+ 	spin_lock_irqsave(HOST_LOCK, flags);
+-	if (nv->bus[bus].target[target].parameter.f.enable_sync) {
+-		status = qla12160_set_target_parameters(ha, bus, target);
+-	}
+-
+-	qla12160_get_target_parameters(ha, device);
++	if (nv->bus[bus].target[target].parameter.f.enable_sync)
++		status = qla1280_set_target_parameters(ha, bus, target);
++	qla1280_get_target_parameters(ha, device);
+ 	spin_unlock_irqrestore(HOST_LOCK, flags);
+ 	return status;
+ }
+@@ -1761,16 +1452,11 @@ qla1280_select_queue_depth(struct Scsi_H
+ 
+ 	if (scsi_devs)
+ 		qla1280_check_for_dead_scsi_bus(ha, scsi_devs->channel);
+-
+ 	LEAVE("qla1280_select_queue_depth");
+ }
+ #endif
+ 
+ /*
+- * Driver Support Routines
+- */
+-
+-/*
+  * qla1280_done
+  *      Process completed commands.
+  *
+@@ -1972,100 +1658,19 @@ qla1280_done_q_put(struct srb * sp, stru
+ 	LEAVE("qla1280_put_done_q");
+ }
+ 
+-
+-/*
+-* qla1280_mem_alloc
+-*      Allocates adapter memory.
+-*
+-* Returns:
+-*      0  = success.
+-*      1  = failure.
+-*/
+-static int
+-qla1280_mem_alloc(struct scsi_qla_host *ha)
+-{
+-	int status = 1;
+-	dma_addr_t dma_handle;
+-
+-	ENTER("qla1280_mem_alloc");
+-
+-	/* get consistent memory allocated for request and response rings */
+-	ha->request_ring = pci_alloc_consistent(ha->pdev,
+-						((REQUEST_ENTRY_CNT + 1) *
+-						 (sizeof(request_t))),
+-						&dma_handle);
+-	if (!ha->request_ring)
+-		goto error;
+-	ha->request_dma = dma_handle;
+-	ha->response_ring = pci_alloc_consistent(ha->pdev,
+-						 ((RESPONSE_ENTRY_CNT + 1) *
+-						  (sizeof(struct response))),
+-						 &dma_handle);
+-	if (!ha->response_ring)
+-		goto error;
+-	ha->response_dma = dma_handle;
+-	status = 0;
+-	goto finish;
+-
+- error:
+-	if (status)
+-		dprintk(2, "qla1280_mem_alloc: **** FAILED ****\n");
+-
+-	if (ha->request_ring)
+-		pci_free_consistent(ha->pdev,
+-                                    ((REQUEST_ENTRY_CNT + 1) *
+-				     (sizeof(request_t))),
+-                                    ha->request_ring, ha->request_dma);
+- finish:
+-	LEAVE("qla1280_mem_alloc");
+-	return status;
+-}
+-
+-/*
+- * qla1280_mem_free
+- *      Frees adapter allocated memory.
+- *
+- * Input:
+- *      ha = adapter block pointer.
+- */
+-static void
+-qla1280_mem_free(struct scsi_qla_host *ha)
+-{
+-	ENTER("qlc1280_mem_free");
+-	/* free consistent memory allocated for request and response rings */
+-	if (ha->request_ring)
+-		pci_free_consistent(ha->pdev,
+-				    ((REQUEST_ENTRY_CNT + 1) *
+-				     (sizeof(request_t))),
+-				    ha->request_ring, ha->request_dma);
+-
+-	if (ha->response_ring)
+-		pci_free_consistent(ha->pdev,
+-				    ((RESPONSE_ENTRY_CNT + 1) *
+-				     (sizeof(struct response))),
+-				    ha->response_ring, ha->response_dma);
+-
+-	if (qla1280_buffer) {
+-		free_page((unsigned long) qla1280_buffer);
+-		qla1280_buffer = NULL;
+-	}
+-
+-	LEAVE("qlc1280_mem_free");
+-}
+-
+ /****************************************************************************/
+ /*                QLogic ISP1280 Hardware Support Functions.                */
+ /****************************************************************************/
+ 
+  /*
+-    * qla2100_enable_intrs
+-    * qla2100_disable_intrs
+-    *
+-    * Input:
+-    *      ha = adapter block pointer.
+-    *
+-    * Returns:
+-    *      None
++  * qla2100_enable_intrs
++  * qla2100_disable_intrs
++  *
++  * Input:
++  *      ha = adapter block pointer.
++  *
++  * Returns:
++  *      None
+   */
+ static inline void
+ qla1280_enable_intrs(struct scsi_qla_host *ha)
+@@ -2101,7 +1706,7 @@ qla1280_disable_intrs(struct scsi_qla_ho
+  * Returns:
+  *      0 = success
+  */
+-static int
++static int __devinit
+ qla1280_initialize_adapter(struct scsi_qla_host *ha)
+ {
+ 	struct device_reg *reg;
+@@ -2297,7 +1902,7 @@ qla1280_isp_firmware(struct scsi_qla_hos
+  * Returns:
+  *      0 = success.
+  */
+-static int
++static int __devinit
+ qla1280_pci_config(struct scsi_qla_host *ha)
+ {
+ #if MEMORY_MAPPED_IO
+@@ -2724,8 +2329,8 @@ qla1280_nvram_config(struct scsi_qla_hos
+ 
+ 	ENTER("qla1280_nvram_config");
+ 
+-	if (ha->device_id == PCI_DEVICE_ID_QLOGIC_ISP12160 ||
+-	    ha->device_id == PCI_DEVICE_ID_QLOGIC_ISP10160)
++	if (ha->pdev->device == PCI_DEVICE_ID_QLOGIC_ISP12160 ||
++	    ha->pdev->device == PCI_DEVICE_ID_QLOGIC_ISP10160)
+ 		is1x160 = 1;
+ 	else
+ 		is1x160 = 0;
+@@ -4207,48 +3812,6 @@ qla1280_isp_cmd(struct scsi_qla_host *ha
+ 	LEAVE("qla1280_isp_cmd");
+ }
+ 
+-#if QL1280_LUN_SUPPORT
+-/*
+- * qla1280_enable_lun
+- *      Issue enable LUN entry IOCB.
+- *
+- * Input:
+- *      ha  = adapter block pointer.
+- *      bus = SCSI BUS number.
+- *      lun  = LUN number.
+- */
+-static void
+-qla1280_enable_lun(struct scsi_qla_host *ha, int bus, int lun)
+-{
+-	struct elun_entry *pkt;
+-
+-	ENTER("qla1280_enable_lun");
+-
+-	/* Get request packet. */
+-	/*
+-	  if (pkt = (struct elun_entry *)qla1280_req_pkt(ha))
+-	  {
+-	  pkt->entry_type = ENABLE_LUN_TYPE;
+-	  pkt->lun = cpu_to_le16(bus ? lun | BIT_15 : lun);
+-	  pkt->command_count = 32;
+-	  pkt->immed_notify_count = 1;
+-	  pkt->group_6_length = MAX_CMDSZ;
+-	  pkt->group_7_length = MAX_CMDSZ;
+-	  pkt->timeout = cpu_to_le16(0x30);
+-
+-	  qla1280_isp_cmd(ha);
+-	  }
+-	*/
+-	pkt = (struct elun_entry *) 1;
+-
+-	if (!pkt)
+-		dprintk(2, "qla1280_enable_lun: **** FAILED ****\n");
+-	else
+-		dprintk(3, "qla1280_enable_lun: exiting normally\n");
+-}
+-#endif
+-
+-
+ /****************************************************************************/
+ /*                        Interrupt Service Routine.                        */
+ /****************************************************************************/
+@@ -4894,7 +4457,7 @@ qla1280_check_for_dead_scsi_bus(struct s
+ }
+ 
+ static void
+-qla12160_get_target_parameters(struct scsi_qla_host *ha, Scsi_Device *device)
++qla1280_get_target_parameters(struct scsi_qla_host *ha, Scsi_Device *device)
+ {
+ 	uint16_t mb[MAILBOX_REGISTER_COUNT];
+ 	int bus, target, lun;
+@@ -5136,34 +4699,274 @@ qla1280_get_token(char *str)
+ 	return ret;
+ }
+ 
+-
+-static Scsi_Host_Template driver_template = {
+-	.proc_info		= qla1280_proc_info,
++static Scsi_Host_Template qla1280_driver_template = {
++	.proc_name		= "qla1280",
+ 	.name			= "Qlogic ISP 1280/12160",
++#if LINUX_VERSION_CODE >= 0x020545
++	.slave_configure	= qla1280_slave_configure,
++#else
+ 	.detect			= qla1280_detect,
+ 	.release		= qla1280_release,
++#endif
+ 	.info			= qla1280_info,
+ 	.queuecommand		= qla1280_queuecommand,
+-#if LINUX_VERSION_CODE >= 0x020545
+-	.slave_configure	= qla1280_slave_configure,
+-#endif
+ 	.eh_abort_handler	= qla1280_eh_abort,
+ 	.eh_device_reset_handler= qla1280_eh_device_reset,
+ 	.eh_bus_reset_handler	= qla1280_eh_bus_reset,
+ 	.eh_host_reset_handler	= qla1280_eh_adapter_reset,
+ 	.bios_param		= qla1280_biosparam,
+-	.can_queue		= 255,
++	.proc_info		= qla1280_proc_info,
++	.can_queue		= 0xfffff,
+ 	.this_id		= -1,
+ 	.sg_tablesize		= SG_ALL,
+-	.cmd_per_lun		= 3,
++	.cmd_per_lun		= 1,
+ 	.use_clustering		= ENABLE_CLUSTERING,
+ #if LINUX_VERSION_CODE < 0x020545
+ 	.use_new_eh_code	= 1,
+ #endif
+ };
+ 
+-#include "scsi_module.c"
++static int __devinit
++qla1280_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
++{
++	int devnum = id->driver_data;
++	struct qla_boards *bdp = &ql1280_board_tbl[devnum];
++	struct Scsi_Host *host;
++	struct scsi_qla_host *ha;
++	int error = -ENODEV;
++
++	/* Bypass all AMI SUBSYS VENDOR IDs */
++	if (pdev->subsystem_vendor == PCI_VENDOR_ID_AMI) {
++		printk(KERN_INFO
++		       "qla1280: Skipping AMI SubSys Vendor ID Chip\n");
++		goto error;
++	}
++
++	printk(KERN_INFO "qla1280: %s found on PCI bus %i, dev %i\n",
++	       bdp->name, pdev->bus->number, PCI_SLOT(pdev->devfn));
++
++	if (pci_enable_device(pdev)) {
++		printk(KERN_WARNING
++		       "qla1280: Failed to enabled pci device, aborting.\n");
++		goto error;
++	}
++
++	error = -ENOMEM;
++	host = scsi_host_alloc(&qla1280_driver_template, sizeof(*ha));
++	if (!host) {
++		printk(KERN_WARNING
++		       "qla1280: Failed to register host, aborting.\n");
++		goto error;
++	}
++
++	ha = (struct scsi_qla_host *)host->hostdata;
++	memset(ha, 0, sizeof(struct scsi_qla_host));
++
++	ha->pdev = pdev;
++	ha->devnum = devnum;	/* specifies microcode load address */
++
++	ha->request_ring = pci_alloc_consistent(ha->pdev,
++			((REQUEST_ENTRY_CNT + 1) * (sizeof(request_t))),
++			&ha->request_dma);
++	if (!ha->request_ring) {
++		printk(KERN_INFO "qla1280: Failed to get request memory\n");
++		goto error_put_host;
++	}
++
++	ha->response_ring = pci_alloc_consistent(ha->pdev,
++			((RESPONSE_ENTRY_CNT + 1) * (sizeof(struct response))),
++			&ha->response_dma);
++	if (!ha->response_ring) {
++		printk(KERN_INFO "qla1280: Failed to get response memory\n");
++		goto error_free_request_ring;
++	}
++
++	ha->ports = bdp->numPorts;
++
++	ha->host = host;
++	ha->host_no = host->host_no;
++
++	host->irq = pdev->irq;
++	host->base = (unsigned long)ha->mmpbase;
++	host->max_channel = bdp->numPorts - 1;
++	host->max_lun = MAX_LUNS - 1;
++	host->max_id = MAX_TARGETS;
++	host->max_sectors = 1024;
++	host->unique_id = host->host_no;
++
++#if LINUX_VERSION_CODE < 0x020545
++	host->select_queue_depths = qla1280_select_queue_depth;
++#endif
++
++	error = -ENODEV;
++	if (qla1280_pci_config(ha)) {
++		printk(KERN_INFO "qla1280: Unable to configure PCI\n");
++		goto error_free_response_ring;
++	}
++
++	/* Disable ISP interrupts. */
++	qla1280_disable_intrs(ha);
++
++	/* Register the IRQ with Linux (sharable) */
++	if (request_irq(pdev->irq, qla1280_intr_handler, SA_SHIRQ,
++				"qla1280", ha)) {
++		printk("qla1280 : Failed to reserve interrupt %d already "
++		       "in use\n", pdev->irq);
++		goto error_iounmap;
++	}
++
++#if !MEMORY_MAPPED_IO
++	/* Register the I/O space with Linux */
++	if (!request_region(host->io_port, 0xff, "qla1280")) {
++		printk("qla1280: Failed to reserve i/o region 0x%04lx-0x%04lx"
++		       " already in use\n",
++		       host->io_port, host->io_port + 0xff);
++		goto error_free_irq;
++	}
++#endif
++
++	/* load the F/W, read paramaters, and init the H/W */
++	if (qla1280_initialize_adapter(ha)) {
++		printk(KERN_INFO "qla1x160: Failed to initialize adapter\n");
++		goto error_release_region;
++	}
++
++	/* set our host ID  (need to do something about our two IDs) */
++	host->this_id = ha->bus_settings[0].id;
++
++	pci_set_drvdata(pdev, host);
++
++#if LINUX_VERSION_CODE >= 0x020600
++	error = scsi_add_host(host, &pdev->dev);
++	if (error)
++		goto error_disable_adapter;
++	scsi_scan_host(host);
++#else
++	scsi_set_pci_device(host, pdev);
++#endif
++
++	return 0;
++
++#if LINUX_VERSION_CODE >= 0x020600
++ error_disable_adapter:
++	WRT_REG_WORD(&ha->iobase->ictrl, 0);
++#endif
++ error_release_region:
++#if !MEMORY_MAPPED_IO
++	release_region(host->io_port, 0xff);
++ error_free_irq:
++#endif
++	free_irq(pdev->irq, ha);
++ error_iounmap:
++#if MEMORY_MAPPED_IO
++	iounmap((void *)(((unsigned long) ha->mmpbase) & PAGE_MASK));
++#endif
++ error_free_response_ring:
++	pci_free_consistent(ha->pdev,
++			((RESPONSE_ENTRY_CNT + 1) * (sizeof(struct response))),
++			ha->response_ring, ha->response_dma);
++ error_free_request_ring:
++	pci_free_consistent(ha->pdev,
++			((REQUEST_ENTRY_CNT + 1) * (sizeof(request_t))),
++			ha->request_ring, ha->request_dma);
++ error_put_host:
++	scsi_host_put(host);
++ error:
++	return error;
++}
++
++/*
++ * Older ia64 toolchains have problems with relative links when this
++ * goes into the .exit.text section
++ */
++#if !defined(CONFIG_QLA1280_MODULE) && defined(__ia64__) && (__GNUC__ == 2)
++static void
++#else
++static void __devexit
++#endif
++qla1280_remove_one(struct pci_dev *pdev)
++{
++	struct Scsi_Host *host = pci_get_drvdata(pdev);
++	struct scsi_qla_host *ha = (struct scsi_qla_host *)host->hostdata;
++
++#if LINUX_VERSION_CODE >= 0x020600
++	scsi_remove_host(host);
++#endif
++
++	WRT_REG_WORD(&ha->iobase->ictrl, 0);
++
++	free_irq(pdev->irq, ha);
++
++#if MEMORY_MAPPED_IO
++	iounmap(ha->mmpbase);
++#else
++	release_region(host->io_port, 0xff);
++#endif
++
++	pci_free_consistent(ha->pdev,
++			((REQUEST_ENTRY_CNT + 1) * (sizeof(request_t))),
++			ha->request_ring, ha->request_dma);
++	pci_free_consistent(ha->pdev,
++			((RESPONSE_ENTRY_CNT + 1) * (sizeof(struct response))),
++			ha->response_ring, ha->response_dma);
++
++	scsi_host_put(host);
++}
++
++#if LINUX_VERSION_CODE >= 0x020600
++static struct pci_driver qla1280_pci_driver = {
++	.name		= "qla1280",
++	.id_table	= qla1280_pci_tbl,
++	.probe		= qla1280_probe_one,
++	.remove		= __devexit_p(qla1280_remove_one),
++};
++
++static int __init
++qla1280_init(void)
++{
++	if (sizeof(struct srb) > sizeof(Scsi_Pointer)) {
++		printk(KERN_WARNING
++		       "qla1280: struct srb too big, aborting\n");
++		return -EINVAL;
++	}
++
++#ifdef MODULE
++	/*
++	 * If we are called as a module, the qla1280 pointer may not be null
++	 * and it would point to our bootup string, just like on the lilo
++	 * command line.  IF not NULL, then process this config string with
++	 * qla1280_setup
++	 *
++	 * Boot time Options
++	 * To add options at boot time add a line to your lilo.conf file like:
++	 * append="qla1280=verbose,max_tags:{{255,255,255,255},{255,255,255,255}}"
++	 * which will result in the first four devices on the first two
++	 * controllers being set to a tagged queue depth of 32.
++	 */
++	if (qla1280)
++		qla1280_setup(qla1280);
++#endif
++
++	return pci_module_init(&qla1280_pci_driver);
++}
+ 
++static void __exit
++qla1280_exit(void)
++{
++	pci_unregister_driver(&qla1280_pci_driver);
++}
++
++module_init(qla1280_init);
++module_exit(qla1280_exit);
++
++#else
++# define driver_template qla1280_driver_template
++# include "scsi_module.c"
++#endif
++
++MODULE_AUTHOR("Qlogic & Jes Sorensen");
++MODULE_DESCRIPTION("Qlogic ISP SCSI (qla1x80/qla1x160) driver");
++MODULE_LICENSE("GPL");
+ 
+ /*
+  * Overrides for Emacs so that we almost follow Linus's tabbing style.
+--- linux-2.6.0/drivers/scsi/qla1280.h	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/scsi/qla1280.h	2003-12-28 23:21:38.000000000 -0800
+@@ -1021,11 +1021,7 @@ struct scsi_qla_host {
+ 
+ 	unsigned char *mmpbase;	/* memory mapped address */
+ 	unsigned long host_no;
+-	unsigned long instance;
+ 	struct pci_dev *pdev;
+-	uint32_t device_id;
+-	uint8_t pci_bus;
+-	uint8_t pci_device_fn;
+ 	uint8_t devnum;
+ 	uint8_t revision;
+ 	uint8_t ports;
+@@ -1040,18 +1036,9 @@ struct scsi_qla_host {
+ 	/* BUS configuration data */
+ 	struct bus_param bus_settings[MAX_BUSES];
+ 
+-#if 0
+-	/* bottom half run queue */
+-	struct tq_struct run_qla_bh;
+-#endif
+-
+ 	/* Received ISP mailbox data. */
+ 	volatile uint16_t mailbox_out[MAILBOX_REGISTER_COUNT];
+ 
+-#ifdef UNUSED
+-	struct timer_list dev_timer[MAX_TARGETS];
+-#endif
+-
+ 	dma_addr_t request_dma;		/* Physical Address */
+ 	request_t *request_ring;	/* Base virtual address */
+ 	request_t *request_ring_ptr;	/* Current address. */
+@@ -1063,15 +1050,6 @@ struct scsi_qla_host {
+ 	struct response *response_ring_ptr;	/* Current address. */
+ 	uint16_t rsp_ring_index;	/* Current index. */
+ 
+-#if WATCHDOGTIMER
+-	/* Watchdog queue, lock and total timer */
+-	uint8_t watchdog_q_lock;	/* Lock for watchdog queue */
+-	struct srb *wdg_q_first;	/* First job on watchdog queue */
+-	struct srb *wdg_q_last;	/* Last job on watchdog queue */
+-	uint32_t total_timeout;	/* Total timeout (quantum count) */
+-	uint32_t watchdogactive;
+-#endif
+-
+ 	struct srb *done_q_first;	/* First job on done queue */
+ 	struct srb *done_q_last;	/* Last job on done queue */
+ 
+--- linux-2.6.0/drivers/scsi/sd.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/scsi/sd.c	2003-12-28 23:21:45.000000000 -0800
+@@ -62,6 +62,7 @@
+  */
+ #define SD_MAJORS	16
+ #define SD_DISKS	(SD_MAJORS << 4)
++#define TOTAL_SD_DISKS	CONFIG_MAX_SD_DISKS
+ 
+ /*
+  * Time out in seconds for disks and Magneto-opticals (which are slower).
+@@ -95,7 +96,7 @@ struct scsi_disk {
+ };
+ 
+ 
+-static unsigned long sd_index_bits[SD_DISKS / BITS_PER_LONG];
++static unsigned long sd_index_bits[TOTAL_SD_DISKS / BITS_PER_LONG];
+ static spinlock_t sd_index_lock = SPIN_LOCK_UNLOCKED;
+ 
+ static int sd_revalidate_disk(struct gendisk *disk);
+@@ -130,6 +131,9 @@ static int sd_major(int major_idx)
+ 		return SCSI_DISK1_MAJOR + major_idx - 1;
+ 	case 8 ... 15:
+ 		return SCSI_DISK8_MAJOR + major_idx - 8;
++#define MAX_IDX        (TOTAL_SD_DISKS >> 4)
++	case 16 ... MAX_IDX:
++		return SCSI_DISK15_MAJOR;
+ 	default:
+ 		BUG();
+ 		return 0;	/* shut up gcc */
+@@ -378,9 +382,9 @@ queue:
+  *	In the latter case @inode and @filp carry an abridged amount
+  *	of information as noted above.
+  **/
+-static int sd_open(struct inode *inode, struct file *filp)
++static int sd_open(struct block_device *bdev, struct file *filp)
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
++	struct gendisk *disk = bdev->bd_disk;
+ 	struct scsi_disk *sdkp = scsi_disk(disk);
+ 	struct scsi_device *sdev;
+ 	int retval;
+@@ -402,7 +406,7 @@ static int sd_open(struct inode *inode, 
+ 		goto error_out;
+ 
+ 	if (sdev->removable || sdkp->write_prot)
+-		check_disk_change(inode->i_bdev);
++		check_disk_change(bdev);
+ 
+ 	/*
+ 	 * If the drive is empty, just let the open fail.
+@@ -453,9 +457,8 @@ error_out:
+  *	Note: may block (uninterruptible) if error recovery is underway
+  *	on this disk.
+  **/
+-static int sd_release(struct inode *inode, struct file *filp)
++static int sd_release(struct gendisk *disk)
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
+ 	struct scsi_disk *sdkp = scsi_disk(disk);
+ 	struct scsi_device *sdev = sdkp->device;
+ 
+@@ -518,10 +521,9 @@ static int sd_hdio_getgeo(struct block_d
+  *	Note: most ioctls are forward onto the block subsystem or further
+  *	down in the scsi subsytem.
+  **/
+-static int sd_ioctl(struct inode * inode, struct file * filp, 
++static int sd_ioctl(struct block_device *bdev, struct file *filp,
+ 		    unsigned int cmd, unsigned long arg)
+ {
+-	struct block_device *bdev = inode->i_bdev;
+ 	struct gendisk *disk = bdev->bd_disk;
+ 	struct scsi_device *sdp = scsi_disk(disk)->device;
+ 	int error;
+@@ -1320,8 +1322,8 @@ static int sd_probe(struct device *dev)
+ 		goto out_free;
+ 
+ 	spin_lock(&sd_index_lock);
+-	index = find_first_zero_bit(sd_index_bits, SD_DISKS);
+-	if (index == SD_DISKS) {
++	index = find_first_zero_bit(sd_index_bits, TOTAL_SD_DISKS);
++	if (index == TOTAL_SD_DISKS) {
+ 		spin_unlock(&sd_index_lock);
+ 		error = -EBUSY;
+ 		goto out_put;
+@@ -1336,15 +1338,24 @@ static int sd_probe(struct device *dev)
+ 	sdkp->openers = 0;
+ 
+ 	gd->major = sd_major(index >> 4);
+-	gd->first_minor = (index & 15) << 4;
++	if (index > SD_DISKS)
++		gd->first_minor = ((index - SD_DISKS) & 15) << 4;
++	else
++		gd->first_minor = (index & 15) << 4;
+ 	gd->minors = 16;
+ 	gd->fops = &sd_fops;
+ 
+-	if (index >= 26) {
++	if (index < 26) {
++		sprintf(gd->disk_name, "sd%c", 'a' + index % 26);
++	} else if (index < (26*27)) {
+ 		sprintf(gd->disk_name, "sd%c%c",
+ 			'a' + index/26-1,'a' + index % 26);
+ 	} else {
+-		sprintf(gd->disk_name, "sd%c", 'a' + index % 26);
++		const unsigned int m1 = (index/ 26 - 1) / 26 - 1;
++		const unsigned int m2 = (index / 26 - 1) % 26;
++		const unsigned int m3 = index % 26;
++		sprintf(gd->disk_name, "sd%c%c%c",
++			'a' + m1, 'a' + m2, 'a' + m3);
+ 	}
+ 
+ 	strcpy(gd->devfs_name, sdp->devfs_name);
+--- linux-2.6.0/drivers/scsi/sg.c	2003-11-23 19:03:01.000000000 -0800
++++ 25/drivers/scsi/sg.c	2003-12-28 23:22:25.000000000 -0800
+@@ -1118,7 +1118,7 @@ sg_rb_correct4mmap(Sg_scatter_hold * rsv
+ }
+ 
+ static struct page *
+-sg_vma_nopage(struct vm_area_struct *vma, unsigned long addr, int unused)
++sg_vma_nopage(struct vm_area_struct *vma, unsigned long addr, int *type)
+ {
+ 	Sg_fd *sfp;
+ 	struct page *page = NOPAGE_SIGBUS;
+@@ -1158,6 +1158,8 @@ sg_vma_nopage(struct vm_area_struct *vma
+ 		page = virt_to_page(page_ptr);
+ 		get_page(page);	/* increment page count */
+ 	}
++	if (type)
++		*type = VM_FAULT_MINOR;
+ 	return page;
+ }
+ 
+@@ -2974,3 +2976,4 @@ sg_proc_version_info(char *buffer, int *
+ 
+ module_init(init_sg);
+ module_exit(exit_sg);
++MODULE_ALIAS_CHARDEV_MAJOR(SCSI_GENERIC_MAJOR);
+--- linux-2.6.0/drivers/scsi/sr.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/scsi/sr.c	2003-12-28 23:22:35.000000000 -0800
+@@ -67,7 +67,8 @@ MODULE_PARM(xa_test, "i");	/* see sr_ioc
+ 	(CDC_CLOSE_TRAY|CDC_OPEN_TRAY|CDC_LOCK|CDC_SELECT_SPEED| \
+ 	 CDC_SELECT_DISC|CDC_MULTI_SESSION|CDC_MCN|CDC_MEDIA_CHANGED| \
+ 	 CDC_PLAY_AUDIO|CDC_RESET|CDC_IOCTLS|CDC_DRIVE_STATUS| \
+-	 CDC_CD_R|CDC_CD_RW|CDC_DVD|CDC_DVD_R|CDC_DVD_RAM|CDC_GENERIC_PACKET)
++	 CDC_CD_R|CDC_CD_RW|CDC_DVD|CDC_DVD_R|CDC_DVD_RAM|CDC_GENERIC_PACKET| \
++	 CDC_MRW|CDC_MRW_W|CDC_RAM)
+ 
+ static int sr_probe(struct device *);
+ static int sr_remove(struct device *);
+@@ -413,22 +414,22 @@ queue:
+ 	return 1;
+ }
+ 
+-static int sr_block_open(struct inode *inode, struct file *file)
++static int sr_block_open(struct block_device *bdev, struct file *file)
+ {
+-	struct scsi_cd *cd = scsi_cd(inode->i_bdev->bd_disk);
+-	return cdrom_open(&cd->cdi, inode, file);
++	struct scsi_cd *cd = scsi_cd(bdev->bd_disk);
++	return cdrom_open(&cd->cdi, bdev, file);
+ }
+ 
+-static int sr_block_release(struct inode *inode, struct file *file)
++static int sr_block_release(struct gendisk *disk)
+ {
+-	struct scsi_cd *cd = scsi_cd(inode->i_bdev->bd_disk);
+-	return cdrom_release(&cd->cdi, file);
++	struct scsi_cd *cd = scsi_cd(disk);
++	return cdrom_release(&cd->cdi);
+ }
+ 
+-static int sr_block_ioctl(struct inode *inode, struct file *file, unsigned cmd,
+-			  unsigned long arg)
++static int sr_block_ioctl(struct block_device *bdev, struct file *file,
++			  unsigned cmd, unsigned long arg)
+ {
+-	struct scsi_cd *cd = scsi_cd(inode->i_bdev->bd_disk);
++	struct scsi_cd *cd = scsi_cd(bdev->bd_disk);
+ 	struct scsi_device *sdev = cd->device;
+ 
+         /*
+@@ -440,7 +441,7 @@ static int sr_block_ioctl(struct inode *
+                 case SCSI_IOCTL_GET_BUS_NUMBER:
+                         return scsi_ioctl(sdev, cmd, (void *)arg);
+ 	}
+-	return cdrom_ioctl(&cd->cdi, inode, cmd, arg);
++	return cdrom_ioctl(&cd->cdi, bdev, cmd, arg);
+ }
+ 
+ static int sr_block_media_changed(struct gendisk *disk)
+@@ -692,7 +693,7 @@ Enomem:
+ static void get_capabilities(struct scsi_cd *cd)
+ {
+ 	unsigned char *buffer;
+-	int rc, n;
++	int rc, n, mrw_write = 0, mrw = 1;
+ 	struct scsi_mode_data data;
+ 	struct scsi_request *SRpnt;
+ 	unsigned char cmd[MAX_COMMAND_SIZE];
+@@ -765,6 +766,15 @@ static void get_capabilities(struct scsi
+ 		printk("%s: scsi-1 drive\n", cd->cdi.name);
+ 		return;
+ 	}
++
++	if (cdrom_is_mrw(&cd->cdi, &mrw_write)) {
++		mrw = 0;
++		cd->cdi.mask |= CDC_MRW;
++		cd->cdi.mask |= CDC_MRW_W;
++	}
++	if (!mrw_write)
++		cd->cdi.mask |= CDC_MRW_W;
++
+ 	n = data.header_length + data.block_descriptor_length;
+ 	cd->cdi.speed = ((buffer[n + 8] << 8) + buffer[n + 9]) / 176;
+ 	cd->readcd_known = 1;
+@@ -788,9 +798,7 @@ static void get_capabilities(struct scsi
+ 	if ((buffer[n + 3] & 0x20) == 0) {
+ 		/* can't write DVD-RAM media */
+ 		cd->cdi.mask |= CDC_DVD_RAM;
+-	} else {
+-		cd->device->writeable = 1;
+-	}
++	} else
+ 	if ((buffer[n + 3] & 0x10) == 0)
+ 		/* can't write DVD-R media */
+ 		cd->cdi.mask |= CDC_DVD_R;
+@@ -814,6 +822,12 @@ static void get_capabilities(struct scsi
+ 	/*else    I don't think it can close its tray
+ 		cd->cdi.mask |= CDC_CLOSE_TRAY; */
+ 
++	/*
++	 * if DVD-RAM of MRW-W, we are randomly writeable
++	 */
++	if ((cd->cdi.mask & (CDC_DVD_RAM | CDC_MRW_W)) != (CDC_DVD_RAM | CDC_MRW_W))
++		cd->device->writeable = 1;
++
+ 	scsi_release_request(SRpnt);
+ 	kfree(buffer);
+ }
+--- linux-2.6.0/drivers/scsi/sym53c8xx_2/sym53c8xx.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/scsi/sym53c8xx_2/sym53c8xx.h	2003-12-28 23:21:49.000000000 -0800
+@@ -55,19 +55,7 @@
+ 
+ #include <linux/config.h>
+ 
+-/*
+- *  Use normal IO if configured.
+- *  Normal IO forced for alpha.
+- *  Forced to MMIO for sparc.
+- */
+-#if defined(__alpha__)
+-#define	SYM_CONF_IOMAPPED
+-#elif defined(__sparc__)
+-#undef SYM_CONF_IOMAPPED
+-/* #elif defined(__powerpc__) */
+-/* #define	SYM_CONF_IOMAPPED */
+-/* #define SYM_OPT_NO_BUS_MEMORY_MAPPING */
+-#elif defined(CONFIG_SCSI_SYM53C8XX_IOMAPPED)
++#ifdef CONFIG_SCSI_SYM53C8XX_IOMAPPED
+ #define	SYM_CONF_IOMAPPED
+ #endif
+ 
+@@ -93,8 +81,6 @@
+  */
+ #if 1
+ #define SYM_CONF_NVRAM_SUPPORT		(1)
+-#define SYM_SETUP_SYMBIOS_NVRAM		(1)
+-#define SYM_SETUP_TEKRAM_NVRAM		(1)
+ #endif
+ 
+ /*
+--- linux-2.6.0/drivers/scsi/sym53c8xx_2/sym_fw1.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/scsi/sym53c8xx_2/sym_fw1.h	2003-12-28 23:21:49.000000000 -0800
+@@ -234,10 +234,6 @@ struct SYM_FWB_SCR {
+ struct SYM_FWZ_SCR {
+ 	u32 snooptest		[  9];
+ 	u32 snoopend		[  2];
+-#ifdef SYM_OPT_NO_BUS_MEMORY_MAPPING
+-	u32 start_ram		[  1];
+-	u32 scripta0_ba		[  4];
+-#endif
+ };
+ 
+ static struct SYM_FWA_SCR SYM_FWA_SCR = {
+@@ -1851,24 +1847,5 @@ static struct SYM_FWZ_SCR SYM_FWZ_SCR = 
+ 	 */
+ 	SCR_INT,
+ 		99,
+-#ifdef SYM_OPT_NO_BUS_MEMORY_MAPPING
+-	/*
+-	 *  We may use MEMORY MOVE instructions to load the on chip-RAM,
+-	 *  if it happens that mapping PCI memory is not possible.
+-	 *  But writing the RAM from the CPU is the preferred method, 
+-	 *  since PCI 2.2 seems to disallow PCI self-mastering.
+-	 */
+-}/*-------------------------< START_RAM >------------------------*/,{
+-	/*
+-	 *  Load the script into on-chip RAM, 
+-	 *  and jump to start point.
+-	 */
+-	SCR_COPY (sizeof(struct SYM_FWA_SCR)),
+-}/*-------------------------< SCRIPTA0_BA >----------------------*/,{
+-		0,
+-		PADDR_A (start),
+-	SCR_JUMP,
+-		PADDR_A (init),
+-#endif /* SYM_OPT_NO_BUS_MEMORY_MAPPING */
+ }/*--------------------------<>----------------------------------*/
+ };
+--- linux-2.6.0/drivers/scsi/sym53c8xx_2/sym_fw2.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/scsi/sym53c8xx_2/sym_fw2.h	2003-12-28 23:21:49.000000000 -0800
+@@ -228,14 +228,6 @@ struct SYM_FWB_SCR {
+ struct SYM_FWZ_SCR {
+ 	u32 snooptest		[  6];
+ 	u32 snoopend		[  2];
+-#ifdef SYM_OPT_NO_BUS_MEMORY_MAPPING
+-	u32 start_ram		[  1];
+-	u32 scripta0_ba		[  4];
+-	u32 start_ram64		[  3];
+-	u32 scripta0_ba64	[  3];
+-	u32 scriptb0_ba64	[  6];
+-	u32 ram_seg64		[  1];
+-#endif
+ };
+ 
+ static struct SYM_FWA_SCR SYM_FWA_SCR = {
+@@ -1944,51 +1936,5 @@ static struct SYM_FWZ_SCR SYM_FWZ_SCR = 
+ 	 */
+ 	SCR_INT,
+ 		99,
+-#ifdef SYM_OPT_NO_BUS_MEMORY_MAPPING
+-	/*
+-	 *  We may use MEMORY MOVE instructions to load the on chip-RAM,
+-	 *  if it happens that mapping PCI memory is not possible.
+-	 *  But writing the RAM from the CPU is the preferred method, 
+-	 *  since PCI 2.2 seems to disallow PCI self-mastering.
+-	 */
+-}/*-------------------------< START_RAM >------------------------*/,{
+-	/*
+-	 *  Load the script into on-chip RAM, 
+-	 *  and jump to start point.
+-	 */
+-	SCR_COPY (sizeof(struct SYM_FWA_SCR)),
+-}/*-------------------------< SCRIPTA0_BA >----------------------*/,{
+-		0,
+-		PADDR_A (start),
+-	SCR_JUMP,
+-		PADDR_A (init),
+-}/*-------------------------< START_RAM64 >----------------------*/,{
+-	/*
+-	 *  Load the RAM and start for 64 bit PCI (895A,896).
+-	 *  Both scripts (script and scripth) are loaded into 
+-	 *  the RAM which is 8K (4K for 825A/875/895).
+-	 *  We also need to load some 32-63 bit segments 
+-	 *  address of the SCRIPTS processor.
+-	 *  LOAD/STORE ABSOLUTE always refers to on-chip RAM 
+-	 *  in our implementation. The main memory is 
+-	 *  accessed using LOAD/STORE DSA RELATIVE.
+-	 */
+-	SCR_LOAD_REL (mmws, 4),
+-		offsetof (struct sym_hcb, scr_ram_seg),
+-	SCR_COPY (sizeof(struct SYM_FWA_SCR)),
+-}/*-------------------------< SCRIPTA0_BA64 >--------------------*/,{
+-		0,
+-		PADDR_A (start),
+-	SCR_COPY (sizeof(struct SYM_FWB_SCR)),
+-}/*-------------------------< SCRIPTB0_BA64 >--------------------*/,{
+-		0,
+-		PADDR_B  (start64),
+-	SCR_LOAD_REL (mmrs, 4),
+-		offsetof (struct sym_hcb, scr_ram_seg),
+-	SCR_JUMP64,
+-		PADDR_B (start64),
+-}/*-------------------------< RAM_SEG64 >------------------------*/,{
+-		0,
+-#endif /* SYM_OPT_NO_BUS_MEMORY_MAPPING */
+ }/*-------------------------<>-----------------------------------*/
+ };
+--- linux-2.6.0/drivers/scsi/sym53c8xx_2/sym_fw.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/scsi/sym53c8xx_2/sym_fw.c	2003-12-28 23:21:49.000000000 -0800
+@@ -89,9 +89,6 @@ static struct sym_fwb_ofs sym_fw1b_ofs =
+ };
+ static struct sym_fwz_ofs sym_fw1z_ofs = {
+ 	SYM_GEN_FW_Z(struct SYM_FWZ_SCR)
+-#ifdef SYM_OPT_NO_BUS_MEMORY_MAPPING
+-	SYM_GEN_Z(struct SYM_FWZ_SCR, start_ram)
+-#endif
+ };
+ #undef	SYM_FWA_SCR
+ #undef	SYM_FWB_SCR
+@@ -122,10 +119,6 @@ static struct sym_fwb_ofs sym_fw2b_ofs =
+ };
+ static struct sym_fwz_ofs sym_fw2z_ofs = {
+ 	SYM_GEN_FW_Z(struct SYM_FWZ_SCR)
+-#ifdef SYM_OPT_NO_BUS_MEMORY_MAPPING
+-	SYM_GEN_Z(struct SYM_FWZ_SCR, start_ram)
+-	SYM_GEN_Z(struct SYM_FWZ_SCR, start_ram64)
+-#endif
+ };
+ #undef	SYM_FWA_SCR
+ #undef	SYM_FWB_SCR
+@@ -146,22 +139,10 @@ sym_fw1_patch(hcb_p np)
+ {
+ 	struct sym_fw1a_scr *scripta0;
+ 	struct sym_fw1b_scr *scriptb0;
+-#ifdef SYM_OPT_NO_BUS_MEMORY_MAPPING
+-	struct sym_fw1z_scr *scriptz0 = 
+-		(struct sym_fw1z_scr *) np->scriptz0;
+-#endif
+ 
+ 	scripta0 = (struct sym_fw1a_scr *) np->scripta0;
+ 	scriptb0 = (struct sym_fw1b_scr *) np->scriptb0;
+ 
+-#ifdef SYM_OPT_NO_BUS_MEMORY_MAPPING
+-	/*
+-	 *  Set up BUS physical address of SCRIPTS that is to 
+-	 *  be copied to on-chip RAM by the SCRIPTS processor.
+-	 */
+-	scriptz0->scripta0_ba[0]	= cpu_to_scr(vtobus(scripta0));
+-#endif
+-
+ 	/*
+ 	 *  Remove LED support if not needed.
+ 	 */
+@@ -199,25 +180,10 @@ sym_fw2_patch(hcb_p np)
+ {
+ 	struct sym_fw2a_scr *scripta0;
+ 	struct sym_fw2b_scr *scriptb0;
+-#ifdef SYM_OPT_NO_BUS_MEMORY_MAPPING
+-	struct sym_fw2z_scr *scriptz0 = 
+-		(struct sym_fw2z_scr *) np->scriptz0;
+-#endif
+ 
+ 	scripta0 = (struct sym_fw2a_scr *) np->scripta0;
+ 	scriptb0 = (struct sym_fw2b_scr *) np->scriptb0;
+ 
+-#ifdef SYM_OPT_NO_BUS_MEMORY_MAPPING
+-	/*
+-	 *  Set up BUS physical address of SCRIPTS that is to 
+-	 *  be copied to on-chip RAM by the SCRIPTS processor.
+-	 */
+-	scriptz0->scripta0_ba64[0]	= /* Nothing is missing here */
+-	scriptz0->scripta0_ba[0]	= cpu_to_scr(vtobus(scripta0));
+-	scriptz0->scriptb0_ba64[0]	= cpu_to_scr(vtobus(scriptb0));
+-	scriptz0->ram_seg64[0]		= np->scr_ram_seg;
+-#endif
+-
+ 	/*
+ 	 *  Remove LED support if not needed.
+ 	 */
+--- linux-2.6.0/drivers/scsi/sym53c8xx_2/sym_fw.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/scsi/sym53c8xx_2/sym_fw.h	2003-12-28 23:21:49.000000000 -0800
+@@ -113,10 +113,6 @@ struct sym_fwb_ofs {
+ };
+ struct sym_fwz_ofs {
+ 	SYM_GEN_FW_Z(u_short)
+-#ifdef SYM_OPT_NO_BUS_MEMORY_MAPPING
+-	SYM_GEN_Z(u_short, start_ram)
+-	SYM_GEN_Z(u_short, start_ram64)
+-#endif
+ };
+ 
+ /*
+@@ -136,10 +132,6 @@ struct sym_fwb_ba {
+ };
+ struct sym_fwz_ba {
+ 	SYM_GEN_FW_Z(u32)
+-#ifdef SYM_OPT_NO_BUS_MEMORY_MAPPING
+-	SYM_GEN_Z(u32, start_ram)
+-	SYM_GEN_Z(u32, start_ram64)
+-#endif
+ };
+ #undef	SYM_GEN_A
+ #undef	SYM_GEN_B
+--- linux-2.6.0/drivers/scsi/sym53c8xx_2/sym_glue.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/scsi/sym53c8xx_2/sym_glue.c	2003-12-28 23:21:49.000000000 -0800
+@@ -167,34 +167,16 @@ struct sym_ucmd {		/* Override the SCSI 
+ #define SYM_SCMD_PTR(ucmd) sym_que_entry(ucmd, struct scsi_cmnd, SCp)
+ #define SYM_SOFTC_PTR(cmd) (((struct host_data *)cmd->device->host->hostdata)->ncb)
+ 
+-/*
+- *  Deal with DMA mapping/unmapping.
+- */
+-#define	bus_unmap_sg(pdev, sgptr, sgcnt, dir)		\
+-	pci_unmap_sg(pdev, sgptr, sgcnt, dir)
+-#define	bus_unmap_single(pdev, mapping, bufptr, dir)	\
+-	pci_unmap_single(pdev, mapping, bufptr, dir)
+-#define	bus_map_single(pdev, bufptr, bufsiz, dir)	\
+-	pci_map_single(pdev, bufptr, bufsiz, dir)
+-#define	bus_map_sg(pdev, sgptr, sgcnt, dir)		\
+-	pci_map_sg(pdev, sgptr, sgcnt, dir)
+-#define	bus_dma_sync_sg(pdev, sgptr, sgcnt, dir)	\
+-	pci_dma_sync_sg(pdev, sgptr, sgcnt, dir)
+-#define	bus_dma_sync_single(pdev, mapping, bufsiz, dir)	\
+-	pci_dma_sync_single(pdev, mapping, bufsiz, dir)
+-#define bus_sg_dma_address(sc)	sg_dma_address(sc)
+-#define bus_sg_dma_len(sc)	sg_dma_len(sc)
+-
+ static void __unmap_scsi_data(struct pci_dev *pdev, struct scsi_cmnd *cmd)
+ {
+ 	int dma_dir = scsi_to_pci_dma_dir(cmd->sc_data_direction);
+ 
+ 	switch(SYM_UCMD_PTR(cmd)->data_mapped) {
+ 	case 2:
+-		bus_unmap_sg(pdev, cmd->buffer, cmd->use_sg, dma_dir);
++		pci_unmap_sg(pdev, cmd->buffer, cmd->use_sg, dma_dir);
+ 		break;
+ 	case 1:
+-		bus_unmap_single(pdev, SYM_UCMD_PTR(cmd)->data_mapping,
++		pci_unmap_single(pdev, SYM_UCMD_PTR(cmd)->data_mapping,
+ 				 cmd->request_bufflen, dma_dir);
+ 		break;
+ 	}
+@@ -206,7 +188,7 @@ static dma_addr_t __map_scsi_single_data
+ 	dma_addr_t mapping;
+ 	int dma_dir = scsi_to_pci_dma_dir(cmd->sc_data_direction);
+ 
+-	mapping = bus_map_single(pdev, cmd->request_buffer,
++	mapping = pci_map_single(pdev, cmd->request_buffer,
+ 				 cmd->request_bufflen, dma_dir);
+ 	if (mapping) {
+ 		SYM_UCMD_PTR(cmd)->data_mapped  = 1;
+@@ -221,7 +203,7 @@ static int __map_scsi_sg_data(struct pci
+ 	int use_sg;
+ 	int dma_dir = scsi_to_pci_dma_dir(cmd->sc_data_direction);
+ 
+-	use_sg = bus_map_sg(pdev, cmd->buffer, cmd->use_sg, dma_dir);
++	use_sg = pci_map_sg(pdev, cmd->buffer, cmd->use_sg, dma_dir);
+ 	if (use_sg > 0) {
+ 		SYM_UCMD_PTR(cmd)->data_mapped  = 2;
+ 		SYM_UCMD_PTR(cmd)->data_mapping = use_sg;
+@@ -236,10 +218,10 @@ static void __sync_scsi_data(struct pci_
+ 
+ 	switch(SYM_UCMD_PTR(cmd)->data_mapped) {
+ 	case 2:
+-		bus_dma_sync_sg(pdev, cmd->buffer, cmd->use_sg, dma_dir);
++		pci_dma_sync_sg(pdev, cmd->buffer, cmd->use_sg, dma_dir);
+ 		break;
+ 	case 1:
+-		bus_dma_sync_single(pdev, SYM_UCMD_PTR(cmd)->data_mapping,
++		pci_dma_sync_single(pdev, SYM_UCMD_PTR(cmd)->data_mapping,
+ 				    cmd->request_bufflen, dma_dir);
+ 		break;
+ 	}
+@@ -469,8 +451,8 @@ static int sym_scatter(struct sym_hcb *n
+ 		data = &cp->phys.data[SYM_CONF_MAX_SG - use_sg];
+ 
+ 		for (segment = 0; segment < use_sg; segment++) {
+-			dma_addr_t baddr = bus_sg_dma_address(&scatter[segment]);
+-			unsigned int len = bus_sg_dma_len(&scatter[segment]);
++			dma_addr_t baddr = sg_dma_address(&scatter[segment]);
++			unsigned int len = sg_dma_len(&scatter[segment]);
+ 
+ 			sym_build_sge(np, &data[segment], baddr, len);
+ 			cp->data_len += len;
+@@ -1595,10 +1577,8 @@ static void sym_free_resources(struct sy
+ 	if (np->s.mmio_va)
+ 		iounmap(np->s.mmio_va);
+ #endif
+-#ifndef SYM_OPT_NO_BUS_MEMORY_MAPPING
+ 	if (np->s.ram_va)
+ 		iounmap(np->s.ram_va);
+-#endif
+ 	/*
+ 	 *  Free O/S independent resources.
+ 	 */
+@@ -1650,14 +1630,13 @@ out_err32:
+  *  If all is OK, install interrupt handling and
+  *  start the timer daemon.
+  */
+-static int __devinit 
+-sym_attach (struct scsi_host_template *tpnt, int unit, struct sym_device *dev)
++static struct Scsi_Host * __devinit sym_attach(struct scsi_host_template *tpnt,
++		int unit, struct sym_device *dev)
+ {
+ 	struct host_data *host_data;
+ 	struct sym_hcb *np = NULL;
+ 	struct Scsi_Host *instance = NULL;
+ 	unsigned long flags;
+-	struct sym_nvram *nvram = dev->nvram;
+ 	struct sym_fw *fw;
+ 
+ 	printk(KERN_INFO
+@@ -1762,20 +1741,18 @@ sym_attach (struct scsi_host_template *t
+ 			np->ram_ws = 8192;
+ 		else
+ 			np->ram_ws = 4096;
+-#ifndef SYM_OPT_NO_BUS_MEMORY_MAPPING
+ 		np->s.ram_va = ioremap(dev->s.base_2_c, np->ram_ws);
+ 		if (!np->s.ram_va) {
+ 			printf_err("%s: can't map PCI MEMORY region\n",
+ 				sym_name(np));
+ 			goto attach_failed;
+ 		}
+-#endif
+ 	}
+ 
+ 	/*
+ 	 *  Perform O/S independent stuff.
+ 	 */
+-	if (sym_hcb_attach(np, fw, nvram))
++	if (sym_hcb_attach(np, fw, dev->nvram))
+ 		goto attach_failed;
+ 
+ 
+@@ -1843,13 +1820,7 @@ sym_attach (struct scsi_host_template *t
+ 
+ 	spin_unlock_irqrestore(instance->host_lock, flags);
+ 
+-	/*
+-	 *  Now let the generic SCSI driver
+-	 *  look for the SCSI devices on the bus ..
+-	 */
+-	scsi_add_host(instance, &dev->pdev->dev); /* XXX: handle failure */
+-	scsi_scan_host(instance);
+-	return 0;
++	return instance;
+ 
+  reset_failed:
+ 	printf_err("%s: FATAL ERROR: CHECK SCSI BUS - CABLES, "
+@@ -1857,13 +1828,13 @@ sym_attach (struct scsi_host_template *t
+ 	spin_unlock_irqrestore(instance->host_lock, flags);
+  attach_failed:
+ 	if (!instance)
+-		return -1;
++		return NULL;
+ 	printf_info("%s: giving up ...\n", sym_name(np));
+ 	if (np)
+ 		sym_free_resources(np);
+ 	scsi_host_put(instance);
+ 
+-	return -1;
++	return NULL;
+  }
+ 
+ 
+@@ -2115,7 +2086,7 @@ sym53c8xx_pci_init(struct pci_dev *pdev,
+ 	 *  Ignore Symbios chips controlled by various RAID controllers.
+ 	 *  These controllers set value 0x52414944 at RAM end - 16.
+ 	 */
+-#if defined(__i386__) && !defined(SYM_OPT_NO_BUS_MEMORY_MAPPING)
++#if defined(__i386__)
+ 	if (base_2_c) {
+ 		unsigned int ram_size, ram_val;
+ 		void *ram_ptr;
+@@ -2202,12 +2173,9 @@ sym53c8xx_pci_init(struct pci_dev *pdev,
+ 
+ 
+ /*
+- *  Linux release module stuff.
+- *
+  *  Called before unloading the module.
+  *  Detach the host.
+  *  We have to free resources and halt the NCR chip.
+- *
+  */
+ static int __devexit sym_detach(struct sym_hcb *np)
+ {
+@@ -2216,18 +2184,15 @@ static int __devexit sym_detach(struct s
+ 	del_timer_sync(&np->s.timer);
+ 
+ 	/*
+-	 *  Reset NCR chip.
+-	 *  We should use sym_soft_reset(), but we donnot want to do 
+-	 *  so, since we may not be safe if interrupts occur.
++	 * Reset NCR chip.
++	 * We should use sym_soft_reset(), but we don't want to do
++	 * so, since we may not be safe if interrupts occur.
+ 	 */
+ 	printk("%s: resetting chip\n", sym_name(np));
+ 	OUTB (nc_istat, SRST);
+ 	UDELAY (10);
+ 	OUTB (nc_istat, 0);
+ 
+-	/*
+-	 *  Free host resources
+-	 */
+ 	sym_free_resources(np);
+ 
+ 	return 1;
+@@ -2336,6 +2301,7 @@ static int __devinit sym2_probe(struct p
+ {
+ 	struct sym_device sym_dev;
+ 	struct sym_nvram nvram;
++	struct Scsi_Host *instance;
+ 
+ 	memset(&sym_dev, 0, sizeof(sym_dev));
+ 	memset(&nvram, 0, sizeof(nvram));
+@@ -2354,12 +2320,20 @@ static int __devinit sym2_probe(struct p
+ 
+ 	sym_get_nvram(&sym_dev, &nvram);
+ 
+-	if (sym_attach(&sym2_template, attach_count, &sym_dev))
++	instance = sym_attach(&sym2_template, attach_count, &sym_dev);
++	if (!instance)
+ 		goto free;
+ 
++	if (scsi_add_host(instance, &pdev->dev))
++		goto detach;
++	scsi_scan_host(instance);
++
+ 	attach_count++;
++
+ 	return 0;
+ 
++ detach:
++	sym_detach(pci_get_drvdata(pdev));
+  free:
+ 	pci_release_regions(pdev);
+  disable:
+@@ -2369,7 +2343,13 @@ static int __devinit sym2_probe(struct p
+ 
+ static void __devexit sym2_remove(struct pci_dev *pdev)
+ {
+-	sym_detach(pci_get_drvdata(pdev));
++	struct sym_hcb *np = pci_get_drvdata(pdev);
++	struct Scsi_Host *host = np->s.host;
++
++	scsi_remove_host(host);
++	scsi_host_put(host);
++
++	sym_detach(np);
+ 
+ 	pci_release_regions(pdev);
+ 	pci_disable_device(pdev);
+--- linux-2.6.0/drivers/scsi/sym53c8xx_2/sym_glue.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/scsi/sym53c8xx_2/sym_glue.h	2003-12-28 23:21:49.000000000 -0800
+@@ -74,10 +74,6 @@
+ #define bzero(d, n)	memset((d), 0, (n))
+ #endif
+ 
+-#ifndef bcmp
+-#define bcmp(a, b, n)	memcmp((a), (b), (n))
+-#endif
+-
+ /*
+  *  General driver includes.
+  */
+@@ -96,7 +92,6 @@
+ #define SYM_OPT_SNIFF_INQUIRY
+ #define SYM_OPT_LIMIT_COMMAND_REORDERING
+ #define	SYM_OPT_ANNOUNCE_TRANSFER_RATE
+-#define	SYM_OPT_BUS_DMA_ABSTRACTION
+ 
+ /*
+  *  Print a message with severity.
+--- linux-2.6.0/drivers/scsi/sym53c8xx_2/sym_hipd.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/scsi/sym53c8xx_2/sym_hipd.c	2003-12-28 23:21:49.000000000 -0800
+@@ -50,7 +50,7 @@
+  * SUCH DAMAGE.
+  */
+ 
+-#define SYM_DRIVER_NAME	"sym-2.1.18b"
++#define SYM_DRIVER_NAME	"sym-2.1.18f"
+ 
+ #ifdef __FreeBSD__
+ #include <dev/sym/sym_glue.h>
+@@ -751,8 +751,6 @@ static u32 parisc_setup_hcb(hcb_p np, u3
+ 				&np->maxwide, &scsi_mode))
+ 		return period;
+ 
+-	printk("scsi_mode = %d, period = %ld\n", scsi_mode, pdc_period);
+-
+ 	if (scsi_mode >= 0) {
+ 		/* C3000 PDC reports period/mode */
+ 		SYM_SETUP_SCSI_DIFF = 0;
+@@ -1060,12 +1058,10 @@ static int sym_prepare_setting(hcb_p np,
+ 		 *  and BUS width.
+ 		 */
+ 		if (np->features & FE_ULTRA3) {
+-			if (tp->tinfo.user.period <= 9	&&
+-			    tp->tinfo.user.width == BUS_16_BIT) {
+-				tp->tinfo.user.options |= PPR_OPT_DT;
+-				tp->tinfo.user.offset   = np->maxoffs_dt;
+-				tp->tinfo.user.spi_version = 3;
+-			}
++			tp->tinfo.user.options |= PPR_OPT_DT;
++			tp->tinfo.user.period = np->minsync_dt;
++			tp->tinfo.user.offset = np->maxoffs_dt;
++			tp->tinfo.user.spi_version = 3;
+ 		}
+ 
+ 		if (!tp->usrtags)
+@@ -1962,13 +1958,6 @@ void sym_start_up (hcb_p np, int reason)
+ 		if (sym_verbose >= 2)
+ 			printf ("%s: Downloading SCSI SCRIPTS.\n",
+ 				sym_name(np));
+-#ifdef SYM_OPT_NO_BUS_MEMORY_MAPPING
+-		np->fw_patch(np);
+-		if (np->ram_ws == 8192)
+-			phys = SCRIPTZ_BA (np, start_ram64);
+-		else
+-			phys = SCRIPTZ_BA (np, start_ram);
+-#else
+ 		if (np->ram_ws == 8192) {
+ 			OUTRAM_OFF(4096, np->scriptb0, np->scriptb_sz);
+ 			phys =  scr_to_cpu(np->scr_ram_seg);
+@@ -1980,7 +1969,6 @@ void sym_start_up (hcb_p np, int reason)
+ 		else
+ 			phys = SCRIPTA_BA (np, init);
+ 		OUTRAM_OFF(0, np->scripta0, np->scripta_sz);
+-#endif
+ 	}
+ 	else
+ 		phys = SCRIPTA_BA (np, init);
+@@ -2136,9 +2124,15 @@ sym_setsync(hcb_p np, int target,
+ 
+ 	sym_settrans(np, target, 0, ofs, per, wide, div, fak);
+ 
+-	tp->tinfo.goal.period	= tp->tinfo.curr.period  = per;
+-	tp->tinfo.goal.offset	= tp->tinfo.curr.offset  = ofs;
+-	tp->tinfo.goal.options	= tp->tinfo.curr.options = 0;
++	tp->tinfo.curr.period  = per;
++	tp->tinfo.curr.offset  = ofs;
++	tp->tinfo.curr.options = 0;
++
++	if (!(tp->tinfo.goal.options & PPR_OPT_MASK)) {
++		tp->tinfo.goal.period	= per;
++		tp->tinfo.goal.offset	= ofs;
++		tp->tinfo.goal.options	= 0;
++	}
+ 
+ 	sym_xpt_async_nego_sync(np, target);
+ }
+@@ -4151,8 +4145,10 @@ sym_ppr_nego_check(hcb_p np, int req, in
+ 	/*
+ 	 *  Check values against our limits.
+ 	 */
+-	if (wide > np->maxwide)
+-		{chg = 1; wide = np->maxwide;}
++	if (wide > np->maxwide) {
++		chg = 1;
++		wide = np->maxwide;
++	}
+ 	if (!wide || !(np->features & FE_ULTRA3))
+ 		dt &= ~PPR_OPT_DT;
+ 	if (req) {
+@@ -4306,8 +4302,10 @@ sym_wide_nego_check(hcb_p np, int req, i
+ 	/*
+ 	 *  Check values against our limits.
+ 	 */
+-	if (wide > np->maxwide)
+-		{chg = 1; wide = np->maxwide;}
++	if (wide > np->maxwide) {
++		chg = 1;
++		wide = np->maxwide;
++	}
+ 	if (req) {
+ 		if (wide > tp->tinfo.user.width)
+ 			{chg = 1; wide = tp->tinfo.user.width;}
+--- linux-2.6.0/drivers/scsi/sym53c8xx_2/sym_hipd.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/scsi/sym53c8xx_2/sym_hipd.h	2003-12-28 23:21:49.000000000 -0800
+@@ -59,12 +59,6 @@
+  *  They may be defined in platform specific headers, if they 
+  *  are useful.
+  *
+- *    SYM_OPT_NO_BUS_MEMORY_MAPPING
+- *        When this option is set, the driver will not load the 
+- *        on-chip RAM using MMIO, but let the SCRIPTS processor 
+- *        do the work using MOVE MEMORY instructions.
+- *        (set for Linux/PPC)
+- *
+  *    SYM_OPT_HANDLE_DIR_UNKNOWN
+  *        When this option is set, the SCRIPTS used by the driver 
+  *        are able to handle SCSI transfers with direction not 
+@@ -75,12 +69,6 @@
+  *        When this option is set, the driver will use a queue per 
+  *        device and handle QUEUE FULL status requeuing internally.
+  *
+- *    SYM_OPT_BUS_DMA_ABSTRACTION
+- *        When this option is set, the driver allocator is responsible 
+- *        of maintaining bus physical addresses and so provides virtual 
+- *        to bus physical address translation of driver data structures.
+- *        (set for FreeBSD-4 and Linux 2.3)
+- *
+  *    SYM_OPT_SNIFF_INQUIRY
+  *        When this option is set, the driver sniff out successful 
+  *        INQUIRY response and performs negotiations accordingly.
+@@ -92,10 +80,8 @@
+  *        (set for Linux)
+  */
+ #if 0
+-#define SYM_OPT_NO_BUS_MEMORY_MAPPING
+ #define SYM_OPT_HANDLE_DIR_UNKNOWN
+ #define SYM_OPT_HANDLE_DEVICE_QUEUEING
+-#define SYM_OPT_BUS_DMA_ABSTRACTION
+ #define SYM_OPT_SNIFF_INQUIRY
+ #define SYM_OPT_LIMIT_COMMAND_REORDERING
+ #endif
+@@ -958,9 +944,7 @@ struct sym_hcb {
+ 	/*
+ 	 *  DMA pool handle for this HBA.
+ 	 */
+-#ifdef	SYM_OPT_BUS_DMA_ABSTRACTION
+ 	m_pool_ident_t	bus_dmat;
+-#endif
+ 
+ 	/*
+ 	 *  O/S specific data structure
+@@ -1133,9 +1117,20 @@ struct sym_hcb {
+ /*
+  *  NVRAM reading (sym_nvram.c).
+  */
++#if SYM_CONF_NVRAM_SUPPORT
+ void sym_nvram_setup_host (hcb_p np, struct sym_nvram *nvram);
+ void sym_nvram_setup_target (hcb_p np, int target, struct sym_nvram *nvp);
+ int sym_read_nvram (sdev_p np, struct sym_nvram *nvp);
++#else
++static inline void sym_nvram_setup_host(hcb_p np, struct sym_nvram *nvram) { }
++static inline void sym_nvram_setup_target(hcb_p np, struct sym_nvram *nvram) { }
++static inline int sym_read_nvram(sdev_p np, struct sym_nvram *nvp)
++{
++	nvp->type = 0;
++	return 0;
++}
++#endif
++
+ 
+ /*
+  *  FIRMWARES (sym_fw.c)
+@@ -1347,7 +1342,6 @@ typedef struct sym_m_link {
+  *  Virtual to bus physical translation for a given cluster.
+  *  Such a structure is only useful with DMA abstraction.
+  */
+-#ifdef	SYM_OPT_BUS_DMA_ABSTRACTION
+ typedef struct sym_m_vtob {	/* Virtual to Bus address translation */
+ 	struct sym_m_vtob *next;
+ #ifdef	SYM_HAVE_M_SVTOB
+@@ -1363,7 +1357,6 @@ typedef struct sym_m_vtob {	/* Virtual t
+ #define VTOB_HASH_MASK		(VTOB_HASH_SIZE-1)
+ #define VTOB_HASH_CODE(m)	\
+ 	((((m_addr_t) (m)) >> SYM_MEM_CLUSTER_SHIFT) & VTOB_HASH_MASK)
+-#endif	/* SYM_OPT_BUS_DMA_ABSTRACTION */
+ 
+ /*
+  *  Memory pool of a given kind.
+@@ -1375,7 +1368,6 @@ typedef struct sym_m_vtob {	/* Virtual t
+  *     method are expected to tell the driver about.
+  */
+ typedef struct sym_m_pool {
+-#ifdef	SYM_OPT_BUS_DMA_ABSTRACTION
+ 	m_pool_ident_t	dev_dmat;	/* Identifies the pool (see above) */
+ 	m_addr_t (*get_mem_cluster)(struct sym_m_pool *);
+ #ifdef	SYM_MEM_FREE_UNUSED
+@@ -1389,10 +1381,6 @@ typedef struct sym_m_pool {
+ 	int nump;
+ 	m_vtob_p vtob[VTOB_HASH_SIZE];
+ 	struct sym_m_pool *next;
+-#else
+-#define M_GET_MEM_CLUSTER()		sym_get_mem_cluster()
+-#define M_FREE_MEM_CLUSTER(p)		sym_free_mem_cluster(p)
+-#endif	/* SYM_OPT_BUS_DMA_ABSTRACTION */
+ 	struct sym_m_link h[SYM_MEM_CLUSTER_SHIFT - SYM_MEM_SHIFT + 1];
+ } *m_pool_p;
+ 
+@@ -1406,12 +1394,10 @@ void *sym_calloc_unlocked(int size, char
+  *  Alloc, free and translate addresses to bus physical 
+  *  for DMAable memory.
+  */
+-#ifdef	SYM_OPT_BUS_DMA_ABSTRACTION
+ void *__sym_calloc_dma_unlocked(m_pool_ident_t dev_dmat, int size, char *name);
+ void 
+ __sym_mfree_dma_unlocked(m_pool_ident_t dev_dmat, void *m,int size, char *name);
+ u32 __vtobus_unlocked(m_pool_ident_t dev_dmat, void *m);
+-#endif
+ 
+ /*
+  * Verbs used by the driver code for DMAable memory handling.
+--- linux-2.6.0/drivers/scsi/sym53c8xx_2/sym_malloc.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/scsi/sym53c8xx_2/sym_malloc.c	2003-12-28 23:21:49.000000000 -0800
+@@ -204,18 +204,9 @@ static void __sym_mfree(m_pool_p mp, voi
+ /*
+  *  Default memory pool we donnot need to involve in DMA.
+  *
+- *  If DMA abtraction is not needed, the generic allocator 
+- *  calls directly some kernel allocator.
+- *
+  *  With DMA abstraction, we use functions (methods), to 
+  *  distinguish between non DMAable memory and DMAable memory.
+  */
+-#ifndef	SYM_OPT_BUS_DMA_ABSTRACTION
+-
+-static struct sym_m_pool mp0;
+-
+-#else
+-
+ static m_addr_t ___mp0_get_mem_cluster(m_pool_p mp)
+ {
+ 	m_addr_t m = (m_addr_t) sym_get_mem_cluster();
+@@ -240,8 +231,6 @@ static struct sym_m_pool mp0 =
+ 	{0, ___mp0_get_mem_cluster};
+ #endif
+ 
+-#endif	/* SYM_OPT_BUS_DMA_ABSTRACTION */
+-
+ /*
+  * Actual memory allocation routine for non-DMAed memory.
+  */
+@@ -260,7 +249,6 @@ void sym_mfree_unlocked(void *ptr, int s
+ 	__sym_mfree(&mp0, ptr, size, name);
+ }
+ 
+-#ifdef	SYM_OPT_BUS_DMA_ABSTRACTION
+ /*
+  *  Methods that maintains DMAable pools according to user allocations.
+  *  New pools are created on the fly when a new pool id is provided.
+@@ -417,5 +405,3 @@ u32 __vtobus_unlocked(m_pool_ident_t dev
+ 		panic("sym: VTOBUS FAILED!\n");
+ 	return (u32)(vp ? vp->baddr + (((m_addr_t) m) - a) : 0);
+ }
+-
+-#endif	/* SYM_OPT_BUS_DMA_ABSTRACTION */
+--- linux-2.6.0/drivers/scsi/sym53c8xx_2/sym_misc.c	2003-10-08 15:07:09.000000000 -0700
++++ 25/drivers/scsi/sym53c8xx_2/sym_misc.c	2003-12-28 23:22:24.000000000 -0800
+@@ -328,7 +328,6 @@ printf("XXXXXX [%d] inq_version=%x inq_b
+ 	    tp->inq_byte56  != inq_byte56) {
+ 		tp->inq_version = inq_version;
+ 		tp->inq_byte7   = inq_byte7;
+-		tp->inq_byte56  = inq_byte56;
+ 		return 1;
+ 	}
+ 	return 0;
+--- linux-2.6.0/drivers/scsi/sym53c8xx_2/sym_nvram.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/scsi/sym53c8xx_2/sym_nvram.c	2003-12-28 23:21:49.000000000 -0800
+@@ -59,25 +59,22 @@
+ /*
+  *  Some poor and bogus sync table that refers to Tekram NVRAM layout.
+  */
+-#if SYM_CONF_NVRAM_SUPPORT
+ static u_char Tekram_sync[16] =
+ 	{25,31,37,43, 50,62,75,125, 12,15,18,21, 6,7,9,10};
+ #ifdef	SYM_CONF_DEBUG_NVRAM
+ static u_char Tekram_boot_delay[7] = {3, 5, 10, 20, 30, 60, 120};
+ #endif
+-#endif
+ 
+ /*
+  *  Get host setup from NVRAM.
+  */
+-void sym_nvram_setup_host (hcb_p np, struct sym_nvram *nvram)
++void sym_nvram_setup_host(struct sym_hcb *np, struct sym_nvram *nvram)
+ {
+-#if SYM_CONF_NVRAM_SUPPORT
+ 	/*
+ 	 *  Get parity checking, host ID, verbose mode 
+ 	 *  and miscellaneous host flags from NVRAM.
+ 	 */
+-	switch(nvram->type) {
++	switch (nvram->type) {
+ 	case SYM_SYMBIOS_NVRAM:
+ 		if (!(nvram->data.Symbios.flags & SYMBIOS_PARITY_ENABLE))
+ 			np->rv_scntl0  &= ~0x0a;
+@@ -95,41 +92,15 @@ void sym_nvram_setup_host (hcb_p np, str
+ 	default:
+ 		break;
+ 	}
+-#endif
+-}
+-
+-/*
+- *  Get target setup from NVRAM.
+- */
+-#if SYM_CONF_NVRAM_SUPPORT
+-static void sym_Symbios_setup_target(hcb_p np,int target, Symbios_nvram *nvram);
+-static void sym_Tekram_setup_target(hcb_p np,int target, Tekram_nvram *nvram);
+-#endif
+-
+-void sym_nvram_setup_target (hcb_p np, int target, struct sym_nvram *nvp)
+-{
+-#if SYM_CONF_NVRAM_SUPPORT
+-	switch(nvp->type) {
+-	case SYM_SYMBIOS_NVRAM:
+-		sym_Symbios_setup_target (np, target, &nvp->data.Symbios);
+-		break;
+-	case SYM_TEKRAM_NVRAM:
+-		sym_Tekram_setup_target (np, target, &nvp->data.Tekram);
+-		break;
+-	default:
+-		break;
+-	}
+-#endif
+ }
+ 
+-#if SYM_CONF_NVRAM_SUPPORT
+ /*
+  *  Get target set-up from Symbios format NVRAM.
+  */
+ static void
+-sym_Symbios_setup_target(hcb_p np, int target, Symbios_nvram *nvram)
++sym_Symbios_setup_target(struct sym_hcb *np, int target, Symbios_nvram *nvram)
+ {
+-	tcb_p tp = &np->target[target];
++	struct sym_tcb *tp = &np->target[target];
+ 	Symbios_target *tn = &nvram->target[target];
+ 
+ 	tp->tinfo.user.period = tn->sync_period ? (tn->sync_period + 3) / 4 : 0;
+@@ -149,9 +120,9 @@ sym_Symbios_setup_target(hcb_p np, int t
+  *  Get target set-up from Tekram format NVRAM.
+  */
+ static void
+-sym_Tekram_setup_target(hcb_p np, int target, Tekram_nvram *nvram)
++sym_Tekram_setup_target(struct sym_hcb *np, int target, Tekram_nvram *nvram)
+ {
+-	tcb_p tp = &np->target[target];
++	struct sym_tcb *tp = &np->target[target];
+ 	struct Tekram_target *tn = &nvram->target[target];
+ 	int i;
+ 
+@@ -160,8 +131,8 @@ sym_Tekram_setup_target(hcb_p np, int ta
+ 		tp->tinfo.user.period = Tekram_sync[i];
+ 	}
+ 
+-	tp->tinfo.user.width =
+-		(tn->flags & TEKRAM_WIDE_NEGO) ? BUS_16_BIT : BUS_8_BIT;
++	tp->tinfo.user.width = (tn->flags & TEKRAM_WIDE_NEGO) ?
++		BUS_16_BIT : BUS_8_BIT;
+ 
+ 	if (tn->flags & TEKRAM_TAGGED_COMMANDS) {
+ 		tp->usrtags = 2 << nvram->max_tags_index;
+@@ -175,11 +146,28 @@ sym_Tekram_setup_target(hcb_p np, int ta
+ 		np->rv_scntl0  &= ~0x0a; /* SCSI parity checking disabled */
+ }
+ 
++/*
++ *  Get target setup from NVRAM.
++ */
++void sym_nvram_setup_target(struct sym_hcb *np, int target, struct sym_nvram *nvp)
++{
++	switch (nvp->type) {
++	case SYM_SYMBIOS_NVRAM:
++		sym_Symbios_setup_target(np, target, &nvp->data.Symbios);
++		break;
++	case SYM_TEKRAM_NVRAM:
++		sym_Tekram_setup_target(np, target, &nvp->data.Tekram);
++		break;
++	default:
++		break;
++	}
++}
++
+ #ifdef	SYM_CONF_DEBUG_NVRAM
+ /*
+  *  Dump Symbios format NVRAM for debugging purpose.
+  */
+-static void sym_display_Symbios_nvram(sdev_p np, Symbios_nvram *nvram)
++static void sym_display_Symbios_nvram(struct sym_device *np, Symbios_nvram *nvram)
+ {
+ 	int i;
+ 
+@@ -211,7 +199,7 @@ static void sym_display_Symbios_nvram(sd
+ /*
+  *  Dump TEKRAM format NVRAM for debugging purpose.
+  */
+-static void sym_display_Tekram_nvram(sdev_p np, Tekram_nvram *nvram)
++static void sym_display_Tekram_nvram(struct sym_device *np, Tekram_nvram *nvram)
+ {
+ 	int i, tags, boot_delay;
+ 	char *rem;
+@@ -221,7 +209,7 @@ static void sym_display_Tekram_nvram(sde
+ 	boot_delay = 0;
+ 	if (nvram->boot_delay_index < 6)
+ 		boot_delay = Tekram_boot_delay[nvram->boot_delay_index];
+-	switch((nvram->flags & TEKRAM_REMOVABLE_FLAGS) >> 6) {
++	switch ((nvram->flags & TEKRAM_REMOVABLE_FLAGS) >> 6) {
+ 	default:
+ 	case 0:	rem = "";			break;
+ 	case 1: rem = " REMOVABLE=boot device";	break;
+@@ -257,49 +245,12 @@ static void sym_display_Tekram_nvram(sde
+ 		sync);
+ 	}
+ }
+-#endif	/* SYM_CONF_DEBUG_NVRAM */
+-#endif	/* SYM_CONF_NVRAM_SUPPORT */
+-
+-
+-/*
+- *  Try reading Symbios or Tekram NVRAM
+- */
+-#if SYM_CONF_NVRAM_SUPPORT
+-static int sym_read_Symbios_nvram (sdev_p np, Symbios_nvram *nvram);
+-static int sym_read_Tekram_nvram  (sdev_p np, Tekram_nvram *nvram);
+-#endif
+-
+-int sym_read_nvram (sdev_p np, struct sym_nvram *nvp)
+-{
+-#if SYM_CONF_NVRAM_SUPPORT
+-	/*
+-	 *  Try to read SYMBIOS nvram.
+-	 *  Try to read TEKRAM nvram if Symbios nvram not found.
+-	 */
+-	if	(SYM_SETUP_SYMBIOS_NVRAM &&
+-		 !sym_read_Symbios_nvram (np, &nvp->data.Symbios)) {
+-		nvp->type = SYM_SYMBIOS_NVRAM;
+-#ifdef SYM_CONF_DEBUG_NVRAM
+-		sym_display_Symbios_nvram(np, &nvp->data.Symbios);
+-#endif
+-	}
+-	else if	(SYM_SETUP_TEKRAM_NVRAM &&
+-		 !sym_read_Tekram_nvram (np, &nvp->data.Tekram)) {
+-		nvp->type = SYM_TEKRAM_NVRAM;
+-#ifdef SYM_CONF_DEBUG_NVRAM
+-		sym_display_Tekram_nvram(np, &nvp->data.Tekram);
+-#endif
+-	}
+-	else
+-		nvp->type = 0;
+ #else
+-	nvp->type = 0;
+-#endif
+-	return nvp->type;
+-}
++static void sym_display_Symbios_nvram(struct sym_device *np, Symbios_nvram *nvram) { }
++static void sym_display_Tekram_nvram(struct sym_device *np, Tekram_nvram *nvram) { }
++#endif	/* SYM_CONF_DEBUG_NVRAM */
+ 
+ 
+-#if SYM_CONF_NVRAM_SUPPORT
+ /*
+  *  24C16 EEPROM reading.
+  *
+@@ -316,11 +267,11 @@ int sym_read_nvram (sdev_p np, struct sy
+ /*
+  *  Set/clear data/clock bit in GPIO0
+  */
+-static void S24C16_set_bit(sdev_p np, u_char write_bit, u_char *gpreg, 
++static void S24C16_set_bit(struct sym_device *np, u_char write_bit, u_char *gpreg,
+ 			  int bit_mode)
+ {
+ 	UDELAY (5);
+-	switch (bit_mode){
++	switch (bit_mode) {
+ 	case SET_BIT:
+ 		*gpreg |= write_bit;
+ 		break;
+@@ -342,7 +293,7 @@ static void S24C16_set_bit(sdev_p np, u_
+ /*
+  *  Send START condition to NVRAM to wake it up.
+  */
+-static void S24C16_start(sdev_p np, u_char *gpreg)
++static void S24C16_start(struct sym_device *np, u_char *gpreg)
+ {
+ 	S24C16_set_bit(np, 1, gpreg, SET_BIT);
+ 	S24C16_set_bit(np, 0, gpreg, SET_CLK);
+@@ -353,7 +304,7 @@ static void S24C16_start(sdev_p np, u_ch
+ /*
+  *  Send STOP condition to NVRAM - puts NVRAM to sleep... ZZzzzz!!
+  */
+-static void S24C16_stop(sdev_p np, u_char *gpreg)
++static void S24C16_stop(struct sym_device *np, u_char *gpreg)
+ {
+ 	S24C16_set_bit(np, 0, gpreg, SET_CLK);
+ 	S24C16_set_bit(np, 1, gpreg, SET_BIT);
+@@ -363,7 +314,7 @@ static void S24C16_stop(sdev_p np, u_cha
+  *  Read or write a bit to the NVRAM,
+  *  read if GPIO0 input else write if GPIO0 output
+  */
+-static void S24C16_do_bit(sdev_p np, u_char *read_bit, u_char write_bit, 
++static void S24C16_do_bit(struct sym_device *np, u_char *read_bit, u_char write_bit,
+ 			 u_char *gpreg)
+ {
+ 	S24C16_set_bit(np, write_bit, gpreg, SET_BIT);
+@@ -378,7 +329,7 @@ static void S24C16_do_bit(sdev_p np, u_c
+  *  Output an ACK to the NVRAM after reading,
+  *  change GPIO0 to output and when done back to an input
+  */
+-static void S24C16_write_ack(sdev_p np, u_char write_bit, u_char *gpreg, 
++static void S24C16_write_ack(struct sym_device *np, u_char write_bit, u_char *gpreg,
+ 			    u_char *gpcntl)
+ {
+ 	OUTB (nc_gpcntl, *gpcntl & 0xfe);
+@@ -390,7 +341,7 @@ static void S24C16_write_ack(sdev_p np, 
+  *  Input an ACK from NVRAM after writing,
+  *  change GPIO0 to input and when done back to an output
+  */
+-static void S24C16_read_ack(sdev_p np, u_char *read_bit, u_char *gpreg, 
++static void S24C16_read_ack(struct sym_device *np, u_char *read_bit, u_char *gpreg,
+ 			   u_char *gpcntl)
+ {
+ 	OUTB (nc_gpcntl, *gpcntl | 0x01);
+@@ -402,7 +353,7 @@ static void S24C16_read_ack(sdev_p np, u
+  *  WRITE a byte to the NVRAM and then get an ACK to see it was accepted OK,
+  *  GPIO0 must already be set as an output
+  */
+-static void S24C16_write_byte(sdev_p np, u_char *ack_data, u_char write_data, 
++static void S24C16_write_byte(struct sym_device *np, u_char *ack_data, u_char write_data,
+ 			     u_char *gpreg, u_char *gpcntl)
+ {
+ 	int x;
+@@ -417,7 +368,7 @@ static void S24C16_write_byte(sdev_p np,
+  *  READ a byte from the NVRAM and then send an ACK to say we have got it,
+  *  GPIO0 must already be set as an input
+  */
+-static void S24C16_read_byte(sdev_p np, u_char *read_data, u_char ack_data, 
++static void S24C16_read_byte(struct sym_device *np, u_char *read_data, u_char ack_data,
+ 			    u_char *gpreg, u_char *gpcntl)
+ {
+ 	int x;
+@@ -435,7 +386,7 @@ static void S24C16_read_byte(sdev_p np, 
+ /*
+  *  Read 'len' bytes starting at 'offset'.
+  */
+-static int sym_read_S24C16_nvram (sdev_p np, int offset, u_char *data, int len)
++static int sym_read_S24C16_nvram(struct sym_device *np, int offset, u_char *data, int len)
+ {
+ 	u_char	gpcntl, gpreg;
+ 	u_char	old_gpcntl, old_gpreg;
+@@ -514,7 +465,7 @@ out:
+  *  Try reading Symbios NVRAM.
+  *  Return 0 if OK.
+  */
+-static int sym_read_Symbios_nvram (sdev_p np, Symbios_nvram *nvram)
++static int sym_read_Symbios_nvram(struct sym_device *np, Symbios_nvram *nvram)
+ {
+ 	static u_char Symbios_trailer[6] = {0xfe, 0xfe, 0, 0, 0, 0};
+ 	u_char *data = (u_char *) nvram;
+@@ -528,7 +479,7 @@ static int sym_read_Symbios_nvram (sdev_
+ 
+ 	/* check valid NVRAM signature, verify byte count and checksum */
+ 	if (nvram->type != 0 ||
+-	    bcmp(nvram->trailer, Symbios_trailer, 6) ||
++	    memcmp(nvram->trailer, Symbios_trailer, 6) ||
+ 	    nvram->byte_count != len - 12)
+ 		return 1;
+ 
+@@ -555,7 +506,7 @@ static int sym_read_Symbios_nvram (sdev_
+ /*
+  *  Pulse clock bit in GPIO0
+  */
+-static void T93C46_Clk(sdev_p np, u_char *gpreg)
++static void T93C46_Clk(struct sym_device *np, u_char *gpreg)
+ {
+ 	OUTB (nc_gpreg, *gpreg | 0x04);
+ 	UDELAY (2);
+@@ -565,7 +516,7 @@ static void T93C46_Clk(sdev_p np, u_char
+ /* 
+  *  Read bit from NVRAM
+  */
+-static void T93C46_Read_Bit(sdev_p np, u_char *read_bit, u_char *gpreg)
++static void T93C46_Read_Bit(struct sym_device *np, u_char *read_bit, u_char *gpreg)
+ {
+ 	UDELAY (2);
+ 	T93C46_Clk(np, gpreg);
+@@ -575,7 +526,7 @@ static void T93C46_Read_Bit(sdev_p np, u
+ /*
+  *  Write bit to GPIO0
+  */
+-static void T93C46_Write_Bit(sdev_p np, u_char write_bit, u_char *gpreg)
++static void T93C46_Write_Bit(struct sym_device *np, u_char write_bit, u_char *gpreg)
+ {
+ 	if (write_bit & 0x01)
+ 		*gpreg |= 0x02;
+@@ -593,7 +544,7 @@ static void T93C46_Write_Bit(sdev_p np, 
+ /*
+  *  Send STOP condition to NVRAM - puts NVRAM to sleep... ZZZzzz!!
+  */
+-static void T93C46_Stop(sdev_p np, u_char *gpreg)
++static void T93C46_Stop(struct sym_device *np, u_char *gpreg)
+ {
+ 	*gpreg &= 0xef;
+ 	OUTB (nc_gpreg, *gpreg);
+@@ -605,7 +556,7 @@ static void T93C46_Stop(sdev_p np, u_cha
+ /*
+  *  Send read command and address to NVRAM
+  */
+-static void T93C46_Send_Command(sdev_p np, u_short write_data, 
++static void T93C46_Send_Command(struct sym_device *np, u_short write_data,
+ 				u_char *read_bit, u_char *gpreg)
+ {
+ 	int x;
+@@ -620,7 +571,8 @@ static void T93C46_Send_Command(sdev_p n
+ /*
+  *  READ 2 bytes from the NVRAM
+  */
+-static void T93C46_Read_Word(sdev_p np, u_short *nvram_data, u_char *gpreg)
++static void T93C46_Read_Word(struct sym_device *np,
++		unsigned short *nvram_data, unsigned char *gpreg)
+ {
+ 	int x;
+ 	u_char read_bit;
+@@ -639,13 +591,13 @@ static void T93C46_Read_Word(sdev_p np, 
+ /*
+  *  Read Tekram NvRAM data.
+  */
+-static int T93C46_Read_Data(sdev_p np, u_short *data,int len,u_char *gpreg)
++static int T93C46_Read_Data(struct sym_device *np, unsigned short *data,
++		int len, unsigned char *gpreg)
+ {
+-	u_char	read_bit;
+-	int	x;
++	int x;
+ 
+ 	for (x = 0; x < len; x++)  {
+-
++		unsigned char read_bit;
+ 		/* output read command and address */
+ 		T93C46_Send_Command(np, 0x180 | x, &read_bit, gpreg);
+ 		if (read_bit & 0x01)
+@@ -660,7 +612,7 @@ static int T93C46_Read_Data(sdev_p np, u
+ /*
+  *  Try reading 93C46 Tekram NVRAM.
+  */
+-static int sym_read_T93C46_nvram (sdev_p np, Tekram_nvram *nvram)
++static int sym_read_T93C46_nvram(struct sym_device *np, Tekram_nvram *nvram)
+ {
+ 	u_char gpcntl, gpreg;
+ 	u_char old_gpcntl, old_gpreg;
+@@ -692,7 +644,7 @@ static int sym_read_T93C46_nvram (sdev_p
+  *  Try reading Tekram NVRAM.
+  *  Return 0 if OK.
+  */
+-static int sym_read_Tekram_nvram (sdev_p np, Tekram_nvram *nvram)
++static int sym_read_Tekram_nvram (struct sym_device *np, Tekram_nvram *nvram)
+ {
+ 	u_char *data = (u_char *) nvram;
+ 	int len = sizeof(*nvram);
+@@ -700,13 +652,13 @@ static int sym_read_Tekram_nvram (sdev_p
+ 	int x;
+ 
+ 	switch (np->device_id) {
+-	case PCI_ID_SYM53C885:
+-	case PCI_ID_SYM53C895:
+-	case PCI_ID_SYM53C896:
++	case PCI_DEVICE_ID_NCR_53C885:
++	case PCI_DEVICE_ID_NCR_53C895:
++	case PCI_DEVICE_ID_NCR_53C896:
+ 		x = sym_read_S24C16_nvram(np, TEKRAM_24C16_NVRAM_ADDRESS,
+ 					  data, len);
+ 		break;
+-	case PCI_ID_SYM53C875:
++	case PCI_DEVICE_ID_NCR_53C875:
+ 		x = sym_read_S24C16_nvram(np, TEKRAM_24C16_NVRAM_ADDRESS,
+ 					  data, len);
+ 		if (!x)
+@@ -727,4 +679,19 @@ static int sym_read_Tekram_nvram (sdev_p
+ 	return 0;
+ }
+ 
+-#endif	/* SYM_CONF_NVRAM_SUPPORT */
++/*
++ *  Try reading Symbios or Tekram NVRAM
++ */
++int sym_read_nvram(struct sym_device *np, struct sym_nvram *nvp)
++{
++	if (!sym_read_Symbios_nvram(np, &nvp->data.Symbios)) {
++		nvp->type = SYM_SYMBIOS_NVRAM;
++		sym_display_Symbios_nvram(np, &nvp->data.Symbios);
++	} else if (!sym_read_Tekram_nvram(np, &nvp->data.Tekram)) {
++		nvp->type = SYM_TEKRAM_NVRAM;
++		sym_display_Tekram_nvram(np, &nvp->data.Tekram);
++	} else {
++		nvp->type = 0;
++	}
++	return nvp->type;
++}
+--- linux-2.6.0/drivers/serial/8250.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/serial/8250.c	2003-12-28 23:21:07.000000000 -0800
+@@ -844,7 +844,7 @@ receive_chars(struct uart_8250_port *up,
+ 		if (unlikely(tty->flip.count >= TTY_FLIPBUF_SIZE)) {
+ 			tty->flip.work.func((void *)tty);
+ 			if (tty->flip.count >= TTY_FLIPBUF_SIZE)
+-				return; // if TTY_DONT_FLIP is set
++				return;	/* if TTY_DONT_FLIP is set */
+ 		}
+ 		ch = serial_inp(up, UART_RX);
+ 		*tty->flip.char_buf_ptr = ch;
+@@ -1205,12 +1205,21 @@ static void serial8250_break_ctl(struct 
+ 	spin_unlock_irqrestore(&up->port.lock, flags);
+ }
+ 
++#ifdef CONFIG_KGDB
++static int kgdb_irq = -1;
++#endif
++
+ static int serial8250_startup(struct uart_port *port)
+ {
+ 	struct uart_8250_port *up = (struct uart_8250_port *)port;
+ 	unsigned long flags;
+ 	int retval;
+ 
++#ifdef CONFIG_KGDB
++	if (up->port.irq == kgdb_irq)
++		return -EBUSY;
++#endif
++
+ 	up->capabilities = uart_config[up->port.type].flags;
+ 
+ 	if (up->port.type == PORT_16C950) {
+@@ -1876,6 +1885,10 @@ static void __init serial8250_register_p
+ 	for (i = 0; i < UART_NR; i++) {
+ 		struct uart_8250_port *up = &serial8250_ports[i];
+ 
++#ifdef CONFIG_KGDB
++		if (up->port.irq == kgdb_irq)
++			up->port.kgdb = 1;
++#endif
+ 		up->port.line = i;
+ 		up->port.ops = &serial8250_pops;
+ 		init_timer(&up->timer);
+@@ -2145,6 +2158,31 @@ void serial8250_resume_port(int line)
+ 	uart_resume_port(&serial8250_reg, &serial8250_ports[line].port);
+ }
+ 
++#ifdef CONFIG_KGDB
++/*
++ * Find all the ports using the given irq and shut them down.
++ * Result should be that the irq will be released.
++ */
++void shutdown_for_kgdb(struct async_struct * info)
++{
++        int irq = info->state->irq;
++        struct uart_8250_port *up;
++	int ttyS;
++
++	kgdb_irq = irq;			/* save for later init */
++	for (ttyS = 0; ttyS < UART_NR; ttyS++){
++		up =  &serial8250_ports[ttyS];
++		if (up->port.irq == irq && (irq_lists + irq)->head) {
++#ifdef CONFIG_DEBUG_SPINLOCK   /* ugly business... */
++			if(up->port.lock.magic != SPINLOCK_MAGIC)
++				spin_lock_init(&up->port.lock);
++#endif
++			serial8250_shutdown(&up->port);
++		}
++        }
++}
++#endif	/* CONFIG_KGDB */
++
+ static int __init serial8250_init(void)
+ {
+ 	int ret, i;
+--- linux-2.6.0/drivers/serial/serial_core.c	2003-11-23 19:03:01.000000000 -0800
++++ 25/drivers/serial/serial_core.c	2003-12-28 23:21:51.000000000 -0800
+@@ -1862,6 +1862,9 @@ uart_set_options(struct uart_port *port,
+ 	if (flow == 'r')
+ 		termios.c_cflag |= CRTSCTS;
+ 
++	if (!port->ops)
++		return 0;	/* "console=" on ia64 */
++
+ 	port->ops->set_termios(port, &termios, NULL);
+ 	co->cflag = termios.c_cflag;
+ 
+@@ -1975,6 +1978,11 @@ uart_configure_port(struct uart_driver *
+ {
+ 	unsigned int flags;
+ 
++#ifdef CONFIG_KGDB
++	if (port->kgdb)
++		return;
++#endif
++
+ 	/*
+ 	 * If there isn't a port here, don't do anything further.
+ 	 */
+--- linux-2.6.0/drivers/serial/serial_cs.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/drivers/serial/serial_cs.c	2003-12-28 23:22:54.000000000 -0800
+@@ -149,9 +149,9 @@ static void serial_remove(dev_link_t *li
+ 		info->link.dev = NULL;
+ 
+ 		if (!info->slave) {
+-			CardServices(ReleaseConfiguration, info->link.handle);
+-			CardServices(ReleaseIO, info->link.handle, &info->link.io);
+-			CardServices(ReleaseIRQ, info->link.handle, &info->link.irq);
++			pcmcia_release_configuration(info->link.handle);
++			pcmcia_release_io(info->link.handle, &info->link.io);
++			pcmcia_release_irq(info->link.handle, &info->link.irq);
+ 		}
+ 
+ 		info->link.state &= ~DEV_CONFIG;
+@@ -211,7 +211,7 @@ static dev_link_t *serial_attach(void)
+ 	client_reg.event_handler = &serial_event;
+ 	client_reg.Version = 0x0210;
+ 	client_reg.event_callback_args.client_data = link;
+-	ret = CardServices(RegisterClient, &link->handle, &client_reg);
++	ret = pcmcia_register_client(&link->handle, &client_reg);
+ 	if (ret != CS_SUCCESS) {
+ 		cs_error(link->handle, RegisterClient, ret);
+ 		serial_detach(link);
+@@ -256,7 +256,7 @@ static void serial_detach(dev_link_t * l
+ 	serial_remove(link);
+ 
+ 	if (link->handle) {
+-		ret = CardServices(DeregisterClient, link->handle);
++		ret = pcmcia_deregister_client(link->handle);
+ 		if (ret != CS_SUCCESS)
+ 			cs_error(link->handle, DeregisterClient, ret);
+ 	}
+@@ -300,20 +300,30 @@ static int setup_serial(struct serial_in
+ /*====================================================================*/
+ 
+ static int
+-get_tuple(int fn, client_handle_t handle, tuple_t * tuple, cisparse_t * parse)
++first_tuple(client_handle_t handle, tuple_t * tuple, cisparse_t * parse)
+ {
+ 	int i;
+-	i = CardServices(fn, handle, tuple);
++	i = pcmcia_get_first_tuple(handle, tuple);
+ 	if (i != CS_SUCCESS)
+ 		return CS_NO_MORE_ITEMS;
+-	i = CardServices(GetTupleData, handle, tuple);
++	i = pcmcia_get_tuple_data(handle, tuple);
+ 	if (i != CS_SUCCESS)
+ 		return i;
+-	return CardServices(ParseTuple, handle, tuple, parse);
++	return pcmcia_parse_tuple(handle, tuple, parse);
+ }
+ 
+-#define first_tuple(a, b, c) get_tuple(GetFirstTuple, a, b, c)
+-#define next_tuple(a, b, c) get_tuple(GetNextTuple, a, b, c)
++static int
++next_tuple(client_handle_t handle, tuple_t * tuple, cisparse_t * parse)
++{
++	int i;
++	i = pcmcia_get_next_tuple(handle, tuple);
++	if (i != CS_SUCCESS)
++		return CS_NO_MORE_ITEMS;
++	i = pcmcia_get_tuple_data(handle, tuple);
++	if (i != CS_SUCCESS)
++		return i;
++	return pcmcia_parse_tuple(handle, tuple, parse);
++}
+ 
+ /*====================================================================*/
+ 
+@@ -330,7 +340,7 @@ static int simple_config(dev_link_t * li
+ 	int i, j, try;
+ 
+ 	/* If the card is already configured, look up the port and irq */
+-	i = CardServices(GetConfigurationInfo, handle, &config);
++	i = pcmcia_get_configuration_info(handle, &config);
+ 	if ((i == CS_SUCCESS) && (config.Attributes & CONF_VALID_CLIENT)) {
+ 		ioaddr_t port = 0;
+ 		if ((config.BasePort2 != 0) && (config.NumPorts2 == 8)) {
+@@ -367,9 +377,7 @@ static int simple_config(dev_link_t * li
+ 				link->io.BasePort1 = cf->io.win[0].base;
+ 				link->io.IOAddrLines = (try == 0) ?
+ 				    16 : cf->io.flags & CISTPL_IO_LINES_MASK;
+-				i =
+-				    CardServices(RequestIO, link->handle,
+-						 &link->io);
++				i = pcmcia_request_io(link->handle, &link->io);
+ 				if (i == CS_SUCCESS)
+ 					goto found_port;
+ 			}
+@@ -389,8 +397,7 @@ static int simple_config(dev_link_t * li
+ 			for (j = 0; j < 5; j++) {
+ 				link->io.BasePort1 = base[j];
+ 				link->io.IOAddrLines = base[j] ? 16 : 3;
+-				i = CardServices(RequestIO, link->handle,
+-						 &link->io);
++				i = pcmcia_request_io(link->handle, &link->io);
+ 				if (i == CS_SUCCESS)
+ 					goto found_port;
+ 			}
+@@ -406,14 +413,14 @@ static int simple_config(dev_link_t * li
+ 		return -1;
+ 	}
+ 
+-	i = CardServices(RequestIRQ, link->handle, &link->irq);
++	i = pcmcia_request_irq(link->handle, &link->irq);
+ 	if (i != CS_SUCCESS) {
+ 		cs_error(link->handle, RequestIRQ, i);
+ 		link->irq.AssignedIRQ = 0;
+ 	}
+ 	if (info->multi && (info->manfid == MANFID_3COM))
+ 		link->conf.ConfigIndex &= ~(0x08);
+-	i = CardServices(RequestConfiguration, link->handle, &link->conf);
++	i = pcmcia_request_configuration(link->handle, &link->conf);
+ 	if (i != CS_SUCCESS) {
+ 		cs_error(link->handle, RequestConfiguration, i);
+ 		return -1;
+@@ -433,7 +440,7 @@ static int multi_config(dev_link_t * lin
+ 	config_info_t config;
+ 	int i, base2 = 0;
+ 
+-	i = CardServices(GetConfigurationInfo, handle, &config);
++	i = pcmcia_get_configuration_info(handle, &config);
+ 	if (i != CS_SUCCESS) {
+ 		cs_error(handle, GetConfigurationInfo, i);
+ 		return -1;
+@@ -458,7 +465,7 @@ static int multi_config(dev_link_t * lin
+ 			link->io.BasePort1 = cf->io.win[0].base;
+ 			link->io.IOAddrLines =
+ 			    cf->io.flags & CISTPL_IO_LINES_MASK;
+-			i = CardServices(RequestIO, link->handle, &link->io);
++			i = pcmcia_request_io(link->handle, &link->io);
+ 			base2 = link->io.BasePort1 + 8;
+ 			if (i == CS_SUCCESS)
+ 				break;
+@@ -478,9 +485,7 @@ static int multi_config(dev_link_t * lin
+ 				link->io.BasePort2 = cf->io.win[1].base;
+ 				link->io.IOAddrLines =
+ 				    cf->io.flags & CISTPL_IO_LINES_MASK;
+-				i =
+-				    CardServices(RequestIO, link->handle,
+-						 &link->io);
++				i = pcmcia_request_io(link->handle, &link->io);
+ 				base2 = link->io.BasePort2;
+ 				if (i == CS_SUCCESS)
+ 					break;
+@@ -494,7 +499,7 @@ static int multi_config(dev_link_t * lin
+ 		return -1;
+ 	}
+ 
+-	i = CardServices(RequestIRQ, link->handle, &link->irq);
++	i = pcmcia_request_irq(link->handle, &link->irq);
+ 	if (i != CS_SUCCESS) {
+ 		printk(KERN_NOTICE
+ 		       "serial_cs: no usable port range found, giving up\n");
+@@ -506,7 +511,7 @@ static int multi_config(dev_link_t * lin
+ 		link->conf.Present |= PRESENT_EXT_STATUS;
+ 		link->conf.ExtStatus = ESR_REQ_ATTN_ENA;
+ 	}
+-	i = CardServices(RequestConfiguration, link->handle, &link->conf);
++	i = pcmcia_request_configuration(link->handle, &link->conf);
+ 	if (i != CS_SUCCESS) {
+ 		cs_error(link->handle, RequestConfiguration, i);
+ 		return -1;
+@@ -543,9 +548,6 @@ static int multi_config(dev_link_t * lin
+ 
+ ======================================================================*/
+ 
+-#define CS_CHECK(fn, args...) \
+-while ((last_ret=CardServices(last_fn=(fn), args))!=0) goto cs_failed
+-
+ void serial_config(dev_link_t * link)
+ {
+ 	client_handle_t handle = link->handle;
+@@ -619,10 +621,18 @@ void serial_config(dev_link_t * link)
+ 
+ 	if (info->manfid == MANFID_IBM) {
+ 		conf_reg_t reg = { 0, CS_READ, 0x800, 0 };
+-		CS_CHECK(AccessConfigurationRegister, link->handle, &reg);
++		last_ret = pcmcia_access_configuration_register(link->handle, &reg);
++		if (last_ret) {
++			last_fn = AccessConfigurationRegister;
++			goto cs_failed;
++		}
+ 		reg.Action = CS_WRITE;
+ 		reg.Value = reg.Value | 1;
+-		CS_CHECK(AccessConfigurationRegister, link->handle, &reg);
++		last_ret = pcmcia_access_configuration_register(link->handle, &reg);
++		if (last_ret) {
++			last_fn = AccessConfigurationRegister;
++			goto cs_failed;
++		}
+ 	}
+ 
+ 	link->dev = &info->node[0];
+@@ -668,7 +678,7 @@ serial_event(event_t event, int priority
+ 		/* Fall through... */
+ 	case CS_EVENT_RESET_PHYSICAL:
+ 		if ((link->state & DEV_CONFIG) && !info->slave)
+-			CardServices(ReleaseConfiguration, link->handle);
++			pcmcia_release_configuration(link->handle);
+ 		break;
+ 
+ 	case CS_EVENT_PM_RESUME:
+@@ -676,8 +686,7 @@ serial_event(event_t event, int priority
+ 		/* Fall through... */
+ 	case CS_EVENT_CARD_RESET:
+ 		if (DEV_OK(link) && !info->slave)
+-			CardServices(RequestConfiguration, link->handle,
+-				     &link->conf);
++			pcmcia_request_configuration(link->handle, &link->conf);
+ 		break;
+ 	}
+ 	return 0;
+--- linux-2.6.0/drivers/telephony/ixj_pcmcia.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/drivers/telephony/ixj_pcmcia.c	2003-12-28 23:22:54.000000000 -0800
+@@ -77,7 +77,7 @@ static dev_link_t *ixj_attach(void)
+ 	client_reg.event_handler = &ixj_event;
+ 	client_reg.Version = 0x0210;
+ 	client_reg.event_callback_args.client_data = link;
+-	ret = CardServices(RegisterClient, &link->handle, &client_reg);
++	ret = pcmcia_register_client(&link->handle, &client_reg);
+ 	if (ret != CS_SUCCESS) {
+ 		cs_error(link->handle, RegisterClient, ret);
+ 		ixj_detach(link);
+@@ -100,7 +100,7 @@ static void ixj_detach(dev_link_t * link
+ 	if (link->state & DEV_CONFIG)
+ 		ixj_cs_release(link);
+ 	if (link->handle) {
+-		ret = CardServices(DeregisterClient, link->handle);
++		ret = pcmcia_deregister_client(link->handle);
+ 		if (ret != CS_SUCCESS)
+ 			cs_error(link->handle, DeregisterClient, ret);
+ 	}
+@@ -110,11 +110,8 @@ static void ixj_detach(dev_link_t * link
+         kfree(link);
+ }
+ 
+-#define CS_CHECK(fn, args...) \
+-while ((last_ret=CardServices(last_fn=(fn), args))!=0) goto cs_failed
+-
+-#define CFG_CHECK(fn, args...) \
+-if (CardServices(fn, args) != 0) goto next_entry
++#define CS_CHECK(fn, ret) \
++do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+ 
+ static void ixj_get_serial(dev_link_t * link, IXJ * j)
+ {
+@@ -130,8 +127,8 @@ static void ixj_get_serial(dev_link_t * 
+ 	tuple.TupleDataMax = 80;
+ 	tuple.Attributes = 0;
+ 	tuple.DesiredTuple = CISTPL_VERS_1;
+-	CS_CHECK(GetFirstTuple, handle, &tuple);
+-	CS_CHECK(GetTupleData, handle, &tuple);
++	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
++	CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
+ 	str = (char *) buf;
+ 	printk("PCMCIA Version %d.%d\n", str[0], str[1]);
+ 	str += 2;
+@@ -202,19 +199,20 @@ static void ixj_config(dev_link_t * link
+ 	tuple.TupleDataMax = 255;
+ 	tuple.Attributes = 0;
+ 	tuple.DesiredTuple = CISTPL_CONFIG;
+-	CS_CHECK(GetFirstTuple, handle, &tuple);
+-	CS_CHECK(GetTupleData, handle, &tuple);
+-	CS_CHECK(ParseTuple, handle, &tuple, &parse);
++	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
++	CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
++	CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+ 	link->conf.ConfigBase = parse.config.base;
+ 	link->conf.Present = parse.config.rmask[0];
+ 	link->state |= DEV_CONFIG;
+-	CS_CHECK(GetConfigurationInfo, handle, &conf);
++	CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(handle, &conf));
+ 	tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
+ 	tuple.Attributes = 0;
+-	CS_CHECK(GetFirstTuple, handle, &tuple);
++	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+ 	while (1) {
+-		CFG_CHECK(GetTupleData, handle, &tuple);
+-		CFG_CHECK(ParseTuple, handle, &tuple, &parse);
++		if (pcmcia_get_tuple_data(handle, &tuple) != 0 ||
++				pcmcia_parse_tuple(handle, &tuple, &parse) != 0)
++			goto next_entry;
+ 		if ((cfg->io.nwin > 0) || (dflt.io.nwin > 0)) {
+ 			cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt.io;
+ 			link->conf.ConfigIndex = cfg->index;
+@@ -224,17 +222,18 @@ static void ixj_config(dev_link_t * link
+ 				link->io.BasePort2 = io->win[1].base;
+ 				link->io.NumPorts2 = io->win[1].len;
+ 			}
+-			CFG_CHECK(RequestIO, link->handle, &link->io);
++			if (pcmcia_request_io(link->handle, &link->io) != 0)
++				goto next_entry;
+ 			/* If we've got this far, we're done */
+ 			break;
+ 		}
+ 	      next_entry:
+ 		if (cfg->flags & CISTPL_CFTABLE_DEFAULT)
+ 			dflt = *cfg;
+-		CS_CHECK(GetNextTuple, handle, &tuple);
++		CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(handle, &tuple));
+ 	}
+ 
+-	CS_CHECK(RequestConfiguration, handle, &link->conf);
++	CS_CHECK(RequestConfiguration, pcmcia_request_configuration(handle, &link->conf));
+ 
+ 	/*
+  	 *	Register the card with the core.
+@@ -258,8 +257,8 @@ static void ixj_cs_release(dev_link_t *l
+ 	DEBUG(0, "ixj_cs_release(0x%p)\n", link);
+ 	info->ndev = 0;
+ 	link->dev = NULL;
+-	CardServices(ReleaseConfiguration, link->handle);
+-	CardServices(ReleaseIO, link->handle, &link->io);
++	pcmcia_release_configuration(link->handle);
++	pcmcia_release_io(link->handle, &link->io);
+ 	link->state &= ~DEV_CONFIG;
+ }
+ 
+@@ -284,14 +283,14 @@ static int ixj_event(event_t event, int 
+ 		/* Fall through... */
+ 	case CS_EVENT_RESET_PHYSICAL:
+ 		if (link->state & DEV_CONFIG)
+-			CardServices(ReleaseConfiguration, link->handle);
++			pcmcia_release_configuration(link->handle);
+ 		break;
+ 	case CS_EVENT_PM_RESUME:
+ 		link->state &= ~DEV_SUSPEND;
+ 		/* Fall through... */
+ 	case CS_EVENT_CARD_RESET:
+ 		if (DEV_OK(link))
+-			CardServices(RequestConfiguration, link->handle, &link->conf);
++			pcmcia_request_configuration(link->handle, &link->conf);
+ 		break;
+ 	}
+ 	return 0;
+--- linux-2.6.0/drivers/usb/class/cdc-acm.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/usb/class/cdc-acm.c	2003-12-28 23:22:00.000000000 -0800
+@@ -1,5 +1,5 @@
+ /*
+- * acm.c  Version 0.22
++ * cdc-acm.c
+  *
+  * Copyright (c) 1999 Armin Fuerst	<fuerst@in.tum.de>
+  * Copyright (c) 1999 Pavel Machek	<pavel@suse.cz>
+@@ -26,6 +26,7 @@
+  *	v0.21 - revert to probing on device for devices with multiple configs
+  *	v0.22 - probe only the control interface. if usbcore doesn't choose the
+  *		config we want, sysadmin changes bConfigurationValue in sysfs.
++ *	v0.23 - use softirq for rx processing, as needed by tty layer
+  */
+ 
+ /*
+@@ -44,6 +45,8 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+  */
+ 
++#undef DEBUG
++
+ #include <linux/kernel.h>
+ #include <linux/errno.h>
+ #include <linux/init.h>
+@@ -54,14 +57,13 @@
+ #include <linux/module.h>
+ #include <linux/smp_lock.h>
+ #include <asm/uaccess.h>
+-#undef DEBUG
+ #include <linux/usb.h>
+ #include <asm/byteorder.h>
+ 
+ /*
+  * Version Information
+  */
+-#define DRIVER_VERSION "v0.21"
++#define DRIVER_VERSION "v0.23"
+ #define DRIVER_AUTHOR "Armin Fuerst, Pavel Machek, Johannes Erdfelt, Vojtech Pavlik"
+ #define DRIVER_DESC "USB Abstract Control Model driver for USB modems and ISDN adapters"
+ 
+@@ -146,7 +148,8 @@ struct acm {
+ 	struct tty_struct *tty;				/* the corresponding tty */
+ 	struct urb *ctrlurb, *readurb, *writeurb;	/* urbs */
+ 	struct acm_line line;				/* line coding (bits, stop, parity) */
+-	struct work_struct work;					/* work queue entry for line discipline waking up */
++	struct work_struct work;			/* work queue entry for line discipline waking up */
++	struct tasklet_struct bh;			/* rx processing */
+ 	unsigned int ctrlin;				/* input control lines (DCD, DSR, RI, break, overruns) */
+ 	unsigned int ctrlout;				/* output control lines (DTR, RTS) */
+ 	unsigned int writesize;				/* max packet size for the output bulk endpoint */
+@@ -184,9 +187,10 @@ static int acm_ctrl_msg(struct acm *acm,
+ #define acm_send_break(acm, ms)		acm_ctrl_msg(acm, ACM_REQ_SEND_BREAK, ms, NULL, 0)
+ 
+ /*
+- * Interrupt handler for various ACM control events
++ * Interrupt handlers for various ACM device responses
+  */
+ 
++/* control interface reports status changes with "interrupt" transfers */
+ static void acm_ctrl_irq(struct urb *urb, struct pt_regs *regs)
+ {
+ 	struct acm *acm = urb->context;
+@@ -251,20 +255,30 @@ exit:
+ 		     __FUNCTION__, status);
+ }
+ 
++/* data interface returns incoming bytes, or we got unthrottled */
+ static void acm_read_bulk(struct urb *urb, struct pt_regs *regs)
+ {
+ 	struct acm *acm = urb->context;
+-	struct tty_struct *tty = acm->tty;
+-	unsigned char *data = urb->transfer_buffer;
+-	int i = 0;
+ 
+ 	if (!ACM_READY(acm))
+ 		return;
+ 
+ 	if (urb->status)
+-		dbg("nonzero read bulk status received: %d", urb->status);
++		dev_dbg(&acm->data->dev, "bulk rx status %d\n", urb->status);
++
++	/* calling tty_flip_buffer_push() in_irq() isn't allowed */
++	tasklet_schedule(&acm->bh);
++}
++
++static void acm_rx_tasklet(unsigned long _acm)
++{
++	struct acm *acm = (void *)_acm;
++	struct urb *urb = acm->readurb;
++	struct tty_struct *tty = acm->tty;
++	unsigned char *data = urb->transfer_buffer;
++	int i = 0;
+ 
+-	if (!urb->status && !acm->throttle)  {
++	if (urb->actual_length > 0 && !acm->throttle)  {
+ 		for (i = 0; i < urb->actual_length && !acm->throttle; i++) {
+ 			/* if we insert more than TTY_FLIPBUF_SIZE characters,
+ 			 * we drop them. */
+@@ -285,10 +299,12 @@ static void acm_read_bulk(struct urb *ur
+ 	urb->actual_length = 0;
+ 	urb->dev = acm->dev;
+ 
+-	if (usb_submit_urb(urb, GFP_ATOMIC))
+-		dbg("failed resubmitting read urb");
++	i = usb_submit_urb(urb, GFP_ATOMIC);
++	if (i)
++		dev_dbg(&acm->data->dev, "bulk rx resubmit %d\n", i);
+ }
+ 
++/* data interface wrote those outgoing bytes */
+ static void acm_write_bulk(struct urb *urb, struct pt_regs *regs)
+ {
+ 	struct acm *acm = (struct acm *)urb->context;
+@@ -621,6 +637,8 @@ static int acm_probe (struct usb_interfa
+ 			acm->minor = minor;
+ 			acm->dev = dev;
+ 
++			acm->bh.func = acm_rx_tasklet;
++			acm->bh.data = (unsigned long) acm;
+ 			INIT_WORK(&acm->work, acm_softint, acm);
+ 
+ 			if (!(buf = kmalloc(ctrlsize + readsize + acm->writesize, GFP_KERNEL))) {
+--- linux-2.6.0/drivers/usb/core/urb.c	2003-08-08 22:55:13.000000000 -0700
++++ 25/drivers/usb/core/urb.c	2003-12-28 23:22:11.000000000 -0800
+@@ -268,7 +268,7 @@ int usb_submit_urb(struct urb *urb, int 
+ 		/* "high bandwidth" mode, 1-3 packets/uframe? */
+ 		if (dev->speed == USB_SPEED_HIGH) {
+ 			int	mult = 1 + ((max >> 11) & 0x03);
+-			max &= 0x03ff;
++			max &= 0x07ff;
+ 			max *= mult;
+ 		}
+ 
+--- linux-2.6.0/drivers/usb/gadget/ether.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/drivers/usb/gadget/ether.c	2003-12-28 23:21:01.000000000 -0800
+@@ -1761,9 +1761,7 @@ eth_bind (struct usb_gadget *gadget)
+ 	/* network device setup */
+ 	dev->net = net;
+ 	SET_MODULE_OWNER (net);
+-	net->priv = dev;
+ 	strcpy (net->name, "usb%d");
+-	ether_setup (net);
+ 
+ 	/* one random address for the gadget device ... both of these could
+ 	 * reasonably come from an id prom or a module parameter.
+--- linux-2.6.0/drivers/usb/host/ehci-sched.c	2003-08-08 22:55:13.000000000 -0700
++++ 25/drivers/usb/host/ehci-sched.c	2003-12-28 23:22:11.000000000 -0800
+@@ -580,10 +580,10 @@ itd_fill (
+ 		maxp = urb->dev->epmaxpacketout [epnum];
+ 		buf1 = 0;
+ 	}
+-	buf1 |= (maxp & 0x03ff);
++	buf1 |= (maxp & 0x07ff);
+ 	multi = 1;
+ 	multi += (maxp >> 11) & 0x03;
+-	maxp &= 0x03ff;
++	maxp &= 0x07ff;
+ 	maxp *= multi;
+ 
+ 	/* transfer can't fit in any uframe? */ 
+--- linux-2.6.0/drivers/usb/image/scanner.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/drivers/usb/image/scanner.c	2003-12-28 23:23:06.000000000 -0800
+@@ -282,7 +282,7 @@
+  *      for common error messages rather than the maintainer.
+  *
+  * 0.4.7  11/28/2001
+- *    - Fixed typo in Documentation/scanner.txt.  Thanks to
++ *    - Fixed typo in Documentation/usb/scanner.txt.  Thanks to
+  *      Karel <karel.vervaeke@pandora.be> for pointing it out.
+  *    - Added ID's for a Memorex 6136u. Thanks to Álvaro Gaspar de
+  *      Valenzuela" <agaspard@utsi.edu>.
+--- linux-2.6.0/drivers/usb/input/powermate.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/usb/input/powermate.c	2003-12-28 23:22:01.000000000 -0800
+@@ -54,7 +54,11 @@
+ #define UPDATE_PULSE_AWAKE       (1<<2)
+ #define UPDATE_PULSE_MODE        (1<<3)
+ 
+-#define POWERMATE_PAYLOAD_SIZE 3
++/* at least two versions of the hardware exist, with differing payload
++   sizes. the first three bytes always contain the "interesting" data in
++   the relevant format. */
++#define POWERMATE_PAYLOAD_SIZE_MAX 6
++#define POWERMATE_PAYLOAD_SIZE_MIN 3
+ struct powermate_device {
+ 	signed char *data;
+ 	dma_addr_t data_dma;
+@@ -269,7 +273,7 @@ static int powermate_input_event(struct 
+ 
+ static int powermate_alloc_buffers(struct usb_device *udev, struct powermate_device *pm)
+ {
+-	pm->data = usb_buffer_alloc(udev, POWERMATE_PAYLOAD_SIZE,
++	pm->data = usb_buffer_alloc(udev, POWERMATE_PAYLOAD_SIZE_MAX,
+ 				    SLAB_ATOMIC, &pm->data_dma);
+ 	if (!pm->data)
+ 		return -1;
+@@ -284,7 +288,7 @@ static int powermate_alloc_buffers(struc
+ static void powermate_free_buffers(struct usb_device *udev, struct powermate_device *pm)
+ {
+ 	if (pm->data)
+-		usb_buffer_free(udev, POWERMATE_PAYLOAD_SIZE,
++		usb_buffer_free(udev, POWERMATE_PAYLOAD_SIZE_MAX,
+ 				pm->data, pm->data_dma);
+ 	if (pm->configcr)
+ 		usb_buffer_free(udev, sizeof(*(pm->configcr)),
+@@ -347,12 +351,14 @@ static int powermate_probe(struct usb_in
+ 	pipe = usb_rcvintpipe(udev, endpoint->bEndpointAddress);
+ 	maxp = usb_maxpacket(udev, pipe, usb_pipeout(pipe));
+ 
+-	if (maxp != POWERMATE_PAYLOAD_SIZE)
+-		printk("powermate: Expected payload of %d bytes, found %d bytes!\n", POWERMATE_PAYLOAD_SIZE, maxp);
+-
++	if(maxp < POWERMATE_PAYLOAD_SIZE_MIN || maxp > POWERMATE_PAYLOAD_SIZE_MAX){
++		printk("powermate: Expected payload of %d--%d bytes, found %d bytes!\n",
++			POWERMATE_PAYLOAD_SIZE_MIN, POWERMATE_PAYLOAD_SIZE_MAX, maxp);
++		maxp = POWERMATE_PAYLOAD_SIZE_MAX;
++	}
+ 
+ 	usb_fill_int_urb(pm->irq, udev, pipe, pm->data,
+-			 POWERMATE_PAYLOAD_SIZE, powermate_irq,
++			 maxp, powermate_irq,
+ 			 pm, endpoint->bInterval);
+ 	pm->irq->transfer_dma = pm->data_dma;
+ 	pm->irq->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
+--- linux-2.6.0/drivers/video/aty/aty128fb.c	2003-10-17 15:58:04.000000000 -0700
++++ 25/drivers/video/aty/aty128fb.c	2003-12-28 23:23:00.000000000 -0800
+@@ -1536,6 +1536,7 @@ aty128_init(struct pci_dev *pdev, const 
+ 	/* fill in info */
+ 	info->fbops = &aty128fb_ops;
+ 	info->flags = FBINFO_FLAG_DEFAULT;
++	info->dev = &pdev->dev;
+ 
+ #ifdef CONFIG_PMAC_PBOOK
+ 	par->lcd_on = default_lcd_on;
+--- linux-2.6.0/drivers/video/cirrusfb.c	2003-06-14 12:18:32.000000000 -0700
++++ 25/drivers/video/cirrusfb.c	2003-12-28 23:23:00.000000000 -0800
+@@ -2528,7 +2528,7 @@ static int __init clgen_pci_setup (struc
+ 
+ 	pdev = clgen_pci_dev_get (btype);
+ 	if (!pdev) {
+-		printk (KERN_ERR " Couldn't find PCI device\n");
++		printk (KERN_INFO "cirrusfb: couldn't find Cirrus Logic PCI device\n");
+ 		DPRINTK ("EXIT, returning 1\n");
+ 		return 1;
+ 	}
+@@ -2787,6 +2787,7 @@ int __init clgenfb_init(void)
+ 	fb_info->gen.info.switch_con = &fbgen_switch;
+ 	fb_info->gen.info.updatevar = &fbgen_update_var;
+ 	fb_info->gen.info.flags = FBINFO_FLAG_DEFAULT;
++	fb_info->gen.info.dev = fb_info->pdev;
+ 
+ 	for (j = 0; j < 256; j++) {
+ 		if (j < 16) {
+--- linux-2.6.0/drivers/video/cyber2000fb.c	2003-08-08 22:55:13.000000000 -0700
++++ 25/drivers/video/cyber2000fb.c	2003-12-28 23:23:00.000000000 -0800
+@@ -1366,6 +1366,7 @@ static int __devinit cyberpro_common_pro
+ 	cfb->fb.fix.smem_len   = smem_size;
+ 	cfb->fb.fix.mmio_len   = MMIO_SIZE;
+ 	cfb->fb.screen_base    = cfb->region;
++	cfb->fb.dev            = &cfb->dev->dev;
+ 
+ 	err = -EINVAL;
+ 	if (!fb_find_mode(&cfb->fb.var, &cfb->fb, NULL, NULL, 0,
+--- linux-2.6.0/drivers/video/fbmem.c	2003-09-08 13:58:58.000000000 -0700
++++ 25/drivers/video/fbmem.c	2003-12-28 23:23:00.000000000 -0800
+@@ -31,6 +31,7 @@
+ #include <linux/kmod.h>
+ #endif
+ #include <linux/devfs_fs_kernel.h>
++#include <linux/device.h>
+ 
+ #if defined(__mc68000__) || defined(CONFIG_APUS)
+ #include <asm/setup.h>
+@@ -1199,6 +1200,10 @@ static struct file_operations fb_fops = 
+ #endif
+ };
+ 
++static struct class fb_class = {
++	.name	= "video",
++};
++
+ /**
+  *	register_framebuffer - registers a frame buffer device
+  *	@fb_info: frame buffer info structure
+@@ -1242,6 +1247,8 @@ register_framebuffer(struct fb_info *fb_
+ 
+ 	devfs_mk_cdev(MKDEV(FB_MAJOR, i),
+ 			S_IFCHR | S_IRUGO | S_IWUGO, "fb/%d", i);
++
++	simple_add_class_device(&fb_class, MKDEV(FB_MAJOR, i), fb_info->dev, "fb%d", i);
+ 	return 0;
+ }
+ 
+@@ -1270,6 +1277,7 @@ unregister_framebuffer(struct fb_info *f
+ 		kfree(fb_info->pixmap.addr);
+ 	registered_fb[i]=NULL;
+ 	num_registered_fb--;
++	simple_remove_class_device(MKDEV(FB_MAJOR, i));
+ 	return 0;
+ }
+ 
+@@ -1294,6 +1302,8 @@ fbmem_init(void)
+ 	if (register_chrdev(FB_MAJOR,"fb",&fb_fops))
+ 		printk("unable to get major %d for fb devs\n", FB_MAJOR);
+ 
++	class_register(&fb_class);
++
+ #ifdef CONFIG_FB_OF
+ 	if (ofonly) {
+ 		offb_init();
+--- linux-2.6.0/drivers/video/fbmon.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/drivers/video/fbmon.c	2003-12-28 23:21:48.000000000 -0800
+@@ -890,30 +890,6 @@ struct __fb_timings {
+ 	u32 vtotal;
+ };
+ 
+-/*
+- * a simple function to get the square root of integers 
+- */
+-static u32 fb_sqrt(int x)
+-{
+-	register int op, res, one;
+-
+-	op = x;
+-	res = 0;
+-
+-	one = 1 << 30;
+-	while (one > op) one >>= 2;
+-
+-	while (one != 0) {
+-		if (op >= res + one) {
+-			op = op - (res + one);
+-			res = res +  2 * one;
+-		}
+-		res /= 2;
+-		one /= 4;
+-	}
+-	return((u32) res);
+-}
+-
+ /**
+  * fb_get_vblank - get vertical blank time
+  * @hfreq: horizontal freq
+@@ -1002,7 +978,7 @@ static u32 fb_get_hblank_by_dclk(u32 dcl
+ 	h_period += (M_VAL * xres * 2 * 1000)/(5 * dclk);
+ 	h_period *=10000; 
+ 
+-	h_period = fb_sqrt((int) h_period);
++	h_period = int_sqrt(h_period);
+ 	h_period -= (100 - C_VAL) * 100;
+ 	h_period *= 1000; 
+ 	h_period /= 2 * M_VAL;
+--- linux-2.6.0/drivers/video/hgafb.c	2003-06-14 12:18:30.000000000 -0700
++++ 25/drivers/video/hgafb.c	2003-12-28 23:22:57.000000000 -0800
+@@ -539,7 +539,7 @@ static struct fb_ops hgafb_ops = {
+ int __init hgafb_init(void)
+ {
+ 	if (! hga_card_detect()) {
+-		printk(KERN_ERR "hgafb: HGA card not detected.\n");
++		printk(KERN_INFO "hgafb: HGA card not detected.\n");
+ 		return -EINVAL;
+ 	}
+ 
+--- linux-2.6.0/drivers/video/i810/i810_main.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/drivers/video/i810/i810_main.c	2003-12-28 23:23:00.000000000 -0800
+@@ -1880,6 +1880,7 @@ static int __devinit i810fb_init_pci (st
+ 	info->fbops = &par->i810fb_ops;
+ 	info->pseudo_palette = par->pseudo_palette;
+ 	info->flags = FBINFO_FLAG_DEFAULT;
++	info->dev = &dev->dev;
+ 	
+ 	fb_alloc_cmap(&info->cmap, 256, 0);
+ 
+--- linux-2.6.0/drivers/video/igafb.c	2003-11-26 13:53:35.000000000 -0800
++++ 25/drivers/video/igafb.c	2003-12-28 23:23:00.000000000 -0800
+@@ -332,7 +332,7 @@ static struct fb_ops igafb_ops = {
+ #endif
+ };
+ 
+-static int __init iga_init(struct fb_info *info, struct iga_par *par)
++static int __init iga_init(struct fb_info *info, struct iga_par *par, struct pci_dev *dev)
+ {
+         char vramsz = iga_inb(par, IGA_EXT_CNTRL, IGA_IDX_EXT_BUS_CNTL) 
+ 		                                         & MEM_SIZE_ALIAS;
+@@ -358,6 +358,7 @@ static int __init iga_init(struct fb_inf
+ 
+ 	info->fbops = &igafb_ops;
+ 	info->flags = FBINFO_FLAG_DEFAULT;
++	info->dev = &dev->dev;
+ 
+ 	fb_alloc_cmap(&info->cmap, video_cmap_len, 0);
+ 
+@@ -529,7 +530,7 @@ int __init igafb_init(void)
+ 	info->fix = igafb_fix;
+ 	info->pseudo_palette = (void *)(par + 1);
+ 
+-	if (!iga_init(info, par)) {
++	if (!iga_init(info, par, pdev)) {
+ 		iounmap((void *)par->io_base);
+ 		iounmap(info->screen_base);
+ 		if (par->mmap_map)
+--- linux-2.6.0/drivers/video/imsttfb.c	2003-10-17 15:58:04.000000000 -0700
++++ 25/drivers/video/imsttfb.c	2003-12-28 23:23:00.000000000 -0800
+@@ -1348,7 +1348,7 @@ static struct fb_ops imsttfb_ops = {
+ };
+ 
+ static void __init 
+-init_imstt(struct fb_info *info)
++init_imstt(struct fb_info *info, struct pci_dev *pdev)
+ {
+ 	struct imstt_par *par = (struct imstt_par *) info->par;
+ 	__u32 i, tmp, *ip, *end;
+@@ -1442,6 +1442,7 @@ init_imstt(struct fb_info *info)
+ 
+ 	info->fbops = &imsttfb_ops;
+ 	info->flags = FBINFO_FLAG_DEFAULT;
++	info->dev = &pdev->dev;
+ 
+ 	fb_alloc_cmap(&info->cmap, 0, 0);
+ 
+@@ -1520,7 +1521,7 @@ imsttfb_probe(struct pci_dev *pdev, cons
+ 	par->cmap_regs = (__u8 *)ioremap(addr + 0x840000, 0x1000);
+ 	info->par = par;
+ 	info->pseudo_palette = (void *) (par + 1);
+-	init_imstt(info);
++	init_imstt(info, pdev);
+ 
+ 	pci_set_drvdata(pdev, info);
+ 	return 0;
+--- linux-2.6.0/drivers/video/matrox/matroxfb_crtc2.c	2003-08-08 22:55:13.000000000 -0700
++++ 25/drivers/video/matrox/matroxfb_crtc2.c	2003-12-28 23:23:00.000000000 -0800
+@@ -605,6 +605,7 @@ static int matroxfb_dh_regit(CPMINFO str
+ 	m2info->fbcon.flags = FBINFO_FLAG_DEFAULT;
+ 	m2info->fbcon.currcon = -1;
+ 	m2info->fbcon.pseudo_palette = m2info->cmap;
++	m2info->fbcon.dev = &m2info->primary_dev->pcidev->dev;
+ 	fb_alloc_cmap(&m2info->fbcon.cmap, 256, 1);
+ 
+ 	if (mem < 64)
+--- linux-2.6.0/drivers/video/neofb.c	2003-08-08 22:55:13.000000000 -0700
++++ 25/drivers/video/neofb.c	2003-12-28 23:23:00.000000000 -0800
+@@ -1943,6 +1943,7 @@ static struct fb_info *__devinit neo_all
+ 	info->flags = FBINFO_FLAG_DEFAULT;
+ 	info->par = par;
+ 	info->pseudo_palette = (void *) (par + 1);
++	info->dev = &dev->dev;
+ 
+ 	fb_alloc_cmap(&info->cmap, NR_PALETTE, 0);
+ 
+--- linux-2.6.0/drivers/video/radeonfb.c	2003-11-23 19:03:01.000000000 -0800
++++ 25/drivers/video/radeonfb.c	2003-12-28 23:23:00.000000000 -0800
+@@ -679,7 +679,7 @@ static __inline__ int _max(int val1, int
+  */
+         
+ static char *mode_option __initdata;
+-static char noaccel = 1;
++static char noaccel = 0;
+ static char mirror = 0;
+ static int panel_yres __initdata = 0;
+ static char force_dfp __initdata = 0;
+@@ -1099,7 +1099,7 @@ static int radeon_get_dfpinfo_BIOS(struc
+ 	printk("radeonfb: detected DFP panel size from BIOS: %dx%d\n",
+ 		rinfo->panel_xres, rinfo->panel_yres);
+ 
+-	for(i=0; i<20; i++) {
++	for(i=0; i<21; i++) {
+ 		tmp0 = rinfo->bios_seg + readw(tmp+64+i*2);
+ 		if (tmp0 == 0)
+ 			break;
+@@ -1241,9 +1241,6 @@ static void radeon_engine_init (struct r
+ 	radeon_fifo_wait (1);
+ 	OUTREG(RB2D_DSTCACHE_MODE, 0);
+ 
+-	/* XXX */
+-	rinfo->pitch = ((rinfo->xres_virtual * (rinfo->bpp / 8) + 0x3f)) >> 6;
+-
+ 	radeon_fifo_wait (1);
+ 	temp = INREG(DEFAULT_PITCH_OFFSET);
+ 	OUTREG(DEFAULT_PITCH_OFFSET, ((temp & 0xc0000000) | 
+@@ -1782,6 +1779,7 @@ static int radeonfb_set_par (struct fb_i
+ 	int hsync_start, hsync_fudge, bytpp, hsync_wid, vsync_wid;
+ 	int primary_mon = PRIMARY_MONITOR(rinfo);
+ 	int depth = var_to_depth(mode);
++        int accel = (mode->accel_flags & FB_ACCELF_TEXT) != 0;
+ 
+ 	rinfo->xres = mode->xres;
+ 	rinfo->yres = mode->yres;
+@@ -1878,7 +1876,15 @@ static int radeonfb_set_par (struct fb_i
+ 	newmode.crtc_v_sync_strt_wid = (((vSyncStart - 1) & 0xfff) |
+ 					 (vsync_wid << 16) | (v_sync_pol  << 23));
+ 
+-	newmode.crtc_pitch = (mode->xres_virtual >> 3);
++	if (accel) {
++		/* We first calculate the engine pitch */
++		rinfo->pitch = ((mode->xres_virtual * ((mode->bits_per_pixel + 1) / 8) + 0x3f)
++ 				& ~(0x3f)) >> 6;
++
++		/* Then, re-multiply it to get the CRTC pitch */
++		newmode.crtc_pitch = (rinfo->pitch << 3) / ((mode->bits_per_pixel + 1) / 8);
++	} else
++		newmode.crtc_pitch = (mode->xres_virtual >> 3);
+ 	newmode.crtc_pitch |= (newmode.crtc_pitch << 16);
+ 
+ #if defined(__BIG_ENDIAN)
+@@ -2085,18 +2091,21 @@ static int radeonfb_set_par (struct fb_i
+ 	if (!rinfo->asleep) {
+ 		radeon_write_mode (rinfo, &newmode);
+ 		/* (re)initialize the engine */
+-		if (!noaccel)
++		if (noaccel)
+ 			radeon_engine_init (rinfo);
+ 	
+ 	}
+ 	/* Update fix */
+-        info->fix.line_length = rinfo->pitch*64;
++	if (accel)
++        	info->fix.line_length = rinfo->pitch*64;
++        else
++		info->fix.line_length = mode->xres_virtual * ((mode->bits_per_pixel + 1) / 8);
+         info->fix.visual = rinfo->depth == 8 ? FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_DIRECTCOLOR;
+ 
+ #ifdef CONFIG_BOOTX_TEXT
+ 	/* Update debug text engine */
+ 	btext_update_display(rinfo->fb_base_phys, mode->xres, mode->yres,
+-			     rinfo->depth, rinfo->pitch*64);
++			     rinfo->depth, info->fix.line_length);
+ #endif
+ 
+ 	return 0;
+@@ -3022,17 +3031,13 @@ static int radeonfb_pci_register (struct
+ 	 */
+ 	radeon_save_state (rinfo, &rinfo->init_state);
+ 
+-	if (!noaccel) {
+-		/* initialize the engine */
+-		radeon_engine_init (rinfo);
+-	}
+-
+ 	/* set all the vital stuff */
+ 	radeon_set_fbinfo (rinfo);
+ 
+ 	pci_set_drvdata(pdev, rinfo);
+ 	rinfo->next = board_list;
+ 	board_list = rinfo;
++	rinfo->info.dev = &pdev->dev;
+ 
+ 	if (register_framebuffer ((struct fb_info *) rinfo) < 0) {
+ 		printk ("radeonfb: could not register framebuffer\n");
+--- linux-2.6.0/drivers/video/riva/fbdev.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/drivers/video/riva/fbdev.c	2003-12-28 23:23:00.000000000 -0800
+@@ -1751,6 +1751,7 @@ static int __devinit rivafb_probe(struct
+ 	if (info->pixmap.addr == NULL)
+ 		goto err_out_kfree1;
+ 	memset(info->pixmap.addr, 0, 64 * 1024);
++	info->dev = &pd->dev;
+ 
+ 	strcat(rivafb_fix.id, rci->name);
+ 	default_par->riva.Architecture = rci->arch_rev;
+--- linux-2.6.0/drivers/video/sis/init301.c	2003-07-13 21:44:34.000000000 -0700
++++ 25/drivers/video/sis/init301.c	2003-12-28 23:22:17.000000000 -0800
+@@ -11712,7 +11712,7 @@ SetOEMLCDData(SiS_Private *SiS_Pr, PSIS_
+   }
+ 
+   temp = GetOEMLCDPtr(SiS_Pr,HwDeviceExtension, ROMAddr, 1);
+-  if(temp = 0xFFFF) return;
++  if(temp == 0xFFFF) return;
+ 
+   index = SiS_Pr->SiS_VBModeIDTable[ModeIdIndex]._VB_LCDHIndex;
+   for(i=0x14, j=0; i<=0x17; i++, j++) {
+--- linux-2.6.0/drivers/video/sis/sis_main.c	2003-06-14 12:18:25.000000000 -0700
++++ 25/drivers/video/sis/sis_main.c	2003-12-28 23:23:00.000000000 -0800
+@@ -4507,6 +4507,7 @@ int __init sisfb_init(void)
+ 		sis_fb_info.par = &ivideo;
+ 		sis_fb_info.screen_base = ivideo.video_vbase;
+ 		sis_fb_info.fbops = &sisfb_ops;
++		sis_fb_info.dev = &pdev->dev;
+ 		sisfb_get_fix(&sis_fb_info.fix, -1, &sis_fb_info);
+ 		sis_fb_info.pseudo_palette = pseudo_palette;
+ 		
+--- linux-2.6.0/drivers/video/sstfb.c	2003-10-08 15:07:09.000000000 -0700
++++ 25/drivers/video/sstfb.c	2003-12-28 23:23:00.000000000 -0800
+@@ -1477,6 +1477,7 @@ static int __devinit sstfb_probe(struct 
+ 	info->fbops	= &sstfb_ops;
+ 	info->currcon	= -1;
+ 	info->pseudo_palette = &all->pseudo_palette;
++	info->dev	= &pdev->dev;
+ 
+ 	fix->type	= FB_TYPE_PACKED_PIXELS;
+ 	fix->visual	= FB_VISUAL_TRUECOLOR;
+--- linux-2.6.0/drivers/video/tdfxfb.c	2003-08-08 22:55:13.000000000 -0700
++++ 25/drivers/video/tdfxfb.c	2003-12-28 23:23:00.000000000 -0800
+@@ -1248,6 +1248,7 @@ static int __devinit tdfxfb_probe(struct
+ 	info->par		= default_par;
+ 	info->pseudo_palette	= (void *)(default_par + 1); 
+ 	info->flags		= FBINFO_FLAG_DEFAULT;
++	info->dev		= &pdev->dev;
+ 
+ #ifndef MODULE
+ 	if (!mode_option)
+--- linux-2.6.0/drivers/video/tgafb.c	2003-06-14 12:18:28.000000000 -0700
++++ 25/drivers/video/tgafb.c	2003-12-28 23:23:00.000000000 -0800
+@@ -1430,6 +1430,7 @@ tgafb_pci_register(struct pci_dev *pdev,
+ 	all->info.currcon = -1;
+ 	all->info.par = &all->par;
+ 	all->info.pseudo_palette = all->pseudo_palette;
++	all->info.dev = &pdev->dev;
+ 
+ 	/* This should give a reasonable default video mode.  */
+ 
+--- linux-2.6.0/drivers/video/tridentfb.c	2003-10-17 15:58:04.000000000 -0700
++++ 25/drivers/video/tridentfb.c	2003-12-28 23:23:02.000000000 -0800
+@@ -723,7 +723,7 @@ static int tridentfb_check_var(struct fb
+ 	if (bpp == 24 )
+ 		bpp = var->bits_per_pixel = 32;
+ 	/* check whether resolution fits on panel and in memory*/
+-	if (var->xres > nativex)
++	if (flatpanel && nativex && var->xres > nativex)
+ 		return -EINVAL;
+ 	if (var->xres * var->yres_virtual * bpp/8 > info->fix.smem_len)
+ 		return -EINVAL;
+@@ -1156,6 +1156,7 @@ static int __devinit trident_pci_probe(s
+ 		default_var.accel_flags &= ~FB_ACCELF_TEXT;
+ 	default_var.activate |= FB_ACTIVATE_NOW;
+ 	fb_info.var = default_var;
++	fb_info.dev = &dev->dev;
+ 	if (register_framebuffer(&fb_info) < 0) {
+ 		output("Could not register Trident framebuffer\n");
+ 		return -EINVAL;
+--- linux-2.6.0/fs/aio.c	2003-11-23 19:03:01.000000000 -0800
++++ 25/fs/aio.c	2003-12-28 23:26:44.000000000 -0800
+@@ -27,6 +27,8 @@
+ #include <linux/aio.h>
+ #include <linux/highmem.h>
+ #include <linux/workqueue.h>
++#include <linux/writeback.h>
++#include <linux/pagemap.h>
+ 
+ #include <asm/kmap_types.h>
+ #include <asm/uaccess.h>
+@@ -38,6 +40,9 @@
+ #define dprintk(x...)	do { ; } while (0)
+ #endif
+ 
++long aio_run = 0; /* for testing only */
++long aio_wakeups = 0; /* for testing only */
++
+ /*------ sysctl variables----*/
+ atomic_t aio_nr = ATOMIC_INIT(0);	/* current system wide number of aio requests */
+ unsigned aio_max_nr = 0x10000;	/* system wide maximum number of aio requests */
+@@ -47,6 +52,7 @@ static kmem_cache_t	*kiocb_cachep;
+ static kmem_cache_t	*kioctx_cachep;
+ 
+ static struct workqueue_struct *aio_wq;
++static struct workqueue_struct *aio_fput_wq;
+ 
+ /* Used for rare fput completion. */
+ static void aio_fput_routine(void *);
+@@ -74,6 +80,7 @@ static int __init aio_setup(void)
+ 		panic("unable to create kioctx cache");
+ 
+ 	aio_wq = create_workqueue("aio");
++	aio_fput_wq = create_workqueue("aio_fput");
+ 
+ 	pr_debug("aio_setup: sizeof(struct page) = %d\n", (int)sizeof(struct page));
+ 
+@@ -281,6 +288,7 @@ static void aio_cancel_all(struct kioctx
+ 		struct kiocb *iocb = list_kiocb(pos);
+ 		list_del_init(&iocb->ki_list);
+ 		cancel = iocb->ki_cancel;
++		kiocbSetCancelled(iocb);
+ 		if (cancel) {
+ 			iocb->ki_users++;
+ 			spin_unlock_irq(&ctx->ctx_lock);
+@@ -341,6 +349,11 @@ void exit_aio(struct mm_struct *mm)
+ 		aio_cancel_all(ctx);
+ 
+ 		wait_for_all_aios(ctx);
++		/*
++		 * this is an overkill, but ensures we don't leave
++		 * the ctx on the aio_wq
++		 */
++		flush_workqueue(aio_wq);
+ 
+ 		if (1 != atomic_read(&ctx->users))
+ 			printk(KERN_DEBUG
+@@ -400,6 +413,7 @@ static struct kiocb *__aio_get_req(struc
+ 	req->ki_cancel = NULL;
+ 	req->ki_retry = NULL;
+ 	req->ki_user_obj = NULL;
++	INIT_LIST_HEAD(&req->ki_run_list);
+ 
+ 	/* Check if the completion queue has enough free space to
+ 	 * accept an event from this io.
+@@ -499,7 +513,7 @@ static int __aio_put_req(struct kioctx *
+ 		spin_lock(&fput_lock);
+ 		list_add(&req->ki_list, &fput_head);
+ 		spin_unlock(&fput_lock);
+-		queue_work(aio_wq, &fput_work);
++		queue_work(aio_fput_wq, &fput_work);
+ 	} else
+ 		really_put_req(ctx, req);
+ 	return 1;
+@@ -541,65 +555,324 @@ struct kioctx *lookup_ioctx(unsigned lon
+ 	return ioctx;
+ }
+ 
++/*
++ * use_mm
++ * 	Makes the calling kernel thread take on the specified
++ * 	mm context.
++ * 	Called by the retry thread execute retries within the
++ * 	iocb issuer's mm context, so that copy_from/to_user
++ * 	operations work seamlessly for aio.
++ * 	(Note: this routine is intended to be called only
++ * 	from a kernel thread context)
++ */
+ static void use_mm(struct mm_struct *mm)
+ {
+-	struct mm_struct *active_mm = current->active_mm;
++	struct mm_struct *active_mm;
++	struct task_struct *tsk = current;
++
++	task_lock(tsk);
++	active_mm = tsk->active_mm;
+ 	atomic_inc(&mm->mm_count);
+-	current->mm = mm;
+-	if (mm != active_mm) {
+-		current->active_mm = mm;
+-		activate_mm(active_mm, mm);
+-	}
++	tsk->mm = mm;
++	tsk->active_mm = mm;
++	activate_mm(active_mm, mm);
++	task_unlock(tsk);
++
+ 	mmdrop(active_mm);
+ }
+ 
+-static void unuse_mm(struct mm_struct *mm)
++/*
++ * unuse_mm
++ * 	Reverses the effect of use_mm, i.e. releases the
++ * 	specified mm context which was earlier taken on
++ * 	by the calling kernel thread
++ * 	(Note: this routine is intended to be called only
++ * 	from a kernel thread context)
++ *
++ * Comments: Called with ctx->ctx_lock held. This nests
++ * task_lock instead ctx_lock.
++ */
++void unuse_mm(struct mm_struct *mm)
+ {
+-	current->mm = NULL;
++	struct task_struct *tsk = current;
++
++	task_lock(tsk);
++	tsk->mm = NULL;
+ 	/* active_mm is still 'mm' */
+-	enter_lazy_tlb(mm, current);
++	enter_lazy_tlb(mm, tsk);
++	task_unlock(tsk);
+ }
+ 
+-/* Run on kevent's context.  FIXME: needs to be per-cpu and warn if an
+- * operation blocks.
++/*
++ * Queue up a kiocb to be retried. Assumes that the kiocb
++ * has already been marked as kicked, and places it on
++ * the retry run list for the corresponding ioctx, if it
++ * isn't already queued. Returns 1 if it actually queued
++ * the kiocb (to tell the caller to activate the work
++ * queue to process it), or 0, if it found that it was
++ * already queued.
++ *
++ * Should be called with the spin lock iocb->ki_ctx->ctx_lock
++ * held
+  */
+-static void aio_kick_handler(void *data)
++static inline int __queue_kicked_iocb(struct kiocb *iocb)
+ {
+-	struct kioctx *ctx = data;
++	struct kioctx	*ctx = iocb->ki_ctx;
+ 
+-	use_mm(ctx->mm);
++	if (list_empty(&iocb->ki_run_list)) {
++		list_add_tail(&iocb->ki_run_list,
++			&ctx->run_list);
++		iocb->ki_queued++;
++		return 1;
++	}
++	return 0;
++}
+ 
+-	spin_lock_irq(&ctx->ctx_lock);
+-	while (!list_empty(&ctx->run_list)) {
+-		struct kiocb *iocb;
+-		long ret;
++/* aio_run_iocb
++ * 	 This is the core aio execution routine. It is
++ * 	 invoked both for initial i/o submission and
++ * 	 subsequent retries via the aio_kick_handler.
++ *       Expects to be invoked with iocb->ki_ctx->lock
++ *       already held. The lock is released and reaquired
++ *       as needed during processing.
++ *
++ * Calls the iocb retry method (already setup for the
++ * iocb on initial submission) for operation specific
++ * handling, but takes care of most of common retry
++ * execution details for a given iocb. The retry method
++ * needs to be non-blocking as far as possible, to avoid
++ * holding up other iocbs waiting to be serviced by the
++ * retry kernel thread.
++ *
++ * The trickier parts in this code have to do with
++ * ensuring that only one retry instance is in progress
++ * for a given iocb at any time. Providing that guarantee
++ * simplifies the coding of individual aio operations as
++ * it avoids various potential races.
++ */
++static ssize_t aio_run_iocb(struct kiocb *iocb)
++{
++	struct kioctx	*ctx = iocb->ki_ctx;
++	ssize_t (*retry)(struct kiocb *);
++	ssize_t ret;
+ 
+-		iocb = list_entry(ctx->run_list.next, struct kiocb,
+-				  ki_run_list);
+-		list_del(&iocb->ki_run_list);
+-		iocb->ki_users ++;
+-		spin_unlock_irq(&ctx->ctx_lock);
++	if (iocb->ki_retried++ > 1024*1024) {
++		printk("Maximal retry count.  Bytes done %Zd\n",
++			iocb->ki_nbytes - iocb->ki_left);
++		return -EAGAIN;
++	}
+ 
+-		kiocbClearKicked(iocb);
+-		ret = iocb->ki_retry(iocb);
++	if (!(iocb->ki_retried & 0xff)) {
++		pr_debug("%ld retry: %d of %d (kick %ld, Q %ld run %ld, wake %ld)\n",
++			iocb->ki_retried,
++			iocb->ki_nbytes - iocb->ki_left, iocb->ki_nbytes,
++			iocb->ki_kicked, iocb->ki_queued, aio_run, aio_wakeups);
++	}
++
++	if (!(retry = iocb->ki_retry)) {
++		printk("aio_run_iocb: iocb->ki_retry = NULL\n");
++		return 0;
++	}
++
++	/*
++	 * We don't want the next retry iteration for this
++	 * operation to start until this one has returned and
++	 * updated the iocb state. However, wait_queue functions
++	 * can trigger a kick_iocb from interrupt context in the
++	 * meantime, indicating that data is available for the next
++	 * iteration. We want to remember that and enable the
++	 * next retry iteration _after_ we are through with
++	 * this one.
++	 *
++	 * So, in order to be able to register a "kick", but
++	 * prevent it from being queued now, we clear the kick
++	 * flag, but make the kick code *think* that the iocb is
++	 * still on the run list until we are actually done.
++	 * When we are done with this iteration, we check if
++	 * the iocb was kicked in the meantime and if so, queue
++	 * it up afresh.
++	 */
++
++	kiocbClearKicked(iocb);
++
++	/*
++	 * This is so that aio_complete knows it doesn't need to
++	 * pull the iocb off the run list (We can't just call
++	 * INIT_LIST_HEAD because we don't want a kick_iocb to
++	 * queue this on the run list yet)
++	 */
++	iocb->ki_run_list.next = iocb->ki_run_list.prev = NULL;
++	iocb->ki_retry = NULL;
++	spin_unlock_irq(&ctx->ctx_lock);
++
++	/* Quit retrying if the i/o has been cancelled */
++	if (kiocbIsCancelled(iocb)) {
++		ret = -EINTR;
++		aio_complete(iocb, ret, 0);
++		/* must not access the iocb after this */
++		goto out;
++	}
++
++	/*
++	 * Now we are all set to call the retry method in async
++	 * context. By setting this thread's io_wait context
++	 * to point to the wait queue entry inside the currently
++	 * running iocb for the duration of the retry, we ensure
++	 * that async notification wakeups are queued by the
++	 * operation instead of blocking waits, and when notified,
++	 * cause the iocb to be kicked for continuation (through
++	 * the aio_wake_function callback).
++	 */
++	BUG_ON(current->io_wait != NULL);
++	current->io_wait = &iocb->ki_wait;
++	ret = retry(iocb);
++	current->io_wait = NULL;
++
++	if (-EIOCBRETRY != ret) {
+ 		if (-EIOCBQUEUED != ret) {
++			BUG_ON(!list_empty(&iocb->ki_wait.task_list));
+ 			aio_complete(iocb, ret, 0);
+-			iocb = NULL;
++			/* must not access the iocb after this */
+ 		}
++	} else {
++		/*
++		 * Issue an additional retry to avoid waiting forever if
++		 * no waits were queued (e.g. in case of a short read).
++		 */
++		if (list_empty(&iocb->ki_wait.task_list))
++			kiocbSetKicked(iocb);
++	}
++out:
++	spin_lock_irq(&ctx->ctx_lock);
+ 
+-		spin_lock_irq(&ctx->ctx_lock);
+-		if (NULL != iocb)
+-			__aio_put_req(ctx, iocb);
++	if (-EIOCBRETRY == ret) {
++		/*
++		 * OK, now that we are done with this iteration
++		 * and know that there is more left to go,
++		 * this is where we let go so that a subsequent
++		 * "kick" can start the next iteration
++		 */
++		iocb->ki_retry = retry;
++		/* will make __queue_kicked_iocb succeed from here on */
++		INIT_LIST_HEAD(&iocb->ki_run_list);
++		/* we must queue the next iteration ourselves, if it
++		 * has already been kicked */
++		if (kiocbIsKicked(iocb)) {
++			__queue_kicked_iocb(iocb);
++		}
+ 	}
++	return ret;
++}
++
++/*
++ * __aio_run_iocbs:
++ * 	Process all pending retries queued on the ioctx
++ * 	run list.
++ * Assumes it is operating within the aio issuer's mm
++ * context. Expects to be called with ctx->ctx_lock held
++ */
++static int __aio_run_iocbs(struct kioctx *ctx)
++{
++	struct kiocb *iocb;
++	int count = 0;
++	LIST_HEAD(run_list);
++
++	list_splice_init(&ctx->run_list, &run_list);
++	while (!list_empty(&run_list)) {
++		iocb = list_entry(run_list.next, struct kiocb,
++			ki_run_list);
++		list_del(&iocb->ki_run_list);
++		/*
++		 * Hold an extra reference while retrying i/o.
++		 */
++		iocb->ki_users++;	/* grab extra reference */
++		aio_run_iocb(iocb);
++		if (__aio_put_req(ctx, iocb))  /* drop extra ref */
++			put_ioctx(ctx);
++		count++;
++	}
++	aio_run++;
++	if (!list_empty(&ctx->run_list))
++		return 1;
++	return 0;
++}
++
++/*
++ * aio_run_iocbs:
++ * 	Process all pending retries queued on the ioctx
++ * 	run list.
++ * Assumes it is operating within the aio issuer's mm
++ * context.
++ */
++static inline void aio_run_iocbs(struct kioctx *ctx)
++{
++	int requeue;
++
++	spin_lock_irq(&ctx->ctx_lock);
++	requeue = __aio_run_iocbs(ctx);
+ 	spin_unlock_irq(&ctx->ctx_lock);
++	if (requeue)
++		queue_work(aio_wq, &ctx->wq);
++}
+ 
++/*
++ * aio_kick_handler:
++ * 	Work queue handler triggered to process pending
++ * 	retries on an ioctx. Takes on the aio issuer's
++ * 	mm context before running the iocbs, so that
++ * 	copy_xxx_user operates on the issuer's address
++ * 	space.
++ * Run on aiod's context.
++ */
++static void aio_kick_handler(void *data)
++{
++	struct kioctx *ctx = data;
++	mm_segment_t oldfs = get_fs();
++	int requeue;
++
++	set_fs(USER_DS);
++	use_mm(ctx->mm);
++	spin_lock_irq(&ctx->ctx_lock);
++	requeue = __aio_run_iocbs(ctx);
+ 	unuse_mm(ctx->mm);
++	spin_unlock_irq(&ctx->ctx_lock);
++	set_fs(oldfs);
++	if (requeue)
++		queue_work(aio_wq, &ctx->wq);
+ }
+ 
+-void kick_iocb(struct kiocb *iocb)
++
++/*
++ * Called by kick_iocb to queue the kiocb for retry
++ * and if required activate the aio work queue to process
++ * it
++ */
++void queue_kicked_iocb(struct kiocb *iocb)
+ {
+ 	struct kioctx	*ctx = iocb->ki_ctx;
++	unsigned long flags;
++	int run = 0;
++
++	WARN_ON((!list_empty(&iocb->ki_wait.task_list)));
+ 
++	spin_lock_irqsave(&ctx->ctx_lock, flags);
++	run = __queue_kicked_iocb(iocb);
++	spin_unlock_irqrestore(&ctx->ctx_lock, flags);
++	if (run) {
++		queue_work(aio_wq, &ctx->wq);
++		aio_wakeups++;
++	}
++}
++
++/*
++ * kick_iocb:
++ * 	Called typically from a wait queue callback context
++ * 	(aio_wake_function) to trigger a retry of the iocb.
++ * 	The retry is usually executed by aio workqueue
++ * 	threads (See aio_kick_handler).
++ */
++void kick_iocb(struct kiocb *iocb)
++{
+ 	/* sync iocbs are easy: they can only ever be executing from a 
+ 	 * single context. */
+ 	if (is_sync_kiocb(iocb)) {
+@@ -608,12 +881,10 @@ void kick_iocb(struct kiocb *iocb)
+ 		return;
+ 	}
+ 
++	iocb->ki_kicked++;
++	/* If its already kicked we shouldn't queue it again */
+ 	if (!kiocbTryKick(iocb)) {
+-		unsigned long flags;
+-		spin_lock_irqsave(&ctx->ctx_lock, flags);
+-		list_add_tail(&iocb->ki_run_list, &ctx->run_list);
+-		spin_unlock_irqrestore(&ctx->ctx_lock, flags);
+-		schedule_work(&ctx->wq);
++		queue_kicked_iocb(iocb);
+ 	}
+ }
+ 
+@@ -666,6 +937,9 @@ int aio_complete(struct kiocb *iocb, lon
+ 	 */
+ 	spin_lock_irqsave(&ctx->ctx_lock, flags);
+ 
++	if (iocb->ki_run_list.prev && !list_empty(&iocb->ki_run_list))
++		list_del_init(&iocb->ki_run_list);
++
+ 	ring = kmap_atomic(info->ring_pages[0], KM_IRQ1);
+ 
+ 	tail = info->tail;
+@@ -694,6 +968,11 @@ int aio_complete(struct kiocb *iocb, lon
+ 
+ 	pr_debug("added to ring %p at [%lu]\n", iocb, tail);
+ 
++	pr_debug("%ld retries: %d of %d (kicked %ld, Q %ld run %ld wake %ld)\n",
++		iocb->ki_retried,
++		iocb->ki_nbytes - iocb->ki_left, iocb->ki_nbytes,
++		iocb->ki_kicked, iocb->ki_queued, aio_run, aio_wakeups);
++
+ 	/* everything turned out well, dispose of the aiocb. */
+ 	ret = __aio_put_req(ctx, iocb);
+ 
+@@ -808,6 +1087,7 @@ static int read_events(struct kioctx *ct
+ 	int			i = 0;
+ 	struct io_event		ent;
+ 	struct timeout		to;
++	int 			event_loop = 0; /* testing only */
+ 
+ 	/* needed to zero any padding within an entry (there shouldn't be 
+ 	 * any, but C is fun!
+@@ -857,7 +1137,6 @@ static int read_events(struct kioctx *ct
+ 		add_wait_queue_exclusive(&ctx->wait, &wait);
+ 		do {
+ 			set_task_state(tsk, TASK_INTERRUPTIBLE);
+-
+ 			ret = aio_read_evt(ctx, &ent);
+ 			if (ret)
+ 				break;
+@@ -867,6 +1146,7 @@ static int read_events(struct kioctx *ct
+ 			if (to.timed_out)	/* Only check after read evt */
+ 				break;
+ 			schedule();
++			event_loop++;
+ 			if (signal_pending(tsk)) {
+ 				ret = -EINTR;
+ 				break;
+@@ -894,6 +1174,9 @@ static int read_events(struct kioctx *ct
+ 	if (timeout)
+ 		clear_timeout(&to);
+ out:
++	pr_debug("event loop executed %d times\n", event_loop);
++	pr_debug("aio_run %ld\n", aio_run);
++	pr_debug("aio_wakeups %ld\n", aio_wakeups);
+ 	return i ? i : ret;
+ }
+ 
+@@ -923,6 +1206,11 @@ static void io_destroy(struct kioctx *io
+ 
+ 	aio_cancel_all(ioctx);
+ 	wait_for_all_aios(ioctx);
++	/*
++	 * this is an overkill, but ensures we don't leave
++	 * the ctx on the aio_wq
++	 */
++	flush_workqueue(aio_wq);
+ 	put_ioctx(ioctx);	/* once for the lookup */
+ }
+ 
+@@ -985,13 +1273,191 @@ asmlinkage long sys_io_destroy(aio_conte
+ 	return -EINVAL;
+ }
+ 
++/*
++ * Retry method for aio_read (also used for first time submit)
++ * Responsible for updating iocb state as retries progress
++ */
++static ssize_t aio_pread(struct kiocb *iocb)
++{
++	struct file *file = iocb->ki_filp;
++	ssize_t ret = 0;
++
++	ret = file->f_op->aio_read(iocb, iocb->ki_buf,
++		iocb->ki_left, iocb->ki_pos);
++
++	/*
++	 * Can't just depend on iocb->ki_left to determine
++	 * whether we are done. This may have been a short read.
++	 */
++	if (ret > 0) {
++		iocb->ki_buf += ret;
++		iocb->ki_left -= ret;
++
++		ret = -EIOCBRETRY;
++	}
++
++	/* This means we must have transferred all that we could */
++	/* No need to retry anymore */
++	if ((ret == 0) || (iocb->ki_left == 0))
++		ret = iocb->ki_nbytes - iocb->ki_left;
++
++	return ret;
++}
++
++/*
++ * Retry method for aio_write (also used for first time submit)
++ * Responsible for updating iocb state as retries progress
++ */
++static ssize_t aio_pwrite(struct kiocb *iocb)
++{
++	struct file *file = iocb->ki_filp;
++	struct address_space *mapping = file->f_mapping;
++	struct inode *inode = mapping->host;
++	ssize_t ret = 0;
++
++	ret = file->f_op->aio_write(iocb, iocb->ki_buf,
++				iocb->ki_left, iocb->ki_pos);
++
++	/*
++	 * Even if iocb->ki_left = 0, we may need to wait
++	 * for a balance_dirty_pages to complete
++	 */
++	if (ret > 0) {
++		iocb->ki_buf += iocb->ki_buf ? ret : 0;
++		iocb->ki_left -= ret;
++
++		ret = -EIOCBRETRY;
++	}
++
++	/* This means we must have transferred all that we could */
++	/* No need to retry anymore unless we need to osync data */
++	if (ret == 0) {
++		ret = iocb->ki_nbytes - iocb->ki_left;
++		if (!iocb->ki_buf)
++			return ret;
++
++		/* Set things up for potential O_SYNC */
++		if (ret > 0 && ((file->f_flags & O_SYNC) || IS_SYNC(inode))) {
++			iocb->ki_buf = NULL;
++			iocb->ki_pos -= ret; /* back up fpos */
++			iocb->ki_left = ret; /* sync what we have written out */
++			iocb->ki_nbytes = ret;
++			ret = -EIOCBRETRY;
++		}
++	}
++
++	return ret;
++}
++
++static ssize_t aio_fdsync(struct kiocb *iocb)
++{
++	struct file *file = iocb->ki_filp;
++	ssize_t ret = -EINVAL;
++
++	if (file->f_op->aio_fsync)
++		ret = file->f_op->aio_fsync(iocb, 1);
++	return ret;
++}
++
++static ssize_t aio_fsync(struct kiocb *iocb)
++{
++	struct file *file = iocb->ki_filp;
++	ssize_t ret = -EINVAL;
++
++	if (file->f_op->aio_fsync)
++		ret = file->f_op->aio_fsync(iocb, 0);
++	return ret;
++}
++
++/*
++ * aio_setup_iocb:
++ *	Performs the initial checks and aio retry method
++ *	setup for the kiocb at the time of io submission.
++ */
++ssize_t aio_setup_iocb(struct kiocb *kiocb)
++{
++	struct file *file = kiocb->ki_filp;
++	ssize_t ret = 0;
++
++	switch (kiocb->ki_opcode) {
++	case IOCB_CMD_PREAD:
++		ret = -EBADF;
++		if (unlikely(!(file->f_mode & FMODE_READ)))
++			break;
++		ret = -EFAULT;
++		if (unlikely(!access_ok(VERIFY_WRITE, kiocb->ki_buf,
++			kiocb->ki_left)))
++			break;
++		ret = -EINVAL;
++		if (file->f_op->aio_read)
++			kiocb->ki_retry = aio_pread;
++		break;
++	case IOCB_CMD_PWRITE:
++		ret = -EBADF;
++		if (unlikely(!(file->f_mode & FMODE_WRITE)))
++			break;
++		ret = -EFAULT;
++		if (unlikely(!access_ok(VERIFY_READ, kiocb->ki_buf,
++			kiocb->ki_left)))
++			break;
++		ret = -EINVAL;
++		if (file->f_op->aio_write)
++			kiocb->ki_retry = aio_pwrite;
++		break;
++	case IOCB_CMD_FDSYNC:
++		ret = -EINVAL;
++		if (file->f_op->aio_fsync)
++			kiocb->ki_retry = aio_fdsync;
++		break;
++	case IOCB_CMD_FSYNC:
++		ret = -EINVAL;
++		if (file->f_op->aio_fsync)
++			kiocb->ki_retry = aio_fsync;
++		break;
++	default:
++		dprintk("EINVAL: io_submit: no operation provided\n");
++		ret = -EINVAL;
++	}
++
++	if (!kiocb->ki_retry)
++		return ret;
++
++	return 0;
++}
++
++/*
++ * aio_wake_function:
++ * 	wait queue callback function for aio notification,
++ * 	Simply triggers a retry of the operation via kick_iocb.
++ *
++ * 	This callback is specified in the wait queue entry in
++ *	a kiocb	(current->io_wait points to this wait queue
++ *	entry when an aio operation executes; it is used
++ * 	instead of a synchronous wait when an i/o blocking
++ *	condition is encountered during aio).
++ *
++ * Note:
++ * This routine is executed with the wait queue lock held.
++ * Since kick_iocb acquires iocb->ctx->ctx_lock, it nests
++ * the ioctx lock inside the wait queue lock. This is safe
++ * because this callback isn't used for wait queues which
++ * are nested inside ioctx lock (i.e. ctx->wait)
++ */
++int aio_wake_function(wait_queue_t *wait, unsigned mode, int sync)
++{
++	struct kiocb *iocb = container_of(wait, struct kiocb, ki_wait);
++
++	list_del_init(&wait->task_list);
++	kick_iocb(iocb);
++	return 1;
++}
++
+ int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
+ 			 struct iocb *iocb)
+ {
+ 	struct kiocb *req;
+ 	struct file *file;
+ 	ssize_t ret;
+-	char *buf;
+ 
+ 	/* enforce forwards compatibility on users */
+ 	if (unlikely(iocb->aio_reserved1 || iocb->aio_reserved2 ||
+@@ -1032,52 +1498,31 @@ int io_submit_one(struct kioctx *ctx, st
+ 	req->ki_user_data = iocb->aio_data;
+ 	req->ki_pos = iocb->aio_offset;
+ 
+-	buf = (char *)(unsigned long)iocb->aio_buf;
++	req->ki_buf = (char *)(unsigned long)iocb->aio_buf;
++	req->ki_left = req->ki_nbytes = iocb->aio_nbytes;
++	req->ki_opcode = iocb->aio_lio_opcode;
++	init_waitqueue_func_entry(&req->ki_wait, aio_wake_function);
++	INIT_LIST_HEAD(&req->ki_wait.task_list);
++	req->ki_run_list.next = req->ki_run_list.prev = NULL;
++	req->ki_retry = NULL;
++	req->ki_retried = 0;
++	req->ki_kicked = 0;
++	req->ki_queued = 0;
++	aio_run = 0;
++	aio_wakeups = 0;
+ 
+-	switch (iocb->aio_lio_opcode) {
+-	case IOCB_CMD_PREAD:
+-		ret = -EBADF;
+-		if (unlikely(!(file->f_mode & FMODE_READ)))
+-			goto out_put_req;
+-		ret = -EFAULT;
+-		if (unlikely(!access_ok(VERIFY_WRITE, buf, iocb->aio_nbytes)))
+-			goto out_put_req;
+-		ret = -EINVAL;
+-		if (file->f_op->aio_read)
+-			ret = file->f_op->aio_read(req, buf,
+-					iocb->aio_nbytes, req->ki_pos);
+-		break;
+-	case IOCB_CMD_PWRITE:
+-		ret = -EBADF;
+-		if (unlikely(!(file->f_mode & FMODE_WRITE)))
+-			goto out_put_req;
+-		ret = -EFAULT;
+-		if (unlikely(!access_ok(VERIFY_READ, buf, iocb->aio_nbytes)))
+-			goto out_put_req;
+-		ret = -EINVAL;
+-		if (file->f_op->aio_write)
+-			ret = file->f_op->aio_write(req, buf,
+-					iocb->aio_nbytes, req->ki_pos);
+-		break;
+-	case IOCB_CMD_FDSYNC:
+-		ret = -EINVAL;
+-		if (file->f_op->aio_fsync)
+-			ret = file->f_op->aio_fsync(req, 1);
+-		break;
+-	case IOCB_CMD_FSYNC:
+-		ret = -EINVAL;
+-		if (file->f_op->aio_fsync)
+-			ret = file->f_op->aio_fsync(req, 0);
+-		break;
+-	default:
+-		dprintk("EINVAL: io_submit: no operation provided\n");
+-		ret = -EINVAL;
+-	}
++	ret = aio_setup_iocb(req);
++
++	if (ret)
++		goto out_put_req;
++
++	spin_lock_irq(&ctx->ctx_lock);
++	ret = aio_run_iocb(req);
++	spin_unlock_irq(&ctx->ctx_lock);
+ 
++	if (-EIOCBRETRY == ret)
++		queue_work(aio_wq, &ctx->wq);
+ 	aio_put_req(req);	/* drop extra ref to req */
+-	if (likely(-EIOCBQUEUED == ret))
+-		return 0;
+-	aio_complete(req, ret, 0);	/* will drop i/o ref to req */
+ 	return 0;
+ 
+ out_put_req:
+--- linux-2.6.0/fs/binfmt_elf.c	2003-10-25 14:45:46.000000000 -0700
++++ 25/fs/binfmt_elf.c	2003-12-28 23:22:21.000000000 -0800
+@@ -82,13 +82,17 @@ static struct linux_binfmt elf_format = 
+ 
+ #define BAD_ADDR(x)	((unsigned long)(x) > TASK_SIZE)
+ 
+-static void set_brk(unsigned long start, unsigned long end)
++static int set_brk(unsigned long start, unsigned long end)
+ {
+ 	start = ELF_PAGEALIGN(start);
+ 	end = ELF_PAGEALIGN(end);
+-	if (end > start)
+-		do_brk(start, end - start);
++	if (end > start) {
++		unsigned long addr = do_brk(start, end - start);
++		if (BAD_ADDR(addr))
++			return addr;
++	}
+ 	current->mm->start_brk = current->mm->brk = end;
++	return 0;
+ }
+ 
+ 
+@@ -381,8 +385,11 @@ static unsigned long load_elf_interp(str
+ 	elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);	/* What we have mapped so far */
+ 
+ 	/* Map the last of the bss segment */
+-	if (last_bss > elf_bss)
+-		do_brk(elf_bss, last_bss - elf_bss);
++	if (last_bss > elf_bss) {
++		error = do_brk(elf_bss, last_bss - elf_bss);
++		if (BAD_ADDR(error))
++			goto out_close;
++	}
+ 
+ 	*interp_load_addr = load_addr;
+ 	error = ((unsigned long) interp_elf_ex->e_entry) + load_addr;
+@@ -466,6 +473,7 @@ static int load_elf_binary(struct linux_
+ 	struct elfhdr interp_elf_ex;
+   	struct exec interp_ex;
+ 	char passed_fileno[6];
++	struct files_struct *files;
+ 	
+ 	/* Get the exec-header */
+ 	elf_ex = *((struct elfhdr *) bprm->buf);
+@@ -498,9 +506,20 @@ static int load_elf_binary(struct linux_
+ 	if (retval < 0)
+ 		goto out_free_ph;
+ 
++	files = current->files;		/* Refcounted so ok */
++	if(unshare_files() < 0)
++		goto out_free_ph;
++	if (files == current->files) {
++		put_files_struct(files);
++		files = NULL;
++	}
++
++	/* exec will make our files private anyway, but for the a.out
++	   loader stuff we need to do it earlier */
++
+ 	retval = get_unused_fd();
+ 	if (retval < 0)
+-		goto out_free_ph;
++		goto out_free_fh;
+ 	get_file(bprm->file);
+ 	fd_install(elf_exec_fileno = retval, bprm->file);
+ 
+@@ -631,6 +650,13 @@ static int load_elf_binary(struct linux_
+ 	if (retval)
+ 		goto out_free_dentry;
+ 
++	/* Discard our unneeded old files struct */
++	if (files) {
++		steal_locks(files);
++		put_files_struct(files);
++		files = NULL;
++	}
++
+ 	/* OK, This is the point of no return */
+ 	current->mm->start_data = 0;
+ 	current->mm->end_data = 0;
+@@ -672,7 +698,12 @@ static int load_elf_binary(struct linux_
+ 			/* There was a PT_LOAD segment with p_memsz > p_filesz
+ 			   before this one. Map anonymous pages, if needed,
+ 			   and clear the area.  */
+-			set_brk (elf_bss + load_bias, elf_brk + load_bias);
++			retval = set_brk (elf_bss + load_bias,
++					  elf_brk + load_bias);
++			if (retval) {
++				send_sig(SIGKILL, current, 0);
++				goto out_free_dentry;
++			}
+ 			nbyte = ELF_PAGEOFFSET(elf_bss);
+ 			if (nbyte) {
+ 				nbyte = ELF_MIN_ALIGN - nbyte;
+@@ -737,6 +768,18 @@ static int load_elf_binary(struct linux_
+ 	start_data += load_bias;
+ 	end_data += load_bias;
+ 
++	/* Calling set_brk effectively mmaps the pages that we need
++	 * for the bss and break sections.  We must do this before
++	 * mapping in the interpreter, to make sure it doesn't wind
++	 * up getting placed where the bss needs to go.
++	 */
++	retval = set_brk(elf_bss, elf_brk);
++	if (retval) {
++		send_sig(SIGKILL, current, 0);
++		goto out_free_dentry;
++	}
++	padzero(elf_bss);
++
+ 	if (elf_interpreter) {
+ 		if (interpreter_type == INTERPRETER_AOUT)
+ 			elf_entry = load_aout_interp(&interp_ex,
+@@ -745,19 +788,17 @@ static int load_elf_binary(struct linux_
+ 			elf_entry = load_elf_interp(&interp_elf_ex,
+ 						    interpreter,
+ 						    &interp_load_addr);
+-
+-		allow_write_access(interpreter);
+-		fput(interpreter);
+-		kfree(elf_interpreter);
+-
+ 		if (BAD_ADDR(elf_entry)) {
+ 			printk(KERN_ERR "Unable to load interpreter\n");
+-			kfree(elf_phdata);
+ 			send_sig(SIGSEGV, current, 0);
+ 			retval = -ENOEXEC; /* Nobody gets to see this, but.. */
+-			goto out;
++			goto out_free_dentry;
+ 		}
+ 		reloc_func_desc = interp_load_addr;
++
++		allow_write_access(interpreter);
++		fput(interpreter);
++		kfree(elf_interpreter);
+ 	} else {
+ 		elf_entry = elf_ex.e_entry;
+ 	}
+@@ -782,13 +823,6 @@ static int load_elf_binary(struct linux_
+ 	current->mm->end_data = end_data;
+ 	current->mm->start_stack = bprm->p;
+ 
+-	/* Calling set_brk effectively mmaps the pages that we need
+-	 * for the bss and break sections
+-	 */
+-	set_brk(elf_bss, elf_brk);
+-
+-	padzero(elf_bss);
+-
+ 	if (current->personality & MMAP_PAGE_ZERO) {
+ 		/* Why this, you ask???  Well SVr4 maps page 0 as read-only,
+ 		   and some applications "depend" upon this behavior.
+@@ -835,6 +869,11 @@ out_free_interp:
+ 		kfree(elf_interpreter);
+ out_free_file:
+ 	sys_close(elf_exec_fileno);
++out_free_fh:
++	if (files) {
++		put_files_struct(current->files);
++		current->files = files;
++	}
+ out_free_ph:
+ 	kfree(elf_phdata);
+ 	goto out;
+--- linux-2.6.0/fs/binfmt_som.c	2003-06-14 12:18:07.000000000 -0700
++++ 25/fs/binfmt_som.c	2003-12-28 23:21:23.000000000 -0800
+@@ -217,7 +217,7 @@ load_som_binary(struct linux_binprm * bp
+ 			(char *) hpuxhdr, size);
+ 	if (retval < 0)
+ 		goto out_free;
+-
++#error "Fix security hole before enabling me"
+ 	retval = get_unused_fd();
+ 	if (retval < 0)
+ 		goto out_free;
+--- linux-2.6.0/fs/block_dev.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/block_dev.c	2003-12-28 23:21:22.000000000 -0800
+@@ -25,6 +25,22 @@
+ #include <linux/namei.h>
+ #include <asm/uaccess.h>
+ 
++struct bdev_inode {
++	struct block_device bdev;
++	struct inode vfs_inode;
++};
++
++static inline struct bdev_inode *BDEV_I(struct inode *inode)
++{
++	return container_of(inode, struct bdev_inode, vfs_inode);
++}
++
++inline struct block_device *I_BDEV(struct inode *inode)
++{
++	return &BDEV_I(inode)->bdev;
++}
++
++EXPORT_SYMBOL(I_BDEV);
+ 
+ static sector_t max_block(struct block_device *bdev)
+ {
+@@ -100,10 +116,10 @@ static int
+ blkdev_get_block(struct inode *inode, sector_t iblock,
+ 		struct buffer_head *bh, int create)
+ {
+-	if (iblock >= max_block(inode->i_bdev))
++	if (iblock >= max_block(I_BDEV(inode)))
+ 		return -EIO;
+ 
+-	bh->b_bdev = inode->i_bdev;
++	bh->b_bdev = I_BDEV(inode);
+ 	bh->b_blocknr = iblock;
+ 	set_buffer_mapped(bh);
+ 	return 0;
+@@ -113,10 +129,10 @@ static int
+ blkdev_get_blocks(struct inode *inode, sector_t iblock,
+ 		unsigned long max_blocks, struct buffer_head *bh, int create)
+ {
+-	if ((iblock + max_blocks) > max_block(inode->i_bdev))
++	if ((iblock + max_blocks) > max_block(I_BDEV(inode)))
+ 		return -EIO;
+ 
+-	bh->b_bdev = inode->i_bdev;
++	bh->b_bdev = I_BDEV(inode);
+ 	bh->b_blocknr = iblock;
+ 	bh->b_size = max_blocks << inode->i_blkbits;
+ 	set_buffer_mapped(bh);
+@@ -128,9 +144,9 @@ blkdev_direct_IO(int rw, struct kiocb *i
+ 			loff_t offset, unsigned long nr_segs)
+ {
+ 	struct file *file = iocb->ki_filp;
+-	struct inode *inode = file->f_dentry->d_inode->i_mapping->host;
++	struct inode *inode = file->f_mapping->host;
+ 
+-	return blockdev_direct_IO(rw, iocb, inode, inode->i_bdev, iov, offset,
++	return blockdev_direct_IO(rw, iocb, inode, I_BDEV(inode), iov, offset,
+ 				nr_segs, blkdev_get_blocks, NULL);
+ }
+ 
+@@ -161,11 +177,10 @@ static int blkdev_commit_write(struct fi
+  */
+ static loff_t block_llseek(struct file *file, loff_t offset, int origin)
+ {
+-	struct inode *bd_inode;
++	struct inode *bd_inode = file->f_mapping->host;
+ 	loff_t size;
+ 	loff_t retval;
+ 
+-	bd_inode = file->f_dentry->d_inode->i_bdev->bd_inode;
+ 	down(&bd_inode->i_sem);
+ 	size = i_size_read(bd_inode);
+ 
+@@ -188,15 +203,13 @@ static loff_t block_llseek(struct file *
+ }
+ 	
+ /*
+- *	Filp may be NULL when we are called by an msync of a vma
+- *	since the vma has no handle.
++ *	Filp is never NULL; the only case when ->fsync() is called with
++ *	NULL first argument is nfsd_sync_dir() and that's not a directory.
+  */
+  
+ static int block_fsync(struct file *filp, struct dentry *dentry, int datasync)
+ {
+-	struct inode * inode = dentry->d_inode;
+-
+-	return sync_blockdev(inode->i_bdev);
++	return sync_blockdev(I_BDEV(filp->f_mapping->host));
+ }
+ 
+ /*
+@@ -206,16 +219,6 @@ static int block_fsync(struct file *filp
+ static spinlock_t bdev_lock __cacheline_aligned_in_smp = SPIN_LOCK_UNLOCKED;
+ static kmem_cache_t * bdev_cachep;
+ 
+-struct bdev_inode {
+-	struct block_device bdev;
+-	struct inode vfs_inode;
+-};
+-
+-static inline struct bdev_inode *BDEV_I(struct inode *inode)
+-{
+-	return container_of(inode, struct bdev_inode, vfs_inode);
+-}
+-
+ static struct inode *bdev_alloc_inode(struct super_block *sb)
+ {
+ 	struct bdev_inode *ei = kmem_cache_alloc(bdev_cachep, SLAB_KERNEL);
+@@ -387,26 +390,27 @@ void bdput(struct block_device *bdev)
+ 
+ EXPORT_SYMBOL(bdput);
+  
+-int bd_acquire(struct inode *inode)
++static struct block_device *bd_acquire(struct inode *inode)
+ {
+ 	struct block_device *bdev;
+ 	spin_lock(&bdev_lock);
+-	if (inode->i_bdev && igrab(inode->i_bdev->bd_inode)) {
++	bdev = inode->i_bdev;
++	if (bdev && igrab(bdev->bd_inode)) {
+ 		spin_unlock(&bdev_lock);
+-		return 0;
++		return bdev;
+ 	}
+ 	spin_unlock(&bdev_lock);
+ 	bdev = bdget(inode->i_rdev);
+-	if (!bdev)
+-		return -ENOMEM;
+-	spin_lock(&bdev_lock);
+-	if (inode->i_bdev)
+-		__bd_forget(inode);
+-	inode->i_bdev = bdev;
+-	inode->i_mapping = bdev->bd_inode->i_mapping;
+-	list_add(&inode->i_devices, &bdev->bd_inodes);
+-	spin_unlock(&bdev_lock);
+-	return 0;
++	if (bdev) {
++		spin_lock(&bdev_lock);
++		if (inode->i_bdev)
++			__bd_forget(inode);
++		inode->i_bdev = bdev;
++		inode->i_mapping = bdev->bd_inode->i_mapping;
++		list_add(&inode->i_devices, &bdev->bd_inodes);
++		spin_unlock(&bdev_lock);
++	}
++	return bdev;
+ }
+ 
+ /* Call when you free inode */
+@@ -531,13 +535,14 @@ static void bd_set_size(struct block_dev
+ 	bdev->bd_inode->i_blkbits = blksize_bits(bsize);
+ }
+ 
+-static int do_open(struct block_device *bdev, struct inode *inode, struct file *file)
++static int do_open(struct block_device *bdev, struct file *file)
+ {
+ 	struct module *owner = NULL;
+ 	struct gendisk *disk;
+ 	int ret = -ENXIO;
+ 	int part;
+ 
++	file->f_mapping = bdev->bd_inode->i_mapping;
+ 	lock_kernel();
+ 	disk = get_gendisk(bdev->bd_dev, &part);
+ 	if (!disk) {
+@@ -554,7 +559,7 @@ static int do_open(struct block_device *
+ 		if (!part) {
+ 			struct backing_dev_info *bdi;
+ 			if (disk->fops->open) {
+-				ret = disk->fops->open(inode, file);
++				ret = disk->fops->open(bdev, file);
+ 				if (ret)
+ 					goto out_first;
+ 			}
+@@ -599,7 +604,7 @@ static int do_open(struct block_device *
+ 		module_put(owner);
+ 		if (bdev->bd_contains == bdev) {
+ 			if (bdev->bd_disk->fops->open) {
+-				ret = bdev->bd_disk->fops->open(inode, file);
++				ret = bdev->bd_disk->fops->open(bdev, file);
+ 				if (ret)
+ 					goto out;
+ 			}
+@@ -647,7 +652,7 @@ int blkdev_get(struct block_device *bdev
+ 	fake_file.f_dentry = &fake_dentry;
+ 	fake_dentry.d_inode = bdev->bd_inode;
+ 
+-	return do_open(bdev, bdev->bd_inode, &fake_file);
++	return do_open(bdev, &fake_file);
+ }
+ 
+ EXPORT_SYMBOL(blkdev_get);
+@@ -665,10 +670,9 @@ int blkdev_open(struct inode * inode, st
+ 	 */
+ 	filp->f_flags |= O_LARGEFILE;
+ 
+-	bd_acquire(inode);
+-	bdev = inode->i_bdev;
++	bdev = bd_acquire(inode);
+ 
+-	res = do_open(bdev, inode, filp);
++	res = do_open(bdev, filp);
+ 	if (res)
+ 		return res;
+ 
+@@ -687,7 +691,6 @@ EXPORT_SYMBOL(blkdev_open);
+ int blkdev_put(struct block_device *bdev, int kind)
+ {
+ 	int ret = 0;
+-	struct inode *bd_inode = bdev->bd_inode;
+ 	struct gendisk *disk = bdev->bd_disk;
+ 
+ 	down(&bdev->bd_sem);
+@@ -696,14 +699,14 @@ int blkdev_put(struct block_device *bdev
+ 		switch (kind) {
+ 		case BDEV_FILE:
+ 		case BDEV_FS:
+-			sync_blockdev(bd_inode->i_bdev);
++			sync_blockdev(bdev);
+ 			break;
+ 		}
+ 		kill_bdev(bdev);
+ 	}
+ 	if (bdev->bd_contains == bdev) {
+ 		if (disk->fops->release)
+-			ret = disk->fops->release(bd_inode, NULL);
++			ret = disk->fops->release(disk);
+ 	} else {
+ 		down(&bdev->bd_contains->bd_sem);
+ 		bdev->bd_contains->bd_part_count--;
+@@ -734,11 +737,12 @@ int blkdev_put(struct block_device *bdev
+ 
+ EXPORT_SYMBOL(blkdev_put);
+ 
+-int blkdev_close(struct inode * inode, struct file * filp)
++static int blkdev_close(struct inode * inode, struct file * filp)
+ {
+-	if (inode->i_bdev->bd_holder == filp)
+-		bd_release(inode->i_bdev);
+-	return blkdev_put(inode->i_bdev, BDEV_FILE);
++	struct block_device *bdev = I_BDEV(filp->f_mapping->host);
++	if (bdev->bd_holder == filp)
++		bd_release(bdev);
++	return blkdev_put(bdev, BDEV_FILE);
+ }
+ 
+ static ssize_t blkdev_file_write(struct file *file, const char __user *buf,
+@@ -757,6 +761,11 @@ static ssize_t blkdev_file_aio_write(str
+ 	return generic_file_aio_write_nolock(iocb, &local_iov, 1, &iocb->ki_pos);
+ }
+ 
++static int block_ioctl(struct inode *inode, struct file *file, unsigned cmd,
++			unsigned long arg)
++{
++	return blkdev_ioctl(I_BDEV(file->f_mapping->host), file, cmd, arg);
++}
+ 
+ struct address_space_operations def_blk_aops = {
+ 	.readpage	= blkdev_readpage,
+@@ -778,7 +787,7 @@ struct file_operations def_blk_fops = {
+   	.aio_write	= blkdev_file_aio_write, 
+ 	.mmap		= generic_file_mmap,
+ 	.fsync		= block_fsync,
+-	.ioctl		= blkdev_ioctl,
++	.ioctl		= block_ioctl,
+ 	.readv		= generic_file_readv,
+ 	.writev		= generic_file_writev,
+ 	.sendfile	= generic_file_sendfile,
+@@ -791,7 +800,7 @@ int ioctl_by_bdev(struct block_device *b
+ 	int res;
+ 	mm_segment_t old_fs = get_fs();
+ 	set_fs(KERNEL_DS);
+-	res = blkdev_ioctl(bdev->bd_inode, NULL, cmd, arg);
++	res = blkdev_ioctl(bdev, NULL, cmd, arg);
+ 	set_fs(old_fs);
+ 	return res;
+ }
+@@ -828,11 +837,10 @@ struct block_device *lookup_bdev(const c
+ 	error = -EACCES;
+ 	if (nd.mnt->mnt_flags & MNT_NODEV)
+ 		goto fail;
+-	error = bd_acquire(inode);
+-	if (error)
++	error = -ENOMEM;
++	bdev = bd_acquire(inode);
++	if (!bdev)
+ 		goto fail;
+-	bdev = inode->i_bdev;
+-
+ out:
+ 	path_release(&nd);
+ 	return bdev;
+--- linux-2.6.0/fs/buffer.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/buffer.c	2003-12-28 23:26:41.000000000 -0800
+@@ -116,27 +116,50 @@ void unlock_buffer(struct buffer_head *b
+ }
+ 
+ /*
+- * Block until a buffer comes unlocked.  This doesn't stop it
++ * Wait until a buffer comes unlocked.  This doesn't stop it
+  * from becoming locked again - you have to lock it yourself
+  * if you want to preserve its state.
++ * If the wait queue parameter specifies an async i/o callback,
++ * then instead of blocking, we just queue up the callback
++ * on the wait queue for async notification when the buffer gets
++ * unlocked.
++ * A NULL wait queue parameter defaults to synchronous behaviour
+  */
+-void __wait_on_buffer(struct buffer_head * bh)
++int __wait_on_buffer_wq(struct buffer_head * bh, wait_queue_t *wait)
+ {
+ 	wait_queue_head_t *wqh = bh_waitq_head(bh);
+-	DEFINE_WAIT(wait);
++	DEFINE_WAIT(local_wait);
++
++	if (!wait)
++		wait = &local_wait;
+ 
+ 	if (atomic_read(&bh->b_count) == 0 &&
+ 			(!bh->b_page || !PageLocked(bh->b_page)))
+ 		buffer_error();
+ 
+ 	do {
+-		prepare_to_wait(wqh, &wait, TASK_UNINTERRUPTIBLE);
++		prepare_to_wait(wqh, wait, TASK_UNINTERRUPTIBLE);
+ 		if (buffer_locked(bh)) {
+ 			blk_run_queues();
++			if (!is_sync_wait(wait)) {
++				/*
++				 * if we've queued an async wait queue
++				 * callback do not block; just tell the
++				 * caller to return and retry later when
++				 * the callback is notified
++				 */
++				return -EIOCBRETRY;
++			}
+ 			io_schedule();
+ 		}
+ 	} while (buffer_locked(bh));
+-	finish_wait(wqh, &wait);
++	finish_wait(wqh, wait);
++	return 0;
++}
++
++void __wait_on_buffer(struct buffer_head * bh)
++{
++	__wait_on_buffer_wq(bh, NULL);
+ }
+ 
+ static void
+@@ -314,8 +337,7 @@ int file_fsync(struct file *filp, struct
+ asmlinkage long sys_fsync(unsigned int fd)
+ {
+ 	struct file * file;
+-	struct dentry * dentry;
+-	struct inode * inode;
++	struct address_space *mapping;
+ 	int ret, err;
+ 
+ 	ret = -EBADF;
+@@ -323,8 +345,7 @@ asmlinkage long sys_fsync(unsigned int f
+ 	if (!file)
+ 		goto out;
+ 
+-	dentry = file->f_dentry;
+-	inode = dentry->d_inode;
++	mapping = file->f_mapping;
+ 
+ 	ret = -EINVAL;
+ 	if (!file->f_op || !file->f_op->fsync) {
+@@ -333,17 +354,17 @@ asmlinkage long sys_fsync(unsigned int f
+ 	}
+ 
+ 	/* We need to protect against concurrent writers.. */
+-	down(&inode->i_sem);
++	down(&mapping->host->i_sem);
+ 	current->flags |= PF_SYNCWRITE;
+-	ret = filemap_fdatawrite(inode->i_mapping);
+-	err = file->f_op->fsync(file, dentry, 0);
++	ret = filemap_fdatawrite(mapping);
++	err = file->f_op->fsync(file, file->f_dentry, 0);
+ 	if (!ret)
+ 		ret = err;
+-	err = filemap_fdatawait(inode->i_mapping);
++	err = filemap_fdatawait(mapping);
+ 	if (!ret)
+ 		ret = err;
+ 	current->flags &= ~PF_SYNCWRITE;
+-	up(&inode->i_sem);
++	up(&mapping->host->i_sem);
+ 
+ out_putf:
+ 	fput(file);
+@@ -354,8 +375,7 @@ out:
+ asmlinkage long sys_fdatasync(unsigned int fd)
+ {
+ 	struct file * file;
+-	struct dentry * dentry;
+-	struct inode * inode;
++	struct address_space *mapping;
+ 	int ret, err;
+ 
+ 	ret = -EBADF;
+@@ -363,24 +383,23 @@ asmlinkage long sys_fdatasync(unsigned i
+ 	if (!file)
+ 		goto out;
+ 
+-	dentry = file->f_dentry;
+-	inode = dentry->d_inode;
+-
+ 	ret = -EINVAL;
+ 	if (!file->f_op || !file->f_op->fsync)
+ 		goto out_putf;
+ 
+-	down(&inode->i_sem);
++	mapping = file->f_mapping;
++
++	down(&mapping->host->i_sem);
+ 	current->flags |= PF_SYNCWRITE;
+-	ret = filemap_fdatawrite(inode->i_mapping);
+-	err = file->f_op->fsync(file, dentry, 1);
++	ret = filemap_fdatawrite(mapping);
++	err = file->f_op->fsync(file, file->f_dentry, 1);
+ 	if (!ret)
+ 		ret = err;
+-	err = filemap_fdatawait(inode->i_mapping);
++	err = filemap_fdatawait(mapping);
+ 	if (!ret)
+ 		ret = err;
+ 	current->flags &= ~PF_SYNCWRITE;
+-	up(&inode->i_sem);
++	up(&mapping->host->i_sem);
+ 
+ out_putf:
+ 	fput(file);
+@@ -432,6 +451,7 @@ __find_get_block_slow(struct block_devic
+ 	printk("block=%llu, b_blocknr=%llu\n",
+ 		(unsigned long long)block, (unsigned long long)bh->b_blocknr);
+ 	printk("b_state=0x%08lx, b_size=%u\n", bh->b_state, bh->b_size);
++	printk("device blocksize: %d\n", 1 << bd_inode->i_blkbits);
+ out_unlock:
+ 	spin_unlock(&bd_mapping->private_lock);
+ 	page_cache_release(page);
+@@ -487,7 +507,7 @@ void invalidate_bdev(struct block_device
+  */
+ static void free_more_memory(void)
+ {
+-	struct zone *zone;
++	struct zone **zones;
+ 	pg_data_t *pgdat;
+ 
+ 	wakeup_bdflush(1024);
+@@ -495,9 +515,9 @@ static void free_more_memory(void)
+ 	yield();
+ 
+ 	for_each_pgdat(pgdat) {
+-		zone = pgdat->node_zonelists[GFP_NOFS&GFP_ZONEMASK].zones[0];
+-		if (zone)
+-			try_to_free_pages(zone, GFP_NOFS, 0);
++		zones = pgdat->node_zonelists[GFP_NOFS&GFP_ZONEMASK].zones;
++		if (*zones)
++			try_to_free_pages(zones, GFP_NOFS, 0);
+ 	}
+ }
+ 
+@@ -1296,9 +1316,12 @@ void __bforget(struct buffer_head *bh)
+ 	__brelse(bh);
+ }
+ 
+-static struct buffer_head *__bread_slow(struct buffer_head *bh)
++static struct buffer_head *__bread_slow_wq(struct buffer_head *bh,
++		wait_queue_t *wait)
+ {
+-	lock_buffer(bh);
++	if (-EIOCBRETRY == lock_buffer_wq(bh, wait))
++		return ERR_PTR(-EIOCBRETRY);
++
+ 	if (buffer_uptodate(bh)) {
+ 		unlock_buffer(bh);
+ 		return bh;
+@@ -1308,7 +1331,8 @@ static struct buffer_head *__bread_slow(
+ 		get_bh(bh);
+ 		bh->b_end_io = end_buffer_read_sync;
+ 		submit_bh(READ, bh);
+-		wait_on_buffer(bh);
++		if (-EIOCBRETRY == wait_on_buffer_wq(bh, wait))
++			return ERR_PTR(-EIOCBRETRY);
+ 		if (buffer_uptodate(bh))
+ 			return bh;
+ 	}
+@@ -1316,6 +1340,11 @@ static struct buffer_head *__bread_slow(
+ 	return NULL;
+ }
+ 
++static inline struct buffer_head *__bread_slow(struct buffer_head *bh)
++{
++	return __bread_slow_wq(bh, NULL);
++}
++
+ /*
+  * Per-cpu buffer LRU implementation.  To reduce the cost of __find_get_block().
+  * The bhs[] array is sorted - newest buffer is at bhs[0].  Buffers have their
+@@ -1503,6 +1532,18 @@ __bread(struct block_device *bdev, secto
+ }
+ EXPORT_SYMBOL(__bread);
+ 
++struct buffer_head *
++__bread_wq(struct block_device *bdev, sector_t block, int size,
++	wait_queue_t *wait)
++{
++	struct buffer_head *bh = __getblk(bdev, block, size);
++
++	if (!buffer_uptodate(bh))
++		bh = __bread_slow_wq(bh, wait);
++	return bh;
++}
++EXPORT_SYMBOL(__bread_wq);
++
+ /*
+  * invalidate_bh_lrus() is called rarely - at unmount.  Because it is only for
+  * unmount it only needs to ensure that all buffers from the target device are
+@@ -1980,8 +2021,9 @@ static int __block_prepare_write(struct 
+ 	/*
+ 	 * If we issued read requests - let them complete.
+ 	 */
+-	while(wait_bh > wait) {
+-		wait_on_buffer(*--wait_bh);
++	while (wait_bh > wait) {
++		if ((err = wait_on_buffer_wq(*--wait_bh, current->io_wait)))
++			return err;
+ 		if (!buffer_uptodate(*wait_bh))
+ 			return -EIO;
+ 	}
+@@ -2823,7 +2865,7 @@ drop_buffers(struct page *page, struct b
+ 		bh = bh->b_this_page;
+ 	} while (bh != head);
+ 
+-	if (!was_uptodate && PageUptodate(page))
++	if (!was_uptodate && PageUptodate(page) && !PageError(page))
+ 		buffer_error();
+ 
+ 	do {
+@@ -3039,6 +3081,7 @@ void __init buffer_init(void)
+ EXPORT_SYMBOL(__bforget);
+ EXPORT_SYMBOL(__brelse);
+ EXPORT_SYMBOL(__wait_on_buffer);
++EXPORT_SYMBOL(__wait_on_buffer_wq);
+ EXPORT_SYMBOL(block_commit_write);
+ EXPORT_SYMBOL(block_prepare_write);
+ EXPORT_SYMBOL(block_read_full_page);
+--- linux-2.6.0/fs/char_dev.c	2003-11-23 19:03:01.000000000 -0800
++++ 25/fs/char_dev.c	2003-12-28 23:21:42.000000000 -0800
+@@ -434,7 +434,9 @@ void cdev_init(struct cdev *cdev, struct
+ 
+ static struct kobject *base_probe(dev_t dev, int *part, void *data)
+ {
+-	request_module("char-major-%d-%d", MAJOR(dev), MINOR(dev));
++	if (request_module("char-major-%d-%d", MAJOR(dev), MINOR(dev)) > 0)
++		/* Make old-style 2.4 aliases work */
++		request_module("char-major-%d", MAJOR(dev));
+ 	return NULL;
+ }
+ 
+--- linux-2.6.0/fs/coda/file.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/coda/file.c	2003-12-28 23:21:18.000000000 -0800
+@@ -89,6 +89,7 @@ coda_file_mmap(struct file *coda_file, s
+ 
+ 	coda_inode = coda_file->f_dentry->d_inode;
+ 	host_inode = host_file->f_dentry->d_inode;
++	coda_file->f_mapping = host_file->f_mapping;
+ 	if (coda_inode->i_mapping == &coda_inode->i_data)
+ 		coda_inode->i_mapping = host_inode->i_mapping;
+ 
+--- linux-2.6.0/fs/compat.c	2003-11-23 19:03:01.000000000 -0800
++++ 25/fs/compat.c	2003-12-28 23:21:47.000000000 -0800
+@@ -559,3 +559,96 @@ asmlinkage long compat_sys_fcntl(unsigne
+ 	return compat_sys_fcntl64(fd, cmd, arg);
+ }
+ 
++extern asmlinkage long sys_io_setup(unsigned nr_reqs, aio_context_t *ctx);
++
++asmlinkage long
++compat_sys_io_setup(unsigned nr_reqs, u32 *ctx32p)
++{
++	long ret;
++	aio_context_t ctx64;
++
++	mm_segment_t oldfs = get_fs();
++	if (unlikely(get_user(ctx64, ctx32p)))
++		return -EFAULT;
++
++	set_fs(KERNEL_DS);
++	ret = sys_io_setup(nr_reqs, &ctx64);
++	set_fs(oldfs);
++	/* truncating is ok because it's a user address */
++	if (!ret)
++		ret = put_user((u32) ctx64, ctx32p);
++	return ret;
++}
++
++extern asmlinkage long sys_io_getevents(aio_context_t ctx_id,
++					  long min_nr,
++					  long nr,
++					  struct io_event *events,
++					  struct timespec *timeout);
++
++asmlinkage long
++compat_sys_io_getevents(aio_context_t ctx_id,
++				 unsigned long min_nr,
++				 unsigned long nr,
++				 struct io_event *events,
++				 struct compat_timespec *timeout)
++{
++	long ret;
++	struct timespec t;
++	struct timespec *ut = NULL;
++
++	ret = -EFAULT;
++	if (unlikely(!access_ok(VERIFY_WRITE, events,
++				nr * sizeof(struct io_event))))
++		goto out;
++	if (timeout) {
++		if (get_compat_timespec(&t, timeout))
++			goto out;
++
++		ut = compat_alloc_user_space(sizeof(*ut));
++		if (copy_to_user(ut, &t, sizeof(t)) )
++			goto out;
++	}
++	ret = sys_io_getevents(ctx_id, min_nr, nr, events, ut);
++out:
++	return ret;
++}
++
++extern asmlinkage long sys_io_submit(aio_context_t, long,
++				struct iocb __user **);
++
++static inline long
++copy_iocb(long nr, u32 *ptr32, u64 *ptr64)
++{
++	compat_uptr_t uptr;
++	int i;
++
++	for (i = 0; i < nr; ++i) {
++		if (get_user(uptr, ptr32 + i))
++			return -EFAULT;
++		if (put_user((u64)compat_ptr(uptr), ptr64 + i))
++			return -EFAULT;
++	}
++	return 0;
++}
++
++#define MAX_AIO_SUBMITS 	(PAGE_SIZE/sizeof(struct iocb *))
++
++asmlinkage long
++compat_sys_io_submit(aio_context_t ctx_id, int nr, u32 *iocb)
++{
++	struct iocb **iocb64;
++	long ret;
++
++	if (unlikely(nr < 0))
++		return -EINVAL;
++
++	if (nr > MAX_AIO_SUBMITS)
++		nr = MAX_AIO_SUBMITS;
++
++	iocb64 = compat_alloc_user_space(nr * sizeof(*iocb64));
++	ret = copy_iocb(nr, iocb, (u64 *) iocb64);
++	if (!ret)
++		ret = sys_io_submit(ctx_id, nr, iocb64);
++	return ret;
++}
+--- linux-2.6.0/fs/compat_ioctl.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/compat_ioctl.c	2003-12-28 23:21:48.000000000 -0800
+@@ -63,6 +63,8 @@
+ #include <linux/ctype.h>
+ #include <linux/ioctl32.h>
+ #include <linux/ncp_fs.h>
++#include <linux/i2c.h>
++#include <linux/i2c-dev.h>
+ 
+ #include <net/sock.h>          /* siocdevprivate_ioctl */
+ #include <net/bluetooth/bluetooth.h>
+@@ -128,7 +130,7 @@ static int w_long(unsigned int fd, unsig
+ 	set_fs (KERNEL_DS);
+ 	err = sys_ioctl(fd, cmd, (unsigned long)&val);
+ 	set_fs (old_fs);
+-	if (!err && put_user(val, (u32 *)arg))
++	if (!err && put_user(val, (u32 *)compat_ptr(arg)))
+ 		return -EFAULT;
+ 	return err;
+ }
+@@ -136,15 +138,16 @@ static int w_long(unsigned int fd, unsig
+ static int rw_long(unsigned int fd, unsigned int cmd, unsigned long arg)
+ {
+ 	mm_segment_t old_fs = get_fs();
++	u32 *argptr = compat_ptr(arg);
+ 	int err;
+ 	unsigned long val;
+ 	
+-	if(get_user(val, (u32 *)arg))
++	if(get_user(val, argptr))
+ 		return -EFAULT;
+ 	set_fs (KERNEL_DS);
+ 	err = sys_ioctl(fd, cmd, (unsigned long)&val);
+ 	set_fs (old_fs);
+-	if (!err && put_user(val, (u32 *)arg))
++	if (!err && put_user(val, argptr))
+ 		return -EFAULT;
+ 	return err;
+ }
+@@ -1701,7 +1704,7 @@ static int do_smb_getmountuid(unsigned i
+ 	set_fs(old_fs);
+ 
+ 	if (err >= 0)
+-		err = put_user(kuid, (compat_pid_t *)arg);
++		err = put_user(kuid, (compat_uid_t *)arg);
+ 
+ 	return err;
+ }
+@@ -2869,6 +2872,105 @@ static int do_usbdevfs_discsignal(unsign
+ 
+         return err;
+ }
++
++/*
++ * I2C layer ioctls
++ */
++
++struct i2c_msg32 {
++	u16 addr;
++	u16 flags;
++	u16 len;
++	compat_caddr_t buf;
++};
++
++struct i2c_rdwr_ioctl_data32 {
++	compat_caddr_t msgs; /* struct i2c_msg __user *msgs */
++	u32 nmsgs;
++};
++
++struct i2c_smbus_ioctl_data32 {
++	u8 read_write;
++	u8 command;
++	u32 size;
++	compat_caddr_t data; /* union i2c_smbus_data *data */
++};
++
++static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)
++{
++	struct i2c_rdwr_ioctl_data	*tdata;
++	struct i2c_rdwr_ioctl_data32	*udata;
++	struct i2c_msg			*tmsgs;
++	struct i2c_msg32		*umsgs;
++	compat_caddr_t			datap;
++	int				nmsgs, i;
++
++	tdata = compat_alloc_user_space(sizeof(*tdata));
++	if (tdata == NULL)
++		return -ENOMEM;
++	if (verify_area(VERIFY_WRITE, tdata, sizeof(*tdata)))
++		return -EFAULT;
++
++	udata = (struct i2c_rdwr_ioctl_data32 *)compat_ptr(arg);
++	if (verify_area(VERIFY_READ, udata, sizeof(*udata)))
++		return -EFAULT;
++	if (__get_user(nmsgs, &udata->nmsgs) || __put_user(nmsgs, &tdata->nmsgs))
++		return -EFAULT;
++	if (nmsgs > I2C_RDRW_IOCTL_MAX_MSGS)
++		return -EINVAL;
++	if (__get_user(datap, &udata->msgs))
++		return -EFAULT;
++	umsgs = (struct i2c_msg32 *)compat_ptr(datap);
++	if (verify_area(VERIFY_READ, umsgs, sizeof(struct i2c_msg) * nmsgs))
++		return -EFAULT;
++
++	tmsgs = compat_alloc_user_space(sizeof(struct i2c_msg) * nmsgs);
++	if (tmsgs == NULL)
++		return -ENOMEM;
++	if (verify_area(VERIFY_WRITE, tmsgs, sizeof(struct i2c_msg) * nmsgs))
++		return -EFAULT;
++	if (__put_user(tmsgs, &tdata->msgs))
++		return -ENOMEM;
++	for (i = 0; i < nmsgs; i++) {
++		if (__copy_in_user(&tmsgs[i].addr,
++				   &umsgs[i].addr,
++				   3 * sizeof(u16)))
++			return -EFAULT;
++		if (__get_user(datap, &umsgs[i].buf) ||
++		    __put_user(compat_ptr(datap), &tmsgs[i].buf))
++			return -EFAULT;
++	}
++	return sys_ioctl(fd, cmd, (unsigned long)tdata);
++}
++
++static int do_i2c_smbus_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)
++{
++	struct i2c_smbus_ioctl_data	*tdata;
++	struct i2c_smbus_ioctl_data32	*udata;
++	compat_caddr_t			datap;
++
++	tdata = compat_alloc_user_space(sizeof(*tdata));
++	if (tdata == NULL)
++		return -ENOMEM;
++	if (verify_area(VERIFY_WRITE, tdata, sizeof(*tdata)))
++		return -EFAULT;
++
++	udata = (struct i2c_smbus_ioctl_data32 *)compat_ptr(arg);
++	if (verify_area(VERIFY_READ, udata, sizeof(*udata)))
++		return -EFAULT;
++
++	if (__copy_in_user(&tdata->read_write, &udata->read_write, 2 * sizeof(u8)))
++		return -EFAULT;
++	if (__copy_in_user(&tdata->size, &udata->size, 2 * sizeof(u32)))
++		return -EFAULT;
++	if (__get_user(datap, &udata->data) ||
++	    __put_user(compat_ptr(datap), &tdata->data))
++		return -EFAULT;
++
++	return sys_ioctl(fd, cmd, (unsigned long)tdata);
++}
++
++
+ #undef CODE
+ #endif
+ 
+@@ -2979,7 +3081,7 @@ HANDLE_IOCTL(VIDIOCSFBUF32, do_video_ioc
+ HANDLE_IOCTL(VIDIOCGFREQ32, do_video_ioctl)
+ HANDLE_IOCTL(VIDIOCSFREQ32, do_video_ioctl)
+ /* One SMB ioctl needs translations. */
+-#define SMB_IOC_GETMOUNTUID_32 _IOR('u', 1, compat_pid_t)
++#define SMB_IOC_GETMOUNTUID_32 _IOR('u', 1, compat_uid_t)
+ HANDLE_IOCTL(SMB_IOC_GETMOUNTUID_32, do_smb_getmountuid)
+ HANDLE_IOCTL(ATM_GETLINKRATE32, do_atm_ioctl)
+ HANDLE_IOCTL(ATM_GETNAMES32, do_atm_ioctl)
+@@ -3027,5 +3129,10 @@ HANDLE_IOCTL(USBDEVFS_BULK32, do_usbdevf
+ HANDLE_IOCTL(USBDEVFS_REAPURB32, do_usbdevfs_reapurb)
+ HANDLE_IOCTL(USBDEVFS_REAPURBNDELAY32, do_usbdevfs_reapurb)
+ HANDLE_IOCTL(USBDEVFS_DISCSIGNAL32, do_usbdevfs_discsignal)
++/* i2c */
++HANDLE_IOCTL(I2C_FUNCS, w_long)
++HANDLE_IOCTL(I2C_RDWR, do_i2c_rdwr_ioctl)
++HANDLE_IOCTL(I2C_SMBUS, do_i2c_smbus_ioctl)
++
+ #undef DECLARES
+ #endif
+--- linux-2.6.0/fs/cramfs/inode.c	2003-11-23 19:03:01.000000000 -0800
++++ 25/fs/cramfs/inode.c	2003-12-28 23:21:22.000000000 -0800
+@@ -112,8 +112,8 @@ static int next_buffer;
+  */
+ static void *cramfs_read(struct super_block *sb, unsigned int offset, unsigned int len)
+ {
+-	struct buffer_head * bh_array[BLKS_PER_BUF];
+-	struct buffer_head * read_array[BLKS_PER_BUF];
++	struct address_space *mapping = sb->s_bdev->bd_inode->i_mapping;
++	struct page *pages[BLKS_PER_BUF];
+ 	unsigned i, blocknr, buffer, unread;
+ 	unsigned long devsize;
+ 	char *data;
+@@ -138,33 +138,36 @@ static void *cramfs_read(struct super_bl
+ 		return read_buffers[i] + blk_offset;
+ 	}
+ 
+-	devsize = sb->s_bdev->bd_inode->i_size >> 12;
+-	if (!devsize)
+-		devsize = ~0UL;
++	devsize = mapping->host->i_size >> PAGE_CACHE_SHIFT;
+ 
+ 	/* Ok, read in BLKS_PER_BUF pages completely first. */
+ 	unread = 0;
+ 	for (i = 0; i < BLKS_PER_BUF; i++) {
+-		struct buffer_head *bh;
++		struct page *page = NULL;
+ 
+-		bh = NULL;
+ 		if (blocknr + i < devsize) {
+-			bh = sb_getblk(sb, blocknr + i);
+-			if (!buffer_uptodate(bh))
+-				read_array[unread++] = bh;
++			page = read_cache_page(mapping, blocknr + i,
++				(filler_t *)mapping->a_ops->readpage,
++				NULL);
++			/* synchronous error? */
++			if (IS_ERR(page))
++				page = NULL;
+ 		}
+-		bh_array[i] = bh;
++		pages[i] = page;
+ 	}
+ 
+-	if (unread) {
+-		ll_rw_block(READ, unread, read_array);
+-		do {
+-			unread--;
+-			wait_on_buffer(read_array[unread]);
+-		} while (unread);
++	for (i = 0; i < BLKS_PER_BUF; i++) {
++		struct page *page = pages[i];
++		if (page) {
++			wait_on_page_locked(page);
++			if (!PageUptodate(page)) {
++				/* asynchronous error */
++				page_cache_release(page);
++				pages[i] = NULL;
++			}
++		}
+ 	}
+ 
+-	/* Ok, copy them to the staging area without sleeping. */
+ 	buffer = next_buffer;
+ 	next_buffer = NEXT_BUFFER(buffer);
+ 	buffer_blocknr[buffer] = blocknr;
+@@ -172,10 +175,11 @@ static void *cramfs_read(struct super_bl
+ 
+ 	data = read_buffers[buffer];
+ 	for (i = 0; i < BLKS_PER_BUF; i++) {
+-		struct buffer_head * bh = bh_array[i];
+-		if (bh) {
+-			memcpy(data, bh->b_data, PAGE_CACHE_SIZE);
+-			brelse(bh);
++		struct page *page = pages[i];
++		if (page) {
++			memcpy(data, kmap(page), PAGE_CACHE_SIZE);
++			kunmap(page);
++			page_cache_release(page);
+ 		} else
+ 			memset(data, 0, PAGE_CACHE_SIZE);
+ 		data += PAGE_CACHE_SIZE;
+@@ -202,8 +206,6 @@ static int cramfs_fill_super(struct supe
+ 	sb->s_fs_info = sbi;
+ 	memset(sbi, 0, sizeof(struct cramfs_sb_info));
+ 
+-	sb_set_blocksize(sb, PAGE_CACHE_SIZE);
+-
+ 	/* Invalidate the read buffers on mount: think disk change.. */
+ 	down(&read_mutex);
+ 	for (i = 0; i < READ_BUFFERS; i++)
+--- linux-2.6.0/fs/dcache.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/dcache.c	2003-12-28 23:21:54.000000000 -0800
+@@ -639,24 +639,9 @@ void shrink_dcache_anon(struct hlist_hea
+ 
+ /*
+  * This is called from kswapd when we think we need some more memory.
+- *
+- * We don't want the VM to steal _all_ unused dcache.  Because that leads to
+- * the VM stealing all unused inodes, which shoots down recently-used
+- * pagecache.  So what we do is to tell fibs to the VM about how many reapable
+- * objects there are in this cache.   If the number of unused dentries is
+- * less than half of the total dentry count then return zero.  The net effect
+- * is that the number of unused dentries will be, at a minimum, equal to the
+- * number of used ones.
+- *
+- * If unused_ratio is set to 5, the number of unused dentries will not fall
+- * below 5* the number of used ones.
+  */
+ static int shrink_dcache_memory(int nr, unsigned int gfp_mask)
+ {
+-	int nr_used;
+-	int nr_unused;
+-	const int unused_ratio = 1;
+-
+ 	if (nr) {
+ 		/*
+ 		 * Nasty deadlock avoidance.
+@@ -672,11 +657,7 @@ static int shrink_dcache_memory(int nr, 
+ 		if (gfp_mask & __GFP_FS)
+ 			prune_dcache(nr);
+ 	}
+-	nr_unused = dentry_stat.nr_unused;
+-	nr_used = dentry_stat.nr_dentry - nr_unused;
+-	if (nr_unused < nr_used * unused_ratio)
+-		return 0;
+-	return nr_unused - nr_used * unused_ratio;
++	return dentry_stat.nr_unused;
+ }
+ 
+ #define NAME_ALLOC_LEN(len)	((len+16) & ~15)
+--- linux-2.6.0/fs/devfs/base.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/devfs/base.c	2003-12-28 23:21:21.000000000 -0800
+@@ -1955,15 +1955,9 @@ static int devfs_notify_change (struct d
+     return 0;
+ }   /*  End Function devfs_notify_change  */
+ 
+-static void devfs_clear_inode (struct inode *inode)
+-{
+-    if ( S_ISBLK (inode->i_mode) ) bdput (inode->i_bdev);
+-}   /*  End Function devfs_clear_inode  */
+-
+ static struct super_operations devfs_sops =
+ { 
+     .drop_inode    = generic_delete_inode,
+-    .clear_inode   = devfs_clear_inode,
+     .statfs        = simple_statfs,
+ };
+ 
+@@ -2015,11 +2009,7 @@ static struct inode *_devfs_get_vfs_inod
+ 	inode->i_rdev = de->u.cdev.dev;
+     }
+     else if ( S_ISBLK (de->mode) )
+-    {
+-	inode->i_rdev = de->u.bdev.dev;
+-	if (bd_acquire (inode) != 0)
+-		PRINTK ("(%d): no block device from bdget()\n",(int)inode->i_ino);
+-    }
++	init_special_inode(inode, de->mode, de->u.bdev.dev);
+     else if ( S_ISFIFO (de->mode) )
+     	inode->i_fop = &def_fifo_fops;
+     else if ( S_ISDIR (de->mode) )
+@@ -2118,11 +2108,7 @@ static int devfs_open (struct inode *ino
+     if (de == NULL) return -ENODEV;
+     if ( S_ISDIR (de->mode) ) return 0;
+     file->private_data = de->info;
+-    if ( S_ISBLK (inode->i_mode) )
+-    {
+-	file->f_op = &def_blk_fops;
+-	err = def_blk_fops.open (inode, file); /* Module refcount unchanged */
+-    } else if (S_ISCHR(inode->i_mode)) {
++    if (S_ISCHR(inode->i_mode)) {
+ 	ops = devfs_get_ops (de);  /*  Now have module refcount  */
+ 	file->f_op = ops;
+ 	if (file->f_op)
+--- linux-2.6.0/fs/direct-io.c	2003-11-23 19:03:01.000000000 -0800
++++ 25/fs/direct-io.c	2003-12-28 23:26:38.000000000 -0800
+@@ -52,6 +52,10 @@
+  *
+  * If blkfactor is zero then the user's request was aligned to the filesystem's
+  * blocksize.
++ *
++ * needs_locking is set for regular files on direct-IO-naive filesystems.  It
++ * determines whether we need to do the fancy locking which prevents direct-IO
++ * from being able to read uninitialised disk blocks.
+  */
+ 
+ struct dio {
+@@ -59,6 +63,7 @@ struct dio {
+ 	struct bio *bio;		/* bio under assembly */
+ 	struct inode *inode;
+ 	int rw;
++	int needs_locking;		/* doesn't change */
+ 	unsigned blkbits;		/* doesn't change */
+ 	unsigned blkfactor;		/* When we're using an alignment which
+ 					   is finer than the filesystem's soft
+@@ -204,8 +209,10 @@ static struct page *dio_get_page(struct 
+  */
+ static void dio_complete(struct dio *dio, loff_t offset, ssize_t bytes)
+ {
+-	if (dio->end_io)
++	if (dio->end_io && dio->result)
+ 		dio->end_io(dio->inode, offset, bytes, dio->map_bh.b_private);
++	if (dio->needs_locking)
++		up_read(&dio->inode->i_alloc_sem);
+ }
+ 
+ /*
+@@ -218,8 +225,14 @@ static void finished_one_bio(struct dio 
+ 		if (dio->is_async) {
+ 			dio_complete(dio, dio->block_in_file << dio->blkbits,
+ 					dio->result);
+-			aio_complete(dio->iocb, dio->result, 0);
+-			kfree(dio);
++			/* Complete AIO later if falling back to buffered i/o */
++			if (dio->result != -ENOTBLK) {
++				aio_complete(dio->iocb, dio->result, 0);
++				kfree(dio);
++			} else {
++				if (dio->waiter)
++					wake_up_process(dio->waiter);
++			}
+ 		}
+ 	}
+ }
+@@ -449,6 +462,7 @@ static int get_more_blocks(struct dio *d
+ 	unsigned long fs_count;	/* Number of filesystem-sized blocks */
+ 	unsigned long dio_count;/* Number of dio_block-sized blocks */
+ 	unsigned long blkmask;
++	int beyond_eof = 0;
+ 
+ 	/*
+ 	 * If there was a memory error and we've overwritten all the
+@@ -466,8 +480,19 @@ static int get_more_blocks(struct dio *d
+ 		if (dio_count & blkmask)	
+ 			fs_count++;
+ 
++		if (dio->needs_locking) {
++			if (dio->block_in_file >= (i_size_read(dio->inode) >>
++							dio->blkbits))
++				beyond_eof = 1;
++		}
++		/*
++		 * For writes inside i_size we forbid block creations: only
++		 * overwrites are permitted.  We fall back to buffered writes
++		 * at a higher level for inside-i_size block-instantiating
++		 * writes.
++		 */
+ 		ret = (*dio->get_blocks)(dio->inode, fs_startblk, fs_count,
+-				map_bh, dio->rw == WRITE);
++				map_bh, (dio->rw == WRITE) && beyond_eof);
+ 	}
+ 	return ret;
+ }
+@@ -774,6 +799,10 @@ do_holes:
+ 			if (!buffer_mapped(map_bh)) {
+ 				char *kaddr;
+ 
++				/* AKPM: eargh, -ENOTBLK is a hack */
++				if (dio->rw == WRITE)
++					return -ENOTBLK;
++
+ 				if (dio->block_in_file >=
+ 					i_size_read(dio->inode)>>blkbits) {
+ 					/* We hit eof */
+@@ -839,23 +868,21 @@ out:
+ 	return ret;
+ }
+ 
++/*
++ * Releases both i_sem and i_alloc_sem
++ */
+ static int
+ direct_io_worker(int rw, struct kiocb *iocb, struct inode *inode, 
+ 	const struct iovec *iov, loff_t offset, unsigned long nr_segs, 
+-	unsigned blkbits, get_blocks_t get_blocks, dio_iodone_t end_io)
++	unsigned blkbits, get_blocks_t get_blocks, dio_iodone_t end_io,
++	struct dio *dio)
+ {
+ 	unsigned long user_addr; 
+ 	int seg;
+ 	int ret = 0;
+ 	int ret2;
+-	struct dio *dio;
+ 	size_t bytes;
+ 
+-	dio = kmalloc(sizeof(*dio), GFP_KERNEL);
+-	if (!dio)
+-		return -ENOMEM;
+-	dio->is_async = !is_sync_kiocb(iocb);
+-
+ 	dio->bio = NULL;
+ 	dio->inode = inode;
+ 	dio->rw = rw;
+@@ -864,7 +891,6 @@ direct_io_worker(int rw, struct kiocb *i
+ 	dio->start_zero_done = 0;
+ 	dio->block_in_file = offset >> blkbits;
+ 	dio->blocks_available = 0;
+-
+ 	dio->cur_page = NULL;
+ 
+ 	dio->boundary = 0;
+@@ -947,14 +973,51 @@ direct_io_worker(int rw, struct kiocb *i
+ 		dio_bio_submit(dio);
+ 
+ 	/*
++	 * It is possible that, we return short IO due to end of file.
++	 * In that case, we need to release all the pages we got hold on.
++	 */
++	dio_cleanup(dio);
++
++	/*
++	 * All block lookups have been performed. For READ requests
++	 * we can let i_sem go now that its achieved its purpose
++	 * of protecting us from looking up uninitialized blocks.
++	 */
++	if ((rw == READ) && dio->needs_locking)
++		up(&dio->inode->i_sem);
++
++	/*
+ 	 * OK, all BIOs are submitted, so we can decrement bio_count to truly
+ 	 * reflect the number of to-be-processed BIOs.
+ 	 */
+ 	if (dio->is_async) {
+ 		if (ret == 0)
+ 			ret = dio->result;	/* Bytes written */
++		if (ret == -ENOTBLK) {
++			/*
++			 * The request will be reissued via buffered I/O
++			 * when we return; Any I/O already issued
++			 * effectively becomes redundant.
++			 */
++			dio->result = ret;
++			dio->waiter = current;
++		}
+ 		finished_one_bio(dio);		/* This can free the dio */
+ 		blk_run_queues();
++		if (ret == -ENOTBLK) {
++			/*
++			 * Wait for already issued I/O to drain out and
++			 * release its references to user-space pages
++			 * before returning to fallback on buffered I/O
++			 */
++			set_current_state(TASK_UNINTERRUPTIBLE);
++			while (atomic_read(&dio->bio_count)) {
++				io_schedule();
++				set_current_state(TASK_UNINTERRUPTIBLE);
++			}
++			set_current_state(TASK_RUNNING);
++			dio->waiter = NULL;
++		}
+ 	} else {
+ 		finished_one_bio(dio);
+ 		ret2 = dio_await_completion(dio);
+@@ -974,6 +1037,9 @@ direct_io_worker(int rw, struct kiocb *i
+ 				ret = i_size - offset;
+ 		}
+ 		dio_complete(dio, offset, ret);
++		/* We could have also come here on an AIO file extend */
++		if (!is_sync_kiocb(iocb) && (ret != -ENOTBLK))
++			aio_complete(iocb, ret, 0);
+ 		kfree(dio);
+ 	}
+ 	return ret;
+@@ -981,11 +1047,17 @@ direct_io_worker(int rw, struct kiocb *i
+ 
+ /*
+  * This is a library function for use by filesystem drivers.
++ *
++ * For writes to S_ISREG files, we are called under i_sem and return with i_sem
++ * held, even though it is internally dropped.
++ *
++ * For writes to S_ISBLK files, i_sem is not held on entry; it is never taken.
+  */
+ int
+-blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode, 
++__blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
+ 	struct block_device *bdev, const struct iovec *iov, loff_t offset, 
+-	unsigned long nr_segs, get_blocks_t get_blocks, dio_iodone_t end_io)
++	unsigned long nr_segs, get_blocks_t get_blocks, dio_iodone_t end_io,
++	int needs_special_locking)
+ {
+ 	int seg;
+ 	size_t size;
+@@ -994,6 +1066,9 @@ blockdev_direct_IO(int rw, struct kiocb 
+ 	unsigned bdev_blkbits = 0;
+ 	unsigned blocksize_mask = (1 << blkbits) - 1;
+ 	ssize_t retval = -EINVAL;
++	loff_t end = offset;
++	struct dio *dio;
++	int needs_locking;
+ 
+ 	if (bdev)
+ 		bdev_blkbits = blksize_bits(bdev_hardsect_size(bdev));
+@@ -1010,6 +1085,7 @@ blockdev_direct_IO(int rw, struct kiocb 
+ 	for (seg = 0; seg < nr_segs; seg++) {
+ 		addr = (unsigned long)iov[seg].iov_base;
+ 		size = iov[seg].iov_len;
++		end += size;
+ 		if ((addr & blocksize_mask) || (size & blocksize_mask))  {
+ 			if (bdev)
+ 				 blkbits = bdev_blkbits;
+@@ -1019,10 +1095,43 @@ blockdev_direct_IO(int rw, struct kiocb 
+ 		}
+ 	}
+ 
+-	retval = direct_io_worker(rw, iocb, inode, iov, offset, 
+-				nr_segs, blkbits, get_blocks, end_io);
++	dio = kmalloc(sizeof(*dio), GFP_KERNEL);
++	retval = -ENOMEM;
++	if (!dio)
++		goto out;
++
++	/*
++	 * For regular files,
++	 *	readers need to grab i_sem and i_alloc_sem
++	 *	writers need to grab i_alloc_sem only (i_sem is already held)
++	 */
++	needs_locking = 0;
++	if (S_ISREG(inode->i_mode) && needs_special_locking) {
++		needs_locking = 1;
++		if (rw == READ) {
++			down(&inode->i_sem);
++			retval = filemap_write_and_wait(inode->i_mapping);
++			if (retval) {
++				up(&inode->i_sem);
++				kfree(dio);
++				goto out;
++			}
++		}
++		down_read(&inode->i_alloc_sem);
++	}
++	dio->needs_locking = needs_locking;
++	/*
++	 * For file extending writes updating i_size before data
++	 * writeouts complete can expose uninitialized blocks. So
++	 * even for AIO, we need to wait for i/o to complete before
++	 * returning in this case.
++	 */
++	dio->is_async = !is_sync_kiocb(iocb) && !((rw == WRITE) &&
++		(end > i_size_read(inode)));
++
++	retval = direct_io_worker(rw, iocb, inode, iov, offset,
++				nr_segs, blkbits, get_blocks, end_io, dio);
+ out:
+ 	return retval;
+ }
+-
+-EXPORT_SYMBOL(blockdev_direct_IO);
++EXPORT_SYMBOL(__blockdev_direct_IO);
+--- linux-2.6.0/fs/dquot.c	2003-11-23 19:03:01.000000000 -0800
++++ 25/fs/dquot.c	2003-12-28 23:22:17.000000000 -0800
+@@ -192,6 +192,8 @@ static struct list_head dquot_hash[NR_DQ
+ 
+ struct dqstats dqstats;
+ 
++static void dqput(struct dquot *dquot);
++
+ static inline int const hashfn(struct super_block *sb, unsigned int id, int type)
+ {
+ 	return((((unsigned long)sb>>L1_CACHE_SHIFT) ^ id) * (MAXQUOTAS - type)) % NR_DQHASH;
+@@ -339,8 +341,11 @@ restart:
+ 			continue;
+ 		if (!dquot_dirty(dquot))
+ 			continue;
++		atomic_inc(&dquot->dq_count);
++		dqstats.lookups++;
+ 		spin_unlock(&dq_list_lock);
+-		sb->dq_op->sync_dquot(dquot);
++		sb->dq_op->write_dquot(dquot);
++		dqput(dquot);
+ 		goto restart;
+ 	}
+ 	spin_unlock(&dq_list_lock);
+@@ -427,7 +432,7 @@ we_slept:
+ 	}
+ 	if (dquot_dirty(dquot)) {
+ 		spin_unlock(&dq_list_lock);
+-		commit_dqblk(dquot);
++		dquot->dq_sb->dq_op->write_dquot(dquot);
+ 		goto we_slept;
+ 	}
+ 	atomic_dec(&dquot->dq_count);
+@@ -1083,7 +1088,7 @@ struct dquot_operations dquot_operations
+ 	.free_space	= dquot_free_space,
+ 	.free_inode	= dquot_free_inode,
+ 	.transfer	= dquot_transfer,
+-	.sync_dquot	= commit_dqblk
++	.write_dquot	= commit_dqblk
+ };
+ 
+ /* Function used by filesystems for initializing the dquot_operations structure */
+@@ -1207,9 +1212,9 @@ int vfs_quota_on(struct super_block *sb,
+ 	error = -EINVAL;
+ 	if (!fmt->qf_ops->check_quota_file(sb, type))
+ 		goto out_file_init;
+-	/* We don't want quota on quota files */
++	/* We don't want quota and atime on quota files (deadlocks possible) */
+ 	dquot_drop_nolock(inode);
+-	inode->i_flags |= S_NOQUOTA;
++	inode->i_flags |= S_NOQUOTA | S_NOATIME;
+ 
+ 	dqopt->ops[type] = fmt->qf_ops;
+ 	dqopt->info[type].dqi_format = fmt;
+--- linux-2.6.0/fs/eventpoll.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/eventpoll.c	2003-12-28 23:23:06.000000000 -0800
+@@ -93,6 +93,8 @@
+ #define EPI_SLAB_DEBUG 0
+ #endif /* #if DEBUG_EPI != 0 */
+ 
++/* Epoll private bits inside the event mask */
++#define EP_PRIVATE_BITS (EPOLLONESHOT | EPOLLET)
+ 
+ /* Maximum number of poll wake up nests we are allowing */
+ #define EP_MAX_POLLWAKE_NESTS 4
+@@ -740,6 +742,7 @@ static int ep_getfd(int *efd, struct ino
+ 	d_add(dentry, inode);
+ 	file->f_vfsmnt = mntget(eventpoll_mnt);
+ 	file->f_dentry = dget(dentry);
++	file->f_mapping = inode->i_mapping;
+ 
+ 	file->f_pos = 0;
+ 	file->f_flags = O_RDONLY;
+@@ -1305,6 +1308,15 @@ static int ep_poll_callback(wait_queue_t
+ 
+ 	write_lock_irqsave(&ep->lock, flags);
+ 
++	/*
++	 * If the event mask does not contain any poll(2) event, we consider the
++	 * descriptor to be disabled. This condition is likely the effect of the
++	 * EPOLLONESHOT bit that disables the descriptor when an event is received,
++	 * until the next EPOLL_CTL_MOD will be issued.
++	 */
++	if (!(epi->event.events & ~EP_PRIVATE_BITS))
++		goto is_disabled;
++
+ 	/* If this file is already in the ready list we exit soon */
+ 	if (EP_IS_LINKED(&epi->rdllink))
+ 		goto is_linked;
+@@ -1321,6 +1333,7 @@ is_linked:
+ 	if (waitqueue_active(&ep->poll_wait))
+ 		pwake++;
+ 
++is_disabled:
+ 	write_unlock_irqrestore(&ep->lock, flags);
+ 
+ 	/* We have to call this outside the lock */
+@@ -1457,6 +1470,8 @@ static int ep_send_events(struct eventpo
+ 				eventcnt += eventbuf;
+ 				eventbuf = 0;
+ 			}
++			if (epi->event.events & EPOLLONESHOT)
++				epi->event.events &= EP_PRIVATE_BITS;
+ 		}
+ 	}
+ 
+--- linux-2.6.0/fs/exec.c	2003-10-17 15:58:04.000000000 -0700
++++ 25/fs/exec.c	2003-12-28 23:22:56.000000000 -0800
+@@ -779,6 +779,7 @@ int flush_old_exec(struct linux_binprm *
+ {
+ 	char * name;
+ 	int i, ch, retval;
++	struct files_struct *files;
+ 
+ 	/*
+ 	 * Make sure we have a private signal table and that
+@@ -789,15 +790,26 @@ int flush_old_exec(struct linux_binprm *
+ 		goto out;
+ 
+ 	/*
++	 * Make sure we have private file handles. Ask the
++	 * fork helper to do the work for us and the exit
++	 * helper to do the cleanup of the old one.
++	 */
++	files = current->files;		/* refcounted so safe to hold */
++	retval = unshare_files();
++	if (retval)
++		goto out;
++	/*
+ 	 * Release all of the old mmap stuff
+ 	 */
+ 	retval = exec_mmap(bprm->mm);
+ 	if (retval)
+-		goto out;
++		goto mmap_failed;
+ 
+ 	bprm->mm = NULL;		/* We're using it now */
+ 
+ 	/* This is the point of no return */
++	steal_locks(files);
++	put_files_struct(files);
+ 
+ 	current->sas_ss_sp = current->sas_ss_size = 0;
+ 
+@@ -830,6 +842,9 @@ int flush_old_exec(struct linux_binprm *
+ 
+ 	return 0;
+ 
++mmap_failed:
++	put_files_struct(current->files);
++	current->files = files;
+ out:
+ 	return retval;
+ }
+@@ -1070,6 +1085,7 @@ int do_execve(char * filename,
+ 	struct linux_binprm bprm;
+ 	struct file *file;
+ 	int retval;
++	int i;
+ 
+ 	sched_balance_exec();
+ 
+@@ -1138,7 +1154,11 @@ int do_execve(char * filename,
+ 
+ out:
+ 	/* Something went wrong, return the inode and free the argument pages*/
+-	free_arg_pages(&bprm);
++	for (i = 0 ; i < MAX_ARG_PAGES ; i++) {
++		struct page * page = bprm.page[i];
++		if (page)
++			__free_page(page);
++	}
+ 
+ 	if (bprm.security)
+ 		security_bprm_free(&bprm);
+--- linux-2.6.0/fs/ext2/inode.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/ext2/inode.c	2003-12-28 23:26:41.000000000 -0800
+@@ -257,11 +257,12 @@ static int ext2_block_to_path(struct ino
+  *	or when it reads all @depth-1 indirect blocks successfully and finds
+  *	the whole chain, all way to the data (returns %NULL, *err == 0).
+  */
+-static Indirect *ext2_get_branch(struct inode *inode,
++static Indirect *ext2_get_branch_wq(struct inode *inode,
+ 				 int depth,
+ 				 int *offsets,
+ 				 Indirect chain[4],
+-				 int *err)
++				 int *err,
++				 wait_queue_t *wait)
+ {
+ 	struct super_block *sb = inode->i_sb;
+ 	Indirect *p = chain;
+@@ -273,8 +274,8 @@ static Indirect *ext2_get_branch(struct 
+ 	if (!p->key)
+ 		goto no_block;
+ 	while (--depth) {
+-		bh = sb_bread(sb, le32_to_cpu(p->key));
+-		if (!bh)
++		bh = sb_bread_wq(sb, le32_to_cpu(p->key), wait);
++		if (!bh || IS_ERR(bh))
+ 			goto failure;
+ 		read_lock(&EXT2_I(inode)->i_meta_lock);
+ 		if (!verify_chain(chain, p))
+@@ -292,11 +293,21 @@ changed:
+ 	*err = -EAGAIN;
+ 	goto no_block;
+ failure:
+-	*err = -EIO;
++	*err = IS_ERR(bh) ? PTR_ERR(bh) : -EIO;
+ no_block:
+ 	return p;
+ }
+ 
++static Indirect *ext2_get_branch(struct inode *inode,
++				 int depth,
++				 int *offsets,
++				 Indirect chain[4],
++				 int *err)
++{
++	return ext2_get_branch_wq(inode, depth, offsets, chain,
++		err, NULL);
++}
++
+ /**
+  *	ext2_find_near - find a place for allocation with sufficient locality
+  *	@inode: owner
+@@ -536,7 +547,8 @@ changed:
+  * reachable from inode.
+  */
+ 
+-static int ext2_get_block(struct inode *inode, sector_t iblock, struct buffer_head *bh_result, int create)
++static int ext2_get_block_wq(struct inode *inode, sector_t iblock,
++	struct buffer_head *bh_result, int create, wait_queue_t *wait)
+ {
+ 	int err = -EIO;
+ 	int offsets[4];
+@@ -551,7 +563,8 @@ static int ext2_get_block(struct inode *
+ 		goto out;
+ 
+ reread:
+-	partial = ext2_get_branch(inode, depth, offsets, chain, &err);
++	partial = ext2_get_branch_wq(inode, depth, offsets, chain, &err,
++		wait);
+ 
+ 	/* Simplest case - block found, no allocation needed */
+ 	if (!partial) {
+@@ -565,7 +578,7 @@ got_it:
+ 	}
+ 
+ 	/* Next simple case - plain lookup or failed read of indirect block */
+-	if (!create || err == -EIO) {
++	if (!create || err == -EIO || err == -EIOCBRETRY) {
+ cleanup:
+ 		while (partial > chain) {
+ 			brelse(partial->bh);
+@@ -606,6 +619,19 @@ changed:
+ 	goto reread;
+ }
+ 
++static int ext2_get_block_async(struct inode *inode, sector_t iblock,
++	struct buffer_head *bh_result, int create)
++{
++	return ext2_get_block_wq(inode, iblock, bh_result, create,
++		current->io_wait);
++}
++
++static int ext2_get_block(struct inode *inode, sector_t iblock,
++	struct buffer_head *bh_result, int create)
++{
++	return ext2_get_block_wq(inode, iblock, bh_result, create, NULL);
++}
++
+ static int ext2_writepage(struct page *page, struct writeback_control *wbc)
+ {
+ 	return block_write_full_page(page, ext2_get_block, wbc);
+@@ -627,7 +653,7 @@ static int
+ ext2_prepare_write(struct file *file, struct page *page,
+ 			unsigned from, unsigned to)
+ {
+-	return block_prepare_write(page,from,to,ext2_get_block);
++	return block_prepare_write(page,from,to,ext2_get_block_async);
+ }
+ 
+ static int
+@@ -659,7 +685,7 @@ ext2_direct_IO(int rw, struct kiocb *ioc
+ 			loff_t offset, unsigned long nr_segs)
+ {
+ 	struct file *file = iocb->ki_filp;
+-	struct inode *inode = file->f_dentry->d_inode->i_mapping->host;
++	struct inode *inode = file->f_mapping->host;
+ 
+ 	return blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev, iov,
+ 				offset, nr_segs, ext2_get_blocks, NULL);
+--- linux-2.6.0/fs/ext3/balloc.c	2003-08-22 19:23:42.000000000 -0700
++++ 25/fs/ext3/balloc.c	2003-12-28 23:22:36.000000000 -0800
+@@ -517,7 +517,7 @@ ext3_new_block(handle_t *handle, struct 
+ 		sbi->s_resuid != current->fsuid &&
+ 		(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
+ 		*errp = -ENOSPC;
+-		return 0;
++		goto out;
+ 	}
+ 
+ 	/*
+--- linux-2.6.0/fs/ext3/inode.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/ext3/inode.c	2003-12-28 23:21:19.000000000 -0800
+@@ -1532,7 +1532,7 @@ static int ext3_direct_IO(int rw, struct
+ 			unsigned long nr_segs)
+ {
+ 	struct file *file = iocb->ki_filp;
+-	struct inode *inode = file->f_dentry->d_inode->i_mapping->host;
++	struct inode *inode = file->f_mapping->host;
+ 	struct ext3_inode_info *ei = EXT3_I(inode);
+ 	handle_t *handle = NULL;
+ 	int ret;
+--- linux-2.6.0/fs/ext3/super.c	2003-10-08 15:07:09.000000000 -0700
++++ 25/fs/ext3/super.c	2003-12-28 23:22:17.000000000 -0800
+@@ -340,6 +340,7 @@ fail:
+  */
+ static int ext3_blkdev_put(struct block_device *bdev)
+ {
++	bd_release(bdev);
+ 	return blkdev_put(bdev, BDEV_FS);
+ }
+ 
+@@ -1480,6 +1481,13 @@ static journal_t *ext3_get_dev_journal(s
+ 	if (bdev == NULL)
+ 		return NULL;
+ 
++	if (bd_claim(bdev, sb)) {
++		printk(KERN_ERR
++		        "EXT3: failed to claim external journal device.\n");
++		blkdev_put(bdev, BDEV_FS);
++		return NULL;
++	}
++
+ 	blocksize = sb->s_blocksize;
+ 	hblock = bdev_hardsect_size(bdev);
+ 	if (blocksize < hblock) {
+@@ -1944,9 +1952,9 @@ int ext3_statfs (struct super_block * sb
+ /* Blocks: quota info + (4 pointer blocks + 1 entry block) * (3 indirect + 1 descriptor + 1 bitmap) + superblock */
+ #define EXT3_V0_QFMT_BLOCKS 27
+ 
+-static int (*old_sync_dquot)(struct dquot *dquot);
++static int (*old_write_dquot)(struct dquot *dquot);
+ 
+-static int ext3_sync_dquot(struct dquot *dquot)
++static int ext3_write_dquot(struct dquot *dquot)
+ {
+ 	int nblocks;
+ 	int ret;
+@@ -1971,7 +1979,7 @@ static int ext3_sync_dquot(struct dquot 
+ 		ret = PTR_ERR(handle);
+ 		goto out;
+ 	}
+-	ret = old_sync_dquot(dquot);
++	ret = old_write_dquot(dquot);
+ 	err = ext3_journal_stop(handle);
+ 	if (ret == 0)
+ 		ret = err;
+@@ -2004,8 +2012,8 @@ static int __init init_ext3_fs(void)
+ 		goto out1;
+ #ifdef CONFIG_QUOTA
+ 	init_dquot_operations(&ext3_qops);
+-	old_sync_dquot = ext3_qops.sync_dquot;
+-	ext3_qops.sync_dquot = ext3_sync_dquot;
++	old_write_dquot = ext3_qops.write_dquot;
++	ext3_qops.write_dquot = ext3_write_dquot;
+ #endif
+         err = register_filesystem(&ext3_fs_type);
+ 	if (err)
+--- linux-2.6.0/fs/fat/file.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/fat/file.c	2003-12-28 23:22:50.000000000 -0800
+@@ -20,6 +20,8 @@ struct file_operations fat_file_operatio
+ 	.write		= fat_file_write,
+ 	.mmap		= generic_file_mmap,
+ 	.fsync		= file_fsync,
++	.readv		= generic_file_readv,
++	.writev		= generic_file_writev,
+ 	.sendfile	= generic_file_sendfile,
+ };
+ 
+--- linux-2.6.0/fs/fat/inode.c	2003-11-23 19:03:01.000000000 -0800
++++ 25/fs/fat/inode.c	2003-12-28 23:22:52.000000000 -0800
+@@ -191,9 +191,9 @@ static int fat_show_options(struct seq_f
+ 	int isvfat = opts->isvfat;
+ 
+ 	if (opts->fs_uid != 0)
+-		seq_printf(m, ",uid=%d", opts->fs_uid);
++		seq_printf(m, ",uid=%u", opts->fs_uid);
+ 	if (opts->fs_gid != 0)
+-		seq_printf(m, ",gid=%d", opts->fs_gid);
++		seq_printf(m, ",gid=%u", opts->fs_gid);
+ 	seq_printf(m, ",fmask=%04o", opts->fs_fmask);
+ 	seq_printf(m, ",dmask=%04o", opts->fs_dmask);
+ 	if (sbi->nls_disk)
+@@ -765,8 +765,9 @@ int fat_fill_super(struct super_block *s
+ 	struct buffer_head *bh;
+ 	struct fat_boot_sector *b;
+ 	struct msdos_sb_info *sbi;
+-	int logical_sector_size, fat_clusters, debug, cp, first;
+-	unsigned int total_sectors, rootdir_sectors;
++	u16 logical_sector_size;
++	u32 total_sectors, total_clusters, fat_clusters, rootdir_sectors;
++	int debug, cp, first;
+ 	unsigned int media;
+ 	long error;
+ 	char buf[50];
+@@ -831,14 +832,13 @@ int fat_fill_super(struct super_block *s
+ 		brelse(bh);
+ 		goto out_invalid;
+ 	}
+-	logical_sector_size =
+-		CF_LE_W(get_unaligned((unsigned short *) &b->sector_size));
++	logical_sector_size = CF_LE_W(get_unaligned((u16 *)&b->sector_size));
+ 	if (!logical_sector_size
+ 	    || (logical_sector_size & (logical_sector_size - 1))
+ 	    || (logical_sector_size < 512)
+ 	    || (PAGE_CACHE_SIZE < logical_sector_size)) {
+ 		if (!silent)
+-			printk(KERN_ERR "FAT: bogus logical sector size %d\n",
++			printk(KERN_ERR "FAT: bogus logical sector size %u\n",
+ 			       logical_sector_size);
+ 		brelse(bh);
+ 		goto out_invalid;
+@@ -847,7 +847,7 @@ int fat_fill_super(struct super_block *s
+ 	if (!sbi->sec_per_clus
+ 	    || (sbi->sec_per_clus & (sbi->sec_per_clus - 1))) {
+ 		if (!silent)
+-			printk(KERN_ERR "FAT: bogus sectors per cluster %d\n",
++			printk(KERN_ERR "FAT: bogus sectors per cluster %u\n",
+ 			       sbi->sec_per_clus);
+ 		brelse(bh);
+ 		goto out_invalid;
+@@ -855,7 +855,7 @@ int fat_fill_super(struct super_block *s
+ 
+ 	if (logical_sector_size < sb->s_blocksize) {
+ 		printk(KERN_ERR "FAT: logical sector size too small for device"
+-		       " (logical sector size = %d)\n", logical_sector_size);
++		       " (logical sector size = %u)\n", logical_sector_size);
+ 		brelse(bh);
+ 		goto out_fail;
+ 	}
+@@ -863,7 +863,7 @@ int fat_fill_super(struct super_block *s
+ 		brelse(bh);
+ 
+ 		if (!sb_set_blocksize(sb, logical_sector_size)) {
+-			printk(KERN_ERR "FAT: unable to set blocksize %d\n",
++			printk(KERN_ERR "FAT: unable to set blocksize %u\n",
+ 			       logical_sector_size);
+ 			goto out_fail;
+ 		}
+@@ -885,7 +885,7 @@ int fat_fill_super(struct super_block *s
+ 	sbi->fat_length = CF_LE_W(b->fat_length);
+ 	sbi->root_cluster = 0;
+ 	sbi->free_clusters = -1;	/* Don't know yet */
+-	sbi->prev_free = 0;
++	sbi->prev_free = -1;
+ 
+ 	if (!sbi->fat_length && b->fat32_length) {
+ 		struct fat_boot_fsinfo *fsinfo;
+@@ -932,10 +932,11 @@ int fat_fill_super(struct super_block *s
+ 	sbi->dir_per_block_bits = ffs(sbi->dir_per_block) - 1;
+ 
+ 	sbi->dir_start = sbi->fat_start + sbi->fats * sbi->fat_length;
+-	sbi->dir_entries =
+-		CF_LE_W(get_unaligned((unsigned short *)&b->dir_entries));
++	sbi->dir_entries = CF_LE_W(get_unaligned((u16 *)&b->dir_entries));
+ 	if (sbi->dir_entries & (sbi->dir_per_block - 1)) {
+-		printk(KERN_ERR "FAT: bogus directroy-entries per block\n");
++		if (!silent)
++			printk(KERN_ERR "FAT: bogus directroy-entries per block"
++			       " (%u)\n", sbi->dir_entries);
+ 		brelse(bh);
+ 		goto out_invalid;
+ 	}
+@@ -943,18 +944,27 @@ int fat_fill_super(struct super_block *s
+ 	rootdir_sectors = sbi->dir_entries
+ 		* sizeof(struct msdos_dir_entry) / sb->s_blocksize;
+ 	sbi->data_start = sbi->dir_start + rootdir_sectors;
+-	total_sectors = CF_LE_W(get_unaligned((unsigned short *)&b->sectors));
++	total_sectors = CF_LE_W(get_unaligned((u16 *)&b->sectors));
+ 	if (total_sectors == 0)
+ 		total_sectors = CF_LE_L(b->total_sect);
+-	sbi->clusters = (total_sectors - sbi->data_start) / sbi->sec_per_clus;
++
++	total_clusters = (total_sectors - sbi->data_start) / sbi->sec_per_clus;
+ 
+ 	if (sbi->fat_bits != 32)
+-		sbi->fat_bits = (sbi->clusters > MSDOS_FAT12) ? 16 : 12;
++		sbi->fat_bits = (total_clusters > MAX_FAT12) ? 16 : 12;
+ 
+ 	/* check that FAT table does not overflow */
+ 	fat_clusters = sbi->fat_length * sb->s_blocksize * 8 / sbi->fat_bits;
+-	if (sbi->clusters > fat_clusters - 2)
+-		sbi->clusters = fat_clusters - 2;
++	total_clusters = min(total_clusters, fat_clusters - 2);
++	if (total_clusters > MAX_FAT(sb)) {
++		if (!silent)
++			printk(KERN_ERR "FAT: count of clusters too big (%u)\n",
++			       total_clusters);
++		brelse(bh);
++		goto out_invalid;
++	}
++
++	sbi->clusters = total_clusters;
+ 
+ 	brelse(bh);
+ 
+@@ -968,6 +978,8 @@ int fat_fill_super(struct super_block *s
+ 		/* all is as it should be */
+ 	} else if (media == 0xf8 && FAT_FIRST_ENT(sb, 0xfe) == first) {
+ 		/* bad, reported on pc9800 */
++	} else if (media == 0xf0 && FAT_FIRST_ENT(sb, 0xf8) == first) {
++		/* bad, reported with a MO disk on win95/me */
+ 	} else if (first == 0) {
+ 		/* bad, reported with a SmartMedia card */
+ 	} else {
+@@ -1047,7 +1059,7 @@ out_fail:
+ 
+ int fat_statfs(struct super_block *sb, struct kstatfs *buf)
+ {
+-	int free, nr;
++	int free, nr, ret;
+        
+ 	if (MSDOS_SB(sb)->free_clusters != -1)
+ 		free = MSDOS_SB(sb)->free_clusters;
+@@ -1057,9 +1069,14 @@ int fat_statfs(struct super_block *sb, s
+ 			free = MSDOS_SB(sb)->free_clusters;
+ 		else {
+ 			free = 0;
+-			for (nr = 2; nr < MSDOS_SB(sb)->clusters + 2; nr++)
+-				if (fat_access(sb, nr, -1) == FAT_ENT_FREE)
++			for (nr = 2; nr < MSDOS_SB(sb)->clusters + 2; nr++) {
++				ret = fat_access(sb, nr, -1);
++				if (ret < 0) {
++					unlock_fat(sb);
++					return ret;
++				} else if (ret == FAT_ENT_FREE)
+ 					free++;
++			}
+ 			MSDOS_SB(sb)->free_clusters = free;
+ 		}
+ 		unlock_fat(sb);
+@@ -1209,10 +1226,10 @@ retry:
+ 	}
+ 	lock_kernel();
+ 	if (!(bh = sb_bread(sb, i_pos >> MSDOS_SB(sb)->dir_per_block_bits))) {
+-		fat_fs_panic(sb, "unable to read i-node block (i_pos %lld)",
+-			     i_pos);
++		printk(KERN_ERR "FAT: unable to read inode block "
++		       "for updating (i_pos %lld)", i_pos);
+ 		unlock_kernel();
+-		return;
++		return /* -EIO */;
+ 	}
+ 	spin_lock(&fat_inode_lock);
+ 	if (i_pos != MSDOS_I(inode)->i_pos) {
+--- linux-2.6.0/fs/fat/misc.c	2003-08-08 22:55:13.000000000 -0700
++++ 25/fs/fat/misc.c	2003-12-28 23:22:51.000000000 -0800
+@@ -74,7 +74,7 @@ void fat_clusters_flush(struct super_blo
+ 	} else {
+ 		if (sbi->free_clusters != -1)
+ 			fsinfo->free_clusters = CF_LE_L(sbi->free_clusters);
+-		if (sbi->prev_free)
++		if (sbi->prev_free != -1)
+ 			fsinfo->next_cluster = CF_LE_L(sbi->prev_free);
+ 		mark_buffer_dirty(bh);
+ 	}
+@@ -88,7 +88,7 @@ void fat_clusters_flush(struct super_blo
+ int fat_add_cluster(struct inode *inode)
+ {
+ 	struct super_block *sb = inode->i_sb;
+-	int count, limit, new_dclus, new_fclus, last;
++	int ret, count, limit, new_dclus, new_fclus, last;
+ 	int cluster_bits = MSDOS_SB(sb)->cluster_bits;
+ 	
+ 	/* 
+@@ -123,7 +123,12 @@ int fat_add_cluster(struct inode *inode)
+ 		new_dclus = new_dclus % limit;
+ 		if (new_dclus < 2)
+ 			new_dclus = 2;
+-		if (fat_access(sb, new_dclus, -1) == FAT_ENT_FREE)
++
++		ret = fat_access(sb, new_dclus, -1);
++		if (ret < 0) {
++			unlock_fat(sb);
++			return ret;
++		} else if (ret == FAT_ENT_FREE)
+ 			break;
+ 	}
+ 	if (count >= MSDOS_SB(sb)->clusters) {
+@@ -131,9 +136,14 @@ int fat_add_cluster(struct inode *inode)
+ 		unlock_fat(sb);
+ 		return -ENOSPC;
+ 	}
+-	MSDOS_SB(sb)->prev_free = new_dclus;
+ 
+-	fat_access(sb, new_dclus, FAT_ENT_EOF);
++	ret = fat_access(sb, new_dclus, FAT_ENT_EOF);
++	if (ret < 0) {
++		unlock_fat(sb);
++		return ret;
++	}
++
++	MSDOS_SB(sb)->prev_free = new_dclus;
+ 	if (MSDOS_SB(sb)->free_clusters != -1)
+ 		MSDOS_SB(sb)->free_clusters--;
+ 	fat_clusters_flush(sb);
+@@ -142,7 +152,9 @@ int fat_add_cluster(struct inode *inode)
+ 
+ 	/* add new one to the last of the cluster chain */
+ 	if (last) {
+-		fat_access(sb, last, new_dclus);
++		ret = fat_access(sb, last, new_dclus);
++		if (ret < 0)
++			return ret;
+ 		fat_cache_add(inode, new_fclus, new_dclus);
+ 	} else {
+ 		MSDOS_I(inode)->i_start = new_dclus;
+--- linux-2.6.0/fs/fcntl.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/fcntl.c	2003-12-28 23:21:20.000000000 -0800
+@@ -229,8 +229,8 @@ static int setfl(int fd, struct file * f
+ 		   arg |= O_NONBLOCK;
+ 
+ 	if (arg & O_DIRECT) {
+-		if (!inode->i_mapping || !inode->i_mapping->a_ops ||
+-			!inode->i_mapping->a_ops->direct_IO)
++		if (!filp->f_mapping || !filp->f_mapping->a_ops ||
++			!filp->f_mapping->a_ops->direct_IO)
+ 				return -EINVAL;
+ 	}
+ 
+--- linux-2.6.0/fs/file_table.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/file_table.c	2003-12-28 23:22:13.000000000 -0800
+@@ -120,6 +120,7 @@ int open_private_file(struct file *filp,
+ 	filp->f_mode   = (flags+1) & O_ACCMODE;
+ 	atomic_set(&filp->f_count, 1);
+ 	filp->f_dentry = dentry;
++	filp->f_mapping = dentry->d_inode->i_mapping;
+ 	filp->f_uid    = current->fsuid;
+ 	filp->f_gid    = current->fsgid;
+ 	filp->f_op     = dentry->d_inode->i_fop;
+@@ -183,9 +184,9 @@ void __fput(struct file *file)
+ 	fops_put(file->f_op);
+ 	if (file->f_mode & FMODE_WRITE)
+ 		put_write_access(inode);
++	file_kill(file);
+ 	file->f_dentry = NULL;
+ 	file->f_vfsmnt = NULL;
+-	file_kill(file);
+ 	file_free(file);
+ 	dput(dentry);
+ 	mntput(mnt);
+--- linux-2.6.0/fs/fs-writeback.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/fs-writeback.c	2003-12-28 23:21:20.000000000 -0800
+@@ -514,7 +514,7 @@ EXPORT_SYMBOL(write_inode_now);
+  *    OSYNC_INODE:    the inode itself
+  */
+ 
+-int generic_osync_inode(struct inode *inode, int what)
++int generic_osync_inode(struct inode *inode, struct address_space *mapping, int what)
+ {
+ 	int err = 0;
+ 	int need_write_inode_now = 0;
+@@ -522,14 +522,14 @@ int generic_osync_inode(struct inode *in
+ 
+ 	current->flags |= PF_SYNCWRITE;
+ 	if (what & OSYNC_DATA)
+-		err = filemap_fdatawrite(inode->i_mapping);
++		err = filemap_fdatawrite(mapping);
+ 	if (what & (OSYNC_METADATA|OSYNC_DATA)) {
+-		err2 = sync_mapping_buffers(inode->i_mapping);
++		err2 = sync_mapping_buffers(mapping);
+ 		if (!err)
+ 			err = err2;
+ 	}
+ 	if (what & OSYNC_DATA) {
+-		err2 = filemap_fdatawait(inode->i_mapping);
++		err2 = filemap_fdatawait(mapping);
+ 		if (!err)
+ 			err = err2;
+ 	}
+--- linux-2.6.0/fs/hugetlbfs/inode.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/hugetlbfs/inode.c	2003-12-28 23:26:43.000000000 -0800
+@@ -165,7 +165,7 @@ void truncate_hugepages(struct address_s
+ 	pagevec_init(&pvec, 0);
+ 	next = start;
+ 	while (1) {
+-		if (!pagevec_lookup(&pvec, mapping, next, PAGEVEC_SIZE)) {
++		if (!pagevec_lookup(&pvec, mapping, &next, PAGEVEC_SIZE)) {
+ 			if (next == start)
+ 				break;
+ 			next = start;
+@@ -176,9 +176,6 @@ void truncate_hugepages(struct address_s
+ 			struct page *page = pvec.pages[i];
+ 
+ 			lock_page(page);
+-			if (page->index > next)
+-				next = page->index;
+-			++next;
+ 			truncate_huge_page(page);
+ 			unlock_page(page);
+ 			hugetlb_put_quota(mapping);
+@@ -194,6 +191,7 @@ static void hugetlbfs_delete_inode(struc
+ 
+ 	hlist_del_init(&inode->i_hash);
+ 	list_del_init(&inode->i_list);
++	list_del_init(&inode->i_sb_list);
+ 	inode->i_state |= I_FREEING;
+ 	inodes_stat.nr_inodes--;
+ 	spin_unlock(&inode_lock);
+@@ -236,6 +234,7 @@ static void hugetlbfs_forget_inode(struc
+ 	hlist_del_init(&inode->i_hash);
+ out_truncate:
+ 	list_del_init(&inode->i_list);
++	list_del_init(&inode->i_sb_list);
+ 	inode->i_state |= I_FREEING;
+ 	inodes_stat.nr_inodes--;
+ 	spin_unlock(&inode_lock);
+@@ -788,6 +787,7 @@ struct file *hugetlb_zero_setup(size_t s
+ 	inode->i_nlink = 0;
+ 	file->f_vfsmnt = mntget(hugetlbfs_vfsmount);
+ 	file->f_dentry = dentry;
++	file->f_mapping = inode->i_mapping;
+ 	file->f_op = &hugetlbfs_file_operations;
+ 	file->f_mode = FMODE_WRITE | FMODE_READ;
+ 	return file;
+--- linux-2.6.0/fs/inode.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/inode.c	2003-12-28 23:26:37.000000000 -0800
+@@ -183,6 +183,7 @@ void inode_init_once(struct inode *inode
+ 	INIT_LIST_HEAD(&inode->i_dentry);
+ 	INIT_LIST_HEAD(&inode->i_devices);
+ 	sema_init(&inode->i_sem, 1);
++	init_rwsem(&inode->i_alloc_sem);
+ 	INIT_RADIX_TREE(&inode->i_data.page_tree, GFP_ATOMIC);
+ 	spin_lock_init(&inode->i_data.page_lock);
+ 	init_MUTEX(&inode->i_data.i_shared_sem);
+@@ -285,7 +286,7 @@ static void dispose_list(struct list_hea
+ /*
+  * Invalidate all inodes for a device.
+  */
+-static int invalidate_list(struct list_head *head, struct super_block * sb, struct list_head * dispose)
++static int invalidate_list(struct list_head *head, struct list_head *dispose)
+ {
+ 	struct list_head *next;
+ 	int busy = 0, count = 0;
+@@ -298,13 +299,12 @@ static int invalidate_list(struct list_h
+ 		next = next->next;
+ 		if (tmp == head)
+ 			break;
+-		inode = list_entry(tmp, struct inode, i_list);
+-		if (inode->i_sb != sb)
+-			continue;
++		inode = list_entry(tmp, struct inode, i_sb_list);
+ 		invalidate_inode_buffers(inode);
+ 		if (!atomic_read(&inode->i_count)) {
+ 			hlist_del_init(&inode->i_hash);
+ 			list_del(&inode->i_list);
++			list_del(&inode->i_sb_list);
+ 			list_add(&inode->i_list, dispose);
+ 			inode->i_state |= I_FREEING;
+ 			count++;
+@@ -340,10 +340,7 @@ int invalidate_inodes(struct super_block
+ 
+ 	down(&iprune_sem);
+ 	spin_lock(&inode_lock);
+-	busy = invalidate_list(&inode_in_use, sb, &throw_away);
+-	busy |= invalidate_list(&inode_unused, sb, &throw_away);
+-	busy |= invalidate_list(&sb->s_dirty, sb, &throw_away);
+-	busy |= invalidate_list(&sb->s_io, sb, &throw_away);
++	busy = invalidate_list(&sb->s_inodes, &throw_away);
+ 	spin_unlock(&inode_lock);
+ 
+ 	dispose_list(&throw_away);
+@@ -443,6 +440,7 @@ static void prune_icache(int nr_to_scan)
+ 				continue;
+ 		}
+ 		hlist_del_init(&inode->i_hash);
++		list_del_init(&inode->i_sb_list);
+ 		list_move(&inode->i_list, &freeable);
+ 		inode->i_state |= I_FREEING;
+ 		nr_pruned++;
+@@ -553,6 +551,7 @@ struct inode *new_inode(struct super_blo
+ 		spin_lock(&inode_lock);
+ 		inodes_stat.nr_inodes++;
+ 		list_add(&inode->i_list, &inode_in_use);
++		list_add(&inode->i_sb_list, &sb->s_inodes);
+ 		inode->i_ino = ++last_ino;
+ 		inode->i_state = 0;
+ 		spin_unlock(&inode_lock);
+@@ -601,6 +600,7 @@ static struct inode * get_new_inode(stru
+ 
+ 			inodes_stat.nr_inodes++;
+ 			list_add(&inode->i_list, &inode_in_use);
++			list_add(&inode->i_sb_list, &sb->s_inodes);
+ 			hlist_add_head(&inode->i_hash, head);
+ 			inode->i_state = I_LOCK|I_NEW;
+ 			spin_unlock(&inode_lock);
+@@ -649,6 +649,7 @@ static struct inode * get_new_inode_fast
+ 			inode->i_ino = ino;
+ 			inodes_stat.nr_inodes++;
+ 			list_add(&inode->i_list, &inode_in_use);
++			list_add(&inode->i_sb_list, &sb->s_inodes);
+ 			hlist_add_head(&inode->i_hash, head);
+ 			inode->i_state = I_LOCK|I_NEW;
+ 			spin_unlock(&inode_lock);
+@@ -984,6 +985,7 @@ void generic_delete_inode(struct inode *
+ 	struct super_operations *op = inode->i_sb->s_op;
+ 
+ 	list_del_init(&inode->i_list);
++	list_del_init(&inode->i_sb_list);
+ 	inode->i_state|=I_FREEING;
+ 	inodes_stat.nr_inodes--;
+ 	spin_unlock(&inode_lock);
+@@ -1031,6 +1033,7 @@ static void generic_forget_inode(struct 
+ 		hlist_del_init(&inode->i_hash);
+ 	}
+ 	list_del_init(&inode->i_list);
++	list_del_init(&inode->i_sb_list);
+ 	inode->i_state|=I_FREEING;
+ 	inodes_stat.nr_inodes--;
+ 	spin_unlock(&inode_lock);
+@@ -1221,34 +1224,17 @@ int remove_inode_dquot_ref(struct inode 
+ void remove_dquot_ref(struct super_block *sb, int type)
+ {
+ 	struct inode *inode;
+-	struct list_head *act_head;
+ 	LIST_HEAD(tofree_head);
+ 
+ 	if (!sb->dq_op)
+ 		return;	/* nothing to do */
+ 	spin_lock(&inode_lock);	/* This lock is for inodes code */
+ 	/* We don't have to lock against quota code - test IS_QUOTAINIT is just for speedup... */
+- 
+-	list_for_each(act_head, &inode_in_use) {
+-		inode = list_entry(act_head, struct inode, i_list);
+-		if (inode->i_sb == sb && IS_QUOTAINIT(inode))
+-			remove_inode_dquot_ref(inode, type, &tofree_head);
+-	}
+-	list_for_each(act_head, &inode_unused) {
+-		inode = list_entry(act_head, struct inode, i_list);
+-		if (inode->i_sb == sb && IS_QUOTAINIT(inode))
+-			remove_inode_dquot_ref(inode, type, &tofree_head);
+-	}
+-	list_for_each(act_head, &sb->s_dirty) {
+-		inode = list_entry(act_head, struct inode, i_list);
+-		if (IS_QUOTAINIT(inode))
+-			remove_inode_dquot_ref(inode, type, &tofree_head);
+-	}
+-	list_for_each(act_head, &sb->s_io) {
+-		inode = list_entry(act_head, struct inode, i_list);
++
++	list_for_each_entry(inode, &sb->s_inodes, i_sb_list)
+ 		if (IS_QUOTAINIT(inode))
+ 			remove_inode_dquot_ref(inode, type, &tofree_head);
+-	}
++
+ 	spin_unlock(&inode_lock);
+ 
+ 	put_dquot_list(&tofree_head);
+--- linux-2.6.0/fs/intermezzo/file.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/intermezzo/file.c	2003-12-28 23:21:18.000000000 -0800
+@@ -336,7 +336,7 @@ static void presto_apply_write_policy(st
+                                 unlock_kernel();
+                                 return; 
+                         }
+-                        error = presto_journal_close(&rec, fset, file,
++                        error = presto_journal_close(&rec, fset, fdata,
+                                                      file->f_dentry,
+                                                      &fdata->fd_version,
+                                                      &new_file_ver);
+--- linux-2.6.0/fs/intermezzo/intermezzo_fs.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/intermezzo/intermezzo_fs.h	2003-12-28 23:21:18.000000000 -0800
+@@ -603,7 +603,7 @@ int presto_journal_rename(struct rec_inf
+ int presto_journal_open(struct rec_info *, struct presto_file_set *,
+                         struct dentry *, struct presto_version *old_ver);
+ int presto_journal_close(struct rec_info *rec, struct presto_file_set *,
+-                         struct file *, struct dentry *,
++                         struct presto_file_data *, struct dentry *,
+                          struct presto_version *old_file_ver,
+                          struct presto_version *new_file_ver);
+ int presto_write_lml_close(struct rec_info *rec,
+--- linux-2.6.0/fs/intermezzo/journal.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/intermezzo/journal.c	2003-12-28 23:21:18.000000000 -0800
+@@ -2103,12 +2103,11 @@ int presto_journal_unlink(struct rec_inf
+ 
+ int
+ presto_journal_close(struct rec_info *rec, struct presto_file_set *fset,
+-                     struct file *file, struct dentry *dentry,
++                     struct presto_file_data *fd, struct dentry *dentry,
+                      struct presto_version *old_file_ver,
+                      struct presto_version *new_file_ver)
+ {
+         int opcode = KML_OPCODE_CLOSE;
+-        struct presto_file_data *fd;
+         char *buffer, *path, *logrecord, record[316];
+         struct dentry *root;
+         int error, size, i;
+@@ -2137,7 +2136,6 @@ presto_journal_close(struct rec_info *re
+ 
+         root = fset->fset_dentry;
+ 
+-        fd = (struct presto_file_data *)file->private_data;
+         if (fd) {
+                 open_ngroups = fd->fd_ngroups;
+                 for (i = 0; i < fd->fd_ngroups; i++)
+--- linux-2.6.0/fs/intermezzo/presto.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/intermezzo/presto.c	2003-12-28 23:21:18.000000000 -0800
+@@ -259,11 +259,8 @@ int lento_cancel_lml(char *path, 
+ 
+ 
+         if (info->flags & LENTO_FL_WRITE_KML) {
+-                struct file file;
+-                file.private_data = NULL;
+-                file.f_dentry = dentry; 
+                 presto_getversion(&new_ver, dentry->d_inode);
+-                error = presto_journal_close(&rec, fset, &file, dentry, 
++                error = presto_journal_close(&rec, fset, NULL, dentry,
+                                              &new_ver);
+                 if ( error ) {
+                         EXIT; 
+--- linux-2.6.0/fs/intermezzo/vfs.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/intermezzo/vfs.c	2003-12-28 23:21:18.000000000 -0800
+@@ -321,7 +321,7 @@ int presto_do_close(struct presto_file_s
+         }
+ 
+         if (fdata->fd_info.flags & LENTO_FL_KML) 
+-                rc = presto_journal_close(&rec, fset, file, file->f_dentry,
++                rc = presto_journal_close(&rec, fset, fdata, file->f_dentry,
+                                           &fdata->fd_version, 
+                                           &fdata->fd_info.remote_version);
+         if (rc) { 
+@@ -431,14 +431,11 @@ int presto_do_setattr(struct presto_file
+ 
+         if ( presto_do_kml(info, dentry) ) {
+                 if ((iattr->ia_valid & ATTR_SIZE) && (old_size != inode->i_size)) {
+-                        struct file file;
+                         /* Journal a close whenever we see a potential truncate
+                         * At the receiving end, lento should explicitly remove
+                         * ATTR_SIZE from the list of valid attributes */
+                         presto_getversion(&new_ver, inode);
+-                        file.private_data = NULL;
+-                        file.f_dentry = dentry;
+-                        error = presto_journal_close(&rec, fset, &file, dentry,
++                        error = presto_journal_close(&rec, fset, NULL, dentry,
+                                                      &old_ver, &new_ver);
+                 }
+ 
+@@ -2086,7 +2083,9 @@ static struct file *presto_filp_dopen(st
+                 }
+         }
+ 
++	/* XXX: where the fuck is ->f_vfsmnt? */
+         f->f_dentry = dentry;
++        f->f_mapping = dentry->d_inode->i_mapping;
+         f->f_pos = 0;
+         //f->f_reada = 0;
+         f->f_op = NULL;
+--- linux-2.6.0/fs/ioctl.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/ioctl.c	2003-12-28 23:21:20.000000000 -0800
+@@ -22,7 +22,7 @@ static int file_ioctl(struct file *filp,
+ 	switch (cmd) {
+ 		case FIBMAP:
+ 		{
+-			struct address_space *mapping = inode->i_mapping;
++			struct address_space *mapping = filp->f_mapping;
+ 			int res;
+ 			/* do we support this mess? */
+ 			if (!mapping->a_ops->bmap)
+--- linux-2.6.0/fs/isofs/inode.c	2003-10-08 15:07:09.000000000 -0700
++++ 25/fs/isofs/inode.c	2003-12-28 23:23:02.000000000 -0800
+@@ -447,10 +447,7 @@ static int parse_options(char *options, 
+ 		case Opt_sb:
+ 			if (match_int(&args[0], &option))
+ 				return 0;
+-			n = option;
+-			if (n > 660 * 512)
+-				return 0;
+-			popt->sbsector = n;
++			popt->sbsector = option;
+ 			break;
+ 		case Opt_check_r:
+ 			popt->check = 'r';
+@@ -1463,4 +1460,5 @@ static void __exit exit_iso9660_fs(void)
+ module_init(init_iso9660_fs)
+ module_exit(exit_iso9660_fs)
+ MODULE_LICENSE("GPL");
+-
++/* Actual filesystem name is iso9660, as requested in filesystems.c */
++MODULE_ALIAS("iso9660");
+--- linux-2.6.0/fs/jbd/commit.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/jbd/commit.c	2003-12-28 23:22:22.000000000 -0800
+@@ -177,8 +177,14 @@ void journal_commit_transaction(journal_
+ 		 * leave undo-committed data.
+ 		 */
+ 		if (jh->b_committed_data) {
+-			kfree(jh->b_committed_data);
+-			jh->b_committed_data = NULL;
++			struct buffer_head *bh = jh2bh(jh);
++
++			jbd_lock_bh_state(bh);
++			if (jh->b_committed_data) {
++				kfree(jh->b_committed_data);
++				jh->b_committed_data = NULL;
++			}
++			jbd_unlock_bh_state(bh);
+ 		}
+ 		journal_refile_buffer(journal, jh);
+ 	}
+@@ -264,6 +270,16 @@ write_out_data_locked:
+ 				jbd_unlock_bh_state(bh);
+ 				journal_remove_journal_head(bh);
+ 				__brelse(bh);
++				if (need_resched() && commit_transaction->
++							t_sync_datalist) {
++					commit_transaction->t_sync_datalist =
++								next_jh;
++					if (bufs)
++						break;
++					spin_unlock(&journal->j_list_lock);
++					cond_resched();
++					goto write_out_data;
++				}
+ 			}
+ 		}
+ 		if (bufs == ARRAY_SIZE(wbuf)) {
+@@ -284,8 +300,7 @@ write_out_data_locked:
+ 		cond_resched();
+ 		journal_brelse_array(wbuf, bufs);
+ 		spin_lock(&journal->j_list_lock);
+-		if (bufs)
+-			goto write_out_data_locked;
++		goto write_out_data_locked;
+ 	}
+ 
+ 	/*
+--- linux-2.6.0/fs/jffs/intrep.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/jffs/intrep.c	2003-12-28 23:21:43.000000000 -0800
+@@ -3337,18 +3337,16 @@ jffs_garbage_collect_thread(void *ptr)
+ 	int result = 0;
+ 	D1(int i = 1);
+ 
++	daemonize("jffs_gcd");
++
+ 	c->gc_task = current;
+ 
+ 	lock_kernel();
+-	exit_mm(c->gc_task);
+-
+-	set_special_pids(1, 1);
+ 	init_completion(&c->gc_thread_comp); /* barrier */ 
+ 	spin_lock_irq(&current->sighand->siglock);
+ 	siginitsetinv (&current->blocked, sigmask(SIGHUP) | sigmask(SIGKILL) | sigmask(SIGSTOP) | sigmask(SIGCONT));
+ 	recalc_sigpending();
+ 	spin_unlock_irq(&current->sighand->siglock);
+-	strcpy(current->comm, "jffs_gcd");
+ 
+ 	D1(printk (KERN_NOTICE "jffs_garbage_collect_thread(): Starting infinite loop.\n"));
+ 
+--- linux-2.6.0/fs/jfs/inode.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/jfs/inode.c	2003-12-28 23:21:19.000000000 -0800
+@@ -306,7 +306,7 @@ static int jfs_direct_IO(int rw, struct 
+ 			loff_t offset, unsigned long nr_segs)
+ {
+ 	struct file *file = iocb->ki_filp;
+-	struct inode *inode = file->f_dentry->d_inode->i_mapping->host;
++	struct inode *inode = file->f_mapping->host;
+ 
+ 	return blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev, iov,
+ 				offset, nr_segs, jfs_get_blocks, NULL);
+--- linux-2.6.0/fs/jfs/namei.c	2003-11-23 19:03:01.000000000 -0800
++++ 25/fs/jfs/namei.c	2003-12-28 23:22:29.000000000 -0800
+@@ -1439,14 +1439,18 @@ static struct dentry *jfs_lookup(struct 
+ struct dentry *jfs_get_parent(struct dentry *dentry)
+ {
+ 	struct super_block *sb = dentry->d_inode->i_sb;
+-	struct dentry *parent = ERR_PTR(-EACCES);
++	struct dentry *parent = ERR_PTR(-ENOENT);
+ 	struct inode *inode;
++	unsigned long parent_ino;
+ 
+-	inode = iget(sb, JFS_IP(dentry->d_inode)->i_dtroot.header.idotdot);
++	parent_ino =
++		le32_to_cpu(JFS_IP(dentry->d_inode)->i_dtroot.header.idotdot);
++	inode = iget(sb, parent_ino);
+ 	if (inode) {
+-		if (is_bad_inode(inode))
++		if (is_bad_inode(inode)) {
+ 			iput(inode);
+-		else {
++			parent = ERR_PTR(-EACCES);
++		} else {
+ 			parent = d_alloc_anon(inode);
+ 			if (!parent) {
+ 				parent = ERR_PTR(-ENOMEM);
+--- linux-2.6.0/fs/Kconfig	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/Kconfig	2003-12-28 23:21:55.000000000 -0800
+@@ -246,6 +246,7 @@ config REISERFS_PROC_INFO
+ 
+ config JFS_FS
+ 	tristate "JFS filesystem support"
++	select NLS
+ 	help
+ 	  This is a port of IBM's Journaled Filesystem .  More information is
+ 	  available in the file Documentation/filesystems/jfs.txt.
+@@ -485,6 +486,7 @@ config ISO9660_FS
+ config JOLIET
+ 	bool "Microsoft Joliet CDROM extensions"
+ 	depends on ISO9660_FS
++	select NLS
+ 	help
+ 	  Joliet is a Microsoft extension for the ISO 9660 CD-ROM file system
+ 	  which allows for long filenames in unicode format (unicode is the
+@@ -530,6 +532,7 @@ menu "DOS/FAT/NT Filesystems"
+ 
+ config FAT_FS
+ 	tristate "DOS FAT fs support"
++	select NLS
+ 	help
+ 	  If you want to use one of the FAT-based file systems (the MS-DOS,
+ 	  VFAT (Windows 95) and UMSDOS (used to run Linux on top of an
+@@ -651,6 +654,7 @@ config UMSDOS_FS
+ 
+ config NTFS_FS
+ 	tristate "NTFS file system support"
++	select NLS
+ 	help
+ 	  NTFS is the file system of Microsoft Windows NT, 2000, XP and 2003.
+ 
+@@ -764,6 +768,30 @@ config PROC_KCORE
+ 	bool
+ 	default y if !ARM
+ 
++config SYSFS
++	bool "sysfs file system support" if EMBEDDED
++	default y
++	help
++	The sysfs filesystem is a virtual filesystem that the kernel uses to export
++	internal kernel objects, their attributes, and their relationships to one
++	another.
++
++	Users can use sysfs to ascertain useful information about the running kernel,
++	such as the devices the kernel has discovered on each bus and which driver
++	each is bound to. sysfs can also be used to tune devices and other kernel
++	subsystems.
++
++	Some system agents rely on the information in sysfs to operate. /sbin/hotplug
++	uses device and object attributes in sysfs to assist in delegating policy
++	decisions, like persistantly naming devices.
++
++	sysfs is currently needed by the block subsystem to mount the root partition.
++	Therefore, you MUST say Y if you're booting from a hard drive. If you use any
++	type of hotpluggable device, you'll also need sysfs for /sbin/hotplug support.
++
++	However, designers of embedded systems may want to say Y here to conserve
++	space.
++
+ config DEVFS_FS
+ 	bool "/dev file system support (OBSOLETE)"
+ 	depends on EXPERIMENTAL
+@@ -962,6 +990,7 @@ config HFS_FS
+ config BEFS_FS
+ 	tristate "BeOS file systemv(BeFS) support (read only) (EXPERIMENTAL)"
+ 	depends on EXPERIMENTAL
++	select NLS
+ 	help
+ 	  The BeOS File System (BeFS) is the native file system of Be, Inc's
+ 	  BeOS. Notable features include support for arbitrary attributes
+@@ -1440,6 +1469,7 @@ config RPCSEC_GSS_KRB5
+ config SMB_FS
+ 	tristate "SMB file system support (to mount Windows shares etc.)"
+ 	depends on INET
++	select NLS
+ 	help
+ 	  SMB (Server Message Block) is the protocol Windows for Workgroups
+ 	  (WfW), Windows 95/98, Windows NT and OS/2 Lan Manager use to share
+@@ -1495,6 +1525,7 @@ config SMB_NLS_REMOTE
+ config CIFS
+ 	tristate "CIFS support (advanced network filesystem for Samba, Window and other CIFS compliant servers)(EXPERIMENTAL)"
+ 	depends on INET
++	select NLS
+ 	help
+ 	  This is the client VFS module for the Common Internet File System
+ 	  (CIFS) protocol which is the successor to the Server Message Block 
+--- linux-2.6.0/fs/Kconfig.binfmt	2003-11-23 19:03:01.000000000 -0800
++++ 25/fs/Kconfig.binfmt	2003-12-28 23:22:18.000000000 -0800
+@@ -23,10 +23,6 @@ config BINFMT_ELF
+ 	  ld.so (check the file <file:Documentation/Changes> for location and
+ 	  latest version).
+ 
+-	  To compile this as a module, choose M here: the module will be called
+-	  binfmt_elf. Saying M or N here is dangerous because some crucial
+-	  programs on your system might be in ELF format.
+-
+ config BINFMT_FLAT
+ 	tristate "Kernel support for flat binaries"
+ 	depends on !MMU || SUPERH
+--- linux-2.6.0/fs/locks.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/locks.c	2003-12-28 23:21:24.000000000 -0800
+@@ -1454,7 +1454,7 @@ int fcntl_setlk(struct file *filp, unsig
+ 	 */
+ 	if (IS_MANDLOCK(inode) &&
+ 	    (inode->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID) {
+-		struct address_space *mapping = inode->i_mapping;
++		struct address_space *mapping = filp->f_mapping;
+ 
+ 		if (!list_empty(&mapping->i_mmap_shared)) {
+ 			error = -EAGAIN;
+@@ -1592,7 +1592,7 @@ int fcntl_setlk64(struct file *filp, uns
+ 	 */
+ 	if (IS_MANDLOCK(inode) &&
+ 	    (inode->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID) {
+-		struct address_space *mapping = inode->i_mapping;
++		struct address_space *mapping = filp->f_mapping;
+ 
+ 		if (!list_empty(&mapping->i_mmap_shared)) {
+ 			error = -EAGAIN;
+@@ -1983,6 +1983,24 @@ int lock_may_write(struct inode *inode, 
+ 
+ EXPORT_SYMBOL(lock_may_write);
+ 
++void steal_locks(fl_owner_t from)
++{
++	struct list_head *tmp;
++
++	if (from == current->files)
++		return;
++
++	lock_kernel();
++	list_for_each(tmp, &file_lock_list) {
++		struct file_lock *fl = list_entry(tmp, struct file_lock, fl_link);
++		if (fl->fl_owner == from)
++			fl->fl_owner = current->files;
++	}
++	unlock_kernel();
++}
++
++EXPORT_SYMBOL(steal_locks);
++
+ static int __init filelock_init(void)
+ {
+ 	filelock_cache = kmem_cache_create("file_lock_cache",
+--- linux-2.6.0/fs/Makefile	2003-08-22 19:23:42.000000000 -0700
++++ 25/fs/Makefile	2003-12-28 23:21:50.000000000 -0800
+@@ -39,7 +39,7 @@ obj-$(CONFIG_QUOTACTL)		+= quota.o
+ 
+ obj-$(CONFIG_PROC_FS)		+= proc/
+ obj-y				+= partitions/
+-obj-y				+= sysfs/
++obj-$(CONFIG_SYSFS)		+= sysfs/
+ obj-y				+= devpts/
+ 
+ obj-$(CONFIG_PROFILING)		+= dcookies.o
+--- linux-2.6.0/fs/msdos/namei.c	2003-07-27 12:14:40.000000000 -0700
++++ 25/fs/msdos/namei.c	2003-12-28 23:22:52.000000000 -0800
+@@ -244,13 +244,14 @@ static int msdos_add_entry(struct inode 
+ 	 */
+ 	dir->i_ctime = dir->i_mtime = CURRENT_TIME;
+ 	mark_inode_dirty(dir);
+-	memcpy((*de)->name,name,MSDOS_NAME);
++
++	memcpy((*de)->name, name, MSDOS_NAME);
+ 	(*de)->attr = is_dir ? ATTR_DIR : ATTR_ARCH;
+ 	if (is_hid)
+ 		(*de)->attr |= ATTR_HIDDEN;
+ 	(*de)->start = 0;
+ 	(*de)->starthi = 0;
+-	fat_date_unix2dos(dir->i_mtime.tv_sec,&(*de)->time,&(*de)->date);
++	fat_date_unix2dos(dir->i_mtime.tv_sec, &(*de)->time, &(*de)->date);
+ 	(*de)->size = 0;
+ 	mark_buffer_dirty(*bh);
+ 	return 0;
+@@ -393,7 +394,6 @@ out_unlock:
+ 	return res;
+ 
+ mkdir_error:
+-	printk(KERN_WARNING "msdos_mkdir: error=%d, attempting cleanup\n", res);
+ 	inode->i_nlink = 0;
+ 	inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME;
+ 	dir->i_nlink--;
+@@ -468,13 +468,9 @@ static int do_msdos_rename(struct inode 
+ 			if (error)
+ 				goto out;
+ 		}
+-		error = fat_scan(old_inode, MSDOS_DOTDOT, &dotdot_bh,
+-				&dotdot_de, &dotdot_i_pos);
+-		if (error < 0) {
+-			printk(KERN_WARNING
+-				"MSDOS: %s/%s, get dotdot failed, ret=%d\n",
+-				old_dentry->d_parent->d_name.name,
+-				old_dentry->d_name.name, error);
++		if (fat_scan(old_inode, MSDOS_DOTDOT, &dotdot_bh,
++			     &dotdot_de, &dotdot_i_pos) < 0) {
++			error = -EIO;
+ 			goto out;
+ 		}
+ 	}
+--- linux-2.6.0/fs/namespace.c	2003-10-08 15:07:09.000000000 -0700
++++ 25/fs/namespace.c	2003-12-28 23:21:50.000000000 -0800
+@@ -24,7 +24,15 @@
+ #include <asm/uaccess.h>
+ 
+ extern int __init init_rootfs(void);
++
++#ifdef CONFIG_SYSFS
+ extern int __init sysfs_init(void);
++#else
++static inline int sysfs_init(void)
++{
++	return 0;
++}
++#endif
+ 
+ /* spinlock for vfsmount related operations, inplace of dcache_lock */
+ spinlock_t vfsmount_lock __cacheline_aligned_in_smp = SPIN_LOCK_UNLOCKED;
+--- linux-2.6.0/fs/ncpfs/Kconfig	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/ncpfs/Kconfig	2003-12-28 23:21:55.000000000 -0800
+@@ -65,6 +65,7 @@ config NCPFS_SMALLDOS
+ config NCPFS_NLS
+ 	bool "Use Native Language Support"
+ 	depends on NCP_FS
++	select NLS
+ 	help
+ 	  Allows you to use codepages and I/O charsets for file name
+ 	  translation between the server file system and input/output. This
+--- linux-2.6.0/fs/ncpfs/mmap.c	2003-06-14 12:18:25.000000000 -0700
++++ 25/fs/ncpfs/mmap.c	2003-12-28 23:22:12.000000000 -0800
+@@ -26,7 +26,7 @@
+  * Fill in the supplied page for mmap
+  */
+ static struct page* ncp_file_mmap_nopage(struct vm_area_struct *area,
+-				     unsigned long address, int write_access)
++				     unsigned long address, int *type)
+ {
+ 	struct file *file = area->vm_file;
+ 	struct dentry *dentry = file->f_dentry;
+@@ -85,6 +85,15 @@ static struct page* ncp_file_mmap_nopage
+ 		memset(pg_addr + already_read, 0, PAGE_SIZE - already_read);
+ 	flush_dcache_page(page);
+ 	kunmap(page);
++
++	/*
++	 * If I understand ncp_read_kernel() properly, the above always
++	 * fetches from the network, here the analogue of disk.
++	 * -- wli
++	 */
++	if (type)
++		*type = VM_FAULT_MAJOR;
++	inc_page_state(pgmajfault);
+ 	return page;
+ }
+ 
+--- linux-2.6.0/fs/nfs/file.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/nfs/file.c	2003-12-28 23:21:20.000000000 -0800
+@@ -266,7 +266,7 @@ out_swapfile:
+ int
+ nfs_lock(struct file *filp, int cmd, struct file_lock *fl)
+ {
+-	struct inode * inode = filp->f_dentry->d_inode;
++	struct inode * inode = filp->f_mapping->host;
+ 	int	status = 0;
+ 	int	status2;
+ 
+@@ -309,13 +309,13 @@ nfs_lock(struct file *filp, int cmd, str
+ 	 * Flush all pending writes before doing anything
+ 	 * with locks..
+ 	 */
+-	status = filemap_fdatawrite(inode->i_mapping);
++	status = filemap_fdatawrite(filp->f_mapping);
+ 	down(&inode->i_sem);
+ 	status2 = nfs_wb_all(inode);
+ 	if (!status)
+ 		status = status2;
+ 	up(&inode->i_sem);
+-	status2 = filemap_fdatawait(inode->i_mapping);
++	status2 = filemap_fdatawait(filp->f_mapping);
+ 	if (!status)
+ 		status = status2;
+ 	if (status < 0)
+@@ -335,11 +335,11 @@ nfs_lock(struct file *filp, int cmd, str
+ 	 */
+  out_ok:
+ 	if ((IS_SETLK(cmd) || IS_SETLKW(cmd)) && fl->fl_type != F_UNLCK) {
+-		filemap_fdatawrite(inode->i_mapping);
++		filemap_fdatawrite(filp->f_mapping);
+ 		down(&inode->i_sem);
+ 		nfs_wb_all(inode);      /* we may have slept */
+ 		up(&inode->i_sem);
+-		filemap_fdatawait(inode->i_mapping);
++		filemap_fdatawait(filp->f_mapping);
+ 		nfs_zap_caches(inode);
+ 	}
+ 	return status;
+--- linux-2.6.0/fs/nls/Kconfig	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/nls/Kconfig	2003-12-28 23:21:55.000000000 -0800
+@@ -1,24 +1,25 @@
+ #
+ # Native language support configuration
+ #
+-# smb wants NLS
+-config SMB_NLS
+-	bool
+-	depends on SMB_FS
+-	default y
+ 
+-# msdos and Joliet want NLS
++menu "Native Language Support"
++
+ config NLS
+-	bool
+-	depends on JOLIET || FAT_FS || NTFS_FS || NCPFS_NLS || SMB_NLS || JFS_FS || CIFS || BEFS_FS
+-	default y
++	tristate "Base native language support"
++	---help---
++	  The base Native Language Support. A number of filesystems
++	  depend on it (e.g. FAT, JOLIET, NT, BEOS filesystems), as well
++	  as the ability of some filesystems to use native languages
++	  (NCP, SMB).
+ 
++	  If unsure, say Y.
+ 
+-menu "Native Language Support"
+-	depends on NLS
++	  To compile this code as a module, choose M here: the module
++	  will be called nls_base.
+ 
+ config NLS_DEFAULT
+ 	string "Default NLS Option"
++	depends on NLS
+ 	default "iso8859-1"
+ 	---help---
+ 	  The default NLS used when mounting file system. Note, that this is
+@@ -38,6 +39,7 @@ config NLS_DEFAULT
+ 
+ config NLS_CODEPAGE_437
+ 	tristate "Codepage 437 (United States, Canada)"
++	depends on NLS
+ 	help
+ 	  The Microsoft FAT file system family can deal with filenames in
+ 	  native language character sets. These character sets are stored
+@@ -50,6 +52,7 @@ config NLS_CODEPAGE_437
+ 
+ config NLS_CODEPAGE_737
+ 	tristate "Codepage 737 (Greek)"
++	depends on NLS
+ 	help
+ 	  The Microsoft FAT file system family can deal with filenames in
+ 	  native language character sets. These character sets are stored
+@@ -62,6 +65,7 @@ config NLS_CODEPAGE_737
+ 
+ config NLS_CODEPAGE_775
+ 	tristate "Codepage 775 (Baltic Rim)"
++	depends on NLS
+ 	help
+ 	  The Microsoft FAT file system family can deal with filenames in
+ 	  native language character sets. These character sets are stored
+@@ -75,6 +79,7 @@ config NLS_CODEPAGE_775
+ 
+ config NLS_CODEPAGE_850
+ 	tristate "Codepage 850 (Europe)"
++	depends on NLS
+ 	---help---
+ 	  The Microsoft FAT file system family can deal with filenames in
+ 	  native language character sets. These character sets are stored in
+@@ -91,6 +96,7 @@ config NLS_CODEPAGE_850
+ 
+ config NLS_CODEPAGE_852
+ 	tristate "Codepage 852 (Central/Eastern Europe)"
++	depends on NLS
+ 	---help---
+ 	  The Microsoft FAT file system family can deal with filenames in
+ 	  native language character sets. These character sets are stored in
+@@ -106,6 +112,7 @@ config NLS_CODEPAGE_852
+ 
+ config NLS_CODEPAGE_855
+ 	tristate "Codepage 855 (Cyrillic)"
++	depends on NLS
+ 	help
+ 	  The Microsoft FAT file system family can deal with filenames in
+ 	  native language character sets. These character sets are stored in
+@@ -117,6 +124,7 @@ config NLS_CODEPAGE_855
+ 
+ config NLS_CODEPAGE_857
+ 	tristate "Codepage 857 (Turkish)"
++	depends on NLS
+ 	help
+ 	  The Microsoft FAT file system family can deal with filenames in
+ 	  native language character sets. These character sets are stored in
+@@ -128,6 +136,7 @@ config NLS_CODEPAGE_857
+ 
+ config NLS_CODEPAGE_860
+ 	tristate "Codepage 860 (Portuguese)"
++	depends on NLS
+ 	help
+ 	  The Microsoft FAT file system family can deal with filenames in
+ 	  native language character sets. These character sets are stored in
+@@ -139,6 +148,7 @@ config NLS_CODEPAGE_860
+ 
+ config NLS_CODEPAGE_861
+ 	tristate "Codepage 861 (Icelandic)"
++	depends on NLS
+ 	help
+ 	  The Microsoft FAT file system family can deal with filenames in
+ 	  native language character sets. These character sets are stored in
+@@ -150,6 +160,7 @@ config NLS_CODEPAGE_861
+ 
+ config NLS_CODEPAGE_862
+ 	tristate "Codepage 862 (Hebrew)"
++	depends on NLS
+ 	help
+ 	  The Microsoft FAT file system family can deal with filenames in
+ 	  native language character sets. These character sets are stored in
+@@ -161,6 +172,7 @@ config NLS_CODEPAGE_862
+ 
+ config NLS_CODEPAGE_863
+ 	tristate "Codepage 863 (Canadian French)"
++	depends on NLS
+ 	help
+ 	  The Microsoft FAT file system family can deal with filenames in
+ 	  native language character sets. These character sets are stored in
+@@ -173,6 +185,7 @@ config NLS_CODEPAGE_863
+ 
+ config NLS_CODEPAGE_864
+ 	tristate "Codepage 864 (Arabic)"
++	depends on NLS
+ 	help
+ 	  The Microsoft FAT file system family can deal with filenames in
+ 	  native language character sets. These character sets are stored in
+@@ -184,6 +197,7 @@ config NLS_CODEPAGE_864
+ 
+ config NLS_CODEPAGE_865
+ 	tristate "Codepage 865 (Norwegian, Danish)"
++	depends on NLS
+ 	help
+ 	  The Microsoft FAT file system family can deal with filenames in
+ 	  native language character sets. These character sets are stored in
+@@ -196,6 +210,7 @@ config NLS_CODEPAGE_865
+ 
+ config NLS_CODEPAGE_866
+ 	tristate "Codepage 866 (Cyrillic/Russian)"
++	depends on NLS
+ 	help
+ 	  The Microsoft FAT file system family can deal with filenames in
+ 	  native language character sets. These character sets are stored in
+@@ -208,6 +223,7 @@ config NLS_CODEPAGE_866
+ 
+ config NLS_CODEPAGE_869
+ 	tristate "Codepage 869 (Greek)"
++	depends on NLS
+ 	help
+ 	  The Microsoft FAT file system family can deal with filenames in
+ 	  native language character sets. These character sets are stored in
+@@ -219,6 +235,7 @@ config NLS_CODEPAGE_869
+ 
+ config NLS_CODEPAGE_936
+ 	tristate "Simplified Chinese charset (CP936, GB2312)"
++	depends on NLS
+ 	help
+ 	  The Microsoft FAT file system family can deal with filenames in
+ 	  native language character sets. These character sets are stored in
+@@ -231,6 +248,7 @@ config NLS_CODEPAGE_936
+ 
+ config NLS_CODEPAGE_950
+ 	tristate "Traditional Chinese charset (Big5)"
++	depends on NLS
+ 	help
+ 	  The Microsoft FAT file system family can deal with filenames in
+ 	  native language character sets. These character sets are stored in
+@@ -243,6 +261,7 @@ config NLS_CODEPAGE_950
+ 
+ config NLS_CODEPAGE_932
+ 	tristate "Japanese charsets (Shift-JIS, EUC-JP)"
++	depends on NLS
+ 	help
+ 	  The Microsoft FAT file system family can deal with filenames in
+ 	  native language character sets. These character sets are stored in
+@@ -256,6 +275,7 @@ config NLS_CODEPAGE_932
+ 
+ config NLS_CODEPAGE_949
+ 	tristate "Korean charset (CP949, EUC-KR)"
++	depends on NLS
+ 	help
+ 	  The Microsoft FAT file system family can deal with filenames in
+ 	  native language character sets. These character sets are stored in
+@@ -267,6 +287,7 @@ config NLS_CODEPAGE_949
+ 
+ config NLS_CODEPAGE_874
+ 	tristate "Thai charset (CP874, TIS-620)"
++	depends on NLS
+ 	help
+ 	  The Microsoft FAT file system family can deal with filenames in
+ 	  native language character sets. These character sets are stored in
+@@ -278,6 +299,7 @@ config NLS_CODEPAGE_874
+ 
+ config NLS_ISO8859_8
+ 	tristate "Hebrew charsets (ISO-8859-8, CP1255)"
++	depends on NLS
+ 	help
+ 	  If you want to display filenames with native language characters
+ 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
+@@ -287,6 +309,7 @@ config NLS_ISO8859_8
+ 
+ config NLS_CODEPAGE_1250
+ 	tristate "Windows CP1250 (Slavic/Central European Languages)"
++	depends on NLS
+ 	help
+ 	  If you want to display filenames with native language characters
+ 	  from the Microsoft FAT file system family or from JOLIET CDROMs
+@@ -298,6 +321,7 @@ config NLS_CODEPAGE_1250
+ 
+ config NLS_CODEPAGE_1251
+ 	tristate "Windows CP1251 (Bulgarian, Belarusian)"
++	depends on NLS
+ 	help
+ 	  The Microsoft FAT file system family can deal with filenames in
+ 	  native language character sets. These character sets are stored in
+@@ -310,6 +334,7 @@ config NLS_CODEPAGE_1251
+ 
+ config NLS_ISO8859_1
+ 	tristate "NLS ISO 8859-1  (Latin 1; Western European Languages)"
++	depends on NLS
+ 	help
+ 	  If you want to display filenames with native language characters
+ 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
+@@ -322,6 +347,7 @@ config NLS_ISO8859_1
+ 
+ config NLS_ISO8859_2
+ 	tristate "NLS ISO 8859-2  (Latin 2; Slavic/Central European Languages)"
++	depends on NLS
+ 	help
+ 	  If you want to display filenames with native language characters
+ 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
+@@ -333,6 +359,7 @@ config NLS_ISO8859_2
+ 
+ config NLS_ISO8859_3
+ 	tristate "NLS ISO 8859-3  (Latin 3; Esperanto, Galician, Maltese, Turkish)"
++	depends on NLS
+ 	help
+ 	  If you want to display filenames with native language characters
+ 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
+@@ -343,6 +370,7 @@ config NLS_ISO8859_3
+ 
+ config NLS_ISO8859_4
+ 	tristate "NLS ISO 8859-4  (Latin 4; old Baltic charset)"
++	depends on NLS
+ 	help
+ 	  If you want to display filenames with native language characters
+ 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
+@@ -353,6 +381,7 @@ config NLS_ISO8859_4
+ 
+ config NLS_ISO8859_5
+ 	tristate "NLS ISO 8859-5  (Cyrillic)"
++	depends on NLS
+ 	help
+ 	  If you want to display filenames with native language characters
+ 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
+@@ -364,6 +393,7 @@ config NLS_ISO8859_5
+ 
+ config NLS_ISO8859_6
+ 	tristate "NLS ISO 8859-6  (Arabic)"
++	depends on NLS
+ 	help
+ 	  If you want to display filenames with native language characters
+ 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
+@@ -373,6 +403,7 @@ config NLS_ISO8859_6
+ 
+ config NLS_ISO8859_7
+ 	tristate "NLS ISO 8859-7  (Modern Greek)"
++	depends on NLS
+ 	help
+ 	  If you want to display filenames with native language characters
+ 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
+@@ -382,6 +413,7 @@ config NLS_ISO8859_7
+ 
+ config NLS_ISO8859_9
+ 	tristate "NLS ISO 8859-9  (Latin 5; Turkish)"
++	depends on NLS
+ 	help
+ 	  If you want to display filenames with native language characters
+ 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
+@@ -392,6 +424,7 @@ config NLS_ISO8859_9
+ 
+ config NLS_ISO8859_13
+ 	tristate "NLS ISO 8859-13 (Latin 7; Baltic)"
++	depends on NLS
+ 	help
+ 	  If you want to display filenames with native language characters
+ 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
+@@ -402,6 +435,7 @@ config NLS_ISO8859_13
+ 
+ config NLS_ISO8859_14
+ 	tristate "NLS ISO 8859-14 (Latin 8; Celtic)"
++	depends on NLS
+ 	help
+ 	  If you want to display filenames with native language characters
+ 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
+@@ -413,6 +447,7 @@ config NLS_ISO8859_14
+ 
+ config NLS_ISO8859_15
+ 	tristate "NLS ISO 8859-15 (Latin 9; Western European Languages with Euro)"
++	depends on NLS
+ 	---help---
+ 	  If you want to display filenames with native language characters
+ 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
+@@ -429,6 +464,7 @@ config NLS_ISO8859_15
+ 
+ config NLS_KOI8_R
+ 	tristate "NLS KOI8-R (Russian)"
++	depends on NLS
+ 	help
+ 	  If you want to display filenames with native language characters
+ 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
+@@ -438,6 +474,7 @@ config NLS_KOI8_R
+ 
+ config NLS_KOI8_U
+ 	tristate "NLS KOI8-U/RU (Ukrainian, Belarusian)"
++	depends on NLS
+ 	help
+ 	  If you want to display filenames with native language characters
+ 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
+@@ -447,6 +484,7 @@ config NLS_KOI8_U
+ 
+ config NLS_UTF8
+ 	tristate "NLS UTF8"
++	depends on NLS
+ 	help
+ 	  If you want to display filenames with native language characters
+ 	  from the Microsoft FAT file system family or from JOLIET CD-ROMs
+--- linux-2.6.0/fs/nls/nls_base.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/nls/nls_base.c	2003-12-28 23:22:50.000000000 -0800
+@@ -99,6 +99,7 @@ utf8_mbstowcs(wchar_t *pwcs, const __u8 
+ 			}
+ 		} else {
+ 			*op++ = *ip++;
++			n--;
+ 		}
+ 	}
+ 	return (op - pwcs);
+@@ -480,7 +481,7 @@ struct nls_table *load_nls_default(void)
+ 	if (default_nls != NULL)
+ 		return default_nls;
+ 	else
+-               return &default_table;
++		return &default_table;
+ }
+ 
+ EXPORT_SYMBOL(register_nls);
+@@ -492,3 +493,5 @@ EXPORT_SYMBOL(utf8_mbtowc);
+ EXPORT_SYMBOL(utf8_mbstowcs);
+ EXPORT_SYMBOL(utf8_wctomb);
+ EXPORT_SYMBOL(utf8_wcstombs);
++
++MODULE_LICENSE("Dual BSD/GPL");
+--- linux-2.6.0/fs/open.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/open.c	2003-12-28 23:26:37.000000000 -0800
+@@ -192,7 +192,9 @@ int do_truncate(struct dentry *dentry, l
+ 	newattrs.ia_size = length;
+ 	newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
+ 	down(&dentry->d_inode->i_sem);
++	down_write(&dentry->d_inode->i_alloc_sem);
+ 	err = notify_change(dentry, &newattrs);
++	up_write(&dentry->d_inode->i_alloc_sem);
+ 	up(&dentry->d_inode->i_sem);
+ 	return err;
+ }
+@@ -776,7 +778,8 @@ struct file *dentry_open(struct dentry *
+ 			goto cleanup_file;
+ 	}
+ 
+-	file_ra_state_init(&f->f_ra, inode->i_mapping);
++	f->f_mapping = inode->i_mapping;
++	file_ra_state_init(&f->f_ra, f->f_mapping);
+ 	f->f_dentry = dentry;
+ 	f->f_vfsmnt = mnt;
+ 	f->f_pos = 0;
+@@ -792,8 +795,8 @@ struct file *dentry_open(struct dentry *
+ 
+ 	/* NB: we're sure to have correct a_ops only after f_op->open */
+ 	if (f->f_flags & O_DIRECT) {
+-		if (!inode->i_mapping || !inode->i_mapping->a_ops ||
+-			!inode->i_mapping->a_ops->direct_IO) {
++		if (!f->f_mapping || !f->f_mapping->a_ops ||
++			!f->f_mapping->a_ops->direct_IO) {
+ 				fput(f);
+ 				f = ERR_PTR(-EINVAL);
+ 		}
+--- linux-2.6.0/fs/pipe.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/pipe.c	2003-12-28 23:22:03.000000000 -0800
+@@ -13,6 +13,7 @@
+ #include <linux/fs.h>
+ #include <linux/mount.h>
+ #include <linux/pipe_fs_i.h>
++#include <linux/uio.h>
+ #include <asm/uaccess.h>
+ #include <asm/ioctls.h>
+ 
+@@ -43,19 +44,63 @@ void pipe_wait(struct inode * inode)
+ 	down(PIPE_SEM(*inode));
+ }
+ 
++static inline int
++pipe_iov_copy_from_user(void *to, struct iovec *iov, unsigned long len)
++{
++	unsigned long copy;
++
++	while (len > 0) {
++		while (!iov->iov_len)
++			iov++;
++		copy = min_t(unsigned long, len, iov->iov_len);
++
++		if (copy_from_user(to, iov->iov_base, copy))
++			return -EFAULT;
++		to += copy;
++		len -= copy;
++		iov->iov_base += copy;
++		iov->iov_len -= copy;
++	}
++	return 0;
++}
++
++static inline int
++pipe_iov_copy_to_user(struct iovec *iov, const void *from, unsigned long len)
++{
++	unsigned long copy;
++
++	while (len > 0) {
++		while (!iov->iov_len)
++			iov++;
++		copy = min_t(unsigned long, len, iov->iov_len);
++
++		if (copy_to_user(iov->iov_base, from, copy))
++			return -EFAULT;
++		from += copy;
++		len -= copy;
++		iov->iov_base += copy;
++		iov->iov_len -= copy;
++	}
++	return 0;
++}
++
+ static ssize_t
+-pipe_read(struct file *filp, char __user *buf, size_t count, loff_t *ppos)
++pipe_readv(struct file *filp, const struct iovec *_iov,
++	   unsigned long nr_segs, loff_t *ppos)
+ {
+ 	struct inode *inode = filp->f_dentry->d_inode;
+ 	int do_wakeup;
+ 	ssize_t ret;
++	struct iovec *iov = (struct iovec *)_iov;
++	size_t total_len;
+ 
+ 	/* pread is not allowed on pipes. */
+ 	if (unlikely(ppos != &filp->f_pos))
+ 		return -ESPIPE;
+-	
++
++	total_len = iov_length(iov, nr_segs);
+ 	/* Null read succeeds. */
+-	if (unlikely(count == 0))
++	if (unlikely(total_len == 0))
+ 		return 0;
+ 
+ 	do_wakeup = 0;
+@@ -67,12 +112,12 @@ pipe_read(struct file *filp, char __user
+ 			char *pipebuf = PIPE_BASE(*inode) + PIPE_START(*inode);
+ 			ssize_t chars = PIPE_MAX_RCHUNK(*inode);
+ 
+-			if (chars > count)
+-				chars = count;
++			if (chars > total_len)
++				chars = total_len;
+ 			if (chars > size)
+ 				chars = size;
+ 
+-			if (copy_to_user(buf, pipebuf, chars)) {
++			if (pipe_iov_copy_to_user(iov, pipebuf, chars)) {
+ 				if (!ret) ret = -EFAULT;
+ 				break;
+ 			}
+@@ -81,12 +126,11 @@ pipe_read(struct file *filp, char __user
+ 			PIPE_START(*inode) += chars;
+ 			PIPE_START(*inode) &= (PIPE_SIZE - 1);
+ 			PIPE_LEN(*inode) -= chars;
+-			count -= chars;
+-			buf += chars;
++			total_len -= chars;
+ 			do_wakeup = 1;
++			if (!total_len)
++				break;	/* common path: read succeeded */
+ 		}
+-		if (!count)
+-			break;	/* common path: read succeeded */
+ 		if (PIPE_LEN(*inode)) /* test for cyclic buffers */
+ 			continue;
+ 		if (!PIPE_WRITERS(*inode))
+@@ -126,24 +170,35 @@ pipe_read(struct file *filp, char __user
+ }
+ 
+ static ssize_t
+-pipe_write(struct file *filp, const char __user *buf, size_t count, loff_t *ppos)
++pipe_read(struct file *filp, char __user *buf, size_t count, loff_t *ppos)
++{
++	struct iovec iov = { .iov_base = buf, .iov_len = count };
++	return pipe_readv(filp, &iov, 1, ppos);
++}
++
++static ssize_t
++pipe_writev(struct file *filp, const struct iovec *_iov,
++	    unsigned long nr_segs, loff_t *ppos)
+ {
+ 	struct inode *inode = filp->f_dentry->d_inode;
+ 	ssize_t ret;
+ 	size_t min;
+ 	int do_wakeup;
++	struct iovec *iov = (struct iovec *)_iov;
++	size_t total_len;
+ 
+ 	/* pwrite is not allowed on pipes. */
+ 	if (unlikely(ppos != &filp->f_pos))
+ 		return -ESPIPE;
+-	
++
++	total_len = iov_length(iov, nr_segs);
+ 	/* Null write succeeds. */
+-	if (unlikely(count == 0))
++	if (unlikely(total_len == 0))
+ 		return 0;
+ 
+ 	do_wakeup = 0;
+ 	ret = 0;
+-	min = count;
++	min = total_len;
+ 	if (min > PIPE_BUF)
+ 		min = 1;
+ 	down(PIPE_SEM(*inode));
+@@ -164,23 +219,22 @@ pipe_write(struct file *filp, const char
+ 			 * syscall merging.
+ 			 */
+ 			do_wakeup = 1;
+-			if (chars > count)
+-				chars = count;
++			if (chars > total_len)
++				chars = total_len;
+ 			if (chars > free)
+ 				chars = free;
+ 
+-			if (copy_from_user(pipebuf, buf, chars)) {
++			if (pipe_iov_copy_from_user(pipebuf, iov, chars)) {
+ 				if (!ret) ret = -EFAULT;
+ 				break;
+ 			}
+-
+ 			ret += chars;
++
+ 			PIPE_LEN(*inode) += chars;
+-			count -= chars;
+-			buf += chars;
++			total_len -= chars;
++			if (!total_len)
++				break;
+ 		}
+-		if (!count)
+-			break;
+ 		if (PIPE_FREE(*inode) && ret) {
+ 			/* handle cyclic data buffers */
+ 			min = 1;
+@@ -214,6 +268,14 @@ pipe_write(struct file *filp, const char
+ }
+ 
+ static ssize_t
++pipe_write(struct file *filp, const char __user *buf,
++	   size_t count, loff_t *ppos)
++{
++	struct iovec iov = { .iov_base = (void __user *)buf, .iov_len = count };
++	return pipe_writev(filp, &iov, 1, ppos);
++}
++
++static ssize_t
+ bad_pipe_r(struct file *filp, char __user *buf, size_t count, loff_t *ppos)
+ {
+ 	return -EBADF;
+@@ -405,6 +467,7 @@ pipe_rdwr_open(struct inode *inode, stru
+ struct file_operations read_fifo_fops = {
+ 	.llseek		= no_llseek,
+ 	.read		= pipe_read,
++	.readv		= pipe_readv,
+ 	.write		= bad_pipe_w,
+ 	.poll		= fifo_poll,
+ 	.ioctl		= pipe_ioctl,
+@@ -417,6 +480,7 @@ struct file_operations write_fifo_fops =
+ 	.llseek		= no_llseek,
+ 	.read		= bad_pipe_r,
+ 	.write		= pipe_write,
++	.writev		= pipe_writev,
+ 	.poll		= fifo_poll,
+ 	.ioctl		= pipe_ioctl,
+ 	.open		= pipe_write_open,
+@@ -427,7 +491,9 @@ struct file_operations write_fifo_fops =
+ struct file_operations rdwr_fifo_fops = {
+ 	.llseek		= no_llseek,
+ 	.read		= pipe_read,
++	.readv		= pipe_readv,
+ 	.write		= pipe_write,
++	.writev		= pipe_writev,
+ 	.poll		= fifo_poll,
+ 	.ioctl		= pipe_ioctl,
+ 	.open		= pipe_rdwr_open,
+@@ -438,6 +504,7 @@ struct file_operations rdwr_fifo_fops = 
+ struct file_operations read_pipe_fops = {
+ 	.llseek		= no_llseek,
+ 	.read		= pipe_read,
++	.readv		= pipe_readv,
+ 	.write		= bad_pipe_w,
+ 	.poll		= pipe_poll,
+ 	.ioctl		= pipe_ioctl,
+@@ -450,6 +517,7 @@ struct file_operations write_pipe_fops =
+ 	.llseek		= no_llseek,
+ 	.read		= bad_pipe_r,
+ 	.write		= pipe_write,
++	.writev		= pipe_writev,
+ 	.poll		= pipe_poll,
+ 	.ioctl		= pipe_ioctl,
+ 	.open		= pipe_write_open,
+@@ -460,7 +528,9 @@ struct file_operations write_pipe_fops =
+ struct file_operations rdwr_pipe_fops = {
+ 	.llseek		= no_llseek,
+ 	.read		= pipe_read,
++	.readv		= pipe_readv,
+ 	.write		= pipe_write,
++	.writev		= pipe_writev,
+ 	.poll		= pipe_poll,
+ 	.ioctl		= pipe_ioctl,
+ 	.open		= pipe_rdwr_open,
+@@ -580,6 +650,7 @@ int do_pipe(int *fd)
+ 	d_add(dentry, inode);
+ 	f1->f_vfsmnt = f2->f_vfsmnt = mntget(mntget(pipe_mnt));
+ 	f1->f_dentry = f2->f_dentry = dget(dentry);
++	f1->f_mapping = f2->f_mapping = inode->i_mapping;
+ 
+ 	/* read file */
+ 	f1->f_pos = f2->f_pos = 0;
+--- linux-2.6.0/fs/proc/base.c	2003-12-17 21:20:02.000000000 -0800
++++ 25/fs/proc/base.c	2003-12-28 23:21:55.000000000 -0800
+@@ -277,15 +277,50 @@ static int proc_root_link(struct inode *
+ 	return result;
+ }
+ 
++#define MAY_PTRACE(task) \
++	(task == current || \
++	(task->parent == current && \
++	(task->ptrace & PT_PTRACED) &&  task->state == TASK_STOPPED && \
++	 security_ptrace(current,task) == 0))
++
++static int may_ptrace_attach(struct task_struct *task)
++{
++	int retval = 0;
++
++	task_lock(task);
++
++	if (!task->mm)
++		goto out;
++	if (((current->uid != task->euid) ||
++	     (current->uid != task->suid) ||
++	     (current->uid != task->uid) ||
++	     (current->gid != task->egid) ||
++	     (current->gid != task->sgid) ||
++	     (current->gid != task->gid)) && !capable(CAP_SYS_PTRACE))
++		goto out;
++	rmb();
++	if (!task->mm->dumpable && !capable(CAP_SYS_PTRACE))
++		goto out;
++	if (security_ptrace(current, task))
++		goto out;
++
++	retval = 1;
++out:
++	task_unlock(task);
++	return retval;
++}
++
+ static int proc_pid_environ(struct task_struct *task, char * buffer)
+ {
+ 	int res = 0;
+ 	struct mm_struct *mm = get_task_mm(task);
+ 	if (mm) {
+-		int len = mm->env_end - mm->env_start;
++		unsigned int len = mm->env_end - mm->env_start;
+ 		if (len > PAGE_SIZE)
+ 			len = PAGE_SIZE;
+ 		res = access_process_vm(task, mm->env_start, buffer, len, 0);
++		if (!may_ptrace_attach(task))
++			res = -ESRCH;
+ 		mmput(mm);
+ 	}
+ 	return res;
+@@ -294,7 +329,7 @@ static int proc_pid_environ(struct task_
+ static int proc_pid_cmdline(struct task_struct *task, char * buffer)
+ {
+ 	int res = 0;
+-	int len;
++	unsigned int len;
+ 	struct mm_struct *mm = get_task_mm(task);
+ 	if (!mm)
+ 		goto out;
+@@ -521,10 +556,6 @@ static struct file_operations proc_info_
+ 	.read		= proc_info_read,
+ };
+ 
+-#define MAY_PTRACE(p) \
+-(p==current||(p->parent==current&&(p->ptrace & PT_PTRACED)&&p->state==TASK_STOPPED&&security_ptrace(current,p)==0))
+-
+-
+ static int mem_open(struct inode* inode, struct file* file)
+ {
+ 	file->private_data = (void*)((long)current->self_exec_id);
+@@ -540,7 +571,7 @@ static ssize_t mem_read(struct file * fi
+ 	int ret = -ESRCH;
+ 	struct mm_struct *mm;
+ 
+-	if (!MAY_PTRACE(task))
++	if (!MAY_PTRACE(task) || !may_ptrace_attach(task))
+ 		goto out;
+ 
+ 	ret = -ENOMEM;
+@@ -566,7 +597,7 @@ static ssize_t mem_read(struct file * fi
+ 
+ 		this_len = (count > PAGE_SIZE) ? PAGE_SIZE : count;
+ 		retval = access_process_vm(task, src, page, this_len, 0);
+-		if (!retval) {
++		if (!retval || !MAY_PTRACE(task) || !may_ptrace_attach(task)) {
+ 			if (!ret)
+ 				ret = -EIO;
+ 			break;
+@@ -604,7 +635,7 @@ static ssize_t mem_write(struct file * f
+ 	struct task_struct *task = proc_task(file->f_dentry->d_inode);
+ 	unsigned long dst = *ppos;
+ 
+-	if (!MAY_PTRACE(task))
++	if (!MAY_PTRACE(task) || !may_ptrace_attach(task))
+ 		return -ESRCH;
+ 
+ 	page = (char *)__get_free_page(GFP_USER);
+@@ -1524,6 +1555,7 @@ struct dentry *proc_pid_lookup(struct in
+ 	struct inode *inode;
+ 	struct proc_inode *ei;
+ 	unsigned tgid;
++	int died;
+ 
+ 	if (dentry->d_name.len == 4 && !memcmp(dentry->d_name.name,"self",4)) {
+ 		inode = new_inode(dir->i_sb);
+@@ -1567,12 +1599,21 @@ struct dentry *proc_pid_lookup(struct in
+ 
+ 	dentry->d_op = &pid_base_dentry_operations;
+ 
++	died = 0;
++	d_add(dentry, inode);
+ 	spin_lock(&task->proc_lock);
+ 	task->proc_dentry = dentry;
+-	d_add(dentry, inode);
++	if (!pid_alive(task)) {
++		dentry = proc_pid_unhash(task);
++		died = 1;
++	}
+ 	spin_unlock(&task->proc_lock);
+ 
+ 	put_task_struct(task);
++	if (died) {
++		proc_pid_flush(dentry);
++		goto out;
++	}
+ 	return NULL;
+ out:
+ 	return ERR_PTR(-ENOENT);
+@@ -1612,10 +1653,7 @@ static struct dentry *proc_task_lookup(s
+ 
+ 	dentry->d_op = &pid_base_dentry_operations;
+ 
+-	spin_lock(&task->proc_lock);
+-	task->proc_dentry = dentry;
+ 	d_add(dentry, inode);
+-	spin_unlock(&task->proc_lock);
+ 
+ 	put_task_struct(task);
+ 	return NULL;
+--- linux-2.6.0/fs/proc/generic.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/proc/generic.c	2003-12-28 23:21:25.000000000 -0800
+@@ -567,12 +567,12 @@ struct proc_dir_entry *proc_symlink(cons
+ 	return ent;
+ }
+ 
+-struct proc_dir_entry *proc_mkdir(const char *name, struct proc_dir_entry *parent)
++struct proc_dir_entry *proc_mkdir_mode(const char *name, mode_t mode,
++		struct proc_dir_entry *parent)
+ {
+ 	struct proc_dir_entry *ent;
+ 
+-	ent = proc_create(&parent,name,
+-			  (S_IFDIR | S_IRUGO | S_IXUGO),2);
++	ent = proc_create(&parent, name, S_IFDIR | mode, 2);
+ 	if (ent) {
+ 		ent->proc_fops = &proc_dir_operations;
+ 		ent->proc_iops = &proc_dir_inode_operations;
+@@ -585,6 +585,12 @@ struct proc_dir_entry *proc_mkdir(const 
+ 	return ent;
+ }
+ 
++struct proc_dir_entry *proc_mkdir(const char *name,
++		struct proc_dir_entry *parent)
++{
++	return proc_mkdir_mode(name, S_IRUGO | S_IXUGO, parent);
++}
++
+ struct proc_dir_entry *create_proc_entry(const char *name, mode_t mode,
+ 					 struct proc_dir_entry *parent)
+ {
+--- linux-2.6.0/fs/proc/proc_misc.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/proc/proc_misc.c	2003-12-28 23:26:33.000000000 -0800
+@@ -473,30 +473,46 @@ static int devices_read_proc(char *page,
+ 	return proc_calc_metrics(page, start, off, count, eof, len);
+ }
+ 
+-extern int show_interrupts(struct seq_file *p, void *v);
+-static int interrupts_open(struct inode *inode, struct file *file)
++/*
++ * /proc/interrupts
++ */
++static void *int_seq_start(struct seq_file *f, loff_t *pos)
++{
++	return (*pos <= NR_IRQS) ? pos : NULL;
++}
++
++static void *int_seq_next(struct seq_file *f, void *v, loff_t *pos)
++{
++	(*pos)++;
++	if (*pos > NR_IRQS)
++		return NULL;
++	return pos;
++}
++
++static void int_seq_stop(struct seq_file *f, void *v)
+ {
+-	unsigned size = 4096 * (1 + num_online_cpus() / 8);
+-	char *buf = kmalloc(size, GFP_KERNEL);
+-	struct seq_file *m;
+-	int res;
+-
+-	if (!buf)
+-		return -ENOMEM;
+-	res = single_open(file, show_interrupts, NULL);
+-	if (!res) {
+-		m = file->private_data;
+-		m->buf = buf;
+-		m->size = size;
+-	} else
+-		kfree(buf);
+-	return res;
++	/* Nothing to do */
+ }
++
++
++extern int show_interrupts(struct seq_file *f, void *v); /* In arch code */
++static struct seq_operations int_seq_ops = {
++	.start = int_seq_start,
++	.next  = int_seq_next,
++	.stop  = int_seq_stop,
++	.show  = show_interrupts
++};
++
++int interrupts_open(struct inode *inode, struct file *filp)
++{
++	return seq_open(filp, &int_seq_ops);
++}
++
+ static struct file_operations proc_interrupts_operations = {
+ 	.open		= interrupts_open,
+ 	.read		= seq_read,
+ 	.llseek		= seq_lseek,
+-	.release	= single_release,
++	.release	= seq_release,
+ };
+ 
+ static int filesystems_read_proc(char *page, char **start, off_t off,
+@@ -638,6 +654,36 @@ static void create_seq_entry(char *name,
+ 		entry->proc_fops = f;
+ }
+ 
++#ifdef CONFIG_LOCKMETER
++extern ssize_t get_lockmeter_info(char *, size_t, loff_t *);
++extern ssize_t put_lockmeter_info(const char *, size_t);
++extern int get_lockmeter_info_size(void);
++
++/*
++ * This function accesses lock metering information.
++ */
++static ssize_t read_lockmeter(struct file *file, char *buf,
++			      size_t count, loff_t *ppos)
++{
++	return get_lockmeter_info(buf, count, ppos);
++}
++
++/*
++ * Writing to /proc/lockmeter resets the counters
++ */
++static ssize_t write_lockmeter(struct file * file, const char * buf,
++			       size_t count, loff_t *ppos)
++{
++	return put_lockmeter_info(buf, count);
++}
++
++static struct file_operations proc_lockmeter_operations = {
++	NULL,           /* lseek */
++	read:		read_lockmeter,
++	write:		write_lockmeter,
++};
++#endif  /* CONFIG_LOCKMETER */
++
+ void __init proc_misc_init(void)
+ {
+ 	struct proc_dir_entry *entry;
+@@ -705,6 +751,13 @@ void __init proc_misc_init(void)
+ 	if (entry)
+ 		entry->proc_fops = &proc_sysrq_trigger_operations;
+ #endif
++#ifdef CONFIG_LOCKMETER
++	entry = create_proc_entry("lockmeter", S_IWUSR | S_IRUGO, NULL);
++	if (entry) {
++		entry->proc_fops = &proc_lockmeter_operations;
++		entry->size = get_lockmeter_info_size();
++	}
++#endif
+ #ifdef CONFIG_PPC32
+ 	{
+ 		extern struct file_operations ppc_htab_operations;
+--- linux-2.6.0/fs/proc/proc_tty.c	2003-11-26 13:53:35.000000000 -0800
++++ 25/fs/proc/proc_tty.c	2003-12-28 23:21:25.000000000 -0800
+@@ -229,7 +229,13 @@ void __init proc_tty_init(void)
+ 	if (!proc_mkdir("tty", 0))
+ 		return;
+ 	proc_tty_ldisc = proc_mkdir("tty/ldisc", 0);
+-	proc_tty_driver = proc_mkdir("tty/driver", 0);
++	/*
++	 * /proc/tty/driver/serial reveals the exact character counts for
++	 * serial links which is just too easy to abuse for inferring
++	 * password lengths and inter-keystroke timings during password
++	 * entry.
++	 */
++	proc_tty_driver = proc_mkdir_mode("tty/driver", S_IRUSR | S_IXUSR, 0);
+ 
+ 	create_proc_read_entry("tty/ldiscs", 0, 0, tty_ldiscs_read_proc,NULL);
+ 	entry = create_proc_entry("tty/drivers", 0, NULL);
+--- linux-2.6.0/fs/proc/task_mmu.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/proc/task_mmu.c	2003-12-28 23:22:48.000000000 -0800
+@@ -1,6 +1,7 @@
+ #include <linux/mm.h>
+ #include <linux/hugetlb.h>
+ #include <linux/seq_file.h>
++#include <asm/elf.h>
+ #include <asm/uaccess.h>
+ 
+ char *task_mem(struct mm_struct *mm, char *buffer)
+@@ -75,6 +76,22 @@ int task_statm(struct mm_struct *mm, int
+ 	return size;
+ }
+ 
++#ifdef AT_SYSINFO_EHDR
++
++static struct vm_area_struct gate_vmarea = {
++	/* Do _not_ mark this area as readable, cuz not the entire range may be readable
++	   (e.g., due to execute-only pages or holes) and the tools that read
++	   /proc/PID/maps should read the interesting bits from the gate-DSO file
++	   instead.  */
++	.vm_start = FIXADDR_USER_START,
++	.vm_end = FIXADDR_USER_END
++};
++
++# define gate_map()	&gate_vmarea
++#else
++# define gate_map()	NULL
++#endif
++
+ static int show_map(struct seq_file *m, void *v)
+ {
+ 	struct vm_area_struct *map = v;
+@@ -105,7 +122,7 @@ static int show_map(struct seq_file *m, 
+ 		if (len < 1)
+ 			len = 1;
+ 		seq_printf(m, "%*c", len, ' ');
+-		seq_path(m, file->f_vfsmnt, file->f_dentry, " \t\n\\");
++		seq_path(m, file->f_vfsmnt, file->f_dentry, "");
+ 	}
+ 	seq_putc(m, '\n');
+ 	return 0;
+@@ -128,6 +145,8 @@ static void *m_start(struct seq_file *m,
+ 	if (!map) {
+ 		up_read(&mm->mmap_sem);
+ 		mmput(mm);
++		if (l == -1)
++			map = gate_map();
+ 	}
+ 	return map;
+ }
+@@ -135,7 +154,7 @@ static void *m_start(struct seq_file *m,
+ static void m_stop(struct seq_file *m, void *v)
+ {
+ 	struct vm_area_struct *map = v;
+-	if (map) {
++	if (map && map != gate_map()) {
+ 		struct mm_struct *mm = map->vm_mm;
+ 		up_read(&mm->mmap_sem);
+ 		mmput(mm);
+@@ -149,6 +168,8 @@ static void *m_next(struct seq_file *m, 
+ 	if (map->vm_next)
+ 		return map->vm_next;
+ 	m_stop(m, v);
++	if (map != gate_map())
++		return gate_map();
+ 	return NULL;
+ }
+ 
+--- linux-2.6.0/fs/read_write.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/read_write.c	2003-12-28 23:21:19.000000000 -0800
+@@ -28,7 +28,7 @@ EXPORT_SYMBOL(generic_ro_fops);
+ loff_t generic_file_llseek(struct file *file, loff_t offset, int origin)
+ {
+ 	long long retval;
+-	struct inode *inode = file->f_dentry->d_inode->i_mapping->host;
++	struct inode *inode = file->f_mapping->host;
+ 
+ 	down(&inode->i_sem);
+ 	switch (origin) {
+--- linux-2.6.0/fs/reiserfs/file.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/reiserfs/file.c	2003-12-28 23:21:22.000000000 -0800
+@@ -1052,7 +1052,7 @@ ssize_t reiserfs_file_write( struct file
+     /* Check if we can write to specified region of file, file
+        is not overly big and this kind of stuff. Adjust pos and
+        count, if needed */
+-    res = generic_write_checks(inode, file, &pos, &count, 0);
++    res = generic_write_checks(file, &pos, &count, 0);
+     if (res)
+ 	goto out;
+ 
+@@ -1179,7 +1179,7 @@ ssize_t reiserfs_file_write( struct file
+     }
+ 
+     if ((file->f_flags & O_SYNC) || IS_SYNC(inode))
+-	res = generic_osync_inode(inode, OSYNC_METADATA|OSYNC_DATA);
++	res = generic_osync_inode(inode, file->f_mapping, OSYNC_METADATA|OSYNC_DATA);
+ 
+     up(&inode->i_sem);
+     return (already_written != 0)?already_written:res;
+--- linux-2.6.0/fs/reiserfs/inode.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/reiserfs/inode.c	2003-12-28 23:21:19.000000000 -0800
+@@ -2375,7 +2375,7 @@ static int reiserfs_direct_IO(int rw, st
+ 			      loff_t offset, unsigned long nr_segs)
+ {
+     struct file *file = iocb->ki_filp;
+-    struct inode *inode = file->f_dentry->d_inode->i_mapping->host;
++    struct inode *inode = file->f_mapping->host;
+ 
+     return blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev, iov,
+ 			      offset, nr_segs, reiserfs_get_blocks_direct_io, NULL);
+--- linux-2.6.0/fs/reiserfs/journal.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/reiserfs/journal.c	2003-12-28 23:23:05.000000000 -0800
+@@ -1937,18 +1937,13 @@ static int journal_init_dev( struct supe
+ 
+ 	journal -> j_dev_file = filp_open( jdev_name, 0, 0 );
+ 	if( !IS_ERR( journal -> j_dev_file ) ) {
+-		struct inode *jdev_inode;
+-
+-		jdev_inode = journal -> j_dev_file -> f_dentry -> d_inode;
+-		journal -> j_dev_bd = jdev_inode -> i_bdev;
++		struct inode *jdev_inode = journal->j_dev_file->f_mapping->host;
+ 		if( !S_ISBLK( jdev_inode -> i_mode ) ) {
+ 			printk( "journal_init_dev: '%s' is not a block device\n", jdev_name );
+ 			result = -ENOTBLK;
+-		} else if( jdev_inode -> i_bdev == NULL ) {
+-			printk( "journal_init_dev: bdev uninitialized for '%s'\n", jdev_name );
+-			result = -ENOMEM;
+ 		} else  {
+ 			/* ok */
++			journal->j_dev_bd = I_BDEV(jdev_inode);
+ 			set_blocksize(journal->j_dev_bd, super->s_blocksize);
+ 		}
+ 	} else {
+@@ -1967,7 +1962,7 @@ static int journal_init_dev( struct supe
+ /*
+ ** must be called once on fs mount.  calls journal_read for you
+ */
+-int journal_init(struct super_block *p_s_sb, const char * j_dev_name, int old_format) {
++int journal_init(struct super_block *p_s_sb, const char * j_dev_name, int old_format, unsigned int commit_max_age) {
+     int num_cnodes = SB_ONDISK_JOURNAL_SIZE(p_s_sb) * 2 ;
+     struct buffer_head *bhjh;
+     struct reiserfs_super_block * rs;
+@@ -2032,7 +2027,11 @@ int journal_init(struct super_block *p_s
+      
+   SB_JOURNAL_TRANS_MAX(p_s_sb)      = le32_to_cpu (jh->jh_journal.jp_journal_trans_max);
+   SB_JOURNAL_MAX_BATCH(p_s_sb)      = le32_to_cpu (jh->jh_journal.jp_journal_max_batch);
++  if (commit_max_age != 0) {
++	  SB_JOURNAL_MAX_COMMIT_AGE(p_s_sb) = commit_max_age;
++  } else {
+   SB_JOURNAL_MAX_COMMIT_AGE(p_s_sb) = le32_to_cpu (jh->jh_journal.jp_journal_max_commit_age);
++  }
+   SB_JOURNAL_MAX_TRANS_AGE(p_s_sb)  = JOURNAL_MAX_TRANS_AGE;
+ 
+   if (SB_JOURNAL_TRANS_MAX(p_s_sb)) {
+--- linux-2.6.0/fs/reiserfs/namei.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/reiserfs/namei.c	2003-12-28 23:23:05.000000000 -0800
+@@ -1088,11 +1088,16 @@ static int reiserfs_rename (struct inode
+     int jbegin_count ; 
+     umode_t old_inode_mode;
+     unsigned long savelink = 1;
++    struct timespec ctime;
+ 
+-    /* two balancings: old name removal, new name insertion or "save" link,
+-       stat data updates: old directory and new directory and maybe block
+-       containing ".." of renamed directory */
+-    jbegin_count = JOURNAL_PER_BALANCE_CNT * 3 + 3;
++    /* three balancings: (1) old name removal, (2) new name insertion
++       and (3) maybe "save" link insertion
++       stat data updates: (1) old directory,
++       (2) new directory and (3) maybe old object stat data (when it is
++       directory) and (4) maybe stat data of object to which new entry
++       pointed initially and (5) maybe block containing ".." of
++       renamed directory */
++    jbegin_count = JOURNAL_PER_BALANCE_CNT * 3 + 5;
+ 
+     old_inode = old_dentry->d_inode;
+     new_dentry_inode = new_dentry->d_inode;
+@@ -1255,8 +1260,12 @@ static int reiserfs_rename (struct inode
+ 
+     mark_de_hidden (old_de.de_deh + old_de.de_entry_num);
+     journal_mark_dirty (&th, old_dir->i_sb, old_de.de_bh);
+-    old_dir->i_ctime = old_dir->i_mtime = 
+-    new_dir->i_ctime = new_dir->i_mtime = CURRENT_TIME;
++    ctime = CURRENT_TIME;
++    old_dir->i_ctime = old_dir->i_mtime = ctime;
++    new_dir->i_ctime = new_dir->i_mtime = ctime;
++    /* thanks to Alex Adriaanse <alex_a@caltech.edu> for patch which adds ctime update of
++       renamed object */
++    old_inode->i_ctime = ctime;
+ 
+     if (new_dentry_inode) {
+ 	// adjust link number of the victim
+@@ -1265,7 +1274,7 @@ static int reiserfs_rename (struct inode
+ 	} else {
+ 	    new_dentry_inode->i_nlink--;
+ 	}
+-	new_dentry_inode->i_ctime = new_dir->i_ctime;
++	new_dentry_inode->i_ctime = ctime;
+ 	savelink = new_dentry_inode->i_nlink;
+     }
+ 
+@@ -1298,6 +1307,7 @@ static int reiserfs_rename (struct inode
+ 
+     reiserfs_update_sd (&th, old_dir);
+     reiserfs_update_sd (&th, new_dir);
++    reiserfs_update_sd (&th, old_inode);
+ 
+     if (new_dentry_inode) {
+ 	if (savelink == 0)
+--- linux-2.6.0/fs/reiserfs/procfs.c	2003-10-17 15:58:04.000000000 -0700
++++ 25/fs/reiserfs/procfs.c	2003-12-28 23:23:05.000000000 -0800
+@@ -401,7 +401,7 @@ static int show_journal(struct seq_file 
+                         DJP( jp_journal_trans_max ),
+                         DJP( jp_journal_magic ),
+                         DJP( jp_journal_max_batch ),
+-                        DJP( jp_journal_max_commit_age ),
++                        SB_JOURNAL_MAX_COMMIT_AGE(sb),
+                         DJP( jp_journal_max_trans_age ),
+ 
+ 			JF( j_1st_reserved_block ),			
+--- linux-2.6.0/fs/reiserfs/super.c	2003-11-23 19:03:01.000000000 -0800
++++ 25/fs/reiserfs/super.c	2003-12-28 23:23:05.000000000 -0800
+@@ -645,7 +645,8 @@ static int reiserfs_parse_options (struc
+ 				      collection of bitflags defining what
+ 				      mount options were selected. */
+ 				   unsigned long * blocks, /* strtol-ed from NNN of resize=NNN */
+-				   char ** jdev_name)
++				   char ** jdev_name,
++				   unsigned int * commit_max_age)
+ {
+     int c;
+     char * arg = NULL;
+@@ -662,6 +663,7 @@ static int reiserfs_parse_options (struc
+ 	{"resize", 'r', 0, 0, 0},
+ 	{"jdev", 'j', 0, 0, 0},
+ 	{"nolargeio", 'w', 0, 0, 0},
++	{"commit", 'c', 0, 0, 0},
+ 	{NULL, 0, 0, 0, 0}
+     };
+ 	
+@@ -690,6 +692,19 @@ static int reiserfs_parse_options (struc
+ 	    }
+ 	}
+ 
++	if ( c == 'c' ) {
++		char *p = 0;
++		int val = simple_strtoul (arg, &p, 0);
++		/* commit=NNN (time in seconds) */
++		if ( *p != '\0' || val == 0) {
++			printk ("reiserfs_parse_options: bad value %s\n", arg);
++			return 0;
++		}
++		if ( val > 0 ) {
++			*commit_max_age = val;
++		}
++	}
++
+ 	if ( c == 'w' ) {
+ 		char *p=0;
+ 		int val = simple_strtoul (arg, &p, 0);
+@@ -743,10 +758,11 @@ static int reiserfs_remount (struct supe
+   unsigned long blocks;
+   unsigned long mount_options = REISERFS_SB(s)->s_mount_opt;
+   unsigned long safe_mask = 0;
++  unsigned int commit_max_age = 0;
+ 
+   rs = SB_DISK_SUPER_BLOCK (s);
+ 
+-  if (!reiserfs_parse_options(s, arg, &mount_options, &blocks, NULL))
++  if (!reiserfs_parse_options(s, arg, &mount_options, &blocks, NULL, &commit_max_age))
+     return -EINVAL;
+   
+   handle_attrs(s);
+@@ -764,6 +780,10 @@ static int reiserfs_remount (struct supe
+    * the bits we're not allowed to change here */
+   REISERFS_SB(s)->s_mount_opt = (REISERFS_SB(s)->s_mount_opt & ~safe_mask) |  (mount_options & safe_mask);
+ 
++  if(commit_max_age != 0) {
++	  SB_JOURNAL_MAX_COMMIT_AGE(s) = commit_max_age;
++  }
++
+   if(blocks) {
+     int rc = reiserfs_resize(s, blocks);
+     if (rc != 0)
+@@ -1201,11 +1221,15 @@ int function2code (hashf_t func)
+     if (func == r5_hash)
+ 	return R5_HASH;
+ 
+-    BUG() ; // should never happen 
++    BUG() ; // should never happen
+ 
+     return 0;
+ }
+ 
++#define SPRINTK(silent, ...)			\
++	if (!(silent))				\
++		printk(__VA_ARGS__)
++
+ static int reiserfs_fill_super (struct super_block * s, void * data, int silent)
+ {
+     struct inode *root_inode;
+@@ -1213,6 +1237,7 @@ static int reiserfs_fill_super (struct s
+     struct reiserfs_transaction_handle th ;
+     int old_format = 0;
+     unsigned long blocks;
++	unsigned int commit_max_age = 0;
+     int jinit_done = 0 ;
+     struct reiserfs_iget_args args ;
+     struct reiserfs_super_block * rs;
+@@ -1237,58 +1262,58 @@ static int reiserfs_fill_super (struct s
+     REISERFS_SB(s)->s_alloc_options.preallocsize = 9;
+ 
+     jdev_name = NULL;
+-    if (reiserfs_parse_options (s, (char *) data, &(sbi->s_mount_opt), &blocks, &jdev_name) == 0) {
++    if (reiserfs_parse_options (s, (char *) data, &(sbi->s_mount_opt), &blocks, &jdev_name, &commit_max_age) == 0) {
+ 	goto error;
+     }
+ 
+     if (blocks) {
+-  	printk("jmacd-7: reiserfs_fill_super: resize option for remount only\n");
++	SPRINTK(silent, "jmacd-7: reiserfs_fill_super: resize option for remount only\n");
+ 	goto error;
+     }	
+ 
+     /* try old format (undistributed bitmap, super block in 8-th 1k block of a device) */
+-    if (!read_super_block (s, REISERFS_OLD_DISK_OFFSET_IN_BYTES)) 
++    if (!read_super_block (s, REISERFS_OLD_DISK_OFFSET_IN_BYTES))
+       old_format = 1;
+     /* try new format (64-th 1k block), which can contain reiserfs super block */
+     else if (read_super_block (s, REISERFS_DISK_OFFSET_IN_BYTES)) {
+-      printk("sh-2021: reiserfs_fill_super: can not find reiserfs on %s\n", reiserfs_bdevname (s));
+-      goto error;    
++      SPRINTK(silent, "sh-2021: reiserfs_fill_super: can not find reiserfs on %s\n", reiserfs_bdevname (s));
++      goto error;
+     }
+ 
+     rs = SB_DISK_SUPER_BLOCK (s);
+     /* Let's do basic sanity check to verify that underlying device is not
+        smaller than the filesystem. If the check fails then abort and scream,
+        because bad stuff will happen otherwise. */
+-    if ( s->s_bdev && s->s_bdev->bd_inode && i_size_read(s->s_bdev->bd_inode) < sb_block_count(rs)*sb_blocksize(rs) ) {
+-	printk("Filesystem on %s cannot be mounted because it is bigger than the device\n", reiserfs_bdevname(s));
+-	printk("You may need to run fsck or increase size of your LVM partition\n");
+-	printk("Or may be you forgot to reboot after fdisk when it told you to\n");
++    if ( s->s_bdev && s->s_bdev->bd_inode && i_size_read(s->s_bdev->bd_inode) < sb_block_count(rs)*sb_blocksize(rs)) {
++	SPRINTK(silent, "Filesystem on %s cannot be mounted because it is bigger than the device\n", reiserfs_bdevname(s));
++	SPRINTK(silent, "You may need to run fsck or increase size of your LVM partition\n");
++	SPRINTK(silent, "Or may be you forgot to reboot after fdisk when it told you to\n");
+ 	goto error;
+     }
+ 
+     sbi->s_mount_state = SB_REISERFS_STATE(s);
+     sbi->s_mount_state = REISERFS_VALID_FS ;
+ 
+-    if (old_format ? read_old_bitmaps(s) : read_bitmaps(s)) { 
+-	printk ("jmacd-8: reiserfs_fill_super: unable to read bitmap\n");
++    if (old_format ? read_old_bitmaps(s) : read_bitmaps(s)) {
++	SPRINTK(silent, "jmacd-8: reiserfs_fill_super: unable to read bitmap\n");
+ 	goto error;
+     }
+ #ifdef CONFIG_REISERFS_CHECK
+-    printk("reiserfs:warning: CONFIG_REISERFS_CHECK is set ON\n");
+-    printk("reiserfs:warning: - it is slow mode for debugging.\n");
++    SPRINTK(silent, "reiserfs:warning: CONFIG_REISERFS_CHECK is set ON\n");
++    SPRINTK(silent, "reiserfs:warning: - it is slow mode for debugging.\n");
+ #endif
+ 
+     // set_device_ro(s->s_dev, 1) ;
+-    if( journal_init(s, jdev_name, old_format) ) {
+-	printk("sh-2022: reiserfs_fill_super: unable to initialize journal space\n") ;
++    if( journal_init(s, jdev_name, old_format, commit_max_age) ) {
++	SPRINTK(silent, "sh-2022: reiserfs_fill_super: unable to initialize journal space\n") ;
+ 	goto error ;
+     } else {
+ 	jinit_done = 1 ; /* once this is set, journal_release must be called
+-			 ** if we error out of the mount 
++			 ** if we error out of the mount
+ 			 */
+     }
+     if (reread_meta_blocks(s)) {
+-	printk("jmacd-9: reiserfs_fill_super: unable to reread meta blocks after journal init\n") ;
++	SPRINTK(silent, "jmacd-9: reiserfs_fill_super: unable to reread meta blocks after journal init\n") ;
+ 	goto error ;
+     }
+ 
+@@ -1296,14 +1321,14 @@ static int reiserfs_fill_super (struct s
+ 	goto error;
+ 
+     if (bdev_read_only(s->s_bdev) && !(s->s_flags & MS_RDONLY)) {
+-        printk("clm-7000: Detected readonly device, marking FS readonly\n") ;
++        SPRINTK(silent, "clm-7000: Detected readonly device, marking FS readonly\n") ;
+ 	s->s_flags |= MS_RDONLY ;
+     }
+     args.objectid = REISERFS_ROOT_OBJECTID ;
+     args.dirid = REISERFS_ROOT_PARENT_OBJECTID ;
+     root_inode = iget5_locked (s, REISERFS_ROOT_OBJECTID, reiserfs_find_actor, reiserfs_init_locked_inode, (void *)(&args));
+     if (!root_inode) {
+-	printk ("jmacd-10: reiserfs_fill_super: get root inode failed\n");
++	SPRINTK(silent, "jmacd-10: reiserfs_fill_super: get root inode failed\n");
+ 	goto error;
+     }
+ 
+@@ -1341,22 +1366,23 @@ static int reiserfs_fill_super (struct s
+ 	
+ 	if (old_format_only(s)) {
+ 	  /* filesystem of format 3.5 either with standard or non-standard
+-	     journal */       
++	     journal */
+ 	  if (convert_reiserfs (s)) {
+-	    /* and -o conv is given */ 
+-	    reiserfs_warning ("reiserfs: converting 3.5 filesystem to the 3.6 format\n") ;
+-	    
++	    /* and -o conv is given */
++	    if(!silent)
++	      reiserfs_warning ("reiserfs: converting 3.5 filesystem to the 3.6 format\n") ;
++
+ 	    if (is_reiserfs_3_5 (rs))
+ 	      /* put magic string of 3.6 format. 2.2 will not be able to
+ 		 mount this filesystem anymore */
+-	      memcpy (rs->s_v1.s_magic, reiserfs_3_6_magic_string, 
++	      memcpy (rs->s_v1.s_magic, reiserfs_3_6_magic_string,
+ 		      sizeof (reiserfs_3_6_magic_string));
+-	    
++
+ 	    set_sb_version(rs,REISERFS_VERSION_2);
+ 	    reiserfs_convert_objectid_map_v1(s) ;
+ 	    set_bit(REISERFS_3_6, &(sbi->s_properties));
+ 	    clear_bit(REISERFS_3_5, &(sbi->s_properties));
+-	  } else {
++	  } else if (!silent){
+ 	    reiserfs_warning("reiserfs: using 3.5.x disk format\n") ;
+ 	  }
+ 	}
+@@ -1369,7 +1395,7 @@ static int reiserfs_fill_super (struct s
+ 
+ 	s->s_dirt = 0;
+     } else {
+-	if ( old_format_only(s) ) {
++	if ( old_format_only(s) && !silent) {
+ 	    reiserfs_warning("reiserfs: using 3.5.x disk format\n") ;
+ 	}
+     }
+--- linux-2.6.0/fs/stat.c	2003-10-08 15:07:10.000000000 -0700
++++ 25/fs/stat.c	2003-12-28 23:22:16.000000000 -0800
+@@ -106,7 +106,7 @@ int vfs_fstat(unsigned int fd, struct ks
+ EXPORT_SYMBOL(vfs_fstat);
+ 
+ #if !defined(__alpha__) && !defined(__sparc__) && !defined(__ia64__) \
+-  && !defined(CONFIG_ARCH_S390) && !defined(__hppa__) && !defined(__x86_64__) \
++  && !defined(CONFIG_ARCH_S390) && !defined(__hppa__) \
+   && !defined(__arm__) && !defined(CONFIG_V850) && !defined(__powerpc64__)
+ 
+ /*
+--- linux-2.6.0/fs/super.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/super.c	2003-12-28 23:21:23.000000000 -0800
+@@ -66,6 +66,7 @@ static struct super_block *alloc_super(v
+ 		INIT_LIST_HEAD(&s->s_files);
+ 		INIT_LIST_HEAD(&s->s_instances);
+ 		INIT_HLIST_HEAD(&s->s_anon);
++		INIT_LIST_HEAD(&s->s_inodes);
+ 		init_rwsem(&s->s_umount);
+ 		sema_init(&s->s_lock, 1);
+ 		down_write(&s->s_umount);
+--- linux-2.6.0/fs/sysfs/dir.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/sysfs/dir.c	2003-12-28 23:22:59.000000000 -0800
+@@ -83,7 +83,8 @@ static void remove_dir(struct dentry * d
+ 	struct dentry * parent = dget(d->d_parent);
+ 	down(&parent->d_inode->i_sem);
+ 	d_delete(d);
+-	simple_rmdir(parent->d_inode,d);
++	if (d->d_inode)
++		simple_rmdir(parent->d_inode,d);
+ 
+ 	pr_debug(" o %s removing done (%d)\n",d->d_name.name,
+ 		 atomic_read(&d->d_count));
+@@ -122,8 +123,8 @@ void sysfs_remove_dir(struct kobject * k
+ 	node = dentry->d_subdirs.next;
+ 	while (node != &dentry->d_subdirs) {
+ 		struct dentry * d = list_entry(node,struct dentry,d_child);
+-		list_del_init(node);
+ 
++		node = node->next;
+ 		pr_debug(" o %s (%d): ",d->d_name.name,atomic_read(&d->d_count));
+ 		if (d->d_inode) {
+ 			d = dget_locked(d);
+@@ -139,9 +140,7 @@ void sysfs_remove_dir(struct kobject * k
+ 			spin_lock(&dcache_lock);
+ 		}
+ 		pr_debug(" done\n");
+-		node = dentry->d_subdirs.next;
+ 	}
+-	list_del_init(&dentry->d_child);
+ 	spin_unlock(&dcache_lock);
+ 	up(&dentry->d_inode->i_sem);
+ 
+--- linux-2.6.0/fs/udf/super.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/udf/super.c	2003-12-28 23:21:55.000000000 -0800
+@@ -414,7 +414,7 @@ udf_parse_options(char *options, struct 
+ 		case Opt_utf8:
+ 			uopt->flags |= (1 << UDF_FLAG_UTF8);
+ 			break;
+-#ifdef CONFIG_NLS
++#if defined(CONFIG_NLS) || defined(CONFIG_NLS_MODULE)
+ 		case Opt_iocharset:
+ 			uopt->nls_map = load_nls(args[0].from);
+ 			uopt->flags |= (1 << UDF_FLAG_NLS_MAP);
+@@ -1510,7 +1510,7 @@ static int udf_fill_super(struct super_b
+ 			"utf8 cannot be combined with iocharset\n");
+ 		goto error_out;
+ 	}
+-#ifdef CONFIG_NLS
++#if defined(CONFIG_NLS) || defined(CONFIG_NLS_MODULE)
+ 	if ((uopt.flags & (1 << UDF_FLAG_NLS_MAP)) && !uopt.nls_map)
+ 	{
+ 		uopt.nls_map = load_nls_default();
+@@ -1674,7 +1674,7 @@ error_out:
+ 				udf_release_data(UDF_SB_TYPESPAR(sb, UDF_SB_PARTITION(sb)).s_spar_map[i]);
+ 		}
+ 	}
+-#ifdef CONFIG_NLS
++#if defined(CONFIG_NLS) || defined(CONFIG_NLS_MODULE)
+ 	if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP))
+ 		unload_nls(UDF_SB(sb)->s_nls_map);
+ #endif
+@@ -1766,7 +1766,7 @@ udf_put_super(struct super_block *sb)
+ 				udf_release_data(UDF_SB_TYPESPAR(sb, UDF_SB_PARTITION(sb)).s_spar_map[i]);
+ 		}
+ 	}
+-#ifdef CONFIG_NLS
++#if defined(CONFIG_NLS) || defined(CONFIG_NLS_MODULE)
+ 	if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP))
+ 		unload_nls(UDF_SB(sb)->s_nls_map);
+ #endif
+--- linux-2.6.0/fs/vfat/namei.c	2003-10-08 15:07:10.000000000 -0700
++++ 25/fs/vfat/namei.c	2003-12-28 23:22:52.000000000 -0800
+@@ -25,23 +25,6 @@
+ #include <linux/buffer_head.h>
+ #include <linux/namei.h>
+ 
+-#define DEBUG_LEVEL 0
+-#if (DEBUG_LEVEL >= 1)
+-#  define PRINTK1(x) printk x
+-#else
+-#  define PRINTK1(x)
+-#endif
+-#if (DEBUG_LEVEL >= 2)
+-#  define PRINTK2(x) printk x
+-#else
+-#  define PRINTK2(x)
+-#endif
+-#if (DEBUG_LEVEL >= 3)
+-#  define PRINTK3(x) printk x
+-#else
+-#  define PRINTK3(x)
+-#endif
+-
+ static int vfat_hashi(struct dentry *parent, struct qstr *qstr);
+ static int vfat_hash(struct dentry *parent, struct qstr *qstr);
+ static int vfat_cmpi(struct dentry *dentry, struct qstr *a, struct qstr *b);
+@@ -573,13 +556,18 @@ xlate_to_uni(const unsigned char *name, 
+ 	int charlen;
+ 
+ 	if (utf8) {
++		int name_len = strlen(name);
++
+ 		*outlen = utf8_mbstowcs((wchar_t *)outname, name, PAGE_SIZE);
+-		if (name[len-1] == '.')
+-			*outlen-=2;
++
++		/*
++		 * We stripped '.'s before and set len appropriately,
++		 * but utf8_mbstowcs doesn't care about len
++		 */
++		*outlen -= (name_len-len);
++
+ 		op = &outname[*outlen * sizeof(wchar_t)];
+ 	} else {
+-		if (name[len-1] == '.') 
+-			len--;
+ 		if (nls) {
+ 			for (i = 0, ip = name, op = outname, *outlen = 0;
+ 			     i < len && *outlen <= 260; *outlen += 1)
+@@ -694,7 +682,6 @@ static int vfat_build_slots(struct inode
+ 	for (cksum = i = 0; i < 11; i++) {
+ 		cksum = (((cksum&1)<<7)|((cksum&0xfe)>>1)) + msdos_name[i];
+ 	}
+-	PRINTK3(("vfat_fill_slots 3: slots=%d\n",*slots));
+ 
+ 	for (ps = ds, slot = *slots; slot > 0; slot--, ps++) {
+ 		ps->id = slot;
+@@ -711,7 +698,6 @@ static int vfat_build_slots(struct inode
+ 	de = (struct msdos_dir_entry *) ps;
+ 
+ shortname:
+-	PRINTK3(("vfat_fill_slots 9\n"));
+ 	/* build the entry of 8.3 alias name */
+ 	(*slots)++;
+ 	memcpy(de->name, msdos_name, MSDOS_NAME);
+@@ -734,18 +720,22 @@ static int vfat_add_entry(struct inode *
+ {
+ 	struct msdos_dir_slot *dir_slots;
+ 	loff_t offset;
+-	int slots, slot;
+-	int res;
++	int res, slots, slot;
++	unsigned int len;
+ 	struct msdos_dir_entry *dummy_de;
+ 	struct buffer_head *dummy_bh;
+ 	loff_t dummy_i_pos;
+ 
+-	dir_slots = (struct msdos_dir_slot *)
++	len = vfat_striptail_len(qname);
++	if (len == 0)
++		return -ENOENT;
++
++	dir_slots =
+ 	       kmalloc(sizeof(struct msdos_dir_slot) * MSDOS_SLOTS, GFP_KERNEL);
+ 	if (dir_slots == NULL)
+ 		return -ENOMEM;
+ 
+-	res = vfat_build_slots(dir, qname->name, vfat_striptail_len(qname),
++	res = vfat_build_slots(dir, qname->name, len,
+ 			       dir_slots, &slots, is_dir);
+ 	if (res < 0)
+ 		goto cleanup;
+@@ -796,11 +786,16 @@ static int vfat_find(struct inode *dir,s
+ {
+ 	struct super_block *sb = dir->i_sb;
+ 	loff_t offset;
++	unsigned int len;
+ 	int res;
+ 
+-	res = fat_search_long(dir, qname->name, vfat_striptail_len(qname),
+-			(MSDOS_SB(sb)->options.name_check != 's'),
+-			&offset,&sinfo->longname_offset);
++	len = vfat_striptail_len(qname);
++	if (len == 0)
++		return -ENOENT;
++
++	res = fat_search_long(dir, qname->name, len,
++			      (MSDOS_SB(sb)->options.name_check != 's'),
++			      &offset, &sinfo->longname_offset);
+ 	if (res>0) {
+ 		sinfo->long_slots = res-1;
+ 		if (fat_get_entry(dir,&offset,last_bh,last_de,&sinfo->i_pos)>=0)
+@@ -820,9 +815,6 @@ struct dentry *vfat_lookup(struct inode 
+ 	struct msdos_dir_entry *de;
+ 	int table;
+ 	
+-	PRINTK2(("vfat_lookup: name=%s, len=%d\n", 
+-		 dentry->d_name.name, dentry->d_name.len));
+-
+ 	lock_kernel();
+ 	table = (MSDOS_SB(dir->i_sb)->options.name_check == 's') ? 2 : 0;
+ 	dentry->d_op = &vfat_dentry_ops[table];
+@@ -955,7 +947,6 @@ int vfat_unlink(struct inode *dir, struc
+ 	struct buffer_head *bh = NULL;
+ 	struct msdos_dir_entry *de;
+ 
+-	PRINTK1(("vfat_unlink: %s\n", dentry->d_name.name));
+ 	lock_kernel();
+ 	res = vfat_find(dir,&dentry->d_name,&sinfo,&bh,&de);
+ 	if (res < 0) {
+@@ -1036,14 +1027,18 @@ int vfat_rename(struct inode *old_dir,st
+ 	new_inode = new_dentry->d_inode;
+ 	lock_kernel();
+ 	res = vfat_find(old_dir,&old_dentry->d_name,&old_sinfo,&old_bh,&old_de);
+-	PRINTK3(("vfat_rename 2\n"));
+-	if (res < 0) goto rename_done;
++	if (res < 0)
++		goto rename_done;
+ 
+ 	is_dir = S_ISDIR(old_inode->i_mode);
+ 
+-	if (is_dir && (res = fat_scan(old_inode,MSDOS_DOTDOT,&dotdot_bh,
+-				&dotdot_de,&dotdot_i_pos)) < 0)
+-		goto rename_done;
++	if (is_dir) {
++		if (fat_scan(old_inode, MSDOS_DOTDOT, &dotdot_bh,
++			     &dotdot_de, &dotdot_i_pos) < 0) {
++			res = -EIO;
++			goto rename_done;
++		}
++	}
+ 
+ 	if (new_dentry->d_inode) {
+ 		res = vfat_find(new_dir,&new_dentry->d_name,&sinfo,&new_bh,
+--- linux-2.6.0/fs/xfs/linux/xfs_aops.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/xfs/linux/xfs_aops.c	2003-12-28 23:26:37.000000000 -0800
+@@ -974,7 +974,7 @@ linvfs_direct_IO(
+ 	unsigned long		nr_segs)
+ {
+ 	struct file	*file = iocb->ki_filp;
+-	struct inode	*inode = file->f_dentry->d_inode->i_mapping->host;
++	struct inode	*inode = file->f_mapping->host;
+ 	vnode_t		*vp = LINVFS_GET_VP(inode);
+ 	page_buf_bmap_t	pbmap;
+ 	int		maps = 1;
+@@ -984,7 +984,8 @@ linvfs_direct_IO(
+ 	if (error)
+ 		return -error;
+ 
+-        return blockdev_direct_IO(rw, iocb, inode, pbmap.pbm_target->pbr_bdev,
++        return blockdev_direct_IO_no_locking(rw, iocb, inode,
++		pbmap.pbm_target->pbr_bdev,
+ 		iov, offset, nr_segs,
+ 		linvfs_get_blocks_direct,
+ 		linvfs_unwritten_convert_direct);
+--- linux-2.6.0/fs/xfs/linux/xfs_file.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/fs/xfs/linux/xfs_file.c	2003-12-28 23:21:19.000000000 -0800
+@@ -112,7 +112,7 @@ __linvfs_write(
+ {
+ 	struct iovec	iov = {(void *)buf, count};
+ 	struct file	*file = iocb->ki_filp;
+-	struct inode	*inode = file->f_dentry->d_inode->i_mapping->host;
++	struct inode	*inode = file->f_mapping->host;
+ 	vnode_t		*vp = LINVFS_GET_VP(inode);
+ 	int		error;
+ 
+@@ -160,7 +160,7 @@ __linvfs_readv(
+ 	unsigned long		nr_segs,
+ 	loff_t			*ppos)
+ {
+-	struct inode	*inode = file->f_dentry->d_inode->i_mapping->host;
++	struct inode	*inode = file->f_mapping->host;
+ 	vnode_t		*vp = LINVFS_GET_VP(inode);
+ 	struct		kiocb kiocb;
+ 	int		error;
+@@ -207,7 +207,7 @@ __linvfs_writev(
+ 	unsigned long		nr_segs,
+ 	loff_t			*ppos)
+ {
+-	struct inode	*inode = file->f_dentry->d_inode->i_mapping->host;
++	struct inode	*inode = file->f_mapping->host;
+ 	vnode_t		*vp = LINVFS_GET_VP(inode);
+ 	struct		kiocb kiocb;
+ 	int		error;
+--- linux-2.6.0/fs/xfs/pagebuf/page_buf.c	2003-10-08 15:07:10.000000000 -0700
++++ 25/fs/xfs/pagebuf/page_buf.c	2003-12-28 23:22:28.000000000 -0800
+@@ -1395,7 +1395,6 @@ next_chunk:
+ 			break;
+ 
+ 		offset = 0;
+-
+ 		sector += nbytes >> BBSHIFT;
+ 		size -= nbytes;
+ 		total_nr_pages--;
+@@ -1403,15 +1402,11 @@ next_chunk:
+ 
+ submit_io:
+ 	if (likely(bio->bi_size)) {
+-		if (pb->pb_flags & PBF_READ) {
+-			submit_bio(READ, bio);
+-		} else {
+-			submit_bio(WRITE, bio);
+-		}
+-
++		submit_bio((pb->pb_flags & PBF_READ) ? READ : WRITE, bio);
+ 		if (size)
+ 			goto next_chunk;
+ 	} else {
++		bio_put(bio);
+ 		pagebuf_ioerror(pb, EIO);
+ 	}
+ 
+--- linux-2.6.0/fs/xfs/xfs_vfsops.c	2003-10-17 15:58:04.000000000 -0700
++++ 25/fs/xfs/xfs_vfsops.c	2003-12-28 23:22:28.000000000 -0800
+@@ -1598,8 +1598,9 @@ xfs_vget(
+ #define MNTOPT_NORECOVERY   "norecovery"   /* don't run XFS recovery */
+ #define MNTOPT_NOLOGFLUSH   "nologflush"   /* don't hard flush on log writes */
+ #define MNTOPT_OSYNCISOSYNC "osyncisosync" /* o_sync is REALLY o_sync */
+-#define MNTOPT_64BITINODE   "inode64"  /* inodes can be allocated anywhere */
+-#define MNTOPT_IKEEP	"ikeep"		/* free empty inode clusters */
++#define MNTOPT_64BITINODE   "inode64"	/* inodes can be allocated anywhere */
++#define MNTOPT_IKEEP	"ikeep"		/* do not free empty inode clusters */
++#define MNTOPT_NOIKEEP	"noikeep"	/* free empty inode clusters */
+ 
+ 
+ int
+@@ -1614,7 +1615,9 @@ xfs_parseargs(
+ 	int			dsunit, dswidth, vol_dsunit, vol_dswidth;
+ 	int			iosize;
+ 
++#if 0	/* XXX: off by default, until some remaining issues ironed out */
+ 	args->flags |= XFSMNT_IDELETE; /* default to on */
++#endif
+ 
+ 	if (!options)
+ 		return 0;
+@@ -1722,6 +1725,8 @@ xfs_parseargs(
+ 			args->flags |= XFSMNT_NOLOGFLUSH;
+ 		} else if (!strcmp(this_char, MNTOPT_IKEEP)) {
+ 			args->flags &= ~XFSMNT_IDELETE;
++		} else if (!strcmp(this_char, MNTOPT_NOIKEEP)) {
++			args->flags |= XFSMNT_IDELETE;
+ 		} else if (!strcmp(this_char, "osyncisdsync")) {
+ 			/* no-op, this is now the default */
+ printk("XFS: osyncisdsync is now the default, option is deprecated.\n");
+--- linux-2.6.0/include/acpi/acconfig.h	2003-10-17 15:58:04.000000000 -0700
++++ 25/include/acpi/acconfig.h	2003-12-28 23:21:33.000000000 -0800
+@@ -64,7 +64,7 @@
+ 
+ /* Version string */
+ 
+-#define ACPI_CA_VERSION                 0x20031002
++#define ACPI_CA_VERSION                 0x20031203
+ 
+ /* Maximum objects in the various object caches */
+ 
+--- linux-2.6.0/include/acpi/acevents.h	2003-06-14 12:18:23.000000000 -0700
++++ 25/include/acpi/acevents.h	2003-12-28 23:21:33.000000000 -0800
+@@ -182,6 +182,17 @@ acpi_ev_detach_region (
+ 	union acpi_operand_object      *region_obj,
+ 	u8                              acpi_ns_is_locked);
+ 
++acpi_status
++acpi_ev_execute_reg_method (
++	union acpi_operand_object      *region_obj,
++	u32                             function);
++
++acpi_status
++acpi_ev_reg_run (
++	acpi_handle                     obj_handle,
++	u32                             level,
++	void                            *context,
++	void                            **return_value);
+ 
+ /*
+  * Evregini - Region initialization and setup
+--- linux-2.6.0/include/acpi/acglobal.h	2003-06-22 12:04:44.000000000 -0700
++++ 25/include/acpi/acglobal.h	2003-12-28 23:21:33.000000000 -0800
+@@ -106,6 +106,9 @@ ACPI_EXTERN struct acpi_common_facs     
+ ACPI_EXTERN u8                                  acpi_gbl_integer_bit_width;
+ ACPI_EXTERN u8                                  acpi_gbl_integer_byte_width;
+ ACPI_EXTERN u8                                  acpi_gbl_integer_nybble_width;
++
++/* Keep local copies of these FADT-based registers */
++
+ ACPI_EXTERN struct acpi_generic_address         acpi_gbl_xpm1a_enable;
+ ACPI_EXTERN struct acpi_generic_address         acpi_gbl_xpm1b_enable;
+ 
+--- linux-2.6.0/include/acpi/acmacros.h	2003-06-14 12:18:22.000000000 -0700
++++ 25/include/acpi/acmacros.h	2003-12-28 23:21:33.000000000 -0800
+@@ -48,7 +48,6 @@
+ /*
+  * Data manipulation macros
+  */
+-
+ #define ACPI_LOWORD(l)                  ((u16)(u32)(l))
+ #define ACPI_HIWORD(l)                  ((u16)((((u32)(l)) >> 16) & 0xFFFF))
+ #define ACPI_LOBYTE(l)                  ((u8)(u16)(l))
+@@ -94,10 +93,18 @@
+ #endif
+ #endif
+ 
+- /*
+-  * Extract a byte of data using a pointer.  Any more than a byte and we
+-  * get into potential aligment issues -- see the STORE macros below
+-  */
++/*
++ * printf() format helpers
++ */
++
++/* Split 64-bit integer into two 32-bit values. use with %8,8_x%8.8X */
++
++#define ACPI_FORMAT_UINT64(i)           ACPI_HIDWORD(i),ACPI_LODWORD(i)
++
++/*
++ * Extract a byte of data using a pointer.  Any more than a byte and we
++ * get into potential aligment issues -- see the STORE macros below
++ */
+ #define ACPI_GET8(addr)                 (*(u8*)(addr))
+ 
+ /* Pointer arithmetic */
+@@ -129,7 +136,6 @@
+  * If the hardware supports the transfer of unaligned data, just do the store.
+  * Otherwise, we have to move one byte at a time.
+  */
+-
+ #ifdef ACPI_BIG_ENDIAN
+ /*
+  * Macros for big-endian machines
+@@ -299,7 +305,6 @@
+ /*
+  * Fast power-of-two math macros for non-optimized compilers
+  */
+-
+ #define _ACPI_DIV(value,power_of2)      ((u32) ((value) >> (power_of2)))
+ #define _ACPI_MUL(value,power_of2)      ((u32) ((value) << (power_of2)))
+ #define _ACPI_MOD(value,divisor)        ((u32) ((value) & ((divisor) -1)))
+@@ -443,7 +448,6 @@
+ /*
+  * Reporting macros that are never compiled out
+  */
+-
+ #define ACPI_PARAM_LIST(pl)                 pl
+ 
+ /*
+@@ -451,7 +455,6 @@
+  * _THIS_MODULE gets compiled out when ACPI_DEBUG_OUTPUT isn't defined, only
+  * use it in debug mode.
+  */
+-
+ #ifdef ACPI_DEBUG_OUTPUT
+ 
+ #define ACPI_REPORT_INFO(fp)                {acpi_ut_report_info(_THIS_MODULE,__LINE__,_COMPONENT); \
+@@ -490,7 +493,6 @@
+ /*
+  * Debug macros that are conditionally compiled
+  */
+-
+ #ifdef ACPI_DEBUG_OUTPUT
+ 
+ #define ACPI_MODULE_NAME(name)               static char ACPI_UNUSED_VAR *_THIS_MODULE = name;
+@@ -500,7 +502,6 @@
+  * The first parameter should be the procedure name as a quoted string.  This is declared
+  * as a local string ("_proc_name) so that it can be also used by the function exit macros below.
+  */
+-
+ #define ACPI_FUNCTION_NAME(a)               struct acpi_debug_print_info _dbg; \
+ 												_dbg.component_id = _COMPONENT; \
+ 												_dbg.proc_name   = a; \
+@@ -562,7 +563,6 @@
+ /*
+  * Generate INT3 on ACPI_ERROR (Debug only!)
+  */
+-
+ #define ACPI_ERROR_BREAK
+ #ifdef  ACPI_ERROR_BREAK
+ #define ACPI_BREAK_ON_ERROR(lvl)        if ((lvl)&ACPI_ERROR) \
+@@ -577,7 +577,6 @@
+  *    1) Debug print for the current component is enabled
+  *    2) Debug error level or trace level for the print statement is enabled
+  */
+-
+ #define ACPI_DEBUG_PRINT(pl)            acpi_ut_debug_print ACPI_PARAM_LIST(pl)
+ #define ACPI_DEBUG_PRINT_RAW(pl)        acpi_ut_debug_print_raw ACPI_PARAM_LIST(pl)
+ 
+@@ -587,7 +586,6 @@
+  * This is the non-debug case -- make everything go away,
+  * leaving no executable debug code!
+  */
+-
+ #define ACPI_MODULE_NAME(name)
+ #define _THIS_MODULE ""
+ 
+@@ -662,7 +660,6 @@
+ /*
+  * Memory allocation tracking (DEBUG ONLY)
+  */
+-
+ #ifndef ACPI_DBG_TRACK_ALLOCATIONS
+ 
+ /* Memory allocation */
+--- linux-2.6.0/include/acpi/acobject.h	2003-06-14 12:17:58.000000000 -0700
++++ 25/include/acpi/acobject.h	2003-12-28 23:21:33.000000000 -0800
+@@ -114,7 +114,7 @@
+ #define ACPI_COMMON_NOTIFY_INFO \
+ 	union acpi_operand_object               *system_notify;     /* Handler for system notifies */\
+ 	union acpi_operand_object               *device_notify;     /* Handler for driver notifies */\
+-	union acpi_operand_object               *address_space;     /* Handler for Address space */
++	union acpi_operand_object               *handler;           /* Handler for Address space */
+ 
+ 
+ /******************************************************************************
+@@ -214,7 +214,7 @@ struct acpi_object_region
+ 	ACPI_OBJECT_COMMON_HEADER
+ 
+ 	u8                                      space_id;
+-	union acpi_operand_object               *address_space;     /* Handler for region access */
++	union acpi_operand_object               *handler;           /* Handler for region access */
+ 	struct acpi_namespace_node              *node;              /* containing object */
+ 	union acpi_operand_object               *next;
+ 	u32                                     length;
+@@ -464,21 +464,22 @@ union acpi_operand_object
+ 
+ /* Object descriptor types */
+ 
+-#define ACPI_DESC_TYPE_CACHED           0x11        /* Used only when object is cached */
+-#define ACPI_DESC_TYPE_STATE            0x20
+-#define ACPI_DESC_TYPE_STATE_UPDATE     0x21
+-#define ACPI_DESC_TYPE_STATE_PACKAGE    0x22
+-#define ACPI_DESC_TYPE_STATE_CONTROL    0x23
+-#define ACPI_DESC_TYPE_STATE_RPSCOPE    0x24
+-#define ACPI_DESC_TYPE_STATE_PSCOPE     0x25
+-#define ACPI_DESC_TYPE_STATE_WSCOPE     0x26
+-#define ACPI_DESC_TYPE_STATE_RESULT     0x27
+-#define ACPI_DESC_TYPE_STATE_NOTIFY     0x28
+-#define ACPI_DESC_TYPE_STATE_THREAD     0x29
+-#define ACPI_DESC_TYPE_WALK             0x44
+-#define ACPI_DESC_TYPE_PARSER           0x66
+-#define ACPI_DESC_TYPE_OPERAND          0x88
+-#define ACPI_DESC_TYPE_NAMED            0xAA
++#define ACPI_DESC_TYPE_CACHED           0x01        /* Used only when object is cached */
++#define ACPI_DESC_TYPE_STATE            0x02
++#define ACPI_DESC_TYPE_STATE_UPDATE     0x03
++#define ACPI_DESC_TYPE_STATE_PACKAGE    0x04
++#define ACPI_DESC_TYPE_STATE_CONTROL    0x05
++#define ACPI_DESC_TYPE_STATE_RPSCOPE    0x06
++#define ACPI_DESC_TYPE_STATE_PSCOPE     0x07
++#define ACPI_DESC_TYPE_STATE_WSCOPE     0x08
++#define ACPI_DESC_TYPE_STATE_RESULT     0x09
++#define ACPI_DESC_TYPE_STATE_NOTIFY     0x0A
++#define ACPI_DESC_TYPE_STATE_THREAD     0x0B
++#define ACPI_DESC_TYPE_WALK             0x0C
++#define ACPI_DESC_TYPE_PARSER           0x0D
++#define ACPI_DESC_TYPE_OPERAND          0x0E
++#define ACPI_DESC_TYPE_NAMED            0x0F
++#define ACPI_DESC_TYPE_MAX              0x0F
+ 
+ 
+ union acpi_descriptor
+--- linux-2.6.0/include/acpi/acpi_drivers.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/include/acpi/acpi_drivers.h	2003-12-28 23:21:33.000000000 -0800
+@@ -53,10 +53,6 @@
+ 
+ #define ACPI_PCI_COMPONENT		0x00400000
+ 
+-/* ACPI PCI Root Bridge (pci_root.c) */
+-
+-void acpi_pci_get_translations (struct acpi_pci_id* id, u64* mem_tra, u64* io_tra);
+-
+ /* ACPI PCI Interrupt Link (pci_link.c) */
+ 
+ int acpi_pci_link_check (void);
+--- linux-2.6.0/include/acpi/acutils.h	2003-06-14 12:17:56.000000000 -0700
++++ 25/include/acpi/acutils.h	2003-12-28 23:21:33.000000000 -0800
+@@ -125,6 +125,14 @@ acpi_ut_get_type_name (
+ 	acpi_object_type                type);
+ 
+ char *
++acpi_ut_get_node_name (
++	void                            *object);
++
++char *
++acpi_ut_get_descriptor_name (
++	void                            *object);
++
++char *
+ acpi_ut_get_object_type_name (
+ 	union acpi_operand_object       *obj_desc);
+ 
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-alpha/cpumask.h	2003-12-28 23:22:10.000000000 -0800
+@@ -0,0 +1,6 @@
++#ifndef _ASM_ALPHA_CPUMASK_H
++#define _ASM_ALPHA_CPUMASK_H
++
++#include <asm-generic/cpumask.h>
++
++#endif /* _ASM_ALPHA_CPUMASK_H */
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-alpha/lockmeter.h	2003-12-28 23:26:33.000000000 -0800
+@@ -0,0 +1,90 @@
++/*
++ *  Written by John Hawkes (hawkes@sgi.com)
++ *  Based on klstat.h by Jack Steiner (steiner@sgi.com)
++ *
++ *  Modified by Peter Rival (frival@zk3.dec.com)
++ */
++
++#ifndef _ALPHA_LOCKMETER_H
++#define _ALPHA_LOCKMETER_H
++
++#include <asm/hwrpb.h>
++#define CPU_CYCLE_FREQUENCY	hwrpb->cycle_freq
++
++#define get_cycles64()		get_cycles()
++
++#define THIS_CPU_NUMBER		smp_processor_id()
++
++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)
++#define local_irq_save(x) \
++	__save_and_cli(x)
++#define local_irq_restore(x) \
++	__restore_flags(x)
++#endif	/* Linux version 2.2.x */
++
++#define SPINLOCK_MAGIC_INIT /**/
++
++/*
++ * Macros to cache and retrieve an index value inside of a lock
++ * these macros assume that there are less than 65536 simultaneous
++ * (read mode) holders of a rwlock.
++ * We also assume that the hash table has less than 32767 entries.
++ * the high order bit is used for write locking a rw_lock
++ * Note: although these defines and macros are the same as what is being used
++ *       in include/asm-i386/lockmeter.h, they are present here to easily
++ *	 allow an alternate Alpha implementation.
++ */
++/*
++ * instrumented spinlock structure -- never used to allocate storage
++ * only used in macros below to overlay a spinlock_t
++ */
++typedef struct inst_spinlock_s {
++	/* remember, Alpha is little endian */
++	unsigned short lock;
++	unsigned short index;
++} inst_spinlock_t;
++#define PUT_INDEX(lock_ptr,indexv)	((inst_spinlock_t *)(lock_ptr))->index = indexv
++#define GET_INDEX(lock_ptr)		((inst_spinlock_t *)(lock_ptr))->index
++
++/*
++ * macros to cache and retrieve an index value in a read/write lock
++ * as well as the cpu where a reader busy period started
++ * we use the 2nd word (the debug word) for this, so require the
++ * debug word to be present
++ */
++/*
++ * instrumented rwlock structure -- never used to allocate storage
++ * only used in macros below to overlay a rwlock_t
++ */
++typedef struct inst_rwlock_s {
++	volatile int lock;
++	unsigned short index;
++	unsigned short cpu;
++} inst_rwlock_t;
++#define PUT_RWINDEX(rwlock_ptr,indexv)	((inst_rwlock_t *)(rwlock_ptr))->index = indexv
++#define GET_RWINDEX(rwlock_ptr)		((inst_rwlock_t *)(rwlock_ptr))->index
++#define PUT_RW_CPU(rwlock_ptr,cpuv)	((inst_rwlock_t *)(rwlock_ptr))->cpu = cpuv
++#define GET_RW_CPU(rwlock_ptr)		((inst_rwlock_t *)(rwlock_ptr))->cpu
++
++/*
++ * return true if rwlock is write locked
++ * (note that other lock attempts can cause the lock value to be negative)
++ */
++#define RWLOCK_IS_WRITE_LOCKED(rwlock_ptr) (((inst_rwlock_t *)rwlock_ptr)->lock & 1)
++#define IABS(x) ((x) > 0 ? (x) : -(x))
++
++#define RWLOCK_READERS(rwlock_ptr)	rwlock_readers(rwlock_ptr)
++extern inline int rwlock_readers(rwlock_t *rwlock_ptr)
++{
++	int tmp = (int) ((inst_rwlock_t *)rwlock_ptr)->lock;
++	/* readers subtract 2, so we have to:		*/
++	/* 	- andnot off a possible writer (bit 0)	*/
++	/*	- get the absolute value		*/
++	/*	- divide by 2 (right shift by one)	*/
++	/* to find the number of readers		*/
++	if (tmp == 0) return(0);
++	else return(IABS(tmp & ~1)>>1);
++}
++
++#endif /* _ALPHA_LOCKMETER_H */
+--- linux-2.6.0/include/asm-alpha/spinlock.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/asm-alpha/spinlock.h	2003-12-28 23:26:33.000000000 -0800
+@@ -6,6 +6,10 @@
+ #include <linux/kernel.h>
+ #include <asm/current.h>
+ 
++#ifdef CONFIG_LOCKMETER
++#undef DEBUG_SPINLOCK
++#undef DEBUG_RWLOCK
++#endif
+ 
+ /*
+  * Simple spin lock operations.  There are two variants, one clears IRQ's
+@@ -95,9 +99,18 @@ static inline int _raw_spin_trylock(spin
+ 
+ typedef struct {
+ 	volatile int write_lock:1, read_counter:31;
++#ifdef CONFIG_LOCKMETER
++	/* required for LOCKMETER since all bits in lock are used */
++	/* need this storage for CPU and lock INDEX ............. */
++	unsigned magic;
++#endif
+ } /*__attribute__((aligned(32)))*/ rwlock_t;
+ 
++#ifdef CONFIG_LOCKMETER
++#define RW_LOCK_UNLOCKED (rwlock_t) { 0, 0, 0 }
++#else
+ #define RW_LOCK_UNLOCKED (rwlock_t) { 0, 0 }
++#endif
+ 
+ #define rwlock_init(x)	do { *(x) = RW_LOCK_UNLOCKED; } while(0)
+ #define rwlock_is_locked(x)	(*(volatile int *)(x) != 0)
+@@ -169,4 +182,41 @@ static inline void _raw_read_unlock(rwlo
+ 	: "m" (*lock) : "memory");
+ }
+ 
++#ifdef CONFIG_LOCKMETER
++static inline int _raw_write_trylock(rwlock_t *lock)
++{
++	long temp,result;
++
++	__asm__ __volatile__(
++	"	ldl_l %1,%0\n"
++	"	mov $31,%2\n"
++	"	bne %1,1f\n"
++	"	or $31,1,%2\n"
++	"	stl_c %2,%0\n"
++	"1:	mb\n"
++	: "=m" (*(volatile int *)lock), "=&r" (temp), "=&r" (result)
++	: "m" (*(volatile int *)lock)
++	);
++
++	return (result);
++}
++
++static inline int _raw_read_trylock(rwlock_t *lock)
++{
++	unsigned long temp,result;
++
++	__asm__ __volatile__(
++	"	ldl_l %1,%0\n"
++	"	mov $31,%2\n"
++	"	blbs %1,1f\n"
++	"	subl %1,2,%2\n"
++	"	stl_c %2,%0\n"
++	"1:	mb\n"
++	: "=m" (*(volatile int *)lock), "=&r" (temp), "=&r" (result)
++	: "m" (*(volatile int *)lock)
++	);
++	return (result);
++}
++#endif /* CONFIG_LOCKMETER */
++
+ #endif /* _ALPHA_SPINLOCK_H */
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-arm26/cpumask.h	2003-12-28 23:22:10.000000000 -0800
+@@ -0,0 +1,6 @@
++#ifndef _ASM_ARM26_CPUMASK_H
++#define _ASM_ARM26_CPUMASK_H
++
++#include <asm-generic/cpumask.h>
++
++#endif /* _ASM_ARM26_CPUMASK_H */
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-arm/cpumask.h	2003-12-28 23:22:10.000000000 -0800
+@@ -0,0 +1,6 @@
++#ifndef _ASM_ARM_CPUMASK_H
++#define _ASM_ARM_CPUMASK_H
++
++#include <asm-generic/cpumask.h>
++
++#endif /* _ASM_ARM_CPUMASK_H */
+--- linux-2.6.0/include/asm-cris/arch-v10/byteorder.h	2003-07-10 18:50:32.000000000 -0700
++++ 25/include/asm-cris/arch-v10/byteorder.h	2003-12-28 23:22:55.000000000 -0800
+@@ -2,20 +2,21 @@
+ #define _CRIS_ARCH_BYTEORDER_H
+ 
+ #include <asm/types.h>
++#include <linux/compiler.h>
+ 
+ /* we just define these two (as we can do the swap in a single
+  * asm instruction in CRIS) and the arch-independent files will put
+  * them together into ntohl etc.
+  */
+ 
+-extern __inline__ __const__ __u32 ___arch__swab32(__u32 x)
++extern __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
+ {
+ 	__asm__ ("swapwb %0" : "=r" (x) : "0" (x));
+   
+ 	return(x);
+ }
+ 
+-extern __inline__ __const__ __u16 ___arch__swab16(__u16 x)
++extern __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x)
+ {
+ 	__asm__ ("swapb %0" : "=r" (x) : "0" (x));
+ 	
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-cris/cpumask.h	2003-12-28 23:22:10.000000000 -0800
+@@ -0,0 +1,6 @@
++#ifndef _ASM_CRIS_CPUMASK_H
++#define _ASM_CRIS_CPUMASK_H
++
++#include <asm-generic/cpumask.h>
++
++#endif /* _ASM_CRIS_CPUMASK_H */
+--- linux-2.6.0/include/asm-generic/cpumask_arith.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-generic/cpumask_arith.h	2003-12-28 23:22:10.000000000 -0800
+@@ -17,6 +17,7 @@
+ #define cpus_complement(map)		do { map = ~(map); } while (0)
+ #define cpus_equal(map1, map2)		((map1) == (map2))
+ #define cpus_empty(map)			((map) == 0)
++#define cpus_addr(map)			(&(map))
+ 
+ #if BITS_PER_LONG == 32
+ #define cpus_weight(map)		hweight32(map)
+--- linux-2.6.0/include/asm-generic/cpumask_array.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-generic/cpumask_array.h	2003-12-28 23:22:10.000000000 -0800
+@@ -20,6 +20,7 @@
+ #define cpus_complement(map)	bitmap_complement((map).mask, NR_CPUS)
+ #define cpus_equal(map1, map2)	bitmap_equal((map1).mask, (map2).mask, NR_CPUS)
+ #define cpus_empty(map)		bitmap_empty(map.mask, NR_CPUS)
++#define cpus_addr(map)		((map).mask)
+ #define cpus_weight(map)		bitmap_weight((map).mask, NR_CPUS)
+ #define cpus_shift_right(d, s, n)	bitmap_shift_right((d).mask, (s).mask, n, NR_CPUS)
+ #define cpus_shift_left(d, s, n)	bitmap_shift_left((d).mask, (s).mask, n, NR_CPUS)
+--- linux-2.6.0/include/asm-generic/cpumask_const_value.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/include/asm-generic/cpumask_const_value.h	2003-12-28 23:22:02.000000000 -0800
+@@ -3,7 +3,7 @@
+ 
+ typedef const cpumask_t cpumask_const_t;
+ 
+-#define mk_cpumask_const(map)		((cpumask_const_t)(map))
++#define mk_cpumask_const(map)		(map)
+ #define cpu_isset_const(cpu, map)	cpu_isset(cpu, map)
+ #define cpus_and_const(dst,src1,src2)	cpus_and(dst, src1, src2)
+ #define cpus_or_const(dst,src1,src2)	cpus_or(dst, src1, src2)
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-generic/cpumask.h	2003-12-28 23:22:10.000000000 -0800
+@@ -0,0 +1,40 @@
++#ifndef __ASM_GENERIC_CPUMASK_H
++#define __ASM_GENERIC_CPUMASK_H
++
++#include <linux/config.h>
++#include <linux/kernel.h>
++#include <linux/threads.h>
++#include <linux/types.h>
++#include <linux/bitmap.h>
++
++#if NR_CPUS > BITS_PER_LONG && NR_CPUS != 1
++#define CPU_ARRAY_SIZE		BITS_TO_LONGS(NR_CPUS)
++
++struct cpumask
++{
++	unsigned long mask[CPU_ARRAY_SIZE];
++};
++
++typedef struct cpumask cpumask_t;
++
++#else
++typedef unsigned long cpumask_t;
++#endif
++
++#ifdef CONFIG_SMP
++#if NR_CPUS > BITS_PER_LONG
++#include <asm-generic/cpumask_array.h>
++#else
++#include <asm-generic/cpumask_arith.h>
++#endif
++#else
++#include <asm-generic/cpumask_up.h>
++#endif
++
++#if NR_CPUS <= 4*BITS_PER_LONG
++#include <asm-generic/cpumask_const_value.h>
++#else
++#include <asm-generic/cpumask_const_reference.h>
++#endif
++
++#endif /* __ASM_GENERIC_CPUMASK_H */
+--- linux-2.6.0/include/asm-generic/cpumask_up.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-generic/cpumask_up.h	2003-12-28 23:22:10.000000000 -0800
+@@ -33,6 +33,7 @@
+ 
+ #define cpus_equal(map1, map2)		(cpus_coerce(map1) == cpus_coerce(map2))
+ #define cpus_empty(map)			(cpus_coerce(map) == 0UL)
++#define cpus_addr(map)			(&(map))
+ #define cpus_weight(map)		(cpus_coerce(map) ? 1UL : 0UL)
+ #define cpus_shift_right(d, s, n)	do { cpus_coerce(d) = 0UL; } while (0)
+ #define cpus_shift_left(d, s, n)	do { cpus_coerce(d) = 0UL; } while (0)
+--- linux-2.6.0/include/asm-generic/statfs.h	2003-06-22 12:04:45.000000000 -0700
++++ 25/include/asm-generic/statfs.h	2003-12-28 23:22:16.000000000 -0800
+@@ -34,4 +34,18 @@ struct statfs64 {
+ 	__u32 f_spare[5];
+ };
+ 
++struct compat_statfs64 {
++	__u32 f_type;
++	__u32 f_bsize;
++	__u64 f_blocks;
++	__u64 f_bfree;
++	__u64 f_bavail;
++	__u64 f_files;
++	__u64 f_ffree;
++	__kernel_fsid_t f_fsid;
++	__u32 f_namelen;
++	__u32 f_frsize;
++	__u32 f_spare[5];
++};
++
+ #endif
+--- linux-2.6.0/include/asm-h8300/bitops.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/include/asm-h8300/bitops.h	2003-12-28 23:22:56.000000000 -0800
+@@ -23,25 +23,22 @@
+  */
+ static __inline__ unsigned long ffz(unsigned long word)
+ {
+-	register unsigned long result asm("er0");
+-	register unsigned long _word asm("er1");
++	unsigned long result;
+ 
+-	_word = word;
+-	__asm__("sub.l %0,%0\n\t"
+-		"dec.l #1,%0\n"
+-		"1:\n\t"
+-		"shlr.l %1\n\t"
++	result = -1;
++	__asm__("1:\n\t"
++		"shlr.l %2\n\t"
+ 		"adds #1,%0\n\t"
+ 		"bcs 1b"
+-		: "=r" (result) : "r" (_word));
++		: "=r" (result)
++		: "0"  (result),"r" (word));
+ 	return result;
+ }
+ 
+ static __inline__ void set_bit(int nr, volatile unsigned long* addr)
+ {
+ 	volatile unsigned char *b_addr;
+-	b_addr = &(((volatile unsigned char *) addr)
+-	          [((nr >> 3) & ~3) + 3 - ((nr >> 3) & 3)]);
++	b_addr = (volatile unsigned char *)addr + ((nr >> 3) ^ 3);
+ 	__asm__("mov.l %1,er0\n\t"
+ 		"bset r0l,%0"
+ 		:"+m"(*b_addr)
+@@ -61,8 +58,7 @@ static __inline__ void set_bit(int nr, v
+ static __inline__ void clear_bit(int nr, volatile unsigned long* addr)
+ {
+ 	volatile unsigned char *b_addr;
+-	b_addr = &(((volatile unsigned char *) addr)
+-	          [((nr >> 3) & ~3) + 3 - ((nr >> 3) & 3)]);
++	b_addr = (volatile unsigned char *)addr + ((nr >> 3) ^ 3);
+ 	__asm__("mov.l %1,er0\n\t"
+ 		"bclr r0l,%0"
+ 		:"+m"(*b_addr)
+@@ -75,8 +71,7 @@ static __inline__ void clear_bit(int nr,
+ static __inline__ void change_bit(int nr, volatile unsigned long* addr)
+ {
+ 	volatile unsigned char *b_addr;
+-	b_addr = &(((volatile unsigned char *) addr)
+-	          [((nr >> 3) & ~3) + 3 - ((nr >> 3) & 3)]);
++	b_addr = (volatile unsigned char *)addr + ((nr >> 3) ^ 3);
+ 	__asm__("mov.l %1,er0\n\t"
+ 		"bnot r0l,%0"
+ 		:"+m"(*b_addr)
+@@ -88,22 +83,18 @@ static __inline__ void change_bit(int nr
+ 
+ static __inline__ int test_bit(int nr, const unsigned long* addr)
+ {
+-	return ((1UL << (nr & 7)) & 
+-               (((const volatile unsigned char *) addr)
+-               [((nr >> 3) & ~3) + 3 - ((nr >> 3) & 3)])) != 0;
++	return (*((volatile unsigned char *)addr + ((nr >> 3) ^ 3)) & (1UL << (nr & 7))) != 0;
+ }
+ 
+ #define __test_bit(nr, addr) test_bit(nr, addr)
+ 
+ static __inline__ int test_and_set_bit(int nr, volatile unsigned long* addr)
+ {
+-	register int retval __asm__("er0");
++	int retval = 0;
+ 	volatile unsigned char *a;
+-	a = (volatile unsigned char *)addr;
+ 
+-	a += ((nr >> 3) & ~3) + (3 - ((nr >> 3) & 3));
+-	__asm__("mov.l %2,er3\n\t"
+-		"sub.l %0,%0\n\t"
++	a = (volatile unsigned char *)addr += ((nr >> 3) ^ 3);             \
++	__asm__("mov.l %4,er3\n\t"
+ 		"stc ccr,r3h\n\t"
+ 		"orc #0x80,ccr\n\t"
+ 		"btst r3l,%1\n\t"
+@@ -112,37 +103,35 @@ static __inline__ int test_and_set_bit(i
+ 		"inc.l #1,%0\n\t"
+ 		"1:"
+ 		"ldc r3h,ccr"
+-		: "=r"(retval),"+m"(*a) :"g"(nr & 7):"er3","memory");
++		: "=r"(retval),"+m"(*a)
++		: "0" (retval),"m" (*a),"g"(nr & 7):"er3","memory");
+ 	return retval;
+ }
+ 
+ static __inline__ int __test_and_set_bit(int nr, volatile unsigned long* addr)
+ {
+-	register int retval __asm__("er0");
++	int retval = 0;
+ 	volatile unsigned char *a;
+-	a = (volatile unsigned char *)addr;
+ 
+-	a += ((nr >> 3) & ~3) + (3 - ((nr >> 3) & 3));
+-	__asm__("mov.l %2,er3\n\t"
+-		"sub.l %0,%0\n\t"
++	a = (volatile unsigned char *)addr += ((nr >> 3) ^ 3);             \
++	__asm__("mov.l %4,er3\n\t"
+ 		"btst r3l,%1\n\t"
+ 		"bset r3l,%1\n\t"
+ 		"beq 1f\n\t"
+ 		"inc.l #1,%0\n\t"
+ 		"1:"
+-		: "=r"(retval),"+m"(*a) :"g"(nr & 7):"er3","memory");
++		: "=r"(retval),"+m"(*a)
++		: "0" (retval),"m" (*a),"g"(nr & 7):"er3","memory");
+ 	return retval;
+ }
+ 
+ static __inline__ int test_and_clear_bit(int nr, volatile unsigned long* addr)
+ {
+-	register int retval __asm__("er0");
++	int retval = 0;
+ 	volatile unsigned char *a;
+-	a = (volatile unsigned char *)addr;
+ 
+-	a += ((nr >> 3) & ~3) + (3 - ((nr >> 3) & 3));
+-	__asm__("mov.l %2,er3\n\t"
+-		"sub.l %0,%0\n\t"
++	a = (volatile unsigned char *)addr += ((nr >> 3) ^ 3);             \
++	__asm__("mov.l %4,er3\n\t"
+ 		"stc ccr,r3h\n\t"
+ 		"orc #0x80,ccr\n\t"
+ 		"btst r3l,%1\n\t"
+@@ -151,37 +140,35 @@ static __inline__ int test_and_clear_bit
+ 		"inc.l #1,%0\n\t"
+ 		"1:"
+ 		"ldc r3h,ccr"
+-		: "=r"(retval),"=m"(*a) :"g"(nr & 7):"er3","memory");
++		: "=r"(retval),"+m"(*a)
++		: "0" (retval),"m" (*a),"g"(nr & 7):"er3","memory");
+ 	return retval;
+ }
+ 
+ static __inline__ int __test_and_clear_bit(int nr, volatile unsigned long* addr)
+ {
+-	register int retval __asm__("er0");
++	int retval = 0;
+ 	volatile unsigned char *a;
+-	a = (volatile unsigned char *)addr;
+ 
+-	a += ((nr >> 3) & ~3) + (3 - ((nr >> 3) & 3));
+-	__asm__("mov.l %2,er3\n\t"
+-		"sub.l %0,%0\n\t"
++	a = (volatile unsigned char *)addr += ((nr >> 3) ^ 3);             \
++	__asm__("mov.l %4,er3\n\t"
+ 		"btst r3l,%1\n\t"
+ 		"bclr r3l,%1\n\t"
+ 		"beq 1f\n\t"
+ 		"inc.l #1,%0\n\t"
+ 		"1:"
+-		: "=r"(retval),"+m"(*a) :"g"(nr & 7):"er3","memory");
++		: "=r"(retval),"+m"(*a)
++		: "0" (retval),"m" (*a),"g"(nr & 7):"er3","memory");
+ 	return retval;
+ }
+ 
+ static __inline__ int test_and_change_bit(int nr, volatile unsigned long* addr)
+ {
+-	register int retval __asm__("er0");
++	int retval = 0;
+ 	volatile unsigned char *a;
+-	a = (volatile unsigned char *)addr;
+ 
+-	a += ((nr >> 3) & ~3) + (3 - ((nr >> 3) & 3));
+-	__asm__("mov.l %2,er3\n\t"
+-		"sub.l %0,%0\n\t"
++	a = (volatile unsigned char *)addr += ((nr >> 3) ^ 3);             \
++	__asm__("mov.l %4,er3\n\t"
+ 		"stc ccr,r3h\n\t"
+ 		"orc #0x80,ccr\n\t"
+ 		"btst r3l,%1\n\t"
+@@ -190,25 +177,25 @@ static __inline__ int test_and_change_bi
+ 		"inc.l #1,%0\n\t"
+ 		"1:"
+ 		"ldc r3h,ccr"
+-		: "=r"(retval),"+m"(*a) :"g"(nr & 7):"er3","memory");
++		: "=r"(retval),"+m"(*a)
++		: "0" (retval),"m" (*a),"g"(nr & 7):"er3","memory");
+ 	return retval;
+ }
+ 
+ static __inline__ int __test_and_change_bit(int nr, volatile unsigned long* addr)
+ {
+-	register int retval __asm__("er0");
++	int retval = 0;
+ 	volatile unsigned char *a;
+-	a = (volatile unsigned char *)addr;
+ 
+-	a += ((nr >> 3) & ~3) + (3 - ((nr >> 3) & 3));
+-	__asm__("mov.l %2,er3\n\t"
+-		"sub.l %0,%0\n\t"
++	a = (volatile unsigned char *)addr += ((nr >> 3) ^ 3);             \
++	__asm__("mov.l %4,er3\n\t"
+ 		"btst r3l,%1\n\t"
+ 		"bnot r3l,%1\n\t"
+ 		"beq 1f\n\t"
+ 		"inc.l #1,%0\n\t"
+ 		"1:"
+-		: "=r"(retval),"+m"(*a) :"g"(nr & 7):"er3","memory");
++		: "=r"(retval),"+m"(*a)
++		: "0" (retval),"m" (*a),"g"(nr & 7):"er3","memory");
+ 	return retval;
+ }
+ 
+@@ -251,27 +238,21 @@ found_middle:
+ 	return result + ffz(tmp);
+ }
+ 
+-static __inline__ unsigned long ffs(unsigned long word)
++static __inline__ unsigned long __ffs(unsigned long word)
+ {
+-	register unsigned long result asm("er0");
+-	register unsigned long _word asm("er1");
++	unsigned long result;
+ 
+-	_word = word;
+-	__asm__("sub.l %0,%0\n\t"
+-		"dec.l #1,%0\n"
+-		"1:\n\t"
+-		"shlr.l %1\n\t"
++	result = -1;
++	__asm__("1:\n\t"
++		"shlr.l %2\n\t"
+ 		"adds #1,%0\n\t"
+ 		"bcc 1b"
+-		: "=r" (result) : "r"(_word));
++		: "=r" (result)
++		: "0"(result),"r"(word));
+ 	return result;
+ }
+ 
+-#define __ffs(x) ffs(x)
+-
+-/*
+- * fls: find last bit set.
+- */
++#define ffs(x) generic_ffs(x)
+ #define fls(x) generic_fls(x)
+ 
+ /*
+@@ -316,6 +297,7 @@ static __inline__ int ext2_set_bit(int n
+ 	local_irq_restore(flags);
+ 	return retval;
+ }
++#define ext2_set_bit_atomic(lock, nr, addr) ext2_set_bit(nr, addr)
+ 
+ static __inline__ int ext2_clear_bit(int nr, volatile void * addr)
+ {
+@@ -331,6 +313,7 @@ static __inline__ int ext2_clear_bit(int
+ 	local_irq_restore(flags);
+ 	return retval;
+ }
++#define ext2_clear_bit_atomic(lock, nr, addr) ext2_set_bit(nr, addr)
+ 
+ static __inline__ int ext2_test_bit(int nr, const volatile void * addr)
+ {
+@@ -402,17 +385,6 @@ found_middle:
+ #define minix_test_bit(nr,addr) test_bit(nr,addr)
+ #define minix_find_first_zero_bit(addr,size) find_first_zero_bit(addr,size)
+ 
+-/**
+- * hweightN - returns the hamming weight of a N-bit word
+- * @x: the word to weigh
+- *
+- * The Hamming Weight of a number is the total number of bits set in it.
+- */
+-
+-#define hweight32(x) generic_hweight32(x)
+-#define hweight16(x) generic_hweight16(x)
+-#define hweight8(x) generic_hweight8(x)
+-
+ #endif /* __KERNEL__ */
+ 
+ #endif /* _H8300_BITOPS_H */
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-h8300/cpumask.h	2003-12-28 23:22:10.000000000 -0800
+@@ -0,0 +1,6 @@
++#ifndef _ASM_H8300_CPUMASK_H
++#define _ASM_H8300_CPUMASK_H
++
++#include <asm-generic/cpumask.h>
++
++#endif /* _ASM_H8300_CPUMASK_H */
+--- linux-2.6.0/include/asm-i386/acpi.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/include/asm-i386/acpi.h	2003-12-28 23:21:33.000000000 -0800
+@@ -109,7 +109,7 @@
+ #ifdef CONFIG_ACPI_BOOT 
+ extern int acpi_lapic;
+ extern int acpi_ioapic;
+-
++extern int acpi_noirq;
+ 
+ /* Fixmap pages to reserve for ACPI boot-time tables (see fixmap.h) */
+ #define FIX_ACPI_PAGES 4
+@@ -139,6 +139,14 @@ static inline void disable_ioapic_setup(
+ 
+ #endif
+ 
++#ifdef CONFIG_ACPI_PCI
++static inline void acpi_noirq_set(void) { acpi_noirq = 1; }
++extern int acpi_irq_balance_set(char *str);
++#else
++static inline void acpi_noirq_set(void) { }
++static inline int acpi_irq_balance_set(char *str) { return 0; }
++#endif
++
+ #ifdef CONFIG_ACPI_SLEEP
+ 
+ /* routines for saving/restoring kernel state */
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-i386/atomic_kmap.h	2003-12-28 23:26:36.000000000 -0800
+@@ -0,0 +1,95 @@
++/*
++ * atomic_kmap.h: temporary virtual kernel memory mappings
++ *
++ * Copyright (C) 2003 Ingo Molnar <mingo@redhat.com>
++ */
++
++#ifndef _ASM_ATOMIC_KMAP_H
++#define _ASM_ATOMIC_KMAP_H
++
++#ifdef __KERNEL__
++
++#include <linux/config.h>
++#include <asm/tlbflush.h>
++
++#ifdef CONFIG_DEBUG_HIGHMEM
++#define HIGHMEM_DEBUG 1
++#else
++#define HIGHMEM_DEBUG 0
++#endif
++
++extern pte_t *kmap_pte;
++#define kmap_prot PAGE_KERNEL
++
++#define PKMAP_BASE (0xff000000UL)
++#define NR_SHARED_PMDS ((0xffffffff-PKMAP_BASE+1)/PMD_SIZE)
++
++static inline unsigned long __kmap_atomic_vaddr(enum km_type type)
++{
++	enum fixed_addresses idx;
++
++	idx = type + KM_TYPE_NR*smp_processor_id();
++	return __fix_to_virt(FIX_KMAP_BEGIN + idx);
++}
++
++static inline void *__kmap_atomic_noflush(struct page *page, enum km_type type)
++{
++	enum fixed_addresses idx;
++	unsigned long vaddr;
++
++	idx = type + KM_TYPE_NR*smp_processor_id();
++	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
++	/*
++	 * NOTE: entries that rely on some secondary TLB-flush
++	 * effect must not be global:
++	 */
++	set_pte(kmap_pte-idx, mk_pte(page, PAGE_KERNEL));
++
++	return (void*) vaddr;
++}
++
++static inline void *__kmap_atomic(struct page *page, enum km_type type)
++{
++	enum fixed_addresses idx;
++	unsigned long vaddr;
++
++	idx = type + KM_TYPE_NR*smp_processor_id();
++	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
++#if HIGHMEM_DEBUG
++	BUG_ON(!pte_none(*(kmap_pte-idx)));
++#else
++	/*
++	 * Performance optimization - do not flush if the new
++	 * pte is the same as the old one:
++	 */
++	if (pte_val(*(kmap_pte-idx)) == pte_val(mk_pte(page, kmap_prot)))
++		return (void *) vaddr;
++#endif
++	set_pte(kmap_pte-idx, mk_pte(page, kmap_prot));
++	__flush_tlb_one(vaddr);
++
++	return (void*) vaddr;
++}
++
++static inline void __kunmap_atomic(void *kvaddr, enum km_type type)
++{
++#if HIGHMEM_DEBUG
++	unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK;
++	enum fixed_addresses idx = type + KM_TYPE_NR*smp_processor_id();
++
++	BUG_ON(vaddr != __fix_to_virt(FIX_KMAP_BEGIN+idx));
++	/*
++	 * force other mappings to Oops if they'll try to access
++	 * this pte without first remap it
++	 */
++	pte_clear(kmap_pte-idx);
++	__flush_tlb_one(vaddr);
++#endif
++}
++
++#define __kunmap_atomic_type(type) \
++		__kunmap_atomic((void *)__kmap_atomic_vaddr(type), (type))
++
++#endif /* __KERNEL__ */
++
++#endif /* _ASM_ATOMIC_KMAP_H */
+--- linux-2.6.0/include/asm-i386/bugs.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/asm-i386/bugs.h	2003-12-28 23:21:07.000000000 -0800
+@@ -1,11 +1,11 @@
+ /*
+  *  include/asm-i386/bugs.h
+  *
+- *  Copyright (C) 1994  Linus Torvalds
++ *  Copyright (C) 1994	Linus Torvalds
+  *
+  *  Cyrix stuff, June 1998 by:
+  *	- Rafael R. Reilova (moved everything from head.S),
+- *        <rreilova@ececs.uc.edu>
++ *	  <rreilova@ececs.uc.edu>
+  *	- Channing Corn (tests & fixes),
+  *	- Andrew D. Balsa (code cleanup).
+  *
+@@ -25,7 +25,20 @@
+ #include <asm/processor.h>
+ #include <asm/i387.h>
+ #include <asm/msr.h>
+-
++#ifdef CONFIG_KGDB
++/*
++ * Provied the command line "gdb" initial break
++ */
++int __init kgdb_initial_break(char * str)
++{
++	if (*str == '\0'){
++		breakpoint();
++		return 1;
++	}
++	return 0;
++}
++__setup("gdb",kgdb_initial_break);
++#endif
+ static int __init no_halt(char *s)
+ {
+ 	boot_cpu_data.hlt_works_ok = 0;
+@@ -140,7 +153,7 @@ static void __init check_popad(void)
+ 	  : "ecx", "edi" );
+ 	/* If this fails, it means that any user program may lock the CPU hard. Too bad. */
+ 	if (res != 12345678) printk( "Buggy.\n" );
+-		        else printk( "OK.\n" );
++			else printk( "OK.\n" );
+ #endif
+ }
+ 
+--- linux-2.6.0/include/asm-i386/byteorder.h	2003-06-14 12:18:23.000000000 -0700
++++ 25/include/asm-i386/byteorder.h	2003-12-28 23:22:55.000000000 -0800
+@@ -2,6 +2,7 @@
+ #define _I386_BYTEORDER_H
+ 
+ #include <asm/types.h>
++#include <linux/compiler.h>
+ 
+ #ifdef __GNUC__
+ 
+@@ -10,7 +11,7 @@
+ #include <linux/config.h>
+ #endif
+ 
+-static __inline__ __const__ __u32 ___arch__swab32(__u32 x)
++static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
+ {
+ #ifdef CONFIG_X86_BSWAP
+ 	__asm__("bswap %0" : "=r" (x) : "0" (x));
+@@ -24,18 +25,7 @@ static __inline__ __const__ __u32 ___arc
+ 	return x;
+ }
+ 
+-/* gcc should generate this for open coded C now too. May be worth switching to 
+-   it because inline assembly cannot be scheduled. -AK */
+-static __inline__ __const__ __u16 ___arch__swab16(__u16 x)
+-{
+-	__asm__("xchgb %b0,%h0"		/* swap bytes		*/
+-		: "=q" (x)
+-		:  "0" (x));
+-		return x;
+-}
+-
+-
+-static inline __u64 ___arch__swab64(__u64 val) 
++static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 val)
+ { 
+ 	union { 
+ 		struct { __u32 a,b; } s;
+@@ -54,9 +44,11 @@ static inline __u64 ___arch__swab64(__u6
+ 	return v.u;	
+ } 
+ 
++/* Do not define swab16.  Gcc is smart enough to recognize "C" version and
++   convert it into rotation or exhange.  */
++
+ #define __arch__swab64(x) ___arch__swab64(x)
+ #define __arch__swab32(x) ___arch__swab32(x)
+-#define __arch__swab16(x) ___arch__swab16(x)
+ 
+ #define __BYTEORDER_HAS_U64__
+ 
+--- linux-2.6.0/include/asm-i386/checksum.h	2003-11-23 19:03:01.000000000 -0800
++++ 25/include/asm-i386/checksum.h	2003-12-28 23:26:36.000000000 -0800
+@@ -25,7 +25,7 @@ asmlinkage unsigned int csum_partial(con
+  * better 64-bit) boundary
+  */
+ 
+-asmlinkage unsigned int csum_partial_copy_generic( const char *src, char *dst, int len, int sum,
++asmlinkage unsigned int direct_csum_partial_copy_generic( const char *src, char *dst, int len, int sum,
+ 						   int *src_err_ptr, int *dst_err_ptr);
+ 
+ /*
+@@ -39,14 +39,19 @@ static __inline__
+ unsigned int csum_partial_copy_nocheck ( const char *src, char *dst,
+ 					int len, int sum)
+ {
+-	return csum_partial_copy_generic ( src, dst, len, sum, NULL, NULL);
++	/*
++	 * The direct function is OK for kernel-space => kernel-space copies:
++	 */
++	return direct_csum_partial_copy_generic ( src, dst, len, sum, NULL, NULL);
+ }
+ 
+ static __inline__
+ unsigned int csum_partial_copy_from_user ( const char *src, char *dst,
+ 						int len, int sum, int *err_ptr)
+ {
+-	return csum_partial_copy_generic ( src, dst, len, sum, err_ptr, NULL);
++	if (copy_from_user(dst, src, len))
++		*err_ptr = -EFAULT;
++	return csum_partial(dst, len, sum);
+ }
+ 
+ /*
+@@ -172,11 +177,26 @@ static __inline__ unsigned short int csu
+  *	Copy and checksum to user
+  */
+ #define HAVE_CSUM_COPY_USER
+-static __inline__ unsigned int csum_and_copy_to_user(const char *src, char *dst,
++static __inline__ unsigned int direct_csum_and_copy_to_user(const char *src, char *dst,
+ 				    int len, int sum, int *err_ptr)
+ {
+ 	if (access_ok(VERIFY_WRITE, dst, len))
+-		return csum_partial_copy_generic(src, dst, len, sum, NULL, err_ptr);
++		return direct_csum_partial_copy_generic(src, dst, len, sum, NULL, err_ptr);
++
++	if (len)
++		*err_ptr = -EFAULT;
++
++	return -1; /* invalid checksum */
++}
++
++static __inline__ unsigned int csum_and_copy_to_user(const char *src, char *dst,
++				    int len, int sum, int *err_ptr)
++{
++	if (access_ok(VERIFY_WRITE, dst, len)) {
++		if (copy_to_user(dst, src, len))
++			*err_ptr = -EFAULT;
++		return csum_partial(src, len, sum);
++	}
+ 
+ 	if (len)
+ 		*err_ptr = -EFAULT;
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-i386/cpumask.h	2003-12-28 23:22:10.000000000 -0800
+@@ -0,0 +1,6 @@
++#ifndef _ASM_I386_CPUMASK_H
++#define _ASM_I386_CPUMASK_H
++
++#include <asm-generic/cpumask.h>
++
++#endif /* _ASM_I386_CPUMASK_H */
+--- linux-2.6.0/include/asm-i386/desc.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/asm-i386/desc.h	2003-12-28 23:26:36.000000000 -0800
+@@ -21,6 +21,13 @@ struct Xgt_desc_struct {
+ 
+ extern struct Xgt_desc_struct idt_descr, cpu_gdt_descr[NR_CPUS];
+ 
++extern void trap_init_virtual_IDT(void);
++extern void trap_init_virtual_GDT(void);
++
++asmlinkage int system_call(void);
++asmlinkage void lcall7(void);
++asmlinkage void lcall27(void);
++
+ #define load_TR_desc() __asm__ __volatile__("ltr %%ax"::"a" (GDT_ENTRY_TSS*8))
+ #define load_LDT_desc() __asm__ __volatile__("lldt %%ax"::"a" (GDT_ENTRY_LDT*8))
+ 
+@@ -30,6 +37,7 @@ extern struct Xgt_desc_struct idt_descr,
+  */
+ extern struct desc_struct default_ldt[];
+ extern void set_intr_gate(unsigned int irq, void * addr);
++extern void set_trap_gate(unsigned int n, void *addr);
+ 
+ #define _set_tssldt_desc(n,addr,limit,type) \
+ __asm__ __volatile__ ("movw %w3,0(%2)\n\t" \
+@@ -90,31 +98,8 @@ static inline void load_TLS(struct threa
+ #undef C
+ }
+ 
+-static inline void clear_LDT(void)
+-{
+-	int cpu = get_cpu();
+-
+-	set_ldt_desc(cpu, &default_ldt[0], 5);
+-	load_LDT_desc();
+-	put_cpu();
+-}
+-
+-/*
+- * load one particular LDT into the current CPU
+- */
+-static inline void load_LDT_nolock(mm_context_t *pc, int cpu)
+-{
+-	void *segments = pc->ldt;
+-	int count = pc->size;
+-
+-	if (likely(!count)) {
+-		segments = &default_ldt[0];
+-		count = 5;
+-	}
+-		
+-	set_ldt_desc(cpu, segments, count);
+-	load_LDT_desc();
+-}
++extern struct page *default_ldt_page;
++extern void load_LDT_nolock(mm_context_t *pc, int cpu);
+ 
+ static inline void load_LDT(mm_context_t *pc)
+ {
+@@ -123,6 +108,6 @@ static inline void load_LDT(mm_context_t
+ 	put_cpu();
+ }
+ 
+-#endif /* !__ASSEMBLY__ */
+ 
++#endif /* !__ASSEMBLY__ */
+ #endif
+--- linux-2.6.0/include/asm-i386/fixmap.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/asm-i386/fixmap.h	2003-12-28 23:26:36.000000000 -0800
+@@ -18,17 +18,15 @@
+ #include <asm/acpi.h>
+ #include <asm/apicdef.h>
+ #include <asm/page.h>
+-#ifdef CONFIG_HIGHMEM
+ #include <linux/threads.h>
+ #include <asm/kmap_types.h>
+-#endif
+ 
+ /*
+  * Here we define all the compile-time 'special' virtual
+  * addresses. The point is to have a constant address at
+  * compile time, but to set the physical address only
+- * in the boot process. We allocate these special addresses
+- * from the end of virtual memory (0xfffff000) backwards.
++ * in the boot process. We allocate these special  addresses
++ * from the end of virtual memory (0xffffe000) backwards.
+  * Also this lets us do fail-safe vmalloc(), we
+  * can guarantee that these special addresses and
+  * vmalloc()-ed addresses never overlap.
+@@ -41,11 +39,20 @@
+  * TLB entries of such buffers will not be flushed across
+  * task switches.
+  */
++
++/*
++ * on UP currently we will have no trace of the fixmap mechanizm,
++ * no page table allocations, etc. This might change in the
++ * future, say framebuffers for the console driver(s) could be
++ * fix-mapped?
++ */
+ enum fixed_addresses {
+ 	FIX_HOLE,
+ 	FIX_VSYSCALL,
+ #ifdef CONFIG_X86_LOCAL_APIC
+ 	FIX_APIC_BASE,	/* local (CPU) APIC) -- required for SMP or not */
++#else
++	FIX_VSTACK_HOLE_1,
+ #endif
+ #ifdef CONFIG_X86_IO_APIC
+ 	FIX_IO_APIC_BASE_0,
+@@ -57,16 +64,21 @@ enum fixed_addresses {
+ 	FIX_LI_PCIA,	/* Lithium PCI Bridge A */
+ 	FIX_LI_PCIB,	/* Lithium PCI Bridge B */
+ #endif
+-#ifdef CONFIG_X86_F00F_BUG
+-	FIX_F00F_IDT,	/* Virtual mapping for IDT */
+-#endif
++	FIX_IDT,
++	FIX_GDT_1,
++	FIX_GDT_0,
++	FIX_TSS_3,
++	FIX_TSS_2,
++	FIX_TSS_1,
++	FIX_TSS_0,
++	FIX_ENTRY_TRAMPOLINE_1,
++	FIX_ENTRY_TRAMPOLINE_0,
+ #ifdef CONFIG_X86_CYCLONE_TIMER
+ 	FIX_CYCLONE_TIMER, /*cyclone timer register*/
++	FIX_VSTACK_HOLE_2,
+ #endif 
+-#ifdef CONFIG_HIGHMEM
+ 	FIX_KMAP_BEGIN,	/* reserved pte's for temporary kernel mappings */
+ 	FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,
+-#endif
+ #ifdef CONFIG_ACPI_BOOT
+ 	FIX_ACPI_BEGIN,
+ 	FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1,
+@@ -95,12 +107,15 @@ extern void __set_fixmap (enum fixed_add
+ 		__set_fixmap(idx, 0, __pgprot(0))
+ 
+ /*
+- * used by vmalloc.c.
++ * used by vmalloc.c and various other places.
+  *
+  * Leave one empty page between vmalloc'ed areas and
+  * the start of the fixmap.
++ *
++ * IMPORTANT: dont change FIXADDR_TOP without adjusting KM_VSTACK0
++ * and KM_VSTACK1 so that the virtual stack is 8K aligned.
+  */
+-#define FIXADDR_TOP	(0xfffff000UL)
++#define FIXADDR_TOP	(0xffffe000UL)
+ #define __FIXADDR_SIZE	(__end_of_permanent_fixed_addresses << PAGE_SHIFT)
+ #define FIXADDR_START	(FIXADDR_TOP - __FIXADDR_SIZE)
+ 
+--- linux-2.6.0/include/asm-i386/genapic.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-i386/genapic.h	2003-12-28 23:21:32.000000000 -0800
+@@ -45,6 +45,7 @@ struct genapic { 
+ 	void (*setup_portio_remap)(void); 
+ 	int (*check_phys_apicid_present)(int boot_cpu_physical_apicid);
+ 	void (*enable_apic_mode)(void);
++	u32 (*phys_pkg_id)(u32 cpuid_apic, int index_msb);
+ 
+ 	/* mpparse */
+ 	void (*mpc_oem_bus_info)(struct mpc_config_bus *, char *, 
+@@ -105,6 +106,7 @@ struct genapic { 
+ 	APICFUNC(send_IPI_allbutself), \
+ 	APICFUNC(send_IPI_all), \
+ 	APICFUNC(enable_apic_mode), \
++	APICFUNC(phys_pkg_id), \
+ 	}
+ 
+ extern struct genapic *genapic;
+--- linux-2.6.0/include/asm-i386/highmem.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/asm-i386/highmem.h	2003-12-28 23:26:36.000000000 -0800
+@@ -25,26 +25,19 @@
+ #include <linux/threads.h>
+ #include <asm/kmap_types.h>
+ #include <asm/tlbflush.h>
++#include <asm/atomic_kmap.h>
+ 
+ /* declarations for highmem.c */
+ extern unsigned long highstart_pfn, highend_pfn;
+ 
+-extern pte_t *kmap_pte;
+-extern pgprot_t kmap_prot;
+ extern pte_t *pkmap_page_table;
+-
+-extern void kmap_init(void);
++extern void kmap_init(void) __init;
+ 
+ /*
+  * Right now we initialize only a single pte table. It can be extended
+  * easily, subsequent pte tables have to be allocated in one physical
+  * chunk of RAM.
+  */
+-#if NR_CPUS <= 32
+-#define PKMAP_BASE (0xff800000UL)
+-#else
+-#define PKMAP_BASE (0xff600000UL)
+-#endif
+ #ifdef CONFIG_X86_PAE
+ #define LAST_PKMAP 512
+ #else
+--- linux-2.6.0/include/asm-i386/hw_irq.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/asm-i386/hw_irq.h	2003-12-28 23:21:44.000000000 -0800
+@@ -41,6 +41,7 @@ asmlinkage void apic_timer_interrupt(voi
+ asmlinkage void error_interrupt(void);
+ asmlinkage void spurious_interrupt(void);
+ asmlinkage void thermal_interrupt(struct pt_regs);
++#define platform_legacy_irq(irq)	((irq) < 16)
+ #endif
+ 
+ void mask_irq(unsigned int irq);
+--- linux-2.6.0/include/asm-i386/io_apic.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/asm-i386/io_apic.h	2003-12-28 23:21:44.000000000 -0800
+@@ -13,6 +13,46 @@
+ 
+ #ifdef CONFIG_X86_IO_APIC
+ 
++#ifdef CONFIG_PCI_USE_VECTOR
++static inline int use_pci_vector(void)	{return 1;}
++static inline void disable_edge_ioapic_vector(unsigned int vector) { }
++static inline void mask_and_ack_level_ioapic_vector(unsigned int vector) { }
++static inline void end_edge_ioapic_vector (unsigned int vector) { }
++#define startup_level_ioapic	startup_level_ioapic_vector
++#define shutdown_level_ioapic	mask_IO_APIC_vector
++#define enable_level_ioapic	unmask_IO_APIC_vector
++#define disable_level_ioapic	mask_IO_APIC_vector
++#define mask_and_ack_level_ioapic mask_and_ack_level_ioapic_vector
++#define end_level_ioapic	end_level_ioapic_vector
++#define set_ioapic_affinity	set_ioapic_affinity_vector
++
++#define startup_edge_ioapic 	startup_edge_ioapic_vector
++#define shutdown_edge_ioapic 	disable_edge_ioapic_vector
++#define enable_edge_ioapic 	unmask_IO_APIC_vector
++#define disable_edge_ioapic 	disable_edge_ioapic_vector
++#define ack_edge_ioapic 	ack_edge_ioapic_vector
++#define end_edge_ioapic 	end_edge_ioapic_vector
++#else
++static inline int use_pci_vector(void)	{return 0;}
++static inline void disable_edge_ioapic_irq(unsigned int irq) { }
++static inline void mask_and_ack_level_ioapic_irq(unsigned int irq) { }
++static inline void end_edge_ioapic_irq (unsigned int irq) { }
++#define startup_level_ioapic	startup_level_ioapic_irq
++#define shutdown_level_ioapic	mask_IO_APIC_irq
++#define enable_level_ioapic	unmask_IO_APIC_irq
++#define disable_level_ioapic	mask_IO_APIC_irq
++#define mask_and_ack_level_ioapic mask_and_ack_level_ioapic_irq
++#define end_level_ioapic	end_level_ioapic_irq
++#define set_ioapic_affinity	set_ioapic_affinity_irq
++
++#define startup_edge_ioapic 	startup_edge_ioapic_irq
++#define shutdown_edge_ioapic 	disable_edge_ioapic_irq
++#define enable_edge_ioapic 	unmask_IO_APIC_irq
++#define disable_edge_ioapic 	disable_edge_ioapic_irq
++#define ack_edge_ioapic 	ack_edge_ioapic_irq
++#define end_edge_ioapic 	end_edge_ioapic_irq
++#endif
++
+ #define APIC_MISMATCH_DEBUG
+ 
+ #define IO_APIC_BASE(idx) \
+@@ -177,4 +217,6 @@ extern int io_apic_set_pci_routing (int 
+ #define io_apic_assign_pci_irqs 0
+ #endif
+ 
++extern int assign_irq_vector(int irq);
++
+ #endif
+--- linux-2.6.0/include/asm-i386/ioctl.h	2003-09-08 13:58:59.000000000 -0700
++++ 25/include/asm-i386/ioctl.h	2003-12-28 23:22:30.000000000 -0800
+@@ -53,7 +53,7 @@
+ 	 ((size) << _IOC_SIZESHIFT))
+ 
+ /* provoke compile error for invalid uses of size argument */
+-extern int __invalid_size_argument_for_IOC;
++extern unsigned int __invalid_size_argument_for_IOC;
+ #define _IOC_TYPECHECK(t) \
+ 	((sizeof(t) == sizeof(t[1]) && \
+ 	  sizeof(t) < (1 << _IOC_SIZEBITS)) ? \
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-i386/kgdb.h	2003-12-28 23:21:09.000000000 -0800
+@@ -0,0 +1,69 @@
++#ifndef __KGDB
++#define __KGDB
++
++/*
++ * This file should not include ANY others.  This makes it usable
++ * most anywhere without the fear of include order or inclusion.
++ * Make it so!
++ *
++ * This file may be included all the time.  It is only active if
++ * CONFIG_KGDB is defined, otherwise it stubs out all the macros
++ * and entry points.
++ */
++#if defined(CONFIG_KGDB) && !defined(__ASSEMBLY__)
++
++extern void breakpoint(void);
++#define INIT_KGDB_INTS kgdb_enable_ints()
++
++#ifndef BREAKPOINT
++#define BREAKPOINT   asm("   int $3")
++#endif
++
++extern void kgdb_schedule_breakpoint(void);
++extern void kgdb_process_breakpoint(void);
++
++extern int kgdb_tty_hook(void);
++extern int kgdb_eth_hook(void);
++extern int kgdboe;
++
++/*
++ * GDB debug stub (or any debug stub) can point the 'linux_debug_hook'
++ * pointer to its routine and it will be entered as the first thing
++ * when a trap occurs.
++ *
++ * Return values are, at present, undefined.
++ *
++ * The debug hook routine does not necessarily return to its caller.
++ * It has the register image and thus may choose to resume execution
++ * anywhere it pleases.
++ */
++struct pt_regs;
++
++extern int kgdb_handle_exception(int trapno,
++				 int signo, int err_code, struct pt_regs *regs);
++extern int in_kgdb(struct pt_regs *regs);
++
++#ifdef CONFIG_KGDB_TS
++void kgdb_tstamp(int line, char *source, int data0, int data1);
++/*
++ * This is the time stamp function.  The macro adds the source info and
++ * does a cast on the data to allow most any 32-bit value.
++ */
++
++#define kgdb_ts(data0,data1) kgdb_tstamp(__LINE__,__FILE__,(int)data0,(int)data1)
++#else
++#define kgdb_ts(data0,data1)
++#endif
++#else				/* CONFIG_KGDB  && ! __ASSEMBLY__ ,stubs follow... */
++#ifndef BREAKPOINT
++#define BREAKPOINT
++#endif
++#define kgdb_ts(data0,data1)
++#define in_kgdb
++#define kgdb_handle_exception
++#define breakpoint
++#define INIT_KGDB_INTS
++#define kgdb_process_breakpoint() do {} while(0)
++
++#endif
++#endif				/* __KGDB */
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-i386/kgdb_local.h	2003-12-28 23:21:07.000000000 -0800
+@@ -0,0 +1,102 @@
++#ifndef __KGDB_LOCAL
++#define ___KGDB_LOCAL
++#include <linux/config.h>
++#include <linux/types.h>
++#include <linux/serial.h>
++#include <linux/serialP.h>
++#include <linux/spinlock.h>
++#include <asm/processor.h>
++#include <asm/msr.h>
++#include <asm/kgdb.h>
++
++#define PORT 0x3f8
++#ifdef CONFIG_KGDB_PORT
++#undef PORT
++#define PORT CONFIG_KGDB_PORT
++#endif
++#define IRQ 4
++#ifdef CONFIG_KGDB_IRQ
++#undef IRQ
++#define IRQ CONFIG_KGDB_IRQ
++#endif
++#define SB_CLOCK 1843200
++#define SB_BASE (SB_CLOCK/16)
++#define SB_BAUD9600 SB_BASE/9600
++#define SB_BAUD192  SB_BASE/19200
++#define SB_BAUD384  SB_BASE/38400
++#define SB_BAUD576  SB_BASE/57600
++#define SB_BAUD1152 SB_BASE/115200
++#ifdef CONFIG_KGDB_9600BAUD
++#define SB_BAUD SB_BAUD9600
++#endif
++#ifdef CONFIG_KGDB_19200BAUD
++#define SB_BAUD SB_BAUD192
++#endif
++#ifdef CONFIG_KGDB_38400BAUD
++#define SB_BAUD SB_BAUD384
++#endif
++#ifdef CONFIG_KGDB_57600BAUD
++#define SB_BAUD SB_BAUD576
++#endif
++#ifdef CONFIG_KGDB_115200BAUD
++#define SB_BAUD SB_BAUD1152
++#endif
++#ifndef SB_BAUD
++#define SB_BAUD SB_BAUD1152	/* Start with this if not given */
++#endif
++
++#ifndef CONFIG_X86_TSC
++#undef rdtsc
++#define rdtsc(a,b) if (a++ > 10000){a = 0; b++;}
++#undef rdtscll
++#define rdtscll(s) s++
++#endif
++
++#ifdef _raw_read_unlock		/* must use a name that is "define"ed, not an inline */
++#undef spin_lock
++#undef spin_trylock
++#undef spin_unlock
++#define spin_lock	 _raw_spin_lock
++#define spin_trylock	 _raw_spin_trylock
++#define spin_unlock	 _raw_spin_unlock
++#else
++#endif
++#undef spin_unlock_wait
++#define spin_unlock_wait(x)  do { cpu_relax(); barrier();} \
++                                     while(spin_is_locked(x))
++
++#define SB_IER 1
++#define SB_MCR UART_MCR_OUT2 | UART_MCR_DTR | UART_MCR_RTS
++
++#define FLAGS 0
++#define SB_STATE { \
++     magic: SSTATE_MAGIC, \
++     baud_base: SB_BASE,  \
++     port:      PORT,     \
++     irq:       IRQ,      \
++     flags:     FLAGS,    \
++     custom_divisor:SB_BAUD}
++#define SB_INFO  { \
++      magic: SERIAL_MAGIC, \
++      port:  PORT,0,FLAGS, \
++      state: &state,       \
++      tty:   (struct tty_struct *)&state, \
++      IER:   SB_IER,       \
++      MCR:   SB_MCR}
++extern void putDebugChar(int);
++/* RTAI support needs us to really stop/start interrupts */
++
++#define kgdb_sti() __asm__ __volatile__("sti": : :"memory")
++#define kgdb_cli() __asm__ __volatile__("cli": : :"memory")
++#define kgdb_local_save_flags(x) __asm__ __volatile__(\
++                                   "pushfl ; popl %0":"=g" (x): /* no input */)
++#define kgdb_local_irq_restore(x) __asm__ __volatile__(\
++                                   "pushl %0 ; popfl": \
++                                     /* no output */ :"g" (x):"memory", "cc")
++#define kgdb_local_irq_save(x) kgdb_local_save_flags(x); kgdb_cli()
++
++#ifdef CONFIG_SERIAL
++extern void shutdown_for_kgdb(struct async_struct *info);
++#endif
++#define INIT_KDEBUG putDebugChar("+");
++#endif				/* __KGDB_LOCAL */
+--- linux-2.6.0/include/asm-i386/kmap_types.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/asm-i386/kmap_types.h	2003-12-28 23:26:36.000000000 -0800
+@@ -3,30 +3,36 @@
+ 
+ #include <linux/config.h>
+ 
+-#ifdef CONFIG_DEBUG_HIGHMEM
+-# define D(n) __KM_FENCE_##n ,
+-#else
+-# define D(n)
+-#endif
+-
+ enum km_type {
+-D(0)	KM_BOUNCE_READ,
+-D(1)	KM_SKB_SUNRPC_DATA,
+-D(2)	KM_SKB_DATA_SOFTIRQ,
+-D(3)	KM_USER0,
+-D(4)	KM_USER1,
+-D(5)	KM_BIO_SRC_IRQ,
+-D(6)	KM_BIO_DST_IRQ,
+-D(7)	KM_PTE0,
+-D(8)	KM_PTE1,
+-D(9)	KM_PTE2,
+-D(10)	KM_IRQ0,
+-D(11)	KM_IRQ1,
+-D(12)	KM_SOFTIRQ0,
+-D(13)	KM_SOFTIRQ1,
+-D(14)	KM_TYPE_NR
+-};
+-
+-#undef D
++	/*
++	 * IMPORTANT: don't move these 3 entries, and only add entries in
++	 * pairs: the 4G/4G virtual stack must be 8K aligned on each cpu.
++	 */
++	KM_BOUNCE_READ,
++	KM_VSTACK1,
++	KM_VSTACK0,
+ 
++	KM_LDT_PAGE15,
++	KM_LDT_PAGE0 = KM_LDT_PAGE15 + 16-1,
++	KM_USER_COPY,
++	KM_VSTACK_HOLE,
++	KM_SKB_SUNRPC_DATA,
++	KM_SKB_DATA_SOFTIRQ,
++	KM_USER0,
++	KM_USER1,
++	KM_BIO_SRC_IRQ,
++	KM_BIO_DST_IRQ,
++	KM_PTE0,
++	KM_PTE1,
++	KM_PTE2,
++	KM_IRQ0,
++	KM_IRQ1,
++	KM_SOFTIRQ0,
++	KM_SOFTIRQ1,
++	/*
++	 * Add new entries in pairs:
++	 * the 4G/4G virtual stack must be 8K aligned on each cpu.
++	 */
++	KM_TYPE_NR
++};
+ #endif
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-i386/lockmeter.h	2003-12-28 23:26:35.000000000 -0800
+@@ -0,0 +1,123 @@
++/*
++ *  Copyright (C) 1999,2000 Silicon Graphics, Inc.
++ *
++ *  Written by John Hawkes (hawkes@sgi.com)
++ *  Based on klstat.h by Jack Steiner (steiner@sgi.com)
++ *
++ *  Modified by Ray Bryant (raybry@us.ibm.com)
++ *  Changes Copyright (C) 2000 IBM, Inc.
++ *  Added save of index in spinlock_t to improve efficiency
++ *  of "hold" time reporting for spinlocks.
++ *  Added support for hold time statistics for read and write
++ *  locks.
++ *  Moved machine dependent code here from include/lockmeter.h.
++ *
++ */
++
++#ifndef _I386_LOCKMETER_H
++#define _I386_LOCKMETER_H
++
++#include <asm/spinlock.h>
++#include <asm/rwlock.h>
++
++#include <linux/version.h>
++
++#ifdef __KERNEL__
++extern unsigned long cpu_khz;
++#define CPU_CYCLE_FREQUENCY	(cpu_khz * 1000)
++#else
++#define CPU_CYCLE_FREQUENCY	450000000
++#endif
++
++#define THIS_CPU_NUMBER		smp_processor_id()
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)
++#define local_irq_save(x) \
++    __asm__ __volatile__("pushfl ; popl %0 ; cli":"=g" (x): /* no input */ :"memory")
++
++#define local_irq_restore(x) \
++    __asm__ __volatile__("pushl %0 ; popfl": /* no output */ :"g" (x):"memory")
++#endif	/* Linux version 2.2.x */
++
++/*
++ * macros to cache and retrieve an index value inside of a spin lock
++ * these macros assume that there are less than 65536 simultaneous
++ * (read mode) holders of a rwlock.  Not normally a problem!!
++ * we also assume that the hash table has less than 65535 entries.
++ */
++/*
++ * instrumented spinlock structure -- never used to allocate storage
++ * only used in macros below to overlay a spinlock_t
++ */
++typedef struct inst_spinlock_s {
++	/* remember, Intel is little endian */
++	unsigned short lock;
++	unsigned short index;
++} inst_spinlock_t;
++#define PUT_INDEX(lock_ptr,indexv) ((inst_spinlock_t *)(lock_ptr))->index = indexv
++#define GET_INDEX(lock_ptr)        ((inst_spinlock_t *)(lock_ptr))->index
++
++/*
++ * macros to cache and retrieve an index value in a read/write lock
++ * as well as the cpu where a reader busy period started
++ * we use the 2nd word (the debug word) for this, so require the
++ * debug word to be present
++ */
++/*
++ * instrumented rwlock structure -- never used to allocate storage
++ * only used in macros below to overlay a rwlock_t
++ */
++typedef struct inst_rwlock_s {
++	volatile int lock;
++	unsigned short index;
++	unsigned short cpu;
++} inst_rwlock_t;
++#define PUT_RWINDEX(rwlock_ptr,indexv) ((inst_rwlock_t *)(rwlock_ptr))->index = indexv
++#define GET_RWINDEX(rwlock_ptr)        ((inst_rwlock_t *)(rwlock_ptr))->index
++#define PUT_RW_CPU(rwlock_ptr,cpuv)    ((inst_rwlock_t *)(rwlock_ptr))->cpu = cpuv
++#define GET_RW_CPU(rwlock_ptr)         ((inst_rwlock_t *)(rwlock_ptr))->cpu
++
++/*
++ * return the number of readers for a rwlock_t
++ */
++#define RWLOCK_READERS(rwlock_ptr)   rwlock_readers(rwlock_ptr)
++
++extern inline int rwlock_readers(rwlock_t *rwlock_ptr)
++{
++	int tmp = (int) rwlock_ptr->lock;
++	/* read and write lock attempts may cause the lock value to temporarily */
++	/* be negative.  Until it is >= 0 we know nothing (i. e. can't tell if  */
++	/* is -1 because it was write locked and somebody tried to read lock it */
++	/* or if it is -1 because it was read locked and somebody tried to write*/
++	/* lock it. ........................................................... */
++	do {
++		tmp = (int) rwlock_ptr->lock;
++	} while (tmp < 0);
++	if (tmp == 0) return(0);
++	else return(RW_LOCK_BIAS-tmp);
++}
++
++/*
++ * return true if rwlock is write locked
++ * (note that other lock attempts can cause the lock value to be negative)
++ */
++#define RWLOCK_IS_WRITE_LOCKED(rwlock_ptr) ((rwlock_ptr)->lock <= 0)
++#define IABS(x) ((x) > 0 ? (x) : -(x))
++#define RWLOCK_IS_READ_LOCKED(rwlock_ptr)  ((IABS((rwlock_ptr)->lock) % RW_LOCK_BIAS) != 0)
++
++/* this is a lot of typing just to get gcc to emit "rdtsc" */
++static inline long long get_cycles64 (void)
++{
++	union longlong_u {
++		long long intlong;
++		struct intint_s {
++			uint32_t eax;
++			uint32_t edx;
++		} intint;
++	} longlong;
++
++	rdtsc(longlong.intint.eax,longlong.intint.edx);
++	return longlong.intlong;
++}
++
++#endif /* _I386_LOCKMETER_H */
+--- linux-2.6.0/include/asm-i386/mach-bigsmp/mach_apic.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-i386/mach-bigsmp/mach_apic.h	2003-12-28 23:21:32.000000000 -0800
+@@ -173,4 +173,9 @@ static inline unsigned int cpu_mask_to_a
+ 	return apicid;
+ }
+ 
++static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb)
++{
++	return cpuid_apic >> index_msb;
++}
++
+ #endif /* __ASM_MACH_APIC_H */
+--- linux-2.6.0/include/asm-i386/mach-default/irq_vectors.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/asm-i386/mach-default/irq_vectors.h	2003-12-28 23:21:44.000000000 -0800
+@@ -76,6 +76,18 @@
+  * Since vectors 0x00-0x1f are used/reserved for the CPU,
+  * the usable vector space is 0x20-0xff (224 vectors)
+  */
++
++/*
++ * The maximum number of vectors supported by i386 processors
++ * is limited to 256. For processors other than i386, NR_VECTORS
++ * should be changed accordingly.
++ */
++#define NR_VECTORS 256
++
++#ifdef CONFIG_PCI_USE_VECTOR
++#define NR_IRQS FIRST_SYSTEM_VECTOR
++#define NR_IRQ_VECTORS NR_IRQS
++#else
+ #ifdef CONFIG_X86_IO_APIC
+ #define NR_IRQS 224
+ # if (224 >= 32 * NR_CPUS)
+@@ -87,6 +99,7 @@
+ #define NR_IRQS 16
+ #define NR_IRQ_VECTORS NR_IRQS
+ #endif
++#endif
+ 
+ #define FPU_IRQ			13
+ 
+--- linux-2.6.0/include/asm-i386/mach-default/mach_apic.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-i386/mach-default/mach_apic.h	2003-12-28 23:22:02.000000000 -0800
+@@ -5,12 +5,12 @@
+ 
+ #define APIC_DFR_VALUE	(APIC_DFR_FLAT)
+ 
+-static inline cpumask_t target_cpus(void)
++static inline cpumask_const_t target_cpus(void)
+ { 
+ #ifdef CONFIG_SMP
+-	return cpu_online_map;
++	return mk_cpumask_const(cpu_online_map);
+ #else
+-	return cpumask_of_cpu(0);
++	return mk_cpumask_const(cpumask_of_cpu(0));
+ #endif
+ } 
+ #define TARGET_CPUS (target_cpus())
+@@ -127,4 +127,9 @@ static inline void enable_apic_mode(void
+ {
+ }
+ 
++static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb)
++{
++	return cpuid_apic >> index_msb;
++}
++
+ #endif /* __ASM_MACH_APIC_H */
+--- linux-2.6.0/include/asm-i386/mach-es7000/mach_apic.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/include/asm-i386/mach-es7000/mach_apic.h	2003-12-28 23:22:45.000000000 -0800
+@@ -39,6 +39,7 @@ static inline cpumask_t target_cpus(void
+ #endif
+ 
+ #define APIC_BROADCAST_ID	(0xff)
++#define NO_IOAPIC_CHECK (0)
+ 
+ static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid)
+ { 
+@@ -191,4 +192,9 @@ static inline unsigned int cpu_mask_to_a
+ 	return apicid;
+ }
+ 
++static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb)
++{
++	return cpuid_apic >> index_msb;
++}
++
+ #endif /* __ASM_MACH_APIC_H */
+--- linux-2.6.0/include/asm-i386/mach-generic/mach_apic.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-i386/mach-generic/mach_apic.h	2003-12-28 23:21:32.000000000 -0800
+@@ -27,5 +27,6 @@
+ #define check_apicid_used (genapic->check_apicid_used)
+ #define cpu_mask_to_apicid (genapic->cpu_mask_to_apicid)
+ #define enable_apic_mode (genapic->enable_apic_mode)
++#define phys_pkg_id (genapic->phys_pkg_id)
+ 
+ #endif /* __ASM_MACH_APIC_H */
+--- linux-2.6.0/include/asm-i386/mach-numaq/mach_apic.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-i386/mach-numaq/mach_apic.h	2003-12-28 23:21:32.000000000 -0800
+@@ -141,4 +141,10 @@ static inline unsigned int cpu_mask_to_a
+ 	return (int) 0xF;
+ }
+ 
++/* No NUMA-Q box has a HT CPU, but it can't hurt to use the default code. */
++static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb)
++{
++	return cpuid_apic >> index_msb;
++}
++
+ #endif /* __ASM_MACH_APIC_H */
+--- linux-2.6.0/include/asm-i386/mach-summit/mach_apic.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-i386/mach-summit/mach_apic.h	2003-12-28 23:21:32.000000000 -0800
+@@ -173,4 +173,15 @@ static inline unsigned int cpu_mask_to_a
+ 	return apicid;
+ }
+ 
++/* cpuid returns the value latched in the HW at reset, not the APIC ID
++ * register's value.  For any box whose BIOS changes APIC IDs, like
++ * clustered APIC systems, we must use hard_smp_processor_id.
++ *
++ * See Intel's IA-32 SW Dev's Manual Vol2 under CPUID.
++ */
++static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb)
++{
++	return hard_smp_processor_id() >> index_msb;
++}
++
+ #endif /* __ASM_MACH_APIC_H */
+--- linux-2.6.0/include/asm-i386/mach-summit/mach_mpparse.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/include/asm-i386/mach-summit/mach_mpparse.h	2003-12-28 23:22:43.000000000 -0800
+@@ -5,11 +5,11 @@
+ 
+ extern int use_cyclone;
+ 
+-#ifdef CONFIG_NUMA
++#ifdef CONFIG_X86_SUMMIT_NUMA
+ extern void setup_summit(void);
+-#else /* !CONFIG_NUMA */
++#else
+ #define setup_summit()	{}
+-#endif /* CONFIG_NUMA */
++#endif
+ 
+ static inline void mpc_oem_bus_info(struct mpc_config_bus *m, char *name, 
+ 				struct mpc_config_translation *translation)
+@@ -110,9 +110,9 @@ typedef enum {
+ 	LookOutBWPEG  = 7,  /* LookOut WPEG                        */
+ } node_type;
+ 
+-static inline int is_WPEG(node_type type){
+-	return (type == CompatWPEG || type == AltWPEG ||
+-		type == LookOutAWPEG || type == LookOutBWPEG);
++static inline int is_WPEG(struct rio_detail *rio){
++	return (rio->type == CompatWPEG || rio->type == AltWPEG ||
++		rio->type == LookOutAWPEG || rio->type == LookOutBWPEG);
+ }
+ 
+ #endif /* __ASM_MACH_MPPARSE_H */
+--- linux-2.6.0/include/asm-i386/mach-visws/mach_apic.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-i386/mach-visws/mach_apic.h	2003-12-28 23:21:32.000000000 -0800
+@@ -88,4 +88,10 @@ static inline unsigned int cpu_mask_to_a
+ {
+ 	return cpus_coerce_const(cpumask);
+ }
++
++static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb)
++{
++	return cpuid_apic >> index_msb;
++}
++
+ #endif /* __ASM_MACH_APIC_H */
+--- linux-2.6.0/include/asm-i386/mmu_context.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/asm-i386/mmu_context.h	2003-12-28 23:26:36.000000000 -0800
+@@ -29,6 +29,10 @@ static inline void switch_mm(struct mm_s
+ {
+ 	int cpu = smp_processor_id();
+ 
++#ifdef CONFIG_X86_SWITCH_PAGETABLES
++	if (tsk->mm)
++		tsk->thread_info->user_pgd = (void *)__pa(tsk->mm->pgd);
++#endif
+ 	if (likely(prev != next)) {
+ 		/* stop flush ipis for the previous mm */
+ 		cpu_clear(cpu, prev->cpu_vm_mask);
+@@ -39,12 +43,14 @@ static inline void switch_mm(struct mm_s
+ 		cpu_set(cpu, next->cpu_vm_mask);
+ 
+ 		/* Re-load page tables */
++#if !defined(CONFIG_X86_SWITCH_PAGETABLES)
+ 		load_cr3(next->pgd);
++#endif
+ 
+ 		/*
+ 		 * load the LDT, if the LDT is different:
+ 		 */
+-		if (unlikely(prev->context.ldt != next->context.ldt))
++		if (unlikely(prev->context.size + next->context.size))
+ 			load_LDT_nolock(&next->context, cpu);
+ 	}
+ #ifdef CONFIG_SMP
+@@ -56,7 +62,9 @@ static inline void switch_mm(struct mm_s
+ 			/* We were in lazy tlb mode and leave_mm disabled 
+ 			 * tlb flush IPI delivery. We must reload %cr3.
+ 			 */
++#if !defined(CONFIG_X86_SWITCH_PAGETABLES)
+ 			load_cr3(next->pgd);
++#endif
+ 			load_LDT_nolock(&next->context, cpu);
+ 		}
+ 	}
+@@ -67,6 +75,6 @@ static inline void switch_mm(struct mm_s
+ 	asm("movl %0,%%fs ; movl %0,%%gs": :"r" (0))
+ 
+ #define activate_mm(prev, next) \
+-	switch_mm((prev),(next),NULL)
++	switch_mm((prev),(next),current)
+ 
+ #endif
+--- linux-2.6.0/include/asm-i386/mmu.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/asm-i386/mmu.h	2003-12-28 23:26:36.000000000 -0800
+@@ -8,10 +8,13 @@
+  *
+  * cpu_vm_mask is used to optimize ldt flushing.
+  */
++
++#define MAX_LDT_PAGES 16
++
+ typedef struct { 
+ 	int size;
+ 	struct semaphore sem;
+-	void *ldt;
++	struct page *ldt_pages[MAX_LDT_PAGES];
+ } mm_context_t;
+ 
+ #endif
+--- linux-2.6.0/include/asm-i386/mpspec.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/include/asm-i386/mpspec.h	2003-12-28 23:22:43.000000000 -0800
+@@ -27,10 +27,6 @@ extern unsigned long mp_lapic_addr;
+ extern int pic_mode;
+ extern int using_apic_timer;
+ 
+-#ifdef CONFIG_X86_SUMMIT
+-extern void setup_summit (void);
+-#endif
+-
+ #ifdef CONFIG_ACPI_BOOT
+ extern void mp_register_lapic (u8 id, u8 enabled);
+ extern void mp_register_lapic_address (u64 address);
+--- linux-2.6.0/include/asm-i386/page.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/asm-i386/page.h	2003-12-28 23:26:36.000000000 -0800
+@@ -1,6 +1,8 @@
+ #ifndef _I386_PAGE_H
+ #define _I386_PAGE_H
+ 
++#include <linux/config.h>
++
+ /* PAGE_SHIFT determines the page size */
+ #define PAGE_SHIFT	12
+ #define PAGE_SIZE	(1UL << PAGE_SHIFT)
+@@ -9,11 +11,10 @@
+ #define LARGE_PAGE_MASK (~(LARGE_PAGE_SIZE-1))
+ #define LARGE_PAGE_SIZE (1UL << PMD_SHIFT)
+ 
+-#ifdef __KERNEL__
+-#ifndef __ASSEMBLY__
+-
+ #include <linux/config.h>
+ 
++#ifdef __KERNEL__
++#ifndef __ASSEMBLY__
+ #ifdef CONFIG_X86_USE_3DNOW
+ 
+ #include <asm/mmx.h>
+@@ -88,8 +89,19 @@ typedef struct { unsigned long pgprot; }
+  *
+  * If you want more physical memory than this then see the CONFIG_HIGHMEM4G
+  * and CONFIG_HIGHMEM64G options in the kernel configuration.
++ *
++ * Note: on PAE the kernel must never go below 32 MB, we use the
++ * first 8 entries of the 2-level boot pgd for PAE magic.
+  */
+ 
++#ifdef CONFIG_X86_4G_VM_LAYOUT
++#define __PAGE_OFFSET		(0x02000000)
++#define TASK_SIZE		(0xff000000)
++#else
++#define __PAGE_OFFSET		(0xc0000000)
++#define TASK_SIZE		(0xc0000000)
++#endif
++
+ /*
+  * This much address space is reserved for vmalloc() and iomap()
+  * as well as fixmap mappings.
+@@ -114,16 +126,10 @@ static __inline__ int get_order(unsigned
+ 
+ #endif /* __ASSEMBLY__ */
+ 
+-#ifdef __ASSEMBLY__
+-#define __PAGE_OFFSET		(0xC0000000)
+-#else
+-#define __PAGE_OFFSET		(0xC0000000UL)
+-#endif
+-
+-
+ #define PAGE_OFFSET		((unsigned long)__PAGE_OFFSET)
+ #define VMALLOC_RESERVE		((unsigned long)__VMALLOC_RESERVE)
+-#define MAXMEM			(-__PAGE_OFFSET-__VMALLOC_RESERVE)
++#define __MAXMEM		(-__PAGE_OFFSET-__VMALLOC_RESERVE)
++#define MAXMEM			((unsigned long)(-PAGE_OFFSET-VMALLOC_RESERVE))
+ #define __pa(x)			((unsigned long)(x)-PAGE_OFFSET)
+ #define __va(x)			((void *)((unsigned long)(x)+PAGE_OFFSET))
+ #define pfn_to_kaddr(pfn)      __va((pfn) << PAGE_SHIFT)
+--- linux-2.6.0/include/asm-i386/pgtable.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/asm-i386/pgtable.h	2003-12-28 23:26:36.000000000 -0800
+@@ -32,16 +32,17 @@
+ #define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
+ extern unsigned long empty_zero_page[1024];
+ extern pgd_t swapper_pg_dir[1024];
+-extern kmem_cache_t *pgd_cache;
+-extern kmem_cache_t *pmd_cache;
++extern kmem_cache_t *pgd_cache, *pmd_cache, *kpmd_cache;
+ extern spinlock_t pgd_lock;
+ extern struct list_head pgd_list;
+ 
+ void pmd_ctor(void *, kmem_cache_t *, unsigned long);
++void kpmd_ctor(void *, kmem_cache_t *, unsigned long);
+ void pgd_ctor(void *, kmem_cache_t *, unsigned long);
+ void pgd_dtor(void *, kmem_cache_t *, unsigned long);
+ void pgtable_cache_init(void);
+ void paging_init(void);
++void setup_identity_mappings(pgd_t *pgd_base, unsigned long start, unsigned long end);
+ 
+ #endif /* !__ASSEMBLY__ */
+ 
+@@ -51,6 +52,11 @@ void paging_init(void);
+  * newer 3-level PAE-mode page tables.
+  */
+ #ifndef __ASSEMBLY__
++
++extern void set_system_gate(unsigned int n, void *addr);
++extern void init_entry_mappings(void);
++extern void entry_trampoline_setup(void);
++
+ #ifdef CONFIG_X86_PAE
+ # include <asm/pgtable-3level.h>
+ #else
+@@ -63,7 +69,12 @@ void paging_init(void);
+ #define PGDIR_SIZE	(1UL << PGDIR_SHIFT)
+ #define PGDIR_MASK	(~(PGDIR_SIZE-1))
+ 
+-#define USER_PTRS_PER_PGD	(TASK_SIZE/PGDIR_SIZE)
++#if defined(CONFIG_X86_PAE) && defined(CONFIG_X86_4G_VM_LAYOUT)
++# define USER_PTRS_PER_PGD	4
++#else
++# define USER_PTRS_PER_PGD	((TASK_SIZE/PGDIR_SIZE) + ((TASK_SIZE % PGDIR_SIZE) + PGDIR_SIZE-1)/PGDIR_SIZE)
++#endif
++
+ #define FIRST_USER_PGD_NR	0
+ 
+ #define USER_PGD_PTRS (PAGE_OFFSET >> PGDIR_SHIFT)
+@@ -233,6 +244,7 @@ static inline void ptep_mkdirty(pte_t *p
+ 
+ #define mk_pte(page, pgprot)	pfn_pte(page_to_pfn(page), (pgprot))
+ #define mk_pte_huge(entry) ((entry).pte_low |= _PAGE_PRESENT | _PAGE_PSE)
++#define mk_pte_phys(physpage, pgprot) pfn_pte((physpage) >> PAGE_SHIFT, pgprot)
+ 
+ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
+ {
+--- linux-2.6.0/include/asm-i386/processor.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/asm-i386/processor.h	2003-12-28 23:26:36.000000000 -0800
+@@ -291,11 +291,6 @@ extern unsigned int machine_submodel_id;
+ extern unsigned int BIOS_revision;
+ extern unsigned int mca_pentium_flag;
+ 
+-/*
+- * User space process size: 3GB (default).
+- */
+-#define TASK_SIZE	(PAGE_OFFSET)
+-
+ /* This decides where the kernel will search for a free chunk of vm
+  * space during mmap's.
+  */
+@@ -406,7 +401,9 @@ struct tss_struct {
+ struct thread_struct {
+ /* cached TLS descriptors. */
+ 	struct desc_struct tls_array[GDT_ENTRY_TLS_ENTRIES];
++	void *stack_page0, *stack_page1;
+ 	unsigned long	esp0;
++	unsigned long	sysenter_cs;
+ 	unsigned long	eip;
+ 	unsigned long	esp;
+ 	unsigned long	fs;
+@@ -428,6 +425,7 @@ struct thread_struct {
+ 
+ #define INIT_THREAD  {							\
+ 	.vm86_info = NULL,						\
++	.sysenter_cs = __KERNEL_CS,					\
+ 	.io_bitmap_ptr = NULL,						\
+ }
+ 
+@@ -447,21 +445,14 @@ struct thread_struct {
+ 	.io_bitmap	= { [ 0 ... IO_BITMAP_LONGS] = ~0 },		\
+ }
+ 
+-static inline void load_esp0(struct tss_struct *tss, unsigned long esp0)
++static inline void
++load_esp0(struct tss_struct *tss, struct thread_struct *thread)
+ {
+-	tss->esp0 = esp0;
++	tss->esp0 = thread->esp0;
+ 	/* This can only happen when SEP is enabled, no need to test "SEP"arately */
+-	if ((unlikely(tss->ss1 != __KERNEL_CS))) {
+-		tss->ss1 = __KERNEL_CS;
+-		wrmsr(MSR_IA32_SYSENTER_CS, __KERNEL_CS, 0);
+-	}
+-}
+-
+-static inline void disable_sysenter(struct tss_struct *tss)
+-{
+-	if (cpu_has_sep)  {
+-		tss->ss1 = 0;
+-		wrmsr(MSR_IA32_SYSENTER_CS, 0, 0);
++	if (unlikely(tss->ss1 != thread->sysenter_cs)) {
++		tss->ss1 = thread->sysenter_cs;
++		wrmsr(MSR_IA32_SYSENTER_CS, thread->sysenter_cs, 0);
+ 	}
+ }
+ 
+@@ -491,6 +482,23 @@ extern void prepare_to_copy(struct task_
+  */
+ extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
+ 
++#ifdef CONFIG_X86_HIGH_ENTRY
++#define virtual_esp0(tsk) \
++	((unsigned long)(tsk)->thread_info->virtual_stack + ((tsk)->thread.esp0 - (unsigned long)(tsk)->thread_info->real_stack))
++#else
++# define virtual_esp0(tsk) ((tsk)->thread.esp0)
++#endif
++
++#define load_virtual_esp0(tss, task)					\
++	do {								\
++		tss->esp0 = virtual_esp0(task);				\
++		if (likely(cpu_has_sep) && unlikely(tss->ss1 != task->thread.sysenter_cs)) {	\
++			tss->ss1 = task->thread.sysenter_cs;		\
++			wrmsr(MSR_IA32_SYSENTER_CS,			\
++				task->thread.sysenter_cs, 0);		\
++		}							\
++	} while (0)
++
+ extern unsigned long thread_saved_pc(struct task_struct *tsk);
+ void show_trace(struct task_struct *task, unsigned long *stack);
+ 
+--- linux-2.6.0/include/asm-i386/rwlock.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/asm-i386/rwlock.h	2003-12-28 23:21:35.000000000 -0800
+@@ -20,28 +20,52 @@
+ #define RW_LOCK_BIAS		 0x01000000
+ #define RW_LOCK_BIAS_STR	"0x01000000"
+ 
+-#define __build_read_lock_ptr(rw, helper)   \
+-	asm volatile(LOCK "subl $1,(%0)\n\t" \
+-		     "js 2f\n" \
+-		     "1:\n" \
+-		     LOCK_SECTION_START("") \
+-		     "2:\tcall " helper "\n\t" \
+-		     "jmp 1b\n" \
+-		     LOCK_SECTION_END \
+-		     ::"a" (rw) : "memory")
+-
+-#define __build_read_lock_const(rw, helper)   \
+-	asm volatile(LOCK "subl $1,%0\n\t" \
+-		     "js 2f\n" \
+-		     "1:\n" \
+-		     LOCK_SECTION_START("") \
+-		     "2:\tpushl %%eax\n\t" \
+-		     "leal %0,%%eax\n\t" \
+-		     "call " helper "\n\t" \
+-		     "popl %%eax\n\t" \
+-		     "jmp 1b\n" \
+-		     LOCK_SECTION_END \
+-		     :"=m" (*(volatile int *)rw) : : "memory")
++#ifdef CONFIG_SPINLINE
++
++	#define __build_read_lock_ptr(rw, helper)   \
++		asm volatile(LOCK "subl $1,(%0)\n\t" \
++			     "jns 1f\n\t" \
++			     "call " helper "\n\t" \
++			     "1:\t" \
++			     ::"a" (rw) : "memory")
++
++	#define __build_read_lock_const(rw, helper)   \
++		asm volatile(LOCK "subl $1,%0\n\t" \
++			     "jns 1f\n\t" \
++			     "pushl %%eax\n\t" \
++			     "leal %0,%%eax\n\t" \
++			     "call " helper "\n\t" \
++			     "popl %%eax\n\t" \
++			     "1:\t" \
++			     :"=m" (*(volatile int *)rw) : : "memory")
++
++#else /* !CONFIG_SPINLINE */
++
++	#define __build_read_lock_ptr(rw, helper)   \
++		asm volatile(LOCK "subl $1,(%0)\n\t" \
++			     "js 2f\n" \
++			     "1:\n" \
++			     LOCK_SECTION_START("") \
++			     "2:\tcall " helper "\n\t" \
++			     "jmp 1b\n" \
++			     LOCK_SECTION_END \
++			     ::"a" (rw) : "memory")
++
++	#define __build_read_lock_const(rw, helper)   \
++		asm volatile(LOCK "subl $1,%0\n\t" \
++			     "js 2f\n" \
++			     "1:\n" \
++			     LOCK_SECTION_START("") \
++			     "2:\tpushl %%eax\n\t" \
++			     "leal %0,%%eax\n\t" \
++			     "call " helper "\n\t" \
++			     "popl %%eax\n\t" \
++			     "jmp 1b\n" \
++			     LOCK_SECTION_END \
++			     :"=m" (*(volatile int *)rw) : : "memory")
++
++#endif /* CONFIG_SPINLINE */
++
+ 
+ #define __build_read_lock(rw, helper)	do { \
+ 						if (__builtin_constant_p(rw)) \
+@@ -50,28 +74,51 @@
+ 							__build_read_lock_ptr(rw, helper); \
+ 					} while (0)
+ 
+-#define __build_write_lock_ptr(rw, helper) \
+-	asm volatile(LOCK "subl $" RW_LOCK_BIAS_STR ",(%0)\n\t" \
+-		     "jnz 2f\n" \
+-		     "1:\n" \
+-		     LOCK_SECTION_START("") \
+-		     "2:\tcall " helper "\n\t" \
+-		     "jmp 1b\n" \
+-		     LOCK_SECTION_END \
+-		     ::"a" (rw) : "memory")
+-
+-#define __build_write_lock_const(rw, helper) \
+-	asm volatile(LOCK "subl $" RW_LOCK_BIAS_STR ",%0\n\t" \
+-		     "jnz 2f\n" \
+-		     "1:\n" \
+-		     LOCK_SECTION_START("") \
+-		     "2:\tpushl %%eax\n\t" \
+-		     "leal %0,%%eax\n\t" \
+-		     "call " helper "\n\t" \
+-		     "popl %%eax\n\t" \
+-		     "jmp 1b\n" \
+-		     LOCK_SECTION_END \
+-		     :"=m" (*(volatile int *)rw) : : "memory")
++#ifdef CONFIG_SPINLINE
++
++	#define __build_write_lock_ptr(rw, helper) \
++		asm volatile(LOCK "subl $" RW_LOCK_BIAS_STR ",(%0)\n\t" \
++			     "jz 1f\n\t" \
++			     "call " helper "\n\t" \
++			     "1:\n" \
++			     ::"a" (rw) : "memory")
++
++	#define __build_write_lock_const(rw, helper) \
++		asm volatile(LOCK "subl $" RW_LOCK_BIAS_STR ",%0\n\t" \
++			     "jz 1f\n\t" \
++			     "pushl %%eax\n\t" \
++			     "leal %0,%%eax\n\t" \
++			     "call " helper "\n\t" \
++			     "popl %%eax\n\t" \
++			     "1:\n" \
++			     :"=m" (*(volatile int *)rw) : : "memory")
++
++#else /* !CONFIG_SPINLINE */
++
++	#define __build_write_lock_ptr(rw, helper) \
++		asm volatile(LOCK "subl $" RW_LOCK_BIAS_STR ",(%0)\n\t" \
++			     "jnz 2f\n" \
++			     "1:\n" \
++			     LOCK_SECTION_START("") \
++			     "2:\tcall " helper "\n\t" \
++			     "jmp 1b\n" \
++			     LOCK_SECTION_END \
++			     ::"a" (rw) : "memory")
++
++	#define __build_write_lock_const(rw, helper) \
++		asm volatile(LOCK "subl $" RW_LOCK_BIAS_STR ",%0\n\t" \
++			     "jnz 2f\n" \
++			     "1:\n" \
++			     LOCK_SECTION_START("") \
++			     "2:\tpushl %%eax\n\t" \
++			     "leal %0,%%eax\n\t" \
++			     "call " helper "\n\t" \
++			     "popl %%eax\n\t" \
++			     "jmp 1b\n" \
++			     LOCK_SECTION_END \
++			     :"=m" (*(volatile int *)rw) : : "memory")
++
++#endif /* CONFIG_SPINLINE */
+ 
+ #define __build_write_lock(rw, helper)	do { \
+ 						if (__builtin_constant_p(rw)) \
+--- linux-2.6.0/include/asm-i386/setup.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/asm-i386/setup.h	2003-12-28 23:21:45.000000000 -0800
+@@ -29,6 +29,11 @@
+ #define IST_INFO   (*(struct ist_info *) (PARAM+0x60))
+ #define DRIVE_INFO (*(struct drive_info_struct *) (PARAM+0x80))
+ #define SYS_DESC_TABLE (*(struct sys_desc_table_struct*)(PARAM+0xa0))
++#define EFI_SYSTAB ((efi_system_table_t *) *((unsigned long *)(PARAM+0x1c4)))
++#define EFI_MEMDESC_SIZE (*((unsigned long *) (PARAM+0x1c8)))
++#define EFI_MEMDESC_VERSION (*((unsigned long *) (PARAM+0x1cc)))
++#define EFI_MEMMAP ((efi_memory_desc_t *) *((unsigned long *)(PARAM+0x1d0)))
++#define EFI_MEMMAP_SIZE (*((unsigned long *) (PARAM+0x1d4)))
+ #define MOUNT_ROOT_RDONLY (*(unsigned short *) (PARAM+0x1F2))
+ #define RAMDISK_FLAGS (*(unsigned short *) (PARAM+0x1F8))
+ #define VIDEO_MODE (*(unsigned short *) (PARAM+0x1FA))
+--- linux-2.6.0/include/asm-i386/spinlock.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/asm-i386/spinlock.h	2003-12-28 23:26:34.000000000 -0800
+@@ -43,18 +43,35 @@ typedef struct {
+ #define spin_is_locked(x)	(*(volatile signed char *)(&(x)->lock) <= 0)
+ #define spin_unlock_wait(x)	do { barrier(); } while(spin_is_locked(x))
+ 
+-#define spin_lock_string \
+-	"\n1:\t" \
+-	"lock ; decb %0\n\t" \
+-	"js 2f\n" \
+-	LOCK_SECTION_START("") \
+-	"2:\t" \
+-	"rep;nop\n\t" \
+-	"cmpb $0,%0\n\t" \
+-	"jle 2b\n\t" \
+-	"jmp 1b\n" \
+-	LOCK_SECTION_END
++#ifdef CONFIG_SPINLINE
+ 
++	#define spin_lock_string \
++		"\n1:\t" \
++		"lock ; decb %0\n\t" \
++		"js 2f\n" \
++		"jmp 3f\n" \
++		"2:\t" \
++		"rep;nop\n\t" \
++		"cmpb $0,%0\n\t" \
++		"jle 2b\n\t" \
++		"jmp 1b\n" \
++		"3:\t"
++
++#else /* !CONFIG_SPINLINE */
++
++	#define spin_lock_string \
++		"\n1:\t" \
++		"lock ; decb %0\n\t" \
++		"js 2f\n" \
++		LOCK_SECTION_START("") \
++		"2:\t" \
++		"rep;nop\n\t" \
++		"cmpb $0,%0\n\t" \
++		"jle 2b\n\t" \
++		"jmp 1b\n" \
++		LOCK_SECTION_END
++
++#endif /* CONFIG_SPINLINE */
+ /*
+  * This works. Despite all the confusion.
+  * (except on PPro SMP or if we are using OOSTORE)
+@@ -138,6 +155,11 @@ here:
+  */
+ typedef struct {
+ 	volatile unsigned int lock;
++#ifdef CONFIG_LOCKMETER
++	/* required for LOCKMETER since all bits in lock are used */
++	/* and we need this storage for CPU and lock INDEX        */
++	unsigned lockmeter_magic;
++#endif
+ #ifdef CONFIG_DEBUG_SPINLOCK
+ 	unsigned magic;
+ #endif
+@@ -145,11 +167,19 @@ typedef struct {
+ 
+ #define RWLOCK_MAGIC	0xdeaf1eed
+ 
++#ifdef CONFIG_LOCKMETER
++#ifdef CONFIG_DEBUG_SPINLOCK
++#define RWLOCK_MAGIC_INIT	, 0, RWLOCK_MAGIC
++#else
++#define RWLOCK_MAGIC_INIT	, 0
++#endif
++#else /* !CONFIG_LOCKMETER */
+ #ifdef CONFIG_DEBUG_SPINLOCK
+ #define RWLOCK_MAGIC_INIT	, RWLOCK_MAGIC
+ #else
+ #define RWLOCK_MAGIC_INIT	/* */
+ #endif
++#endif /* !CONFIG_LOCKMETER */
+ 
+ #define RW_LOCK_UNLOCKED (rwlock_t) { RW_LOCK_BIAS RWLOCK_MAGIC_INIT }
+ 
+@@ -196,4 +226,60 @@ static inline int _raw_write_trylock(rwl
+ 	return 0;
+ }
+ 
++#ifdef CONFIG_LOCKMETER
++static inline int _raw_read_trylock(rwlock_t *lock)
++{
++/* FIXME -- replace with assembler */
++	atomic_t *count = (atomic_t *)lock;
++	atomic_dec(count);
++	if (count->counter > 0)
++		return 1;
++	atomic_inc(count);
++	return 0;
++}
++#endif
++
++#if defined(CONFIG_LOCKMETER) && defined(CONFIG_HAVE_DEC_LOCK)
++extern void _metered_spin_lock  (spinlock_t *lock);
++extern void _metered_spin_unlock(spinlock_t *lock);
++
++/*
++ *  Matches what is in arch/i386/lib/dec_and_lock.c, except this one is
++ *  "static inline" so that the spin_lock(), if actually invoked, is charged
++ *  against the real caller, not against the catch-all atomic_dec_and_lock
++ */
++static inline int atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock)
++{
++	int counter;
++	int newcount;
++
++repeat:
++	counter = atomic_read(atomic);
++	newcount = counter-1;
++
++	if (!newcount)
++		goto slow_path;
++
++	asm volatile("lock; cmpxchgl %1,%2"
++		:"=a" (newcount)
++		:"r" (newcount), "m" (atomic->counter), "0" (counter));
++
++	/* If the above failed, "eax" will have changed */
++	if (newcount != counter)
++		goto repeat;
++	return 0;
++
++slow_path:
++	preempt_disable();
++	_metered_spin_lock(lock);
++	if (atomic_dec_and_test(atomic))
++		return 1;
++	_metered_spin_unlock(lock);
++	preempt_enable();
++	return 0;
++}
++
++#define ATOMIC_DEC_AND_LOCK
++#endif
++
+ #endif /* __ASM_SPINLOCK_H */
+--- linux-2.6.0/include/asm-i386/string.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/asm-i386/string.h	2003-12-28 23:26:36.000000000 -0800
+@@ -56,6 +56,29 @@ __asm__ __volatile__(
+ return dest;
+ }
+ 
++/*
++ * This is a more generic variant of strncpy_count() suitable for
++ * implementing string-access routines with all sorts of return
++ * code semantics. It's used by mm/usercopy.c.
++ */
++static inline size_t strncpy_count(char * dest,const char *src,size_t count)
++{
++	__asm__ __volatile__(
++
++	"1:\tdecl %0\n\t"
++	"js 2f\n\t"
++	"lodsb\n\t"
++	"stosb\n\t"
++	"testb %%al,%%al\n\t"
++	"jne 1b\n\t"
++	"2:"
++	"incl %0"
++	: "=c" (count)
++	:"S" (src),"D" (dest),"0" (count) : "memory");
++
++	return count;
++}
++
+ #define __HAVE_ARCH_STRCAT
+ static inline char * strcat(char * dest,const char * src)
+ {
+@@ -291,7 +314,7 @@ extern void __struct_cpy_bug (void);
+ #define struct_cpy(x,y) 			\
+ ({						\
+ 	if (sizeof(*(x)) != sizeof(*(y))) 	\
+-		__struct_cpy_bug;		\
++		__struct_cpy_bug();		\
+ 	memcpy(x, y, sizeof(*(x)));		\
+ })
+ 
+@@ -299,14 +322,9 @@ extern void __struct_cpy_bug (void);
+ static inline void * memmove(void * dest,const void * src, size_t n)
+ {
+ int d0, d1, d2;
+-if (dest<src)
+-__asm__ __volatile__(
+-	"rep\n\t"
+-	"movsb"
+-	: "=&c" (d0), "=&S" (d1), "=&D" (d2)
+-	:"0" (n),"1" (src),"2" (dest)
+-	: "memory");
+-else
++if (dest<src) {
++	memcpy(dest,src,n);
++} else
+ __asm__ __volatile__(
+ 	"std\n\t"
+ 	"rep\n\t"
+--- linux-2.6.0/include/asm-i386/system.h	2003-06-14 12:17:56.000000000 -0700
++++ 25/include/asm-i386/system.h	2003-12-28 23:21:33.000000000 -0800
+@@ -470,6 +470,7 @@ void enable_hlt(void);
+ 
+ extern unsigned long dmi_broken;
+ extern int is_sony_vaio_laptop;
++extern int es7000_plat;
+ 
+ #define BROKEN_ACPI_Sx		0x0001
+ #define BROKEN_INIT_AFTER_S1	0x0002
+--- linux-2.6.0/include/asm-i386/thread_info.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/asm-i386/thread_info.h	2003-12-28 23:26:36.000000000 -0800
+@@ -33,23 +33,12 @@ struct thread_info {
+ 					 	   0-0xBFFFFFFF for user-thead
+ 						   0-0xFFFFFFFF for kernel-thread
+ 						*/
+-	struct restart_block    restart_block;
++	void *real_stack, *virtual_stack, *user_pgd;
+ 
++	struct restart_block    restart_block;
+ 	__u8			supervisor_stack[0];
+ };
+ 
+-#else /* !__ASSEMBLY__ */
+-
+-/* offsets into the thread_info struct for assembly code access */
+-#define TI_TASK		0x00000000
+-#define TI_EXEC_DOMAIN	0x00000004
+-#define TI_FLAGS	0x00000008
+-#define TI_STATUS	0x0000000C
+-#define TI_CPU		0x00000010
+-#define TI_PRE_COUNT	0x00000014
+-#define TI_ADDR_LIMIT	0x00000018
+-#define TI_RESTART_BLOCK 0x000001C
+-
+ #endif
+ 
+ #define PREEMPT_ACTIVE		0x4000000
+@@ -61,7 +50,7 @@ struct thread_info {
+  */
+ #ifndef __ASSEMBLY__
+ 
+-#define INIT_THREAD_INFO(tsk)			\
++#define INIT_THREAD_INFO(tsk, thread_info)	\
+ {						\
+ 	.task		= &tsk,			\
+ 	.exec_domain	= &default_exec_domain,	\
+@@ -72,6 +61,7 @@ struct thread_info {
+ 	.restart_block = {			\
+ 		.fn = do_no_restart_syscall,	\
+ 	},					\
++	.real_stack	= &thread_info,		\
+ }
+ 
+ #define init_thread_info	(init_thread_union.thread_info)
+@@ -113,6 +103,7 @@ static inline struct thread_info *curren
+ #define TIF_NEED_RESCHED	3	/* rescheduling necessary */
+ #define TIF_SINGLESTEP		4	/* restore singlestep on return to user mode */
+ #define TIF_IRET		5	/* return with iret */
++#define TIF_DB7			6	/* has debug registers */
+ #define TIF_POLLING_NRFLAG	16	/* true if poll_idle() is polling TIF_NEED_RESCHED */
+ 
+ #define _TIF_SYSCALL_TRACE	(1<<TIF_SYSCALL_TRACE)
+@@ -121,6 +112,7 @@ static inline struct thread_info *curren
+ #define _TIF_NEED_RESCHED	(1<<TIF_NEED_RESCHED)
+ #define _TIF_SINGLESTEP		(1<<TIF_SINGLESTEP)
+ #define _TIF_IRET		(1<<TIF_IRET)
++#define _TIF_DB7		(1<<TIF_DB7)
+ #define _TIF_POLLING_NRFLAG	(1<<TIF_POLLING_NRFLAG)
+ 
+ #define _TIF_WORK_MASK		0x0000FFFE	/* work to do on interrupt/exception return */
+--- linux-2.6.0/include/asm-i386/timer.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/asm-i386/timer.h	2003-12-28 23:21:57.000000000 -0800
+@@ -11,6 +11,7 @@
+  *	last timer intruupt.
+  */
+ struct timer_opts{
++	char* name;
+ 	int (*init)(char *override);
+ 	void (*mark_offset)(void);
+ 	unsigned long (*get_offset)(void);
+@@ -39,9 +40,13 @@ extern struct timer_opts timer_cyclone;
+ #endif
+ 
+ extern unsigned long calibrate_tsc(void);
++extern void init_cpu_khz(void);
+ #ifdef CONFIG_HPET_TIMER
+ extern struct timer_opts timer_hpet;
+ extern unsigned long calibrate_tsc_hpet(unsigned long *tsc_hpet_quotient_ptr);
+ #endif
+ 
++#ifdef CONFIG_X86_PM_TIMER
++extern struct timer_opts timer_pmtmr;
++#endif
+ #endif
+--- linux-2.6.0/include/asm-i386/tlbflush.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/asm-i386/tlbflush.h	2003-12-28 23:26:36.000000000 -0800
+@@ -85,22 +85,28 @@ extern unsigned long pgkern_mask;
+ 
+ static inline void flush_tlb_mm(struct mm_struct *mm)
+ {
++#ifndef CONFIG_X86_SWITCH_PAGETABLES
+ 	if (mm == current->active_mm)
+ 		__flush_tlb();
++#endif
+ }
+ 
+ static inline void flush_tlb_page(struct vm_area_struct *vma,
+ 	unsigned long addr)
+ {
++#ifndef CONFIG_X86_SWITCH_PAGETABLES
+ 	if (vma->vm_mm == current->active_mm)
+ 		__flush_tlb_one(addr);
++#endif
+ }
+ 
+ static inline void flush_tlb_range(struct vm_area_struct *vma,
+ 	unsigned long start, unsigned long end)
+ {
++#ifndef CONFIG_X86_SWITCH_PAGETABLES
+ 	if (vma->vm_mm == current->active_mm)
+ 		__flush_tlb();
++#endif
+ }
+ 
+ #else
+@@ -111,11 +117,10 @@ static inline void flush_tlb_range(struc
+ 	__flush_tlb()
+ 
+ extern void flush_tlb_all(void);
+-extern void flush_tlb_current_task(void);
+ extern void flush_tlb_mm(struct mm_struct *);
+ extern void flush_tlb_page(struct vm_area_struct *, unsigned long);
+ 
+-#define flush_tlb()	flush_tlb_current_task()
++#define flush_tlb()	flush_tlb_all()
+ 
+ static inline void flush_tlb_range(struct vm_area_struct * vma, unsigned long start, unsigned long end)
+ {
+--- linux-2.6.0/include/asm-i386/uaccess.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/asm-i386/uaccess.h	2003-12-28 23:26:36.000000000 -0800
+@@ -26,7 +26,7 @@
+ 
+ 
+ #define KERNEL_DS	MAKE_MM_SEG(0xFFFFFFFFUL)
+-#define USER_DS		MAKE_MM_SEG(PAGE_OFFSET)
++#define USER_DS		MAKE_MM_SEG(TASK_SIZE)
+ 
+ #define get_ds()	(KERNEL_DS)
+ #define get_fs()	(current_thread_info()->addr_limit)
+@@ -149,6 +149,45 @@ extern void __get_user_4(void);
+ 		:"=a" (ret),"=d" (x) \
+ 		:"0" (ptr))
+ 
++extern int get_user_size(unsigned int size, void *val, const void *ptr);
++extern int put_user_size(unsigned int size, const void *val, void *ptr);
++extern int zero_user_size(unsigned int size, void *ptr);
++extern int copy_str_fromuser_size(unsigned int size, void *val, const void *ptr);
++extern int strlen_fromuser_size(unsigned int size, const void *ptr);
++
++
++# define indirect_get_user(x,ptr)					\
++({	int __ret_gu,__val_gu;						\
++	__typeof__(ptr) __ptr_gu = (ptr);				\
++	__ret_gu = get_user_size(sizeof(*__ptr_gu), &__val_gu,__ptr_gu) ? -EFAULT : 0;\
++	(x) = (__typeof__(*__ptr_gu))__val_gu;				\
++	__ret_gu;							\
++})
++#define indirect_put_user(x,ptr)					\
++({									\
++	__typeof__(*(ptr)) *__ptr_pu = (ptr), __x_pu = (x);		\
++	put_user_size(sizeof(*__ptr_pu), &__x_pu, __ptr_pu) ? -EFAULT : 0; \
++})
++#define __indirect_put_user indirect_put_user
++#define __indirect_get_user indirect_get_user
++
++#define indirect_copy_from_user(to,from,n) get_user_size(n,to,from)
++#define indirect_copy_to_user(to,from,n) put_user_size(n,from,to)
++
++#define __indirect_copy_from_user indirect_copy_from_user
++#define __indirect_copy_to_user indirect_copy_to_user
++
++#define indirect_strncpy_from_user(dst, src, count) \
++		copy_str_fromuser_size(count, dst, src)
++
++extern int strlen_fromuser_size(unsigned int size, const void *ptr);
++#define indirect_strnlen_user(str, n) strlen_fromuser_size(n, str)
++#define indirect_strlen_user(str) indirect_strnlen_user(str, ~0UL >> 1)
++
++extern int zero_user_size(unsigned int size, void *ptr);
++
++#define indirect_clear_user(mem, len) zero_user_size(len, mem)
++#define __indirect_clear_user clear_user
+ 
+ /* Careful: we have to cast the result to the type of the pointer for sign reasons */
+ /**
+@@ -168,7 +207,7 @@ extern void __get_user_4(void);
+  * Returns zero on success, or -EFAULT on error.
+  * On error, the variable @x is set to zero.
+  */
+-#define get_user(x,ptr)							\
++#define direct_get_user(x,ptr)						\
+ ({	int __ret_gu,__val_gu;						\
+ 	switch(sizeof (*(ptr))) {					\
+ 	case 1:  __get_user_x(1,__ret_gu,__val_gu,ptr); break;		\
+@@ -198,7 +237,7 @@ extern void __put_user_bad(void);
+  *
+  * Returns zero on success, or -EFAULT on error.
+  */
+-#define put_user(x,ptr)							\
++#define direct_put_user(x,ptr)						\
+   __put_user_check((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr)))
+ 
+ 
+@@ -222,7 +261,7 @@ extern void __put_user_bad(void);
+  * Returns zero on success, or -EFAULT on error.
+  * On error, the variable @x is set to zero.
+  */
+-#define __get_user(x,ptr) \
++#define __direct_get_user(x,ptr) \
+   __get_user_nocheck((x),(ptr),sizeof(*(ptr)))
+ 
+ 
+@@ -245,7 +284,7 @@ extern void __put_user_bad(void);
+  *
+  * Returns zero on success, or -EFAULT on error.
+  */
+-#define __put_user(x,ptr) \
++#define __direct_put_user(x,ptr) \
+   __put_user_nocheck((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr)))
+ 
+ #define __put_user_nocheck(x,ptr,size)				\
+@@ -396,7 +435,7 @@ unsigned long __copy_from_user_ll(void *
+  * On success, this will be zero.
+  */
+ static inline unsigned long
+-__copy_to_user(void __user *to, const void *from, unsigned long n)
++__direct_copy_to_user(void __user *to, const void *from, unsigned long n)
+ {
+ 	if (__builtin_constant_p(n)) {
+ 		unsigned long ret;
+@@ -434,7 +473,7 @@ __copy_to_user(void __user *to, const vo
+  * data to the requested size using zero bytes.
+  */
+ static inline unsigned long
+-__copy_from_user(void *to, const void __user *from, unsigned long n)
++__direct_copy_from_user(void *to, const void __user *from, unsigned long n)
+ {
+ 	if (__builtin_constant_p(n)) {
+ 		unsigned long ret;
+@@ -468,11 +507,11 @@ __copy_from_user(void *to, const void __
+  * On success, this will be zero.
+  */
+ static inline unsigned long
+-copy_to_user(void __user *to, const void *from, unsigned long n)
++direct_copy_to_user(void __user *to, const void *from, unsigned long n)
+ {
+ 	might_sleep();
+ 	if (access_ok(VERIFY_WRITE, to, n))
+-		n = __copy_to_user(to, from, n);
++		n = __direct_copy_to_user(to, from, n);
+ 	return n;
+ }
+ 
+@@ -493,11 +532,11 @@ copy_to_user(void __user *to, const void
+  * data to the requested size using zero bytes.
+  */
+ static inline unsigned long
+-copy_from_user(void *to, const void __user *from, unsigned long n)
++direct_copy_from_user(void *to, const void __user *from, unsigned long n)
+ {
+ 	might_sleep();
+ 	if (access_ok(VERIFY_READ, from, n))
+-		n = __copy_from_user(to, from, n);
++		n = __direct_copy_from_user(to, from, n);
+ 	else
+ 		memset(to, 0, n);
+ 	return n;
+@@ -520,10 +559,68 @@ long __strncpy_from_user(char *dst, cons
+  * If there is a limit on the length of a valid string, you may wish to
+  * consider using strnlen_user() instead.
+  */
+-#define strlen_user(str) strnlen_user(str, ~0UL >> 1)
+ 
+-long strnlen_user(const char __user *str, long n);
+-unsigned long clear_user(void __user *mem, unsigned long len);
+-unsigned long __clear_user(void __user *mem, unsigned long len);
++long direct_strncpy_from_user(char *dst, const char *src, long count);
++long __direct_strncpy_from_user(char *dst, const char *src, long count);
++#define direct_strlen_user(str) direct_strnlen_user(str, ~0UL >> 1)
++long direct_strnlen_user(const char *str, long n);
++unsigned long direct_clear_user(void *mem, unsigned long len);
++unsigned long __direct_clear_user(void *mem, unsigned long len);
++
++extern int indirect_uaccess;
++
++#ifdef CONFIG_X86_UACCESS_INDIRECT
++
++/*
++ * Return code and zeroing semantics:
++
++ __clear_user          0                      <-> bytes not done
++ clear_user            0                      <-> bytes not done
++ __copy_to_user        0                      <-> bytes not done
++ copy_to_user          0                      <-> bytes not done
++ __copy_from_user      0                      <-> bytes not done, zero rest
++ copy_from_user        0                      <-> bytes not done, zero rest
++ __get_user            0                      <-> -EFAULT
++ get_user              0                      <-> -EFAULT
++ __put_user            0                      <-> -EFAULT
++ put_user              0                      <-> -EFAULT
++ strlen_user           strlen + 1             <-> 0
++ strnlen_user          strlen + 1 (or n+1)    <-> 0
++ strncpy_from_user     strlen (or n)          <-> -EFAULT
++
++ */
++
++#define __clear_user(mem,len) __indirect_clear_user(mem,len)
++#define clear_user(mem,len) indirect_clear_user(mem,len)
++#define __copy_to_user(to,from,n) __indirect_copy_to_user(to,from,n)
++#define copy_to_user(to,from,n) indirect_copy_to_user(to,from,n)
++#define __copy_from_user(to,from,n) __indirect_copy_from_user(to,from,n)
++#define copy_from_user(to,from,n) indirect_copy_from_user(to,from,n)
++#define __get_user(val,ptr) __indirect_get_user(val,ptr)
++#define get_user(val,ptr) indirect_get_user(val,ptr)
++#define __put_user(val,ptr) __indirect_put_user(val,ptr)
++#define put_user(val,ptr) indirect_put_user(val,ptr)
++#define strlen_user(str) indirect_strlen_user(str)
++#define strnlen_user(src,count) indirect_strnlen_user(src,count)
++#define strncpy_from_user(dst,src,count) \
++			indirect_strncpy_from_user(dst,src,count)
++
++#else
++
++#define __clear_user __direct_clear_user
++#define clear_user direct_clear_user
++#define __copy_to_user __direct_copy_to_user
++#define copy_to_user direct_copy_to_user
++#define __copy_from_user __direct_copy_from_user
++#define copy_from_user direct_copy_from_user
++#define __get_user __direct_get_user
++#define get_user direct_get_user
++#define __put_user __direct_put_user
++#define put_user direct_put_user
++#define strlen_user direct_strlen_user
++#define strnlen_user direct_strnlen_user
++#define strncpy_from_user direct_strncpy_from_user
++
++#endif /* CONFIG_X86_UACCESS_INDIRECT */
+ 
+ #endif /* __i386_UACCESS_H */
+--- linux-2.6.0/include/asm-ia64/byteorder.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/include/asm-ia64/byteorder.h	2003-12-28 23:22:55.000000000 -0800
+@@ -8,8 +8,9 @@
+ 
+ #include <asm/types.h>
+ #include <asm/intrinsics.h>
++#include <linux/compiler.h>
+ 
+-static __inline__ __const__ __u64
++static __inline__ __attribute_const__ __u64
+ __ia64_swab64 (__u64 x)
+ {
+ 	__u64 result;
+@@ -18,13 +19,13 @@ __ia64_swab64 (__u64 x)
+ 	return result;
+ }
+ 
+-static __inline__ __const__ __u32
++static __inline__ __attribute_const__ __u32
+ __ia64_swab32 (__u32 x)
+ {
+ 	return __ia64_swab64(x) >> 32;
+ }
+ 
+-static __inline__ __const__ __u16
++static __inline__ __attribute_const__ __u16
+ __ia64_swab16(__u16 x)
+ {
+ 	return __ia64_swab64(x) >> 48;
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-ia64/cpumask.h	2003-12-28 23:22:10.000000000 -0800
+@@ -0,0 +1,6 @@
++#ifndef _ASM_IA64_CPUMASK_H
++#define _ASM_IA64_CPUMASK_H
++
++#include <asm-generic/cpumask.h>
++
++#endif /* _ASM_IA64_CPUMASK_H */
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-ia64/lockmeter.h	2003-12-28 23:26:33.000000000 -0800
+@@ -0,0 +1,72 @@
++/*
++ *  Copyright (C) 1999,2000 Silicon Graphics, Inc.
++ *
++ *  Written by John Hawkes (hawkes@sgi.com)
++ *  Based on klstat.h by Jack Steiner (steiner@sgi.com)
++ */
++
++#ifndef _IA64_LOCKMETER_H
++#define _IA64_LOCKMETER_H
++
++#ifdef local_cpu_data
++#define CPU_CYCLE_FREQUENCY	local_cpu_data->itc_freq
++#else
++#define CPU_CYCLE_FREQUENCY	my_cpu_data.itc_freq
++#endif
++#define get_cycles64()		get_cycles()
++
++#define THIS_CPU_NUMBER		smp_processor_id()
++
++/*
++ * macros to cache and retrieve an index value inside of a lock
++ * these macros assume that there are less than 65536 simultaneous
++ * (read mode) holders of a rwlock.
++ * we also assume that the hash table has less than 32767 entries.
++ */
++/*
++ * instrumented spinlock structure -- never used to allocate storage
++ * only used in macros below to overlay a spinlock_t
++ */
++typedef struct inst_spinlock_s {
++	/* remember, Intel is little endian */
++	volatile unsigned short lock;
++	volatile unsigned short index;
++} inst_spinlock_t;
++#define PUT_INDEX(lock_ptr,indexv) ((inst_spinlock_t *)(lock_ptr))->index = indexv
++#define GET_INDEX(lock_ptr)        ((inst_spinlock_t *)(lock_ptr))->index
++
++/*
++ * macros to cache and retrieve an index value in a read/write lock
++ * as well as the cpu where a reader busy period started
++ * we use the 2nd word (the debug word) for this, so require the
++ * debug word to be present
++ */
++/*
++ * instrumented rwlock structure -- never used to allocate storage
++ * only used in macros below to overlay a rwlock_t
++ */
++typedef struct inst_rwlock_s {
++	volatile int read_counter:31;
++	volatile int write_lock:1;
++	volatile unsigned short index;
++	volatile unsigned short cpu;
++} inst_rwlock_t;
++#define PUT_RWINDEX(rwlock_ptr,indexv) ((inst_rwlock_t *)(rwlock_ptr))->index = indexv
++#define GET_RWINDEX(rwlock_ptr)        ((inst_rwlock_t *)(rwlock_ptr))->index
++#define PUT_RW_CPU(rwlock_ptr,cpuv)    ((inst_rwlock_t *)(rwlock_ptr))->cpu = cpuv
++#define GET_RW_CPU(rwlock_ptr)         ((inst_rwlock_t *)(rwlock_ptr))->cpu
++
++/*
++ * return the number of readers for a rwlock_t
++ */
++#define RWLOCK_READERS(rwlock_ptr)	((rwlock_ptr)->read_counter)
++
++/*
++ * return true if rwlock is write locked
++ * (note that other lock attempts can cause the lock value to be negative)
++ */
++#define RWLOCK_IS_WRITE_LOCKED(rwlock_ptr) ((rwlock_ptr)->write_lock)
++#define RWLOCK_IS_READ_LOCKED(rwlock_ptr)  ((rwlock_ptr)->read_counter)
++
++#endif /* _IA64_LOCKMETER_H */
++
+--- linux-2.6.0/include/asm-ia64/spinlock.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/asm-ia64/spinlock.h	2003-12-28 23:26:33.000000000 -0800
+@@ -110,8 +110,18 @@ do {											\
+ typedef struct {
+ 	volatile int read_counter	: 31;
+ 	volatile int write_lock		:  1;
++#ifdef CONFIG_LOCKMETER
++	/* required for LOCKMETER since all bits in lock are used */
++	/* and we need this storage for CPU and lock INDEX        */
++	unsigned lockmeter_magic;
++#endif
+ } rwlock_t;
++
++#ifdef CONFIG_LOCKMETER
++#define RW_LOCK_UNLOCKED (rwlock_t) { 0, 0, 0 }
++#else
+ #define RW_LOCK_UNLOCKED (rwlock_t) { 0, 0 }
++#endif
+ 
+ #define rwlock_init(x)		do { *(x) = RW_LOCK_UNLOCKED; } while(0)
+ #define rwlock_is_locked(x)	(*(volatile int *) (x) != 0)
+@@ -127,6 +137,48 @@ do {											\
+ 	}										\
+ } while (0)
+ 
++#ifdef CONFIG_LOCKMETER
++/*
++ * HACK: This works, but still have a timing window that affects performance:
++ * we see that no one owns the Write lock, then someone * else grabs for Write
++ * lock before we do a read_lock().
++ * This means that on rare occasions our read_lock() will stall and spin-wait
++ * until we acquire for Read, instead of simply returning a trylock failure.
++ */
++static inline int _raw_read_trylock(rwlock_t *rw)
++{
++	if (rw->write_lock) {
++		return 0;
++	} else {
++		_raw_read_lock(rw);
++		return 1;
++	}
++}
++
++static inline int _raw_write_trylock(rwlock_t *rw)
++{
++	if (!(rw->write_lock)) {
++	    /* isn't currently write-locked... that looks promising... */
++	    if (test_and_set_bit(31, rw) == 0) {
++		/* now it is write-locked by me... */
++		if (rw->read_counter) {
++		    /* really read-locked, so release write-lock and fail */
++		    clear_bit(31, rw);
++		} else {
++		    /* we've the the write-lock, no read-lockers... success! */
++		    barrier();
++		    return 1;
++		}
++
++	    }
++	}
++
++	/* falls through ... fails to write-lock */
++	barrier();
++	return 0;
++}
++#endif
++
+ #define _raw_read_unlock(rw)					\
+ do {								\
+ 	rwlock_t *__read_lock_ptr = (rw);			\
+@@ -190,4 +242,25 @@ do {										\
+ 	clear_bit(31, (x));								\
+ })
+ 
++#ifdef CONFIG_LOCKMETER
++extern void _metered_spin_lock  (spinlock_t *lock);
++extern void _metered_spin_unlock(spinlock_t *lock);
++
++/*
++ *  Use a less efficient, and inline, atomic_dec_and_lock() if lockmetering
++ *  so we can see the callerPC of who is actually doing the spin_lock().
++ *  Otherwise, all we see is the generic rollup of all locks done by
++ *  atomic_dec_and_lock().
++ */
++static inline int atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock)
++{
++	_metered_spin_lock(lock);
++	if (atomic_dec_and_test(atomic))
++		return 1;
++	_metered_spin_unlock(lock);
++	return 0;
++}
++#define ATOMIC_DEC_AND_LOCK
++#endif
++
+ #endif /*  _ASM_IA64_SPINLOCK_H */
+--- linux-2.6.0/include/asm-ia64/statfs.h	2003-08-08 22:55:13.000000000 -0700
++++ 25/include/asm-ia64/statfs.h	2003-12-28 23:22:16.000000000 -0800
+@@ -43,5 +43,18 @@ struct statfs64 {
+ 	long f_spare[5];
+ };
+ 
++struct compat_statfs64 {
++	__u32 f_type;
++	__u32 f_bsize;
++	__u64 f_blocks;
++	__u64 f_bfree;
++	__u64 f_bavail;
++	__u64 f_files;
++	__u64 f_ffree;
++	__kernel_fsid_t f_fsid;
++	__u32 f_namelen;
++	__u32 f_frsize;
++	__u32 f_spare[5];
++} __attribute__((packed));
+ 
+ #endif /* _ASM_IA64_STATFS_H */
+--- linux-2.6.0/include/asm-m68k/byteorder.h	2003-06-14 12:18:08.000000000 -0700
++++ 25/include/asm-m68k/byteorder.h	2003-12-28 23:22:55.000000000 -0800
+@@ -2,10 +2,11 @@
+ #define _M68K_BYTEORDER_H
+ 
+ #include <asm/types.h>
++#include <linux/compiler.h>
+ 
+ #ifdef __GNUC__
+ 
+-static __inline__ __const__ __u32 ___arch__swab32(__u32 val)
++static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 val)
+ {
+ 	__asm__("rolw #8,%0; swap %0; rolw #8,%0" : "=d" (val) : "0" (val));
+ 	return val;
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-m68k/cpumask.h	2003-12-28 23:22:10.000000000 -0800
+@@ -0,0 +1,6 @@
++#ifndef _ASM_M68K_CPUMASK_H
++#define _ASM_M68K_CPUMASK_H
++
++#include <asm-generic/cpumask.h>
++
++#endif /* _ASM_M68K_CPUMASK_H */
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-m68knommu/cpumask.h	2003-12-28 23:22:10.000000000 -0800
+@@ -0,0 +1,6 @@
++#ifndef _ASM_M68KNOMMU_CPUMASK_H
++#define _ASM_M68KNOMMU_CPUMASK_H
++
++#include <asm-generic/cpumask.h>
++
++#endif /* _ASM_M68KNOMMU_CPUMASK_H */
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-mips/cpumask.h	2003-12-28 23:22:10.000000000 -0800
+@@ -0,0 +1,6 @@
++#ifndef _ASM_MIPS_CPUMASK_H
++#define _ASM_MIPS_CPUMASK_H
++
++#include <asm-generic/cpumask.h>
++
++#endif /* _ASM_MIPS_CPUMASK_H */
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-mips/lockmeter.h	2003-12-28 23:26:33.000000000 -0800
+@@ -0,0 +1,126 @@
++/*
++ *  Copyright (C) 1999,2000 Silicon Graphics, Inc.
++ *
++ *  Written by John Hawkes (hawkes@sgi.com)
++ *  Based on klstat.h by Jack Steiner (steiner@sgi.com)
++ *  Ported to mips32 for Asita Technologies
++ *   by D.J. Barrow ( dj.barrow@asitatechnologies.com )
++ */
++#ifndef _ASM_LOCKMETER_H
++#define _ASM_LOCKMETER_H
++
++/* do_gettimeoffset is a function pointer on mips */
++/* & it is not included by <linux/time.h> */
++#include <asm/time.h>
++#include <linux/time.h>
++#include <asm/div64.h>
++
++#define SPINLOCK_MAGIC_INIT	/* */
++
++#define CPU_CYCLE_FREQUENCY	get_cpu_cycle_frequency()
++
++#define THIS_CPU_NUMBER		smp_processor_id()
++
++static uint32_t cpu_cycle_frequency = 0;
++
++static uint32_t get_cpu_cycle_frequency(void)
++{
++    /* a total hack, slow and invasive, but ... it works */
++    int sec;
++    uint32_t start_cycles;
++    struct timeval tv;
++
++    if (cpu_cycle_frequency == 0) {	/* uninitialized */
++	do_gettimeofday(&tv);
++	sec = tv.tv_sec;	/* set up to catch the tv_sec rollover */
++	while (sec == tv.tv_sec) { do_gettimeofday(&tv); }
++	sec = tv.tv_sec;	/* rolled over to a new sec value */
++	start_cycles = get_cycles();
++	while (sec == tv.tv_sec) { do_gettimeofday(&tv); }
++	cpu_cycle_frequency = get_cycles() - start_cycles;
++    }
++
++    return cpu_cycle_frequency;
++}
++
++extern struct timeval xtime;
++
++static uint64_t get_cycles64(void)
++{
++    static uint64_t last_get_cycles64 = 0;
++    uint64_t ret;
++    unsigned long sec;
++    unsigned long usec, usec_offset;
++
++again:
++    sec  = xtime.tv_sec;
++    usec = xtime.tv_usec;
++    usec_offset = do_gettimeoffset();
++    if ((xtime.tv_sec != sec)  ||
++	(xtime.tv_usec != usec)||
++	(usec_offset >= 20000))
++	goto again;
++
++    ret = ((uint64_t)(usec + usec_offset) * cpu_cycle_frequency);
++    /* We can't do a normal 64 bit division on mips without libgcc.a */
++    do_div(ret,1000000);
++    ret +=  ((uint64_t)sec * cpu_cycle_frequency);
++
++    /* XXX why does time go backwards?  do_gettimeoffset?  general time adj? */
++    if (ret <= last_get_cycles64)
++	ret  = last_get_cycles64+1;
++    last_get_cycles64 = ret;
++
++    return ret;
++}
++
++/*
++ * macros to cache and retrieve an index value inside of a lock
++ * these macros assume that there are less than 65536 simultaneous
++ * (read mode) holders of a rwlock.
++ * we also assume that the hash table has less than 32767 entries.
++ * the high order bit is used for write locking a rw_lock
++ */
++#define INDEX_MASK   0x7FFF0000
++#define READERS_MASK 0x0000FFFF
++#define INDEX_SHIFT 16
++#define PUT_INDEX(lockp,index)   \
++        lockp->lock = (((lockp->lock) & ~INDEX_MASK) | (index) << INDEX_SHIFT)
++#define GET_INDEX(lockp) \
++        (((lockp->lock) & INDEX_MASK) >> INDEX_SHIFT)
++
++/*
++ * macros to cache and retrieve an index value in a read/write lock
++ * as well as the cpu where a reader busy period started
++ * we use the 2nd word (the debug word) for this, so require the
++ * debug word to be present
++ */
++/*
++ * instrumented rwlock structure -- never used to allocate storage
++ * only used in macros below to overlay a rwlock_t
++ */
++typedef struct inst_rwlock_s {
++	volatile int lock;
++	unsigned short index;
++	unsigned short cpu;
++} inst_rwlock_t;
++#define PUT_RWINDEX(rwlock_ptr,indexv) ((inst_rwlock_t *)(rwlock_ptr))->index = indexv
++#define GET_RWINDEX(rwlock_ptr)        ((inst_rwlock_t *)(rwlock_ptr))->index
++#define PUT_RW_CPU(rwlock_ptr,cpuv)    ((inst_rwlock_t *)(rwlock_ptr))->cpu = cpuv
++#define GET_RW_CPU(rwlock_ptr)         ((inst_rwlock_t *)(rwlock_ptr))->cpu
++
++/*
++ * return the number of readers for a rwlock_t
++ */
++#define RWLOCK_READERS(rwlock_ptr)   rwlock_readers(rwlock_ptr)
++
++extern inline int rwlock_readers(rwlock_t *rwlock_ptr)
++{
++	int tmp = (int) rwlock_ptr->lock;
++	return (tmp >= 0) ? tmp : 0;
++}
++
++#define RWLOCK_IS_WRITE_LOCKED(rwlock_ptr) ((rwlock_ptr)->lock < 0)
++#define RWLOCK_IS_READ_LOCKED(rwlock_ptr)  ((rwlock_ptr)->lock > 0)
++
++#endif /* _ASM_LOCKMETER_H */
+--- linux-2.6.0/include/asm-mips/spinlock.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/asm-mips/spinlock.h	2003-12-28 23:26:33.000000000 -0800
+@@ -91,9 +91,18 @@ static inline unsigned int _raw_spin_try
+ 
+ typedef struct {
+ 	volatile unsigned int lock;
++#ifdef CONFIG_LOCKMETER
++	/* required for LOCKMETER since all bits in lock are used */
++	/* and we need this storage for CPU and lock INDEX        */
++	unsigned lockmeter_magic;
++#endif
+ } rwlock_t;
+ 
++#ifdef CONFIG_LOCKMETER
++#define RW_LOCK_UNLOCKED (rwlock_t) { 0, 0 }
++#else
+ #define RW_LOCK_UNLOCKED (rwlock_t) { 0 }
++#endif
+ 
+ #define rwlock_init(x)  do { *(x) = RW_LOCK_UNLOCKED; } while(0)
+ 
+--- linux-2.6.0/include/asm-mips/statfs.h	2003-08-08 22:55:13.000000000 -0700
++++ 25/include/asm-mips/statfs.h	2003-12-28 23:22:16.000000000 -0800
+@@ -75,6 +75,20 @@ struct statfs64 {			/* Same as struct st
+ 	long		f_spare[6];
+ };
+ 
++struct compat_statfs64 {
++	__u32 f_type;
++	__u32 f_bsize;
++	__u64 f_blocks;
++	__u64 f_bfree;
++	__u64 f_bavail;
++	__u64 f_files;
++	__u64 f_ffree;
++	__kernel_fsid_t f_fsid;
++	__u32 f_namelen;
++	__u32 f_frsize;
++	__u32 f_spare[5];
++};
++
+ #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */
+ 
+ #endif /* _ASM_STATFS_H */
+--- linux-2.6.0/include/asm-parisc/byteorder.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-parisc/byteorder.h	2003-12-28 23:22:55.000000000 -0800
+@@ -2,10 +2,11 @@
+ #define _PARISC_BYTEORDER_H
+ 
+ #include <asm/types.h>
++#include <linux/compiler.h>
+ 
+ #ifdef __GNUC__
+ 
+-static __inline__ __const__ __u16 ___arch__swab16(__u16 x)
++static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x)
+ {
+ 	__asm__("dep %0, 15, 8, %0\n\t"		/* deposit 00ab -> 0bab */
+ 		"shd %%r0, %0, 8, %0"		/* shift 000000ab -> 00ba */
+@@ -14,7 +15,7 @@ static __inline__ __const__ __u16 ___arc
+ 	return x;
+ }
+ 
+-static __inline__ __const__ __u32 ___arch__swab24(__u32 x)
++static __inline__ __attribute_const__ __u32 ___arch__swab24(__u32 x)
+ {
+ 	__asm__("shd %0, %0, 8, %0\n\t"		/* shift xabcxabc -> cxab */
+ 		"dep %0, 15, 8, %0\n\t"		/* deposit cxab -> cbab */
+@@ -24,7 +25,7 @@ static __inline__ __const__ __u32 ___arc
+ 	return x;
+ }
+ 
+-static __inline__ __const__ __u32 ___arch__swab32(__u32 x)
++static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
+ {
+ 	unsigned int temp;
+ 	__asm__("shd %0, %0, 16, %1\n\t"	/* shift abcdabcd -> cdab */
+@@ -47,7 +48,7 @@ static __inline__ __const__ __u32 ___arc
+ **      HSHR    67452301 -> *6*4*2*0 into %0
+ **      OR      %0 | %1  -> 76543210 into %0 (all done!)
+ */
+-static __inline__ __const__ __u64 ___arch__swab64(__u64 x) {
++static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 x) {
+ 	__u64 temp;
+ 	__asm__("permh,3210 %0, %0\n\t"
+ 		"hshl %0, 8, %1\n\t"
+@@ -60,7 +61,7 @@ static __inline__ __const__ __u64 ___arc
+ #define __arch__swab64(x) ___arch__swab64(x)
+ #define __BYTEORDER_HAS_U64__
+ #elif !defined(__STRICT_ANSI__)
+-static __inline__ __const__ __u64 ___arch__swab64(__u64 x)
++static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 x)
+ {
+ 	__u32 t1 = ___arch__swab32((__u32) x);
+ 	__u32 t2 = ___arch__swab32((__u32) (x >> 32));
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-parisc/cpumask.h	2003-12-28 23:22:10.000000000 -0800
+@@ -0,0 +1,6 @@
++#ifndef _ASM_PARISC_CPUMASK_H
++#define _ASM_PARISC_CPUMASK_H
++
++#include <asm-generic/cpumask.h>
++
++#endif /* _ASM_PARISC_CPUMASK_H */
+--- linux-2.6.0/include/asm-parisc/ioctl.h	2003-10-08 15:07:10.000000000 -0700
++++ 25/include/asm-parisc/ioctl.h	2003-12-28 23:22:30.000000000 -0800
+@@ -45,7 +45,7 @@
+ 	 ((size) << _IOC_SIZESHIFT))
+ 
+ /* provoke compile error for invalid uses of size argument */
+-extern int __invalid_size_argument_for_IOC;
++extern unsigned int __invalid_size_argument_for_IOC;
+ #define _IOC_TYPECHECK(t) \
+ 	((sizeof(t) == sizeof(t[1]) && \
+ 	  sizeof(t) < (1 << _IOC_SIZEBITS)) ? \
+--- linux-2.6.0/include/asm-parisc/statfs.h	2003-06-22 12:04:45.000000000 -0700
++++ 25/include/asm-parisc/statfs.h	2003-12-28 23:22:16.000000000 -0800
+@@ -41,4 +41,18 @@ struct statfs64 {
+ 	long f_spare[5];
+ };
+ 
++struct compat_statfs64 {
++	__u32 f_type;
++	__u32 f_bsize;
++	__u64 f_blocks;
++	__u64 f_bfree;
++	__u64 f_bavail;
++	__u64 f_files;
++	__u64 f_ffree;
++	__kernel_fsid_t f_fsid;
++	__u32 f_namelen;
++	__u32 f_frsize;
++	__u32 f_spare[5];
++};
++
+ #endif
+--- linux-2.6.0/include/asm-ppc64/byteorder.h	2003-06-14 12:18:51.000000000 -0700
++++ 25/include/asm-ppc64/byteorder.h	2003-12-28 23:22:55.000000000 -0800
+@@ -9,6 +9,7 @@
+  */
+ 
+ #include <asm/types.h>
++#include <linux/compiler.h>
+ 
+ #ifdef __GNUC__
+ #ifdef __KERNEL__
+@@ -40,7 +41,7 @@ static __inline__ void st_le32(volatile 
+ }
+ 
+ #if 0
+-static __inline__ __const__ __u16 ___arch__swab16(__u16 value)
++static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 value)
+ {
+ 	__u16 result;
+ 
+@@ -50,7 +51,7 @@ static __inline__ __const__ __u16 ___arc
+ 	return result;
+ }
+ 
+-static __inline__ __const__ __u32 ___arch__swab32(__u32 value)
++static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 value)
+ {
+ 	__u32 result;
+ 
+@@ -62,7 +63,7 @@ static __inline__ __const__ __u32 ___arc
+ 	return result;
+ }
+ 
+-static __inline__ __const__ __u64 ___arch__swab64(__u64 value)
++static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 value)
+ {
+ 	__u64 result;
+ #error implement me
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-ppc64/cpumask.h	2003-12-28 23:22:10.000000000 -0800
+@@ -0,0 +1,6 @@
++#ifndef _ASM_PPC64_CPUMASK_H
++#define _ASM_PPC64_CPUMASK_H
++
++#include <asm-generic/cpumask.h>
++
++#endif /* _ASM_PPC64_CPUMASK_H */
+--- linux-2.6.0/include/asm-ppc64/ioctl.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-ppc64/ioctl.h	2003-12-28 23:22:30.000000000 -0800
+@@ -43,7 +43,7 @@
+ 	 ((size) << _IOC_SIZESHIFT))
+ 
+ /* provoke compile error for invalid uses of size argument */
+-extern int __invalid_size_argument_for_IOC;
++extern unsigned int __invalid_size_argument_for_IOC;
+ #define _IOC_TYPECHECK(t) \
+        ((sizeof(t) == sizeof(t[1]) && \
+          sizeof(t) < (1 << _IOC_SIZEBITS)) ? \
+--- linux-2.6.0/include/asm-ppc64/page.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-ppc64/page.h	2003-12-28 23:22:58.000000000 -0800
+@@ -41,6 +41,7 @@
+ 	( ((addr > (TASK_HPAGE_BASE-len)) && (addr < TASK_HPAGE_END)) || \
+ 	  ((current->mm->context & CONTEXT_LOW_HPAGES) && \
+ 	   (addr > (TASK_HPAGE_BASE_32-len)) && (addr < TASK_HPAGE_END_32)) )
++#define hugetlb_free_pgtables free_pgtables
+ #define HAVE_ARCH_HUGETLB_UNMAPPED_AREA
+ 
+ #define in_hugepage_area(context, addr) \
+--- linux-2.6.0/include/asm-ppc64/statfs.h	2003-06-22 12:04:45.000000000 -0700
++++ 25/include/asm-ppc64/statfs.h	2003-12-28 23:22:16.000000000 -0800
+@@ -44,4 +44,18 @@ struct statfs64 {
+ 	long f_spare[5];
+ };
+ 
++struct compat_statfs64 {
++	__u32 f_type;
++	__u32 f_bsize;
++	__u64 f_blocks;
++	__u64 f_bfree;
++	__u64 f_bavail;
++	__u64 f_files;
++	__u64 f_ffree;
++	__kernel_fsid_t f_fsid;
++	__u32 f_namelen;
++	__u32 f_frsize;
++	__u32 f_spare[5];
++};
++
+ #endif  /* _PPC64_STATFS_H */
+--- linux-2.6.0/include/asm-ppc/byteorder.h	2003-06-14 12:18:09.000000000 -0700
++++ 25/include/asm-ppc/byteorder.h	2003-12-28 23:22:55.000000000 -0800
+@@ -2,6 +2,7 @@
+ #define _PPC_BYTEORDER_H
+ 
+ #include <asm/types.h>
++#include <linux/compiler.h>
+ 
+ #ifdef __GNUC__
+ #ifdef __KERNEL__
+@@ -32,7 +33,7 @@ extern __inline__ void st_le32(volatile 
+ 	__asm__ __volatile__ ("stwbrx %1,0,%2" : "=m" (*addr) : "r" (val), "r" (addr));
+ }
+ 
+-static __inline__ __const__ __u16 ___arch__swab16(__u16 value)
++static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 value)
+ {
+ 	__u16 result;
+ 
+@@ -40,7 +41,7 @@ static __inline__ __const__ __u16 ___arc
+ 	return result;
+ }
+ 
+-static __inline__ __const__ __u32 ___arch__swab32(__u32 value)
++static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 value)
+ {
+ 	__u32 result;
+ 
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-ppc/cpumask.h	2003-12-28 23:22:10.000000000 -0800
+@@ -0,0 +1,6 @@
++#ifndef _ASM_PPC_CPUMASK_H
++#define _ASM_PPC_CPUMASK_H
++
++#include <asm-generic/cpumask.h>
++
++#endif /* _ASM_PPC_CPUMASK_H */
+--- linux-2.6.0/include/asm-ppc/highmem.h	2003-10-08 15:07:10.000000000 -0700
++++ 25/include/asm-ppc/highmem.h	2003-12-28 23:22:58.000000000 -0800
+@@ -81,6 +81,7 @@ static inline void *kmap_atomic(struct p
+ 	unsigned int idx;
+ 	unsigned long vaddr;
+ 
++	/* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */
+ 	inc_preempt_count();
+ 	if (page < highmem_start_page)
+ 		return page_address(page);
+@@ -105,6 +106,7 @@ static inline void kunmap_atomic(void *k
+ 
+ 	if (vaddr < KMAP_FIX_BEGIN) { // FIXME
+ 		dec_preempt_count();
++		preempt_check_resched();
+ 		return;
+ 	}
+ 
+@@ -119,6 +121,7 @@ static inline void kunmap_atomic(void *k
+ 	flush_tlb_page(0, vaddr);
+ #endif
+ 	dec_preempt_count();
++	preempt_check_resched();
+ }
+ 
+ static inline struct page *kmap_atomic_to_page(void *ptr)
+--- linux-2.6.0/include/asm-ppc/ibm4xx.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-ppc/ibm4xx.h	2003-12-28 23:22:27.000000000 -0800
+@@ -90,8 +90,6 @@ void ppc4xx_init(unsigned long r3, unsig
+ #include <platforms/4xx/ocotea.h>
+ #endif
+ 
+-#endif /* CONFIG_40x */
+-
+ #ifndef __ASSEMBLY__
+ /*
+  * The "residual" board information structure the boot loader passes
+@@ -99,6 +97,7 @@ void ppc4xx_init(unsigned long r3, unsig
+  */
+ extern bd_t __res;
+ #endif
++#endif /* CONFIG_40x */
+ 
+ #endif /* __ASM_IBM4XX_H__ */
+ #endif /* __KERNEL__ */
+--- linux-2.6.0/include/asm-ppc/ioctl.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-ppc/ioctl.h	2003-12-28 23:22:30.000000000 -0800
+@@ -38,7 +38,7 @@
+ 	 ((size) << _IOC_SIZESHIFT))
+ 
+ /* provoke compile error for invalid uses of size argument */
+-extern int __invalid_size_argument_for_IOC;
++extern unsigned int __invalid_size_argument_for_IOC;
+ #define _IOC_TYPECHECK(t) \
+ 	((sizeof(t) == sizeof(t[1]) && \
+ 	  sizeof(t) < (1 << _IOC_SIZEBITS)) ? \
+--- linux-2.6.0/include/asm-ppc/mpc8260.h	2003-06-14 12:17:56.000000000 -0700
++++ 25/include/asm-ppc/mpc8260.h	2003-12-28 23:22:27.000000000 -0800
+@@ -1,15 +1,36 @@
+-/* This is the single file included by all MPC8260 build options.
++/*
+  * Since there are many different boards and no standard configuration,
+  * we have a unique include file for each.  Rather than change every
+  * file that has to include MPC8260 configuration, they all include
+  * this one and the configuration switching is done here.
+  */
+ #ifdef __KERNEL__
+-#ifndef __CONFIG_8260_DEFS
+-#define __CONFIG_8260_DEFS
++#ifndef __ASM_PPC_MPC8260_H__
++#define __ASM_PPC_MPC8260_H__
+ 
+ #include <linux/config.h>
+-#include <platforms/mpc82xx.h>
++
++#ifdef CONFIG_8260
++
++#ifdef CONFIG_EST8260
++#include <platforms/est8260.h>
++#endif
++
++#ifdef CONFIG_SBS8260
++#include <platforms/sbs8260.h>
++#endif
++
++#ifdef CONFIG_RPX6
++#include <platforms/rpxsuper.h>
++#endif
++
++#ifdef CONFIG_WILLOW
++#include <platforms/willow.h>
++#endif
++
++#ifdef CONFIG_TQM8260
++#include <platforms/tqm8260.h>
++#endif
+ 
+ /* Make sure the memory translation stuff is there if PCI not used.
+  */
+@@ -34,10 +55,13 @@
+ #define IO_VIRT_ADDR	IO_PHYS_ADDR
+ #endif
+ 
++#ifndef __ASSEMBLY__
+ /* The "residual" data board information structure the boot loader
+  * hands to us.
+  */
+ extern unsigned char __res[];
++#endif
+ 
+-#endif /* !__CONFIG_8260_DEFS */
++#endif /* CONFIG_8260 */
++#endif /* !__ASM_PPC_MPC8260_H__ */
+ #endif /* __KERNEL__ */
+--- linux-2.6.0/include/asm-s390/byteorder.h	2003-06-14 12:18:51.000000000 -0700
++++ 25/include/asm-s390/byteorder.h	2003-12-28 23:22:56.000000000 -0800
+@@ -10,11 +10,12 @@
+  */
+ 
+ #include <asm/types.h>
++#include <linux/compiler.h>
+ 
+ #ifdef __GNUC__
+ 
+ #ifdef __s390x__
+-static __inline__ __const__ __u64 ___arch__swab64p(__u64 *x)
++static __inline__ __attribute_pure__ __u64 ___arch__swab64p(__const__ __u64 *x)
+ {
+ 	__u64 result;
+ 
+@@ -24,7 +25,7 @@ static __inline__ __const__ __u64 ___arc
+ 	return result;
+ }
+ 
+-static __inline__ __const__ __u64 ___arch__swab64(__u64 x)
++static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 x)
+ {
+ 	__u64 result;
+ 
+@@ -40,7 +41,7 @@ static __inline__ void ___arch__swab64s(
+ }
+ #endif /* __s390x__ */
+ 
+-static __inline__ __const__ __u32 ___arch__swab32p(__u32 *x)
++static __inline__ __attribute_pure__ __u32 ___arch__swab32p(__const__ __u32 *x)
+ {
+ 	__u32 result;
+ 	
+@@ -58,7 +59,7 @@ static __inline__ __const__ __u32 ___arc
+ 	return result;
+ }
+ 
+-static __inline__ __const__ __u32 ___arch__swab32(__u32 x)
++static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
+ {
+ #ifndef __s390x__
+ 	return ___arch__swab32p(&x);
+@@ -77,7 +78,7 @@ static __inline__ void ___arch__swab32s(
+ 	*x = ___arch__swab32p(x);
+ }
+ 
+-static __inline__ __const__ __u16 ___arch__swab16p(__u16 *x)
++static __inline__ __attribute_pure__ __u16 ___arch__swab16p(__const__ __u16 *x)
+ {
+ 	__u16 result;
+ 	
+@@ -93,7 +94,7 @@ static __inline__ __const__ __u16 ___arc
+ 	return result;
+ }
+ 
+-static __inline__ __const__ __u16 ___arch__swab16(__u16 x)
++static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x)
+ {
+ 	return ___arch__swab16p(&x);
+ }
+--- linux-2.6.0/include/asm-s390/ccwdev.h	2003-07-02 14:53:17.000000000 -0700
++++ 25/include/asm-s390/ccwdev.h	2003-12-28 23:23:06.000000000 -0800
+@@ -69,7 +69,7 @@ ccw_device_id_match(const struct ccw_dev
+ /* The struct ccw device is our replacement for the globally accessible
+  * ioinfo array. ioinfo will mutate into a subchannel device later.
+  *
+- * Reference: Documentation/driver-model.txt */
++ * Reference: Documentation/s390/driver-model.txt */
+ struct ccw_device {
+ 	spinlock_t *ccwlock;
+ 	struct ccw_device_private *private;	/* cio private information */
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-s390/cpumask.h	2003-12-28 23:22:10.000000000 -0800
+@@ -0,0 +1,6 @@
++#ifndef _ASM_S390_CPUMASK_H
++#define _ASM_S390_CPUMASK_H
++
++#include <asm-generic/cpumask.h>
++
++#endif /* _ASM_S390_CPUMASK_H */
+--- linux-2.6.0/include/asm-s390/statfs.h	2003-07-02 14:53:17.000000000 -0700
++++ 25/include/asm-s390/statfs.h	2003-12-28 23:22:16.000000000 -0800
+@@ -53,5 +53,19 @@ struct statfs64 {
+ 	int  f_spare[5];
+ };
+ 
++struct compat_statfs64 {
++	__u32 f_type;
++	__u32 f_bsize;
++	__u64 f_blocks;
++	__u64 f_bfree;
++	__u64 f_bavail;
++	__u64 f_files;
++	__u64 f_ffree;
++	__kernel_fsid_t f_fsid;
++	__u32 f_namelen;
++	__u32 f_frsize;
++	__u32 f_spare[5];
++};
++
+ #endif /* __s390x__ */
+ #endif
+--- linux-2.6.0/include/asm-sh/byteorder.h	2003-07-02 14:53:18.000000000 -0700
++++ 25/include/asm-sh/byteorder.h	2003-12-28 23:22:55.000000000 -0800
+@@ -6,8 +6,9 @@
+  */
+ 
+ #include <asm/types.h>
++#include <linux/compiler.h>
+ 
+-static __inline__ __const__ __u32 ___arch__swab32(__u32 x)
++static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
+ {
+ 	__asm__("swap.b	%0, %0\n\t"
+ 		"swap.w %0, %0\n\t"
+@@ -17,7 +18,7 @@ static __inline__ __const__ __u32 ___arc
+ 	return x;
+ }
+ 
+-static __inline__ __const__ __u16 ___arch__swab16(__u16 x)
++static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x)
+ {
+ 	__asm__("swap.b %0, %0"
+ 		: "=r" (x)
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-sh/cpumask.h	2003-12-28 23:22:10.000000000 -0800
+@@ -0,0 +1,6 @@
++#ifndef _ASM_SH_CPUMASK_H
++#define _ASM_SH_CPUMASK_H
++
++#include <asm-generic/cpumask.h>
++
++#endif /* _ASM_SH_CPUMASK_H */
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-sparc64/cpumask.h	2003-12-28 23:22:10.000000000 -0800
+@@ -0,0 +1,6 @@
++#ifndef _ASM_SPARC64_CPUMASK_H
++#define _ASM_SPARC64_CPUMASK_H
++
++#include <asm-generic/cpumask.h>
++
++#endif /* _ASM_SPARC64_CPUMASK_H */
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-sparc64/lockmeter.h	2003-12-28 23:26:33.000000000 -0800
+@@ -0,0 +1,45 @@
++/*
++ * Copyright (C) 2000 Anton Blanchard (anton@linuxcare.com)
++ * Copyright (C) 2003 David S. Miller (davem@redhat.com)
++ */
++
++#ifndef _SPARC64_LOCKMETER_H
++#define _SPARC64_LOCKMETER_H
++
++#include <linux/smp.h>
++#include <asm/spinlock.h>
++#include <asm/timer.h>
++#include <asm/timex.h>
++
++/* Actually, this is not the CPU frequency by the system tick
++ * frequency which is good enough for lock metering.
++ */
++#define CPU_CYCLE_FREQUENCY	(timer_tick_offset * HZ)
++#define THIS_CPU_NUMBER		smp_processor_id()
++
++#define PUT_INDEX(lock_ptr,indexv)	(lock_ptr)->index = (indexv)
++#define GET_INDEX(lock_ptr)		(lock_ptr)->index
++
++#define PUT_RWINDEX(rwlock_ptr,indexv) (rwlock_ptr)->index = (indexv)
++#define GET_RWINDEX(rwlock_ptr)        (rwlock_ptr)->index
++#define PUT_RW_CPU(rwlock_ptr,cpuv)    (rwlock_ptr)->cpu = (cpuv)
++#define GET_RW_CPU(rwlock_ptr)         (rwlock_ptr)->cpu
++
++#define RWLOCK_READERS(rwlock_ptr)	rwlock_readers(rwlock_ptr)
++
++extern inline int rwlock_readers(rwlock_t *rwlock_ptr)
++{
++	signed int tmp = rwlock_ptr->lock;
++
++	if (tmp > 0)
++		return tmp;
++	else
++		return 0;
++}
++
++#define RWLOCK_IS_WRITE_LOCKED(rwlock_ptr)	((signed int)((rwlock_ptr)->lock) < 0)
++#define RWLOCK_IS_READ_LOCKED(rwlock_ptr)	((signed int)((rwlock_ptr)->lock) > 0)
++
++#define get_cycles64()	get_cycles()
++
++#endif /* _SPARC64_LOCKMETER_H */
+--- linux-2.6.0/include/asm-sparc64/spinlock.h	2003-11-23 19:03:02.000000000 -0800
++++ 25/include/asm-sparc64/spinlock.h	2003-12-28 23:26:33.000000000 -0800
+@@ -30,15 +30,23 @@
+ 
+ #ifndef CONFIG_DEBUG_SPINLOCK
+ 
+-typedef unsigned char spinlock_t;
+-#define SPIN_LOCK_UNLOCKED	0
++typedef struct {
++	unsigned char lock;
++	unsigned int  index;
++} spinlock_t;
+ 
+-#define spin_lock_init(lock)	(*((unsigned char *)(lock)) = 0)
+-#define spin_is_locked(lock)	(*((volatile unsigned char *)(lock)) != 0)
++#ifdef CONFIG_LOCKMETER
++#define SPIN_LOCK_UNLOCKED	(spinlock_t) {0, 0}
++#else
++#define SPIN_LOCK_UNLOCKED	(spinlock_t) { 0 }
++#endif
+ 
+-#define spin_unlock_wait(lock)	\
++#define spin_lock_init(__lock)	do { *(__lock) = SPIN_LOCK_UNLOCKED; } while(0)
++#define spin_is_locked(__lock)	(*((volatile unsigned char *)(&((__lock)->lock))) != 0)
++
++#define spin_unlock_wait(__lock)	\
+ do {	membar("#LoadLoad");	\
+-} while(*((volatile unsigned char *)lock))
++} while(*((volatile unsigned char *)(&(((spinlock_t *)__lock)->lock))))
+ 
+ static __inline__ void _raw_spin_lock(spinlock_t *lock)
+ {
+@@ -109,17 +117,31 @@ extern int _spin_trylock (spinlock_t *lo
+ 
+ #ifndef CONFIG_DEBUG_SPINLOCK
+ 
+-typedef unsigned int rwlock_t;
+-#define RW_LOCK_UNLOCKED	0
+-#define rwlock_init(lp) do { *(lp) = RW_LOCK_UNLOCKED; } while(0)
+-#define rwlock_is_locked(x) (*(x) != RW_LOCK_UNLOCKED)
++#ifdef CONFIG_LOCKMETER
++typedef struct {
++	unsigned int lock;
++	unsigned int index;
++	unsigned int cpu;
++} rwlock_t;
++#define RW_LOCK_UNLOCKED       (rwlock_t) { 0, 0, 0xff }
++#else
++typedef struct {
++	unsigned int lock;
++} rwlock_t;
++#define RW_LOCK_UNLOCKED        (rwlock_t) { 0 }
++#endif
++
++#define rwlock_init(lp)		do { *(lp) = RW_LOCK_UNLOCKED; } while(0)
++#define rwlock_is_locked(x)	((x)->lock != 0)
+ 
++extern int __read_trylock(rwlock_t *);
+ extern void __read_lock(rwlock_t *);
+ extern void __read_unlock(rwlock_t *);
+ extern void __write_lock(rwlock_t *);
+ extern void __write_unlock(rwlock_t *);
+ extern int __write_trylock(rwlock_t *);
+ 
++#define _raw_read_trylock(p)	__read_trylock(p)
+ #define _raw_read_lock(p)	__read_lock(p)
+ #define _raw_read_unlock(p)	__read_unlock(p)
+ #define _raw_write_lock(p)	__write_lock(p)
+--- linux-2.6.0/include/asm-sparc64/statfs.h	2003-06-22 12:04:45.000000000 -0700
++++ 25/include/asm-sparc64/statfs.h	2003-12-28 23:22:16.000000000 -0800
+@@ -38,4 +38,18 @@ struct statfs64 {
+ 	long f_spare[5];
+ };
+ 
++struct compat_statfs64 {
++	__u32 f_type;
++	__u32 f_bsize;
++	__u64 f_blocks;
++	__u64 f_bfree;
++	__u64 f_bavail;
++	__u64 f_files;
++	__u64 f_ffree;
++	__kernel_fsid_t f_fsid;
++	__u32 f_namelen;
++	__u32 f_frsize;
++	__u32 f_spare[5];
++};
++
+ #endif
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-sparc/cpumask.h	2003-12-28 23:22:10.000000000 -0800
+@@ -0,0 +1,6 @@
++#ifndef _ASM_SPARC_CPUMASK_H
++#define _ASM_SPARC_CPUMASK_H
++
++#include <asm-generic/cpumask.h>
++
++#endif /* _ASM_SPARC_CPUMASK_H */
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-um/cpumask.h	2003-12-28 23:22:10.000000000 -0800
+@@ -0,0 +1,6 @@
++#ifndef _ASM_UM_CPUMASK_H
++#define _ASM_UM_CPUMASK_H
++
++#include <asm-generic/cpumask.h>
++
++#endif /* _ASM_UM_CPUMASK_H */
+--- linux-2.6.0/include/asm-v850/byteorder.h	2003-06-14 12:18:30.000000000 -0700
++++ 25/include/asm-v850/byteorder.h	2003-12-28 23:22:55.000000000 -0800
+@@ -15,17 +15,18 @@
+ #define __V850_BYTEORDER_H__
+ 
+ #include <asm/types.h>
++#include <linux/compiler.h>
+ 
+ #ifdef __GNUC__
+ 
+-static __inline__ __const__ __u32 ___arch__swab32 (__u32 word)
++static __inline__ __attribute_const__ __u32 ___arch__swab32 (__u32 word)
+ {
+ 	__u32 res;
+ 	__asm__ ("bsw %1, %0" : "=r" (res) : "r" (word));
+ 	return res;
+ }
+ 
+-static __inline__ __const__ __u16 ___arch__swab16 (__u16 half_word)
++static __inline__ __attribute_const__ __u16 ___arch__swab16 (__u16 half_word)
+ {
+ 	__u16 res;
+ 	__asm__ ("bsh %1, %0" : "=r" (res) : "r" (half_word));
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-v850/cpumask.h	2003-12-28 23:22:10.000000000 -0800
+@@ -0,0 +1,6 @@
++#ifndef _ASM_V850_CPUMASK_H
++#define _ASM_V850_CPUMASK_H
++
++#include <asm-generic/cpumask.h>
++
++#endif /* _ASM_V850_CPUMASK_H */
+--- linux-2.6.0/include/asm-x86_64/acpi.h	2003-06-14 12:18:25.000000000 -0700
++++ 25/include/asm-x86_64/acpi.h	2003-12-28 23:21:33.000000000 -0800
+@@ -104,25 +104,26 @@
+         :"0"(n_hi), "1"(n_lo))
+ 
+ 
+-#ifndef CONFIG_ACPI_BOOT
+-#define acpi_lapic 0
+-#define acpi_ioapic 0
+-#else
+-#ifdef CONFIG_X86_LOCAL_APIC
++#ifdef CONFIG_ACPI_BOOT
+ extern int acpi_lapic;
+-#else
+-#define acpi_lapic 0
+-#endif
+-#ifdef CONFIG_X86_IO_APIC
+ extern int acpi_ioapic;
+-#else
+-#define acpi_ioapic 0
+-#endif
++extern int acpi_noirq;
+ 
+ /* Fixmap pages to reserve for ACPI boot-time tables (see fixmap.h) */
+ #define FIX_ACPI_PAGES 4
+ 
+-#endif /*CONFIG_ACPI_BOOT*/
++#else	/* !CONFIG_ACPI_BOOT */
++#define acpi_lapic 0
++#define acpi_ioapic 0
++#endif /* !CONFIG_ACPI_BOOT */
++
++#ifdef CONFIG_ACPI_PCI
++static inline void acpi_noirq_set(void) { acpi_noirq = 1; }
++extern int acpi_irq_balance_set(char *str);
++#else
++static inline void acpi_noirq_set(void) { }
++static inline int acpi_irq_balance_set(char *str) { return 0; }
++#endif
+ 
+ #ifdef CONFIG_ACPI_SLEEP
+ 
+--- linux-2.6.0/include/asm-x86_64/a.out.h	2003-06-14 12:18:08.000000000 -0700
++++ 25/include/asm-x86_64/a.out.h	2003-12-28 23:22:16.000000000 -0800
+@@ -1,13 +1,11 @@
+ #ifndef __X8664_A_OUT_H__
+ #define __X8664_A_OUT_H__
+ 
+-
+-/* Note: a.out is not supported in 64bit mode. This is just here to 
+-   still let some old things compile. */ 
++/* 32bit a.out */
+ 
+ struct exec
+ {
+-  unsigned long a_info;		/* Use macros N_MAGIC, etc for access */
++  unsigned int a_info;		/* Use macros N_MAGIC, etc for access */
+   unsigned a_text;		/* length of text, in bytes */
+   unsigned a_data;		/* length of data, in bytes */
+   unsigned a_bss;		/* length of uninitialized data area for file, in bytes */
+@@ -23,7 +21,7 @@ struct exec
+ 
+ #ifdef __KERNEL__
+ 
+-#define STACK_TOP	TASK_SIZE
++#define STACK_TOP	0xc0000000
+ 
+ #endif
+ 
+--- linux-2.6.0/include/asm-x86_64/byteorder.h	2003-06-14 12:18:29.000000000 -0700
++++ 25/include/asm-x86_64/byteorder.h	2003-12-28 23:22:55.000000000 -0800
+@@ -2,16 +2,17 @@
+ #define _X86_64_BYTEORDER_H
+ 
+ #include <asm/types.h>
++#include <linux/compiler.h>
+ 
+ #ifdef __GNUC__
+ 
+-static __inline__ __const__ __u64 ___arch__swab64(__u64 x)
++static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 x)
+ {
+ 	__asm__("bswapq %0" : "=r" (x) : "0" (x));
+ 	return x;
+ }
+ 
+-static __inline__ __const__ __u32 ___arch__swab32(__u32 x)
++static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
+ {
+ 	__asm__("bswapl %0" : "=r" (x) : "0" (x));
+ 	return x;
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-x86_64/cpumask.h	2003-12-28 23:22:10.000000000 -0800
+@@ -0,0 +1,6 @@
++#ifndef _ASM_X86_64_CPUMASK_H
++#define _ASM_X86_64_CPUMASK_H
++
++#include <asm-generic/cpumask.h>
++
++#endif /* _ASM_X86_64_CPUMASK_H */
+--- linux-2.6.0/include/asm-x86_64/hw_irq.h	2003-11-23 19:03:02.000000000 -0800
++++ 25/include/asm-x86_64/hw_irq.h	2003-12-28 23:21:44.000000000 -0800
+@@ -173,6 +173,8 @@ static inline void hw_resend_irq(struct 
+ static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i) {}
+ #endif
+ 
++#define platform_legacy_irq(irq)	((irq) < 16)
++
+ #endif
+ 
+ #endif /* _ASM_HW_IRQ_H */
+--- linux-2.6.0/include/asm-x86_64/io_apic.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/include/asm-x86_64/io_apic.h	2003-12-28 23:21:44.000000000 -0800
+@@ -174,6 +174,25 @@ extern int sis_apic_bug; /* dummy */ 
+ #define io_apic_assign_pci_irqs 0
+ #endif
+ 
++static inline int use_pci_vector(void)	{return 0;}
++static inline void disable_edge_ioapic_irq(unsigned int irq) { }
++static inline void mask_and_ack_level_ioapic_irq(unsigned int irq) { }
++static inline void end_edge_ioapic_irq (unsigned int irq) { }
++#define startup_level_ioapic	startup_level_ioapic_irq
++#define shutdown_level_ioapic	mask_IO_APIC_irq
++#define enable_level_ioapic	unmask_IO_APIC_irq
++#define disable_level_ioapic	mask_IO_APIC_irq
++#define mask_and_ack_level_ioapic mask_and_ack_level_ioapic_irq
++#define end_level_ioapic	end_level_ioapic_irq
++#define set_ioapic_affinity	set_ioapic_affinity_irq
++
++#define startup_edge_ioapic 	startup_edge_ioapic_irq
++#define shutdown_edge_ioapic 	disable_edge_ioapic_irq
++#define enable_edge_ioapic 	unmask_IO_APIC_irq
++#define disable_edge_ioapic 	disable_edge_ioapic_irq
++#define ack_edge_ioapic 	ack_edge_ioapic_irq
++#define end_edge_ioapic 	end_edge_ioapic_irq
++
+ void enable_NMI_through_LVT0 (void * dummy);
+ 
+ #endif
+--- linux-2.6.0/include/asm-x86_64/io.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/include/asm-x86_64/io.h	2003-12-28 23:26:30.000000000 -0800
+@@ -304,8 +304,8 @@ out:
+ /* Disable vmerge for now. Need to fix the block layer code
+    to check for non iommu addresses first.
+    When the IOMMU is force it is safe to enable. */
+-extern int force_iommu; 
+-#define BIO_VERMGE_BOUNDARY (force_iommu ? 4096 : 0)
++extern int iommu_merge;
++#define BIO_VMERGE_BOUNDARY (iommu_merge ? 4096 : 0)
+ 
+ #endif /* __KERNEL__ */
+ 
+--- linux-2.6.0/include/asm-x86_64/statfs.h	2003-06-22 12:04:45.000000000 -0700
++++ 25/include/asm-x86_64/statfs.h	2003-12-28 23:22:16.000000000 -0800
+@@ -41,4 +41,18 @@ struct statfs64 {
+ 	long f_spare[5];
+ };
+ 
++struct compat_statfs64 {
++	__u32 f_type;
++	__u32 f_bsize;
++	__u64 f_blocks;
++	__u64 f_bfree;
++	__u64 f_bavail;
++	__u64 f_files;
++	__u64 f_ffree;
++	__kernel_fsid_t f_fsid;
++	__u32 f_namelen;
++	__u32 f_frsize;
++	__u32 f_spare[5];
++} __attribute__((packed));
++
+ #endif
+--- linux-2.6.0/include/asm-x86_64/stat.h	2003-06-14 12:18:33.000000000 -0700
++++ 25/include/asm-x86_64/stat.h	2003-12-28 23:22:16.000000000 -0800
+@@ -26,4 +26,19 @@ struct stat {
+   	long		__unused[3];
+ };
+ 
++/* For 32bit emulation */
++struct __old_kernel_stat {
++	unsigned short st_dev;
++	unsigned short st_ino;
++	unsigned short st_mode;
++	unsigned short st_nlink;
++	unsigned short st_uid;
++	unsigned short st_gid;
++	unsigned short st_rdev;
++	unsigned int  st_size;
++	unsigned int  st_atime;
++	unsigned int  st_mtime;
++	unsigned int  st_ctime;
++};
++
+ #endif
+--- linux-2.6.0/include/linux/aio.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/linux/aio.h	2003-12-28 23:26:44.000000000 -0800
+@@ -29,21 +29,26 @@ struct kioctx;
+ #define KIF_LOCKED		0
+ #define KIF_KICKED		1
+ #define KIF_CANCELLED		2
++#define KIF_SYNCED		3
+ 
+ #define kiocbTryLock(iocb)	test_and_set_bit(KIF_LOCKED, &(iocb)->ki_flags)
+ #define kiocbTryKick(iocb)	test_and_set_bit(KIF_KICKED, &(iocb)->ki_flags)
++#define kiocbTrySync(iocb)	test_and_set_bit(KIF_SYNCED, &(iocb)->ki_flags)
+ 
+ #define kiocbSetLocked(iocb)	set_bit(KIF_LOCKED, &(iocb)->ki_flags)
+ #define kiocbSetKicked(iocb)	set_bit(KIF_KICKED, &(iocb)->ki_flags)
+ #define kiocbSetCancelled(iocb)	set_bit(KIF_CANCELLED, &(iocb)->ki_flags)
++#define kiocbSetSynced(iocb)	set_bit(KIF_SYNCED, &(iocb)->ki_flags)
+ 
+ #define kiocbClearLocked(iocb)	clear_bit(KIF_LOCKED, &(iocb)->ki_flags)
+ #define kiocbClearKicked(iocb)	clear_bit(KIF_KICKED, &(iocb)->ki_flags)
+ #define kiocbClearCancelled(iocb)	clear_bit(KIF_CANCELLED, &(iocb)->ki_flags)
++#define kiocbClearSynced(iocb)	clear_bit(KIF_SYNCED, &(iocb)->ki_flags)
+ 
+ #define kiocbIsLocked(iocb)	test_bit(KIF_LOCKED, &(iocb)->ki_flags)
+ #define kiocbIsKicked(iocb)	test_bit(KIF_KICKED, &(iocb)->ki_flags)
+ #define kiocbIsCancelled(iocb)	test_bit(KIF_CANCELLED, &(iocb)->ki_flags)
++#define kiocbIsSynced(iocb)	test_bit(KIF_SYNCED, &(iocb)->ki_flags)
+ 
+ struct kiocb {
+ 	struct list_head	ki_run_list;
+@@ -54,7 +59,7 @@ struct kiocb {
+ 	struct file		*ki_filp;
+ 	struct kioctx		*ki_ctx;	/* may be NULL for sync ops */
+ 	int			(*ki_cancel)(struct kiocb *, struct io_event *);
+-	long			(*ki_retry)(struct kiocb *);
++	ssize_t			(*ki_retry)(struct kiocb *);
+ 
+ 	struct list_head	ki_list;	/* the aio core uses this
+ 						 * for cancellation */
+@@ -63,6 +68,16 @@ struct kiocb {
+ 	__u64			ki_user_data;	/* user's data for completion */
+ 	loff_t			ki_pos;
+ 
++	/* State that we remember to be able to restart/retry  */
++	unsigned short		ki_opcode;
++	size_t			ki_nbytes; 	/* copy of iocb->aio_nbytes */
++	char 			*ki_buf;	/* remaining iocb->aio_buf */
++	size_t			ki_left; 	/* remaining bytes */
++	wait_queue_t		ki_wait;
++	long			ki_retried; 	/* just for testing */
++	long			ki_kicked; 	/* just for testing */
++	long			ki_queued; 	/* just for testing */
++
+ 	char			private[KIOCB_PRIVATE_SIZE];
+ };
+ 
+@@ -77,6 +92,8 @@ struct kiocb {
+ 		(x)->ki_ctx = &tsk->active_mm->default_kioctx;	\
+ 		(x)->ki_cancel = NULL;			\
+ 		(x)->ki_user_obj = tsk;			\
++		(x)->ki_user_data = 0;			\
++		init_wait((&(x)->ki_wait));		\
+ 	} while (0)
+ 
+ #define AIO_RING_MAGIC			0xa10a10a1
+@@ -159,6 +176,17 @@ int FASTCALL(io_submit_one(struct kioctx
+ #define get_ioctx(kioctx)	do { if (unlikely(atomic_read(&(kioctx)->users) <= 0)) BUG(); atomic_inc(&(kioctx)->users); } while (0)
+ #define put_ioctx(kioctx)	do { if (unlikely(atomic_dec_and_test(&(kioctx)->users))) __put_ioctx(kioctx); else if (unlikely(atomic_read(&(kioctx)->users) < 0)) BUG(); } while (0)
+ 
++#define in_aio() !is_sync_wait(current->io_wait)
++/* may be used for debugging */
++#define warn_if_async()	if (in_aio()) {\
++	printk(KERN_ERR "%s(%s:%d) called in async context!\n", \
++	__FUNCTION__, __FILE__, __LINE__); \
++	dump_stack(); \
++	}
++
++#define io_wait_to_kiocb(wait) container_of(wait, struct kiocb, ki_wait)
++#define is_retried_kiocb(iocb) ((iocb)->ki_retried > 1)
++
+ #include <linux/aio_abi.h>
+ 
+ static inline struct kiocb *list_kiocb(struct list_head *h)
+@@ -167,6 +195,7 @@ static inline struct kiocb *list_kiocb(s
+ }
+ 
+ /* for sysctl: */
+-extern unsigned aio_max_nr, aio_max_size, aio_max_pinned;
++extern atomic_t aio_nr;
++extern unsigned aio_max_nr;
+ 
+ #endif /* __LINUX__AIO_H */
+--- linux-2.6.0/include/linux/arcdevice.h	2003-07-27 12:14:40.000000000 -0700
++++ 25/include/linux/arcdevice.h	2003-12-28 23:21:01.000000000 -0800
+@@ -331,6 +331,7 @@ void arcnet_dump_packet(struct net_devic
+ void arcnet_unregister_proto(struct ArcProto *proto);
+ irqreturn_t arcnet_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+ void arcdev_setup(struct net_device *dev);
++struct net_device *alloc_arcdev(char *name);
+ void arcnet_rx(struct net_device *dev, int bufnum);
+ 
+ #endif				/* __KERNEL__ */
+--- linux-2.6.0/include/linux/bio.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/linux/bio.h	2003-12-28 23:22:57.000000000 -0800
+@@ -162,7 +162,7 @@ struct bio {
+  */
+ 
+ #define __BVEC_END(bio)		bio_iovec_idx((bio), (bio)->bi_vcnt - 1)
+-#define __BVEC_START(bio)	bio_iovec_idx((bio), 0)
++#define __BVEC_START(bio)	bio_iovec_idx((bio), (bio)->bi_idx)
+ #define BIOVEC_PHYS_MERGEABLE(vec1, vec2)	\
+ 	((bvec_to_phys((vec1)) + (vec1)->bv_len) == bvec_to_phys((vec2)))
+ #define BIOVEC_VIRT_MERGEABLE(vec1, vec2)	\
+--- linux-2.6.0/include/linux/blkdev.h	2003-12-17 21:20:03.000000000 -0800
++++ 25/include/linux/blkdev.h	2003-12-28 23:26:41.000000000 -0800
+@@ -195,11 +195,6 @@ enum rq_flag_bits {
+ 	__REQ_PM_SUSPEND,	/* suspend request */
+ 	__REQ_PM_RESUME,	/* resume request */
+ 	__REQ_PM_SHUTDOWN,	/* shutdown request */
+-	__REQ_IDETAPE_PC1,	/* packet command (first stage) */
+-	__REQ_IDETAPE_PC2,	/* packet command (second stage) */
+-	__REQ_IDETAPE_READ,
+-	__REQ_IDETAPE_WRITE,
+-	__REQ_IDETAPE_READ_BUFFER,
+ 	__REQ_NR_BITS,		/* stops here */
+ };
+ 
+@@ -225,11 +220,6 @@ enum rq_flag_bits {
+ #define REQ_PM_SUSPEND	(1 << __REQ_PM_SUSPEND)
+ #define REQ_PM_RESUME	(1 << __REQ_PM_RESUME)
+ #define REQ_PM_SHUTDOWN	(1 << __REQ_PM_SHUTDOWN)
+-#define REQ_IDETAPE_PC1 (1 << __REQ_IDETAPE_PC1)
+-#define REQ_IDETAPE_PC2 (1 << __REQ_IDETAPE_PC2)
+-#define REQ_IDETAPE_READ	(1 << __REQ_IDETAPE_READ)
+-#define REQ_IDETAPE_WRITE	(1 << __REQ_IDETAPE_WRITE)
+-#define REQ_IDETAPE_READ_BUFFER	(1 << __REQ_IDETAPE_READ_BUFFER)
+ 
+ /*
+  * State information carried for REQ_PM_SUSPEND and REQ_PM_RESUME
+@@ -597,6 +587,7 @@ extern void blk_queue_free_tags(request_
+ extern int blk_queue_resize_tags(request_queue_t *, int);
+ extern void blk_queue_invalidate_tags(request_queue_t *);
+ extern void blk_congestion_wait(int rw, long timeout);
++extern int blk_congestion_wait_wq(int rw, long timeout, wait_queue_t *wait);
+ 
+ extern void blk_rq_bio_prep(request_queue_t *, struct request *, struct bio *);
+ extern void blk_rq_prep_restart(struct request *);
+--- linux-2.6.0/include/linux/buffer_head.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/linux/buffer_head.h	2003-12-28 23:26:42.000000000 -0800
+@@ -162,6 +162,7 @@ void mark_buffer_async_write(struct buff
+ void invalidate_bdev(struct block_device *, int);
+ int sync_blockdev(struct block_device *bdev);
+ void __wait_on_buffer(struct buffer_head *);
++int __wait_on_buffer_wq(struct buffer_head *, wait_queue_t *wait);
+ wait_queue_head_t *bh_waitq_head(struct buffer_head *bh);
+ void wake_up_buffer(struct buffer_head *bh);
+ int fsync_bdev(struct block_device *);
+@@ -173,6 +174,8 @@ void __brelse(struct buffer_head *);
+ void __bforget(struct buffer_head *);
+ void __breadahead(struct block_device *, sector_t block, int size);
+ struct buffer_head *__bread(struct block_device *, sector_t block, int size);
++struct buffer_head *__bread_wq(struct block_device *, sector_t block,
++	int size, wait_queue_t *wait);
+ struct buffer_head *alloc_buffer_head(int gfp_flags);
+ void free_buffer_head(struct buffer_head * bh);
+ void FASTCALL(unlock_buffer(struct buffer_head *bh));
+@@ -207,12 +210,6 @@ int nobh_prepare_write(struct page*, uns
+ int nobh_commit_write(struct file *, struct page *, unsigned, unsigned);
+ int nobh_truncate_page(struct address_space *, loff_t);
+ 
+-#define OSYNC_METADATA	(1<<0)
+-#define OSYNC_DATA	(1<<1)
+-#define OSYNC_INODE	(1<<2)
+-int generic_osync_inode(struct inode *, int);
+-
+-
+ /*
+  * inline definitions
+  */
+@@ -230,13 +227,13 @@ static inline void put_bh(struct buffer_
+ 
+ static inline void brelse(struct buffer_head *bh)
+ {
+-	if (bh)
++	if (bh && !IS_ERR(bh))
+ 		__brelse(bh);
+ }
+ 
+ static inline void bforget(struct buffer_head *bh)
+ {
+-	if (bh)
++	if (bh && !IS_ERR(bh))
+ 		__bforget(bh);
+ }
+ 
+@@ -253,7 +250,12 @@ sb_breadahead(struct super_block *sb, se
+ }
+ 
+ static inline struct buffer_head *
+-sb_getblk(struct super_block *sb, sector_t block)
++sb_bread_wq(struct super_block *sb, sector_t block, wait_queue_t *wait)
++{
++	return __bread_wq(sb->s_bdev, block, sb->s_blocksize, wait);
++}
++
++static inline struct buffer_head *sb_getblk(struct super_block *sb, sector_t block)
+ {
+ 	return __getblk(sb->s_bdev, block, sb->s_blocksize);
+ }
+@@ -277,16 +279,34 @@ map_bh(struct buffer_head *bh, struct su
+  * __wait_on_buffer() just to trip a debug check.  Because debug code in inline
+  * functions is bloaty.
+  */
+-static inline void wait_on_buffer(struct buffer_head *bh)
++
++static inline int wait_on_buffer_wq(struct buffer_head *bh, wait_queue_t *wait)
+ {
+ 	if (buffer_locked(bh) || atomic_read(&bh->b_count) == 0)
+-		__wait_on_buffer(bh);
++		return __wait_on_buffer_wq(bh, wait);
++
++	return 0;
++}
++
++static inline void wait_on_buffer(struct buffer_head *bh)
++{
++	wait_on_buffer_wq(bh, NULL);
++}
++
++static inline int lock_buffer_wq(struct buffer_head *bh, wait_queue_t *wait)
++{
++	while (test_set_buffer_locked(bh)) {
++		int ret = __wait_on_buffer_wq(bh, wait);
++		if (ret)
++			return ret;
++	}
++
++	return 0;
+ }
+ 
+ static inline void lock_buffer(struct buffer_head *bh)
+ {
+-	while (test_set_buffer_locked(bh))
+-		__wait_on_buffer(bh);
++	lock_buffer_wq(bh, NULL);
+ }
+ 
+ #endif /* _LINUX_BUFFER_HEAD_H */
+--- linux-2.6.0/include/linux/byteorder/swab.h	2003-06-14 12:18:51.000000000 -0700
++++ 25/include/linux/byteorder/swab.h	2003-12-28 23:22:55.000000000 -0800
+@@ -15,6 +15,8 @@
+  *
+  */
+ 
++#include <linux/compiler.h>
++
+ /* casts are necessary for constants, because we never know how for sure
+  * how U/UL/ULL map to __u16, __u32, __u64. At least not in a portable way.
+  */
+@@ -128,7 +130,7 @@
+ #endif /* OPTIMIZE */
+ 
+ 
+-static __inline__ __const__ __u16 __fswab16(__u16 x)
++static __inline__ __attribute_const__ __u16 __fswab16(__u16 x)
+ {
+ 	return __arch__swab16(x);
+ }
+@@ -141,7 +143,7 @@ static __inline__ void __swab16s(__u16 *
+ 	__arch__swab16s(addr);
+ }
+ 
+-static __inline__ __const__ __u32 __fswab32(__u32 x)
++static __inline__ __attribute_const__ __u32 __fswab32(__u32 x)
+ {
+ 	return __arch__swab32(x);
+ }
+@@ -155,7 +157,7 @@ static __inline__ void __swab32s(__u32 *
+ }
+ 
+ #ifdef __BYTEORDER_HAS_U64__
+-static __inline__ __const__ __u64 __fswab64(__u64 x)
++static __inline__ __attribute_const__ __u64 __fswab64(__u64 x)
+ {
+ #  ifdef __SWAB_64_THRU_32__
+ 	__u32 h = x >> 32;
+--- linux-2.6.0/include/linux/cdrom.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/linux/cdrom.h	2003-12-28 23:22:35.000000000 -0800
+@@ -5,7 +5,7 @@
+  *               1994, 1995   Eberhard Moenkeberg, emoenke@gwdg.de
+  *               1996         David van Leeuwen, david@tm.tno.nl
+  *               1997, 1998   Erik Andersen, andersee@debian.org
+- *               1998-2000    Jens Axboe, axboe@suse.de
++ *               1998-2002    Jens Axboe, axboe@suse.de
+  */
+  
+ #ifndef	_LINUX_CDROM_H
+@@ -388,6 +388,9 @@ struct cdrom_generic_command
+ #define CDC_DVD_R		0x10000	/* drive can write DVD-R */
+ #define CDC_DVD_RAM		0x20000	/* drive can write DVD-RAM */
+ #define CDC_MO_DRIVE		0x40000 /* drive is an MO device */
++#define CDC_MRW			0x80000 /* drive can read MRW */
++#define CDC_MRW_W		0x100000 /* drive can write MRW */
++#define CDC_RAM			0x200000 /* ok to open for WRITE */
+ 
+ /* drive status possibilities returned by CDROM_DRIVE_STATUS ioctl */
+ #define CDS_NO_INFO		0	/* if not implemented */
+@@ -715,92 +718,57 @@ struct request_sense {
+ 	__u8 asb[46];
+ };
+ 
+-#ifdef __KERNEL__
+-#include <linux/fs.h>		/* not really needed, later.. */
+-#include <linux/device.h>
+-
+-struct cdrom_write_settings {
+-	unsigned char fpacket;		/* fixed/variable packets */
+-	unsigned long packet_size;	/* write out this number of packets */
+-	unsigned long nwa;		/* next writeable address */
+-	unsigned char writeable;	/* cdrom is writeable */
+-};
+-
+-/* Uniform cdrom data structures for cdrom.c */
+-struct cdrom_device_info {
+-	struct cdrom_device_ops  *ops;  /* link to device_ops */
+-	struct cdrom_device_info *next; /* next device_info for this major */
+-	void *handle;		        /* driver-dependent data */
+-/* specifications */
+-	int mask;                       /* mask of capability: disables them */
+-	int speed;			/* maximum speed for reading data */
+-	int capacity;			/* number of discs in jukebox */
+-/* device-related storage */
+-	int options		: 30;	/* options flags */
+-	unsigned mc_flags	: 2;	/* media change buffer flags */
+-    	int use_count;                  /* number of times device opened */
+-    	char name[20];                  /* name of the device type */
+-/* per-device flags */
+-        __u8 sanyo_slot		: 2;	/* Sanyo 3 CD changer support */
+-        __u8 reserved		: 6;	/* not used yet */
+-	struct cdrom_write_settings write;
+-};
+-
+-struct cdrom_device_ops {
+-/* routines */
+-	int (*open) (struct cdrom_device_info *, int);
+-	void (*release) (struct cdrom_device_info *);
+-	int (*drive_status) (struct cdrom_device_info *, int);
+-	int (*media_changed) (struct cdrom_device_info *, int);
+-	int (*tray_move) (struct cdrom_device_info *, int);
+-	int (*lock_door) (struct cdrom_device_info *, int);
+-	int (*select_speed) (struct cdrom_device_info *, int);
+-	int (*select_disc) (struct cdrom_device_info *, int);
+-	int (*get_last_session) (struct cdrom_device_info *,
+-				 struct cdrom_multisession *);
+-	int (*get_mcn) (struct cdrom_device_info *,
+-			struct cdrom_mcn *);
+-	/* hard reset device */
+-	int (*reset) (struct cdrom_device_info *);
+-	/* play stuff */
+-	int (*audio_ioctl) (struct cdrom_device_info *,unsigned int, void *);
+-	/* dev-specific */
+- 	int (*dev_ioctl) (struct cdrom_device_info *,
+-			  unsigned int, unsigned long);
+-/* driver specifications */
+-	const int capability;   /* capability flags */
+-	int n_minors;           /* number of active minor devices */
+-	/* handle uniform packets for scsi type devices (scsi,atapi) */
+-	int (*generic_packet) (struct cdrom_device_info *,
+-			       struct cdrom_generic_command *);
+-};
++/*
++ * feature profile
++ */
++#define CDF_MRW		0x28
+ 
+-/* the general block_device operations structure: */
+-extern int cdrom_open(struct cdrom_device_info *, struct inode *, struct file *);
+-extern int cdrom_release(struct cdrom_device_info *, struct file *);
+-extern int cdrom_ioctl(struct cdrom_device_info *, struct inode *, unsigned, unsigned long);
+-extern int cdrom_media_changed(struct cdrom_device_info *);
++/*
++ * media status bits
++ */
++#define CDM_MRW_NOTMRW			0
++#define CDM_MRW_BGFORMAT_INACTIVE	1
++#define CDM_MRW_BGFORMAT_ACTIVE		2
++#define CDM_MRW_BGFORMAT_COMPLETE	3
+ 
+-extern int register_cdrom(struct cdrom_device_info *cdi);
+-extern int unregister_cdrom(struct cdrom_device_info *cdi);
++/*
++ * mrw address spaces
++ */
++#define MRW_LBA_DMA			0
++#define MRW_LBA_GAA			1
+ 
+-typedef struct {
+-    int data;
+-    int audio;
+-    int cdi;
+-    int xa;
+-    long error;
+-} tracktype;
++/*
++ * mrw mode pages (first is deprecated) -- probed at init time and
++ * cdi->mrw_mode_page is set
++ */
++#define MRW_MODE_PC_PRE1		0x2c
++#define MRW_MODE_PC			0x03
+ 
+-extern int cdrom_get_last_written(struct cdrom_device_info *cdi, long *last_written);
+-extern int cdrom_number_of_slots(struct cdrom_device_info *cdi);
+-extern int cdrom_mode_select(struct cdrom_device_info *cdi,
+-			     struct cdrom_generic_command *cgc);
+-extern int cdrom_mode_sense(struct cdrom_device_info *cdi,
+-			    struct cdrom_generic_command *cgc,
+-			    int page_code, int page_control);
+-extern void init_cdrom_command(struct cdrom_generic_command *cgc,
+-			       void *buffer, int len, int type);
++struct mrw_feature_desc {
++	__u16 feature_code;
++#if defined(__BIG_ENDIAN_BITFIELD)
++	__u8 reserved1		: 2;
++	__u8 feature_version	: 4;
++	__u8 persistent		: 1;
++	__u8 curr		: 1;
++#elif defined(__LITTLE_ENDIAN_BITFIELD)
++	__u8 curr		: 1;
++	__u8 persistent		: 1;
++	__u8 feature_version	: 4;
++	__u8 reserved1		: 2;
++#endif
++	__u8 add_len;
++#if defined(__BIG_ENDIAN_BITFIELD)
++	__u8 reserved2		: 7;
++	__u8 write		: 1;
++#elif defined(__LITTLE_ENDIAN_BITFIELD)
++	__u8 write		: 1;
++	__u8 reserved2		: 7;
++#endif
++	__u8 reserved3;
++	__u8 reserved4;
++	__u8 reserved5;
++};
+ 
+ typedef struct {
+ 	__u16 disc_information_length;
+@@ -825,9 +793,13 @@ typedef struct {
+ 	__u8 did_v			: 1;
+         __u8 dbc_v			: 1;
+         __u8 uru			: 1;
+-        __u8 reserved2			: 5;
++        __u8 reserved2			: 2;
++	__u8 dbit			: 1;
++	__u8 mrw_status			: 2;
+ #elif defined(__LITTLE_ENDIAN_BITFIELD)
+-        __u8 reserved2			: 5;
++	__u8 mrw_status			: 2;
++	__u8 dbit			: 1;
++        __u8 reserved2			: 2;
+         __u8 uru			: 1;
+         __u8 dbc_v			: 1;
+ 	__u8 did_v			: 1;
+@@ -884,6 +856,104 @@ typedef struct {
+ 	__u32 last_rec_address;
+ } track_information;
+ 
++struct feature_header {
++	__u32 data_len;
++	__u8 reserved1;
++	__u8 reserved2;
++	__u16 curr_profile;
++};
++
++struct mode_page_header {
++	__u16 mode_data_length;
++	__u8 medium_type;
++	__u8 reserved1;
++	__u8 reserved2;
++	__u8 reserved3;
++	__u16 desc_length;
++};
++
++#ifdef __KERNEL__
++#include <linux/fs.h>		/* not really needed, later.. */
++#include <linux/device.h>
++
++/* Uniform cdrom data structures for cdrom.c */
++struct cdrom_device_info {
++	struct cdrom_device_ops  *ops;  /* link to device_ops */
++	struct cdrom_device_info *next; /* next device_info for this major */
++	void *handle;		        /* driver-dependent data */
++/* specifications */
++	int mask;                       /* mask of capability: disables them */
++	int speed;			/* maximum speed for reading data */
++	int capacity;			/* number of discs in jukebox */
++/* device-related storage */
++	int options		: 30;	/* options flags */
++	unsigned mc_flags	: 2;	/* media change buffer flags */
++    	int use_count;                  /* number of times device opened */
++    	char name[20];                  /* name of the device type */
++/* per-device flags */
++        __u8 sanyo_slot		: 2;	/* Sanyo 3 CD changer support */
++        __u8 reserved		: 6;	/* not used yet */
++	int for_data;
++	int (*exit)(struct cdrom_device_info *);
++	int mrw_mode_page;
++};
++
++struct cdrom_device_ops {
++/* routines */
++	int (*open) (struct cdrom_device_info *, int);
++	void (*release) (struct cdrom_device_info *);
++	int (*drive_status) (struct cdrom_device_info *, int);
++	int (*media_changed) (struct cdrom_device_info *, int);
++	int (*tray_move) (struct cdrom_device_info *, int);
++	int (*lock_door) (struct cdrom_device_info *, int);
++	int (*select_speed) (struct cdrom_device_info *, int);
++	int (*select_disc) (struct cdrom_device_info *, int);
++	int (*get_last_session) (struct cdrom_device_info *,
++				 struct cdrom_multisession *);
++	int (*get_mcn) (struct cdrom_device_info *,
++			struct cdrom_mcn *);
++	/* hard reset device */
++	int (*reset) (struct cdrom_device_info *);
++	/* play stuff */
++	int (*audio_ioctl) (struct cdrom_device_info *,unsigned int, void *);
++	/* dev-specific */
++ 	int (*dev_ioctl) (struct cdrom_device_info *,
++			  unsigned int, unsigned long);
++/* driver specifications */
++	const int capability;   /* capability flags */
++	int n_minors;           /* number of active minor devices */
++	/* handle uniform packets for scsi type devices (scsi,atapi) */
++	int (*generic_packet) (struct cdrom_device_info *,
++			       struct cdrom_generic_command *);
++};
++
++/* the general block_device operations structure: */
++extern int cdrom_open(struct cdrom_device_info *, struct block_device *, struct file *);
++extern int cdrom_release(struct cdrom_device_info *);
++extern int cdrom_ioctl(struct cdrom_device_info *, struct block_device *, unsigned, unsigned long);
++extern int cdrom_media_changed(struct cdrom_device_info *);
++
++extern int register_cdrom(struct cdrom_device_info *cdi);
++extern int unregister_cdrom(struct cdrom_device_info *cdi);
++
++typedef struct {
++    int data;
++    int audio;
++    int cdi;
++    int xa;
++    long error;
++} tracktype;
++
++extern int cdrom_get_last_written(struct cdrom_device_info *cdi, long *last_written);
++extern int cdrom_number_of_slots(struct cdrom_device_info *cdi);
++extern int cdrom_mode_select(struct cdrom_device_info *cdi,
++			     struct cdrom_generic_command *cgc);
++extern int cdrom_mode_sense(struct cdrom_device_info *cdi,
++			    struct cdrom_generic_command *cgc,
++			    int page_code, int page_control);
++extern void init_cdrom_command(struct cdrom_generic_command *cgc,
++			       void *buffer, int len, int type);
++
+ /* The SCSI spec says there could be 256 slots. */
+ #define CDROM_MAX_SLOTS	256
+ 
+@@ -934,15 +1004,6 @@ typedef enum {
+ 	mechtype_cartridge_changer  = 5
+ } mechtype_t;
+ 
+-struct mode_page_header {
+-	__u16 mode_data_length;
+-	__u8 medium_type;
+-	__u8 reserved1;
+-	__u8 reserved2;
+-	__u8 reserved3;
+-	__u16 desc_length;
+-};
+-
+ typedef struct {
+ #if defined(__BIG_ENDIAN_BITFIELD)
+ 	__u8 ps			: 1;
+@@ -1032,6 +1093,41 @@ typedef struct {
+ 	__u8 reserved3;
+ } rpc_state_t;
+ 
++struct event_header {
++	__u16 data_len;
++#if defined(__BIG_ENDIAN_BITFIELD)
++	__u8 nea		: 1;
++	__u8 reserved1		: 4;
++	__u8 notification_class	: 3;
++#elif defined(__LITTLE_ENDIAN_BITFIELD)
++	__u8 notification_class	: 3;
++	__u8 reserved1		: 4;
++	__u8 nea		: 1;
++#endif
++	__u8 supp_event_class;
++};
++
++struct media_event_desc {
++#if defined(__BIG_ENDIAN_BITFIELD)
++	__u8 reserved1		: 4;
++	__u8 media_event_code	: 4;
++	__u8 reserved2		: 6;
++	__u8 media_present	: 1;
++	__u8 door_open		: 1;
++#elif defined(__LITTLE_ENDIAN_BITFIELD)
++	__u8 media_event_code	: 4;
++	__u8 reserved1		: 4;
++	__u8 door_open		: 1;
++	__u8 media_present	: 1;
++	__u8 reserved2		: 6;
++#endif
++	__u8 start_slot;
++	__u8 end_slot;
++};
++
++extern int cdrom_get_media_event(struct cdrom_device_info *cdi, struct media_event_desc *med);
++extern int cdrom_is_mrw(struct cdrom_device_info *cdi, int *write);
++
+ #endif  /* End of kernel only stuff */ 
+ 
+ #endif  /* _LINUX_CDROM_H */
+--- linux-2.6.0/include/linux/com20020.h	2003-06-14 12:18:25.000000000 -0700
++++ 25/include/linux/com20020.h	2003-12-28 23:21:01.000000000 -0800
+@@ -29,7 +29,6 @@
+ 
+ int com20020_check(struct net_device *dev);
+ int com20020_found(struct net_device *dev, int shared);
+-void com20020_remove(struct net_device *dev);
+ 
+ /* The number of low I/O ports used by the card. */
+ #define ARCNET_TOTAL_SIZE 8
+--- linux-2.6.0/include/linux/compat.h	2003-10-08 15:07:10.000000000 -0700
++++ 25/include/linux/compat.h	2003-12-28 23:22:22.000000000 -0800
+@@ -44,8 +44,8 @@ typedef struct {
+ } compat_sigset_t;
+ 
+ extern int cp_compat_stat(struct kstat *, struct compat_stat *);
+-extern int get_compat_timespec(struct timespec *, struct compat_timespec *);
+-extern int put_compat_timespec(struct timespec *, struct compat_timespec *);
++extern int get_compat_timespec(struct timespec *, const struct compat_timespec *);
++extern int put_compat_timespec(struct timespec *, const struct compat_timespec *);
+ 
+ struct compat_iovec {
+ 	compat_uptr_t	iov_base;
+@@ -76,20 +76,6 @@ struct compat_rusage {
+ 	compat_long_t	ru_nivcsw;
+ };
+ 
+-struct compat_statfs64 {
+-	__u32 f_type;
+-	__u32 f_bsize;
+-	__u64 f_blocks;
+-	__u64 f_bfree;
+-	__u64 f_bavail;
+-	__u64 f_files;
+-	__u64 f_ffree;
+-	__kernel_fsid_t f_fsid;
+-	__u32 f_namelen;
+-	__u32 f_frsize;
+-	__u32 f_spare[5];
+-};
+-
+ struct compat_dirent {
+ 	u32		d_ino;
+ 	compat_off_t	d_off;
+--- linux-2.6.0/include/linux/compat_ioctl.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/linux/compat_ioctl.h	2003-12-28 23:21:48.000000000 -0800
+@@ -678,3 +678,10 @@ COMPATIBLE_IOCTL(NBD_CLEAR_QUE)
+ COMPATIBLE_IOCTL(NBD_PRINT_DEBUG)
+ COMPATIBLE_IOCTL(NBD_SET_SIZE_BLOCKS)
+ COMPATIBLE_IOCTL(NBD_DISCONNECT)
++/* i2c */
++COMPATIBLE_IOCTL(I2C_SLAVE)
++COMPATIBLE_IOCTL(I2C_SLAVE_FORCE)
++COMPATIBLE_IOCTL(I2C_TENBIT)
++COMPATIBLE_IOCTL(I2C_PEC)
++COMPATIBLE_IOCTL(I2C_RETRIES)
++COMPATIBLE_IOCTL(I2C_TIMEOUT)
+--- linux-2.6.0/include/linux/compiler-gcc2.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/linux/compiler-gcc2.h	2003-12-28 23:22:55.000000000 -0800
+@@ -20,4 +20,5 @@
+  */
+ #if __GNUC_MINOR__ >= 96
+ # define __attribute_pure__	__attribute__((pure))
++# define __attribute_const__	__attribute__((__const__))
+ #endif
+--- linux-2.6.0/include/linux/compiler-gcc3.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/linux/compiler-gcc3.h	2003-12-28 23:22:55.000000000 -0800
+@@ -20,3 +20,4 @@
+ #endif
+ 
+ #define __attribute_pure__	__attribute__((pure))
++#define __attribute_const__	__attribute__((__const__))
+--- linux-2.6.0/include/linux/compiler-gcc.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/linux/compiler-gcc.h	2003-12-28 23:21:36.000000000 -0800
+@@ -13,5 +13,5 @@
+    shouldn't recognize the original var, and make assumptions about it */
+ #define RELOC_HIDE(ptr, off)					\
+   ({ unsigned long __ptr;					\
+-    __asm__ ("" : "=g"(__ptr) : "0"(ptr));		\
++	__asm__ ("" : "=r"(__ptr) : "0"(ptr));			\
+     (typeof(ptr)) (__ptr + (off)); })
+--- linux-2.6.0/include/linux/compiler-gcc+.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/linux/compiler-gcc+.h	2003-12-28 23:22:55.000000000 -0800
+@@ -12,3 +12,4 @@
+ #define __deprecated		__attribute__((deprecated))
+ #define __attribute_used__	__attribute__((__used__))
+ #define __attribute_pure__	__attribute__((pure))
++#define __attribute_const__	__attribute__((__const__))
+--- linux-2.6.0/include/linux/compiler.h	2003-11-23 19:03:02.000000000 -0800
++++ 25/include/linux/compiler.h	2003-12-28 23:22:55.000000000 -0800
+@@ -76,6 +76,24 @@
+ # define __attribute_pure__	/* unimplemented */
+ #endif
+ 
++/*
++ * From the GCC manual:
++ *
++ * Many functions do not examine any values except their arguments,
++ * and have no effects except the return value.  Basically this is
++ * just slightly more strict class than the `pure' attribute above,
++ * since function is not allowed to read global memory.
++ *
++ * Note that a function that has pointer arguments and examines the
++ * data pointed to must _not_ be declared `const'.  Likewise, a
++ * function that calls a non-`const' function usually must not be
++ * `const'.  It does not make sense for a `const' function to return
++ * `void'.
++ */
++#ifndef __attribute_const__
++# define __attribute_const__	/* unimplemented */
++#endif
++
+ /* Optimization barrier */
+ #ifndef barrier
+ # define barrier() __memory_barrier()
+--- linux-2.6.0/include/linux/config.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/linux/config.h	2003-12-28 23:21:09.000000000 -0800
+@@ -2,5 +2,8 @@
+ #define _LINUX_CONFIG_H
+ 
+ #include <linux/autoconf.h>
++#if defined(__i386__) && !defined(IN_BOOTLOADER)
++#include <asm/kgdb.h>
++#endif
+ 
+ #endif
+--- linux-2.6.0/include/linux/cpumask.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/include/linux/cpumask.h	2003-12-28 23:22:10.000000000 -0800
+@@ -1,42 +1,9 @@
+ #ifndef __LINUX_CPUMASK_H
+ #define __LINUX_CPUMASK_H
+ 
+-#include <linux/config.h>
+-#include <linux/kernel.h>
+ #include <linux/threads.h>
+-#include <linux/types.h>
+-#include <linux/bitmap.h>
+-
+-#if NR_CPUS > BITS_PER_LONG && NR_CPUS != 1
+-#define CPU_ARRAY_SIZE		BITS_TO_LONGS(NR_CPUS)
+-
+-struct cpumask
+-{
+-	unsigned long mask[CPU_ARRAY_SIZE];
+-};
+-
+-typedef struct cpumask cpumask_t;
+-
+-#else
+-typedef unsigned long cpumask_t;
+-#endif
+-
+-#ifdef CONFIG_SMP
+-#if NR_CPUS > BITS_PER_LONG
+-#include <asm-generic/cpumask_array.h>
+-#else
+-#include <asm-generic/cpumask_arith.h>
+-#endif
+-#else
+-#include <asm-generic/cpumask_up.h>
+-#endif
+-
+-#if NR_CPUS <= 4*BITS_PER_LONG
+-#include <asm-generic/cpumask_const_value.h>
+-#else
+-#include <asm-generic/cpumask_const_reference.h>
+-#endif
+-
++#include <asm/cpumask.h>
++#include <asm/bug.h>
+ 
+ #ifdef CONFIG_SMP
+ 
+@@ -53,19 +20,31 @@ extern cpumask_t cpu_online_map;
+ static inline int next_online_cpu(int cpu, cpumask_t map)
+ {
+ 	do
+-		cpu = next_cpu_const(cpu, map);
++		cpu = next_cpu_const(cpu, mk_cpumask_const(map));
+ 	while (cpu < NR_CPUS && !cpu_online(cpu));
+ 	return cpu;
+ }
+ 
+ #define for_each_cpu(cpu, map)						\
+-	for (cpu = first_cpu_const(map);				\
++	for (cpu = first_cpu_const(mk_cpumask_const(map));		\
+ 		cpu < NR_CPUS;						\
+-		cpu = next_cpu_const(cpu,map))
++		cpu = next_cpu_const(cpu,mk_cpumask_const(map)))
+ 
+ #define for_each_online_cpu(cpu, map)					\
+-	for (cpu = first_cpu_const(map);				\
++	for (cpu = first_cpu_const(mk_cpumask_const(map));		\
+ 		cpu < NR_CPUS;						\
+ 		cpu = next_online_cpu(cpu,map))
+ 
++extern int __mask_snprintf_len(char *buf, unsigned int buflen,
++		const unsigned long *maskp, unsigned int maskbytes);
++
++#define cpumask_snprintf(buf, buflen, map)				\
++	__mask_snprintf_len(buf, buflen, cpus_addr(map), sizeof(map))
++
++extern int __mask_parse_len(const char __user *ubuf, unsigned int ubuflen,
++	unsigned long *maskp, unsigned int maskbytes);
++
++#define cpumask_parse(buf, buflen, map)					\
++	__mask_parse_len(buf, buflen, cpus_addr(map), sizeof(map))
++
+ #endif /* __LINUX_CPUMASK_H */
+--- linux-2.6.0/include/linux/device.h	2003-10-17 15:58:04.000000000 -0700
++++ 25/include/linux/device.h	2003-12-28 23:22:59.000000000 -0800
+@@ -246,6 +246,11 @@ struct class_interface {
+ extern int class_interface_register(struct class_interface *);
+ extern void class_interface_unregister(struct class_interface *);
+ 
++/* interface for simple class devices */
++extern struct class_device *simple_add_class_device(struct class *class, dev_t dev, struct device *device, const char *fmt, ...)
++	__attribute__((format(printf,4,5)));
++extern void simple_remove_class_device(dev_t dev);
++
+ 
+ struct device {
+ 	struct list_head node;		/* node in sibling list */
+@@ -372,7 +377,7 @@ extern int platform_device_register(stru
+ extern void platform_device_unregister(struct platform_device *);
+ 
+ extern struct bus_type platform_bus_type;
+-extern struct device legacy_bus;
++extern struct device platform_bus;
+ 
+ /* drivers/base/power.c */
+ extern void device_shutdown(void);
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/linux/dwarf2.h	2003-12-28 23:21:07.000000000 -0800
+@@ -0,0 +1,738 @@
++/* Declarations and definitions of codes relating to the DWARF2 symbolic
++   debugging information format.
++   Copyright (C) 1992, 1993, 1995, 1996, 1997, 1999, 2000, 2001, 2002
++   Free Software Foundation, Inc.
++
++   Written by Gary Funck (gary@intrepid.com) The Ada Joint Program
++   Office (AJPO), Florida State Unviversity and Silicon Graphics Inc.
++   provided support for this effort -- June 21, 1995.
++
++   Derived from the DWARF 1 implementation written by Ron Guilmette
++   (rfg@netcom.com), November 1990.
++
++   This file is part of GCC.
++
++   GCC is free software; you can redistribute it and/or modify it under
++   the terms of the GNU General Public License as published by the Free
++   Software Foundation; either version 2, or (at your option) any later
++   version.
++
++   GCC is distributed in the hope that it will be useful, but WITHOUT
++   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
++   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
++   License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with GCC; see the file COPYING.  If not, write to the Free
++   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
++   02111-1307, USA.  */
++
++/* This file is derived from the DWARF specification (a public document)
++   Revision 2.0.0 (July 27, 1993) developed by the UNIX International
++   Programming Languages Special Interest Group (UI/PLSIG) and distributed
++   by UNIX International.  Copies of this specification are available from
++   UNIX International, 20 Waterview Boulevard, Parsippany, NJ, 07054.
++
++   This file also now contains definitions from the DWARF 3 specification.  */
++
++/* This file is shared between GCC and GDB, and should not contain
++   prototypes.	*/
++
++#ifndef _ELF_DWARF2_H
++#define _ELF_DWARF2_H
++
++/* Structure found in the .debug_line section.	*/
++#ifndef __ASSEMBLY__
++typedef struct
++{
++  unsigned char li_length	   [4];
++  unsigned char li_version	   [2];
++  unsigned char li_prologue_length [4];
++  unsigned char li_min_insn_length [1];
++  unsigned char li_default_is_stmt [1];
++  unsigned char li_line_base	   [1];
++  unsigned char li_line_range	   [1];
++  unsigned char li_opcode_base	   [1];
++}
++DWARF2_External_LineInfo;
++
++typedef struct
++{
++  unsigned long  li_length;
++  unsigned short li_version;
++  unsigned int	 li_prologue_length;
++  unsigned char  li_min_insn_length;
++  unsigned char  li_default_is_stmt;
++  int		 li_line_base;
++  unsigned char  li_line_range;
++  unsigned char  li_opcode_base;
++}
++DWARF2_Internal_LineInfo;
++
++/* Structure found in .debug_pubnames section.	*/
++typedef struct
++{
++  unsigned char pn_length  [4];
++  unsigned char pn_version [2];
++  unsigned char pn_offset  [4];
++  unsigned char pn_size    [4];
++}
++DWARF2_External_PubNames;
++
++typedef struct
++{
++  unsigned long  pn_length;
++  unsigned short pn_version;
++  unsigned long  pn_offset;
++  unsigned long  pn_size;
++}
++DWARF2_Internal_PubNames;
++
++/* Structure found in .debug_info section.  */
++typedef struct
++{
++  unsigned char  cu_length	  [4];
++  unsigned char  cu_version	  [2];
++  unsigned char  cu_abbrev_offset [4];
++  unsigned char  cu_pointer_size  [1];
++}
++DWARF2_External_CompUnit;
++
++typedef struct
++{
++  unsigned long  cu_length;
++  unsigned short cu_version;
++  unsigned long  cu_abbrev_offset;
++  unsigned char  cu_pointer_size;
++}
++DWARF2_Internal_CompUnit;
++
++typedef struct
++{
++  unsigned char  ar_length	 [4];
++  unsigned char  ar_version	 [2];
++  unsigned char  ar_info_offset  [4];
++  unsigned char  ar_pointer_size [1];
++  unsigned char  ar_segment_size [1];
++}
++DWARF2_External_ARange;
++
++typedef struct
++{
++  unsigned long  ar_length;
++  unsigned short ar_version;
++  unsigned long  ar_info_offset;
++  unsigned char  ar_pointer_size;
++  unsigned char  ar_segment_size;
++}
++DWARF2_Internal_ARange;
++
++#define ENUM(name) enum name {
++#define IF_NOT_ASM(a) a
++#define COMMA ,
++#else
++#define ENUM(name)
++#define IF_NOT_ASM(a)
++#define COMMA
++
++#endif
++
++/* Tag names and codes.  */
++ENUM(dwarf_tag)
++
++    DW_TAG_padding = 0x00 COMMA
++    DW_TAG_array_type = 0x01 COMMA
++    DW_TAG_class_type = 0x02 COMMA
++    DW_TAG_entry_point = 0x03 COMMA
++    DW_TAG_enumeration_type = 0x04 COMMA
++    DW_TAG_formal_parameter = 0x05 COMMA
++    DW_TAG_imported_declaration = 0x08 COMMA
++    DW_TAG_label = 0x0a COMMA
++    DW_TAG_lexical_block = 0x0b COMMA
++    DW_TAG_member = 0x0d COMMA
++    DW_TAG_pointer_type = 0x0f COMMA
++    DW_TAG_reference_type = 0x10 COMMA
++    DW_TAG_compile_unit = 0x11 COMMA
++    DW_TAG_string_type = 0x12 COMMA
++    DW_TAG_structure_type = 0x13 COMMA
++    DW_TAG_subroutine_type = 0x15 COMMA
++    DW_TAG_typedef = 0x16 COMMA
++    DW_TAG_union_type = 0x17 COMMA
++    DW_TAG_unspecified_parameters = 0x18 COMMA
++    DW_TAG_variant = 0x19 COMMA
++    DW_TAG_common_block = 0x1a COMMA
++    DW_TAG_common_inclusion = 0x1b COMMA
++    DW_TAG_inheritance = 0x1c COMMA
++    DW_TAG_inlined_subroutine = 0x1d COMMA
++    DW_TAG_module = 0x1e COMMA
++    DW_TAG_ptr_to_member_type = 0x1f COMMA
++    DW_TAG_set_type = 0x20 COMMA
++    DW_TAG_subrange_type = 0x21 COMMA
++    DW_TAG_with_stmt = 0x22 COMMA
++    DW_TAG_access_declaration = 0x23 COMMA
++    DW_TAG_base_type = 0x24 COMMA
++    DW_TAG_catch_block = 0x25 COMMA
++    DW_TAG_const_type = 0x26 COMMA
++    DW_TAG_constant = 0x27 COMMA
++    DW_TAG_enumerator = 0x28 COMMA
++    DW_TAG_file_type = 0x29 COMMA
++    DW_TAG_friend = 0x2a COMMA
++    DW_TAG_namelist = 0x2b COMMA
++    DW_TAG_namelist_item = 0x2c COMMA
++    DW_TAG_packed_type = 0x2d COMMA
++    DW_TAG_subprogram = 0x2e COMMA
++    DW_TAG_template_type_param = 0x2f COMMA
++    DW_TAG_template_value_param = 0x30 COMMA
++    DW_TAG_thrown_type = 0x31 COMMA
++    DW_TAG_try_block = 0x32 COMMA
++    DW_TAG_variant_part = 0x33 COMMA
++    DW_TAG_variable = 0x34 COMMA
++    DW_TAG_volatile_type = 0x35 COMMA
++    /* DWARF 3.  */
++    DW_TAG_dwarf_procedure = 0x36 COMMA
++    DW_TAG_restrict_type = 0x37 COMMA
++    DW_TAG_interface_type = 0x38 COMMA
++    DW_TAG_namespace = 0x39 COMMA
++    DW_TAG_imported_module = 0x3a COMMA
++    DW_TAG_unspecified_type = 0x3b COMMA
++    DW_TAG_partial_unit = 0x3c COMMA
++    DW_TAG_imported_unit = 0x3d COMMA
++    /* SGI/MIPS Extensions.  */
++    DW_TAG_MIPS_loop = 0x4081 COMMA
++    /* GNU extensions.	*/
++    DW_TAG_format_label = 0x4101 COMMA	/* For FORTRAN 77 and Fortran 90.  */
++    DW_TAG_function_template = 0x4102 COMMA	/* For C++.  */
++    DW_TAG_class_template = 0x4103 COMMA	/* For C++.  */
++    DW_TAG_GNU_BINCL = 0x4104 COMMA
++    DW_TAG_GNU_EINCL = 0x4105 COMMA
++    /* Extensions for UPC.  See: http://upc.gwu.edu/~upc.  */
++    DW_TAG_upc_shared_type = 0x8765 COMMA
++    DW_TAG_upc_strict_type = 0x8766 COMMA
++    DW_TAG_upc_relaxed_type = 0x8767
++IF_NOT_ASM(};)
++
++#define DW_TAG_lo_user	0x4080
++#define DW_TAG_hi_user	0xffff
++
++/* Flag that tells whether entry has a child or not.  */
++#define DW_children_no	 0
++#define	DW_children_yes  1
++
++/* Form names and codes.  */
++ENUM(dwarf_form)
++
++    DW_FORM_addr = 0x01 COMMA
++    DW_FORM_block2 = 0x03 COMMA
++    DW_FORM_block4 = 0x04 COMMA
++    DW_FORM_data2 = 0x05 COMMA
++    DW_FORM_data4 = 0x06 COMMA
++    DW_FORM_data8 = 0x07 COMMA
++    DW_FORM_string = 0x08 COMMA
++    DW_FORM_block = 0x09 COMMA
++    DW_FORM_block1 = 0x0a COMMA
++    DW_FORM_data1 = 0x0b COMMA
++    DW_FORM_flag = 0x0c COMMA
++    DW_FORM_sdata = 0x0d COMMA
++    DW_FORM_strp = 0x0e COMMA
++    DW_FORM_udata = 0x0f COMMA
++    DW_FORM_ref_addr = 0x10 COMMA
++    DW_FORM_ref1 = 0x11 COMMA
++    DW_FORM_ref2 = 0x12 COMMA
++    DW_FORM_ref4 = 0x13 COMMA
++    DW_FORM_ref8 = 0x14 COMMA
++    DW_FORM_ref_udata = 0x15 COMMA
++    DW_FORM_indirect = 0x16
++IF_NOT_ASM(};)
++
++/* Attribute names and codes.  */
++
++ENUM(dwarf_attribute)
++
++    DW_AT_sibling = 0x01 COMMA
++    DW_AT_location = 0x02 COMMA
++    DW_AT_name = 0x03 COMMA
++    DW_AT_ordering = 0x09 COMMA
++    DW_AT_subscr_data = 0x0a COMMA
++    DW_AT_byte_size = 0x0b COMMA
++    DW_AT_bit_offset = 0x0c COMMA
++    DW_AT_bit_size = 0x0d COMMA
++    DW_AT_element_list = 0x0f COMMA
++    DW_AT_stmt_list = 0x10 COMMA
++    DW_AT_low_pc = 0x11 COMMA
++    DW_AT_high_pc = 0x12 COMMA
++    DW_AT_language = 0x13 COMMA
++    DW_AT_member = 0x14 COMMA
++    DW_AT_discr = 0x15 COMMA
++    DW_AT_discr_value = 0x16 COMMA
++    DW_AT_visibility = 0x17 COMMA
++    DW_AT_import = 0x18 COMMA
++    DW_AT_string_length = 0x19 COMMA
++    DW_AT_common_reference = 0x1a COMMA
++    DW_AT_comp_dir = 0x1b COMMA
++    DW_AT_const_value = 0x1c COMMA
++    DW_AT_containing_type = 0x1d COMMA
++    DW_AT_default_value = 0x1e COMMA
++    DW_AT_inline = 0x20 COMMA
++    DW_AT_is_optional = 0x21 COMMA
++    DW_AT_lower_bound = 0x22 COMMA
++    DW_AT_producer = 0x25 COMMA
++    DW_AT_prototyped = 0x27 COMMA
++    DW_AT_return_addr = 0x2a COMMA
++    DW_AT_start_scope = 0x2c COMMA
++    DW_AT_stride_size = 0x2e COMMA
++    DW_AT_upper_bound = 0x2f COMMA
++    DW_AT_abstract_origin = 0x31 COMMA
++    DW_AT_accessibility = 0x32 COMMA
++    DW_AT_address_class = 0x33 COMMA
++    DW_AT_artificial = 0x34 COMMA
++    DW_AT_base_types = 0x35 COMMA
++    DW_AT_calling_convention = 0x36 COMMA
++    DW_AT_count = 0x37 COMMA
++    DW_AT_data_member_location = 0x38 COMMA
++    DW_AT_decl_column = 0x39 COMMA
++    DW_AT_decl_file = 0x3a COMMA
++    DW_AT_decl_line = 0x3b COMMA
++    DW_AT_declaration = 0x3c COMMA
++    DW_AT_discr_list = 0x3d COMMA
++    DW_AT_encoding = 0x3e COMMA
++    DW_AT_external = 0x3f COMMA
++    DW_AT_frame_base = 0x40 COMMA
++    DW_AT_friend = 0x41 COMMA
++    DW_AT_identifier_case = 0x42 COMMA
++    DW_AT_macro_info = 0x43 COMMA
++    DW_AT_namelist_items = 0x44 COMMA
++    DW_AT_priority = 0x45 COMMA
++    DW_AT_segment = 0x46 COMMA
++    DW_AT_specification = 0x47 COMMA
++    DW_AT_static_link = 0x48 COMMA
++    DW_AT_type = 0x49 COMMA
++    DW_AT_use_location = 0x4a COMMA
++    DW_AT_variable_parameter = 0x4b COMMA
++    DW_AT_virtuality = 0x4c COMMA
++    DW_AT_vtable_elem_location = 0x4d COMMA
++    /* DWARF 3 values.	*/
++    DW_AT_allocated	= 0x4e COMMA
++    DW_AT_associated	= 0x4f COMMA
++    DW_AT_data_location = 0x50 COMMA
++    DW_AT_stride	= 0x51 COMMA
++    DW_AT_entry_pc	= 0x52 COMMA
++    DW_AT_use_UTF8	= 0x53 COMMA
++    DW_AT_extension	= 0x54 COMMA
++    DW_AT_ranges	= 0x55 COMMA
++    DW_AT_trampoline	= 0x56 COMMA
++    DW_AT_call_column	= 0x57 COMMA
++    DW_AT_call_file	= 0x58 COMMA
++    DW_AT_call_line	= 0x59 COMMA
++    /* SGI/MIPS extensions.  */
++    DW_AT_MIPS_fde = 0x2001 COMMA
++    DW_AT_MIPS_loop_begin = 0x2002 COMMA
++    DW_AT_MIPS_tail_loop_begin = 0x2003 COMMA
++    DW_AT_MIPS_epilog_begin = 0x2004 COMMA
++    DW_AT_MIPS_loop_unroll_factor = 0x2005 COMMA
++    DW_AT_MIPS_software_pipeline_depth = 0x2006 COMMA
++    DW_AT_MIPS_linkage_name = 0x2007 COMMA
++    DW_AT_MIPS_stride = 0x2008 COMMA
++    DW_AT_MIPS_abstract_name = 0x2009 COMMA
++    DW_AT_MIPS_clone_origin = 0x200a COMMA
++    DW_AT_MIPS_has_inlines = 0x200b COMMA
++    /* GNU extensions.	*/
++    DW_AT_sf_names   = 0x2101 COMMA
++    DW_AT_src_info   = 0x2102 COMMA
++    DW_AT_mac_info   = 0x2103 COMMA
++    DW_AT_src_coords = 0x2104 COMMA
++    DW_AT_body_begin = 0x2105 COMMA
++    DW_AT_body_end   = 0x2106 COMMA
++    DW_AT_GNU_vector = 0x2107 COMMA
++    /* VMS extensions.	*/
++    DW_AT_VMS_rtnbeg_pd_address = 0x2201 COMMA
++    /* UPC extension.  */
++    DW_AT_upc_threads_scaled = 0x3210
++IF_NOT_ASM(};)
++
++#define DW_AT_lo_user	0x2000	/* Implementation-defined range start.	*/
++#define DW_AT_hi_user	0x3ff0	/* Implementation-defined range end.  */
++
++/* Location atom names and codes.  */
++ENUM(dwarf_location_atom)
++
++    DW_OP_addr = 0x03 COMMA
++    DW_OP_deref = 0x06 COMMA
++    DW_OP_const1u = 0x08 COMMA
++    DW_OP_const1s = 0x09 COMMA
++    DW_OP_const2u = 0x0a COMMA
++    DW_OP_const2s = 0x0b COMMA
++    DW_OP_const4u = 0x0c COMMA
++    DW_OP_const4s = 0x0d COMMA
++    DW_OP_const8u = 0x0e COMMA
++    DW_OP_const8s = 0x0f COMMA
++    DW_OP_constu = 0x10 COMMA
++    DW_OP_consts = 0x11 COMMA
++    DW_OP_dup = 0x12 COMMA
++    DW_OP_drop = 0x13 COMMA
++    DW_OP_over = 0x14 COMMA
++    DW_OP_pick = 0x15 COMMA
++    DW_OP_swap = 0x16 COMMA
++    DW_OP_rot = 0x17 COMMA
++    DW_OP_xderef = 0x18 COMMA
++    DW_OP_abs = 0x19 COMMA
++    DW_OP_and = 0x1a COMMA
++    DW_OP_div = 0x1b COMMA
++    DW_OP_minus = 0x1c COMMA
++    DW_OP_mod = 0x1d COMMA
++    DW_OP_mul = 0x1e COMMA
++    DW_OP_neg = 0x1f COMMA
++    DW_OP_not = 0x20 COMMA
++    DW_OP_or = 0x21 COMMA
++    DW_OP_plus = 0x22 COMMA
++    DW_OP_plus_uconst = 0x23 COMMA
++    DW_OP_shl = 0x24 COMMA
++    DW_OP_shr = 0x25 COMMA
++    DW_OP_shra = 0x26 COMMA
++    DW_OP_xor = 0x27 COMMA
++    DW_OP_bra = 0x28 COMMA
++    DW_OP_eq = 0x29 COMMA
++    DW_OP_ge = 0x2a COMMA
++    DW_OP_gt = 0x2b COMMA
++    DW_OP_le = 0x2c COMMA
++    DW_OP_lt = 0x2d COMMA
++    DW_OP_ne = 0x2e COMMA
++    DW_OP_skip = 0x2f COMMA
++    DW_OP_lit0 = 0x30 COMMA
++    DW_OP_lit1 = 0x31 COMMA
++    DW_OP_lit2 = 0x32 COMMA
++    DW_OP_lit3 = 0x33 COMMA
++    DW_OP_lit4 = 0x34 COMMA
++    DW_OP_lit5 = 0x35 COMMA
++    DW_OP_lit6 = 0x36 COMMA
++    DW_OP_lit7 = 0x37 COMMA
++    DW_OP_lit8 = 0x38 COMMA
++    DW_OP_lit9 = 0x39 COMMA
++    DW_OP_lit10 = 0x3a COMMA
++    DW_OP_lit11 = 0x3b COMMA
++    DW_OP_lit12 = 0x3c COMMA
++    DW_OP_lit13 = 0x3d COMMA
++    DW_OP_lit14 = 0x3e COMMA
++    DW_OP_lit15 = 0x3f COMMA
++    DW_OP_lit16 = 0x40 COMMA
++    DW_OP_lit17 = 0x41 COMMA
++    DW_OP_lit18 = 0x42 COMMA
++    DW_OP_lit19 = 0x43 COMMA
++    DW_OP_lit20 = 0x44 COMMA
++    DW_OP_lit21 = 0x45 COMMA
++    DW_OP_lit22 = 0x46 COMMA
++    DW_OP_lit23 = 0x47 COMMA
++    DW_OP_lit24 = 0x48 COMMA
++    DW_OP_lit25 = 0x49 COMMA
++    DW_OP_lit26 = 0x4a COMMA
++    DW_OP_lit27 = 0x4b COMMA
++    DW_OP_lit28 = 0x4c COMMA
++    DW_OP_lit29 = 0x4d COMMA
++    DW_OP_lit30 = 0x4e COMMA
++    DW_OP_lit31 = 0x4f COMMA
++    DW_OP_reg0 = 0x50 COMMA
++    DW_OP_reg1 = 0x51 COMMA
++    DW_OP_reg2 = 0x52 COMMA
++    DW_OP_reg3 = 0x53 COMMA
++    DW_OP_reg4 = 0x54 COMMA
++    DW_OP_reg5 = 0x55 COMMA
++    DW_OP_reg6 = 0x56 COMMA
++    DW_OP_reg7 = 0x57 COMMA
++    DW_OP_reg8 = 0x58 COMMA
++    DW_OP_reg9 = 0x59 COMMA
++    DW_OP_reg10 = 0x5a COMMA
++    DW_OP_reg11 = 0x5b COMMA
++    DW_OP_reg12 = 0x5c COMMA
++    DW_OP_reg13 = 0x5d COMMA
++    DW_OP_reg14 = 0x5e COMMA
++    DW_OP_reg15 = 0x5f COMMA
++    DW_OP_reg16 = 0x60 COMMA
++    DW_OP_reg17 = 0x61 COMMA
++    DW_OP_reg18 = 0x62 COMMA
++    DW_OP_reg19 = 0x63 COMMA
++    DW_OP_reg20 = 0x64 COMMA
++    DW_OP_reg21 = 0x65 COMMA
++    DW_OP_reg22 = 0x66 COMMA
++    DW_OP_reg23 = 0x67 COMMA
++    DW_OP_reg24 = 0x68 COMMA
++    DW_OP_reg25 = 0x69 COMMA
++    DW_OP_reg26 = 0x6a COMMA
++    DW_OP_reg27 = 0x6b COMMA
++    DW_OP_reg28 = 0x6c COMMA
++    DW_OP_reg29 = 0x6d COMMA
++    DW_OP_reg30 = 0x6e COMMA
++    DW_OP_reg31 = 0x6f COMMA
++    DW_OP_breg0 = 0x70 COMMA
++    DW_OP_breg1 = 0x71 COMMA
++    DW_OP_breg2 = 0x72 COMMA
++    DW_OP_breg3 = 0x73 COMMA
++    DW_OP_breg4 = 0x74 COMMA
++    DW_OP_breg5 = 0x75 COMMA
++    DW_OP_breg6 = 0x76 COMMA
++    DW_OP_breg7 = 0x77 COMMA
++    DW_OP_breg8 = 0x78 COMMA
++    DW_OP_breg9 = 0x79 COMMA
++    DW_OP_breg10 = 0x7a COMMA
++    DW_OP_breg11 = 0x7b COMMA
++    DW_OP_breg12 = 0x7c COMMA
++    DW_OP_breg13 = 0x7d COMMA
++    DW_OP_breg14 = 0x7e COMMA
++    DW_OP_breg15 = 0x7f COMMA
++    DW_OP_breg16 = 0x80 COMMA
++    DW_OP_breg17 = 0x81 COMMA
++    DW_OP_breg18 = 0x82 COMMA
++    DW_OP_breg19 = 0x83 COMMA
++    DW_OP_breg20 = 0x84 COMMA
++    DW_OP_breg21 = 0x85 COMMA
++    DW_OP_breg22 = 0x86 COMMA
++    DW_OP_breg23 = 0x87 COMMA
++    DW_OP_breg24 = 0x88 COMMA
++    DW_OP_breg25 = 0x89 COMMA
++    DW_OP_breg26 = 0x8a COMMA
++    DW_OP_breg27 = 0x8b COMMA
++    DW_OP_breg28 = 0x8c COMMA
++    DW_OP_breg29 = 0x8d COMMA
++    DW_OP_breg30 = 0x8e COMMA
++    DW_OP_breg31 = 0x8f COMMA
++    DW_OP_regx = 0x90 COMMA
++    DW_OP_fbreg = 0x91 COMMA
++    DW_OP_bregx = 0x92 COMMA
++    DW_OP_piece = 0x93 COMMA
++    DW_OP_deref_size = 0x94 COMMA
++    DW_OP_xderef_size = 0x95 COMMA
++    DW_OP_nop = 0x96 COMMA
++    /* DWARF 3 extensions.  */
++    DW_OP_push_object_address = 0x97 COMMA
++    DW_OP_call2 = 0x98 COMMA
++    DW_OP_call4 = 0x99 COMMA
++    DW_OP_call_ref = 0x9a COMMA
++    /* GNU extensions.	*/
++    DW_OP_GNU_push_tls_address = 0xe0
++IF_NOT_ASM(};)
++
++#define DW_OP_lo_user	0xe0	/* Implementation-defined range start.	*/
++#define DW_OP_hi_user	0xff	/* Implementation-defined range end.  */
++
++/* Type encodings.  */
++ENUM(dwarf_type)
++
++    DW_ATE_void = 0x0 COMMA
++    DW_ATE_address = 0x1 COMMA
++    DW_ATE_boolean = 0x2 COMMA
++    DW_ATE_complex_float = 0x3 COMMA
++    DW_ATE_float = 0x4 COMMA
++    DW_ATE_signed = 0x5 COMMA
++    DW_ATE_signed_char = 0x6 COMMA
++    DW_ATE_unsigned = 0x7 COMMA
++    DW_ATE_unsigned_char = 0x8 COMMA
++    /* DWARF 3.  */
++    DW_ATE_imaginary_float = 0x9
++IF_NOT_ASM(};)
++
++#define	DW_ATE_lo_user 0x80
++#define	DW_ATE_hi_user 0xff
++
++/* Array ordering names and codes.  */
++ENUM(dwarf_array_dim_ordering)
++
++    DW_ORD_row_major = 0 COMMA
++    DW_ORD_col_major = 1
++IF_NOT_ASM(};)
++
++/* Access attribute.  */
++ENUM(dwarf_access_attribute)
++
++    DW_ACCESS_public = 1 COMMA
++    DW_ACCESS_protected = 2 COMMA
++    DW_ACCESS_private = 3
++IF_NOT_ASM(};)
++
++/* Visibility.	*/
++ENUM(dwarf_visibility_attribute)
++
++    DW_VIS_local = 1 COMMA
++    DW_VIS_exported = 2 COMMA
++    DW_VIS_qualified = 3
++IF_NOT_ASM(};)
++
++/* Virtuality.	*/
++ENUM(dwarf_virtuality_attribute)
++
++    DW_VIRTUALITY_none = 0 COMMA
++    DW_VIRTUALITY_virtual = 1 COMMA
++    DW_VIRTUALITY_pure_virtual = 2
++IF_NOT_ASM(};)
++
++/* Case sensitivity.  */
++ENUM(dwarf_id_case)
++
++    DW_ID_case_sensitive = 0 COMMA
++    DW_ID_up_case = 1 COMMA
++    DW_ID_down_case = 2 COMMA
++    DW_ID_case_insensitive = 3
++IF_NOT_ASM(};)
++
++/* Calling convention.	*/
++ENUM(dwarf_calling_convention)
++
++    DW_CC_normal = 0x1 COMMA
++    DW_CC_program = 0x2 COMMA
++    DW_CC_nocall = 0x3
++IF_NOT_ASM(};)
++
++#define DW_CC_lo_user 0x40
++#define DW_CC_hi_user 0xff
++
++/* Inline attribute.  */
++ENUM(dwarf_inline_attribute)
++
++    DW_INL_not_inlined = 0 COMMA
++    DW_INL_inlined = 1 COMMA
++    DW_INL_declared_not_inlined = 2 COMMA
++    DW_INL_declared_inlined = 3
++IF_NOT_ASM(};)
++
++/* Discriminant lists.	*/
++ENUM(dwarf_discrim_list)
++
++    DW_DSC_label = 0 COMMA
++    DW_DSC_range = 1
++IF_NOT_ASM(};)
++
++/* Line number opcodes.  */
++ENUM(dwarf_line_number_ops)
++
++    DW_LNS_extended_op = 0 COMMA
++    DW_LNS_copy = 1 COMMA
++    DW_LNS_advance_pc = 2 COMMA
++    DW_LNS_advance_line = 3 COMMA
++    DW_LNS_set_file = 4 COMMA
++    DW_LNS_set_column = 5 COMMA
++    DW_LNS_negate_stmt = 6 COMMA
++    DW_LNS_set_basic_block = 7 COMMA
++    DW_LNS_const_add_pc = 8 COMMA
++    DW_LNS_fixed_advance_pc = 9 COMMA
++    /* DWARF 3.  */
++    DW_LNS_set_prologue_end = 10 COMMA
++    DW_LNS_set_epilogue_begin = 11 COMMA
++    DW_LNS_set_isa = 12
++IF_NOT_ASM(};)
++
++/* Line number extended opcodes.  */
++ENUM(dwarf_line_number_x_ops)
++
++    DW_LNE_end_sequence = 1 COMMA
++    DW_LNE_set_address = 2 COMMA
++    DW_LNE_define_file = 3
++IF_NOT_ASM(};)
++
++/* Call frame information.  */
++ENUM(dwarf_call_frame_info)
++
++    DW_CFA_advance_loc = 0x40 COMMA
++    DW_CFA_offset = 0x80 COMMA
++    DW_CFA_restore = 0xc0 COMMA
++    DW_CFA_nop = 0x00 COMMA
++    DW_CFA_set_loc = 0x01 COMMA
++    DW_CFA_advance_loc1 = 0x02 COMMA
++    DW_CFA_advance_loc2 = 0x03 COMMA
++    DW_CFA_advance_loc4 = 0x04 COMMA
++    DW_CFA_offset_extended = 0x05 COMMA
++    DW_CFA_restore_extended = 0x06 COMMA
++    DW_CFA_undefined = 0x07 COMMA
++    DW_CFA_same_value = 0x08 COMMA
++    DW_CFA_register = 0x09 COMMA
++    DW_CFA_remember_state = 0x0a COMMA
++    DW_CFA_restore_state = 0x0b COMMA
++    DW_CFA_def_cfa = 0x0c COMMA
++    DW_CFA_def_cfa_register = 0x0d COMMA
++    DW_CFA_def_cfa_offset = 0x0e COMMA
++
++    /* DWARF 3.  */
++    DW_CFA_def_cfa_expression = 0x0f COMMA
++    DW_CFA_expression = 0x10 COMMA
++    DW_CFA_offset_extended_sf = 0x11 COMMA
++    DW_CFA_def_cfa_sf = 0x12 COMMA
++    DW_CFA_def_cfa_offset_sf = 0x13 COMMA
++
++    /* SGI/MIPS specific.  */
++    DW_CFA_MIPS_advance_loc8 = 0x1d COMMA
++
++    /* GNU extensions.	*/
++    DW_CFA_GNU_window_save = 0x2d COMMA
++    DW_CFA_GNU_args_size = 0x2e COMMA
++    DW_CFA_GNU_negative_offset_extended = 0x2f
++IF_NOT_ASM(};)
++
++#define DW_CIE_ID	  0xffffffff
++#define DW_CIE_VERSION	  1
++
++#define DW_CFA_extended   0
++#define DW_CFA_lo_user	  0x1c
++#define DW_CFA_hi_user	  0x3f
++
++#define DW_CHILDREN_no		     0x00
++#define DW_CHILDREN_yes		     0x01
++
++#define DW_ADDR_none		0
++
++/* Source language names and codes.  */
++ENUM(dwarf_source_language)
++
++    DW_LANG_C89 = 0x0001 COMMA
++    DW_LANG_C = 0x0002 COMMA
++    DW_LANG_Ada83 = 0x0003 COMMA
++    DW_LANG_C_plus_plus = 0x0004 COMMA
++    DW_LANG_Cobol74 = 0x0005 COMMA
++    DW_LANG_Cobol85 = 0x0006 COMMA
++    DW_LANG_Fortran77 = 0x0007 COMMA
++    DW_LANG_Fortran90 = 0x0008 COMMA
++    DW_LANG_Pascal83 = 0x0009 COMMA
++    DW_LANG_Modula2 = 0x000a COMMA
++    DW_LANG_Java = 0x000b COMMA
++    /* DWARF 3.  */
++    DW_LANG_C99 = 0x000c COMMA
++    DW_LANG_Ada95 = 0x000d COMMA
++    DW_LANG_Fortran95 = 0x000e COMMA
++    /* MIPS.  */
++    DW_LANG_Mips_Assembler = 0x8001 COMMA
++    /* UPC.  */
++    DW_LANG_Upc = 0x8765
++IF_NOT_ASM(};)
++
++#define DW_LANG_lo_user 0x8000	/* Implementation-defined range start.	*/
++#define DW_LANG_hi_user 0xffff	/* Implementation-defined range start.	*/
++
++/* Names and codes for macro information.  */
++ENUM(dwarf_macinfo_record_type)
++
++    DW_MACINFO_define = 1 COMMA
++    DW_MACINFO_undef = 2 COMMA
++    DW_MACINFO_start_file = 3 COMMA
++    DW_MACINFO_end_file = 4 COMMA
++    DW_MACINFO_vendor_ext = 255
++IF_NOT_ASM(};)
++
++/* @@@ For use with GNU frame unwind information.  */
++
++#define DW_EH_PE_absptr		0x00
++#define DW_EH_PE_omit		0xff
++
++#define DW_EH_PE_uleb128	0x01
++#define DW_EH_PE_udata2		0x02
++#define DW_EH_PE_udata4		0x03
++#define DW_EH_PE_udata8		0x04
++#define DW_EH_PE_sleb128	0x09
++#define DW_EH_PE_sdata2		0x0A
++#define DW_EH_PE_sdata4		0x0B
++#define DW_EH_PE_sdata8		0x0C
++#define DW_EH_PE_signed		0x08
++
++#define DW_EH_PE_pcrel		0x10
++#define DW_EH_PE_textrel	0x20
++#define DW_EH_PE_datarel	0x30
++#define DW_EH_PE_funcrel	0x40
++#define DW_EH_PE_aligned	0x50
++
++#define DW_EH_PE_indirect	0x80
++
++#endif /* _ELF_DWARF2_H */
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/linux/dwarf2-lang.h	2003-12-28 23:21:07.000000000 -0800
+@@ -0,0 +1,132 @@
++#ifndef DWARF2_LANG
++#define DWARF2_LANG
++#include <linux/dwarf2.h>
++
++/*
++ * This is free software; you can redistribute it and/or modify it under
++ * the terms of the GNU General Public License as published by the Free
++ * Software Foundation; either version 2, or (at your option) any later
++ * version.
++ */
++/*
++ * This file defines macros that allow generation of DWARF debug records
++ * for asm files.  This file is platform independent.  Register numbers
++ * (which are about the only thing that is platform dependent) are to be
++ * supplied by a platform defined file.
++ */
++#define DWARF_preamble()	.section	.debug_frame,"",@progbits
++/*
++ * This macro starts a debug frame section.  The debug_frame describes
++ * where to find the registers that the enclosing function saved on
++ * entry.
++ *
++ * ORD is use by the label generator and should be the same as what is
++ * passed to CFI_postamble.
++ *
++ * pc,	pc register gdb ordinal.
++ *
++ * code_align this is the factor used to define locations or regions
++ * where the given definitions apply.  If you use labels to define these
++ * this should be 1.
++ *
++ * data_align this is the factor used to define register offsets.  If
++ * you use struct offset, this should be the size of the register in
++ * bytes or the negative of that.  This is how it is used: you will
++ * define a register as the reference register, say the stack pointer,
++ * then you will say where a register is located relative to this
++ * reference registers value, say 40 for register 3 (the gdb register
++ * number).  The <40> will be multiplied by <data_align> to define the
++ * byte offset of the given register (3, in this example).  So if your
++ * <40> is the byte offset and the reference register points at the
++ * begining, you would want 1 for the data_offset.  If <40> was the 40th
++ * 4-byte element in that structure you would want 4.  And if your
++ * reference register points at the end of the structure you would want
++ * a negative data_align value(and you would have to do other math as
++ * well).
++ */
++
++#define CFI_preamble(ORD, pc, code_align, data_align)	\
++.section	.debug_frame,"",@progbits ;		\
++frame/**/_/**/ORD:						\
++	.long end/**/_/**/ORD-start/**/_/**/ORD;			\
++start/**/_/**/ORD:						\
++	.long	DW_CIE_ID;				\
++	.byte	DW_CIE_VERSION;			\
++	.byte 0	 ;				\
++	.uleb128 code_align;				\
++	.sleb128 data_align;				\
++	.byte pc;
++
++/*
++ * After the above macro and prior to the CFI_postamble, you need to
++ * define the initial state.  This starts with defining the reference
++ * register and, usually the pc.  Here are some helper macros:
++ */
++
++#define CFA_define_reference(reg, offset)	\
++	.byte DW_CFA_def_cfa;			\
++	.uleb128 reg;				\
++	.uleb128 (offset);
++
++#define CFA_define_offset(reg, offset)		\
++	.byte (DW_CFA_offset + reg);		\
++	.uleb128 (offset);
++
++#define CFI_postamble(ORD)			\
++	.align 4;				\
++end/**/_/**/ORD:
++/*
++ * So now your code pushs stuff on the stack, you need a new location
++ * and the rules for what to do.  This starts a running description of
++ * the call frame.  You need to describe what changes with respect to
++ * the call registers as the location of the pc moves through the code.
++ * The following builds an FDE (fram descriptor entry?).  Like the
++ * above, it has a preamble and a postamble.  It also is tied to the CFI
++ * above.
++ * The first entry after the preamble must be the location in the code
++ * that the call frame is being described for.
++ */
++#define FDE_preamble(ORD, fde_no, initial_address, length)	\
++	.long FDE_end/**/_/**/fde_no-FDE_start/**/_/**/fde_no;		\
++FDE_start/**/_/**/fde_no:						\
++	.long frame/**/_/**/ORD;					\
++	.long initial_address;					\
++	.long length;
++
++#define FDE_postamble(fde_no)			\
++	.align 4;				\
++FDE_end/**/_/**/fde_no:
++/*
++ * That done, you can now add registers, subtract registers, move the
++ * reference and even change the reference.  You can also define a new
++ * area of code the info applies to.  For discontinuous bits you should
++ * start a new FDE.  You may have as many as you like.
++ */
++
++/*
++ * To advance the address by <bytes>
++ */
++
++#define FDE_advance(bytes)			\
++	.byte DW_CFA_advance_loc4		\
++	.long bytes
++
++
++
++/*
++ * With the above you can define all the register locations.  But
++ * suppose the reference register moves... Takes the new offset NOT an
++ * increment.  This is how esp is tracked if it is not saved.
++ */
++
++#define CFA_define_cfa_offset(offset) \
++	.byte $DW_CFA_def_cfa_offset; \
++	.uleb128 (offset);
++/*
++ * Or suppose you want to use a different reference register...
++ */
++#define CFA_define_cfa_register(reg)		\
++	.byte DW_CFA_def_cfa_register;		\
++	.uleb128 reg;
++
++#endif
+--- linux-2.6.0/include/linux/efi.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/linux/efi.h	2003-12-28 23:21:45.000000000 -0800
+@@ -16,6 +16,8 @@
+ #include <linux/time.h>
+ #include <linux/types.h>
+ #include <linux/proc_fs.h>
++#include <linux/rtc.h>
++#include <linux/ioport.h>
+ 
+ #include <asm/page.h>
+ #include <asm/system.h>
+@@ -77,18 +79,23 @@ typedef	struct {
+ #define EFI_MAX_MEMORY_TYPE		14
+ 
+ /* Attribute values: */
+-#define EFI_MEMORY_UC		0x0000000000000001	/* uncached */
+-#define EFI_MEMORY_WC		0x0000000000000002	/* write-coalescing */
+-#define EFI_MEMORY_WT		0x0000000000000004	/* write-through */
+-#define EFI_MEMORY_WB		0x0000000000000008	/* write-back */
+-#define EFI_MEMORY_WP		0x0000000000001000	/* write-protect */
+-#define EFI_MEMORY_RP		0x0000000000002000	/* read-protect */
+-#define EFI_MEMORY_XP		0x0000000000004000	/* execute-protect */
+-#define EFI_MEMORY_RUNTIME	0x8000000000000000	/* range requires runtime mapping */
++#define EFI_MEMORY_UC		((u64)0x0000000000000001ULL)	/* uncached */
++#define EFI_MEMORY_WC		((u64)0x0000000000000002ULL)	/* write-coalescing */
++#define EFI_MEMORY_WT		((u64)0x0000000000000004ULL)	/* write-through */
++#define EFI_MEMORY_WB		((u64)0x0000000000000008ULL)	/* write-back */
++#define EFI_MEMORY_WP		((u64)0x0000000000001000ULL)	/* write-protect */
++#define EFI_MEMORY_RP		((u64)0x0000000000002000ULL)	/* read-protect */
++#define EFI_MEMORY_XP		((u64)0x0000000000004000ULL)	/* execute-protect */
++#define EFI_MEMORY_RUNTIME	((u64)0x8000000000000000ULL)	/* range requires runtime mapping */
+ #define EFI_MEMORY_DESCRIPTOR_VERSION	1
+ 
+ #define EFI_PAGE_SHIFT		12
+ 
++/*
++ * For current x86 implementations of EFI, there is
++ * additional padding in the mem descriptors.  This is not
++ * the case in ia64.  Need to have this fixed in the f/w.
++ */
+ typedef struct {
+ 	u32 type;
+ 	u32 pad;
+@@ -96,6 +103,9 @@ typedef struct {
+ 	u64 virt_addr;
+ 	u64 num_pages;
+ 	u64 attribute;
++#if defined (__i386__)
++	u64 pad1;
++#endif
+ } efi_memory_desc_t;
+ 
+ typedef int efi_freemem_callback_t (unsigned long start, unsigned long end, void *arg);
+@@ -132,11 +142,12 @@ typedef struct {
+  */
+ #define EFI_RESET_COLD 0
+ #define EFI_RESET_WARM 1
++#define EFI_RESET_SHUTDOWN 2
+ 
+ /*
+  * EFI Runtime Services table
+  */
+-#define EFI_RUNTIME_SERVICES_SIGNATURE 0x5652453544e5552
++#define EFI_RUNTIME_SERVICES_SIGNATURE ((u64)0x5652453544e5552ULL)
+ #define EFI_RUNTIME_SERVICES_REVISION  0x00010000
+ 
+ typedef struct {
+@@ -169,6 +180,10 @@ typedef efi_status_t efi_set_variable_t 
+ typedef efi_status_t efi_get_next_high_mono_count_t (u32 *count);
+ typedef void efi_reset_system_t (int reset_type, efi_status_t status,
+ 				 unsigned long data_size, efi_char16_t *data);
++typedef efi_status_t efi_set_virtual_address_map_t (unsigned long memory_map_size,
++						unsigned long descriptor_size,
++						u32 descriptor_version,
++						efi_memory_desc_t *virtual_map);
+ 
+ /*
+  *  EFI Configuration Table and GUID definitions
+@@ -194,12 +209,15 @@ typedef void efi_reset_system_t (int res
+ #define HCDP_TABLE_GUID	\
+     EFI_GUID(  0xf951938d, 0x620b, 0x42ef, 0x82, 0x79, 0xa8, 0x4b, 0x79, 0x61, 0x78, 0x98 )
+ 
++#define UGA_IO_PROTOCOL_GUID \
++    EFI_GUID(  0x61a4d49e, 0x6f68, 0x4f1b, 0xb9, 0x22, 0xa8, 0x6e, 0xed, 0xb, 0x7, 0xa2 )
++
+ typedef struct {
+ 	efi_guid_t guid;
+ 	unsigned long table;
+ } efi_config_table_t;
+ 
+-#define EFI_SYSTEM_TABLE_SIGNATURE 0x5453595320494249
++#define EFI_SYSTEM_TABLE_SIGNATURE ((u64)0x5453595320494249ULL)
+ #define EFI_SYSTEM_TABLE_REVISION  ((1 << 16) | 00)
+ 
+ typedef struct {
+@@ -218,6 +236,13 @@ typedef struct {
+ 	unsigned long tables;
+ } efi_system_table_t;
+ 
++struct efi_memory_map {
++	efi_memory_desc_t *phys_map;
++	efi_memory_desc_t *map;
++	int nr_map;
++	unsigned long desc_version;
++};
++
+ /*
+  * All runtime access to EFI goes through this structure:
+  */
+@@ -230,6 +255,7 @@ extern struct efi {
+ 	void *sal_systab;		/* SAL system table */
+ 	void *boot_info;		/* boot info table */
+ 	void *hcdp;			/* HCDP table */
++	void *uga;			/* UGA table */
+ 	efi_get_time_t *get_time;
+ 	efi_set_time_t *set_time;
+ 	efi_get_wakeup_time_t *get_wakeup_time;
+@@ -239,6 +265,7 @@ extern struct efi {
+ 	efi_set_variable_t *set_variable;
+ 	efi_get_next_high_mono_count_t *get_next_high_mono_count;
+ 	efi_reset_system_t *reset_system;
++	efi_set_virtual_address_map_t *set_virtual_address_map;
+ } efi;
+ 
+ static inline int
+@@ -260,12 +287,25 @@ efi_guid_unparse(efi_guid_t *guid, char 
+ 
+ extern void efi_init (void);
+ extern void efi_map_pal_code (void);
++extern void efi_map_memmap(void);
+ extern void efi_memmap_walk (efi_freemem_callback_t callback, void *arg);
+ extern void efi_gettimeofday (struct timespec *ts);
+ extern void efi_enter_virtual_mode (void);	/* switch EFI to virtual mode, if possible */
+ extern u64 efi_get_iobase (void);
+ extern u32 efi_mem_type (unsigned long phys_addr);
+ extern u64 efi_mem_attributes (unsigned long phys_addr);
++extern void efi_initialize_iomem_resources(struct resource *code_resource,
++					struct resource *data_resource);
++extern efi_status_t phys_efi_get_time(efi_time_t *tm, efi_time_cap_t *tc);
++extern unsigned long inline __init efi_get_time(void);
++extern int inline __init efi_set_rtc_mmss(unsigned long nowtime);
++extern struct efi_memory_map memmap;
++
++#ifdef CONFIG_EFI
++extern int efi_enabled;
++#else
++#define efi_enabled 0
++#endif
+ 
+ /*
+  * Variable Attributes
+--- linux-2.6.0/include/linux/elevator.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/linux/elevator.h	2003-12-28 23:21:35.000000000 -0800
+@@ -94,6 +94,11 @@ extern elevator_t iosched_deadline;
+  */
+ extern elevator_t iosched_as;
+ 
++/*
++ * completely fair queueing I/O scheduler
++ */
++extern elevator_t iosched_cfq;
++
+ extern int elevator_init(request_queue_t *, elevator_t *);
+ extern void elevator_exit(request_queue_t *);
+ extern inline int elv_rq_merge_ok(struct request *, struct bio *);
+--- linux-2.6.0/include/linux/errno.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/linux/errno.h	2003-12-28 23:26:39.000000000 -0800
+@@ -22,6 +22,7 @@
+ #define EBADTYPE	527	/* Type not supported by server */
+ #define EJUKEBOX	528	/* Request initiated, but will not complete before timeout */
+ #define EIOCBQUEUED	529	/* iocb queued, will get completion event */
++#define EIOCBRETRY	530	/* iocb queued, will trigger a retry */
+ 
+ #endif
+ 
+--- linux-2.6.0/include/linux/eventpoll.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/linux/eventpoll.h	2003-12-28 23:23:06.000000000 -0800
+@@ -22,6 +22,9 @@
+ #define EPOLL_CTL_DEL 2
+ #define EPOLL_CTL_MOD 3
+ 
++/* Set the One Shot behaviour for the target file descriptor */
++#define EPOLLONESHOT (1 << 30)
++
+ /* Set the Edge Triggered behaviour for the target file descriptor */
+ #define EPOLLET (1 << 31)
+ 
+--- linux-2.6.0/include/linux/fb.h	2003-06-14 12:18:06.000000000 -0700
++++ 25/include/linux/fb.h	2003-12-28 23:23:00.000000000 -0800
+@@ -352,6 +352,7 @@ struct fb_pixmap {
+ struct fb_info;
+ struct vm_area_struct;
+ struct file;
++struct device;
+ 
+     /*
+      *  Frame buffer operations
+@@ -412,6 +413,7 @@ struct fb_info {
+    struct vc_data *display_fg;		/* Console visible on this display */
+    int currcon;				/* Current VC. */	
+    void *pseudo_palette;                /* Fake palette of 16 colors */ 
++   struct device *dev;                  /* pointer to the device for this fb */
+    /* From here on everything is device dependent */
+    void *par;	
+ };
+--- linux-2.6.0/include/linux/fs.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/linux/fs.h	2003-12-28 23:26:42.000000000 -0800
+@@ -369,6 +369,7 @@ struct block_device {
+ struct inode {
+ 	struct hlist_node	i_hash;
+ 	struct list_head	i_list;
++	struct list_head	i_sb_list;
+ 	struct list_head	i_dentry;
+ 	unsigned long		i_ino;
+ 	atomic_t		i_count;
+@@ -388,6 +389,7 @@ struct inode {
+ 	unsigned short          i_bytes;
+ 	spinlock_t		i_lock;	/* i_blocks, i_bytes, maybe i_size */
+ 	struct semaphore	i_sem;
++	struct rw_semaphore	i_alloc_sem;
+ 	struct inode_operations	*i_op;
+ 	struct file_operations	*i_fop;	/* former ->i_op->default_file_ops */
+ 	struct super_block	*i_sb;
+@@ -480,6 +482,8 @@ static inline unsigned imajor(struct ino
+ 	return MAJOR(inode->i_rdev);
+ }
+ 
++extern struct block_device *I_BDEV(struct inode *inode);
++
+ struct fown_struct {
+ 	rwlock_t lock;          /* protects pid, uid, euid fields */
+ 	int pid;		/* pid or -pgrp where SIGIO should be sent */
+@@ -523,9 +527,12 @@ struct file {
+ 	/* needed for tty driver, and maybe others */
+ 	void			*private_data;
+ 
++#ifdef CONFIG_EPOLL
+ 	/* Used by fs/eventpoll.c to link all the hooks to this file */
+ 	struct list_head	f_ep_links;
+ 	spinlock_t		f_ep_lock;
++#endif /* #ifdef CONFIG_EPOLL */
++	struct address_space	*f_mapping;
+ };
+ extern spinlock_t files_lock;
+ #define file_list_lock() spin_lock(&files_lock);
+@@ -630,6 +637,7 @@ extern int __break_lease(struct inode *i
+ extern void lease_get_mtime(struct inode *, struct timespec *time);
+ extern int lock_may_read(struct inode *, loff_t start, unsigned long count);
+ extern int lock_may_write(struct inode *, loff_t start, unsigned long count);
++extern void steal_locks(fl_owner_t from);
+ 
+ struct fasync_struct {
+ 	int	magic;
+@@ -687,6 +695,7 @@ struct super_block {
+ 	atomic_t		s_active;
+ 	void                    *s_security;
+ 
++	struct list_head	s_inodes;	/* all inodes */
+ 	struct list_head	s_dirty;	/* dirty inodes */
+ 	struct list_head	s_io;		/* parked for writeback */
+ 	struct hlist_head	s_anon;		/* anonymous dentries for (nfs) exporting */
+@@ -749,6 +758,11 @@ extern int vfs_rename(struct inode *, st
+ #define DT_SOCK		12
+ #define DT_WHT		14
+ 
++#define OSYNC_METADATA	(1<<0)
++#define OSYNC_DATA	(1<<1)
++#define OSYNC_INODE	(1<<2)
++int generic_osync_inode(struct inode *, struct address_space *, int);
++
+ /*
+  * This is the "filldir" function type, used by readdir() to let
+  * the kernel specify what kind of dirent layout it wants to have.
+@@ -758,9 +772,9 @@ extern int vfs_rename(struct inode *, st
+ typedef int (*filldir_t)(void *, const char *, int, loff_t, ino_t, unsigned);
+ 
+ struct block_device_operations {
+-	int (*open) (struct inode *, struct file *);
+-	int (*release) (struct inode *, struct file *);
+-	int (*ioctl) (struct inode *, struct file *, unsigned, unsigned long);
++	int (*open) (struct block_device *, struct file *);
++	int (*release) (struct gendisk *);
++	int (*ioctl) (struct block_device *, struct file *, unsigned, unsigned long);
+ 	int (*media_changed) (struct gendisk *);
+ 	int (*revalidate_disk) (struct gendisk *);
+ 	struct module *owner;
+@@ -1123,11 +1137,9 @@ enum {BDEV_FILE, BDEV_SWAP, BDEV_FS, BDE
+ extern int register_blkdev(unsigned int, const char *);
+ extern int unregister_blkdev(unsigned int, const char *);
+ extern struct block_device *bdget(dev_t);
+-extern int bd_acquire(struct inode *inode);
+ extern void bd_forget(struct inode *inode);
+ extern void bdput(struct block_device *);
+ extern int blkdev_open(struct inode *, struct file *);
+-extern int blkdev_close(struct inode *, struct file *);
+ extern struct block_device *open_by_devnum(dev_t, unsigned, int);
+ extern struct file_operations def_blk_fops;
+ extern struct address_space_operations def_blk_aops;
+@@ -1135,7 +1147,7 @@ extern struct file_operations def_chr_fo
+ extern struct file_operations bad_sock_fops;
+ extern struct file_operations def_fifo_fops;
+ extern int ioctl_by_bdev(struct block_device *, unsigned, unsigned long);
+-extern int blkdev_ioctl(struct inode *, struct file *, unsigned, unsigned long);
++extern int blkdev_ioctl(struct block_device *, struct file *, unsigned, unsigned long);
+ extern int blkdev_get(struct block_device *, mode_t, unsigned, int);
+ extern int blkdev_put(struct block_device *, int);
+ extern int bd_claim(struct block_device *, void *);
+@@ -1202,6 +1214,7 @@ extern void write_inode_now(struct inode
+ extern int filemap_fdatawrite(struct address_space *);
+ extern int filemap_flush(struct address_space *);
+ extern int filemap_fdatawait(struct address_space *);
++extern int filemap_write_and_wait(struct address_space *mapping);
+ extern void sync_supers(void);
+ extern void sync_filesystems(int wait);
+ extern void emergency_sync(void);
+@@ -1295,8 +1308,7 @@ extern int generic_file_readonly_mmap(st
+ extern int file_read_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size);
+ extern int file_send_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size);
+ extern ssize_t generic_file_read(struct file *, char __user *, size_t, loff_t *);
+-int generic_write_checks(struct inode *inode, struct file *file,
+-			loff_t *pos, size_t *count, int isblk);
++int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk);
+ extern ssize_t generic_file_write(struct file *, const char __user *, size_t, loff_t *);
+ extern ssize_t generic_file_aio_read(struct kiocb *, char __user *, size_t, loff_t);
+ extern ssize_t __generic_file_aio_read(struct kiocb *, const struct iovec *, unsigned long, loff_t *);
+@@ -1314,9 +1326,6 @@ extern void
+ file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping);
+ extern ssize_t generic_file_direct_IO(int rw, struct kiocb *iocb,
+ 	const struct iovec *iov, loff_t offset, unsigned long nr_segs);
+-extern int blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode, 
+-	struct block_device *bdev, const struct iovec *iov, loff_t offset, 
+-	unsigned long nr_segs, get_blocks_t *get_blocks, dio_iodone_t *end_io);
+ extern ssize_t generic_file_readv(struct file *filp, const struct iovec *iov, 
+ 	unsigned long nr_segs, loff_t *ppos);
+ ssize_t generic_file_writev(struct file *filp, const struct iovec *iov, 
+@@ -1330,7 +1339,7 @@ static inline void do_generic_file_read(
+ 					read_descriptor_t * desc,
+ 					read_actor_t actor)
+ {
+-	do_generic_mapping_read(filp->f_dentry->d_inode->i_mapping,
++	do_generic_mapping_read(filp->f_mapping,
+ 				&filp->f_ra,
+ 				filp,
+ 				ppos,
+@@ -1338,6 +1347,32 @@ static inline void do_generic_file_read(
+ 				actor);
+ }
+ 
++int __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
++	struct block_device *bdev, const struct iovec *iov, loff_t offset,
++	unsigned long nr_segs, get_blocks_t get_blocks, dio_iodone_t end_io,
++	int needs_special_locking);
++
++/*
++ * For filesystems which need locking between buffered and direct access
++ */
++static inline int blockdev_direct_IO(int rw, struct kiocb *iocb,
++	struct inode *inode, struct block_device *bdev, const struct iovec *iov,
++	loff_t offset, unsigned long nr_segs, get_blocks_t get_blocks,
++	dio_iodone_t end_io)
++{
++	return __blockdev_direct_IO(rw, iocb, inode, bdev, iov, offset,
++				nr_segs, get_blocks, end_io, 1);
++}
++
++static inline int blockdev_direct_IO_no_locking(int rw, struct kiocb *iocb,
++	struct inode *inode, struct block_device *bdev, const struct iovec *iov,
++	loff_t offset, unsigned long nr_segs, get_blocks_t get_blocks,
++	dio_iodone_t end_io)
++{
++	return __blockdev_direct_IO(rw, iocb, inode, bdev, iov, offset,
++				nr_segs, get_blocks, end_io, 0);
++}
++
+ extern struct file_operations generic_ro_fops;
+ 
+ #define special_file(m) (S_ISCHR(m)||S_ISBLK(m)||S_ISFIFO(m)||S_ISSOCK(m))
+@@ -1408,5 +1443,8 @@ static inline ino_t parent_ino(struct de
+ 	return res;
+ }
+ 
++/* kernel/fork.c */
++extern int unshare_files(void);
++
+ #endif /* __KERNEL__ */
+ #endif /* _LINUX_FS_H */
+--- linux-2.6.0/include/linux/hugetlb.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/linux/hugetlb.h	2003-12-28 23:22:58.000000000 -0800
+@@ -39,6 +39,7 @@ mark_mm_hugetlb(struct mm_struct *mm, st
+ 
+ #ifndef ARCH_HAS_HUGEPAGE_ONLY_RANGE
+ #define is_hugepage_only_range(addr, len)	0
++#define hugetlb_free_pgtables(tlb, prev, start, end) do { } while (0)
+ #endif
+ 
+ #else /* !CONFIG_HUGETLB_PAGE */
+@@ -63,6 +64,7 @@ static inline int is_vm_hugetlb_page(str
+ #define is_aligned_hugepage_range(addr, len)	0
+ #define pmd_huge(x)	0
+ #define is_hugepage_only_range(addr, len)	0
++#define hugetlb_free_pgtables(tlb, prev, start, end) do { } while (0)
+ 
+ #ifndef HPAGE_MASK
+ #define HPAGE_MASK	0		/* Keep the compiler happy */
+--- linux-2.6.0/include/linux/i2c-dev.h	2003-06-14 12:18:04.000000000 -0700
++++ 25/include/linux/i2c-dev.h	2003-12-28 23:21:48.000000000 -0800
+@@ -43,4 +43,6 @@ struct i2c_rdwr_ioctl_data {
+ 	__u32 nmsgs;			/* number of i2c_msgs */
+ };
+ 
++#define  I2C_RDRW_IOCTL_MAX_MSGS	42
++
+ #endif /* _LINUX_I2C_DEV_H */
+--- linux-2.6.0/include/linux/ide.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/linux/ide.h	2003-12-28 23:26:29.000000000 -0800
+@@ -51,9 +51,6 @@
+ #ifndef SUPPORT_VLB_SYNC		/* 1 to support weird 32-bit chips */
+ #define SUPPORT_VLB_SYNC	1	/* 0 to reduce kernel size */
+ #endif
+-#ifndef DISK_RECOVERY_TIME		/* off=0; on=access_delay_time */
+-#define DISK_RECOVERY_TIME	0	/*  for hardware that needs it */
+-#endif
+ #ifndef OK_TO_RESET_CONTROLLER		/* 1 needed for good error recovery */
+ #define OK_TO_RESET_CONTROLLER	1	/* 0 for use with AH2372A/B interface */
+ #endif
+@@ -999,10 +996,6 @@ typedef struct hwif_s {
+ 	unsigned	dma_extra;	/* extra addr for dma ports */
+ 	unsigned long	config_data;	/* for use by chipset-specific code */
+ 	unsigned long	select_data;	/* for use by chipset-specific code */
+-#if (DISK_RECOVERY_TIME > 0)
+-	unsigned long	last_time;	/* time when previous rq was done */
+-#endif
+-
+ 
+ 	unsigned	noprobe    : 1;	/* don't probe for this interface */
+ 	unsigned	present    : 1;	/* this interface exists */
+@@ -1693,6 +1686,8 @@ extern void ide_setup_pci_devices(struct
+ #define GOOD_DMA_DRIVE		1
+ 
+ #ifdef CONFIG_BLK_DEV_IDEDMA_PCI
++extern int ide_build_sglist(ide_drive_t *, struct request *);
++extern int ide_raw_build_sglist(ide_drive_t *, struct request *);
+ extern int ide_build_dmatable(ide_drive_t *, struct request *);
+ extern void ide_destroy_dmatable(ide_drive_t *);
+ extern ide_startstop_t ide_dma_intr(ide_drive_t *);
+--- linux-2.6.0/include/linux/if_bonding.h	2003-06-14 12:18:30.000000000 -0700
++++ 25/include/linux/if_bonding.h	2003-12-28 23:21:01.000000000 -0800
+@@ -1,7 +1,7 @@
+ /*
+  * Bond several ethernet interfaces into a Cisco, running 'Etherchannel'.
+  *
+- * 
++ *
+  * Portions are (c) Copyright 1995 Simon "Guru Aleph-Null" Janes
+  * NCM: Network and Communications Management, Inc.
+  *
+@@ -10,11 +10,11 @@
+  *
+  *	This software may be used and distributed according to the terms
+  *	of the GNU Public License, incorporated herein by reference.
+- * 
++ *
+  * 2003/03/18 - Amir Noam <amir.noam at intel dot com>
+  *	- Added support for getting slave's speed and duplex via ethtool.
+  *	  Needed for 802.3ad and other future modes.
+- * 
++ *
+  * 2003/03/18 - Tsippy Mendelson <tsippy.mendelson at intel dot com> and
+  *		Shmulik Hen <shmulik.hen at intel dot com>
+  *	- Enable support of modes that need to use the unique mac address of
+@@ -42,7 +42,7 @@
+ #include <linux/if_ether.h>
+ 
+ /* userland - kernel ABI version (2003/05/08) */
+-#define BOND_ABI_VERSION 1
++#define BOND_ABI_VERSION 2
+ 
+ /*
+  * We can remove these ioctl definitions in 2.5.  People should use the
+@@ -77,10 +77,6 @@
+ 
+ #define BOND_DEFAULT_MAX_BONDS  1   /* Default maximum number of devices to support */
+ 
+-#define BOND_MULTICAST_DISABLED 0
+-#define BOND_MULTICAST_ACTIVE   1
+-#define BOND_MULTICAST_ALL      2
+-
+ typedef struct ifbond {
+ 	__s32 bond_mode;
+ 	__s32 num_slaves;
+@@ -90,9 +86,9 @@ typedef struct ifbond {
+ typedef struct ifslave
+ {
+ 	__s32 slave_id; /* Used as an IN param to the BOND_SLAVE_INFO_QUERY ioctl */
+-	char slave_name[IFNAMSIZ];
+-	char link;
+-	char state;
++	__s8 slave_name[IFNAMSIZ];
++	__s8 link;
++	__s8 state;
+ 	__u32  link_failure_count;
+ } ifslave;
+ 
+@@ -115,3 +111,4 @@ struct ad_info {
+  *  tab-width: 8
+  * End:
+  */
++
+--- linux-2.6.0/include/linux/init_task.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/linux/init_task.h	2003-12-28 23:26:39.000000000 -0800
+@@ -108,6 +108,7 @@
+ 	.proc_lock	= SPIN_LOCK_UNLOCKED,				\
+ 	.switch_lock	= SPIN_LOCK_UNLOCKED,				\
+ 	.journal_info	= NULL,						\
++	.io_wait	= NULL,						\
+ }
+ 
+ 
+--- linux-2.6.0/include/linux/input.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/linux/input.h	2003-12-28 23:21:26.000000000 -0800
+@@ -870,6 +870,7 @@ struct input_handler {
+ 	char *name;
+ 
+ 	struct input_device_id *id_table;
++	struct input_device_id *blacklist;
+ 
+ 	struct list_head	h_list;
+ 	struct list_head	node;
+--- linux-2.6.0/include/linux/jiffies.h	2003-06-14 12:17:56.000000000 -0700
++++ 25/include/linux/jiffies.h	2003-12-28 23:22:24.000000000 -0800
+@@ -10,7 +10,7 @@
+ 
+ /*
+  * The 64-bit value is not volatile - you MUST NOT read it
+- * without holding read_lock_irq(&xtime_lock).
++ * without sampling the sequence number in xtime_lock.
+  * get_jiffies_64() will do this for you as appropriate.
+  */
+ extern u64 jiffies_64;
+--- linux-2.6.0/include/linux/kernel.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/linux/kernel.h	2003-12-28 23:21:48.000000000 -0800
+@@ -87,6 +87,8 @@ extern int session_of_pgrp(int pgrp);
+ asmlinkage int printk(const char * fmt, ...)
+ 	__attribute__ ((format (printf, 1, 2)));
+ 
++unsigned long int_sqrt(unsigned long);
++
+ static inline void console_silent(void)
+ {
+ 	console_loglevel = 0;
+--- linux-2.6.0/include/linux/keyboard.h	2003-06-14 12:17:58.000000000 -0700
++++ 25/include/linux/keyboard.h	2003-12-28 23:21:28.000000000 -0800
+@@ -2,7 +2,6 @@
+ #define __LINUX_KEYBOARD_H
+ 
+ #include <linux/wait.h>
+-#include <linux/input.h>
+ 
+ #define KG_SHIFT	0
+ #define KG_CTRL		2
+@@ -17,7 +16,7 @@
+ 
+ #define NR_SHIFT	9
+ 
+-#define NR_KEYS		(KEY_MAX+1)
++#define NR_KEYS		255
+ #define MAX_NR_KEYMAPS	256
+ /* This means 128Kb if all keymaps are allocated. Only the superuser
+ 	may increase the number of keymaps beyond MAX_NR_OF_USER_KEYMAPS. */
+--- linux-2.6.0/include/linux/kmod.h	2003-09-08 13:58:59.000000000 -0700
++++ 25/include/linux/kmod.h	2003-12-28 23:21:42.000000000 -0800
+@@ -24,6 +24,8 @@
+ #include <linux/compiler.h>
+ 
+ #ifdef CONFIG_KMOD
++/* modprobe exit status on success, -ve on error.  Return value
++ * usually useless though. */
+ extern int request_module(const char * name, ...) __attribute__ ((format (printf, 1, 2)));
+ #else
+ static inline int request_module(const char * name, ...) { return -ENOSYS; }
+--- linux-2.6.0/include/linux/list.h	2003-12-17 21:20:03.000000000 -0800
++++ 25/include/linux/list.h	2003-12-28 23:26:32.000000000 -0800
+@@ -142,8 +142,11 @@ static inline void __list_del(struct lis
+  * Note: list_empty on entry does not return true after this, the entry is
+  * in an undefined state.
+  */
++#include <linux/kernel.h>	/* BUG_ON */
+ static inline void list_del(struct list_head *entry)
+ {
++	BUG_ON(entry->prev->next != entry);
++	BUG_ON(entry->next->prev != entry);
+ 	__list_del(entry->prev, entry->next);
+ 	entry->next = LIST_POISON1;
+ 	entry->prev = LIST_POISON2;
+@@ -212,6 +215,12 @@ static inline int list_empty(const struc
+  * list_empty_careful - tests whether a list is
+  * empty _and_ checks that no other CPU might be
+  * in the process of still modifying either member
++ *
++ * NOTE: using list_empty_careful() without synchronization
++ * can only be safe if the only activity that can happen
++ * to the list entry is list_del_init(). Eg. it cannot be used
++ * if another CPU could re-list_add() it.
++ *
+  * @head: the list to test.
+  */
+ static inline int list_empty_careful(const struct list_head *head)
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/linux/lockmeter.h	2003-12-28 23:26:33.000000000 -0800
+@@ -0,0 +1,320 @@
++/*
++ *  Copyright (C) 1999-2002 Silicon Graphics, Inc.
++ *
++ *  Written by John Hawkes (hawkes@sgi.com)
++ *  Based on klstat.h by Jack Steiner (steiner@sgi.com)
++ *
++ *  Modified by Ray Bryant (raybry@us.ibm.com) Feb-Apr 2000
++ *  Changes Copyright (C) 2000 IBM, Inc.
++ *  Added save of index in spinlock_t to improve efficiency
++ *  of "hold" time reporting for spinlocks
++ *  Added support for hold time statistics for read and write
++ *  locks.
++ *  Moved machine dependent code to include/asm/lockmeter.h.
++ *
++ */
++
++#ifndef _LINUX_LOCKMETER_H
++#define _LINUX_LOCKMETER_H
++
++
++/*---------------------------------------------------
++ *	architecture-independent lockmeter.h
++ *-------------------------------------------------*/
++
++/*
++ * raybry -- version 2: added efficient hold time statistics
++ *           requires lstat recompile, so flagged as new version
++ * raybry -- version 3: added global reader lock data
++ * hawkes -- version 4: removed some unnecessary fields to simplify mips64 port
++ */
++#define LSTAT_VERSION	5
++
++int	lstat_update(void*, void*, int);
++int	lstat_update_time(void*, void*, int, uint32_t);
++
++/*
++ * Currently, the mips64 and sparc64 kernels talk to a 32-bit lockstat, so we
++ * need to force compatibility in the inter-communication data structure.
++ */
++
++#if defined(CONFIG_MIPS32_COMPAT)
++#define TIME_T		uint32_t
++#elif defined(CONFIG_SPARC) || defined(CONFIG_SPARC64)
++#define TIME_T		uint64_t
++#else
++#define TIME_T		time_t
++#endif
++
++#if defined(__KERNEL__) || (!defined(CONFIG_MIPS32_COMPAT) && !defined(CONFIG_SPARC) && !defined(CONFIG_SPARC64)) || (_MIPS_SZLONG==32)
++#define POINTER		void *
++#else
++#define	POINTER		int64_t
++#endif
++
++/*
++ * Values for the "action" parameter passed to lstat_update.
++ *	ZZZ - do we want a try-success status here???
++ */
++#define LSTAT_ACT_NO_WAIT	0
++#define LSTAT_ACT_SPIN		1
++#define LSTAT_ACT_REJECT	2
++#define LSTAT_ACT_WW_SPIN       3
++#define LSTAT_ACT_SLEPT		4 /* UNUSED */
++
++#define LSTAT_ACT_MAX_VALUES	4 /* NOTE: Increase to 5 if use ACT_SLEPT */
++
++/*
++ * Special values for the low 2 bits of an RA passed to
++ * lstat_update.
++ */
++/* we use these values to figure out what kind of lock data */
++/* is stored in the statistics table entry at index ....... */
++#define LSTAT_RA_SPIN           0  /* spin lock data */
++#define LSTAT_RA_READ           1  /* read lock statistics */
++#define LSTAT_RA_SEMA		2  /* RESERVED */
++#define LSTAT_RA_WRITE          3  /* write lock statistics*/
++
++#define LSTAT_RA(n)	\
++	((void*)( ((unsigned long)__builtin_return_address(0) & ~3) | n) )
++
++/*
++ * Constants used for lock addresses in the lstat_directory
++ * to indicate special values of the lock address.
++ */
++#define	LSTAT_MULTI_LOCK_ADDRESS	NULL
++
++/*
++ * Maximum size of the lockstats tables. Increase this value
++ * if its not big enough. (Nothing bad happens if its not
++ * big enough although some locks will not be monitored.)
++ * We record overflows of this quantity in lstat_control.dir_overflows
++ *
++ * Note:  The max value here must fit into the field set
++ * and obtained by the macro's PUT_INDEX() and GET_INDEX().
++ * This value depends on how many bits are available in the
++ * lock word in the particular machine implementation we are on.
++ */
++#define LSTAT_MAX_STAT_INDEX		2000
++
++/*
++ * Size and mask for the hash table into the directory.
++ */
++#define LSTAT_HASH_TABLE_SIZE		4096		/* must be 2**N */
++#define LSTAT_HASH_TABLE_MASK		(LSTAT_HASH_TABLE_SIZE-1)
++
++#define DIRHASH(ra)      ((unsigned long)(ra)>>2 & LSTAT_HASH_TABLE_MASK)
++
++/*
++ *	This defines an entry in the lockstat directory. It contains
++ *	information about a lock being monitored.
++ *	A directory entry only contains the lock identification -
++ *	counts on usage of the lock are kept elsewhere in a per-cpu
++ *	data structure to minimize cache line pinging.
++ */
++typedef struct {
++	POINTER	caller_ra;		  /* RA of code that set lock */
++	POINTER	lock_ptr;		  /* lock address */
++	ushort	next_stat_index;  /* Used to link multiple locks that have the same hash table value */
++} lstat_directory_entry_t;
++
++/*
++ *	A multi-dimensioned array used to contain counts for lock accesses.
++ *	The array is 3-dimensional:
++ *		- CPU number. Keep from thrashing cache lines between CPUs
++ *		- Directory entry index. Identifies the lock
++ *		- Action. Indicates what kind of contention occurred on an
++ *		  access to the lock.
++ *
++ *	The index of an entry in the directory is the same as the 2nd index
++ *	of the entry in the counts array.
++ */
++/*
++ *  This table contains data for spin_locks, write locks, and read locks
++ *  Not all data is used for all cases.  In particular, the hold time
++ *  information is not stored here for read locks since that is a global
++ *  (e. g. cannot be separated out by return address) quantity.
++ *  See the lstat_read_lock_counts_t structure for the global read lock
++ *  hold time.
++ */
++typedef struct {
++	uint64_t    cum_wait_ticks;	/* sum of wait times               */
++	                                /* for write locks, sum of time a  */
++					/* writer is waiting for a reader  */
++	int64_t	    cum_hold_ticks;	/* cumulative sum of holds         */
++	                                /* not used for read mode locks    */
++					/* must be signed. ............... */
++	uint32_t    max_wait_ticks;	/* max waiting time                */
++	uint32_t    max_hold_ticks;	/* max holding time                */
++	uint64_t    cum_wait_ww_ticks;  /* sum times writer waits on writer*/
++	uint32_t    max_wait_ww_ticks;  /* max wait time writer vs writer  */
++	                                /* prev 2 only used for write locks*/
++	uint32_t    acquire_time;       /* time lock acquired this CPU     */
++	uint32_t    count[LSTAT_ACT_MAX_VALUES];
++} lstat_lock_counts_t;
++
++typedef lstat_lock_counts_t	lstat_cpu_counts_t[LSTAT_MAX_STAT_INDEX];
++
++/*
++ * User request to:
++ *	- turn statistic collection on/off, or to reset
++ */
++#define LSTAT_OFF	 0
++#define LSTAT_ON	 1
++#define LSTAT_RESET      2
++#define LSTAT_RELEASE    3
++
++#define LSTAT_MAX_READ_LOCK_INDEX 1000
++typedef struct {
++	POINTER	    lock_ptr;            /* address of lock for output stats */
++	uint32_t    read_lock_count;
++	int64_t     cum_hold_ticks;       /* sum of read lock hold times over */
++	                                  /* all callers. ....................*/
++	uint32_t    write_index;          /* last write lock hash table index */
++	uint32_t    busy_periods;         /* count of busy periods ended this */
++	uint64_t    start_busy;           /* time this busy period started. ..*/
++	uint64_t    busy_ticks;           /* sum of busy periods this lock. ..*/
++	uint64_t    max_busy;             /* longest busy period for this lock*/
++	uint32_t    max_readers;          /* maximum number of readers ...... */
++#ifdef USER_MODE_TESTING
++	rwlock_t    entry_lock;           /* lock for this read lock entry... */
++	                                  /* avoid having more than one rdr at*/
++	                                  /* needed for user space testing... */
++	                                  /* not needed for kernel 'cause it  */
++					  /* is non-preemptive. ............. */
++#endif
++} lstat_read_lock_counts_t;
++typedef lstat_read_lock_counts_t	lstat_read_lock_cpu_counts_t[LSTAT_MAX_READ_LOCK_INDEX];
++
++#if defined(__KERNEL__) || defined(USER_MODE_TESTING)
++
++#ifndef USER_MODE_TESTING
++#include <asm/lockmeter.h>
++#else
++#include "asm_newlockmeter.h"
++#endif
++
++/*
++ * Size and mask for the hash table into the directory.
++ */
++#define LSTAT_HASH_TABLE_SIZE		4096		/* must be 2**N */
++#define LSTAT_HASH_TABLE_MASK		(LSTAT_HASH_TABLE_SIZE-1)
++
++#define DIRHASH(ra)      ((unsigned long)(ra)>>2 & LSTAT_HASH_TABLE_MASK)
++
++/*
++ * This version eliminates the per processor lock stack.  What we do is to
++ * store the index of the lock hash structure in unused bits in the lock
++ * itself.  Then on unlock we can find the statistics record without doing
++ * any additional hash or lock stack lookup.  This works for spin_locks.
++ * Hold time reporting is now basically as cheap as wait time reporting
++ * so we ignore the difference between LSTAT_ON_HOLD and LSTAT_ON_WAIT
++ * as in version 1.1.* of lockmeter.
++ *
++ * For rw_locks, we store the index of a global reader stats structure in
++ * the lock and the writer index is stored in the latter structure.
++ * For read mode locks we hash at the time of the lock to find an entry
++ * in the directory for reader wait time and the like.
++ * At unlock time for read mode locks, we update just the global structure
++ * so we don't need to know the reader directory index value at unlock time.
++ *
++ */
++
++/*
++ * Protocol to change lstat_control.state
++ *   This is complicated because we don't want the cum_hold_time for
++ * a rw_lock to be decremented in _read_lock_ without making sure it
++ * is incremented in _read_lock_ and vice versa.  So here is the
++ * way we change the state of lstat_control.state:
++ * I.  To Turn Statistics On
++ *     After allocating storage, set lstat_control.state non-zero.
++ * This works because we don't start updating statistics for in use
++ * locks until the reader lock count goes to zero.
++ * II. To Turn Statistics Off:
++ * (0)  Disable interrupts on this CPU
++ * (1)  Seize the lstat_control.directory_lock
++ * (2)  Obtain the current value of lstat_control.next_free_read_lock_index
++ * (3)  Store a zero in lstat_control.state.
++ * (4)  Release the lstat_control.directory_lock
++ * (5)  For each lock in the read lock list up to the saved value
++ *      (well, -1) of the next_free_read_lock_index, do the following:
++ *      (a)  Check validity of the stored lock address
++ *           by making sure that the word at the saved addr
++ *           has an index that matches this entry.  If not
++ *           valid, then skip this entry.
++ *      (b)  If there is a write lock already set on this lock,
++ *           skip to (d) below.
++ *      (c)  Set a non-metered write lock on the lock
++ *      (d)  set the cached INDEX in the lock to zero
++ *      (e)  Release the non-metered write lock.
++ * (6)  Re-enable interrupts
++ *
++ * These rules ensure that a read lock will not have its statistics
++ * partially updated even though the global lock recording state has
++ * changed.  See put_lockmeter_info() for implementation.
++ *
++ * The reason for (b) is that there may be write locks set on the
++ * syscall path to put_lockmeter_info() from user space.  If we do
++ * not do this check, then we can deadlock.  A similar problem would
++ * occur if the lock was read locked by the current CPU.  At the
++ * moment this does not appear to happen.
++ */
++
++/*
++ * Main control structure for lockstat. Used to turn statistics on/off
++ * and to maintain directory info.
++ */
++typedef struct {
++	int				state;
++	spinlock_t		control_lock;		/* used to serialize turning statistics on/off   */
++	spinlock_t		directory_lock;		/* for serialize adding entries to directory     */
++	volatile int	next_free_dir_index;/* next free entry in the directory */
++	/* FIXME not all of these fields are used / needed .............. */
++                /* the following fields represent data since     */
++		/* first "lstat on" or most recent "lstat reset" */
++	TIME_T      first_started_time;     /* time when measurement first enabled */
++	TIME_T      started_time;           /* time when measurement last started  */
++	TIME_T      ending_time;            /* time when measurement last disabled */
++	uint64_t    started_cycles64;       /* cycles when measurement last started          */
++	uint64_t    ending_cycles64;        /* cycles when measurement last disabled         */
++	uint64_t    enabled_cycles64;       /* total cycles with measurement enabled         */
++	int         intervals;              /* number of measurement intervals recorded      */
++	                                    /* i. e. number of times did lstat on;lstat off  */
++	lstat_directory_entry_t	*dir;		/* directory */
++	int         dir_overflow;           /* count of times ran out of space in directory  */
++	int         rwlock_overflow;        /* count of times we couldn't allocate a rw block*/
++	ushort		*hashtab;		 	    /* hash table for quick dir scans */
++	lstat_cpu_counts_t	*counts[NR_CPUS];	 /* Array of pointers to per-cpu stats */
++    int         next_free_read_lock_index;   /* next rwlock reader (global) stats block  */
++    lstat_read_lock_cpu_counts_t *read_lock_counts[NR_CPUS]; /* per cpu read lock stats  */
++} lstat_control_t;
++
++#endif	/* defined(__KERNEL__) || defined(USER_MODE_TESTING) */
++
++typedef struct {
++	short		lstat_version;		/* version of the data */
++	short		state;			/* the current state is returned */
++	int		maxcpus;		/* Number of cpus present */
++	int		next_free_dir_index;	/* index of the next free directory entry */
++	TIME_T          first_started_time;	/* when measurement enabled for first time */
++	TIME_T          started_time;		/* time in secs since 1969 when stats last turned on  */
++	TIME_T		ending_time;		/* time in secs since 1969 when stats last turned off */
++	uint32_t	cycleval;		/* cycles per second */
++#ifdef notyet
++	void		*kernel_magic_addr;	/* address of kernel_magic */
++	void		*kernel_end_addr;	/* contents of kernel magic (points to "end") */
++#endif
++	int              next_free_read_lock_index; /* index of next (global) read lock stats struct */
++	uint64_t         started_cycles64;	/* cycles when measurement last started        */
++	uint64_t         ending_cycles64;	/* cycles when stats last turned off           */
++	uint64_t         enabled_cycles64;	/* total cycles with measurement enabled       */
++	int              intervals;		/* number of measurement intervals recorded      */
++						/* i.e. number of times we did lstat on;lstat off*/
++	int              dir_overflow;		/* number of times we wanted more space in directory */
++	int              rwlock_overflow;	/* # of times we wanted more space in read_locks_count */
++	struct new_utsname   uts;		/* info about machine where stats are measured */
++						/* -T option of lockstat allows data to be     */
++						/* moved to another machine. ................. */
++} lstat_user_request_t;
++
++#endif /* _LINUX_LOCKMETER_H */
+--- linux-2.6.0/include/linux/loop.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/linux/loop.h	2003-12-28 23:21:53.000000000 -0800
+@@ -34,8 +34,9 @@ struct loop_device {
+ 	loff_t		lo_sizelimit;
+ 	int		lo_flags;
+ 	int		(*transfer)(struct loop_device *, int cmd,
+-				    char *raw_buf, char *loop_buf, int size,
+-				    sector_t real_block);
++				    struct page *raw_page, unsigned raw_off,
++				    struct page *loop_page, unsigned loop_off,
++				    int size, sector_t real_block);
+ 	char		lo_file_name[LO_NAME_SIZE];
+ 	char		lo_crypt_name[LO_NAME_SIZE];
+ 	char		lo_encrypt_key[LO_KEY_SIZE];
+@@ -70,8 +71,7 @@ struct loop_device {
+ /*
+  * Loop flags
+  */
+-#define LO_FLAGS_DO_BMAP	1
+-#define LO_FLAGS_READ_ONLY	2
++#define LO_FLAGS_READ_ONLY	1
+ 
+ #include <asm/posix_types.h>	/* for __kernel_old_dev_t */
+ #include <asm/types.h>		/* for __u64 */
+@@ -128,8 +128,10 @@ struct loop_info64 {
+ /* Support for loadable transfer modules */
+ struct loop_func_table {
+ 	int number;	/* filter type */ 
+-	int (*transfer)(struct loop_device *lo, int cmd, char *raw_buf,
+-			char *loop_buf, int size, sector_t real_block);
++	int (*transfer)(struct loop_device *lo, int cmd,
++			struct page *raw_page, unsigned raw_off,
++			struct page *loop_page, unsigned loop_off,
++			int size, sector_t real_block);
+ 	int (*init)(struct loop_device *, const struct loop_info64 *); 
+ 	/* release is called from loop_unregister_transfer or clr_fd */
+ 	int (*release)(struct loop_device *); 
+--- linux-2.6.0/include/linux/miscdevice.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/linux/miscdevice.h	2003-12-28 23:23:00.000000000 -0800
+@@ -36,12 +36,15 @@
+ 
+ #define TUN_MINOR	     200
+ 
++struct device;
++
+ struct miscdevice 
+ {
+ 	int minor;
+ 	const char *name;
+ 	struct file_operations *fops;
+ 	struct list_head list;
++	struct device *dev;
+ 	char devfs_name[64];
+ };
+ 
+--- linux-2.6.0/include/linux/mm.h	2003-10-08 15:07:10.000000000 -0700
++++ 25/include/linux/mm.h	2003-12-28 23:22:12.000000000 -0800
+@@ -143,7 +143,7 @@ extern pgprot_t protection_map[16];
+ struct vm_operations_struct {
+ 	void (*open)(struct vm_area_struct * area);
+ 	void (*close)(struct vm_area_struct * area);
+-	struct page * (*nopage)(struct vm_area_struct * area, unsigned long address, int unused);
++	struct page * (*nopage)(struct vm_area_struct * area, unsigned long address, int *type);
+ 	int (*populate)(struct vm_area_struct * area, unsigned long address, unsigned long len, pgprot_t prot, unsigned long pgoff, int nonblock);
+ };
+ 
+@@ -322,8 +322,10 @@ static inline void put_page(struct page 
+ /*
+  * The zone field is never updated after free_area_init_core()
+  * sets it, so none of the operations on it need to be atomic.
++ * We'll have up to log2(MAX_NUMNODES * MAX_NR_ZONES) zones
++ * total, so we use NODES_SHIFT here to get enough bits.
+  */
+-#define ZONE_SHIFT (BITS_PER_LONG - 8)
++#define ZONE_SHIFT (BITS_PER_LONG - NODES_SHIFT - MAX_NR_ZONES_SHIFT)
+ 
+ struct zone;
+ extern struct zone *zone_table[];
+@@ -405,7 +407,7 @@ static inline int page_mapped(struct pag
+ extern void show_free_areas(void);
+ 
+ struct page *shmem_nopage(struct vm_area_struct * vma,
+-			unsigned long address, int unused);
++			unsigned long address, int *type);
+ struct file *shmem_file_setup(char * name, loff_t size, unsigned long flags);
+ void shmem_lock(struct file * file, int lock);
+ int shmem_zero_setup(struct vm_area_struct *);
+@@ -563,7 +565,7 @@ extern unsigned long page_unuse(struct p
+ extern void truncate_inode_pages(struct address_space *, loff_t);
+ 
+ /* generic vm_area_ops exported for stackable file systems */
+-extern struct page *filemap_nopage(struct vm_area_struct *, unsigned long, int);
++struct page *filemap_nopage(struct vm_area_struct *, unsigned long, int *);
+ 
+ /* mm/page-writeback.c */
+ int write_one_page(struct page *page, int wait);
+--- linux-2.6.0/include/linux/mmzone.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/linux/mmzone.h	2003-12-28 23:22:02.000000000 -0800
+@@ -159,7 +159,10 @@ struct zone {
+ #define ZONE_DMA		0
+ #define ZONE_NORMAL		1
+ #define ZONE_HIGHMEM		2
+-#define MAX_NR_ZONES		3
++
++#define MAX_NR_ZONES		3	/* Sync this with MAX_NR_ZONES_SHIFT */
++#define MAX_NR_ZONES_SHIFT	2	/* ceil(log2(MAX_NR_ZONES)) */
++
+ #define GFP_ZONEMASK	0x03
+ 
+ /*
+@@ -284,8 +287,6 @@ struct ctl_table;
+ struct file;
+ int min_free_kbytes_sysctl_handler(struct ctl_table *, int, struct file *, 
+ 					  void *, size_t *);
+-extern void setup_per_zone_pages_min(void);
+-
+ 
+ #ifdef CONFIG_NUMA
+ #define MAX_NR_MEMBLKS	BITS_PER_LONG /* Max number of Memory Blocks */
+--- linux-2.6.0/include/linux/msdos_fs.h	2003-08-08 22:55:14.000000000 -0700
++++ 25/include/linux/msdos_fs.h	2003-12-28 23:22:51.000000000 -0800
+@@ -4,13 +4,8 @@
+ /*
+  * The MS-DOS filesystem constants/structures
+  */
+-#include <linux/buffer_head.h>
+-#include <linux/string.h>
+ #include <asm/byteorder.h>
+ 
+-struct statfs;
+-
+-
+ #define SECTOR_SIZE	512		/* sector size (bytes) */
+ #define SECTOR_BITS	9		/* log2(SECTOR_SIZE) */
+ #define MSDOS_DPB	(MSDOS_DPS)	/* dir entries per block */
+@@ -18,6 +13,9 @@ struct statfs;
+ #define MSDOS_DPS	(SECTOR_SIZE / sizeof(struct msdos_dir_entry))
+ #define MSDOS_DPS_BITS	4		/* log2(MSDOS_DPS) */
+ 
++
++#define MSDOS_SUPER_MAGIC 0x4d44 /* MD */
++
+ #define MSDOS_ROOT_INO	1	/* == MINIX_ROOT_INO */
+ #define MSDOS_DIR_BITS	5	/* log2(sizeof(struct msdos_dir_entry)) */
+ 
+@@ -25,8 +23,6 @@ struct statfs;
+ #define FAT_MAX_DIR_ENTRIES	(65536)
+ #define FAT_MAX_DIR_SIZE	(FAT_MAX_DIR_ENTRIES << MSDOS_DIR_BITS)
+ 
+-#define MSDOS_SUPER_MAGIC 0x4d44 /* MD */
+-
+ #define ATTR_NONE    0 /* no attribute bits */
+ #define ATTR_RO      1  /* read-only */
+ #define ATTR_HIDDEN  2  /* hidden */
+@@ -35,10 +31,10 @@ struct statfs;
+ #define ATTR_DIR     16 /* directory */
+ #define ATTR_ARCH    32 /* archived */
+ 
++/* attribute bits that are copied "as is" */
+ #define ATTR_UNUSED  (ATTR_VOLUME | ATTR_ARCH | ATTR_SYS | ATTR_HIDDEN)
+-	/* attribute bits that are copied "as is" */
++/* bits that are used by the Windows 95/Windows NT extended FAT */
+ #define ATTR_EXT     (ATTR_RO | ATTR_HIDDEN | ATTR_SYS | ATTR_VOLUME)
+-	/* bits that are used by the Windows 95/Windows NT extended FAT */
+ 
+ #define CASE_LOWER_BASE 8	/* base is lower case */
+ #define CASE_LOWER_EXT  16	/* extension is lower case */
+@@ -46,8 +42,12 @@ struct statfs;
+ #define DELETED_FLAG 0xe5 /* marks file as deleted when in name[0] */
+ #define IS_FREE(n) (!*(n) || *(n) == DELETED_FLAG)
+ 
++/* valid file mode bits */
+ #define MSDOS_VALID_MODE (S_IFREG | S_IFDIR | S_IRWXU | S_IRWXG | S_IRWXO)
+-	/* valid file mode bits */
++/* Convert attribute bits and a mask to the UNIX mode. */
++#define MSDOS_MKMODE(a, m) (m & (a & ATTR_RO ? S_IRUGO|S_IXUGO : S_IRWXUGO))
++/* Convert the UNIX mode to MS-DOS attribute bits. */
++#define MSDOS_MKATTR(m) ((m & S_IWUGO) ? ATTR_NONE : ATTR_RO)
+ 
+ #define MSDOS_NAME 11 /* maximum name length */
+ #define MSDOS_LONGNAME 256 /* maximum name length */
+@@ -55,24 +55,29 @@ struct statfs;
+ #define MSDOS_DOT    ".          " /* ".", padded to MSDOS_NAME chars */
+ #define MSDOS_DOTDOT "..         " /* "..", padded to MSDOS_NAME chars */
+ 
+-#define MSDOS_FAT12 4084 /* maximum number of clusters in a 12 bit FAT */
+-
+ /* media of boot sector */
+ #define FAT_VALID_MEDIA(x)	((0xF8 <= (x) && (x) <= 0xFF) || (x) == 0xF0)
+ #define FAT_FIRST_ENT(s, x)	((MSDOS_SB(s)->fat_bits == 32 ? 0x0FFFFF00 : \
+ 	MSDOS_SB(s)->fat_bits == 16 ? 0xFF00 : 0xF00) | (x))
+ 
++/* maximum number of clusters */
++#define MAX_FAT12 0xFF4
++#define MAX_FAT16 0xFFF4
++#define MAX_FAT32 0x0FFFFFF6
++#define MAX_FAT(s) (MSDOS_SB(s)->fat_bits == 32 ? MAX_FAT32 : \
++	MSDOS_SB(s)->fat_bits == 16 ? MAX_FAT16 : MAX_FAT12)
++
+ /* bad cluster mark */
+ #define BAD_FAT12 0xFF7
+ #define BAD_FAT16 0xFFF7
+-#define BAD_FAT32 0xFFFFFF7
++#define BAD_FAT32 0x0FFFFFF7
+ #define BAD_FAT(s) (MSDOS_SB(s)->fat_bits == 32 ? BAD_FAT32 : \
+ 	MSDOS_SB(s)->fat_bits == 16 ? BAD_FAT16 : BAD_FAT12)
+ 
+ /* standard EOF */
+ #define EOF_FAT12 0xFFF
+ #define EOF_FAT16 0xFFFF
+-#define EOF_FAT32 0xFFFFFFF
++#define EOF_FAT32 0x0FFFFFFF
+ #define EOF_FAT(s) (MSDOS_SB(s)->fat_bits == 32 ? EOF_FAT32 : \
+ 	MSDOS_SB(s)->fat_bits == 16 ? EOF_FAT16 : EOF_FAT12)
+ 
+@@ -80,8 +85,8 @@ struct statfs;
+ #define FAT_ENT_BAD	(BAD_FAT32)
+ #define FAT_ENT_EOF	(EOF_FAT32)
+ 
+-#define FAT_FSINFO_SIG1		0x41615252
+-#define FAT_FSINFO_SIG2		0x61417272
++#define FAT_FSINFO_SIG1	0x41615252
++#define FAT_FSINFO_SIG2	0x61417272
+ #define IS_FSINFO(x)	(CF_LE_L((x)->signature1) == FAT_FSINFO_SIG1	\
+ 			 && CF_LE_L((x)->signature2) == FAT_FSINFO_SIG2)
+ 
+@@ -179,15 +184,10 @@ struct vfat_slot_info {
+ 	loff_t i_pos;		       /* on-disk position of directory entry */
+ };
+ 
+-/* Convert attribute bits and a mask to the UNIX mode. */
+-#define MSDOS_MKMODE(a,m) (m & (a & ATTR_RO ? S_IRUGO|S_IXUGO : S_IRWXUGO))
+-
+-/* Convert the UNIX mode to MS-DOS attribute bits. */
+-#define MSDOS_MKATTR(m) ((m & S_IWUGO) ? ATTR_NONE : ATTR_RO)
+-
+-
+ #ifdef __KERNEL__
+ 
++#include <linux/buffer_head.h>
++#include <linux/string.h>
+ #include <linux/nls.h>
+ #include <linux/msdos_fs_i.h>
+ #include <linux/msdos_fs_sb.h>
+--- linux-2.6.0/include/linux/msdos_fs_sb.h	2003-07-27 12:14:40.000000000 -0700
++++ 25/include/linux/msdos_fs_sb.h	2003-12-28 23:22:51.000000000 -0800
+@@ -47,9 +47,9 @@ struct msdos_sb_info {
+ 	unsigned long data_start;    /* first data sector */
+ 	unsigned long clusters;      /* number of clusters */
+ 	unsigned long root_cluster;  /* first cluster of the root directory */
+-	unsigned long fsinfo_sector; /* FAT32 fsinfo offset from start of disk */
++	unsigned long fsinfo_sector; /* sector number of FAT32 fsinfo */
+ 	struct semaphore fat_lock;
+-	int prev_free;               /* previously returned free cluster number */
++	int prev_free;               /* previously allocated cluster number */
+ 	int free_clusters;           /* -1 if undefined */
+ 	struct fat_mount_options options;
+ 	struct nls_table *nls_disk;  /* Codepage used on disk */
+--- linux-2.6.0/include/linux/nbd.h	2003-07-13 21:44:35.000000000 -0700
++++ 25/include/linux/nbd.h	2003-12-28 23:22:28.000000000 -0800
+@@ -35,6 +35,9 @@ enum {
+ /* Define PARANOIA to include extra sanity checking code in here & driver */
+ #define PARANOIA
+ 
++/* userspace doesn't need the nbd_device structure */
++#ifdef __KERNEL__
++
+ struct nbd_device {
+ 	int flags;
+ 	int harderror;		/* Code of hard error			*/
+@@ -53,6 +56,8 @@ struct nbd_device {
+ 	u64 bytesize;
+ };
+ 
++#endif
++
+ /* This now IS in some kind of include file...	*/
+ 
+ /* These are send over network in request/reply magic field */
+--- linux-2.6.0/include/linux/netdevice.h	2003-11-23 19:03:02.000000000 -0800
++++ 25/include/linux/netdevice.h	2003-12-28 23:21:01.000000000 -0800
+@@ -452,6 +452,12 @@ struct net_device
+ 						     unsigned char *haddr);
+ 	int			(*neigh_setup)(struct net_device *dev, struct neigh_parms *);
+ 	int			(*accept_fastpath)(struct net_device *, struct dst_entry*);
++#ifdef CONFIG_NETPOLL_RX
++	int			netpoll_rx;
++#endif
++#ifdef CONFIG_NET_POLL_CONTROLLER
++	void                    (*poll_controller)(struct net_device *dev);
++#endif
+ 
+ 	/* bridge stuff */
+ 	struct net_bridge_port	*br_port;
+@@ -470,8 +476,15 @@ struct net_device
+ 	/* class/net/name entry */
+ 	struct class_device	class_dev;
+ 	struct net_device_stats* (*last_stats)(struct net_device *);
++	/* how much padding had been added by alloc_netdev() */
++	int padded;
+ };
+ 
++static inline void *netdev_priv(struct net_device *dev)
++{
++	return (char *)dev + ((sizeof(struct net_device) + 31) & ~31);
++}
++
+ #define SET_MODULE_OWNER(dev) do { } while (0)
+ /* Set the sysfs physical device reference for the network logical device
+  * if set prior to registration will cause a symlink during initialization.
+@@ -496,6 +509,7 @@ extern rwlock_t				dev_base_lock;		/* De
+ 
+ extern int			netdev_boot_setup_add(char *name, struct ifmap *map);
+ extern int 			netdev_boot_setup_check(struct net_device *dev);
++extern unsigned long		netdev_boot_base(const char *prefix, int unit);
+ extern struct net_device    *dev_getbyhwaddr(unsigned short type, char *hwaddr);
+ extern struct net_device *__dev_getfirstbyhwtype(unsigned short type);
+ extern struct net_device *dev_getfirstbyhwtype(unsigned short type);
+@@ -533,6 +547,9 @@ extern int		dev_new_index(void);
+ extern struct net_device	*dev_get_by_index(int ifindex);
+ extern struct net_device	*__dev_get_by_index(int ifindex);
+ extern int		dev_restart(struct net_device *dev);
++#ifdef CONFIG_NETPOLL_TRAP
++extern int		netpoll_trap(void);
++#endif
+ 
+ typedef int gifconf_func_t(struct net_device * dev, char * bufptr, int len);
+ extern int		register_gifconf(unsigned int family, gifconf_func_t * gifconf);
+@@ -591,12 +608,20 @@ static inline void netif_start_queue(str
+ 
+ static inline void netif_wake_queue(struct net_device *dev)
+ {
++#ifdef CONFIG_NETPOLL_TRAP
++	if (netpoll_trap())
++		return;
++#endif
+ 	if (test_and_clear_bit(__LINK_STATE_XOFF, &dev->state))
+ 		__netif_schedule(dev);
+ }
+ 
+ static inline void netif_stop_queue(struct net_device *dev)
+ {
++#ifdef CONFIG_NETPOLL_TRAP
++	if (netpoll_trap())
++		return;
++#endif
+ 	set_bit(__LINK_STATE_XOFF, &dev->state);
+ }
+ 
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/linux/netpoll.h	2003-12-28 23:21:01.000000000 -0800
+@@ -0,0 +1,38 @@
++/*
++ * Common code for low-level network console, dump, and debugger code
++ *
++ * Derived from netconsole, kgdb-over-ethernet, and netdump patches
++ */
++
++#ifndef _LINUX_NETPOLL_H
++#define _LINUX_NETPOLL_H
++
++#include <linux/netdevice.h>
++#include <linux/interrupt.h>
++#include <linux/irq.h>
++#include <linux/list.h>
++
++struct netpoll;
++
++struct netpoll {
++	struct net_device *dev;
++	char dev_name[16], *name;
++	void (*rx_hook)(struct netpoll *, int, char *, int);
++	u32 local_ip, remote_ip;
++	u16 local_port, remote_port;
++	unsigned char local_mac[6], remote_mac[6];
++	struct list_head rx_list;
++};
++
++void netpoll_poll(struct netpoll *np);
++void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb);
++void netpoll_send_udp(struct netpoll *np, const char *msg, int len);
++int netpoll_parse_options(struct netpoll *np, char *opt);
++int netpoll_setup(struct netpoll *np);
++int netpoll_trap(void);
++void netpoll_set_trap(int trap);
++void netpoll_cleanup(struct netpoll *np);
++int netpoll_rx(struct sk_buff *skb);
++
++
++#endif
+--- linux-2.6.0/include/linux/page-flags.h	2003-09-08 13:58:59.000000000 -0700
++++ 25/include/linux/page-flags.h	2003-12-28 23:22:25.000000000 -0800
+@@ -133,6 +133,7 @@ extern void get_full_page_state(struct p
+ 
+ #define inc_page_state(member)	mod_page_state(member, 1UL)
+ #define dec_page_state(member)	mod_page_state(member, 0UL - 1)
++#define add_page_state(member,delta) mod_page_state(member, (delta))
+ #define sub_page_state(member,delta) mod_page_state(member, 0UL - (delta))
+ 
+ 
+--- linux-2.6.0/include/linux/pagemap.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/linux/pagemap.h	2003-12-28 23:26:43.000000000 -0800
+@@ -8,7 +8,6 @@
+ #include <linux/fs.h>
+ #include <linux/list.h>
+ #include <linux/highmem.h>
+-#include <linux/pagemap.h>
+ #include <asm/uaccess.h>
+ #include <linux/gfp.h>
+ 
+@@ -71,7 +70,7 @@ extern struct page * find_trylock_page(s
+ extern struct page * find_or_create_page(struct address_space *mapping,
+ 				unsigned long index, unsigned int gfp_mask);
+ extern unsigned int find_get_pages(struct address_space *mapping,
+-				pgoff_t start, unsigned int nr_pages,
++				pgoff_t *next, unsigned int nr_pages,
+ 				struct page **pages);
+ 
+ /*
+@@ -153,17 +152,27 @@ static inline void ___add_to_page_cache(
+ extern void FASTCALL(__lock_page(struct page *page));
+ extern void FASTCALL(unlock_page(struct page *page));
+ 
+-static inline void lock_page(struct page *page)
++
++extern int FASTCALL(__lock_page_wq(struct page *page, wait_queue_t *wait));
++static inline int lock_page_wq(struct page *page, wait_queue_t *wait)
+ {
+ 	if (TestSetPageLocked(page))
+-		__lock_page(page);
++		return __lock_page_wq(page, wait);
++	else
++		return 0;
++}
++
++static inline void lock_page(struct page *page)
++{
++	lock_page_wq(page, NULL);
+ }
+ 	
+ /*
+  * This is exported only for wait_on_page_locked/wait_on_page_writeback.
+  * Never use this directly!
+  */
+-extern void FASTCALL(wait_on_page_bit(struct page *page, int bit_nr));
++extern int FASTCALL(wait_on_page_bit_wq(struct page *page, int bit_nr,
++	wait_queue_t *wait));
+ 
+ /* 
+  * Wait for a page to be unlocked.
+@@ -172,19 +181,33 @@ extern void FASTCALL(wait_on_page_bit(st
+  * ie with increased "page->count" so that the page won't
+  * go away during the wait..
+  */
+-static inline void wait_on_page_locked(struct page *page)
++static inline int wait_on_page_locked_wq(struct page *page, wait_queue_t *wait)
+ {
+ 	if (PageLocked(page))
+-		wait_on_page_bit(page, PG_locked);
++		return wait_on_page_bit_wq(page, PG_locked, wait);
++	return 0;
++}
++
++static inline int wait_on_page_writeback_wq(struct page *page,
++						wait_queue_t *wait)
++{
++	if (PageWriteback(page))
++		return wait_on_page_bit_wq(page, PG_writeback, wait);
++	return 0;
++}
++
++static inline void wait_on_page_locked(struct page *page)
++{
++	wait_on_page_locked_wq(page, NULL);
+ }
+ 
+ /* 
+  * Wait for a page to complete writeback
+  */
++
+ static inline void wait_on_page_writeback(struct page *page)
+ {
+-	if (PageWriteback(page))
+-		wait_on_page_bit(page, PG_writeback);
++	wait_on_page_writeback_wq(page, NULL);
+ }
+ 
+ extern void end_page_writeback(struct page *page);
+--- linux-2.6.0/include/linux/pagevec.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/linux/pagevec.h	2003-12-28 23:26:43.000000000 -0800
+@@ -23,7 +23,7 @@ void __pagevec_lru_add(struct pagevec *p
+ void __pagevec_lru_add_active(struct pagevec *pvec);
+ void pagevec_strip(struct pagevec *pvec);
+ unsigned int pagevec_lookup(struct pagevec *pvec, struct address_space *mapping,
+-		pgoff_t start, unsigned int nr_pages);
++		pgoff_t *next, unsigned int nr_pages);
+ 
+ static inline void pagevec_init(struct pagevec *pvec, int cold)
+ {
+--- linux-2.6.0/include/linux/parser.h	2003-10-08 15:07:10.000000000 -0700
++++ 25/include/linux/parser.h	2003-12-28 23:22:09.000000000 -0800
+@@ -1,3 +1,14 @@
++/*
++ * linux/include/linux/parser.h
++ *
++ * Header for lib/parser.c
++ * Intended use of these functions is parsing filesystem argument lists,
++ * but could potentially be used anywhere else that simple option=arg
++ * parsing is required.
++ */
++
++
++/* associates an integer enumerator with a pattern string. */
+ struct match_token {
+ 	int token;
+ 	char *pattern;
+@@ -5,15 +16,16 @@ struct match_token {
+ 
+ typedef struct match_token match_table_t[];
+ 
++/* Maximum number of arguments that match_token will find in a pattern */
+ enum {MAX_OPT_ARGS = 3};
+ 
++/* Describe the location within a string of a substring */
+ typedef struct {
+ 	char *from;
+ 	char *to;
+ } substring_t;
+ 
+-int match_token(char *s, match_table_t table, substring_t args[]);
+-
++int match_token(char *, match_table_t table, substring_t args[]);
+ int match_int(substring_t *, int *result);
+ int match_octal(substring_t *, int *result);
+ int match_hex(substring_t *, int *result);
+--- linux-2.6.0/include/linux/pci.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/linux/pci.h	2003-12-28 23:21:44.000000000 -0800
+@@ -36,6 +36,7 @@
+ #define  PCI_COMMAND_WAIT 	0x80	/* Enable address/data stepping */
+ #define  PCI_COMMAND_SERR	0x100	/* Enable SERR */
+ #define  PCI_COMMAND_FAST_BACK	0x200	/* Enable back-to-back writes */
++#define  PCI_COMMAND_INTX_DISABLE 0x400 /* INTx Emulation Disable */
+ 
+ #define PCI_STATUS		0x06	/* 16 bits */
+ #define  PCI_STATUS_CAP_LIST	0x10	/* Support Capability List */
+@@ -198,6 +199,8 @@
+ #define  PCI_CAP_ID_MSI		0x05	/* Message Signalled Interrupts */
+ #define  PCI_CAP_ID_CHSWP	0x06	/* CompactPCI HotSwap */
+ #define  PCI_CAP_ID_PCIX	0x07	/* PCI-X */
++#define  PCI_CAP_ID_EXP 	0x10	/* PCI Express */
++#define  PCI_CAP_ID_MSIX	0x11	/* MSI-X */
+ #define PCI_CAP_LIST_NEXT	1	/* Next capability in the list */
+ #define PCI_CAP_FLAGS		2	/* Capability defined flags (16 bits) */
+ #define PCI_CAP_SIZEOF		4
+@@ -275,11 +278,13 @@
+ #define  PCI_MSI_FLAGS_QSIZE	0x70	/* Message queue size configured */
+ #define  PCI_MSI_FLAGS_QMASK	0x0e	/* Maximum queue size available */
+ #define  PCI_MSI_FLAGS_ENABLE	0x01	/* MSI feature enabled */
++#define  PCI_MSI_FLAGS_MASKBIT	0x100	/* 64-bit mask bits allowed */
+ #define PCI_MSI_RFU		3	/* Rest of capability flags */
+ #define PCI_MSI_ADDRESS_LO	4	/* Lower 32 bits */
+ #define PCI_MSI_ADDRESS_HI	8	/* Upper 32 bits (if PCI_MSI_FLAGS_64BIT set) */
+ #define PCI_MSI_DATA_32		8	/* 16 bits of data for 32-bit devices */
+ #define PCI_MSI_DATA_64		12	/* 16 bits of data for 64-bit devices */
++#define PCI_MSI_MASK_BIT	16	/* Mask bits register */
+ 
+ /* CompactPCI Hotswap Register */
+ 
+@@ -695,6 +700,18 @@ void pci_pool_free (struct pci_pool *poo
+ extern struct pci_dev *isa_bridge;
+ #endif
+ 
++#ifndef CONFIG_PCI_USE_VECTOR
++static inline void pci_scan_msi_device(struct pci_dev *dev) {}
++static inline int pci_enable_msi(struct pci_dev *dev) {return -1;}
++static inline void msi_remove_pci_irq_vectors(struct pci_dev *dev) {}
++#else
++extern void pci_scan_msi_device(struct pci_dev *dev);
++extern int pci_enable_msi(struct pci_dev *dev);
++extern void msi_remove_pci_irq_vectors(struct pci_dev *dev);
++extern int msi_alloc_vectors(struct pci_dev* dev, int *vector, int nvec);
++extern int msi_free_vectors(struct pci_dev* dev, int *vector, int nvec);
++#endif
++
+ #endif /* CONFIG_PCI */
+ 
+ /* Include architecture-dependent settings and functions */
+--- linux-2.6.0/include/linux/pci_ids.h	2003-11-23 19:03:02.000000000 -0800
++++ 25/include/linux/pci_ids.h	2003-12-28 23:26:27.000000000 -0800
+@@ -630,6 +630,8 @@
+ #define PCI_DEVICE_ID_HP_TACHLITE	0x1029
+ #define PCI_DEVICE_ID_HP_J2585A		0x1030
+ #define PCI_DEVICE_ID_HP_J2585B		0x1031
++#define PCI_DEVICE_ID_HP_J2973A		0x1040
++#define PCI_DEVICE_ID_HP_J2970A		0x1042
+ #define PCI_DEVICE_ID_HP_DIVA		0x1048
+ #define PCI_DEVICE_ID_HP_DIVA_TOSCA1	0x1049
+ #define PCI_DEVICE_ID_HP_DIVA_TOSCA2	0x104A
+@@ -882,6 +884,7 @@
+ 
+ #define PCI_DEVICE_ID_SII_680		0x0680
+ #define PCI_DEVICE_ID_SII_3112		0x3112
++#define PCI_DEVICE_ID_SII_3114		0x3114
+ #define PCI_DEVICE_ID_SII_1210SA	0x0240
+ 
+ #define PCI_VENDOR_ID_VISION		0x1098
+@@ -900,6 +903,7 @@
+ 
+ #define PCI_VENDOR_ID_SGI		0x10a9
+ #define PCI_DEVICE_ID_SGI_IOC3		0x0003
++#define PCI_DEVICE_ID_SGI_IOC4		0x100a
+ #define PCI_VENDOR_ID_SGI_LITHIUM	0x1002
+ 
+ #define PCI_VENDOR_ID_ACC		0x10aa
+@@ -1784,11 +1788,13 @@
+ #define PCI_DEVICE_ID_TIGON3_5702	0x1646
+ #define PCI_DEVICE_ID_TIGON3_5703	0x1647
+ #define PCI_DEVICE_ID_TIGON3_5704	0x1648
++#define PCI_DEVICE_ID_TIGON3_5704S_2	0x1649
+ #define PCI_DEVICE_ID_TIGON3_5702FE	0x164d
+ #define PCI_DEVICE_ID_TIGON3_5705	0x1653
+ #define PCI_DEVICE_ID_TIGON3_5705_2	0x1654
+ #define PCI_DEVICE_ID_TIGON3_5705M	0x165d
+ #define PCI_DEVICE_ID_TIGON3_5705M_2	0x165e
++#define PCI_DEVICE_ID_TIGON3_5705F	0x166e
+ #define PCI_DEVICE_ID_TIGON3_5782	0x1696
+ #define PCI_DEVICE_ID_TIGON3_5788	0x169c
+ #define PCI_DEVICE_ID_TIGON3_5702X	0x16a6
+@@ -2052,6 +2058,7 @@
+ #define PCI_DEVICE_ID_INTEL_82443MX_3	0x719b
+ #define PCI_DEVICE_ID_INTEL_82443GX_0	0x71a0
+ #define PCI_DEVICE_ID_INTEL_82443GX_1	0x71a1
++#define PCI_DEVICE_ID_INTEL_82443GX_2	0x71a2
+ #define PCI_DEVICE_ID_INTEL_82372FB_0	0x7600
+ #define PCI_DEVICE_ID_INTEL_82372FB_1	0x7601
+ #define PCI_DEVICE_ID_INTEL_82372FB_2	0x7602
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/linux/pci_msi.h	2003-12-28 23:21:44.000000000 -0800
+@@ -0,0 +1,193 @@
++/*
++ *	../include/linux/pci_msi.h
++ *
++ */
++
++#ifndef _ASM_PCI_MSI_H
++#define _ASM_PCI_MSI_H
++
++#include <linux/pci.h>
++
++#define MSI_AUTO -1
++#define NR_REPEATS	23
++#define NR_RESERVED_VECTORS 3 /*FIRST_DEVICE_VECTOR,FIRST_SYSTEM_VECTOR,0x80 */
++
++/*
++ * Assume the maximum number of hot plug slots supported by the system is about
++ * ten. The worstcase is that each of these slots is hot-added with a device,
++ * which has two MSI/MSI-X capable functions. To avoid any MSI-X driver, which
++ * attempts to request all available vectors, NR_HP_RESERVED_VECTORS is defined
++ * as below to ensure at least one message is assigned to each detected MSI/
++ * MSI-X device function.
++ */
++#define NR_HP_RESERVED_VECTORS 	20
++
++extern int vector_irq[NR_IRQS];
++extern cpumask_t pending_irq_balance_cpumask[NR_IRQS];
++extern void (*interrupt[NR_IRQS])(void);
++
++#ifdef CONFIG_SMP
++#define set_msi_irq_affinity	set_msi_affinity
++#else
++#define set_msi_irq_affinity	NULL
++static inline void move_msi(int vector) {}
++#endif
++
++#ifndef CONFIG_X86_IO_APIC
++static inline int get_ioapic_vector(struct pci_dev *dev) { return -1;}
++static inline void restore_ioapic_irq_handler(int irq) {}
++#else
++extern void restore_ioapic_irq_handler(int irq);
++#endif
++
++/*
++ * MSI-X Address Register
++ */
++#define PCI_MSIX_FLAGS_QSIZE		0x7FF
++#define PCI_MSIX_FLAGS_ENABLE		(1 << 15)
++#define PCI_MSIX_FLAGS_BIRMASK		(7 << 0)
++#define PCI_MSIX_FLAGS_BITMASK		(1 << 0)
++
++#define PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET	0
++#define PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET	4
++#define PCI_MSIX_ENTRY_DATA_OFFSET		8
++#define PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET	12
++#define PCI_MSIX_ENTRY_SIZE			16
++
++#define msi_control_reg(base)		(base + PCI_MSI_FLAGS)
++#define msi_lower_address_reg(base)	(base + PCI_MSI_ADDRESS_LO)
++#define msi_upper_address_reg(base)	(base + PCI_MSI_ADDRESS_HI)
++#define msi_data_reg(base, is64bit)	\
++	( (is64bit == 1) ? base+PCI_MSI_DATA_64 : base+PCI_MSI_DATA_32 )
++#define msi_mask_bits_reg(base, is64bit) \
++	( (is64bit == 1) ? base+PCI_MSI_MASK_BIT : base+PCI_MSI_MASK_BIT-4)
++#define msi_disable(control)		control &= ~PCI_MSI_FLAGS_ENABLE
++#define multi_msi_capable(control) \
++	(1 << ((control & PCI_MSI_FLAGS_QMASK) >> 1))
++#define multi_msi_enable(control, num) \
++	control |= (((num >> 1) << 4) & PCI_MSI_FLAGS_QSIZE);
++#define is_64bit_address(control)	(control & PCI_MSI_FLAGS_64BIT)
++#define is_mask_bit_support(control)	(control & PCI_MSI_FLAGS_MASKBIT)
++#define msi_enable(control, num) multi_msi_enable(control, num); \
++	control |= PCI_MSI_FLAGS_ENABLE
++
++#define msix_control_reg		msi_control_reg
++#define msix_table_offset_reg(base)	(base + 0x04)
++#define msix_pba_offset_reg(base)	(base + 0x08)
++#define msix_enable(control)	 	control |= PCI_MSIX_FLAGS_ENABLE
++#define msix_disable(control)	 	control &= ~PCI_MSIX_FLAGS_ENABLE
++#define msix_table_size(control) 	((control & PCI_MSIX_FLAGS_QSIZE)+1)
++#define multi_msix_capable		msix_table_size
++#define msix_unmask(address)	 	(address & ~PCI_MSIX_FLAGS_BITMASK)
++#define msix_mask(address)		(address | PCI_MSIX_FLAGS_BITMASK)
++#define msix_is_pending(address) 	(address & PCI_MSIX_FLAGS_PENDMASK)
++
++extern char __dbg_str_buf[256];
++#define _DEFINE_DBG_BUFFER	char __dbg_str_buf[256];
++#define _DBG_K_TRACE_ENTRY	((unsigned int)0x00000001)
++#define _DBG_K_TRACE_EXIT	((unsigned int)0x00000002)
++#define _DBG_K_INFO		((unsigned int)0x00000004)
++#define _DBG_K_ERROR		((unsigned int)0x00000008)
++#define _DBG_K_TRACE	(_DBG_K_TRACE_ENTRY | _DBG_K_TRACE_EXIT)
++
++#define _DEBUG_LEVEL	(_DBG_K_INFO | _DBG_K_ERROR | _DBG_K_TRACE)
++#define _DBG_PRINT( dbg_flags, args... )		\
++if ( _DEBUG_LEVEL & (dbg_flags) )			\
++{							\
++	int len;					\
++	len = sprintf(__dbg_str_buf, "%s:%d: %s ", 	\
++		__FILE__, __LINE__, __FUNCTION__ ); 	\
++	sprintf(__dbg_str_buf + len, args);		\
++	printk(KERN_INFO "%s\n", __dbg_str_buf);	\
++}
++
++#define MSI_FUNCTION_TRACE_ENTER	\
++	_DBG_PRINT (_DBG_K_TRACE_ENTRY, "%s", "[Entry]");
++#define MSI_FUNCTION_TRACE_EXIT		\
++	_DBG_PRINT (_DBG_K_TRACE_EXIT, "%s", "[Entry]");
++
++/*
++ * MSI Defined Data Structures
++ */
++#define MSI_ADDRESS_HEADER		0xfee
++#define MSI_ADDRESS_HEADER_SHIFT	12
++#define MSI_ADDRESS_HEADER_MASK		0xfff000
++#define MSI_TARGET_CPU_SHIFT		4
++#define MSI_TARGET_CPU_MASK		0xff
++#define MSI_DELIVERY_MODE		0
++#define MSI_LEVEL_MODE			1	/* Edge always assert */
++#define MSI_TRIGGER_MODE		0	/* MSI is edge sensitive */
++#define MSI_LOGICAL_MODE		1
++#define MSI_REDIRECTION_HINT_MODE	0
++#ifdef CONFIG_SMP
++#define MSI_TARGET_CPU			logical_smp_processor_id()
++#else
++#define MSI_TARGET_CPU			TARGET_CPUS
++#endif
++
++struct msg_data {
++#if defined(__LITTLE_ENDIAN_BITFIELD)
++	__u32	vector		:  8;
++	__u32	delivery_mode	:  3;	/* 000b: FIXED | 001b: lowest prior */
++	__u32	reserved_1	:  3;
++	__u32	level		:  1;	/* 0: deassert | 1: assert */
++	__u32	trigger		:  1;	/* 0: edge | 1: level */
++	__u32	reserved_2	: 16;
++#elif defined(__BIG_ENDIAN_BITFIELD)
++	__u32	reserved_2	: 16;
++	__u32	trigger		:  1;	/* 0: edge | 1: level */
++	__u32	level		:  1;	/* 0: deassert | 1: assert */
++	__u32	reserved_1	:  3;
++	__u32	delivery_mode	:  3;	/* 000b: FIXED | 001b: lowest prior */
++	__u32	vector		:  8;
++#else
++#error "Bitfield endianness not defined! Check your byteorder.h"
++#endif
++} __attribute__ ((packed));
++
++struct msg_address {
++	union {
++		struct {
++#if defined(__LITTLE_ENDIAN_BITFIELD)
++			__u32	reserved_1	:  2;
++			__u32	dest_mode	:  1;	/*0:physic | 1:logic */
++			__u32	redirection_hint:  1;  	/*0: dedicated CPU
++							  1: lowest priority */
++			__u32	reserved_2	:  4;
++ 			__u32	dest_id		: 24;	/* Destination ID */
++#elif defined(__BIG_ENDIAN_BITFIELD)
++ 			__u32	dest_id		: 24;	/* Destination ID */
++			__u32	reserved_2	:  4;
++			__u32	redirection_hint:  1;  	/*0: dedicated CPU
++							  1: lowest priority */
++			__u32	dest_mode	:  1;	/*0:physic | 1:logic */
++			__u32	reserved_1	:  2;
++#else
++#error "Bitfield endianness not defined! Check your byteorder.h"
++#endif
++      		}u;
++       		__u32  value;
++	}lo_address;
++	__u32 	hi_address;
++} __attribute__ ((packed));
++
++struct msi_desc {
++	struct {
++		__u8	type	: 5; 	/* {0: unused, 5h:MSI, 11h:MSI-X} */
++		__u8	maskbit	: 1; 	/* mask-pending bit supported ?   */
++		__u8	reserved: 2; 	/* reserved			  */
++		__u8	entry_nr;    	/* specific enabled entry 	  */
++		__u8	default_vector; /* default pre-assigned vector    */
++		__u8	current_cpu; 	/* current destination cpu	  */
++	}msi_attrib;
++
++	struct {
++		__u16	head;
++		__u16	tail;
++	}link;
++
++	unsigned long mask_base;
++	struct pci_dev *dev;
++};
++
++#endif /* _ASM_PCI_MSI_H */
+--- linux-2.6.0/include/linux/percpu_counter.h	2003-06-14 12:18:22.000000000 -0700
++++ 25/include/linux/percpu_counter.h	2003-12-28 23:22:03.000000000 -0800
+@@ -8,17 +8,14 @@
+ #include <linux/spinlock.h>
+ #include <linux/smp.h>
+ #include <linux/threads.h>
++#include <linux/percpu.h>
+ 
+ #ifdef CONFIG_SMP
+ 
+-struct __percpu_counter {
+-	long count;
+-} ____cacheline_aligned;
+-
+ struct percpu_counter {
+ 	spinlock_t lock;
+ 	long count;
+-	struct __percpu_counter counters[NR_CPUS];
++	long *counters;
+ };
+ 
+ #if NR_CPUS >= 16
+@@ -29,12 +26,14 @@ struct percpu_counter {
+ 
+ static inline void percpu_counter_init(struct percpu_counter *fbc)
+ {
+-	int i;
+-
+ 	spin_lock_init(&fbc->lock);
+ 	fbc->count = 0;
+-	for (i = 0; i < NR_CPUS; i++)
+-		fbc->counters[i].count = 0;
++	fbc->counters = alloc_percpu(long);
++}
++
++static inline void percpu_counter_destroy(struct percpu_counter *fbc)
++{
++	free_percpu(fbc->counters);
+ }
+ 
+ void percpu_counter_mod(struct percpu_counter *fbc, long amount);
+@@ -69,6 +68,10 @@ static inline void percpu_counter_init(s
+ 	fbc->count = 0;
+ }
+ 
++static inline void percpu_counter_destroy(struct percpu_counter *fbc)
++{
++}
++
+ static inline void
+ percpu_counter_mod(struct percpu_counter *fbc, long amount)
+ {
+--- linux-2.6.0/include/linux/proc_fs.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/linux/proc_fs.h	2003-12-28 23:21:25.000000000 -0800
+@@ -141,6 +141,8 @@ extern void proc_rtas_init(void);
+ extern struct proc_dir_entry *proc_symlink(const char *,
+ 		struct proc_dir_entry *, const char *);
+ extern struct proc_dir_entry *proc_mkdir(const char *,struct proc_dir_entry *);
++extern struct proc_dir_entry *proc_mkdir_mode(const char *name, mode_t mode,
++			struct proc_dir_entry *parent);
+ 
+ static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
+ 	mode_t mode, struct proc_dir_entry *base, 
+--- linux-2.6.0/include/linux/quota.h	2003-08-08 22:55:14.000000000 -0700
++++ 25/include/linux/quota.h	2003-12-28 23:22:17.000000000 -0800
+@@ -250,7 +250,7 @@ struct dquot_operations {
+ 	void (*free_space) (struct inode *, qsize_t);
+ 	void (*free_inode) (const struct inode *, unsigned long);
+ 	int (*transfer) (struct inode *, struct iattr *);
+-	int (*sync_dquot) (struct dquot *);
++	int (*write_dquot) (struct dquot *);
+ };
+ 
+ /* Operations handling requests from userspace */
+--- linux-2.6.0/include/linux/reiserfs_fs.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/linux/reiserfs_fs.h	2003-12-28 23:23:05.000000000 -0800
+@@ -1719,7 +1719,7 @@ void reiserfs_allow_writes(struct super_
+ void reiserfs_check_lock_depth(char *caller) ;
+ void reiserfs_prepare_for_journal(struct super_block *, struct buffer_head *bh, int wait) ;
+ void reiserfs_restore_prepared_buffer(struct super_block *, struct buffer_head *bh) ;
+-int journal_init(struct super_block *, const char * j_dev_name, int old_format) ;
++int journal_init(struct super_block *, const char * j_dev_name, int old_format, unsigned int) ;
+ int journal_release(struct reiserfs_transaction_handle*, struct super_block *) ;
+ int journal_release_error(struct reiserfs_transaction_handle*, struct super_block *) ;
+ int journal_end(struct reiserfs_transaction_handle *, struct super_block *, unsigned long) ;
+--- linux-2.6.0/include/linux/sched.h	2003-11-23 19:03:02.000000000 -0800
++++ 25/include/linux/sched.h	2003-12-28 23:26:39.000000000 -0800
+@@ -151,6 +151,7 @@ extern void init_idle(task_t *idle, int 
+ 
+ extern void show_state(void);
+ extern void show_regs(struct pt_regs *);
++extern void show_trace_task(task_t *tsk);
+ 
+ /*
+  * TASK is a pointer to the task whose backtrace we want to see (or NULL for current
+@@ -205,7 +206,6 @@ struct mm_struct {
+ 	unsigned long rss, total_vm, locked_vm;
+ 	unsigned long def_flags;
+ 	cpumask_t cpu_vm_mask;
+-	unsigned long swap_address;
+ 
+ 	unsigned long saved_auxv[40]; /* for /proc/PID/auxv */
+ 
+@@ -464,6 +464,13 @@ struct task_struct {
+ 
+ 	unsigned long ptrace_message;
+ 	siginfo_t *last_siginfo; /* For ptrace use.  */
++/*
++ * current io wait handle: wait queue entry to use for io waits
++ * If this thread is processing aio, this points at the waitqueue
++ * inside the currently handled kiocb. It may be NULL (i.e. default
++ * to a stack based synchronous wait) if its doing sync IO.
++ */
++	wait_queue_t *io_wait;
+ };
+ 
+ static inline pid_t process_group(struct task_struct *tsk)
+@@ -580,6 +587,7 @@ extern int FASTCALL(wake_up_process(stru
+  static inline void kick_process(struct task_struct *tsk) { }
+ #endif
+ extern void FASTCALL(wake_up_forked_process(struct task_struct * tsk));
++extern void FASTCALL(sched_fork(task_t * p));
+ extern void FASTCALL(sched_exit(task_t * p));
+ 
+ asmlinkage long sys_wait4(pid_t pid,unsigned int * stat_addr, int options, struct rusage * ru);
+--- linux-2.6.0/include/linux/serial_core.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/linux/serial_core.h	2003-12-28 23:21:07.000000000 -0800
+@@ -158,7 +158,9 @@ struct uart_port {
+ 	unsigned char		x_char;			/* xon/xoff char */
+ 	unsigned char		regshift;		/* reg offset shift */
+ 	unsigned char		iotype;			/* io access style */
+-
++#ifdef CONFIG_KGDB
++	int			kgdb;			/* in use by kgdb */
++#endif
+ #define UPIO_PORT		(0)
+ #define UPIO_HUB6		(1)
+ #define UPIO_MEM		(2)
+--- linux-2.6.0/include/linux/serio.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/linux/serio.h	2003-12-28 23:21:30.000000000 -0800
+@@ -49,6 +49,7 @@ struct serio_dev {
+ 	irqreturn_t (*interrupt)(struct serio *, unsigned char,
+ 			unsigned int, struct pt_regs *);
+ 	void (*connect)(struct serio *, struct serio_dev *dev);
++	int  (*reconnect)(struct serio *);
+ 	void (*disconnect)(struct serio *);
+ 	void (*cleanup)(struct serio *);
+ 
+@@ -58,12 +59,15 @@ struct serio_dev {
+ int serio_open(struct serio *serio, struct serio_dev *dev);
+ void serio_close(struct serio *serio);
+ void serio_rescan(struct serio *serio);
++void serio_reconnect(struct serio *serio);
+ irqreturn_t serio_interrupt(struct serio *serio, unsigned char data, unsigned int flags, struct pt_regs *regs);
+ 
+ void serio_register_port(struct serio *serio);
+-void serio_register_slave_port(struct serio *serio);
++void serio_register_port_delayed(struct serio *serio);
++void __serio_register_port(struct serio *serio);
+ void serio_unregister_port(struct serio *serio);
+-void serio_unregister_slave_port(struct serio *serio);
++void serio_unregister_port_delayed(struct serio *serio);
++void __serio_unregister_port(struct serio *serio);
+ void serio_register_device(struct serio_dev *dev);
+ void serio_unregister_device(struct serio_dev *dev);
+ 
+--- linux-2.6.0/include/linux/spinlock.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/linux/spinlock.h	2003-12-28 23:26:33.000000000 -0800
+@@ -15,6 +15,12 @@
+ 
+ #include <asm/processor.h>	/* for cpu relax */
+ #include <asm/system.h>
++#ifdef CONFIG_KGDB
++#include <asm/current.h>
++#define SET_WHO(x, him) (x)->who = him;
++#else
++#define SET_WHO(x, him)
++#endif
+ 
+ /*
+  * Must define these before including other files, inline functions need them
+@@ -55,6 +61,9 @@ typedef struct {
+ 	const char *module;
+ 	char *owner;
+ 	int oline;
++#ifdef CONFIG_KGDB
++	struct task_struct *who;
++#endif
+ } spinlock_t;
+ #define SPIN_LOCK_UNLOCKED (spinlock_t) { SPINLOCK_MAGIC, 0, 10, __FILE__ , NULL, 0}
+ 
+@@ -66,6 +75,7 @@ typedef struct {
+ 		(x)->module = __FILE__; \
+ 		(x)->owner = NULL; \
+ 		(x)->oline = 0; \
++                SET_WHO(x, NULL) \
+ 	} while (0)
+ 
+ #define CHECK_LOCK(x) \
+@@ -88,6 +98,7 @@ typedef struct {
+ 		(x)->lock = 1; \
+ 		(x)->owner = __FILE__; \
+ 		(x)->oline = __LINE__; \
++                SET_WHO(x, current)       \
+ 	} while (0)
+ 
+ /* without debugging, spin_is_locked on UP always says
+@@ -118,6 +129,7 @@ typedef struct {
+ 		(x)->lock = 1; \
+ 		(x)->owner = __FILE__; \
+ 		(x)->oline = __LINE__; \
++                SET_WHO(x, current)       \
+ 		1; \
+ 	})
+ 
+@@ -184,6 +196,17 @@ typedef struct {
+ 
+ #endif /* !SMP */
+ 
++#ifdef CONFIG_LOCKMETER
++extern void _metered_spin_lock   (spinlock_t *lock);
++extern void _metered_spin_unlock (spinlock_t *lock);
++extern int  _metered_spin_trylock(spinlock_t *lock);
++extern void _metered_read_lock    (rwlock_t *lock);
++extern void _metered_read_unlock  (rwlock_t *lock);
++extern void _metered_write_lock   (rwlock_t *lock);
++extern void _metered_write_unlock (rwlock_t *lock);
++extern int  _metered_write_trylock(rwlock_t *lock);
++#endif
++
+ /*
+  * Define the various spin_lock and rw_lock methods.  Note we define these
+  * regardless of whether CONFIG_SMP or CONFIG_PREEMPT are set. The various
+@@ -389,6 +412,141 @@ do { \
+ 				_raw_spin_trylock(lock) ? 1 : \
+ 				({preempt_enable(); local_bh_enable(); 0;});})
+ 
++#ifdef CONFIG_LOCKMETER
++#undef spin_lock
++#undef spin_trylock
++#undef spin_unlock
++#undef spin_lock_irqsave
++#undef spin_lock_irq
++#undef spin_lock_bh
++#undef read_lock
++#undef read_unlock
++#undef write_lock
++#undef write_unlock
++#undef write_trylock
++#undef spin_unlock_bh
++#undef read_lock_irqsave
++#undef read_lock_irq
++#undef read_lock_bh
++#undef read_unlock_bh
++#undef write_lock_irqsave
++#undef write_lock_irq
++#undef write_lock_bh
++#undef write_unlock_bh
++
++#define spin_lock(lock) \
++do { \
++	preempt_disable(); \
++	_metered_spin_lock(lock); \
++} while(0)
++
++#define spin_trylock(lock)     ({preempt_disable(); _metered_spin_trylock(lock) ? \
++				1 : ({preempt_enable(); 0;});})
++#define spin_unlock(lock) \
++do { \
++	_metered_spin_unlock(lock); \
++	preempt_enable(); \
++} while (0)
++
++#define spin_lock_irqsave(lock, flags) \
++do { \
++	local_irq_save(flags); \
++	preempt_disable(); \
++	_metered_spin_lock(lock); \
++} while (0)
++
++#define spin_lock_irq(lock) \
++do { \
++	local_irq_disable(); \
++	preempt_disable(); \
++	_metered_spin_lock(lock); \
++} while (0)
++
++#define spin_lock_bh(lock) \
++do { \
++	local_bh_disable(); \
++	preempt_disable(); \
++	_metered_spin_lock(lock); \
++} while (0)
++
++#define spin_unlock_bh(lock) \
++do { \
++	_metered_spin_unlock(lock); \
++	preempt_enable(); \
++	local_bh_enable(); \
++} while (0)
++
++
++#define read_lock(lock)                ({preempt_disable(); _metered_read_lock(lock);})
++#define read_unlock(lock)      ({_metered_read_unlock(lock); preempt_enable();})
++#define write_lock(lock)       ({preempt_disable(); _metered_write_lock(lock);})
++#define write_unlock(lock)     ({_metered_write_unlock(lock); preempt_enable();})
++#define write_trylock(lock)    ({preempt_disable();_metered_write_trylock(lock) ? \
++				1 : ({preempt_enable(); 0;});})
++#define spin_unlock_no_resched(lock) \
++do { \
++	_metered_spin_unlock(lock); \
++	preempt_enable_no_resched(); \
++} while (0)
++
++#define read_lock_irqsave(lock, flags) \
++do { \
++	local_irq_save(flags); \
++	preempt_disable(); \
++	_metered_read_lock(lock); \
++} while (0)
++
++#define read_lock_irq(lock) \
++do { \
++	local_irq_disable(); \
++	preempt_disable(); \
++	_metered_read_lock(lock); \
++} while (0)
++
++#define read_lock_bh(lock) \
++do { \
++	local_bh_disable(); \
++	preempt_disable(); \
++	_metered_read_lock(lock); \
++} while (0)
++
++#define read_unlock_bh(lock) \
++do { \
++	_metered_read_unlock(lock); \
++	preempt_enable(); \
++	local_bh_enable(); \
++} while (0)
++
++#define write_lock_irqsave(lock, flags) \
++do { \
++	local_irq_save(flags); \
++	preempt_disable(); \
++	_metered_write_lock(lock); \
++} while (0)
++
++#define write_lock_irq(lock) \
++do { \
++	local_irq_disable(); \
++	preempt_disable(); \
++	_metered_write_lock(lock); \
++} while (0)
++
++#define write_lock_bh(lock) \
++do { \
++	local_bh_disable(); \
++	preempt_disable(); \
++	_metered_write_lock(lock); \
++} while (0)
++
++#define write_unlock_bh(lock) \
++do { \
++	_metered_write_unlock(lock); \
++	preempt_enable(); \
++	local_bh_enable(); \
++} while (0)
++
++#endif /* !CONFIG_LOCKMETER */
++
+ /* "lock on reference count zero" */
+ #ifndef ATOMIC_DEC_AND_LOCK
+ #include <asm/atomic.h>
+--- linux-2.6.0/include/linux/swap.h	2003-10-08 15:07:10.000000000 -0700
++++ 25/include/linux/swap.h	2003-12-28 23:22:46.000000000 -0800
+@@ -173,7 +173,7 @@ extern int rotate_reclaimable_page(struc
+ extern void swap_setup(void);
+ 
+ /* linux/mm/vmscan.c */
+-extern int try_to_free_pages(struct zone *, unsigned int, unsigned int);
++extern int try_to_free_pages(struct zone **, unsigned int, unsigned int);
+ extern int shrink_all_memory(int);
+ extern int vm_swappiness;
+ 
+--- linux-2.6.0/include/linux/sysctl.h	2003-11-23 19:03:02.000000000 -0800
++++ 25/include/linux/sysctl.h	2003-12-28 23:26:39.000000000 -0800
+@@ -601,6 +601,8 @@ enum
+ 	FS_LEASE_TIME=15,	/* int: maximum time to wait for a lease break */
+ 	FS_DQSTATS=16,	/* disc quota usage statistics */
+ 	FS_XFS=17,	/* struct: control xfs parameters */
++	FS_AIO_NR=18,	/* current system-wide number of aio requests */
++	FS_AIO_MAX_NR=19,	/* system-wide maximum number of aio requests */
+ };
+ 
+ /* /proc/sys/fs/quota/ */
+--- linux-2.6.0/include/linux/sysfs.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/linux/sysfs.h	2003-12-28 23:21:50.000000000 -0800
+@@ -18,6 +18,12 @@ struct attribute {
+ 	mode_t			mode;
+ };
+ 
++struct attribute_group {
++	char			* name;
++	struct attribute	** attrs;
++};
++
++
+ struct bin_attribute {
+ 	struct attribute	attr;
+ 	size_t			size;
+@@ -25,14 +31,13 @@ struct bin_attribute {
+ 	ssize_t (*write)(struct kobject *, char *, loff_t, size_t);
+ };
+ 
+-int sysfs_create_bin_file(struct kobject * kobj, struct bin_attribute * attr);
+-int sysfs_remove_bin_file(struct kobject * kobj, struct bin_attribute * attr);
+-
+ struct sysfs_ops {
+ 	ssize_t	(*show)(struct kobject *, struct attribute *,char *);
+ 	ssize_t	(*store)(struct kobject *,struct attribute *,const char *, size_t);
+ };
+ 
++#ifdef CONFIG_SYSFS
++
+ extern int
+ sysfs_create_dir(struct kobject *);
+ 
+@@ -57,13 +62,75 @@ sysfs_create_link(struct kobject * kobj,
+ extern void
+ sysfs_remove_link(struct kobject *, char * name);
+ 
+-
+-struct attribute_group {
+-	char			* name;
+-	struct attribute	** attrs;
+-};
++int sysfs_create_bin_file(struct kobject * kobj, struct bin_attribute * attr);
++int sysfs_remove_bin_file(struct kobject * kobj, struct bin_attribute * attr);
+ 
+ int sysfs_create_group(struct kobject *, const struct attribute_group *);
+ void sysfs_remove_group(struct kobject *, const struct attribute_group *);
+ 
++#else /* CONFIG_SYSFS */
++
++static inline int sysfs_create_dir(struct kobject * k)
++{
++	return 0;
++}
++
++static inline void sysfs_remove_dir(struct kobject * k)
++{
++	;
++}
++
++static inline void sysfs_rename_dir(struct kobject * k, const char *new_name)
++{
++	;
++}
++
++static inline int sysfs_create_file(struct kobject * k, const struct attribute * a)
++{
++	return 0;
++}
++
++static inline int sysfs_update_file(struct kobject * k, const struct attribute * a)
++{
++	return 0;
++}
++
++static inline void sysfs_remove_file(struct kobject * k, const struct attribute * a)
++{
++	;
++}
++
++static inline int sysfs_create_link(struct kobject * k, struct kobject * t, char * n)
++{
++	return 0;
++}
++
++static inline void sysfs_remove_link(struct kobject * k, char * name)
++{
++	;
++}
++
++
++static inline int sysfs_create_bin_file(struct kobject * k, struct bin_attribute * a)
++{
++	return 0;
++}
++
++static inline int sysfs_remove_bin_file(struct kobject * k, struct bin_attribute * a)
++{
++	return 0;
++}
++
++static inline int sysfs_create_group(struct kobject * k, const struct attribute_group *g)
++{
++	return 0;
++}
++
++static inline void sysfs_remove_group(struct kobject * k, const struct attribute_group * g)
++{
++	;
++}
++
++#endif /* CONFIG_SYSFS */
++
+ #endif /* _SYSFS_H_ */
+--- linux-2.6.0/include/linux/wait.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/linux/wait.h	2003-12-28 23:26:39.000000000 -0800
+@@ -80,6 +80,15 @@ static inline int waitqueue_active(wait_
+ 	return !list_empty(&q->task_list);
+ }
+ 
++/*
++ * Used to distinguish between sync and async io wait context:
++ * sync i/o typically specifies a NULL wait queue entry or a wait
++ * queue entry bound to a task (current task) to wake up.
++ * aio specifies a wait queue entry with an async notification
++ * callback routine, not associated with any task.
++ */
++#define is_sync_wait(wait)	(!(wait) || ((wait)->task))
++
+ extern void FASTCALL(add_wait_queue(wait_queue_head_t *q, wait_queue_t * wait));
+ extern void FASTCALL(add_wait_queue_exclusive(wait_queue_head_t *q, wait_queue_t * wait));
+ extern void FASTCALL(remove_wait_queue(wait_queue_head_t *q, wait_queue_t * wait));
+--- linux-2.6.0/include/linux/writeback.h	2003-11-09 16:45:05.000000000 -0800
++++ 25/include/linux/writeback.h	2003-12-28 23:26:42.000000000 -0800
+@@ -84,9 +84,13 @@ int dirty_writeback_centisecs_handler(st
+ 				      void __user *, size_t *);
+ 
+ void page_writeback_init(void);
+-void balance_dirty_pages_ratelimited(struct address_space *mapping);
++int balance_dirty_pages_ratelimited(struct address_space *mapping);
+ int pdflush_operation(void (*fn)(unsigned long), unsigned long arg0);
+ int do_writepages(struct address_space *mapping, struct writeback_control *wbc);
++ssize_t sync_page_range(struct inode *inode, struct address_space *mapping,
++			loff_t pos, size_t count);
++ssize_t sync_page_range_nolock(struct inode *inode, struct address_space
++		*mapping, loff_t pos, size_t count);
+ 
+ /* pdflush.c */
+ extern int nr_pdflush_threads;	/* Global so it can be exported to sysctl
+--- linux-2.6.0/include/media/saa7146.h	2003-07-27 12:14:40.000000000 -0700
++++ 25/include/media/saa7146.h	2003-12-28 23:22:37.000000000 -0800
+@@ -87,6 +87,7 @@ struct saa7146_extension
+ {
+ 	char	name[32];		/* name of the device */
+ #define SAA7146_USE_I2C_IRQ	0x1
++#define SAA7146_I2C_SHORT_DELAY	0x2
+ 	int	flags;
+ 	
+ 	/* pairs of subvendor and subdevice ids for
+@@ -162,9 +163,10 @@ int saa7146_unregister_extension(struct 
+ struct saa7146_format* format_by_fourcc(struct saa7146_dev *dev, int fourcc);
+ int saa7146_pgtable_alloc(struct pci_dev *pci, struct saa7146_pgtable *pt);
+ void saa7146_pgtable_free(struct pci_dev *pci, struct saa7146_pgtable *pt);
+-void saa7146_pgtable_build_single(struct pci_dev *pci, struct saa7146_pgtable *pt, struct scatterlist *list, int length );
++int saa7146_pgtable_build_single(struct pci_dev *pci, struct saa7146_pgtable *pt, struct scatterlist *list, int length );
+ char *saa7146_vmalloc_build_pgtable(struct pci_dev *pci, long length, struct saa7146_pgtable *pt);
+ void saa7146_setgpio(struct saa7146_dev *dev, int port, u32 data);
++int saa7146_wait_for_debi_done(struct saa7146_dev *dev);
+ 
+ /* some memory sizes */
+ #define SAA7146_I2C_MEM		( 1*PAGE_SIZE)
+@@ -187,6 +189,9 @@ void saa7146_setgpio(struct saa7146_dev 
+ #define SAA7146_GPIO_OUTLO 0x40
+ #define SAA7146_GPIO_OUTHI 0x50
+ 
++/* debi defines */
++#define DEBINOSWAP 0x000e0000
++
+ /* define for the register programming sequencer (rps) */
+ #define CMD_NOP		0x00000000  /* No operation */
+ #define CMD_CLR_EVENT	0x00000000  /* Clear event */
+--- linux-2.6.0/include/media/saa7146_vv.h	2003-10-17 15:58:04.000000000 -0700
++++ 25/include/media/saa7146_vv.h	2003-12-28 23:22:37.000000000 -0800
+@@ -149,7 +149,7 @@ struct saa7146_extension_ioctls
+ };
+ 
+ /* flags */
+-#define SAA7146_EXT_SWAP_ODD_EVEN       0x1     /* needs odd/even fields swapped */
++// #define SAA7146_EXT_SWAP_ODD_EVEN	0x1     /* needs odd/even fields swapped */
+ #define SAA7146_USE_PORT_B_FOR_VBI	0x2     /* use input port b for vbi hardware bug workaround */
+ 
+ struct saa7146_ext_vv
+@@ -171,12 +171,10 @@ struct saa7146_ext_vv
+ 
+ struct saa7146_use_ops  {
+         void (*init)(struct saa7146_dev *, struct saa7146_vv *);
+-        void(*open)(struct saa7146_dev *, struct saa7146_fh *);
+-        void (*release)(struct saa7146_dev *, struct saa7146_fh *,struct file *);
++        void(*open)(struct saa7146_dev *, struct file *);
++        void (*release)(struct saa7146_dev *, struct file *);
+         void (*irq_done)(struct saa7146_dev *, unsigned long status);
+ 	ssize_t (*read)(struct file *, char *, size_t, loff_t *);
+-        int (*capture_begin)(struct saa7146_fh *);
+-        int (*capture_end)(struct saa7146_fh *);
+ };
+ 
+ /* from saa7146_fops.c */
+--- linux-2.6.0/include/net/atmclip.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/net/atmclip.h	2003-12-28 23:21:01.000000000 -0800
+@@ -44,7 +44,7 @@ struct atmarp_entry {
+ };
+ 
+ 
+-#define PRIV(dev) ((struct clip_priv *) ((struct net_device *) (dev)+1))
++#define PRIV(dev) ((struct clip_priv *) netdev_priv(dev))
+ 
+ 
+ struct clip_priv {
+--- linux-2.6.0/include/pcmcia/cs.h	2003-10-08 15:07:10.000000000 -0700
++++ 25/include/pcmcia/cs.h	2003-12-28 23:22:54.000000000 -0800
+@@ -421,12 +421,6 @@ enum service {
+     GetFirstWindow, GetNextWindow, GetMemPage
+ };
+ 
+-#ifdef IN_CARD_SERVICES
+-extern int CardServices(int func, void *a1, void *a2, void *a3);
+-#else
+-extern int CardServices(int func, ...);
+-#endif
+-
+ int pcmcia_access_configuration_register(client_handle_t handle, conf_reg_t *reg);
+ int pcmcia_bind_device(bind_req_t *req);
+ int pcmcia_bind_mtd(mtd_bind_t *req);
+--- linux-2.6.0/include/sound/i2c.h	2003-06-14 12:18:00.000000000 -0700
++++ 25/include/sound/i2c.h	2003-12-28 23:22:19.000000000 -0800
+@@ -58,7 +58,7 @@ struct _snd_i2c_bus {
+ 	snd_card_t *card;	/* card which I2C belongs to */
+ 	char name[32];		/* some useful label */
+ 
+-	spinlock_t lock;
++	struct semaphore lock_mutex;
+ 
+ 	snd_i2c_bus_t *master;	/* master bus when SCK/SCL is shared */
+ 	struct list_head buses;	/* master: slave buses sharing SCK/SCL, slave: link list */
+@@ -84,15 +84,15 @@ int snd_i2c_device_free(snd_i2c_device_t
+ 
+ static inline void snd_i2c_lock(snd_i2c_bus_t *bus) {
+ 	if (bus->master)
+-		spin_lock(&bus->master->lock);
++		down(&bus->master->lock_mutex);
+ 	else
+-		spin_lock(&bus->lock);
++		down(&bus->lock_mutex);
+ }
+ static inline void snd_i2c_unlock(snd_i2c_bus_t *bus) {
+ 	if (bus->master)
+-		spin_unlock(&bus->master->lock);
++		up(&bus->master->lock_mutex);
+ 	else
+-		spin_unlock(&bus->lock);
++		up(&bus->lock_mutex);
+ }
+ 
+ int snd_i2c_sendbytes(snd_i2c_device_t *device, unsigned char *bytes, int count);
+--- linux-2.6.0/init/do_mounts.c	2003-10-08 15:07:10.000000000 -0700
++++ 25/init/do_mounts.c	2003-12-28 23:22:34.000000000 -0800
+@@ -130,20 +130,22 @@ fail:
+  *	Driverfs is used to check if something is a disk name - it has
+  *	all known disks under bus/block/devices.  If the disk name
+  *	contains slashes, name of driverfs node has them replaced with
+- *	dots.  try_name() does the actual checks, assuming that driverfs
++ *	bangs.  try_name() does the actual checks, assuming that driverfs
+  *	is mounted on rootfs /sys.
+  */
+ 
+-dev_t name_to_dev_t(char *name)
++dev_t __init name_to_dev_t(char *name)
+ {
+ 	char s[32];
+ 	char *p;
+ 	dev_t res = 0;
+ 	int part;
+ 
++#ifdef CONFIG_SYSFS
+ 	sys_mkdir("/sys", 0700);
+ 	if (sys_mount("sysfs", "/sys", "sysfs", 0, NULL) < 0)
+ 		goto out;
++#endif
+ 
+ 	if (strncmp(name, "/dev/", 5) != 0) {
+ 		unsigned maj, min;
+@@ -169,7 +171,7 @@ dev_t name_to_dev_t(char *name)
+ 	strcpy(s, name);
+ 	for (p = s; *p; p++)
+ 		if (*p == '/')
+-			*p = '.';
++			*p = '!';
+ 	res = try_name(s, 0);
+ 	if (res)
+ 		goto done;
+--- linux-2.6.0/init/Kconfig	2003-11-09 16:45:05.000000000 -0800
++++ 25/init/Kconfig	2003-12-28 23:21:55.000000000 -0800
+@@ -43,7 +43,7 @@ config CLEAN_COMPILE
+ 
+ config STANDALONE
+ 	bool "Select only drivers that don't need compile-time external firmware" if EXPERIMENTAL
+-	default y
++	default n
+ 	help
+ 	  Select this option if you don't have magic firmware for drivers that
+ 	  need it.
+@@ -196,6 +196,19 @@ config EPOLL
+ 
+ source "drivers/block/Kconfig.iosched"
+ 
++config CC_OPTIMIZE_FOR_SIZE
++	bool "Optimize for size" if EMBEDDED
++	default y if ARM || H8300
++	default n
++	help
++	  Enabling this option will pass "-Os" instead of "-O2" to gcc
++	  resulting in a smaller kernel.
++
++	  WARNING: some versions of gcc may generate incorrect code with this
++	  option.  If problems are observed, a gcc upgrade may be needed.
++
++	  If unsure, say N.
++
+ endmenu		# General setup
+ 
+ 
+--- linux-2.6.0/init/main.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/init/main.c	2003-12-28 23:22:49.000000000 -0800
+@@ -38,6 +38,7 @@
+ #include <linux/moduleparam.h>
+ #include <linux/writeback.h>
+ #include <linux/cpu.h>
++#include <linux/efi.h>
+ 
+ #include <asm/io.h>
+ #include <asm/bugs.h>
+@@ -107,9 +108,7 @@ extern void time_init(void);
+ void (*late_time_init)(void) = NULL;
+ extern void softirq_init(void);
+ 
+-int rows, cols;
+-
+-char *execute_command;
++static char *execute_command;
+ 
+ /* Setup configured maximum number of CPUs to activate */
+ static unsigned int max_cpus = NR_CPUS;
+@@ -374,7 +373,7 @@ static void __init smp_init(void)
+ 
+ static void rest_init(void)
+ {
+-	kernel_thread(init, NULL, CLONE_KERNEL);
++	kernel_thread(init, NULL, CLONE_FS | CLONE_SIGHAND);
+ 	unlock_kernel();
+  	cpu_idle();
+ } 
+@@ -395,7 +394,6 @@ asmlinkage void __init start_kernel(void
+ 	lock_kernel();
+ 	printk(linux_banner);
+ 	setup_arch(&command_line);
+-	setup_per_zone_pages_min();
+ 	setup_per_cpu_areas();
+ 
+ 	/*
+@@ -443,6 +441,10 @@ asmlinkage void __init start_kernel(void
+ 	pidmap_init();
+ 	pgtable_cache_init();
+ 	pte_chain_init();
++#ifdef CONFIG_X86
++	if (efi_enabled)
++		efi_enter_virtual_mode();
++#endif
+ 	fork_init(num_physpages);
+ 	proc_caches_init();
+ 	buffer_init();
+@@ -470,7 +472,7 @@ asmlinkage void __init start_kernel(void
+ 	rest_init();
+ }
+ 
+-int __initdata initcall_debug;
++static int __initdata initcall_debug;
+ 
+ static int __init initcall_debug_setup(char *str)
+ {
+--- linux-2.6.0/ipc/sem.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/ipc/sem.c	2003-12-28 23:22:03.000000000 -0800
+@@ -59,6 +59,8 @@
+  * (c) 1999 Manfred Spraul <manfreds@colorfullife.com>
+  * Enforced range limit on SEM_UNDO
+  * (c) 2001 Red Hat Inc <alan@redhat.com>
++ * Lockless wakeup
++ * (c) 2003 Manfred Spraul <manfred@colorfullife.com>
+  */
+ 
+ #include <linux/config.h>
+@@ -118,6 +120,40 @@ void __init sem_init (void)
+ #endif
+ }
+ 
++/*
++ * Lockless wakeup algorithm:
++ * Without the check/retry algorithm a lockless wakeup is possible:
++ * - queue.status is initialized to -EINTR before blocking.
++ * - wakeup is performed by
++ *	* unlinking the queue entry from sma->sem_pending
++ *	* setting queue.status to IN_WAKEUP
++ *	  This is the notification for the blocked thread that a
++ *	  result value is imminent.
++ *	* call wake_up_process
++ *	* set queue.status to the final value.
++ * - the previously blocked thread checks queue.status:
++ *   	* if it's IN_WAKEUP, then it must wait until the value changes
++ *   	* if it's not -EINTR, then the operation was completed by
++ *   	  update_queue. semtimedop can return queue.status without
++ *   	  performing any operation on the semaphore array.
++ *   	* otherwise it must acquire the spinlock and check what's up.
++ *
++ * The two-stage algorithm is necessary to protect against the following
++ * races:
++ * - if queue.status is set after wake_up_process, then the woken up idle
++ *   thread could race forward and try (and fail) to acquire sma->lock
++ *   before update_queue had a chance to set queue.status
++ * - if queue.status is written before wake_up_process and if the
++ *   blocked process is woken up by a signal between writing
++ *   queue.status and the wake_up_process, then the woken up
++ *   process could return from semtimedop and die by calling
++ *   sys_exit before wake_up_process is called. Then wake_up_process
++ *   will oops, because the task structure is already invalid.
++ *   (yes, this happened on s390 with sysv msg).
++ *
++ */
++#define IN_WAKEUP	1
++
+ static int newary (key_t key, int nsems, int semflg)
+ {
+ 	int id;
+@@ -331,16 +367,25 @@ static void update_queue (struct sem_arr
+ 	int error;
+ 	struct sem_queue * q;
+ 
+-	for (q = sma->sem_pending; q; q = q->next) {
+-			
++	q = sma->sem_pending;
++	while(q) {
+ 		error = try_atomic_semop(sma, q->sops, q->nsops,
+ 					 q->undo, q->pid);
+ 
+ 		/* Does q->sleeper still need to sleep? */
+ 		if (error <= 0) {
+-			q->status = error;
++			struct sem_queue *n;
+ 			remove_from_queue(sma,q);
++			n = q->next;
++			q->status = IN_WAKEUP;
+ 			wake_up_process(q->sleeper);
++			/* hands-off: q will disappear immediately after
++			 * writing q->status.
++			 */
++			q->status = error;
++			q = n;
++		} else {
++			q = q->next;
+ 		}
+ 	}
+ }
+@@ -409,10 +454,16 @@ static void freeary (struct sem_array *s
+ 		un->semid = -1;
+ 
+ 	/* Wake up all pending processes and let them fail with EIDRM. */
+-	for (q = sma->sem_pending; q; q = q->next) {
+-		q->status = -EIDRM;
++	q = sma->sem_pending;
++	while(q) {
++		struct sem_queue *n;
++		/* lazy remove_from_queue: we are killing the whole queue */
+ 		q->prev = NULL;
++		n = q->next;
++		q->status = IN_WAKEUP;
+ 		wake_up_process(q->sleeper); /* doesn't sleep */
++		q->status = -EIDRM;	/* hands-off q */
++		q = n;
+ 	}
+ 
+ 	/* Remove the semaphore set from the ID array*/
+@@ -1083,6 +1134,18 @@ retry_undos:
+ 	else
+ 		schedule();
+ 
++	error = queue.status;
++	while(unlikely(error == IN_WAKEUP)) {
++		cpu_relax();
++		error = queue.status;
++	}
++
++	if (error != -EINTR) {
++		/* fast path: update_queue already obtained all requested
++		 * resources */
++		goto out_free;
++	}
++
+ 	sma = sem_lock(semid);
+ 	if(sma==NULL) {
+ 		if(queue.prev != NULL)
+@@ -1095,7 +1158,7 @@ retry_undos:
+ 	 * If queue.status != -EINTR we are woken up by another process
+ 	 */
+ 	error = queue.status;
+-	if (queue.status != -EINTR) {
++	if (error != -EINTR) {
+ 		goto out_unlock_free;
+ 	}
+ 
+--- linux-2.6.0/kernel/compat.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/kernel/compat.c	2003-12-28 23:22:22.000000000 -0800
+@@ -22,14 +22,14 @@
+ 
+ #include <asm/uaccess.h>
+ 
+-int get_compat_timespec(struct timespec *ts, struct compat_timespec *cts)
++int get_compat_timespec(struct timespec *ts, const struct compat_timespec *cts)
+ {
+ 	return (verify_area(VERIFY_READ, cts, sizeof(*cts)) ||
+ 			__get_user(ts->tv_sec, &cts->tv_sec) ||
+ 			__get_user(ts->tv_nsec, &cts->tv_nsec)) ? -EFAULT : 0;
+ }
+ 
+-int put_compat_timespec(struct timespec *ts, struct compat_timespec *cts)
++int put_compat_timespec(struct timespec *ts, const struct compat_timespec *cts)
+ {
+ 	return (verify_area(VERIFY_WRITE, cts, sizeof(*cts)) ||
+ 			__put_user(ts->tv_sec, &cts->tv_sec) ||
+@@ -204,7 +204,8 @@ asmlinkage long compat_sys_sigprocmask(i
+ 	ret = sys_sigprocmask(how, set ? &s : NULL, oset ? &s : NULL);
+ 	set_fs(old_fs);
+ 	if (ret == 0)
+-		ret = put_user(s, oset);
++		if (oset)
++			ret = put_user(s, oset);
+ 	return ret;
+ }
+ 
+--- linux-2.6.0/kernel/exit.c	2003-12-17 21:20:03.000000000 -0800
++++ 25/kernel/exit.c	2003-12-28 23:22:30.000000000 -0800
+@@ -472,21 +472,29 @@ static inline void __exit_mm(struct task
+ 	if (!mm)
+ 		return;
+ 	/*
+-	 * Serialize with any possible pending coredump:
++	 * Serialize with any possible pending coredump.
++	 * We must hold mmap_sem around checking core_waiters
++	 * and clearing tsk->mm.  The core-inducing thread
++	 * will increment core_waiters for each thread in the
++	 * group with ->mm != NULL.
+ 	 */
++	down_read(&mm->mmap_sem);
+ 	if (mm->core_waiters) {
++		up_read(&mm->mmap_sem);
+ 		down_write(&mm->mmap_sem);
+ 		if (!--mm->core_waiters)
+ 			complete(mm->core_startup_done);
+ 		up_write(&mm->mmap_sem);
+ 
+ 		wait_for_completion(&mm->core_done);
++		down_read(&mm->mmap_sem);
+ 	}
+ 	atomic_inc(&mm->mm_count);
+ 	if (mm != tsk->active_mm) BUG();
+ 	/* more a memory barrier than a real lock */
+ 	task_lock(tsk);
+ 	tsk->mm = NULL;
++	up_read(&mm->mmap_sem);
+ 	enter_lazy_tlb(mm, current);
+ 	task_unlock(tsk);
+ 	mmput(mm);
+--- linux-2.6.0/kernel/fork.c	2003-12-17 21:20:03.000000000 -0800
++++ 25/kernel/fork.c	2003-12-28 23:26:39.000000000 -0800
+@@ -146,7 +146,12 @@ void prepare_to_wait(wait_queue_head_t *
+ 	spin_lock_irqsave(&q->lock, flags);
+ 	if (list_empty(&wait->task_list))
+ 		__add_wait_queue(q, wait);
+-	set_current_state(state);
++	/*
++	 * don't alter the task state if this is just going to
++	 * queue an async wait queue callback
++	 */
++	if (is_sync_wait(wait))
++		set_current_state(state);
+ 	spin_unlock_irqrestore(&q->lock, flags);
+ }
+ 
+@@ -161,7 +166,12 @@ prepare_to_wait_exclusive(wait_queue_hea
+ 	spin_lock_irqsave(&q->lock, flags);
+ 	if (list_empty(&wait->task_list))
+ 		__add_wait_queue_tail(q, wait);
+-	set_current_state(state);
++	/*
++	 * don't alter the task state if this is just going to
++ 	 * queue an async wait queue callback
++	 */
++	if (is_sync_wait(wait))
++		set_current_state(state);
+ 	spin_unlock_irqrestore(&q->lock, flags);
+ }
+ 
+@@ -316,9 +326,9 @@ static inline int dup_mmap(struct mm_str
+ 				atomic_dec(&inode->i_writecount);
+       
+ 			/* insert tmp into the share list, just after mpnt */
+-			down(&inode->i_mapping->i_shared_sem);
++			down(&file->f_mapping->i_shared_sem);
+ 			list_add_tail(&tmp->shared, &mpnt->shared);
+-			up(&inode->i_mapping->i_shared_sem);
++			up(&file->f_mapping->i_shared_sem);
+ 		}
+ 
+ 		/*
+@@ -642,6 +652,11 @@ static int copy_files(unsigned long clon
+ 		goto out;
+ 	}
+ 
++	/*
++	 * Note: we may be using current for both targets (See exec.c)
++	 * This works because we cache current->files (old) as oldf. Don't
++	 * break this.
++	 */
+ 	tsk->files = NULL;
+ 	error = -ENOMEM;
+ 	newf = kmem_cache_alloc(files_cachep, SLAB_KERNEL);
+@@ -731,6 +746,35 @@ out_release:
+ 	goto out;
+ }
+ 
++/*
++ *	Helper to unshare the files of the current task.
++ *	We don't want to expose copy_files internals to
++ *	the exec layer of the kernel.
++ */
++
++int unshare_files(void)
++{
++	struct files_struct *files  = current->files;
++	int rc;
++
++	if(!files)
++		BUG();
++
++	/* This can race but the race causes us to copy when we don't
++	   need to and drop the copy */
++	if(atomic_read(&files->count) == 1)
++	{
++		atomic_inc(&files->count);
++		return 0;
++	}
++	rc = copy_files(0, current);
++	if(rc)
++		current->files = files;
++	return rc;
++}
++
++EXPORT_SYMBOL(unshare_files);
++
+ static inline int copy_sighand(unsigned long clone_flags, struct task_struct * tsk)
+ {
+ 	struct sighand_struct *sig;
+@@ -876,15 +920,7 @@ struct task_struct *copy_process(unsigne
+ 	if (p->binfmt && !try_module_get(p->binfmt->module))
+ 		goto bad_fork_cleanup_put_domain;
+ 
+-#ifdef CONFIG_PREEMPT
+-	/*
+-	 * schedule_tail drops this_rq()->lock so we compensate with a count
+-	 * of 1.  Also, we want to start with kernel preemption disabled.
+-	 */
+-	p->thread_info->preempt_count = 1;
+-#endif
+ 	p->did_exec = 0;
+-	p->state = TASK_UNINTERRUPTIBLE;
+ 
+ 	copy_flags(clone_flags, p);
+ 	if (clone_flags & CLONE_IDLETASK)
+@@ -901,15 +937,12 @@ struct task_struct *copy_process(unsigne
+ 
+ 	p->proc_dentry = NULL;
+ 
+-	INIT_LIST_HEAD(&p->run_list);
+-
+ 	INIT_LIST_HEAD(&p->children);
+ 	INIT_LIST_HEAD(&p->sibling);
+ 	INIT_LIST_HEAD(&p->posix_timers);
+ 	init_waitqueue_head(&p->wait_chldexit);
+ 	p->vfork_done = NULL;
+ 	spin_lock_init(&p->alloc_lock);
+-	spin_lock_init(&p->switch_lock);
+ 	spin_lock_init(&p->proc_lock);
+ 
+ 	clear_tsk_thread_flag(p, TIF_SIGPENDING);
+@@ -924,11 +957,11 @@ struct task_struct *copy_process(unsigne
+ 	p->tty_old_pgrp = 0;
+ 	p->utime = p->stime = 0;
+ 	p->cutime = p->cstime = 0;
+-	p->array = NULL;
+ 	p->lock_depth = -1;		/* -1 = no lock */
+ 	p->start_time = get_jiffies_64();
+ 	p->security = NULL;
+ 	p->io_context = NULL;
++	p->io_wait = NULL;
+ 
+ 	retval = -ENOMEM;
+ 	if ((retval = security_task_alloc(p)))
+@@ -973,38 +1006,12 @@ struct task_struct *copy_process(unsigne
+ 	p->exit_signal = (clone_flags & CLONE_THREAD) ? -1 : (clone_flags & CSIGNAL);
+ 	p->pdeath_signal = 0;
+ 
++	/* Perform scheduler related setup */
++	sched_fork(p);
++
+ 	/*
+-	 * Share the timeslice between parent and child, thus the
+-	 * total amount of pending timeslices in the system doesn't change,
+-	 * resulting in more scheduling fairness.
+-	 */
+-	local_irq_disable();
+-        p->time_slice = (current->time_slice + 1) >> 1;
+-	/*
+-	 * The remainder of the first timeslice might be recovered by
+-	 * the parent if the child exits early enough.
+-	 */
+-	p->first_time_slice = 1;
+-	current->time_slice >>= 1;
+-	p->timestamp = sched_clock();
+-	if (!current->time_slice) {
+-		/*
+-	 	 * This case is rare, it happens when the parent has only
+-	 	 * a single jiffy left from its timeslice. Taking the
+-		 * runqueue lock is not a problem.
+-		 */
+-		current->time_slice = 1;
+-		preempt_disable();
+-		scheduler_tick(0, 0);
+-		local_irq_enable();
+-		preempt_enable();
+-	} else
+-		local_irq_enable();
+-	/*
+-	 * Ok, add it to the run-queues and make it
+-	 * visible to the rest of the system.
+-	 *
+-	 * Let it rip!
++	 * Ok, make it visible to the rest of the system.
++	 * We dont wake it up yet.
+ 	 */
+ 	p->tgid = p->pid;
+ 	p->group_leader = p;
+--- linux-2.6.0/kernel/futex.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/kernel/futex.c	2003-12-28 23:21:42.000000000 -0800
+@@ -246,7 +246,7 @@ static inline void get_key_refs(union fu
+  * Drop a reference to the resource addressed by a key.
+  * The hash bucket spinlock must not be held.
+  */
+-static inline void drop_key_refs(union futex_key *key)
++static void drop_key_refs(union futex_key *key)
+ {
+ 	if (key->both.ptr != 0) {
+ 		if (key->both.offset & 1)
+@@ -260,7 +260,7 @@ static inline void drop_key_refs(union f
+  * The hash bucket lock must be held when this is called.
+  * Afterwards, the futex_q must not be accessed.
+  */
+-static inline void wake_futex(struct futex_q *q)
++static void wake_futex(struct futex_q *q)
+ {
+ 	list_del_init(&q->list);
+ 	if (q->filp)
+@@ -384,7 +384,7 @@ out:
+  */
+ 
+ /* The key must be already stored in q->key. */
+-static inline void queue_me(struct futex_q *q, int fd, struct file *filp)
++static void queue_me(struct futex_q *q, int fd, struct file *filp)
+ {
+ 	struct futex_hash_bucket *bh;
+ 
+@@ -577,6 +577,7 @@ static int futex_fd(unsigned long uaddr,
+ 	filp->f_op = &futex_fops;
+ 	filp->f_vfsmnt = mntget(futex_mnt);
+ 	filp->f_dentry = dget(futex_mnt->mnt_root);
++	filp->f_mapping = filp->f_dentry->d_inode->i_mapping;
+ 
+ 	if (signal) {
+ 		int err;
+--- linux-2.6.0/kernel/kmod.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/kernel/kmod.c	2003-12-28 23:21:42.000000000 -0800
+@@ -182,16 +182,21 @@ static int wait_for_helper(void *data)
+ {
+ 	struct subprocess_info *sub_info = data;
+ 	pid_t pid;
++	struct k_sigaction sa;
++
++	/* Install a handler: if SIGCLD isn't handled sys_wait4 won't
++	 * populate the status, but will return -ECHILD. */
++	sa.sa.sa_handler = SIG_IGN;
++	sa.sa.sa_flags = 0;
++	siginitset(&sa.sa.sa_mask, sigmask(SIGCHLD));
++	do_sigaction(SIGCHLD, &sa, (struct k_sigaction *)0);
++	allow_signal(SIGCHLD);
+ 
+-	sub_info->retval = 0;
+ 	pid = kernel_thread(____call_usermodehelper, sub_info, SIGCHLD);
+ 	if (pid < 0)
+ 		sub_info->retval = pid;
+ 	else
+-		/* We don't have a SIGCHLD signal handler, so this
+-		 * always returns -ECHILD, but the important thing is
+-		 * that it blocks. */
+-		sys_wait4(pid, NULL, 0, NULL);
++		sys_wait4(pid, &sub_info->retval, 0, NULL);
+ 
+ 	complete(sub_info->complete);
+ 	return 0;
+@@ -210,7 +215,7 @@ static void __call_usermodehelper(void *
+ 	 * until that is done.  */
+ 	if (sub_info->wait)
+ 		pid = kernel_thread(wait_for_helper, sub_info,
+-				    CLONE_KERNEL | SIGCHLD);
++				    CLONE_FS | CLONE_FILES | SIGCHLD);
+ 	else
+ 		pid = kernel_thread(____call_usermodehelper, sub_info,
+ 				    CLONE_VFORK | SIGCHLD);
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/kernel/lockmeter.c	2003-12-28 23:26:34.000000000 -0800
+@@ -0,0 +1,1178 @@
++/*
++ *  Copyright (C) 1999,2000 Silicon Graphics, Inc.
++ *
++ *  Written by John Hawkes (hawkes@sgi.com)
++ *  Based on klstat.c by Jack Steiner (steiner@sgi.com)
++ *
++ *  Modified by Ray Bryant (raybry@us.ibm.com)
++ *  Changes Copyright (C) 2000 IBM, Inc.
++ *  Added save of index in spinlock_t to improve efficiency
++ *  of "hold" time reporting for spinlocks
++ *  Added support for hold time statistics for read and write
++ *  locks.
++ */
++
++#include <linux/config.h>
++#include <linux/types.h>
++#include <linux/errno.h>
++#include <linux/slab.h>
++#include <linux/sched.h>
++#include <linux/smp.h>
++#include <linux/threads.h>
++#include <linux/version.h>
++#include <linux/vmalloc.h>
++#include <linux/spinlock.h>
++#include <linux/utsname.h>
++#include <linux/module.h>
++#include <asm/system.h>
++#include <asm/uaccess.h>
++
++#include <linux/lockmeter.h>
++
++#define ASSERT(cond)
++#define bzero(loc,size)		memset(loc,0,size)
++
++/*<---------------------------------------------------*/
++/*              lockmeter.c                           */
++/*>---------------------------------------------------*/
++
++static lstat_control_t lstat_control __cacheline_aligned =
++	{ LSTAT_OFF, SPIN_LOCK_UNLOCKED, SPIN_LOCK_UNLOCKED,
++	  19 * 0, NR_CPUS * 0, 0, NR_CPUS * 0 };
++
++static ushort lstat_make_dir_entry(void *, void *);
++
++/*
++ * lstat_lookup
++ *
++ * Given a RA, locate the directory entry for the lock.
++ */
++static ushort
++lstat_lookup(void *lock_ptr, void *caller_ra)
++{
++	ushort index;
++	lstat_directory_entry_t *dirp;
++
++	dirp = lstat_control.dir;
++
++	index = lstat_control.hashtab[DIRHASH(caller_ra)];
++	while (dirp[index].caller_ra != caller_ra) {
++		if (index == 0) {
++			return lstat_make_dir_entry(lock_ptr, caller_ra);
++		}
++		index = dirp[index].next_stat_index;
++	}
++
++	if (dirp[index].lock_ptr != NULL && dirp[index].lock_ptr != lock_ptr) {
++		dirp[index].lock_ptr = NULL;
++	}
++
++	return index;
++}
++
++/*
++ * lstat_make_dir_entry
++ * Called to add a new lock to the lock directory.
++ */
++static ushort
++lstat_make_dir_entry(void *lock_ptr, void *caller_ra)
++{
++	lstat_directory_entry_t *dirp;
++	ushort index, hindex;
++	unsigned long flags;
++
++	/* lock the table without recursively reentering this metering code */
++	local_irq_save(flags);
++	_raw_spin_lock(&lstat_control.directory_lock);
++
++	hindex = DIRHASH(caller_ra);
++	index = lstat_control.hashtab[hindex];
++	dirp = lstat_control.dir;
++	while (index && dirp[index].caller_ra != caller_ra)
++		index = dirp[index].next_stat_index;
++
++	if (index == 0) {
++		if (lstat_control.next_free_dir_index < LSTAT_MAX_STAT_INDEX) {
++			index = lstat_control.next_free_dir_index++;
++			lstat_control.dir[index].caller_ra = caller_ra;
++			lstat_control.dir[index].lock_ptr = lock_ptr;
++			lstat_control.dir[index].next_stat_index =
++				lstat_control.hashtab[hindex];
++			lstat_control.hashtab[hindex] = index;
++		} else {
++			lstat_control.dir_overflow++;
++		}
++	}
++	_raw_spin_unlock(&lstat_control.directory_lock);
++	local_irq_restore(flags);
++	return index;
++}
++
++int
++lstat_update(void *lock_ptr, void *caller_ra, int action)
++{
++	int index;
++	int cpu;
++
++	ASSERT(action < LSTAT_ACT_MAX_VALUES);
++
++	if (lstat_control.state == LSTAT_OFF)
++		return 0;
++
++	index = lstat_lookup(lock_ptr, caller_ra);
++	cpu = THIS_CPU_NUMBER;
++	(*lstat_control.counts[cpu])[index].count[action]++;
++	(*lstat_control.counts[cpu])[index].acquire_time = get_cycles();
++
++	return index;
++}
++
++int
++lstat_update_time(void *lock_ptr, void *caller_ra, int action, uint32_t ticks)
++{
++	ushort index;
++	int cpu;
++
++	ASSERT(action < LSTAT_ACT_MAX_VALUES);
++
++	if (lstat_control.state == LSTAT_OFF)
++		return 0;
++
++	index = lstat_lookup(lock_ptr, caller_ra);
++	cpu = THIS_CPU_NUMBER;
++	(*lstat_control.counts[cpu])[index].count[action]++;
++	(*lstat_control.counts[cpu])[index].cum_wait_ticks += (uint64_t) ticks;
++	if ((*lstat_control.counts[cpu])[index].max_wait_ticks < ticks)
++		(*lstat_control.counts[cpu])[index].max_wait_ticks = ticks;
++
++	(*lstat_control.counts[cpu])[index].acquire_time = get_cycles();
++
++	return index;
++}
++
++void
++_metered_spin_lock(spinlock_t * lock_ptr)
++{
++	if (lstat_control.state == LSTAT_OFF) {
++		_raw_spin_lock(lock_ptr);	/* do the real lock */
++		PUT_INDEX(lock_ptr, 0);	/* clean index in case lockmetering  */
++		/* gets turned on before unlock */
++	} else {
++		void *this_pc = LSTAT_RA(LSTAT_RA_SPIN);
++		int index;
++
++		if (_raw_spin_trylock(lock_ptr)) {
++			index = lstat_update(lock_ptr, this_pc,
++						LSTAT_ACT_NO_WAIT);
++		} else {
++			uint32_t start_cycles = get_cycles();
++			_raw_spin_lock(lock_ptr);	/* do the real lock */
++			index = lstat_update_time(lock_ptr, this_pc,
++				LSTAT_ACT_SPIN, get_cycles() - start_cycles);
++		}
++		/* save the index in the lock itself for use in spin unlock */
++		PUT_INDEX(lock_ptr, index);
++	}
++}
++
++int
++_metered_spin_trylock(spinlock_t * lock_ptr)
++{
++	if (lstat_control.state == LSTAT_OFF) {
++		return _raw_spin_trylock(lock_ptr);
++	} else {
++		int retval;
++		void *this_pc = LSTAT_RA(LSTAT_RA_SPIN);
++
++		if ((retval = _raw_spin_trylock(lock_ptr))) {
++			int index = lstat_update(lock_ptr, this_pc,
++						LSTAT_ACT_NO_WAIT);
++			/*
++			 * save the index in the lock itself for use in spin
++			 * unlock
++			 */
++			PUT_INDEX(lock_ptr, index);
++		} else {
++			lstat_update(lock_ptr, this_pc, LSTAT_ACT_REJECT);
++		}
++
++		return retval;
++	}
++}
++
++void
++_metered_spin_unlock(spinlock_t * lock_ptr)
++{
++	int index = -1;
++
++	if (lstat_control.state != LSTAT_OFF) {
++		index = GET_INDEX(lock_ptr);
++		/*
++		 * If statistics were turned off when we set the lock,
++		 * then the index can be zero.  If that is the case,
++		 * then collect no stats on this call.
++		 */
++		if (index > 0) {
++			uint32_t hold_time;
++			int cpu = THIS_CPU_NUMBER;
++			hold_time = get_cycles() -
++			 (*lstat_control.counts[cpu])[index].acquire_time;
++			(*lstat_control.counts[cpu])[index].cum_hold_ticks +=
++				(uint64_t) hold_time;
++			if ((*lstat_control.counts[cpu])[index].max_hold_ticks <
++			    hold_time)
++				(*lstat_control.counts[cpu])[index].
++				    max_hold_ticks = hold_time;
++		}
++	}
++
++	/* make sure we don't have a stale index value saved */
++	PUT_INDEX(lock_ptr, 0);
++	_raw_spin_unlock(lock_ptr);	/* do the real unlock */
++}
++
++/*
++ * allocate the next global read lock structure and store its index
++ * in the rwlock at "lock_ptr".
++ */
++uint32_t
++alloc_rwlock_struct(rwlock_t * rwlock_ptr)
++{
++	int index;
++	unsigned long flags;
++	int cpu = THIS_CPU_NUMBER;
++
++	/* If we've already overflowed, then do a quick exit */
++	if (lstat_control.next_free_read_lock_index >
++			LSTAT_MAX_READ_LOCK_INDEX) {
++		lstat_control.rwlock_overflow++;
++		return 0;
++	}
++
++	local_irq_save(flags);
++	_raw_spin_lock(&lstat_control.directory_lock);
++
++	/* It is possible this changed while we were waiting for the directory_lock */
++	if (lstat_control.state == LSTAT_OFF) {
++		index = 0;
++		goto unlock;
++	}
++
++	/* It is possible someone else got here first and set the index */
++	if ((index = GET_RWINDEX(rwlock_ptr)) == 0) {
++		/*
++		 * we can't turn on read stats for this lock while there are
++		 * readers (this would mess up the running hold time sum at
++		 * unlock time)
++		 */
++		if (RWLOCK_READERS(rwlock_ptr) != 0) {
++			index = 0;
++			goto unlock;
++		}
++
++		/*
++		 * if stats are turned on after being off, we may need to
++		 * return an old index from when the statistics were on last
++		 * time.
++		 */
++		for (index = 1; index < lstat_control.next_free_read_lock_index;
++				index++)
++			if ((*lstat_control.read_lock_counts[cpu])[index].
++					lock_ptr == rwlock_ptr)
++				goto put_index_and_unlock;
++
++		/* allocate the next global read lock structure */
++		if (lstat_control.next_free_read_lock_index >=
++		    LSTAT_MAX_READ_LOCK_INDEX) {
++			lstat_control.rwlock_overflow++;
++			index = 0;
++			goto unlock;
++		}
++		index = lstat_control.next_free_read_lock_index++;
++
++		/*
++		 * initialize the global read stats data structure for each
++		 * cpu
++		 */
++		for (cpu = 0; cpu < num_online_cpus(); cpu++) {
++			(*lstat_control.read_lock_counts[cpu])[index].lock_ptr =
++				rwlock_ptr;
++		}
++put_index_and_unlock:
++		/* store the index for the read lock structure into the lock */
++		PUT_RWINDEX(rwlock_ptr, index);
++	}
++
++unlock:
++	_raw_spin_unlock(&lstat_control.directory_lock);
++	local_irq_restore(flags);
++	return index;
++}
++
++void
++_metered_read_lock(rwlock_t * rwlock_ptr)
++{
++	void *this_pc;
++	uint32_t start_cycles;
++	int index;
++	int cpu;
++	unsigned long flags;
++	int readers_before, readers_after;
++	uint64_t cycles64;
++
++	if (lstat_control.state == LSTAT_OFF) {
++		_raw_read_lock(rwlock_ptr);
++		/* clean index in case lockmetering turns on before an unlock */
++		PUT_RWINDEX(rwlock_ptr, 0);
++		return;
++	}
++
++	this_pc = LSTAT_RA(LSTAT_RA_READ);
++	cpu = THIS_CPU_NUMBER;
++	index = GET_RWINDEX(rwlock_ptr);
++
++	/* allocate the global stats entry for this lock, if needed */
++	if (index == 0)
++		index = alloc_rwlock_struct(rwlock_ptr);
++
++	readers_before = RWLOCK_READERS(rwlock_ptr);
++	if (_raw_read_trylock(rwlock_ptr)) {
++		/*
++		 * We have decremented the lock to count a new reader,
++		 * and have confirmed that no writer has it locked.
++		 */
++		/* update statistics if enabled */
++		if (index > 0) {
++			local_irq_save(flags);
++			lstat_update((void *) rwlock_ptr, this_pc,
++					LSTAT_ACT_NO_WAIT);
++			/* preserve value of TSC so cum_hold_ticks and start_busy use same value */
++			cycles64 = get_cycles64();
++			(*lstat_control.read_lock_counts[cpu])[index].
++				cum_hold_ticks -= cycles64;
++
++			/* record time and cpu of start of busy period */
++			/* this is not perfect (some race conditions are possible) */
++			if (readers_before == 0) {
++				(*lstat_control.read_lock_counts[cpu])[index].
++					start_busy = cycles64;
++				PUT_RW_CPU(rwlock_ptr, cpu);
++			}
++			readers_after = RWLOCK_READERS(rwlock_ptr);
++			if (readers_after >
++				(*lstat_control.read_lock_counts[cpu])[index].
++					max_readers)
++				(*lstat_control.read_lock_counts[cpu])[index].
++					max_readers = readers_after;
++			local_irq_restore(flags);
++		}
++
++		return;
++	}
++	/* If we get here, then we could not quickly grab the read lock */
++
++	start_cycles = get_cycles();	/* start counting the wait time */
++
++	/* Now spin until read_lock is successful */
++	_raw_read_lock(rwlock_ptr);
++
++	lstat_update_time((void *) rwlock_ptr, this_pc, LSTAT_ACT_SPIN,
++			  get_cycles() - start_cycles);
++
++	/* update statistics if they are enabled for this lock */
++	if (index > 0) {
++		local_irq_save(flags);
++		cycles64 = get_cycles64();
++		(*lstat_control.read_lock_counts[cpu])[index].cum_hold_ticks -=
++				cycles64;
++
++		/* this is not perfect (some race conditions are possible) */
++		if (readers_before == 0) {
++			(*lstat_control.read_lock_counts[cpu])[index].
++				start_busy = cycles64;
++			PUT_RW_CPU(rwlock_ptr, cpu);
++		}
++		readers_after = RWLOCK_READERS(rwlock_ptr);
++		if (readers_after >
++		    (*lstat_control.read_lock_counts[cpu])[index].max_readers)
++			(*lstat_control.read_lock_counts[cpu])[index].
++				max_readers = readers_after;
++		local_irq_restore(flags);
++	}
++}
++
++void
++_metered_read_unlock(rwlock_t * rwlock_ptr)
++{
++	int index;
++	int cpu;
++	unsigned long flags;
++	uint64_t busy_length;
++	uint64_t cycles64;
++
++	if (lstat_control.state == LSTAT_OFF) {
++		_raw_read_unlock(rwlock_ptr);
++		return;
++	}
++
++	index = GET_RWINDEX(rwlock_ptr);
++	cpu = THIS_CPU_NUMBER;
++
++	if (index > 0) {
++		local_irq_save(flags);
++		/*
++		 * preserve value of TSC so cum_hold_ticks and busy_ticks are
++		 * consistent.
++		 */
++		cycles64 = get_cycles64();
++		(*lstat_control.read_lock_counts[cpu])[index].cum_hold_ticks +=
++			cycles64;
++		(*lstat_control.read_lock_counts[cpu])[index].read_lock_count++;
++
++		/*
++		 * once again, this is not perfect (some race conditions are
++		 * possible)
++		 */
++		if (RWLOCK_READERS(rwlock_ptr) == 1) {
++			int cpu1 = GET_RW_CPU(rwlock_ptr);
++			uint64_t last_start_busy =
++				(*lstat_control.read_lock_counts[cpu1])[index].
++					start_busy;
++			(*lstat_control.read_lock_counts[cpu])[index].
++				busy_periods++;
++			if (cycles64 > last_start_busy) {
++				busy_length = cycles64 - last_start_busy;
++				(*lstat_control.read_lock_counts[cpu])[index].
++					busy_ticks += busy_length;
++				if (busy_length >
++					(*lstat_control.
++						read_lock_counts[cpu])[index].
++							max_busy)
++					(*lstat_control.
++					 read_lock_counts[cpu])[index].
++						max_busy = busy_length;
++			}
++		}
++		local_irq_restore(flags);
++	}
++	_raw_read_unlock(rwlock_ptr);
++}
++
++void
++_metered_write_lock(rwlock_t * rwlock_ptr)
++{
++	uint32_t start_cycles;
++	void *this_pc;
++	uint32_t spin_ticks = 0; /* in anticipation of a potential wait */
++	int index;
++	int write_index = 0;
++	int cpu;
++	enum {
++		writer_writer_conflict,
++		writer_reader_conflict
++	} why_wait = writer_writer_conflict;
++
++	if (lstat_control.state == LSTAT_OFF) {
++		_raw_write_lock(rwlock_ptr);
++		/* clean index in case lockmetering turns on before an unlock */
++		PUT_RWINDEX(rwlock_ptr, 0);
++		return;
++	}
++
++	this_pc = LSTAT_RA(LSTAT_RA_WRITE);
++	cpu = THIS_CPU_NUMBER;
++	index = GET_RWINDEX(rwlock_ptr);
++
++	/* allocate the global stats entry for this lock, if needed */
++	if (index == 0) {
++		index = alloc_rwlock_struct(rwlock_ptr);
++	}
++
++	if (_raw_write_trylock(rwlock_ptr)) {
++		/* We acquired the lock on the first try */
++		write_index = lstat_update((void *) rwlock_ptr, this_pc,
++					LSTAT_ACT_NO_WAIT);
++		/* save the write_index for use in unlock if stats enabled */
++		if (index > 0)
++			(*lstat_control.read_lock_counts[cpu])[index].
++				write_index = write_index;
++		return;
++	}
++
++	/* If we get here, then we could not quickly grab the write lock */
++	start_cycles = get_cycles();	/* start counting the wait time */
++
++	why_wait = RWLOCK_READERS(rwlock_ptr) ?
++			writer_reader_conflict : writer_writer_conflict;
++
++	/* Now set the lock and wait for conflicts to disappear */
++	_raw_write_lock(rwlock_ptr);
++
++	spin_ticks = get_cycles() - start_cycles;
++
++	/* update stats -- if enabled */
++	if (index > 0 && spin_ticks) {
++		if (why_wait == writer_reader_conflict) {
++			/* waited due to a reader holding the lock */
++			write_index = lstat_update_time((void *)rwlock_ptr,
++					this_pc, LSTAT_ACT_SPIN, spin_ticks);
++		} else {
++			/*
++			 * waited due to another writer holding the lock
++			 */
++			write_index = lstat_update_time((void *)rwlock_ptr,
++				this_pc, LSTAT_ACT_WW_SPIN, spin_ticks);
++			(*lstat_control.counts[cpu])[write_index].
++				cum_wait_ww_ticks += spin_ticks;
++			if (spin_ticks >
++				(*lstat_control.counts[cpu])[write_index].
++					max_wait_ww_ticks) {
++				(*lstat_control.counts[cpu])[write_index].
++					max_wait_ww_ticks = spin_ticks;
++			}
++		}
++
++		/* save the directory index for use on write_unlock */
++		(*lstat_control.read_lock_counts[cpu])[index].
++			write_index = write_index;
++	}
++}
++
++void
++_metered_write_unlock(rwlock_t * rwlock_ptr)
++{
++	int index;
++	int cpu;
++	int write_index;
++	uint32_t hold_time;
++
++	if (lstat_control.state == LSTAT_OFF) {
++		_raw_write_unlock(rwlock_ptr);
++		return;
++	}
++
++	cpu = THIS_CPU_NUMBER;
++	index = GET_RWINDEX(rwlock_ptr);
++
++	/* update statistics if stats enabled for this lock */
++	if (index > 0) {
++		write_index =
++		    (*lstat_control.read_lock_counts[cpu])[index].write_index;
++
++		hold_time = get_cycles() -
++			(*lstat_control.counts[cpu])[write_index].acquire_time;
++		(*lstat_control.counts[cpu])[write_index].cum_hold_ticks +=
++			(uint64_t) hold_time;
++		if ((*lstat_control.counts[cpu])[write_index].max_hold_ticks <
++				hold_time)
++			(*lstat_control.counts[cpu])[write_index].
++				max_hold_ticks = hold_time;
++	}
++	_raw_write_unlock(rwlock_ptr);
++}
++
++int
++_metered_write_trylock(rwlock_t * rwlock_ptr)
++{
++	int retval;
++	void *this_pc = LSTAT_RA(LSTAT_RA_WRITE);
++
++	if ((retval = _raw_write_trylock(rwlock_ptr))) {
++		lstat_update(rwlock_ptr, this_pc, LSTAT_ACT_NO_WAIT);
++	} else {
++		lstat_update(rwlock_ptr, this_pc, LSTAT_ACT_REJECT);
++	}
++
++	return retval;
++}
++
++static void
++init_control_space(void)
++{
++	/* Set all control space pointers to null and indices to "empty" */
++	int cpu;
++
++	/*
++	 * Access CPU_CYCLE_FREQUENCY at the outset, which in some
++	 * architectures may trigger a runtime calculation that uses a
++	 * spinlock.  Let's do this before lockmetering is turned on.
++	 */
++	if (CPU_CYCLE_FREQUENCY == 0)
++		BUG();
++
++	lstat_control.hashtab = NULL;
++	lstat_control.dir = NULL;
++	for (cpu = 0; cpu < NR_CPUS; cpu++) {
++		lstat_control.counts[cpu] = NULL;
++		lstat_control.read_lock_counts[cpu] = NULL;
++	}
++}
++
++static int
++reset_lstat_data(void)
++{
++	int cpu, flags;
++
++	flags = 0;
++	lstat_control.next_free_dir_index = 1;	/* 0 is for overflows */
++	lstat_control.next_free_read_lock_index = 1;
++	lstat_control.dir_overflow = 0;
++	lstat_control.rwlock_overflow = 0;
++
++	lstat_control.started_cycles64 = 0;
++	lstat_control.ending_cycles64 = 0;
++	lstat_control.enabled_cycles64 = 0;
++	lstat_control.first_started_time = 0;
++	lstat_control.started_time = 0;
++	lstat_control.ending_time = 0;
++	lstat_control.intervals = 0;
++
++	/*
++	 * paranoia -- in case someone does a "lockstat reset" before
++	 * "lockstat on"
++	 */
++	if (lstat_control.hashtab) {
++		bzero(lstat_control.hashtab,
++			LSTAT_HASH_TABLE_SIZE * sizeof (short));
++		bzero(lstat_control.dir, LSTAT_MAX_STAT_INDEX *
++				sizeof (lstat_directory_entry_t));
++
++		for (cpu = 0; cpu < num_online_cpus(); cpu++) {
++			bzero(lstat_control.counts[cpu],
++				sizeof (lstat_cpu_counts_t));
++			bzero(lstat_control.read_lock_counts[cpu],
++				sizeof (lstat_read_lock_cpu_counts_t));
++		}
++	}
++#ifdef NOTDEF
++	_raw_spin_unlock(&lstat_control.directory_lock);
++	local_irq_restore(flags);
++#endif
++	return 1;
++}
++
++static void
++release_control_space(void)
++{
++	/*
++	 * Called when either (1) allocation of kmem
++	 * or (2) when user writes LSTAT_RELEASE to /pro/lockmeter.
++	 * Assume that all pointers have been initialized to zero,
++	 * i.e., nonzero pointers are valid addresses.
++	 */
++	int cpu;
++
++	if (lstat_control.hashtab) {
++		kfree(lstat_control.hashtab);
++		lstat_control.hashtab = NULL;
++	}
++
++	if (lstat_control.dir) {
++		vfree(lstat_control.dir);
++		lstat_control.dir = NULL;
++	}
++
++	for (cpu = 0; cpu < NR_CPUS; cpu++) {
++		if (lstat_control.counts[cpu]) {
++			vfree(lstat_control.counts[cpu]);
++			lstat_control.counts[cpu] = NULL;
++		}
++		if (lstat_control.read_lock_counts[cpu]) {
++			kfree(lstat_control.read_lock_counts[cpu]);
++			lstat_control.read_lock_counts[cpu] = NULL;
++		}
++	}
++}
++
++int
++get_lockmeter_info_size(void)
++{
++	return sizeof (lstat_user_request_t)
++		+ num_online_cpus() * sizeof (lstat_cpu_counts_t)
++		+ num_online_cpus() * sizeof (lstat_read_lock_cpu_counts_t)
++		+ (LSTAT_MAX_STAT_INDEX * sizeof (lstat_directory_entry_t));
++}
++
++ssize_t
++get_lockmeter_info(char *buffer, size_t max_len, loff_t * last_index)
++{
++	lstat_user_request_t req;
++	struct timeval tv;
++	ssize_t next_ret_bcount;
++	ssize_t actual_ret_bcount = 0;
++	int cpu;
++
++	*last_index = 0;	/* a one-shot read */
++
++	req.lstat_version = LSTAT_VERSION;
++	req.state = lstat_control.state;
++	req.maxcpus = num_online_cpus();
++	req.cycleval = CPU_CYCLE_FREQUENCY;
++#ifdef notyet
++	req.kernel_magic_addr = (void *) &_etext;
++	req.kernel_end_addr = (void *) &_etext;
++#endif
++	req.uts = system_utsname;
++	req.intervals = lstat_control.intervals;
++
++	req.first_started_time = lstat_control.first_started_time;
++	req.started_time = lstat_control.started_time;
++	req.started_cycles64 = lstat_control.started_cycles64;
++
++	req.next_free_dir_index = lstat_control.next_free_dir_index;
++	req.next_free_read_lock_index = lstat_control.next_free_read_lock_index;
++	req.dir_overflow = lstat_control.dir_overflow;
++	req.rwlock_overflow = lstat_control.rwlock_overflow;
++
++	if (lstat_control.state == LSTAT_OFF) {
++		if (req.intervals == 0) {
++			/* mesasurement is off and no valid data present */
++			next_ret_bcount = sizeof (lstat_user_request_t);
++			req.enabled_cycles64 = 0;
++
++			if ((actual_ret_bcount + next_ret_bcount) > max_len)
++				return actual_ret_bcount;
++
++			copy_to_user(buffer, (void *) &req, next_ret_bcount);
++			actual_ret_bcount += next_ret_bcount;
++			return actual_ret_bcount;
++		} else {
++			/*
++			 * measurement is off but valid data present
++			 * fetch time info from lstat_control
++			 */
++			req.ending_time = lstat_control.ending_time;
++			req.ending_cycles64 = lstat_control.ending_cycles64;
++			req.enabled_cycles64 = lstat_control.enabled_cycles64;
++		}
++	} else {
++		/*
++		 * this must be a read while data active--use current time,
++		 * etc
++		 */
++		do_gettimeofday(&tv);
++		req.ending_time = tv.tv_sec;
++		req.ending_cycles64 = get_cycles64();
++		req.enabled_cycles64 = req.ending_cycles64 -
++			req.started_cycles64 + lstat_control.enabled_cycles64;
++	}
++
++	next_ret_bcount = sizeof (lstat_user_request_t);
++	if ((actual_ret_bcount + next_ret_bcount) > max_len)
++		return actual_ret_bcount;
++
++	copy_to_user(buffer, (void *) &req, next_ret_bcount);
++	actual_ret_bcount += next_ret_bcount;
++
++	if (!lstat_control.counts[0])	/* not initialized? */
++		return actual_ret_bcount;
++
++	next_ret_bcount = sizeof (lstat_cpu_counts_t);
++	for (cpu = 0; cpu < num_online_cpus(); cpu++) {
++		if ((actual_ret_bcount + next_ret_bcount) > max_len)
++			return actual_ret_bcount;	/* leave early */
++		copy_to_user(buffer + actual_ret_bcount,
++				lstat_control.counts[cpu], next_ret_bcount);
++		actual_ret_bcount += next_ret_bcount;
++	}
++
++	next_ret_bcount = LSTAT_MAX_STAT_INDEX *
++			sizeof (lstat_directory_entry_t);
++	if (((actual_ret_bcount + next_ret_bcount) > max_len)
++			|| !lstat_control.dir)
++		return actual_ret_bcount;	/* leave early */
++
++	copy_to_user(buffer + actual_ret_bcount, lstat_control.dir,
++			next_ret_bcount);
++	actual_ret_bcount += next_ret_bcount;
++
++	next_ret_bcount = sizeof (lstat_read_lock_cpu_counts_t);
++	for (cpu = 0; cpu < num_online_cpus(); cpu++) {
++		if (actual_ret_bcount + next_ret_bcount > max_len)
++			return actual_ret_bcount;
++		copy_to_user(buffer + actual_ret_bcount,
++				lstat_control.read_lock_counts[cpu],
++				next_ret_bcount);
++		actual_ret_bcount += next_ret_bcount;
++	}
++
++	return actual_ret_bcount;
++}
++
++/*
++ *  Writing to the /proc lockmeter node enables or disables metering.
++ *  based upon the first byte of the "written" data.
++ *  The following values are defined:
++ *  LSTAT_ON: 1st call: allocates storage, intializes and turns on measurement
++ *            subsequent calls just turn on measurement
++ *  LSTAT_OFF: turns off measurement
++ *  LSTAT_RESET: resets statistics
++ *  LSTAT_RELEASE: releases statistics storage
++ *
++ *  This allows one to accumulate statistics over several lockstat runs:
++ *
++ *  lockstat on
++ *  lockstat off
++ *  ...repeat above as desired...
++ *  lockstat get
++ *  ...now start a new set of measurements...
++ *  lockstat reset
++ *  lockstat on
++ *  ...
++ *
++ */
++ssize_t
++put_lockmeter_info(const char *buffer, size_t len)
++{
++	int error = 0;
++	int dirsize, countsize, read_lock_countsize, hashsize;
++	int cpu;
++	char put_char;
++	int i, read_lock_blocks;
++	unsigned long flags;
++	rwlock_t *lock_ptr;
++	struct timeval tv;
++
++	if (len <= 0)
++		return -EINVAL;
++
++	_raw_spin_lock(&lstat_control.control_lock);
++
++	get_user(put_char, buffer);
++	switch (put_char) {
++
++	case LSTAT_OFF:
++		if (lstat_control.state != LSTAT_OFF) {
++			/*
++			 * To avoid seeing read lock hold times in an
++			 * inconsisent state, we have to follow this protocol
++			 * to turn off statistics
++			 */
++			local_irq_save(flags);
++			/*
++			 * getting this lock will stop any read lock block
++			 * allocations
++			 */
++			_raw_spin_lock(&lstat_control.directory_lock);
++			/*
++			 * keep any more read lock blocks from being
++			 * allocated
++			 */
++			lstat_control.state = LSTAT_OFF;
++			/* record how may read lock blocks there are */
++			read_lock_blocks =
++				lstat_control.next_free_read_lock_index;
++			_raw_spin_unlock(&lstat_control.directory_lock);
++			/* now go through the list of read locks */
++			cpu = THIS_CPU_NUMBER;
++			for (i = 1; i < read_lock_blocks; i++) {
++				lock_ptr =
++				    (*lstat_control.read_lock_counts[cpu])[i].
++				    lock_ptr;
++				/* is this saved lock address still valid? */
++				if (GET_RWINDEX(lock_ptr) == i) {
++					/*
++					 * lock address appears to still be
++					 * valid because we only hold one lock
++					 * at a time, this can't cause a
++					 * deadlock unless this is a lock held
++					 * as part of the current system call
++					 * path. At the moment there
++					 * are no READ mode locks held to get
++					 * here from user space, so we solve
++					 * this by skipping locks held in
++					 * write mode.
++					 */
++					if (RWLOCK_IS_WRITE_LOCKED(lock_ptr)) {
++						PUT_RWINDEX(lock_ptr, 0);
++						continue;
++					}
++					/*
++					 * now we know there are no read
++					 * holders of this lock! stop
++					 * statistics collection for this
++					 * lock
++					 */
++					_raw_write_lock(lock_ptr);
++					PUT_RWINDEX(lock_ptr, 0);
++					_raw_write_unlock(lock_ptr);
++				}
++				/*
++				 * it may still be possible for the hold time
++				 * sum to be negative e.g. if a lock is
++				 * reallocated while "busy" we will have to fix
++				 * this up in the data reduction program.
++				 */
++			}
++			local_irq_restore(flags);
++			lstat_control.intervals++;
++			lstat_control.ending_cycles64 = get_cycles64();
++			lstat_control.enabled_cycles64 +=
++				lstat_control.ending_cycles64 -
++				lstat_control.started_cycles64;
++			do_gettimeofday(&tv);
++			lstat_control.ending_time = tv.tv_sec;
++			/*
++			 * don't deallocate the structures -- we may do a
++			 * lockstat on to add to the data that is already
++			 * there. Use LSTAT_RELEASE to release storage
++			 */
++		} else {
++			error = -EBUSY;	/* already OFF */
++		}
++		break;
++
++	case LSTAT_ON:
++		if (lstat_control.state == LSTAT_OFF) {
++#ifdef DEBUG_LOCKMETER
++			printk("put_lockmeter_info(cpu=%d): LSTAT_ON\n",
++				THIS_CPU_NUMBER);
++#endif
++			lstat_control.next_free_dir_index = 1;	/* 0 is for overflows */
++
++			dirsize = LSTAT_MAX_STAT_INDEX *
++					sizeof (lstat_directory_entry_t);
++			hashsize =
++				(1 + LSTAT_HASH_TABLE_SIZE) * sizeof (ushort);
++			countsize = sizeof (lstat_cpu_counts_t);
++			read_lock_countsize =
++				sizeof (lstat_read_lock_cpu_counts_t);
++#ifdef DEBUG_LOCKMETER
++			printk(" dirsize:%d", dirsize);
++			printk(" hashsize:%d", hashsize);
++			printk(" countsize:%d", countsize);
++			printk(" read_lock_countsize:%d\n",
++				read_lock_countsize);
++#endif
++#ifdef DEBUG_LOCKMETER
++			{
++				int secs;
++				unsigned long cycles;
++				uint64_t cycles64;
++
++				do_gettimeofday(&tv);
++				secs = tv.tv_sec;
++				do {
++					do_gettimeofday(&tv);
++				} while (secs == tv.tv_sec);
++				cycles = get_cycles();
++				cycles64 = get_cycles64();
++				secs = tv.tv_sec;
++				do {
++					do_gettimeofday(&tv);
++				} while (secs == tv.tv_sec);
++				cycles = get_cycles() - cycles;
++				cycles64 = get_cycles64() - cycles;
++				printk("lockmeter: cycleFrequency:%d "
++					"cycles:%d cycles64:%d\n",
++					CPU_CYCLE_FREQUENCY, cycles, cycles64);
++			}
++#endif
++
++			/*
++			 * if this is the first call, allocate storage and
++			 * initialize
++			 */
++			if (!lstat_control.hashtab) {
++
++				spin_lock_init(&lstat_control.directory_lock);
++
++				/* guarantee all pointers at zero */
++				init_control_space();
++
++				lstat_control.hashtab =
++				    kmalloc(hashsize, GFP_KERNEL);
++				if (!lstat_control.hashtab) {
++					error = -ENOSPC;
++#ifdef DEBUG_LOCKMETER
++					printk("!!error kmalloc of hashtab\n");
++#endif
++				}
++				lstat_control.dir = vmalloc(dirsize);
++				if (!lstat_control.dir) {
++					error = -ENOSPC;
++#ifdef DEBUG_LOCKMETER
++					printk("!!error kmalloc of dir\n");
++#endif
++				}
++
++				for (cpu = 0; cpu < num_online_cpus(); cpu++) {
++					lstat_control.counts[cpu] =
++						vmalloc(countsize);
++					if (!lstat_control.counts[cpu]) {
++						error = -ENOSPC;
++#ifdef DEBUG_LOCKMETER
++						printk("!!error vmalloc of "
++							"counts[%d]\n", cpu);
++#endif
++					}
++					lstat_control.read_lock_counts[cpu] =
++						(lstat_read_lock_cpu_counts_t *)
++						kmalloc(read_lock_countsize,
++							GFP_KERNEL);
++					if (!lstat_control.
++							read_lock_counts[cpu]) {
++						error = -ENOSPC;
++#ifdef DEBUG_LOCKMETER
++						printk("!!error kmalloc of "
++						  "read_lock_counts[%d]\n",
++							cpu);
++#endif
++					}
++				}
++			}
++
++			if (error) {
++				/*
++				 * One or more kmalloc failures -- free
++				 * everything
++				 */
++				release_control_space();
++			} else {
++
++				if (!reset_lstat_data()) {
++					error = -EINVAL;
++					break;
++				};
++
++				/*
++				 * record starting and ending times and the
++				 * like
++				 */
++				if (lstat_control.intervals == 0) {
++					do_gettimeofday(&tv);
++					lstat_control.first_started_time =
++						tv.tv_sec;
++				}
++				lstat_control.started_cycles64 = get_cycles64();
++				do_gettimeofday(&tv);
++				lstat_control.started_time = tv.tv_sec;
++
++				lstat_control.state = LSTAT_ON;
++			}
++		} else {
++			error = -EBUSY;	/* already ON */
++		}
++		break;
++
++	case LSTAT_RESET:
++		if (lstat_control.state == LSTAT_OFF) {
++			if (!reset_lstat_data())
++				error = -EINVAL;
++		} else {
++			error = -EBUSY;	/* still on; can't reset */
++		}
++		break;
++
++	case LSTAT_RELEASE:
++		if (lstat_control.state == LSTAT_OFF) {
++			release_control_space();
++			lstat_control.intervals = 0;
++			lstat_control.enabled_cycles64 = 0;
++		} else {
++			error = -EBUSY;
++		}
++		break;
++
++	default:
++		error = -EINVAL;
++	}			/* switch */
++
++	_raw_spin_unlock(&lstat_control.control_lock);
++	return error ? error : len;
++}
++
++#ifdef USER_MODE_TESTING
++/* following used for user mode testing */
++void
++lockmeter_init()
++{
++	int dirsize, hashsize, countsize, read_lock_countsize, cpu;
++
++	printf("lstat_control is at %x size=%d\n", &lstat_control,
++		sizeof (lstat_control));
++	printf("sizeof(spinlock_t)=%d\n", sizeof (spinlock_t));
++	lstat_control.state = LSTAT_ON;
++
++	lstat_control.directory_lock = SPIN_LOCK_UNLOCKED;
++	lstat_control.next_free_dir_index = 1;	/* 0 is for overflows */
++	lstat_control.next_free_read_lock_index = 1;
++
++	dirsize = LSTAT_MAX_STAT_INDEX * sizeof (lstat_directory_entry_t);
++	hashsize = (1 + LSTAT_HASH_TABLE_SIZE) * sizeof (ushort);
++	countsize = sizeof (lstat_cpu_counts_t);
++	read_lock_countsize = sizeof (lstat_read_lock_cpu_counts_t);
++
++	lstat_control.hashtab = (ushort *) malloc(hashsize);
++
++	if (lstat_control.hashtab == 0) {
++		printf("malloc failure for at line %d in lockmeter.c\n",
++			__LINE__);
++		exit(0);
++	}
++
++	lstat_control.dir = (lstat_directory_entry_t *) malloc(dirsize);
++
++	if (lstat_control.dir == 0) {
++		printf("malloc failure for at line %d in lockmeter.c\n", cpu,
++			__LINE__);
++		exit(0);
++	}
++
++	for (cpu = 0; cpu < num_online_cpus(); cpu++) {
++		int j, k;
++		j = (int) (lstat_control.counts[cpu] =
++			   (lstat_cpu_counts_t *) malloc(countsize));
++		k = (int) (lstat_control.read_lock_counts[cpu] =
++			   (lstat_read_lock_cpu_counts_t *)
++			   malloc(read_lock_countsize));
++		if (j * k == 0) {
++			printf("malloc failure for cpu=%d at line %d in "
++				"lockmeter.c\n", cpu, __LINE__);
++			exit(0);
++		}
++	}
++
++	memset(lstat_control.hashtab, 0, hashsize);
++	memset(lstat_control.dir, 0, dirsize);
++
++	for (cpu = 0; cpu < num_online_cpus(); cpu++) {
++		memset(lstat_control.counts[cpu], 0, countsize);
++		memset(lstat_control.read_lock_counts[cpu], 0,
++			read_lock_countsize);
++	}
++}
++
++asm(" \
++.align	4 \
++.globl	__write_lock_failed \
++__write_lock_failed: \
++	" LOCK "addl	$" RW_LOCK_BIAS_STR ",(%eax) \
++1:	cmpl	$" RW_LOCK_BIAS_STR ",(%eax) \
++	jne	1b \
++\
++	" LOCK "subl	$" RW_LOCK_BIAS_STR ",(%eax) \
++	jnz	__write_lock_failed \
++	ret \
++\
++\
++.align	4 \
++.globl	__read_lock_failed \
++__read_lock_failed: \
++	lock ; incl	(%eax) \
++1:	cmpl	$1,(%eax) \
++	js	1b \
++\
++	lock ; decl	(%eax) \
++	js	__read_lock_failed \
++	ret \
++");
++#endif
++
++EXPORT_SYMBOL(_metered_spin_lock);
++EXPORT_SYMBOL(_metered_spin_unlock);
++EXPORT_SYMBOL(_metered_spin_trylock);
++EXPORT_SYMBOL(_metered_read_lock);
++EXPORT_SYMBOL(_metered_read_unlock);
++EXPORT_SYMBOL(_metered_write_lock);
++EXPORT_SYMBOL(_metered_write_unlock);
+--- linux-2.6.0/kernel/Makefile	2003-11-09 16:45:05.000000000 -0800
++++ 25/kernel/Makefile	2003-12-28 23:26:33.000000000 -0800
+@@ -11,6 +11,7 @@ obj-y     = sched.o fork.o exec_domain.o
+ obj-$(CONFIG_FUTEX) += futex.o
+ obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o
+ obj-$(CONFIG_SMP) += cpu.o
++obj-$(CONFIG_LOCKMETER) += lockmeter.o
+ obj-$(CONFIG_UID16) += uid16.o
+ obj-$(CONFIG_MODULES) += module.o
+ obj-$(CONFIG_KALLSYMS) += kallsyms.o
+--- linux-2.6.0/kernel/pid.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/kernel/pid.c	2003-12-28 23:21:08.000000000 -0800
+@@ -268,6 +268,9 @@ void switch_exec_pids(task_t *leader, ta
+  * machine.  From a minimum of 16 slots up to 4096 slots at one gigabyte or
+  * more.
+  */
++#ifdef CONFIG_KGDB
++int kgdb_pid_init_done; /* so we don't call prior to... */
++#endif
+ void __init pidhash_init(void)
+ {
+ 	int i, j, pidhash_size;
+@@ -289,6 +292,9 @@ void __init pidhash_init(void)
+ 		for (j = 0; j < pidhash_size; j++)
+ 			INIT_LIST_HEAD(&pid_hash[i][j]);
+ 	}
++#ifdef CONFIG_KGDB
++	kgdb_pid_init_done++;
++#endif
+ }
+ 
+ void __init pidmap_init(void)
+--- linux-2.6.0/kernel/power/Kconfig	2003-09-27 18:57:47.000000000 -0700
++++ 25/kernel/power/Kconfig	2003-12-28 23:23:06.000000000 -0800
+@@ -40,7 +40,7 @@ config SOFTWARE_SUSPEND
+ 	  involved in suspending. Also in this case there is a risk that buffers
+ 	  on disk won't match with saved ones.
+ 
+-	  For more information take a look at Documentation/swsusp.txt.
++	  For more information take a look at Documentation/power/swsusp.txt.
+ 
+ config PM_DISK
+ 	bool "Suspend-to-Disk Support"
+--- linux-2.6.0/kernel/power/swsusp.c	2003-10-17 15:58:04.000000000 -0700
++++ 25/kernel/power/swsusp.c	2003-12-28 23:23:06.000000000 -0800
+@@ -33,7 +33,7 @@
+  *
+  * More state savers are welcome. Especially for the scsi layer...
+  *
+- * For TODOs,FIXMEs also look in Documentation/swsusp.txt
++ * For TODOs,FIXMEs also look in Documentation/power/swsusp.txt
+  */
+ 
+ #include <linux/module.h>
+--- linux-2.6.0/kernel/printk.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/kernel/printk.c	2003-12-28 23:26:35.000000000 -0800
+@@ -150,6 +150,7 @@ __setup("console=", console_setup);
+ static int __init log_buf_len_setup(char *str)
+ {
+ 	unsigned long size = memparse(str, &str);
++	unsigned long flags;
+ 
+ 	if (size > log_buf_len) {
+ 		unsigned long start, dest_idx, offset;
+@@ -161,7 +162,7 @@ static int __init log_buf_len_setup(char
+ 			goto out;
+ 		}
+ 
+-		spin_lock_irq(&logbuf_lock);
++		spin_lock_irqsave(&logbuf_lock, flags);
+ 		log_buf_len = size;
+ 		log_buf = new_log_buf;
+ 
+@@ -175,7 +176,7 @@ static int __init log_buf_len_setup(char
+ 		log_start -= offset;
+ 		con_start -= offset;
+ 		log_end -= offset;
+-		spin_unlock_irq(&logbuf_lock);
++		spin_unlock_irqrestore(&logbuf_lock, flags);
+ 
+ 		printk("log_buf_len: %d\n", log_buf_len);
+ 	}
+@@ -447,9 +448,13 @@ asmlinkage int printk(const char *fmt, .
+ 	char *p;
+ 	static char printk_buf[1024];
+ 	static int log_level_unknown = 1;
++	static int printk_cpu = -1;
+ 
+-	if (oops_in_progress) {
+-		/* If a crash is occurring, make sure we can't deadlock */
++	if (oops_in_progress && printk_cpu == smp_processor_id()) {
++		/*
++		 * If a crash is occurring during printk() on this CPU, make
++		 * sure we can't deadlock
++		 */
+ 		spin_lock_init(&logbuf_lock);
+ 		/* And make sure that we print immediately */
+ 		init_MUTEX(&console_sem);
+@@ -457,6 +462,7 @@ asmlinkage int printk(const char *fmt, .
+ 
+ 	/* This stops the holder of console_sem just where we want him */
+ 	spin_lock_irqsave(&logbuf_lock, flags);
++	printk_cpu = smp_processor_id();
+ 
+ 	/* Emit the output into the temporary buffer */
+ 	va_start(args, fmt);
+--- linux-2.6.0/kernel/sched.c	2003-12-17 21:20:03.000000000 -0800
++++ 25/kernel/sched.c	2003-12-28 23:26:33.000000000 -0800
+@@ -79,13 +79,13 @@
+  */
+ #define MIN_TIMESLICE		( 10 * HZ / 1000)
+ #define MAX_TIMESLICE		(200 * HZ / 1000)
+-#define ON_RUNQUEUE_WEIGHT	30
+-#define CHILD_PENALTY		95
++#define ON_RUNQUEUE_WEIGHT	 30
++#define CHILD_PENALTY		 95
+ #define PARENT_PENALTY		100
+-#define EXIT_WEIGHT		3
+-#define PRIO_BONUS_RATIO	25
++#define EXIT_WEIGHT		  3
++#define PRIO_BONUS_RATIO	 25
+ #define MAX_BONUS		(MAX_USER_PRIO * PRIO_BONUS_RATIO / 100)
+-#define INTERACTIVE_DELTA	2
++#define INTERACTIVE_DELTA	  2
+ #define MAX_SLEEP_AVG		(AVG_TIMESLICE * MAX_BONUS)
+ #define STARVATION_LIMIT	(MAX_SLEEP_AVG)
+ #define NS_MAX_SLEEP_AVG	(JIFFIES_TO_NS(MAX_SLEEP_AVG))
+@@ -143,7 +143,7 @@
+ #define TASK_INTERACTIVE(p) \
+ 	((p)->prio <= (p)->static_prio - DELTA(p))
+ 
+-#define JUST_INTERACTIVE_SLEEP(p) \
++#define INTERACTIVE_SLEEP(p) \
+ 	(JIFFIES_TO_NS(MAX_SLEEP_AVG * \
+ 		(MAX_BONUS / 2 + DELTA((p)) + 1) / MAX_BONUS - 1))
+ 
+@@ -168,7 +168,8 @@
+  */
+ 
+ #define BASE_TIMESLICE(p) (MIN_TIMESLICE + \
+-	((MAX_TIMESLICE - MIN_TIMESLICE) * (MAX_PRIO-1-(p)->static_prio)/(MAX_USER_PRIO - 1)))
++		((MAX_TIMESLICE - MIN_TIMESLICE) * \
++			(MAX_PRIO-1 - (p)->static_prio) / (MAX_USER_PRIO-1)))
+ 
+ static inline unsigned int task_timeslice(task_t *p)
+ {
+@@ -199,11 +200,11 @@ struct prio_array {
+ struct runqueue {
+ 	spinlock_t lock;
+ 	unsigned long nr_running, nr_switches, expired_timestamp,
+-			nr_uninterruptible;
++		      nr_uninterruptible, timestamp_last_tick;
+ 	task_t *curr, *idle;
+ 	struct mm_struct *prev_mm;
+ 	prio_array_t *active, *expired, arrays[2];
+-	int prev_cpu_load[NR_CPUS];
++	int best_expired_prio, prev_cpu_load[NR_CPUS];
+ #ifdef CONFIG_NUMA
+ 	atomic_t *node_nr_running;
+ 	int prev_node_load[MAX_NUMNODES];
+@@ -225,7 +226,7 @@ static DEFINE_PER_CPU(struct runqueue, r
+  * Default context-switch locking:
+  */
+ #ifndef prepare_arch_switch
+-# define prepare_arch_switch(rq, next)	do { } while(0)
++# define prepare_arch_switch(rq, next)	do { } while (0)
+ # define finish_arch_switch(rq, next)	spin_unlock_irq(&(rq)->lock)
+ # define task_running(rq, p)		((rq)->curr == (p))
+ #endif
+@@ -269,9 +270,9 @@ __init void node_nr_running_init(void)
+ 
+ #else /* !CONFIG_NUMA */
+ 
+-# define nr_running_init(rq)   do { } while (0)
+-# define nr_running_inc(rq)    do { (rq)->nr_running++; } while (0)
+-# define nr_running_dec(rq)    do { (rq)->nr_running--; } while (0)
++# define nr_running_init(rq)	do { } while (0)
++# define nr_running_inc(rq)	do { (rq)->nr_running++; } while (0)
++# define nr_running_dec(rq)	do { (rq)->nr_running--; } while (0)
+ 
+ #endif /* CONFIG_NUMA */
+ 
+@@ -396,7 +397,7 @@ static void recalc_task_prio(task_t *p, 
+ 		 * other processes.
+ 		 */
+ 		if (p->mm && p->activated != -1 &&
+-			sleep_time > JUST_INTERACTIVE_SLEEP(p)){
++			sleep_time > INTERACTIVE_SLEEP(p)) {
+ 				p->sleep_avg = JIFFIES_TO_NS(MAX_SLEEP_AVG -
+ 						AVG_TIMESLICE);
+ 				if (!HIGH_CREDIT(p))
+@@ -413,37 +414,35 @@ static void recalc_task_prio(task_t *p, 
+ 			 * one timeslice worth of sleep avg bonus.
+ 			 */
+ 			if (LOW_CREDIT(p) &&
+-				sleep_time > JIFFIES_TO_NS(task_timeslice(p)))
+-					sleep_time =
+-						JIFFIES_TO_NS(task_timeslice(p));
++			    sleep_time > JIFFIES_TO_NS(task_timeslice(p)))
++				sleep_time = JIFFIES_TO_NS(task_timeslice(p));
+ 
+ 			/*
+ 			 * Non high_credit tasks waking from uninterruptible
+ 			 * sleep are limited in their sleep_avg rise as they
+ 			 * are likely to be cpu hogs waiting on I/O
+ 			 */
+-			if (p->activated == -1 && !HIGH_CREDIT(p) && p->mm){
+-				if (p->sleep_avg >= JUST_INTERACTIVE_SLEEP(p))
++			if (p->activated == -1 && !HIGH_CREDIT(p) && p->mm) {
++				if (p->sleep_avg >= INTERACTIVE_SLEEP(p))
+ 					sleep_time = 0;
+ 				else if (p->sleep_avg + sleep_time >=
+-					JUST_INTERACTIVE_SLEEP(p)){
+-						p->sleep_avg =
+-							JUST_INTERACTIVE_SLEEP(p);
+-						sleep_time = 0;
+-					}
++						INTERACTIVE_SLEEP(p)) {
++					p->sleep_avg = INTERACTIVE_SLEEP(p);
++					sleep_time = 0;
++				}
+ 			}
+ 
+ 			/*
+ 			 * This code gives a bonus to interactive tasks.
+ 			 *
+ 			 * The boost works by updating the 'average sleep time'
+-			 * value here, based on ->timestamp. The more time a task
+-			 * spends sleeping, the higher the average gets - and the
+-			 * higher the priority boost gets as well.
++			 * value here, based on ->timestamp. The more time a
++			 * task spends sleeping, the higher the average gets -
++			 * and the higher the priority boost gets as well.
+ 			 */
+ 			p->sleep_avg += sleep_time;
+ 
+-			if (p->sleep_avg > NS_MAX_SLEEP_AVG){
++			if (p->sleep_avg > NS_MAX_SLEEP_AVG) {
+ 				p->sleep_avg = NS_MAX_SLEEP_AVG;
+ 				if (!HIGH_CREDIT(p))
+ 					p->interactive_credit++;
+@@ -470,7 +469,7 @@ static inline void activate_task(task_t 
+ 	 * This checks to make sure it's not an uninterruptible task
+ 	 * that is now waking up.
+ 	 */
+-	if (!p->activated){
++	if (!p->activated) {
+ 		/*
+ 		 * Tasks which were woken up by interrupts (ie. hw events)
+ 		 * are most likely of interactive nature. So we give them
+@@ -480,13 +479,14 @@ static inline void activate_task(task_t 
+ 		 */
+ 		if (in_interrupt())
+ 			p->activated = 2;
+-		else
+-		/*
+-		 * Normal first-time wakeups get a credit too for on-runqueue
+-		 * time, but it will be weighted down:
+-		 */
++		else {
++			/*
++			 * Normal first-time wakeups get a credit too for
++			 * on-runqueue time, but it will be weighted down:
++			 */
+ 			p->activated = 1;
+ 		}
++	}
+ 	p->timestamp = now;
+ 
+ 	__activate_task(p, rq);
+@@ -632,13 +632,14 @@ repeat_lock_task:
+ 			 */
+ 			if (unlikely(sync && !task_running(rq, p) &&
+ 				(task_cpu(p) != smp_processor_id()) &&
+-				cpu_isset(smp_processor_id(), p->cpus_allowed))) {
++					cpu_isset(smp_processor_id(),
++							p->cpus_allowed))) {
+ 
+ 				set_task_cpu(p, smp_processor_id());
+ 				task_rq_unlock(rq, &flags);
+ 				goto repeat_lock_task;
+ 			}
+-			if (old_state == TASK_UNINTERRUPTIBLE){
++			if (old_state == TASK_UNINTERRUPTIBLE) {
+ 				rq->nr_uninterruptible--;
+ 				/*
+ 				 * Tasks on involuntary sleep don't earn
+@@ -663,7 +664,8 @@ repeat_lock_task:
+ }
+ int wake_up_process(task_t * p)
+ {
+-	return try_to_wake_up(p, TASK_STOPPED | TASK_INTERRUPTIBLE | TASK_UNINTERRUPTIBLE, 0);
++	return try_to_wake_up(p, TASK_STOPPED |
++		       		 TASK_INTERRUPTIBLE | TASK_UNINTERRUPTIBLE, 0);
+ }
+ 
+ EXPORT_SYMBOL(wake_up_process);
+@@ -674,6 +676,54 @@ int wake_up_state(task_t *p, unsigned in
+ }
+ 
+ /*
++ * Perform scheduler related setup for a newly forked process p.
++ * p is forked by current.
++ */
++void sched_fork(task_t *p)
++{
++	p->state = TASK_UNINTERRUPTIBLE;
++	INIT_LIST_HEAD(&p->run_list);
++	p->array = NULL;
++	spin_lock_init(&p->switch_lock);
++#ifdef CONFIG_PREEMPT
++	/*
++	 * During context-switch we hold precisely one spinlock, which
++	 * schedule_tail drops. (in the common case it's this_rq()->lock,
++	 * but it also can be p->switch_lock.) So we compensate with a count
++	 * of 1. Also, we want to start with kernel preemption disabled.
++	 */
++	p->thread_info->preempt_count = 1;
++#endif
++	/*
++	 * Share the timeslice between parent and child, thus the
++	 * total amount of pending timeslices in the system doesn't change,
++	 * resulting in more scheduling fairness.
++	 */
++	local_irq_disable();
++	p->time_slice = (current->time_slice + 1) >> 1;
++	/*
++	 * The remainder of the first timeslice might be recovered by
++	 * the parent if the child exits early enough.
++	 */
++	p->first_time_slice = 1;
++	current->time_slice >>= 1;
++	p->timestamp = sched_clock();
++	if (!current->time_slice) {
++		/*
++	 	 * This case is rare, it happens when the parent has only
++	 	 * a single jiffy left from its timeslice. Taking the
++		 * runqueue lock is not a problem.
++		 */
++		current->time_slice = 1;
++		preempt_disable();
++		scheduler_tick(0, 0);
++		local_irq_enable();
++		preempt_enable();
++	} else
++		local_irq_enable();
++}
++
++/*
+  * wake_up_forked_process - wake up a freshly forked process.
+  *
+  * This function will do some initial scheduler statistics housekeeping
+@@ -799,7 +849,8 @@ asmlinkage void schedule_tail(task_t *pr
+  * context_switch - switch to the new MM and the new
+  * thread's register state.
+  */
+-static inline task_t * context_switch(runqueue_t *rq, task_t *prev, task_t *next)
++static inline
++task_t * context_switch(runqueue_t *rq, task_t *prev, task_t *next)
+ {
+ 	struct mm_struct *mm = next->mm;
+ 	struct mm_struct *oldmm = prev->active_mm;
+@@ -947,10 +998,10 @@ static int sched_best_cpu(struct task_st
+ 	minload = 10000000;
+ 	for_each_node_with_cpus(i) {
+ 		/*
+-		 * Node load is always divided by nr_cpus_node to normalise 
++		 * Node load is always divided by nr_cpus_node to normalise
+ 		 * load values in case cpu count differs from node to node.
+ 		 * We first multiply node_nr_running by 10 to get a little
+-		 * better resolution.   
++		 * better resolution.
+ 		 */
+ 		load = 10 * atomic_read(&node_nr_running[i]) / nr_cpus_node(i);
+ 		if (load < minload) {
+@@ -989,7 +1040,7 @@ void sched_balance_exec(void)
+  *      load_{t} = load_{t-1}/2 + nr_node_running_{t}
+  * This way sudden load peaks are flattened out a bit.
+  * Node load is divided by nr_cpus_node() in order to compare nodes
+- * of different cpu count but also [first] multiplied by 10 to 
++ * of different cpu count but also [first] multiplied by 10 to
+  * provide better resolution.
+  */
+ static int find_busiest_node(int this_node)
+@@ -1027,8 +1078,10 @@ static int find_busiest_node(int this_no
+  * this_rq is locked already. Recalculate nr_running if we have to
+  * drop the runqueue lock.
+  */
+-static inline unsigned int double_lock_balance(runqueue_t *this_rq,
+-	runqueue_t *busiest, int this_cpu, int idle, unsigned int nr_running)
++static inline
++unsigned int double_lock_balance(runqueue_t *this_rq, runqueue_t *busiest,
++				 int this_cpu, int idle,
++				 unsigned int nr_running)
+ {
+ 	if (unlikely(!spin_trylock(&busiest->lock))) {
+ 		if (busiest < this_rq) {
+@@ -1036,7 +1089,8 @@ static inline unsigned int double_lock_b
+ 			spin_lock(&busiest->lock);
+ 			spin_lock(&this_rq->lock);
+ 			/* Need to recalculate nr_running */
+-			if (idle || (this_rq->nr_running > this_rq->prev_cpu_load[this_cpu]))
++			if (idle || (this_rq->nr_running >
++					this_rq->prev_cpu_load[this_cpu]))
+ 				nr_running = this_rq->nr_running;
+ 			else
+ 				nr_running = this_rq->prev_cpu_load[this_cpu];
+@@ -1049,7 +1103,9 @@ static inline unsigned int double_lock_b
+ /*
+  * find_busiest_queue - find the busiest runqueue among the cpus in cpumask.
+  */
+-static inline runqueue_t *find_busiest_queue(runqueue_t *this_rq, int this_cpu, int idle, int *imbalance, cpumask_t cpumask)
++static inline
++runqueue_t *find_busiest_queue(runqueue_t *this_rq, int this_cpu, int idle,
++			       int *imbalance, cpumask_t cpumask)
+ {
+ 	int nr_running, load, max_load, i;
+ 	runqueue_t *busiest, *rq_src;
+@@ -1061,10 +1117,11 @@ static inline runqueue_t *find_busiest_q
+ 	 * the lock held.
+ 	 *
+ 	 * We fend off statistical fluctuations in runqueue lengths by
+-	 * saving the runqueue length during the previous load-balancing
+-	 * operation and using the smaller one the current and saved lengths.
+-	 * If a runqueue is long enough for a longer amount of time then
+-	 * we recognize it and pull tasks from it.
++	 * saving the runqueue length (as seen by the balancing CPU) during
++	 * the previous load-balancing operation and using the smaller one
++	 * of the current and saved lengths. If a runqueue is long enough
++	 * for a longer amount of time then we recognize it and pull tasks
++	 * from it.
+ 	 *
+ 	 * The 'current runqueue length' is a statistical maximum variable,
+ 	 * for that one we take the longer one - to avoid fluctuations in
+@@ -1111,7 +1168,8 @@ static inline runqueue_t *find_busiest_q
+ 		goto out;
+ 	}
+ 
+-	nr_running = double_lock_balance(this_rq, busiest, this_cpu, idle, nr_running);
++	nr_running = double_lock_balance(this_rq, busiest, this_cpu,
++					 idle, nr_running);
+ 	/*
+ 	 * Make sure nothing changed since we checked the
+ 	 * runqueue length.
+@@ -1128,13 +1186,17 @@ out:
+  * pull_task - move a task from a remote runqueue to the local runqueue.
+  * Both runqueues must be locked.
+  */
+-static inline void pull_task(runqueue_t *src_rq, prio_array_t *src_array, task_t *p, runqueue_t *this_rq, int this_cpu)
++static inline
++void pull_task(runqueue_t *src_rq, prio_array_t *src_array, task_t *p,
++	       runqueue_t *this_rq, int this_cpu)
+ {
+ 	dequeue_task(p, src_array);
+ 	nr_running_dec(src_rq);
+ 	set_task_cpu(p, this_cpu);
+ 	nr_running_inc(this_rq);
+ 	enqueue_task(p, this_rq->active);
++	p->timestamp = sched_clock() -
++				(src_rq->timestamp_last_tick - p->timestamp);
+ 	/*
+ 	 * Note that idle threads have a prio of MAX_PRIO, for this test
+ 	 * to be always true for them.
+@@ -1144,25 +1206,25 @@ static inline void pull_task(runqueue_t 
+ }
+ 
+ /*
+- * Previously:
+- *
+- * #define CAN_MIGRATE_TASK(p,rq,this_cpu)	\
+- *	((!idle || (NS_TO_JIFFIES(now - (p)->timestamp) > \
+- *		cache_decay_ticks)) && !task_running(rq, p) && \
+- *			cpu_isset(this_cpu, (p)->cpus_allowed))
++ * can_migrate_task - may task p from runqueue rq be migrated to this_cpu?
+  */
+-
+-static inline int
+-can_migrate_task(task_t *tsk, runqueue_t *rq, int this_cpu, int idle)
++static inline
++int can_migrate_task(task_t *tsk, runqueue_t *rq, int this_cpu, int idle)
+ {
+-	unsigned long delta = sched_clock() - tsk->timestamp;
++	unsigned long delta = rq->timestamp_last_tick - tsk->timestamp;
+ 
+-	if (!idle && (delta <= JIFFIES_TO_NS(cache_decay_ticks)))
+-		return 0;
++	/*
++	 * We do not migrate tasks that are:
++	 * 1) running (obviously), or
++	 * 2) cannot be migrated to this CPU due to cpus_allowed, or
++	 * 3) are cache-hot on their current CPU.
++	 */
+ 	if (task_running(rq, tsk))
+ 		return 0;
+ 	if (!cpu_isset(this_cpu, tsk->cpus_allowed))
+ 		return 0;
++	if (!idle && (delta <= JIFFIES_TO_NS(cache_decay_ticks)))
++		return 0;
+ 	return 1;
+ }
+ 
+@@ -1182,7 +1244,8 @@ static void load_balance(runqueue_t *thi
+ 	struct list_head *head, *curr;
+ 	task_t *tmp;
+ 
+-	busiest = find_busiest_queue(this_rq, this_cpu, idle, &imbalance, cpumask);
++	busiest = find_busiest_queue(this_rq, this_cpu, idle,
++				     &imbalance, cpumask);
+ 	if (!busiest)
+ 		goto out;
+ 
+@@ -1224,13 +1287,6 @@ skip_bitmap:
+ skip_queue:
+ 	tmp = list_entry(curr, task_t, run_list);
+ 
+-	/*
+-	 * We do not migrate tasks that are:
+-	 * 1) running (obviously), or
+-	 * 2) cannot be migrated to this CPU due to cpus_allowed, or
+-	 * 3) are cache-hot on their current CPU.
+-	 */
+-
+ 	curr = curr->prev;
+ 
+ 	if (!can_migrate_task(tmp, busiest, this_cpu, idle)) {
+@@ -1240,6 +1296,8 @@ skip_queue:
+ 		goto skip_bitmap;
+ 	}
+ 	pull_task(busiest, array, tmp, this_rq, this_cpu);
++
++	/* Only migrate one task if we are idle */
+ 	if (!idle && --imbalance) {
+ 		if (curr != head)
+ 			goto skip_queue;
+@@ -1329,7 +1387,7 @@ static inline void rebalance_tick(runque
+ }
+ #endif
+ 
+-DEFINE_PER_CPU(struct kernel_stat, kstat) = { { 0 } };
++DEFINE_PER_CPU(struct kernel_stat, kstat);
+ 
+ EXPORT_PER_CPU_SYMBOL(kstat);
+ 
+@@ -1340,12 +1398,14 @@ EXPORT_PER_CPU_SYMBOL(kstat);
+  * interactivity of a task if the first expired task had to wait more
+  * than a 'reasonable' amount of time. This deadline timeout is
+  * load-dependent, as the frequency of array switched decreases with
+- * increasing number of running tasks:
++ * increasing number of running tasks. We also ignore the interactivity
++ * if a better static_prio task has expired:
+  */
+ #define EXPIRED_STARVING(rq) \
+-		(STARVATION_LIMIT && ((rq)->expired_timestamp && \
++	((STARVATION_LIMIT && ((rq)->expired_timestamp && \
+ 		(jiffies - (rq)->expired_timestamp >= \
+-			STARVATION_LIMIT * ((rq)->nr_running) + 1)))
++			STARVATION_LIMIT * ((rq)->nr_running) + 1))) || \
++			((rq)->curr->static_prio > (rq)->best_expired_prio))
+ 
+ /*
+  * This function gets called by the timer code, with HZ frequency.
+@@ -1361,6 +1421,8 @@ void scheduler_tick(int user_ticks, int 
+ 	runqueue_t *rq = this_rq();
+ 	task_t *p = current;
+ 
++	rq->timestamp_last_tick = sched_clock();
++
+ 	if (rcu_pending(cpu))
+ 		rcu_check_callbacks(cpu, user_ticks);
+ 
+@@ -1427,6 +1489,8 @@ void scheduler_tick(int user_ticks, int 
+ 			rq->expired_timestamp = jiffies;
+ 		if (!TASK_INTERACTIVE(p) || EXPIRED_STARVING(rq)) {
+ 			enqueue_task(p, rq->expired);
++			if (p->static_prio < rq->best_expired_prio)
++				rq->best_expired_prio = p->static_prio;
+ 		} else
+ 			enqueue_task(p, rq->active);
+ 	} else {
+@@ -1470,6 +1534,7 @@ void scheduling_functions_start_here(voi
+  */
+ asmlinkage void schedule(void)
+ {
++	long *switch_count;
+ 	task_t *prev, *next;
+ 	runqueue_t *rq;
+ 	prio_array_t *array;
+@@ -1516,32 +1581,25 @@ need_resched:
+ 	 * if entering off of a kernel preemption go straight
+ 	 * to picking the next task.
+ 	 */
+-	if (unlikely(preempt_count() & PREEMPT_ACTIVE))
+-		goto pick_next_task;
+-
+-	switch (prev->state) {
+-	case TASK_INTERRUPTIBLE:
+-		if (unlikely(signal_pending(prev))) {
++	switch_count = &prev->nivcsw;
++	if (prev->state && !(preempt_count() & PREEMPT_ACTIVE)) {
++		switch_count = &prev->nvcsw;
++		if (unlikely((prev->state & TASK_INTERRUPTIBLE) &&
++				unlikely(signal_pending(prev))))
+ 			prev->state = TASK_RUNNING;
+-			break;
+-		}
+-	default:
+-		deactivate_task(prev, rq);
+-		prev->nvcsw++;
+-		break;
+-	case TASK_RUNNING:
+-		prev->nivcsw++;
++		else
++			deactivate_task(prev, rq);
+ 	}
+-pick_next_task:
++
+ 	if (unlikely(!rq->nr_running)) {
+ #ifdef CONFIG_SMP
+ 		load_balance(rq, 1, cpu_to_node_mask(smp_processor_id()));
+-		if (rq->nr_running)
+-			goto pick_next_task;
+ #endif
+-		next = rq->idle;
+-		rq->expired_timestamp = 0;
+-		goto switch_tasks;
++		if (!rq->nr_running) {
++			next = rq->idle;
++			rq->expired_timestamp = 0;
++			goto switch_tasks;
++		}
+ 	}
+ 
+ 	array = rq->active;
+@@ -1553,6 +1611,7 @@ pick_next_task:
+ 		rq->expired = array;
+ 		array = rq->active;
+ 		rq->expired_timestamp = 0;
++		rq->best_expired_prio = MAX_PRIO;
+ 	}
+ 
+ 	idx = sched_find_first_bit(array->bitmap);
+@@ -1577,7 +1636,7 @@ switch_tasks:
+ 	RCU_qsctr(task_cpu(prev))++;
+ 
+ 	prev->sleep_avg -= run_time;
+-	if ((long)prev->sleep_avg <= 0){
++	if ((long)prev->sleep_avg <= 0) {
+ 		prev->sleep_avg = 0;
+ 		if (!(HIGH_CREDIT(prev) || LOW_CREDIT(prev)))
+ 			prev->interactive_credit--;
+@@ -1588,6 +1647,7 @@ switch_tasks:
+ 		next->timestamp = now;
+ 		rq->nr_switches++;
+ 		rq->curr = next;
++		++*switch_count;
+ 
+ 		prepare_arch_switch(rq, next);
+ 		prev = context_switch(rq, prev, next);
+@@ -1653,7 +1713,8 @@ EXPORT_SYMBOL(default_wake_function);
+  * started to run but is not in state TASK_RUNNING.  try_to_wake_up() returns
+  * zero in this (rare) case, and we handle it by continuing to scan the queue.
+  */
+-static void __wake_up_common(wait_queue_head_t *q, unsigned int mode, int nr_exclusive, int sync)
++static void __wake_up_common(wait_queue_head_t *q, unsigned int mode,
++			     int nr_exclusive, int sync)
+ {
+ 	struct list_head *tmp, *next;
+ 
+@@ -1730,7 +1791,8 @@ void complete(struct completion *x)
+ 
+ 	spin_lock_irqsave(&x->wait.lock, flags);
+ 	x->done++;
+-	__wake_up_common(&x->wait, TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE, 1, 0);
++	__wake_up_common(&x->wait, TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE,
++			 1, 0);
+ 	spin_unlock_irqrestore(&x->wait.lock, flags);
+ }
+ 
+@@ -1742,7 +1804,8 @@ void complete_all(struct completion *x)
+ 
+ 	spin_lock_irqsave(&x->wait.lock, flags);
+ 	x->done += UINT_MAX/2;
+-	__wake_up_common(&x->wait, TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE, 0, 0);
++	__wake_up_common(&x->wait, TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE,
++			 0, 0);
+ 	spin_unlock_irqrestore(&x->wait.lock, flags);
+ }
+ 
+@@ -1769,9 +1832,9 @@ void wait_for_completion(struct completi
+ 
+ EXPORT_SYMBOL(wait_for_completion);
+ 
+-#define	SLEEP_ON_VAR				\
+-	unsigned long flags;			\
+-	wait_queue_t wait;			\
++#define	SLEEP_ON_VAR					\
++	unsigned long flags;				\
++	wait_queue_t wait;				\
+ 	init_waitqueue_entry(&wait, current);
+ 
+ #define SLEEP_ON_HEAD					\
+@@ -1779,9 +1842,9 @@ EXPORT_SYMBOL(wait_for_completion);
+ 	__add_wait_queue(q, &wait);			\
+ 	spin_unlock(&q->lock);
+ 
+-#define	SLEEP_ON_TAIL						\
+-	spin_lock_irq(&q->lock);				\
+-	__remove_wait_queue(q, &wait);				\
++#define	SLEEP_ON_TAIL					\
++	spin_lock_irq(&q->lock);			\
++	__remove_wait_queue(q, &wait);			\
+ 	spin_unlock_irqrestore(&q->lock, flags);
+ 
+ void interruptible_sleep_on(wait_queue_head_t *q)
+@@ -1891,6 +1954,13 @@ out_unlock:
+ 
+ EXPORT_SYMBOL(set_user_nice);
+ 
++#if defined( CONFIG_KGDB)
++struct task_struct * kgdb_get_idle(int this_cpu)
++{
++        return cpu_rq(this_cpu)->idle;
++}
++#endif
++
+ #ifndef __alpha__
+ 
+ /*
+@@ -1906,9 +1976,9 @@ asmlinkage long sys_nice(int increment)
+ 	long nice;
+ 
+ 	/*
+-	 *	Setpriority might change our priority at the same moment.
+-	 *	We don't have to worry. Conceptually one call occurs first
+-	 *	and we have a single winner.
++	 * Setpriority might change our priority at the same moment.
++	 * We don't have to worry. Conceptually one call occurs first
++	 * and we have a single winner.
+ 	 */
+ 	if (increment < 0) {
+ 		if (!capable(CAP_SYS_NICE))
+@@ -2088,7 +2158,7 @@ out_nounlock:
+  * @param: structure containing the new RT priority.
+  */
+ asmlinkage long sys_sched_setscheduler(pid_t pid, int policy,
+-				      struct sched_param __user *param)
++				       struct sched_param __user *param)
+ {
+ 	return setscheduler(pid, policy, param);
+ }
+@@ -2395,7 +2465,8 @@ asmlinkage long sys_sched_get_priority_m
+  * this syscall writes the default timeslice value of a given process
+  * into the user-space timespec buffer. A value of '0' means infinity.
+  */
+-asmlinkage long sys_sched_rr_get_interval(pid_t pid, struct timespec __user *interval)
++asmlinkage
++long sys_sched_rr_get_interval(pid_t pid, struct timespec __user *interval)
+ {
+ 	int retval = -EINVAL;
+ 	struct timespec t;
+@@ -2445,17 +2516,16 @@ static inline struct task_struct *younge
+ 
+ static void show_task(task_t * p)
+ {
+-	unsigned long free = 0;
+ 	task_t *relative;
+-	int state;
+-	static const char * stat_nam[] = { "R", "S", "D", "T", "Z", "W" };
++	unsigned state;
++	static const char *stat_nam[] = { "R", "S", "D", "T", "Z", "W" };
+ 
+ 	printk("%-13.13s ", p->comm);
+ 	state = p->state ? __ffs(p->state) + 1 : 0;
+-	if (((unsigned) state) < sizeof(stat_nam)/sizeof(char *))
++	if (state < ARRAY_SIZE(stat_nam))
+ 		printk(stat_nam[state]);
+ 	else
+-		printk(" ");
++		printk("?");
+ #if (BITS_PER_LONG == 32)
+ 	if (p == current)
+ 		printk(" current  ");
+@@ -2467,13 +2537,7 @@ static void show_task(task_t * p)
+ 	else
+ 		printk(" %016lx ", thread_saved_pc(p));
+ #endif
+-	{
+-		unsigned long * n = (unsigned long *) (p->thread_info+1);
+-		while (!*n)
+-			n++;
+-		free = (unsigned long) n - (unsigned long)(p->thread_info+1);
+-	}
+-	printk("%5lu %5d %6d ", free, p->pid, p->parent->pid);
++	printk("%5d %6d ", p->pid, p->parent->pid);
+ 	if ((relative = eldest_child(p)))
+ 		printk("%5d ", relative->pid);
+ 	else
+@@ -2500,12 +2564,12 @@ void show_state(void)
+ 
+ #if (BITS_PER_LONG == 32)
+ 	printk("\n"
+-	       "                         free                        sibling\n");
+-	printk("  task             PC    stack   pid father child younger older\n");
++	       "                                               sibling\n");
++	printk("  task             PC      pid father child younger older\n");
+ #else
+ 	printk("\n"
+-	       "                                 free                        sibling\n");
+-	printk("  task                 PC        stack   pid father child younger older\n");
++	       "                                                       sibling\n");
++	printk("  task                 PC          pid father child younger older\n");
+ #endif
+ 	read_lock(&tasklist_lock);
+ 	do_each_thread(g, p) {
+@@ -2639,7 +2703,9 @@ static void move_task_away(struct task_s
+ 		if (p->prio < rq_dest->curr->prio)
+ 			resched_task(rq_dest->curr);
+ 	}
+- out:
++	p->timestamp = rq_dest->timestamp_last_tick;
++
++out:
+ 	double_rq_unlock(this_rq(), rq_dest);
+ 	local_irq_restore(flags);
+ }
+@@ -2708,11 +2774,10 @@ static int migration_thread(void * data)
+  * migration_call - callback that gets triggered when a CPU is added.
+  * Here we can start up the necessary migration thread for the new CPU.
+  */
+-static int migration_call(struct notifier_block *nfb,
+-			  unsigned long action,
++static int migration_call(struct notifier_block *nfb, unsigned long action,
+ 			  void *hcpu)
+ {
+-	long cpu = (long) hcpu;
++	long cpu = (long)hcpu;
+ 	migration_startup_t startup;
+ 
+ 	switch (action) {
+@@ -2741,7 +2806,8 @@ static int migration_call(struct notifie
+ 	return NOTIFY_OK;
+ }
+ 
+-static struct notifier_block migration_notifier = { &migration_call, NULL, 0 };
++static struct notifier_block migration_notifier
++			= { .notifier_call = &migration_call };
+ 
+ __init int migration_init(void)
+ {
+@@ -2777,7 +2843,7 @@ static void kstat_init_cpu(int cpu)
+ }
+ 
+ static int __devinit kstat_cpu_notify(struct notifier_block *self,
+-					unsigned long action, void *hcpu)
++				      unsigned long action, void *hcpu)
+ {
+ 	int cpu = (unsigned long)hcpu;
+ 	switch(action) {
+@@ -2791,13 +2857,14 @@ static int __devinit kstat_cpu_notify(st
+ }
+ 
+ static struct notifier_block __devinitdata kstat_nb = {
+-	.notifier_call  = kstat_cpu_notify,
+-	.next           = NULL,
++	.notifier_call	= kstat_cpu_notify,
++	.next		= NULL,
+ };
+ 
+-__init static void init_kstat(void) {
++__init static void init_kstat(void)
++{
+ 	kstat_cpu_notify(&kstat_nb, (unsigned long)CPU_UP_PREPARE,
+-			(void *)(long)smp_processor_id());
++			 (void *)(long)smp_processor_id());
+ 	register_cpu_notifier(&kstat_nb);
+ }
+ 
+@@ -2814,6 +2881,8 @@ void __init sched_init(void)
+ 		rq = cpu_rq(i);
+ 		rq->active = rq->arrays;
+ 		rq->expired = rq->arrays + 1;
++		rq->best_expired_prio = MAX_PRIO;
++
+ 		spin_lock_init(&rq->lock);
+ 		INIT_LIST_HEAD(&rq->migration_queue);
+ 		atomic_set(&rq->nr_iowait, 0);
+@@ -2861,7 +2930,7 @@ void __might_sleep(char *file, int line)
+ 		printk(KERN_ERR "Debug: sleeping function called from invalid"
+ 				" context at %s:%d\n", file, line);
+ 		printk("in_atomic():%d, irqs_disabled():%d\n",
+-				in_atomic(), irqs_disabled());
++			in_atomic(), irqs_disabled());
+ 		dump_stack();
+ 	}
+ #endif
+--- linux-2.6.0/kernel/softirq.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/kernel/softirq.c	2003-12-28 23:22:00.000000000 -0800
+@@ -117,11 +117,22 @@ EXPORT_SYMBOL(do_softirq);
+ 
+ void local_bh_enable(void)
+ {
++	if (in_irq()) {
++		printk("local_bh_enable() was called in hard irq context.   "
++			"This is probably a bug\n");
++		dump_stack();
++	}
++
+ 	__local_bh_enable();
+-	WARN_ON(irqs_disabled());
+-	if (unlikely(!in_interrupt() &&
+-		     local_softirq_pending()))
++	if (unlikely(!in_interrupt() && local_softirq_pending())) {
++		if (irqs_disabled()) {
++			printk("local_bh_enable() was called with local "
++				"interrupts disabled.  This is probably a"
++				" bug\n");
++			dump_stack();
++		}
+ 		invoke_softirq();
++	}
+ 	preempt_check_resched();
+ }
+ EXPORT_SYMBOL(local_bh_enable);
+--- linux-2.6.0/kernel/sys.c	2003-10-25 14:45:46.000000000 -0700
++++ 25/kernel/sys.c	2003-12-28 23:22:12.000000000 -0800
+@@ -1323,8 +1323,6 @@ asmlinkage long sys_setrlimit(unsigned i
+  * either stopped or zombied.  In the zombied case the task won't get
+  * reaped till shortly after the call to getrusage(), in both cases the
+  * task being examined is in a frozen state so the counters won't change.
+- *
+- * FIXME! Get the fault counts properly!
+  */
+ int getrusage(struct task_struct *p, int who, struct rusage __user *ru)
+ {
+--- linux-2.6.0/kernel/sysctl.c	2003-11-09 16:45:05.000000000 -0800
++++ 25/kernel/sysctl.c	2003-12-28 23:26:39.000000000 -0800
+@@ -794,6 +794,22 @@ static ctl_table fs_table[] = {
+ 		.mode		= 0644,
+ 		.proc_handler	= &proc_dointvec,
+ 	},
++	{
++		.ctl_name	= FS_AIO_NR,
++		.procname	= "aio-nr",
++		.data		= &aio_nr,
++		.maxlen		= sizeof(aio_nr),
++		.mode		= 0444,
++		.proc_handler	= &proc_dointvec,
++	},
++	{
++		.ctl_name	= FS_AIO_MAX_NR,
++		.procname	= "aio-max-nr",
++		.data		= &aio_max_nr,
++		.maxlen		= sizeof(aio_max_nr),
++		.mode		= 0644,
++		.proc_handler	= &proc_dointvec,
++	},
+ 	{ .ctl_name = 0 }
+ };
+ 
+--- linux-2.6.0/lib/inflate.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/lib/inflate.c	2003-12-28 23:22:52.000000000 -0800
+@@ -221,7 +221,7 @@ STATIC const ush mask_bits[] = {
+     0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff
+ };
+ 
+-#define NEXTBYTE()  (uch)get_byte()
++#define NEXTBYTE()  ({ int v = get_byte(); if (v < 0) goto underrun; (uch)v; })
+ #define NEEDBITS(n) {while(k<(n)){b|=((ulg)NEXTBYTE())<<k;k+=8;}}
+ #define DUMPBITS(n) {b>>=(n);k-=(n);}
+ 
+@@ -620,6 +620,9 @@ STATIC int inflate_codes(
+ 
+   /* done */
+   return 0;
++
++ underrun:
++  return 4;			/* Input underrun */
+ }
+ 
+ 
+@@ -676,6 +679,9 @@ DEBG("<stor");
+ 
+   DEBG(">");
+   return 0;
++
++ underrun:
++  return 4;			/* Input underrun */
+ }
+ 
+ 
+@@ -908,6 +914,9 @@ DEBG("dyn7 ");
+ 
+   DEBG(">");
+   return 0;
++
++ underrun:
++  return 4;			/* Input underrun */
+ }
+ 
+ 
+@@ -956,6 +965,9 @@ STATIC int inflate_block(
+ 
+   /* bad block type */
+   return 2;
++
++ underrun:
++  return 4;			/* Input underrun */
+ }
+ 
+ 
+@@ -1079,9 +1091,9 @@ static int gunzip(void)
+     ulg orig_len = 0;       /* original uncompressed length */
+     int res;
+ 
+-    magic[0] = (unsigned char)get_byte();
+-    magic[1] = (unsigned char)get_byte();
+-    method = (unsigned char)get_byte();
++    magic[0] = NEXTBYTE();
++    magic[1] = NEXTBYTE();
++    method   = NEXTBYTE();
+ 
+     if (magic[0] != 037 ||
+ 	((magic[1] != 0213) && (magic[1] != 0236))) {
+@@ -1108,29 +1120,29 @@ static int gunzip(void)
+ 	    error("Input has invalid flags");
+ 	    return -1;
+     }
+-    (ulg)get_byte();	/* Get timestamp */
+-    ((ulg)get_byte()) << 8;
+-    ((ulg)get_byte()) << 16;
+-    ((ulg)get_byte()) << 24;
++    NEXTBYTE();	/* Get timestamp */
++    NEXTBYTE();
++    NEXTBYTE();
++    NEXTBYTE();
+ 
+-    (void)get_byte();  /* Ignore extra flags for the moment */
+-    (void)get_byte();  /* Ignore OS type for the moment */
++    (void)NEXTBYTE();  /* Ignore extra flags for the moment */
++    (void)NEXTBYTE();  /* Ignore OS type for the moment */
+ 
+     if ((flags & EXTRA_FIELD) != 0) {
+-	    unsigned len = (unsigned)get_byte();
+-	    len |= ((unsigned)get_byte())<<8;
+-	    while (len--) (void)get_byte();
++	    unsigned len = (unsigned)NEXTBYTE();
++	    len |= ((unsigned)NEXTBYTE())<<8;
++	    while (len--) (void)NEXTBYTE();
+     }
+ 
+     /* Get original file name if it was truncated */
+     if ((flags & ORIG_NAME) != 0) {
+ 	    /* Discard the old name */
+-	    while (get_byte() != 0) /* null */ ;
++	    while (NEXTBYTE() != 0) /* null */ ;
+     } 
+ 
+     /* Discard file comment if any */
+     if ((flags & COMMENT) != 0) {
+-	    while (get_byte() != 0) /* null */ ;
++	    while (NEXTBYTE() != 0) /* null */ ;
+     }
+ 
+     /* Decompress */
+@@ -1147,6 +1159,9 @@ static int gunzip(void)
+ 	    case 3:
+ 		    error("out of memory");
+ 		    break;
++	    case 4:
++		    error("out of input data");
++		    break;
+ 	    default:
+ 		    error("invalid compressed format (other)");
+ 	    }
+@@ -1157,15 +1172,15 @@ static int gunzip(void)
+     /* crc32  (see algorithm.doc)
+      * uncompressed input size modulo 2^32
+      */
+-    orig_crc = (ulg) get_byte();
+-    orig_crc |= (ulg) get_byte() << 8;
+-    orig_crc |= (ulg) get_byte() << 16;
+-    orig_crc |= (ulg) get_byte() << 24;
++    orig_crc = (ulg) NEXTBYTE();
++    orig_crc |= (ulg) NEXTBYTE() << 8;
++    orig_crc |= (ulg) NEXTBYTE() << 16;
++    orig_crc |= (ulg) NEXTBYTE() << 24;
+     
+-    orig_len = (ulg) get_byte();
+-    orig_len |= (ulg) get_byte() << 8;
+-    orig_len |= (ulg) get_byte() << 16;
+-    orig_len |= (ulg) get_byte() << 24;
++    orig_len = (ulg) NEXTBYTE();
++    orig_len |= (ulg) NEXTBYTE() << 8;
++    orig_len |= (ulg) NEXTBYTE() << 16;
++    orig_len |= (ulg) NEXTBYTE() << 24;
+     
+     /* Validate decompression */
+     if (orig_crc != CRC_VALUE) {
+@@ -1177,6 +1192,10 @@ static int gunzip(void)
+ 	    return -1;
+     }
+     return 0;
++
++ underrun:			/* NEXTBYTE() goto's here if needed */
++    error("out of input data");
++    return -1;
+ }
+ 
+ 
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/lib/int_sqrt.c	2003-12-28 23:21:48.000000000 -0800
+@@ -0,0 +1,32 @@
++
++#include <linux/kernel.h>
++#include <linux/module.h>
++
++/**
++ * int_sqrt - rough approximation to sqrt
++ * @x: integer of which to calculate the sqrt
++ *
++ * A very rough approximation to the sqrt() function.
++ */
++unsigned long int_sqrt(unsigned long x)
++{
++	unsigned long op, res, one;
++
++	op = x;
++	res = 0;
++
++	one = 1 << 30;
++	while (one > op)
++		one >>= 2;
++
++	while (one != 0) {
++		if (op >= res + one) {
++			op = op - (res + one);
++			res = res +  2 * one;
++		}
++		res /= 2;
++		one /= 4;
++	}
++	return res;
++}
++EXPORT_SYMBOL(int_sqrt);
+--- linux-2.6.0/lib/Makefile	2003-11-23 19:03:02.000000000 -0800
++++ 25/lib/Makefile	2003-12-28 23:22:10.000000000 -0800
+@@ -5,7 +5,7 @@
+ 
+ lib-y := errno.o ctype.o string.o vsprintf.o cmdline.o \
+ 	 bust_spinlocks.o rbtree.o radix-tree.o dump_stack.o \
+-	 kobject.o idr.o div64.o parser.o
++	 kobject.o idr.o div64.o parser.o int_sqrt.o mask.o
+ 
+ lib-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o
+ lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/lib/mask.c	2003-12-28 23:22:10.000000000 -0800
+@@ -0,0 +1,178 @@
++/*
++ * lib/mask.c
++ *
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License.  See the file "COPYING" in the main directory of this archive
++ * for more details.
++ *
++ * Copyright (C) 2003 Silicon Graphics, Inc.  All Rights Reserved.
++ */
++
++/*
++ * Routines to manipulate multi-word bit masks, such as cpumasks.
++ *
++ * The ascii representation of multi-word bit masks displays each
++ * 32bit word in hex (not zero filled), and for masks longer than
++ * one word, uses a comma separator between words.  Words are
++ * displayed in big-endian order most significant first.  And hex
++ * digits within a word are also in big-endian order, of course.
++ *
++ * Examples:
++ *   A mask with just bit 0 set displays as "1".
++ *   A mask with just bit 127 set displays as "80000000,0,0,0".
++ *   A mask with just bit 64 set displays as "1,0,0".
++ *   A mask with bits 0, 1, 2, 4, 8, 16, 32 and 64 set displays
++ *     as "1,1,10117".  The first "1" is for bit 64, the second
++ *     for bit 32, the third for bit 16, and so forth, to the
++ *     "7", which is for bits 2, 1 and 0.
++ *   A mask with bits 32 through 39 set displays as "ff,0".
++ *
++ * The internal binary representation of masks is as one or
++ * an array of unsigned longs, perhaps wrapped in a struct for
++ * convenient use as an lvalue.  The following code doesn't know
++ * about any such struct details, relying on inline macros in
++ * files such as cpumask.h to pass in an unsigned long pointer
++ * and a length (in bytes), describing the mask contents.
++ * The 32bit words in the array are in little-endian order,
++ * low order word first.  Beware that this is the reverse order
++ * of the ascii representation.
++ *
++ * Even though the size of the input mask is provided in bytes,
++ * the following code may assume that the mask is a multiple of
++ * 32 or 64 bit words long, and ignore any fractional portion
++ * of a word at the end.  The main reason the size is passed in
++ * bytes is because it is so easy to write 'sizeof(somemask_t)'
++ * in the macros.
++ *
++ * Masks are not a single,simple type, like classic 'C'
++ * nul-term strings.  Rather they are a family of types, one
++ * for each different length.  Inline macros are used to pick
++ * up the actual length, where it is known to the compiler, and
++ * pass it down to these routines, which work on any specified
++ * length array of unsigned longs.  Poor man's templates.
++ *
++ * Many of the inline macros don't call into the following
++ * routines.  Some of them call into other kernel routines,
++ * such as memset(), set_bit() or ffs().  Some of them can
++ * accomplish their task right inline, such as returning the
++ * size or address of the unsigned long array, or optimized
++ * versions of the macros for the most common case of an array
++ * of a single unsigned long.
++ */
++
++#include <linux/kernel.h>
++#include <linux/string.h>
++#include <linux/ctype.h>
++#include <linux/slab.h>
++#include <linux/errno.h>
++#include <linux/gfp.h>
++#include <asm/uaccess.h>
++
++#define MAX_HEX_PER_BYTE 4	/* dont need > 4 hex chars to encode byte */
++#define BASE 16			/* masks are input in hex (base 16) */
++#define NUL ((char)'\0')	/* nul-terminator */
++
++/**
++ * __mask_snprintf_len - represent multi-word bit mask as string.
++ * @buf: The buffer to place the result into
++ * @buflen: The size of the buffer, including the trailing null space
++ * @maskp: Points to beginning of multi-word bit mask.
++ * @maskbytes: Number of bytes in bit mask at maskp.
++ *
++ * This routine is expected to be called from a macro such as:
++ *
++ * #define cpumask_snprintf(buf, buflen, mask) \
++ *   __mask_snprintf_len(buf, buflen, cpus_addr(mask), sizeof(mask))
++ */
++
++int __mask_snprintf_len(char *buf, unsigned int buflen,
++	const unsigned long *maskp, unsigned int maskbytes)
++{
++	u32 *wordp = (u32 *)maskp;
++	int i = maskbytes/sizeof(u32) - 1;
++	int len = 0;
++	char *sep = "";
++
++	while (i >= 1 && wordp[i] == 0)
++		i--;
++	while (i >= 0) {
++		len += snprintf(buf+len, buflen-len, "%s%x", sep, wordp[i]);
++		sep = ",";
++		i--;
++	}
++	return len;
++}
++
++/**
++ * __mask_parse_len - parse user string into maskbytes mask at maskp
++ * @ubuf: The user buffer from which to take the string
++ * @ubuflen: The size of this buffer, including the terminating char
++ * @maskp: Place resulting mask (array of unsigned longs) here
++ * @masklen: Construct mask at @maskp to have exactly @masklen bytes
++ *
++ * @masklen is a multiple of sizeof(unsigned long).  A mask of
++ * @masklen bytes is constructed starting at location @maskp.
++ * The value of this mask is specified by the user provided
++ * string starting at address @ubuf.  Only bytes in the range
++ * [@ubuf, @ubuf+@ubuflen) can be read from user space, and
++ * reading will stop after the first byte that is not a comma
++ * or valid hex digit in the characters [,0-9a-fA-F], or at
++ * the point @ubuf+@ubuflen, whichever comes first.
++ *
++ * Since the user only needs about 2.25 chars per byte to encode
++ * a mask (one char per nibble plus one comma separator or nul
++ * terminator per byte), we blow them off with -EINVAL if they
++ * claim a @ubuflen more than 4 (MAX_HEX_PER_BYTE) times maskbytes.
++ * An empty word (delimited by two consecutive commas, for example)
++ * is taken as zero.  If @buflen is zero, the entire @maskp is set
++ * to zero.
++ *
++ * If the user provides fewer comma-separated ascii words
++ * than there are 32 bit words in maskbytes, we zero fill the
++ * remaining high order words.  If they provide more, they fail
++ * with -EINVAL.  Each comma-separate ascii word is taken as
++ * a hex representation; leading zeros are ignored, and do not
++ * imply octal.  '00e1', 'e1', '00E1', 'E1' are all the same.
++ * If user passes a word that is larger than fits in a u32,
++ * they fail with -EOVERFLOW.
++ */
++
++int __mask_parse_len(const char __user *ubuf, unsigned int ubuflen,
++	unsigned long *maskp, unsigned int maskbytes)
++{
++	char buf[maskbytes * MAX_HEX_PER_BYTE + sizeof(NUL)];
++	char *bp = buf;
++	u32 *wordp = (u32 *)maskp;
++	char *p;
++	int i, j;
++
++	if (ubuflen > maskbytes * MAX_HEX_PER_BYTE)
++		return -EINVAL;
++	if (copy_from_user(buf, ubuf, ubuflen))
++		return -EFAULT;
++	buf[ubuflen] = NUL;
++
++	/*
++	 * Put the words into wordp[] in big-endian order,
++	 * then go back and reverse them.
++	 */
++	memset(wordp, 0, maskbytes);
++	i = j = 0;
++	while ((p = strsep(&bp, ",")) != NULL) {
++		unsigned long long t;
++		if (j == maskbytes/sizeof(u32))
++			return -EINVAL;
++		t = simple_strtoull(p, 0, BASE);
++		if (t != (u32)t)
++			return -EOVERFLOW;
++		wordp[j++] = t;
++	}
++	--j;
++	while (i < j) {
++		u32 t = wordp[i];
++		wordp[i] = wordp[j];
++		wordp[j] = t;
++		i++, --j;
++	}
++	return 0;
++}
+--- linux-2.6.0/lib/parser.c	2003-10-08 15:07:10.000000000 -0700
++++ 25/lib/parser.c	2003-12-28 23:22:09.000000000 -0800
+@@ -11,6 +11,17 @@
+ #include <linux/slab.h>
+ #include <linux/string.h>
+ 
++/**
++ * match_one: - Determines if a string matches a simple pattern
++ * @s: the string to examine for presense of the pattern
++ * @p: the string containing the pattern
++ * @args: array of %MAX_OPT_ARGS &substring_t elements. Used to return match
++ * locations.
++ *
++ * Description: Determines if the pattern @p is present in string @s. Can only
++ * match extremely simple token=arg style patterns. If the pattern is found,
++ * the location(s) of the arguments will be returned in the @args array.
++ */
+ static int match_one(char *s, char *p, substring_t args[])
+ {
+ 	char *meta;
+@@ -74,6 +85,20 @@ static int match_one(char *s, char *p, s
+ 	}
+ }
+ 
++/**
++ * match_token: - Find a token (and optional args) in a string
++ * @s: the string to examine for token/argument pairs
++ * @table: match_table_t describing the set of allowed option tokens and the
++ * arguments that may be associated with them. Must be terminated with a
++ * &struct match_token whose pattern is set to the NULL pointer.
++ * @args: array of %MAX_OPT_ARGS &substring_t elements. Used to return match
++ * locations.
++ *
++ * Description: Detects which if any of a set of token strings has been passed
++ * to it. Tokens can include up to MAX_OPT_ARGS instances of basic c-style
++ * format identifiers which will be taken into account when matching the
++ * tokens, and whose locations will be returned in the @args array.
++ */
+ int match_token(char *s, match_table_t table, substring_t args[])
+ {
+ 	struct match_token *p;
+@@ -84,6 +109,16 @@ int match_token(char *s, match_table_t t
+ 	return p->token;
+ }
+ 
++/**
++ * match_number: scan a number in the given base from a substring_t
++ * @s: substring to be scanned
++ * @result: resulting integer on success
++ * @base: base to use when converting string
++ *
++ * Description: Given a &substring_t and a base, attempts to parse the substring
++ * as a number in that base. On success, sets @result to the integer represented
++ * by the string and returns 0. Returns either -ENOMEM or -EINVAL on failure.
++ */
+ static int match_number(substring_t *s, int *result, int base)
+ {
+ 	char *endp;
+@@ -103,27 +138,71 @@ static int match_number(substring_t *s, 
+ 	return ret;
+ }
+ 
++/**
++ * match_int: - scan a decimal representation of an integer from a substring_t
++ * @s: substring_t to be scanned
++ * @result: resulting integer on success
++ *
++ * Description: Attempts to parse the &substring_t @s as a decimal integer. On
++ * success, sets @result to the integer represented by the string and returns 0.
++ * Returns either -ENOMEM or -EINVAL on failure.
++ */
+ int match_int(substring_t *s, int *result)
+ {
+ 	return match_number(s, result, 0);
+ }
+ 
++/**
++ * match_octal: - scan an octal representation of an integer from a substring_t
++ * @s: substring_t to be scanned
++ * @result: resulting integer on success
++ *
++ * Description: Attempts to parse the &substring_t @s as an octal integer. On
++ * success, sets @result to the integer represented by the string and returns
++ * 0. Returns either -ENOMEM or -EINVAL on failure.
++ */
+ int match_octal(substring_t *s, int *result)
+ {
+ 	return match_number(s, result, 8);
+ }
+ 
++/**
++ * match_hex: - scan a hex representation of an integer from a substring_t
++ * @s: substring_t to be scanned
++ * @result: resulting integer on success
++ *
++ * Description: Attempts to parse the &substring_t @s as a hexadecimal integer.
++ * On success, sets @result to the integer represented by the string and
++ * returns 0. Returns either -ENOMEM or -EINVAL on failure.
++ */
+ int match_hex(substring_t *s, int *result)
+ {
+ 	return match_number(s, result, 16);
+ }
+ 
++/**
++ * match_strcpy: - copies the characters from a substring_t to a string
++ * @to: string to copy characters to.
++ * @s: &substring_t to copy
++ *
++ * Description: Copies the set of characters represented by the given
++ * &substring_t @s to the c-style string @to. Caller guarantees that @to is
++ * large enough to hold the characters of @s.
++ */
+ void match_strcpy(char *to, substring_t *s)
+ {
+ 	memcpy(to, s->from, s->to - s->from);
+ 	to[s->to - s->from] = '\0';
+ }
+ 
++/**
++ * match_strdup: - allocate a new string with the contents of a substring_t
++ * @s: &substring_t to copy
++ *
++ * Description: Allocates and returns a string filled with the contents of
++ * the &substring_t @s. The caller is responsible for freeing the returned
++ * string with kfree().
++ */
+ char *match_strdup(substring_t *s)
+ {
+ 	char *p = kmalloc(s->to - s->from + 1, GFP_KERNEL);
+--- linux-2.6.0/MAINTAINERS	2003-11-23 19:03:00.000000000 -0800
++++ 25/MAINTAINERS	2003-12-28 23:22:47.000000000 -0800
+@@ -73,7 +73,7 @@ S: Status, one of the following:
+ 3C359 NETWORK DRIVER
+ P:	Mike Phillips
+ M:	mikep@linuxtr.net
+-L:	linux-net@vger.rutgers.edu
++L:	linux-net@vger.kernel.org
+ L:	linux-tr@linuxtr.net
+ W:	http://www.linuxtr.net
+ S:	Maintained
+@@ -929,8 +929,9 @@ W:	http://www.linuxia64.org/
+ S:	Maintained
+ 
+ SN-IA64 (Itanium) SUB-PLATFORM
+-P:	John Hesterberg
+-M:	jh@sgi.com
++P:	Jesse Barnes
++M:	jbarnes@sgi.com
++L:	linux-altix@sgi.com
+ L:	linux-ia64@linuxia64.org
+ W:	http://www.sgi.com/altix
+ S:	Maintained
+@@ -1154,6 +1155,12 @@ W:	http://sf.net/projects/kernel-janitor
+ W:	http://developer.osdl.org/rddunlap/kj-patches/
+ S:	Maintained
+ 
++KGDB FOR I386 PLATFORM
++P:	George Anzinger
++M:	george@mvista.com
++L:	linux-net@vger.kernel.org
++S:	Supported
++
+ KERNEL NFSD
+ P:	Neil Brown
+ M:	neilb@cse.unsw.edu.au
+@@ -1234,8 +1241,8 @@ W:	http://ldm.sourceforge.net
+ S:	Maintained
+ 
+ LSILOGIC/SYMBIOS/NCR 53C8XX and 53C1010 PCI-SCSI drivers
+-P:	Gerard Roudier
+-M:	groudier@free.fr
++P:	Matthew Wilcox
++M:	matthew@wil.cx
+ L:	linux-scsi@vger.kernel.org
+ S:	Maintained
+ 
+@@ -1468,7 +1475,7 @@ ONSTREAM SCSI TAPE DRIVER
+ P:	Willem Riede
+ M:	osst@riede.org
+ L:	osst@linux1.onstream.nl
+-L:	linux-scsi@vger.rutgers.edu
++L:	linux-scsi@vger.kernel.org
+ S:	Maintained
+ 
+ OPL3-SA2, SA3, and SAx DRIVER
+@@ -1556,11 +1563,8 @@ M:	greg@kroah.com
+ S:	Maintained
+ 
+ PCMCIA SUBSYSTEM
+-P:	David Hinds
+-M:	dahinds@users.sourceforge.net
+-L:	linux-kernel@vger.kernel.org
+-W:	http://pcmcia-cs.sourceforge.net
+-S:	Maintained
++L:	http://lists.infradead.org/mailman/listinfo/linux-pcmcia
++S:	Unmaintained
+ 
+ PCNET32 NETWORK DRIVER
+ P:	Thomas Bogendörfer
+--- linux-2.6.0/Makefile	2003-12-17 21:20:01.000000000 -0800
++++ 25/Makefile	2003-12-28 23:23:07.000000000 -0800
+@@ -1,7 +1,7 @@
+ VERSION = 2
+ PATCHLEVEL = 6
+ SUBLEVEL = 0
+-EXTRAVERSION =
++EXTRAVERSION = -mm2
+ 
+ # *DOCUMENTATION*
+ # To see a list of typical targets execute "make help"
+@@ -275,7 +275,7 @@ NOSTDINC_FLAGS  = -nostdinc -iwithprefix
+ CPPFLAGS        := -D__KERNEL__ -Iinclude \
+ 		   $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include)
+ 
+-CFLAGS 		:= -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \
++CFLAGS 		:= -Wall -Wstrict-prototypes -Wno-trigraphs \
+ 	  	   -fno-strict-aliasing -fno-common
+ AFLAGS		:= -D__ASSEMBLY__
+ 
+@@ -431,6 +431,12 @@ libs-y		:= $(libs-y1) $(libs-y2)
+ # ---------------------------------------------------------------------------
+ 
+ 
++ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
++CFLAGS		+= -Os
++else
++CFLAGS		+= -O2
++endif
++
+ ifndef CONFIG_FRAME_POINTER
+ CFLAGS		+= -fomit-frame-pointer
+ endif
+@@ -872,7 +878,7 @@ rpm:	clean spec
+ 	$(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version;\
+ 	mv -f $(objtree)/.tmp_version $(objtree)/.version;
+ 
+-	$(RPM) -ta ../$(KERNELPATH).tar.gz
++	$(RPM) --target $(UTS_MACHINE) -ta ../$(KERNELPATH).tar.gz
+ 	rm ../$(KERNELPATH).tar.gz
+ 
+ # Brief documentation of the typical targets used
+--- linux-2.6.0/mm/fadvise.c	2003-11-09 16:45:06.000000000 -0800
++++ 25/mm/fadvise.c	2003-12-28 23:21:20.000000000 -0800
+@@ -23,7 +23,6 @@
+ asmlinkage long sys_fadvise64_64(int fd, loff_t offset, loff_t len, int advice)
+ {
+ 	struct file *file = fget(fd);
+-	struct inode *inode;
+ 	struct address_space *mapping;
+ 	struct backing_dev_info *bdi;
+ 	pgoff_t start_index;
+@@ -33,8 +32,7 @@ asmlinkage long sys_fadvise64_64(int fd,
+ 	if (!file)
+ 		return -EBADF;
+ 
+-	inode = file->f_dentry->d_inode;
+-	mapping = inode->i_mapping;
++	mapping = file->f_mapping;
+ 	if (!mapping) {
+ 		ret = -EINVAL;
+ 		goto out;
+--- linux-2.6.0/mm/filemap.c	2003-11-23 19:03:02.000000000 -0800
++++ 25/mm/filemap.c	2003-12-28 23:26:44.000000000 -0800
+@@ -73,6 +73,9 @@
+  *  ->mmap_sem
+  *    ->i_sem			(msync)
+  *
++ *  ->i_sem
++ *    ->i_alloc_sem             (various)
++ *
+  *  ->inode_lock
+  *    ->sb_lock			(fs/fs-writeback.c)
+  *    ->mapping->page_lock	(__sync_single_inode)
+@@ -226,6 +229,18 @@ restart:
+ 
+ EXPORT_SYMBOL(filemap_fdatawait);
+ 
++int filemap_write_and_wait(struct address_space *mapping)
++{
++	int retval = 0;
++
++	if (mapping->nrpages) {
++		retval = filemap_fdatawrite(mapping);
++		if (retval == 0)
++			retval = filemap_fdatawait(mapping);
++	}
++	return retval;
++}
++
+ /*
+  * This adds a page to the page cache, starting out as locked, unreferenced,
+  * not uptodate and with no errors.
+@@ -292,22 +307,42 @@ static wait_queue_head_t *page_waitqueue
+ 	return &zone->wait_table[hash_ptr(page, zone->wait_table_bits)];
+ }
+ 
+-void wait_on_page_bit(struct page *page, int bit_nr)
++/*
++ * wait for the specified page bit to be cleared
++ * this could be a synchronous wait or could just queue an async
++ * notification callback depending on the wait queue entry parameter
++ *
++ * A NULL wait queue parameter defaults to sync behaviour
++ */
++int wait_on_page_bit_wq(struct page *page, int bit_nr, wait_queue_t *wait)
+ {
+ 	wait_queue_head_t *waitqueue = page_waitqueue(page);
+-	DEFINE_WAIT(wait);
++	DEFINE_WAIT(local_wait);
++
++	if (!wait)
++		wait = &local_wait; /* default to a sync wait entry */
+ 
+ 	do {
+-		prepare_to_wait(waitqueue, &wait, TASK_UNINTERRUPTIBLE);
++		prepare_to_wait(waitqueue, wait, TASK_UNINTERRUPTIBLE);
+ 		if (test_bit(bit_nr, &page->flags)) {
+ 			sync_page(page);
++			if (!is_sync_wait(wait)) {
++				/*
++				 * if we've queued an async wait queue
++				 * callback do not block; just tell the
++				 * caller to return and retry later when
++				 * the callback is notified
++				 */
++				return -EIOCBRETRY;
++			}
+ 			io_schedule();
+ 		}
+ 	} while (test_bit(bit_nr, &page->flags));
+-	finish_wait(waitqueue, &wait);
+-}
++	finish_wait(waitqueue, wait);
+ 
+-EXPORT_SYMBOL(wait_on_page_bit);
++	return 0;
++}
++EXPORT_SYMBOL(wait_on_page_bit_wq);
+ 
+ /**
+  * unlock_page() - unlock a locked page
+@@ -317,7 +352,9 @@ EXPORT_SYMBOL(wait_on_page_bit);
+  * Unlocks the page and wakes up sleepers in ___wait_on_page_locked().
+  * Also wakes sleepers in wait_on_page_writeback() because the wakeup
+  * mechananism between PageLocked pages and PageWriteback pages is shared.
+- * But that's OK - sleepers in wait_on_page_writeback() just go back to sleep.
++ * But that's OK - sleepers in wait_on_page_writeback() just go back to sleep,
++ * or in case the wakeup notifies async wait queue entries, as in the case
++ * of aio, retries would be triggered and may re-queue their callbacks.
+  *
+  * The first mb is necessary to safely close the critical section opened by the
+  * TestSetPageLocked(), the second mb is necessary to enforce ordering between
+@@ -358,26 +395,51 @@ void end_page_writeback(struct page *pag
+ EXPORT_SYMBOL(end_page_writeback);
+ 
+ /*
+- * Get a lock on the page, assuming we need to sleep to get it.
++ * Get a lock on the page, assuming we need to either sleep to get it
++ * or to queue an async notification callback to try again when its
++ * available.
++ *
++ * A NULL wait queue parameter defaults to sync behaviour. Otherwise
++ * it specifies the wait queue entry to be used for async notification
++ * or waiting.
+  *
+  * Ugly: running sync_page() in state TASK_UNINTERRUPTIBLE is scary.  If some
+  * random driver's requestfn sets TASK_RUNNING, we could busywait.  However
+  * chances are that on the second loop, the block layer's plug list is empty,
+  * so sync_page() will then return in state TASK_UNINTERRUPTIBLE.
+  */
+-void __lock_page(struct page *page)
++int __lock_page_wq(struct page *page, wait_queue_t *wait)
+ {
+ 	wait_queue_head_t *wqh = page_waitqueue(page);
+-	DEFINE_WAIT(wait);
++	DEFINE_WAIT(local_wait);
++
++	if (!wait)
++		wait = &local_wait;
+ 
+ 	while (TestSetPageLocked(page)) {
+-		prepare_to_wait(wqh, &wait, TASK_UNINTERRUPTIBLE);
++		prepare_to_wait(wqh, wait, TASK_UNINTERRUPTIBLE);
+ 		if (PageLocked(page)) {
+ 			sync_page(page);
++			if (!is_sync_wait(wait)) {
++				/*
++				 * if we've queued an async wait queue
++				 * callback do not block; just tell the
++				 * caller to return and retry later when
++				 * the callback is notified
++				 */
++				return -EIOCBRETRY;
++			}
+ 			io_schedule();
+ 		}
+ 	}
+-	finish_wait(wqh, &wait);
++	finish_wait(wqh, wait);
++	return 0;
++}
++EXPORT_SYMBOL(__lock_page_wq);
++
++void __lock_page(struct page *page)
++{
++	__lock_page_wq(page, NULL);
+ }
+ 
+ EXPORT_SYMBOL(__lock_page);
+@@ -432,8 +494,8 @@ EXPORT_SYMBOL(find_trylock_page);
+  *
+  * Returns zero if the page was not present. find_lock_page() may sleep.
+  */
+-struct page *find_lock_page(struct address_space *mapping,
+-				unsigned long offset)
++struct page *find_lock_page_wq(struct address_space *mapping,
++				unsigned long offset, wait_queue_t *wait)
+ {
+ 	struct page *page;
+ 
+@@ -444,7 +506,10 @@ repeat:
+ 		page_cache_get(page);
+ 		if (TestSetPageLocked(page)) {
+ 			spin_unlock(&mapping->page_lock);
+-			lock_page(page);
++			if (-EIOCBRETRY == lock_page_wq(page, wait)) {
++				page_cache_release(page);
++				return ERR_PTR(-EIOCBRETRY);
++			}
+ 			spin_lock(&mapping->page_lock);
+ 
+ 			/* Has the page been truncated while we slept? */
+@@ -461,6 +526,12 @@ repeat:
+ 
+ EXPORT_SYMBOL(find_lock_page);
+ 
++struct page *find_lock_page(struct address_space *mapping,
++				unsigned long offset)
++{
++	return find_lock_page_wq(mapping, offset, NULL);
++}
++
+ /**
+  * find_or_create_page - locate or add a pagecache page
+  *
+@@ -521,9 +592,12 @@ EXPORT_SYMBOL(find_or_create_page);
+  * The search returns a group of mapping-contiguous pages with ascending
+  * indexes.  There may be holes in the indices due to not-present pages.
+  *
+- * find_get_pages() returns the number of pages which were found.
++ * find_get_pages() returns the number of pages which were found
++ * and also atomically sets the next offset to continue looking up
++ * mapping contiguous pages from (useful when doing a range of
++ * pagevec lookups in chunks of PAGEVEC_SIZE).
+  */
+-unsigned int find_get_pages(struct address_space *mapping, pgoff_t start,
++unsigned int find_get_pages(struct address_space *mapping, pgoff_t *next,
+ 			    unsigned int nr_pages, struct page **pages)
+ {
+ 	unsigned int i;
+@@ -531,9 +605,12 @@ unsigned int find_get_pages(struct addre
+ 
+ 	spin_lock(&mapping->page_lock);
+ 	ret = radix_tree_gang_lookup(&mapping->page_tree,
+-				(void **)pages, start, nr_pages);
++				(void **)pages, *next, nr_pages);
+ 	for (i = 0; i < ret; i++)
+ 		page_cache_get(pages[i]);
++	if (ret)
++		*next = pages[ret - 1]->index + 1;
++
+ 	spin_unlock(&mapping->page_lock);
+ 	return ret;
+ }
+@@ -587,21 +664,46 @@ void do_generic_mapping_read(struct addr
+ 			     read_actor_t actor)
+ {
+ 	struct inode *inode = mapping->host;
+-	unsigned long index, offset;
++	unsigned long index, offset, first, last, end_index;
++	loff_t isize = i_size_read(inode);
+ 	struct page *cached_page;
+ 	int error;
+ 
+ 	cached_page = NULL;
+-	index = *ppos >> PAGE_CACHE_SHIFT;
++	first = *ppos >> PAGE_CACHE_SHIFT;
+ 	offset = *ppos & ~PAGE_CACHE_MASK;
++	last = (*ppos + desc->count) >> PAGE_CACHE_SHIFT;
++	end_index = isize >> PAGE_CACHE_SHIFT;
++	if (last > end_index)
++		last = end_index;
+ 
++	/* Don't repeat the readahead if we are executing aio retries */
++	if (in_aio()) {
++		if (is_retried_kiocb(io_wait_to_kiocb(current->io_wait)))
++			goto done_readahead;
++	}
++
++	/*
++	 * Let the readahead logic know upfront about all
++	 * the pages we'll need to satisfy this request
++	 */
++	for (index = first; index < last; index++)
++		page_cache_readahead(mapping, ra, filp, index);
++
++	if (ra->next_size == -1UL) {
++		/* the readahead window was maximally shrunk */
++		/* explicitly readahead at least what is needed now */
++		for (index = first; index < last; index++)
++			handle_ra_miss(mapping, ra, index);
++		do_page_cache_readahead(mapping, filp, first, last - first);
++	}
++
++done_readahead:
++	index = first;
+ 	for (;;) {
+ 		struct page *page;
+-		unsigned long end_index, nr, ret;
+-		loff_t isize = i_size_read(inode);
++		unsigned long nr, ret;
+ 
+-		end_index = isize >> PAGE_CACHE_SHIFT;
+-			
+ 		if (index > end_index)
+ 			break;
+ 		nr = PAGE_CACHE_SIZE;
+@@ -612,7 +714,6 @@ void do_generic_mapping_read(struct addr
+ 		}
+ 
+ 		cond_resched();
+-		page_cache_readahead(mapping, ra, filp, index);
+ 
+ 		nr = nr - offset;
+ find_page:
+@@ -662,7 +763,12 @@ page_not_up_to_date:
+ 			goto page_ok;
+ 
+ 		/* Get exclusive access to the page ... */
+-		lock_page(page);
++
++		if (lock_page_wq(page, current->io_wait)) {
++			pr_debug("queued lock page \n");
++			error = -EIOCBRETRY;
++			goto sync_error;
++		}
+ 
+ 		/* Did it get unhashed before we got the lock? */
+ 		if (!page->mapping) {
+@@ -684,13 +790,23 @@ readpage:
+ 		if (!error) {
+ 			if (PageUptodate(page))
+ 				goto page_ok;
+-			wait_on_page_locked(page);
++			if (wait_on_page_locked_wq(page, current->io_wait)) {
++				pr_debug("queued wait_on_page \n");
++				error = -EIOCBRETRY;
++				goto sync_error;
++			}
++
+ 			if (PageUptodate(page))
+ 				goto page_ok;
+ 			error = -EIO;
+ 		}
+ 
+-		/* UHHUH! A synchronous read error occurred. Report it */
++sync_error:
++		/* We don't have uptodate data in the page yet */
++		/* Could be due to an error or because we need to
++		 * retry when we get an async i/o notification.
++		 * Report the reason.
++		 */
+ 		desc->error = error;
+ 		page_cache_release(page);
+ 		break;
+@@ -804,7 +920,7 @@ __generic_file_aio_read(struct kiocb *io
+ 		struct address_space *mapping;
+ 		struct inode *inode;
+ 
+-		mapping = filp->f_dentry->d_inode->i_mapping;
++		mapping = filp->f_mapping;
+ 		inode = mapping->host;
+ 		retval = 0;
+ 		if (!count)
+@@ -844,22 +960,19 @@ __generic_file_aio_read(struct kiocb *io
+ out:
+ 	return retval;
+ }
+-
+ EXPORT_SYMBOL(__generic_file_aio_read);
+ 
+-ssize_t
+-generic_file_aio_read(struct kiocb *iocb, char __user *buf, size_t count, loff_t pos)
++ssize_t generic_file_aio_read(struct kiocb *iocb, char __user *buf,
++				size_t count, loff_t pos)
+ {
+ 	struct iovec local_iov = { .iov_base = buf, .iov_len = count };
+ 
+-	BUG_ON(iocb->ki_pos != pos);
+ 	return __generic_file_aio_read(iocb, &local_iov, 1, &iocb->ki_pos);
+ }
+-
+ EXPORT_SYMBOL(generic_file_aio_read);
+ 
+-ssize_t
+-generic_file_read(struct file *filp, char __user *buf, size_t count, loff_t *ppos)
++ssize_t generic_file_read(struct file *filp, char __user *buf,
++				size_t count, loff_t *ppos)
+ {
+ 	struct iovec local_iov = { .iov_base = buf, .iov_len = count };
+ 	struct kiocb kiocb;
+@@ -871,10 +984,10 @@ generic_file_read(struct file *filp, cha
+ 		ret = wait_on_sync_kiocb(&kiocb);
+ 	return ret;
+ }
+-
+ EXPORT_SYMBOL(generic_file_read);
+ 
+-int file_send_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size)
++int file_send_actor(read_descriptor_t * desc, struct page *page,
++				unsigned long offset, unsigned long size)
+ {
+ 	ssize_t written;
+ 	unsigned long count = desc->count;
+@@ -936,7 +1049,7 @@ asmlinkage ssize_t sys_readahead(int fd,
+ 	file = fget(fd);
+ 	if (file) {
+ 		if (file->f_mode & FMODE_READ) {
+-			struct address_space *mapping = file->f_dentry->d_inode->i_mapping;
++			struct address_space *mapping = file->f_mapping;
+ 			unsigned long start = offset >> PAGE_CACHE_SHIFT;
+ 			unsigned long end = (offset + count - 1) >> PAGE_CACHE_SHIFT;
+ 			unsigned long len = end - start + 1;
+@@ -955,7 +1068,7 @@ asmlinkage ssize_t sys_readahead(int fd,
+ static int FASTCALL(page_cache_read(struct file * file, unsigned long offset));
+ static int page_cache_read(struct file * file, unsigned long offset)
+ {
+-	struct address_space *mapping = file->f_dentry->d_inode->i_mapping;
++	struct address_space *mapping = file->f_mapping;
+ 	struct page *page; 
+ 	int error;
+ 
+@@ -990,16 +1103,16 @@ static int page_cache_read(struct file *
+  * it in the page cache, and handles the special cases reasonably without
+  * having a lot of duplicated code.
+  */
+-struct page * filemap_nopage(struct vm_area_struct * area, unsigned long address, int unused)
++struct page * filemap_nopage(struct vm_area_struct * area, unsigned long address, int *type)
+ {
+ 	int error;
+ 	struct file *file = area->vm_file;
+-	struct address_space *mapping = file->f_dentry->d_inode->i_mapping;
++	struct address_space *mapping = file->f_mapping;
+ 	struct file_ra_state *ra = &file->f_ra;
+ 	struct inode *inode = mapping->host;
+ 	struct page *page;
+ 	unsigned long size, pgoff, endoff;
+-	int did_readaround = 0;
++	int did_readaround = 0, majmin = VM_FAULT_MINOR;
+ 
+ 	pgoff = ((address - area->vm_start) >> PAGE_CACHE_SHIFT) + area->vm_pgoff;
+ 	endoff = ((area->vm_end - area->vm_start) >> PAGE_CACHE_SHIFT) + area->vm_pgoff;
+@@ -1048,6 +1161,14 @@ retry_find:
+ 		if (ra->mmap_miss > ra->mmap_hit + MMAP_LOTSAMISS)
+ 			goto no_cached_page;
+ 
++		/*
++		 * To keep the pgmajfault counter straight, we need to
++		 * check did_readaround, as this is an inner loop.
++		 */
++		if (!did_readaround) {
++			majmin = VM_FAULT_MAJOR;
++			inc_page_state(pgmajfault);
++		}
+ 		did_readaround = 1;
+ 		do_page_cache_readahead(mapping, file,
+ 				pgoff & ~(MMAP_READAROUND-1), MMAP_READAROUND);
+@@ -1069,6 +1190,8 @@ success:
+ 	 * Found the page and have a reference on it.
+ 	 */
+ 	mark_page_accessed(page);
++	if (type)
++		*type = majmin;
+ 	return page;
+ 
+ outside_data_content:
+@@ -1104,7 +1227,10 @@ no_cached_page:
+ 	return NULL;
+ 
+ page_not_uptodate:
+-	inc_page_state(pgmajfault);
++	if (!did_readaround) {
++		majmin = VM_FAULT_MAJOR;
++		inc_page_state(pgmajfault);
++	}
+ 	lock_page(page);
+ 
+ 	/* Did it get unhashed while we waited for it? */
+@@ -1166,7 +1292,7 @@ EXPORT_SYMBOL(filemap_nopage);
+ static struct page * filemap_getpage(struct file *file, unsigned long pgoff,
+ 					int nonblock)
+ {
+-	struct address_space *mapping = file->f_dentry->d_inode->i_mapping;
++	struct address_space *mapping = file->f_mapping;
+ 	struct page *page;
+ 	int error;
+ 
+@@ -1278,7 +1404,7 @@ static int filemap_populate(struct vm_ar
+ 			int nonblock)
+ {
+ 	struct file *file = vma->vm_file;
+-	struct address_space *mapping = file->f_dentry->d_inode->i_mapping;
++	struct address_space *mapping = file->f_mapping;
+ 	struct inode *inode = mapping->host;
+ 	unsigned long size;
+ 	struct mm_struct *mm = vma->vm_mm;
+@@ -1337,7 +1463,7 @@ static struct vm_operations_struct gener
+ 
+ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
+ {
+-	struct address_space *mapping = file->f_dentry->d_inode->i_mapping;
++	struct address_space *mapping = file->f_mapping;
+ 	struct inode *inode = mapping->host;
+ 
+ 	if (!mapping->a_ops->readpage)
+@@ -1460,7 +1586,9 @@ __grab_cache_page(struct address_space *
+ 	int err;
+ 	struct page *page;
+ repeat:
+-	page = find_lock_page(mapping, index);
++	page = find_lock_page_wq(mapping, index, current->io_wait);
++	if (IS_ERR(page))
++		return page;
+ 	if (!page) {
+ 		if (!*cached_page) {
+ 			*cached_page = page_cache_alloc(mapping);
+@@ -1605,9 +1733,9 @@ filemap_set_next_iovec(const struct iove
+  * Returns appropriate error code that caller should return or
+  * zero in case that write should be allowed.
+  */
+-inline int generic_write_checks(struct inode *inode,
+-		struct file *file, loff_t *pos, size_t *count, int isblk)
++inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk)
+ {
++	struct inode *inode = file->f_mapping->host;
+ 	unsigned long limit = current->rlim[RLIMIT_FSIZE].rlim_cur;
+ 
+         if (unlikely(*pos < 0))
+@@ -1669,7 +1797,7 @@ inline int generic_write_checks(struct i
+ 			*count = inode->i_sb->s_maxbytes - *pos;
+ 	} else {
+ 		loff_t isize;
+-		if (bdev_read_only(inode->i_bdev))
++		if (bdev_read_only(I_BDEV(inode)))
+ 			return -EPERM;
+ 		isize = i_size_read(inode);
+ 		if (*pos >= isize) {
+@@ -1687,6 +1815,7 @@ EXPORT_SYMBOL(generic_write_checks);
+ 
+ /*
+  * Write to a file through the page cache. 
++ * Called under i_sem for S_ISREG files.
+  *
+  * We put everything into the page cache prior to writing it. This is not a
+  * problem when writing full pages. With partial pages, however, we first have
+@@ -1695,11 +1824,11 @@ EXPORT_SYMBOL(generic_write_checks);
+  *							okir@monad.swb.de
+  */
+ ssize_t
+-generic_file_aio_write_nolock(struct kiocb *iocb, const struct iovec *iov,
++__generic_file_aio_write_nolock(struct kiocb *iocb, const struct iovec *iov,
+ 				unsigned long nr_segs, loff_t *ppos)
+ {
+ 	struct file *file = iocb->ki_filp;
+-	struct address_space * mapping = file->f_dentry->d_inode->i_mapping;
++	struct address_space * mapping = file->f_mapping;
+ 	struct address_space_operations *a_ops = mapping->a_ops;
+ 	size_t ocount;		/* original count */
+ 	size_t count;		/* after file limit checks */
+@@ -1746,11 +1875,10 @@ generic_file_aio_write_nolock(struct kio
+ 	current->backing_dev_info = mapping->backing_dev_info;
+ 	written = 0;
+ 
+-	err = generic_write_checks(inode, file, &pos, &count, isblk);
++	err = generic_write_checks(file, &pos, &count, isblk);
+ 	if (err)
+ 		goto out;
+ 
+-
+ 	if (count == 0)
+ 		goto out;
+ 
+@@ -1775,12 +1903,19 @@ generic_file_aio_write_nolock(struct kio
+ 		/*
+ 		 * Sync the fs metadata but not the minor inode changes and
+ 		 * of course not the data as we did direct DMA for the IO.
++		 * i_sem is held, which protects generic_osync_inode() from
++		 * livelocking.
+ 		 */
+ 		if (written >= 0 && file->f_flags & O_SYNC)
+-			status = generic_osync_inode(inode, OSYNC_METADATA);
++			status = generic_osync_inode(inode, mapping, OSYNC_METADATA);
+ 		if (written >= 0 && !is_sync_kiocb(iocb))
+ 			written = -EIOCBQUEUED;
+-		goto out_status;
++		if (written != -ENOTBLK)
++			goto out_status;
++		/*
++		 * direct-io write to a hole: fall through to buffered I/O
++		 */
++		written = 0;
+ 	}
+ 
+ 	buf = iov->iov_base;
+@@ -1804,6 +1939,10 @@ generic_file_aio_write_nolock(struct kio
+ 		fault_in_pages_readable(buf, bytes);
+ 
+ 		page = __grab_cache_page(mapping,index,&cached_page,&lru_pvec);
++		if (IS_ERR(page)) {
++			status = PTR_ERR(page);
++			break;
++		}
+ 		if (!page) {
+ 			status = -ENOMEM;
+ 			break;
+@@ -1852,7 +1991,11 @@ generic_file_aio_write_nolock(struct kio
+ 		page_cache_release(page);
+ 		if (status < 0)
+ 			break;
+-		balance_dirty_pages_ratelimited(mapping);
++		status = balance_dirty_pages_ratelimited(mapping);
++		if (status < 0) {
++			pr_debug("async balance_dirty_pages\n");
++			break;
++		}
+ 		cond_resched();
+ 	} while (count);
+ 	*ppos = pos;
+@@ -1863,12 +2006,22 @@ generic_file_aio_write_nolock(struct kio
+ 	/*
+ 	 * For now, when the user asks for O_SYNC, we'll actually give O_DSYNC
+ 	 */
+-	if (status >= 0) {
+-		if ((file->f_flags & O_SYNC) || IS_SYNC(inode))
+-			status = generic_osync_inode(inode,
+-					OSYNC_METADATA|OSYNC_DATA);
+-	}
++	if (likely(status >= 0)) {
++		if (unlikely((file->f_flags & O_SYNC) || IS_SYNC(inode))) {
++			if (!a_ops->writepage)
++				status = generic_osync_inode(inode, mapping,
++						OSYNC_METADATA|OSYNC_DATA);
++		}
++  	}
+ 	
++	/*
++	 * If we get here for O_DIRECT writes then we must have fallen through
++	 * to buffered writes (block instantiation inside i_size).  So we sync
++	 * the file data here, to try to honour O_DIRECT expectations.
++	 */
++	if (unlikely(file->f_flags & O_DIRECT) && written)
++		status = filemap_write_and_wait(mapping);
++
+ out_status:	
+ 	err = written ? written : status;
+ out:
+@@ -1880,6 +2033,55 @@ out:
+ EXPORT_SYMBOL(generic_file_aio_write_nolock);
+ 
+ ssize_t
++generic_file_aio_write_nolock(struct kiocb *iocb, const struct iovec *iov,
++				unsigned long nr_segs, loff_t *ppos)
++{
++	struct file *file = iocb->ki_filp;
++	struct address_space *mapping = file->f_mapping;
++	struct inode *inode = mapping->host;
++	ssize_t ret;
++	loff_t pos = *ppos;
++
++	if (!iov->iov_base && !is_sync_kiocb(iocb)) {
++		/* nothing to transfer, may just need to sync data */
++		ret = iov->iov_len; /* vector AIO not supported yet */
++		goto osync;
++	}
++
++	ret = __generic_file_aio_write_nolock(iocb, iov, nr_segs, ppos);
++
++	/*
++	 * Avoid doing a sync in parts for aio - its more efficient to
++	 * call in again after all the data has been copied
++	 */
++	if (!is_sync_kiocb(iocb))
++		return ret;
++
++osync:
++	if (ret > 0 && ((file->f_flags & O_SYNC) || IS_SYNC(inode))) {
++		ret = sync_page_range_nolock(inode, mapping, pos, ret);
++		if (ret >= 0)
++			*ppos = pos + ret;
++	}
++	return ret;
++}
++
++
++ssize_t
++__generic_file_write_nolock(struct file *file, const struct iovec *iov,
++				unsigned long nr_segs, loff_t *ppos)
++{
++	struct kiocb kiocb;
++	ssize_t ret;
++
++	init_sync_kiocb(&kiocb, file);
++	ret = __generic_file_aio_write_nolock(&kiocb, iov, nr_segs, ppos);
++	if (-EIOCBQUEUED == ret)
++		ret = wait_on_sync_kiocb(&kiocb);
++	return ret;
++}
++
++ssize_t
+ generic_file_write_nolock(struct file *file, const struct iovec *iov,
+ 				unsigned long nr_segs, loff_t *ppos)
+ {
+@@ -1899,36 +2101,62 @@ ssize_t generic_file_aio_write(struct ki
+ 			       size_t count, loff_t pos)
+ {
+ 	struct file *file = iocb->ki_filp;
+-	struct inode *inode = file->f_dentry->d_inode->i_mapping->host;
+-	ssize_t err;
+-	struct iovec local_iov = { .iov_base = (void __user *)buf, .iov_len = count };
++	struct address_space *mapping = file->f_mapping;
++	struct inode *inode = mapping->host;
++	ssize_t ret;
++	struct iovec local_iov = { .iov_base = (void __user *)buf,
++					.iov_len = count };
+ 
+-	BUG_ON(iocb->ki_pos != pos);
++	if (!buf && !is_sync_kiocb(iocb)) {
++		/* nothing to transfer, may just need to sync data */
++		ret = count;
++		goto osync;
++	}
+ 
+ 	down(&inode->i_sem);
+-	err = generic_file_aio_write_nolock(iocb, &local_iov, 1, 
++	ret = __generic_file_aio_write_nolock(iocb, &local_iov, 1,
+ 						&iocb->ki_pos);
+ 	up(&inode->i_sem);
+ 
+-	return err;
+-}
++	/*
++	 * Avoid doing a sync in parts for aio - its more efficient to
++	 * call in again after all the data has been copied
++	 */
++	if (!is_sync_kiocb(iocb))
++		return ret;
+ 
++osync:
++	if (ret > 0 && ((file->f_flags & O_SYNC) || IS_SYNC(inode))) {
++		ret = sync_page_range(inode, mapping, pos, ret);
++		if (ret >= 0)
++			iocb->ki_pos = pos + ret;
++	}
++	return ret;
++}
+ EXPORT_SYMBOL(generic_file_aio_write);
+ 
+ ssize_t generic_file_write(struct file *file, const char __user *buf,
+ 			   size_t count, loff_t *ppos)
+ {
+-	struct inode	*inode = file->f_dentry->d_inode->i_mapping->host;
+-	ssize_t		err;
+-	struct iovec local_iov = { .iov_base = (void __user *)buf, .iov_len = count };
++	struct address_space *mapping = file->f_mapping;
++	struct inode *inode = mapping->host;
++	ssize_t	ret;
++	struct iovec local_iov = { .iov_base = (void __user *)buf,
++					.iov_len = count };
+ 
+ 	down(&inode->i_sem);
+-	err = generic_file_write_nolock(file, &local_iov, 1, ppos);
++	ret = __generic_file_write_nolock(file, &local_iov, 1, ppos);
+ 	up(&inode->i_sem);
+ 
+-	return err;
+-}
++	if (ret > 0 && ((file->f_flags & O_SYNC) || IS_SYNC(inode))) {
++		ssize_t err;
+ 
++		err = sync_page_range(inode, mapping, *ppos - ret, ret);
++		if (err < 0)
++			ret = err;
++	}
++	return ret;
++}
+ EXPORT_SYMBOL(generic_file_write);
+ 
+ ssize_t generic_file_readv(struct file *filp, const struct iovec *iov,
+@@ -1947,39 +2175,46 @@ ssize_t generic_file_readv(struct file *
+ EXPORT_SYMBOL(generic_file_readv);
+ 
+ ssize_t generic_file_writev(struct file *file, const struct iovec *iov,
+-			unsigned long nr_segs, loff_t * ppos) 
++			unsigned long nr_segs, loff_t *ppos)
+ {
+-	struct inode *inode = file->f_dentry->d_inode;
++	struct address_space *mapping = file->f_mapping;
++	struct inode *inode = mapping->host;
+ 	ssize_t ret;
+ 
+ 	down(&inode->i_sem);
+-	ret = generic_file_write_nolock(file, iov, nr_segs, ppos);
++	ret = __generic_file_write_nolock(file, iov, nr_segs, ppos);
+ 	up(&inode->i_sem);
++
++	if (ret > 0 && ((file->f_flags & O_SYNC) || IS_SYNC(inode))) {
++		ssize_t err;
++
++		err = sync_page_range(inode, mapping, *ppos - ret, ret);
++		if (err < 0)
++			ret = err;
++	}
+ 	return ret;
+ }
+ 
+ EXPORT_SYMBOL(generic_file_writev);
+ 
++/*
++ * Called under i_sem for writes to S_ISREG files
++ */
+ ssize_t
+ generic_file_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov,
+ 	loff_t offset, unsigned long nr_segs)
+ {
+ 	struct file *file = iocb->ki_filp;
+-	struct address_space *mapping = file->f_dentry->d_inode->i_mapping;
++	struct address_space *mapping = file->f_mapping;
+ 	ssize_t retval;
+ 
+-	if (mapping->nrpages) {
+-		retval = filemap_fdatawrite(mapping);
+-		if (retval == 0)
+-			retval = filemap_fdatawait(mapping);
+-		if (retval)
+-			goto out;
++	retval = filemap_write_and_wait(mapping);
++	if (retval == 0) {
++		retval = mapping->a_ops->direct_IO(rw, iocb, iov,
++						offset, nr_segs);
++		if (rw == WRITE && mapping->nrpages)
++			invalidate_inode_pages2(mapping);
+ 	}
+-
+-	retval = mapping->a_ops->direct_IO(rw, iocb, iov, offset, nr_segs);
+-	if (rw == WRITE && mapping->nrpages)
+-		invalidate_inode_pages2(mapping);
+-out:
+ 	return retval;
+ }
+ 
+--- linux-2.6.0/mm/highmem.c	2003-10-08 15:07:10.000000000 -0700
++++ 25/mm/highmem.c	2003-12-28 23:22:14.000000000 -0800
+@@ -285,7 +285,7 @@ static void copy_to_high_bio_irq(struct 
+ 	struct bio_vec *tovec, *fromvec;
+ 	int i;
+ 
+-	__bio_for_each_segment(tovec, to, i, 0) {
++	bio_for_each_segment(tovec, to, i) {
+ 		fromvec = from->bi_io_vec + i;
+ 
+ 		/*
+@@ -314,7 +314,7 @@ static void bounce_end_io(struct bio *bi
+ 	/*
+ 	 * free up bounce indirect pages used
+ 	 */
+-	__bio_for_each_segment(bvec, bio, i, 0) {
++	bio_for_each_segment(bvec, bio, i) {
+ 		org_vec = bio_orig->bi_io_vec + i;
+ 		if (bvec->bv_page == org_vec->bv_page)
+ 			continue;
+@@ -437,7 +437,7 @@ static void __blk_queue_bounce(request_q
+ 	bio->bi_rw = (*bio_orig)->bi_rw;
+ 
+ 	bio->bi_vcnt = (*bio_orig)->bi_vcnt;
+-	bio->bi_idx = 0;
++	bio->bi_idx = (*bio_orig)->bi_idx;
+ 	bio->bi_size = (*bio_orig)->bi_size;
+ 
+ 	if (pool == page_pool) {
+--- linux-2.6.0/mm/madvise.c	2003-11-09 16:45:06.000000000 -0800
++++ 25/mm/madvise.c	2003-12-28 23:21:19.000000000 -0800
+@@ -65,7 +65,7 @@ static long madvise_willneed(struct vm_a
+ 		end = vma->vm_end;
+ 	end = ((end - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
+ 
+-	force_page_cache_readahead(file->f_dentry->d_inode->i_mapping,
++	force_page_cache_readahead(file->f_mapping,
+ 			file, start, max_sane_readahead(end - start));
+ 	return 0;
+ }
+--- linux-2.6.0/mm/Makefile	2003-11-09 16:45:06.000000000 -0800
++++ 25/mm/Makefile	2003-12-28 23:26:36.000000000 -0800
+@@ -12,3 +12,6 @@ obj-y			:= bootmem.o filemap.o mempool.o
+ 			   slab.o swap.o truncate.o vmscan.o $(mmu-y)
+ 
+ obj-$(CONFIG_SWAP)	+= page_io.o swap_state.o swapfile.o
++
++obj-$(CONFIG_X86_4G) += usercopy.o
++
+--- linux-2.6.0/mm/memory.c	2003-11-23 19:03:02.000000000 -0800
++++ 25/mm/memory.c	2003-12-28 23:26:36.000000000 -0800
+@@ -107,7 +107,8 @@ static inline void free_one_pmd(struct m
+ 	pte_free_tlb(tlb, page);
+ }
+ 
+-static inline void free_one_pgd(struct mmu_gather *tlb, pgd_t * dir)
++static inline void free_one_pgd(struct mmu_gather *tlb, pgd_t * dir,
++							int pgd_idx)
+ {
+ 	int j;
+ 	pmd_t * pmd;
+@@ -121,8 +122,11 @@ static inline void free_one_pgd(struct m
+ 	}
+ 	pmd = pmd_offset(dir, 0);
+ 	pgd_clear(dir);
+-	for (j = 0; j < PTRS_PER_PMD ; j++)
++	for (j = 0; j < PTRS_PER_PMD ; j++) {
++		if (pgd_idx * PGDIR_SIZE + j * PMD_SIZE >= TASK_SIZE)
++			break;
+ 		free_one_pmd(tlb, pmd+j);
++	}
+ 	pmd_free_tlb(tlb, pmd);
+ }
+ 
+@@ -135,11 +139,13 @@ static inline void free_one_pgd(struct m
+ void clear_page_tables(struct mmu_gather *tlb, unsigned long first, int nr)
+ {
+ 	pgd_t * page_dir = tlb->mm->pgd;
++	int pgd_idx = first;
+ 
+ 	page_dir += first;
+ 	do {
+-		free_one_pgd(tlb, page_dir);
++		free_one_pgd(tlb, page_dir, pgd_idx);
+ 		page_dir++;
++		pgd_idx++;
+ 	} while (--nr);
+ }
+ 
+@@ -437,7 +443,7 @@ zap_pmd_range(struct mmu_gather *tlb, pg
+ 		unsigned long address, unsigned long size)
+ {
+ 	pmd_t * pmd;
+-	unsigned long end;
++	unsigned long end, pgd_boundary;
+ 
+ 	if (pgd_none(*dir))
+ 		return;
+@@ -448,8 +454,9 @@ zap_pmd_range(struct mmu_gather *tlb, pg
+ 	}
+ 	pmd = pmd_offset(dir, address);
+ 	end = address + size;
+-	if (end > ((address + PGDIR_SIZE) & PGDIR_MASK))
+-		end = ((address + PGDIR_SIZE) & PGDIR_MASK);
++	pgd_boundary = ((address + PGDIR_SIZE) & PGDIR_MASK);
++	if (pgd_boundary && (end > pgd_boundary))
++		end = pgd_boundary;
+ 	do {
+ 		zap_pte_range(tlb, pmd, address, end - address);
+ 		address = (address + PMD_SIZE) & PMD_MASK; 
+@@ -603,6 +610,11 @@ void zap_page_range(struct vm_area_struc
+ 	might_sleep();
+ 
+ 	if (is_vm_hugetlb_page(vma)) {
++		static int x;
++		if (x < 10) {
++			x++;
++			dump_stack();
++		}
+ 		zap_hugepage_range(vma, address, size);
+ 		return;
+ 	}
+@@ -685,6 +697,7 @@ int get_user_pages(struct task_struct *t
+ 		struct page **pages, struct vm_area_struct **vmas)
+ {
+ 	int i;
++	int vm_io;
+ 	unsigned int flags;
+ 
+ 	/* 
+@@ -741,8 +754,10 @@ int get_user_pages(struct task_struct *t
+ 		}
+ #endif
+ 
+-		if (!vma || (pages && (vma->vm_flags & VM_IO))
+-				|| !(flags & vma->vm_flags))
++		if (!vma)
++			return i ? : -EFAULT;
++		vm_io = vma->vm_flags & VM_IO;
++		if ((pages && vm_io) || !(flags & vma->vm_flags))
+ 			return i ? : -EFAULT;
+ 
+ 		if (is_vm_hugetlb_page(vma)) {
+@@ -750,9 +765,17 @@ int get_user_pages(struct task_struct *t
+ 						&start, &len, i);
+ 			continue;
+ 		}
++
+ 		spin_lock(&mm->page_table_lock);
+ 		do {
+-			struct page *map;
++			struct page *map = NULL;
++
++			/*
++			 * We don't follow pagetables for VM_IO regions - they
++			 * may have no pageframes.
++			 */
++			if (vm_io)
++				goto no_follow;
+ 			while (!(map = follow_page(mm, start, write))) {
+ 				spin_unlock(&mm->page_table_lock);
+ 				switch (handle_mm_fault(mm,vma,start,write)) {
+@@ -784,6 +807,7 @@ int get_user_pages(struct task_struct *t
+ 				if (!PageReserved(pages[i]))
+ 					page_cache_get(pages[i]);
+ 			}
++no_follow:
+ 			if (vmas)
+ 				vmas[i] = vma;
+ 			i++;
+@@ -1147,7 +1171,7 @@ void invalidate_mmap_range(struct addres
+ 		invalidate_mmap_range_list(&mapping->i_mmap_shared, hba, hlen);
+ 	up(&mapping->i_shared_sem);
+ }
+-EXPORT_SYMBOL_GPL(invalidate_mmap_range);
++EXPORT_SYMBOL(invalidate_mmap_range);
+ 
+ /*
+  * Handle all mappings that got truncated by a "truncate()"
+@@ -1400,7 +1424,7 @@ do_no_page(struct mm_struct *mm, struct 
+ 	pte_t entry;
+ 	struct pte_chain *pte_chain;
+ 	int sequence = 0;
+-	int ret;
++	int ret = VM_FAULT_MINOR;
+ 
+ 	if (!vma->vm_ops || !vma->vm_ops->nopage)
+ 		return do_anonymous_page(mm, vma, page_table,
+@@ -1409,12 +1433,12 @@ do_no_page(struct mm_struct *mm, struct 
+ 	spin_unlock(&mm->page_table_lock);
+ 
+ 	if (vma->vm_file) {
+-		mapping = vma->vm_file->f_dentry->d_inode->i_mapping;
++		mapping = vma->vm_file->f_mapping;
+ 		sequence = atomic_read(&mapping->truncate_count);
+ 	}
+ 	smp_rmb();  /* Prevent CPU from reordering lock-free ->nopage() */
+ retry:
+-	new_page = vma->vm_ops->nopage(vma, address & PAGE_MASK, 0);
++	new_page = vma->vm_ops->nopage(vma, address & PAGE_MASK, &ret);
+ 
+ 	/* no page was available -- either SIGBUS or OOM */
+ 	if (new_page == NOPAGE_SIGBUS)
+@@ -1483,14 +1507,12 @@ retry:
+ 		pte_unmap(page_table);
+ 		page_cache_release(new_page);
+ 		spin_unlock(&mm->page_table_lock);
+-		ret = VM_FAULT_MINOR;
+ 		goto out;
+ 	}
+ 
+ 	/* no need to invalidate: a not-present page shouldn't be cached */
+ 	update_mmu_cache(vma, address, entry);
+ 	spin_unlock(&mm->page_table_lock);
+-	ret = VM_FAULT_MAJOR;
+ 	goto out;
+ oom:
+ 	ret = VM_FAULT_OOM;
+--- linux-2.6.0/mm/mincore.c	2003-11-09 16:45:06.000000000 -0800
++++ 25/mm/mincore.c	2003-12-28 23:21:19.000000000 -0800
+@@ -26,7 +26,7 @@ static unsigned char mincore_page(struct
+ 	unsigned long pgoff)
+ {
+ 	unsigned char present = 0;
+-	struct address_space * as = vma->vm_file->f_dentry->d_inode->i_mapping;
++	struct address_space * as = vma->vm_file->f_mapping;
+ 	struct page * page;
+ 
+ 	page = find_get_page(as, pgoff);
+--- linux-2.6.0/mm/mmap.c	2003-12-17 21:20:03.000000000 -0800
++++ 25/mm/mmap.c	2003-12-28 23:22:58.000000000 -0800
+@@ -80,11 +80,10 @@ static void remove_shared_vm_struct(stru
+ 	struct file *file = vma->vm_file;
+ 
+ 	if (file) {
+-		struct inode *inode = file->f_dentry->d_inode;
+-
+-		down(&inode->i_mapping->i_shared_sem);
+-		__remove_shared_vm_struct(vma, inode);
+-		up(&inode->i_mapping->i_shared_sem);
++		struct address_space *mapping = file->f_mapping;
++		down(&mapping->i_shared_sem);
++		__remove_shared_vm_struct(vma, file->f_dentry->d_inode);
++		up(&mapping->i_shared_sem);
+ 	}
+ }
+ 
+@@ -235,11 +234,10 @@ static inline void __vma_link_file(struc
+ 
+ 	file = vma->vm_file;
+ 	if (file) {
+-		struct inode * inode = file->f_dentry->d_inode;
+-		struct address_space *mapping = inode->i_mapping;
++		struct address_space *mapping = file->f_mapping;
+ 
+ 		if (vma->vm_flags & VM_DENYWRITE)
+-			atomic_dec(&inode->i_writecount);
++			atomic_dec(&file->f_dentry->d_inode->i_writecount);
+ 
+ 		if (vma->vm_flags & VM_SHARED)
+ 			list_add_tail(&vma->shared, &mapping->i_mmap_shared);
+@@ -265,7 +263,7 @@ static void vma_link(struct mm_struct *m
+ 	struct address_space *mapping = NULL;
+ 
+ 	if (vma->vm_file)
+-		mapping = vma->vm_file->f_dentry->d_inode->i_mapping;
++		mapping = vma->vm_file->f_mapping;
+ 
+ 	if (mapping)
+ 		down(&mapping->i_shared_sem);
+@@ -383,7 +381,7 @@ static int vma_merge(struct mm_struct *m
+ 	if (vm_flags & VM_SPECIAL)
+ 		return 0;
+ 
+-	i_shared_sem = file ? &inode->i_mapping->i_shared_sem : NULL;
++	i_shared_sem = file ? &file->f_mapping->i_shared_sem : NULL;
+ 
+ 	if (!prev) {
+ 		prev = rb_entry(rb_parent, struct vm_area_struct, vm_rb);
+@@ -1138,7 +1136,11 @@ static void unmap_region(struct mm_struc
+ 	tlb = tlb_gather_mmu(mm, 0);
+ 	unmap_vmas(&tlb, mm, vma, start, end, &nr_accounted);
+ 	vm_unacct_memory(nr_accounted);
+-	free_pgtables(tlb, prev, start, end);
++
++	if (is_hugepage_only_range(start, end - start))
++		hugetlb_free_pgtables(tlb, prev, start, end);
++	else
++		free_pgtables(tlb, prev, start, end);
+ 	tlb_finish_mmu(tlb, start, end);
+ }
+ 
+@@ -1203,7 +1205,7 @@ int split_vma(struct mm_struct * mm, str
+ 		new->vm_ops->open(new);
+ 
+ 	if (vma->vm_file)
+-		 mapping = vma->vm_file->f_dentry->d_inode->i_mapping;
++		 mapping = vma->vm_file->f_mapping;
+ 
+ 	if (mapping)
+ 		down(&mapping->i_shared_sem);
+--- linux-2.6.0/mm/msync.c	2003-11-09 16:45:06.000000000 -0800
++++ 25/mm/msync.c	2003-12-28 23:21:20.000000000 -0800
+@@ -146,20 +146,20 @@ static int msync_interval(struct vm_area
+ 		ret = filemap_sync(vma, start, end-start, flags);
+ 
+ 		if (!ret && (flags & MS_SYNC)) {
+-			struct inode *inode = file->f_dentry->d_inode;
++			struct address_space *mapping = file->f_mapping;
+ 			int err;
+ 
+-			down(&inode->i_sem);
+-			ret = filemap_fdatawrite(inode->i_mapping);
++			down(&mapping->host->i_sem);
++			ret = filemap_fdatawrite(mapping);
+ 			if (file->f_op && file->f_op->fsync) {
+ 				err = file->f_op->fsync(file,file->f_dentry,1);
+ 				if (err && !ret)
+ 					ret = err;
+ 			}
+-			err = filemap_fdatawait(inode->i_mapping);
++			err = filemap_fdatawait(mapping);
+ 			if (!ret)
+ 				ret = err;
+-			up(&inode->i_sem);
++			up(&mapping->host->i_sem);
+ 		}
+ 	}
+ 	return ret;
+--- linux-2.6.0/mm/oom_kill.c	2003-11-09 16:45:06.000000000 -0800
++++ 25/mm/oom_kill.c	2003-12-28 23:21:48.000000000 -0800
+@@ -24,20 +24,6 @@
+ /* #define DEBUG */
+ 
+ /**
+- * int_sqrt - oom_kill.c internal function, rough approximation to sqrt
+- * @x: integer of which to calculate the sqrt
+- * 
+- * A very rough approximation to the sqrt() function.
+- */
+-static unsigned int int_sqrt(unsigned int x)
+-{
+-	unsigned int out = x;
+-	while (x & ~(unsigned int)1) x >>=2, out >>=1;
+-	if (x) out -= out >> 2;
+-	return (out ? out : 1);
+-}	
+-
+-/**
+  * oom_badness - calculate a numeric value for how bad this task has been
+  * @p: task struct of which task we should calculate
+  *
+@@ -57,7 +43,7 @@ static unsigned int int_sqrt(unsigned in
+ 
+ static int badness(struct task_struct *p)
+ {
+-	int points, cpu_time, run_time;
++	int points, cpu_time, run_time, s;
+ 
+ 	if (!p->mm)
+ 		return 0;
+@@ -77,8 +63,12 @@ static int badness(struct task_struct *p
+ 	cpu_time = (p->utime + p->stime) >> (SHIFT_HZ + 3);
+ 	run_time = (get_jiffies_64() - p->start_time) >> (SHIFT_HZ + 10);
+ 
+-	points /= int_sqrt(cpu_time);
+-	points /= int_sqrt(int_sqrt(run_time));
++	s = int_sqrt(cpu_time);
++	if (s)
++		points /= s;
++	s = int_sqrt(int_sqrt(run_time));
++	if (s)
++		points /= s;
+ 
+ 	/*
+ 	 * Niced processes are most likely less important, so double
+--- linux-2.6.0/mm/page_alloc.c	2003-11-09 16:45:06.000000000 -0800
++++ 25/mm/page_alloc.c	2003-12-28 23:22:46.000000000 -0800
+@@ -267,9 +267,11 @@ free_pages_bulk(struct zone *zone, int c
+ void __free_pages_ok(struct page *page, unsigned int order)
+ {
+ 	LIST_HEAD(list);
++	int i;
+ 
+ 	mod_page_state(pgfree, 1 << order);
+-	free_pages_check(__FUNCTION__, page);
++	for (i = 0 ; i < (1 << order) ; ++i)
++		free_pages_check(__FUNCTION__, page + i);
+ 	list_add(&page->list, &list);
+ 	kernel_map_pages(page, 1<<order, 0);
+ 	free_pages_bulk(page_zone(page), 1, &list, order);
+@@ -537,7 +539,7 @@ __alloc_pages(unsigned int gfp_mask, uns
+ {
+ 	const int wait = gfp_mask & __GFP_WAIT;
+ 	unsigned long min;
+-	struct zone **zones, *classzone;
++	struct zone **zones;
+ 	struct page *page;
+ 	struct reclaim_state reclaim_state;
+ 	struct task_struct *p = current;
+@@ -552,8 +554,7 @@ __alloc_pages(unsigned int gfp_mask, uns
+ 		cold = 1;
+ 
+ 	zones = zonelist->zones;  /* the list of zones suitable for gfp_mask */
+-	classzone = zones[0]; 
+-	if (classzone == NULL)    /* no zones in the zonelist */
++	if (zones[0] == NULL)     /* no zones in the zonelist */
+ 		return NULL;
+ 
+ 	/* Go through the zonelist once, looking for a zone with enough free */
+@@ -628,7 +629,7 @@ rebalance:
+ 	reclaim_state.reclaimed_slab = 0;
+ 	p->reclaim_state = &reclaim_state;
+ 
+-	try_to_free_pages(classzone, gfp_mask, order);
++	try_to_free_pages(zones, gfp_mask, order);
+ 
+ 	p->reclaim_state = NULL;
+ 	p->flags &= ~PF_MEMALLOC;
+@@ -672,6 +673,7 @@ nopage:
+ 		printk("%s: page allocation failure."
+ 			" order:%d, mode:0x%x\n",
+ 			p->comm, order, gfp_mask);
++		dump_stack();
+ 	}
+ 	return NULL;
+ got_pg:
+@@ -1589,7 +1591,7 @@ void __init page_alloc_init(void)
+  *	that the pages_{min,low,high} values for each zone are set correctly 
+  *	with respect to min_free_kbytes.
+  */
+-void setup_per_zone_pages_min(void)
++static void setup_per_zone_pages_min(void)
+ {
+ 	unsigned long pages_min = min_free_kbytes >> (PAGE_SHIFT - 10);
+ 	unsigned long lowmem_pages = 0;
+@@ -1633,6 +1635,45 @@ void setup_per_zone_pages_min(void)
+ }
+ 
+ /*
++ * Initialise min_free_kbytes.
++ *
++ * For small machines we want it small (128k min).  For large machines
++ * we want it large (16MB max).  But it is not linear, because network
++ * bandwidth does not increase linearly with machine size.  We use
++ *
++ *	min_free_kbytes = sqrt(lowmem_kbytes)
++ *
++ * which yields
++ *
++ * 16MB:	128k
++ * 32MB:	181k
++ * 64MB:	256k
++ * 128MB:	362k
++ * 256MB:	512k
++ * 512MB:	724k
++ * 1024MB:	1024k
++ * 2048MB:	1448k
++ * 4096MB:	2048k
++ * 8192MB:	2896k
++ * 16384MB:	4096k
++ */
++static int __init init_per_zone_pages_min(void)
++{
++	unsigned long lowmem_kbytes;
++
++	lowmem_kbytes = nr_free_buffer_pages() * (PAGE_SIZE >> 10);
++
++	min_free_kbytes = int_sqrt(lowmem_kbytes);
++	if (min_free_kbytes < 128)
++		min_free_kbytes = 128;
++	if (min_free_kbytes > 16384)
++		min_free_kbytes = 16384;
++	setup_per_zone_pages_min();
++	return 0;
++}
++module_init(init_per_zone_pages_min)
++
++/*
+  * min_free_kbytes_sysctl_handler - just a wrapper around proc_dointvec() so 
+  *	that we can call setup_per_zone_pages_min() whenever min_free_kbytes 
+  *	changes.
+--- linux-2.6.0/mm/page-writeback.c	2003-11-09 16:45:06.000000000 -0800
++++ 25/mm/page-writeback.c	2003-12-28 23:26:44.000000000 -0800
+@@ -28,6 +28,7 @@
+ #include <linux/smp.h>
+ #include <linux/sysctl.h>
+ #include <linux/cpu.h>
++#include <linux/pagevec.h>
+ 
+ /*
+  * The maximum number of pages to writeout in a single bdflush/kupdate
+@@ -146,7 +147,7 @@ get_dirty_limits(struct page_state *ps, 
+  * If we're over `background_thresh' then pdflush is woken to perform some
+  * writeout.
+  */
+-static void balance_dirty_pages(struct address_space *mapping)
++static int balance_dirty_pages(struct address_space *mapping)
+ {
+ 	struct page_state ps;
+ 	long nr_reclaimable;
+@@ -163,6 +164,7 @@ static void balance_dirty_pages(struct a
+ 			.sync_mode	= WB_SYNC_NONE,
+ 			.older_than_this = NULL,
+ 			.nr_to_write	= write_chunk,
++			.nonblocking	= !is_sync_wait(current->io_wait)
+ 		};
+ 
+ 		get_dirty_limits(&ps, &background_thresh, &dirty_thresh);
+@@ -189,7 +191,11 @@ static void balance_dirty_pages(struct a
+ 			if (pages_written >= write_chunk)
+ 				break;		/* We've done our duty */
+ 		}
+-		blk_congestion_wait(WRITE, HZ/10);
++		if (-EIOCBRETRY == blk_congestion_wait_wq(WRITE, HZ/10,
++			current->io_wait)) {
++			pr_debug("async blk congestion wait\n");
++			return -EIOCBRETRY;
++		}
+ 	}
+ 
+ 	if (nr_reclaimable + ps.nr_writeback <= dirty_thresh)
+@@ -197,6 +203,8 @@ static void balance_dirty_pages(struct a
+ 
+ 	if (!writeback_in_progress(bdi) && nr_reclaimable > background_thresh)
+ 		pdflush_operation(background_writeout, 0);
++
++	return 0;
+ }
+ 
+ /**
+@@ -212,7 +220,7 @@ static void balance_dirty_pages(struct a
+  * decrease the ratelimiting by a lot, to prevent individual processes from
+  * overshooting the limit by (ratelimit_pages) each.
+  */
+-void balance_dirty_pages_ratelimited(struct address_space *mapping)
++int balance_dirty_pages_ratelimited(struct address_space *mapping)
+ {
+ 	static DEFINE_PER_CPU(int, ratelimits) = 0;
+ 	long ratelimit;
+@@ -228,10 +236,10 @@ void balance_dirty_pages_ratelimited(str
+ 	if (get_cpu_var(ratelimits)++ >= ratelimit) {
+ 		__get_cpu_var(ratelimits) = 0;
+ 		put_cpu_var(ratelimits);
+-		balance_dirty_pages(mapping);
+-		return;
++		return balance_dirty_pages(mapping);
+ 	}
+ 	put_cpu_var(ratelimits);
++	return 0;
+ }
+ 
+ /*
+@@ -567,3 +575,152 @@ int test_clear_page_dirty(struct page *p
+ 	return 0;
+ }
+ EXPORT_SYMBOL(test_clear_page_dirty);
++
++
++static ssize_t operate_on_page_range(struct address_space *mapping,
++		loff_t pos, size_t count, int (*operator)(struct page *))
++{
++	pgoff_t first = pos >> PAGE_CACHE_SHIFT;
++	pgoff_t last = (pos + count - 1) >> PAGE_CACHE_SHIFT;	/* inclusive */
++	pgoff_t next = first, curr = first;
++	struct pagevec pvec;
++	ssize_t ret = 0, bytes = 0;
++	int i, nr;
++
++	if (count == 0)
++		return 0;
++
++	pagevec_init(&pvec, 0);
++	while ((nr = pagevec_lookup(&pvec, mapping, &next,
++				min((pgoff_t)PAGEVEC_SIZE, last - next + 1)))) {
++		for (i = 0; i < pagevec_count(&pvec); i++) {
++			struct page *page = pvec.pages[i];
++
++			curr = page->index;
++			if (page->mapping != mapping) /* truncated ?*/ {
++				curr = next;
++				break;
++			} else {
++				ret = (*operator)(page);
++				if (ret == -EIOCBRETRY)
++					break;
++				if (PageError(page)) {
++					if (!ret)
++						ret = -EIO;
++				} else
++					curr++;
++			}
++		}
++		pagevec_release(&pvec);
++		if ((ret == -EIOCBRETRY) || (next > last))
++			break;
++	}
++	if (!nr)
++		curr = last + 1;
++
++	bytes = (curr << PAGE_CACHE_SHIFT) - pos;
++	if (bytes > count)
++		bytes = count;
++	return (bytes && (!ret || (ret == -EIOCBRETRY))) ? bytes : ret;
++}
++
++static int page_waiter(struct page *page)
++{
++	return wait_on_page_writeback_wq(page, current->io_wait);
++}
++
++static size_t
++wait_on_page_range(struct address_space *mapping, loff_t pos, size_t count)
++{
++	return operate_on_page_range(mapping, pos, count, page_waiter);
++}
++
++static int page_writer(struct page *page)
++{
++	struct writeback_control wbc = {
++		.sync_mode	= WB_SYNC_ALL,
++		.nr_to_write	= 1,
++	};
++
++	lock_page(page);
++	if (!page->mapping) {	/* truncated */
++		unlock_page(page);
++		return 0;
++	}
++	if (!test_clear_page_dirty(page)) {
++		unlock_page(page);
++		return 0;
++	}
++	wait_on_page_writeback(page);
++	return page->mapping->a_ops->writepage(page, &wbc);
++}
++
++static ssize_t
++write_out_page_range(struct address_space *mapping, loff_t pos, size_t count)
++{
++	return operate_on_page_range(mapping, pos, count, page_writer);
++}
++
++/*
++ * Write and wait upon all the pages in the passed range.  This is a "data
++ * integrity" operation.  It waits upon in-flight writeout before starting and
++ * waiting upon new writeout.  If there was an IO error, return it.
++ *
++ * We need to re-take i_sem during the generic_osync_inode list walk because
++ * it is otherwise livelockable.
++ */
++ssize_t sync_page_range(struct inode *inode, struct address_space *mapping,
++			loff_t pos, size_t count)
++{
++	int ret = 0;
++
++	if (in_aio()) {
++		/* Already issued writeouts for this iocb ? */
++		if (kiocbTrySync(io_wait_to_kiocb(current->io_wait)))
++			goto do_wait; /* just need to check if done */
++	}
++	if (!mapping->a_ops->writepage)
++		return 0;
++	if (mapping->backing_dev_info->memory_backed)
++		return 0;
++	ret = write_out_page_range(mapping, pos, count);
++	if (ret >= 0) {
++		down(&inode->i_sem);
++		ret = generic_osync_inode(inode, mapping, OSYNC_METADATA);
++		up(&inode->i_sem);
++	}
++do_wait:
++	if (ret >= 0)
++		ret = wait_on_page_range(mapping, pos, count);
++	return ret;
++}
++
++/*
++ * It is really better to use sync_page_range, rather than call
++ * sync_page_range_nolock while holding i_sem, if you don't
++ * want to block parallel O_SYNC writes until the pages in this
++ * range are written out.
++ */
++ssize_t sync_page_range_nolock(struct inode *inode, struct address_space
++	*mapping, loff_t pos, size_t count)
++{
++	ssize_t ret = 0;
++
++	if (in_aio()) {
++		/* Already issued writeouts for this iocb ? */
++		if (kiocbTrySync(io_wait_to_kiocb(current->io_wait)))
++			goto do_wait; /* just need to check if done */
++	}
++	if (!mapping->a_ops->writepage)
++		return 0;
++	if (mapping->backing_dev_info->memory_backed)
++		return 0;
++	ret = write_out_page_range(mapping, pos, count);
++	if (ret >= 0) {
++		ret = generic_osync_inode(inode, mapping, OSYNC_METADATA);
++	}
++do_wait:
++	if (ret >= 0)
++		ret = wait_on_page_range(mapping, pos, count);
++	return ret;
++}
+--- linux-2.6.0/mm/pdflush.c	2003-11-09 16:45:06.000000000 -0800
++++ 25/mm/pdflush.c	2003-12-28 23:21:42.000000000 -0800
+@@ -84,6 +84,8 @@ struct pdflush_work {
+ 	unsigned long when_i_went_to_sleep;
+ };
+ 
++static int wakeup_count = 100;
++
+ static int __pdflush(struct pdflush_work *my_work)
+ {
+ 	daemonize("pdflush");
+@@ -112,7 +114,10 @@ static int __pdflush(struct pdflush_work
+ 
+ 		spin_lock_irq(&pdflush_lock);
+ 		if (!list_empty(&my_work->list)) {
+-			printk("pdflush: bogus wakeup!\n");
++			if (wakeup_count > 0) {
++				wakeup_count--;
++				printk("pdflush: bogus wakeup!\n");
++			}
+ 			my_work->fn = NULL;
+ 			continue;
+ 		}
+@@ -182,6 +187,7 @@ int pdflush_operation(void (*fn)(unsigne
+ {
+ 	unsigned long flags;
+ 	int ret = 0;
++	static int poke_count = 0;
+ 
+ 	if (fn == NULL)
+ 		BUG();		/* Hard to diagnose if it's deferred */
+@@ -190,9 +196,19 @@ int pdflush_operation(void (*fn)(unsigne
+ 	if (list_empty(&pdflush_list)) {
+ 		spin_unlock_irqrestore(&pdflush_lock, flags);
+ 		ret = -1;
++		if (wakeup_count < 100 && poke_count < 10) {
++			printk("%s: no threads\n", __FUNCTION__);
++			dump_stack();
++			poke_count++;
++		}
+ 	} else {
+ 		struct pdflush_work *pdf;
+ 
++		if (wakeup_count < 100 && poke_count < 10) {
++			printk("%s: found a thread\n", __FUNCTION__);
++			dump_stack();
++			poke_count++;
++		}
+ 		pdf = list_entry(pdflush_list.next, struct pdflush_work, list);
+ 		list_del_init(&pdf->list);
+ 		if (list_empty(&pdflush_list))
+--- linux-2.6.0/mm/readahead.c	2003-11-09 16:45:06.000000000 -0800
++++ 25/mm/readahead.c	2003-12-28 23:26:38.000000000 -0800
+@@ -347,6 +347,8 @@ page_cache_readahead(struct address_spac
+ 	unsigned min;
+ 	unsigned orig_next_size;
+ 	unsigned actual;
++	int first_access=0;
++	unsigned long preoffset=0;
+ 
+ 	/*
+ 	 * Here we detect the case where the application is performing
+@@ -370,16 +372,18 @@ page_cache_readahead(struct address_spac
+ 	min = get_min_readahead(ra);
+ 	orig_next_size = ra->next_size;
+ 
+-	if (ra->next_size == 0 && offset == 0) {
++	if (ra->next_size == 0) {
+ 		/*
+-		 * Special case - first read from first page.
++		 * Special case - first read.
+ 		 * We'll assume it's a whole-file read, and
+ 		 * grow the window fast.
+ 		 */
++		first_access=1;
+ 		ra->next_size = max / 2;
+ 		goto do_io;
+ 	}
+ 
++	preoffset = ra->prev_page;
+ 	ra->prev_page = offset;
+ 
+ 	if (offset >= ra->start && offset <= (ra->start + ra->size)) {
+@@ -439,20 +443,44 @@ do_io:
+ 		 * ahead window and get some I/O underway for the new
+ 		 * current window.
+ 		 */
++		if (!first_access && preoffset >= ra->start &&
++				preoffset < (ra->start + ra->size)) {
++			 /* Heuristic:  If 'n' pages were
++			  * accessed in the current window, there
++			  * is a high probability that around 'n' pages
++			  * shall be used in the next current window.
++			  *
++			  * To minimize lazy-readahead triggered
++			  * in the next current window, read in
++			  * an extra page.
++			  */
++			ra->next_size = preoffset - ra->start + 2;
++		}
+ 		ra->start = offset;
+ 		ra->size = ra->next_size;
+ 		ra->ahead_start = 0;		/* Invalidate these */
+ 		ra->ahead_size = 0;
+ 		actual = do_page_cache_readahead(mapping, filp, offset,
+ 						 ra->size);
+-		check_ra_success(ra, ra->size, actual, orig_next_size);
++		if(!first_access) {
++			/*
++			 * do not adjust the readahead window size the first
++			 * time, the ahead window might get closed if all
++			 * the pages are already in the cache.
++			 */
++			check_ra_success(ra, ra->size, actual, orig_next_size);
++		}
+ 	} else {
+ 		/*
+ 		 * This read request is within the current window.  It is time
+ 		 * to submit I/O for the ahead window while the application is
+-		 * crunching through the current window.
++		 * about to step into the ahead window.
++		 * Heuristic: Defer reading the ahead window till we hit
++		 * the last page in the current window. (lazy readahead)
++		 * If we read in earlier we run the risk of wasting
++		 * the ahead window.
+ 		 */
+-		if (ra->ahead_start == 0) {
++		if (ra->ahead_start == 0 && offset == (ra->start + ra->size -1)) {
+ 			ra->ahead_start = ra->start + ra->size;
+ 			ra->ahead_size = ra->next_size;
+ 			actual = do_page_cache_readahead(mapping, filp,
+@@ -488,7 +516,7 @@ void handle_ra_miss(struct address_space
+ 		const unsigned long max = get_max_readahead(ra);
+ 
+ 		if (offset != ra->prev_page + 1) {
+-			ra->size = 0;			/* Not sequential */
++			ra->size = ra->size?ra->size-1:0; /* Not sequential */
+ 		} else {
+ 			ra->size++;			/* A sequential read */
+ 			if (ra->size >= max) {		/* Resume readahead */
+--- linux-2.6.0/mm/shmem.c	2003-11-09 16:45:06.000000000 -0800
++++ 25/mm/shmem.c	2003-12-28 23:22:12.000000000 -0800
+@@ -71,7 +71,7 @@ enum sgp_type {
+ };
+ 
+ static int shmem_getpage(struct inode *inode, unsigned long idx,
+-			 struct page **pagep, enum sgp_type sgp);
++			 struct page **pagep, enum sgp_type sgp, int *type);
+ 
+ static inline struct page *shmem_dir_alloc(unsigned int gfp_mask)
+ {
+@@ -540,7 +540,7 @@ static int shmem_notify_change(struct de
+ 			if (attr->ia_size & (PAGE_CACHE_SIZE-1)) {
+ 				(void) shmem_getpage(inode,
+ 					attr->ia_size>>PAGE_CACHE_SHIFT,
+-						&page, SGP_READ);
++						&page, SGP_READ, NULL);
+ 			}
+ 			/*
+ 			 * Reset SHMEM_PAGEIN flag so that shmem_truncate can
+@@ -765,7 +765,7 @@ redirty:
+  * vm. If we swap it in we mark it dirty since we also free the swap
+  * entry since a page cannot live in both the swap and page cache
+  */
+-static int shmem_getpage(struct inode *inode, unsigned long idx, struct page **pagep, enum sgp_type sgp)
++static int shmem_getpage(struct inode *inode, unsigned long idx, struct page **pagep, enum sgp_type sgp, int *type)
+ {
+ 	struct address_space *mapping = inode->i_mapping;
+ 	struct shmem_inode_info *info = SHMEM_I(inode);
+@@ -774,7 +774,7 @@ static int shmem_getpage(struct inode *i
+ 	struct page *swappage;
+ 	swp_entry_t *entry;
+ 	swp_entry_t swap;
+-	int error;
++	int error, majmin = VM_FAULT_MINOR;
+ 
+ 	if (idx >= SHMEM_MAX_INDEX)
+ 		return -EFBIG;
+@@ -811,6 +811,10 @@ repeat:
+ 		if (!swappage) {
+ 			shmem_swp_unmap(entry);
+ 			spin_unlock(&info->lock);
++			/* here we actually do the io */
++			if (majmin == VM_FAULT_MINOR && type)
++				inc_page_state(pgmajfault);
++			majmin = VM_FAULT_MAJOR;
+ 			swapin_readahead(swap);
+ 			swappage = read_swap_cache_async(swap);
+ 			if (!swappage) {
+@@ -959,6 +963,8 @@ done:
+ 		} else
+ 			*pagep = ZERO_PAGE(0);
+ 	}
++	if (type)
++		*type = majmin;
+ 	return 0;
+ 
+ failed:
+@@ -969,7 +975,7 @@ failed:
+ 	return error;
+ }
+ 
+-struct page *shmem_nopage(struct vm_area_struct *vma, unsigned long address, int unused)
++struct page *shmem_nopage(struct vm_area_struct *vma, unsigned long address, int *type)
+ {
+ 	struct inode *inode = vma->vm_file->f_dentry->d_inode;
+ 	struct page *page = NULL;
+@@ -980,7 +986,7 @@ struct page *shmem_nopage(struct vm_area
+ 	idx += vma->vm_pgoff;
+ 	idx >>= PAGE_CACHE_SHIFT - PAGE_SHIFT;
+ 
+-	error = shmem_getpage(inode, idx, &page, SGP_CACHE);
++	error = shmem_getpage(inode, idx, &page, SGP_CACHE, type);
+ 	if (error)
+ 		return (error == -ENOMEM)? NOPAGE_OOM: NOPAGE_SIGBUS;
+ 
+@@ -1007,7 +1013,7 @@ static int shmem_populate(struct vm_area
+ 		/*
+ 		 * Will need changing if PAGE_CACHE_SIZE != PAGE_SIZE
+ 		 */
+-		err = shmem_getpage(inode, pgoff, &page, sgp);
++		err = shmem_getpage(inode, pgoff, &page, sgp, NULL);
+ 		if (err)
+ 			return err;
+ 		if (page) {
+@@ -1157,7 +1163,7 @@ static int
+ shmem_prepare_write(struct file *file, struct page *page, unsigned offset, unsigned to)
+ {
+ 	struct inode *inode = page->mapping->host;
+-	return shmem_getpage(inode, page->index, &page, SGP_WRITE);
++	return shmem_getpage(inode, page->index, &page, SGP_WRITE, NULL);
+ }
+ 
+ static ssize_t
+@@ -1180,7 +1186,7 @@ shmem_file_write(struct file *file, cons
+ 	pos = *ppos;
+ 	written = 0;
+ 
+-	err = generic_write_checks(inode, file, &pos, &count, 0);
++	err = generic_write_checks(file, &pos, &count, 0);
+ 	if (err || !count)
+ 		goto out;
+ 
+@@ -1214,7 +1220,7 @@ shmem_file_write(struct file *file, cons
+ 		 * But it still may be a good idea to prefault below.
+ 		 */
+ 
+-		err = shmem_getpage(inode, index, &page, SGP_WRITE);
++		err = shmem_getpage(inode, index, &page, SGP_WRITE, NULL);
+ 		if (err)
+ 			break;
+ 
+@@ -1296,7 +1302,7 @@ static void do_shmem_file_read(struct fi
+ 				break;
+ 		}
+ 
+-		desc->error = shmem_getpage(inode, index, &page, SGP_READ);
++		desc->error = shmem_getpage(inode, index, &page, SGP_READ, NULL);
+ 		if (desc->error) {
+ 			if (desc->error == -EINVAL)
+ 				desc->error = 0;
+@@ -1552,7 +1558,7 @@ static int shmem_symlink(struct inode *d
+ 			iput(inode);
+ 			return -ENOMEM;
+ 		}
+-		error = shmem_getpage(inode, 0, &page, SGP_WRITE);
++		error = shmem_getpage(inode, 0, &page, SGP_WRITE, NULL);
+ 		if (error) {
+ 			vm_unacct_memory(VM_ACCT(1));
+ 			iput(inode);
+@@ -1590,7 +1596,7 @@ static int shmem_follow_link_inline(stru
+ static int shmem_readlink(struct dentry *dentry, char __user *buffer, int buflen)
+ {
+ 	struct page *page = NULL;
+-	int res = shmem_getpage(dentry->d_inode, 0, &page, SGP_READ);
++	int res = shmem_getpage(dentry->d_inode, 0, &page, SGP_READ, NULL);
+ 	if (res)
+ 		return res;
+ 	res = vfs_readlink(dentry, buffer, buflen, kmap(page));
+@@ -1603,7 +1609,7 @@ static int shmem_readlink(struct dentry 
+ static int shmem_follow_link(struct dentry *dentry, struct nameidata *nd)
+ {
+ 	struct page *page = NULL;
+-	int res = shmem_getpage(dentry->d_inode, 0, &page, SGP_READ);
++	int res = shmem_getpage(dentry->d_inode, 0, &page, SGP_READ, NULL);
+ 	if (res)
+ 		return res;
+ 	res = vfs_follow_link(nd, kmap(page));
+@@ -1972,6 +1978,7 @@ struct file *shmem_file_setup(char *name
+ 	inode->i_nlink = 0;	/* It is unlinked */
+ 	file->f_vfsmnt = mntget(shm_mnt);
+ 	file->f_dentry = dentry;
++	file->f_mapping = inode->i_mapping;
+ 	file->f_op = &shmem_file_operations;
+ 	file->f_mode = FMODE_WRITE | FMODE_READ;
+ 	return(file);
+--- linux-2.6.0/mm/slab.c	2003-11-09 16:45:06.000000000 -0800
++++ 25/mm/slab.c	2003-12-28 23:26:36.000000000 -0800
+@@ -805,13 +805,14 @@ static inline void *kmem_getpages(kmem_c
+ 	void *addr;
+ 
+ 	flags |= cachep->gfpflags;
+-	if (cachep->flags & SLAB_RECLAIM_ACCOUNT)
+-		atomic_add(1<<cachep->gfporder, &slab_reclaim_pages);
+ 	addr = (void*)__get_free_pages(flags, cachep->gfporder);
+ 	if (addr) {
+ 		int i = (1 << cachep->gfporder);
+ 		struct page *page = virt_to_page(addr);
+ 
++		if (cachep->flags & SLAB_RECLAIM_ACCOUNT)
++			atomic_add(i, &slab_reclaim_pages);
++		add_page_state(nr_slab, i);
+ 		while (i--) {
+ 			SetPageSlab(page);
+ 			page++;
+@@ -1180,7 +1181,8 @@ next:
+ 		cachep = NULL;
+ 		goto opps;
+ 	}
+-	slab_size = L1_CACHE_ALIGN(cachep->num*sizeof(kmem_bufctl_t)+sizeof(struct slab));
++	slab_size = L1_CACHE_ALIGN(cachep->num*sizeof(kmem_bufctl_t) +
++			sizeof(struct slab));
+ 
+ 	/*
+ 	 * If the slab has been placed off-slab, and we have enough space then
+@@ -1224,10 +1226,13 @@ next:
+ 			 * the cache that's used by kmalloc(24), otherwise
+ 			 * the creation of further caches will BUG().
+ 			 */
+-			cachep->array[smp_processor_id()] = &initarray_generic.cache;
++			cachep->array[smp_processor_id()] =
++					&initarray_generic.cache;
+ 			g_cpucache_up = PARTIAL;
+ 		} else {
+-			cachep->array[smp_processor_id()] = kmalloc(sizeof(struct arraycache_init),GFP_KERNEL);
++			cachep->array[smp_processor_id()] =
++				kmalloc(sizeof(struct arraycache_init),
++					GFP_KERNEL);
+ 		}
+ 		BUG_ON(!ac_data(cachep));
+ 		ac_data(cachep)->avail = 0;
+@@ -1241,7 +1246,7 @@ next:
+ 	} 
+ 
+ 	cachep->lists.next_reap = jiffies + REAPTIMEOUT_LIST3 +
+-					((unsigned long)cachep)%REAPTIMEOUT_LIST3;
++				((unsigned long)cachep)%REAPTIMEOUT_LIST3;
+ 
+ 	/* Need the semaphore to access the chain. */
+ 	down(&cache_chain_sem);
+@@ -1254,16 +1259,24 @@ next:
+ 		list_for_each(p, &cache_chain) {
+ 			kmem_cache_t *pc = list_entry(p, kmem_cache_t, next);
+ 			char tmp;
+-			/* This happens when the module gets unloaded and doesn't
+-			   destroy its slab cache and noone else reuses the vmalloc
+-			   area of the module. Print a warning. */
+-			if (__get_user(tmp,pc->name)) { 
+-				printk("SLAB: cache with size %d has lost its name\n", 
+-					pc->objsize); 
++
++			/*
++			 * This happens when the module gets unloaded and
++			 * doesn't destroy its slab cache and noone else reuses
++			 * the vmalloc area of the module. Print a warning.
++			 */
++#ifdef CONFIG_X86_UACCESS_INDIRECT
++			if (__direct_get_user(tmp,pc->name)) {
++#else
++			if (__get_user(tmp,pc->name)) {
++#endif
++				printk("SLAB: cache with size %d has lost its "
++						"name\n", pc->objsize);
+ 				continue; 
+ 			} 	
+ 			if (!strcmp(pc->name,name)) { 
+-				printk("kmem_cache_create: duplicate cache %s\n",name); 
++				printk("kmem_cache_create: duplicate "
++						"cache %s\n",name);
+ 				up(&cache_chain_sem); 
+ 				BUG(); 
+ 			}	
+@@ -1608,7 +1621,6 @@ static int cache_grow (kmem_cache_t * ca
+ 	do {
+ 		SET_PAGE_CACHE(page, cachep);
+ 		SET_PAGE_SLAB(page, slabp);
+-		inc_page_state(nr_slab);
+ 		page++;
+ 	} while (--i);
+ 
+@@ -1890,6 +1902,15 @@ cache_alloc_debugcheck_after(kmem_cache_
+ 		*dbg_redzone1(cachep, objp) = RED_ACTIVE;
+ 		*dbg_redzone2(cachep, objp) = RED_ACTIVE;
+ 	}
++	{
++		int objnr;
++		struct slab *slabp;
++
++		slabp = GET_PAGE_SLAB(virt_to_page(objp));
++
++		objnr = (objp - slabp->s_mem) / cachep->objsize;
++		slab_bufctl(slabp)[objnr] = (int)caller;
++	}
+ 	objp += obj_dbghead(cachep);
+ 	if (cachep->ctor && cachep->flags & SLAB_POISON) {
+ 		unsigned long	ctor_flags = SLAB_CTOR_CONSTRUCTOR;
+@@ -1951,12 +1972,14 @@ static void free_block(kmem_cache_t *cac
+ 		objnr = (objp - slabp->s_mem) / cachep->objsize;
+ 		check_slabp(cachep, slabp);
+ #if DEBUG
++#if 0
+ 		if (slab_bufctl(slabp)[objnr] != BUFCTL_FREE) {
+ 			printk(KERN_ERR "slab: double free detected in cache '%s', objp %p.\n",
+ 						cachep->name, objp);
+ 			BUG();
+ 		}
+ #endif
++#endif
+ 		slab_bufctl(slabp)[objnr] = slabp->free;
+ 		slabp->free = objnr;
+ 		STATS_DEC_ACTIVE(cachep);
+@@ -2693,6 +2716,29 @@ struct seq_operations slabinfo_op = {
+ 	.show	= s_show,
+ };
+ 
++static void do_dump_slabp(kmem_cache_t *cachep)
++{
++#if DEBUG
++	struct list_head *q;
++
++	check_irq_on();
++	spin_lock_irq(&cachep->spinlock);
++	list_for_each(q,&cachep->lists.slabs_full) {
++		struct slab *slabp;
++		int i;
++		slabp = list_entry(q, struct slab, list);
++		for (i = 0; i < cachep->num; i++) {
++			unsigned long sym = slab_bufctl(slabp)[i];
++
++			printk("obj %p/%d: %p", slabp, i, (void *)sym);
++			print_symbol(" <%s>", sym);
++			printk("\n");
++		}
++	}
++	spin_unlock_irq(&cachep->spinlock);
++#endif
++}
++
+ #define MAX_SLABINFO_WRITE 128
+ /**
+  * slabinfo_write - Tuning for the slab allocator
+@@ -2733,9 +2779,11 @@ ssize_t slabinfo_write(struct file *file
+ 			    batchcount < 1 ||
+ 			    batchcount > limit ||
+ 			    shared < 0) {
+-				res = -EINVAL;
++				do_dump_slabp(cachep);
++				res = 0;
+ 			} else {
+-				res = do_tune_cpucache(cachep, limit, batchcount, shared);
++				res = do_tune_cpucache(cachep, limit,
++							batchcount, shared);
+ 			}
+ 			break;
+ 		}
+--- linux-2.6.0/mm/swap.c	2003-11-23 19:03:02.000000000 -0800
++++ 25/mm/swap.c	2003-12-28 23:26:43.000000000 -0800
+@@ -348,12 +348,15 @@ void pagevec_strip(struct pagevec *pvec)
+  * The search returns a group of mapping-contiguous pages with ascending
+  * indexes.  There may be holes in the indices due to not-present pages.
+  *
+- * pagevec_lookup() returns the number of pages which were found.
++ * pagevec_lookup() returns the number of pages which were found
++ * and also atomically sets the next offset to continue looking up
++ * mapping contiguous pages from (useful when doing a range of
++ * pagevec lookups in chunks of PAGEVEC_SIZE).
+  */
+ unsigned int pagevec_lookup(struct pagevec *pvec, struct address_space *mapping,
+-		pgoff_t start, unsigned int nr_pages)
++		pgoff_t *next, unsigned int nr_pages)
+ {
+-	pvec->nr = find_get_pages(mapping, start, nr_pages, pvec->pages);
++	pvec->nr = find_get_pages(mapping, next, nr_pages, pvec->pages);
+ 	return pagevec_count(pvec);
+ }
+ 
+@@ -386,17 +389,19 @@ EXPORT_SYMBOL(vm_acct_memory);
+ #ifdef CONFIG_SMP
+ void percpu_counter_mod(struct percpu_counter *fbc, long amount)
+ {
++	long count;
++	long *pcount;
+ 	int cpu = get_cpu();
+-	long count = fbc->counters[cpu].count;
+ 
+-	count += amount;
++	pcount = per_cpu_ptr(fbc->counters, cpu);
++	count = *pcount + amount;
+ 	if (count >= FBC_BATCH || count <= -FBC_BATCH) {
+ 		spin_lock(&fbc->lock);
+ 		fbc->count += count;
+ 		spin_unlock(&fbc->lock);
+ 		count = 0;
+ 	}
+-	fbc->counters[cpu].count = count;
++	*pcount = count;
+ 	put_cpu();
+ }
+ EXPORT_SYMBOL(percpu_counter_mod);
+--- linux-2.6.0/mm/swapfile.c	2003-11-09 16:45:06.000000000 -0800
++++ 25/mm/swapfile.c	2003-12-28 23:21:22.000000000 -0800
+@@ -912,7 +912,7 @@ static int setup_swap_extents(struct swa
+ 	sector_t last_block;
+ 	int ret;
+ 
+-	inode = sis->swap_file->f_dentry->d_inode;
++	inode = sis->swap_file->f_mapping->host;
+ 	if (S_ISBLK(inode->i_mode)) {
+ 		ret = add_swap_extent(sis, 0, sis->max, 0);
+ 		goto done;
+@@ -1031,13 +1031,13 @@ asmlinkage long sys_swapoff(const char _
+ 	if (IS_ERR(victim))
+ 		goto out;
+ 
+-	mapping = victim->f_dentry->d_inode->i_mapping;
++	mapping = victim->f_mapping;
+ 	prev = -1;
+ 	swap_list_lock();
+ 	for (type = swap_list.head; type >= 0; type = swap_info[type].next) {
+ 		p = swap_info + type;
+ 		if ((p->flags & SWP_ACTIVE) == SWP_ACTIVE) {
+-			if (p->swap_file->f_dentry->d_inode->i_mapping==mapping)
++			if (p->swap_file->f_mapping == mapping)
+ 				break;
+ 		}
+ 		prev = type;
+@@ -1099,13 +1099,12 @@ asmlinkage long sys_swapoff(const char _
+ 	swap_device_unlock(p);
+ 	swap_list_unlock();
+ 	vfree(swap_map);
+-	if (S_ISBLK(swap_file->f_dentry->d_inode->i_mode)) {
+-		struct block_device *bdev;
+-		bdev = swap_file->f_dentry->d_inode->i_bdev;
++	if (S_ISBLK(mapping->host->i_mode)) {
++		struct block_device *bdev = I_BDEV(mapping->host);
+ 		set_blocksize(bdev, p->old_block_size);
+ 		bd_release(bdev);
+ 	} else {
+-		up(&swap_file->f_dentry->d_inode->i_mapping->host->i_sem);
++		up(&mapping->host->i_sem);
+ 	}
+ 	filp_close(swap_file, NULL);
+ 	err = 0;
+@@ -1231,8 +1230,8 @@ asmlinkage long sys_swapon(const char __
+ 	int swapfilesize;
+ 	unsigned short *swap_map;
+ 	struct page *page = NULL;
+-	struct inode *inode;
+-	struct inode *downed_inode = NULL;
++	struct inode *inode = NULL;
++	int did_down = 0;
+ 
+ 	if (!capable(CAP_SYS_ADMIN))
+ 		return -EPERM;
+@@ -1279,8 +1278,8 @@ asmlinkage long sys_swapon(const char __
+ 	}
+ 
+ 	p->swap_file = swap_file;
+-	inode = swap_file->f_dentry->d_inode;
+-	mapping = swap_file->f_dentry->d_inode->i_mapping;
++	mapping = swap_file->f_mapping;
++	inode = mapping->host;
+ 
+ 	error = -EBUSY;
+ 	for (i = 0; i < nr_swapfiles; i++) {
+@@ -1288,32 +1287,32 @@ asmlinkage long sys_swapon(const char __
+ 
+ 		if (i == type || !q->swap_file)
+ 			continue;
+-		if (mapping == q->swap_file->f_dentry->d_inode->i_mapping)
++		if (mapping == q->swap_file->f_mapping)
+ 			goto bad_swap;
+ 	}
+ 
+ 	error = -EINVAL;
+ 	if (S_ISBLK(inode->i_mode)) {
+-		bdev = inode->i_bdev;
++		bdev = I_BDEV(inode);
+ 		error = bd_claim(bdev, sys_swapon);
+ 		if (error < 0) {
+ 			bdev = NULL;
+ 			goto bad_swap;
+ 		}
+ 		p->old_block_size = block_size(bdev);
+-		error = set_blocksize(inode->i_bdev, PAGE_SIZE);
++		error = set_blocksize(bdev, PAGE_SIZE);
+ 		if (error < 0)
+ 			goto bad_swap;
+ 		p->bdev = bdev;
+ 	} else if (S_ISREG(inode->i_mode)) {
+ 		p->bdev = inode->i_sb->s_bdev;
+-		downed_inode = mapping->host;
+-		down(&downed_inode->i_sem);
++		down(&inode->i_sem);
++		did_down = 1;
+ 	} else {
+ 		goto bad_swap;
+ 	}
+ 
+-	swapfilesize = i_size_read(mapping->host) >> PAGE_SHIFT;
++	swapfilesize = i_size_read(inode) >> PAGE_SHIFT;
+ 
+ 	/*
+ 	 * Read the swap header.
+@@ -1465,8 +1464,8 @@ out:
+ 	}
+ 	if (name)
+ 		putname(name);
+-	if (error && downed_inode)
+-		up(&downed_inode->i_sem);
++	if (error && did_down)
++		up(&inode->i_sem);
+ 	return error;
+ }
+ 
+--- linux-2.6.0/mm/truncate.c	2003-11-09 16:45:06.000000000 -0800
++++ 25/mm/truncate.c	2003-12-28 23:26:43.000000000 -0800
+@@ -122,14 +122,10 @@ void truncate_inode_pages(struct address
+ 
+ 	pagevec_init(&pvec, 0);
+ 	next = start;
+-	while (pagevec_lookup(&pvec, mapping, next, PAGEVEC_SIZE)) {
++	while (pagevec_lookup(&pvec, mapping, &next, PAGEVEC_SIZE)) {
+ 		for (i = 0; i < pagevec_count(&pvec); i++) {
+ 			struct page *page = pvec.pages[i];
+-			pgoff_t page_index = page->index;
+ 
+-			if (page_index > next)
+-				next = page_index;
+-			next++;
+ 			if (TestSetPageLocked(page))
+ 				continue;
+ 			if (PageWriteback(page)) {
+@@ -155,7 +151,7 @@ void truncate_inode_pages(struct address
+ 
+ 	next = start;
+ 	for ( ; ; ) {
+-		if (!pagevec_lookup(&pvec, mapping, next, PAGEVEC_SIZE)) {
++		if (!pagevec_lookup(&pvec, mapping, &next, PAGEVEC_SIZE)) {
+ 			if (next == start)
+ 				break;
+ 			next = start;
+@@ -166,14 +162,19 @@ void truncate_inode_pages(struct address
+ 
+ 			lock_page(page);
+ 			wait_on_page_writeback(page);
+-			if (page->index > next)
+-				next = page->index;
+-			next++;
+ 			truncate_complete_page(mapping, page);
+ 			unlock_page(page);
+ 		}
+ 		pagevec_release(&pvec);
+ 	}
++
++	if (lstart == 0) {
++		WARN_ON(mapping->nrpages);
++		WARN_ON(!list_empty(&mapping->clean_pages));
++		WARN_ON(!list_empty(&mapping->dirty_pages));
++		WARN_ON(!list_empty(&mapping->locked_pages));
++		WARN_ON(!list_empty(&mapping->io_pages));
++	}
+ }
+ 
+ EXPORT_SYMBOL(truncate_inode_pages);
+@@ -201,17 +202,13 @@ unsigned long invalidate_mapping_pages(s
+ 
+ 	pagevec_init(&pvec, 0);
+ 	while (next <= end &&
+-			pagevec_lookup(&pvec, mapping, next, PAGEVEC_SIZE)) {
++			pagevec_lookup(&pvec, mapping, &next, PAGEVEC_SIZE)) {
+ 		for (i = 0; i < pagevec_count(&pvec); i++) {
+ 			struct page *page = pvec.pages[i];
+ 
+ 			if (TestSetPageLocked(page)) {
+-				next++;
+ 				continue;
+ 			}
+-			if (page->index > next)
+-				next = page->index;
+-			next++;
+ 			if (PageDirty(page) || PageWriteback(page))
+ 				goto unlock;
+ 			if (page_mapped(page))
+@@ -250,14 +247,13 @@ void invalidate_inode_pages2(struct addr
+ 	int i;
+ 
+ 	pagevec_init(&pvec, 0);
+-	while (pagevec_lookup(&pvec, mapping, next, PAGEVEC_SIZE)) {
++	while (pagevec_lookup(&pvec, mapping, &next, PAGEVEC_SIZE)) {
+ 		for (i = 0; i < pagevec_count(&pvec); i++) {
+ 			struct page *page = pvec.pages[i];
+ 
+ 			lock_page(page);
+ 			if (page->mapping == mapping) {	/* truncate race? */
+ 				wait_on_page_writeback(page);
+-				next = page->index + 1;
+ 				if (page_mapped(page))
+ 					clear_page_dirty(page);
+ 				else
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/mm/usercopy.c	2003-12-28 23:26:37.000000000 -0800
+@@ -0,0 +1,291 @@
++/*
++ * linux/mm/usercopy.c
++ *
++ * (C) Copyright 2003 Ingo Molnar
++ *
++ * Generic implementation of all the user-VM access functions, without
++ * relying on being able to access the VM directly.
++ */
++
++#include <linux/module.h>
++#include <linux/sched.h>
++#include <linux/errno.h>
++#include <linux/mm.h>
++#include <linux/highmem.h>
++#include <linux/pagemap.h>
++#include <linux/smp_lock.h>
++#include <linux/ptrace.h>
++#include <linux/interrupt.h>
++
++#include <asm/pgtable.h>
++#include <asm/uaccess.h>
++#include <asm/atomic_kmap.h>
++
++/*
++ * Get kernel address of the user page and pin it.
++ */
++static inline struct page *pin_page(unsigned long addr, int write)
++{
++	struct mm_struct *mm = current->mm ? : &init_mm;
++	struct page *page = NULL;
++	int ret;
++
++	/*
++	 * Do a quick atomic lookup first - this is the fastpath.
++	 */
++retry:
++	page = follow_page(mm, addr, write);
++	if (likely(page != NULL)) {
++		if (!PageReserved(page))
++			get_page(page);
++		return page;
++	}
++
++	/*
++	 * No luck - bad address or need to fault in the page:
++	 */
++
++	/* Release the lock so get_user_pages can sleep */
++	spin_unlock(&mm->page_table_lock);
++
++	/*
++	 * In the context of filemap_copy_from_user(), we are not allowed
++	 * to sleep.  We must fail this usercopy attempt and allow
++	 * filemap_copy_from_user() to recover: drop its atomic kmap and use
++	 * a sleeping kmap instead.
++	 */
++	if (in_atomic()) {
++		spin_lock(&mm->page_table_lock);
++		return NULL;
++	}
++
++	down_read(&mm->mmap_sem);
++	ret = get_user_pages(current, mm, addr, 1, write, 0, NULL, NULL);
++	up_read(&mm->mmap_sem);
++	spin_lock(&mm->page_table_lock);
++
++	if (ret <= 0)
++		return NULL;
++
++	/*
++	 * Go try the follow_page again.
++	 */
++	goto retry;
++}
++
++static inline void unpin_page(struct page *page)
++{
++	put_page(page);
++}
++
++/*
++ * Access another process' address space.
++ * Source/target buffer must be kernel space,
++ * Do not walk the page table directly, use get_user_pages
++ */
++static int rw_vm(unsigned long addr, void *buf, int len, int write)
++{
++	struct mm_struct *mm = current->mm ? : &init_mm;
++
++	if (!len)
++		return 0;
++
++	spin_lock(&mm->page_table_lock);
++
++	/* ignore errors, just check how much was sucessfully transfered */
++	while (len) {
++		struct page *page = NULL;
++		int bytes, offset;
++		void *maddr;
++
++		page = pin_page(addr, write);
++		if (!page)
++			break;
++
++		bytes = len;
++		offset = addr & (PAGE_SIZE-1);
++		if (bytes > PAGE_SIZE-offset)
++			bytes = PAGE_SIZE-offset;
++
++		maddr = kmap_atomic(page, KM_USER_COPY);
++
++#define HANDLE_TYPE(type) \
++	case sizeof(type): *(type *)(maddr+offset) = *(type *)(buf); break;
++
++		if (write) {
++			switch (bytes) {
++			HANDLE_TYPE(char);
++			HANDLE_TYPE(int);
++			HANDLE_TYPE(long long);
++			default:
++				memcpy(maddr + offset, buf, bytes);
++			}
++		} else {
++#undef HANDLE_TYPE
++#define HANDLE_TYPE(type) \
++	case sizeof(type): *(type *)(buf) = *(type *)(maddr+offset); break;
++			switch (bytes) {
++			HANDLE_TYPE(char);
++			HANDLE_TYPE(int);
++			HANDLE_TYPE(long long);
++			default:
++				memcpy(buf, maddr + offset, bytes);
++			}
++#undef HANDLE_TYPE
++		}
++		kunmap_atomic(maddr, KM_USER_COPY);
++		unpin_page(page);
++		len -= bytes;
++		buf += bytes;
++		addr += bytes;
++	}
++	spin_unlock(&mm->page_table_lock);
++
++	return len;
++}
++
++static int str_vm(unsigned long addr, void *buf0, int len, int copy)
++{
++	struct mm_struct *mm = current->mm ? : &init_mm;
++	struct page *page;
++	void *buf = buf0;
++
++	if (!len)
++		return len;
++
++	spin_lock(&mm->page_table_lock);
++
++	/* ignore errors, just check how much was sucessfully transfered */
++	while (len) {
++		int bytes, offset, left, copied;
++		char *maddr;
++
++		page = pin_page(addr, copy == 2);
++		if (!page) {
++			spin_unlock(&mm->page_table_lock);
++			return -EFAULT;
++		}
++		bytes = len;
++		offset = addr & (PAGE_SIZE-1);
++		if (bytes > PAGE_SIZE-offset)
++			bytes = PAGE_SIZE-offset;
++
++		maddr = kmap_atomic(page, KM_USER_COPY);
++		if (copy == 2) {
++			memset(maddr + offset, 0, bytes);
++			copied = bytes;
++			left = 0;
++		} else if (copy == 1) {
++			left = strncpy_count(buf, maddr + offset, bytes);
++			copied = bytes - left;
++		} else {
++			copied = strnlen(maddr + offset, bytes);
++			left = bytes - copied;
++		}
++		BUG_ON(bytes < 0 || copied < 0);
++		kunmap_atomic(maddr, KM_USER_COPY);
++		unpin_page(page);
++		len -= copied;
++		buf += copied;
++		addr += copied;
++		if (left)
++			break;
++	}
++	spin_unlock(&mm->page_table_lock);
++
++	return len;
++}
++
++/*
++ * Copies memory from userspace (ptr) into kernelspace (val).
++ *
++ * returns # of bytes not copied.
++ */
++int get_user_size(unsigned int size, void *val, const void *ptr)
++{
++	int ret;
++
++	if (unlikely(segment_eq(get_fs(), KERNEL_DS)))
++		ret = __direct_copy_from_user(val, ptr, size);
++	else
++		ret = rw_vm((unsigned long)ptr, val, size, 0);
++	if (ret)
++		/*
++		 * Zero the rest:
++		 */
++		memset(val + size - ret, 0, ret);
++	return ret;
++}
++
++/*
++ * Copies memory from kernelspace (val) into userspace (ptr).
++ *
++ * returns # of bytes not copied.
++ */
++int put_user_size(unsigned int size, const void *val, void *ptr)
++{
++	if (unlikely(segment_eq(get_fs(), KERNEL_DS)))
++		return __direct_copy_to_user(ptr, val, size);
++	else
++		return rw_vm((unsigned long)ptr, (void *)val, size, 1);
++}
++
++int copy_str_fromuser_size(unsigned int size, void *val, const void *ptr)
++{
++	int copied, left;
++
++	if (unlikely(segment_eq(get_fs(), KERNEL_DS))) {
++		left = strncpy_count(val, ptr, size);
++		copied = size - left;
++		BUG_ON(copied < 0);
++
++		return copied;
++	}
++	left = str_vm((unsigned long)ptr, val, size, 1);
++	if (left < 0)
++		return left;
++	copied = size - left;
++	BUG_ON(copied < 0);
++
++	return copied;
++}
++
++int strlen_fromuser_size(unsigned int size, const void *ptr)
++{
++	int copied, left;
++
++	if (unlikely(segment_eq(get_fs(), KERNEL_DS))) {
++		copied = strnlen(ptr, size) + 1;
++		BUG_ON(copied < 0);
++
++		return copied;
++	}
++	left = str_vm((unsigned long)ptr, NULL, size, 0);
++	if (left < 0)
++		return 0;
++	copied = size - left + 1;
++	BUG_ON(copied < 0);
++
++	return copied;
++}
++
++int zero_user_size(unsigned int size, void *ptr)
++{
++	int left;
++
++	if (unlikely(segment_eq(get_fs(), KERNEL_DS))) {
++		memset(ptr, 0, size);
++		return 0;
++	}
++	left = str_vm((unsigned long)ptr, NULL, size, 2);
++	if (left < 0)
++		return size;
++	return left;
++}
++
++EXPORT_SYMBOL(get_user_size);
++EXPORT_SYMBOL(put_user_size);
++EXPORT_SYMBOL(zero_user_size);
++EXPORT_SYMBOL(copy_str_fromuser_size);
++EXPORT_SYMBOL(strlen_fromuser_size);
++
+--- linux-2.6.0/mm/vmscan.c	2003-11-09 16:45:06.000000000 -0800
++++ 25/mm/vmscan.c	2003-12-28 23:23:03.000000000 -0800
+@@ -154,7 +154,7 @@ static int shrink_slab(long scanned, uns
+ 	list_for_each_entry(shrinker, &shrinker_list, list) {
+ 		unsigned long long delta;
+ 
+-		delta = scanned * shrinker->seeks;
++		delta = 4 * (scanned / shrinker->seeks);
+ 		delta *= (*shrinker->shrinker)(0, gfp_mask);
+ 		do_div(delta, pages + 1);
+ 		shrinker->nr += delta;
+@@ -779,7 +779,7 @@ shrink_zone(struct zone *zone, int max_s
+ 		count = atomic_read(&zone->refill_counter);
+ 		if (count > SWAP_CLUSTER_MAX * 4)
+ 			count = SWAP_CLUSTER_MAX * 4;
+-		atomic_sub(count, &zone->refill_counter);
++		atomic_set(&zone->refill_counter, 0);
+ 		refill_inactive_zone(zone, count, ps, priority);
+ 	}
+ 	return shrink_cache(nr_pages, zone, gfp_mask,
+@@ -803,16 +803,15 @@ shrink_zone(struct zone *zone, int max_s
+  * scan then give up on it.
+  */
+ static int
+-shrink_caches(struct zone *classzone, int priority, int *total_scanned,
++shrink_caches(struct zone **zones, int priority, int *total_scanned,
+ 		int gfp_mask, int nr_pages, struct page_state *ps)
+ {
+-	struct zone *first_classzone;
+-	struct zone *zone;
+ 	int ret = 0;
++	int i;
+ 
+-	first_classzone = classzone->zone_pgdat->node_zones;
+-	for (zone = classzone; zone >= first_classzone; zone--) {
++	for (i = 0; zones[i] != NULL; i++) {
+ 		int to_reclaim = max(nr_pages, SWAP_CLUSTER_MAX);
++		struct zone *zone = zones[i];
+ 		int nr_mapped = 0;
+ 		int max_scan;
+ 
+@@ -855,27 +854,27 @@ shrink_caches(struct zone *classzone, in
+  * excessive rotation of the inactive list, which is _supposed_ to be an LRU,
+  * yes?
+  */
+-int try_to_free_pages(struct zone *cz,
++int try_to_free_pages(struct zone **zones,
+ 		unsigned int gfp_mask, unsigned int order)
+ {
+ 	int priority;
+ 	int ret = 0;
+ 	const int nr_pages = SWAP_CLUSTER_MAX;
+ 	int nr_reclaimed = 0;
+-	struct zone *zone;
+ 	struct reclaim_state *reclaim_state = current->reclaim_state;
++	int i;
+ 
+ 	inc_page_state(allocstall);
+ 
+-	for (zone = cz; zone >= cz->zone_pgdat->node_zones; --zone)
+-		zone->temp_priority = DEF_PRIORITY;
++	for (i = 0; zones[i] != 0; i++)
++		zones[i]->temp_priority = DEF_PRIORITY;
+ 
+ 	for (priority = DEF_PRIORITY; priority >= 0; priority--) {
+ 		int total_scanned = 0;
+ 		struct page_state ps;
+ 
+ 		get_page_state(&ps);
+-		nr_reclaimed += shrink_caches(cz, priority, &total_scanned,
++		nr_reclaimed += shrink_caches(zones, priority, &total_scanned,
+ 						gfp_mask, nr_pages, &ps);
+ 		if (nr_reclaimed >= nr_pages) {
+ 			ret = 1;
+@@ -892,7 +891,7 @@ int try_to_free_pages(struct zone *cz,
+ 
+ 		/* Take a nap, wait for some writeback to complete */
+ 		blk_congestion_wait(WRITE, HZ/10);
+-		if (cz - cz->zone_pgdat->node_zones < ZONE_HIGHMEM) {
++		if (zones[0] - zones[0]->zone_pgdat->node_zones < ZONE_HIGHMEM) {
+ 			shrink_slab(total_scanned, gfp_mask);
+ 			if (reclaim_state) {
+ 				nr_reclaimed += reclaim_state->reclaimed_slab;
+@@ -903,8 +902,8 @@ int try_to_free_pages(struct zone *cz,
+ 	if ((gfp_mask & __GFP_FS) && !(gfp_mask & __GFP_NORETRY))
+ 		out_of_memory();
+ out:
+-	for (zone = cz; zone >= cz->zone_pgdat->node_zones; --zone)
+-		zone->prev_priority = zone->temp_priority;
++	for (i = 0; zones[i] != 0; i++)
++		zones[i]->prev_priority = zones[i]->temp_priority;
+ 	return ret;
+ }
+ 
+--- linux-2.6.0/net/atm/clip.c	2003-10-17 15:58:05.000000000 -0700
++++ 25/net/atm/clip.c	2003-12-28 23:21:01.000000000 -0800
+@@ -563,32 +563,20 @@ static int clip_setentry(struct atm_vcc 
+ }
+ 
+ 
+-static int clip_init(struct net_device *dev)
++static void clip_setup(struct net_device *dev)
+ {
+-	DPRINTK("clip_init %s\n",dev->name);
+ 	dev->hard_start_xmit = clip_start_xmit;
+ 	/* sg_xmit ... */
+-	dev->hard_header = NULL;
+-	dev->rebuild_header = NULL;
+-	dev->set_mac_address = NULL;
+-	dev->hard_header_parse = NULL;
+-	dev->hard_header_cache = NULL;
+-	dev->header_cache_update = NULL;
+-	dev->change_mtu = NULL;
+-	dev->do_ioctl = NULL;
+ 	dev->get_stats = clip_get_stats;
+ 	dev->type = ARPHRD_ATM;
+ 	dev->hard_header_len = RFC1483LLC_LEN;
+ 	dev->mtu = RFC1626_MTU;
+-	dev->addr_len = 0;
+ 	dev->tx_queue_len = 100; /* "normal" queue (packets) */
+ 	    /* When using a "real" qdisc, the qdisc determines the queue */
+ 	    /* length. tx_queue_len is only used for the default case, */
+ 	    /* without any more elaborate queuing. 100 is a reasonable */
+ 	    /* compromise between decent burst-tolerance and protection */
+ 	    /* against memory hogs. */
+-	dev->flags = 0;
+-	return 0;
+ }
+ 
+ 
+@@ -608,18 +596,16 @@ static int clip_create(int number)
+ 			if (PRIV(dev)->number >= number)
+ 				number = PRIV(dev)->number+1;
+ 	}
+-	dev = kmalloc(sizeof(struct net_device)+sizeof(struct clip_priv),
+-	    GFP_KERNEL); 
+-	if (!dev) return -ENOMEM;
+-	memset(dev,0,sizeof(struct net_device)+sizeof(struct clip_priv));
++	dev = alloc_netdev(sizeof(struct clip_priv), "", clip_setup);
++	if (!dev)
++		return -ENOMEM;
+ 	clip_priv = PRIV(dev);
+ 	sprintf(dev->name,"atm%d",number);
+-	dev->init = clip_init;
+ 	spin_lock_init(&clip_priv->xoff_lock);
+ 	clip_priv->number = number;
+ 	error = register_netdev(dev);
+ 	if (error) {
+-		kfree(dev);
++		free_netdev(dev);
+ 		return error;
+ 	}
+ 	clip_priv->next = clip_devs;
+@@ -634,7 +620,7 @@ static int clip_device_event(struct noti
+ {
+ 	/* ignore non-CLIP devices */
+ 	if (((struct net_device *) dev)->type != ARPHRD_ATM ||
+-	    ((struct net_device *) dev)->init != clip_init)
++	    ((struct net_device *) dev)->hard_start_xmit != clip_start_xmit)
+ 		return NOTIFY_DONE;
+ 	switch (event) {
+ 		case NETDEV_UP:
+--- linux-2.6.0/net/bridge/br_if.c	2003-07-27 12:14:40.000000000 -0700
++++ 25/net/bridge/br_if.c	2003-12-28 23:21:01.000000000 -0800
+@@ -172,7 +172,7 @@ int br_add_bridge(const char *name)
+ 
+ 	ret = register_netdev(br->dev);
+ 	if (ret)
+-		kfree(br->dev);
++		free_netdev(br->dev);
+ 	return ret;
+ }
+ 
+--- linux-2.6.0/net/bridge/netfilter/Kconfig	2003-10-17 15:58:05.000000000 -0700
++++ 25/net/bridge/netfilter/Kconfig	2003-12-28 23:23:06.000000000 -0800
+@@ -92,7 +92,7 @@ config BRIDGE_EBT_LIMIT
+ 	  equivalent of the iptables limit match.
+ 
+ 	  If you want to compile it as a module, say M here and read
+-	  <file:Documentation/modules.txt>.  If unsure, say `N'.
++	  <file:Documentation/kbuild/modules.txt>.  If unsure, say `N'.
+ 
+ config BRIDGE_EBT_MARK
+ 	tristate "ebt: mark filter support"
+--- linux-2.6.0/net/core/dev.c	2003-11-23 19:03:03.000000000 -0800
++++ 25/net/core/dev.c	2003-12-28 23:21:10.000000000 -0800
+@@ -105,6 +105,7 @@
+ #include <linux/kmod.h>
+ #include <linux/module.h>
+ #include <linux/kallsyms.h>
++#include <linux/netpoll.h>
+ #ifdef CONFIG_NET_RADIO
+ #include <linux/wireless.h>		/* Note : will define WIRELESS_EXT */
+ #include <net/iw_handler.h>
+@@ -371,6 +372,30 @@ int netdev_boot_setup_check(struct net_d
+ 	return 0;
+ }
+ 
++
++/**
++ *	netdev_boot_base	- get address from boot time settings
++ *	@prefix: prefix for network device
++ *	@unit: id for network device
++ *
++ * 	Check boot time settings for the base address of device.
++ *	The found settings are set for the device to be used
++ *	later in the device probing.
++ *	Returns 0 if no settings found.
++ */
++unsigned long netdev_boot_base(const char *prefix, int unit)
++{
++	const struct netdev_boot_setup *s = dev_boot_setup;
++	char name[IFNAMSIZ];
++	int i;
++
++	sprintf(name, "%s%d", prefix, unit);
++	for (i = 0; i < NETDEV_BOOT_SETUP_MAX; i++)
++		if (!strcmp(name, s[i].name))
++			return s[i].map.base_addr;
++	return 0;
++}
++
+ /*
+  * Saves at boot time configured settings for any netdevice.
+  */
+@@ -1380,7 +1405,6 @@ static void sample_queue(unsigned long d
+ }
+ #endif
+ 
+-
+ /**
+  *	netif_rx	-	post buffer to the network code
+  *	@skb: buffer to post
+@@ -1405,6 +1429,13 @@ int netif_rx(struct sk_buff *skb)
+ 	struct softnet_data *queue;
+ 	unsigned long flags;
+ 
++#ifdef CONFIG_NETPOLL_RX
++	if (skb->dev->netpoll_rx && netpoll_rx(skb)) {
++		kfree_skb(skb);
++		return NET_RX_DROP;
++	}
++#endif
++
+ 	if (!skb->stamp.tv_sec)
+ 		do_gettimeofday(&skb->stamp);
+ 
+@@ -1560,6 +1591,13 @@ int netif_receive_skb(struct sk_buff *sk
+ 	int ret = NET_RX_DROP;
+ 	unsigned short type = skb->protocol;
+ 
++#ifdef CONFIG_NETPOLL_RX
++	if (skb->dev->netpoll_rx && skb->dev->poll && netpoll_rx(skb)) {
++		kfree_skb(skb);
++		return NET_RX_DROP;
++	}
++#endif
++
+ 	if (!skb->stamp.tv_sec)
+ 		do_gettimeofday(&skb->stamp);
+ 
+@@ -1684,7 +1722,6 @@ static void net_rx_action(struct softirq
+ 	unsigned long start_time = jiffies;
+ 	int budget = netdev_max_backlog;
+ 
+-	
+ 	preempt_disable();
+ 	local_irq_disable();
+ 
+@@ -1711,6 +1748,10 @@ static void net_rx_action(struct softirq
+ 			dev_put(dev);
+ 			local_irq_disable();
+ 		}
++
++#ifdef CONFIG_KGDBOE
++		kgdb_process_breakpoint();
++#endif
+ 	}
+ out:
+ 	local_irq_enable();
+@@ -2875,7 +2916,7 @@ void free_netdev(struct net_device *dev)
+ {
+ 	/*  Compatiablity with error handling in drivers */
+ 	if (dev->reg_state == NETREG_UNINITIALIZED) {
+-		kfree(dev);
++		kfree((char *)dev - dev->padded);
+ 		return;
+ 	}
+ 
+--- linux-2.6.0/net/core/Makefile	2003-09-08 13:58:59.000000000 -0700
++++ 25/net/core/Makefile	2003-12-28 23:21:01.000000000 -0800
+@@ -13,3 +13,4 @@ obj-$(CONFIG_NETFILTER) += netfilter.o
+ obj-$(CONFIG_NET_DIVERT) += dv.o
+ obj-$(CONFIG_NET_PKTGEN) += pktgen.o
+ obj-$(CONFIG_NET_RADIO) += wireless.o
++obj-$(CONFIG_NETPOLL) += netpoll.o
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/net/core/netpoll.c	2003-12-28 23:21:01.000000000 -0800
+@@ -0,0 +1,642 @@
++/*
++ * Common framework for low-level network console, dump, and debugger code
++ *
++ * Sep 8 2003  Matt Mackall <mpm@selenic.com>
++ */
++
++#include <linux/smp_lock.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/string.h>
++#include <linux/inetdevice.h>
++#include <linux/inet.h>
++#include <linux/interrupt.h>
++#include <linux/netpoll.h>
++#include <linux/sched.h>
++#include <net/tcp.h>
++#include <net/udp.h>
++
++/*
++ * We maintain a small pool of fully-sized skbs, to make sure the
++ * message gets out even in extreme OOM situations.
++ */
++
++#define MAX_SKBS 32
++#define MAX_UDP_CHUNK 1460
++
++static spinlock_t skb_list_lock = SPIN_LOCK_UNLOCKED;
++static int nr_skbs;
++static struct sk_buff *skbs;
++
++static spinlock_t rx_list_lock = SPIN_LOCK_UNLOCKED;
++static LIST_HEAD(rx_list);
++
++static int trapped;
++
++#define MAX_SKB_SIZE \
++		(MAX_UDP_CHUNK + sizeof(struct udphdr) + \
++				sizeof(struct iphdr) + sizeof(struct ethhdr))
++
++static void zap_completion_queue(void);
++
++static int checksum_udp(struct sk_buff *skb, struct udphdr *uh,
++			     unsigned short ulen, u32 saddr, u32 daddr)
++{
++	if (uh->check == 0)
++		return 0;
++
++	if (skb->ip_summed == CHECKSUM_HW)
++		return csum_tcpudp_magic(
++			saddr, daddr, ulen, IPPROTO_UDP, skb->csum);
++
++	skb->csum = csum_tcpudp_nofold(saddr, daddr, ulen, IPPROTO_UDP, 0);
++
++	return csum_fold(skb_checksum(skb, 0, skb->len, skb->csum));
++}
++
++void netpoll_poll(struct netpoll *np)
++{
++	int budget = 1;
++
++	if(!np->dev || !netif_running(np->dev) || !np->dev->poll_controller)
++		return;
++
++	/* Process pending work on NIC */
++	np->dev->poll_controller(np->dev);
++
++	/* If scheduling is stopped, tickle NAPI bits */
++	if(trapped && np->dev->poll &&
++	   test_bit(__LINK_STATE_RX_SCHED, &np->dev->state))
++		np->dev->poll(np->dev, &budget);
++	zap_completion_queue();
++}
++
++static void refill_skbs(void)
++{
++	struct sk_buff *skb;
++	unsigned long flags;
++
++	spin_lock_irqsave(&skb_list_lock, flags);
++	while (nr_skbs < MAX_SKBS) {
++		skb = alloc_skb(MAX_SKB_SIZE, GFP_ATOMIC);
++		if (!skb)
++			break;
++
++		skb->next = skbs;
++		skbs = skb;
++		nr_skbs++;
++	}
++	spin_unlock_irqrestore(&skb_list_lock, flags);
++}
++
++static void zap_completion_queue(void)
++{
++	unsigned long flags;
++	struct softnet_data *sd = &get_cpu_var(softnet_data);
++
++	if (sd->completion_queue) {
++		struct sk_buff *clist;
++
++		local_irq_save(flags);
++		clist = sd->completion_queue;
++		sd->completion_queue = NULL;
++		local_irq_restore(flags);
++
++		while (clist != NULL) {
++			struct sk_buff *skb = clist;
++			clist = clist->next;
++			__kfree_skb(skb);
++		}
++	}
++
++	put_cpu_var(softnet_data);
++}
++
++static struct sk_buff * find_skb(struct netpoll *np, int len, int reserve)
++{
++	int once = 1, count = 0;
++	unsigned long flags;
++	struct sk_buff *skb = NULL;
++
++	zap_completion_queue();
++repeat:
++	if (nr_skbs < MAX_SKBS)
++		refill_skbs();
++
++	skb = alloc_skb(len, GFP_ATOMIC);
++
++	if (!skb) {
++		spin_lock_irqsave(&skb_list_lock, flags);
++		skb = skbs;
++		if (skb)
++			skbs = skb->next;
++		skb->next = NULL;
++		nr_skbs--;
++		spin_unlock_irqrestore(&skb_list_lock, flags);
++	}
++
++	if(!skb) {
++		count++;
++		if (once && (count == 1000000)) {
++			printk("out of netpoll skbs!\n");
++			once = 0;
++		}
++		netpoll_poll(np);
++		goto repeat;
++	}
++
++	atomic_set(&skb->users, 1);
++	skb_reserve(skb, reserve);
++	return skb;
++}
++
++void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
++{
++	int status;
++
++repeat:
++	if(!np || !np->dev || !netif_running(np->dev)) {
++		__kfree_skb(skb);
++		return;
++	}
++
++	spin_lock(&np->dev->xmit_lock);
++	np->dev->xmit_lock_owner = smp_processor_id();
++
++	if (netif_queue_stopped(np->dev)) {
++		np->dev->xmit_lock_owner = -1;
++		spin_unlock(&np->dev->xmit_lock);
++
++		netpoll_poll(np);
++		goto repeat;
++	}
++
++	status = np->dev->hard_start_xmit(skb, np->dev);
++	np->dev->xmit_lock_owner = -1;
++	spin_unlock(&np->dev->xmit_lock);
++
++	/* transmit busy */
++	if(status)
++		goto repeat;
++}
++
++void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
++{
++	int total_len, eth_len, ip_len, udp_len;
++	struct sk_buff *skb;
++	struct udphdr *udph;
++	struct iphdr *iph;
++	struct ethhdr *eth;
++
++	udp_len = len + sizeof(*udph);
++	ip_len = eth_len = udp_len + sizeof(*iph);
++	total_len = eth_len + ETH_HLEN;
++
++	skb = find_skb(np, total_len, total_len - len);
++	if (!skb)
++		return;
++
++	memcpy(skb->data, msg, len);
++	skb->len += len;
++
++	udph = (struct udphdr *) skb_push(skb, sizeof(*udph));
++	udph->source = htons(np->local_port);
++	udph->dest = htons(np->remote_port);
++	udph->len = htons(udp_len);
++	udph->check = 0;
++
++	iph = (struct iphdr *)skb_push(skb, sizeof(*iph));
++
++	iph->version  = 4;
++	iph->ihl      = 5;
++	iph->tos      = 0;
++	iph->tot_len  = htons(ip_len);
++	iph->id       = 0;
++	iph->frag_off = 0;
++	iph->ttl      = 64;
++	iph->protocol = IPPROTO_UDP;
++	iph->check    = 0;
++	iph->saddr    = htonl(np->local_ip);
++	iph->daddr    = htonl(np->remote_ip);
++	iph->check    = ip_fast_csum((unsigned char *)iph, iph->ihl);
++
++	eth = (struct ethhdr *) skb_push(skb, ETH_HLEN);
++
++	eth->h_proto = htons(ETH_P_IP);
++	memcpy(eth->h_source, np->local_mac, 6);
++	memcpy(eth->h_dest, np->remote_mac, 6);
++
++	netpoll_send_skb(np, skb);
++}
++
++static void arp_reply(struct sk_buff *skb)
++{
++	struct in_device *in_dev = (struct in_device *) skb->dev->ip_ptr;
++	struct arphdr *arp;
++	unsigned char *arp_ptr, *sha, *tha;
++	int size, type = ARPOP_REPLY, ptype = ETH_P_ARP;
++	u32 sip, tip;
++	struct sk_buff *send_skb;
++	unsigned long flags;
++	struct list_head *p;
++	struct netpoll *np = 0;
++
++	spin_lock_irqsave(&rx_list_lock, flags);
++	list_for_each(p, &rx_list) {
++		np = list_entry(p, struct netpoll, rx_list);
++		if ( np->dev == skb->dev )
++			break;
++		np = 0;
++	}
++	spin_unlock_irqrestore(&rx_list_lock, flags);
++
++	if (!np) return;
++
++	/* No arp on this interface */
++	if (!in_dev || skb->dev->flags & IFF_NOARP)
++		return;
++
++	if (!pskb_may_pull(skb, (sizeof(struct arphdr) +
++				 (2 * skb->dev->addr_len) +
++				 (2 * sizeof(u32)))))
++		return;
++
++	skb->h.raw = skb->nh.raw = skb->data;
++	arp = skb->nh.arph;
++
++	if ((arp->ar_hrd != htons(ARPHRD_ETHER) &&
++	     arp->ar_hrd != htons(ARPHRD_IEEE802)) ||
++	    arp->ar_pro != htons(ETH_P_IP) ||
++	    arp->ar_op != htons(ARPOP_REQUEST))
++		return;
++
++	arp_ptr= (unsigned char *)(arp+1);
++	sha = arp_ptr;
++	arp_ptr += skb->dev->addr_len;
++	memcpy(&sip, arp_ptr, 4);
++	arp_ptr += 4;
++	tha = arp_ptr;
++	arp_ptr += skb->dev->addr_len;
++	memcpy(&tip, arp_ptr, 4);
++
++	/* Should we ignore arp? */
++	if (tip != in_dev->ifa_list->ifa_address ||
++	    LOOPBACK(tip) || MULTICAST(tip))
++		return;
++
++
++	size = sizeof(struct arphdr) + 2 * (skb->dev->addr_len + 4);
++	send_skb = find_skb(np, size + LL_RESERVED_SPACE(np->dev),
++			    LL_RESERVED_SPACE(np->dev));
++
++	if (!send_skb)
++		return;
++
++	send_skb->nh.raw = send_skb->data;
++	arp = (struct arphdr *) skb_put(send_skb, size);
++	send_skb->dev = skb->dev;
++	send_skb->protocol = htons(ETH_P_ARP);
++
++	/* Fill the device header for the ARP frame */
++
++	if (np->dev->hard_header &&
++	    np->dev->hard_header(send_skb, skb->dev, ptype,
++				       np->remote_mac, np->local_mac,
++				       send_skb->len) < 0) {
++		kfree_skb(send_skb);
++		return;
++	}
++
++	/*
++	 * Fill out the arp protocol part.
++	 *
++	 * we only support ethernet device type,
++	 * which (according to RFC 1390) should always equal 1 (Ethernet).
++	 */
++
++	arp->ar_hrd = htons(np->dev->type);
++	arp->ar_pro = htons(ETH_P_IP);
++	arp->ar_hln = np->dev->addr_len;
++	arp->ar_pln = 4;
++	arp->ar_op = htons(type);
++
++	arp_ptr=(unsigned char *)(arp + 1);
++	memcpy(arp_ptr, np->dev->dev_addr, np->dev->addr_len);
++	arp_ptr += np->dev->addr_len;
++	memcpy(arp_ptr, &tip, 4);
++	arp_ptr += 4;
++	memcpy(arp_ptr, np->local_mac, np->dev->addr_len);
++	arp_ptr += np->dev->addr_len;
++	memcpy(arp_ptr, &sip, 4);
++
++	netpoll_send_skb(np, send_skb);
++}
++
++int netpoll_rx(struct sk_buff *skb)
++{
++	int proto, len, ulen;
++	struct iphdr *iph;
++	struct udphdr *uh;
++	struct netpoll *np;
++	struct list_head *p;
++	unsigned long flags;
++
++	if (skb->dev->type != ARPHRD_ETHER)
++		goto out;
++
++	/* check if netpoll clients need ARP */
++	if (skb->protocol == __constant_htons(ETH_P_ARP) && trapped) {
++		arp_reply(skb);
++		return 1;
++	}
++
++	proto = ntohs(skb->mac.ethernet->h_proto);
++	if (proto != ETH_P_IP)
++		goto out;
++	if (skb->pkt_type == PACKET_OTHERHOST)
++		goto out;
++	if (skb_shared(skb))
++		goto out;
++
++	iph = (struct iphdr *)skb->data;
++	if (!pskb_may_pull(skb, sizeof(struct iphdr)))
++		goto out;
++	if (iph->ihl < 5 || iph->version != 4)
++		goto out;
++	if (!pskb_may_pull(skb, iph->ihl*4))
++		goto out;
++	if (ip_fast_csum((u8 *)iph, iph->ihl) != 0)
++		goto out;
++
++	len = ntohs(iph->tot_len);
++	if (skb->len < len || len < iph->ihl*4)
++		goto out;
++
++	if (iph->protocol != IPPROTO_UDP)
++		goto out;
++
++	len -= iph->ihl*4;
++	uh = (struct udphdr *)(((char *)iph) + iph->ihl*4);
++	ulen = ntohs(uh->len);
++
++	if (ulen != len)
++		goto out;
++	if (checksum_udp(skb, uh, ulen, iph->saddr, iph->daddr) < 0)
++		goto out;
++
++	spin_lock_irqsave(&rx_list_lock, flags);
++	list_for_each(p, &rx_list) {
++		np = list_entry(p, struct netpoll, rx_list);
++		if (np->dev && np->dev != skb->dev)
++			continue;
++		if (np->local_ip && np->local_ip != ntohl(iph->daddr))
++			continue;
++		if (np->remote_ip && np->remote_ip != ntohl(iph->saddr))
++			continue;
++		if (np->local_port && np->local_port != ntohs(uh->dest))
++			continue;
++
++		spin_unlock_irqrestore(&rx_list_lock, flags);
++
++		if (np->rx_hook)
++			np->rx_hook(np, ntohs(uh->source),
++				    (char *)(uh+1), ulen-sizeof(uh)-4);
++
++		return 1;
++	}
++	spin_unlock_irqrestore(&rx_list_lock, flags);
++
++out:
++	return trapped;
++}
++
++int netpoll_parse_options(struct netpoll *np, char *opt)
++{
++	char *cur=opt, *delim;
++
++	if(*cur != '@') {
++		if ((delim = strchr(cur, '@')) == NULL)
++			goto parse_failed;
++		*delim=0;
++		np->local_port=simple_strtol(cur, 0, 10);
++		cur=delim;
++	}
++	cur++;
++	printk(KERN_INFO "%s: local port %d\n", np->name, np->local_port);
++
++	if(*cur != '/') {
++		if ((delim = strchr(cur, '/')) == NULL)
++			goto parse_failed;
++		*delim=0;
++		np->local_ip=ntohl(in_aton(cur));
++		cur=delim;
++
++		printk(KERN_INFO "%s: local IP %d.%d.%d.%d\n",
++		       np->name, HIPQUAD(np->local_ip));
++	}
++	cur++;
++
++	if ( *cur != ',') {
++		/* parse out dev name */
++		if ((delim = strchr(cur, ',')) == NULL)
++			goto parse_failed;
++		*delim=0;
++		strlcpy(np->dev_name, cur, sizeof(np->dev_name));
++		cur=delim;
++	}
++	cur++;
++
++	printk(KERN_INFO "%s: interface %s\n", np->name, np->dev_name);
++
++	if ( *cur != '@' ) {
++		/* dst port */
++		if ((delim = strchr(cur, '@')) == NULL)
++			goto parse_failed;
++		*delim=0;
++		np->remote_port=simple_strtol(cur, 0, 10);
++		cur=delim;
++	}
++	cur++;
++	printk(KERN_INFO "%s: remote port %d\n", np->name, np->remote_port);
++
++	/* dst ip */
++	if ((delim = strchr(cur, '/')) == NULL)
++		goto parse_failed;
++	*delim=0;
++	np->remote_ip=ntohl(in_aton(cur));
++	cur=delim+1;
++
++	printk(KERN_INFO "%s: remote IP %d.%d.%d.%d\n",
++		       np->name, HIPQUAD(np->remote_ip));
++
++	if( *cur != 0 )
++	{
++		/* MAC address */
++		if ((delim = strchr(cur, ':')) == NULL)
++			goto parse_failed;
++		*delim=0;
++		np->remote_mac[0]=simple_strtol(cur, 0, 16);
++		cur=delim+1;
++		if ((delim = strchr(cur, ':')) == NULL)
++			goto parse_failed;
++		*delim=0;
++		np->remote_mac[1]=simple_strtol(cur, 0, 16);
++		cur=delim+1;
++		if ((delim = strchr(cur, ':')) == NULL)
++			goto parse_failed;
++		*delim=0;
++		np->remote_mac[2]=simple_strtol(cur, 0, 16);
++		cur=delim+1;
++		if ((delim = strchr(cur, ':')) == NULL)
++			goto parse_failed;
++		*delim=0;
++		np->remote_mac[3]=simple_strtol(cur, 0, 16);
++		cur=delim+1;
++		if ((delim = strchr(cur, ':')) == NULL)
++			goto parse_failed;
++		*delim=0;
++		np->remote_mac[4]=simple_strtol(cur, 0, 16);
++		cur=delim+1;
++		np->remote_mac[5]=simple_strtol(cur, 0, 16);
++	}
++
++	printk(KERN_INFO "%s: remote ethernet address "
++	       "%02x:%02x:%02x:%02x:%02x:%02x\n",
++	       np->name,
++	       np->remote_mac[0],
++	       np->remote_mac[1],
++	       np->remote_mac[2],
++	       np->remote_mac[3],
++	       np->remote_mac[4],
++	       np->remote_mac[5]);
++
++	return 0;
++
++ parse_failed:
++	printk(KERN_INFO "%s: couldn't parse config at %s!\n",
++	       np->name, cur);
++	return -1;
++}
++
++int netpoll_setup(struct netpoll *np)
++{
++	struct net_device *ndev = NULL;
++	struct in_device *in_dev;
++
++	if (np->dev_name)
++		ndev = dev_get_by_name(np->dev_name);
++	if (!ndev) {
++		printk(KERN_ERR "%s: %s doesn't exist, aborting.\n",
++		       np->name, np->dev_name);
++		goto release;
++	}
++	if (!ndev->poll_controller) {
++		printk(KERN_ERR "%s: %s doesn't support polling, aborting.\n",
++		       np->name, np->dev_name);
++		goto release;
++	}
++
++	if (!(ndev->flags & IFF_UP)) {
++		unsigned short oflags;
++		unsigned long jiff;
++
++		printk(KERN_INFO "%s: device %s not up yet, forcing it\n",
++		       np->name, np->dev_name);
++
++		oflags = ndev->flags;
++
++		rtnl_shlock();
++		if (dev_change_flags(ndev, oflags | IFF_UP) < 0) {
++			printk(KERN_ERR "%s: failed to open %s\n",
++			       np->name, np->dev_name);
++			rtnl_shunlock();
++			goto release;
++		}
++		rtnl_shunlock();
++
++		jiff = jiffies + 6*HZ;
++		while(!netif_carrier_ok(ndev)) {
++			if (!time_before(jiffies, jiff)) {
++				printk(KERN_NOTICE
++				       "%s: timeout waiting for carrier\n",
++				       np->name);
++				break;
++			}
++			cond_resched();
++		}
++
++	}
++
++	if (!memcmp(np->local_mac, "\0\0\0\0\0\0", 6) && ndev->dev_addr)
++		memcpy(np->local_mac, ndev->dev_addr, 6);
++
++	if (!np->local_ip) {
++		in_dev = in_dev_get(ndev);
++
++		if (!in_dev) {
++			printk(KERN_ERR "%s: no IP address for %s, aborting\n",
++			       np->name, np->dev_name);
++			goto release;
++		}
++
++		np->local_ip = ntohl(in_dev->ifa_list->ifa_local);
++		in_dev_put(in_dev);
++		printk(KERN_INFO "%s: local IP %d.%d.%d.%d\n",
++		       np->name, HIPQUAD(np->local_ip));
++	}
++
++	np->dev = ndev;
++
++	if(np->rx_hook) {
++		unsigned long flags;
++
++#ifdef CONFIG_NETPOLL_RX
++		np->dev->netpoll_rx = 1;
++#endif
++
++		spin_lock_irqsave(&rx_list_lock, flags);
++		list_add(&np->rx_list, &rx_list);
++		spin_unlock_irqrestore(&rx_list_lock, flags);
++	}
++
++	return 0;
++ release:
++	dev_put(ndev);
++	return -1;
++}
++
++void netpoll_cleanup(struct netpoll *np)
++{
++	if(np->rx_hook) {
++		unsigned long flags;
++
++		spin_lock_irqsave(&rx_list_lock, flags);
++		list_del(&np->rx_list);
++#ifdef CONFIG_NETPOLL_RX
++		np->dev->netpoll_rx = 0;
++#endif
++		spin_unlock_irqrestore(&rx_list_lock, flags);
++	}
++
++	dev_put(np->dev);
++	np->dev = 0;
++}
++
++int netpoll_trap()
++{
++	return trapped;
++}
++
++void netpoll_set_trap(int trap)
++{
++	trapped = trap;
++}
++
++EXPORT_SYMBOL(netpoll_set_trap);
++EXPORT_SYMBOL(netpoll_trap);
++EXPORT_SYMBOL(netpoll_parse_options);
++EXPORT_SYMBOL(netpoll_setup);
++EXPORT_SYMBOL(netpoll_cleanup);
++EXPORT_SYMBOL(netpoll_send_skb);
++EXPORT_SYMBOL(netpoll_send_udp);
++EXPORT_SYMBOL(netpoll_poll);
+--- linux-2.6.0/net/core/net-sysfs.c	2003-10-25 14:45:46.000000000 -0700
++++ 25/net/core/net-sysfs.c	2003-12-28 23:21:01.000000000 -0800
+@@ -372,7 +372,7 @@ static void netdev_release(struct class_
+ 
+ 	BUG_ON(dev->reg_state != NETREG_RELEASED);
+ 
+-	kfree(dev);
++	kfree((char *)dev - dev->padded);
+ }
+ 
+ static struct class net_class = {
+--- linux-2.6.0/net/Kconfig	2003-11-23 19:03:02.000000000 -0800
++++ 25/net/Kconfig	2003-12-28 23:21:09.000000000 -0800
+@@ -664,4 +664,19 @@ source "net/irda/Kconfig"
+ 
+ source "net/bluetooth/Kconfig"
+ 
++config KGDBOE
++	def_bool X86 && KGDB
++
++config NETPOLL
++	def_bool NETCONSOLE || KGDBOE
++
++config NETPOLL_RX
++	def_bool KGDBOE
++
++config NETPOLL_TRAP
++	def_bool KGDBOE
++
++config NET_POLL_CONTROLLER
++	def_bool NETPOLL
++
+ endmenu
+--- linux-2.6.0/net/socket.c	2003-11-23 19:03:03.000000000 -0800
++++ 25/net/socket.c	2003-12-28 23:21:18.000000000 -0800
+@@ -394,6 +394,7 @@ int sock_map_fd(struct socket *sock)
+ 		file->f_dentry->d_op = &sockfs_dentry_operations;
+ 		d_add(file->f_dentry, SOCK_INODE(sock));
+ 		file->f_vfsmnt = mntget(sock_mnt);
++		file->f_mapping = file->f_dentry->d_inode->i_mapping;
+ 
+ 		sock->file = file;
+ 		file->f_op = SOCK_INODE(sock)->i_fop = &socket_file_ops;
+--- linux-2.6.0/net/wanrouter/wanmain.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/net/wanrouter/wanmain.c	2003-12-28 23:21:01.000000000 -0800
+@@ -726,8 +726,6 @@ static int wanrouter_device_new_if(struc
+ 
+ 		if (dev->name == NULL) {
+ 			err = -EINVAL;
+-		} else if (dev_get(dev->name)) {
+-			err = -EEXIST;	/* name already exists */
+ 		} else {
+ 
+ 			#ifdef WANDEBUG
+--- linux-2.6.0/README	2003-10-08 15:07:08.000000000 -0700
++++ 25/README	2003-12-28 23:22:44.000000000 -0800
+@@ -119,7 +119,7 @@ BUILD directory for the kernel:
+    cd /usr/src/linux-2.6.N
+    make O=/home/name/build/kernel menuconfig
+    make O=/home/name/build/kernel
+-   sudo make O=/home/name/build/kernel install_modules install
++   sudo make O=/home/name/build/kernel modules_install install
+ 
+    Please note: If the 'O=output/dir' option is used then it must be
+    used for all invocations of make.
+--- linux-2.6.0/scripts/kconfig/gconf.c	2003-08-08 22:55:14.000000000 -0700
++++ 25/scripts/kconfig/gconf.c	2003-12-28 23:22:45.000000000 -0800
+@@ -1172,7 +1172,7 @@ on_treeview1_button_press_event(GtkWidge
+ 
+ 	gtk_widget_realize(tree2_w);
+ 	gtk_tree_view_set_cursor(view, path, NULL, FALSE);
+-	gtk_widget_grab_focus(GTK_TREE_VIEW(tree2_w));
++	gtk_widget_grab_focus(GTK_WIDGET(tree2_w));
+ 
+ 	return FALSE;
+ }
+--- linux-2.6.0/scripts/mkspec	2003-09-27 18:57:47.000000000 -0700
++++ 25/scripts/mkspec	2003-12-28 23:23:07.000000000 -0800
+@@ -9,7 +9,7 @@
+ #	Patched for non-x86 by Opencon (L) 2002 <opencon@rio.skydome.net>
+ #
+ # That's the voodoo to see if it's a x86.
+-ISX86=`arch | grep -ie i.86`
++ISX86=`echo ${ARCH:=\`arch\`} | grep -ie i.86`
+ if [ ! -z $ISX86 ]; then
+ 	PC=1
+ else
+--- linux-2.6.0/scripts/modpost.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/scripts/modpost.c	2003-12-28 23:22:29.000000000 -0800
+@@ -324,6 +324,19 @@ handle_modversions(struct module *mod, s
+ 	}
+ }
+ 
++int
++is_vmlinux(const char *modname)
++{
++	const char *myname;
++
++	if ((myname = strrchr(modname, '/')))
++		myname++;
++	else
++		myname = modname;
++
++	return strcmp(myname, "vmlinux") == 0;
++}
++
+ void
+ read_symbols(char *modname)
+ {
+@@ -335,8 +348,7 @@ read_symbols(char *modname)
+ 
+ 	/* When there's no vmlinux, don't print warnings about
+ 	 * unresolved symbols (since there'll be too many ;) */
+-	if (strcmp(modname, "vmlinux") == 0)
+-		have_vmlinux = 1;
++	have_vmlinux = is_vmlinux(modname);
+ 
+ 	parse_elf(&info, modname);
+ 
+@@ -460,10 +472,7 @@ add_depends(struct buffer *b, struct mod
+ 	int first = 1;
+ 
+ 	for (m = modules; m; m = m->next) {
+-		if (strcmp(m->name, "vmlinux") == 0)
+-			m->seen = 1;
+-		else 
+-			m->seen = 0;
++		m->seen = is_vmlinux(m->name);
+ 	}
+ 
+ 	buf_printf(b, "\n");
+@@ -543,7 +552,7 @@ main(int argc, char **argv)
+ 	}
+ 
+ 	for (mod = modules; mod; mod = mod->next) {
+-		if (strcmp(mod->name, "vmlinux") == 0)
++		if (is_vmlinux(mod->name))
+ 			continue;
+ 
+ 		buf.pos = 0;
+--- linux-2.6.0/security/selinux/hooks.c	2003-10-08 15:07:10.000000000 -0700
++++ 25/security/selinux/hooks.c	2003-12-28 23:22:42.000000000 -0800
+@@ -1515,7 +1515,8 @@ static void selinux_bprm_compute_creds(s
+ 	struct bprm_security_struct *bsec;
+ 	u32 sid;
+ 	struct av_decision avd;
+-	int rc;
++	struct itimerval itimer;
++	int rc, i;
+ 
+ 	secondary_ops->bprm_compute_creds(bprm);
+ 
+@@ -1565,6 +1566,26 @@ static void selinux_bprm_compute_creds(s
+ 		/* Close files for which the new task SID is not authorized. */
+ 		flush_unauthorized_files(current->files);
+ 
++		/* Check whether the new SID can inherit signal state
++		   from the old SID.  If not, clear itimers to avoid
++		   subsequent signal generation and flush and unblock
++		   signals. This must occur _after_ the task SID has
++                  been updated so that any kill done after the flush
++                  will be checked against the new SID. */
++		rc = avc_has_perm(tsec->osid, tsec->sid, SECCLASS_PROCESS,
++				  PROCESS__SIGINH, NULL, NULL);
++		if (rc) {
++			memset(&itimer, 0, sizeof itimer);
++			for (i = 0; i < 3; i++)
++				do_setitimer(i, &itimer, NULL);
++			flush_signals(current);
++			spin_lock_irq(&current->sighand->siglock);
++			flush_signal_handlers(current, 1);
++			sigemptyset(&current->blocked);
++			recalc_sigpending();
++			spin_unlock_irq(&current->sighand->siglock);
++		}
++
+ 		/* Wake up the parent if it is waiting so that it can
+ 		   recheck wait permission to the new task SID. */
+ 		wake_up_interruptible(&current->parent->wait_chldexit);
+@@ -1738,10 +1759,6 @@ static int selinux_inode_permission(stru
+ 		return 0;
+ 	}
+ 
+-	if (nd && nd->dentry)
+-		return dentry_has_perm(current, nd->mnt, nd->dentry,
+-				       file_mask_to_av(inode->i_mode, mask));
+-
+ 	return inode_has_perm(current, inode,
+ 			       file_mask_to_av(inode->i_mode, mask), NULL, NULL);
+ }
+@@ -1992,8 +2009,7 @@ static int selinux_file_ioctl(struct fil
+ 
+ 	        case KDSKBENT:
+ 	        case KDSKBSENT:
+-		  	if (!capable(CAP_SYS_TTY_CONFIG))
+-				error = -EPERM;
++			error = task_has_capability(current,CAP_SYS_TTY_CONFIG);
+ 			break;
+ 
+ 		/* default case assumes that the command will go
+--- linux-2.6.0/security/selinux/include/av_permissions.h	2003-08-08 22:55:14.000000000 -0700
++++ 25/security/selinux/include/av_permissions.h	2003-12-28 23:22:42.000000000 -0800
+@@ -450,6 +450,7 @@
+ #define PROCESS__SETEXEC                          0x00020000UL
+ #define PROCESS__SETFSCREATE                      0x00040000UL
+ #define PROCESS__NOATSECURE                       0x00080000UL
++#define PROCESS__SIGINH                           0x00100000UL
+ 
+ #define IPC__SETATTR                              0x00000008UL
+ #define IPC__READ                                 0x00000010UL
+--- linux-2.6.0/security/selinux/include/av_perm_to_string.h	2003-08-08 22:55:14.000000000 -0700
++++ 25/security/selinux/include/av_perm_to_string.h	2003-12-28 23:22:42.000000000 -0800
+@@ -66,6 +66,7 @@ static struct av_perm_to_string av_perm_
+    { SECCLASS_PROCESS, PROCESS__SETEXEC, "setexec" },
+    { SECCLASS_PROCESS, PROCESS__SETFSCREATE, "setfscreate" },
+    { SECCLASS_PROCESS, PROCESS__NOATSECURE, "noatsecure" },
++   { SECCLASS_PROCESS, PROCESS__SIGINH, "siginh" },
+    { SECCLASS_MSGQ, MSGQ__ENQUEUE, "enqueue" },
+    { SECCLASS_MSG, MSG__SEND, "send" },
+    { SECCLASS_MSG, MSG__RECEIVE, "receive" },
+--- linux-2.6.0/security/selinux/ss/avtab.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/security/selinux/ss/avtab.c	2003-12-28 23:22:41.000000000 -0800
+@@ -3,6 +3,10 @@
+  *
+  * Author : Stephen Smalley, <sds@epoch.ncsc.mil>
+  */
++#include <linux/kernel.h>
++#include <linux/slab.h>
++#include <linux/vmalloc.h>
++#include <linux/errno.h>
+ #include "avtab.h"
+ #include "policydb.h"
+ 
+--- linux-2.6.0/security/selinux/ss/ebitmap.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/security/selinux/ss/ebitmap.c	2003-12-28 23:22:41.000000000 -0800
+@@ -3,6 +3,9 @@
+  *
+  * Author : Stephen Smalley, <sds@epoch.ncsc.mil>
+  */
++#include <linux/kernel.h>
++#include <linux/slab.h>
++#include <linux/errno.h>
+ #include "ebitmap.h"
+ #include "policydb.h"
+ 
+--- linux-2.6.0/security/selinux/ss/global.h	2003-09-08 13:58:59.000000000 -0700
++++ 25/security/selinux/ss/global.h	2003-12-28 23:22:41.000000000 -0800
+@@ -1,18 +0,0 @@
+-#ifndef _SS_GLOBAL_H_
+-#define _SS_GLOBAL_H_
+-
+-#include <linux/kernel.h>
+-#include <linux/slab.h>
+-#include <linux/string.h>
+-#include <linux/ctype.h>
+-#include <linux/in.h>
+-#include <linux/spinlock.h>
+-#include <linux/sched.h>
+-#include <linux/vmalloc.h>
+-
+-#include "flask.h"
+-#include "avc.h"
+-#include "avc_ss.h"
+-#include "security.h"
+-
+-#endif /* _SS_GLOBAL_H_ */
+--- linux-2.6.0/security/selinux/ss/hashtab.c	2003-08-08 22:55:14.000000000 -0700
++++ 25/security/selinux/ss/hashtab.c	2003-12-28 23:22:41.000000000 -0800
+@@ -3,6 +3,9 @@
+  *
+  * Author : Stephen Smalley, <sds@epoch.ncsc.mil>
+  */
++#include <linux/kernel.h>
++#include <linux/slab.h>
++#include <linux/errno.h>
+ #include "hashtab.h"
+ 
+ struct hashtab *hashtab_create(u32 (*hash_value)(struct hashtab *h, void *key),
+--- linux-2.6.0/security/selinux/ss/Makefile	2003-08-08 22:55:14.000000000 -0700
++++ 25/security/selinux/ss/Makefile	2003-12-28 23:22:41.000000000 -0800
+@@ -2,8 +2,7 @@
+ # Makefile for building the SELinux security server as part of the kernel tree.
+ #
+ 
+-EXTRA_CFLAGS += -Isecurity/selinux/include -include security/selinux/ss/global.h
+-
++EXTRA_CFLAGS += -Isecurity/selinux/include
+ obj-y := ss.o
+ 
+ ss-objs := ebitmap.o hashtab.o symtab.o sidtab.o avtab.o policydb.o services.o
+--- linux-2.6.0/security/selinux/ss/mls.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/security/selinux/ss/mls.c	2003-12-28 23:22:41.000000000 -0800
+@@ -3,6 +3,10 @@
+  *
+  * Author : Stephen Smalley, <sds@epoch.ncsc.mil>
+  */
++#include <linux/kernel.h>
++#include <linux/slab.h>
++#include <linux/string.h>
++#include <linux/errno.h>
+ #include "mls.h"
+ #include "policydb.h"
+ #include "services.h"
+--- linux-2.6.0/security/selinux/ss/policydb.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/security/selinux/ss/policydb.c	2003-12-28 23:22:41.000000000 -0800
+@@ -3,6 +3,11 @@
+  *
+  * Author : Stephen Smalley, <sds@epoch.ncsc.mil>
+  */
++#include <linux/kernel.h>
++#include <linux/slab.h>
++#include <linux/string.h>
++#include <linux/errno.h>
++#include "security.h"
+ #include "policydb.h"
+ #include "mls.h"
+ 
+--- linux-2.6.0/security/selinux/ss/services.c	2003-10-08 15:07:10.000000000 -0700
++++ 25/security/selinux/ss/services.c	2003-12-28 23:22:41.000000000 -0800
+@@ -10,6 +10,17 @@
+  *	it under the terms of the GNU General Public License version 2,
+  *      as published by the Free Software Foundation.
+  */
++#include <linux/kernel.h>
++#include <linux/slab.h>
++#include <linux/string.h>
++#include <linux/spinlock.h>
++#include <linux/errno.h>
++#include <linux/in.h>
++#include <asm/semaphore.h>
++#include "flask.h"
++#include "avc.h"
++#include "avc_ss.h"
++#include "security.h"
+ #include "context.h"
+ #include "policydb.h"
+ #include "sidtab.h"
+--- linux-2.6.0/security/selinux/ss/sidtab.c	2003-08-08 22:55:14.000000000 -0700
++++ 25/security/selinux/ss/sidtab.c	2003-12-28 23:22:41.000000000 -0800
+@@ -3,6 +3,12 @@
+  *
+  * Author : Stephen Smalley, <sds@epoch.ncsc.mil>
+  */
++#include <linux/kernel.h>
++#include <linux/slab.h>
++#include <linux/spinlock.h>
++#include <linux/errno.h>
++#include "flask.h"
++#include "security.h"
+ #include "sidtab.h"
+ 
+ #define SIDTAB_HASH(sid) \
+--- linux-2.6.0/security/selinux/ss/symtab.c	2003-08-08 22:55:14.000000000 -0700
++++ 25/security/selinux/ss/symtab.c	2003-12-28 23:22:41.000000000 -0800
+@@ -3,6 +3,10 @@
+  *
+  * Author : Stephen Smalley, <sds@epoch.ncsc.mil>
+  */
++#include <linux/kernel.h>
++#include <linux/slab.h>
++#include <linux/string.h>
++#include <linux/errno.h>
+ #include "symtab.h"
+ 
+ static unsigned int symhash(struct hashtab *h, void *key)
+--- linux-2.6.0/sound/core/pcm_native.c	2003-10-25 14:45:46.000000000 -0700
++++ 25/sound/core/pcm_native.c	2003-12-28 23:22:12.000000000 -0800
+@@ -2779,7 +2779,7 @@ unsigned int snd_pcm_capture_poll(struct
+ 	return mask;
+ }
+ 
+-static struct page * snd_pcm_mmap_status_nopage(struct vm_area_struct *area, unsigned long address, int no_share)
++static struct page * snd_pcm_mmap_status_nopage(struct vm_area_struct *area, unsigned long address, int *type)
+ {
+ 	snd_pcm_substream_t *substream = (snd_pcm_substream_t *)area->vm_private_data;
+ 	snd_pcm_runtime_t *runtime;
+@@ -2791,6 +2791,8 @@ static struct page * snd_pcm_mmap_status
+ 	page = virt_to_page(runtime->status);
+ 	if (!PageReserved(page))
+ 		get_page(page);
++	if (type)
++		*type = VM_FAULT_MINOR;
+ 	return page;
+ }
+ 
+@@ -2817,7 +2819,7 @@ int snd_pcm_mmap_status(snd_pcm_substrea
+ 	return 0;
+ }
+ 
+-static struct page * snd_pcm_mmap_control_nopage(struct vm_area_struct *area, unsigned long address, int no_share)
++static struct page * snd_pcm_mmap_control_nopage(struct vm_area_struct *area, unsigned long address, int *type)
+ {
+ 	snd_pcm_substream_t *substream = (snd_pcm_substream_t *)area->vm_private_data;
+ 	snd_pcm_runtime_t *runtime;
+@@ -2829,6 +2831,8 @@ static struct page * snd_pcm_mmap_contro
+ 	page = virt_to_page(runtime->control);
+ 	if (!PageReserved(page))
+ 		get_page(page);
++	if (type)
++		*type = VM_FAULT_MINOR;
+ 	return page;
+ }
+ 
+@@ -2867,7 +2871,7 @@ static void snd_pcm_mmap_data_close(stru
+ 	atomic_dec(&substream->runtime->mmap_count);
+ }
+ 
+-static struct page * snd_pcm_mmap_data_nopage(struct vm_area_struct *area, unsigned long address, int no_share)
++static struct page * snd_pcm_mmap_data_nopage(struct vm_area_struct *area, unsigned long address, int *type)
+ {
+ 	snd_pcm_substream_t *substream = (snd_pcm_substream_t *)area->vm_private_data;
+ 	snd_pcm_runtime_t *runtime;
+@@ -2895,6 +2899,8 @@ static struct page * snd_pcm_mmap_data_n
+ 	}
+ 	if (!PageReserved(page))
+ 		get_page(page);
++	if (type)
++		*type = VM_FAULT_MINOR;
+ 	return page;
+ }
+ 
+--- linux-2.6.0/sound/core/sound.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/sound/core/sound.c	2003-12-28 23:22:25.000000000 -0800
+@@ -31,6 +31,7 @@
+ #include <sound/initval.h>
+ #include <linux/kmod.h>
+ #include <linux/devfs_fs_kernel.h>
++#include <linux/device.h>
+ 
+ #define SNDRV_OS_MINORS 256
+ 
+@@ -52,6 +53,7 @@ MODULE_PARM_SYNTAX(major, "default:116,s
+ MODULE_PARM(cards_limit, "i");
+ MODULE_PARM_DESC(cards_limit, "Count of soundcards installed in the system.");
+ MODULE_PARM_SYNTAX(cards_limit, "default:8,skill:advanced");
++MODULE_ALIAS_CHARDEV_MAJOR(CONFIG_SND_MAJOR);
+ #ifdef CONFIG_DEVFS_FS
+ MODULE_PARM(device_mode, "i");
+ MODULE_PARM_DESC(device_mode, "Device file permission mask for devfs.");
+--- linux-2.6.0/sound/i2c/i2c.c	2003-06-14 12:18:09.000000000 -0700
++++ 25/sound/i2c/i2c.c	2003-12-28 23:22:19.000000000 -0800
+@@ -84,7 +84,7 @@ int snd_i2c_bus_create(snd_card_t *card,
+ 	bus = (snd_i2c_bus_t *)snd_magic_kcalloc(snd_i2c_bus_t, 0, GFP_KERNEL);
+ 	if (bus == NULL)
+ 		return -ENOMEM;
+-	spin_lock_init(&bus->lock);
++	init_MUTEX(&bus->lock_mutex);
+ 	INIT_LIST_HEAD(&bus->devices);
+ 	INIT_LIST_HEAD(&bus->buses);
+ 	bus->card = card;
+--- linux-2.6.0/sound/isa/gus/gus_pcm.c	2003-06-14 12:18:08.000000000 -0700
++++ 25/sound/isa/gus/gus_pcm.c	2003-12-28 23:22:44.000000000 -0800
+@@ -334,9 +334,11 @@ static int snd_gf1_pcm_poke_block(snd_gu
+ 					snd_gf1_poke(gus, pos++, *buf++ ^ invert);
+ 			}
+ 		}
+-		schedule_timeout(1);
+-		if (signal_pending(current))
+-			return -EAGAIN;
++		if (count > 0 && !in_interrupt()) {
++			schedule_timeout(1);
++			if (signal_pending(current))
++				return -EAGAIN;
++		}
+ 	}
+ 	return 0;
+ }
+--- linux-2.6.0/sound/oss/cmpci.c	2003-11-09 16:45:06.000000000 -0800
++++ 25/sound/oss/cmpci.c	2003-12-28 23:21:54.000000000 -0800
+@@ -2876,7 +2876,6 @@ MODULE_DEVICE_TABLE(pci, cmpci_pci_tbl);
+ void initialize_chip(struct pci_dev *pcidev)
+ {
+ 	struct cm_state *s;
+-	mm_segment_t fs;
+ 	int i, val;
+ #if defined(CONFIG_SOUND_CMPCI_MIDI) || defined(CONFIG_SOUND_CMPCI_FM)
+ 	unsigned char reg_mask = 0;
+@@ -3038,8 +3037,6 @@ void initialize_chip(struct pci_dev *pci
+ #endif
+ 		pci_set_master(pcidev);	/* enable bus mastering */
+ 		/* initialize the chips */
+-		fs = get_fs();
+-		set_fs(KERNEL_DS);
+ 		/* set mixer output */
+ 		frobindir(s, DSP_MIX_OUTMIXIDX, 0x1f, 0x1f);
+ 		/* set mixer input */
+--- linux-2.6.0/sound/oss/dmasound/Kconfig	2003-10-08 15:07:10.000000000 -0700
++++ 25/sound/oss/dmasound/Kconfig	2003-12-28 23:23:06.000000000 -0800
+@@ -10,7 +10,7 @@ config DMASOUND_ATARI
+ 	  This driver is also available as a module ( = code which can be
+ 	  inserted in and removed from the running kernel whenever you
+ 	  want). If you want to compile it as a module, say M here and read
+-	  <file:Documentation/modules.txt>.
++	  <file:Documentation/kbuild/modules.txt>.
+ 
+ config DMASOUND_PMAC
+ 	tristate "PowerMac DMA sound support"
+@@ -24,7 +24,7 @@ config DMASOUND_PMAC
+ 	  This driver is also available as a module ( = code which can be
+ 	  inserted in and removed from the running kernel whenever you
+ 	  want). If you want to compile it as a module, say M here and read
+-	  <file:Documentation/modules.txt>.
++	  <file:Documentation/kbuild/modules.txt>.
+ 
+ config DMASOUND_PAULA
+ 	tristate "Amiga DMA sound support"
+@@ -38,7 +38,7 @@ config DMASOUND_PAULA
+ 	  This driver is also available as a module ( = code which can be
+ 	  inserted in and removed from the running kernel whenever you
+ 	  want). If you want to compile it as a module, say M here and read
+-	  <file:Documentation/modules.txt>.
++	  <file:Documentation/kbuild/modules.txt>.
+ 
+ config DMASOUND_Q40
+ 	tristate "Q40 sound support"
+@@ -52,7 +52,7 @@ config DMASOUND_Q40
+ 	  This driver is also available as a module ( = code which can be
+ 	  inserted in and removed from the running kernel whenever you
+ 	  want). If you want to compile it as a module, say M here and read
+-	  <file:Documentation/modules.txt>.
++	  <file:Documentation/kbuild/modules.txt>.
+ 
+ config DMASOUND
+ 	tristate
+--- linux-2.6.0/sound/oss/emu10k1/audio.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/sound/oss/emu10k1/audio.c	2003-12-28 23:22:12.000000000 -0800
+@@ -989,7 +989,7 @@ static int emu10k1_audio_ioctl(struct in
+ 	return 0;
+ }
+ 
+-static struct page *emu10k1_mm_nopage (struct vm_area_struct * vma, unsigned long address, int write_access)
++static struct page *emu10k1_mm_nopage (struct vm_area_struct * vma, unsigned long address, int *type)
+ {
+ 	struct emu10k1_wavedevice *wave_dev = vma->vm_private_data;
+ 	struct woinst *woinst = wave_dev->woinst;
+@@ -1032,6 +1032,8 @@ static struct page *emu10k1_mm_nopage (s
+ 	get_page (dmapage);
+ 
+ 	DPD(3, "page: %#lx\n", (unsigned long) dmapage);
++	if (type)
++		*type = VM_FAULT_MINOR;
+ 	return dmapage;
+ }
+ 
+--- linux-2.6.0/sound/oss/Kconfig	2003-10-17 15:58:05.000000000 -0700
++++ 25/sound/oss/Kconfig	2003-12-28 23:23:06.000000000 -0800
+@@ -25,7 +25,7 @@ config SOUND_CMPCI
+ 	depends on SOUND_PRIME!=n && SOUND && PCI
+ 	help
+ 	  Say Y or M if you have a PCI sound card using the CMI8338
+-	  or the CMI8378 chipset.  Data on these chips are available at
++	  or the CMI8738 chipset.  Data on these chips are available at
+ 	  <http://www.cmedia.com.tw/>.
+ 
+ 	  A userspace utility to control some internal registers of these
+@@ -195,7 +195,7 @@ config SOUND_ES1371
+ 	  Ensoniq was bought by Creative Labs, Sound Blaster 64/PCI
+ 	  models are either ES1370 or ES1371 based. This driver differs
+ 	  slightly from OSS/Free, so PLEASE READ
+-	  <file:Documentation/sound/es1371>.
++	  <file:Documentation/sound/oss/es1371>.
+ 
+ config SOUND_ESSSOLO1
+ 	tristate "ESS Technology Solo1"
+--- linux-2.6.0/sound/oss/via82cxxx_audio.c	2003-10-17 15:58:05.000000000 -0700
++++ 25/sound/oss/via82cxxx_audio.c	2003-12-28 23:22:33.000000000 -0800
+@@ -15,7 +15,7 @@
+  */
+ 
+ 
+-#define VIA_VERSION	"1.9.1-ac3-2.5"
++#define VIA_VERSION	"1.9.1-ac4-2.5"
+ 
+ 
+ #include <linux/config.h>
+@@ -1237,7 +1237,6 @@ static int via_chan_set_stereo (struct v
+ 		}
+ 	/* unknown */
+ 	default:
+-		printk (KERN_WARNING PFX "unknown number of channels\n");
+ 		val = -EINVAL;
+ 		break;
+ 	}
+@@ -2116,7 +2115,7 @@ static void via_dsp_cleanup (struct via_
+ 
+ 
+ static struct page * via_mm_nopage (struct vm_area_struct * vma,
+-				    unsigned long address, int write_access)
++				    unsigned long address, int *type)
+ {
+ 	struct via_info *card = vma->vm_private_data;
+ 	struct via_channel *chan = &card->ch_out;
+@@ -2124,12 +2123,11 @@ static struct page * via_mm_nopage (stru
+ 	unsigned long pgoff;
+ 	int rd, wr;
+ 
+-	DPRINTK ("ENTER, start %lXh, ofs %lXh, pgoff %ld, addr %lXh, wr %d\n",
++	DPRINTK ("ENTER, start %lXh, ofs %lXh, pgoff %ld, addr %lXh\n",
+ 		 vma->vm_start,
+ 		 address - vma->vm_start,
+ 		 (address - vma->vm_start) >> PAGE_SHIFT,
+-		 address,
+-		 write_access);
++		 address);
+ 
+         if (address > vma->vm_end) {
+ 		DPRINTK ("EXIT, returning NOPAGE_SIGBUS\n");
+@@ -2167,6 +2165,8 @@ static struct page * via_mm_nopage (stru
+ 	DPRINTK ("EXIT, returning page %p for cpuaddr %lXh\n",
+ 		 dmapage, (unsigned long) chan->pgtbl[pgoff].cpuaddr);
+ 	get_page (dmapage);
++	if (type)
++		*type = VM_FAULT_MINOR;
+ 	return dmapage;
+ }
+ 
+@@ -3367,7 +3367,7 @@ static int via_dsp_release(struct inode 
+ 
+ 	if (file->f_mode & FMODE_WRITE) {
+ 		rc = via_dsp_drain_playback (card, &card->ch_out, nonblock);
+-		if (rc && rc != ERESTARTSYS)	/* Nobody needs to know about ^C */
++		if (rc && rc != -ERESTARTSYS)	/* Nobody needs to know about ^C */
+ 			printk (KERN_DEBUG "via_audio: ignoring drain playback error %d\n", rc);
+ 
+ 		via_chan_free (card, &card->ch_out);
+--- linux-2.6.0/sound/oss/vwsnd.c	2003-09-27 18:57:48.000000000 -0700
++++ 25/sound/oss/vwsnd.c	2003-12-28 23:23:06.000000000 -0800
+@@ -1,6 +1,6 @@
+ /*
+  * Sound driver for Silicon Graphics 320 and 540 Visual Workstations'
+- * onboard audio.  See notes in ../../Documentation/sound/vwsnd .
++ * onboard audio.  See notes in ../../Documentation/sound/oss/vwsnd .
+  *
+  * Copyright 1999 Silicon Graphics, Inc.  All rights reserved.
+  *
+--- linux-2.6.0/sound/pci/intel8x0.c	2003-11-09 16:45:06.000000000 -0800
++++ 25/sound/pci/intel8x0.c	2003-12-28 23:21:41.000000000 -0800
+@@ -2271,10 +2271,8 @@ static void __devinit intel8x0_measure_a
+ 
+ 	t = stop_time.tv_sec - start_time.tv_sec;
+ 	t *= 1000000;
+-	if (stop_time.tv_usec < start_time.tv_usec)
+-		t -= start_time.tv_usec - stop_time.tv_usec;
+-	else
+-		t += stop_time.tv_usec - start_time.tv_usec;
++	t += stop_time.tv_usec - start_time.tv_usec;
++	printk(KERN_INFO "%s: measured %lu usecs\n", __FUNCTION__, t);
+ 	if (t == 0) {
+ 		snd_printk(KERN_ERR "?? calculation error..\n");
+ 		return;
+--- linux-2.6.0/sound/pcmcia/vx/vx_entry.c	2003-09-27 18:57:48.000000000 -0700
++++ 25/sound/pcmcia/vx/vx_entry.c	2003-12-28 23:22:54.000000000 -0800
+@@ -38,9 +38,9 @@ static void vxpocket_release(dev_link_t 
+ {
+ 	if (link->state & DEV_CONFIG) {
+ 		/* release cs resources */
+-		CardServices(ReleaseConfiguration, link->handle);
+-		CardServices(ReleaseIO, link->handle, &link->io);
+-		CardServices(ReleaseIRQ, link->handle, &link->irq);
++		pcmcia_release_configuration(link->handle);
++		pcmcia_release_io(link->handle, &link->io);
++		pcmcia_release_irq(link->handle, &link->irq);
+ 		link->state &= ~DEV_CONFIG;
+ 	}
+ }
+@@ -58,7 +58,7 @@ static int snd_vxpocket_free(vx_core_t *
+ 
+ 	/* Break the link with Card Services */
+ 	if (link->handle)
+-		CardServices(DeregisterClient, link->handle);
++		pcmcia_deregister_client(link->handle);
+ 
+ 	hw = vxp->hw_entry;
+ 	if (hw)
+@@ -170,7 +170,7 @@ dev_link_t *snd_vxpocket_attach(struct s
+ 	client_reg.Version = 0x0210;
+ 	client_reg.event_callback_args.client_data = link;
+ 
+-	ret = CardServices(RegisterClient, &link->handle, &client_reg);
++	ret = pcmcia_register_client(&link->handle, &client_reg);
+ 	if (ret != CS_SUCCESS) {
+ 		cs_error(link->handle, RegisterClient, ret);
+ 		snd_vxpocket_detach(hw, link);
+@@ -253,8 +253,8 @@ void snd_vxpocket_detach_all(struct snd_
+  * configuration callback
+  */
+ 
+-#define CS_CHECK(fn, args...) \
+-while ((last_ret=CardServices(last_fn=(fn), args))!=0) goto cs_failed
++#define CS_CHECK(fn, ret) \
++do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
+ 
+ static void vxpocket_config(dev_link_t *link)
+ {
+@@ -274,21 +274,21 @@ static void vxpocket_config(dev_link_t *
+ 	tuple.TupleDataMax = sizeof(buf);
+ 	tuple.TupleOffset = 0;
+ 	tuple.DesiredTuple = CISTPL_CONFIG;
+-	CS_CHECK(GetFirstTuple, handle, &tuple);
+-	CS_CHECK(GetTupleData, handle, &tuple);
+-	CS_CHECK(ParseTuple, handle, &tuple, &parse);
++	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
++	CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
++	CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+ 	link->conf.ConfigBase = parse.config.base;
+ 	link->conf.ConfigIndex = 1;
+ 
+-	CS_CHECK(GetConfigurationInfo, handle, &conf);
++	CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(handle, &conf));
+ 	link->conf.Vcc = conf.Vcc;
+ 
+ 	/* Configure card */
+ 	link->state |= DEV_CONFIG;
+ 
+-	CS_CHECK(RequestIO, handle, &link->io);
+-	CS_CHECK(RequestIRQ, link->handle, &link->irq);
+-	CS_CHECK(RequestConfiguration, link->handle, &link->conf);
++	CS_CHECK(RequestIO, pcmcia_request_io(handle, &link->io));
++	CS_CHECK(RequestIRQ, pcmcia_request_irq(link->handle, &link->irq));
++	CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link->handle, &link->conf));
+ 
+ 	if (snd_vxpocket_assign_resources(chip, link->io.BasePort1, link->irq.AssignedIRQ) < 0)
+ 		goto failed;
+@@ -300,9 +300,9 @@ static void vxpocket_config(dev_link_t *
+ cs_failed:
+ 	cs_error(link->handle, last_fn, last_ret);
+ failed:
+-	CardServices(ReleaseConfiguration, link->handle);
+-	CardServices(ReleaseIO, link->handle, &link->io);
+-	CardServices(ReleaseIRQ, link->handle, &link->irq);
++	pcmcia_release_configuration(link->handle);
++	pcmcia_release_io(link->handle, &link->io);
++	pcmcia_release_irq(link->handle, &link->irq);
+ }
+ 
+ 
+@@ -339,7 +339,7 @@ static int vxpocket_event(event_t event,
+ 	case CS_EVENT_RESET_PHYSICAL:
+ 		snd_printdd(KERN_DEBUG "RESET_PHYSICAL\n");
+ 		if (link->state & DEV_CONFIG)
+-			CardServices(ReleaseConfiguration, link->handle);
++			pcmcia_release_configuration(link->handle);
+ 		break;
+ 	case CS_EVENT_PM_RESUME:
+ 		snd_printdd(KERN_DEBUG "RESUME\n");
+@@ -350,7 +350,7 @@ static int vxpocket_event(event_t event,
+ 		if (DEV_OK(link)) {
+ 			//struct snd_vxpocket *vxp = (struct snd_vxpocket *)chip;
+ 			snd_printdd(KERN_DEBUG "requestconfig...\n");
+-			CardServices(RequestConfiguration, link->handle, &link->conf);
++			pcmcia_request_configuration(link->handle, &link->conf);
+ 			if (chip) {
+ 				snd_printdd(KERN_DEBUG "calling snd_vx_resume\n");
+ 				snd_vx_resume(chip);
+--- linux-2.6.0/sound/sound_core.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/sound/sound_core.c	2003-12-28 23:22:25.000000000 -0800
+@@ -45,6 +45,7 @@
+ #include <linux/major.h>
+ #include <linux/kmod.h>
+ #include <linux/devfs_fs_kernel.h>
++#include <linux/device.h>
+ 
+ #define SOUND_STEP 16
+ 
+@@ -547,6 +548,7 @@ EXPORT_SYMBOL(mod_firmware_load);
+ MODULE_DESCRIPTION("Core sound module");
+ MODULE_AUTHOR("Alan Cox");
+ MODULE_LICENSE("GPL");
++MODULE_ALIAS_CHARDEV_MAJOR(SOUND_MAJOR);
+ 
+ static void __exit cleanup_soundcore(void)
+ {
+--- linux-2.6.0/usr/gen_init_cpio.c	2003-09-27 18:57:48.000000000 -0700
++++ 25/usr/gen_init_cpio.c	2003-12-28 23:22:09.000000000 -0800
+@@ -197,6 +197,7 @@ void cpio_mkfile(const char *filename, c
+ 
+ 	for (i = 0; i < buf.st_size; ++i)
+ 		fputc(filebuf[i], stdout);
++	offset += buf.st_size;
+ 	close(file);
+ 	free(filebuf);
+ 	push_pad();
diff --git a/lustre/kernel_patches/patches/2.6.0-test6-mm4.patch b/lustre/kernel_patches/patches/2.6.0-test6-mm4.patch
new file mode 100644
index 0000000..2de9932
--- /dev/null
+++ b/lustre/kernel_patches/patches/2.6.0-test6-mm4.patch
@@ -0,0 +1,113204 @@
+--- linux-2.6.0-test6/arch/alpha/Kconfig	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/alpha/Kconfig	2003-10-05 00:36:11.000000000 -0700
+@@ -471,21 +471,6 @@ config EISA
+ 	bool
+ 	depends on ALPHA_GENERIC || ALPHA_JENSEN || ALPHA_ALCOR || ALPHA_MIKASA || ALPHA_SABLE || ALPHA_LYNX || ALPHA_NORITAKE || ALPHA_RAWHIDE
+ 	default y
+-	---help---
+-	  The Extended Industry Standard Architecture (EISA) bus was
+-	  developed as an open alternative to the IBM MicroChannel bus.
+-
+-	  The EISA bus provided some of the features of the IBM MicroChannel
+-	  bus while maintaining backward compatibility with cards made for
+-	  the older ISA bus.  The EISA bus saw limited use between 1988 and
+-	  1995 when it was made obsolete by the PCI bus.
+-
+-	  Say Y here if you are building a kernel for an EISA-based machine.
+-
+-	  Otherwise, say N.
+-
+-config EISA_ALWAYS
+-	def_bool EISA
+ 
+ config SMP
+ 	bool "Symmetric multi-processing support"
+--- linux-2.6.0-test6/arch/alpha/kernel/core_irongate.c	2003-06-14 12:18:25.000000000 -0700
++++ 25/arch/alpha/kernel/core_irongate.c	2003-10-05 00:33:23.000000000 -0700
+@@ -391,7 +391,7 @@ irongate_ioremap(unsigned long addr, uns
+ 		cur_gatt = phys_to_virt(GET_GATT(baddr) & ~1);
+ 		pte = cur_gatt[GET_GATT_OFF(baddr)] & ~1;
+ 
+-		if (__alpha_remap_area_pages(VMALLOC_VMADDR(vaddr), 
++		if (__alpha_remap_area_pages(vaddr,
+ 					     pte, PAGE_SIZE, 0)) {
+ 			printk("AGP ioremap: FAILED to map...\n");
+ 			vfree(area->addr);
+--- linux-2.6.0-test6/arch/alpha/kernel/core_marvel.c	2003-08-22 19:23:39.000000000 -0700
++++ 25/arch/alpha/kernel/core_marvel.c	2003-10-05 00:33:23.000000000 -0700
+@@ -696,7 +696,7 @@ marvel_ioremap(unsigned long addr, unsig
+ 			}
+ 			pfn >>= 1;	/* make it a true pfn */
+ 			
+-			if (__alpha_remap_area_pages(VMALLOC_VMADDR(vaddr), 
++			if (__alpha_remap_area_pages(vaddr,
+ 						     pfn << PAGE_SHIFT, 
+ 						     PAGE_SIZE, 0)) {
+ 				printk("FAILED to map...\n");
+--- linux-2.6.0-test6/arch/alpha/kernel/core_titan.c	2003-09-08 13:58:55.000000000 -0700
++++ 25/arch/alpha/kernel/core_titan.c	2003-10-05 00:33:23.000000000 -0700
+@@ -534,7 +534,7 @@ titan_ioremap(unsigned long addr, unsign
+ 			}
+ 			pfn >>= 1;	/* make it a true pfn */
+ 			
+-			if (__alpha_remap_area_pages(VMALLOC_VMADDR(vaddr), 
++			if (__alpha_remap_area_pages(vaddr,
+ 						     pfn << PAGE_SHIFT, 
+ 						     PAGE_SIZE, 0)) {
+ 				printk("FAILED to map...\n");
+--- linux-2.6.0-test6/arch/alpha/kernel/setup.c	2003-08-22 19:23:39.000000000 -0700
++++ 25/arch/alpha/kernel/setup.c	2003-10-05 00:36:11.000000000 -0700
+@@ -33,6 +33,7 @@
+ #include <linux/seq_file.h>
+ #include <linux/root_dev.h>
+ #include <linux/initrd.h>
++#include <linux/eisa.h>
+ #ifdef CONFIG_MAGIC_SYSRQ
+ #include <linux/sysrq.h>
+ #include <linux/reboot.h>
+@@ -680,6 +681,11 @@ setup_arch(char **cmdline_p)
+ 	/* Default root filesystem to sda2.  */
+ 	ROOT_DEV = Root_SDA2;
+ 
++#ifdef CONFIG_EISA
++	/* FIXME:  only set this when we actually have EISA in this box? */
++	EISA_bus = 1;
++#endif
++
+  	/*
+ 	 * Check ASN in HWRPB for validity, report if bad.
+ 	 * FIXME: how was this failing?  Should we trust it instead,
+@@ -1203,7 +1209,7 @@ show_cpuinfo(struct seq_file *f, void *s
+ 		       platform_string(), nr_processors);
+ 
+ #ifdef CONFIG_SMP
+-	seq_printf(f, "cpus active\t\t: %d\n"
++	seq_printf(f, "cpus active\t\t: %ld\n"
+ 		      "cpu active mask\t\t: %016lx\n",
+ 		       num_online_cpus(), cpu_present_mask);
+ #endif
+--- linux-2.6.0-test6/arch/alpha/kernel/smp.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/arch/alpha/kernel/smp.c	2003-10-05 00:33:23.000000000 -0700
+@@ -597,7 +597,7 @@ smp_cpus_done(unsigned int max_cpus)
+ 		if (cpu_online(cpu))
+ 			bogosum += cpu_data[cpu].loops_per_jiffy;
+ 	
+-	printk(KERN_INFO "SMP: Total of %d processors activated "
++	printk(KERN_INFO "SMP: Total of %ld processors activated "
+ 	       "(%lu.%02lu BogoMIPS).\n",
+ 	       num_online_cpus(), 
+ 	       (bogosum + 2500) / (500000/HZ),
+--- linux-2.6.0-test6/arch/alpha/kernel/time.c	2003-08-08 22:55:10.000000000 -0700
++++ 25/arch/alpha/kernel/time.c	2003-10-05 00:33:23.000000000 -0700
+@@ -89,6 +89,16 @@ static inline __u32 rpcc(void)
+     return result;
+ }
+ 
++/*
++ * Scheduler clock - returns current time in nanosec units.
++ *
++ * Copied from ARM code for expediency... ;-}
++ */
++unsigned long long sched_clock(void)
++{
++        return (unsigned long long)jiffies * (1000000000 / HZ);
++}
++
+ 
+ /*
+  * timer_interrupt() needs to keep up the real-time clock,
+@@ -239,8 +249,9 @@ validate_cc_value(unsigned long cc)
+  * arch/i386/time.c.
+  */
+ 
+-#define CALIBRATE_LATCH	(52 * LATCH)
+-#define CALIBRATE_TIME	(52 * 1000020 / HZ)
++#define PIC_TICK_RATE	1193180UL
++#define CALIBRATE_LATCH	0xffff
++#define TIMEOUT_COUNT	0x100000
+ 
+ static unsigned long __init
+ calibrate_cc_with_pic(void)
+@@ -263,19 +274,15 @@ calibrate_cc_with_pic(void)
+ 
+ 	cc = rpcc();
+ 	do {
+-	  count+=100; /* by 1 takes too long to timeout from 0 */
+-	} while ((inb(0x61) & 0x20) == 0 && count > 0);
++		count++;
++	} while ((inb(0x61) & 0x20) == 0 && count < TIMEOUT_COUNT);
+ 	cc = rpcc() - cc;
+ 
+ 	/* Error: ECTCNEVERSET or ECPUTOOFAST.  */
+-	if (count <= 100)
+-		return 0;
+-
+-	/* Error: ECPUTOOSLOW.  */
+-	if (cc <= CALIBRATE_TIME)
++	if (count <= 1 || count == TIMEOUT_COUNT)
+ 		return 0;
+ 
+-	return (cc * 1000000UL) / CALIBRATE_TIME;
++	return ((long)cc * PIC_TICK_RATE) / (CALIBRATE_LATCH + 1);
+ }
+ 
+ /* The Linux interpretation of the CMOS clock register contents:
+--- linux-2.6.0-test6/arch/alpha/mm/init.c	2003-07-27 12:14:38.000000000 -0700
++++ 25/arch/alpha/mm/init.c	2003-10-05 00:33:23.000000000 -0700
+@@ -210,7 +210,8 @@ callback_init(void * kernel_end)
+ 	/* Allocate one PGD and one PMD.  In the case of SRM, we'll need
+ 	   these to actually remap the console.  There is an assumption
+ 	   here that only one of each is needed, and this allows for 8MB.
+-	   Currently (late 1999), big consoles are still under 4MB.
++	   On systems with larger consoles, additional pages will be
++	   allocated as needed during the mapping process.
+ 
+ 	   In the case of not SRM, but not CONFIG_ALPHA_LARGE_VMALLOC,
+ 	   we need to allocate the PGD we use for vmalloc before we start
+@@ -237,6 +238,15 @@ callback_init(void * kernel_end)
+ 			unsigned long pfn = crb->map[i].pa >> PAGE_SHIFT;
+ 			crb->map[i].va = vaddr;
+ 			for (j = 0; j < crb->map[i].count; ++j) {
++				/* Newer console's (especially on larger
++				   systems) may require more pages of
++				   PTEs. Grab additional pages as needed. */
++				if (pmd != pmd_offset(pgd, vaddr)) {
++					memset(kernel_end, 0, PAGE_SIZE);
++					pmd = pmd_offset(pgd, vaddr);
++					pmd_set(pmd, (pte_t *)kernel_end);
++					kernel_end += PAGE_SIZE;
++				}
+ 				set_pte(pte_offset_kernel(pmd, vaddr),
+ 					pfn_pte(pfn, PAGE_KERNEL));
+ 				pfn++;
+--- linux-2.6.0-test6/arch/arm/boot/compressed/head.S	2003-06-14 12:18:33.000000000 -0700
++++ 25/arch/arm/boot/compressed/head.S	2003-10-05 00:33:23.000000000 -0700
+@@ -477,6 +477,12 @@ proc_types:
+ @		b	__arm6_cache_off
+ @		b	__armv3_cache_flush
+ 
++		.word	0x00000000		@ old ARM ID
++		.word	0x0000f000
++		mov	pc, lr
++		mov	pc, lr
++		mov	pc, lr
++
+ 		.word	0x41007000		@ ARM7/710
+ 		.word	0xfff8fe00
+ 		b	__arm7_cache_off
+@@ -489,6 +495,14 @@ proc_types:
+ 		b	__armv4_cache_off
+ 		mov	pc, lr
+ 
++		.word	0x00007000		@ ARM7 IDs
++		.word	0x0000f000
++		mov	pc, lr
++		mov	pc, lr
++		mov	pc, lr
++
++		@ Everything from here on will be the new ID system.
++
+ 		.word	0x41129200		@ ARM920T
+ 		.word	0xff00fff0
+ 		b	__armv4_cache_on
+@@ -507,8 +521,16 @@ proc_types:
+ 		b	__armv4_cache_off
+ 		b	__armv4_cache_flush
+ 
+-		.word	0x69050000		@ xscale
+-		.word	0xffff0000
++		@ These match on the architecture ID
++
++		.word	0x00050000		@ ARMv5TE
++		.word	0x000f0000
++		b	__armv4_cache_on
++		b	__armv4_cache_off
++		b	__armv4_cache_flush
++
++		.word	0x00060000		@ ARMv5TEJ
++		.word	0x000f0000
+ 		b	__armv4_cache_on
+ 		b	__armv4_cache_off
+ 		b	__armv4_cache_flush
+--- linux-2.6.0-test6/arch/arm/Kconfig	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/arm/Kconfig	2003-10-05 00:33:23.000000000 -0700
+@@ -239,7 +239,7 @@ config DISCONTIGMEM
+ 
+ # Now handle the bus types
+ config PCI
+-	bool "PCI support" if ARCH_INTEGRATOR
++	bool "PCI support" if ARCH_INTEGRATOR_AP
+ 	default y if ARCH_FTVPCI || ARCH_SHARK || FOOTBRIDGE_HOST || ARCH_IOP3XX
+ 	help
+ 	  Find out whether you have a PCI motherboard. PCI is the name of a
+@@ -645,8 +645,6 @@ source "drivers/misc/Kconfig"
+ 
+ source "drivers/usb/Kconfig"
+ 
+-source "net/bluetooth/Kconfig"
+-
+ 
+ menu "Kernel hacking"
+ 
+--- linux-2.6.0-test6/arch/arm/kernel/apm.c	2003-09-08 13:58:55.000000000 -0700
++++ 25/arch/arm/kernel/apm.c	2003-10-05 00:33:23.000000000 -0700
+@@ -179,13 +179,10 @@ static void queue_event(apm_event_t even
+ 	wake_up_interruptible(&apm_waitqueue);
+ }
+ 
+-/* defined in pm.c */
+-extern int suspend(void);
+-
+ static int apm_suspend(void)
+ {
+ 	struct list_head *l;
+-	int err = suspend();
++	int err = pm_suspend(PM_SUSPEND_MEM);
+ 
+ 	/*
+ 	 * Anyone on the APM queues will think we're still suspended.
+--- linux-2.6.0-test6/arch/arm/kernel/entry-armv.S	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/arm/kernel/entry-armv.S	2003-10-05 00:33:23.000000000 -0700
+@@ -439,20 +439,25 @@ ENTRY(soft_irq_mask)
+ 
+ 		.macro	get_irqnr_and_base, irqnr, irqstat, base, tmp
+ /* FIXME: should not be using soo many LDRs here */
+-		ldr	\irqnr, =IO_ADDRESS(INTEGRATOR_IC_BASE)
+-		ldr	\irqstat, [\irqnr, #IRQ_STATUS]		@ get masked status
+-		ldr	\irqnr, =IO_ADDRESS(INTEGRATOR_HDR_BASE)
+-		ldr	\irqnr, [\irqnr, #(INTEGRATOR_HDR_IC_OFFSET+IRQ_STATUS)]
+-		orr	\irqstat, \irqstat, \irqnr, lsl #INTEGRATOR_CM_INT0
++		ldr	\base, =IO_ADDRESS(INTEGRATOR_IC_BASE)
++		mov	\irqnr, #IRQ_PIC_START
++		ldr	\irqstat, [\base, #IRQ_STATUS]		@ get masked status
++		ldr	\base, =IO_ADDRESS(INTEGRATOR_HDR_BASE)
++		teq	\irqstat, #0
++		ldreq	\irqstat, [\base, #(INTEGRATOR_HDR_IC_OFFSET+IRQ_STATUS)]
++		moveq	\irqnr, #IRQ_CIC_START
+ 
+-		mov	\irqnr, #0
+-1001:		tst	\irqstat, #1
++1001:		tst	\irqstat, #15
+ 		bne	1002f
++		add	\irqnr, \irqnr, #4
++		movs	\irqstat, \irqstat, lsr #4
++		bne	1001b
++1002:		tst	\irqstat, #1
++		bne	1003f
+ 		add	\irqnr, \irqnr, #1
+-		mov	\irqstat, \irqstat, lsr #1
+-		cmp	\irqnr, #22
+-		bcc	1001b
+-1002:		/* EQ will be set if we reach 22 */
++		movs	\irqstat, \irqstat, lsr #1
++		bne	1002b
++1003:		/* EQ will be set if no irqs pending */
+ 		.endm
+ 
+ 		.macro	irq_prio_table
+--- linux-2.6.0-test6/arch/arm/kernel/pm.c	2003-09-08 13:58:55.000000000 -0700
++++ 25/arch/arm/kernel/pm.c	2003-10-05 00:33:23.000000000 -0700
+@@ -9,68 +9,18 @@
+  *  sleep.
+  */
+ #include <linux/config.h>
++#include <linux/init.h>
++#include <linux/sysctl.h>
+ #include <linux/pm.h>
+-#include <linux/device.h>
+-#include <linux/sysdev.h>
+ #include <linux/errno.h>
+ #include <linux/sched.h>
+ 
+-#include <asm/leds.h>
+-#include <asm/system.h>
+-
+-/*
+- * Tell the linker that pm_do_suspend may not be present.
+- */
+-extern int pm_do_suspend(void) __attribute__((weak));
+-
+-int suspend(void)
+-{
+-	int ret;
+-
+-	if (!pm_do_suspend)
+-		return -ENOSYS;
+-
+-	/*
+-	 * Suspend "legacy" devices.
+-	 */
+-	ret = pm_send_all(PM_SUSPEND, (void *)3);
+-	if (ret != 0)
+-		goto out;
+-
+-	ret = device_suspend(3);
+-	if (ret)
+-		goto resume_legacy;
+-
+-	local_irq_disable();
+-	leds_event(led_stop);
+-
+-	sysdev_suspend(3);
+-
+-	ret = pm_do_suspend();
+-
+-	sysdev_resume();
+-
+-	leds_event(led_start);
+-	local_irq_enable();
+-
+-	device_resume();
+-
+- resume_legacy:
+-	pm_send_all(PM_RESUME, (void *)0);
+-
+- out:
+-	return ret;
+-}
+-
+ #ifdef CONFIG_SYSCTL
+ /*
+  * We really want this to die.  It's a disgusting hack using unallocated
+  * sysctl numbers.  We should be using a real interface.
+  */
+ 
+-#include <linux/init.h>
+-#include <linux/sysctl.h>
+-
+ static int
+ pm_sysctl_proc_handler(ctl_table *ctl, int write, struct file *filp,
+ 		       void *buffer, size_t *lenp)
+@@ -79,7 +29,7 @@ pm_sysctl_proc_handler(ctl_table *ctl, i
+ 	printk("PM: task %s (pid %d) uses deprecated sysctl PM interface\n",
+ 		current->comm, current->pid);
+ 	if (write)
+-		ret = suspend();
++		ret = pm_suspend(PM_SUSPEND_MEM);
+ 	return ret;
+ }
+ 
+--- linux-2.6.0-test6/arch/arm/kernel/process.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/arm/kernel/process.c	2003-10-05 00:33:23.000000000 -0700
+@@ -117,12 +117,10 @@ __setup("reboot=", reboot_setup);
+ 
+ void machine_halt(void)
+ {
+-	leds_event(led_halted);
+ }
+ 
+ void machine_power_off(void)
+ {
+-	leds_event(led_halted);
+ 	if (pm_power_off)
+ 		pm_power_off();
+ }
+--- linux-2.6.0-test6/arch/arm/kernel/setup.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/arm/kernel/setup.c	2003-10-05 00:33:23.000000000 -0700
+@@ -182,7 +182,7 @@ static const char *proc_arch[] = {
+ 	"5",
+ 	"5T",
+ 	"5TE",
+-	"?(8)",
++	"5TEJ",
+ 	"?(9)",
+ 	"?(10)",
+ 	"?(11)",
+--- linux-2.6.0-test6/arch/arm/kernel/signal.c	2003-06-14 12:17:56.000000000 -0700
++++ 25/arch/arm/kernel/signal.c	2003-10-05 00:33:23.000000000 -0700
+@@ -21,6 +21,7 @@
+ #include <linux/tty.h>
+ #include <linux/binfmts.h>
+ #include <linux/elf.h>
++#include <linux/suspend.h>
+ 
+ #include <asm/pgalloc.h>
+ #include <asm/ucontext.h>
+@@ -539,6 +540,11 @@ static int do_signal(sigset_t *oldset, s
+ 	if (!user_mode(regs))
+ 		return 0;
+ 
++	if (current->flags & PF_FREEZE) {
++		refrigerator(0);
++		goto no_signal;
++	}
++
+ 	if (current->ptrace & PT_SINGLESTEP)
+ 		ptrace_cancel_bpt(current);
+ 
+@@ -550,6 +556,7 @@ static int do_signal(sigset_t *oldset, s
+ 		return 1;
+ 	}
+ 
++ no_signal:
+ 	/*
+ 	 * No signal to deliver to the process - restart the syscall.
+ 	 */
+--- linux-2.6.0-test6/arch/arm/kernel/time.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/arm/kernel/time.c	2003-10-05 00:33:23.000000000 -0700
+@@ -26,6 +26,7 @@
+ #include <linux/timex.h>
+ #include <linux/errno.h>
+ #include <linux/profile.h>
++#include <linux/sysdev.h>
+ 
+ #include <asm/hardware.h>
+ #include <asm/io.h>
+@@ -72,8 +73,6 @@ unsigned long (*gettimeoffset)(void) = d
+  */
+ unsigned long long sched_clock(void)
+ {
+-	unsigned long long this_offset;
+-
+ 	return (unsigned long long)jiffies * (1000000000 / HZ);
+ }
+ 
+@@ -137,6 +136,47 @@ static void dummy_leds_event(led_event_t
+ 
+ void (*leds_event)(led_event_t) = dummy_leds_event;
+ 
++static int leds_suspend(struct sys_device *dev, u32 state)
++{
++	leds_event(led_stop);
++	return 0;
++}
++
++static int leds_resume(struct sys_device *dev)
++{
++	leds_event(led_start);
++	return 0;
++}
++
++static int leds_shutdown(struct sys_device *dev)
++{
++	leds_event(led_halted);
++	return 0;
++}
++
++static struct sysdev_class leds_sysclass = {
++	set_kset_name("leds"),
++	.shutdown	= leds_shutdown,
++	.suspend	= leds_suspend,
++	.resume		= leds_resume,
++};
++
++static struct sys_device leds_device = {
++	.id		= 0,
++	.cls		= &leds_sysclass,
++};
++
++static int __init leds_init(void)
++{
++	int ret;
++	ret = sysdev_class_register(&leds_sysclass);
++	if (ret == 0)
++		ret = sys_device_register(&leds_device);
++	return ret;
++}
++
++device_initcall(leds_init);
++
+ EXPORT_SYMBOL(leds_event);
+ #endif
+ 
+--- linux-2.6.0-test6/arch/arm/kernel/traps.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/arch/arm/kernel/traps.c	2003-10-05 00:33:23.000000000 -0700
+@@ -212,10 +212,10 @@ NORET_TYPE void die(const char *str, str
+ 	printk("CPU: %d\n", smp_processor_id());
+ 	show_regs(regs);
+ 	printk("Process %s (pid: %d, stack limit = 0x%p)\n",
+-		current->comm, current->pid, tsk->thread_info + 1);
++		tsk->comm, tsk->pid, tsk->thread_info + 1);
+ 
+ 	if (!user_mode(regs) || in_interrupt()) {
+-		dump_mem("Stack: ", (unsigned long)(regs + 1), 8192+(unsigned long)tsk->thread_info);
++		dump_mem("Stack: ", regs->ARM_sp, 8192+(unsigned long)tsk->thread_info);
+ 		dump_backtrace(regs, tsk);
+ 		dump_instr(regs);
+ 	}
+--- linux-2.6.0-test6/arch/arm/lib/io-readsl-armv4.S	2003-06-14 12:18:30.000000000 -0700
++++ 25/arch/arm/lib/io-readsl-armv4.S	2003-10-05 00:33:23.000000000 -0700
+@@ -9,7 +9,6 @@
+  */
+ #include <linux/linkage.h>
+ #include <asm/assembler.h>
+-#include <asm/hardware.h>
+ 
+ /*
+  * Note that some reads can be aligned on half-word boundaries.
+@@ -31,6 +30,10 @@ ENTRY(__raw_readsl)
+ 		blt	4f
+ 		bgt	6f
+ 
++#ifndef	__ARMEB__
++
++		/* little endian code */
++
+ 		strh	ip, [r1], #2
+ 		mov	ip, ip, lsr #16
+ 3:		subs	r2, r2, #1
+@@ -68,3 +71,48 @@ ENTRY(__raw_readsl)
+ 		strb	ip, [r1]
+ 		mov	pc, lr
+ 
++#else
++
++		/* big endian code */
++
++
++		mov	r3, ip, lsr #16
++		strh	r3, [r1], #2
++3:		mov	r3, ip, lsl #16
++		subs	r2, r2, #1
++		ldrne	ip, [r0]
++		orrne	r3, r3, ip, lsr #16
++		strne	r3, [r1], #4
++		bne	3b
++ 		strh	ip, [r1], #2
++ 		mov	pc, lr
++
++4:		mov	r3, ip, lsr #24
++		strb	r3, [r1], #1
++		mov	r3, ip, lsr #8
++		strh	r3, [r1], #2
++5:		mov	r3, ip, lsl #24
++		subs	r2, r2, #1
++		ldrne	ip, [r0]
++		orrne	r3, r3, ip, lsr #8
++		strne	r3, [r1], #4
++		bne	5b
++		strb	ip, [r1], #1
++		mov	pc, lr
++
++6:		mov	r3, ip, lsr #24
++		strb	r3, [r1], #1
++7:		mov	r3, ip, lsl #8
++		subs	r2, r2, #1
++		ldrne	ip, [r0]
++		orrne	r3, r3, ip, lsr #24
++		strne	r3, [r1], #4
++		bne	7b
++		mov	r3, ip, lsr #8
++		strh	r3, [r1], #2
++		strb	ip, [r1], #1
++		mov	pc, lr
++
++#endif
++
++
+--- linux-2.6.0-test6/arch/arm/lib/io-readsw-armv4.S	2003-06-14 12:18:23.000000000 -0700
++++ 25/arch/arm/lib/io-readsw-armv4.S	2003-10-05 00:33:23.000000000 -0700
+@@ -9,7 +9,14 @@
+  */
+ #include <linux/linkage.h>
+ #include <asm/assembler.h>
+-#include <asm/hardware.h>
++
++		.macro	pack, rd, hw1, hw2
++#ifndef __ARMEB__
++		orr	\rd, \hw1, \hw2, lsl #16
++#else
++		orr	\rd, \hw2, \hw1, lsl #16
++#endif
++		.endm
+ 
+ .insw_bad_alignment:
+ 		adr	r0, .insw_bad_align_msg
+@@ -41,19 +48,19 @@ ENTRY(__raw_readsw)
+ 
+ .insw_8_lp:	ldrh	r3, [r0]
+ 		ldrh	r4, [r0]
+-		orr	r3, r3, r4, lsl #16
++		pack	r3, r3, r4
+ 
+ 		ldrh	r4, [r0]
+ 		ldrh	r5, [r0]
+-		orr	r4, r4, r5, lsl #16
++		pack	r4, r4, r5
+ 
+ 		ldrh	r5, [r0]
+ 		ldrh	ip, [r0]
+-		orr	r5, r5, ip, lsl #16
++		pack	r5, r5, ip
+ 
+ 		ldrh	ip, [r0]
+ 		ldrh	lr, [r0]
+-		orr	ip, ip, lr, lsl #16
++		pack	ip, ip, lr
+ 
+ 		stmia	r1!, {r3 - r5, ip}
+ 
+@@ -68,11 +75,11 @@ ENTRY(__raw_readsw)
+ 
+ 		ldrh	r3, [r0]
+ 		ldrh	r4, [r0]
+-		orr	r3, r3, r4, lsl #16
++		pack	r3, r3, r4
+ 
+ 		ldrh	r4, [r0]
+ 		ldrh	ip, [r0]
+-		orr	r4, r4, ip, lsl #16
++		pack	r4, r4, ip
+ 
+ 		stmia	r1!, {r3, r4}
+ 
+@@ -81,7 +88,7 @@ ENTRY(__raw_readsw)
+ 
+ 		ldrh	r3, [r0]
+ 		ldrh	ip, [r0]
+-		orr	r3, r3, ip, lsl #16
++		pack	r3, r3, ip
+ 
+ 		str	r3, [r1], #4
+ 
+--- linux-2.6.0-test6/arch/arm/lib/io-writesw-armv4.S	2003-06-14 12:18:34.000000000 -0700
++++ 25/arch/arm/lib/io-writesw-armv4.S	2003-10-05 00:33:23.000000000 -0700
+@@ -9,7 +9,18 @@
+  */
+ #include <linux/linkage.h>
+ #include <asm/assembler.h>
+-#include <asm/hardware.h>
++
++		.macro	outword, rd
++#ifndef __ARMEB__
++		strh	\rd, [r0]
++		mov	\rd, \rd, lsr #16
++		strh	\rd, [r0]
++#else
++		mov	lr, \rd, lsr #16
++		strh	lr, [r0]
++		strh	\rd, [r0]
++#endif
++		.endm
+ 
+ .outsw_bad_alignment:
+ 		adr	r0, .outsw_bad_align_msg
+@@ -40,20 +51,10 @@ ENTRY(__raw_writesw)
+ 		bmi	.no_outsw_8
+ 
+ .outsw_8_lp:	ldmia	r1!, {r3, r4, r5, ip}
+-
+-		strh	r3, [r0]
+-		mov	r3, r3, lsr #16
+-		strh	r3, [r0]
+-		strh	r4, [r0]
+-		mov	r4, r4, lsr #16
+-		strh	r4, [r0]
+-		strh	r5, [r0]
+-		mov	r5, r5, lsr #16
+-		strh	r5, [r0]
+-		strh	ip, [r0]
+-		mov	ip, ip, lsr #16
+-		strh	ip, [r0]
+-
++		outword	r3
++		outword	r4
++		outword	r5
++		outword	ip
+ 		subs	r2, r2, #8
+ 		bpl	.outsw_8_lp
+ 
+@@ -64,20 +65,14 @@ ENTRY(__raw_writesw)
+ 		beq	.no_outsw_4
+ 
+ 		ldmia	r1!, {r3, ip}
+-		strh	r3, [r0]
+-		mov	r3, r3, lsr #16
+-		strh	r3, [r0]
+-		strh	ip, [r0]
+-		mov	ip, ip, lsr #16
+-		strh	ip, [r0]
++		outword	r3
++		outword	ip
+ 
+ .no_outsw_4:	tst	r2, #2
+ 		beq	.no_outsw_2
+ 
+ 		ldr	r3, [r1], #4
+-		strh	r3, [r0]
+-		mov	r3, r3, lsr #16
+-		strh	r3, [r0]
++		outword	r3
+ 
+ .no_outsw_2:	tst	r2, #1
+ 		ldrneh	r3, [r1]
+--- linux-2.6.0-test6/arch/arm/lib/lib1funcs.S	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/arm/lib/lib1funcs.S	2003-10-05 00:33:23.000000000 -0700
+@@ -1,7 +1,12 @@
+-@ libgcc1 routines for ARM cpu.
+-@ Division routines, written by Richard Earnshaw, (rearnsha@armltd.co.uk)
++/*
++ * linux/arch/arm/lib/lib1funcs.S: Optimized ARM division routines
++ *
++ * Author: Nicolas Pitre <nico@cam.org>
++ *   - contributed to gcc-3.4 on Sep 30, 2003
++ *   - adapted for the Linux kernel on Oct 2, 2003
++ */
+ 
+-/* Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc.
++/* Copyright 1995, 1996, 1998, 1999, 2000, 2003 Free Software Foundation, Inc.
+ 
+ This file is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+@@ -10,11 +15,12 @@ later version.
+ 
+ In addition to the permissions in the GNU General Public License, the
+ Free Software Foundation gives you unlimited permission to link the
+-compiled version of this file with other programs, and to distribute
+-those programs without any restriction coming from the use of this
+-file.  (The General Public License restrictions do apply in other
+-respects; for example, they cover modification of the file, and
+-distribution when not linked into another program.)
++compiled version of this file into combinations with other programs,
++and to distribute those combinations without any restriction coming
++from the use of this file.  (The General Public License restrictions
++do apply in other respects; for example, they cover modification of
++the file, and distribution when not linked into a combine
++executable.)
+ 
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+@@ -26,286 +32,283 @@ along with this program; see the file CO
+ the Free Software Foundation, 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.  */
+ 
+-/* As a special exception, if you link this library with other files,
+-   some of which are compiled with GCC, to produce an executable,
+-   this library does not by itself cause the resulting executable
+-   to be covered by the GNU General Public License.
+-   This exception does not however invalidate any other reasons why
+-   the executable file might be covered by the GNU General Public License.
+- */
+-/* This code is derived from gcc 2.95.3
+- * 29/07/01 Adapted for linux
+- * 27/03/03 Ian Molton Clean up CONFIG_CPU
+- */
+ 
+ #include <linux/linkage.h>
+ #include <asm/assembler.h>
+-#include <asm/hardware.h>
+ 
+-#define RET	mov
+-#define RETc(x)	mov##x
+-#define RETCOND
+-
+-dividend	.req	r0
+-divisor		.req	r1
+-result		.req	r2
+-overdone        .req    r2
+-curbit		.req	r3
++
++.macro ARM_DIV_BODY dividend, divisor, result, curbit
++
++#if __LINUX_ARM_ARCH__ >= 5
++
++	clz	\curbit, \divisor
++	clz	\result, \dividend
++	sub	\result, \curbit, \result
++	mov	\curbit, #1
++	mov	\divisor, \divisor, lsl \result
++	mov	\curbit, \curbit, lsl \result
++	mov	\result, #0
+ 	
+-ENTRY(__udivsi3)
+-	cmp	divisor, #0
+-	beq	Ldiv0
+-	mov	curbit, #1
+-	mov	result, #0
+-	cmp	dividend, divisor
+-	bcc	Lgot_result_udivsi3
+-1:
++#else
++
++	@ Initially shift the divisor left 3 bits if possible,
++	@ set curbit accordingly.  This allows for curbit to be located
++	@ at the left end of each 4 bit nibbles in the division loop
++	@ to save one loop in most cases.
++	tst	\divisor, #0xe0000000
++	moveq	\divisor, \divisor, lsl #3
++	moveq	\curbit, #8
++	movne	\curbit, #1
++
+ 	@ Unless the divisor is very big, shift it up in multiples of
+ 	@ four bits, since this is the amount of unwinding in the main
+ 	@ division loop.  Continue shifting until the divisor is 
+ 	@ larger than the dividend.
+-	cmp	divisor, #0x10000000
+-	cmpcc	divisor, dividend
+-	movcc	divisor, divisor, lsl #4
+-	movcc	curbit, curbit, lsl #4
+-	bcc	1b
++1:	cmp	\divisor, #0x10000000
++	cmplo	\divisor, \dividend
++	movlo	\divisor, \divisor, lsl #4
++	movlo	\curbit, \curbit, lsl #4
++	blo	1b
+ 
+-2:
+ 	@ For very big divisors, we must shift it a bit at a time, or
+ 	@ we will be in danger of overflowing.
+-	cmp	divisor, #0x80000000
+-	cmpcc	divisor, dividend
+-	movcc	divisor, divisor, lsl #1
+-	movcc	curbit, curbit, lsl #1
+-	bcc	2b
+-
+-3:
+-	@ Test for possible subtractions, and note which bits
+-	@ are done in the result.  On the final pass, this may subtract
+-	@ too much from the dividend, but the result will be ok, since the
+-	@ "bit" will have been shifted out at the bottom.
+-	cmp	dividend, divisor
+-	subcs	dividend, dividend, divisor
+-	orrcs	result, result, curbit
+-	cmp	dividend, divisor, lsr #1
+-	subcs	dividend, dividend, divisor, lsr #1
+-	orrcs	result, result, curbit, lsr #1
+-	cmp	dividend, divisor, lsr #2
+-	subcs	dividend, dividend, divisor, lsr #2
+-	orrcs	result, result, curbit, lsr #2
+-	cmp	dividend, divisor, lsr #3
+-	subcs	dividend, dividend, divisor, lsr #3
+-	orrcs	result, result, curbit, lsr #3
+-	cmp	dividend, #0			@ Early termination?
+-	movnes	curbit, curbit, lsr #4		@ No, any more bits to do?
+-	movne	divisor, divisor, lsr #4
+-	bne	3b
+-Lgot_result_udivsi3:
+-	mov	r0, result
+-	RET	pc, lr
++1:	cmp	\divisor, #0x80000000
++	cmplo	\divisor, \dividend
++	movlo	\divisor, \divisor, lsl #1
++	movlo	\curbit, \curbit, lsl #1
++	blo	1b
+ 
+-Ldiv0:
+-	str	lr, [sp, #-4]!
+-	bl	__div0
+-	mov	r0, #0			@ about as wrong as it could be
+-	ldmia	sp!, {pc}RETCOND
++	mov	\result, #0
+ 
+-/* __umodsi3 ----------------------- */
++#endif
++
++	@ Division loop
++1:	cmp	\dividend, \divisor
++	subhs	\dividend, \dividend, \divisor
++	orrhs	\result,   \result,   \curbit
++	cmp	\dividend, \divisor,  lsr #1
++	subhs	\dividend, \dividend, \divisor, lsr #1
++	orrhs	\result,   \result,   \curbit,  lsr #1
++	cmp	\dividend, \divisor,  lsr #2
++	subhs	\dividend, \dividend, \divisor, lsr #2
++	orrhs	\result,   \result,   \curbit,  lsr #2
++	cmp	\dividend, \divisor,  lsr #3
++	subhs	\dividend, \dividend, \divisor, lsr #3
++	orrhs	\result,   \result,   \curbit,  lsr #3
++	cmp	\dividend, #0			@ Early termination?
++	movnes	\curbit,   \curbit,  lsr #4	@ No, any more bits to do?
++	movne	\divisor,  \divisor, lsr #4
++	bne	1b
++
++.endm
++
++
++.macro ARM_DIV2_ORDER divisor, order
++
++#if __LINUX_ARM_ARCH__ >= 5
++
++	clz	\order, \divisor
++	rsb	\order, \order, #31
++
++#else
++
++	cmp	\divisor, #(1 << 16)
++	movhs	\divisor, \divisor, lsr #16
++	movhs	\order, #16
++	movlo	\order, #0
++
++	cmp	\divisor, #(1 << 8)
++	movhs	\divisor, \divisor, lsr #8
++	addhs	\order, \order, #8
++
++	cmp	\divisor, #(1 << 4)
++	movhs	\divisor, \divisor, lsr #4
++	addhs	\order, \order, #4
++
++	cmp	\divisor, #(1 << 2)
++	addhi	\order, \order, #3
++	addls	\order, \order, \divisor, lsr #1
++
++#endif
++
++.endm
++
++
++.macro ARM_MOD_BODY dividend, divisor, order, spare
++
++#if __LINUX_ARM_ARCH__ >= 5
++
++	clz	\order, \divisor
++	clz	\spare, \dividend
++	sub	\order, \order, \spare
++	mov	\divisor, \divisor, lsl \order
++
++#else
++
++	mov	\order, #0
+ 
+-ENTRY(__umodsi3)
+-	cmp	divisor, #0
+-	beq	Ldiv0
+-	mov	curbit, #1
+-	cmp	dividend, divisor
+-	RETc(cc)	pc, lr
+-1:
+ 	@ Unless the divisor is very big, shift it up in multiples of
+ 	@ four bits, since this is the amount of unwinding in the main
+ 	@ division loop.  Continue shifting until the divisor is 
+ 	@ larger than the dividend.
+-	cmp	divisor, #0x10000000
+-	cmpcc	divisor, dividend
+-	movcc	divisor, divisor, lsl #4
+-	movcc	curbit, curbit, lsl #4
+-	bcc	1b
++1:	cmp	\divisor, #0x10000000
++	cmplo	\divisor, \dividend
++	movlo	\divisor, \divisor, lsl #4
++	addlo	\order, \order, #4
++	blo	1b
+ 
+-2:
+ 	@ For very big divisors, we must shift it a bit at a time, or
+ 	@ we will be in danger of overflowing.
+-	cmp	divisor, #0x80000000
+-	cmpcc	divisor, dividend
+-	movcc	divisor, divisor, lsl #1
+-	movcc	curbit, curbit, lsl #1
+-	bcc	2b
+-
+-3:
+-	@ Test for possible subtractions.  On the final pass, this may 
+-	@ subtract too much from the dividend, so keep track of which
+-	@ subtractions are done, we can fix them up afterwards...
+-	mov	overdone, #0
+-	cmp	dividend, divisor
+-	subcs	dividend, dividend, divisor
+-	cmp	dividend, divisor, lsr #1
+-	subcs	dividend, dividend, divisor, lsr #1
+-	orrcs	overdone, overdone, curbit, ror #1
+-	cmp	dividend, divisor, lsr #2
+-	subcs	dividend, dividend, divisor, lsr #2
+-	orrcs	overdone, overdone, curbit, ror #2
+-	cmp	dividend, divisor, lsr #3
+-	subcs	dividend, dividend, divisor, lsr #3
+-	orrcs	overdone, overdone, curbit, ror #3
+-	mov	ip, curbit
+-	cmp	dividend, #0			@ Early termination?
+-	movnes	curbit, curbit, lsr #4		@ No, any more bits to do?
+-	movne	divisor, divisor, lsr #4
+-	bne	3b
+-
+-	@ Any subtractions that we should not have done will be recorded in
+-	@ the top three bits of "overdone".  Exactly which were not needed
+-	@ are governed by the position of the bit, stored in ip.
+-	@ If we terminated early, because dividend became zero,
+-	@ then none of the below will match, since the bit in ip will not be
+-	@ in the bottom nibble.
+-	ands	overdone, overdone, #0xe0000000
+-	RETc(eq)	pc, lr				@ No fixups needed
+-	tst	overdone, ip, ror #3
+-	addne	dividend, dividend, divisor, lsr #3
+-	tst	overdone, ip, ror #2
+-	addne	dividend, dividend, divisor, lsr #2
+-	tst	overdone, ip, ror #1
+-	addne	dividend, dividend, divisor, lsr #1
+-	RET	pc, lr
++1:	cmp	\divisor, #0x80000000
++	cmplo	\divisor, \dividend
++	movlo	\divisor, \divisor, lsl #1
++	addlo	\order, \order, #1
++	blo	1b
++
++#endif
++
++	@ Perform all needed substractions to keep only the reminder.
++	@ Do comparisons in batch of 4 first.
++	subs	\order, \order, #3		@ yes, 3 is intended here
++	blt	2f
++
++1:	cmp	\dividend, \divisor
++	subhs	\dividend, \dividend, \divisor
++	cmp	\dividend, \divisor,  lsr #1
++	subhs	\dividend, \dividend, \divisor, lsr #1
++	cmp	\dividend, \divisor,  lsr #2
++	subhs	\dividend, \dividend, \divisor, lsr #2
++	cmp	\dividend, \divisor,  lsr #3
++	subhs	\dividend, \dividend, \divisor, lsr #3
++	cmp	\dividend, #1
++	mov	\divisor, \divisor, lsr #4
++	subges	\order, \order, #4
++	bge	1b
++
++	tst	\order, #3
++	teqne	\dividend, #0
++	beq	5f
++
++	@ Either 1, 2 or 3 comparison/substractions are left.
++2:	cmn	\order, #2
++	blt	4f
++	beq	3f
++	cmp	\dividend, \divisor
++	subhs	\dividend, \dividend, \divisor
++	mov	\divisor,  \divisor,  lsr #1
++3:	cmp	\dividend, \divisor
++	subhs	\dividend, \dividend, \divisor
++	mov	\divisor,  \divisor,  lsr #1
++4:	cmp	\dividend, \divisor
++	subhs	\dividend, \dividend, \divisor
++5:
++.endm
++
++
++ENTRY(__udivsi3)
++
++	subs	r2, r1, #1
++	moveq	pc, lr
++	bcc	Ldiv0
++	cmp	r0, r1
++	bls	11f
++	tst	r1, r2
++	beq	12f
++
++	ARM_DIV_BODY r0, r1, r2, r3
++
++	mov	r0, r2
++	mov	pc, lr
++
++11:	moveq	r0, #1
++	movne	r0, #0
++	mov	pc, lr
++
++12:	ARM_DIV2_ORDER r1, r2
++
++	mov	r0, r0, lsr r2
++	mov	pc, lr
++
++
++ENTRY(__umodsi3)
++
++	subs	r2, r1, #1			@ compare divisor with 1
++	bcc	Ldiv0
++	cmpne	r0, r1				@ compare dividend with divisor
++	moveq   r0, #0
++	tsthi	r1, r2				@ see if divisor is power of 2
++	andeq	r0, r0, r2
++	movls	pc, lr
++
++	ARM_MOD_BODY r0, r1, r2, r3
++
++	mov	pc, lr
++
+ 
+ ENTRY(__divsi3)
+-	eor	ip, dividend, divisor		@ Save the sign of the result.
+-	mov	curbit, #1
+-	mov	result, #0
+-	cmp	divisor, #0
+-	rsbmi	divisor, divisor, #0		@ Loops below use unsigned.
++
++	cmp	r1, #0
++	eor	ip, r0, r1			@ save the sign of the result.
+ 	beq	Ldiv0
+-	cmp	dividend, #0
+-	rsbmi	dividend, dividend, #0
+-	cmp	dividend, divisor
+-	bcc	Lgot_result_divsi3
++	rsbmi	r1, r1, #0			@ loops below use unsigned.
++	subs	r2, r1, #1			@ division by 1 or -1 ?
++	beq	10f
++	movs	r3, r0
++	rsbmi	r3, r0, #0			@ positive dividend value
++	cmp	r3, r1
++	bls	11f
++	tst	r1, r2				@ divisor is power of 2 ?
++	beq	12f
+ 
+-1:
+-	@ Unless the divisor is very big, shift it up in multiples of
+-	@ four bits, since this is the amount of unwinding in the main
+-	@ division loop.  Continue shifting until the divisor is 
+-	@ larger than the dividend.
+-	cmp	divisor, #0x10000000
+-	cmpcc	divisor, dividend
+-	movcc	divisor, divisor, lsl #4
+-	movcc	curbit, curbit, lsl #4
+-	bcc	1b
++	ARM_DIV_BODY r3, r1, r0, r2
+ 
+-2:
+-	@ For very big divisors, we must shift it a bit at a time, or
+-	@ we will be in danger of overflowing.
+-	cmp	divisor, #0x80000000
+-	cmpcc	divisor, dividend
+-	movcc	divisor, divisor, lsl #1
+-	movcc	curbit, curbit, lsl #1
+-	bcc	2b
+-
+-3:
+-	@ Test for possible subtractions, and note which bits
+-	@ are done in the result.  On the final pass, this may subtract
+-	@ too much from the dividend, but the result will be ok, since the
+-	@ "bit" will have been shifted out at the bottom.
+-	cmp	dividend, divisor
+-	subcs	dividend, dividend, divisor
+-	orrcs	result, result, curbit
+-	cmp	dividend, divisor, lsr #1
+-	subcs	dividend, dividend, divisor, lsr #1
+-	orrcs	result, result, curbit, lsr #1
+-	cmp	dividend, divisor, lsr #2
+-	subcs	dividend, dividend, divisor, lsr #2
+-	orrcs	result, result, curbit, lsr #2
+-	cmp	dividend, divisor, lsr #3
+-	subcs	dividend, dividend, divisor, lsr #3
+-	orrcs	result, result, curbit, lsr #3
+-	cmp	dividend, #0			@ Early termination?
+-	movnes	curbit, curbit, lsr #4		@ No, any more bits to do?
+-	movne	divisor, divisor, lsr #4
+-	bne	3b
+-Lgot_result_divsi3:
+-	mov	r0, result
+ 	cmp	ip, #0
+ 	rsbmi	r0, r0, #0
+-	RET	pc, lr
++	mov	pc, lr
++
++10:	teq	ip, r0				@ same sign ?
++	rsbmi	r0, r0, #0
++	mov	pc, lr
++
++11:	movlo	r0, #0
++	moveq	r0, ip, asr #31
++	orreq	r0, r0, #1
++	mov	pc, lr
++
++12:	ARM_DIV2_ORDER r1, r2
++
++	cmp	ip, #0
++	mov	r0, r3, lsr r2
++	rsbmi	r0, r0, #0
++	mov	pc, lr
++
+ 
+ ENTRY(__modsi3)
+-	mov	curbit, #1
+-	cmp	divisor, #0
+-	rsbmi	divisor, divisor, #0		@ Loops below use unsigned.
++
++	cmp	r1, #0
+ 	beq	Ldiv0
+-	@ Need to save the sign of the dividend, unfortunately, we need
+-	@ ip later on; this is faster than pushing lr and using that.
+-	str	dividend, [sp, #-4]!
+-	cmp	dividend, #0
+-	rsbmi	dividend, dividend, #0
+-	cmp	dividend, divisor
+-	bcc	Lgot_result_modsi3
++	rsbmi	r1, r1, #0			@ loops below use unsigned.
++	movs	ip, r0				@ preserve sign of dividend
++	rsbmi	r0, r0, #0			@ if negative make positive
++	subs	r2, r1, #1			@ compare divisor with 1
++	cmpne	r0, r1				@ compare dividend with divisor
++	moveq	r0, #0
++	tsthi	r1, r2				@ see if divisor is power of 2
++	andeq	r0, r0, r2
++	bls	10f
++
++	ARM_MOD_BODY r0, r1, r2, r3
++
++10:	cmp	ip, #0
++	rsbmi	r0, r0, #0
++	mov	pc, lr
++
++
++Ldiv0:
++
++	str	lr, [sp, #-4]!
++	bl	__div0
++	mov	r0, #0			@ About as wrong as it could be.
++	ldr	pc, [sp], #4
+ 
+-1:
+-	@ Unless the divisor is very big, shift it up in multiples of
+-	@ four bits, since this is the amount of unwinding in the main
+-	@ division loop.  Continue shifting until the divisor is 
+-	@ larger than the dividend.
+-	cmp	divisor, #0x10000000
+-	cmpcc	divisor, dividend
+-	movcc	divisor, divisor, lsl #4
+-	movcc	curbit, curbit, lsl #4
+-	bcc	1b
+ 
+-2:
+-	@ For very big divisors, we must shift it a bit at a time, or
+-	@ we will be in danger of overflowing.
+-	cmp	divisor, #0x80000000
+-	cmpcc	divisor, dividend
+-	movcc	divisor, divisor, lsl #1
+-	movcc	curbit, curbit, lsl #1
+-	bcc	2b
+-
+-3:
+-	@ Test for possible subtractions.  On the final pass, this may 
+-	@ subtract too much from the dividend, so keep track of which
+-	@ subtractions are done, we can fix them up afterwards...
+-	mov	overdone, #0
+-	cmp	dividend, divisor
+-	subcs	dividend, dividend, divisor
+-	cmp	dividend, divisor, lsr #1
+-	subcs	dividend, dividend, divisor, lsr #1
+-	orrcs	overdone, overdone, curbit, ror #1
+-	cmp	dividend, divisor, lsr #2
+-	subcs	dividend, dividend, divisor, lsr #2
+-	orrcs	overdone, overdone, curbit, ror #2
+-	cmp	dividend, divisor, lsr #3
+-	subcs	dividend, dividend, divisor, lsr #3
+-	orrcs	overdone, overdone, curbit, ror #3
+-	mov	ip, curbit
+-	cmp	dividend, #0			@ Early termination?
+-	movnes	curbit, curbit, lsr #4		@ No, any more bits to do?
+-	movne	divisor, divisor, lsr #4
+-	bne	3b
+-
+-	@ Any subtractions that we should not have done will be recorded in
+-	@ the top three bits of "overdone".  Exactly which were not needed
+-	@ are governed by the position of the bit, stored in ip.
+-	@ If we terminated early, because dividend became zero,
+-	@ then none of the below will match, since the bit in ip will not be
+-	@ in the bottom nibble.
+-	ands	overdone, overdone, #0xe0000000
+-	beq	Lgot_result_modsi3
+-	tst	overdone, ip, ror #3
+-	addne	dividend, dividend, divisor, lsr #3
+-	tst	overdone, ip, ror #2
+-	addne	dividend, dividend, divisor, lsr #2
+-	tst	overdone, ip, ror #1
+-	addne	dividend, dividend, divisor, lsr #1
+-Lgot_result_modsi3:
+-	ldr	ip, [sp], #4
+-	cmp	ip, #0
+-	rsbmi	dividend, dividend, #0
+-	RET	pc, lr
+--- linux-2.6.0-test6/arch/arm/mach-integrator/core.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/arm/mach-integrator/core.c	2003-10-05 00:33:23.000000000 -0700
+@@ -1,134 +1,59 @@
+ /*
+- *  linux/arch/arm/mach-integrator/arch.c
++ *  linux/arch/arm/mach-integrator/core.c
+  *
+- *  Copyright (C) 2000 Deep Blue Solutions Ltd
++ *  Copyright (C) 2000-2003 Deep Blue Solutions Ltd
+  *
+  * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ * it under the terms of the GNU General Public License version 2, as
++ * published by the Free Software Foundation.
+  */
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/init.h>
+-#include <linux/list.h>
+ #include <linux/device.h>
+-#include <linux/slab.h>
+-#include <linux/string.h>
+ 
+ #include <asm/hardware.h>
+-#include <asm/io.h>
+ #include <asm/irq.h>
+-#include <asm/setup.h>
+-#include <asm/mach-types.h>
+ #include <asm/hardware/amba.h>
+-#include <asm/hardware/amba_kmi.h>
+-
+-#include <asm/arch/lm.h>
+-
+-#include <asm/mach/arch.h>
+-#include <asm/mach/irq.h>
+-#include <asm/mach/map.h>
+-
+-/* 
+- * All IO addresses are mapped onto VA 0xFFFx.xxxx, where x.xxxx
+- * is the (PA >> 12).
+- *
+- * Setup a VA for the Integrator interrupt controller (for header #0,
+- * just for now).
+- */
+-#define VA_IC_BASE	IO_ADDRESS(INTEGRATOR_IC_BASE) 
+-#define VA_SC_BASE	IO_ADDRESS(INTEGRATOR_SC_BASE)
+-#define VA_CMIC_BASE	IO_ADDRESS(INTEGRATOR_HDR_BASE) + INTEGRATOR_HDR_IC_OFFSET
+-
+-/*
+- * Logical      Physical
+- * e8000000	40000000	PCI memory		PHYS_PCI_MEM_BASE	(max 512M)
+- * ec000000	61000000	PCI config space	PHYS_PCI_CONFIG_BASE	(max 16M)
+- * ed000000	62000000	PCI V3 regs		PHYS_PCI_V3_BASE	(max 64k)
+- * ee000000	60000000	PCI IO			PHYS_PCI_IO_BASE	(max 16M)
+- * ef000000			Cache flush
+- * f1000000	10000000	Core module registers
+- * f1100000	11000000	System controller registers
+- * f1200000	12000000	EBI registers
+- * f1300000	13000000	Counter/Timer
+- * f1400000	14000000	Interrupt controller
+- * f1500000	15000000	RTC
+- * f1600000	16000000	UART 0
+- * f1700000	17000000	UART 1
+- * f1a00000	1a000000	Debug LEDs
+- * f1b00000	1b000000	GPIO
+- */
+ 
+-static struct map_desc integrator_io_desc[] __initdata = {
+- { IO_ADDRESS(INTEGRATOR_HDR_BASE),   INTEGRATOR_HDR_BASE,   SZ_4K,  MT_DEVICE },
+- { IO_ADDRESS(INTEGRATOR_SC_BASE),    INTEGRATOR_SC_BASE,    SZ_4K,  MT_DEVICE },
+- { IO_ADDRESS(INTEGRATOR_EBI_BASE),   INTEGRATOR_EBI_BASE,   SZ_4K,  MT_DEVICE },
+- { IO_ADDRESS(INTEGRATOR_CT_BASE),    INTEGRATOR_CT_BASE,    SZ_4K,  MT_DEVICE },
+- { IO_ADDRESS(INTEGRATOR_IC_BASE),    INTEGRATOR_IC_BASE,    SZ_4K,  MT_DEVICE },
+- { IO_ADDRESS(INTEGRATOR_RTC_BASE),   INTEGRATOR_RTC_BASE,   SZ_4K,  MT_DEVICE },
+- { IO_ADDRESS(INTEGRATOR_UART0_BASE), INTEGRATOR_UART0_BASE, SZ_4K,  MT_DEVICE },
+- { IO_ADDRESS(INTEGRATOR_UART1_BASE), INTEGRATOR_UART1_BASE, SZ_4K,  MT_DEVICE },
+- { IO_ADDRESS(INTEGRATOR_DBG_BASE),   INTEGRATOR_DBG_BASE,   SZ_4K,  MT_DEVICE },
+- { IO_ADDRESS(INTEGRATOR_GPIO_BASE),  INTEGRATOR_GPIO_BASE,  SZ_4K,  MT_DEVICE },
+- { PCI_MEMORY_VADDR,                  PHYS_PCI_MEM_BASE,     SZ_16M, MT_DEVICE },
+- { PCI_CONFIG_VADDR,                  PHYS_PCI_CONFIG_BASE,  SZ_16M, MT_DEVICE },
+- { PCI_V3_VADDR,                      PHYS_PCI_V3_BASE,      SZ_64K, MT_DEVICE },
+- { PCI_IO_VADDR,                      PHYS_PCI_IO_BASE,      SZ_64K, MT_DEVICE }
++static struct amba_device rtc_device = {
++	.dev		= {
++		.bus_id	= "mb:15",
++	},
++	.res		= {
++		.start	= INTEGRATOR_RTC_BASE,
++		.end	= INTEGRATOR_RTC_BASE + SZ_4K - 1,
++		.flags	= IORESOURCE_MEM,
++	},
++	.irq		= IRQ_RTCINT,
++	.periphid	= 0x00041030,
+ };
+ 
+-static void __init integrator_map_io(void)
+-{
+-	iotable_init(integrator_io_desc, ARRAY_SIZE(integrator_io_desc));
+-}
+-
+-#define ALLPCI ( (1 << IRQ_PCIINT0) | (1 << IRQ_PCIINT1) | (1 << IRQ_PCIINT2) | (1 << IRQ_PCIINT3) )
+-
+-static void sc_mask_irq(unsigned int irq)
+-{
+-	writel(1 << irq, VA_IC_BASE + IRQ_ENABLE_CLEAR);
+-}
+-
+-static void sc_unmask_irq(unsigned int irq)
+-{
+-	writel(1 << irq, VA_IC_BASE + IRQ_ENABLE_SET);
+-}
+-
+-static struct irqchip sc_chip = {
+-	.ack	= sc_mask_irq,
+-	.mask	= sc_mask_irq,
+-	.unmask = sc_unmask_irq,
++static struct amba_device uart0_device = {
++	.dev		= {
++		.bus_id	= "mb:16",
++	},
++	.res		= {
++		.start	= INTEGRATOR_UART0_BASE,
++		.end	= INTEGRATOR_UART0_BASE + SZ_4K - 1,
++		.flags	= IORESOURCE_MEM,
++	},
++	.irq		= IRQ_UARTINT0,
++	.periphid	= 0x0041010,
+ };
+ 
+-static void __init integrator_init_irq(void)
+-{
+-	unsigned int i;
+-
+-	/* Disable all interrupts initially. */
+-	/* Do the core module ones */
+-	writel(-1, VA_CMIC_BASE + IRQ_ENABLE_CLEAR);
+-
+-	/* do the header card stuff next */
+-	writel(-1, VA_IC_BASE + IRQ_ENABLE_CLEAR);
+-	writel(-1, VA_IC_BASE + FIQ_ENABLE_CLEAR);
+-
+-	for (i = 0; i < NR_IRQS; i++) {
+-		if (((1 << i) && INTEGRATOR_SC_VALID_INT) != 0) {
+-			set_irq_chip(i, &sc_chip);
+-			set_irq_handler(i, do_level_IRQ);
+-			set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
+-		}
+-	}
+-}
++static struct amba_device uart1_device = {
++	.dev		= {
++		.bus_id	= "mb:17",
++	},
++	.res		= {
++		.start	= INTEGRATOR_UART1_BASE,
++		.end	= INTEGRATOR_UART1_BASE + SZ_4K - 1,
++		.flags	= IORESOURCE_MEM,
++	},
++	.irq		= IRQ_UARTINT1,
++	.periphid	= 0x0041010,
++};
+ 
+ static struct amba_device kmi0_device = {
+ 	.dev		= {
+@@ -136,7 +61,7 @@ static struct amba_device kmi0_device = 
+ 	},
+ 	.res		= {
+ 		.start	= KMI0_BASE,
+-		.end	= KMI0_BASE + KMI_SIZE - 1,
++		.end	= KMI0_BASE + SZ_4K - 1,
+ 		.flags	= IORESOURCE_MEM,
+ 	},
+ 	.irq		= IRQ_KMIINT0,
+@@ -149,7 +74,7 @@ static struct amba_device kmi1_device = 
+ 	},
+ 	.res		= {
+ 		.start	= KMI1_BASE,
+-		.end	= KMI1_BASE + KMI_SIZE - 1,
++		.end	= KMI1_BASE + SZ_4K - 1,
+ 		.flags	= IORESOURCE_MEM,
+ 	},
+ 	.irq		= IRQ_KMIINT1,
+@@ -157,52 +82,23 @@ static struct amba_device kmi1_device = 
+ };
+ 
+ static struct amba_device *amba_devs[] __initdata = {
++	&rtc_device,
++	&uart0_device,
++	&uart1_device,
+ 	&kmi0_device,
+ 	&kmi1_device,
+ };
+ 
+-static int __init register_devices(void)
++static int __init integrator_init(void)
+ {
+-	unsigned long sc_dec;
+ 	int i;
+ 
+ 	for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
+ 		struct amba_device *d = amba_devs[i];
+-
+ 		amba_device_register(d, &iomem_resource);
+ 	}
+ 
+-	sc_dec = readl(VA_SC_BASE + INTEGRATOR_SC_DEC_OFFSET);
+-	for (i = 0; i < 4; i++) {
+-		struct lm_device *lmdev;
+-
+-		if ((sc_dec & (16 << i)) == 0)
+-			continue;
+-
+-		lmdev = kmalloc(sizeof(struct lm_device), GFP_KERNEL);
+-		if (!lmdev)
+-			continue;
+-
+-		memset(lmdev, 0, sizeof(struct lm_device));
+-
+-		lmdev->resource.start = 0xc0000000 + 0x10000000 * i;
+-		lmdev->resource.end = lmdev->resource.start + 0x0fffffff;
+-		lmdev->resource.flags = IORESOURCE_MEM;
+-		lmdev->irq = IRQ_EXPINT0 + i;
+-		lmdev->id = i;
+-
+-		lm_device_register(lmdev);
+-	}
+-
+ 	return 0;
+ }
+ 
+-arch_initcall(register_devices);
+-
+-MACHINE_START(INTEGRATOR, "ARM-Integrator")
+-	MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
+-	BOOT_MEM(0x00000000, 0x16000000, 0xf1600000)
+-	BOOT_PARAMS(0x00000100)
+-	MAPIO(integrator_map_io)
+-	INITIRQ(integrator_init_irq)
+-MACHINE_END
++arch_initcall(integrator_init);
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/arch/arm/mach-integrator/integrator_ap.c	2003-10-05 00:33:23.000000000 -0700
+@@ -0,0 +1,294 @@
++/*
++ *  linux/arch/arm/mach-integrator/integrator_ap.c
++ *
++ *  Copyright (C) 2000-2003 Deep Blue Solutions Ltd
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#include <linux/types.h>
++#include <linux/kernel.h>
++#include <linux/init.h>
++#include <linux/list.h>
++#include <linux/device.h>
++#include <linux/slab.h>
++#include <linux/string.h>
++#include <linux/sysdev.h>
++
++#include <asm/hardware.h>
++#include <asm/io.h>
++#include <asm/irq.h>
++#include <asm/setup.h>
++#include <asm/mach-types.h>
++#include <asm/hardware/amba.h>
++#include <asm/hardware/amba_kmi.h>
++
++#include <asm/arch/lm.h>
++
++#include <asm/mach/arch.h>
++#include <asm/mach/flash.h>
++#include <asm/mach/irq.h>
++#include <asm/mach/map.h>
++
++
++/* 
++ * All IO addresses are mapped onto VA 0xFFFx.xxxx, where x.xxxx
++ * is the (PA >> 12).
++ *
++ * Setup a VA for the Integrator interrupt controller (for header #0,
++ * just for now).
++ */
++#define VA_IC_BASE	IO_ADDRESS(INTEGRATOR_IC_BASE) 
++#define VA_SC_BASE	IO_ADDRESS(INTEGRATOR_SC_BASE)
++#define VA_EBI_BASE	IO_ADDRESS(INTEGRATOR_EBI_BASE)
++#define VA_CMIC_BASE	IO_ADDRESS(INTEGRATOR_HDR_BASE) + INTEGRATOR_HDR_IC_OFFSET
++
++/*
++ * Logical      Physical
++ * e8000000	40000000	PCI memory		PHYS_PCI_MEM_BASE	(max 512M)
++ * ec000000	61000000	PCI config space	PHYS_PCI_CONFIG_BASE	(max 16M)
++ * ed000000	62000000	PCI V3 regs		PHYS_PCI_V3_BASE	(max 64k)
++ * ee000000	60000000	PCI IO			PHYS_PCI_IO_BASE	(max 16M)
++ * ef000000			Cache flush
++ * f1000000	10000000	Core module registers
++ * f1100000	11000000	System controller registers
++ * f1200000	12000000	EBI registers
++ * f1300000	13000000	Counter/Timer
++ * f1400000	14000000	Interrupt controller
++ * f1500000	15000000	RTC
++ * f1600000	16000000	UART 0
++ * f1700000	17000000	UART 1
++ * f1a00000	1a000000	Debug LEDs
++ * f1b00000	1b000000	GPIO
++ */
++
++static struct map_desc ap_io_desc[] __initdata = {
++ { IO_ADDRESS(INTEGRATOR_HDR_BASE),   INTEGRATOR_HDR_BASE,   SZ_4K,  MT_DEVICE },
++ { IO_ADDRESS(INTEGRATOR_SC_BASE),    INTEGRATOR_SC_BASE,    SZ_4K,  MT_DEVICE },
++ { IO_ADDRESS(INTEGRATOR_EBI_BASE),   INTEGRATOR_EBI_BASE,   SZ_4K,  MT_DEVICE },
++ { IO_ADDRESS(INTEGRATOR_CT_BASE),    INTEGRATOR_CT_BASE,    SZ_4K,  MT_DEVICE },
++ { IO_ADDRESS(INTEGRATOR_IC_BASE),    INTEGRATOR_IC_BASE,    SZ_4K,  MT_DEVICE },
++ { IO_ADDRESS(INTEGRATOR_RTC_BASE),   INTEGRATOR_RTC_BASE,   SZ_4K,  MT_DEVICE },
++ { IO_ADDRESS(INTEGRATOR_UART0_BASE), INTEGRATOR_UART0_BASE, SZ_4K,  MT_DEVICE },
++ { IO_ADDRESS(INTEGRATOR_UART1_BASE), INTEGRATOR_UART1_BASE, SZ_4K,  MT_DEVICE },
++ { IO_ADDRESS(INTEGRATOR_DBG_BASE),   INTEGRATOR_DBG_BASE,   SZ_4K,  MT_DEVICE },
++ { IO_ADDRESS(INTEGRATOR_GPIO_BASE),  INTEGRATOR_GPIO_BASE,  SZ_4K,  MT_DEVICE },
++ { PCI_MEMORY_VADDR,                  PHYS_PCI_MEM_BASE,     SZ_16M, MT_DEVICE },
++ { PCI_CONFIG_VADDR,                  PHYS_PCI_CONFIG_BASE,  SZ_16M, MT_DEVICE },
++ { PCI_V3_VADDR,                      PHYS_PCI_V3_BASE,      SZ_64K, MT_DEVICE },
++ { PCI_IO_VADDR,                      PHYS_PCI_IO_BASE,      SZ_64K, MT_DEVICE }
++};
++
++static void __init ap_map_io(void)
++{
++	iotable_init(ap_io_desc, ARRAY_SIZE(ap_io_desc));
++}
++
++#define INTEGRATOR_SC_VALID_INT	0x003fffff
++
++static void sc_mask_irq(unsigned int irq)
++{
++	writel(1 << irq, VA_IC_BASE + IRQ_ENABLE_CLEAR);
++}
++
++static void sc_unmask_irq(unsigned int irq)
++{
++	writel(1 << irq, VA_IC_BASE + IRQ_ENABLE_SET);
++}
++
++static struct irqchip sc_chip = {
++	.ack	= sc_mask_irq,
++	.mask	= sc_mask_irq,
++	.unmask = sc_unmask_irq,
++};
++
++static void __init ap_init_irq(void)
++{
++	unsigned int i;
++
++	/* Disable all interrupts initially. */
++	/* Do the core module ones */
++	writel(-1, VA_CMIC_BASE + IRQ_ENABLE_CLEAR);
++
++	/* do the header card stuff next */
++	writel(-1, VA_IC_BASE + IRQ_ENABLE_CLEAR);
++	writel(-1, VA_IC_BASE + FIQ_ENABLE_CLEAR);
++
++	for (i = 0; i < NR_IRQS; i++) {
++		if (((1 << i) && INTEGRATOR_SC_VALID_INT) != 0) {
++			set_irq_chip(i, &sc_chip);
++			set_irq_handler(i, do_level_IRQ);
++			set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
++		}
++	}
++}
++
++#ifdef CONFIG_PM
++static unsigned long ic_irq_enable;
++
++static int irq_suspend(struct sys_device *dev, u32 state)
++{
++	ic_irq_enable = readl(VA_IC_BASE + IRQ_ENABLE);
++	return 0;
++}
++
++static int irq_resume(struct sys_device *dev)
++{
++	/* disable all irq sources */
++	writel(-1, VA_CMIC_BASE + IRQ_ENABLE_CLEAR);
++	writel(-1, VA_IC_BASE + IRQ_ENABLE_CLEAR);
++	writel(-1, VA_IC_BASE + FIQ_ENABLE_CLEAR);
++
++	writel(ic_irq_enable, VA_IC_BASE + IRQ_ENABLE_SET);
++	return 0;
++}
++#else
++#define irq_suspend NULL
++#define irq_resume NULL
++#endif
++
++static struct sysdev_class irq_class = {
++	set_kset_name("irq"),
++	.suspend	= irq_suspend,
++	.resume		= irq_resume,
++};
++
++static struct sys_device irq_device = {
++	.id	= 0,
++	.cls	= &irq_class,
++};
++
++static int __init irq_init_sysfs(void)
++{
++	int ret = sysdev_class_register(&irq_class);
++	if (ret == 0)
++		ret = sys_device_register(&irq_device);
++	return ret;
++}
++
++device_initcall(irq_init_sysfs);
++
++/*
++ * Flash handling.
++ */
++#define SC_CTRLC (VA_SC_BASE + INTEGRATOR_SC_CTRLC_OFFSET)
++#define SC_CTRLS (VA_SC_BASE + INTEGRATOR_SC_CTRLS_OFFSET)
++#define EBI_CSR1 (VA_EBI_BASE + INTEGRATOR_EBI_CSR1_OFFSET)
++#define EBI_LOCK (VA_EBI_BASE + INTEGRATOR_EBI_LOCK_OFFSET)
++
++static int ap_flash_init(void)
++{
++	u32 tmp;
++
++	writel(INTEGRATOR_SC_CTRL_nFLVPPEN | INTEGRATOR_SC_CTRL_nFLWP, SC_CTRLC);
++
++	tmp = readl(EBI_CSR1) | INTEGRATOR_EBI_WRITE_ENABLE;
++	writel(tmp, EBI_CSR1);
++
++	if (!(readl(EBI_CSR1) & INTEGRATOR_EBI_WRITE_ENABLE)) {
++		writel(0xa05f, EBI_LOCK);
++		writel(tmp, EBI_CSR1);
++		writel(0, EBI_LOCK);
++	}
++	return 0;
++}
++
++static void ap_flash_exit(void)
++{
++	u32 tmp;
++
++	writel(INTEGRATOR_SC_CTRL_nFLVPPEN | INTEGRATOR_SC_CTRL_nFLWP, SC_CTRLC);
++
++	tmp = readl(EBI_CSR1) & ~INTEGRATOR_EBI_WRITE_ENABLE;
++	writel(tmp, EBI_CSR1);
++
++	if (readl(EBI_CSR1) & INTEGRATOR_EBI_WRITE_ENABLE) {
++		writel(0xa05f, EBI_LOCK);
++		writel(tmp, EBI_CSR1);
++		writel(0, EBI_LOCK);
++	}
++}
++
++static void ap_flash_set_vpp(int on)
++{
++	unsigned long reg = on ? SC_CTRLS : SC_CTRLC;
++
++	writel(INTEGRATOR_SC_CTRL_nFLVPPEN, reg);
++}
++
++static struct flash_platform_data ap_flash_data = {
++	.map_name	= "cfi_probe",
++	.width		= 4,
++	.init		= ap_flash_init,
++	.exit		= ap_flash_exit,
++	.set_vpp	= ap_flash_set_vpp,
++};
++
++static struct resource cfi_flash_resource = {
++	.start		= INTEGRATOR_FLASH_BASE,
++	.end		= INTEGRATOR_FLASH_BASE + INTEGRATOR_FLASH_SIZE - 1,
++	.flags		= IORESOURCE_MEM,
++};
++
++static struct platform_device cfi_flash_device = {
++	.name		= "armflash",
++	.id		= 0,
++	.dev		= {
++		.platform_data	= &ap_flash_data,
++	},
++	.num_resources	= 1,
++	.resource	= &cfi_flash_resource,
++};
++
++static int __init ap_init(void)
++{
++	unsigned long sc_dec;
++	int i;
++
++	platform_add_device(&cfi_flash_device);
++
++	sc_dec = readl(VA_SC_BASE + INTEGRATOR_SC_DEC_OFFSET);
++	for (i = 0; i < 4; i++) {
++		struct lm_device *lmdev;
++
++		if ((sc_dec & (16 << i)) == 0)
++			continue;
++
++		lmdev = kmalloc(sizeof(struct lm_device), GFP_KERNEL);
++		if (!lmdev)
++			continue;
++
++		memset(lmdev, 0, sizeof(struct lm_device));
++
++		lmdev->resource.start = 0xc0000000 + 0x10000000 * i;
++		lmdev->resource.end = lmdev->resource.start + 0x0fffffff;
++		lmdev->resource.flags = IORESOURCE_MEM;
++		lmdev->irq = IRQ_AP_EXPINT0 + i;
++		lmdev->id = i;
++
++		lm_device_register(lmdev);
++	}
++
++	return 0;
++}
++
++arch_initcall(ap_init);
++
++MACHINE_START(INTEGRATOR, "ARM-Integrator")
++	MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
++	BOOT_MEM(0x00000000, 0x16000000, 0xf1600000)
++	BOOT_PARAMS(0x00000100)
++	MAPIO(ap_map_io)
++	INITIRQ(ap_init_irq)
++MACHINE_END
+--- linux-2.6.0-test6/arch/arm/mach-integrator/Kconfig	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/arm/mach-integrator/Kconfig	2003-10-05 00:33:23.000000000 -0700
+@@ -1,8 +1,15 @@
+ menu "Integrator Options"
+ 	depends on ARCH_INTEGRATOR
+ 
++config ARCH_INTEGRATOR_AP
++	bool "Support Integrator/AP and Integrator/PP2 platforms"
++	help
++	  Include support for the ARM(R) Integrator/AP and
++	  Integrator/PP2 platforms.
++
+ config INTEGRATOR_IMPD1
+ 	tristate "Include support for Integrator/IM-PD1"
++	depends on ARCH_INTEGRATOR_AP
+ 	help
+ 	  The IM-PD1 is an add-on logic module for the Integrator which
+ 	  allows ARM(R) Ltd PrimeCells to be developed and evaluated.
+--- linux-2.6.0-test6/arch/arm/mach-integrator/Makefile	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/arm/mach-integrator/Makefile	2003-10-05 00:33:23.000000000 -0700
+@@ -4,9 +4,10 @@
+ 
+ # Object file lists.
+ 
+-obj-y			:= core.o lm.o time.o
++obj-y					:= core.o lm.o time.o
++obj-$(CONFIG_ARCH_INTEGRATOR_AP)	+= integrator_ap.o
+ 
+-obj-$(CONFIG_LEDS)	+= leds.o
+-obj-$(CONFIG_PCI)	+= pci_v3.o pci.o
++obj-$(CONFIG_LEDS)			+= leds.o
++obj-$(CONFIG_PCI)			+= pci_v3.o pci.o
+ obj-$(CONFIG_CPU_FREQ_INTEGRATOR)	+= cpu.o
+ obj-$(CONFIG_INTEGRATOR_IMPD1)		+= impd1.o
+--- linux-2.6.0-test6/arch/arm/mach-integrator/pci.c	2003-06-14 12:18:51.000000000 -0700
++++ 25/arch/arm/mach-integrator/pci.c	2003-10-05 00:33:23.000000000 -0700
+@@ -96,7 +96,7 @@ static u8 __init integrator_swizzle(stru
+ }
+ 
+ static int irq_tab[4] __initdata = {
+-	IRQ_PCIINT0,	IRQ_PCIINT1,	IRQ_PCIINT2,	IRQ_PCIINT3
++	IRQ_AP_PCIINT0,	IRQ_AP_PCIINT1,	IRQ_AP_PCIINT2,	IRQ_AP_PCIINT3
+ };
+ 
+ /*
+--- linux-2.6.0-test6/arch/arm/mach-integrator/pci_v3.c	2003-06-14 12:18:28.000000000 -0700
++++ 25/arch/arm/mach-integrator/pci_v3.c	2003-10-05 00:33:23.000000000 -0700
+@@ -575,7 +575,7 @@ void __init pci_v3_preinit(void)
+ 	/*
+ 	 * Grab the PCI error interrupt.
+ 	 */
+-	ret = request_irq(IRQ_V3INT, v3_irq, 0, "V3", NULL);
++	ret = request_irq(IRQ_AP_V3INT, v3_irq, 0, "V3", NULL);
+ 	if (ret)
+ 		printk(KERN_ERR "PCI: unable to grab PCI error "
+ 		       "interrupt: %d\n", ret);
+@@ -596,7 +596,7 @@ void __init pci_v3_postinit(void)
+ 	v3_writeb(V3_LB_IMASK, 0x68);
+ 
+ #if 0
+-	ret = request_irq(IRQ_LBUSTIMEOUT, lb_timeout, 0, "bus timeout", NULL);
++	ret = request_irq(IRQ_AP_LBUSTIMEOUT, lb_timeout, 0, "bus timeout", NULL);
+ 	if (ret)
+ 		printk(KERN_ERR "PCI: unable to grab local bus timeout "
+ 		       "interrupt: %d\n", ret);
+--- linux-2.6.0-test6/arch/arm/mach-pxa/irq.c	2003-06-14 12:18:33.000000000 -0700
++++ 25/arch/arm/mach-pxa/irq.c	2003-10-05 00:33:23.000000000 -0700
+@@ -58,7 +58,19 @@ static int pxa_gpio_irq_type(unsigned in
+ {
+ 	int gpio, idx;
+ 
+-	gpio = irq - ((irq >= IRQ_GPIO(2)) ? IRQ_GPIO(2) + 2 : IRQ_GPIO(0));
++	gpio = IRQ_TO_GPIO(irq);
++	idx = gpio >> 5;
++
++	if (type == IRQT_PROBE) {
++	    /* Don't mess with enabled GPIOs using preconfigured edges or
++	       GPIOs set to alternate function during probe */
++		if ((GPIO_IRQ_rising_edge[idx] | GPIO_IRQ_falling_edge[idx]) &
++		    GPIO_bit(gpio))
++			return 0;
++		if (GAFR(gpio) & (0x3 << (((gpio) & 0xf)*2)))
++			return 0;
++		type = __IRQT_RISEDGE | __IRQT_FALEDGE;
++	}
+ 
+ 	printk(KERN_DEBUG "IRQ%d (GPIO%d): ", irq, gpio);
+ 
+@@ -78,10 +90,8 @@ static int pxa_gpio_irq_type(unsigned in
+ 
+ 	printk("edges\n");
+ 
+-	idx = gpio >> 5;
+ 	GRER(gpio) = GPIO_IRQ_rising_edge[idx] & GPIO_IRQ_mask[idx];
+ 	GFER(gpio) = GPIO_IRQ_falling_edge[idx] & GPIO_IRQ_mask[idx];
+-
+ 	return 0;
+ }
+ 
+--- linux-2.6.0-test6/arch/arm/mach-pxa/leds.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/arm/mach-pxa/leds.c	2003-10-05 00:33:23.000000000 -0700
+@@ -7,6 +7,7 @@
+  *
+  * Copyright (c) 2001 Jeff Sutherland, Accelent Systems Inc.
+  */
++#include <linux/compiler.h>
+ #include <linux/init.h>
+ 
+ #include <asm/leds.h>
+--- linux-2.6.0-test6/arch/arm/mach-pxa/lubbock.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/arch/arm/mach-pxa/lubbock.c	2003-10-05 00:33:23.000000000 -0700
+@@ -78,7 +78,7 @@ static void __init lubbock_init_irq(void
+ 	pxa_init_irq();
+ 
+ 	/* setup extra lubbock irqs */
+-	for (irq = LUBBOCK_IRQ(0); irq <= LUBBOCK_IRQ(5); irq++) {
++	for (irq = LUBBOCK_IRQ(0); irq <= LUBBOCK_LAST_IRQ; irq++) {
+ 		set_irq_chip(irq, &lubbock_irq_chip);
+ 		set_irq_handler(irq, do_level_IRQ);
+ 		set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
+@@ -124,6 +124,7 @@ static struct map_desc lubbock_io_desc[]
+   { 0xf0000000, 0x08000000, 0x00100000, MT_DEVICE }, /* CPLD */
+   { 0xf1000000, 0x0c000000, 0x00100000, MT_DEVICE }, /* LAN91C96 IO */
+   { 0xf1100000, 0x0e000000, 0x00100000, MT_DEVICE }, /* LAN91C96 Attr */
++  { 0xf4000000, 0x10000000, 0x00800000, MT_DEVICE }, /* SA1111 */
+ };
+ 
+ static void __init lubbock_map_io(void)
+--- linux-2.6.0-test6/arch/arm/mach-pxa/pm.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/arm/mach-pxa/pm.c	2003-10-05 00:33:23.000000000 -0700
+@@ -11,13 +11,14 @@
+  * modify it under the terms of the GNU General Public License.
+  */
+ #include <linux/config.h>
++#include <linux/init.h>
++#include <linux/suspend.h>
+ #include <linux/errno.h>
+ #include <linux/time.h>
+ 
+ #include <asm/hardware.h>
+ #include <asm/memory.h>
+ #include <asm/system.h>
+-#include <asm/leds.h>
+ 
+ 
+ /*
+@@ -60,13 +61,16 @@ enum {	SLEEP_SAVE_START = 0,
+ };
+ 
+ 
+-int pm_do_suspend(void)
++static int pxa_pm_enter(u32 state)
+ {
+ 	unsigned long sleep_save[SLEEP_SAVE_SIZE];
+ 	unsigned long checksum = 0;
+ 	unsigned long delta;
+ 	int i;
+ 
++	if (state != PM_SUSPEND_MEM)
++		return -EINVAL;
++
+ 	/* preserve current time */
+ 	delta = xtime.tv_sec - RCNR;
+ 
+@@ -194,3 +198,37 @@ unsigned long sleep_phys_sp(void *sp)
+ {
+ 	return virt_to_phys(sp);
+ }
++
++/*
++ * Called after processes are frozen, but before we shut down devices.
++ */
++static int pxa_pm_prepare(u32 state)
++{
++	return 0;
++}
++
++/*
++ * Called after devices are re-setup, but before processes are thawed.
++ */
++static int pxa_pm_finish(u32 state)
++{
++	return 0;
++}
++
++/*
++ * Set to PM_DISK_FIRMWARE so we can quickly veto suspend-to-disk.
++ */
++static struct pm_ops pxa_pm_ops = {
++	.pm_disk_mode	= PM_DISK_FIRMWARE,
++	.prepare	= pxa_pm_prepare,
++	.enter		= pxa_pm_enter,
++	.finish		= pxa_pm_finish,
++};
++
++static int __init pxa_pm_init(void)
++{
++	pm_set_ops(&pxa_pm_ops);
++	return 0;
++}
++
++late_initcall(pxa_pm_init);
+--- linux-2.6.0-test6/arch/arm/mach-sa1100/leds.c	2003-09-08 13:58:55.000000000 -0700
++++ 25/arch/arm/mach-sa1100/leds.c	2003-10-05 00:33:23.000000000 -0700
+@@ -5,6 +5,7 @@
+  * 
+  * Copyright (C) 2001 Nicolas Pitre
+  */
++#include <linux/compiler.h>
+ #include <linux/init.h>
+ 
+ #include <asm/leds.h>
+--- linux-2.6.0-test6/arch/arm/mach-sa1100/pm.c	2003-09-08 13:58:55.000000000 -0700
++++ 25/arch/arm/mach-sa1100/pm.c	2003-10-05 00:33:23.000000000 -0700
+@@ -22,6 +22,8 @@
+  * 2002-05-27:	Nicolas Pitre	Killed sleep.h and the kmalloced save array.
+  * 				Storage is local on the stack now.
+  */
++#include <linux/init.h>
++#include <linux/suspend.h>
+ #include <linux/errno.h>
+ #include <linux/time.h>
+ 
+@@ -54,11 +56,14 @@ enum {	SLEEP_SAVE_SP = 0,
+ };
+ 
+ 
+-int pm_do_suspend(void)
++static int sa11x0_pm_enter(u32 state)
+ {
+ 	unsigned long sleep_save[SLEEP_SAVE_SIZE];
+ 	unsigned long delta, gpio;
+ 
++	if (state != PM_SUSPEND_MEM)
++		return -EINVAL;
++
+ 	/* preserve current time */
+ 	delta = xtime.tv_sec - RCNR;
+ 	gpio = GPLR;
+@@ -139,3 +144,37 @@ unsigned long sleep_phys_sp(void *sp)
+ {
+ 	return virt_to_phys(sp);
+ }
++
++/*
++ * Called after processes are frozen, but before we shut down devices.
++ */
++static int sa11x0_pm_prepare(u32 state)
++{
++	return 0;
++}
++
++/*
++ * Called after devices are re-setup, but before processes are thawed.
++ */
++static int sa11x0_pm_finish(u32 state)
++{
++	return 0;
++}
++
++/*
++ * Set to PM_DISK_FIRMWARE so we can quickly veto suspend-to-disk.
++ */
++static struct pm_ops sa11x0_pm_ops = {
++	.pm_disk_mode	= PM_DISK_FIRMWARE,
++	.prepare	= sa11x0_pm_prepare,
++	.enter		= sa11x0_pm_enter,
++	.finish		= sa11x0_pm_finish,
++};
++
++static int __init sa11x0_pm_init(void)
++{
++	pm_set_ops(&sa11x0_pm_ops);
++	return 0;
++}
++
++late_initcall(sa11x0_pm_init);
+--- linux-2.6.0-test6/arch/arm/Makefile	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/arm/Makefile	2003-10-05 00:33:23.000000000 -0700
+@@ -182,7 +182,6 @@ define archhelp
+   echo  '* zImage        - Compressed kernel image (arch/$(ARCH)/boot/zImage)'
+   echo  '  Image         - Uncompressed kernel image (arch/$(ARCH)/boot/Image)'
+   echo  '  bootpImage    - Combined zImage and initial RAM disk' 
+-  echo  '  initrd        - Create an initial image'
+   echo  '  install       - Install uncompressed kernel'
+   echo  '  zinstall      - Install compressed kernel'
+   echo  '                  Install using (your) ~/bin/installkernel or'
+--- linux-2.6.0-test6/arch/arm/mm/discontig.c	2003-06-14 12:18:31.000000000 -0700
++++ 25/arch/arm/mm/discontig.c	2003-10-05 00:34:40.000000000 -0700
+@@ -15,7 +15,7 @@
+ #include <linux/init.h>
+ #include <linux/bootmem.h>
+ 
+-#if NR_NODES != 4
++#if MAX_NUMNODES != 4
+ #error Fix Me Please
+ #endif
+ 
+@@ -23,9 +23,9 @@
+  * Our node_data structure for discontiguous memory.
+  */
+ 
+-static bootmem_data_t node_bootmem_data[NR_NODES];
++static bootmem_data_t node_bootmem_data[MAX_NUMNODES];
+ 
+-pg_data_t discontig_node_data[NR_NODES] = {
++pg_data_t discontig_node_data[MAX_NUMNODES] = {
+   { .bdata = &node_bootmem_data[0] },
+   { .bdata = &node_bootmem_data[1] },
+   { .bdata = &node_bootmem_data[2] },
+--- linux-2.6.0-test6/arch/arm/mm/init.c	2003-07-10 18:50:30.000000000 -0700
++++ 25/arch/arm/mm/init.c	2003-10-05 00:34:40.000000000 -0700
+@@ -33,12 +33,6 @@
+ #include <asm/mach/arch.h>
+ #include <asm/mach/map.h>
+ 
+-#ifndef CONFIG_DISCONTIGMEM
+-#define NR_NODES	1
+-#else
+-#define NR_NODES	4
+-#endif
+-
+ #ifdef CONFIG_CPU_32
+ #define TABLE_OFFSET	(PTRS_PER_PTE)
+ #else
+@@ -178,7 +172,7 @@ find_memend_and_nodes(struct meminfo *mi
+ {
+ 	unsigned int i, bootmem_pages = 0, memend_pfn = 0;
+ 
+-	for (i = 0; i < NR_NODES; i++) {
++	for (i = 0; i < MAX_NUMNODES; i++) {
+ 		np[i].start = -1U;
+ 		np[i].end = 0;
+ 		np[i].bootmap_pages = 0;
+@@ -207,7 +201,7 @@ find_memend_and_nodes(struct meminfo *mi
+ 			 * we have, we're in trouble.  (maybe we ought to
+ 			 * limit, instead of bugging?)
+ 			 */
+-			if (numnodes > NR_NODES)
++			if (numnodes > MAX_NUMNODES)
+ 				BUG();
+ 		}
+ 
+@@ -365,7 +359,7 @@ static inline void free_bootmem_node_ban
+  */
+ void __init bootmem_init(struct meminfo *mi)
+ {
+-	struct node_info node_info[NR_NODES], *np = node_info;
++	struct node_info node_info[MAX_NUMNODES], *np = node_info;
+ 	unsigned int bootmap_pages, bootmap_pfn, map_pg;
+ 	int node, initrd_node;
+ 
+--- linux-2.6.0-test6/arch/arm/mm/ioremap.c	2003-06-14 12:18:24.000000000 -0700
++++ 25/arch/arm/mm/ioremap.c	2003-10-05 00:33:23.000000000 -0700
+@@ -150,7 +150,7 @@ __ioremap(unsigned long phys_addr, size_
+ 	if (!area)
+ 		return NULL;
+ 	addr = area->addr;
+-	if (remap_area_pages(VMALLOC_VMADDR(addr), phys_addr, size, flags)) {
++	if (remap_area_pages((unsigned long) addr, phys_addr, size, flags)) {
+ 		vfree(addr);
+ 		return NULL;
+ 	}
+--- linux-2.6.0-test6/arch/cris/mm/ioremap.c	2003-07-10 18:50:30.000000000 -0700
++++ 25/arch/cris/mm/ioremap.c	2003-10-05 00:33:23.000000000 -0700
+@@ -157,7 +157,7 @@ void * __ioremap(unsigned long phys_addr
+ 	if (!area)
+ 		return NULL;
+ 	addr = area->addr;
+-	if (remap_area_pages(VMALLOC_VMADDR(addr), phys_addr, size, flags)) {
++	if (remap_area_pages((unsigned long) addr, phys_addr, size, flags)) {
+ 		vfree(addr);
+ 		return NULL;
+ 	}
+--- linux-2.6.0-test6/arch/h8300/README	2003-06-14 12:18:26.000000000 -0700
++++ 25/arch/h8300/README	2003-10-05 00:33:23.000000000 -0700
+@@ -16,7 +16,7 @@ H8S is planning.
+ 
+ 3.H8MAX 
+   Under development
+-  see http://www.strawbelly-linux.com (Japanese Only)
++  see http://www.strawberry-linux.com (Japanese Only)
+ 
+ * Toolchain Version
+ gcc-3.1 or higher and patch
+--- linux-2.6.0-test6/arch/i386/boot/setup.S	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/i386/boot/setup.S	2003-10-05 00:36:48.000000000 -0700
+@@ -162,7 +162,7 @@ cmd_line_ptr:	.long 0			# (Header versio
+ 					# can be located anywhere in
+ 					# low memory 0x10000 or higher.
+ 
+-ramdisk_max:	.long MAXMEM-1		# (Header version 0x0203 or later)
++ramdisk_max:	.long __MAXMEM-1	# (Header version 0x0203 or later)
+ 					# The highest safe address for
+ 					# the contents of an initrd
+ 
+--- linux-2.6.0-test6/arch/i386/Kconfig	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/i386/Kconfig	2003-10-05 00:36:48.000000000 -0700
+@@ -397,6 +397,54 @@ config X86_OOSTORE
+ 	depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6
+ 	default y
+ 
++config X86_4G
++	bool "4 GB kernel-space and 4 GB user-space virtual memory support"
++	help
++          This option is only useful for systems that have more than 1 GB
++          of RAM.
++
++          The default kernel VM layout leaves 1 GB of virtual memory for
++          kernel-space mappings, and 3 GB of VM for user-space applications.
++          This option ups both the kernel-space VM and the user-space VM to
++          4 GB.
++
++          The cost of this option is additional TLB flushes done at
++          system-entry points that transition from user-mode into kernel-mode.
++          I.e. system calls and page faults, and IRQs that interrupt user-mode
++          code. There's also additional overhead to kernel operations that copy
++          memory to/from user-space. The overhead from this is hard to tell and
++          depends on the workload - it can be anything from no visible overhead
++          to 20-30% overhead. A good rule of thumb is to count with a runtime
++          overhead of 20%.
++
++          The upside is the much increased kernel-space VM, which more than
++          quadruples the maximum amount of RAM supported. Kernels compiled with
++          this option boot on 64GB of RAM and still have more than 3.1 GB of
++          'lowmem' left. Another bonus is that highmem IO bouncing decreases,
++          if used with drivers that still use bounce-buffers.
++
++          There's also a 33% increase in user-space VM size - database
++          applications might see a boost from this.
++
++          But the cost of the TLB flushes and the runtime overhead has to be
++          weighed against the bonuses offered by the larger VM spaces. The
++          dividing line depends on the actual workload - there might be 4 GB
++          systems that benefit from this option. Systems with less than 4 GB
++          of RAM will rarely see a benefit from this option - but it's not
++          out of question, the exact circumstances have to be considered.
++
++config X86_SWITCH_PAGETABLES
++	def_bool X86_4G
++
++config X86_4G_VM_LAYOUT
++	def_bool X86_4G
++
++config X86_UACCESS_INDIRECT
++	def_bool X86_4G
++
++config X86_HIGH_ENTRY
++	def_bool X86_4G
++
+ config HPET_TIMER
+ 	bool "HPET Timer Support"
+ 	help
+@@ -793,7 +841,8 @@ config HAVE_DEC_LOCK
+ # Summit needs it only when NUMA is on
+ config BOOT_IOREMAP
+ 	bool
+-	depends on ((X86_SUMMIT || X86_GENERICARCH) && NUMA)
++	depends on X86_PC
++# depends on (((X86_SUMMIT || X86_GENERICARCH) && NUMA)) || X86_GENERICARCH
+ 	default y
+ 
+ endmenu
+@@ -1030,6 +1079,25 @@ config PCI_DIRECT
+  	depends on PCI && ((PCI_GODIRECT || PCI_GOANY) || X86_VISWS)
+ 	default y
+ 
++config PCI_USE_VECTOR
++	bool "Vector-based interrupt indexing"
++	depends on X86_LOCAL_APIC
++	default n
++	help
++	   This replaces the current existing IRQ-based index interrupt scheme
++	   with the vector-base index scheme. The advantages of vector base
++	   over IRQ base are listed below:
++	   1) Support MSI implementation.
++	   2) Support future IOxAPIC hotplug
++
++	   Note that this enables MSI, Message Signaled Interrupt, on all
++	   MSI capable device functions detected if users also install the
++	   MSI patch. Message Signal Interrupt enables an MSI-capable
++	   hardware device to send an inbound Memory Write on its PCI bus
++	   instead of asserting IRQ signal on device IRQ pin.
++
++	   If you don't know what to do here, say N.
++
+ source "drivers/pci/Kconfig"
+ 
+ config ISA
+@@ -1231,6 +1299,15 @@ config DEBUG_PAGEALLOC
+ 	  This results in a large slowdown, but helps to find certain types
+ 	  of memory corruptions.
+ 
++config SPINLINE
++	bool "Spinlock inlining"
++	depends on DEBUG_KERNEL
++	help
++	  This will change spinlocks from out of line to inline, making them
++	  account cost to the callers in readprofile, rather than the lock
++	  itself (as ".text.lock.filename"). This can be helpful for finding
++	  the callers of locks.
++
+ config DEBUG_HIGHMEM
+ 	bool "Highmem debugging"
+ 	depends on DEBUG_KERNEL && HIGHMEM
+@@ -1247,20 +1324,208 @@ config DEBUG_INFO
+ 	  Say Y here only if you plan to use gdb to debug the kernel.
+ 	  If you don't debug the kernel, you can say N.
+ 	  
++config LOCKMETER
++	bool "Kernel lock metering"
++	depends on SMP && !PREEMPT
++	help
++	  Say Y to enable kernel lock metering, which adds overhead to SMP locks,
++	  but allows you to see various statistics using the lockstat command.
++
+ config DEBUG_SPINLOCK_SLEEP
+ 	bool "Sleep-inside-spinlock checking"
+ 	help
+ 	  If you say Y here, various routines which may sleep will become very
+ 	  noisy if they are called with a spinlock held.	
+ 
++config KGDB
++	bool "Include kgdb kernel debugger"
++	depends on DEBUG_KERNEL
++	help
++	  If you say Y here, the system will be compiled with the debug
++	  option (-g) and a debugging stub will be included in the
++	  kernel.  This stub communicates with gdb on another (host)
++	  computer via a serial port.  The host computer should have
++	  access to the kernel binary file (vmlinux) and a serial port
++	  that is connected to the target machine.  Gdb can be made to
++	  configure the serial port or you can use stty and setserial to
++	  do this. See the 'target' command in gdb. This option also
++	  configures in the ability to request a breakpoint early in the
++	  boot process.  To request the breakpoint just include 'kgdb'
++	  as a boot option when booting the target machine.  The system
++	  will then break as soon as it looks at the boot options.  This
++	  option also installs a breakpoint in panic and sends any
++	  kernel faults to the debugger. For more information see the
++	  Documentation/i386/kgdb.txt file.
++
++choice
++	depends on KGDB
++    	prompt "Debug serial port BAUD"
++	default KGDB_115200BAUD
++	help
++	  Gdb and the kernel stub need to agree on the baud rate to be
++	  used.  Some systems (x86 family at this writing) allow this to
++	  be configured.
++
++config KGDB_9600BAUD
++	bool "9600"
++
++config KGDB_19200BAUD
++	bool "19200"
++
++config KGDB_38400BAUD
++	bool "38400"
++
++config KGDB_57600BAUD
++	bool "57600"
++
++config KGDB_115200BAUD
++	bool "115200"
++endchoice
++
++config KGDB_PORT
++	hex "hex I/O port address of the debug serial port"
++	depends on KGDB
++	default  3f8
++	help
++	  Some systems (x86 family at this writing) allow the port
++	  address to be configured.  The number entered is assumed to be
++	  hex, don't put 0x in front of it.  The standard address are:
++	  COM1 3f8 , irq 4 and COM2 2f8 irq 3.  Setserial /dev/ttySx
++	  will tell you what you have.  It is good to test the serial
++	  connection with a live system before trying to debug.
++
++config KGDB_IRQ
++	int "IRQ of the debug serial port"
++	depends on KGDB
++	default 4
++	help
++	  This is the irq for the debug port.  If everything is working
++	  correctly and the kernel has interrupts on a control C to the
++	  port should cause a break into the kernel debug stub.
++
++config DEBUG_INFO
++	bool
++	depends on KGDB
++	default y
++
++config KGDB_MORE
++	bool "Add any additional compile options"
++	depends on KGDB
++	default n
++	help
++	  Saying yes here turns on the ability to enter additional
++	  compile options.
++
++
++config KGDB_OPTIONS
++	depends on KGDB_MORE
++	string "Additional compile arguments"
++	default "-O1"
++	help
++	  This option allows you enter additional compile options for
++	  the whole kernel compile.  Each platform will have a default
++	  that seems right for it.  For example on PPC "-ggdb -O1", and
++	  for i386 "-O1".  Note that by configuring KGDB "-g" is already
++	  turned on.  In addition, on i386 platforms
++	  "-fomit-frame-pointer" is deleted from the standard compile
++	  options.
++
++config NO_KGDB_CPUS
++	int "Number of CPUs"
++	depends on KGDB && SMP
++	default NR_CPUS
++	help
++
++	  This option sets the number of cpus for kgdb ONLY.  It is used
++	  to prune some internal structures so they look "nice" when
++	  displayed with gdb.  This is to overcome possibly larger
++	  numbers that may have been entered above.  Enter the real
++	  number to get nice clean kgdb_info displays.
++
++config KGDB_TS
++	bool "Enable kgdb time stamp macros?"
++	depends on KGDB
++	default n
++	help
++	  Kgdb event macros allow you to instrument your code with calls
++	  to the kgdb event recording function.  The event log may be
++	  examined with gdb at a break point.  Turning on this
++	  capability also allows you to choose how many events to
++	  keep. Kgdb always keeps the lastest events.
++
++choice
++	depends on KGDB_TS
++	prompt "Max number of time stamps to save?"
++	default KGDB_TS_128
++
++config KGDB_TS_64
++	bool "64"
++
++config KGDB_TS_128
++	bool "128"
++
++config KGDB_TS_256
++	bool "256"
++
++config KGDB_TS_512
++	bool "512"
++
++config KGDB_TS_1024
++	bool "1024"
++
++endchoice
++
++config STACK_OVERFLOW_TEST
++	bool "Turn on kernel stack overflow testing?"
++	depends on KGDB
++	default n
++	help
++	  This option enables code in the front line interrupt handlers
++	  to check for kernel stack overflow on interrupts and system
++	  calls.  This is part of the kgdb code on x86 systems.
++
++config KGDB_CONSOLE
++	bool "Enable serial console thru kgdb port"
++	depends on KGDB
++	default n
++	help
++	  This option enables the command line "console=kgdb" option.
++	  When the system is booted with this option in the command line
++	  all kernel printk output is sent to gdb (as well as to other
++	  consoles).  For this to work gdb must be connected.  For this
++	  reason, this command line option will generate a breakpoint if
++	  gdb has not yet connected.  After the gdb continue command is
++	  given all pent up console output will be printed by gdb on the
++	  host machine.  Neither this option, nor KGDB require the
++	  serial driver to be configured.
++
++config KGDB_SYSRQ
++	bool "Turn on SysRq 'G' command to do a break?"
++	depends on KGDB
++	default y
++	help
++	  This option includes an option in the SysRq code that allows
++	  you to enter SysRq G which generates a breakpoint to the KGDB
++	  stub.  This will work if the keyboard is alive and can
++	  interrupt the system.  Because of constraints on when the
++	  serial port interrupt can be enabled, this code may allow you
++	  to interrupt the system before the serial port control C is
++	  available.  Just say yes here.
++
+ config FRAME_POINTER
+ 	bool "Compile the kernel with frame pointers"
++	default KGDB
+ 	help
+ 	  If you say Y here the resulting kernel image will be slightly larger
+ 	  and slower, but it will give very useful debugging information.
+ 	  If you don't debug the kernel, you can say N, but we may not be able
+ 	  to solve problems without frame pointers.
+ 
++config MAGIC_SYSRQ
++	bool
++	depends on KGDB_SYSRQ
++	default y
++
+ config X86_EXTRA_IRQS
+ 	bool
+ 	depends on X86_LOCAL_APIC || X86_VOYAGER
+@@ -1303,3 +1568,8 @@ config X86_TRAMPOLINE
+ 	bool
+ 	depends on SMP || X86_VISWS
+ 	default y
++
++config PC
++	bool
++	depends on X86 && !EMBEDDED
++	default y
+--- linux-2.6.0-test6/arch/i386/kernel/acpi/boot.c	2003-09-08 13:58:55.000000000 -0700
++++ 25/arch/i386/kernel/acpi/boot.c	2003-10-05 00:36:22.000000000 -0700
+@@ -26,6 +26,7 @@
+ #include <linux/init.h>
+ #include <linux/config.h>
+ #include <linux/acpi.h>
++#include <linux/efi.h>
+ #include <asm/pgalloc.h>
+ #include <asm/io_apic.h>
+ #include <asm/apic.h>
+@@ -183,8 +184,7 @@ acpi_parse_lapic_nmi (
+ 
+ #endif /*CONFIG_X86_LOCAL_APIC*/
+ 
+-#ifdef CONFIG_X86_IO_APIC
+-
++#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI_INTERPRETER)
+ 
+ static int __init
+ acpi_parse_ioapic (
+@@ -297,6 +297,10 @@ acpi_find_rsdp (void)
+ {
+ 	unsigned long		rsdp_phys = 0;
+ 
++	if (efi.acpi20)
++		return __pa(efi.acpi20);
++	else if (efi.acpi)
++		return __pa(efi.acpi);
+ 	/*
+ 	 * Scan memory looking for the RSDP signature. First search EBDA (low
+ 	 * memory) paragraphs and then search upper memory (E0000-FFFFF).
+@@ -368,7 +372,6 @@ acpi_boot_init (void)
+ 
+ 	result = acpi_table_parse(ACPI_APIC, acpi_parse_madt);
+ 	if (!result) {
+-		printk(KERN_WARNING PREFIX "MADT not present\n");
+ 		return 0;
+ 	}
+ 	else if (result < 0) {
+@@ -416,7 +419,7 @@ acpi_boot_init (void)
+ 
+ #endif /*CONFIG_X86_LOCAL_APIC*/
+ 
+-#ifdef CONFIG_X86_IO_APIC
++#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI_INTERPRETER)
+ 
+ 	/* 
+ 	 * I/O APIC 
+@@ -472,7 +475,8 @@ acpi_boot_init (void)
+ 	acpi_irq_model = ACPI_IRQ_MODEL_IOAPIC;
+ 
+ 	acpi_ioapic = 1;
+-#endif /*CONFIG_X86_IO_APIC*/
++
++#endif /* CONFIG_X86_IO_APIC && CONFIG_ACPI_INTERPRETER */
+ 
+ #ifdef CONFIG_X86_LOCAL_APIC
+ 	if (acpi_lapic && acpi_ioapic) {
+@@ -480,6 +484,7 @@ acpi_boot_init (void)
+ 		clustered_apic_check();
+ 	}
+ #endif
++
+ #ifdef CONFIG_HPET_TIMER
+ 	acpi_table_parse(ACPI_HPET, acpi_parse_hpet);
+ #endif
+--- linux-2.6.0-test6/arch/i386/kernel/asm-offsets.c	2003-06-14 12:18:07.000000000 -0700
++++ 25/arch/i386/kernel/asm-offsets.c	2003-10-05 00:36:48.000000000 -0700
+@@ -4,9 +4,11 @@
+  * to extract and format the required data.
+  */
+ 
++#include <linux/sched.h>
+ #include <linux/signal.h>
+ #include <asm/ucontext.h>
+ #include "sigframe.h"
++#include <asm/fixmap.h>
+ 
+ #define DEFINE(sym, val) \
+         asm volatile("\n->" #sym " %0 " #val : : "i" (val))
+@@ -28,4 +30,17 @@ void foo(void)
+ 
+ 	DEFINE(RT_SIGFRAME_sigcontext,
+ 	       offsetof (struct rt_sigframe, uc.uc_mcontext));
++	DEFINE(TI_task, offsetof (struct thread_info, task));
++	DEFINE(TI_exec_domain, offsetof (struct thread_info, exec_domain));
++	DEFINE(TI_flags, offsetof (struct thread_info, flags));
++	DEFINE(TI_preempt_count, offsetof (struct thread_info, preempt_count));
++	DEFINE(TI_addr_limit, offsetof (struct thread_info, addr_limit));
++	DEFINE(TI_real_stack, offsetof (struct thread_info, real_stack));
++	DEFINE(TI_virtual_stack, offsetof (struct thread_info, virtual_stack));
++	DEFINE(TI_user_pgd, offsetof (struct thread_info, user_pgd));
++
++	DEFINE(FIX_ENTRY_TRAMPOLINE_0_addr, __fix_to_virt(FIX_ENTRY_TRAMPOLINE_0));
++	DEFINE(FIX_VSYSCALL_addr, __fix_to_virt(FIX_VSYSCALL));
++	DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
++	DEFINE(task_thread_db7, offsetof (struct task_struct, thread.debugreg[7]));
+ }
+--- linux-2.6.0-test6/arch/i386/kernel/cpu/common.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/i386/kernel/cpu/common.c	2003-10-05 00:36:48.000000000 -0700
+@@ -510,16 +510,20 @@ void __init cpu_init (void)
+ 		BUG();
+ 	enter_lazy_tlb(&init_mm, current);
+ 
+-	load_esp0(t, thread->esp0);
+-	set_tss_desc(cpu,t);
++	t->esp0 = thread->esp0;
++	set_tss_desc(cpu, t);
+ 	cpu_gdt_table[cpu][GDT_ENTRY_TSS].b &= 0xfffffdff;
+ 	load_TR_desc();
+-	load_LDT(&init_mm.context);
++	if (cpu)
++		load_LDT(&init_mm.context);
+ 
+ 	/* Set up doublefault TSS pointer in the GDT */
+ 	__set_tss_desc(cpu, GDT_ENTRY_DOUBLEFAULT_TSS, &doublefault_tss);
+ 	cpu_gdt_table[cpu][GDT_ENTRY_DOUBLEFAULT_TSS].b &= 0xfffffdff;
+ 
++	if (cpu)
++		trap_init_virtual_GDT();
++
+ 	/* Clear %fs and %gs. */
+ 	asm volatile ("xorl %eax, %eax; movl %eax, %fs; movl %eax, %gs");
+ 
+--- linux-2.6.0-test6/arch/i386/kernel/cpu/cpufreq/acpi.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/i386/kernel/cpu/cpufreq/acpi.c	2003-10-05 00:33:23.000000000 -0700
+@@ -231,7 +231,7 @@ acpi_processor_set_performance (
+ 	int			state)
+ {
+ 	u16			port = 0;
+-	u8			value = 0;
++	u16			value = 0;
+ 	int			i = 0;
+ 	struct cpufreq_freqs    cpufreq_freqs;
+ 
+@@ -282,9 +282,9 @@ acpi_processor_set_performance (
+ 	value = (u16) perf->states[state].control;
+ 
+ 	ACPI_DEBUG_PRINT((ACPI_DB_INFO, 
+-		"Writing 0x%02x to port 0x%04x\n", value, port));
++		"Writing 0x%04x to port 0x%04x\n", value, port));
+ 
+-	outb(value, port); 
++	outw(value, port); 
+ 
+ 	/*
+ 	 * Then we read the 'status_register' and compare the value with the
+@@ -296,12 +296,12 @@ acpi_processor_set_performance (
+ 	port = perf->status_register;
+ 
+ 	ACPI_DEBUG_PRINT((ACPI_DB_INFO, 
+-		"Looking for 0x%02x from port 0x%04x\n",
+-		(u8) perf->states[state].status, port));
++		"Looking for 0x%04x from port 0x%04x\n",
++		(u16) perf->states[state].status, port));
+ 
+ 	for (i=0; i<100; i++) {
+-		value = inb(port);
+-		if (value == (u8) perf->states[state].status)
++		value = inw(port);
++		if (value == (u16) perf->states[state].status)
+ 			break;
+ 		udelay(10);
+ 	}
+@@ -309,7 +309,7 @@ acpi_processor_set_performance (
+ 	/* notify cpufreq */
+ 	cpufreq_notify_transition(&cpufreq_freqs, CPUFREQ_POSTCHANGE);
+ 
+-	if (value != perf->states[state].status) {
++	if (value != (u16) perf->states[state].status) {
+ 		unsigned int tmp = cpufreq_freqs.new;
+ 		cpufreq_freqs.new = cpufreq_freqs.old;
+ 		cpufreq_freqs.old = tmp;
+--- linux-2.6.0-test6/arch/i386/kernel/cpu/cpufreq/Kconfig	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/i386/kernel/cpu/cpufreq/Kconfig	2003-10-05 00:33:23.000000000 -0700
+@@ -88,6 +88,16 @@ config X86_POWERNOW_K7
+ 
+ 	  If in doubt, say N.
+ 
++config X86_POWERNOW_K8
++	tristate "AMD Opteron/Athlon64 PowerNow!"
++	depends on CPU_FREQ_TABLE
++	help
++	  This adds the CPUFreq driver for mobile AMD Opteron/Athlon64 processors.
++
++	  For details, take a look at linux/Documentation/cpu-freq. 
++
++	  If in doubt, say N.
++
+ config X86_GX_SUSPMOD
+ 	tristate "Cyrix MediaGX/NatSemi Geode Suspend Modulation"
+ 	depends on CPU_FREQ
+--- linux-2.6.0-test6/arch/i386/kernel/cpu/cpufreq/longhaul.c	2003-09-08 13:58:55.000000000 -0700
++++ 25/arch/i386/kernel/cpu/cpufreq/longhaul.c	2003-10-05 00:33:23.000000000 -0700
+@@ -70,21 +70,6 @@ static unsigned int calc_speed (int mult
+ }
+ 
+ 
+-static unsigned int longhaul_get_cpu_fsb (void)
+-{
+-	unsigned long lo, hi;
+-	unsigned int eblcr_fsb_table[] = { 66, 133, 100, -1 };
+-	unsigned int invalue=0;
+-
+-	if (fsb == 0) {
+-		rdmsr (MSR_IA32_EBL_CR_POWERON, lo, hi);
+-		invalue = (lo & (1<<18|1<<19)) >>18;
+-		fsb = eblcr_fsb_table[invalue];
+-	}
+-	return fsb;
+-}
+-
+-
+ static int longhaul_get_cpu_mult (void)
+ {
+ 	unsigned long invalue=0,lo, hi;
+@@ -168,7 +153,7 @@ static void longhaul_setstate (unsigned 
+ 		break;
+ 
+ 	/*
+-	 * Longhaul v3. (Ezra-T [C5M], Nehemiag [C5N])
++	 * Longhaul v3. (Ezra-T [C5M], Nehemiah [C5N])
+ 	 * This can also do voltage scaling, but see above.
+ 	 * Ezra-T was alleged to do FSB scaling too, but it never worked in practice.
+ 	 */
+@@ -193,6 +178,39 @@ static void longhaul_setstate (unsigned 
+ 	cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+ }
+ 
++/*
++ * Centaur decided to make life a little more tricky.
++ * Only longhaul v1 is allowed to read EBLCR BSEL[0:1].
++ * Samuel2 and above have to try and guess what the FSB is.
++ * We do this by assuming we booted at maximum multiplier, and interpolate
++ * between that value multiplied by possible FSBs and cpu_mhz which
++ * was calculated at boot time. Really ugly, but no other way to do this.
++ */
++static int _guess (int guess, int maxmult)
++{
++	int target;
++
++	target = ((maxmult/10)*guess);
++	if (maxmult%10 != 0)
++		target += (guess/2);
++	target &= ~0xf;
++	return target;
++}
++
++static int guess_fsb(int maxmult)
++{
++	int speed = (cpu_khz/1000) & ~0xf;
++	int i;
++	int speeds[3] = { 66, 100, 133 };
++
++	for (i=0; i<3; i++) {
++		if (_guess(speeds[i],maxmult) == speed)
++			return speeds[i];
++	}
++	return 0;
++}
++
++
+ 
+ static int __init longhaul_get_ranges (void)
+ {
+@@ -203,8 +221,8 @@ static int __init longhaul_get_ranges (v
+ 		-1,110,120,-1,135,115,125,105,130,150,160,140,-1,155,-1,145 };
+ 	unsigned int j, k = 0;
+ 	union msr_longhaul longhaul;
+-
+-	fsb = longhaul_get_cpu_fsb();
++	unsigned long lo, hi;
++	unsigned int eblcr_fsb_table[] = { 66, 133, 100, -1 };
+ 
+ 	switch (longhaul_version) {
+ 	case 1:
+@@ -212,6 +230,9 @@ static int __init longhaul_get_ranges (v
+ 		   Assume min=3.0x & max = whatever we booted at. */
+ 		minmult = 30;
+ 		maxmult = longhaul_get_cpu_mult();
++		rdmsr (MSR_IA32_EBL_CR_POWERON, lo, hi);
++		invalue = (lo & (1<<18|1<<19)) >>18;
++		fsb = eblcr_fsb_table[invalue];
+ 		break;
+ 
+ 	case 2 ... 3:
+@@ -222,14 +243,13 @@ static int __init longhaul_get_ranges (v
+ 			invalue += 16;
+ 		maxmult=multipliers[invalue];
+ 
+-#if 0
+ 		invalue = longhaul.bits.MinMHzBR;
+-		if (longhaul.bits.MinMHzBR4);
+-			invalue += 16;
+-		minmult = multipliers[invalue];
+-#else
+-		minmult = 30; /* as per spec */
+-#endif
++		if (longhaul.bits.MinMHzBR4 == 1)
++			minmult = 30;
++		else
++			minmult = multipliers[invalue];
++
++		fsb = guess_fsb(maxmult);
+ 		break;
+ 	}
+ 
+--- linux-2.6.0-test6/arch/i386/kernel/cpu/cpufreq/Makefile	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/i386/kernel/cpu/cpufreq/Makefile	2003-10-05 00:33:23.000000000 -0700
+@@ -1,5 +1,6 @@
+ obj-$(CONFIG_X86_POWERNOW_K6)	+= powernow-k6.o
+ obj-$(CONFIG_X86_POWERNOW_K7)	+= powernow-k7.o
++obj-$(CONFIG_X86_POWERNOW_K8)	+= powernow-k8.o
+ obj-$(CONFIG_X86_LONGHAUL)	+= longhaul.o
+ obj-$(CONFIG_X86_P4_CLOCKMOD)	+= p4-clockmod.o
+ obj-$(CONFIG_ELAN_CPUFREQ)	+= elanfreq.o
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/arch/i386/kernel/cpu/cpufreq/powernow-k8.c	2003-10-05 00:33:23.000000000 -0700
+@@ -0,0 +1,1020 @@
++/*
++ *   (c) 2003 Advanced Micro Devices, Inc.
++ *  Your use of this code is subject to the terms and conditions of the
++ *  GNU general public license version 2. See "../../../COPYING" or
++ *  http://www.gnu.org/licenses/gpl.html
++ *
++ *  Support : paul.devriendt@amd.com
++ *
++ *  Based on the powernow-k7.c module written by Dave Jones.
++ *  (C) 2003 Dave Jones <davej@codemonkey.ork.uk> on behalf of SuSE Labs
++ *  Licensed under the terms of the GNU GPL License version 2.
++ *  Based upon datasheets & sample CPUs kindly provided by AMD.
++ *
++ *  Processor information obtained from Chapter 9 (Power and Thermal Management)
++ *  of the "BIOS and Kernel Developer's Guide for the AMD Athlon 64 and AMD
++ *  Opteron Processors", revision 3.03, available for download from www.amd.com
++ *
++ */
++
++#include <linux/kernel.h>
++#include <linux/smp.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/cpufreq.h>
++#include <linux/slab.h>
++#include <linux/string.h>
++
++#include <asm/msr.h>
++#include <asm/io.h>
++#include <asm/delay.h>
++
++#define PFX "powernow-k8: "
++#define BFX PFX "BIOS error: "
++#define VERSION "version 1.00.08 - September 26, 2003"
++#include "powernow-k8.h"
++
++#ifdef CONFIG_PREEMPT
++#warning this driver has not been tested on a preempt system
++#endif
++
++static u32 vstable;	/* voltage stabalization time, from PSB, units 20 us */
++static u32 plllock;	/* pll lock time, from PSB, units 1 us */
++static u32 numps;	/* number of p-states, from PSB */
++static u32 rvo;		/* ramp voltage offset, from PSB */
++static u32 irt;		/* isochronous relief time, from PSB */
++static u32 vidmvs;	/* usable value calculated from mvs, from PSB */
++struct pst_s *ppst;	/* array of p states, valid for this part */
++static u32 currvid;	/* keep track of the current fid / vid */
++static u32 currfid;
++
++/*
++The PSB table supplied by BIOS allows for the definition of the number of
++p-states that can be used when running on a/c, and the number of p-states
++that can be used when running on battery. This allows laptop manufacturers
++to force the system to save power when running from battery. The relationship 
++is :
++   1 <= number_of_battery_p_states <= maximum_number_of_p_states
++
++This driver does NOT have the support in it to detect transitions from
++a/c power to battery power, and thus trigger the transition to a lower
++p-state if required. This is because I need ACPI and the 2.6 kernel to do 
++this, and this is a 2.4 kernel driver. Check back for a new improved driver
++for the 2.6 kernel soon.
++
++This code therefore assumes it is on battery at all times, and thus
++restricts performance to number_of_battery_p_states. For desktops, 
++  number_of_battery_p_states == maximum_number_of_pstates, 
++so this is not actually a restriction.
++*/
++
++static u32 batps;	/* limit on the number of p states when on battery */
++			/* - set by BIOS in the PSB/PST                    */
++
++static struct cpufreq_driver cpufreq_amd64_driver = {
++	.verify = drv_verify,
++	.target = drv_target,
++	.init = drv_cpu_init,
++	.name = "cpufreq-amd64",
++	.owner = THIS_MODULE,
++};
++
++#define SEARCH_UP     1
++#define SEARCH_DOWN   0
++
++/* Return a frequency in MHz, given an input fid */
++u32
++find_freq_from_fid(u32 fid)
++{
++	return 800 + (fid * 100);
++}
++
++/* Return a fid matching an input frequency in MHz */
++u32
++find_fid_from_freq(u32 freq)
++{
++	return (freq - 800) / 100;
++}
++
++/* Return the vco fid for an input fid */
++static u32
++convert_fid_to_vco_fid(u32 fid)
++{
++	if (fid < HI_FID_TABLE_BOTTOM) {
++		return 8 + (2 * fid);
++	} else {
++		return fid;
++	}
++}
++
++/* Sort the fid/vid frequency table into ascending order by fid. The spec */
++/* implies that it will be sorted by BIOS, but, it only implies it, and I */
++/* prefer not to trust when I can check.                                  */
++/* Yes, it is a simple bubble sort, but the PST is really small, so the   */
++/* choice of algorithm is pretty irrelevant.                              */
++static inline void
++sort_pst(struct pst_s *ppst, u32 numpstates)
++{
++	u32 i;
++	u8 tempfid;
++	u8 tempvid;
++	int swaps = 1;
++
++	while (swaps) {
++		swaps = 0;
++		for (i = 0; i < (numpstates - 1); i++) {
++			if (ppst[i].fid > ppst[i + 1].fid) {
++				swaps = 1;
++				tempfid = ppst[i].fid;
++				tempvid = ppst[i].vid;
++				ppst[i].fid = ppst[i + 1].fid;
++				ppst[i].vid = ppst[i + 1].vid;
++				ppst[i + 1].fid = tempfid;
++				ppst[i + 1].vid = tempvid;
++			}
++		}
++	}
++
++	return;
++}
++
++/* Return 1 if the pending bit is set. Unless we are actually just told the */
++/* processor to transition a state, seeing this bit set is really bad news. */
++static inline int
++pending_bit_stuck(void)
++{
++	u32 lo;
++	u32 hi;
++
++	rdmsr(MSR_FIDVID_STATUS, lo, hi);
++	return lo & MSR_S_LO_CHANGE_PENDING ? 1 : 0;
++}
++
++/* Update the global current fid / vid values from the status msr. Returns 1 */
++/* on error.                                                                 */
++static int
++query_current_values_with_pending_wait(void)
++{
++	u32 lo;
++	u32 hi;
++	u32 i = 0;
++
++	lo = MSR_S_LO_CHANGE_PENDING;
++	while (lo & MSR_S_LO_CHANGE_PENDING) {
++		if (i++ > 0x1000000) {
++			printk(KERN_ERR PFX "detected change pending stuck\n");
++			return 1;
++		}
++		rdmsr(MSR_FIDVID_STATUS, lo, hi);
++	}
++
++	currvid = hi & MSR_S_HI_CURRENT_VID;
++	currfid = lo & MSR_S_LO_CURRENT_FID;
++
++	return 0;
++}
++
++/* the isochronous relief time */
++static inline void
++count_off_irt(void)
++{
++	udelay((1 << irt) * 10);
++	return;
++}
++
++/* the voltage stabalization time */
++static inline void
++count_off_vst(void)
++{
++	udelay(vstable * VST_UNITS_20US);
++	return;
++}
++
++/* write the new fid value along with the other control fields to the msr */
++static int
++write_new_fid(u32 fid)
++{
++	u32 lo;
++	u32 savevid = currvid;
++
++	if ((fid & INVALID_FID_MASK) || (currvid & INVALID_VID_MASK)) {
++		printk(KERN_ERR PFX "internal error - overflow on fid write\n");
++		return 1;
++	}
++
++	lo = fid | (currvid << MSR_C_LO_VID_SHIFT) | MSR_C_LO_INIT_FID_VID;
++
++	dprintk(KERN_DEBUG PFX "writing fid %x, lo %x, hi %x\n",
++		fid, lo, plllock * PLL_LOCK_CONVERSION);
++
++	wrmsr(MSR_FIDVID_CTL, lo, plllock * PLL_LOCK_CONVERSION);
++
++	if (query_current_values_with_pending_wait())
++		return 1;
++
++	count_off_irt();
++
++	if (savevid != currvid) {
++		printk(KERN_ERR PFX
++		       "vid changed on fid transition, save %x, currvid %x\n",
++		       savevid, currvid);
++		return 1;
++	}
++
++	if (fid != currfid) {
++		printk(KERN_ERR PFX
++		       "fid transition failed, fid %x, currfid %x\n",
++		        fid, currfid);
++		return 1;
++	}
++
++	return 0;
++}
++
++/* Write a new vid to the hardware */
++static int
++write_new_vid(u32 vid)
++{
++	u32 lo;
++	u32 savefid = currfid;
++
++	if ((currfid & INVALID_FID_MASK) || (vid & INVALID_VID_MASK)) {
++		printk(KERN_ERR PFX "internal error - overflow on vid write\n");
++		return 1;
++	}
++
++	lo = currfid | (vid << MSR_C_LO_VID_SHIFT) | MSR_C_LO_INIT_FID_VID;
++
++	dprintk(KERN_DEBUG PFX "writing vid %x, lo %x, hi %x\n",
++		vid, lo, STOP_GRANT_5NS);
++
++	wrmsr(MSR_FIDVID_CTL, lo, STOP_GRANT_5NS);
++
++	if (query_current_values_with_pending_wait()) {
++		return 1;
++	}
++
++	if (savefid != currfid) {
++		printk(KERN_ERR PFX
++		       "fid changed on vid transition, save %x currfid %x\n",
++		       savefid, currfid);
++		return 1;
++	}
++
++	if (vid != currvid) {
++		printk(KERN_ERR PFX
++		       "vid transition failed, vid %x, currvid %x\n",
++		       vid, currvid);
++		return 1;
++	}
++
++	return 0;
++}
++
++/* Reduce the vid by the max of step or reqvid.                   */
++/* Decreasing vid codes represent increasing voltages :           */
++/* vid of 0 is 1.550V, vid of 0x1e is 0.800V, vid of 0x1f is off. */
++static int
++decrease_vid_code_by_step(u32 reqvid, u32 step)
++{
++	if ((currvid - reqvid) > step)
++		reqvid = currvid - step;
++
++	if (write_new_vid(reqvid))
++		return 1;
++
++	count_off_vst();
++
++	return 0;
++}
++
++/* Change the fid and vid, by the 3 phases. */
++static inline int
++transition_fid_vid(u32 reqfid, u32 reqvid)
++{
++	if (core_voltage_pre_transition(reqvid))
++		return 1;
++
++	if (core_frequency_transition(reqfid))
++		return 1;
++
++	if (core_voltage_post_transition(reqvid))
++		return 1;
++
++	if (query_current_values_with_pending_wait())
++		return 1;
++
++	if ((reqfid != currfid) || (reqvid != currvid)) {
++		printk(KERN_ERR PFX "failed: req 0x%x 0x%x, curr 0x%x 0x%x\n",
++		       reqfid, reqvid, currfid, currvid);
++		return 1;
++	}
++
++	dprintk(KERN_INFO PFX
++		"transitioned: new fid 0x%x, vid 0x%x\n", currfid, currvid);
++
++	return 0;
++}
++
++/* Phase 1 - core voltage transition ... setup appropriate voltage for the */
++/* fid transition.                                                         */
++static inline int
++core_voltage_pre_transition(u32 reqvid)
++{
++	u32 rvosteps = rvo;
++	u32 savefid = currfid;
++
++	dprintk(KERN_DEBUG PFX
++		"ph1: start, currfid 0x%x, currvid 0x%x, reqvid 0x%x, rvo %x\n",
++		currfid, currvid, reqvid, rvo);
++
++	while (currvid > reqvid) {
++		dprintk(KERN_DEBUG PFX "ph1: curr 0x%x, requesting vid 0x%x\n",
++			currvid, reqvid);
++		if (decrease_vid_code_by_step(reqvid, vidmvs))
++			return 1;
++	}
++
++	while (rvosteps > 0) {
++		if (currvid == 0) {
++			rvosteps = 0;
++		} else {
++			dprintk(KERN_DEBUG PFX
++				"ph1: changing vid for rvo, requesting 0x%x\n",
++				currvid - 1);
++			if (decrease_vid_code_by_step(currvid - 1, 1))
++				return 1;
++			rvosteps--;
++		}
++	}
++
++	if (query_current_values_with_pending_wait())
++		return 1;
++
++	if (savefid != currfid) {
++		printk(KERN_ERR PFX "ph1 err, currfid changed 0x%x\n", currfid);
++		return 1;
++	}
++
++	dprintk(KERN_DEBUG PFX "ph1 complete, currfid 0x%x, currvid 0x%x\n",
++		currfid, currvid);
++
++	return 0;
++}
++
++/* Phase 2 - core frequency transition */
++static inline int
++core_frequency_transition(u32 reqfid)
++{
++	u32 vcoreqfid;
++	u32 vcocurrfid;
++	u32 vcofiddiff;
++	u32 savevid = currvid;
++
++	if ((reqfid < HI_FID_TABLE_BOTTOM) && (currfid < HI_FID_TABLE_BOTTOM)) {
++		printk(KERN_ERR PFX "ph2 illegal lo-lo transition 0x%x 0x%x\n",
++		       reqfid, currfid);
++		return 1;
++	}
++
++	if (currfid == reqfid) {
++		printk(KERN_ERR PFX "ph2 null fid transition 0x%x\n", currfid);
++		return 0;
++	}
++
++	dprintk(KERN_DEBUG PFX
++		"ph2 starting, currfid 0x%x, currvid 0x%x, reqfid 0x%x\n",
++		currfid, currvid, reqfid);
++
++	vcoreqfid = convert_fid_to_vco_fid(reqfid);
++	vcocurrfid = convert_fid_to_vco_fid(currfid);
++	vcofiddiff = vcocurrfid > vcoreqfid ? vcocurrfid - vcoreqfid
++	    : vcoreqfid - vcocurrfid;
++
++	while (vcofiddiff > 2) {
++		if (reqfid > currfid) {
++			if (currfid > LO_FID_TABLE_TOP) {
++				if (write_new_fid(currfid + 2)) {
++					return 1;
++				}
++			} else {
++				if (write_new_fid
++				    (2 + convert_fid_to_vco_fid(currfid))) {
++					return 1;
++				}
++			}
++		} else {
++			if (write_new_fid(currfid - 2))
++				return 1;
++		}
++
++		vcocurrfid = convert_fid_to_vco_fid(currfid);
++		vcofiddiff = vcocurrfid > vcoreqfid ? vcocurrfid - vcoreqfid
++		    : vcoreqfid - vcocurrfid;
++	}
++
++	if (write_new_fid(reqfid))
++		return 1;
++
++	if (query_current_values_with_pending_wait())
++		return 1;
++
++	if (currfid != reqfid) {
++		printk(KERN_ERR PFX
++		       "ph2 mismatch, failed fid transition, curr %x, req %x\n",
++		       currfid, reqfid);
++		return 1;
++	}
++
++	if (savevid != currvid) {
++		printk(KERN_ERR PFX
++		       "ph2 vid changed, save %x, curr %x\n", savevid,
++		       currvid);
++		return 1;
++	}
++
++	dprintk(KERN_DEBUG PFX "ph2 complete, currfid 0x%x, currvid 0x%x\n",
++		currfid, currvid);
++
++	return 0;
++}
++
++/* Phase 3 - core voltage transition flow ... jump to the final vid. */
++static inline int
++core_voltage_post_transition(u32 reqvid)
++{
++	u32 savefid = currfid;
++	u32 savereqvid = reqvid;
++
++	dprintk(KERN_DEBUG PFX "ph3 starting, currfid 0x%x, currvid 0x%x\n",
++		currfid, currvid);
++
++	if (reqvid != currvid) {
++		if (write_new_vid(reqvid))
++			return 1;
++
++		if (savefid != currfid) {
++			printk(KERN_ERR PFX
++			       "ph3: bad fid change, save %x, curr %x\n",
++			       savefid, currfid);
++			return 1;
++		}
++
++		if (currvid != reqvid) {
++			printk(KERN_ERR PFX
++			       "ph3: failed vid transition\n, req %x, curr %x",
++			       reqvid, currvid);
++			return 1;
++		}
++	}
++
++	if (query_current_values_with_pending_wait())
++		return 1;
++
++	if (savereqvid != currvid) {
++		dprintk(KERN_ERR PFX "ph3 failed, currvid 0x%x\n", currvid);
++		return 1;
++	}
++
++	if (savefid != currfid) {
++		dprintk(KERN_ERR PFX "ph3 failed, currfid changed 0x%x\n",
++			currfid);
++		return 1;
++	}
++
++	dprintk(KERN_DEBUG PFX "ph3 complete, currfid 0x%x, currvid 0x%x\n",
++		currfid, currvid);
++
++	return 0;
++}
++
++static inline int
++check_supported_cpu(void)
++{
++	struct cpuinfo_x86 *c = cpu_data;
++	u32 eax, ebx, ecx, edx;
++
++	if (num_online_cpus() != 1) {
++		printk(KERN_INFO PFX "multiprocessor systems not supported\n");
++		return 0;
++	}
++
++	if (c->x86_vendor != X86_VENDOR_AMD) {
++		printk(KERN_INFO PFX "Not an AMD processor\n");
++		return 0;
++	}
++
++	eax = cpuid_eax(CPUID_PROCESSOR_SIGNATURE);
++	if ((eax & CPUID_XFAM_MOD) == ATHLON64_XFAM_MOD) {
++		dprintk(KERN_DEBUG PFX "AMD Althon 64 Processor found\n");
++		if ((eax & CPUID_F1_STEP) < ATHLON64_REV_C0) {
++			printk(KERN_INFO PFX "Revision C0 or better "
++			       "AMD Athlon 64 processor required\n");
++			return 0;
++		}
++	} else if ((eax & CPUID_XFAM_MOD) == OPTERON_XFAM_MOD) {
++		dprintk(KERN_DEBUG PFX "AMD Opteron Processor found\n");
++	} else {
++		printk(KERN_INFO PFX
++		       "AMD Athlon 64 or AMD Opteron processor required\n");
++		return 0;
++	}
++
++	eax = cpuid_eax(CPUID_GET_MAX_CAPABILITIES);
++	if (eax < CPUID_FREQ_VOLT_CAPABILITIES) {
++		printk(KERN_INFO PFX
++		       "No frequency change capabilities detected\n");
++		return 0;
++	}
++
++	cpuid(CPUID_FREQ_VOLT_CAPABILITIES, &eax, &ebx, &ecx, &edx);
++	if ((edx & P_STATE_TRANSITION_CAPABLE) != P_STATE_TRANSITION_CAPABLE) {
++		printk(KERN_INFO PFX "Power state transitions not supported\n");
++		return 0;
++	}
++
++	printk(KERN_INFO PFX "Found AMD Athlon 64 / Opteron processor "
++	       "supporting p-state transitions\n");
++
++	return 1;
++}
++
++/* Find and validate the PSB/PST table in BIOS. */
++static inline int
++find_psb_table(void)
++{
++	struct psb_s *psb;
++	struct pst_s *pst;
++	unsigned i, j;
++	u32 lastfid;
++	u32 mvs;
++	u8 maxvid;
++
++	for (i = 0xc0000; i < 0xffff0; i += 0x10) {
++		/* Scan BIOS looking for the signature. */
++		/* It can not be at ffff0 - it is too big. */
++
++		psb = phys_to_virt(i);
++		if (memcmp(psb, PSB_ID_STRING, PSB_ID_STRING_LEN) != 0)
++			continue;
++
++		dprintk(KERN_DEBUG PFX "found PSB header at 0x%p\n", psb);
++
++		dprintk(KERN_DEBUG PFX "table vers: 0x%x\n", psb->tableversion);
++		if (psb->tableversion != PSB_VERSION_1_4) {
++			printk(KERN_INFO BFX "PSB table is not v1.4\n");
++			return -ENODEV;
++		}
++
++		dprintk(KERN_DEBUG PFX "flags: 0x%x\n", psb->flags1);
++		if (psb->flags1) {
++			printk(KERN_ERR BFX "unknown flags\n");
++			return -ENODEV;
++		}
++
++		vstable = psb->voltagestabilizationtime;
++		printk(KERN_INFO PFX "voltage stable time: %d (units 20us)\n",
++		       vstable);
++
++		dprintk(KERN_DEBUG PFX "flags2: 0x%x\n", psb->flags2);
++		rvo = psb->flags2 & 3;
++		irt = ((psb->flags2) >> 2) & 3;
++		mvs = ((psb->flags2) >> 4) & 3;
++		vidmvs = 1 << mvs;
++		batps = ((psb->flags2) >> 6) & 3;
++		printk(KERN_INFO PFX "p states on battery: %d ", batps);
++		switch (batps) {
++		case 0:
++			printk("- all available\n");
++			break;
++		case 1:
++			printk("- only the minimum\n");
++			break;
++		case 2:
++			printk("- only the 2 lowest\n");
++			break;
++		case 3:
++			printk("- only the 3 lowest\n");
++			break;
++		}
++		printk(KERN_INFO PFX "ramp voltage offset: %d\n", rvo);
++		printk(KERN_INFO PFX "isochronous relief time: %d\n", irt);
++		printk(KERN_INFO PFX "maximum voltage step: %d\n", mvs);
++
++		dprintk(KERN_DEBUG PFX "numpst: 0x%x\n", psb->numpst);
++		if (psb->numpst != 1) {
++			printk(KERN_ERR BFX "numpst must be 1\n");
++			return -ENODEV;
++		}
++
++		dprintk(KERN_DEBUG PFX "cpuid: 0x%x\n", psb->cpuid);
++
++		plllock = psb->plllocktime;
++		printk(KERN_INFO PFX "pll lock time: 0x%x\n", plllock);
++
++		maxvid = psb->maxvid;
++		printk(KERN_INFO PFX "maxfid: 0x%x\n", psb->maxfid);
++		printk(KERN_INFO PFX "maxvid: 0x%x\n", maxvid);
++
++		numps = psb->numpstates;
++		printk(KERN_INFO PFX "numpstates: 0x%x\n", numps);
++		if (numps < 2) {
++			printk(KERN_ERR BFX "no p states to transition\n");
++			return -ENODEV;
++		}
++
++		if (batps == 0) {
++			batps = numps;
++		} else if (batps > numps) {
++			printk(KERN_ERR BFX "batterypstates > numpstates\n");
++			batps = numps;
++		} else {
++			printk(KERN_ERR PFX
++			       "Restricting operation to %d p-states\n", batps);
++			printk(KERN_ERR PFX
++			       "Check for an updated driver to access all "
++			       "%d p-states\n", numps);
++		}
++
++		if ((numps <= 1) || (batps <= 1)) {
++			printk(KERN_ERR PFX "only 1 p-state to transition\n");
++			return -ENODEV;
++		}
++
++		ppst = kmalloc(sizeof (struct pst_s) * numps, GFP_KERNEL);
++		if (!ppst) {
++			printk(KERN_ERR PFX "ppst memory alloc failure\n");
++			return -ENOMEM;
++		}
++
++		pst = (struct pst_s *) (psb + 1);
++		for (j = 0; j < numps; j++) {
++			ppst[j].fid = pst[j].fid;
++			ppst[j].vid = pst[j].vid;
++			printk(KERN_INFO PFX
++			       "   %d : fid 0x%x, vid 0x%x\n", j,
++			       ppst[j].fid, ppst[j].vid);
++		}
++		sort_pst(ppst, numps);
++
++		lastfid = ppst[0].fid;
++		if (lastfid > LO_FID_TABLE_TOP)
++			printk(KERN_INFO BFX "first fid not in lo freq tbl\n");
++
++		if ((lastfid > MAX_FID) || (lastfid & 1) || (ppst[0].vid > LEAST_VID)) {
++			printk(KERN_ERR BFX "first fid/vid bad (0x%x - 0x%x)\n",
++			       lastfid, ppst[0].vid);
++			kfree(ppst);
++			return -ENODEV;
++		}
++
++		for (j = 1; j < numps; j++) {
++			if ((lastfid >= ppst[j].fid)
++			    || (ppst[j].fid & 1)
++			    || (ppst[j].fid < HI_FID_TABLE_BOTTOM)
++			    || (ppst[j].fid > MAX_FID)
++			    || (ppst[j].vid > LEAST_VID)) {
++				printk(KERN_ERR BFX
++				       "invalid fid/vid in pst(%x %x)\n",
++				       ppst[j].fid, ppst[j].vid);
++				kfree(ppst);
++				return -ENODEV;
++			}
++			lastfid = ppst[j].fid;
++		}
++
++		for (j = 0; j < numps; j++) {
++			if (ppst[j].vid < rvo) {	/* vid+rvo >= 0 */
++				printk(KERN_ERR BFX
++				       "0 vid exceeded with pstate %d\n", j);
++				return -ENODEV;
++			}
++			if (ppst[j].vid < maxvid+rvo) { /* vid+rvo >= maxvid */
++				printk(KERN_ERR BFX
++				       "maxvid exceeded with pstate %d\n", j);
++				return -ENODEV;
++			}
++		}
++
++		if (query_current_values_with_pending_wait()) {
++			kfree(ppst);
++			return -EIO;
++		}
++
++		printk(KERN_INFO PFX "currfid 0x%x, currvid 0x%x\n",
++		       currfid, currvid);
++
++		for (j = 0; j < numps; j++)
++			if ((ppst[j].fid==currfid) && (ppst[j].vid==currvid))
++				return (0);
++
++		printk(KERN_ERR BFX "currfid/vid do not match PST, ignoring\n");
++		return 0;
++	}
++
++	printk(KERN_ERR BFX "no PSB\n");
++	return -ENODEV;
++}
++
++/* Converts a frequency (that might not necessarily be a multiple of 200) */
++/* to a fid.                                                              */
++u32
++find_closest_fid(u32 freq, int searchup)
++{
++	if (searchup == SEARCH_UP)
++		freq += MIN_FREQ_RESOLUTION - 1;
++
++	freq = (freq / MIN_FREQ_RESOLUTION) * MIN_FREQ_RESOLUTION;
++
++	if (freq < MIN_FREQ)
++		freq = MIN_FREQ;
++	else if (freq > MAX_FREQ)
++		freq = MAX_FREQ;
++
++	return find_fid_from_freq(freq);
++}
++
++static int
++find_match(u32 * ptargfreq, u32 * pmin, u32 * pmax, int searchup, u32 * pfid,
++	   u32 * pvid)
++{
++	u32 availpstates = batps;
++	u32 targfid = find_closest_fid(*ptargfreq, searchup);
++	u32 minfid = find_closest_fid(*pmin, SEARCH_DOWN);
++	u32 maxfid = find_closest_fid(*pmax, SEARCH_UP);
++	u32 minidx = 0;
++	u32 maxidx = availpstates - 1;
++	u32 targidx = 0xffffffff;
++	int i;
++
++	dprintk(KERN_DEBUG PFX "find match: freq %d MHz, min %d, max %d\n",
++		*ptargfreq, *pmin, *pmax);
++
++	/* Restrict values to the frequency choices in the PST */
++	if (minfid < ppst[0].fid)
++		minfid = ppst[0].fid;
++	if (maxfid > ppst[maxidx].fid)
++		maxfid = ppst[maxidx].fid;
++
++	/* Find appropriate PST index for the minimim fid */
++	for (i = 0; i < (int) availpstates; i++) {
++		if (minfid >= ppst[i].fid)
++			minidx = i;
++	}
++
++	/* Find appropriate PST index for the maximum fid */
++	for (i = availpstates - 1; i >= 0; i--) {
++		if (maxfid <= ppst[i].fid)
++			maxidx = i;
++	}
++
++	if (minidx > maxidx)
++		maxidx = minidx;
++
++	/* Frequency ids are now constrained by limits matching PST entries */
++	minfid = ppst[minidx].fid;
++	maxfid = ppst[maxidx].fid;
++
++	/* Limit the target frequency to these limits */
++	if (targfid < minfid)
++		targfid = minfid;
++	else if (targfid > maxfid)
++		targfid = maxfid;
++
++	/* Find the best target index into the PST, contrained by the range */
++	if (searchup == SEARCH_UP) {
++		for (i = maxidx; i >= (int) minidx; i--) {
++			if (targfid <= ppst[i].fid)
++				targidx = i;
++		}
++	} else {
++		for (i = minidx; i <= (int) maxidx; i++) {
++			if (targfid >= ppst[i].fid)
++				targidx = i;
++		}
++	}
++
++	if (targidx == 0xffffffff) {
++		printk(KERN_ERR PFX "could not find target\n");
++		return 1;
++	}
++
++	*pmin = find_freq_from_fid(minfid);
++	*pmax = find_freq_from_fid(maxfid);
++	*ptargfreq = find_freq_from_fid(ppst[targidx].fid);
++
++	if (pfid)
++		*pfid = ppst[targidx].fid;
++	if (pvid)
++		*pvid = ppst[targidx].vid;
++
++	return 0;
++}
++
++/* Take a frequency, and issue the fid/vid transition command */
++static inline int
++transition_frequency(u32 * preq, u32 * pmin, u32 * pmax, u32 searchup)
++{
++	u32 fid;
++	u32 vid;
++	int res;
++	struct cpufreq_freqs freqs;
++
++	if (find_match(preq, pmin, pmax, searchup, &fid, &vid))
++		return 1;
++
++	dprintk(KERN_DEBUG PFX "table matched fid 0x%x, giving vid 0x%x\n",
++		fid, vid);
++
++	if (query_current_values_with_pending_wait())
++		return 1;
++
++	if ((currvid == vid) && (currfid == fid)) {
++		dprintk(KERN_DEBUG PFX
++			"target matches current values (fid 0x%x, vid 0x%x)\n",
++			fid, vid);
++		return 0;
++	}
++
++	if ((fid < HI_FID_TABLE_BOTTOM) && (currfid < HI_FID_TABLE_BOTTOM)) {
++		printk(KERN_ERR PFX
++		       "ignoring illegal change in lo freq table-%x to %x\n",
++		       currfid, fid);
++		return 1;
++	}
++
++	dprintk(KERN_DEBUG PFX "changing to fid 0x%x, vid 0x%x\n", fid, vid);
++
++	freqs.cpu = 0;	/* only true because SMP not supported */
++
++	freqs.old = find_freq_from_fid(currfid);
++	freqs.new = find_freq_from_fid(fid);
++	cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
++
++	res = transition_fid_vid(fid, vid);
++
++	freqs.new = find_freq_from_fid(currfid);
++	cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
++
++	return res;
++}
++
++/* Driver entry point to switch to the target frequency */
++static int
++drv_target(struct cpufreq_policy *pol, unsigned targfreq, unsigned relation)
++{
++	u32 checkfid = currfid;
++	u32 checkvid = currvid;
++	u32 reqfreq = targfreq / 1000;
++	u32 minfreq = pol->min / 1000;
++	u32 maxfreq = pol->max / 1000;
++
++	if (ppst == 0) {
++		printk(KERN_ERR PFX "targ: ppst 0\n");
++		return -ENODEV;
++	}
++
++	if (pending_bit_stuck()) {
++		printk(KERN_ERR PFX "drv targ fail: change pending bit set\n");
++		return -EIO;
++	}
++
++	dprintk(KERN_DEBUG PFX "targ: %d kHz, min %d, max %d, relation %d\n",
++		targfreq, pol->min, pol->max, relation);
++
++	if (query_current_values_with_pending_wait())
++		return -EIO;
++
++	dprintk(KERN_DEBUG PFX "targ: curr fid 0x%x, vid 0x%x\n",
++		currfid, currvid);
++
++	if ((checkvid != currvid) || (checkfid != currfid)) {
++		printk(KERN_ERR PFX
++		       "error - out of sync, fid 0x%x 0x%x, vid 0x%x 0x%x\n",
++		       checkfid, currfid, checkvid, currvid);
++	}
++
++	if (transition_frequency(&reqfreq, &minfreq, &maxfreq,
++				 relation ==
++				 CPUFREQ_RELATION_H ? SEARCH_UP : SEARCH_DOWN))
++	{
++		printk(KERN_ERR PFX "transition frequency failed\n");
++		return 1;
++	}
++
++	pol->cur = 1000 * find_freq_from_fid(currfid);
++
++	return 0;
++}
++
++/* Driver entry point to verify the policy and range of frequencies */
++static int
++drv_verify(struct cpufreq_policy *pol)
++{
++	u32 min = pol->min / 1000;
++	u32 max = pol->max / 1000;
++	u32 targ = min;
++	int res;
++
++	if (ppst == 0) {
++		printk(KERN_ERR PFX "verify - ppst 0\n");
++		return -ENODEV;
++	}
++
++	if (pending_bit_stuck()) {
++		printk(KERN_ERR PFX "failing verify, change pending bit set\n");
++		return -EIO;
++	}
++
++	dprintk(KERN_DEBUG PFX
++		"ver: cpu%d, min %d, max %d, cur %d, pol %d\n", pol->cpu,
++		pol->min, pol->max, pol->cur, pol->policy);
++
++	if (pol->cpu != 0) {
++		printk(KERN_ERR PFX "verify - cpu not 0\n");
++		return -ENODEV;
++	}
++
++	res = find_match(&targ, &min, &max,
++			 pol->policy == CPUFREQ_POLICY_POWERSAVE ?
++			 SEARCH_DOWN : SEARCH_UP, 0, 0);
++	if (!res) {
++		pol->min = min * 1000;
++		pol->max = max * 1000;
++	}
++	return res;
++}
++
++/* per CPU init entry point to the driver */
++static int __init
++drv_cpu_init(struct cpufreq_policy *pol)
++{
++	if (pol->cpu != 0) {
++		printk(KERN_ERR PFX "init not cpu 0\n");
++		return -ENODEV;
++	}
++
++	pol->policy = CPUFREQ_POLICY_PERFORMANCE; /* boot as fast as we can */
++
++	/* Take a crude guess here. */
++	pol->cpuinfo.transition_latency = ((rvo + 8) * vstable * VST_UNITS_20US)
++	    + (3 * (1 << irt) * 10);
++
++	if (query_current_values_with_pending_wait())
++		return -EIO;
++
++	pol->cur = 1000 * find_freq_from_fid(currfid);
++	dprintk(KERN_DEBUG PFX "policy current frequency %d kHz\n", pol->cur);
++
++	/* min/max the cpu is capable of */
++	pol->cpuinfo.min_freq = 1000 * find_freq_from_fid(ppst[0].fid);
++	pol->cpuinfo.max_freq = 1000 * find_freq_from_fid(ppst[numps-1].fid);
++	pol->min = 1000 * find_freq_from_fid(ppst[0].fid);
++	pol->max = 1000 * find_freq_from_fid(ppst[batps - 1].fid);
++
++	printk(KERN_INFO PFX "cpu_init done, current fid 0x%x, vid 0x%x\n",
++	       currfid, currvid);
++
++	return 0;
++}
++
++/* driver entry point for init */
++static int __init
++drv_init(void)
++{
++	int rc;
++
++	printk(KERN_INFO PFX VERSION "\n");
++
++	if (check_supported_cpu() == 0)
++		return -ENODEV;
++
++	rc = find_psb_table();
++	if (rc)
++		return rc;
++
++	if (pending_bit_stuck()) {
++		printk(KERN_ERR PFX "drv_init fail, change pending bit set\n");
++		kfree(ppst);
++		return -EIO;
++	}
++
++	return cpufreq_register_driver(&cpufreq_amd64_driver);
++}
++
++/* driver entry point for term */
++static void __exit
++drv_exit(void)
++{
++	dprintk(KERN_INFO PFX "drv_exit\n");
++
++	cpufreq_unregister_driver(&cpufreq_amd64_driver);
++	kfree(ppst);
++}
++
++MODULE_AUTHOR("Paul Devriendt <paul.devriendt@amd.com>");
++MODULE_DESCRIPTION("AMD Athlon 64 and Opteron processor frequency driver.");
++MODULE_LICENSE("GPL");
++
++module_init(drv_init);
++module_exit(drv_exit);
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/arch/i386/kernel/cpu/cpufreq/powernow-k8.h	2003-10-05 00:33:23.000000000 -0700
+@@ -0,0 +1,126 @@
++/*
++ *   (c) 2003 Advanced Micro Devices, Inc.
++ *  Your use of this code is subject to the terms and conditions of the
++ *  GNU general public license version 2. See "../../../COPYING" or
++ *  http://www.gnu.org/licenses/gpl.html
++ */
++
++/* processor's cpuid instruction support */
++#define CPUID_PROCESSOR_SIGNATURE             1	/* function 1               */
++#define CPUID_F1_FAM                 0x00000f00	/* family mask              */
++#define CPUID_F1_XFAM                0x0ff00000	/* extended family mask     */
++#define CPUID_F1_MOD                 0x000000f0	/* model mask               */
++#define CPUID_F1_STEP                0x0000000f	/* stepping level mask      */
++#define CPUID_XFAM_MOD               0x0ff00ff0	/* xtended fam, fam + model */
++#define ATHLON64_XFAM_MOD            0x00000f40	/* xtended fam, fam + model */
++#define OPTERON_XFAM_MOD             0x00000f50	/* xtended fam, fam + model */
++#define ATHLON64_REV_C0                       8
++#define CPUID_GET_MAX_CAPABILITIES   0x80000000
++#define CPUID_FREQ_VOLT_CAPABILITIES 0x80000007
++#define P_STATE_TRANSITION_CAPABLE            6
++
++/* Model Specific Registers for p-state transitions. MSRs are 64-bit. For     */
++/* writes (wrmsr - opcode 0f 30), the register number is placed in ecx, and   */
++/* the value to write is placed in edx:eax. For reads (rdmsr - opcode 0f 32), */
++/* the register number is placed in ecx, and the data is returned in edx:eax. */
++
++#define MSR_FIDVID_CTL      0xc0010041
++#define MSR_FIDVID_STATUS   0xc0010042
++
++/* Field definitions within the FID VID Low Control MSR : */
++#define MSR_C_LO_INIT_FID_VID     0x00010000
++#define MSR_C_LO_NEW_VID          0x00001f00
++#define MSR_C_LO_NEW_FID          0x0000002f
++#define MSR_C_LO_VID_SHIFT        8
++
++/* Field definitions within the FID VID High Control MSR : */
++#define MSR_C_HI_STP_GNT_TO       0x000fffff
++
++/* Field definitions within the FID VID Low Status MSR : */
++#define MSR_S_LO_CHANGE_PENDING   0x80000000	/* cleared when completed */
++#define MSR_S_LO_MAX_RAMP_VID     0x1f000000
++#define MSR_S_LO_MAX_FID          0x003f0000
++#define MSR_S_LO_START_FID        0x00003f00
++#define MSR_S_LO_CURRENT_FID      0x0000003f
++
++/* Field definitions within the FID VID High Status MSR : */
++#define MSR_S_HI_MAX_WORKING_VID  0x001f0000
++#define MSR_S_HI_START_VID        0x00001f00
++#define MSR_S_HI_CURRENT_VID      0x0000001f
++
++/* fids (frequency identifiers) are arranged in 2 tables - lo and hi */
++#define LO_FID_TABLE_TOP     6
++#define HI_FID_TABLE_BOTTOM  8
++
++#define LO_VCOFREQ_TABLE_TOP    1400	/* corresponding vco frequency values */
++#define HI_VCOFREQ_TABLE_BOTTOM 1600
++
++#define MIN_FREQ_RESOLUTION  200 /* fids jump by 2 matching freq jumps by 200 */
++
++#define MAX_FID 0x2a	/* Spec only gives FID values as far as 5 GHz */
++
++#define LEAST_VID 0x1e	/* Lowest (numerically highest) useful vid value */
++
++#define MIN_FREQ 800	/* Min and max freqs, per spec */
++#define MAX_FREQ 5000
++
++#define INVALID_FID_MASK 0xffffffc1  /* not a valid fid if these bits are set */
++
++#define INVALID_VID_MASK 0xffffffe0  /* not a valid vid if these bits are set */
++
++#define STOP_GRANT_5NS 1 /* min poss memory access latency for voltage change */
++
++#define PLL_LOCK_CONVERSION (1000/5) /* ms to ns, then divide by clock period */
++
++#define MAXIMUM_VID_STEPS 1  /* Current cpus only allow a single step of 25mV */
++
++#define VST_UNITS_20US 20   /* Voltage Stabalization Time is in units of 20us */
++
++/*
++Version 1.4 of the PSB table. This table is constructed by BIOS and is
++to tell the OS's power management driver which VIDs and FIDs are
++supported by this particular processor. This information is obtained from
++the data sheets for each processor model by the system vendor and
++incorporated into the BIOS.
++If the data in the PSB / PST is wrong, then this driver will program the
++wrong values into hardware, which is very likely to lead to a crash.
++*/
++
++#define PSB_ID_STRING      "AMDK7PNOW!"
++#define PSB_ID_STRING_LEN  10
++
++#define PSB_VERSION_1_4  0x14
++
++struct psb_s {
++	u8 signature[10];
++	u8 tableversion;
++	u8 flags1;
++	u16 voltagestabilizationtime;
++	u8 flags2;
++	u8 numpst;
++	u32 cpuid;
++	u8 plllocktime;
++	u8 maxfid;
++	u8 maxvid;
++	u8 numpstates;
++};
++
++/* Pairs of fid/vid values are appended to the version 1.4 PSB table. */
++struct pst_s {
++	u8 fid;
++	u8 vid;
++};
++
++#ifdef DEBUG
++#define dprintk(msg...) printk(msg)
++#else
++#define dprintk(msg...) do { } while(0)
++#endif
++
++static inline int core_voltage_pre_transition(u32 reqvid);
++static inline int core_voltage_post_transition(u32 reqvid);
++static inline int core_frequency_transition(u32 reqfid);
++static int drv_verify(struct cpufreq_policy *pol);
++static int drv_target(struct cpufreq_policy *pol, unsigned targfreq,
++		      unsigned relation);
++static int __init drv_cpu_init(struct cpufreq_policy *pol);
+--- linux-2.6.0-test6/arch/i386/kernel/cpu/intel.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/i386/kernel/cpu/intel.c	2003-10-05 00:36:48.000000000 -0700
+@@ -8,11 +8,10 @@
+ #include <asm/processor.h>
+ #include <asm/msr.h>
+ #include <asm/uaccess.h>
++#include <asm/desc.h>
+ 
+ #include "cpu.h"
+ 
+-extern int trap_init_f00f_bug(void);
+-
+ #ifdef CONFIG_X86_INTEL_USERCOPY
+ /*
+  * Alignment at which movsl is preferred for bulk memory copies.
+@@ -157,7 +156,7 @@ static void __init init_intel(struct cpu
+ 
+ 		c->f00f_bug = 1;
+ 		if ( !f00f_workaround_enabled ) {
+-			trap_init_f00f_bug();
++			trap_init_virtual_IDT();
+ 			printk(KERN_NOTICE "Intel Pentium with F0 0F bug - workaround enabled.\n");
+ 			f00f_workaround_enabled = 1;
+ 		}
+@@ -238,12 +237,9 @@ static void __init init_intel(struct cpu
+ 	}
+ 
+ 	/* SEP CPUID bug: Pentium Pro reports SEP but doesn't have it until model 3 mask 3 */
+-	if ( c->x86 == 6) {
+-		unsigned model_mask = (c->x86_model << 8) + c->x86_mask;
+-		if (model_mask < 0x0303)
+-			clear_bit(X86_FEATURE_SEP, c->x86_capability);
+-	}
+-	
++	if ((c->x86<<8 | c->x86_model<<4 | c->x86_mask) < 0x633)
++		clear_bit(X86_FEATURE_SEP, c->x86_capability);
++
+ 	/* Names for the Pentium II/Celeron processors 
+ 	   detectable only by also checking the cache size.
+ 	   Dixon is NOT a Celeron. */
+--- linux-2.6.0-test6/arch/i386/kernel/cpu/mcheck/k7.c	2003-08-08 22:55:10.000000000 -0700
++++ 25/arch/i386/kernel/cpu/mcheck/k7.c	2003-10-05 00:33:23.000000000 -0700
+@@ -17,7 +17,7 @@
+ #include "mce.h"
+ 
+ /* Machine Check Handler For AMD Athlon/Duron */
+-static void k7_machine_check(struct pt_regs * regs, long error_code)
++static asmlinkage void k7_machine_check(struct pt_regs * regs, long error_code)
+ {
+ 	int recover=1;
+ 	u32 alow, ahigh, high, low;
+@@ -31,7 +31,7 @@ static void k7_machine_check(struct pt_r
+ 	printk (KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n",
+ 		smp_processor_id(), mcgsth, mcgstl);
+ 
+-	for (i=0; i<nr_mce_banks; i++) {
++	for (i=1; i<nr_mce_banks; i++) {
+ 		rdmsr (MSR_IA32_MC0_STATUS+i*4,low, high);
+ 		if (high&(1<<31)) {
+ 			if (high & (1<<29))
+@@ -81,6 +81,9 @@ void __init amd_mcheck_init(struct cpuin
+ 		wrmsr (MSR_IA32_MCG_CTL, 0xffffffff, 0xffffffff);
+ 	nr_mce_banks = l & 0xff;
+ 
++	/* Clear status for MC index 0 separately, we don't touch CTL,
++	 * as some Athlons cause spurious MCEs when its enabled. */
++	wrmsr (MSR_IA32_MC0_STATUS, 0x0, 0x0);
+ 	for (i=1; i<nr_mce_banks; i++) {
+ 		wrmsr (MSR_IA32_MC0_CTL+4*i, 0xffffffff, 0xffffffff);
+ 		wrmsr (MSR_IA32_MC0_STATUS+4*i, 0x0, 0x0);
+--- linux-2.6.0-test6/arch/i386/kernel/cpu/mcheck/mce.c	2003-06-14 12:18:29.000000000 -0700
++++ 25/arch/i386/kernel/cpu/mcheck/mce.c	2003-10-05 00:33:23.000000000 -0700
+@@ -18,18 +18,13 @@ int mce_disabled __initdata = 0;
+ int nr_mce_banks;
+ 
+ /* Handle unconfigured int18 (should never happen) */
+-static void unexpected_machine_check(struct pt_regs * regs, long error_code)
++static asmlinkage void unexpected_machine_check(struct pt_regs * regs, long error_code)
+ {	
+ 	printk(KERN_ERR "CPU#%d: Unexpected int18 (Machine Check).\n", smp_processor_id());
+ }
+ 
+ /* Call the installed machine check handler for this CPU setup. */
+-void (*machine_check_vector)(struct pt_regs *, long error_code) = unexpected_machine_check;
+-
+-asmlinkage void do_machine_check(struct pt_regs * regs, long error_code)
+-{
+-	machine_check_vector(regs, error_code);
+-}
++void asmlinkage (*machine_check_vector)(struct pt_regs *, long error_code) = unexpected_machine_check;
+ 
+ /* This has to be run for each processor */
+ void __init mcheck_init(struct cpuinfo_x86 *c)
+--- linux-2.6.0-test6/arch/i386/kernel/cpu/mcheck/mce.h	2003-06-14 12:17:58.000000000 -0700
++++ 25/arch/i386/kernel/cpu/mcheck/mce.h	2003-10-05 00:33:23.000000000 -0700
+@@ -7,7 +7,7 @@ void intel_p6_mcheck_init(struct cpuinfo
+ void winchip_mcheck_init(struct cpuinfo_x86 *c);
+ 
+ /* Call the installed machine check handler for this CPU setup. */
+-extern void (*machine_check_vector)(struct pt_regs *, long error_code);
++extern asmlinkage void (*machine_check_vector)(struct pt_regs *, long error_code);
+ 
+ extern int mce_disabled __initdata;
+ extern int nr_mce_banks;
+--- linux-2.6.0-test6/arch/i386/kernel/cpu/mcheck/p4.c	2003-06-14 12:18:24.000000000 -0700
++++ 25/arch/i386/kernel/cpu/mcheck/p4.c	2003-10-05 00:33:23.000000000 -0700
+@@ -148,7 +148,7 @@ done:
+ 	return mce_num_extended_msrs;
+ }
+ 
+-static void intel_machine_check(struct pt_regs * regs, long error_code)
++static asmlinkage void intel_machine_check(struct pt_regs * regs, long error_code)
+ {
+ 	int recover=1;
+ 	u32 alow, ahigh, high, low;
+--- linux-2.6.0-test6/arch/i386/kernel/cpu/mcheck/p5.c	2003-06-14 12:18:23.000000000 -0700
++++ 25/arch/i386/kernel/cpu/mcheck/p5.c	2003-10-05 00:33:23.000000000 -0700
+@@ -16,7 +16,7 @@
+ #include "mce.h"
+ 
+ /* Machine check handler for Pentium class Intel */
+-static void pentium_machine_check(struct pt_regs * regs, long error_code)
++static asmlinkage void pentium_machine_check(struct pt_regs * regs, long error_code)
+ {
+ 	u32 loaddr, hi, lotype;
+ 	rdmsr(MSR_IA32_P5_MC_ADDR, loaddr, hi);
+--- linux-2.6.0-test6/arch/i386/kernel/cpu/mcheck/p6.c	2003-06-14 12:18:24.000000000 -0700
++++ 25/arch/i386/kernel/cpu/mcheck/p6.c	2003-10-05 00:33:23.000000000 -0700
+@@ -16,7 +16,7 @@
+ #include "mce.h"
+ 
+ /* Machine Check Handler For PII/PIII */
+-static void intel_machine_check(struct pt_regs * regs, long error_code)
++static asmlinkage void intel_machine_check(struct pt_regs * regs, long error_code)
+ {
+ 	int recover=1;
+ 	u32 alow, ahigh, high, low;
+--- linux-2.6.0-test6/arch/i386/kernel/cpu/mcheck/winchip.c	2003-06-14 12:18:22.000000000 -0700
++++ 25/arch/i386/kernel/cpu/mcheck/winchip.c	2003-10-05 00:33:23.000000000 -0700
+@@ -15,7 +15,7 @@
+ #include "mce.h"
+ 
+ /* Machine check handler for WinChip C6 */
+-static void winchip_machine_check(struct pt_regs * regs, long error_code)
++static asmlinkage void winchip_machine_check(struct pt_regs * regs, long error_code)
+ {
+ 	printk(KERN_EMERG "CPU0: Machine Check Exception.\n");
+ }
+--- linux-2.6.0-test6/arch/i386/kernel/dmi_scan.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/i386/kernel/dmi_scan.c	2003-10-05 00:33:23.000000000 -0700
+@@ -939,11 +939,6 @@ static __initdata struct dmi_blacklist d
+ 			MATCH(DMI_BOARD_NAME, "CUR-DLS"),
+ 			NO_MATCH, NO_MATCH }},
+ 
+-	{ force_acpi_ht, "ASUS A7V", {
+-			MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC"),
+-			MATCH(DMI_BOARD_NAME, "<A7V>"),
+-			MATCH(DMI_BIOS_VERSION, "ASUS A7V ACPI BIOS Revision 1011"), NO_MATCH }},
+-
+ 	{ force_acpi_ht, "ABIT i440BX-W83977", {
+ 			MATCH(DMI_BOARD_VENDOR, "ABIT <http://www.abit.com>"),
+ 			MATCH(DMI_BOARD_NAME, "i440BX-W83977 (BP6)"),
+@@ -978,7 +973,10 @@ static __initdata struct dmi_blacklist d
+ 	{ disable_acpi_pci, "ASUS A7V", {
+ 			MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC"),
+ 			MATCH(DMI_BOARD_NAME, "<A7V>"),
+-			MATCH(DMI_BIOS_VERSION, "ASUS A7V ACPI BIOS Revision 1007"), NO_MATCH }},
++			/* newer BIOS, Revision 1011, does work */
++			MATCH(DMI_BIOS_VERSION, "ASUS A7V ACPI BIOS Revision 1007"),
++			NO_MATCH }},
++
+ #endif
+ 
+ 	{ NULL, }
+--- linux-2.6.0-test6/arch/i386/kernel/doublefault.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/arch/i386/kernel/doublefault.c	2003-10-05 00:36:48.000000000 -0700
+@@ -7,12 +7,13 @@
+ #include <asm/uaccess.h>
+ #include <asm/pgtable.h>
+ #include <asm/desc.h>
++#include <asm/fixmap.h>
+ 
+ #define DOUBLEFAULT_STACKSIZE (1024)
+ static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
+ #define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
+ 
+-#define ptr_ok(x) ((x) > 0xc0000000 && (x) < 0xc1000000)
++#define ptr_ok(x) (((x) > __PAGE_OFFSET && (x) < (__PAGE_OFFSET + 0x01000000)) || ((x) >= FIXADDR_START))
+ 
+ static void doublefault_fn(void)
+ {
+@@ -38,8 +39,8 @@ static void doublefault_fn(void)
+ 
+ 			printk("eax = %08lx, ebx = %08lx, ecx = %08lx, edx = %08lx\n",
+ 				t->eax, t->ebx, t->ecx, t->edx);
+-			printk("esi = %08lx, edi = %08lx\n",
+-				t->esi, t->edi);
++			printk("esi = %08lx, edi = %08lx, ebp = %08lx\n",
++				t->esi, t->edi, t->ebp);
+ 		}
+ 	}
+ 
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/arch/i386/kernel/efi.c	2003-10-05 00:36:25.000000000 -0700
+@@ -0,0 +1,611 @@
++/*
++ * Extensible Firmware Interface
++ *
++ * Based on Extensible Firmware Interface Specification version 1.0
++ *
++ * Copyright (C) 1999 VA Linux Systems
++ * Copyright (C) 1999 Walt Drummond <drummond@valinux.com>
++ * Copyright (C) 1999-2002 Hewlett-Packard Co.
++ *	David Mosberger-Tang <davidm@hpl.hp.com>
++ *	Stephane Eranian <eranian@hpl.hp.com>
++ *
++ * All EFI Runtime Services are not implemented yet as EFI only
++ * supports physical mode addressing on SoftSDV. This is to be fixed
++ * in a future version.  --drummond 1999-07-20
++ *
++ * Implemented EFI runtime services and virtual mode calls.  --davidm
++ *
++ * Goutham Rao: <goutham.rao@intel.com>
++ *	Skip non-WB memory and ignore empty memory ranges.
++ */
++
++#include <linux/config.h>
++#include <linux/kernel.h>
++#include <linux/init.h>
++#include <linux/mm.h>
++#include <linux/types.h>
++#include <linux/time.h>
++#include <linux/spinlock.h>
++#include <linux/bootmem.h>
++#include <linux/ioport.h>
++#include <linux/proc_fs.h>
++#include <linux/efi.h>
++
++#include <asm/setup.h>
++#include <asm/io.h>
++#include <asm/page.h>
++#include <asm/pgtable.h>
++#include <asm/processor.h>
++#include <asm/desc.h>
++#include <asm/pgalloc.h>
++#include <asm/tlbflush.h>
++
++#define EFI_DEBUG	0
++#define PFX 		"EFI: "
++
++extern efi_status_t asmlinkage efi_call_phys(void *, ...);
++
++struct efi efi;
++struct efi efi_phys __initdata;
++struct efi_memory_map memmap __initdata;
++
++/*
++ * We require an early boot_ioremap mapping mechanism initially
++ */
++extern void * boot_ioremap(unsigned long, unsigned long);
++
++/*
++ * efi_dir is allocated here, but the directory isn't created
++ * here, as proc_mkdir() doesn't work this early in the bootup
++ * process.  Therefore, each module, like efivars, must test for
++ *    if (!efi_dir) efi_dir = proc_mkdir("efi", NULL);
++ * prior to creating their own entries under /proc/efi.
++ */
++#ifdef CONFIG_PROC_FS
++struct proc_dir_entry *efi_dir;
++#endif
++
++
++/*
++ * To make EFI call EFI runtime service in physical addressing mode we need
++ * prelog/epilog before/after the invocation to disable interrupt, to
++ * claim EFI runtime service handler exclusively and to duplicate a memory in
++ * low memory space say 0 - 3G.
++ */
++
++static unsigned long efi_rt_eflags;
++static spinlock_t efi_rt_lock = SPIN_LOCK_UNLOCKED;
++static pgd_t efi_bak_pg_dir_pointer[2];
++
++static void efi_call_phys_prelog(void)
++{
++	unsigned long cr4;
++	unsigned long temp;
++
++	spin_lock(&efi_rt_lock);
++	local_irq_save(efi_rt_eflags);
++
++	/*
++	 * If I don't have PSE, I should just duplicate two entries in page
++	 * directory. If I have PSE, I just need to duplicate one entry in
++	 * page directory.
++	 */
++	__asm__ __volatile__("movl %%cr4, %0":"=r"(cr4));
++
++	if (cr4 & X86_CR4_PSE) {
++		efi_bak_pg_dir_pointer[0].pgd =
++		    swapper_pg_dir[pgd_index(0)].pgd;
++		swapper_pg_dir[0].pgd =
++		    swapper_pg_dir[pgd_index(PAGE_OFFSET)].pgd;
++	} else {
++		efi_bak_pg_dir_pointer[0].pgd =
++		    swapper_pg_dir[pgd_index(0)].pgd;
++		efi_bak_pg_dir_pointer[1].pgd =
++		    swapper_pg_dir[pgd_index(0x400000)].pgd;
++		swapper_pg_dir[pgd_index(0)].pgd =
++		    swapper_pg_dir[pgd_index(PAGE_OFFSET)].pgd;
++		temp = PAGE_OFFSET + 0x400000;
++		swapper_pg_dir[pgd_index(0x400000)].pgd =
++		    swapper_pg_dir[pgd_index(temp)].pgd;
++	}
++
++	/*
++	 * After the lock is released, the original page table is restored.
++	 */
++	local_flush_tlb();
++
++	cpu_gdt_descr[0].address = __pa(cpu_gdt_descr[0].address);
++	__asm__ __volatile__("lgdt %0":"=m"
++			    (*(struct Xgt_desc_struct *) __pa(&cpu_gdt_descr[0])));
++}
++
++static void efi_call_phys_epilog(void)
++{
++	unsigned long cr4;
++
++	cpu_gdt_descr[0].address =
++		(unsigned long) __va(cpu_gdt_descr[0].address);
++	__asm__ __volatile__("lgdt %0":"=m"(cpu_gdt_descr));
++	__asm__ __volatile__("movl %%cr4, %0":"=r"(cr4));
++
++	if (cr4 & X86_CR4_PSE) {
++		swapper_pg_dir[pgd_index(0)].pgd =
++		    efi_bak_pg_dir_pointer[0].pgd;
++	} else {
++		swapper_pg_dir[pgd_index(0)].pgd =
++		    efi_bak_pg_dir_pointer[0].pgd;
++		swapper_pg_dir[pgd_index(0x400000)].pgd =
++		    efi_bak_pg_dir_pointer[1].pgd;
++	}
++
++	/*
++	 * After the lock is released, the original page table is restored.
++	 */
++	local_flush_tlb();
++
++	local_irq_restore(efi_rt_eflags);
++	spin_unlock(&efi_rt_lock);
++}
++
++static efi_status_t
++phys_efi_set_virtual_address_map(unsigned long memory_map_size,
++				 unsigned long descriptor_size,
++				 u32 descriptor_version,
++				 efi_memory_desc_t *virtual_map)
++{
++	efi_status_t status;
++
++	efi_call_phys_prelog();
++	status = efi_call_phys(efi_phys.set_virtual_address_map,
++				     memory_map_size, descriptor_size,
++				     descriptor_version, virtual_map);
++	efi_call_phys_epilog();
++	return status;
++}
++
++efi_status_t
++phys_efi_get_time(efi_time_t *tm, efi_time_cap_t *tc)
++{
++	efi_status_t status;
++
++	efi_call_phys_prelog();
++	status = efi_call_phys(efi_phys.get_time, tm, tc);
++	efi_call_phys_epilog();
++	return status;
++}
++
++void efi_gettimeofday(struct timespec *tv)
++{
++	efi_time_t tm;
++
++	memset(tv, 0, sizeof(*tv));
++	if ((*efi.get_time) (&tm, 0) != EFI_SUCCESS)
++		return;
++
++	tv->tv_sec = mktime(tm.year, tm.month, tm.day, tm.hour, tm.minute,
++		            tm.second);
++	tv->tv_nsec = tm.nanosecond;
++}
++
++int is_available_memory(efi_memory_desc_t * md)
++{
++	if (!(md->attribute & EFI_MEMORY_WB))
++		return 0;
++
++	switch (md->type) {
++		case EFI_LOADER_CODE:
++		case EFI_LOADER_DATA:
++		case EFI_BOOT_SERVICES_CODE:
++		case EFI_BOOT_SERVICES_DATA:
++		case EFI_CONVENTIONAL_MEMORY:
++			return 1;
++	}
++	return 0;
++}
++
++/*
++ * We need to map the EFI memory map again after paging_init().
++ */
++void __init efi_map_memmap(void)
++{
++	memmap.map = NULL;
++
++	memmap.map = (efi_memory_desc_t *)
++		bt_ioremap((unsigned long) memmap.phys_map,
++			(memmap.nr_map * sizeof(efi_memory_desc_t)));
++
++	if (memmap.map == NULL)
++		printk(KERN_ERR PFX "Could not remap the EFI memmap!\n");
++}
++
++void __init print_efi_memmap(void)
++{
++	efi_memory_desc_t *md;
++	int i;
++
++	for (i = 0; i < memmap.nr_map; i++) {
++		md = &memmap.map[i];
++		printk(KERN_INFO "mem%02u: type=%u, attr=0x%llx, "
++			"range=[0x%016llx-0x%016llx) (%lluMB)\n",
++			i, md->type, md->attribute, md->phys_addr,
++			md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT),
++			(md->num_pages >> (20 - EFI_PAGE_SHIFT)));
++	}
++}
++
++/*
++ * Walks the EFI memory map and calls CALLBACK once for each EFI
++ * memory descriptor that has memory that is available for kernel use.
++ */
++void efi_memmap_walk(efi_freemem_callback_t callback, void *arg)
++{
++	int prev_valid = 0;
++	struct range {
++		unsigned long start;
++		unsigned long end;
++	} prev, curr;
++	efi_memory_desc_t *md;
++	unsigned long start, end;
++	int i;
++
++	for (i = 0; i < memmap.nr_map; i++) {
++		md = &memmap.map[i];
++
++		if ((md->num_pages == 0) || (!is_available_memory(md)))
++			continue;
++
++		curr.start = md->phys_addr;
++		curr.end = curr.start + (md->num_pages << EFI_PAGE_SHIFT);
++
++		if (!prev_valid) {
++			prev = curr;
++			prev_valid = 1;
++		} else {
++			if (curr.start < prev.start)
++				printk(KERN_INFO PFX "Unordered memory map\n");
++			if (prev.end == curr.start)
++				prev.end = curr.end;
++			else {
++				start =
++				    (unsigned long) (PAGE_ALIGN(prev.start));
++				end = (unsigned long) (prev.end & PAGE_MASK);
++				if ((end > start)
++				    && (*callback) (start, end, arg) < 0)
++					return;
++				prev = curr;
++			}
++		}
++	}
++	if (prev_valid) {
++		start = (unsigned long) PAGE_ALIGN(prev.start);
++		end = (unsigned long) (prev.end & PAGE_MASK);
++		if (end > start)
++			(*callback) (start, end, arg);
++	}
++}
++
++void __init efi_init(void)
++{
++	efi_config_table_t *config_tables;
++	efi_runtime_services_t *runtime;
++	efi_char16_t *c16;
++	char vendor[100] = "unknown";
++	unsigned long num_config_tables;
++	int i = 0;
++
++	memset(&efi, 0, sizeof(efi) );
++	memset(&efi_phys, 0, sizeof(efi_phys));
++
++	efi_phys.systab = EFI_SYSTAB;
++	memmap.phys_map = EFI_MEMMAP;
++	memmap.nr_map = EFI_MEMMAP_SIZE/EFI_MEMDESC_SIZE;
++	memmap.desc_version = EFI_MEMDESC_VERSION;
++
++	efi.systab = (efi_system_table_t *)
++		boot_ioremap((unsigned long) efi_phys.systab,
++			sizeof(efi_system_table_t));
++	/*
++	 * Verify the EFI Table
++	 */
++	if (efi.systab == NULL)
++		printk(KERN_ERR PFX "Woah! Couldn't map the EFI system table.\n");
++	if (efi.systab->hdr.signature != EFI_SYSTEM_TABLE_SIGNATURE)
++		printk(KERN_ERR PFX "Woah! EFI system table signature incorrect\n");
++	if ((efi.systab->hdr.revision ^ EFI_SYSTEM_TABLE_REVISION) >> 16 != 0)
++		printk(KERN_ERR PFX
++		       "Warning: EFI system table major version mismatch: "
++		       "got %d.%02d, expected %d.%02d\n",
++		       efi.systab->hdr.revision >> 16,
++		       efi.systab->hdr.revision & 0xffff,
++		       EFI_SYSTEM_TABLE_REVISION >> 16,
++		       EFI_SYSTEM_TABLE_REVISION & 0xffff);
++	/*
++	 * Grab some details from the system table
++	 */
++	num_config_tables = efi.systab->nr_tables;
++	config_tables = (efi_config_table_t *)efi.systab->tables;
++	runtime = efi.systab->runtime;
++
++	/*
++	 * Show what we know for posterity
++	 */
++	c16 = (efi_char16_t *) boot_ioremap(efi.systab->fw_vendor, 2);
++	if (c16) {
++		for (i = 0; i < sizeof(vendor) && *c16; ++i)
++			vendor[i] = *c16++;
++		vendor[i] = '\0';
++	} else
++		printk(KERN_ERR PFX "Could not map the firmware vendor!\n");
++
++	printk(KERN_INFO PFX "EFI v%u.%.02u by %s \n",
++	       efi.systab->hdr.revision >> 16,
++	       efi.systab->hdr.revision & 0xffff, vendor);
++
++	/*
++	 * Let's see what config tables the firmware passed to us.
++	 */
++	config_tables = (efi_config_table_t *)
++				boot_ioremap((unsigned long) config_tables,
++			        num_config_tables * sizeof(efi_config_table_t));
++
++	if (config_tables == NULL)
++		printk(KERN_ERR PFX "Could not map EFI Configuration Table!\n");
++
++	for (i = 0; i < num_config_tables; i++) {
++		if (efi_guidcmp(config_tables[i].guid, MPS_TABLE_GUID) == 0) {
++			efi.mps = (void *)config_tables[i].table;
++			printk(KERN_INFO " MPS=0x%lx ", config_tables[i].table);
++		} else
++		    if (efi_guidcmp(config_tables[i].guid, ACPI_20_TABLE_GUID) == 0) {
++			efi.acpi20 = __va(config_tables[i].table);
++			printk(KERN_INFO " ACPI 2.0=0x%lx ", config_tables[i].table);
++		} else
++		    if (efi_guidcmp(config_tables[i].guid, ACPI_TABLE_GUID) == 0) {
++			efi.acpi = __va(config_tables[i].table);
++			printk(KERN_INFO " ACPI=0x%lx ", config_tables[i].table);
++		} else
++		    if (efi_guidcmp(config_tables[i].guid, SMBIOS_TABLE_GUID) == 0) {
++			efi.smbios = (void *) config_tables[i].table;
++			printk(KERN_INFO " SMBIOS=0x%lx ", config_tables[i].table);
++		} else
++		    if (efi_guidcmp(config_tables[i].guid, HCDP_TABLE_GUID) == 0) {
++			efi.hcdp = (void *)config_tables[i].table;
++			printk(KERN_INFO " HCDP=0x%lx ", config_tables[i].table);
++		} else
++		    if (efi_guidcmp(config_tables[i].guid, UGA_IO_PROTOCOL_GUID) == 0) {
++			efi.uga = (void *)config_tables[i].table;
++			printk(KERN_INFO " UGA=0x%lx ", config_tables[i].table);
++		}
++	}
++	printk("\n");
++
++	/*
++	 * Check out the runtime services table. We need to map
++	 * the runtime services table so that we can grab the physical
++	 * address of several of the EFI runtime functions, needed to
++	 * set the firmware into virtual mode.
++	 */
++
++	runtime = (efi_runtime_services_t *) boot_ioremap((unsigned long)
++						runtime,
++				      		sizeof(efi_runtime_services_t));
++	if (runtime != NULL) {
++		/*
++	 	 * We will only need *early* access to the following
++		 * two EFI runtime services before set_virtual_address_map
++		 * is invoked.
++ 	 	 */
++		efi_phys.get_time = (efi_get_time_t *) runtime->get_time;
++		efi_phys.set_virtual_address_map =
++			(efi_set_virtual_address_map_t *)
++				runtime->set_virtual_address_map;
++	} else
++		printk(KERN_ERR PFX "Could not map the runtime service table!\n");
++
++	/* Map the EFI memory map for use until paging_init() */
++
++	memmap.map = (efi_memory_desc_t *)
++		boot_ioremap((unsigned long) EFI_MEMMAP, EFI_MEMMAP_SIZE);
++
++	if (memmap.map == NULL)
++		printk(KERN_ERR PFX "Could not map the EFI memory map!\n");
++
++	if (EFI_MEMDESC_SIZE != sizeof(efi_memory_desc_t)) {
++		printk(KERN_WARNING PFX "Warning! Kernel-defined memdesc doesn't "
++			   "match the one from EFI!\n");
++	}
++#if EFI_DEBUG
++	print_efi_memmap();
++#endif
++}
++
++/*
++ * This function will switch the EFI runtime services to virtual mode.
++ * Essentially, look through the EFI memmap and map every region that
++ * has the runtime attribute bit set in its memory descriptor and update
++ * that memory descriptor with the virtual address obtained from ioremap().
++ * This enables the runtime services to be called without having to
++ * thunk back into physical mode for every invocation.
++ */
++
++void __init efi_enter_virtual_mode(void)
++{
++	efi_memory_desc_t *md;
++	efi_status_t status;
++	int i;
++
++	efi.systab = NULL;
++
++	for (i = 0; i < memmap.nr_map; i++) {
++		md = &memmap.map[i];
++
++		if (md->attribute & EFI_MEMORY_RUNTIME) {
++			md->virt_addr =
++				(unsigned long)ioremap(md->phys_addr,
++					md->num_pages << EFI_PAGE_SHIFT);
++			if (!(unsigned long)md->virt_addr) {
++				printk(KERN_ERR PFX "ioremap of 0x%lX failed\n",
++					(unsigned long)md->phys_addr);
++			}
++
++			if (((unsigned long)md->phys_addr <=
++					(unsigned long)efi_phys.systab) &&
++				((unsigned long)efi_phys.systab <
++					md->phys_addr +
++					((unsigned long)md->num_pages <<
++						EFI_PAGE_SHIFT))) {
++				unsigned long addr;
++
++				addr = md->virt_addr - md->phys_addr +
++						(unsigned long)efi_phys.systab;
++				efi.systab = (efi_system_table_t *)addr;
++			}
++		}
++	}
++
++	if (!efi.systab)
++		BUG();
++
++	status = phys_efi_set_virtual_address_map(
++			sizeof(efi_memory_desc_t) * memmap.nr_map,
++			sizeof(efi_memory_desc_t),
++			memmap.desc_version,
++		       	memmap.phys_map);
++
++	if (status != EFI_SUCCESS) {
++		printk (KERN_ALERT "You are screwed! "
++			"Unable to switch EFI into virtual mode "
++			"(status=%lx)\n", status);
++		panic("EFI call to SetVirtualAddressMap() failed!");
++	}
++
++	/*
++	 * Now that EFI is in virtual mode, update the function
++	 * pointers in the runtime service table to the new virtual addresses.
++	 */
++
++	efi.get_time = (efi_get_time_t *) efi.systab->runtime->get_time;
++	efi.set_time = (efi_set_time_t *) efi.systab->runtime->set_time;
++	efi.get_wakeup_time = (efi_get_wakeup_time_t *)
++					efi.systab->runtime->get_wakeup_time;
++	efi.set_wakeup_time = (efi_set_wakeup_time_t *)
++					efi.systab->runtime->set_wakeup_time;
++	efi.get_variable = (efi_get_variable_t *)
++					efi.systab->runtime->get_variable;
++	efi.get_next_variable = (efi_get_next_variable_t *)
++					efi.systab->runtime->get_next_variable;
++	efi.set_variable = (efi_set_variable_t *)
++					efi.systab->runtime->set_variable;
++	efi.get_next_high_mono_count = (efi_get_next_high_mono_count_t *)
++					efi.systab->runtime->get_next_high_mono_count;
++	efi.reset_system = (efi_reset_system_t *)
++					efi.systab->runtime->reset_system;
++}
++
++void __init
++efi_initialize_iomem_resources(struct resource *code_resource,
++			       struct resource *data_resource)
++{
++	struct resource *res;
++	efi_memory_desc_t *md;
++	int i;
++
++	for (i = 0; i < memmap.nr_map; i++) {
++		md = &memmap.map[i];
++
++		if ((md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT)) >
++		    0x100000000ULL)
++			continue;
++		res = alloc_bootmem_low(sizeof(struct resource));
++		switch (md->type) {
++		case EFI_RESERVED_TYPE:
++			res->name = "Reserved Memory";
++			break;
++		case EFI_LOADER_CODE:
++			res->name = "Loader Code";
++			break;
++		case EFI_LOADER_DATA:
++			res->name = "Loader Data";
++			break;
++		case EFI_BOOT_SERVICES_DATA:
++			res->name = "BootServices Data";
++			break;
++		case EFI_BOOT_SERVICES_CODE:
++			res->name = "BootServices Code";
++			break;
++		case EFI_RUNTIME_SERVICES_CODE:
++			res->name = "Runtime Service Code";
++			break;
++		case EFI_RUNTIME_SERVICES_DATA:
++			res->name = "Runtime Service Data";
++			break;
++		case EFI_CONVENTIONAL_MEMORY:
++			res->name = "Conventional Memory";
++			break;
++		case EFI_UNUSABLE_MEMORY:
++			res->name = "Unusable Memory";
++			break;
++		case EFI_ACPI_RECLAIM_MEMORY:
++			res->name = "ACPI Reclaim";
++			break;
++		case EFI_ACPI_MEMORY_NVS:
++			res->name = "ACPI NVS";
++			break;
++		case EFI_MEMORY_MAPPED_IO:
++			res->name = "Memory Mapped IO";
++			break;
++		case EFI_MEMORY_MAPPED_IO_PORT_SPACE:
++			res->name = "Memory Mapped IO Port Space";
++			break;
++		default:
++			res->name = "Reserved";
++			break;
++		}
++		res->start = md->phys_addr;
++		res->end = res->start + ((md->num_pages << EFI_PAGE_SHIFT) - 1);
++		res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
++		if (request_resource(&iomem_resource, res) < 0)
++			printk(KERN_ERR PFX "Failed to allocate res %s : 0x%lx-0x%lx\n",
++				res->name, res->start, res->end);
++		/*
++		 * We don't know which region contains kernel data so we try
++		 * it repeatedly and let the resource manager test it.
++		 */
++		if (md->type == EFI_CONVENTIONAL_MEMORY) {
++			request_resource(res, code_resource);
++			request_resource(res, data_resource);
++		}
++	}
++}
++
++/*
++ * Convenience functions to obtain memory types and attributes
++ */
++
++u32 efi_mem_type(unsigned long phys_addr)
++{
++	efi_memory_desc_t *md;
++	int i;
++
++	for (i = 0; i < memmap.nr_map; i++) {
++		md = &memmap.map[i];
++		if ((md->phys_addr <= phys_addr) && (phys_addr <
++			(md->phys_addr + (md-> num_pages << EFI_PAGE_SHIFT)) ))
++			return md->type;
++	}
++	return 0;
++}
++
++u64 efi_mem_attributes(unsigned long phys_addr)
++{
++	efi_memory_desc_t *md;
++	int i;
++
++	for (i = 0; i < memmap.nr_map; i++) {
++		md = &memmap.map[i];
++		if ((md->phys_addr <= phys_addr) && (phys_addr <
++			(md->phys_addr + (md-> num_pages << EFI_PAGE_SHIFT)) ))
++			return md->attribute;
++	}
++	return 0;
++}
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/arch/i386/kernel/efi_stub.S	2003-10-05 00:36:22.000000000 -0700
+@@ -0,0 +1,125 @@
++/*
++ * EFI call stub for IA32.
++ *
++ * This stub allows us to make EFI calls in physical mode with interrupts
++ * turned off.
++ */
++
++#include <linux/config.h>
++#include <linux/linkage.h>
++#include <asm/page.h>
++#include <asm/pgtable.h>
++
++/*
++ * efi_call_phys(void *, ...) is a function with variable parameters.
++ * All the callers of this function assure that all the parameters are 4-bytes.
++ */
++
++/*
++ * In gcc calling convention, EBX, ESP, EBP, ESI and EDI are all callee save.
++ * So we'd better save all of them at the beginning of this function and restore
++ * at the end no matter how many we use, because we can not assure EFI runtime
++ * service functions will comply with gcc calling convention, too.
++ */
++
++.text
++.section .text, "a"
++ENTRY(efi_call_phys)
++	/*
++	 * 0. The function can only be called in Linux kernel. So CS has been
++	 * set to 0x0010, DS and SS have been set to 0x0018. In EFI, I found
++	 * the values of these registers are the same. And, the corresponding
++	 * GDT entries are identical. So I will do nothing about segment reg
++	 * and GDT, but change GDT base register in prelog and epilog.
++	 */
++
++	/*
++	 * 1. Now I am running with EIP = <physical address> + PAGE_OFFSET.
++	 * But to make it smoothly switch from virtual mode to flat mode.
++	 * The mapping of lower virtual memory has been created in prelog and
++	 * epilog.
++	 */
++	movl	$1f, %edx
++	subl	$__PAGE_OFFSET, %edx
++	jmp	*%edx
++1:
++
++	/*
++	 * 2. Now on the top of stack is the return
++	 * address in the caller of efi_call_phys(), then parameter 1,
++	 * parameter 2, ..., param n. To make things easy, we save the return
++	 * address of efi_call_phys in a global variable.
++	 */
++	popl	%edx
++	movl	%edx, saved_return_addr
++	/* get the function pointer into ECX*/
++	popl	%ecx
++	movl	%ecx, efi_rt_function_ptr
++	movl	$2f, %edx
++	subl	$__PAGE_OFFSET, %edx
++	pushl	%edx
++
++	/*
++	 * 3. Clear PG bit in %CR0.
++	 */
++	movl	%cr0, %edx
++	andl	$0x7fffffff, %edx
++	movl	%edx, %cr0
++	jmp	1f
++1:
++
++	/*
++	 * 4. Adjust stack pointer.
++	 */
++	subl	$__PAGE_OFFSET, %esp
++
++	/*
++	 * 5. Call the physical function.
++	 */
++	jmp	*%ecx
++
++2:
++	/*
++	 * 6. After EFI runtime service returns, control will return to
++	 * following instruction. We'd better readjust stack pointer first.
++	 */
++	addl	$__PAGE_OFFSET, %esp
++
++	/*
++	 * 7. Restore PG bit
++	 */
++	movl	%cr0, %edx
++	orl	$0x80000000, %edx
++	movl	%edx, %cr0
++	jmp	1f
++1:
++	/*
++	 * 8. Now restore the virtual mode from flat mode by
++	 * adding EIP with PAGE_OFFSET.
++	 */
++	movl	$1f, %edx
++	jmp	*%edx
++1:
++
++	/*
++	 * 9. Balance the stack. And because EAX contain the return value,
++	 * we'd better not clobber it.
++	 */
++	leal	efi_rt_function_ptr, %edx
++	movl	(%edx), %ecx
++	pushl	%ecx
++
++	/*
++	 * 10. Push the saved return address onto the stack and return.
++	 */
++	leal	saved_return_addr, %edx
++	movl	(%edx), %ecx
++	pushl	%ecx
++	ret
++.previous
++
++.data
++saved_return_addr:
++	.long 0
++efi_rt_function_ptr:
++	.long 0
+--- linux-2.6.0-test6/arch/i386/kernel/entry.S	2003-08-22 19:23:40.000000000 -0700
++++ 25/arch/i386/kernel/entry.S	2003-10-05 00:36:48.000000000 -0700
+@@ -43,11 +43,25 @@
+ #include <linux/config.h>
+ #include <linux/linkage.h>
+ #include <asm/thread_info.h>
++#include <asm/asm_offsets.h>
+ #include <asm/errno.h>
+ #include <asm/segment.h>
++#include <asm/page.h>
+ #include <asm/smp.h>
+ #include <asm/page.h>
+ #include "irq_vectors.h"
++        /* We do not recover from a stack overflow, but at least
++         * we know it happened and should be able to track it down.
++         */
++#ifdef CONFIG_STACK_OVERFLOW_TEST
++#define STACK_OVERFLOW_TEST \
++        testl $7680,%esp;    \
++        jnz   10f;            \
++        call  stack_overflow; \
++10:
++#else
++#define STACK_OVERFLOW_TEST
++#endif
+ 
+ EBX		= 0x00
+ ECX		= 0x04
+@@ -85,7 +99,102 @@ TSS_ESP0_OFFSET = (4 - 0x200)
+ #define resume_kernel		restore_all
+ #endif
+ 
+-#define SAVE_ALL \
++#ifdef CONFIG_X86_HIGH_ENTRY
++
++#ifdef CONFIG_X86_SWITCH_PAGETABLES
++
++#if defined(CONFIG_PREEMPT) && defined(CONFIG_SMP)
++/*
++ * If task is preempted in __SWITCH_KERNELSPACE, and moved to another cpu,
++ * __switch_to repoints %esp to the appropriate virtual stack; but %ebp is
++ * left stale, so we must check whether to repeat the real stack calculation.
++ */
++#define repeat_if_esp_changed				\
++	xorl %esp, %ebp;				\
++	testl $0xffffe000, %ebp;			\
++	jnz 0b
++#else
++#define repeat_if_esp_changed
++#endif
++
++/* clobbers ebx, edx and ebp */
++
++#define __SWITCH_KERNELSPACE				\
++	cmpl $0xff000000, %esp;				\
++	jb 1f;						\
++							\
++	/*						\
++	 * switch pagetables and load the real stack,	\
++	 * keep the stack offset:			\
++	 */						\
++							\
++	movl $swapper_pg_dir-__PAGE_OFFSET, %edx;	\
++							\
++	/* GET_THREAD_INFO(%ebp) intermixed */		\
++0:							\
++	movl %esp, %ebp;				\
++	movl %esp, %ebx;				\
++	andl $0xffffe000, %ebp;				\
++	andl $0x00001fff, %ebx;				\
++	orl TI_real_stack(%ebp), %ebx;			\
++	repeat_if_esp_changed;				\
++							\
++	movl %edx, %cr3;				\
++	movl %ebx, %esp;				\
++1:
++
++#endif
++
++
++#define __SWITCH_USERSPACE \
++	/* interrupted any of the user return paths? */	\
++							\
++	movl EIP(%esp), %eax;				\
++							\
++	cmpl $int80_ret_start_marker, %eax;		\
++	jb 33f; /* nope - continue with sysexit check */\
++	cmpl $int80_ret_end_marker, %eax;		\
++	jb 22f; /* yes - switch to virtual stack */	\
++33:							\
++	cmpl $sysexit_ret_start_marker, %eax;		\
++	jb 44f; /* nope - continue with user check */	\
++	cmpl $sysexit_ret_end_marker, %eax;		\
++	jb 22f; /* yes - switch to virtual stack */	\
++	/* return to userspace? */			\
++44:							\
++	movl EFLAGS(%esp),%ecx;				\
++	movb CS(%esp),%cl;				\
++	testl $(VM_MASK | 3),%ecx;			\
++	jz 2f;						\
++22:							\
++	/*						\
++	 * switch to the virtual stack, then switch to	\
++	 * the userspace pagetables.			\
++	 */						\
++							\
++	GET_THREAD_INFO(%ebp);				\
++	movl TI_virtual_stack(%ebp), %edx;		\
++	movl TI_user_pgd(%ebp), %ecx;			\
++							\
++	movl %esp, %ebx;				\
++	andl $0x1fff, %ebx;				\
++	orl %ebx, %edx;					\
++int80_ret_start_marker:					\
++	movl %edx, %esp; 				\
++	movl %ecx, %cr3;				\
++							\
++	__RESTORE_ALL;					\
++int80_ret_end_marker:					\
++2:
++
++#else /* !CONFIG_X86_HIGH_ENTRY */
++
++#define __SWITCH_KERNELSPACE
++#define __SWITCH_USERSPACE
++
++#endif
++
++#define __SAVE_ALL \
+ 	cld; \
+ 	pushl %es; \
+ 	pushl %ds; \
+@@ -100,7 +209,7 @@ TSS_ESP0_OFFSET = (4 - 0x200)
+ 	movl %edx, %ds; \
+ 	movl %edx, %es;
+ 
+-#define RESTORE_INT_REGS \
++#define __RESTORE_INT_REGS \
+ 	popl %ebx;	\
+ 	popl %ecx;	\
+ 	popl %edx;	\
+@@ -109,29 +218,28 @@ TSS_ESP0_OFFSET = (4 - 0x200)
+ 	popl %ebp;	\
+ 	popl %eax
+ 
+-#define RESTORE_REGS	\
+-	RESTORE_INT_REGS; \
+-1:	popl %ds;	\
+-2:	popl %es;	\
++#define __RESTORE_REGS	\
++	__RESTORE_INT_REGS; \
++111:	popl %ds;	\
++222:	popl %es;	\
+ .section .fixup,"ax";	\
+-3:	movl $0,(%esp);	\
+-	jmp 1b;		\
+-4:	movl $0,(%esp);	\
+-	jmp 2b;		\
++444:	movl $0,(%esp);	\
++	jmp 111b;	\
++555:	movl $0,(%esp);	\
++	jmp 222b;	\
+ .previous;		\
+ .section __ex_table,"a";\
+ 	.align 4;	\
+-	.long 1b,3b;	\
+-	.long 2b,4b;	\
++	.long 111b,444b;\
++	.long 222b,555b;\
+ .previous
+ 
+-
+-#define RESTORE_ALL	\
+-	RESTORE_REGS	\
++#define __RESTORE_ALL	\
++	__RESTORE_REGS	\
+ 	addl $4, %esp;	\
+-1:	iret;		\
++333:	iret;		\
+ .section .fixup,"ax";   \
+-2:	sti;		\
++666:	sti;		\
+ 	movl $(__USER_DS), %edx; \
+ 	movl %edx, %ds; \
+ 	movl %edx, %es; \
+@@ -140,10 +248,19 @@ TSS_ESP0_OFFSET = (4 - 0x200)
+ .previous;		\
+ .section __ex_table,"a";\
+ 	.align 4;	\
+-	.long 1b,2b;	\
++	.long 333b,666b;\
+ .previous
+ 
++#define SAVE_ALL \
++	__SAVE_ALL;					\
++	__SWITCH_KERNELSPACE;				\
++        STACK_OVERFLOW_TEST;
++
++#define RESTORE_ALL					\
++	__SWITCH_USERSPACE;				\
++	__RESTORE_ALL;
+ 
++.section .entry.text,"ax"
+ 
+ ENTRY(lcall7)
+ 	pushfl			# We get a different stack layout with call
+@@ -161,7 +278,7 @@ do_lcall:
+ 	movl %edx,EIP(%ebp)	# Now we move them to their "normal" places
+ 	movl %ecx,CS(%ebp)	#
+ 	andl $-8192, %ebp	# GET_THREAD_INFO
+-	movl TI_EXEC_DOMAIN(%ebp), %edx	# Get the execution domain
++	movl TI_exec_domain(%ebp), %edx	# Get the execution domain
+ 	call *4(%edx)		# Call the lcall7 handler for the domain
+ 	addl $4, %esp
+ 	popl %eax
+@@ -206,7 +323,7 @@ ENTRY(resume_userspace)
+  	cli				# make sure we don't miss an interrupt
+ 					# setting need_resched or sigpending
+ 					# between sampling and the iret
+-	movl TI_FLAGS(%ebp), %ecx
++	movl TI_flags(%ebp), %ecx
+ 	andl $_TIF_WORK_MASK, %ecx	# is there any work to be done on
+ 					# int/exception return?
+ 	jne work_pending
+@@ -214,18 +331,18 @@ ENTRY(resume_userspace)
+ 
+ #ifdef CONFIG_PREEMPT
+ ENTRY(resume_kernel)
+-	cmpl $0,TI_PRE_COUNT(%ebp)	# non-zero preempt_count ?
++	cmpl $0,TI_preempt_count(%ebp)	# non-zero preempt_count ?
+ 	jnz restore_all
+ need_resched:
+-	movl TI_FLAGS(%ebp), %ecx	# need_resched set ?
++	movl TI_flags(%ebp), %ecx	# need_resched set ?
+ 	testb $_TIF_NEED_RESCHED, %cl
+ 	jz restore_all
+ 	testl $IF_MASK,EFLAGS(%esp)     # interrupts off (exception path) ?
+ 	jz restore_all
+-	movl $PREEMPT_ACTIVE,TI_PRE_COUNT(%ebp)
++	movl $PREEMPT_ACTIVE,TI_preempt_count(%ebp)
+ 	sti
+ 	call schedule
+-	movl $0,TI_PRE_COUNT(%ebp)
++	movl $0,TI_preempt_count(%ebp)
+ 	cli
+ 	jmp need_resched
+ #endif
+@@ -244,37 +361,50 @@ sysenter_past_esp:
+ 	pushl $(__USER_CS)
+ 	pushl $SYSENTER_RETURN
+ 
+-/*
+- * Load the potential sixth argument from user stack.
+- * Careful about security.
+- */
+-	cmpl $__PAGE_OFFSET-3,%ebp
+-	jae syscall_fault
+-1:	movl (%ebp),%ebp
+-.section __ex_table,"a"
+-	.align 4
+-	.long 1b,syscall_fault
+-.previous
+-
+ 	pushl %eax
+ 	SAVE_ALL
+ 	GET_THREAD_INFO(%ebp)
+ 	cmpl $(nr_syscalls), %eax
+ 	jae syscall_badsys
+ 
+-	testb $_TIF_SYSCALL_TRACE,TI_FLAGS(%ebp)
++	testb $_TIF_SYSCALL_TRACE,TI_flags(%ebp)
+ 	jnz syscall_trace_entry
+ 	call *sys_call_table(,%eax,4)
+ 	movl %eax,EAX(%esp)
+ 	cli
+-	movl TI_FLAGS(%ebp), %ecx
++	movl TI_flags(%ebp), %ecx
+ 	testw $_TIF_ALLWORK_MASK, %cx
+ 	jne syscall_exit_work
++
++#ifdef CONFIG_X86_SWITCH_PAGETABLES
++
++	GET_THREAD_INFO(%ebp)
++	movl TI_virtual_stack(%ebp), %edx
++	movl TI_user_pgd(%ebp), %ecx
++	movl %esp, %ebx
++	andl $0x1fff, %ebx
++	orl %ebx, %edx
++sysexit_ret_start_marker:
++	movl %edx, %esp
++	movl %ecx, %cr3
++#endif
++	/*
++	 * only ebx is not restored by the userspace sysenter vsyscall
++	 * code, it assumes it to be callee-saved.
++	 */
++	movl EBX(%esp), %ebx
++
+ /* if something modifies registers it must also disable sysexit */
++
+ 	movl EIP(%esp), %edx
+ 	movl OLDESP(%esp), %ecx
++
+ 	sti
+ 	sysexit
++#ifdef CONFIG_X86_SWITCH_PAGETABLES
++sysexit_ret_end_marker:
++	nop
++#endif
+ 
+ 
+ 	# system call handler stub
+@@ -285,7 +415,7 @@ ENTRY(system_call)
+ 	cmpl $(nr_syscalls), %eax
+ 	jae syscall_badsys
+ 					# system call tracing in operation
+-	testb $_TIF_SYSCALL_TRACE,TI_FLAGS(%ebp)
++	testb $_TIF_SYSCALL_TRACE,TI_flags(%ebp)
+ 	jnz syscall_trace_entry
+ syscall_call:
+ 	call *sys_call_table(,%eax,4)
+@@ -294,10 +424,23 @@ syscall_exit:
+ 	cli				# make sure we don't miss an interrupt
+ 					# setting need_resched or sigpending
+ 					# between sampling and the iret
+-	movl TI_FLAGS(%ebp), %ecx
++	movl TI_flags(%ebp), %ecx
+ 	testw $_TIF_ALLWORK_MASK, %cx	# current->work
+ 	jne syscall_exit_work
+ restore_all:
++#ifdef CONFIG_TRAP_BAD_SYSCALL_EXITS
++	movl EFLAGS(%esp), %eax		# mix EFLAGS and CS
++	movb CS(%esp), %al
++	testl $(VM_MASK | 3), %eax
++	jz resume_kernelX		# returning to kernel or vm86-space
++
++	cmpl $0,TI_preempt_count(%ebp)	# non-zero preempt_count ?
++	jz resume_kernelX
++
++        int $3
++
++resume_kernelX:
++#endif
+ 	RESTORE_ALL
+ 
+ 	# perform work that needs to be done immediately before resumption
+@@ -310,7 +453,7 @@ work_resched:
+ 	cli				# make sure we don't miss an interrupt
+ 					# setting need_resched or sigpending
+ 					# between sampling and the iret
+-	movl TI_FLAGS(%ebp), %ecx
++	movl TI_flags(%ebp), %ecx
+ 	andl $_TIF_WORK_MASK, %ecx	# is there any work to be done other
+ 					# than syscall tracing?
+ 	jz restore_all
+@@ -325,6 +468,22 @@ work_notifysig:				# deal with pending s
+ 					# vm86-space
+ 	xorl %edx, %edx
+ 	call do_notify_resume
++
++#if CONFIG_X86_HIGH_ENTRY
++	/*
++	 * Reload db7 if necessary:
++	 */
++	movl TI_flags(%ebp), %ecx
++	testb $_TIF_DB7, %cl
++	jnz work_db7
++
++	jmp restore_all
++
++work_db7:
++	movl TI_task(%ebp), %edx;
++	movl task_thread_db7(%edx), %edx;
++	movl %edx, %db7;
++#endif
+ 	jmp restore_all
+ 
+ 	ALIGN
+@@ -380,7 +539,7 @@ syscall_badsys:
+  */
+ .data
+ ENTRY(interrupt)
+-.text
++.previous
+ 
+ vector=0
+ ENTRY(irq_entries_start)
+@@ -390,7 +549,7 @@ ENTRY(irq_entries_start)
+ 	jmp common_interrupt
+ .data
+ 	.long 1b
+-.text
++.previous
+ vector=vector+1
+ .endr
+ 
+@@ -431,12 +590,17 @@ error_code:
+ 	movl ES(%esp), %edi		# get the function address
+ 	movl %eax, ORIG_EAX(%esp)
+ 	movl %ecx, ES(%esp)
+-	movl %esp, %edx
+ 	pushl %esi			# push the error code
+-	pushl %edx			# push the pt_regs pointer
+ 	movl $(__USER_DS), %edx
+ 	movl %edx, %ds
+ 	movl %edx, %es
++
++/* clobbers edx, ebx and ebp */
++	__SWITCH_KERNELSPACE
++
++	leal 4(%esp), %edx		# prepare pt_regs
++	pushl %edx			# push pt_regs
++
+ 	call *%edi
+ 	addl $8, %esp
+ 	jmp ret_from_exception
+@@ -527,7 +691,7 @@ nmi_stack_correct:
+ 	pushl %edx
+ 	call do_nmi
+ 	addl $8, %esp
+-	RESTORE_ALL
++	jmp restore_all
+ 
+ nmi_stack_fixup:
+ 	FIX_STACK(12,nmi_stack_correct, 1)
+@@ -595,7 +759,7 @@ ENTRY(page_fault)
+ #ifdef CONFIG_X86_MCE
+ ENTRY(machine_check)
+ 	pushl $0
+-	pushl $do_machine_check
++	pushl machine_check_vector
+ 	jmp error_code
+ #endif
+ 
+@@ -604,6 +768,8 @@ ENTRY(spurious_interrupt_bug)
+ 	pushl $do_spurious_interrupt_bug
+ 	jmp error_code
+ 
++.previous
++
+ .data
+ ENTRY(sys_call_table)
+ 	.long sys_restart_syscall	/* 0 - old "setup()" system call, used for restarting */
+@@ -879,5 +1045,60 @@ ENTRY(sys_call_table)
+ 	.long sys_tgkill	/* 270 */
+ 	.long sys_utimes
+  	.long sys_fadvise64_64
++	.long sys_ni_syscall	/* sys_vserver */
+ 
+ nr_syscalls=(.-sys_call_table)/4
++
++
++#	Here we do call frames.  We cheat a bit as we only really need
++#	correct frames at locations we can actually look at from a
++#	debugger.  Since the break instruction trap actually goes thru
++#	some of this code, we don't really need info on those areas, but
++#	only after the fact.  I.e. if we can not step or break in a
++#	location or end up with a return address pointing at the
++#	location, we don't need a correct call frame for it.
++
++#if 0
++
++#include <linux/dwarf2-lang.h>
++/*
++ * The register numbers as known by gdb
++ */
++#define _EAX 0
++#define _ECX 1
++#define _EDX 2
++#define _EBX 3
++#define _ESP 4
++#define _EBP 5
++#define _ESI 6
++#define _EDI 7
++#define _PC  8
++#define _EIP 8
++#define _PS  9
++#define _EFLAGS  9
++#define _CS 10
++#define _SS 11
++#define _DS 12
++#define _ES 13
++#define _FS 14
++#define _GS 15
++
++	CFI_preamble(c1,_PC,1,1)
++	CFA_define_reference(_ESP,OLDESP)
++	CFA_define_offset(_EIP,EIP)
++	CFA_define_offset(_EBX,EBX)
++	CFA_define_offset(_ECX,ECX)
++	CFA_define_offset(_EDX,EDX)
++	CFA_define_offset(_ESI,ESI)
++	CFA_define_offset(_EDI,EDI)
++	CFA_define_offset(_EBP,EBP)
++	CFA_define_offset(_EAX,EAX)
++	CFA_define_offset(_EFLAGS,EFLAGS)
++	CFA_define_offset(_CS,CS)
++	CFA_define_offset(_DS,DS)
++	CFA_define_offset(_ES,ES)
++	CFI_postamble(c1)
++
++	FDE_preamble(c1,f1,ret_from_intr,(divide_error - ret_from_intr))
++	FDE_postamble(f1)
++#endif
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/arch/i386/kernel/entry_trampoline.c	2003-10-05 00:36:48.000000000 -0700
+@@ -0,0 +1,75 @@
++/*
++ * linux/arch/i386/kernel/entry_trampoline.c
++ *
++ * (C) Copyright 2003 Ingo Molnar
++ *
++ * This file contains the needed support code for 4GB userspace
++ */
++
++#include <linux/init.h>
++#include <linux/smp.h>
++#include <linux/mm.h>
++#include <linux/sched.h>
++#include <linux/kernel.h>
++#include <linux/string.h>
++#include <linux/highmem.h>
++#include <asm/desc.h>
++#include <asm/atomic_kmap.h>
++
++extern char __entry_tramp_start, __entry_tramp_end, __start___entry_text;
++
++void __init init_entry_mappings(void)
++{
++#ifdef CONFIG_X86_HIGH_ENTRY
++	void *tramp;
++
++	/*
++	 * We need a high IDT and GDT for the 4G/4G split:
++	 */
++	trap_init_virtual_IDT();
++
++	__set_fixmap(FIX_ENTRY_TRAMPOLINE_0, __pa((unsigned long)&__entry_tramp_start), PAGE_KERNEL);
++	__set_fixmap(FIX_ENTRY_TRAMPOLINE_1, __pa((unsigned long)&__entry_tramp_start) + PAGE_SIZE, PAGE_KERNEL);
++	tramp = (void *)fix_to_virt(FIX_ENTRY_TRAMPOLINE_0);
++
++	printk("mapped 4G/4G trampoline to %p.\n", tramp);
++	BUG_ON((void *)&__start___entry_text != tramp);
++	/*
++	 * Virtual kernel stack:
++	 */
++	BUG_ON(__kmap_atomic_vaddr(KM_VSTACK0) & 8191);
++	BUG_ON(sizeof(struct desc_struct)*NR_CPUS*GDT_ENTRIES > 2*PAGE_SIZE);
++	BUG_ON((unsigned int)&__entry_tramp_end - (unsigned int)&__entry_tramp_start > 2*PAGE_SIZE);
++
++	/*
++	 * set up the initial thread's virtual stack related
++	 * fields:
++	 */
++	current->thread.stack_page0 = virt_to_page((char *)current->thread_info);
++	current->thread.stack_page1 = virt_to_page((char *)current->thread_info + PAGE_SIZE);
++	current->thread_info->virtual_stack = (void *)__kmap_atomic_vaddr(KM_VSTACK0);
++
++	__kunmap_atomic_type(KM_VSTACK0);
++	__kunmap_atomic_type(KM_VSTACK1);
++        __kmap_atomic(current->thread.stack_page0, KM_VSTACK0);
++        __kmap_atomic(current->thread.stack_page1, KM_VSTACK1);
++
++#endif
++	printk("current: %p\n", current);
++	printk("current->thread_info: %p\n", current->thread_info);
++	current->thread_info->real_stack = (void *)current->thread_info;
++	current->thread_info->user_pgd = NULL;
++	current->thread.esp0 = (unsigned long)current->thread_info->real_stack + THREAD_SIZE;
++}
++
++
++
++void __init entry_trampoline_setup(void)
++{
++	/*
++	 * old IRQ entries set up by the boot code will still hang
++	 * around - they are a sign of hw trouble anyway, now they'll
++	 * produce a double fault message.
++	 */
++	trap_init_virtual_GDT();
++}
+--- linux-2.6.0-test6/arch/i386/kernel/head.S	2003-08-22 19:23:40.000000000 -0700
++++ 25/arch/i386/kernel/head.S	2003-10-05 00:36:48.000000000 -0700
+@@ -16,6 +16,7 @@
+ #include <asm/pgtable.h>
+ #include <asm/desc.h>
+ #include <asm/cache.h>
++#include <asm/asm_offsets.h>
+ 
+ #define OLD_CL_MAGIC_ADDR	0x90020
+ #define OLD_CL_MAGIC		0xA33F
+@@ -330,7 +331,7 @@ ENTRY(stack_start)
+ 
+ /* This is the default interrupt "handler" :-) */
+ int_msg:
+-	.asciz "Unknown interrupt\n"
++	.asciz "Unknown interrupt or fault at EIP %p %p %p\n"
+ 	ALIGN
+ ignore_int:
+ 	cld
+@@ -342,9 +343,17 @@ ignore_int:
+ 	movl $(__KERNEL_DS),%eax
+ 	movl %eax,%ds
+ 	movl %eax,%es
++	pushl 16(%esp)
++	pushl 24(%esp)
++	pushl 32(%esp)
++	pushl 40(%esp)
+ 	pushl $int_msg
+ 	call printk
+ 	popl %eax
++	popl %eax
++	popl %eax
++	popl %eax
++	popl %eax
+ 	popl %ds
+ 	popl %es
+ 	popl %edx
+@@ -377,23 +386,27 @@ cpu_gdt_descr:
+ 	.fill NR_CPUS-1,8,0		# space for the other GDT descriptors
+ 
+ /*
+- * This is initialized to create an identity-mapping at 0-8M (for bootup
+- * purposes) and another mapping of the 0-8M area at virtual address
++ * This is initialized to create an identity-mapping at 0-16M (for bootup
++ * purposes) and another mapping of the 0-16M area at virtual address
+  * PAGE_OFFSET.
+  */
+ .org 0x1000
+ ENTRY(swapper_pg_dir)
+ 	.long 0x00102007
+ 	.long 0x00103007
+-	.fill BOOT_USER_PGD_PTRS-2,4,0
+-	/* default: 766 entries */
++	.long 0x00104007
++	.long 0x00105007
++	.fill BOOT_USER_PGD_PTRS-4,4,0
++	/* default: 764 entries */
+ 	.long 0x00102007
+ 	.long 0x00103007
+-	/* default: 254 entries */
+-	.fill BOOT_KERNEL_PGD_PTRS-2,4,0
++	.long 0x00104007
++	.long 0x00105007
++	/* default: 252 entries */
++	.fill BOOT_KERNEL_PGD_PTRS-4,4,0
+ 
+ /*
+- * The page tables are initialized to only 8MB here - the final page
++ * The page tables are initialized to only 16MB here - the final page
+  * tables are set up later depending on memory size.
+  */
+ .org 0x2000
+@@ -402,15 +415,21 @@ ENTRY(pg0)
+ .org 0x3000
+ ENTRY(pg1)
+ 
++.org 0x4000
++ENTRY(pg2)
++
++.org 0x5000
++ENTRY(pg3)
++
+ /*
+  * empty_zero_page must immediately follow the page tables ! (The
+  * initialization loop counts until empty_zero_page)
+  */
+ 
+-.org 0x4000
++.org 0x6000
+ ENTRY(empty_zero_page)
+ 
+-.org 0x5000
++.org 0x7000
+ 
+ /*
+  * Real beginning of normal "text" segment
+@@ -419,12 +438,12 @@ ENTRY(stext)
+ ENTRY(_stext)
+ 
+ /*
+- * This starts the data section. Note that the above is all
+- * in the text section because it has alignment requirements
+- * that we cannot fulfill any other way.
++ * This starts the data section.
+  */
+ .data
+ 
++.align PAGE_SIZE_asm
++
+ /*
+  * The Global Descriptor Table contains 28 quadwords, per-CPU.
+  */
+@@ -439,7 +458,9 @@ ENTRY(boot_gdt_table)
+ 	.quad 0x00cf9a000000ffff	/* kernel 4GB code at 0x00000000 */
+ 	.quad 0x00cf92000000ffff	/* kernel 4GB data at 0x00000000 */
+ #endif
+-	.align L1_CACHE_BYTES
++
++.align PAGE_SIZE_asm
++
+ ENTRY(cpu_gdt_table)
+ 	.quad 0x0000000000000000	/* NULL descriptor */
+ 	.quad 0x0000000000000000	/* 0x0b reserved */
+--- linux-2.6.0-test6/arch/i386/kernel/i386_ksyms.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/i386/kernel/i386_ksyms.c	2003-10-05 00:36:48.000000000 -0700
+@@ -98,7 +98,6 @@ EXPORT_SYMBOL_NOVERS(__down_failed_inter
+ EXPORT_SYMBOL_NOVERS(__down_failed_trylock);
+ EXPORT_SYMBOL_NOVERS(__up_wakeup);
+ /* Networking helper routines. */
+-EXPORT_SYMBOL(csum_partial_copy_generic);
+ /* Delay loops */
+ EXPORT_SYMBOL(__ndelay);
+ EXPORT_SYMBOL(__udelay);
+@@ -112,13 +111,17 @@ EXPORT_SYMBOL_NOVERS(__get_user_4);
+ EXPORT_SYMBOL(strpbrk);
+ EXPORT_SYMBOL(strstr);
+ 
++#if !defined(CONFIG_X86_UACCESS_INDIRECT)
+ EXPORT_SYMBOL(strncpy_from_user);
+-EXPORT_SYMBOL(__strncpy_from_user);
++EXPORT_SYMBOL(__direct_strncpy_from_user);
+ EXPORT_SYMBOL(clear_user);
+ EXPORT_SYMBOL(__clear_user);
+ EXPORT_SYMBOL(__copy_from_user_ll);
+ EXPORT_SYMBOL(__copy_to_user_ll);
+ EXPORT_SYMBOL(strnlen_user);
++#else /* CONFIG_X86_UACCESS_INDIRECT */
++EXPORT_SYMBOL(direct_csum_partial_copy_generic);
++#endif
+ 
+ EXPORT_SYMBOL(dma_alloc_coherent);
+ EXPORT_SYMBOL(dma_free_coherent);
+--- linux-2.6.0-test6/arch/i386/kernel/i387.c	2003-06-14 12:18:51.000000000 -0700
++++ 25/arch/i386/kernel/i387.c	2003-10-05 00:36:48.000000000 -0700
+@@ -219,6 +219,7 @@ void set_fpu_mxcsr( struct task_struct *
+ static int convert_fxsr_to_user( struct _fpstate __user *buf,
+ 					struct i387_fxsave_struct *fxsave )
+ {
++	struct _fpreg tmp[8]; /* 80 bytes scratch area */
+ 	unsigned long env[7];
+ 	struct _fpreg __user *to;
+ 	struct _fpxreg *from;
+@@ -235,23 +236,25 @@ static int convert_fxsr_to_user( struct 
+ 	if ( __copy_to_user( buf, env, 7 * sizeof(unsigned long) ) )
+ 		return 1;
+ 
+-	to = &buf->_st[0];
++	to = tmp;
+ 	from = (struct _fpxreg *) &fxsave->st_space[0];
+ 	for ( i = 0 ; i < 8 ; i++, to++, from++ ) {
+ 		unsigned long *t = (unsigned long *)to;
+ 		unsigned long *f = (unsigned long *)from;
+ 
+-		if (__put_user(*f, t) ||
+-				__put_user(*(f + 1), t + 1) ||
+-				__put_user(from->exponent, &to->exponent))
+-			return 1;
++		*t = *f;
++		*(t + 1) = *(f+1);
++		to->exponent = from->exponent;
+ 	}
++	if (copy_to_user(buf->_st, tmp, sizeof(struct _fpreg [8])))
++		return 1;
+ 	return 0;
+ }
+ 
+ static int convert_fxsr_from_user( struct i387_fxsave_struct *fxsave,
+ 					  struct _fpstate __user *buf )
+ {
++	struct _fpreg tmp[8]; /* 80 bytes scratch area */
+ 	unsigned long env[7];
+ 	struct _fpxreg *to;
+ 	struct _fpreg __user *from;
+@@ -259,6 +262,8 @@ static int convert_fxsr_from_user( struc
+ 
+ 	if ( __copy_from_user( env, buf, 7 * sizeof(long) ) )
+ 		return 1;
++	if (copy_from_user(tmp, buf->_st, sizeof(struct _fpreg [8])))
++		return 1;
+ 
+ 	fxsave->cwd = (unsigned short)(env[0] & 0xffff);
+ 	fxsave->swd = (unsigned short)(env[1] & 0xffff);
+@@ -270,15 +275,14 @@ static int convert_fxsr_from_user( struc
+ 	fxsave->fos = env[6];
+ 
+ 	to = (struct _fpxreg *) &fxsave->st_space[0];
+-	from = &buf->_st[0];
++	from = tmp;
+ 	for ( i = 0 ; i < 8 ; i++, to++, from++ ) {
+ 		unsigned long *t = (unsigned long *)to;
+ 		unsigned long *f = (unsigned long *)from;
+ 
+-		if (__get_user(*t, f) ||
+-				__get_user(*(t + 1), f + 1) ||
+-				__get_user(to->exponent, &from->exponent))
+-			return 1;
++		*t = *f;
++		*(t + 1) = *(f + 1);
++		to->exponent = from->exponent;
+ 	}
+ 	return 0;
+ }
+@@ -549,13 +553,3 @@ int dump_task_extended_fpu(struct task_s
+ 	}
+ 	return fpvalid;
+ }
+-
+-
+-#ifdef CONFIG_SMP
+-void dump_smp_unlazy_fpu(void)
+-{
+-	unlazy_fpu(current);
+-	return;
+-}
+-#endif
+-
+--- linux-2.6.0-test6/arch/i386/kernel/i8259.c	2003-06-14 12:18:34.000000000 -0700
++++ 25/arch/i386/kernel/i8259.c	2003-10-05 00:36:20.000000000 -0700
+@@ -419,8 +419,10 @@ void __init init_IRQ(void)
+ 	 * us. (some of these will be overridden and become
+ 	 * 'special' SMP interrupts)
+ 	 */
+-	for (i = 0; i < NR_IRQS; i++) {
++	for (i = 0; i < (NR_VECTORS - FIRST_EXTERNAL_VECTOR); i++) {
+ 		int vector = FIRST_EXTERNAL_VECTOR + i;
++		if (i >= NR_IRQS)
++			break;
+ 		if (vector != SYSCALL_VECTOR) 
+ 			set_intr_gate(vector, interrupt[i]);
+ 	}
+--- linux-2.6.0-test6/arch/i386/kernel/init_task.c	2003-06-14 12:18:35.000000000 -0700
++++ 25/arch/i386/kernel/init_task.c	2003-10-05 00:36:48.000000000 -0700
+@@ -23,7 +23,7 @@ struct mm_struct init_mm = INIT_MM(init_
+  */
+ union thread_union init_thread_union 
+ 	__attribute__((__section__(".data.init_task"))) =
+-		{ INIT_THREAD_INFO(init_task) };
++		{ INIT_THREAD_INFO(init_task, init_thread_union) };
+ 
+ /*
+  * Initial task structure.
+@@ -39,5 +39,5 @@ struct task_struct init_task = INIT_TASK
+  * section. Since TSS's are completely CPU-local, we want them
+  * on exact cacheline boundaries, to eliminate cacheline ping-pong.
+  */ 
+-struct tss_struct init_tss[NR_CPUS] __cacheline_aligned = { [0 ... NR_CPUS-1] = INIT_TSS };
++struct tss_struct init_tss[NR_CPUS] __attribute__((__section__(".data.tss"))) = { [0 ... NR_CPUS-1] = INIT_TSS };
+ 
+--- linux-2.6.0-test6/arch/i386/kernel/io_apic.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/i386/kernel/io_apic.c	2003-10-05 00:36:27.000000000 -0700
+@@ -76,6 +76,14 @@ static struct irq_pin_list {
+ 	int apic, pin, next;
+ } irq_2_pin[PIN_MAP_SIZE];
+ 
++#ifdef CONFIG_PCI_USE_VECTOR
++int vector_irq[NR_IRQS] = { [0 ... NR_IRQS -1] = -1};
++#define vector_to_irq(vector) 	\
++	(platform_legacy_irq(vector) ? vector : vector_irq[vector])
++#else
++#define vector_to_irq(vector)	(vector)
++#endif
++
+ /*
+  * The common case is 1:1 IRQ<->pin mappings. Sometimes there are
+  * shared ISA-space IRQs, so we have to support them. We are super
+@@ -249,7 +257,7 @@ static void clear_IO_APIC (void)
+ 			clear_IO_APIC_pin(apic, pin);
+ }
+ 
+-static void set_ioapic_affinity(unsigned int irq, cpumask_t cpumask)
++static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t cpumask)
+ {
+ 	unsigned long flags;
+ 	int pin;
+@@ -288,7 +296,7 @@ static void set_ioapic_affinity(unsigned
+ 
+ extern cpumask_t irq_affinity[NR_IRQS];
+ 
+-static cpumask_t __cacheline_aligned pending_irq_balance_cpumask[NR_IRQS];
++cpumask_t __cacheline_aligned pending_irq_balance_cpumask[NR_IRQS];
+ 
+ #define IRQBALANCE_CHECK_ARCH -999
+ static int irqbalance_disabled = IRQBALANCE_CHECK_ARCH;
+@@ -670,13 +678,11 @@ static int __init irqbalance_disable(cha
+ 
+ __setup("noirqbalance", irqbalance_disable);
+ 
+-static void set_ioapic_affinity(unsigned int irq, cpumask_t mask);
+-
+ static inline void move_irq(int irq)
+ {
+ 	/* note - we hold the desc->lock */
+ 	if (unlikely(!cpus_empty(pending_irq_balance_cpumask[irq]))) {
+-		set_ioapic_affinity(irq, pending_irq_balance_cpumask[irq]);
++		set_ioapic_affinity_irq(irq, pending_irq_balance_cpumask[irq]);
+ 		cpus_clear(pending_irq_balance_cpumask[irq]);
+ 	}
+ }
+@@ -853,7 +859,7 @@ void __init setup_ioapic_dest(cpumask_t 
+ 			if (irq_entry == -1)
+ 				continue;
+ 			irq = pin_2_irq(irq_entry, ioapic, pin);
+-			set_ioapic_affinity(irq, mask);
++			set_ioapic_affinity_irq(irq, mask);
+ 		}
+ 
+ 	}
+@@ -1138,12 +1144,14 @@ static inline int IO_APIC_irq_trigger(in
+ 	return 0;
+ }
+ 
+-int irq_vector[NR_IRQS] = { FIRST_DEVICE_VECTOR , 0 };
++u8 *irq_vector;
++int nr_irqs;
+ 
+-static int __init assign_irq_vector(int irq)
++#ifndef CONFIG_PCI_USE_VECTOR
++int __init assign_irq_vector(int irq)
+ {
+ 	static int current_vector = FIRST_DEVICE_VECTOR, offset = 0;
+-	BUG_ON(irq >= NR_IRQS);
++	BUG_ON(irq >= nr_irqs);
+ 	if (IO_APIC_VECTOR(irq) > 0)
+ 		return IO_APIC_VECTOR(irq);
+ next:
+@@ -1157,11 +1165,36 @@ next:
+ 	}
+ 
+ 	IO_APIC_VECTOR(irq) = current_vector;
++
+ 	return current_vector;
+ }
++#endif
+ 
+-static struct hw_interrupt_type ioapic_level_irq_type;
+-static struct hw_interrupt_type ioapic_edge_irq_type;
++static struct hw_interrupt_type ioapic_level_type;
++static struct hw_interrupt_type ioapic_edge_type;
++
++#define IOAPIC_AUTO	-1
++#define IOAPIC_EDGE	0
++#define IOAPIC_LEVEL	1
++
++static inline void ioapic_register_intr(int irq, int vector, unsigned long trigger)
++{
++	if (use_pci_vector() && !platform_legacy_irq(irq)) {
++		if ((trigger == IOAPIC_AUTO && IO_APIC_irq_trigger(irq)) ||
++				trigger == IOAPIC_LEVEL)
++			irq_desc[vector].handler = &ioapic_level_type;
++		else
++			irq_desc[vector].handler = &ioapic_edge_type;
++		set_intr_gate(vector, interrupt[vector]);
++	} else	{
++		if ((trigger == IOAPIC_AUTO && IO_APIC_irq_trigger(irq)) ||
++				trigger == IOAPIC_LEVEL)
++			irq_desc[irq].handler = &ioapic_level_type;
++		else
++			irq_desc[irq].handler = &ioapic_edge_type;
++		set_intr_gate(vector, interrupt[irq]);
++	}
++}
+ 
+ void __init setup_IO_APIC_irqs(void)
+ {
+@@ -1219,13 +1252,7 @@ void __init setup_IO_APIC_irqs(void)
+ 		if (IO_APIC_IRQ(irq)) {
+ 			vector = assign_irq_vector(irq);
+ 			entry.vector = vector;
+-
+-			if (IO_APIC_irq_trigger(irq))
+-				irq_desc[irq].handler = &ioapic_level_irq_type;
+-			else
+-				irq_desc[irq].handler = &ioapic_edge_irq_type;
+-
+-			set_intr_gate(vector, interrupt[irq]);
++			ioapic_register_intr(irq, vector, IOAPIC_AUTO);
+ 		
+ 			if (!apic && (irq < 16))
+ 				disable_8259A_irq(irq);
+@@ -1272,7 +1299,7 @@ void __init setup_ExtINT_IRQ0_pin(unsign
+ 	 * The timer IRQ doesn't have to know that behind the
+ 	 * scene we have a 8259A-master in AEOI mode ...
+ 	 */
+-	irq_desc[0].handler = &ioapic_edge_irq_type;
++	irq_desc[0].handler = &ioapic_edge_type;
+ 
+ 	/*
+ 	 * Add it to the IO-APIC irq-routing table:
+@@ -1762,9 +1789,6 @@ static int __init timer_irq_works(void)
+  * that was delayed but this is now handled in the device
+  * independent code.
+  */
+-#define enable_edge_ioapic_irq unmask_IO_APIC_irq
+-
+-static void disable_edge_ioapic_irq (unsigned int irq) { /* nothing */ }
+ 
+ /*
+  * Starting up a edge-triggered IO-APIC interrupt is
+@@ -1775,7 +1799,6 @@ static void disable_edge_ioapic_irq (uns
+  * This is not complete - we should be able to fake
+  * an edge even if it isn't on the 8259A...
+  */
+-
+ static unsigned int startup_edge_ioapic_irq(unsigned int irq)
+ {
+ 	int was_pending = 0;
+@@ -1793,8 +1816,6 @@ static unsigned int startup_edge_ioapic_
+ 	return was_pending;
+ }
+ 
+-#define shutdown_edge_ioapic_irq	disable_edge_ioapic_irq
+-
+ /*
+  * Once we have recorded IRQ_PENDING already, we can mask the
+  * interrupt for real. This prevents IRQ storms from unhandled
+@@ -1809,9 +1830,6 @@ static void ack_edge_ioapic_irq(unsigned
+ 	ack_APIC_irq();
+ }
+ 
+-static void end_edge_ioapic_irq (unsigned int i) { /* nothing */ }
+-
+-
+ /*
+  * Level triggered interrupts can just be masked,
+  * and shutting down and starting up the interrupt
+@@ -1833,10 +1851,6 @@ static unsigned int startup_level_ioapic
+ 	return 0; /* don't check for pending */
+ }
+ 
+-#define shutdown_level_ioapic_irq	mask_IO_APIC_irq
+-#define enable_level_ioapic_irq		unmask_IO_APIC_irq
+-#define disable_level_ioapic_irq	mask_IO_APIC_irq
+-
+ static void end_level_ioapic_irq (unsigned int irq)
+ {
+ 	unsigned long v;
+@@ -1863,6 +1877,7 @@ static void end_level_ioapic_irq (unsign
+  * The idea is from Manfred Spraul.  --macro
+  */
+ 	i = IO_APIC_VECTOR(irq);
++
+ 	v = apic_read(APIC_TMR + ((i & ~0x1f) >> 1));
+ 
+ 	ack_APIC_irq();
+@@ -1897,7 +1912,57 @@ static void end_level_ioapic_irq (unsign
+ 	}
+ }
+ 
+-static void mask_and_ack_level_ioapic_irq (unsigned int irq) { /* nothing */ }
++#ifdef CONFIG_PCI_USE_VECTOR
++static unsigned int startup_edge_ioapic_vector(unsigned int vector)
++{
++	int irq = vector_to_irq(vector);
++
++	return startup_edge_ioapic_irq(irq);
++}
++
++static void ack_edge_ioapic_vector(unsigned int vector)
++{
++	int irq = vector_to_irq(vector);
++
++	ack_edge_ioapic_irq(irq);
++}
++
++static unsigned int startup_level_ioapic_vector (unsigned int vector)
++{
++	int irq = vector_to_irq(vector);
++
++	return startup_level_ioapic_irq (irq);
++}
++
++static void end_level_ioapic_vector (unsigned int vector)
++{
++	int irq = vector_to_irq(vector);
++
++	end_level_ioapic_irq(irq);
++}
++
++static void mask_IO_APIC_vector (unsigned int vector)
++{
++	int irq = vector_to_irq(vector);
++
++	mask_IO_APIC_irq(irq);
++}
++
++static void unmask_IO_APIC_vector (unsigned int vector)
++{
++	int irq = vector_to_irq(vector);
++
++	unmask_IO_APIC_irq(irq);
++}
++
++static void set_ioapic_affinity_vector (unsigned int vector,
++					unsigned long cpu_mask)
++{
++	int irq = vector_to_irq(vector);
++
++	set_ioapic_affinity_irq(irq, cpu_mask);
++}
++#endif
+ 
+ /*
+  * Level and edge triggered IO-APIC interrupts need different handling,
+@@ -1907,26 +1972,25 @@ static void mask_and_ack_level_ioapic_ir
+  * edge-triggered handler, without risking IRQ storms and other ugly
+  * races.
+  */
+-
+-static struct hw_interrupt_type ioapic_edge_irq_type = {
++static struct hw_interrupt_type ioapic_edge_type = {
+ 	.typename 	= "IO-APIC-edge",
+-	.startup 	= startup_edge_ioapic_irq,
+-	.shutdown 	= shutdown_edge_ioapic_irq,
+-	.enable 	= enable_edge_ioapic_irq,
+-	.disable 	= disable_edge_ioapic_irq,
+-	.ack 		= ack_edge_ioapic_irq,
+-	.end 		= end_edge_ioapic_irq,
++	.startup 	= startup_edge_ioapic,
++	.shutdown 	= shutdown_edge_ioapic,
++	.enable 	= enable_edge_ioapic,
++	.disable 	= disable_edge_ioapic,
++	.ack 		= ack_edge_ioapic,
++	.end 		= end_edge_ioapic,
+ 	.set_affinity 	= set_ioapic_affinity,
+ };
+ 
+-static struct hw_interrupt_type ioapic_level_irq_type = {
++static struct hw_interrupt_type ioapic_level_type = {
+ 	.typename 	= "IO-APIC-level",
+-	.startup 	= startup_level_ioapic_irq,
+-	.shutdown 	= shutdown_level_ioapic_irq,
+-	.enable 	= enable_level_ioapic_irq,
+-	.disable 	= disable_level_ioapic_irq,
+-	.ack 		= mask_and_ack_level_ioapic_irq,
+-	.end 		= end_level_ioapic_irq,
++	.startup 	= startup_level_ioapic,
++	.shutdown 	= shutdown_level_ioapic,
++	.enable 	= enable_level_ioapic,
++	.disable 	= disable_level_ioapic,
++	.ack 		= mask_and_ack_level_ioapic,
++	.end 		= end_level_ioapic,
+ 	.set_affinity 	= set_ioapic_affinity,
+ };
+ 
+@@ -1946,7 +2010,13 @@ static inline void init_IO_APIC_traps(vo
+ 	 * 0x80, because int 0x80 is hm, kind of importantish. ;)
+ 	 */
+ 	for (irq = 0; irq < NR_IRQS ; irq++) {
+-		if (IO_APIC_IRQ(irq) && !IO_APIC_VECTOR(irq)) {
++		int tmp = irq;
++		if (use_pci_vector()) {
++			if (!platform_legacy_irq(tmp))
++				if ((tmp = vector_to_irq(tmp)) == -1)
++					continue;
++		}
++		if (IO_APIC_IRQ(tmp) && !IO_APIC_VECTOR(tmp)) {
+ 			/*
+ 			 * Hmm.. We don't have an entry for this,
+ 			 * so default to an old-fashioned 8259
+@@ -2378,10 +2448,12 @@ int io_apic_set_pci_routing (int ioapic,
+ 		"IRQ %d Mode:%i Active:%i)\n", ioapic, 
+ 		mp_ioapics[ioapic].mpc_apicid, pin, entry.vector, irq, edge_level, active_high_low);
+ 
++ 	if (use_pci_vector() && !platform_legacy_irq(irq))
++		irq = IO_APIC_VECTOR(irq);
+ 	if (edge_level) {
+-	irq_desc[irq].handler = &ioapic_level_irq_type;
++		irq_desc[irq].handler = &ioapic_level_type;
+ 	} else {
+-		irq_desc[irq].handler = &ioapic_edge_irq_type;
++		irq_desc[irq].handler = &ioapic_edge_type;
+ 	}
+ 
+ 	set_intr_gate(entry.vector, interrupt[irq]);
+--- linux-2.6.0-test6/arch/i386/kernel/irq.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/arch/i386/kernel/irq.c	2003-10-05 00:33:50.000000000 -0700
+@@ -44,6 +44,7 @@
+ #include <asm/delay.h>
+ #include <asm/desc.h>
+ #include <asm/irq.h>
++#include <asm/kgdb.h>
+ 
+ /*
+  * Linux has a controller-independent x86 interrupt architecture.
+@@ -499,6 +500,17 @@ out:
+ 
+ 	irq_exit();
+ 
++#ifdef CONFIG_KGDB
++	/*
++	 * We need to do this after clearing out of all the interrupt
++	 * machinery because kgdb will reenter the NIC driver and the IRQ
++	 * system.  synchronize_irq() (at least) will deadlock.
++	 */
++	if (kgdb_eth_need_breakpoint[smp_processor_id()]) {
++		kgdb_eth_need_breakpoint[smp_processor_id()] = 0;
++		BREAKPOINT;
++	}
++#endif
+ 	return 1;
+ }
+ 
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/arch/i386/kernel/kgdb_stub.c	2003-10-05 00:33:51.000000000 -0700
+@@ -0,0 +1,2492 @@
++/*
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
++ * General Public License for more details.
++ *
++ */
++
++/*
++ * Copyright (c) 2000 VERITAS Software Corporation.
++ *
++ */
++/****************************************************************************
++ *  Header: remcom.c,v 1.34 91/03/09 12:29:49 glenne Exp $
++ *
++ *  Module name: remcom.c $
++ *  Revision: 1.34 $
++ *  Date: 91/03/09 12:29:49 $
++ *  Contributor:     Lake Stevens Instrument Division$
++ *
++ *  Description:     low level support for gdb debugger. $
++ *
++ *  Considerations:  only works on target hardware $
++ *
++ *  Written by:	     Glenn Engel $
++ *  Updated by:	     David Grothe <dave@gcom.com>
++ *  Updated by:	     Robert Walsh <rjwalsh@durables.org>
++ *  Updated by:	     wangdi <wangdi@clusterfs.com>
++ *  ModuleState:     Experimental $
++ *
++ *  NOTES:	     See Below $
++ *
++ *  Modified for 386 by Jim Kingdon, Cygnus Support.
++ *  Compatibility with 2.1.xx kernel by David Grothe <dave@gcom.com>
++ *
++ *  Changes to allow auto initilization.  All that is needed is that it
++ *  be linked with the kernel and a break point (int 3) be executed.
++ *  The header file <asm/kgdb.h> defines BREAKPOINT to allow one to do
++ *  this. It should also be possible, once the interrupt system is up, to
++ *  call putDebugChar("+").  Once this is done, the remote debugger should
++ *  get our attention by sending a ^C in a packet. George Anzinger
++ *  <george@mvista.com>
++ *  Integrated into 2.2.5 kernel by Tigran Aivazian <tigran@sco.com>
++ *  Added thread support, support for multiple processors,
++ *	support for ia-32(x86) hardware debugging.
++ *	Amit S. Kale ( akale@veritas.com )
++ *
++ *  Modified to support debugging over ethernet by Robert Walsh
++ *  <rjwalsh@durables.org> and wangdi <wangdi@clusterfs.com>, based on
++ *  code by San Mehat.
++ *
++ *
++ *  To enable debugger support, two things need to happen.  One, a
++ *  call to set_debug_traps() is necessary in order to allow any breakpoints
++ *  or error conditions to be properly intercepted and reported to gdb.
++ *  Two, a breakpoint needs to be generated to begin communication.  This
++ *  is most easily accomplished by a call to breakpoint().  Breakpoint()
++ *  simulates a breakpoint by executing an int 3.
++ *
++ *************
++ *
++ *    The following gdb commands are supported:
++ *
++ * command	    function				   Return value
++ *
++ *    g		    return the value of the CPU registers  hex data or ENN
++ *    G		    set the value of the CPU registers	   OK or ENN
++ *
++ *    mAA..AA,LLLL  Read LLLL bytes at address AA..AA	   hex data or ENN
++ *    MAA..AA,LLLL: Write LLLL bytes at address AA.AA	   OK or ENN
++ *
++ *    c		    Resume at current address		   SNN	 ( signal NN)
++ *    cAA..AA	    Continue at address AA..AA		   SNN
++ *
++ *    s		    Step one instruction		   SNN
++ *    sAA..AA	    Step one instruction from AA..AA	   SNN
++ *
++ *    k		    kill
++ *
++ *    ?		    What was the last sigval ?		   SNN	 (signal NN)
++ *
++ * All commands and responses are sent with a packet which includes a
++ * checksum.  A packet consists of
++ *
++ * $<packet info>#<checksum>.
++ *
++ * where
++ * <packet info> :: <characters representing the command or response>
++ * <checksum>	 :: < two hex digits computed as modulo 256 sum of <packetinfo>>
++ *
++ * When a packet is received, it is first acknowledged with either '+' or '-'.
++ * '+' indicates a successful transfer.	 '-' indicates a failed transfer.
++ *
++ * Example:
++ *
++ * Host:		  Reply:
++ * $m0,10#2a		   +$00010203040506070809101112131415#42
++ *
++ ****************************************************************************/
++#define KGDB_VERSION "<20030915.1651.33>"
++#include <linux/config.h>
++#include <linux/types.h>
++#include <asm/string.h>		/* for strcpy */
++#include <linux/kernel.h>
++#include <linux/sched.h>
++#include <asm/vm86.h>
++#include <asm/system.h>
++#include <asm/ptrace.h>		/* for linux pt_regs struct */
++#include <asm/kgdb_local.h>
++#include <linux/list.h>
++#include <asm/atomic.h>
++#include <asm/processor.h>
++#include <linux/irq.h>
++#include <asm/desc.h>
++#include <linux/inet.h>
++#include <linux/kallsyms.h>
++
++/************************************************************************
++ *
++ * external low-level support routines
++ */
++typedef void (*Function) (void);	/* pointer to a function */
++
++/* Thread reference */
++typedef unsigned char threadref[8];
++
++extern int tty_putDebugChar(int);     /* write a single character      */
++extern int tty_getDebugChar(void);    /* read and return a single char */
++extern void tty_flushDebugChar(void); /* flush pending characters      */
++extern int eth_putDebugChar(int);     /* write a single character      */
++extern int eth_getDebugChar(void);    /* read and return a single char */
++extern void eth_flushDebugChar(void); /* flush pending characters      */
++extern void kgdb_eth_set_trapmode(int);
++extern void kgdb_eth_reply_arp(void);   /*send arp request */
++extern volatile int kgdb_eth_is_initializing;
++
++
++/************************************************************************/
++/* BUFMAX defines the maximum number of characters in inbound/outbound buffers*/
++/* at least NUMREGBYTES*2 are needed for register packets */
++/* Longer buffer is needed to list all threads */
++#define BUFMAX 400
++
++char *kgdb_version = KGDB_VERSION;
++
++/*  debug >  0 prints ill-formed commands in valid packets & checksum errors */
++int debug_regs = 0;		/* set to non-zero to print registers */
++
++/* filled in by an external module */
++char *gdb_module_offsets;
++
++static const char hexchars[] = "0123456789abcdef";
++
++/* Number of bytes of registers.  */
++#define NUMREGBYTES 64
++/*
++ * Note that this register image is in a different order than
++ * the register image that Linux produces at interrupt time.
++ *
++ * Linux's register image is defined by struct pt_regs in ptrace.h.
++ * Just why GDB uses a different order is a historical mystery.
++ */
++enum regnames { _EAX,		/* 0 */
++	_ECX,			/* 1 */
++	_EDX,			/* 2 */
++	_EBX,			/* 3 */
++	_ESP,			/* 4 */
++	_EBP,			/* 5 */
++	_ESI,			/* 6 */
++	_EDI,			/* 7 */
++	_PC /* 8 also known as eip */ ,
++	_PS /* 9 also known as eflags */ ,
++	_CS,			/* 10 */
++	_SS,			/* 11 */
++	_DS,			/* 12 */
++	_ES,			/* 13 */
++	_FS,			/* 14 */
++	_GS			/* 15 */
++};
++
++/***************************  ASSEMBLY CODE MACROS *************************/
++/*
++ * Put the error code here just in case the user cares.
++ * Likewise, the vector number here (since GDB only gets the signal
++ * number through the usual means, and that's not very specific).
++ * The called_from is the return address so he can tell how we entered kgdb.
++ * This will allow him to seperate out the various possible entries.
++ */
++#define REMOTE_DEBUG 0		/* set != to turn on printing (also available in info) */
++
++#define PID_MAX PID_MAX_DEFAULT
++
++#ifdef CONFIG_SMP
++void smp_send_nmi_allbutself(void);
++#define IF_SMP(x) x
++#undef MAX_NO_CPUS
++#ifndef CONFIG_NO_KGDB_CPUS
++#define CONFIG_NO_KGDB_CPUS 2
++#endif
++#if CONFIG_NO_KGDB_CPUS > NR_CPUS
++#define MAX_NO_CPUS NR_CPUS
++#else
++#define MAX_NO_CPUS CONFIG_NO_KGDB_CPUS
++#endif
++#define hold_init hold_on_sstep: 1,
++#define MAX_CPU_MASK (unsigned long)((1LL << MAX_NO_CPUS) - 1LL)
++#define NUM_CPUS num_online_cpus()
++#else
++#define IF_SMP(x)
++#define hold_init
++#undef MAX_NO_CPUS
++#define MAX_NO_CPUS 1
++#define NUM_CPUS 1
++#endif
++#define NOCPU (struct task_struct *)0xbad1fbad
++/* *INDENT-OFF*	 */
++struct kgdb_info {
++	int used_malloc;
++	void *called_from;
++	long long entry_tsc;
++	int errcode;
++	int vector;
++	int print_debug_info;
++#ifdef CONFIG_SMP
++	int hold_on_sstep;
++	struct {
++		volatile struct task_struct *task;
++		int pid;
++		int hold;
++		struct pt_regs *regs;
++	} cpus_waiting[MAX_NO_CPUS];
++#endif
++} kgdb_info = {hold_init print_debug_info:REMOTE_DEBUG, vector:-1};
++
++/* *INDENT-ON*	*/
++
++#define used_m kgdb_info.used_malloc
++/*
++ * This is little area we set aside to contain the stack we
++ * need to build to allow gdb to call functions.  We use one
++ * per cpu to avoid locking issues.  We will do all this work
++ * with interrupts off so that should take care of the protection
++ * issues.
++ */
++#define LOOKASIDE_SIZE 200	/* should be more than enough */
++#define MALLOC_MAX   200	/* Max malloc size */
++struct {
++	unsigned int esp;
++	int array[LOOKASIDE_SIZE];
++} fn_call_lookaside[MAX_NO_CPUS];
++
++static int trap_cpu;
++static unsigned int OLD_esp;
++
++#define END_OF_LOOKASIDE  &fn_call_lookaside[trap_cpu].array[LOOKASIDE_SIZE]
++#define IF_BIT 0x200
++#define TF_BIT 0x100
++
++#define MALLOC_ROUND 8-1
++
++static char malloc_array[MALLOC_MAX];
++IF_SMP(static void to_gdb(const char *mess));
++void *
++malloc(int size)
++{
++
++	if (size <= (MALLOC_MAX - used_m)) {
++		int old_used = used_m;
++		used_m += ((size + MALLOC_ROUND) & (~MALLOC_ROUND));
++		return &malloc_array[old_used];
++	} else {
++		return NULL;
++	}
++}
++
++/*
++ * I/O dispatch functions...
++ * Based upon kgdb_eth, either call the ethernet
++ * handler or the serial one..
++ */
++void
++putDebugChar(int c)
++{
++	if (kgdb_eth == -1) {
++		tty_putDebugChar(c);
++	} else {
++		eth_putDebugChar(c);
++	}
++}
++
++int
++getDebugChar(void)
++{
++	if (kgdb_eth == -1) {
++		return tty_getDebugChar();
++	} else {
++		return eth_getDebugChar();
++	}
++}
++
++void
++flushDebugChar(void)
++{
++	if (kgdb_eth == -1) {
++		tty_flushDebugChar();
++	} else {
++		eth_flushDebugChar();
++	}
++}
++
++/*
++ * Gdb calls functions by pushing agruments, including a return address
++ * on the stack and the adjusting EIP to point to the function.	 The
++ * whole assumption in GDB is that we are on a different stack than the
++ * one the "user" i.e. code that hit the break point, is on.  This, of
++ * course is not true in the kernel.  Thus various dodges are needed to
++ * do the call without directly messing with EIP (which we can not change
++ * as it is just a location and not a register.	 To adjust it would then
++ * require that we move every thing below EIP up or down as needed.  This
++ * will not work as we may well have stack relative pointer on the stack
++ * (such as the pointer to regs, for example).
++
++ * So here is what we do:
++ * We detect gdb attempting to store into the stack area and instead, store
++ * into the fn_call_lookaside.array at the same relative location as if it
++ * were the area ESP pointed at.  We also trap ESP modifications
++ * and uses these to adjust fn_call_lookaside.esp.  On entry
++ * fn_call_lookaside.esp will be set to point at the last entry in
++ * fn_call_lookaside.array.  This allows us to check if it has changed, and
++ * if so, on exit, we add the registers we will use to do the move and a
++ * trap/ interrupt return exit sequence.  We then adjust the eflags in the
++ * regs array (remember we now have a copy in the fn_call_lookaside.array) to
++ * kill the interrupt bit, AND we change EIP to point at our set up stub.
++ * As part of the register set up we preset the registers to point at the
++ * begining and end of the fn_call_lookaside.array, so all the stub needs to
++ * do is move words from the array to the stack until ESP= the desired value
++ * then do the rti.  This will then transfer to the desired function with
++ * all the correct registers.  Nifty huh?
++ */
++extern asmlinkage void fn_call_stub(void);
++extern asmlinkage void fn_rtn_stub(void);
++/*					   *INDENT-OFF*	 */
++__asm__("fn_rtn_stub:\n\t"
++	"movl %eax,%esp\n\t"
++	"fn_call_stub:\n\t"
++	"1:\n\t"
++	"addl $-4,%ebx\n\t"
++	"movl (%ebx), %eax\n\t"
++	"pushl %eax\n\t"
++	"cmpl %esp,%ecx\n\t"
++	"jne  1b\n\t"
++	"popl %eax\n\t"
++	"popl %ebx\n\t"
++	"popl %ecx\n\t"
++	"iret \n\t");
++/*					     *INDENT-ON*  */
++#define gdb_i386vector	kgdb_info.vector
++#define gdb_i386errcode kgdb_info.errcode
++#define waiting_cpus	kgdb_info.cpus_waiting
++#define remote_debug	kgdb_info.print_debug_info
++#define hold_cpu(cpu)	kgdb_info.cpus_waiting[cpu].hold
++/* gdb locks */
++
++#ifdef CONFIG_SMP
++static int in_kgdb_called;
++static spinlock_t waitlocks[MAX_NO_CPUS] =
++    {[0 ... MAX_NO_CPUS - 1] = SPIN_LOCK_UNLOCKED };
++/*
++ * The following array has the thread pointer of each of the "other"
++ * cpus.  We make it global so it can be seen by gdb.
++ */
++volatile int in_kgdb_entry_log[MAX_NO_CPUS];
++volatile struct pt_regs *in_kgdb_here_log[MAX_NO_CPUS];
++/*
++static spinlock_t continuelocks[MAX_NO_CPUS];
++*/
++spinlock_t kgdb_spinlock = SPIN_LOCK_UNLOCKED;
++/* waiters on our spinlock plus us */
++static atomic_t spinlock_waiters = ATOMIC_INIT(1);
++static int spinlock_count = 0;
++static int spinlock_cpu = 0;
++/*
++ * Note we use nested spin locks to account for the case where a break
++ * point is encountered when calling a function by user direction from
++ * kgdb. Also there is the memory exception recursion to account for.
++ * Well, yes, but this lets other cpus thru too.  Lets add a
++ * cpu id to the lock.
++ */
++#define KGDB_SPIN_LOCK(x) if( spinlock_count == 0 || \
++			      spinlock_cpu != smp_processor_id()){\
++				      atomic_inc(&spinlock_waiters); \
++				      while (! spin_trylock(x)) {\
++					    in_kgdb(&regs);\
++				      }\
++				      atomic_dec(&spinlock_waiters); \
++				      spinlock_count = 1; \
++				      spinlock_cpu = smp_processor_id(); \
++			  }else{  \
++				      spinlock_count++; \
++			  }
++#define KGDB_SPIN_UNLOCK(x) if( --spinlock_count == 0) spin_unlock(x)
++#else
++unsigned kgdb_spinlock = 0;
++#define KGDB_SPIN_LOCK(x) --*x
++#define KGDB_SPIN_UNLOCK(x) ++*x
++#endif
++
++int
++hex(char ch)
++{
++	if ((ch >= 'a') && (ch <= 'f'))
++		return (ch - 'a' + 10);
++	if ((ch >= '0') && (ch <= '9'))
++		return (ch - '0');
++	if ((ch >= 'A') && (ch <= 'F'))
++		return (ch - 'A' + 10);
++	return (-1);
++}
++
++/* scan for the sequence $<data>#<checksum>	*/
++void
++getpacket(char *buffer)
++{
++	unsigned char checksum;
++	unsigned char xmitcsum;
++	int i;
++	int count;
++	char ch;
++
++	do {
++		/* wait around for the start character, ignore all other characters */
++		while ((ch = (getDebugChar() & 0x7f)) != '$') ;
++		checksum = 0;
++		xmitcsum = -1;
++
++		count = 0;
++
++		/* now, read until a # or end of buffer is found */
++		while (count < BUFMAX) {
++			ch = getDebugChar() & 0x7f;
++			if (ch == '#')
++				break;
++			checksum = checksum + ch;
++			buffer[count] = ch;
++			count = count + 1;
++		}
++		buffer[count] = 0;
++
++		if (ch == '#') {
++			xmitcsum = hex(getDebugChar() & 0x7f) << 4;
++			xmitcsum += hex(getDebugChar() & 0x7f);
++			if ((remote_debug) && (checksum != xmitcsum)) {
++				printk
++				    ("bad checksum.	My count = 0x%x, sent=0x%x. buf=%s\n",
++				     checksum, xmitcsum, buffer);
++			}
++
++			if (checksum != xmitcsum)
++				putDebugChar('-');	/* failed checksum */
++			else {
++				putDebugChar('+');	/* successful transfer */
++				/* if a sequence char is present, reply the sequence ID */
++				if (buffer[2] == ':') {
++					putDebugChar(buffer[0]);
++					putDebugChar(buffer[1]);
++					/* remove sequence chars from buffer */
++					count = strlen(buffer);
++					for (i = 3; i <= count; i++)
++						buffer[i - 3] = buffer[i];
++				}
++			}
++		}
++	} while (checksum != xmitcsum);
++
++	if (remote_debug)
++		printk("R:%s\n", buffer);
++	flushDebugChar();
++}
++
++/* send the packet in buffer.  */
++
++void
++putpacket(char *buffer)
++{
++	unsigned char checksum;
++	int count;
++	char ch;
++
++	/*  $<packet info>#<checksum>. */
++
++	if (kgdb_eth == -1) {
++		do {
++			if (remote_debug)
++				printk("T:%s\n", buffer);
++			putDebugChar('$');
++			checksum = 0;
++			count = 0;
++
++			while ((ch = buffer[count])) {
++				putDebugChar(ch);
++				checksum += ch;
++				count += 1;
++			}
++
++			putDebugChar('#');
++			putDebugChar(hexchars[checksum >> 4]);
++			putDebugChar(hexchars[checksum % 16]);
++			flushDebugChar();
++
++		} while ((getDebugChar() & 0x7f) != '+');
++	} else {
++		/*
++		 * For udp, we can not transfer too much bytes once.
++		 * We only transfer MAX_SEND_COUNT size bytes each time
++		 */
++
++#define MAX_SEND_COUNT 30
++
++		int send_count = 0, i = 0;
++		char send_buf[MAX_SEND_COUNT];
++
++		do {
++			if (remote_debug)
++				printk("T:%s\n", buffer);
++			putDebugChar('$');
++			checksum = 0;
++			count = 0;
++			send_count = 0;
++			while ((ch = buffer[count])) {
++				if (send_count >= MAX_SEND_COUNT) {
++					for(i = 0; i < MAX_SEND_COUNT; i++) {
++						putDebugChar(send_buf[i]);
++					}
++					flushDebugChar();
++					send_count = 0;
++				} else {
++					send_buf[send_count] = ch;
++					checksum += ch;
++					count ++;
++					send_count++;
++				}
++			}
++			for(i = 0; i < send_count; i++)
++				putDebugChar(send_buf[i]);
++			putDebugChar('#');
++			putDebugChar(hexchars[checksum >> 4]);
++			putDebugChar(hexchars[checksum % 16]);
++			flushDebugChar();
++		} while ((getDebugChar() & 0x7f) != '+');
++	}
++}
++
++static char remcomInBuffer[BUFMAX];
++static char remcomOutBuffer[BUFMAX];
++static short error;
++
++void
++debug_error(char *format, char *parm)
++{
++	if (remote_debug)
++		printk(format, parm);
++}
++
++static void
++print_regs(struct pt_regs *regs)
++{
++	printk("EAX=%08lx ", regs->eax);
++	printk("EBX=%08lx ", regs->ebx);
++	printk("ECX=%08lx ", regs->ecx);
++	printk("EDX=%08lx ", regs->edx);
++	printk("\n");
++	printk("ESI=%08lx ", regs->esi);
++	printk("EDI=%08lx ", regs->edi);
++	printk("EBP=%08lx ", regs->ebp);
++	printk("ESP=%08lx ", (long) &regs->esp);
++	printk("\n");
++	printk(" DS=%08x ", regs->xds);
++	printk(" ES=%08x ", regs->xes);
++	printk(" SS=%08x ", __KERNEL_DS);
++	printk(" FL=%08lx ", regs->eflags);
++	printk("\n");
++	printk(" CS=%08x ", regs->xcs);
++	printk(" IP=%08lx ", regs->eip);
++#if 0
++	printk(" FS=%08x ", regs->fs);
++	printk(" GS=%08x ", regs->gs);
++#endif
++	printk("\n");
++
++}				/* print_regs */
++
++#define NEW_esp fn_call_lookaside[trap_cpu].esp
++
++static void
++regs_to_gdb_regs(int *gdb_regs, struct pt_regs *regs)
++{
++	gdb_regs[_EAX] = regs->eax;
++	gdb_regs[_EBX] = regs->ebx;
++	gdb_regs[_ECX] = regs->ecx;
++	gdb_regs[_EDX] = regs->edx;
++	gdb_regs[_ESI] = regs->esi;
++	gdb_regs[_EDI] = regs->edi;
++	gdb_regs[_EBP] = regs->ebp;
++	gdb_regs[_DS] = regs->xds;
++	gdb_regs[_ES] = regs->xes;
++	gdb_regs[_PS] = regs->eflags;
++	gdb_regs[_CS] = regs->xcs;
++	gdb_regs[_PC] = regs->eip;
++	/* Note, as we are a debugging the kernel, we will always
++	 * trap in kernel code, this means no priviledge change,
++	 * and so the pt_regs structure is not completely valid.  In a non
++	 * privilege change trap, only EFLAGS, CS and EIP are put on the stack,
++	 * SS and ESP are not stacked, this means that the last 2 elements of
++	 * pt_regs is not valid (they would normally refer to the user stack)
++	 * also, using regs+1 is no good because you end up will a value that is
++	 * 2 longs (8) too high.  This used to cause stepping over functions
++	 * to fail, so my fix is to use the address of regs->esp, which
++	 * should point at the end of the stack frame.	Note I have ignored
++	 * completely exceptions that cause an error code to be stacked, such
++	 * as double fault.  Stuart Hughes, Zentropix.
++	 * original code: gdb_regs[_ESP] =  (int) (regs + 1) ;
++
++	 * this is now done on entry and moved to OLD_esp (as well as NEW_esp).
++	 */
++	gdb_regs[_ESP] = NEW_esp;
++	gdb_regs[_SS] = __KERNEL_DS;
++	gdb_regs[_FS] = 0xFFFF;
++	gdb_regs[_GS] = 0xFFFF;
++}				/* regs_to_gdb_regs */
++
++static void
++gdb_regs_to_regs(int *gdb_regs, struct pt_regs *regs)
++{
++	regs->eax = gdb_regs[_EAX];
++	regs->ebx = gdb_regs[_EBX];
++	regs->ecx = gdb_regs[_ECX];
++	regs->edx = gdb_regs[_EDX];
++	regs->esi = gdb_regs[_ESI];
++	regs->edi = gdb_regs[_EDI];
++	regs->ebp = gdb_regs[_EBP];
++	regs->xds = gdb_regs[_DS];
++	regs->xes = gdb_regs[_ES];
++	regs->eflags = gdb_regs[_PS];
++	regs->xcs = gdb_regs[_CS];
++	regs->eip = gdb_regs[_PC];
++	NEW_esp = gdb_regs[_ESP];	/* keep the value */
++#if 0				/* can't change these */
++	regs->esp = gdb_regs[_ESP];
++	regs->xss = gdb_regs[_SS];
++	regs->fs = gdb_regs[_FS];
++	regs->gs = gdb_regs[_GS];
++#endif
++
++}				/* gdb_regs_to_regs */
++extern void scheduling_functions_start_here(void);
++extern void scheduling_functions_end_here(void);
++#define first_sched	((unsigned long) scheduling_functions_start_here)
++#define last_sched	((unsigned long) scheduling_functions_end_here)
++
++int thread_list = 0;
++
++void
++get_gdb_regs(struct task_struct *p, struct pt_regs *regs, int *gdb_regs)
++{
++	unsigned long stack_page;
++	int count = 0;
++	IF_SMP(int i);
++	if (!p || p == current) {
++		regs_to_gdb_regs(gdb_regs, regs);
++		return;
++	}
++#ifdef CONFIG_SMP
++	for (i = 0; i < MAX_NO_CPUS; i++) {
++		if (p == kgdb_info.cpus_waiting[i].task) {
++			regs_to_gdb_regs(gdb_regs,
++					 kgdb_info.cpus_waiting[i].regs);
++			gdb_regs[_ESP] =
++			    (int) &kgdb_info.cpus_waiting[i].regs->esp;
++
++			return;
++		}
++	}
++#endif
++	memset(gdb_regs, 0, NUMREGBYTES);
++	gdb_regs[_ESP] = p->thread.esp;
++	gdb_regs[_PC] = p->thread.eip;
++	gdb_regs[_EBP] = *(int *) gdb_regs[_ESP];
++	gdb_regs[_EDI] = *(int *) (gdb_regs[_ESP] + 4);
++	gdb_regs[_ESI] = *(int *) (gdb_regs[_ESP] + 8);
++
++/*
++ * This code is to give a more informative notion of where a process
++ * is waiting.	It is used only when the user asks for a thread info
++ * list.  If he then switches to the thread, s/he will find the task
++ * is in schedule, but a back trace should show the same info we come
++ * up with.  This code was shamelessly purloined from process.c.  It was
++ * then enhanced to provide more registers than simply the program
++ * counter.
++ */
++
++	if (!thread_list) {
++		return;
++	}
++
++	if (p->state == TASK_RUNNING)
++		return;
++	stack_page = (unsigned long) p->thread_info;
++	if (gdb_regs[_ESP] < stack_page || gdb_regs[_ESP] > 8188 + stack_page)
++		return;
++	/* include/asm-i386/system.h:switch_to() pushes ebp last. */
++	do {
++		if (gdb_regs[_EBP] < stack_page ||
++		    gdb_regs[_EBP] > 8184 + stack_page)
++			return;
++		gdb_regs[_PC] = *(unsigned long *) (gdb_regs[_EBP] + 4);
++		gdb_regs[_ESP] = gdb_regs[_EBP] + 8;
++		gdb_regs[_EBP] = *(unsigned long *) gdb_regs[_EBP];
++		if (gdb_regs[_PC] < first_sched || gdb_regs[_PC] >= last_sched)
++			return;
++	} while (count++ < 16);
++	return;
++}
++
++/* Indicate to caller of mem2hex or hex2mem that there has been an
++   error.  */
++static volatile int mem_err = 0;
++static volatile int mem_err_expected = 0;
++static volatile int mem_err_cnt = 0;
++static int garbage_loc = -1;
++
++int
++get_char(char *addr)
++{
++	return *addr;
++}
++
++void
++set_char(char *addr, int val, int may_fault)
++{
++	/*
++	 * This code traps references to the area mapped to the kernel
++	 * stack as given by the regs and, instead, stores to the
++	 * fn_call_lookaside[cpu].array
++	 */
++	if (may_fault &&
++	    (unsigned int) addr < OLD_esp &&
++	    ((unsigned int) addr > (OLD_esp - (unsigned int) LOOKASIDE_SIZE))) {
++		addr = (char *) END_OF_LOOKASIDE - ((char *) OLD_esp - addr);
++	}
++	*addr = val;
++}
++
++/* convert the memory pointed to by mem into hex, placing result in buf */
++/* return a pointer to the last char put in buf (null) */
++/* If MAY_FAULT is non-zero, then we should set mem_err in response to
++   a fault; if zero treat a fault like any other fault in the stub.  */
++char *
++mem2hex(char *mem, char *buf, int count, int may_fault)
++{
++	int i;
++	unsigned char ch;
++
++	if (may_fault) {
++		mem_err_expected = 1;
++		mem_err = 0;
++	}
++	for (i = 0; i < count; i++) {
++		/* printk("%lx = ", mem) ; */
++
++		ch = get_char(mem++);
++
++		/* printk("%02x\n", ch & 0xFF) ; */
++		if (may_fault && mem_err) {
++			if (remote_debug)
++				printk("Mem fault fetching from addr %lx\n",
++				       (long) (mem - 1));
++			*buf = 0;	/* truncate buffer */
++			return (buf);
++		}
++		*buf++ = hexchars[ch >> 4];
++		*buf++ = hexchars[ch % 16];
++	}
++	*buf = 0;
++	if (may_fault)
++		mem_err_expected = 0;
++	return (buf);
++}
++
++/* convert the hex array pointed to by buf into binary to be placed in mem */
++/* return a pointer to the character AFTER the last byte written */
++/* NOTE: We use the may fault flag to also indicate if the write is to
++ * the registers (0) or "other" memory (!=0)
++ */
++char *
++hex2mem(char *buf, char *mem, int count, int may_fault)
++{
++	int i;
++	unsigned char ch;
++
++	if (may_fault) {
++		mem_err_expected = 1;
++		mem_err = 0;
++	}
++	for (i = 0; i < count; i++) {
++		ch = hex(*buf++) << 4;
++		ch = ch + hex(*buf++);
++		set_char(mem++, ch, may_fault);
++
++		if (may_fault && mem_err) {
++			if (remote_debug)
++				printk("Mem fault storing to addr %lx\n",
++				       (long) (mem - 1));
++			return (mem);
++		}
++	}
++	if (may_fault)
++		mem_err_expected = 0;
++	return (mem);
++}
++
++/**********************************************/
++/* WHILE WE FIND NICE HEX CHARS, BUILD AN INT */
++/* RETURN NUMBER OF CHARS PROCESSED	      */
++/**********************************************/
++int
++hexToInt(char **ptr, int *intValue)
++{
++	int numChars = 0;
++	int hexValue;
++
++	*intValue = 0;
++
++	while (**ptr) {
++		hexValue = hex(**ptr);
++		if (hexValue >= 0) {
++			*intValue = (*intValue << 4) | hexValue;
++			numChars++;
++		} else
++			break;
++
++		(*ptr)++;
++	}
++
++	return (numChars);
++}
++
++#define stubhex(h) hex(h)
++#ifdef old_thread_list
++
++static int
++stub_unpack_int(char *buff, int fieldlength)
++{
++	int nibble;
++	int retval = 0;
++
++	while (fieldlength) {
++		nibble = stubhex(*buff++);
++		retval |= nibble;
++		fieldlength--;
++		if (fieldlength)
++			retval = retval << 4;
++	}
++	return retval;
++}
++#endif
++static char *
++pack_hex_byte(char *pkt, int byte)
++{
++	*pkt++ = hexchars[(byte >> 4) & 0xf];
++	*pkt++ = hexchars[(byte & 0xf)];
++	return pkt;
++}
++
++#define BUF_THREAD_ID_SIZE 16
++
++static char *
++pack_threadid(char *pkt, threadref * id)
++{
++	char *limit;
++	unsigned char *altid;
++
++	altid = (unsigned char *) id;
++	limit = pkt + BUF_THREAD_ID_SIZE;
++	while (pkt < limit)
++		pkt = pack_hex_byte(pkt, *altid++);
++	return pkt;
++}
++
++#ifdef old_thread_list
++static char *
++unpack_byte(char *buf, int *value)
++{
++	*value = stub_unpack_int(buf, 2);
++	return buf + 2;
++}
++
++static char *
++unpack_threadid(char *inbuf, threadref * id)
++{
++	char *altref;
++	char *limit = inbuf + BUF_THREAD_ID_SIZE;
++	int x, y;
++
++	altref = (char *) id;
++
++	while (inbuf < limit) {
++		x = stubhex(*inbuf++);
++		y = stubhex(*inbuf++);
++		*altref++ = (x << 4) | y;
++	}
++	return inbuf;
++}
++#endif
++void
++int_to_threadref(threadref * id, int value)
++{
++	unsigned char *scan;
++
++	scan = (unsigned char *) id;
++	{
++		int i = 4;
++		while (i--)
++			*scan++ = 0;
++	}
++	*scan++ = (value >> 24) & 0xff;
++	*scan++ = (value >> 16) & 0xff;
++	*scan++ = (value >> 8) & 0xff;
++	*scan++ = (value & 0xff);
++}
++int
++int_to_hex_v(unsigned char * id, int value)
++{
++	unsigned char *start = id;
++	int shift;
++	int ch;
++
++	for (shift = 28; shift >= 0; shift -= 4) {
++		if ((ch = (value >> shift) & 0xf) || (id != start)) {
++			*id = hexchars[ch];
++			id++;
++		}
++	}
++	if (id == start)
++		*id++ = '0';
++	return id - start;
++}
++#ifdef old_thread_list
++
++static int
++threadref_to_int(threadref * ref)
++{
++	int i, value = 0;
++	unsigned char *scan;
++
++	scan = (char *) ref;
++	scan += 4;
++	i = 4;
++	while (i-- > 0)
++		value = (value << 8) | ((*scan++) & 0xff);
++	return value;
++}
++#endif
++static int
++cmp_str(char *s1, char *s2, int count)
++{
++	while (count--) {
++		if (*s1++ != *s2++)
++			return 0;
++	}
++	return 1;
++}
++
++#if 1				/* this is a hold over from 2.4 where O(1) was "sometimes" */
++extern struct task_struct *kgdb_get_idle(int cpu);
++#define idle_task(cpu) kgdb_get_idle(cpu)
++#else
++#define idle_task(cpu) init_tasks[cpu]
++#endif
++
++extern int kgdb_pid_init_done;
++
++struct task_struct *
++getthread(int pid)
++{
++	struct task_struct *thread;
++	if (pid >= PID_MAX && pid <= (PID_MAX + MAX_NO_CPUS)) {
++
++		return idle_task(pid - PID_MAX);
++	} else {
++		/*
++		 * find_task_by_pid is relatively safe all the time
++		 * Other pid functions require lock downs which imply
++		 * that we may be interrupting them (as we get here
++		 * in the middle of most any lock down).
++		 * Still we don't want to call until the table exists!
++		 */
++		if (kgdb_pid_init_done){
++			thread = find_task_by_pid(pid);
++			if (thread) {
++				return thread;
++			}
++		}
++	}
++	return NULL;
++}
++/* *INDENT-OFF*	 */
++struct hw_breakpoint {
++	unsigned enabled;
++	unsigned type;
++	unsigned len;
++	unsigned addr;
++} breakinfo[4] = { {enabled:0},
++		   {enabled:0},
++		   {enabled:0},
++		   {enabled:0}};
++/* *INDENT-ON*	*/
++unsigned hw_breakpoint_status;
++void
++correct_hw_break(void)
++{
++	int breakno;
++	int correctit;
++	int breakbit;
++	unsigned dr7;
++
++	asm volatile ("movl %%db7, %0\n":"=r" (dr7)
++		      :);
++	/* *INDENT-OFF*	 */
++	do {
++		unsigned addr0, addr1, addr2, addr3;
++		asm volatile ("movl %%db0, %0\n"
++			      "movl %%db1, %1\n"
++			      "movl %%db2, %2\n"
++			      "movl %%db3, %3\n"
++			      :"=r" (addr0), "=r"(addr1),
++			      "=r"(addr2), "=r"(addr3)
++			      :);
++	} while (0);
++	/* *INDENT-ON*	*/
++	correctit = 0;
++	for (breakno = 0; breakno < 3; breakno++) {
++		breakbit = 2 << (breakno << 1);
++		if (!(dr7 & breakbit) && breakinfo[breakno].enabled) {
++			correctit = 1;
++			dr7 |= breakbit;
++			dr7 &= ~(0xf0000 << (breakno << 2));
++			dr7 |= (((breakinfo[breakno].len << 2) |
++				 breakinfo[breakno].type) << 16) <<
++			    (breakno << 2);
++			switch (breakno) {
++			case 0:
++				asm volatile ("movl %0, %%dr0\n"::"r"
++					      (breakinfo[breakno].addr));
++				break;
++
++			case 1:
++				asm volatile ("movl %0, %%dr1\n"::"r"
++					      (breakinfo[breakno].addr));
++				break;
++
++			case 2:
++				asm volatile ("movl %0, %%dr2\n"::"r"
++					      (breakinfo[breakno].addr));
++				break;
++
++			case 3:
++				asm volatile ("movl %0, %%dr3\n"::"r"
++					      (breakinfo[breakno].addr));
++				break;
++			}
++		} else if ((dr7 & breakbit) && !breakinfo[breakno].enabled) {
++			correctit = 1;
++			dr7 &= ~breakbit;
++			dr7 &= ~(0xf0000 << (breakno << 2));
++		}
++	}
++	if (correctit) {
++		asm volatile ("movl %0, %%db7\n"::"r" (dr7));
++	}
++}
++
++int
++remove_hw_break(unsigned breakno)
++{
++	if (!breakinfo[breakno].enabled) {
++		return -1;
++	}
++	breakinfo[breakno].enabled = 0;
++	return 0;
++}
++
++int
++set_hw_break(unsigned breakno, unsigned type, unsigned len, unsigned addr)
++{
++	if (breakinfo[breakno].enabled) {
++		return -1;
++	}
++	breakinfo[breakno].enabled = 1;
++	breakinfo[breakno].type = type;
++	breakinfo[breakno].len = len;
++	breakinfo[breakno].addr = addr;
++	return 0;
++}
++
++#ifdef CONFIG_SMP
++static int in_kgdb_console = 0;
++
++int
++in_kgdb(struct pt_regs *regs)
++{
++	unsigned flags;
++	int cpu = smp_processor_id();
++	in_kgdb_called = 1;
++	if (!spin_is_locked(&kgdb_spinlock)) {
++		if (in_kgdb_here_log[cpu] ||	/* we are holding this cpu */
++		    in_kgdb_console) {	/* or we are doing slow i/o */
++			return 1;
++		}
++		return 0;
++	}
++
++	/* As I see it the only reason not to let all cpus spin on
++	 * the same spin_lock is to allow selected ones to proceed.
++	 * This would be a good thing, so we leave it this way.
++	 * Maybe someday....  Done !
++
++	 * in_kgdb() is called from an NMI so we don't pretend
++	 * to have any resources, like printk() for example.
++	 */
++
++	kgdb_local_irq_save(flags);	/* only local here, to avoid hanging */
++	/*
++	 * log arival of this cpu
++	 * The NMI keeps on ticking.  Protect against recurring more
++	 * than once, and ignor the cpu that has the kgdb lock
++	 */
++	in_kgdb_entry_log[cpu]++;
++	in_kgdb_here_log[cpu] = regs;
++	if (cpu == spinlock_cpu || waiting_cpus[cpu].task) {
++		goto exit_in_kgdb;
++	}
++	/*
++	 * For protection of the initilization of the spin locks by kgdb
++	 * it locks the kgdb spinlock before it gets the wait locks set
++	 * up.	We wait here for the wait lock to be taken.  If the
++	 * kgdb lock goes away first??	Well, it could be a slow exit
++	 * sequence where the wait lock is removed prior to the kgdb lock
++	 * so if kgdb gets unlocked, we just exit.
++	 */
++	while (spin_is_locked(&kgdb_spinlock) &&
++	       !spin_is_locked(waitlocks + cpu)) ;
++	if (!spin_is_locked(&kgdb_spinlock)) {
++		goto exit_in_kgdb;
++	}
++	waiting_cpus[cpu].task = current;
++	waiting_cpus[cpu].pid = (current->pid) ? : (PID_MAX + cpu);
++	waiting_cpus[cpu].regs = regs;
++
++	spin_unlock_wait(waitlocks + cpu);
++	/*
++	 * log departure of this cpu
++	 */
++	waiting_cpus[cpu].task = 0;
++	waiting_cpus[cpu].pid = 0;
++	waiting_cpus[cpu].regs = 0;
++	correct_hw_break();
++      exit_in_kgdb:
++	in_kgdb_here_log[cpu] = 0;
++	kgdb_local_irq_restore(flags);
++	return 1;
++	/*
++	   spin_unlock(continuelocks + smp_processor_id());
++	 */
++}
++
++void
++smp__in_kgdb(struct pt_regs regs)
++{
++	ack_APIC_irq();
++	in_kgdb(&regs);
++}
++#else
++int
++in_kgdb(struct pt_regs *regs)
++{
++	return (kgdb_spinlock);
++}
++#endif
++
++void
++printexceptioninfo(int exceptionNo, int errorcode, char *buffer)
++{
++	unsigned dr6;
++	int i;
++	switch (exceptionNo) {
++	case 1:		/* debug exception */
++		break;
++	case 3:		/* breakpoint */
++		sprintf(buffer, "Software breakpoint");
++		return;
++	default:
++		sprintf(buffer, "Details not available");
++		return;
++	}
++	asm volatile ("movl %%db6, %0\n":"=r" (dr6)
++		      :);
++	if (dr6 & 0x4000) {
++		sprintf(buffer, "Single step");
++		return;
++	}
++	for (i = 0; i < 4; ++i) {
++		if (dr6 & (1 << i)) {
++			sprintf(buffer, "Hardware breakpoint %d", i);
++			return;
++		}
++	}
++	sprintf(buffer, "Unknown trap");
++	return;
++}
++
++/*
++ * This function does all command procesing for interfacing to gdb.
++ *
++ * NOTE:  The INT nn instruction leaves the state of the interrupt
++ *	  enable flag UNCHANGED.  That means that when this routine
++ *	  is entered via a breakpoint (INT 3) instruction from code
++ *	  that has interrupts enabled, then interrupts will STILL BE
++ *	  enabled when this routine is entered.	 The first thing that
++ *	  we do here is disable interrupts so as to prevent recursive
++ *	  entries and bothersome serial interrupts while we are
++ *	  trying to run the serial port in polled mode.
++ *
++ * For kernel version 2.1.xx the kgdb_cli() actually gets a spin lock so
++ * it is always necessary to do a restore_flags before returning
++ * so as to let go of that lock.
++ */
++int
++kgdb_handle_exception(int exceptionVector,
++		      int signo, int err_code, struct pt_regs *linux_regs)
++{
++	struct task_struct *usethread = NULL;
++	struct task_struct *thread_list_start = 0, *thread = NULL;
++	int addr, length;
++	unsigned long address;
++	int breakno, breaktype;
++	char *ptr;
++	int newPC;
++	threadref thref;
++	int threadid;
++	int thread_min = PID_MAX + MAX_NO_CPUS;
++#ifdef old_thread_list
++	int maxthreads;
++#endif
++	int nothreads;
++	unsigned long flags;
++	int gdb_regs[NUMREGBYTES / 4];
++	int dr6;
++	IF_SMP(int entry_state = 0);	/* 0, ok, 1, no nmi, 2 sync failed */
++#define NO_NMI 1
++#define NO_SYNC 2
++#define	regs	(*linux_regs)
++#define NUMREGS NUMREGBYTES/4
++	/*
++	 * If the entry is not from the kernel then return to the Linux
++	 * trap handler and let it process the interrupt normally.
++	 */
++	if ((linux_regs->eflags & VM_MASK) || (3 & linux_regs->xcs)) {
++		printk("ignoring non-kernel exception\n");
++		print_regs(&regs);
++		return (0);
++	}
++	/*
++	 * If we're using eth mode, set the 'mode' in the netdevice.
++	 */
++
++	__asm__("movl %%cr2,%0":"=r" (address));
++
++	if (kgdb_eth != -1) {
++		kgdb_eth_set_trapmode(1);
++	}
++
++	kgdb_local_irq_save(flags);
++
++	/* Get kgdb spinlock */
++
++	KGDB_SPIN_LOCK(&kgdb_spinlock);
++	rdtscll(kgdb_info.entry_tsc);
++	/*
++	 * We depend on this spinlock and the NMI watch dog to control the
++	 * other cpus.	They will arrive at "in_kgdb()" as a result of the
++	 * NMI and will wait there for the following spin locks to be
++	 * released.
++	 */
++#ifdef CONFIG_SMP
++
++#if 0
++	if (cpu_callout_map & ~MAX_CPU_MASK) {
++		printk("kgdb : too many cpus, possibly not mapped"
++		       " in contiguous space, change MAX_NO_CPUS"
++		       " in kgdb_stub and make new kernel.\n"
++		       " cpu_callout_map is %lx\n", cpu_callout_map);
++		goto exit_just_unlock;
++	}
++#endif
++	if (spinlock_count == 1) {
++		int time, end_time, dum;
++		int i;
++		int cpu_logged_in[MAX_NO_CPUS] = {[0 ... MAX_NO_CPUS - 1] = (0)
++		};
++		if (remote_debug) {
++			printk("kgdb : cpu %d entry, syncing others\n",
++			       smp_processor_id());
++		}
++		for (i = 0; i < MAX_NO_CPUS; i++) {
++			/*
++			 * Use trylock as we may already hold the lock if
++			 * we are holding the cpu.  Net result is all
++			 * locked.
++			 */
++			spin_trylock(&waitlocks[i]);
++		}
++		for (i = 0; i < MAX_NO_CPUS; i++)
++			cpu_logged_in[i] = 0;
++		/*
++		 * Wait for their arrival.  We know the watch dog is active if
++		 * in_kgdb() has ever been called, as it is always called on a
++		 * watchdog tick.
++		 */
++		rdtsc(dum, time);
++		end_time = time + 2;	/* Note: we use the High order bits! */
++		i = 1;
++		if (num_online_cpus() > 1) {
++			int me_in_kgdb = in_kgdb_entry_log[smp_processor_id()];
++			smp_send_nmi_allbutself();
++			while (i < num_online_cpus() && time != end_time) {
++				int j;
++				for (j = 0; j < MAX_NO_CPUS; j++) {
++					if (waiting_cpus[j].task &&
++					    !cpu_logged_in[j]) {
++						i++;
++						cpu_logged_in[j] = 1;
++						if (remote_debug) {
++							printk
++							    ("kgdb : cpu %d arrived at kgdb\n",
++							     j);
++						}
++						break;
++					} else if (!waiting_cpus[j].task &&
++						   !cpu_online(j)) {
++						waiting_cpus[j].task = NOCPU;
++						cpu_logged_in[j] = 1;
++						waiting_cpus[j].hold = 1;
++						break;
++					}
++					if (!waiting_cpus[j].task &&
++					    in_kgdb_here_log[j]) {
++
++						int wait = 100000;
++						while (wait--) ;
++						if (!waiting_cpus[j].task &&
++						    in_kgdb_here_log[j]) {
++							printk
++							    ("kgdb : cpu %d stall"
++							     " in in_kgdb\n",
++							     j);
++							i++;
++							cpu_logged_in[j] = 1;
++							waiting_cpus[j].task =
++							    (struct task_struct
++							     *) 1;
++						}
++					}
++				}
++
++				if (in_kgdb_entry_log[smp_processor_id()] >
++				    (me_in_kgdb + 10)) {
++					break;
++				}
++
++				rdtsc(dum, time);
++			}
++			if (i < num_online_cpus()) {
++				printk
++				    ("kgdb : time out, proceeding without sync\n");
++#if 0
++				printk("kgdb : Waiting_cpus: 0 = %d, 1 = %d\n",
++				       waiting_cpus[0].task != 0,
++				       waiting_cpus[1].task != 0);
++				printk("kgdb : Cpu_logged in: 0 = %d, 1 = %d\n",
++				       cpu_logged_in[0], cpu_logged_in[1]);
++				printk
++				    ("kgdb : in_kgdb_here_log in: 0 = %d, 1 = %d\n",
++				     in_kgdb_here_log[0] != 0,
++				     in_kgdb_here_log[1] != 0);
++#endif
++				entry_state = NO_SYNC;
++			} else {
++#if 0
++				int ent =
++				    in_kgdb_entry_log[smp_processor_id()] -
++				    me_in_kgdb;
++				printk("kgdb : sync after %d entries\n", ent);
++#endif
++			}
++		} else {
++			if (remote_debug) {
++				printk
++				    ("kgdb : %d cpus, but watchdog not active\n"
++				     "proceeding without locking down other cpus\n",
++				     num_online_cpus());
++				entry_state = NO_NMI;
++			}
++		}
++	}
++#endif
++
++	if (remote_debug) {
++		printk("handle_exception(exceptionVector=%d, "
++		       "signo=%d, err_code=%d, linux_regs=%p)\n",
++		       exceptionVector, signo, err_code, linux_regs);
++		printk(" address: %lx\n", address);
++
++		if (debug_regs) {
++			print_regs(&regs);
++			show_trace(current, (unsigned long *)&regs);
++		}
++	}
++
++	/* Disable hardware debugging while we are in kgdb */
++	/* Get the debug register status register */
++/*				       *INDENT-OFF*  */
++      __asm__("movl %0,%%db7"
++	      :	/* no output */
++	      :"r"(0));
++
++	asm volatile ("movl %%db6, %0\n"
++		      :"=r" (hw_breakpoint_status)
++		      :);
++
++/*				       *INDENT-ON*  */
++	switch (exceptionVector) {
++	case 0:		/* divide error */
++	case 1:		/* debug exception */
++	case 2:		/* NMI */
++	case 3:		/* breakpoint */
++	case 4:		/* overflow */
++	case 5:		/* bounds check */
++	case 6:		/* invalid opcode */
++	case 7:		/* device not available */
++	case 8:		/* double fault (errcode) */
++	case 10:		/* invalid TSS (errcode) */
++	case 12:		/* stack fault (errcode) */
++	case 16:		/* floating point error */
++	case 17:		/* alignment check (errcode) */
++	default:		/* any undocumented */
++		break;
++	case 11:		/* segment not present (errcode) */
++	case 13:		/* general protection (errcode) */
++	case 14:		/* page fault (special errcode) */
++	case 19:		/* cache flush denied */
++		if (mem_err_expected) {
++			/*
++			 * This fault occured because of the
++			 * get_char or set_char routines.  These
++			 * two routines use either eax of edx to
++			 * indirectly reference the location in
++			 * memory that they are working with.
++			 * For a page fault, when we return the
++			 * instruction will be retried, so we
++			 * have to make sure that these
++			 * registers point to valid memory.
++			 */
++			mem_err = 1;	/* set mem error flag */
++			mem_err_expected = 0;
++			mem_err_cnt++;	/* helps in debugging */
++			/* make valid address */
++			regs.eax = (long) &garbage_loc;
++			/* make valid address */
++			regs.edx = (long) &garbage_loc;
++			if (remote_debug)
++				printk("Return after memory error: "
++				       "mem_err_cnt=%d\n", mem_err_cnt);
++			if (debug_regs)
++				print_regs(&regs);
++			goto exit_kgdb;
++		}
++		break;
++	}
++	if (remote_debug)
++		printk("kgdb : entered kgdb on cpu %d\n", smp_processor_id());
++
++	gdb_i386vector = exceptionVector;
++	gdb_i386errcode = err_code;
++	kgdb_info.called_from = __builtin_return_address(0);
++#ifdef CONFIG_SMP
++	/*
++	 * OK, we can now communicate, lets tell gdb about the sync.
++	 * but only if we had a problem.
++	 */
++	switch (entry_state) {
++	case NO_NMI:
++		to_gdb("NMI not active, other cpus not stopped\n");
++		break;
++	case NO_SYNC:
++		to_gdb("Some cpus not stopped, see 'kgdb_info' for details\n");
++	default:;
++	}
++
++#endif
++/*
++ * Set up the gdb function call area.
++ */
++	trap_cpu = smp_processor_id();
++	OLD_esp = NEW_esp = (int) (&linux_regs->esp);
++
++      IF_SMP(once_again:)
++	    /* reply to host that an exception has occurred */
++	    remcomOutBuffer[0] = 'S';
++	remcomOutBuffer[1] = hexchars[signo >> 4];
++	remcomOutBuffer[2] = hexchars[signo % 16];
++	remcomOutBuffer[3] = 0;
++
++	if (kgdb_eth_is_initializing) {
++		kgdb_eth_is_initializing = 0;
++	} else {
++		putpacket(remcomOutBuffer);
++	}
++
++	kgdb_eth_reply_arp();
++	while (1 == 1) {
++		error = 0;
++		remcomOutBuffer[0] = 0;
++		getpacket(remcomInBuffer);
++		switch (remcomInBuffer[0]) {
++		case '?':
++			remcomOutBuffer[0] = 'S';
++			remcomOutBuffer[1] = hexchars[signo >> 4];
++			remcomOutBuffer[2] = hexchars[signo % 16];
++			remcomOutBuffer[3] = 0;
++			break;
++		case 'd':
++			remote_debug = !(remote_debug);	/* toggle debug flag */
++			printk("Remote debug %s\n",
++			       remote_debug ? "on" : "off");
++			break;
++		case 'g':	/* return the value of the CPU registers */
++			get_gdb_regs(usethread, &regs, gdb_regs);
++			mem2hex((char *) gdb_regs,
++				remcomOutBuffer, NUMREGBYTES, 0);
++			break;
++		case 'G':	/* set the value of the CPU registers - return OK */
++			hex2mem(&remcomInBuffer[1],
++				(char *) gdb_regs, NUMREGBYTES, 0);
++			if (!usethread || usethread == current) {
++				gdb_regs_to_regs(gdb_regs, &regs);
++				strcpy(remcomOutBuffer, "OK");
++			} else {
++				strcpy(remcomOutBuffer, "E00");
++			}
++			break;
++
++		case 'P':{	/* set the value of a single CPU register -
++				   return OK */
++				/*
++				 * For some reason, gdb wants to talk about psudo
++				 * registers (greater than 15).	 These may have
++				 * meaning for ptrace, but for us it is safe to
++				 * ignor them.	We do this by dumping them into
++				 * _GS which we also ignor, but do have memory for.
++				 */
++				int regno;
++
++				ptr = &remcomInBuffer[1];
++				regs_to_gdb_regs(gdb_regs, &regs);
++				if ((!usethread || usethread == current) &&
++				    hexToInt(&ptr, &regno) &&
++				    *ptr++ == '=' && (regno >= 0)) {
++					regno =
++					    (regno >= NUMREGS ? _GS : regno);
++					hex2mem(ptr, (char *) &gdb_regs[regno],
++						4, 0);
++					gdb_regs_to_regs(gdb_regs, &regs);
++					strcpy(remcomOutBuffer, "OK");
++					break;
++				}
++				strcpy(remcomOutBuffer, "E01");
++				break;
++			}
++
++			/* mAA..AA,LLLL	 Read LLLL bytes at address AA..AA */
++		case 'm':
++			/* TRY TO READ %x,%x.  IF SUCCEED, SET PTR = 0 */
++			ptr = &remcomInBuffer[1];
++			if (hexToInt(&ptr, &addr) &&
++			    (*(ptr++) == ',') && (hexToInt(&ptr, &length))) {
++				ptr = 0;
++				/*
++				 * hex doubles the byte count
++				 */
++				if (length > (BUFMAX / 2))
++					length = BUFMAX / 2;
++				mem2hex((char *) addr,
++					remcomOutBuffer, length, 1);
++				if (mem_err) {
++					strcpy(remcomOutBuffer, "E03");
++					debug_error("memory fault\n", NULL);
++				}
++			}
++
++			if (ptr) {
++				strcpy(remcomOutBuffer, "E01");
++				debug_error
++				    ("malformed read memory command: %s\n",
++				     remcomInBuffer);
++			}
++			break;
++
++			/* MAA..AA,LLLL:
++			   Write LLLL bytes at address AA.AA return OK */
++		case 'M':
++			/* TRY TO READ '%x,%x:'.  IF SUCCEED, SET PTR = 0 */
++			ptr = &remcomInBuffer[1];
++			if (hexToInt(&ptr, &addr) &&
++			    (*(ptr++) == ',') &&
++			    (hexToInt(&ptr, &length)) && (*(ptr++) == ':')) {
++				hex2mem(ptr, (char *) addr, length, 1);
++
++				if (mem_err) {
++					strcpy(remcomOutBuffer, "E03");
++					debug_error("memory fault\n", NULL);
++				} else {
++					strcpy(remcomOutBuffer, "OK");
++				}
++
++				ptr = 0;
++			}
++			if (ptr) {
++				strcpy(remcomOutBuffer, "E02");
++				debug_error
++				    ("malformed write memory command: %s\n",
++				     remcomInBuffer);
++			}
++			break;
++		case 'S':
++			remcomInBuffer[0] = 's';
++		case 'C':
++			/* Csig;AA..AA where ;AA..AA is optional
++			 * continue with signal
++			 * Since signals are meaning less to us, delete that
++			 * part and then fall into the 'c' code.
++			 */
++			ptr = &remcomInBuffer[1];
++			length = 2;
++			while (*ptr && *ptr != ';') {
++				length++;
++				ptr++;
++			}
++			if (*ptr) {
++				do {
++					ptr++;
++					*(ptr - length++) = *ptr;
++				} while (*ptr);
++			} else {
++				remcomInBuffer[1] = 0;
++			}
++
++			/* cAA..AA  Continue at address AA..AA(optional) */
++			/* sAA..AA  Step one instruction from AA..AA(optional) */
++			/* D	    detach, reply OK and then continue */
++		case 'c':
++		case 's':
++		case 'D':
++
++			/* try to read optional parameter,
++			   pc unchanged if no parm */
++			ptr = &remcomInBuffer[1];
++			if (hexToInt(&ptr, &addr)) {
++				if (remote_debug)
++					printk("Changing EIP to 0x%x\n", addr);
++
++				regs.eip = addr;
++			}
++
++			newPC = regs.eip;
++
++			if (kgdb_eth != -1) {
++				kgdb_eth_set_trapmode(0);
++			}
++
++			/* clear the trace bit */
++			regs.eflags &= 0xfffffeff;
++
++			/* set the trace bit if we're stepping */
++			if (remcomInBuffer[0] == 's')
++				regs.eflags |= 0x100;
++
++			/* detach is a friendly version of continue. Note that
++			   debugging is still enabled (e.g hit control C)
++			 */
++			if (remcomInBuffer[0] == 'D') {
++				strcpy(remcomOutBuffer, "OK");
++				putpacket(remcomOutBuffer);
++			}
++
++			if (remote_debug) {
++				printk("Resuming execution\n");
++				print_regs(&regs);
++			}
++			asm volatile ("movl %%db6, %0\n":"=r" (dr6)
++				      :);
++			if (!(dr6 & 0x4000)) {
++				for (breakno = 0; breakno < 4; ++breakno) {
++					if (dr6 & (1 << breakno) &&
++					    (breakinfo[breakno].type == 0)) {
++						/* Set restore flag */
++						regs.eflags |= 0x10000;
++						break;
++					}
++				}
++			}
++			correct_hw_break();
++			asm volatile ("movl %0, %%db6\n"::"r" (0));
++			goto exit_kgdb;
++
++			/* kill the program */
++		case 'k':	/* do nothing */
++			break;
++
++			/* query */
++		case 'q':
++			nothreads = 0;
++			switch (remcomInBuffer[1]) {
++			case 'f':
++				threadid = 1;
++				thread_list = 2;
++				thread_list_start = (usethread ? : current);
++			case 's':
++				if (!cmp_str(&remcomInBuffer[2],
++					     "ThreadInfo", 10))
++					break;
++
++				remcomOutBuffer[nothreads++] = 'm';
++				for (; threadid < PID_MAX + MAX_NO_CPUS;
++				     threadid++) {
++					thread = getthread(threadid);
++					if (thread) {
++						nothreads += int_to_hex_v(
++							&remcomOutBuffer[
++								nothreads],
++							threadid);
++						if (thread_min > threadid)
++							thread_min = threadid;
++						remcomOutBuffer[
++							nothreads] = ',';
++						nothreads++;
++						if (nothreads > BUFMAX - 10)
++							break;
++					}
++				}
++				if (remcomOutBuffer[nothreads - 1] == 'm') {
++					remcomOutBuffer[nothreads - 1] = 'l';
++				} else {
++					nothreads--;
++				}
++				remcomOutBuffer[nothreads] = 0;
++				break;
++
++#ifdef old_thread_list /* Old thread info request */
++			case 'L':
++				/* List threads */
++				thread_list = 2;
++				thread_list_start = (usethread ? : current);
++				unpack_byte(remcomInBuffer + 3, &maxthreads);
++				unpack_threadid(remcomInBuffer + 5, &thref);
++				do {
++					int buf_thread_limit =
++					    (BUFMAX - 22) / BUF_THREAD_ID_SIZE;
++					if (maxthreads > buf_thread_limit) {
++						maxthreads = buf_thread_limit;
++					}
++				} while (0);
++				remcomOutBuffer[0] = 'q';
++				remcomOutBuffer[1] = 'M';
++				remcomOutBuffer[4] = '0';
++				pack_threadid(remcomOutBuffer + 5, &thref);
++
++				threadid = threadref_to_int(&thref);
++				for (nothreads = 0;
++				     nothreads < maxthreads &&
++				     threadid < PID_MAX + MAX_NO_CPUS;
++				     threadid++) {
++					thread = getthread(threadid);
++					if (thread) {
++						int_to_threadref(&thref,
++								 threadid);
++						pack_threadid(remcomOutBuffer +
++							      21 +
++							      nothreads * 16,
++							      &thref);
++						nothreads++;
++						if (thread_min > threadid)
++							thread_min = threadid;
++					}
++				}
++
++				if (threadid == PID_MAX + MAX_NO_CPUS) {
++					remcomOutBuffer[4] = '1';
++				}
++				pack_hex_byte(remcomOutBuffer + 2, nothreads);
++				remcomOutBuffer[21 + nothreads * 16] = '\0';
++				break;
++#endif
++			case 'C':
++				/* Current thread id */
++				remcomOutBuffer[0] = 'Q';
++				remcomOutBuffer[1] = 'C';
++				threadid = current->pid;
++				if (!threadid) {
++					/*
++					 * idle thread
++					 */
++					for (threadid = PID_MAX;
++					     threadid < PID_MAX + MAX_NO_CPUS;
++					     threadid++) {
++						if (current ==
++						    idle_task(threadid -
++							      PID_MAX))
++							break;
++					}
++				}
++				int_to_threadref(&thref, threadid);
++				pack_threadid(remcomOutBuffer + 2, &thref);
++				remcomOutBuffer[18] = '\0';
++				break;
++
++			case 'E':
++				/* Print exception info */
++				printexceptioninfo(exceptionVector,
++						   err_code, remcomOutBuffer);
++				break;
++			case 'T':{
++				char * nptr;
++				/* Thread extra info */
++				if (!cmp_str(&remcomInBuffer[2],
++					    "hreadExtraInfo,", 15)) {
++					break;
++				}
++				ptr = &remcomInBuffer[17];
++				hexToInt(&ptr, &threadid);
++				thread = getthread(threadid);
++				nptr = &thread->comm[0];
++				length = 0;
++				ptr = &remcomOutBuffer[0];
++				do {
++					length++;
++					ptr = pack_hex_byte(ptr, *nptr++);
++				 } while (*nptr && length < 16);
++				/*
++				 * would like that 16 to be the size of
++				 * task_struct.comm but don't know the
++				 * syntax..
++				 */
++				*ptr = 0;
++			}
++			}
++			break;
++
++			/* task related */
++		case 'H':
++			switch (remcomInBuffer[1]) {
++			case 'g':
++				ptr = &remcomInBuffer[2];
++				hexToInt(&ptr, &threadid);
++				thread = getthread(threadid);
++				if (!thread) {
++					remcomOutBuffer[0] = 'E';
++					remcomOutBuffer[1] = '\0';
++					break;
++				}
++				/*
++				 * Just in case I forget what this is all about,
++				 * the "thread info" command to gdb causes it
++				 * to ask for a thread list.  It then switches
++				 * to each thread and asks for the registers.
++				 * For this (and only this) usage, we want to
++				 * fudge the registers of tasks not on the run
++				 * list (i.e. waiting) to show the routine that
++				 * called schedule. Also, gdb, is a minimalist
++				 * in that if the current thread is the last
++				 * it will not re-read the info when done.
++				 * This means that in this case we must show
++				 * the real registers. So here is how we do it:
++				 * Each entry we keep track of the min
++				 * thread in the list (the last that gdb will)
++				 * get info for.  We also keep track of the
++				 * starting thread.
++				 * "thread_list" is cleared when switching back
++				 * to the min thread if it is was current, or
++				 * if it was not current, thread_list is set
++				 * to 1.  When the switch to current comes,
++				 * if thread_list is 1, clear it, else do
++				 * nothing.
++				 */
++				usethread = thread;
++				if ((thread_list == 1) &&
++				    (thread == thread_list_start)) {
++					thread_list = 0;
++				}
++				if (thread_list && (threadid == thread_min)) {
++					if (thread == thread_list_start) {
++						thread_list = 0;
++					} else {
++						thread_list = 1;
++					}
++				}
++				/* follow through */
++			case 'c':
++				remcomOutBuffer[0] = 'O';
++				remcomOutBuffer[1] = 'K';
++				remcomOutBuffer[2] = '\0';
++				break;
++			}
++			break;
++
++			/* Query thread status */
++		case 'T':
++			ptr = &remcomInBuffer[1];
++			hexToInt(&ptr, &threadid);
++			thread = getthread(threadid);
++			if (thread) {
++				remcomOutBuffer[0] = 'O';
++				remcomOutBuffer[1] = 'K';
++				remcomOutBuffer[2] = '\0';
++				if (thread_min > threadid)
++					thread_min = threadid;
++			} else {
++				remcomOutBuffer[0] = 'E';
++				remcomOutBuffer[1] = '\0';
++			}
++			break;
++
++		case 'Y': /* set up a hardware breakpoint */
++			ptr = &remcomInBuffer[1];
++			hexToInt(&ptr, &breakno);
++			ptr++;
++			hexToInt(&ptr, &breaktype);
++			ptr++;
++			hexToInt(&ptr, &length);
++			ptr++;
++			hexToInt(&ptr, &addr);
++			if (set_hw_break(breakno & 0x3,
++					 breaktype & 0x3,
++					 length & 0x3, addr) == 0) {
++				strcpy(remcomOutBuffer, "OK");
++			} else {
++				strcpy(remcomOutBuffer, "ERROR");
++			}
++			break;
++
++			/* Remove hardware breakpoint */
++		case 'y':
++			ptr = &remcomInBuffer[1];
++			hexToInt(&ptr, &breakno);
++			if (remove_hw_break(breakno & 0x3) == 0) {
++				strcpy(remcomOutBuffer, "OK");
++			} else {
++				strcpy(remcomOutBuffer, "ERROR");
++			}
++			break;
++
++		case 'r':	/* reboot */
++			strcpy(remcomOutBuffer, "OK");
++			putpacket(remcomOutBuffer);
++			/*to_gdb("Rebooting\n"); */
++			/* triplefault	 no return from here */
++			{
++				static long no_idt[2];
++				__asm__ __volatile__("lidt %0"::"m"(no_idt[0]));
++				BREAKPOINT;
++			}
++
++		}		/* switch */
++
++		/* reply to the request */
++		putpacket(remcomOutBuffer);
++	}			/* while(1==1) */
++	/*
++	 *  reached by goto only.
++	 */
++      exit_kgdb:
++	/*
++	 * Here is where we set up to trap a gdb function call.	 NEW_esp
++	 * will be changed if we are trying to do this.	 We handle both
++	 * adding and subtracting, thus allowing gdb to put grung on
++	 * the stack which it removes later.
++	 */
++	if (NEW_esp != OLD_esp) {
++		int *ptr = END_OF_LOOKASIDE;
++		if (NEW_esp < OLD_esp)
++			ptr -= (OLD_esp - NEW_esp) / sizeof (int);
++		*--ptr = linux_regs->eflags;
++		*--ptr = linux_regs->xcs;
++		*--ptr = linux_regs->eip;
++		*--ptr = linux_regs->ecx;
++		*--ptr = linux_regs->ebx;
++		*--ptr = linux_regs->eax;
++		linux_regs->ecx = NEW_esp - (sizeof (int) * 6);
++		linux_regs->ebx = (unsigned int) END_OF_LOOKASIDE;
++		if (NEW_esp < OLD_esp) {
++			linux_regs->eip = (unsigned int) fn_call_stub;
++		} else {
++			linux_regs->eip = (unsigned int) fn_rtn_stub;
++			linux_regs->eax = NEW_esp;
++		}
++		linux_regs->eflags &= ~(IF_BIT | TF_BIT);
++	}
++#ifdef CONFIG_SMP
++	/*
++	 * Release gdb wait locks
++	 * Sanity check time.  Must have at least one cpu to run.  Also single
++	 * step must not be done if the current cpu is on hold.
++	 */
++	if (spinlock_count == 1) {
++		int ss_hold = (regs.eflags & 0x100) && kgdb_info.hold_on_sstep;
++		int cpu_avail = 0;
++		int i;
++
++		for (i = 0; i < MAX_NO_CPUS; i++) {
++			if (!cpu_online(i))
++				break;
++			if (!hold_cpu(i)) {
++				cpu_avail = 1;
++			}
++		}
++		/*
++		 * Early in the bring up there will be NO cpus on line...
++		 */
++		if (!cpu_avail && !cpus_empty(cpu_online_map)) {
++			to_gdb("No cpus unblocked, see 'kgdb_info.hold_cpu'\n");
++			goto once_again;
++		}
++		if (hold_cpu(smp_processor_id()) && (regs.eflags & 0x100)) {
++			to_gdb
++			    ("Current cpu must be unblocked to single step\n");
++			goto once_again;
++		}
++		if (!(ss_hold)) {
++			int i;
++			for (i = 0; i < MAX_NO_CPUS; i++) {
++				if (!hold_cpu(i)) {
++					spin_unlock(&waitlocks[i]);
++				}
++			}
++		} else {
++			spin_unlock(&waitlocks[smp_processor_id()]);
++		}
++		/* Release kgdb spinlock */
++		KGDB_SPIN_UNLOCK(&kgdb_spinlock);
++		/*
++		 * If this cpu is on hold, this is where we
++		 * do it.  Note, the NMI will pull us out of here,
++		 * but will return as the above lock is not held.
++		 * We will stay here till another cpu releases the lock for us.
++		 */
++		spin_unlock_wait(waitlocks + smp_processor_id());
++		kgdb_local_irq_restore(flags);
++		return (0);
++	}
++#if 0
++exit_just_unlock:
++#endif
++#endif
++	/* Release kgdb spinlock */
++	KGDB_SPIN_UNLOCK(&kgdb_spinlock);
++	kgdb_local_irq_restore(flags);
++	return (0);
++}
++
++/* this function is used to set up exception handlers for tracing and
++ * breakpoints.
++ * This function is not needed as the above line does all that is needed.
++ * We leave it for backward compatitability...
++ */
++void
++set_debug_traps(void)
++{
++	/*
++	 * linux_debug_hook is defined in traps.c.  We store a pointer
++	 * to our own exception handler into it.
++
++	 * But really folks, every hear of labeled common, an old Fortran
++	 * concept.  Lots of folks can reference it and it is define if
++	 * anyone does.	 Only one can initialize it at link time.  We do
++	 * this with the hook.	See the statement above.  No need for any
++	 * executable code and it is ready as soon as the kernel is
++	 * loaded.  Very desirable in kernel debugging.
++
++	 linux_debug_hook = handle_exception ;
++	 */
++
++	/* In case GDB is started before us, ack any packets (presumably
++	   "$?#xx") sitting there.
++	   putDebugChar ('+');
++
++	   initialized = 1;
++	 */
++}
++
++/* This function will generate a breakpoint exception.	It is used at the
++   beginning of a program to sync up with a debugger and can be used
++   otherwise as a quick means to stop program execution and "break" into
++   the debugger. */
++/* But really, just use the BREAKPOINT macro.  We will handle the int stuff
++ */
++
++#ifdef later
++/*
++ * possibly we should not go thru the traps.c code at all?  Someday.
++ */
++void
++do_kgdb_int3(struct pt_regs *regs, long error_code)
++{
++	kgdb_handle_exception(3, 5, error_code, regs);
++	return;
++}
++#endif
++#undef regs
++#ifdef CONFIG_TRAP_BAD_SYSCALL_EXITS
++asmlinkage void
++bad_sys_call_exit(int stuff)
++{
++	struct pt_regs *regs = (struct pt_regs *) &stuff;
++	printk("Sys call %d return with %x preempt_count\n",
++	       (int) regs->orig_eax, preempt_count());
++}
++#endif
++#ifdef CONFIG_STACK_OVERFLOW_TEST
++#include <asm/kgdb.h>
++asmlinkage void
++stack_overflow(void)
++{
++#ifdef BREAKPOINT
++	BREAKPOINT;
++#else
++	printk("Kernel stack overflow, looping forever\n");
++#endif
++	while (1) {
++	}
++}
++#endif
++
++#if defined(CONFIG_SMP) || defined(CONFIG_KGDB_CONSOLE)
++char gdbconbuf[BUFMAX];
++
++static void
++kgdb_gdb_message(const char *s, unsigned count)
++{
++	int i;
++	int wcount;
++	char *bufptr;
++	/*
++	 * This takes care of NMI while spining out chars to gdb
++	 */
++	IF_SMP(in_kgdb_console = 1);
++	gdbconbuf[0] = 'O';
++	bufptr = gdbconbuf + 1;
++	while (count > 0) {
++		if ((count << 1) > (BUFMAX - 2)) {
++			wcount = (BUFMAX - 2) >> 1;
++		} else {
++			wcount = count;
++		}
++		count -= wcount;
++		for (i = 0; i < wcount; i++) {
++			bufptr = pack_hex_byte(bufptr, s[i]);
++		}
++		*bufptr = '\0';
++		s += wcount;
++
++		putpacket(gdbconbuf);
++
++	}
++	IF_SMP(in_kgdb_console = 0);
++}
++#endif
++#ifdef CONFIG_SMP
++static void
++to_gdb(const char *s)
++{
++	int count = 0;
++	while (s[count] && (count++ < BUFMAX)) ;
++	kgdb_gdb_message(s, count);
++}
++#endif
++#ifdef CONFIG_KGDB_CONSOLE
++#include <linux/console.h>
++#include <linux/init.h>
++#include <linux/fs.h>
++#include <asm/uaccess.h>
++#include <asm/semaphore.h>
++
++void
++kgdb_console_write(struct console *co, const char *s, unsigned count)
++{
++
++	if (gdb_i386vector == -1) {
++		/*
++		 * We have not yet talked to gdb.  What to do...
++		 * lets break, on continue we can do the write.
++		 * But first tell him whats up. Uh, well no can do,
++		 * as this IS the console.  Oh well...
++		 * We do need to wait or the messages will be lost.
++		 * Other option would be to tell the above code to
++		 * ignore this breakpoint and do an auto return,
++		 * but that might confuse gdb.	Also this happens
++		 * early enough in boot up that we don't have the traps
++		 * set up yet, so...
++		 */
++		breakpoint();
++	}
++	kgdb_gdb_message(s, count);
++}
++
++/*
++ * ------------------------------------------------------------
++ * Serial KGDB driver
++ * ------------------------------------------------------------
++ */
++
++static struct console kgdbcons = {
++	name:"kgdb",
++	write:kgdb_console_write,
++#ifdef CONFIG_KGDB_USER_CONSOLE
++	device:kgdb_console_device,
++#endif
++	flags:CON_PRINTBUFFER | CON_ENABLED,
++	index:-1,
++};
++
++/*
++ * The trick here is that this file gets linked before printk.o
++ * That means we get to peer at the console info in the command
++ * line before it does.	 If we are up, we register, otherwise,
++ * do nothing.	By returning 0, we allow printk to look also.
++ */
++static int kgdb_console_enabled;
++
++int __init
++kgdb_console_init(char *str)
++{
++	if ((strncmp(str, "kgdb", 4) == 0) || (strncmp(str, "gdb", 3) == 0)) {
++		register_console(&kgdbcons);
++		kgdb_console_enabled = 1;
++	}
++	return 0;		/* let others look at the string */
++}
++
++__setup("console=", kgdb_console_init);
++
++#ifdef CONFIG_KGDB_USER_CONSOLE
++static kdev_t kgdb_console_device(struct console *c);
++/* This stuff sort of works, but it knocks out telnet devices
++ * we are leaving it here in case we (or you) find time to figure it out
++ * better..
++ */
++
++/*
++ * We need a real char device as well for when the console is opened for user
++ * space activities.
++ */
++
++static int
++kgdb_consdev_open(struct inode *inode, struct file *file)
++{
++	return 0;
++}
++
++static ssize_t
++kgdb_consdev_write(struct file *file, const char *buf,
++		   size_t count, loff_t * ppos)
++{
++	int size, ret = 0;
++	static char kbuf[128];
++	static DECLARE_MUTEX(sem);
++
++	/* We are not reentrant... */
++	if (down_interruptible(&sem))
++		return -ERESTARTSYS;
++
++	while (count > 0) {
++		/* need to copy the data from user space */
++		size = count;
++		if (size > sizeof (kbuf))
++			size = sizeof (kbuf);
++		if (copy_from_user(kbuf, buf, size)) {
++			ret = -EFAULT;
++			break;;
++		}
++		kgdb_console_write(&kgdbcons, kbuf, size);
++		count -= size;
++		ret += size;
++		buf += size;
++	}
++
++	up(&sem);
++
++	return ret;
++}
++
++struct file_operations kgdb_consdev_fops = {
++	open:kgdb_consdev_open,
++	write:kgdb_consdev_write
++};
++static kdev_t
++kgdb_console_device(struct console *c)
++{
++	return MKDEV(TTYAUX_MAJOR, 1);
++}
++
++/*
++ * This routine gets called from the serial stub in the i386/lib
++ * This is so it is done late in bring up (just before the console open).
++ */
++void
++kgdb_console_finit(void)
++{
++	if (kgdb_console_enabled) {
++		char *cptr = cdevname(MKDEV(TTYAUX_MAJOR, 1));
++		char *cp = cptr;
++		while (*cptr && *cptr != '(')
++			cptr++;
++		*cptr = 0;
++		unregister_chrdev(TTYAUX_MAJOR, cp);
++		register_chrdev(TTYAUX_MAJOR, "kgdb", &kgdb_consdev_fops);
++	}
++}
++#endif
++#endif
++#ifdef CONFIG_KGDB_TS
++#include <asm/msr.h>		/* time stamp code */
++#include <asm/hardirq.h>	/* in_interrupt */
++#ifdef CONFIG_KGDB_TS_64
++#define DATA_POINTS 64
++#endif
++#ifdef CONFIG_KGDB_TS_128
++#define DATA_POINTS 128
++#endif
++#ifdef CONFIG_KGDB_TS_256
++#define DATA_POINTS 256
++#endif
++#ifdef CONFIG_KGDB_TS_512
++#define DATA_POINTS 512
++#endif
++#ifdef CONFIG_KGDB_TS_1024
++#define DATA_POINTS 1024
++#endif
++#ifndef DATA_POINTS
++#define DATA_POINTS 128		/* must be a power of two */
++#endif
++#define INDEX_MASK (DATA_POINTS - 1)
++#if (INDEX_MASK & DATA_POINTS)
++#error "CONFIG_KGDB_TS_COUNT must be a power of 2"
++#endif
++struct kgdb_and_then_struct {
++#ifdef CONFIG_SMP
++	int on_cpu;
++#endif
++	struct task_struct *task;
++	long long at_time;
++	int from_ln;
++	char *in_src;
++	void *from;
++	int *with_shpf;
++	int data0;
++	int data1;
++};
++struct kgdb_and_then_struct2 {
++#ifdef CONFIG_SMP
++	int on_cpu;
++#endif
++	struct task_struct *task;
++	long long at_time;
++	int from_ln;
++	char *in_src;
++	void *from;
++	int *with_shpf;
++	struct task_struct *t1;
++	struct task_struct *t2;
++};
++struct kgdb_and_then_struct kgdb_data[DATA_POINTS];
++
++struct kgdb_and_then_struct *kgdb_and_then = &kgdb_data[0];
++int kgdb_and_then_count;
++
++void
++kgdb_tstamp(int line, char *source, int data0, int data1)
++{
++	static spinlock_t ts_spin = SPIN_LOCK_UNLOCKED;
++	int flags;
++	kgdb_local_irq_save(flags);
++	spin_lock(&ts_spin);
++	rdtscll(kgdb_and_then->at_time);
++#ifdef CONFIG_SMP
++	kgdb_and_then->on_cpu = smp_processor_id();
++#endif
++	kgdb_and_then->task = current;
++	kgdb_and_then->from_ln = line;
++	kgdb_and_then->in_src = source;
++	kgdb_and_then->from = __builtin_return_address(0);
++	kgdb_and_then->with_shpf = (int *) (((flags & IF_BIT) >> 9) |
++					    (preempt_count() << 8));
++	kgdb_and_then->data0 = data0;
++	kgdb_and_then->data1 = data1;
++	kgdb_and_then = &kgdb_data[++kgdb_and_then_count & INDEX_MASK];
++	spin_unlock(&ts_spin);
++	kgdb_local_irq_restore(flags);
++#ifdef CONFIG_PREEMPT
++
++#endif
++	return;
++}
++#endif
++typedef int gdb_debug_hook(int exceptionVector,
++			   int signo, int err_code, struct pt_regs *linux_regs);
++gdb_debug_hook *linux_debug_hook = &kgdb_handle_exception;	/* histerical reasons... */
++
++static int __init kgdb_opt_kgdbeth(char *str)
++{
++	kgdb_eth = simple_strtoul(str, NULL, 10);
++	return 1;
++}
++
++static int __init kgdb_opt_kgdbeth_remoteip(char *str)
++{
++	kgdb_remoteip = in_aton(str);
++	return 1;
++}
++
++static int __init kgdb_opt_kgdbeth_listenport(char *str)
++{
++	kgdb_listenport = simple_strtoul(str, NULL, 10);
++	kgdb_sendport = kgdb_listenport - 1;
++	return 1;
++}
++
++static int __init parse_hw_addr(char *str, unsigned char *addr)
++{
++	int  i;
++	char *p;
++
++	p = str;
++	i = 0;
++	while(1)
++	{
++		unsigned int c;
++
++		sscanf(p, "%x:", &c);
++		addr[i++] = c;
++		while((*p != 0) && (*p != ':')) {
++			p++;
++		}
++		if (*p == 0) {
++			break;
++		}
++		p++;
++	}
++
++	return 1;
++}
++
++static int __init kgdb_opt_kgdbeth_remotemac(char *str)
++{
++	return parse_hw_addr(str, kgdb_remotemac);
++}
++static int __init kgdb_opt_kgdbeth_localmac(char *str)
++{
++	return parse_hw_addr(str, kgdb_localmac);
++}
++
++
++__setup("gdbeth=", kgdb_opt_kgdbeth);
++__setup("gdbeth_remoteip=", kgdb_opt_kgdbeth_remoteip);
++__setup("gdbeth_listenport=", kgdb_opt_kgdbeth_listenport);
++__setup("gdbeth_remotemac=", kgdb_opt_kgdbeth_remotemac);
++__setup("gdbeth_localmac=", kgdb_opt_kgdbeth_localmac);
++
+--- linux-2.6.0-test6/arch/i386/kernel/ldt.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/arch/i386/kernel/ldt.c	2003-10-05 00:36:48.000000000 -0700
+@@ -2,7 +2,7 @@
+  * linux/kernel/ldt.c
+  *
+  * Copyright (C) 1992 Krishna Balasubramanian and Linus Torvalds
+- * Copyright (C) 1999 Ingo Molnar <mingo@redhat.com>
++ * Copyright (C) 1999, 2003 Ingo Molnar <mingo@redhat.com>
+  */
+ 
+ #include <linux/errno.h>
+@@ -18,6 +18,8 @@
+ #include <asm/system.h>
+ #include <asm/ldt.h>
+ #include <asm/desc.h>
++#include <linux/highmem.h>
++#include <asm/atomic_kmap.h>
+ 
+ #ifdef CONFIG_SMP /* avoids "defined but not used" warnig */
+ static void flush_ldt(void *null)
+@@ -29,34 +31,31 @@ static void flush_ldt(void *null)
+ 
+ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
+ {
+-	void *oldldt;
+-	void *newldt;
+-	int oldsize;
++	int oldsize, newsize, i;
+ 
+ 	if (mincount <= pc->size)
+ 		return 0;
++	/*
++	 * LDT got larger - reallocate if necessary.
++	 */
+ 	oldsize = pc->size;
+ 	mincount = (mincount+511)&(~511);
+-	if (mincount*LDT_ENTRY_SIZE > PAGE_SIZE)
+-		newldt = vmalloc(mincount*LDT_ENTRY_SIZE);
+-	else
+-		newldt = kmalloc(mincount*LDT_ENTRY_SIZE, GFP_KERNEL);
+-
+-	if (!newldt)
+-		return -ENOMEM;
+-
+-	if (oldsize)
+-		memcpy(newldt, pc->ldt, oldsize*LDT_ENTRY_SIZE);
+-	oldldt = pc->ldt;
+-	memset(newldt+oldsize*LDT_ENTRY_SIZE, 0, (mincount-oldsize)*LDT_ENTRY_SIZE);
+-	pc->ldt = newldt;
+-	wmb();
++	newsize = mincount*LDT_ENTRY_SIZE;
++	for (i = 0; i < newsize; i += PAGE_SIZE) {
++		int nr = i/PAGE_SIZE;
++		BUG_ON(i >= 64*1024);
++		if (!pc->ldt_pages[nr]) {
++			pc->ldt_pages[nr] = alloc_page(GFP_HIGHUSER);
++			if (!pc->ldt_pages[nr])
++				return -ENOMEM;
++			clear_highpage(pc->ldt_pages[nr]);
++		}
++	}
+ 	pc->size = mincount;
+-	wmb();
+-
+ 	if (reload) {
+ #ifdef CONFIG_SMP
+ 		cpumask_t mask;
++
+ 		preempt_disable();
+ 		load_LDT(pc);
+ 		mask = cpumask_of_cpu(smp_processor_id());
+@@ -67,21 +66,20 @@ static int alloc_ldt(mm_context_t *pc, i
+ 		load_LDT(pc);
+ #endif
+ 	}
+-	if (oldsize) {
+-		if (oldsize*LDT_ENTRY_SIZE > PAGE_SIZE)
+-			vfree(oldldt);
+-		else
+-			kfree(oldldt);
+-	}
+ 	return 0;
+ }
+ 
+ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
+ {
+-	int err = alloc_ldt(new, old->size, 0);
+-	if (err < 0)
++	int i, err, size = old->size, nr_pages = (size*LDT_ENTRY_SIZE + PAGE_SIZE-1)/PAGE_SIZE;
++
++	err = alloc_ldt(new, size, 0);
++	if (err < 0) {
++		new->size = 0;
+ 		return err;
+-	memcpy(new->ldt, old->ldt, old->size*LDT_ENTRY_SIZE);
++	}
++	for (i = 0; i < nr_pages; i++)
++		copy_user_highpage(new->ldt_pages[i], old->ldt_pages[i], 0);
+ 	return 0;
+ }
+ 
+@@ -96,6 +94,7 @@ int init_new_context(struct task_struct 
+ 
+ 	init_MUTEX(&mm->context.sem);
+ 	mm->context.size = 0;
++	memset(mm->context.ldt_pages, 0, sizeof(struct page *) * MAX_LDT_PAGES);
+ 	old_mm = current->mm;
+ 	if (old_mm && old_mm->context.size > 0) {
+ 		down(&old_mm->context.sem);
+@@ -107,23 +106,21 @@ int init_new_context(struct task_struct 
+ 
+ /*
+  * No need to lock the MM as we are the last user
++ * Do not touch the ldt register, we are already
++ * in the next thread.
+  */
+ void destroy_context(struct mm_struct *mm)
+ {
+-	if (mm->context.size) {
+-		if (mm == current->active_mm)
+-			clear_LDT();
+-		if (mm->context.size*LDT_ENTRY_SIZE > PAGE_SIZE)
+-			vfree(mm->context.ldt);
+-		else
+-			kfree(mm->context.ldt);
+-		mm->context.size = 0;
+-	}
++	int i, nr_pages = (mm->context.size*LDT_ENTRY_SIZE + PAGE_SIZE-1) / PAGE_SIZE;
++
++	for (i = 0; i < nr_pages; i++)
++		__free_page(mm->context.ldt_pages[i]);
++	mm->context.size = 0;
+ }
+ 
+ static int read_ldt(void __user * ptr, unsigned long bytecount)
+ {
+-	int err;
++	int err, i;
+ 	unsigned long size;
+ 	struct mm_struct * mm = current->mm;
+ 
+@@ -138,8 +135,25 @@ static int read_ldt(void __user * ptr, u
+ 		size = bytecount;
+ 
+ 	err = 0;
+-	if (copy_to_user(ptr, mm->context.ldt, size))
+-		err = -EFAULT;
++	/*
++	 * This is necessary just in case we got here straight from a
++	 * context-switch where the ptes were set but no tlb flush
++	 * was done yet. We rather avoid doing a TLB flush in the
++	 * context-switch path and do it here instead.
++	 */
++	__flush_tlb_global();
++
++	for (i = 0; i < size; i += PAGE_SIZE) {
++		int nr = i / PAGE_SIZE, bytes;
++		char *kaddr = kmap(mm->context.ldt_pages[nr]);
++
++		bytes = size - i;
++		if (bytes > PAGE_SIZE)
++			bytes = PAGE_SIZE;
++		if (copy_to_user(ptr + i, kaddr, size - i))
++			err = -EFAULT;
++		kunmap(mm->context.ldt_pages[nr]);
++	}
+ 	up(&mm->context.sem);
+ 	if (err < 0)
+ 		return err;
+@@ -158,7 +172,7 @@ static int read_default_ldt(void __user 
+ 
+ 	err = 0;
+ 	address = &default_ldt[0];
+-	size = 5*sizeof(struct desc_struct);
++	size = 5*LDT_ENTRY_SIZE;
+ 	if (size > bytecount)
+ 		size = bytecount;
+ 
+@@ -200,7 +214,15 @@ static int write_ldt(void __user * ptr, 
+ 			goto out_unlock;
+ 	}
+ 
+-	lp = (__u32 *) ((ldt_info.entry_number << 3) + (char *) mm->context.ldt);
++	/*
++	 * No rescheduling allowed from this point to the install.
++	 *
++	 * We do a TLB flush for the same reason as in the read_ldt() path.
++	 */
++	preempt_disable();
++	__flush_tlb_global();
++	lp = (__u32 *) ((ldt_info.entry_number << 3) +
++			(char *) __kmap_atomic_vaddr(KM_LDT_PAGE0));
+ 
+    	/* Allow LDTs to be cleared by the user. */
+    	if (ldt_info.base_addr == 0 && ldt_info.limit == 0) {
+@@ -221,6 +243,7 @@ install:
+ 	*lp	= entry_1;
+ 	*(lp+1)	= entry_2;
+ 	error = 0;
++	preempt_enable();
+ 
+ out_unlock:
+ 	up(&mm->context.sem);
+@@ -248,3 +271,26 @@ asmlinkage int sys_modify_ldt(int func, 
+ 	}
+ 	return ret;
+ }
++
++/*
++ * load one particular LDT into the current CPU
++ */
++void load_LDT_nolock(mm_context_t *pc, int cpu)
++{
++	struct page **pages = pc->ldt_pages;
++	int count = pc->size;
++	int nr_pages, i;
++
++	if (likely(!count)) {
++		pages = &default_ldt_page;
++		count = 5;
++	}
++       	nr_pages = (count*LDT_ENTRY_SIZE + PAGE_SIZE-1) / PAGE_SIZE;
++
++	for (i = 0; i < nr_pages; i++) {
++		__kunmap_atomic_type(KM_LDT_PAGE0 - i);
++		__kmap_atomic(pages[i], KM_LDT_PAGE0 - i);
++	}
++	set_ldt_desc(cpu, (void *)__kmap_atomic_vaddr(KM_LDT_PAGE0), count);
++	load_LDT_desc();
++}
+--- linux-2.6.0-test6/arch/i386/kernel/Makefile	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/i386/kernel/Makefile	2003-10-05 00:36:48.000000000 -0700
+@@ -7,13 +7,14 @@ extra-y := head.o init_task.o vmlinux.ld
+ obj-y	:= process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \
+ 		ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_i386.o \
+ 		pci-dma.o i386_ksyms.o i387.o dmi_scan.o bootflag.o \
+-		doublefault.o
++		doublefault.o efi.o efi_stub.o entry_trampoline.o
+ 
+ obj-y				+= cpu/
+ obj-y				+= timers/
+ obj-$(CONFIG_ACPI_BOOT)		+= acpi/
+ obj-$(CONFIG_X86_BIOS_REBOOT)	+= reboot.o
+ obj-$(CONFIG_MCA)		+= mca.o
++obj-$(CONFIG_KGDB)		+= kgdb_stub.o
+ obj-$(CONFIG_X86_MSR)		+= msr.o
+ obj-$(CONFIG_X86_CPUID)		+= cpuid.o
+ obj-$(CONFIG_MICROCODE)		+= microcode.o
+--- linux-2.6.0-test6/arch/i386/kernel/mca.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/arch/i386/kernel/mca.c	2003-10-05 00:36:10.000000000 -0700
+@@ -132,7 +132,9 @@ struct resource mca_standard_resources[]
+ #define MCA_STANDARD_RESOURCES	(sizeof(mca_standard_resources)/sizeof(struct resource))
+ 
+ /**
+- *	mca_read_pos - read the POS registers into a memory buffer
++ *	mca_read_and_store_pos - read the POS registers into a memory buffer
++ *      @pos: a char pointer to 8 bytes, contains the POS register value on
++ *            successful return
+  *
+  *	Returns 1 if a card actually exists (i.e. the pos isn't
+  *	all 0xff) or 0 otherwise
+--- linux-2.6.0-test6/arch/i386/kernel/mpparse.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/i386/kernel/mpparse.c	2003-10-05 00:36:48.000000000 -0700
+@@ -169,7 +169,7 @@ void __init MP_processor_info (struct mp
+ 
+ 	if (num_processors >= NR_CPUS) {
+ 		printk(KERN_WARNING "NR_CPUS limit of %i reached.  Cannot "
+-			"boot CPU(apicid 0x%d).\n", NR_CPUS, m->mpc_apicid);
++			"boot CPU(apicid 0x%x).\n", NR_CPUS, m->mpc_apicid);
+ 		return;
+ 	}
+ 	num_processors++;
+@@ -616,6 +616,31 @@ static inline void __init construct_defa
+ 	}
+ }
+ 
++#ifdef CONFIG_X86_IO_APIC
++/* irq_vector must be have an entry for all RTEs of all I/O APICs. */
++void __init alloc_irq_vector_array(void)
++{
++	int	total = 0;
++	int	idx;
++	union IO_APIC_reg_01	reg_01;
++
++	/* The I/O APIC fixmaps aren't inited yet, so use the first one. */
++	for (idx = 0; idx < nr_ioapics; idx++) {
++		set_fixmap_nocache(FIX_IO_APIC_BASE_0, mp_ioapics[idx].mpc_apicaddr);
++		reg_01.raw = io_apic_read(0, 1);
++		total += reg_01.bits.entries + 1;
++	}
++
++	/* Always alloc at least NR_IRQS vectors. */
++	nr_irqs = max(total, NR_IRQS);
++	irq_vector = (u8 *) alloc_bootmem(nr_irqs);
++	memset(irq_vector, 0, nr_irqs);
++	irq_vector[0] = FIRST_DEVICE_VECTOR;
++}
++#else
++void __init alloc_irq_vector_array(void) { }
++#endif /* CONFIG_X86_IO_APIC */
++
+ static struct intel_mp_floating *mpf_found;
+ 
+ /*
+@@ -633,6 +658,7 @@ void __init get_smp_config (void)
+ 	 */
+ 	if (acpi_lapic && acpi_ioapic) {
+ 		printk(KERN_INFO "Using ACPI (MADT) for SMP configuration information\n");
++		alloc_irq_vector_array();
+ 		return;
+ 	}
+ 	else if (acpi_lapic)
+@@ -661,10 +687,11 @@ void __init get_smp_config (void)
+ 		 * Read the physical hardware table.  Anything here will
+ 		 * override the defaults.
+ 		 */
+-		if (!smp_read_mpc((void *)mpf->mpf_physptr)) {
++		if (!smp_read_mpc((void *)phys_to_virt(mpf->mpf_physptr))) {
+ 			smp_found_config = 0;
+ 			printk(KERN_ERR "BIOS bug, MP table errors detected!...\n");
+ 			printk(KERN_ERR "... disabling SMP support. (tell your hw vendor)\n");
++			alloc_irq_vector_array();
+ 			return;
+ 		}
+ 		/*
+@@ -688,6 +715,7 @@ void __init get_smp_config (void)
+ 	} else
+ 		BUG();
+ 
++	alloc_irq_vector_array();
+ 	printk(KERN_INFO "Processors: %d\n", num_processors);
+ 	/*
+ 	 * Only use the first configuration found.
+@@ -830,7 +858,7 @@ void __init mp_register_lapic (
+ 	MP_processor_info(&processor);
+ }
+ 
+-#ifdef CONFIG_X86_IO_APIC
++#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI_INTERPRETER)
+ 
+ #define MP_ISA_BUS		0
+ #define MP_MAX_IOAPIC_PIN	127
+@@ -1019,10 +1047,6 @@ void __init mp_config_acpi_legacy_irqs (
+ 	}
+ }
+ 
+-#ifdef	CONFIG_ACPI
+-
+-/* Ensure the ACPI SCI interrupt level is active low, edge-triggered */
+-
+ extern FADT_DESCRIPTOR acpi_fadt;
+ 
+ void __init mp_config_ioapic_for_sci(int irq)
+@@ -1031,6 +1055,7 @@ void __init mp_config_ioapic_for_sci(int
+ 	int ioapic_pin;
+ 	struct acpi_table_madt *madt;
+ 	struct acpi_table_int_src_ovr *entry = NULL;
++	acpi_interrupt_flags flags;
+ 	void *madt_end;
+ 	acpi_status status;
+ 
+@@ -1049,32 +1074,37 @@ void __init mp_config_ioapic_for_sci(int
+ 
+ 		while ((void *) entry < madt_end) {
+                 	if (entry->header.type == ACPI_MADT_INT_SRC_OVR &&
+-			    acpi_fadt.sci_int == entry->bus_irq) {
+-				/*
+-				 * See the note at the end of ACPI 2.0b section
+-				 * 5.2.10.8 for what this is about.
+-				 */
+-				if (entry->bus_irq != entry->global_irq) {
+-					acpi_fadt.sci_int = entry->global_irq;
+-					irq = entry->global_irq;
+-					break;
+-				}
+-				else
+-                			return;
+-			}
+-
++			    acpi_fadt.sci_int == entry->bus_irq)
++				goto found;
++			
+                 	entry = (struct acpi_table_int_src_ovr *)
+                 	        ((unsigned long) entry + entry->header.length);
+         	}
+ 	}
++	/*
++	 * Although the ACPI spec says that the SCI should be level/low
++	 * don't reprogram it unless there is an explicit MADT OVR entry
++	 * instructing us to do so -- otherwise we break Tyan boards which
++	 * have the SCI wired edge/high but no MADT OVR.
++	 */
++	return;
++
++found:
++	/*
++	 * See the note at the end of ACPI 2.0b section
++	 * 5.2.10.8 for what this is about.
++	 */
++	flags = entry->flags;
++	acpi_fadt.sci_int = entry->global_irq;
++	irq = entry->global_irq;
+ 
+ 	ioapic = mp_find_ioapic(irq);
+ 
+ 	ioapic_pin = irq - mp_ioapic_routing[ioapic].irq_start;
+ 
+-	io_apic_set_pci_routing(ioapic, ioapic_pin, irq, 1, 1); // Active low, level triggered
++	io_apic_set_pci_routing(ioapic, ioapic_pin, irq, 
++				(flags.trigger >> 1) , (flags.polarity >> 1));
+ }
+-#endif	/* CONFIG_ACPI */
+ 
+ #ifdef CONFIG_ACPI_PCI
+ 
+@@ -1110,8 +1140,10 @@ void __init mp_parse_prt (void)
+ 		}
+ 
+ 		/* Don't set up the ACPI SCI because it's already set up */
+-		if (acpi_fadt.sci_int == irq)
++                if (acpi_fadt.sci_int == irq) {
++                        entry->irq = irq; /*we still need to set entry's irq*/
+ 			continue;
++                }
+ 	
+ 		ioapic = mp_find_ioapic(irq);
+ 		if (ioapic < 0)
+@@ -1136,15 +1168,19 @@ void __init mp_parse_prt (void)
+ 		if ((1<<bit) & mp_ioapic_routing[ioapic].pin_programmed[idx]) {
+ 			printk(KERN_DEBUG "Pin %d-%d already programmed\n",
+ 				mp_ioapic_routing[ioapic].apic_id, ioapic_pin);
+-			entry->irq = irq;
++ 			if (use_pci_vector() && !platform_legacy_irq(irq))
++ 				irq = IO_APIC_VECTOR(irq);
++ 			entry->irq = irq;
+ 			continue;
+ 		}
+ 
+ 		mp_ioapic_routing[ioapic].pin_programmed[idx] |= (1<<bit);
+ 
+-		if (!io_apic_set_pci_routing(ioapic, ioapic_pin, irq, edge_level, active_high_low))
+-			entry->irq = irq;
+-
++		if (!io_apic_set_pci_routing(ioapic, ioapic_pin, irq, edge_level, active_high_low)) {
++ 			if (use_pci_vector() && !platform_legacy_irq(irq))
++ 				irq = IO_APIC_VECTOR(irq);
++ 			entry->irq = irq;
++ 		}
+ 		printk(KERN_DEBUG "%02x:%02x:%02x[%c] -> %d-%d -> IRQ %d\n",
+ 			entry->id.segment, entry->id.bus, 
+ 			entry->id.device, ('A' + entry->pin), 
+@@ -1154,5 +1190,5 @@ void __init mp_parse_prt (void)
+ }
+ 
+ #endif /*CONFIG_ACPI_PCI*/
+-#endif	/* CONFIG_X86_IO_APIC */
++#endif /*CONFIG_X86_IO_APIC && CONFIG_ACPI_INTERPRETER*/
+ #endif /*CONFIG_ACPI_BOOT*/
+--- linux-2.6.0-test6/arch/i386/kernel/nmi.c	2003-08-08 22:55:10.000000000 -0700
++++ 25/arch/i386/kernel/nmi.c	2003-10-05 00:33:38.000000000 -0700
+@@ -31,7 +31,16 @@
+ #include <asm/mpspec.h>
+ #include <asm/nmi.h>
+ 
++#ifdef CONFIG_KGDB
++#include <asm/kgdb.h>
++#ifdef CONFIG_SMP
++unsigned int nmi_watchdog = NMI_IO_APIC;
++#else
++unsigned int nmi_watchdog = NMI_LOCAL_APIC;
++#endif
++#else
+ unsigned int nmi_watchdog = NMI_NONE;
++#endif
+ static unsigned int nmi_hz = HZ;
+ unsigned int nmi_perfctr_msr;	/* the MSR to reset in NMI handler */
+ extern void show_registers(struct pt_regs *regs);
+@@ -408,6 +417,9 @@ void touch_nmi_watchdog (void)
+ 	for (i = 0; i < NR_CPUS; i++)
+ 		alert_counter[i] = 0;
+ }
++#ifdef CONFIG_KGDB
++int tune_watchdog = 5*HZ;
++#endif
+ 
+ void nmi_watchdog_tick (struct pt_regs * regs)
+ {
+@@ -421,12 +433,24 @@ void nmi_watchdog_tick (struct pt_regs *
+ 
+ 	sum = irq_stat[cpu].apic_timer_irqs;
+ 
++#ifdef CONFIG_KGDB
++ 	if (! in_kgdb(regs) && last_irq_sums[cpu] == sum ) {
++
++#else
+ 	if (last_irq_sums[cpu] == sum) {
++#endif
+ 		/*
+ 		 * Ayiee, looks like this CPU is stuck ...
+ 		 * wait a few IRQs (5 seconds) before doing the oops ...
+ 		 */
+ 		alert_counter[cpu]++;
++#ifdef CONFIG_KGDB
++                if (alert_counter[cpu] == tune_watchdog) {
++                        kgdb_handle_exception(2, SIGPWR, 0, regs);
++                        last_irq_sums[cpu] = sum;
++                        alert_counter[cpu] = 0;
++                }
++#endif
+ 		if (alert_counter[cpu] == 5*nmi_hz) {
+ 			spin_lock(&nmi_print_lock);
+ 			/*
+--- linux-2.6.0-test6/arch/i386/kernel/process.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/i386/kernel/process.c	2003-10-05 00:36:48.000000000 -0700
+@@ -47,6 +47,7 @@
+ #include <asm/i387.h>
+ #include <asm/irq.h>
+ #include <asm/desc.h>
++#include <asm/atomic_kmap.h>
+ #ifdef CONFIG_MATH_EMULATION
+ #include <asm/math_emu.h>
+ #endif
+@@ -298,6 +299,9 @@ void flush_thread(void)
+ 	struct task_struct *tsk = current;
+ 
+ 	memset(tsk->thread.debugreg, 0, sizeof(unsigned long)*8);
++#ifdef CONFIG_X86_HIGH_ENTRY
++	clear_thread_flag(TIF_DB7);
++#endif
+ 	memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));	
+ 	/*
+ 	 * Forget coprocessor state..
+@@ -311,9 +315,8 @@ void release_thread(struct task_struct *
+ 	if (dead_task->mm) {
+ 		// temporary debugging check
+ 		if (dead_task->mm->context.size) {
+-			printk("WARNING: dead process %8s still has LDT? <%p/%d>\n",
++			printk("WARNING: dead process %8s still has LDT? <%d>\n",
+ 					dead_task->comm,
+-					dead_task->mm->context.ldt,
+ 					dead_task->mm->context.size);
+ 			BUG();
+ 		}
+@@ -348,7 +351,17 @@ int copy_thread(int nr, unsigned long cl
+ 	p->thread.esp = (unsigned long) childregs;
+ 	p->thread.esp0 = (unsigned long) (childregs+1);
+ 
++	/*
++	 * get the two stack pages, for the virtual stack.
++	 *
++	 * IMPORTANT: this code relies on the fact that the task
++	 * structure is an 8K aligned piece of physical memory.
++	 */
++	p->thread.stack_page0 = virt_to_page((unsigned long)p->thread_info);
++	p->thread.stack_page1 = virt_to_page((unsigned long)p->thread_info + PAGE_SIZE);
++
+ 	p->thread.eip = (unsigned long) ret_from_fork;
++	p->thread_info->real_stack = p->thread_info;
+ 
+ 	savesegment(fs,p->thread.fs);
+ 	savesegment(gs,p->thread.gs);
+@@ -500,10 +513,40 @@ struct task_struct * __switch_to(struct 
+ 
+ 	__unlazy_fpu(prev_p);
+ 
++#ifdef CONFIG_X86_HIGH_ENTRY
++	/*
++	 * Set the ptes of the virtual stack. (NOTE: a one-page TLB flush is
++	 * needed because otherwise NMIs could interrupt the
++	 * user-return code with a virtual stack and stale TLBs.)
++	 */
++	__kunmap_atomic_type(KM_VSTACK0);
++	__kunmap_atomic_type(KM_VSTACK1);
++	__kmap_atomic(next->stack_page0, KM_VSTACK0);
++	__kmap_atomic(next->stack_page1, KM_VSTACK1);
++
++	/*
++	 * NOTE: here we rely on the task being the stack as well
++	 */
++	next_p->thread_info->virtual_stack = (void *)__kmap_atomic_vaddr(KM_VSTACK0);
++
++#if defined(CONFIG_PREEMPT) && defined(CONFIG_SMP)
++	/*
++	 * If next was preempted on entry from userspace to kernel,
++	 * and now it's on a different cpu, we need to adjust %esp.
++	 * This assumes that entry.S does not copy %esp while on the
++	 * virtual stack (with interrupts enabled): which is so,
++	 * except within __SWITCH_KERNELSPACE itself.
++	 */
++	if (unlikely(next->esp >= TASK_SIZE)) {
++		next->esp &= THREAD_SIZE - 1;
++		next->esp |= (unsigned long) next_p->thread_info->virtual_stack;
++	}
++#endif
++#endif
+ 	/*
+-	 * Reload esp0, LDT and the page table pointer:
++	 * Reload esp0:
+ 	 */
+-	load_esp0(tss, next->esp0);
++	load_esp0(tss, virtual_esp0(next_p));
+ 
+ 	/*
+ 	 * Load the per-thread Thread-Local Storage descriptor.
+--- linux-2.6.0-test6/arch/i386/kernel/reboot.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/i386/kernel/reboot.c	2003-10-05 00:36:48.000000000 -0700
+@@ -7,6 +7,7 @@
+ #include <linux/init.h>
+ #include <linux/interrupt.h>
+ #include <linux/mc146818rtc.h>
++#include <linux/efi.h>
+ #include <asm/uaccess.h>
+ #include <asm/apic.h>
+ #include "mach_reboot.h"
+@@ -153,12 +154,11 @@ void machine_real_restart(unsigned char 
+ 	CMOS_WRITE(0x00, 0x8f);
+ 	spin_unlock_irqrestore(&rtc_lock, flags);
+ 
+-	/* Remap the kernel at virtual address zero, as well as offset zero
+-	   from the kernel segment.  This assumes the kernel segment starts at
+-	   virtual address PAGE_OFFSET. */
+-
+-	memcpy (swapper_pg_dir, swapper_pg_dir + USER_PGD_PTRS,
+-		sizeof (swapper_pg_dir [0]) * KERNEL_PGD_PTRS);
++	/*
++	 * Remap the first 16 MB of RAM (which includes the kernel image)
++	 * at virtual address zero:
++	 */
++	setup_identity_mappings(swapper_pg_dir, 0, 16*1024*1024);
+ 
+ 	/*
+ 	 * Use `swapper_pg_dir' as our page directory.
+@@ -262,7 +262,12 @@ void machine_restart(char * __unused)
+ 	disable_IO_APIC();
+ #endif
+ 
+-	if(!reboot_thru_bios) {
++	if (!reboot_thru_bios) {
++		if (efi_enabled) {
++			efi.reset_system(EFI_RESET_COLD, EFI_SUCCESS, 0, 0);
++			__asm__ __volatile__("lidt %0": :"m" (no_idt));
++			__asm__ __volatile__("int3");
++		}
+ 		/* rebooting needs to touch the page at absolute addr 0 */
+ 		*((unsigned short *)__va(0x472)) = reboot_mode;
+ 		for (;;) {
+@@ -272,6 +277,8 @@ void machine_restart(char * __unused)
+ 			__asm__ __volatile__("int3");
+ 		}
+ 	}
++	if (efi_enabled)
++		efi.reset_system(EFI_RESET_WARM, EFI_SUCCESS, 0, 0);
+ 
+ 	machine_real_restart(jump_to_bios, sizeof(jump_to_bios));
+ }
+@@ -282,6 +289,8 @@ void machine_halt(void)
+ 
+ void machine_power_off(void)
+ {
++	if (efi_enabled)
++		efi.reset_system(EFI_RESET_SHUTDOWN, EFI_SUCCESS, 0, 0);
+ 	if (pm_power_off)
+ 		pm_power_off();
+ }
+--- linux-2.6.0-test6/arch/i386/kernel/setup.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/i386/kernel/setup.c	2003-10-05 00:36:22.000000000 -0700
+@@ -36,6 +36,8 @@
+ #include <linux/root_dev.h>
+ #include <linux/highmem.h>
+ #include <linux/module.h>
++#include <linux/efi.h>
++#include <linux/init.h>
+ #include <video/edid.h>
+ #include <asm/e820.h>
+ #include <asm/mpspec.h>
+@@ -56,6 +58,8 @@ static inline char * __init machine_spec
+  * Machine setup..
+  */
+ 
++int efi_enabled = 0;
++
+ /* cpu data as detected by the assembly code in head.S */
+ struct cpuinfo_x86 new_cpu_data __initdata = { 0, 0, 0, 0, -1, 1, 0, 0, -1 };
+ /* common cpu data for all cpus */
+@@ -64,10 +68,10 @@ struct cpuinfo_x86 boot_cpu_data = { 0, 
+ unsigned long mmu_cr4_features;
+ EXPORT_SYMBOL_GPL(mmu_cr4_features);
+ 
+-#ifdef	CONFIG_ACPI
+-	int acpi_disabled __initdata = 0;
++#ifdef	CONFIG_ACPI_INTERPRETER
++	int acpi_disabled = 0;
+ #else
+-	int acpi_disabled __initdata = 1;
++	int acpi_disabled = 1;
+ #endif
+ EXPORT_SYMBOL(acpi_disabled);
+ 
+@@ -144,6 +148,20 @@ static void __init limit_regions (unsign
+ 	int i;
+ 	unsigned long long current_size = 0;
+ 
++	if (efi_enabled) {
++		for (i = 0; i < memmap.nr_map; i++) {
++			current_size = memmap.map[i].phys_addr +
++				       (memmap.map[i].num_pages << 12);
++			if (memmap.map[i].type == EFI_CONVENTIONAL_MEMORY) {
++				if (current_size > size) {
++					memmap.map[i].num_pages -=
++						(((current_size-size) + PAGE_SIZE-1) >> PAGE_SHIFT);
++					memmap.nr_map = i + 1;
++					return;
++				}
++			}
++		}
++	}
+ 	for (i = 0; i < e820.nr_map; i++) {
+ 		if (e820.map[i].type == E820_RAM) {
+ 			current_size += e820.map[i].size;
+@@ -158,17 +176,21 @@ static void __init limit_regions (unsign
+ static void __init add_memory_region(unsigned long long start,
+                                   unsigned long long size, int type)
+ {
+-	int x = e820.nr_map;
++	int x;
+ 
+-	if (x == E820MAX) {
+-	    printk(KERN_ERR "Ooops! Too many entries in the memory map!\n");
+-	    return;
+-	}
++	if (!efi_enabled) {
++       		x = e820.nr_map;
+ 
+-	e820.map[x].addr = start;
+-	e820.map[x].size = size;
+-	e820.map[x].type = type;
+-	e820.nr_map++;
++		if (x == E820MAX) {
++		    printk(KERN_ERR "Ooops! Too many entries in the memory map!\n");
++		    return;
++		}
++
++		e820.map[x].addr = start;
++		e820.map[x].size = size;
++		e820.map[x].type = type;
++		e820.nr_map++;
++	}
+ } /* add_memory_region */
+ 
+ #define E820_DEBUG	1
+@@ -445,7 +467,6 @@ static inline void copy_edd(void)
+ static void __init setup_memory_region(void)
+ {
+ 	char *who = machine_specific_memory_setup();
+-
+ 	printk(KERN_INFO "BIOS-provided physical RAM map:\n");
+ 	print_memory_map(who);
+ } /* setup_memory_region */
+@@ -583,6 +604,23 @@ static void __init parse_cmdline_early (
+ }
+ 
+ /*
++ * Callback for efi_memory_walk.
++ */
++static int __init
++efi_find_max_pfn(unsigned long start, unsigned long end, void *arg)
++{
++	unsigned long *max_pfn = arg, pfn;
++
++	if (start < end) {
++		pfn = PFN_UP(end -1);
++		if (pfn > *max_pfn)
++			*max_pfn = pfn;
++	}
++	return 0;
++}
++
++
++/*
+  * Find the highest page frame number we have available
+  */
+ void __init find_max_pfn(void)
+@@ -590,6 +628,11 @@ void __init find_max_pfn(void)
+ 	int i;
+ 
+ 	max_pfn = 0;
++	if (efi_enabled) {
++		efi_memmap_walk(efi_find_max_pfn, &max_pfn);
++		return;
++	}
++
+ 	for (i = 0; i < e820.nr_map; i++) {
+ 		unsigned long start, end;
+ 		/* RAM? */
+@@ -664,6 +707,25 @@ unsigned long __init find_max_low_pfn(vo
+ }
+ 
+ #ifndef CONFIG_DISCONTIGMEM
++
++/*
++ * Free all available memory for boot time allocation.  Used
++ * as a callback function by efi_memory_walk()
++ */
++
++static int __init
++free_available_memory(unsigned long start, unsigned long end, void *arg)
++{
++	/* check max_low_pfn */
++	if (start >= ((max_low_pfn + 1) << PAGE_SHIFT))
++		return 0;
++	if (end >= ((max_low_pfn + 1) << PAGE_SHIFT))
++		end = (max_low_pfn + 1) << PAGE_SHIFT;
++	if (start < end)
++		free_bootmem(start, end - start);
++
++	return 0;
++}
+ /*
+  * Register fully available low RAM pages with the bootmem allocator.
+  */
+@@ -671,6 +733,10 @@ static void __init register_bootmem_low_
+ {
+ 	int i;
+ 
++	if (efi_enabled) {
++		efi_memmap_walk(free_available_memory, NULL);
++		return;
++	}
+ 	for (i = 0; i < e820.nr_map; i++) {
+ 		unsigned long curr_pfn, last_pfn, size;
+ 		/*
+@@ -798,9 +864,9 @@ extern unsigned long setup_memory(void);
+  * Request address space for all standard RAM and ROM resources
+  * and also for regions reported as reserved by the e820.
+  */
+-static void __init register_memory(unsigned long max_low_pfn)
++static void __init
++legacy_init_iomem_resources(struct resource *code_resource, struct resource *data_resource)
+ {
+-	unsigned long low_mem_size;
+ 	int i;
+ 
+ 	probe_roms();
+@@ -825,11 +891,26 @@ static void __init register_memory(unsig
+ 			 *  so we try it repeatedly and let the resource manager
+ 			 *  test it.
+ 			 */
+-			request_resource(res, &code_resource);
+-			request_resource(res, &data_resource);
++			request_resource(res, code_resource);
++			request_resource(res, data_resource);
+ 		}
+ 	}
++}
++
++/*
++ * Request address space for all standard resources
++ */
++static void __init register_memory(unsigned long max_low_pfn)
++{
++	unsigned long low_mem_size;
++	int i;
+ 
++	if (efi_enabled)
++		efi_initialize_iomem_resources(&code_resource, &data_resource);
++	else
++		legacy_init_iomem_resources(&code_resource, &data_resource);
++
++ 	 /* EFI systems may still have VGA */
+ 	request_graphics_resource();
+ 
+ 	/* request I/O space for devices used on all i[345]86 PCs */
+@@ -949,6 +1030,13 @@ static int __init noreplacement_setup(ch
+ 
+ __setup("noreplacement", noreplacement_setup); 
+ 
++/*
++ * Determine if we were loaded by an EFI loader.  If so, then we have also been
++ * passed the efi memmap, systab, etc., so we should use these data structures
++ * for initialization.  Note, the efi init code path is determined by the
++ * global efi_enabled. This allows the same kernel image to be used on existing
++ * systems (with a traditional BIOS) as well as on EFI systems.
++ */
+ void __init setup_arch(char **cmdline_p)
+ {
+ 	unsigned long max_low_pfn;
+@@ -957,6 +1045,12 @@ void __init setup_arch(char **cmdline_p)
+ 	pre_setup_arch_hook();
+ 	early_cpu_init();
+ 
++	/* FIXME: This isn't an official loader_type right
++	 * now but does currently work with elilo.
++	 */
++	if ((LOADER_TYPE == 0x50) && EFI_SYSTAB)
++		efi_enabled = 1;
++
+  	ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
+  	drive_info = DRIVE_INFO;
+  	screen_info = SCREEN_INFO;
+@@ -979,7 +1073,11 @@ void __init setup_arch(char **cmdline_p)
+ 	rd_doload = ((RAMDISK_FLAGS & RAMDISK_LOAD_FLAG) != 0);
+ #endif
+ 	ARCH_SETUP
+-	setup_memory_region();
++	if (efi_enabled)
++		efi_init();
++	else
++		setup_memory_region();
++
+ 	copy_edd();
+ 
+ 	if (!MOUNT_ROOT_RDONLY)
+@@ -1013,6 +1111,8 @@ void __init setup_arch(char **cmdline_p)
+ #ifdef CONFIG_X86_GENERICARCH
+ 	generic_apic_probe(*cmdline_p);
+ #endif	
++	if (efi_enabled)
++		efi_map_memmap();
+ 
+ 	/*
+ 	 * Parse the ACPI tables for possible boot-time SMP configuration.
+@@ -1028,7 +1128,8 @@ void __init setup_arch(char **cmdline_p)
+ 
+ #ifdef CONFIG_VT
+ #if defined(CONFIG_VGA_CONSOLE)
+-	conswitchp = &vga_con;
++	if (!efi_enabled || (efi_mem_type(0xa0000) != EFI_CONVENTIONAL_MEMORY))
++		conswitchp = &vga_con;
+ #elif defined(CONFIG_DUMMY_CONSOLE)
+ 	conswitchp = &dummy_con;
+ #endif
+--- linux-2.6.0-test6/arch/i386/kernel/signal.c	2003-06-14 12:18:09.000000000 -0700
++++ 25/arch/i386/kernel/signal.c	2003-10-05 00:36:48.000000000 -0700
+@@ -128,25 +128,25 @@ sys_sigaltstack(const stack_t __user *us
+  */
+ 
+ static int
+-restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, int *peax)
++restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *__sc, int *peax)
+ {
+-	unsigned int err = 0;
++	struct sigcontext scratch; /* 88 bytes of scratch area */
+ 
+-#define COPY(x)		err |= __get_user(regs->x, &sc->x)
++	if (copy_from_user(&scratch, __sc, sizeof(scratch)))
++		return -EFAULT;
++
++#define COPY(x)		regs->x = scratch.x
+ 
+ #define COPY_SEG(seg)							\
+-	{ unsigned short tmp;						\
+-	  err |= __get_user(tmp, &sc->seg);				\
++	{ unsigned short tmp = scratch.seg;				\
+ 	  regs->x##seg = tmp; }
+ 
+ #define COPY_SEG_STRICT(seg)						\
+-	{ unsigned short tmp;						\
+-	  err |= __get_user(tmp, &sc->seg);				\
++	{ unsigned short tmp = scratch.seg;				\
+ 	  regs->x##seg = tmp|3; }
+ 
+ #define GET_SEG(seg)							\
+-	{ unsigned short tmp;						\
+-	  err |= __get_user(tmp, &sc->seg);				\
++	{ unsigned short tmp = scratch.seg;				\
+ 	  loadsegment(seg,tmp); }
+ 
+ 	GET_SEG(gs);
+@@ -165,27 +165,23 @@ restore_sigcontext(struct pt_regs *regs,
+ 	COPY_SEG_STRICT(ss);
+ 	
+ 	{
+-		unsigned int tmpflags;
+-		err |= __get_user(tmpflags, &sc->eflags);
++		unsigned int tmpflags = scratch.eflags;
+ 		regs->eflags = (regs->eflags & ~0x40DD5) | (tmpflags & 0x40DD5);
+ 		regs->orig_eax = -1;		/* disable syscall checks */
+ 	}
+ 
+ 	{
+-		struct _fpstate __user * buf;
+-		err |= __get_user(buf, &sc->fpstate);
++		struct _fpstate * buf = scratch.fpstate;
+ 		if (buf) {
+ 			if (verify_area(VERIFY_READ, buf, sizeof(*buf)))
+-				goto badframe;
+-			err |= restore_i387(buf);
++				return -EFAULT;
++			if (restore_i387(buf))
++				return -EFAULT;
+ 		}
+ 	}
+ 
+-	err |= __get_user(*peax, &sc->eax);
+-	return err;
+-
+-badframe:
+-	return 1;
++	*peax = scratch.eax;
++	return 0;
+ }
+ 
+ asmlinkage int sys_sigreturn(unsigned long __unused)
+@@ -263,46 +259,47 @@ badframe:
+  */
+ 
+ static int
+-setup_sigcontext(struct sigcontext __user *sc, struct _fpstate __user *fpstate,
++setup_sigcontext(struct sigcontext __user *__sc, struct _fpstate __user *fpstate,
+ 		 struct pt_regs *regs, unsigned long mask)
+ {
+-	int tmp, err = 0;
++	struct sigcontext sc; /* 88 bytes of scratch area */
++	int tmp;
+ 
+ 	tmp = 0;
+ 	__asm__("movl %%gs,%0" : "=r"(tmp): "0"(tmp));
+-	err |= __put_user(tmp, (unsigned int *)&sc->gs);
++	*(unsigned int *)&sc.gs = tmp;
+ 	__asm__("movl %%fs,%0" : "=r"(tmp): "0"(tmp));
+-	err |= __put_user(tmp, (unsigned int *)&sc->fs);
+-
+-	err |= __put_user(regs->xes, (unsigned int *)&sc->es);
+-	err |= __put_user(regs->xds, (unsigned int *)&sc->ds);
+-	err |= __put_user(regs->edi, &sc->edi);
+-	err |= __put_user(regs->esi, &sc->esi);
+-	err |= __put_user(regs->ebp, &sc->ebp);
+-	err |= __put_user(regs->esp, &sc->esp);
+-	err |= __put_user(regs->ebx, &sc->ebx);
+-	err |= __put_user(regs->edx, &sc->edx);
+-	err |= __put_user(regs->ecx, &sc->ecx);
+-	err |= __put_user(regs->eax, &sc->eax);
+-	err |= __put_user(current->thread.trap_no, &sc->trapno);
+-	err |= __put_user(current->thread.error_code, &sc->err);
+-	err |= __put_user(regs->eip, &sc->eip);
+-	err |= __put_user(regs->xcs, (unsigned int *)&sc->cs);
+-	err |= __put_user(regs->eflags, &sc->eflags);
+-	err |= __put_user(regs->esp, &sc->esp_at_signal);
+-	err |= __put_user(regs->xss, (unsigned int *)&sc->ss);
++	*(unsigned int *)&sc.fs = tmp;
++	*(unsigned int *)&sc.es = regs->xes;
++	*(unsigned int *)&sc.ds = regs->xds;
++	sc.edi = regs->edi;
++	sc.esi = regs->esi;
++	sc.ebp = regs->ebp;
++	sc.esp = regs->esp;
++	sc.ebx = regs->ebx;
++	sc.edx = regs->edx;
++	sc.ecx = regs->ecx;
++	sc.eax = regs->eax;
++	sc.trapno = current->thread.trap_no;
++	sc.err = current->thread.error_code;
++	sc.eip = regs->eip;
++	*(unsigned int *)&sc.cs = regs->xcs;
++	sc.eflags = regs->eflags;
++	sc.esp_at_signal = regs->esp;
++	*(unsigned int *)&sc.ss = regs->xss;
+ 
+ 	tmp = save_i387(fpstate);
+ 	if (tmp < 0)
+-	  err = 1;
+-	else
+-	  err |= __put_user(tmp ? fpstate : NULL, &sc->fpstate);
++		return 1;
++	sc.fpstate = tmp ? fpstate : NULL;
+ 
+ 	/* non-iBCS2 extensions.. */
+-	err |= __put_user(mask, &sc->oldmask);
+-	err |= __put_user(current->thread.cr2, &sc->cr2);
++	sc.oldmask = mask;
++	sc.cr2 = current->thread.cr2;
+ 
+-	return err;
++	if (copy_to_user(__sc, &sc, sizeof(sc)))
++		return 1;
++	return 0;
+ }
+ 
+ /*
+@@ -440,7 +437,7 @@ static void setup_rt_frame(int sig, stru
+ 	/* Create the ucontext.  */
+ 	err |= __put_user(0, &frame->uc.uc_flags);
+ 	err |= __put_user(0, &frame->uc.uc_link);
+-	err |= __put_user(current->sas_ss_sp, &frame->uc.uc_stack.ss_sp);
++	err |= __put_user(current->sas_ss_sp, (unsigned long *)&frame->uc.uc_stack.ss_sp);
+ 	err |= __put_user(sas_ss_flags(regs->esp),
+ 			  &frame->uc.uc_stack.ss_flags);
+ 	err |= __put_user(current->sas_ss_size, &frame->uc.uc_stack.ss_size);
+--- linux-2.6.0-test6/arch/i386/kernel/smpboot.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/i386/kernel/smpboot.c	2003-10-05 00:34:39.000000000 -0700
+@@ -499,8 +499,8 @@ static struct task_struct * __init fork_
+ #ifdef CONFIG_NUMA
+ 
+ /* which logical CPUs are on which nodes */
+-cpumask_t node_2_cpu_mask[MAX_NR_NODES] =
+-				{ [0 ... MAX_NR_NODES-1] = CPU_MASK_NONE };
++cpumask_t node_2_cpu_mask[MAX_NUMNODES] =
++				{ [0 ... MAX_NUMNODES-1] = CPU_MASK_NONE };
+ /* which node each logical CPU is on */
+ int cpu_2_node[NR_CPUS] = { [0 ... NR_CPUS-1] = 0 };
+ 
+@@ -518,7 +518,7 @@ static inline void unmap_cpu_to_node(int
+ 	int node;
+ 
+ 	printk("Unmapping cpu %d from all nodes\n", cpu);
+-	for (node = 0; node < MAX_NR_NODES; node ++)
++	for (node = 0; node < MAX_NUMNODES; node ++)
+ 		cpu_clear(cpu, node_2_cpu_mask[node]);
+ 	cpu_2_node[cpu] = -1;
+ }
+@@ -937,6 +937,7 @@ int cpu_sibling_map[NR_CPUS] __cacheline
+ static void __init smp_boot_cpus(unsigned int max_cpus)
+ {
+ 	int apicid, cpu, bit, kicked;
++	unsigned long bogosum = 0;
+ 
+ 	/*
+ 	 * Setup boot CPU information
+@@ -1048,26 +1049,25 @@ static void __init smp_boot_cpus(unsigne
+ 	/*
+ 	 * Allow the user to impress friends.
+ 	 */
+-
+ 	Dprintk("Before bogomips.\n");
+-	if (!cpucount) {
+-		printk(KERN_ERR "Error: only one processor found.\n");
+-	} else {
+-		unsigned long bogosum = 0;
+-		for (cpu = 0; cpu < NR_CPUS; cpu++)
+-			if (cpu_isset(cpu, cpu_callout_map))
+-				bogosum += cpu_data[cpu].loops_per_jiffy;
+-		printk(KERN_INFO "Total of %d processors activated (%lu.%02lu BogoMIPS).\n",
+-			cpucount+1,
+-			bogosum/(500000/HZ),
+-			(bogosum/(5000/HZ))%100);
+-		Dprintk("Before bogocount - setting activated=1.\n");
+-	}
++	for (cpu = 0; cpu < NR_CPUS; cpu++)
++		if (cpu_isset(cpu, cpu_callout_map))
++			bogosum += cpu_data[cpu].loops_per_jiffy;
++	printk(KERN_INFO
++		"Total of %d processors activated (%lu.%02lu BogoMIPS).\n",
++		cpucount+1,
++		bogosum/(500000/HZ),
++		(bogosum/(5000/HZ))%100);
++	
++	Dprintk("Before bogocount - setting activated=1.\n");
+ 
+ 	if (smp_b_stepping)
+ 		printk(KERN_WARNING "WARNING: SMP operation may be unreliable with B stepping processors.\n");
+ 
+-	/* Don't taint if we are running SMP kernel on a single non-MP approved Athlon  */
++	/*
++	 * Don't taint if we are running SMP kernel on a single non-MP
++	 * approved Athlon
++	 */
+ 	if (tainted & TAINT_UNSAFE_SMP) {
+ 		if (cpucount)
+ 			printk (KERN_INFO "WARNING: This combination of AMD processors is not suitable for SMP.\n");
+--- linux-2.6.0-test6/arch/i386/kernel/smp.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/arch/i386/kernel/smp.c	2003-10-05 00:36:48.000000000 -0700
+@@ -327,10 +327,12 @@ asmlinkage void smp_invalidate_interrupt
+ 		 
+ 	if (flush_mm == cpu_tlbstate[cpu].active_mm) {
+ 		if (cpu_tlbstate[cpu].state == TLBSTATE_OK) {
++#ifndef CONFIG_X86_SWITCH_PAGETABLES
+ 			if (flush_va == FLUSH_ALL)
+ 				local_flush_tlb();
+ 			else
+ 				__flush_tlb_one(flush_va);
++#endif
+ 		} else
+ 			leave_mm(cpu);
+ 	}
+@@ -396,21 +398,6 @@ static void flush_tlb_others(cpumask_t c
+ 	spin_unlock(&tlbstate_lock);
+ }
+ 	
+-void flush_tlb_current_task(void)
+-{
+-	struct mm_struct *mm = current->mm;
+-	cpumask_t cpu_mask;
+-
+-	preempt_disable();
+-	cpu_mask = mm->cpu_vm_mask;
+-	cpu_clear(smp_processor_id(), cpu_mask);
+-
+-	local_flush_tlb();
+-	if (!cpus_empty(cpu_mask))
+-		flush_tlb_others(cpu_mask, mm, FLUSH_ALL);
+-	preempt_enable();
+-}
+-
+ void flush_tlb_mm (struct mm_struct * mm)
+ {
+ 	cpumask_t cpu_mask;
+@@ -442,7 +429,10 @@ void flush_tlb_page(struct vm_area_struc
+ 
+ 	if (current->active_mm == mm) {
+ 		if(current->mm)
+-			__flush_tlb_one(va);
++#ifndef CONFIG_X86_SWITCH_PAGETABLES
++			__flush_tlb_one(va)
++#endif
++				;
+ 		 else
+ 		 	leave_mm(smp_processor_id());
+ 	}
+@@ -466,7 +456,17 @@ void flush_tlb_all(void)
+ {
+ 	on_each_cpu(do_flush_tlb_all, 0, 1, 1);
+ }
+-
++#ifdef CONFIG_KGDB
++/*
++ * By using the NMI code instead of a vector we just sneak thru the
++ * word generator coming out with just what we want.  AND it does
++ * not matter if clustered_apic_mode is set or not.
++ */
++void smp_send_nmi_allbutself(void)
++{
++	send_IPI_allbutself(APIC_DM_NMI);
++}
++#endif
+ /*
+  * this function sends a 'reschedule' IPI to another CPU.
+  * it goes straight through and wastes no time serializing
+--- linux-2.6.0-test6/arch/i386/kernel/sysenter.c	2003-08-08 22:55:10.000000000 -0700
++++ 25/arch/i386/kernel/sysenter.c	2003-10-05 00:36:48.000000000 -0700
+@@ -18,13 +18,18 @@
+ #include <asm/msr.h>
+ #include <asm/pgtable.h>
+ #include <asm/unistd.h>
++#include <linux/highmem.h>
+ 
+ extern asmlinkage void sysenter_entry(void);
+ 
+ void enable_sep_cpu(void *info)
+ {
+ 	int cpu = get_cpu();
++#ifdef CONFIG_X86_HIGH_ENTRY
++	struct tss_struct *tss = (struct tss_struct *) __fix_to_virt(FIX_TSS_0) + cpu;
++#else
+ 	struct tss_struct *tss = init_tss + cpu;
++#endif
+ 
+ 	tss->ss1 = __KERNEL_CS;
+ 	tss->esp1 = sizeof(struct tss_struct) + (unsigned long) tss;
+--- linux-2.6.0-test6/arch/i386/kernel/time.c	2003-09-08 13:58:55.000000000 -0700
++++ 25/arch/i386/kernel/time.c	2003-10-05 00:36:22.000000000 -0700
+@@ -44,6 +44,7 @@
+ #include <linux/module.h>
+ #include <linux/sysdev.h>
+ #include <linux/bcd.h>
++#include <linux/efi.h>
+ 
+ #include <asm/io.h>
+ #include <asm/smp.h>
+@@ -160,6 +161,37 @@ static int set_rtc_mmss(unsigned long no
+ 	return retval;
+ }
+ 
++static int efi_set_rtc_mmss(unsigned long nowtime)
++{
++	int real_seconds, real_minutes;
++	unsigned long 	flags;
++	efi_status_t 	status;
++	efi_time_t 	eft;
++	efi_time_cap_t 	cap;
++
++	spin_lock_irqsave(&rtc_lock, flags);
++
++	status = efi.get_time(&eft, &cap);
++	if (status != EFI_SUCCESS)
++		panic("Ooops, efitime: can't read time!\n");
++	real_seconds = nowtime % 60;
++	real_minutes = nowtime / 60;
++
++	if (((abs(real_minutes - eft.minute) + 15)/30) & 1)
++		real_minutes += 30;
++	real_minutes %= 60;
++
++	eft.minute = real_minutes;
++	eft.second = real_seconds;
++
++	status = efi.set_time(&eft);
++	if (status != EFI_SUCCESS)
++		panic("Ooops: efitime: can't read time!\n");
++
++	spin_unlock_irqrestore(&rtc_lock, flags);
++	return 0;
++}
++
+ /* last time the cmos clock got updated */
+ static long last_rtc_update;
+ 
+@@ -212,7 +244,7 @@ static inline void do_timer_interrupt(in
+ 			>= USEC_AFTER - ((unsigned) TICK_SIZE) / 2 &&
+ 	    (xtime.tv_nsec / 1000)
+ 			<= USEC_BEFORE + ((unsigned) TICK_SIZE) / 2) {
+-		if (set_rtc_mmss(xtime.tv_sec) == 0)
++		if ((efi_enabled && (!efi_set_rtc_mmss(xtime.tv_sec) )) || (set_rtc_mmss(xtime.tv_sec) == 0))
+ 			last_rtc_update = xtime.tv_sec;
+ 		else
+ 			last_rtc_update = xtime.tv_sec - 600; /* do it again in 60 s */
+@@ -277,6 +309,27 @@ static struct sysdev_class pit_sysclass 
+ 	set_kset_name("pit"),
+ };
+ 
++/*
++ * This is called before the RT mappings are in place, so we
++ * need to be able to get the time in physical mode.
++ */
++unsigned long efi_get_time(void)
++{
++	efi_status_t status;
++	unsigned long flags;
++	efi_time_t eft;
++	efi_time_cap_t cap;
++
++	spin_lock_irqsave(&rtc_lock, flags);
++	status = phys_efi_get_time(&eft, &cap);
++	if (status != EFI_SUCCESS)
++		printk("Oops: efitime: can't read time status: 0x%lx\n", status);
++
++	spin_unlock_irqrestore(&rtc_lock, flags);
++
++	return mktime(eft.year, eft.month, eft.day, eft.hour, eft.minute, eft.second);
++}
++
+ /* XXX this driverfs stuff should probably go elsewhere later -john */
+ static struct sys_device device_i8253 = {
+ 	.id	= 0,
+@@ -298,7 +351,10 @@ extern void (*late_time_init)(void);
+ /* Duplicate of time_init() below, with hpet_enable part added */
+ void __init hpet_time_init(void)
+ {
+-	xtime.tv_sec = get_cmos_time();
++	if (efi_enabled)
++		xtime.tv_sec = efi_get_time();
++	else
++		xtime.tv_sec = get_cmos_time();
+ 	wall_to_monotonic.tv_sec = -xtime.tv_sec;
+ 	xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ);
+ 	wall_to_monotonic.tv_nsec = -xtime.tv_nsec;
+@@ -324,8 +380,10 @@ void __init time_init(void)
+ 		return;
+ 	}
+ #endif
+-
+-	xtime.tv_sec = get_cmos_time();
++	if (efi_enabled)
++		xtime.tv_sec = efi_get_time();
++	else
++		xtime.tv_sec = get_cmos_time();
+ 	wall_to_monotonic.tv_sec = -xtime.tv_sec;
+ 	xtime.tv_nsec = (INITIAL_JIFFIES % HZ) * (NSEC_PER_SEC / HZ);
+ 	wall_to_monotonic.tv_nsec = -xtime.tv_nsec;
+--- linux-2.6.0-test6/arch/i386/kernel/traps.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/i386/kernel/traps.c	2003-10-05 00:36:48.000000000 -0700
+@@ -54,12 +54,8 @@
+ 
+ #include "mach_traps.h"
+ 
+-asmlinkage int system_call(void);
+-asmlinkage void lcall7(void);
+-asmlinkage void lcall27(void);
+-
+-struct desc_struct default_ldt[] = { { 0, 0 }, { 0, 0 }, { 0, 0 },
+-		{ 0, 0 }, { 0, 0 } };
++struct desc_struct default_ldt[] __attribute__((__section__(".data.default_ldt"))) = { { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 } };
++struct page *default_ldt_page;
+ 
+ /* Do we ignore FPU interrupts ? */
+ char ignore_fpu_irq = 0;
+@@ -91,6 +87,43 @@ asmlinkage void alignment_check(void);
+ asmlinkage void spurious_interrupt_bug(void);
+ asmlinkage void machine_check(void);
+ 
++#ifdef CONFIG_KGDB
++extern void sysenter_entry(void);
++#include <asm/kgdb.h>
++#include <linux/init.h>
++extern void int3(void);
++extern void debug(void);
++void set_intr_gate(unsigned int n, void *addr);
++static void set_intr_usr_gate(unsigned int n, void *addr);
++/*
++ * Should be able to call this breakpoint() very early in
++ * bring up.  Just hard code the call where needed.
++ * The breakpoint() code is here because set_?_gate() functions
++ * are local (static) to trap.c.  They need be done only once,
++ * but it does not hurt to do them over.
++ */
++void breakpoint(void)
++{
++	init_entry_mappings();
++        set_intr_usr_gate(3,&int3); /* disable ints on trap */
++	set_intr_gate(1,&debug);
++	set_intr_gate(14,&page_fault);
++
++        BREAKPOINT;
++}
++#define	CHK_REMOTE_DEBUG(trapnr,signr,error_code,regs,after)		\
++    {									\
++	if (!user_mode(regs)  ) \
++	{								\
++		kgdb_handle_exception(trapnr, signr, error_code, regs);	\
++		after;							\
++	} else if ((trapnr == 3) && (regs->eflags &0x200)) local_irq_enable(); \
++    }
++#else
++#define	CHK_REMOTE_DEBUG(trapnr,signr,error_code,regs,after)
++#endif
++
++
+ static int kstack_depth_to_print = 24;
+ 
+ void show_trace(struct task_struct *task, unsigned long * stack)
+@@ -173,8 +206,9 @@ void show_registers(struct pt_regs *regs
+ 		ss = regs->xss & 0xffff;
+ 	}
+ 	print_modules();
+-	printk("CPU:    %d\nEIP:    %04x:[<%08lx>]    %s\nEFLAGS: %08lx\n",
+-		smp_processor_id(), 0xffff & regs->xcs, regs->eip, print_tainted(), regs->eflags);
++	printk("CPU:    %d\nEIP:    %04x:[<%08lx>]    %s VLI\nEFLAGS: %08lx\n",
++		smp_processor_id(), 0xffff & regs->xcs,
++		regs->eip, print_tainted(), regs->eflags);
+ 
+ 	print_symbol("EIP is at %s\n", regs->eip);
+ 	printk("eax: %08lx   ebx: %08lx   ecx: %08lx   edx: %08lx\n",
+@@ -190,23 +224,27 @@ void show_registers(struct pt_regs *regs
+ 	 * time of the fault..
+ 	 */
+ 	if (in_kernel) {
++		u8 *eip;
+ 
+ 		printk("\nStack: ");
+ 		show_stack(NULL, (unsigned long*)esp);
+ 
+ 		printk("Code: ");
+-		if(regs->eip < PAGE_OFFSET)
+-			goto bad;
+ 
+-		for(i=0;i<20;i++)
+-		{
+-			unsigned char c;
+-			if(__get_user(c, &((unsigned char*)regs->eip)[i])) {
+-bad:
++		eip = (u8 *)regs->eip - 43;
++		for (i = 0; i < 64; i++, eip++) {
++			unsigned char c = 0xff;
++
++			if ((user_mode(regs) && get_user(c, eip)) ||
++			    (!user_mode(regs) && __direct_get_user(c, eip))) {
++
+ 				printk(" Bad EIP value.");
+ 				break;
+ 			}
+-			printk("%02x ", c);
++			if (eip == (u8 *)regs->eip)
++				printk("<%02x> ", c);
++			else
++				printk("%02x ", c);
+ 		}
+ 	}
+ 	printk("\n");
+@@ -253,12 +291,36 @@ spinlock_t die_lock = SPIN_LOCK_UNLOCKED
+ void die(const char * str, struct pt_regs * regs, long err)
+ {
+ 	static int die_counter;
++	int nl = 0;
+ 
+ 	console_verbose();
+ 	spin_lock_irq(&die_lock);
+ 	bust_spinlocks(1);
+ 	handle_BUG(regs);
+ 	printk("%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter);
++#ifdef CONFIG_PREEMPT
++	printk("PREEMPT ");
++	nl = 1;
++#endif
++#ifdef CONFIG_SMP
++	printk("SMP ");
++	nl = 1;
++#endif
++#ifdef CONFIG_DEBUG_PAGEALLOC
++	printk("DEBUG_PAGEALLOC");
++	nl = 1;
++#endif
++	if (nl)
++		printk("\n");
++#ifdef CONFIG_KGDB
++	/* This is about the only place we want to go to kgdb even if in
++	 * user mode.  But we must go in via a trap so within kgdb we will
++	 * always be in kernel mode.
++	 */
++	if (user_mode(regs))
++		BREAKPOINT;
++#endif
++ 	CHK_REMOTE_DEBUG(0,SIGTRAP,err,regs,)
+ 	show_registers(regs);
+ 	bust_spinlocks(0);
+ 	spin_unlock_irq(&die_lock);
+@@ -328,6 +390,7 @@ static inline void do_trap(int trapnr, i
+ #define DO_ERROR(trapnr, signr, str, name) \
+ asmlinkage void do_##name(struct pt_regs * regs, long error_code) \
+ { \
++	CHK_REMOTE_DEBUG(trapnr,signr,error_code,regs,)\
+ 	do_trap(trapnr, signr, str, 0, regs, error_code, NULL); \
+ }
+ 
+@@ -345,7 +408,9 @@ asmlinkage void do_##name(struct pt_regs
+ #define DO_VM86_ERROR(trapnr, signr, str, name) \
+ asmlinkage void do_##name(struct pt_regs * regs, long error_code) \
+ { \
++	CHK_REMOTE_DEBUG(trapnr, signr, error_code,regs, return)\
+ 	do_trap(trapnr, signr, str, 1, regs, error_code, NULL); \
++	return; \
+ }
+ 
+ #define DO_VM86_ERROR_INFO(trapnr, signr, str, name, sicode, siaddr) \
+@@ -388,8 +453,10 @@ gp_in_vm86:
+ 	return;
+ 
+ gp_in_kernel:
+-	if (!fixup_exception(regs))
++	if (!fixup_exception(regs)){
++ 		CHK_REMOTE_DEBUG(13,SIGSEGV,error_code,regs,)
+ 		die("general protection fault", regs, error_code);
++	}
+ }
+ 
+ static void mem_parity_error(unsigned char reason, struct pt_regs * regs)
+@@ -528,10 +595,18 @@ asmlinkage void do_debug(struct pt_regs 
+ 	if (regs->eflags & X86_EFLAGS_IF)
+ 		local_irq_enable();
+ 
+-	/* Mask out spurious debug traps due to lazy DR7 setting */
++	/*
++	 * Mask out spurious debug traps due to lazy DR7 setting or
++	 * due to 4G/4G kernel mode:
++	 */
+ 	if (condition & (DR_TRAP0|DR_TRAP1|DR_TRAP2|DR_TRAP3)) {
+ 		if (!tsk->thread.debugreg[7])
+ 			goto clear_dr7;
++		if (!user_mode(regs)) {
++			// restore upon return-to-userspace:
++			set_thread_flag(TIF_DB7);
++			goto clear_dr7;
++		}
+ 	}
+ 
+ 	if (regs->eflags & VM_MASK)
+@@ -551,8 +626,18 @@ asmlinkage void do_debug(struct pt_regs 
+ 		 * allowing programs to debug themselves without the ptrace()
+ 		 * interface.
+ 		 */
++#ifdef CONFIG_KGDB
++		/*
++		 * I think this is the only "real" case of a TF in the kernel
++		 * that really belongs to user space.  Others are
++		 * "Ours all ours!"
++		 */
++		if (((regs->xcs & 3) == 0) && ((void *)regs->eip == sysenter_entry))
++			goto clear_TF_reenable;
++#else
+ 		if ((regs->xcs & 3) == 0)
+ 			goto clear_TF_reenable;
++#endif
+ 		if ((tsk->ptrace & (PT_DTRACE|PT_PTRACED)) == PT_DTRACE)
+ 			goto clear_TF;
+ 	}
+@@ -564,6 +649,17 @@ asmlinkage void do_debug(struct pt_regs 
+ 	info.si_errno = 0;
+ 	info.si_code = TRAP_BRKPT;
+ 	
++#ifdef CONFIG_KGDB
++        /*
++	 * If this is a kernel mode trap, we need to reset db7 to allow us
++	 * to continue sanely ALSO skip the signal delivery
++         */
++	if ((regs->xcs & 3) == 0)
++		goto clear_dr7;
++
++        /* if not kernel, allow ints but only if they were on */
++       if ( regs->eflags & 0x200) local_irq_enable();
++#endif
+ 	/* If this is a kernel mode trap, save the user PC on entry to 
+ 	 * the kernel, that's what the debugger can make sense of.
+ 	 */
+@@ -578,6 +674,7 @@ clear_dr7:
+ 	__asm__("movl %0,%%db7"
+ 		: /* no output */
+ 		: "r" (0));
++	CHK_REMOTE_DEBUG(1,SIGTRAP,error_code,regs,)
+ 	return;
+ 
+ debug_vm86:
+@@ -773,19 +870,53 @@ asmlinkage void math_emulate(long arg)
+ 
+ #endif /* CONFIG_MATH_EMULATION */
+ 
+-#ifdef CONFIG_X86_F00F_BUG
+-void __init trap_init_f00f_bug(void)
++void __init trap_init_virtual_IDT(void)
+ {
+-	__set_fixmap(FIX_F00F_IDT, __pa(&idt_table), PAGE_KERNEL_RO);
+-
+ 	/*
+-	 * Update the IDT descriptor and reload the IDT so that
+-	 * it uses the read-only mapped virtual address.
++	 * "idt" is magic - it overlaps the idt_descr
++	 * variable so that updating idt will automatically
++	 * update the idt descriptor..
+ 	 */
+-	idt_descr.address = fix_to_virt(FIX_F00F_IDT);
++	__set_fixmap(FIX_IDT, __pa(&idt_table), PAGE_KERNEL_RO);
++	idt_descr.address = __fix_to_virt(FIX_IDT);
++
+ 	__asm__ __volatile__("lidt %0" : : "m" (idt_descr));
+ }
++
++void __init trap_init_virtual_GDT(void)
++{
++	int cpu = smp_processor_id();
++	struct Xgt_desc_struct *gdt_desc = cpu_gdt_descr + cpu;
++	struct Xgt_desc_struct tmp_desc = {0, 0};
++	struct tss_struct * t;
++
++	__asm__ __volatile__("sgdt %0": "=m" (tmp_desc): :"memory");
++
++#ifdef CONFIG_X86_HIGH_ENTRY
++	if (!cpu) {
++		__set_fixmap(FIX_GDT_0, __pa(cpu_gdt_table), PAGE_KERNEL);
++		__set_fixmap(FIX_GDT_1, __pa(cpu_gdt_table) + PAGE_SIZE, PAGE_KERNEL);
++		__set_fixmap(FIX_TSS_0, __pa(init_tss), PAGE_KERNEL);
++		__set_fixmap(FIX_TSS_1, __pa(init_tss) + 1*PAGE_SIZE, PAGE_KERNEL);
++		__set_fixmap(FIX_TSS_2, __pa(init_tss) + 2*PAGE_SIZE, PAGE_KERNEL);
++		__set_fixmap(FIX_TSS_3, __pa(init_tss) + 3*PAGE_SIZE, PAGE_KERNEL);
++	}
++
++	gdt_desc->address = __fix_to_virt(FIX_GDT_0) + sizeof(cpu_gdt_table[0]) * cpu;
++#else
++	gdt_desc->address = (unsigned long)cpu_gdt_table[cpu];
++#endif
++	__asm__ __volatile__("lgdt %0": "=m" (*gdt_desc));
++
++#ifdef CONFIG_X86_HIGH_ENTRY
++	t = (struct tss_struct *) __fix_to_virt(FIX_TSS_0) + cpu;
++#else
++	t = init_tss + cpu;
+ #endif
++	set_tss_desc(cpu, t);
++	cpu_gdt_table[cpu][GDT_ENTRY_TSS].b &= 0xfffffdff;
++	load_TR_desc();
++}
+ 
+ #define _set_gate(gate_addr,type,dpl,addr,seg) \
+ do { \
+@@ -812,20 +943,26 @@ void set_intr_gate(unsigned int n, void 
+ 	_set_gate(idt_table+n,14,0,addr,__KERNEL_CS);
+ }
+ 
+-static void __init set_trap_gate(unsigned int n, void *addr)
++void __init set_trap_gate(unsigned int n, void *addr)
+ {
+ 	_set_gate(idt_table+n,15,0,addr,__KERNEL_CS);
+ }
+ 
+-static void __init set_system_gate(unsigned int n, void *addr)
++void __init set_system_gate(unsigned int n, void *addr)
+ {
+ 	_set_gate(idt_table+n,15,3,addr,__KERNEL_CS);
+ }
+ 
+-static void __init set_call_gate(void *a, void *addr)
++void __init set_call_gate(void *a, void *addr)
+ {
+ 	_set_gate(a,12,3,addr,__KERNEL_CS);
+ }
++#ifdef CONFIG_KGDB
++void set_intr_usr_gate(unsigned int n, void *addr)
++{
++	_set_gate(idt_table+n,14,3,addr,__KERNEL_CS);
++}
++#endif
+ 
+ static void __init set_task_gate(unsigned int n, unsigned int gdt_entry)
+ {
+@@ -844,11 +981,16 @@ void __init trap_init(void)
+ #ifdef CONFIG_X86_LOCAL_APIC
+ 	init_apic_mappings();
+ #endif
++	init_entry_mappings();
+ 
+ 	set_trap_gate(0,&divide_error);
+ 	set_intr_gate(1,&debug);
+ 	set_intr_gate(2,&nmi);
++#ifndef CONFIG_KGDB
+ 	set_system_gate(3,&int3);	/* int3-5 can be called from all */
++#else
++	set_intr_usr_gate(3,&int3);	/* int3-5 can be called from all */
++#endif
+ 	set_system_gate(4,&overflow);
+ 	set_system_gate(5,&bounds);
+ 	set_trap_gate(6,&invalid_op);
+--- linux-2.6.0-test6/arch/i386/kernel/vm86.c	2003-06-14 12:17:58.000000000 -0700
++++ 25/arch/i386/kernel/vm86.c	2003-10-05 00:36:48.000000000 -0700
+@@ -117,7 +117,7 @@ struct pt_regs * save_v86_state(struct k
+ 
+ 	tss = init_tss + get_cpu();
+ 	current->thread.esp0 = current->thread.saved_esp0;
+-	load_esp0(tss, current->thread.esp0);
++	load_esp0(tss, virtual_esp0(current));
+ 	current->thread.saved_esp0 = 0;
+ 	put_cpu();
+ 
+@@ -294,7 +294,8 @@ static void do_sys_vm86(struct kernel_vm
+ 	asm volatile("movl %%gs,%0":"=m" (tsk->thread.saved_gs));
+ 
+ 	tss = init_tss + get_cpu();
+-	tss->esp0 = tsk->thread.esp0 = (unsigned long) &info->VM86_TSS_ESP0;
++	tsk->thread.esp0 = (unsigned long) &info->VM86_TSS_ESP0;
++	tss->esp0 = virtual_esp0(tsk);
+ 	disable_sysenter(tss);
+ 	put_cpu();
+ 
+--- linux-2.6.0-test6/arch/i386/kernel/vmlinux.lds.S	2003-08-22 19:23:40.000000000 -0700
++++ 25/arch/i386/kernel/vmlinux.lds.S	2003-10-05 00:36:48.000000000 -0700
+@@ -3,6 +3,9 @@
+  */
+ 
+ #include <asm-generic/vmlinux.lds.h>
++#include <linux/config.h>
++#include <asm/page.h>
++#include <asm/asm_offsets.h>
+ 	
+ OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
+ OUTPUT_ARCH(i386)
+@@ -10,7 +13,7 @@ ENTRY(startup_32)
+ jiffies = jiffies_64;
+ SECTIONS
+ {
+-  . = 0xC0000000 + 0x100000;
++  . = __PAGE_OFFSET + 0x100000;
+   /* read-only */
+   _text = .;			/* Text and read-only data */
+   .text : {
+@@ -19,6 +22,19 @@ SECTIONS
+ 	*(.gnu.warning)
+ 	} = 0x9090
+ 
++#ifdef CONFIG_X86_4G
++  . = ALIGN(PAGE_SIZE_asm);
++  __entry_tramp_start = .;
++  . = FIX_ENTRY_TRAMPOLINE_0_addr;
++  __start___entry_text = .;
++  .entry.text : AT (__entry_tramp_start) { *(.entry.text) }
++  __entry_tramp_end = __entry_tramp_start + SIZEOF(.entry.text);
++  . = __entry_tramp_end;
++  . = ALIGN(PAGE_SIZE_asm);
++#else
++  .entry.text : { *(.entry.text) }
++#endif
++
+   _etext = .;			/* End of text section */
+ 
+   . = ALIGN(16);		/* Exception table */
+@@ -34,15 +50,12 @@ SECTIONS
+ 	CONSTRUCTORS
+ 	}
+ 
+-  . = ALIGN(4096);
++  . = ALIGN(PAGE_SIZE_asm);
+   __nosave_begin = .;
+   .data_nosave : { *(.data.nosave) }
+-  . = ALIGN(4096);
++  . = ALIGN(PAGE_SIZE_asm);
+   __nosave_end = .;
+ 
+-  . = ALIGN(4096);
+-  .data.page_aligned : { *(.data.idt) }
+-
+   . = ALIGN(32);
+   .data.cacheline_aligned : { *(.data.cacheline_aligned) }
+ 
+@@ -52,7 +65,7 @@ SECTIONS
+   .data.init_task : { *(.data.init_task) }
+ 
+   /* will be freed after init */
+-  . = ALIGN(4096);		/* Init code and data */
++  . = ALIGN(PAGE_SIZE_asm);		/* Init code and data */
+   __init_begin = .;
+   .init.text : { 
+ 	_sinittext = .;
+@@ -91,7 +104,7 @@ SECTIONS
+      from .altinstructions and .eh_frame */
+   .exit.text : { *(.exit.text) }
+   .exit.data : { *(.exit.data) }
+-  . = ALIGN(4096);
++  . = ALIGN(PAGE_SIZE_asm);
+   __initramfs_start = .;
+   .init.ramfs : { *(.init.ramfs) }
+   __initramfs_end = .;
+@@ -99,10 +112,22 @@ SECTIONS
+   __per_cpu_start = .;
+   .data.percpu  : { *(.data.percpu) }
+   __per_cpu_end = .;
+-  . = ALIGN(4096);
++  . = ALIGN(PAGE_SIZE_asm);
+   __init_end = .;
+   /* freed after init ends here */
+-	
++
++  . = ALIGN(PAGE_SIZE_asm);
++  .data.page_aligned_tss : { *(.data.tss) }
++
++  . = ALIGN(PAGE_SIZE_asm);
++  .data.page_aligned_default_ldt : { *(.data.default_ldt) }
++
++  . = ALIGN(PAGE_SIZE_asm);
++  .data.page_aligned_idt : { *(.data.idt) }
++
++  . = ALIGN(PAGE_SIZE_asm);
++  .data.page_aligned_gdt : { *(.data.gdt) }
++
+   __bss_start = .;		/* BSS */
+   .bss : { *(.bss) }
+   __bss_stop = .; 
+@@ -122,4 +147,6 @@ SECTIONS
+   .stab.index 0 : { *(.stab.index) }
+   .stab.indexstr 0 : { *(.stab.indexstr) }
+   .comment 0 : { *(.comment) }
++
++
+ }
+--- linux-2.6.0-test6/arch/i386/kernel/vsyscall.lds	2003-06-14 12:18:07.000000000 -0700
++++ 25/arch/i386/kernel/vsyscall.lds	2003-10-05 00:36:48.000000000 -0700
+@@ -5,7 +5,7 @@
+  */
+ 
+ /* This must match <asm/fixmap.h>.  */
+-VSYSCALL_BASE = 0xffffe000;
++VSYSCALL_BASE = 0xffffd000;
+ 
+ SECTIONS
+ {
+--- linux-2.6.0-test6/arch/i386/kernel/vsyscall-sysenter.S	2003-06-14 12:18:08.000000000 -0700
++++ 25/arch/i386/kernel/vsyscall-sysenter.S	2003-10-05 00:36:48.000000000 -0700
+@@ -7,6 +7,11 @@
+ 	.type __kernel_vsyscall,@function
+ __kernel_vsyscall:
+ .LSTART_vsyscall:
++	cmpl $192, %eax
++	jne 1f
++	int $0x80
++	ret
++1:
+ 	push %ecx
+ .Lpush_ecx:
+ 	push %edx
+--- linux-2.6.0-test6/arch/i386/lib/checksum.S	2003-06-14 12:18:30.000000000 -0700
++++ 25/arch/i386/lib/checksum.S	2003-10-05 00:36:48.000000000 -0700
+@@ -280,14 +280,14 @@ unsigned int csum_partial_copy_generic (
+ 	.previous
+ 
+ .align 4
+-.globl csum_partial_copy_generic
++.globl direct_csum_partial_copy_generic
+ 				
+ #ifndef CONFIG_X86_USE_PPRO_CHECKSUM
+ 
+ #define ARGBASE 16		
+ #define FP		12
+ 		
+-csum_partial_copy_generic:
++direct_csum_partial_copy_generic:
+ 	subl  $4,%esp	
+ 	pushl %edi
+ 	pushl %esi
+@@ -422,7 +422,7 @@ DST(	movb %cl, (%edi)	)
+ 
+ #define ARGBASE 12
+ 		
+-csum_partial_copy_generic:
++direct_csum_partial_copy_generic:
+ 	pushl %ebx
+ 	pushl %edi
+ 	pushl %esi
+--- linux-2.6.0-test6/arch/i386/lib/dec_and_lock.c	2003-06-26 22:07:23.000000000 -0700
++++ 25/arch/i386/lib/dec_and_lock.c	2003-10-05 00:36:40.000000000 -0700
+@@ -10,6 +10,7 @@
+ #include <linux/spinlock.h>
+ #include <asm/atomic.h>
+ 
++#ifndef ATOMIC_DEC_AND_LOCK
+ int atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock)
+ {
+ 	int counter;
+@@ -38,3 +39,5 @@ slow_path:
+ 	spin_unlock(lock);
+ 	return 0;
+ }
++#endif
++
+--- linux-2.6.0-test6/arch/i386/lib/getuser.S	2003-06-14 12:17:56.000000000 -0700
++++ 25/arch/i386/lib/getuser.S	2003-10-05 00:36:48.000000000 -0700
+@@ -9,6 +9,7 @@
+  * return value.
+  */
+ #include <asm/thread_info.h>
++#include <asm/asm_offsets.h>
+ 
+ 
+ /*
+@@ -28,7 +29,7 @@
+ .globl __get_user_1
+ __get_user_1:
+ 	GET_THREAD_INFO(%edx)
+-	cmpl TI_ADDR_LIMIT(%edx),%eax
++	cmpl TI_addr_limit(%edx),%eax
+ 	jae bad_get_user
+ 1:	movzbl (%eax),%edx
+ 	xorl %eax,%eax
+@@ -40,7 +41,7 @@ __get_user_2:
+ 	addl $1,%eax
+ 	jc bad_get_user
+ 	GET_THREAD_INFO(%edx)
+-	cmpl TI_ADDR_LIMIT(%edx),%eax
++	cmpl TI_addr_limit(%edx),%eax
+ 	jae bad_get_user
+ 2:	movzwl -1(%eax),%edx
+ 	xorl %eax,%eax
+@@ -52,7 +53,7 @@ __get_user_4:
+ 	addl $3,%eax
+ 	jc bad_get_user
+ 	GET_THREAD_INFO(%edx)
+-	cmpl TI_ADDR_LIMIT(%edx),%eax
++	cmpl TI_addr_limit(%edx),%eax
+ 	jae bad_get_user
+ 3:	movl -3(%eax),%edx
+ 	xorl %eax,%eax
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/arch/i386/lib/kgdb_serial.c	2003-10-05 00:33:44.000000000 -0700
+@@ -0,0 +1,499 @@
++/*
++ * Serial interface GDB stub
++ *
++ * Written (hacked together) by David Grothe (dave@gcom.com)
++ * Modified to allow invokation early in boot see also
++ * kgdb.h for instructions by George Anzinger(george@mvista.com)
++ * Modified to handle debugging over ethernet by Robert Walsh
++ * <rjwalsh@durables.org> and wangdi <wangdi@clusterfs.com>, based on
++ * code by San Mehat.
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/errno.h>
++#include <linux/signal.h>
++#include <linux/sched.h>
++#include <linux/timer.h>
++#include <linux/interrupt.h>
++#include <linux/tty.h>
++#include <linux/tty_flip.h>
++#include <linux/serial.h>
++#include <linux/serial_reg.h>
++#include <linux/config.h>
++#include <linux/major.h>
++#include <linux/string.h>
++#include <linux/fcntl.h>
++#include <linux/ptrace.h>
++#include <linux/ioport.h>
++#include <linux/mm.h>
++#include <linux/init.h>
++#include <linux/highmem.h>
++#include <asm/system.h>
++#include <asm/io.h>
++#include <asm/segment.h>
++#include <asm/bitops.h>
++#include <asm/system.h>
++#include <asm/kgdb_local.h>
++#ifdef CONFIG_KGDB_USER_CONSOLE
++extern void kgdb_console_finit(void);
++#endif
++#define PRNT_off
++#define TEST_EXISTANCE
++#ifdef PRNT
++#define dbprintk(s) printk s
++#else
++#define dbprintk(s)
++#endif
++#define TEST_INTERRUPT_off
++#ifdef TEST_INTERRUPT
++#define intprintk(s) printk s
++#else
++#define intprintk(s)
++#endif
++
++#define IRQ_T(info) ((info->flags & ASYNC_SHARE_IRQ) ? SA_SHIRQ : SA_INTERRUPT)
++
++#define	GDB_BUF_SIZE	512	/* power of 2, please */
++
++static char gdb_buf[GDB_BUF_SIZE];
++static int gdb_buf_in_inx;
++static atomic_t gdb_buf_in_cnt;
++static int gdb_buf_out_inx;
++
++struct async_struct *gdb_async_info;
++static int gdb_async_irq;
++
++#define outb_px(a,b) outb_p(b,a)
++
++static void program_uart(struct async_struct *info);
++static void write_char(struct async_struct *info, int chr);
++/*
++ * Get a byte from the hardware data buffer and return it
++ */
++static int
++read_data_bfr(struct async_struct *info)
++{
++	char it = inb_p(info->port + UART_LSR);
++
++	if (it & UART_LSR_DR)
++		return (inb_p(info->port + UART_RX));
++	/*
++	 * If we have a framing error assume somebody messed with
++	 * our uart.  Reprogram it and send '-' both ways...
++	 */
++	if (it & 0xc) {
++		program_uart(info);
++		write_char(info, '-');
++		return ('-');
++	}
++	return (-1);
++
++}				/* read_data_bfr */
++
++/*
++ * Get a char if available, return -1 if nothing available.
++ * Empty the receive buffer first, then look at the interface hardware.
++
++ * Locking here is a bit of a problem.	We MUST not lock out communication
++ * if we are trying to talk to gdb about a kgdb entry.	ON the other hand
++ * we can loose chars in the console pass thru if we don't lock.  It is also
++ * possible that we could hold the lock or be waiting for it when kgdb
++ * NEEDS to talk.  Since kgdb locks down the world, it does not need locks.
++ * We do, of course have possible issues with interrupting a uart operation,
++ * but we will just depend on the uart status to help keep that straight.
++
++ */
++static spinlock_t uart_interrupt_lock = SPIN_LOCK_UNLOCKED;
++#ifdef CONFIG_SMP
++extern spinlock_t kgdb_spinlock;
++#endif
++
++static int
++read_char(struct async_struct *info)
++{
++	int chr;
++	unsigned long flags;
++	local_irq_save(flags);
++#ifdef CONFIG_SMP
++	if (!spin_is_locked(&kgdb_spinlock)) {
++		spin_lock(&uart_interrupt_lock);
++	}
++#endif
++	if (atomic_read(&gdb_buf_in_cnt) != 0) {	/* intr routine has q'd chars */
++		chr = gdb_buf[gdb_buf_out_inx++];
++		gdb_buf_out_inx &= (GDB_BUF_SIZE - 1);
++		atomic_dec(&gdb_buf_in_cnt);
++	} else {
++		chr = read_data_bfr(info);
++	}
++#ifdef CONFIG_SMP
++	if (!spin_is_locked(&kgdb_spinlock)) {
++		spin_unlock(&uart_interrupt_lock);
++	}
++#endif
++	local_irq_restore(flags);
++	return (chr);
++}
++
++/*
++ * Wait until the interface can accept a char, then write it.
++ */
++static void
++write_char(struct async_struct *info, int chr)
++{
++	while (!(inb_p(info->port + UART_LSR) & UART_LSR_THRE)) ;
++
++	outb_p(chr, info->port + UART_TX);
++
++}				/* write_char */
++
++/*
++ * Mostly we don't need a spinlock, but since the console goes
++ * thru here with interrutps on, well, we need to catch those
++ * chars.
++ */
++/*
++ * This is the receiver interrupt routine for the GDB stub.
++ * It will receive a limited number of characters of input
++ * from the gdb  host machine and save them up in a buffer.
++ *
++ * When the gdb stub routine tty_getDebugChar() is called it
++ * draws characters out of the buffer until it is empty and
++ * then reads directly from the serial port.
++ *
++ * We do not attempt to write chars from the interrupt routine
++ * since the stubs do all of that via tty_putDebugChar() which
++ * writes one byte after waiting for the interface to become
++ * ready.
++ *
++ * The debug stubs like to run with interrupts disabled since,
++ * after all, they run as a consequence of a breakpoint in
++ * the kernel.
++ *
++ * Perhaps someone who knows more about the tty driver than I
++ * care to learn can make this work for any low level serial
++ * driver.
++ */
++static irqreturn_t
++gdb_interrupt(int irq, void *dev_id, struct pt_regs *regs)
++{
++	struct async_struct *info;
++	unsigned long flags;
++
++	info = gdb_async_info;
++	if (!info || !info->tty || irq != gdb_async_irq)
++		return IRQ_NONE;
++
++	local_irq_save(flags);
++	spin_lock(&uart_interrupt_lock);
++	do {
++		int chr = read_data_bfr(info);
++		intprintk(("Debug char on int: %x hex\n", chr));
++		if (chr < 0)
++			continue;
++
++		if (chr == 3) {	/* Ctrl-C means remote interrupt */
++			BREAKPOINT;
++			continue;
++		}
++
++		if (atomic_read(&gdb_buf_in_cnt) >= GDB_BUF_SIZE) {
++			/* buffer overflow tosses early char */
++			read_char(info);
++		}
++		gdb_buf[gdb_buf_in_inx++] = chr;
++		gdb_buf_in_inx &= (GDB_BUF_SIZE - 1);
++	} while (inb_p(info->port + UART_IIR) & UART_IIR_RDI);
++	spin_unlock(&uart_interrupt_lock);
++	local_irq_restore(flags);
++	return IRQ_HANDLED;
++}				/* gdb_interrupt */
++
++/*
++ * Just a NULL routine for testing.
++ */
++void
++gdb_null(void)
++{
++}				/* gdb_null */
++
++/* These structure are filled in with values defined in asm/kgdb_local.h
++ */
++static struct serial_state state = SB_STATE;
++static struct async_struct local_info = SB_INFO;
++static int ok_to_enable_ints = 0;
++static void kgdb_enable_ints_now(void);
++
++extern char *kgdb_version;
++/*
++ * Hook an IRQ for KGDB.
++ *
++ * This routine is called from tty_putDebugChar, below.
++ */
++static int ints_disabled = 1;
++int
++gdb_hook_interrupt(struct async_struct *info, int verb)
++{
++	struct serial_state *state = info->state;
++	unsigned long flags;
++	int port;
++#ifdef TEST_EXISTANCE
++	int scratch, scratch2;
++#endif
++
++	/* The above fails if memory managment is not set up yet.
++	 * Rather than fail the set up, just keep track of the fact
++	 * and pick up the interrupt thing later.
++	 */
++	gdb_async_info = info;
++	port = gdb_async_info->port;
++	gdb_async_irq = state->irq;
++	if (verb) {
++		printk("kgdb %s : port =%x, IRQ=%d, divisor =%d\n",
++		       kgdb_version,
++		       port,
++		       gdb_async_irq, gdb_async_info->state->custom_divisor);
++	}
++	local_irq_save(flags);
++#ifdef TEST_EXISTANCE
++	/* Existance test */
++	/* Should not need all this, but just in case.... */
++
++	scratch = inb_p(port + UART_IER);
++	outb_px(port + UART_IER, 0);
++	outb_px(0xff, 0x080);
++	scratch2 = inb_p(port + UART_IER);
++	outb_px(port + UART_IER, scratch);
++	if (scratch2) {
++		printk
++		    ("gdb_hook_interrupt: Could not clear IER, not a UART!\n");
++		local_irq_restore(flags);
++		return 1;	/* We failed; there's nothing here */
++	}
++	scratch2 = inb_p(port + UART_LCR);
++	outb_px(port + UART_LCR, 0xBF);	/* set up for StarTech test */
++	outb_px(port + UART_EFR, 0);	/* EFR is the same as FCR */
++	outb_px(port + UART_LCR, 0);
++	outb_px(port + UART_FCR, UART_FCR_ENABLE_FIFO);
++	scratch = inb_p(port + UART_IIR) >> 6;
++	if (scratch == 1) {
++		printk("gdb_hook_interrupt: Undefined UART type!"
++		       "  Not a UART! \n");
++		local_irq_restore(flags);
++		return 1;
++	} else {
++		dbprintk(("gdb_hook_interrupt: UART type "
++			  "is %d where 0=16450, 2=16550 3=16550A\n", scratch));
++	}
++	scratch = inb_p(port + UART_MCR);
++	outb_px(port + UART_MCR, UART_MCR_LOOP | scratch);
++	outb_px(port + UART_MCR, UART_MCR_LOOP | 0x0A);
++	scratch2 = inb_p(port + UART_MSR) & 0xF0;
++	outb_px(port + UART_MCR, scratch);
++	if (scratch2 != 0x90) {
++		printk("gdb_hook_interrupt: "
++		       "Loop back test failed! Not a UART!\n");
++		local_irq_restore(flags);
++		return scratch2 + 1000;	/* force 0 to fail */
++	}
++#endif				/* test existance */
++	program_uart(info);
++	local_irq_restore(flags);
++
++	return (0);
++
++}				/* gdb_hook_interrupt */
++
++static void
++program_uart(struct async_struct *info)
++{
++	int port = info->port;
++
++	(void) inb_p(port + UART_RX);
++	outb_px(port + UART_IER, 0);
++
++	(void) inb_p(port + UART_RX);	/* serial driver comments say */
++	(void) inb_p(port + UART_IIR);	/* this clears the interrupt regs */
++	(void) inb_p(port + UART_MSR);
++	outb_px(port + UART_LCR, UART_LCR_WLEN8 | UART_LCR_DLAB);
++	outb_px(port + UART_DLL, info->state->custom_divisor & 0xff);	/* LS */
++	outb_px(port + UART_DLM, info->state->custom_divisor >> 8);	/* MS  */
++	outb_px(port + UART_MCR, info->MCR);
++
++	outb_px(port + UART_FCR, UART_FCR_ENABLE_FIFO | UART_FCR_TRIGGER_1 | UART_FCR_CLEAR_XMIT | UART_FCR_CLEAR_RCVR);	/* set fcr */
++	outb_px(port + UART_LCR, UART_LCR_WLEN8);	/* reset DLAB */
++	outb_px(port + UART_FCR, UART_FCR_ENABLE_FIFO | UART_FCR_TRIGGER_1);	/* set fcr */
++	if (!ints_disabled) {
++		intprintk(("KGDB: Sending %d to port %x offset %d\n",
++			   gdb_async_info->IER,
++			   (int) gdb_async_info->port, UART_IER));
++		outb_px(gdb_async_info->port + UART_IER, gdb_async_info->IER);
++	}
++	return;
++}
++
++/*
++ * tty_getDebugChar
++ *
++ * This is a GDB stub routine.	It waits for a character from the
++ * serial interface and then returns it.  If there is no serial
++ * interface connection then it returns a bogus value which will
++ * almost certainly cause the system to hang.  In the
++ */
++int kgdb_in_isr = 0;
++int kgdb_in_lsr = 0;
++extern spinlock_t kgdb_spinlock;
++
++/* Caller takes needed protections */
++
++int
++tty_getDebugChar(void)
++{
++	volatile int chr, dum, time, end_time;
++
++	dbprintk(("tty_getDebugChar(port %x): ", gdb_async_info->port));
++
++	if (gdb_async_info == NULL) {
++		gdb_hook_interrupt(&local_info, 0);
++	}
++	/*
++	 * This trick says if we wait a very long time and get
++	 * no char, return the -1 and let the upper level deal
++	 * with it.
++	 */
++	rdtsc(dum, time);
++	end_time = time + 2;
++	while (((chr = read_char(gdb_async_info)) == -1) &&
++	       (end_time - time) > 0) {
++		rdtsc(dum, time);
++	};
++	/*
++	 * This covers our butts if some other code messes with
++	 * our uart, hay, it happens :o)
++	 */
++	if (chr == -1)
++		program_uart(gdb_async_info);
++
++	dbprintk(("%c\n", chr > ' ' && chr < 0x7F ? chr : ' '));
++	return (chr);
++
++}				/* tty_getDebugChar */
++
++static int count = 3;
++static spinlock_t one_at_atime = SPIN_LOCK_UNLOCKED;
++
++static int __init
++kgdb_enable_ints(void)
++{
++	if (kgdb_eth != -1) {
++		return 0;
++	}
++	if (gdb_async_info == NULL) {
++		gdb_hook_interrupt(&local_info, 1);
++	}
++	ok_to_enable_ints = 1;
++	kgdb_enable_ints_now();
++#ifdef CONFIG_KGDB_USER_CONSOLE
++	kgdb_console_finit();
++#endif
++	return 0;
++}
++
++#ifdef CONFIG_SERIAL_8250
++void shutdown_for_kgdb(struct async_struct *gdb_async_info);
++#endif
++
++#ifdef CONFIG_DISCONTIGMEM
++static inline int kgdb_mem_init_done(void)
++{
++	return highmem_start_page != NULL;
++}
++#else
++static inline int kgdb_mem_init_done(void)
++{
++	return max_mapnr != 0;
++}
++#endif
++
++static void
++kgdb_enable_ints_now(void)
++{
++	if (!spin_trylock(&one_at_atime))
++		return;
++	if (!ints_disabled)
++		goto exit;
++	if (kgdb_mem_init_done() &&
++			ints_disabled) {	/* don't try till mem init */
++#ifdef CONFIG_SERIAL_8250
++		/*
++		 * The ifdef here allows the system to be configured
++		 * without the serial driver.
++		 * Don't make it a module, however, it will steal the port
++		 */
++		shutdown_for_kgdb(gdb_async_info);
++#endif
++		ints_disabled = request_irq(gdb_async_info->state->irq,
++					    gdb_interrupt,
++					    IRQ_T(gdb_async_info),
++					    "KGDB-stub", NULL);
++		intprintk(("KGDB: request_irq returned %d\n", ints_disabled));
++	}
++	if (!ints_disabled) {
++		intprintk(("KGDB: Sending %d to port %x offset %d\n",
++			   gdb_async_info->IER,
++			   (int) gdb_async_info->port, UART_IER));
++		outb_px(gdb_async_info->port + UART_IER, gdb_async_info->IER);
++	}
++      exit:
++	spin_unlock(&one_at_atime);
++}
++
++/*
++ * tty_putDebugChar
++ *
++ * This is a GDB stub routine.	It waits until the interface is ready
++ * to transmit a char and then sends it.  If there is no serial
++ * interface connection then it simply returns to its caller, having
++ * pretended to send the char.	Caller takes needed protections.
++ */
++void
++tty_putDebugChar(int chr)
++{
++	dbprintk(("tty_putDebugChar(port %x): chr=%02x '%c', ints_on=%d\n",
++		  gdb_async_info->port,
++		  chr,
++		  chr > ' ' && chr < 0x7F ? chr : ' ', ints_disabled ? 0 : 1));
++
++	if (gdb_async_info == NULL) {
++		gdb_hook_interrupt(&local_info, 0);
++	}
++
++	write_char(gdb_async_info, chr);	/* this routine will wait */
++	count = (chr == '#') ? 0 : count + 1;
++	if ((count == 2)) {	/* try to enable after */
++		if (ints_disabled & ok_to_enable_ints)
++			kgdb_enable_ints_now();	/* try to enable after */
++
++		/* We do this a lot because, well we really want to get these
++		 * interrupts.	The serial driver will clear these bits when it
++		 * initializes the chip.  Every thing else it does is ok,
++		 * but this.
++		 */
++		if (!ints_disabled) {
++			outb_px(gdb_async_info->port + UART_IER,
++				gdb_async_info->IER);
++		}
++	}
++
++}				/* tty_putDebugChar */
++
++/*
++ * This does nothing for the serial port, since it doesn't buffer.
++ */
++
++void tty_flushDebugChar(void)
++{
++}
++
++module_init(kgdb_enable_ints);
+--- linux-2.6.0-test6/arch/i386/lib/Makefile	2003-06-26 22:07:23.000000000 -0700
++++ 25/arch/i386/lib/Makefile	2003-10-05 00:33:38.000000000 -0700
+@@ -9,4 +9,5 @@ lib-y = checksum.o delay.o \
+ 
+ lib-$(CONFIG_X86_USE_3DNOW) += mmx.o
+ lib-$(CONFIG_HAVE_DEC_LOCK) += dec_and_lock.o
++lib-$(CONFIG_KGDB) += kgdb_serial.o
+ lib-$(CONFIG_DEBUG_IOVIRT)  += iodebug.o
+--- linux-2.6.0-test6/arch/i386/lib/usercopy.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/arch/i386/lib/usercopy.c	2003-10-05 00:36:48.000000000 -0700
+@@ -76,7 +76,7 @@ do {									   \
+  * and returns @count.
+  */
+ long
+-__strncpy_from_user(char *dst, const char __user *src, long count)
++__direct_strncpy_from_user(char *dst, const char __user *src, long count)
+ {
+ 	long res;
+ 	__do_strncpy_from_user(dst, src, count, res);
+@@ -102,7 +102,7 @@ __strncpy_from_user(char *dst, const cha
+  * and returns @count.
+  */
+ long
+-strncpy_from_user(char *dst, const char __user *src, long count)
++direct_strncpy_from_user(char *dst, const char __user *src, long count)
+ {
+ 	long res = -EFAULT;
+ 	if (access_ok(VERIFY_READ, src, 1))
+@@ -147,7 +147,7 @@ do {									\
+  * On success, this will be zero.
+  */
+ unsigned long
+-clear_user(void __user *to, unsigned long n)
++direct_clear_user(void __user *to, unsigned long n)
+ {
+ 	might_sleep();
+ 	if (access_ok(VERIFY_WRITE, to, n))
+@@ -167,7 +167,7 @@ clear_user(void __user *to, unsigned lon
+  * On success, this will be zero.
+  */
+ unsigned long
+-__clear_user(void __user *to, unsigned long n)
++__direct_clear_user(void __user *to, unsigned long n)
+ {
+ 	__do_clear_user(to, n);
+ 	return n;
+@@ -184,7 +184,7 @@ __clear_user(void __user *to, unsigned l
+  * On exception, returns 0.
+  * If the string is too long, returns a value greater than @n.
+  */
+-long strnlen_user(const char __user *s, long n)
++long direct_strnlen_user(const char __user *s, long n)
+ {
+ 	unsigned long mask = -__addr_ok(s);
+ 	unsigned long res, tmp;
+@@ -573,3 +573,4 @@ unsigned long __copy_from_user_ll(void *
+ 		n = __copy_user_zeroing_intel(to, (const void *) from, n);
+ 	return n;
+ }
++
+--- linux-2.6.0-test6/arch/i386/Makefile	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/i386/Makefile	2003-10-05 00:33:38.000000000 -0700
+@@ -84,6 +84,9 @@ mcore-$(CONFIG_X86_ES7000)	:= mach-es700
+ # default subarch .h files
+ mflags-y += -Iinclude/asm-i386/mach-default
+ 
++mflags-$(CONFIG_KGDB) += -gdwarf-2
++mflags-$(CONFIG_KGDB_MORE) += $(shell echo $(CONFIG_KGDB_OPTIONS) | sed -e 's/"//g')
++
+ head-y := arch/i386/kernel/head.o arch/i386/kernel/init_task.o
+ 
+ libs-y 					+= arch/i386/lib/
+--- linux-2.6.0-test6/arch/i386/math-emu/fpu_system.h	2003-06-14 12:18:06.000000000 -0700
++++ 25/arch/i386/math-emu/fpu_system.h	2003-10-05 00:36:48.000000000 -0700
+@@ -15,6 +15,7 @@
+ #include <linux/sched.h>
+ #include <linux/kernel.h>
+ #include <linux/mm.h>
++#include <asm/atomic_kmap.h>
+ 
+ /* This sets the pointer FPU_info to point to the argument part
+    of the stack frame of math_emulate() */
+@@ -22,7 +23,7 @@
+ 
+ /* s is always from a cpu register, and the cpu does bounds checking
+  * during register load --> no further bounds checks needed */
+-#define LDT_DESCRIPTOR(s)	(((struct desc_struct *)current->mm->context.ldt)[(s) >> 3])
++#define LDT_DESCRIPTOR(s)	(((struct desc_struct *)__kmap_atomic_vaddr(KM_LDT_PAGE0))[(s) >> 3])
+ #define SEG_D_SIZE(x)		((x).b & (3 << 21))
+ #define SEG_G_BIT(x)		((x).b & (1 << 23))
+ #define SEG_GRANULARITY(x)	(((x).b & (1 << 23)) ? 4096 : 1)
+--- linux-2.6.0-test6/arch/i386/mm/extable.c	2003-06-14 12:18:51.000000000 -0700
++++ 25/arch/i386/mm/extable.c	2003-10-05 00:36:48.000000000 -0700
+@@ -6,6 +6,52 @@
+ #include <linux/module.h>
+ #include <linux/spinlock.h>
+ #include <asm/uaccess.h>
++#include <asm/pgtable.h>
++
++extern struct exception_table_entry __start___ex_table[];
++extern struct exception_table_entry __stop___ex_table[];
++
++/*
++ * The exception table needs to be sorted because we use the macros
++ * which put things into the exception table in a variety of sections
++ * as well as the init section and the main kernel text section.
++ */
++static inline void
++sort_ex_table(struct exception_table_entry *start,
++	      struct exception_table_entry *finish)
++{
++	struct exception_table_entry el, *p, *q;
++
++	/* insertion sort */
++	for (p = start + 1; p < finish; ++p) {
++		/* start .. p-1 is sorted */
++		if (p[0].insn < p[-1].insn) {
++			/* move element p down to its right place */
++			el = *p;
++			q = p;
++			do {
++				/* el comes before q[-1], move q[-1] up one */
++				q[0] = q[-1];
++				--q;
++			} while (q > start && el.insn < q[-1].insn);
++			*q = el;
++		}
++	}
++}
++
++void fixup_sort_exception_table(void)
++{
++	struct exception_table_entry *p;
++
++	/*
++	 * Fix up the trampoline exception addresses:
++	 */
++	for (p = __start___ex_table; p < __stop___ex_table; p++) {
++		p->insn = (unsigned long)(void *)p->insn;
++		p->fixup = (unsigned long)(void *)p->fixup;
++	}
++	sort_ex_table(__start___ex_table, __stop___ex_table);
++}
+ 
+ /* Simple binary search */
+ const struct exception_table_entry *
+@@ -15,13 +61,15 @@ search_extable(const struct exception_ta
+ {
+         while (first <= last) {
+ 		const struct exception_table_entry *mid;
+-		long diff;
+ 
+ 		mid = (last - first) / 2 + first;
+-		diff = mid->insn - value;
+-                if (diff == 0)
++		/*
++		 * careful, the distance between entries can be
++		 * larger than 2GB:
++		 */
++                if (mid->insn == value)
+                         return mid;
+-                else if (diff < 0)
++                else if (mid->insn < value)
+                         first = mid+1;
+                 else
+                         last = mid-1;
+--- linux-2.6.0-test6/arch/i386/mm/fault.c	2003-06-26 22:07:23.000000000 -0700
++++ 25/arch/i386/mm/fault.c	2003-10-05 00:36:50.000000000 -0700
+@@ -19,6 +19,7 @@
+ #include <linux/init.h>
+ #include <linux/tty.h>
+ #include <linux/vt_kern.h>		/* For unblank_screen() */
++#include <linux/highmem.h>
+ #include <linux/module.h>
+ 
+ #include <asm/system.h>
+@@ -26,6 +27,7 @@
+ #include <asm/pgalloc.h>
+ #include <asm/hardirq.h>
+ #include <asm/desc.h>
++#include <asm/tlbflush.h>
+ 
+ extern void die(const char *,struct pt_regs *,long);
+ 
+@@ -55,6 +57,161 @@ void bust_spinlocks(int yes)
+ 	console_loglevel = loglevel_save;
+ }
+ 
++/*
++ * Return EIP plus the CS segment base.  The segment limit is also
++ * adjusted, clamped to the kernel/user address space (whichever is
++ * appropriate), and returned in *eip_limit.
++ *
++ * The segment is checked, because it might have been changed by another
++ * task between the original faulting instruction and here.
++ *
++ * If CS is no longer a valid code segment, or if EIP is beyond the
++ * limit, or if it is a kernel address when CS is not a kernel segment,
++ * then the returned value will be greater than *eip_limit.
++ */
++static inline unsigned long get_segment_eip(struct pt_regs *regs,
++					    unsigned long *eip_limit)
++{
++	unsigned long eip = regs->eip;
++	unsigned seg = regs->xcs & 0xffff;
++	u32 seg_ar, seg_limit, base, *desc;
++
++	/* The standard kernel/user address space limit. */
++	*eip_limit = (seg & 3) ? USER_DS.seg : KERNEL_DS.seg;
++
++	/* Unlikely, but must come before segment checks. */
++	if (unlikely((regs->eflags & VM_MASK) != 0))
++		return eip + (seg << 4);
++
++	/* By far the commonest cases. */
++	if (likely(seg == __USER_CS || seg == __KERNEL_CS))
++		return eip;
++
++	/* Check the segment exists, is within the current LDT/GDT size,
++	   that kernel/user (ring 0..3) has the appropriate privilege,
++	   that it's a code segment, and get the limit. */
++	__asm__ ("larl %3,%0; lsll %3,%1"
++		 : "=&r" (seg_ar), "=r" (seg_limit) : "0" (0), "rm" (seg));
++	if ((~seg_ar & 0x9800) || eip > seg_limit) {
++		*eip_limit = 0;
++		return 1;	 /* So that returned eip > *eip_limit. */
++	}
++
++	/* Get the GDT/LDT descriptor base.
++	   When you look for races in this code remember that
++	   LDT and other horrors are only used in user space. */
++	if (seg & (1<<2)) {
++		/* Must lock the LDT while reading it. */
++		down(&current->mm->context.sem);
++#if 1
++		/* horrible hack for 4/4 disabled kernels.
++		   I'm not quite sure what the TLB flush is good for,
++		   it's mindlessly copied from the read_ldt code */
++		__flush_tlb_global();
++		desc = kmap(current->mm->context.ldt_pages[(seg & ~7)/PAGE_SIZE]);
++		desc = (void *)desc + ((seg & ~7) % PAGE_SIZE);
++#else
++		desc = current->mm->context.ldt;
++		desc = (void *)desc + (seg & ~7);
++#endif
++	} else {
++		/* Must disable preemption while reading the GDT. */
++		desc = (u32 *)&cpu_gdt_table[get_cpu()];
++		desc = (void *)desc + (seg & ~7);
++	}
++	base = (desc[0] >> 16) |
++		((desc[1] & 0xff) << 16) |
++		(desc[1] & 0xff000000);
++	if (seg & (1<<2)) {
++#if 1
++		kunmap((void *)((unsigned long)desc & PAGE_MASK));
++#endif
++		up(&current->mm->context.sem);
++	} else
++		put_cpu();
++
++	/* Adjust EIP and segment limit, and clamp at the kernel limit.
++	   It's legitimate for segments to wrap at 0xffffffff. */
++	seg_limit += base;
++	if (seg_limit < *eip_limit && seg_limit >= base)
++		*eip_limit = seg_limit;
++	return eip + base;
++}
++
++/*
++ * Sometimes AMD Athlon/Opteron CPUs report invalid exceptions on prefetch.
++ * Check that here and ignore it.
++ */
++static int __is_prefetch(struct pt_regs *regs, unsigned long addr)
++{
++	unsigned long limit;
++	unsigned long instr = get_segment_eip (regs, &limit);
++	int scan_more = 1;
++	int prefetch = 0;
++	int i;
++
++	for (i = 0; scan_more && i < 15; i++) {
++		unsigned char opcode;
++		unsigned char instr_hi;
++		unsigned char instr_lo;
++
++		if (instr > limit)
++			break;
++		if (__get_user(opcode, (unsigned char *) instr))
++			break;
++
++		instr_hi = opcode & 0xf0;
++		instr_lo = opcode & 0x0f;
++		instr++;
++
++		switch (instr_hi) {
++		case 0x20:
++		case 0x30:
++			/* Values 0x26,0x2E,0x36,0x3E are valid x86 prefixes. */
++			scan_more = ((instr_lo & 7) == 0x6);
++			break;
++
++		case 0x60:
++			/* 0x64 thru 0x67 are valid prefixes in all modes. */
++			scan_more = (instr_lo & 0xC) == 0x4;
++			break;
++		case 0xF0:
++			/* 0xF0, 0xF2, and 0xF3 are valid prefixes in all modes. */
++			scan_more = !instr_lo || (instr_lo>>1) == 1;
++			break;
++		case 0x00:
++			/* Prefetch instruction is 0x0F0D or 0x0F18 */
++			scan_more = 0;
++			if (instr > limit)
++				break;
++			if (__get_user(opcode, (unsigned char *) instr))
++				break;
++			prefetch = (instr_lo == 0xF) &&
++				(opcode == 0x0D || opcode == 0x18);
++			break;
++		default:
++			scan_more = 0;
++			break;
++		}
++	}
++
++#if 1
++	if (prefetch)
++		printk("prefetch handled at %lx eip %lx instr %lx cs %x\n",
++		       addr, regs->eip, instr, regs->xcs);
++#endif
++
++	return prefetch;
++}
++
++static inline int is_prefetch(struct pt_regs *regs, unsigned long addr)
++{
++	if (unlikely(boot_cpu_data.x86_vendor == X86_VENDOR_AMD &&
++		     boot_cpu_data.x86 >= 6))
++		return __is_prefetch(regs, addr);
++	return 0;
++}
++
+ asmlinkage void do_invalid_op(struct pt_regs *, unsigned long);
+ 
+ /*
+@@ -86,6 +243,8 @@ asmlinkage void do_page_fault(struct pt_
+ 
+ 	tsk = current;
+ 
++	info.si_code = SEGV_MAPERR;
++
+ 	/*
+ 	 * We fault-in kernel-space virtual memory on-demand. The
+ 	 * 'reference' page table is init_mm.pgd.
+@@ -99,18 +258,26 @@ asmlinkage void do_page_fault(struct pt_
+ 	 * (error_code & 4) == 0, and that the fault was not a
+ 	 * protection error (error_code & 1) == 0.
+ 	 */
+-	if (address >= TASK_SIZE && !(error_code & 5))
++#ifdef CONFIG_X86_4G
++	/* On 4/4 all kernels faults are either bugs, vmalloc or prefetch */
++	if (unlikely((regs->xcs & 3) == 0))
+ 		goto vmalloc_fault;
++#else
++	if (unlikely(address >= TASK_SIZE)) {
++		if (!(error_code & 5))
++			goto vmalloc_fault;
++		goto bad_area_nosemaphore;
++	}
++#endif
+ 
+ 	mm = tsk->mm;
+-	info.si_code = SEGV_MAPERR;
+ 
+ 	/*
+ 	 * If we're in an interrupt, have no user context or are running in an
+ 	 * atomic region then we must not take the fault..
+ 	 */
+ 	if (in_atomic() || !mm)
+-		goto no_context;
++		goto bad_area_nosemaphore;
+ 
+ 	down_read(&mm->mmap_sem);
+ 
+@@ -198,8 +365,16 @@ good_area:
+ bad_area:
+ 	up_read(&mm->mmap_sem);
+ 
++bad_area_nosemaphore:
+ 	/* User mode accesses just cause a SIGSEGV */
+ 	if (error_code & 4) {
++		/*
++		 * Valid to do another page fault here because this one came
++		 * from user space.
++		 */
++		if (is_prefetch(regs, address))
++			return;
++
+ 		tsk->thread.cr2 = address;
+ 		tsk->thread.error_code = error_code;
+ 		tsk->thread.trap_no = 14;
+@@ -232,10 +407,24 @@ no_context:
+ 	if (fixup_exception(regs))
+ 		return;
+ 
++	/*
++	 * Valid to do another page fault here, because if this fault
++	 * had been triggered by is_prefetch fixup_exception would have
++	 * handled it.
++	 */
++ 	if (is_prefetch(regs, address))
++ 		return;
++
+ /*
+  * Oops. The kernel tried to access some bad page. We'll have to
+  * terminate things with extreme prejudice.
+  */
++#ifdef CONFIG_KGDB
++        if (!user_mode(regs)){
++                kgdb_handle_exception(14,SIGBUS, error_code, regs);
++                return;
++        }
++#endif
+ 
+ 	bust_spinlocks(1);
+ 
+@@ -286,10 +475,14 @@ out_of_memory:
+ do_sigbus:
+ 	up_read(&mm->mmap_sem);
+ 
+-	/*
+-	 * Send a sigbus, regardless of whether we were in kernel
+-	 * or user mode.
+-	 */
++	/* Kernel mode? Handle exceptions or die */
++	if (!(error_code & 4))
++		goto no_context;
++
++	/* User space => ok to do another page fault */
++	if (is_prefetch(regs, address))
++		return;
++
+ 	tsk->thread.cr2 = address;
+ 	tsk->thread.error_code = error_code;
+ 	tsk->thread.trap_no = 14;
+@@ -298,10 +491,6 @@ do_sigbus:
+ 	info.si_code = BUS_ADRERR;
+ 	info.si_addr = (void *)address;
+ 	force_sig_info(SIGBUS, &info, tsk);
+-
+-	/* Kernel mode? Handle exceptions or die */
+-	if (!(error_code & 4))
+-		goto no_context;
+ 	return;
+ 
+ vmalloc_fault:
+--- linux-2.6.0-test6/arch/i386/mm/init.c	2003-08-08 22:55:10.000000000 -0700
++++ 25/arch/i386/mm/init.c	2003-10-05 00:36:48.000000000 -0700
+@@ -25,6 +25,7 @@
+ #include <linux/bootmem.h>
+ #include <linux/slab.h>
+ #include <linux/proc_fs.h>
++#include <linux/efi.h>
+ 
+ #include <asm/processor.h>
+ #include <asm/system.h>
+@@ -38,125 +39,13 @@
+ #include <asm/tlb.h>
+ #include <asm/tlbflush.h>
+ #include <asm/sections.h>
++#include <asm/desc.h>
+ 
+ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
+ unsigned long highstart_pfn, highend_pfn;
+ 
+ static int do_test_wp_bit(void);
+ 
+-/*
+- * Creates a middle page table and puts a pointer to it in the
+- * given global directory entry. This only returns the gd entry
+- * in non-PAE compilation mode, since the middle layer is folded.
+- */
+-static pmd_t * __init one_md_table_init(pgd_t *pgd)
+-{
+-	pmd_t *pmd_table;
+-		
+-#ifdef CONFIG_X86_PAE
+-	pmd_table = (pmd_t *) alloc_bootmem_low_pages(PAGE_SIZE);
+-	set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
+-	if (pmd_table != pmd_offset(pgd, 0)) 
+-		BUG();
+-#else
+-	pmd_table = pmd_offset(pgd, 0);
+-#endif
+-
+-	return pmd_table;
+-}
+-
+-/*
+- * Create a page table and place a pointer to it in a middle page
+- * directory entry.
+- */
+-static pte_t * __init one_page_table_init(pmd_t *pmd)
+-{
+-	if (pmd_none(*pmd)) {
+-		pte_t *page_table = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE);
+-		set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
+-		if (page_table != pte_offset_kernel(pmd, 0))
+-			BUG();	
+-
+-		return page_table;
+-	}
+-	
+-	return pte_offset_kernel(pmd, 0);
+-}
+-
+-/*
+- * This function initializes a certain range of kernel virtual memory 
+- * with new bootmem page tables, everywhere page tables are missing in
+- * the given range.
+- */
+-
+-/*
+- * NOTE: The pagetables are allocated contiguous on the physical space 
+- * so we can cache the place of the first one and move around without 
+- * checking the pgd every time.
+- */
+-static void __init page_table_range_init (unsigned long start, unsigned long end, pgd_t *pgd_base)
+-{
+-	pgd_t *pgd;
+-	pmd_t *pmd;
+-	int pgd_idx, pmd_idx;
+-	unsigned long vaddr;
+-
+-	vaddr = start;
+-	pgd_idx = pgd_index(vaddr);
+-	pmd_idx = pmd_index(vaddr);
+-	pgd = pgd_base + pgd_idx;
+-
+-	for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
+-		if (pgd_none(*pgd)) 
+-			one_md_table_init(pgd);
+-
+-		pmd = pmd_offset(pgd, vaddr);
+-		for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end); pmd++, pmd_idx++) {
+-			if (pmd_none(*pmd)) 
+-				one_page_table_init(pmd);
+-
+-			vaddr += PMD_SIZE;
+-		}
+-		pmd_idx = 0;
+-	}
+-}
+-
+-/*
+- * This maps the physical memory to kernel virtual address space, a total 
+- * of max_low_pfn pages, by creating page tables starting from address 
+- * PAGE_OFFSET.
+- */
+-static void __init kernel_physical_mapping_init(pgd_t *pgd_base)
+-{
+-	unsigned long pfn;
+-	pgd_t *pgd;
+-	pmd_t *pmd;
+-	pte_t *pte;
+-	int pgd_idx, pmd_idx, pte_ofs;
+-
+-	pgd_idx = pgd_index(PAGE_OFFSET);
+-	pgd = pgd_base + pgd_idx;
+-	pfn = 0;
+-
+-	for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
+-		pmd = one_md_table_init(pgd);
+-		if (pfn >= max_low_pfn)
+-			continue;
+-		for (pmd_idx = 0; pmd_idx < PTRS_PER_PMD && pfn < max_low_pfn; pmd++, pmd_idx++) {
+-			/* Map with big pages if possible, otherwise create normal page tables. */
+-			if (cpu_has_pse) {
+-				set_pmd(pmd, pfn_pmd(pfn, PAGE_KERNEL_LARGE));
+-				pfn += PTRS_PER_PTE;
+-			} else {
+-				pte = one_page_table_init(pmd);
+-
+-				for (pte_ofs = 0; pte_ofs < PTRS_PER_PTE && pfn < max_low_pfn; pte++, pfn++, pte_ofs++)
+-					set_pte(pte, pfn_pte(pfn, PAGE_KERNEL));
+-			}
+-		}
+-	}	
+-}
+-
+ static inline int page_kills_ppro(unsigned long pagenr)
+ {
+ 	if (pagenr >= 0x70000 && pagenr <= 0x7003F)
+@@ -164,12 +53,30 @@ static inline int page_kills_ppro(unsign
+ 	return 0;
+ }
+ 
++extern int is_available_memory(efi_memory_desc_t *);
++
+ static inline int page_is_ram(unsigned long pagenr)
+ {
+ 	int i;
++	unsigned long addr, end;
++
++	if (efi_enabled) {
++		efi_memory_desc_t *md;
++
++		for (i = 0; i < memmap.nr_map; i++) {
++			md = &memmap.map[i];
++			if (!is_available_memory(md))
++				continue;
++			addr = (md->phys_addr+PAGE_SIZE-1) >> PAGE_SHIFT;
++			end = (md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT)) >> PAGE_SHIFT;
++
++			if ((pagenr >= addr) && (pagenr < end))
++				return 1;
++		}
++		return 0;
++	}
+ 
+ 	for (i = 0; i < e820.nr_map; i++) {
+-		unsigned long addr, end;
+ 
+ 		if (e820.map[i].type != E820_RAM)	/* not usable memory */
+ 			continue;
+@@ -186,38 +93,14 @@ static inline int page_is_ram(unsigned l
+ 	return 0;
+ }
+ 
+-#ifdef CONFIG_HIGHMEM
+ pte_t *kmap_pte;
+-pgprot_t kmap_prot;
+ 
+ #define kmap_get_fixmap_pte(vaddr)					\
+ 	pte_offset_kernel(pmd_offset(pgd_offset_k(vaddr), (vaddr)), (vaddr))
+ 
+ void __init kmap_init(void)
+ {
+-	unsigned long kmap_vstart;
+-
+-	/* cache the first kmap pte */
+-	kmap_vstart = __fix_to_virt(FIX_KMAP_BEGIN);
+-	kmap_pte = kmap_get_fixmap_pte(kmap_vstart);
+-
+-	kmap_prot = PAGE_KERNEL;
+-}
+-
+-void __init permanent_kmaps_init(pgd_t *pgd_base)
+-{
+-	pgd_t *pgd;
+-	pmd_t *pmd;
+-	pte_t *pte;
+-	unsigned long vaddr;
+-
+-	vaddr = PKMAP_BASE;
+-	page_table_range_init(vaddr, vaddr + PAGE_SIZE*LAST_PKMAP, pgd_base);
+-
+-	pgd = swapper_pg_dir + pgd_index(vaddr);
+-	pmd = pmd_offset(pgd, vaddr);
+-	pte = pte_offset_kernel(pmd, vaddr);
+-	pkmap_page_table = pte;	
++	kmap_pte = kmap_get_fixmap_pte(__fix_to_virt(FIX_KMAP_BEGIN));
+ }
+ 
+ void __init one_highpage_init(struct page *page, int pfn, int bad_ppro)
+@@ -232,6 +115,8 @@ void __init one_highpage_init(struct pag
+ 		SetPageReserved(page);
+ }
+ 
++#ifdef CONFIG_HIGHMEM
++
+ #ifndef CONFIG_DISCONTIGMEM
+ void __init set_highmem_pages_init(int bad_ppro) 
+ {
+@@ -243,12 +128,9 @@ void __init set_highmem_pages_init(int b
+ #else
+ extern void set_highmem_pages_init(int);
+ #endif /* !CONFIG_DISCONTIGMEM */
+-
+ #else
+-#define kmap_init() do { } while (0)
+-#define permanent_kmaps_init(pgd_base) do { } while (0)
+-#define set_highmem_pages_init(bad_ppro) do { } while (0)
+-#endif /* CONFIG_HIGHMEM */
++# define set_highmem_pages_init(bad_ppro) do { } while (0)
++#endif
+ 
+ unsigned long __PAGE_KERNEL = _PAGE_KERNEL;
+ 
+@@ -258,30 +140,125 @@ unsigned long __PAGE_KERNEL = _PAGE_KERN
+ extern void __init remap_numa_kva(void);
+ #endif
+ 
+-static void __init pagetable_init (void)
++static __init void prepare_pagetables(pgd_t *pgd_base, unsigned long address)
++{
++	pgd_t *pgd;
++	pmd_t *pmd;
++	pte_t *pte;
++
++	pgd = pgd_base + pgd_index(address);
++	pmd = pmd_offset(pgd, address);
++	if (!pmd_present(*pmd)) {
++		pte = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE);
++		set_pmd(pmd, __pmd(_PAGE_TABLE + __pa(pte)));
++	}
++}
++
++static void __init fixrange_init (unsigned long start, unsigned long end, pgd_t *pgd_base)
++{
++	unsigned long vaddr;
++
++	for (vaddr = start; vaddr != end; vaddr += PAGE_SIZE)
++		prepare_pagetables(pgd_base, vaddr);
++}
++
++void setup_identity_mappings(pgd_t *pgd_base, unsigned long start, unsigned long end)
+ {
+ 	unsigned long vaddr;
+-	pgd_t *pgd_base = swapper_pg_dir;
++	pgd_t *pgd;
++	int i, j, k;
++	pmd_t *pmd;
++	pte_t *pte, *pte_base;
++
++	pgd = pgd_base;
++
++	for (i = 0; i < PTRS_PER_PGD; pgd++, i++) {
++		vaddr = i*PGDIR_SIZE;
++		if (end && (vaddr >= end))
++			break;
++		pmd = pmd_offset(pgd, 0);
++		for (j = 0; j < PTRS_PER_PMD; pmd++, j++) {
++			vaddr = i*PGDIR_SIZE + j*PMD_SIZE;
++			if (end && (vaddr >= end))
++				break;
++			if (vaddr < start)
++				continue;
++			if (cpu_has_pse) {
++				unsigned long __pe;
++
++				set_in_cr4(X86_CR4_PSE);
++				boot_cpu_data.wp_works_ok = 1;
++				__pe = _KERNPG_TABLE + _PAGE_PSE + vaddr - start;
++				/* Make it "global" too if supported */
++				if (cpu_has_pge) {
++					set_in_cr4(X86_CR4_PGE);
++#if !defined(CONFIG_X86_SWITCH_PAGETABLES)
++					__pe += _PAGE_GLOBAL;
++					__PAGE_KERNEL |= _PAGE_GLOBAL;
++#endif
++				}
++				set_pmd(pmd, __pmd(__pe));
++				continue;
++			}
++			if (!pmd_present(*pmd))
++				pte_base = (pte_t *) alloc_bootmem_low_pages(PAGE_SIZE);
++			else
++				pte_base = (pte_t *) page_address(pmd_page(*pmd));
++			pte = pte_base;
++			for (k = 0; k < PTRS_PER_PTE; pte++, k++) {
++				vaddr = i*PGDIR_SIZE + j*PMD_SIZE + k*PAGE_SIZE;
++				if (end && (vaddr >= end))
++					break;
++				if (vaddr < start)
++					continue;
++				*pte = mk_pte_phys(vaddr-start, PAGE_KERNEL);
++			}
++			set_pmd(pmd, __pmd(_KERNPG_TABLE + __pa(pte_base)));
++		}
++	}
++}
+ 
++static void __init pagetable_init (void)
++{
++	unsigned long vaddr, end;
++	pgd_t *pgd_base;
+ #ifdef CONFIG_X86_PAE
+ 	int i;
+-	/* Init entries of the first-level page table to the zero page */
+-	for (i = 0; i < PTRS_PER_PGD; i++)
+-		set_pgd(pgd_base + i, __pgd(__pa(empty_zero_page) | _PAGE_PRESENT));
+ #endif
+ 
+-	/* Enable PSE if available */
+-	if (cpu_has_pse) {
+-		set_in_cr4(X86_CR4_PSE);
+-	}
++	/*
++	 * This can be zero as well - no problem, in that case we exit
++	 * the loops anyway due to the PTRS_PER_* conditions.
++	 */
++	end = (unsigned long)__va(max_low_pfn*PAGE_SIZE);
+ 
+-	/* Enable PGE if available */
+-	if (cpu_has_pge) {
+-		set_in_cr4(X86_CR4_PGE);
+-		__PAGE_KERNEL |= _PAGE_GLOBAL;
++	pgd_base = swapper_pg_dir;
++#ifdef CONFIG_X86_PAE
++	/*
++	 * It causes too many problems if there's no proper pmd set up
++	 * for all 4 entries of the PGD - so we allocate all of them.
++	 * PAE systems will not miss this extra 4-8K anyway ...
++	 */
++	for (i = 0; i < PTRS_PER_PGD; i++) {
++		pmd_t *pmd = (pmd_t *) alloc_bootmem_low_pages(PAGE_SIZE);
++		set_pgd(pgd_base + i, __pgd(__pa(pmd) + 0x1));
+ 	}
++#endif
++	/*
++	 * Set up lowmem-sized identity mappings at PAGE_OFFSET:
++	 */
++	setup_identity_mappings(pgd_base, PAGE_OFFSET, end);
+ 
+-	kernel_physical_mapping_init(pgd_base);
++	/*
++	 * Add flat-mode identity-mappings - SMP needs it when
++	 * starting up on an AP from real-mode. (In the non-PAE
++	 * case we already have these mappings through head.S.)
++	 * All user-space mappings are explicitly cleared after
++	 * SMP startup.
++	 */
++#if CONFIG_SMP && CONFIG_X86_PAE
++	setup_identity_mappings(pgd_base, 0, 16*1024*1024);
++#endif
+ 	remap_numa_kva();
+ 
+ 	/*
+@@ -289,38 +266,64 @@ static void __init pagetable_init (void)
+ 	 * created - mappings will be set by set_fixmap():
+ 	 */
+ 	vaddr = __fix_to_virt(__end_of_fixed_addresses - 1) & PMD_MASK;
+-	page_table_range_init(vaddr, 0, pgd_base);
++	fixrange_init(vaddr, 0, pgd_base);
+ 
+-	permanent_kmaps_init(pgd_base);
++#if CONFIG_HIGHMEM
++	{
++		pgd_t *pgd;
++		pmd_t *pmd;
++		pte_t *pte;
+ 
+-#ifdef CONFIG_X86_PAE
+-	/*
+-	 * Add low memory identity-mappings - SMP needs it when
+-	 * starting up on an AP from real-mode. In the non-PAE
+-	 * case we already have these mappings through head.S.
+-	 * All user-space mappings are explicitly cleared after
+-	 * SMP startup.
+-	 */
+-	pgd_base[0] = pgd_base[USER_PTRS_PER_PGD];
++		/*
++		 * Permanent kmaps:
++		 */
++		vaddr = PKMAP_BASE;
++		fixrange_init(vaddr, vaddr + PAGE_SIZE*LAST_PKMAP, pgd_base);
++
++		pgd = swapper_pg_dir + pgd_index(vaddr);
++		pmd = pmd_offset(pgd, vaddr);
++		pte = pte_offset_kernel(pmd, vaddr);
++		pkmap_page_table = pte;
++	}
+ #endif
+ }
+ 
+-void zap_low_mappings (void)
++/*
++ * Clear kernel pagetables in a PMD_SIZE-aligned range.
++ */
++static void clear_mappings(pgd_t *pgd_base, unsigned long start, unsigned long end)
+ {
+-	int i;
++	unsigned long vaddr;
++	pgd_t *pgd;
++	pmd_t *pmd;
++	int i, j;
++
++	pgd = pgd_base;
++
++	for (i = 0; i < PTRS_PER_PGD; pgd++, i++) {
++		vaddr = i*PGDIR_SIZE;
++		if (end && (vaddr >= end))
++			break;
++		pmd = pmd_offset(pgd, 0);
++		for (j = 0; j < PTRS_PER_PMD; pmd++, j++) {
++			vaddr = i*PGDIR_SIZE + j*PMD_SIZE;
++			if (end && (vaddr >= end))
++				break;
++			if (vaddr < start)
++				continue;
++			pmd_clear(pmd);
++		}
++	}
++	flush_tlb_all();
++}
++
++void __init zap_low_mappings(void)
++{
++	printk("zapping low mappings.\n");
+ 	/*
+ 	 * Zap initial low-memory mappings.
+-	 *
+-	 * Note that "pgd_clear()" doesn't do it for
+-	 * us, because pgd_clear() is a no-op on i386.
+ 	 */
+-	for (i = 0; i < USER_PTRS_PER_PGD; i++)
+-#ifdef CONFIG_X86_PAE
+-		set_pgd(swapper_pg_dir+i, __pgd(1 + __pa(empty_zero_page)));
+-#else
+-		set_pgd(swapper_pg_dir+i, __pgd(0));
+-#endif
+-	flush_tlb_all();
++	clear_mappings(swapper_pg_dir, 0, 16*1024*1024);
+ }
+ 
+ #ifndef CONFIG_DISCONTIGMEM
+@@ -424,6 +427,7 @@ extern void set_max_mapnr_init(void);
+ #endif /* !CONFIG_DISCONTIGMEM */
+ 
+ static struct kcore_list kcore_mem, kcore_vmalloc; 
++extern void fixup_sort_exception_table(void);
+ 
+ void __init mem_init(void)
+ {
+@@ -432,6 +436,8 @@ void __init mem_init(void)
+ 	int tmp;
+ 	int bad_ppro;
+ 
++	fixup_sort_exception_table();
++
+ #ifndef CONFIG_DISCONTIGMEM
+ 	if (!mem_map)
+ 		BUG();
+@@ -507,13 +513,18 @@ void __init mem_init(void)
+ #ifndef CONFIG_SMP
+ 	zap_low_mappings();
+ #endif
++	entry_trampoline_setup();
++	default_ldt_page = virt_to_page(default_ldt);
++	load_LDT(&init_mm.context);
+ }
+ 
+-kmem_cache_t *pgd_cache;
+-kmem_cache_t *pmd_cache;
++kmem_cache_t *pgd_cache, *pmd_cache, *kpmd_cache;
+ 
+ void __init pgtable_cache_init(void)
+ {
++	void (*ctor)(void *, kmem_cache_t *, unsigned long);
++	void (*dtor)(void *, kmem_cache_t *, unsigned long);
++
+ 	if (PTRS_PER_PMD > 1) {
+ 		pmd_cache = kmem_cache_create("pmd",
+ 					PTRS_PER_PMD*sizeof(pmd_t),
+@@ -523,13 +534,36 @@ void __init pgtable_cache_init(void)
+ 					NULL);
+ 		if (!pmd_cache)
+ 			panic("pgtable_cache_init(): cannot create pmd cache");
++
++		if (TASK_SIZE > PAGE_OFFSET) {
++			kpmd_cache = kmem_cache_create("kpmd",
++					PTRS_PER_PMD*sizeof(pmd_t),
++					0,
++					SLAB_HWCACHE_ALIGN | SLAB_MUST_HWCACHE_ALIGN,
++					kpmd_ctor,
++					NULL);
++			if (!kpmd_cache)
++				panic("pgtable_cache_init(): "
++						"cannot create kpmd cache");
++		}
+ 	}
++
++	if (PTRS_PER_PMD == 1 || TASK_SIZE <= PAGE_OFFSET)
++		ctor = pgd_ctor;
++	else
++		ctor = NULL;
++
++	if (PTRS_PER_PMD == 1 && TASK_SIZE <= PAGE_OFFSET)
++		dtor = pgd_dtor;
++	else
++		dtor = NULL;
++
+ 	pgd_cache = kmem_cache_create("pgd",
+ 				PTRS_PER_PGD*sizeof(pgd_t),
+ 				0,
+ 				SLAB_HWCACHE_ALIGN | SLAB_MUST_HWCACHE_ALIGN,
+-				pgd_ctor,
+-				PTRS_PER_PMD == 1 ? pgd_dtor : NULL);
++				ctor,
++				dtor);
+ 	if (!pgd_cache)
+ 		panic("pgtable_cache_init(): Cannot create pgd cache");
+ }
+--- linux-2.6.0-test6/arch/i386/mm/ioremap.c	2003-06-14 12:18:04.000000000 -0700
++++ 25/arch/i386/mm/ioremap.c	2003-10-05 00:33:23.000000000 -0700
+@@ -158,7 +158,7 @@ void * __ioremap(unsigned long phys_addr
+ 		return NULL;
+ 	area->phys_addr = phys_addr;
+ 	addr = area->addr;
+-	if (remap_area_pages(VMALLOC_VMADDR(addr), phys_addr, size, flags)) {
++	if (remap_area_pages((unsigned long) addr, phys_addr, size, flags)) {
+ 		vunmap(addr);
+ 		return NULL;
+ 	}
+--- linux-2.6.0-test6/arch/i386/mm/pgtable.c	2003-08-08 22:55:10.000000000 -0700
++++ 25/arch/i386/mm/pgtable.c	2003-10-05 00:36:48.000000000 -0700
+@@ -21,6 +21,7 @@
+ #include <asm/e820.h>
+ #include <asm/tlb.h>
+ #include <asm/tlbflush.h>
++#include <asm/atomic_kmap.h>
+ 
+ void show_mem(void)
+ {
+@@ -157,11 +158,20 @@ void pmd_ctor(void *pmd, kmem_cache_t *c
+ 	memset(pmd, 0, PTRS_PER_PMD*sizeof(pmd_t));
+ }
+ 
++void kpmd_ctor(void *__pmd, kmem_cache_t *cache, unsigned long flags)
++{
++	pmd_t *kpmd, *pmd;
++	kpmd = pmd_offset(&swapper_pg_dir[PTRS_PER_PGD-1],
++				(PTRS_PER_PMD - NR_SHARED_PMDS)*PMD_SIZE);
++	pmd = (pmd_t *)__pmd + (PTRS_PER_PMD - NR_SHARED_PMDS);
++
++	memset(__pmd, 0, (PTRS_PER_PMD - NR_SHARED_PMDS)*sizeof(pmd_t));
++	memcpy(pmd, kpmd, NR_SHARED_PMDS*sizeof(pmd_t));
++}
++
+ /*
+- * List of all pgd's needed for non-PAE so it can invalidate entries
+- * in both cached and uncached pgd's; not needed for PAE since the
+- * kernel pmd is shared. If PAE were not to share the pmd a similar
+- * tactic would be needed. This is essentially codepath-based locking
++ * List of all pgd's needed so it can invalidate entries in both cached
++ * and uncached pgd's. This is essentially codepath-based locking
+  * against pageattr.c; it is the unique case in which a valid change
+  * of kernel pagetables can't be lazily synchronized by vmalloc faults.
+  * vmalloc faults work because attached pagetables are never freed.
+@@ -170,30 +180,60 @@ void pmd_ctor(void *pmd, kmem_cache_t *c
+  * could be used. The locking scheme was chosen on the basis of
+  * manfred's recommendations and having no core impact whatsoever.
+  * -- wli
++ *
++ * The entire issue goes away when XKVA is configured.
+  */
+ spinlock_t pgd_lock = SPIN_LOCK_UNLOCKED;
+ LIST_HEAD(pgd_list);
+ 
+-void pgd_ctor(void *pgd, kmem_cache_t *cache, unsigned long unused)
++/*
++ * This is not that hard to figure out.
++ * (a) PTRS_PER_PMD == 1 means non-PAE.
++ * (b) PTRS_PER_PMD > 1 means PAE.
++ * (c) TASK_SIZE > PAGE_OFFSET means XKVA.
++ * (d) TASK_SIZE <= PAGE_OFFSET means non-XKVA.
++ *
++ * Do *NOT* back out the preconstruction like the patch I'm cleaning
++ * up after this very instant did, or at all, for that matter.
++ * This is never called when PTRS_PER_PMD > 1 && TASK_SIZE > PAGE_OFFSET.
++ * -- wli
++ */
++void pgd_ctor(void *__pgd, kmem_cache_t *cache, unsigned long unused)
+ {
++	pgd_t *pgd = (pgd_t *)__pgd;
+ 	unsigned long flags;
+ 
+-	if (PTRS_PER_PMD == 1)
+-		spin_lock_irqsave(&pgd_lock, flags);
++	if (PTRS_PER_PMD == 1) {
++		if (TASK_SIZE <= PAGE_OFFSET)
++			spin_lock_irqsave(&pgd_lock, flags);
++		else
++ 			memcpy(&pgd[PTRS_PER_PGD - NR_SHARED_PMDS],
++ 				&swapper_pg_dir[PTRS_PER_PGD - NR_SHARED_PMDS],
++ 				NR_SHARED_PMDS * sizeof(pgd_t));
++	}
+ 
+-	memcpy((pgd_t *)pgd + USER_PTRS_PER_PGD,
+-			swapper_pg_dir + USER_PTRS_PER_PGD,
+-			(PTRS_PER_PGD - USER_PTRS_PER_PGD) * sizeof(pgd_t));
++	if (TASK_SIZE <= PAGE_OFFSET)
++ 		memcpy(pgd + USER_PTRS_PER_PGD,
++ 			swapper_pg_dir + USER_PTRS_PER_PGD,
++ 			(PTRS_PER_PGD - USER_PTRS_PER_PGD) * sizeof(pgd_t));
+ 
+ 	if (PTRS_PER_PMD > 1)
+ 		return;
+ 
+-	list_add(&virt_to_page(pgd)->lru, &pgd_list);
+-	spin_unlock_irqrestore(&pgd_lock, flags);
+-	memset(pgd, 0, USER_PTRS_PER_PGD*sizeof(pgd_t));
++	if (TASK_SIZE > PAGE_OFFSET)
++		memset(pgd, 0, (PTRS_PER_PGD - NR_SHARED_PMDS)*sizeof(pgd_t));
++	else {
++		list_add(&virt_to_page(pgd)->lru, &pgd_list);
++		spin_unlock_irqrestore(&pgd_lock, flags);
++		memset(pgd, 0, USER_PTRS_PER_PGD*sizeof(pgd_t));
++	}
+ }
+ 
+-/* never called when PTRS_PER_PMD > 1 */
++/*
++ * Never called when PTRS_PER_PMD > 1 || TASK_SIZE > PAGE_OFFSET
++ * for with PAE we would list_del() multiple times, and for non-PAE
++ * with XKVA all the AGP pgd shootdown code is unnecessary.
++ */
+ void pgd_dtor(void *pgd, kmem_cache_t *cache, unsigned long unused)
+ {
+ 	unsigned long flags; /* can be called from interrupt context */
+@@ -203,6 +243,12 @@ void pgd_dtor(void *pgd, kmem_cache_t *c
+ 	spin_unlock_irqrestore(&pgd_lock, flags);
+ }
+ 
++/*
++ * See the comments above pgd_ctor() wrt. preconstruction.
++ * Do *NOT* memcpy() here. If you do, you back out important
++ * anti- cache pollution code.
++ *
++ */
+ pgd_t *pgd_alloc(struct mm_struct *mm)
+ {
+ 	int i;
+@@ -211,15 +257,33 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
+ 	if (PTRS_PER_PMD == 1 || !pgd)
+ 		return pgd;
+ 
++	/*
++	 * In the 4G userspace case alias the top 16 MB virtual
++	 * memory range into the user mappings as well (these
++	 * include the trampoline and CPU data structures).
++	 */
+ 	for (i = 0; i < USER_PTRS_PER_PGD; ++i) {
+-		pmd_t *pmd = kmem_cache_alloc(pmd_cache, GFP_KERNEL);
++		kmem_cache_t *cache;
++		pmd_t *pmd;
++
++		if (TASK_SIZE > PAGE_OFFSET && i == USER_PTRS_PER_PGD - 1)
++			cache = kpmd_cache;
++		else
++			cache = pmd_cache;
++
++		pmd = kmem_cache_alloc(cache, GFP_KERNEL);
+ 		if (!pmd)
+ 			goto out_oom;
+ 		set_pgd(&pgd[i], __pgd(1 + __pa((u64)((u32)pmd))));
+ 	}
+-	return pgd;
+ 
++	return pgd;
+ out_oom:
++	/*
++	 * we don't have to handle the kpmd_cache here, since it's the
++	 * last allocation, and has either nothing to free or when it
++	 * succeeds the whole operation succeeds.
++	 */
+ 	for (i--; i >= 0; i--)
+ 		kmem_cache_free(pmd_cache, (void *)__va(pgd_val(pgd[i])-1));
+ 	kmem_cache_free(pgd_cache, pgd);
+@@ -230,10 +294,29 @@ void pgd_free(pgd_t *pgd)
+ {
+ 	int i;
+ 
+-	/* in the PAE case user pgd entries are overwritten before usage */
+-	if (PTRS_PER_PMD > 1)
+-		for (i = 0; i < USER_PTRS_PER_PGD; ++i)
+-			kmem_cache_free(pmd_cache, (void *)__va(pgd_val(pgd[i])-1));
+ 	/* in the non-PAE case, clear_page_tables() clears user pgd entries */
++	if (PTRS_PER_PMD == 1)
++		goto out_free;
++
++	/* in the PAE case user pgd entries are overwritten before usage */
++	for (i = 0; i < USER_PTRS_PER_PGD; ++i) {
++		kmem_cache_t *cache;
++		pmd_t *pmd = __va(pgd_val(pgd[i]) - 1);
++
++		/*
++		 * only userspace pmd's are cleared for us
++		 * by mm/memory.c; it's a slab cache invariant
++		 * that we must separate the kernel pmd slab
++		 * all times, else we'll have bad pmd's.
++		 */
++		if (TASK_SIZE > PAGE_OFFSET && i == USER_PTRS_PER_PGD - 1)
++			cache = kpmd_cache;
++		else
++			cache = pmd_cache;
++
++		kmem_cache_free(cache, pmd);
++	}
++out_free:
+ 	kmem_cache_free(pgd_cache, pgd);
+ }
++
+--- linux-2.6.0-test6/arch/i386/pci/acpi.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/arch/i386/pci/acpi.c	2003-10-05 00:34:16.000000000 -0700
+@@ -15,10 +15,11 @@ struct pci_bus * __devinit pci_acpi_scan
+ 
+ static int __init pci_acpi_init(void)
+ {
++	extern int acpi_disabled;
+ 	if (pcibios_scanned)
+ 		return 0;
+ 
+-	if (!(pci_probe & PCI_NO_ACPI_ROUTING)) {
++	if (!(pci_probe & PCI_NO_ACPI_ROUTING) && !acpi_disabled) {
+ 		if (!acpi_pci_irq_init()) {
+ 			printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n");
+ 			printk(KERN_INFO "PCI: if you experience problems, try using option 'pci=noacpi' or even 'acpi=off'\n");
+--- linux-2.6.0-test6/arch/i386/pci/irq.c	2003-08-08 22:55:10.000000000 -0700
++++ 25/arch/i386/pci/irq.c	2003-10-05 00:36:20.000000000 -0700
+@@ -680,8 +680,10 @@ static int pcibios_lookup_irq(struct pci
+ 		    	if ( dev2->irq && dev2->irq != irq && \
+ 			(!(pci_probe & PCI_USE_PIRQ_MASK) || \
+ 			((1 << dev2->irq) & mask)) ) {
++#ifndef CONFIG_PCI_USE_VECTOR
+ 		    		printk(KERN_INFO "IRQ routing conflict for %s, have irq %d, want irq %d\n",
+ 				       pci_name(dev2), dev2->irq, irq);
++#endif
+ 		    		continue;
+ 		    	}
+ 			dev2->irq = irq;
+@@ -745,6 +747,10 @@ static void __init pcibios_fixup_irqs(vo
+ 							bridge->bus->number, PCI_SLOT(bridge->devfn), pin, irq);
+ 				}
+ 				if (irq >= 0) {
++					if (use_pci_vector() &&
++						!platform_legacy_irq(irq))
++						irq = IO_APIC_VECTOR(irq);
++
+ 					printk(KERN_INFO "PCI->APIC IRQ transform: (B%d,I%d,P%d) -> %d\n",
+ 						dev->bus->number, PCI_SLOT(dev->devfn), pin, irq);
+ 					dev->irq = irq;
+--- linux-2.6.0-test6/arch/ia64/ia32/ia32_ioctl.c	2003-09-08 13:58:56.000000000 -0700
++++ 25/arch/ia64/ia32/ia32_ioctl.c	2003-10-05 00:34:44.000000000 -0700
+@@ -26,43 +26,11 @@
+ 	_ret;						\
+ })
+ 
+-#define P(i)	((void *)(unsigned long)(i))
+-
+ asmlinkage long sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg);
+ 
+ #define CODE
+ #include "compat_ioctl.c"
+ 
+-#define	VFAT_IOCTL_READDIR_BOTH32	_IOR('r', 1, struct linux32_dirent[2])
+-#define	VFAT_IOCTL_READDIR_SHORT32	_IOR('r', 2, struct linux32_dirent[2])
+-
+-static long
+-put_dirent32 (struct dirent *d, struct linux32_dirent *d32)
+-{
+-	size_t namelen = strlen(d->d_name);
+-
+-	return (put_user(d->d_ino, &d32->d_ino)
+-		|| put_user(d->d_off, &d32->d_off)
+-		|| put_user(d->d_reclen, &d32->d_reclen)
+-		|| copy_to_user(d32->d_name, d->d_name, namelen + 1));
+-}
+-
+-static int vfat_ioctl32(unsigned fd, unsigned cmd,  void *ptr) 
+-{
+-	int ret;
+-	mm_segment_t oldfs = get_fs();
+-	struct dirent d[2]; 
+-
+-	set_fs(KERNEL_DS);
+-	ret = sys_ioctl(fd,cmd,(unsigned long)&d); 
+-	set_fs(oldfs); 
+-	if (!ret) { 
+-		ret |= put_dirent32(&d[0], (struct linux32_dirent *)ptr); 
+-		ret |= put_dirent32(&d[1], ((struct linux32_dirent *)ptr) + 1); 
+-	}
+-	return ret; 
+-} 
+-
+ typedef int (* ioctl32_handler_t)(unsigned int, unsigned int, unsigned long, struct file *);
+ 
+ #define COMPATIBLE_IOCTL(cmd)		HANDLE_IOCTL((cmd),sys_ioctl)
+@@ -73,8 +41,6 @@ typedef int (* ioctl32_handler_t)(unsign
+ 	};
+ 
+ IOCTL_TABLE_START
+-HANDLE_IOCTL(VFAT_IOCTL_READDIR_BOTH32, vfat_ioctl32)
+-HANDLE_IOCTL(VFAT_IOCTL_READDIR_SHORT32, vfat_ioctl32)
+ #define DECLARES
+ #include "compat_ioctl.c"
+ #include <linux/compat_ioctl.h>
+--- linux-2.6.0-test6/arch/ia64/ia32/ia32priv.h	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/ia64/ia32/ia32priv.h	2003-10-05 00:34:44.000000000 -0700
+@@ -249,13 +249,6 @@ typedef struct siginfo32 {
+ 	} _sifields;
+ } siginfo_t32;
+ 
+-struct linux32_dirent {
+-	u32	d_ino;
+-	u32	d_off;
+-	u16	d_reclen;
+-	char	d_name[256];
+-};
+-
+ struct old_linux32_dirent {
+ 	u32	d_ino;
+ 	u32	d_offset;
+--- linux-2.6.0-test6/arch/ia64/ia32/sys_ia32.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/ia64/ia32/sys_ia32.c	2003-10-05 00:34:44.000000000 -0700
+@@ -707,8 +707,8 @@ sys32_settimeofday (struct compat_timeva
+ }
+ 
+ struct getdents32_callback {
+-	struct linux32_dirent * current_dir;
+-	struct linux32_dirent * previous;
++	struct compat_dirent * current_dir;
++	struct compat_dirent * previous;
+ 	int count;
+ 	int error;
+ };
+@@ -722,7 +722,7 @@ static int
+ filldir32 (void *__buf, const char *name, int namlen, loff_t offset, ino_t ino,
+ 	   unsigned int d_type)
+ {
+-	struct linux32_dirent * dirent;
++	struct compat_dirent * dirent;
+ 	struct getdents32_callback * buf = (struct getdents32_callback *) __buf;
+ 	int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 1, 4);
+ 
+@@ -748,10 +748,10 @@ filldir32 (void *__buf, const char *name
+ }
+ 
+ asmlinkage long
+-sys32_getdents (unsigned int fd, struct linux32_dirent *dirent, unsigned int count)
++sys32_getdents (unsigned int fd, struct compat_dirent *dirent, unsigned int count)
+ {
+ 	struct file * file;
+-	struct linux32_dirent * lastdirent;
++	struct compat_dirent * lastdirent;
+ 	struct getdents32_callback buf;
+ 	int error;
+ 
+--- linux-2.6.0-test6/arch/ia64/kernel/acpi.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/ia64/kernel/acpi.c	2003-10-05 00:34:41.000000000 -0700
+@@ -41,6 +41,7 @@
+ #include <linux/irq.h>
+ #include <linux/acpi.h>
+ #include <linux/efi.h>
++#include <linux/mmzone.h>
+ #include <asm/io.h>
+ #include <asm/iosapic.h>
+ #include <asm/machvec.h>
+@@ -56,7 +57,7 @@ void (*pm_power_off) (void);
+ 
+ unsigned char acpi_kbd_controller_present = 1;
+ 
+-int acpi_disabled __initdata;	/* XXX this shouldn't be needed---we can't boot without ACPI! */
++int acpi_disabled;	/* XXX this shouldn't be needed---we can't boot without ACPI! */
+ 
+ const char *
+ acpi_get_sysname (void)
+@@ -341,7 +342,7 @@ static u32 __initdata pxm_flag[PXM_FLAG_
+ #define pxm_bit_test(bit)	(test_bit(bit,(void *)pxm_flag))
+ /* maps to convert between proximity domain and logical node ID */
+ int __initdata pxm_to_nid_map[MAX_PXM_DOMAINS];
+-int __initdata nid_to_pxm_map[NR_NODES];
++int __initdata nid_to_pxm_map[MAX_NUMNODES];
+ static struct acpi_table_slit __initdata *slit_table;
+ 
+ /*
+--- linux-2.6.0-test6/arch/ia64/kernel/perfmon.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/ia64/kernel/perfmon.c	2003-10-05 00:34:03.000000000 -0700
+@@ -2165,6 +2165,7 @@ pfm_alloc_fd(struct file **cfile)
+ 
+ 	d_add(file->f_dentry, inode);
+ 	file->f_vfsmnt = mntget(pfmfs_mnt);
++	file->f_mapping = inode->i_mapping;
+ 
+ 	file->f_op    = &pfm_file_ops;
+ 	file->f_mode  = FMODE_READ;
+--- linux-2.6.0-test6/arch/ia64/kernel/unaligned.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/arch/ia64/kernel/unaligned.c	2003-10-05 00:36:18.000000000 -0700
+@@ -1347,7 +1347,7 @@ ia64_handle_unaligned (unsigned long ifa
+ 			 * be holding locks...
+ 			 */
+ 			if (user_mode(regs))
+-				tty_write_message(current->tty, buf);
++				tty_write_message(process_tty(current), buf);
+ 			buf[len-1] = '\0';	/* drop '\r' */
+ 			printk(KERN_WARNING "%s", buf);	/* watch for command names containing %s */
+ 		}
+--- linux-2.6.0-test6/arch/ia64/mm/discontig.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/ia64/mm/discontig.c	2003-10-05 00:34:41.000000000 -0700
+@@ -14,7 +14,6 @@
+ #include <linux/mm.h>
+ #include <linux/swap.h>
+ #include <linux/bootmem.h>
+-#include <linux/mmzone.h>
+ #include <linux/acpi.h>
+ #include <linux/efi.h>
+ #include <asm/pgalloc.h>
+@@ -26,10 +25,10 @@
+  */
+ #define GRANULEROUNDUP(n) (((n)+IA64_GRANULE_SIZE-1) & ~(IA64_GRANULE_SIZE-1))
+ 
+-static struct ia64_node_data	*node_data[NR_NODES];
+-static long			boot_pg_data[8*NR_NODES+sizeof(pg_data_t)]  __initdata;
+-static pg_data_t		*pg_data_ptr[NR_NODES] __initdata;
+-static bootmem_data_t		bdata[NR_NODES][NR_BANKS_PER_NODE+1] __initdata;
++static struct ia64_node_data	*node_data[MAX_NUMNODES];
++static long			boot_pg_data[8*MAX_NUMNODES+sizeof(pg_data_t)]  __initdata;
++static pg_data_t		*pg_data_ptr[MAX_NUMNODES] __initdata;
++static bootmem_data_t		bdata[MAX_NUMNODES][NR_BANKS_PER_NODE+1] __initdata;
+ /*
+  * Return the compact node number of this cpu. Used prior to
+  * setting up the cpu_data area.
+--- linux-2.6.0-test6/arch/ia64/mm/numa.c	2003-09-08 13:58:56.000000000 -0700
++++ 25/arch/ia64/mm/numa.c	2003-10-05 00:34:41.000000000 -0700
+@@ -15,7 +15,6 @@
+ #include <linux/mm.h>
+ #include <linux/init.h>
+ #include <linux/bootmem.h>
+-#include <linux/mmzone.h>
+ #include <asm/numa.h>
+ 
+ /*
+@@ -29,7 +28,7 @@ struct node_cpuid_s node_cpuid[NR_CPUS];
+  * This is a matrix with "distances" between nodes, they should be
+  * proportional to the memory access latency ratios.
+  */
+-u8 numa_slit[NR_NODES * NR_NODES];
++u8 numa_slit[MAX_NUMNODES * MAX_NUMNODES];
+ 
+ /* Identify which cnode a physical address resides on */
+ int
+--- linux-2.6.0-test6/arch/ia64/sn/io/sn2/module.c	2003-07-10 18:50:30.000000000 -0700
++++ 25/arch/ia64/sn/io/sn2/module.c	2003-10-05 00:33:23.000000000 -0700
+@@ -166,7 +166,6 @@ int module_probe_snum(module_t *m, nasid
+ {
+     lboard_t	       *board;
+     klmod_serial_num_t *comp;
+-    char * bcopy(const char * src, char * dest, int count);
+     char serial_number[16];
+ 
+     /*
+@@ -215,9 +214,9 @@ int module_probe_snum(module_t *m, nasid
+ #endif
+ 
+ 	    if (comp->snum.snum_str[0] != '\0') {
+-		bcopy(comp->snum.snum_str,
+-		      m->sys_snum,
+-		      MAX_SERIAL_NUM_SIZE);
++		memcpy(m->sys_snum,
++		       comp->snum.snum_str,
++		       MAX_SERIAL_NUM_SIZE);
+ 		m->sys_snum_valid = 1;
+ 	    }
+     }
+--- linux-2.6.0-test6/arch/ia64/sn/io/sn2/pic.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/ia64/sn/io/sn2/pic.c	2003-10-05 00:33:23.000000000 -0700
+@@ -29,8 +29,6 @@
+ #include <asm/sn/io.h>
+ #include <asm/sn/sn_private.h>
+ 
+-extern char *bcopy(const char * src, char * dest, int count);
+-
+ 
+ #define PCI_BUS_NO_1 1
+ 
+@@ -51,7 +49,7 @@ pic_bus1_inventory_dup(vertex_hdl_t conn
+ 				(arbitrary_info_t *)&pinv) == GRAPH_SUCCESS)
+  {
+ 		NEW(peer_pinv);
+-		bcopy((const char *)pinv, (char *)peer_pinv, sizeof(inventory_t));
++		memcpy(peer_pinv, pinv, sizeof(inventory_t));
+ 		if (hwgraph_info_add_LBL(peer_conn_v, INFO_LBL_INVENT,
+ 			    (arbitrary_info_t)peer_pinv) != GRAPH_SUCCESS) {
+ 			DEL(peer_pinv);
+--- linux-2.6.0-test6/arch/m68k/atari/stram.c	2003-09-08 13:58:56.000000000 -0700
++++ 25/arch/m68k/atari/stram.c	2003-10-05 00:33:23.000000000 -0700
+@@ -22,6 +22,7 @@
+ #include <linux/shm.h>
+ #include <linux/bootmem.h>
+ #include <linux/mount.h>
++#include <linux/blkdev.h>
+ 
+ #include <asm/setup.h>
+ #include <asm/machdep.h>
+--- linux-2.6.0-test6/arch/m68k/Kconfig	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/m68k/Kconfig	2003-10-05 00:33:23.000000000 -0700
+@@ -87,7 +87,7 @@ config ATARI
+ 
+ config HADES
+ 	bool "Hades support"
+-	depends on ATARI
++	depends on ATARI && BROKEN
+ 	help
+ 	  This option enables support for the Hades Atari clone. If you plan
+ 	  to use this kernel on a Hades, say Y here; otherwise say N.
+@@ -361,7 +361,7 @@ config AMIGA_PCMCIA
+ 
+ config STRAM_SWAP
+ 	bool "Support for ST-RAM as swap space"
+-	depends on ATARI
++	depends on ATARI && BROKEN
+ 	---help---
+ 	  Some Atari 68k macines (including the 520STF and 1020STE) divide
+ 	  their addressible memory into ST and TT sections.  The TT section
+@@ -961,7 +961,7 @@ config MVME147_SCC
+ 
+ config SERIAL167
+ 	bool "CD2401 support for MVME166/7 serial ports"
+-	depends on MVME16x
++	depends on MVME16x && BROKEN
+ 	help
+ 	  This is the driver for the serial ports on the Motorola MVME166,
+ 	  167, and 172 boards.  Everyone using one of these boards should say
+--- linux-2.6.0-test6/arch/m68k/kernel/time.c	2003-07-13 21:44:34.000000000 -0700
++++ 25/arch/m68k/kernel/time.c	2003-10-05 00:33:23.000000000 -0700
+@@ -171,3 +171,12 @@ int do_settimeofday(struct timespec *tv)
+ 	write_sequnlock_irq(&xtime_lock);
+ 	return 0;
+ }
++
++/*
++ * Scheduler clock - returns current time in ns units.
++ */
++unsigned long long sched_clock(void)
++{
++       return (unsigned long long)jiffies*(1000000000/HZ);
++}
++
+--- linux-2.6.0-test6/arch/m68k/Makefile	2003-07-27 12:14:38.000000000 -0700
++++ 25/arch/m68k/Makefile	2003-10-05 00:33:23.000000000 -0700
+@@ -76,6 +76,8 @@ core-$(CONFIG_M68040)		+= arch/m68k/fpsp
+ core-$(CONFIG_M68060)		+= arch/m68k/ifpsp060/
+ core-$(CONFIG_M68KFPU_EMU)	+= arch/m68k/math-emu/
+ 
++all:	zImage
++
+ lilo:	vmlinux
+ 	if [ -f $(INSTALL_PATH)/vmlinux ]; then mv -f $(INSTALL_PATH)/vmlinux $(INSTALL_PATH)/vmlinux.old; fi
+ 	if [ -f $(INSTALL_PATH)/System.map ]; then mv -f $(INSTALL_PATH)/System.map $(INSTALL_PATH)/System.old; fi
+--- linux-2.6.0-test6/arch/m68k/q40/q40ints.c	2003-07-27 12:14:38.000000000 -0700
++++ 25/arch/m68k/q40/q40ints.c	2003-10-05 00:33:23.000000000 -0700
+@@ -200,7 +200,9 @@ void q40_free_irq(unsigned int irq, void
+ 
+ irqreturn_t q40_process_int (int level, struct pt_regs *fp)
+ {
+-  printk("unexpected interrupt %x\n",level);
++  printk("unexpected interrupt vec=%x, pc=%lx, d0=%lx, d0_orig=%lx, d1=%lx, d2=%lx\n",
++          level, fp->pc, fp->d0, fp->orig_d0, fp->d1, fp->d2);
++  printk("\tIIRQ_REG = %x, EIRQ_REG = %x\n",master_inb(IIRQ_REG),master_inb(EIRQ_REG));
+   return IRQ_HANDLED;
+ }
+ 
+@@ -378,7 +380,7 @@ irqreturn_t q40_irq2_handler (int vec, v
+ 				  /*printk("reenabling irq %d\n",irq); */
+ #endif
+ 			  }
+-// used to do 'goto repeat;' her, this delayed bh processing too long
++// used to do 'goto repeat;' here, this delayed bh processing too long
+ 			  return IRQ_HANDLED;
+ 		  }
+ 	  }
+@@ -387,6 +389,7 @@ irqreturn_t q40_irq2_handler (int vec, v
+   } 
+  iirq:
+   mir=master_inb(IIRQ_REG);
++  /* should test whether keyboard irq is really enabled, doing it in defhand */
+   if (mir&Q40_IRQ_KEYB_MASK) {
+ 	  irq_tab[Q40_IRQ_KEYBOARD].count++;
+ 	  irq_tab[Q40_IRQ_KEYBOARD].handler(Q40_IRQ_KEYBOARD,irq_tab[Q40_IRQ_KEYBOARD].dev_id,fp);
+@@ -413,7 +416,9 @@ int show_q40_interrupts (struct seq_file
+ 
+ static irqreturn_t q40_defhand (int irq, void *dev_id, struct pt_regs *fp)
+ {
+-	printk ("Unknown q40 interrupt 0x%02x\n", irq);
++        if (irq!=Q40_IRQ_KEYBOARD)
++	     printk ("Unknown q40 interrupt %d\n", irq);
++	else master_outb(-1,KEYBOARD_UNLOCK_REG);
+ 	return IRQ_NONE;
+ }
+ static irqreturn_t sys_default_handler(int lev, void *dev_id, struct pt_regs *regs)
+--- linux-2.6.0-test6/arch/m68k/sun3/config.c	2003-06-14 12:18:25.000000000 -0700
++++ 25/arch/m68k/sun3/config.c	2003-10-05 00:33:23.000000000 -0700
+@@ -129,7 +129,7 @@ void __init sun3_bootmem_alloc(unsigned 
+ 	high_memory = (void *)memory_end;
+ 	availmem = memory_start;
+ 
+-	availmem += init_bootmem(start_page, num_pages);
++	availmem += init_bootmem_node(NODE_DATA(0), start_page, 0, num_pages);
+ 	availmem = (availmem + (PAGE_SIZE-1)) & PAGE_MASK;
+ 
+ 	free_bootmem(__pa(availmem), memory_end - (availmem));
+--- linux-2.6.0-test6/arch/mips/mm/ioremap.c	2003-08-08 22:55:11.000000000 -0700
++++ 25/arch/mips/mm/ioremap.c	2003-10-05 00:33:23.000000000 -0700
+@@ -162,7 +162,7 @@ void * __ioremap(phys_t phys_addr, phys_
+ 	if (!area)
+ 		return NULL;
+ 	addr = area->addr;
+-	if (remap_area_pages(VMALLOC_VMADDR(addr), phys_addr, size, flags)) {
++	if (remap_area_pages((unsigned long) addr, phys_addr, size, flags)) {
+ 		vunmap(addr);
+ 		return NULL;
+ 	}
+--- linux-2.6.0-test6/arch/parisc/Kconfig	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/parisc/Kconfig	2003-10-05 00:33:23.000000000 -0700
+@@ -150,6 +150,7 @@ config COMPAT
+ 
+ config HPUX
+ 	bool "Support for HP-UX binaries"
++	depends on !PARISC64
+ 
+ config NR_CPUS
+ 	int "Maximum number of CPUs (2-32)"
+@@ -190,6 +191,8 @@ source drivers/message/fusion/Kconfig
+ 
+ #source drivers/message/i2o/Kconfig
+ 
++source "net/Kconfig"
++
+ #source "drivers/isdn/Kconfig"
+ 
+ #source "drivers/telephony/Kconfig"
+--- linux-2.6.0-test6/arch/parisc/kernel/asm-offsets.c	2003-06-14 12:17:58.000000000 -0700
++++ 25/arch/parisc/kernel/asm-offsets.c	2003-10-05 00:33:23.000000000 -0700
+@@ -8,6 +8,7 @@
+ #include <linux/sched.h>
+ #include <linux/thread_info.h>
+ #include <linux/version.h>
++#include <linux/ptrace.h>
+ 
+ #include <asm/ptrace.h>
+ #include <asm/processor.h>
+@@ -249,5 +250,8 @@ int main(void)
+ 	DEFINE(DTLB_OFF_COUNT, offsetof(struct pdc_cache_info, dt_off_count));
+ 	DEFINE(DTLB_LOOP, offsetof(struct pdc_cache_info, dt_loop));
+ 	BLANK();
++	DEFINE(PA_BLOCKSTEP_BIT, 31-PT_BLOCKSTEP_BIT);
++	DEFINE(PA_SINGLESTEP_BIT, 31-PT_SINGLESTEP_BIT);
++	BLANK();
+ 	return 0;
+ }
+--- linux-2.6.0-test6/arch/parisc/kernel/binfmt_elf32.c	2003-06-14 12:18:07.000000000 -0700
++++ 25/arch/parisc/kernel/binfmt_elf32.c	2003-10-05 00:33:23.000000000 -0700
+@@ -88,7 +88,9 @@ struct elf_prpsinfo32
+  */
+ 
+ #define SET_PERSONALITY(ex, ibcs2) \
+-	current->personality = PER_LINUX_32BIT
++	current->personality = PER_LINUX32; \
++	current->thread.map_base = DEFAULT_MAP_BASE32; \
++	current->thread.task_size = DEFAULT_TASK_SIZE32 \
+ 
+ #define jiffies_to_timeval jiffies_to_compat_timeval 
+ static __inline__ void
+@@ -99,3 +101,25 @@ jiffies_to_compat_timeval(unsigned long 
+ }
+ 
+ #include "../../../fs/binfmt_elf.c"
++
++/* Set up a separate execution domain for ELF32 binaries running
++ * on an ELF64 kernel */
++
++static struct exec_domain parisc32_exec_domain = { 
++	.name = "Linux/ELF32",
++	.pers_low = PER_LINUX32,
++	.pers_high = PER_LINUX32,
++};      
++
++static int __init parisc32_exec_init(void)
++{
++	/* steal the identity signal mappings from the default domain */
++	parisc32_exec_domain.signal_map = default_exec_domain.signal_map;
++	parisc32_exec_domain.signal_invmap = default_exec_domain.signal_invmap;
++
++	register_exec_domain(&parisc32_exec_domain);
++
++	return 0;
++}
++
++__initcall(parisc32_exec_init);
+--- linux-2.6.0-test6/arch/parisc/kernel/drivers.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/parisc/kernel/drivers.c	2003-10-05 00:33:23.000000000 -0700
+@@ -28,6 +28,7 @@
+ 
+ /* See comments in include/asm-parisc/pci.h */
+ struct hppa_dma_ops *hppa_dma_ops;
++EXPORT_SYMBOL(hppa_dma_ops);
+ 
+ static struct parisc_device root;
+ 
+@@ -155,6 +156,7 @@ int register_parisc_driver(struct parisc
+ 
+ 	return driver_register(&driver->drv);
+ }
++EXPORT_SYMBOL(register_parisc_driver);
+ 
+ /**
+  * count_parisc_driver - count # of devices this driver would match
+@@ -187,6 +189,7 @@ int unregister_parisc_driver(struct pari
+ 	driver_unregister(&driver->drv);
+ 	return 0;
+ }
++EXPORT_SYMBOL(unregister_parisc_driver);
+ 
+ static struct parisc_device *find_device_by_addr(unsigned long hpa)
+ {
+@@ -257,7 +260,7 @@ char *print_pa_hwpath(struct parisc_devi
+ 	path.mod = dev->hw_path;
+ 	return print_hwpath(&path, output);
+ }
+-
++EXPORT_SYMBOL(print_pa_hwpath);
+ 
+ #if defined(CONFIG_PCI) || defined(CONFIG_ISA)
+ /**
+@@ -289,6 +292,7 @@ void get_pci_node_path(struct pci_dev *d
+ 		padev = padev->parent;
+ 	}
+ }
++EXPORT_SYMBOL(get_pci_node_path);
+ 
+ /**
+  * print_pci_hwpath - Returns hardware path for PCI devices
+@@ -306,6 +310,8 @@ char *print_pci_hwpath(struct pci_dev *d
+ 	get_pci_node_path(dev, &path);
+ 	return print_hwpath(&path, output);
+ }
++EXPORT_SYMBOL(print_pci_hwpath);
++
+ #endif /* defined(CONFIG_PCI) || defined(CONFIG_ISA) */
+ 
+ 
+--- linux-2.6.0-test6/arch/parisc/kernel/entry.S	2003-06-16 22:32:20.000000000 -0700
++++ 25/arch/parisc/kernel/entry.S	2003-10-05 00:33:23.000000000 -0700
+@@ -2225,18 +2225,23 @@ syscall_exit:
+ 	LDREG     TI_TASK(%r1),%r1
+ 	STREG     %r28,TASK_PT_GR28(%r1)
+ 
+-	/* Save other hpux returns if personality is PER_HPUX */
++#ifdef CONFIG_HPUX
+ 
+ /* <linux/personality.h> cannot be easily included */
+ #define PER_HPUX 0x10
+ 	LDREG     TASK_PERSONALITY(%r1),%r19
+-#warning the ldo+CMPIB could probably be done better but 0x10 i soutside of range of CMPIB
++
++	/* We can't use "CMPIB<> PER_HPUX" since "im5" field is sign extended */
+ 	ldo	  -PER_HPUX(%r19), %r19
+ 	CMPIB<>,n 0,%r19,1f
++
++	/* Save other hpux returns if personality is PER_HPUX */
+ 	STREG     %r22,TASK_PT_GR22(%r1)
+ 	STREG     %r29,TASK_PT_GR29(%r1)
+ 1:
+ 
++#endif /* CONFIG_HPUX */
++
+ 	/* Seems to me that dp could be wrong here, if the syscall involved
+ 	 * calling a module, and nothing got round to restoring dp on return.
+ 	 */
+@@ -2315,18 +2320,16 @@ syscall_restore:
+ 	depi	3,31,2,%r31			   /* ensure return to user mode. */
+ 
+ #ifdef __LP64__
+-	/* Since we are returning to a 32 bit user process, we always
+-	 * clear the W bit. This means that the be (and mtsp) gets
+-	 * executed in narrow mode, but that is OK, since we are
+-	 * returning to a 32 bit process. When we support 64 bit processes
+-	 * we won't clear the W bit, so the be will run in wide mode.
+-	 */
+-
+-	be	0(%sr3,%r31)			   /* return to user space */
++	/* decide whether to reset the wide mode bit
++	 *
++	 * For a syscall, the W bit is stored in the lowest bit
++	 * of sp.  Extract it and reset W if it is zero */
++	extrd,u,*<>	%r30,63,1,%r1
+ 	rsm	PSW_SM_W, %r0
+-#else
+-	be,n    0(%sr3,%r31)                       /* return to user space */
++	/* now reset the lowest bit of sp if it was set */
++	xor	%r30,%r1,%r30
+ #endif
++	be,n    0(%sr3,%r31)                       /* return to user space */
+ 
+ 	/* We have to return via an RFI, so that PSW T and R bits can be set
+ 	 * appropriately.
+@@ -2340,12 +2343,19 @@ syscall_restore_rfi:
+ 	LDREG	TASK_PT_PSW(%r1),%r2		   /* Get old PSW */
+ 	ldi	0x0b,%r20			   /* Create new PSW */
+ 	depi	-1,13,1,%r20			   /* C, Q, D, and I bits */
+-	bb,>=,n	%r19,15,try_tbit		   /* PT_SINGLESTEP */
++
++	/* The values of PA_SINGLESTEP_BIT and PA_BLOCKSTEP_BIT are
++	 * set in include/linux/ptrace.h and converted to PA bitmap
++	 * numbers in asm-offsets.c */
++
++	/* if ((%r19.PA_SINGLESTEP_BIT)) { %r20.27=1} */
++	extru,=	%r19,PA_SINGLESTEP_BIT,1,%r0
+ 	depi	-1,27,1,%r20			   /* R bit */
+-try_tbit:
+-	bb,>=,n	%r19,14,psw_setup		   /* PT_BLOCKSTEP, see ptrace.c */
++
++	/* if ((%r19.PA_BLOCKSTEP_BIT)) { %r20.7=1} */
++	extru,= %r19,PA_BLOCKSTEP_BIT,1,%r0
+ 	depi	-1,7,1,%r20			   /* T bit */
+-psw_setup:
++
+ 	STREG	%r20,TASK_PT_PSW(%r1)
+ 
+ 	/* Always store space registers, since sr3 can be changed (e.g. fork) */
+--- linux-2.6.0-test6/arch/parisc/kernel/firmware.c	2003-06-14 12:17:57.000000000 -0700
++++ 25/arch/parisc/kernel/firmware.c	2003-10-05 00:33:23.000000000 -0700
+@@ -41,19 +41,20 @@
+  *					prumpf	991016	
+  */
+ 
++#include <stdarg.h>
++
++#include <linux/delay.h>
++#include <linux/init.h>
+ #include <linux/kernel.h>
++#include <linux/module.h>
+ #include <linux/string.h>
+ #include <linux/spinlock.h>
+-#include <linux/init.h>
+-#include <linux/delay.h>
+ 
+ #include <asm/page.h>
+ #include <asm/pdc.h>
+ #include <asm/system.h>
+ #include <asm/processor.h>	/* for boot_cpu_data */
+ 
+-#include <stdarg.h>
+-
+ static spinlock_t pdc_lock = SPIN_LOCK_UNLOCKED;
+ static unsigned long pdc_result[32] __attribute__ ((aligned (8)));
+ static unsigned long pdc_result2[32] __attribute__ ((aligned (8)));
+@@ -151,6 +152,7 @@ int pdc_add_valid(unsigned long address)
+ 
+         return retval;
+ }
++EXPORT_SYMBOL(pdc_add_valid);
+ 
+ /**
+  * pdc_chassis_info - Return chassis information.
+@@ -264,6 +266,7 @@ int pdc_iodc_read(unsigned long *actcnt,
+ 
+ 	return retval;
+ }
++EXPORT_SYMBOL(pdc_iodc_read);
+ 
+ /**
+  * pdc_system_map_find_mods - Locate unarchitected modules.
+@@ -518,6 +521,7 @@ int pdc_lan_station_id(char *lan_addr, u
+ 
+ 	return retval;
+ }
++EXPORT_SYMBOL(pdc_lan_station_id);
+ 
+ 
+ /**
+@@ -594,6 +598,7 @@ int pdc_get_initiator( struct hardware_p
+ 	spin_unlock_irq(&pdc_lock);
+ 	return retval >= PDC_OK;
+ }
++EXPORT_SYMBOL(pdc_get_initiator);
+ 
+ 
+ /**
+@@ -660,6 +665,7 @@ int pdc_tod_read(struct pdc_tod *tod)
+ 
+         return retval;
+ }
++EXPORT_SYMBOL(pdc_tod_read);
+ 
+ /**
+  * pdc_tod_set - Set the Time-Of-Day clock.
+@@ -678,6 +684,7 @@ int pdc_tod_set(unsigned long sec, unsig
+ 
+         return retval;
+ }
++EXPORT_SYMBOL(pdc_tod_set);
+ 
+ #ifdef __LP64__
+ int pdc_mem_mem_table(struct pdc_memory_table_raddr *r_addr,
+@@ -772,20 +779,34 @@ int pdc_soft_power_button(int sw_control
+ }
+ 
+ /*
+- * pdc_suspend_usb - Stop USB controller
++ * pdc_io_reset - Hack to avoid overlapping range registers of Bridges devices.
++ * Primarily a problem on T600 (which parisc-linux doesn't support) but
++ * who knows what other platform firmware might do with this OS "hook".
++ */
++void pdc_io_reset(void)
++{
++	spin_lock_irq(&pdc_lock);  
++	mem_pdc_call(PDC_IO, PDC_IO_RESET, 0);
++	spin_unlock_irq(&pdc_lock);
++}
++
++/*
++ * pdc_io_reset_devices - Hack to Stop USB controller
+  *
+  * If PDC used the usb controller, the usb controller
+  * is still running and will crash the machines during iommu 
+  * setup, because of still running DMA. This PDC call
+- * stops the USB controller
++ * stops the USB controller.
++ * Normally called after calling pdc_io_reset().
+  */
+-void pdc_suspend_usb(void)
++void pdc_io_reset_devices(void)
+ {
+ 	spin_lock_irq(&pdc_lock);  
+-	mem_pdc_call(PDC_IO, PDC_IO_SUSPEND_USB, 0);
++	mem_pdc_call(PDC_IO, PDC_IO_RESET_DEVICES, 0);
+ 	spin_unlock_irq(&pdc_lock);
+ }
+ 
++
+ /**
+  * pdc_iodc_putc - Console character print using IODC.
+  * @c: the character to output.
+@@ -905,6 +926,7 @@ int pdc_sti_call(unsigned long func, uns
+ 
+         return retval;
+ }
++EXPORT_SYMBOL(pdc_sti_call);
+ 
+ #ifdef __LP64__
+ /**
+--- linux-2.6.0-test6/arch/parisc/kernel/inventory.c	2003-06-14 12:17:57.000000000 -0700
++++ 25/arch/parisc/kernel/inventory.c	2003-10-05 00:33:23.000000000 -0700
+@@ -526,12 +526,14 @@ static void __init system_map_inventory(
+ 	int i;
+ 	long status = PDC_OK;
+     
++#if defined(CONFIG_IOMMU_SBA) && defined(CONFIG_SUPERIO)
+ 	/*
+-	 * first stop the usb controller, otherwise the machine
+-	 * might crash during iommu setup
++	 * Stop the suckyio usb controller on Astro based systems.
++	 * Otherwise the machine might crash during iommu setup.
+ 	 */
+-#warning We still probably need to worry about USB here, but how?
+-        /* pdc_suspend_usb(); */
++	pdc_io_reset();
++	pdc_io_reset_devices();
++#endif
+ 
+ 	for (i = 0; status != PDC_BAD_PROC && status != PDC_NE_MOD; i++) {
+ 		struct parisc_device *dev;
+--- linux-2.6.0-test6/arch/parisc/kernel/irq.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/parisc/kernel/irq.c	2003-10-05 00:33:23.000000000 -0700
+@@ -193,6 +193,7 @@ void disable_irq(int irq)
+ 	else
+ 		BUG();
+ }
++EXPORT_SYMBOL(disable_irq);
+ 
+ void enable_irq(int irq)
+ {
+@@ -208,6 +209,7 @@ void enable_irq(int irq)
+ 	else
+ 		BUG();
+ }
++EXPORT_SYMBOL(enable_irq);
+ 
+ int show_interrupts(struct seq_file *p, void *v)
+ {
+@@ -698,6 +700,7 @@ void synchronize_irq(unsigned int irqnum
+ {
+ 	while (in_irq()) ;
+ }
++EXPORT_SYMBOL(synchronize_irq);
+ #endif
+ 
+ 
+@@ -847,6 +850,7 @@ unsigned int probe_irq_mask(unsigned lon
+ {
+ 	return 0;
+ }
++EXPORT_SYMBOL(probe_irq_mask);
+ 
+ void __init init_IRQ(void)
+ {
+--- linux-2.6.0-test6/arch/parisc/kernel/module.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/parisc/kernel/module.c	2003-10-05 00:33:23.000000000 -0700
+@@ -73,10 +73,7 @@ struct got_entry {
+ 	Elf32_Addr addr;
+ };
+ 
+-struct fdesc_entry {
+-	Elf32_Addr addr;
+-	Elf32_Addr gp;
+-};
++#define Elf_Fdesc	Elf32_Fdesc
+ 
+ struct stub_entry {
+ 	Elf32_Word insns[2]; /* each stub entry has two insns */
+@@ -86,11 +83,7 @@ struct got_entry {
+ 	Elf64_Addr addr;
+ };
+ 
+-struct fdesc_entry {
+-	Elf64_Addr dummy[2];
+-	Elf64_Addr addr;
+-	Elf64_Addr gp;
+-};
++#define Elf_Fdesc	Elf64_Fdesc
+ 
+ struct stub_entry {
+ 	Elf64_Word insns[4]; /* each stub entry has four insns */
+@@ -276,7 +269,7 @@ int module_frob_arch_sections(CONST Elf_
+ 
+ 	me->core_size = ALIGN(me->core_size, 16);
+ 	me->arch.fdesc_offset = me->core_size;
+-	me->core_size += fdescs * sizeof(struct fdesc_entry);
++	me->core_size += fdescs * sizeof(Elf_Fdesc);
+ 
+ 	me->core_size = ALIGN(me->core_size, 16);
+ 	me->arch.stub_offset = me->core_size;
+@@ -322,7 +315,7 @@ static Elf64_Word get_got(struct module 
+ #ifdef __LP64__
+ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
+ {
+-	struct fdesc_entry *fdesc = me->module_core + me->arch.fdesc_offset;
++	Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
+ 
+ 	if (!value) {
+ 		printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
+@@ -664,7 +657,7 @@ int apply_relocate_add(Elf_Shdr *sechdrs
+ 				*loc64 = get_fdesc(me, val+addend);
+ 				DEBUGP("FDESC for %s at %p points to %lx\n",
+ 				       strtab + sym->st_name, *loc64,
+-				       ((struct fdesc_entry *)*loc64)->addr);
++				       ((Elf_Fdesc *)*loc64)->addr);
+ 			} else {
+ 				/* if the symbol is not local to this
+ 				 * module then val+addend is a pointer
+@@ -696,10 +689,10 @@ int module_finalize(const Elf_Ehdr *hdr,
+ 	Elf_Sym *newptr, *oldptr;
+ 	Elf_Shdr *symhdr = NULL;
+ #ifdef DEBUG
+-	struct fdesc_entry *entry;
++	Elf_Fdesc *entry;
+ 	u32 *addr;
+ 
+-	entry = (struct fdesc_entry *)me->init;
++	entry = (Elf_Fdesc *)me->init;
+ 	printk("FINALIZE, ->init FPTR is %p, GP %lx ADDR %lx\n", entry,
+ 	       entry->gp, entry->addr);
+ 	addr = (u32 *)entry->addr;
+--- linux-2.6.0-test6/arch/parisc/kernel/parisc_ksyms.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/parisc/kernel/parisc_ksyms.c	2003-10-05 00:33:23.000000000 -0700
+@@ -26,19 +26,6 @@ EXPORT_SYMBOL(strrchr);
+ EXPORT_SYMBOL(strstr);
+ EXPORT_SYMBOL(strpbrk);
+ 
+-#include <asm/hardware.h>	/* struct parisc_device for asm/pci.h */
+-#include <linux/pci.h>
+-EXPORT_SYMBOL(hppa_dma_ops);
+-#if defined(CONFIG_PCI) || defined(CONFIG_ISA)
+-EXPORT_SYMBOL(get_pci_node_path);
+-#endif
+-
+-#include <linux/sched.h>
+-#include <asm/irq.h>
+-EXPORT_SYMBOL(enable_irq);
+-EXPORT_SYMBOL(disable_irq);
+-EXPORT_SYMBOL(probe_irq_mask);
+-
+ #include <asm/processor.h>
+ EXPORT_SYMBOL(kernel_thread);
+ EXPORT_SYMBOL(boot_cpu_data);
+@@ -46,10 +33,6 @@ EXPORT_SYMBOL(boot_cpu_data);
+ #include <linux/pm.h>
+ EXPORT_SYMBOL(pm_power_off);
+ 
+-#ifdef CONFIG_SMP
+-EXPORT_SYMBOL(synchronize_irq);
+-#endif /* CONFIG_SMP */
+-
+ #include <asm/atomic.h>
+ EXPORT_SYMBOL(__xchg8);
+ EXPORT_SYMBOL(__xchg32);
+@@ -74,14 +57,6 @@ extern int $global$;
+ EXPORT_SYMBOL($global$);
+ #endif
+ 
+-EXPORT_SYMBOL(register_parisc_driver);
+-EXPORT_SYMBOL(unregister_parisc_driver);
+-EXPORT_SYMBOL(print_pci_hwpath);
+-EXPORT_SYMBOL(print_pa_hwpath);
+-EXPORT_SYMBOL(pdc_iodc_read);
+-EXPORT_SYMBOL(pdc_tod_read);
+-EXPORT_SYMBOL(pdc_tod_set);
+-
+ #include <asm/io.h>
+ EXPORT_SYMBOL(__ioremap);
+ EXPORT_SYMBOL(iounmap);
+@@ -89,22 +64,6 @@ EXPORT_SYMBOL(__memcpy_toio);
+ EXPORT_SYMBOL(__memcpy_fromio);
+ EXPORT_SYMBOL(__memset_io);
+ 
+-#if defined(CONFIG_PCI) || defined(CONFIG_ISA)
+-EXPORT_SYMBOL(inb);
+-EXPORT_SYMBOL(inw);
+-EXPORT_SYMBOL(inl);
+-EXPORT_SYMBOL(outb);
+-EXPORT_SYMBOL(outw);
+-EXPORT_SYMBOL(outl);
+-
+-EXPORT_SYMBOL(insb);
+-EXPORT_SYMBOL(insw);
+-EXPORT_SYMBOL(insl);
+-EXPORT_SYMBOL(outsb);
+-EXPORT_SYMBOL(outsw);
+-EXPORT_SYMBOL(outsl);
+-#endif
+-
+ #include <asm/cache.h>
+ EXPORT_SYMBOL(flush_kernel_dcache_range_asm);
+ EXPORT_SYMBOL(flush_kernel_dcache_page);
+@@ -130,17 +89,6 @@ EXPORT_SYMBOL(__up);
+ EXPORT_SYMBOL(__down_interruptible);
+ EXPORT_SYMBOL(__down);
+ 
+-#include <linux/in6.h>
+-#include <asm/checksum.h>
+-EXPORT_SYMBOL(csum_partial_copy_nocheck);
+-EXPORT_SYMBOL(csum_partial_copy_from_user);
+-
+-#include <asm/pdc.h>
+-EXPORT_SYMBOL(pdc_add_valid);
+-EXPORT_SYMBOL(pdc_lan_station_id);
+-EXPORT_SYMBOL(pdc_get_initiator);
+-EXPORT_SYMBOL(pdc_sti_call);
+-
+ extern void $$divI(void);
+ extern void $$divU(void);
+ extern void $$remI(void);
+@@ -218,6 +166,3 @@ EXPORT_SYMBOL(__moddi3);
+ extern void $$dyncall(void);
+ EXPORT_SYMBOL($$dyncall);
+ #endif
+-
+-#include <asm/pgtable.h>
+-EXPORT_SYMBOL(vmalloc_start);
+--- linux-2.6.0-test6/arch/parisc/kernel/pci.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/parisc/kernel/pci.c	2003-10-05 00:33:23.000000000 -0700
+@@ -88,7 +88,8 @@ u##size in##type (int addr) \
+ 	EISA_IN(size); \
+ 	if (!parisc_pci_hba[b]) return (u##size) -1; \
+ 	return pci_port->in##type(parisc_pci_hba[b], PCI_PORT_ADDR(addr)); \
+-}
++} \
++EXPORT_SYMBOL(in##type);
+ 
+ PCI_PORT_IN(b,  8)
+ PCI_PORT_IN(w, 16)
+@@ -102,7 +103,8 @@ void out##type (u##size d, int addr) \
+ 	EISA_OUT(size); \
+ 	if (!parisc_pci_hba[b]) return; \
+ 	pci_port->out##type(parisc_pci_hba[b], PCI_PORT_ADDR(addr), d); \
+-}
++} \
++EXPORT_SYMBOL(out##type);
+ 
+ PCI_PORT_OUT(b,  8)
+ PCI_PORT_OUT(w, 16)
+--- linux-2.6.0-test6/arch/parisc/kernel/ptrace.c	2003-06-14 12:17:58.000000000 -0700
++++ 25/arch/parisc/kernel/ptrace.c	2003-10-05 00:33:23.000000000 -0700
+@@ -23,16 +23,6 @@
+ #include <asm/processor.h>
+ #include <asm/offsets.h>
+ 
+-/* These are used in entry.S, syscall_restore_rfi.  We need to record the
+- * current stepping mode somewhere other than in PSW, because there is no
+- * concept of saving and restoring the users PSW over a syscall.  We choose
+- * to use these two bits in task->ptrace.  These bits must not clash with
+- * any PT_* defined in include/linux/sched.h, and must match with the bit
+- * tests in entry.S
+- */
+-#define PT_SINGLESTEP	0x10000
+-#define PT_BLOCKSTEP	0x20000
+-
+ /* PSW bits we allow the debugger to modify */
+ #define USER_PSW_BITS	(PSW_N | PSW_V | PSW_CB)
+ 
+--- linux-2.6.0-test6/arch/parisc/kernel/setup.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/parisc/kernel/setup.c	2003-10-05 00:33:23.000000000 -0700
+@@ -43,6 +43,7 @@
+ #include <asm/led.h>
+ #include <asm/machdep.h>	/* for pa7300lc_init() proto */
+ #include <asm/pdc_chassis.h>
++#include <asm/io.h>
+ 
+ #define COMMAND_LINE_SIZE 1024
+ char	saved_command_line[COMMAND_LINE_SIZE];
+@@ -208,27 +209,32 @@ static void __init parisc_proc_mkdir(voi
+                         proc_runway_root = proc_mkdir("bus/runway", 0);
+                 }
+                 break;
++	default:
++		/* FIXME: this was added to prevent the compiler 
++		 * complaining about missing pcx, pcxs and pcxt
++		 * I'm assuming they have neither gsc nor runway */
++		break;
+ 	}
+ }
+ 
+ static struct resource central_bus = {
+ 	.name	= "Central Bus",
+-	.start	= (unsigned long)0xfffffffffff80000,
+-	.end    = (unsigned long)0xfffffffffffaffff,
++	.start	= F_EXTEND(0xfff80000),
++	.end    = F_EXTEND(0xfffaffff),
+ 	.flags	= IORESOURCE_MEM,
+ };
+ 
+ static struct resource local_broadcast = {
+ 	.name	= "Local Broadcast",
+-	.start	= (unsigned long)0xfffffffffffb0000,
+-	.end	= (unsigned long)0xfffffffffffdffff,
++	.start	= F_EXTEND(0xfffb0000),
++	.end	= F_EXTEND(0xfffdffff),
+ 	.flags	= IORESOURCE_MEM,
+ };
+ 
+ static struct resource global_broadcast = {
+ 	.name	= "Global Broadcast",
+-	.start	= (unsigned long)0xfffffffffffe0000,
+-	.end	= (unsigned long)0xffffffffffffffff,
++	.start	= F_EXTEND(0xfffe0000),
++	.end	= F_EXTEND(0xffffffff),
+ 	.flags	= IORESOURCE_MEM,
+ };
+ 
+--- linux-2.6.0-test6/arch/parisc/kernel/signal.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/parisc/kernel/signal.c	2003-10-05 00:33:23.000000000 -0700
+@@ -25,6 +25,8 @@
+ #include <linux/unistd.h>
+ #include <linux/stddef.h>
+ #include <linux/compat.h>
++#include <linux/elf.h>
++#include <linux/personality.h>
+ #include <asm/ucontext.h>
+ #include <asm/rt_sigframe.h>
+ #include <asm/uaccess.h>
+@@ -41,8 +43,11 @@
+ 
+ #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
+ 
+-/* Use this to get at 32-bit user passed pointers. 
+- *    See sys_sparc32.c for description about these. */
++/* gcc will complain if a pointer is cast to an integer of different
++ * size.  If you really need to do this (and we do for an ELF32 user
++ * application in an ELF64 kernel) then you have to do a cast to an
++ * integer of the same size first.  The A() macro accomplishes
++ * this. */
+ #define A(__x)	((unsigned long)(__x))
+ 
+ int do_signal(sigset_t *oldset, struct pt_regs *regs, int in_syscall);
+@@ -166,11 +171,17 @@ sys_rt_sigreturn(struct pt_regs *regs, i
+ 	struct rt_sigframe *frame;
+ 	struct siginfo si;
+ 	sigset_t set;
+-	unsigned long usp = regs->gr[30];
++	unsigned long usp = (regs->gr[30] & ~(0x01UL));
++	unsigned long sigframe_size = PARISC_RT_SIGFRAME_SIZE;
++#ifdef __LP64__
++	if(personality(current->personality) == PER_LINUX32)
++		sigframe_size = PARISC_RT_SIGFRAME_SIZE32;
++#endif
++
+ 
+ 	/* Unwind the user stack to get the rt_sigframe structure. */
+ 	frame = (struct rt_sigframe *)
+-		(usp - PARISC_RT_SIGFRAME_SIZE);
++		(usp - sigframe_size);
+ 	DBG(("in sys_rt_sigreturn, frame is %p\n", frame));
+ 
+ 	if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))
+@@ -271,11 +282,12 @@ setup_rt_frame(int sig, struct k_sigacti
+ 	       sigset_t *set, struct pt_regs *regs, int in_syscall)
+ {
+ 	struct rt_sigframe *frame;
+-	unsigned long rp, usp, haddr;
++	unsigned long rp, usp;
++	unsigned long haddr, sigframe_size;
+ 	struct siginfo si;
+ 	int err = 0;
+ 
+-	usp = regs->gr[30];
++	usp = (regs->gr[30] & ~(0x01UL));
+ 	frame = get_sigframe(ka, usp, sizeof(*frame));
+ 
+ 	DBG(("setup_rt_frame 1: frame %p info %p\n", frame, info));
+@@ -308,64 +320,86 @@ setup_rt_frame(int sig, struct k_sigacti
+ 	}
+ #endif
+ 
+-#undef CACHE_FLUSHING_IS_NOT_BROKEN
+-#ifdef CACHE_FLUSHING_IS_NOT_BROKEN
++	flush_user_dcache_range((unsigned long) &frame->tramp[0],
++			   (unsigned long) &frame->tramp[4]);
+ 	flush_user_icache_range((unsigned long) &frame->tramp[0],
+ 			   (unsigned long) &frame->tramp[4]);
+-#else
+-	/* It should *always* be cache line-aligned, but the compiler
+-	sometimes screws up. */
+-	asm volatile("fdc 0(%%sr3,%0)\n\t"
+-		     "fdc %1(%%sr3,%0)\n\t"
+-		     "sync\n\t"
+-		     "fic 0(%%sr3,%0)\n\t"
+-		     "fic %1(%%sr3,%0)\n\t"
+-		     "sync\n\t"
+-		      : : "r" (frame->tramp), "r" (L1_CACHE_BYTES));
+-#endif
+ 
+ 	rp = (unsigned long) frame->tramp;
+ 
+ 	if (err)
+ 		goto give_sigsegv;
+ 
+-/* Much more has to happen with signals than this -- but it'll at least */
+-/* provide a pointer to some places which definitely need a look. */
+-#define HACK u32
+-
+-	haddr = (HACK)A(ka->sa.sa_handler);
+-	/* ARGH!  Fucking brain damage.  You don't want to know. */
+-	if (haddr & 2) {
+-		HACK *plabel;
+-		HACK ltp;
+-
+-		plabel = (HACK *) (haddr & ~3);
+-		err |= __get_user(haddr, plabel);
+-		err |= __get_user(ltp, plabel + 1);
++	haddr = A(ka->sa.sa_handler);
++	/* The sa_handler may be a pointer to a function descriptor */
++#ifdef __LP64__
++	if(personality(current->personality) == PER_LINUX32) {
++#endif
++		if (haddr & PA_PLABEL_FDESC) {
++			Elf32_Fdesc fdesc;
++			Elf32_Fdesc *ufdesc = (Elf32_Fdesc *)A(haddr & ~3);
++
++			err = __copy_from_user(&fdesc, ufdesc, sizeof(fdesc));
++
++			if (err)
++				goto give_sigsegv;
++
++			haddr = fdesc.addr;
++			regs->gr[19] = fdesc.gp;
++		}
++#ifdef __LP64__
++	} else {
++		Elf64_Fdesc fdesc;
++		Elf64_Fdesc *ufdesc = (Elf64_Fdesc *)A(haddr & ~3);
++		
++		err = __copy_from_user(&fdesc, ufdesc, sizeof(fdesc));
++		
+ 		if (err)
+ 			goto give_sigsegv;
+-		regs->gr[19] = ltp;
++		
++		haddr = fdesc.addr;
++		regs->gr[19] = fdesc.gp;
++		DBG(("64 bit signal, exe=%#lx, r19=%#lx, in_syscall=%d\n",
++		     haddr, regs->gr[19], in_syscall));
+ 	}
++#endif
+ 
+ 	/* The syscall return path will create IAOQ values from r31.
+ 	 */
+-	if (in_syscall)
+-		regs->gr[31] = (HACK) haddr;
+-	else {
+-		regs->gr[0] = USER_PSW;
+-		regs->iaoq[0] = (HACK) haddr | 3;
++	sigframe_size = PARISC_RT_SIGFRAME_SIZE;
++#ifdef __LP64__
++	if(personality(current->personality) == PER_LINUX32)
++		sigframe_size = PARISC_RT_SIGFRAME_SIZE32;
++#endif
++	if (in_syscall) {
++		regs->gr[31] = haddr;
++#ifdef __LP64__
++		if(personality(current->personality) == PER_LINUX)
++			sigframe_size |= 1;
++#endif
++	} else {
++		unsigned long psw = USER_PSW;
++#ifdef __LP64__
++		if(personality(current->personality) == PER_LINUX)
++			psw |= PSW_W;
++#endif
++
++		regs->gr[0] = psw;
++		regs->iaoq[0] = haddr | 3;
+ 		regs->iaoq[1] = regs->iaoq[0] + 4;
+ 	}
+ 
+ 	regs->gr[2]  = rp;                /* userland return pointer */
+ 	regs->gr[26] = sig;               /* signal number */
+-	regs->gr[25] = (HACK)A(&frame->info); /* siginfo pointer */
+-	regs->gr[24] = (HACK)A(&frame->uc);   /* ucontext pointer */
++	regs->gr[25] = A(&frame->info); /* siginfo pointer */
++	regs->gr[24] = A(&frame->uc);   /* ucontext pointer */
++	
+ 	DBG(("making sigreturn frame: %#lx + %#x = %#lx\n",
+-	       regs->gr[30], PARISC_RT_SIGFRAME_SIZE,
+-	       regs->gr[30] + PARISC_RT_SIGFRAME_SIZE));
++	       regs->gr[30], sigframe_size,
++	       regs->gr[30] + sigframe_size));
+ 	/* Raise the user stack pointer to make a proper call frame. */
+-	regs->gr[30] = ((HACK)A(frame) + PARISC_RT_SIGFRAME_SIZE);
++	regs->gr[30] = (A(frame) + sigframe_size);
++
+ 
+ 	DBG(("SIG deliver (%s:%d): frame=0x%p sp=%#lx iaoq=%#lx/%#lx rp=%#lx\n",
+ 	       current->comm, current->pid, frame, regs->gr[30],
+--- linux-2.6.0-test6/arch/parisc/kernel/syscall.S	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/parisc/kernel/syscall.S	2003-10-05 00:33:23.000000000 -0700
+@@ -69,9 +69,14 @@ linux_gateway_entry:
+ 	 * exit from the syscall, and also use that value to know
+ 	 * whether to do narrow or wide syscalls. -PB
+ 	 */
+-	ssm	PSW_SM_W, %r0
++	ssm	PSW_SM_W, %r1
++	extrd,u	%r1,PSW_W_BIT,1,%r1
++	/* sp must be aligned on 4, so deposit the W bit setting into
++	 * the bottom of sp temporarily */
++	or,ev	%r1,%r30,%r30
++	b,n	1f
+ 	/* The top halves of argument registers must be cleared on syscall
+-	 * entry.
++	 * entry from narrow executable.
+ 	 */
+ 	depdi	0, 31, 32, %r26
+ 	depdi	0, 31, 32, %r25
+@@ -79,11 +84,13 @@ linux_gateway_entry:
+ 	depdi	0, 31, 32, %r23
+ 	depdi	0, 31, 32, %r22
+ 	depdi	0, 31, 32, %r21
++1:	
+ #endif
+ 	mfctl   %cr30,%r1
+ 	xor     %r1,%r30,%r30                   /* ye olde xor trick */
+ 	xor     %r1,%r30,%r1
+ 	xor     %r1,%r30,%r30
++	
+ 	ldo     THREAD_SZ_ALGN+FRAME_SIZE(%r30),%r30  /* set up kernel stack */
+ 
+ 	/* N.B.: It is critical that we don't set sr7 to 0 until r30
+@@ -104,9 +111,19 @@ linux_gateway_entry:
+ 	   PSW value is stored.  This is needed for gdb and sys_ptrace. */
+ 	STREG	%r0,  TASK_PT_PSW(%r1)
+ 	STREG	%r2,  TASK_PT_GR2(%r1)		/* preserve rp */
++	STREG	%r19, TASK_PT_GR19(%r1)
++
+ 	LDREGM	-FRAME_SIZE(%r30), %r2		/* get users sp back */
++#ifdef __LP64__
++	extrd,u	%r2,63,1,%r19			/* W hidden in bottom bit */
++#if 0
++	xor	%r19,%r2,%r2			/* clear bottom bit */
++	depd,z	%r19,1,1,%r19
++	std	%r19,TASK_PT_PSW(%r1)
++#endif
++#endif
+ 	STREG	%r2,  TASK_PT_GR30(%r1)		/* ... and save it */
+-	STREG	%r19, TASK_PT_GR19(%r1)
++	
+ 	STREG	%r20, TASK_PT_GR20(%r1)
+ 	STREG	%r21, TASK_PT_GR21(%r1)
+ 	STREG	%r22, TASK_PT_GR22(%r1)
+@@ -130,6 +147,7 @@ linux_gateway_entry:
+ 
+ #ifdef __LP64__
+ 	ldo	-16(%r30),%r29			/* Reference param save area */
++	copy	%r19,%r2			/* W bit back to r2 */
+ #else
+ 	/* no need to save these on stack in wide mode because the first 8
+ 	 * args are passed in registers */
+@@ -144,9 +162,17 @@ linux_gateway_entry:
+ 	/* Note!  We cannot use the syscall table that is mapped
+ 	nearby since the gateway page is mapped execute-only. */
+ 
++#ifdef __LP64__
++	ldil	L%sys_call_table, %r1
++	or,=	%r2,%r2,%r2
++	addil	L%(sys_call_table64-sys_call_table), %r1
++	ldo	R%sys_call_table(%r1), %r19
++	or,=	%r2,%r2,%r2
++	ldo	R%sys_call_table64(%r1), %r19
++#else
+ 	ldil	L%sys_call_table, %r1
+ 	ldo     R%sys_call_table(%r1), %r19
+-	
++#endif	
+ 	comiclr,>>=	__NR_Linux_syscalls, %r20, %r0
+ 	b,n	.Lsyscall_nosys
+ 	
+@@ -317,304 +343,21 @@ tracesys_sigexit:
+ 	ldil	L%syscall_exit_rfi,%r1
+ 	be,n	R%syscall_exit_rfi(%sr7,%r1)
+ 
+-#ifdef __LP64__
+-/* Use ENTRY_SAME for 32-bit syscalls which are the same on wide and
+- * narrow palinux.  Use ENTRY_DIFF for those where a 32-bit specific
+- * implementation is required on wide palinux.  Use ENTRY_COMP where
+- * the compatability layer has a useful 32-bit implementation.
+- */
+-#define ENTRY_SAME(_name_) .dword sys_##_name_
+-#define ENTRY_DIFF(_name_) .dword sys32_##_name_
+-#define ENTRY_UHOH(_name_) .dword sys32_##unimplemented
+-#define ENTRY_OURS(_name_) .dword parisc_##_name_
+-#define ENTRY_COMP(_name_) .dword compat_sys_##_name_
+-#else
+-#define ENTRY_SAME(_name_) .word sys_##_name_
+-#define ENTRY_DIFF(_name_) .word sys_##_name_
+-#define ENTRY_UHOH(_name_) .word sys_##_name_
+-#define ENTRY_OURS(_name_) .word parisc_##_name_
+-#define ENTRY_COMP(_name_) .word sys_##_name_
+-#endif
+-
+-	.align 8
++	.align 4096
+ 	.export sys_call_table
+ .Lsys_call_table:
+ sys_call_table:
+-	ENTRY_SAME(ni_syscall)	/* 0  -  old "setup()" system call*/
+-	ENTRY_SAME(exit)
+-	ENTRY_SAME(fork_wrapper)
+-	ENTRY_SAME(read)
+-	ENTRY_SAME(write)
+-	ENTRY_SAME(open)		/* 5 */
+-	ENTRY_SAME(close)
+-	ENTRY_SAME(waitpid)
+-	ENTRY_SAME(creat)
+-	ENTRY_SAME(link)
+-	ENTRY_SAME(unlink)		/* 10 */
+-	ENTRY_DIFF(execve_wrapper)
+-	ENTRY_SAME(chdir)
+-	/* See comments in kernel/time.c!!! Maybe we don't need this? */
+-	ENTRY_DIFF(time)
+-	ENTRY_SAME(mknod)
+-	ENTRY_SAME(chmod)		/* 15 */
+-	ENTRY_SAME(lchown)
+-	ENTRY_SAME(socket)
+-	/* struct stat is MAYBE identical wide and narrow ?? */
+-	ENTRY_COMP(newstat)
+-	ENTRY_DIFF(lseek)
+-	ENTRY_SAME(getpid)		/* 20 */
+-	/* the 'void * data' parameter may need re-packing in wide */
+-	ENTRY_DIFF(mount)
+-	/* concerned about struct sockaddr in wide/narrow */
+-	/* ---> I think sockaddr is OK unless the compiler packs the struct */
+-	/*      differently to align the char array */
+-	ENTRY_SAME(bind)
+-	ENTRY_SAME(setuid)
+-	ENTRY_SAME(getuid)
+-	ENTRY_SAME(stime)		/* 25 */
+-	ENTRY_SAME(ptrace)
+-	ENTRY_SAME(alarm)
+-	/* see stat comment */
+-	ENTRY_COMP(newfstat)
+-	ENTRY_SAME(pause)
+-	/* struct utimbuf uses time_t which might vary */
+-	ENTRY_COMP(utime)		/* 30 */
+-	/* struct sockaddr... */
+-	ENTRY_SAME(connect)
+-	ENTRY_SAME(listen)
+-	ENTRY_SAME(access)
+-	ENTRY_SAME(nice)
+-	/* struct sockaddr... */
+-	ENTRY_SAME(accept)		/* 35 */
+-	ENTRY_SAME(sync)
+-	ENTRY_SAME(kill)
+-	ENTRY_SAME(rename)
+-	ENTRY_SAME(mkdir)
+-	ENTRY_SAME(rmdir)		/* 40 */
+-	ENTRY_SAME(dup)
+-	ENTRY_SAME(pipe)
+-	ENTRY_COMP(times)
+-	/* struct sockaddr... */
+-	ENTRY_SAME(getsockname)
+-	/* it seems possible brk() could return a >4G pointer... */
+-	ENTRY_SAME(brk)			/* 45 */
+-	ENTRY_SAME(setgid)
+-	ENTRY_SAME(getgid)
+-	ENTRY_SAME(signal)
+-	ENTRY_SAME(geteuid)
+-	ENTRY_SAME(getegid)		/* 50 */
+-	ENTRY_SAME(acct)
+-	ENTRY_SAME(umount)
+-	/* struct sockaddr... */
+-	ENTRY_SAME(getpeername)
+-	ENTRY_COMP(ioctl)
+-	ENTRY_COMP(fcntl)		/* 55 */
+-	ENTRY_SAME(socketpair)
+-	ENTRY_SAME(setpgid)
+-	ENTRY_SAME(send)
+-	ENTRY_SAME(newuname)
+-	ENTRY_SAME(umask)		/* 60 */
+-	ENTRY_SAME(chroot)
+-	ENTRY_SAME(ustat)
+-	ENTRY_SAME(dup2)
+-	ENTRY_SAME(getppid)
+-	ENTRY_SAME(getpgrp)		/* 65 */
+-	ENTRY_SAME(setsid)
+-	ENTRY_SAME(pivot_root)
+-	/* I don't like this */
+-	ENTRY_UHOH(sgetmask)
+-	ENTRY_UHOH(ssetmask)
+-	ENTRY_SAME(setreuid)		/* 70 */
+-	ENTRY_SAME(setregid)
+-	ENTRY_SAME(mincore)
+-	ENTRY_COMP(sigpending)
+-	ENTRY_SAME(sethostname)
+-	/* Following 3 have linux-common-code structs containing longs -( */
+-	ENTRY_COMP(setrlimit)		/* 75 */
+-	ENTRY_COMP(getrlimit)
+-	ENTRY_COMP(getrusage)
+-	/* struct timeval and timezone are maybe?? consistent wide and narrow */
+-	ENTRY_DIFF(gettimeofday)
+-	ENTRY_DIFF(settimeofday)
+-	ENTRY_SAME(getgroups)		/* 80 */
+-	ENTRY_SAME(setgroups)
+-	/* struct socketaddr... */
+-	ENTRY_SAME(sendto)
+-	ENTRY_SAME(symlink)
+-	/* see stat comment */
+-	ENTRY_COMP(newlstat)
+-	ENTRY_SAME(readlink)		/* 85 */
+-	ENTRY_SAME(ni_syscall)	/* was uselib */
+-	ENTRY_SAME(swapon)
+-	ENTRY_SAME(reboot)
+-	ENTRY_SAME(mmap2)
+-	ENTRY_SAME(mmap)		/* 90 */
+-	ENTRY_SAME(munmap)
+-	ENTRY_SAME(truncate)
+-	ENTRY_SAME(ftruncate)
+-	ENTRY_SAME(fchmod)
+-	ENTRY_SAME(fchown)		/* 95 */
+-	ENTRY_SAME(getpriority)
+-	ENTRY_SAME(setpriority)
+-	ENTRY_SAME(recv)
+-	ENTRY_COMP(statfs)
+-	ENTRY_COMP(fstatfs)		/* 100 */
+-	ENTRY_SAME(stat64)
+-	ENTRY_SAME(ni_syscall)	/* was socketcall */
+-	ENTRY_SAME(syslog)
+-	/* even though manpage says struct timeval contains longs, ours has
+-	 * time_t and suseconds_t -- both of which are safe wide/narrow */
+-	ENTRY_COMP(setitimer)
+-	ENTRY_COMP(getitimer)		/* 105 */
+-	ENTRY_SAME(capget)
+-	ENTRY_SAME(capset)
+-	ENTRY_OURS(pread64)
+-	ENTRY_OURS(pwrite64)
+-	ENTRY_SAME(getcwd)		/* 110 */
+-	ENTRY_SAME(vhangup)
+-	ENTRY_SAME(fstat64)
+-	ENTRY_SAME(vfork_wrapper)
+-	/* struct rusage contains longs... */
+-	ENTRY_COMP(wait4)
+-	ENTRY_SAME(swapoff)		/* 115 */
+-	ENTRY_DIFF(sysinfo)
+-	ENTRY_SAME(shutdown)
+-	ENTRY_SAME(fsync)
+-	ENTRY_SAME(madvise)
+-	ENTRY_SAME(clone_wrapper)	/* 120 */
+-	ENTRY_SAME(setdomainname)
+-	ENTRY_DIFF(sendfile)
+-	/* struct sockaddr... */
+-	ENTRY_SAME(recvfrom)
+-	/* struct timex contains longs */
+-	ENTRY_DIFF(adjtimex)
+-	ENTRY_SAME(mprotect)		/* 125 */
+-	/* old_sigset_t forced to 32 bits.  Beware glibc sigset_t */
+-	ENTRY_COMP(sigprocmask)
+-	ENTRY_SAME(ni_syscall)	/* create_module */
+-	ENTRY_SAME(init_module)
+-	ENTRY_SAME(delete_module)
+-	ENTRY_SAME(ni_syscall)		/* 130: get_kernel_syms */
+-	/* time_t inside struct dqblk */
+-	ENTRY_SAME(quotactl)
+-	ENTRY_SAME(getpgid)
+-	ENTRY_SAME(fchdir)
+-	ENTRY_SAME(bdflush)
+-	ENTRY_SAME(sysfs)		/* 135 */
+-	ENTRY_SAME(personality)
+-	ENTRY_SAME(ni_syscall)	/* for afs_syscall */
+-	ENTRY_SAME(setfsuid)
+-	ENTRY_SAME(setfsgid)
+-	/* I think this might work */
+-	ENTRY_SAME(llseek)		/* 140 */
+-	/* struct linux_dirent has longs, like 'unsigned long d_ino' which
+-	 * almost definitely should be 'ino_t d_ino' but it's too late now */
+-	ENTRY_DIFF(getdents)
+-	/* it is POSSIBLE that select will be OK because even though fd_set
+-	 * contains longs, the macros and sizes are clever. */
+-	ENTRY_DIFF(select)
+-	ENTRY_SAME(flock)
+-	ENTRY_SAME(msync)
+-	/* struct iovec contains pointers */
+-	ENTRY_DIFF(readv)		/* 145 */
+-	ENTRY_DIFF(writev)
+-	ENTRY_SAME(getsid)
+-	ENTRY_SAME(fdatasync)
+-	/* struct __sysctl_args is a mess */
+-	ENTRY_DIFF(sysctl)
+-	ENTRY_SAME(mlock)		/* 150 */
+-	ENTRY_SAME(munlock)
+-	ENTRY_SAME(mlockall)
+-	ENTRY_SAME(munlockall)
+-	/* struct sched_param is ok for now */
+-	ENTRY_SAME(sched_setparam)
+-	ENTRY_SAME(sched_getparam)	/* 155 */
+-	ENTRY_SAME(sched_setscheduler)
+-	ENTRY_SAME(sched_getscheduler)
+-	ENTRY_SAME(sched_yield)
+-	ENTRY_SAME(sched_get_priority_max)
+-	ENTRY_SAME(sched_get_priority_min)	/* 160 */
+-	/* These 2 would've worked if someone had defined struct timespec
+-	 * carefully, like timeval for example (which is about the same).
+-	 * Unfortunately it contains a long :-( */
+-	ENTRY_DIFF(sched_rr_get_interval)
+-	ENTRY_COMP(nanosleep)
+-	ENTRY_SAME(mremap)
+-	ENTRY_SAME(setresuid)
+-	ENTRY_SAME(getresuid)		/* 165 */
+-	ENTRY_DIFF(sigaltstack_wrapper)
+-	ENTRY_SAME(ni_syscall)		/* query_module */
+-	ENTRY_SAME(poll)
+-	/* structs contain pointers and an in_addr... */
+-	ENTRY_DIFF(nfsservctl)
+-	ENTRY_SAME(setresgid)		/* 170 */
+-	ENTRY_SAME(getresgid)
+-	ENTRY_SAME(prctl)
+-	/* signals need a careful review */
+-	ENTRY_SAME(rt_sigreturn_wrapper)
+-	ENTRY_DIFF(rt_sigaction)
+-	ENTRY_DIFF(rt_sigprocmask)	/* 175 */
+-	ENTRY_DIFF(rt_sigpending)
+-	ENTRY_UHOH(rt_sigtimedwait)
+-	/* even though the struct siginfo_t is different, it appears like
+-	 * all the paths use values which should be same wide and narrow.
+-	 * Also the struct is padded to 128 bytes which means we don't have
+-	 * to worry about faulting trying to copy in a larger 64-bit
+-	 * struct from a 32-bit user-space app.
+-	 */
+-	ENTRY_SAME(rt_sigqueueinfo)
+-	ENTRY_SAME(rt_sigsuspend_wrapper) /* not really SAME -- see the code */
+-	ENTRY_SAME(chown)		/* 180 */
+-	/* setsockopt() used by iptables: SO_SET_REPLACE/SO_SET_ADD_COUNTERS */
+-	ENTRY_COMP(setsockopt)
+-	ENTRY_SAME(getsockopt)
+-	ENTRY_COMP(sendmsg)
+-	ENTRY_COMP(recvmsg)
+-	ENTRY_SAME(semop)		/* 185 */
+-	ENTRY_SAME(semget)
+-	ENTRY_DIFF(semctl_broken)
+-	ENTRY_DIFF(msgsnd)
+-	ENTRY_DIFF(msgrcv)
+-	ENTRY_SAME(msgget)		/* 190 */
+-	ENTRY_SAME(msgctl_broken)
+-	ENTRY_SAME(shmat_wrapper)
+-	ENTRY_SAME(shmdt)
+-	ENTRY_SAME(shmget)
+-	ENTRY_SAME(shmctl_broken)	/* 195 */
+-	ENTRY_SAME(ni_syscall)		/* streams1 */
+-	ENTRY_SAME(ni_syscall)		/* streams2 */
+-	ENTRY_SAME(lstat64)
+-	ENTRY_OURS(truncate64)
+-	ENTRY_OURS(ftruncate64)		/* 200 */
+-	ENTRY_SAME(getdents64)
+-	ENTRY_COMP(fcntl64)
+-	ENTRY_SAME(ni_syscall)
+-	ENTRY_SAME(ni_syscall)
+-	ENTRY_SAME(ni_syscall)		/* 205 */
+-	ENTRY_SAME(gettid)             
+-	ENTRY_OURS(readahead)          
+-	ENTRY_SAME(ni_syscall)		/* tkill */
+-
+-	ENTRY_SAME(sendfile64)
+-	ENTRY_COMP(futex)		/* 210 */
+-	ENTRY_COMP(sched_setaffinity)
+-	ENTRY_COMP(sched_getaffinity)
+-	ENTRY_SAME(ni_syscall)
+-	ENTRY_SAME(ni_syscall)
+-	ENTRY_SAME(io_setup)		/* 215 */
+-	ENTRY_SAME(io_destroy)
+-	ENTRY_SAME(io_getevents)
+-	ENTRY_SAME(io_submit)
+-	ENTRY_SAME(io_cancel)
+-	ENTRY_SAME(alloc_hugepages)	/* 220 */
+-	ENTRY_SAME(free_hugepages)
+-	ENTRY_SAME(exit_group)
+-	ENTRY_DIFF(lookup_dcookie)
+-	ENTRY_SAME(epoll_create)
+-	ENTRY_SAME(epoll_ctl)		/* 225 */
+-	ENTRY_SAME(epoll_wait)
+- 	ENTRY_SAME(remap_file_pages)
++#include "syscall_table.S"
+ .end
++#ifdef __LP64__
++	.align 4096
++	.export sys_call_table64
++.Lsys_call_table64:
++sys_call_table64:
++#define SYSCALL_TABLE_64BIT
++#include "syscall_table.S"
++#endif
++
+ 
+ 	/* Make sure nothing else is placed on this page */
+ 
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/arch/parisc/kernel/syscall_table.S	2003-10-05 00:33:23.000000000 -0700
+@@ -0,0 +1,304 @@
++#undef ENTRY_SAME
++#undef ENTRY_DIFF
++#undef ENTRY_UHOH
++#undef ENTRY_COMP
++#undef ENTRY_OURS
++#if defined(__LP64__) && !defined(SYSCALL_TABLE_64BIT)
++/* Use ENTRY_SAME for 32-bit syscalls which are the same on wide and
++ * narrow palinux.  Use ENTRY_DIFF for those where a 32-bit specific
++ * implementation is required on wide palinux.  Use ENTRY_COMP where
++ * the compatability layer has a useful 32-bit implementation.
++ */
++#define ENTRY_SAME(_name_) .dword sys_##_name_
++#define ENTRY_DIFF(_name_) .dword sys32_##_name_
++#define ENTRY_UHOH(_name_) .dword sys32_##unimplemented
++#define ENTRY_OURS(_name_) .dword parisc_##_name_
++#define ENTRY_COMP(_name_) .dword compat_sys_##_name_
++#elif defined(__LP64__) && defined(SYSCALL_TABLE_64BIT)
++#define ENTRY_SAME(_name_) .dword sys_##_name_
++#define ENTRY_DIFF(_name_) .dword sys_##_name_
++#define ENTRY_UHOH(_name_) .dword sys_##_name_
++#define ENTRY_OURS(_name_) .dword sys_##_name_
++#define ENTRY_COMP(_name_) .dword sys_##_name_
++#else
++#define ENTRY_SAME(_name_) .word sys_##_name_
++#define ENTRY_DIFF(_name_) .word sys_##_name_
++#define ENTRY_UHOH(_name_) .word sys_##_name_
++#define ENTRY_OURS(_name_) .word parisc_##_name_
++#define ENTRY_COMP(_name_) .word sys_##_name_
++#endif
++
++	ENTRY_SAME(ni_syscall)	/* 0  -  old "setup()" system call*/
++	ENTRY_SAME(exit)
++	ENTRY_SAME(fork_wrapper)
++	ENTRY_SAME(read)
++	ENTRY_SAME(write)
++	ENTRY_SAME(open)		/* 5 */
++	ENTRY_SAME(close)
++	ENTRY_SAME(waitpid)
++	ENTRY_SAME(creat)
++	ENTRY_SAME(link)
++	ENTRY_SAME(unlink)		/* 10 */
++	ENTRY_DIFF(execve_wrapper)
++	ENTRY_SAME(chdir)
++	/* See comments in kernel/time.c!!! Maybe we don't need this? */
++	ENTRY_DIFF(time)
++	ENTRY_SAME(mknod)
++	ENTRY_SAME(chmod)		/* 15 */
++	ENTRY_SAME(lchown)
++	ENTRY_SAME(socket)
++	/* struct stat is MAYBE identical wide and narrow ?? */
++	ENTRY_COMP(newstat)
++	ENTRY_DIFF(lseek)
++	ENTRY_SAME(getpid)		/* 20 */
++	/* the 'void * data' parameter may need re-packing in wide */
++	ENTRY_DIFF(mount)
++	/* concerned about struct sockaddr in wide/narrow */
++	/* ---> I think sockaddr is OK unless the compiler packs the struct */
++	/*      differently to align the char array */
++	ENTRY_SAME(bind)
++	ENTRY_SAME(setuid)
++	ENTRY_SAME(getuid)
++	ENTRY_SAME(stime)		/* 25 */
++	ENTRY_SAME(ptrace)
++	ENTRY_SAME(alarm)
++	/* see stat comment */
++	ENTRY_COMP(newfstat)
++	ENTRY_SAME(pause)
++	/* struct utimbuf uses time_t which might vary */
++	ENTRY_COMP(utime)		/* 30 */
++	/* struct sockaddr... */
++	ENTRY_SAME(connect)
++	ENTRY_SAME(listen)
++	ENTRY_SAME(access)
++	ENTRY_SAME(nice)
++	/* struct sockaddr... */
++	ENTRY_SAME(accept)		/* 35 */
++	ENTRY_SAME(sync)
++	ENTRY_SAME(kill)
++	ENTRY_SAME(rename)
++	ENTRY_SAME(mkdir)
++	ENTRY_SAME(rmdir)		/* 40 */
++	ENTRY_SAME(dup)
++	ENTRY_SAME(pipe)
++	ENTRY_COMP(times)
++	/* struct sockaddr... */
++	ENTRY_SAME(getsockname)
++	/* it seems possible brk() could return a >4G pointer... */
++	ENTRY_SAME(brk)			/* 45 */
++	ENTRY_SAME(setgid)
++	ENTRY_SAME(getgid)
++	ENTRY_SAME(signal)
++	ENTRY_SAME(geteuid)
++	ENTRY_SAME(getegid)		/* 50 */
++	ENTRY_SAME(acct)
++	ENTRY_SAME(umount)
++	/* struct sockaddr... */
++	ENTRY_SAME(getpeername)
++	ENTRY_COMP(ioctl)
++	ENTRY_COMP(fcntl)		/* 55 */
++	ENTRY_SAME(socketpair)
++	ENTRY_SAME(setpgid)
++	ENTRY_SAME(send)
++	ENTRY_SAME(newuname)
++	ENTRY_SAME(umask)		/* 60 */
++	ENTRY_SAME(chroot)
++	ENTRY_SAME(ustat)
++	ENTRY_SAME(dup2)
++	ENTRY_SAME(getppid)
++	ENTRY_SAME(getpgrp)		/* 65 */
++	ENTRY_SAME(setsid)
++	ENTRY_SAME(pivot_root)
++	/* I don't like this */
++	ENTRY_UHOH(sgetmask)
++	ENTRY_UHOH(ssetmask)
++	ENTRY_SAME(setreuid)		/* 70 */
++	ENTRY_SAME(setregid)
++	ENTRY_SAME(mincore)
++	ENTRY_COMP(sigpending)
++	ENTRY_SAME(sethostname)
++	/* Following 3 have linux-common-code structs containing longs -( */
++	ENTRY_COMP(setrlimit)		/* 75 */
++	ENTRY_COMP(getrlimit)
++	ENTRY_COMP(getrusage)
++	/* struct timeval and timezone are maybe?? consistent wide and narrow */
++	ENTRY_DIFF(gettimeofday)
++	ENTRY_DIFF(settimeofday)
++	ENTRY_SAME(getgroups)		/* 80 */
++	ENTRY_SAME(setgroups)
++	/* struct socketaddr... */
++	ENTRY_SAME(sendto)
++	ENTRY_SAME(symlink)
++	/* see stat comment */
++	ENTRY_COMP(newlstat)
++	ENTRY_SAME(readlink)		/* 85 */
++	ENTRY_SAME(ni_syscall)	/* was uselib */
++	ENTRY_SAME(swapon)
++	ENTRY_SAME(reboot)
++	ENTRY_SAME(mmap2)
++	ENTRY_SAME(mmap)		/* 90 */
++	ENTRY_SAME(munmap)
++	ENTRY_SAME(truncate)
++	ENTRY_SAME(ftruncate)
++	ENTRY_SAME(fchmod)
++	ENTRY_SAME(fchown)		/* 95 */
++	ENTRY_SAME(getpriority)
++	ENTRY_SAME(setpriority)
++	ENTRY_SAME(recv)
++	ENTRY_COMP(statfs)
++	ENTRY_COMP(fstatfs)		/* 100 */
++	ENTRY_SAME(stat64)
++	ENTRY_SAME(ni_syscall)	/* was socketcall */
++	ENTRY_SAME(syslog)
++	/* even though manpage says struct timeval contains longs, ours has
++	 * time_t and suseconds_t -- both of which are safe wide/narrow */
++	ENTRY_COMP(setitimer)
++	ENTRY_COMP(getitimer)		/* 105 */
++	ENTRY_SAME(capget)
++	ENTRY_SAME(capset)
++	ENTRY_OURS(pread64)
++	ENTRY_OURS(pwrite64)
++	ENTRY_SAME(getcwd)		/* 110 */
++	ENTRY_SAME(vhangup)
++	ENTRY_SAME(fstat64)
++	ENTRY_SAME(vfork_wrapper)
++	/* struct rusage contains longs... */
++	ENTRY_COMP(wait4)
++	ENTRY_SAME(swapoff)		/* 115 */
++	ENTRY_DIFF(sysinfo)
++	ENTRY_SAME(shutdown)
++	ENTRY_SAME(fsync)
++	ENTRY_SAME(madvise)
++	ENTRY_SAME(clone_wrapper)	/* 120 */
++	ENTRY_SAME(setdomainname)
++	ENTRY_DIFF(sendfile)
++	/* struct sockaddr... */
++	ENTRY_SAME(recvfrom)
++	/* struct timex contains longs */
++	ENTRY_DIFF(adjtimex)
++	ENTRY_SAME(mprotect)		/* 125 */
++	/* old_sigset_t forced to 32 bits.  Beware glibc sigset_t */
++	ENTRY_COMP(sigprocmask)
++	ENTRY_SAME(ni_syscall)	/* create_module */
++	ENTRY_SAME(init_module)
++	ENTRY_SAME(delete_module)
++	ENTRY_SAME(ni_syscall)		/* 130: get_kernel_syms */
++	/* time_t inside struct dqblk */
++	ENTRY_SAME(quotactl)
++	ENTRY_SAME(getpgid)
++	ENTRY_SAME(fchdir)
++	ENTRY_SAME(bdflush)
++	ENTRY_SAME(sysfs)		/* 135 */
++	ENTRY_SAME(personality)
++	ENTRY_SAME(ni_syscall)	/* for afs_syscall */
++	ENTRY_SAME(setfsuid)
++	ENTRY_SAME(setfsgid)
++	/* I think this might work */
++	ENTRY_SAME(llseek)		/* 140 */
++	/* struct linux_dirent has longs, like 'unsigned long d_ino' which
++	 * almost definitely should be 'ino_t d_ino' but it's too late now */
++	ENTRY_DIFF(getdents)
++	/* it is POSSIBLE that select will be OK because even though fd_set
++	 * contains longs, the macros and sizes are clever. */
++	ENTRY_DIFF(select)
++	ENTRY_SAME(flock)
++	ENTRY_SAME(msync)
++	/* struct iovec contains pointers */
++	ENTRY_DIFF(readv)		/* 145 */
++	ENTRY_DIFF(writev)
++	ENTRY_SAME(getsid)
++	ENTRY_SAME(fdatasync)
++	/* struct __sysctl_args is a mess */
++	ENTRY_DIFF(sysctl)
++	ENTRY_SAME(mlock)		/* 150 */
++	ENTRY_SAME(munlock)
++	ENTRY_SAME(mlockall)
++	ENTRY_SAME(munlockall)
++	/* struct sched_param is ok for now */
++	ENTRY_SAME(sched_setparam)
++	ENTRY_SAME(sched_getparam)	/* 155 */
++	ENTRY_SAME(sched_setscheduler)
++	ENTRY_SAME(sched_getscheduler)
++	ENTRY_SAME(sched_yield)
++	ENTRY_SAME(sched_get_priority_max)
++	ENTRY_SAME(sched_get_priority_min)	/* 160 */
++	/* These 2 would've worked if someone had defined struct timespec
++	 * carefully, like timeval for example (which is about the same).
++	 * Unfortunately it contains a long :-( */
++	ENTRY_DIFF(sched_rr_get_interval)
++	ENTRY_COMP(nanosleep)
++	ENTRY_SAME(mremap)
++	ENTRY_SAME(setresuid)
++	ENTRY_SAME(getresuid)		/* 165 */
++	ENTRY_DIFF(sigaltstack_wrapper)
++	ENTRY_SAME(ni_syscall)		/* query_module */
++	ENTRY_SAME(poll)
++	/* structs contain pointers and an in_addr... */
++	ENTRY_DIFF(nfsservctl)
++	ENTRY_SAME(setresgid)		/* 170 */
++	ENTRY_SAME(getresgid)
++	ENTRY_SAME(prctl)
++	/* signals need a careful review */
++	ENTRY_SAME(rt_sigreturn_wrapper)
++	ENTRY_DIFF(rt_sigaction)
++	ENTRY_DIFF(rt_sigprocmask)	/* 175 */
++	ENTRY_DIFF(rt_sigpending)
++	ENTRY_UHOH(rt_sigtimedwait)
++	/* even though the struct siginfo_t is different, it appears like
++	 * all the paths use values which should be same wide and narrow.
++	 * Also the struct is padded to 128 bytes which means we don't have
++	 * to worry about faulting trying to copy in a larger 64-bit
++	 * struct from a 32-bit user-space app.
++	 */
++	ENTRY_SAME(rt_sigqueueinfo)
++	ENTRY_SAME(rt_sigsuspend_wrapper) /* not really SAME -- see the code */
++	ENTRY_SAME(chown)		/* 180 */
++	/* setsockopt() used by iptables: SO_SET_REPLACE/SO_SET_ADD_COUNTERS */
++	ENTRY_COMP(setsockopt)
++	ENTRY_SAME(getsockopt)
++	ENTRY_COMP(sendmsg)
++	ENTRY_COMP(recvmsg)
++	ENTRY_SAME(semop)		/* 185 */
++	ENTRY_SAME(semget)
++	ENTRY_DIFF(semctl_broken)
++	ENTRY_DIFF(msgsnd)
++	ENTRY_DIFF(msgrcv)
++	ENTRY_SAME(msgget)		/* 190 */
++	ENTRY_SAME(msgctl_broken)
++	ENTRY_SAME(shmat_wrapper)
++	ENTRY_SAME(shmdt)
++	ENTRY_SAME(shmget)
++	ENTRY_SAME(shmctl_broken)	/* 195 */
++	ENTRY_SAME(ni_syscall)		/* streams1 */
++	ENTRY_SAME(ni_syscall)		/* streams2 */
++	ENTRY_SAME(lstat64)
++	ENTRY_OURS(truncate64)
++	ENTRY_OURS(ftruncate64)		/* 200 */
++	ENTRY_SAME(getdents64)
++	ENTRY_COMP(fcntl64)
++	ENTRY_SAME(ni_syscall)
++	ENTRY_SAME(ni_syscall)
++	ENTRY_SAME(ni_syscall)		/* 205 */
++	ENTRY_SAME(gettid)             
++	ENTRY_OURS(readahead)          
++	ENTRY_SAME(ni_syscall)		/* tkill */
++
++	ENTRY_SAME(sendfile64)
++	ENTRY_COMP(futex)		/* 210 */
++	ENTRY_COMP(sched_setaffinity)
++	ENTRY_COMP(sched_getaffinity)
++	ENTRY_SAME(ni_syscall)
++	ENTRY_SAME(ni_syscall)
++	ENTRY_SAME(io_setup)		/* 215 */
++	ENTRY_SAME(io_destroy)
++	ENTRY_SAME(io_getevents)
++	ENTRY_SAME(io_submit)
++	ENTRY_SAME(io_cancel)
++	ENTRY_SAME(alloc_hugepages)	/* 220 */
++	ENTRY_SAME(free_hugepages)
++	ENTRY_SAME(exit_group)
++	ENTRY_DIFF(lookup_dcookie)
++	ENTRY_SAME(epoll_create)
++	ENTRY_SAME(epoll_ctl)		/* 225 */
++	ENTRY_SAME(epoll_wait)
++ 	ENTRY_SAME(remap_file_pages)
+--- linux-2.6.0-test6/arch/parisc/kernel/sys_parisc.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/parisc/kernel/sys_parisc.c	2003-10-05 00:34:08.000000000 -0700
+@@ -65,7 +65,7 @@ static int get_offset(struct address_spa
+  */
+ static int get_offset(struct address_space *mapping)
+ {
+-	int offset = (int) mapping << (PAGE_SHIFT - 8);
++	int offset = (unsigned long) mapping << (PAGE_SHIFT - 8);
+ 	return offset & 0x3FF000;
+ }
+ #endif
+@@ -93,17 +93,13 @@ static unsigned long get_shared_area(str
+ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
+ 		unsigned long len, unsigned long pgoff, unsigned long flags)
+ {
+-	struct inode *inode;
+-
+ 	if (len > TASK_SIZE)
+ 		return -ENOMEM;
+ 	if (!addr)
+ 		addr = TASK_UNMAPPED_BASE;
+ 
+-	inode = filp ? filp->f_dentry->d_inode : NULL;
+-
+-	if (inode && (flags & MAP_SHARED)) {
+-		addr = get_shared_area(inode->i_mapping, addr, len, pgoff);
++	if (filp && (flags & MAP_SHARED)) {
++		addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
+ 	} else {
+ 		addr = get_unshared_area(addr, len);
+ 	}
+@@ -165,12 +161,13 @@ long sys_shmat_wrapper(int shmid, char *
+ 	return raddr;
+ }
+ 
+-
+ /* Fucking broken ABI */
+ 
+ #ifdef CONFIG_PARISC64
+ extern asmlinkage long sys_truncate(const char *, unsigned long);
+ extern asmlinkage long sys_ftruncate(unsigned int, unsigned long);
++extern asmlinkage long sys_fcntl(unsigned int, unsigned int, unsigned long);
++
+ asmlinkage long parisc_truncate64(const char * path,
+ 					unsigned int high, unsigned int low)
+ {
+@@ -182,6 +179,21 @@ asmlinkage long parisc_ftruncate64(unsig
+ {
+ 	return sys_ftruncate(fd, (long)high << 32 | low);
+ }
++
++/* stubs for the benefit of the syscall_table since truncate64 and truncate 
++ * are identical on LP64 */
++asmlinkage long sys_truncate64(const char * path, unsigned long length)
++{
++	return sys_truncate(path, length);
++}
++asmlinkage long sys_ftruncate64(unsigned int fd, unsigned long length)
++{
++	return sys_ftruncate(fd, length);
++}
++asmlinkage long sys_fcntl64(unsigned int fd, unsigned int cmd, unsigned long arg)
++{
++	return sys_fcntl(fd, cmd, arg);
++}
+ #else
+ 
+ extern asmlinkage long sys_truncate64(const char *, loff_t);
+--- linux-2.6.0-test6/arch/parisc/kernel/time.c	2003-07-13 21:44:34.000000000 -0700
++++ 25/arch/parisc/kernel/time.c	2003-10-05 00:33:23.000000000 -0700
+@@ -48,7 +48,9 @@ static inline void
+ parisc_do_profile(struct pt_regs *regs)
+ {
+ 	unsigned long pc = regs->iaoq[0];
++#if 0
+ 	extern unsigned long prof_cpu_mask;
++#endif
+ 	extern char _stext;
+ 
+ 	profile_hook(regs);
+@@ -60,6 +62,10 @@ parisc_do_profile(struct pt_regs *regs)
+ 		return;
+ 
+ #if 0
++	/* FIXME: when we have irq affinity to cpu, we need to
++	 * only look at the cpus specified in this mask 
++	 */
++
+ 	if (!((1 << smp_processor_id()) & prof_cpu_mask))
+ 		return;
+ #endif
+@@ -206,7 +212,6 @@ do_settimeofday (struct timespec *tv)
+ 		 * done, and then undo it!
+ 		 */
+ 		nsec -= gettimeoffset() * 1000;
+-		nsec -= (jiffies - wall_jiffies) * (NSEC_PER_SEC / HZ);
+ 
+ 		wtm_sec  = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec);
+ 		wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec);
+@@ -223,6 +228,16 @@ do_settimeofday (struct timespec *tv)
+ 	return 0;
+ }
+ 
++/*
++ * XXX: We can do better than this.
++ * Returns nanoseconds
++ */
++
++unsigned long long sched_clock(void)
++{
++	return (unsigned long long)jiffies * (1000000000 / HZ);
++}
++
+ 
+ void __init time_init(void)
+ {
+--- linux-2.6.0-test6/arch/parisc/kernel/traps.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/parisc/kernel/traps.c	2003-10-05 00:33:23.000000000 -0700
+@@ -678,12 +678,13 @@ void handle_interruption(int code, struc
+ 	}
+ 
+ 	if (user_mode(regs)) {
+-	    if (fault_space != regs->sr[7]) {
++	    if ((fault_space>>SPACEID_SHIFT) != (regs->sr[7] >> SPACEID_SHIFT)) {
+ #ifdef PRINT_USER_FAULTS
+ 		if (fault_space == 0)
+ 			printk(KERN_DEBUG "User Fault on Kernel Space ");
+ 		else
+-			printk(KERN_DEBUG "User Fault (long pointer) ");
++			printk(KERN_DEBUG "User Fault (long pointer) (fault %d) ",
++			       code);
+ 		printk("pid=%d command='%s'\n", current->pid, current->comm);
+ 		show_regs(regs);
+ #endif
+--- linux-2.6.0-test6/arch/parisc/kernel/unaligned.c	2003-07-13 21:44:34.000000000 -0700
++++ 25/arch/parisc/kernel/unaligned.c	2003-10-05 00:33:23.000000000 -0700
+@@ -369,8 +369,8 @@ static int emulate_std(struct pt_regs *r
+ 
+ void handle_unaligned(struct pt_regs *regs)
+ {
+-	unsigned long unaligned_count = 0;
+-	unsigned long last_time = 0;
++	static unsigned long unaligned_count = 0;
++	static unsigned long last_time = 0;
+ 	unsigned long newbase = R1(regs->iir)?regs->gr[R1(regs->iir)]:0;
+ 	int modify = 0;
+ 	int ret = -1;
+@@ -380,7 +380,6 @@ void handle_unaligned(struct pt_regs *re
+ 	/* if the unaligned access is inside the kernel:
+ 	 *   if the access is caused by a syscall, then we fault the calling
+ 	 *     user process
+-	 *   otherwise we halt the kernel
+ 	 */
+ 	if (!user_mode(regs))
+ 	{
+@@ -427,10 +426,10 @@ void handle_unaligned(struct pt_regs *re
+ 			show_regs(regs);
+ #endif		
+ 		}
+-	}
+ 
+-	if (!unaligned_enabled)
+-		goto force_sigbus;
++		if (!unaligned_enabled)
++			goto force_sigbus;
++	}
+ 
+ 	/* handle modification - OK, it's ugly, see the instruction manual */
+ 	switch (MAJOR_OP(regs->iir))
+--- linux-2.6.0-test6/arch/parisc/lib/checksum.c	2003-06-14 12:18:24.000000000 -0700
++++ 25/arch/parisc/lib/checksum.c	2003-10-05 00:33:23.000000000 -0700
+@@ -18,6 +18,8 @@
+  */
+-#include <net/checksum.h>
++#include <linux/module.h>
+ #include <linux/types.h>
++
++#include <net/checksum.h>
+ #include <asm/byteorder.h>
+ #include <asm/string.h>
+ #include <asm/uaccess.h>
+@@ -109,6 +111,7 @@ unsigned int csum_partial_copy_nocheck(c
+ 
+ 	return sum;
+ }
++EXPORT_SYMBOL(csum_partial_copy_nocheck);
+ 
+ /*
+  * Copy from userspace and compute checksum.  If we catch an exception
+@@ -128,3 +131,4 @@ unsigned int csum_partial_copy_from_user
+ 		
+ 	return csum_partial(dst, len, sum);
+ }
++EXPORT_SYMBOL(csum_partial_copy_from_user);
+--- linux-2.6.0-test6/arch/parisc/lib/io.c	2003-06-14 12:17:58.000000000 -0700
++++ 25/arch/parisc/lib/io.c	2003-10-05 00:33:23.000000000 -0700
+@@ -8,6 +8,7 @@
+  */
+ 
+ #include <linux/kernel.h>
++#include <linux/module.h>
+ #include <asm/io.h>
+ 
+ /* Copies a block of memory to a device in an efficient manner.
+@@ -457,3 +458,10 @@ void outsl (unsigned long port, const vo
+ 		break;
+ 	}
+ }
++
++EXPORT_SYMBOL(insb);
++EXPORT_SYMBOL(insw);
++EXPORT_SYMBOL(insl);
++EXPORT_SYMBOL(outsb);
++EXPORT_SYMBOL(outsw);
++EXPORT_SYMBOL(outsl);
+--- linux-2.6.0-test6/arch/parisc/math-emu/denormal.c	2003-06-14 12:18:09.000000000 -0700
++++ 25/arch/parisc/math-emu/denormal.c	2003-10-05 00:33:23.000000000 -0700
+@@ -47,7 +47,7 @@
+ #include "sgl_float.h"
+ #include "dbl_float.h"
+ #include "hppa.h"
+-#include "types.h"
++#include <linux/kernel.h>
+ /* #include <machine/sys/mdep_private.h> */
+ 
+ #undef Fpustatus_register
+--- linux-2.6.0-test6/arch/parisc/math-emu/fpudispatch.c	2003-06-14 12:17:56.000000000 -0700
++++ 25/arch/parisc/math-emu/fpudispatch.c	2003-10-05 00:33:23.000000000 -0700
+@@ -50,7 +50,7 @@
+ #define FPUDEBUG 0
+ 
+ #include "float.h"
+-#include "types.h"
++#include <linux/kernel.h>
+ #include <asm/processor.h>
+ /* #include <sys/debug.h> */
+ /* #include <machine/sys/mdep_private.h> */
+--- linux-2.6.0-test6/arch/parisc/math-emu/Makefile	2003-06-14 12:18:09.000000000 -0700
++++ 25/arch/parisc/math-emu/Makefile	2003-10-05 00:33:23.000000000 -0700
+@@ -2,6 +2,11 @@
+ # Makefile for the linux/parisc floating point code
+ #
+ 
++# See arch/parisc/math-emu/README
++CFLAGS += -Wno-parentheses -Wno-implicit-function-declaration \
++	-Wno-uninitialized -Wno-strict-prototypes -Wno-return-type \
++	-Wno-implicit-int
++
+ obj-y	 := frnd.o driver.o decode_exc.o fpudispatch.o denormal.o \
+ 		dfmpy.o sfmpy.o sfsqrt.o dfsqrt.o dfadd.o fmpyfadd.o \
+ 		sfadd.o dfsub.o sfsub.o fcnvfxt.o fcnvff.o fcnvxf.o \
+--- linux-2.6.0-test6/arch/parisc/math-emu/types.h	2003-06-14 12:18:00.000000000 -0700
++++ /dev/null	2002-08-30 16:31:37.000000000 -0700
+@@ -1,25 +0,0 @@
+-/*
+- * Linux/PA-RISC Project (http://www.parisc-linux.org/)
+- *
+- * Floating-point emulation code
+- *  Copyright (C) 2001 Hewlett-Packard (Paul Bame) <bame@debian.org>
+- *
+- *    This program is free software; you can redistribute it and/or modify
+- *    it under the terms of the GNU General Public License as published by
+- *    the Free Software Foundation; either version 2, or (at your option)
+- *    any later version.
+- *
+- *    This program is distributed in the hope that it will be useful,
+- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- *    GNU General Public License for more details.
+- *
+- *    You should have received a copy of the GNU General Public License
+- *    along with this program; if not, write to the Free Software
+- *    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+- */
+-
+-#include <linux/kernel.h>
+-#define BUG() do { \
+-        printk(KERN_ERR "floating-pt emulation BUG at %s:%d!\n", __FILE__, __LINE__); \
+-} while (0)
+--- linux-2.6.0-test6/arch/parisc/mm/init.c	2003-06-16 22:32:20.000000000 -0700
++++ 25/arch/parisc/mm/init.c	2003-10-05 00:33:23.000000000 -0700
+@@ -430,6 +430,8 @@ void free_initmem(void)
+ 				     & ~(VM_MAP_OFFSET-1)))
+ 
+ void *vmalloc_start;
++EXPORT_SYMBOL(vmalloc_start);
++
+ #ifdef CONFIG_PA11
+ unsigned long pcxl_dma_start;
+ #endif
+@@ -618,8 +620,6 @@ static void __init pagetable_init(void)
+ {
+ 	int range;
+ 
+-	printk("pagetable_init\n");
+-
+ 	/* Map each physical memory range to its kernel vaddr */
+ 
+ 	for (range = 0; range < npmem_ranges; range++) {
+--- linux-2.6.0-test6/arch/parisc/mm/ioremap.c	2003-06-14 12:18:07.000000000 -0700
++++ 25/arch/parisc/mm/ioremap.c	2003-10-05 00:33:23.000000000 -0700
+@@ -159,7 +159,7 @@ void * __ioremap(unsigned long phys_addr
+ 	if (!area)
+ 		return NULL;
+ 	addr = area->addr;
+-	if (remap_area_pages(VMALLOC_VMADDR(addr), phys_addr, size, flags)) {
++	if (remap_area_pages((unsigned long) addr, phys_addr, size, flags)) {
+ 		vfree(addr);
+ 		return NULL;
+ 	}
+--- linux-2.6.0-test6/arch/ppc64/kernel/ioctl32.c	2003-09-08 13:58:56.000000000 -0700
++++ 25/arch/ppc64/kernel/ioctl32.c	2003-10-05 00:34:44.000000000 -0700
+@@ -328,396 +328,6 @@ static int do_ncp_setprivatedata(unsigne
+ 	return err;
+ }
+ 
+-struct usbdevfs_ctrltransfer32 {
+-	__u8 bRequestType;
+-	__u8 bRequest;
+-	__u16 wValue;
+-	__u16 wIndex;
+-	__u16 wLength;
+-	__u32 timeout;  /* in milliseconds */
+-	__u32 data;
+-};
+-
+-#define USBDEVFS_CONTROL32           _IOWR('U', 0, struct usbdevfs_ctrltransfer32)
+-
+-static int do_usbdevfs_control(unsigned int fd, unsigned int cmd, unsigned long arg)
+-{
+-	struct usbdevfs_ctrltransfer kctrl;
+-	struct usbdevfs_ctrltransfer32 *uctrl;
+-	mm_segment_t old_fs;
+-	__u32 udata;
+-	void *uptr, *kptr;
+-	int err;
+-
+-	uctrl = (struct usbdevfs_ctrltransfer32 *) arg;
+-
+-	if (copy_from_user(&kctrl, uctrl,
+-			   (sizeof(struct usbdevfs_ctrltransfer) -
+-			    sizeof(void *))))
+-		return -EFAULT;
+-
+-	if (get_user(udata, &uctrl->data))
+-		return -EFAULT;
+-	uptr = (void *) A(udata);
+-
+-	/* In usbdevice_fs, it limits the control buffer to a page,
+-	 * for simplicity so do we.
+-	 */
+-	if (!uptr || kctrl.wLength > PAGE_SIZE)
+-		return -EINVAL;
+-
+-	kptr = (void *)__get_free_page(GFP_KERNEL);
+-
+-	if ((kctrl.bRequestType & 0x80) == 0) {
+-		err = -EFAULT;
+-		if (copy_from_user(kptr, uptr, kctrl.wLength))
+-			goto out;
+-	}
+-
+-	kctrl.data = kptr;
+-
+-	old_fs = get_fs();
+-	set_fs(KERNEL_DS);
+-	err = sys_ioctl(fd, USBDEVFS_CONTROL, (unsigned long)&kctrl);
+-	set_fs(old_fs);
+-
+-	if (err >= 0 &&
+-	    ((kctrl.bRequestType & 0x80) != 0)) {
+-		if (copy_to_user(uptr, kptr, kctrl.wLength))
+-			err = -EFAULT;
+-	}
+-
+-out:
+-	free_page((unsigned long) kptr);
+-	return err;
+-}
+-
+-struct usbdevfs_bulktransfer32 {
+-	unsigned int ep;
+-	unsigned int len;
+-	unsigned int timeout; /* in milliseconds */
+-	__u32 data;
+-};
+-
+-#define USBDEVFS_BULK32              _IOWR('U', 2, struct usbdevfs_bulktransfer32)
+-
+-static int do_usbdevfs_bulk(unsigned int fd, unsigned int cmd, unsigned long arg)
+-{
+-	struct usbdevfs_bulktransfer kbulk;
+-	struct usbdevfs_bulktransfer32 *ubulk;
+-	mm_segment_t old_fs;
+-	__u32 udata;
+-	void *uptr, *kptr;
+-	int err;
+-
+-	ubulk = (struct usbdevfs_bulktransfer32 *) arg;
+-
+-	if (get_user(kbulk.ep, &ubulk->ep) ||
+-	    get_user(kbulk.len, &ubulk->len) ||
+-	    get_user(kbulk.timeout, &ubulk->timeout) ||
+-	    get_user(udata, &ubulk->data))
+-		return -EFAULT;
+-
+-	uptr = (void *) A(udata);
+-
+-	/* In usbdevice_fs, it limits the control buffer to a page,
+-	 * for simplicity so do we.
+-	 */
+-	if (!uptr || kbulk.len > PAGE_SIZE)
+-		return -EINVAL;
+-
+-	kptr = (void *) __get_free_page(GFP_KERNEL);
+-
+-	if ((kbulk.ep & 0x80) == 0) {
+-		err = -EFAULT;
+-		if (copy_from_user(kptr, uptr, kbulk.len))
+-			goto out;
+-	}
+-
+-	kbulk.data = kptr;
+-
+-	old_fs = get_fs();
+-	set_fs(KERNEL_DS);
+-	err = sys_ioctl(fd, USBDEVFS_BULK, (unsigned long) &kbulk);
+-	set_fs(old_fs);
+-
+-	if (err >= 0 &&
+-	    ((kbulk.ep & 0x80) != 0)) {
+-		if (copy_to_user(uptr, kptr, kbulk.len))
+-			err = -EFAULT;
+-	}
+-
+-out:
+-	free_page((unsigned long) kptr);
+-	return err;
+-}
+-
+-/* This needs more work before we can enable it.  Unfortunately
+- * because of the fancy asynchronous way URB status/error is written
+- * back to userspace, we'll need to fiddle with USB devio internals
+- * and/or reimplement entirely the frontend of it ourselves. -DaveM
+- *
+- * The issue is:
+- *
+- *	When an URB is submitted via usbdevicefs it is put onto an
+- *	asynchronous queue.  When the URB completes, it may be reaped
+- *	via another ioctl.  During this reaping the status is written
+- *	back to userspace along with the length of the transfer.
+- *
+- *	We must translate into 64-bit kernel types so we pass in a kernel
+- *	space copy of the usbdevfs_urb structure.  This would mean that we
+- *	must do something to deal with the async entry reaping.  First we
+- *	have to deal somehow with this transitory memory we've allocated.
+- *	This is problematic since there are many call sites from which the
+- *	async entries can be destroyed (and thus when we'd need to free up
+- *	this kernel memory).  One of which is the close() op of usbdevicefs.
+- *	To handle that we'd need to make our own file_operations struct which
+- *	overrides usbdevicefs's release op with our own which runs usbdevicefs's
+- *	real release op then frees up the kernel memory.
+- *
+- *	But how to keep track of these kernel buffers?  We'd need to either
+- *	keep track of them in some table _or_ know about usbdevicefs internals
+- *	(ie. the exact layout of its file private, which is actually defined
+- *	in linux/usbdevice_fs.h, the layout of the async queues are private to
+- *	devio.c)
+- *
+- * There is one possible other solution I considered, also involving knowledge
+- * of usbdevicefs internals:
+- *
+- *	After an URB is submitted, we "fix up" the address back to the user
+- *	space one.  This would work if the status/length fields written back
+- *	by the async URB completion lines up perfectly in the 32-bit type with
+- *	the 64-bit kernel type.  Unfortunately, it does not because the iso
+- *	frame descriptors, at the end of the struct, can be written back.
+- *
+- * I think we'll just need to simply duplicate the devio URB engine here.
+- */
+-#if 0
+-struct usbdevfs_urb32 {
+-	__u8 type;
+-	__u8 endpoint;
+-	__s32 status;
+-	__u32 flags;
+-	__u32 buffer;
+-	__s32 buffer_length;
+-	__s32 actual_length;
+-	__s32 start_frame;
+-	__s32 number_of_packets;
+-	__s32 error_count;
+-	__u32 signr;
+-	__u32 usercontext; /* unused */
+-	struct usbdevfs_iso_packet_desc iso_frame_desc[0];
+-};
+-
+-#define USBDEVFS_SUBMITURB32       _IOR('U', 10, struct usbdevfs_urb32)
+-
+-static int get_urb32(struct usbdevfs_urb *kurb,
+-		     struct usbdevfs_urb32 *uurb)
+-{
+-	if (get_user(kurb->type, &uurb->type) ||
+-	    __get_user(kurb->endpoint, &uurb->endpoint) ||
+-	    __get_user(kurb->status, &uurb->status) ||
+-	    __get_user(kurb->flags, &uurb->flags) ||
+-	    __get_user(kurb->buffer_length, &uurb->buffer_length) ||
+-	    __get_user(kurb->actual_length, &uurb->actual_length) ||
+-	    __get_user(kurb->start_frame, &uurb->start_frame) ||
+-	    __get_user(kurb->number_of_packets, &uurb->number_of_packets) ||
+-	    __get_user(kurb->error_count, &uurb->error_count) ||
+-	    __get_user(kurb->signr, &uurb->signr))
+-		return -EFAULT;
+-
+-	kurb->usercontext = 0; /* unused currently */
+-
+-	return 0;
+-}
+-
+-/* Just put back the values which usbdevfs actually changes. */
+-static int put_urb32(struct usbdevfs_urb *kurb,
+-		     struct usbdevfs_urb32 *uurb)
+-{
+-	if (put_user(kurb->status, &uurb->status) ||
+-	    __put_user(kurb->actual_length, &uurb->actual_length) ||
+-	    __put_user(kurb->error_count, &uurb->error_count))
+-		return -EFAULT;
+-
+-	if (kurb->number_of_packets != 0) {
+-		int i;
+-
+-		for (i = 0; i < kurb->number_of_packets; i++) {
+-			if (__put_user(kurb->iso_frame_desc[i].actual_length,
+-				       &uurb->iso_frame_desc[i].actual_length) ||
+-			    __put_user(kurb->iso_frame_desc[i].status,
+-				       &uurb->iso_frame_desc[i].status))
+-				return -EFAULT;
+-		}
+-	}
+-
+-	return 0;
+-}
+-
+-static int get_urb32_isoframes(struct usbdevfs_urb *kurb,
+-			       struct usbdevfs_urb32 *uurb)
+-{
+-	unsigned int totlen;
+-	int i;
+-
+-	if (kurb->type != USBDEVFS_URB_TYPE_ISO) {
+-		kurb->number_of_packets = 0;
+-		return 0;
+-	}
+-
+-	if (kurb->number_of_packets < 1 ||
+-	    kurb->number_of_packets > 128)
+-		return -EINVAL;
+-
+-	if (copy_from_user(&kurb->iso_frame_desc[0],
+-			   &uurb->iso_frame_desc[0],
+-			   sizeof(struct usbdevfs_iso_packet_desc) *
+-			   kurb->number_of_packets))
+-		return -EFAULT;
+-
+-	totlen = 0;
+-	for (i = 0; i < kurb->number_of_packets; i++) {
+-		unsigned int this_len;
+-
+-		this_len = kurb->iso_frame_desc[i].length;
+-		if (this_len > 1023)
+-			return -EINVAL;
+-
+-		totlen += this_len;
+-	}
+-
+-	if (totlen > 32768)
+-		return -EINVAL;
+-
+-	kurb->buffer_length = totlen;
+-
+-	return 0;
+-}
+-
+-static int do_usbdevfs_urb(unsigned int fd, unsigned int cmd, unsigned long arg)
+-{
+-	struct usbdevfs_urb *kurb;
+-	struct usbdevfs_urb32 *uurb;
+-	mm_segment_t old_fs;
+-	__u32 udata;
+-	void *uptr, *kptr;
+-	unsigned int buflen;
+-	int err;
+-
+-	uurb = (struct usbdevfs_urb32 *) arg;
+-
+-	err = -ENOMEM;
+-	kurb = kmalloc(sizeof(struct usbdevfs_urb) +
+-		       (sizeof(struct usbdevfs_iso_packet_desc) * 128),
+-		       GFP_KERNEL);
+-	if (!kurb)
+-		goto out;
+-
+-	err = -EFAULT;
+-	if (get_urb32(kurb, uurb))
+-		goto out;
+-
+-	err = get_urb32_isoframes(kurb, uurb);
+-	if (err)
+-		goto out;
+-
+-	err = -EFAULT;
+-	if (__get_user(udata, &uurb->buffer))
+-		goto out;
+-	uptr = (void *) A(udata);
+-
+-	err = -ENOMEM;
+-	buflen = kurb->buffer_length;
+-	kptr = kmalloc(buflen, GFP_KERNEL);
+-	if (!kptr)
+-		goto out;
+-
+-	kurb->buffer = kptr;
+-
+-	err = -EFAULT;
+-	if (copy_from_user(kptr, uptr, buflen))
+-		goto out_kptr;
+-
+-	old_fs = get_fs();
+-	set_fs(KERNEL_DS);
+-	err = sys_ioctl(fd, USBDEVFS_SUBMITURB, (unsigned long) kurb);
+-	set_fs(old_fs);
+-
+-	if (err >= 0) {
+-		/* XXX Shit, this doesn't work for async URBs :-( XXX */
+-		if (put_urb32(kurb, uurb)) {
+-			err = -EFAULT;
+-		} else if ((kurb->endpoint & USB_DIR_IN) != 0) {
+-			if (copy_to_user(uptr, kptr, buflen))
+-				err = -EFAULT;
+-		}
+-	}
+-
+-out_kptr:
+-	kfree(kptr);
+-
+-out:
+-	kfree(kurb);
+-	return err;
+-}
+-#endif
+-
+-#define USBDEVFS_REAPURB32         _IOW('U', 12, u32)
+-#define USBDEVFS_REAPURBNDELAY32   _IOW('U', 13, u32)
+-
+-static int do_usbdevfs_reapurb(unsigned int fd, unsigned int cmd, unsigned long arg)
+-{
+-	mm_segment_t old_fs;
+-	void *kptr;
+-	int err;
+-
+-	old_fs = get_fs();
+-	set_fs(KERNEL_DS);
+-	err = sys_ioctl(fd,
+-			(cmd == USBDEVFS_REAPURB32 ?
+-			 USBDEVFS_REAPURB :
+-			 USBDEVFS_REAPURBNDELAY),
+-			(unsigned long) &kptr);
+-	set_fs(old_fs);
+-
+-	if (err >= 0 &&
+-	    put_user(((u32)(long)kptr), (u32 *) A(arg)))
+-		err = -EFAULT;
+-
+-	return err;
+-}
+-
+-struct usbdevfs_disconnectsignal32 {
+-	unsigned int signr;
+-	u32 context;
+-};
+-
+-#define USBDEVFS_DISCSIGNAL32      _IOR('U', 14, struct usbdevfs_disconnectsignal32)
+-
+-static int do_usbdevfs_discsignal(unsigned int fd, unsigned int cmd, unsigned long arg)
+-{
+-	struct usbdevfs_disconnectsignal kdis;
+-	struct usbdevfs_disconnectsignal32 *udis;
+-	mm_segment_t old_fs;
+-	u32 uctx;
+-	int err;
+-
+-	udis = (struct usbdevfs_disconnectsignal32 *) arg;
+-
+-	if (get_user(kdis.signr, &udis->signr) ||
+-	    __get_user(uctx, &udis->context))
+-		return -EFAULT;
+-
+-	kdis.context = (void *) (long)uctx;
+-
+-	old_fs = get_fs();
+-	set_fs(KERNEL_DS);
+-	err = sys_ioctl(fd, USBDEVFS_DISCSIGNAL, (unsigned long) &kdis);
+-	set_fs(old_fs);
+-
+-	return err;
+-}
+ 
+ #define HANDLE_IOCTL(cmd,handler) { cmd, (ioctl_trans_handler_t)handler, 0 },
+ #define COMPATIBLE_IOCTL(cmd) HANDLE_IOCTL(cmd,sys_ioctl)
+@@ -734,8 +344,6 @@ IOCTL_TABLE_START
+ COMPATIBLE_IOCTL(TCSBRKP)
+ COMPATIBLE_IOCTL(TIOCSTART)
+ COMPATIBLE_IOCTL(TIOCSTOP)
+-COMPATIBLE_IOCTL(TIOCGSERIAL)
+-COMPATIBLE_IOCTL(TIOCSSERIAL)
+ COMPATIBLE_IOCTL(TIOCSLTC)
+ #if 0
+ COMPATIBLE_IOCTL(FBIOBLANK)
+@@ -755,13 +363,6 @@ HANDLE_IOCTL(NCP_IOC_SETOBJECTNAME_32, d
+ HANDLE_IOCTL(NCP_IOC_GETPRIVATEDATA_32, do_ncp_getprivatedata)
+ HANDLE_IOCTL(NCP_IOC_SETPRIVATEDATA_32, do_ncp_setprivatedata)
+ 
+-/* USB devfs */
+-HANDLE_IOCTL(USBDEVFS_CONTROL32, do_usbdevfs_control)
+-HANDLE_IOCTL(USBDEVFS_BULK32, do_usbdevfs_bulk)
+-/*HANDLE_IOCTL(USBDEVFS_SUBMITURB32, do_usbdevfs_urb)*/
+-HANDLE_IOCTL(USBDEVFS_REAPURB32, do_usbdevfs_reapurb)
+-HANDLE_IOCTL(USBDEVFS_REAPURBNDELAY32, do_usbdevfs_reapurb)
+-HANDLE_IOCTL(USBDEVFS_DISCSIGNAL32, do_usbdevfs_discsignal)
+ IOCTL_TABLE_END
+ 
+ int ioctl_table_size = ARRAY_SIZE(ioctl_start);
+--- linux-2.6.0-test6/arch/ppc64/kernel/process.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/arch/ppc64/kernel/process.c	2003-10-05 00:33:23.000000000 -0700
+@@ -70,23 +70,6 @@ enable_kernel_fp(void)
+ #endif /* CONFIG_SMP */
+ }
+ 
+-#ifdef CONFIG_SMP
+-static void smp_unlazy_onefpu(void *arg)
+-{
+-	struct pt_regs *regs = current->thread.regs;
+-
+-	if (!regs)
+-		return;
+-	if (regs->msr & MSR_FP)
+-		giveup_fpu(current);
+-}
+-
+-void dump_smp_unlazy_fpu(void)
+-{
+-	smp_call_function(smp_unlazy_onefpu, NULL, 1, 1);
+-}
+-#endif
+-
+ int dump_task_fpu(struct task_struct *tsk, elf_fpregset_t *fpregs)
+ {
+ 	struct pt_regs *regs = tsk->thread.regs;
+--- linux-2.6.0-test6/arch/ppc64/kernel/semaphore.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/arch/ppc64/kernel/semaphore.c	2003-10-05 00:34:19.000000000 -0700
+@@ -21,6 +21,7 @@
+ #include <asm/semaphore.h>
+ #include <asm/errno.h>
+ 
++#if 0
+ /*
+  * Atomically update sem->count.
+  * This does the equivalent of the following:
+@@ -128,3 +129,140 @@ int __down_interruptible(struct semaphor
+ 	wake_up(&sem->wait);
+ 	return retval;
+ }
++#else
++
++static __inline__ int atomic_add_negative(int i, atomic_t *v)
++{
++	if (atomic_add_return(i, v) < 0)
++		return 1;
++	else
++		return 0;
++}
++
++void __up(struct semaphore *sem)
++{
++	wake_up(&sem->wait);
++}
++
++void __down(struct semaphore * sem)
++{
++	struct task_struct *tsk = current;
++	DECLARE_WAITQUEUE(wait, tsk);
++	unsigned long flags;
++
++	tsk->state = TASK_UNINTERRUPTIBLE;
++	spin_lock_irqsave(&sem->wait.lock, flags);
++	add_wait_queue_exclusive_locked(&sem->wait, &wait);
++
++	sem->sleepers++;
++	for (;;) {
++		int sleepers = sem->sleepers;
++
++		/*
++		 * Add "everybody else" into it. They aren't
++		 * playing, because we own the spinlock in
++		 * the wait_queue_head.
++		 */
++		if (!atomic_add_negative(sleepers - 1, &sem->count)) {
++			sem->sleepers = 0;
++			break;
++		}
++		sem->sleepers = 1;	/* us - see -1 above */
++		spin_unlock_irqrestore(&sem->wait.lock, flags);
++
++		schedule();
++
++		spin_lock_irqsave(&sem->wait.lock, flags);
++		tsk->state = TASK_UNINTERRUPTIBLE;
++	}
++	remove_wait_queue_locked(&sem->wait, &wait);
++	wake_up_locked(&sem->wait);
++	spin_unlock_irqrestore(&sem->wait.lock, flags);
++	tsk->state = TASK_RUNNING;
++}
++
++int __down_interruptible(struct semaphore * sem)
++{
++	int retval = 0;
++	struct task_struct *tsk = current;
++	DECLARE_WAITQUEUE(wait, tsk);
++	unsigned long flags;
++
++	tsk->state = TASK_INTERRUPTIBLE;
++	spin_lock_irqsave(&sem->wait.lock, flags);
++	add_wait_queue_exclusive_locked(&sem->wait, &wait);
++
++	sem->sleepers++;
++	for (;;) {
++		int sleepers = sem->sleepers;
++
++		/*
++		 * With signals pending, this turns into
++		 * the trylock failure case - we won't be
++		 * sleeping, and we* can't get the lock as
++		 * it has contention. Just correct the count
++		 * and exit.
++		 */
++		if (signal_pending(current)) {
++			retval = -EINTR;
++			sem->sleepers = 0;
++			atomic_add(sleepers, &sem->count);
++			break;
++		}
++
++		/*
++		 * Add "everybody else" into it. They aren't
++		 * playing, because we own the spinlock in
++		 * wait_queue_head. The "-1" is because we're
++		 * still hoping to get the semaphore.
++		 */
++		if (!atomic_add_negative(sleepers - 1, &sem->count)) {
++			sem->sleepers = 0;
++			break;
++		}
++		sem->sleepers = 1;	/* us - see -1 above */
++		spin_unlock_irqrestore(&sem->wait.lock, flags);
++
++		schedule();
++
++		spin_lock_irqsave(&sem->wait.lock, flags);
++		tsk->state = TASK_INTERRUPTIBLE;
++	}
++	remove_wait_queue_locked(&sem->wait, &wait);
++	wake_up_locked(&sem->wait);
++	spin_unlock_irqrestore(&sem->wait.lock, flags);
++
++	tsk->state = TASK_RUNNING;
++	return retval;
++}
++
++/*
++ * Trylock failed - make sure we correct for
++ * having decremented the count.
++ *
++ * We could have done the trylock with a
++ * single "cmpxchg" without failure cases,
++ * but then it wouldn't work on a 386.
++ */
++int __down_trylock(struct semaphore * sem)
++{
++	int sleepers;
++	unsigned long flags;
++
++	spin_lock_irqsave(&sem->wait.lock, flags);
++	sleepers = sem->sleepers + 1;
++	sem->sleepers = 0;
++
++	/*
++	 * Add "everybody else" and us into it. They aren't
++	 * playing, because we own the spinlock in the
++	 * wait_queue_head.
++	 */
++	if (!atomic_add_negative(sleepers, &sem->count)) {
++		wake_up_locked(&sem->wait);
++	}
++
++	spin_unlock_irqrestore(&sem->wait.lock, flags);
++	return 1;
++}
++#endif
+--- linux-2.6.0-test6/arch/ppc/boot/ld.script	2003-09-08 13:58:56.000000000 -0700
++++ 25/arch/ppc/boot/ld.script	2003-10-05 00:36:51.000000000 -0700
+@@ -82,6 +82,7 @@ SECTIONS
+     *(__ksymtab)
+     *(__ksymtab_strings)
+     *(__bug_table)
++    *(__kcrctab)
+   }
+ 
+ }
+--- linux-2.6.0-test6/arch/ppc/mm/cachemap.c	2003-09-08 13:58:56.000000000 -0700
++++ 25/arch/ppc/mm/cachemap.c	2003-10-05 00:33:23.000000000 -0700
+@@ -101,7 +101,7 @@ void *consistent_alloc(int gfp, size_t s
+ 	if (! area)
+ 		goto out;
+ 
+-	va = VMALLOC_VMADDR(area->addr);
++	va = (unsigned long) area->addr;
+ 
+ 	flags = _PAGE_KERNEL | _PAGE_NO_CACHE;
+ 	
+--- linux-2.6.0-test6/arch/ppc/mm/pgtable.c	2003-09-27 18:57:43.000000000 -0700
++++ 25/arch/ppc/mm/pgtable.c	2003-10-05 00:33:23.000000000 -0700
+@@ -195,7 +195,7 @@ __ioremap(phys_addr_t addr, unsigned lon
+ 		area = get_vm_area(size, VM_IOREMAP);
+ 		if (area == 0)
+ 			return NULL;
+-		v = VMALLOC_VMADDR(area->addr);
++		v = (unsigned long) area->addr;
+ 	} else {
+ 		v = (ioremap_bot -= size);
+ 	}
+--- linux-2.6.0-test6/arch/s390/mm/ioremap.c	2003-06-14 12:17:58.000000000 -0700
++++ 25/arch/s390/mm/ioremap.c	2003-10-05 00:33:23.000000000 -0700
+@@ -124,7 +124,7 @@ void * __ioremap(unsigned long phys_addr
+ 	if (!area)
+ 		return NULL;
+ 	addr = area->addr;
+-	if (remap_area_pages(VMALLOC_VMADDR(addr), phys_addr, size, flags)) {
++	if (remap_area_pages((unsigned long) addr, phys_addr, size, flags)) {
+ 		vfree(addr);
+ 		return NULL;
+ 	}
+--- linux-2.6.0-test6/arch/sh/mm/init.c	2003-07-27 12:14:38.000000000 -0700
++++ 25/arch/sh/mm/init.c	2003-10-05 00:34:40.000000000 -0700
+@@ -51,8 +51,8 @@ unsigned long mmu_context_cache = NO_CON
+ #endif
+ 
+ #ifdef CONFIG_DISCONTIGMEM
+-pg_data_t discontig_page_data[NR_NODES];
+-bootmem_data_t discontig_node_bdata[NR_NODES];
++pg_data_t discontig_page_data[MAX_NUMNODES];
++bootmem_data_t discontig_node_bdata[MAX_NUMNODES];
+ #endif
+ 
+ void show_mem(void)
+--- linux-2.6.0-test6/arch/sh/mm/ioremap.c	2003-07-02 14:53:14.000000000 -0700
++++ 25/arch/sh/mm/ioremap.c	2003-10-05 00:33:23.000000000 -0700
+@@ -149,7 +149,7 @@ void * p3_ioremap(unsigned long phys_add
+ 	if (!area)
+ 		return NULL;
+ 	addr = area->addr;
+-	if (remap_area_pages(VMALLOC_VMADDR(addr), phys_addr, size, flags)) {
++	if (remap_area_pages((unsigned long) addr, phys_addr, size, flags)) {
+ 		vfree(addr);
+ 		return NULL;
+ 	}
+--- linux-2.6.0-test6/arch/sparc64/defconfig	2003-09-27 18:57:44.000000000 -0700
++++ 25/arch/sparc64/defconfig	2003-10-05 00:33:23.000000000 -0700
+@@ -571,6 +571,7 @@ CONFIG_BRIDGE_EBT_T_NAT=m
+ CONFIG_BRIDGE_EBT_802_3=m
+ CONFIG_BRIDGE_EBT_ARP=m
+ CONFIG_BRIDGE_EBT_IP=m
++CONFIG_BRIDGE_EBT_LIMIT=m
+ CONFIG_BRIDGE_EBT_MARK=m
+ CONFIG_BRIDGE_EBT_PKTTYPE=m
+ CONFIG_BRIDGE_EBT_STP=m
+@@ -665,7 +666,7 @@ CONFIG_TUN=m
+ # Ethernet (10 or 100Mbit)
+ #
+ CONFIG_NET_ETHERNET=y
+-# CONFIG_MII is not set
++CONFIG_MII=m
+ CONFIG_SUNLANCE=y
+ CONFIG_HAPPYMEAL=y
+ CONFIG_SUNBMAC=m
+@@ -729,15 +730,6 @@ CONFIG_YELLOWFIN=m
+ CONFIG_R8169=m
+ # CONFIG_SIS190 is not set
+ CONFIG_SK98LIN=m
+-CONFIG_CONFIG_SK98LIN_T1=y
+-CONFIG_CONFIG_SK98LIN_T2=y
+-CONFIG_CONFIG_SK98LIN_T3=y
+-CONFIG_CONFIG_SK98LIN_T4=y
+-CONFIG_CONFIG_SK98LIN_T5=y
+-CONFIG_CONFIG_SK98LIN_T6=y
+-CONFIG_CONFIG_SK98LIN_T7=y
+-CONFIG_CONFIG_SK98LIN_T8=y
+-CONFIG_CONFIG_SK98LIN_T9=y
+ CONFIG_TIGON3=m
+ 
+ #
+@@ -895,6 +887,30 @@ CONFIG_IRDA_FAST_RR=y
+ # CONFIG_VLSI_FIR is not set
+ 
+ #
++# Bluetooth support
++#
++CONFIG_BT=m
++CONFIG_BT_L2CAP=m
++CONFIG_BT_SCO=m
++CONFIG_BT_RFCOMM=m
++CONFIG_BT_RFCOMM_TTY=y
++CONFIG_BT_BNEP=m
++CONFIG_BT_BNEP_MC_FILTER=y
++CONFIG_BT_BNEP_PROTO_FILTER=y
++
++#
++# Bluetooth device drivers
++#
++CONFIG_BT_HCIUSB=m
++CONFIG_BT_USB_SCO=y
++# CONFIG_BT_USB_ZERO_PACKET is not set
++CONFIG_BT_HCIUART=m
++CONFIG_BT_HCIUART_H4=y
++CONFIG_BT_HCIUART_BCSP=y
++CONFIG_BT_HCIUART_BCSP_TXCRC=y
++CONFIG_BT_HCIVHCI=m
++
++#
+ # ISDN subsystem
+ #
+ CONFIG_ISDN_BOOL=y
+@@ -1517,30 +1533,6 @@ CONFIG_USB_TEST=m
+ # CONFIG_USB_GADGET is not set
+ 
+ #
+-# Bluetooth support
+-#
+-CONFIG_BT=m
+-CONFIG_BT_L2CAP=m
+-CONFIG_BT_SCO=m
+-CONFIG_BT_RFCOMM=m
+-CONFIG_BT_RFCOMM_TTY=y
+-CONFIG_BT_BNEP=m
+-CONFIG_BT_BNEP_MC_FILTER=y
+-CONFIG_BT_BNEP_PROTO_FILTER=y
+-
+-#
+-# Bluetooth device drivers
+-#
+-CONFIG_BT_HCIUSB=m
+-CONFIG_BT_USB_SCO=y
+-# CONFIG_BT_USB_ZERO_PACKET is not set
+-CONFIG_BT_HCIUART=m
+-CONFIG_BT_HCIUART_H4=y
+-CONFIG_BT_HCIUART_BCSP=y
+-CONFIG_BT_HCIUART_BCSP_TXCRC=y
+-CONFIG_BT_HCIVHCI=m
+-
+-#
+ # Watchdog
+ #
+ # CONFIG_SOFT_WATCHDOG is not set
+--- linux-2.6.0-test6/arch/sparc64/Kconfig	2003-09-27 18:57:44.000000000 -0700
++++ 25/arch/sparc64/Kconfig	2003-10-05 00:36:40.000000000 -0700
+@@ -787,12 +787,19 @@ config DEBUG_SPINLOCK
+ 	  best used in conjunction with the NMI watchdog so that spinlock
+ 	  deadlocks are also debuggable.
+ 
++config LOCKMETER
++	bool "Kernel lock metering"
++	depends on SMP && !PREEMPT
++	help
++	  Say Y to enable kernel lock metering, which adds overhead to SMP locks,
++	  but allows you to see various statistics using the lockstat command.
++
+ # We have a custom atomic_dec_and_lock() implementation but it's not
+ # compatible with spinlock debugging so we need to fall back on
+ # the generic version in that case.
+ config HAVE_DEC_LOCK
+ 	bool
+-	depends on !DEBUG_SPINLOCK
++	depends on !DEBUG_SPINLOCK && !LOCKMETER
+ 	default y
+ 
+ config DEBUG_SPINLOCK_SLEEP
+--- linux-2.6.0-test6/arch/sparc64/kernel/entry.S	2003-09-08 13:58:56.000000000 -0700
++++ 25/arch/sparc64/kernel/entry.S	2003-10-05 00:33:23.000000000 -0700
+@@ -26,7 +26,7 @@
+ 
+ #define curptr      g6
+ 
+-#define NR_SYSCALLS 267      /* Each OS is different... */
++#define NR_SYSCALLS 268      /* Each OS is different... */
+ 
+ 	.text
+ 	.align		32
+--- linux-2.6.0-test6/arch/sparc64/kernel/ioctl32.c	2003-09-08 13:58:56.000000000 -0700
++++ 25/arch/sparc64/kernel/ioctl32.c	2003-10-05 00:34:44.000000000 -0700
+@@ -985,402 +985,6 @@ static int drm32_res_ctx(unsigned int fd
+ 
+ #endif
+ 
+-/* HERE! */
+-
+-struct usbdevfs_ctrltransfer32 {
+-	__u8 bRequestType;
+-	__u8 bRequest;
+-	__u16 wValue;
+-	__u16 wIndex;
+-	__u16 wLength;
+-	__u32 timeout;  /* in milliseconds */
+-	__u32 data;
+-};
+-
+-#define USBDEVFS_CONTROL32           _IOWR('U', 0, struct usbdevfs_ctrltransfer32)
+-
+-static int do_usbdevfs_control(unsigned int fd, unsigned int cmd, unsigned long arg)
+-{
+-	struct usbdevfs_ctrltransfer kctrl;
+-	struct usbdevfs_ctrltransfer32 *uctrl;
+-	mm_segment_t old_fs;
+-	__u32 udata;
+-	void __user *uptr;
+-	void *kptr;
+-	int err;
+-
+-	uctrl = (struct usbdevfs_ctrltransfer32 *) arg;
+-
+-	if (copy_from_user(&kctrl, uctrl,
+-			   (sizeof(struct usbdevfs_ctrltransfer) -
+-			    sizeof(void *))))
+-		return -EFAULT;
+-
+-	if (get_user(udata, &uctrl->data))
+-		return -EFAULT;
+-	uptr = A(udata);
+-
+-	/* In usbdevice_fs, it limits the control buffer to a page,
+-	 * for simplicity so do we.
+-	 */
+-	if (!uptr || kctrl.wLength > PAGE_SIZE)
+-		return -EINVAL;
+-
+-	kptr = (void *)__get_free_page(GFP_KERNEL);
+-
+-	if ((kctrl.bRequestType & 0x80) == 0) {
+-		err = -EFAULT;
+-		if (copy_from_user(kptr, uptr, kctrl.wLength))
+-			goto out;
+-	}
+-
+-	kctrl.data = kptr;
+-
+-	old_fs = get_fs();
+-	set_fs(KERNEL_DS);
+-	err = sys_ioctl(fd, USBDEVFS_CONTROL, (unsigned long)&kctrl);
+-	set_fs(old_fs);
+-
+-	if (err >= 0 &&
+-	    ((kctrl.bRequestType & 0x80) != 0)) {
+-		if (copy_to_user(uptr, kptr, kctrl.wLength))
+-			err = -EFAULT;
+-	}
+-
+-out:
+-	free_page((unsigned long) kptr);
+-	return err;
+-}
+-
+-struct usbdevfs_bulktransfer32 {
+-	unsigned int ep;
+-	unsigned int len;
+-	unsigned int timeout; /* in milliseconds */
+-	__u32 data;
+-};
+-
+-#define USBDEVFS_BULK32              _IOWR('U', 2, struct usbdevfs_bulktransfer32)
+-
+-static int do_usbdevfs_bulk(unsigned int fd, unsigned int cmd, unsigned long arg)
+-{
+-	struct usbdevfs_bulktransfer kbulk;
+-	struct usbdevfs_bulktransfer32 *ubulk;
+-	mm_segment_t old_fs;
+-	__u32 udata;
+-	void __user *uptr;
+-	void *kptr;
+-	int err;
+-
+-	ubulk = (struct usbdevfs_bulktransfer32 *) arg;
+-
+-	if (get_user(kbulk.ep, &ubulk->ep) ||
+-	    get_user(kbulk.len, &ubulk->len) ||
+-	    get_user(kbulk.timeout, &ubulk->timeout) ||
+-	    get_user(udata, &ubulk->data))
+-		return -EFAULT;
+-
+-	uptr = A(udata);
+-
+-	/* In usbdevice_fs, it limits the control buffer to a page,
+-	 * for simplicity so do we.
+-	 */
+-	if (!uptr || kbulk.len > PAGE_SIZE)
+-		return -EINVAL;
+-
+-	kptr = (void *) __get_free_page(GFP_KERNEL);
+-
+-	if ((kbulk.ep & 0x80) == 0) {
+-		err = -EFAULT;
+-		if (copy_from_user(kptr, uptr, kbulk.len))
+-			goto out;
+-	}
+-
+-	kbulk.data = kptr;
+-
+-	old_fs = get_fs();
+-	set_fs(KERNEL_DS);
+-	err = sys_ioctl(fd, USBDEVFS_BULK, (unsigned long) &kbulk);
+-	set_fs(old_fs);
+-
+-	if (err >= 0 &&
+-	    ((kbulk.ep & 0x80) != 0)) {
+-		if (copy_to_user(uptr, kptr, kbulk.len))
+-			err = -EFAULT;
+-	}
+-
+-out:
+-	free_page((unsigned long) kptr);
+-	return err;
+-}
+-
+-/* This needs more work before we can enable it.  Unfortunately
+- * because of the fancy asynchronous way URB status/error is written
+- * back to userspace, we'll need to fiddle with USB devio internals
+- * and/or reimplement entirely the frontend of it ourselves. -DaveM
+- *
+- * The issue is:
+- *
+- *	When an URB is submitted via usbdevicefs it is put onto an
+- *	asynchronous queue.  When the URB completes, it may be reaped
+- *	via another ioctl.  During this reaping the status is written
+- *	back to userspace along with the length of the transfer.
+- *
+- *	We must translate into 64-bit kernel types so we pass in a kernel
+- *	space copy of the usbdevfs_urb structure.  This would mean that we
+- *	must do something to deal with the async entry reaping.  First we
+- *	have to deal somehow with this transitory memory we've allocated.
+- *	This is problematic since there are many call sites from which the
+- *	async entries can be destroyed (and thus when we'd need to free up
+- *	this kernel memory).  One of which is the close() op of usbdevicefs.
+- *	To handle that we'd need to make our own file_operations struct which
+- *	overrides usbdevicefs's release op with our own which runs usbdevicefs's
+- *	real release op then frees up the kernel memory.
+- *
+- *	But how to keep track of these kernel buffers?  We'd need to either
+- *	keep track of them in some table _or_ know about usbdevicefs internals
+- *	(ie. the exact layout of its file private, which is actually defined
+- *	in linux/usbdevice_fs.h, the layout of the async queues are private to
+- *	devio.c)
+- *
+- * There is one possible other solution I considered, also involving knowledge
+- * of usbdevicefs internals:
+- *
+- *	After an URB is submitted, we "fix up" the address back to the user
+- *	space one.  This would work if the status/length fields written back
+- *	by the async URB completion lines up perfectly in the 32-bit type with
+- *	the 64-bit kernel type.  Unfortunately, it does not because the iso
+- *	frame descriptors, at the end of the struct, can be written back.
+- *
+- * I think we'll just need to simply duplicate the devio URB engine here.
+- */
+-#if 0
+-struct usbdevfs_urb32 {
+-	__u8 type;
+-	__u8 endpoint;
+-	__s32 status;
+-	__u32 flags;
+-	__u32 buffer;
+-	__s32 buffer_length;
+-	__s32 actual_length;
+-	__s32 start_frame;
+-	__s32 number_of_packets;
+-	__s32 error_count;
+-	__u32 signr;
+-	__u32 usercontext; /* unused */
+-	struct usbdevfs_iso_packet_desc iso_frame_desc[0];
+-};
+-
+-#define USBDEVFS_SUBMITURB32       _IOR('U', 10, struct usbdevfs_urb32)
+-
+-static int get_urb32(struct usbdevfs_urb *kurb,
+-		     struct usbdevfs_urb32 *uurb)
+-{
+-	if (get_user(kurb->type, &uurb->type) ||
+-	    __get_user(kurb->endpoint, &uurb->endpoint) ||
+-	    __get_user(kurb->status, &uurb->status) ||
+-	    __get_user(kurb->flags, &uurb->flags) ||
+-	    __get_user(kurb->buffer_length, &uurb->buffer_length) ||
+-	    __get_user(kurb->actual_length, &uurb->actual_length) ||
+-	    __get_user(kurb->start_frame, &uurb->start_frame) ||
+-	    __get_user(kurb->number_of_packets, &uurb->number_of_packets) ||
+-	    __get_user(kurb->error_count, &uurb->error_count) ||
+-	    __get_user(kurb->signr, &uurb->signr))
+-		return -EFAULT;
+-
+-	kurb->usercontext = 0; /* unused currently */
+-
+-	return 0;
+-}
+-
+-/* Just put back the values which usbdevfs actually changes. */
+-static int put_urb32(struct usbdevfs_urb *kurb,
+-		     struct usbdevfs_urb32 *uurb)
+-{
+-	if (put_user(kurb->status, &uurb->status) ||
+-	    __put_user(kurb->actual_length, &uurb->actual_length) ||
+-	    __put_user(kurb->error_count, &uurb->error_count))
+-		return -EFAULT;
+-
+-	if (kurb->number_of_packets != 0) {
+-		int i;
+-
+-		for (i = 0; i < kurb->number_of_packets; i++) {
+-			if (__put_user(kurb->iso_frame_desc[i].actual_length,
+-				       &uurb->iso_frame_desc[i].actual_length) ||
+-			    __put_user(kurb->iso_frame_desc[i].status,
+-				       &uurb->iso_frame_desc[i].status))
+-				return -EFAULT;
+-		}
+-	}
+-
+-	return 0;
+-}
+-
+-static int get_urb32_isoframes(struct usbdevfs_urb *kurb,
+-			       struct usbdevfs_urb32 *uurb)
+-{
+-	unsigned int totlen;
+-	int i;
+-
+-	if (kurb->type != USBDEVFS_URB_TYPE_ISO) {
+-		kurb->number_of_packets = 0;
+-		return 0;
+-	}
+-
+-	if (kurb->number_of_packets < 1 ||
+-	    kurb->number_of_packets > 128)
+-		return -EINVAL;
+-
+-	if (copy_from_user(&kurb->iso_frame_desc[0],
+-			   &uurb->iso_frame_desc[0],
+-			   sizeof(struct usbdevfs_iso_packet_desc) *
+-			   kurb->number_of_packets))
+-		return -EFAULT;
+-
+-	totlen = 0;
+-	for (i = 0; i < kurb->number_of_packets; i++) {
+-		unsigned int this_len;
+-
+-		this_len = kurb->iso_frame_desc[i].length;
+-		if (this_len > 1023)
+-			return -EINVAL;
+-
+-		totlen += this_len;
+-	}
+-
+-	if (totlen > 32768)
+-		return -EINVAL;
+-
+-	kurb->buffer_length = totlen;
+-
+-	return 0;
+-}
+-
+-static int do_usbdevfs_urb(unsigned int fd, unsigned int cmd, unsigned long arg)
+-{
+-	struct usbdevfs_urb *kurb;
+-	struct usbdevfs_urb32 *uurb;
+-	mm_segment_t old_fs;
+-	__u32 udata;
+-	void __user *uptr;
+-	void *kptr;
+-	unsigned int buflen;
+-	int err;
+-
+-	uurb = (struct usbdevfs_urb32 *) arg;
+-
+-	err = -ENOMEM;
+-	kurb = kmalloc(sizeof(struct usbdevfs_urb) +
+-		       (sizeof(struct usbdevfs_iso_packet_desc) * 128),
+-		       GFP_KERNEL);
+-	if (!kurb)
+-		goto out;
+-
+-	err = -EFAULT;
+-	if (get_urb32(kurb, uurb))
+-		goto out;
+-
+-	err = get_urb32_isoframes(kurb, uurb);
+-	if (err)
+-		goto out;
+-
+-	err = -EFAULT;
+-	if (__get_user(udata, &uurb->buffer))
+-		goto out;
+-	uptr = A(udata);
+-
+-	err = -ENOMEM;
+-	buflen = kurb->buffer_length;
+-	kptr = kmalloc(buflen, GFP_KERNEL);
+-	if (!kptr)
+-		goto out;
+-
+-	kurb->buffer = kptr;
+-
+-	err = -EFAULT;
+-	if (copy_from_user(kptr, uptr, buflen))
+-		goto out_kptr;
+-
+-	old_fs = get_fs();
+-	set_fs(KERNEL_DS);
+-	err = sys_ioctl(fd, USBDEVFS_SUBMITURB, (unsigned long) kurb);
+-	set_fs(old_fs);
+-
+-	if (err >= 0) {
+-		/* XXX Shit, this doesn't work for async URBs :-( XXX */
+-		if (put_urb32(kurb, uurb)) {
+-			err = -EFAULT;
+-		} else if ((kurb->endpoint & USB_DIR_IN) != 0) {
+-			if (copy_to_user(uptr, kptr, buflen))
+-				err = -EFAULT;
+-		}
+-	}
+-
+-out_kptr:
+-	kfree(kptr);
+-
+-out:
+-	kfree(kurb);
+-	return err;
+-}
+-#endif
+-
+-#define USBDEVFS_REAPURB32         _IOW('U', 12, u32)
+-#define USBDEVFS_REAPURBNDELAY32   _IOW('U', 13, u32)
+-
+-static int do_usbdevfs_reapurb(unsigned int fd, unsigned int cmd, unsigned long arg)
+-{
+-	mm_segment_t old_fs;
+-	void *kptr;
+-	int err;
+-
+-	old_fs = get_fs();
+-	set_fs(KERNEL_DS);
+-	err = sys_ioctl(fd,
+-			(cmd == USBDEVFS_REAPURB32 ?
+-			 USBDEVFS_REAPURB :
+-			 USBDEVFS_REAPURBNDELAY),
+-			(unsigned long) &kptr);
+-	set_fs(old_fs);
+-
+-	if (err >= 0 &&
+-	    put_user(((u32)(long)kptr), (u32 __user *) A(arg)))
+-		err = -EFAULT;
+-
+-	return err;
+-}
+-
+-struct usbdevfs_disconnectsignal32 {
+-	unsigned int signr;
+-	u32 context;
+-};
+-
+-#define USBDEVFS_DISCSIGNAL32      _IOR('U', 14, struct usbdevfs_disconnectsignal32)
+-
+-static int do_usbdevfs_discsignal(unsigned int fd, unsigned int cmd, unsigned long arg)
+-{
+-	struct usbdevfs_disconnectsignal kdis;
+-	struct usbdevfs_disconnectsignal32 *udis;
+-	mm_segment_t old_fs;
+-	u32 uctx;
+-	int err;
+-
+-	udis = (struct usbdevfs_disconnectsignal32 *) arg;
+-
+-	if (get_user(kdis.signr, &udis->signr) ||
+-	    __get_user(uctx, &udis->context))
+-		return -EFAULT;
+-
+-	kdis.context = (void *) (long)uctx;
+-
+-	old_fs = get_fs();
+-	set_fs(KERNEL_DS);
+-	err = sys_ioctl(fd, USBDEVFS_DISCSIGNAL, (unsigned long) &kdis);
+-	set_fs(old_fs);
+-
+-	return err;
+-}
+-
+ typedef int (* ioctl32_handler_t)(unsigned int, unsigned int, unsigned long, struct file *);
+ 
+ #define COMPATIBLE_IOCTL(cmd)		HANDLE_IOCTL((cmd),sys_ioctl)
+@@ -1397,8 +1001,6 @@ IOCTL_TABLE_START
+ COMPATIBLE_IOCTL(TCSBRKP)
+ COMPATIBLE_IOCTL(TIOCSTART)
+ COMPATIBLE_IOCTL(TIOCSTOP)
+-COMPATIBLE_IOCTL(TIOCGSERIAL)
+-COMPATIBLE_IOCTL(TIOCSSERIAL)
+ COMPATIBLE_IOCTL(TIOCSLTC)
+ COMPATIBLE_IOCTL(FBIOGTYPE)
+ COMPATIBLE_IOCTL(FBIOSATTR)
+@@ -1467,9 +1069,6 @@ COMPATIBLE_IOCTL(AUDIO_GETDEV)
+ COMPATIBLE_IOCTL(AUDIO_GETDEV_SUNOS)
+ COMPATIBLE_IOCTL(AUDIO_FLUSH)
+ COMPATIBLE_IOCTL(AUTOFS_IOC_EXPIRE_MULTI)
+-/* Raw devices */
+-COMPATIBLE_IOCTL(RAW_SETBIND)
+-COMPATIBLE_IOCTL(RAW_GETBIND)
+ /* NCP ioctls which do not need any translations */
+ COMPATIBLE_IOCTL(NCP_IOC_CONN_LOGGED_IN)
+ COMPATIBLE_IOCTL(NCP_IOC_SIGN_INIT)
+@@ -1575,12 +1174,6 @@ HANDLE_IOCTL(RTC32_IRQP_SET, do_rtc_ioct
+ HANDLE_IOCTL(RTC32_EPOCH_READ, do_rtc_ioctl)
+ HANDLE_IOCTL(RTC32_EPOCH_SET, do_rtc_ioctl)
+ #endif
+-HANDLE_IOCTL(USBDEVFS_CONTROL32, do_usbdevfs_control)
+-HANDLE_IOCTL(USBDEVFS_BULK32, do_usbdevfs_bulk)
+-/*HANDLE_IOCTL(USBDEVFS_SUBMITURB32, do_usbdevfs_urb)*/
+-HANDLE_IOCTL(USBDEVFS_REAPURB32, do_usbdevfs_reapurb)
+-HANDLE_IOCTL(USBDEVFS_REAPURBNDELAY32, do_usbdevfs_reapurb)
+-HANDLE_IOCTL(USBDEVFS_DISCSIGNAL32, do_usbdevfs_discsignal)
+ /* take care of sizeof(sizeof()) breakage */
+ IOCTL_TABLE_END
+ 
+--- linux-2.6.0-test6/arch/sparc64/kernel/module.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/arch/sparc64/kernel/module.c	2003-10-05 00:33:23.000000000 -0700
+@@ -14,6 +14,9 @@
+ #include <linux/vmalloc.h>
+ #include <linux/mm.h>
+ 
++#include <asm/processor.h>
++#include <asm/spitfire.h>
++
+ static struct vm_struct * modvmlist = NULL;
+ 
+ static void module_unmap(void * addr)
+@@ -279,6 +282,16 @@ int module_finalize(const Elf_Ehdr *hdr,
+ 		    const Elf_Shdr *sechdrs,
+ 		    struct module *me)
+ {
++	/* Cheetah's I-cache is fully coherent.  */
++	if (tlb_type == spitfire) {
++		unsigned long va;
++
++		flushw_all();
++		for (va =  0; va < (PAGE_SIZE << 1); va += 32)
++			spitfire_put_icache_tag(va, 0x0);
++		__asm__ __volatile__("flush %g6");
++	}
++
+ 	return 0;
+ }
+ 
+--- linux-2.6.0-test6/arch/sparc64/kernel/smp.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/arch/sparc64/kernel/smp.c	2003-10-05 00:33:23.000000000 -0700
+@@ -118,7 +118,6 @@ void __init smp_callin(void)
+ 
+ 	inherit_locked_prom_mappings(0);
+ 
+-	__flush_cache_all();
+ 	__flush_tlb_all();
+ 
+ 	smp_setup_percpu_timer();
+@@ -661,7 +660,6 @@ extern unsigned long xcall_flush_tlb_ran
+ extern unsigned long xcall_flush_tlb_kernel_range;
+ extern unsigned long xcall_flush_tlb_all_spitfire;
+ extern unsigned long xcall_flush_tlb_all_cheetah;
+-extern unsigned long xcall_flush_cache_all_spitfire;
+ extern unsigned long xcall_report_regs;
+ extern unsigned long xcall_receive_signal;
+ extern unsigned long xcall_flush_dcache_page_cheetah;
+@@ -776,15 +774,6 @@ void smp_report_regs(void)
+ 	smp_cross_call(&xcall_report_regs, 0, 0, 0);
+ }
+ 
+-void smp_flush_cache_all(void)
+-{
+-	/* Cheetah need do nothing. */
+-	if (tlb_type == spitfire) {
+-		smp_cross_call(&xcall_flush_cache_all_spitfire, 0, 0, 0);
+-		__flush_cache_all();
+-	}
+-}
+-
+ void smp_flush_tlb_all(void)
+ {
+ 	if (tlb_type == spitfire)
+--- linux-2.6.0-test6/arch/sparc64/kernel/systbls.S	2003-09-08 13:58:56.000000000 -0700
++++ 25/arch/sparc64/kernel/systbls.S	2003-10-05 00:33:23.000000000 -0700
+@@ -72,7 +72,7 @@ sys_call_table32:
+ /*250*/	.word sys32_mremap, sys32_sysctl, sys_getsid, sys_fdatasync, sys32_nfsservctl
+ 	.word sys_ni_syscall, compat_clock_settime, compat_clock_gettime, compat_clock_getres, compat_clock_nanosleep
+ /*260*/	.word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, compat_timer_settime, compat_timer_gettime, sys_timer_getoverrun
+-	.word sys_timer_delete, sys32_timer_create, sys_ni_syscall
++	.word sys_timer_delete, sys32_timer_create, sys_ni_syscall, sys_ni_syscall
+ 
+ 	/* Now the 64-bit native Linux syscall table. */
+ 
+@@ -133,7 +133,7 @@ sys_call_table:
+ /*250*/	.word sys64_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
+ 	.word sys_ni_syscall, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
+ /*260*/	.word sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun
+-	.word sys_timer_delete, sys_timer_create, sys_ni_syscall
++	.word sys_timer_delete, sys_timer_create, sys_ni_syscall, sys_ni_syscall
+ 
+ #if defined(CONFIG_SUNOS_EMUL) || defined(CONFIG_SOLARIS_EMUL) || \
+     defined(CONFIG_SOLARIS_EMUL_MODULE)
+@@ -233,5 +233,6 @@ sunos_sys_table:
+ 	.word sunos_nosys, sunos_nosys, sunos_nosys
+ 	.word sunos_nosys, sunos_nosys, sunos_nosys
+ 	.word sunos_nosys, sunos_nosys, sunos_nosys
++	.word sunos_nosys
+ 
+ #endif
+--- linux-2.6.0-test6/arch/sparc64/lib/rwlock.S	2003-06-26 22:07:24.000000000 -0700
++++ 25/arch/sparc64/lib/rwlock.S	2003-10-05 00:36:40.000000000 -0700
+@@ -63,5 +63,33 @@ __write_lock: /* %o0 = lock_ptr */
+ 	be,pt		%icc, 99b
+ 	 membar		#StoreLoad | #StoreStore
+ 	ba,a,pt		%xcc, 1b
++
++	.globl	__read_trylock
++__read_trylock: /* %o0 = lock_ptr */
++	ldsw		[%o0], %g5
++	brlz,pn		%g5, 100f
++	 add		%g5, 1, %g7
++	cas		[%o0], %g5, %g7
++	cmp		%g5, %g7
++	bne,pn		%icc, __read_trylock
++	 membar		#StoreLoad | #StoreStore
++	retl
++	 mov		1, %o0
++
++	.globl		__write_trylock
++__write_trylock: /* %o0 = lock_ptr */
++	sethi		%hi(0x80000000), %g2
++1:	lduw		[%o0], %g5
++4:	brnz,pn		%g5, 100f
++	 or		%g5, %g2, %g7
++	cas		[%o0], %g5, %g7
++	cmp		%g5, %g7
++	bne,pn		%icc, 1b
++	 membar		#StoreLoad | #StoreStore
++	retl
++	 mov		1, %o0
++100:	retl
++	 mov		0, %o0
++
+ rwlock_impl_end:
+ 
+--- linux-2.6.0-test6/arch/sparc64/mm/init.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/arch/sparc64/mm/init.c	2003-10-05 00:33:23.000000000 -0700
+@@ -1025,19 +1025,6 @@ void __flush_dcache_range(unsigned long 
+ 	}
+ }
+ 
+-void __flush_cache_all(void)
+-{
+-	/* Cheetah should be fine here too. */
+-	if (tlb_type == spitfire) {
+-		unsigned long va;
+-
+-		flushw_all();
+-		for (va =  0; va < (PAGE_SIZE << 1); va += 32)
+-			spitfire_put_icache_tag(va, 0x0);
+-		__asm__ __volatile__("flush %g6");
+-	}
+-}
+-
+ /* If not locked, zap it. */
+ void __flush_tlb_all(void)
+ {
+--- linux-2.6.0-test6/arch/sparc64/mm/ultra.S	2003-06-14 12:18:28.000000000 -0700
++++ 25/arch/sparc64/mm/ultra.S	2003-10-05 00:33:23.000000000 -0700
+@@ -721,20 +721,6 @@ xcall_flush_tlb_all_cheetah:
+ 	stxa		%g0, [%g2] ASI_IMMU_DEMAP
+ 	retry
+ 
+-	.globl		xcall_flush_cache_all_spitfire
+-xcall_flush_cache_all_spitfire:
+-	sethi		%hi(16383), %g2
+-	or		%g2, %lo(16383), %g2
+-	clr		%g3
+-1:	stxa		%g0, [%g3] ASI_IC_TAG
+-	membar		#Sync
+-	add		%g3, 32, %g3
+-	cmp		%g3, %g2
+-	bleu,pt		%xcc, 1b
+-	 nop
+-	flush		%g6
+-	retry
+-
+ 	/* These just get rescheduled to PIL vectors. */
+ 	.globl		xcall_call_function
+ xcall_call_function:
+--- linux-2.6.0-test6/arch/sparc/kernel/entry.S	2003-09-08 13:58:56.000000000 -0700
++++ 25/arch/sparc/kernel/entry.S	2003-10-05 00:33:23.000000000 -0700
+@@ -38,7 +38,7 @@
+ 
+ #define curptr      g6
+ 
+-#define NR_SYSCALLS 267      /* Each OS is different... */
++#define NR_SYSCALLS 268      /* Each OS is different... */
+ 
+ /* These are just handy. */
+ #define _SV	save	%sp, -STACKFRAME_SZ, %sp
+--- linux-2.6.0-test6/arch/sparc/kernel/systbls.S	2003-09-08 13:58:56.000000000 -0700
++++ 25/arch/sparc/kernel/systbls.S	2003-10-05 00:33:23.000000000 -0700
+@@ -72,7 +72,7 @@ sys_call_table:
+ /*250*/	.long sparc_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
+ /*255*/	.long sys_nis_syscall, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
+ /*260*/	.long sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun
+-/*265*/	.long sys_timer_delete, sys_timer_create, sys_nis_syscall
++/*265*/	.long sys_timer_delete, sys_timer_create, sys_nis_syscall, sys_nis_syscall
+ 
+ #ifdef CONFIG_SUNOS_EMUL
+ 	/* Now the SunOS syscall table. */
+@@ -171,6 +171,6 @@ sunos_sys_table:
+ 	.long sunos_nosys
+ /*260*/	.long sunos_nosys, sunos_nosys, sunos_nosys
+ 	.long sunos_nosys, sunos_nosys, sunos_nosys
+-	.long sunos_nosys, sunos_nosys
++	.long sunos_nosys, sunos_nosys, sunos_nosys
+ 
+ #endif
+--- linux-2.6.0-test6/arch/sparc/kernel/time.c	2003-07-13 21:44:34.000000000 -0700
++++ 25/arch/sparc/kernel/time.c	2003-10-05 00:36:33.000000000 -0700
+@@ -617,3 +617,12 @@ static int set_rtc_mmss(unsigned long no
+ 		return -1;
+ 	}
+ }
++
++/*
++ * Returns nanoseconds
++  */
++
++unsigned long long sched_clock(void)
++{
++	return (unsigned long long)jiffies * (1000000000 / HZ);
++}
+--- linux-2.6.0-test6/arch/um/config.release	2003-08-08 22:55:11.000000000 -0700
++++ 25/arch/um/config.release	2003-10-05 00:34:32.000000000 -0700
+@@ -228,7 +228,6 @@ CONFIG_ROMFS_FS=m
+ CONFIG_EXT2_FS=y
+ CONFIG_SYSV_FS=m
+ CONFIG_UDF_FS=m
+-# CONFIG_UDF_RW is not set
+ CONFIG_UFS_FS=m
+ # CONFIG_UFS_FS_WRITE is not set
+ 
+--- linux-2.6.0-test6/arch/um/defconfig	2003-08-08 22:55:11.000000000 -0700
++++ 25/arch/um/defconfig	2003-10-05 00:34:32.000000000 -0700
+@@ -3,29 +3,19 @@
+ #
+ CONFIG_USERMODE=y
+ CONFIG_MMU=y
+-CONFIG_SWAP=y
+ CONFIG_UID16=y
+ CONFIG_RWSEM_GENERIC_SPINLOCK=y
+-CONFIG_CONFIG_LOG_BUF_SHIFT=14
+-
+-#
+-# Code maturity level options
+-#
+-CONFIG_EXPERIMENTAL=y
+ 
+ #
+-# General Setup
++# UML-specific options
+ #
+ CONFIG_MODE_TT=y
+ CONFIG_MODE_SKAS=y
+ CONFIG_NET=y
+-CONFIG_SYSVIPC=y
+-CONFIG_BSD_PROCESS_ACCT=y
+-CONFIG_SYSCTL=y
+-CONFIG_BINFMT_AOUT=y
+ CONFIG_BINFMT_ELF=y
+ CONFIG_BINFMT_MISC=y
+ CONFIG_HOSTFS=y
++CONFIG_HPPFS=y
+ CONFIG_MCONSOLE=y
+ CONFIG_MAGIC_SYSRQ=y
+ # CONFIG_HOST_2G_2G is not set
+@@ -38,10 +28,38 @@ CONFIG_PROC_MM=y
+ CONFIG_KERNEL_STACK_ORDER=2
+ 
+ #
++# Code maturity level options
++#
++CONFIG_EXPERIMENTAL=y
++CONFIG_CLEAN_COMPILE=y
++CONFIG_STANDALONE=y
++CONFIG_BROKEN_ON_SMP=y
++
++#
++# General setup
++#
++CONFIG_SWAP=y
++CONFIG_SYSVIPC=y
++CONFIG_BSD_PROCESS_ACCT=y
++CONFIG_SYSCTL=y
++CONFIG_LOG_BUF_SHIFT=14
++# CONFIG_IKCONFIG is not set
++# CONFIG_EMBEDDED is not set
++CONFIG_KALLSYMS=y
++CONFIG_FUTEX=y
++CONFIG_EPOLL=y
++CONFIG_IOSCHED_NOOP=y
++CONFIG_IOSCHED_AS=y
++CONFIG_IOSCHED_DEADLINE=y
++
++#
+ # Loadable module support
+ #
+-CONFIG_MODULES=y
+-# CONFIG_KMOD is not set
++# CONFIG_MODULES is not set
++
++#
++# Generic Driver Options
++#
+ 
+ #
+ # Character Devices
+@@ -69,6 +87,7 @@ CONFIG_HOSTAUDIO=y
+ #
+ CONFIG_BLK_DEV_UBD=y
+ # CONFIG_BLK_DEV_UBD_SYNC is not set
++CONFIG_BLK_DEV_COW_COMMON=y
+ CONFIG_BLK_DEV_LOOP=y
+ CONFIG_BLK_DEV_NBD=y
+ CONFIG_BLK_DEV_RAM=y
+@@ -78,7 +97,7 @@ CONFIG_BLK_DEV_INITRD=y
+ CONFIG_NETDEVICES=y
+ 
+ #
+-# Network Devices
++# UML Network Devices
+ #
+ CONFIG_UML_NET=y
+ CONFIG_UML_NET_ETHERTAP=y
+@@ -88,22 +107,6 @@ CONFIG_UML_NET_DAEMON=y
+ CONFIG_UML_NET_MCAST=y
+ # CONFIG_UML_NET_PCAP is not set
+ CONFIG_UML_NET_SLIRP=y
+-CONFIG_DUMMY=y
+-# CONFIG_BONDING is not set
+-# CONFIG_EQUALIZER is not set
+-CONFIG_TUN=y
+-# CONFIG_ETHERTAP is not set
+-CONFIG_PPP=y
+-# CONFIG_PPP_MULTILINK is not set
+-# CONFIG_PPP_ASYNC is not set
+-# CONFIG_PPP_SYNC_TTY is not set
+-# CONFIG_PPP_DEFLATE is not set
+-# CONFIG_PPP_BSDCOMP is not set
+-# CONFIG_PPPOE is not set
+-CONFIG_SLIP=y
+-# CONFIG_SLIP_COMPRESSED is not set
+-# CONFIG_SLIP_SMART is not set
+-# CONFIG_SLIP_MODE_SLIP6 is not set
+ 
+ #
+ # Networking support
+@@ -115,8 +118,6 @@ CONFIG_SLIP=y
+ CONFIG_PACKET=y
+ CONFIG_PACKET_MMAP=y
+ # CONFIG_NETLINK_DEV is not set
+-# CONFIG_NETFILTER is not set
+-# CONFIG_FILTER is not set
+ CONFIG_UNIX=y
+ # CONFIG_NET_KEY is not set
+ CONFIG_INET=y
+@@ -130,8 +131,11 @@ CONFIG_INET=y
+ # CONFIG_SYN_COOKIES is not set
+ # CONFIG_INET_AH is not set
+ # CONFIG_INET_ESP is not set
+-# CONFIG_XFRM_USER is not set
++# CONFIG_INET_IPCOMP is not set
+ # CONFIG_IPV6 is not set
++# CONFIG_DECNET is not set
++# CONFIG_BRIDGE is not set
++# CONFIG_NETFILTER is not set
+ 
+ #
+ # SCTP Configuration (EXPERIMENTAL)
+@@ -141,8 +145,6 @@ CONFIG_IPV6_SCTP__=y
+ # CONFIG_ATM is not set
+ # CONFIG_VLAN_8021Q is not set
+ # CONFIG_LLC is not set
+-# CONFIG_DECNET is not set
+-# CONFIG_BRIDGE is not set
+ # CONFIG_X25 is not set
+ # CONFIG_LAPB is not set
+ # CONFIG_NET_DIVERT is not set
+@@ -160,6 +162,10 @@ CONFIG_IPV6_SCTP__=y
+ # Network testing
+ #
+ # CONFIG_NET_PKTGEN is not set
++CONFIG_DUMMY=y
++# CONFIG_BONDING is not set
++# CONFIG_EQUALIZER is not set
++CONFIG_TUN=y
+ 
+ #
+ # Ethernet (10 or 100Mbit)
+@@ -171,6 +177,22 @@ CONFIG_IPV6_SCTP__=y
+ #
+ 
+ #
++# Ethernet (10000 Mbit)
++#
++CONFIG_PPP=y
++# CONFIG_PPP_MULTILINK is not set
++# CONFIG_PPP_FILTER is not set
++# CONFIG_PPP_ASYNC is not set
++# CONFIG_PPP_SYNC_TTY is not set
++# CONFIG_PPP_DEFLATE is not set
++# CONFIG_PPP_BSDCOMP is not set
++# CONFIG_PPPOE is not set
++CONFIG_SLIP=y
++# CONFIG_SLIP_COMPRESSED is not set
++# CONFIG_SLIP_SMART is not set
++# CONFIG_SLIP_MODE_SLIP6 is not set
++
++#
+ # Wireless LAN (non-hamradio)
+ #
+ # CONFIG_NET_RADIO is not set
+@@ -188,66 +210,82 @@ CONFIG_IPV6_SCTP__=y
+ #
+ # File systems
+ #
++CONFIG_EXT2_FS=y
++# CONFIG_EXT2_FS_XATTR is not set
++# CONFIG_EXT3_FS is not set
++# CONFIG_JBD is not set
++CONFIG_REISERFS_FS=y
++# CONFIG_REISERFS_CHECK is not set
++# CONFIG_REISERFS_PROC_INFO is not set
++# CONFIG_JFS_FS is not set
++# CONFIG_XFS_FS is not set
++CONFIG_MINIX_FS=y
++# CONFIG_ROMFS_FS is not set
+ CONFIG_QUOTA=y
+ # CONFIG_QFMT_V1 is not set
+ # CONFIG_QFMT_V2 is not set
+ CONFIG_QUOTACTL=y
+-CONFIG_AUTOFS_FS=m
+-CONFIG_AUTOFS4_FS=m
+-CONFIG_REISERFS_FS=m
+-# CONFIG_REISERFS_CHECK is not set
+-# CONFIG_REISERFS_PROC_INFO is not set
++CONFIG_AUTOFS_FS=y
++CONFIG_AUTOFS4_FS=y
++
++#
++# CD-ROM/DVD Filesystems
++#
++CONFIG_ISO9660_FS=y
++# CONFIG_JOLIET is not set
++# CONFIG_ZISOFS is not set
++# CONFIG_UDF_FS is not set
++
++#
++# DOS/FAT/NT Filesystems
++#
++CONFIG_FAT_FS=y
++CONFIG_MSDOS_FS=y
++CONFIG_VFAT_FS=y
++# CONFIG_NTFS_FS is not set
++
++#
++# Pseudo filesystems
++#
++CONFIG_PROC_FS=y
++CONFIG_DEVFS_FS=y
++CONFIG_DEVFS_MOUNT=y
++# CONFIG_DEVFS_DEBUG is not set
++CONFIG_DEVPTS_FS=y
++# CONFIG_DEVPTS_FS_XATTR is not set
++# CONFIG_TMPFS is not set
++CONFIG_RAMFS=y
++
++#
++# Miscellaneous filesystems
++#
+ # CONFIG_ADFS_FS is not set
+ # CONFIG_AFFS_FS is not set
+ # CONFIG_HFS_FS is not set
+ # CONFIG_BEFS_FS is not set
+ # CONFIG_BFS_FS is not set
+-# CONFIG_EXT3_FS is not set
+-# CONFIG_JBD is not set
+-CONFIG_FAT_FS=m
+-CONFIG_MSDOS_FS=m
+-CONFIG_VFAT_FS=m
+ # CONFIG_EFS_FS is not set
+ CONFIG_JFFS_FS=y
+ CONFIG_JFFS_FS_VERBOSE=0
+-CONFIG_JFFS_PROC_FS=y
+ # CONFIG_JFFS2_FS is not set
+ # CONFIG_CRAMFS is not set
+-# CONFIG_TMPFS is not set
+-CONFIG_RAMFS=y
+-CONFIG_ISO9660_FS=m
+-# CONFIG_JOLIET is not set
+-# CONFIG_ZISOFS is not set
+-# CONFIG_JFS_FS is not set
+-CONFIG_MINIX_FS=m
+ # CONFIG_VXFS_FS is not set
+-# CONFIG_NTFS_FS is not set
+ # CONFIG_HPFS_FS is not set
+-CONFIG_PROC_FS=y
+-CONFIG_DEVFS_FS=y
+-CONFIG_DEVFS_MOUNT=y
+-# CONFIG_DEVFS_DEBUG is not set
+-CONFIG_DEVPTS_FS=y
+ # CONFIG_QNX4FS_FS is not set
+-# CONFIG_ROMFS_FS is not set
+-CONFIG_EXT2_FS=y
+-# CONFIG_EXT2_FS_XATTR is not set
+ # CONFIG_SYSV_FS is not set
+-# CONFIG_UDF_FS is not set
+ # CONFIG_UFS_FS is not set
+-# CONFIG_XFS_FS is not set
+ 
+ #
+ # Network File Systems
+ #
+-# CONFIG_CODA_FS is not set
+-# CONFIG_INTERMEZZO_FS is not set
+ # CONFIG_NFS_FS is not set
+ # CONFIG_NFSD is not set
+ # CONFIG_EXPORTFS is not set
+-# CONFIG_CIFS is not set
+ # CONFIG_SMB_FS is not set
++# CONFIG_CIFS is not set
+ # CONFIG_NCP_FS is not set
++# CONFIG_CODA_FS is not set
++# CONFIG_INTERMEZZO_FS is not set
+ # CONFIG_AFS_FS is not set
+ 
+ #
+@@ -317,28 +355,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
+ #
+ # SCSI support
+ #
+-CONFIG_SCSI=y
+-CONFIG_GENERIC_ISA_DMA=y
+-
+-#
+-# SCSI support type (disk, tape, CD-ROM)
+-#
+-CONFIG_BLK_DEV_SD=y
+-CONFIG_SD_EXTRA_DEVS=40
+-CONFIG_CHR_DEV_ST=y
+-CONFIG_BLK_DEV_SR=y
+-CONFIG_BLK_DEV_SR_VENDOR=y
+-CONFIG_SR_EXTRA_DEVS=2
+-CONFIG_CHR_DEV_SG=y
+-
+-#
+-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+-#
+-CONFIG_SCSI_DEBUG_QUEUES=y
+-CONFIG_SCSI_MULTI_LUN=y
+-CONFIG_SCSI_CONSTANTS=y
+-CONFIG_SCSI_LOGGING=y
+-CONFIG_SCSI_DEBUG=y
++# CONFIG_SCSI is not set
+ 
+ #
+ # Multi-device support (RAID and LVM)
+@@ -360,6 +377,7 @@ CONFIG_MTD_CHAR=y
+ CONFIG_MTD_BLOCK=y
+ # CONFIG_FTL is not set
+ # CONFIG_NFTL is not set
++# CONFIG_INFTL is not set
+ 
+ #
+ # RAM/ROM/Flash chip drivers
+@@ -374,20 +392,21 @@ CONFIG_MTD_BLOCK=y
+ #
+ # Mapping drivers for chip access
+ #
++# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+ 
+ #
+ # Self-contained MTD device drivers
+ #
+ # CONFIG_MTD_SLRAM is not set
+ # CONFIG_MTD_MTDRAM is not set
+-CONFIG_MTD_BLKMTD=m
++CONFIG_MTD_BLKMTD=y
+ 
+ #
+ # Disk-On-Chip Device Drivers
+ #
+-# CONFIG_MTD_DOC1000 is not set
+ # CONFIG_MTD_DOC2000 is not set
+ # CONFIG_MTD_DOC2001 is not set
++# CONFIG_MTD_DOC2001PLUS is not set
+ 
+ #
+ # NAND Flash Device Drivers
+--- linux-2.6.0-test6/arch/um/drivers/chan_kern.c	2003-06-14 12:18:35.000000000 -0700
++++ 25/arch/um/drivers/chan_kern.c	2003-10-05 00:34:32.000000000 -0700
+@@ -8,6 +8,7 @@
+ #include <linux/list.h>
+ #include <linux/slab.h>
+ #include <linux/tty.h>
++#include <linux/string.h>
+ #include <linux/tty_flip.h>
+ #include <asm/irq.h>
+ #include "chan_kern.h"
+--- linux-2.6.0-test6/arch/um/drivers/chan_user.c	2003-06-14 12:17:56.000000000 -0700
++++ 25/arch/um/drivers/chan_user.c	2003-10-05 00:34:32.000000000 -0700
+@@ -188,8 +188,8 @@ void register_winch(int fd, void *device
+ 	if(!isatty(fd)) return;
+ 
+ 	pid = tcgetpgrp(fd);
+-	if(!CHOOSE_MODE(is_tracer_winch(pid, fd, device_data), 0) && 
+-	   (pid == -1)){
++	if(!CHOOSE_MODE_PROC(is_tracer_winch, is_skas_winch, pid, fd, 
++			     device_data) && (pid == -1)){
+ 		thread = winch_tramp(fd, device_data, &thread_fd);
+ 		if(fd != -1){
+ 			register_winch_irq(thread_fd, fd, thread, device_data);
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/arch/um/drivers/cow.h	2003-10-05 00:34:32.000000000 -0700
+@@ -0,0 +1,40 @@
++#ifndef __COW_H__
++#define __COW_H__
++
++#include <asm/types.h>
++
++#if __BYTE_ORDER == __BIG_ENDIAN
++# define ntohll(x) (x)
++# define htonll(x) (x)
++#elif __BYTE_ORDER == __LITTLE_ENDIAN
++# define ntohll(x)  bswap_64(x)
++# define htonll(x)  bswap_64(x)
++#else
++#error "__BYTE_ORDER not defined"
++#endif
++
++extern int init_cow_file(int fd, char *cow_file, char *backing_file, 
++			 int sectorsize, int *bitmap_offset_out, 
++			 unsigned long *bitmap_len_out, int *data_offset_out);
++
++extern int file_reader(__u64 offset, char *buf, int len, void *arg);
++extern int read_cow_header(int (*reader)(__u64, char *, int, void *), 
++			   void *arg, __u32 *magic_out, 
++			   char **backing_file_out, time_t *mtime_out, 
++			   __u64 *size_out, int *sectorsize_out, 
++			   int *bitmap_offset_out);
++
++extern int write_cow_header(char *cow_file, int fd, char *backing_file, 
++			    int sectorsize, long long *size);
++
++extern void cow_sizes(__u64 size, int sectorsize, int bitmap_offset, 
++		      unsigned long *bitmap_len_out, int *data_offset_out);
++
++#endif
++
++/*
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/arch/um/drivers/cow_kern.c	2003-10-05 00:34:32.000000000 -0700
+@@ -0,0 +1,628 @@
++#define COW_MAJOR 60
++#define MAJOR_NR COW_MAJOR
++
++#include <linux/stddef.h>
++#include <linux/kernel.h>
++#include <linux/ctype.h>
++#include <linux/stat.h>
++#include <linux/vmalloc.h>
++#include <linux/blkdev.h>
++#include <linux/blk.h>
++#include <linux/fs.h>
++#include <linux/genhd.h>
++#include <linux/devfs_fs.h>
++#include <asm/uaccess.h>
++#include "2_5compat.h"
++#include "cow.h"
++#include "ubd_user.h"
++
++#define COW_SHIFT 4
++
++struct cow {
++	int count;
++	char *cow_path;
++	dev_t cow_dev;
++	struct block_device *cow_bdev;
++	char *backing_path;
++	dev_t backing_dev;
++	struct block_device *backing_bdev;
++	int sectorsize;
++	unsigned long *bitmap;
++	unsigned long bitmap_len;
++	int bitmap_offset;
++	int data_offset;
++	devfs_handle_t devfs;
++	struct semaphore sem;
++	struct semaphore io_sem;
++	atomic_t working;
++	spinlock_t io_lock;
++	struct buffer_head *bh;
++	struct buffer_head *bhtail;
++	void *end_io;
++};
++
++#define DEFAULT_COW { \
++	.count			= 0, \
++	.cow_path		= NULL, \
++	.cow_dev		= 0, \
++	.backing_path		= NULL, \
++	.backing_dev		= 0, \
++        .bitmap			= NULL, \
++	.bitmap_len		= 0, \
++	.bitmap_offset		= 0, \
++        .data_offset		= 0, \
++	.devfs			= NULL, \
++	.working		= ATOMIC_INIT(0), \
++	.io_lock		= SPIN_LOCK_UNLOCKED, \
++}
++
++#define MAX_DEV (8)
++#define MAX_MINOR (MAX_DEV << COW_SHIFT)
++
++struct cow cow_dev[MAX_DEV] = { [ 0 ... MAX_DEV - 1 ] = DEFAULT_COW };
++
++/* Not modified by this driver */
++static int blk_sizes[MAX_MINOR] = { [ 0 ... MAX_MINOR - 1 ] = BLOCK_SIZE };
++static int hardsect_sizes[MAX_MINOR] = { [ 0 ... MAX_MINOR - 1 ] = 512 };
++
++/* Protected by cow_lock */
++static int sizes[MAX_MINOR] = { [ 0 ... MAX_MINOR - 1 ] = 0 };
++
++static struct hd_struct	cow_part[MAX_MINOR] =
++	{ [ 0 ... MAX_MINOR - 1 ] = { 0, 0, 0 } };
++
++/* Protected by io_request_lock */
++static request_queue_t *cow_queue;
++
++static int cow_open(struct inode *inode, struct file *filp);
++static int cow_release(struct inode * inode, struct file * file);
++static int cow_ioctl(struct inode * inode, struct file * file,
++		     unsigned int cmd, unsigned long arg);
++static int cow_revalidate(kdev_t rdev);
++
++static struct block_device_operations cow_blops = {
++       .open		= cow_open,
++       .release	= cow_release,
++       .ioctl		= cow_ioctl,
++       .revalidate	= cow_revalidate,
++};
++
++/* Initialized in an initcall, and unchanged thereafter */
++devfs_handle_t cow_dir_handle;
++
++#define INIT_GENDISK(maj, name, parts, shift, bsizes, max, blops) \
++{ \
++	.major 		= maj, \
++	.major_name  	= name, \
++	.minor_shift 	= shift, \
++	.max_p  	= 1 << shift, \
++	.part  		= parts, \
++	.sizes  	= bsizes, \
++	.nr_real  	= max, \
++	.real_devices  	= NULL, \
++	.next  		= NULL, \
++	.fops  		= blops, \
++	.de_arr  	= NULL, \
++	.flags  	= 0 \
++}
++
++static spinlock_t cow_lock = SPIN_LOCK_UNLOCKED;
++
++static struct gendisk cow_gendisk = INIT_GENDISK(MAJOR_NR, "cow", cow_part,
++						 COW_SHIFT, sizes, MAX_DEV, 
++						 &cow_blops);
++
++static int cow_add(int n)
++{
++	struct cow *dev = &cow_dev[n];
++	char name[sizeof("nnnnnn\0")];
++	int err = -ENODEV;
++
++	if(dev->cow_path == NULL)
++		goto out;
++
++	sprintf(name, "%d", n);
++	dev->devfs = devfs_register(cow_dir_handle, name, DEVFS_FL_REMOVABLE,
++				    MAJOR_NR, n << COW_SHIFT, S_IFBLK | 
++				    S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
++				    &cow_blops, NULL);
++
++	init_MUTEX_LOCKED(&dev->sem);
++	init_MUTEX(&dev->io_sem);
++
++	return(0);
++
++out:
++	return(err);
++}
++
++/*
++* Add buffer_head to back of pending list
++*/
++static void cow_add_bh(struct cow *cow, struct buffer_head *bh)
++{
++	unsigned long flags;
++
++	spin_lock_irqsave(&cow->io_lock, flags);
++	if(cow->bhtail != NULL){
++		cow->bhtail->b_reqnext = bh;
++		cow->bhtail = bh;
++	}
++	else {
++		cow->bh = bh;
++		cow->bhtail = bh;
++	}
++	spin_unlock_irqrestore(&cow->io_lock, flags);
++}
++
++/*
++* Grab first pending buffer
++*/
++static struct buffer_head *cow_get_bh(struct cow *cow)
++{
++	struct buffer_head *bh;
++
++	spin_lock_irq(&cow->io_lock);
++	bh = cow->bh;
++	if(bh != NULL){
++		if(bh == cow->bhtail)
++			cow->bhtail = NULL;
++		cow->bh = bh->b_reqnext;
++		bh->b_reqnext = NULL;
++	}
++	spin_unlock_irq(&cow->io_lock);
++
++	return(bh);
++}
++
++static void cow_handle_bh(struct cow *cow, struct buffer_head *bh, 
++			  struct buffer_head **cow_bh, int ncow_bh)
++{
++	int i;
++
++	if(ncow_bh > 0)
++		ll_rw_block(WRITE, ncow_bh, cow_bh);
++
++	for(i = 0; i < ncow_bh ; i++){
++		wait_on_buffer(cow_bh[i]);
++		brelse(cow_bh[i]);
++	}
++
++	ll_rw_block(WRITE, 1, &bh);
++	brelse(bh);
++}
++
++static struct buffer_head *cow_new_bh(struct cow *dev, int sector)
++{
++	struct buffer_head *bh;
++
++	sector = (dev->bitmap_offset + sector / 8) / dev->sectorsize;
++	bh = getblk(dev->cow_dev, sector, dev->sectorsize);
++	memcpy(bh->b_data, dev->bitmap + sector / (8 * sizeof(dev->bitmap[0])),
++	       dev->sectorsize);
++	return(bh);
++}
++
++/* Copied from loop.c, needed to avoid deadlocking in make_request. */
++
++static int cow_thread(void *data)
++{
++	struct cow *dev = data;
++	struct buffer_head *bh;
++
++	daemonize();
++	exit_files(current);
++
++	sprintf(current->comm, "cow%d", dev - cow_dev);
++
++	spin_lock_irq(&current->sigmask_lock);
++	sigfillset(&current->blocked);
++	flush_signals(current);
++	spin_unlock_irq(&current->sigmask_lock);
++
++	atomic_inc(&dev->working);
++
++	current->policy = SCHED_OTHER;
++	current->nice = -20;
++
++	current->flags |= PF_NOIO;
++
++	/*
++	 * up sem, we are running
++	 */
++	up(&dev->sem);
++
++	for(;;){
++		int start, len, nbh, i, update_bitmap = 0;
++		struct buffer_head *cow_bh[2];
++
++		down_interruptible(&dev->io_sem);
++		/*
++		 * could be upped because of tear-down, not because of
++		 * pending work
++		 */
++		if(!atomic_read(&dev->working))
++			break;
++
++		bh = cow_get_bh(dev);
++		if(bh == NULL){
++			printk(KERN_ERR "cow: missing bh\n");
++			continue;
++		}
++
++		start = bh->b_blocknr * bh->b_size / dev->sectorsize;
++		len = bh->b_size / dev->sectorsize;
++		for(i = 0; i < len ; i++){
++			if(ubd_test_bit(start +ni, 
++					(unsigned char *) dev->bitmap))
++				continue;
++
++			update_bitmap = 1;
++			ubd_set_bit(start + i, (unsigned char *) dev->bitmap);
++		}
++
++		cow_bh[0] = NULL;
++		cow_bh[1] = NULL;
++		nbh = 0;
++		if(update_bitmap){
++			cow_bh[0] = cow_new_bh(dev, start);
++			nbh++;
++			if(start / dev->sectorsize != 
++			   (start + len) / dev->sectorsize){
++				cow_bh[1] = cow_new_bh(dev, start + len);
++				nbh++;
++			}
++		}
++		
++		bh->b_dev = dev->cow_dev;
++		bh->b_blocknr += dev->data_offset / dev->sectorsize;
++
++		cow_handle_bh(dev, bh, cow_bh, nbh);
++
++		/*
++		 * upped both for pending work and tear-down, lo_pending
++		 * will hit zero then
++		 */
++		if(atomic_dec_and_test(&dev->working))
++			break;
++	}
++
++	up(&dev->sem);
++	return(0);
++}
++
++static int cow_make_request(request_queue_t *q, int rw, struct buffer_head *bh)
++{
++	struct cow *dev;
++	int n, minor;
++
++	minor = MINOR(bh->b_rdev);
++	n = minor >> COW_SHIFT;
++	dev = &cow_dev[n];
++
++	dev->end_io = NULL;
++	if(ubd_test_bit(bh->b_rsector, (unsigned char *) dev->bitmap)){
++		bh->b_rdev = dev->cow_dev;
++		bh->b_rsector += dev->data_offset / dev->sectorsize;
++	}
++	else if(rw == WRITE){
++		bh->b_dev = dev->cow_dev;
++		bh->b_blocknr += dev->data_offset / dev->sectorsize;
++
++		cow_add_bh(dev, bh);
++		up(&dev->io_sem);
++		return(0);
++	}
++	else {
++		bh->b_rdev = dev->backing_dev;
++	}
++
++	return(1);
++}
++
++int cow_init(void)
++{
++	int i;
++
++	cow_dir_handle = devfs_mk_dir (NULL, "cow", NULL);
++	if (devfs_register_blkdev(MAJOR_NR, "cow", &cow_blops)) {
++		printk(KERN_ERR "cow: unable to get major %d\n", MAJOR_NR);
++		return -1;
++	}
++	read_ahead[MAJOR_NR] = 8;		/* 8 sector (4kB) read-ahead */
++	blksize_size[MAJOR_NR] = blk_sizes;
++	blk_size[MAJOR_NR] = sizes;
++	INIT_HARDSECT(hardsect_size, MAJOR_NR, hardsect_sizes);
++
++	cow_queue = BLK_DEFAULT_QUEUE(MAJOR_NR);
++	blk_init_queue(cow_queue, NULL);
++	INIT_ELV(cow_queue, &cow_queue->elevator);
++	blk_queue_make_request(cow_queue, cow_make_request);
++
++       add_gendisk(&cow_gendisk);
++
++	for(i=0;i<MAX_DEV;i++) 
++		cow_add(i);
++
++	return(0);
++}
++
++__initcall(cow_init);
++
++static int reader(__u64 start, char *buf, int count, void *arg)
++{
++	dev_t dev = *((dev_t *) arg);
++	struct buffer_head *bh;
++	__u64 block;
++	int cur, offset, left, n, blocksize = get_hardsect_size(dev);
++
++	if(blocksize == 0)
++		panic("Zero blocksize");
++
++	block = start / blocksize;
++	offset = start % blocksize;
++	left = count;
++	cur = 0;
++	while(left > 0){
++		n = (left > blocksize) ? blocksize : left;
++
++		bh = bread(dev, block, (n < 512) ? 512 : n);
++		if(bh == NULL)
++			return(-EIO);
++
++		n -= offset;
++		memcpy(&buf[cur], bh->b_data + offset, n);
++		block++;
++		left -= n;
++		cur += n;
++		offset = 0;
++		brelse(bh);
++	}
++
++	return(count);
++}
++
++static int cow_open(struct inode *inode, struct file *filp)
++{
++	int (*dev_ioctl)(struct inode *, struct file *, unsigned int, 
++			 unsigned long);
++	mm_segment_t fs;
++	struct cow *dev;
++	__u64 size;
++	__u32 magic;
++	time_t mtime;
++	char *backing_file;
++	int n, offset, err = 0;
++
++	n = DEVICE_NR(inode->i_rdev);
++	if(n >= MAX_DEV)
++		return(-ENODEV);
++	dev = &cow_dev[n];
++	offset = n << COW_SHIFT;
++
++	spin_lock(&cow_lock);
++
++	if(dev->count == 0){
++		dev->cow_dev = name_to_kdev_t(dev->cow_path);
++		if(dev->cow_dev == 0){
++			printk(KERN_ERR "cow_open - name_to_kdev_t(\"%s\") "
++			       "failed\n", dev->cow_path);
++			err = -ENODEV;
++		}
++
++		dev->backing_dev = name_to_kdev_t(dev->backing_path);
++		if(dev->backing_dev == 0){
++			printk(KERN_ERR "cow_open - name_to_kdev_t(\"%s\") "
++			       "failed\n", dev->backing_path);
++			err = -ENODEV;
++		}
++
++		if(err) 
++			goto out;
++
++		dev->cow_bdev = bdget(dev->cow_dev);
++		if(dev->cow_bdev == NULL){
++			printk(KERN_ERR "cow_open - bdget(\"%s\") failed\n", 
++			       dev->cow_path);
++			err = -ENOMEM;
++		}
++		dev->backing_bdev = bdget(dev->backing_dev);
++		if(dev->backing_bdev == NULL){
++			printk(KERN_ERR "cow_open - bdget(\"%s\") failed\n", 
++			       dev->backing_path);
++			err = -ENOMEM;
++		}
++
++		if(err) 
++			goto out;
++
++		err = blkdev_get(dev->cow_bdev, FMODE_READ|FMODE_WRITE, 0, 
++				 BDEV_RAW);
++		if(err){
++			printk("cow_open - blkdev_get of COW device failed, "
++			       "error = %d\n", err);
++			goto out;
++		}
++		
++		err = blkdev_get(dev->backing_bdev, FMODE_READ, 0, BDEV_RAW);
++		if(err){
++			printk("cow_open - blkdev_get of backing device "
++			       "failed, error = %d\n", err);
++			goto out;
++		}
++		
++		err = read_cow_header(reader, &dev->cow_dev, &magic, 
++				      &backing_file, &mtime, &size,
++				      &dev->sectorsize, &dev->bitmap_offset);
++		if(err){
++			printk(KERN_ERR "cow_open - read_cow_header failed, "
++			       "err = %d\n", err);
++			goto out;
++		}
++
++		cow_sizes(size, dev->sectorsize, dev->bitmap_offset, 
++			  &dev->bitmap_len, &dev->data_offset);
++		dev->bitmap = (void *) vmalloc(dev->bitmap_len);
++		if(dev->bitmap == NULL){
++			err = -ENOMEM;
++			printk(KERN_ERR "Failed to vmalloc COW bitmap\n");
++			goto out;
++		}
++		flush_tlb_kernel_vm();
++		
++		err = reader(dev->bitmap_offset, (char *) dev->bitmap, 
++			     dev->bitmap_len, &dev->cow_dev);
++		if(err < 0){
++			printk(KERN_ERR "Failed to read COW bitmap\n");
++			vfree(dev->bitmap);
++			goto out;
++		}
++
++		dev_ioctl = dev->backing_bdev->bd_op->ioctl;
++		fs = get_fs();
++		set_fs(KERNEL_DS);
++		err = (*dev_ioctl)(inode, filp, BLKGETSIZE, 
++				   (unsigned long) &sizes[offset]);
++		set_fs(fs);
++		if(err){
++			printk(KERN_ERR "cow_open - BLKGETSIZE failed, "
++			       "error = %d\n", err);
++			goto out;
++		}
++
++		kernel_thread(cow_thread, dev, 
++			      CLONE_FS | CLONE_FILES | CLONE_SIGHAND);
++		down(&dev->sem);
++	}
++	dev->count++;
++out:
++	spin_unlock(&cow_lock);
++	return(err);
++}
++
++static int cow_release(struct inode * inode, struct file * file)
++{
++	struct cow *dev;
++	int n, err;
++
++	n = DEVICE_NR(inode->i_rdev);
++	if(n >= MAX_DEV)
++		return(-ENODEV);
++	dev = &cow_dev[n];
++
++	spin_lock(&cow_lock);
++
++	if(--dev->count > 0)
++		goto out;
++
++	err = blkdev_put(dev->cow_bdev, BDEV_RAW);
++	if(err)
++		printk("cow_release - blkdev_put of cow device failed, "
++		       "error = %d\n", err);
++	bdput(dev->cow_bdev);
++	dev->cow_bdev = 0;
++
++	err = blkdev_put(dev->backing_bdev, BDEV_RAW);
++	if(err)
++		printk("cow_release - blkdev_put of backing device failed, "
++		       "error = %d\n", err);
++	bdput(dev->backing_bdev);
++	dev->backing_bdev = 0;
++
++out:
++	spin_unlock(&cow_lock);
++	return(0);
++}
++
++static int cow_ioctl(struct inode * inode, struct file * file,
++		     unsigned int cmd, unsigned long arg)
++{
++	struct cow *dev;
++	int (*dev_ioctl)(struct inode *, struct file *, unsigned int, 
++			 unsigned long);
++	int n;
++
++	n = DEVICE_NR(inode->i_rdev);
++	if(n >= MAX_DEV)
++		return(-ENODEV);
++	dev = &cow_dev[n];
++
++	dev_ioctl = dev->backing_bdev->bd_op->ioctl;
++	return((*dev_ioctl)(inode, file, cmd, arg));
++}
++
++static int cow_revalidate(kdev_t rdev)
++{
++	printk(KERN_ERR "Need to implement cow_revalidate\n");
++	return(0);
++}
++
++static int parse_unit(char **ptr)
++{
++	char *str = *ptr, *end;
++	int n = -1;
++
++	if(isdigit(*str)) {
++		n = simple_strtoul(str, &end, 0);
++		if(end == str)
++			return(-1);
++		*ptr = end;
++	}
++	else if (('a' <= *str) && (*str <= 'h')) {
++		n = *str - 'a';
++		str++;
++		*ptr = str;
++	}
++	return(n);
++}
++
++static int cow_setup(char *str)
++{
++	struct cow *dev;
++	char *cow_name, *backing_name;
++	int unit;
++
++	unit = parse_unit(&str);
++	if(unit < 0){
++		printk(KERN_ERR "cow_setup - Couldn't parse unit number\n");
++		return(1);
++	}
++
++	if(*str != '='){
++		printk(KERN_ERR "cow_setup - Missing '=' after unit "
++		       "number\n");
++		return(1);
++	}
++	str++;
++
++	cow_name = str;
++	backing_name = strchr(str, ',');
++	if(backing_name == NULL){
++		printk(KERN_ERR "cow_setup - missing backing device name\n");
++		return(0);
++	}
++	*backing_name = '\0';
++	backing_name++;
++
++	spin_lock(&cow_lock);
++
++	dev = &cow_dev[unit];
++	dev->cow_path = cow_name;
++	dev->backing_path = backing_name;
++	
++	spin_unlock(&cow_lock);
++	return(0);
++}
++
++__setup("cow", cow_setup);
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/arch/um/drivers/cow_sys.h	2003-10-05 00:34:32.000000000 -0700
+@@ -0,0 +1,48 @@
++#ifndef __COW_SYS_H__
++#define __COW_SYS_H__
++
++#include "kern_util.h"
++#include "user_util.h"
++#include "os.h"
++#include "user.h"
++
++static inline void *cow_malloc(int size)
++{
++	return(um_kmalloc(size));
++}
++
++static inline void cow_free(void *ptr)
++{
++	kfree(ptr);
++}
++
++#define cow_printf printk
++
++static inline char *cow_strdup(char *str)
++{
++	return(uml_strdup(str));
++}
++
++static inline int cow_seek_file(int fd, __u64 offset)
++{
++	return(os_seek_file(fd, offset));
++}
++
++static inline int cow_file_size(char *file, __u64 *size_out)
++{
++	return(os_file_size(file, size_out));
++}
++
++static inline int cow_write_file(int fd, char *buf, int size)
++{
++	return(os_write_file(fd, buf, size));
++}
++
++#endif
++
++/*
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/arch/um/drivers/cow_user.c	2003-10-05 00:34:32.000000000 -0700
+@@ -0,0 +1,296 @@
++#include <stddef.h>
++#include <string.h>
++#include <errno.h>
++#include <unistd.h>
++#include <byteswap.h>
++#include <sys/stat.h>
++#include <sys/time.h>
++#include <sys/param.h>
++#include <netinet/in.h>
++
++#include "cow.h"
++#include "cow_sys.h"
++
++#define PATH_LEN_V1 256
++
++struct cow_header_v1 {
++	int magic;
++	int version;
++	char backing_file[PATH_LEN_V1];
++	time_t mtime;
++	__u64 size;
++	int sectorsize;
++};
++
++#define PATH_LEN_V2 MAXPATHLEN
++
++struct cow_header_v2 {
++	unsigned long magic;
++	unsigned long version;
++	char backing_file[PATH_LEN_V2];
++	time_t mtime;
++	__u64 size;
++	int sectorsize;
++};
++
++union cow_header {
++	struct cow_header_v1 v1;
++	struct cow_header_v2 v2;
++};
++
++#define COW_MAGIC 0x4f4f4f4d  /* MOOO */
++#define COW_VERSION 2
++
++void cow_sizes(__u64 size, int sectorsize, int bitmap_offset, 
++	       unsigned long *bitmap_len_out, int *data_offset_out)
++{
++	*bitmap_len_out = (size + sectorsize - 1) / (8 * sectorsize);
++
++	*data_offset_out = bitmap_offset + *bitmap_len_out;
++	*data_offset_out = (*data_offset_out + sectorsize - 1) / sectorsize;
++	*data_offset_out *= sectorsize;
++}
++
++static int absolutize(char *to, int size, char *from)
++{
++	char save_cwd[256], *slash;
++	int remaining;
++
++	if(getcwd(save_cwd, sizeof(save_cwd)) == NULL) {
++		cow_printf("absolutize : unable to get cwd - errno = %d\n", 
++			   errno);
++		return(-1);
++	}
++	slash = strrchr(from, '/');
++	if(slash != NULL){
++		*slash = '\0';
++		if(chdir(from)){
++			*slash = '/';
++			cow_printf("absolutize : Can't cd to '%s' - " 
++				   "errno = %d\n", from, errno);
++			return(-1);
++		}
++		*slash = '/';
++		if(getcwd(to, size) == NULL){
++			cow_printf("absolutize : unable to get cwd of '%s' - "
++			       "errno = %d\n", from, errno);
++			return(-1);
++		}
++		remaining = size - strlen(to);
++		if(strlen(slash) + 1 > remaining){
++			cow_printf("absolutize : unable to fit '%s' into %d "
++			       "chars\n", from, size);
++			return(-1);
++		}
++		strcat(to, slash);
++	}
++	else {
++		if(strlen(save_cwd) + 1 + strlen(from) + 1 > size){
++			cow_printf("absolutize : unable to fit '%s' into %d "
++			       "chars\n", from, size);
++			return(-1);
++		}
++		strcpy(to, save_cwd);
++		strcat(to, "/");
++		strcat(to, from);
++	}
++	chdir(save_cwd);
++	return(0);
++}
++
++int write_cow_header(char *cow_file, int fd, char *backing_file, 
++		     int sectorsize, long long *size)
++{
++	struct cow_header_v2 *header;
++	struct stat64 buf;
++	int err;
++
++	err = cow_seek_file(fd, 0);
++	if(err != 0){
++		cow_printf("write_cow_header - lseek failed, errno = %d\n", 
++			   errno);
++		return(-errno);
++	}
++
++	err = -ENOMEM;
++	header = cow_malloc(sizeof(*header));
++	if(header == NULL){
++		cow_printf("Failed to allocate COW V2 header\n");
++		goto out;
++	}
++	header->magic = htonl(COW_MAGIC);
++	header->version = htonl(COW_VERSION);
++
++	err = -EINVAL;
++	if(strlen(backing_file) > sizeof(header->backing_file) - 1){
++		cow_printf("Backing file name \"%s\" is too long - names are "
++			   "limited to %d characters\n", backing_file, 
++			   sizeof(header->backing_file) - 1);
++		goto out_free;
++	}
++
++	if(absolutize(header->backing_file, sizeof(header->backing_file), 
++		      backing_file))
++		goto out_free;
++
++	err = stat64(header->backing_file, &buf);
++	if(err < 0){
++		cow_printf("Stat of backing file '%s' failed, errno = %d\n",
++			   header->backing_file, errno);
++		err = -errno;
++		goto out_free;
++	}
++
++	err = cow_file_size(header->backing_file, size);
++	if(err){
++		cow_printf("Couldn't get size of backing file '%s', "
++			   "errno = %d\n", header->backing_file, -*size);
++		goto out_free;
++	}
++
++	header->mtime = htonl(buf.st_mtime);
++	header->size = htonll(*size);
++	header->sectorsize = htonl(sectorsize);
++
++	err = write(fd, header, sizeof(*header));
++	if(err != sizeof(*header)){
++		cow_printf("Write of header to new COW file '%s' failed, "
++			   "errno = %d\n", cow_file, errno);
++		goto out_free;
++	}
++	err = 0;
++ out_free:
++	cow_free(header);
++ out:
++	return(err);
++}
++
++int file_reader(__u64 offset, char *buf, int len, void *arg)
++{
++	int fd = *((int *) arg);
++
++	return(pread(fd, buf, len, offset));
++}
++
++int read_cow_header(int (*reader)(__u64, char *, int, void *), void *arg, 
++		    __u32 *magic_out, char **backing_file_out, 
++		    time_t *mtime_out, __u64 *size_out, 
++		    int *sectorsize_out, int *bitmap_offset_out)
++{
++	union cow_header *header;
++	char *file;
++	int err, n;
++	unsigned long version, magic;
++
++	header = cow_malloc(sizeof(*header));
++	if(header == NULL){
++	        cow_printf("read_cow_header - Failed to allocate header\n");
++		return(-ENOMEM);
++	}
++	err = -EINVAL;
++	n = (*reader)(0, (char *) header, sizeof(*header), arg);
++	if(n < offsetof(typeof(header->v1), backing_file)){
++		cow_printf("read_cow_header - short header\n");
++		goto out;
++	}
++
++	magic = header->v1.magic;
++	if(magic == COW_MAGIC) {
++		version = header->v1.version;
++	}
++	else if(magic == ntohl(COW_MAGIC)){
++		version = ntohl(header->v1.version);
++	}
++	/* No error printed because the non-COW case comes through here */
++	else goto out;
++
++	*magic_out = COW_MAGIC;
++
++	if(version == 1){
++		if(n < sizeof(header->v1)){
++			cow_printf("read_cow_header - failed to read V1 "
++				   "header\n");
++			goto out;
++		}
++		*mtime_out = header->v1.mtime;
++		*size_out = header->v1.size;
++		*sectorsize_out = header->v1.sectorsize;
++		*bitmap_offset_out = sizeof(header->v1);
++		file = header->v1.backing_file;
++	}
++	else if(version == 2){
++		if(n < sizeof(header->v2)){
++			cow_printf("read_cow_header - failed to read V2 "
++				   "header\n");
++			goto out;
++		}
++		*mtime_out = ntohl(header->v2.mtime);
++		*size_out = ntohll(header->v2.size);
++		*sectorsize_out = ntohl(header->v2.sectorsize);
++		*bitmap_offset_out = sizeof(header->v2);
++		file = header->v2.backing_file;
++	}
++	else {
++		cow_printf("read_cow_header - invalid COW version\n");
++		goto out;
++	}
++	err = -ENOMEM;
++	*backing_file_out = cow_strdup(file);
++	if(*backing_file_out == NULL){
++		cow_printf("read_cow_header - failed to allocate backing "
++			   "file\n");
++		goto out;
++	}
++	err = 0;
++ out:
++	cow_free(header);
++	return(err);
++}
++
++int init_cow_file(int fd, char *cow_file, char *backing_file, int sectorsize,
++		  int *bitmap_offset_out, unsigned long *bitmap_len_out, 
++		  int *data_offset_out)
++{
++	__u64 size, offset;
++	char zero = 0;
++	int err;
++
++	err = write_cow_header(cow_file, fd, backing_file, sectorsize, &size);
++	if(err) 
++		goto out;
++	
++	cow_sizes(size, sectorsize, sizeof(struct cow_header_v2), 
++		  bitmap_len_out, data_offset_out);
++	*bitmap_offset_out = sizeof(struct cow_header_v2);
++
++	offset = *data_offset_out + size - sizeof(zero);
++	err = cow_seek_file(fd, offset);
++	if(err != 0){
++		cow_printf("cow bitmap lseek failed : errno = %d\n", errno);
++		goto out;
++	}
++
++	/* does not really matter how much we write it is just to set EOF 
++	 * this also sets the entire COW bitmap
++	 * to zero without having to allocate it 
++	 */
++	err = cow_write_file(fd, &zero, sizeof(zero));
++	if(err != sizeof(zero)){
++		err = -EINVAL;
++		cow_printf("Write of bitmap to new COW file '%s' failed, "
++			   "errno = %d\n", cow_file, errno);
++		goto out;
++	}
++
++	return(0);
++
++ out:
++	return(err);
++}
++
++/*
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+--- linux-2.6.0-test6/arch/um/drivers/hostaudio_kern.c	2003-06-14 12:18:35.000000000 -0700
++++ 25/arch/um/drivers/hostaudio_kern.c	2003-10-05 00:34:32.000000000 -0700
+@@ -11,6 +11,7 @@
+ #include "linux/fs.h"
+ #include "linux/sound.h"
+ #include "linux/soundcard.h"
++#include "asm/uaccess.h"
+ #include "kern_util.h"
+ #include "init.h"
+ #include "hostaudio.h"
+@@ -22,7 +23,7 @@ char *mixer = HOSTAUDIO_DEV_MIXER;
+ #ifndef MODULE
+ static int set_dsp(char *name, int *add)
+ {
+-	dsp = uml_strdup(name);
++	dsp = name;
+ 	return(0);
+ }
+ 
+@@ -34,7 +35,7 @@ __uml_setup("dsp=", set_dsp,
+ 
+ static int set_mixer(char *name, int *add)
+ {
+-	mixer = uml_strdup(name);
++	mixer = name;
+ 	return(0);
+ }
+ 
+@@ -51,23 +52,55 @@ static ssize_t hostaudio_read(struct fil
+ 			      loff_t *ppos)
+ {
+         struct hostaudio_state *state = file->private_data;
++	void *kbuf;
++	int err;
+ 
+ #ifdef DEBUG
+         printk("hostaudio: read called, count = %d\n", count);
+ #endif
+ 
+-        return(hostaudio_read_user(state, buffer, count, ppos));
++	kbuf = kmalloc(count, GFP_KERNEL);
++	if(kbuf == NULL)
++		return(-ENOMEM);
++
++        err = hostaudio_read_user(state, kbuf, count, ppos);
++	if(err < 0)
++		goto out;
++
++	if(copy_to_user(buffer, kbuf, err))
++		err = -EFAULT;
++
++ out:
++	kfree(kbuf);
++	return(err);
+ }
+ 
+ static ssize_t hostaudio_write(struct file *file, const char *buffer, 
+ 			       size_t count, loff_t *ppos)
+ {
+         struct hostaudio_state *state = file->private_data;
++	void *kbuf;
++	int err;
+ 
+ #ifdef DEBUG
+         printk("hostaudio: write called, count = %d\n", count);
+ #endif
+-        return(hostaudio_write_user(state, buffer, count, ppos));
++
++	kbuf = kmalloc(count, GFP_KERNEL);
++	if(kbuf == NULL)
++		return(-ENOMEM);
++
++	err = -EFAULT;
++	if(copy_from_user(kbuf, buffer, count))
++		goto out;
++
++        err = hostaudio_write_user(state, kbuf, count, ppos);
++	if(err < 0)
++		goto out;
++
++ out:
++	kfree(kbuf);
++	return(err);
+ }
+ 
+ static unsigned int hostaudio_poll(struct file *file, 
+@@ -86,12 +119,43 @@ static int hostaudio_ioctl(struct inode 
+ 			   unsigned int cmd, unsigned long arg)
+ {
+         struct hostaudio_state *state = file->private_data;
++	unsigned long data = 0;
++	int err;
+ 
+ #ifdef DEBUG
+         printk("hostaudio: ioctl called, cmd = %u\n", cmd);
+ #endif
++	switch(cmd){
++	case SNDCTL_DSP_SPEED:
++	case SNDCTL_DSP_STEREO:
++	case SNDCTL_DSP_GETBLKSIZE:
++	case SNDCTL_DSP_CHANNELS:
++	case SNDCTL_DSP_SUBDIVIDE:
++	case SNDCTL_DSP_SETFRAGMENT:
++		if(get_user(data, (int *) arg))
++			return(-EFAULT);
++		break;
++	default:
++		break;
++	}
++
++        err = hostaudio_ioctl_user(state, cmd, (unsigned long) &data);
++
++	switch(cmd){
++	case SNDCTL_DSP_SPEED:
++	case SNDCTL_DSP_STEREO:
++	case SNDCTL_DSP_GETBLKSIZE:
++	case SNDCTL_DSP_CHANNELS:
++	case SNDCTL_DSP_SUBDIVIDE:
++	case SNDCTL_DSP_SETFRAGMENT:
++		if(put_user(data, (int *) arg))
++			return(-EFAULT);
++		break;
++	default:
++		break;
++	}
+ 
+-        return(hostaudio_ioctl_user(state, cmd, arg));
++	return(err);
+ }
+ 
+ static int hostaudio_open(struct inode *inode, struct file *file)
+@@ -225,7 +289,8 @@ MODULE_LICENSE("GPL");
+ 
+ static int __init hostaudio_init_module(void)
+ {
+-        printk(KERN_INFO "UML Audio Relay\n");
++        printk(KERN_INFO "UML Audio Relay (host dsp = %s, host mixer = %s)\n",
++	       dsp, mixer);
+ 
+ 	module_data.dev_audio = register_sound_dsp(&hostaudio_fops, -1);
+         if(module_data.dev_audio < 0){
+--- linux-2.6.0-test6/arch/um/drivers/line.c	2003-06-14 12:18:33.000000000 -0700
++++ 25/arch/um/drivers/line.c	2003-10-05 00:34:32.000000000 -0700
+@@ -6,8 +6,8 @@
+ #include "linux/sched.h"
+ #include "linux/slab.h"
+ #include "linux/list.h"
++#include "linux/interrupt.h"
+ #include "linux/devfs_fs_kernel.h"
+-#include "asm/irq.h"
+ #include "asm/uaccess.h"
+ #include "chan_kern.h"
+ #include "irq_user.h"
+@@ -16,16 +16,18 @@
+ #include "user_util.h"
+ #include "kern_util.h"
+ #include "os.h"
++#include "irq_kern.h"
+ 
+ #define LINE_BUFSIZE 4096
+ 
+-void line_interrupt(int irq, void *data, struct pt_regs *unused)
++irqreturn_t line_interrupt(int irq, void *data, struct pt_regs *unused)
+ {
+ 	struct line *dev = data;
+ 
+ 	if(dev->count > 0) 
+ 		chan_interrupt(&dev->chan_list, &dev->task, dev->tty, irq, 
+ 			       dev);
++	return IRQ_HANDLED;
+ }
+ 
+ void line_timer_cb(void *arg)
+@@ -136,20 +138,22 @@ int line_write(struct line *lines, struc
+ 	return(len);
+ }
+ 
+-void line_write_interrupt(int irq, void *data, struct pt_regs *unused)
++irqreturn_t line_write_interrupt(int irq, void *data, struct pt_regs *unused)
+ {
+ 	struct line *dev = data;
+ 	struct tty_struct *tty = dev->tty;
+ 	int err;
+ 
+ 	err = flush_buffer(dev);
+-	if(err == 0) return;
++	if(err == 0) 
++		return(IRQ_NONE);
+ 	else if(err < 0){
+ 		dev->head = dev->buffer;
+ 		dev->tail = dev->buffer;
+ 	}
+ 
+-	if(tty == NULL) return;
++	if(tty == NULL) 
++		return(IRQ_NONE);
+ 
+ 	if(test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags) &&
+ 	   (tty->ldisc.write_wakeup != NULL))
+@@ -161,9 +165,9 @@ void line_write_interrupt(int irq, void 
+ 	 * writes.
+ 	 */
+ 
+-	if (waitqueue_active(&tty->write_wait))
++	if(waitqueue_active(&tty->write_wait))
+ 		wake_up_interruptible(&tty->write_wait);
+-
++	return(IRQ_HANDLED);
+ }
+ 
+ int line_write_room(struct tty_struct *tty)
+@@ -369,7 +373,7 @@ int line_get_config(char *name, struct l
+ 
+ 	dev = simple_strtoul(name, &end, 0);
+ 	if((*end != '\0') || (end == name)){
+-		*error_out = "line_setup failed to parse device number";
++		*error_out = "line_get_config failed to parse device number";
+ 		return(0);
+ 	}
+ 
+@@ -379,15 +383,15 @@ int line_get_config(char *name, struct l
+ 	}
+ 
+ 	line = &lines[dev];
++
+ 	down(&line->sem);
+-	
+ 	if(!line->valid)
+ 		CONFIG_CHUNK(str, size, n, "none", 1);
+ 	else if(line->count == 0)
+ 		CONFIG_CHUNK(str, size, n, line->init_str, 1);
+ 	else n = chan_config_string(&line->chan_list, str, size, error_out);
+-
+ 	up(&line->sem);
++
+ 	return(n);
+ }
+ 
+@@ -412,7 +416,8 @@ struct tty_driver *line_register_devfs(s
+ 		return NULL;
+ 
+ 	driver->driver_name = line_driver->name;
+-	driver->name = line_driver->devfs_name;
++	driver->name = line_driver->device_name;
++	driver->devfs_name = line_driver->devfs_name;
+ 	driver->major = line_driver->major;
+ 	driver->minor_start = line_driver->minor_start;
+ 	driver->type = line_driver->type;
+@@ -432,7 +437,7 @@ struct tty_driver *line_register_devfs(s
+ 
+ 	for(i = 0; i < nlines; i++){
+ 		if(!lines[i].valid) 
+-			tty_unregister_devfs(driver, i);
++			tty_unregister_device(driver, i);
+ 	}
+ 
+ 	mconsole_register_dev(&line_driver->mc);
+@@ -465,24 +470,25 @@ struct winch {
+ 	struct line *line;
+ };
+ 
+-void winch_interrupt(int irq, void *data, struct pt_regs *unused)
++irqreturn_t winch_interrupt(int irq, void *data, struct pt_regs *unused)
+ {
+ 	struct winch *winch = data;
+ 	struct tty_struct *tty;
+ 	int err;
+ 	char c;
+ 
+-	err = generic_read(winch->fd, &c, NULL);
+-	if(err < 0){
+-		if(err != -EAGAIN){
+-			printk("winch_interrupt : read failed, errno = %d\n", 
+-			       -err);
+-			printk("fd %d is losing SIGWINCH support\n", 
+-			       winch->tty_fd);
+-			free_irq(irq, data);
+-			return;
++	if(winch->fd != -1){
++		err = generic_read(winch->fd, &c, NULL);
++		if(err < 0){
++			if(err != -EAGAIN){
++				printk("winch_interrupt : read failed, "
++				       "errno = %d\n", -err);
++				printk("fd %d is losing SIGWINCH support\n", 
++				       winch->tty_fd);
++				return(IRQ_HANDLED);
++			}
++			goto out;
+ 		}
+-		goto out;
+ 	}
+ 	tty = winch->line->tty;
+ 	if(tty != NULL){
+@@ -492,7 +498,9 @@ void winch_interrupt(int irq, void *data
+ 		kill_pg(tty->pgrp, SIGWINCH, 1);
+ 	}
+  out:
+-	reactivate_fd(winch->fd, WINCH_IRQ);
++	if(winch->fd != -1)
++		reactivate_fd(winch->fd, WINCH_IRQ);
++	return(IRQ_HANDLED);
+ }
+ 
+ DECLARE_MUTEX(winch_handler_sem);
+@@ -529,7 +537,10 @@ static void winch_cleanup(void)
+ 
+ 	list_for_each(ele, &winch_handlers){
+ 		winch = list_entry(ele, struct winch, list);
+-		close(winch->fd);
++		if(winch->fd != -1){
++			deactivate_fd(winch->fd, WINCH_IRQ);
++			close(winch->fd);
++		}
+ 		if(winch->pid != -1) 
+ 			os_kill_process(winch->pid, 1);
+ 	}
+--- linux-2.6.0-test6/arch/um/drivers/Makefile	2003-06-14 12:18:23.000000000 -0700
++++ 25/arch/um/drivers/Makefile	2003-10-05 00:34:32.000000000 -0700
+@@ -1,5 +1,5 @@
+ # 
+-# Copyright (C) 2000, 2002 Jeff Dike (jdike@karaya.com)
++# Copyright (C) 2000, 2002, 2003 Jeff Dike (jdike@karaya.com)
+ # Licensed under the GPL
+ #
+ 
+@@ -39,6 +39,8 @@ obj-$(CONFIG_PTY_CHAN) += pty.o
+ obj-$(CONFIG_TTY_CHAN) += tty.o 
+ obj-$(CONFIG_XTERM_CHAN) += xterm.o xterm_kern.o
+ obj-$(CONFIG_UML_WATCHDOG) += harddog.o
++obj-$(CONFIG_BLK_DEV_COW) += cow_kern.o
++obj-$(CONFIG_BLK_DEV_COW_COMMON) += cow_user.o
+ 
+ obj-y += stdio_console.o $(CHAN_OBJS)
+ 
+@@ -46,7 +48,7 @@ USER_SINGLE_OBJS = $(foreach f,$(patsubs
+ 
+ USER_OBJS := $(filter %_user.o,$(obj-y) $(obj-m) $(USER_SINGLE_OBJS)) fd.o \
+ 	null.o pty.o tty.o xterm.o
+-USER_OBJS := $(foreach file,$(USER_OBJS),arch/um/drivers/$(file))
++USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
+ 
+ $(USER_OBJS) : %.o: %.c
+ 	$(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
+--- linux-2.6.0-test6/arch/um/drivers/mconsole_kern.c	2003-06-14 12:17:56.000000000 -0700
++++ 25/arch/um/drivers/mconsole_kern.c	2003-10-05 00:34:32.000000000 -0700
+@@ -27,6 +27,7 @@
+ #include "init.h"
+ #include "os.h"
+ #include "umid.h"
++#include "irq_kern.h"
+ 
+ static int do_unlink_socket(struct notifier_block *notifier, 
+ 			    unsigned long what, void *data)
+@@ -67,7 +68,7 @@ void mc_work_proc(void *unused)
+ 
+ DECLARE_WORK(mconsole_work, mc_work_proc, NULL);
+ 
+-void mconsole_interrupt(int irq, void *dev_id, struct pt_regs *regs)
++irqreturn_t mconsole_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+ {
+ 	int fd;
+ 	struct mconsole_entry *new;
+@@ -88,6 +89,7 @@ void mconsole_interrupt(int irq, void *d
+ 	}
+ 	if(!list_empty(&mc_requests)) schedule_work(&mconsole_work);
+ 	reactivate_fd(fd, MCONSOLE_IRQ);
++	return(IRQ_HANDLED);
+ }
+ 
+ void mconsole_version(struct mc_request *req)
+@@ -100,20 +102,34 @@ void mconsole_version(struct mc_request 
+ 	mconsole_reply(req, version, 0, 0);
+ }
+ 
++void mconsole_log(struct mc_request *req)
++{
++	int len;
++	char *ptr = req->request.data;
++	
++	ptr += strlen("log");
++	while(isspace(*ptr)) ptr++;
++
++	len = ptr - req->request.data;
++	printk("%.*s", len, ptr);
++	mconsole_reply(req, "", 0, 0);
++}
++
+ #define UML_MCONSOLE_HELPTEXT \
+-"Commands:
+-    version - Get kernel version
+-    help - Print this message
+-    halt - Halt UML
+-    reboot - Reboot UML
+-    config <dev>=<config> - Add a new device to UML; 
+-	same syntax as command line
+-    config <dev> - Query the configuration of a device
+-    remove <dev> - Remove a device from UML
+-    sysrq <letter> - Performs the SysRq action controlled by the letter
+-    cad - invoke the Ctl-Alt-Del handler
+-    stop - pause the UML; it will do nothing until it receives a 'go'
+-    go - continue the UML after a 'stop'
++"Commands: \n\
++    version - Get kernel version \n\
++    help - Print this message \n\
++    halt - Halt UML \n\
++    reboot - Reboot UML \n\
++    config <dev>=<config> - Add a new device to UML;  \n\
++	same syntax as command line \n\
++    config <dev> - Query the configuration of a device \n\
++    remove <dev> - Remove a device from UML \n\
++    sysrq <letter> - Performs the SysRq action controlled by the letter \n\
++    cad - invoke the Ctl-Alt-Del handler \n\
++    stop - pause the UML; it will do nothing until it receives a 'go' \n\
++    go - continue the UML after a 'stop' \n\
++    log <string> - make UML enter <string> into the kernel log\n\
+ "
+ 
+ void mconsole_help(struct mc_request *req)
+@@ -302,7 +318,7 @@ int mconsole_init(void)
+ 	if(umid_file_name("mconsole", file, sizeof(file))) return(-1);
+ 	snprintf(mconsole_socket_name, sizeof(file), "%s", file);
+ 
+-	sock = create_unix_socket(file, sizeof(file));
++	sock = create_unix_socket(file, sizeof(file), 1);
+ 	if (sock < 0){
+ 		printk("Failed to initialize management console\n");
+ 		return(1);
+--- linux-2.6.0-test6/arch/um/drivers/mconsole_user.c	2003-06-14 12:17:59.000000000 -0700
++++ 25/arch/um/drivers/mconsole_user.c	2003-10-05 00:34:32.000000000 -0700
+@@ -28,6 +28,7 @@ static struct mconsole_command commands[
+ 	{ "cad", mconsole_cad, 1 },
+ 	{ "stop", mconsole_stop, 0 },
+ 	{ "go", mconsole_go, 1 },
++	{ "log", mconsole_log, 1 },
+ };
+ 
+ /* Initialized in mconsole_init, which is an initcall */
+@@ -139,6 +140,7 @@ int mconsole_reply(struct mc_request *re
+ 		memcpy(reply.data, str, len);
+ 		reply.data[len] = '\0';
+ 		total -= len;
++ 		str += len;
+ 		reply.len = len + 1;
+ 
+ 		len = sizeof(reply) + reply.len - sizeof(reply.data);
+--- linux-2.6.0-test6/arch/um/drivers/mmapper_kern.c	2003-06-14 12:17:58.000000000 -0700
++++ 25/arch/um/drivers/mmapper_kern.c	2003-10-05 00:34:32.000000000 -0700
+@@ -120,7 +120,10 @@ static int __init mmapper_init(void)
+ 	printk(KERN_INFO "Mapper v0.1\n");
+ 
+ 	v_buf = (char *) find_iomem("mmapper", &mmapper_size);
+-	if(mmapper_size == 0) return(0);
++	if(mmapper_size == 0){
++		printk(KERN_ERR "mmapper_init - find_iomem failed\n");
++		return(0);
++	}
+ 
+ 	p_buf = __pa(v_buf);
+ 
+--- linux-2.6.0-test6/arch/um/drivers/net_kern.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/arch/um/drivers/net_kern.c	2003-10-05 00:34:32.000000000 -0700
+@@ -26,6 +26,7 @@
+ #include "mconsole_kern.h"
+ #include "init.h"
+ #include "irq_user.h"
++#include "irq_kern.h"
+ 
+ static spinlock_t opened_lock = SPIN_LOCK_UNLOCKED;
+ LIST_HEAD(opened);
+@@ -61,14 +62,14 @@ static int uml_net_rx(struct net_device 
+ 	return pkt_len;
+ }
+ 
+-void uml_net_interrupt(int irq, void *dev_id, struct pt_regs *regs)
++irqreturn_t uml_net_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+ {
+ 	struct net_device *dev = dev_id;
+ 	struct uml_net_private *lp = dev->priv;
+ 	int err;
+ 
+ 	if(!netif_running(dev))
+-		return;
++		return(IRQ_NONE);
+ 
+ 	spin_lock(&lp->lock);
+ 	while((err = uml_net_rx(dev)) > 0) ;
+@@ -83,6 +84,7 @@ void uml_net_interrupt(int irq, void *de
+ 
+  out:
+ 	spin_unlock(&lp->lock);
++	return(IRQ_HANDLED);
+ }
+ 
+ static int uml_net_open(struct net_device *dev)
+@@ -252,37 +254,6 @@ void uml_net_user_timer_expire(unsigned 
+ #endif
+ }
+ 
+-/*
+- * default do nothing hard header packet routines for struct net_device init.
+- * real ethernet transports will overwrite with real routines.
+- */
+-static int uml_net_hard_header(struct sk_buff *skb, struct net_device *dev,
+-                 unsigned short type, void *daddr, void *saddr, unsigned len)
+-{
+-	return(0); /* no change */
+-}
+-
+-static int uml_net_rebuild_header(struct sk_buff *skb)
+-{
+-	return(0); /* ignore */ 
+-}
+-
+-static int uml_net_header_cache(struct neighbour *neigh, struct hh_cache *hh)
+-{
+-	return(-1); /* fail */
+-}
+-
+-static void uml_net_header_cache_update(struct hh_cache *hh,
+-                 struct net_device *dev, unsigned char * haddr)
+-{
+-	/* ignore */
+-}
+-
+-static int uml_net_header_parse(struct sk_buff *skb, unsigned char *haddr)
+-{
+-	return(0); /* nothing */
+-}
+-
+ static spinlock_t devices_lock = SPIN_LOCK_UNLOCKED;
+ static struct list_head devices = LIST_HEAD_INIT(devices);
+ 
+@@ -292,7 +263,7 @@ static int eth_configure(int n, void *in
+ 	struct uml_net *device;
+ 	struct net_device *dev;
+ 	struct uml_net_private *lp;
+-	int err, size;
++	int save, err, size;
+ 
+ 	size = transport->private_size + sizeof(struct uml_net_private) + 
+ 		sizeof(((struct uml_net_private *) 0)->user);
+@@ -334,12 +305,6 @@ static int eth_configure(int n, void *in
+ 	snprintf(dev->name, sizeof(dev->name), "eth%d", n);
+ 	device->dev = dev;
+ 
+-        dev->hard_header = uml_net_hard_header;
+-        dev->rebuild_header = uml_net_rebuild_header;
+-        dev->hard_header_cache = uml_net_header_cache;
+-        dev->header_cache_update= uml_net_header_cache_update;
+-        dev->hard_header_parse = uml_net_header_parse;
+-
+ 	(*transport->kern->init)(dev, init);
+ 
+ 	dev->mtu = transport->user->max_packet;
+@@ -362,21 +327,29 @@ static int eth_configure(int n, void *in
+ 		return 1;
+ 	lp = dev->priv;
+ 
+-	INIT_LIST_HEAD(&lp->list);
+-	spin_lock_init(&lp->lock);
+-	lp->dev = dev;
+-	lp->fd = -1;
+-	lp->mac = { 0xfe, 0xfd, 0x0, 0x0, 0x0, 0x0 };
+-	lp->have_mac = device->have_mac;
+-	lp->protocol = transport->kern->protocol;
+-	lp->open = transport->user->open;
+-	lp->close = transport->user->close;
+-	lp->remove = transport->user->remove;
+-	lp->read = transport->kern->read;
+-	lp->write = transport->kern->write;
+-	lp->add_address = transport->user->add_address;
+-	lp->delete_address = transport->user->delete_address;
+-	lp->set_mtu = transport->user->set_mtu;
++	/* lp.user is the first four bytes of the transport data, which
++	 * has already been initialized.  This structure assignment will
++	 * overwrite that, so we make sure that .user gets overwritten with
++	 * what it already has.
++	 */
++	save = lp->user[0];
++	*lp = ((struct uml_net_private) 
++		{ .list  		= LIST_HEAD_INIT(lp->list),
++		  .lock 		= SPIN_LOCK_UNLOCKED,
++		  .dev 			= dev,
++		  .fd 			= -1,
++		  .mac 			= { 0xfe, 0xfd, 0x0, 0x0, 0x0, 0x0},
++		  .have_mac 		= device->have_mac,
++		  .protocol 		= transport->kern->protocol,
++		  .open 		= transport->user->open,
++		  .close 		= transport->user->close,
++		  .remove 		= transport->user->remove,
++		  .read 		= transport->kern->read,
++		  .write 		= transport->kern->write,
++		  .add_address 		= transport->user->add_address,
++		  .delete_address  	= transport->user->delete_address,
++		  .set_mtu 		= transport->user->set_mtu,
++		  .user  		= { save } });
+ 
+ 	init_timer(&lp->tl);
+ 	lp->tl.function = uml_net_user_timer_expire;
+@@ -609,7 +582,8 @@ static int net_remove(char *str)
+ 	unregister_netdev(dev);
+ 
+ 	list_del(&device->list);
+-	free_netdev(device);
++	kfree(device);
++	free_netdev(dev);
+ 	return(0);
+ }
+ 
+--- linux-2.6.0-test6/arch/um/drivers/port_kern.c	2003-06-14 12:17:57.000000000 -0700
++++ 25/arch/um/drivers/port_kern.c	2003-10-05 00:34:32.000000000 -0700
+@@ -6,6 +6,7 @@
+ #include "linux/list.h"
+ #include "linux/sched.h"
+ #include "linux/slab.h"
++#include "linux/interrupt.h"
+ #include "linux/irq.h"
+ #include "linux/spinlock.h"
+ #include "linux/errno.h"
+@@ -14,6 +15,7 @@
+ #include "kern_util.h"
+ #include "kern.h"
+ #include "irq_user.h"
++#include "irq_kern.h"
+ #include "port.h"
+ #include "init.h"
+ #include "os.h"
+@@ -44,7 +46,7 @@ struct connection {
+ 	struct port_list *port;
+ };
+ 
+-static void pipe_interrupt(int irq, void *data, struct pt_regs *regs)
++static irqreturn_t pipe_interrupt(int irq, void *data, struct pt_regs *regs)
+ {
+ 	struct connection *conn = data;
+ 	int fd;
+@@ -52,7 +54,7 @@ static void pipe_interrupt(int irq, void
+  	fd = os_rcv_fd(conn->socket[0], &conn->helper_pid);
+ 	if(fd < 0){
+ 		if(fd == -EAGAIN)
+-			return;
++			return(IRQ_NONE);
+ 
+ 		printk(KERN_ERR "pipe_interrupt : os_rcv_fd returned %d\n", 
+ 		       -fd);
+@@ -65,6 +67,7 @@ static void pipe_interrupt(int irq, void
+ 	list_add(&conn->list, &conn->port->connections);
+ 
+ 	up(&conn->port->sem);
++	return(IRQ_HANDLED);
+ }
+ 
+ static int port_accept(struct port_list *port)
+@@ -138,12 +141,13 @@ void port_work_proc(void *unused)
+ 
+ DECLARE_WORK(port_work, port_work_proc, NULL);
+ 
+-static void port_interrupt(int irq, void *data, struct pt_regs *regs)
++static irqreturn_t port_interrupt(int irq, void *data, struct pt_regs *regs)
+ {
+ 	struct port_list *port = data;
+ 
+ 	port->has_connection = 1;
+ 	schedule_work(&port_work);
++	return(IRQ_HANDLED);
+ } 
+ 
+ void *port_data(int port_num)
+--- linux-2.6.0-test6/arch/um/drivers/ssl.c	2003-06-14 12:18:21.000000000 -0700
++++ 25/arch/um/drivers/ssl.c	2003-10-05 00:34:32.000000000 -0700
+@@ -53,8 +53,9 @@ static int ssl_remove(char *str);
+ 
+ static struct line_driver driver = {
+ 	.name 			= "UML serial line",
+-	.devfs_name 		= "tts/%d",
+-	.major 			= TTYAUX_MAJOR,
++	.device_name 		= "ttS",
++	.devfs_name 		= "tts/",
++	.major 			= TTY_MAJOR,
+ 	.minor_start 		= 64,
+ 	.type 		 	= TTY_DRIVER_TYPE_SERIAL,
+ 	.subtype 	 	= 0,
+--- linux-2.6.0-test6/arch/um/drivers/stdio_console.c	2003-06-14 12:18:04.000000000 -0700
++++ 25/arch/um/drivers/stdio_console.c	2003-10-05 00:34:32.000000000 -0700
+@@ -83,7 +83,8 @@ static int con_remove(char *str);
+ 
+ static struct line_driver driver = {
+ 	.name 			= "UML console",
+-	.devfs_name 		= "vc/%d",
++	.device_name 		= "tty",
++	.devfs_name 		= "vc/",
+ 	.major 			= TTY_MAJOR,
+ 	.minor_start 		= 0,
+ 	.type 		 	= TTY_DRIVER_TYPE_CONSOLE,
+@@ -159,6 +160,15 @@ static int chars_in_buffer(struct tty_st
+ 
+ static int con_init_done = 0;
+ 
++static struct tty_operations console_ops = {
++	.open 	 		= con_open,
++	.close 	 		= con_close,
++	.write 	 		= con_write,
++	.chars_in_buffer 	= chars_in_buffer,
++	.set_termios 		= set_termios,
++	.write_room		= line_write_room,
++};
++
+ int stdio_init(void)
+ {
+ 	char *new_title;
+@@ -166,7 +176,8 @@ int stdio_init(void)
+ 	printk(KERN_INFO "Initializing stdio console driver\n");
+ 
+ 	console_driver = line_register_devfs(&console_lines, &driver,
+-				&console_ops, vts, sizeof(vts)/sizeof(vts[0]));
++					     &console_ops, vts,
++					     sizeof(vts)/sizeof(vts[0]));
+ 
+ 	lines_init(vts, sizeof(vts)/sizeof(vts[0]));
+ 
+@@ -188,15 +199,6 @@ static void console_write(struct console
+ 	if(con_init_done) up(&vts[console->index].sem);
+ }
+ 
+-static struct tty_operations console_ops = {
+-	.open 	 		= con_open,
+-	.close 	 		= con_close,
+-	.write 	 		= con_write,
+-	.chars_in_buffer 	= chars_in_buffer,
+-	.set_termios 		= set_termios,
+-	.write_room		= line_write_room,
+-};
+-
+ static struct tty_driver *console_device(struct console *c, int *index)
+ {
+ 	*index = c->index;
+@@ -212,12 +214,14 @@ static struct console stdiocons = INIT_C
+ 					       console_device, console_setup,
+ 					       CON_PRINTBUFFER);
+ 
+-static void __init stdio_console_init(void)
++static int __init stdio_console_init(void)
+ {
+ 	INIT_LIST_HEAD(&vts[0].chan_list);
+ 	list_add(&init_console_chan.list, &vts[0].chan_list);
+ 	register_console(&stdiocons);
++	return(0);
+ }
++
+ console_initcall(stdio_console_init);
+ 
+ static int console_chan_setup(char *str)
+--- linux-2.6.0-test6/arch/um/drivers/ubd_kern.c	2003-09-08 13:58:56.000000000 -0700
++++ 25/arch/um/drivers/ubd_kern.c	2003-10-05 00:34:32.000000000 -0700
+@@ -8,6 +8,13 @@
+  * old style ubd by setting UBD_SHIFT to 0
+  * 2002-09-27...2002-10-18 massive tinkering for 2.5
+  * partitions have changed in 2.5
++ * 2003-01-29 more tinkering for 2.5.59-1
++ * This should now address the sysfs problems and has
++ * the symlink for devfs to allow for booting with
++ * the common /dev/ubd/discX/... names rather than
++ * only /dev/ubdN/discN this version also has lots of
++ * clean ups preparing for ubd-many.
++ * James McMechan
+  */
+ 
+ #define MAJOR_NR UBD_MAJOR
+@@ -40,6 +47,7 @@
+ #include "mconsole_kern.h"
+ #include "init.h"
+ #include "irq_user.h"
++#include "irq_kern.h"
+ #include "ubd_user.h"
+ #include "2_5compat.h"
+ #include "os.h"
+@@ -49,9 +57,9 @@ static spinlock_t ubd_lock = SPIN_LOCK_U
+ 
+ static void (*do_ubd)(void);
+ 
+-static int ubd_open(struct inode * inode, struct file * filp);
+-static int ubd_release(struct inode * inode, struct file * file);
+-static int ubd_ioctl(struct inode * inode, struct file * file,
++static int ubd_open(struct block_device *bdev, struct file * filp);
++static int ubd_release(struct gendisk *disk);
++static int ubd_ioctl(struct block_device *bdev, struct file * file,
+ 		     unsigned int cmd, unsigned long arg);
+ 
+ #define MAX_DEV (8)
+@@ -67,7 +75,7 @@ static struct block_device_operations ub
+ static request_queue_t *ubd_queue;
+ 
+ /* Protected by ubd_lock */
+-static int fake_major = 0;
++static int fake_major = MAJOR_NR;
+ 
+ static struct gendisk *ubd_gendisk[MAX_DEV];
+ static struct gendisk *fake_gendisk[MAX_DEV];
+@@ -96,12 +104,12 @@ struct cow {
+ 
+ struct ubd {
+ 	char *file;
+-	int is_dir;
+ 	int count;
+ 	int fd;
+ 	__u64 size;
+ 	struct openflags boot_openflags;
+ 	struct openflags openflags;
++	int no_cow;
+ 	struct cow cow;
+ };
+ 
+@@ -115,12 +123,12 @@ struct ubd {
+ 
+ #define DEFAULT_UBD { \
+ 	.file = 		NULL, \
+-	.is_dir =		0, \
+ 	.count =		0, \
+ 	.fd =			-1, \
+ 	.size =			-1, \
+ 	.boot_openflags =	OPEN_FLAGS, \
+ 	.openflags =		OPEN_FLAGS, \
++        .no_cow =               0, \
+         .cow =			DEFAULT_COW, \
+ }
+ 
+@@ -128,8 +136,10 @@ struct ubd ubd_dev[MAX_DEV] = { [ 0 ... 
+ 
+ static int ubd0_init(void)
+ {
+-	if(ubd_dev[0].file == NULL)
+-		ubd_dev[0].file = "root_fs";
++	struct ubd *dev = &ubd_dev[0];
++
++	if(dev->file == NULL)
++		dev->file = "root_fs";
+ 	return(0);
+ }
+ 
+@@ -196,19 +206,39 @@ __uml_help(fake_ide_setup,
+ "    Create ide0 entries that map onto ubd devices.\n\n"
+ );
+ 
++static int parse_unit(char **ptr)
++{
++	char *str = *ptr, *end;
++	int n = -1;
++
++	if(isdigit(*str)) {
++		n = simple_strtoul(str, &end, 0);
++		if(end == str)
++			return(-1);
++		*ptr = end;
++	}
++	else if (('a' <= *str) && (*str <= 'h')) {
++		n = *str - 'a';
++		str++;
++		*ptr = str;
++	}
++	return(n);
++}
++
+ static int ubd_setup_common(char *str, int *index_out)
+ {
++	struct ubd *dev;
+ 	struct openflags flags = global_openflags;
+ 	char *backing_file;
+ 	int n, err;
+ 
+ 	if(index_out) *index_out = -1;
+-	n = *str++;
++	n = *str;
+ 	if(n == '='){
+-		static int fake_major_allowed = 1;
+ 		char *end;
+ 		int major;
+ 
++		str++;
+ 		if(!strcmp(str, "sync")){
+ 			global_openflags.s = 1;
+ 			return(0);
+@@ -220,20 +250,14 @@ static int ubd_setup_common(char *str, i
+ 			return(1);
+ 		}
+ 
+-		if(!fake_major_allowed){
+-			printk(KERN_ERR "Can't assign a fake major twice\n");
+-			return(1);
+-		}
+-
+ 		err = 1;
+  		spin_lock(&ubd_lock);
+- 		if(!fake_major_allowed){
++ 		if(fake_major != MAJOR_NR){
+  			printk(KERN_ERR "Can't assign a fake major twice\n");
+  			goto out1;
+  		}
+  
+  		fake_major = major;
+-		fake_major_allowed = 0;
+ 
+ 		printk(KERN_INFO "Setting extra ubd major number to %d\n",
+ 		       major);
+@@ -243,25 +267,23 @@ static int ubd_setup_common(char *str, i
+ 		return(err);
+ 	}
+ 
+-	if(n < '0'){
+-		printk(KERN_ERR "ubd_setup : index out of range\n"); }
+-
+-	if((n >= '0') && (n <= '9')) n -= '0';
+-	else if((n >= 'a') && (n <= 'z')) n -= 'a';
+-	else {
+-		printk(KERN_ERR "ubd_setup : device syntax invalid\n");
++	n = parse_unit(&str);
++	if(n < 0){
++		printk(KERN_ERR "ubd_setup : couldn't parse unit number "
++		       "'%s'\n", str);
+ 		return(1);
+ 	}
+ 	if(n >= MAX_DEV){
+-		printk(KERN_ERR "ubd_setup : index out of range "
+-		       "(%d devices)\n", MAX_DEV);	
++		printk(KERN_ERR "ubd_setup : index %d out of range "
++		       "(%d devices)\n", n, MAX_DEV);
+ 		return(1);
+ 	}
+ 
+ 	err = 1;
+ 	spin_lock(&ubd_lock);
+ 
+-	if(ubd_dev[n].file != NULL){
++	dev = &ubd_dev[n];
++	if(dev->file != NULL){
+ 		printk(KERN_ERR "ubd_setup : device already configured\n");
+ 		goto out2;
+ 	}
+@@ -276,6 +298,11 @@ static int ubd_setup_common(char *str, i
+ 		flags.s = 1;
+ 		str++;
+ 	}
++	if (*str == 'd'){
++		dev->no_cow = 1;
++		str++;
++	}
++
+ 	if(*str++ != '='){
+ 		printk(KERN_ERR "ubd_setup : Expected '='\n");
+ 		goto out2;
+@@ -284,14 +311,17 @@ static int ubd_setup_common(char *str, i
+ 	err = 0;
+ 	backing_file = strchr(str, ',');
+ 	if(backing_file){
+-		*backing_file = '\0';
+-		backing_file++;
++		if(dev->no_cow)
++			printk(KERN_ERR "Can't specify both 'd' and a "
++			       "cow file\n");
++		else {
++			*backing_file = '\0';
++			backing_file++;
++		}
+ 	}
+-	ubd_dev[n].file = str;
+-	if(ubd_is_dir(ubd_dev[n].file))
+-		ubd_dev[n].is_dir = 1;
+-	ubd_dev[n].cow.file = backing_file;
+-	ubd_dev[n].boot_openflags = flags;
++	dev->file = str;
++	dev->cow.file = backing_file;
++	dev->boot_openflags = flags;
+  out2:
+ 	spin_unlock(&ubd_lock);
+ 	return(err);
+@@ -321,8 +351,7 @@ __uml_help(ubd_setup,
+ static int fakehd_set = 0;
+ static int fakehd(char *str)
+ {
+-	printk(KERN_INFO 
+-	       "fakehd : Changing ubd name to \"hd\".\n");
++	printk(KERN_INFO "fakehd : Changing ubd name to \"hd\".\n");
+ 	fakehd_set = 1;
+ 	return 1;
+ }
+@@ -391,9 +420,10 @@ static void ubd_handler(void)
+ 	do_ubd_request(ubd_queue);
+ }
+ 
+-static void ubd_intr(int irq, void *dev, struct pt_regs *unused)
++static irqreturn_t ubd_intr(int irq, void *dev, struct pt_regs *unused)
+ {
+ 	ubd_handler();
++	return(IRQ_HANDLED);
+ }
+ 
+ /* Only changed by ubd_init, which is an initcall. */
+@@ -429,16 +459,18 @@ static void ubd_close(struct ubd *dev)
+ static int ubd_open_dev(struct ubd *dev)
+ {
+ 	struct openflags flags;
+-	int err, n, create_cow, *create_ptr;
++	char **back_ptr;
++	int err, create_cow, *create_ptr;
+ 
++	dev->openflags = dev->boot_openflags;
+ 	create_cow = 0;
+ 	create_ptr = (dev->cow.file != NULL) ? &create_cow : NULL;
+-	dev->fd = open_ubd_file(dev->file, &dev->openflags, &dev->cow.file,
++	back_ptr = dev->no_cow ? NULL : &dev->cow.file;
++	dev->fd = open_ubd_file(dev->file, &dev->openflags, back_ptr,
+ 				&dev->cow.bitmap_offset, &dev->cow.bitmap_len, 
+ 				&dev->cow.data_offset, create_ptr);
+ 
+ 	if((dev->fd == -ENOENT) && create_cow){
+-		n = dev - ubd_dev;
+ 		dev->fd = create_cow_file(dev->file, dev->cow.file, 
+ 					  dev->openflags, 1 << 9,
+ 					  &dev->cow.bitmap_offset, 
+@@ -455,7 +487,10 @@ static int ubd_open_dev(struct ubd *dev)
+ 	if(dev->cow.file != NULL){
+ 		err = -ENOMEM;
+ 		dev->cow.bitmap = (void *) vmalloc(dev->cow.bitmap_len);
+-		if(dev->cow.bitmap == NULL) goto error;
++		if(dev->cow.bitmap == NULL){
++			printk(KERN_ERR "Failed to vmalloc COW bitmap\n");
++			goto error;
++		}
+ 		flush_tlb_kernel_vm();
+ 
+ 		err = read_cow_bitmap(dev->fd, dev->cow.bitmap, 
+@@ -481,17 +516,31 @@ static int ubd_new_disk(int major, u64 s
+ 			
+ {
+ 	struct gendisk *disk;
++	char from[sizeof("ubd/nnnnn\0")], to[sizeof("discnnnnn/disc\0")];
++	int err;
+ 
+ 	disk = alloc_disk(1 << UBD_SHIFT);
+-	if (!disk)
+-		return -ENOMEM;
++	if(disk == NULL)
++		return(-ENOMEM);
+ 
+ 	disk->major = major;
+ 	disk->first_minor = unit << UBD_SHIFT;
+ 	disk->fops = &ubd_blops;
+ 	set_capacity(disk, size / 512);
+-	sprintf(disk->disk_name, "ubd");
+-	sprintf(disk->devfs_name, "ubd/disc%d", unit);
++	if(major == MAJOR_NR){
++		sprintf(disk->disk_name, "ubd%d", unit);
++		sprintf(disk->devfs_name, "ubd/disc%d", unit);
++		sprintf(from, "ubd/%d", unit);
++		sprintf(to, "disc%d/disc", unit);
++		err = devfs_mk_symlink(from, to);
++		if(err)
++			printk("ubd_new_disk failed to make link from %s to "
++			       "%s, error = %d\n", from, to, err);
++	}
++	else {
++		sprintf(disk->disk_name, "ubd_fake%d", unit);
++		sprintf(disk->devfs_name, "ubd_fake/disc%d", unit);
++	}
+ 
+ 	disk->private_data = &ubd_dev[unit];
+ 	disk->queue = ubd_queue;
+@@ -506,10 +555,7 @@ static int ubd_add(int n)
+ 	struct ubd *dev = &ubd_dev[n];
+ 	int err;
+ 
+-	if(dev->is_dir)
+-		return(-EISDIR);
+-
+-	if (!dev->file)
++	if(dev->file == NULL)
+ 		return(-ENODEV);
+ 
+ 	if (ubd_open_dev(dev))
+@@ -523,7 +569,7 @@ static int ubd_add(int n)
+ 	if(err) 
+ 		return(err);
+  
+-	if(fake_major)
++	if(fake_major != MAJOR_NR)
+ 		ubd_new_disk(fake_major, dev->size, n, 
+ 			     &fake_gendisk[n]);
+ 
+@@ -561,42 +607,42 @@ static int ubd_config(char *str)
+ 	return(err);
+ }
+ 
+-static int ubd_get_config(char *dev, char *str, int size, char **error_out)
++static int ubd_get_config(char *name, char *str, int size, char **error_out)
+ {
+-	struct ubd *ubd;
++	struct ubd *dev;
+ 	char *end;
+-	int major, n = 0;
++	int n, len = 0;
+ 
+-	major = simple_strtoul(dev, &end, 0);
+-	if((*end != '\0') || (end == dev)){
+-		*error_out = "ubd_get_config : didn't parse major number";
++	n = simple_strtoul(name, &end, 0);
++	if((*end != '\0') || (end == name)){
++		*error_out = "ubd_get_config : didn't parse device number";
+ 		return(-1);
+ 	}
+ 
+-	if((major >= MAX_DEV) || (major < 0)){
+-		*error_out = "ubd_get_config : major number out of range";
++	if((n >= MAX_DEV) || (n < 0)){
++		*error_out = "ubd_get_config : device number out of range";
+ 		return(-1);
+ 	}
+ 
+-	ubd = &ubd_dev[major];
++	dev = &ubd_dev[n];
+ 	spin_lock(&ubd_lock);
+ 
+-	if(ubd->file == NULL){
+-		CONFIG_CHUNK(str, size, n, "", 1);
++	if(dev->file == NULL){
++		CONFIG_CHUNK(str, size, len, "", 1);
+ 		goto out;
+ 	}
+ 
+-	CONFIG_CHUNK(str, size, n, ubd->file, 0);
++	CONFIG_CHUNK(str, size, len, dev->file, 0);
+ 
+-	if(ubd->cow.file != NULL){
+-		CONFIG_CHUNK(str, size, n, ",", 0);
+-		CONFIG_CHUNK(str, size, n, ubd->cow.file, 1);
++	if(dev->cow.file != NULL){
++		CONFIG_CHUNK(str, size, len, ",", 0);
++		CONFIG_CHUNK(str, size, len, dev->cow.file, 1);
+ 	}
+-	else CONFIG_CHUNK(str, size, n, "", 1);
++	else CONFIG_CHUNK(str, size, len, "", 1);
+ 
+  out:
+ 	spin_unlock(&ubd_lock);
+-	return(n);
++	return(len);
+ }
+ 
+ static int ubd_remove(char *str)
+@@ -604,11 +650,9 @@ static int ubd_remove(char *str)
+ 	struct ubd *dev;
+ 	int n, err = -ENODEV;
+ 
+-	if(!isdigit(*str))
+-		return(err);	/* it should be a number 0-7/a-h */
++	n = parse_unit(&str);
+ 
+-	n = *str - '0';
+-	if(n >= MAX_DEV) 
++	if((n < 0) || (n >= MAX_DEV))
+ 		return(err);
+ 
+ 	dev = &ubd_dev[n];
+@@ -669,7 +713,7 @@ int ubd_init(void)
+ 		
+ 	elevator_init(ubd_queue, &elevator_noop);
+ 
+-	if (fake_major != 0) {
++	if (fake_major != MAJOR_NR) {
+ 		char name[sizeof("ubd_nnn\0")];
+ 
+ 		snprintf(name, sizeof(name), "ubd_%d", fake_major);
+@@ -710,19 +754,13 @@ int ubd_driver_init(void){
+ 
+ device_initcall(ubd_driver_init);
+ 
+-static int ubd_open(struct inode *inode, struct file *filp)
++static int ubd_open(struct block_device *bdev, struct file *filp)
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
++	struct gendisk *disk = bdev->bd_disk;
+ 	struct ubd *dev = disk->private_data;
+-	int err = -EISDIR;
+-
+-	if(dev->is_dir == 1)
+-		goto out;
++	int err = 0;
+ 
+-	err = 0;
+ 	if(dev->count == 0){
+-		dev->openflags = dev->boot_openflags;
+-
+ 		err = ubd_open_dev(dev);
+ 		if(err){
+ 			printk(KERN_ERR "%s: Can't open \"%s\": errno = %d\n",
+@@ -739,9 +777,8 @@ static int ubd_open(struct inode *inode,
+ 	return(err);
+ }
+ 
+-static int ubd_release(struct inode * inode, struct file * file)
++static int ubd_release(struct gendisk *disk)
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
+ 	struct ubd *dev = disk->private_data;
+ 
+ 	if(--dev->count == 0)
+@@ -796,15 +833,6 @@ static int prepare_request(struct reques
+ 
+ 	if(req->rq_status == RQ_INACTIVE) return(1);
+ 
+-	if(dev->is_dir){
+-		strcpy(req->buffer, "HOSTFS:");
+-		strcat(req->buffer, dev->file);
+- 		spin_lock(&ubd_io_lock);
+-		end_request(req, 1);
+- 		spin_unlock(&ubd_io_lock);
+-		return(1);
+-	}
+-
+ 	if((rq_data_dir(req) == WRITE) && !dev->openflags.w){
+ 		printk("Write attempted on readonly ubd device %s\n", 
+ 		       disk->disk_name);
+@@ -865,11 +893,11 @@ static void do_ubd_request(request_queue
+ 	}
+ }
+ 
+-static int ubd_ioctl(struct inode * inode, struct file * file,
++static int ubd_ioctl(struct block_device *bdev, struct file * file,
+ 		     unsigned int cmd, unsigned long arg)
+ {
+ 	struct hd_geometry *loc = (struct hd_geometry *) arg;
+-	struct ubd *dev = inode->i_bdev->bd_disk->private_data;
++	struct ubd *dev = bdev->bd_disk->private_data;
+ 	int err;
+ 	struct hd_driveid ubd_id = {
+ 		.cyls		= 0,
+@@ -890,7 +918,7 @@ static int ubd_ioctl(struct inode * inod
+ 
+ 	case HDIO_SET_UNMASKINTR:
+ 		if(!capable(CAP_SYS_ADMIN)) return(-EACCES);
+-		if((arg > 1) || (inode->i_bdev->bd_contains != inode->i_bdev))
++		if((arg > 1) || (bdev->bd_contains != bdev))
+ 			return(-EINVAL);
+ 		return(0);
+ 
+@@ -910,7 +938,7 @@ static int ubd_ioctl(struct inode * inod
+ 
+ 	case HDIO_SET_MULTCOUNT:
+ 		if(!capable(CAP_SYS_ADMIN)) return(-EACCES);
+-		if(inode->i_bdev->bd_contains != inode->i_bdev)
++		if(bdev->bd_contains != bdev)
+ 			return(-EINVAL);
+ 		return(0);
+ 
+--- linux-2.6.0-test6/arch/um/drivers/ubd_user.c	2003-06-14 12:18:04.000000000 -0700
++++ 25/arch/um/drivers/ubd_user.c	2003-10-05 00:34:32.000000000 -0700
+@@ -24,142 +24,24 @@
+ #include "user.h"
+ #include "ubd_user.h"
+ #include "os.h"
++#include "cow.h"
+ 
+ #include <endian.h>
+ #include <byteswap.h>
+-#if __BYTE_ORDER == __BIG_ENDIAN
+-# define ntohll(x) (x)
+-# define htonll(x) (x)
+-#elif __BYTE_ORDER == __LITTLE_ENDIAN
+-# define ntohll(x)  bswap_64(x)
+-# define htonll(x)  bswap_64(x)
+-#else
+-#error "__BYTE_ORDER not defined"
+-#endif
+-
+-#define PATH_LEN_V1 256
+-
+-struct cow_header_v1 {
+-	int magic;
+-	int version;
+-	char backing_file[PATH_LEN_V1];
+-	time_t mtime;
+-	__u64 size;
+-	int sectorsize;
+-};
+-
+-#define PATH_LEN_V2 MAXPATHLEN
+-
+-struct cow_header_v2 {
+-	unsigned long magic;
+-	unsigned long version;
+-	char backing_file[PATH_LEN_V2];
+-	time_t mtime;
+-	__u64 size;
+-	int sectorsize;
+-};
+-
+-union cow_header {
+-	struct cow_header_v1 v1;
+-	struct cow_header_v2 v2;
+-};
+-
+-#define COW_MAGIC 0x4f4f4f4d  /* MOOO */
+-#define COW_VERSION 2
+-
+-static void sizes(__u64 size, int sectorsize, int bitmap_offset, 
+-		  unsigned long *bitmap_len_out, int *data_offset_out)
+-{
+-	*bitmap_len_out = (size + sectorsize - 1) / (8 * sectorsize);
+-
+-	*data_offset_out = bitmap_offset + *bitmap_len_out;
+-	*data_offset_out = (*data_offset_out + sectorsize - 1) / sectorsize;
+-	*data_offset_out *= sectorsize;
+-}
+-
+-static int read_cow_header(int fd, int *magic_out, char **backing_file_out, 
+-			   time_t *mtime_out, __u64 *size_out, 
+-			   int *sectorsize_out, int *bitmap_offset_out)
+-{
+-	union cow_header *header;
+-	char *file;
+-	int err, n;
+-	unsigned long version, magic;
+-
+-	header = um_kmalloc(sizeof(*header));
+-	if(header == NULL){
+-		printk("read_cow_header - Failed to allocate header\n");
+-		return(-ENOMEM);
+-	}
+-	err = -EINVAL;
+-	n = read(fd, header, sizeof(*header));
+-	if(n < offsetof(typeof(header->v1), backing_file)){
+-		printk("read_cow_header - short header\n");
+-		goto out;
+-	}
+-
+-	magic = header->v1.magic;
+-	if(magic == COW_MAGIC) {
+-		version = header->v1.version;
+-	}
+-	else if(magic == ntohl(COW_MAGIC)){
+-		version = ntohl(header->v1.version);
+-	}
+-	else goto out;
+-
+-	*magic_out = COW_MAGIC;
+-
+-	if(version == 1){
+-		if(n < sizeof(header->v1)){
+-			printk("read_cow_header - failed to read V1 header\n");
+-			goto out;
+-		}
+-		*mtime_out = header->v1.mtime;
+-		*size_out = header->v1.size;
+-		*sectorsize_out = header->v1.sectorsize;
+-		*bitmap_offset_out = sizeof(header->v1);
+-		file = header->v1.backing_file;
+-	}
+-	else if(version == 2){
+-		if(n < sizeof(header->v2)){
+-			printk("read_cow_header - failed to read V2 header\n");
+-			goto out;
+-		}
+-		*mtime_out = ntohl(header->v2.mtime);
+-		*size_out = ntohll(header->v2.size);
+-		*sectorsize_out = ntohl(header->v2.sectorsize);
+-		*bitmap_offset_out = sizeof(header->v2);
+-		file = header->v2.backing_file;
+-	}
+-	else {
+-		printk("read_cow_header - invalid COW version\n");
+-		goto out;
+-	}
+-	err = -ENOMEM;
+-	*backing_file_out = uml_strdup(file);
+-	if(*backing_file_out == NULL){
+-		printk("read_cow_header - failed to allocate backing file\n");
+-		goto out;
+-	}
+-	err = 0;
+- out:
+-	kfree(header);
+-	return(err);
+-}
+ 
+ static int same_backing_files(char *from_cmdline, char *from_cow, char *cow)
+ {
+-	struct stat buf1, buf2;
++	struct stat64 buf1, buf2;
+ 
+ 	if(from_cmdline == NULL) return(1);
+ 	if(!strcmp(from_cmdline, from_cow)) return(1);
+ 
+-	if(stat(from_cmdline, &buf1) < 0){
++	if(stat64(from_cmdline, &buf1) < 0){
+ 		printk("Couldn't stat '%s', errno = %d\n", from_cmdline, 
+ 		       errno);
+ 		return(1);
+ 	}
+-	if(stat(from_cow, &buf2) < 0){
++	if(stat64(from_cow, &buf2) < 0){
+ 		printk("Couldn't stat '%s', errno = %d\n", from_cow, errno);
+ 		return(1);
+ 	}
+@@ -215,118 +97,6 @@ int read_cow_bitmap(int fd, void *buf, i
+ 	return(0);
+ }
+ 
+-static int absolutize(char *to, int size, char *from)
+-{
+-	char save_cwd[256], *slash;
+-	int remaining;
+-
+-	if(getcwd(save_cwd, sizeof(save_cwd)) == NULL) {
+-		printk("absolutize : unable to get cwd - errno = %d\n", errno);
+-		return(-1);
+-	}
+-	slash = strrchr(from, '/');
+-	if(slash != NULL){
+-		*slash = '\0';
+-		if(chdir(from)){
+-			*slash = '/';
+-			printk("absolutize : Can't cd to '%s' - errno = %d\n",
+-			       from, errno);
+-			return(-1);
+-		}
+-		*slash = '/';
+-		if(getcwd(to, size) == NULL){
+-			printk("absolutize : unable to get cwd of '%s' - "
+-			       "errno = %d\n", from, errno);
+-			return(-1);
+-		}
+-		remaining = size - strlen(to);
+-		if(strlen(slash) + 1 > remaining){
+-			printk("absolutize : unable to fit '%s' into %d "
+-			       "chars\n", from, size);
+-			return(-1);
+-		}
+-		strcat(to, slash);
+-	}
+-	else {
+-		if(strlen(save_cwd) + 1 + strlen(from) + 1 > size){
+-			printk("absolutize : unable to fit '%s' into %d "
+-			       "chars\n", from, size);
+-			return(-1);
+-		}
+-		strcpy(to, save_cwd);
+-		strcat(to, "/");
+-		strcat(to, from);
+-	}
+-	chdir(save_cwd);
+-	return(0);
+-}
+-
+-static int write_cow_header(char *cow_file, int fd, char *backing_file, 
+-			    int sectorsize, long long *size)
+-{
+-        struct cow_header_v2 *header;
+-	struct stat64 buf;
+-	int err;
+-
+-	err = os_seek_file(fd, 0);
+-	if(err != 0){
+-		printk("write_cow_header - lseek failed, errno = %d\n", errno);
+-		return(-errno);
+-	}
+-
+-	err = -ENOMEM;
+-	header = um_kmalloc(sizeof(*header));
+-	if(header == NULL){
+-		printk("Failed to allocate COW V2 header\n");
+-		goto out;
+-	}
+-	header->magic = htonl(COW_MAGIC);
+-	header->version = htonl(COW_VERSION);
+-
+-	err = -EINVAL;
+-	if(strlen(backing_file) > sizeof(header->backing_file) - 1){
+-		printk("Backing file name \"%s\" is too long - names are "
+-		       "limited to %d characters\n", backing_file, 
+-		       sizeof(header->backing_file) - 1);
+-		goto out_free;
+-	}
+-
+-	if(absolutize(header->backing_file, sizeof(header->backing_file), 
+-		      backing_file))
+-		goto out_free;
+-
+-	err = stat64(header->backing_file, &buf);
+-	if(err < 0){
+-		printk("Stat of backing file '%s' failed, errno = %d\n",
+-		       header->backing_file, errno);
+-		err = -errno;
+-		goto out_free;
+-	}
+-
+-	err = os_file_size(header->backing_file, size);
+-	if(err){
+-		printk("Couldn't get size of backing file '%s', errno = %d\n",
+-		       header->backing_file, -*size);
+-		goto out_free;
+-	}
+-
+-	header->mtime = htonl(buf.st_mtime);
+-	header->size = htonll(*size);
+-	header->sectorsize = htonl(sectorsize);
+-
+-	err = write(fd, header, sizeof(*header));
+-	if(err != sizeof(*header)){
+-		printk("Write of header to new COW file '%s' failed, "
+-		       "errno = %d\n", cow_file, errno);
+-		goto out_free;
+-	}
+-	err = 0;
+- out_free:
+-	kfree(header);
+- out:
+-	return(err);
+-}
+-
+ int open_ubd_file(char *file, struct openflags *openflags, 
+ 		  char **backing_file_out, int *bitmap_offset_out, 
+ 		  unsigned long *bitmap_len_out, int *data_offset_out, 
+@@ -346,10 +116,17 @@ int open_ubd_file(char *file, struct ope
+                 if((fd = os_open_file(file, *openflags, mode)) < 0) 
+ 			return(fd);
+         }
++
++	err = os_lock_file(fd, openflags->w);
++	if(err){
++		printk("Failed to lock '%s', errno = %d\n", file, -err);
++		goto error;
++	}
++	
+ 	if(backing_file_out == NULL) return(fd);
+ 
+-	err = read_cow_header(fd, &magic, &backing_file, &mtime, &size, 
+-			      &sectorsize, bitmap_offset_out);
++	err = read_cow_header(file_reader, &fd, &magic, &backing_file, &mtime, 
++			      &size, &sectorsize, bitmap_offset_out);
+ 	if(err && (*backing_file_out != NULL)){
+ 		printk("Failed to read COW header from COW file \"%s\", "
+ 		       "errno = %d\n", file, err);
+@@ -376,12 +153,12 @@ int open_ubd_file(char *file, struct ope
+ 		if(err) goto error;
+ 	}
+ 
+-	sizes(size, sectorsize, *bitmap_offset_out, bitmap_len_out, 
+-	      data_offset_out);
++	cow_sizes(size, sectorsize, *bitmap_offset_out, bitmap_len_out, 
++		  data_offset_out);
+ 
+         return(fd);
+  error:
+-	close(fd);
++	os_close_file(fd);
+ 	return(err);
+ }
+ 
+@@ -389,10 +166,7 @@ int create_cow_file(char *cow_file, char
+ 		    int sectorsize, int *bitmap_offset_out, 
+ 		    unsigned long *bitmap_len_out, int *data_offset_out)
+ {
+-	__u64 blocks;
+-	long zero;
+-	int err, fd, i;
+-	long long size;
++	int err, fd;
+ 
+ 	flags.c = 1;
+ 	fd = open_ubd_file(cow_file, &flags, NULL, NULL, NULL, NULL, NULL);
+@@ -403,29 +177,12 @@ int create_cow_file(char *cow_file, char
+ 		goto out;
+ 	}
+ 
+-	err = write_cow_header(cow_file, fd, backing_file, sectorsize, &size);
+-	if(err) goto out_close;
+-
+-	blocks = (size + sectorsize - 1) / sectorsize;
+-	blocks = (blocks + sizeof(long) * 8 - 1) / (sizeof(long) * 8);
+-	zero = 0;
+-	for(i = 0; i < blocks; i++){
+-		err = write(fd, &zero, sizeof(zero));
+-		if(err != sizeof(zero)){
+-			printk("Write of bitmap to new COW file '%s' failed, "
+-			       "errno = %d\n", cow_file, errno);
+-			goto out_close;
+-		}
+-	}
+-
+-	sizes(size, sectorsize, sizeof(struct cow_header_v2), 
+-	      bitmap_len_out, data_offset_out);
+-	*bitmap_offset_out = sizeof(struct cow_header_v2);
+-
+-	return(fd);
+-
+- out_close:
+-	close(fd);
++	err = init_cow_file(fd, cow_file, backing_file, sectorsize, 
++			    bitmap_offset_out, bitmap_len_out, 
++			    data_offset_out);
++	if(!err)
++		return(fd);
++	os_close_file(fd);
+  out:
+ 	return(err);
+ }
+@@ -448,14 +205,6 @@ int write_ubd_fs(int fd, char *buffer, i
+ 	else return(n);
+ }
+ 
+-int ubd_is_dir(char *file)
+-{
+-	struct stat64 buf;
+-
+-	if(stat64(file, &buf) < 0) return(0);
+-	return(S_ISDIR(buf.st_mode));
+-}
+-
+ void do_io(struct io_thread_req *req)
+ {
+ 	char *buf;
+--- linux-2.6.0-test6/arch/um/drivers/xterm.c	2003-06-14 12:17:57.000000000 -0700
++++ 25/arch/um/drivers/xterm.c	2003-10-05 00:34:32.000000000 -0700
+@@ -108,7 +108,7 @@ int xterm_open(int input, int output, in
+ 	}
+ 	close(fd);
+ 
+-	fd = create_unix_socket(file, sizeof(file));
++	fd = create_unix_socket(file, sizeof(file), 1);
+ 	if(fd < 0){
+ 		printk("xterm_open : create_unix_socket failed, errno = %d\n", 
+ 		       -fd);
+--- linux-2.6.0-test6/arch/um/drivers/xterm_kern.c	2003-06-14 12:18:28.000000000 -0700
++++ 25/arch/um/drivers/xterm_kern.c	2003-10-05 00:34:32.000000000 -0700
+@@ -5,9 +5,12 @@
+ 
+ #include "linux/errno.h"
+ #include "linux/slab.h"
++#include "linux/signal.h"
++#include "linux/interrupt.h"
+ #include "asm/semaphore.h"
+ #include "asm/irq.h"
+ #include "irq_user.h"
++#include "irq_kern.h"
+ #include "kern_util.h"
+ #include "os.h"
+ #include "xterm.h"
+@@ -19,17 +22,18 @@ struct xterm_wait {
+ 	int new_fd;
+ };
+ 
+-static void xterm_interrupt(int irq, void *data, struct pt_regs *regs)
++static irqreturn_t xterm_interrupt(int irq, void *data, struct pt_regs *regs)
+ {
+ 	struct xterm_wait *xterm = data;
+ 	int fd;
+ 
+ 	fd = os_rcv_fd(xterm->fd, &xterm->pid);
+ 	if(fd == -EAGAIN)
+-		return;
++		return(IRQ_NONE);
+ 
+ 	xterm->new_fd = fd;
+ 	up(&xterm->sem);
++	return(IRQ_HANDLED);
+ }
+ 
+ int xterm_fd(int socket, int *pid_out)
+--- linux-2.6.0-test6/arch/um/dyn.lds.S	2003-06-14 12:18:21.000000000 -0700
++++ 25/arch/um/dyn.lds.S	2003-10-05 00:34:32.000000000 -0700
+@@ -15,7 +15,11 @@ SECTIONS
+   . = ALIGN(4096);		/* Init code and data */
+   _stext = .;
+   __init_begin = .;
+-  .text.init : { *(.text.init) }
++  .init.text : { 
++	_sinittext = .;
++	*(.init.text)
++	_einittext = .;
++  }
+ 
+   . = ALIGN(4096);
+ 
+@@ -67,7 +71,7 @@ SECTIONS
+ 
+   #include "asm/common.lds.S"
+ 
+-  .data.init : { *(.data.init) }
++  init.data : { *(.init.data) }
+ 
+   /* Ensure the __preinit_array_start label is properly aligned.  We
+      could instead move the label definition inside the section, but
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/arch/um/include/irq_kern.h	2003-10-05 00:34:32.000000000 -0700
+@@ -0,0 +1,28 @@
++/* 
++ * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
++ * Licensed under the GPL
++ */
++
++#ifndef __IRQ_KERN_H__
++#define __IRQ_KERN_H__
++
++#include "linux/interrupt.h"
++
++extern int um_request_irq(unsigned int irq, int fd, int type,
++			  irqreturn_t (*handler)(int, void *, 
++						 struct pt_regs *),
++			  unsigned long irqflags,  const char * devname,
++			  void *dev_id);
++
++#endif
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+--- linux-2.6.0-test6/arch/um/include/kern_util.h	2003-06-14 12:18:07.000000000 -0700
++++ 25/arch/um/include/kern_util.h	2003-10-05 00:34:32.000000000 -0700
+@@ -63,10 +63,9 @@ extern void init_flush_vm(void);
+ extern void *syscall_sp(void *t);
+ extern void syscall_trace(void);
+ extern int hz(void);
+-extern void idle_timer(void);
++extern void uml_idle_timer(void);
+ extern unsigned int do_IRQ(int irq, union uml_pt_regs *regs);
+ extern int external_pid(void *t);
+-extern int pid_to_processor_id(int pid);
+ extern void boot_timer_handler(int sig);
+ extern void interrupt_end(void);
+ extern void initial_thread_cb(void (*proc)(void *), void *arg);
+@@ -90,9 +89,7 @@ extern int remove_gdb(void);
+ extern char *uml_strdup(char *string);
+ extern void unprotect_kernel_mem(void);
+ extern void protect_kernel_mem(void);
+-extern void set_kmem_end(unsigned long);
+ extern void uml_cleanup(void);
+-extern int pid_to_processor_id(int pid);
+ extern void set_current(void *t);
+ extern void lock_signalled_task(void *t);
+ extern void IPI_handler(int cpu);
+@@ -101,7 +98,9 @@ extern void *get_init_task(void);
+ extern int clear_user_proc(void *buf, int size);
+ extern int copy_to_user_proc(void *to, void *from, int size);
+ extern int copy_from_user_proc(void *to, void *from, int size);
++extern int strlen_user_proc(char *str);
+ extern void bus_handler(int sig, union uml_pt_regs *regs);
++extern void winch(int sig, union uml_pt_regs *regs);
+ extern long execute_syscall(void *r);
+ extern int smp_sigio_handler(void);
+ extern void *get_current(void);
+--- linux-2.6.0-test6/arch/um/include/line.h	2003-06-14 12:18:29.000000000 -0700
++++ 25/arch/um/include/line.h	2003-10-05 00:34:32.000000000 -0700
+@@ -9,12 +9,14 @@
+ #include "linux/list.h"
+ #include "linux/workqueue.h"
+ #include "linux/tty.h"
++#include "linux/interrupt.h"
+ #include "asm/semaphore.h"
+ #include "chan_user.h"
+ #include "mconsole_kern.h"
+ 
+ struct line_driver {
+ 	char *name;
++	char *device_name;
+ 	char *devfs_name;
+ 	short major;
+ 	short minor_start;
+@@ -67,8 +69,9 @@ struct lines {
+ 
+ #define LINES_INIT(n) {  num :		n }
+ 
+-extern void line_interrupt(int irq, void *data, struct pt_regs *unused);
+-extern void line_write_interrupt(int irq, void *data, struct pt_regs *unused);
++extern irqreturn_t line_interrupt(int irq, void *data, struct pt_regs *unused);
++extern irqreturn_t line_write_interrupt(int irq, void *data, 
++					struct pt_regs *unused);
+ extern void line_close(struct line *lines, struct tty_struct *tty);
+ extern int line_open(struct line *lines, struct tty_struct *tty, 
+ 		     struct chan_opts *opts);
+--- linux-2.6.0-test6/arch/um/include/mconsole.h	2003-06-14 12:18:08.000000000 -0700
++++ 25/arch/um/include/mconsole.h	2003-10-05 00:34:32.000000000 -0700
+@@ -77,6 +77,7 @@ extern void mconsole_sysrq(struct mc_req
+ extern void mconsole_cad(struct mc_request *req);
+ extern void mconsole_stop(struct mc_request *req);
+ extern void mconsole_go(struct mc_request *req);
++extern void mconsole_log(struct mc_request *req);
+ 
+ extern int mconsole_get_request(int fd, struct mc_request *req);
+ extern int mconsole_notify(char *sock_name, int type, const void *data, 
+--- linux-2.6.0-test6/arch/um/include/mem.h	2003-06-14 12:18:51.000000000 -0700
++++ 25/arch/um/include/mem.h	2003-10-05 00:34:32.000000000 -0700
+@@ -13,7 +13,6 @@ struct vm_reserved {
+ };
+ 
+ extern void set_usable_vm(unsigned long start, unsigned long end);
+-extern void set_kmem_end(unsigned long new);
+ 
+ #endif
+ 
+--- linux-2.6.0-test6/arch/um/include/mem_user.h	2003-06-14 12:18:25.000000000 -0700
++++ 25/arch/um/include/mem_user.h	2003-10-05 00:34:32.000000000 -0700
+@@ -51,9 +51,6 @@ extern unsigned long task_size;
+ 
+ extern int init_mem_user(void);
+ extern int create_mem_file(unsigned long len);
+-extern void setup_range(int fd, char *driver, unsigned long start,
+-			unsigned long pfn, unsigned long total, int need_vm, 
+-			struct mem_region *region, void *reserved);
+ extern void setup_memory(void *entry);
+ extern unsigned long find_iomem(char *driver, unsigned long *len_out);
+ extern int init_maps(struct mem_region *region);
+--- linux-2.6.0-test6/arch/um/include/os.h	2003-06-14 12:18:02.000000000 -0700
++++ 25/arch/um/include/os.h	2003-10-05 00:34:32.000000000 -0700
+@@ -103,10 +103,11 @@ extern int os_accept_connection(int fd);
+ extern int os_shutdown_socket(int fd, int r, int w);
+ extern void os_close_file(int fd);
+ extern int os_rcv_fd(int fd, int *helper_pid_out);
+-extern int create_unix_socket(char *file, int len);
++extern int create_unix_socket(char *file, int len, int close_on_exec);
+ extern int os_connect_socket(char *name);
+ extern int os_file_type(char *file);
+ extern int os_file_mode(char *file, struct openflags *mode_out);
++extern int os_lock_file(int fd, int excl);
+ 
+ extern unsigned long os_process_pc(int pid);
+ extern int os_process_parent(int pid);
+@@ -120,6 +121,7 @@ extern int os_map_memory(void *virt, int
+ extern int os_protect_memory(void *addr, unsigned long len, 
+ 			     int r, int w, int x);
+ extern int os_unmap_memory(void *addr, int len);
++extern void os_flush_stdout(void);
+ 
+ #endif
+ 
+--- linux-2.6.0-test6/arch/um/include/sysdep-i386/sigcontext.h	2003-06-14 12:18:28.000000000 -0700
++++ 25/arch/um/include/sysdep-i386/sigcontext.h	2003-10-05 00:34:32.000000000 -0700
+@@ -28,8 +28,8 @@
+  */
+ #define SC_START_SYSCALL(sc) do SC_EAX(sc) = -ENOSYS; while(0)
+ 
+-/* These are General Protection and Page Fault */
+-#define SEGV_IS_FIXABLE(trap) ((trap == 13) || (trap == 14))
++/* This is Page Fault */
++#define SEGV_IS_FIXABLE(trap) (trap == 14)
+ 
+ #define SC_SEGV_IS_FIXABLE(sc) (SEGV_IS_FIXABLE(SC_TRAPNO(sc)))
+ 
+--- linux-2.6.0-test6/arch/um/include/ubd_user.h	2003-06-14 12:18:22.000000000 -0700
++++ 25/arch/um/include/ubd_user.h	2003-10-05 00:34:32.000000000 -0700
+@@ -39,7 +39,6 @@ extern int read_ubd_fs(int fd, void *buf
+ extern int write_ubd_fs(int fd, char *buffer, int len);
+ extern int start_io_thread(unsigned long sp, int *fds_out);
+ extern void do_io(struct io_thread_req *req);
+-extern int ubd_is_dir(char *file);
+ 
+ static inline int ubd_test_bit(__u64 bit, unsigned char *data)
+ {
+--- linux-2.6.0-test6/arch/um/include/user.h	2003-06-14 12:17:57.000000000 -0700
++++ 25/arch/um/include/user.h	2003-10-05 00:34:32.000000000 -0700
+@@ -14,7 +14,7 @@ extern void *um_kmalloc_atomic(int size)
+ extern void kfree(void *ptr);
+ extern int in_aton(char *str);
+ extern int open_gdb_chan(void);
+-
++extern int strlcpy(char *, const char *, int);
+ #endif
+ 
+ /*
+--- linux-2.6.0-test6/arch/um/include/user_util.h	2003-06-14 12:17:58.000000000 -0700
++++ 25/arch/um/include/user_util.h	2003-10-05 00:34:32.000000000 -0700
+@@ -59,7 +59,6 @@ extern int wait_for_stop(int pid, int si
+ extern void *add_signal_handler(int sig, void (*handler)(int));
+ extern int start_fork_tramp(void *arg, unsigned long temp_stack, 
+ 			    int clone_flags, int (*tramp)(void *));
+-extern int clone_and_wait(int (*fn)(void *), void *arg, void *sp, int flags);
+ extern int linux_main(int argc, char **argv);
+ extern void set_cmdline(char *cmd);
+ extern void input_cb(void (*proc)(void *), void *arg, int arg_len);
+@@ -90,7 +89,8 @@ extern int arch_handle_signal(int sig, u
+ extern int arch_fixup(unsigned long address, void *sc_ptr);
+ extern void forward_pending_sigio(int target);
+ extern int can_do_skas(void);
+- 
++extern void arch_init_thread(void);
++
+ #endif
+ 
+ /*
+--- linux-2.6.0-test6/arch/um/Kconfig	2003-08-08 22:55:11.000000000 -0700
++++ 25/arch/um/Kconfig	2003-10-05 00:34:32.000000000 -0700
+@@ -61,6 +61,20 @@ config MODE_SKAS
+ 
+ config NET
+ 	bool "Networking support"
++	help
++	Unless you really know what you are doing, you should say Y here.
++	The reason is that some programs need kernel networking support even
++	when running on a stand-alone machine that isn't connected to any
++	other computer. If you are upgrading from an older kernel, you
++	should consider updating your networking tools too because changes
++	in the kernel and the tools often go hand in hand. The tools are
++	contained in the package net-tools, the location and version number
++	of which are given in Documentation/Changes.
++
++	For a general introduction to Linux networking, it is highly
++	recommended to read the NET-HOWTO, available from
++	<http://www.tldp.org/docs.html#howto>.
++
+ 
+ source "fs/Kconfig.binfmt"
+ 
+@@ -105,6 +119,16 @@ config MCONSOLE
+ config MAGIC_SYSRQ
+ 	bool "Magic SysRq key"
+ 	depends on MCONSOLE
++	help
++	If you say Y here, you will have some control over the system even
++	if the system crashes for example during kernel debugging (e.g., you
++	will be able to flush the buffer cache to disk, reboot the system
++	immediately or dump some status information). This is accomplished
++	by pressing various keys while holding SysRq (Alt+PrintScreen). It
++	also works on a serial console (on PC hardware at least), if you
++	send a BREAK and then within 5 seconds a command keypress. The
++	keys are documented in Documentation/sysrq.txt. Don't say Y
++	unless you really know what this hack does.
+ 
+ config HOST_2G_2G
+ 	bool "2G/2G host address space split"
+@@ -239,6 +263,10 @@ config FRAME_POINTER
+ config PT_PROXY
+ 	bool "Enable ptrace proxy"
+ 	depends on XTERM_CHAN && DEBUG_INFO
++	help
++	This option enables a debugging interface which allows gdb to debug
++	the kernel without needing to actually attach to kernel threads.
++	If you want to do kernel debugging, say Y here; otherwise say N.
+ 
+ config GPROF
+ 	bool "Enable gprof support"
+--- linux-2.6.0-test6/arch/um/Kconfig_block	2003-06-14 12:18:25.000000000 -0700
++++ 25/arch/um/Kconfig_block	2003-10-05 00:34:32.000000000 -0700
+@@ -29,6 +29,20 @@ config BLK_DEV_UBD_SYNC
+         wise choice too.  In all other cases (for example, if you're just
+         playing around with User-Mode Linux) you can choose N.
+ 
++# Turn this back on when the driver actually works
++#
++#config BLK_DEV_COW
++#	tristate "COW block device"
++#	help
++#	This is a layered driver which sits above two other block devices.
++#	One is read-only, and the other is a read-write layer which stores
++#	all changes.  This provides the illusion that the read-only layer
++#	can be mounted read-write and changed.
++
++config BLK_DEV_COW_COMMON
++	bool
++	default BLK_DEV_COW || BLK_DEV_UBD
++
+ config BLK_DEV_LOOP
+ 	tristate "Loopback device support"
+ 
+--- linux-2.6.0-test6/arch/um/Kconfig_net	2003-06-14 12:18:23.000000000 -0700
++++ 25/arch/um/Kconfig_net	2003-10-05 00:34:32.000000000 -0700
+@@ -1,5 +1,5 @@
+ 
+-menu "Network Devices"
++menu "UML Network Devices"
+ 	depends on NET
+ 
+ # UML virtual driver
+@@ -176,73 +176,5 @@ config UML_NET_SLIRP
+ 	
+         Startup example: "eth0=slirp,FE:FD:01:02:03:04,/usr/local/bin/slirp"
+ 
+-
+-# Below are hardware-independent drivers mirrored from
+-# drivers/net/Config.in. It would be nice if Linux
+-# had HW independent drivers separated from the other
+-# but it does not. Until then each non-ISA/PCI arch
+-# needs to provide it's own menu of network drivers
+-config DUMMY
+-	tristate "Dummy net driver support"
+-
+-config BONDING
+-	tristate "Bonding driver support"
+-
+-config EQUALIZER
+-	tristate "EQL (serial line load balancing) support"
+-
+-config TUN
+-	tristate "Universal TUN/TAP device driver support"
+-
+-config ETHERTAP
+-	tristate "Ethertap network tap (OBSOLETE)"
+-	depends on EXPERIMENTAL && NETLINK
+-
+-config PPP
+-	tristate "PPP (point-to-point protocol) support"
+-
+-config PPP_MULTILINK
+-	bool "PPP multilink support (EXPERIMENTAL)"
+-	depends on PPP && EXPERIMENTAL
+-
+-config PPP_FILTER
+-	bool "PPP filtering"
+-	depends on PPP && FILTER
+-
+-config PPP_ASYNC
+-	tristate "PPP support for async serial ports"
+-	depends on PPP
+-
+-config PPP_SYNC_TTY
+-	tristate "PPP support for sync tty ports"
+-	depends on PPP
+-
+-config PPP_DEFLATE
+-	tristate "PPP Deflate compression"
+-	depends on PPP
+-
+-config PPP_BSDCOMP
+-	tristate "PPP BSD-Compress compression"
+-	depends on PPP
+-
+-config PPPOE
+-	tristate "PPP over Ethernet (EXPERIMENTAL)"
+-	depends on PPP && EXPERIMENTAL
+-
+-config SLIP
+-	tristate "SLIP (serial line) support"
+-
+-config SLIP_COMPRESSED
+-	bool "CSLIP compressed headers"
+-	depends on SLIP=y
+-
+-config SLIP_SMART
+-	bool "Keepalive and linefill"
+-	depends on SLIP=y
+-
+-config SLIP_MODE_SLIP6
+-	bool "Six bit SLIP encapsulation"
+-	depends on SLIP=y
+-
+ endmenu
+ 
+--- linux-2.6.0-test6/arch/um/kernel/config.c.in	2003-06-14 12:18:28.000000000 -0700
++++ 25/arch/um/kernel/config.c.in	2003-10-05 00:34:32.000000000 -0700
+@@ -7,9 +7,7 @@
+ #include <stdlib.h>
+ #include "init.h"
+ 
+-static __initdata char *config = "
+-CONFIG
+-";
++static __initdata char *config = "CONFIG";
+ 
+ static int __init print_config(char *line, int *add)
+ {
+--- linux-2.6.0-test6/arch/um/kernel/init_task.c	2003-06-14 12:18:51.000000000 -0700
++++ 25/arch/um/kernel/init_task.c	2003-10-05 00:34:32.000000000 -0700
+@@ -17,6 +17,7 @@ static struct fs_struct init_fs = INIT_F
+ struct mm_struct init_mm = INIT_MM(init_mm);
+ static struct files_struct init_files = INIT_FILES;
+ static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
++static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
+ 
+ /*
+  * Initial task structure.
+@@ -38,26 +39,12 @@ union thread_union init_thread_union 
+ __attribute__((__section__(".data.init_task"))) = 
+ { INIT_THREAD_INFO(init_task) };
+ 
+-struct task_struct *alloc_task_struct(void)
+-{
+-	return((struct task_struct *) 
+-	       __get_free_pages(GFP_KERNEL, CONFIG_KERNEL_STACK_ORDER));
+-}
+-
+ void unprotect_stack(unsigned long stack)
+ {
+ 	protect_memory(stack, (1 << CONFIG_KERNEL_STACK_ORDER) * PAGE_SIZE, 
+ 		       1, 1, 0, 1);
+ }
+ 
+-void free_task_struct(struct task_struct *task)
+-{
+-	/* free_pages decrements the page counter and only actually frees
+-	 * the pages if they are now not accessed by anything.
+-	 */
+-	free_pages((unsigned long) task, CONFIG_KERNEL_STACK_ORDER);
+-}
+-
+ /*
+  * Overrides for Emacs so that we follow Linus's tabbing style.
+  * Emacs will notice this stuff at the end of the file and automatically
+--- linux-2.6.0-test6/arch/um/kernel/irq.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/arch/um/kernel/irq.c	2003-10-05 00:34:32.000000000 -0700
+@@ -28,6 +28,7 @@
+ #include "user_util.h"
+ #include "kern_util.h"
+ #include "irq_user.h"
++#include "irq_kern.h"
+ 
+ static void register_irq_proc (unsigned int irq);
+ 
+@@ -82,65 +83,52 @@ struct hw_interrupt_type no_irq_type = {
+ 	end_none
+ };
+ 
+-/* Not changed */
+-volatile unsigned long irq_err_count;
+-
+ /*
+  * Generic, controller-independent functions:
+  */
+ 
+-int get_irq_list(char *buf)
++int show_interrupts(struct seq_file *p, void *v)
+ {
+ 	int i, j;
+-	unsigned long flags;
+ 	struct irqaction * action;
+-	char *p = buf;
++	unsigned long flags;
+ 
+-	p += sprintf(p, "           ");
+-	for (j=0; j<num_online_cpus(); j++)
+-		p += sprintf(p, "CPU%d       ",j);
+-	*p++ = '\n';
++	seq_printf(p, "           ");
++	for (j=0; j<NR_CPUS; j++)
++		if (cpu_online(j))
++			seq_printf(p, "CPU%d       ",j);
++	seq_putc(p, '\n');
+ 
+ 	for (i = 0 ; i < NR_IRQS ; i++) {
+ 		spin_lock_irqsave(&irq_desc[i].lock, flags);
+ 		action = irq_desc[i].action;
+ 		if (!action) 
+-			goto end;
+-		p += sprintf(p, "%3d: ",i);
++			goto skip;
++		seq_printf(p, "%3d: ",i);
+ #ifndef CONFIG_SMP
+-		p += sprintf(p, "%10u ", kstat_irqs(i));
++		seq_printf(p, "%10u ", kstat_irqs(i));
+ #else
+-		for (j = 0; j < num_online_cpus(); j++)
+-			p += sprintf(p, "%10u ",
+-				kstat_cpu(cpu_logical_map(j)).irqs[i]);
++		for (j = 0; j < NR_CPUS; j++)
++			if (cpu_online(j))
++				seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
+ #endif
+-		p += sprintf(p, " %14s", irq_desc[i].handler->typename);
+-		p += sprintf(p, "  %s", action->name);
++		seq_printf(p, " %14s", irq_desc[i].handler->typename);
++		seq_printf(p, "  %s", action->name);
+ 
+ 		for (action=action->next; action; action = action->next)
+-			p += sprintf(p, ", %s", action->name);
+-		*p++ = '\n';
+-	end:
++			seq_printf(p, ", %s", action->name);
++
++		seq_putc(p, '\n');
++skip:
+ 		spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+ 	}
+-	p += sprintf(p, "\n");
+-#ifdef notdef
+-#ifdef CONFIG_SMP
+-	p += sprintf(p, "LOC: ");
+-	for (j = 0; j < num_online_cpus(); j++)
+-		p += sprintf(p, "%10u ",
+-			apic_timer_irqs[cpu_logical_map(j)]);
+-	p += sprintf(p, "\n");
+-#endif
+-#endif
+-	p += sprintf(p, "ERR: %10lu\n", irq_err_count);
+-	return p - buf;
+-}
+-
++	seq_printf(p, "NMI: ");
++	for (j = 0; j < NR_CPUS; j++)
++		if (cpu_online(j))
++			seq_printf(p, "%10u ", nmi_count(j));
++	seq_putc(p, '\n');
+ 
+-int show_interrupts(struct seq_file *p, void *v)
+-{
+-	return(0);
++	return 0;
+ }
+ 
+ /*
+@@ -281,13 +269,12 @@ unsigned int do_IRQ(int irq, union uml_p
+ 	 * 0 return value means that this irq is already being
+ 	 * handled by some other CPU. (or is disabled)
+ 	 */
+-	int cpu = smp_processor_id();
+ 	irq_desc_t *desc = irq_desc + irq;
+ 	struct irqaction * action;
+ 	unsigned int status;
+ 
+ 	irq_enter();
+-	kstat_cpu(cpu).irqs[irq]++;
++	kstat_this_cpu.irqs[irq]++;
+ 	spin_lock(&desc->lock);
+ 	desc->handler->ack(irq);
+ 	/*
+@@ -384,7 +371,7 @@ out:
+  */
+  
+ int request_irq(unsigned int irq,
+-		void (*handler)(int, void *, struct pt_regs *),
++		irqreturn_t (*handler)(int, void *, struct pt_regs *),
+ 		unsigned long irqflags, 
+ 		const char * devname,
+ 		void *dev_id)
+@@ -430,15 +417,19 @@ int request_irq(unsigned int irq,
+ }
+ 
+ int um_request_irq(unsigned int irq, int fd, int type,
+-		   void (*handler)(int, void *, struct pt_regs *),
++		   irqreturn_t (*handler)(int, void *, struct pt_regs *),
+ 		   unsigned long irqflags, const char * devname,
+ 		   void *dev_id)
+ {
+-	int retval;
++	int err;
+ 
+-	retval = request_irq(irq, handler, irqflags, devname, dev_id);
+-	if(retval) return(retval);
+-	return(activate_fd(irq, fd, type, dev_id));
++	err = request_irq(irq, handler, irqflags, devname, dev_id);
++	if(err) 
++		return(err);
++
++	if(fd != -1)
++		err = activate_fd(irq, fd, type, dev_id);
++	return(err);
+ }
+ 
+ /* this was setup_x86_irq but it seems pretty generic */
+@@ -654,7 +645,7 @@ static int prof_cpu_mask_read_proc (char
+ 		return -EINVAL;
+ 	tmp = *mask;
+ 	for (k = 0; k < sizeof(cpumask_t)/sizeof(u16); ++k) {
+-		int j = sprintf(page, "%04hx", cpus_coerce(tmp));
++		int j = sprintf(page, "%04hx", (short) cpus_coerce(tmp));
+ 		len += j;
+ 		page += j;
+ 		cpus_shift_right(tmp, tmp, 16);
+--- linux-2.6.0-test6/arch/um/kernel/Makefile	2003-08-22 19:23:40.000000000 -0700
++++ 25/arch/um/kernel/Makefile	2003-10-05 00:34:32.000000000 -0700
+@@ -21,6 +21,8 @@ obj-$(CONFIG_TTY_LOG)	+= tty_log.o
+ obj-$(CONFIG_MODE_TT) += tt/
+ obj-$(CONFIG_MODE_SKAS) += skas/
+ 
++clean-files	:= config.c
++
+ user-objs-$(CONFIG_TTY_LOG) += tty_log.o
+ 
+ USER_OBJS := $(filter %_user.o,$(obj-y))  $(user-objs-y) config.o helper.o \
+@@ -45,17 +47,13 @@ $(USER_OBJS) : %.o: %.c
+ $(obj)/frame.o: $(src)/frame.c
+ 	$(CC) $(CFLAGS_$(notdir $@)) -c -o $@ $<
+ 
+-QUOTE = 'my $$config=`cat $(TOPDIR)/.config`; $$config =~ s/"/\\"/g ; while(<STDIN>) { $$_ =~ s/CONFIG/$$config/; print $$_ }'
++QUOTE = 'my $$config=`cat $(TOPDIR)/.config`; $$config =~ s/"/\\"/g ; $$config =~ s/\n/\\n"\n"/g ; while(<STDIN>) { $$_ =~ s/CONFIG/$$config/; print $$_ }'
+ 
+ $(obj)/config.c : $(src)/config.c.in $(TOPDIR)/.config
+ 	$(PERL) -e $(QUOTE) < $(src)/config.c.in > $@
+ 
+ $(obj)/config.o : $(obj)/config.c
+ 
+-clean:
+-	rm -f config.c
+-	for dir in $(subdir-y) ; do $(MAKE) -C $$dir clean; done
+-
+ modules:
+ 
+ fastdep:
+--- linux-2.6.0-test6/arch/um/kernel/mem.c	2003-06-14 12:18:08.000000000 -0700
++++ 25/arch/um/kernel/mem.c	2003-10-05 00:34:32.000000000 -0700
+@@ -119,11 +119,6 @@ unsigned long get_kmem_end(void)
+ 	return(kmem_top);
+ }
+ 
+-void set_kmem_end(unsigned long new)
+-{
+-	kmem_top = new;
+-}
+-
+ #ifdef CONFIG_HIGHMEM
+ /* Changed during early boot */
+ pte_t *kmap_pte;
+@@ -218,7 +213,7 @@ static int setup_one_range(int fd, char 
+ 		if(regions[i] == NULL) break;		
+ 	}
+ 	if(i == NREGIONS){
+-		printk("setup_range : no free regions\n");
++		printk("setup_one_range : no free regions\n");
+ 		i = -1;
+ 		goto out;
+ 	}
+@@ -227,7 +222,9 @@ static int setup_one_range(int fd, char 
+ 		fd = create_mem_file(len);
+ 
+ 	if(region == NULL){
+-		region = alloc_bootmem_low_pages(sizeof(*region));
++		if(kmalloc_ok)
++			region = kmalloc(sizeof(*region), GFP_KERNEL);
++		else region = alloc_bootmem_low_pages(sizeof(*region));
+ 		if(region == NULL)
+ 			panic("Failed to allocating mem_region");
+ 	}
+@@ -528,9 +525,9 @@ int nregions(void)
+ 	return(NREGIONS);
+ }
+ 
+-void setup_range(int fd, char *driver, unsigned long start, unsigned long pfn,
+-		 unsigned long len, int need_vm, struct mem_region *region, 
+-		 void *reserved)
++static void setup_range(int fd, char *driver, unsigned long start, 
++			unsigned long pfn, unsigned long len, int need_vm, 
++			struct mem_region *region, void *reserved)
+ {
+ 	int i, cur;
+ 
+--- linux-2.6.0-test6/arch/um/kernel/mem_user.c	2003-06-14 12:18:22.000000000 -0700
++++ 25/arch/um/kernel/mem_user.c	2003-10-05 00:34:32.000000000 -0700
+@@ -111,6 +111,11 @@ int setup_region(struct mem_region *regi
+ 		offset = 0;
+ 	}
+ 
++	if(offset >= region->len){
++		printf("%ld bytes of physical memory is insufficient\n",
++		       region->len);
++		exit(1);
++	}
+ 	loc = mmap(start, region->len - offset, PROT_READ | PROT_WRITE, 
+ 		   MAP_SHARED | MAP_FIXED, region->fd, offset);
+ 	if(loc != start){
+@@ -122,26 +127,26 @@ int setup_region(struct mem_region *regi
+ 
+ static int __init parse_iomem(char *str, int *add)
+ {
+-	struct stat buf;
++	struct stat64 buf;
+ 	char *file, *driver;
+ 	int fd;
+ 
+ 	driver = str;
+ 	file = strchr(str,',');
+ 	if(file == NULL){
+-		printk("parse_iomem : failed to parse iomem\n");
++		printf("parse_iomem : failed to parse iomem\n");
+ 		return(1);
+ 	}
+ 	*file = '\0';
+ 	file++;
+ 	fd = os_open_file(file, of_rdwr(OPENFLAGS()), 0);
+ 	if(fd < 0){
+-		printk("parse_iomem - Couldn't open io file, errno = %d\n", 
++		printf("parse_iomem - Couldn't open io file, errno = %d\n", 
+ 		       errno);
+ 		return(1);
+ 	}
+-	if(fstat(fd, &buf) < 0) {
+-		printk("parse_iomem - cannot fstat file, errno = %d\n", errno);
++	if(fstat64(fd, &buf) < 0) {
++		printf("parse_iomem - cannot fstat file, errno = %d\n", errno);
+ 		return(1);
+ 	}
+ 	add_iomem(driver, fd, buf.st_size);
+--- linux-2.6.0-test6/arch/um/kernel/process.c	2003-06-14 12:18:32.000000000 -0700
++++ 25/arch/um/kernel/process.c	2003-10-05 00:34:32.000000000 -0700
+@@ -72,7 +72,6 @@ void init_new_thread_signals(int altstac
+ 		    SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);
+ 	set_handler(SIGUSR2, (__sighandler_t) sig_handler, 
+ 		    SA_NOMASK | flags, -1);
+-	(void) CHOOSE_MODE(signal(SIGCHLD, SIG_IGN), (void *) 0);
+ 	signal(SIGHUP, SIG_IGN);
+ 
+ 	init_irq_signals(altstack);
+@@ -127,7 +126,8 @@ int start_fork_tramp(void *thread_arg, u
+ 	if(err < 0) panic("Waiting for outer trampoline failed - errno = %d", 
+ 			  errno);
+ 	if(!WIFSIGNALED(status) || (WTERMSIG(status) != SIGKILL))
+-		panic("outer trampoline didn't exit with SIGKILL");
++		panic("outer trampoline didn't exit with SIGKILL, "
++		      "status = %d", status);
+ 
+ 	return(arg.pid);
+ }
+--- linux-2.6.0-test6/arch/um/kernel/process_kern.c	2003-07-10 18:50:30.000000000 -0700
++++ 25/arch/um/kernel/process_kern.c	2003-10-05 00:34:32.000000000 -0700
+@@ -52,17 +52,12 @@ struct cpu_task cpu_tasks[NR_CPUS] = { [
+ 
+ struct task_struct *get_task(int pid, int require)
+ {
+-        struct task_struct *task, *ret;
++        struct task_struct *ret;
+ 
+-        ret = NULL;
+         read_lock(&tasklist_lock);
+-        for_each_process(task){
+-                if(task->pid == pid){
+-                        ret = task;
+-                        break;
+-                }
+-        }
++	ret = find_task_by_pid(pid);
+         read_unlock(&tasklist_lock);
++
+         if(require && (ret == NULL)) panic("get_task couldn't find a task\n");
+         return(ret);
+ }
+@@ -103,13 +98,14 @@ unsigned long alloc_stack(int order, int
+ 
+ int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
+ {
+-	struct task_struct *p;
++	int pid;
+ 
+ 	current->thread.request.u.thread.proc = fn;
+ 	current->thread.request.u.thread.arg = arg;
+-	p = do_fork(CLONE_VM | flags, 0, NULL, 0, NULL, NULL);
+-	if(IS_ERR(p)) panic("do_fork failed in kernel_thread");
+-	return(p->pid);
++	pid = do_fork(CLONE_VM | flags, 0, NULL, 0, NULL, NULL);
++	if(pid < 0)
++		panic("do_fork failed in kernel_thread, errno = %d", pid);
++	return(pid);
+ }
+ 
+ void switch_mm(struct mm_struct *prev, struct mm_struct *next, 
+@@ -129,7 +125,7 @@ void set_current(void *t)
+ 		{ external_pid(task), task });
+ }
+ 
+-void *switch_to(void *prev, void *next, void *last)
++void *_switch_to(void *prev, void *next, void *last)
+ {
+ 	return(CHOOSE_MODE(switch_to_tt(prev, next), 
+ 			   switch_to_skas(prev, next)));
+@@ -149,7 +145,7 @@ void release_thread(struct task_struct *
+ void exit_thread(void)
+ {
+ 	CHOOSE_MODE(exit_thread_tt(), exit_thread_skas());
+-	unprotect_stack((unsigned long) current->thread_info);
++	unprotect_stack((unsigned long) current_thread);
+ }
+  
+ void *get_current(void)
+@@ -157,6 +153,10 @@ void *get_current(void)
+ 	return(current);
+ }
+ 
++void prepare_to_copy(struct task_struct *tsk)
++{
++}
++
+ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
+ 		unsigned long stack_top, struct task_struct * p, 
+ 		struct pt_regs *regs)
+@@ -190,7 +190,7 @@ int current_pid(void)
+ 
+ void default_idle(void)
+ {
+-	idle_timer();
++	uml_idle_timer();
+ 
+ 	atomic_inc(&init_mm.mm_count);
+ 	current->mm = &init_mm;
+@@ -363,10 +363,15 @@ int clear_user_proc(void *buf, int size)
+ 	return(clear_user(buf, size));
+ }
+ 
++int strlen_user_proc(char *str)
++{
++	return(strlen_user(str));
++}
++
+ int smp_sigio_handler(void)
+ {
+ #ifdef CONFIG_SMP
+-	int cpu = current->thread_info->cpu;
++	int cpu = current_thread->cpu;
+ 	IPI_handler(cpu);
+ 	if(cpu != 0)
+ 		return(1);
+@@ -381,7 +386,7 @@ int um_in_interrupt(void)
+ 
+ int cpu(void)
+ {
+-	return(current->thread_info->cpu);
++	return(current_thread->cpu);
+ }
+ 
+ /*
+--- linux-2.6.0-test6/arch/um/kernel/ptrace.c	2003-06-14 12:17:58.000000000 -0700
++++ 25/arch/um/kernel/ptrace.c	2003-10-05 00:34:32.000000000 -0700
+@@ -311,11 +311,8 @@ void syscall_trace(void)
+ 
+ 	/* the 0x80 provides a way for the tracing parent to distinguish
+ 	   between a syscall stop and SIGTRAP delivery */
+- 	current->exit_code = SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
+- 					? 0x80 : 0);
+-	current->state = TASK_STOPPED;
+-	notify_parent(current, SIGCHLD);
+-	schedule();
++	ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
++				 ? 0x80 : 0));
+ 
+ 	/*
+ 	 * this isn't the same as continuing with a signal, but it will do
+--- linux-2.6.0-test6/arch/um/kernel/sigio_kern.c	2003-06-14 12:18:04.000000000 -0700
++++ 25/arch/um/kernel/sigio_kern.c	2003-10-05 00:34:32.000000000 -0700
+@@ -6,18 +6,21 @@
+ #include "linux/kernel.h"
+ #include "linux/list.h"
+ #include "linux/slab.h"
+-#include "asm/irq.h"
++#include "linux/signal.h"
++#include "linux/interrupt.h"
+ #include "init.h"
+ #include "sigio.h"
+ #include "irq_user.h"
++#include "irq_kern.h"
+ 
+ /* Protected by sigio_lock() called from write_sigio_workaround */
+ static int sigio_irq_fd = -1;
+ 
+-void sigio_interrupt(int irq, void *data, struct pt_regs *unused)
++irqreturn_t sigio_interrupt(int irq, void *data, struct pt_regs *unused)
+ {
+ 	read_sigio_fd(sigio_irq_fd);
+ 	reactivate_fd(sigio_irq_fd, SIGIO_WRITE_IRQ);
++	return(IRQ_HANDLED);
+ }
+ 
+ int write_sigio_irq(int fd)
+--- linux-2.6.0-test6/arch/um/kernel/signal_kern.c	2003-06-14 12:18:23.000000000 -0700
++++ 25/arch/um/kernel/signal_kern.c	2003-10-05 00:34:32.000000000 -0700
+@@ -36,7 +36,7 @@ static void force_segv(int sig)
+ 	if(sig == SIGSEGV){
+ 		struct k_sigaction *ka;
+ 
+-		ka = &current->sig->action[SIGSEGV - 1];
++		ka = &current->sighand->action[SIGSEGV - 1];
+ 		ka->sa.sa_handler = SIG_DFL;
+ 	}
+ 	force_sig(SIGSEGV, current);
+@@ -142,7 +142,7 @@ static int kern_do_signal(struct pt_regs
+ 		return(0);
+ 
+ 	/* Whee!  Actually deliver the signal.  */
+-	ka = &current->sig->action[sig -1 ];
++	ka = &current->sighand->action[sig -1 ];
+ 	err = handle_signal(regs, sig, ka, &info, oldset, error);
+ 	if(!err) return(1);
+ 
+@@ -201,7 +201,7 @@ int sys_sigsuspend(int history0, int his
+ 	}
+ }
+ 
+-int sys_rt_sigsuspend(sigset_t *unewset, size_t sigsetsize)
++int sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize)
+ {
+ 	sigset_t saveset, newset;
+ 
+@@ -227,6 +227,42 @@ int sys_rt_sigsuspend(sigset_t *unewset,
+ 	}
+ }
+ 
++int sys_sigaction(int sig, const struct old_sigaction __user *act,
++			 struct old_sigaction __user *oact)
++{
++	struct k_sigaction new_ka, old_ka;
++	int ret;
++
++	if (act) {
++		old_sigset_t mask;
++		if (verify_area(VERIFY_READ, act, sizeof(*act)) ||
++		    __get_user(new_ka.sa.sa_handler, &act->sa_handler) ||
++		    __get_user(new_ka.sa.sa_restorer, &act->sa_restorer))
++			return -EFAULT;
++		__get_user(new_ka.sa.sa_flags, &act->sa_flags);
++		__get_user(mask, &act->sa_mask);
++		siginitset(&new_ka.sa.sa_mask, mask);
++	}
++
++	ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
++
++	if (!ret && oact) {
++		if (verify_area(VERIFY_WRITE, oact, sizeof(*oact)) ||
++		    __put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||
++		    __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer))
++			return -EFAULT;
++		__put_user(old_ka.sa.sa_flags, &oact->sa_flags);
++		__put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask);
++	}
++
++	return ret;
++}
++
++int sys_sigaltstack(const stack_t *uss, stack_t *uoss)
++{
++	return(do_sigaltstack(uss, uoss, PT_REGS_SP(&current->thread.regs)));
++}
++
+ static int copy_sc_from_user(struct pt_regs *to, void *from, 
+ 			     struct arch_frame_data *arch)
+ {
+@@ -239,8 +275,8 @@ static int copy_sc_from_user(struct pt_r
+ 
+ int sys_sigreturn(struct pt_regs regs)
+ {
+-	void *sc = sp_to_sc(PT_REGS_SP(&current->thread.regs));
+-	void *mask = sp_to_mask(PT_REGS_SP(&current->thread.regs));
++	void __user *sc = sp_to_sc(PT_REGS_SP(&current->thread.regs));
++	void __user *mask = sp_to_mask(PT_REGS_SP(&current->thread.regs));
+ 	int sig_size = (_NSIG_WORDS - 1) * sizeof(unsigned long);
+ 
+ 	spin_lock_irq(&current->sighand->siglock);
+@@ -257,7 +293,8 @@ int sys_sigreturn(struct pt_regs regs)
+ 
+ int sys_rt_sigreturn(struct pt_regs regs)
+ {
+-	struct ucontext *uc = sp_to_uc(PT_REGS_SP(&current->thread.regs));
++	unsigned long sp = PT_REGS_SP(&current->thread.regs);
++	struct ucontext __user *uc = sp_to_uc(sp);
+ 	void *fp;
+ 	int sig_size = _NSIG_WORDS * sizeof(unsigned long);
+ 
+--- linux-2.6.0-test6/arch/um/kernel/skas/include/mode.h	2003-06-14 12:18:22.000000000 -0700
++++ 25/arch/um/kernel/skas/include/mode.h	2003-10-05 00:34:32.000000000 -0700
+@@ -20,6 +20,7 @@ extern void sig_handler_common_skas(int 
+ extern void halt_skas(void);
+ extern void reboot_skas(void);
+ extern void kill_off_processes_skas(void);
++extern int is_skas_winch(int pid, int fd, void *data);
+ 
+ #endif
+ 
+--- linux-2.6.0-test6/arch/um/kernel/skas/include/uaccess.h	2003-06-14 12:18:08.000000000 -0700
++++ 25/arch/um/kernel/skas/include/uaccess.h	2003-10-05 00:34:32.000000000 -0700
+@@ -19,7 +19,7 @@
+ #define access_ok_skas(type, addr, size) \
+ 	((segment_eq(get_fs(), KERNEL_DS)) || \
+ 	 (((unsigned long) (addr) < TASK_SIZE) && \
+-	  ((unsigned long) (addr) + (size) < TASK_SIZE)))
++	  ((unsigned long) (addr) + (size) <= TASK_SIZE)))
+ 
+ static inline int verify_area_skas(int type, const void * addr, 
+ 				   unsigned long size)
+--- linux-2.6.0-test6/arch/um/kernel/skas/Makefile	2003-06-14 12:18:06.000000000 -0700
++++ 25/arch/um/kernel/skas/Makefile	2003-10-05 00:34:32.000000000 -0700
+@@ -7,18 +7,22 @@ obj-y = exec_kern.o exec_user.o mem.o me
+ 	process_kern.o syscall_kern.o syscall_user.o time.o tlb.o trap_user.o \
+ 	sys-$(SUBARCH)/
+ 
++host-progs	:= util/mk_ptregs
++clean-files	:= include/skas_ptregs.h
++
+ USER_OBJS = $(filter %_user.o,$(obj-y)) process.o time.o
+ USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
+ 
+-include/skas_ptregs.h : util/mk_ptregs
+-	util/mk_ptregs > $@
+-
+-util/mk_ptregs :
+-	$(MAKE) -C util
++$(TOPDIR)/arch/um/include/skas_ptregs.h : $(src)/util/mk_ptregs
++	@echo -n '  Generating $@'
++	@$< > $@.tmp
++	@if [ -r $@ ] && cmp -s $@ $@.tmp; then \
++		echo ' (unchanged)'; \
++		rm -f $@.tmp; \
++	else \
++		echo ' (updated)'; \
++		mv -f $@.tmp $@; \
++	fi
+ 
+ $(USER_OBJS) : %.o: %.c
+ 	$(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
+-
+-clean :
+-	$(MAKE) -C util clean
+-	$(RM) -f include/skas_ptregs.h
+--- linux-2.6.0-test6/arch/um/kernel/skas/process.c	2003-06-14 12:18:34.000000000 -0700
++++ 25/arch/um/kernel/skas/process.c	2003-10-05 00:34:32.000000000 -0700
+@@ -4,6 +4,7 @@
+  */
+ 
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <errno.h>
+ #include <signal.h>
+ #include <setjmp.h>
+@@ -24,6 +25,16 @@
+ #include "os.h"
+ #include "proc_mm.h"
+ #include "skas_ptrace.h"
++#include "chan_user.h"
++
++int is_skas_winch(int pid, int fd, void *data)
++{
++	if(pid != getpid())
++		return(0);
++
++	register_winch_irq(-1, fd, -1, data);
++	return(1);
++}
+ 
+ unsigned long exec_regs[FRAME_SIZE];
+ unsigned long exec_fp_regs[HOST_FP_SIZE];
+@@ -48,11 +59,11 @@ static void handle_trap(int pid, union u
+ 	int err, syscall_nr, status;
+ 
+ 	syscall_nr = PT_SYSCALL_NR(regs->skas.regs);
++	UPT_SYSCALL_NR(regs) = syscall_nr;
+ 	if(syscall_nr < 1){
+ 		relay_signal(SIGTRAP, regs);
+ 		return;
+ 	}
+-	UPT_SYSCALL_NR(regs) = syscall_nr;
+ 
+ 	err = ptrace(PTRACE_POKEUSER, pid, PT_SYSCALL_NR_OFFSET, __NR_getpid);
+ 	if(err < 0)
+@@ -72,8 +83,6 @@ static void handle_trap(int pid, union u
+ 	handle_syscall(regs);
+ }
+ 
+-int userspace_pid;
+-
+ static int userspace_tramp(void *arg)
+ {
+ 	init_new_thread_signals(0);
+@@ -83,6 +92,8 @@ static int userspace_tramp(void *arg)
+ 	return(0);
+ }
+ 
++int userspace_pid;
++
+ void start_userspace(void)
+ {
+ 	void *stack;
+@@ -149,6 +160,7 @@ void userspace(union uml_pt_regs *regs)
+ 			case SIGILL:
+ 			case SIGBUS:
+ 			case SIGFPE:
++			case SIGWINCH:
+ 				user_signal(WSTOPSIG(status), regs);
+ 				break;
+ 			default:
+@@ -328,7 +340,8 @@ void reboot_skas(void)
+ int new_mm(int from)
+ {
+ 	struct proc_mm_op copy;
+-	int n, fd = os_open_file("/proc/mm", of_write(OPENFLAGS()), 0);
++	int n, fd = os_open_file("/proc/mm", 
++				 of_cloexec(of_write(OPENFLAGS())), 0);
+ 
+ 	if(fd < 0)
+ 		return(-errno);
+@@ -342,6 +355,7 @@ int new_mm(int from)
+ 			printk("new_mm : /proc/mm copy_segments failed, "
+ 			       "errno = %d\n", errno);
+ 	}
++
+ 	return(fd);
+ }
+ 
+--- linux-2.6.0-test6/arch/um/kernel/skas/process_kern.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/arch/um/kernel/skas/process_kern.c	2003-10-05 00:34:32.000000000 -0700
+@@ -61,9 +61,8 @@ void new_thread_handler(int sig)
+ 	thread_wait(&current->thread.mode.skas.switch_buf, 
+ 		    current->thread.mode.skas.fork_buf);
+ 
+-#ifdef CONFIG_SMP
+-	schedule_tail(NULL);
+-#endif
++	if(current->thread.prev_sched != NULL)
++		schedule_tail(current->thread.prev_sched);
+ 	current->thread.prev_sched = NULL;
+ 
+ 	n = run_kernel_thread(fn, arg, &current->thread.exec_buf);
+@@ -93,9 +92,8 @@ void fork_handler(int sig)
+ 		    current->thread.mode.skas.fork_buf);
+   	
+ 	force_flush_all();
+-#ifdef CONFIG_SMP
+-	schedule_tail(current->thread.prev_sched);
+-#endif
++	if(current->thread.prev_sched != NULL)
++		schedule_tail(current->thread.prev_sched);
+ 	current->thread.prev_sched = NULL;
+ 	unblock_signals();
+ 
+@@ -136,7 +134,7 @@ int copy_thread_skas(int nr, unsigned lo
+ 
+ void init_idle_skas(void)
+ {
+-	cpu_tasks[current->thread_info->cpu].pid = os_getpid();
++	cpu_tasks[current_thread->cpu].pid = os_getpid();
+ 	default_idle();
+ }
+ 
+@@ -164,7 +162,7 @@ int start_uml_skas(void)
+ 	capture_signal_stack();
+ 
+ 	init_new_thread_signals(1);
+-	idle_timer();
++	uml_idle_timer();
+ 
+ 	init_task.thread.request.u.thread.proc = start_kernel_proc;
+ 	init_task.thread.request.u.thread.arg = NULL;
+--- linux-2.6.0-test6/arch/um/kernel/skas/util/mk_ptregs.c	2003-06-14 12:18:08.000000000 -0700
++++ 25/arch/um/kernel/skas/util/mk_ptregs.c	2003-10-05 00:34:32.000000000 -0700
+@@ -1,3 +1,4 @@
++#include <stdio.h>
+ #include <asm/ptrace.h>
+ #include <asm/user.h>
+ 
+--- linux-2.6.0-test6/arch/um/kernel/smp.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/arch/um/kernel/smp.c	2003-10-05 00:34:32.000000000 -0700
+@@ -22,7 +22,7 @@
+ #include "os.h"
+ 
+ /* CPU online map, set by smp_boot_cpus */
+-unsigned long cpu_online_map = cpumask_of_cpu(0);
++unsigned long cpu_online_map = CPU_MASK_NONE;
+ 
+ /* Per CPU bogomips and other parameters
+  * The only piece used here is the ipi pipe, which is set before SMP is
+@@ -97,15 +97,15 @@ void smp_send_stop(void)
+ 
+ 	printk(KERN_INFO "Stopping all CPUs...");
+ 	for(i = 0; i < num_online_cpus(); i++){
+-		if(i == current->thread_info->cpu)
++		if(i == current_thread->cpu)
+ 			continue;
+ 		write(cpu_data[i].ipi_pipe[1], "S", 1);
+ 	}
+ 	printk("done\n");
+ }
+ 
+-static cpumask_t smp_commenced_mask;
+-static cpumask_t smp_callin_map = CPU_MASK_NONE;
++static cpumask_t smp_commenced_mask = CPU_MASK_NONE;
++static cpumask_t cpu_callin_map = CPU_MASK_NONE;
+ 
+ static int idle_proc(void *cpup)
+ {
+@@ -120,12 +120,12 @@ static int idle_proc(void *cpup)
+ 		     current->thread.mode.tt.extern_pid);
+  
+ 	wmb();
+-	if (cpu_test_and_set(cpu, &smp_callin_map)) {
++	if (cpu_test_and_set(cpu, cpu_callin_map)) {
+ 		printk("huh, CPU#%d already present??\n", cpu);
+ 		BUG();
+ 	}
+ 
+-	while (!cpu_isset(cpu, &smp_commenced_mask))
++	while (!cpu_isset(cpu, smp_commenced_mask))
+ 		cpu_relax();
+ 
+ 	cpu_set(cpu, cpu_online_map);
+@@ -140,8 +140,11 @@ static struct task_struct *idle_thread(i
+ 
+         current->thread.request.u.thread.proc = idle_proc;
+         current->thread.request.u.thread.arg = (void *) cpu;
+-	new_task = do_fork(CLONE_VM | CLONE_IDLETASK, 0, NULL, 0, NULL, NULL);
+-	if(IS_ERR(new_task)) panic("do_fork failed in idle_thread");
++	new_task = copy_process(CLONE_VM | CLONE_IDLETASK, 0, NULL, 0, NULL, 
++				NULL);
++	if(IS_ERR(new_task)) 
++		panic("copy_process failed in idle_thread, error = %ld",
++		      PTR_ERR(new_task));
+ 
+ 	cpu_tasks[cpu] = ((struct cpu_task) 
+ 		          { .pid = 	new_task->thread.mode.tt.extern_pid,
+@@ -150,6 +153,7 @@ static struct task_struct *idle_thread(i
+ 	CHOOSE_MODE(write(new_task->thread.mode.tt.switch_pipe[1], &c, 
+ 			  sizeof(c)),
+ 		    ({ panic("skas mode doesn't support SMP"); }));
++	wake_up_forked_process(new_task);
+ 	return(new_task);
+ }
+ 
+@@ -157,15 +161,16 @@ void smp_prepare_cpus(unsigned int maxcp
+ {
+ 	struct task_struct *idle;
+ 	unsigned long waittime;
+-	int err, cpu;
++	int err, cpu, me = smp_processor_id();
+ 
+-	cpu_set(0, cpu_online_map);
+-	cpu_set(0, smp_callin_map);
++	cpu_clear(me, cpu_online_map);
++	cpu_set(me, cpu_online_map);
++	cpu_set(me, cpu_callin_map);
+ 
+-	err = os_pipe(cpu_data[0].ipi_pipe, 1, 1);
++	err = os_pipe(cpu_data[me].ipi_pipe, 1, 1);
+ 	if(err)	panic("CPU#0 failed to create IPI pipe, errno = %d", -err);
+ 
+-	activate_ipi(cpu_data[0].ipi_pipe[0], 
++	activate_ipi(cpu_data[me].ipi_pipe[0], 
+ 		     current->thread.mode.tt.extern_pid);
+ 
+ 	for(cpu = 1; cpu < ncpus; cpu++){
+@@ -177,10 +182,10 @@ void smp_prepare_cpus(unsigned int maxcp
+ 		unhash_process(idle);
+ 
+ 		waittime = 200000000;
+-		while (waittime-- && !cpu_isset(cpu, smp_callin_map))
++		while (waittime-- && !cpu_isset(cpu, cpu_callin_map))
+ 			cpu_relax();
+ 
+-		if (cpu_isset(cpu, smp_callin_map))
++		if (cpu_isset(cpu, cpu_callin_map))
+ 			printk("done\n");
+ 		else printk("failed\n");
+ 	}
+@@ -270,7 +275,7 @@ int smp_call_function(void (*_func)(void
+ 	info = _info;
+ 
+ 	for (i=0;i<NR_CPUS;i++)
+-		if((i != current->thread_info->cpu) && 
++		if((i != current_thread->cpu) && 
+ 		   cpu_isset(i, cpu_online_map))
+ 			write(cpu_data[i].ipi_pipe[1], "C", 1);
+ 
+--- linux-2.6.0-test6/arch/um/kernel/syscall_kern.c	2003-06-14 12:18:28.000000000 -0700
++++ 25/arch/um/kernel/syscall_kern.c	2003-10-05 00:34:32.000000000 -0700
+@@ -35,39 +35,40 @@ long um_mount(char * dev_name, char * di
+ 
+ long sys_fork(void)
+ {
+-	struct task_struct *p;
++	long ret;
+ 
+ 	current->thread.forking = 1;
+-        p = do_fork(SIGCHLD, 0, NULL, 0, NULL, NULL);
++        ret = do_fork(SIGCHLD, 0, NULL, 0, NULL, NULL);
+ 	current->thread.forking = 0;
+-	return(IS_ERR(p) ? PTR_ERR(p) : p->pid);
++	return(ret);
+ }
+ 
+-long sys_clone(unsigned long clone_flags, unsigned long newsp)
++long sys_clone(unsigned long clone_flags, unsigned long newsp, 
++	       int *parent_tid, int *child_tid)
+ {
+-	struct task_struct *p;
++	long ret;
+ 
+ 	current->thread.forking = 1;
+-	p = do_fork(clone_flags, newsp, NULL, 0, NULL, NULL);
++	ret = do_fork(clone_flags, newsp, NULL, 0, parent_tid, child_tid);
+ 	current->thread.forking = 0;
+-	return(IS_ERR(p) ? PTR_ERR(p) : p->pid);
++	return(ret);
+ }
+ 
+ long sys_vfork(void)
+ {
+-	struct task_struct *p;
++	long ret;
+ 
+ 	current->thread.forking = 1;
+-	p = do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, 0, NULL, 0, NULL, NULL);
++	ret = do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, 0, NULL, 0, NULL, 
++		      NULL);
+ 	current->thread.forking = 0;
+-	return(IS_ERR(p) ? PTR_ERR(p) : p->pid);
++	return(ret);
+ }
+ 
+ /* common code for old and new mmaps */
+-static inline long do_mmap2(
+-	unsigned long addr, unsigned long len,
+-	unsigned long prot, unsigned long flags,
+-	unsigned long fd, unsigned long pgoff)
++long do_mmap2(struct mm_struct *mm, unsigned long addr, unsigned long len,
++	      unsigned long prot, unsigned long flags, unsigned long fd,
++	      unsigned long pgoff)
+ {
+ 	int error = -EBADF;
+ 	struct file * file = NULL;
+@@ -93,7 +94,7 @@ long sys_mmap2(unsigned long addr, unsig
+ 	       unsigned long prot, unsigned long flags,
+ 	       unsigned long fd, unsigned long pgoff)
+ {
+-	return do_mmap2(addr, len, prot, flags, fd, pgoff);
++	return do_mmap2(current->mm, addr, len, prot, flags, fd, pgoff);
+ }
+ 
+ /*
+@@ -120,7 +121,8 @@ int old_mmap(unsigned long addr, unsigne
+ 	if (offset & ~PAGE_MASK)
+ 		goto out;
+ 
+-	err = do_mmap2(addr, len, prot, flags, fd, offset >> PAGE_SHIFT);
++	err = do_mmap2(current->mm, addr, len, prot, flags, fd, 
++		       offset >> PAGE_SHIFT);
+  out:
+ 	return err;
+ }
+@@ -141,37 +143,6 @@ int sys_pipe(unsigned long * fildes)
+         return error;
+ }
+ 
+-int sys_sigaction(int sig, const struct old_sigaction *act,
+-			 struct old_sigaction *oact)
+-{
+-	struct k_sigaction new_ka, old_ka;
+-	int ret;
+-
+-	if (act) {
+-		old_sigset_t mask;
+-		if (verify_area(VERIFY_READ, act, sizeof(*act)) ||
+-		    __get_user(new_ka.sa.sa_handler, &act->sa_handler) ||
+-		    __get_user(new_ka.sa.sa_restorer, &act->sa_restorer))
+-			return -EFAULT;
+-		__get_user(new_ka.sa.sa_flags, &act->sa_flags);
+-		__get_user(mask, &act->sa_mask);
+-		siginitset(&new_ka.sa.sa_mask, mask);
+-	}
+-
+-	ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
+-
+-	if (!ret && oact) {
+-		if (verify_area(VERIFY_WRITE, oact, sizeof(*oact)) ||
+-		    __put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||
+-		    __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer))
+-			return -EFAULT;
+-		__put_user(old_ka.sa.sa_flags, &oact->sa_flags);
+-		__put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask);
+-	}
+-
+-	return ret;
+-}
+-
+ /*
+  * sys_ipc() is the de-multiplexer for the SysV IPC calls..
+  *
+@@ -253,7 +224,7 @@ int sys_ipc (uint call, int first, int s
+ 		return sys_shmctl (first, second,
+ 				   (struct shmid_ds *) ptr);
+ 	default:
+-		return -EINVAL;
++		return -ENOSYS;
+ 	}
+ }
+ 
+@@ -302,11 +273,6 @@ int sys_olduname(struct oldold_utsname *
+ 	return error;
+ }
+ 
+-int sys_sigaltstack(const stack_t *uss, stack_t *uoss)
+-{
+-	return(do_sigaltstack(uss, uoss, PT_REGS_SP(&current->thread.regs)));
+-}
+-
+ long execute_syscall(void *r)
+ {
+ 	return(CHOOSE_MODE_PROC(execute_syscall_tt, execute_syscall_skas, r));
+--- linux-2.6.0-test6/arch/um/kernel/sys_call_table.c	2003-06-14 12:18:30.000000000 -0700
++++ 25/arch/um/kernel/sys_call_table.c	2003-10-05 00:34:32.000000000 -0700
+@@ -219,15 +219,30 @@ extern syscall_handler_t sys_getdents64;
+ extern syscall_handler_t sys_gettid;
+ extern syscall_handler_t sys_readahead;
+ extern syscall_handler_t sys_tkill;
++extern syscall_handler_t sys_setxattr;
++extern syscall_handler_t sys_lsetxattr;
++extern syscall_handler_t sys_fsetxattr;
++extern syscall_handler_t sys_getxattr;
++extern syscall_handler_t sys_lgetxattr;
++extern syscall_handler_t sys_fgetxattr;
++extern syscall_handler_t sys_listxattr;
++extern syscall_handler_t sys_llistxattr;
++extern syscall_handler_t sys_flistxattr;
++extern syscall_handler_t sys_removexattr;
++extern syscall_handler_t sys_lremovexattr;
++extern syscall_handler_t sys_fremovexattr;
+ extern syscall_handler_t sys_sendfile64;
+ extern syscall_handler_t sys_futex;
+ extern syscall_handler_t sys_sched_setaffinity;
+ extern syscall_handler_t sys_sched_getaffinity;
++extern syscall_handler_t sys_set_thread_area;
++extern syscall_handler_t sys_get_thread_area;
+ extern syscall_handler_t sys_io_setup;
+ extern syscall_handler_t sys_io_destroy;
+ extern syscall_handler_t sys_io_getevents;
+ extern syscall_handler_t sys_io_submit;
+ extern syscall_handler_t sys_io_cancel;
++extern syscall_handler_t sys_fadvise64;
+ extern syscall_handler_t sys_exit_group;
+ extern syscall_handler_t sys_lookup_dcookie;
+ extern syscall_handler_t sys_epoll_create;
+@@ -235,6 +250,20 @@ extern syscall_handler_t sys_epoll_ctl;
+ extern syscall_handler_t sys_epoll_wait;
+ extern syscall_handler_t sys_remap_file_pages;
+ extern syscall_handler_t sys_set_tid_address;
++extern syscall_handler_t sys_timer_create;
++extern syscall_handler_t sys_timer_settime;
++extern syscall_handler_t sys_timer_gettime;
++extern syscall_handler_t sys_timer_getoverrun;
++extern syscall_handler_t sys_timer_delete;
++extern syscall_handler_t sys_clock_settime;
++extern syscall_handler_t sys_clock_gettime;
++extern syscall_handler_t sys_clock_getres;
++extern syscall_handler_t sys_clock_nanosleep;
++extern syscall_handler_t sys_statfs64;
++extern syscall_handler_t sys_fstatfs64;
++extern syscall_handler_t sys_tgkill;
++extern syscall_handler_t sys_utimes;
++extern syscall_handler_t sys_fadvise64_64;
+ 
+ #ifdef CONFIG_NFSD
+ #define NFSSERVCTL sys_nfsservctl
+@@ -246,7 +275,7 @@ extern syscall_handler_t um_mount;
+ extern syscall_handler_t um_time;
+ extern syscall_handler_t um_stime;
+ 
+-#define LAST_GENERIC_SYSCALL __NR_set_tid_address
++#define LAST_GENERIC_SYSCALL __NR_fadvise64_64
+ 
+ #if LAST_GENERIC_SYSCALL > LAST_ARCH_SYSCALL
+ #define LAST_SYSCALL LAST_GENERIC_SYSCALL
+@@ -455,32 +484,37 @@ syscall_handler_t *sys_call_table[] = {
+ 	[ __NR_stat64 ] = sys_stat64,
+ 	[ __NR_lstat64 ] = sys_lstat64,
+ 	[ __NR_fstat64 ] = sys_fstat64,
+-	[ __NR_fcntl64 ] = sys_fcntl64,
+ 	[ __NR_getdents64 ] = sys_getdents64,
++	[ __NR_fcntl64 ] = sys_fcntl64,
++	[ 223 ] = sys_ni_syscall,
+ 	[ __NR_gettid ] = sys_gettid,
+ 	[ __NR_readahead ] = sys_readahead,
+-	[ __NR_setxattr ] = sys_ni_syscall,
+-	[ __NR_lsetxattr ] = sys_ni_syscall,
+-	[ __NR_fsetxattr ] = sys_ni_syscall,
+-	[ __NR_getxattr ] = sys_ni_syscall,
+-	[ __NR_lgetxattr ] = sys_ni_syscall,
+-	[ __NR_fgetxattr ] = sys_ni_syscall,
+-	[ __NR_listxattr ] = sys_ni_syscall,
+-	[ __NR_llistxattr ] = sys_ni_syscall,
+-	[ __NR_flistxattr ] = sys_ni_syscall,
+-	[ __NR_removexattr ] = sys_ni_syscall,
+-	[ __NR_lremovexattr ] = sys_ni_syscall,
+-	[ __NR_fremovexattr ] = sys_ni_syscall,
++	[ __NR_setxattr ] = sys_setxattr,
++	[ __NR_lsetxattr ] = sys_lsetxattr,
++	[ __NR_fsetxattr ] = sys_fsetxattr,
++	[ __NR_getxattr ] = sys_getxattr,
++	[ __NR_lgetxattr ] = sys_lgetxattr,
++	[ __NR_fgetxattr ] = sys_fgetxattr,
++	[ __NR_listxattr ] = sys_listxattr,
++	[ __NR_llistxattr ] = sys_llistxattr,
++	[ __NR_flistxattr ] = sys_flistxattr,
++	[ __NR_removexattr ] = sys_removexattr,
++	[ __NR_lremovexattr ] = sys_lremovexattr,
++	[ __NR_fremovexattr ] = sys_fremovexattr,
+ 	[ __NR_tkill ] = sys_tkill,
+ 	[ __NR_sendfile64 ] = sys_sendfile64,
+ 	[ __NR_futex ] = sys_futex,
+ 	[ __NR_sched_setaffinity ] = sys_sched_setaffinity,
+ 	[ __NR_sched_getaffinity ] = sys_sched_getaffinity,
++	[ __NR_set_thread_area ] = sys_ni_syscall,
++	[ __NR_get_thread_area ] = sys_ni_syscall,
+ 	[ __NR_io_setup ] = sys_io_setup,
+ 	[ __NR_io_destroy ] = sys_io_destroy,
+ 	[ __NR_io_getevents ] = sys_io_getevents,
+ 	[ __NR_io_submit ] = sys_io_submit,
+ 	[ __NR_io_cancel ] = sys_io_cancel,
++	[ __NR_fadvise64 ] = sys_fadvise64,
++	[ 251 ] = sys_ni_syscall,
+ 	[ __NR_exit_group ] = sys_exit_group,
+ 	[ __NR_lookup_dcookie ] = sys_lookup_dcookie,
+ 	[ __NR_epoll_create ] = sys_epoll_create,
+@@ -488,6 +522,20 @@ syscall_handler_t *sys_call_table[] = {
+ 	[ __NR_epoll_wait ] = sys_epoll_wait,
+         [ __NR_remap_file_pages ] = sys_remap_file_pages,
+         [ __NR_set_tid_address ] = sys_set_tid_address,
++	[ __NR_timer_create ] = sys_timer_create,
++	[ __NR_timer_settime ] = sys_timer_settime,
++	[ __NR_timer_gettime ] = sys_timer_gettime,
++	[ __NR_timer_getoverrun ] = sys_timer_getoverrun,
++	[ __NR_timer_delete ] = sys_timer_delete,
++	[ __NR_clock_settime ] = sys_clock_settime,
++	[ __NR_clock_gettime ] = sys_clock_gettime,
++	[ __NR_clock_getres ] = sys_clock_getres,
++	[ __NR_clock_nanosleep ] = sys_clock_nanosleep,
++	[ __NR_statfs64 ] = sys_statfs64,
++	[ __NR_fstatfs64 ] = sys_fstatfs64,
++	[ __NR_tgkill ] = sys_tgkill,
++	[ __NR_utimes ] = sys_utimes,
++	[ __NR_fadvise64_64 ] = sys_fadvise64_64,
+ 
+ 	ARCH_SYSCALLS
+ 	[ LAST_SYSCALL + 1 ... NR_syscalls ] = 
+--- linux-2.6.0-test6/arch/um/kernel/sysrq.c	2003-06-14 12:18:07.000000000 -0700
++++ 25/arch/um/kernel/sysrq.c	2003-10-05 00:34:32.000000000 -0700
+@@ -53,6 +53,14 @@ void show_trace_task(struct task_struct 
+ 	show_trace((unsigned long *)esp);
+ }
+ 
++void show_stack(struct task_struct *task, unsigned long *sp)
++{
++	if(task)
++		show_trace_task(task);
++	else
++		show_trace(sp);
++}
++
+ /*
+  * Overrides for Emacs so that we follow Linus's tabbing style.
+  * Emacs will notice this stuff at the end of the file and automatically
+--- linux-2.6.0-test6/arch/um/kernel/time.c	2003-06-16 22:32:20.000000000 -0700
++++ 25/arch/um/kernel/time.c	2003-10-05 00:34:32.000000000 -0700
+@@ -15,12 +15,16 @@
+ #include "process.h"
+ #include "signal_user.h"
+ #include "time_user.h"
++#include "kern_constants.h"
+ 
+ extern struct timeval xtime;
+ 
++struct timeval local_offset = { 0, 0 };
++
+ void timer(void)
+ {
+ 	gettimeofday(&xtime, NULL);
++	timeradd(&xtime, &local_offset, &xtime);
+ }
+ 
+ void set_interval(int timer_type)
+@@ -65,7 +69,7 @@ void switch_timers(int to_real)
+ 		       errno);
+ }
+ 
+-void idle_timer(void)
++void uml_idle_timer(void)
+ {
+ 	if(signal(SIGVTALRM, SIG_IGN) == SIG_ERR)
+ 		panic("Couldn't unset SIGVTALRM handler");
+@@ -82,8 +86,6 @@ void time_init(void)
+ 	set_interval(ITIMER_VIRTUAL);
+ }
+ 
+-struct timeval local_offset = { 0, 0 };
+-
+ void do_gettimeofday(struct timeval *tv)
+ {
+ 	unsigned long flags;
+@@ -100,7 +102,7 @@ int do_settimeofday(struct timespec *tv)
+ 	unsigned long flags;
+ 	struct timeval tv_in;
+ 
+-	if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
++	if ((unsigned long) tv->tv_nsec >= UM_NSEC_PER_SEC)
+ 		return -EINVAL;
+ 
+ 	tv_in.tv_sec = tv->tv_sec;
+@@ -110,6 +112,8 @@ int do_settimeofday(struct timespec *tv)
+ 	gettimeofday(&now, NULL);
+ 	timersub(&tv_in, &now, &local_offset);
+ 	time_unlock(flags);
++
++	return(0);
+ }
+ 
+ void idle_sleep(int secs)
+--- linux-2.6.0-test6/arch/um/kernel/time_kern.c	2003-06-14 12:18:24.000000000 -0700
++++ 25/arch/um/kernel/time_kern.c	2003-10-05 00:34:32.000000000 -0700
+@@ -38,7 +38,7 @@ int __attribute__ ((__section__ (".unpro
+ 
+ void timer_irq(union uml_pt_regs *regs)
+ {
+-	int cpu = current->thread_info->cpu, ticks = missed_ticks[cpu];
++	int cpu = current_thread->cpu, ticks = missed_ticks[cpu];
+ 
+         if(!timer_irq_inited) return;
+ 	missed_ticks[cpu] = 0;
+@@ -55,12 +55,13 @@ void boot_timer_handler(int sig)
+ 	do_timer(&regs);
+ }
+ 
+-void um_timer(int irq, void *dev, struct pt_regs *regs)
++irqreturn_t um_timer(int irq, void *dev, struct pt_regs *regs)
+ {
+ 	do_timer(regs);
+-	write_seqlock(&xtime_lock);
++	write_seqlock_irq(&xtime_lock);
+ 	timer();
+-	write_sequnlock(&xtime_lock);
++	write_sequnlock_irq(&xtime_lock);
++	return(IRQ_HANDLED);
+ }
+ 
+ long um_time(int * tloc)
+@@ -78,12 +79,12 @@ long um_time(int * tloc)
+ long um_stime(int * tptr)
+ {
+ 	int value;
+-	struct timeval new;
++	struct timespec new;
+ 
+ 	if (get_user(value, tptr))
+                 return -EFAULT;
+ 	new.tv_sec = value;
+-	new.tv_usec = 0;
++	new.tv_nsec = 0;
+ 	do_settimeofday(&new);
+ 	return 0;
+ }
+@@ -122,9 +123,11 @@ void __const_udelay(um_udelay_t usecs)
+ void timer_handler(int sig, union uml_pt_regs *regs)
+ {
+ #ifdef CONFIG_SMP
++	local_irq_disable();
+ 	update_process_times(user_context(UPT_SP(regs)));
++	local_irq_enable();
+ #endif
+-	if(current->thread_info->cpu == 0)
++	if(current_thread->cpu == 0)
+ 		timer_irq(regs);
+ }
+ 
+--- linux-2.6.0-test6/arch/um/kernel/trap_kern.c	2003-06-14 12:17:57.000000000 -0700
++++ 25/arch/um/kernel/trap_kern.c	2003-10-05 00:34:32.000000000 -0700
+@@ -16,6 +16,7 @@
+ #include "asm/tlbflush.h"
+ #include "asm/a.out.h"
+ #include "asm/current.h"
++#include "asm/irq.h"
+ #include "user_util.h"
+ #include "kern_util.h"
+ #include "kern.h"
+@@ -51,7 +52,7 @@ int handle_page_fault(unsigned long addr
+ 	if(is_write && !(vma->vm_flags & VM_WRITE)) 
+ 		goto out;
+ 	page = address & PAGE_MASK;
+-	if(page == (unsigned long) current->thread_info + PAGE_SIZE)
++	if(page == (unsigned long) current_thread + PAGE_SIZE)
+ 		panic("Kernel stack overflow");
+ 	pgd = pgd_offset(mm, page);
+ 	pmd = pmd_offset(pgd, page);
+@@ -180,6 +181,11 @@ void bus_handler(int sig, union uml_pt_r
+ 	else relay_signal(sig, regs);
+ }
+ 
++void winch(int sig, union uml_pt_regs *regs)
++{
++	do_IRQ(WINCH_IRQ, regs);
++}
++
+ void trap_init(void)
+ {
+ }
+--- linux-2.6.0-test6/arch/um/kernel/trap_user.c	2003-06-14 12:18:09.000000000 -0700
++++ 25/arch/um/kernel/trap_user.c	2003-10-05 00:34:32.000000000 -0700
+@@ -82,6 +82,8 @@ struct signal_info sig_info[] = {
+ 		     .is_irq 		= 0 },
+ 	[ SIGILL ] { .handler 		= relay_signal,
+ 		     .is_irq 		= 0 },
++	[ SIGWINCH ] { .handler		= winch,
++		       .is_irq		= 1 },
+ 	[ SIGBUS ] { .handler 		= bus_handler,
+ 		     .is_irq 		= 0 },
+ 	[ SIGSEGV] { .handler 		= segv_handler,
+--- linux-2.6.0-test6/arch/um/kernel/tt/exec_kern.c	2003-06-14 12:17:59.000000000 -0700
++++ 25/arch/um/kernel/tt/exec_kern.c	2003-10-05 00:34:32.000000000 -0700
+@@ -47,17 +47,17 @@ void flush_thread_tt(void)
+ 		do_exit(SIGKILL);
+ 	}
+ 
+-	if(current->thread_info->cpu == 0)
++	if(current_thread->cpu == 0)
+ 		forward_interrupts(new_pid);
+ 	current->thread.request.op = OP_EXEC;
+ 	current->thread.request.u.exec.pid = new_pid;
+-	unprotect_stack((unsigned long) current->thread_info);
++	unprotect_stack((unsigned long) current_thread);
+ 	os_usr1_process(os_getpid());
+ 
+ 	enable_timer();
+ 	free_page(stack);
+ 	protect_memory(uml_reserved, high_physmem - uml_reserved, 1, 1, 0, 1);
+-	task_protections((unsigned long) current->thread_info);
++	task_protections((unsigned long) current_thread);
+ 	force_flush_all();
+ 	unblock_signals();
+ }
+--- linux-2.6.0-test6/arch/um/kernel/tt/include/uaccess.h	2003-06-14 12:18:24.000000000 -0700
++++ 25/arch/um/kernel/tt/include/uaccess.h	2003-10-05 00:34:32.000000000 -0700
+@@ -46,18 +46,20 @@ extern int __do_copy_from_user(void *to,
+ 
+ static inline int copy_from_user_tt(void *to, const void *from, int n)
+ {
+-	return(access_ok_tt(VERIFY_READ, from, n) ?
+-	       __do_copy_from_user(to, from, n, 
+-				   &current->thread.fault_addr,
+-				   &current->thread.fault_catcher) : n);
++	if(!access_ok_tt(VERIFY_READ, from, n)) 
++		return(n);
++
++	return(__do_copy_from_user(to, from, n, &current->thread.fault_addr,
++				   &current->thread.fault_catcher));
+ }
+ 
+ static inline int copy_to_user_tt(void *to, const void *from, int n)
+ {
+-	return(access_ok_tt(VERIFY_WRITE, to, n) ?
+-	       __do_copy_to_user(to, from, n, 
+-				   &current->thread.fault_addr,
+-				   &current->thread.fault_catcher) : n);
++	if(!access_ok_tt(VERIFY_WRITE, to, n))
++		return(n);
++		
++	return(__do_copy_to_user(to, from, n, &current->thread.fault_addr,
++				 &current->thread.fault_catcher));
+ }
+ 
+ extern int __do_strncpy_from_user(char *dst, const char *src, size_t n,
+@@ -67,7 +69,9 @@ static inline int strncpy_from_user_tt(c
+ {
+ 	int n;
+ 
+-	if(!access_ok_tt(VERIFY_READ, src, 1)) return(-EFAULT);
++	if(!access_ok_tt(VERIFY_READ, src, 1)) 
++		return(-EFAULT);
++
+ 	n = __do_strncpy_from_user(dst, src, count, 
+ 				   &current->thread.fault_addr,
+ 				   &current->thread.fault_catcher);
+@@ -87,10 +91,11 @@ static inline int __clear_user_tt(void *
+ 
+ static inline int clear_user_tt(void *mem, int len)
+ {
+-	return(access_ok_tt(VERIFY_WRITE, mem, len) ? 
+-	       __do_clear_user(mem, len, 
+-			       &current->thread.fault_addr,
+-			       &current->thread.fault_catcher) : len);
++	if(!access_ok_tt(VERIFY_WRITE, mem, len))
++		return(len);
++
++	return(__do_clear_user(mem, len, &current->thread.fault_addr,
++			       &current->thread.fault_catcher));
+ }
+ 
+ extern int __do_strnlen_user(const char *str, unsigned long n,
+--- linux-2.6.0-test6/arch/um/kernel/tt/process_kern.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/arch/um/kernel/tt/process_kern.c	2003-10-05 00:34:32.000000000 -0700
+@@ -104,7 +104,10 @@ void *switch_to_tt(void *prev, void *nex
+ 
+ void release_thread_tt(struct task_struct *task)
+ {
+-	os_kill_process(task->thread.mode.tt.extern_pid, 0);
++	int pid = task->thread.mode.tt.extern_pid;
++
++	if(os_getpid() != pid)
++		os_kill_process(pid, 0);
+ }
+ 
+ void exit_thread_tt(void)
+@@ -125,27 +128,27 @@ static void new_thread_handler(int sig)
+ 	UPT_SC(&current->thread.regs.regs) = (void *) (&sig + 1);
+ 	suspend_new_thread(current->thread.mode.tt.switch_pipe[0]);
+ 
+-	block_signals();
++	force_flush_all();
++	if(current->thread.prev_sched != NULL)
++		schedule_tail(current->thread.prev_sched);
++	current->thread.prev_sched = NULL;
++
+ 	init_new_thread_signals(1);
+-#ifdef CONFIG_SMP
+-	schedule_tail(current->thread.prev_sched);
+-#endif
+ 	enable_timer();
+ 	free_page(current->thread.temp_stack);
+ 	set_cmdline("(kernel thread)");
+-	force_flush_all();
+ 
+-	current->thread.prev_sched = NULL;
+ 	change_sig(SIGUSR1, 1);
+ 	change_sig(SIGVTALRM, 1);
+ 	change_sig(SIGPROF, 1);
+-	unblock_signals();
++	local_irq_enable();
+ 	if(!run_kernel_thread(fn, arg, &current->thread.exec_buf))
+ 		do_exit(0);
+ }
+ 
+ static int new_thread_proc(void *stack)
+ {
++	local_irq_disable();
+ 	init_new_thread_stack(stack, new_thread_handler);
+ 	os_usr1_process(os_getpid());
+ 	return(0);
+@@ -165,35 +168,32 @@ void finish_fork_handler(int sig)
+  	UPT_SC(&current->thread.regs.regs) = (void *) (&sig + 1);
+ 	suspend_new_thread(current->thread.mode.tt.switch_pipe[0]);
+ 
+-#ifdef CONFIG_SMP	
+-	schedule_tail(NULL);
+-#endif
++	force_flush_all();
++	if(current->thread.prev_sched != NULL)
++		schedule_tail(current->thread.prev_sched);
++	current->thread.prev_sched = NULL;
++
+ 	enable_timer();
+ 	change_sig(SIGVTALRM, 1);
+ 	local_irq_enable();
+-	force_flush_all();
+ 	if(current->mm != current->parent->mm)
+ 		protect_memory(uml_reserved, high_physmem - uml_reserved, 1, 
+ 			       1, 0, 1);
+-	task_protections((unsigned long) current->thread_info);
+-
+-	current->thread.prev_sched = NULL;
++	task_protections((unsigned long) current_thread);
+ 
+ 	free_page(current->thread.temp_stack);
++	local_irq_disable();
+ 	change_sig(SIGUSR1, 0);
+ 	set_user_mode(current);
+ }
+ 
+-static int sigusr1 = SIGUSR1;
+-
+ int fork_tramp(void *stack)
+ {
+-	int sig = sigusr1;
+-
+ 	local_irq_disable();
++	arch_init_thread();
+ 	init_new_thread_stack(stack, finish_fork_handler);
+ 
+-	kill(os_getpid(), sig);
++	os_usr1_process(os_getpid());
+ 	return(0);
+ }
+ 
+@@ -377,8 +377,8 @@ static void mprotect_kernel_mem(int w)
+ 
+ 	pages = (1 << CONFIG_KERNEL_STACK_ORDER);
+ 
+-	start = (unsigned long) current->thread_info + PAGE_SIZE;
+-	end = (unsigned long) current + PAGE_SIZE * pages;
++	start = (unsigned long) current_thread + PAGE_SIZE;
++	end = (unsigned long) current_thread + PAGE_SIZE * pages;
+ 	protect_memory(uml_reserved, start - uml_reserved, 1, w, 1, 1);
+ 	protect_memory(end, high_physmem - end, 1, w, 1, 1);
+ 
+--- linux-2.6.0-test6/arch/um/kernel/tt/ptproxy/proxy.c	2003-06-14 12:18:23.000000000 -0700
++++ 25/arch/um/kernel/tt/ptproxy/proxy.c	2003-10-05 00:34:32.000000000 -0700
+@@ -293,10 +293,10 @@ void fake_child_exit(void)
+ }
+ 
+ char gdb_init_string[] = 
+-"att 1
+-b panic
+-b stop
+-handle SIGWINCH nostop noprint pass
++"att 1 \n\
++b panic \n\
++b stop \n\
++handle SIGWINCH nostop noprint pass \n\
+ ";
+ 
+ int start_debugger(char *prog, int startup, int stop, int *fd_out)
+--- linux-2.6.0-test6/arch/um/kernel/tt/tracer.c	2003-06-14 12:17:56.000000000 -0700
++++ 25/arch/um/kernel/tt/tracer.c	2003-10-05 00:34:32.000000000 -0700
+@@ -39,7 +39,7 @@ int is_tracer_winch(int pid, int fd, voi
+ 		return(0);
+ 
+ 	register_winch_irq(tracer_winch[0], fd, -1, data);
+-	return(0);
++	return(1);
+ }
+ 
+ static void tracer_winch_handler(int sig)
+@@ -401,7 +401,7 @@ static int __init uml_debug_setup(char *
+ 		
+ 		if(!strcmp(line, "go"))	debug_stop = 0;
+ 		else if(!strcmp(line, "parent")) debug_parent = 1;
+-		else printk("Unknown debug option : '%s'\n", line);
++		else printf("Unknown debug option : '%s'\n", line);
+ 
+ 		line = next;
+ 	}
+--- linux-2.6.0-test6/arch/um/kernel/tt/uaccess_user.c	2003-06-14 12:18:06.000000000 -0700
++++ 25/arch/um/kernel/tt/uaccess_user.c	2003-10-05 00:34:32.000000000 -0700
+@@ -8,15 +8,20 @@
+ #include <string.h>
+ #include "user_util.h"
+ #include "uml_uaccess.h"
++#include "task.h"
++#include "kern_util.h"
+ 
+ int __do_copy_from_user(void *to, const void *from, int n,
+ 			void **fault_addr, void **fault_catcher)
+ {
++	struct tt_regs save = TASK_REGS(get_current())->tt;
+ 	unsigned long fault;
+ 	int faulted;
+ 
+ 	fault = __do_user_copy(to, from, n, fault_addr, fault_catcher,
+ 			       __do_copy, &faulted);
++	TASK_REGS(get_current())->tt = save;
++
+ 	if(!faulted) return(0);
+ 	else return(n - (fault - (unsigned long) from));
+ }
+@@ -29,11 +34,14 @@ static void __do_strncpy(void *dst, cons
+ int __do_strncpy_from_user(char *dst, const char *src, unsigned long count,
+ 			   void **fault_addr, void **fault_catcher)
+ {
++	struct tt_regs save = TASK_REGS(get_current())->tt;
+ 	unsigned long fault;
+ 	int faulted;
+ 
+ 	fault = __do_user_copy(dst, src, count, fault_addr, fault_catcher,
+ 			       __do_strncpy, &faulted);
++	TASK_REGS(get_current())->tt = save;
++
+ 	if(!faulted) return(strlen(dst));
+ 	else return(-1);
+ }
+@@ -46,11 +54,14 @@ static void __do_clear(void *to, const v
+ int __do_clear_user(void *mem, unsigned long len,
+ 		    void **fault_addr, void **fault_catcher)
+ {
++	struct tt_regs save = TASK_REGS(get_current())->tt;
+ 	unsigned long fault;
+ 	int faulted;
+ 
+ 	fault = __do_user_copy(mem, NULL, len, fault_addr, fault_catcher,
+ 			       __do_clear, &faulted);
++	TASK_REGS(get_current())->tt = save;
++
+ 	if(!faulted) return(0);
+ 	else return(len - (fault - (unsigned long) mem));
+ }
+@@ -58,6 +69,7 @@ int __do_clear_user(void *mem, unsigned 
+ int __do_strnlen_user(const char *str, unsigned long n,
+ 		      void **fault_addr, void **fault_catcher)
+ {
++	struct tt_regs save = TASK_REGS(get_current())->tt;
+ 	int ret;
+ 	unsigned long *faddrp = (unsigned long *)fault_addr;
+ 	jmp_buf jbuf;
+@@ -71,6 +83,8 @@ int __do_strnlen_user(const char *str, u
+ 	}
+ 	*fault_addr = NULL;
+ 	*fault_catcher = NULL;
++
++	TASK_REGS(get_current())->tt = save;
+ 	return ret;
+ }
+ 
+--- linux-2.6.0-test6/arch/um/kernel/um_arch.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/arch/um/kernel/um_arch.c	2003-10-05 00:34:32.000000000 -0700
+@@ -38,13 +38,18 @@
+ #include "mode_kern.h"
+ #include "mode.h"
+ 
+-#define DEFAULT_COMMAND_LINE "root=6200"
++#define DEFAULT_COMMAND_LINE "root=ubd0"
+ 
+ struct cpuinfo_um boot_cpu_data = { 
+ 	.loops_per_jiffy	= 0,
+ 	.ipi_pipe		= { -1, -1 }
+ };
+ 
++/* Placeholder to make UML link until the vsyscall stuff is actually 
++ * implemented
++ */
++void *__kernel_vsyscall;
++
+ unsigned long thread_saved_pc(struct task_struct *task)
+ {
+ 	return(os_process_pc(CHOOSE_MODE_PROC(thread_pid_tt, thread_pid_skas,
+@@ -61,10 +66,14 @@ static int show_cpuinfo(struct seq_file 
+ 		return 0;
+ #endif
+ 
+-	seq_printf(m, "bogomips\t: %lu.%02lu\n",
++	seq_printf(m, "processor\t: %d\n", index);
++	seq_printf(m, "vendor_id\t: User Mode Linux\n");
++	seq_printf(m, "model name\t: UML\n");
++	seq_printf(m, "mode\t\t: %s\n", CHOOSE_MODE("tt", "skas"));
++	seq_printf(m, "host\t\t: %s\n", host_info);
++	seq_printf(m, "bogomips\t: %lu.%02lu\n\n",
+ 		   loops_per_jiffy/(500000/HZ),
+ 		   (loops_per_jiffy/(5000/HZ)) % 100);
+-	seq_printf(m, "host\t\t: %s\n", host_info);
+ 
+ 	return(0);
+ }
+@@ -134,12 +143,12 @@ void set_cmdline(char *cmd)
+ 	if(umid != NULL){
+ 		snprintf(argv1_begin, 
+ 			 (argv1_end - argv1_begin) * sizeof(*ptr), 
+-			 "(%s)", umid);
++			 "(%s) ", umid);
+ 		ptr = &argv1_begin[strlen(argv1_begin)];
+ 	}
+ 	else ptr = argv1_begin;
+ 
+-	snprintf(ptr, (argv1_end - ptr) * sizeof(*ptr), " [%s]", cmd);
++	snprintf(ptr, (argv1_end - ptr) * sizeof(*ptr), "[%s]", cmd);
+ 	memset(argv1_begin + strlen(argv1_begin), '\0', 
+ 	       argv1_end - argv1_begin - strlen(argv1_begin));
+ #endif
+@@ -179,7 +188,7 @@ __uml_setup("root=", uml_root_setup,
+ static int __init uml_ncpus_setup(char *line, int *add)
+ {
+        if (!sscanf(line, "%d", &ncpus)) {
+-               printk("Couldn't parse [%s]\n", line);
++               printf("Couldn't parse [%s]\n", line);
+                return -1;
+        }
+ 
+@@ -210,7 +219,7 @@ static int __init mode_tt_setup(char *li
+ 
+ static int __init mode_tt_setup(char *line, int *add)
+ {
+-	printk("CONFIG_MODE_TT disabled - 'mode=tt' ignored\n");
++	printf("CONFIG_MODE_TT disabled - 'mode=tt' ignored\n");
+ 	return(0);
+ }
+ 
+@@ -221,7 +230,7 @@ static int __init mode_tt_setup(char *li
+ 
+ static int __init mode_tt_setup(char *line, int *add)
+ {
+-	printk("CONFIG_MODE_SKAS disabled - 'mode=tt' redundant\n");
++	printf("CONFIG_MODE_SKAS disabled - 'mode=tt' redundant\n");
+ 	return(0);
+ }
+ 
+@@ -369,6 +378,7 @@ int linux_main(int argc, char **argv)
+ 		2 * PAGE_SIZE;
+ 
+ 	task_protections((unsigned long) &init_thread_info);
++	os_flush_stdout();
+ 
+ 	return(CHOOSE_MODE(start_uml_tt(), start_uml_skas()));
+ }
+--- linux-2.6.0-test6/arch/um/kernel/umid.c	2003-06-14 12:18:34.000000000 -0700
++++ 25/arch/um/kernel/umid.c	2003-10-05 00:34:32.000000000 -0700
+@@ -33,18 +33,19 @@ static char *uml_dir = UML_DIR;
+ static int umid_is_random = 1;
+ static int umid_inited = 0;
+ 
+-static int make_umid(void);
++static int make_umid(int (*printer)(const char *fmt, ...));
+ 
+-static int __init set_umid(char *name, int is_random)
++static int __init set_umid(char *name, int is_random, 
++			   int (*printer)(const char *fmt, ...))
+ {
+ 	if(umid_inited){
+-		printk("Unique machine name can't be set twice\n");
++		(*printer)("Unique machine name can't be set twice\n");
+ 		return(-1);
+ 	}
+ 
+ 	if(strlen(name) > UMID_LEN - 1)
+-		printk("Unique machine name is being truncated to %s "
+-		       "characters\n", UMID_LEN);
++		(*printer)("Unique machine name is being truncated to %s "
++			   "characters\n", UMID_LEN);
+ 	strlcpy(umid, name, sizeof(umid));
+ 
+ 	umid_is_random = is_random;
+@@ -54,7 +55,7 @@ static int __init set_umid(char *name, i
+ 
+ static int __init set_umid_arg(char *name, int *add)
+ {
+-	return(set_umid(name, 0));
++	return(set_umid(name, 0, printf));
+ }
+ 
+ __uml_setup("umid=", set_umid_arg,
+@@ -67,7 +68,7 @@ int __init umid_file_name(char *name, ch
+ {
+ 	int n;
+ 
+-	if(!umid_inited && make_umid()) return(-1);
++	if(!umid_inited && make_umid(printk)) return(-1);
+ 
+ 	n = strlen(uml_dir) + strlen(umid) + strlen(name) + 1;
+ 	if(n > len){
+@@ -92,14 +93,14 @@ static int __init create_pid_file(void)
+ 	fd = os_open_file(file, of_create(of_excl(of_rdwr(OPENFLAGS()))), 
+ 			  0644);
+ 	if(fd < 0){
+-		printk("Open of machine pid file \"%s\" failed - "
++		printf("Open of machine pid file \"%s\" failed - "
+ 		       "errno = %d\n", file, -fd);
+ 		return 0;
+ 	}
+ 
+ 	sprintf(pid, "%d\n", os_getpid());
+ 	if(write(fd, pid, strlen(pid)) != strlen(pid))
+-		printk("Write of pid file failed - errno = %d\n", errno);
++		printf("Write of pid file failed - errno = %d\n", errno);
+ 	close(fd);
+ 	return 0;
+ }
+@@ -197,7 +198,7 @@ static int __init set_uml_dir(char *name
+ 	if((strlen(name) > 0) && (name[strlen(name) - 1] != '/')){
+ 		uml_dir = malloc(strlen(name) + 1);
+ 		if(uml_dir == NULL){
+-			printk("Failed to malloc uml_dir - error = %d\n",
++			printf("Failed to malloc uml_dir - error = %d\n",
+ 			       errno);
+ 			uml_dir = name;
+ 			return(0);
+@@ -217,7 +218,7 @@ static int __init make_uml_dir(void)
+ 		char *home = getenv("HOME");
+ 
+ 		if(home == NULL){
+-			printk("make_uml_dir : no value in environment for "
++			printf("make_uml_dir : no value in environment for "
+ 			       "$HOME\n");
+ 			exit(1);
+ 		}
+@@ -239,25 +240,25 @@ static int __init make_uml_dir(void)
+ 	strcpy(uml_dir, dir);
+ 	
+ 	if((mkdir(uml_dir, 0777) < 0) && (errno != EEXIST)){
+-	        printk("Failed to mkdir %s - errno = %i\n", uml_dir, errno);
++	        printf("Failed to mkdir %s - errno = %i\n", uml_dir, errno);
+ 		return(-1);
+ 	}
+ 	return 0;
+ }
+ 
+-static int __init make_umid(void)
++static int __init make_umid(int (*printer)(const char *fmt, ...))
+ {
+ 	int fd, err;
+ 	char tmp[strlen(uml_dir) + UMID_LEN + 1];
+ 
+ 	strlcpy(tmp, uml_dir, sizeof(tmp));
+ 
+-	if(*umid == 0){
++	if(!umid_inited){
+ 		strcat(tmp, "XXXXXX");
+ 		fd = mkstemp(tmp);
+ 		if(fd < 0){
+-			printk("make_umid - mkstemp failed, errno = %d\n",
+-			       errno);
++			(*printer)("make_umid - mkstemp failed, errno = %d\n",
++				   errno);
+ 			return(1);
+ 		}
+ 
+@@ -267,7 +268,7 @@ static int __init make_umid(void)
+ 		 * for directories.
+ 		 */
+ 		unlink(tmp);
+-		set_umid(&tmp[strlen(uml_dir)], 1);
++		set_umid(&tmp[strlen(uml_dir)], 1, printer);
+ 	}
+ 	
+ 	sprintf(tmp, "%s%s", uml_dir, umid);
+@@ -275,14 +276,14 @@ static int __init make_umid(void)
+ 	if((err = mkdir(tmp, 0777)) < 0){
+ 		if(errno == EEXIST){
+ 			if(not_dead_yet(tmp)){
+-				printk("umid '%s' is in use\n", umid);
++				(*printer)("umid '%s' is in use\n", umid);
+ 				return(-1);
+ 			}
+ 			err = mkdir(tmp, 0777);
+ 		}
+ 	}
+ 	if(err < 0){
+-		printk("Failed to create %s - errno = %d\n", umid, errno);
++		(*printer)("Failed to create %s - errno = %d\n", umid, errno);
+ 		return(-1);
+ 	}
+ 
+@@ -295,7 +296,13 @@ __uml_setup("uml_dir=", set_uml_dir,
+ );
+ 
+ __uml_postsetup(make_uml_dir);
+-__uml_postsetup(make_umid);
++
++static int __init make_umid_setup(void)
++{
++	return(make_umid(printf));
++}
++
++__uml_postsetup(make_umid_setup);
+ __uml_postsetup(create_pid_file);
+ 
+ /*
+--- linux-2.6.0-test6/arch/um/kernel/user_util.c	2003-06-14 12:17:59.000000000 -0700
++++ 25/arch/um/kernel/user_util.c	2003-10-05 00:34:32.000000000 -0700
+@@ -119,17 +119,6 @@ int wait_for_stop(int pid, int sig, int 
+ 	}
+ }
+ 
+-int clone_and_wait(int (*fn)(void *), void *arg, void *sp, int flags)
+-{
+-	int pid;
+-
+-	pid = clone(fn, sp, flags, arg);
+- 	if(pid < 0) return(-1);
+-	wait_for_stop(pid, SIGSTOP, PTRACE_CONT, NULL);
+-	ptrace(PTRACE_CONT, pid, 0, 0);
+-	return(pid);
+-}
+-
+ int raw(int fd, int complain)
+ {
+ 	struct termios tt;
+--- linux-2.6.0-test6/arch/um/Makefile	2003-08-08 22:55:11.000000000 -0700
++++ 25/arch/um/Makefile	2003-10-05 00:34:32.000000000 -0700
+@@ -24,15 +24,17 @@ core-y			+= $(ARCH_DIR)/kernel/		 \
+ # Have to precede the include because the included Makefiles reference them.
+ SYMLINK_HEADERS = include/asm-um/archparam.h include/asm-um/system.h \
+ 	include/asm-um/sigcontext.h include/asm-um/processor.h \
+-	include/asm-um/ptrace.h include/asm-um/arch-signal.h
++	include/asm-um/ptrace.h include/asm-um/arch-signal.h \
++	include/asm-um/module.h
+ 
+ ARCH_SYMLINKS = include/asm-um/arch $(ARCH_DIR)/include/sysdep $(ARCH_DIR)/os \
+ 	$(SYMLINK_HEADERS) $(ARCH_DIR)/include/uml-config.h
+ 
+ GEN_HEADERS += $(ARCH_DIR)/include/task.h $(ARCH_DIR)/include/kern_constants.h
+ 
+-include $(ARCH_DIR)/Makefile-$(SUBARCH)
+-include $(ARCH_DIR)/Makefile-os-$(OS)
++.PHONY: sys_prepare
++sys_prepare:
++	@:
+ 
+ MAKEFILE-$(CONFIG_MODE_TT) += Makefile-tt
+ MAKEFILE-$(CONFIG_MODE_SKAS) += Makefile-skas
+@@ -41,6 +43,9 @@ ifneq ($(MAKEFILE-y),)
+   include $(addprefix $(ARCH_DIR)/,$(MAKEFILE-y))
+ endif
+ 
++include $(ARCH_DIR)/Makefile-$(SUBARCH)
++include $(ARCH_DIR)/Makefile-os-$(OS)
++
+ EXTRAVERSION := $(EXTRAVERSION)-1um
+ 
+ ARCH_INCLUDE = -I$(ARCH_DIR)/include
+@@ -52,14 +57,14 @@ ARCH_INCLUDE = -I$(ARCH_DIR)/include
+ 
+ CFLAGS += $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \
+ 	-D_LARGEFILE64_SOURCE $(ARCH_INCLUDE) -Derrno=kernel_errno \
+-	$(MODE_INCLUDE)
++	-Dsigprocmask=kernel_sigprocmask $(MODE_INCLUDE)
+ 
+ LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc
+ 
+ SIZE = (($(CONFIG_NEST_LEVEL) + $(CONFIG_KERNEL_HALF_GIGS)) * 0x20000000)
+ 
+ ifeq ($(CONFIG_MODE_SKAS), y)
+-$(SYS_HEADERS) : $(ARCH_DIR)/kernel/skas/include/skas_ptregs.h
++$(SYS_HEADERS) : $(TOPDIR)/$(ARCH_DIR)/include/skas_ptregs.h
+ endif
+ 
+ include/linux/version.h: arch/$(ARCH)/Makefile
+@@ -98,17 +103,17 @@ CPP_MODE_TT := $(shell [ "$(CONFIG_MODE_
+ CONFIG_KERNEL_STACK_ORDER ?= 2
+ STACK_SIZE := $(shell echo $$[ 4096 * (1 << $(CONFIG_KERNEL_STACK_ORDER)) ] )
+ 
+-AFLAGS_vmlinux.lds.o = -U$(SUBARCH) \
++AFLAGS_vmlinux.lds.o = $(shell echo -U$(SUBARCH) \
+ 	-DSTART=$$(($(TOP_ADDR) - $(SIZE))) -DELF_ARCH=$(ELF_ARCH) \
+ 	-DELF_FORMAT=\"$(ELF_FORMAT)\" $(CPP_MODE_TT) \
+-	-DKERNEL_STACK_SIZE=$(STACK_SIZE)
++	-DKERNEL_STACK_SIZE=$(STACK_SIZE))
+ 
+-AFLAGS_$(LD_SCRIPT-y:.s=).o = $(AFLAGS_vmlinux.lds.o) -P -C -Uum
++export AFLAGS_$(LD_SCRIPT-y:.s=).o = $(AFLAGS_vmlinux.lds.o) -P -C -Uum
+ 
+ LD_SCRIPT-y := $(ARCH_DIR)/$(LD_SCRIPT-y)
+ 
+-$(LD_SCRIPT-y) : $(LD_SCRIPT-y:.s=.S) scripts FORCE
+-	$(call if_changed_dep,as_s_S)
++#$(LD_SCRIPT-y) : $(LD_SCRIPT-y:.s=.S) scripts FORCE
++#	$(call if_changed_dep,as_s_S)
+ 
+ linux: vmlinux $(LD_SCRIPT-y)
+ 	$(CC) -Wl,-T,$(LD_SCRIPT-y) $(LINK-y) $(LINK_WRAPS) \
+@@ -116,6 +121,7 @@ linux: vmlinux $(LD_SCRIPT-y)
+ 
+ USER_CFLAGS := $(patsubst -I%,,$(CFLAGS))
+ USER_CFLAGS := $(patsubst -Derrno=kernel_errno,,$(USER_CFLAGS))
++USER_CFLAGS := $(patsubst -Dsigprocmask=kernel_sigprocmask,,$(USER_CFLAGS))
+ USER_CFLAGS := $(patsubst -D__KERNEL__,,$(USER_CFLAGS)) $(ARCH_INCLUDE) \
+ 	$(MODE_INCLUDE)
+ 
+@@ -123,9 +129,10 @@ USER_CFLAGS := $(patsubst -D__KERNEL__,,
+ USER_CFLAGS += -D_GNU_SOURCE
+ 
+ CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/uml.lds.s \
+-	$(ARCH_DIR)/dyn_link.ld.s $(GEN_HEADERS)
++	$(ARCH_DIR)/dyn_link.ld.s $(ARCH_DIR)/include/uml-config.h \
++	$(GEN_HEADERS)
+ 
+-$(ARCH_DIR)/main.o: $(ARCH_DIR)/main.c
++$(ARCH_DIR)/main.o: $(ARCH_DIR)/main.c sys_prepare
+ 	$(CC) $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+ 
+ archmrproper:
+@@ -161,19 +168,23 @@ $(ARCH_DIR)/include/sysdep:
+ $(ARCH_DIR)/os:
+ 	cd $(ARCH_DIR) && ln -sf os-$(OS) os
+ 
+-$(ARCH_DIR)/include/uml-config.h :
++$(ARCH_DIR)/include/uml-config.h : $(TOPDIR)/include/linux/autoconf.h
+ 	sed 's/ CONFIG/ UML_CONFIG/' $(TOPDIR)/include/linux/autoconf.h > $@
+ 
++filechk_$(ARCH_DIR)/include/task.h := $(ARCH_DIR)/util/mk_task
++
+ $(ARCH_DIR)/include/task.h : $(ARCH_DIR)/util/mk_task
+-	$< > $@
++	$(call filechk,$@)
++
++filechk_$(ARCH_DIR)/include/kern_constants.h := $(ARCH_DIR)/util/mk_constants
+ 
+ $(ARCH_DIR)/include/kern_constants.h : $(ARCH_DIR)/util/mk_constants
+-	$< > $@
++	$(call filechk,$@)
+ 
+-$(ARCH_DIR)/util/mk_task : $(ARCH_DIR)/kernel/skas/include/skas_ptregs.h \
+-	$(ARCH_DIR)/util FORCE ;
++$(ARCH_DIR)/util/mk_task $(ARCH_DIR)/util/mk_constants : $(ARCH_DIR)/util \
++	sys_prepare FORCE ;
+ 
+ $(ARCH_DIR)/util: FORCE
+-	@$(call descend,$@,)
++	$(MAKE) -f scripts/Makefile.build obj=$@
+ 
+-export SUBARCH USER_CFLAGS OS
++export SUBARCH USER_CFLAGS OS 
+--- linux-2.6.0-test6/arch/um/Makefile-i386	2003-06-14 12:18:29.000000000 -0700
++++ 25/arch/um/Makefile-i386	2003-10-05 00:34:32.000000000 -0700
+@@ -16,22 +16,28 @@ SYS_UTIL_DIR	:= $(ARCH_DIR)/sys-i386/uti
+ 
+ SYS_HEADERS = $(SYS_DIR)/sc.h $(SYS_DIR)/thread.h
+ 
++sys_prepare: $(SYS_DIR)/sc.h
++
+ prepare: $(SYS_HEADERS)
+ 
++filechk_$(SYS_DIR)/sc.h := $(SYS_UTIL_DIR)/mk_sc
++
+ $(SYS_DIR)/sc.h: $(SYS_UTIL_DIR)/mk_sc
+-	$< > $@
++	$(call filechk,$@)
++
++filechk_$(SYS_DIR)/thread.h := $(SYS_UTIL_DIR)/mk_thread 
+ 
+ $(SYS_DIR)/thread.h: $(SYS_UTIL_DIR)/mk_thread 
+-	$< > $@
++	$(call filechk,$@)
+ 
+-$(SYS_UTIL_DIR)/mk_sc: FORCE ; 
+-	@$(call descend,$(SYS_UTIL_DIR),$@)
++$(SYS_UTIL_DIR)/mk_sc: scripts/fixdep include/config/MARKER FORCE ; 
++	+@$(call descend,$(SYS_UTIL_DIR),$@)
+ 
+-$(SYS_UTIL_DIR)/mk_thread: $(ARCH_SYMLINKS) $(GEN_HEADERS) FORCE ; 
+-	@$(call descend,$(SYS_UTIL_DIR),$@)
++$(SYS_UTIL_DIR)/mk_thread: $(ARCH_SYMLINKS) $(GEN_HEADERS) sys_prepare FORCE ; 
++	+@$(call descend,$(SYS_UTIL_DIR),$@)
+ 
+ $(SYS_UTIL_DIR): include/asm FORCE
+-	@$(call descend,$@,)
++	+@$(call descend,$@,)
+ 
+ sysclean :
+ 	rm -f $(SYS_HEADERS)
+--- linux-2.6.0-test6/arch/um/Makefile-skas	2003-06-14 12:18:09.000000000 -0700
++++ 25/arch/um/Makefile-skas	2003-10-05 00:34:32.000000000 -0700
+@@ -14,7 +14,7 @@ MODE_INCLUDE += -I$(TOPDIR)/$(ARCH_DIR)/
+ LINK_SKAS = -Wl,-rpath,/lib 
+ LD_SCRIPT_SKAS = dyn.lds.s
+ 
+-GEN_HEADERS += $(ARCH_DIR)/kernel/skas/include/skas_ptregs.h
++GEN_HEADERS += $(TOPDIR)/$(ARCH_DIR)/include/skas_ptregs.h
+ 
+-$(ARCH_DIR)/kernel/skas/include/skas_ptregs.h :
+-	$(MAKE) -C $(ARCH_DIR)/kernel/skas include/skas_ptregs.h
++$(TOPDIR)/$(ARCH_DIR)/include/skas_ptregs.h :
++	$(call descend,$(ARCH_DIR)/kernel/skas,$@)
+--- linux-2.6.0-test6/arch/um/os-Linux/drivers/tuntap_user.c	2003-06-14 12:18:51.000000000 -0700
++++ 25/arch/um/os-Linux/drivers/tuntap_user.c	2003-10-05 00:34:32.000000000 -0700
+@@ -142,7 +142,7 @@ static int tuntap_open(void *data)
+ 			return(-errno);
+ 		}
+ 		memset(&ifr, 0, sizeof(ifr));
+-		ifr.ifr_flags = IFF_TAP;
++		ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
+ 		strlcpy(ifr.ifr_name, pri->dev_name, sizeof(ifr.ifr_name));
+ 		if(ioctl(pri->fd, TUNSETIFF, (void *) &ifr) < 0){
+ 			printk("TUNSETIFF failed, errno = %d", errno);
+--- linux-2.6.0-test6/arch/um/os-Linux/file.c	2003-06-14 12:18:51.000000000 -0700
++++ 25/arch/um/os-Linux/file.c	2003-10-05 00:34:32.000000000 -0700
+@@ -315,7 +315,7 @@ int os_rcv_fd(int fd, int *helper_pid_ou
+ 	return(new);
+ }
+ 
+-int create_unix_socket(char *file, int len)
++int create_unix_socket(char *file, int len, int close_on_exec)
+ {
+ 	struct sockaddr_un addr;
+ 	int sock, err;
+@@ -327,6 +327,10 @@ int create_unix_socket(char *file, int l
+ 		return(-errno);
+ 	}
+ 
++	if(close_on_exec && fcntl(sock, F_SETFD, 1) < 0)
++		printk("create_unix_socket : Setting FD_CLOEXEC failed, "
++		       "errno = %d", errno);
++
+ 	addr.sun_family = AF_UNIX;
+ 
+ 	/* XXX Be more careful about overflow */
+@@ -342,6 +346,37 @@ int create_unix_socket(char *file, int l
+ 	return(sock);
+ }
+ 
++void os_flush_stdout(void)
++{
++	fflush(stdout);
++}
++
++int os_lock_file(int fd, int excl)
++{
++	int type = excl ? F_WRLCK : F_RDLCK;
++	struct flock lock = ((struct flock) { .l_type	= type,
++					      .l_whence	= SEEK_SET,
++					      .l_start	= 0,
++					      .l_len	= 0 } );
++	int err, save;
++
++	err = fcntl(fd, F_SETLK, &lock);
++	if(!err)
++		goto out;
++
++	save = -errno;
++	err = fcntl(fd, F_GETLK, &lock);
++	if(err){
++		err = -errno;
++		goto out;
++	}
++	
++	printk("F_SETLK failed, file already locked by pid %d\n", lock.l_pid);
++	err = save;
++ out:
++	return(err);
++}
++
+ /*
+  * Overrides for Emacs so that we follow Linus's tabbing style.
+  * Emacs will notice this stuff at the end of the file and automatically
+--- linux-2.6.0-test6/arch/um/sys-i386/bugs.c	2003-06-14 12:18:29.000000000 -0700
++++ 25/arch/um/sys-i386/bugs.c	2003-10-05 00:34:32.000000000 -0700
+@@ -8,6 +8,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <sys/signal.h>
++#include <asm/ldt.h>
+ #include "kern_util.h"
+ #include "user.h"
+ #include "sysdep/ptrace.h"
+@@ -16,8 +17,8 @@
+ #define MAXTOKEN 64
+ 
+ /* Set during early boot */
+-int cpu_has_cmov = 1;
+-int cpu_has_xmm = 0;
++int host_has_cmov = 1;
++int host_has_xmm = 0;
+ 
+ static char token(int fd, char *buf, int len, char stop)
+ {
+@@ -104,6 +105,25 @@ static int check_cpu_feature(char *featu
+ 	return(1);
+ }
+ 
++static void disable_lcall(void)
++{
++	struct modify_ldt_ldt_s ldt;
++	int err;
++
++	bzero(&ldt, sizeof(ldt));
++	ldt.entry_number = 7;
++	ldt.base_addr = 0;
++	ldt.limit = 0;
++	err = modify_ldt(1, &ldt, sizeof(ldt));
++	if(err)
++		printk("Failed to disable lcall7 - errno = %d\n", errno);
++}
++
++void arch_init_thread(void)
++{
++	disable_lcall();
++}
++
+ void arch_check_bugs(void)
+ {
+ 	int have_it;
+@@ -113,8 +133,8 @@ void arch_check_bugs(void)
+ 		       "checks\n");
+ 		return;
+ 	}
+-	if(check_cpu_feature("cmov", &have_it)) cpu_has_cmov = have_it;
+-	if(check_cpu_feature("xmm", &have_it)) cpu_has_xmm = have_it;
++	if(check_cpu_feature("cmov", &have_it)) host_has_cmov = have_it;
++	if(check_cpu_feature("xmm", &have_it)) host_has_xmm = have_it;
+ }
+ 
+ int arch_handle_signal(int sig, union uml_pt_regs *regs)
+@@ -130,18 +150,18 @@ int arch_handle_signal(int sig, union um
+ 	if((*((char *) ip) != 0x0f) || ((*((char *) (ip + 1)) & 0xf0) != 0x40))
+ 		return(0);
+ 
+-	if(cpu_has_cmov == 0)
++	if(host_has_cmov == 0)
+ 		panic("SIGILL caused by cmov, which this processor doesn't "
+ 		      "implement, boot a filesystem compiled for older "
+ 		      "processors");
+-	else if(cpu_has_cmov == 1)
++	else if(host_has_cmov == 1)
+ 		panic("SIGILL caused by cmov, which this processor claims to "
+ 		      "implement");
+-	else if(cpu_has_cmov == -1)
++	else if(host_has_cmov == -1)
+ 		panic("SIGILL caused by cmov, couldn't tell if this processor "
+ 		      "implements it, boot a filesystem compiled for older "
+ 		      "processors");
+-	else panic("Bad value for cpu_has_cmov (%d)", cpu_has_cmov);
++	else panic("Bad value for host_has_cmov (%d)", host_has_cmov);
+ 	return(0);
+ }
+ 
+--- linux-2.6.0-test6/arch/um/sys-i386/Makefile	2003-06-14 12:17:59.000000000 -0700
++++ 25/arch/um/sys-i386/Makefile	2003-10-05 00:34:32.000000000 -0700
+@@ -1,7 +1,8 @@
+-obj-y = bugs.o checksum.o extable.o fault.o ksyms.o ldt.o module.o \
+-	ptrace.o ptrace_user.o semaphore.o sigcontext.o syscalls.o sysrq.o
++obj-y = bugs.o checksum.o extable.o fault.o ksyms.o ldt.o ptrace.o \
++	ptrace_user.o semaphore.o sigcontext.o syscalls.o sysrq.o
+ 
+ obj-$(CONFIG_HIGHMEM) += highmem.o
++obj-$(CONFIG_MODULES) += module.o
+ 
+ USER_OBJS := bugs.o ptrace_user.o sigcontext.o fault.o
+ USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
+@@ -9,6 +10,8 @@ USER_OBJS := $(foreach file,$(USER_OBJS)
+ SYMLINKS = semaphore.c highmem.c module.c
+ SYMLINKS := $(foreach f,$(SYMLINKS),$(src)/$f)
+ 
++clean-files := $(SYMLINKS)
++
+ semaphore.c-dir = kernel
+ highmem.c-dir = mm
+ module.c-dir = kernel
+@@ -24,8 +27,7 @@ $(USER_OBJS) : %.o: %.c
+ $(SYMLINKS): 
+ 	$(call make_link,$@)
+ 
+-clean:
+-	$(MAKE) -C util clean
++subdir- := util
+ 
+ fastdep:
+ 
+--- linux-2.6.0-test6/arch/um/uml.lds.S	2003-06-14 12:18:09.000000000 -0700
++++ 25/arch/um/uml.lds.S	2003-10-05 00:34:32.000000000 -0700
+@@ -26,7 +26,11 @@ SECTIONS
+   . = ALIGN(4096);		/* Init code and data */
+   _stext = .;
+   __init_begin = .;
+-  .text.init : { *(.text.init) }
++  .init.text : { 
++	_sinittext = .;
++	*(.init.text)
++	_einittext = .;
++  }
+   . = ALIGN(4096);
+   .text      :
+   {
+@@ -38,7 +42,7 @@ SECTIONS
+ 
+   #include "asm/common.lds.S"
+ 
+-  .data.init : { *(.data.init) }
++  init.data : { *(init.data) }
+   .data    :
+   {
+     . = ALIGN(KERNEL_STACK_SIZE);		/* init_task */
+--- linux-2.6.0-test6/arch/um/util/mk_constants_kern.c	2003-06-14 12:17:57.000000000 -0700
++++ 25/arch/um/util/mk_constants_kern.c	2003-10-05 00:34:32.000000000 -0700
+@@ -1,5 +1,6 @@
+ #include "linux/kernel.h"
+ #include "linux/stringify.h"
++#include "linux/time.h"
+ #include "asm/page.h"
+ 
+ extern void print_head(void);
+@@ -11,6 +12,7 @@ int main(int argc, char **argv)
+ {
+   print_head();
+   print_constant_int("UM_KERN_PAGE_SIZE", PAGE_SIZE);
++
+   print_constant_str("UM_KERN_EMERG", KERN_EMERG);
+   print_constant_str("UM_KERN_ALERT", KERN_ALERT);
+   print_constant_str("UM_KERN_CRIT", KERN_CRIT);
+@@ -19,6 +21,8 @@ int main(int argc, char **argv)
+   print_constant_str("UM_KERN_NOTICE", KERN_NOTICE);
+   print_constant_str("UM_KERN_INFO", KERN_INFO);
+   print_constant_str("UM_KERN_DEBUG", KERN_DEBUG);
++
++  print_constant_int("UM_NSEC_PER_SEC", NSEC_PER_SEC);
+   print_tail();
+   return(0);
+ }
+--- linux-2.6.0-test6/arch/x86_64/boot/compressed/head.S	2003-06-26 22:07:24.000000000 -0700
++++ 25/arch/x86_64/boot/compressed/head.S	2003-10-05 00:33:43.000000000 -0700
+@@ -26,6 +26,7 @@
+ .code32
+ .text
+ 
++#define IN_BOOTLOADER
+ #include <linux/linkage.h>
+ #include <asm/segment.h>
+ 
+--- linux-2.6.0-test6/arch/x86_64/boot/compressed/misc.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/arch/x86_64/boot/compressed/misc.c	2003-10-05 00:33:43.000000000 -0700
+@@ -9,6 +9,7 @@
+  * High loaded stuff by Hans Lermen & Werner Almesberger, Feb. 1996
+  */
+ 
++#define IN_BOOTLOADER
+ #include "miscsetup.h"
+ #include <asm/io.h>
+ 
+--- linux-2.6.0-test6/arch/x86_64/ia32/ia32_binfmt.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/arch/x86_64/ia32/ia32_binfmt.c	2003-10-05 00:33:23.000000000 -0700
+@@ -82,9 +82,12 @@ do {									      \
+ 	int i;								      \
+ 	Elf32_Off ofs = 0;						      \
+ 	for (i = 0; i < VSYSCALL32_EHDR->e_phnum; ++i) {		      \
+-		struct elf_phdr phdr = vsyscall_phdrs[i];		      \
++		struct elf32_phdr phdr = vsyscall_phdrs[i];		      \
+ 		if (phdr.p_type == PT_LOAD) {				      \
++			BUG_ON(ofs != 0);				      \
+ 			ofs = phdr.p_offset = offset;			      \
++			phdr.p_memsz = PAGE_ALIGN(phdr.p_memsz);	      \
++			phdr.p_filesz = phdr.p_memsz;			      \
+ 			offset += phdr.p_filesz;			      \
+ 		}							      \
+ 		else							      \
+@@ -99,10 +102,10 @@ do {									      \
+ 		(const struct elf32_phdr *) (VSYSCALL32_BASE		      \
+ 					   + VSYSCALL32_EHDR->e_phoff);	      \
+ 	int i;								      \
+-	for (i = 0; i < VSYSCALL32_EHDR->e_phnum; ++i) {		      \
++	for (i = 0; i < VSYSCALL_EHDR->e_phnum; ++i) {			      \
+ 		if (vsyscall_phdrs[i].p_type == PT_LOAD)		      \
+ 			DUMP_WRITE((void *) (u64) vsyscall_phdrs[i].p_vaddr,	      \
+-				   vsyscall_phdrs[i].p_filesz);		      \
++				   PAGE_ALIGN(vsyscall_phdrs[i].p_memsz));    \
+ 	}								      \
+ } while (0)
+ 
+--- linux-2.6.0-test6/arch/x86_64/ia32/ia32_ioctl.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/arch/x86_64/ia32/ia32_ioctl.c	2003-10-05 00:34:44.000000000 -0700
+@@ -38,87 +38,6 @@ static int tiocgdev(unsigned fd, unsigne
+ 	return put_user(new_encode_dev(tty_devnum(real_tty)), ptr); 
+ } 
+ 
+-
+-struct raw32_config_request 
+-{
+-	compat_int_t	raw_minor;
+-	__u64	block_major;
+-	__u64	block_minor;
+-} __attribute__((packed));
+-
+-static int raw_ioctl(unsigned fd, unsigned cmd,  void *ptr) 
+-{ 
+-	int ret;
+-	switch (cmd) { 
+-	case RAW_SETBIND:
+-	case RAW_GETBIND: {
+-		struct raw_config_request req; 
+-		struct raw32_config_request *user_req = ptr;
+-		mm_segment_t oldfs = get_fs(); 
+-
+-		if (get_user(req.raw_minor, &user_req->raw_minor) ||
+-		    get_user(req.block_major, &user_req->block_major) ||
+-		    get_user(req.block_minor, &user_req->block_minor))
+-			return -EFAULT;
+-		set_fs(KERNEL_DS); 
+-		ret = sys_ioctl(fd,cmd,(unsigned long)&req); 
+-		set_fs(oldfs); 
+-		break;
+-	}
+-	default:
+-		ret = sys_ioctl(fd,cmd,(unsigned long)ptr);
+-		break;
+-	} 
+-	return ret; 		
+-} 
+-
+-
+-#define REISERFS_IOC_UNPACK32               _IOW(0xCD,1,int)
+-
+-static int reiserfs_ioctl32(unsigned fd, unsigned cmd, unsigned long ptr) 
+-{ 
+-	if (cmd == REISERFS_IOC_UNPACK32) 
+-		cmd = REISERFS_IOC_UNPACK; 
+-	return sys_ioctl(fd,cmd,ptr); 
+-} 
+-
+-struct dirent32 {
+-	compat_int_t	d_ino;
+-	compat_off_t	d_off;
+-	unsigned short	d_reclen;
+-	char		d_name[256]; /* We must not include limits.h! */
+-};
+-
+-#define	VFAT_IOCTL_READDIR_BOTH32	_IOR('r', 1, struct dirent32 [2])
+-#define	VFAT_IOCTL_READDIR_SHORT32	_IOR('r', 2, struct dirent32 [2])
+-
+-static int put_dirent32(struct dirent *src, struct dirent32 *dst)
+-{
+-	int ret; 
+-	ret = put_user(src->d_ino, &dst->d_ino); 
+-	ret |= __put_user(src->d_off, &dst->d_off); 
+-	ret |= __put_user(src->d_reclen, &dst->d_reclen); 
+-	if (__copy_to_user(&dst->d_name, src->d_name, src->d_reclen))
+-		ret |= -EFAULT;
+-	return ret;
+-} 
+-
+-static int vfat_ioctl32(unsigned fd, unsigned cmd,  void *ptr) 
+-{
+-	int ret;
+-	mm_segment_t oldfs = get_fs();
+-	struct dirent d[2]; 
+-
+-	set_fs(KERNEL_DS);
+-	ret = sys_ioctl(fd,cmd,(unsigned long)&d); 
+-	set_fs(oldfs); 
+-	if (!ret) { 
+-		ret |= put_dirent32(&d[0], (struct dirent32 *)ptr); 
+-		ret |= put_dirent32(&d[1], ((struct dirent32 *)ptr) + 1); 
+-	}
+-	return ret; 
+-} 
+-
+ #define RTC_IRQP_READ32	_IOR('p', 0x0b, unsigned int)	 /* Read IRQ rate   */
+ #define RTC_IRQP_SET32	_IOW('p', 0x0c, unsigned int)	 /* Set IRQ rate    */
+ #define RTC_EPOCH_READ32	_IOR('p', 0x0d, unsigned)	 /* Read epoch      */
+@@ -158,436 +77,6 @@ static int rtc32_ioctl(unsigned fd, unsi
+ 	return sys_ioctl(fd,cmd,arg); 
+ } 
+ 
+-struct serial_struct32 {
+-	compat_int_t	type;
+-	compat_int_t	line;
+-	compat_uint_t	port;
+-	compat_int_t	irq;
+-	compat_int_t	flags;
+-	compat_int_t	xmit_fifo_size;
+-	compat_int_t	custom_divisor;
+-	compat_int_t	baud_base;
+-	unsigned short	close_delay;
+-	char	io_type;
+-	char	reserved_char[1];
+-	compat_int_t	hub6;
+-	unsigned short	closing_wait; /* time to wait before closing */
+-	unsigned short	closing_wait2; /* no longer used... */
+-	compat_uint_t	iomem_base;
+-	unsigned short	iomem_reg_shift;
+-	unsigned int	port_high;
+-	compat_int_t	reserved[1];
+-};
+-
+-static int serial_struct_ioctl(unsigned fd, unsigned cmd,  void *ptr) 
+-{
+-	typedef struct serial_struct SS;
+-	struct serial_struct32 *ss32 = ptr; 
+-	int err;
+-	struct serial_struct ss; 
+-	mm_segment_t oldseg = get_fs(); 
+-	if (cmd == TIOCSSERIAL) { 
+-		if (copy_from_user(&ss, ss32, sizeof(struct serial_struct32)))
+-			return -EFAULT;
+-		memmove(&ss.iomem_reg_shift, ((char*)&ss.iomem_base)+4, 
+-			sizeof(SS)-offsetof(SS,iomem_reg_shift)); 
+-		ss.iomem_base = (void *)((unsigned long)ss.iomem_base & 0xffffffff);
+-	}
+-	set_fs(KERNEL_DS);
+-		err = sys_ioctl(fd,cmd,(unsigned long)(&ss)); 
+-	set_fs(oldseg);
+-	if (cmd == TIOCGSERIAL && err >= 0) { 
+-		if (__copy_to_user(ss32,&ss,offsetof(SS,iomem_base)) ||
+-		    __put_user((unsigned long)ss.iomem_base  >> 32 ? 
+-			       0xffffffff : (unsigned)(unsigned long)ss.iomem_base,
+-			       &ss32->iomem_base) ||
+-		    __put_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
+-		    __put_user(ss.port_high, &ss32->port_high))
+-			return -EFAULT;
+-	} 
+-	return err;	
+-}
+-
+-
+-
+-struct usbdevfs_ctrltransfer32 {
+-	u8 bRequestType;
+-	u8 bRequest;
+-	u16 wValue;
+-	u16 wIndex;
+-	u16 wLength;
+-	u32 timeout;  /* in milliseconds */
+-	compat_caddr_t data;
+-};
+-
+-#define USBDEVFS_CONTROL32           _IOWR('U', 0, struct usbdevfs_ctrltransfer32)
+-
+-static int do_usbdevfs_control(unsigned int fd, unsigned int cmd, unsigned long arg)
+-{
+-	struct usbdevfs_ctrltransfer kctrl;
+-	struct usbdevfs_ctrltransfer32 *uctrl;
+-	mm_segment_t old_fs;
+-	__u32 udata;
+-	void *uptr, *kptr;
+-	int err;
+-
+-	uctrl = (struct usbdevfs_ctrltransfer32 *) arg;
+-
+-	if (copy_from_user(&kctrl, uctrl,
+-			   (sizeof(struct usbdevfs_ctrltransfer) -
+-			    sizeof(void *))))
+-		return -EFAULT;
+-
+-	if (get_user(udata, &uctrl->data))
+-		return -EFAULT;
+-	uptr = compat_ptr(udata);
+-
+-	/* In usbdevice_fs, it limits the control buffer to a page,
+-	 * for simplicity so do we.
+-	 */
+-	if (!uptr || kctrl.wLength > PAGE_SIZE)
+-		return -EINVAL;
+-
+-	kptr = (void *)__get_free_page(GFP_KERNEL);
+-
+-	if ((kctrl.bRequestType & 0x80) == 0) {
+-		err = -EFAULT;
+-		if (copy_from_user(kptr, uptr, kctrl.wLength))
+-			goto out;
+-	}
+-
+-	kctrl.data = kptr;
+-
+-	old_fs = get_fs();
+-	set_fs(KERNEL_DS);
+-	err = sys_ioctl(fd, USBDEVFS_CONTROL, (unsigned long)&kctrl);
+-	set_fs(old_fs);
+-
+-	if (err >= 0 &&
+-	    ((kctrl.bRequestType & 0x80) != 0)) {
+-		if (copy_to_user(uptr, kptr, kctrl.wLength))
+-			err = -EFAULT;
+-	}
+-
+-out:
+-	free_page((unsigned long) kptr);
+-	return err;
+-}
+-
+-struct usbdevfs_bulktransfer32 {
+-	compat_uint_t ep;
+-	compat_uint_t len;
+-	compat_uint_t timeout; /* in milliseconds */
+-	compat_caddr_t data;
+-};
+-
+-#define USBDEVFS_BULK32              _IOWR('U', 2, struct usbdevfs_bulktransfer32)
+-
+-static int do_usbdevfs_bulk(unsigned int fd, unsigned int cmd, unsigned long arg)
+-{
+-	struct usbdevfs_bulktransfer kbulk;
+-	struct usbdevfs_bulktransfer32 *ubulk;
+-	mm_segment_t old_fs;
+-	__u32 udata;
+-	void *uptr, *kptr;
+-	int err;
+-
+-	ubulk = (struct usbdevfs_bulktransfer32 *) arg;
+-
+-	if (get_user(kbulk.ep, &ubulk->ep) ||
+-	    get_user(kbulk.len, &ubulk->len) ||
+-	    get_user(kbulk.timeout, &ubulk->timeout) ||
+-	    get_user(udata, &ubulk->data))
+-		return -EFAULT;
+-
+-	uptr = compat_ptr(udata);
+-
+-	/* In usbdevice_fs, it limits the control buffer to a page,
+-	 * for simplicity so do we.
+-	 */
+-	if (!uptr || kbulk.len > PAGE_SIZE)
+-		return -EINVAL;
+-
+-	kptr = (void *) __get_free_page(GFP_KERNEL);
+-
+-	if ((kbulk.ep & 0x80) == 0) {
+-		err = -EFAULT;
+-		if (copy_from_user(kptr, uptr, kbulk.len))
+-			goto out;
+-	}
+-
+-	kbulk.data = kptr;
+-
+-	old_fs = get_fs();
+-	set_fs(KERNEL_DS);
+-	err = sys_ioctl(fd, USBDEVFS_BULK, (unsigned long) &kbulk);
+-	set_fs(old_fs);
+-
+-	if (err >= 0 &&
+-	    ((kbulk.ep & 0x80) != 0)) {
+-		if (copy_to_user(uptr, kptr, kbulk.len))
+-			err = -EFAULT;
+-	}
+-
+-out:
+-	free_page((unsigned long) kptr);
+-	return err;
+-}
+-
+-/* This needs more work before we can enable it.  Unfortunately
+- * because of the fancy asynchronous way URB status/error is written
+- * back to userspace, we'll need to fiddle with USB devio internals
+- * and/or reimplement entirely the frontend of it ourselves. -DaveM
+- *
+- * The issue is:
+- *
+- *	When an URB is submitted via usbdevicefs it is put onto an
+- *	asynchronous queue.  When the URB completes, it may be reaped
+- *	via another ioctl.  During this reaping the status is written
+- *	back to userspace along with the length of the transfer.
+- *
+- *	We must translate into 64-bit kernel types so we pass in a kernel
+- *	space copy of the usbdevfs_urb structure.  This would mean that we
+- *	must do something to deal with the async entry reaping.  First we
+- *	have to deal somehow with this transitory memory we've allocated.
+- *	This is problematic since there are many call sites from which the
+- *	async entries can be destroyed (and thus when we'd need to free up
+- *	this kernel memory).  One of which is the close() op of usbdevicefs.
+- *	To handle that we'd need to make our own file_operations struct which
+- *	overrides usbdevicefs's release op with our own which runs usbdevicefs's
+- *	real release op then frees up the kernel memory.
+- *
+- *	But how to keep track of these kernel buffers?  We'd need to either
+- *	keep track of them in some table _or_ know about usbdevicefs internals
+- *	(ie. the exact layout of its file private, which is actually defined
+- *	in linux/usbdevice_fs.h, the layout of the async queues are private to
+- *	devio.c)
+- *
+- * There is one possible other solution I considered, also involving knowledge
+- * of usbdevicefs internals:
+- *
+- *	After an URB is submitted, we "fix up" the address back to the user
+- *	space one.  This would work if the status/length fields written back
+- *	by the async URB completion lines up perfectly in the 32-bit type with
+- *	the 64-bit kernel type.  Unfortunately, it does not because the iso
+- *	frame descriptors, at the end of the struct, can be written back.
+- *
+- * I think we'll just need to simply duplicate the devio URB engine here.
+- */
+-#if 0
+-struct usbdevfs_urb32 {
+-	unsigned char type;
+-	unsigned char endpoint;
+-	compat_int_t status;
+-	compat_uint_t flags;
+-	compat_caddr_t buffer;
+-	compat_int_t buffer_length;
+-	compat_int_t actual_length;
+-	compat_int_t start_frame;
+-	compat_int_t number_of_packets;
+-	compat_int_t error_count;
+-	compat_uint_t signr;
+-	compat_caddr_t usercontext; /* unused */
+-	struct usbdevfs_iso_packet_desc iso_frame_desc[0];
+-};
+-
+-#define USBDEVFS_SUBMITURB32       _IOR('U', 10, struct usbdevfs_urb32)
+-
+-static int get_urb32(struct usbdevfs_urb *kurb,
+-		     struct usbdevfs_urb32 *uurb)
+-{
+-	if (get_user(kurb->type, &uurb->type) ||
+-	    __get_user(kurb->endpoint, &uurb->endpoint) ||
+-	    __get_user(kurb->status, &uurb->status) ||
+-	    __get_user(kurb->flags, &uurb->flags) ||
+-	    __get_user(kurb->buffer_length, &uurb->buffer_length) ||
+-	    __get_user(kurb->actual_length, &uurb->actual_length) ||
+-	    __get_user(kurb->start_frame, &uurb->start_frame) ||
+-	    __get_user(kurb->number_of_packets, &uurb->number_of_packets) ||
+-	    __get_user(kurb->error_count, &uurb->error_count) ||
+-	    __get_user(kurb->signr, &uurb->signr))
+-		return -EFAULT;
+-
+-	kurb->usercontext = 0; /* unused currently */
+-
+-	return 0;
+-}
+-
+-/* Just put back the values which usbdevfs actually changes. */
+-static int put_urb32(struct usbdevfs_urb *kurb,
+-		     struct usbdevfs_urb32 *uurb)
+-{
+-	if (put_user(kurb->status, &uurb->status) ||
+-	    __put_user(kurb->actual_length, &uurb->actual_length) ||
+-	    __put_user(kurb->error_count, &uurb->error_count))
+-		return -EFAULT;
+-
+-	if (kurb->number_of_packets != 0) {
+-		int i;
+-
+-		for (i = 0; i < kurb->number_of_packets; i++) {
+-			if (__put_user(kurb->iso_frame_desc[i].actual_length,
+-				       &uurb->iso_frame_desc[i].actual_length) ||
+-			    __put_user(kurb->iso_frame_desc[i].status,
+-				       &uurb->iso_frame_desc[i].status))
+-				return -EFAULT;
+-		}
+-	}
+-
+-	return 0;
+-}
+-
+-static int get_urb32_isoframes(struct usbdevfs_urb *kurb,
+-			       struct usbdevfs_urb32 *uurb)
+-{
+-	unsigned int totlen;
+-	int i;
+-
+-	if (kurb->type != USBDEVFS_URB_TYPE_ISO) {
+-		kurb->number_of_packets = 0;
+-		return 0;
+-	}
+-
+-	if (kurb->number_of_packets < 1 ||
+-	    kurb->number_of_packets > 128)
+-		return -EINVAL;
+-
+-	if (copy_from_user(&kurb->iso_frame_desc[0],
+-			   &uurb->iso_frame_desc[0],
+-			   sizeof(struct usbdevfs_iso_packet_desc) *
+-			   kurb->number_of_packets))
+-		return -EFAULT;
+-
+-	totlen = 0;
+-	for (i = 0; i < kurb->number_of_packets; i++) {
+-		unsigned int this_len;
+-
+-		this_len = kurb->iso_frame_desc[i].length;
+-		if (this_len > 1023)
+-			return -EINVAL;
+-
+-		totlen += this_len;
+-	}
+-
+-	if (totlen > 32768)
+-		return -EINVAL;
+-
+-	kurb->buffer_length = totlen;
+-
+-	return 0;
+-}
+-
+-static int do_usbdevfs_urb(unsigned int fd, unsigned int cmd, unsigned long arg)
+-{
+-	struct usbdevfs_urb *kurb;
+-	struct usbdevfs_urb32 *uurb;
+-	mm_segment_t old_fs;
+-	__u32 udata;
+-	void *uptr, *kptr;
+-	unsigned int buflen;
+-	int err;
+-
+-	uurb = (struct usbdevfs_urb32 *) arg;
+-
+-	err = -ENOMEM;
+-	kurb = kmalloc(sizeof(struct usbdevfs_urb) +
+-		       (sizeof(struct usbdevfs_iso_packet_desc) * 128),
+-		       GFP_KERNEL);
+-	if (!kurb)
+-		goto out;
+-
+-	err = -EFAULT;
+-	if (get_urb32(kurb, uurb))
+-		goto out;
+-
+-	err = get_urb32_isoframes(kurb, uurb);
+-	if (err)
+-		goto out;
+-
+-	err = -EFAULT;
+-	if (__get_user(udata, &uurb->buffer))
+-		goto out;
+-	uptr = compat_ptr(udata);
+-
+-	buflen = kurb->buffer_length;
+-	err = verify_area(VERIFY_WRITE, uptr, buflen);
+-	if (err) 
+-		goto out;
+-
+-
+-	old_fs = get_fs();
+-	set_fs(KERNEL_DS);
+-	err = sys_ioctl(fd, USBDEVFS_SUBMITURB, (unsigned long) kurb);
+-	set_fs(old_fs);
+-
+-	if (err >= 0) {
+-		/* RED-PEN Shit, this doesn't work for async URBs :-( XXX */
+-		if (put_urb32(kurb, uurb)) {
+-			err = -EFAULT;
+-		}
+-	}
+-
+-out:
+-	kfree(kurb);
+-	return err;
+-}
+-#endif
+-
+-#define USBDEVFS_REAPURB32         _IOW('U', 12, u32)
+-#define USBDEVFS_REAPURBNDELAY32   _IOW('U', 13, u32)
+-
+-static int do_usbdevfs_reapurb(unsigned int fd, unsigned int cmd, unsigned long arg)
+-{
+-	mm_segment_t old_fs;
+-	void *kptr;
+-	int err;
+-
+-	old_fs = get_fs();
+-	set_fs(KERNEL_DS);
+-	err = sys_ioctl(fd,
+-			(cmd == USBDEVFS_REAPURB32 ?
+-			 USBDEVFS_REAPURB :
+-			 USBDEVFS_REAPURBNDELAY),
+-			(unsigned long) &kptr);
+-	set_fs(old_fs);
+-
+-	if (err >= 0 &&
+-	    put_user((u32)(u64)kptr, (u32 *)arg))
+-		err = -EFAULT;
+-
+-	return err;
+-}
+-
+-struct usbdevfs_disconnectsignal32 {
+-	compat_int_t signr;
+-	compat_caddr_t context;
+-};
+-
+-#define USBDEVFS_DISCSIGNAL32      _IOR('U', 14, struct usbdevfs_disconnectsignal32)
+-
+-static int do_usbdevfs_discsignal(unsigned int fd, unsigned int cmd, unsigned long arg)
+-{
+-	struct usbdevfs_disconnectsignal kdis;
+-	struct usbdevfs_disconnectsignal32 *udis;
+-	mm_segment_t old_fs;
+-	u32 uctx;
+-	int err;
+-
+-	udis = (struct usbdevfs_disconnectsignal32 *) arg;
+-
+-	if (get_user(kdis.signr, &udis->signr) ||
+-	    __get_user(uctx, &udis->context))
+-		return -EFAULT;
+-
+-	kdis.context = (void *) (long)uctx;
+-
+-	old_fs = get_fs();
+-	set_fs(KERNEL_DS);
+-	err = sys_ioctl(fd, USBDEVFS_DISCSIGNAL, (unsigned long) &kdis);
+-	set_fs(old_fs);
+-
+-	return err;
+-}
+ /* /proc/mtrr ioctls */
+ 
+ 
+@@ -726,27 +215,12 @@ COMPATIBLE_IOCTL(FIOQSIZE)
+ 
+ /* And these ioctls need translation */
+ HANDLE_IOCTL(TIOCGDEV, tiocgdev)
+-HANDLE_IOCTL(TIOCGSERIAL, serial_struct_ioctl)
+-HANDLE_IOCTL(TIOCSSERIAL, serial_struct_ioctl)
+-/* Raw devices */
+-HANDLE_IOCTL(RAW_SETBIND, raw_ioctl)
+ /* realtime device */
+ HANDLE_IOCTL(RTC_IRQP_READ,  rtc32_ioctl)
+ HANDLE_IOCTL(RTC_IRQP_READ32,rtc32_ioctl)
+ HANDLE_IOCTL(RTC_IRQP_SET32, rtc32_ioctl)
+ HANDLE_IOCTL(RTC_EPOCH_READ32, rtc32_ioctl)
+ HANDLE_IOCTL(RTC_EPOCH_SET32, rtc32_ioctl)
+-HANDLE_IOCTL(REISERFS_IOC_UNPACK32, reiserfs_ioctl32)
+-/* VFAT */
+-HANDLE_IOCTL(VFAT_IOCTL_READDIR_BOTH32, vfat_ioctl32)
+-HANDLE_IOCTL(VFAT_IOCTL_READDIR_SHORT32, vfat_ioctl32)
+-
+-HANDLE_IOCTL(USBDEVFS_CONTROL32, do_usbdevfs_control)
+-HANDLE_IOCTL(USBDEVFS_BULK32, do_usbdevfs_bulk)
+-/*HANDLE_IOCTL(USBDEVFS_SUBMITURB32, do_usbdevfs_urb)*/
+-HANDLE_IOCTL(USBDEVFS_REAPURB32, do_usbdevfs_reapurb)
+-HANDLE_IOCTL(USBDEVFS_REAPURBNDELAY32, do_usbdevfs_reapurb)
+-HANDLE_IOCTL(USBDEVFS_DISCSIGNAL32, do_usbdevfs_discsignal)
+ /* take care of sizeof(sizeof()) breakage */
+ /* mtrr */
+ HANDLE_IOCTL(MTRRIOC32_ADD_ENTRY, mtrr_ioctl32)
+--- linux-2.6.0-test6/arch/x86_64/kernel/i387.c	2003-06-14 12:18:05.000000000 -0700
++++ 25/arch/x86_64/kernel/i387.c	2003-10-05 00:33:23.000000000 -0700
+@@ -138,12 +138,3 @@ int dump_task_fpu(struct task_struct *ts
+ }
+ 	return fpvalid;
+ }
+-
+-#ifdef CONFIG_SMP
+-void dump_smp_unlazy_fpu(void)
+-{
+-	unlazy_fpu(current);
+-	return;
+-}
+-#endif
+-
+--- linux-2.6.0-test6/arch/x86_64/mm/ioremap.c	2003-06-14 12:18:34.000000000 -0700
++++ 25/arch/x86_64/mm/ioremap.c	2003-10-05 00:33:23.000000000 -0700
+@@ -159,7 +159,7 @@ void * __ioremap(unsigned long phys_addr
+ 	if (!area)
+ 		return NULL;
+ 	addr = area->addr;
+-	if (remap_area_pages(VMALLOC_VMADDR(addr), phys_addr, size, flags)) {
++	if (remap_area_pages((unsigned long) addr, phys_addr, size, flags)) {
+ 		vunmap(addr);
+ 		return NULL;
+ 	}
+--- linux-2.6.0-test6/CREDITS	2003-09-27 18:57:43.000000000 -0700
++++ 25/CREDITS	2003-10-05 00:33:23.000000000 -0700
+@@ -1459,6 +1459,13 @@ S: Ballinagard
+ S: Roscommon
+ S: Ireland
+ 
++N: Michael Hunold
++E: michael@mihu.de
++W: http://www.mihu.de/linux/
++D: Generic saa7146 video4linux-2 driver core,
++D: Driver for the "Multimedia eXtension Board", "dpc7146",
++D: "Hexium Orion", "Hexium Gemini"
++
+ N: Miguel de Icaza Amozurrutia
+ E: miguel@nuclecu.unam.mx
+ D: Linux/SPARC team, Midnight Commander maintainer
+--- linux-2.6.0-test6/Documentation/cachetlb.txt	2003-06-14 12:18:07.000000000 -0700
++++ 25/Documentation/cachetlb.txt	2003-10-05 00:33:23.000000000 -0700
+@@ -59,9 +59,9 @@ changes occur:
+ 	address translations from the TLB.  After running, this
+ 	interface must make sure that any previous page table
+ 	modifications for the address space 'vma->vm_mm' in the range
+-	'start' to 'end' will be visible to the cpu.  That is, after
++	'start' to 'end-1' will be visible to the cpu.  That is, after
+ 	running, here will be no entries in the TLB for 'mm' for
+-	virtual addresses in the range 'start' to 'end'.
++	virtual addresses in the range 'start' to 'end-1'.
+ 
+ 	The "vma" is the backing store being used for the region.
+ 	Primarily, this is used for munmap() type operations.
+@@ -100,7 +100,7 @@ changes occur:
+ 			   unsigned long start, unsigned long end)
+ 
+    The software page tables for address space 'mm' for virtual
+-   addresses in the range 'start' to 'end' are being torn down.
++   addresses in the range 'start' to 'end-1' are being torn down.
+ 
+    Some platforms cache the lowest level of the software page tables
+    in a linear virtually mapped array, to make TLB miss processing
+@@ -165,15 +165,7 @@ and have no dependency on translation in
+ 
+ Here are the routines, one by one:
+ 
+-1) void flush_cache_all(void)
+-
+-	The most severe flush of all.  After this interface runs,
+-	the entire cpu cache is flushed.
+-
+-	This is usually invoked when the kernel page tables are
+-	changed, since such translations are "global" in nature.
+-
+-2) void flush_cache_mm(struct mm_struct *mm)
++1) void flush_cache_mm(struct mm_struct *mm)
+ 
+ 	This interface flushes an entire user address space from
+ 	the caches.  That is, after running, there will be no cache
+@@ -183,13 +175,13 @@ Here are the routines, one by one:
+ 	page table operations such as what happens during
+ 	fork, exit, and exec.
+ 
+-3) void flush_cache_range(struct vm_area_struct *vma,
++2) void flush_cache_range(struct vm_area_struct *vma,
+ 			  unsigned long start, unsigned long end)
+ 
+ 	Here we are flushing a specific range of (user) virtual
+ 	addresses from the cache.  After running, there will be no
+ 	entries in the cache for 'vma->vm_mm' for virtual addresses in
+-	the range 'start' to 'end'.
++	the range 'start' to 'end-1'.
+ 
+ 	The "vma" is the backing store being used for the region.
+ 	Primarily, this is used for munmap() type operations.
+@@ -200,7 +192,7 @@ Here are the routines, one by one:
+ 	call flush_cache_page (see below) for each entry which may be
+ 	modified.
+ 
+-4) void flush_cache_page(struct vm_area_struct *vma, unsigned long addr)
++3) void flush_cache_page(struct vm_area_struct *vma, unsigned long addr)
+ 
+ 	This time we need to remove a PAGE_SIZE sized range
+ 	from the cache.  The 'vma' is the backing structure used by
+@@ -215,6 +207,30 @@ Here are the routines, one by one:
+ 
+ 	This is used primarily during fault processing.
+ 
++4) void flush_cache_kmaps(void)
++
++	This routine need only be implemented if the platform utilizes
++	highmem.  It will be called right before all of the kmaps
++	are invalidated.
++
++	After running, there will be no entries in the cache for
++	the kernel virtual address range PKMAP_ADDR(0) to
++	PKMAP_ADDR(LAST_PKMAP).
++
++	This routing should be implemented in asm/highmem.h
++
++5) void flush_cache_vmap(unsigned long start, unsigned long end)
++   void flush_cache_vunmap(unsigned long start, unsigned long end)
++
++	Here in these two interfaces we are flushing a specific range
++	of (kernel) virtual addresses from the cache.  After running,
++	there will be no entries in the cache for the kernel address
++	space for virtual addresses in the range 'start' to 'end-1'.
++
++	The first of these two routines is invoked after map_vm_area()
++	has installed the page table entries.  The second is invoked
++	before unmap_vm_area() deletes the page table entries.
++
+ There exists another whole class of cpu cache issues which currently
+ require a whole different set of interfaces to handle properly.
+ The biggest problem is that of virtual aliasing in the data cache
+@@ -317,6 +333,26 @@ maps this page at its virtual address.
+ 			dirty.  Again, see sparc64 for examples of how
+ 			to deal with this.
+ 
++  void copy_to_user_page(struct vm_area_struct *vma, struct page *page,
++                         unsigned long user_vaddr,
++                         void *dst, void *src, int len)
++  void copy_from_user_page(struct vm_area_struct *vma, struct page *page,
++                           unsigned long user_vaddr,
++                           void *dst, void *src, int len)
++	When the kernel needs to copy arbitrary data in and out
++	of arbitrary user pages (f.e. for ptrace()) it will use
++	these two routines.
++
++	The page has been kmap()'d, and flush_cache_page() has
++	just been called for the user mapping of this page (if
++	necessary).
++
++	Any necessary cache flushing or other coherency operations
++	that need to occur should happen here.  If the processor's
++	instruction cache does not snoop cpu stores, it is very
++	likely that you will need to flush the instruction cache
++	for copy_to_user_page().
++
+   void flush_icache_range(unsigned long start, unsigned long end)
+   	When the kernel stores into addresses that it will execute
+ 	out of (eg when loading modules), this function is called.
+@@ -324,17 +360,6 @@ maps this page at its virtual address.
+ 	If the icache does not snoop stores then this routine will need
+ 	to flush it.
+ 
+-  void flush_icache_user_range(struct vm_area_struct *vma,
+-			struct page *page, unsigned long addr, int len)
+-	This is called when the kernel stores into addresses that are
+-	part of the address space of a user process (which may be some
+-	other process than the current process).  The addr argument
+-	gives the virtual address in that process's address space,
+-	page is the page which is being modified, and len indicates
+-	how many bytes have been modified.  The modified region must
+-	not cross a page boundary.  Currently this is only called from
+-	kernel/ptrace.c.
+-
+   void flush_icache_page(struct vm_area_struct *vma, struct page *page)
+ 	All the functionality of flush_icache_page can be implemented in
+ 	flush_dcache_page and update_mmu_cache. In 2.7 the hope is to
+--- linux-2.6.0-test6/Documentation/cpu-freq/user-guide.txt	2003-08-08 22:55:10.000000000 -0700
++++ 25/Documentation/cpu-freq/user-guide.txt	2003-10-05 00:33:23.000000000 -0700
+@@ -57,6 +57,8 @@ AMD mobile K6-2+
+ AMD mobile K6-3+
+ AMD mobile Duron
+ AMD mobile Athlon
++AMD Opteron
++AMD Athlon 64
+ Cyrix Media GXm
+ Intel mobile PIII and Intel mobile PIII-M on certain chipsets
+ Intel Pentium 4, Intel Xeon
+--- linux-2.6.0-test6/Documentation/crypto/api-intro.txt	2003-08-22 19:23:39.000000000 -0700
++++ 25/Documentation/crypto/api-intro.txt	2003-10-05 00:33:23.000000000 -0700
+@@ -126,7 +126,7 @@ might already be working on.
+ BUGS
+ 
+ Send bug reports to:
+-James Morris <jmorris@intercode.com.au>
++James Morris <jmorris@redhat.com>
+ Cc: David S. Miller <davem@redhat.com>
+ 
+ 
+@@ -220,5 +220,5 @@ CAST5 algorithm contributors:
+ Generic scatterwalk code by Adam J. Richter <adam@yggdrasil.com>
+ 
+ Please send any credits updates or corrections to:
+-James Morris <jmorris@intercode.com.au>
++James Morris <jmorris@redhat.com>
+ 
+--- linux-2.6.0-test6/Documentation/DocBook/kernel-api.tmpl	2003-09-27 18:57:43.000000000 -0700
++++ 25/Documentation/DocBook/kernel-api.tmpl	2003-10-05 00:33:23.000000000 -0700
+@@ -318,6 +318,5 @@ X!Idrivers/video/console/fonts.c
+ <!-- Needs ksyms to list additional exported symbols, but no specific doc.
+      docproc do not care about sgml commants.
+ !Dkernel/ksyms.c
+-!Dnet/netsyms.c
+ -->
+ </book>
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/fb/neofb.txt	2003-10-05 00:34:22.000000000 -0700
+@@ -0,0 +1,27 @@
++the neofb framebuffer driver supports the following Neomagic chipsets:
++
++NM2070 MagicGraph 128
++NM2090 MagicGraph 128V
++NM2093 MagicGraph 128ZV
++NM2097 MagicGraph 128ZV+
++NM2160 MagicGraph 128XD
++NM2200 MagicGraph 256AV
++NM2230 MagicGraph 256AV+
++NM2360 MagicGraph 256ZX
++NM2380 MagicGraph 256XL+
++
++with the following options:
++
++disabled	Disable this driver's initialization.
++internal	Enable output on internal LCD Display.
++external	Enable output on external CRT.
++nostretch	Disable stretching of modes smaller than LCD.
++nopciburst	Disable PCI burst mode.
++libretto	Force Libretto 100/110 800x480 LCD.
++picturebook	Force Picturebook 1024x480 LCD.
++
++at the boot prompt:
++	video=neofb:picturebook
++
++as a module:
++	modprobe neofb picturebook=1
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/i386/kgdb/andthen	2003-10-05 00:33:38.000000000 -0700
+@@ -0,0 +1,100 @@
++
++define	set_andthen
++	set var $thp=0
++	set var $thp=(struct kgdb_and_then_struct *)&kgdb_data[0]
++	set var $at_size = (sizeof kgdb_data)/(sizeof *$thp)
++	set var $at_oc=kgdb_and_then_count
++	set var $at_cc=$at_oc
++end
++
++define andthen_next
++	set var $at_cc=$arg0
++end
++
++define andthen
++	andthen_set_edge
++	if ($at_cc >= $at_oc)
++		printf "Outside window.  Window size is %d\n",($at_oc-$at_low)
++	else
++		printf "%d: ",$at_cc
++		output *($thp+($at_cc++ % $at_size ))
++		printf "\n"
++	end
++end
++define andthen_set_edge
++	set var $at_oc=kgdb_and_then_count
++	set var $at_low = $at_oc - $at_size
++	if ($at_low < 0 )
++		set var $at_low = 0
++	end
++	if (( $at_cc > $at_oc) || ($at_cc < $at_low))
++		printf "Count outside of window, setting count to "
++		if ($at_cc >= $at_oc)
++			set var $at_cc = $at_oc
++		else
++			set var $at_cc = $at_low
++		end
++		printf "%d\n",$at_cc
++	end
++end
++
++define beforethat
++	andthen_set_edge
++	if ($at_cc <= $at_low)
++		printf "Outside window.  Window size is %d\n",($at_oc-$at_low)
++	else
++		printf "%d: ",$at_cc-1
++		output *($thp+(--$at_cc % $at_size ))
++		printf "\n"
++	end
++end
++
++document andthen_next
++	andthen_next <count>
++	.	sets the number of the event to display next. If this event
++	.	is not in the event pool, either andthen or beforethat will
++	.	correct it to the nearest event pool edge.  The event pool
++	.	ends at the last event recorded and begins <number of events>
++	.	prior to that.  If beforethat is used next, it will display
++	.	event <count> -1.
++.
++	andthen commands are: set_andthen, andthen_next, andthen and beforethat
++end
++
++
++document andthen
++	andthen
++.	displays the next event in the list.  <set_andthen> sets up to display
++.	the oldest saved event first.
++.	<count> (optional) count of the event to display.
++.	note the number of events saved is specified at configure time.
++.	if events are saved between calls to andthen the index will change
++.	but the displayed event will be the next one (unless the event buffer
++.	is overrun).
++.
++.	andthen commands are: set_andthen, andthen_next, andthen and beforethat
++end
++
++document set_andthen
++	set_andthen
++.	sets up to use the <andthen> and <beforethat> commands.
++.		if you have defined your own struct, use the above and
++.		then enter the following:
++.		p $thp=(struct kgdb_and_then_structX *)&kgdb_data[0]
++.		where <kgdb_and_then_structX> is the name of your structure.
++.
++.	andthen commands are: set_andthen, andthen_next, andthen and beforethat
++end
++
++document beforethat
++	beforethat
++.	displays the next prior event in the list. <set_andthen> sets up to
++.	display the last occuring event first.
++.
++.	note the number of events saved is specified at configure time.
++.	if events are saved between calls to beforethat the index will change
++.	but the displayed event will be the next one (unless the event buffer
++.	is overrun).
++.
++.	andthen commands are: set_andthen, andthen_next, andthen and beforethat
++end
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/i386/kgdb/debug-nmi.txt	2003-10-05 00:33:38.000000000 -0700
+@@ -0,0 +1,37 @@
++Subject: Debugging with NMI
++Date: Mon, 12 Jul 1999 11:28:31 -0500
++From: David Grothe <dave@gcom.com>
++Organization: Gcom, Inc
++To: David Grothe <dave@gcom.com>
++
++Kernel hackers:
++
++Maybe this is old hat, but it is new to me --
++
++On an ISA bus machine, if you short out the A1 and B1 pins of an ISA
++slot you will generate an NMI to the CPU.  This interrupts even a
++machine that is hung in a loop with interrupts disabled.  Used in
++conjunction with kgdb <
++ftp://ftp.gcom.com/pub/linux/src/kgdb-2.3.35/kgdb-2.3.35.tgz > you can
++gain debugger control of a machine that is hung in the kernel!  Even
++without kgdb the kernel will print a stack trace so you can find out
++where it was hung.
++
++The A1/B1 pins are directly opposite one another and the farthest pins
++towards the bracket end of the ISA bus socket.  You can stick a paper
++clip or multi-meter probe between them to short them out.
++
++I had a spare ISA bus to PC104 bus adapter around.  The PC104 end of the
++board consists of two rows of wire wrap pins.  So I wired a push button
++between the A1/B1 pins and now have an ISA board that I can stick into
++any ISA bus slot for debugger entry.
++
++Microsoft has a circuit diagram of a PCI card at
++http://www.microsoft.com/hwdev/DEBUGGING/DMPSW.HTM.  If you want to
++build one you will have to mail them and ask for the PAL equations.
++Nobody makes one comercially.
++
++[THIS TIP COMES WITH NO WARRANTY WHATSOEVER.  It works for me, but if
++your machine catches fire, it is your problem, not mine.]
++
++-- Dave (the kgdb guy)
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/i386/kgdb/gdb-globals.txt	2003-10-05 00:33:38.000000000 -0700
+@@ -0,0 +1,71 @@
++Sender: akale@veritas.com
++Date: Fri, 23 Jun 2000 19:26:35 +0530
++From: "Amit S. Kale" <akale@veritas.com>
++Organization: Veritas Software (India)
++To: Dave Grothe <dave@gcom.com>, linux-kernel@vger.rutgers.edu
++CC: David Milburn <dmilburn@wirespeed.com>,
++        "Edouard G. Parmelan" <Edouard.Parmelan@quadratec.fr>,
++        ezannoni@cygnus.com, Keith Owens <kaos@ocs.com.au>
++Subject: Re: Module debugging using kgdb
++
++Dave Grothe wrote:
++>
++> Amit:
++>
++> There is a 2.4.0 version of kgdb on our ftp site:
++> ftp://ftp.gcom.com/pub/linux/src/kgdb.  I mirrored your version of gdb
++> and loadmodule.sh there.
++>
++> Have a look at the README file and see if I go it right.  If not, send
++> me some corrections and I will update it.
++>
++> Does your version of gdb solve the global variable problem?
++
++Yes.
++Thanks to Elena Zanoni, gdb (developement version) can now calculate
++correctly addresses  of dynamically loaded object files. I have not been
++following gdb developement for sometime and am not sure when symbol
++address calculation fix is going to appear in a gdb stable version.
++
++Elena, any idea when the fix will make it to a prebuilt gdb from a
++redhat release?
++
++For the time being I have built a gdb developement version. It can be
++used for module debugging with loadmodule.sh script.
++
++The problem with calculating of module addresses with previous versions
++of gdb was as follows:
++gdb did not use base address of a section while calculating address of
++a symbol in the section in an object file loaded via 'add-symbol-file'.
++It used address of .text segment instead. Due to this addresses of
++symbols in .data, .bss etc. (e.g. global variables) were calculated incorrectly.
++
++Above mentioned fix allow gdb to use base address of a segment while
++calculating address of a symbol in it. It adds a parameter '-s' to
++'add-symbol-file' command for specifying base address of a segment.
++
++loadmodule.sh script works as follows.
++
++1. Copy a module file to target machine.
++2. Load the module on the target machine using insmod with -m parameter.
++insmod produces a module load map which contains base addresses of all
++sections in the module and addresses of symbols in the module file.
++3. Find all sections and their base addresses in the module from
++the module map.
++4. Generate a script that loads the module file. The script uses
++'add-symbol-file' and specifies address of text segment followed by
++addresses of all segments in the module.
++
++Here is an example gdb script produced by loadmodule.sh script.
++
++add-symbol-file foo 0xd082c060 -s .text.lock 0xd08cbfb5
++-s .fixup 0xd08cfbdf -s .rodata 0xd08cfde0 -s __ex_table 0xd08e3b38
++-s .data 0xd08e3d00 -s .bss 0xd08ec8c0 -s __ksymtab 0xd08ee838
++
++With this command gdb can calculate addresses of symbols in ANY segment
++in a module file.
++
++Regards.
++--
++Amit Kale
++Veritas Software ( http://www.veritas.com )
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/i386/kgdb/gdbinit	2003-10-05 00:33:38.000000000 -0700
+@@ -0,0 +1,14 @@
++shell echo -e "\003" >/dev/ttyS0
++set remotebaud 38400
++target remote /dev/ttyS0
++define si
++stepi
++printf "EAX=%08x EBX=%08x ECX=%08x EDX=%08x\n", $eax, $ebx, $ecx, $edx
++printf "ESI=%08x EDI=%08x EBP=%08x ESP=%08x\n", $esi, $edi, $ebp, $esp
++x/i $eip
++end
++define ni
++nexti
++printf "EAX=%08x EBX=%08x ECX=%08x EDX=%08x\n", $eax, $ebx, $ecx, $edx
++printf "ESI=%08x EDI=%08x EBP=%08x ESP=%08x\n", $esi, $edi, $ebp, $esp
++x/i $eip
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/i386/kgdb/gdbinit.hw	2003-10-05 00:33:38.000000000 -0700
+@@ -0,0 +1,117 @@
++
++#Using ia-32 hardware breakpoints.
++#
++#4 hardware breakpoints are available in ia-32 processors. These breakpoints
++#do not need code modification. They are set using debug registers.
++#
++#Each hardware breakpoint can be of one of the
++#three types: execution, write, access.
++#1. An Execution breakpoint is triggered when code at the breakpoint address is
++#executed.
++#2. A write breakpoint ( aka watchpoints ) is triggered when memory location
++#at the breakpoint address is written.
++#3. An access breakpoint is triggered when memory location at the breakpoint
++#address is either read or written.
++#
++#As hardware breakpoints are available in limited number, use software
++#breakpoints ( br command in gdb ) instead of execution hardware breakpoints.
++#
++#Length of an access or a write breakpoint defines length of the datatype to
++#be watched. Length is 1 for char, 2 short , 3 int.
++#
++#For placing execution, write and access breakpoints, use commands
++#hwebrk, hwwbrk, hwabrk
++#To remove a breakpoint use hwrmbrk command.
++#
++#These commands take following types of arguments. For arguments associated
++#with each command, use help command.
++#1. breakpointno: 0 to 3
++#2. length: 1 to 3
++#3. address: Memory location in hex ( without 0x ) e.g c015e9bc
++#
++#Use the command exinfo to find which hardware breakpoint occured.
++
++#hwebrk breakpointno address
++define hwebrk
++	maintenance packet Y$arg0,0,0,$arg1
++end
++document hwebrk
++	hwebrk <breakpointno> <address>
++	Places a hardware execution breakpoint
++	<breakpointno> = 0 - 3
++	<address> = Hex digits without leading "0x".
++end
++
++#hwwbrk breakpointno length address
++define hwwbrk
++	maintenance packet Y$arg0,1,$arg1,$arg2
++end
++document hwwbrk
++	hwwbrk <breakpointno> <length> <address>
++	Places a hardware write breakpoint
++	<breakpointno> = 0 - 3
++	<length> = 1 (1 byte), 2 (2 byte), 3 (4 byte)
++	<address> = Hex digits without leading "0x".
++end
++
++#hwabrk breakpointno length address
++define hwabrk
++	maintenance packet Y$arg0,1,$arg1,$arg2
++end
++document hwabrk
++	hwabrk <breakpointno> <length> <address>
++	Places a hardware access breakpoint
++	<breakpointno> = 0 - 3
++	<length> = 1 (1 byte), 2 (2 byte), 3 (4 byte)
++	<address> = Hex digits without leading "0x".
++end
++
++#hwrmbrk breakpointno
++define hwrmbrk
++	maintenance packet y$arg0
++end
++document hwrmbrk
++	hwrmbrk <breakpointno>
++	<breakpointno> = 0 - 3
++	Removes a hardware breakpoint
++end
++
++define reboot
++        maintenance packet r
++end
++#exinfo
++define exinfo
++	maintenance packet qE
++end
++document exinfo
++	exinfo
++	Gives information about a breakpoint.
++end
++define get_th
++	p $th=(struct thread_info *)((int)$esp & ~8191)
++end
++document get_th
++	get_tu
++	Gets and prints the current thread_info pointer, Defines th to be it.
++end
++define get_cu
++	p $cu=((struct thread_info *)((int)$esp & ~8191))->task
++end
++document get_cu
++	get_cu
++	Gets and print the "current" value.  Defines $cu to be it.
++end
++define int_off
++	set var $flags=$eflags
++	set $eflags=$eflags&~0x200
++	end
++define int_on
++	set var $eflags|=$flags&0x200
++	end
++document int_off
++	saves the current interrupt state and clears the processor interrupt
++	flag.  Use int_on to restore the saved flag.
++end
++document int_on
++	Restores the interrupt flag saved by int_off.
++end
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/i386/kgdb/gdbinit-modules	2003-10-05 00:33:38.000000000 -0700
+@@ -0,0 +1,146 @@
++#
++# Usefull GDB user-command to debug Linux Kernel Modules with gdbstub.
++#
++# This don't work for Linux-2.0 or older.
++#
++# Author Edouard G. Parmelan <Edouard.Parmelan@quadratec.fr>
++#
++#
++# Fri Apr 30 20:33:29 CEST 1999
++#   First public release.
++#
++#   Major cleanup after experiment Linux-2.0 kernel without success.
++#   Symbols of a module are not in the correct order, I can't explain
++#   why :(
++#
++# Fri Mar 19 15:41:40 CET 1999
++#   Initial version.
++#
++# Thu Jan  6 16:29:03 CST 2000
++#   A little fixing by Dave Grothe <dave@gcom.com>
++#
++# Mon Jun 19 09:33:13 CDT 2000
++#   Alignment changes from Edouard Parmelan
++#
++# The basic idea is to find where insmod load the module and inform
++# GDB to load the symbol table of the module with the GDB command
++# ``add-symbol-file <object> <address>''.
++#
++# The Linux kernel holds the list of all loaded modules in module_list,
++# this list end with &kernel_module (exactly with module->next == NULL,
++# but the last module is not a real module).
++#
++# Insmod allocates the struct module before the object file.  Since
++# Linux-2.1, this structure contain his size.  The real address of
++# the object file is then (char*)module + module->size_of_struct.
++#
++# You can use three user functions ``mod-list'', ``mod-print-symbols''
++# and ``add-module-symbols''.
++#
++# mod-list list all loaded modules with the format:
++#    <module-address> <module-name>
++#
++# As soon as you have found the address of your module, you can
++# print its exported symbols (mod-print-symbols) or inform GDB to add
++# symbols from your module file (mod-add-symbols).
++#
++# The argument that you give to mod-print-symbols or mod-add-symbols
++# is the <module-address> from the mod-list command.
++#
++# When using the mod-add-symbols command you must also give the full
++# pathname of the modules object code file.
++#
++# The command mod-add-lis is an example of how to make this easier.
++# You can edit this macro to contain the path name of your own
++# favorite module and then use it as a shorthand to load it.  You
++# still need the module-address, however.
++#
++# The internal function ``mod-validate'' set the GDB variable $mod
++# as a ``struct module*'' if the kernel known the module otherwise
++# $mod is set to NULL.  This ensure to not add symbols for a wrong
++# address.
++#
++# Have a nice hacking day !
++#
++#
++define mod-list
++    set $mod = (struct module*)module_list
++    # the last module is the kernel, ignore it
++    while $mod != &kernel_module
++    	printf "%p\t%s\n", (long)$mod, ($mod)->name
++	set $mod = $mod->next
++    end
++end
++document mod-list
++List all modules in the form: <module-address> <module-name>
++Use the <module-address> as the argument for the other
++mod-commands: mod-print-symbols, mod-add-symbols.
++end
++
++define mod-validate
++    set $mod = (struct module*)module_list
++    while ($mod != $arg0) && ($mod != &kernel_module)
++    	set $mod = $mod->next
++    end
++    if $mod == &kernel_module
++	set $mod = 0
++    	printf "%p is not a module\n", $arg0
++    end
++end
++document mod-validate
++mod-validate <module-address>
++Internal user-command used to validate the module parameter.
++If <module> is a real loaded module, set $mod to it otherwise set $mod to 0.
++end
++
++
++define mod-print-symbols
++    mod-validate $arg0
++    if $mod != 0
++	set $i = 0
++	while $i < $mod->nsyms
++	    set $sym = $mod->syms[$i]
++	    printf "%p\t%s\n", $sym->value, $sym->name
++	    set $i = $i + 1
++	end
++    end
++end
++document mod-print-symbols
++mod-print-symbols <module-address>
++Print all exported symbols of the module.  see mod-list
++end
++
++
++define mod-add-symbols-align
++    mod-validate $arg0
++    if $mod != 0
++	set $mod_base = ($mod->size_of_struct + (long)$mod)
++	if ($arg2 != 0) && (($mod_base & ($arg2 - 1)) != 0)
++	    set $mod_base = ($mod_base | ($arg2 - 1)) + 1
++	end
++	add-symbol-file $arg1 $mod_base
++    end
++end
++document mod-add-symbols-align
++mod-add-symbols-align <module-address> <object file path name> <align>
++Load the symbols table of the module from the object file where
++first section aligment is <align>.
++To retreive alignment, use `objdump -h <object file path name>'.
++end
++
++define mod-add-symbols
++    mod-add-symbols-align $arg0 $arg1 sizeof(long)
++end
++document mod-add-symbols
++mod-add-symbols <module-address> <object file path name>
++Load the symbols table of the module from the object file.
++Default alignment is 4.  See mod-add-symbols-align.
++end
++
++define mod-add-lis
++    mod-add-symbols-align $arg0 /usr/src/LiS/streams.o 16
++end
++document mod-add-lis
++mod-add-lis <module-address>
++Does mod-add-symbols <module-address> /usr/src/LiS/streams.o
++end
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/i386/kgdb/kgdbeth.txt	2003-10-05 00:33:46.000000000 -0700
+@@ -0,0 +1,118 @@
++KGDB over ethernet
++==================
++
++Authors
++-------
++
++Robert Walsh <rjwalsh@durables.org>  (2.6 port)
++wangdi <wangdi@clusterfs.com>        (2.6 port)
++San Mehat                            (original 2.4 code)
++
++
++Introduction
++------------
++
++KGDB supports debugging over ethernet.  Only a limited set of ethernet
++devices are supported right now, but adding support for new devices
++should not be too complicated.  See "New Devices" below for details.
++
++
++Terminology
++-----------
++
++This document uses the following terms:
++
++  TARGET: the machine being debugged.
++  HOST:   the machine running gdb.
++
++
++Usage
++-----
++
++You need to use the following command-line options on the TARGET kernel:
++
++  gdbeth=DEVICENUM
++  gdbeth_remoteip=HOSTIPADDR
++  gdbeth_remotemac=REMOTEMAC
++  gdbeth_localmac=LOCALMAC
++
++kgdbeth=DEVICENUM sets the ethernet device number to listen on for
++debugging packets.  e.g. kgdbeth=0 listens on eth0.
++
++kgdbeth_remoteip=HOSTIPADDR sets the IP address of the HOST machine.
++Only packets originating from this IP address will be accepted by the
++debugger.  e.g. kgdbeth_remoteip=192.168.2.2
++
++kgdbeth_remotemac=REMOTEMAC sets the ethernet address of the HOST machine.
++e.g. kgdbeth_remotemac=00:07:70:12:4E:F5
++
++kgdbeth_localmac=LOCALMAC sets the ethernet address of the TARGET machine.
++e.g. kgdbeth_localmac=00:10:9F:18:21:3C
++
++You can also set the following command-line option on the TARGET kernel:
++
++  kgdbeth_listenport=PORT
++
++kgdbeth_listenport sets the UDP port to listen on for gdb debugging
++packets.  The default value is "6443".  e.g. kgdbeth_listenport=7654
++causes the kernel to listen on UDP port 7654 for debugging packets.
++
++On the HOST side, run gdb as normal and use a remote UDP host as the
++target:
++
++   % gdb ./vmlinux
++   GNU gdb Red Hat Linux (5.3post-0.20021129.18rh)
++   Copyright 2003 Free Software Foundation, Inc.
++   GDB is free software, covered by the GNU General Public License, and you are
++   welcome to change it and/or distribute copies of it under certain conditions.
++   Type "show copying" to see the conditions.
++   There is absolutely no warranty for GDB.  Type "show warranty" for details.
++   This GDB was configured as "i386-redhat-linux-gnu"...
++   (gdb) target remote udp:HOSTNAME:6443
++
++You can now continue as if you were debugging over a serial line.
++
++Observations
++------------
++
++I've used this with NFS and various other network applications (ssh,
++etc.) and it's doesn't appear to interfere with their operation in
++any way.  It doesn't seem to effect the NIC it uses - i.e. you don't
++need a dedicated NIC for this.
++
++Limitations
++-----------
++
++In the inital release of this code you _must_ break into the system with the
++debugger by hand, early after boot, as described above.
++
++Otherwise, the first time the kernel tries to enter the debugger (say, via an
++oops or a BUG), the kgdb stub will doublefault and die because things aren't
++fully set up yet.
++
++Supported devices
++-----------------
++
++Right now, the following drivers are supported:
++
++  e100 driver (drivers/net/e100/*)
++  3c59x driver (drivers/net/3c59x.c)
++
++
++New devices
++-----------
++
++Supporting a new device is straightforward.  Just add a "poll" routine to
++the driver and hook it into the poll_controller field in the netdevice
++structure.  For an example, look in drivers/net/3c59x.c and search
++for CONFIG_KGDB (two places.)
++
++The poll routine is usually quite simple - it's usually enough to just
++disable interrupts, call the device's interrupt routine and re-enable
++interrupts again.
++
++
++Bug reports
++-----------
++
++Send bug reports to Robert Walsh <rjwalsh@durables.org>.
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/i386/kgdb/kgdb.txt	2003-10-05 00:33:38.000000000 -0700
+@@ -0,0 +1,775 @@
++Last edit: <20030806.1637.12>
++This file has information specific to the i386 kgdb option.  Other
++platforms with the kgdb option may behave in a similar fashion.
++
++New features:
++============
++20030806.1557.37
++This version was made against the 2.6.0-test2 kernel. We have made the
++following changes:
++
++- The getthread() code in the stub calls find_task_by_pid().  It fails
++  if we are early in the bring up such that the pid arrays have yet to
++  be allocated.  We have added a line to kernel/pid.c to make
++  "kgdb_pid_init_done" true once the arrays are allocated.  This way the
++  getthread() code knows not to call.  This is only used by the thread
++  debugging stuff and threads will not yet exist at this point in the
++  boot.
++
++- For some reason, gdb was not asking for a new thread list when the
++  "info thread" command was given.  We changed to the newer version of
++  the thread info command and gdb now seems to ask when needed.  Result,
++  we now get all threads in the thread list.
++
++- We now respond to the ThreadExtraInfo request from gdb with the thread
++  name from task_struct .comm.  This then appears in the thread list.
++  Thoughts on additional options for this are welcome.  Things such as
++  "has BKL" and "Preempted" come to mind.  I think we could have a flag
++  word that could enable different bits of info here.
++
++- We now honor, sort of, the C and S commands.  These are continue and
++  single set after delivering a signal.  We ignore the signal and do the
++  requested action.  This only happens when we told gdb that a signal
++  was the reason for entry, which is only done on memory faults.  The
++  result is that you can now continue into the Oops.
++
++- We changed the -g to -gdwarf-2.  This seems to be the same as -ggdb,
++  but it is more exact on what language to use.
++
++- We added two dwarf2 include files and a bit of code at the end of
++  entry.S.  This does not yet work, so it is disabled.  Still we want to
++  keep track of the code and "maybe" someone out there can fix it.
++
++- Randy Dunlap sent some fix ups for this file which are now merged.
++
++- Hugh Dickins sent a fix to a bit of code in traps.c that prevents a
++  compiler warning if CONFIG_KGDB is off (now who would do that :).
++
++- Andrew Morton sent a fix for the serial driver which is now merged.
++
++- Andrew also sent a change to the stub around the cpu managment code
++  which is also merged.
++
++- Andrew also sent a patch to make "f" as well as "g" work as SysRq
++  commands to enter kgdb, merged.
++
++- If CONFIG_KGDB and CONFIG_DEBUG_SPINLOCKS are both set we added a
++  "who" field to the spinlock data struct.  This is filled with
++  "current" when ever the spinlock suceeds.  Useful if you want to know
++  who has the lock.
++
++_ And last, but not least, we fixed the "get_cu" macro to properly get
++  the current value of "current".
++
++New features:
++============
++20030505.1827.27
++We are starting to align with the sourceforge version, at least in
++commands.  To this end, the boot command string to start kgdb at
++boot time has been changed from "kgdb" to "gdb".
++
++Andrew Morton sent a couple of patches which are now included as follows:
++1.) We now return a flag to the interrupt handler.
++2.) We no longer use smp_num_cpus (a conflict with the lock meter).
++3.) And from William Lee Irwin III <wli@holomorphy.com> code to make
++    sure high-mem is set up before we attempt to register our interrupt
++    handler.
++We now include asm/kgdb.h from config.h so you will most likely never
++have to include it.  It also 'NULLS' the kgdb macros you might have in
++your code when CONFIG_KGDB is not defined.  This allows you to just
++turn off CONFIG_KGDB to turn off all the kgdb_ts() calls and such.
++This include is conditioned on the machine being an x86 so as to not
++mess with other archs.
++
++20020801.1129.03
++This is currently the version for the 2.4.18 (and beyond?) kernel.
++
++We have several new "features" beginning with this version:
++
++1.) Kgdb now syncs the "other" CPUs with a cross-CPU NMI.  No more
++    waiting and it will pull that guy out of an IRQ off spin lock :)
++
++2.) We doctored up the code that tells where a task is waiting and
++    included it so that the "info thread" command will show a bit more
++    than "schedule()".  Try it...
++
++3.) Added the ability to call a function from gdb.  All the standard gdb
++    issues apply, i.e. if you hit a breakpoint in the function, you are
++    not allowed to call another (gdb limitation, not kgdb).  To help
++    this capability we added a memory allocation function.  Gdb does not
++    return this memory (it is used for strings that you pass to that function
++    you are calling from gdb) so we fixed up a way to allow you to
++    manually return the memory (see below).
++
++4.) Kgdb time stamps (kgdb_ts()) are enhanced to expand what was the
++    interrupt flag to now also include the preemption count and the
++    "in_interrupt" info.  The flag is now called "with_pif" to indicate
++    the order, preempt_count, in_interrupt, flag.  The preempt_count is
++    shifted left by 4 bits so you can read the count in hex by dropping
++    the low order digit.  In_interrupt is in bit 1, and the flag is in
++    bit 0.
++
++5.) The command: "p kgdb_info" is now expanded and prints something
++    like:
++(gdb) p kgdb_info
++$2 = {used_malloc = 0, called_from = 0xc0107506, entry_tsc = 67468627259,
++  errcode = 0, vector = 3, print_debug_info = 0, hold_on_sstep = 1,
++  cpus_waiting = {{task = 0xc027a000, pid = 32768, hold = 0,
++      regs = 0xc027bf84}, {task = 0x0, pid = 0, hold = 0, regs = 0x0}}}
++
++    Things to note here: a.) used_malloc is the amount of memory that
++    has been malloc'ed to do calls from gdb.  You can reclaim this
++    memory like this: "p kgdb_info.used_malloc=0" Cool, huh?  b.)
++    cpus_waiting is now "sized" by the number of CPUs you enter at
++    configure time in the kgdb configure section.  This is NOT used
++    anywhere else in the system, but it is "nice" here.  c.)  The task's
++    "pid" is now in the structure.  This is the pid you will need to use
++    to decode to the thread id to get gdb to look at that thread.
++    Remember that the "info thread" command prints a list of threads
++    wherein it numbers each thread with its reference number followed
++    by the thread's pid.  Note that the per-CPU idle threads actually
++    have pids of 0 (yes, there is more than one pid 0 in an SMP system).
++    To avoid confusion, kgdb numbers these threads with numbers beyond
++    the MAX_PID.  That is why you see 32768 and above.
++
++6.) A subtle change, we now provide the complete register set for tasks
++    that are active on the other CPUs.  This allows better trace back on
++    those tasks.
++
++    And, let's mention what we could not fix.  Back-trace from all but the
++    thread that we trapped will, most likely, have a bogus entry in it.
++    The problem is that gdb does not recognize the entry code for
++    functions that use "current" near (at all?) the entry.  The compiler
++    is putting the "current" decode as the first two instructions of the
++    function where gdb expects to find %ebp changing code.  Back trace
++    also has trouble with interrupt frames.  I am talking with Daniel
++    Jacobowitz about some way to fix this, but don't hold your breath.
++
++20011220.0050.35
++Major enhancement with this version is the ability to hold one or more
++CPUs in an SMP system while allowing the others to continue.  Also, by
++default only the current CPU is enabled on single-step commands (please
++note that gdb issues single-step commands at times other than when you
++use the si command).
++
++Another change is to collect some useful information in
++a global structure called "kgdb_info".  You should be able to just:
++
++p kgdb_info
++
++although I have seen cases where the first time this is done gdb just
++prints the first member but prints the whole structure if you then enter
++CR (carriage return or enter).  This also works:
++
++p *&kgdb_info
++
++Here is a sample:
++(gdb) p kgdb_info
++$4 = {called_from = 0xc010732c, entry_tsc = 32804123790856, errcode = 0,
++  vector = 3, print_debug_info = 0}
++
++"Called_from" is the return address from the current entry into kgdb.
++Sometimes it is useful to know why you are in kgdb, for example, was
++it an NMI or a real breakpoint?  The simple way to interrogate this
++return address is:
++
++l *0xc010732c
++
++which will print the surrounding few lines of source code.
++
++"Entry_tsc" is the CPU TSC on entry to kgdb (useful to compare to the
++kgdb_ts entries).
++
++"errcode" and "vector" are other entry parameters which may be helpful on
++some traps.
++
++"print_debug_info" is the internal debugging kgdb print enable flag.  Yes,
++you can modify it.
++
++In SMP systems kgdb_info also includes the "cpus_waiting" structure and
++"hold_on_step":
++
++(gdb) p kgdb_info
++$7 = {called_from = 0xc0112739, entry_tsc = 1034936624074, errcode = 0,
++  vector = 2, print_debug_info = 0, hold_on_sstep = 1, cpus_waiting = {{
++      task = 0x0, hold = 0, regs = 0x0}, {task = 0xc71b8000, hold = 0,
++      regs = 0xc71b9f70}, {task = 0x0, hold = 0, regs = 0x0}, {task = 0x0,
++      hold = 0, regs = 0x0}, {task = 0x0, hold = 0, regs = 0x0}, {task = 0x0,
++      hold = 0, regs = 0x0}, {task = 0x0, hold = 0, regs = 0x0}, {task = 0x0,
++      hold = 0, regs = 0x0}}}
++
++"Cpus_waiting" has an entry for each CPU other than the current one that
++has been stopped.  Each entry contains the task_struct address for that
++CPU, the address of the regs for that task and a hold flag.  All these
++have the proper typing so that, for example:
++
++p *kgdb_info.cpus_waiting[1].regs
++
++will print the registers for CPU 1.
++
++"Hold_on_sstep" is a new feature with this version and comes up set or
++true.  What this means is that whenever kgdb is asked to single-step all
++other CPUs are held (i.e. not allowed to execute).  The flag applies to
++all but the current CPU and, again, can be changed:
++
++p kgdb_info.hold_on_sstep=0
++
++restores the old behavior of letting all CPUs run during single-stepping.
++
++Likewise, each CPU has a "hold" flag, which if set, locks that CPU out
++of execution.  Note that this has some risk in cases where the CPUs need
++to communicate with each other.  If kgdb finds no CPU available on exit,
++it will push a message thru gdb and stay in kgdb.  Note that it is legal
++to hold the current CPU as long as at least one CPU can execute.
++
++20010621.1117.09
++This version implements an event queue.  Events are signaled by calling
++a function in the kgdb stub and may be examined from gdb.  See EVENTS
++below for details.  This version also tightens up the interrupt and SMP
++handling to not allow interrupts on the way to kgdb from a breakpoint
++trap.  It is fine to allow these interrupts for user code, but not
++system debugging.
++
++Version
++=======
++
++This version of the kgdb package was developed and tested on
++kernel version 2.4.16.  It will not install on any earlier kernels.
++It is possible that it will continue to work on later versions
++of 2.4 and then versions of 2.5 (I hope).
++
++
++Debugging Setup
++===============
++
++Designate one machine as the "development" machine.  This is the
++machine on which you run your compiles and which has your source
++code for the kernel.  Designate a second machine as the "target"
++machine.  This is the machine that will run your experimental
++kernel.
++
++The two machines will be connected together via a serial line out
++one or the other of the COM ports of the PC.  You will need the
++appropriate modem eliminator (null modem) cable(s) for this.
++
++Decide on which tty port you want the machines to communicate, then
++connect them up back-to-back using the null modem cable.  COM1 is
++/dev/ttyS0 and COM2 is /dev/ttyS1. You should test this connection
++with the two machines prior to trying to debug a kernel.  Once you
++have it working, on the TARGET machine, enter:
++
++setserial /dev/ttyS0 (or what ever tty you are using)
++
++and record the port address and the IRQ number.
++
++On the DEVELOPMENT machine you need to apply the patch for the kgdb
++hooks.  You have probably already done that if you are reading this
++file.
++
++On your DEVELOPMENT machine, go to your kernel source directory and do
++"make Xconfig" where X is one of "x", "menu", or "".  If you are
++configuring in the standard serial driver, it must not be a module.
++Either yes or no is ok, but making the serial driver a module means it
++will initialize after kgdb has set up the UART interrupt code and may
++cause a failure of the control-C option discussed below.  The configure
++question for the serial driver is under the "Character devices" heading
++and is:
++
++"Standard/generic (8250/16550 and compatible UARTs) serial support"
++
++Go down to the kernel debugging menu item and open it up.  Enable the
++kernel kgdb stub code by selecting that item.  You can also choose to
++turn on the "-ggdb -O1" compile options.  The -ggdb causes the compiler
++to put more debug info (like local symbols) in the object file.  On the
++i386 -g and -ggdb are the same so this option just reduces to "O1".  The
++-O1 reduces the optimization level.  This may be helpful in some cases,
++be aware, however, that this may also mask the problem you are looking
++for.
++
++The baud rate.  Default is 115200.  What ever you choose be sure that
++the host machine is set to the same speed.  I recommend the default.
++
++The port.  This is the I/O address of the serial UART that you should
++have gotten using setserial as described above.  The standard COM1 port
++(3f8) using IRQ 4 is default.  COM2 is 2f8 which by convention uses IRQ
++3.
++
++The port IRQ (see above).
++
++Stack overflow test.  This option makes a minor change in the trap,
++system call and interrupt code to detect stack overflow and transfer
++control to kgdb if it happens.  (Some platforms have this in the
++baseline code, but the i386 does not.)
++
++You can also configure the system to recognize the boot option
++"console=kgdb" which if given will cause all console output during
++booting to be put thru gdb as well as other consoles.  This option
++requires that gdb and kgdb be connected prior to sending console output
++so, if they are not, a breakpoint is executed to force the connection.
++This will happen before any kernel output (it is going thru gdb, right),
++and will stall the boot until the connection is made.
++
++You can also configure in a patch to SysRq to enable the kGdb SysRq.
++This request generates a breakpoint.  Since the serial port IRQ line is
++set up after any serial drivers, it is possible that this command will
++work when the control-C will not.
++
++Save and exit the Xconfig program.  Then do "make clean" , "make dep"
++and "make bzImage" (or whatever target you want to make).  This gets the
++kernel compiled with the "-g" option set -- necessary for debugging.
++
++You have just built the kernel on your DEVELOPMENT machine that you
++intend to run on your TARGET machine.
++
++To install this new kernel, use the following installation procedure.
++Remember, you are on the DEVELOPMENT machine patching the kernel source
++for the kernel that you intend to run on the TARGET machine.
++
++Copy this kernel to your target machine using your usual procedures.  I
++usually arrange to copy development:
++/usr/src/linux/arch/i386/boot/bzImage to /vmlinuz on the TARGET machine
++via a LAN based NFS access.  That is, I run the cp command on the target
++and copy from the development machine via the LAN.  Run Lilo (see "man
++lilo" for details on how to set this up) on the new kernel on the target
++machine so that it will boot!  Then boot the kernel on the target
++machine.
++
++On the DEVELOPMENT machine, create a file called .gdbinit in the
++directory /usr/src/linux.  An example .gdbinit file looks like this:
++
++shell echo -e "\003" >/dev/ttyS0
++set remotebaud 38400 (or what ever speed you have chosen)
++target remote /dev/ttyS0
++
++
++Change the "echo" and "target" definition so that it specifies the tty
++port that you intend to use.  Change the "remotebaud" definition to
++match the data rate that you are going to use for the com line.
++
++You are now ready to try it out.
++
++Boot your target machine with "kgdb" in the boot command i.e. something
++like:
++
++lilo> test kgdb
++
++or if you also want console output thru gdb:
++
++lilo> test kgdb console=kgdb
++
++You should see the lilo message saying it has loaded the kernel and then
++all output stops.  The kgdb stub is trying to connect with gdb.  Start
++gdb something like this:
++
++
++On your DEVELOPMENT machine, cd /usr/src/linux and enter "gdb vmlinux".
++When gdb gets the symbols loaded it will read your .gdbinit file and, if
++everything is working correctly, you should see gdb print out a few
++lines indicating that a breakpoint has been taken.  It will actually
++show a line of code in the target kernel inside the kgdb activation
++code.
++
++The gdb interaction should look something like this:
++
++    linux-dev:/usr/src/linux# gdb vmlinux
++    GDB is free software and you are welcome to distribute copies of it
++     under certain conditions; type "show copying" to see the conditions.
++    There is absolutely no warranty for GDB; type "show warranty" for details.
++    GDB 4.15.1 (i486-slackware-linux),
++    Copyright 1995 Free Software Foundation, Inc...
++    breakpoint () at i386-stub.c:750
++    750     }
++    (gdb)
++
++You can now use whatever gdb commands you like to set breakpoints.
++Enter "continue" to start your target machine executing again.  At this
++point the target system will run at full speed until it encounters
++your breakpoint or gets a segment violation in the kernel, or whatever.
++
++If you have the kgdb console enabled when you continue, gdb will print
++out all the console messages.
++
++The above example caused a breakpoint relatively early in the boot
++process.  For the i386 kgdb it is possible to code a break instruction
++as the first C-language point in init/main.c, i.e. as the first instruction
++in start_kernel().  This could be done as follows:
++
++#include <asm/kgdb.h>
++	 breakpoint();
++
++This breakpoint() is really a function that sets up the breakpoint and
++single-step hardware trap cells and then executes a breakpoint.  Any
++early hard coded breakpoint will need to use this function.  Once the
++trap cells are set up they need not be set again, but doing it again
++does not hurt anything, so you don't need to be concerned about which
++breakpoint is hit first.  Once the trap cells are set up (and the kernel
++sets them up in due course even if breakpoint() is never called) the
++macro:
++
++BREAKPOINT;
++
++will generate an inline breakpoint.  This may be more useful as it stops
++the processor at the instruction instead of in a function a step removed
++from the location of interest.  In either case <asm/kgdb.h> must be
++included to define both breakpoint() and BREAKPOINT.
++
++Triggering kgdbstub at other times
++==================================
++
++Often you don't need to enter the debugger until much later in the boot
++or even after the machine has been running for some time.  Once the
++kernel is booted and interrupts are on, you can force the system to
++enter the debugger by sending a control-C to the debug port. This is
++what the first line of the recommended .gdbinit file does.  This allows
++you to start gdb any time after the system is up as well as when the
++system is already at a breakpoint.  (In the case where the system is
++already at a breakpoint the control-C is not needed, however, it will
++be ignored by the target so no harm is done.  Also note the the echo
++command assumes that the port speed is already set.  This will be true
++once gdb has connected, but it is best to set the port speed before you
++run gdb.)
++
++Another simple way to do this is to put the following file in you ~/bin
++directory:
++
++#!/bin/bash
++echo  -e "\003"  > /dev/ttyS0
++
++Here, the ttyS0 should be replaced with what ever port you are using.
++The "\003" is control-C.  Once you are connected with gdb, you can enter
++control-C at the command prompt.
++
++An alternative way to get control to the debugger is to enable the kGdb
++SysRq command.  Then you would enter Alt-SysRq-g (all three keys at the
++same time, but push them down in the order given).  To refresh your
++memory of the available SysRq commands try Alt-SysRq-=.  Actually any
++undefined command could replace the "=", but I like to KNOW that what I
++am pushing will never be defined.
++
++Debugging hints
++===============
++
++You can break into the target machine at any time from the development
++machine by typing ^C (see above paragraph).  If the target machine has
++interrupts enabled this will stop it in the kernel and enter the
++debugger.
++
++There is unfortunately no way of breaking into the kernel if it is
++in a loop with interrupts disabled, so if this happens to you then
++you need to place exploratory breakpoints or printk's into the kernel
++to find out where it is looping.  The exploratory breakpoints can be
++entered either thru gdb or hard coded into the source.  This is very
++handy if you do something like:
++
++if (<it hurts>) BREAKPOINT;
++
++
++There is a copy of an e-mail in the Documentation/i386/kgdb/ directory
++(debug-nmi.txt) which describes how to create an NMI on an ISA bus
++machine using a paper clip.  I have a sophisticated version of this made
++by wiring a push button switch into a PC104/ISA bus adapter card.  The
++adapter card nicely furnishes wire wrap pins for all the ISA bus
++signals.
++
++When you are done debugging the kernel on the target machine it is a
++good idea to leave it in a running state.  This makes reboots faster,
++bypassing the fsck.  So do a gdb "continue" as the last gdb command if
++this is possible.  To terminate gdb itself on the development machine
++and leave the target machine running, first clear all breakpoints and
++continue, then type ^Z to suspend gdb and then kill it with "kill %1" or
++something similar.
++
++If gdbstub Does Not Work
++========================
++
++If it doesn't work, you will have to troubleshoot it.  Do the easy
++things first like double checking your cabling and data rates.  You
++might try some non-kernel based programs to see if the back-to-back
++connection works properly.  Just something simple like cat /etc/hosts
++>/dev/ttyS0 on one machine and cat /dev/ttyS0 on the other will tell you
++if you can send data from one machine to the other.  Make sure it works
++in both directions.  There is no point in tearing out your hair in the
++kernel if the line doesn't work.
++
++All of the real action takes place in the file
++/usr/src/linux/arch/i386/kernel/kgdb_stub.c.  That is the code on the target
++machine that interacts with gdb on the development machine.  In gdb you can
++turn on a debug switch with the following command:
++
++	set remotedebug
++
++This will print out the protocol messages that gdb is exchanging with
++the target machine.
++
++Another place to look is /usr/src/arch/i386/lib/kgdb_serial.c. This is
++the code that talks to the serial port on the target side.  There might
++be a problem there.  In particular there is a section of this code that
++tests the UART which will tell you what UART you have if you define
++"PRNT" (just remove "_off" from the #define PRNT_off).  To view this
++report you will need to boot the system without any beakpoints.  This
++allows the kernel to run to the point where it calls kgdb to set up
++interrupts.  At this time kgdb will test the UART and print out the type
++it finds.  (You need to wait so that the printks are actually being
++printed.  Early in the boot they are cached, waiting for the console to
++be enabled.  Also, if kgdb is entered thru a breakpoint it is possible
++to cause a dead lock by calling printk when the console is locked.  The
++stub thus avoids doing printks from breakpoints, especially in the
++serial code.)  At this time, if the UART fails to do the expected thing,
++kgdb will print out (using printk) information on what failed.  (These
++messages will be buried in all the other boot up messages.  Look for
++lines that start with "gdb_hook_interrupt:".  You may want to use dmesg
++once the system is up to view the log.  If this fails or if you still
++don't connect, review your answers for the port address.  Use:
++
++setserial /dev/ttyS0
++
++to get the current port and IRQ information.  This command will also
++tell you what the system found for the UART type. The stub recognizes
++the following UART types:
++
++16450, 16550, and 16550A
++
++If you are really desperate you can use printk debugging in the
++kgdbstub code in the target kernel until you get it working.  In particular,
++there is a global variable in /usr/src/linux/arch/i386/kernel/kgdb_stub.c
++named "remote_debug".  Compile your kernel with this set to 1, rather
++than 0 and the debug stub will print out lots of stuff as it does
++what it does.  Likewise there are debug printks in the kgdb_serial.c
++code that can be turned on with simple changes in the macro defines.
++
++
++Debugging Loadable Modules
++==========================
++
++This technique comes courtesy of Edouard Parmelan
++<Edouard.Parmelan@quadratec.fr>
++
++When you run gdb, enter the command
++
++source gdbinit-modules
++
++This will read in a file of gdb macros that was installed in your
++kernel source directory when kgdb was installed.  This file implements
++the following commands:
++
++mod-list
++    Lists the loaded modules in the form <module-address> <module-name>
++
++mod-print-symbols <module-address>
++    Prints all the symbols in the indicated module.
++
++mod-add-symbols <module-address> <object-file-path-name>
++    Loads the symbols from the object file and associates them
++    with the indicated module.
++
++After you have loaded the module that you want to debug, use the command
++mod-list to find the <module-address> of your module.  Then use that
++address in the mod-add-symbols command to load your module's symbols.
++From that point onward you can debug your module as if it were a part
++of the kernel.
++
++The file gdbinit-modules also contains a command named mod-add-lis as
++an example of how to construct a command of your own to load your
++favorite module.  The idea is to "can" the pathname of the module
++in the command so you don't have to type so much.
++
++Threads
++=======
++
++Each process in a target machine is seen as a gdb thread. gdb thread
++related commands (info threads, thread n) can be used.
++
++ia-32 hardware breakpoints
++==========================
++
++kgdb stub contains support for hardware breakpoints using debugging features
++of ia-32(x86) processors. These breakpoints do not need code modification.
++They use debugging registers. 4 hardware breakpoints are available in ia-32
++processors.
++
++Each hardware breakpoint can be of one of the following three types.
++
++1. Execution breakpoint - An Execution breakpoint is triggered when code
++	at the breakpoint address is executed.
++
++	As limited number of hardware breakpoints are available, it is
++	advisable to use software breakpoints ( break command ) instead
++	of execution hardware breakpoints, unless modification of code
++	is to be avoided.
++
++2. Write breakpoint - A write breakpoint is triggered when memory
++	location at the breakpoint address is written.
++
++	A write or can be placed for data of variable length. Length of
++	a write breakpoint indicates length of the datatype to be
++	watched. Length is 1 for 1 byte data , 2 for 2 byte data, 3 for
++	4 byte data.
++
++3. Access breakpoint - An access breakpoint is triggered when memory
++	location at the breakpoint address is either read or written.
++
++	Access breakpoints also have lengths similar to write breakpoints.
++
++IO breakpoints in ia-32 are not supported.
++
++Since gdb stub at present does not use the protocol used by gdb for hardware
++breakpoints, hardware breakpoints are accessed through gdb macros. gdb macros
++for hardware breakpoints are described below.
++
++hwebrk	- Places an execution breakpoint
++	hwebrk breakpointno address
++hwwbrk	- Places a write breakpoint
++	hwwbrk breakpointno length address
++hwabrk	- Places an access breakpoint
++	hwabrk breakpointno length address
++hwrmbrk	- Removes a breakpoint
++	hwrmbrk breakpointno
++exinfo	- Tells whether a software or hardware breakpoint has occurred.
++	Prints number of the hardware breakpoint if a hardware breakpoint has
++	occurred.
++
++Arguments required by these commands are as follows
++breakpointno	- 0 to 3
++length		- 1 to 3
++address		- Memory location in hex digits ( without 0x ) e.g c015e9bc
++
++SMP support
++==========
++
++When a breakpoint occurs or user issues a break ( Ctrl + C ) to gdb
++client, all the processors are forced to enter the debugger. Current
++thread corresponds to the thread running on the processor where
++breakpoint occurred.  Threads running on other processor(s) appear
++similar to other non-running threads in the 'info threads' output.
++Within the kgdb stub there is a structure "waiting_cpus" in which kgdb
++records the values of "current" and "regs" for each CPU other than the
++one that hit the breakpoint.  "current" is a pointer to the task
++structure for the task that CPU is running, while "regs" points to the
++saved registers for the task.  This structure can be examined with the
++gdb "p" command.
++
++ia-32 hardware debugging registers on all processors are set to same
++values.  Hence any hardware breakpoints may occur on any processor.
++
++gdb troubleshooting
++===================
++
++1. gdb hangs
++Kill it. restart gdb. Connect to target machine.
++
++2. gdb cannot connect to target machine (after killing a gdb and
++restarting another) If the target machine was not inside debugger when
++you killed gdb, gdb cannot connect because the target machine won't
++respond.  In this case echo "Ctrl+C"(ASCII 3) to the serial line.
++e.g. echo -e "\003" > /dev/ttyS1
++This forces that target machine into the debugger, after which you
++can connect.
++
++3. gdb cannot connect even after echoing Ctrl+C into serial line
++Try changing serial line settings min to 1 and time to 0
++e.g. stty min 1 time 0 < /dev/ttyS1
++Try echoing again
++
++Check serial line speed and set it to correct value if required
++e.g. stty ispeed 115200 ospeed 115200 < /dev/ttyS1
++
++EVENTS
++======
++
++Ever want to know the order of things happening?  Which CPU did what and
++when?  How did the spinlock get the way it is?  Then events are for
++you.  Events are defined by calls to an event collection interface and
++saved for later examination.  In this case, kgdb events are saved by a
++very fast bit of code in kgdb which is fully SMP and interrupt protected
++and they are examined by using gdb to display them.  Kgdb keeps only
++the last N events, where N must be a power of two and is defined at
++configure time.
++
++
++Events are signaled to kgdb by calling:
++
++kgdb_ts(data0,data1)
++
++For each call kgdb records each call in an array along with other info.
++Here is the array definition:
++
++struct kgdb_and_then_struct {
++#ifdef CONFIG_SMP
++	int	on_cpu;
++#endif
++	long long at_time;
++	int  	from_ln;
++	char	* in_src;
++	void	*from;
++        int     with_if;
++	int	data0;
++	int	data1;
++};
++
++For SMP machines the CPU is recorded, for all machines the TSC is
++recorded (gets a time stamp) as well as the line number and source file
++the call was made from.  The address of the (from), the "if" (interrupt
++flag) and the two data items are also recorded.  The macro kgdb_ts casts
++the types to int, so you can put any 32-bit values here.  There is a
++configure option to select the number of events you want to keep.  A
++nice number might be 128, but you can keep up to 1024 if you want.  The
++number must be a power of two.  An "andthen" macro library is provided
++for gdb to help you look at these events.  It is also possible to define
++a different structure for the event storage and cast the data to this
++structure.  For example the following structure is defined in kgdb:
++
++struct kgdb_and_then_struct2 {
++#ifdef CONFIG_SMP
++	int	on_cpu;
++#endif
++	long long at_time;
++	int  	from_ln;
++	char	* in_src;
++	void	*from;
++        int     with_if;
++	struct task_struct *t1;
++	struct task_struct *t2;
++};
++
++If you use this for display, the data elements will be displayed as
++pointers to task_struct entries.  You may want to define your own
++structure to use in casting.  You should only change the last two items
++and you must keep the structure size the same.  Kgdb will handle these
++as 32-bit ints, but within that constraint you can define a structure to
++cast to any 32-bit quantity.  This need only be available to gdb and is
++only used for casting in the display code.
++
++Final Items
++===========
++
++I picked up this code from Amit S. Kale and enhanced it.
++
++If you make some really cool modification to this stuff, or if you
++fix a bug, please let me know.
++
++George Anzinger
++<george@mvista.com>
++
++Amit S. Kale
++<akale@veritas.com>
++
++(First kgdb by David Grothe <dave@gcom.com>)
++
++(modified by Tigran Aivazian <tigran@sco.com>)
++    Putting gdbstub into the kernel config menu.
++
++(modified by Scott Foehner <sfoehner@engr.sgi.com>)
++    Hooks for entering gdbstub at boot time.
++
++(modified by Amit S. Kale <akale@veritas.com>)
++    Threads, ia-32 hw debugging, mp support, console support,
++    nmi watchdog handling.
++
++(modified by George Anzinger <george@mvista.com>)
++    Extended threads to include the idle threads.
++    Enhancements to allow breakpoint() at first C code.
++    Use of module_init() and __setup() to automate the configure.
++    Enhanced the cpu "collection" code to work in early bring-up.
++    Added ability to call functions from gdb
++    Print info thread stuff without going back to schedule()
++    Now collect the "other" cpus with an IPI/ NMI.
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/i386/kgdb/loadmodule.sh	2003-10-05 00:33:38.000000000 -0700
+@@ -0,0 +1,78 @@
++#/bin/sh
++# This script loads a module on a target machine and generates a gdb script.
++# source generated gdb script to load the module file at appropriate addresses
++# in gdb.
++#
++# Usage:
++# Loading the module on target machine and generating gdb script)
++#	[foo]$ loadmodule.sh <modulename>
++#
++# Loading the module file into gdb
++#	(gdb) source <gdbscriptpath>
++#
++# Modify following variables according to your setup.
++#	TESTMACHINE - Name of the target machine
++#	GDBSCRIPTS - The directory where a gdb script will be generated
++#
++# Author: Amit S. Kale (akale@veritas.com).
++#
++# If you run into problems, please check files pointed to by following
++# variables.
++#	ERRFILE - /tmp/<modulename>.errs contains stderr output of insmod
++#	MAPFILE - /tmp/<modulename>.map contains stdout output of insmod
++#	GDBSCRIPT - $GDBSCRIPTS/load<modulename> gdb script.
++
++TESTMACHINE=foo
++GDBSCRIPTS=/home/bar
++
++if [ $# -lt 1 ] ; then {
++	echo Usage: $0 modulefile
++	exit
++} ; fi
++
++MODULEFILE=$1
++MODULEFILEBASENAME=`basename $1`
++
++if [ $MODULEFILE = $MODULEFILEBASENAME ] ; then {
++	MODULEFILE=`pwd`/$MODULEFILE
++} fi
++
++ERRFILE=/tmp/$MODULEFILEBASENAME.errs
++MAPFILE=/tmp/$MODULEFILEBASENAME.map
++GDBSCRIPT=$GDBSCRIPTS/load$MODULEFILEBASENAME
++
++function findaddr() {
++	local ADDR=0x$(echo "$SEGMENTS" | \
++		grep "$1" | sed 's/^[^ ]*[ ]*[^ ]*[ ]*//' | \
++		sed 's/[ ]*[^ ]*$//')
++	echo $ADDR
++}
++
++function checkerrs() {
++	if [ "`cat $ERRFILE`" != "" ] ; then {
++		cat $ERRFILE
++		exit
++	} fi
++}
++
++#load the module
++echo Copying $MODULEFILE to $TESTMACHINE
++rcp $MODULEFILE root@${TESTMACHINE}:
++
++echo Loading module $MODULEFILE
++rsh -l root $TESTMACHINE  /sbin/insmod -m ./`basename $MODULEFILE` \
++	> $MAPFILE 2> $ERRFILE
++checkerrs
++
++SEGMENTS=`head -n 11 $MAPFILE | tail -n 10`
++TEXTADDR=$(findaddr "\\.text[^.]")
++LOADSTRING="add-symbol-file $MODULEFILE $TEXTADDR"
++SEGADDRS=`echo "$SEGMENTS" | awk '//{
++	if ($1 != ".text" && $1 != ".this" &&
++	    $1 != ".kstrtab" && $1 != ".kmodtab") {
++		print " -s " $1 " 0x" $3 " "
++	}
++}'`
++LOADSTRING="$LOADSTRING $SEGADDRS"
++echo Generating script $GDBSCRIPT
++echo $LOADSTRING > $GDBSCRIPT
+--- linux-2.6.0-test6/Documentation/ioctl-number.txt	2003-09-08 13:58:55.000000000 -0700
++++ 25/Documentation/ioctl-number.txt	2003-10-05 00:33:23.000000000 -0700
+@@ -175,10 +175,6 @@ Code	Seq#	Include File		Comments
+ 					<mailto:buk@buks.ipn.de>
+ 0xA0	all	linux/sdp/sdp.h		Industrial Device Project
+ 					<mailto:kenji@bitgate.com>
+-0xA2    00-0F   DVD decoder driver      in development:
+-                                        <http://linuxtv.org/developer/dvdapi.html>
+-0xA3	00-1F	Philips SAA7146 dirver	in development:
+-					<mailto:Andreas.Beckmann@hamburg.sc.philips.com>
+ 0xA3	80-8F	Port ACL		in development:
+ 					<mailto:tlewis@mindspring.com>
+ 0xA3	90-9F	linux/dtlk.h
+--- linux-2.6.0-test6/Documentation/iostats.txt	2003-06-14 12:18:06.000000000 -0700
++++ 25/Documentation/iostats.txt	2003-10-05 00:33:23.000000000 -0700
+@@ -1,22 +1,22 @@
+ I/O statistics fields
+ ---------------
+ 
+-Last modified 5/15/03
++Last modified Sep 30, 2003
+ 
+-In 2.4.20 (and some versions before, with patches), and 2.5.45,
+-more extensive disk statistics were introduced to help measure disk
++Since 2.4.20 (and some versions before, with patches), and 2.5.45,
++more extensive disk statistics have been introduced to help measure disk
+ activity. Tools such as sar and iostat typically interpret these and do
+ the work for you, but in case you are interested in creating your own
+ tools, the fields are explained here.
+ 
+-In most versions of the 2.4 patch, the information is found as additional
+-fields in /proc/partitions.  In 2.5, the same information is found in
+-two places: one is in the file /proc/diskstats (appears in 2.5.69 and
+-beyond), and the other is within the sysfs file system, which must be
+-mounted in order to obtain the information. Throughout this document
+-we'll assume that sysfs is mounted on /sys, although of course it may
+-be mounted anywhere.  In 2.5, both /proc/diskstats and sysfs use the
+-same source for the information and so should not differ.
++In 2.4 now, the information is found as additional fields in
++/proc/partitions.  In 2.6, the same information is found in two
++places: one is in the file /proc/diskstats, and the other is within
++the sysfs file system, which must be mounted in order to obtain
++the information. Throughout this document we'll assume that sysfs
++is mounted on /sys, although of course it may be mounted anywhere.
++Both /proc/diskstats and sysfs use the same source for the information
++and so should not differ.
+ 
+ Here are examples of these different formats:
+ 
+@@ -25,15 +25,15 @@ Here are examples of these different for
+    3     1    9221278 hda1 35486 0 35496 38030 0 0 0 0 0 38030 38030
+ 
+ 
+-2.5 sysfs:
++2.6 sysfs:
+    446216 784926 9550688 4382310 424847 312726 5922052 19310380 0 3376340 23705160
+    35486    38030    38030    38030
+ 
+-2.5 diskstats:
++2.6 diskstats:
+    3    0   hda 446216 784926 9550688 4382310 424847 312726 5922052 19310380 0 3376340 23705160
+    3    1   hda1 35486 38030 38030 38030
+ 
+-On 2.4 you might execute "grep 'hda ' /proc/partitions". On 2.5, you have
++On 2.4 you might execute "grep 'hda ' /proc/partitions". On 2.6, you have
+ a choice of "cat /sys/block/hda/stat" or "grep 'hda ' /proc/diskstats".
+ The advantage of one over the other is that the sysfs choice works well
+ if you are watching a known, small set of disks.  /proc/diskstats may
+@@ -43,7 +43,7 @@ each snapshot of your disk statistics.
+ 
+ In 2.4, the statistics fields are those after the device name. In
+ the above example, the first field of statistics would be 446216.
+-By contrast, in 2.5 if you look at /sys/block/hda/stat, you'll
++By contrast, in 2.6 if you look at /sys/block/hda/stat, you'll
+ find just the eleven fields, beginning with 446216.  If you look at
+ /proc/diskstats, the eleven fields will be preceded by the major and
+ minor device numbers, and device name.  Each of these formats provide
+@@ -93,35 +93,35 @@ Field 11 -- weighted # of milliseconds s
+ To avoid introducing performance bottlenecks, no locks are held while
+ modifying these counters.  This implies that minor inaccuracies may be
+ introduced when changes collide, so (for instance) adding up all the
+-read I/Os issued per partition should equal those made to the disks
+-... but due to the lack of locking it may only be very close.
++read I/Os issued per partition should equal those made to the disks ...
++but due to the lack of locking it may only be very close.
+ 
+-In release 2.5.65 the 2.5 counters were made per-cpu, which made the lack
+-of locking almost a non-issue.  When the statistics are read, the per-cpu
+-counters are summed (possibly overflowing the unsigned 32-bit variable
+-they are summed to) and the result given to the user.  There is no
+-convenient user interface for accessing the per-cpu counters themselves.
++In 2.6, there are counters for each cpu, which made the lack of locking
++almost a non-issue.  When the statistics are read, the per-cpu counters
++are summed (possibly overflowing the unsigned 32-bit variable they are
++summed to) and the result given to the user.  There is no convenient
++user interface for accessing the per-cpu counters themselves.
+ 
+ Disks vs Partitions
+ -------------------
+ 
+-There were significant changes between 2.4 and 2.5 in the I/O subsystem.
++There were significant changes between 2.4 and 2.6 in the I/O subsystem.
+ As a result, some statistic information disappeared. The translation from
+ a disk address relative to a partition to the disk address relative to
+ the host disk happens much earlier.  All merges and timings now happen
+ at the disk level rather than at both the disk and partition level as
+-in 2.4.  Consequently, you'll see a different statistics output on 2.5 for
++in 2.4.  Consequently, you'll see a different statistics output on 2.6 for
+ partitions from that for disks.  There are only *four* fields available
+-for partitions on 2.5 machines.  This is reflected in the examples above.
++for partitions on 2.6 machines.  This is reflected in the examples above.
+ 
+ Field  1 -- # of reads issued
+     This is the total number of reads issued to this partition.
+ Field  2 -- # of sectors read
+     This is the total number of sectors requested to be read from this
+     partition.
+-Field  3 -- # of reads issued
++Field  3 -- # of writes issued
+     This is the total number of writes issued to this partition.
+-Field  4 -- # of sectors read
++Field  4 -- # of sectors written
+     This is the total number of sectors requested to be written to
+     this partition.
+ 
+@@ -135,14 +135,16 @@ a subtle distinction that is probably un
+ Additional notes
+ ----------------
+ 
+-In 2.5, sysfs is not mounted by default.  Here's the line you'll want
+-to add to your /etc/fstab:
++In 2.6, sysfs is not mounted by default.  If your distribution of
++Linux hasn't added it already, here's the line you'll want to add to
++your /etc/fstab:
+ 
+ none /sys sysfs defaults 0 0
+ 
+ 
+-In 2.5, at the same time that disk statistics appeared in sysfs, they were
+-removed from /proc/stat.  In 2.4, they appear in both /proc/partitions
+-and /proc/stat.
++In 2.6, all disk statistics were removed from /proc/stat.  In 2.4, they
++appear in both /proc/partitions and /proc/stat, although the ones in
++/proc/stat take a very different format from those in /proc/partitions
++(see proc(5), if your system has it.)
+ 
+ -- ricklind@us.ibm.com
+--- linux-2.6.0-test6/Documentation/kernel-parameters.txt	2003-09-27 18:57:43.000000000 -0700
++++ 25/Documentation/kernel-parameters.txt	2003-10-05 00:34:33.000000000 -0700
+@@ -460,6 +460,10 @@ running once the system is up.
+ 	logibm_irq=	[HW,MOUSE] Logitech Bus Mouse Driver
+ 			Format: <irq>
+ 
++	log_buf_len=n	Sets the size of the printk ring buffer, in bytes.
++			Format is n, nk, nM.  n must be a power of two.  The
++			default is set in kernel config.
++
+ 	lp=0		[LP]	Specify parallel ports to use, e.g,
+ 	lp=port[,port...]	lp=none,parport0 (lp0 not configured, lp1 uses
+ 	lp=reset		first parallel port). 'lp=0' disables the
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/MSI-HOWTO.txt	2003-10-05 00:36:20.000000000 -0700
+@@ -0,0 +1,321 @@
++		The MSI Driver Guide HOWTO
++	Tom L Nguyen tom.l.nguyen@intel.com
++			10/03/2003
++
++1. About this guide
++
++This guide describes the basics of Message Signaled Interrupts(MSI), the
++advantages of using MSI over traditional interrupt mechanisms, and how
++to enable your driver to use MSI or MSI-X. Also included is a Frequently
++Asked Questions.
++
++2. Copyright 2003 Intel Corporation
++
++3. What is MSI/MSI-X?
++
++Message Signaled Interrupt (MSI), as described in the PCI Local Bus
++Specification Revision 2.3 or latest, is an optional feature, and a
++required feature for PCI Express devices. MSI enables a device function
++to request service by sending an Inbound Memory Write on its PCI bus to
++the FSB as a Message Signal Interrupt transaction. Because MSI is
++generated in the form of a Memory Write, all transaction conditions,
++such as a Retry, Master-Abort, Target-Abort or normal completion, are
++supported.
++
++A PCI device that supports MSI must also support pin IRQ assertion
++interrupt mechanism to provide backward compatibility for systems that
++do not support MSI. In Systems, which support MSI, the bus driver is
++responsible for initializing the message address and message data of
++the device function's MSI/MSI-X capability structure during device
++initial configuration.
++
++An MSI capable device function indicates MSI support by implementing
++the MSI/MSI-X capability structure in its PCI capability list. The
++device function may implement both the MSI capability structure and
++the MSI-X capability structure; however, the bus driver should not
++enable both, but instead enable only the MSI-X capability structure.
++
++The MSI capability structure contains Message Control register,
++Message Address register and Message Data register. These registers
++provide the bus driver control over MSI. The Message Control register
++indicates the MSI capability supported by the device. The Message
++Address register specifies the target address and the Message Data
++register specifies the characteristics of the message. To request
++service, the device function writes the content of the Message Data
++register to the target address. The device and its software driver
++are prohibited from writing to these registers.
++
++The MSI-X capability structure is an optional extension to MSI. It
++uses an independent and separate capability structure. There are
++some key advantages to implementing the MSI-X capability structure
++over the MSI capability structure as described below.
++
++	- Support a larger maximum number of vectors per function.
++
++	- Provide the ability for system software to configure
++	each vector with an independent message address and message
++	data, specified by a table that resides in Memory Space.
++
++        - MSI and MSI-X both support per-vector masking. Per-vector
++	masking is an optional extension of MSI but a required
++	feature for MSI-X. Per-vector masking provides the kernel
++	the ability to mask/unmask MSI when servicing its software
++	interrupt service routing handler. If per-vector masking is
++	not supported, then the device driver should provide the
++	hardware/software synchronization to ensure that the device
++	generates MSI when the driver wants it to do so.
++
++4. Why use MSI?
++
++As a benefit the simplification of board design, MSI allows board
++designers to remove out of band interrupt routing. MSI is another
++step towards a legacy-free environment.
++
++Due to increasing pressure on chipset and processor packages to
++reduce pin count, the need for interrupt pins is expected to
++diminish over time. Devices, due to pin constraints, may implement
++messages to increase performance.
++
++PCI Express endpoints uses INTx emulation (in-band messages) instead
++of IRQ pin assertion. Using INTx emulation requires interrupt
++sharing among devices connected to the same node (PCI bridge) while
++MSI is unique (non-shared) and does not require BIOS configuration
++support. As a result, the PCI Express technology requires MSI
++support for better interrupt performance.
++
++Using MSI enables the device functions to support two or more
++vectors, which can be configure to target different CPU's to
++increase scalability.
++
++5. Configuring a driver to use MSI/MSI-X
++
++By default, the kernel will not enable MSI/MSI-X on all devices that
++support this capability once the patch is installed. A kernel
++configuration option must be selected to enable MSI/MSI-X support.
++
++5.1 Including MSI support into the kernel
++
++To include MSI support into the kernel requires users to patch the
++VECTOR-base patch first and then the MSI patch because the MSI
++support needs VECTOR based scheme. Once these patches are installed,
++setting CONFIG_PCI_USE_VECTOR enables the VECTOR based scheme and
++the option for MSI-capable device drivers to selectively enable MSI
++(using pci_enable_msi as desribed below).
++
++Since the target of the inbound message is the local APIC, providing
++CONFIG_PCI_USE_VECTOR is dependent on whether CONFIG_X86_LOCAL_APIC
++is enabled or not.
++
++int pci_enable_msi(struct pci_dev *)
++
++With this new API, any existing device driver, which like to have
++MSI enabled on its device function, must call this explicitly. A
++successful call will initialize the MSI/MSI-X capability structure
++with ONE vector, regardless of whether the device function is
++capable of supporting multiple messages. This vector replaces the
++pre-assigned dev->irq with a new MSI vector. To avoid the conflict
++of new assigned vector with existing pre-assigned vector requires
++the device driver to call this API before calling request_irq(...).
++
++The below diagram shows the events, which switches the interrupt
++mode on the MSI-capable device function between MSI mode and
++PIN-IRQ assertion mode.
++
++	 ------------   pci_enable_msi 	 ------------------------
++	|	     | <===============	| 			 |
++	| MSI MODE   |	  	     	| PIN-IRQ ASSERTION MODE |
++	| 	     | ===============>	|			 |
++ 	 ------------	free_irq      	 ------------------------
++
++5.2 Configuring for MSI support
++
++Due to the non-contiguous fashion in vector assignment of the
++existing Linux kernel, this patch does not support multiple
++messages regardless of the device function is capable of supporting
++more than one vector. The bus driver initializes only entry 0 of
++this capability if pci_enable_msi(...) is called successfully by
++the device driver.
++
++5.3 Configuring for MSI-X support
++
++Both the MSI capability structure and the MSI-X capability structure
++share the same above semantics; however, due to the ability of the
++system software to configure each vector of the MSI-X capability
++structure with an independent message address and message data, the
++non-contiguous fashion in vector assignment of the existing Linux
++kernel has no impact on supporting multiple messages on an MSI-X
++capable device functions. By default, as mentioned above, ONE vector
++should be always allocated to the MSI-X capability structure at
++entry 0. The bus driver does not initialize other entries of the
++MSI-X table.
++
++Note that the PCI subsystem should have full control of a MSI-X
++table that resides in Memory Space. The software device driver
++should not access this table.
++
++To request for additional vectors, the device software driver should
++call function msi_alloc_vectors(). It is recommended that the
++software driver should call this function once during the
++initialization phase of the device driver.
++
++The function msi_alloc_vectors(), once invoked, enables either
++all or nothing, depending on the current availability of vector
++resources. If no vector resources are available, the device function
++still works with ONE vector. If the vector resources are available
++for the number of vectors requested by the driver, this function
++will reconfigure the MSI-X capability structure of the device with
++additional messages, starting from entry 1. To emphasize this
++reason, for example, the device may be capable for supporting the
++maximum of 32 vectors while its software driver usually may request
++4 vectors.
++
++For each vector, after this successful call, the device driver is
++responsible to call other functions like request_irq(), enable_irq(),
++etc. to enable this vector with its corresponding interrupt service
++handler. It is the device driver's choice to have all vectors shared
++the same interrupt service handler or each vector with a unique
++interrupt service handler.
++
++In addition to the function msi_alloc_vectors(), another function
++msi_free_vectors() is provided to allow the software driver to
++release a number of vectors back to the vector resources. Once
++invoked, the PCI subsystem disables (masks) each vector released.
++These vectors are no longer valid for the hardware device and its
++software driver to use. Like free_irq, it recommends that the
++device driver should also call msi_free_vectors to release all
++additional vectors previously requested.
++
++int msi_alloc_vectors(struct pci_dev *dev, int *vector, int nvec)
++
++This API enables the software driver to request the PCI subsystem
++for additional messages. Depending on the number of vectors
++available, the PCI subsystem enables either all or nothing.
++
++Argument dev points to the device (pci_dev) structure.
++Argument vector is a pointer of integer type. The number of
++elements is indicated in argument nvec.
++Argument nvec is an integer indicating the number of messages
++requested.
++A return of zero indicates that the number of allocated vector is
++successfully allocated. Otherwise, indicate resources not
++available.
++
++int msi_free_vectors(struct pci_dev* dev, int *vector, int nvec)
++
++This API enables the software driver to inform the PCI subsystem
++that it is willing to release a number of vectors back to the
++MSI resource pool. Once invoked, the PCI subsystem disables each
++MSI-X entry associated with each vector stored in the argument 2.
++These vectors are no longer valid for the hardware device and
++its software driver to use.
++
++Argument dev points to the device (pci_dev) structure.
++Argument vector is a pointer of integer type. The number of
++elements is indicated in argument nvec.
++Argument nvec is an integer indicating the number of messages
++released.
++A return of zero indicates that the number of allocated vectors
++is successfully released. Otherwise, indicates a failure.
++
++5.4 Hardware requirements for MSI support
++MSI support requires support from both system hardware and
++individual hardware device functions.
++
++5.4.1 System hardware support
++Since the target of MSI address is the local APIC CPU, enabling
++MSI support in Linux kernel is dependent on whether existing
++system hardware supports local APIC. Users should verify their
++system whether it runs when CONFIG_X86_LOCAL_APIC=y.
++
++In SMP environment, CONFIG_X86_LOCAL_APIC is automatically set;
++however, in UP environment, users must manually set
++CONFIG_X86_LOCAL_APIC. Once CONFIG_X86_LOCAL_APIC=y, setting
++CONFIG_PCI_USE_VECTOR enables the VECTOR based scheme and
++the option for MSI-capable device drivers to selectively enable
++MSI (using pci_enable_msi as desribed below).
++
++Note that CONFIG_X86_IO_APIC setting is irrelevant because MSI
++vector is allocated new during runtime and MSI support does not
++depend on BIOS support. This key independency enables MSI support
++on future IOxAPIC free platform.
++
++5.4.2 Device hardware support
++The hardware device function supports MSI by indicating the
++MSI/MSI-X capability structure on its PCI capability list. By
++default, this capability structure will not be initialized by
++the kernel to enable MSI during the system boot. In other words,
++the device function is running on its default pin assertion mode.
++Note that in many cases the hardware supporting MSI have bugs,
++which may result in system hang. The software driver of specific
++MSI-capable hardware is responsible for whether calling
++pci_enable_msi or not. A return of zero indicates the kernel
++successfully initializes the MSI/MSI-X capability structure of the
++device funtion. The device function is now running on MSI mode.
++
++5.5 How to tell whether MSI is enabled on device function
++
++At the driver level, a return of zero from pci_enable_msi(...)
++indicates to the device driver that its device function is
++initialized successfully and ready to run in MSI mode.
++
++At the user level, users can use command 'cat /proc/interrupts'
++to display the vector allocated for the device and its interrupt
++mode, as shown below.
++
++           CPU0       CPU1
++  0:     324639          0    IO-APIC-edge  timer
++  1:       1186          0    IO-APIC-edge  i8042
++  2:          0          0          XT-PIC  cascade
++ 12:       2797          0    IO-APIC-edge  i8042
++ 14:       6543          0    IO-APIC-edge  ide0
++ 15:          1          0    IO-APIC-edge  ide1
++169:          0          0   IO-APIC-level  uhci-hcd
++185:          0          0   IO-APIC-level  uhci-hcd
++193:        138         10         PCI MSI  aic79xx
++201:         30          0         PCI MSI  aic79xx
++225:         30          0   IO-APIC-level  aic7xxx
++233:         30          0   IO-APIC-level  aic7xxx
++NMI:          0          0
++LOC:     324553     325068
++ERR:          0
++MIS:          0
++
++6. FAQ
++
++Q1. Are there any limitations on using the MSI?
++
++A1. If the PCI device supports MSI and conforms to the
++specification and the platform supports the APIC local bus,
++then using MSI should work.
++
++Q2. Will it work on all the Pentium processors (P3, P4, Xeon,
++AMD processors)? In P3 IPI's are transmitted on the APIC local
++bus and in P4 and Xeon they are transmitted on the system
++bus. Are there any implications with this?
++
++A2. MSI support enables a PCI device sending an inbound
++memory write (0xfeexxxxx as target address) on its PCI bus
++directly to the FSB. Since the message address has a
++redirection hint bit cleared, it should work.
++
++Q3. The target address 0xfeexxxxx will be translated by the
++Host Bridge into an interrupt message. Are there any
++limitations on the chipsets such as Intel 8xx, Intel e7xxx,
++or VIA?
++
++A3. If these chipsets support an inbound memory write with
++target address set as 0xfeexxxxx, as conformed to PCI
++specification 2.3 or latest, then it should work.
++
++Q4. From the driver point of view, if the MSI is lost because
++of the errors occur during inbound memory write, then it may
++wait for ever. Is there a mechanism for it to recover?
++
++A4. Since the target of the transaction is an inbound memory
++write, all transaction termination conditions (Retry,
++Master-Abort, Target-Abort, or normal completion) are
++supported. A device sending an MSI must abide by all the PCI
++rules and conditions regarding that inbound memory write. So,
++if a retry is signaled it must retry, etc... We believe that
++the recommendation for Abort is also a retry (refer to PCI
++specification 2.3 or latest).
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/must-fix.txt	2003-10-05 00:33:51.000000000 -0700
+@@ -0,0 +1,354 @@
++
++Must-fix bugs
++=============
++
++drivers/char/
++~~~~~~~~~~~~~
++
++o TTY locking is broken.
++
++  o see FIXME in do_tty_hangup().  This causes ppp BUGs in local_bh_enable()
++
++  o Other problems: aviro, dipankar, Alan have details.
++
++  o somebody will have to document the tty driver and ldisc API
++
++o Lack of test cases and/or stress tests is a problem.  Contributions and
++  suggestions are sought.
++
++o Lots of drivers are using cli/sti and are broken.
++
++drivers/tty
++~~~~~~~~~~~
++
++o viro: we need to fix refcounting for tty_driver (oopsable race, must fix
++  anyway, hopefully about a week until it's merged) then we can do
++  tty/misc/upper levels of sound.
++
++drivers/block/
++~~~~~~~~~~~~~~
++
++o ideraid hasn't been ported to 2.5 at all yet.
++
++  We need to understand whether the proposed BIO split code will suffice
++  for this.
++
++o CD burning.  There are still a few quirks to solve wrt SG_IO and ide-cd.
++
++  Jens: The basic hang has been solved (double fault in ide-cd), there still
++  seems to be some cases that don't work too well.  Don't really have a
++  handle on those :/
++
++o lmb: Last time I looked at the multipath code (2.5.50 or so) it also
++  looked pretty broken; I plan to port forward the changes we did on 2.4
++  before KS.
++
++drivers/input/
++~~~~~~~~~~~~~~
++
++o rmk: unconverted keyboard/mouse drivers (there's a deadline of 2.6.0
++  currently on these remaining in my/Linus' tree.)
++
++o viro: large absence of locking.
++
++o viro: parport is nearly as bad as that and there the code is more hairy. 
++  IMO parport is more of "figure out what API changes are needed for its
++  users, get them done ASAP, then fix generic layer at leisure"
++
++o (Albert Cahalan) Lots of people (check Google) get this message from the
++  kernel:
++
++  psmouse.c: Lost synchronization, throwing 2 bytes away.
++
++  (the number of bytes will be 1, 2, or 3)
++
++  At work, I get it when there is heavy NFS traffic.  The mouse goes crazy,
++  jumping around and doing random cut-and-paste all over everything.  This
++  is with a decently fast and modern PC.
++
++o There seem to be too many reports of keyboards and mice failing or acting
++  strangely.
++
++
++drivers/misc/
++~~~~~~~~~~~~~
++
++o rmk: UCB1[23]00 drivers, currently sitting in drivers/misc in the ARM
++  tree.  (touchscreen, audio, gpio, type device.)
++
++  These need to be moved out of drivers/misc/ and into real places
++
++o viro: actually, misc.c has a good chance to die.  With cdev-cidr that's
++  trivial.
++
++drivers/net/
++~~~~~~~~~~~~
++
++o rmk: network drivers.  ARM people like to add tonnes of #ifdefs into
++  these to customise them to their hardware platform (eg, chip access
++  methods, addresses, etc.) I cope with this by not integrating them into my
++  tree.  The result is that many ARM platforms can't be built from even my
++  tree without extra patches.  This isn't sane, and has bred a culture of
++  network drivers not being submitted.  I don't see this changing for 2.6
++  though.
++
++drivers/net/irda/
++~~~~~~~~~~~~~~~~~
++
++o dongle drivers need to be converted to sir-dev
++
++o irport need to be converted to sir-kthread
++
++o new drivers (irtty-sir/smsc-ircc2/donauboe) need more testing
++
++o rmk: Refuse IrDA initialisation if sizeof(structures) is incorrect (I'm
++  not sure if we still need this; I think gcc 2.95.3 on ARM shows this
++  problem though.)
++
++drivers/pci/
++~~~~~~~~~~~~
++
++o alan: Some cardbus crashes the system
++
++  (bugzilla, please?)
++
++drivers/pcmcia/
++~~~~~~~~~~~~~~~
++
++o alan: This is a locking disaster.
++
++  (rmk, brodo: in progress)
++
++drivers/pld/
++~~~~~~~~~~~~
++
++o rmk: EPXA (ARM platform) PLD hotswap drivers (drivers/pld)
++
++  (rmk: will work out what to do here.  maybe drivers/arm/)
++
++drivers/video/
++~~~~~~~~~~~~~~
++
++o Lots of drivers don't compile, others do but don't work.
++
++drivers/scsi/
++~~~~~~~~~~~~~
++
++o hch: large parts of the locking are hosed or not existant
++
++  (Mike Anderson, Patrick Mansfield, Badari Pulavarty)
++
++  o shost->my_devices isn't locked down at all
++
++  o there are lots of members of struct Scsi_Host/scsi_device/scsi_cmnd
++    with very unclear locking, many of them probably want to become
++    atomic_t's or bitmaps (for the 1bit bitfields).
++
++  o there's lots of volatile abuse in the scsi code that needs to be
++    thought about.
++
++  o there's some global variables incremented without any locks
++
++o Convert am53c974, dpt_i2o, initio and pci2220i to DMA-mapping
++
++o Make inia100, cpqfc, pci2000 and dc390t compile
++
++o Convert
++
++   wd33c99 based: a2091 a3000 gpv11 mvme174 sgiwd93
++
++   53c7xx based: amiga7xxx bvme6000 mvme16x initio am53c974 pci2000
++   pci2220i dc390t
++
++  To new error handling
++
++  It also might be possible to shift the 53c7xx based drivers over to
++  53c700 which does the new EH stuff, but I don't have the hardware to check
++  such a shift.
++
++  For the non-compiling stuff, I've probably missed a few that just aren't
++  compilable on my platforms, so any updates would be welcome.  Also, are
++  some of our non-compiling or unconverted drivers obsolete?
++
++o rmk: I have a pending todo: I need to put the scsi error handling through
++  a workout on my scsi bus from hell to make sure it does the right thing
++  and doesn't get wedged.
++
++o James B: USB hot-removal crash: "It's a known scsi refcounting issue."
++
++fs/
++~~~
++
++o AIO/direct-IO writes can race with truncate and wreck filesystems.
++  (Badari has a patch)
++
++o hch: devfs: there's a fundamental lookup vs devfsd race that's only
++  fixable by introducing a lookup vs devfs deadlock.  I can't see how this is
++  fixable without getting rid of the current devfsd design.  Mandrake seems
++  to have a workaround for this so this is at least not triggered so easily,
++  but that's not what I'd consider a fix..
++
++o viro: fs/char_dev.c needs removal of aeb stuff and merge of cdev-cidr. 
++  In progress.
++
++o forward-port sct's O_DIRECT fixes (Badari has a patch)
++
++o viro: there is some generic stuff for namei/namespace/super, but that's a
++  slow-merge and can go in 2.6 just fine
++
++o andi: also soft needs to be fixed - there are quite a lot of
++  uninterruptible waits in sunrpc/nfs
++
++o trond: NFS has a mmap-versus-truncate problem
++
++kernel/sched.c
++~~~~~~~~~~~~~~
++
++o Starvation, general interactivity need close monitoring.
++
++kernel/
++~~~~~~~
++
++o Alan: 32bit uid support is *still* broken for process accounting.
++
++  Create a 32bit uid, turn accounting on.  Shock horror it doesn't work
++  because the field is 16bit.  We need an acct structure flag day for 2.6
++  IMHO
++
++  (alan has patch)
++
++o viro: core sysctl code is racy.  And its interaction wiuth sysfs
++
++o (ingo) rwsems (on x86) are limited to 32766 waiting processes.  This
++  means that setting pid_max to above 32K is unsafe :-(
++
++  An option is to use CONFIG_RWSEM_GENERIC_SPINLOCK variant all the time,
++  for all archs, and not inline any part of the ops.
++
++lib/kobject.c
++~~~~~~~~~~~~~
++
++o kobject refcounting (comments from Al Viro):
++
++  _anything_ can grab a temporary reference to kobject.  IOW, if kobject is
++  embedded into something that could be freed - it _MUST_ have a destructor
++  and that destructor _MUST_ be the destructor for containing object.
++
++  Any violation of the above (and we already have a bunch of those) is a
++  user-triggerable memory corruption.
++
++  We can tolerate it for a while in 2.5 (e.g.  during work on susbsystem we
++  can decide to switch to that way of handling objects and have subsystem
++  vulnerable for a while), but all such windows must be closed before 2.6
++  and during 2.6 we can't open them at all.
++
++o All block drivers which control multiple gendisks with a single
++  request_queue are broken, due to one-to-one assumptions in the request
++  queue sysfs hookup.
++
++mm/
++~~~
++
++o GFP_DMA32 (or something like that).  Lots of ideas.  jejb, zaitcev,
++  willy, arjan, wli.
++
++  Specifically, 64-bit systems need to be able to enforce 32-bit addressing
++  limits for device metadata like network cards' ring buffers and SCSI
++  command descriptors.
++
++o access_process_vm() doesn't flush right.  We probably need new flushing
++  primitives to do this (davem?)
++
++
++modules
++~~~~~~~
++
++  (Rusty)
++
++net/
++~~~~
++
++  (davem)
++
++o UDP apps can in theory deadlock, because the ip_append_data path can end
++  up sleeping while the socket lock is held.
++
++  It is OK to sleep with the socket held held, normally.  But in this case
++  the sleep happens while waiting for socket memory/space to become
++  available, if another context needs to take the socket lock to free up the
++  space we could hang.
++
++  I sent a rough patch on how to fix this to Alexey, and he is analyzing
++  the situation.  I expect a final fix from him next week or so.
++
++o Semantics for IPSEC during operations such as TCP connect suck currently.
++
++  When we first try to connect to a destination, we may need to ask the
++  IPSEC key management daemon to resolve the IPSEC routes for us.  For the
++  purposes of what the kernel needs to do, you can think of it like ARP.  We
++  can't send the packet out properly until we resolve the path.
++
++  What happens now for IPSEC is basically this:
++
++  O_NONBLOCK: returns -EAGAIN over and over until route is resolved
++
++  !O_NONBLOCK: Sleeps until route is resolved
++
++  These semantics are total crap.  The solution, which Alexey is working
++  on, is to allow incomplete routes to exist.  These "incomplete" routes
++  merely put the packet onto a "resolution queue", and once the key manager
++  does it's thing we finish the output of the packet.  This is precisely how
++  ARP works.
++
++  I don't know when Alexey will be done with this.
++
++net/*/netfilter/
++~~~~~~~~~~~~~~~~
++
++  (Rusty)
++
++o Rework conntrack hashing.
++
++o Module relationship bogosity fix (trivial, have patch).
++
++sound/
++~~~~~~
++
++o rmk: several OSS drivers for SA11xx-based hardware in need of
++  ALSA-ification and L3 bus support code for these.
++
++o rmk: linux/sound/drivers/mpu401/mpu401.c and
++  linux/sound/drivers/virmidi.c complained about 'errno' at some time in the
++  past, need to confirm whether this is still a problem.
++
++o rmk: need to complete ALSA-ification of the WaveArtist driver for both
++  NetWinder and other stuff (there's some fairly fundamental differences in
++  the way the mixer needs to be handled for the NetWinder.)
++
++
++  (Issues with forward-porting 2.4 bugfixes.)
++  (Killing off OSS is 2.7 material)
++
++
++global
++~~~~~~
++
++o 64-bit dev_t.  Seems almost ready, but it's not really known how much
++  work is still to do.  Patches exist in -mm but with the recent rise of the
++  neo-viro I'm not sure where things are at.
++
++o Lots of 2.4 fixes including some security are not in 2.5
++
++o There are about 60 or 70 security related checks that need doing
++  (copy_user etc) from Stanford tools.  (badari is looking into this, and
++  hollisb)
++
++o A couple of hundred real looking bugzilla bugs
++
++o viro: cdev rework.  Main group is pretty stable and I hope to feed it to
++  Linus RSN.  That's cdev-cidr and ->i_cdev/->i_cindex stuff
++
++o Athlon prefetch oopses sometimes.  It is currently disabled, and needs to
++  be fixed.
++
++
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/Documentation/should-fix.txt	2003-10-05 00:33:52.000000000 -0700
+@@ -0,0 +1,611 @@
++Not-ready features and speedups
++===============================
++
++Legend:
++
++PRI1:	We're totally lame if this doesn't get in
++PRI2:	Would be nice
++PRI3:	Not very important
++
++drivers/block/
++~~~~~~~~~~~~~~
++
++o Framework for selecting IO schedulers.  This is the main one really. 
++  Once this is in place we can drop in new schedulers any old time, no risk.
++  Nick Piggin has code for this.
++
++  PRI1
++
++o viro: paride drivers need a big cleanup
++
++  PRI2
++
++drivers/char/rtc/
++~~~~~~~~~~~~~~~~~
++
++o rmk, trini: add support for alarms to the existing generic rtc driver.
++
++  PRI2
++
++console drivers
++~~~~~~~~~~~~~~~
++  (Pavel Machek <pavel@ucw.cz>)
++
++o There are few must-fix bugs in cursor handling.
++
++o Play with gpm selection for a while and your cursor gets corrupted with
++  random dots. Ouch.
++
++device mapper
++~~~~~~~~~~~~~
++
++o ioctl interface cleanup patch is ready (redo the structure layouts)
++
++  PRI1
++
++o A port of the 2.4 snapshot and mirror targets is in progress
++
++  PRI1
++
++o the fs interface to dm needs to be redone.  gregkh was going to work on
++  this.  viro is interested in seeing work thus-far.
++
++  PRI2
++
++drivers/net/wireless/
++~~~~~~~~~~~~~~~~~~~~~
++
++  (Jean Tourrilhes <jt@bougret.hpl.hp.com>)
++
++o get latest orinoco changes from David.
++
++  PRI1
++
++o get the latest airo.c fixes from CVS.  This will hopefully fix problems
++  people have reported on the LKML.
++
++  PRI1
++
++o get HostAP driver in the kernel.  No consolidation of the 802.11
++  management across driver can happen until this one is in (which is probably
++  2.7.X material).  I think Jouni is mostly ready but didn't find time for
++  it.
++
++  PRI2
++
++o get more wireless drivers into the kernel.  The most "integrable" drivers
++  at this point seem the NWN driver, Pavel's Spectrum driver and the Atmel
++  driver.
++
++  PRI1
++
++o The last two drivers mentioned above are held up by firmware issues (see
++  flamewar on LKML a few days ago).  So maybe fixing those firmware issues
++  should be a requirement for 2.6.X, because we can expect more wireless
++  devices to need firmware upload at startup coming to market.
++
++  (in progress?)
++
++  PRI1
++
++drivers/usb/gadget/
++~~~~~~~~~~~~~~~~~~~
++
++o rmk: SA11xx USB client/gadget code (David B has been doing some work on
++  this, and keeps trying to prod me, but unfortunately I haven't had the time
++  to look at his work, sorry David.)
++
++  PRI3
++
++fs/
++~~~
++
++o ext3 and ext2 block allocators have serious failure modes - interleaved
++  allocations.
++
++  PRI3
++
++o Integrate Chris Mason's 2.4 reiserfs ordered data and data journaling
++  patches.  They make reiserfs a lot safer.
++
++  Ordered: PRI2
++  data journalled: PRI3
++
++o (Trond:) Yes: I'm still working on an atomic "open()", i.e.  one
++           where we short-circuit the usual VFS path_walk() + lookup() +
++           permission() + create() + ....  bullsh*t...
++
++           I have several reasons for wanting to do this (all of
++           them related to NFS of course, but much of the reasoning applies
++           to *all* networked file systems).
++
++   1) The above sequence is simply not atomic on *any* networked
++      filesystem.
++
++   2) It introduces a sh*tload of completely unnecessary RPC calls (why
++      do a 'permission' RPC call when the server is in *any* case going to
++      tell you whether or not this operations is allowed.  Why do a
++      'lookup()' when the 'create()' call can be made to tell you whether or
++      not a file already exists).
++
++   3) It is incompatible with some operations: the current create()
++      doesn't pass an 'EXCLUSIVE' flag down to the filesystems.
++
++   4) (NFS specific?) open() has very different cache consistency
++      requirements when compared to most other VFS operations.
++
++   I'd very much like for something like Peter Braam's 'lookup with
++   intent' or (better yet) for a proper dentry->open() to be integrated with
++   path_walk()/open_namei().  I'm still working on the latter (Peter has
++   already completed the lookup with intent stuff).
++
++   (All this is in progress, see http://www.fys.uio.no/~trondmy/src)
++
++   (Is awaiting Pater Braam's intent patches.  Applicable to CIFS)
++
++   PRI2 (?)
++
++o (Chuck Lever <cel@citi.umich.edu>): NFS O_DIRECT support must be
++  completed.  The best approach is to fall back to something like the 2.4 NFS
++  O_DIRECT support, which issues RPCs synchronously and uses the RPC
++  completion mechanism to wait for I/O completion.
++
++  PRI2
++
++o viro: cleaning up options-parsers in filesystems.  (patch exists, needs
++  porting).
++
++  PRI2
++
++o aio: fs IO isn't async at present.  suparna has restart patches, they're
++  in -mm.  Need to get Ben to review/comment.
++
++  PRI1.
++
++o drepper: various filesystems use ->pid wrongly
++
++kernel/
++~~~~~~~
++
++o rusty: Zippel's Reference count simplification.  Tricky code, but cuts
++  about 120 lines from module.c.  Patch exists, needs stressing.
++
++  PRI3
++
++o rusty: Fix module-failed-init races by starting module "disabled".  Patch
++  exists, requires some subsystems (ie.  add_partition) to explicitly say
++  "make module live now".  Without patch we are no worse off than 2.4 etc.  
++
++  PRI1
++
++o Integrate userspace irq balancing daemon.
++
++  PRI2
++
++o kexec.  Seems to work, was in -mm.
++
++  PRI3
++
++o rmk: lib/inflate.c must not use static variables (causes these to be
++  referenced via GOTOFF relocations in PIC decompressor.  We have a PIC
++  decompressor to avoid having to hard code a per platform zImage link
++  address into the makefiles.)
++
++  PRI2
++
++o klibc merge?
++
++  PRI2
++
++mm/
++~~~
++
++o objrmap: concerns over page reclaim performance at high sharing levels,
++  and interoperation with nonlinear mappings is hairy.
++
++o oxymoron's async write-error-handling patch
++
++  PRI1
++
++o dropbehind for large files
++
++  PRI2
++
++net/
++~~~~
++
++  (davem)
++
++o Real serious use of IPSEC is hampered by lack of MPLS support.  MPLS is a
++  switching technology that works by switching based upon fixed length labels
++  prepended to packets.  Many people use this and IPSEC to implement VPNs
++  over public networks, it is also used for things like traffic engineering.
++
++  A good reference site is:
++
++	http://www.mplsrc.com/
++
++  Anyways, an existing (crappy) implementation exists.  I've almost
++  completed a rewrite, I should have something in the tree next week.
++
++  PRI1
++
++o Sometimes we generate IP fragments when it truly isn't necessary.
++
++  The way IP fragmentation is specified, each fragment must be modulo 8
++  bytes in length.  So suppose the device has an MTU that is not 0 modulo 8,
++  ethernet even classifies in this way.  1500 == (8 * 187) + 4
++
++  Our IP fragmenting engine can fragment on packets that are sized within
++  the last modulo 8 bytes of the MTU.  This happens in obscure cases, but it
++  does happen.
++
++  I've proposed a fix to Alexey, whereby very late in the output path we
++  check the packet, if we fragmented but the data length would fit into the
++  MTU we unfragment the packet.
++
++  This is low priority, because technically it creates suboptimal behavior
++  rather than mis-operation.
++
++  PRI1
++
++net/*/netfilter/
++~~~~~~~~~~~~~~~~
++
++o Lots of misc. cleanups, which are happening slowly.
++
++  PRI2
++
++power management
++~~~~~~~~~~~~~~~~
++
++o PM code in mainline is currently b0rked. Fixes in -mm
++
++  PRI1
++
++o Pat and Pavel disagree over swsusp. Need to sort that out.
++
++  PRI2
++
++o Frame buffer restore codepaths (that requires some deep PCI magic)
++
++  PRI2
++
++o XFree86 hooks
++
++  PRI2
++
++o AGP restoration
++
++  PRI2
++
++o DRI restoration
++
++  (davej/Alan: not super-critical, can crash laptop on restore.  davej
++  looking into it.)
++
++  PRI2
++
++o IDE suspend/resume without races (Ben is looking at this a little)
++
++  PRI2
++
++o Pat: There are already CPU device structures; MTRRs should be a
++  dynamically registered interface of CPUs, which implies there needs
++  to be some other glue to know that there are MTRRs that need to be
++  saved/restored.
++
++  PRI1
++
++global
++~~~~~~
++
++o We need a kernel side API for reporting error events to userspace (could
++  be async to 2.6 itself)
++
++  (Prototype core based on netlink exists)
++
++  PRI2
++
++o Kai: Introduce a sane, easy and standard way to build external modules
++  - make clean and make modules_install are both broken
++
++  PRI2
++
++drivers
++~~~~~~~
++
++o Alan: Cardbus/PCMCIA requires all Russell's stuff is merged to do
++  multiheader right and so on
++
++  PRI1
++
++drivers/acpi/
++~~~~~~~~~~~~~
++
++o Fix acpi for all newer IBM Thinkpads see
++  http://bugme.osdl.org/show_bug.cgi?id=1038 for more information
++
++o alan: VIA APIC stuff is one bit of this, there are also some other
++  reports that were caused by ACPI not setting level v edge trigger some
++  times
++
++  PRI1
++
++o mochel: it seems the acpi irq routing code could use a serious rewrite.
++
++  grover: The problem is the ACPI irq routing code is trying to piggyback
++  on the existing MPS-specific data structures, and it's generally a hack. 
++  So yes mochel is right, but it is also purging MPS-ities from common code
++  as well.  I've done some preliminary work in this area and it doesn't seem
++  to break anything (yet) but a rewrite in this area imho should not be
++  rushed out the door.  And, I think the above bugs can be fixed w/o the
++  rewrite.
++
++  PRI2
++
++o mochel: ACPI suspend doesn't work.  Important, not cricital.  Pat is
++  working it.
++
++  PRI2
++
++drivers/block/
++~~~~~~~~~~~~~~
++
++o Floppy is almost unusably buggy still
++
++  akpm: we need more people to test & report.
++
++  alan: "Floppy has worked for me since the patches that went in 2.5.69-ac
++  and I think -bk somewhere"
++
++  PRI1
++
++drivers/char/
++~~~~~~~~~~~~~
++
++
++drivers/ide/
++~~~~~~~~~~~~
++
++  (Alan)
++
++o IDE PIO has occasional unexplained PIO disk eating reports
++
++  PRI1
++
++o IDE has multiple zillions of races/hangs in 2.5 still
++
++  PRI1
++
++o IDE scsi needs rewriting
++
++  PRI2
++
++o IDE needs significant reworking to handle Simplex right
++
++  PRI2
++
++o IDE hotplug handling for 2.5 is completely broken still
++
++  PRI2
++
++o There are lots of other IDE bugs that wont go away until the taskfile
++  stuff is included, the locking bugs that allow any user to hang the IDE
++  layer in 2.5, and some other updates are forward ported.  (esp.  HPT372N).
++
++  PRI1
++
++drivers/isdn/
++~~~~~~~~~~~~~
++
++  (Kai, rmk)
++
++o isdn_tty locking is completely broken (cli() and friends)
++
++  PRI2
++
++o fix other drivers
++
++  PRI2
++
++o lots more cleanups, adaption to recent APIs etc
++
++  PRI3
++
++o fixup tty-based ISDN drivers which provide TIOCM* ioctls (see my recent
++  3-set patch for serial stuff)
++
++  Alternatively, we could re-introduce the fallback to driver ioctl parsing
++  for these if not enough drivers get updated.
++
++  PRI3
++
++drivers/net/
++~~~~~~~~~~~~
++
++o davej: Either Wireless network drivers or PCMCIA broke somewhen.  A
++  configuration that worked fine under 2.4 doesn't receive any packets.  Need
++  to look into this more to make sure I don't have any misconfiguration that
++  just 'happened to work' under 2.4
++
++  PRI1
++
++drivers/scsi/
++~~~~~~~~~~~~~
++
++o jejb: qlogic -
++
++  o Merge the feral driver.  It covers all qlogic chips: 1020 all the way
++    up to 23xxx. http://linux-scsi.bkbits.net/scsi-isp-2.5
++
++  o qla2xxx: only for FC chips.  Has significant build issues.  hch
++    promises to send me a "must fix" list for this.
++    http://linux-scsi.bkbits.net/scsi-qla2xxx-2.5
++
++  PRI2
++
++arch/i386/
++~~~~~~~~~~
++
++o Also PC9800 merge needs finishing to the point we want for 2.6 (not all).
++
++  PRI3
++
++o davej: PAT support (for mtrr exhaustion w/ AGP)
++
++  PRI2
++
++o 2.5.x won't boot on some 440GX
++
++  alan: Problem understood now, feasible fix in 2.4/2.4-ac.  (440GX has two
++  IRQ routers, we use the $PIR table with the PIIX, but the 440GX doesnt use
++  the PIIX for its IRQ routing).  Fall back to BIOS for 440GX works and Intel
++  concurs.
++
++  PRI1
++
++o 2.5.x doesn't handle VIA APIC right yet.
++
++  1. We must write the PCI_INTERRUPT_LINE
++
++  2. We have quirk handlers that seem to trash it.
++
++  PRI1
++
++o ACPI needs the relax patches merging to work on lots of laptops
++
++  alan: ACPI relax stuff is in 2.4-ac, compaq workaround is in next -ac
++  coming.  These seem to deliver the goods - toshibas now work a treat.  Some
++  other relax bits are being discussed (assume local0 starts 0 etc) and
++  progress looks great.  This can occur before 2.6 or during.
++
++  PRI1
++
++o ECC driver questions are not yet sorted (DaveJ is working on this) (Dan
++  Hollis)
++
++  alan: ECC - I have some test bits from Dan's stuff - they need no kernel
++  core changes for most platforms.  That means we can treat it as a random
++  driver merge.
++
++  PRI3
++
++o alan: 2.4 has some fixes for tsc handling bugs.  One where some bioses in
++  SMM mode mess up our toggle on the time high/low or mangle the counter and
++  one where a few chips need religious use of _p for timer access and we
++  don't do that.  This is forward porting little bits of fixup.
++
++  ACPI HZ stuff we can't trap - a lot of ACPI is implemented as outb's
++  triggering SMM traps
++
++  PRI1
++
++arch/x86_64/
++~~~~~~~~~~~~
++
++  (Andi)
++
++o time handling is broken. Need to move up 2.4 time.c code.
++
++  PRI1
++
++o NMI watchdog seems to tick too fast
++
++  PRI2
++
++o not very well tested. probably more bugs lurking.
++
++  PRI1
++
++o need to coredump 64bit vsyscall code with dwarf2
++
++  PRI2
++
++o Consider merging of Erich Focht's very clean and simple homenode NUMA
++  scheduler (I have my own in 2.4, but Erich's 2.5 version is much cleaner)
++
++  PRI2
++  
++o Consider port of the Simple NUMA API from 2.4/homenode.
++
++  PRI3
++
++o move 64bit signal trampolines into vsyscall code and add dwarf2 for it.
++  (in progress)
++
++  PRI1
++
++o describe kernel assembly with dwarf2 annotations for kgdb
++
++  PRI3
++
++arch/alpha/
++~~~~~~~~~~~
++
++o rth: Ptrace writes are broken.  This means we can't (reliably) set
++  breakpoints or modify variables from gdb.
++
++  PRI1
++
++arch/arm/
++~~~~~~~~~
++
++o rmk: missing raw keyboard translation tables for all ARM machines. 
++  Haven't even looked into this at all.  This could be messy since there
++  isn't an ARM architecture standard.  I'm presently hoping that it won't be
++  an issue.  If it does, I guess we'll see drivers/char/keyboard.c explode.
++
++  PRI2
++
++arch/others/
++~~~~~~~~~~~~
++
++o SH needs resyncing, as do some other ports. SH64 needs merging.
++  No impact on mainstream platforms hopefully.
++
++  PRI2
++
++arch/s390/
++~~~~~~~~~
++
++o A nastly memory management problem causes random crashes.  These appear
++  to be fixed/hidden by the objrmap patch, more investigation is needed.
++
++  PRI1
++
++drivers/s390/
++~~~~~~~~~~~~~
++
++o Early userspace and 64 bit dev_t will allow the removal of most of
++  dasd_devmap.c and dasd_genhd.c.
++
++  PRI2
++
++o The 3270 console driver needs to be replaced with a working one
++  (prototype is there, needs to be finished).
++
++  PRI2
++
++o Minor interface changes are pending in cio/ when the z990 machines are
++  out.
++
++  PRI2
++
++o Jan Glauber is working on a fix for the timer issues related to running
++  on virtualized CPUs (wall-clock vs.  cpu time).
++
++  PRI1
++
++o a block device driver for ramdisks shared among virtual machines
++
++  PRI3
++
++o driver for crypto hardware
++
++  PRI3
++
++o 'claw' network device driver
++
++  PRI3
++
+--- linux-2.6.0-test6/Documentation/zorro.txt	2003-07-27 12:14:38.000000000 -0700
++++ 25/Documentation/zorro.txt	2003-10-05 00:33:23.000000000 -0700
+@@ -2,7 +2,7 @@
+ 		----------------------------------------
+ 
+ Written by Geert Uytterhoeven <geert@linux-m68k.org>
+-Last revised: February 27, 2000
++Last revised: September 5, 2003
+ 
+ 
+ 1. Introduction
+@@ -75,7 +75,7 @@ they are CPU physical addresses as well.
+ The treatment of these regions depends on the type of Zorro space:
+ 
+   - Zorro II address space is always mapped and does not have to be mapped
+-    explicitly using ioremap().
++    explicitly using z_ioremap().
+     
+     Conversion from bus/physical Zorro II addresses to kernel virtual addresses
+     and vice versa is done using:
+@@ -83,22 +83,20 @@ The treatment of these regions depends o
+ 	virt_addr = ZTWO_VADDR(bus_addr);
+ 	bus_addr = ZTWO_PADDR(virt_addr);
+ 
+-  - Zorro III address space must be mapped explicitly using ioremap() first
++  - Zorro III address space must be mapped explicitly using z_ioremap() first
+     before it can be accessed:
+  
+-	virt_addr = ioremap(bus_addr, size);
++	virt_addr = z_ioremap(bus_addr, size);
+ 	...
+-	iounmap(virt_addr);
++	z_iounmap(virt_addr);
+ 
+ 
+ 5. References
+ -------------
+ 
+ linux/include/linux/zorro.h
+-linux/include/linux/ioport.h
+-linux/include/asm-m68k/io.h
+-linux/include/asm-m68k/amigahw.h
+-linux/include/asm-ppc/io.h
++linux/include/asm-{m68k,ppc}/zorro.h
++linux/include/linux/zorro_ids.h
+ linux/drivers/zorro
+ /proc/bus/zorro
+ 
+--- linux-2.6.0-test6/drivers/acorn/block/fd1772.c	2003-09-08 13:58:56.000000000 -0700
++++ 25/drivers/acorn/block/fd1772.c	2003-10-05 00:34:00.000000000 -0700
+@@ -365,13 +365,12 @@ static void finish_fdc_done(int dummy);
+ static void floppy_off(unsigned int nr);
+ static void setup_req_params(int drive);
+ static void redo_fd_request(void);
+-static int fd_ioctl(struct inode *inode, struct file *filp, unsigned int
++static int fd_ioctl(struct block_device *bdev, struct file *filp, unsigned int
+ 		    cmd, unsigned long param);
+ static void fd_probe(int drive);
+ static int fd_test_drive_present(int drive);
+ static void config_types(void);
+-static int floppy_open(struct inode *inode, struct file *filp);
+-static int floppy_release(struct inode *inode, struct file *filp);
++static int floppy_open(struct block_device *bdev, struct file *filp);
+ static void do_fd_request(request_queue_t *);
+ 
+ /************************* End of Prototypes **************************/
+@@ -1309,11 +1308,9 @@ static int invalidate_drive(struct block
+ 	return 0;
+ }
+ 
+-static int fd_ioctl(struct inode *inode, struct file *filp,
++static int fd_ioctl(struct block_device *bdev, struct file *filp,
+ 		    unsigned int cmd, unsigned long param)
+ {
+-	struct block_device *bdev = inode->i_bdev;
+-
+ 	switch (cmd) {
+ 	case FDFMTEND:
+ 	case FDFLUSH:
+@@ -1453,10 +1450,11 @@ static void config_types(void)
+  * drive with different device numbers.
+  */
+ 
+-static int floppy_open(struct inode *inode, struct file *filp)
++static int floppy_open(struct block_device *bdev, struct file *filp)
+ {
+-	int drive = iminor(inode) & 3;
+-	int type =  iminor(inode) >> 2;
++	struct archy_floppy_struct *p = bdev->bd_disk->private_data;
++	int drive = p - unit;
++	int type =  MINOR(bdev->bd_dev) >> 2;
+ 	int old_dev = fd_device[drive];
+ 
+ 	if (fd_ref[drive] && old_dev != type)
+@@ -1476,10 +1474,13 @@ static int floppy_open(struct inode *ino
+ 		return 0;
+ 
+ 	if (filp->f_mode & 3) {
+-		check_disk_change(inode->i_bdev);
++		check_disk_change(bdev);
+ 		if (filp->f_mode & 2) {
+-			if (unit[drive].wpstat) {
+-				floppy_release(inode, filp);
++			if (p->wpstat) {
++				if (fd_ref[drive] < 0)
++					fd_ref[drive] = 0;
++				else
++					fd_ref[drive]--;
+ 				return -EROFS;
+ 			}
+ 		}
+@@ -1487,10 +1488,10 @@ static int floppy_open(struct inode *ino
+ 	return 0;
+ }
+ 
+-
+-static int floppy_release(struct inode *inode, struct file *filp)
++static int floppy_release(struct gendisk *disk)
+ {
+-	int drive = iminor(inode) & 3;
++	struct archy_floppy_struct *p = disk->private_data;
++	int drive = p - unit;
+ 
+ 	if (fd_ref[drive] < 0)
+ 		fd_ref[drive] = 0;
+--- linux-2.6.0-test6/drivers/acorn/block/mfmhd.c	2003-08-08 22:55:11.000000000 -0700
++++ 25/drivers/acorn/block/mfmhd.c	2003-10-05 00:33:54.000000000 -0700
+@@ -1153,9 +1153,9 @@ static int mfm_initdrives(void)
+  * The 'front' end of the mfm driver follows...
+  */
+ 
+-static int mfm_ioctl(struct inode *inode, struct file *file, u_int cmd, u_long arg)
++static int mfm_ioctl(struct block_device *bdev, struct file *file, u_int cmd, u_long arg)
+ {
+-	struct mfm_info *p = inode->i_bdev->bd_disk->private_data;
++	struct mfm_info *p = bdev->bd_disk->private_data;
+ 	struct hd_geometry *geo = (struct hd_geometry *) arg;
+ 	if (cmd != HDIO_GETGEO)
+ 		return -EINVAL;
+@@ -1167,7 +1167,7 @@ static int mfm_ioctl(struct inode *inode
+ 		return -EFAULT;
+ 	if (put_user (p->cylinders, &geo->cylinders))
+ 		return -EFAULT;
+-	if (put_user (get_start_sect(inode->i_bdev), &geo->start))
++	if (put_user (get_start_sect(bdev), &geo->start))
+ 		return -EFAULT;
+ 	return 0;
+ }
+--- linux-2.6.0-test6/drivers/acpi/asus_acpi.c	2003-06-22 12:04:44.000000000 -0700
++++ 25/drivers/acpi/asus_acpi.c	2003-10-05 00:33:23.000000000 -0700
+@@ -26,13 +26,17 @@
+  *  Johann Wiesner - Small compile fixes
+  *  John Belmonte  - ACPI code for Toshiba laptop was a good starting point.
+  *
+- *  TODO
++ *  TODO:
+  *  add Fn key status
+- *  Add mode selection on module loading (parameter) -> still necessary ?
++ *  Add mode selection on module loading (parameter) -> still necessary?
+  *  Complete display switching -- may require dirty hacks?
+- *
+  */
+ 
++#include <linux/config.h>
++#if defined (CONFIG_MODVERSIONS) && !defined (MODVERSIONS) && defined (MODULE)
++#include <linux/modversions.h>
++#endif
++
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
+@@ -41,7 +45,7 @@
+ #include <acpi/acpi_drivers.h>
+ #include <acpi/acpi_bus.h>
+ 
+-#define ASUS_ACPI_VERSION "0.24a"
++#define ASUS_ACPI_VERSION "0.26"
+ 
+ #define PROC_ASUS       "asus"	//the directory
+ #define PROC_MLED       "mled"
+@@ -110,20 +114,24 @@ struct asus_hotk {
+ 	struct model_data *methods;	//methods available on the laptop
+ 	u8 brightness;			//brighness level
+ 	enum {
+-		L2X = 0,	//L200D -> TODO check Q11 (Fn+F8)
+-				//	   Calling this method simply hang the
++		A1X=0,  	//A1340D, A1300F
++		A2X,		//A2500H
++		D1X,		//D1
++		L1X,		//L1400B
++		L2X,		//L2000D -> TODO check Q11 (Fn+F8)
++				//	   Calling this method simply hangs the
+ 				//	   computer, ISMI method hangs the laptop.
+-		L3X,		//L3C
+ 		L3D,		//L3400D
++		L3X,		//L3C
++		L5X,		//L5C TODO this model seems to have one more
++		                //         LED, add support
+ 		M2X,		//M2400E
++		M3N,		//M3700N, but also S1300N -> TODO WLED
+ 		S1X,		//S1300A -> TODO special keys do not work ?
+-		D1X,		//D1
+-		L1X,		//L1400B
+-		A1X, 		//A1340D, A1300F
+-		J1X,		//S200 (J1)
+-				//TODO  A1370D does not seems to have a ATK device 
++		S2X,		//S200 (J1 reported), Victor MP-XP7210
++				//TODO  A1370D does not seem to have an ATK device 
+ 				//	L8400 model doesn't have ATK
+-		END_MODEL,
++		END_MODEL
+ 	} model;		//Models currently supported
+ 	u16 event_count[128];	//count for each event TODO make this better
+ };
+@@ -133,7 +141,8 @@ struct asus_hotk {
+ #define S1X_PREFIX "\\_SB.PCI0.PX40."
+ #define L1X_PREFIX S1X_PREFIX
+ #define A1X_PREFIX "\\_SB.PCI0.ISA.EC0."
+-#define J1X_PREFIX A1X_PREFIX
++#define S2X_PREFIX A1X_PREFIX
++#define M3N_PREFIX "\\_SB.PCI0.SBRG.EC0."
+ 
+ static struct model_data model_conf[END_MODEL] = {
+         /*
+@@ -147,33 +156,43 @@ static struct model_data model_conf[END_
+ 	 * it seems to be a kind of switch, but what for ?
+ 	 *
+ 	 */
++	{"A1X", "MLED", "\\MAIL", NULL, NULL, A1X_PREFIX "_Q10", "\\BKLI",
++	 A1X_PREFIX "_Q0E", A1X_PREFIX "_Q0F", NULL, NULL, NULL, NULL, NULL},
++
++	{"A2X", "MLED", NULL, "WLED", "\\SG66", "\\Q10", "\\BAOF",
++	 "\\Q0E", "\\Q0F", "SPLV", "GPLV", "\\CMOD", "SDSP", "\\INFB"},
++
++	{"D1X", "MLED", NULL, NULL, NULL, "\\Q0D", "\\GP11", 
++	 "\\Q0C", "\\Q0B", NULL, NULL, "\\BLVL", "SDSP","\\INFB"},
++
++	{"L1X", "MLED", NULL, "WLED", NULL, L1X_PREFIX "Q10", "\\PNOF", 
++	 L1X_PREFIX "Q0F", L1X_PREFIX "Q0E", "SPLV", "GPLV", "\\BRIT", NULL, NULL},
++	 
+ 	{"L2X", "MLED", "\\SGP6", "WLED", "\\RCP3", "\\Q10", "\\SGP0", 
+ 	 "\\Q0E", "\\Q0F", NULL, NULL, NULL, "SDSP", "\\INFB"},
+ 
++	{"L3D", "MLED", "\\MALD", "WLED", NULL, "\\Q10", "\\BKLG",
++	 "\\Q0E", "\\Q0F", "SPLV", "GPLV", "\\BLVL", "SDSP", "\\INFB"},
++
+ 	{"L3X", "MLED", NULL, "WLED", NULL, L3X_PREFIX "_Q10", "\\GL32", 
+ 	 L3X_PREFIX "_Q0F", L3X_PREFIX "_Q0E", "SPLV", "GPLV", "\\BLVL", "SDSP", 
+ 	 "\\_SB.PCI0.PCI1.VGAC.NMAP"},
+ 
+-	{"L3D", "MLED", "\\MALD", "WLED", NULL, "\\Q10", "\\BKLG",
+-	 "\\Q0E", "\\Q0F", "SPLV", "GPLV", "\\BLVL", "SDSP", "\\INFB"},
+-
++	{"L5X", "MLED", NULL, "WLED", "WRED", "\\Q0D", "\\BAOF", 
++	 "\\Q0C","\\Q0B", "SPLV", "GPLV", NULL, "SDSP", "\\INFB"},
++	 
+ 	{"M2X", "MLED", NULL, "WLED", NULL, "\\Q10", "\\GP06", 
+ 	 "\\Q0E","\\Q0F", "SPLV", "GPLV", NULL, "SDSP", "\\INFB"},
++
++	{"M3N", "MLED", NULL, "WLED", "\\PO33", M3N_PREFIX "_Q10", "\\BKLT", 
++	 M3N_PREFIX "_Q0F", M3N_PREFIX "_Q0E", "SPLV", "GPLV", "\\LBTN", "SDSP", 
++	 "\\ADVG"},
+ 	
+ 	{"S1X", "MLED", "\\EMLE", "WLED", NULL, S1X_PREFIX "Q10", "\\PNOF", 
+ 	 S1X_PREFIX "Q0F", S1X_PREFIX "Q0E", "SPLV", "GPLV", "\\BRIT", NULL, NULL},
+ 	
+-	{"D1X", "MLED", NULL, NULL, NULL, "\\Q0D", "\\GP11", 
+-	 "\\Q0C", "\\Q0B", NULL, NULL, "\\BLVL", "SDSP","\\INFB"},
+-
+-	{"L1X", "MLED", NULL, "WLED", NULL, L1X_PREFIX "Q10", "\\PNOF", 
+-	 L1X_PREFIX "Q0F", L1X_PREFIX "Q0E", "SPLV", "GPLV", "\\BRIT", NULL, NULL},
+-
+-	{"A1X", "MLED", "\\MAIL", NULL, NULL, A1X_PREFIX "_Q10", "\\BKLI",
+-	 A1X_PREFIX "_Q0E", A1X_PREFIX "_Q0F", NULL, NULL, NULL, NULL, NULL},
+-
+-	{"J1X", "MLED", "\\MAIL", NULL, NULL, J1X_PREFIX "_Q10", "\\BKLI",
+-	 J1X_PREFIX "_Q0B", J1X_PREFIX "_Q0A", NULL, NULL, NULL, NULL, NULL}
++	{"S2X", "MLED", "\\MAIL", NULL, NULL, S2X_PREFIX "_Q10", "\\BKLI",
++	 S2X_PREFIX "_Q0B", S2X_PREFIX "_Q0A", NULL, NULL, NULL, NULL, NULL}
+ };
+ 
+ /* procdir we use */
+@@ -234,7 +253,7 @@ static int read_acpi_int(acpi_handle han
+ 	output.length = sizeof(out_obj);
+ 	output.pointer = &out_obj;
+ 
+-	status = acpi_evaluate_object(handle, (char*) method, NULL, &output);
++	status = acpi_evaluate_object(handle, (char *) method, NULL, &output);
+ 	*val = out_obj.integer.value;
+ 	return (status == AE_OK) && (out_obj.type == ACPI_TYPE_INTEGER);
+ }
+@@ -249,6 +268,7 @@ proc_read_info(char *page, char **start,
+ 		void *data)
+ {
+ 	int len = 0;
++	int sfun;
+ 	struct asus_hotk *hotk = (struct asus_hotk *) data;
+ 	char buf[16];		//enough for all info
+ 	/*
+@@ -257,28 +277,27 @@ proc_read_info(char *page, char **start,
+ 	 */
+ 
+ 	len += sprintf(page, ACPI_HOTK_NAME " " ASUS_ACPI_VERSION "\n");
+-	len +=
+-	    sprintf(page + len, "Model reference    : %s\n",
+-		    hotk->methods->name);
++	len += sprintf(page + len, "Model reference    : %s\n", 
++		       hotk->methods->name);
++	if(read_acpi_int(hotk->handle, "SFUN", &sfun))
++		len += sprintf(page + len, "SFUN value         : 0x%04x\n", sfun);
+ 	if (asus_info) {
+-		snprintf(buf, 5, "%s", asus_info->signature);
+-		len += sprintf(page + len, "ACPI signature     : %s\n", buf);
+ 		snprintf(buf, 16, "%d", asus_info->length);
+-		len += sprintf(page + len, "Table length       : %s\n", buf);
+-		snprintf(buf, 16, "%d", asus_info->revision);
+-		len += sprintf(page + len, "ACPI minor version : %s\n", buf);
++		len += sprintf(page + len, "DSDT length        : %s\n", buf);
+ 		snprintf(buf, 16, "%d", asus_info->checksum);
+-		len += sprintf(page + len, "Checksum           : %s\n", buf);
++		len += sprintf(page + len, "DSDT checksum      : %s\n", buf);
++		snprintf(buf, 16, "%d", asus_info->revision);
++		len += sprintf(page + len, "DSDT revision      : %s\n", buf);
+ 		snprintf(buf, 7, "%s", asus_info->oem_id);
+-		len += sprintf(page + len, "OEM identification : %s\n", buf);
++		len += sprintf(page + len, "OEM id             : %s\n", buf);
+ 		snprintf(buf, 9, "%s", asus_info->oem_table_id);
+ 		len += sprintf(page + len, "OEM table id       : %s\n", buf);
+ 		snprintf(buf, 16, "%x", asus_info->oem_revision);
+-		len += sprintf(page + len, "OEM rev number     : 0x%s\n", buf);
++		len += sprintf(page + len, "OEM revision       : 0x%s\n", buf);
+ 		snprintf(buf, 5, "%s", asus_info->asl_compiler_id);
+-		len += sprintf(page + len, "ASL comp vendor ID : %s\n", buf);
++		len += sprintf(page + len, "ASL comp vendor id : %s\n", buf);
+ 		snprintf(buf, 16, "%x", asus_info->asl_compiler_revision);
+-		len += sprintf(page + len, "ASL comp rev number: 0x%s\n", buf);
++		len += sprintf(page + len, "ASL comp revision  : 0x%s\n", buf);
+ 	}
+ 
+ 	return len;
+@@ -304,7 +323,7 @@ proc_read_mled(char *page, char **start,
+ 				  &led_status))
+ 			len =  sprintf(page, "%d\n", led_status);
+ 		else
+-			printk(KERN_NOTICE "Asus ACPI: Error reading MLED "
++			printk(KERN_WARNING "Asus ACPI: Error reading MLED "
+ 			       "status\n");
+ 	} else {
+ 		len = sprintf(page, "%d\n", (hotk->status & MLED_ON) ? 1 : 0);
+@@ -334,7 +353,7 @@ proc_write_mled(struct file *file, const
+ 	/* We don't have to check mt_mled exists if we are here :) */
+ 	if (!write_acpi_int(hotk->handle, hotk->methods->mt_mled, led_out,
+ 			    NULL))
+-		printk(KERN_NOTICE "Asus ACPI: MLED write failed\n");
++		printk(KERN_WARNING "Asus ACPI: MLED write failed\n");
+ 
+ 
+ 
+@@ -355,11 +374,11 @@ proc_read_wled(char *page, char **start,
+ 	int led_status;
+ 
+ 	if (hotk->methods->wled_status) {
+-		if (read_acpi_int(NULL, hotk->methods->mled_status, 
++		if (read_acpi_int(NULL, hotk->methods->wled_status, 
+ 				  &led_status))
+ 			len = sprintf(page, "%d\n", led_status);
+ 		else
+-			printk(KERN_NOTICE "Asus ACPI: Error reading WLED "
++			printk(KERN_WARNING "Asus ACPI: Error reading WLED "
+ 			       "status\n");
+ 	} else {
+ 		len = sprintf(page, "%d\n", (hotk->status & WLED_ON) ? 1 : 0);
+@@ -386,7 +405,7 @@ proc_write_wled(struct file *file, const
+ 	/* We don't have to check if mt_wled exists if we are here :) */
+ 	if (!write_acpi_int(hotk->handle, hotk->methods->mt_wled, led_out,
+ 			    NULL))
+-		printk(KERN_NOTICE "Asus ACPI: WLED write failed\n");
++		printk(KERN_WARNING "Asus ACPI: WLED write failed\n");
+ 
+ 
+ 	return count;
+@@ -399,7 +418,7 @@ static int get_lcd_state(struct asus_hot
+ 
+ 	/* We don't have to check anything, if we are here */
+ 	if (!read_acpi_int(NULL, hotk->methods->lcd_status, &lcd))
+-		printk(KERN_NOTICE "Asus ACPI: Error reading LCD status\n");
++		printk(KERN_WARNING "Asus ACPI: Error reading LCD status\n");
+ 	
+ 	if (hotk->model == L2X)
+ 		lcd = ~lcd;
+@@ -438,7 +457,7 @@ proc_write_lcd(struct file *file, const 
+ 		    acpi_evaluate_object(NULL, hotk->methods->mt_lcd_switch,
+ 					 NULL, NULL);
+ 		if (ACPI_FAILURE(status))
+-			printk(KERN_NOTICE "Asus ACPI: Error switching LCD\n");
++			printk(KERN_WARNING "Asus ACPI: Error switching LCD\n");
+ 	}
+ 
+ 	return count;
+@@ -452,15 +471,15 @@ static void set_brightness(int value, st
+ {
+ 	acpi_status status = 0;
+ 
+-	/* ATKD laptop */
++	/* SPLV laptop */
+ 	if(hotk->methods->brightness_set) {
+ 		if (!write_acpi_int(hotk->handle, hotk->methods->brightness_set, 
+ 				    value, NULL))
+-			printk(KERN_NOTICE "Asus ACPI: Error changing brightness\n");
++			printk(KERN_WARNING "Asus ACPI: Error changing brightness\n");
+ 		return;
+ 	}
+ 
+-	/* HOTK laptop if we are here, act as appropriate */
++	/* No SPLV method if we are here, act as appropriate */
+ 	value -= hotk->brightness;
+ 	while (value != 0) {
+ 		status = acpi_evaluate_object(NULL, (value > 0) ? 
+@@ -469,7 +488,7 @@ static void set_brightness(int value, st
+ 					      NULL, NULL);
+ 		(value > 0) ? value-- : value++;
+ 		if (ACPI_FAILURE(status))
+-			printk(KERN_NOTICE "Asus ACPI: Error changing brightness\n");
++			printk(KERN_WARNING "Asus ACPI: Error changing brightness\n");
+ 	}
+ 	return;
+ }
+@@ -478,15 +497,15 @@ static int read_brightness(struct asus_h
+ {
+ 	int value;
+ 	
+-	if(hotk->methods->brightness_get) { /* ATKD laptop */
++	if(hotk->methods->brightness_get) { /* SPLV/GPLV laptop */
+ 		if (!read_acpi_int(hotk->handle, hotk->methods->brightness_get, 
+ 				   &value))
+-			printk(KERN_NOTICE "Asus ACPI: Error reading brightness\n");
++			printk(KERN_WARNING "Asus ACPI: Error reading brightness\n");
+ 	} else if (hotk->methods->brightness_status) { /* For D1 for example */
+ 		if (!read_acpi_int(NULL, hotk->methods->brightness_status, 
+ 				   &value))
+-			printk(KERN_NOTICE "Asus ACPI: Error reading brightness\n");
+-	} else /* HOTK laptop */
++			printk(KERN_WARNING "Asus ACPI: Error reading brightness\n");
++	} else /* No GPLV method */
+ 		value = hotk->brightness;
+ 	return value;
+ }
+@@ -512,7 +531,7 @@ proc_write_brn(struct file *file, const 
+ 			/* 0 <= value <= 15 */
+ 		set_brightness(value, hotk);
+ 	} else {
+-		printk(KERN_NOTICE "Asus ACPI: Error reading user input\n");
++		printk(KERN_WARNING "Asus ACPI: Error reading user input\n");
+ 	}
+ 
+ 	return count;
+@@ -523,7 +542,7 @@ static void set_display(int value, struc
+ 	/* no sanity check needed for now */
+ 	if (!write_acpi_int(hotk->handle, hotk->methods->display_set, 
+ 			    value, NULL))
+-		printk(KERN_NOTICE "Asus ACPI: Error setting display\n");
++		printk(KERN_WARNING "Asus ACPI: Error setting display\n");
+ 	return;
+ }
+ 
+@@ -540,12 +559,12 @@ proc_read_disp(char *page, char **start,
+ 	struct asus_hotk *hotk = (struct asus_hotk *) data;
+ 	
+ 	if (!read_acpi_int(hotk->handle, hotk->methods->display_get, &value))
+-		printk(KERN_NOTICE "Asus ACPI: Error reading display status\n");
++		printk(KERN_WARNING "Asus ACPI: Error reading display status\n");
+ 	return sprintf(page, "%d\n", value);
+ }
+ 
+ /*
+- * Preliminary support for display switching. As of now: 0x01 should activate 
++ * Experimental support for display switching. As of now: 0x01 should activate 
+  * the LCD output, 0x02 should do for CRT, and 0x04 for TV-Out. Any combination 
+  * (bitwise) of these will suffice. I never actually tested 3 displays hooked up 
+  * simultaneously, so be warned.
+@@ -562,13 +581,13 @@ proc_write_disp(struct file *file, const
+ 	if (sscanf(buffer, "%d", &value) == 1)
+ 		set_display(value, hotk);
+ 	else {
+-		printk(KERN_NOTICE "Asus ACPI: Error reading user input\n");
++		printk(KERN_WARNING "Asus ACPI: Error reading user input\n");
+ 	}
+ 
+ 	return count;
+ }
+ 
+-static int asus_hotk_add_fs(struct acpi_device *device)
++static int __init asus_hotk_add_fs(struct acpi_device *device)
+ {
+ 	struct proc_dir_entry *proc;
+ 	struct asus_hotk *hotk = acpi_driver_data(device);
+@@ -582,7 +601,7 @@ static int asus_hotk_add_fs(struct acpi_
+ 
+ 	if ((asus_uid == 0) && (asus_gid == 0)){
+ 		mode = S_IFREG | S_IRUGO | S_IWUGO;
+-	}else{
++	} else {
+ 		mode = S_IFREG | S_IRUSR | S_IRGRP | S_IWUSR | S_IWGRP;
+ 	}
+ 
+@@ -598,7 +617,7 @@ static int asus_hotk_add_fs(struct acpi_
+ 		proc->uid = asus_uid;
+ 		proc->gid = asus_gid;;
+ 	} else {
+-		printk(KERN_NOTICE "  Unable to create " PROC_INFOS
++		printk(KERN_WARNING "  Unable to create " PROC_INFOS
+ 		       " fs entry\n");
+ 	}
+ 
+@@ -612,7 +631,7 @@ static int asus_hotk_add_fs(struct acpi_
+ 			proc->uid = asus_uid;
+ 			proc->gid = asus_gid;;
+ 		} else {
+-			printk(KERN_NOTICE "  Unable to create " PROC_WLED
++			printk(KERN_WARNING "  Unable to create " PROC_WLED
+ 			       " fs entry\n");
+ 		}
+ 	}
+@@ -627,7 +646,7 @@ static int asus_hotk_add_fs(struct acpi_
+ 			proc->uid = asus_uid;
+ 			proc->gid = asus_gid;;
+ 		} else {
+-			printk(KERN_NOTICE "  Unable to create " PROC_MLED
++			printk(KERN_WARNING "  Unable to create " PROC_MLED
+ 			       " fs entry\n");
+ 		}
+ 	}
+@@ -646,7 +665,7 @@ static int asus_hotk_add_fs(struct acpi_
+ 			proc->uid = asus_uid;
+ 			proc->gid = asus_gid;;
+ 		} else {
+-			printk(KERN_NOTICE "  Unable to create " PROC_LCD
++			printk(KERN_WARNING "  Unable to create " PROC_LCD
+ 			       " fs entry\n");
+ 		}
+ 	}
+@@ -662,7 +681,7 @@ static int asus_hotk_add_fs(struct acpi_
+ 			proc->uid = asus_uid;
+ 			proc->gid = asus_gid;;
+ 		} else {
+-			printk(KERN_NOTICE "  Unable to create " PROC_BRN
++			printk(KERN_WARNING "  Unable to create " PROC_BRN
+ 			       " fs entry\n");
+ 		}
+ 	}
+@@ -677,19 +696,19 @@ static int asus_hotk_add_fs(struct acpi_
+ 			proc->uid = asus_uid;
+ 			proc->gid = asus_gid;;
+ 		} else {
+-			printk(KERN_NOTICE "  Unable to create " PROC_DISP
++			printk(KERN_WARNING "  Unable to create " PROC_DISP
+ 			       " fs entry\n");
+ 		}
+ 	}
+ 
+-	return (AE_OK);
++	return 0;
+ }
+ 
+ 
+ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
+ {
+ 	/* TODO Find a better way to handle events count. Here, in data, we receive
+-	 * the hotk, so we can make anything !!
++	 * the hotk, so we can do anything!
+ 	 */
+ 	struct asus_hotk *hotk = (struct asus_hotk *) data;
+ 
+@@ -712,19 +731,40 @@ static void asus_hotk_notify(acpi_handle
+  * This function is used to initialize the hotk with right values. In this
+  * method, we can make all the detection we want, and modify the hotk struct
+  */
+-static int asus_hotk_get_info(struct asus_hotk *hotk)
++static int __init asus_hotk_get_info(struct asus_hotk *hotk)
+ {
+ 	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
++	struct acpi_buffer dsdt = { ACPI_ALLOCATE_BUFFER, NULL };
+ 	union acpi_object *model = NULL;
++	int bsts_result;
++	acpi_status status;
+ 
+-	/* 
+-	 * We have to write 0 on init this far for all ASUS models
++	/*
++	 * Get DSDT headers early enough to allow for differentiating between 
++	 * models, but late enough to allow acpi_bus_register_driver() to fail 
++	 * before doing anything ACPI-specific. Should we encounter a machine,
++	 * which needs special handling (i.e. its hotkey device has a different
++	 * HID), this bit will be moved. A global variable asus_info contains
++	 * the DSDT header.
+ 	 */
++	status = acpi_get_table(ACPI_TABLE_DSDT, 1, &dsdt);
++	if (ACPI_FAILURE(status))
++		printk(KERN_WARNING "  Couldn't get the DSDT table header\n");
++	else
++		asus_info = (struct acpi_table_header *) dsdt.pointer;
++
++	/* We have to write 0 on init this far for all ASUS models */
+ 	if (!write_acpi_int(hotk->handle, "INIT", 0, &buffer)) {
+-		printk(KERN_NOTICE "  Hotkey initialization failed\n");
++		printk(KERN_ERR "  Hotkey initialization failed\n");
+ 		return -ENODEV;
+ 	}
+ 
++	/* For testing purposes */
++	if (!read_acpi_int(hotk->handle, "BSTS", &bsts_result))
++		printk(KERN_WARNING "  Error calling BSTS\n");
++	else if (bsts_result)
++		printk(KERN_NOTICE "  BSTS called, 0x%02x returned\n", bsts_result);
++
+ 	/*
+ 	 * Here, we also use asus_info to make decision. For example, on INIT
+ 	 * method, S1X and L1X models both reports to be L84F, but they don't
+@@ -749,26 +789,34 @@ static int asus_hotk_get_info(struct asu
+ 		hotk->model = L3X;
+ 	else if (strncmp(model->string.pointer, "M2", 2) == 0)
+ 		hotk->model = M2X;
++	else if (strncmp(model->string.pointer, "M3N", 3) == 0 ||
++		 strncmp(model->string.pointer, "S1N", 3) == 0)
++		hotk->model = M3N; /* S1300N is similar enough */
+ 	else if (strncmp(model->string.pointer, "L2", 2) == 0)
+ 		hotk->model = L2X;
+-	else if (strncmp(model->string.pointer, "L8", 2) == 0)
++	else if (strncmp(model->string.pointer, "L8", 2) == 0) {
+ 		/* S1300A reports L84F, but L1400B too */
+-		if (strncmp(asus_info->oem_table_id, "L1", 2) == 0)
+-			hotk->model = L1X;
+-		else
++		if (asus_info) {
++			if (strncmp(asus_info->oem_table_id, "L1", 2) == 0)
++				hotk->model = L1X;
++		} else
+ 			hotk->model = S1X;
++	}
+ 	else if (strncmp(model->string.pointer, "D1", 2) == 0)
+ 		hotk->model = D1X;
+ 	else if (strncmp(model->string.pointer, "A1", 2) == 0)
+ 		hotk->model = A1X;
++	else if (strncmp(model->string.pointer, "A2", 2) == 0)
++		hotk->model = A2X;
+ 	else if (strncmp(model->string.pointer, "J1", 2) == 0)
+-		hotk->model = J1X;
+-
++		hotk->model = S2X;
++	else if (strncmp(model->string.pointer, "L5", 2) == 0)
++		hotk->model = L5X;
+ 
+ 	if (hotk->model == END_MODEL) {
+ 		/* By default use the same values, as I don't know others */
+-		printk("unsupported, trying default values, contact the "
+-		       "developers\n");
++		printk("unsupported, trying default values, supply the "
++		       "developers with your DSDT\n");
+ 		hotk->model = L2X;
+ 	} else {
+ 		printk("supported\n");
+@@ -783,7 +831,7 @@ static int asus_hotk_get_info(struct asu
+ 
+ 
+ 
+-static int asus_hotk_check(struct asus_hotk *hotk)
++static int __init asus_hotk_check(struct asus_hotk *hotk)
+ {
+ 	int result = 0;
+ 
+@@ -797,7 +845,7 @@ static int asus_hotk_check(struct asus_h
+ 	if (hotk->device->status.present) {
+ 		result = asus_hotk_get_info(hotk);
+ 	} else {
+-		printk(KERN_NOTICE "  Hotkey device not present, aborting\n");
++		printk(KERN_ERR "  Hotkey device not present, aborting\n");
+ 		return(-EINVAL);
+ 	}
+ 
+@@ -806,7 +854,7 @@ static int asus_hotk_check(struct asus_h
+ 
+ 
+ 
+-static int asus_hotk_add(struct acpi_device *device)
++static int __init asus_hotk_add(struct acpi_device *device)
+ {
+ 	struct asus_hotk *hotk = NULL;
+ 	acpi_status status = AE_OK;
+@@ -815,6 +863,9 @@ static int asus_hotk_add(struct acpi_dev
+ 	if (!device)
+ 		return(-EINVAL);
+ 
++	printk(KERN_NOTICE "Asus Laptop ACPI Extras version %s\n",
++	       ASUS_ACPI_VERSION);
++
+ 	hotk =
+ 	    (struct asus_hotk *) kmalloc(sizeof(struct asus_hotk), GFP_KERNEL);
+ 	if (!hotk)
+@@ -842,25 +893,23 @@ static int asus_hotk_add(struct acpi_dev
+ 	 */
+ 	status = acpi_install_notify_handler(hotk->handle, ACPI_SYSTEM_NOTIFY,
+ 					     asus_hotk_notify, hotk);
+-	if (ACPI_FAILURE(status)) {
+-		printk(KERN_NOTICE
+-		       "  Error installing notify handler\n");
+-	} else {
+-		printk(KERN_DEBUG
+-		       "  Notify Handler installed successfully\n");
+-	}
++	if (ACPI_FAILURE(status))
++		printk(KERN_ERR "  Error installing notify handler\n");
+ 
+-	/* For HOTK laptops: init the hotk->brightness value */
++	/* For laptops without GPLV: init the hotk->brightness value */
+ 	if ((!hotk->methods->brightness_get) && (!hotk->methods->brightness_status) &&
+ 	    (hotk->methods->brightness_up && hotk->methods->brightness_down)) {
+ 		status = acpi_evaluate_object(NULL, hotk->methods->brightness_down,
+ 					      NULL, NULL);
+ 		if (ACPI_FAILURE(status))
+-			printk(KERN_NOTICE "  Error changing brightness\n");
+-		status = acpi_evaluate_object(NULL, hotk->methods->brightness_up,
+-					      NULL, NULL);
+-		if (ACPI_FAILURE(status))
+-			printk(KERN_NOTICE "  Error changing brightness\n");
++			printk(KERN_WARNING "  Error changing brightness\n");
++		else {
++			status = acpi_evaluate_object(NULL, hotk->methods->brightness_up,
++						      NULL, NULL);
++			if (ACPI_FAILURE(status))
++				printk(KERN_WARNING "  Strange, error changing" 
++				       " brightness\n");
++		}
+ 	}
+ 
+       end:
+@@ -887,7 +936,7 @@ static int asus_hotk_remove(struct acpi_
+ 	status = acpi_remove_notify_handler(hotk->handle, ACPI_SYSTEM_NOTIFY,
+ 					    asus_hotk_notify);
+ 	if (ACPI_FAILURE(status))
+-		printk(KERN_NOTICE "Error removing notify handler\n");
++		printk(KERN_ERR "Asus ACPI: Error removing notify handler\n");
+ 
+ 	kfree(hotk);
+ 
+@@ -899,35 +948,17 @@ static int asus_hotk_remove(struct acpi_
+ 
+ static int __init asus_acpi_init(void)
+ {
+-	int result = 0;
+-	acpi_status status = 0;
+-	struct acpi_buffer dsdt = { ACPI_ALLOCATE_BUFFER, NULL };
+-
+-	printk(KERN_NOTICE "Asus Laptop ACPI Extras version %s\n",
+-	       ASUS_ACPI_VERSION);
+-	/*
+-	 * Here is the code to know the model we are running on. We need to
+-	 * know this before calling the acpi_bus_register_driver function, in
+-	 * case the HID for the laptop we are running on is different from
+-	 * ACPI_HOTK_HID, which I have never seen yet :)
+-	 * 
+-	 * This information is then available in the global var asus_info
+-	 */
+-	status = acpi_get_table(ACPI_TABLE_DSDT, 1, &dsdt);
+-	if (ACPI_FAILURE(status)) {
+-		printk(KERN_NOTICE "  Couldn't get the DSDT table header\n");
+-	} else {
+-		asus_info = (struct acpi_table_header *) dsdt.pointer;
+-	}
++	int result;
+ 
+ 	asus_proc_dir = proc_mkdir(PROC_ASUS, acpi_root_dir);
+-	if (!asus_proc_dir)
++	if (!asus_proc_dir) {
++		printk(KERN_ERR "Asus ACPI: Unable to create /proc entry");
+ 		return(-ENODEV);
++	}
+ 	asus_proc_dir->owner = THIS_MODULE;
+ 
+ 	result = acpi_bus_register_driver(&asus_hotk_driver);
+ 	if (result < 0) {
+-		printk(KERN_NOTICE "  Error registering " ACPI_HOTK_NAME " \n");
+ 		remove_proc_entry(PROC_ASUS, acpi_root_dir);
+ 		return(-ENODEV);
+ 	}
+--- linux-2.6.0-test6/drivers/acpi/bus.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/drivers/acpi/bus.c	2003-10-05 00:33:23.000000000 -0700
+@@ -634,8 +634,7 @@ acpi_bus_init (void)
+ 	 * the EC parameters out of that.
+ 	 */
+ 	status = acpi_ec_ecdt_probe();
+-	if (ACPI_FAILURE(status))
+-		goto error1;
++	/* Ignore result. Not having an ECDT is not fatal. */
+ #endif
+ 
+ 	status = acpi_initialize_objects(ACPI_FULL_INITIALIZATION);
+--- linux-2.6.0-test6/drivers/acpi/dispatcher/dsfield.c	2003-06-14 12:18:25.000000000 -0700
++++ 25/drivers/acpi/dispatcher/dsfield.c	2003-10-05 00:33:23.000000000 -0700
+@@ -105,27 +105,33 @@ acpi_ds_create_buffer_field (
+ 		return_ACPI_STATUS (AE_AML_NO_OPERAND);
+ 	}
+ 
+-	/*
+-	 * During the load phase, we want to enter the name of the field into
+-	 * the namespace.  During the execute phase (when we evaluate the size
+-	 * operand), we want to lookup the name
+-	 */
+-	if (walk_state->parse_flags & ACPI_PARSE_EXECUTE) {
+-		flags = ACPI_NS_NO_UPSEARCH | ACPI_NS_DONT_OPEN_SCOPE;
++	if (walk_state->deferred_node) {
++		node = walk_state->deferred_node;
++		status = AE_OK;
+ 	}
+ 	else {
+-		flags = ACPI_NS_NO_UPSEARCH | ACPI_NS_DONT_OPEN_SCOPE | ACPI_NS_ERROR_IF_FOUND;
+-	}
++		/*
++		 * During the load phase, we want to enter the name of the field into
++		 * the namespace.  During the execute phase (when we evaluate the size
++		 * operand), we want to lookup the name
++		 */
++		if (walk_state->parse_flags & ACPI_PARSE_EXECUTE) {
++			flags = ACPI_NS_NO_UPSEARCH | ACPI_NS_DONT_OPEN_SCOPE;
++		}
++		else {
++			flags = ACPI_NS_NO_UPSEARCH | ACPI_NS_DONT_OPEN_SCOPE | ACPI_NS_ERROR_IF_FOUND;
++		}
+ 
+-	/*
+-	 * Enter the name_string into the namespace
+-	 */
+-	status = acpi_ns_lookup (walk_state->scope_info, arg->common.value.string,
+-			 ACPI_TYPE_ANY, ACPI_IMODE_LOAD_PASS1,
+-			 flags, walk_state, &(node));
+-	if (ACPI_FAILURE (status)) {
+-		ACPI_REPORT_NSERROR (arg->common.value.string, status);
+-		return_ACPI_STATUS (status);
++		/*
++		 * Enter the name_string into the namespace
++		 */
++		status = acpi_ns_lookup (walk_state->scope_info, arg->common.value.string,
++				 ACPI_TYPE_ANY, ACPI_IMODE_LOAD_PASS1,
++				 flags, walk_state, &(node));
++		if (ACPI_FAILURE (status)) {
++			ACPI_REPORT_NSERROR (arg->common.value.string, status);
++			return_ACPI_STATUS (status);
++		}
+ 	}
+ 
+ 	/* We could put the returned object (Node) on the object stack for later, but
+--- linux-2.6.0-test6/drivers/acpi/dispatcher/dsinit.c	2003-06-14 12:18:34.000000000 -0700
++++ 25/drivers/acpi/dispatcher/dsinit.c	2003-10-05 00:33:23.000000000 -0700
+@@ -135,7 +135,7 @@ acpi_ds_init_one_object (
+ 		}
+ 
+ 		/*
+-		 * Always parse methods to detect errors, we may delete
++		 * Always parse methods to detect errors, we will delete
+ 		 * the parse tree below
+ 		 */
+ 		status = acpi_ds_parse_method (obj_handle);
+@@ -150,7 +150,7 @@ acpi_ds_init_one_object (
+ 		}
+ 
+ 		/*
+-		 * Delete the parse tree.  We simple re-parse the method
++		 * Delete the parse tree.  We simply re-parse the method
+ 		 * for every execution since there isn't much overhead
+ 		 */
+ 		acpi_ns_delete_namespace_subtree (obj_handle);
+--- linux-2.6.0-test6/drivers/acpi/dispatcher/dsopcode.c	2003-06-14 12:18:30.000000000 -0700
++++ 25/drivers/acpi/dispatcher/dsopcode.c	2003-10-05 00:33:23.000000000 -0700
+@@ -65,7 +65,7 @@
+  *
+  * RETURN:      Status.
+  *
+- * DESCRIPTION: Late execution of region or field arguments
++ * DESCRIPTION: Late (deferred) execution of region or field arguments
+  *
+  ****************************************************************************/
+ 
+@@ -111,7 +111,10 @@ acpi_ds_execute_arguments (
+ 		return_ACPI_STATUS (status);
+ 	}
+ 
++	/* Mark this parse as a deferred opcode */
++
+ 	walk_state->parse_flags = ACPI_PARSE_DEFERRED_OP;
++	walk_state->deferred_node = node;
+ 
+ 	/* Pass1: Parse the entire declaration */
+ 
+@@ -128,7 +131,7 @@ acpi_ds_execute_arguments (
+ 	arg->common.node = node;
+ 	acpi_ps_delete_parse_tree (op);
+ 
+-	/* Evaluate the address and length arguments for the Buffer Field */
++	/* Evaluate the deferred arguments */
+ 
+ 	op = acpi_ps_alloc_op (AML_INT_EVAL_SUBTREE_OP);
+ 	if (!op) {
+@@ -144,6 +147,8 @@ acpi_ds_execute_arguments (
+ 		return_ACPI_STATUS (AE_NO_MEMORY);
+ 	}
+ 
++	/* Execute the opcode and arguments */
++
+ 	status = acpi_ds_init_aml_walk (walk_state, op, NULL, aml_start,
+ 			  aml_length, NULL, NULL, 3);
+ 	if (ACPI_FAILURE (status)) {
+@@ -151,6 +156,9 @@ acpi_ds_execute_arguments (
+ 		return_ACPI_STATUS (status);
+ 	}
+ 
++	/* Mark this execution as a deferred opcode */
++
++	walk_state->deferred_node = node;
+ 	status = acpi_ps_parse_aml (walk_state);
+ 	acpi_ps_delete_parse_tree (op);
+ 	return_ACPI_STATUS (status);
+@@ -192,7 +200,7 @@ acpi_ds_get_buffer_field_arguments (
+ 	node = obj_desc->buffer_field.node;
+ 
+ 	ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname (ACPI_TYPE_BUFFER_FIELD, node, NULL));
+-	ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "[%4.4s] buffer_field JIT Init\n",
++	ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "[%4.4s] buffer_field Arg Init\n",
+ 		node->name.ascii));
+ 
+ 	/* Execute the AML code for the term_arg arguments */
+@@ -207,7 +215,7 @@ acpi_ds_get_buffer_field_arguments (
+  *
+  * FUNCTION:    acpi_ds_get_buffer_arguments
+  *
+- * PARAMETERS:  obj_desc        - A valid Bufferobject
++ * PARAMETERS:  obj_desc        - A valid Buffer object
+  *
+  * RETURN:      Status.
+  *
+@@ -240,7 +248,7 @@ acpi_ds_get_buffer_arguments (
+ 		return_ACPI_STATUS (AE_AML_INTERNAL);
+ 	}
+ 
+-	ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Buffer JIT Init\n"));
++	ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Buffer Arg Init\n"));
+ 
+ 	/* Execute the AML code for the term_arg arguments */
+ 
+@@ -254,7 +262,7 @@ acpi_ds_get_buffer_arguments (
+  *
+  * FUNCTION:    acpi_ds_get_package_arguments
+  *
+- * PARAMETERS:  obj_desc        - A valid Packageobject
++ * PARAMETERS:  obj_desc        - A valid Package object
+  *
+  * RETURN:      Status.
+  *
+@@ -287,7 +295,7 @@ acpi_ds_get_package_arguments (
+ 		return_ACPI_STATUS (AE_AML_INTERNAL);
+ 	}
+ 
+-	ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Package JIT Init\n"));
++	ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Package Arg Init\n"));
+ 
+ 	/* Execute the AML code for the term_arg arguments */
+ 
+@@ -335,11 +343,12 @@ acpi_ds_get_region_arguments (
+ 
+ 	node = obj_desc->region.node;
+ 
+-	ACPI_DEBUG_EXEC(acpi_ut_display_init_pathname (ACPI_TYPE_REGION, node, NULL));
++	ACPI_DEBUG_EXEC (acpi_ut_display_init_pathname (ACPI_TYPE_REGION, node, NULL));
+ 
+-	ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "[%4.4s] op_region Init at AML %p\n",
++	ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "[%4.4s] op_region Arg Init at AML %p\n",
+ 		node->name.ascii, extra_desc->extra.aml_start));
+ 
++	/* Execute the argument AML */
+ 
+ 	status = acpi_ds_execute_arguments (node, acpi_ns_get_parent_node (node),
+ 			 extra_desc->extra.aml_length, extra_desc->extra.aml_start);
+@@ -505,14 +514,16 @@ acpi_ds_init_buffer_field (
+ 		goto cleanup;
+ 	}
+ 
+-
+ 	/* Entire field must fit within the current length of the buffer */
+ 
+ 	if ((bit_offset + bit_count) >
+ 		(8 * (u32) buffer_desc->buffer.length)) {
+ 		ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
+-			"Field size %d exceeds Buffer size %d (bits)\n",
+-			 bit_offset + bit_count, 8 * (u32) buffer_desc->buffer.length));
++			"Field [%4.4s] size %d exceeds Buffer [%4.4s] size %d (bits)\n",
++			((struct acpi_namespace_node *) result_desc)->name.ascii,
++			 bit_offset + bit_count,
++			 buffer_desc->buffer.node->name.ascii,
++			 8 * (u32) buffer_desc->buffer.length));
+ 		status = AE_AML_BUFFER_LIMIT;
+ 		goto cleanup;
+ 	}
+--- linux-2.6.0-test6/drivers/acpi/dispatcher/dsutils.c	2003-06-14 12:18:09.000000000 -0700
++++ 25/drivers/acpi/dispatcher/dsutils.c	2003-10-05 00:33:23.000000000 -0700
+@@ -53,6 +53,7 @@
+ #define _COMPONENT          ACPI_DISPATCHER
+ 	 ACPI_MODULE_NAME    ("dsutils")
+ 
++
+ #ifndef ACPI_NO_METHOD_EXECUTION
+ 
+ /*******************************************************************************
+@@ -196,7 +197,6 @@ result_not_used:
+ 			acpi_ps_get_opcode_name (op->common.parent->common.aml_opcode), op));
+ 
+ 	return_VALUE (FALSE);
+-
+ }
+ 
+ 
+@@ -239,7 +239,6 @@ acpi_ds_delete_result_if_not_used (
+ 		return_VOID;
+ 	}
+ 
+-
+ 	if (!acpi_ds_is_result_used (op, walk_state)) {
+ 		/*
+ 		 * Must pop the result stack (obj_desc should be equal to result_obj)
+@@ -389,61 +388,77 @@ acpi_ds_create_operand (
+ 		 * in name_string
+ 		 */
+ 
++
+ 		/*
+-		 * Differentiate between a namespace "create" operation
+-		 * versus a "lookup" operation (IMODE_LOAD_PASS2 vs.
+-		 * IMODE_EXECUTE) in order to support the creation of
+-		 * namespace objects during the execution of control methods.
++		 * Special handling for buffer_field declarations. This is a deferred
++		 * opcode that unfortunately defines the field name as the last
++		 * parameter instead of the first.  We get here when we are performing
++		 * the deferred execution, so the actual name of the field is already
++		 * in the namespace.  We don't want to attempt to look it up again
++		 * because we may be executing in a different scope than where the
++		 * actual opcode exists.
+ 		 */
+-		parent_op = arg->common.parent;
+-		op_info = acpi_ps_get_opcode_info (parent_op->common.aml_opcode);
+-		if ((op_info->flags & AML_NSNODE) &&
+-			(parent_op->common.aml_opcode != AML_INT_METHODCALL_OP) &&
+-			(parent_op->common.aml_opcode != AML_REGION_OP) &&
+-			(parent_op->common.aml_opcode != AML_INT_NAMEPATH_OP)) {
+-			/* Enter name into namespace if not found */
+-
+-			interpreter_mode = ACPI_IMODE_LOAD_PASS2;
++		if ((walk_state->deferred_node) &&
++			(walk_state->deferred_node->type == ACPI_TYPE_BUFFER_FIELD) &&
++			(arg_index != 0)) {
++			obj_desc = ACPI_CAST_PTR (union acpi_operand_object, walk_state->deferred_node);
++			status = AE_OK;
+ 		}
++		else    /* All other opcodes */ {
++			/*
++			 * Differentiate between a namespace "create" operation
++			 * versus a "lookup" operation (IMODE_LOAD_PASS2 vs.
++			 * IMODE_EXECUTE) in order to support the creation of
++			 * namespace objects during the execution of control methods.
++			 */
++			parent_op = arg->common.parent;
++			op_info = acpi_ps_get_opcode_info (parent_op->common.aml_opcode);
++			if ((op_info->flags & AML_NSNODE) &&
++				(parent_op->common.aml_opcode != AML_INT_METHODCALL_OP) &&
++				(parent_op->common.aml_opcode != AML_REGION_OP) &&
++				(parent_op->common.aml_opcode != AML_INT_NAMEPATH_OP)) {
++				/* Enter name into namespace if not found */
+ 
+-		else {
+-			/* Return a failure if name not found */
+-
+-			interpreter_mode = ACPI_IMODE_EXECUTE;
+-		}
++				interpreter_mode = ACPI_IMODE_LOAD_PASS2;
++			}
++			else {
++				/* Return a failure if name not found */
+ 
+-		status = acpi_ns_lookup (walk_state->scope_info, name_string,
+-				 ACPI_TYPE_ANY, interpreter_mode,
+-				 ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE,
+-				 walk_state,
+-				 ACPI_CAST_INDIRECT_PTR (struct acpi_namespace_node, &obj_desc));
+-		/*
+-		 * The only case where we pass through (ignore) a NOT_FOUND
+-		 * error is for the cond_ref_of opcode.
+-		 */
+-		if (status == AE_NOT_FOUND) {
+-			if (parent_op->common.aml_opcode == AML_COND_REF_OF_OP) {
+-				/*
+-				 * For the Conditional Reference op, it's OK if
+-				 * the name is not found;  We just need a way to
+-				 * indicate this to the interpreter, set the
+-				 * object to the root
+-				 */
+-				obj_desc = ACPI_CAST_PTR (union acpi_operand_object, acpi_gbl_root_node);
+-				status = AE_OK;
++				interpreter_mode = ACPI_IMODE_EXECUTE;
+ 			}
+ 
+-			else {
+-				/*
+-				 * We just plain didn't find it -- which is a
+-				 * very serious error at this point
+-				 */
+-				status = AE_AML_NAME_NOT_FOUND;
++			status = acpi_ns_lookup (walk_state->scope_info, name_string,
++					 ACPI_TYPE_ANY, interpreter_mode,
++					 ACPI_NS_SEARCH_PARENT | ACPI_NS_DONT_OPEN_SCOPE,
++					 walk_state,
++					 ACPI_CAST_INDIRECT_PTR (struct acpi_namespace_node, &obj_desc));
++			/*
++			 * The only case where we pass through (ignore) a NOT_FOUND
++			 * error is for the cond_ref_of opcode.
++			 */
++			if (status == AE_NOT_FOUND) {
++				if (parent_op->common.aml_opcode == AML_COND_REF_OF_OP) {
++					/*
++					 * For the Conditional Reference op, it's OK if
++					 * the name is not found;  We just need a way to
++					 * indicate this to the interpreter, set the
++					 * object to the root
++					 */
++					obj_desc = ACPI_CAST_PTR (union acpi_operand_object, acpi_gbl_root_node);
++					status = AE_OK;
++				}
++				else {
++					/*
++					 * We just plain didn't find it -- which is a
++					 * very serious error at this point
++					 */
++					status = AE_AML_NAME_NOT_FOUND;
++				}
+ 			}
+-		}
+ 
+-		if (ACPI_FAILURE (status)) {
+-			ACPI_REPORT_NSERROR (name_string, status);
++			if (ACPI_FAILURE (status)) {
++				ACPI_REPORT_NSERROR (name_string, status);
++			}
+ 		}
+ 
+ 		/* Free the namestring created above */
+@@ -464,8 +479,6 @@ acpi_ds_create_operand (
+ 		}
+ 		ACPI_DEBUGGER_EXEC (acpi_db_display_argument_object (obj_desc, walk_state));
+ 	}
+-
+-
+ 	else {
+ 		/* Check for null name case */
+ 
+@@ -480,7 +493,6 @@ acpi_ds_create_operand (
+ 
+ 			ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, "Null namepath: Arg=%p\n", arg));
+ 		}
+-
+ 		else {
+ 			opcode = arg->common.aml_opcode;
+ 		}
+--- linux-2.6.0-test6/drivers/acpi/dispatcher/dswload.c	2003-06-14 12:17:57.000000000 -0700
++++ 25/drivers/acpi/dispatcher/dswload.c	2003-10-05 00:33:23.000000000 -0700
+@@ -248,6 +248,14 @@ acpi_ds_load1_begin_op (
+ 		 *       buffer_field, or Package), the name of the object is already
+ 		 *       in the namespace.
+ 		 */
++		if (walk_state->deferred_node) {
++			/* This name is already in the namespace, get the node */
++
++			node = walk_state->deferred_node;
++			status = AE_OK;
++			break;
++		}
++
+ 		flags = ACPI_NS_NO_UPSEARCH;
+ 		if ((walk_state->opcode != AML_SCOPE_OP) &&
+ 			(!(walk_state->parse_flags & ACPI_PARSE_DEFERRED_OP))) {
+@@ -589,7 +597,17 @@ acpi_ds_load2_begin_op (
+ 		 * Enter the named type into the internal namespace.  We enter the name
+ 		 * as we go downward in the parse tree.  Any necessary subobjects that involve
+ 		 * arguments to the opcode must be created as we go back up the parse tree later.
++		 *
++		 * Note: Name may already exist if we are executing a deferred opcode.
+ 		 */
++		if (walk_state->deferred_node) {
++			/* This name is already in the namespace, get the node */
++
++			node = walk_state->deferred_node;
++			status = AE_OK;
++			break;
++		}
++
+ 		status = acpi_ns_lookup (walk_state->scope_info, buffer_ptr, object_type,
+ 				  ACPI_IMODE_EXECUTE, ACPI_NS_NO_UPSEARCH, walk_state, &(node));
+ 		break;
+--- linux-2.6.0-test6/drivers/acpi/dispatcher/dswscope.c	2003-06-14 12:18:51.000000000 -0700
++++ 25/drivers/acpi/dispatcher/dswscope.c	2003-10-05 00:33:23.000000000 -0700
+@@ -121,10 +121,9 @@ acpi_ds_scope_stack_push (
+ 	/* Make sure object type is valid */
+ 
+ 	if (!acpi_ut_valid_object_type (type)) {
+-		ACPI_REPORT_WARNING (("ds_scope_stack_push: type code out of range\n"));
++		ACPI_REPORT_WARNING (("ds_scope_stack_push: Invalid object type: 0x%X\n", type));
+ 	}
+ 
+-
+ 	/* Allocate a new scope object */
+ 
+ 	scope_info = acpi_ut_create_generic_state ();
+@@ -146,13 +145,13 @@ acpi_ds_scope_stack_push (
+ 	old_scope_info = walk_state->scope_info;
+ 	if (old_scope_info) {
+ 		ACPI_DEBUG_PRINT_RAW ((ACPI_DB_EXEC,
+-			"[%4.4s] (%10s)",
++			"[%4.4s] (%s)",
+ 			old_scope_info->scope.node->name.ascii,
+ 			acpi_ut_get_type_name (old_scope_info->common.value)));
+ 	}
+ 	else {
+ 		ACPI_DEBUG_PRINT_RAW ((ACPI_DB_EXEC,
+-			"[\\___] (%10s)", "ROOT"));
++			"[\\___] (%s)", "ROOT"));
+ 	}
+ 
+ 	ACPI_DEBUG_PRINT_RAW ((ACPI_DB_EXEC,
+@@ -163,7 +162,6 @@ acpi_ds_scope_stack_push (
+ 	/* Push new scope object onto stack */
+ 
+ 	acpi_ut_push_generic_state (&walk_state->scope_info, scope_info);
+-
+ 	return_ACPI_STATUS (AE_OK);
+ }
+ 
+@@ -207,7 +205,7 @@ acpi_ds_scope_stack_pop (
+ 	walk_state->scope_depth--;
+ 
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
+-		"[%.2d] Popped scope [%4.4s] (%10s), New scope -> ",
++		"[%.2d] Popped scope [%4.4s] (%s), New scope -> ",
+ 		(u32) walk_state->scope_depth,
+ 		scope_info->scope.node->name.ascii,
+ 		acpi_ut_get_type_name (scope_info->common.value)));
+@@ -225,7 +223,6 @@ acpi_ds_scope_stack_pop (
+ 	}
+ 
+ 	acpi_ut_delete_generic_state (scope_info);
+-
+ 	return_ACPI_STATUS (AE_OK);
+ }
+ 
+--- linux-2.6.0-test6/drivers/acpi/dispatcher/dswstate.c	2003-06-14 12:18:32.000000000 -0700
++++ 25/drivers/acpi/dispatcher/dswstate.c	2003-10-05 00:33:23.000000000 -0700
+@@ -56,11 +56,12 @@
+  * FUNCTION:    acpi_ds_result_insert
+  *
+  * PARAMETERS:  Object              - Object to push
++ *              Index               - Where to insert the object
+  *              walk_state          - Current Walk state
+  *
+  * RETURN:      Status
+  *
+- * DESCRIPTION: Push an object onto this walk's result stack
++ * DESCRIPTION: Insert an object onto this walk's result stack
+  *
+  ******************************************************************************/
+ 
+@@ -114,6 +115,7 @@ acpi_ds_result_insert (
+  * FUNCTION:    acpi_ds_result_remove
+  *
+  * PARAMETERS:  Object              - Where to return the popped object
++ *              Index               - Where to extract the object
+  *              walk_state          - Current Walk state
+  *
+  * RETURN:      Status
+@@ -233,6 +235,7 @@ acpi_ds_result_pop (
+ 	return (AE_AML_NO_RETURN_VALUE);
+ }
+ 
++
+ /*******************************************************************************
+  *
+  * FUNCTION:    acpi_ds_result_pop_from_bottom
+@@ -295,7 +298,6 @@ acpi_ds_result_pop_from_bottom (
+ 		*object, (*object) ? acpi_ut_get_object_type_name (*object) : "NULL",
+ 		state, walk_state));
+ 
+-
+ 	return (AE_OK);
+ }
+ 
+@@ -358,8 +360,7 @@ acpi_ds_result_push (
+  *
+  * FUNCTION:    acpi_ds_result_stack_push
+  *
+- * PARAMETERS:  Object              - Object to push
+- *              walk_state          - Current Walk state
++ * PARAMETERS:  walk_state          - Current Walk state
+  *
+  * RETURN:      Status
+  *
+@@ -420,7 +421,6 @@ acpi_ds_result_stack_pop (
+ 		return (AE_AML_NO_OPERAND);
+ 	}
+ 
+-
+ 	state = acpi_ut_pop_generic_state (&walk_state->results);
+ 
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
+@@ -572,6 +572,7 @@ acpi_ds_obj_stack_pop_object (
+ }
+ #endif
+ 
++
+ /*******************************************************************************
+  *
+  * FUNCTION:    acpi_ds_obj_stack_pop
+@@ -641,6 +642,7 @@ acpi_ds_obj_stack_pop_and_delete (
+ 	u32                             i;
+ 	union acpi_operand_object       *obj_desc;
+ 
++
+ 	ACPI_FUNCTION_NAME ("ds_obj_stack_pop_and_delete");
+ 
+ 
+@@ -883,8 +885,15 @@ acpi_ds_create_walk_state (
+  * FUNCTION:    acpi_ds_init_aml_walk
+  *
+  * PARAMETERS:  walk_state      - New state to be initialized
++ *              Op              - Current parse op
++ *              method_node     - Control method NS node, if any
++ *              aml_start       - Start of AML
++ *              aml_length      - Length of AML
++ *              Params          - Method args, if any
++ *              return_obj_desc - Where to store a return object, if any
++ *              pass_number     - 1, 2, or 3
+  *
+- * RETURN:      None
++ * RETURN:      Status
+  *
+  * DESCRIPTION: Initialize a walk state for a pass 1 or 2 parse tree walk
+  *
+@@ -927,9 +936,9 @@ acpi_ds_init_aml_walk (
+ 
+ 	if (method_node) {
+ 		walk_state->parser_state.start_node = method_node;
+-		walk_state->walk_type               = ACPI_WALK_METHOD;
+-		walk_state->method_node             = method_node;
+-		walk_state->method_desc             = acpi_ns_get_attached_object (method_node);
++		walk_state->walk_type            = ACPI_WALK_METHOD;
++		walk_state->method_node          = method_node;
++		walk_state->method_desc          = acpi_ns_get_attached_object (method_node);
+ 
+ 		/* Push start scope on scope stack and make it current  */
+ 
+@@ -956,6 +965,7 @@ acpi_ds_init_aml_walk (
+ 		while (extra_op && !extra_op->common.node) {
+ 			extra_op = extra_op->common.parent;
+ 		}
++
+ 		if (!extra_op) {
+ 			parser_state->start_node = NULL;
+ 		}
+@@ -1014,7 +1024,7 @@ acpi_ds_delete_walk_state (
+ 		ACPI_DEBUG_PRINT ((ACPI_DB_ERROR, "%p walk still has a scope list\n", walk_state));
+ 	}
+ 
+-   /* Always must free any linked control states */
++	/* Always must free any linked control states */
+ 
+ 	while (walk_state->control_state) {
+ 		state = walk_state->control_state;
+--- linux-2.6.0-test6/drivers/acpi/ec.c	2003-06-14 12:18:22.000000000 -0700
++++ 25/drivers/acpi/ec.c	2003-10-05 00:33:24.000000000 -0700
+@@ -32,7 +32,7 @@
+ #include <asm/io.h>
+ #include <acpi/acpi_bus.h>
+ #include <acpi/acpi_drivers.h>
+-
++#include <acpi/actypes.h>
+ 
+ #define _COMPONENT		ACPI_EC_COMPONENT
+ ACPI_MODULE_NAME		("acpi_ec")
+@@ -412,7 +412,10 @@ acpi_ec_space_setup (
+ 	 * The EC object is in the handler context and is needed
+ 	 * when calling the acpi_ec_space_handler.
+ 	 */
+-	*return_context = handler_context;
++	if(function == ACPI_REGION_DEACTIVATE) 
++		*return_context = NULL;
++	else 
++		*return_context = handler_context;
+ 
+ 	return AE_OK;
+ }
+--- linux-2.6.0-test6/drivers/acpi/events/evregion.c	2003-06-14 12:18:25.000000000 -0700
++++ 25/drivers/acpi/events/evregion.c	2003-10-05 00:33:24.000000000 -0700
+@@ -382,7 +382,7 @@ acpi_ev_detach_region(
+ 	union acpi_operand_object       *obj_desc;
+ 	union acpi_operand_object       **last_obj_ptr;
+ 	acpi_adr_space_setup            region_setup;
+-	void                            *region_context;
++	void                            **region_context;
+ 	union acpi_operand_object       *region_obj2;
+ 	acpi_status                     status;
+ 
+@@ -394,7 +394,7 @@ acpi_ev_detach_region(
+ 	if (!region_obj2) {
+ 		return_VOID;
+ 	}
+-	region_context = region_obj2->extra.region_context;
++	region_context = &region_obj2->extra.region_context;
+ 
+ 	/* Get the address handler from the region object */
+ 
+@@ -450,7 +450,7 @@ acpi_ev_detach_region(
+ 
+ 			region_setup = handler_obj->address_space.setup;
+ 			status = region_setup (region_obj, ACPI_REGION_DEACTIVATE,
+-					  handler_obj->address_space.context, &region_context);
++					  handler_obj->address_space.context, region_context);
+ 
+ 			/* Init routine may fail, Just ignore errors */
+ 
+--- linux-2.6.0-test6/drivers/acpi/executer/excreate.c	2003-06-14 12:18:34.000000000 -0700
++++ 25/drivers/acpi/executer/excreate.c	2003-10-05 00:33:24.000000000 -0700
+@@ -286,7 +286,7 @@ acpi_ex_create_region (
+ 	ACPI_FUNCTION_TRACE ("ex_create_region");
+ 
+ 
+-	/* Get the Node from the object stack  */
++	/* Get the Namespace Node */
+ 
+ 	node = walk_state->op->common.node;
+ 
+@@ -311,7 +311,6 @@ acpi_ex_create_region (
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_LOAD, "Region Type - %s (%X)\n",
+ 			  acpi_ut_get_region_name (region_space), region_space));
+ 
+-
+ 	/* Create the region descriptor */
+ 
+ 	obj_desc = acpi_ut_create_internal_object (ACPI_TYPE_REGION);
+@@ -375,6 +374,7 @@ acpi_ex_create_table_region (
+ 
+ 	ACPI_FUNCTION_TRACE ("ex_create_table_region");
+ 
++
+ 	/* Get the Node from the object stack  */
+ 
+ 	node = walk_state->op->common.node;
+@@ -392,7 +392,6 @@ acpi_ex_create_table_region (
+ 	status = acpi_tb_find_table (operand[1]->string.pointer,
+ 			   operand[2]->string.pointer,
+ 			   operand[3]->string.pointer, &table);
+-
+ 	if (ACPI_FAILURE (status)) {
+ 		return_ACPI_STATUS (status);
+ 	}
+@@ -489,7 +488,6 @@ acpi_ex_create_processor (
+ 	status = acpi_ns_attach_object ((struct acpi_namespace_node *) operand[0],
+ 			  obj_desc, ACPI_TYPE_PROCESSOR);
+ 
+-
+ 	/* Remove local reference to the object */
+ 
+ 	acpi_ut_remove_reference (obj_desc);
+@@ -540,7 +538,6 @@ acpi_ex_create_power_resource (
+ 	status = acpi_ns_attach_object ((struct acpi_namespace_node *) operand[0],
+ 			  obj_desc, ACPI_TYPE_POWER);
+ 
+-
+ 	/* Remove local reference to the object */
+ 
+ 	acpi_ut_remove_reference (obj_desc);
+@@ -609,7 +606,6 @@ acpi_ex_create_method (
+ 		obj_desc->method.concurrency = (u8)
+ 				  (((method_flags & METHOD_FLAGS_SYNCH_LEVEL) >> 4) + 1);
+ 	}
+-
+ 	else {
+ 		obj_desc->method.concurrency = INFINITE_CONCURRENCY;
+ 	}
+--- linux-2.6.0-test6/drivers/acpi/executer/exfldio.c	2003-06-14 12:18:06.000000000 -0700
++++ 25/drivers/acpi/executer/exfldio.c	2003-10-05 00:33:24.000000000 -0700
+@@ -139,7 +139,41 @@ acpi_ex_setup_region (
+ 			field_datum_byte_offset, obj_desc->common_field.access_byte_width,
+ 			rgn_desc->region.node->name.ascii, rgn_desc->region.length));
+ 
+-		return_ACPI_STATUS (AE_AML_REGION_LIMIT);
++		#ifdef CONFIG_ACPI_RELAXED_AML
++		{
++			/*
++			 * Allow access to the field if it is within the region size
++			 * rounded up to a multiple of the access byte width.  This
++			 * overcomes "off-by-one" programming errors in the AML often
++			 * found in Toshiba laptops.  These errors were allowed by
++			 * the Microsoft ASL compiler.
++			 */
++			u32 rounded_length = ACPI_ROUND_UP(rgn_desc->region.length,
++									obj_desc->common_field.access_byte_width);
++
++			if (rounded_length < (obj_desc->common_field.base_byte_offset
++						+ field_datum_byte_offset
++						+ obj_desc->common_field.access_byte_width)) {
++				return_ACPI_STATUS (AE_AML_REGION_LIMIT);
++			} else {
++				static int	warn_once = 1;
++				if (warn_once) {
++					// Could also associate a flag with each field, and
++					// warn once for each field.
++					ACPI_REPORT_WARNING((
++						"The ACPI AML in your computer contains errors, "
++						"please nag the manufacturer to correct it.\n"));
++					ACPI_REPORT_WARNING((
++						"Allowing relaxed access to fields; "
++						"turn on CONFIG_ACPI_DEBUG for details.\n"));
++					warn_once = 0;
++				}
++				return_ACPI_STATUS (AE_OK);
++			}
++		}
++		#else
++			return_ACPI_STATUS (AE_AML_REGION_LIMIT);
++		#endif
+ 	}
+ 
+ 	return_ACPI_STATUS (AE_OK);
+--- linux-2.6.0-test6/drivers/acpi/Kconfig	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/acpi/Kconfig	2003-10-05 00:36:23.000000000 -0700
+@@ -3,34 +3,14 @@
+ #
+ 
+ menu "ACPI (Advanced Configuration and Power Interface) Support"
+-
+-config ACPI_HT
+-	bool "ACPI Processor Enumeration for HT"
+-	depends on X86
+-	default y
+-	---help---
+-	  ACPI enumerates both logical (a.k.a. Hyper-Threaded -- HT)
+-	  and physical processors.  It is designed to obsolete several older
+-	  specifications, including the MultiProcessor Specification (MPS),
+-	  which supported only physical processors.
+-
+-	  CONFIG_ACPI_HT includes the minimal ACPI boot-time code
+-	  necessary to enumerate logical processors and enable HT.
+-
+-	  CONFIG_ACPI includes CONFIG_ACPI_HT, plus IO APIC enumeration,
+-	  and the hooks to run the ACPI AML interpreter for run-time events.
+-
+-	  When CONFIG_ACPI is selected, the command-line option "acpi=ht"
+-	  is available to run just the ACPI boot-time code -- just as if
+-	  only CONFIG_ACPI_HT were selected.
+-
+-	  Note that "acpi=off" can be used to disable all ACPI code in the kernel.
+-
+-config ACPI
+-	bool "Full ACPI Support"
+ 	depends on !X86_VISWS
+ 	depends on !IA64_HP_SIM
+-	depends on IA64 || (X86 || ACPI_HT)
++	depends on IA64 || X86
++
++config ACPI
++	bool "ACPI Support"
++	depends on IA64 || X86
++
+ 	default y
+ 	---help---
+ 	  Advanced Configuration and Power Interface (ACPI) support for 
+@@ -62,12 +42,19 @@ config ACPI
+ 
+ config ACPI_BOOT
+ 	bool
+-	depends on ACPI || ACPI_HT
++	depends on ACPI || X86_HT
++	default y
++
++config ACPI_INTERPRETER
++	bool
++	depends on ACPI
++	depends on !IA64_SGI_SN
+ 	default y
+ 
+ config ACPI_SLEEP
+ 	bool "Sleep States (EXPERIMENTAL)"
+ 	depends on X86 && ACPI
++	depends on ACPI_INTERPRETER
+ 	depends on EXPERIMENTAL && PM
+ 	default y
+ 	---help---
+@@ -93,7 +80,8 @@ config ACPI_SLEEP_PROC_FS
+ 
+ config ACPI_AC
+ 	tristate "AC Adapter"
+-	depends on X86 && ACPI
++	depends on X86
++	depends on ACPI_INTERPRETER
+ 	default m
+ 	help
+ 	  This driver adds support for the AC Adapter object, which indicates
+@@ -102,7 +90,8 @@ config ACPI_AC
+ 
+ config ACPI_BATTERY
+ 	tristate "Battery"
+-	depends on X86 && ACPI
++	depends on X86
++	depends on ACPI_INTERPRETER
+ 	default m
+ 	help
+ 	  This driver adds support for battery information through
+@@ -111,7 +100,7 @@ config ACPI_BATTERY
+ 
+ config ACPI_BUTTON
+ 	tristate "Button"
+-	depends on ACPI
++	depends on ACPI_INTERPRETER
+ 	depends on !IA64_SGI_SN
+ 	default m
+ 	help
+@@ -123,7 +112,7 @@ config ACPI_BUTTON
+ 
+ config ACPI_FAN
+ 	tristate "Fan"
+-	depends on ACPI
++	depends on ACPI_INTERPRETER
+ 	depends on !IA64_SGI_SN
+ 	default m
+ 	help
+@@ -132,7 +121,7 @@ config ACPI_FAN
+ 
+ config ACPI_PROCESSOR
+ 	tristate "Processor"
+-	depends on ACPI
++	depends on ACPI_INTERPRETER
+ 	depends on !IA64_SGI_SN
+ 	default m
+ 	help
+@@ -152,14 +141,15 @@ config ACPI_THERMAL
+ 
+ config ACPI_NUMA
+ 	bool "NUMA support"
+-	depends on ACPI
++	depends on ACPI_INTERPRETER
+ 	depends on NUMA
+ 	depends on !X86_64
+ 	default y if IA64_GENERIC || IA64_SGI_SN2
+ 
+ config ACPI_ASUS
+         tristate "ASUS/Medion Laptop Extras"
+-        depends on X86 && ACPI
++	depends on X86
++	depends on ACPI_INTERPRETER
+ 	default m
+         ---help---
+           This driver provides support for extra features of ACPI-compatible
+@@ -170,6 +160,9 @@ config ACPI_ASUS
+           display brightness and output, switching the LCD backlight on and off,
+           and most importantly, allows you to blink those fancy LEDs intended
+           for reporting mail and wireless status.
++
++	  Note: display switching code is currently considered EXPERIMENTAL,
++	  toying with these values may even lock your machine.
+           
+           All settings are changed via /proc/acpi/asus directory entries. Owner
+           and group for these entries can be set with asus_uid and asus_gid
+@@ -185,7 +178,8 @@ config ACPI_ASUS
+           
+ config ACPI_TOSHIBA
+ 	tristate "Toshiba Laptop Extras"
+-	depends on X86 && ACPI
++	depends on X86
++	depends on ACPI_INTERPRETER
+ 	default m
+ 	---help---
+ 	  This driver adds support for access to certain system settings
+@@ -212,7 +206,7 @@ config ACPI_TOSHIBA
+ 
+ config ACPI_DEBUG
+ 	bool "Debug Statements"
+-	depends on ACPI
++	depends on ACPI_INTERPRETER
+ 	depends on !IA64_SGI_SN
+ 	default n
+ 	help
+@@ -222,19 +216,14 @@ config ACPI_DEBUG
+ 
+ config ACPI_BUS
+ 	bool
+-	depends on ACPI
+-	depends on !IA64_SGI_SN
+-	default y
+-
+-config ACPI_INTERPRETER
+-	bool
+-	depends on ACPI
++	depends on ACPI_INTERPRETER
+ 	depends on !IA64_SGI_SN
+ 	default y
+ 
+ config ACPI_EC
+ 	bool
+-	depends on X86 && ACPI
++	depends on X86
++	depends on ACPI_INTERPRETER
+ 	default y
+ 	help
+ 	  This driver is required on some systems for the proper operation of
+@@ -243,19 +232,19 @@ config ACPI_EC
+ 
+ config ACPI_POWER
+ 	bool
+-	depends on ACPI
++	depends on ACPI_INTERPRETER
+ 	depends on !IA64_SGI_SN
+ 	default y
+ 
+ config ACPI_PCI
+ 	bool
+-	depends on ACPI
++	depends on ACPI_INTERPRETER
+ 	depends on !IA64_SGI_SN
+ 	default PCI
+ 
+ config ACPI_SYSTEM
+ 	bool
+-	depends on ACPI
++	depends on ACPI_INTERPRETER
+ 	depends on !IA64_SGI_SN
+ 	default y
+ 	help
+@@ -263,10 +252,28 @@ config ACPI_SYSTEM
+ 	  dump your ACPI DSDT table using /proc/acpi/dsdt.
+ 
+ config ACPI_EFI
+-	bool
+-	depends on ACPI
+-	depends on IA64
+-	default y
++ 	bool "Obtain RSDP from EFI Configuration Table"
++	depends on ACPI_INTERPRETER
++	depends on IA64 || X86
++  	default n
++ 	help
++ 	   On EFI Systems the RSDP pointer is passed to the kernel via
++ 	   the EFI Configuration Table.  On Itanium systems this is
++ 	   standard and required.  For IA-32, systems that have
++ 	   EFI firmware should leave this enabled.  Platforms with
++ 	   traditional legacy BIOS should disable this option.
++
++config ACPI_RELAXED_AML
++	bool "Relaxed AML"
++	depends on ACPI_INTERPRETER
++	depends on !IA64_SGI_SN
++	default n
++	help
++	  If you say `Y' here, the ACPI interpreter will relax its checking
++	  for valid AML and will ignore some AML mistakes, such as off-by-one
++	  errors in region sizes.  Some laptops may require this option.  In
++	  particular, many Toshiba laptops require this for correct operation
++	  of the AC module.
+ 
+ endmenu
+ 
+--- linux-2.6.0-test6/drivers/acpi/Makefile	2003-08-22 19:23:40.000000000 -0700
++++ 25/drivers/acpi/Makefile	2003-10-05 00:33:23.000000000 -0700
+@@ -18,7 +18,7 @@ obj-$(CONFIG_ACPI)		:= acpi_ksyms.o 
+ # ACPI Boot-Time Table Parsing
+ #
+ obj-$(CONFIG_ACPI_BOOT)		+= tables.o
+-obj-$(CONFIG_ACPI)		+= blacklist.o
++obj-$(CONFIG_ACPI_INTERPRETER)	+= blacklist.o
+ 
+ #
+ # ACPI Core Subsystem (Interpreter)
+--- linux-2.6.0-test6/drivers/acpi/namespace/nsdump.c	2003-06-14 12:18:33.000000000 -0700
++++ 25/drivers/acpi/namespace/nsdump.c	2003-10-05 00:33:24.000000000 -0700
+@@ -234,7 +234,7 @@ acpi_ns_dump_one_object (
+ 
+ 		case ACPI_TYPE_DEVICE:
+ 
+-			acpi_os_printf ("Notify object: %p", obj_desc);
++			acpi_os_printf ("Notify Object: %p\n", obj_desc);
+ 			break;
+ 
+ 
+@@ -371,7 +371,7 @@ acpi_ns_dump_one_object (
+ 		case ACPI_TYPE_LOCAL_BANK_FIELD:
+ 		case ACPI_TYPE_LOCAL_INDEX_FIELD:
+ 
+-			acpi_os_printf (" Off %.2X Len %.2X Acc %.2hd\n",
++			acpi_os_printf ("Off %.2X Len %.2X Acc %.2hd\n",
+ 					(obj_desc->common_field.base_byte_offset * 8)
+ 						+ obj_desc->common_field.start_field_bit_offset,
+ 					obj_desc->common_field.bit_length,
+--- linux-2.6.0-test6/drivers/acpi/namespace/nssearch.c	2003-06-14 12:18:34.000000000 -0700
++++ 25/drivers/acpi/namespace/nssearch.c	2003-10-05 00:33:24.000000000 -0700
+@@ -96,7 +96,7 @@ acpi_ns_search_node (
+ 
+ 		scope_name = acpi_ns_get_external_pathname (node);
+ 		if (scope_name) {
+-			ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "Searching %s [%p] For %4.4s (%s)\n",
++			ACPI_DEBUG_PRINT ((ACPI_DB_NAMES, "Searching %s (%p) For [%4.4s] (%s)\n",
+ 				scope_name, node, (char *) &target_name, acpi_ut_get_type_name (type)));
+ 
+ 			ACPI_MEM_FREE (scope_name);
+@@ -117,9 +117,9 @@ acpi_ns_search_node (
+ 			 * Found matching entry.
+ 			 */
+ 			ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
+-				"Name %4.4s Type [%s] found in scope [%4.4s] %p\n",
++				"Name [%4.4s] (%s) %p found in scope [%4.4s] %p\n",
+ 				(char *) &target_name, acpi_ut_get_type_name (next_node->type),
+-				next_node->name.ascii, next_node));
++				next_node, node->name.ascii, node));
+ 
+ 			*return_node = next_node;
+ 			return_ACPI_STATUS (AE_OK);
+@@ -143,7 +143,7 @@ acpi_ns_search_node (
+ 	/* Searched entire namespace level, not found */
+ 
+ 	ACPI_DEBUG_PRINT ((ACPI_DB_NAMES,
+-		"Name %4.4s Type [%s] not found in search in scope [%4.4s] %p first child %p\n",
++		"Name [%4.4s] (%s) not found in search in scope [%4.4s] %p first child %p\n",
+ 		(char *) &target_name, acpi_ut_get_type_name (type),
+ 		node->name.ascii, node, node->child));
+ 
+--- linux-2.6.0-test6/drivers/acpi/namespace/nsutils.c	2003-06-14 12:18:21.000000000 -0700
++++ 25/drivers/acpi/namespace/nsutils.c	2003-10-05 00:33:24.000000000 -0700
+@@ -175,6 +175,11 @@ acpi_ns_print_node_pathname (
+ 	acpi_status                     status;
+ 
+ 
++	if (!node) {
++		acpi_os_printf ("[NULL NAME]");
++		return;
++	}
++
+ 	/* Convert handle to a full pathname and print it (with supplied message) */
+ 
+ 	buffer.length = ACPI_ALLOCATE_LOCAL_BUFFER;
+@@ -470,11 +475,11 @@ acpi_ns_build_internal_name (
+ 	*result = 0;
+ 
+ 	if (info->fully_qualified) {
+-		ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "returning [%p] (abs) \"\\%s\"\n",
++		ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Returning [%p] (abs) \"\\%s\"\n",
+ 			internal_name, internal_name));
+ 	}
+ 	else {
+-		ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "returning [%p] (rel) \"%s\"\n",
++		ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "Returning [%p] (rel) \"%s\"\n",
+ 			internal_name, internal_name));
+ 	}
+ 
+--- linux-2.6.0-test6/drivers/acpi/osl.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/drivers/acpi/osl.c	2003-10-05 00:36:22.000000000 -0700
+@@ -43,7 +43,6 @@
+ 
+ #ifdef CONFIG_ACPI_EFI
+ #include <linux/efi.h>
+-u64 efi_mem_attributes (u64 phys_addr);
+ #endif
+ 
+ 
+--- linux-2.6.0-test6/drivers/acpi/parser/psparse.c	2003-06-14 12:17:59.000000000 -0700
++++ 25/drivers/acpi/parser/psparse.c	2003-10-05 00:33:24.000000000 -0700
+@@ -437,7 +437,6 @@ acpi_ps_parse_loop (
+ 		return_ACPI_STATUS (AE_BAD_PARAMETER);
+ 	}
+ 
+-
+ 	parser_state = &walk_state->parser_state;
+ 	walk_state->arg_types = 0;
+ 
+@@ -705,10 +704,9 @@ acpi_ps_parse_loop (
+ 				walk_state->arg_types = 0;
+ 				break;
+ 
+-
+ 			default:
+ 
+-				/* Op is not a constant or string, append each argument */
++				/* Op is not a constant or string, append each argument to the Op */
+ 
+ 				while (GET_CURRENT_ARG_TYPE (walk_state->arg_types) &&
+ 						!walk_state->arg_count) {
+@@ -727,23 +725,23 @@ acpi_ps_parse_loop (
+ 					INCREMENT_ARG_LIST (walk_state->arg_types);
+ 				}
+ 
++				/* Special processing for certain opcodes */
++
+ 				switch (op->common.aml_opcode) {
+ 				case AML_METHOD_OP:
+ 
+-					/* For a method, save the length and address of the body */
+-
+ 					/*
+-					 * Skip parsing of control method or opregion body,
++					 * Skip parsing of control method
+ 					 * because we don't have enough info in the first pass
+-					 * to parse them correctly.
++					 * to parse it correctly.
++					 *
++					 * Save the length and address of the body
+ 					 */
+ 					op->named.data   = parser_state->aml;
+ 					op->named.length = (u32) (parser_state->pkg_end - parser_state->aml);
+-					/*
+-					 * Skip body of method.  For op_regions, we must continue
+-					 * parsing because the opregion is not a standalone
+-					 * package (We don't know where the end is).
+-					 */
++
++					/* Skip body of method */
++
+ 					parser_state->aml   = parser_state->pkg_end;
+ 					walk_state->arg_count = 0;
+ 					break;
+@@ -756,15 +754,15 @@ acpi_ps_parse_loop (
+ 						(op->common.parent->common.aml_opcode == AML_NAME_OP) &&
+ 						(walk_state->descending_callback != acpi_ds_exec_begin_op)) {
+ 						/*
+-						 * Skip parsing of
++						 * Skip parsing of Buffers and Packages
+ 						 * because we don't have enough info in the first pass
+ 						 * to parse them correctly.
+ 						 */
+ 						op->named.data   = aml_op_start;
+ 						op->named.length = (u32) (parser_state->pkg_end - aml_op_start);
+-						/*
+-						 * Skip body
+-						 */
++
++						/* Skip body */
++
+ 						parser_state->aml   = parser_state->pkg_end;
+ 						walk_state->arg_count = 0;
+ 					}
+@@ -778,6 +776,7 @@ acpi_ps_parse_loop (
+ 					break;
+ 
+ 				default:
++
+ 					/* No action for all other opcodes */
+ 					break;
+ 				}
+--- linux-2.6.0-test6/drivers/acpi/pci_irq.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/drivers/acpi/pci_irq.c	2003-10-05 00:36:20.000000000 -0700
+@@ -71,6 +71,9 @@ acpi_pci_irq_find_prt_entry (
+ 
+ 	ACPI_FUNCTION_TRACE("acpi_pci_irq_find_prt_entry");
+ 
++	if (!acpi_prt.count)
++		return_PTR(NULL);
++
+ 	/*
+ 	 * Parse through all PRT entries looking for a match on the specified
+ 	 * PCI device's segment, bus, device, and pin (don't care about func).
+@@ -234,7 +237,7 @@ acpi_pci_irq_add_prt (
+                           PCI Interrupt Routing Support
+    -------------------------------------------------------------------------- */
+ 
+-static int
++int
+ acpi_pci_irq_lookup (struct pci_bus *bus, int device, int pin)
+ {
+ 	struct acpi_prt_entry	*entry = NULL;
+--- linux-2.6.0-test6/drivers/acpi/pci_link.c	2003-09-08 13:58:56.000000000 -0700
++++ 25/drivers/acpi/pci_link.c	2003-10-05 00:33:24.000000000 -0700
+@@ -220,7 +220,6 @@ acpi_pci_link_check_current (
+ 	return AE_CTRL_TERMINATE;
+ }
+ 
+-
+ static int
+ acpi_pci_link_get_current (
+ 	struct acpi_pci_link	*link)
+@@ -279,6 +278,28 @@ end:
+ 	return_VALUE(result);
+ }
+ 
++static int
++acpi_pci_link_try_get_current (
++	struct acpi_pci_link *link,
++	int irq)
++{
++	int result;
++
++	ACPI_FUNCTION_TRACE("acpi_pci_link_try_get_current");
++
++	result = acpi_pci_link_get_current(link);
++	if (result && link->irq.active) {
++ 		return_VALUE(result);
++ 	}
++
++	if (!link->irq.active) {
++		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "No active IRQ resource found\n"));
++		printk(KERN_WARNING "_CRS returns NULL! Using IRQ %d for device (%s [%s]).\n", irq, acpi_device_name(link->device), acpi_device_bid(link->device));
++		link->irq.active = irq;
++	}
++	
++	return 0;
++}
+ 
+ static int
+ acpi_pci_link_set (
+@@ -294,6 +315,7 @@ acpi_pci_link_set (
+ 	struct acpi_buffer	buffer = {sizeof(resource)+1, &resource};
+ 	int			i = 0;
+ 	int			valid = 0;
++	int			resource_type = 0;
+ 
+ 	ACPI_FUNCTION_TRACE("acpi_pci_link_set");
+ 
+@@ -317,20 +339,32 @@ acpi_pci_link_set (
+ 		}
+ 	}
+ 
++	/* If IRQ<=15, first try with a "normal" IRQ descriptor. If that fails, try with
++	 * an extended one */
++	if (irq <= 15) {
++		resource_type = ACPI_RSTYPE_IRQ;
++	} else {
++		resource_type = ACPI_RSTYPE_EXT_IRQ;
++	}
++
++retry_programming:
++   
+ 	memset(&resource, 0, sizeof(resource));
+ 
+ 	/* NOTE: PCI interrupts are always level / active_low / shared. But not all
+ 	   interrupts > 15 are PCI interrupts. Rely on the ACPI IRQ definition for 
+ 	   parameters */
+-	if (irq <= 15) {
++	switch(resource_type) {
++	case ACPI_RSTYPE_IRQ:
+ 		resource.res.id = ACPI_RSTYPE_IRQ;
+ 		resource.res.length = sizeof(struct acpi_resource);
+ 		resource.res.data.irq.edge_level = link->irq.edge_level;
+ 		resource.res.data.irq.active_high_low = link->irq.active_high_low;
+ 		resource.res.data.irq.number_of_interrupts = 1;
+ 		resource.res.data.irq.interrupts[0] = irq;
+-	}
+-	else {
++		break;
++	   
++	case ACPI_RSTYPE_EXT_IRQ:
+ 		resource.res.id = ACPI_RSTYPE_EXT_IRQ;
+ 		resource.res.length = sizeof(struct acpi_resource);
+ 		resource.res.data.extended_irq.producer_consumer = ACPI_CONSUMER;
+@@ -339,11 +373,21 @@ acpi_pci_link_set (
+ 		resource.res.data.extended_irq.number_of_interrupts = 1;
+ 		resource.res.data.extended_irq.interrupts[0] = irq;
+ 		/* ignore resource_source, it's optional */
++		break;
+ 	}
+ 	resource.end.id = ACPI_RSTYPE_END_TAG;
+ 
+ 	/* Attempt to set the resource */
+ 	status = acpi_set_current_resources(link->handle, &buffer);
++
++	/* if we failed and IRQ <= 15, try again with an extended descriptor */
++	if (ACPI_FAILURE(status) && (resource_type == ACPI_RSTYPE_IRQ)) {
++                resource_type = ACPI_RSTYPE_EXT_IRQ;
++                printk(PREFIX "Retrying with extended IRQ descriptor\n");
++                goto retry_programming;
++	}
++  
++	/* check for total failure */
+ 	if (ACPI_FAILURE(status)) {
+ 		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Error evaluating _SRS\n"));
+ 		return_VALUE(-ENODEV);
+@@ -361,7 +405,7 @@ acpi_pci_link_set (
+ 	}
+ 
+ 	/* Make sure the active IRQ is the one we requested. */
+-	result = acpi_pci_link_get_current(link);
++	result = acpi_pci_link_try_get_current(link, irq);
+ 	if (result) {
+ 		return_VALUE(result);
+ 	}
+@@ -456,16 +500,16 @@ static int acpi_pci_link_allocate(struct
+ 		irq = link->irq.active;
+ 	} else {
+ 		irq = link->irq.possible[0];
+-	}
+ 
+-		/* 
+-		 * Select the best IRQ.  This is done in reverse to promote 
++		/*
++		 * Select the best IRQ.  This is done in reverse to promote
+ 		 * the use of IRQs 9, 10, 11, and >15.
+ 		 */
+ 		for (i=(link->irq.possible_count-1); i>0; i--) {
+ 			if (acpi_irq_penalty[irq] > acpi_irq_penalty[link->irq.possible[i]])
+ 				irq = link->irq.possible[i];
+ 		}
++	}
+ 
+ 	/* Attempt to enable the link device at this IRQ. */
+ 	if (acpi_pci_link_set(link, irq)) {
+@@ -574,10 +618,6 @@ acpi_pci_link_add (
+ 		else
+ 			printk(" %d", link->irq.possible[i]);
+ 	}
+-	if (!link->irq.active)
+-		printk(", disabled");
+-	else if (!found)
+-		printk(", enabled at IRQ %d", link->irq.active);
+ 	printk(")\n");
+ 
+ 	/* TBD: Acquire/release lock */
+--- linux-2.6.0-test6/drivers/acpi/tables.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/drivers/acpi/tables.c	2003-10-05 00:33:24.000000000 -0700
+@@ -69,7 +69,8 @@ struct acpi_table_sdt {
+ 
+ static unsigned long		sdt_pa;		/* Physical Address */
+ static unsigned long		sdt_count;	/* Table count */
+-static struct acpi_table_sdt	*sdt_entry;
++
++static struct acpi_table_sdt	sdt_entry[ACPI_MAX_TABLES];
+ 
+ void
+ acpi_table_print (
+@@ -418,12 +419,6 @@ acpi_table_get_sdt (
+ 			sdt_count = ACPI_MAX_TABLES;
+ 		}
+ 
+-		sdt_entry = alloc_bootmem(sdt_count * sizeof(struct acpi_table_sdt));
+-		if (!sdt_entry) {
+-			printk(KERN_ERR "ACPI: Could not allocate mem for SDT entries!\n");
+-			return -ENOMEM;
+-		}
+-
+ 		for (i = 0; i < sdt_count; i++)
+ 			sdt_entry[i].pa = (unsigned long) mapped_xsdt->entry[i];
+ 	}
+@@ -470,12 +465,6 @@ acpi_table_get_sdt (
+ 			sdt_count = ACPI_MAX_TABLES;
+ 		}
+ 
+-		sdt_entry = alloc_bootmem(sdt_count * sizeof(struct acpi_table_sdt));
+-		if (!sdt_entry) {
+-			printk(KERN_ERR "ACPI: Could not allocate mem for SDT entries!\n");
+-			return -ENOMEM;
+-		}
+-
+ 		for (i = 0; i < sdt_count; i++)
+ 			sdt_entry[i].pa = (unsigned long) mapped_rsdt->entry[i];
+ 	}
+--- linux-2.6.0-test6/drivers/acpi/toshiba_acpi.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/drivers/acpi/toshiba_acpi.c	2003-10-05 00:33:24.000000000 -0700
+@@ -41,7 +41,6 @@
+ #include <linux/init.h>
+ #include <linux/types.h>
+ #include <linux/proc_fs.h>
+-#include <linux/version.h>
+ 
+ #include <acpi/acpi_drivers.h>
+ 
+--- linux-2.6.0-test6/drivers/acpi/utilities/utdelete.c	2003-06-14 12:18:20.000000000 -0700
++++ 25/drivers/acpi/utilities/utdelete.c	2003-10-05 00:34:43.000000000 -0700
+@@ -417,6 +417,8 @@ acpi_ut_update_object_reference (
+ 	union acpi_generic_state         *state_list = NULL;
+ 	union acpi_generic_state         *state;
+ 
++	union acpi_operand_object        *tmp;
++
+ 
+ 	ACPI_FUNCTION_TRACE_PTR ("ut_update_object_reference", object);
+ 
+@@ -448,8 +450,15 @@ acpi_ut_update_object_reference (
+ 		switch (ACPI_GET_OBJECT_TYPE (object)) {
+ 		case ACPI_TYPE_DEVICE:
+ 
+-			acpi_ut_update_ref_count (object->device.system_notify, action);
+-			acpi_ut_update_ref_count (object->device.device_notify, action);
++			tmp = object->device.system_notify;
++			if(tmp && tmp->common.reference_count<=1 && action == REF_DECREMENT)
++				object->device.system_notify = NULL;
++			acpi_ut_update_ref_count (tmp, action);
++
++			tmp = object->device.device_notify;
++			if(tmp && tmp->common.reference_count <=1 && action == REF_DECREMENT)
++				object->device.device_notify = NULL;
++			acpi_ut_update_ref_count (tmp, action);
+ 			break;
+ 
+ 
+@@ -467,6 +476,9 @@ acpi_ut_update_object_reference (
+ 				 */
+ 				status = acpi_ut_create_update_state_and_push (
+ 						 object->package.elements[i], action, &state_list);
++				tmp = object->package.elements[i];
++				if(tmp && tmp->common.reference_count<=1  && action == REF_DECREMENT) /*reference count didn't refresh now*/
++					object->package.elements[i] = NULL;
+ 				if (ACPI_FAILURE (status)) {
+ 					goto error_exit;
+ 				}
+@@ -478,6 +490,9 @@ acpi_ut_update_object_reference (
+ 
+ 			status = acpi_ut_create_update_state_and_push (
+ 					 object->buffer_field.buffer_obj, action, &state_list);
++			tmp = object->buffer_field.buffer_obj;
++			if( tmp && tmp->common.reference_count <=1  && action == REF_DECREMENT)/*reference count didn't refresh now*/
++				object->buffer_field.buffer_obj = NULL;
+ 			if (ACPI_FAILURE (status)) {
+ 				goto error_exit;
+ 			}
+@@ -491,6 +506,9 @@ acpi_ut_update_object_reference (
+ 			if (ACPI_FAILURE (status)) {
+ 				goto error_exit;
+ 			}
++			tmp = object->field.region_obj;
++			if( tmp && tmp->common.reference_count <=1  && action == REF_DECREMENT)/*reference count didn't refresh now*/
++				object->field.region_obj = NULL;
+ 		   break;
+ 
+ 
+@@ -501,12 +519,18 @@ acpi_ut_update_object_reference (
+ 			if (ACPI_FAILURE (status)) {
+ 				goto error_exit;
+ 			}
++			tmp = object->bank_field.bank_obj;
++			if( tmp && tmp->common.reference_count <=1  && action == REF_DECREMENT)/*reference count didn't refresh now*/
++				object->bank_field.bank_obj = NULL;
+ 
+ 			status = acpi_ut_create_update_state_and_push (
+ 					 object->bank_field.region_obj, action, &state_list);
+ 			if (ACPI_FAILURE (status)) {
+ 				goto error_exit;
+ 			}
++			tmp = object->bank_field.region_obj;
++			if( tmp && tmp->common.reference_count <=1  && action == REF_DECREMENT)/*reference count didn't refresh now*/
++				object->bank_field.region_obj = NULL;
+ 			break;
+ 
+ 
+@@ -517,12 +541,18 @@ acpi_ut_update_object_reference (
+ 			if (ACPI_FAILURE (status)) {
+ 				goto error_exit;
+ 			}
++			tmp = object->index_field.index_obj;
++			if( tmp && tmp->common.reference_count <=1  && action == REF_DECREMENT)/*reference count didn't refresh now*/
++				object->index_field.index_obj = NULL;
+ 
+ 			status = acpi_ut_create_update_state_and_push (
+ 					 object->index_field.data_obj, action, &state_list);
+ 			if (ACPI_FAILURE (status)) {
+ 				goto error_exit;
+ 			}
++			tmp = object->index_field.data_obj;
++			if( tmp && tmp->common.reference_count <=1  && action == REF_DECREMENT)/*reference count didn't refresh now*/
++				object->index_field.data_obj = NULL;
+ 			break;
+ 
+ 
+--- linux-2.6.0-test6/drivers/block/acsi.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/block/acsi.c	2003-10-05 00:34:00.000000000 -0700
+@@ -63,6 +63,7 @@ typedef void Scsi_Device; /* hack to avo
+ #include <linux/hdreg.h> /* for HDIO_GETGEO */
+ #include <linux/blkpg.h>
+ #include <linux/buffer_head.h>
++#include <linux/blkdev.h>
+ 
+ #include <asm/setup.h>
+ #include <asm/pgtable.h>
+@@ -346,7 +347,7 @@ struct acsi_error {
+ static int acsicmd_dma( const char *cmd, char *buffer, int blocks, int
+                         rwflag, int enable);
+ static int acsi_reqsense( char *buffer, int targ, int lun);
+-static void acsi_print_error(const unsigned char *errblk, int struct acsi_info_struct *aip);
++static void acsi_print_error(const unsigned char *errblk, struct acsi_info_struct *aip);
+ static irqreturn_t acsi_interrupt (int irq, void *data, struct pt_regs *fp);
+ static void unexpected_acsi_interrupt( void );
+ static void bad_rw_intr( void );
+@@ -358,10 +359,9 @@ static void copy_from_acsibuffer( void )
+ static void do_end_requests( void );
+ static void do_acsi_request( request_queue_t * );
+ static void redo_acsi_request( void );
+-static int acsi_ioctl( struct inode *inode, struct file *file, unsigned int
++static int acsi_ioctl(struct block_device *bdev, struct file *file, unsigned int
+                        cmd, unsigned long arg );
+-static int acsi_open( struct inode * inode, struct file * filp );
+-static int acsi_release( struct inode * inode, struct file * file );
++static int acsi_open(struct block_device *bdev, struct file *filp);
+ static void acsi_prevent_removal(struct acsi_info_struct *aip, int flag );
+ static int acsi_change_blk_size( int target, int lun);
+ static int acsi_mode_sense( int target, int lun, SENSE_DATA *sd );
+@@ -1080,10 +1080,10 @@ static void redo_acsi_request( void )
+  ***********************************************************************/
+ 
+ 
+-static int acsi_ioctl( struct inode *inode, struct file *file,
+-					   unsigned int cmd, unsigned long arg )
++static int acsi_ioctl(struct block_device *bdev, struct file *file,
++		      unsigned int cmd, unsigned long arg )
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
++	struct gendisk *disk = bdev->bd_disk;
+ 	struct acsi_info_struct *aip = disk->private_data;
+ 	switch (cmd) {
+ 	  case HDIO_GETGEO:
+@@ -1095,7 +1095,7 @@ static int acsi_ioctl( struct inode *ino
+ 	    put_user( 64, &geo->heads );
+ 	    put_user( 32, &geo->sectors );
+ 	    put_user( aip->size >> 11, &geo->cylinders );
+-		put_user(get_start_sect(inode->i_bdev), &geo->start);
++		put_user(get_start_sect(bdev), &geo->start);
+ 		return 0;
+ 	  }
+ 	  case SCSI_IOCTL_GET_IDLUN:
+@@ -1125,16 +1125,16 @@ static int acsi_ioctl( struct inode *ino
+  *
+  */
+ 
+-static int acsi_open( struct inode * inode, struct file * filp )
++static int acsi_open(struct block_device *bdev, struct file *filp)
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
++	struct gendisk *disk = bdev->bd_disk;
+ 	struct acsi_info_struct *aip = disk->private_data;
+ 
+ 	if (aip->access_count == 0 && aip->removable) {
+ #if 0
+ 		aip->changed = 1;	/* safety first */
+ #endif
+-		check_disk_change( inode->i_bdev );
++		check_disk_change(bdev);
+ 		if (aip->changed)	/* revalidate was not successful (no medium) */
+ 			return -ENXIO;
+ 		acsi_prevent_removal(aip, 1);
+@@ -1142,10 +1142,11 @@ static int acsi_open( struct inode * ino
+ 	aip->access_count++;
+ 
+ 	if (filp && filp->f_mode) {
+-		check_disk_change( inode->i_bdev );
++		check_disk_change(bdev);
+ 		if (filp->f_mode & 2) {
+ 			if (aip->read_only) {
+-				acsi_release( inode, filp );
++				if (--aip->access_count == 0 && aip->removable)
++					acsi_prevent_removal(aip, 0);
+ 				return -EROFS;
+ 			}
+ 		}
+@@ -1159,9 +1160,8 @@ static int acsi_open( struct inode * ino
+  * be forgotten about...
+  */
+ 
+-static int acsi_release( struct inode * inode, struct file * file )
++static int acsi_release(struct gendisk *disk)
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
+ 	struct acsi_info_struct *aip = disk->private_data;
+ 	if (--aip->access_count == 0 && aip->removable)
+ 		acsi_prevent_removal(aip, 0);
+@@ -1327,8 +1327,6 @@ static int acsi_mode_sense( int target, 
+  ********************************************************************/
+ 
+ 
+-extern struct block_device_operations acsi_fops;
+-
+ static struct gendisk *acsi_gendisk[MAX_DEV];
+ 
+ #define MAX_SCSI_DEVICE_CODE 10
+--- linux-2.6.0-test6/drivers/block/amiflop.c	2003-09-08 13:58:56.000000000 -0700
++++ 25/drivers/block/amiflop.c	2003-10-05 00:34:00.000000000 -0700
+@@ -1434,10 +1434,11 @@ static void do_fd_request(request_queue_
+ 	redo_fd_request();
+ }
+ 
+-static int fd_ioctl(struct inode *inode, struct file *filp,
++static int fd_ioctl(struct block_device *bdev, struct file *filp,
+ 		    unsigned int cmd, unsigned long param)
+ {
+-	int drive = iminor(inode) & 3;
++	struct amiga_floppy_struct *floppy = bdev->bd_disk->private_data;
++	int drive = floppy - unit;
+ 	static struct floppy_struct getprm;
+ 
+ 	switch(cmd){
+@@ -1459,7 +1460,7 @@ static int fd_ioctl(struct inode *inode,
+ 			rel_fdc();
+ 			return -EBUSY;
+ 		}
+-		fsync_bdev(inode->i_bdev);
++		fsync_bdev(bdev);
+ 		if (fd_motor_on(drive) == 0) {
+ 			rel_fdc();
+ 			return -ENODEV;
+@@ -1488,7 +1489,7 @@ static int fd_ioctl(struct inode *inode,
+ 		break;
+ 	case FDFMTEND:
+ 		floppy_off(drive);
+-		invalidate_bdev(inode->i_bdev, 0);
++		invalidate_bdev(bdev, 0);
+ 		break;
+ 	case FDGETPRM:
+ 		memset((void *)&getprm, 0, sizeof (getprm));
+@@ -1559,10 +1560,11 @@ static void fd_probe(int dev)
+  * /dev/PS0 etc), and disallows simultaneous access to the same
+  * drive with different device numbers.
+  */
+-static int floppy_open(struct inode *inode, struct file *filp)
++static int floppy_open(struct block_device *bdev, struct file *filp)
+ {
+-	int drive = iminor(inode) & 3;
+-	int system =  (iminor(inode) & 4) >> 2;
++	struct amiga_floppy_struct *p = bdev->bd_disk->private_data;
++	int drive = p - unit;
++	int system =  (MINOR(bdev->bd_dev) & 4) >> 2;
+ 	int old_dev;
+ 	unsigned long flags;
+ 
+@@ -1572,7 +1574,7 @@ static int floppy_open(struct inode *ino
+ 		return -EBUSY;
+ 
+ 	if (filp && filp->f_mode & 3) {
+-		check_disk_change(inode->i_bdev);
++		check_disk_change(bdev);
+ 		if (filp->f_mode & 2 ) {
+ 			int wrprot;
+ 
+@@ -1607,9 +1609,10 @@ static int floppy_open(struct inode *ino
+ 	return 0;
+ }
+ 
+-static int floppy_release(struct inode * inode, struct file * filp)
++static int floppy_release(struct gendisk *disk)
+ {
+-	int drive = iminor(inode) & 3;
++	struct amiga_floppy_struct *p = disk->private_data;
++	int drive = p - unit;
+ 
+ 	if (unit[drive].dirty == 1) {
+ 		del_timer (flush_track_timer + drive);
+--- linux-2.6.0-test6/drivers/block/as-iosched.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/block/as-iosched.c	2003-10-05 00:36:08.000000000 -0700
+@@ -174,12 +174,14 @@ static kmem_cache_t *arq_pool;
+  * IO Context helper functions
+  */
+ /* Debug */
+-static atomic_t nr_as_io_requests = ATOMIC_INIT(0);
++extern atomic_t global_nr_requests;
++static atomic_t nr_as_io_contexts = ATOMIC_INIT(0);
+ 
+ /* Called to deallocate the as_io_context */
+ static void free_as_io_context(struct as_io_context *aic)
+ {
+-	atomic_dec(&nr_as_io_requests);
++	WARN_ON(atomic_read(&nr_as_io_contexts) == 0);
++	atomic_dec(&nr_as_io_contexts);
+ 	kfree(aic);
+ }
+ 
+@@ -195,7 +197,9 @@ static struct as_io_context *alloc_as_io
+ 
+ 	ret = kmalloc(sizeof(*ret), GFP_ATOMIC);
+ 	if (ret) {
+-		atomic_inc(&nr_as_io_requests);
++		atomic_inc(&nr_as_io_contexts);
++		WARN_ON(atomic_read(&nr_as_io_contexts) ==
++			1 + nr_threads + atomic_read(&global_nr_requests));
+ 		ret->dtor = free_as_io_context;
+ 		ret->exit = exit_as_io_context;
+ 		ret->state = 1 << AS_TASK_RUNNING;
+@@ -914,6 +918,8 @@ static void as_completed_request(request
+ 	struct as_rq *arq = RQ_DATA(rq);
+ 	struct as_io_context *aic;
+ 
++	WARN_ON(!list_empty(&rq->queuelist));
++
+ 	if (unlikely(arq->state != AS_RQ_DISPATCHED))
+ 		return;
+ 
+@@ -926,6 +932,7 @@ static void as_completed_request(request
+ 		if (ad->batch_data_dir == REQ_SYNC)
+ 			ad->new_batch = 1;
+ 	}
++	WARN_ON(ad->nr_dispatched == 0);
+ 	ad->nr_dispatched--;
+ 
+ 	/*
+@@ -1140,8 +1147,6 @@ static void as_move_to_dispatch(struct a
+ 	/*
+ 	 * take it off the sort and fifo list, add to dispatch queue
+ 	 */
+-	as_remove_queued_request(ad->q, rq);
+-
+ 	insert = ad->dispatch->prev;
+ 
+ 	while (!list_empty(&rq->queuelist)) {
+@@ -1159,6 +1164,7 @@ static void as_move_to_dispatch(struct a
+ 		ad->nr_dispatched++;
+ 	}
+ 
++	as_remove_queued_request(ad->q, rq);
+ 	list_add(&rq->queuelist, insert);
+ 	if (arq->io_context && arq->io_context->aic)
+ 		atomic_inc(&arq->io_context->aic->nr_dispatched);
+@@ -1325,12 +1331,27 @@ static struct request *as_next_request(r
+ static inline void
+ as_add_aliased_request(struct as_data *ad, struct as_rq *arq, struct as_rq *alias)
+ {
++	struct request  *req = arq->request;
++	struct list_head *insert = alias->request->queuelist.prev;
++
++	/*
++	 * Transfer list of aliases
++	 */
++	while (!list_empty(&req->queuelist)) {
++		struct request *__rq = list_entry_rq(req->queuelist.next);
++		struct as_rq *__arq = RQ_DATA(__rq);
++
++		list_move_tail(&__rq->queuelist, &alias->request->queuelist);
++
++		WARN_ON(__arq->state != AS_RQ_QUEUED);
++	}
++
+ 	/*
+ 	 * Another request with the same start sector on the rbtree.
+ 	 * Link this request to that sector. They are untangled in
+ 	 * as_move_to_dispatch
+ 	 */
+-	list_add_tail(&arq->request->queuelist, &alias->request->queuelist);
++	list_add(&arq->request->queuelist, insert);
+ 
+ 	/*
+ 	 * Don't want to have to handle merges.
+@@ -1390,9 +1411,6 @@ static void as_add_request(struct as_dat
+ 		}
+ 	}
+ 
+-
+-
+-
+ 	arq->state = AS_RQ_QUEUED;
+ }
+ 
+@@ -1596,7 +1614,8 @@ static void as_merged_request(request_qu
+ 		 */
+ 	}
+ 
+-	q->last_merge = req;
++	if (arq->on_hash)
++		q->last_merge = req;
+ }
+ 
+ static void
+--- linux-2.6.0-test6/drivers/block/ataflop.c	2003-09-08 13:58:56.000000000 -0700
++++ 25/drivers/block/ataflop.c	2003-10-05 00:34:00.000000000 -0700
+@@ -364,13 +364,12 @@ static void finish_fdc_done( int dummy )
+ static __inline__ void copy_buffer( void *from, void *to);
+ static void setup_req_params( int drive );
+ static void redo_fd_request( void);
+-static int fd_ioctl( struct inode *inode, struct file *filp, unsigned int
++static int fd_ioctl(struct block_device *bdev, struct file *filp, unsigned int
+                      cmd, unsigned long param);
+ static void fd_probe( int drive );
+ static int fd_test_drive_present( int drive );
+ static void config_types( void );
+-static int floppy_open( struct inode *inode, struct file *filp );
+-static int floppy_release( struct inode * inode, struct file * filp );
++static int floppy_open(struct block_device *bdev, struct file *filp );
+ 
+ /************************* End of Prototypes **************************/
+ 
+@@ -1496,10 +1495,10 @@ void do_fd_request(request_queue_t * q)
+ 	atari_enable_irq( IRQ_MFP_FDC );
+ }
+ 
+-static int fd_ioctl(struct inode *inode, struct file *filp,
++static int fd_ioctl(struct block_device *bdev, struct file *filp,
+ 		    unsigned int cmd, unsigned long param)
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
++	struct gendisk *disk = bdev->bd_disk;
+ 	struct atari_floppy_struct *floppy = disk->private_data;
+ 	int drive = floppy - unit;
+ 	int type = floppy->type;
+@@ -1673,7 +1672,7 @@ static int fd_ioctl(struct inode *inode,
+ 		/* invalidate the buffer track to force a reread */
+ 		BufferDrive = -1;
+ 		set_bit(drive, &fake_change);
+-		check_disk_change(inode->i_bdev);
++		check_disk_change(bdev);
+ 		return 0;
+ 	default:
+ 		return -EINVAL;
+@@ -1816,10 +1815,10 @@ static void __init config_types( void )
+  * drive with different device numbers.
+  */
+ 
+-static int floppy_open( struct inode *inode, struct file *filp )
++static int floppy_open(struct block_device *bdev, struct file *filp )
+ {
+-	struct atari_floppy_struct *p = inode->i_bdev->bd_disk->private_data;
+-	int type  = iminor(inode) >> 2;
++	struct atari_floppy_struct *p = bdev->bd_disk->private_data;
++	int type  = MINOR(bdev->bd_dev) >> 2;
+ 
+ 	DPRINT(("fd_open: type=%d\n",type));
+ 	if (p->ref && p->type != type)
+@@ -1839,14 +1838,13 @@ static int floppy_open( struct inode *in
+ 		return 0;
+ 
+ 	if (filp->f_mode & 3) {
+-		check_disk_change(inode->i_bdev);
++		check_disk_change(bdev);
+ 		if (filp->f_mode & 2) {
+ 			if (p->wpstat) {
+ 				if (p->ref < 0)
+ 					p->ref = 0;
+ 				else
+ 					p->ref--;
+-				floppy_release(inode, filp);
+ 				return -EROFS;
+ 			}
+ 		}
+@@ -1855,9 +1853,9 @@ static int floppy_open( struct inode *in
+ }
+ 
+ 
+-static int floppy_release( struct inode * inode, struct file * filp )
++static int floppy_release(struct gendisk *disk)
+ {
+-	struct atari_floppy_struct *p = inode->i_bdev->bd_disk->private_data;
++	struct atari_floppy_struct *p = disk->private_data;
+ 	if (p->ref < 0)
+ 		p->ref = 0;
+ 	else if (!p->ref--) {
+--- linux-2.6.0-test6/drivers/block/cciss.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/block/cciss.c	2003-10-05 00:34:00.000000000 -0700
+@@ -111,12 +111,10 @@ static struct board_type products[] = {
+ 
+ static ctlr_info_t *hba[MAX_CTLR];
+ 
+-static struct proc_dir_entry *proc_cciss;
+-
+ static void do_cciss_request(request_queue_t *q);
+-static int cciss_open(struct inode *inode, struct file *filep);
+-static int cciss_release(struct inode *inode, struct file *filep);
+-static int cciss_ioctl(struct inode *inode, struct file *filep, 
++static int cciss_open(struct block_device *bdev, struct file *filep);
++static int cciss_release(struct gendisk *disk);
++static int cciss_ioctl(struct block_device *bdev, struct file *filep, 
+ 		unsigned int cmd, unsigned long arg);
+ 
+ static int revalidate_allvol(ctlr_info_t *host);
+@@ -137,8 +135,6 @@ static int cciss_proc_get_info(char *buf
+ 		int length, int *eof, void *data);
+ static void cciss_procinit(int i);
+ #else
+-static int cciss_proc_get_info(char *buffer, char **start, off_t offset, 
+-		int length, int *eof, void *data) { return 0;}
+ static void cciss_procinit(int i) {}
+ #endif /* CONFIG_PROC_FS */
+ 
+@@ -156,6 +152,9 @@ static struct block_device_operations cc
+  * Report information about this controller.
+  */
+ #ifdef CONFIG_PROC_FS
++
++static struct proc_dir_entry *proc_cciss;
++
+ static int cciss_proc_get_info(char *buffer, char **start, off_t offset, 
+ 		int length, int *eof, void *data)
+ {
+@@ -363,13 +362,13 @@ static inline drive_info_struct *get_drv
+ /*
+  * Open.  Make sure the device is really there.
+  */
+-static int cciss_open(struct inode *inode, struct file *filep)
++static int cciss_open(struct block_device *bdev, struct file *filep)
+ {
+-	ctlr_info_t *host = get_host(inode->i_bdev->bd_disk);
+-	drive_info_struct *drv = get_drv(inode->i_bdev->bd_disk);
++	ctlr_info_t *host = get_host(bdev->bd_disk);
++	drive_info_struct *drv = get_drv(bdev->bd_disk);
+ 
+ #ifdef CCISS_DEBUG
+-	printk(KERN_DEBUG "cciss_open %s\n", inode->i_bdev->bd_disk->disk_name);
++	printk(KERN_DEBUG "cciss_open %s\n", bdev->bd_disk->disk_name);
+ #endif /* CCISS_DEBUG */ 
+ 
+ 	/*
+@@ -379,7 +378,7 @@ static int cciss_open(struct inode *inod
+ 	 * for "raw controller".
+ 	 */
+ 	if (drv->nr_blocks == 0) {
+-		if (iminor(inode) != 0)
++		if (bdev != bdev->bd_contains || drv != host->drv)
+ 			return -ENXIO;
+ 		if (!capable(CAP_SYS_ADMIN))
+ 			return -EPERM;
+@@ -391,13 +390,13 @@ static int cciss_open(struct inode *inod
+ /*
+  * Close.  Sync first.
+  */
+-static int cciss_release(struct inode *inode, struct file *filep)
++static int cciss_release(struct gendisk *disk)
+ {
+-	ctlr_info_t *host = get_host(inode->i_bdev->bd_disk);
+-	drive_info_struct *drv = get_drv(inode->i_bdev->bd_disk);
++	ctlr_info_t *host = get_host(disk);
++	drive_info_struct *drv = get_drv(disk);
+ 
+ #ifdef CCISS_DEBUG
+-	printk(KERN_DEBUG "cciss_release %s\n", inode->i_bdev->bd_disk->disk_name);
++	printk(KERN_DEBUG "cciss_release %s\n", disk->disk_name);
+ #endif /* CCISS_DEBUG */
+ 
+ 	drv->usage_count--;
+@@ -408,10 +407,9 @@ static int cciss_release(struct inode *i
+ /*
+  * ioctl 
+  */
+-static int cciss_ioctl(struct inode *inode, struct file *filep, 
++static int cciss_ioctl(struct block_device *bdev, struct file *filep, 
+ 		unsigned int cmd, unsigned long arg)
+ {
+-	struct block_device *bdev = inode->i_bdev;
+ 	struct gendisk *disk = bdev->bd_disk;
+ 	ctlr_info_t *host = get_host(disk);
+ 	drive_info_struct *drv = get_drv(disk);
+@@ -434,7 +432,7 @@ static int cciss_ioctl(struct inode *ino
+                         driver_geo.sectors = 0x3f;
+                         driver_geo.cylinders = (int)drv->nr_blocks / (0xff*0x3f);
+                 }
+-                driver_geo.start= get_start_sect(inode->i_bdev);
++                driver_geo.start= get_start_sect(bdev);
+                 if (copy_to_user((void *) arg, &driver_geo,
+                                 sizeof( struct hd_geometry)))
+                         return  -EFAULT;
+@@ -636,9 +634,11 @@ static int cciss_ioctl(struct inode *ino
+ 		{	
+ 			return -EINVAL;
+ 		} 
++#if 0 /* 'buf_size' member is 16-bits, and always smaller than kmalloc limit */
+ 		/* Check kmalloc limits */
+ 		if(iocommand.buf_size > 128000)
+ 			return -EINVAL;
++#endif
+ 		if(iocommand.buf_size > 0)
+ 		{
+ 			buff =  kmalloc(iocommand.buf_size, GFP_KERNEL);
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/block/cfq-iosched.c	2003-10-05 00:34:17.000000000 -0700
+@@ -0,0 +1,707 @@
++/*
++ *  linux/drivers/block/cfq-iosched.c
++ *
++ *  CFQ, or complete fairness queueing, disk scheduler.
++ *
++ *  Based on ideas from a previously unfinished io
++ *  scheduler (round robin per-process disk scheduling) and Andrea Arcangeli.
++ *
++ *  Copyright (C) 2003 Jens Axboe <axboe@suse.de>
++ */
++#include <linux/kernel.h>
++#include <linux/fs.h>
++#include <linux/blkdev.h>
++#include <linux/elevator.h>
++#include <linux/bio.h>
++#include <linux/config.h>
++#include <linux/module.h>
++#include <linux/slab.h>
++#include <linux/init.h>
++#include <linux/compiler.h>
++#include <linux/hash.h>
++#include <linux/rbtree.h>
++#include <linux/mempool.h>
++
++/*
++ * tunables
++ */
++static int cfq_quantum = 4;
++static int cfq_queued = 8;
++
++#define CFQ_QHASH_SHIFT		6
++#define CFQ_QHASH_ENTRIES	(1 << CFQ_QHASH_SHIFT)
++#define list_entry_qhash(entry)	list_entry((entry), struct cfq_queue, cfq_hash)
++
++#define CFQ_MHASH_SHIFT		8
++#define CFQ_MHASH_BLOCK(sec)	((sec) >> 3)
++#define CFQ_MHASH_ENTRIES	(1 << CFQ_MHASH_SHIFT)
++#define CFQ_MHASH_FN(sec)	(hash_long(CFQ_MHASH_BLOCK((sec)),CFQ_MHASH_SHIFT))
++#define ON_MHASH(crq)		!list_empty(&(crq)->hash)
++#define rq_hash_key(rq)		((rq)->sector + (rq)->nr_sectors)
++#define list_entry_hash(ptr)	list_entry((ptr), struct cfq_rq, hash)
++
++#define list_entry_cfqq(ptr)	list_entry((ptr), struct cfq_queue, cfq_list)
++
++#define RQ_DATA(rq)		((struct cfq_rq *) (rq)->elevator_private)
++
++static kmem_cache_t *crq_pool;
++static kmem_cache_t *cfq_pool;
++static mempool_t *cfq_mpool;
++
++struct cfq_data {
++	struct list_head rr_list;
++	struct list_head *dispatch;
++	struct list_head *cfq_hash;
++
++	struct list_head *crq_hash;
++
++	unsigned int busy_queues;
++	unsigned int max_queued;
++
++	mempool_t *crq_pool;
++};
++
++struct cfq_queue {
++	struct list_head cfq_hash;
++	struct list_head cfq_list;
++	struct rb_root sort_list;
++	int pid;
++	int queued[2];
++#if 0
++	/*
++	 * with a simple addition like this, we can do io priorities. almost.
++	 * does need a split request free list, too.
++	 */
++	int io_prio
++#endif
++};
++
++struct cfq_rq {
++	struct rb_node rb_node;
++	sector_t rb_key;
++
++	struct request *request;
++
++	struct cfq_queue *cfq_queue;
++
++	struct list_head hash;
++};
++
++static void cfq_put_queue(struct cfq_data *cfqd, struct cfq_queue *cfqq);
++static struct cfq_queue *cfq_find_cfq_hash(struct cfq_data *cfqd, int pid);
++static void cfq_dispatch_sort(struct list_head *head, struct cfq_rq *crq);
++
++/*
++ * lots of deadline iosched dupes, can be abstracted later...
++ */
++static inline void __cfq_del_crq_hash(struct cfq_rq *crq)
++{
++	list_del_init(&crq->hash);
++}
++
++static inline void cfq_del_crq_hash(struct cfq_rq *crq)
++{
++	if (ON_MHASH(crq))
++		__cfq_del_crq_hash(crq);
++}
++
++static void cfq_remove_merge_hints(request_queue_t *q, struct cfq_rq *crq)
++{
++	cfq_del_crq_hash(crq);
++
++	if (q->last_merge == crq->request)
++		q->last_merge = NULL;
++}
++
++static inline void cfq_add_crq_hash(struct cfq_data *cfqd, struct cfq_rq *crq)
++{
++	struct request *rq = crq->request;
++
++	BUG_ON(ON_MHASH(crq));
++
++	list_add(&crq->hash, &cfqd->crq_hash[CFQ_MHASH_FN(rq_hash_key(rq))]);
++}
++
++static struct request *cfq_find_rq_hash(struct cfq_data *cfqd, sector_t offset)
++{
++	struct list_head *hash_list = &cfqd->crq_hash[CFQ_MHASH_FN(offset)];
++	struct list_head *entry, *next = hash_list->next;
++
++	while ((entry = next) != hash_list) {
++		struct cfq_rq *crq = list_entry_hash(entry);
++		struct request *__rq = crq->request;
++
++		next = entry->next;
++
++		BUG_ON(!ON_MHASH(crq));
++
++		if (!rq_mergeable(__rq)) {
++			__cfq_del_crq_hash(crq);
++			continue;
++		}
++
++		if (rq_hash_key(__rq) == offset)
++			return __rq;
++	}
++
++	return NULL;
++}
++
++/*
++ * rb tree support functions
++ */
++#define RB_NONE		(2)
++#define RB_EMPTY(node)	((node)->rb_node == NULL)
++#define RB_CLEAR(node)	((node)->rb_color = RB_NONE)
++#define RB_CLEAR_ROOT(root)	((root)->rb_node = NULL)
++#define ON_RB(node)	((node)->rb_color != RB_NONE)
++#define rb_entry_crq(node)	rb_entry((node), struct cfq_rq, rb_node)
++#define rq_rb_key(rq)		(rq)->sector
++
++static inline void cfq_del_crq_rb(struct cfq_queue *cfqq, struct cfq_rq *crq)
++{
++	if (ON_RB(&crq->rb_node)) {
++		cfqq->queued[rq_data_dir(crq->request)]--;
++		rb_erase(&crq->rb_node, &cfqq->sort_list);
++		crq->cfq_queue = NULL;
++	}
++}
++
++static struct cfq_rq *
++__cfq_add_crq_rb(struct cfq_queue *cfqq, struct cfq_rq *crq)
++{
++	struct rb_node **p = &cfqq->sort_list.rb_node;
++	struct rb_node *parent = NULL;
++	struct cfq_rq *__crq;
++
++	while (*p) {
++		parent = *p;
++		__crq = rb_entry_crq(parent);
++
++		if (crq->rb_key < __crq->rb_key)
++			p = &(*p)->rb_left;
++		else if (crq->rb_key > __crq->rb_key)
++			p = &(*p)->rb_right;
++		else
++			return __crq;
++	}
++
++	rb_link_node(&crq->rb_node, parent, p);
++	return 0;
++}
++
++static void
++cfq_add_crq_rb(struct cfq_data *cfqd, struct cfq_queue *cfqq,struct cfq_rq *crq)
++{
++	struct request *rq = crq->request;
++	struct cfq_rq *__alias;
++
++	crq->rb_key = rq_rb_key(rq);
++	cfqq->queued[rq_data_dir(rq)]++;
++retry:
++	__alias = __cfq_add_crq_rb(cfqq, crq);
++	if (!__alias) {
++		rb_insert_color(&crq->rb_node, &cfqq->sort_list);
++		crq->cfq_queue = cfqq;
++		return;
++	}
++
++	cfq_del_crq_rb(cfqq, __alias);
++	cfq_dispatch_sort(cfqd->dispatch, __alias);
++	goto retry;
++}
++
++static struct request *
++cfq_find_rq_rb(struct cfq_data *cfqd, sector_t sector)
++{
++	struct cfq_queue *cfqq = cfq_find_cfq_hash(cfqd, current->tgid);
++	struct rb_node *n;
++
++	if (!cfqq)
++		goto out;
++
++	n = cfqq->sort_list.rb_node;
++	while (n) {
++		struct cfq_rq *crq = rb_entry_crq(n);
++
++		if (sector < crq->rb_key)
++			n = n->rb_left;
++		else if (sector > crq->rb_key)
++			n = n->rb_right;
++		else
++			return crq->request;
++	}
++
++out:
++	return NULL;
++}
++
++static void cfq_remove_request(request_queue_t *q, struct request *rq)
++{
++	struct cfq_data *cfqd = q->elevator.elevator_data;
++	struct cfq_rq *crq = RQ_DATA(rq);
++
++	if (crq) {
++		struct cfq_queue *cfqq = crq->cfq_queue;
++
++		cfq_remove_merge_hints(q, crq);
++		list_del_init(&rq->queuelist);
++
++		if (cfqq) {
++			cfq_del_crq_rb(cfqq, crq);
++
++			if (RB_EMPTY(&cfqq->sort_list))
++				cfq_put_queue(cfqd, cfqq);
++		}
++	}
++}
++
++static int
++cfq_merge(request_queue_t *q, struct request **req, struct bio *bio)
++{
++	struct cfq_data *cfqd = q->elevator.elevator_data;
++	struct request *__rq;
++	int ret;
++
++	ret = elv_try_last_merge(q, bio);
++	if (ret != ELEVATOR_NO_MERGE) {
++		__rq = q->last_merge;
++		goto out_insert;
++	}
++
++	__rq = cfq_find_rq_hash(cfqd, bio->bi_sector);
++	if (__rq) {
++		BUG_ON(__rq->sector + __rq->nr_sectors != bio->bi_sector);
++
++		if (elv_rq_merge_ok(__rq, bio)) {
++			ret = ELEVATOR_BACK_MERGE;
++			goto out;
++		}
++	}
++
++	__rq = cfq_find_rq_rb(cfqd, bio->bi_sector + bio_sectors(bio));
++	if (__rq) {
++		if (elv_rq_merge_ok(__rq, bio)) {
++			ret = ELEVATOR_FRONT_MERGE;
++			goto out;
++		}
++	}
++
++	return ELEVATOR_NO_MERGE;
++out:
++	q->last_merge = __rq;
++out_insert:
++	*req = __rq;
++	return ret;
++}
++
++static void cfq_merged_request(request_queue_t *q, struct request *req)
++{
++	struct cfq_data *cfqd = q->elevator.elevator_data;
++	struct cfq_rq *crq = RQ_DATA(req);
++
++	cfq_del_crq_hash(crq);
++	cfq_add_crq_hash(cfqd, crq);
++
++	if (ON_RB(&crq->rb_node) && (rq_rb_key(req) != crq->rb_key)) {
++		struct cfq_queue *cfqq = crq->cfq_queue;
++
++		cfq_del_crq_rb(cfqq, crq);
++		cfq_add_crq_rb(cfqd, cfqq, crq);
++	}
++
++	q->last_merge = req;
++}
++
++static void
++cfq_merged_requests(request_queue_t *q, struct request *req,
++		    struct request *next)
++{
++	cfq_merged_request(q, req);
++	cfq_remove_request(q, next);
++}
++
++static void cfq_dispatch_sort(struct list_head *head, struct cfq_rq *crq)
++{
++	struct list_head *entry = head;
++	struct request *__rq;
++
++	if (!list_empty(head)) {
++		__rq = list_entry_rq(head->next);
++
++		if (crq->request->sector < __rq->sector) {
++			entry = head->prev;
++			goto link;
++		}
++	}
++
++	while ((entry = entry->prev) != head) {
++		__rq = list_entry_rq(entry);
++
++		if (crq->request->sector <= __rq->sector)
++			break;
++	}
++
++link:
++	list_add_tail(&crq->request->queuelist, entry);
++}
++
++static inline void
++__cfq_dispatch_requests(request_queue_t *q, struct cfq_data *cfqd,
++			struct cfq_queue *cfqq)
++{
++	struct cfq_rq *crq = rb_entry_crq(rb_first(&cfqq->sort_list));
++
++	cfq_del_crq_rb(cfqq, crq);
++	cfq_remove_merge_hints(q, crq);
++	cfq_dispatch_sort(cfqd->dispatch, crq);
++}
++
++static int cfq_dispatch_requests(request_queue_t *q, struct cfq_data *cfqd)
++{
++	struct cfq_queue *cfqq;
++	struct list_head *entry, *tmp;
++	int ret, queued, good_queues;
++
++	if (list_empty(&cfqd->rr_list))
++		return 0;
++
++	queued = ret = 0;
++restart:
++	good_queues = 0;
++	list_for_each_safe(entry, tmp, &cfqd->rr_list) {
++		cfqq = list_entry_cfqq(cfqd->rr_list.next);
++
++		BUG_ON(RB_EMPTY(&cfqq->sort_list));
++
++		__cfq_dispatch_requests(q, cfqd, cfqq);
++
++		if (RB_EMPTY(&cfqq->sort_list))
++			cfq_put_queue(cfqd, cfqq);
++		else
++			good_queues++;
++
++		queued++;
++		ret = 1;
++	}
++
++	if ((queued < cfq_quantum) && good_queues)
++		goto restart;
++
++	return ret;
++}
++
++static struct request *cfq_next_request(request_queue_t *q)
++{
++	struct cfq_data *cfqd = q->elevator.elevator_data;
++	struct request *rq;
++
++	if (!list_empty(cfqd->dispatch)) {
++		struct cfq_rq *crq;
++dispatch:
++		rq = list_entry_rq(cfqd->dispatch->next);
++
++		BUG_ON(q->last_merge == rq);
++		crq = RQ_DATA(rq);
++		if (crq)
++			BUG_ON(ON_MHASH(crq));
++
++		return rq;
++	}
++
++	if (cfq_dispatch_requests(q, cfqd))
++		goto dispatch;
++
++	return NULL;
++}
++
++static inline struct cfq_queue *
++__cfq_find_cfq_hash(struct cfq_data *cfqd, int pid, const int hashval)
++{
++	struct list_head *hash_list = &cfqd->cfq_hash[hashval];
++	struct list_head *entry;
++
++	list_for_each(entry, hash_list) {
++		struct cfq_queue *__cfqq = list_entry_qhash(entry);
++
++		if (__cfqq->pid == pid)
++			return __cfqq;
++	}
++
++	return NULL;
++}
++
++static struct cfq_queue *cfq_find_cfq_hash(struct cfq_data *cfqd, int pid)
++{
++	const int hashval = hash_long(current->tgid, CFQ_QHASH_SHIFT);
++
++	return __cfq_find_cfq_hash(cfqd, pid, hashval);
++}
++
++static void cfq_put_queue(struct cfq_data *cfqd, struct cfq_queue *cfqq)
++{
++	cfqd->busy_queues--;
++	list_del(&cfqq->cfq_list);
++	list_del(&cfqq->cfq_hash);
++	mempool_free(cfqq, cfq_mpool);
++}
++
++static struct cfq_queue *cfq_get_queue(struct cfq_data *cfqd, int pid)
++{
++	const int hashval = hash_long(current->tgid, CFQ_QHASH_SHIFT);
++	struct cfq_queue *cfqq = __cfq_find_cfq_hash(cfqd, pid, hashval);
++
++	if (!cfqq) {
++		cfqq = mempool_alloc(cfq_mpool, GFP_NOIO);
++
++		INIT_LIST_HEAD(&cfqq->cfq_hash);
++		INIT_LIST_HEAD(&cfqq->cfq_list);
++		RB_CLEAR_ROOT(&cfqq->sort_list);
++
++		cfqq->pid = pid;
++		cfqq->queued[0] = cfqq->queued[1] = 0;
++		list_add(&cfqq->cfq_hash, &cfqd->cfq_hash[hashval]);
++	}
++
++	return cfqq;
++}
++
++static void cfq_enqueue(struct cfq_data *cfqd, struct cfq_rq *crq)
++{
++	struct cfq_queue *cfqq;
++
++	cfqq = cfq_get_queue(cfqd, current->tgid);
++
++	cfq_add_crq_rb(cfqd, cfqq, crq);
++
++	if (list_empty(&cfqq->cfq_list)) {
++		list_add(&cfqq->cfq_list, &cfqd->rr_list);
++		cfqd->busy_queues++;
++	}
++}
++
++static void
++cfq_insert_request(request_queue_t *q, struct request *rq, int where)
++{
++	struct cfq_data *cfqd = q->elevator.elevator_data;
++	struct cfq_rq *crq = RQ_DATA(rq);
++
++	switch (where) {
++		case ELEVATOR_INSERT_BACK:
++			while (cfq_dispatch_requests(q, cfqd))
++				;
++			list_add_tail(&rq->queuelist, cfqd->dispatch);
++			break;
++		case ELEVATOR_INSERT_FRONT:
++			list_add(&rq->queuelist, cfqd->dispatch);
++			break;
++		case ELEVATOR_INSERT_SORT:
++			BUG_ON(!blk_fs_request(rq));
++			cfq_enqueue(cfqd, crq);
++			break;
++		default:
++			printk("%s: bad insert point %d\n", __FUNCTION__,where);
++			return;
++	}
++
++	if (rq_mergeable(rq)) {
++		cfq_add_crq_hash(cfqd, crq);
++
++		if (!q->last_merge)
++			q->last_merge = rq;
++	}
++}
++
++static int cfq_queue_empty(request_queue_t *q)
++{
++	struct cfq_data *cfqd = q->elevator.elevator_data;
++
++	if (list_empty(cfqd->dispatch) && list_empty(&cfqd->rr_list))
++		return 1;
++
++	return 0;
++}
++
++static struct request *
++cfq_former_request(request_queue_t *q, struct request *rq)
++{
++	struct cfq_rq *crq = RQ_DATA(rq);
++	struct rb_node *rbprev = rb_prev(&crq->rb_node);
++
++	if (rbprev)
++		return rb_entry_crq(rbprev)->request;
++
++	return NULL;
++}
++
++static struct request *
++cfq_latter_request(request_queue_t *q, struct request *rq)
++{
++	struct cfq_rq *crq = RQ_DATA(rq);
++	struct rb_node *rbnext = rb_next(&crq->rb_node);
++
++	if (rbnext)
++		return rb_entry_crq(rbnext)->request;
++
++	return NULL;
++}
++
++static int cfq_may_queue(request_queue_t *q, int rw)
++{
++	struct cfq_data *cfqd = q->elevator.elevator_data;
++	struct cfq_queue *cfqq;
++	int ret = 1;
++
++	if (!cfqd->busy_queues)
++		goto out;
++
++	cfqq = cfq_find_cfq_hash(cfqd, current->tgid);
++	if (cfqq) {
++		int limit = (q->nr_requests - cfq_queued) / cfqd->busy_queues;
++
++		if (limit < 3)
++			limit = 3;
++		else if (limit > cfqd->max_queued)
++			limit = cfqd->max_queued;
++
++		if (cfqq->queued[rw] > limit)
++			ret = 0;
++	}
++out:
++	return ret;
++}
++
++static void cfq_put_request(request_queue_t *q, struct request *rq)
++{
++	struct cfq_data *cfqd = q->elevator.elevator_data;
++	struct cfq_rq *crq = RQ_DATA(rq);
++
++	if (crq) {
++		BUG_ON(q->last_merge == rq);
++		BUG_ON(ON_MHASH(crq));
++
++		mempool_free(crq, cfqd->crq_pool);
++		rq->elevator_private = NULL;
++	}
++}
++
++static int cfq_set_request(request_queue_t *q, struct request *rq, int gfp_mask)
++{
++	struct cfq_data *cfqd = q->elevator.elevator_data;
++	struct cfq_rq *crq = mempool_alloc(cfqd->crq_pool, gfp_mask);
++
++	if (crq) {
++		RB_CLEAR(&crq->rb_node);
++		crq->request = rq;
++		crq->cfq_queue = NULL;
++		INIT_LIST_HEAD(&crq->hash);
++		rq->elevator_private = crq;
++		return 0;
++	}
++
++	return 1;
++}
++
++static void cfq_exit(request_queue_t *q, elevator_t *e)
++{
++	struct cfq_data *cfqd = e->elevator_data;
++
++	e->elevator_data = NULL;
++	mempool_destroy(cfqd->crq_pool);
++	kfree(cfqd->crq_hash);
++	kfree(cfqd->cfq_hash);
++	kfree(cfqd);
++}
++
++static int cfq_init(request_queue_t *q, elevator_t *e)
++{
++	struct cfq_data *cfqd;
++	int i;
++
++	cfqd = kmalloc(sizeof(*cfqd), GFP_KERNEL);
++	if (!cfqd)
++		return -ENOMEM;
++
++	memset(cfqd, 0, sizeof(*cfqd));
++	INIT_LIST_HEAD(&cfqd->rr_list);
++
++	cfqd->crq_hash = kmalloc(sizeof(struct list_head) * CFQ_MHASH_ENTRIES, GFP_KERNEL);
++	if (!cfqd->crq_hash)
++		goto out_crqhash;
++
++	cfqd->cfq_hash = kmalloc(sizeof(struct list_head) * CFQ_QHASH_ENTRIES, GFP_KERNEL);
++	if (!cfqd->cfq_hash)
++		goto out_cfqhash;
++
++	cfqd->crq_pool = mempool_create(BLKDEV_MIN_RQ, mempool_alloc_slab, mempool_free_slab, crq_pool);
++	if (!cfqd->crq_pool)
++		goto out_crqpool;
++
++	for (i = 0; i < CFQ_MHASH_ENTRIES; i++)
++		INIT_LIST_HEAD(&cfqd->crq_hash[i]);
++	for (i = 0; i < CFQ_QHASH_ENTRIES; i++)
++		INIT_LIST_HEAD(&cfqd->cfq_hash[i]);
++
++	cfqd->dispatch = &q->queue_head;
++	e->elevator_data = cfqd;
++
++	/*
++	 * just set it to some high value, we want anyone to be able to queue
++	 * some requests. fairness is handled differently
++	 */
++	cfqd->max_queued = q->nr_requests;
++	q->nr_requests = 8192;
++
++	return 0;
++out_crqpool:
++	kfree(cfqd->cfq_hash);
++out_cfqhash:
++	kfree(cfqd->crq_hash);
++out_crqhash:
++	kfree(cfqd);
++	return -ENOMEM;
++}
++
++static int __init cfq_slab_setup(void)
++{
++	crq_pool = kmem_cache_create("crq_pool", sizeof(struct cfq_rq), 0, 0,
++					NULL, NULL);
++
++	if (!crq_pool)
++		panic("cfq_iosched: can't init crq pool\n");
++
++	cfq_pool = kmem_cache_create("cfq_pool", sizeof(struct cfq_queue), 0, 0,
++					NULL, NULL);
++
++	if (!cfq_pool)
++		panic("cfq_iosched: can't init cfq pool\n");
++
++	cfq_mpool = mempool_create(64, mempool_alloc_slab, mempool_free_slab, cfq_pool);
++
++	if (!cfq_mpool)
++		panic("cfq_iosched: can't init cfq mpool\n");
++
++	return 0;
++}
++
++subsys_initcall(cfq_slab_setup);
++
++elevator_t iosched_cfq = {
++	.elevator_name =		"cfq",
++	.elevator_merge_fn = 		cfq_merge,
++	.elevator_merged_fn =		cfq_merged_request,
++	.elevator_merge_req_fn =	cfq_merged_requests,
++	.elevator_next_req_fn =		cfq_next_request,
++	.elevator_add_req_fn =		cfq_insert_request,
++	.elevator_remove_req_fn =	cfq_remove_request,
++	.elevator_queue_empty_fn =	cfq_queue_empty,
++	.elevator_former_req_fn =	cfq_former_request,
++	.elevator_latter_req_fn =	cfq_latter_request,
++	.elevator_set_req_fn =		cfq_set_request,
++	.elevator_put_req_fn =		cfq_put_request,
++	.elevator_may_queue_fn =	cfq_may_queue,
++	.elevator_init_fn =		cfq_init,
++	.elevator_exit_fn =		cfq_exit,
++};
++
++EXPORT_SYMBOL(iosched_cfq);
+--- linux-2.6.0-test6/drivers/block/cpqarray.c	2003-09-08 13:58:56.000000000 -0700
++++ 25/drivers/block/cpqarray.c	2003-10-05 00:34:00.000000000 -0700
+@@ -99,8 +99,6 @@ static struct board_type products[] = {
+ 
+ static struct gendisk *ida_gendisk[MAX_CTLR][NWD];
+ 
+-static struct proc_dir_entry *proc_array;
+-
+ /* Debug... */
+ #define DBG(s)	do { s } while(0)
+ /* Debug (general info)... */
+@@ -130,9 +128,9 @@ static int sendcmd(
+ 	unsigned int blkcnt,
+ 	unsigned int log_unit );
+ 
+-static int ida_open(struct inode *inode, struct file *filep);
+-static int ida_release(struct inode *inode, struct file *filep);
+-static int ida_ioctl(struct inode *inode, struct file *filep, unsigned int cmd, unsigned long arg);
++static int ida_open(struct block_device *bdev, struct file *filep);
++static int ida_release(struct gendisk *disk);
++static int ida_ioctl(struct block_device *bdev, struct file *filep, unsigned int cmd, unsigned long arg);
+ static int ida_ctlr_ioctl(ctlr_info_t *h, int dsk, ida_ioctl_t *io);
+ 
+ static void do_ida_request(request_queue_t *q);
+@@ -153,8 +151,6 @@ static void ida_procinit(int i);
+ static int ida_proc_get_info(char *buffer, char **start, off_t offset, int length, int *eof, void *data);
+ #else
+ static void ida_procinit(int i) {}
+-static int ida_proc_get_info(char *buffer, char **start, off_t offset,
+-			     int length, int *eof, void *data) { return 0;}
+ #endif
+ 
+ static inline drv_info_t *get_drv(struct gendisk *disk)
+@@ -179,6 +175,8 @@ static struct block_device_operations id
+ 
+ #ifdef CONFIG_PROC_FS
+ 
++static struct proc_dir_entry *proc_array;
++
+ /*
+  * Get us a file in /proc/array that says something about each controller.
+  * Create /proc/array if it doesn't exist yet.
+@@ -717,12 +715,12 @@ DBGINFO(
+ /*
+  * Open.  Make sure the device is really there.
+  */
+-static int ida_open(struct inode *inode, struct file *filep)
++static int ida_open(struct block_device *bdev, struct file *filep)
+ {
+-	drv_info_t *drv = get_drv(inode->i_bdev->bd_disk);
+-	ctlr_info_t *host = get_host(inode->i_bdev->bd_disk);
++	drv_info_t *drv = get_drv(bdev->bd_disk);
++	ctlr_info_t *host = get_host(bdev->bd_disk);
+ 
+-	DBGINFO(printk("ida_open %s\n", inode->i_bdev->bd_disk->disk_name));
++	DBGINFO(printk("ida_open %s\n", bdev->bd_disk->disk_name));
+ 	/*
+ 	 * Root is allowed to open raw volume zero even if it's not configured
+ 	 * so array config can still work.  I don't think I really like this,
+@@ -742,9 +740,9 @@ static int ida_open(struct inode *inode,
+ /*
+  * Close.  Sync first.
+  */
+-static int ida_release(struct inode *inode, struct file *filep)
++static int ida_release(struct gendisk *disk)
+ {
+-	ctlr_info_t *host = get_host(inode->i_bdev->bd_disk);
++	ctlr_info_t *host = get_host(disk);
+ 	host->usage_count--;
+ 	return 0;
+ }
+@@ -1024,10 +1022,10 @@ static void ida_timer(unsigned long tdat
+  *  ida_ioctl does some miscellaneous stuff like reporting drive geometry,
+  *  setting readahead and submitting commands from userspace to the controller.
+  */
+-static int ida_ioctl(struct inode *inode, struct file *filep, unsigned int cmd, unsigned long arg)
++static int ida_ioctl(struct block_device *bdev, struct file *filep, unsigned int cmd, unsigned long arg)
+ {
+-	drv_info_t *drv = get_drv(inode->i_bdev->bd_disk);
+-	ctlr_info_t *host = get_host(inode->i_bdev->bd_disk);
++	drv_info_t *drv = get_drv(bdev->bd_disk);
++	ctlr_info_t *host = get_host(bdev->bd_disk);
+ 	int error;
+ 	int diskinfo[4];
+ 	struct hd_geometry *geo = (struct hd_geometry *)arg;
+@@ -1048,7 +1046,7 @@ static int ida_ioctl(struct inode *inode
+ 		put_user(diskinfo[0], &geo->heads);
+ 		put_user(diskinfo[1], &geo->sectors);
+ 		put_user(diskinfo[2], &geo->cylinders);
+-		put_user(get_start_sect(inode->i_bdev), &geo->start);
++		put_user(get_start_sect(bdev), &geo->start);
+ 		return 0;
+ 	case IDAGETDRVINFO:
+ 		if (copy_to_user(&io->c.drv, drv, sizeof(drv_info_t)))
+@@ -1078,7 +1076,7 @@ out_passthru:
+ 		put_user(host->ctlr_sig, (int*)arg);
+ 		return 0;
+ 	case IDAREVALIDATEVOLS:
+-		if (iminor(inode) != 0)
++		if (bdev != bdev->bd_contains || drv != host->drv)
+ 			return -ENXIO;
+ 		return revalidate_allvol(host);
+ 	case IDADRIVERVERSION:
+--- linux-2.6.0-test6/drivers/block/DAC960.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/block/DAC960.c	2003-10-05 00:33:58.000000000 -0700
+@@ -67,9 +67,9 @@ static long disk_size(DAC960_Controller_
+ 	}
+ }
+ 
+-static int DAC960_open(struct inode *inode, struct file *file)
++static int DAC960_open(struct block_device *bdev, struct file *file)
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
++	struct gendisk *disk = bdev->bd_disk;
+ 	DAC960_Controller_T *p = disk->queue->queuedata;
+ 	int drive_nr = (long)disk->private_data;
+ 
+@@ -84,17 +84,17 @@ static int DAC960_open(struct inode *ino
+ 			return -ENXIO;
+ 	}
+ 
+-	check_disk_change(inode->i_bdev);
++	check_disk_change(bdev);
+ 
+ 	if (!get_capacity(p->disks[drive_nr]))
+ 		return -ENXIO;
+ 	return 0;
+ }
+ 
+-static int DAC960_ioctl(struct inode *inode, struct file *file,
++static int DAC960_ioctl(struct block_device *bdev, struct file *file,
+ 			unsigned int cmd, unsigned long arg)
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
++	struct gendisk *disk = bdev->bd_disk;
+ 	DAC960_Controller_T *p = disk->queue->queuedata;
+ 	int drive_nr = (long)disk->private_data;
+ 	struct hd_geometry g, *loc = (struct hd_geometry *)arg;
+@@ -128,7 +128,7 @@ static int DAC960_ioctl(struct inode *in
+ 		g.cylinders = i->ConfigurableDeviceSize / (g.heads * g.sectors);
+ 	}
+ 	
+-	g.start = get_start_sect(inode->i_bdev);
++	g.start = get_start_sect(bdev);
+ 
+ 	return copy_to_user(loc, &g, sizeof g) ? -EFAULT : 0; 
+ }
+--- linux-2.6.0-test6/drivers/block/floppy98.c	2003-09-08 13:58:56.000000000 -0700
++++ 25/drivers/block/floppy98.c	2003-10-05 00:34:01.000000000 -0700
+@@ -3484,14 +3484,14 @@ static int get_floppy_geometry(int drive
+ 	return 0;
+ }
+ 
+-static int fd_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
++static int fd_ioctl(struct block_device *bdev, struct file *filp, unsigned int cmd,
+ 		    unsigned long param)
+ {
+ #define FD_IOCTL_ALLOWED ((filp) && (filp)->private_data)
+ #define OUT(c,x) case c: outparam = (const char *) (x); break
+ #define IN(c,x,tag) case c: *(x) = inparam. tag ; return 0
+ 
+-	int drive = (long)inode->i_bdev->bd_disk->private_data;
++	int drive = (long)bdev->bd_disk->private_data;
+ 	int i, type = ITYPE(UDRS->fd_device);
+ 	int ret;
+ 	int size;
+@@ -3566,11 +3566,11 @@ static int fd_ioctl(struct inode *inode,
+ 			current_type[drive] = NULL;
+ 			floppy_sizes[drive] = MAX_DISK_SIZE << 1;
+ 			UDRS->keep_data = 0;
+-			return invalidate_drive(inode->i_bdev);
++			return invalidate_drive(bdev);
+ 		case FDSETPRM:
+ 		case FDDEFPRM:
+ 			return set_geometry(cmd, & inparam.g,
+-					    drive, type, inode->i_bdev);
++					    drive, type, bdev);
+ 		case FDGETPRM:
+ 			ECALL(get_floppy_geometry(drive, type, 
+ 						  (struct floppy_struct**)
+@@ -3625,7 +3625,7 @@ static int fd_ioctl(struct inode *inode,
+ 		case FDFMTEND:
+ 		case FDFLUSH:
+ 			LOCK_FDC(drive,1);
+-			return invalidate_drive(inode->i_bdev);
++			return invalidate_drive(bdev);
+ 
+ 		case FDSETEMSGTRESH:
+ 			UDP->max_errors.reporting =
+@@ -3735,9 +3735,9 @@ static void __init config_types(void)
+ 		printk("\n");
+ }
+ 
+-static int floppy_release(struct inode * inode, struct file * filp)
++static int floppy_release(struct gendisk *disk)
+ {
+-	int drive = (long)inode->i_bdev->bd_disk->private_data;
++	int drive = (long)disk->private_data;
+ 
+ 	down(&open_lock);
+ 	if (UDRS->fd_ref < 0)
+@@ -3758,11 +3758,10 @@ static int floppy_release(struct inode *
+  * /dev/PS0 etc), and disallows simultaneous access to the same
+  * drive with different device numbers.
+  */
+-#define RETERR(x) do{floppy_release(inode,filp); return -(x);}while(0)
+ 
+-static int floppy_open(struct inode * inode, struct file * filp)
++static int floppy_open(struct block_device *bdev, struct file *filp)
+ {
+-	int drive = (long)inode->i_bdev->bd_disk->private_data;
++	int drive = (long)bdev->bd_disk->private_data;
+ 	int old_dev;
+ 	int try;
+ 	int res = -EBUSY;
+@@ -3789,7 +3788,7 @@ static int floppy_open(struct inode * in
+ 
+ 	down(&open_lock);
+ 	old_dev = UDRS->fd_device;
+-	if (opened_bdev[drive] && opened_bdev[drive] != inode->i_bdev)
++	if (opened_bdev[drive] && opened_bdev[drive] != bdev)
+ 		goto out2;
+ 
+ 	if (!UDRS->fd_ref && (UDP->flags & FD_BROKEN_DCL)){
+@@ -3809,7 +3808,7 @@ static int floppy_open(struct inode * in
+ 	else
+ 		UDRS->fd_ref++;
+ 
+-	opened_bdev[drive] = inode->i_bdev;
++	opened_bdev[drive] = bdev;
+ 
+ 	res = -ENXIO;
+ 
+@@ -3844,9 +3843,9 @@ static int floppy_open(struct inode * in
+ 		}
+ 	}
+ 
+-	UDRS->fd_device = iminor(inode);
+-	set_capacity(disks[drive], floppy_sizes[iminor(inode)]);
+-	if (old_dev != -1 && old_dev != iminor(inode)) {
++	UDRS->fd_device = MINOR(bdev->bd_dev);
++	set_capacity(disks[drive], floppy_sizes[MINOR(bdev->bd_dev)]);
++	if (old_dev != -1 && old_dev != MINOR(bdev->bd_dev)) {
+ 		if (buffer_drive == drive)
+ 			buffer_track = -1;
+ 	}
+@@ -3859,8 +3858,7 @@ static int floppy_open(struct inode * in
+ 	/* Allow ioctls if we have write-permissions even if read-only open.
+ 	 * Needed so that programs such as fdrawcmd still can work on write
+ 	 * protected disks */
+-	if ((filp->f_mode & 2) || 
+-	    (inode->i_sb && (permission(inode,2) == 0)))
++	if ((filp->f_mode & 2) || permission(filp->f_dentry->d_inode,2) == 0)
+ 	    filp->private_data = (void*) 8;
+ 
+ 	if (UFDCS->rawcmd == 1)
+@@ -3873,7 +3871,7 @@ static int floppy_open(struct inode * in
+ 	if (!(filp->f_flags & O_NDELAY)) {
+ 		if (filp->f_mode & 3) {
+ 			UDRS->last_checked = 0;
+-			check_disk_change(inode->i_bdev);
++			check_disk_change(bdev);
+ 			if (UTESTF(FD_DISK_CHANGED))
+ 				goto out;
+ 		}
+--- linux-2.6.0-test6/drivers/block/floppy.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/block/floppy.c	2003-10-05 00:34:01.000000000 -0700
+@@ -3456,14 +3456,14 @@ static int get_floppy_geometry(int drive
+ 	return 0;
+ }
+ 
+-static int fd_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
++static int fd_ioctl(struct block_device *bdev, struct file *filp, unsigned int cmd,
+ 		    unsigned long param)
+ {
+ #define FD_IOCTL_ALLOWED ((filp) && (filp)->private_data)
+ #define OUT(c,x) case c: outparam = (const char *) (x); break
+ #define IN(c,x,tag) case c: *(x) = inparam. tag ; return 0
+ 
+-	int drive = (long)inode->i_bdev->bd_disk->private_data;
++	int drive = (long)bdev->bd_disk->private_data;
+ 	int i, type = ITYPE(UDRS->fd_device);
+ 	int ret;
+ 	int size;
+@@ -3539,11 +3539,11 @@ static int fd_ioctl(struct inode *inode,
+ 			current_type[drive] = NULL;
+ 			floppy_sizes[drive] = MAX_DISK_SIZE << 1;
+ 			UDRS->keep_data = 0;
+-			return invalidate_drive(inode->i_bdev);
++			return invalidate_drive(bdev);
+ 		case FDSETPRM:
+ 		case FDDEFPRM:
+ 			return set_geometry(cmd, & inparam.g,
+-					    drive, type, inode->i_bdev);
++					    drive, type, bdev);
+ 		case FDGETPRM:
+ 			ECALL(get_floppy_geometry(drive, type, 
+ 						  (struct floppy_struct**)
+@@ -3574,7 +3574,7 @@ static int fd_ioctl(struct inode *inode,
+ 		case FDFMTEND:
+ 		case FDFLUSH:
+ 			LOCK_FDC(drive,1);
+-			return invalidate_drive(inode->i_bdev);
++			return invalidate_drive(bdev);
+ 
+ 		case FDSETEMSGTRESH:
+ 			UDP->max_errors.reporting =
+@@ -3685,9 +3685,9 @@ static void __init config_types(void)
+ 		printk("\n");
+ }
+ 
+-static int floppy_release(struct inode * inode, struct file * filp)
++static int floppy_release(struct gendisk *disk)
+ {
+-	int drive = (long)inode->i_bdev->bd_disk->private_data;
++	int drive = (long)disk->private_data;
+ 
+ 	down(&open_lock);
+ 	if (UDRS->fd_ref < 0)
+@@ -3708,9 +3708,9 @@ static int floppy_release(struct inode *
+  * /dev/PS0 etc), and disallows simultaneous access to the same
+  * drive with different device numbers.
+  */
+-static int floppy_open(struct inode * inode, struct file * filp)
++static int floppy_open(struct block_device *bdev, struct file * filp)
+ {
+-	int drive = (long)inode->i_bdev->bd_disk->private_data;
++	int drive = (long)bdev->bd_disk->private_data;
+ 	int old_dev;
+ 	int try;
+ 	int res = -EBUSY;
+@@ -3719,7 +3719,7 @@ static int floppy_open(struct inode * in
+ 	filp->private_data = (void*) 0;
+ 	down(&open_lock);
+ 	old_dev = UDRS->fd_device;
+-	if (opened_bdev[drive] && opened_bdev[drive] != inode->i_bdev)
++	if (opened_bdev[drive] && opened_bdev[drive] != bdev)
+ 		goto out2;
+ 
+ 	if (!UDRS->fd_ref && (UDP->flags & FD_BROKEN_DCL)){
+@@ -3739,7 +3739,7 @@ static int floppy_open(struct inode * in
+ 	else
+ 		UDRS->fd_ref++;
+ 
+-	opened_bdev[drive] = inode->i_bdev;
++	opened_bdev[drive] = bdev;
+ 
+ 	res = -ENXIO;
+ 
+@@ -3774,9 +3774,9 @@ static int floppy_open(struct inode * in
+ 		}
+ 	}
+ 
+-	UDRS->fd_device = iminor(inode);
+-	set_capacity(disks[drive], floppy_sizes[iminor(inode)]);
+-	if (old_dev != -1 && old_dev != iminor(inode)) {
++	UDRS->fd_device = MINOR(bdev->bd_dev);
++	set_capacity(disks[drive], floppy_sizes[MINOR(bdev->bd_dev)]);
++	if (old_dev != -1 && old_dev != MINOR(bdev->bd_dev)) {
+ 		if (buffer_drive == drive)
+ 			buffer_track = -1;
+ 	}
+@@ -3784,8 +3784,7 @@ static int floppy_open(struct inode * in
+ 	/* Allow ioctls if we have write-permissions even if read-only open.
+ 	 * Needed so that programs such as fdrawcmd still can work on write
+ 	 * protected disks */
+-	if ((filp->f_mode & 2) || 
+-	    (inode->i_sb && (permission(inode,2, NULL) == 0)))
++	if ((filp->f_mode & 2) || permission(filp->f_dentry->d_inode,2,NULL) == 0)
+ 	    filp->private_data = (void*) 8;
+ 
+ 	if (UFDCS->rawcmd == 1)
+@@ -3794,7 +3793,7 @@ static int floppy_open(struct inode * in
+ 	if (!(filp->f_flags & O_NDELAY)) {
+ 		if (filp->f_mode & 3) {
+ 			UDRS->last_checked = 0;
+-			check_disk_change(inode->i_bdev);
++			check_disk_change(bdev);
+ 			if (UTESTF(FD_DISK_CHANGED))
+ 				goto out;
+ 		}
+--- linux-2.6.0-test6/drivers/block/initrd.c	2003-06-14 12:18:51.000000000 -0700
++++ /dev/null	2002-08-30 16:31:37.000000000 -0700
+@@ -1,100 +0,0 @@
+-
+-#include <linux/blkdev.h>
+-#include <linux/genhd.h>
+-#include <linux/initrd.h>
+-#include <linux/init.h>
+-#include <linux/major.h>
+-#include <linux/module.h>
+-#include <linux/spinlock.h>
+-#include <asm/uaccess.h>
+-
+-
+-unsigned long initrd_start, initrd_end;
+-int initrd_below_start_ok;
+-
+-static int initrd_users;
+-static spinlock_t initrd_users_lock = SPIN_LOCK_UNLOCKED;
+-
+-static struct gendisk *initrd_disk;
+-
+-static ssize_t initrd_read(struct file *file, char *buf,
+-			   size_t count, loff_t *ppos)
+-{
+-	int left = initrd_end - initrd_start - *ppos;
+-
+-	if (count > left)
+-		count = left;
+-	if (count == 0)
+-		return 0;
+-	if (copy_to_user(buf, (char *)initrd_start + *ppos, count))
+-		return -EFAULT;
+-
+-	*ppos += count;
+-	return count;
+-}
+-
+-static int initrd_release(struct inode *inode,struct file *file)
+-{
+-
+-	blkdev_put(inode->i_bdev, BDEV_FILE);
+-
+-	spin_lock(&initrd_users_lock);
+-	if (!--initrd_users) {
+-		spin_unlock(&initrd_users_lock);
+-		del_gendisk(initrd_disk);
+-		free_initrd_mem(initrd_start, initrd_end);
+-		initrd_start = 0;
+-	} else
+-		spin_unlock(&initrd_users_lock);
+-
+-	return 0;
+-}
+-
+-static struct file_operations initrd_fops = {
+-	.read =		initrd_read,
+-	.release =	initrd_release,
+-};
+-
+-static int initrd_open(struct inode *inode, struct file *filp)
+-{
+-	if (!initrd_start) 
+-		return -ENODEV;
+-
+-	spin_lock(&initrd_users_lock);
+-	initrd_users++;
+-	spin_unlock(&initrd_users_lock);
+-
+-	filp->f_op = &initrd_fops;
+-	return 0;
+-}
+-
+-static struct block_device_operations initrd_bdops = {
+-	.owner =	THIS_MODULE,
+-	.open =		initrd_open,
+-};
+-
+-static int __init initrd_init(void)
+-{
+-	initrd_disk = alloc_disk(1);
+-	if (!initrd_disk)
+-		return -ENOMEM;
+-
+-	initrd_disk->major = RAMDISK_MAJOR;
+-	initrd_disk->first_minor = INITRD_MINOR;
+-	initrd_disk->fops = &initrd_bdops;	
+-
+-	sprintf(initrd_disk->disk_name, "initrd");
+-	sprintf(initrd_disk->devfs_name, "rd/initrd");
+-
+-	set_capacity(initrd_disk, (initrd_end-initrd_start+511) >> 9);
+-	add_disk(initrd_disk);
+-	return 0;
+-}
+-
+-static void __exit initrd_exit(void)
+-{
+-	put_disk(initrd_disk);
+-}
+-
+-module_init(initrd_init);
+-module_exit(initrd_exit);
+--- linux-2.6.0-test6/drivers/block/ioctl.c	2003-09-08 13:58:56.000000000 -0700
++++ 25/drivers/block/ioctl.c	2003-10-05 00:34:11.000000000 -0700
+@@ -132,10 +132,9 @@ static int put_u64(unsigned long arg, u6
+ 	return put_user(val, (u64 *)arg);
+ }
+ 
+-int blkdev_ioctl(struct inode *inode, struct file *file, unsigned cmd,
++int blkdev_ioctl(struct block_device *bdev, struct file *file, unsigned cmd,
+ 			unsigned long arg)
+ {
+-	struct block_device *bdev = inode->i_bdev;
+ 	struct gendisk *disk = bdev->bd_disk;
+ 	struct backing_dev_info *bdi;
+ 	int holder;
+@@ -194,7 +193,7 @@ int blkdev_ioctl(struct inode *inode, st
+ 		if (!capable(CAP_SYS_ADMIN))
+ 			return -EACCES;
+ 		if (disk->fops->ioctl) {
+-			ret = disk->fops->ioctl(inode, file, cmd, arg);
++			ret = disk->fops->ioctl(bdev, file, cmd, arg);
+ 			if (ret != -EINVAL)
+ 				return ret;
+ 		}
+@@ -203,7 +202,7 @@ int blkdev_ioctl(struct inode *inode, st
+ 		return 0;
+ 	case BLKROSET:
+ 		if (disk->fops->ioctl) {
+-			ret = disk->fops->ioctl(inode, file, cmd, arg);
++			ret = disk->fops->ioctl(bdev, file, cmd, arg);
+ 			if (ret != -EINVAL)
+ 				return ret;
+ 		}
+@@ -215,7 +214,7 @@ int blkdev_ioctl(struct inode *inode, st
+ 		return 0;
+ 	default:
+ 		if (disk->fops->ioctl)
+-			return disk->fops->ioctl(inode, file, cmd, arg);
++			return disk->fops->ioctl(bdev, file, cmd, arg);
+ 	}
+ 	return -ENOTTY;
+ }
+--- linux-2.6.0-test6/drivers/block/Kconfig	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/block/Kconfig	2003-10-05 00:33:24.000000000 -0700
+@@ -6,7 +6,7 @@ menu "Block devices"
+ 
+ config BLK_DEV_FD
+ 	tristate "Normal floppy disk support"
+-	depends on !X86_PC9800 && !ARCH_S390
++	depends on ISA || M68 || SPARC64
+ 	---help---
+ 	  If you want to use the floppy disk drive(s) of your PC under Linux,
+ 	  say Y. Information about this driver, especially important for IBM
+@@ -35,7 +35,7 @@ config BLK_DEV_FD98
+ 
+ config BLK_DEV_SWIM_IOP
+ 	bool "Macintosh IIfx/Quadra 900/Quadra 950 floppy support (EXPERIMENTAL)"
+-	depends on MAC && EXPERIMENTAL
++	depends on MAC && EXPERIMENTAL && BROKEN
+ 	help
+ 	  Say Y here to support the SWIM (Super Woz Integrated Machine) IOP
+ 	  floppy controller on the Macintosh IIfx and Quadra 900/950.
+@@ -63,7 +63,7 @@ config AMIGA_Z2RAM
+ 
+ config ATARI_ACSI
+ 	tristate "Atari ACSI support"
+-	depends on ATARI
++	depends on ATARI && BROKEN
+ 	---help---
+ 	  This enables support for the Atari ACSI interface. The driver
+ 	  supports hard disks and CD-ROMs, which have 512-byte sectors, or can
+--- linux-2.6.0-test6/drivers/block/Kconfig.iosched	2003-08-22 19:23:40.000000000 -0700
++++ 25/drivers/block/Kconfig.iosched	2003-10-05 00:34:17.000000000 -0700
+@@ -27,3 +27,10 @@ config IOSCHED_DEADLINE
+ 	  a disk at any one time, its behaviour is almost identical to the
+ 	  anticipatory I/O scheduler and so is a good choice.
+ 
++config IOSCHED_CFQ
++	bool "CFQ I/O scheduler" if EMBEDDED
++	default y
++	---help---
++	  The CFQ I/O scheduler tries to distribute bandwidth equally
++	  among all processes in the system. It should provide a fair
++	  working environment, suitable for desktop systems.
+--- linux-2.6.0-test6/drivers/block/ll_rw_blk.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/block/ll_rw_blk.c	2003-10-05 00:36:58.000000000 -0700
+@@ -119,7 +119,7 @@ static void set_queue_congested(request_
+ 
+ /**
+  * blk_get_backing_dev_info - get the address of a queue's backing_dev_info
+- * @dev:	device
++ * @bdev:	device
+  *
+  * Locates the passed device's request queue and returns the address of its
+  * backing_dev_info
+@@ -414,8 +414,8 @@ void blk_queue_segment_boundary(request_
+ 
+ /**
+  * blk_queue_dma_alignment - set dma length and memory alignment
+- * @q:  the request queue for the device
+- * @dma_mask:  alignment mask
++ * @q:     the request queue for the device
++ * @mask:  alignment mask
+  *
+  * description:
+  *    set required memory and length aligment for direct dma transactions.
+@@ -1152,7 +1152,7 @@ void blk_stop_queue(request_queue_t *q)
+ 
+ /**
+  * blk_run_queue - run a single device queue
+- * @q	The queue to run
++ * @q:	The queue to run
+  */
+ void blk_run_queue(struct request_queue *q)
+ {
+@@ -1257,6 +1257,8 @@ static elevator_t *chosen_elevator =
+ 	&iosched_as;
+ #elif defined(CONFIG_IOSCHED_DEADLINE)
+ 	&iosched_deadline;
++#elif defined(CONFIG_IOSCHED_CFQ)
++	&iosched_cfq;
+ #elif defined(CONFIG_IOSCHED_NOOP)
+ 	&elevator_noop;
+ #else
+@@ -1275,6 +1277,10 @@ static int __init elevator_setup(char *s
+ 	if (!strcmp(str, "as"))
+ 		chosen_elevator = &iosched_as;
+ #endif
++#ifdef CONFIG_IOSCHED_CFQ
++	if (!strcmp(str, "cfq"))
++		chosen_elevator = &iosched_cfq;
++#endif
+ #ifdef CONFIG_IOSCHED_NOOP
+ 	if (!strcmp(str, "noop"))
+ 		chosen_elevator = &elevator_noop;
+@@ -1459,6 +1465,8 @@ static void freed_request(request_queue_
+ 	}
+ }
+ 
++atomic_t global_nr_requests = ATOMIC_INIT(0);
++
+ #define blkdev_free_rq(list) list_entry((list)->next, struct request, queuelist)
+ /*
+  * Get a free request, queue_lock must not be held
+@@ -1536,6 +1544,8 @@ static struct request *get_request(reque
+ 	rq->data = NULL;
+ 	rq->sense = NULL;
+ 
++	atomic_inc(&global_nr_requests);
++
+ out:
+ 	put_io_context(ioc);
+ 	return rq;
+@@ -1766,6 +1776,9 @@ void __blk_put_request(request_queue_t *
+ 
+ 		blk_free_request(q, req);
+ 		freed_request(q, rw);
++
++		WARN_ON(atomic_read(&global_nr_requests) == 0);
++		atomic_dec(&global_nr_requests);
+ 	}
+ }
+ 
+@@ -1787,25 +1800,50 @@ void blk_put_request(struct request *req
+ }
+ 
+ /**
+- * blk_congestion_wait - wait for a queue to become uncongested
++ * blk_congestion_wait_wq - wait for a queue to become uncongested,
+  * @rw: READ or WRITE
+  * @timeout: timeout in jiffies
++ * @wait : wait queue entry to use for waiting or async notification
++ * (NULL defaults to synchronous behaviour)
+  *
+  * Waits for up to @timeout jiffies for a queue (any queue) to exit congestion.
+  * If no queues are congested then just wait for the next request to be
+  * returned.
++ *
++ * If the wait queue parameter specifies an async i/o callback,
++ * then instead of blocking, just register the callback on the wait
++ * queue for async notification when the queue gets uncongested.
+  */
+-void blk_congestion_wait(int rw, long timeout)
++int blk_congestion_wait_wq(int rw, long timeout, wait_queue_t *wait)
+ {
+-	DEFINE_WAIT(wait);
+ 	wait_queue_head_t *wqh = &congestion_wqh[rw];
++	DEFINE_WAIT(local_wait);
++
++	if (!wait)
++		wait = &local_wait;
+ 
+ 	blk_run_queues();
+-	prepare_to_wait(wqh, &wait, TASK_UNINTERRUPTIBLE);
++	prepare_to_wait(wqh, wait, TASK_UNINTERRUPTIBLE);
++	if (!is_sync_wait(wait)) {
++		/*
++		 * if we've queued an async wait queue
++		 * callback do not block; just tell the
++		 * caller to return and retry later when
++		 * the callback is notified
++		 */
++		return -EIOCBRETRY;
++	}
+ 	io_schedule_timeout(timeout);
+-	finish_wait(wqh, &wait);
++	finish_wait(wqh, wait);
++	return 0;
+ }
+ 
++void blk_congestion_wait(int rw, long timeout)
++{
++	blk_congestion_wait_wq(rw, timeout, NULL);
++}
++
++
+ /*
+  * Has to be called with the request spinlock acquired
+  */
+@@ -2592,6 +2630,7 @@ void put_io_context(struct io_context *i
+ 		if (ioc->aic && ioc->aic->dtor)
+ 			ioc->aic->dtor(ioc->aic);
+ 		kfree(ioc);
++		WARN_ON(atomic_read(&nr_io_contexts) == 0);
+ 		atomic_dec(&nr_io_contexts);
+ 	}
+ }
+@@ -2634,6 +2673,9 @@ struct io_context *get_io_context(int gf
+ 		ret = kmalloc(sizeof(*ret), GFP_ATOMIC);
+ 		if (ret) {
+ 			atomic_inc(&nr_io_contexts);
++			WARN_ON(atomic_read(&nr_io_contexts) ==
++				1 + nr_threads + atomic_read(&global_nr_requests));
++
+ 			atomic_set(&ret->refcount, 1);
+ 			ret->pid = tsk->pid;
+ 			ret->last_waited = jiffies; /* doesn't matter... */
+--- linux-2.6.0-test6/drivers/block/loop.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/block/loop.c	2003-10-05 00:34:11.000000000 -0700
+@@ -140,8 +140,7 @@ figure_loop_size(struct loop_device *lo)
+ 	sector_t x;
+ 
+ 	/* Compute loopsize in bytes */
+-	size = i_size_read(lo->lo_backing_file->f_dentry->
+-				d_inode->i_mapping->host);
++	size = i_size_read(lo->lo_backing_file->f_mapping->host);
+ 	offset = lo->lo_offset;
+ 	loopsize = size - offset;
+ 	if (lo->lo_sizelimit > 0 && lo->lo_sizelimit < loopsize)
+@@ -175,7 +174,7 @@ static int
+ do_lo_send(struct loop_device *lo, struct bio_vec *bvec, int bsize, loff_t pos)
+ {
+ 	struct file *file = lo->lo_backing_file; /* kudos to NFsckingS */
+-	struct address_space *mapping = file->f_dentry->d_inode->i_mapping;
++	struct address_space *mapping = file->f_mapping;
+ 	struct address_space_operations *aops = mapping->a_ops;
+ 	struct page *page;
+ 	char *kaddr, *data;
+@@ -660,6 +659,7 @@ static int loop_set_fd(struct loop_devic
+ 	struct file	*file;
+ 	struct inode	*inode;
+ 	struct block_device *lo_device = NULL;
++	struct address_space *mapping;
+ 	unsigned lo_blocksize;
+ 	int		lo_flags = 0;
+ 	int		error;
+@@ -676,14 +676,16 @@ static int loop_set_fd(struct loop_devic
+ 	if (!file)
+ 		goto out;
+ 
+-	error = -EINVAL;
+-	inode = file->f_dentry->d_inode;
++	mapping = file->f_mapping;
++	inode = mapping->host;
+ 
+ 	if (!(file->f_mode & FMODE_WRITE))
+ 		lo_flags |= LO_FLAGS_READ_ONLY;
+ 
++	error = -EINVAL;
++
+ 	if (S_ISBLK(inode->i_mode)) {
+-		lo_device = inode->i_bdev;
++		lo_device = I_BDEV(inode);
+ 		if (lo_device == bdev) {
+ 			error = -EBUSY;
+ 			goto out;
+@@ -692,7 +694,7 @@ static int loop_set_fd(struct loop_devic
+ 		if (bdev_read_only(lo_device))
+ 			lo_flags |= LO_FLAGS_READ_ONLY;
+ 	} else if (S_ISREG(inode->i_mode)) {
+-		struct address_space_operations *aops = inode->i_mapping->a_ops;
++		struct address_space_operations *aops = mapping->a_ops;
+ 		/*
+ 		 * If we can't read - sorry. If we only can't write - well,
+ 		 * it's going to be read-only.
+@@ -728,9 +730,8 @@ static int loop_set_fd(struct loop_devic
+ 		fput(file);
+ 		goto out_putf;
+ 	}
+-	lo->old_gfp_mask = mapping_gfp_mask(inode->i_mapping);
+-	mapping_set_gfp_mask(inode->i_mapping,
+-			     lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));
++	lo->old_gfp_mask = mapping_gfp_mask(mapping);
++	mapping_set_gfp_mask(mapping, lo->old_gfp_mask & ~(__GFP_IO|__GFP_FS));
+ 
+ 	set_blocksize(bdev, lo_blocksize);
+ 
+@@ -846,7 +847,7 @@ static int loop_clr_fd(struct loop_devic
+ 	memset(lo->lo_file_name, 0, LO_NAME_SIZE);
+ 	invalidate_bdev(bdev, 0);
+ 	set_capacity(disks[lo->lo_number], 0);
+-	mapping_set_gfp_mask(filp->f_dentry->d_inode->i_mapping, gfp);
++	mapping_set_gfp_mask(filp->f_mapping, gfp);
+ 	lo->lo_state = Lo_unbound;
+ 	fput(filp);
+ 	/* This is safe: open() is still holding a reference. */
+@@ -1056,19 +1057,19 @@ loop_get_status64(struct loop_device *lo
+ 	return err;
+ }
+ 
+-static int lo_ioctl(struct inode * inode, struct file * file,
++static int lo_ioctl(struct block_device *bdev, struct file *file,
+ 	unsigned int cmd, unsigned long arg)
+ {
+-	struct loop_device *lo = inode->i_bdev->bd_disk->private_data;
++	struct loop_device *lo = bdev->bd_disk->private_data;
+ 	int err;
+ 
+ 	down(&lo->lo_ctl_mutex);
+ 	switch (cmd) {
+ 	case LOOP_SET_FD:
+-		err = loop_set_fd(lo, file, inode->i_bdev, arg);
++		err = loop_set_fd(lo, file, bdev, arg);
+ 		break;
+ 	case LOOP_CLR_FD:
+-		err = loop_clr_fd(lo, inode->i_bdev);
++		err = loop_clr_fd(lo, bdev);
+ 		break;
+ 	case LOOP_SET_STATUS:
+ 		err = loop_set_status_old(lo, (struct loop_info *) arg);
+@@ -1089,9 +1090,9 @@ static int lo_ioctl(struct inode * inode
+ 	return err;
+ }
+ 
+-static int lo_open(struct inode *inode, struct file *file)
++static int lo_open(struct block_device *bdev, struct file *file)
+ {
+-	struct loop_device *lo = inode->i_bdev->bd_disk->private_data;
++	struct loop_device *lo = bdev->bd_disk->private_data;
+ 
+ 	down(&lo->lo_ctl_mutex);
+ 	lo->lo_refcnt++;
+@@ -1100,9 +1101,9 @@ static int lo_open(struct inode *inode, 
+ 	return 0;
+ }
+ 
+-static int lo_release(struct inode *inode, struct file *file)
++static int lo_release(struct gendisk *disk)
+ {
+-	struct loop_device *lo = inode->i_bdev->bd_disk->private_data;
++	struct loop_device *lo = disk->private_data;
+ 
+ 	down(&lo->lo_ctl_mutex);
+ 	--lo->lo_refcnt;
+--- linux-2.6.0-test6/drivers/block/Makefile	2003-08-22 19:23:40.000000000 -0700
++++ 25/drivers/block/Makefile	2003-10-05 00:34:17.000000000 -0700
+@@ -18,6 +18,7 @@ obj-y	:= elevator.o ll_rw_blk.o ioctl.o 
+ obj-$(CONFIG_IOSCHED_NOOP)	+= noop-iosched.o
+ obj-$(CONFIG_IOSCHED_AS)	+= as-iosched.o
+ obj-$(CONFIG_IOSCHED_DEADLINE)	+= deadline-iosched.o
++obj-$(CONFIG_IOSCHED_CFQ)	+= cfq-iosched.o
+ obj-$(CONFIG_MAC_FLOPPY)	+= swim3.o
+ obj-$(CONFIG_BLK_DEV_FD)	+= floppy.o
+ obj-$(CONFIG_BLK_DEV_FD98)	+= floppy98.o
+@@ -28,7 +29,6 @@ obj-$(CONFIG_ATARI_ACSI)	+= acsi.o
+ obj-$(CONFIG_ATARI_SLM)		+= acsi_slm.o
+ obj-$(CONFIG_AMIGA_Z2RAM)	+= z2ram.o
+ obj-$(CONFIG_BLK_DEV_RAM)	+= rd.o
+-obj-$(CONFIG_BLK_DEV_INITRD)	+= initrd.o
+ obj-$(CONFIG_BLK_DEV_LOOP)	+= loop.o
+ obj-$(CONFIG_BLK_DEV_PS2)	+= ps2esdi.o
+ obj-$(CONFIG_BLK_DEV_XD)	+= xd.o
+--- linux-2.6.0-test6/drivers/block/nbd.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/drivers/block/nbd.c	2003-10-05 00:33:54.000000000 -0700
+@@ -535,10 +535,10 @@ static void do_nbd_request(request_queue
+ 	return;
+ }
+ 
+-static int nbd_ioctl(struct inode *inode, struct file *file,
++static int nbd_ioctl(struct block_device *bdev, struct file *file,
+ 		     unsigned int cmd, unsigned long arg)
+ {
+-	struct nbd_device *lo = inode->i_bdev->bd_disk->private_data;
++	struct nbd_device *lo = bdev->bd_disk->private_data;
+ 	int error;
+ 	struct request sreq ;
+ 
+@@ -593,7 +593,7 @@ static int nbd_ioctl(struct inode *inode
+ 		error = -EINVAL;
+ 		file = fget(arg);
+ 		if (file) {
+-			inode = file->f_dentry->d_inode;
++			struct inode *inode = file->f_dentry->d_inode;
+ 			if (inode->i_sock) {
+ 				lo->file = file;
+ 				lo->sock = SOCKET_I(inode);
+@@ -606,20 +606,20 @@ static int nbd_ioctl(struct inode *inode
+ 	case NBD_SET_BLKSIZE:
+ 		lo->blksize = arg;
+ 		lo->bytesize &= ~(lo->blksize-1);
+-		inode->i_bdev->bd_inode->i_size = lo->bytesize;
+-		set_blocksize(inode->i_bdev, lo->blksize);
++		bdev->bd_inode->i_size = lo->bytesize;
++		set_blocksize(bdev, lo->blksize);
+ 		set_capacity(lo->disk, lo->bytesize >> 9);
+ 		return 0;
+ 	case NBD_SET_SIZE:
+ 		lo->bytesize = arg & ~(lo->blksize-1);
+-		inode->i_bdev->bd_inode->i_size = lo->bytesize;
+-		set_blocksize(inode->i_bdev, lo->blksize);
++		bdev->bd_inode->i_size = lo->bytesize;
++		set_blocksize(bdev, lo->blksize);
+ 		set_capacity(lo->disk, lo->bytesize >> 9);
+ 		return 0;
+ 	case NBD_SET_SIZE_BLOCKS:
+ 		lo->bytesize = ((u64) arg) * lo->blksize;
+-		inode->i_bdev->bd_inode->i_size = lo->bytesize;
+-		set_blocksize(inode->i_bdev, lo->blksize);
++		bdev->bd_inode->i_size = lo->bytesize;
++		set_blocksize(bdev, lo->blksize);
+ 		set_capacity(lo->disk, lo->bytesize >> 9);
+ 		return 0;
+ 	case NBD_DO_IT:
+@@ -664,11 +664,11 @@ static int nbd_ioctl(struct inode *inode
+ 	case NBD_PRINT_DEBUG:
+ #ifdef PARANOIA
+ 		printk(KERN_INFO "%s: next = %p, prev = %p. Global: in %d, out %d\n",
+-			inode->i_bdev->bd_disk->disk_name, lo->queue_head.next,
++			bdev->bd_disk->disk_name, lo->queue_head.next,
+ 			lo->queue_head.prev, requests_in, requests_out);
+ #else
+ 		printk(KERN_INFO "%s: next = %p, prev = %p\n",
+-			inode->i_bdev->bd_disk->disk_name,
++			bdev->bd_disk->disk_name,
+ 			lo->queue_head.next, lo->queue_head.prev);
+ #endif
+ 		return 0;
+--- linux-2.6.0-test6/drivers/block/paride/pcd.c	2003-08-08 22:55:11.000000000 -0700
++++ 25/drivers/block/paride/pcd.c	2003-10-05 00:34:01.000000000 -0700
+@@ -243,23 +243,23 @@ static int pcd_warned;		/* Have we logge
+ 
+ /* kernel glue structures */
+ 
+-static int pcd_block_open(struct inode *inode, struct file *file)
++static int pcd_block_open(struct block_device *bdev, struct file *file)
+ {
+-	struct pcd_unit *cd = inode->i_bdev->bd_disk->private_data;
+-	return cdrom_open(&cd->info, inode, file);
++	struct pcd_unit *cd = bdev->bd_disk->private_data;
++	return cdrom_open(&cd->info, bdev, file);
+ }
+ 
+-static int pcd_block_release(struct inode *inode, struct file *file)
++static int pcd_block_release(struct gendisk *disk)
+ {
+-	struct pcd_unit *cd = inode->i_bdev->bd_disk->private_data;
+-	return cdrom_release(&cd->info, file);
++	struct pcd_unit *cd = disk->private_data;
++	return cdrom_release(&cd->info);
+ }
+ 
+-static int pcd_block_ioctl(struct inode *inode, struct file *file,
++static int pcd_block_ioctl(struct block_device *bdev, struct file *file,
+ 				unsigned cmd, unsigned long arg)
+ {
+-	struct pcd_unit *cd = inode->i_bdev->bd_disk->private_data;
+-	return cdrom_ioctl(&cd->info, inode, cmd, arg);
++	struct pcd_unit *cd = bdev->bd_disk->private_data;
++	return cdrom_ioctl(&cd->info, bdev, cmd, arg);
+ }
+ 
+ static int pcd_block_media_changed(struct gendisk *disk)
+--- linux-2.6.0-test6/drivers/block/paride/pd.c	2003-09-08 13:58:56.000000000 -0700
++++ 25/drivers/block/paride/pd.c	2003-10-05 00:34:01.000000000 -0700
+@@ -236,11 +236,11 @@ MODULE_PARM(drive3, "1-8i");
+ #define IDE_EJECT		0xed
+ 
+ void pd_setup(char *str, int *ints);
+-static int pd_open(struct inode *inode, struct file *file);
++static int pd_open(struct block_device *bdev, struct file *file);
+ static void do_pd_request(request_queue_t * q);
+-static int pd_ioctl(struct inode *inode, struct file *file,
++static int pd_ioctl(struct block_device *bdev, struct file *file,
+ 		    unsigned int cmd, unsigned long arg);
+-static int pd_release(struct inode *inode, struct file *file);
++static int pd_release(struct gendisk *disk);
+ static int pd_revalidate(struct gendisk *p);
+ static int pd_detect(void);
+ static void do_pd_read(void);
+@@ -304,8 +304,6 @@ static char *pd_errs[17] = { "ERR", "IND
+ 
+ /* kernel glue structures */
+ 
+-extern struct block_device_operations pd_fops;
+-
+ static struct block_device_operations pd_fops = {
+ 	.owner		= THIS_MODULE,
+ 	.open		= pd_open,
+@@ -337,9 +335,9 @@ static void pd_init_units(void)
+ 	}
+ }
+ 
+-static int pd_open(struct inode *inode, struct file *file)
++static int pd_open(struct block_device *bdev, struct file *file)
+ {
+-	struct pd_unit *disk = inode->i_bdev->bd_disk->private_data;
++	struct pd_unit *disk = bdev->bd_disk->private_data;
+ 
+ 	disk->access++;
+ 
+@@ -350,10 +348,10 @@ static int pd_open(struct inode *inode, 
+ 	return 0;
+ }
+ 
+-static int pd_ioctl(struct inode *inode, struct file *file,
++static int pd_ioctl(struct block_device *bdev, struct file *file,
+ 	 unsigned int cmd, unsigned long arg)
+ {
+-	struct pd_unit *disk = inode->i_bdev->bd_disk->private_data;
++	struct pd_unit *disk = bdev->bd_disk->private_data;
+ 	struct hd_geometry *geo = (struct hd_geometry *) arg;
+ 	struct hd_geometry g;
+ 
+@@ -372,7 +370,7 @@ static int pd_ioctl(struct inode *inode,
+ 			g.sectors = disk->sectors;
+ 			g.cylinders = disk->cylinders;
+ 		}
+-		g.start = get_start_sect(inode->i_bdev);
++		g.start = get_start_sect(bdev);
+ 		if (copy_to_user(geo, &g, sizeof(struct hd_geometry)))
+ 			return -EFAULT;
+ 		return 0;
+@@ -381,9 +379,9 @@ static int pd_ioctl(struct inode *inode,
+ 	}
+ }
+ 
+-static int pd_release(struct inode *inode, struct file *file)
++static int pd_release(struct gendisk *p)
+ {
+-	struct pd_unit *disk = inode->i_bdev->bd_disk->private_data;
++	struct pd_unit *disk = p->private_data;
+ 
+ 	if (!--disk->access && disk->removable)
+ 		pd_doorlock(disk, IDE_DOORUNLOCK);
+--- linux-2.6.0-test6/drivers/block/paride/pf.c	2003-08-08 22:55:11.000000000 -0700
++++ 25/drivers/block/paride/pf.c	2003-10-05 00:34:01.000000000 -0700
+@@ -222,12 +222,12 @@ MODULE_PARM(drive3, "1-7i");
+ #define ATAPI_READ_10		0x28
+ #define ATAPI_WRITE_10		0x2a
+ 
+-static int pf_open(struct inode *inode, struct file *file);
++static int pf_open(struct block_device *bdev, struct file *file);
+ static void do_pf_request(request_queue_t * q);
+-static int pf_ioctl(struct inode *inode, struct file *file,
++static int pf_ioctl(struct block_device *bdev, struct file *file,
+ 		    unsigned int cmd, unsigned long arg);
+ 
+-static int pf_release(struct inode *inode, struct file *file);
++static int pf_release(struct gendisk *disk);
+ 
+ static int pf_detect(void);
+ static void do_pf_read(void);
+@@ -315,9 +315,9 @@ void pf_init_units(void)
+ 	}
+ }
+ 
+-static int pf_open(struct inode *inode, struct file *file)
++static int pf_open(struct block_device *bdev, struct file *file)
+ {
+-	struct pf_unit *pf = inode->i_bdev->bd_disk->private_data;
++	struct pf_unit *pf = bdev->bd_disk->private_data;
+ 
+ 	pf_identify(pf);
+ 
+@@ -334,9 +334,9 @@ static int pf_open(struct inode *inode, 
+ 	return 0;
+ }
+ 
+-static int pf_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
++static int pf_ioctl(struct block_device *bdev, struct file *file, unsigned int cmd, unsigned long arg)
+ {
+-	struct pf_unit *pf = inode->i_bdev->bd_disk->private_data;
++	struct pf_unit *pf = bdev->bd_disk->private_data;
+ 	struct hd_geometry *geo = (struct hd_geometry *) arg;
+ 	struct hd_geometry g;
+ 	sector_t capacity;
+@@ -365,9 +365,9 @@ static int pf_ioctl(struct inode *inode,
+ 	return 0;
+ }
+ 
+-static int pf_release(struct inode *inode, struct file *file)
++static int pf_release(struct gendisk *disk)
+ {
+-	struct pf_unit *pf = inode->i_bdev->bd_disk->private_data;
++	struct pf_unit *pf = disk->private_data;
+ 
+ 	if (pf->access <= 0)
+ 		return -EINVAL;
+--- linux-2.6.0-test6/drivers/block/ps2esdi.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/block/ps2esdi.c	2003-10-05 00:33:54.000000000 -0700
+@@ -39,7 +39,7 @@
+ #include <linux/genhd.h>
+ #include <linux/ps2esdi.h>
+ #include <linux/blkdev.h>
+-#include <linux/mca.h>
++#include <linux/mca-legacy.h>
+ #include <linux/init.h>
+ #include <linux/ioport.h>
+ #include <linux/module.h>
+@@ -81,7 +81,7 @@ static void (*current_int_handler) (u_in
+ static void ps2esdi_normal_interrupt_handler(u_int);
+ static void ps2esdi_initial_reset_int_handler(u_int);
+ static void ps2esdi_geometry_int_handler(u_int);
+-static int ps2esdi_ioctl(struct inode *inode, struct file *file,
++static int ps2esdi_ioctl(struct block_device *bdev, struct file *file,
+ 			 u_int cmd, u_long arg);
+ 
+ static int ps2esdi_read_status_words(int num_words, int max_words, u_short * buffer);
+@@ -1059,10 +1059,10 @@ static void dump_cmd_complete_status(u_i
+ 
+ }
+ 
+-static int ps2esdi_ioctl(struct inode *inode,
++static int ps2esdi_ioctl(struct block_device *bdev,
+ 			 struct file *file, u_int cmd, u_long arg)
+ {
+-	struct ps2esdi_i_struct *p = inode->i_bdev->bd_disk->private_data;
++	struct ps2esdi_i_struct *p = bdev->bd_disk->private_data;
+ 	struct ps2esdi_geometry *geometry = (struct ps2esdi_geometry *) arg;
+ 	int err;
+ 
+@@ -1073,7 +1073,7 @@ static int ps2esdi_ioctl(struct inode *i
+ 	put_user(p->head, (char *) &geometry->heads);
+ 	put_user(p->sect, (char *) &geometry->sectors);
+ 	put_user(p->cyl, (short *) &geometry->cylinders);
+-	put_user(get_start_sect(inode->i_bdev), (long *) &geometry->start);
++	put_user(get_start_sect(bdev), (long *) &geometry->start);
+ 	return 0;
+ }
+ 
+--- linux-2.6.0-test6/drivers/block/rd.c	2003-09-08 13:58:56.000000000 -0700
++++ 25/drivers/block/rd.c	2003-10-05 00:34:30.000000000 -0700
+@@ -1,15 +1,15 @@
+ /*
+  * ramdisk.c - Multiple RAM disk driver - gzip-loading version - v. 0.8 beta.
+- * 
+- * (C) Chad Page, Theodore Ts'o, et. al, 1995. 
++ *
++ * (C) Chad Page, Theodore Ts'o, et. al, 1995.
+  *
+  * This RAM disk is designed to have filesystems created on it and mounted
+- * just like a regular floppy disk.  
+- *  
++ * just like a regular floppy disk.
++ *
+  * It also does something suggested by Linus: use the buffer cache as the
+  * RAM disk data.  This makes it possible to dynamically allocate the RAM disk
+- * buffer - with some consequences I have to deal with as I write this. 
+- * 
++ * buffer - with some consequences I have to deal with as I write this.
++ *
+  * This code is based on the original ramdisk.c, written mostly by
+  * Theodore Ts'o (TYT) in 1991.  The code was largely rewritten by
+  * Chad Page to use the buffer cache to store the RAM disk data in
+@@ -33,7 +33,7 @@
+  *
+  *  Added initrd: Werner Almesberger & Hans Lermen, Feb '96
+  *
+- * 4/25/96 : Made RAM disk size a parameter (default is now 4 MB) 
++ * 4/25/96 : Made RAM disk size a parameter (default is now 4 MB)
+  *		- Chad Page
+  *
+  * Add support for fs images split across >1 disk, Paul Gortmaker, Mar '98
+@@ -60,7 +60,7 @@
+ #include <asm/uaccess.h>
+ 
+ /* The RAM disk size is now a parameter */
+-#define NUM_RAMDISKS 16		/* This cannot be overridden (yet) */ 
++#define NUM_RAMDISKS 16		/* This cannot be overridden (yet) */
+ 
+ /* Various static variables go here.  Most are used only in the RAM disk code.
+  */
+@@ -73,7 +73,7 @@ static struct request_queue *rd_queue[NU
+  * Parameters for the boot-loading of the RAM disk.  These are set by
+  * init/main.c (from arguments to the kernel command line) or from the
+  * architecture-specific setup routine (from the stored boot sector
+- * information). 
++ * information).
+  */
+ int rd_size = CONFIG_BLK_DEV_RAM_SIZE;		/* Size of the RAM disks */
+ /*
+@@ -94,7 +94,7 @@ int rd_blocksize = BLOCK_SIZE;			/* bloc
+  *               2000 Transmeta Corp.
+  * aops copied from ramfs.
+  */
+-static int ramdisk_readpage(struct file *file, struct page * page)
++static int ramdisk_readpage(struct file *file, struct page *page)
+ {
+ 	if (!PageUptodate(page)) {
+ 		void *kaddr = kmap_atomic(page, KM_USER0);
+@@ -108,7 +108,8 @@ static int ramdisk_readpage(struct file 
+ 	return 0;
+ }
+ 
+-static int ramdisk_prepare_write(struct file *file, struct page *page, unsigned offset, unsigned to)
++static int ramdisk_prepare_write(struct file *file, struct page *page,
++				unsigned offset, unsigned to)
+ {
+ 	if (!PageUptodate(page)) {
+ 		void *kaddr = kmap_atomic(page, KM_USER0);
+@@ -122,7 +123,8 @@ static int ramdisk_prepare_write(struct 
+ 	return 0;
+ }
+ 
+-static int ramdisk_commit_write(struct file *file, struct page *page, unsigned offset, unsigned to)
++static int ramdisk_commit_write(struct file *file, struct page *page,
++				unsigned offset, unsigned to)
+ {
+ 	return 0;
+ }
+@@ -212,7 +214,7 @@ static int rd_blkdev_pagecache_IO(int rw
+  * 19-JAN-1998  Richard Gooch <rgooch@atnf.csiro.au>  Added devfs support
+  *
+  */
+-static int rd_make_request(request_queue_t * q, struct bio *bio)
++static int rd_make_request(request_queue_t *q, struct bio *bio)
+ {
+ 	struct block_device *bdev = bio->bi_bdev;
+ 	struct address_space * mapping = bdev->bd_inode->i_mapping;
+@@ -242,17 +244,19 @@ fail:
+ 	return 0;
+ } 
+ 
+-static int rd_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
++static int rd_ioctl(struct block_device *bdev, struct file *file,
++			unsigned int cmd, unsigned long arg)
+ {
+ 	int error;
+-	struct block_device *bdev = inode->i_bdev;
+ 
+ 	if (cmd != BLKFLSBUF)
+ 		return -EINVAL;
+ 
+-	/* special: we want to release the ramdisk memory,
+-	   it's not like with the other blockdevices where
+-	   this ioctl only flushes away the buffer cache. */
++	/*
++	 * special: we want to release the ramdisk memory, it's not like with
++	 * the other blockdevices where this ioctl only flushes away the buffer
++	 * cache
++	 */
+ 	error = -EBUSY;
+ 	down(&bdev->bd_sem);
+ 	if (bdev->bd_openers <= 2) {
+@@ -268,16 +272,15 @@ static struct backing_dev_info rd_backin
+ 	.memory_backed	= 1,	/* Does not contribute to dirty memory */
+ };
+ 
+-static int rd_open(struct inode * inode, struct file * filp)
++static int rd_open(struct block_device *bdev, struct file *filp)
+ {
+-	unsigned unit = iminor(inode);
++	unsigned unit = MINOR(bdev->bd_dev);
+ 
+ 	/*
+ 	 * Immunize device against invalidate_buffers() and prune_icache().
+ 	 */
+ 	if (rd_bdev[unit] == NULL) {
+-		struct block_device *bdev = inode->i_bdev;
+-		inode = igrab(bdev->bd_inode);
++		struct inode *inode = igrab(bdev->bd_inode);
+ 		rd_bdev[unit] = bdev;
+ 		bdev->bd_openers++;
+ 		bdev->bd_block_size = rd_blocksize;
+@@ -295,12 +298,14 @@ static struct block_device_operations rd
+ 	.ioctl =	rd_ioctl,
+ };
+ 
+-/* Before freeing the module, invalidate all of the protected buffers! */
+-static void __exit rd_cleanup (void)
++/*
++ * Before freeing the module, invalidate all of the protected buffers!
++ */
++static void __exit rd_cleanup(void)
+ {
+ 	int i;
+ 
+-	for (i = 0 ; i < NUM_RAMDISKS; i++) {
++	for (i = 0; i < NUM_RAMDISKS; i++) {
+ 		struct block_device *bdev = rd_bdev[i];
+ 		rd_bdev[i] = NULL;
+ 		if (bdev) {
+@@ -311,17 +316,19 @@ static void __exit rd_cleanup (void)
+ 		put_disk(rd_disks[i]);
+ 	}
+ 	devfs_remove("rd");
+-	unregister_blkdev(RAMDISK_MAJOR, "ramdisk" );
++	unregister_blkdev(RAMDISK_MAJOR, "ramdisk");
+ }
+ 
+-/* This is the registration and initialization section of the RAM disk driver */
+-static int __init rd_init (void)
++/*
++ * This is the registration and initialization section of the RAM disk driver
++ */
++static int __init rd_init(void)
+ {
+ 	int i;
+ 	int err = -ENOMEM;
+ 
+ 	if (rd_blocksize > PAGE_SIZE || rd_blocksize < 512 ||
+-	    (rd_blocksize & (rd_blocksize-1))) {
++			(rd_blocksize & (rd_blocksize-1))) {
+ 		printk("RAMDISK: wrong blocksize %d, reverting to defaults\n",
+ 		       rd_blocksize);
+ 		rd_blocksize = BLOCK_SIZE;
+@@ -362,8 +369,8 @@ static int __init rd_init (void)
+ 
+ 	/* rd_size is given in kB */
+ 	printk("RAMDISK driver initialized: "
+-	       "%d RAM disks of %dK size %d blocksize\n",
+-	       NUM_RAMDISKS, rd_size, rd_blocksize);
++		"%d RAM disks of %dK size %d blocksize\n",
++		NUM_RAMDISKS, rd_size, rd_blocksize);
+ 
+ 	return 0;
+ out_queue:
+--- linux-2.6.0-test6/drivers/block/scsi_ioctl.c	2003-09-08 13:58:56.000000000 -0700
++++ 25/drivers/block/scsi_ioctl.c	2003-10-05 00:36:48.000000000 -0700
+@@ -25,6 +25,7 @@
+ #include <linux/cdrom.h>
+ #include <linux/slab.h>
+ #include <linux/bio.h>
++#include <linux/times.h>
+ #include <asm/uaccess.h>
+ 
+ #include <scsi/scsi.h>
+@@ -140,40 +141,36 @@ static int sg_emulated_host(request_queu
+ }
+ 
+ static int sg_io(request_queue_t *q, struct block_device *bdev,
+-		 struct sg_io_hdr *uptr)
++		 struct sg_io_hdr *hdr)
+ {
+ 	unsigned long start_time;
+ 	int reading, writing;
+-	struct sg_io_hdr hdr;
+ 	struct request *rq;
+ 	struct bio *bio;
+ 	char sense[SCSI_SENSE_BUFFERSIZE];
+ 	void *buffer;
+ 
+-	if (copy_from_user(&hdr, uptr, sizeof(*uptr)))
+-		return -EFAULT;
+-
+-	if (hdr.interface_id != 'S')
++	if (hdr->interface_id != 'S')
+ 		return -EINVAL;
+-	if (hdr.cmd_len > sizeof(rq->cmd))
++	if (hdr->cmd_len > sizeof(rq->cmd))
+ 		return -EINVAL;
+ 
+ 	/*
+ 	 * we'll do that later
+ 	 */
+-	if (hdr.iovec_count)
++	if (hdr->iovec_count)
+ 		return -EOPNOTSUPP;
+ 
+-	if (hdr.dxfer_len > (q->max_sectors << 9))
++	if (hdr->dxfer_len > (q->max_sectors << 9))
+ 		return -EIO;
+ 
+ 	reading = writing = 0;
+ 	buffer = NULL;
+ 	bio = NULL;
+-	if (hdr.dxfer_len) {
+-		unsigned int bytes = (hdr.dxfer_len + 511) & ~511;
++	if (hdr->dxfer_len) {
++		unsigned int bytes = (hdr->dxfer_len + 511) & ~511;
+ 
+-		switch (hdr.dxfer_direction) {
++		switch (hdr->dxfer_direction) {
+ 		default:
+ 			return -EINVAL;
+ 		case SG_DXFER_TO_FROM_DEV:
+@@ -191,8 +188,8 @@ static int sg_io(request_queue_t *q, str
+ 		 * first try to map it into a bio. reading from device will
+ 		 * be a write to vm.
+ 		 */
+-		bio = bio_map_user(bdev, (unsigned long) hdr.dxferp,
+-				   hdr.dxfer_len, reading);
++		bio = bio_map_user(bdev, (unsigned long) hdr->dxferp,
++				   hdr->dxfer_len, reading);
+ 
+ 		/*
+ 		 * if bio setup failed, fall back to slow approach
+@@ -203,11 +200,11 @@ static int sg_io(request_queue_t *q, str
+ 				return -ENOMEM;
+ 
+ 			if (writing) {
+-				if (copy_from_user(buffer, hdr.dxferp,
+-						   hdr.dxfer_len))
++				if (copy_from_user(buffer, hdr->dxferp,
++						   hdr->dxfer_len))
+ 					goto out_buffer;
+ 			} else
+-				memset(buffer, 0, hdr.dxfer_len);
++				memset(buffer, 0, hdr->dxfer_len);
+ 		}
+ 	}
+ 
+@@ -216,11 +213,10 @@ static int sg_io(request_queue_t *q, str
+ 	/*
+ 	 * fill in request structure
+ 	 */
+-	rq->cmd_len = hdr.cmd_len;
+-	if (copy_from_user(rq->cmd, hdr.cmdp, hdr.cmd_len))
+-		goto out_request;
+-	if (sizeof(rq->cmd) != hdr.cmd_len)
+-		memset(rq->cmd + hdr.cmd_len, 0, sizeof(rq->cmd) - hdr.cmd_len);
++	rq->cmd_len = hdr->cmd_len;
++	memcpy(rq->cmd, hdr->cmdp, hdr->cmd_len);
++	if (sizeof(rq->cmd) != hdr->cmd_len)
++		memset(rq->cmd + hdr->cmd_len, 0, sizeof(rq->cmd) - hdr->cmd_len);
+ 
+ 	memset(sense, 0, sizeof(sense));
+ 	rq->sense = sense;
+@@ -234,9 +230,9 @@ static int sg_io(request_queue_t *q, str
+ 		blk_rq_bio_prep(q, rq, bio);
+ 
+ 	rq->data = buffer;
+-	rq->data_len = hdr.dxfer_len;
++	rq->data_len = hdr->dxfer_len;
+ 
+-	rq->timeout = (hdr.timeout * HZ) / 1000;
++	rq->timeout = (hdr->timeout * HZ) / 1000;
+ 	if (!rq->timeout)
+ 		rq->timeout = q->sg_timeout;
+ 	if (!rq->timeout)
+@@ -254,33 +250,30 @@ static int sg_io(request_queue_t *q, str
+ 		bio_unmap_user(bio, reading);
+ 
+ 	/* write to all output members */
+-	hdr.status = rq->errors;	
+-	hdr.masked_status = (hdr.status >> 1) & 0x1f;
+-	hdr.msg_status = 0;
+-	hdr.host_status = 0;
+-	hdr.driver_status = 0;
+-	hdr.info = 0;
+-	if (hdr.masked_status || hdr.host_status || hdr.driver_status)
+-		hdr.info |= SG_INFO_CHECK;
+-	hdr.resid = rq->data_len;
+-	hdr.duration = ((jiffies - start_time) * 1000) / HZ;
+-	hdr.sb_len_wr = 0;
++	hdr->status = rq->errors;	
++	hdr->masked_status = (hdr->status >> 1) & 0x1f;
++	hdr->msg_status = 0;
++	hdr->host_status = 0;
++	hdr->driver_status = 0;
++	hdr->info = 0;
++	if (hdr->masked_status || hdr->host_status || hdr->driver_status)
++		hdr->info |= SG_INFO_CHECK;
++	hdr->resid = rq->data_len;
++	hdr->duration = ((jiffies - start_time) * 1000) / HZ;
++	hdr->sb_len_wr = 0;
+ 
+-	if (rq->sense_len && hdr.sbp) {
+-		int len = min((unsigned int) hdr.mx_sb_len, rq->sense_len);
++	if (rq->sense_len && hdr->sbp) {
++		int len = min((unsigned int) hdr->mx_sb_len, rq->sense_len);
+ 
+-		if (!copy_to_user(hdr.sbp, rq->sense, len))
+-			hdr.sb_len_wr = len;
++		if (!copy_to_user(hdr->sbp, rq->sense, len))
++			hdr->sb_len_wr = len;
+ 	}
+ 
+ 	blk_put_request(rq);
+ 
+-	if (copy_to_user(uptr, &hdr, sizeof(*uptr)))
+-		goto out_buffer;
+-
+ 	if (buffer) {
+ 		if (reading)
+-			if (copy_to_user(hdr.dxferp, buffer, hdr.dxfer_len))
++			if (copy_to_user(hdr->dxferp, buffer, hdr->dxfer_len))
+ 				goto out_buffer;
+ 
+ 		kfree(buffer);
+@@ -289,8 +282,6 @@ static int sg_io(request_queue_t *q, str
+ 	/* may not have succeeded, but output values written to control
+ 	 * structure (struct sg_io_hdr).  */
+ 	return 0;
+-out_request:
+-	blk_put_request(rq);
+ out_buffer:
+ 	kfree(buffer);
+ 	return -EFAULT;
+@@ -319,7 +310,7 @@ static int sg_scsi_ioctl(request_queue_t
+ 		return -EFAULT;
+ 	if (in_len > PAGE_SIZE || out_len > PAGE_SIZE)
+ 		return -EINVAL;
+-	if (get_user(opcode, sic->data))
++	if (get_user(opcode, (int *)sic->data))
+ 		return -EFAULT;
+ 
+ 	bytes = max(in_len, out_len);
+@@ -437,9 +428,71 @@ int scsi_cmd_ioctl(struct block_device *
+ 		case SG_EMULATED_HOST:
+ 			err = sg_emulated_host(q, (int *) arg);
+ 			break;
+-		case SG_IO:
+-			err = sg_io(q, bdev, (struct sg_io_hdr *) arg);
++		case SG_IO: {
++			struct sg_io_hdr hdr;
++
++			if (copy_from_user(&hdr, (struct sg_io_hdr *) arg, sizeof(hdr))) {
++				err = -EFAULT;
++				break;
++			}
++			err = sg_io(q, bdev, &hdr);
++			if (copy_to_user((struct sg_io_hdr *) arg, &hdr, sizeof(hdr)))
++				err = -EFAULT;
+ 			break;
++		}
++		case CDROM_SEND_PACKET: {
++			struct cdrom_generic_command cgc;
++			struct sg_io_hdr hdr;
++
++			if (copy_from_user(&cgc, (struct cdrom_generic_command *) arg, sizeof(cgc))) {
++				err = -EFAULT;
++				break;
++			}
++			cgc.timeout = clock_t_to_jiffies(cgc.timeout);
++			memset(&hdr, 0, sizeof(hdr));
++			hdr.interface_id = 'S';
++			hdr.cmd_len = sizeof(cgc.cmd);
++			hdr.dxfer_len = cgc.buflen;
++			err = 0;
++			switch (cgc.data_direction) {
++				case CGC_DATA_UNKNOWN:
++					hdr.dxfer_direction = SG_DXFER_UNKNOWN;
++					break;
++				case CGC_DATA_WRITE:
++					hdr.dxfer_direction = SG_DXFER_TO_DEV;
++					break;
++				case CGC_DATA_READ:
++					hdr.dxfer_direction = SG_DXFER_FROM_DEV;
++					break;
++				case CGC_DATA_NONE:
++					hdr.dxfer_direction = SG_DXFER_NONE;
++					break;
++				default:
++					err = -EINVAL;
++			}
++			if (err)
++				break;
++
++			hdr.dxferp = cgc.buffer;
++			hdr.sbp = (char *) cgc.sense;
++			if (hdr.sbp)
++				hdr.mx_sb_len = sizeof(struct request_sense);
++			hdr.timeout = cgc.timeout;
++			hdr.cmdp = cgc.cmd;
++			hdr.cmd_len = sizeof(cgc.cmd);
++			err = sg_io(q, bdev, &hdr);
++
++			if (hdr.status)
++				err = -EIO;
++
++			cgc.stat = err;
++			cgc.buflen = hdr.resid;
++			if (copy_to_user((struct cdrom_generic_command *) arg, &cgc, sizeof(cgc)))
++				err = -EFAULT;
++
++			break;
++		}
++
+ 		/*
+ 		 * old junk scsi send command ioctl
+ 		 */
+--- linux-2.6.0-test6/drivers/block/swim3.c	2003-08-08 22:55:11.000000000 -0700
++++ 25/drivers/block/swim3.c	2003-10-05 00:34:01.000000000 -0700
+@@ -239,10 +239,9 @@ static int grab_drive(struct floppy_stat
+ 		      int interruptible);
+ static void release_drive(struct floppy_state *fs);
+ static int fd_eject(struct floppy_state *fs);
+-static int floppy_ioctl(struct inode *inode, struct file *filp,
++static int floppy_ioctl(struct block_device *bdev, struct file *filp,
+ 			unsigned int cmd, unsigned long param);
+-static int floppy_open(struct inode *inode, struct file *filp);
+-static int floppy_release(struct inode *inode, struct file *filp);
++static int floppy_open(struct block_device *bdev, struct file *filp);
+ static int floppy_check_change(struct gendisk *disk);
+ static int floppy_revalidate(struct gendisk *disk);
+ static int swim3_add_device(struct device_node *swims);
+@@ -811,10 +810,10 @@ static int fd_eject(struct floppy_state 
+ static struct floppy_struct floppy_type =
+ 	{ 2880,18,2,80,0,0x1B,0x00,0xCF,0x6C,NULL };	/*  7 1.44MB 3.5"   */
+ 
+-static int floppy_ioctl(struct inode *inode, struct file *filp,
++static int floppy_ioctl(struct block_device *bdev, struct file *filp,
+ 			unsigned int cmd, unsigned long param)
+ {
+-	struct floppy_state *fs = inode->i_bdev->bd_disk->private_data;
++	struct floppy_state *fs = bdev->bd_disk->private_data;
+ 	int err;
+ 		
+ 	if ((cmd & 0x80) && !capable(CAP_SYS_ADMIN))
+@@ -838,9 +837,9 @@ static int floppy_ioctl(struct inode *in
+ 	return -ENOTTY;
+ }
+ 
+-static int floppy_open(struct inode *inode, struct file *filp)
++static int floppy_open(struct block_device *bdev, struct file *filp)
+ {
+-	struct floppy_state *fs = inode->i_bdev->bd_disk->private_data;
++	struct floppy_state *fs = bdev->bd_disk->private_data;
+ 	volatile struct swim3 *sw = fs->swim3;
+ 	int n, err = 0;
+ 
+@@ -876,7 +875,7 @@ static int floppy_open(struct inode *ino
+ 
+ 	if (err == 0 && (filp->f_flags & O_NDELAY) == 0
+ 	    && (filp->f_mode & 3)) {
+-		check_disk_change(inode->i_bdev);
++		check_disk_change(bdev);
+ 		if (fs->ejected)
+ 			err = -ENXIO;
+ 	}
+@@ -904,9 +903,9 @@ static int floppy_open(struct inode *ino
+ 	return 0;
+ }
+ 
+-static int floppy_release(struct inode *inode, struct file *filp)
++static int floppy_release(struct gendisk *disk)
+ {
+-	struct floppy_state *fs = inode->i_bdev->bd_disk->private_data;
++	struct floppy_state *fs = disk->private_data;
+ 	volatile struct swim3 *sw = fs->swim3;
+ 	if (fs->ref_count > 0 && --fs->ref_count == 0) {
+ 		swim3_action(fs, MOTOR_OFF);
+--- linux-2.6.0-test6/drivers/block/swim_iop.c	2003-08-08 22:55:11.000000000 -0700
++++ 25/drivers/block/swim_iop.c	2003-10-05 00:34:01.000000000 -0700
+@@ -31,6 +31,7 @@
+ #include <linux/delay.h>
+ #include <linux/fd.h>
+ #include <linux/ioctl.h>
++#include <linux/blkdev.h>
+ #include <asm/io.h>
+ #include <asm/uaccess.h>
+ #include <asm/mac_iop.h>
+@@ -97,10 +98,10 @@ static void swimiop_receive(struct iop_m
+ static void swimiop_status_update(int, struct swim_drvstatus *);
+ static int swimiop_eject(struct floppy_state *fs);
+ 
+-static int floppy_ioctl(struct inode *inode, struct file *filp,
++static int floppy_ioctl(struct block_device *bdev, struct file *filp,
+ 			unsigned int cmd, unsigned long param);
+-static int floppy_open(struct inode *inode, struct file *filp);
+-static int floppy_release(struct inode *inode, struct file *filp);
++static int floppy_open(struct block_device *bdev, struct file *filp);
++static int floppy_release(struct gendisk *disk);
+ static int floppy_check_change(struct gendisk *disk);
+ static int floppy_revalidate(struct gendisk *disk);
+ static int grab_drive(struct floppy_state *fs, enum swim_state state,
+@@ -347,10 +348,10 @@ static int swimiop_eject(struct floppy_s
+ static struct floppy_struct floppy_type =
+ 	{ 2880,18,2,80,0,0x1B,0x00,0xCF,0x6C,NULL };	/*  7 1.44MB 3.5"   */
+ 
+-static int floppy_ioctl(struct inode *inode, struct file *filp,
++static int floppy_ioctl(struct block_device *bdev, struct file *filp,
+ 			unsigned int cmd, unsigned long param)
+ {
+-	struct floppy_state *fs = inode->i_bdev->bd_disk->private_data;
++	struct floppy_state *fs = bdev->bd_disk->private_data;
+ 	int err;
+ 
+ 	if ((cmd & 0x80) && !capable(CAP_SYS_ADMIN))
+@@ -371,15 +372,15 @@ static int floppy_ioctl(struct inode *in
+ 	return -ENOTTY;
+ }
+ 
+-static int floppy_open(struct inode *inode, struct file *filp)
++static int floppy_open(struct block_device *bdev, struct file *filp)
+ {
+-	struct floppy_state *fs = inode->i_bdev->bd_disk->private_data;
++	struct floppy_state *fs = bdev->bd_disk->private_data;
+ 
+ 	if (fs->ref_count == -1 || filp->f_flags & O_EXCL)
+ 		return -EBUSY;
+ 
+ 	if ((filp->f_flags & O_NDELAY) == 0 && (filp->f_mode & 3)) {
+-		check_disk_change(inode->i_bdev);
++		check_disk_change(bdev);
+ 		if (fs->ejected)
+ 			return -ENXIO;
+ 	}
+@@ -395,9 +396,9 @@ static int floppy_open(struct inode *ino
+ 	return 0;
+ }
+ 
+-static int floppy_release(struct inode *inode, struct file *filp)
++static int floppy_release(struct gendisk *disk)
+ {
+-	struct floppy_state *fs = inode->i_bdev->bd_disk->private_data;
++	struct floppy_state *fs = disk->private_data;
+ 	if (fs->ref_count > 0)
+ 		fs->ref_count--;
+ 	return 0;
+--- linux-2.6.0-test6/drivers/block/umem.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/block/umem.c	2003-10-05 00:33:58.000000000 -0700
+@@ -153,7 +153,6 @@ struct cardinfo {
+ };
+ 
+ static struct cardinfo cards[MM_MAXCARDS];
+-static struct block_device_operations mm_fops;
+ static struct timer_list battery_timer;
+ 
+ static int num_cards = 0;
+@@ -818,10 +817,10 @@ static int mm_revalidate(struct gendisk 
+ --                            mm_ioctl
+ -----------------------------------------------------------------------------------
+ */
+-static int mm_ioctl(struct inode *i, struct file *f, unsigned int cmd, unsigned long arg)
++static int mm_ioctl(struct block_device *bdev, struct file *f, unsigned int cmd, unsigned long arg)
+ {
+ 	if (cmd == HDIO_GETGEO) {
+-		struct cardinfo *card = i->i_bdev->bd_disk->private_data;
++		struct cardinfo *card = bdev->bd_disk->private_data;
+ 		int size = card->mm_size * (1024 / MM_HARDSECT);
+ 		struct hd_geometry geo;
+ 		/*
+@@ -831,7 +830,7 @@ static int mm_ioctl(struct inode *i, str
+ 		 */
+ 		geo.heads     = 64;
+ 		geo.sectors   = 32;
+-		geo.start     = get_start_sect(i->i_bdev);
++		geo.start     = get_start_sect(bdev);
+ 		geo.cylinders = size / (geo.heads * geo.sectors);
+ 
+ 		if (copy_to_user((void *) arg, &geo, sizeof(geo)))
+--- linux-2.6.0-test6/drivers/block/xd.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/block/xd.c	2003-10-05 00:33:54.000000000 -0700
+@@ -322,9 +322,9 @@ static void do_xd_request (request_queue
+ }
+ 
+ /* xd_ioctl: handle device ioctl's */
+-static int xd_ioctl (struct inode *inode,struct file *file,u_int cmd,u_long arg)
++static int xd_ioctl (struct block_device *bdev,struct file *file,u_int cmd,u_long arg)
+ {
+-	XD_INFO *p = inode->i_bdev->bd_disk->private_data;
++	XD_INFO *p = bdev->bd_disk->private_data;
+ 
+ 	switch (cmd) {
+ 		case HDIO_GETGEO:
+@@ -334,7 +334,7 @@ static int xd_ioctl (struct inode *inode
+ 			g.heads = p->heads;
+ 			g.sectors = p->sectors;
+ 			g.cylinders = p->cylinders;
+-			g.start = get_start_sect(inode->i_bdev);
++			g.start = get_start_sect(bdev);
+ 			return copy_to_user(geometry, &g, sizeof g) ? -EFAULT : 0;
+ 		}
+ 		case HDIO_SET_DMA:
+--- linux-2.6.0-test6/drivers/block/xd.h	2003-06-14 12:18:30.000000000 -0700
++++ 25/drivers/block/xd.h	2003-10-05 00:33:54.000000000 -0700
+@@ -105,7 +105,7 @@ static u_char xd_detect (u_char *control
+ static u_char xd_initdrives (void (*init_drive)(u_char drive));
+ 
+ static void do_xd_request (request_queue_t * q);
+-static int xd_ioctl (struct inode *inode,struct file *file,unsigned int cmd,unsigned long arg);
++static int xd_ioctl (struct block_device *bdev,struct file *file,unsigned int cmd,unsigned long arg);
+ static int xd_readwrite (u_char operation,XD_INFO *disk,char *buffer,u_int block,u_int count);
+ static void xd_recalibrate (u_char drive);
+ 
+--- linux-2.6.0-test6/drivers/block/z2ram.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/block/z2ram.c	2003-10-05 00:34:01.000000000 -0700
+@@ -67,7 +67,6 @@ static int current_device   = -1;
+ 
+ static spinlock_t z2ram_lock = SPIN_LOCK_UNLOCKED;
+ 
+-static struct block_device_operations z2_fops;
+ static struct gendisk *z2ram_gendisk;
+ 
+ static void do_z2_request(request_queue_t *q)
+@@ -141,7 +140,7 @@ get_chipram( void )
+ }
+ 
+ static int
+-z2_open( struct inode *inode, struct file *filp )
++z2_open( struct block_device *bdev, struct file *filp )
+ {
+     int device;
+     int max_z2_map = ( Z2RAM_SIZE / Z2RAM_CHUNKSIZE ) *
+@@ -150,7 +149,7 @@ z2_open( struct inode *inode, struct fil
+ 	sizeof( z2ram_map[0] );
+     int rc = -ENOMEM;
+ 
+-    device = iminor(inode);
++    device = MINOR(bdev->bd_dev);
+ 
+     if ( current_device != -1 && current_device != device )
+     {
+@@ -301,8 +300,7 @@ err_out:
+     return rc;
+ }
+ 
+-static int
+-z2_release( struct inode *inode, struct file *filp )
++static int z2_release(struct gendisk *disk)
+ {
+     if ( current_device == -1 )
+ 	return 0;     
+--- linux-2.6.0-test6/drivers/cdrom/aztcd.c	2003-09-08 13:58:56.000000000 -0700
++++ 25/drivers/cdrom/aztcd.c	2003-10-05 00:34:01.000000000 -0700
+@@ -330,10 +330,10 @@ static int aztGetToc(int multi);
+ 
+ /* Kernel Interface Functions */
+ static int check_aztcd_media_change(struct gendisk *disk);
+-static int aztcd_ioctl(struct inode *ip, struct file *fp, unsigned int cmd,
++static int aztcd_ioctl(struct block_device *bdev, struct file *fp, unsigned int cmd,
+ 		       unsigned long arg);
+-static int aztcd_open(struct inode *ip, struct file *fp);
+-static int aztcd_release(struct inode *inode, struct file *file);
++static int aztcd_open(struct block_device *bdev, struct file *fp);
++static int aztcd_release(struct gendisk *disk);
+ 
+ static struct block_device_operations azt_fops = {
+ 	.owner		= THIS_MODULE,
+@@ -1153,7 +1153,7 @@ static int check_aztcd_media_change(stru
+ /*
+  * Kernel IO-controls
+ */
+-static int aztcd_ioctl(struct inode *ip, struct file *fp, unsigned int cmd,
++static int aztcd_ioctl(struct block_device *bdev, struct file *fp, unsigned int cmd,
+ 		       unsigned long arg)
+ {
+ 	int i;
+@@ -1171,8 +1171,6 @@ static int aztcd_ioctl(struct inode *ip,
+ 	       cmd, jiffies);
+ 	printk("aztcd Status %x\n", getAztStatus());
+ #endif
+-	if (!ip)
+-		RETURNM("aztcd_ioctl 1", -EINVAL);
+ 	if (getAztStatus() < 0)
+ 		RETURNM("aztcd_ioctl 2", -EIO);
+ 	if ((!aztTocUpToDate) || (aztDiskChanged)) {
+@@ -1624,7 +1622,7 @@ static void azt_invalidate_buffers(void)
+ /*
+  * Open the device special file.  Check that a disk is in.
+  */
+-static int aztcd_open(struct inode *ip, struct file *fp)
++static int aztcd_open(struct block_device *bdev, struct file *fp)
+ {
+ 	int st;
+ 
+@@ -1673,12 +1671,11 @@ static int aztcd_open(struct inode *ip, 
+ /*
+  * On close, we flush all azt blocks from the buffer cache.
+  */
+-static int aztcd_release(struct inode *inode, struct file *file)
++static int aztcd_release(struct gendisk *disk)
+ {
+ #ifdef AZT_DEBUG
+ 	printk("aztcd: executing aztcd_release\n");
+-	printk("inode: %p, device: %s    file: %p\n", inode,
+-	       inode->i_bdev->bd_disk->disk_name, file);
++	printk("disk: %p, device: %s\n", disk, disk->disk_name);
+ #endif
+ 	if (!--azt_open_count) {
+ 		azt_invalidate_buffers();
+--- linux-2.6.0-test6/drivers/cdrom/cdrom.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/cdrom/cdrom.c	2003-10-05 00:33:59.000000000 -0700
+@@ -367,6 +367,7 @@ int register_cdrom(struct cdrom_device_i
+ 	ENSURE(generic_packet, CDC_GENERIC_PACKET);
+ 	cdi->mc_flags = 0;
+ 	cdo->n_minors = 0;
++	cdi->for_data = 0;
+         cdi->options = CDO_USE_FFLAGS;
+ 	
+ 	if (autoclose==1 && CDROM_CAN(CDC_CLOSE_TRAY))
+@@ -416,7 +417,7 @@ int unregister_cdrom(struct cdrom_device
+  * is in their own interest: device control becomes a lot easier
+  * this way.
+  */
+-int cdrom_open(struct cdrom_device_info *cdi, struct inode *ip, struct file *fp)
++int cdrom_open(struct cdrom_device_info *cdi, struct block_device *bdev, struct file *fp)
+ {
+ 	int ret;
+ 
+@@ -437,7 +438,7 @@ int cdrom_open(struct cdrom_device_info 
+ 	cdinfo(CD_OPEN, "Use count for \"/dev/%s\" now %d\n", cdi->name, cdi->use_count);
+ 	/* Do this on open.  Don't wait for mount, because they might
+ 	    not be mounting, but opening with O_NONBLOCK */
+-	check_disk_change(ip->i_bdev);
++	check_disk_change(bdev);
+ 	return ret;
+ }
+ 
+@@ -530,6 +531,7 @@ int open_for_data(struct cdrom_device_in
+ 			cdinfo(CD_OPEN, "door locked.\n");
+ 	}
+ 	cdinfo(CD_OPEN, "device opened successfully.\n"); 
++	cdi->for_data = 1;
+ 	return ret;
+ 
+ 	/* Something failed.  Try to unlock the drive, because some drivers
+@@ -605,30 +607,29 @@ int check_for_audio_disc(struct cdrom_de
+ 
+ 
+ /* Admittedly, the logic below could be performed in a nicer way. */
+-int cdrom_release(struct cdrom_device_info *cdi, struct file *fp)
++int cdrom_release(struct cdrom_device_info *cdi)
+ {
+ 	struct cdrom_device_ops *cdo = cdi->ops;
+-	int opened_for_data;
+ 
+ 	cdinfo(CD_CLOSE, "entering cdrom_release\n"); 
+ 
+ 	if (cdi->use_count > 0)
+ 		cdi->use_count--;
+-	if (cdi->use_count == 0)
+-		cdinfo(CD_CLOSE, "Use count for \"/dev/%s\" now zero\n", cdi->name);
+-	if (cdi->use_count == 0 &&
+-	    cdo->capability & CDC_LOCK && !keeplocked) {
++	if (cdi->use_count) {
++		cdo->release(cdi);
++		return 0;
++	}
++		
++	cdinfo(CD_CLOSE, "Use count for \"/dev/%s\" now zero\n", cdi->name);
++	if (cdo->capability & CDC_LOCK && !keeplocked) {
+ 		cdinfo(CD_CLOSE, "Unlocking door!\n");
+ 		cdo->lock_door(cdi, 0);
+ 	}
+-	opened_for_data = !(cdi->options & CDO_USE_FFLAGS) ||
+-		!(fp && fp->f_flags & O_NONBLOCK);
+ 	cdo->release(cdi);
+-	if (cdi->use_count == 0) {      /* last process that closes dev*/
+-		if (opened_for_data &&
+-		    cdi->options & CDO_AUTO_EJECT && CDROM_CAN(CDC_OPEN_TRAY))
+-			cdo->tray_move(cdi, 1);
+-	}
++	if (cdi->for_data &&
++	    cdi->options & CDO_AUTO_EJECT && CDROM_CAN(CDC_OPEN_TRAY))
++		cdo->tray_move(cdi, 1);
++	cdi->for_data = 0;
+ 	return 0;
+ }
+ 
+@@ -1433,14 +1434,14 @@ static int cdrom_read_block(struct cdrom
+  * these days. ATAPI / SCSI specific code now mainly resides in
+  * mmc_ioct().
+  */
+-int cdrom_ioctl(struct cdrom_device_info *cdi, struct inode *ip,
++int cdrom_ioctl(struct cdrom_device_info *cdi, struct block_device *bdev,
+ 		unsigned int cmd, unsigned long arg)
+ {
+ 	struct cdrom_device_ops *cdo = cdi->ops;
+ 	int ret;
+ 
+ 	/* Try the generic SCSI command ioctl's first.. */
+-	ret = scsi_cmd_ioctl(ip->i_bdev, cmd, arg);
++	ret = scsi_cmd_ioctl(bdev, cmd, arg);
+ 	if (ret != -ENOTTY)
+ 		return ret;
+ 
+@@ -1593,7 +1594,7 @@ int cdrom_ioctl(struct cdrom_device_info
+ 		cdinfo(CD_DO_IOCTL, "entering CDROM_RESET\n");
+ 		if (!CDROM_CAN(CDC_RESET))
+ 			return -ENOSYS;
+-		invalidate_bdev(ip->i_bdev, 0);
++		invalidate_bdev(bdev, 0);
+ 		return cdo->reset(cdi);
+ 		}
+ 
+@@ -1856,57 +1857,6 @@ static int cdrom_switch_blocksize(struct
+ 	return cdo->generic_packet(cdi, &cgc);
+ }
+ 
+-static int cdrom_do_cmd(struct cdrom_device_info *cdi,
+-			struct cdrom_generic_command *cgc)
+-{
+-	struct request_sense *usense, sense;
+-	unsigned char *ubuf;
+-	int ret;
+-
+-	if (cgc->data_direction == CGC_DATA_UNKNOWN)
+-		return -EINVAL;
+-
+-	if (cgc->buflen < 0 || cgc->buflen >= 131072)
+-		return -EINVAL;
+-
+-	usense = cgc->sense;
+-	cgc->sense = &sense;
+-	if (usense && !access_ok(VERIFY_WRITE, usense, sizeof(*usense))) {
+-		return -EFAULT;
+-	}
+-
+-	ubuf = cgc->buffer;
+-	if (cgc->data_direction == CGC_DATA_READ ||
+-	    cgc->data_direction == CGC_DATA_WRITE) {
+-		cgc->buffer = kmalloc(cgc->buflen, GFP_KERNEL);
+-		if (cgc->buffer == NULL)
+-			return -ENOMEM;
+-	}
+-
+-
+-	if (cgc->data_direction == CGC_DATA_READ) {
+-		if (!access_ok(VERIFY_READ, ubuf, cgc->buflen)) {
+-			kfree(cgc->buffer);
+-			return -EFAULT;
+-		}
+-	} else if (cgc->data_direction == CGC_DATA_WRITE) {
+-		if (copy_from_user(cgc->buffer, ubuf, cgc->buflen)) {
+-			kfree(cgc->buffer);
+-			return -EFAULT;
+-		}
+-	}
+-
+-	ret = cdi->ops->generic_packet(cdi, cgc);
+-	__copy_to_user(usense, cgc->sense, sizeof(*usense));
+-	if (!ret && cgc->data_direction == CGC_DATA_READ)
+-		__copy_to_user(ubuf, cgc->buffer, cgc->buflen);
+-	if (cgc->data_direction == CGC_DATA_READ ||
+-	    cgc->data_direction == CGC_DATA_WRITE) {
+-		kfree(cgc->buffer);
+-	}
+-	return ret;
+-}
+-
+ static int mmc_ioctl(struct cdrom_device_info *cdi, unsigned int cmd,
+ 		     unsigned long arg)
+ {		
+@@ -2176,14 +2126,6 @@ static int mmc_ioctl(struct cdrom_device
+ 		return 0;
+ 		}
+ 
+-	case CDROM_SEND_PACKET: {
+-		if (!CDROM_CAN(CDC_GENERIC_PACKET))
+-			return -ENOSYS;
+-		cdinfo(CD_DO_IOCTL, "entering CDROM_SEND_PACKET\n"); 
+-		IOCTL_IN(arg, struct cdrom_generic_command, cgc);
+-		cgc.timeout = clock_t_to_jiffies(cgc.timeout);
+-		return cdrom_do_cmd(cdi, &cgc);
+-		}
+ 	case CDROM_NEXT_WRITABLE: {
+ 		long next = 0;
+ 		cdinfo(CD_DO_IOCTL, "entering CDROM_NEXT_WRITABLE\n"); 
+--- linux-2.6.0-test6/drivers/cdrom/cdu31a.c	2003-09-08 13:58:56.000000000 -0700
++++ 25/drivers/cdrom/cdu31a.c	2003-10-05 00:34:01.000000000 -0700
+@@ -3167,20 +3167,20 @@ static struct cdrom_device_info scd_info
+ 	.name		= "cdu31a"
+ };
+ 
+-static int scd_block_open(struct inode *inode, struct file *file)
++static int scd_block_open(struct block_device *bdev, struct file *file)
+ {
+-	return cdrom_open(&scd_info, inode, file);
++	return cdrom_open(&scd_info, bdev, file);
+ }
+ 
+-static int scd_block_release(struct inode *inode, struct file *file)
++static int scd_block_release(struct gendisk *disk)
+ {
+-	return cdrom_release(&scd_info, file);
++	return cdrom_release(&scd_info);
+ }
+ 
+-static int scd_block_ioctl(struct inode *inode, struct file *file,
++static int scd_block_ioctl(struct block_device *bdev, struct file *file,
+ 				unsigned cmd, unsigned long arg)
+ {
+-	return cdrom_ioctl(&scd_info, inode, cmd, arg);
++	return cdrom_ioctl(&scd_info, bdev, cmd, arg);
+ }
+ 
+ static int scd_block_media_changed(struct gendisk *disk)
+--- linux-2.6.0-test6/drivers/cdrom/cm206.c	2003-09-08 13:58:56.000000000 -0700
++++ 25/drivers/cdrom/cm206.c	2003-10-05 00:34:01.000000000 -0700
+@@ -1350,20 +1350,20 @@ static struct cdrom_device_info cm206_in
+ 	.name		= "cm206",
+ };
+ 
+-static int cm206_block_open(struct inode *inode, struct file *file)
++static int cm206_block_open(struct block_device *bdev, struct file *file)
+ {
+-	return cdrom_open(&cm206_info, inode, file);
++	return cdrom_open(&cm206_info, bdev, file);
+ }
+ 
+-static int cm206_block_release(struct inode *inode, struct file *file)
++static int cm206_block_release(struct gendisk *disk)
+ {
+-	return cdrom_release(&cm206_info, file);
++	return cdrom_release(&cm206_info);
+ }
+ 
+-static int cm206_block_ioctl(struct inode *inode, struct file *file,
++static int cm206_block_ioctl(struct block_device *bdev, struct file *file,
+ 				unsigned cmd, unsigned long arg)
+ {
+-	return cdrom_ioctl(&cm206_info, inode, cmd, arg);
++	return cdrom_ioctl(&cm206_info, bdev, cmd, arg);
+ }
+ 
+ static int cm206_block_media_changed(struct gendisk *disk)
+--- linux-2.6.0-test6/drivers/cdrom/gscd.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/cdrom/gscd.c	2003-10-05 00:34:01.000000000 -0700
+@@ -91,10 +91,10 @@ static void gscd_bin2bcd(unsigned char *
+ /* Schnittstellen zum Kern/FS */
+ 
+ static void __do_gscd_request(unsigned long dummy);
+-static int gscd_ioctl(struct inode *, struct file *, unsigned int,
++static int gscd_ioctl(struct block_device *, struct file *, unsigned int,
+ 		      unsigned long);
+-static int gscd_open(struct inode *, struct file *);
+-static int gscd_release(struct inode *, struct file *);
++static int gscd_open(struct block_device *, struct file *);
++static int gscd_release(struct gendisk *disk);
+ static int check_gscd_med_chg(struct gendisk *disk);
+ 
+ /*      GoldStar Funktionen    */
+@@ -190,8 +190,8 @@ __setup("gscd=", gscd_setup);
+ 
+ #endif
+ 
+-static int gscd_ioctl(struct inode *ip, struct file *fp, unsigned int cmd,
+-		      unsigned long arg)
++static int gscd_ioctl(struct block_device *bdev, struct file *fp,
++			unsigned int cmd, unsigned long arg)
+ {
+ 	unsigned char to_do[10];
+ 	unsigned char dummy;
+@@ -338,7 +338,7 @@ static void gscd_read_cmd(struct request
+  * Open the device special file.  Check that a disk is in.
+  */
+ 
+-static int gscd_open(struct inode *ip, struct file *fp)
++static int gscd_open(struct block_device *bdev, struct file *fp)
+ {
+ 	int st;
+ 
+@@ -368,7 +368,7 @@ static int gscd_open(struct inode *ip, s
+  * On close, we flush all gscd blocks from the buffer cache.
+  */
+ 
+-static int gscd_release(struct inode *inode, struct file *file)
++static int gscd_release(struct gendisk *disk)
+ {
+ 
+ #ifdef GSCD_DEBUG
+--- linux-2.6.0-test6/drivers/cdrom/mcd.c	2003-09-08 13:58:56.000000000 -0700
++++ 25/drivers/cdrom/mcd.c	2003-10-05 00:34:01.000000000 -0700
+@@ -214,20 +214,20 @@ static struct cdrom_device_info mcd_info
+ 	.name		= "mcd",
+ };
+ 
+-static int mcd_block_open(struct inode *inode, struct file *file)
++static int mcd_block_open(struct block_device *bdev, struct file *file)
+ {
+-	return cdrom_open(&mcd_info, inode, file);
++	return cdrom_open(&mcd_info, bdev, file);
+ }
+ 
+-static int mcd_block_release(struct inode *inode, struct file *file)
++static int mcd_block_release(struct gendisk *disk)
+ {
+-	return cdrom_release(&mcd_info, file);
++	return cdrom_release(&mcd_info);
+ }
+ 
+-static int mcd_block_ioctl(struct inode *inode, struct file *file,
++static int mcd_block_ioctl(struct block_device *bdev, struct file *file,
+ 				unsigned cmd, unsigned long arg)
+ {
+-	return cdrom_ioctl(&mcd_info, inode, cmd, arg);
++	return cdrom_ioctl(&mcd_info, bdev, cmd, arg);
+ }
+ 
+ static int mcd_block_media_changed(struct gendisk *disk)
+--- linux-2.6.0-test6/drivers/cdrom/mcdx.c	2003-09-08 13:58:56.000000000 -0700
++++ 25/drivers/cdrom/mcdx.c	2003-10-05 00:34:01.000000000 -0700
+@@ -221,23 +221,23 @@ struct s_drive_stuff {
+ int mcdx_init(void);
+ void do_mcdx_request(request_queue_t * q);
+ 
+-static int mcdx_block_open(struct inode *inode, struct file *file)
++static int mcdx_block_open(struct block_device *bdev, struct file *file)
+ {
+-	struct s_drive_stuff *p = inode->i_bdev->bd_disk->private_data;
+-	return cdrom_open(&p->info, inode, file);
++	struct s_drive_stuff *p = bdev->bd_disk->private_data;
++	return cdrom_open(&p->info, bdev, file);
+ }
+ 
+-static int mcdx_block_release(struct inode *inode, struct file *file)
++static int mcdx_block_release(struct gendisk *disk)
+ {
+-	struct s_drive_stuff *p = inode->i_bdev->bd_disk->private_data;
+-	return cdrom_release(&p->info, file);
++	struct s_drive_stuff *p = disk->private_data;
++	return cdrom_release(&p->info);
+ }
+ 
+-static int mcdx_block_ioctl(struct inode *inode, struct file *file,
++static int mcdx_block_ioctl(struct block_device *bdev, struct file *file,
+ 				unsigned cmd, unsigned long arg)
+ {
+-	struct s_drive_stuff *p = inode->i_bdev->bd_disk->private_data;
+-	return cdrom_ioctl(&p->info, inode, cmd, arg);
++	struct s_drive_stuff *p = bdev->bd_disk->private_data;
++	return cdrom_ioctl(&p->info, bdev, cmd, arg);
+ }
+ 
+ static int mcdx_block_media_changed(struct gendisk *disk)
+--- linux-2.6.0-test6/drivers/cdrom/optcd.c	2003-09-08 13:58:56.000000000 -0700
++++ 25/drivers/cdrom/optcd.c	2003-10-05 00:34:01.000000000 -0700
+@@ -1713,16 +1713,13 @@ static int cdromreset(void)
+ /* VFS calls */
+ 
+ 
+-static int opt_ioctl(struct inode *ip, struct file *fp,
++static int opt_ioctl(struct block_device *bdev, struct file *fp,
+                      unsigned int cmd, unsigned long arg)
+ {
+ 	int status, err, retval = 0;
+ 
+ 	DEBUG((DEBUG_VFS, "starting opt_ioctl"));
+ 
+-	if (!ip)
+-		return -EINVAL;
+-
+ 	if (cmd == CDROMRESET)
+ 		return cdromreset();
+ 
+@@ -1844,7 +1841,7 @@ static int opt_ioctl(struct inode *ip, s
+ static int open_count = 0;
+ 
+ /* Open device special file; check that a disk is in. */
+-static int opt_open(struct inode *ip, struct file *fp)
++static int opt_open(struct block_device *bdev, struct file *fp)
+ {
+ 	DEBUG((DEBUG_VFS, "starting opt_open"));
+ 
+@@ -1904,13 +1901,12 @@ err_out:
+ 
+ 
+ /* Release device special file; flush all blocks from the buffer cache */
+-static int opt_release(struct inode *ip, struct file *fp)
++static int opt_release(struct gendisk *disk)
+ {
+ 	int status;
+ 
+ 	DEBUG((DEBUG_VFS, "executing opt_release"));
+-	DEBUG((DEBUG_VFS, "inode: %p, device: %s, file: %p\n",
+-		ip, ip->i_bdev->bd_disk->disk_name, fp));
++	DEBUG((DEBUG_VFS, "disk: %p, device: %s\n", disk, disk->disk_name));
+ 
+ 	if (!--open_count) {
+ 		toc_uptodate = 0;
+--- linux-2.6.0-test6/drivers/cdrom/sbpcd.c	2003-09-08 13:58:56.000000000 -0700
++++ 25/drivers/cdrom/sbpcd.c	2003-10-05 00:34:01.000000000 -0700
+@@ -363,7 +363,6 @@
+ 
+ #include <linux/module.h>
+ 
+-#include <linux/version.h>
+ #include <linux/errno.h>
+ #include <linux/sched.h>
+ #include <linux/mm.h>
+@@ -5357,23 +5356,23 @@ static int sbp_data(struct request *req)
+ }
+ /*==========================================================================*/
+ 
+-static int sbpcd_block_open(struct inode *inode, struct file *file)
++static int sbpcd_block_open(struct block_device *bdev, struct file *file)
+ {
+-	struct sbpcd_drive *p = inode->i_bdev->bd_disk->private_data;
+-	return cdrom_open(p->sbpcd_infop, inode, file);
++	struct sbpcd_drive *p = bdev->bd_disk->private_data;
++	return cdrom_open(p->sbpcd_infop, bdev, file);
+ }
+ 
+-static int sbpcd_block_release(struct inode *inode, struct file *file)
++static int sbpcd_block_release(struct gendisk *disk)
+ {
+-	struct sbpcd_drive *p = inode->i_bdev->bd_disk->private_data;
+-	return cdrom_release(p->sbpcd_infop, file);
++	struct sbpcd_drive *p = disk->private_data;
++	return cdrom_release(p->sbpcd_infop);
+ }
+ 
+-static int sbpcd_block_ioctl(struct inode *inode, struct file *file,
++static int sbpcd_block_ioctl(struct block_device *bdev, struct file *file,
+ 				unsigned cmd, unsigned long arg)
+ {
+-	struct sbpcd_drive *p = inode->i_bdev->bd_disk->private_data;
+-	return cdrom_ioctl(p->sbpcd_infop, inode, cmd, arg);
++	struct sbpcd_drive *p = bdev->bd_disk->private_data;
++	return cdrom_ioctl(p->sbpcd_infop, bdev, cmd, arg);
+ }
+ 
+ static int sbpcd_block_media_changed(struct gendisk *disk)
+--- linux-2.6.0-test6/drivers/cdrom/sjcd.c	2003-09-08 13:58:56.000000000 -0700
++++ 25/drivers/cdrom/sjcd.c	2003-10-05 00:34:01.000000000 -0700
+@@ -713,16 +713,13 @@ static int sjcd_tray_open(void)
+ /*
+  * Do some user commands.
+  */
+-static int sjcd_ioctl(struct inode *ip, struct file *fp,
++static int sjcd_ioctl(struct block_device *bdev, struct file *fp,
+ 		      unsigned int cmd, unsigned long arg)
+ {
+ #if defined( SJCD_TRACE )
+ 	printk("SJCD:ioctl\n");
+ #endif
+ 
+-	if (ip == NULL)
+-		return (-EINVAL);
+-
+ 	sjcd_get_status();
+ 	if (!sjcd_status_valid)
+ 		return (-EIO);
+@@ -1522,7 +1519,7 @@ static void do_sjcd_request(request_queu
+ /*
+  * Open the device special file. Check disk is in.
+  */
+-static int sjcd_open(struct inode *ip, struct file *fp)
++static int sjcd_open(struct block_device *bdev, struct file *fp)
+ {
+ 	/*
+ 	 * Check the presence of device.
+@@ -1607,7 +1604,7 @@ static int sjcd_open(struct inode *ip, s
+ /*
+  * On close, we flush all sjcd blocks from the buffer cache.
+  */
+-static int sjcd_release(struct inode *inode, struct file *file)
++static int sjcd_release(struct gendisk *disk)
+ {
+ 	int s;
+ 
+--- linux-2.6.0-test6/drivers/cdrom/sonycd535.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/cdrom/sonycd535.c	2003-10-05 00:34:01.000000000 -0700
+@@ -201,7 +201,7 @@
+ 
+ static int read_subcode(void);
+ static void sony_get_toc(void);
+-static int cdu_open(struct inode *inode, struct file *filp);
++static int cdu_open(struct block_device *bdev, struct file *filp);
+ static inline unsigned int int_to_bcd(unsigned int val);
+ static unsigned int bcd_to_int(unsigned int bcd);
+ static int do_sony_cmd(Byte * cmd, int nCmd, Byte status[2],
+@@ -1061,7 +1061,7 @@ sony_get_subchnl_info(long arg)
+  * The big ugly ioctl handler.
+  */
+ static int
+-cdu_ioctl(struct inode *inode,
++cdu_ioctl(struct block_device *bdev,
+ 		  struct file *file,
+ 		  unsigned int cmd,
+ 		  unsigned long arg)
+@@ -1363,9 +1363,7 @@ cdu_ioctl(struct inode *inode,
+  * Open the drive for operations.  Spin the drive up and read the table of
+  * contents if these have not already been done.
+  */
+-static int
+-cdu_open(struct inode *inode,
+-		 struct file *filp)
++static int cdu_open(struct block_device *bdev, struct file *filp)
+ {
+ 	Byte status[2], cmd_buff[2];
+ 
+@@ -1388,7 +1386,7 @@ cdu_open(struct inode *inode,
+ 		sony_inuse = 0;
+ 		return -EIO;
+ 	}
+-	check_disk_change(inode->i_bdev);
++	check_disk_change(bdev);
+ 	sony_usage++;
+ 
+ #ifdef LOCK_DOORS
+@@ -1405,9 +1403,7 @@ cdu_open(struct inode *inode,
+  * Close the drive.  Spin it down if no task is using it.  The spin
+  * down will fail if playing audio, so audio play is OK.
+  */
+-static int
+-cdu_release(struct inode *inode,
+-			struct file *filp)
++static int cdu_release(struct gendisk *disk)
+ {
+ 	Byte status[2], cmd_no;
+ 
+--- linux-2.6.0-test6/drivers/char/agp/amd64-agp.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/char/agp/amd64-agp.c	2003-10-05 00:33:24.000000000 -0700
+@@ -91,9 +91,9 @@ static int amd64_insert_memory(struct ag
+ 	for (i = 0, j = pg_start; i < mem->page_count; i++, j++) {
+ 		tmp = agp_bridge->driver->mask_memory(mem->memory[i], mem->type);
+ 
+-		BUG_ON(tmp & 0xffffff0000000ffc);
+-		pte = (tmp & 0x000000ff00000000) >> 28;
+-		pte |=(tmp & 0x00000000fffff000);
++		BUG_ON(tmp & 0xffffff0000000ffcULL);
++		pte = (tmp & 0x000000ff00000000ULL) >> 28;
++		pte |=(tmp & 0x00000000fffff000ULL);
+ 		pte |= GPTE_VALID | GPTE_COHERENT;
+ 
+ 		agp_bridge->gatt_table[j] = pte;
+--- linux-2.6.0-test6/drivers/char/agp/via-agp.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/char/agp/via-agp.c	2003-10-05 00:33:24.000000000 -0700
+@@ -251,6 +251,11 @@ static struct agp_device_ids via_agp_dev
+ 		.chipset_name	= "Pro 266",
+ 	},
+ 
++	{
++		.device_id	= PCI_DEVICE_ID_VIA_XN266,
++		.chipset_name	= "Apollo Pro266",
++	},
++
+ 	/* VT8361 */
+ 	{
+ 		.device_id	= PCI_DEVICE_ID_VIA_8361,
+--- linux-2.6.0-test6/drivers/char/amiserial.c	2003-07-27 12:14:38.000000000 -0700
++++ 25/drivers/char/amiserial.c	2003-10-05 00:33:24.000000000 -0700
+@@ -32,7 +32,6 @@
+  */
+ 
+ #include <linux/config.h>
+-#include <linux/version.h>
+ 
+ #undef SERIAL_PARANOIA_CHECK
+ #define SERIAL_DO_RESTART
+--- linux-2.6.0-test6/drivers/char/cyclades.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/char/cyclades.c	2003-10-05 00:33:24.000000000 -0700
+@@ -670,7 +670,6 @@ static char rcsid[] =
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/pci.h>
+-#include <linux/version.h>
+ 
+ #include <linux/stat.h>
+ #include <linux/proc_fs.h>
+--- linux-2.6.0-test6/drivers/char/dsp56k.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/char/dsp56k.c	2003-10-05 00:33:24.000000000 -0700
+@@ -24,7 +24,6 @@
+  */
+ 
+ #include <linux/module.h>
+-#include <linux/version.h>
+ #include <linux/slab.h>	/* for kmalloc() and kfree() */
+ #include <linux/sched.h>	/* for struct wait_queue etc */
+ #include <linux/major.h>
+--- linux-2.6.0-test6/drivers/char/dtlk.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/char/dtlk.c	2003-10-05 00:33:24.000000000 -0700
+@@ -48,7 +48,6 @@
+  */
+ 
+ #include <linux/module.h>
+-#include <linux/version.h>
+ 
+ #define KERNEL
+ #include <linux/types.h>
+--- linux-2.6.0-test6/drivers/char/dz.c	2003-06-14 12:17:57.000000000 -0700
++++ 25/drivers/char/dz.c	2003-10-05 00:33:24.000000000 -0700
+@@ -23,7 +23,6 @@ Qua Jun 27 15:02:26 BRT 2001
+ 
+ /* #define DEBUG_DZ 1 */
+ 
+-#include <linux/version.h>
+ #include <linux/module.h>
+ 
+ #include <linux/config.h>
+--- linux-2.6.0-test6/drivers/char/ftape/compressor/zftape-compress.c	2003-06-14 12:18:32.000000000 -0700
++++ 25/drivers/char/ftape/compressor/zftape-compress.c	2003-10-05 00:33:24.000000000 -0700
+@@ -33,4 +33,5 @@
+ 
++#include <linux/version.h>
+ #include <linux/errno.h>
+ #include <linux/mm.h>
+ #include <linux/module.h>
+--- linux-2.6.0-test6/drivers/char/ftape/lowlevel/fdc-io.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/char/ftape/lowlevel/fdc-io.c	2003-10-05 00:33:24.000000000 -0700
+@@ -30,7 +30,6 @@
+ #include <linux/errno.h>
+ #include <linux/sched.h>
+ #include <linux/ioport.h>
+-#include <linux/version.h>
+ #include <linux/interrupt.h>
+ #include <asm/system.h>
+ #include <asm/io.h>
+--- linux-2.6.0-test6/drivers/char/generic_serial.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/char/generic_serial.c	2003-10-05 00:33:24.000000000 -0700
+@@ -348,7 +348,7 @@ int gs_real_chars_in_buffer(struct tty_s
+ static int gs_wait_tx_flushed (void * ptr, int timeout) 
+ {
+ 	struct gs_port *port = ptr;
+-	long end_jiffies;
++	unsigned long end_jiffies;
+ 	int jiffies_to_transmit, charsleft = 0, rv = 0;
+ 	int rcib;
+ 
+--- linux-2.6.0-test6/drivers/char/i8k.c	2003-06-14 12:18:01.000000000 -0700
++++ 25/drivers/char/i8k.c	2003-10-05 00:33:24.000000000 -0700
+@@ -17,7 +17,6 @@
+  */
+ 
+ #include <linux/module.h>
+-#include <linux/version.h>
+ #include <linux/types.h>
+ #include <linux/init.h>
+ #include <linux/proc_fs.h>
+--- linux-2.6.0-test6/drivers/char/ip2/i2os.h	2003-07-27 12:14:38.000000000 -0700
++++ 25/drivers/char/ip2/i2os.h	2003-10-05 00:33:24.000000000 -0700
+@@ -25,7 +25,6 @@
+ 
+ #include "ip2types.h"
+ #include <asm/io.h>  /* For inb, etc */
+-#include <linux/version.h>
+ 
+ //------------------------------------
+ // Defines for I/O instructions:
+--- linux-2.6.0-test6/drivers/char/ip2main.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/char/ip2main.c	2003-10-05 00:33:24.000000000 -0700
+@@ -84,8 +84,6 @@
+ /************/
+ #include <linux/config.h>
+ 
+-#include <linux/version.h>
+-
+ #include <linux/ctype.h>
+ #include <linux/string.h>
+ #include <linux/fcntl.h>
+--- linux-2.6.0-test6/drivers/char/isicom.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/drivers/char/isicom.c	2003-10-05 00:33:24.000000000 -0700
+@@ -38,7 +38,6 @@
+  */
+ 
+ #include <linux/module.h>
+-#include <linux/version.h>
+ #include <linux/kernel.h>
+ #include <linux/tty.h>
+ #include <linux/termios.h>
+--- linux-2.6.0-test6/drivers/char/istallion.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/char/istallion.c	2003-10-05 00:33:24.000000000 -0700
+@@ -35,7 +35,6 @@
+ #include <linux/serial.h>
+ #include <linux/cdk.h>
+ #include <linux/comstats.h>
+-#include <linux/version.h>
+ #include <linux/istallion.h>
+ #include <linux/ioport.h>
+ #include <linux/delay.h>
+--- linux-2.6.0-test6/drivers/char/Kconfig	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/char/Kconfig	2003-10-05 00:33:24.000000000 -0700
+@@ -954,6 +954,15 @@ config RAW_DRIVER
+ 	  Once bound, I/O against /dev/raw/rawN uses efficient zero-copy I/O. 
+ 	  See the raw(8) manpage for more details.
+ 
++config MAX_RAW_DEVS
++	int "Maximum number of RAW devices to support (1-8192)"
++	depends on RAW_DRIVER
++	default "256"
++	help
++	  The maximum number of RAW devices that are supported.
++	  Default is 256. Increase this number in case you need lots of
++	  raw devices.
++
+ config HANGCHECK_TIMER
+ 	tristate "Hangcheck timer"
+ 	depends on X86_64 || X86
+--- linux-2.6.0-test6/drivers/char/keyboard.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/char/keyboard.c	2003-10-05 00:33:38.000000000 -0700
+@@ -1052,6 +1052,9 @@ void kbd_keycode(unsigned int keycode, i
+ 	}
+ 	if (sysrq_down && down && !rep) {
+ 		handle_sysrq(kbd_sysrq_xlate[keycode], regs, tty);
++#ifdef CONFIG_KGDB_SYSRQ
++                sysrq_down = 0;        /* in case we miss the "up" event */
++#endif
+ 		return;
+ 	}
+ #endif
+--- linux-2.6.0-test6/drivers/char/lp_old98.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/char/lp_old98.c	2003-10-05 00:33:24.000000000 -0700
+@@ -23,7 +23,6 @@
+ #include <linux/fcntl.h>
+ #include <linux/delay.h>
+ #include <linux/console.h>
+-#include <linux/version.h>
+ #include <linux/fs.h>
+ 
+ #include <asm/io.h>
+--- linux-2.6.0-test6/drivers/char/mem.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/char/mem.c	2003-10-05 00:36:19.000000000 -0700
+@@ -40,6 +40,7 @@ extern void fbmem_init(void);
+ extern void tapechar_init(void);
+ #endif
+ 
++#ifdef pgprot_noncached
+ /*
+  * Architectures vary in how they handle caching for addresses
+  * outside of main memory.
+@@ -65,19 +66,21 @@ static inline int uncached_access(struct
+ 	  && addr >= __pa(high_memory);
+ #elif defined(CONFIG_IA64)
+ 	/*
+-	 * On ia64, we ignore O_SYNC because we cannot tolerate memory attribute aliases.
++	 * On ia64, we ignore O_SYNC because we cannot tolerate memory
++	 * attribute aliases.
+ 	 */
+ 	return !(efi_mem_attributes(addr) & EFI_MEMORY_WB);
+ #else
+ 	/*
+-	 * Accessing memory above the top the kernel knows about or through a file pointer
+-	 * that was marked O_SYNC will be done non-cached.
++	 * Accessing memory above the top the kernel knows about or through a
++	 * file pointer that was marked O_SYNC will be done non-cached.
+ 	 */
+ 	if (file->f_flags & O_SYNC)
+ 		return 1;
+ 	return addr >= __pa(high_memory);
+ #endif
+ }
++#endif		/* pgprot_noncached */
+ 
+ static ssize_t do_write_mem(struct file * file, void *p, unsigned long realp,
+ 			    const char * buf, size_t count, loff_t *ppos)
+@@ -159,28 +162,24 @@ static ssize_t write_mem(struct file * f
+ 	return do_write_mem(file, __va(p), p, buf, count, ppos);
+ }
+ 
+-static int mmap_mem(struct file * file, struct vm_area_struct * vma)
++static int mmap_mem(struct file *file, struct vm_area_struct *vma)
+ {
+ 	unsigned long offset = vma->vm_pgoff << PAGE_SHIFT;
+-	int uncached;
+ 
+-	uncached = uncached_access(file, offset);
+ #ifdef pgprot_noncached
+-	if (uncached)
++	if (uncached_access(file, offset))
+ 		vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+ #endif
+ 
+-	/* Don't try to swap out physical pages.. */
+-	vma->vm_flags |= VM_RESERVED;
+-
+ 	/*
+-	 * Don't dump addresses that are not real memory to a core file.
++	 * Don't try to swap out physical pages..
++	 * And treat /dev/mem mappings as "IO" regions: they may not
++	 * describe valid pageframes.
+ 	 */
+-	if (uncached)
+-		vma->vm_flags |= VM_IO;
++	vma->vm_flags |= VM_RESERVED|VM_IO;
+ 
+-	if (remap_page_range(vma, vma->vm_start, offset, vma->vm_end-vma->vm_start,
+-			     vma->vm_page_prot))
++	if (remap_page_range(vma, vma->vm_start, offset,
++			vma->vm_end-vma->vm_start, vma->vm_page_prot))
+ 		return -EAGAIN;
+ 	return 0;
+ }
+--- linux-2.6.0-test6/drivers/char/misc.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/char/misc.c	2003-10-05 00:33:24.000000000 -0700
+@@ -157,12 +157,11 @@ static int misc_open(struct inode * inod
+ 		list_for_each_entry(c, &misc_list, list) {
+ 			if (c->minor == minor) {
+ 				new_fops = fops_get(c->fops);
+-				if (!new_fops)
+-					goto fail;
+ 				break;
+ 			}
+ 		}
+-		goto fail;
++		if (!new_fops)
++			goto fail;
+ 	}
+ 
+ 	err = 0;
+--- linux-2.6.0-test6/drivers/char/moxa.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/char/moxa.c	2003-10-05 00:33:24.000000000 -0700
+@@ -32,7 +32,6 @@
+ #include <linux/config.h>
+ #include <linux/module.h>
+ #include <linux/types.h>
+-#include <linux/version.h>
+ #include <linux/mm.h>
+ #include <linux/ioport.h>
+ #include <linux/errno.h>
+--- linux-2.6.0-test6/drivers/char/mxser.c	2003-08-08 22:55:11.000000000 -0700
++++ 25/drivers/char/mxser.c	2003-10-05 00:33:24.000000000 -0700
+@@ -39,7 +39,6 @@
+ 
+ #include <linux/config.h>
+ #include <linux/module.h>
+-#include <linux/version.h>
+ #include <linux/errno.h>
+ #include <linux/signal.h>
+ #include <linux/sched.h>
+--- linux-2.6.0-test6/drivers/char/n_tty.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/char/n_tty.c	2003-10-05 00:36:15.000000000 -0700
+@@ -974,7 +974,8 @@ do_it_again:
+ 	/* NOTE: not yet done after every sleep pending a thorough
+ 	   check of the logic of this change. -- jlc */
+ 	/* don't stop on /dev/console */
+-	if (file->f_op->write != redirected_tty_write && current->tty == tty) {
++	if (file->f_op->write != redirected_tty_write &&
++			process_tty(current) == tty) {
+ 		if (tty->pgrp <= 0)
+ 			printk("read_chan: tty->pgrp <= 0!\n");
+ 		else if (process_group(current) != tty->pgrp) {
+--- linux-2.6.0-test6/drivers/char/pcmcia/synclink_cs.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/char/pcmcia/synclink_cs.c	2003-10-05 00:33:24.000000000 -0700
+@@ -37,7 +37,6 @@
+ 
+ #include <linux/config.h>	
+ #include <linux/module.h>
+-#include <linux/version.h>
+ #include <linux/errno.h>
+ #include <linux/signal.h>
+ #include <linux/sched.h>
+--- linux-2.6.0-test6/drivers/char/pcxx.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/char/pcxx.c	2003-10-05 00:33:24.000000000 -0700
+@@ -65,7 +65,6 @@
+ #include <linux/tty_driver.h>
+ #include <linux/slab.h>
+ #include <linux/init.h>
+-#include <linux/version.h>
+ 
+ #ifndef MODULE
+ #include <linux/ctype.h> /* We only need it for parsing the "digi="-line */
+--- linux-2.6.0-test6/drivers/char/random.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/char/random.c	2003-10-05 00:33:24.000000000 -0700
+@@ -1735,7 +1735,7 @@ random_ioctl(struct inode * inode, struc
+ 		tmp = kmalloc(size * sizeof(__u32), GFP_KERNEL);
+ 
+ 		if (!tmp)
+-			return -EFAULT;
++			return -ENOMEM;
+ 
+ 		spin_lock_irqsave(&random_state->lock, flags);
+ 		ent_count = random_state->entropy_count;
+--- linux-2.6.0-test6/drivers/char/raw.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/char/raw.c	2003-10-05 00:34:12.000000000 -0700
+@@ -20,8 +20,6 @@
+ 
+ #include <asm/uaccess.h>
+ 
+-#define MAX_RAW_MINORS	256
+-
+ struct raw_device_data {
+ 	struct block_device *binding;
+ 	int inuse;
+@@ -76,9 +74,8 @@ static int raw_open(struct inode *inode,
+ 			goto out;
+ 		}
+ 		filp->f_flags |= O_DIRECT;
+-		if (++raw_devices[minor].inuse == 1)
+-			filp->f_dentry->d_inode->i_mapping =
+-				bdev->bd_inode->i_mapping;
++		filp->f_mapping = bdev->bd_inode->i_mapping;
++		raw_devices[minor].inuse++;
+ 	}
+ 	filp->private_data = bdev;
+ out:
+@@ -97,11 +94,7 @@ static int raw_release(struct inode *ino
+ 
+ 	down(&raw_mutex);
+ 	bdev = raw_devices[minor].binding;
+-	if (--raw_devices[minor].inuse == 0) {
+-		/* Here  inode->i_mapping == bdev->bd_inode->i_mapping  */
+-		inode->i_mapping = &inode->i_data;
+-		inode->i_mapping->backing_dev_info = &default_backing_dev_info;
+-	}
++	--raw_devices[minor].inuse;
+ 	up(&raw_mutex);
+ 
+ 	bd_release(bdev);
+--- linux-2.6.0-test6/drivers/char/rio/rio_linux.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/char/rio/rio_linux.c	2003-10-05 00:33:24.000000000 -0700
+@@ -53,7 +53,6 @@
+ #include <linux/fcntl.h>
+ #include <linux/major.h>
+ #include <linux/delay.h>
+-#include <linux/version.h>
+ #include <linux/pci.h>
+ #include <linux/slab.h>
+ #include <linux/miscdevice.h>
+--- linux-2.6.0-test6/drivers/char/rocket.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/char/rocket.c	2003-10-05 00:36:15.000000000 -0700
+@@ -85,11 +85,9 @@
+ #include <linux/string.h>
+ #include <linux/fcntl.h>
+ #include <linux/ptrace.h>
+-#include <linux/major.h>
+ #include <linux/ioport.h>
+ #include <linux/delay.h>
+ #include <linux/wait.h>
+-#include <linux/delay.h>
+ #include <linux/pci.h>
+ #include <asm/uaccess.h>
+ #include <asm/atomic.h>
+@@ -955,7 +953,7 @@ static int rp_open(struct tty_struct *tt
+ 	/*
+ 	 * Info->count is now 1; so it's safe to sleep now.
+ 	 */
+-	info->session = current->session;
++	info->session = process_session(current);
+ 	info->pgrp = process_group(current);
+ 
+ 	if ((info->flags & ROCKET_INITIALIZED) == 0) {
+--- linux-2.6.0-test6/drivers/char/ser_a2232.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/char/ser_a2232.c	2003-10-05 00:33:24.000000000 -0700
+@@ -703,7 +703,7 @@ static int a2232_init_drivers(void)
+ 	a2232_driver->name = "ttyY";
+ 	a2232_driver->major = A2232_NORMAL_MAJOR;
+ 	a2232_driver->type = TTY_DRIVER_TYPE_SERIAL;
+-	a2232_driver->subtype = SERIAL_TTY_NORMAL;
++	a2232_driver->subtype = SERIAL_TYPE_NORMAL;
+ 	a2232_driver->init_termios = tty_std_termios;
+ 	a2232_driver->init_termios.c_cflag =
+ 		B9600 | CS8 | CREAD | HUPCL | CLOCAL;
+--- linux-2.6.0-test6/drivers/char/serial167.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/char/serial167.c	2003-10-05 00:33:24.000000000 -0700
+@@ -70,7 +70,6 @@
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ 
+-#include <linux/version.h>
+ #include <asm/uaccess.h>
+ #include <linux/init.h>
+ 
+--- linux-2.6.0-test6/drivers/char/stallion.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/char/stallion.c	2003-10-05 00:33:24.000000000 -0700
+@@ -28,7 +28,6 @@
+ 
+ #include <linux/config.h>
+ #include <linux/module.h>
+-#include <linux/version.h> /* for linux/stallion.h */
+ #include <linux/slab.h>
+ #include <linux/interrupt.h>
+ #include <linux/tty.h>
+--- linux-2.6.0-test6/drivers/char/sx.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/char/sx.c	2003-10-05 00:33:24.000000000 -0700
+@@ -240,7 +240,6 @@
+ #include "sxwindow.h"
+ 
+ #include <linux/generic_serial.h>
+-#include <asm/uaccess.h>
+ #include "sx.h"
+ 
+ 
+--- linux-2.6.0-test6/drivers/char/sysrq.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/char/sysrq.c	2003-10-05 00:33:38.000000000 -0700
+@@ -35,6 +35,25 @@
+ #include <linux/spinlock.h>
+ 
+ #include <asm/ptrace.h>
++#ifdef CONFIG_KGDB_SYSRQ
++
++#define  GDB_OP &kgdb_op
++static void kgdb_sysrq(int key, struct pt_regs *pt_regs, struct tty_struct *tty)
++{
++	printk("kgdb sysrq\n");
++	breakpoint();
++}
++
++static struct sysrq_key_op kgdb_op = {
++	.handler	= kgdb_sysrq,
++	.help_msg	= "kGdb|Fgdb",
++	.action_msg	= "Debug breakpoint\n",
++};
++
++#else
++#define  GDB_OP NULL
++#endif
++
+ 
+ extern void reset_vc(unsigned int);
+ 
+@@ -238,8 +257,8 @@ static struct sysrq_key_op *sysrq_key_ta
+ /* c */ NULL,
+ /* d */	NULL,
+ /* e */	&sysrq_term_op,
+-/* f */	NULL,
+-/* g */	NULL,
++/* f */	GDB_OP,
++/* g */	GDB_OP,
+ /* h */	NULL,
+ /* i */	&sysrq_kill_op,
+ /* j */	NULL,
+--- linux-2.6.0-test6/drivers/char/toshiba.c	2003-06-14 12:18:34.000000000 -0700
++++ 25/drivers/char/toshiba.c	2003-10-05 00:33:24.000000000 -0700
+@@ -57,7 +57,6 @@
+ #define TOSH_DEBUG 0
+ 
+ #include <linux/module.h>
+-#include <linux/version.h>
+ #include <linux/kernel.h>
+ #include <linux/sched.h>
+ #include <linux/types.h>
+@@ -85,7 +84,6 @@ static int tosh_fn = 0;
+ MODULE_PARM(tosh_fn, "i");
+ 
+ 
+-static int tosh_get_info(char *, char **, off_t, int);
+ static int tosh_ioctl(struct inode *, struct file *, unsigned int,
+ 	unsigned long);
+ 
+@@ -104,6 +102,7 @@ static struct miscdevice tosh_device = {
+ /*
+  * Read the Fn key status
+  */
++#ifdef CONFIG_PROC_FS
+ static int tosh_fn_status(void)
+ {
+         unsigned char scan;
+@@ -120,6 +119,7 @@ static int tosh_fn_status(void)
+ 
+         return (int) scan;
+ }
++#endif
+ 
+ 
+ /*
+@@ -291,6 +291,7 @@ static int tosh_ioctl(struct inode *ip, 
+ /*
+  * Print the information for /proc/toshiba
+  */
++#ifdef CONFIG_PROC_FS
+ int tosh_get_info(char *buffer, char **start, off_t fpos, int length)
+ {
+ 	char *temp;
+@@ -319,6 +320,7 @@ int tosh_get_info(char *buffer, char **s
+ 
+ 	return temp-buffer;
+ }
++#endif
+ 
+ 
+ /*
+--- linux-2.6.0-test6/drivers/char/tty_io.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/char/tty_io.c	2003-10-05 00:36:15.000000000 -0700
+@@ -314,7 +314,7 @@ struct tty_driver *get_tty_driver(dev_t 
+  */
+ int tty_check_change(struct tty_struct * tty)
+ {
+-	if (current->tty != tty)
++	if (process_tty(current) != tty)
+ 		return 0;
+ 	if (tty->pgrp <= 0) {
+ 		printk(KERN_WARNING "tty_check_change: tty->pgrp <= 0!\n");
+@@ -481,14 +481,14 @@ void do_tty_hangup(void *data)
+ 	if (tty->session > 0) {
+ 		struct list_head *l;
+ 		for_each_task_pid(tty->session, PIDTYPE_SID, p, l, pid) {
+-			if (p->tty == tty)
+-				p->tty = NULL;
+-			if (!p->leader)
++			if (process_tty(p) == tty)
++				p->signal->tty = NULL;
++			if (!process_session_leader(p))
+ 				continue;
+ 			send_group_sig_info(SIGHUP, SEND_SIG_PRIV, p);
+ 			send_group_sig_info(SIGCONT, SEND_SIG_PRIV, p);
+ 			if (tty->pgrp > 0)
+-				p->tty_old_pgrp = tty->pgrp;
++				p->signal->tty_old_pgrp = tty->pgrp;
+ 		}
+ 	}
+ 	read_unlock(&tasklist_lock);
+@@ -565,15 +565,15 @@ void disassociate_ctty(int on_exit)
+ 
+ 	lock_kernel();
+ 
+-	tty = current->tty;
++	tty = process_tty(current);
+ 	if (tty) {
+ 		tty_pgrp = tty->pgrp;
+ 		if (on_exit && tty->driver->type != TTY_DRIVER_TYPE_PTY)
+ 			tty_vhangup(tty);
+ 	} else {
+-		if (current->tty_old_pgrp) {
+-			kill_pg(current->tty_old_pgrp, SIGHUP, on_exit);
+-			kill_pg(current->tty_old_pgrp, SIGCONT, on_exit);
++		if (current->signal->tty_old_pgrp) {
++			kill_pg(current->signal->tty_old_pgrp, SIGHUP, on_exit);
++			kill_pg(current->signal->tty_old_pgrp, SIGCONT, on_exit);
+ 		}
+ 		unlock_kernel();	
+ 		return;
+@@ -584,13 +584,13 @@ void disassociate_ctty(int on_exit)
+ 			kill_pg(tty_pgrp, SIGCONT, on_exit);
+ 	}
+ 
+-	current->tty_old_pgrp = 0;
++	current->signal->tty_old_pgrp = 0;
+ 	tty->session = 0;
+ 	tty->pgrp = -1;
+ 
+ 	read_lock(&tasklist_lock);
+-	for_each_task_pid(current->session, PIDTYPE_SID, p, l, pid)
+-		p->tty = NULL;
++	for_each_task_pid(process_session(current), PIDTYPE_SID, p, l, pid)
++		p->signal->tty = NULL;
+ 	read_unlock(&tasklist_lock);
+ 	unlock_kernel();
+ }
+@@ -1218,10 +1218,10 @@ static void release_dev(struct file * fi
+ 
+ 		read_lock(&tasklist_lock);
+ 		for_each_task_pid(tty->session, PIDTYPE_SID, p, l, pid)
+-			p->tty = NULL;
++			p->signal->tty = NULL;
+ 		if (o_tty)
+ 			for_each_task_pid(o_tty->session, PIDTYPE_SID, p,l, pid)
+-				p->tty = NULL;
++				p->signal->tty = NULL;
+ 		read_unlock(&tasklist_lock);
+ 	}
+ 
+@@ -1292,10 +1292,10 @@ static int tty_open(struct inode * inode
+ retry_open:
+ 	noctty = filp->f_flags & O_NOCTTY;
+ 	if (device == MKDEV(TTYAUX_MAJOR,0)) {
+-		if (!current->tty)
++		if (!process_tty(current))
+ 			return -ENXIO;
+-		driver = current->tty->driver;
+-		index = current->tty->index;
++		driver = process_tty(current)->driver;
++		index = process_tty(current)->index;
+ 		filp->f_flags |= O_NONBLOCK; /* Don't let /dev/tty block */
+ 		/* noctty = 1; */
+ 		goto got_driver;
+@@ -1389,15 +1389,13 @@ got_driver:
+ 			filp->f_op = &tty_fops;
+ 		goto retry_open;
+ 	}
+-	if (!noctty &&
+-	    current->leader &&
+-	    !current->tty &&
+-	    tty->session == 0) {
++	if (!noctty && process_session_leader(current) &&
++			!process_tty(current) && tty->session == 0) {
+ 	    	task_lock(current);
+-		current->tty = tty;
++		current->signal->tty = tty;
+ 		task_unlock(current);
+-		current->tty_old_pgrp = 0;
+-		tty->session = current->session;
++		current->signal->tty_old_pgrp = 0;
++		tty->session = process_session(current);
+ 		tty->pgrp = process_group(current);
+ 	}
+ 	return 0;
+@@ -1455,7 +1453,7 @@ static int tiocsti(struct tty_struct *tt
+ {
+ 	char ch, mbz = 0;
+ 
+-	if ((current->tty != tty) && !capable(CAP_SYS_ADMIN))
++	if ((process_tty(current) != tty) && !capable(CAP_SYS_ADMIN))
+ 		return -EPERM;
+ 	if (get_user(ch, arg))
+ 		return -EFAULT;
+@@ -1541,14 +1539,14 @@ static int tiocsctty(struct tty_struct *
+ 	struct pid *pid;
+ 	task_t *p;
+ 
+-	if (current->leader &&
+-	    (current->session == tty->session))
++	if (process_session_leader(current) &&
++			(process_session(current) == tty->session))
+ 		return 0;
+ 	/*
+ 	 * The process must be a session leader and
+ 	 * not have a controlling tty already.
+ 	 */
+-	if (!current->leader || current->tty)
++	if (!process_session_leader(current) || process_tty(current))
+ 		return -EPERM;
+ 	if (tty->session > 0) {
+ 		/*
+@@ -1562,16 +1560,16 @@ static int tiocsctty(struct tty_struct *
+ 
+ 			read_lock(&tasklist_lock);
+ 			for_each_task_pid(tty->session, PIDTYPE_SID, p, l, pid)
+-				p->tty = NULL;
++				p->signal->tty = NULL;
+ 			read_unlock(&tasklist_lock);
+ 		} else
+ 			return -EPERM;
+ 	}
+ 	task_lock(current);
+-	current->tty = tty;
++	current->signal->tty = tty;
+ 	task_unlock(current);
+-	current->tty_old_pgrp = 0;
+-	tty->session = current->session;
++	current->signal->tty_old_pgrp = 0;
++	tty->session = process_session(current);
+ 	tty->pgrp = process_group(current);
+ 	return 0;
+ }
+@@ -1582,12 +1580,13 @@ static int tiocgpgrp(struct tty_struct *
+ 	 * (tty == real_tty) is a cheap way of
+ 	 * testing if the tty is NOT a master pty.
+ 	 */
+-	if (tty == real_tty && current->tty != real_tty)
++	if (tty == real_tty && process_tty(current) != real_tty)
+ 		return -ENOTTY;
+ 	return put_user(real_tty->pgrp, arg);
+ }
+ 
+-static int tiocspgrp(struct tty_struct *tty, struct tty_struct *real_tty, pid_t *arg)
++static int tiocspgrp(struct tty_struct *tty,
++			struct tty_struct *real_tty, pid_t *arg)
+ {
+ 	pid_t pgrp;
+ 	int retval = tty_check_change(real_tty);
+@@ -1596,15 +1595,14 @@ static int tiocspgrp(struct tty_struct *
+ 		return -ENOTTY;
+ 	if (retval)
+ 		return retval;
+-	if (!current->tty ||
+-	    (current->tty != real_tty) ||
+-	    (real_tty->session != current->session))
++	if (!process_tty(current) || (process_tty(current) != real_tty) ||
++			(real_tty->session != process_session(current)))
+ 		return -ENOTTY;
+ 	if (get_user(pgrp, (pid_t *) arg))
+ 		return -EFAULT;
+ 	if (pgrp < 0)
+ 		return -EINVAL;
+-	if (session_of_pgrp(pgrp) != current->session)
++	if (session_of_pgrp(pgrp) != process_session(current))
+ 		return -EPERM;
+ 	real_tty->pgrp = pgrp;
+ 	return 0;
+@@ -1616,7 +1614,7 @@ static int tiocgsid(struct tty_struct *t
+ 	 * (tty == real_tty) is a cheap way of
+ 	 * testing if the tty is NOT a master pty.
+ 	*/
+-	if (tty == real_tty && current->tty != real_tty)
++	if (tty == real_tty && process_tty(current) != real_tty)
+ 		return -ENOTTY;
+ 	if (real_tty->session <= 0)
+ 		return -ENOTTY;
+@@ -1774,12 +1772,12 @@ int tty_ioctl(struct inode * inode, stru
+ 			clear_bit(TTY_EXCLUSIVE, &tty->flags);
+ 			return 0;
+ 		case TIOCNOTTY:
+-			if (current->tty != tty)
++			if (process_tty(current) != tty)
+ 				return -ENOTTY;
+-			if (current->leader)
++			if (process_session_leader(current))
+ 				disassociate_ctty(0);
+ 			task_lock(current);
+-			current->tty = NULL;
++			current->signal->tty = NULL;
+ 			task_unlock(current);
+ 			return 0;
+ 		case TIOCSCTTY:
+@@ -1883,10 +1881,10 @@ static void __do_SAK(void *arg)
+ 		tty->driver->flush_buffer(tty);
+ 	read_lock(&tasklist_lock);
+ 	for_each_task_pid(session, PIDTYPE_SID, p, l, pid) {
+-		if (p->tty == tty || session > 0) {
++		if (process_tty(p) == tty || session > 0) {
+ 			printk(KERN_NOTICE "SAK: killed process %d"
+-			    " (%s): p->session==tty->session\n",
+-			    p->pid, p->comm);
++				" (%s): process_session(p)==tty->session\n",
++				p->pid, p->comm);
+ 			send_sig(SIGKILL, p, 1);
+ 			continue;
+ 		}
+--- linux-2.6.0-test6/drivers/char/vme_scc.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/char/vme_scc.c	2003-10-05 00:33:24.000000000 -0700
+@@ -29,7 +29,6 @@
+ #include <linux/fcntl.h>
+ #include <linux/major.h>
+ #include <linux/delay.h>
+-#include <linux/version.h>
+ #include <linux/slab.h>
+ #include <linux/miscdevice.h>
+ #include <linux/console.h>
+--- linux-2.6.0-test6/drivers/char/vt.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/char/vt.c	2003-10-05 00:36:15.000000000 -0700
+@@ -2226,7 +2226,7 @@ int tioclinux(struct tty_struct *tty, un
+ 
+ 	if (tty->driver->type != TTY_DRIVER_TYPE_CONSOLE)
+ 		return -EINVAL;
+-	if (current->tty != tty && !capable(CAP_SYS_ADMIN))
++	if (process_tty(current) != tty && !capable(CAP_SYS_ADMIN))
+ 		return -EPERM;
+ 	if (get_user(type, (char *)arg))
+ 		return -EFAULT;
+--- linux-2.6.0-test6/drivers/char/vt_ioctl.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/drivers/char/vt_ioctl.c	2003-10-05 00:36:15.000000000 -0700
+@@ -380,7 +380,7 @@ int vt_ioctl(struct tty_struct *tty, str
+ 	 * to be the owner of the tty, or have CAP_SYS_TTY_CONFIG.
+ 	 */
+ 	perm = 0;
+-	if (current->tty == tty || capable(CAP_SYS_TTY_CONFIG))
++	if (process_tty(current) == tty || capable(CAP_SYS_TTY_CONFIG))
+ 		perm = 1;
+  
+ 	kbd = kbd_table + console;
+@@ -1188,4 +1188,3 @@ void change_console(unsigned int new_con
+ 
+ 	complete_change_console(new_console);
+ }
+-
+--- linux-2.6.0-test6/drivers/char/watchdog/amd7xx_tco.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/char/watchdog/amd7xx_tco.c	2003-10-05 00:33:24.000000000 -0700
+@@ -19,13 +19,11 @@
+ 
+ #include <linux/config.h>
+ #include <linux/module.h>
+-#include <linux/version.h>
+ #include <linux/kernel.h>
+ #include <linux/miscdevice.h>
+ #include <linux/watchdog.h>
+ #include <linux/ioport.h>
+ #include <linux/spinlock.h>
+-#include <linux/ioport.h>
+ #include <asm/semaphore.h>
+ #include <asm/io.h>
+ #include <asm/uaccess.h>
+--- linux-2.6.0-test6/drivers/cpufreq/cpufreq.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/cpufreq/cpufreq.c	2003-10-05 00:36:14.000000000 -0700
+@@ -449,6 +449,9 @@ static int cpufreq_remove_dev (struct sy
+ 	if (!kobject_get(&data->kobj))
+ 		return -EFAULT;
+ 
++	if (cpufreq_driver->target)
++		__cpufreq_governor(data, CPUFREQ_GOV_STOP);
++
+ 	kobject_unregister(&data->kobj);
+ 
+ 	kobject_put(&data->kobj);
+@@ -459,9 +462,6 @@ static int cpufreq_remove_dev (struct sy
+ 	 */
+ 	wait_for_completion(&data->kobj_unregister);
+ 
+-	if (cpufreq_driver->target)
+-		__cpufreq_governor(data, CPUFREQ_GOV_STOP);
+-
+ 	if (cpufreq_driver->exit)
+ 		cpufreq_driver->exit(data);
+ 
+--- linux-2.6.0-test6/drivers/eisa/eisa-bus.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/eisa/eisa-bus.c	2003-10-05 00:36:11.000000000 -0700
+@@ -33,23 +33,22 @@ static struct eisa_device_info __initdat
+ #endif
+ 
+ #define EISA_MAX_FORCED_DEV 16
+-#define EISA_FORCED_OFFSET  2
+ 
+-static int enable_dev[EISA_MAX_FORCED_DEV + EISA_FORCED_OFFSET]  = { 1, EISA_MAX_FORCED_DEV, };
+-static int disable_dev[EISA_MAX_FORCED_DEV + EISA_FORCED_OFFSET] = { 1, EISA_MAX_FORCED_DEV, };
++static int enable_dev[EISA_MAX_FORCED_DEV];
++static int enable_dev_count;
++static int disable_dev[EISA_MAX_FORCED_DEV];
++static int disable_dev_count;
+ 
+ static int is_forced_dev (int *forced_tab,
++			  int forced_count,
+ 			  struct eisa_root_device *root,
+ 			  struct eisa_device *edev)
+ {
+ 	int i, x;
+ 
+-	for (i = 0; i < EISA_MAX_FORCED_DEV; i++) {
+-		if (!forced_tab[EISA_FORCED_OFFSET + i])
+-			return 0;
+-
++	for (i = 0; i < forced_count; i++) {
+ 		x = (root->bus_nr << 8) | edev->slot;
+-		if (forced_tab[EISA_FORCED_OFFSET + i] == x)
++		if (forced_tab[i] == x)
+ 			return 1;
+ 	}
+ 
+@@ -198,10 +197,10 @@ static int __init eisa_init_device (stru
+ #endif
+ 	}
+ 
+-	if (is_forced_dev (enable_dev, root, edev))
++	if (is_forced_dev (enable_dev, enable_dev_count, root, edev))
+ 		edev->state = EISA_CONFIG_ENABLED | EISA_CONFIG_FORCED;
+ 	
+-	if (is_forced_dev (disable_dev, root, edev))
++	if (is_forced_dev (disable_dev, disable_dev_count, root, edev))
+ 		edev->state = EISA_CONFIG_FORCED;
+ 
+ 	return 0;
+@@ -418,20 +417,13 @@ static int __init eisa_init (void)
+ 	return 0;
+ }
+ 
+-/* Couldn't use intarray with checking on... :-( */
+-#undef  param_check_intarray
+-#define param_check_intarray(name, p)
+-
+-module_param(enable_dev,  intarray, 0444);
+-module_param(disable_dev, intarray, 0444);
++module_param_array(enable_dev, int, enable_dev_count, 0444);
++module_param_array(disable_dev, int, disable_dev_count, 0444);
+ 
+ postcore_initcall (eisa_init);
+ 
+-#ifndef CONFIG_EISA_ALWAYS
+-int EISA_bus;
+-EXPORT_SYMBOL(EISA_bus);
+-#endif
+-
++int EISA_bus;		/* for legacy drivers */
++EXPORT_SYMBOL (EISA_bus);
+ EXPORT_SYMBOL (eisa_bus_type);
+ EXPORT_SYMBOL (eisa_driver_register);
+ EXPORT_SYMBOL (eisa_driver_unregister);
+--- linux-2.6.0-test6/drivers/i2c/busses/Kconfig	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/i2c/busses/Kconfig	2003-10-05 00:33:24.000000000 -0700
+@@ -285,7 +285,7 @@ config I2C_VELLEMAN
+ 	  will be called i2c-velleman.
+ 
+ config I2C_VIA
+-	tristate "VIA 82C58B"
++	tristate "VIA 82C586B"
+ 	depends on I2C_ALGOBIT && PCI && EXPERIMENTAL
+ 	help
+ 
+--- linux-2.6.0-test6/drivers/i2c/i2c-sensor.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/i2c/i2c-sensor.c	2003-10-05 00:33:24.000000000 -0700
+@@ -133,7 +133,7 @@ int i2c_detect(struct i2c_adapter *adapt
+ 		     i += 2) {
+ 			if (((adapter_id == address_data->probe[i]) ||
+ 			     ((address_data->
+-			       probe[i] == ANY_I2C_BUS) & !is_isa))
++			       probe[i] == ANY_I2C_BUS) && !is_isa))
+ 			    && (addr == address_data->probe[i + 1])) {
+ 				dev_dbg(&adapter->dev, "found probe parameter for adapter %d, addr %04x\n", adapter_id, addr);
+ 				found = 1;
+@@ -141,7 +141,7 @@ int i2c_detect(struct i2c_adapter *adapt
+ 		}
+ 		for (i = 0; !found && (address_data->probe_range[i] != I2C_CLIENT_END); i += 3) {
+ 			if ( ((adapter_id == address_data->probe_range[i]) ||
+-			      ((address_data->probe_range[i] == ANY_I2C_BUS) & !is_isa)) &&
++			      ((address_data->probe_range[i] == ANY_I2C_BUS) && !is_isa)) &&
+ 			     (addr >= address_data->probe_range[i + 1]) &&
+ 			     (addr <= address_data->probe_range[i + 2])) {
+ 				found = 1;
+--- linux-2.6.0-test6/drivers/ide/ide.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ide/ide.c	2003-10-05 00:33:58.000000000 -0700
+@@ -457,7 +457,7 @@ void ide_probe_module (void)
+ 
+ EXPORT_SYMBOL(ide_probe_module);
+ 
+-static int ide_open (struct inode * inode, struct file * filp)
++static int ide_open (struct block_device *bdev, struct file * filp)
+ {
+ 	return -ENXIO;
+ }
+@@ -1800,27 +1800,26 @@ static int __init match_parm (char *s, c
+ 
+ #ifdef CONFIG_BLK_DEV_PDC4030
+ static int __initdata probe_pdc4030;
+-extern void init_pdc4030(void);
+ #endif
+ #ifdef CONFIG_BLK_DEV_ALI14XX
+ static int __initdata probe_ali14xx;
+-extern void init_ali14xx(void);
++extern int ali14xx_init(void);
+ #endif
+ #ifdef CONFIG_BLK_DEV_UMC8672
+ static int __initdata probe_umc8672;
+-extern void init_umc8672(void);
++extern int umc8672_init(void);
+ #endif
+ #ifdef CONFIG_BLK_DEV_DTC2278
+ static int __initdata probe_dtc2278;
+-extern void init_dtc2278(void);
++extern int dtc2278_init(void);
+ #endif
+ #ifdef CONFIG_BLK_DEV_HT6560B
+ static int __initdata probe_ht6560b;
+-extern void init_ht6560b(void);
++extern int ht6560b_init(void);
+ #endif
+ #ifdef CONFIG_BLK_DEV_QD65XX
+ static int __initdata probe_qd65xx;
+-extern void init_qd65xx(void);
++extern int qd65xx_init(void);
+ #endif
+ 
+ static int __initdata is_chipset_set[MAX_HWIFS];
+@@ -2238,8 +2237,9 @@ static void __init probe_for_hwifs (void
+ #endif /* CONFIG_BLK_DEV_CMD640 */
+ #ifdef CONFIG_BLK_DEV_PDC4030
+ 	{
+-		extern int ide_probe_for_pdc4030(void);
+-		(void) ide_probe_for_pdc4030();
++		extern int pdc4030_init(void);
++		if (probe_pdc4030)
++			(void)pdc4030_init();
+ 	}
+ #endif /* CONFIG_BLK_DEV_PDC4030 */
+ #ifdef CONFIG_BLK_DEV_IDE_PMAC
+@@ -2595,29 +2595,25 @@ int __init ide_init (void)
+ 
+ 	init_ide_data();
+ 
+-#ifdef CONFIG_BLK_DEV_PDC4030
+-	if (probe_pdc4030)
+-		init_pdc4030();
+-#endif
+ #ifdef CONFIG_BLK_DEV_ALI14XX
+ 	if (probe_ali14xx)
+-		init_ali14xx();
++		(void)ali14xx_init();
+ #endif
+ #ifdef CONFIG_BLK_DEV_UMC8672
+ 	if (probe_umc8672)
+-		init_umc8672();
++		(void)umc8672_init();
+ #endif
+ #ifdef CONFIG_BLK_DEV_DTC2278
+ 	if (probe_dtc2278)
+-		init_dtc2278();
++		(void)dtc2278_init();
+ #endif
+ #ifdef CONFIG_BLK_DEV_HT6560B
+ 	if (probe_ht6560b)
+-		init_ht6560b();
++		(void)ht6560b_init();
+ #endif
+ #ifdef CONFIG_BLK_DEV_QD65XX
+ 	if (probe_qd65xx)
+-		init_qd65xx();
++		(void)qd65xx_init();
+ #endif
+ 
+ 	initializing = 1;
+--- linux-2.6.0-test6/drivers/ide/ide-cd.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/ide/ide-cd.c	2003-10-05 00:34:01.000000000 -0700
+@@ -3331,39 +3331,38 @@ static ide_driver_t ide_cdrom_driver = {
+ 	.complete_power_step	= ide_cdrom_complete_power_step,
+ };
+ 
+-static int idecd_open(struct inode * inode, struct file * file)
++static int idecd_open(struct block_device *bdev, struct file * file)
+ {
+-	ide_drive_t *drive = inode->i_bdev->bd_disk->private_data;
++	ide_drive_t *drive = bdev->bd_disk->private_data;
+ 	struct cdrom_info *info = drive->driver_data;
+ 	int rc = -ENOMEM;
+ 	drive->usage++;
+ 
+ 	if (!info->buffer)
+ 		info->buffer = (char *) kmalloc(SECTOR_BUFFER_SIZE, GFP_KERNEL);
+-        if (!info->buffer || (rc = cdrom_open(&info->devinfo, inode, file)))
++        if (!info->buffer || (rc = cdrom_open(&info->devinfo, bdev, file)))
+ 		drive->usage--;
+ 	return rc;
+ }
+ 
+-static int idecd_release(struct inode * inode, struct file * file)
++static int idecd_release(struct gendisk *disk)
+ {
+-	ide_drive_t *drive = inode->i_bdev->bd_disk->private_data;
++	ide_drive_t *drive = disk->private_data;
+ 	struct cdrom_info *info = drive->driver_data;
+ 
+-	cdrom_release (&info->devinfo, file);
++	cdrom_release(&info->devinfo);
+ 	drive->usage--;
+ 	return 0;
+ }
+ 
+-static int idecd_ioctl (struct inode *inode, struct file *file,
++static int idecd_ioctl (struct block_device *bdev, struct file *file,
+ 			unsigned int cmd, unsigned long arg)
+ {
+-	struct block_device *bdev = inode->i_bdev;
+ 	ide_drive_t *drive = bdev->bd_disk->private_data;
+ 	int err = generic_ide_ioctl(bdev, cmd, arg);
+ 	if (err == -EINVAL) {
+ 		struct cdrom_info *info = drive->driver_data;
+-		err = cdrom_ioctl(&info->devinfo, inode, cmd, arg);
++		err = cdrom_ioctl(&info->devinfo, bdev, cmd, arg);
+ 	}
+ 	return err;
+ }
+--- linux-2.6.0-test6/drivers/ide/ide-disk.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ide/ide-disk.c	2003-10-05 00:34:01.000000000 -0700
+@@ -1734,9 +1734,9 @@ static ide_driver_t idedisk_driver = {
+ 	.complete_power_step	= idedisk_complete_power_step,
+ };
+ 
+-static int idedisk_open(struct inode *inode, struct file *filp)
++static int idedisk_open(struct block_device *bdev, struct file *filp)
+ {
+-	ide_drive_t *drive = inode->i_bdev->bd_disk->private_data;
++	ide_drive_t *drive = bdev->bd_disk->private_data;
+ 	drive->usage++;
+ 	if (drive->removable && drive->usage == 1) {
+ 		ide_task_t args;
+@@ -1744,7 +1744,7 @@ static int idedisk_open(struct inode *in
+ 		memset(&args, 0, sizeof(ide_task_t));
+ 		args.tfRegister[IDE_COMMAND_OFFSET] = WIN_DOORLOCK;
+ 		args.command_type = ide_cmd_type_parser(&args);
+-		check_disk_change(inode->i_bdev);
++		check_disk_change(bdev);
+ 		/*
+ 		 * Ignore the return code from door_lock,
+ 		 * since the open() has already succeeded,
+@@ -1782,9 +1782,9 @@ static int ide_cacheflush_p(ide_drive_t 
+ 	return 0;
+ }
+ 
+-static int idedisk_release(struct inode *inode, struct file *filp)
++static int idedisk_release(struct gendisk *disk)
+ {
+-	ide_drive_t *drive = inode->i_bdev->bd_disk->private_data;
++	ide_drive_t *drive = disk->private_data;
+ 	if (drive->removable && drive->usage == 1) {
+ 		ide_task_t args;
+ 		memset(&args, 0, sizeof(ide_task_t));
+@@ -1798,10 +1798,9 @@ static int idedisk_release(struct inode 
+ 	return 0;
+ }
+ 
+-static int idedisk_ioctl(struct inode *inode, struct file *file,
++static int idedisk_ioctl(struct block_device *bdev, struct file *file,
+ 			unsigned int cmd, unsigned long arg)
+ {
+-	struct block_device *bdev = inode->i_bdev;
+ 	return generic_ide_ioctl(bdev, cmd, arg);
+ }
+ 
+--- linux-2.6.0-test6/drivers/ide/ide-floppy.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ide/ide-floppy.c	2003-10-05 00:34:01.000000000 -0700
+@@ -156,7 +156,6 @@ typedef struct idefloppy_packet_command_
+ 	int request_transfer;			/* Bytes to transfer */
+ 	int actually_transferred;		/* Bytes actually transferred */
+ 	int buffer_size;			/* Size of our data buffer */
+-	char *b_data;				/* Pointer which runs on the buffers */
+ 	int b_count;				/* Missing/Available data on the current buffer */
+ 	struct request *rq;			/* The corresponding request */
+ 	u8 *buffer;				/* Data buffer */
+@@ -515,9 +514,6 @@ typedef struct {
+ 	u8		reserved[4];
+ } idefloppy_mode_parameter_header_t;
+ 
+-#define IDEFLOPPY_MIN(a,b)	((a)<(b) ? (a):(b))
+-#define	IDEFLOPPY_MAX(a,b)	((a)>(b) ? (a):(b))
+-
+ /*
+  *	Too bad. The drive wants to send us data which we are not ready to accept.
+  *	Just throw it away.
+@@ -575,59 +571,68 @@ static int idefloppy_do_end_request(ide_
+ static void idefloppy_input_buffers (ide_drive_t *drive, idefloppy_pc_t *pc, unsigned int bcount)
+ {
+ 	struct request *rq = pc->rq;
+-	struct bio *bio = rq->bio;
+-	int count;
++	struct bio_vec *bvec;
++	struct bio *bio;
++	unsigned long flags;
++	char *data;
++	int count, i, done = 0;
++
++	rq_for_each_bio(bio, rq) {
++		bio_for_each_segment(bvec, bio, i) {
++			if (!bcount)
++				break;
++
++			count = min(bvec->bv_len, bcount);
++
++			data = bvec_kmap_irq(bvec, &flags);
++			atapi_input_bytes(drive, data, count);
++			bvec_kunmap_irq(data, &flags);
+ 
+-	while (bcount) {
+-		if (pc->b_count == bio->bi_size) {
+-			rq->sector += rq->current_nr_sectors;
+-			rq->nr_sectors -= rq->current_nr_sectors;
+-			idefloppy_do_end_request(drive, 1, 0);
+-			if ((bio = rq->bio) != NULL)
+-				pc->b_count = 0;
+-		}
+-		if (bio == NULL) {
+-			printk(KERN_ERR "%s: bio == NULL in "
+-				"idefloppy_input_buffers, bcount == %d\n",
+-				drive->name, bcount);
+-			idefloppy_discard_data(drive, bcount);
+-			return;
+-		}
+-		count = IDEFLOPPY_MIN(bio->bi_size - pc->b_count, bcount);
+-		atapi_input_bytes(drive, bio_data(bio) + pc->b_count, count);
+-		bcount -= count;
+-		pc->b_count += count;
++			bcount -= count;
++			pc->b_count += count;
++			done += count;
++		}
++	}
++
++	idefloppy_do_end_request(drive, 1, done >> 9);
++
++	if (bcount) {
++		printk(KERN_ERR "%s: leftover data in idefloppy_input_buffers, bcount == %d\n", drive->name, bcount);
++		idefloppy_discard_data(drive, bcount);
+ 	}
+ }
+ 
+ static void idefloppy_output_buffers (ide_drive_t *drive, idefloppy_pc_t *pc, unsigned int bcount)
+ {
+ 	struct request *rq = pc->rq;
+-	struct bio *bio = rq->bio;
+-	int count;
+-	
+-	while (bcount) {
+-		if (!pc->b_count) {
+-			rq->sector += rq->current_nr_sectors;
+-			rq->nr_sectors -= rq->current_nr_sectors;
+-			idefloppy_do_end_request(drive, 1, 0);
+-			if ((bio = rq->bio) != NULL) {
+-				pc->b_data = bio_data(bio);
+-				pc->b_count = bio->bi_size;
+-			}
++	struct bio *bio;
++	struct bio_vec *bvec;
++	unsigned long flags;
++	int count, i, done = 0;
++	char *data;
++
++	rq_for_each_bio(bio, rq) {
++		bio_for_each_segment(bvec, bio, i) {
++			if (!bcount)
++				break;
++
++			count = min(bvec->bv_len, bcount);
++
++			data = bvec_kmap_irq(bvec, &flags);
++			atapi_output_bytes(drive, data, count);
++			bvec_kunmap_irq(data, &flags);
++
++			bcount -= count;
++			pc->b_count += count;
++			done += count;
+ 		}
+-		if (bio == NULL) {
+-			printk(KERN_ERR "%s: bio == NULL in "
+-				"idefloppy_output_buffers, bcount == %d\n",
+-				drive->name, bcount);
+-			idefloppy_write_zeros(drive, bcount);
+-			return;
+-		}
+-		count = IDEFLOPPY_MIN(pc->b_count, bcount);
+-		atapi_output_bytes(drive, pc->b_data, count);
+-		bcount -= count;
+-		pc->b_data += count;
+-		pc->b_count -= count;
++	}
++
++	idefloppy_do_end_request(drive, 1, done >> 9);
++
++	if (bcount) {
++		printk(KERN_ERR "%s: leftover data in idefloppy_output_buffers, bcount == %d\n", drive->name, bcount);
++		idefloppy_write_zeros(drive, bcount);
+ 	}
+ }
+ 
+@@ -732,8 +737,6 @@ static void idefloppy_init_pc (idefloppy
+ 	pc->request_transfer = 0;
+ 	pc->buffer = pc->pc_buffer;
+ 	pc->buffer_size = IDEFLOPPY_PC_BUFFER_SIZE;
+-	pc->b_data = NULL;
+-//	pc->bio = NULL;
+ 	pc->callback = &idefloppy_pc_callback;
+ }
+ 
+@@ -1199,7 +1202,6 @@ static void idefloppy_create_rw_cmd (ide
+ 	put_unaligned(htonl(block), (unsigned int *) &pc->c[2]);
+ 	pc->callback = &idefloppy_rw_callback;
+ 	pc->rq = rq;
+-	pc->b_data = rq->buffer;
+ 	pc->b_count = cmd == READ ? 0 : rq->bio->bi_size;
+ 	if (rq->flags & REQ_RW)
+ 		set_bit(PC_WRITING, &pc->flags);
+@@ -1864,9 +1866,9 @@ static ide_driver_t idefloppy_driver = {
+ 	.drives			= LIST_HEAD_INIT(idefloppy_driver.drives),
+ };
+ 
+-static int idefloppy_open(struct inode *inode, struct file *filp)
++static int idefloppy_open(struct block_device *bdev, struct file *filp)
+ {
+-	ide_drive_t *drive = inode->i_bdev->bd_disk->private_data;
++	ide_drive_t *drive = bdev->bd_disk->private_data;
+ 	idefloppy_floppy_t *floppy = drive->driver_data;
+ 	idefloppy_pc_t pc;
+ 
+@@ -1906,7 +1908,7 @@ static int idefloppy_open(struct inode *
+ 			idefloppy_create_prevent_cmd(&pc, 1);
+ 			(void) idefloppy_queue_pc_tail(drive, &pc);
+ 		}
+-		check_disk_change(inode->i_bdev);
++		check_disk_change(bdev);
+ 	} else if (test_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, &floppy->flags)) {
+ 		drive->usage--;
+ 		return -EBUSY;
+@@ -1914,9 +1916,9 @@ static int idefloppy_open(struct inode *
+ 	return 0;
+ }
+ 
+-static int idefloppy_release(struct inode *inode, struct file *filp)
++static int idefloppy_release(struct gendisk *disk)
+ {
+-	ide_drive_t *drive = inode->i_bdev->bd_disk->private_data;
++	ide_drive_t *drive = disk->private_data;
+ 	idefloppy_pc_t pc;
+ 	
+ 	debug_log(KERN_INFO "Reached idefloppy_release\n");
+@@ -1936,10 +1938,9 @@ static int idefloppy_release(struct inod
+ 	return 0;
+ }
+ 
+-static int idefloppy_ioctl(struct inode *inode, struct file *file,
++static int idefloppy_ioctl(struct block_device *bdev, struct file *file,
+ 			unsigned int cmd, unsigned long arg)
+ {
+-	struct block_device *bdev = inode->i_bdev;
+ 	ide_drive_t *drive = bdev->bd_disk->private_data;
+ 	idefloppy_floppy_t *floppy = drive->driver_data;
+ 	int err = generic_ide_ioctl(bdev, cmd, arg);
+--- linux-2.6.0-test6/drivers/ide/ide-proc.c	2003-06-14 12:18:22.000000000 -0700
++++ 25/drivers/ide/ide-proc.c	2003-10-05 00:33:24.000000000 -0700
+@@ -522,7 +522,8 @@ int proc_ide_write_settings
+ 			if (*p != ':')
+ 				goto parse_error;
+ 			len = IDE_MIN(p - start, MAX_LEN);
+-			strlcpy(name, start, IDE_MIN(len, MAX_LEN));
++			strncpy(name, start, IDE_MIN(len, MAX_LEN));
++			name[len] = 0;
+ 
+ 			if (n > 0) {
+ 				--n;
+--- linux-2.6.0-test6/drivers/ide/ide-tape.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ide/ide-tape.c	2003-10-05 00:34:01.000000000 -0700
+@@ -6338,24 +6338,23 @@ static struct file_operations idetape_fo
+ 	.release	= idetape_chrdev_release,
+ };
+ 
+-static int idetape_open(struct inode *inode, struct file *filp)
++static int idetape_open(struct block_device *bdev, struct file *filp)
+ {
+-	ide_drive_t *drive = inode->i_bdev->bd_disk->private_data;
++	ide_drive_t *drive = bdev->bd_disk->private_data;
+ 	drive->usage++;
+ 	return 0;
+ }
+ 
+-static int idetape_release(struct inode *inode, struct file *filp)
++static int idetape_release(struct gendisk *disk)
+ {
+-	ide_drive_t *drive = inode->i_bdev->bd_disk->private_data;
++	ide_drive_t *drive = disk->private_data;
+ 	drive->usage--;
+ 	return 0;
+ }
+ 
+-static int idetape_ioctl(struct inode *inode, struct file *file,
++static int idetape_ioctl(struct block_device *bdev, struct file *file,
+ 			unsigned int cmd, unsigned long arg)
+ {
+-	struct block_device *bdev = inode->i_bdev;
+ 	ide_drive_t *drive = bdev->bd_disk->private_data;
+ 	int err = generic_ide_ioctl(bdev, cmd, arg);
+ 	if (err == -EINVAL)
+--- linux-2.6.0-test6/drivers/ide/Kconfig	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/ide/Kconfig	2003-10-05 00:36:28.000000000 -0700
+@@ -740,6 +740,13 @@ config BLK_DEV_SVWKS
+ 	  This driver adds PIO/(U)DMA support for the ServerWorks OSB4/CSB5
+ 	  chipsets.
+ 
++config BLK_DEV_SGIIOC4
++	tristate "Silicon Graphics IOC4 chipset support"
++	help
++	  This driver adds PIO & MultiMode DMA-2 support for the SGI IOC4
++	  chipset.  Please say Y here, if you have an Altix System from
++	  Silicon Graphics Inc.
++
+ config BLK_DEV_SIIMAGE
+ 	tristate "Silicon Image chipset support"
+ 	help
+--- linux-2.6.0-test6/drivers/ide/legacy/ali14xx.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ide/legacy/ali14xx.c	2003-10-05 00:33:24.000000000 -0700
+@@ -198,22 +198,12 @@ static int __init initRegisters (void) {
+ 	return t;
+ }
+ 
+-int __init probe_ali14xx (void)
++static int __init ali14xx_probe(void)
+ {
+-	/* auto-detect IDE controller port */
+-	if (!findPort()) {
+-		printk(KERN_ERR "ali14xx: not found.\n");
+-		return 1;
+-	}
++	ide_hwif_t *hwif, *mate;
+ 
+-	printk(KERN_DEBUG "ali14xx: base= 0x%03x, regOn = 0x%02x.\n", basePort, regOn);
+-	ide_hwifs[0].chipset = ide_ali14xx;
+-	ide_hwifs[1].chipset = ide_ali14xx;
+-	ide_hwifs[0].tuneproc = &ali14xx_tune_drive;
+-	ide_hwifs[1].tuneproc = &ali14xx_tune_drive;
+-	ide_hwifs[0].mate = &ide_hwifs[1];
+-	ide_hwifs[1].mate = &ide_hwifs[0];
+-	ide_hwifs[1].channel = 1;
++	printk(KERN_DEBUG "ali14xx: base=0x%03x, regOn=0x%02x.\n",
++			  basePort, regOn);
+ 
+ 	/* initialize controller registers */
+ 	if (!initRegisters()) {
+@@ -221,74 +211,59 @@ int __init probe_ali14xx (void)
+ 		return 1;
+ 	}
+ 
+-	probe_hwif_init(&ide_hwifs[0]);
+-	probe_hwif_init(&ide_hwifs[1]);
++	hwif = &ide_hwifs[0];
++	mate = &ide_hwifs[1];
+ 
+-	return 0;
+-}
++	hwif->chipset = ide_ali14xx;
++	hwif->tuneproc = &ali14xx_tune_drive;
++	hwif->mate = mate;
++
++	mate->chipset = ide_ali14xx;
++	mate->tuneproc = &ali14xx_tune_drive;
++	mate->mate = hwif;
++	mate->channel = 1;
+ 
+-static void ali14xx_release (void)
+-{
+-	if (ide_hwifs[0].chipset != ide_ali14xx &&
+-	    ide_hwifs[1].chipset != ide_ali14xx)
+-		return;
++	probe_hwif_init(hwif);
++	probe_hwif_init(mate);
+ 
+-	ide_hwifs[0].chipset = ide_unknown;
+-	ide_hwifs[1].chipset = ide_unknown;
+-	ide_hwifs[0].tuneproc = NULL;
+-	ide_hwifs[1].tuneproc = NULL;
+-	ide_hwifs[0].mate = NULL;
+-	ide_hwifs[1].mate = NULL;
++	return 0;
+ }
+ 
+-#ifndef MODULE
+-/*
+- * init_ali14xx:
+- *
+- * called by ide.c when parsing command line
+- */
+-
+-void __init init_ali14xx (void)
++/* Can be called directly from ide.c. */
++int __init ali14xx_init(void)
+ {
+ 	/* auto-detect IDE controller port */
+-        if (findPort())
+-		if (probe_ali14xx())
+-			goto no_detect;
+-	return;
+-
+-no_detect:
++	if (findPort()) {
++		if (ali14xx_probe())
++			return -ENODEV;
++		return 0;
++	}
+ 	printk(KERN_ERR "ali14xx: not found.\n");
+-	ali14xx_release();
++	return -ENODEV;
+ }
+ 
+-#else
+-
+-MODULE_AUTHOR("see local file");
+-MODULE_DESCRIPTION("support of ALI 14XX IDE chipsets");
+-MODULE_LICENSE("GPL");
+-
+-static int __init ali14xx_mod_init(void)
++#ifdef MODULE
++static void __exit ali14xx_release_hwif(ide_hwif_t *hwif)
+ {
+-	/* auto-detect IDE controller port */
+-	if (findPort())
+-		if (probe_ali14xx()) {
+-			ali14xx_release();
+-			return -ENODEV;
+-		}
++	if (hwif->chipset != ide_ali14xx)
++		return;
+ 
+-	if (ide_hwifs[0].chipset != ide_ali14xx &&
+-	    ide_hwifs[1].chipset != ide_ali14xx) {
+-		ali14xx_release();
+-		return -ENODEV;
+-	}
+-	return 0;
++	hwif->chipset = ide_unknown;
++	hwif->tuneproc = NULL;
++	hwif->mate = NULL;
++	hwif->channel = 0;
+ }
+-module_init(ali14xx_mod_init);
+ 
+-static void __exit ali14xx_mod_exit(void)
++static void __exit ali14xx_exit(void)
+ {
+-	ali14xx_release();
++	ali14xx_release_hwif(&ide_hwifs[0]);
++	ali14xx_release_hwif(&ide_hwifs[1]);
+ }
+-module_exit(ali14xx_mod_exit);
++
++module_init(ali14xx_init);
++module_exit(ali14xx_exit);
+ #endif
+ 
++MODULE_AUTHOR("see local file");
++MODULE_DESCRIPTION("support of ALI 14XX IDE chipsets");
++MODULE_LICENSE("GPL");
+--- linux-2.6.0-test6/drivers/ide/legacy/dtc2278.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ide/legacy/dtc2278.c	2003-10-05 00:33:24.000000000 -0700
+@@ -95,9 +95,16 @@ static void tune_dtc2278 (ide_drive_t *d
+ 	HWIF(drive)->drives[!drive->select.b.unit].io_32bit = 1;
+ }
+ 
+-void __init probe_dtc2278 (void)
++static int __init probe_dtc2278(void)
+ {
+ 	unsigned long flags;
++	ide_hwif_t *hwif, *mate;
++
++	hwif = &ide_hwifs[0];
++	mate = &ide_hwifs[1];
++
++	if (hwif->chipset != ide_unknown || mate->chipset != ide_unknown)
++		return 1;
+ 
+ 	local_irq_save(flags);
+ 	/*
+@@ -117,76 +124,60 @@ void __init probe_dtc2278 (void)
+ #endif
+ 	local_irq_restore(flags);
+ 
+-	ide_hwifs[0].serialized = 1;
+-	ide_hwifs[1].serialized = 1;
+-	ide_hwifs[0].chipset = ide_dtc2278;
+-	ide_hwifs[1].chipset = ide_dtc2278;
+-	ide_hwifs[0].tuneproc = &tune_dtc2278;
+-	ide_hwifs[0].drives[0].no_unmask = 1;
+-	ide_hwifs[0].drives[1].no_unmask = 1;
+-	ide_hwifs[1].drives[0].no_unmask = 1;
+-	ide_hwifs[1].drives[1].no_unmask = 1;
+-	ide_hwifs[0].mate = &ide_hwifs[1];
+-	ide_hwifs[1].mate = &ide_hwifs[0];
+-	ide_hwifs[1].channel = 1;
++	hwif->serialized = 1;
++	hwif->chipset = ide_dtc2278;
++	hwif->tuneproc = &tune_dtc2278;
++	hwif->drives[0].no_unmask = 1;
++	hwif->drives[1].no_unmask = 1;
++	hwif->mate = mate;
++
++	mate->serialized = 1;
++	mate->chipset = ide_dtc2278;
++	mate->drives[0].no_unmask = 1;
++	mate->drives[1].no_unmask = 1;
++	mate->mate = hwif;
++	mate->channel = 1;
++
++	probe_hwif_init(hwif);
++	probe_hwif_init(mate);
+ 
+-	probe_hwif_init(&ide_hwifs[0]);
+-	probe_hwif_init(&ide_hwifs[1]);
++	return 0;
+ }
+ 
+-static void dtc2278_release (void)
++/* Can be called directly from ide.c. */
++int __init dtc2278_init(void)
+ {
+-	if (ide_hwifs[0].chipset != ide_dtc2278 &&
+-	    ide_hwifs[1].chipset != ide_dtc2278)
++	if (probe_dtc2278()) {
++		printk(KERN_ERR "dtc2278: ide interfaces already in use!\n");
++		return -EBUSY;
++	}
++	return 0;
++}
++
++#ifdef MODULE
++static void __exit dtc2278_release_hwif(ide_hwif_t *hwif)
++{
++	if (hwif->chipset != ide_dtc2278)
+ 		return;
+ 
+-	ide_hwifs[0].serialized = 0;
+-	ide_hwifs[1].serialized = 0;
+-	ide_hwifs[0].chipset = ide_unknown;
+-	ide_hwifs[1].chipset = ide_unknown;
+-	ide_hwifs[0].tuneproc = NULL;
+-	ide_hwifs[0].drives[0].no_unmask = 0;
+-	ide_hwifs[0].drives[1].no_unmask = 0;
+-	ide_hwifs[1].drives[0].no_unmask = 0;
+-	ide_hwifs[1].drives[1].no_unmask = 0;
+-	ide_hwifs[0].mate = NULL;
+-	ide_hwifs[1].mate = NULL;
++	hwif->serialized = 0;
++	hwif->chipset = ide_unknown;
++	hwif->tuneproc = NULL;
++	hwif->drives[0].no_unmask = 0;
++	hwif->drives[1].no_unmask = 0;
++	hwif->mate = NULL;
+ }
+ 
+-#ifndef MODULE
+-/*
+- * init_dtc2278:
+- *
+- * called by ide.c when parsing command line
+- */
+-
+-void __init init_dtc2278 (void)
++static void __exit dtc2278_exit(void)
+ {
+-	probe_dtc2278();
++	dtc2278_release_hwif(&ide_hwifs[0]);
++	dtc2278_release_hwif(&ide_hwifs[1]);
+ }
+ 
+-#else
++module_init(dtc2278_init);
++module_exit(dtc2278_exit);
++#endif
+ 
+ MODULE_AUTHOR("See Local File");
+ MODULE_DESCRIPTION("support of DTC-2278 VLB IDE chipsets");
+ MODULE_LICENSE("GPL");
+-
+-static int __init dtc2278_mod_init(void)
+-{
+-	probe_dtc2278();
+-	if (ide_hwifs[0].chipset != ide_dtc2278 &&
+-	    ide_hwifs[1].chipset != ide_dtc2278) {
+-		dtc2278_release();
+-		return -ENODEV;
+-	}
+-	return 0;
+-}
+-module_init(dtc2278_mod_init);
+-
+-static void __exit dtc2278_mod_exit(void)
+-{
+-	dtc2278_release();
+-}
+-module_exit(dtc2278_mod_exit);
+-#endif
+-
+--- linux-2.6.0-test6/drivers/ide/legacy/hd98.c	2003-08-08 22:55:11.000000000 -0700
++++ 25/drivers/ide/legacy/hd98.c	2003-10-05 00:33:54.000000000 -0700
+@@ -652,10 +652,10 @@ static void do_hd_request (request_queue
+ 	enable_irq(HD_IRQ);
+ }
+ 
+-static int hd_ioctl(struct inode * inode, struct file * file,
++static int hd_ioctl(struct block_device *bdev, struct file *file,
+ 	unsigned int cmd, unsigned long arg)
+ {
+-	struct hd_i_struct *disk = inode->i_bdev->bd_disk->private_data;
++	struct hd_i_struct *disk = bdev->bd_disk->private_data;
+ 	struct hd_geometry *loc = (struct hd_geometry *) arg;
+ 	struct hd_geometry g; 
+ 
+@@ -666,7 +666,7 @@ static int hd_ioctl(struct inode * inode
+ 	g.heads = disk->head;
+ 	g.sectors = disk->sect;
+ 	g.cylinders = disk->cyl;
+-	g.start = get_start_sect(inode->i_bdev);
++	g.start = get_start_sect(bdev);
+ 	return copy_to_user(loc, &g, sizeof g) ? -EFAULT : 0; 
+ }
+ 
+--- linux-2.6.0-test6/drivers/ide/legacy/hd.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/drivers/ide/legacy/hd.c	2003-10-05 00:33:54.000000000 -0700
+@@ -656,10 +656,10 @@ static void do_hd_request (request_queue
+ 	enable_irq(HD_IRQ);
+ }
+ 
+-static int hd_ioctl(struct inode * inode, struct file * file,
++static int hd_ioctl(struct block_device *bdev, struct file *file,
+ 	unsigned int cmd, unsigned long arg)
+ {
+-	struct hd_i_struct *disk = inode->i_bdev->bd_disk->private_data;
++	struct hd_i_struct *disk = bdev->bd_disk->private_data;
+ 	struct hd_geometry *loc = (struct hd_geometry *) arg;
+ 	struct hd_geometry g; 
+ 
+@@ -670,7 +670,7 @@ static int hd_ioctl(struct inode * inode
+ 	g.heads = disk->head;
+ 	g.sectors = disk->sect;
+ 	g.cylinders = disk->cyl;
+-	g.start = get_start_sect(inode->i_bdev);
++	g.start = get_start_sect(bdev);
+ 	return copy_to_user(loc, &g, sizeof g) ? -EFAULT : 0; 
+ }
+ 
+--- linux-2.6.0-test6/drivers/ide/legacy/ht6560b.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ide/legacy/ht6560b.c	2003-10-05 00:33:24.000000000 -0700
+@@ -304,35 +304,16 @@ static void tune_ht6560b (ide_drive_t *d
+ #endif
+ }
+ 
+-void ht6560b_release (void)
+-{
+-	if (ide_hwifs[0].chipset != ide_ht6560b &&
+-	    ide_hwifs[1].chipset != ide_ht6560b)
+-                return;
+-
+-	ide_hwifs[0].chipset = ide_unknown;
+-	ide_hwifs[1].chipset = ide_unknown;
+-	ide_hwifs[0].tuneproc = NULL;
+-	ide_hwifs[1].tuneproc = NULL;
+-	ide_hwifs[0].selectproc = NULL;
+-	ide_hwifs[1].selectproc = NULL;
+-	ide_hwifs[0].serialized = 0;
+-	ide_hwifs[1].serialized = 0;
+-	ide_hwifs[0].mate = NULL;
+-	ide_hwifs[1].mate = NULL;
+-
+-	ide_hwifs[0].drives[0].drive_data = 0;
+-	ide_hwifs[0].drives[1].drive_data = 0;
+-	ide_hwifs[1].drives[0].drive_data = 0;
+-	ide_hwifs[1].drives[1].drive_data = 0;
+-	release_region(HT_CONFIG_PORT, 1);
+-}
+-
+-static int __init ht6560b_mod_init(void)
++/* Can be called directly from ide.c. */
++int __init ht6560b_init(void)
+ {
++	ide_hwif_t *hwif, *mate;
+ 	int t;
+ 
+-	if (!request_region(HT_CONFIG_PORT, 1, ide_hwifs[0].name)) {
++	hwif = &ide_hwifs[0];
++	mate = &ide_hwifs[1];
++
++	if (!request_region(HT_CONFIG_PORT, 1, hwif->name)) {
+ 		printk(KERN_NOTICE "%s: HT_CONFIG_PORT not found\n",
+ 			__FUNCTION__);
+ 		return -ENODEV;
+@@ -343,39 +324,33 @@ static int __init ht6560b_mod_init(void)
+ 		goto release_region;
+ 	}
+ 
+-	ide_hwifs[0].chipset = ide_ht6560b;
+-	ide_hwifs[1].chipset = ide_ht6560b;
+-	ide_hwifs[0].selectproc = &ht6560b_selectproc;
+-	ide_hwifs[1].selectproc = &ht6560b_selectproc;
+-	ide_hwifs[0].tuneproc = &tune_ht6560b;
+-	ide_hwifs[1].tuneproc = &tune_ht6560b;
+-	ide_hwifs[0].serialized = 1;  /* is this needed? */
+-	ide_hwifs[1].serialized = 1;  /* is this needed? */
+-	ide_hwifs[0].mate = &ide_hwifs[1];
+-	ide_hwifs[1].mate = &ide_hwifs[0];
+-	ide_hwifs[1].channel = 1;
++	hwif->chipset = ide_ht6560b;
++	hwif->selectproc = &ht6560b_selectproc;
++	hwif->tuneproc = &tune_ht6560b;
++	hwif->serialized = 1;	/* is this needed? */
++	hwif->mate = mate;
++
++	mate->chipset = ide_ht6560b;
++	mate->selectproc = &ht6560b_selectproc;
++	mate->tuneproc = &tune_ht6560b;
++	mate->serialized = 1;	/* is this needed? */
++	mate->mate = hwif;
++	mate->channel = 1;
+ 
+ 	/*
+ 	 * Setting default configurations for drives
+ 	 */
+ 	t = (HT_CONFIG_DEFAULT << 8);
+ 	t |= HT_TIMING_DEFAULT;
+-	ide_hwifs[0].drives[0].drive_data = t;
+-	ide_hwifs[0].drives[1].drive_data = t;
+-	t |= (HT_SECONDARY_IF << 8);
+-	ide_hwifs[1].drives[0].drive_data = t;
+-	ide_hwifs[1].drives[1].drive_data = t;
++	hwif->drives[0].drive_data = t;
++	hwif->drives[1].drive_data = t;
+ 
+-	probe_hwif_init(&ide_hwifs[0]);
+-	probe_hwif_init(&ide_hwifs[1]);
++	t |= (HT_SECONDARY_IF << 8);
++	mate->drives[0].drive_data = t;
++	mate->drives[1].drive_data = t;
+ 
+-#ifdef MODULE
+-	if (ide_hwifs[0].chipset != ide_ht6560b &&
+-	    ide_hwifs[1].chipset != ide_ht6560b) {
+-		ht6560b_release();
+-		return -ENODEV;
+-	}
+-#endif
++	probe_hwif_init(hwif);
++	probe_hwif_init(mate);
+ 
+ 	return 0;
+ 
+@@ -384,24 +359,34 @@ release_region:
+ 	return -ENODEV;
+ }
+ 
+-MODULE_AUTHOR("See Local File");
+-MODULE_DESCRIPTION("HT-6560B EIDE-controller support");
+-MODULE_LICENSE("GPL");
+-
+ #ifdef MODULE
+-static void __exit ht6560b_mod_exit(void)
++static void __exit ht6560b_release_hwif(ide_hwif_t *hwif)
+ {
+-        ht6560b_release();
++	if (hwif->chipset != ide_ht6560b)
++		return;
++
++	hwif->chipset = ide_unknown;
++	hwif->tuneproc = NULL;
++	hwif->selectproc = NULL;
++	hwif->serialized = 0;
++	hwif->mate = NULL;
++	hwif->channel = 0;
++
++	hwif->drives[0].drive_data = 0;
++	hwif->drives[1].drive_data = 0;
+ }
+ 
+-module_init(ht6560b_mod_init);
+-module_exit(ht6560b_mod_exit);
+-#else
+-/*
+- * called by ide.c when parsing command line
+- */
+-void __init init_ht6560b (void)
++static void __exit ht6560b_exit(void)
+ {
+-	ht6560b_mod_init();	/* ignore return value */
++	ht6560b_release_hwif(&ide_hwifs[0]);
++	ht6560b_release_hwif(&ide_hwifs[1]);
++	release_region(HT_CONFIG_PORT, 1);
+ }
++
++module_init(ht6560b_init);
++module_exit(ht6560b_exit);
+ #endif
++
++MODULE_AUTHOR("See Local File");
++MODULE_DESCRIPTION("HT-6560B EIDE-controller support");
++MODULE_LICENSE("GPL");
+--- linux-2.6.0-test6/drivers/ide/legacy/pdc4030.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ide/legacy/pdc4030.c	2003-10-05 00:33:24.000000000 -0700
+@@ -147,8 +147,6 @@ int pdc4030_identify(ide_drive_t *drive)
+ 	return pdc4030_cmd(drive, PROMISE_IDENTIFY);
+ }
+ 
+-int enable_promise_support;
+-
+ /*
+  * setup_pdc4030()
+  * Completes the setup of a Promise DC4030 controller card, once found.
+@@ -296,33 +294,24 @@ int __init detect_pdc4030(ide_hwif_t *hw
+ 	}
+ }
+ 
+-
+-int __init ide_probe_for_pdc4030(void)
++int __init pdc4030_init(void)
+ {
+ 	unsigned int	index;
+ 	ide_hwif_t	*hwif;
+ 
+-#ifndef MODULE
+-	if (enable_promise_support == 0)
+-		return;
+-#endif
+-
+ 	for (index = 0; index < MAX_HWIFS; index++) {
+ 		hwif = &ide_hwifs[index];
+ 		if (hwif->chipset == ide_unknown && detect_pdc4030(hwif)) {
+-#ifndef MODULE
+-			setup_pdc4030(hwif);
+-#else
+-			return setup_pdc4030(hwif);
+-#endif
++			if (!setup_pdc4030(hwif))
++				return -ENODEV;
++			return 0;
+ 		}
+ 	}
+-#ifdef MODULE
+-	return 0;
+-#endif
++	return -ENODEV;
+ }
+ 
+-static void __exit release_pdc4030(ide_hwif_t *hwif, ide_hwif_t *mate)
++#ifdef MODULE
++static void __exit pdc4030_release_hwif(ide_hwif_t *hwif)
+ {
+ 	hwif->chipset = ide_unknown;
+ 	hwif->selectproc = NULL;
+@@ -333,72 +322,24 @@ static void __exit release_pdc4030(ide_h
+ 	hwif->drives[1].keep_settings = 0;
+ 	hwif->drives[0].noprobe = 0;
+ 	hwif->drives[1].noprobe = 0;
+-
+-	if (mate != NULL) {
+-		mate->chipset = ide_unknown;
+-		mate->selectproc = NULL;
+-		mate->serialized = 0;
+-		mate->drives[0].io_32bit = 0;
+-		mate->drives[1].io_32bit = 0;
+-		mate->drives[0].keep_settings = 0;
+-		mate->drives[1].keep_settings = 0;
+-		mate->drives[0].noprobe = 0;
+-		mate->drives[1].noprobe = 0;
+-	}
+ }
+ 
+-#ifndef MODULE
+-/*
+- * init_pdc4030:
+- *
+- * called by ide.c when parsing command line
+- */
+-
+-void __init init_pdc4030(void)
++static void __exit pdc4030_exit(void)
+ {
+-	enable_promise_support = 1;
++	unsigned int index;
++
++	for (index = 0; index < MAX_HWIFS; index++)
++		pdc4030_release_hwif(&ide_hwifs[index]);
+ }
+ 
+-#else
++module_init(pdc4030_init);
++module_exit(pdc4030_exit);
++#endif
+ 
+ MODULE_AUTHOR("Peter Denison");
+ MODULE_DESCRIPTION("Support of Promise 4030 VLB series IDE chipsets");
+ MODULE_LICENSE("GPL");
+ 
+-static int __init pdc4030_mod_init(void)
+-{
+-	if (enable_promise_support == 0)
+-		enable_promise_support = 1;
+-
+-	if (!ide_probe_for_pdc4030())
+-		return -ENODEV;
+-        return 0;
+-}
+-module_init(pdc4030_mod_init);
+-
+-static void __exit pdc4030_mod_exit(void)
+-{
+-	unsigned int    index;
+-	ide_hwif_t      *hwif;
+-
+-	if (enable_promise_support == 0)
+-		return;
+- 
+-	for (index = 0; index < MAX_HWIFS; index++) {
+-		hwif = &ide_hwifs[index];
+-		if (hwif->chipset == ide_pdc4030) {
+-			ide_hwif_t *mate = &ide_hwifs[hwif->index+1];
+-			if (mate->chipset == ide_pdc4030)
+-				release_pdc4030(hwif, mate);
+-			else
+-				release_pdc4030(hwif, NULL);
+-                }
+-        }
+-	enable_promise_support = 0;
+-}
+-module_exit(pdc4030_mod_exit);
+-#endif
+-
+ /*
+  * promise_read_intr() is the handler for disk read/multread interrupts
+  */
+--- linux-2.6.0-test6/drivers/ide/legacy/qd65xx.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ide/legacy/qd65xx.c	2003-10-05 00:33:24.000000000 -0700
+@@ -338,12 +338,12 @@ static int __init qd_testreg(int port)
+  * called to setup an ata channel : adjusts attributes & links for tuning
+  */
+ 
+-void __init qd_setup (int unit, int base, int config, unsigned int data0, unsigned int data1, void (*tuneproc) (ide_drive_t *, u8 pio))
++static void __init qd_setup(ide_hwif_t *hwif, int base, int config,
++			    unsigned int data0, unsigned int data1,
++			    void (*tuneproc) (ide_drive_t *, u8 pio))
+ {
+-	ide_hwif_t *hwif = &ide_hwifs[unit];
+-
+ 	hwif->chipset = ide_qd65xx;
+-	hwif->channel = unit;
++	hwif->channel = hwif->index;
+ 	hwif->select_data = base;
+ 	hwif->config_data = config;
+ 	hwif->drives[0].drive_data = data0;
+@@ -354,19 +354,20 @@ void __init qd_setup (int unit, int base
+ 	probe_hwif_init(hwif);
+ }
+ 
++#ifdef MODULE
+ /*
+  * qd_unsetup:
+  *
+  * called to unsetup an ata channel : back to default values, unlinks tuning
+  */
+-static void __exit qd_unsetup (int unit)
++static void __exit qd_unsetup(ide_hwif_t *hwif)
+ {
+-	ide_hwif_t *hwif = &ide_hwifs[unit];
+ 	u8 config = hwif->config_data;
+ 	int base = hwif->select_data;
+ 	void *tuneproc = (void *) hwif->tuneproc;
+ 
+-	if (!(hwif->chipset == ide_qd65xx)) return;
++	if (hwif->chipset != ide_qd65xx)
++		return;
+ 
+ 	printk(KERN_NOTICE "%s: back to defaults\n", hwif->name);
+ 
+@@ -381,13 +382,14 @@ static void __exit qd_unsetup (int unit)
+ 			qd_write_reg(QD6580_DEF_DATA, QD_TIMREG(&hwif->drives[0]));
+ 			qd_write_reg(QD6580_DEF_DATA2, QD_TIMREG(&hwif->drives[1]));
+ 		} else {
+-			qd_write_reg(unit?QD6580_DEF_DATA2:QD6580_DEF_DATA, QD_TIMREG(&hwif->drives[0]));
++			qd_write_reg(hwif->channel ? QD6580_DEF_DATA2 : QD6580_DEF_DATA, QD_TIMREG(&hwif->drives[0]));
+ 		}
+ 	} else {
+ 		printk(KERN_WARNING "Unknown qd65xx tuning fonction !\n");
+ 		printk(KERN_WARNING "keeping settings !\n");
+ 	}
+ }
++#endif
+ 
+ /*
+  * qd_probe:
+@@ -396,8 +398,9 @@ static void __exit qd_unsetup (int unit)
+  * return 1 if another qd may be probed
+  */
+ 
+-int __init qd_probe (int base)
++static int __init qd_probe(int base)
+ {
++	ide_hwif_t *hwif;
+ 	u8 config;
+ 	u8 unit;
+ 
+@@ -414,9 +417,8 @@ int __init qd_probe (int base)
+ 
+ 		/* qd6500 found */
+ 
+-		printk(KERN_NOTICE "%s: qd6500 at %#x\n",
+-			ide_hwifs[unit].name, base);
+-		
++		hwif = &ide_hwifs[unit];
++		printk(KERN_NOTICE "%s: qd6500 at %#x\n", hwif->name, base);
+ 		printk(KERN_DEBUG "qd6500: config=%#x, ID3=%u\n",
+ 			config, QD_ID3);
+ 		
+@@ -425,8 +427,8 @@ int __init qd_probe (int base)
+ 			return 1;
+ 		}
+ 
+-		qd_setup(unit, base, config, QD6500_DEF_DATA,
+-			QD6500_DEF_DATA, &qd6500_tune_drive);
++		qd_setup(hwif, base, config, QD6500_DEF_DATA, QD6500_DEF_DATA,
++			 &qd6500_tune_drive);
+ 		return 1;
+ 	}
+ 
+@@ -448,25 +450,31 @@ int __init qd_probe (int base)
+ 
+ 		if (control & QD_CONTR_SEC_DISABLED) {
+ 			/* secondary disabled */
++
++			hwif = &ide_hwifs[unit];
+ 			printk(KERN_INFO "%s: qd6580: single IDE board\n",
+-					ide_hwifs[unit].name);
+-			qd_setup(unit, base, config | (control << 8),
+-				QD6580_DEF_DATA, QD6580_DEF_DATA2,
+-				&qd6580_tune_drive);
++					 hwif->name);
++			qd_setup(hwif, base, config | (control << 8),
++				 QD6580_DEF_DATA, QD6580_DEF_DATA2,
++				 &qd6580_tune_drive);
+ 			qd_write_reg(QD_DEF_CONTR,QD_CONTROL_PORT);
+ 
+ 			return 1;
+ 		} else {
++			ide_hwif_t *mate;
++
++			hwif = &ide_hwifs[0];
++			mate = &ide_hwifs[1];
+ 			/* secondary enabled */
+ 			printk(KERN_INFO "%s&%s: qd6580: dual IDE board\n",
+-					ide_hwifs[0].name,ide_hwifs[1].name);
++					hwif->name, mate->name);
+ 
+-			qd_setup(0, base, config | (control << 8),
+-				QD6580_DEF_DATA, QD6580_DEF_DATA,
+-				&qd6580_tune_drive);
+-			qd_setup(1, base, config | (control << 8),
+-				QD6580_DEF_DATA2, QD6580_DEF_DATA2,
+-				&qd6580_tune_drive);
++			qd_setup(hwif, base, config | (control << 8),
++				 QD6580_DEF_DATA, QD6580_DEF_DATA,
++				 &qd6580_tune_drive);
++			qd_setup(mate, base, config | (control << 8),
++				 QD6580_DEF_DATA2, QD6580_DEF_DATA2,
++				 &qd6580_tune_drive);
+ 			qd_write_reg(QD_DEF_CONTR,QD_CONTROL_PORT);
+ 
+ 			return 0; /* no other qd65xx possible */
+@@ -476,38 +484,28 @@ int __init qd_probe (int base)
+ 	return 1;
+ }
+ 
+-#ifndef MODULE
+-/*
+- * init_qd65xx:
+- *
+- * called by ide.c when parsing command line
+- */
+-
+-void __init init_qd65xx (void)
+-{
+-	if (qd_probe(0x30)) qd_probe(0xb0);
+-}
+-
+-#else
+-
+-MODULE_AUTHOR("Samuel Thibault");
+-MODULE_DESCRIPTION("support of qd65xx vlb ide chipset");
+-MODULE_LICENSE("GPL");
+-
+-static int __init qd65xx_mod_init(void)
++/* Can be called directly from ide.c. */
++int __init qd65xx_init(void)
+ {
+-	if (qd_probe(0x30)) qd_probe(0xb0);
++	if (qd_probe(0x30))
++		qd_probe(0xb0);
+ 	if (ide_hwifs[0].chipset != ide_qd65xx &&
+ 	    ide_hwifs[1].chipset != ide_qd65xx)
+ 		return -ENODEV;
+ 	return 0;
+ }
+-module_init(qd65xx_mod_init);
+ 
+-static void __exit qd65xx_mod_exit(void)
++#ifdef MODULE
++static void __exit qd65xx_exit(void)
+ {
+-	qd_unsetup(0);
+-	qd_unsetup(1);
++	qd_unsetup(&ide_hwifs[0]);
++	qd_unsetup(&ide_hwifs[1]);
+ }
+-module_exit(qd65xx_mod_exit);
++
++module_init(qd65xx_init);
++module_exit(qd65xx_exit);
+ #endif
++
++MODULE_AUTHOR("Samuel Thibault");
++MODULE_DESCRIPTION("support of qd65xx vlb ide chipset");
++MODULE_LICENSE("GPL");
+--- linux-2.6.0-test6/drivers/ide/legacy/umc8672.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ide/legacy/umc8672.c	2003-10-05 00:33:24.000000000 -0700
+@@ -124,16 +124,16 @@ static void tune_umc (ide_drive_t *drive
+ 	spin_unlock_irqrestore(&ide_lock, flags);
+ }
+ 
+-int __init probe_umc8672 (void)
++static int __init umc8672_probe(void)
+ {
+ 	unsigned long flags;
++	ide_hwif_t *hwif, *mate;
+ 
+-	local_irq_save(flags);
+ 	if (!request_region(0x108, 2, "umc8672")) {
+-		local_irq_restore(flags);
+ 		printk(KERN_ERR "umc8672: ports 0x108-0x109 already in use.\n");
+ 		return 1;
+ 	}
++	local_irq_save(flags);
+ 	outb_p(0x5A,0x108); /* enable umc */
+ 	if (in_umc (0xd5) != 0xa0) {
+ 		local_irq_restore(flags);
+@@ -146,82 +146,62 @@ int __init probe_umc8672 (void)
+ 	umc_set_speeds (current_speeds);
+ 	local_irq_restore(flags);
+ 
+-	ide_hwifs[0].chipset = ide_umc8672;
+-	ide_hwifs[1].chipset = ide_umc8672;
+-	ide_hwifs[0].tuneproc = &tune_umc;
+-	ide_hwifs[1].tuneproc = &tune_umc;
+-	ide_hwifs[0].mate = &ide_hwifs[1];
+-	ide_hwifs[1].mate = &ide_hwifs[0];
+-	ide_hwifs[1].channel = 1;
++	hwif = &ide_hwifs[0];
++	mate = &ide_hwifs[1];
+ 
+-	probe_hwif_init(&ide_hwifs[0]);
+-	probe_hwif_init(&ide_hwifs[1]);
++	hwif->chipset = ide_umc8672;
++	hwif->tuneproc = &tune_umc;
++	hwif->mate = mate;
++
++	mate->chipset = ide_umc8672;
++	mate->tuneproc = &tune_umc;
++	mate->mate = hwif;
++	mate->channel = 1;
++
++	probe_hwif_init(hwif);
++	probe_hwif_init(mate);
+ 
+ 	return 0;
+ }
+ 
+-static void umc8672_release (void)
++/* Can be called directly from ide.c. */
++int __init umc8672_init(void)
+ {
+-	unsigned long flags;
++	if (umc8672_probe())
++		return -ENODEV;
++	return 0;
++}
+ 
+-	local_irq_save(flags);
+-	if (ide_hwifs[0].chipset != ide_umc8672 &&
+-	    ide_hwifs[1].chipset != ide_umc8672) {
+-		local_irq_restore(flags);
++#ifdef MODULE
++static void __exit umc8672_release_hwif(ide_hwif_t *hwif)
++{
++	if (hwif->chipset != ide_umc8672)
+ 		return;
+-	}
+ 
+-	ide_hwifs[0].chipset = ide_unknown;
+-	ide_hwifs[1].chipset = ide_unknown;	
+-	ide_hwifs[0].tuneproc = NULL;
+-	ide_hwifs[1].tuneproc = NULL;
+-	ide_hwifs[0].mate = NULL;
+-	ide_hwifs[1].mate = NULL;
+-	ide_hwifs[0].channel = 0;
+-	ide_hwifs[1].channel = 0;
+-
+-	outb_p(0xa5,0x108); /* disable umc */
+-
+-	release_region(0x108, 2);
+-	local_irq_restore(flags);
++	hwif->chipset = ide_unknown;
++	hwif->tuneproc = NULL;
++	hwif->mate = NULL;
++	hwif->channel = 0;
+ }
+ 
+-#ifndef MODULE
+-/*
+- * init_umc8672:
+- *
+- * called by ide.c when parsing command line
+- */
+-
+-void __init init_umc8672 (void)
++static void __exit umc8672_exit(void)
+ {
+-	if (probe_umc8672())
+-		printk(KERN_ERR "init_umc8672: umc8672 controller not found.\n");
+-}
++	unsigned long flags;
+ 
+-#else
++	umc8672_release_hwif(&ide_hwifs[0]);
++	umc8672_release_hwif(&ide_hwifs[1]);
+ 
+-MODULE_AUTHOR("Wolfram Podien");
+-MODULE_DESCRIPTION("Support for UMC 8672 IDE chipset");
+-MODULE_LICENSE("GPL");
++	local_irq_save(flags);
++	outb_p(0xa5, 0x108);	/* disable umc */
++	local_irq_restore(flags);
+ 
+-static int __init umc8672_mod_init(void)
+-{
+-	if (probe_umc8672())
+-		return -ENODEV;
+-	if (ide_hwifs[0].chipset != ide_umc8672 &&
+-	    ide_hwifs[1].chipset != ide_umc8672) {
+-		umc8672_release();
+-		return -ENODEV;
+-	}
+-	return 0;
++	release_region(0x108, 2);
+ }
+-module_init(umc8672_mod_init);
+ 
+-static void __exit umc8672_mod_exit(void)
+-{
+-        umc8672_release();
+-}
+-module_exit(umc8672_mod_exit);
++module_init(umc8672_init);
++module_exit(umc8672_exit);
+ #endif
+ 
++MODULE_AUTHOR("Wolfram Podien");
++MODULE_DESCRIPTION("Support for UMC 8672 IDE chipset");
++MODULE_LICENSE("GPL");
+--- linux-2.6.0-test6/drivers/ide/pci/amd74xx.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/drivers/ide/pci/amd74xx.c	2003-10-05 00:33:24.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Version 2.9
++ * Version 2.11
+  *
+  * AMD 755/756/766/8111 and nVidia nForce IDE driver for Linux.
+  *
+@@ -65,7 +65,6 @@ static struct amd_ide_chip {
+ };
+ 
+ static struct amd_ide_chip *amd_config;
+-static unsigned char amd_enabled;
+ static unsigned int amd_80w;
+ static unsigned int amd_clock;
+ 
+@@ -103,7 +102,7 @@ static int amd74xx_get_info(char *buffer
+ 
+ 	amd_print("----------AMD BusMastering IDE Configuration----------------");
+ 
+-	amd_print("Driver Version:                     2.9");
++	amd_print("Driver Version:                     2.11");
+ 	amd_print("South Bridge:                       %s", pci_name(bmide_dev));
+ 
+ 	pci_read_config_byte(dev, PCI_REVISION_ID, &t);
+@@ -250,9 +249,6 @@ static int amd_set_drive(ide_drive_t *dr
+ 
+ static void amd74xx_tune_drive(ide_drive_t *drive, u8 pio)
+ {
+-	if (!((amd_enabled >> HWIF(drive)->channel) & 1))
+-		return;
+-
+ 	if (pio == 255) {
+ 		amd_set_drive(drive, ide_find_best_mode(drive, XFER_PIO | XFER_EPIO));
+ 		return;
+@@ -330,9 +326,6 @@ static unsigned int __init init_chipset_
+ 			break;
+ 	}
+ 
+-	pci_read_config_dword(dev, AMD_IDE_ENABLE, &u);
+-	amd_enabled = ((u & 1) ? 2 : 0) | ((u & 2) ? 1 : 0);
+-
+ /*
+  * Take care of prefetch & postwrite.
+  */
+@@ -408,8 +401,8 @@ static void __init init_hwif_amd74xx(ide
+         hwif->mwdma_mask = 0x07;
+         hwif->swdma_mask = 0x07;
+ 
+-        if (!(hwif->udma_four))
+-                hwif->udma_four = ((amd_enabled & amd_80w) >> hwif->channel) & 1;
++	if (!hwif->udma_four)
++		hwif->udma_four = (amd_80w >> hwif->channel) & 1;
+         hwif->ide_dma_check = &amd74xx_ide_dma_check;
+         if (!noautodma)
+                 hwif->autodma = 1;
+@@ -417,16 +410,6 @@ static void __init init_hwif_amd74xx(ide
+         hwif->drives[1].autodma = hwif->autodma;
+ }
+ 
+-/*
+- * We allow the BM-DMA driver only work on enabled interfaces.
+- */
+-
+-static void __init init_dma_amd74xx(ide_hwif_t *hwif, unsigned long dmabase)
+-{
+-	if ((amd_enabled >> hwif->channel) & 1)
+-		ide_setup_dma(hwif, dmabase, 8);
+-}
+-
+ extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *);
+ 
+ static int __devinit amd74xx_probe(struct pci_dev *dev, const struct pci_device_id *id)
+--- linux-2.6.0-test6/drivers/ide/pci/amd74xx.h	2003-06-14 12:17:57.000000000 -0700
++++ 25/drivers/ide/pci/amd74xx.h	2003-10-05 00:33:24.000000000 -0700
+@@ -27,7 +27,6 @@ static ide_pci_host_proc_t amd74xx_procs
+ 
+ static unsigned int init_chipset_amd74xx(struct pci_dev *, const char *);
+ static void init_hwif_amd74xx(ide_hwif_t *);
+-static void init_dma_amd74xx(ide_hwif_t *, unsigned long);
+ 
+ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
+ 	{	/* 0 */
+@@ -35,9 +34,7 @@ static ide_pci_device_t amd74xx_chipsets
+ 		.device		= PCI_DEVICE_ID_AMD_COBRA_7401,
+ 		.name		= "AMD7401",
+ 		.init_chipset	= init_chipset_amd74xx,
+-		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_amd74xx,
+-		.init_dma	= init_dma_amd74xx,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
+@@ -48,9 +45,7 @@ static ide_pci_device_t amd74xx_chipsets
+ 		.device		= PCI_DEVICE_ID_AMD_VIPER_7409,
+ 		.name		= "AMD7409",
+ 		.init_chipset	= init_chipset_amd74xx,
+-		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_amd74xx,
+-		.init_dma	= init_dma_amd74xx,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
+@@ -61,9 +56,7 @@ static ide_pci_device_t amd74xx_chipsets
+ 		.device		= PCI_DEVICE_ID_AMD_VIPER_7411,
+ 		.name		= "AMD7411",
+ 		.init_chipset	= init_chipset_amd74xx,
+-		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_amd74xx,
+-		.init_dma	= init_dma_amd74xx,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
+@@ -74,9 +67,7 @@ static ide_pci_device_t amd74xx_chipsets
+ 		.device		= PCI_DEVICE_ID_AMD_OPUS_7441,
+ 		.name		= "AMD7441",
+ 		.init_chipset	= init_chipset_amd74xx,
+-		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_amd74xx,
+-		.init_dma	= init_dma_amd74xx,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
+@@ -87,9 +78,7 @@ static ide_pci_device_t amd74xx_chipsets
+ 		.device		= PCI_DEVICE_ID_AMD_8111_IDE,
+ 		.name		= "AMD8111",
+ 		.init_chipset	= init_chipset_amd74xx,
+-		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_amd74xx,
+-		.init_dma	= init_dma_amd74xx,
+ 		.autodma	= AUTODMA,
+ 		.channels	= 2,
+ 		.enablebits	= {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
+@@ -101,9 +90,7 @@ static ide_pci_device_t amd74xx_chipsets
+ 		.device		= PCI_DEVICE_ID_NVIDIA_NFORCE_IDE,
+ 		.name		= "NFORCE",
+ 		.init_chipset	= init_chipset_amd74xx,
+-		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_amd74xx,
+-		.init_dma	= init_dma_amd74xx,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
+@@ -115,9 +102,7 @@ static ide_pci_device_t amd74xx_chipsets
+ 		.device		= PCI_DEVICE_ID_NVIDIA_NFORCE2_IDE,
+ 		.name		= "NFORCE2",
+ 		.init_chipset	= init_chipset_amd74xx,
+-		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_amd74xx,
+-		.init_dma	= init_dma_amd74xx,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x50,0x02,0x02}, {0x50,0x01,0x01}},
+--- linux-2.6.0-test6/drivers/ide/pci/cmd64x.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ide/pci/cmd64x.c	2003-10-05 00:33:24.000000000 -0700
+@@ -742,11 +742,6 @@ static void __init init_hwif_cmd64x (ide
+ 	hwif->drives[1].autodma = hwif->autodma;
+ }
+ 
+-static void __init init_dma_cmd64x (ide_hwif_t *hwif, unsigned long dmabase)
+-{
+-	ide_setup_dma(hwif, dmabase, 8);
+-}
+-
+ extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *);
+ 
+ static int __devinit cmd64x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
+--- linux-2.6.0-test6/drivers/ide/pci/cmd64x.h	2003-06-14 12:18:08.000000000 -0700
++++ 25/drivers/ide/pci/cmd64x.h	2003-10-05 00:33:24.000000000 -0700
+@@ -81,7 +81,6 @@ static ide_pci_host_proc_t cmd64x_procs[
+ 
+ static unsigned int init_chipset_cmd64x(struct pci_dev *, const char *);
+ static void init_hwif_cmd64x(ide_hwif_t *);
+-static void init_dma_cmd64x(ide_hwif_t *, unsigned long);
+ 
+ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
+ 	{	/* 0 */
+@@ -91,7 +90,6 @@ static ide_pci_device_t cmd64x_chipsets[
+ 		.init_chipset	= init_chipset_cmd64x,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_cmd64x,
+-		.init_dma	= init_dma_cmd64x,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+@@ -104,7 +102,6 @@ static ide_pci_device_t cmd64x_chipsets[
+ 		.init_chipset	= init_chipset_cmd64x,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_cmd64x,
+-		.init_dma	= init_dma_cmd64x,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x00,0x00,0x00}, {0x51,0x80,0x80}},
+@@ -117,7 +114,6 @@ static ide_pci_device_t cmd64x_chipsets[
+ 		.init_chipset	= init_chipset_cmd64x,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_cmd64x,
+-		.init_dma	= init_dma_cmd64x,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+@@ -130,7 +126,6 @@ static ide_pci_device_t cmd64x_chipsets[
+ 		.init_chipset	= init_chipset_cmd64x,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_cmd64x,
+-		.init_dma	= init_dma_cmd64x,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+--- linux-2.6.0-test6/drivers/ide/pci/cs5530.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ide/pci/cs5530.c	2003-10-05 00:33:24.000000000 -0700
+@@ -404,19 +404,6 @@ static void __init init_hwif_cs5530 (ide
+ 	hwif->drives[1].autodma = hwif->autodma;
+ }
+ 
+-/**
+- *	init_dma_cs5530		-	set up for DMA
+- *	@hwif: interface
+- *	@dmabase: DMA base address
+- *
+- *	FIXME: this can go away
+- */
+- 
+-static void __init init_dma_cs5530 (ide_hwif_t *hwif, unsigned long dmabase)
+-{
+-	ide_setup_dma(hwif, dmabase, 8);
+-}
+-
+ extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *);
+ 
+ 
+--- linux-2.6.0-test6/drivers/ide/pci/cs5530.h	2003-06-14 12:17:57.000000000 -0700
++++ 25/drivers/ide/pci/cs5530.h	2003-10-05 00:33:24.000000000 -0700
+@@ -27,7 +27,6 @@ static ide_pci_host_proc_t cs5530_procs[
+ 
+ static unsigned int init_chipset_cs5530(struct pci_dev *, const char *);
+ static void init_hwif_cs5530(ide_hwif_t *);
+-static void init_dma_cs5530(ide_hwif_t *, unsigned long);
+ 
+ static ide_pci_device_t cs5530_chipsets[] __devinitdata = {
+ 	{	/* 0 */
+@@ -37,7 +36,6 @@ static ide_pci_device_t cs5530_chipsets[
+ 		.init_chipset	= init_chipset_cs5530,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_cs5530,
+-		.init_dma	= init_dma_cs5530,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+--- linux-2.6.0-test6/drivers/ide/pci/generic.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ide/pci/generic.c	2003-10-05 00:33:24.000000000 -0700
+@@ -72,11 +72,6 @@ static void __init init_hwif_generic (id
+ 	hwif->drives[1].autodma = hwif->autodma;
+ }
+ 
+-static void init_dma_generic (ide_hwif_t *hwif, unsigned long dmabase)
+-{
+-	ide_setup_dma(hwif, dmabase, 8);
+-}
+-
+ extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *);
+ 
+ #if 0
+--- linux-2.6.0-test6/drivers/ide/pci/generic.h	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ide/pci/generic.h	2003-10-05 00:33:24.000000000 -0700
+@@ -7,7 +7,6 @@
+ 
+ static unsigned int init_chipset_generic(struct pci_dev *, const char *);
+ static void init_hwif_generic(ide_hwif_t *);
+-static void init_dma_generic(ide_hwif_t *, unsigned long);
+ 
+ static ide_pci_device_t generic_chipsets[] __devinitdata = {
+ 	{	/* 0 */
+@@ -17,7 +16,6 @@ static ide_pci_device_t generic_chipsets
+ 		.init_chipset	= init_chipset_generic,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_generic,
+-		.init_dma	= init_dma_generic,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x43,0x08,0x08}, {0x47,0x08,0x08}},
+@@ -30,7 +28,6 @@ static ide_pci_device_t generic_chipsets
+ 		.init_chipset	= init_chipset_generic,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_generic,
+-		.init_dma	= init_dma_generic,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+@@ -43,7 +40,6 @@ static ide_pci_device_t generic_chipsets
+ 		.init_chipset	= init_chipset_generic,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_generic,
+-		.init_dma	= init_dma_generic,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+@@ -56,7 +52,6 @@ static ide_pci_device_t generic_chipsets
+ 		.init_chipset	= init_chipset_generic,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_generic,
+-		.init_dma	= init_dma_generic,
+ 		.channels	= 2,
+ 		.autodma	= NODMA,
+ 		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+@@ -69,7 +64,6 @@ static ide_pci_device_t generic_chipsets
+ 		.init_chipset	= init_chipset_generic,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_generic,
+-		.init_dma	= init_dma_generic,
+ 		.channels	= 2,
+ 		.autodma	= NODMA,
+ 		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+@@ -82,7 +76,6 @@ static ide_pci_device_t generic_chipsets
+ 		.init_chipset	= init_chipset_generic,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_generic,
+-		.init_dma	= init_dma_generic,
+ 		.channels	= 2,
+ 		.autodma	= NODMA,
+ 		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+@@ -95,7 +88,6 @@ static ide_pci_device_t generic_chipsets
+ 		.init_chipset	= init_chipset_generic,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_generic,
+-		.init_dma	= init_dma_generic,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+@@ -108,7 +100,6 @@ static ide_pci_device_t generic_chipsets
+ 		.init_chipset	= init_chipset_generic,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_generic,
+-		.init_dma	= init_dma_generic,
+ 		.channels	= 2,
+ 		.autodma	= NOAUTODMA,
+ 		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+@@ -121,7 +112,6 @@ static ide_pci_device_t generic_chipsets
+ 		.init_chipset	= init_chipset_generic,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_generic,
+-		.init_dma	= init_dma_generic,
+ 		.channels	= 2,
+ 		.autodma	= NOAUTODMA,
+ 		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+@@ -134,7 +124,6 @@ static ide_pci_device_t generic_chipsets
+ 		.init_chipset	= init_chipset_generic,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_generic,
+-		.init_dma	= init_dma_generic,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+@@ -157,7 +146,6 @@ static ide_pci_device_t unknown_chipset[
+ 		.init_chipset	= init_chipset_generic,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_generic,
+-		.init_dma	= init_dma_generic,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+--- linux-2.6.0-test6/drivers/ide/pci/hpt34x.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ide/pci/hpt34x.c	2003-10-05 00:33:24.000000000 -0700
+@@ -315,11 +315,6 @@ static void __init init_hwif_hpt34x (ide
+ 	hwif->drives[1].autodma = hwif->autodma;
+ }
+ 
+-static void __init init_dma_hpt34x (ide_hwif_t *hwif, unsigned long dmabase)
+-{
+-	ide_setup_dma(hwif, dmabase, 8);
+-}
+-
+ extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *);
+ 
+ static int __devinit hpt34x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
+--- linux-2.6.0-test6/drivers/ide/pci/hpt34x.h	2003-06-14 12:17:56.000000000 -0700
++++ 25/drivers/ide/pci/hpt34x.h	2003-10-05 00:33:24.000000000 -0700
+@@ -33,7 +33,6 @@ static ide_pci_host_proc_t hpt34x_procs[
+ 
+ static unsigned int init_chipset_hpt34x(struct pci_dev *, const char *);
+ static void init_hwif_hpt34x(ide_hwif_t *);
+-static void init_dma_hpt34x(ide_hwif_t *, unsigned long);
+ 
+ static ide_pci_device_t hpt34x_chipsets[] __devinitdata = {
+ 	{	/* 0 */
+@@ -43,7 +42,6 @@ static ide_pci_device_t hpt34x_chipsets[
+ 		.init_chipset	= init_chipset_hpt34x,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_hpt34x,
+-		.init_dma	= init_dma_hpt34x,
+ 		.channels	= 2,
+ 		.autodma	= NOAUTODMA,
+ 		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+--- linux-2.6.0-test6/drivers/ide/pci/it8172.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ide/pci/it8172.c	2003-10-05 00:33:24.000000000 -0700
+@@ -284,11 +284,6 @@ static void __init init_hwif_it8172 (ide
+ 	hwif->drives[1].autodma = hwif->autodma;
+ }
+ 
+-static void __init init_dma_it8172 (ide_hwif_t *hwif, unsigned long dmabase)
+-{
+-	ide_setup_dma(hwif, dmabase, 8);
+-}
+-
+ extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *);
+ 
+ static int __devinit it8172_init_one(struct pci_dev *dev, const struct pci_device_id *id)
+--- linux-2.6.0-test6/drivers/ide/pci/it8172.h	2003-06-14 12:18:08.000000000 -0700
++++ 25/drivers/ide/pci/it8172.h	2003-10-05 00:33:24.000000000 -0700
+@@ -17,7 +17,6 @@ static int it8172_config_chipset_for_dma
+ static void init_setup_it8172(struct pci_dev *, ide_pci_device_t *);
+ static unsigned int init_chipset_it8172(struct pci_dev *, const char *);
+ static void init_hwif_it8172(ide_hwif_t *);
+-static void init_dma_it8172(ide_hwif_t *, unsigned long);
+ 
+ static ide_pci_device_t it8172_chipsets[] __devinitdata = {
+ 	{	/* 0 */
+@@ -28,7 +27,6 @@ static ide_pci_device_t it8172_chipsets[
+ 		.init_chipset	= init_chipset_it8172,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_it8172,
+-                .init_dma	= init_dma_it8172,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x00,0x00,0x00}, {0x40,0x00,0x01}},
+--- linux-2.6.0-test6/drivers/ide/pci/Makefile	2003-06-14 12:17:59.000000000 -0700
++++ 25/drivers/ide/pci/Makefile	2003-10-05 00:36:28.000000000 -0700
+@@ -18,10 +18,10 @@ obj-$(CONFIG_BLK_DEV_NS87415)		+= ns8741
+ obj-$(CONFIG_BLK_DEV_OPTI621)		+= opti621.o
+ obj-$(CONFIG_BLK_DEV_PDC202XX_OLD)	+= pdc202xx_old.o
+ obj-$(CONFIG_BLK_DEV_PDC202XX_NEW)	+= pdc202xx_new.o
+-obj-$(CONFIG_BLK_DEV_PDC_ADMA)		+= pdcadma.o ide-adma.o
+ obj-$(CONFIG_BLK_DEV_PIIX)		+= piix.o
+ obj-$(CONFIG_BLK_DEV_RZ1000)		+= rz1000.o
+ obj-$(CONFIG_BLK_DEV_SVWKS)		+= serverworks.o
++obj-$(CONFIG_BLK_DEV_SGIIOC4)		+= sgiioc4.o
+ obj-$(CONFIG_BLK_DEV_SIIMAGE)		+= siimage.o
+ obj-$(CONFIG_BLK_DEV_SIS5513)		+= sis5513.o
+ obj-$(CONFIG_BLK_DEV_SL82C105)		+= sl82c105.o
+--- linux-2.6.0-test6/drivers/ide/pci/ns87415.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ide/pci/ns87415.c	2003-10-05 00:33:24.000000000 -0700
+@@ -217,11 +217,6 @@ static void __init init_hwif_ns87415 (id
+ 	hwif->drives[1].autodma = hwif->autodma;
+ }
+ 
+-static void __init init_dma_ns87415 (ide_hwif_t *hwif, unsigned long dmabase)
+-{
+-	ide_setup_dma(hwif, dmabase, 8);
+-}
+-
+ extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *);
+ 
+ static int __devinit ns87415_init_one(struct pci_dev *dev, const struct pci_device_id *id)
+--- linux-2.6.0-test6/drivers/ide/pci/ns87415.h	2003-06-14 12:17:57.000000000 -0700
++++ 25/drivers/ide/pci/ns87415.h	2003-10-05 00:33:24.000000000 -0700
+@@ -6,7 +6,6 @@
+ #include <linux/ide.h>
+ 
+ static void init_hwif_ns87415(ide_hwif_t *);
+-static void init_dma_ns87415(ide_hwif_t *, unsigned long);
+ 
+ static ide_pci_device_t ns87415_chipsets[] __devinitdata = {
+ 	{	/* 0 */
+@@ -16,7 +15,6 @@ static ide_pci_device_t ns87415_chipsets
+ 		.init_chipset	= NULL,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_ns87415,
+-                .init_dma	= init_dma_ns87415,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+--- linux-2.6.0-test6/drivers/ide/pci/opti621.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ide/pci/opti621.c	2003-10-05 00:33:24.000000000 -0700
+@@ -348,11 +348,6 @@ static void __init init_hwif_opti621 (id
+ 	hwif->drives[1].autodma = hwif->autodma;
+ }
+ 
+-static void __init init_dma_opti621 (ide_hwif_t *hwif, unsigned long dmabase)
+-{
+-	ide_setup_dma(hwif, dmabase, 8);
+-}
+-
+ extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *);
+ 
+ static void __init init_setup_opti621 (struct pci_dev *dev, ide_pci_device_t *d)
+--- linux-2.6.0-test6/drivers/ide/pci/opti621.h	2003-06-14 12:18:33.000000000 -0700
++++ 25/drivers/ide/pci/opti621.h	2003-10-05 00:33:24.000000000 -0700
+@@ -7,7 +7,6 @@
+ 
+ static void init_setup_opti621(struct pci_dev *, ide_pci_device_t *);
+ static void init_hwif_opti621(ide_hwif_t *);
+-static void init_dma_opti621(ide_hwif_t *, unsigned long);
+ 
+ static ide_pci_device_t opti621_chipsets[] __devinitdata = {
+ 	{	/* 0 */
+@@ -18,7 +17,6 @@ static ide_pci_device_t opti621_chipsets
+ 		.init_chipset	= NULL,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_opti621,
+-		.init_dma	= init_dma_opti621,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
+@@ -32,7 +30,6 @@ static ide_pci_device_t opti621_chipsets
+ 		.init_chipset	= NULL,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_opti621,
+-                .init_dma	= init_dma_opti621,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x45,0x80,0x00}, {0x40,0x08,0x00}},
+--- linux-2.6.0-test6/drivers/ide/pci/pdc202xx_new.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ide/pci/pdc202xx_new.c	2003-10-05 00:33:24.000000000 -0700
+@@ -563,11 +563,6 @@ static void __init init_hwif_pdc202new (
+ #endif /* PDC202_DEBUG_CABLE */
+ }
+ 
+-static void __init init_dma_pdc202new (ide_hwif_t *hwif, unsigned long dmabase)
+-{
+-	ide_setup_dma(hwif, dmabase, 8);
+-}
+-
+ extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *);
+ extern void ide_setup_pci_devices(struct pci_dev *, struct pci_dev *, ide_pci_device_t *);
+ 
+--- linux-2.6.0-test6/drivers/ide/pci/pdc202xx_new.h	2003-06-14 12:17:57.000000000 -0700
++++ 25/drivers/ide/pci/pdc202xx_new.h	2003-10-05 00:33:24.000000000 -0700
+@@ -188,7 +188,6 @@ static void init_setup_pdc20270(struct p
+ static void init_setup_pdc20276(struct pci_dev *dev, ide_pci_device_t *d);
+ static unsigned int init_chipset_pdcnew(struct pci_dev *, const char *);
+ static void init_hwif_pdc202new(ide_hwif_t *);
+-static void init_dma_pdc202new(ide_hwif_t *, unsigned long);
+ 
+ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
+ 	{	/* 0 */
+@@ -199,7 +198,6 @@ static ide_pci_device_t pdcnew_chipsets[
+ 		.init_chipset	= init_chipset_pdcnew,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_pdc202new,
+-		.init_dma	= init_dma_pdc202new,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+@@ -213,7 +211,6 @@ static ide_pci_device_t pdcnew_chipsets[
+ 		.init_chipset	= init_chipset_pdcnew,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_pdc202new,
+-		.init_dma	= init_dma_pdc202new,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+@@ -227,7 +224,6 @@ static ide_pci_device_t pdcnew_chipsets[
+ 		.init_chipset	= init_chipset_pdcnew,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_pdc202new,
+-		.init_dma	= init_dma_pdc202new,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ #ifdef CONFIG_PDC202XX_FORCE
+@@ -245,7 +241,6 @@ static ide_pci_device_t pdcnew_chipsets[
+ 		.init_chipset	= init_chipset_pdcnew,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_pdc202new,
+-		.init_dma	= init_dma_pdc202new,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+@@ -259,7 +254,6 @@ static ide_pci_device_t pdcnew_chipsets[
+ 		.init_chipset	= init_chipset_pdcnew,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_pdc202new,
+-		.init_dma	= init_dma_pdc202new,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+@@ -273,7 +267,6 @@ static ide_pci_device_t pdcnew_chipsets[
+ 		.init_chipset	= init_chipset_pdcnew,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_pdc202new,
+-		.init_dma	= init_dma_pdc202new,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ #ifdef CONFIG_PDC202XX_FORCE
+@@ -291,7 +284,6 @@ static ide_pci_device_t pdcnew_chipsets[
+ 		.init_chipset	= init_chipset_pdcnew,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_pdc202new,
+-		.init_dma	= init_dma_pdc202new,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+--- linux-2.6.0-test6/drivers/ide/pci/pdcadma.c	2003-09-08 13:58:57.000000000 -0700
++++ /dev/null	2002-08-30 16:31:37.000000000 -0700
+@@ -1,162 +0,0 @@
+-/*
+- * linux/drivers/ide/pci/pdcadma.c		Version 0.05	Sept 10, 2002
+- *
+- * Copyright (C) 1999-2000		Andre Hedrick <andre@linux-ide.org>
+- * May be copied or modified under the terms of the GNU General Public License
+- *
+- */
+-
+-#include <linux/config.h>
+-#include <linux/types.h>
+-#include <linux/kernel.h>
+-#include <linux/delay.h>
+-#include <linux/timer.h>
+-#include <linux/mm.h>
+-#include <linux/ioport.h>
+-#include <linux/blkdev.h>
+-#include <linux/hdreg.h>
+-
+-#include <linux/interrupt.h>
+-#include <linux/init.h>
+-#include <linux/pci.h>
+-#include <linux/ide.h>
+-
+-#include <asm/io.h>
+-#include <asm/irq.h>
+-
+-#include "pdcadma.h"
+-
+-#if defined(DISPLAY_PDCADMA_TIMINGS) && defined(CONFIG_PROC_FS)
+-#include <linux/stat.h>
+-#include <linux/proc_fs.h>
+-
+-static u8 pdcadma_proc = 0;
+-#define PDC_MAX_DEVS		5
+-static struct pci_dev *pdc_devs[PDC_MAX_DEVS];
+-static int n_pdc_devs;
+-
+-static int pdcadma_get_info (char *buffer, char **addr, off_t offset, int count)
+-{
+-	char *p = buffer;
+-	int i;
+-
+-	for (i = 0; i < n_pdc_devs; i++) {
+-		struct pci_dev *dev	= pdc_devs[i];
+-		unsigned long bibma = pci_resource_start(dev, 4);
+-
+-		p += sprintf(p, "\n                                "
+-			"PDC ADMA %04X Chipset.\n", dev->device);
+-		p += sprintf(p, "UDMA\n");
+-		p += sprintf(p, "PIO\n");
+-
+-	}
+-	return p-buffer;	/* => must be less than 4k! */
+-}
+-#endif  /* defined(DISPLAY_PDCADMA_TIMINGS) && defined(CONFIG_PROC_FS) */
+-
+-/*
+- * pdcadma_dma functions() initiates/aborts (U)DMA read/write
+- * operations on a drive.
+- */
+-#if 0
+-        int (*ide_dma_read)(ide_drive_t *drive);
+-        int (*ide_dma_write)(ide_drive_t *drive);
+-        int (*ide_dma_begin)(ide_drive_t *drive);
+-        int (*ide_dma_end)(ide_drive_t *drive);
+-        int (*ide_dma_check)(ide_drive_t *drive);
+-        int (*ide_dma_on)(ide_drive_t *drive);
+-        int (*ide_dma_off)(ide_drive_t *drive);
+-        int (*ide_dma_off_quietly)(ide_drive_t *drive);
+-        int (*ide_dma_test_irq)(ide_drive_t *drive);
+-        int (*ide_dma_host_on)(ide_drive_t *drive);
+-        int (*ide_dma_host_off)(ide_drive_t *drive);
+-        int (*ide_dma_bad_drive)(ide_drive_t *drive);
+-        int (*ide_dma_good_drive)(ide_drive_t *drive);
+-        int (*ide_dma_count)(ide_drive_t *drive);
+-        int (*ide_dma_verbose)(ide_drive_t *drive);
+-        int (*ide_dma_retune)(ide_drive_t *drive);
+-        int (*ide_dma_lostirq)(ide_drive_t *drive);
+-        int (*ide_dma_timeout)(ide_drive_t *drive);
+-
+-#endif
+-
+-static unsigned int __init init_chipset_pdcadma (struct pci_dev *dev, const char *name)
+-{
+-#if defined(DISPLAY_PDCADMA_TIMINGS) && defined(CONFIG_PROC_FS)
+-	pdc_devs[n_pdc_devs++] = dev;
+-
+-	if (!pdcadma_proc) {
+-		pdcadma_proc = 1;
+-		ide_pci_register_host_proc(&pdcadma_procs[0]);
+-	}
+-#endif /* DISPLAY_PDCADMA_TIMINGS && CONFIG_PROC_FS */
+-	return 0;
+-}
+-
+-static void __init init_hwif_pdcadma (ide_hwif_t *hwif)
+-{
+-	hwif->autodma = 0;
+-	hwif->dma_base = 0;
+-
+-//	hwif->tuneproc = &pdcadma_tune_drive;
+-//	hwif->speedproc = &pdcadma_tune_chipset;
+-
+-//	if (hwif->dma_base) {
+-//		hwif->autodma = 1;
+-//	}
+-
+-	hwif->udma_four = 1;
+-
+-//	hwif->atapi_dma = 1;
+-//	hwif->ultra_mask = 0x7f;
+-//	hwif->mwdma_mask = 0x07;
+-//	hwif->swdma_mask = 0x07;
+-
+-}
+-
+-static void __init init_dma_pdcadma (ide_hwif_t *hwif, unsigned long dmabase)
+-{
+-#if 0
+-	ide_setup_dma(hwif, dmabase, 8);
+-#endif
+-}
+-
+-extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *);
+-
+-static int __devinit pdcadma_init_one(struct pci_dev *dev, const struct pci_device_id *id)
+-{
+-	ide_pci_device_t *d = &pdcadma_chipsets[id->driver_data];
+-	if (dev->device != d->device)
+-		BUG();
+-	ide_setup_pci_device(dev, d);
+-	MOD_INC_USE_COUNT;
+-	return 1;
+-}
+-
+-static struct pci_device_id pdcadma_pci_tbl[] = {
+-	{ PCI_VENDOR_ID_PDC, PCI_DEVICE_ID_PDC_1841, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+-	{ 0, },
+-};
+-
+-static struct pci_driver driver = {
+-	.name		= "PDCADMA-IDE",
+-	.id_table	= pdcadma_pci_tbl,
+-	.probe		= pdcadma_init_one,
+-};
+-
+-static int pdcadma_ide_init(void)
+-{
+-	return ide_pci_register_driver(&driver);
+-}
+-
+-static void pdcadma_ide_exit(void)
+-{
+-	ide_pci_unregister_driver(&driver);
+-}
+-
+-module_init(pdcadma_ide_init);
+-module_exit(pdcadma_ide_exit);
+-
+-MODULE_AUTHOR("Andre Hedrick");
+-MODULE_DESCRIPTION("PCI driver module for PDCADMA IDE");
+-MODULE_LICENSE("GPL");
+--- linux-2.6.0-test6/drivers/ide/pci/pdcadma.h	2003-06-14 12:17:56.000000000 -0700
++++ /dev/null	2002-08-30 16:31:37.000000000 -0700
+@@ -1,56 +0,0 @@
+-#ifndef PDC_ADMA_H
+-#define PDC_ADMA_H
+-
+-#include <linux/config.h>
+-#include <linux/pci.h>
+-#include <linux/ide.h>
+-
+-#undef DISPLAY_PDCADMA_TIMINGS
+-
+-#if defined(DISPLAY_PDCADMA_TIMINGS) && defined(CONFIG_PROC_FS)
+-#include <linux/stat.h>
+-#include <linux/proc_fs.h>
+-
+-static u8 pdcadma_proc;
+-
+-static int pdcadma_get_info(char *, char **, off_t, int);
+-
+-static ide_pci_host_proc_t pdcadma_procs[] __initdata = {
+-	{
+-		.name		= "pdcadma",
+-		.set		= 1,
+-		.get_info	= pdcadma_get_info,
+-		.parent		= NULL,
+-	},
+-};
+-#endif  /* defined(DISPLAY_PDCADMA_TIMINGS) && defined(CONFIG_PROC_FS) */
+-
+-static void init_setup_pdcadma(struct pci_dev *, ide_pci_device_t *);
+-static unsigned int init_chipset_pdcadma(struct pci_dev *, const char *);
+-static void init_hwif_pdcadma(ide_hwif_t *);
+-static void init_dma_pdcadma(ide_hwif_t *, unsigned long);
+-
+-static ide_pci_device_t pdcadma_chipsets[] __devinitdata = {
+-	{	/* 0 */
+-		.vendor		= PCI_VENDOR_ID_PDC,
+-		.device		= PCI_DEVICE_ID_PDC_1841,
+-		.name		= "PDCADMA",
+-		.init_setup	= init_setup_pdcadma,
+-		.init_chipset	= init_chipset_pdcadma,
+-		.init_iops	= NULL,
+-		.init_hwif	= init_hwif_pdcadma,
+-		.init_dma	= init_dma_pdcadma,
+-		.channels	= 2,
+-		.autodma	= NODMA,
+-		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+-		.bootable	= OFF_BOARD,
+-		.extra		= 0,
+-	},{
+-		.vendor		= 0,
+-		.device		= 0,
+-		.channels	= 0,
+-		.bootable	= EOL,
+-	}
+-};
+-
+-#endif /* PDC_ADMA_H */
+--- linux-2.6.0-test6/drivers/ide/pci/piix.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ide/pci/piix.c	2003-10-05 00:33:24.000000000 -0700
+@@ -709,21 +709,6 @@ static void __init init_hwif_piix (ide_h
+ 	hwif->drives[0].autodma = hwif->autodma;
+ }
+ 
+-/**
+- *	init_dma_piix		-	set up the PIIX DMA
+- *	@hwif: IDE interface
+- *	@dmabase: DMA PCI base
+- *
+- *	Set up the DMA on the PIIX controller, providing a DMA base is
+- *	available. The PIIX follows the normal specs so we do nothing
+- *	magical here.
+- */
+-
+-static void __init init_dma_piix (ide_hwif_t *hwif, unsigned long dmabase)
+-{
+-	ide_setup_dma(hwif, dmabase, 8);
+-}
+-
+ extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *);
+ 
+ /**
+--- linux-2.6.0-test6/drivers/ide/pci/piix.h	2003-06-14 12:18:00.000000000 -0700
++++ 25/drivers/ide/pci/piix.h	2003-10-05 00:33:24.000000000 -0700
+@@ -30,8 +30,6 @@ static ide_pci_host_proc_t piix_procs[] 
+ static void init_setup_piix(struct pci_dev *, ide_pci_device_t *);
+ static unsigned int __devinit init_chipset_piix(struct pci_dev *, const char *);
+ static void init_hwif_piix(ide_hwif_t *);
+-static void init_dma_piix(ide_hwif_t *, unsigned long);
+-
+ 
+ /*
+  *	Table of the various PIIX capability blocks
+@@ -47,7 +45,6 @@ static ide_pci_device_t piix_pci_info[] 
+ 		.init_chipset	= init_chipset_piix,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_piix,
+-		.init_dma	= init_dma_piix,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+@@ -61,7 +58,6 @@ static ide_pci_device_t piix_pci_info[] 
+ 		.init_chipset	= init_chipset_piix,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_piix,
+-		.init_dma	= init_dma_piix,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+@@ -75,7 +71,6 @@ static ide_pci_device_t piix_pci_info[] 
+ 		.init_chipset	= NULL,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_piix,
+-		.init_dma	= NULL,
+ 		.channels	= 2,
+ 		.autodma	= NODMA,
+ 		.enablebits	= {{0x6D,0x80,0x80}, {0x6F,0x80,0x80}},
+@@ -89,7 +84,6 @@ static ide_pci_device_t piix_pci_info[] 
+ 		.init_chipset	= init_chipset_piix,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_piix,
+-		.init_dma	= init_dma_piix,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+@@ -103,7 +97,6 @@ static ide_pci_device_t piix_pci_info[] 
+ 		.init_chipset	= init_chipset_piix,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_piix,
+-		.init_dma	= init_dma_piix,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+@@ -117,7 +110,6 @@ static ide_pci_device_t piix_pci_info[] 
+ 		.init_chipset	= init_chipset_piix,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_piix,
+-		.init_dma	= init_dma_piix,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+@@ -131,7 +123,6 @@ static ide_pci_device_t piix_pci_info[] 
+ 		.init_chipset	= init_chipset_piix,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_piix,
+-		.init_dma	= init_dma_piix,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+@@ -145,7 +136,6 @@ static ide_pci_device_t piix_pci_info[] 
+ 		.init_chipset	= init_chipset_piix,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_piix,
+-		.init_dma	= init_dma_piix,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+@@ -159,7 +149,6 @@ static ide_pci_device_t piix_pci_info[] 
+ 		.init_chipset	= init_chipset_piix,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_piix,
+-		.init_dma	= init_dma_piix,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+@@ -173,7 +162,6 @@ static ide_pci_device_t piix_pci_info[] 
+ 		.init_chipset	= init_chipset_piix,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_piix,
+-		.init_dma	= init_dma_piix,
+ 		.channels	= 2,
+ 		.autodma	= NOAUTODMA,
+ 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+@@ -187,7 +175,6 @@ static ide_pci_device_t piix_pci_info[] 
+ 		.init_chipset	= init_chipset_piix,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_piix,
+-		.init_dma	= init_dma_piix,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+@@ -201,7 +188,6 @@ static ide_pci_device_t piix_pci_info[] 
+ 		.init_chipset	= init_chipset_piix,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_piix,
+-		.init_dma	= init_dma_piix,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+@@ -215,7 +201,6 @@ static ide_pci_device_t piix_pci_info[] 
+ 		.init_chipset	= init_chipset_piix,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_piix,
+-		.init_dma	= init_dma_piix,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+@@ -229,7 +214,6 @@ static ide_pci_device_t piix_pci_info[] 
+ 		.init_chipset	= init_chipset_piix,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_piix,
+-		.init_dma	= init_dma_piix,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+@@ -243,7 +227,6 @@ static ide_pci_device_t piix_pci_info[] 
+ 		.init_chipset	= init_chipset_piix,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_piix,
+-		.init_dma	= init_dma_piix,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+@@ -257,7 +240,6 @@ static ide_pci_device_t piix_pci_info[] 
+ 		.init_chipset	= init_chipset_piix,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_piix,
+-		.init_dma	= init_dma_piix,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+@@ -271,7 +253,6 @@ static ide_pci_device_t piix_pci_info[] 
+ 		.init_chipset	= init_chipset_piix,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_piix,
+-		.init_dma	= init_dma_piix,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+@@ -285,7 +266,6 @@ static ide_pci_device_t piix_pci_info[] 
+ 		.init_chipset	= init_chipset_piix,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_piix,
+-		.init_dma	= init_dma_piix,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+@@ -299,7 +279,6 @@ static ide_pci_device_t piix_pci_info[] 
+ 		.init_chipset	= init_chipset_piix,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_piix,
+-		.init_dma	= init_dma_piix,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+--- linux-2.6.0-test6/drivers/ide/pci/sc1200.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ide/pci/sc1200.c	2003-10-05 00:33:24.000000000 -0700
+@@ -396,44 +396,44 @@ typedef struct sc1200_saved_state_s {
+ 	__u32		regs[4];
+ } sc1200_saved_state_t;
+ 
+-static int sc1200_save_state (struct pci_dev *dev, u32 state)
++
++static int sc1200_suspend (struct pci_dev *dev, u32 state)
+ {
+ 	ide_hwif_t		*hwif = NULL;
+ 
+-printk("SC1200: save_state(%u)\n", state);
+-	if (state != 0)
+-		return 0;	// we only save state when going from full power to less
+-	//
+-	// Loop over all interfaces that are part of this PCI device:
+-	//
+-	while ((hwif = lookup_pci_dev(hwif, dev)) != NULL) {
+-		sc1200_saved_state_t	*ss;
+-		unsigned int		basereg, r;
+-		//
+-		// allocate a permanent save area, if not already allocated
+-		//
+-		ss = (sc1200_saved_state_t *)hwif->config_data;
+-		if (ss == NULL) {
+-			ss = kmalloc(sizeof(sc1200_saved_state_t), GFP_KERNEL);
+-			if (ss == NULL)
+-				return -ENOMEM;
+-			(sc1200_saved_state_t *)hwif->config_data = ss;
+-		}
+-		ss = (sc1200_saved_state_t *)hwif->config_data;
++	printk("SC1200: suspend(%u)\n", state);
++
++	if (state == 0) {
++		// we only save state when going from full power to less
++
+ 		//
+-		// Save timing registers:  this may be unnecessary if BIOS also does it
++		// Loop over all interfaces that are part of this PCI device:
+ 		//
+-		basereg = hwif->channel ? 0x50 : 0x40;
+-		for (r = 0; r < 4; ++r) {
+-			pci_read_config_dword (hwif->pci_dev, basereg + (r<<2), &ss->regs[r]);
++		while ((hwif = lookup_pci_dev(hwif, dev)) != NULL) {
++			sc1200_saved_state_t	*ss;
++			unsigned int		basereg, r;
++			//
++			// allocate a permanent save area, if not already allocated
++			//
++			ss = (sc1200_saved_state_t *)hwif->config_data;
++			if (ss == NULL) {
++				ss = kmalloc(sizeof(sc1200_saved_state_t), GFP_KERNEL);
++				if (ss == NULL)
++					return -ENOMEM;
++				(sc1200_saved_state_t *)hwif->config_data = ss;
++			}
++			ss = (sc1200_saved_state_t *)hwif->config_data;
++			//
++			// Save timing registers:  this may be unnecessary if 
++			// BIOS also does it
++			//
++			basereg = hwif->channel ? 0x50 : 0x40;
++			for (r = 0; r < 4; ++r) {
++				pci_read_config_dword (hwif->pci_dev, basereg + (r<<2), &ss->regs[r]);
++			}
+ 		}
+ 	}
+-	return 0;
+-}
+ 
+-static int sc1200_suspend (struct pci_dev *dev, u32 state)
+-{
+-	printk("SC1200: suspend(%u)\n", state);
+ 	/* You don't need to iterate over disks -- sysfs should have done that for you already */ 
+ 
+ 	pci_disable_device(dev);
+@@ -545,11 +545,6 @@ static void __init init_hwif_sc1200 (ide
+         hwif->drives[1].autodma = hwif->autodma;
+ }
+ 
+-static void __init init_dma_sc1200 (ide_hwif_t *hwif, unsigned long dmabase)
+-{
+-	ide_setup_dma(hwif, dmabase, 8);
+-}
+-
+ extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *);
+ 
+ 
+@@ -572,7 +567,6 @@ static struct pci_driver driver = {
+ 	.name		= "SC1200 IDE",
+ 	.id_table	= sc1200_pci_tbl,
+ 	.probe		= sc1200_init_one,
+-	.save_state	= sc1200_save_state,
+ 	.suspend	= sc1200_suspend,
+ 	.resume		= sc1200_resume,
+ };
+--- linux-2.6.0-test6/drivers/ide/pci/sc1200.h	2003-06-14 12:18:05.000000000 -0700
++++ 25/drivers/ide/pci/sc1200.h	2003-10-05 00:33:24.000000000 -0700
+@@ -27,7 +27,6 @@ static ide_pci_host_proc_t sc1200_procs[
+ 
+ static unsigned int init_chipset_sc1200(struct pci_dev *, const char *);
+ static void init_hwif_sc1200(ide_hwif_t *);
+-static void init_dma_sc1200(ide_hwif_t *, unsigned long);
+ 
+ static ide_pci_device_t sc1200_chipsets[] __devinitdata = {
+ 	{	/* 0 */
+@@ -37,7 +36,6 @@ static ide_pci_device_t sc1200_chipsets[
+ 		.init_chipset	= init_chipset_sc1200,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_sc1200,
+-		.init_dma	= init_dma_sc1200,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/ide/pci/sgiioc4.c	2003-10-05 00:36:28.000000000 -0700
+@@ -0,0 +1,1053 @@
++/*
++ * Copyright (c) 2003 Silicon Graphics, Inc.  All Rights Reserved.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of version 2 of the GNU General Public License
++ * as published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it would be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++ *
++ * You should have received a copy of the GNU General Public
++ * License along with this program; if not, write the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
++ *
++ * Contact information:  Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
++ * Mountain View, CA  94043, or:
++ *
++ * http://www.sgi.com
++ *
++ * For further information regarding this notice, see:
++ *
++ * http://oss.sgi.com/projects/GenInfo/NoticeExplan
++ */
++
++#include <linux/config.h>
++#include <linux/module.h>
++#include <linux/types.h>
++#include <linux/pci.h>
++#include <linux/delay.h>
++#include <linux/hdreg.h>
++#include <linux/init.h>
++#include <linux/kernel.h>
++#include <linux/timer.h>
++#include <linux/mm.h>
++#include <linux/ioport.h>
++#include <linux/blkdev.h>
++#include <asm/io.h>
++
++#define IDE_ARCH_ACK_INTR	1
++#include <linux/ide.h>
++
++/* IOC4 Specific Definitions */
++#define IOC4_CMD_OFFSET		0x100
++#define IOC4_CTRL_OFFSET	0x120
++#define IOC4_DMA_OFFSET		0x140
++#define IOC4_INTR_OFFSET	0x0
++
++#define IOC4_TIMING		0x00
++#define IOC4_DMA_PTR_L		0x01
++#define IOC4_DMA_PTR_H		0x02
++#define IOC4_DMA_ADDR_L		0x03
++#define IOC4_DMA_ADDR_H		0x04
++#define IOC4_BC_DEV		0x05
++#define IOC4_BC_MEM		0x06
++#define	IOC4_DMA_CTRL		0x07
++#define	IOC4_DMA_END_ADDR	0x08
++
++/* Bits in the IOC4 Control/Status Register */
++#define	IOC4_S_DMA_START	0x01
++#define	IOC4_S_DMA_STOP		0x02
++#define	IOC4_S_DMA_DIR		0x04
++#define	IOC4_S_DMA_ACTIVE	0x08
++#define	IOC4_S_DMA_ERROR	0x10
++#define	IOC4_ATA_MEMERR		0x02
++
++/* Read/Write Directions */
++#define	IOC4_DMA_WRITE		0x04
++#define	IOC4_DMA_READ		0x00
++
++/* Interrupt Register Offsets */
++#define IOC4_INTR_REG		0x03
++#define	IOC4_INTR_SET		0x05
++#define	IOC4_INTR_CLEAR		0x07
++
++#define IOC4_IDE_CACHELINE_SIZE	128
++#define IOC4_CMD_CTL_BLK_SIZE	0x20
++#define IOC4_SUPPORTED_FIRMWARE_REV 46
++
++/* Weeds out non-IDE interrupts to the IOC4 */
++#define ide_ack_intr(hwif) ((hwif)->hw.ack_intr ? (hwif)->hw.ack_intr(hwif) : 1)
++
++#define SGIIOC4_MAX_DEVS	32
++
++#if  defined(CONFIG_PROC_FS)
++#include <linux/stat.h>
++#include <linux/proc_fs.h>
++
++static u8 sgiioc4_proc;
++
++static struct pci_dev *sgiioc4_devs[SGIIOC4_MAX_DEVS];
++static int sgiioc4_get_info(char *, char **, off_t, int);
++
++static ide_pci_host_proc_t sgiioc4_procs[] __initdata = {
++	{
++	 .name = "sgiioc4",
++	 .set = 1,
++	 .get_info = sgiioc4_get_info,
++	 .parent = NULL,
++	 }
++};
++#endif
++
++typedef struct {
++	u32 timing_reg0;
++	u32 timing_reg1;
++	u32 low_mem_ptr;
++	u32 high_mem_ptr;
++	u32 low_mem_addr;
++	u32 high_mem_addr;
++	u32 dev_byte_count;
++	u32 mem_byte_count;
++	u32 status;
++} ioc4_dma_regs_t;
++
++/* Each Physical Region Descriptor Entry size is 16 bytes (2 * 64 bits) */
++/* IOC4 has only 1 IDE channel */
++#define IOC4_PRD_BYTES       16
++#define IOC4_PRD_ENTRIES     (PAGE_SIZE /(4*IOC4_PRD_BYTES))
++
++typedef enum pciio_endian_e {
++	PCIDMA_ENDIAN_BIG,
++	PCIDMA_ENDIAN_LITTLE
++} pciio_endian_t;
++
++static void sgiioc4_init_hwif_ports(hw_regs_t * hw, unsigned long data_port,
++				    unsigned long ctrl_port,
++				    unsigned long irq_port);
++static void sgiioc4_ide_setup_pci_device(struct pci_dev *dev,
++					 ide_pci_device_t * d);
++static void sgiioc4_resetproc(ide_drive_t * drive);
++static void sgiioc4_maskproc(ide_drive_t * drive, int mask);
++static void sgiioc4_configure_for_dma(int dma_direction, ide_drive_t * drive);
++static void __init ide_init_sgiioc4(ide_hwif_t * hwif);
++static void __init ide_dma_sgiioc4(ide_hwif_t * hwif, unsigned long dma_base);
++static int sgiioc4_checkirq(ide_hwif_t * hwif);
++static int sgiioc4_clearirq(ide_drive_t * drive);
++static int sgiioc4_get_info(char *buffer, char **addr, off_t offset, int count);
++static int sgiioc4_ide_dma_read(ide_drive_t * drive);
++static int sgiioc4_ide_dma_write(ide_drive_t * drive);
++static int sgiioc4_ide_dma_begin(ide_drive_t * drive);
++static int sgiioc4_ide_dma_end(ide_drive_t * drive);
++static int sgiioc4_ide_dma_check(ide_drive_t * drive);
++static int sgiioc4_ide_dma_on(ide_drive_t * drive);
++static int sgiioc4_ide_dma_off(ide_drive_t * drive);
++static int sgiioc4_ide_dma_off_quietly(ide_drive_t * drive);
++static int sgiioc4_ide_dma_test_irq(ide_drive_t * drive);
++static int sgiioc4_ide_dma_host_on(ide_drive_t * drive);
++static int sgiioc4_ide_dma_host_off(ide_drive_t * drive);
++static int sgiioc4_ide_dma_count(ide_drive_t * drive);
++static int sgiioc4_ide_dma_verbose(ide_drive_t * drive);
++static int sgiioc4_ide_dma_lostirq(ide_drive_t * drive);
++static int sgiioc4_ide_dma_timeout(ide_drive_t * drive);
++static int sgiioc4_ide_build_sglist(ide_drive_t * drive, struct request *rq);
++static int sgiioc4_ide_raw_build_sglist(ide_drive_t * drive,
++					struct request *rq);
++static u8 sgiioc4_INB(unsigned long port);
++static inline void xide_delay(long ticks);
++static unsigned int sgiioc4_build_dma_table(ide_drive_t * drive,
++					    struct request *rq, int ddir);
++static unsigned int __init pci_init_sgiioc4(struct pci_dev *dev,
++					    ide_pci_device_t * d);
++
++static ide_pci_device_t sgiioc4_chipsets[] __devinitdata = {
++	{
++	 /* Channel 0 */
++	 .vendor = PCI_VENDOR_ID_SGI,
++	 .device = PCI_DEVICE_ID_SGI_IOC4,
++	 .name = "SGIIOC4",
++	 .init_chipset = NULL,
++	 .init_iops = NULL,
++	 .init_hwif = ide_init_sgiioc4,
++	 .init_dma = ide_dma_sgiioc4,
++	 .channels = 1,
++	 .autodma = AUTODMA,
++	 .enablebits = {{0x00, 0x00, 0x00}, {0x00, 0x00, 0x00}},
++	 .bootable = ON_BOARD,
++	 .extra = 0,
++	 }
++};
++
++#ifdef CONFIG_PROC_FS
++static u8 sgiioc4_proc;
++#endif				/* CONFIG_PROC_FS */
++
++static int n_sgiioc4_devs;
++
++static inline void
++xide_delay(long ticks)
++{
++	if (!ticks)
++		return;
++
++	current->state = TASK_UNINTERRUPTIBLE;
++	schedule_timeout(ticks);
++}
++static void __init
++sgiioc4_ide_setup_pci_device(struct pci_dev *dev, ide_pci_device_t * d)
++{
++	unsigned long base = 0, ctl = 0, dma_base = 0, irqport = 0;
++	ide_hwif_t *hwif = NULL;
++	int h = 0;
++
++	/*  Get the CmdBlk and CtrlBlk Base Registers */
++	base = pci_resource_start(dev, 0) + IOC4_CMD_OFFSET;
++	ctl = pci_resource_start(dev, 0) + IOC4_CTRL_OFFSET;
++	irqport = pci_resource_start(dev, 0) + IOC4_INTR_OFFSET;
++	dma_base = pci_resource_start(dev, 0) + IOC4_DMA_OFFSET;
++
++	if (!request_region(base, IOC4_CMD_CTL_BLK_SIZE, hwif->name)) {
++		printk(KERN_ERR
++			"%s : %s -- Warning, Port Addresses "
++			"0x%p to 0x%p ALREADY in use\n",
++		       __FUNCTION__, hwif->name, (void *) base,
++		       (void *) base + IOC4_CMD_CTL_BLK_SIZE);
++	}
++
++	for (h = 0; h < MAX_HWIFS; ++h) {
++		hwif = &ide_hwifs[h];
++		/* Find an empty HWIF */
++		if (hwif->chipset == ide_unknown)
++			break;
++	}
++
++	if (hwif->io_ports[IDE_DATA_OFFSET] != base) {
++		/* Initialize the IO registers */
++		sgiioc4_init_hwif_ports(&hwif->hw, base, ctl, irqport);
++		memcpy(hwif->io_ports, hwif->hw.io_ports,
++		       sizeof (hwif->io_ports));
++		hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET];
++	}
++
++	hwif->irq = dev->irq;
++	hwif->chipset = ide_pci;
++	hwif->pci_dev = dev;
++	hwif->channel = 0;	/* Single Channel chip */
++	hwif->cds = (struct ide_pci_device_s *) d;
++	hwif->hw.ack_intr = &sgiioc4_checkirq;	/* MultiFunction Chip */
++	hwif->gendev.parent = &dev->dev;/* setup proper ancestral information */
++
++	/* Initializing chipset IRQ Registers */
++	hwif->OUTL(0x03, irqport + IOC4_INTR_SET * 4);
++
++	(void) ide_init_sgiioc4(hwif);
++
++	if (dma_base)
++		ide_dma_sgiioc4(hwif, dma_base);
++	else
++		printk(KERN_INFO "%s: %s Bus-Master DMA disabled\n",
++		       hwif->name, d->name);
++
++	probe_hwif_init(hwif);
++}
++
++/* This ensures that we can build this for generic kernels without
++ * having all the SN2 code sync'd and merged.
++ */
++
++pciio_endian_t __attribute__ ((weak)) snia_pciio_endian_set(struct pci_dev
++					    *pci_dev, pciio_endian_t device_end,
++					    pciio_endian_t desired_end);
++
++static unsigned int __init
++pci_init_sgiioc4(struct pci_dev *dev, ide_pci_device_t * d)
++{
++	if (pci_enable_device(dev)) {
++		printk(KERN_INFO
++		       "Failed to enable device %s at slot %s\n",
++		       d->name, dev->slot_name);
++		return 1;
++	}
++	pci_set_master(dev);
++
++	/* Enable Byte Swapping in the PIC... */
++	if (snia_pciio_endian_set) {
++		snia_pciio_endian_set(dev, PCIDMA_ENDIAN_LITTLE,
++				      PCIDMA_ENDIAN_BIG);
++	} else {
++		printk(KERN_INFO
++		       "Failed to set endianness for device %s at slot %s\n",
++		       d->name, dev->slot_name);
++		return 1;
++	}
++
++#ifdef CONFIG_PROC_FS
++	sgiioc4_devs[n_sgiioc4_devs++] = dev;
++	if (!sgiioc4_proc) {
++		sgiioc4_proc = 1;
++		ide_pci_register_host_proc(&sgiioc4_procs[0]);
++	}
++#endif
++	sgiioc4_ide_setup_pci_device(dev, d);
++
++	return 0;
++}
++
++static void
++sgiioc4_init_hwif_ports(hw_regs_t * hw, unsigned long data_port,
++			unsigned long ctrl_port, unsigned long irq_port)
++{
++	unsigned long reg = data_port;
++	int i;
++
++	/* Registers are word (32 bit) aligned */
++	for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++)
++		hw->io_ports[i] = reg + i * 4;
++
++	if (ctrl_port)
++		hw->io_ports[IDE_CONTROL_OFFSET] = ctrl_port;
++
++	if (irq_port)
++		hw->io_ports[IDE_IRQ_OFFSET] = irq_port;
++}
++
++static void
++sgiioc4_resetproc(ide_drive_t * drive)
++{
++	sgiioc4_ide_dma_end(drive);
++	sgiioc4_clearirq(drive);
++}
++
++static void
++sgiioc4_maskproc(ide_drive_t * drive, int mask)
++{
++	ide_hwif_t *hwif = HWIF(drive);
++	hwif->OUTB(mask ? (drive->ctl | 2) : (drive->ctl & ~2),
++		   IDE_CONTROL_REG);
++}
++
++static void __init
++ide_init_sgiioc4(ide_hwif_t * hwif)
++{
++	hwif->mmio = 2;
++	hwif->autodma = 1;
++	hwif->atapi_dma = 1;
++	hwif->ultra_mask = 0x0;	/* Disable Ultra DMA */
++	hwif->mwdma_mask = 0x2;	/* Multimode-2 DMA  */
++	hwif->swdma_mask = 0x2;
++	hwif->identify = NULL;
++	hwif->tuneproc = NULL;	/* Sets timing for PIO mode */
++	hwif->speedproc = NULL;	/* Sets timing for DMA &/or PIO modes */
++	hwif->selectproc = NULL;/* Use the default routine to select drive */
++	hwif->reset_poll = NULL;/* No HBA specific reset_poll needed */
++	hwif->pre_reset = NULL;	/* No HBA specific pre_set needed */
++	hwif->resetproc = &sgiioc4_resetproc;/* Reset DMA engine,
++						clear interrupts */
++	hwif->intrproc = NULL;	/* Enable or Disable interrupt from drive */
++	hwif->maskproc = &sgiioc4_maskproc;	/* Mask on/off NIEN register */
++	hwif->quirkproc = NULL;
++	hwif->busproc = NULL;
++
++	hwif->ide_dma_read = &sgiioc4_ide_dma_read;
++	hwif->ide_dma_write = &sgiioc4_ide_dma_write;
++	hwif->ide_dma_begin = &sgiioc4_ide_dma_begin;
++	hwif->ide_dma_end = &sgiioc4_ide_dma_end;
++	hwif->ide_dma_check = &sgiioc4_ide_dma_check;
++	hwif->ide_dma_on = &sgiioc4_ide_dma_on;
++	hwif->ide_dma_off = &sgiioc4_ide_dma_off;
++	hwif->ide_dma_off_quietly = &sgiioc4_ide_dma_off_quietly;
++	hwif->ide_dma_test_irq = &sgiioc4_ide_dma_test_irq;
++	hwif->ide_dma_host_on = &sgiioc4_ide_dma_host_on;
++	hwif->ide_dma_host_off = &sgiioc4_ide_dma_host_off;
++	hwif->ide_dma_bad_drive = &__ide_dma_bad_drive;
++	hwif->ide_dma_good_drive = &__ide_dma_good_drive;
++	hwif->ide_dma_count = &sgiioc4_ide_dma_count;
++	hwif->ide_dma_verbose = &sgiioc4_ide_dma_verbose;
++	hwif->ide_dma_retune = &__ide_dma_retune;
++	hwif->ide_dma_lostirq = &sgiioc4_ide_dma_lostirq;
++	hwif->ide_dma_timeout = &sgiioc4_ide_dma_timeout;
++	hwif->INB = &sgiioc4_INB;
++}
++
++static int
++sgiioc4_ide_dma_read(ide_drive_t * drive)
++{
++	struct request *rq = HWGROUP(drive)->rq;
++	unsigned int count = 0;
++
++	if (!(count = sgiioc4_build_dma_table(drive, rq, PCI_DMA_FROMDEVICE))) {
++		/* try PIO instead of DMA */
++		return 1;
++	}
++	/* Writes FROM the IOC4 TO Main Memory */
++	sgiioc4_configure_for_dma(IOC4_DMA_WRITE, drive);
++
++	return 0;
++}
++
++static int
++sgiioc4_ide_dma_write(ide_drive_t * drive)
++{
++	struct request *rq = HWGROUP(drive)->rq;
++	unsigned int count = 0;
++
++	if (!(count = sgiioc4_build_dma_table(drive, rq, PCI_DMA_TODEVICE))) {
++		/* try PIO instead of DMA */
++		return 1;
++	}
++
++	sgiioc4_configure_for_dma(IOC4_DMA_READ, drive);
++	/* Writes TO the IOC4 FROM Main Memory */
++
++	return 0;
++}
++
++static int
++sgiioc4_ide_dma_begin(ide_drive_t * drive)
++{
++	ide_hwif_t *hwif = HWIF(drive);
++	unsigned int reg = hwif->INL(hwif->dma_base + IOC4_DMA_CTRL * 4);
++	unsigned int temp_reg = reg | IOC4_S_DMA_START;
++
++	hwif->OUTL(temp_reg, hwif->dma_base + IOC4_DMA_CTRL * 4);
++
++	return 0;
++}
++
++/* Stops the IOC4 DMA Engine */
++static int
++sgiioc4_ide_dma_end(ide_drive_t * drive)
++{
++	u32 ioc4_dma, bc_dev, bc_mem, num, valid = 0, cnt = 0;
++	ide_hwif_t *hwif = HWIF(drive);
++	uint64_t dma_base = hwif->dma_base;
++	int dma_stat = 0, count;
++	unsigned long *ending_dma = (unsigned long *) hwif->dma_base2;
++
++	hwif->OUTL(IOC4_S_DMA_STOP, dma_base + IOC4_DMA_CTRL * 4);
++
++	count = 0;
++	do {
++		xide_delay(count);
++		ioc4_dma = hwif->INL(dma_base + IOC4_DMA_CTRL * 4);
++		count += 10;
++	} while ((ioc4_dma & IOC4_S_DMA_STOP) && (count < 100));
++
++	if (ioc4_dma & IOC4_S_DMA_STOP) {
++		printk(KERN_ERR
++		       "%s(%s): IOC4 DMA STOP bit is still 1 :"
++		       "ioc4_dma_reg 0x%x\n",
++		       __FUNCTION__, drive->name, ioc4_dma);
++		dma_stat = 1;
++	}
++
++	if (ending_dma) {
++		do {
++			for (num = 0; num < 16; num++) {
++				if (ending_dma[num] & (~0ul)) {
++					valid = 1;
++					break;
++				}
++			}
++			xide_delay(cnt);
++		} while ((cnt++ < 100) && (!valid));
++	}
++
++	if (!valid)
++		printk(KERN_INFO "%s(%s) : Stale DMA Data in Memory\n",
++		       __FUNCTION__, drive->name);
++
++	bc_dev = hwif->INL(dma_base + IOC4_BC_DEV * 4);
++	bc_mem = hwif->INL(dma_base + IOC4_BC_MEM * 4);
++
++	if ((bc_dev & 0x01FF) || (bc_mem & 0x1FF)) {
++		if (bc_dev > bc_mem + 8) {
++			printk(KERN_ERR
++			       "%s(%s): WARNING!! byte_count_dev %d "
++			       "!= byte_count_mem %d\n",
++			       __FUNCTION__, drive->name, bc_dev, bc_mem);
++		}
++	}
++
++	drive->waiting_for_dma = 0;
++	ide_destroy_dmatable(drive);
++
++	return dma_stat;
++}
++
++static int
++sgiioc4_ide_dma_check(ide_drive_t * drive)
++{
++	if (ide_config_drive_speed(drive, XFER_MW_DMA_2) != 0) {
++		printk(KERN_INFO
++		       "Couldnot set %s in Multimode-2 DMA mode | "
++			   "Drive %s using PIO instead\n",
++		       drive->name, drive->name);
++		drive->using_dma = 0;
++	} else
++		drive->using_dma = 1;
++
++	return 0;
++}
++
++static int
++sgiioc4_ide_dma_on(ide_drive_t * drive)
++{
++	drive->using_dma = 1;
++
++	return HWIF(drive)->ide_dma_host_on(drive);
++}
++
++static int
++sgiioc4_ide_dma_off(ide_drive_t * drive)
++{
++	printk(KERN_INFO "%s: DMA disabled\n", drive->name);
++
++	return HWIF(drive)->ide_dma_off_quietly(drive);
++}
++
++static int
++sgiioc4_ide_dma_off_quietly(ide_drive_t * drive)
++{
++	drive->using_dma = 0;
++
++	return HWIF(drive)->ide_dma_host_off(drive);
++}
++
++/* returns 1 if dma irq issued, 0 otherwise */
++static int
++sgiioc4_ide_dma_test_irq(ide_drive_t * drive)
++{
++	return sgiioc4_checkirq(HWIF(drive));
++}
++
++static int
++sgiioc4_ide_dma_host_on(ide_drive_t * drive)
++{
++	if (drive->using_dma)
++		return 0;
++
++	return 1;
++}
++
++static int
++sgiioc4_ide_dma_host_off(ide_drive_t * drive)
++{
++	sgiioc4_clearirq(drive);
++
++	return 0;
++}
++
++static int
++sgiioc4_ide_dma_count(ide_drive_t * drive)
++{
++	return HWIF(drive)->ide_dma_begin(drive);
++}
++
++static int
++sgiioc4_ide_dma_verbose(ide_drive_t * drive)
++{
++	if (drive->using_dma == 1)
++		printk(", UDMA(16)");
++	else
++		printk(", PIO");
++
++	return 1;
++}
++
++static int
++sgiioc4_ide_dma_lostirq(ide_drive_t * drive)
++{
++	HWIF(drive)->resetproc(drive);
++
++	return __ide_dma_lostirq(drive);
++}
++
++static int
++sgiioc4_ide_dma_timeout(ide_drive_t * drive)
++{
++	printk(KERN_ERR "%s: timeout waiting for DMA\n", drive->name);
++	if (HWIF(drive)->ide_dma_test_irq(drive))
++		return 0;
++
++	return HWIF(drive)->ide_dma_end(drive);
++}
++
++static u8
++sgiioc4_INB(unsigned long port)
++{
++	u8 reg = (u8) inb(port);
++
++	if ((port & 0xFFF) == 0x11C) {	/* Status register of IOC4 */
++		if (reg & 0x51) {	/* Not busy...check for interrupt */
++			unsigned long other_ir = port - 0x110;
++			unsigned int intr_reg = (u32) inl(other_ir);
++
++			/* Clear the Interrupt, Error bits on the IOC4 */
++			if (intr_reg & 0x03) {
++				outl(0x03, other_ir);
++				intr_reg = (u32) inl(other_ir);
++			}
++		}
++	}
++
++	return reg;
++}
++
++/* Creates a dma map for the scatter-gather list entries */
++static void __init
++ide_dma_sgiioc4(ide_hwif_t * hwif, unsigned long dma_base)
++{
++	int num_ports = sizeof (ioc4_dma_regs_t);
++
++	printk(KERN_INFO "%s: BM-DMA at 0x%04lx-0x%04lx\n", hwif->name,
++	       dma_base, dma_base + num_ports - 1);
++
++	if (!request_region(dma_base, num_ports, hwif->name)) {
++		printk(KERN_ERR
++		       "%s(%s) -- WARNING, Addresses 0x%p to 0x%p "
++		       "ALREADY in use\n",
++		       __FUNCTION__, hwif->name, (void *) dma_base,
++		       (void *) dma_base + num_ports - 1);
++	}
++
++	hwif->dma_base = dma_base;
++	hwif->dmatable_cpu = pci_alloc_consistent(hwif->pci_dev,
++					  IOC4_PRD_ENTRIES * IOC4_PRD_BYTES,
++					  &hwif->dmatable_dma);
++
++	if (!hwif->dmatable_cpu)
++		goto dma_alloc_failure;
++
++	hwif->sg_table =
++	    kmalloc(sizeof (struct scatterlist) * IOC4_PRD_ENTRIES, GFP_KERNEL);
++
++	if (!hwif->sg_table) {
++		pci_free_consistent(hwif->pci_dev,
++				    IOC4_PRD_ENTRIES * IOC4_PRD_BYTES,
++				    hwif->dmatable_cpu, hwif->dmatable_dma);
++		goto dma_alloc_failure;
++	}
++
++	hwif->dma_base2 = (unsigned long)
++		pci_alloc_consistent(hwif->pci_dev,
++				     IOC4_IDE_CACHELINE_SIZE,
++				     (dma_addr_t *) &(hwif->dma_status));
++
++	if (!hwif->dma_base2) {
++		pci_free_consistent(hwif->pci_dev,
++				    IOC4_PRD_ENTRIES * IOC4_PRD_BYTES,
++				    hwif->dmatable_cpu, hwif->dmatable_dma);
++		kfree(hwif->sg_table);
++		goto dma_alloc_failure;
++	}
++
++	return;
++
++      dma_alloc_failure:
++	printk(KERN_INFO
++	       "%s() -- Error! Unable to allocate DMA Maps for drive %s\n",
++	       __FUNCTION__, hwif->name);
++	printk(KERN_INFO
++	       "Changing from DMA to PIO mode for Drive %s\n", hwif->name);
++
++	/* Disable DMA because we couldnot allocate any DMA maps */
++	hwif->autodma = 0;
++	hwif->atapi_dma = 0;
++}
++
++/* Initializes the IOC4 DMA Engine */
++static void
++sgiioc4_configure_for_dma(int dma_direction, ide_drive_t * drive)
++{
++	u32 ioc4_dma;
++	int count;
++	ide_hwif_t *hwif = HWIF(drive);
++	uint64_t dma_base = hwif->dma_base;
++	uint32_t dma_addr, ending_dma_addr;
++
++	ioc4_dma = hwif->INL(dma_base + IOC4_DMA_CTRL * 4);
++
++	if (ioc4_dma & IOC4_S_DMA_ACTIVE) {
++		printk(KERN_WARNING
++			"%s(%s):Warning!! DMA from previous transfer was still active\n",
++		       __FUNCTION__, drive->name);
++		hwif->OUTL(IOC4_S_DMA_STOP, dma_base + IOC4_DMA_CTRL * 4);
++		count = 0;
++		do {
++			xide_delay(count);
++			ioc4_dma = hwif->INL(dma_base + IOC4_DMA_CTRL * 4);
++			count += 10;
++		} while ((ioc4_dma & IOC4_S_DMA_STOP) && (count < 100));
++
++		if (ioc4_dma & IOC4_S_DMA_STOP)
++			printk(KERN_ERR
++			       "%s(%s) : IOC4 Dma STOP bit is still 1\n",
++			       __FUNCTION__, drive->name);
++	}
++
++	ioc4_dma = hwif->INL(dma_base + IOC4_DMA_CTRL * 4);
++	if (ioc4_dma & IOC4_S_DMA_ERROR) {
++		printk(KERN_WARNING
++		       "%s(%s) : Warning!! - DMA Error during Previous"
++		       " transfer | status 0x%x\n",
++		       __FUNCTION__, drive->name, ioc4_dma);
++		hwif->OUTL(IOC4_S_DMA_STOP, dma_base + IOC4_DMA_CTRL * 4);
++		count = 0;
++		do {
++			ioc4_dma = hwif->INL(dma_base + IOC4_DMA_CTRL * 4);
++			xide_delay(count);
++			count += 10;
++		} while ((ioc4_dma & IOC4_S_DMA_STOP) && (count < 100));
++
++		if (ioc4_dma & IOC4_S_DMA_STOP)
++			printk(KERN_ERR
++			       "%s(%s) : IOC4 DMA STOP bit is still 1\n",
++			       __FUNCTION__, drive->name);
++	}
++
++	/* Address of the Scatter Gather List */
++	dma_addr = cpu_to_le32(hwif->dmatable_dma);
++	hwif->OUTL(dma_addr, dma_base + IOC4_DMA_PTR_L * 4);
++
++	/* Address of the Ending DMA */
++	memset((unsigned int *) hwif->dma_base2, 0, IOC4_IDE_CACHELINE_SIZE);
++	ending_dma_addr = cpu_to_le32(hwif->dma_status);
++	hwif->OUTL(ending_dma_addr, dma_base + IOC4_DMA_END_ADDR * 4);
++
++	hwif->OUTL(dma_direction, dma_base + IOC4_DMA_CTRL * 4);
++	drive->waiting_for_dma = 1;
++}
++
++/* IOC4 Scatter Gather list Format 					 */
++/* 128 Bit entries to support 64 bit addresses in the future		 */
++/* The Scatter Gather list Entry should be in the BIG-ENDIAN Format	 */
++/* --------------------------------------------------------------------- */
++/* | Upper 32 bits - Zero           |	 	Lower 32 bits- address | */
++/* --------------------------------------------------------------------- */
++/* | Upper 32 bits - Zero	    |EOL| 15 unused     | 16 Bit Length| */
++/* --------------------------------------------------------------------- */
++/* Creates the scatter gather list, DMA Table */
++static unsigned int
++sgiioc4_build_dma_table(ide_drive_t * drive, struct request *rq, int ddir)
++{
++	ide_hwif_t *hwif = HWIF(drive);
++	unsigned int *table = hwif->dmatable_cpu;
++	unsigned int count = 0, i = 1;
++	struct scatterlist *sg;
++
++	if (HWGROUP(drive)->rq->flags & REQ_DRIVE_TASKFILE)
++		hwif->sg_nents = i = sgiioc4_ide_raw_build_sglist(drive, rq);
++	else
++		hwif->sg_nents = i = sgiioc4_ide_build_sglist(drive, rq);
++
++	if (!i)
++		return 0;	/* sglist of length Zero */
++
++	sg = hwif->sg_table;
++	while (i && sg_dma_len(sg)) {
++		dma_addr_t cur_addr;
++		int cur_len;
++		cur_addr = sg_dma_address(sg);
++		cur_len = sg_dma_len(sg);
++
++		while (cur_len) {
++			if (count++ >= IOC4_PRD_ENTRIES) {
++				printk(KERN_WARNING
++				       "%s: DMA table too small\n",
++				       drive->name);
++				goto use_pio_instead;
++			} else {
++				uint32_t xcount, bcount =
++				    0x10000 - (cur_addr & 0xffff);
++
++				if (bcount > cur_len)
++					bcount = cur_len;
++
++				/* put the addr, length in
++				 * the IOC4 dma-table format */
++				*table = 0x0;
++				table++;
++				*table = cpu_to_be32(cur_addr);
++				table++;
++				*table = 0x0;
++				table++;
++
++				xcount = bcount & 0xffff;
++				*table = cpu_to_be32(xcount);
++				table++;
++
++				cur_addr += bcount;
++				cur_len -= bcount;
++			}
++		}
++
++		sg++;
++		i--;
++	}
++
++	if (count) {
++		table--;
++		*table |= cpu_to_be32(0x80000000);
++		return count;
++	}
++
++      use_pio_instead:
++	pci_unmap_sg(hwif->pci_dev, hwif->sg_table, hwif->sg_nents,
++		     hwif->sg_dma_direction);
++	hwif->sg_dma_active = 0;
++
++	return 0;		/* revert to PIO for this request */
++}
++
++static int
++sgiioc4_checkirq(ide_hwif_t * hwif)
++{
++	uint8_t intr_reg =
++	    hwif->INL(hwif->io_ports[IDE_IRQ_OFFSET] + IOC4_INTR_REG * 4);
++
++	if (intr_reg & 0x03)
++		return 1;
++
++	return 0;
++}
++
++static int
++sgiioc4_clearirq(ide_drive_t * drive)
++{
++	u32 intr_reg;
++	ide_hwif_t *hwif = HWIF(drive);
++	unsigned long other_ir =
++	    hwif->io_ports[IDE_IRQ_OFFSET] + (IOC4_INTR_REG << 2);
++
++	/* Code to check for PCI error conditions */
++	intr_reg = hwif->INL(other_ir);
++	if (intr_reg & 0x03) {
++		/* Valid IOC4-IDE interrupt */
++		u8 stat = hwif->INB(IDE_STATUS_REG);
++		int count = 0;
++		do {
++			xide_delay(count);
++			stat = hwif->INB(IDE_STATUS_REG);
++			/* Removes Interrupt from IDE Device */
++		} while ((stat & 0x80) && (count++ < 1024));
++
++		if (intr_reg & 0x02) {
++			/* Error when transferring DMA data on PCI bus */
++			uint32_t pci_err_addr_low, pci_err_addr_high,
++			    pci_stat_cmd_reg;
++
++			pci_err_addr_low =
++				hwif->INL(hwif->io_ports[IDE_IRQ_OFFSET]);
++			pci_err_addr_high =
++				hwif->INL(hwif->io_ports[IDE_IRQ_OFFSET] + 4);
++			pci_read_config_dword(hwif->pci_dev, PCI_COMMAND,
++					      &pci_stat_cmd_reg);
++			printk(KERN_ERR
++			       "%s(%s) : PCI Bus Error when doing DMA:"
++				   " status-cmd reg is 0x%x\n",
++			       __FUNCTION__, drive->name, pci_stat_cmd_reg);
++			printk(KERN_ERR
++			       "%s(%s) : PCI Error Address is 0x%x%x\n",
++			       __FUNCTION__, drive->name,
++			       pci_err_addr_high, pci_err_addr_low);
++			/* Clear the PCI Error indicator */
++			pci_write_config_dword(hwif->pci_dev, PCI_COMMAND,
++					       0x00000146);
++		}
++
++		/* Clear the Interrupt, Error bits on the IOC4 */
++		hwif->OUTL(0x03, other_ir);
++
++		intr_reg = hwif->INL(other_ir);
++	}
++
++	return intr_reg;
++}
++
++/**
++ * 	"Copied from drivers/ide/ide-dma.c"
++ *	sgiioc4_ide_build_sglist - map IDE scatter gather for DMA I/O
++ *	@hwif: the interface to build the DMA table for
++ *	@rq: the request holding the sg list
++ *	@ddir: data direction
++ *
++ *	Perform the PCI mapping magic neccessary to access the source
++ *	or target buffers of a request via PCI DMA. The lower layers
++ *	of the kernel provide the neccessary cache management so that
++ *	we can operate in a portable fashion.
++ *
++ *	This code is identical to ide_build_sglist in ide-dma.c
++ *	however that is not exported.
++ */
++
++static int
++sgiioc4_ide_build_sglist(ide_drive_t * drive, struct request *rq)
++{
++	ide_hwif_t *hwif = HWIF(drive);
++	struct scatterlist *sg = hwif->sg_table;
++	int nents;
++
++	if (hwif->sg_dma_active)
++		BUG();
++
++	nents = blk_rq_map_sg(drive->queue, rq, hwif->sg_table);
++
++	if (rq_data_dir(rq) == READ)
++		hwif->sg_dma_direction = PCI_DMA_FROMDEVICE;
++	else
++		hwif->sg_dma_direction = PCI_DMA_TODEVICE;
++
++	return pci_map_sg(hwif->pci_dev, sg, nents, hwif->sg_dma_direction);
++}
++
++/**
++ * 	Copied from drivers/ide/ide-dma.c
++ *	sgiioc4_ide_raw_build_sglist	-	map IDE scatter gather for DMA
++ *	@hwif: the interface to build the DMA table for
++ *	@rq: the request holding the sg list
++ *
++ *	Perform the PCI mapping magic neccessary to access the source or
++ *	target buffers of a taskfile request via PCI DMA. The lower layers
++ *	of the  kernel provide the neccessary cache management so that we can
++ *	operate in a portable fashion
++ *
++ *	This code is identical to ide_raw_build_sglist in ide-dma.c
++ *	however that is not exported
++ */
++
++static int
++sgiioc4_ide_raw_build_sglist(ide_drive_t * drive, struct request *rq)
++{
++	ide_hwif_t *hwif = HWIF(drive);
++	struct scatterlist *sg = hwif->sg_table;
++	int nents = 0;
++	ide_task_t *args = rq->special;
++	u8 *virt_addr = rq->buffer;
++	int sector_count = rq->nr_sectors;
++
++	if (args->command_type == IDE_DRIVE_TASK_RAW_WRITE)
++		hwif->sg_dma_direction = PCI_DMA_TODEVICE;
++	else
++		hwif->sg_dma_direction = PCI_DMA_FROMDEVICE;
++
++#if 1
++	if (sector_count > 256)
++		BUG();
++
++	if (sector_count > 128) {
++#else
++	while (sector_count > 128) {
++#endif
++		memset(&sg[nents], 0, sizeof (*sg));
++		sg[nents].page = virt_to_page(virt_addr);
++		sg[nents].offset = offset_in_page(virt_addr);
++		sg[nents].length = 128 * SECTOR_SIZE;
++		nents++;
++		virt_addr = virt_addr + (128 * SECTOR_SIZE);
++		sector_count -= 128;
++	}
++	memset(&sg[nents], 0, sizeof (*sg));
++	sg[nents].page = virt_to_page(virt_addr);
++	sg[nents].offset = offset_in_page(virt_addr);
++	sg[nents].length = sector_count * SECTOR_SIZE;
++	nents++;
++
++	return pci_map_sg(hwif->pci_dev, sg, nents, hwif->sg_dma_direction);
++}
++
++#ifdef CONFIG_PROC_FS
++
++static int
++sgiioc4_get_info(char *buffer, char **addr, off_t offset, int count)
++{
++	char *p = buffer;
++	unsigned int class_rev;
++	int i = 0;
++
++	while (i < n_sgiioc4_devs) {
++		pci_read_config_dword(sgiioc4_devs[i], PCI_CLASS_REVISION, &class_rev);
++		class_rev &= 0xff;
++
++		if (sgiioc4_devs[i]->device == PCI_DEVICE_ID_SGI_IOC4) {
++			p += sprintf(p,
++	"\n\tSGI IOC4 Chipset rev %d.\n\t"
++	"Chipset has 1 IDE channel and supports 2 devices on that channel.\n\t"
++	"Chipset supports DMA in MultiMode-2 data transfer protocol.\n",
++				class_rev);
++			/* Do we need more info. here? */
++		}
++		i++;
++	}
++
++	return p - buffer;
++}
++
++#endif				/* CONFIG_PROC_FS */
++
++static int __devinit
++sgiioc4_init_one(struct pci_dev *dev, const struct pci_device_id *id)
++{
++	unsigned int class_rev;
++	ide_pci_device_t *d = &sgiioc4_chipsets[id->driver_data];
++	if (dev->device != d->device) {
++		printk(KERN_ERR "Error in %s(dev 0x%p | id 0x%p )\n",
++		       __FUNCTION__, (void *) dev, (void *) id);
++		BUG();
++	}
++
++	pci_read_config_dword(dev, PCI_CLASS_REVISION, &class_rev);
++	class_rev &= 0xff;
++
++	if (class_rev < IOC4_SUPPORTED_FIRMWARE_REV) {
++		printk(KERN_INFO
++		       "Disabling IOC4 IDE Part due to "
++		       "unsupported Firmware Rev (%d)",
++		       class_rev);
++		printk(KERN_INFO
++		       "\nPlease upgrade to Firmware Rev 46 or higher\n");
++		return 0;
++	}
++
++	printk(KERN_INFO "%s: IDE controller at PCI slot %s\n", d->name,
++	       dev->slot_name);
++
++	if (pci_init_sgiioc4(dev, d))
++		return 0;
++
++	MOD_INC_USE_COUNT;
++
++	return 0;
++}
++
++static struct pci_device_id sgiioc4_pci_tbl[] = {
++	{PCI_VENDOR_ID_SGI, PCI_DEVICE_ID_SGI_IOC4, PCI_ANY_ID,
++	 PCI_ANY_ID, 0x0b4000, 0xFFFFFF, 0},
++	{0}
++};
++
++static struct pci_driver driver = {
++	.name = "SGI-IOC4 IDE",
++	.id_table = sgiioc4_pci_tbl,
++	.probe = sgiioc4_init_one,
++};
++
++static int
++sgiioc4_ide_init(void)
++{
++	return ide_pci_register_driver(&driver);
++}
++
++static void
++sgiioc4_ide_exit(void)
++{
++	ide_pci_unregister_driver(&driver);
++}
++
++module_init(sgiioc4_ide_init);
++module_exit(sgiioc4_ide_exit);
++
++MODULE_AUTHOR("Aniket Malatpure - Silicon Graphics Inc. (SGI)");
++MODULE_DESCRIPTION("PCI driver module for SGI IOC4 Base-IO Card");
++MODULE_LICENSE("GPL");
+--- linux-2.6.0-test6/drivers/ide/pci/siimage.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ide/pci/siimage.c	2003-10-05 00:33:24.000000000 -0700
+@@ -1150,20 +1150,6 @@ static void __init init_hwif_siimage (id
+ 	hwif->drives[1].autodma = hwif->autodma;
+ }
+ 
+-/**
+- *	init_dma_siimage	-	set up IDE DMA
+- *	@hwif: interface
+- *	@dmabase: DMA base address to use
+- *	
+- *	For the SI chips this requires no special set up so we can just
+- *	let the IDE DMA core do the usual work.
+- */
+- 
+-static void __init init_dma_siimage (ide_hwif_t *hwif, unsigned long dmabase)
+-{
+-	ide_setup_dma(hwif, dmabase, 8);
+-}
+-
+ extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *);
+ 
+ 
+--- linux-2.6.0-test6/drivers/ide/pci/siimage.h	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ide/pci/siimage.h	2003-10-05 00:33:24.000000000 -0700
+@@ -44,7 +44,6 @@ static ide_pci_host_proc_t siimage_procs
+ static unsigned int init_chipset_siimage(struct pci_dev *, const char *);
+ static void init_iops_siimage(ide_hwif_t *);
+ static void init_hwif_siimage(ide_hwif_t *);
+-static void init_dma_siimage(ide_hwif_t *, unsigned long);
+ 
+ static ide_pci_device_t siimage_chipsets[] __devinitdata = {
+ 	{	/* 0 */
+@@ -54,7 +53,6 @@ static ide_pci_device_t siimage_chipsets
+ 		.init_chipset	= init_chipset_siimage,
+ 		.init_iops	= init_iops_siimage,
+ 		.init_hwif	= init_hwif_siimage,
+-		.init_dma	= init_dma_siimage,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+@@ -67,7 +65,6 @@ static ide_pci_device_t siimage_chipsets
+ 		.init_chipset	= init_chipset_siimage,
+ 		.init_iops	= init_iops_siimage,
+ 		.init_hwif	= init_hwif_siimage,
+-		.init_dma	= init_dma_siimage,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+@@ -80,7 +77,6 @@ static ide_pci_device_t siimage_chipsets
+ 		.init_chipset	= init_chipset_siimage,
+ 		.init_iops	= init_iops_siimage,
+ 		.init_hwif	= init_hwif_siimage,
+-		.init_dma	= init_dma_siimage,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
+--- linux-2.6.0-test6/drivers/ide/pci/sis5513.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ide/pci/sis5513.c	2003-10-05 00:33:24.000000000 -0700
+@@ -942,11 +942,6 @@ static void __init init_hwif_sis5513 (id
+ 	return;
+ }
+ 
+-static void __init init_dma_sis5513 (ide_hwif_t *hwif, unsigned long dmabase)
+-{
+-	ide_setup_dma(hwif, dmabase, 8);
+-}
+-
+ extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *);
+ 
+ 
+--- linux-2.6.0-test6/drivers/ide/pci/sis5513.h	2003-06-14 12:18:24.000000000 -0700
++++ 25/drivers/ide/pci/sis5513.h	2003-10-05 00:33:24.000000000 -0700
+@@ -27,7 +27,6 @@ static ide_pci_host_proc_t sis_procs[] _
+ 
+ static unsigned int init_chipset_sis5513(struct pci_dev *, const char *);
+ static void init_hwif_sis5513(ide_hwif_t *);
+-static void init_dma_sis5513(ide_hwif_t *, unsigned long);
+ 
+ static ide_pci_device_t sis5513_chipsets[] __devinitdata = {
+ 	{	/* 0 */
+@@ -37,7 +36,6 @@ static ide_pci_device_t sis5513_chipsets
+ 		.init_chipset	= init_chipset_sis5513,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_sis5513,
+-		.init_dma	= init_dma_sis5513,
+ 		.channels	= 2,
+ 		.autodma	= NOAUTODMA,
+ 		.enablebits	= {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},
+--- linux-2.6.0-test6/drivers/ide/pci/slc90e66.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/ide/pci/slc90e66.c	2003-10-05 00:33:24.000000000 -0700
+@@ -362,11 +362,6 @@ static void __init init_hwif_slc90e66 (i
+ #endif /* !CONFIG_BLK_DEV_IDEDMA */
+ }
+ 
+-static void __init init_dma_slc90e66 (ide_hwif_t *hwif, unsigned long dmabase)
+-{
+-	ide_setup_dma(hwif, dmabase, 8);
+-}
+-
+ extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *);
+ 
+ 
+--- linux-2.6.0-test6/drivers/ide/pci/slc90e66.h	2003-06-14 12:18:05.000000000 -0700
++++ 25/drivers/ide/pci/slc90e66.h	2003-10-05 00:33:24.000000000 -0700
+@@ -29,7 +29,6 @@ static ide_pci_host_proc_t slc90e66_proc
+ 
+ static unsigned int init_chipset_slc90e66(struct pci_dev *, const char *);
+ static void init_hwif_slc90e66(ide_hwif_t *);
+-static void init_dma_slc90e66(ide_hwif_t *, unsigned long);
+ 
+ static ide_pci_device_t slc90e66_chipsets[] __devinitdata = {
+ 	{	/* 0 */
+@@ -39,7 +38,6 @@ static ide_pci_device_t slc90e66_chipset
+ 		.init_chipset	= init_chipset_slc90e66,
+ 		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_slc90e66,
+-		.init_dma	= init_dma_slc90e66,
+ 		.channels	= 2,
+ 		.autodma	= AUTODMA,
+ 		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
+--- linux-2.6.0-test6/drivers/ide/pci/via82cxxx.c	2003-08-08 22:55:11.000000000 -0700
++++ 25/drivers/ide/pci/via82cxxx.c	2003-10-05 00:33:24.000000000 -0700
+@@ -1,6 +1,6 @@
+ /*
+  *
+- * Version 3.37
++ * Version 3.38
+  *
+  * VIA IDE driver for Linux. Supported southbridges:
+  *
+@@ -96,7 +96,6 @@ static struct via_isa_bridge {
+ };
+ 
+ static struct via_isa_bridge *via_config;
+-static unsigned char via_enabled;
+ static unsigned int via_80w;
+ static unsigned int via_clock;
+ static char *via_dma[] = { "MWDMA16", "UDMA33", "UDMA66", "UDMA100", "UDMA133" };
+@@ -146,7 +145,7 @@ static int via_get_info(char *buffer, ch
+ 	via_print("----------VIA BusMastering IDE Configuration"
+ 		"----------------");
+ 
+-	via_print("Driver Version:                     3.37");
++	via_print("Driver Version:                     3.38");
+ 	via_print("South Bridge:                       VIA %s",
+ 		via_config->name);
+ 
+@@ -370,9 +369,6 @@ static int via_set_drive(ide_drive_t *dr
+ 
+ static void via82cxxx_tune_drive(ide_drive_t *drive, u8 pio)
+ {
+-	if (!((via_enabled >> HWIF(drive)->channel) & 1))
+-		return;
+-
+ 	if (pio == 255) {
+ 		via_set_drive(drive,
+ 			ide_find_best_mode(drive, XFER_PIO | XFER_EPIO));
+@@ -506,7 +502,6 @@ static unsigned int __init init_chipset_
+ 	 */
+ 
+ 	pci_read_config_byte(dev, VIA_IDE_ENABLE, &v);
+-	via_enabled = ((v & 1) ? 2 : 0) | ((v & 2) ? 1 : 0);
+ 
+ 	/*
+ 	 * Set up FIFO sizes and thresholds.
+@@ -523,9 +518,9 @@ static unsigned int __init init_chipset_
+ 	/* Fix FIFO split between channels */
+ 	if (via_config->flags & VIA_SET_FIFO) {
+ 		t &= (t & 0x9f);
+-		switch (via_enabled) {
+-			case 1: t |= 0x00; break;	/* 16 on primary */
+-			case 2: t |= 0x60; break;	/* 16 on secondary */
++		switch (v & 3) {
++			case 2: t |= 0x00; break;	/* 16 on primary */
++			case 1: t |= 0x60; break;	/* 16 on secondary */
+ 			case 3: t |= 0x20; break;	/* 8 pri 8 sec */
+ 		}
+ 	}
+@@ -603,8 +598,8 @@ static void __init init_hwif_via82cxxx(i
+ 	hwif->mwdma_mask = 0x07;
+ 	hwif->swdma_mask = 0x07;
+ 
+-	if (!(hwif->udma_four))
+-		hwif->udma_four = ((via_enabled & via_80w) >> hwif->channel) & 1;
++	if (!hwif->udma_four)
++		hwif->udma_four = (via_80w >> hwif->channel) & 1;
+ 	hwif->ide_dma_check = &via82cxxx_ide_dma_check;
+ 	if (!noautodma)
+ 		hwif->autodma = 1;
+@@ -612,20 +607,6 @@ static void __init init_hwif_via82cxxx(i
+ 	hwif->drives[1].autodma = hwif->autodma;
+ }
+ 
+-/**
+- *	init_dma_via82cxxx	-	set up for IDE DMA
+- *	@hwif: IDE interface
+- *	@dmabase: DMA base address
+- *
+- *	We allow the BM-DMA driver to only work on enabled interfaces.
+- */
+-
+-static void __init init_dma_via82cxxx(ide_hwif_t *hwif, unsigned long dmabase)
+-{
+-	if ((via_enabled >> hwif->channel) & 1)
+-		ide_setup_dma(hwif, dmabase, 8);
+-}
+-
+ extern void ide_setup_pci_device(struct pci_dev *, ide_pci_device_t *);
+ 
+ static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_id *id)
+--- linux-2.6.0-test6/drivers/ide/pci/via82cxxx.h	2003-06-14 12:18:24.000000000 -0700
++++ 25/drivers/ide/pci/via82cxxx.h	2003-10-05 00:33:24.000000000 -0700
+@@ -27,7 +27,6 @@ static ide_pci_host_proc_t via_procs[] _
+ 
+ static unsigned int init_chipset_via82cxxx(struct pci_dev *, const char *);
+ static void init_hwif_via82cxxx(ide_hwif_t *);
+-static void init_dma_via82cxxx(ide_hwif_t *, unsigned long);
+ 
+ static ide_pci_device_t via82cxxx_chipsets[] __devinitdata = {
+ 	{	/* 0 */
+@@ -35,9 +34,7 @@ static ide_pci_device_t via82cxxx_chipse
+ 		.device		= PCI_DEVICE_ID_VIA_82C576_1,
+ 		.name		= "VP_IDE",
+ 		.init_chipset	= init_chipset_via82cxxx,
+-		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_via82cxxx,
+-		.init_dma	= init_dma_via82cxxx,
+ 		.channels	= 2,
+ 		.autodma	= NOAUTODMA,
+ 		.enablebits	= {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
+@@ -48,9 +45,7 @@ static ide_pci_device_t via82cxxx_chipse
+ 		.device		= PCI_DEVICE_ID_VIA_82C586_1,
+ 		.name		= "VP_IDE",
+ 		.init_chipset	= init_chipset_via82cxxx,
+-		.init_iops	= NULL,
+ 		.init_hwif	= init_hwif_via82cxxx,
+-		.init_dma	= init_dma_via82cxxx,
+ 		.channels	= 2,
+ 		.autodma	= NOAUTODMA,
+ 		.enablebits	= {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
+--- linux-2.6.0-test6/drivers/input/input.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/input/input.c	2003-10-05 00:34:14.000000000 -0700
+@@ -447,9 +447,10 @@ void input_register_device(struct input_
+ 	list_add_tail(&dev->node, &input_dev_list);
+ 
+ 	list_for_each_entry(handler, &input_handler_list, node)
+-		if ((id = input_match_device(handler->id_table, dev)))
+-			if ((handle = handler->connect(handler, dev, id)))
+-				input_link_handle(handle);
++		if (!handler->blacklist || !input_match_device(handler->blacklist, dev))
++			if ((id = input_match_device(handler->id_table, dev)))
++				if ((handle = handler->connect(handler, dev, id)))
++					input_link_handle(handle);
+ 
+ #ifdef CONFIG_HOTPLUG
+ 	input_call_hotplug("add", dev);
+@@ -507,9 +508,10 @@ void input_register_handler(struct input
+ 	list_add_tail(&handler->node, &input_handler_list);
+ 	
+ 	list_for_each_entry(dev, &input_dev_list, node)
+-		if ((id = input_match_device(handler->id_table, dev)))
+-			if ((handle = handler->connect(handler, dev, id)))
+-				input_link_handle(handle);
++		if (!handler->blacklist || !input_match_device(handler->blacklist, dev))
++			if ((id = input_match_device(handler->id_table, dev)))
++				if ((handle = handler->connect(handler, dev, id)))
++					input_link_handle(handle);
+ 
+ #ifdef CONFIG_PROC_FS
+ 	input_devices_state++;
+--- linux-2.6.0-test6/drivers/input/joydev.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/input/joydev.c	2003-10-05 00:34:14.000000000 -0700
+@@ -380,10 +380,6 @@ static struct input_handle *joydev_conne
+ 	struct joydev *joydev;
+ 	int i, j, t, minor;
+ 
+-	/* Avoid tablets */
+-        if (test_bit(EV_KEY, dev->evbit) && test_bit(BTN_TOUCH, dev->keybit))
+-		return NULL;
+-
+ 	for (minor = 0; minor < JOYDEV_MINORS && joydev_table[minor]; minor++);
+ 	if (minor == JOYDEV_MINORS) {
+ 		printk(KERN_ERR "joydev: no more free joydev devices\n");
+@@ -464,6 +460,15 @@ static void joydev_disconnect(struct inp
+ 		joydev_free(joydev);
+ }
+ 
++static struct input_device_id joydev_blacklist[] = {
++	{
++		.flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT,
++		.evbit = { BIT(EV_KEY) },
++		.keybit = { [LONG(BTN_TOUCH)] = BIT(BTN_TOUCH) },
++	}, 	/* Avoid itouchpads, touchscreens and tablets */
++	{ }, 	/* Terminating entry */
++};
++
+ static struct input_device_id joydev_ids[] = {
+ 	{
+ 		.flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_ABSBIT,
+@@ -493,6 +498,7 @@ static struct input_handler joydev_handl
+ 	.minor =	JOYDEV_MINOR_BASE,
+ 	.name =		"joydev",
+ 	.id_table =	joydev_ids,
++	.blacklist = 	joydev_blacklist,
+ };
+ 
+ static int __init joydev_init(void)
+--- linux-2.6.0-test6/drivers/input/joystick/analog.c	2003-06-16 22:32:21.000000000 -0700
++++ 25/drivers/input/joystick/analog.c	2003-10-05 00:33:24.000000000 -0700
+@@ -159,7 +159,7 @@ static unsigned int get_time_pit(void)
+ #define DELTA(x,y)	((y)-(x))
+ #define TIME_NAME	"TSC"
+ #elif __alpha__
+-#define GET_TIME(x)	do { x = get_cycles(x); } while (0)
++#define GET_TIME(x)	do { x = get_cycles(); } while (0)
+ #define DELTA(x,y)	((y)-(x))
+ #define TIME_NAME	"PCC"
+ #else
+--- linux-2.6.0-test6/drivers/input/keyboard/atkbd.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/input/keyboard/atkbd.c	2003-10-05 00:36:37.000000000 -0700
+@@ -369,10 +369,11 @@ static int atkbd_command(struct atkbd *a
+ static int atkbd_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
+ {
+ 	struct atkbd *atkbd = dev->private;
+-	struct { int p; u8 v; } period[] =	
+-		{ {30, 0x00}, {25, 0x02}, {20, 0x04}, {15, 0x08}, {10, 0x0c}, {7, 0x10}, {5, 0x14}, {0, 0x14} };
+-	struct { int d; u8 v; } delay[] =
+-        	{ {1000, 0x60}, {750, 0x40}, {500, 0x20}, {250, 0x00}, {0, 0x00} };
++	const short period[32] =
++		{ 33,  37,  42,  46,  50,  54,  58,  63,  67,  75,  83,  92, 100, 109, 116, 125,
++		 133, 149, 167, 182, 200, 217, 232, 250, 270, 303, 333, 370, 400, 435, 470, 500 };
++	const short delay[4] =
++		{ 250, 500, 750, 1000 };
+ 	char param[2];
+ 	int i, j;
+ 
+@@ -406,11 +407,11 @@ static int atkbd_event(struct input_dev 
+ 			if (atkbd_softrepeat) return 0;
+ 
+ 			i = j = 0;
+-			while (period[i].p > dev->rep[REP_PERIOD]) i++;
+-			while (delay[j].d > dev->rep[REP_DELAY]) j++;
+-			dev->rep[REP_PERIOD] = period[i].p;
+-			dev->rep[REP_DELAY] = delay[j].d;
+-			param[0] = period[i].v | delay[j].v;
++			while (i < 32 && period[i] < dev->rep[REP_PERIOD]) i++;
++			while (j < 4 && delay[j] < dev->rep[REP_DELAY]) j++;
++			dev->rep[REP_PERIOD] = period[i];
++			dev->rep[REP_DELAY] = delay[j];
++			param[0] = i | (j << 5);
+ 			atkbd_command(atkbd, param, ATKBD_CMD_SETREP);
+ 
+ 			return 0;
+@@ -576,6 +577,7 @@ static void atkbd_disconnect(struct seri
+ 	struct atkbd *atkbd = serio->private;
+ 	input_unregister_device(&atkbd->dev);
+ 	serio_close(serio);
++	serio->private = NULL;
+ 	kfree(atkbd);
+ }
+ 
+@@ -634,6 +636,7 @@ static void atkbd_connect(struct serio *
+ 	serio->private = atkbd;
+ 
+ 	if (serio_open(serio, dev)) {
++		serio->private = NULL;
+ 		kfree(atkbd);
+ 		return;
+ 	}
+@@ -642,6 +645,7 @@ static void atkbd_connect(struct serio *
+ 
+ 		if (atkbd_probe(atkbd)) {
+ 			serio_close(serio);
++			serio->private = NULL;
+ 			kfree(atkbd);
+ 			return;
+ 		}
+--- linux-2.6.0-test6/drivers/input/keyboard/Kconfig	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/input/keyboard/Kconfig	2003-10-05 00:33:24.000000000 -0700
+@@ -12,10 +12,11 @@ config INPUT_KEYBOARD
+ 	  If unsure, say Y.
+ 
+ config KEYBOARD_ATKBD
+-	tristate "AT keyboard support" if EMBEDDED || !X86 
++	tristate "AT keyboard support" if !PC
+ 	default y
+ 	depends on INPUT && INPUT_KEYBOARD
+-	select SERIO_I8042
++	select SERIO
++	select SERIO_I8042 if PC
+ 	help
+ 	  Say Y here if you want to use a standard AT or PS/2 keyboard. Usually
+ 	  you'll need this, unless you have a different type keyboard (USB, ADB
+--- linux-2.6.0-test6/drivers/input/mouse/Kconfig	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/input/mouse/Kconfig	2003-10-05 00:33:24.000000000 -0700
+@@ -15,7 +15,8 @@ config MOUSE_PS2
+ 	tristate "PS/2 mouse"
+ 	default y
+ 	depends on INPUT && INPUT_MOUSE
+-	select SERIO_I8042
++	select SERIO
++	select SERIO_I8042 if PC
+ 	---help---
+ 	  Say Y here if you have a PS/2 mouse connected to your system. This
+ 	  includes the standard 2 or 3-button PS/2 mouse, as well as PS/2
+--- linux-2.6.0-test6/drivers/input/mouse/logips2pp.c	2003-06-22 12:04:44.000000000 -0700
++++ 25/drivers/input/mouse/logips2pp.c	2003-10-05 00:34:15.000000000 -0700
+@@ -10,6 +10,7 @@
+  */
+ 
+ #include <linux/input.h>
++#include <linux/serio.h>
+ #include "psmouse.h"
+ #include "logips2pp.h"
+ 
+--- linux-2.6.0-test6/drivers/input/mouse/psmouse-base.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/input/mouse/psmouse-base.c	2003-10-05 00:34:15.000000000 -0700
+@@ -141,7 +141,8 @@ static irqreturn_t psmouse_interrupt(str
+ 		goto out;
+ 	}
+ 
+-	if (psmouse->pktcnt && time_after(jiffies, psmouse->last + HZ/2)) {
++	if (psmouse->state == PSMOUSE_ACTIVATED && 
++	    psmouse->pktcnt && time_after(jiffies, psmouse->last + HZ/2)) {
+ 		printk(KERN_WARNING "psmouse.c: %s at %s lost synchronization, throwing %d bytes away.\n",
+ 		       psmouse->name, psmouse->phys, psmouse->pktcnt);
+ 		psmouse->pktcnt = 0;
+@@ -276,24 +277,18 @@ static int psmouse_extensions(struct psm
+ 		return PSMOUSE_PS2;
+ 
+ /*
+- * Try Synaptics TouchPad magic ID
++ * Try Synaptics TouchPad
+  */
+-
+-       param[0] = 0;
+-       psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES);
+-       psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES);
+-       psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES);
+-       psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES);
+-       psmouse_command(psmouse, param, PSMOUSE_CMD_GETINFO);
+-
+-       if (param[1] == 0x47) {
++	if (synaptics_detect(psmouse) == 0) {
+ 		psmouse->vendor = "Synaptics";
+ 		psmouse->name = "TouchPad";
+-		if (!synaptics_init(psmouse))
++
++#if CONFIG_MOUSE_PS2_SYNAPTICS
++		if (synaptics_init(psmouse) == 0)
+ 			return PSMOUSE_SYNAPTICS;
+-		else
+-			return PSMOUSE_PS2;
+-       }
++#endif
++		return PSMOUSE_PS2;
++	}
+ 
+ /*
+  * Try Genius NetMouse magic init.
+@@ -519,7 +514,18 @@ static void psmouse_disconnect(struct se
+ 	struct psmouse *psmouse = serio->private;
+ 
+ 	psmouse->state = PSMOUSE_IGNORE;
+-	synaptics_disconnect(psmouse);
++	
++	if (psmouse->ptport) {
++		if (psmouse->ptport->deactivate)
++			psmouse->ptport->deactivate(psmouse);
++		__serio_unregister_port(&psmouse->ptport->serio); /* we have serio_sem */
++		kfree(psmouse->ptport);
++		psmouse->ptport = NULL;
++	}
++		
++	if (psmouse->disconnect)
++		psmouse->disconnect(psmouse);
++	
+ 	input_unregister_device(&psmouse->dev);
+ 	serio_close(serio);
+ 	kfree(psmouse);
+@@ -532,20 +538,10 @@ static void psmouse_disconnect(struct se
+ static int psmouse_pm_callback(struct pm_dev *dev, pm_request_t request, void *data)
+ {
+ 	struct psmouse *psmouse = dev->data;
+-	struct serio_dev *ser_dev = psmouse->serio->dev;
+-
+-	synaptics_disconnect(psmouse);
+-
+-	/* We need to reopen the serio port to reinitialize the i8042 controller */
+-	serio_close(psmouse->serio);
+-	serio_open(psmouse->serio, ser_dev);
+-
+-	/* Probe and re-initialize the mouse */
+-	psmouse_probe(psmouse);
+-	psmouse_initialize(psmouse);
+-	synaptics_pt_init(psmouse);
+-	psmouse_activate(psmouse);
+ 
++	psmouse->state = PSMOUSE_IGNORE;
++	serio_reconnect(psmouse->serio);
++	
+ 	return 0;
+ }
+ 
+@@ -553,7 +549,6 @@ static int psmouse_pm_callback(struct pm
+  * psmouse_connect() is a callback from the serio module when
+  * an unhandled serio port is found.
+  */
+-
+ static void psmouse_connect(struct serio *serio, struct serio_dev *dev)
+ {
+ 	struct psmouse *psmouse;
+@@ -578,7 +573,6 @@ static void psmouse_connect(struct serio
+ 	psmouse->dev.private = psmouse;
+ 
+ 	serio->private = psmouse;
+-
+ 	if (serio_open(serio, dev)) {
+ 		kfree(psmouse);
+ 		return;
+@@ -590,10 +584,12 @@ static void psmouse_connect(struct serio
+ 		return;
+ 	}
+ 	
+-	pmdev = pm_register(PM_SYS_DEV, PM_SYS_UNKNOWN, psmouse_pm_callback);
+-	if (pmdev) {
+-		psmouse->dev.pm_dev = pmdev;
+-		pmdev->data = psmouse;
++	if (serio->type != SERIO_PS_PSTHRU) {
++		pmdev = pm_register(PM_SYS_DEV, PM_SYS_UNKNOWN, psmouse_pm_callback);
++		if (pmdev) {
++			psmouse->dev.pm_dev = pmdev;
++			pmdev->data = psmouse;
++		}
+ 	}
+ 
+ 	sprintf(psmouse->devname, "%s %s %s",
+@@ -614,14 +610,70 @@ static void psmouse_connect(struct serio
+ 
+ 	psmouse_initialize(psmouse);
+ 
+-	synaptics_pt_init(psmouse);
++	if (psmouse->ptport) {
++		printk(KERN_INFO "serio: %s port at %s\n", psmouse->ptport->serio.name, psmouse->phys);
++		__serio_register_port(&psmouse->ptport->serio); /* we have serio_sem */
++		if (psmouse->ptport->activate)
++			psmouse->ptport->activate(psmouse);
++	}
++	
++	psmouse_activate(psmouse);
++}
+ 
++
++static int psmouse_reconnect(struct serio *serio)
++{
++	struct psmouse *psmouse = serio->private;
++	struct serio_dev *dev = serio->dev;
++	int old_type = psmouse->type;
++	
++	if (!dev) {
++		printk(KERN_DEBUG "psmouse: reconnect request, but serio is disconnected, ignoring...\n");
++		return -1;
++	}
++	
++	/* We need to reopen the serio port to reinitialize the i8042 controller */
++	serio_close(serio);
++	if (serio_open(serio, dev)) {
++		/* do a disconnect here as serio_open leaves dev as NULL so disconnect 
++		 * will not be called automatically later
++		 */
++		psmouse_disconnect(serio);
++		return -1;
++	}
++	
++	psmouse->state = PSMOUSE_NEW_DEVICE;
++	psmouse->type = psmouse->acking = psmouse->cmdcnt = psmouse->pktcnt = 0;
++	if (psmouse->reconnect) {
++	       if (psmouse->reconnect(psmouse))
++			return -1;
++	} else if (psmouse_probe(psmouse) != old_type)
++		return -1;
++	
++	/* ok, the device type (and capabilities) match the old one,
++	 * we can continue using it, complete intialization
++	 */ 
++	psmouse->type = old_type;
++	psmouse_initialize(psmouse);
++
++	if (psmouse->ptport) {
++       		if (psmouse_reconnect(&psmouse->ptport->serio)) {
++			__serio_unregister_port(&psmouse->ptport->serio);
++			__serio_register_port(&psmouse->ptport->serio);
++			if (psmouse->ptport->activate)
++				psmouse->ptport->activate(psmouse);
++		}
++	}
++	
+ 	psmouse_activate(psmouse);
++	return 0;
+ }
+ 
++
+ static struct serio_dev psmouse_dev = {
+ 	.interrupt =	psmouse_interrupt,
+ 	.connect =	psmouse_connect,
++	.reconnect =	psmouse_reconnect,
+ 	.disconnect =	psmouse_disconnect,
+ 	.cleanup =	psmouse_cleanup,
+ };
+--- linux-2.6.0-test6/drivers/input/mouse/psmouse.h	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/input/mouse/psmouse.h	2003-10-05 00:34:15.000000000 -0700
+@@ -22,10 +22,20 @@
+ #define PSMOUSE_ACTIVATED	1
+ #define PSMOUSE_IGNORE		2
+ 
++struct psmouse;
++
++struct psmouse_ptport {
++	struct serio serio;
++
++	void (*activate)(struct psmouse *parent);
++	void (*deactivate)(struct psmouse *parent);
++};
++
+ struct psmouse {
+ 	void *private;
+ 	struct input_dev dev;
+ 	struct serio *serio;
++	struct psmouse_ptport *ptport;
+ 	char *vendor;
+ 	char *name;
+ 	unsigned char cmdbuf[8];
+@@ -41,6 +51,9 @@ struct psmouse {
+ 	char error;
+ 	char devname[64];
+ 	char phys[32];
++	
++	int (*reconnect)(struct psmouse *psmouse);
++	void (*disconnect)(struct psmouse *psmouse);
+ };
+ 
+ #define PSMOUSE_PS2		1
+--- linux-2.6.0-test6/drivers/input/mouse/synaptics.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/input/mouse/synaptics.c	2003-10-05 00:34:15.000000000 -0700
+@@ -2,7 +2,8 @@
+  * Synaptics TouchPad PS/2 mouse driver
+  *
+  *   2003 Dmitry Torokhov <dtor@mail.ru>
+- *     Added support for pass-through port
++ *     Added support for pass-through port. Special thanks to Peter Berg Larsen
++ *     for explaining various Synaptics quirks.
+  *
+  *   2003 Peter Osterlund <petero2@telia.com>
+  *     Ported to 2.5 input device infrastructure.
+@@ -194,9 +195,7 @@ static void print_ident(struct synaptics
+ 
+ static int synaptics_query_hardware(struct psmouse *psmouse)
+ {
+-	struct synaptics_data *priv = psmouse->private;
+ 	int retries = 0;
+-	int mode;
+ 
+ 	while ((retries++ < 3) && synaptics_reset(psmouse))
+ 		printk(KERN_ERR "synaptics reset failed\n");
+@@ -207,8 +206,15 @@ static int synaptics_query_hardware(stru
+ 		return -1;
+ 	if (synaptics_capability(psmouse))
+ 		return -1;
++	
++	return 0;
++}
+ 
+-	mode = SYN_BIT_ABSOLUTE_MODE | SYN_BIT_HIGH_RATE;
++static int synaptics_set_mode(struct psmouse *psmouse, int mode)
++{
++	struct synaptics_data *priv = psmouse->private;
++
++	mode |= SYN_BIT_ABSOLUTE_MODE | SYN_BIT_HIGH_RATE;
+ 	if (SYN_ID_MAJOR(priv->identity) >= 4)
+ 		mode |= SYN_BIT_DISABLE_GESTURE;
+ 	if (SYN_CAP_EXTENDED(priv->capabilities))
+@@ -265,49 +271,38 @@ static void synaptics_pass_pt_packet(str
+ 	}
+ }
+ 
+-int synaptics_pt_init(struct psmouse *psmouse)
++static void synaptics_pt_activate(struct psmouse *psmouse)
+ {
+-	struct synaptics_data *priv = psmouse->private;
+-	struct serio *port;
+-	struct psmouse *child;
++	struct psmouse *child = psmouse->ptport->serio.private;
++	
++	/* adjust the touchpad to child's choice of protocol */
++	if (child && child->type >= PSMOUSE_GENPS) {
++		if (synaptics_set_mode(psmouse, SYN_BIT_FOUR_BYTE_CLIENT))
++			printk(KERN_INFO "synaptics: failed to enable 4-byte guest protocol\n");
++	}
++}
+ 
+-	if (psmouse->type != PSMOUSE_SYNAPTICS)
+-		return -1;
+-	if (!SYN_CAP_EXTENDED(priv->capabilities))
+-		return -1;
+-	if (!SYN_CAP_PASS_THROUGH(priv->capabilities))
+-		return -1;
++static void synaptics_pt_create(struct psmouse *psmouse)
++{
++	struct psmouse_ptport *port;
+ 
+-	priv->ptport = port = kmalloc(sizeof(struct serio), GFP_KERNEL);
++	psmouse->ptport = port = kmalloc(sizeof(struct psmouse_ptport), GFP_KERNEL);
+ 	if (!port) {
+-		printk(KERN_ERR "synaptics: not enough memory to allocate serio port\n");
+-		return -1;
++		printk(KERN_ERR "synaptics: not enough memory to allocate pass-through port\n");
++		return;
+ 	}
+ 
+-	memset(port, 0, sizeof(struct serio));
+-	port->type = SERIO_PS_PSTHRU;
+-	port->name = "Synaptics pass-through";
+-	port->phys = "synaptics-pt/serio0";
+-	port->write = synaptics_pt_write;
+-	port->open = synaptics_pt_open;
+-	port->close = synaptics_pt_close;
+-	port->driver = psmouse;
++	memset(port, 0, sizeof(struct psmouse_ptport));
+ 
+-	printk(KERN_INFO "serio: %s port at %s\n", port->name, psmouse->phys);
+-	serio_register_slave_port(port);
++	port->serio.type = SERIO_PS_PSTHRU;
++	port->serio.name = "Synaptics pass-through";
++	port->serio.phys = "synaptics-pt/serio0";
++	port->serio.write = synaptics_pt_write;
++	port->serio.open = synaptics_pt_open;
++	port->serio.close = synaptics_pt_close;
++	port->serio.driver = psmouse;
+ 
+-	/* adjust the touchpad to child's choice of protocol */
+-	child = port->private;
+-	if (child && child->type >= PSMOUSE_GENPS) {
+-		if (synaptics_mode_cmd(psmouse, (SYN_BIT_ABSOLUTE_MODE |
+-					 	 SYN_BIT_HIGH_RATE |
+-					 	 SYN_BIT_DISABLE_GESTURE |
+-						 SYN_BIT_FOUR_BYTE_CLIENT |
+-					 	 SYN_BIT_W_MODE)))
+-			printk(KERN_INFO "synaptics: failed to enable 4-byte guest protocol\n");
+-	}
+-
+-	return 0;
++	port->activate = synaptics_pt_activate;
+ }
+ 
+ /*****************************************************************************
+@@ -371,27 +366,82 @@ static void set_input_params(struct inpu
+ 	clear_bit(REL_Y, dev->relbit);
+ }
+ 
++static void synaptics_disconnect(struct psmouse *psmouse)
++{
++	synaptics_mode_cmd(psmouse, 0);
++	kfree(psmouse->private);
++}
++
++static int synaptics_reconnect(struct psmouse *psmouse)
++{
++	struct synaptics_data *priv = psmouse->private;
++	struct synaptics_data old_priv = *priv;
++
++	if (synaptics_detect(psmouse))
++		return -1;
++
++	if (synaptics_query_hardware(psmouse)) {
++		printk(KERN_ERR "Unable to query Synaptics hardware.\n");
++		return -1;
++	}
++	
++	if (old_priv.identity != priv->identity ||
++	    old_priv.model_id != priv->model_id ||
++	    old_priv.capabilities != priv->capabilities ||
++    	    old_priv.ext_cap != priv->ext_cap)
++    		return -1;
++	
++	if (synaptics_set_mode(psmouse, 0)) {
++		printk(KERN_ERR "Unable to initialize Synaptics hardware.\n");
++		return -1;
++	}
++
++	return 0;
++}
++
++int synaptics_detect(struct psmouse *psmouse)
++{
++	unsigned char param[4];
++	
++	param[0] = 0;
++	
++	psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES);
++	psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES);
++	psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES);
++	psmouse_command(psmouse, param, PSMOUSE_CMD_SETRES);
++	psmouse_command(psmouse, param, PSMOUSE_CMD_GETINFO);
++	
++	return param[1] == 0x47 ? 0 : -1;
++}
++
+ int synaptics_init(struct psmouse *psmouse)
+ {
+ 	struct synaptics_data *priv;
+ 
+-#ifndef CONFIG_MOUSE_PS2_SYNAPTICS
+-	return -1;
+-#endif
+-
+ 	psmouse->private = priv = kmalloc(sizeof(struct synaptics_data), GFP_KERNEL);
+ 	if (!priv)
+ 		return -1;
+ 	memset(priv, 0, sizeof(struct synaptics_data));
+ 
+ 	if (synaptics_query_hardware(psmouse)) {
+-		printk(KERN_ERR "Unable to query/initialize Synaptics hardware.\n");
++		printk(KERN_ERR "Unable to query Synaptics hardware.\n");
++		goto init_fail;
++	}
++	
++	if (synaptics_set_mode(psmouse, 0)) {
++		printk(KERN_ERR "Unable to initialize Synaptics hardware.\n");
+ 		goto init_fail;
+ 	}
+ 
++	if (SYN_CAP_EXTENDED(priv->capabilities) && SYN_CAP_PASS_THROUGH(priv->capabilities))
++       		synaptics_pt_create(psmouse);
++	
+ 	print_ident(priv);
+ 	set_input_params(&psmouse->dev, priv);
+ 
++	psmouse->disconnect = synaptics_disconnect;
++	psmouse->reconnect = synaptics_reconnect;
++	
+ 	return 0;
+ 
+  init_fail:
+@@ -399,36 +449,13 @@ int synaptics_init(struct psmouse *psmou
+ 	return -1;
+ }
+ 
+-void synaptics_disconnect(struct psmouse *psmouse)
+-{
+-	struct synaptics_data *priv = psmouse->private;
+-
+-	if (psmouse->type == PSMOUSE_SYNAPTICS && priv) {
+-		synaptics_mode_cmd(psmouse, 0);
+-		if (priv->ptport) {
+-			serio_unregister_slave_port(priv->ptport);
+-			kfree(priv->ptport);
+-		}
+-		kfree(priv);
+-	}
+-}
+-
+ /*****************************************************************************
+  *	Functions to interpret the absolute mode packets
+  ****************************************************************************/
+ 
+ static void synaptics_parse_hw_state(unsigned char buf[], struct synaptics_data *priv, struct synaptics_hw_state *hw)
+ {
+-	hw->up    = 0;
+-	hw->down  = 0;
+-	hw->b0    = 0;
+-	hw->b1    = 0;
+-	hw->b2    = 0;
+-	hw->b3    = 0;
+-	hw->b4    = 0;
+-	hw->b5    = 0;
+-	hw->b6    = 0;
+-	hw->b7    = 0;
++	memset(hw, 0, sizeof(struct synaptics_hw_state));
+ 
+ 	if (SYN_MODEL_NEWABS(priv->model_id)) {
+ 		hw->x = (((buf[3] & 0x10) << 8) |
+@@ -570,64 +597,47 @@ static void synaptics_process_packet(str
+ 	input_sync(dev);
+ }
+ 
++static int synaptics_validate_byte(struct psmouse *psmouse)
++{
++	static unsigned char newabs_mask[] = { 0xC8, 0x00, 0x00, 0xC8, 0x00 };
++	static unsigned char newabs_rslt[] = { 0x80, 0x00, 0x00, 0xC0, 0x00 };
++	static unsigned char oldabs_mask[] = { 0xC0, 0x60, 0x00, 0xC0, 0x60 };
++	static unsigned char oldabs_rslt[] = { 0xC0, 0x00, 0x00, 0x80, 0x00 };
++	struct synaptics_data *priv = psmouse->private;
++	int idx = psmouse->pktcnt - 1;
++
++	if (SYN_MODEL_NEWABS(priv->model_id))
++		return (psmouse->packet[idx] & newabs_mask[idx]) == newabs_rslt[idx];
++	else
++		return (psmouse->packet[idx] & oldabs_mask[idx]) == oldabs_rslt[idx];
++}
++
+ void synaptics_process_byte(struct psmouse *psmouse, struct pt_regs *regs)
+ {
+ 	struct input_dev *dev = &psmouse->dev;
+ 	struct synaptics_data *priv = psmouse->private;
+-	unsigned char data = psmouse->packet[psmouse->pktcnt - 1];
+-	int newabs = SYN_MODEL_NEWABS(priv->model_id);
+ 
+ 	input_regs(dev, regs);
+ 
+-	switch (psmouse->pktcnt) {
+-	case 1:
+-		if (newabs ? ((data & 0xC8) != 0x80) : ((data & 0xC0) != 0xC0)) {
+-			printk(KERN_WARNING "Synaptics driver lost sync at 1st byte\n");
+-			goto bad_sync;
+-		}
+-		break;
+-	case 2:
+-		if (!newabs && ((data & 0x60) != 0x00)) {
+-			printk(KERN_WARNING "Synaptics driver lost sync at 2nd byte\n");
+-			goto bad_sync;
+-		}
+-		break;
+-	case 4:
+-		if (newabs ? ((data & 0xC8) != 0xC0) : ((data & 0xC0) != 0x80)) {
+-			printk(KERN_WARNING "Synaptics driver lost sync at 4th byte\n");
+-			goto bad_sync;
+-		}
+-		break;
+-	case 5:
+-		if (!newabs && ((data & 0x60) != 0x00)) {
+-			printk(KERN_WARNING "Synaptics driver lost sync at 5th byte\n");
+-			goto bad_sync;
+-		}
+-		break;
+-	default:
+-		if (psmouse->pktcnt < 6)
+-			break;		    /* Wait for full packet */
+-
++	if (psmouse->pktcnt >= 6) { /* Full packet received */
+ 		if (priv->out_of_sync) {
+ 			priv->out_of_sync = 0;
+ 			printk(KERN_NOTICE "Synaptics driver resynced.\n");
+ 		}
+ 
+-		if (priv->ptport && synaptics_is_pt_packet(psmouse->packet))
+-			synaptics_pass_pt_packet(priv->ptport, psmouse->packet);
++		if (psmouse->ptport && psmouse->ptport->serio.dev && synaptics_is_pt_packet(psmouse->packet))
++			synaptics_pass_pt_packet(&psmouse->ptport->serio, psmouse->packet);
+ 		else
+ 			synaptics_process_packet(psmouse);
+-
+ 		psmouse->pktcnt = 0;
+-		break;
+-	}
+-	return;
+ 
+- bad_sync:
+-	priv->out_of_sync++;
+-	psmouse->pktcnt = 0;
+-	if (psmouse_resetafter > 0 && priv->out_of_sync	== psmouse_resetafter) {
+-		psmouse->state = PSMOUSE_IGNORE;
+-		serio_rescan(psmouse->serio);
++	} else if (psmouse->pktcnt && !synaptics_validate_byte(psmouse)) {
++		printk(KERN_WARNING "Synaptics driver lost sync at byte %d\n", psmouse->pktcnt);
++		psmouse->pktcnt = 0;
++		if (++priv->out_of_sync == psmouse_resetafter) {
++			psmouse->state = PSMOUSE_IGNORE;
++			printk(KERN_NOTICE "synaptics: issuing reconnect request\n");
++			serio_reconnect(psmouse->serio);
++		}
+ 	}
+ }
+--- linux-2.6.0-test6/drivers/input/mouse/synaptics.h	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/input/mouse/synaptics.h	2003-10-05 00:34:15.000000000 -0700
+@@ -9,11 +9,9 @@
+ #ifndef _SYNAPTICS_H
+ #define _SYNAPTICS_H
+ 
+-
+ extern void synaptics_process_byte(struct psmouse *psmouse, struct pt_regs *regs);
++extern int synaptics_detect(struct psmouse *psmouse);
+ extern int synaptics_init(struct psmouse *psmouse);
+-extern int synaptics_pt_init(struct psmouse *psmouse);
+-extern void synaptics_disconnect(struct psmouse *psmouse);
+ 
+ /* synaptics queries */
+ #define SYN_QUE_IDENTIFY		0x00
+@@ -105,8 +103,6 @@ struct synaptics_data {
+ 	/* Data for normal processing */
+ 	unsigned int out_of_sync;		/* # of packets out of sync */
+ 	int old_w;				/* Previous w value */
+-	
+-	struct serio *ptport;			/* pass-through port */
+ };
+ 
+ #endif /* _SYNAPTICS_H */
+--- linux-2.6.0-test6/drivers/input/serio/serio.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/input/serio/serio.c	2003-10-05 00:34:15.000000000 -0700
+@@ -49,14 +49,15 @@ MODULE_LICENSE("GPL");
+ 
+ EXPORT_SYMBOL(serio_interrupt);
+ EXPORT_SYMBOL(serio_register_port);
+-EXPORT_SYMBOL(serio_register_slave_port);
++EXPORT_SYMBOL(__serio_register_port);
+ EXPORT_SYMBOL(serio_unregister_port);
+-EXPORT_SYMBOL(serio_unregister_slave_port);
++EXPORT_SYMBOL(__serio_unregister_port);
+ EXPORT_SYMBOL(serio_register_device);
+ EXPORT_SYMBOL(serio_unregister_device);
+ EXPORT_SYMBOL(serio_open);
+ EXPORT_SYMBOL(serio_close);
+ EXPORT_SYMBOL(serio_rescan);
++EXPORT_SYMBOL(serio_reconnect);
+ 
+ struct serio_event {
+ 	int type;
+@@ -83,10 +84,20 @@ static void serio_find_dev(struct serio 
+ }
+ 
+ #define SERIO_RESCAN	1
++#define SERIO_RECONNECT	2
+ 
+ static DECLARE_WAIT_QUEUE_HEAD(serio_wait);
+ static DECLARE_COMPLETION(serio_exited);
+ 
++static void serio_invalidate_pending_events(struct serio *serio)
++{
++	struct serio_event *event;
++	
++	list_for_each_entry(event, &serio_event_list, node)
++		if (event->serio == serio)
++			event->serio = NULL;
++}
++
+ void serio_handle_events(void)
+ {
+ 	struct list_head *node, *next;
+@@ -95,17 +106,27 @@ void serio_handle_events(void)
+ 	list_for_each_safe(node, next, &serio_event_list) {
+ 		event = container_of(node, struct serio_event, node);	
+ 
++		down(&serio_sem);
++		if (event->serio == NULL)
++			goto event_done;
++		
+ 		switch (event->type) {
++			case SERIO_RECONNECT :
++				if (event->serio->dev && event->serio->dev->reconnect)
++					if (event->serio->dev->reconnect(event->serio) == 0)
++						break;
++				/* reconnect failed - fall through to rescan */
++				
+ 			case SERIO_RESCAN :
+-				down(&serio_sem);
+ 				if (event->serio->dev && event->serio->dev->disconnect)
+ 					event->serio->dev->disconnect(event->serio);
+ 				serio_find_dev(event->serio);
+-				up(&serio_sem);
+ 				break;
+ 			default:
+ 				break;
+ 		}
++event_done:
++		up(&serio_sem);
+ 		list_del_init(node);
+ 		kfree(event);
+ 	}
+@@ -130,18 +151,27 @@ static int serio_thread(void *nothing)
+ 	complete_and_exit(&serio_exited, 0);
+ }
+ 
+-void serio_rescan(struct serio *serio)
++static void serio_queue_event(struct serio *serio, int event_type)
+ {
+ 	struct serio_event *event;
+ 
+-	if (!(event = kmalloc(sizeof(struct serio_event), GFP_ATOMIC)))
+-		return;
++	if ((event = kmalloc(sizeof(struct serio_event), GFP_ATOMIC))) {
++		event->type = event_type;
++		event->serio = serio;
+ 
+-	event->type = SERIO_RESCAN;
+-	event->serio = serio;
++		list_add_tail(&event->node, &serio_event_list);
++		wake_up(&serio_wait);
++	}
++}
+ 
+-	list_add_tail(&event->node, &serio_event_list);
+-	wake_up(&serio_wait);
++void serio_rescan(struct serio *serio)
++{
++	serio_queue_event(serio, SERIO_RESCAN);
++}
++
++void serio_reconnect(struct serio *serio)
++{
++	serio_queue_event(serio, SERIO_RECONNECT);
+ }
+ 
+ irqreturn_t serio_interrupt(struct serio *serio,
+@@ -163,17 +193,16 @@ irqreturn_t serio_interrupt(struct serio
+ void serio_register_port(struct serio *serio)
+ {
+ 	down(&serio_sem);
+-	list_add_tail(&serio->node, &serio_list);
+-	serio_find_dev(serio);
++	__serio_register_port(serio);
+ 	up(&serio_sem);
+ }
+ 
+ /*
+- * Same as serio_register_port but does not try to acquire serio_sem.
+- * Should be used when registering a serio from other input device's
++ * Should only be called directly if serio_sem has already been taken,
++ * for example when unregistering a serio from other input device's 
+  * connect() function.
+  */
+-void serio_register_slave_port(struct serio *serio)
++void __serio_register_port(struct serio *serio)
+ {
+ 	list_add_tail(&serio->node, &serio_list);
+ 	serio_find_dev(serio);
+@@ -182,19 +211,18 @@ void serio_register_slave_port(struct se
+ void serio_unregister_port(struct serio *serio)
+ {
+ 	down(&serio_sem);
+-	list_del_init(&serio->node);
+-	if (serio->dev && serio->dev->disconnect)
+-		serio->dev->disconnect(serio);
++	__serio_unregister_port(serio);
+ 	up(&serio_sem);
+ }
+ 
+ /*
+- * Same as serio_unregister_port but does not try to acquire serio_sem.
+- * Should be used when unregistering a serio from other input device's
++ * Should only be called directly if serio_sem has already been taken,
++ * for example when unregistering a serio from other input device's 
+  * disconnect() function.
+  */
+-void serio_unregister_slave_port(struct serio *serio)
++void __serio_unregister_port(struct serio *serio)
+ {
++	serio_invalidate_pending_events(serio);
+ 	list_del_init(&serio->node);
+ 	if (serio->dev && serio->dev->disconnect)
+ 		serio->dev->disconnect(serio);
+--- linux-2.6.0-test6/drivers/isdn/hardware/eicon/debuglib.h	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/isdn/hardware/eicon/debuglib.h	2003-10-05 00:33:24.000000000 -0700
+@@ -103,28 +103,28 @@
+ #define DL_TO_KERNEL    0x40000000
+ 
+ #ifdef DIVA_NO_DEBUGLIB
+-#define myDbgPrint_LOG(x,...) do { } while(0);
+-#define myDbgPrint_FTL(x,...) do { } while(0);
+-#define myDbgPrint_ERR(x,...) do { } while(0);
+-#define myDbgPrint_TRC(x,...) do { } while(0);
+-#define myDbgPrint_MXLOG(x,...) do { } while(0);
+-#define myDbgPrint_EVL(x,...) do { } while(0);
+-#define myDbgPrint_REG(x,...) do { } while(0);
+-#define myDbgPrint_MEM(x,...) do { } while(0);
+-#define myDbgPrint_SPL(x,...) do { } while(0);
+-#define myDbgPrint_IRP(x,...) do { } while(0);
+-#define myDbgPrint_TIM(x,...) do { } while(0);
+-#define myDbgPrint_BLK(x,...) do { } while(0);
+-#define myDbgPrint_TAPI(x,...) do { } while(0);
+-#define myDbgPrint_NDIS(x,...) do { } while(0);
+-#define myDbgPrint_CONN(x,...) do { } while(0);
+-#define myDbgPrint_STAT(x,...) do { } while(0);
+-#define myDbgPrint_SEND(x,...) do { } while(0);
+-#define myDbgPrint_RECV(x,...) do { } while(0);
+-#define myDbgPrint_PRV0(x,...) do { } while(0);
+-#define myDbgPrint_PRV1(x,...) do { } while(0);
+-#define myDbgPrint_PRV2(x,...) do { } while(0);
+-#define myDbgPrint_PRV3(x,...) do { } while(0);
++#define myDbgPrint_LOG(x...) do { } while(0);
++#define myDbgPrint_FTL(x...) do { } while(0);
++#define myDbgPrint_ERR(x...) do { } while(0);
++#define myDbgPrint_TRC(x...) do { } while(0);
++#define myDbgPrint_MXLOG(x...) do { } while(0);
++#define myDbgPrint_EVL(x...) do { } while(0);
++#define myDbgPrint_REG(x...) do { } while(0);
++#define myDbgPrint_MEM(x...) do { } while(0);
++#define myDbgPrint_SPL(x...) do { } while(0);
++#define myDbgPrint_IRP(x...) do { } while(0);
++#define myDbgPrint_TIM(x...) do { } while(0);
++#define myDbgPrint_BLK(x...) do { } while(0);
++#define myDbgPrint_TAPI(x...) do { } while(0);
++#define myDbgPrint_NDIS(x...) do { } while(0);
++#define myDbgPrint_CONN(x...) do { } while(0);
++#define myDbgPrint_STAT(x...) do { } while(0);
++#define myDbgPrint_SEND(x...) do { } while(0);
++#define myDbgPrint_RECV(x...) do { } while(0);
++#define myDbgPrint_PRV0(x...) do { } while(0);
++#define myDbgPrint_PRV1(x...) do { } while(0);
++#define myDbgPrint_PRV2(x...) do { } while(0);
++#define myDbgPrint_PRV3(x...) do { } while(0);
+ #define DBG_TEST(func,args) do { } while(0);
+ #define DBG_EVL_ID(args) do { } while(0);
+ 
+--- linux-2.6.0-test6/drivers/isdn/hardware/eicon/divamnt.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/isdn/hardware/eicon/divamnt.c	2003-10-05 00:33:24.000000000 -0700
+@@ -24,6 +24,5 @@
+ #include "platform.h"
+ #include "di_defs.h"
+ #include "divasync.h"
+-#include "di_defs.h"
+ #include "debug_if.h"
+ 
+--- linux-2.6.0-test6/drivers/isdn/hardware/eicon/divasmain.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/isdn/hardware/eicon/divasmain.c	2003-10-05 00:33:24.000000000 -0700
+@@ -9,13 +9,11 @@
+  * of the GNU General Public License, incorporated herein by reference.
+  */
+ 
+-#define __KERNEL_SYSCALLS__
+ #include <linux/config.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
+ #include <linux/kernel.h>
+ #include <linux/sched.h>
+-#include <linux/unistd.h>
+ #include <linux/devfs_fs_kernel.h>
+ #include <asm/uaccess.h>
+ #include <asm/io.h>
+--- linux-2.6.0-test6/drivers/isdn/hardware/eicon/mntfunc.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/isdn/hardware/eicon/mntfunc.c	2003-10-05 00:33:24.000000000 -0700
+@@ -14,7 +14,6 @@
+ #include "platform.h"
+ #include "di_defs.h"
+ #include "divasync.h"
+-#include "di_defs.h"
+ #include "debug_if.h"
+ 
+ extern char *DRIVERRELEASE_MNT;
+--- linux-2.6.0-test6/drivers/isdn/hardware/eicon/platform.h	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/isdn/hardware/eicon/platform.h	2003-10-05 00:33:24.000000000 -0700
+@@ -19,7 +19,6 @@
+ #endif
+ 
+ #include <linux/config.h>
+-#include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
+ #include <linux/kernel.h>
+--- linux-2.6.0-test6/drivers/isdn/i4l/isdn_common.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/isdn/i4l/isdn_common.c	2003-10-05 00:33:24.000000000 -0700
+@@ -2229,8 +2229,10 @@ static int __init isdn_init(void)
+ 	isdn_info_update();
+ 	return 0;
+ 
+-/* err_tty_modem:*/
++#ifdef CONFIG_ISDN_PPP
++ err_tty_modem:
+ 	isdn_tty_exit();
++#endif
+  err_cleanup_devfs:
+ 	isdn_cleanup_devfs();
+ 	unregister_chrdev(ISDN_MAJOR, "isdn");
+--- linux-2.6.0-test6/drivers/mca/mca-legacy.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/drivers/mca/mca-legacy.c	2003-10-05 00:33:24.000000000 -0700
+@@ -28,7 +28,7 @@
+ 
+ #include <linux/module.h>
+ #include <linux/device.h>
+-#include <linux/mca.h>
++#include <linux/mca-legacy.h>
+ #include <asm/io.h>
+ 
+ /* NOTE: This structure is stack allocated */
+--- linux-2.6.0-test6/drivers/mca/mca-proc.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/drivers/mca/mca-proc.c	2003-10-05 00:33:24.000000000 -0700
+@@ -120,12 +120,13 @@ static int mca_default_procfn(char* buf,
+ 	len += sprintf(buf+len, "Id: %02x%02x\n",
+ 		mca_dev->pos[1], mca_dev->pos[0]);
+ 	len += sprintf(buf+len, "Enabled: %s\nPOS: ",
+-		mca_isenabled(slot) ? "Yes" : "No");
++		mca_device_status(mca_dev) == MCA_ADAPTER_NORMAL ?
++			"Yes" : "No");
+ 	for(i=0; i<8; i++) {
+ 		len += sprintf(buf+len, "%02x ", mca_dev->pos[i]);
+ 	}
+ 	len += sprintf(buf+len, "\nDriver Installed: %s",
+-		mca_is_adapter_used(slot) ? "Yes" : "No");
++		mca_device_claimed(mca_dev) ? "Yes" : "No");
+ 	buf[len++] = '\n';
+ 	buf[len] = 0;
+ 
+@@ -189,6 +190,7 @@ void __init mca_do_proc_init(void)
+ 	/* Initialize /proc/mca entries for existing adapters */
+ 
+ 	for(i = 0; i < MCA_NUMADAPTERS; i++) {
++		enum MCA_AdapterStatus status;
+ 		mca_dev = mca_find_device_by_slot(i);
+ 		if(!mca_dev)
+ 			continue;
+@@ -200,7 +202,10 @@ void __init mca_do_proc_init(void)
+ 		else if(i == MCA_INTEGSCSI) sprintf(mca_dev->procname,"scsi");
+ 		else if(i == MCA_MOTHERBOARD) sprintf(mca_dev->procname,"planar");
+ 
+-		if(!mca_isadapter(i)) continue;
++		status = mca_device_status(mca_dev);
++		if (status != MCA_ADAPTER_NORMAL &&
++		    status != MCA_ADAPTER_DISABLED)
++			continue;
+ 
+ 		node = create_proc_read_entry(mca_dev->procname, 0, proc_mca,
+ 					      mca_read_proc, (void *)mca_dev);
+--- linux-2.6.0-test6/drivers/md/dm.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/md/dm.c	2003-10-05 00:34:01.000000000 -0700
+@@ -160,20 +160,16 @@ static void __exit dm_exit(void)
+ /*
+  * Block device functions
+  */
+-static int dm_blk_open(struct inode *inode, struct file *file)
++static int dm_blk_open(struct block_device *bdev, struct file *file)
+ {
+-	struct mapped_device *md;
+-
+-	md = inode->i_bdev->bd_disk->private_data;
++	struct mapped_device *md = bdev->bd_disk->private_data;
+ 	dm_get(md);
+ 	return 0;
+ }
+ 
+-static int dm_blk_close(struct inode *inode, struct file *file)
++static int dm_blk_close(struct gendisk *disk)
+ {
+-	struct mapped_device *md;
+-
+-	md = inode->i_bdev->bd_disk->private_data;
++	struct mapped_device *md = disk->private_data;
+ 	dm_put(md);
+ 	return 0;
+ }
+--- linux-2.6.0-test6/drivers/md/md.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/md/md.c	2003-10-05 00:34:01.000000000 -0700
+@@ -2360,11 +2360,10 @@ static int set_disk_faulty(mddev_t *mdde
+ 	return 1;
+ }
+ 
+-static int md_ioctl(struct inode *inode, struct file *file,
++static int md_ioctl(struct block_device *bdev, struct file *file,
+ 			unsigned int cmd, unsigned long arg)
+ {
+ 	char b[BDEVNAME_SIZE];
+-	unsigned int minor = iminor(inode);
+ 	int err = 0;
+ 	struct hd_geometry *loc = (struct hd_geometry *) arg;
+ 	mddev_t *mddev = NULL;
+@@ -2372,11 +2371,6 @@ static int md_ioctl(struct inode *inode,
+ 	if (!capable(CAP_SYS_ADMIN))
+ 		return -EACCES;
+ 
+-	if (minor >= MAX_MD_DEVS) {
+-		MD_BUG();
+-		return -EINVAL;
+-	}
+-
+ 	/*
+ 	 * Commands dealing with the RAID driver but not any
+ 	 * particular array:
+@@ -2405,7 +2399,7 @@ static int md_ioctl(struct inode *inode,
+ 	 * Commands creating/starting a new array:
+ 	 */
+ 
+-	mddev = inode->i_bdev->bd_inode->u.generic_ip;
++	mddev = bdev->bd_inode->u.generic_ip;
+ 
+ 	if (!mddev) {
+ 		BUG();
+@@ -2527,7 +2521,7 @@ static int md_ioctl(struct inode *inode,
+ 						(short *) &loc->cylinders);
+ 			if (err)
+ 				goto abort_unlock;
+-			err = put_user (get_start_sect(inode->i_bdev),
++			err = put_user (get_start_sect(bdev),
+ 						(long *) &loc->start);
+ 			goto done_unlock;
+ 	}
+@@ -2605,12 +2599,12 @@ abort:
+ 	return err;
+ }
+ 
+-static int md_open(struct inode *inode, struct file *file)
++static int md_open(struct block_device *bdev, struct file *file)
+ {
+ 	/*
+ 	 * Succeed if we can find or allocate a mddev structure.
+ 	 */
+-	mddev_t *mddev = mddev_find(iminor(inode));
++	mddev_t *mddev = mddev_find(MINOR(bdev->bd_dev));
+ 	int err = -ENOMEM;
+ 
+ 	if (!mddev)
+@@ -2621,16 +2615,16 @@ static int md_open(struct inode *inode, 
+ 
+ 	err = 0;
+ 	mddev_unlock(mddev);
+-	inode->i_bdev->bd_inode->u.generic_ip = mddev_get(mddev);
++	bdev->bd_inode->u.generic_ip = mddev_get(mddev);
+  put:
+ 	mddev_put(mddev);
+  out:
+ 	return err;
+ }
+ 
+-static int md_release(struct inode *inode, struct file * file)
++static int md_release(struct gendisk *disk)
+ {
+- 	mddev_t *mddev = inode->i_bdev->bd_inode->u.generic_ip;
++ 	mddev_t *mddev = disk->private_data;
+ 
+ 	if (!mddev)
+ 		BUG();
+--- linux-2.6.0-test6/drivers/media/common/saa7146_i2c.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/media/common/saa7146_i2c.c	2003-10-05 00:33:24.000000000 -0700
+@@ -1,3 +1,4 @@
++#include <linux/version.h>
+ #include <media/saa7146_vv.h>
+ 
+ /* helper function */
+--- linux-2.6.0-test6/drivers/media/dvb/dvb-core/dvbdev.h	2003-07-27 12:14:39.000000000 -0700
++++ 25/drivers/media/dvb/dvb-core/dvbdev.h	2003-10-05 00:33:24.000000000 -0700
+@@ -28,7 +28,6 @@
+ #include <linux/poll.h>
+ #include <linux/fs.h>
+ #include <linux/list.h>
+-#include <linux/version.h>
+ #include <linux/devfs_fs_kernel.h>
+ 
+ #define DVB_MAJOR 250
+--- linux-2.6.0-test6/drivers/media/dvb/dvb-core/dvb_functions.c	2003-07-27 12:14:39.000000000 -0700
++++ 25/drivers/media/dvb/dvb-core/dvb_functions.c	2003-10-05 00:33:24.000000000 -0700
+@@ -1,4 +1,3 @@
+-#include <linux/version.h>
+ #include <linux/errno.h>
+ #include <linux/fs.h>
+ #include <linux/string.h>
+--- linux-2.6.0-test6/drivers/media/dvb/dvb-core/dvb_functions.h	2003-07-27 12:14:39.000000000 -0700
++++ 25/drivers/media/dvb/dvb-core/dvb_functions.h	2003-10-05 00:33:24.000000000 -0700
+@@ -1,8 +1,6 @@
+ #ifndef __DVB_FUNCTIONS_H__
+ #define __DVB_FUNCTIONS_H__
+ 
+-#include <linux/version.h>
+-
+ /**
+  *  a sleeping delay function, waits i ms
+  *
+--- linux-2.6.0-test6/drivers/media/dvb/ttpci/av7110.c	2003-07-27 12:14:39.000000000 -0700
++++ 25/drivers/media/dvb/ttpci/av7110.c	2003-10-05 00:33:24.000000000 -0700
+@@ -55,10 +55,8 @@
+ #include <linux/ptrace.h>
+ #include <linux/ioport.h>
+ #include <linux/in.h>
+-#include <linux/slab.h>
+ #include <linux/string.h>
+ #include <linux/pci.h>
+-#include <linux/init.h>
+ #include <linux/vmalloc.h>
+ #include <linux/netdevice.h>
+ #include <linux/inetdevice.h>
+@@ -4745,12 +4743,19 @@ static struct saa7146_extension av7110_e
+ 
+ static int __init av7110_init(void) 
+ {
+-	if (saa7146_register_extension(&av7110_extension))
+-		return -ENODEV;
++	int retval;
++	retval = saa7146_register_extension(&av7110_extension);
++	if (retval)
++		goto failed_saa7146_register;
+ 	
+-	av7110_ir_init();
+-
++	retval = av7110_ir_init();
++	if (retval)
++		goto failed_av7110_ir_init;
+ 	return 0;
++failed_av7110_ir_init:
++	saa7146_unregister_extension(&av7110_extension);
++failed_saa7146_register:
++	return retval;
+ }
+ 
+ 
+--- linux-2.6.0-test6/drivers/media/dvb/ttpci/budget.c	2003-07-27 12:14:39.000000000 -0700
++++ 25/drivers/media/dvb/ttpci/budget.c	2003-10-05 00:33:24.000000000 -0700
+@@ -228,10 +228,7 @@ static struct saa7146_extension budget_e
+ 
+ static int __init budget_init(void) 
+ {
+-	if (saa7146_register_extension(&budget_extension))
+-		return -ENODEV;
+-	
+-	return 0;
++	return saa7146_register_extension(&budget_extension);
+ }
+ 
+ 
+--- linux-2.6.0-test6/drivers/media/dvb/ttpci/budget-ci.c	2003-07-27 12:14:39.000000000 -0700
++++ 25/drivers/media/dvb/ttpci/budget-ci.c	2003-10-05 00:33:24.000000000 -0700
+@@ -384,10 +384,7 @@ static struct saa7146_extension budget_e
+ 
+ static int __init budget_ci_init(void) 
+ {
+-	if (saa7146_register_extension(&budget_extension))
+-		return -ENODEV;
+-	
+-	return 0;
++	return saa7146_register_extension(&budget_extension);
+ }
+ 
+ 
+--- linux-2.6.0-test6/drivers/media/dvb/ttpci/budget-patch.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/media/dvb/ttpci/budget-patch.c	2003-10-05 00:33:24.000000000 -0700
+@@ -247,10 +247,7 @@ static int budget_patch_detach (struct s
+ 
+ static int __init budget_patch_init(void) 
+ {
+-        if (saa7146_register_extension(&budget_extension))
+-                return -ENODEV;
+-        
+-        return 0;
++	return saa7146_register_extension(&budget_extension);
+ }
+ 
+ 
+--- linux-2.6.0-test6/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c	2003-10-05 00:33:24.000000000 -0700
+@@ -9,6 +9,7 @@
+  *	published by the Free Software Foundation; either version 2 of
+  *	the License, or (at your option) any later version.
+  */
++#include <linux/version.h>
+ #include <linux/init.h>
+ #include <linux/slab.h>
+ #include <linux/wait.h>
+@@ -27,7 +28,6 @@
+ #include <linux/dvb/frontend.h>
+ #include <linux/dvb/dmx.h>
+ #include <linux/pci.h>
+-#include <linux/usb.h>
+ 
+ #include "dvb_functions.h"
+ 
+@@ -1055,7 +1055,8 @@ static ssize_t stc_read(struct file *fil
+ 	if (tc < 0)
+ 		return 0;
+ 
+-	copy_to_user(buf, stc_firmware + *offset, tc);
++	if (copy_to_user(buf, stc_firmware + *offset, tc))
++		return -EFAULT;
+ 
+ 	*offset += tc;
+ 
+--- linux-2.6.0-test6/drivers/media/dvb/ttusb-dec/ttusb_dec.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/media/dvb/ttusb-dec/ttusb_dec.c	2003-10-05 00:33:24.000000000 -0700
+@@ -19,6 +19,7 @@
+  *
+  */
+ 
++#include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/pci.h>
+ #include <linux/slab.h>
+--- linux-2.6.0-test6/drivers/media/radio/radio-gemtek-pci.c	2003-06-14 12:17:57.000000000 -0700
++++ 25/drivers/media/radio/radio-gemtek-pci.c	2003-10-05 00:33:24.000000000 -0700
+@@ -37,7 +37,6 @@
+  ***************************************************************************
+  */
+ 
+-#include <linux/version.h>
+ #include <linux/config.h>
+ #include <linux/types.h>
+ #include <linux/list.h>
+--- linux-2.6.0-test6/drivers/media/video/adv7170.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/media/video/adv7170.c	2003-10-05 00:33:24.000000000 -0700
+@@ -28,8 +28,6 @@
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
+-#include <linux/version.h>
+-
+ #include <linux/module.h>
+ #include <linux/init.h>
+ #include <linux/delay.h>
+@@ -49,7 +47,6 @@
+ #include <linux/types.h>
+ 
+ #include <linux/videodev.h>
+-#include <linux/version.h>
+ #include <asm/uaccess.h>
+ 
+ MODULE_DESCRIPTION("Analog Devices ADV7170 video encoder driver");
+--- linux-2.6.0-test6/drivers/media/video/adv7175.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/media/video/adv7175.c	2003-10-05 00:33:24.000000000 -0700
+@@ -24,8 +24,6 @@
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
+-#include <linux/version.h>
+-
+ #include <linux/module.h>
+ #include <linux/init.h>
+ #include <linux/delay.h>
+@@ -45,7 +43,6 @@
+ #include <linux/types.h>
+ 
+ #include <linux/videodev.h>
+-#include <linux/version.h>
+ #include <asm/uaccess.h>
+ 
+ MODULE_DESCRIPTION("Analog Devices ADV7175 video encoder driver");
+--- linux-2.6.0-test6/drivers/media/video/bt819.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/media/video/bt819.c	2003-10-05 00:33:24.000000000 -0700
+@@ -28,8 +28,6 @@
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
+-#include <linux/version.h>
+-
+ #include <linux/module.h>
+ #include <linux/init.h>
+ #include <linux/delay.h>
+@@ -49,7 +47,6 @@
+ #include <linux/types.h>
+ 
+ #include <linux/videodev.h>
+-#include <linux/version.h>
+ #include <asm/uaccess.h>
+ 
+ MODULE_DESCRIPTION("Brooktree-819 video decoder driver");
+--- linux-2.6.0-test6/drivers/media/video/bt856.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/media/video/bt856.c	2003-10-05 00:33:24.000000000 -0700
+@@ -28,8 +28,6 @@
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
+-#include <linux/version.h>
+-
+ #include <linux/module.h>
+ #include <linux/init.h>
+ #include <linux/delay.h>
+@@ -49,7 +47,6 @@
+ #include <linux/types.h>
+ 
+ #include <linux/videodev.h>
+-#include <linux/version.h>
+ #include <asm/uaccess.h>
+ 
+ MODULE_DESCRIPTION("Brooktree-856A video encoder driver");
+--- linux-2.6.0-test6/drivers/media/video/bttvp.h	2003-08-22 19:23:40.000000000 -0700
++++ 25/drivers/media/video/bttvp.h	2003-10-05 00:33:24.000000000 -0700
+@@ -25,6 +25,7 @@
+ #define _BTTVP_H_
+ 
+ 
++#include <linux/version.h>
+ #define BTTV_VERSION_CODE KERNEL_VERSION(0,9,11)
+ 
+ #include <linux/types.h>
+--- linux-2.6.0-test6/drivers/media/video/bw-qcam.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/media/video/bw-qcam.c	2003-10-05 00:33:24.000000000 -0700
+@@ -72,7 +72,6 @@ OTHER DEALINGS IN THE SOFTWARE.
+ #include <linux/mm.h>
+ #include <linux/parport.h>
+ #include <linux/sched.h>
+-#include <linux/version.h>
+ #include <linux/videodev.h>
+ #include <asm/semaphore.h>
+ #include <asm/uaccess.h>
+--- linux-2.6.0-test6/drivers/media/video/cpia.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/media/video/cpia.c	2003-10-05 00:33:24.000000000 -0700
+@@ -29,7 +29,6 @@
+ #include <linux/config.h>
+ 
+ #include <linux/module.h>
+-#include <linux/version.h>
+ #include <linux/init.h>
+ #include <linux/fs.h>
+ #include <linux/vmalloc.h>
+--- linux-2.6.0-test6/drivers/media/video/cpia_pp.c	2003-06-14 12:17:56.000000000 -0700
++++ 25/drivers/media/video/cpia_pp.c	2003-10-05 00:33:24.000000000 -0700
+@@ -26,7 +26,6 @@
+ /* #define _CPIA_DEBUG_  1 */  
+ 
+ #include <linux/config.h>
+-#include <linux/version.h>
+ 
+ #include <linux/module.h>
+ #include <linux/init.h>
+--- linux-2.6.0-test6/drivers/media/video/c-qcam.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/media/video/c-qcam.c	2003-10-05 00:33:24.000000000 -0700
+@@ -33,7 +33,6 @@
+ #include <linux/mm.h>
+ #include <linux/parport.h>
+ #include <linux/sched.h>
+-#include <linux/version.h>
+ #include <linux/videodev.h>
+ #include <asm/semaphore.h>
+ #include <asm/uaccess.h>
+--- linux-2.6.0-test6/drivers/media/video/meye.h	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/media/video/meye.h	2003-10-05 00:33:24.000000000 -0700
+@@ -36,8 +36,6 @@
+ #include <linux/config.h>
+ #include <linux/types.h>
+ #include <linux/pci.h>
+-#include <linux/sonypi.h>
+-#include <linux/meye.h>
+ 
+ /****************************************************************************/
+ /* Motion JPEG chip registers                                               */
+--- linux-2.6.0-test6/drivers/media/video/planb.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/media/video/planb.c	2003-10-05 00:33:24.000000000 -0700
+@@ -29,5 +29,4 @@
+ 
+-#include <linux/version.h>
+ #include <linux/init.h>
+ #include <linux/errno.h>
+ #include <linux/module.h>
+--- linux-2.6.0-test6/drivers/media/video/pms.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/media/video/pms.c	2003-10-05 00:33:24.000000000 -0700
+@@ -30,7 +30,6 @@
+ #include <asm/io.h>
+ #include <linux/sched.h>
+ #include <linux/videodev.h>
+-#include <linux/version.h>
+ #include <asm/uaccess.h>
+ 
+ 
+--- linux-2.6.0-test6/drivers/media/video/saa7110.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/media/video/saa7110.c	2003-10-05 00:33:24.000000000 -0700
+@@ -25,8 +25,6 @@
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
+-#include <linux/version.h>
+-
+ #include <linux/module.h>
+ #include <linux/init.h>
+ #include <linux/types.h>
+--- linux-2.6.0-test6/drivers/media/video/saa7111.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/media/video/saa7111.c	2003-10-05 00:33:24.000000000 -0700
+@@ -24,8 +24,6 @@
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
+-#include <linux/version.h>
+-
+ #include <linux/module.h>
+ #include <linux/init.h>
+ #include <linux/delay.h>
+@@ -45,7 +43,6 @@
+ #include <linux/types.h>
+ 
+ #include <linux/videodev.h>
+-#include <linux/version.h>
+ #include <asm/uaccess.h>
+ 
+ MODULE_DESCRIPTION("Philips SAA7111 video decoder driver");
+--- linux-2.6.0-test6/drivers/media/video/saa7114.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/media/video/saa7114.c	2003-10-05 00:33:24.000000000 -0700
+@@ -28,8 +28,6 @@
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
+-#include <linux/version.h>
+-
+ #include <linux/module.h>
+ #include <linux/init.h>
+ #include <linux/delay.h>
+@@ -51,7 +49,6 @@
+ #include <linux/types.h>
+ 
+ #include <linux/videodev.h>
+-#include <linux/version.h>
+ #include <asm/uaccess.h>
+ 
+ MODULE_DESCRIPTION("Philips SAA7114H video decoder driver");
+--- linux-2.6.0-test6/drivers/media/video/saa7134/saa7134.h	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/media/video/saa7134/saa7134.h	2003-10-05 00:33:24.000000000 -0700
+@@ -18,6 +18,7 @@
+  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
++#include <linux/version.h>
+ #include <linux/pci.h>
+ #include <linux/i2c.h>
+ #include <linux/videodev.h>
+--- linux-2.6.0-test6/drivers/media/video/saa7185.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/media/video/saa7185.c	2003-10-05 00:33:24.000000000 -0700
+@@ -24,8 +24,6 @@
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
+-#include <linux/version.h>
+-
+ #include <linux/module.h>
+ #include <linux/init.h>
+ #include <linux/delay.h>
+@@ -45,7 +43,6 @@
+ #include <linux/types.h>
+ 
+ #include <linux/videodev.h>
+-#include <linux/version.h>
+ #include <asm/uaccess.h>
+ 
+ MODULE_DESCRIPTION("Philips SAA7185 video encoder driver");
+--- linux-2.6.0-test6/drivers/media/video/stradis.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/media/video/stradis.c	2003-10-05 00:33:24.000000000 -0700
+@@ -20,7 +20,6 @@
+  */
+ 
+ #include <linux/module.h>
+-#include <linux/version.h>
+ #include <linux/delay.h>
+ #include <linux/errno.h>
+ #include <linux/fs.h>
+--- linux-2.6.0-test6/drivers/media/video/tuner-3036.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/media/video/tuner-3036.c	2003-10-05 00:33:24.000000000 -0700
+@@ -21,7 +21,6 @@
+ #include <linux/delay.h>
+ #include <linux/errno.h>
+ #include <linux/slab.h>
+-#include <linux/version.h>
+ #include <linux/init.h>
+ 
+ #include <linux/i2c.h>
+--- linux-2.6.0-test6/drivers/media/video/v4l2-common.c	2003-06-14 12:18:34.000000000 -0700
++++ 25/drivers/media/video/v4l2-common.c	2003-10-05 00:33:24.000000000 -0700
+@@ -45,7 +45,6 @@
+  */
+ 
+ #include <linux/config.h>
+-#include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+--- linux-2.6.0-test6/drivers/media/video/videocodec.c	2003-08-22 19:23:40.000000000 -0700
++++ 25/drivers/media/video/videocodec.c	2003-10-05 00:33:24.000000000 -0700
+@@ -29,7 +29,6 @@
+ 
+ #define VIDEOCODEC_VERSION "v0.2"
+ 
+-#include <linux/version.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
+--- linux-2.6.0-test6/drivers/media/video/videodev.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/media/video/videodev.c	2003-10-05 00:33:24.000000000 -0700
+@@ -15,7 +15,6 @@
+  *		- Added procfs support
+  */
+ 
+-#include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+@@ -27,7 +26,6 @@
+ #include <linux/init.h>
+ #include <linux/kmod.h>
+ #include <linux/slab.h>
+-#include <linux/types.h>
+ #include <linux/devfs_fs_kernel.h>
+ #include <asm/uaccess.h>
+ #include <asm/system.h>
+@@ -52,7 +50,7 @@ static ssize_t show_dev(struct class_dev
+ {
+ 	struct video_device *vfd = container_of(cd, struct video_device, class_dev);
+ 	dev_t dev = MKDEV(VIDEO_MAJOR, vfd->minor);
+-	return sprintf(buf,"%04x\n",old_encode_dev(dev));
++	return print_dev_t(buf,dev);
+ }
+ 
+ static CLASS_DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
+--- linux-2.6.0-test6/drivers/media/video/vpx3220.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/media/video/vpx3220.c	2003-10-05 00:33:24.000000000 -0700
+@@ -18,7 +18,6 @@
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
+-#include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
+ #include <linux/delay.h>
+--- linux-2.6.0-test6/drivers/media/video/zoran_card.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/media/video/zoran_card.c	2003-10-05 00:33:24.000000000 -0700
+@@ -28,7 +28,6 @@
+  */
+ 
+ #include <linux/config.h>
+-#include <linux/version.h>
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+--- linux-2.6.0-test6/drivers/media/video/zoran_device.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/media/video/zoran_device.c	2003-10-05 00:33:24.000000000 -0700
+@@ -28,7 +28,6 @@
+  */
+ 
+ #include <linux/config.h>
+-#include <linux/version.h>
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+--- linux-2.6.0-test6/drivers/media/video/zoran_procfs.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/media/video/zoran_procfs.c	2003-10-05 00:33:24.000000000 -0700
+@@ -28,7 +28,6 @@
+  */
+ 
+ #include <linux/config.h>
+-#include <linux/version.h>
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+--- linux-2.6.0-test6/drivers/media/video/zr36120.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/media/video/zr36120.c	2003-10-05 00:33:24.000000000 -0700
+@@ -36,7 +36,6 @@
+ #include <linux/sched.h>
+ #include <linux/video_decoder.h>
+ 
+-#include <linux/version.h>
+ #include <asm/uaccess.h>
+ 
+ #include "tuner.h"
+--- linux-2.6.0-test6/drivers/media/video/zr36120_i2c.c	2003-06-14 12:18:52.000000000 -0700
++++ 25/drivers/media/video/zr36120_i2c.c	2003-10-05 00:33:24.000000000 -0700
+@@ -22,7 +22,6 @@
+ #include <linux/delay.h>
+ #include <asm/io.h>
+ 
+-#include <linux/version.h>
+ #include <linux/video_decoder.h>
+ #include <asm/uaccess.h>
+ 
+--- linux-2.6.0-test6/drivers/message/i2o/i2o_block.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/message/i2o/i2o_block.c	2003-10-05 00:34:01.000000000 -0700
+@@ -885,10 +885,10 @@ static void i2o_block_biosparam(
+  *	Issue device specific ioctl calls.
+  */
+ 
+-static int i2ob_ioctl(struct inode *inode, struct file *file,
++static int i2ob_ioctl(struct block_device *bdev, struct file *file,
+ 		     unsigned int cmd, unsigned long arg)
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
++	struct gendisk *disk = bdev->bd_disk;
+ 	struct i2ob_device *dev = disk->private_data;
+ 
+ 	/* Anyone capable of this syscall can do *real bad* things */
+@@ -901,7 +901,7 @@ static int i2ob_ioctl(struct inode *inod
+ 			struct hd_geometry g;
+ 			i2o_block_biosparam(get_capacity(disk), 
+ 					&g.cylinders, &g.heads, &g.sectors);
+-			g.start = get_start_sect(inode->i_bdev);
++			g.start = get_start_sect(bdev);
+ 			return copy_to_user((void *)arg,&g, sizeof(g))?-EFAULT:0;
+ 		}
+ 		
+@@ -927,9 +927,8 @@ static int i2ob_ioctl(struct inode *inod
+  *	Close the block device down
+  */
+  
+-static int i2ob_release(struct inode *inode, struct file *file)
++static int i2ob_release(struct gendisk *disk)
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
+ 	struct i2ob_device *dev = disk->private_data;
+ 
+ 	/*
+@@ -999,9 +998,9 @@ static int i2ob_release(struct inode *in
+  *	Open the block device.
+  */
+  
+-static int i2ob_open(struct inode *inode, struct file *file)
++static int i2ob_open(struct block_device *bdev, struct file *file)
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
++	struct gendisk *disk = bdev->bd_disk;
+ 	struct i2ob_device *dev = disk->private_data;
+ 
+ 	if(!dev->i2odev)	
+--- linux-2.6.0-test6/drivers/mtd/chips/cfi_cmdset_0020.c	2003-06-14 12:18:06.000000000 -0700
++++ 25/drivers/mtd/chips/cfi_cmdset_0020.c	2003-10-05 00:33:24.000000000 -0700
+@@ -17,6 +17,7 @@
+  *	- added a writev function
+  */
+ 
++#include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+@@ -26,7 +27,6 @@
+ #include <asm/byteorder.h>
+ 
+ #include <linux/errno.h>
+-#include <linux/init.h>
+ #include <linux/slab.h>
+ #include <linux/delay.h>
+ #include <linux/interrupt.h>
+@@ -208,6 +208,7 @@ static struct mtd_info *cfi_staa_setup(s
+ 	if (!mtd->eraseregions) { 
+ 		printk(KERN_ERR "Failed to allocate memory for MTD erase region info\n");
+ 		kfree(cfi->cmdset_priv);
++		kfree(mtd);
+ 		return NULL;
+ 	}
+ 	
+@@ -232,6 +233,7 @@ static struct mtd_info *cfi_staa_setup(s
+ 			printk(KERN_WARNING "Sum of regions (%lx) != total size of set of interleaved chips (%lx)\n", offset, devsize);
+ 			kfree(mtd->eraseregions);
+ 			kfree(cfi->cmdset_priv);
++			kfree(mtd);
+ 			return NULL;
+ 		}
+ 
+--- linux-2.6.0-test6/drivers/mtd/chips/gen_probe.c	2003-07-02 14:53:14.000000000 -0700
++++ 25/drivers/mtd/chips/gen_probe.c	2003-10-05 00:33:24.000000000 -0700
+@@ -11,7 +11,6 @@
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/map.h>
+ #include <linux/mtd/cfi.h>
+-#include <linux/mtd/mtd.h>
+ #include <linux/mtd/gen_probe.h>
+ 
+ static struct mtd_info *check_cmd_set(struct map_info *, int);
+--- linux-2.6.0-test6/drivers/mtd/chips/map_rom.c	2003-06-14 12:18:24.000000000 -0700
++++ 25/drivers/mtd/chips/map_rom.c	2003-10-05 00:33:24.000000000 -0700
+@@ -5,6 +5,7 @@
+  */
+ 
+-#include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+--- linux-2.6.0-test6/drivers/mtd/chips/sharp.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/mtd/chips/sharp.c	2003-10-05 00:33:24.000000000 -0700
+@@ -22,7 +22,6 @@
+ 
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+-#include <linux/version.h>
+ #include <linux/types.h>
+ #include <linux/sched.h>
+ #include <linux/errno.h>
+--- linux-2.6.0-test6/drivers/mtd/devices/lart.c	2003-06-14 12:18:08.000000000 -0700
++++ 25/drivers/mtd/devices/lart.c	2003-10-05 00:33:24.000000000 -0700
+@@ -42,7 +42,6 @@
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+ #include <linux/types.h>
+-#include <linux/version.h>
+ #include <linux/errno.h>
+ #include <linux/mtd/mtd.h>
+ #ifdef HAVE_PARTITIONS
+--- linux-2.6.0-test6/drivers/mtd/devices/pmc551.c	2003-06-14 12:18:29.000000000 -0700
++++ 25/drivers/mtd/devices/pmc551.c	2003-10-05 00:33:24.000000000 -0700
+@@ -82,6 +82,7 @@
+  *       * Comb the init routine.  It's still a bit cludgy on a few things.
+  */
+ 
++#include <linux/version.h>
+ #include <linux/config.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+--- linux-2.6.0-test6/drivers/mtd/maps/integrator-flash.c	2003-06-14 12:18:29.000000000 -0700
++++ 25/drivers/mtd/maps/integrator-flash.c	2003-10-05 00:33:24.000000000 -0700
+@@ -31,223 +31,181 @@
+ #include <linux/kernel.h>
+ #include <linux/slab.h>
+ #include <linux/ioport.h>
++#include <linux/device.h>
+ #include <linux/init.h>
+ 
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/map.h>
+ #include <linux/mtd/partitions.h>
+ 
++#include <asm/mach/flash.h>
+ #include <asm/hardware.h>
+ #include <asm/io.h>
+ #include <asm/system.h>
+ 
+-// board specific stuff - sorry, it should be in arch/arm/mach-*.
+-#ifdef CONFIG_ARCH_INTEGRATOR
+-
+-#define FLASH_BASE	INTEGRATOR_FLASH_BASE
+-#define FLASH_SIZE	INTEGRATOR_FLASH_SIZE
+-
+-#define FLASH_PART_SIZE 0x400000
+-
+-#define SC_CTRLC	(IO_ADDRESS(INTEGRATOR_SC_BASE) + INTEGRATOR_SC_CTRLC_OFFSET)
+-#define SC_CTRLS	(IO_ADDRESS(INTEGRATOR_SC_BASE) + INTEGRATOR_SC_CTRLS_OFFSET)
+-#define EBI_CSR1	(IO_ADDRESS(INTEGRATOR_EBI_BASE) + INTEGRATOR_EBI_CSR1_OFFSET)
+-#define EBI_LOCK	(IO_ADDRESS(INTEGRATOR_EBI_BASE) + INTEGRATOR_EBI_LOCK_OFFSET)
+-
+-/*
+- * Initialise the flash access systems:
+- *  - Disable VPP
+- *  - Assert WP
+- *  - Set write enable bit in EBI reg
+- */
+-static void armflash_flash_init(void)
+-{
+-	unsigned int tmp;
+-
+-	__raw_writel(INTEGRATOR_SC_CTRL_nFLVPPEN | INTEGRATOR_SC_CTRL_nFLWP, SC_CTRLC);
+-
+-	tmp = __raw_readl(EBI_CSR1) | INTEGRATOR_EBI_WRITE_ENABLE;
+-	__raw_writel(tmp, EBI_CSR1);
+-
+-	if (!(__raw_readl(EBI_CSR1) & INTEGRATOR_EBI_WRITE_ENABLE)) {
+-		__raw_writel(0xa05f, EBI_LOCK);
+-		__raw_writel(tmp, EBI_CSR1);
+-		__raw_writel(0, EBI_LOCK);
+-	}
+-}
+-
+-/*
+- * Shutdown the flash access systems:
+- *  - Disable VPP
+- *  - Assert WP
+- *  - Clear write enable bit in EBI reg
+- */
+-static void armflash_flash_exit(void)
+-{
+-	unsigned int tmp;
+-
+-	__raw_writel(INTEGRATOR_SC_CTRL_nFLVPPEN | INTEGRATOR_SC_CTRL_nFLWP, SC_CTRLC);
+-
+-	/*
+-	 * Clear the write enable bit in system controller EBI register.
+-	 */
+-	tmp = __raw_readl(EBI_CSR1) & ~INTEGRATOR_EBI_WRITE_ENABLE;
+-	__raw_writel(tmp, EBI_CSR1);
+-
+-	if (__raw_readl(EBI_CSR1) & INTEGRATOR_EBI_WRITE_ENABLE) {
+-		__raw_writel(0xa05f, EBI_LOCK);
+-		__raw_writel(tmp, EBI_CSR1);
+-		__raw_writel(0, EBI_LOCK);
+-	}
+-}
+-
+-static void armflash_flash_wp(int on)
+-{
+-	unsigned int reg;
+-
+-	if (on)
+-		reg = SC_CTRLC;
+-	else
+-		reg = SC_CTRLS;
+-
+-	__raw_writel(INTEGRATOR_SC_CTRL_nFLWP, reg);
+-}
+-
+-static void armflash_set_vpp(struct map_info *map, int on)
+-{
+-	unsigned int reg;
+-
+-	if (on)
+-		reg = SC_CTRLS;
+-	else
+-		reg = SC_CTRLC;
+-
+-	__raw_writel(INTEGRATOR_SC_CTRL_nFLVPPEN, reg);
+-}
+-#endif
+-
+ #ifdef CONFIG_ARCH_P720T
+-
+ #define FLASH_BASE		(0x04000000)
+ #define FLASH_SIZE		(64*1024*1024)
++#endif
+ 
+-#define FLASH_PART_SIZE 	(4*1024*1024)
+-#define FLASH_BLOCK_SIZE	(128*1024)
++struct armflash_info {
++	struct flash_platform_data *plat;
++	struct resource		*res;
++	struct mtd_partition	*parts;
++	struct mtd_info		*mtd;
++	struct map_info		map;
++};
+ 
+-static void armflash_flash_init(void)
++static void armflash_set_vpp(struct map_info *map, int on)
+ {
+-}
++	struct armflash_info *info = container_of(map, struct armflash_info, map);
+ 
+-static void armflash_flash_exit(void)
+-{
++	if (info->plat && info->plat->set_vpp)
++		info->plat->set_vpp(on);
+ }
+ 
+-static void armflash_flash_wp(int on)
+-{
+-}
++static const char *probes[] = { "RedBoot", "afs", NULL };
+ 
+-static void armflash_set_vpp(struct map_info *map, int on)
++static int armflash_probe(struct device *_dev)
+ {
+-}
+-#endif
++	struct platform_device *dev = to_platform_device(_dev);
++	struct flash_platform_data *plat = dev->dev.platform_data;
++	struct resource *res = dev->resource;
++	unsigned int size = res->end - res->start + 1;
++	struct armflash_info *info;
++	int err;
++	void *base;
+ 
++	info = kmalloc(sizeof(struct armflash_info), GFP_KERNEL);
++	if (!info) {
++		err = -ENOMEM;
++		goto out;
++	}
+ 
+-static struct map_info armflash_map =
+-{
+-	.name =		"AFS",
+-	.set_vpp =	armflash_set_vpp,
+-	.phys =		FLASH_BASE,
+-};
++	memset(info, 0, sizeof(struct armflash_info));
+ 
+-static struct mtd_info *mtd;
+-static struct mtd_partition *parts;
+-static const char *probes[] = { "RedBoot", "afs", NULL };
++	info->plat = plat;
++	if (plat && plat->init) {
++		err = plat->init();
++		if (err)
++			goto no_resource;
++	}
+ 
+-static int __init armflash_cfi_init(void *base, u_int size)
+-{
+-	int ret;
++	info->res = request_mem_region(res->start, size, "armflash");
++	if (!info->res) {
++		err = -EBUSY;
++		goto no_resource;
++	}
+ 
+-	armflash_flash_init();
+-	armflash_flash_wp(1);
++	base = ioremap(res->start, size);
++	if (!base) {
++		err = -ENOMEM;
++		goto no_mem;
++	}
+ 
+ 	/*
+ 	 * look for CFI based flash parts fitted to this board
+ 	 */
+-	armflash_map.size       = size;
+-	armflash_map.buswidth   = 4;
+-	armflash_map.virt = (unsigned long) base;
++	info->map.size		= size;
++	info->map.buswidth	= plat->width;
++	info->map.phys		= res->start;
++	info->map.virt		= (unsigned long) base;
++	info->map.name		= dev->dev.bus_id;
++	info->map.set_vpp	= armflash_set_vpp;
+ 
+-	simple_map_init(&armflash_map);
++	simple_map_init(&info->map);
+ 
+ 	/*
+ 	 * Also, the CFI layer automatically works out what size
+ 	 * of chips we have, and does the necessary identification
+ 	 * for us automatically.
+ 	 */
+-	mtd = do_map_probe("cfi_probe", &armflash_map);
+-	if (!mtd)
+-		return -ENXIO;
+-
+-	mtd->owner = THIS_MODULE;
+-
+-	ret = parse_mtd_partitions(mtd, probes, &parts, (void *)0);
+-	if (ret > 0) {
+-		ret = add_mtd_partitions(mtd, parts, ret);
+-		if (ret)
+-			printk(KERN_ERR "mtd partition registration "
+-				"failed: %d\n", ret);
++	info->mtd = do_map_probe(plat->map_name, &info->map);
++	if (!info->mtd) {
++		err = -ENXIO;
++		goto no_device;
+ 	}
+ 
++	info->mtd->owner = THIS_MODULE;
++
++	err = parse_mtd_partitions(info->mtd, probes, &info->parts, 0);
++	if (err > 0) {
++		err = add_mtd_partitions(info->mtd, info->parts, err);
++		if (err)
++			printk(KERN_ERR
++			       "mtd partition registration failed: %d\n", err);
++	}
++
++	if (err == 0)
++		dev_set_drvdata(&dev->dev, info);
++
+ 	/*
+ 	 * If we got an error, free all resources.
+ 	 */
+-	if (ret < 0) {
+-		del_mtd_partitions(mtd);
+-		map_destroy(mtd);
+-	}
++	if (err < 0) {
++		if (info->mtd) {
++			del_mtd_partitions(info->mtd);
++			map_destroy(info->mtd);
++		}
++		if (info->parts)
++			kfree(info->parts);
+ 
+-	return ret;
+-}
+-
+-static void armflash_cfi_exit(void)
+-{
+-	if (mtd) {
+-		del_mtd_partitions(mtd);
+-		map_destroy(mtd);
++ no_device:
++		iounmap(base);
++ no_mem:
++		release_mem_region(res->start, size);
++ no_resource:
++		if (plat && plat->exit)
++			plat->exit();
++		kfree(info);
+ 	}
+-	if (parts)
+-		kfree(parts);
++ out:
++	return err;
+ }
+ 
+-static int __init armflash_init(void)
++static int armflash_remove(struct device *_dev)
+ {
+-	int err = -EBUSY;
+-	void *base;
++	struct platform_device *dev = to_platform_device(_dev);
++	struct armflash_info *info = dev_get_drvdata(&dev->dev);
+ 
+-	if (request_mem_region(FLASH_BASE, FLASH_SIZE, "flash") == NULL)
+-		goto out;
++	dev_set_drvdata(&dev->dev, NULL);
+ 
+-	base = ioremap(FLASH_BASE, FLASH_SIZE);
+-	err = -ENOMEM;
+-	if (base == NULL)
+-		goto release;
++	if (info) {
++		if (info->mtd) {
++			del_mtd_partitions(info->mtd);
++			map_destroy(info->mtd);
++		}
++		if (info->parts)
++			kfree(info->parts);
+ 
+-	err = armflash_cfi_init(base, FLASH_SIZE);
+-	if (err) {
+-		iounmap(base);
+-release:
+-		release_mem_region(FLASH_BASE, FLASH_SIZE);
++		iounmap((void *)info->map.virt);
++		release_resource(info->res);
++		kfree(info->res);
++
++		if (info->plat && info->plat->exit)
++			info->plat->exit();
++
++		kfree(info);
+ 	}
+-out:
+-	return err;
++
++	return 0;
++}
++
++static struct device_driver armflash_driver = {
++	.name		= "armflash",
++	.bus		= &platform_bus_type,
++	.probe		= armflash_probe,
++	.remove		= armflash_remove,
++};
++
++static int __init armflash_init(void)
++{
++	return driver_register(&armflash_driver);
+ }
+ 
+ static void __exit armflash_exit(void)
+ {
+-	armflash_cfi_exit();
+-	iounmap((void *)armflash_map.virt);
+-	release_mem_region(FLASH_BASE, FLASH_SIZE);
+-	armflash_flash_exit();
++	driver_unregister(&armflash_driver);
+ }
+ 
+ module_init(armflash_init);
+--- linux-2.6.0-test6/drivers/mtd/maps/sun_uflash.c	2003-06-14 12:18:25.000000000 -0700
++++ 25/drivers/mtd/maps/sun_uflash.c	2003-10-05 00:33:24.000000000 -0700
+@@ -12,7 +12,6 @@
+ 
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+-#include <linux/version.h>
+ #include <linux/fs.h>
+ #include <linux/errno.h>
+ #include <linux/init.h>
+--- linux-2.6.0-test6/drivers/mtd/mtd_blkdevs.c	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/mtd/mtd_blkdevs.c	2003-10-05 00:34:01.000000000 -0700
+@@ -141,14 +141,12 @@ static void mtd_blktrans_request(struct 
+ }
+ 
+ 
+-int blktrans_open(struct inode *i, struct file *f)
++static int blktrans_open(struct block_device *bdev, struct file *f)
+ {
+-	struct mtd_blktrans_dev *dev;
+-	struct mtd_blktrans_ops *tr;
++	struct mtd_blktrans_dev *dev = bdev->bd_disk->private_data;
++	struct mtd_blktrans_ops *tr = dev->tr;
+ 	int ret = -ENODEV;
+ 
+-	dev = i->i_bdev->bd_disk->private_data;
+-	tr = dev->tr;
+ 
+ 	if (!try_module_get(dev->mtd->owner))
+ 		goto out;
+@@ -172,15 +170,12 @@ int blktrans_open(struct inode *i, struc
+ 	return ret;
+ }
+ 
+-int blktrans_release(struct inode *i, struct file *f)
++static int blktrans_release(struct gendisk *disk)
+ {
+-	struct mtd_blktrans_dev *dev;
+-	struct mtd_blktrans_ops *tr;
++	struct mtd_blktrans_dev *dev = disk->private_data;
++	struct mtd_blktrans_ops *tr = dev->tr;
+ 	int ret = 0;
+ 
+-	dev = i->i_bdev->bd_disk->private_data;
+-	tr = dev->tr;
+-
+ 	if (tr->release)
+ 		ret = tr->release(dev);
+ 
+@@ -194,10 +189,10 @@ int blktrans_release(struct inode *i, st
+ }
+ 
+ 
+-static int blktrans_ioctl(struct inode *inode, struct file *file, 
++static int blktrans_ioctl(struct block_device *bdev, struct file *file, 
+ 			      unsigned int cmd, unsigned long arg)
+ {
+-	struct mtd_blktrans_dev *dev = inode->i_bdev->bd_disk->private_data;
++	struct mtd_blktrans_dev *dev = bdev->bd_disk->private_data;
+ 	struct mtd_blktrans_ops *tr = dev->tr;
+ 
+ 	switch (cmd) {
+@@ -217,7 +212,7 @@ static int blktrans_ioctl(struct inode *
+ 			if (ret)
+ 				return ret;
+ 
+-			g.start = get_start_sect(inode->i_bdev);
++			g.start = get_start_sect(bdev);
+ 			if (copy_to_user((void *)arg, &g, sizeof(g)))
+ 				return -EFAULT;
+ 			return 0;
+--- linux-2.6.0-test6/drivers/mtd/mtdcore.c	2003-06-14 12:18:20.000000000 -0700
++++ 25/drivers/mtd/mtdcore.c	2003-10-05 00:33:24.000000000 -0700
+@@ -6,6 +6,7 @@
+  *
+  */
+ 
++#include <linux/version.h>
+ #include <linux/config.h>
+ #include <linux/module.h>
+ #include <linux/kernel.h>
+--- linux-2.6.0-test6/drivers/mtd/nand/autcpu12.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/mtd/nand/autcpu12.c	2003-10-05 00:33:24.000000000 -0700
+@@ -27,6 +27,7 @@
+  *	10-06-2002 TG	128K card support added
+  */
+ 
++#include <linux/version.h>
+ #include <linux/slab.h>
+ #include <linux/init.h>
+ #include <linux/module.h>
+--- linux-2.6.0-test6/drivers/net/3c523.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/3c523.c	2003-10-05 00:33:24.000000000 -0700
+@@ -102,7 +102,7 @@
+ #include <linux/slab.h>
+ #include <linux/interrupt.h>
+ #include <linux/delay.h>
+-#include <linux/mca.h>
++#include <linux/mca-legacy.h>
+ #include <linux/ethtool.h>
+ 
+ #include <asm/uaccess.h>
+--- linux-2.6.0-test6/drivers/net/3c527.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/3c527.c	2003-10-05 00:33:24.000000000 -0700
+@@ -92,7 +92,7 @@ DRV_NAME ".c:v" DRV_VERSION " " DRV_RELD
+ #include <linux/types.h>
+ #include <linux/fcntl.h>
+ #include <linux/interrupt.h>
+-#include <linux/mca.h>
++#include <linux/mca-legacy.h>
+ #include <linux/ioport.h>
+ #include <linux/in.h>
+ #include <linux/skbuff.h>
+--- linux-2.6.0-test6/drivers/net/3c59x.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/3c59x.c	2003-10-05 00:33:46.000000000 -0700
+@@ -1063,6 +1063,22 @@ static int __devinit vortex_init_one (st
+ 	return rc;
+ }
+ 
++#ifdef CONFIG_NET_POLL_CONTROLLER
++static void vortex_rx_poll(struct net_device *dev)
++{
++	disable_irq(dev->irq);
++	vortex_interrupt(dev->irq, (void *)dev, 0);
++	enable_irq(dev->irq);
++}
++
++static void boomerang_rx_poll(struct net_device *dev)
++{
++	disable_irq(dev->irq);
++	boomerang_interrupt(dev->irq, (void *)dev, 0);
++	enable_irq(dev->irq);
++}
++#endif
++
+ /*
+  * Start up the PCI/EISA device which is described by *gendev.
+  * Return 0 on success.
+@@ -1450,6 +1466,13 @@ static int __devinit vortex_probe1(struc
+ 	dev->set_multicast_list = set_rx_mode;
+ 	dev->tx_timeout = vortex_tx_timeout;
+ 	dev->watchdog_timeo = (watchdog * HZ) / 1000;
++#ifdef CONFIG_NET_POLL_CONTROLLER
++	if (vp->full_bus_master_tx)
++		dev->poll_controller = boomerang_rx_poll;
++	else
++		dev->poll_controller = vortex_rx_poll;
++#endif
++
+ 	if (pdev) {
+ 		vp->pm_state_valid = 1;
+  		pci_save_state(VORTEX_PCI(vp), vp->power_state);
+--- linux-2.6.0-test6/drivers/net/8139too.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/8139too.c	2003-10-05 00:34:34.000000000 -0700
+@@ -248,6 +248,7 @@ static struct pci_device_id rtl8139_pci_
+ 	{0x14ea, 0xab06, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
+ 	{0x14ea, 0xab07, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
+ 	{0x11db, 0x1234, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
++	{0x1432, 0x9130, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 },
+ 
+ #ifdef CONFIG_SH_SECUREEDGE5410
+ 	/* Bogus 8139 silicon reports 8129 without external PROM :-( */
+--- linux-2.6.0-test6/drivers/net/arcnet/com20020.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/arcnet/com20020.c	2003-10-05 00:33:24.000000000 -0700
+@@ -180,10 +180,6 @@ int com20020_found(struct net_device *de
+ 	if (!dev->dev_addr[0])
+ 		dev->dev_addr[0] = inb(ioaddr + 8);	/* FIXME: do this some other way! */
+ 
+-	/* reserve the I/O region */
+-	if (!request_region(ioaddr, ARCNET_TOTAL_SIZE, "arcnet (COM20020)"))
+-		return -EBUSY;
+-
+ 	SET_SUBADR(SUB_SETUP1);
+ 	outb(lp->setup, _XREG);
+ 
+@@ -207,7 +203,6 @@ int com20020_found(struct net_device *de
+ 	if (request_irq(dev->irq, &arcnet_interrupt, shared,
+ 			"arcnet (COM20020)", dev)) {
+ 		BUGMSG(D_NORMAL, "Can't get IRQ %d!\n", dev->irq);
+-		release_region(ioaddr, ARCNET_TOTAL_SIZE);
+ 		return -ENODEV;
+ 	}
+ 
+@@ -227,7 +222,6 @@ int com20020_found(struct net_device *de
+ 	       clockrates[3 - ((lp->setup2 & 0xF0) >> 4) + ((lp->setup & 0x0F) >> 1)]);
+ 
+ 	if (!dev->init && register_netdev(dev)) {
+-		release_region(ioaddr, ARCNET_TOTAL_SIZE);
+ 		free_irq(dev->irq, dev);
+ 		return -EIO;
+ 	}
+@@ -342,7 +336,6 @@ void com20020_remove(struct net_device *
+ {
+ 	unregister_netdev(dev);
+ 	free_irq(dev->irq, dev);
+-	release_region(dev->base_addr, ARCNET_TOTAL_SIZE);
+ 	kfree(dev->priv);
+ 	free_netdev(dev);
+ }
+--- linux-2.6.0-test6/drivers/net/arcnet/com20020-isa.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/net/arcnet/com20020-isa.c	2003-10-05 00:33:24.000000000 -0700
+@@ -53,6 +53,7 @@ static int __init com20020isa_probe(stru
+ 	int ioaddr;
+ 	unsigned long airqmask;
+ 	struct arcnet_local *lp = dev->priv;
++	int err;
+ 
+ 	BUGLVL(D_NORMAL) printk(VERSION);
+ 
+@@ -62,17 +63,20 @@ static int __init com20020isa_probe(stru
+ 		       "must specify the base address!\n");
+ 		return -ENODEV;
+ 	}
+-	if (check_region(ioaddr, ARCNET_TOTAL_SIZE)) {
++	if (!request_region(ioaddr, ARCNET_TOTAL_SIZE, "arcnet (COM20020)")) {
+ 		BUGMSG(D_NORMAL, "IO region %xh-%xh already allocated.\n",
+ 		       ioaddr, ioaddr + ARCNET_TOTAL_SIZE - 1);
+ 		return -ENXIO;
+ 	}
+ 	if (ASTATUS() == 0xFF) {
+ 		BUGMSG(D_NORMAL, "IO address %x empty\n", ioaddr);
+-		return -ENODEV;
++		err = -ENODEV;
++		goto out;
++	}
++	if (com20020_check(dev)) {
++		err = -ENODEV;
++		goto out;
+ 	}
+-	if (com20020_check(dev))
+-		return -ENODEV;
+ 
+ 	if (!dev->irq) {
+ 		/* if we do this, we're sure to get an IRQ since the
+@@ -96,13 +100,21 @@ static int __init com20020isa_probe(stru
+ 			dev->irq = probe_irq_off(airqmask);
+ 			if (dev->irq <= 0) {
+ 				BUGMSG(D_NORMAL, "Autoprobe IRQ failed.\n");
+-				return -ENODEV;
++				err = -ENODEV;
++				goto out;
+ 			}
+ 		}
+ 	}
+ 
+ 	lp->card_name = "ISA COM20020";
+-	return com20020_found(dev, 0);
++	if ((err = com20020_found(dev, 0)) != 0)
++		goto out;
++
++	return 0;
++
++out:
++	release_region(ioaddr, ARCNET_TOTAL_SIZE);
++	return err;
+ }
+ 
+ 
+@@ -170,6 +182,7 @@ int init_module(void)
+ void cleanup_module(void)
+ {
+ 	com20020_remove(my_dev);
++	release_region(my_dev->base_addr, ARCNET_TOTAL_SIZE);
+ }
+ 
+ #else
+--- linux-2.6.0-test6/drivers/net/arcnet/com20020-pci.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/arcnet/com20020-pci.c	2003-10-05 00:33:24.000000000 -0700
+@@ -115,20 +115,20 @@ static int __devinit com20020pci_probe(s
+ 		BUGMSG(D_NORMAL, "IO address %Xh was reported by PCI BIOS, "
+ 		       "but seems empty!\n", ioaddr);
+ 		err = -EIO;
+-		goto out_priv;
++		goto out_port;
+ 	}
+ 	if (com20020_check(dev)) {
+ 		err = -EIO;
+-		goto out_priv;
++		goto out_port;
+ 	}
+ 
+-	release_region(ioaddr, ARCNET_TOTAL_SIZE);
+-
+ 	if ((err = com20020_found(dev, SA_SHIRQ)) != 0)
+-	        goto out_priv;
++	        goto out_port;
+ 
+ 	return 0;
+ 
++out_port:
++	release_region(ioaddr, ARCNET_TOTAL_SIZE);
+ out_priv:
+ 	kfree(dev->priv);
+ out_dev:
+@@ -138,7 +138,9 @@ out_dev:
+ 
+ static void __devexit com20020pci_remove(struct pci_dev *pdev)
+ {
+-	com20020_remove(pci_get_drvdata(pdev));
++	struct net_device *dev = pci_get_drvdata(pdev);
++	com20020_remove(dev);
++	release_region(dev->base_addr, ARCNET_TOTAL_SIZE);
+ }
+ 
+ static struct pci_device_id com20020pci_id_table[] = {
+--- linux-2.6.0-test6/drivers/net/at1700.c	2003-06-14 12:18:07.000000000 -0700
++++ 25/drivers/net/at1700.c	2003-10-05 00:33:24.000000000 -0700
+@@ -43,7 +43,7 @@
+ #include <linux/errno.h>
+ #include <linux/netdevice.h>
+ #include <linux/etherdevice.h>
+-#include <linux/mca.h>
++#include <linux/mca-legacy.h>
+ #include <linux/module.h>
+ #include <linux/kernel.h>
+ #include <linux/types.h>
+--- linux-2.6.0-test6/drivers/net/e100/e100_main.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/e100/e100_main.c	2003-10-05 00:33:46.000000000 -0700
+@@ -539,6 +539,15 @@ e100_trigger_SWI(struct e100_private *bd
+ 	readw(&(bdp->scb->scb_status));	/* flushes last write, read-safe */
+ }
+ 
++#ifdef CONFIG_NET_POLL_CONTROLLER
++static void e100_rx_poll(struct net_device *dev)
++{
++	disable_irq(dev->irq);
++	e100intr(dev->irq, (void *)dev, 0);
++	enable_irq(dev->irq);
++}
++#endif
++
+ static int __devinit
+ e100_found1(struct pci_dev *pcid, const struct pci_device_id *ent)
+ {
+@@ -631,7 +640,9 @@ e100_found1(struct pci_dev *pcid, const 
+ 	dev->set_multicast_list = &e100_set_multi;
+ 	dev->set_mac_address = &e100_set_mac;
+ 	dev->do_ioctl = &e100_ioctl;
+-
++#ifdef CONFIG_NET_POLL_CONTROLLER
++	dev->poll_controller = e100_rx_poll;
++#endif
+ 	if (bdp->flags & USE_IPCB)
+ 	dev->features = NETIF_F_SG | NETIF_F_IP_CSUM |
+ 			NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+--- linux-2.6.0-test6/drivers/net/eepro100.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/eepro100.c	2003-10-05 00:33:47.000000000 -0700
+@@ -543,6 +543,7 @@ static void speedo_refill_rx_buffers(str
+ static int speedo_rx(struct net_device *dev);
+ static void speedo_tx_buffer_gc(struct net_device *dev);
+ static irqreturn_t speedo_interrupt(int irq, void *dev_instance, struct pt_regs *regs);
++static void poll_speedo (struct net_device *dev);
+ static int speedo_close(struct net_device *dev);
+ static struct net_device_stats *speedo_get_stats(struct net_device *dev);
+ static int speedo_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
+@@ -885,6 +886,9 @@ static int __devinit speedo_found1(struc
+ 	dev->get_stats = &speedo_get_stats;
+ 	dev->set_multicast_list = &set_rx_mode;
+ 	dev->do_ioctl = &speedo_ioctl;
++#ifdef CONFIG_NET_POLL_CONTROLLER
++	dev->poll_controller = &poll_speedo;
++#endif
+ 
+ 	if (register_netdevice(dev))
+ 		goto err_free_unlock;
+@@ -1675,6 +1679,22 @@ static irqreturn_t speedo_interrupt(int 
+ 	return IRQ_RETVAL(handled);
+ }
+ 
++#ifdef CONFIG_NET_POLL_CONTROLLER
++
++/*
++ * Polling 'interrupt' - used by things like netconsole to send skbs
++ * without having to re-enable interrupts. It's not called while
++ * the interrupt routine is executing.
++ */
++
++static void poll_speedo (struct net_device *dev)
++{
++	disable_irq(dev->irq);
++	speedo_interrupt (dev->irq, dev, NULL);
++	enable_irq(dev->irq);
++}
++#endif
++
+ static inline struct RxFD *speedo_rx_alloc(struct net_device *dev, int entry)
+ {
+ 	struct speedo_private *sp = (struct speedo_private *)dev->priv;
+--- linux-2.6.0-test6/drivers/net/eexpress.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/eexpress.c	2003-10-05 00:33:24.000000000 -0700
+@@ -113,7 +113,6 @@
+ #include <linux/etherdevice.h>
+ #include <linux/skbuff.h>
+ #include <linux/slab.h>
+-#include <linux/mca.h>
+ #include <linux/mca-legacy.h>
+ #include <linux/spinlock.h>
+ 
+--- linux-2.6.0-test6/drivers/net/ibmlana.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/ibmlana.c	2003-10-05 00:33:24.000000000 -0700
+@@ -82,7 +82,7 @@ History:
+ #include <linux/interrupt.h>
+ #include <linux/delay.h>
+ #include <linux/time.h>
+-#include <linux/mca.h>
++#include <linux/mca-legacy.h>
+ #include <linux/module.h>
+ #include <linux/netdevice.h>
+ #include <linux/etherdevice.h>
+--- linux-2.6.0-test6/drivers/net/irda/act200l.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/irda/act200l.c	2003-10-05 00:33:24.000000000 -0700
+@@ -84,12 +84,12 @@ static int  act200l_change_speed(struct 
+ #define ACT200L_OSCL    0x04 /* oscillator in low power, medium accuracy mode */
+ 
+ static struct dongle_reg dongle = {
+-	Q_NULL,
+-	IRDA_ACT200L_DONGLE,
+-	act200l_open,
+-	act200l_close,
+-	act200l_reset,
+-	act200l_change_speed,
++	.type = IRDA_ACT200L_DONGLE,
++	.open = act200l_open,
++	.close = act200l_close,
++	.reset = act200l_reset,
++	.change_speed = act200l_change_speed,
++	.owner = THIS_MODULE,
+ };
+ 
+ int __init act200l_init(void)
+@@ -112,8 +112,6 @@ static void act200l_open(dongle_t *self,
+ 	/* Set the speeds we can accept */
+ 	qos->baud_rate.bits &= IR_9600|IR_19200|IR_38400|IR_57600|IR_115200;
+ 	qos->min_turn_time.bits = 0x03;
+-
+-	MOD_INC_USE_COUNT;
+ }
+ 
+ static void act200l_close(dongle_t *self)
+@@ -122,8 +120,6 @@ static void act200l_close(dongle_t *self
+ 
+ 	/* Power off the dongle */
+ 	self->set_dtr_rts(self->dev, FALSE, FALSE);
+-
+-	MOD_DEC_USE_COUNT;
+ }
+ 
+ /*
+--- linux-2.6.0-test6/drivers/net/irda/actisys.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/irda/actisys.c	2003-10-05 00:33:24.000000000 -0700
+@@ -64,21 +64,21 @@ static __u32 baud_rates[] = { 9600, 1920
+ #define MAX_SPEEDS 5
+ 
+ static struct dongle_reg dongle = {
+-	Q_NULL,
+-	IRDA_ACTISYS_DONGLE,
+-	actisys_open,
+-	actisys_close,
+-	actisys_reset,
+-	actisys_change_speed,
++	.type = IRDA_ACTISYS_DONGLE,
++	.open = actisys_open,
++	.close = actisys_close,
++	.reset = actisys_reset,
++	.change_speed = actisys_change_speed,
++	.owner = THIS_MODULE,
+ };
+ 
+ static struct dongle_reg dongle_plus = {
+-	Q_NULL,
+-	IRDA_ACTISYS_PLUS_DONGLE,
+-	actisys_open,
+-	actisys_close,
+-	actisys_reset,
+-	actisys_change_speed,
++	.type = IRDA_ACTISYS_PLUS_DONGLE,
++	.open = actisys_open,
++	.close = actisys_close,
++	.reset = actisys_reset,
++	.change_speed = actisys_change_speed,
++	.owner = THIS_MODULE,
+ };
+ 
+ /*
+@@ -128,16 +128,12 @@ static void actisys_open(dongle_t *self,
+ 		qos->baud_rate.bits &= ~IR_38400;
+ 	
+ 	qos->min_turn_time.bits = 0x7f; /* Needs 0.01 ms */
+-
+-	MOD_INC_USE_COUNT;
+ }
+ 
+ static void actisys_close(dongle_t *self)
+ {
+ 	/* Power off the dongle */
+ 	self->set_dtr_rts(self->dev, FALSE, FALSE);
+-
+-	MOD_DEC_USE_COUNT;
+ }
+ 
+ /*
+--- linux-2.6.0-test6/drivers/net/irda/ali-ircc.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/irda/ali-ircc.c	2003-10-05 00:33:24.000000000 -0700
+@@ -254,7 +254,7 @@ static int ali_ircc_open(int i, chipio_t
+ 	if ((ali_ircc_setup(info)) == -1)
+ 		return -1;
+ 		
+-	dev = alloc_netdev(sizeof(*self), "irda%d", irda_device_setup);
++	dev = alloc_irdadev(sizeof(*self));
+ 	if (dev == NULL) {
+ 		ERROR("%s(), can't allocate memory for control block!\n", __FUNCTION__);
+ 		return -ENOMEM;
+--- linux-2.6.0-test6/drivers/net/irda/donauboe.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/irda/donauboe.c	2003-10-05 00:33:24.000000000 -0700
+@@ -1598,8 +1598,7 @@ toshoboe_open (struct pci_dev *pci_dev, 
+   if ((err=pci_enable_device(pci_dev)))
+     return err;
+ 
+-  dev = alloc_netdev(sizeof (struct toshoboe_cb), "irda%d",
+-		     irda_device_setup);
++  dev = alloc_irdadev(sizeof (struct toshoboe_cb));
+   if (dev == NULL)
+     {
+       printk (KERN_ERR DRIVER_NAME ": can't allocate memory for "
+--- linux-2.6.0-test6/drivers/net/irda/ep7211_ir.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/irda/ep7211_ir.c	2003-10-05 00:33:24.000000000 -0700
+@@ -24,12 +24,12 @@ static int  ep7211_ir_change_speed(struc
+ static int  ep7211_ir_reset(struct irda_task *task);
+ 
+ static struct dongle_reg dongle = {
+-	Q_NULL,
+-	IRDA_EP7211_IR,
+-	ep7211_ir_open,
+-	ep7211_ir_close,
+-	ep7211_ir_reset,
+-	ep7211_ir_change_speed,
++	.type = IRDA_EP7211_IR,
++	.open = ep7211_ir_open,
++	.close = ep7211_ir_close,
++	.reset = ep7211_ir_reset,
++	.change_speed = ep7211_ir_change_speed,
++	.owner = THIS_MODULE,
+ };
+ 
+ static void ep7211_ir_open(dongle_t *self, struct qos_info *qos)
+@@ -47,8 +47,6 @@ static void ep7211_ir_open(dongle_t *sel
+ 		UART (interrupt #14). */
+ 
+ 	restore_flags(flags);
+-
+-	MOD_INC_USE_COUNT;
+ }
+ 
+ static void ep7211_ir_close(dongle_t *self)
+@@ -66,8 +64,6 @@ static void ep7211_ir_close(dongle_t *se
+ 		reset them back to their original state. */
+ 
+ 	restore_flags(flags);
+-
+-	MOD_DEC_USE_COUNT;
+ }
+ 
+ /*
+--- linux-2.6.0-test6/drivers/net/irda/esi.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/irda/esi.c	2003-10-05 00:33:24.000000000 -0700
+@@ -44,12 +44,12 @@ static int  esi_change_speed(struct irda
+ static int  esi_reset(struct irda_task *task);
+ 
+ static struct dongle_reg dongle = {
+-	Q_NULL,
+-	IRDA_ESI_DONGLE,
+-	esi_open,
+-	esi_close,
+-	esi_reset,
+-	esi_change_speed,
++	.type = IRDA_ESI_DONGLE,
++	.open = esi_open,
++	.close = esi_close,
++	.reset = esi_reset,
++	.change_speed = esi_change_speed,
++	.owner = THIS_MODULE,
+ };
+ 
+ int __init esi_init(void)
+@@ -66,16 +66,12 @@ static void esi_open(dongle_t *self, str
+ {
+ 	qos->baud_rate.bits &= IR_9600|IR_19200|IR_115200;
+ 	qos->min_turn_time.bits = 0x01; /* Needs at least 10 ms */
+-
+-	MOD_INC_USE_COUNT;
+ }
+ 
+ static void esi_close(dongle_t *dongle)
+ {		
+ 	/* Power off dongle */
+ 	dongle->set_dtr_rts(dongle->dev, FALSE, FALSE);
+-
+-	MOD_DEC_USE_COUNT;
+ }
+ 
+ /*
+--- linux-2.6.0-test6/drivers/net/irda/girbil.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/irda/girbil.c	2003-10-05 00:33:24.000000000 -0700
+@@ -63,12 +63,12 @@ static int  girbil_change_speed(struct i
+ #define GIRBIL_LOAD    0x51 /* Load the new baud rate value */
+ 
+ static struct dongle_reg dongle = {
+-	Q_NULL,
+-	IRDA_GIRBIL_DONGLE,
+-	girbil_open,
+-	girbil_close,
+-	girbil_reset,
+-	girbil_change_speed,
++	.type = IRDA_GIRBIL_DONGLE,
++	.open = girbil_open,
++	.close = girbil_close,
++	.reset = girbil_reset,
++	.change_speed = girbil_change_speed,
++	.owner = THIS_MODULE,
+ };
+ 
+ int __init girbil_init(void)
+@@ -85,16 +85,12 @@ static void girbil_open(dongle_t *self, 
+ {
+ 	qos->baud_rate.bits &= IR_9600|IR_19200|IR_38400|IR_57600|IR_115200;
+ 	qos->min_turn_time.bits = 0x03;
+-
+-	MOD_INC_USE_COUNT;
+ }
+ 
+ static void girbil_close(dongle_t *self)
+ {
+ 	/* Power off dongle */
+ 	self->set_dtr_rts(self->dev, FALSE, FALSE);
+-
+-	MOD_DEC_USE_COUNT;
+ }
+ 
+ /*
+--- linux-2.6.0-test6/drivers/net/irda/irda-usb.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/irda/irda-usb.c	2003-10-05 00:33:24.000000000 -0700
+@@ -1176,7 +1176,7 @@ static inline int irda_usb_open(struct i
+ 	memset(self->speed_buff, 0, IRDA_USB_SPEED_MTU);
+ 
+ 	/* Create a network device for us */
+-	netdev = alloc_netdev(0, "irda%d",  irda_device_setup);
++	netdev = alloc_irdadev(0);
+ 	if (!netdev) {
+ 		ERROR("%s(), alloc_net_dev() failed!\n", __FUNCTION__);
+ 		return -ENOMEM;
+--- linux-2.6.0-test6/drivers/net/irda/irport.c	2003-06-14 12:18:25.000000000 -0700
++++ 25/drivers/net/irda/irport.c	2003-10-05 00:33:24.000000000 -0700
+@@ -78,7 +78,6 @@ static inline void irport_write_wakeup(s
+ static inline int  irport_write(int iobase, int fifo_size, __u8 *buf, int len);
+ static inline void irport_receive(struct irport_cb *self);
+ 
+-static int  irport_net_init(struct net_device *dev);
+ static int  irport_net_ioctl(struct net_device *dev, struct ifreq *rq, 
+ 			     int cmd);
+ static inline int  irport_is_receiving(struct irport_cb *self);
+@@ -136,30 +135,27 @@ irport_open(int i, unsigned int iobase, 
+ {
+ 	struct net_device *dev;
+ 	struct irport_cb *self;
+-	void *ret;
+-	int err;
+ 
+ 	IRDA_DEBUG(1, "%s()\n", __FUNCTION__);
+ 
+ 	/* Lock the port that we need */
+-	ret = request_region(iobase, IO_EXTENT, driver_name);
+-	if (!ret) {
++	if (!request_region(iobase, IO_EXTENT, driver_name)) {
+ 		IRDA_DEBUG(0, "%s(), can't get iobase of 0x%03x\n",
+ 			   __FUNCTION__, iobase);
+-		return NULL;
++		goto err_out1;
+ 	}
+ 
+ 	/*
+ 	 *  Allocate new instance of the driver
+ 	 */
+-	self = kmalloc(sizeof(struct irport_cb), GFP_KERNEL);
+-	if (!self) {
++	dev = alloc_irdadev(sizeof(struct irport_cb));
++	if (!dev) {
+ 		ERROR("%s(), can't allocate memory for "
+-		      "control block!\n", __FUNCTION__);
+-		release_region(iobase, IO_EXTENT);
+-		return NULL;
++		      "irda device!\n", __FUNCTION__);
++		goto err_out2;
+ 	}
+-	memset(self, 0, sizeof(struct irport_cb));
++
++	self = dev->priv;
+ 	spin_lock_init(&self->lock);
+ 
+ 	/* Need to store self somewhere */
+@@ -189,8 +185,11 @@ irport_open(int i, unsigned int iobase, 
+ 	self->rx_buff.truesize = IRDA_SKB_MAX_MTU;
+ 	self->rx_buff.skb = __dev_alloc_skb(self->rx_buff.truesize,
+ 					    GFP_KERNEL);
+-	if (self->rx_buff.skb == NULL)
+-		return NULL;
++	if (self->rx_buff.skb == NULL) {
++		ERROR("%s(), can't allocate memory for "
++		      "receive buffer!\n", __FUNCTION__);
++		goto err_out3;
++	}
+ 	skb_reserve(self->rx_buff.skb, 1);
+ 	self->rx_buff.head = self->rx_buff.skb->data;
+ 	/* No need to memset the buffer, unless you are really pedantic */
+@@ -208,30 +207,23 @@ irport_open(int i, unsigned int iobase, 
+ 		self->tx_buff.head = (__u8 *) kmalloc(self->tx_buff.truesize, 
+ 						      GFP_KERNEL);
+ 		if (self->tx_buff.head == NULL) {
+-			kfree_skb(self->rx_buff.skb);
+-			self->rx_buff.skb = NULL;
+-			self->rx_buff.head = NULL;
+-			return NULL;
++			ERROR("%s(), can't allocate memory for "
++			      "transmit buffer!\n", __FUNCTION__);
++			goto err_out4;
+ 		}
+ 		memset(self->tx_buff.head, 0, self->tx_buff.truesize);
+ 	}	
+ 	self->tx_buff.data = self->tx_buff.head;
+ 
+-	if (!(dev = dev_alloc("irda%d", &err))) {
+-		ERROR("%s(), dev_alloc() failed!\n", __FUNCTION__);
+-		return NULL;
+-	}
+ 	self->netdev = dev;
+ 	/* Keep track of module usage */
+ 	SET_MODULE_OWNER(dev);
+ 
+ 	/* May be overridden by piggyback drivers */
+- 	dev->priv = (void *) self;
+ 	self->interrupt    = irport_interrupt;
+ 	self->change_speed = irport_change_speed;
+ 
+ 	/* Override the network functions we need to use */
+-	dev->init            = irport_net_init;
+ 	dev->hard_start_xmit = irport_hard_xmit;
+ 	dev->tx_timeout	     = irport_timeout;
+ 	dev->watchdog_timeo  = HZ;  /* Allow time enough for speed change */
+@@ -244,17 +236,25 @@ irport_open(int i, unsigned int iobase, 
+ 	dev->base_addr = iobase;
+ 	dev->irq = irq;
+ 
+-	rtnl_lock();
+-	err = register_netdevice(dev);
+-	rtnl_unlock();
+-	if (err) {
++	if (register_netdev(dev)) {
+ 		ERROR("%s(), register_netdev() failed!\n", __FUNCTION__);
+-		return NULL;
++		goto err_out5;
+ 	}
+ 	MESSAGE("IrDA: Registered device %s (irport io=0x%X irq=%d)\n",
+ 		dev->name, iobase, irq);
+ 
+ 	return self;
++ err_out5:
++	kfree(self->tx_buff.head);
++ err_out4:
++	kfree_skb(self->rx_buff.skb);
++ err_out3:
++	free_netdev(dev);
++	dev_self[i] = NULL;
++ err_out2:
++	release_region(iobase, IO_EXTENT);
++ err_out1:
++	return NULL;
+ }
+ 
+ int irport_close(struct irport_cb *self)
+@@ -267,8 +267,7 @@ int irport_close(struct irport_cb *self)
+ 	self->dongle = NULL;
+ 	
+ 	/* Remove netdevice */
+-	if (self->netdev)
+-		unregister_netdev(self->netdev);
++	unregister_netdev(self->netdev);
+ 
+ 	/* Release the IO-port that this driver is using */
+ 	IRDA_DEBUG(0 , "%s(), Releasing Region %03x\n", 
+@@ -284,7 +283,7 @@ int irport_close(struct irport_cb *self)
+ 	
+ 	/* Remove ourselves */
+ 	dev_self[self->index] = NULL;
+-	kfree(self);
++	free_netdev(self->netdev);
+ 	
+ 	return 0;
+ }
+@@ -886,16 +885,6 @@ irqreturn_t irport_interrupt(int irq, vo
+ 	return IRQ_RETVAL(handled);
+ }
+ 
+-static int irport_net_init(struct net_device *dev)
+-{
+-	/* Set up to be a normal IrDA network device driver */
+-	irda_device_setup(dev);
+-
+-	/* Insert overrides below this line! */
+-
+-	return 0;
+-}
+-
+ /*
+  * Function irport_net_open (dev)
+  *
+--- linux-2.6.0-test6/drivers/net/irda/litelink.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/irda/litelink.c	2003-10-05 00:33:24.000000000 -0700
+@@ -48,12 +48,12 @@ static int  litelink_reset(struct irda_t
+ static __u32 baud_rates[] = { 115200, 57600, 38400, 19200, 9600 };
+ 
+ static struct dongle_reg dongle = {
+-	Q_NULL,
+-	IRDA_LITELINK_DONGLE,
+-	litelink_open,
+-	litelink_close,
+-	litelink_reset,
+-	litelink_change_speed,
++	.type = IRDA_LITELINK_DONGLE,
++	.open = litelink_open,
++	.close = litelink_close,
++	.reset = litelink_reset,
++	.change_speed = litelink_change_speed,
++	.owner = THIS_MODULE,
+ };
+ 
+ int __init litelink_init(void)
+@@ -70,16 +70,12 @@ static void litelink_open(dongle_t *self
+ {
+ 	qos->baud_rate.bits &= IR_9600|IR_19200|IR_38400|IR_57600|IR_115200;
+ 	qos->min_turn_time.bits = 0x7f; /* Needs 0.01 ms */
+-
+-	MOD_INC_USE_COUNT;
+ }
+ 
+ static void litelink_close(dongle_t *self)
+ {
+ 	/* Power off dongle */
+ 	self->set_dtr_rts(self->dev, FALSE, FALSE);
+-
+-	MOD_DEC_USE_COUNT;
+ }
+ 
+ /*
+--- linux-2.6.0-test6/drivers/net/irda/ma600.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/irda/ma600.c	2003-10-05 00:33:24.000000000 -0700
+@@ -74,12 +74,12 @@ static int  ma600_reset(struct irda_task
+ #define MA600_2400	0x08
+ 
+ static struct dongle_reg dongle = {
+-	Q_NULL,
+-	IRDA_MA600_DONGLE,
+-	ma600_open,
+-	ma600_close,
+-	ma600_reset,
+-	ma600_change_speed,
++	.type = IRDA_MA600_DONGLE,
++	.open = ma600_open,
++	.close = ma600_close,
++	.reset = ma600_reset,
++	.change_speed = ma600_change_speed,
++	.owner = THIS_MODULE,
+ };
+ 
+ int __init ma600_init(void)
+@@ -115,8 +115,6 @@ static void ma600_open(dongle_t *self, s
+ 
+ 	self->set_dtr_rts(self->dev, TRUE, TRUE);
+ 	// should wait 1 second
+-
+-	MOD_INC_USE_COUNT;
+ }
+ 
+ static void ma600_close(dongle_t *self)
+@@ -125,8 +123,6 @@ static void ma600_close(dongle_t *self)
+ 
+ 	/* Power off dongle */
+ 	self->set_dtr_rts(self->dev, FALSE, FALSE);
+-
+-	MOD_DEC_USE_COUNT;
+ }
+ 
+ static __u8 get_control_byte(__u32 speed)
+--- linux-2.6.0-test6/drivers/net/irda/mcp2120.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/irda/mcp2120.c	2003-10-05 00:33:24.000000000 -0700
+@@ -40,12 +40,12 @@ static int  mcp2120_change_speed(struct 
+ #define MCP2120_COMMIT  0x11
+ 
+ static struct dongle_reg dongle = {
+-	Q_NULL,
+-	IRDA_MCP2120_DONGLE,
+-	mcp2120_open,
+-	mcp2120_close,
+-	mcp2120_reset,
+-	mcp2120_change_speed,
++	.type = IRDA_MCP2120_DONGLE,
++	.open = mcp2120_open,
++	.close = mcp2120_close,
++	.reset = mcp2120_reset,
++	.change_speed = mcp2120_change_speed,
++	.owner = THIS_MODULE,
+ };
+ 
+ int __init mcp2120_init(void)
+@@ -62,8 +62,6 @@ static void mcp2120_open(dongle_t *self,
+ {
+ 	qos->baud_rate.bits &= IR_9600|IR_19200|IR_38400|IR_57600|IR_115200;
+ 	qos->min_turn_time.bits = 0x01;
+-
+-	MOD_INC_USE_COUNT;
+ }
+ 
+ static void mcp2120_close(dongle_t *self)
+@@ -72,8 +70,6 @@ static void mcp2120_close(dongle_t *self
+         /* reset and inhibit mcp2120 */
+ 	self->set_dtr_rts(self->dev, TRUE, TRUE);
+ 	//self->set_dtr_rts(self->dev, FALSE, FALSE);
+-
+-	MOD_DEC_USE_COUNT;
+ }
+ 
+ /*
+--- linux-2.6.0-test6/drivers/net/irda/nsc-ircc.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/irda/nsc-ircc.c	2003-10-05 00:33:24.000000000 -0700
+@@ -260,8 +260,7 @@ static int __init nsc_ircc_open(int i, c
+ 
+ 	MESSAGE("%s, driver loaded (Dag Brattli)\n", driver_name);
+ 
+-	dev = alloc_netdev(sizeof(struct nsc_ircc_cb), "irda%d",
+-			   irda_device_setup);
++	dev = alloc_irdadev(sizeof(struct nsc_ircc_cb));
+ 	if (dev == NULL) {
+ 		ERROR("%s(), can't allocate memory for "
+ 		       "control block!\n", __FUNCTION__);
+--- linux-2.6.0-test6/drivers/net/irda/old_belkin.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/irda/old_belkin.c	2003-10-05 00:33:24.000000000 -0700
+@@ -74,12 +74,12 @@ static int  old_belkin_reset(struct irda
+ /* static __u32 baud_rates[] = { 9600 }; */
+ 
+ static struct dongle_reg dongle = {
+-	Q_NULL,
+-	IRDA_OLD_BELKIN_DONGLE,
+-	old_belkin_open,
+-	old_belkin_close,
+-	old_belkin_reset,
+-	old_belkin_change_speed,
++	.type = IRDA_OLD_BELKIN_DONGLE,
++	.open = old_belkin_open,
++	.close = old_belkin_close,
++	.reset = old_belkin_reset,
++	.change_speed = old_belkin_change_speed,
++	.owner = THIS_MODULE,
+ };
+ 
+ int __init old_belkin_init(void)
+@@ -98,16 +98,12 @@ static void old_belkin_open(dongle_t *se
+ 	qos->baud_rate.bits &= IR_9600;
+ 	/* Needs at least 10 ms (totally wild guess, can do probably better) */
+ 	qos->min_turn_time.bits = 0x01;
+-
+-	MOD_INC_USE_COUNT;
+ }
+ 
+ static void old_belkin_close(dongle_t *self)
+ {
+ 	/* Power off dongle */
+ 	self->set_dtr_rts(self->dev, FALSE, FALSE);
+-
+-	MOD_DEC_USE_COUNT;
+ }
+ 
+ /*
+--- linux-2.6.0-test6/drivers/net/irda/sir_dev.c	2003-07-10 18:50:31.000000000 -0700
++++ 25/drivers/net/irda/sir_dev.c	2003-10-05 00:33:24.000000000 -0700
+@@ -538,28 +538,6 @@ out:
+ 
+ /* ----------------------------------------------------------------------------- */
+ 
+-static int sirdev_init(struct net_device *ndev)
+-{
+-	struct sir_dev *dev = ndev->priv;
+-
+-	SET_MODULE_OWNER(ndev);
+-
+-	/* Set up to be a normal IrDA network device driver */
+-	irda_device_setup(ndev);
+-
+-	dev->flags = IFF_SIR | IFF_PIO;
+-
+-	/* Override the network functions we need to use */
+-	ndev->hard_start_xmit = sirdev_hard_xmit;
+-	ndev->open = sirdev_open;
+-	ndev->stop = sirdev_close;
+-	ndev->get_stats = sirdev_get_stats;
+-	ndev->do_ioctl = sirdev_ioctl;
+-
+-	return 0;
+-}
+-
+-
+ struct sir_dev * sirdev_get_instance(const struct sir_driver *drv, const char *name)
+ {
+ 	struct net_device *ndev;
+@@ -577,12 +555,12 @@ struct sir_dev * sirdev_get_instance(con
+ 	/*
+ 	 *  Allocate new instance of the device
+ 	 */
+-	dev = kmalloc(sizeof(*dev), GFP_KERNEL);
+-	if (dev == NULL) {
++	ndev = alloc_irdadev(sizeof(*dev));
++	if (ndev == NULL) {
+ 		ERROR("%s - Can't allocate memory for IrDA control block!\n", __FUNCTION__);
+ 		goto out;
+ 	}
+-	memset(dev, 0, sizeof(*dev));
++	dev = ndev->priv;
+ 
+ 	irda_init_max_qos_capabilies(&dev->qos);
+ 	dev->qos.baud_rate.bits = IR_9600|IR_19200|IR_38400|IR_57600|IR_115200;
+@@ -591,11 +569,6 @@ struct sir_dev * sirdev_get_instance(con
+ 
+ 	strncpy(dev->hwname, name, sizeof(dev->hwname)-1);
+ 
+-	ndev = kmalloc(sizeof(*ndev), GFP_KERNEL);
+-	if (ndev == NULL)
+-		goto out_freedev;
+-	memset(ndev, 0, sizeof(*ndev));
+-
+ 	atomic_set(&dev->enable_rx, 0);
+ 	dev->tx_skb = NULL;
+ 
+@@ -609,10 +582,17 @@ struct sir_dev * sirdev_get_instance(con
+ 	dev->drv = drv;
+ 	dev->netdev = ndev;
+ 
+-	ndev->priv = (void *) dev;
+-	ndev->init = sirdev_init;
++	SET_MODULE_OWNER(ndev);
++
++	dev->flags = IFF_SIR | IFF_PIO;
++
++	/* Override the network functions we need to use */
++	ndev->hard_start_xmit = sirdev_hard_xmit;
++	ndev->open = sirdev_open;
++	ndev->stop = sirdev_close;
++	ndev->get_stats = sirdev_get_stats;
++	ndev->do_ioctl = sirdev_ioctl;
+ 
+-	strcpy(ndev->name, "irda%d");
+ 	if (register_netdev(ndev)) {
+ 		ERROR("%s(), register_netdev() failed!\n", __FUNCTION__);
+ 		goto out_freenetdev;
+@@ -621,9 +601,7 @@ struct sir_dev * sirdev_get_instance(con
+ 	return dev;
+ 
+ out_freenetdev:
+-	kfree(ndev);
+-out_freedev:
+-	kfree(dev);
++	free_netdev(ndev);
+ out:
+ 	return NULL;
+ }
+@@ -653,10 +631,9 @@ int sirdev_put_instance(struct sir_dev *
+ 	up(&dev->fsm.sem);
+ 
+ 	/* Remove netdevice */
+-	if (dev->netdev)
+-		unregister_netdev(dev->netdev);
++	unregister_netdev(dev->netdev);
+ 
+-	kfree(dev);
++	free_netdev(dev->netdev);
+ 
+ 	return 0;
+ }
+--- linux-2.6.0-test6/drivers/net/irda/smsc-ircc2.c	2003-06-14 12:18:24.000000000 -0700
++++ 25/drivers/net/irda/smsc-ircc2.c	2003-10-05 00:33:24.000000000 -0700
+@@ -140,10 +140,8 @@ static const char *driver_name = "smsc-i
+ 
+ static int smsc_ircc_open(unsigned int firbase, unsigned int sirbase, u8 dma, u8 irq);
+ static int smsc_ircc_present(unsigned int fir_base, unsigned int sir_base);
+-static int smsc_ircc_setup_io(struct smsc_ircc_cb *self, unsigned int fir_base, unsigned int sir_base, u8 dma, u8 irq);
+-static int smsc_ircc_setup_buffers(struct smsc_ircc_cb *self);
++static void smsc_ircc_setup_io(struct smsc_ircc_cb *self, unsigned int fir_base, unsigned int sir_base, u8 dma, u8 irq);
+ static void smsc_ircc_setup_qos(struct smsc_ircc_cb *self);
+-static int smsc_ircc_setup_netdev(struct smsc_ircc_cb *self);
+ static void smsc_ircc_init_chip(struct smsc_ircc_cb *self);
+ static int __exit smsc_ircc_close(struct smsc_ircc_cb *self);
+ static int  smsc_ircc_dma_receive(struct smsc_ircc_cb *self, int iobase); 
+@@ -163,7 +161,6 @@ static void smsc_ircc_sir_stop(struct sm
+ #endif
+ static void smsc_ircc_sir_write_wakeup(struct smsc_ircc_cb *self);
+ static int  smsc_ircc_sir_write(int iobase, int fifo_size, __u8 *buf, int len);
+-static int  smsc_ircc_net_init(struct net_device *dev);
+ static int  smsc_ircc_net_open(struct net_device *dev);
+ static int  smsc_ircc_net_close(struct net_device *dev);
+ static int  smsc_ircc_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
+@@ -366,38 +363,81 @@ int __init smsc_ircc_init(void)
+ static int __init smsc_ircc_open(unsigned int fir_base, unsigned int sir_base, u8 dma, u8 irq)
+ {
+ 	struct smsc_ircc_cb *self;
++	struct net_device *dev;
+ 	int err;
+ 	
+ 	IRDA_DEBUG(1, "%s\n", __FUNCTION__);
+ 
+-	err= smsc_ircc_present(fir_base, sir_base);
+-	if(err) return -ENODEV;
++	err = smsc_ircc_present(fir_base, sir_base);
++	if(err) 
++		goto err_out;
+ 		
+-	if (dev_count>DIM(dev_self)) {
++	err = -ENOMEM;
++	if (dev_count > DIM(dev_self)) {
+ 	        WARNING("%s(), too many devices!\n", __FUNCTION__);
+-		return -ENOMEM;
++		goto err_out1;
+ 	}
+ 
+ 	/*
+ 	 *  Allocate new instance of the driver
+ 	 */
+-	self = kmalloc(sizeof(struct smsc_ircc_cb), GFP_KERNEL);
+-	if (self == NULL) {
+-		ERROR("%s, Can't allocate memory for control block!\n",
+-                      driver_name);
+-		return -ENOMEM;
++	dev = alloc_irdadev(sizeof(struct smsc_ircc_cb));
++	if (!dev) {
++		WARNING("%s() can't allocate net device\n", __FUNCTION__);
++		goto err_out1;
+ 	}
+-	memset(self, 0, sizeof(struct smsc_ircc_cb));
++
++	SET_MODULE_OWNER(dev);
++
++	dev->hard_start_xmit = smsc_ircc_hard_xmit_sir;
++#if SMSC_IRCC2_C_NET_TIMEOUT
++	dev->tx_timeout	     = smsc_ircc_timeout;
++	dev->watchdog_timeo  = HZ*2;  /* Allow enough time for speed change */
++#endif
++	dev->open            = smsc_ircc_net_open;
++	dev->stop            = smsc_ircc_net_close;
++	dev->do_ioctl        = smsc_ircc_net_ioctl;
++	dev->get_stats	     = smsc_ircc_net_get_stats;
++	
++	self = dev->priv;
++	self->netdev = dev;
++
++	/* Make ifconfig display some details */
++	dev->base_addr = self->io.fir_base = fir_base;
++	dev->irq = self->io.irq = irq;
+ 
+ 	/* Need to store self somewhere */
+ 	dev_self[dev_count++] = self;
+ 	spin_lock_init(&self->lock);
+ 
+-	err = smsc_ircc_setup_buffers(self);
+-	if(err) return err;
++	self->rx_buff.truesize = SMSC_IRCC2_RX_BUFF_TRUESIZE; 
++	self->tx_buff.truesize = SMSC_IRCC2_TX_BUFF_TRUESIZE;
++
++	self->rx_buff.head = (u8 *) kmalloc(self->rx_buff.truesize,
++					      GFP_KERNEL|GFP_DMA);
++	if (self->rx_buff.head == NULL) {
++		ERROR("%s, Can't allocate memory for receive buffer!\n",
++                      driver_name);
++		goto err_out2;
++	}
++
++	self->tx_buff.head = (u8 *) kmalloc(self->tx_buff.truesize, 
++					      GFP_KERNEL|GFP_DMA);
++	if (self->tx_buff.head == NULL) {
++		ERROR("%s, Can't allocate memory for transmit buffer!\n",
++                      driver_name);
++		goto err_out3;
++	}
++
++	memset(self->rx_buff.head, 0, self->rx_buff.truesize);
++	memset(self->tx_buff.head, 0, self->tx_buff.truesize);
++
++	self->rx_buff.in_frame = FALSE;
++	self->rx_buff.state = OUTSIDE_FRAME;
++	self->tx_buff.data = self->tx_buff.head;
++	self->rx_buff.data = self->rx_buff.head;
+ 	   
+-	err= smsc_ircc_setup_io(self, fir_base, sir_base, dma, irq);
+-	if(err) return err;
++	smsc_ircc_setup_io(self, fir_base, sir_base, dma, irq);
+ 
+ 	smsc_ircc_setup_qos(self);
+ 
+@@ -405,17 +445,38 @@ static int __init smsc_ircc_open(unsigne
+ 		
+ 	smsc_ircc_init_chip(self);
+ 	
+-	if(ircc_transceiver > 0 && ircc_transceiver < SMSC_IRCC2_C_NUMBER_OF_TRANSCEIVERS) self->transceiver = ircc_transceiver;
+-	else smsc_ircc_probe_transceiver(self);
++	if(ircc_transceiver > 0  && 
++	   ircc_transceiver < SMSC_IRCC2_C_NUMBER_OF_TRANSCEIVERS)
++		self->transceiver = ircc_transceiver;
++	else
++		smsc_ircc_probe_transceiver(self);
+ 
+-	err = smsc_ircc_setup_netdev(self);
+-	if(err) return err;
++	err = register_netdev(self->netdev);
++	if(err) {
++		ERROR("%s, Network device registration failed!\n",
++		      driver_name);
++		goto err_out4;
++	}
+ 
+ 	self->pmdev = pm_register(PM_SYS_DEV, PM_SYS_IRDA, smsc_ircc_pmproc);
+ 	if (self->pmdev)
+ 		self->pmdev->data = self;
+ 
++	MESSAGE("IrDA: Registered device %s\n", dev->name);
++
+ 	return 0;
++ err_out4:
++	kfree(self->tx_buff.head);
++ err_out3:
++	kfree(self->rx_buff.head);
++ err_out2:
++	free_netdev(self->netdev);
++	dev_self[--dev_count] = NULL;
++ err_out1:
++	release_region(fir_base, SMSC_IRCC2_FIR_CHIP_IO_EXTENT);
++	release_region(sir_base, SMSC_IRCC2_SIR_CHIP_IO_EXTENT);
++ err_out:
++	return err;
+ }
+ 
+ /*
+@@ -428,18 +489,19 @@ static int smsc_ircc_present(unsigned in
+ {
+ 	unsigned char low, high, chip, config, dma, irq, version;
+ 
+-	if (check_region(fir_base, SMSC_IRCC2_FIR_CHIP_IO_EXTENT) < 0) {
++	if (!request_region(fir_base, SMSC_IRCC2_FIR_CHIP_IO_EXTENT,
++			    driver_name)) {
+ 		WARNING("%s: can't get fir_base of 0x%03x\n",
+ 			__FUNCTION__, fir_base);
+-		return -ENODEV;
++		goto out1;
+ 	}
+-#if POSSIBLE_USED_BY_SERIAL_DRIVER
+-	if (check_region(sir_base, SMSC_IRCC2_SIR_CHIP_IO_EXTENT) < 0) {
++
++	if (!request_region(sir_base, SMSC_IRCC2_SIR_CHIP_IO_EXTENT,
++			    driver_name)) {
+ 		WARNING("%s: can't get sir_base of 0x%03x\n",
+ 			__FUNCTION__, sir_base);
+-		return -ENODEV;
++		goto out2;
+ 	}
+-#endif
+ 
+ 	register_bank(fir_base, 3);
+ 
+@@ -454,54 +516,19 @@ static int smsc_ircc_present(unsigned in
+ 	if (high != 0x10 || low != 0xb8 || (chip != 0xf1 && chip != 0xf2)) { 
+ 	        WARNING("%s(), addr 0x%04x - no device found!\n",
+ 			__FUNCTION__, fir_base);
+-		return -ENODEV;
++		goto out3;
+ 	}
+ 	MESSAGE("SMsC IrDA Controller found\n IrCC version %d.%d, "
+ 		"firport 0x%03x, sirport 0x%03x dma=%d, irq=%d\n",
+ 		chip & 0x0f, version, fir_base, sir_base, dma, irq);
+ 
+ 	return 0;
+-}
+-
+-/*
+- * Function smsc_ircc_setup_buffers(self)
+- *
+- *    Setup RX/TX buffers
+- *
+- */
+-static int smsc_ircc_setup_buffers(struct smsc_ircc_cb *self)
+-{
+-	self->rx_buff.truesize = SMSC_IRCC2_RX_BUFF_TRUESIZE; 
+-	self->tx_buff.truesize = SMSC_IRCC2_TX_BUFF_TRUESIZE;
+-
+-	self->rx_buff.head = (u8 *) kmalloc(self->rx_buff.truesize,
+-					      GFP_KERNEL|GFP_DMA);
+-	if (self->rx_buff.head == NULL) {
+-		ERROR("%s, Can't allocate memory for receive buffer!\n",
+-                      driver_name);
+-		kfree(self);
+-		return -ENOMEM;
+-	}
+-
+-	self->tx_buff.head = (u8 *) kmalloc(self->tx_buff.truesize, 
+-					      GFP_KERNEL|GFP_DMA);
+-	if (self->tx_buff.head == NULL) {
+-		ERROR("%s, Can't allocate memory for transmit buffer!\n",
+-                      driver_name);
+-		kfree(self->rx_buff.head);
+-		kfree(self);
+-		return -ENOMEM;
+-	}
+-
+-	memset(self->rx_buff.head, 0, self->rx_buff.truesize);
+-	memset(self->tx_buff.head, 0, self->tx_buff.truesize);
+-
+-	self->rx_buff.in_frame = FALSE;
+-	self->rx_buff.state = OUTSIDE_FRAME;
+-	self->tx_buff.data = self->tx_buff.head;
+-	self->rx_buff.data = self->rx_buff.head;
+-
+-	return 0;
++ out3:
++	release_region(fir_base, SMSC_IRCC2_FIR_CHIP_IO_EXTENT);
++ out2:
++	release_region(fir_base, SMSC_IRCC2_FIR_CHIP_IO_EXTENT);
++ out1:
++	return -ENODEV;
+ }
+ 
+ /*
+@@ -510,10 +537,11 @@ static int smsc_ircc_setup_buffers(struc
+  *    Setup I/O
+  *
+  */
+-static int smsc_ircc_setup_io(struct smsc_ircc_cb *self, unsigned int fir_base, unsigned int sir_base, u8 dma, u8 irq)
++static void smsc_ircc_setup_io(struct smsc_ircc_cb *self, 
++			       unsigned int fir_base, unsigned int sir_base, 
++			       u8 dma, u8 irq)
+ {
+ 	unsigned char config, chip_dma, chip_irq;
+-	void *ret;
+ 
+ 	register_bank(fir_base, 3);
+ 	config  = inb(fir_base+IRCC_INTERFACE);
+@@ -545,27 +573,6 @@ static int smsc_ircc_setup_io(struct sms
+ 	else
+ 		self->io.dma = chip_dma;
+ 
+-	ret = request_region(self->io.fir_base, self->io.fir_ext, driver_name);
+-	if (!ret) { 
+-		WARNING("%s(), can't get iobase of 0x%03x\n",
+-			__FUNCTION__, self->io.fir_base);
+-		kfree(self->tx_buff.head);
+-		kfree(self->rx_buff.head);
+-		kfree(self);
+-		return -ENODEV;
+-	}
+-	ret = request_region(self->io.sir_base, self->io.sir_ext, driver_name);
+-	if (!ret) { 
+-		WARNING("%s(), can't get iobase of 0x%03x\n",
+-			__FUNCTION__, self->io.sir_base);
+-		release_region(self->io.fir_base, self->io.fir_ext);
+-		kfree(self->tx_buff.head);
+-		kfree(self->rx_buff.head);
+-		kfree(self);
+-		return -ENODEV;
+-	}
+-
+-	return 0;
+ }
+ 
+ /*
+@@ -635,59 +642,6 @@ static void smsc_ircc_init_chip(struct s
+ }
+ 
+ /*
+- * Function smsc_ircc_setup_netdev(self)
+- *
+- *    Alloc and setup network device
+- *
+- */
+-static int smsc_ircc_setup_netdev(struct smsc_ircc_cb *self)
+-{
+-	struct net_device *dev;
+-	int err;
+-	/* Alloc netdev */
+-
+-	if (!(dev = dev_alloc("irda%d", &err))) {
+-		ERROR("%s(), dev_alloc() failed!\n", __FUNCTION__);
+-		kfree(self->tx_buff.head);
+-		kfree(self->rx_buff.head);
+-		kfree(self);
+-		return -ENOMEM;
+-	}
+-
+-	dev->priv = (void *) self;
+-	self->netdev = dev;
+-
+-	dev->init            = smsc_ircc_net_init;
+-	dev->hard_start_xmit = smsc_ircc_hard_xmit_sir;
+-	#if SMSC_IRCC2_C_NET_TIMEOUT
+-	dev->tx_timeout	     = smsc_ircc_timeout;
+-	dev->watchdog_timeo  = HZ*2;  /* Allow enough time for speed change */
+-	#endif
+-	dev->open            = smsc_ircc_net_open;
+-	dev->stop            = smsc_ircc_net_close;
+-	dev->do_ioctl        = smsc_ircc_net_ioctl;
+-	dev->get_stats	     = smsc_ircc_net_get_stats;
+-	
+-	/* Make ifconfig display some details */
+-	dev->base_addr = self->io.fir_base;
+-	dev->irq = self->io.irq;
+-
+-	rtnl_lock();
+-	err = register_netdevice(dev);
+-	rtnl_unlock();
+-	if (err) {
+-		ERROR("%s(), register_netdev() failed!\n", __FUNCTION__);
+-		kfree(self->tx_buff.head);
+-		kfree(self->rx_buff.head);
+-		kfree(self);
+-		return -ENODEV;
+-	}
+-	MESSAGE("IrDA: Registered device %s\n", dev->name);
+-
+-	return 0;
+-}
+-
+-/*
+  * Function smsc_ircc_net_ioctl (dev, rq, cmd)
+  *
+  *    Process IOCTL commands for this device
+@@ -1571,18 +1525,6 @@ static int ircc_is_receiving(struct smsc
+ }
+ #endif /* unused */
+ 
+-static int smsc_ircc_net_init(struct net_device *dev)
+-{
+-	/* Keep track of module usage */
+-	SET_MODULE_OWNER(dev);
+-
+-	/* Set up to be a normal IrDA network device driver */
+-	irda_device_setup(dev);
+-
+-	/* Insert overrides below this line! */
+-
+-	return 0;
+-}
+ 
+ /*
+  * Function smsc_ircc_net_open (dev)
+@@ -1745,11 +1687,7 @@ static int __exit smsc_ircc_close(struct
+ 		pm_unregister(self->pmdev);
+ 
+ 	/* Remove netdevice */
+-	if (self->netdev) {
+-		rtnl_lock();
+-		unregister_netdevice(self->netdev);
+-		rtnl_unlock();
+-	}
++	unregister_netdev(self->netdev);
+ 
+ 	/* Make sure the irq handler is not exectuting */
+ 	spin_lock_irqsave(&self->lock, flags);
+@@ -1784,7 +1722,7 @@ static int __exit smsc_ircc_close(struct
+ 	if (self->rx_buff.head)
+ 		kfree(self->rx_buff.head);
+ 
+-	kfree(self);
++	free_netdev(self->netdev);
+ 
+ 	return 0;
+ }
+@@ -2269,32 +2207,36 @@ static const smsc_chip_t * __init smsc_i
+ 
+ static int __init smsc_superio_fdc(unsigned short cfg_base)
+ {
+-	if (check_region(cfg_base, 2) < 0) {
++	int ret = -1;
++
++	if (!request_region(cfg_base, 2, driver_name)) {
+ 		WARNING("%s: can't get cfg_base of 0x%03x\n",
+ 			__FUNCTION__, cfg_base);
+-		return -1;
+-	}
++	} else {
++		if (!smsc_superio_flat(fdc_chips_flat,cfg_base,"FDC")
++		    ||!smsc_superio_paged(fdc_chips_paged,cfg_base,"FDC"))
++			ret =  0;
+ 
+-	if (!smsc_superio_flat(fdc_chips_flat,cfg_base,"FDC")||!smsc_superio_paged(fdc_chips_paged,cfg_base,"FDC"))
+-		return 0;
++		release_region(cfg_base, 2);
++	}
+ 
+-	return -1;
++	return ret;
+ }
+ 
+ static int __init smsc_superio_lpc(unsigned short cfg_base)
+ {
+-#if 0
+-	if (check_region(cfg_base, 2) < 0) {
+-		IRDA_DEBUG(0, __FUNCTION__ ": can't get cfg_base of 0x%03x\n",
+-			   cfg_base);
+-		return -1;
+-	}
+-#endif
+-
+-	if (!smsc_superio_flat(lpc_chips_flat,cfg_base,"LPC")||!smsc_superio_paged(lpc_chips_paged,cfg_base,"LPC"))
+-		return 0;
++	int ret = -1;
+ 
+-	return -1;
++	if (!request_region(cfg_base, 2, driver_name)) {
++		WARNING("%s: can't get cfg_base of 0x%03x\n",
++			__FUNCTION__, cfg_base);
++	} else {
++		if (!smsc_superio_flat(lpc_chips_flat,cfg_base,"LPC")
++		    ||!smsc_superio_paged(lpc_chips_paged,cfg_base,"LPC"))
++			ret = 0;
++		release_region(cfg_base, 2);
++	}
++	return ret;
+ }
+ 
+ /************************************************
+--- linux-2.6.0-test6/drivers/net/irda/tekram.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/irda/tekram.c	2003-10-05 00:33:24.000000000 -0700
+@@ -44,12 +44,12 @@ static int  tekram_reset(struct irda_tas
+ #define TEKRAM_PW     0x10 /* Pulse select bit */
+ 
+ static struct dongle_reg dongle = {
+-	Q_NULL,
+-	IRDA_TEKRAM_DONGLE,
+-	tekram_open,
+-	tekram_close,
+-	tekram_reset,
+-	tekram_change_speed,
++	.type = IRDA_TEKRAM_DONGLE,
++	.open  = tekram_open,
++	.close = tekram_close,
++	.reset = tekram_reset,
++	.change_speed = tekram_change_speed,
++	.owner = THIS_MODULE,
+ };
+ 
+ int __init tekram_init(void)
+@@ -69,8 +69,6 @@ static void tekram_open(dongle_t *self, 
+ 	qos->baud_rate.bits &= IR_9600|IR_19200|IR_38400|IR_57600|IR_115200;
+ 	qos->min_turn_time.bits = 0x01; /* Needs at least 10 ms */	
+ 	irda_qos_bits_to_value(qos);
+-
+-	MOD_INC_USE_COUNT;
+ }
+ 
+ static void tekram_close(dongle_t *self)
+@@ -84,8 +82,6 @@ static void tekram_close(dongle_t *self)
+ 		irda_task_delete(self->reset_task);
+ 	if (self->speed_task)
+ 		irda_task_delete(self->speed_task);
+-
+-	MOD_DEC_USE_COUNT;
+ }
+ 
+ /*
+--- linux-2.6.0-test6/drivers/net/irda/via-ircc.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/irda/via-ircc.c	2003-10-05 00:33:24.000000000 -0700
+@@ -335,8 +335,7 @@ static __devinit int via_ircc_open(int i
+ 		return -1;
+ 
+ 	/* Allocate new instance of the driver */
+-	dev = alloc_netdev(sizeof(struct via_ircc_cb), "irda%d",
+-			   irda_device_setup);
++	dev = alloc_irdadev(sizeof(struct via_ircc_cb));
+ 	if (dev == NULL) 
+ 		return -ENOMEM;
+ 
+--- linux-2.6.0-test6/drivers/net/irda/vlsi_ir.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/irda/vlsi_ir.c	2003-10-05 00:33:24.000000000 -0700
+@@ -1859,15 +1859,6 @@ static void __devexit vlsi_irda_remove(s
+  * otherwise we might get cheated by pci-pm.
+  */
+ 
+-static int vlsi_irda_save_state(struct pci_dev *pdev, u32 state)
+-{
+-	if (state < 1 || state > 3 ) {
+-		ERROR("%s - %s: invalid pm state request: %u\n",
+-			__FUNCTION__, PCIDEV_NAME(pdev), state);
+-		return -1;
+-	}
+-	return 0;
+-}
+ 
+ static int vlsi_irda_suspend(struct pci_dev *pdev, u32 state)
+ {
+@@ -1970,7 +1961,6 @@ static struct pci_driver vlsi_irda_drive
+ 	.probe		= vlsi_irda_probe,
+ 	.remove		= __devexit_p(vlsi_irda_remove),
+ #ifdef CONFIG_PM
+-	.save_state	= vlsi_irda_save_state,
+ 	.suspend	= vlsi_irda_suspend,
+ 	.resume		= vlsi_irda_resume,
+ #endif
+--- linux-2.6.0-test6/drivers/net/irda/w83977af_ir.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/irda/w83977af_ir.c	2003-10-05 00:33:24.000000000 -0700
+@@ -170,8 +170,7 @@ int w83977af_open(int i, unsigned int io
+ 	/*
+ 	 *  Allocate new instance of the driver
+ 	 */
+-	dev = alloc_netdev(sizeof(struct w83977af_ir), "irda%d",
+-			   irda_device_setup);
++	dev = alloc_irdadev(sizeof(struct w83977af_ir));
+ 	if (dev == NULL) {
+ 		printk( KERN_ERR "IrDA: Can't allocate memory for "
+ 			"IrDA control block!\n");
+--- linux-2.6.0-test6/drivers/net/Kconfig	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/net/Kconfig	2003-10-05 00:33:46.000000000 -0700
+@@ -8,32 +8,18 @@ config NETDEVICES
+ 	bool "Network device support"
+ 	---help---
+ 	  You can say N here if you don't intend to connect your Linux box to
+-	  any other computer at all or if all your connections will be over a
+-	  telephone line with a modem either via UUCP (UUCP is a protocol to
+-	  forward mail and news between unix hosts over telephone lines; read
+-	  the UUCP-HOWTO, available from
+-	  <http://www.tldp.org/docs.html#howto>) or dialing up a shell
+-	  account or a BBS, even using term (term is a program which gives you
+-	  almost full Internet connectivity if you have a regular dial up
+-	  shell account on some Internet connected Unix computer. Read
+-	  <http://www.bart.nl/~patrickr/term-howto/Term-HOWTO.html>).
++	  any other computer at all.
+ 
+ 	  You'll have to say Y if your computer contains a network card that
+-	  you want to use under Linux (make sure you know its name because you
+-	  will be asked for it and read the Ethernet-HOWTO (especially if you
+-	  plan to use more than one network card under Linux)) or if you want
+-	  to use SLIP (Serial Line Internet Protocol is the protocol used to
+-	  send Internet traffic over telephone lines or null modem cables) or
+-	  CSLIP (compressed SLIP) or PPP (Point to Point Protocol, a better
+-	  and newer replacement for SLIP) or PLIP (Parallel Line Internet
+-	  Protocol is mainly used to create a mini network by connecting the
+-	  parallel ports of two local machines) or AX.25/KISS (protocol for
+-	  sending Internet traffic over amateur radio links).
+-
+-	  Make sure to read the NET-3-HOWTO. Eventually, you will have to read
+-	  Olaf Kirch's excellent and free book "Network Administrator's
+-	  Guide", to be found in <http://www.tldp.org/docs.html#guide>. If
+-	  unsure, say Y.
++	  you want to use under Linux. If you are going to run SLIP or PPP over
++	  telephone line or null modem cable you need say Y here. Connecting
++	  two machines with parallel ports using PLIP needs this, as well as
++	  AX.25/KISS for sending Internet traffic over amateur radio links.
++
++	  See also "The Linux Network Administrator's Guide" by Olaf Kirch and
++	  Terry Dawson. Available at <http://www.tldp.org/guides.html>.
++
++	  If unsure, say Y.
+ 
+ if NETDEVICES
+ 	source "drivers/net/arcnet/Kconfig"
+@@ -332,7 +318,7 @@ config MAC8390
+ 
+ config MAC89x0
+ 	tristate "Macintosh CS89x0 based ethernet cards"
+-	depends on NETDEVICES && MAC
++	depends on NETDEVICES && MAC && BROKEN
+ 	---help---
+ 	  Support for CS89x0 chipset based Ethernet cards.  If you have a
+ 	  Nubus or LC-PDS network (Ethernet) card of this type, say Y and
+@@ -405,7 +391,7 @@ config ATARILANCE
+ 
+ config ATARI_BIONET
+ 	tristate "BioNet-100 support"
+-	depends on NETDEVICES && ATARI && ATARI_ACSI!=n
++	depends on NETDEVICES && ATARI && ATARI_ACSI!=n && BROKEN
+ 	help
+ 	  Say Y to include support for BioData's BioNet-100 Ethernet adapter
+ 	  for the ACSI port. The driver works (has to work...) with a polled
+@@ -413,7 +399,7 @@ config ATARI_BIONET
+ 
+ config ATARI_PAMSNET
+ 	tristate "PAMsNet support"
+-	depends on NETDEVICES && ATARI && ATARI_ACSI!=n
++	depends on NETDEVICES && ATARI && ATARI_ACSI!=n && BROKEN
+ 	help
+ 	  Say Y to include support for the PAMsNet Ethernet adapter for the
+ 	  ACSI port ("ACSI node"). The driver works (has to work...) with a
+@@ -808,7 +794,7 @@ config ULTRA32
+ 
+ config SMC9194
+ 	tristate "SMC 9194 support"
+-	depends on NET_VENDOR_SMC && (ISA || MAC)
++	depends on NET_VENDOR_SMC && (ISA || MAC && BROKEN)
+ 	select CRC32
+ 	---help---
+ 	  This is support for the SMC9xxx based Ethernet cards. Choose this
+@@ -2455,6 +2441,9 @@ config SHAPER
+ 	  To compile this driver as a module, choose M here: the module
+ 	  will be called shaper.  If unsure, say N.
+ 
++config NET_POLL_CONTROLLER
++	def_bool KGDB
++
+ source "drivers/net/wan/Kconfig"
+ 
+ source "drivers/net/pcmcia/Kconfig"
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/net/kgdb_eth.c	2003-10-05 00:33:51.000000000 -0700
+@@ -0,0 +1,517 @@
++/*
++ * Network interface GDB stub
++ *
++ * Written by San Mehat (nettwerk@biodome.org)
++ * Based upon 'gdbserial' by David Grothe (dave@gcom.com)
++ * and Scott Foehner (sfoehner@engr.sgi.com)
++ *
++ * Twiddled for 2.6 by Robert Walsh <rjwalsh@durables.org>
++ * and wangdi <wangdi@clusterfs.com>.
++ */
++
++#include <linux/module.h>
++#include <linux/errno.h>
++#include <linux/signal.h>
++#include <linux/sched.h>
++#include <linux/timer.h>
++#include <linux/interrupt.h>
++#include <linux/config.h>
++#include <linux/major.h>
++#include <linux/string.h>
++#include <linux/fcntl.h>
++#include <linux/termios.h>
++#include <asm/kgdb.h>
++#include <linux/if_ether.h>
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/skbuff.h>
++#include <linux/delay.h>
++#include <net/tcp.h>
++#include <net/udp.h>
++
++#include <asm/system.h>
++#include <asm/io.h>
++#include <asm/segment.h>
++#include <asm/bitops.h>
++#include <asm/system.h>
++#include <asm/irq.h>
++#include <asm/atomic.h>
++
++#define	GDB_BUF_SIZE	512		/* power of 2, please */
++
++static char	kgdb_buf[GDB_BUF_SIZE] ;
++static int	kgdb_buf_in_inx ;
++static atomic_t	kgdb_buf_in_cnt ;
++static int	kgdb_buf_out_inx ;
++
++extern void	set_debug_traps(void) ;		/* GDB routine */
++extern void	breakpoint(void);
++
++unsigned int	kgdb_remoteip = 0;
++unsigned short	kgdb_listenport = 6443;
++unsigned short	kgdb_sendport= 6442;
++int		kgdb_eth = -1; /* Default tty mode */
++unsigned char	kgdb_remotemac[6] = {0xff,0xff,0xff,0xff,0xff,0xff};
++unsigned char	kgdb_localmac[6] = {0xff,0xff,0xff,0xff,0xff,0xff};
++volatile int	kgdb_eth_is_initializing = 0;
++int		kgdb_eth_need_breakpoint[NR_CPUS];
++
++struct net_device *kgdb_netdevice = NULL;
++
++/*
++ * Get a char if available, return -1 if nothing available.
++ * Empty the receive buffer first, then look at the interface hardware.
++ */
++static int
++read_char(void)
++{
++	/* intr routine has queued chars */
++	if (atomic_read(&kgdb_buf_in_cnt) != 0)
++	{
++		int chr;
++
++		chr = kgdb_buf[kgdb_buf_out_inx++] ;
++		kgdb_buf_out_inx &= (GDB_BUF_SIZE - 1) ;
++		atomic_dec(&kgdb_buf_in_cnt) ;
++		return chr;
++	}
++
++	return -1; /* no data */
++}
++
++/*
++ * Wait until the interface can accept a char, then write it.
++ */
++static void
++write_buffer(char *buf, int len)
++{
++	int			total_len, eth_len, ip_len, udp_len;
++	struct in_device	*in_dev;
++	struct sk_buff		*skb;
++	struct udphdr		*udph;
++	struct iphdr		*iph;
++	struct ethhdr		*eth;
++
++	if (!(in_dev = (struct in_device *) kgdb_netdevice->ip_ptr)) {
++		panic("No in_device available for interface!\n");
++	}
++
++	if (!(in_dev->ifa_list)) {
++		panic("No interface address set for interface!\n");
++	}
++
++	udp_len = len + sizeof(struct udphdr);
++	ip_len = eth_len = udp_len + sizeof(struct iphdr);
++	total_len = eth_len + ETH_HLEN;
++
++	if (!(skb = alloc_skb(total_len, GFP_ATOMIC))) {
++		return;
++	}
++
++	atomic_set(&skb->users, 1);
++	skb_reserve(skb, total_len - len);
++
++	memcpy(skb->data, (unsigned char *) buf, len);
++	skb->len += len;
++
++	udph = (struct udphdr *) skb_push(skb, sizeof(*udph));
++	udph->source = htons(kgdb_listenport);
++	udph->dest   = htons(kgdb_sendport);
++	udph->len    = htons(udp_len);
++	udph->check  = 0;
++
++	iph = (struct iphdr *)skb_push(skb, sizeof(*iph));
++	iph->version  = 4;
++	iph->ihl      = 5;
++	iph->tos      = 0;
++	iph->tot_len  = htons(ip_len);
++	iph->id       = 0;
++	iph->frag_off = 0;
++	iph->ttl      = 64;
++	iph->protocol = IPPROTO_UDP;
++	iph->check    = 0;
++	iph->saddr    = in_dev->ifa_list->ifa_address;
++	iph->daddr    = kgdb_remoteip;
++	iph->check    = ip_fast_csum((unsigned char *)iph, iph->ihl);
++
++	eth = (struct ethhdr *) skb_push(skb, ETH_HLEN);
++	eth->h_proto = htons(ETH_P_IP);
++	memcpy(eth->h_source, kgdb_localmac, kgdb_netdevice->addr_len);
++	memcpy(eth->h_dest, kgdb_remotemac, kgdb_netdevice->addr_len);
++
++repeat:
++	spin_lock(&kgdb_netdevice->xmit_lock);
++	kgdb_netdevice->xmit_lock_owner = smp_processor_id();
++
++	if (netif_queue_stopped(kgdb_netdevice)) {
++		kgdb_netdevice->xmit_lock_owner = -1;
++		spin_unlock(&kgdb_netdevice->xmit_lock);
++
++		kgdb_netdevice->poll_controller(kgdb_netdevice);
++		goto repeat;
++	}
++
++	kgdb_netdevice->hard_start_xmit(skb, kgdb_netdevice);
++	kgdb_netdevice->xmit_lock_owner = -1;
++	spin_unlock(&kgdb_netdevice->xmit_lock);
++}
++
++/*
++ * In the interrupt state the target machine will not respond to any
++ * arp requests, so handle them here.
++ */
++
++static struct sk_buff *send_skb = NULL;
++
++void
++kgdb_eth_reply_arp(void)
++{
++	if (send_skb) {
++		spin_lock(&kgdb_netdevice->xmit_lock);
++		kgdb_netdevice->xmit_lock_owner = smp_processor_id();
++	    	kgdb_netdevice->hard_start_xmit(send_skb, kgdb_netdevice);
++	    	kgdb_netdevice->xmit_lock_owner = -1;
++	    	spin_unlock(&kgdb_netdevice->xmit_lock);
++		send_skb = NULL;
++	}
++}
++
++static int
++make_arp_request(struct sk_buff *skb)
++{
++	struct arphdr *arp;
++	unsigned char *arp_ptr;
++	int type = ARPOP_REPLY;
++	int ptype = ETH_P_ARP;
++	u32 sip, tip;
++	unsigned char *sha, *tha;
++	struct in_device *in_dev = (struct in_device *) kgdb_netdevice->ip_ptr;
++
++	/* No arp on this interface */
++
++	if (kgdb_netdevice->flags & IFF_NOARP) {
++		return 0;
++	}
++
++	if (!pskb_may_pull(skb, (sizeof(struct arphdr) +
++				 (2 * kgdb_netdevice->addr_len) +
++				 (2 * sizeof(u32))))) {
++		return 0;
++	}
++
++	skb->h.raw = skb->nh.raw = skb->data;
++	arp = skb->nh.arph;
++
++	if ((arp->ar_hrd != htons(ARPHRD_ETHER) &&
++	     arp->ar_hrd != htons(ARPHRD_IEEE802)) ||
++	    arp->ar_pro != htons(ETH_P_IP)) {
++		return 0;
++	}
++
++	/* Understand only these message types */
++
++	if (arp->ar_op != htons(ARPOP_REQUEST)) {
++		return 0;
++	}
++
++	/* Extract fields */
++
++	arp_ptr= (unsigned char *)(arp+1);
++	sha = arp_ptr;
++	arp_ptr += kgdb_netdevice->addr_len;
++	memcpy(&sip, arp_ptr, 4);
++	arp_ptr += 4;
++	tha = arp_ptr;
++	arp_ptr += kgdb_netdevice->addr_len;
++	memcpy(&tip, arp_ptr, 4);
++
++	if (tip != in_dev->ifa_list->ifa_address) {
++		return 0;
++	}
++
++	if (kgdb_remoteip != sip) {
++		return 0;
++	}
++
++	/*
++	 * Check for bad requests for 127.x.x.x and requests for multicast
++	 * addresses.  If this is one such, delete it.
++	 */
++
++	if (LOOPBACK(tip) || MULTICAST(tip)) {
++		return 0;
++	}
++
++	/* reply to the ARP request */
++
++	send_skb = alloc_skb(sizeof(struct arphdr) + 2 * (kgdb_netdevice->addr_len + 4) + LL_RESERVED_SPACE(kgdb_netdevice), GFP_ATOMIC);
++
++	if (send_skb == NULL) {
++		return 0;
++	}
++
++	skb_reserve(send_skb, LL_RESERVED_SPACE(kgdb_netdevice));
++	send_skb->nh.raw = send_skb->data;
++	arp = (struct arphdr *) skb_put(send_skb, sizeof(struct arphdr) + 2 * (kgdb_netdevice->addr_len + 4));
++	send_skb->dev = kgdb_netdevice;
++	send_skb->protocol = htons(ETH_P_ARP);
++
++	/* Fill the device header for the ARP frame */
++
++	if (kgdb_netdevice->hard_header &&
++	    kgdb_netdevice->hard_header(send_skb, kgdb_netdevice, ptype,
++				       kgdb_remotemac, kgdb_localmac,
++				       send_skb->len) < 0) {
++		kfree_skb(send_skb);
++		return 0;
++	}
++
++	/*
++	 * Fill out the arp protocol part.
++	 *
++	 * we only support ethernet device type,
++	 * which (according to RFC 1390) should always equal 1 (Ethernet).
++	 */
++
++	arp->ar_hrd = htons(kgdb_netdevice->type);
++	arp->ar_pro = htons(ETH_P_IP);
++
++	arp->ar_hln = kgdb_netdevice->addr_len;
++	arp->ar_pln = 4;
++	arp->ar_op = htons(type);
++
++	arp_ptr=(unsigned char *)(arp + 1);
++
++	memcpy(arp_ptr, kgdb_netdevice->dev_addr, kgdb_netdevice->addr_len);
++	arp_ptr += kgdb_netdevice->addr_len;
++	memcpy(arp_ptr, &tip, 4);
++	arp_ptr += 4;
++	memcpy(arp_ptr, kgdb_localmac, kgdb_netdevice->addr_len);
++	arp_ptr += kgdb_netdevice->addr_len;
++	memcpy(arp_ptr, &sip, 4);
++	return 0;
++}
++
++
++/*
++ * Accept an skbuff from net_device layer and add the payload onto
++ * kgdb buffer
++ *
++ * When the kgdb stub routine getDebugChar() is called it draws characters
++ * out of the buffer until it is empty and then reads directly from the
++ * serial port.
++ *
++ * We do not attempt to write chars from the interrupt routine since
++ * the stubs do all of that via putDebugChar() which writes one byte
++ * after waiting for the interface to become ready.
++ *
++ * The debug stubs like to run with interrupts disabled since, after all,
++ * they run as a consequence of a breakpoint in the kernel.
++ *
++ * NOTE: Return value of 1 means it was for us and is an indication to
++ * the calling driver to destroy the sk_buff and not send it up the stack.
++ */
++int
++kgdb_net_interrupt(struct sk_buff *skb)
++{
++	unsigned char	chr;
++	struct iphdr	*iph = (struct iphdr*)skb->data;
++	struct udphdr	*udph= (struct udphdr*)(skb->data+(iph->ihl<<2));
++	unsigned char	*data = (unsigned char *) udph + sizeof(struct udphdr);
++	int		len;
++	int		i;
++
++	if ((kgdb_eth != -1) && (!kgdb_netdevice) &&
++	    (iph->protocol == IPPROTO_UDP) &&
++	    (be16_to_cpu(udph->dest) == kgdb_listenport)) {
++		kgdb_sendport = be16_to_cpu(udph->source);
++
++		while (kgdb_eth_is_initializing)
++			;
++		if (!kgdb_netdevice)
++			kgdb_eth_hook();
++		if (!kgdb_netdevice) {
++			/* Lets not even try again. */
++			kgdb_eth = -1;
++			return 0;
++		}
++	}
++	if (!kgdb_netdevice) {
++		return 0;
++	}
++	if (skb->protocol == __constant_htons(ETH_P_ARP) && !send_skb) {
++		make_arp_request(skb);
++		return 0;
++	}
++	if (iph->protocol != IPPROTO_UDP) {
++		return 0;
++	}
++
++	if (be16_to_cpu(udph->dest) != kgdb_listenport) {
++		return 0;
++	}
++
++	len = (be16_to_cpu(iph->tot_len) -
++	       (sizeof(struct udphdr) + sizeof(struct iphdr)));
++
++	for (i = 0; i < len; i++) {
++		chr = data[i];
++		if (chr == 3) {
++			kgdb_eth_need_breakpoint[smp_processor_id()] = 1;
++			continue;
++		}
++		if (atomic_read(&kgdb_buf_in_cnt) >= GDB_BUF_SIZE) {
++			/* buffer overflow, clear it */
++			kgdb_buf_in_inx = 0;
++			atomic_set(&kgdb_buf_in_cnt, 0);
++			kgdb_buf_out_inx = 0;
++			break;
++		}
++		kgdb_buf[kgdb_buf_in_inx++] = chr;
++		kgdb_buf_in_inx &= (GDB_BUF_SIZE - 1);
++		atomic_inc(&kgdb_buf_in_cnt);
++	}
++
++	if (!kgdb_netdevice->kgdb_is_trapped) {
++		/*
++		 * If a new gdb instance is trying to attach, we need to
++		 * break here.
++		 */
++		if (!strncmp(data, "$Hc-1#09", 8))
++			kgdb_eth_need_breakpoint[smp_processor_id()] = 1;
++	}
++	return 1;
++}
++EXPORT_SYMBOL(kgdb_net_interrupt);
++
++int
++kgdb_eth_hook(void)
++{
++	char kgdb_netdev[16];
++	extern void kgdb_respond_ok(void);
++
++	if (kgdb_remotemac[0] == 0xff) {
++		panic("ERROR! 'gdbeth_remotemac' option not set!\n");
++	}
++	if (kgdb_localmac[0] == 0xff) {
++		panic("ERROR! 'gdbeth_localmac' option not set!\n");
++	}
++	if (kgdb_remoteip == 0) {
++		panic("ERROR! 'gdbeth_remoteip' option not set!\n");
++	}
++
++	sprintf(kgdb_netdev,"eth%d",kgdb_eth);
++
++#ifdef CONFIG_SMP
++	if (num_online_cpus() > CONFIG_NO_KGDB_CPUS) {
++		printk("kgdb: too manu cpus. Cannot enable debugger with more than %d cpus\n", CONFIG_NO_KGDB_CPUS);
++		return -1;
++	}
++#endif
++	for (kgdb_netdevice = dev_base;
++		kgdb_netdevice != NULL;
++		kgdb_netdevice = kgdb_netdevice->next) {
++		if (strncmp(kgdb_netdevice->name, kgdb_netdev, IFNAMSIZ) == 0) {
++			break;
++		}
++	}
++	if (!kgdb_netdevice) {
++		printk("KGDB NET : Unable to find interface %s\n",kgdb_netdev);
++		return -ENODEV;
++	}
++
++	/*
++	 * Call GDB routine to setup the exception vectors for the debugger
++	 */
++	set_debug_traps();
++
++	/*
++	 * Call the breakpoint() routine in GDB to start the debugging
++	 * session.
++	 */
++	kgdb_eth_is_initializing = 1;
++	kgdb_eth_need_breakpoint[smp_processor_id()] = 1;
++	return 0;
++}
++
++/*
++ * getDebugChar
++ *
++ * This is a GDB stub routine.  It waits for a character from the
++ * serial interface and then returns it.  If there is no serial
++ * interface connection then it returns a bogus value which will
++ * almost certainly cause the system to hang.
++ */
++int
++eth_getDebugChar(void)
++{
++	volatile int	chr;
++
++	while ((chr = read_char()) < 0) {
++		if (send_skb) {
++			kgdb_eth_reply_arp();
++		}
++		if (kgdb_netdevice->poll_controller) {
++			kgdb_netdevice->poll_controller(kgdb_netdevice);
++		} else {
++			printk("KGDB NET: Error - Device %s is not supported!\n", kgdb_netdevice->name);
++			panic("Please add support for kgdb net to this driver");
++		}
++	}
++	return chr;
++}
++
++#define ETH_QUEUE_SIZE 256
++static char eth_queue[ETH_QUEUE_SIZE];
++static int outgoing_queue;
++
++void
++eth_flushDebugChar(void)
++{
++	if(outgoing_queue) {
++		write_buffer(eth_queue, outgoing_queue);
++
++		outgoing_queue = 0;
++	}
++}
++
++static void
++put_char_on_queue(int chr)
++{
++	eth_queue[outgoing_queue++] = chr;
++	if(outgoing_queue == ETH_QUEUE_SIZE)
++	{
++		eth_flushDebugChar();
++	}
++}
++
++/*
++ * eth_putDebugChar
++ *
++ * This is a GDB stub routine.  It waits until the interface is ready
++ * to transmit a char and then sends it.
++ */
++void
++eth_putDebugChar(int chr)
++{
++	put_char_on_queue(chr); /* this routine will wait */
++}
++
++void
++kgdb_eth_set_trapmode(int mode)
++{
++	if (!kgdb_netdevice) {
++		return;
++	}
++	kgdb_netdevice->kgdb_is_trapped = mode;
++}
++
++int
++kgdb_eth_is_trapped()
++{
++	if (!kgdb_netdevice) {
++		return 0;
++	}
++	return kgdb_netdevice->kgdb_is_trapped;
++}
++EXPORT_SYMBOL(kgdb_eth_is_trapped);
+--- linux-2.6.0-test6/drivers/net/loopback.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/loopback.c	2003-10-05 00:33:24.000000000 -0700
+@@ -30,6 +30,7 @@
+  */
+ #include <linux/kernel.h>
+ #include <linux/jiffies.h>
++#include <linux/module.h>
+ #include <linux/interrupt.h>
+ #include <linux/fs.h>
+ #include <linux/types.h>
+@@ -202,3 +203,5 @@ int __init loopback_init(void)
+ 	
+ 	return register_netdev(&loopback_dev);
+ };
++
++EXPORT_SYMBOL(loopback_dev);
+--- linux-2.6.0-test6/drivers/net/mac8390.c	2003-07-27 12:14:39.000000000 -0700
++++ 25/drivers/net/mac8390.c	2003-10-05 00:33:24.000000000 -0700
+@@ -442,14 +442,14 @@ int __init mac8390_initdev(struct net_de
+                ei_status.tx_start_page = CABLETRON_TX_START_PG;
+                ei_status.rx_start_page = CABLETRON_RX_START_PG;
+                ei_status.stop_page = CABLETRON_RX_STOP_PG;
+-               dev->rmem_start = dev->mem_start;
+-               dev->rmem_end = dev->mem_start + CABLETRON_RX_STOP_PG*256;
++               ei_status.rmem_start = dev->mem_start;
++               ei_status.rmem_end = dev->mem_start + CABLETRON_RX_STOP_PG*256;
+ 	} else {
+                ei_status.tx_start_page = WD_START_PG;
+                ei_status.rx_start_page = WD_START_PG + TX_PAGES;
+                ei_status.stop_page = (dev->mem_end - dev->mem_start)/256;
+-               dev->rmem_start = dev->mem_start + TX_PAGES*256;
+-               dev->rmem_end = dev->mem_end;
++               ei_status.rmem_start = dev->mem_start + TX_PAGES*256;
++               ei_status.rmem_end = dev->mem_end;
+ 	}
+ 	
+ 	/* Fill in model-specific information and functions */
+@@ -621,12 +621,12 @@ static void sane_block_input(struct net_
+ 	unsigned long xfer_base = ring_offset - (WD_START_PG<<8);
+ 	unsigned long xfer_start = xfer_base + dev->mem_start;
+ 
+-	if (xfer_start + count > dev->rmem_end) {
++	if (xfer_start + count > ei_status.rmem_end) {
+ 		/* We must wrap the input move. */
+-		int semi_count = dev->rmem_end - xfer_start;
++		int semi_count = ei_status.rmem_end - xfer_start;
+ 		memcpy_fromio(skb->data, (char *)dev->mem_start + xfer_base, semi_count);
+ 		count -= semi_count;
+-		memcpy_toio(skb->data + semi_count, (char *)dev->rmem_start, count);
++		memcpy_toio(skb->data + semi_count, (char *)ei_status.rmem_start, count);
+ 	} else {
+ 		memcpy_fromio(skb->data, (char *)dev->mem_start + xfer_base, count);
+ 	}
+@@ -657,15 +657,16 @@ static void dayna_block_input(struct net
+ 
+ 	/* Note the offset math is done in card memory space which is word
+ 	   per long onto our space. */
+-	 
+-	if (xfer_start + count > dev->rmem_end) 
++
++	if (xfer_start + count > ei_status.rmem_end)
+ 	{
+ 		/* We must wrap the input move. */
+-		int semi_count = dev->rmem_end - xfer_start;
++		int semi_count = ei_status.rmem_end - xfer_start;
+ 		dayna_memcpy_fromcard(dev, skb->data, xfer_base, semi_count);
+ 		count -= semi_count;
+-		dayna_memcpy_fromcard(dev, skb->data + semi_count, 
+-			dev->rmem_start - dev->mem_start, count);
++		dayna_memcpy_fromcard(dev, skb->data + semi_count,
++				      ei_status.rmem_start - dev->mem_start,
++				      count);
+ 	}
+ 	else
+ 	{
+@@ -697,15 +698,15 @@ static void slow_sane_block_input(struct
+ 	unsigned long xfer_base = ring_offset - (WD_START_PG<<8);
+ 	unsigned long xfer_start = xfer_base+dev->mem_start;
+ 
+-	if (xfer_start + count > dev->rmem_end)
++	if (xfer_start + count > ei_status.rmem_end)
+ 	{
+ 		/* We must wrap the input move. */
+-		int semi_count = dev->rmem_end - xfer_start;
++		int semi_count = ei_status.rmem_end - xfer_start;
+ 		word_memcpy_fromcard(skb->data, (char *)dev->mem_start +
+ 			xfer_base, semi_count);
+ 		count -= semi_count;
+ 		word_memcpy_fromcard(skb->data + semi_count,
+-			(char *)dev->rmem_start, count);
++				     (char *)ei_status.rmem_start, count);
+ 	}
+ 	else
+ 	{
+--- linux-2.6.0-test6/drivers/net/Makefile	2003-09-27 18:57:44.000000000 -0700
++++ 25/drivers/net/Makefile	2003-10-05 00:33:44.000000000 -0700
+@@ -32,6 +32,8 @@ obj-$(CONFIG_BMAC) += bmac.o
+ 
+ obj-$(CONFIG_OAKNET) += oaknet.o 8390.o
+ 
++obj-$(CONFIG_KGDB) += kgdb_eth.o
++
+ obj-$(CONFIG_DGRS) += dgrs.o
+ obj-$(CONFIG_RCPCI) += rcpci.o
+ obj-$(CONFIG_VORTEX) += 3c59x.o
+--- linux-2.6.0-test6/drivers/net/ne2.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/ne2.c	2003-10-05 00:33:24.000000000 -0700
+@@ -70,7 +70,7 @@ static const char *version = "ne2.c:v0.9
+ #include <linux/string.h>
+ #include <linux/errno.h>
+ #include <linux/init.h>
+-#include <linux/mca.h>
++#include <linux/mca-legacy.h>
+ #include <linux/netdevice.h>
+ #include <linux/etherdevice.h>
+ #include <linux/skbuff.h>
+--- linux-2.6.0-test6/drivers/net/ne3210.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/ne3210.c	2003-10-05 00:33:24.000000000 -0700
+@@ -23,6 +23,7 @@
+ 	This driver WILL NOT WORK FOR THE NE3200 - it is completely different
+ 	and does not use an 8390 at all.
+ 
++	Updated to EISA probing API 5/2003 by Marc Zyngier.
+ */
+ 
+ static const char *version =
+@@ -44,9 +45,6 @@ static const char *version =
+ 
+ #include "8390.h"
+ 
+-int ne3210_probe(struct net_device *dev);
+-static int ne3210_probe1(struct net_device *dev, int ioaddr);
+-
+ static int ne3210_open(struct net_device *dev);
+ static int ne3210_close(struct net_device *dev);
+ 
+@@ -59,7 +57,6 @@ static void ne3210_block_output(struct n
+ #define NE3210_START_PG		0x00    /* First page of TX buffer	*/
+ #define NE3210_STOP_PG		0x80    /* Last page +1 of RX ring	*/
+ 
+-#define NE3210_ID_PORT		0xc80	/* Same for all EISA cards 	*/
+ #define NE3210_IO_EXTENT	0x20
+ #define NE3210_SA_PROM		0x16	/* Start of e'net addr.		*/
+ #define NE3210_RESET_PORT	0xc84
+@@ -69,10 +66,9 @@ static void ne3210_block_output(struct n
+ #define NE3210_ADDR1		0x00
+ #define NE3210_ADDR2		0x1b
+ 
+-#define NE3210_ID	0x0118cc3a	/* 0x3acc = 1110 10110 01100 =  nvl */
+-
+ #define NE3210_CFG1		0xc84	/* NB: 0xc84 is also "reset" port. */
+ #define NE3210_CFG2		0xc90
++#define NE3210_CFG_EXTENT       (NE3210_CFG2 - NE3210_CFG1 + 1)
+ 
+ /*
+  *	You can OR any of the following bits together and assign it
+@@ -89,152 +85,108 @@ static void ne3210_block_output(struct n
+ 
+ static unsigned char irq_map[] __initdata = {15, 12, 11, 10, 9, 7, 5, 3};
+ static unsigned int shmem_map[] __initdata = {0xff0, 0xfe0, 0xfff0, 0xd8, 0xffe0, 0xffc0, 0xd0, 0x0};
++static const char *ifmap[] __initdata = {"UTP", "?", "BNC", "AUI"};
++static int ifmap_val[] __initdata = {
++		IF_PORT_10BASET,
++		IF_PORT_UNKNOWN,
++		IF_PORT_10BASE2,
++		IF_PORT_AUI,
++};
+ 
+-/*
+- *	Probe for the card. The best way is to read the EISA ID if it
+- *	is known. Then we can check the prefix of the station address
+- *	PROM for a match against the value assigned to Novell.
+- */
+-
+-int __init ne3210_probe(struct net_device *dev)
++static int __init ne3210_eisa_probe (struct device *device)
+ {
+-	unsigned short ioaddr = dev->base_addr;
+-
+-	SET_MODULE_OWNER(dev);
++	unsigned long ioaddr, phys_mem;
++	int i, retval, port_index;
++	struct eisa_device *edev = to_eisa_device (device);
++	struct net_device *dev;
+ 
+-	if (ioaddr > 0x1ff)		/* Check a single specified location. */
+-		return ne3210_probe1(dev, ioaddr);
+-	else if (ioaddr > 0)		/* Don't probe at all. */
+-		return -ENXIO;
+-
+-	if (!EISA_bus) {
+-#if NE3210_DEBUG & NE3210_D_PROBE
+-		printk("ne3210-debug: Not an EISA bus. Not probing high ports.\n");
+-#endif
+-		return -ENXIO;
++	/* Allocate dev->priv and fill in 8390 specific dev fields. */
++	if (!(dev = alloc_ei_netdev ())) {
++		printk ("ne3210.c: unable to allocate memory for dev!\n");
++		return -ENOMEM;
+ 	}
+ 
+-	/* EISA spec allows for up to 16 slots, but 8 is typical. */
+-	for (ioaddr = 0x1000; ioaddr < 0x9000; ioaddr += 0x1000)
+-		if (ne3210_probe1(dev, ioaddr) == 0)
+-			return 0;
+-
+-	return -ENODEV;
+-}
+-
+-static int __init ne3210_probe1(struct net_device *dev, int ioaddr)
+-{
+-	int i, retval;
+-	unsigned long eisa_id;
+-	const char *ifmap[] = {"UTP", "?", "BNC", "AUI"};
+-
+-	if (!request_region(dev->base_addr, NE3210_IO_EXTENT, dev->name))
+-		return -EBUSY;
++	SET_MODULE_OWNER(dev);
++	SET_NETDEV_DEV(dev, device);
++	device->driver_data = dev;
++	ioaddr = edev->base_addr;
+ 
+-	if (inb_p(ioaddr + NE3210_ID_PORT) == 0xff) {
+-		retval = -ENODEV;
++	if (ethdev_init (dev)) {
++		printk ("ne3210.c: unable to allocate memory for dev->priv!\n");
++		retval = -ENOMEM;
+ 		goto out;
+ 	}
+ 
+-#if NE3210_DEBUG & NE3210_D_PROBE
+-	printk("ne3210-debug: probe at %#x, ID %#8x\n", ioaddr, inl(ioaddr + NE3210_ID_PORT));
+-	printk("ne3210-debug: config regs: %#x %#x\n",
+-		inb(ioaddr + NE3210_CFG1), inb(ioaddr + NE3210_CFG2));
+-#endif
+-
+-
+-/*	Check the EISA ID of the card. */
+-	eisa_id = inl(ioaddr + NE3210_ID_PORT);
+-	if (eisa_id != NE3210_ID) {
+-		retval = -ENODEV;
++	if (!request_region(ioaddr, NE3210_IO_EXTENT, dev->name)) {
++		retval = -EBUSY;
+ 		goto out;
+ 	}
+ 
+-	
+-#if 0
+-/*	Check the vendor ID as well. Not really required. */
+-	if (inb(ioaddr + NE3210_SA_PROM + 0) != NE3210_ADDR0
+-		|| inb(ioaddr + NE3210_SA_PROM + 1) != NE3210_ADDR1
+-		|| inb(ioaddr + NE3210_SA_PROM + 2) != NE3210_ADDR2 ) {
+-		printk("ne3210.c: card not found");
+-		for(i = 0; i < ETHER_ADDR_LEN; i++)
+-			printk(" %02x", inb(ioaddr + NE3210_SA_PROM + i));
+-		printk(" (invalid prefix).\n");
+-		retval = -ENODEV;
+-		goto out;
++	if (!request_region(ioaddr + NE3210_CFG1,
++			    NE3210_CFG_EXTENT, dev->name)) {
++		retval = -EBUSY;
++		goto out1;
+ 	}
++
++#if NE3210_DEBUG & NE3210_D_PROBE
++	printk("ne3210-debug: probe at %#x, ID %s\n", ioaddr, edev->id.sig);
++	printk("ne3210-debug: config regs: %#x %#x\n",
++		inb(ioaddr + NE3210_CFG1), inb(ioaddr + NE3210_CFG2));
+ #endif
+ 
+-	/* Allocate dev->priv and fill in 8390 specific dev fields. */
+-	if (ethdev_init(dev)) {
+-		printk ("ne3210.c: unable to allocate memory for dev->priv!\n");
+-		retval = -ENOMEM;
+-		goto out;
+-	}
+ 
++	port_index = inb(ioaddr + NE3210_CFG2) >> 6;
+ 	printk("ne3210.c: NE3210 in EISA slot %d, media: %s, addr:",
+-		ioaddr/0x1000, ifmap[inb(ioaddr + NE3210_CFG2) >> 6]);
++		edev->slot, ifmap[port_index]);
+ 	for(i = 0; i < ETHER_ADDR_LEN; i++)
+ 		printk(" %02x", (dev->dev_addr[i] = inb(ioaddr + NE3210_SA_PROM + i)));
+-	printk(".\nne3210.c: ");
++	
+ 
+ 	/* Snarf the interrupt now. CFG file has them all listed as `edge' with share=NO */
+-	if (dev->irq == 0) {
+-		unsigned char irq_reg = inb(ioaddr + NE3210_CFG2) >> 3;
+-		dev->irq = irq_map[irq_reg & 0x07];
+-		printk("using");
+-	} else {
+-		/* This is useless unless we reprogram the card here too */
+-		if (dev->irq == 2) dev->irq = 9;	/* Doh! */
+-		printk("assigning");
+-	}
+-	printk(" IRQ %d,", dev->irq);
++	dev->irq = irq_map[(inb(ioaddr + NE3210_CFG2) >> 3) & 0x07];
++	printk(".\nne3210.c: using IRQ %d, ", dev->irq);
+ 
+ 	retval = request_irq(dev->irq, ei_interrupt, 0, dev->name, dev);
+ 	if (retval) {
+ 		printk (" unable to get IRQ %d.\n", dev->irq);
+-		goto out1;
+-	}
+-
+-	if (dev->mem_start == 0) {
+-		unsigned char mem_reg = inb(ioaddr + NE3210_CFG2) & 0x07;
+-		dev->mem_start = shmem_map[mem_reg] * 0x1000;
+-		printk(" using ");
+-	} else {
+-		/* Should check for value in shmem_map and reprogram the card to use it */
+-		dev->mem_start &= 0xfff8000;
+-		printk(" assigning ");
++		goto out2;
+ 	}
+ 
+-	printk("%dkB memory at physical address %#lx\n",
+-			NE3210_STOP_PG/4, dev->mem_start);
++	phys_mem = shmem_map[inb(ioaddr + NE3210_CFG2) & 0x07] * 0x1000;
+ 
+ 	/*
+ 	   BEWARE!! Some dain-bramaged EISA SCUs will allow you to put
+ 	   the card mem within the region covered by `normal' RAM  !!!
+ 	*/
+-	if (dev->mem_start > 1024*1024) {	/* phys addr > 1MB */
+-		if (dev->mem_start < virt_to_phys(high_memory)) {
++	if (phys_mem > 1024*1024) {	/* phys addr > 1MB */
++		if (phys_mem < virt_to_phys(high_memory)) {
+ 			printk(KERN_CRIT "ne3210.c: Card RAM overlaps with normal memory!!!\n");
+ 			printk(KERN_CRIT "ne3210.c: Use EISA SCU to set card memory below 1MB,\n");
+ 			printk(KERN_CRIT "ne3210.c: or to an address above 0x%lx.\n", virt_to_phys(high_memory));
+ 			printk(KERN_CRIT "ne3210.c: Driver NOT installed.\n");
+ 			retval = -EINVAL;
+-			goto out2;
++			goto out3;
+ 		}
+-		dev->mem_start = (unsigned long)ioremap(dev->mem_start, NE3210_STOP_PG*0x100);
+-		if (dev->mem_start == 0) {
+-			printk(KERN_ERR "ne3210.c: Unable to remap card memory above 1MB !!\n");
+-			printk(KERN_ERR "ne3210.c: Try using EISA SCU to set memory below 1MB.\n");
+-			printk(KERN_ERR "ne3210.c: Driver NOT installed.\n");
+-			retval = -EAGAIN;
+-			goto out2;
+-		}
+-		ei_status.reg0 = 1;	/* Use as remap flag */
+-		printk("ne3210.c: remapped %dkB card memory to virtual address %#lx\n",
+-				NE3210_STOP_PG/4, dev->mem_start);
+ 	}
++	
++	if (!request_mem_region (phys_mem, NE3210_STOP_PG*0x100, dev->name)) {
++		printk ("ne3210.c: Unable to request shared memory at physical address %#lx\n",
++			phys_mem);
++		goto out3;
++	}
++	
++	printk("%dkB memory at physical address %#lx\n",
++	       NE3210_STOP_PG/4, phys_mem);
+ 
++	dev->mem_start = (unsigned long)ioremap(phys_mem, NE3210_STOP_PG*0x100);
++	if (dev->mem_start == 0) {
++		printk(KERN_ERR "ne3210.c: Unable to remap card memory !!\n");
++		printk(KERN_ERR "ne3210.c: Driver NOT installed.\n");
++		retval = -EAGAIN;
++		goto out4;
++	}
++	printk("ne3210.c: remapped %dkB card memory to virtual address %#lx\n",
++	       NE3210_STOP_PG/4, dev->mem_start);
+ 	dev->mem_end = ei_status.rmem_end = dev->mem_start
+ 		+ (NE3210_STOP_PG - NE3210_START_PG)*256;
+ 	ei_status.rmem_start = dev->mem_start + TX_PAGES*256;
+@@ -247,6 +199,7 @@ static int __init ne3210_probe1(struct n
+ 	ei_status.rx_start_page = NE3210_START_PG + TX_PAGES;
+ 	ei_status.stop_page = NE3210_STOP_PG;
+ 	ei_status.word16 = 1;
++	ei_status.priv = phys_mem;
+ 
+ 	if (ei_debug > 0)
+ 		printk(version);
+@@ -258,18 +211,46 @@ static int __init ne3210_probe1(struct n
+ 
+ 	dev->open = &ne3210_open;
+ 	dev->stop = &ne3210_close;
++	dev->if_port = ifmap_val[port_index];
++
++	if ((retval = register_netdev (dev)))
++		goto out5;
++		
+ 	NS8390_init(dev, 0);
+ 	return 0;
+-out2:
+-	free_irq(dev->irq, dev);	
+-out1:
+-	kfree(dev->priv);
+-	dev->priv = NULL;
+-out:
+-	release_region(ioaddr, NE3210_IO_EXTENT);
++
++ out5:
++	iounmap((void *)dev->mem_start);
++ out4:
++	release_mem_region (phys_mem, NE3210_STOP_PG*0x100);
++ out3:
++	free_irq (dev->irq, dev);
++ out2:
++	release_region (ioaddr + NE3210_CFG1, NE3210_CFG_EXTENT);
++ out1:
++	release_region (ioaddr, NE3210_IO_EXTENT);
++ out:
++	free_netdev (dev);
++	
+ 	return retval;
+ }
+ 
++static int __devexit ne3210_eisa_remove (struct device *device)
++{
++	struct net_device  *dev    = device->driver_data;
++	unsigned long       ioaddr = to_eisa_device (device)->base_addr;
++
++	unregister_netdev (dev);
++	iounmap((void *)dev->mem_start);
++	release_mem_region (ei_status.priv, NE3210_STOP_PG*0x100);
++	free_irq (dev->irq, dev);
++	release_region (ioaddr + NE3210_CFG1, NE3210_CFG_EXTENT);
++	release_region (ioaddr, NE3210_IO_EXTENT);
++	free_netdev (dev);
++
++	return 0;
++}
++
+ /*
+  *	Reset by toggling the "Board Enable" bits (bit 2 and 0).
+  */
+@@ -309,7 +290,7 @@ static void
+ ne3210_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring_page)
+ {
+ 	unsigned long hdr_start = dev->mem_start + ((ring_page - NE3210_START_PG)<<8);
+-	isa_memcpy_fromio(hdr, hdr_start, sizeof(struct e8390_pkt_hdr));
++	memcpy_fromio(hdr, hdr_start, sizeof(struct e8390_pkt_hdr));
+ 	hdr->count = (hdr->count + 3) & ~3;     /* Round up allocation. */
+ }
+ 
+@@ -327,12 +308,12 @@ static void ne3210_block_input(struct ne
+ 	if (xfer_start + count > ei_status.rmem_end) {
+ 		/* Packet wraps over end of ring buffer. */
+ 		int semi_count = ei_status.rmem_end - xfer_start;
+-		isa_memcpy_fromio(skb->data, xfer_start, semi_count);
++		memcpy_fromio(skb->data, xfer_start, semi_count);
+ 		count -= semi_count;
+-		isa_memcpy_fromio(skb->data + semi_count, ei_status.rmem_start, count);
++		memcpy_fromio(skb->data + semi_count, ei_status.rmem_start, count);
+ 	} else {
+ 		/* Packet is in one chunk. */
+-		isa_memcpy_fromio(skb->data, xfer_start, count);
++		memcpy_fromio(skb->data, xfer_start, count);
+ 	}
+ }
+ 
+@@ -342,7 +323,7 @@ static void ne3210_block_output(struct n
+ 	unsigned long shmem = dev->mem_start + ((start_page - NE3210_START_PG)<<8);
+ 
+ 	count = (count + 3) & ~3;     /* Round up to doubleword */
+-	isa_memcpy_toio(shmem, buf, count);
++	memcpy_toio(shmem, buf, count);
+ }
+ 
+ static int ne3210_open(struct net_device *dev)
+@@ -361,7 +342,23 @@ static int ne3210_close(struct net_devic
+ 	return 0;
+ }
+ 
++static struct eisa_device_id ne3210_ids[] = {
++	{ "EGL0101" },
++	{ "NVL1801" },
++	{ "" },
++};
++
++static struct eisa_driver ne3210_eisa_driver = {
++	.id_table = ne3210_ids,
++	.driver   = {
++		.name   = "ne3210",
++		.probe  = ne3210_eisa_probe,
++		.remove = __devexit_p (ne3210_eisa_remove),
++	},
++};
++
+ #ifdef MODULE
++#if 0
+ #define MAX_NE3210_CARDS	4	/* Max number of NE3210 cards per module */
+ static struct net_device dev_ne3210[MAX_NE3210_CARDS];
+ static int io[MAX_NE3210_CARDS];
+@@ -374,50 +371,22 @@ MODULE_PARM(mem, "1-" __MODULE_STRING(MA
+ MODULE_PARM_DESC(io, "I/O base address(es)");
+ MODULE_PARM_DESC(irq, "IRQ number(s)");
+ MODULE_PARM_DESC(mem, "memory base address(es)");
++#endif
++#endif /* MODULE */
++
++
+ MODULE_DESCRIPTION("NE3210 EISA Ethernet driver");
+ MODULE_LICENSE("GPL");
+ 
+-int init_module(void)
++int ne3210_init(void)
+ {
+-	int this_dev, found = 0;
+-
+-	for (this_dev = 0; this_dev < MAX_NE3210_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_ne3210[this_dev];
+-		dev->irq = irq[this_dev];
+-		dev->base_addr = io[this_dev];
+-		dev->mem_start = mem[this_dev];
+-		dev->init = ne3210_probe;
+-		/* Default is to only install one card. */
+-		if (io[this_dev] == 0 && this_dev != 0) break;
+-		if (register_netdev(dev) != 0) {
+-			printk(KERN_WARNING "ne3210.c: No NE3210 card found (i/o = 0x%x).\n", io[this_dev]);
+-			if (found != 0) {	/* Got at least one. */
+-				return 0;
+-			}
+-			return -ENXIO;
+-		}
+-		found++;
+-	}
+-	return 0;
++	return eisa_driver_register (&ne3210_eisa_driver);
+ }
+ 
+-void cleanup_module(void)
++void ne3210_cleanup(void)
+ {
+-	int this_dev;
+-
+-	for (this_dev = 0; this_dev < MAX_NE3210_CARDS; this_dev++) {
+-		struct net_device *dev = &dev_ne3210[this_dev];
+-		if (dev->priv != NULL) {
+-			free_irq(dev->irq, dev);
+-			release_region(dev->base_addr, NE3210_IO_EXTENT);
+-			if (ei_status.reg0)
+-				iounmap((void *)dev->mem_start);
+-			unregister_netdev(dev);
+-			kfree(dev->priv);
+-			dev->priv = NULL;
+-		}
+-	}
++	eisa_driver_unregister (&ne3210_eisa_driver);
+ }
+ 
+-#endif /* MODULE */
+-
++module_init (ne3210_init);
++module_exit (ne3210_cleanup);
+--- linux-2.6.0-test6/drivers/net/sk_mca.c	2003-09-08 13:58:57.000000000 -0700
++++ 25/drivers/net/sk_mca.c	2003-10-05 00:33:24.000000000 -0700
+@@ -89,7 +89,7 @@ History:
+ #include <linux/interrupt.h>
+ #include <linux/delay.h>
+ #include <linux/time.h>
+-#include <linux/mca.h>
++#include <linux/mca-legacy.h>
+ #include <linux/init.h>
+ #include <linux/module.h>
+ #include <linux/version.h>
+--- linux-2.6.0-test6/drivers/net/slip.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/slip.c	2003-10-05 00:36:15.000000000 -0700
+@@ -1307,7 +1307,7 @@ static int sl_ioctl(struct net_device *d
+ 		/* Resolve race condition, when ioctl'ing hanged up 
+ 		   and opened by another process device.
+ 		 */
+-		if (sl->tty != current->tty && sl->pid != current->pid) {
++		if (sl->tty != process_tty(current) && sl->pid != current->pid) {
+ 			spin_unlock_bh(&sl->lock);
+ 			return -EPERM;
+ 		}
+--- linux-2.6.0-test6/drivers/net/Space.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/Space.c	2003-10-05 00:33:24.000000000 -0700
+@@ -67,7 +67,6 @@ extern int elplus_probe(struct net_devic
+ extern int ac3200_probe(struct net_device *);
+ extern int es_probe(struct net_device *);
+ extern int lne390_probe(struct net_device *);
+-extern int ne3210_probe(struct net_device *);
+ extern int e2100_probe(struct net_device *);
+ extern int ni5010_probe(struct net_device *);
+ extern int ni52_probe(struct net_device *);
+@@ -155,9 +154,6 @@ static struct devprobe eisa_probes[] __i
+ #ifdef CONFIG_LNE390
+ 	{lne390_probe, 0},
+ #endif
+-#ifdef CONFIG_NE3210
+-	{ne3210_probe, 0},
+-#endif
+ 	{NULL, 0},
+ };
+ 
+@@ -480,3 +476,5 @@ void __init probe_old_netdevs(void)
+ struct net_device *dev_base;
+ rwlock_t dev_base_lock = RW_LOCK_UNLOCKED;
+ 
++EXPORT_SYMBOL(dev_base);
++EXPORT_SYMBOL(dev_base_lock);
+--- linux-2.6.0-test6/drivers/net/tlan.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/tlan.c	2003-10-05 00:33:48.000000000 -0700
+@@ -297,6 +297,7 @@ static int	TLan_ioctl( struct net_device
+ static int      TLan_probe1( struct pci_dev *pdev, long ioaddr, int irq, int rev, const struct pci_device_id *ent);
+ static void	TLan_tx_timeout( struct net_device *dev);
+ static int 	tlan_init_one( struct pci_dev *pdev, const struct pci_device_id *ent);
++static void	TLan_Poll(struct net_device *dev);
+ 
+ static u32	TLan_HandleInvalid( struct net_device *, u16 );
+ static u32	TLan_HandleTxEOF( struct net_device *, u16 );
+@@ -453,6 +454,25 @@ static void __devexit tlan_remove_one( s
+ 	pci_set_drvdata( pdev, NULL );
+ } 
+ 
++#ifdef CONFIG_NET_POLL_CONTROLLER
++
++/*
++ * Polling 'interrupt' - used by things like netconsole to send skbs
++ * without having to re-enable interrupts. It's not called while
++ * the interrupt routine is executing.
++ */
++
++static void TLan_Poll (struct net_device *dev)
++{
++       disable_irq(dev->irq);
++       TLan_HandleInterrupt(dev->irq, dev, NULL);
++       enable_irq(dev->irq);
++}
++
++#endif
++
++
++
+ static struct pci_driver tlan_driver = {
+ 	.name		= "tlan",
+ 	.id_table	= tlan_pci_tbl,
+@@ -895,6 +915,9 @@ static int TLan_Init( struct net_device 
+ 	dev->do_ioctl = &TLan_ioctl;
+ 	dev->tx_timeout = &TLan_tx_timeout;
+ 	dev->watchdog_timeo = TX_TIMEOUT;
++#ifdef CONFIG_NET_POLL_CONTROLLER
++	dev->poll_controller = &TLan_Poll;
++#endif
+ 
+ 	return 0;
+ 
+--- linux-2.6.0-test6/drivers/net/tokenring/madgemc.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/tokenring/madgemc.c	2003-10-05 00:33:24.000000000 -0700
+@@ -20,7 +20,7 @@
+ static const char version[] = "madgemc.c: v0.91 23/01/2000 by Adam Fritzler\n";
+ 
+ #include <linux/module.h>
+-#include <linux/mca.h>
++#include <linux/mca-legacy.h>
+ #include <linux/kernel.h>
+ #include <linux/errno.h>
+ #include <linux/pci.h>
+--- linux-2.6.0-test6/drivers/net/tokenring/smctr.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/tokenring/smctr.c	2003-10-05 00:33:24.000000000 -0700
+@@ -43,7 +43,7 @@
+ #include <linux/errno.h>
+ #include <linux/init.h>
+ #include <linux/pci.h>
+-#include <linux/mca.h>
++#include <linux/mca-legacy.h>
+ #include <linux/delay.h>
+ #include <linux/netdevice.h>
+ #include <linux/etherdevice.h>
+--- linux-2.6.0-test6/drivers/net/tulip/interrupt.c	2003-06-14 12:18:04.000000000 -0700
++++ 25/drivers/net/tulip/interrupt.c	2003-10-05 00:36:07.000000000 -0700
+@@ -19,13 +19,13 @@
+ #include <linux/etherdevice.h>
+ #include <linux/pci.h>
+ 
+-
+ int tulip_rx_copybreak;
+ unsigned int tulip_max_interrupt_work;
+ 
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-
++#ifdef CONFIG_TULIP_NAPI_HW_MITIGATION
+ #define MIT_SIZE 15
++#define MIT_TABLE 15 /* We use 0 or max */
++
+ unsigned int mit_table[MIT_SIZE+1] =
+ {
+         /*  CRS11 21143 hardware Mitigation Control Interrupt
+@@ -99,16 +99,28 @@ int tulip_refill_rx(struct net_device *d
+ 	return refilled;
+ }
+ 
++#ifdef CONFIG_TULIP_NAPI
+ 
+-static int tulip_rx(struct net_device *dev)
++void oom_timer(unsigned long data)
++{
++        struct net_device *dev = (struct net_device *)data;
++	netif_rx_schedule(dev);
++}
++
++int tulip_poll(struct net_device *dev, int *budget)
+ {
+ 	struct tulip_private *tp = (struct tulip_private *)dev->priv;
+ 	int entry = tp->cur_rx % RX_RING_SIZE;
+-	int rx_work_limit = tp->dirty_rx + RX_RING_SIZE - tp->cur_rx;
++	int rx_work_limit = *budget;
+ 	int received = 0;
+ 
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-        int drop = 0, mit_sel = 0;
++	if (!netif_running(dev))
++		goto done;
++
++	if (rx_work_limit > dev->quota)
++		rx_work_limit = dev->quota;
++
++#ifdef CONFIG_TULIP_NAPI_HW_MITIGATION
+ 
+ /* that one buffer is needed for mit activation; or might be a
+    bug in the ring buffer code; check later -- JHS*/
+@@ -119,6 +131,237 @@ static int tulip_rx(struct net_device *d
+ 	if (tulip_debug > 4)
+ 		printk(KERN_DEBUG " In tulip_rx(), entry %d %8.8x.\n", entry,
+ 			   tp->rx_ring[entry].status);
++
++       do {
++               /* Acknowledge current RX interrupt sources. */
++               outl((RxIntr | RxNoBuf), dev->base_addr + CSR5);
++
++
++               /* If we own the next entry, it is a new packet. Send it up. */
++               while ( ! (tp->rx_ring[entry].status & cpu_to_le32(DescOwned))) {
++                       s32 status = le32_to_cpu(tp->rx_ring[entry].status);
++
++
++                       if (tp->dirty_rx + RX_RING_SIZE == tp->cur_rx)
++                               break;
++
++                       if (tulip_debug > 5)
++                               printk(KERN_DEBUG "%s: In tulip_rx(), entry %d %8.8x.\n",
++                                      dev->name, entry, status);
++                       if (--rx_work_limit < 0)
++                               goto not_done;
++
++                       if ((status & 0x38008300) != 0x0300) {
++                               if ((status & 0x38000300) != 0x0300) {
++                                /* Ingore earlier buffers. */
++                                       if ((status & 0xffff) != 0x7fff) {
++                                               if (tulip_debug > 1)
++                                                       printk(KERN_WARNING "%s: Oversized Ethernet frame "
++                                                              "spanned multiple buffers, status %8.8x!\n",
++                                                              dev->name, status);
++                                               tp->stats.rx_length_errors++;
++                                       }
++                               } else if (status & RxDescFatalErr) {
++                                /* There was a fatal error. */
++                                       if (tulip_debug > 2)
++                                               printk(KERN_DEBUG "%s: Receive error, Rx status %8.8x.\n",
++                                                      dev->name, status);
++                                       tp->stats.rx_errors++; /* end of a packet.*/
++                                       if (status & 0x0890) tp->stats.rx_length_errors++;
++                                       if (status & 0x0004) tp->stats.rx_frame_errors++;
++                                       if (status & 0x0002) tp->stats.rx_crc_errors++;
++                                       if (status & 0x0001) tp->stats.rx_fifo_errors++;
++                               }
++                       } else {
++                               /* Omit the four octet CRC from the length. */
++                               short pkt_len = ((status >> 16) & 0x7ff) - 4;
++                               struct sk_buff *skb;
++
++#ifndef final_version
++                               if (pkt_len > 1518) {
++                                       printk(KERN_WARNING "%s: Bogus packet size of %d (%#x).\n",
++                                              dev->name, pkt_len, pkt_len);
++                                       pkt_len = 1518;
++                                       tp->stats.rx_length_errors++;
++                               }
++#endif
++                               /* Check if the packet is long enough to accept without copying
++                                  to a minimally-sized skbuff. */
++                               if (pkt_len < tulip_rx_copybreak
++                                   && (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
++                                       skb->dev = dev;
++                                       skb_reserve(skb, 2);    /* 16 byte align the IP header */
++                                       pci_dma_sync_single(tp->pdev,
++                                                           tp->rx_buffers[entry].mapping,
++                                                           pkt_len, PCI_DMA_FROMDEVICE);
++#if ! defined(__alpha__)
++                                       eth_copy_and_sum(skb, tp->rx_buffers[entry].skb->tail,
++                                                        pkt_len, 0);
++                                       skb_put(skb, pkt_len);
++#else
++                                       memcpy(skb_put(skb, pkt_len),
++                                              tp->rx_buffers[entry].skb->tail,
++                                              pkt_len);
++#endif
++                               } else {        /* Pass up the skb already on the Rx ring. */
++                                       char *temp = skb_put(skb = tp->rx_buffers[entry].skb,
++                                                            pkt_len);
++
++#ifndef final_version
++                                       if (tp->rx_buffers[entry].mapping !=
++                                           le32_to_cpu(tp->rx_ring[entry].buffer1)) {
++                                               printk(KERN_ERR "%s: Internal fault: The skbuff addresses "
++                                                      "do not match in tulip_rx: %08x vs. %08x %p / %p.\n",
++                                                      dev->name,
++                                                      le32_to_cpu(tp->rx_ring[entry].buffer1),
++                                                      tp->rx_buffers[entry].mapping,
++                                                      skb->head, temp);
++                                       }
++#endif
++
++                                       pci_unmap_single(tp->pdev, tp->rx_buffers[entry].mapping,
++                                                        PKT_BUF_SZ, PCI_DMA_FROMDEVICE);
++
++                                       tp->rx_buffers[entry].skb = NULL;
++                                       tp->rx_buffers[entry].mapping = 0;
++                               }
++                               skb->protocol = eth_type_trans(skb, dev);
++
++                               netif_receive_skb(skb);
++
++                               dev->last_rx = jiffies;
++                               tp->stats.rx_packets++;
++                               tp->stats.rx_bytes += pkt_len;
++                       }
++                       received++;
++
++                       entry = (++tp->cur_rx) % RX_RING_SIZE;
++                       if (tp->cur_rx - tp->dirty_rx > RX_RING_SIZE/4)
++                               tulip_refill_rx(dev);
++
++                }
++
++               /* New ack strategy... irq does not ack Rx any longer
++                  hopefully this helps */
++
++               /* Really bad things can happen here... If new packet arrives
++                * and an irq arrives (tx or just due to occasionally unset
++                * mask), it will be acked by irq handler, but new thread
++                * is not scheduled. It is major hole in design.
++                * No idea how to fix this if "playing with fire" will fail
++                * tomorrow (night 011029). If it will not fail, we won
++                * finally: amount of IO did not increase at all. */
++       } while ((inl(dev->base_addr + CSR5) & RxIntr));
++
++done:
++
++ #ifdef CONFIG_TULIP_NAPI_HW_MITIGATION
++
++          /* We use this simplistic scheme for IM. It's proven by
++             real life installations. We can have IM enabled
++            continuesly but this would cause unnecessary latency.
++            Unfortunely we can't use all the NET_RX_* feedback here.
++            This would turn on IM for devices that is not contributing
++            to backlog congestion with unnecessary latency.
++
++             We monitor the the device RX-ring and have:
++
++             HW Interrupt Mitigation either ON or OFF.
++
++            ON:  More then 1 pkt received (per intr.) OR we are dropping
++             OFF: Only 1 pkt received
++
++             Note. We only use min and max (0, 15) settings from mit_table */
++
++
++          if( tp->flags &  HAS_INTR_MITIGATION) {
++                 if( received > 1 ) {
++                         if( ! tp->mit_on ) {
++                                 tp->mit_on = 1;
++                                 outl(mit_table[MIT_TABLE], dev->base_addr + CSR11);
++                         }
++                  }
++                 else {
++                         if( tp->mit_on ) {
++                                 tp->mit_on = 0;
++                                 outl(0, dev->base_addr + CSR11);
++                         }
++                  }
++          }
++
++#endif /* CONFIG_TULIP_NAPI_HW_MITIGATION */
++
++         dev->quota -= received;
++         *budget -= received;
++
++         tulip_refill_rx(dev);
++
++         /* If RX ring is not full we are out of memory. */
++         if (tp->rx_buffers[tp->dirty_rx % RX_RING_SIZE].skb == NULL) goto oom;
++
++         /* Remove us from polling list and enable RX intr. */
++
++         netif_rx_complete(dev);
++         outl(tulip_tbl[tp->chip_id].valid_intrs, dev->base_addr+CSR7);
++
++         /* The last op happens after poll completion. Which means the following:
++          * 1. it can race with disabling irqs in irq handler
++          * 2. it can race with dise/enabling irqs in other poll threads
++          * 3. if an irq raised after beginning loop, it will be immediately
++          *    triggered here.
++          *
++          * Summarizing: the logic results in some redundant irqs both
++          * due to races in masking and due to too late acking of already
++          * processed irqs. But it must not result in losing events.
++          */
++
++         return 0;
++
++ not_done:
++         if (!received) {
++
++                 received = dev->quota; /* Not to happen */
++         }
++         dev->quota -= received;
++         *budget -= received;
++
++         if (tp->cur_rx - tp->dirty_rx > RX_RING_SIZE/2 ||
++             tp->rx_buffers[tp->dirty_rx % RX_RING_SIZE].skb == NULL)
++                 tulip_refill_rx(dev);
++
++         if (tp->rx_buffers[tp->dirty_rx % RX_RING_SIZE].skb == NULL) goto oom;
++
++         return 1;
++
++
++ oom:    /* Executed with RX ints disabled */
++
++
++         /* Start timer, stop polling, but do not enable rx interrupts. */
++         mod_timer(&tp->oom_timer, jiffies+1);
++
++         /* Think: timer_pending() was an explicit signature of bug.
++          * Timer can be pending now but fired and completed
++          * before we did netif_rx_complete(). See? We would lose it. */
++
++         /* remove ourselves from the polling list */
++         netif_rx_complete(dev);
++
++         return 0;
++}
++
++#else /* CONFIG_TULIP_NAPI */
++
++static int tulip_rx(struct net_device *dev)
++{
++	struct tulip_private *tp = (struct tulip_private *)dev->priv;
++	int entry = tp->cur_rx % RX_RING_SIZE;
++	int rx_work_limit = tp->dirty_rx + RX_RING_SIZE - tp->cur_rx;
++	int received = 0;
++
++	if (tulip_debug > 4)
++		printk(KERN_DEBUG " In tulip_rx(), entry %d %8.8x.\n", entry,
++			   tp->rx_ring[entry].status);
+ 	/* If we own the next entry, it is a new packet. Send it up. */
+ 	while ( ! (tp->rx_ring[entry].status & cpu_to_le32(DescOwned))) {
+ 		s32 status = le32_to_cpu(tp->rx_ring[entry].status);
+@@ -163,11 +406,6 @@ static int tulip_rx(struct net_device *d
+ 			}
+ #endif
+ 
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-                        drop = atomic_read(&netdev_dropping);
+-                        if (drop)
+-                                goto throttle;
+-#endif
+ 			/* Check if the packet is long enough to accept without copying
+ 			   to a minimally-sized skbuff. */
+ 			if (pkt_len < tulip_rx_copybreak
+@@ -209,44 +447,9 @@ static int tulip_rx(struct net_device *d
+ 				tp->rx_buffers[entry].mapping = 0;
+ 			}
+ 			skb->protocol = eth_type_trans(skb, dev);
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-                        mit_sel =
+-#endif
+-			netif_rx(skb);
+ 
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-                        switch (mit_sel) {
+-                        case NET_RX_SUCCESS:
+-                        case NET_RX_CN_LOW:
+-                        case NET_RX_CN_MOD:
+-                                break;
+-
+-                        case NET_RX_CN_HIGH:
+-                                rx_work_limit -= NET_RX_CN_HIGH; /* additional*/
+-                                break;
+-                        case NET_RX_DROP:
+-                                rx_work_limit = -1;
+-                                break;
+-                        default:
+-                                printk("unknown feedback return code %d\n", mit_sel);
+-                                break;
+-                        }
++			netif_rx(skb);
+ 
+-                        drop = atomic_read(&netdev_dropping);
+-                        if (drop) {
+-throttle:
+-                                rx_work_limit = -1;
+-                                mit_sel = NET_RX_DROP;
+-
+-                                if (tp->fc_bit) {
+-                                        long ioaddr = dev->base_addr;
+-
+-                                        /* disable Rx & RxNoBuf ints. */
+-                                        outl(tulip_tbl[tp->chip_id].valid_intrs&RX_A_NBF_STOP, ioaddr + CSR7);
+-                                        set_bit(tp->fc_bit, &netdev_fc_xoff);
+-                                }
+-                        }
+-#endif
+ 			dev->last_rx = jiffies;
+ 			tp->stats.rx_packets++;
+ 			tp->stats.rx_bytes += pkt_len;
+@@ -254,42 +457,9 @@ throttle:
+ 		received++;
+ 		entry = (++tp->cur_rx) % RX_RING_SIZE;
+ 	}
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-
+-        /* We use this simplistic scheme for IM. It's proven by
+-           real life installations. We can have IM enabled
+-           continuesly but this would cause unnecessary latency.
+-           Unfortunely we can't use all the NET_RX_* feedback here.
+-           This would turn on IM for devices that is not contributing
+-           to backlog congestion with unnecessary latency.
+-
+-           We monitor the device RX-ring and have:
+-
+-           HW Interrupt Mitigation either ON or OFF.
+-
+-           ON:  More then 1 pkt received (per intr.) OR we are dropping
+-           OFF: Only 1 pkt received
+-
+-           Note. We only use min and max (0, 15) settings from mit_table */
+-
+-
+-        if( tp->flags &  HAS_INTR_MITIGATION) {
+-                if((received > 1 || mit_sel == NET_RX_DROP)
+-                   && tp->mit_sel != 15 ) {
+-                        tp->mit_sel = 15;
+-                        tp->mit_change = 1; /* Force IM change */
+-                }
+-                if((received <= 1 && mit_sel != NET_RX_DROP) && tp->mit_sel != 0 ) {
+-                        tp->mit_sel = 0;
+-                        tp->mit_change = 1; /* Force IM change */
+-                }
+-        }
+-
+-        return RX_RING_SIZE+1; /* maxrx+1 */
+-#else
+ 	return received;
+-#endif
+ }
++#endif  /* CONFIG_TULIP_NAPI */
+ 
+ static inline unsigned int phy_interrupt (struct net_device *dev)
+ {
+@@ -323,7 +493,6 @@ irqreturn_t tulip_interrupt(int irq, voi
+ 	struct tulip_private *tp = (struct tulip_private *)dev->priv;
+ 	long ioaddr = dev->base_addr;
+ 	int csr5;
+-	int entry;
+ 	int missed;
+ 	int rx = 0;
+ 	int tx = 0;
+@@ -331,6 +500,11 @@ irqreturn_t tulip_interrupt(int irq, voi
+ 	int maxrx = RX_RING_SIZE;
+ 	int maxtx = TX_RING_SIZE;
+ 	int maxoi = TX_RING_SIZE;
++#ifdef CONFIG_TULIP_NAPI
++	int rxd = 0;
++#else
++	int entry;
++#endif
+ 	unsigned int work_count = tulip_max_interrupt_work;
+ 	unsigned int handled = 0;
+ 
+@@ -346,22 +520,41 @@ irqreturn_t tulip_interrupt(int irq, voi
+ 	tp->nir++;
+ 
+ 	do {
++
++#ifdef CONFIG_TULIP_NAPI
++
++		if (!rxd && (csr5 & (RxIntr | RxNoBuf))) {
++			rxd++;
++			/* Mask RX intrs and add the device to poll list. */
++			outl(tulip_tbl[tp->chip_id].valid_intrs&~RxPollInt, ioaddr + CSR7);
++			netif_rx_schedule(dev);
++
++			if (!(csr5&~(AbnormalIntr|NormalIntr|RxPollInt|TPLnkPass)))
++                               break;
++		}
++
++               /* Acknowledge the interrupt sources we handle here ASAP
++                  the poll function does Rx and RxNoBuf acking */
++
++		outl(csr5 & 0x0001ff3f, ioaddr + CSR5);
++
++#else
+ 		/* Acknowledge all of the current interrupt sources ASAP. */
+ 		outl(csr5 & 0x0001ffff, ioaddr + CSR5);
+ 
+-		if (tulip_debug > 4)
+-			printk(KERN_DEBUG "%s: interrupt  csr5=%#8.8x new csr5=%#8.8x.\n",
+-				   dev->name, csr5, inl(dev->base_addr + CSR5));
+ 
+ 		if (csr5 & (RxIntr | RxNoBuf)) {
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-                        if ((!tp->fc_bit) ||
+-			    (!test_bit(tp->fc_bit, &netdev_fc_xoff)))
+-#endif
+ 				rx += tulip_rx(dev);
+ 			tulip_refill_rx(dev);
+ 		}
+ 
++#endif /*  CONFIG_TULIP_NAPI */
++
++		if (tulip_debug > 4)
++			printk(KERN_DEBUG "%s: interrupt  csr5=%#8.8x new csr5=%#8.8x.\n",
++			       dev->name, csr5, inl(dev->base_addr + CSR5));
++
++
+ 		if (csr5 & (TxNoBuf | TxDied | TxIntr | TimerInt)) {
+ 			unsigned int dirty_tx;
+ 
+@@ -462,15 +655,8 @@ irqreturn_t tulip_interrupt(int irq, voi
+ 			}
+ 			if (csr5 & RxDied) {		/* Missed a Rx frame. */
+                                 tp->stats.rx_missed_errors += inl(ioaddr + CSR8) & 0xffff;
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-				if (tp->fc_bit && !test_bit(tp->fc_bit, &netdev_fc_xoff)) {
+-					tp->stats.rx_errors++;
+-					tulip_start_rxtx(tp);
+-				}
+-#else
+ 				tp->stats.rx_errors++;
+ 				tulip_start_rxtx(tp);
+-#endif
+ 			}
+ 			/*
+ 			 * NB: t21142_lnk_change() does a del_timer_sync(), so be careful if this
+@@ -504,10 +690,6 @@ irqreturn_t tulip_interrupt(int irq, voi
+ 			if (tulip_debug > 2)
+ 				printk(KERN_ERR "%s: Re-enabling interrupts, %8.8x.\n",
+ 					   dev->name, csr5);
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-                        if (tp->fc_bit && (test_bit(tp->fc_bit, &netdev_fc_xoff)))
+-                          if (net_ratelimit()) printk("BUG!! enabling interrupt when FC off (timerintr.) \n");
+-#endif
+ 			outl(tulip_tbl[tp->chip_id].valid_intrs, ioaddr + CSR7);
+ 			tp->ttimer = 0;
+ 			oi++;
+@@ -520,16 +702,9 @@ irqreturn_t tulip_interrupt(int irq, voi
+                        /* Acknowledge all interrupt sources. */
+                         outl(0x8001ffff, ioaddr + CSR5);
+                         if (tp->flags & HAS_INTR_MITIGATION) {
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-                                if(tp->mit_change) {
+-                                        outl(mit_table[tp->mit_sel], ioaddr + CSR11);
+-                                        tp->mit_change = 0;
+-                                }
+-#else
+                      /* Josip Loncaric at ICASE did extensive experimentation
+ 			to develop a good interrupt mitigation setting.*/
+                                 outl(0x8b240000, ioaddr + CSR11);
+-#endif
+                         } else if (tp->chip_id == LC82C168) {
+ 				/* the LC82C168 doesn't have a hw timer.*/
+ 				outl(0x00, ioaddr + CSR7);
+@@ -537,10 +712,8 @@ irqreturn_t tulip_interrupt(int irq, voi
+ 			} else {
+                           /* Mask all interrupting sources, set timer to
+ 				re-enable. */
+-#ifndef CONFIG_NET_HW_FLOWCONTROL
+                                 outl(((~csr5) & 0x0001ebef) | AbnormalIntr | TimerInt, ioaddr + CSR7);
+                                 outl(0x0012, ioaddr + CSR11);
+-#endif
+                         }
+ 			break;
+ 		}
+@@ -550,6 +723,21 @@ irqreturn_t tulip_interrupt(int irq, voi
+ 			break;
+ 
+ 		csr5 = inl(ioaddr + CSR5);
++
++#ifdef CONFIG_TULIP_NAPI
++		if (rxd)
++			csr5 &= ~RxPollInt;
++	} while ((csr5 & (TxNoBuf |
++			  TxDied |
++			  TxIntr |
++			  TimerInt |
++			  /* Abnormal intr. */
++			  RxDied |
++			  TxFIFOUnderflow |
++			  TxJabber |
++			  TPLnkFail |
++			  SytemError )) != 0);
++#else
+ 	} while ((csr5 & (NormalIntr|AbnormalIntr)) != 0);
+ 
+ 	tulip_refill_rx(dev);
+@@ -574,6 +762,7 @@ irqreturn_t tulip_interrupt(int irq, voi
+ 			}
+ 		}
+ 	}
++#endif /* CONFIG_TULIP_NAPI */
+ 
+ 	if ((missed = inl(ioaddr + CSR8) & 0x1ffff)) {
+ 		tp->stats.rx_dropped += missed & 0x10000 ? 0x10000 : missed;
+--- linux-2.6.0-test6/drivers/net/tulip/Kconfig	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/tulip/Kconfig	2003-10-05 00:34:49.000000000 -0700
+@@ -68,6 +68,26 @@ config TULIP_MMIO
+ 	  obscure bugs if your mainboard has memory controller timing issues.
+ 	  If in doubt, say N.
+ 
++config TULIP_NAPI
++	bool "Use NAPI RX polling "
++	depends on TULIP
++	---help---
++	  This is of useful for servers and routers dealing with high network loads.
++
++	  See <file:Documentation/networking/NAPI_HOWTO.txt>.
++
++	  If in doubt, say N.
++
++config TULIP_NAPI_HW_MITIGATION
++	bool "Use Interrupt Mitigation "
++	depends on TULIP_NAPI
++	---help---
++	  Use HW to reduce RX interrupts. Not strict necessary since NAPI reduces
++	  RX interrupts but itself. Although this reduces RX interrupts even at
++	  low levels traffic at the cost of a small latency.
++
++	  If in doubt, say Y.
++
+ config DE4X5
+ 	tristate "Generic DECchip & DIGITAL EtherWORKS PCI/EISA"
+ 	depends on NET_TULIP && (PCI || EISA)
+--- linux-2.6.0-test6/drivers/net/tulip/tulip_core.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/net/tulip/tulip_core.c	2003-10-05 00:34:49.000000000 -0700
+@@ -14,11 +14,17 @@
+ 
+ */
+ 
++#include <linux/config.h>
++
+ #define DRV_NAME	"tulip"
++#ifdef CONFIG_TULIP_NAPI
++#define DRV_VERSION    "1.1.13-NAPI" /* Keep at least for test */
++#else
+ #define DRV_VERSION	"1.1.13"
++#endif
+ #define DRV_RELDATE	"May 11, 2002"
+ 
+-#include <linux/config.h>
++
+ #include <linux/module.h>
+ #include "tulip.h"
+ #include <linux/pci.h>
+@@ -246,6 +252,7 @@ static void tulip_down(struct net_device
+ static struct net_device_stats *tulip_get_stats(struct net_device *dev);
+ static int private_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
+ static void set_rx_mode(struct net_device *dev);
++static void poll_tulip(struct net_device *dev);
+ 
+ 
+ 
+@@ -465,29 +472,16 @@ media_picked:
+ 	   to an alternate media type. */
+ 	tp->timer.expires = RUN_AT(next_tick);
+ 	add_timer(&tp->timer);
+-}
+-
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-/* Enable receiver */
+-void tulip_xon(struct net_device *dev)
+-{
+-        struct tulip_private *tp = (struct tulip_private *)dev->priv;
+-
+-        clear_bit(tp->fc_bit, &netdev_fc_xoff);
+-        if (netif_running(dev)){
+-
+-                tulip_refill_rx(dev);
+-                outl(tulip_tbl[tp->chip_id].valid_intrs,  dev->base_addr+CSR7);
+-        }
+-}
++#ifdef CONFIG_TULIP_NAPI
++	init_timer(&tp->oom_timer);
++        tp->oom_timer.data = (unsigned long)dev;
++        tp->oom_timer.function = oom_timer;
+ #endif
++}
+ 
+ static int
+ tulip_open(struct net_device *dev)
+ {
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-        struct tulip_private *tp = (struct tulip_private *)dev->priv;
+-#endif
+ 	int retval;
+ 
+ 	if ((retval = request_irq(dev->irq, &tulip_interrupt, SA_SHIRQ, dev->name, dev)))
+@@ -497,10 +491,6 @@ tulip_open(struct net_device *dev)
+ 
+ 	tulip_up (dev);
+ 
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-        tp->fc_bit = netdev_register_fc(dev, tulip_xon);
+-#endif
+-
+ 	netif_start_queue (dev);
+ 
+ 	return 0;
+@@ -581,10 +571,7 @@ static void tulip_tx_timeout(struct net_
+ #endif
+ 
+ 	/* Stop and restart the chip's Tx processes . */
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-        if (tp->fc_bit && test_bit(tp->fc_bit,&netdev_fc_xoff))
+-                printk("BUG tx_timeout restarting rx when fc on\n");
+-#endif
++
+ 	tulip_restart_rxtx(tp);
+ 	/* Trigger an immediate transmit demand. */
+ 	outl(0, ioaddr + CSR1);
+@@ -741,7 +728,9 @@ static void tulip_down (struct net_devic
+ 	unsigned long flags;
+ 
+ 	del_timer_sync (&tp->timer);
+-
++#ifdef CONFIG_TULIP_NAPI
++	del_timer_sync (&tp->oom_timer);
++#endif
+ 	spin_lock_irqsave (&tp->lock, flags);
+ 
+ 	/* Disable interrupts by clearing the interrupt mask. */
+@@ -780,13 +769,6 @@ static int tulip_close (struct net_devic
+ 
+ 	netif_stop_queue (dev);
+ 
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-        if (tp->fc_bit) {
+-                int bit = tp->fc_bit;
+-                tp->fc_bit = 0;
+-                netdev_unregister_fc(bit);
+-        }
+-#endif
+ 	tulip_down (dev);
+ 
+ 	if (tulip_debug > 1)
+@@ -1627,10 +1609,17 @@ static int __devinit tulip_init_one (str
+ 	dev->hard_start_xmit = tulip_start_xmit;
+ 	dev->tx_timeout = tulip_tx_timeout;
+ 	dev->watchdog_timeo = TX_TIMEOUT;
++#ifdef CONFIG_TULIP_NAPI
++	dev->poll = tulip_poll;
++	dev->weight = 16;
++#endif
+ 	dev->stop = tulip_close;
+ 	dev->get_stats = tulip_get_stats;
+ 	dev->do_ioctl = private_ioctl;
+ 	dev->set_multicast_list = set_rx_mode;
++#ifdef CONFIG_NET_POLL_CONTROLLER
++	dev->poll_controller = &poll_tulip;
++#endif
+ 
+ 	if (register_netdev(dev))
+ 		goto err_out_free_ring;
+@@ -1788,6 +1777,24 @@ static void __devexit tulip_remove_one (
+ }
+ 
+ 
++#ifdef CONFIG_NET_POLL_CONTROLLER
++
++/*
++ * Polling 'interrupt' - used by things like netconsole to send skbs
++ * without having to re-enable interrupts. It's not called while
++ * the interrupt routine is executing.
++ */
++
++static void poll_tulip (struct net_device *dev)
++{
++       disable_irq(dev->irq);
++       tulip_interrupt (dev->irq, dev, NULL);
++       enable_irq(dev->irq);
++}
++
++#endif
++
++
+ static struct pci_driver tulip_driver = {
+ 	.name		= DRV_NAME,
+ 	.id_table	= tulip_pci_tbl,
+--- linux-2.6.0-test6/drivers/net/tulip/tulip.h	2003-06-14 12:18:34.000000000 -0700
++++ 25/drivers/net/tulip/tulip.h	2003-10-05 00:34:49.000000000 -0700
+@@ -126,6 +126,7 @@ enum pci_cfg_driver_reg {
+ 	CFDD_Snooze = (1 << 30),
+ };
+ 
++#define RxPollInt (RxIntr|RxNoBuf|RxDied|RxJabber)
+ 
+ /* The bits in the CSR5 status registers, mostly interrupt sources. */
+ enum status_bits {
+@@ -251,9 +252,9 @@ enum t21143_csr6_bits {
+    Making the Tx ring too large decreases the effectiveness of channel
+    bonding and packet priority.
+    There are no ill effects from too-large receive rings. */
+-#define TX_RING_SIZE	16
+-#define RX_RING_SIZE	32
+ 
++#define TX_RING_SIZE	32
++#define RX_RING_SIZE	128
+ #define MEDIA_MASK     31
+ 
+ #define PKT_BUF_SZ		1536	/* Size of each temporary Rx buffer. */
+@@ -343,17 +344,15 @@ struct tulip_private {
+ 	int flags;
+ 	struct net_device_stats stats;
+ 	struct timer_list timer;	/* Media selection timer. */
++	struct timer_list oom_timer;    /* Out of memory timer. */
+ 	u32 mc_filter[2];
+ 	spinlock_t lock;
+ 	spinlock_t mii_lock;
+ 	unsigned int cur_rx, cur_tx;	/* The next free ring entry */
+ 	unsigned int dirty_rx, dirty_tx;	/* The ring entries to be free()ed. */
+ 
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-#define RX_A_NBF_STOP 0xffffff3f /* To disable RX and RX-NOBUF ints. */
+-        int fc_bit;
+-        int mit_sel;
+-        int mit_change; /* Signal for Interrupt Mitigtion */
++#ifdef 	CONFIG_TULIP_NAPI_HW_MITIGATION
++        int mit_on;
+ #endif
+ 	unsigned int full_duplex:1;	/* Full-duplex operation requested. */
+ 	unsigned int full_duplex_lock:1;
+@@ -415,6 +414,10 @@ extern unsigned int tulip_max_interrupt_
+ extern int tulip_rx_copybreak;
+ irqreturn_t tulip_interrupt(int irq, void *dev_instance, struct pt_regs *regs);
+ int tulip_refill_rx(struct net_device *dev);
++#ifdef CONFIG_TULIP_NAPI
++int tulip_poll(struct net_device *dev, int *budget);
++#endif
++
+ 
+ /* media.c */
+ int tulip_mdio_read(struct net_device *dev, int phy_id, int location);
+@@ -438,6 +441,7 @@ extern int tulip_debug;
+ extern const char * const medianame[];
+ extern const char tulip_media_cap[];
+ extern struct tulip_chip_table tulip_tbl[];
++void oom_timer(unsigned long data);
+ extern u8 t21040_csr13[];
+ 
+ #ifndef USE_IO_OPS
+--- linux-2.6.0-test6/drivers/net/wan/comx-hw-munich.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/wan/comx-hw-munich.c	2003-10-05 00:33:24.000000000 -0700
+@@ -1849,7 +1849,7 @@ static int MUNICH_open(struct net_device
+     if (board->isx21)
+     {
+ 	init_timer(&board->modemline_timer);
+-	board->modemline_timer.data = (unsigned int)board;
++	board->modemline_timer.data = (unsigned long)board;
+ 	board->modemline_timer.function = pcicom_modemline;
+ 	board->modemline_timer.expires = jiffies + HZ;
+ 	add_timer((struct timer_list *)&board->modemline_timer);
+--- linux-2.6.0-test6/drivers/net/wan/dscc4.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/wan/dscc4.c	2003-10-05 00:36:13.000000000 -0700
+@@ -592,6 +592,7 @@ static inline int dscc4_xpr_ack(struct d
+ 	return (i >= 0 ) ? i : -EAGAIN;
+ }
+ 
++#if 0 /* dscc4_{rx/tx}_reset are both unreliable - more tweak needed */
+ static void dscc4_rx_reset(struct dscc4_dev_priv *dpriv, struct net_device *dev)
+ {
+ 	unsigned long flags;
+@@ -606,6 +607,9 @@ static void dscc4_rx_reset(struct dscc4_
+ 	spin_unlock_irqrestore(&dpriv->pci_priv->lock, flags);
+ }
+ 
++#endif
++
++#if 0
+ static void dscc4_tx_reset(struct dscc4_dev_priv *dpriv, struct net_device *dev)
+ {
+ 	u16 i = 0;
+@@ -625,6 +629,7 @@ static void dscc4_tx_reset(struct dscc4_
+ 	if (dscc4_do_action(dev, "Rdt") < 0)
+ 		printk(KERN_ERR "%s: Tx reset failed\n", dev->name);
+ }
++#endif
+ 
+ /* TODO: (ab)use this function to refill a completely depleted RX ring. */
+ static inline void dscc4_rx_skb(struct dscc4_dev_priv *dpriv,
+@@ -859,7 +864,7 @@ static int dscc4_found1(struct pci_dev *
+ {
+ 	struct dscc4_pci_priv *ppriv;
+ 	struct dscc4_dev_priv *root;
+-	int i = 0;
++	int i, ret = -ENOMEM;
+ 
+ 	root = (struct dscc4_dev_priv *)
+ 		kmalloc(dev_per_card*sizeof(*root), GFP_KERNEL);
+@@ -900,7 +905,8 @@ static int dscc4_found1(struct pci_dev *
+ 		hdlc->xmit = dscc4_start_xmit;
+ 		hdlc->attach = dscc4_hdlc_attach;
+ 
+-	        if (register_hdlc_device(hdlc)) {
++		ret = register_hdlc_device(hdlc);
++		if (ret < 0) {
+ 			printk(KERN_ERR "%s: unable to register\n", DRV_NAME);
+ 			goto err_unregister;
+ 	        }
+@@ -908,17 +914,20 @@ static int dscc4_found1(struct pci_dev *
+ 		dscc4_init_registers(dpriv, d);
+ 		dpriv->parity = PARITY_CRC16_PR0_CCITT;
+ 		dpriv->encoding = ENCODING_NRZ;
+-		if (dscc4_init_ring(d)) {
++
++		ret = dscc4_init_ring(d);
++		if (ret < 0) {
+ 			unregister_hdlc_device(hdlc);
+ 			goto err_unregister;
+ 		}
+ 	}
+-	if (dscc4_set_quartz(root, quartz) < 0)
++	ret = dscc4_set_quartz(root, quartz);
++	if (ret < 0)
+ 		goto err_unregister;
+ 	ppriv->root = root;
+ 	spin_lock_init(&ppriv->lock);
+ 	pci_set_drvdata(pdev, ppriv);
+-	return 0;
++	return ret;
+ 
+ err_unregister:
+ 	while (--i >= 0) {
+@@ -929,7 +938,7 @@ err_unregister:
+ err_free_dev:
+ 	kfree(root);
+ err_out:
+-	return -1;
++	return ret;
+ };
+ 
+ /* FIXME: get rid of the unneeded code */
+@@ -1092,9 +1101,7 @@ done:
+ 
+ err_disable_scc_events:
+ 	scc_writel(0xffffffff, dpriv, dev, IMR);
+-err_free_ring:
+ 	scc_patchl(PowerUp | Vis, 0, dpriv, dev, CCR0);
+-	dscc4_release_ring(dpriv);
+ err_out:
+ 	hdlc_close(hdlc);
+ err:
+@@ -1160,7 +1167,6 @@ static int dscc4_close(struct net_device
+ 	dpriv->flags |= FakeReset;
+ 
+ 	hdlc_close(hdlc);
+-	dscc4_release_ring(dpriv);
+ 
+ 	return 0;
+ }
+@@ -2006,6 +2012,7 @@ static int dscc4_hdlc_attach(hdlc_device
+ 	return 0;
+ }
+ 
++#ifndef MODULE
+ static int __init dscc4_setup(char *str)
+ {
+ 	int *args[] = { &debug, &quartz, NULL }, **p = args;
+@@ -2016,6 +2023,7 @@ static int __init dscc4_setup(char *str)
+ }
+ 
+ __setup("dscc4.setup=", dscc4_setup);
++#endif
+ 
+ static struct pci_device_id dscc4_pci_tbl[] = {
+ 	{ PCI_VENDOR_ID_SIEMENS, PCI_DEVICE_ID_SIEMENS_DSCC4,
+--- linux-2.6.0-test6/drivers/net/wan/sbni.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/wan/sbni.c	2003-10-05 00:33:24.000000000 -0700
+@@ -1300,12 +1300,9 @@ sbni_ioctl( struct net_device  *dev,  st
+   
+ 	switch( cmd ) {
+ 	case  SIOCDEVGETINSTATS :
+-		error = verify_area( VERIFY_WRITE, ifr->ifr_data,
+-				     sizeof(struct sbni_in_stats) );
+-		if( !error )
+-			if (copy_to_user( ifr->ifr_data, &nl->in_stats,
+-				      sizeof(struct sbni_in_stats) ))
+-				return -EFAULT;
++		if (copy_to_user( ifr->ifr_data, &nl->in_stats,
++					sizeof(struct sbni_in_stats) ))
++			error = -EFAULT;
+ 		break;
+ 
+ 	case  SIOCDEVRESINSTATS :
+@@ -1321,11 +1318,8 @@ sbni_ioctl( struct net_device  *dev,  st
+ 		flags.rxl	= nl->cur_rxl_index;
+ 		flags.fixed_rxl	= nl->delta_rxl == 0;
+ 
+-		error = verify_area( VERIFY_WRITE, ifr->ifr_data,
+-				     sizeof flags );
+-		if( !error )
+-			if (copy_to_user( ifr->ifr_data, &flags, sizeof flags ))
+-				return -EFAULT;
++		if (copy_to_user( ifr->ifr_data, &flags, sizeof flags ))
++			error = -EFAULT;
+ 		break;
+ 
+ 	case  SIOCDEVSHWSTATE :
+@@ -1353,10 +1347,6 @@ sbni_ioctl( struct net_device  *dev,  st
+ 		if( current->euid != 0 )	/* root only */
+ 			return  -EPERM;
+ 
+-		if( (error = verify_area( VERIFY_READ, ifr->ifr_data,
+-					  sizeof slave_name )) != 0 )
+-			return  error;
+-
+ 		if (copy_from_user( slave_name, ifr->ifr_data, sizeof slave_name ))
+ 			return -EFAULT;
+ 		slave_dev = dev_get_by_name( slave_name );
+--- linux-2.6.0-test6/drivers/net/wan/syncppp.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/wan/syncppp.c	2003-10-05 00:33:24.000000000 -0700
+@@ -236,7 +236,7 @@ void sppp_input (struct net_device *dev,
+ 		sp->ipkts++;
+ 	}
+ 
+-	if (skb->len <= PPP_HEADER_LEN) {
++	if (!pskb_may_pull(skb, PPP_HEADER_LEN)) {
+ 		/* Too small packet, drop it. */
+ 		if (sp->pp_flags & PP_DEBUG)
+ 			printk (KERN_DEBUG "%s: input packet is too small, %d bytes\n",
+@@ -473,7 +473,7 @@ static void sppp_lcp_input (struct sppp 
+ 	u8 *p, opt[6];
+ 	u32 rmagic;
+ 
+-	if (len < 4) {
++	if (!pskb_may_pull(skb, sizeof(struct lcp_header))) {
+ 		if (sp->pp_flags & PP_DEBUG)
+ 			printk (KERN_WARNING "%s: invalid lcp packet length: %d bytes\n",
+ 				dev->name, len);
+@@ -707,7 +707,9 @@ static void sppp_cisco_input (struct spp
+ 	struct cisco_packet *h;
+ 	struct net_device *dev = sp->pp_if;
+ 
+-	if (skb->len != CISCO_PACKET_LEN && skb->len != CISCO_BIG_PACKET_LEN) {
++	if (!pskb_may_pull(skb, sizeof(struct cisco_packet))
++	    || (skb->len != CISCO_PACKET_LEN
++		&& skb->len != CISCO_BIG_PACKET_LEN)) {
+ 		if (sp->pp_flags & PP_DEBUG)
+ 			printk (KERN_WARNING "%s: invalid cisco packet length: %d bytes\n",
+ 				dev->name,  skb->len);
+@@ -1211,8 +1213,7 @@ static void sppp_ipcp_input (struct sppp
+ 	struct net_device *dev = sp->pp_if;
+ 	int len = skb->len;
+ 
+-	if (len < 4) 
+-	{
++	if (!pskb_may_pull(skb, sizeof(struct lcp_header))) {
+ 		if (sp->pp_flags & PP_DEBUG)
+ 			printk (KERN_WARNING "%s: invalid ipcp packet length: %d bytes\n",
+ 				dev->name,  len);
+--- linux-2.6.0-test6/drivers/net/wireless/arlan-main.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/net/wireless/arlan-main.c	2003-10-05 00:33:24.000000000 -0700
+@@ -5,7 +5,6 @@
+  * This module provides support for the Arlan 655 card made by Aironet
+  */
+ 
+-#include <linux/version.h>
+ #include <linux/config.h>
+ #include "arlan.h"
+ 
+@@ -721,9 +720,9 @@ static int arlan_hw_tx(struct net_device
+ 	else
+ 	{
+ 		netif_stop_queue (dev);
+-		return -1;
+ 		IFDEBUG(ARLAN_DEBUG_TX_CHAIN)
+ 			printk(KERN_ERR "TX TAIL & HEAD full, return, tailStart %d headEnd %d\n", tailStarts, headEnds);
++		return -1;
+ 	}
+ 	priv->out_bytes += length;
+ 	priv->out_bytes10 += length;
+@@ -1881,6 +1880,8 @@ int __init arlan_probe(struct net_device
+ 
+ #ifdef  MODULE
+ 
++static int probe = probeUNKNOWN;
++
+ static int __init arlan_find_devices(void)
+ {
+ 	int m;
+--- linux-2.6.0-test6/drivers/parisc/superio.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/parisc/superio.c	2003-10-05 00:33:24.000000000 -0700
+@@ -530,11 +530,6 @@ static struct pci_driver superio_driver 
+ 
+ static int __init superio_modinit(void)
+ {
+-#ifdef CONFIG_SERIAL_8250
+-	extern int serial8250_init(void);
+-	serial8250_init();
+-#endif
+-
+ 	return pci_module_init(&superio_driver);
+ }
+ 
+@@ -543,5 +538,10 @@ static void __exit superio_exit(void)
+ 	pci_unregister_driver(&superio_driver);
+ }
+ 
+-module_init(superio_modinit);
++/* Make late initcall to ensure the serial and tty layers are initialised
++ * before we start superio.
++ *
++ * FIXME: does this break the superio console?
++ */
++late_initcall(superio_modinit);
+ module_exit(superio_exit);
+--- linux-2.6.0-test6/drivers/pci/hotplug/cpqphp.h	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/pci/hotplug/cpqphp.h	2003-10-05 00:33:24.000000000 -0700
+@@ -766,7 +766,6 @@ static inline int wait_for_ctrl_irq (str
+ 	set_current_state(TASK_INTERRUPTIBLE);
+ 	/* Sleep for up to 1 second to wait for the LED to change. */
+ 	schedule_timeout(1*HZ);
+-	set_current_state(TASK_RUNNING);
+ 	remove_wait_queue(&ctrl->queue, &wait);
+ 	if (signal_pending(current))
+ 		retval =  -EINTR;
+--- linux-2.6.0-test6/drivers/pci/hotplug/pci_hotplug_core.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/pci/hotplug/pci_hotplug_core.c	2003-10-05 00:33:24.000000000 -0700
+@@ -69,7 +69,7 @@ static int debug;
+ 
+ static LIST_HEAD(pci_hotplug_slot_list);
+ 
+-static struct subsystem hotplug_slots_subsys;
++struct subsystem pci_hotplug_slots_subsys;
+ 
+ static ssize_t hotplug_slot_attr_show(struct kobject *kobj,
+ 		struct attribute *attr, char *buf)
+@@ -104,7 +104,7 @@ static struct kobj_type hotplug_slot_kty
+ 	.release = &hotplug_slot_release,
+ };
+ 
+-static decl_subsys(hotplug_slots, &hotplug_slot_ktype, NULL);
++decl_subsys(pci_hotplug_slots, &hotplug_slot_ktype, NULL);
+ 
+ 
+ /* these strings match up with the values in pci_bus_speed */
+@@ -534,7 +534,7 @@ int pci_hp_register (struct hotplug_slot
+ 		return -EINVAL;
+ 
+ 	strlcpy(slot->kobj.name, slot->name, KOBJ_NAME_LEN);
+-	kobj_set_kset_s(slot, hotplug_slots_subsys);
++	kobj_set_kset_s(slot, pci_hotplug_slots_subsys);
+ 
+ 	/* this can fail if we have already registered a slot with the same name */
+ 	if (kobject_register(&slot->kobj)) {
+@@ -629,8 +629,8 @@ static int __init pci_hotplug_init (void
+ {
+ 	int result;
+ 
+-	kset_set_kset_s(&hotplug_slots_subsys, pci_bus_type.subsys);
+-	result = subsystem_register(&hotplug_slots_subsys);
++	kset_set_kset_s(&pci_hotplug_slots_subsys, pci_bus_type.subsys);
++	result = subsystem_register(&pci_hotplug_slots_subsys);
+ 	if (result) {
+ 		err("Register subsys with error %d\n", result);
+ 		goto exit;
+@@ -645,7 +645,7 @@ static int __init pci_hotplug_init (void
+ 	goto exit;
+ 	
+ err_subsys:
+-	subsystem_unregister(&hotplug_slots_subsys);
++	subsystem_unregister(&pci_hotplug_slots_subsys);
+ exit:
+ 	return result;
+ }
+@@ -653,7 +653,7 @@ exit:
+ static void __exit pci_hotplug_exit (void)
+ {
+ 	cpci_hotplug_exit();
+-	subsystem_unregister(&hotplug_slots_subsys);
++	subsystem_unregister(&pci_hotplug_slots_subsys);
+ }
+ 
+ module_init(pci_hotplug_init);
+@@ -665,6 +665,7 @@ MODULE_LICENSE("GPL");
+ MODULE_PARM(debug, "i");
+ MODULE_PARM_DESC(debug, "Debugging mode enabled or not");
+ 
++EXPORT_SYMBOL_GPL(pci_hotplug_slots_subsys);
+ EXPORT_SYMBOL_GPL(pci_hp_register);
+ EXPORT_SYMBOL_GPL(pci_hp_deregister);
+ EXPORT_SYMBOL_GPL(pci_hp_change_slot_info);
+--- linux-2.6.0-test6/drivers/pci/hotplug/pci_hotplug.h	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/pci/hotplug/pci_hotplug.h	2003-10-05 00:33:24.000000000 -0700
+@@ -145,6 +145,7 @@ extern int pci_hp_register		(struct hotp
+ extern int pci_hp_deregister		(struct hotplug_slot *slot);
+ extern int pci_hp_change_slot_info	(struct hotplug_slot *slot,
+ 					 struct hotplug_slot_info *info);
++extern struct subsystem pci_hotplug_slots_subsys;
+ 
+ #endif
+ 
+--- linux-2.6.0-test6/drivers/pci/Makefile	2003-07-27 12:14:39.000000000 -0700
++++ 25/drivers/pci/Makefile	2003-10-05 00:36:20.000000000 -0700
+@@ -4,7 +4,6 @@
+ 
+ obj-y		+= access.o bus.o probe.o remove.o pci.o pool.o quirks.o \
+ 			names.o pci-driver.o search.o pci-sysfs.o
+-obj-$(CONFIG_PM)  += power.o
+ obj-$(CONFIG_PROC_FS) += proc.o
+ 
+ ifndef CONFIG_SPARC64
+@@ -28,6 +27,7 @@ obj-$(CONFIG_PPC64) += setup-bus.o
+ obj-$(CONFIG_SGI_IP27) += setup-irq.o
+ obj-$(CONFIG_SGI_IP32) += setup-irq.o
+ obj-$(CONFIG_X86_VISWS) += setup-irq.o
++obj-$(CONFIG_PCI_USE_VECTOR) += msi.o
+ 
+ # Cardbus & CompactPCI use setup-bus
+ obj-$(CONFIG_HOTPLUG) += setup-bus.o
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/pci/msi.c	2003-10-05 00:36:21.000000000 -0700
+@@ -0,0 +1,1062 @@
++/*
++ * linux/drivers/pci/msi.c
++ */
++
++#include <linux/mm.h>
++#include <linux/irq.h>
++#include <linux/interrupt.h>
++#include <linux/init.h>
++#include <linux/config.h>
++#include <linux/ioport.h>
++#include <linux/smp_lock.h>
++#include <linux/pci.h>
++#include <linux/proc_fs.h>
++#include <linux/acpi.h>
++
++#include <asm/errno.h>
++#include <asm/io.h>
++#include <asm/smp.h>
++#include <asm/desc.h>
++#include <asm/io_apic.h>
++#include <mach_apic.h>
++
++#include <linux/pci_msi.h>
++
++_DEFINE_DBG_BUFFER
++
++static spinlock_t msi_lock = SPIN_LOCK_UNLOCKED;
++static struct msi_desc* msi_desc[NR_IRQS] = { [0 ... NR_IRQS-1] = NULL };
++static kmem_cache_t* msi_cachep;
++
++static int pci_msi_enable = 1;
++static int nr_alloc_vectors = 0;
++static int nr_released_vectors = 0;
++static int nr_reserved_vectors = NR_HP_RESERVED_VECTORS;
++static int nr_msix_devices = 0;
++
++#ifndef CONFIG_X86_IO_APIC
++int vector_irq[NR_IRQS] = { [0 ... NR_IRQS -1] = -1};
++int irq_vector[NR_IRQS] = { FIRST_DEVICE_VECTOR , 0 };
++#endif
++
++static void msi_cache_ctor(void *p, kmem_cache_t *cache, unsigned long flags)
++{
++	memset(p, 0, NR_IRQS * sizeof(struct msi_desc));
++}
++
++static int msi_cache_init(void)
++{
++	msi_cachep = kmem_cache_create("msi_cache",
++			NR_IRQS * sizeof(struct msi_desc),
++		       	0, SLAB_HWCACHE_ALIGN, msi_cache_ctor, NULL);
++	if (!msi_cachep)
++		return -ENOMEM;
++
++	return 0;
++}
++
++static void msi_set_mask_bit(unsigned int vector, int flag)
++{
++	struct msi_desc *entry;
++
++	entry = (struct msi_desc *)msi_desc[vector];
++	if (!entry || !entry->dev || !entry->mask_base)
++		return;
++	switch (entry->msi_attrib.type) {
++	case PCI_CAP_ID_MSI:
++	{
++		int		pos;
++		unsigned int	mask_bits;
++
++		pos = entry->mask_base;
++	        entry->dev->bus->ops->read(entry->dev->bus, entry->dev->devfn,
++				pos, 4, &mask_bits);
++		mask_bits &= ~(1);
++		mask_bits |= flag;
++	        entry->dev->bus->ops->write(entry->dev->bus, entry->dev->devfn,
++				pos, 4, mask_bits);
++		break;
++	}
++	case PCI_CAP_ID_MSIX:
++	{
++		int offset = entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +
++			PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET;
++		writel(flag, entry->mask_base + offset);
++		break;
++	}
++	default:
++		break;
++	}
++}
++
++#ifdef CONFIG_SMP
++static void set_msi_affinity(unsigned int vector, unsigned long cpu_mask)
++{
++	struct msi_desc *entry;
++	struct msg_address address;
++	unsigned int dest_id;
++
++	entry = (struct msi_desc *)msi_desc[vector];
++	if (!entry || !entry->dev)
++		return;
++
++	switch (entry->msi_attrib.type) {
++	case PCI_CAP_ID_MSI:
++	{
++		int pos;
++
++   		if (!(pos = pci_find_capability(entry->dev, PCI_CAP_ID_MSI)))
++			return;
++
++	        entry->dev->bus->ops->read(entry->dev->bus, entry->dev->devfn,
++			msi_lower_address_reg(pos), 4,
++			&address.lo_address.value);
++		dest_id = (address.lo_address.u.dest_id &
++			MSI_ADDRESS_HEADER_MASK) |
++			(cpu_mask_to_apicid(cpu_mask) << MSI_TARGET_CPU_SHIFT);
++		address.lo_address.u.dest_id = dest_id;
++		entry->msi_attrib.current_cpu = cpu_mask_to_apicid(cpu_mask);
++		entry->dev->bus->ops->write(entry->dev->bus, entry->dev->devfn,
++			msi_lower_address_reg(pos), 4,
++			address.lo_address.value);
++		break;
++	}
++	case PCI_CAP_ID_MSIX:
++	{
++		int offset = entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +
++			PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET;
++
++		address.lo_address.value = readl(entry->mask_base + offset);
++		dest_id = (address.lo_address.u.dest_id &
++			MSI_ADDRESS_HEADER_MASK) |
++			(cpu_mask_to_apicid(cpu_mask) << MSI_TARGET_CPU_SHIFT);
++		address.lo_address.u.dest_id = dest_id;
++		entry->msi_attrib.current_cpu = cpu_mask_to_apicid(cpu_mask);
++		writel(address.lo_address.value, entry->mask_base + offset);
++		break;
++	}
++	default:
++		break;
++	}
++}
++
++static inline void move_msi(int vector)
++{
++	if (unlikely(pending_irq_balance_cpumask[vector])) {
++		set_msi_affinity(vector, pending_irq_balance_cpumask[vector]);
++		pending_irq_balance_cpumask[vector] = 0;
++	}
++}
++#endif
++
++static void mask_MSI_irq(unsigned int vector)
++{
++	msi_set_mask_bit(vector, 1);
++}
++
++static void unmask_MSI_irq(unsigned int vector)
++{
++	msi_set_mask_bit(vector, 0);
++}
++
++static unsigned int startup_msi_irq_wo_maskbit(unsigned int vector)
++{
++	return 0;	/* never anything pending */
++}
++
++static void pci_disable_msi(unsigned int vector);
++static void shutdown_msi_irq(unsigned int vector)
++{
++	pci_disable_msi(vector);
++}
++
++#define shutdown_msi_irq_wo_maskbit	shutdown_msi_irq
++static void enable_msi_irq_wo_maskbit(unsigned int vector) {}
++static void disable_msi_irq_wo_maskbit(unsigned int vector) {}
++static void ack_msi_irq_wo_maskbit(unsigned int vector) {}
++static void end_msi_irq_wo_maskbit(unsigned int vector)
++{
++	move_msi(vector);
++	ack_APIC_irq();
++}
++
++static unsigned int startup_msi_irq_w_maskbit(unsigned int vector)
++{
++	unmask_MSI_irq(vector);
++	return 0;	/* never anything pending */
++}
++
++#define shutdown_msi_irq_w_maskbit	shutdown_msi_irq
++#define enable_msi_irq_w_maskbit	unmask_MSI_irq
++#define disable_msi_irq_w_maskbit	mask_MSI_irq
++#define ack_msi_irq_w_maskbit		mask_MSI_irq
++
++static void end_msi_irq_w_maskbit(unsigned int vector)
++{
++	move_msi(vector);
++	unmask_MSI_irq(vector);
++	ack_APIC_irq();
++}
++
++/*
++ * Interrupt Type for MSI-X PCI/PCI-X/PCI-Express Devices,
++ * which implement the MSI-X Capability Structure.
++ */
++static struct hw_interrupt_type msix_irq_type = {
++	.typename	= "PCI MSI-X",
++	.startup	= startup_msi_irq_w_maskbit,
++	.shutdown	= shutdown_msi_irq_w_maskbit,
++	.enable		= enable_msi_irq_w_maskbit,
++	.disable	= disable_msi_irq_w_maskbit,
++	.ack		= ack_msi_irq_w_maskbit,
++	.end		= end_msi_irq_w_maskbit,
++	.set_affinity	= set_msi_irq_affinity
++};
++
++/*
++ * Interrupt Type for MSI PCI/PCI-X/PCI-Express Devices,
++ * which implement the MSI Capability Structure with
++ * Mask-and-Pending Bits.
++ */
++static struct hw_interrupt_type msi_irq_w_maskbit_type = {
++	.typename	= "PCI MSI",
++	.startup	= startup_msi_irq_w_maskbit,
++	.shutdown	= shutdown_msi_irq_w_maskbit,
++	.enable		= enable_msi_irq_w_maskbit,
++	.disable	= disable_msi_irq_w_maskbit,
++	.ack		= ack_msi_irq_w_maskbit,
++	.end		= end_msi_irq_w_maskbit,
++	.set_affinity	= set_msi_irq_affinity
++};
++
++/*
++ * Interrupt Type for MSI PCI/PCI-X/PCI-Express Devices,
++ * which implement the MSI Capability Structure without
++ * Mask-and-Pending Bits.
++ */
++static struct hw_interrupt_type msi_irq_wo_maskbit_type = {
++	.typename	= "PCI MSI",
++	.startup	= startup_msi_irq_wo_maskbit,
++	.shutdown	= shutdown_msi_irq_wo_maskbit,
++	.enable		= enable_msi_irq_wo_maskbit,
++	.disable	= disable_msi_irq_wo_maskbit,
++	.ack		= ack_msi_irq_wo_maskbit,
++	.end		= end_msi_irq_wo_maskbit,
++	.set_affinity	= set_msi_irq_affinity
++};
++
++static void msi_data_init(struct msg_data *msi_data,
++			  unsigned int vector)
++{
++	memset(msi_data, 0, sizeof(struct msg_data));
++	msi_data->vector = (u8)vector;
++	msi_data->delivery_mode = MSI_DELIVERY_MODE;
++	msi_data->level = MSI_LEVEL_MODE;
++	msi_data->trigger = MSI_TRIGGER_MODE;
++}
++
++static void msi_address_init(struct msg_address *msi_address)
++{
++	unsigned int	dest_id;
++
++	memset(msi_address, 0, sizeof(struct msg_address));
++	msi_address->hi_address = (u32)0;
++	dest_id = (MSI_ADDRESS_HEADER << MSI_ADDRESS_HEADER_SHIFT) |
++		 (MSI_TARGET_CPU << MSI_TARGET_CPU_SHIFT);
++	msi_address->lo_address.u.dest_mode = MSI_LOGICAL_MODE;
++	msi_address->lo_address.u.redirection_hint = MSI_REDIRECTION_HINT_MODE;
++	msi_address->lo_address.u.dest_id = dest_id;
++}
++
++static int pci_vector_resources(void)
++{
++	static int res = -EINVAL;
++	int nr_free_vectors;
++
++	if (res == -EINVAL) {
++		int i, repeat;
++		for (i = NR_REPEATS; i > 0; i--) {
++			if ((FIRST_DEVICE_VECTOR + i * 8) > FIRST_SYSTEM_VECTOR)
++				continue;
++			break;
++		}
++		i++;
++		repeat = (FIRST_SYSTEM_VECTOR - FIRST_DEVICE_VECTOR)/i;
++		res = i * repeat - NR_RESERVED_VECTORS + 1;
++	}
++
++	nr_free_vectors = res + nr_released_vectors - nr_alloc_vectors;
++
++	return nr_free_vectors;
++}
++
++int assign_irq_vector(int irq)
++{
++	static int current_vector = FIRST_DEVICE_VECTOR, offset = 0;
++
++	if (irq != MSI_AUTO && IO_APIC_VECTOR(irq) > 0)
++		return IO_APIC_VECTOR(irq);
++next:
++	current_vector += 8;
++	if (current_vector == SYSCALL_VECTOR)
++		goto next;
++
++	if (current_vector > FIRST_SYSTEM_VECTOR) {
++		offset++;
++		current_vector = FIRST_DEVICE_VECTOR + offset;
++	}
++
++	if (current_vector == FIRST_SYSTEM_VECTOR)
++		return -ENOSPC;
++
++	vector_irq[current_vector] = irq;
++	if (irq != MSI_AUTO)
++		IO_APIC_VECTOR(irq) = current_vector;
++
++	nr_alloc_vectors++;
++
++	return current_vector;
++}
++
++static int assign_msi_vector(void)
++{
++	static int new_vector_avail = 1;
++	int vector;
++	unsigned long flags;
++
++	/*
++	 * msi_lock is provided to ensure that successful allocation of MSI
++	 * vector is assigned unique among drivers.
++	 */
++	spin_lock_irqsave(&msi_lock, flags);
++	if (!(pci_vector_resources() > 0)) {
++		spin_unlock_irqrestore(&msi_lock, flags);
++		return -EBUSY;
++	}
++
++	if (!new_vector_avail) {
++		/*
++	 	 * vector_irq[] = -1 indicates that this specific vector is:
++	 	 * - assigned for MSI (since MSI have no associated IRQ) or
++	 	 * - assigned for legacy if less than 16, or
++	 	 * - having no corresponding 1:1 vector-to-IOxAPIC IRQ mapping
++	 	 * vector_irq[] = 0 indicates that this vector, previously
++		 * assigned for MSI, is freed by hotplug removed operations.
++		 * This vector will be reused for any subsequent hotplug added
++		 * operations.
++	 	 * vector_irq[] > 0 indicates that this vector is assigned for
++		 * IOxAPIC IRQs. This vector and its value provides a 1-to-1
++		 * vector-to-IOxAPIC IRQ mapping.
++	 	 */
++		for (vector = FIRST_DEVICE_VECTOR; vector < NR_IRQS; vector++) {
++			if (vector_irq[vector] != 0)
++				continue;
++			vector_irq[vector] = -1;
++			nr_released_vectors--;
++			spin_unlock_irqrestore(&msi_lock, flags);
++			return vector;
++		}
++		spin_unlock_irqrestore(&msi_lock, flags);
++		return -EBUSY;
++	}
++
++	vector = assign_irq_vector(MSI_AUTO);
++	if (vector  == (FIRST_SYSTEM_VECTOR - 8))
++		new_vector_avail = 0;
++
++	spin_unlock_irqrestore(&msi_lock, flags);
++	return vector;
++}
++
++static int get_new_vector(void)
++{
++	int vector;
++
++	if ((vector = assign_msi_vector()) > 0)
++		set_intr_gate(vector, interrupt[vector]);
++
++	return vector;
++}
++
++static int msi_init(void)
++{
++	static int status = -ENOMEM;
++
++	if (!status)
++		return status;
++
++	if ((status = msi_cache_init()) < 0) {
++		pci_msi_enable = 0;
++		printk(KERN_INFO "WARNING: MSI INIT FAILURE\n");
++		return status;
++	}
++	printk(KERN_INFO "MSI INIT SUCCESS\n");
++
++	return status;
++}
++
++static int get_msi_vector(struct pci_dev *dev)
++{
++	return get_new_vector();
++}
++
++static struct msi_desc* alloc_msi_entry(void)
++{
++	struct msi_desc *entry;
++
++	entry = (struct msi_desc*) kmem_cache_alloc(msi_cachep, SLAB_KERNEL);
++	if (!entry)
++		return NULL;
++
++	memset(entry, 0, sizeof(struct msi_desc));
++	entry->link.tail = entry->link.head = 0;	/* single message */
++	entry->dev = NULL;
++
++	return entry;
++}
++
++static void attach_msi_entry(struct msi_desc *entry, int vector)
++{
++	unsigned long flags;
++
++	spin_lock_irqsave(&msi_lock, flags);
++	msi_desc[vector] = entry;
++	spin_unlock_irqrestore(&msi_lock, flags);
++}
++
++static void irq_handler_init(int cap_id, int pos, int mask)
++{
++	spin_lock(&irq_desc[pos].lock);
++	if (cap_id == PCI_CAP_ID_MSIX)
++		irq_desc[pos].handler = &msix_irq_type;
++	else {
++		if (!mask)
++			irq_desc[pos].handler = &msi_irq_wo_maskbit_type;
++		else
++			irq_desc[pos].handler = &msi_irq_w_maskbit_type;
++	}
++	spin_unlock(&irq_desc[pos].lock);
++}
++
++static void enable_msi_mode(struct pci_dev *dev, int pos, int type)
++{
++	u32 control;
++
++	dev->bus->ops->read(dev->bus, dev->devfn,
++		msi_control_reg(pos), 2, &control);
++	if (type == PCI_CAP_ID_MSI) {
++		/* Set enabled bits to single MSI & enable MSI_enable bit */
++		msi_enable(control, 1);
++	        dev->bus->ops->write(dev->bus, dev->devfn,
++			msi_control_reg(pos), 2, control);
++	} else {
++		msix_enable(control);
++	        dev->bus->ops->write(dev->bus, dev->devfn,
++			msi_control_reg(pos), 2, control);
++	}
++    	if (pci_find_capability(dev, PCI_CAP_ID_EXP)) {
++		/* PCI Express Endpoint device detected */
++		u32 cmd;
++	        dev->bus->ops->read(dev->bus, dev->devfn, PCI_COMMAND, 2, &cmd);
++		cmd |= PCI_COMMAND_INTX_DISABLE;
++	        dev->bus->ops->write(dev->bus, dev->devfn, PCI_COMMAND, 2, cmd);
++	}
++}
++
++static void disable_msi_mode(struct pci_dev *dev, int pos, int type)
++{
++	u32 control;
++
++	dev->bus->ops->read(dev->bus, dev->devfn,
++		msi_control_reg(pos), 2, &control);
++	if (type == PCI_CAP_ID_MSI) {
++		/* Set enabled bits to single MSI & enable MSI_enable bit */
++		msi_disable(control);
++	        dev->bus->ops->write(dev->bus, dev->devfn,
++			msi_control_reg(pos), 2, control);
++	} else {
++		msix_disable(control);
++	        dev->bus->ops->write(dev->bus, dev->devfn,
++			msi_control_reg(pos), 2, control);
++	}
++    	if (pci_find_capability(dev, PCI_CAP_ID_EXP)) {
++		/* PCI Express Endpoint device detected */
++		u32 cmd;
++	        dev->bus->ops->read(dev->bus, dev->devfn, PCI_COMMAND, 2, &cmd);
++		cmd &= ~PCI_COMMAND_INTX_DISABLE;
++	        dev->bus->ops->write(dev->bus, dev->devfn, PCI_COMMAND, 2, cmd);
++	}
++}
++
++static int msi_lookup_vector(struct pci_dev *dev)
++{
++	int vector;
++	unsigned long flags;
++
++	spin_lock_irqsave(&msi_lock, flags);
++	for (vector = FIRST_DEVICE_VECTOR; vector < NR_IRQS; vector++) {
++		if (!msi_desc[vector] || msi_desc[vector]->dev != dev ||
++			msi_desc[vector]->msi_attrib.entry_nr ||
++			msi_desc[vector]->msi_attrib.default_vector != dev->irq)
++			continue;	/* not entry 0, skip */
++		spin_unlock_irqrestore(&msi_lock, flags);
++		/* This pre-assigned entry-0 MSI vector for this device
++		   already exits. Override dev->irq with this vector */
++		dev->irq = vector;
++		return 0;
++	}
++	spin_unlock_irqrestore(&msi_lock, flags);
++
++	return -EACCES;
++}
++
++void pci_scan_msi_device(struct pci_dev *dev)
++{
++	if (!dev)
++		return;
++
++   	if (pci_find_capability(dev, PCI_CAP_ID_MSIX) > 0) {
++		nr_reserved_vectors++;
++		nr_msix_devices++;
++	} else if (pci_find_capability(dev, PCI_CAP_ID_MSI) > 0)
++		nr_reserved_vectors++;
++}
++
++/**
++ * msi_capability_init - configure device's MSI capability structure
++ * @dev: pointer to the pci_dev data structure of MSI device function
++ *
++ * Setup the MSI capability structure of device funtion with a single
++ * MSI vector, regardless of device function is capable of handling
++ * multiple messages. A return of zero indicates the successful setup
++ * of an entry zero with the new MSI vector or non-zero for otherwise.
++ **/
++static int msi_capability_init(struct pci_dev *dev)
++{
++	struct msi_desc *entry;
++	struct msg_address address;
++	struct msg_data data;
++	int pos, vector;
++	u32 control;
++
++   	pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
++	if (!pos)
++		return -EINVAL;
++
++	dev->bus->ops->read(dev->bus, dev->devfn, msi_control_reg(pos),
++		2, &control);
++	if (control & PCI_MSI_FLAGS_ENABLE)
++		return 0;
++
++	vector = dev->irq;
++	if (vector > 0 && !msi_lookup_vector(dev)) {
++		/* Lookup Sucess */
++		enable_msi_mode(dev, pos, PCI_CAP_ID_MSI);
++		return 0;
++	}
++	/* MSI Entry Initialization */
++	if (!(entry = alloc_msi_entry()))
++		return -ENOMEM;
++
++	if ((vector = get_msi_vector(dev)) < 0) {
++		kmem_cache_free(msi_cachep, entry);
++		return -EBUSY;
++	}
++	entry->msi_attrib.type = PCI_CAP_ID_MSI;
++	entry->msi_attrib.entry_nr = 0;
++	entry->msi_attrib.maskbit = is_mask_bit_support(control);
++	entry->msi_attrib.default_vector = dev->irq;
++	dev->irq = vector;	/* save default pre-assigned ioapic vector */
++	entry->dev = dev;
++	if (is_mask_bit_support(control)) {
++		entry->mask_base = msi_mask_bits_reg(pos,
++				is_64bit_address(control));
++	}
++	/* Replace with MSI handler */
++	irq_handler_init(PCI_CAP_ID_MSI, vector, entry->msi_attrib.maskbit);
++	/* Configure MSI capability structure */
++	msi_address_init(&address);
++	msi_data_init(&data, vector);
++	entry->msi_attrib.current_cpu = ((address.lo_address.u.dest_id >>
++				MSI_TARGET_CPU_SHIFT) & MSI_TARGET_CPU_MASK);
++	dev->bus->ops->write(dev->bus, dev->devfn, msi_lower_address_reg(pos),
++				4, address.lo_address.value);
++	if (is_64bit_address(control)) {
++		dev->bus->ops->write(dev->bus, dev->devfn,
++			msi_upper_address_reg(pos), 4, address.hi_address);
++		dev->bus->ops->write(dev->bus, dev->devfn,
++			msi_data_reg(pos, 1), 2, *((u32*)&data));
++	} else
++		dev->bus->ops->write(dev->bus, dev->devfn,
++			msi_data_reg(pos, 0), 2, *((u32*)&data));
++	if (entry->msi_attrib.maskbit) {
++		unsigned int maskbits, temp;
++		/* All MSIs are unmasked by default, Mask them all */
++	        dev->bus->ops->read(dev->bus, dev->devfn,
++			msi_mask_bits_reg(pos, is_64bit_address(control)), 4,
++			&maskbits);
++		temp = (1 << multi_msi_capable(control));
++		temp = ((temp - 1) & ~temp);
++		maskbits |= temp;
++		dev->bus->ops->write(dev->bus, dev->devfn,
++			msi_mask_bits_reg(pos, is_64bit_address(control)), 4,
++			maskbits);
++	}
++	attach_msi_entry(entry, vector);
++	/* Set MSI enabled bits	 */
++	enable_msi_mode(dev, pos, PCI_CAP_ID_MSI);
++
++	return 0;
++}
++
++/**
++ * msix_capability_init - configure device's MSI-X capability
++ * @dev: pointer to the pci_dev data structure of MSI-X device function
++ *
++ * Setup the MSI-X capability structure of device funtion with a
++ * single MSI-X vector. A return of zero indicates the successful setup
++ * of an entry zero with the new MSI-X vector or non-zero for otherwise.
++ * To request for additional MSI-X vectors, the device drivers are
++ * required to utilize the following supported APIs:
++ * 1) msi_alloc_vectors(...) for requesting one or more MSI-X vectors
++ * 2) msi_free_vectors(...) for releasing one or more MSI-X vectors
++ *    back to PCI subsystem before calling free_irq(...)
++ **/
++static int msix_capability_init(struct pci_dev	*dev)
++{
++	struct msi_desc *entry;
++	struct msg_address address;
++	struct msg_data data;
++	int vector, pos, dev_msi_cap;
++	u32 phys_addr, table_offset;
++	u32 control;
++	u8 bir;
++	void *base;
++
++   	pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);
++	if (!pos)
++		return -EINVAL;
++
++	/* Request & Map MSI-X table region */
++	dev->bus->ops->read(dev->bus, dev->devfn, msi_control_reg(pos), 2,
++		&control);
++	if (control & PCI_MSIX_FLAGS_ENABLE)
++		return 0;
++
++	vector = dev->irq;
++	if (vector > 0 && !msi_lookup_vector(dev)) {
++		/* Lookup Sucess */
++		enable_msi_mode(dev, pos, PCI_CAP_ID_MSIX);
++		return 0;
++	}
++
++	dev_msi_cap = multi_msix_capable(control);
++	dev->bus->ops->read(dev->bus, dev->devfn,
++		msix_table_offset_reg(pos), 4, &table_offset);
++	bir = (u8)(table_offset & PCI_MSIX_FLAGS_BIRMASK);
++	phys_addr = pci_resource_start (dev, bir);
++	phys_addr += (u32)(table_offset & ~PCI_MSIX_FLAGS_BIRMASK);
++	if (!request_mem_region(phys_addr,
++		dev_msi_cap * PCI_MSIX_ENTRY_SIZE,
++		"MSI-X iomap Failure"))
++		return -ENOMEM;
++	base = ioremap_nocache(phys_addr, dev_msi_cap * PCI_MSIX_ENTRY_SIZE);
++	if (base == NULL)
++		goto free_region;
++	/* MSI Entry Initialization */
++	entry = alloc_msi_entry();
++	if (!entry)
++		goto free_iomap;
++	if ((vector = get_msi_vector(dev)) < 0)
++		goto free_entry;
++
++	entry->msi_attrib.type = PCI_CAP_ID_MSIX;
++	entry->msi_attrib.entry_nr = 0;
++	entry->msi_attrib.maskbit = 1;
++	entry->msi_attrib.default_vector = dev->irq;
++	dev->irq = vector;	/* save default pre-assigned ioapic vector */
++	entry->dev = dev;
++	entry->mask_base = (unsigned long)base;
++	/* Replace with MSI handler */
++	irq_handler_init(PCI_CAP_ID_MSIX, vector, 1);
++	/* Configure MSI-X capability structure */
++	msi_address_init(&address);
++	msi_data_init(&data, vector);
++	entry->msi_attrib.current_cpu = ((address.lo_address.u.dest_id >>
++				MSI_TARGET_CPU_SHIFT) & MSI_TARGET_CPU_MASK);
++	writel(address.lo_address.value, base + PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET);
++	writel(address.hi_address, base + PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET);
++	writel(*(u32*)&data, base + PCI_MSIX_ENTRY_DATA_OFFSET);
++	/* Initialize all entries from 1 up to 0 */
++	for (pos = 1; pos < dev_msi_cap; pos++) {
++		writel(0, base + pos * PCI_MSIX_ENTRY_SIZE +
++			PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET);
++		writel(0, base + pos * PCI_MSIX_ENTRY_SIZE +
++			PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET);
++		writel(0, base + pos * PCI_MSIX_ENTRY_SIZE +
++			PCI_MSIX_ENTRY_DATA_OFFSET);
++	}
++	attach_msi_entry(entry, vector);
++	/* Set MSI enabled bits	 */
++	enable_msi_mode(dev, pos, PCI_CAP_ID_MSIX);
++
++	return 0;
++
++free_entry:
++	kmem_cache_free(msi_cachep, entry);
++free_iomap:
++	iounmap(base);
++free_region:
++	release_mem_region(phys_addr, dev_msi_cap * PCI_MSIX_ENTRY_SIZE);
++
++	return ((vector < 0) ? -EBUSY : -ENOMEM);
++}
++
++/**
++ * pci_enable_msi - configure device's MSI(X) capability structure
++ * @dev: pointer to the pci_dev data structure of MSI(X) device function
++ *
++ * Setup the MSI/MSI-X capability structure of device function with
++ * a single MSI(X) vector upon its software driver call to request for
++ * MSI(X) mode enabled on its hardware device function. A return of zero
++ * indicates the successful setup of an entry zero with the new MSI(X)
++ * vector or non-zero for otherwise.
++ **/
++int pci_enable_msi(struct pci_dev* dev)
++{
++	int status = -EINVAL;
++
++	if (!pci_msi_enable || !dev)
++ 		return status;
++
++	if (msi_init() < 0)
++		return -ENOMEM;
++
++	if ((status = msix_capability_init(dev)) == -EINVAL)
++		status = msi_capability_init(dev);
++	if (!status)
++		nr_reserved_vectors--;
++
++	return status;
++}
++
++static int msi_free_vector(struct pci_dev* dev, int vector);
++static void pci_disable_msi(unsigned int vector)
++{
++	int head, tail, type, default_vector;
++	struct msi_desc *entry;
++	struct pci_dev *dev;
++	unsigned long flags;
++
++	spin_lock_irqsave(&msi_lock, flags);
++	entry = msi_desc[vector];
++	if (!entry || !entry->dev) {
++		spin_unlock_irqrestore(&msi_lock, flags);
++		return;
++	}
++	dev = entry->dev;
++	type = entry->msi_attrib.type;
++	head = entry->link.head;
++	tail = entry->link.tail;
++	default_vector = entry->msi_attrib.default_vector;
++	spin_unlock_irqrestore(&msi_lock, flags);
++
++	disable_msi_mode(dev, pci_find_capability(dev, type), type);
++	/* Restore dev->irq to its default pin-assertion vector */
++	dev->irq = default_vector;
++	if (type == PCI_CAP_ID_MSIX && head != tail) {
++		/* Bad driver, which do not call msi_free_vectors before exit.
++		   We must do a cleanup here */
++		while (1) {
++			spin_lock_irqsave(&msi_lock, flags);
++			entry = msi_desc[vector];
++			head = entry->link.head;
++			tail = entry->link.tail;
++			spin_unlock_irqrestore(&msi_lock, flags);
++			if (tail == head)
++				break;
++			if (msi_free_vector(dev, entry->link.tail))
++				break;
++		}
++	}
++}
++
++static int msi_alloc_vector(struct pci_dev* dev, int head)
++{
++	struct msi_desc *entry;
++	struct msg_address address;
++	struct msg_data data;
++	int i, offset, pos, dev_msi_cap, vector;
++	u32 low_address, control;
++	unsigned long base = 0L;
++	unsigned long flags;
++
++	spin_lock_irqsave(&msi_lock, flags);
++	entry = msi_desc[dev->irq];
++	if (!entry) {
++		spin_unlock_irqrestore(&msi_lock, flags);
++		return -EINVAL;
++	}
++	base = entry->mask_base;
++	spin_unlock_irqrestore(&msi_lock, flags);
++
++   	pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);
++	dev->bus->ops->read(dev->bus, dev->devfn, msi_control_reg(pos),
++		2, &control);
++	dev_msi_cap = multi_msix_capable(control);
++	for (i = 1; i < dev_msi_cap; i++) {
++		if (!(low_address = readl(base + i * PCI_MSIX_ENTRY_SIZE)))
++			 break;
++	}
++	if (i >= dev_msi_cap)
++		return -EINVAL;
++
++	/* MSI Entry Initialization */
++	if (!(entry = alloc_msi_entry()))
++		return -ENOMEM;
++
++	if ((vector = get_new_vector()) < 0) {
++		kmem_cache_free(msi_cachep, entry);
++		return vector;
++	}
++	entry->msi_attrib.type = PCI_CAP_ID_MSIX;
++	entry->msi_attrib.entry_nr = i;
++	entry->msi_attrib.maskbit = 1;
++	entry->dev = dev;
++	entry->link.head = head;
++	entry->mask_base = base;
++	irq_handler_init(PCI_CAP_ID_MSIX, vector, 1);
++	/* Configure MSI-X capability structure */
++	msi_address_init(&address);
++	msi_data_init(&data, vector);
++	entry->msi_attrib.current_cpu = ((address.lo_address.u.dest_id >>
++				MSI_TARGET_CPU_SHIFT) & MSI_TARGET_CPU_MASK);
++	offset = entry->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE;
++	writel(address.lo_address.value, base + offset +
++		PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET);
++	writel(address.hi_address, base + offset +
++		PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET);
++	writel(*(u32*)&data, base + offset + PCI_MSIX_ENTRY_DATA_OFFSET);
++	writel(1, base + offset + PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET);
++	attach_msi_entry(entry, vector);
++
++	return vector;
++}
++
++static int msi_free_vector(struct pci_dev* dev, int vector)
++{
++	struct msi_desc *entry;
++	int entry_nr, type;
++	unsigned long base = 0L;
++	unsigned long flags;
++
++	spin_lock_irqsave(&msi_lock, flags);
++	entry = msi_desc[vector];
++	if (!entry || entry->dev != dev) {
++		spin_unlock_irqrestore(&msi_lock, flags);
++		return -EINVAL;
++	}
++	type = entry->msi_attrib.type;
++	entry_nr = entry->msi_attrib.entry_nr;
++	base = entry->mask_base;
++	if (entry->link.tail != entry->link.head) {
++		msi_desc[entry->link.head]->link.tail = entry->link.tail;
++		if (entry->link.tail)
++			msi_desc[entry->link.tail]->link.head = entry->link.head;
++	}
++	entry->dev = NULL;
++	vector_irq[vector] = 0;
++	nr_released_vectors++;
++	msi_desc[vector] = NULL;
++	spin_unlock_irqrestore(&msi_lock, flags);
++
++	kmem_cache_free(msi_cachep, entry);
++	if (type == PCI_CAP_ID_MSIX) {
++		int offset;
++
++		offset = entry_nr * PCI_MSIX_ENTRY_SIZE;
++		writel(1, base + offset + PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET);
++		writel(0, base + offset + PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET);
++	}
++
++	return 0;
++}
++
++/**
++ * msi_alloc_vectors - allocate additional MSI-X vectors
++ * @dev: pointer to the pci_dev data structure of MSI-X device function
++ * @vector: pointer to an array of new allocated MSI-X vectors
++ * @nvec: number of MSI-X vectors requested for allocation by device driver
++ *
++ * Allocate additional MSI-X vectors requested by device driver. A
++ * return of zero indicates the successful setup of MSI-X capability
++ * structure with new allocated MSI-X vectors or non-zero for otherwise.
++ **/
++int msi_alloc_vectors(struct pci_dev* dev, int *vector, int nvec)
++{
++	struct msi_desc *entry;
++	int i, head, pos, vec, free_vectors, alloc_vectors;
++	int *vectors = (int *)vector;
++	u32 control;
++	unsigned long flags;
++
++	if (!pci_msi_enable || !dev)
++ 		return -EINVAL;
++
++   	if (!(pos = pci_find_capability(dev, PCI_CAP_ID_MSIX)))
++ 		return -EINVAL;
++
++	dev->bus->ops->read(dev->bus, dev->devfn, msi_control_reg(pos), 			2, &control);
++	if (nvec > multi_msix_capable(control))
++		return -EINVAL;
++
++	spin_lock_irqsave(&msi_lock, flags);
++	entry = msi_desc[dev->irq];
++	if (!entry || entry->dev != dev ||		/* legal call */
++	   entry->msi_attrib.type != PCI_CAP_ID_MSIX || /* must be MSI-X */
++	   entry->link.head != entry->link.tail) {	/* already multi */
++		spin_unlock_irqrestore(&msi_lock, flags);
++		return -EINVAL;
++	}
++	/*
++	 * msi_lock is provided to ensure that enough vectors resources are
++	 * available before granting.
++	 */
++	free_vectors = pci_vector_resources();
++	/* Ensure that each MSI/MSI-X device has one vector reserved by
++	   default to avoid any MSI-X driver to take all available
++ 	   resources */
++	free_vectors -= nr_reserved_vectors;
++	/* Find the average of free vectors among MSI-X devices */
++	if (nr_msix_devices > 0)
++		free_vectors /= nr_msix_devices;
++	spin_unlock_irqrestore(&msi_lock, flags);
++
++	if (nvec > free_vectors)
++		return -EBUSY;
++
++	alloc_vectors = 0;
++	head = dev->irq;
++	for (i = 0; i < nvec; i++) {
++		if ((vec = msi_alloc_vector(dev, head)) < 0)
++			break;
++		*(vectors + i) = vec;
++		head = vec;
++		alloc_vectors++;
++	}
++	if (alloc_vectors != nvec) {
++		for (i = 0; i < alloc_vectors; i++) {
++			vec = *(vectors + i);
++			msi_free_vector(dev, vec);
++		}
++		spin_lock_irqsave(&msi_lock, flags);
++		msi_desc[dev->irq]->link.tail = msi_desc[dev->irq]->link.head;
++		spin_unlock_irqrestore(&msi_lock, flags);
++		return -EBUSY;
++	}
++	if (nr_msix_devices > 0)
++		nr_msix_devices--;
++
++	return 0;
++}
++
++/**
++ * msi_free_vectors - reclaim MSI-X vectors to unused state
++ * @dev: pointer to the pci_dev data structure of MSI-X device function
++ * @vector: pointer to an array of released MSI-X vectors
++ * @nvec: number of MSI-X vectors requested for release by device driver
++ *
++ * Reclaim MSI-X vectors released by device driver to unused state,
++ * which may be used later on. A return of zero indicates the
++ * success or non-zero for otherwise. Device driver should call this
++ * before calling function free_irq.
++ **/
++int msi_free_vectors(struct pci_dev* dev, int *vector, int nvec)
++{
++	struct msi_desc *entry;
++	int i;
++	unsigned long flags;
++
++	if (!pci_msi_enable)
++ 		return -EINVAL;
++
++	spin_lock_irqsave(&msi_lock, flags);
++	entry = msi_desc[dev->irq];
++	if (!entry || entry->dev != dev ||
++	   	entry->msi_attrib.type != PCI_CAP_ID_MSIX ||
++		entry->link.head == entry->link.tail) {	/* Nothing to free */
++		spin_unlock_irqrestore(&msi_lock, flags);
++		return -EINVAL;
++	}
++	spin_unlock_irqrestore(&msi_lock, flags);
++
++	for (i = 0; i < nvec; i++) {
++		if (*(vector + i) == dev->irq)
++			continue;/* Don't free entry 0 if mistaken by driver */
++		msi_free_vector(dev, *(vector + i));
++	}
++
++	return 0;
++}
++
++/**
++ * msi_remove_pci_irq_vectors - reclaim MSI(X) vectors to unused state
++ * @dev: pointer to the pci_dev data structure of MSI(X) device function
++ *
++ * Being called during hotplug remove, from which the device funciton
++ * is hot-removed. All previous assigned MSI/MSI-X vectors, if
++ * allocated for this device function, are reclaimed to unused state,
++ * which may be used later on.
++ **/
++void msi_remove_pci_irq_vectors(struct pci_dev* dev)
++{
++	struct msi_desc *entry;
++	int type;
++	unsigned long flags;
++
++	if (!pci_msi_enable)
++ 		return;
++
++	spin_lock_irqsave(&msi_lock, flags);
++	entry = msi_desc[dev->irq];
++	if (!entry || entry->dev != dev) {
++		spin_unlock_irqrestore(&msi_lock, flags);
++		return;
++	}
++	type = entry->msi_attrib.type;
++	spin_unlock_irqrestore(&msi_lock, flags);
++
++	msi_free_vector(dev, dev->irq);
++	if (type == PCI_CAP_ID_MSIX) {
++		int i, pos, dev_msi_cap;
++		u32 phys_addr, table_offset;
++		u32 control;
++		u8 bir;
++
++   		pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);
++		dev->bus->ops->read(dev->bus, dev->devfn, msi_control_reg(pos), 			2, &control);
++		dev_msi_cap = multi_msix_capable(control);
++		dev->bus->ops->read(dev->bus, dev->devfn,
++			msix_table_offset_reg(pos), 4, &table_offset);
++		bir = (u8)(table_offset & PCI_MSIX_FLAGS_BIRMASK);
++		phys_addr = pci_resource_start (dev, bir);
++		phys_addr += (u32)(table_offset & ~PCI_MSIX_FLAGS_BIRMASK);
++		for (i = FIRST_DEVICE_VECTOR; i < NR_IRQS; i++) {
++			spin_lock_irqsave(&msi_lock, flags);
++			if (!msi_desc[i] || msi_desc[i]->dev != dev) {
++				spin_unlock_irqrestore(&msi_lock, flags);
++				continue;
++			}
++			spin_unlock_irqrestore(&msi_lock, flags);
++			msi_free_vector(dev, i);
++		}
++		writel(1, entry->mask_base + PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET);
++		iounmap((void*)entry->mask_base);
++		release_mem_region(phys_addr, dev_msi_cap * PCI_MSIX_ENTRY_SIZE);
++	}
++	nr_reserved_vectors++;
++}
++
++EXPORT_SYMBOL(pci_enable_msi);
++EXPORT_SYMBOL(msi_alloc_vectors);
++EXPORT_SYMBOL(msi_free_vectors);
+--- linux-2.6.0-test6/drivers/pci/pci.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/pci/pci.c	2003-10-05 00:36:10.000000000 -0700
+@@ -126,11 +126,13 @@ pci_find_capability(struct pci_dev *dev,
+ 
+ /**
+  * pci_bus_find_capability - query for devices' capabilities 
+- * @dev: PCI device to query
+- * @cap: capability code
++ * @bus:   the PCI bus to query
++ * @devfn: PCI device to query
++ * @cap:   capability code
+  *
+  * Like pci_find_capability() but works for pci devices that do not have a
+  * pci_dev structure set up yet. 
++ *
+  * Returns the address of the requested capability structure within the
+  * device's PCI configuration space or 0 in case the device does not
+  * support it.
+--- linux-2.6.0-test6/drivers/pci/pool.c	2003-07-27 12:14:39.000000000 -0700
++++ 25/drivers/pci/pool.c	2003-10-05 00:33:24.000000000 -0700
+@@ -296,7 +296,6 @@ restart:
+ 
+ 			schedule_timeout (POOL_TIMEOUT_JIFFIES);
+ 
+-			current->state = TASK_RUNNING;
+ 			remove_wait_queue (&pool->waitq, &wait);
+ 			goto restart;
+ 		}
+--- linux-2.6.0-test6/drivers/pci/power.c	2003-06-14 12:18:25.000000000 -0700
++++ /dev/null	2002-08-30 16:31:37.000000000 -0700
+@@ -1,159 +0,0 @@
+-#include <linux/pci.h>
+-#include <linux/pm.h>
+-#include <linux/init.h>
+-
+-/*
+- * PCI Power management..
+- *
+- * This needs to be done centralized, so that we power manage PCI
+- * devices in the right order: we should not shut down PCI bridges
+- * before we've shut down the devices behind them, and we should
+- * not wake up devices before we've woken up the bridge to the
+- * device.. Eh?
+- *
+- * We do not touch devices that don't have a driver that exports
+- * a suspend/resume function. That is just too dangerous. If the default
+- * PCI suspend/resume functions work for a device, the driver can
+- * easily implement them (ie just have a suspend function that calls
+- * the pci_set_power_state() function).
+- */
+-
+-static int pci_pm_save_state_device(struct pci_dev *dev, u32 state)
+-{
+-	int error = 0;
+-	if (dev) {
+-		struct pci_driver *driver = dev->driver;
+-		if (driver && driver->save_state) 
+-			error = driver->save_state(dev,state);
+-	}
+-	return error;
+-}
+-
+-static int pci_pm_suspend_device(struct pci_dev *dev, u32 state)
+-{
+-	int error = 0;
+-	if (dev) {
+-		struct pci_driver *driver = dev->driver;
+-		if (driver && driver->suspend)
+-			error = driver->suspend(dev,state);
+-	}
+-	return error;
+-}
+-
+-static int pci_pm_resume_device(struct pci_dev *dev)
+-{
+-	int error = 0;
+-	if (dev) {
+-		struct pci_driver *driver = dev->driver;
+-		if (driver && driver->resume)
+-			error = driver->resume(dev);
+-	}
+-	return error;
+-}
+-
+-static int pci_pm_save_state_bus(struct pci_bus *bus, u32 state)
+-{
+-	struct list_head *list;
+-	int error = 0;
+-
+-	list_for_each(list, &bus->children) {
+-		error = pci_pm_save_state_bus(pci_bus_b(list),state);
+-		if (error) return error;
+-	}
+-	list_for_each(list, &bus->devices) {
+-		error = pci_pm_save_state_device(pci_dev_b(list),state);
+-		if (error) return error;
+-	}
+-	return 0;
+-}
+-
+-static int pci_pm_suspend_bus(struct pci_bus *bus, u32 state)
+-{
+-	struct list_head *list;
+-
+-	/* Walk the bus children list */
+-	list_for_each(list, &bus->children) 
+-		pci_pm_suspend_bus(pci_bus_b(list),state);
+-
+-	/* Walk the device children list */
+-	list_for_each(list, &bus->devices)
+-		pci_pm_suspend_device(pci_dev_b(list),state);
+-	return 0;
+-}
+-
+-static int pci_pm_resume_bus(struct pci_bus *bus)
+-{
+-	struct list_head *list;
+-
+-	/* Walk the device children list */
+-	list_for_each(list, &bus->devices)
+-		pci_pm_resume_device(pci_dev_b(list));
+-
+-	/* And then walk the bus children */
+-	list_for_each(list, &bus->children)
+-		pci_pm_resume_bus(pci_bus_b(list));
+-	return 0;
+-}
+-
+-static int pci_pm_save_state(u32 state)
+-{
+-	struct pci_bus *bus = NULL;
+-	int error = 0;
+-
+-	while ((bus = pci_find_next_bus(bus)) != NULL) {
+-		error = pci_pm_save_state_bus(bus,state);
+-		if (!error)
+-			error = pci_pm_save_state_device(bus->self,state);
+-	}
+-	return error;
+-}
+-
+-static int pci_pm_suspend(u32 state)
+-{
+-	struct pci_bus *bus = NULL;
+-
+-	while ((bus = pci_find_next_bus(bus)) != NULL) {
+-		pci_pm_suspend_bus(bus,state);
+-		pci_pm_suspend_device(bus->self,state);
+-	}
+-	return 0;
+-}
+-
+-static int pci_pm_resume(void)
+-{
+-	struct pci_bus *bus = NULL;
+-
+-	while ((bus = pci_find_next_bus(bus)) != NULL) {
+-		pci_pm_resume_device(bus->self);
+-		pci_pm_resume_bus(bus);
+-	}
+-	return 0;
+-}
+-
+-static int 
+-pci_pm_callback(struct pm_dev *pm_device, pm_request_t rqst, void *data)
+-{
+-	int error = 0;
+-
+-	switch (rqst) {
+-	case PM_SAVE_STATE:
+-		error = pci_pm_save_state((unsigned long)data);
+-		break;
+-	case PM_SUSPEND:
+-		error = pci_pm_suspend((unsigned long)data);
+-		break;
+-	case PM_RESUME:
+-		error = pci_pm_resume();
+-		break;
+-	default: break;
+-	}
+-	return error;
+-}
+-
+-static int __init pci_pm_init(void)
+-{
+-	pm_register(PM_PCI_DEV, 0, pci_pm_callback);
+-	return 0;
+-}
+-
+-subsys_initcall(pci_pm_init);
+--- linux-2.6.0-test6/drivers/pci/probe.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/pci/probe.c	2003-10-05 00:36:20.000000000 -0700
+@@ -176,7 +176,7 @@ void __devinit pci_read_bridge_bases(str
+ 		limit |= (io_limit_hi << 16);
+ 	}
+ 
+-	if (base && base <= limit) {
++	if (base <= limit) {
+ 		res->flags = (io_base_lo & PCI_IO_RANGE_TYPE_MASK) | IORESOURCE_IO;
+ 		res->start = base;
+ 		res->end = limit + 0xfff;
+@@ -187,7 +187,7 @@ void __devinit pci_read_bridge_bases(str
+ 	pci_read_config_word(dev, PCI_MEMORY_LIMIT, &mem_limit_lo);
+ 	base = (mem_base_lo & PCI_MEMORY_RANGE_MASK) << 16;
+ 	limit = (mem_limit_lo & PCI_MEMORY_RANGE_MASK) << 16;
+-	if (base && base <= limit) {
++	if (base <= limit) {
+ 		res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM;
+ 		res->start = base;
+ 		res->end = limit + 0xfffff;
+@@ -213,7 +213,7 @@ void __devinit pci_read_bridge_bases(str
+ 		}
+ #endif
+ 	}
+-	if (base && base <= limit) {
++	if (base <= limit) {
+ 		res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM | IORESOURCE_PREFETCH;
+ 		res->start = base;
+ 		res->end = limit + 0xfffff;
+@@ -552,6 +552,7 @@ int __devinit pci_scan_slot(struct pci_b
+ 		struct pci_dev *dev;
+ 
+ 		dev = pci_scan_device(bus, devfn);
++		pci_scan_msi_device(dev);
+ 		if (func == 0) {
+ 			if (!dev)
+ 				break;
+--- linux-2.6.0-test6/drivers/pci/quirks.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/pci/quirks.c	2003-10-05 00:33:24.000000000 -0700
+@@ -750,6 +750,9 @@ static void __init quirk_sis_96x_compati
+ 
+ /*
+  *  The main table of quirks.
++ *
++ *  Note: any hooks for hotpluggable devices in this table must _NOT_
++ *        be declared __init.
+  */
+ 
+ static struct pci_fixup pci_fixups[] __devinitdata = {
+--- linux-2.6.0-test6/drivers/pci/remove.c	2003-07-27 12:14:39.000000000 -0700
++++ 25/drivers/pci/remove.c	2003-10-05 00:36:20.000000000 -0700
+@@ -14,6 +14,8 @@ static void pci_free_resources(struct pc
+ {
+ 	int i;
+ 
++ 	msi_remove_pci_irq_vectors(dev);
++
+ 	for (i = 0; i < PCI_NUM_RESOURCES; i++) {
+ 		struct resource *res = dev->resource + i;
+ 		if (res->parent)
+--- linux-2.6.0-test6/drivers/s390/block/dasd.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/s390/block/dasd.c	2003-10-05 00:34:01.000000000 -0700
+@@ -1643,9 +1643,9 @@ dasd_flush_request_queue(struct dasd_dev
+ }
+ 
+ static int
+-dasd_open(struct inode *inp, struct file *filp)
++dasd_open(struct block_device *bdev, struct file *filp)
+ {
+-	struct gendisk *disk = inp->i_bdev->bd_disk;
++	struct gendisk *disk = bdev->bd_disk;
+ 	struct dasd_device *device = disk->private_data;
+ 	int rc;
+ 
+@@ -1676,10 +1676,8 @@ out:
+ 	return rc;
+ }
+ 
+-static int
+-dasd_release(struct inode *inp, struct file *filp)
++static int dasd_release(struct gendisk *disk)
+ {
+-	struct gendisk *disk = inp->i_bdev->bd_disk;
+ 	struct dasd_device *device = disk->private_data;
+ 
+ 	if (device->state < DASD_STATE_BASIC) {
+--- linux-2.6.0-test6/drivers/s390/block/dasd_int.h	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/s390/block/dasd_int.h	2003-10-05 00:33:54.000000000 -0700
+@@ -493,7 +493,7 @@ int  dasd_ioctl_init(void);
+ void dasd_ioctl_exit(void);
+ int  dasd_ioctl_no_register(struct module *, int, dasd_ioctl_fn_t);
+ int  dasd_ioctl_no_unregister(struct module *, int, dasd_ioctl_fn_t);
+-int  dasd_ioctl(struct inode *, struct file *, unsigned int, unsigned long);
++int  dasd_ioctl(struct block_device *, struct file *, unsigned int, unsigned long);
+ 
+ /* externals in dasd_proc.c */
+ int dasd_proc_init(void);
+--- linux-2.6.0-test6/drivers/s390/block/dasd_ioctl.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/s390/block/dasd_ioctl.c	2003-10-05 00:33:54.000000000 -0700
+@@ -78,10 +78,9 @@ dasd_ioctl_no_unregister(struct module *
+ }
+ 
+ int
+-dasd_ioctl(struct inode *inp, struct file *filp,
++dasd_ioctl(struct block_device *bdev, struct file *filp,
+ 	   unsigned int no, unsigned long data)
+ {
+-	struct block_device *bdev = inp->i_bdev;
+ 	struct dasd_device *device = bdev->bd_disk->private_data;
+ 	struct dasd_ioctl *ioctl;
+ 	const char *dir;
+--- linux-2.6.0-test6/drivers/s390/block/xpram.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/s390/block/xpram.c	2003-10-05 00:33:54.000000000 -0700
+@@ -328,7 +328,7 @@ fail:
+ 	return 0;
+ }
+ 
+-static int xpram_ioctl (struct inode *inode, struct file *filp,
++static int xpram_ioctl (struct block_device *bdev, struct file *filp,
+ 		 unsigned int cmd, unsigned long arg)
+ {
+ 	struct hd_geometry *geo;
+--- linux-2.6.0-test6/drivers/s390/char/tape_block.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/s390/char/tape_block.c	2003-10-05 00:34:01.000000000 -0700
+@@ -27,8 +27,8 @@
+ /*
+  * file operation structure for tape block frontend
+  */
+-static int tapeblock_open(struct inode *, struct file *);
+-static int tapeblock_release(struct inode *, struct file *);
++static int tapeblock_open(block_device *, struct file *);
++static int tapeblock_release(struct gendisk *);
+ 
+ static struct block_device_operations tapeblock_fops = {
+ 	.owner		= THIS_MODULE,
+@@ -299,9 +299,9 @@ static int tapeblock_mediumdetect(struct
+  * Block frontend tape device open function.
+  */
+ static int
+-tapeblock_open(struct inode *inode, struct file *filp)
++tapeblock_open(struct block_device *bdev, struct file *filp)
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
++	struct gendisk *disk = bdev->bd_disk;
+ 	struct tape_device *device = disk->private_data;
+ 	int rc;
+ 
+@@ -336,9 +336,8 @@ tapeblock_open(struct inode *inode, stru
+  * Block frontend tape device release function.
+  */
+ static int
+-tapeblock_release(struct inode *inode, struct file *filp)
++tapeblock_release(struct gendisk *disk)
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
+ 	struct tape_device *device = disk->private_data;
+ 
+ 	tape_release(device);
+--- linux-2.6.0-test6/drivers/sbus/char/bbc_envctrl.c	2003-06-14 12:18:08.000000000 -0700
++++ 25/drivers/sbus/char/bbc_envctrl.c	2003-10-05 00:33:24.000000000 -0700
+@@ -59,7 +59,7 @@ static int errno;
+  * before the hardware based power-off event is triggered.
+  */
+ 
+-/* These settings are in celcius.  We use these defaults only
++/* These settings are in Celsius.  We use these defaults only
+  * if we cannot interrogate the cpu-fru SEEPROM.
+  */
+ struct temp_limits {
+--- linux-2.6.0-test6/drivers/sbus/char/cpwatchdog.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/sbus/char/cpwatchdog.c	2003-10-05 00:33:24.000000000 -0700
+@@ -539,7 +539,7 @@ static void wd_toggleintr(struct wd_time
+ static void wd_pingtimer(struct wd_timer* pTimer)
+ {
+ 	if(wd_readb(&pTimer->regs->status) & WD_S_RUNNING) {
+-		wd_readb(&pTimer->regs->dcntr);
++		wd_readw(&pTimer->regs->dcntr);
+ 	}
+ }
+ 
+--- linux-2.6.0-test6/drivers/sbus/char/jsflash.c	2003-08-08 22:55:12.000000000 -0700
++++ 25/drivers/sbus/char/jsflash.c	2003-10-05 00:33:24.000000000 -0700
+@@ -37,6 +37,7 @@
+ #include <linux/string.h>
+ #include <linux/smp_lock.h>
+ #include <linux/genhd.h>
++#include <linux/blkdev.h>
+ 
+ #define MAJOR_NR	JSFD_MAJOR
+ 
+@@ -187,7 +188,7 @@ static void jsfd_read(char *buf, unsigne
+ static void jsfd_do_request(request_queue_t *q)
+ {
+ 	struct request *req;
+-	
++
+ 	while ((req = elv_next_request(q)) != NULL) {
+ 		struct jsfd_part *jdp = req->rq_disk->private_data;
+ 		unsigned long offset = req->sector << 9;
+@@ -198,16 +199,11 @@ static void jsfd_do_request(request_queu
+ 			continue;
+ 		}
+ 
+-		if (req->cmd == WRITE) {
++		if (rq_data_dir(req) != READ) {
+ 			printk(KERN_ERR "jsfd: write\n");
+ 			end_request(req, 0);
+ 			continue;
+ 		}
+-		if (req->cmd != READ) {
+-			printk(KERN_ERR "jsfd: bad req->cmd %d\n", req->cmd);
+-			end_request(req, 0);
+-			continue;
+-		}
+ 
+ 		if ((jdp->dbase & 0xff000000) != 0x20000000) {
+ 			printk(KERN_ERR "jsfd: bad base %x\n", (int)jdp->dbase);
+@@ -215,7 +211,6 @@ static void jsfd_do_request(request_queu
+ 			continue;
+ 		}
+ 
+-/* printk("%s: read buf %p off %x len %x\n", req->rq_disk->disk_name, req->buffer, (int)offset, (int)len); */ /* P3 */
+ 		jsfd_read(req->buffer, jdp->dbase + offset, len);
+ 
+ 		end_request(req, 1);
+@@ -265,9 +260,6 @@ static ssize_t jsf_read(struct file * fi
+ 		unsigned int n;
+ 	} b;
+ 
+-	if (verify_area(VERIFY_WRITE, buf, togo))
+-		return -EFAULT; 
+-
+ 	if (p < JSF_BASE_ALL || p >= JSF_BASE_TOP) {
+ 		return 0;
+ 	}
+@@ -298,7 +290,8 @@ static ssize_t jsf_read(struct file * fi
+ 	while (togo >= 4) {
+ 		togo -= 4;
+ 		b.n = jsf_inl(p);
+-		copy_to_user(tmp, b.s, 4);
++		if (copy_to_user(tmp, b.s, 4))
++			return -EFAULT;
+ 		tmp += 4;
+ 		p += 4;
+ 	}
+@@ -374,19 +367,17 @@ static int jsf_ioctl_program(unsigned lo
+ 		char s[4];
+ 	} b;
+ 
+-	if (verify_area(VERIFY_READ, (void *)arg, JSFPRGSZ))
++	if (copy_from_user(&abuf, (char *)arg, JSFPRGSZ))
+ 		return -EFAULT; 
+-	copy_from_user(&abuf, (char *)arg, JSFPRGSZ);
+ 	p = abuf.off;
+ 	togo = abuf.size;
+ 	if ((togo & 3) || (p & 3)) return -EINVAL;
+ 
+ 	uptr = (char *) (unsigned long) abuf.data;
+-	if (verify_area(VERIFY_READ, uptr, togo))
+-		return -EFAULT;
+ 	while (togo != 0) {
+ 		togo -= 4;
+-		copy_from_user(&b.s[0], uptr, 4);
++		if (copy_from_user(&b.s[0], uptr, 4))
++			return -EFAULT;
+ 		jsf_write4(p, b.n);
+ 		p += 4;
+ 		uptr += 4;
+@@ -404,10 +395,8 @@ static int jsf_ioctl(struct inode *inode
+ 		return -EPERM;
+ 	switch (cmd) {
+ 	case JSFLASH_IDENT:
+-		if (verify_area(VERIFY_WRITE, (void *)arg, JSFIDSZ))
+-			return -EFAULT; 
+-		copy_to_user(arg, &jsf0.id, JSFIDSZ);
+-		error = 0;
++		if (copy_to_user((void *)arg, &jsf0.id, JSFIDSZ))
++			return -EFAULT;
+ 		break;
+ 	case JSFLASH_ERASE:
+ 		error = jsf_ioctl_erase(arg);
+--- linux-2.6.0-test6/drivers/scsi/a2091.c	2003-07-27 12:14:39.000000000 -0700
++++ 25/drivers/scsi/a2091.c	2003-10-05 00:33:24.000000000 -0700
+@@ -25,31 +25,20 @@
+ #define DMA(ptr) ((a2091_scsiregs *)((ptr)->base))
+ #define HDATA(ptr) ((struct WD33C93_hostdata *)((ptr)->hostdata))
+ 
+-static struct Scsi_Host *first_instance = NULL;
+-static Scsi_Host_Template *a2091_template;
+-
+-static irqreturn_t a2091_intr (int irq, void *dummy, struct pt_regs *fp)
++static irqreturn_t a2091_intr (int irq, void *_instance, struct pt_regs *fp)
+ {
+     unsigned long flags;
+     unsigned int status;
+-    struct Scsi_Host *instance;
+-    int handled = 0;
++    struct Scsi_Host *instance = (struct Scsi_Host *)_instance;
+ 
+-    for (instance = first_instance; instance &&
+-	 instance->hostt == a2091_template; instance = instance->next)
+-    {
+-	status = DMA(instance)->ISTR;
+-	if (!(status & (ISTR_INT_F|ISTR_INT_P)))
+-		continue;
+-
+-	if (status & ISTR_INTS) {
+-		spin_lock_irqsave(instance->host_lock, flags);
+-		wd33c93_intr (instance);
+-		spin_unlock_irqrestore(instance->host_lock, flags);
+-		handled = 1;
+-	}
+-    }
+-    return IRQ_RETVAL(handled);
++    status = DMA(instance)->ISTR;
++    if (!(status & (ISTR_INT_F|ISTR_INT_P)) || !(status & ISTR_INTS))
++	return IRQ_NONE;
++
++    spin_lock_irqsave(instance->host_lock, flags);
++    wd33c93_intr(instance);
++    spin_unlock_irqrestore(instance->host_lock, flags);
++    return IRQ_HANDLED;
+ }
+ 
+ static int dma_setup (Scsi_Cmnd *cmd, int dir_in)
+@@ -184,8 +173,6 @@ static void dma_stop (struct Scsi_Host *
+     }
+ }
+ 
+-static int num_a2091 = 0;
+-
+ int __init a2091_detect(Scsi_Host_Template *tpnt)
+ {
+     static unsigned char called = 0;
+@@ -193,6 +180,7 @@ int __init a2091_detect(Scsi_Host_Templa
+     unsigned long address;
+     struct zorro_dev *z = NULL;
+     wd33c93_regs regs;
++    int num_a2091 = 0;
+ 
+     if (!MACH_IS_AMIGA || called)
+ 	return 0;
+@@ -221,13 +209,10 @@ int __init a2091_detect(Scsi_Host_Templa
+ 	regs.SASR = &(DMA(instance)->SASR);
+ 	regs.SCMD = &(DMA(instance)->SCMD);
+ 	wd33c93_init(instance, regs, dma_setup, dma_stop, WD33C93_FS_8_10);
+-	if (num_a2091++ == 0) {
+-	    first_instance = instance;
+-	    a2091_template = instance->hostt;
+-	    request_irq(IRQ_AMIGA_PORTS, a2091_intr, SA_SHIRQ, "A2091 SCSI",
+-			a2091_intr);
+-	}
++	request_irq(IRQ_AMIGA_PORTS, a2091_intr, SA_SHIRQ, "A2091 SCSI",
++		    instance);
+ 	DMA(instance)->CNTR = CNTR_PDMD | CNTR_INTEN;
++	num_a2091++;
+     }
+ 
+     return num_a2091;
+@@ -266,8 +251,7 @@ int a2091_release(struct Scsi_Host *inst
+ #ifdef MODULE
+ 	DMA(instance)->CNTR = 0;
+ 	release_mem_region(ZTWO_PADDR(instance->base), 256);
+-	if (--num_a2091 == 0)
+-		free_irq(IRQ_AMIGA_PORTS, a2091_intr);
++	free_irq(IRQ_AMIGA_PORTS, instance);
+ 	wd33c93_release();
+ #endif
+ 	return 1;
+--- linux-2.6.0-test6/drivers/scsi/aic7xxx/aicasm/Makefile	2003-06-14 12:18:32.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/aicasm/Makefile	2003-10-05 00:34:29.000000000 -0700
+@@ -49,14 +49,18 @@ aicdb.h:
+ clean:
+ 	rm -f $(clean-files)
+ 
+-aicasm_gram.c aicasm_gram.h: aicasm_gram.y
++aicasm_gram.c: aicasm_gram.h
++	mv $(<:.h=).tab.c $(<:.h=.c)
++
++aicasm_gram.h: aicasm_gram.y
+ 	$(YACC) $(YFLAGS) -b $(<:.y=) $<
+-	mv $(<:.y=).tab.c $(<:.y=.c)
+ 	mv $(<:.y=).tab.h $(<:.y=.h)
+ 
+-aicasm_macro_gram.c aicasm_macro_gram.h: aicasm_macro_gram.y
++aicasm_macro_gram.c: aicasm_macro_gram.h
++	mv $(<:.h=).tab.c $(<:.h=.c)
++
++aicasm_macro_gram.h: aicasm_macro_gram.y
+ 	$(YACC) $(YFLAGS) -b $(<:.y=) -p mm $<
+-	mv $(<:.y=).tab.c $(<:.y=.c)
+ 	mv $(<:.y=).tab.h $(<:.y=.h)
+ 
+ aicasm_scan.c: aicasm_scan.l
+--- linux-2.6.0-test6/drivers/scsi/aic7xxx/Makefile	2003-06-14 12:18:48.000000000 -0700
++++ 25/drivers/scsi/aic7xxx/Makefile	2003-10-05 00:34:29.000000000 -0700
+@@ -58,7 +58,9 @@ aicasm-7xxx-opts-$(CONFIG_AIC7XXX_REG_PR
+ 	-p $(obj)/aic7xxx_reg_print.c -i aic7xxx_osm.h
+ 
+ ifeq ($(CONFIG_AIC7XXX_BUILD_FIRMWARE),y)
+-$(aic7xxx-gen-y): $(src)/aic7xxx.seq $(src)/aic7xxx.reg $(obj)/aicasm/aicasm
++$(aic7xxx-gen-y): $(src)/aic7xxx.seq
++
++$(src)/aic7xxx.seq: $(obj)/aicasm/aicasm $(src)/aic7xxx.reg
+ 	$(obj)/aicasm/aicasm -I$(src) -r $(obj)/aic7xxx_reg.h \
+ 			      $(aicasm-7xxx-opts-y) -o $(obj)/aic7xxx_seq.h \
+ 			      $(src)/aic7xxx.seq
+@@ -72,7 +74,9 @@ aicasm-79xx-opts-$(CONFIG_AIC79XX_REG_PR
+ 	-p $(obj)/aic79xx_reg_print.c -i aic79xx_osm.h
+ 
+ ifeq ($(CONFIG_AIC79XX_BUILD_FIRMWARE),y)
+-$(aic79xx-gen-y): $(src)/aic79xx.seq $(src)/aic79xx.reg $(obj)/aicasm/aicasm
++$(aic79xx-gen-y): $(src)/aic79xx.seq
++
++$(src)/aic79xx.seq: $(obj)/aicasm/aicasm $(src)/aic79xx.reg
+ 	$(obj)/aicasm/aicasm -I$(src) -r $(obj)/aic79xx_reg.h \
+ 			      $(aicasm-79xx-opts-y) -o $(obj)/aic79xx_seq.h \
+ 			      $(src)/aic79xx.seq
+--- linux-2.6.0-test6/drivers/scsi/aic7xxx_old/aic7xxx_proc.c	2003-06-14 12:18:33.000000000 -0700
++++ 25/drivers/scsi/aic7xxx_old/aic7xxx_proc.c	2003-10-05 00:36:51.000000000 -0700
+@@ -92,7 +92,7 @@ aic7xxx_proc_info ( struct Scsi_Host *HB
+ 
+   HBAptr = NULL;
+ 
+-  for(p=first_aic7xxx; p->host != HBAptr; p=p->next)
++  for(p=first_aic7xxx; p && p->host != HBAptr; p=p->next)
+     ;
+ 
+   if (!p)
+--- linux-2.6.0-test6/drivers/scsi/g_NCR5380.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/scsi/g_NCR5380.c	2003-10-05 00:33:24.000000000 -0700
+@@ -527,8 +527,9 @@ int generic_NCR5380_release_resources(st
+  *	Locks: none
+  */
+ 
+-int generic_NCR5380_biosparam(struct scsi_device *sdev,
+-		struct block_device *bdev, sector_t capacity, int *ip)
++static int
++generic_NCR5380_biosparam(struct scsi_device *sdev, struct block_device *bdev,
++			  sector_t capacity, int *ip)
+ {
+ 	ip[0] = 64;
+ 	ip[1] = 32;
+--- linux-2.6.0-test6/drivers/scsi/g_NCR5380.h	2003-06-14 12:17:56.000000000 -0700
++++ 25/drivers/scsi/g_NCR5380.h	2003-10-05 00:33:24.000000000 -0700
+@@ -52,7 +52,6 @@ static int generic_NCR5380_bus_reset(Scs
+ static int generic_NCR5380_host_reset(Scsi_Cmnd *);
+ static int generic_NCR5380_device_reset(Scsi_Cmnd *);
+ static const char* generic_NCR5380_info(struct Scsi_Host *);
+-static int generic_NCR5380_biosparam(struct scsi_device *, struct block_device *, sector_t, int *);
+ 
+ #ifndef CMD_PER_LUN
+ #define CMD_PER_LUN 2
+--- linux-2.6.0-test6/drivers/scsi/gvp11.c	2003-07-27 12:14:39.000000000 -0700
++++ 25/drivers/scsi/gvp11.c	2003-10-05 00:33:24.000000000 -0700
+@@ -25,29 +25,20 @@
+ #define DMA(ptr) ((gvp11_scsiregs *)((ptr)->base))
+ #define HDATA(ptr) ((struct WD33C93_hostdata *)((ptr)->hostdata))
+ 
+-static struct Scsi_Host *first_instance = NULL;
+-static Scsi_Host_Template *gvp11_template;
+-
+-static irqreturn_t gvp11_intr (int irq, void *dummy, struct pt_regs *fp)
++static irqreturn_t gvp11_intr (int irq, void *_instance, struct pt_regs *fp)
+ {
+     unsigned long flags;
+     unsigned int status;
+-    struct Scsi_Host *instance;
+-    int handled = 0;
+-
+-    for (instance = first_instance; instance &&
+-	 instance->hostt == gvp11_template; instance = instance->next)
+-    {
+-	status = DMA(instance)->CNTR;
+-	if (!(status & GVP11_DMAC_INT_PENDING))
+-	    continue;
++    struct Scsi_Host *instance = (struct Scsi_Host *)_instance;
+ 
+-	spin_lock_irqsave(instance->host_lock, flags);
+-	wd33c93_intr (instance);
+-	spin_unlock_irqrestore(instance->host_lock, flags);
+-	handled = 1;
+-    }
+-    return IRQ_RETVAL(handled);
++    status = DMA(instance)->CNTR;
++    if (!(status & GVP11_DMAC_INT_PENDING))
++	return IRQ_NONE;
++
++    spin_lock_irqsave(instance->host_lock, flags);
++    wd33c93_intr(instance);
++    spin_unlock_irqrestore(instance->host_lock, flags);
++    return IRQ_HANDLED;
+ }
+ 
+ static int gvp11_xfer_mask = 0;
+@@ -177,8 +168,6 @@ static void dma_stop (struct Scsi_Host *
+     }
+ }
+ 
+-static int num_gvp11 = 0;
+-
+ #define CHECK_WD33C93
+ 
+ int __init gvp11_detect(Scsi_Host_Template *tpnt)
+@@ -190,6 +179,7 @@ int __init gvp11_detect(Scsi_Host_Templa
+     struct zorro_dev *z = NULL;
+     unsigned int default_dma_xfer_mask;
+     wd33c93_regs regs;
++    int num_gvp11 = 0;
+ #ifdef CHECK_WD33C93
+     volatile unsigned char *sasr_3393, *scmd_3393;
+     unsigned char save_sasr;
+@@ -339,13 +329,10 @@ int __init gvp11_detect(Scsi_Host_Templa
+ 		     (epc & GVP_SCSICLKMASK) ? WD33C93_FS_8_10
+ 					     : WD33C93_FS_12_15);
+ 
+-	if (num_gvp11++ == 0) {
+-		first_instance = instance;
+-		gvp11_template = instance->hostt;
+-		request_irq(IRQ_AMIGA_PORTS, gvp11_intr, SA_SHIRQ,
+-			    "GVP11 SCSI", gvp11_intr);
+-	}
++	request_irq(IRQ_AMIGA_PORTS, gvp11_intr, SA_SHIRQ, "GVP11 SCSI",
++		    instance);
+ 	DMA(instance)->CNTR = GVP11_DMAC_INT_ENABLE;
++	num_gvp11++;
+ 	continue;
+ 
+ release:
+@@ -391,8 +378,7 @@ int gvp11_release(struct Scsi_Host *inst
+ #ifdef MODULE
+     DMA(instance)->CNTR = 0;
+     release_mem_region(ZTWO_PADDR(instance->base), 256);
+-    if (--num_gvp11 == 0)
+-	    free_irq(IRQ_AMIGA_PORTS, gvp11_intr);
++    free_irq(IRQ_AMIGA_PORTS, instance);
+     wd33c93_release();
+ #endif
+     return 1;
+--- linux-2.6.0-test6/drivers/scsi/ide-scsi.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/scsi/ide-scsi.c	2003-10-05 00:34:01.000000000 -0700
+@@ -635,24 +635,23 @@ static ide_driver_t idescsi_driver = {
+ 	.drives			= LIST_HEAD_INIT(idescsi_driver.drives),
+ };
+ 
+-static int idescsi_ide_open(struct inode *inode, struct file *filp)
++static int idescsi_ide_open(struct block_device *bdev, struct file *filp)
+ {
+-	ide_drive_t *drive = inode->i_bdev->bd_disk->private_data;
++	ide_drive_t *drive = bdev->bd_disk->private_data;
+ 	drive->usage++;
+ 	return 0;
+ }
+ 
+-static int idescsi_ide_release(struct inode *inode, struct file *filp)
++static int idescsi_ide_release(struct gendisk *disk)
+ {
+-	ide_drive_t *drive = inode->i_bdev->bd_disk->private_data;
++	ide_drive_t *drive = disk->private_data;
+ 	drive->usage--;
+ 	return 0;
+ }
+ 
+-static int idescsi_ide_ioctl(struct inode *inode, struct file *file,
++static int idescsi_ide_ioctl(struct block_device *bdev, struct file *file,
+ 			unsigned int cmd, unsigned long arg)
+ {
+-	struct block_device *bdev = inode->i_bdev;
+ 	return generic_ide_ioctl(bdev, cmd, arg);
+ }
+ 
+--- linux-2.6.0-test6/drivers/scsi/Kconfig	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/scsi/Kconfig	2003-10-05 00:36:26.000000000 -0700
+@@ -55,6 +55,14 @@ config BLK_DEV_SD
+ 	  In this case, do not compile the driver for your SCSI host adapter
+ 	  (below) as a module either.
+ 
++config MAX_SD_DISKS
++	int "Maximum number of SCSI disks to support (256-8192)"
++	depends on BLK_DEV_SD
++	default "256"
++	help
++	The maximum number SCSI disks to support. Default is 256.
++	Change this value if you want kernel to support lots of SCSI devices.
++
+ config CHR_DEV_ST
+ 	tristate "SCSI tape support"
+ 	depends on SCSI
+@@ -1148,16 +1156,6 @@ config SCSI_QLOGIC_1280
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called qla1280.
+ 
+-config SCSI_QLOGIC_1280_PIO
+-	bool "Use PIO instead of MMIO" if !X86_VISWS
+-	depends on SCSI_QLOGIC_1280
+-	default y if X86_VISWS
+-	help
+-	  This instructs the driver to use programmed I/O ports (PIO) instead
+-	  of PCI shared memory (MMIO).  This can possibly solve some problems
+-	  in case your mainboard has memory consistency issues.  If unsure,
+-	  say N.
+-
+ config SCSI_QLOGICPTI
+ 	tristate "PTI Qlogic, ISP Driver"
+ 	depends on SBUS && SCSI
+@@ -1435,7 +1433,7 @@ config A3000_SCSI
+ 
+ config A4000T_SCSI
+ 	bool "A4000T SCSI support (EXPERIMENTAL)"
+-	depends on AMIGA && SCSI && EXPERIMENTAL
++	depends on AMIGA && SCSI && EXPERIMENTAL && BROKEN
+ 	help
+ 	  Support for the NCR53C710 SCSI controller on the Amiga 4000T.
+ 
+@@ -1503,7 +1501,7 @@ config FASTLANE_SCSI
+ 
+ config A4091_SCSI
+ 	bool "A4091 SCSI support (EXPERIMENTAL)"
+-	depends on ZORRO && SCSI && EXPERIMENTAL
++	depends on ZORRO && SCSI && EXPERIMENTAL && BROKEN
+ 	help
+ 	  Support for the NCR53C710 chip on the Amiga 4091 Z3 SCSI2 controller
+ 	  (1993).  Very obscure -- the 4091 was part of an Amiga 4000 upgrade
+@@ -1511,7 +1509,7 @@ config A4091_SCSI
+ 
+ config WARPENGINE_SCSI
+ 	bool "WarpEngine SCSI support (EXPERIMENTAL)"
+-	depends on ZORRO && SCSI && EXPERIMENTAL
++	depends on ZORRO && SCSI && EXPERIMENTAL && BROKEN
+ 	help
+ 	  Support for MacroSystem Development's WarpEngine Amiga SCSI-2
+ 	  controller. Info at
+@@ -1519,7 +1517,7 @@ config WARPENGINE_SCSI
+ 
+ config BLZ603EPLUS_SCSI
+ 	bool "Blizzard PowerUP 603e+ SCSI (EXPERIMENTAL)"
+-	depends on ZORRO && SCSI && EXPERIMENTAL
++	depends on ZORRO && SCSI && EXPERIMENTAL && BROKEN
+ 	help
+ 	  If you have an Amiga 1200 with a Phase5 Blizzard PowerUP 603e+
+ 	  accelerator, say Y. Otherwise, say N.
+@@ -1535,7 +1533,7 @@ config OKTAGON_SCSI
+ 
+ config ATARI_SCSI
+ 	tristate "Atari native SCSI support"
+-	depends on ATARI && SCSI
++	depends on ATARI && SCSI && BROKEN
+ 	---help---
+ 	  If you have an Atari with built-in NCR5380 SCSI controller (TT,
+ 	  Falcon, ...) say Y to get it supported. Of course also, if you have
+@@ -1604,7 +1602,7 @@ config MVME147_SCSI
+ 
+ config MVME16x_SCSI
+ 	bool "NCR53C710 SCSI driver for MVME16x"
+-	depends on MVME16x && SCSI
++	depends on MVME16x && SCSI && BROKEN
+ 	help
+ 	  The Motorola MVME162, 166, 167, 172 and 177 boards use the NCR53C710
+ 	  SCSI controller chip.  Almost everyone using one of these boards
+@@ -1612,7 +1610,7 @@ config MVME16x_SCSI
+ 
+ config BVME6000_SCSI
+ 	bool "NCR53C710 SCSI driver for BVME6000"
+-	depends on BVME6000 && SCSI
++	depends on BVME6000 && SCSI && BROKEN
+ 	help
+ 	  The BVME4000 and BVME6000 boards from BVM Ltd use the NCR53C710
+ 	  SCSI controller chip.  Almost everyone using one of these boards
+--- linux-2.6.0-test6/drivers/scsi/megaraid.c	2003-09-08 13:58:58.000000000 -0700
++++ 25/drivers/scsi/megaraid.c	2003-10-05 00:33:24.000000000 -0700
+@@ -586,7 +586,7 @@ mega_find_card(Scsi_Host_Template *host_
+ 
+ 		/* Set the Mode of addressing to 64 bit if we can */
+ 		if((adapter->flag & BOARD_64BIT)&&(sizeof(dma_addr_t) == 8)) {
+-			pci_set_dma_mask(pdev, 0xffffffffffffffff);
++			pci_set_dma_mask(pdev, 0xffffffffffffffffULL);
+ 			adapter->has_64bit_addr = 1;
+ 		}
+ 		else  {
+--- linux-2.6.0-test6/drivers/scsi/ncr53c8xx.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/scsi/ncr53c8xx.c	2003-10-05 00:33:24.000000000 -0700
+@@ -7757,7 +7757,7 @@ static void ncr_init_ccb(ncb_p np, ccb_p
+ 	cp->start.schedule.l_cmd = cpu_to_scr(SCR_JUMP);
+ 	cp->start.p_phys	 = cpu_to_scr(CCB_PHYS(cp, phys));
+ 
+-	bcopy(&cp->start, &cp->restart, sizeof(cp->restart));
++	memcpy(&cp->restart, &cp->start, sizeof(cp->restart));
+ 
+ 	cp->start.schedule.l_paddr   = cpu_to_scr(NCB_SCRIPT_PHYS (np, idle));
+ 	cp->restart.schedule.l_paddr = cpu_to_scr(NCB_SCRIPTH_PHYS (np, abort));
+--- linux-2.6.0-test6/drivers/scsi/nsp32.c	2003-09-08 13:58:58.000000000 -0700
++++ 25/drivers/scsi/nsp32.c	2003-10-05 00:33:24.000000000 -0700
+@@ -3435,15 +3435,6 @@ static inline int nsp32_prom_get(nsp32_h
+  * Power Management
+  */
+ #ifdef CONFIG_PM
+-/* Save Device Context */
+-static int nsp32_save_state(struct pci_dev *pdev, u32 state)
+-{
+-	struct Scsi_Host *host = pci_get_drvdata(pdev);
+-
+-	nsp32_msg(KERN_INFO, "pci-save_state: stub, pdev=0x%p, state=%ld, slot=%s, host=0x%p", pdev, state, pci_name(pdev), host);
+-
+-	return 0;
+-}
+ 
+ /* Device suspended */
+ static int nsp32_suspend(struct pci_dev *pdev, u32 state)
+@@ -3573,7 +3564,6 @@ static struct pci_driver nsp32_driver = 
+ 	.probe		= nsp32_probe,
+ 	.remove		= __devexit_p(nsp32_remove),
+ #ifdef CONFIG_PM
+-	.save_state     = nsp32_save_state,
+ 	.suspend	= nsp32_suspend, 
+ 	.resume		= nsp32_resume, 
+ 	.enable_wake    = nsp32_enable_wake,
+--- linux-2.6.0-test6/drivers/scsi/qla1280.c	2003-09-27 18:57:45.000000000 -0700
++++ 25/drivers/scsi/qla1280.c	2003-10-05 00:33:24.000000000 -0700
+@@ -16,10 +16,15 @@
+ * General Public License for more details.
+ *
+ ******************************************************************************/
+-#define QLA1280_VERSION      "3.23.36"
++#define QLA1280_VERSION      "3.23.37"
+ /*****************************************************************************
+     Revision History:
+-    Rev  3.23.36 September 19, 2003, Christoph Hellwig
++    Rev  3.23.37 October 1, 2003, Jes Sorensen
++	- Make MMIO depend on CONFIG_X86_VISWS instead of yet another
++	  random CONFIG option
++	- Clean up locking in probe path
++    Rev  3.23.36 October 1, 2003, Christoph Hellwig
++	- queuecommand only ever receives new commands - clear flags
+ 	- Reintegrate lost fixes from Linux 2.5
+     Rev  3.23.35 August 14, 2003, Jes Sorensen
+ 	- Build against 2.6
+@@ -315,14 +320,14 @@
+ 
+ #if LINUX_VERSION_CODE >= 0x020545
+ #include <scsi/scsi_host.h>
++#include "scsi.h"
+ #else
+ #include <linux/blk.h>
++#include "scsi.h"
+ #include "hosts.h"
+ #include "sd.h"
+ #endif
+ 
+-#include "scsi.h"
+-
+ #if LINUX_VERSION_CODE < 0x020407
+ #error "Kernels older than 2.4.7 are no longer supported"
+ #endif
+@@ -339,7 +344,10 @@
+ #define  DEBUG_PRINT_NVRAM	0
+ #define  DEBUG_QLA1280		0
+ 
+-#ifdef	CONFIG_SCSI_QLOGIC_1280_PIO
++/*
++ * The SGI VISWS is broken and doesn't support MMIO ;-(
++ */
++#ifdef CONFIG_X86_VISWS
+ #define	MEMORY_MAPPED_IO	0
+ #else
+ #define	MEMORY_MAPPED_IO	1
+@@ -414,6 +422,11 @@ scsi_adjust_queue_depth(Scsi_Device *dev
+ #else
+ #define HOST_LOCK			ha->host->host_lock
+ #endif
++#if LINUX_VERSION_CODE < 0x020600
++#define DEV_SIMPLE_TAGS(device)		device->tagged_queue
++#else
++#define DEV_SIMPLE_TAGS(device)		device->simple_tags
++#endif
+ #if defined(__ia64__) && !defined(ia64_platform_is)
+ #define ia64_platform_is(foo)		(!strcmp(x, platform_name))
+ #endif
+@@ -647,11 +660,11 @@ static int ql_debug_level = 1;
+ #define	PROC_BUF	&qla1280_buffer[len]
+ 
+ #if LINUX_VERSION_CODE < 0x020600
+-static int qla1280_proc_info(char *buffer, char **start, off_t offset, int length,
+-		      int hostno, int inout)
++static int qla1280_proc_info(char *buffer, char **start, off_t offset,
++			     int length, int hostno, int inout)
+ #else
+-static int qla1280_proc_info(struct Scsi_Host *host, char *buffer, char **start,
+-		      off_t offset, int length, int inout)
++static int qla1280_proc_info(struct Scsi_Host *host, char *buffer,
++			     char **start, off_t offset, int length, int inout)
+ #endif
+ {
+ 	struct scsi_qla_host *ha;
+@@ -955,8 +968,8 @@ qla1280_do_device_init(struct pci_dev *p
+ 		       host->io_port, host->io_port + 0xff);
+ 		goto error_free_irq;
+ 	}
+-
+ #endif
++
+ 	/* load the F/W, read paramaters, and init the H/W */
+ 	if (qla1280_initialize_adapter(ha)) {
+ 		printk(KERN_INFO "qla1x160: Failed to initialize adapter\n");
+@@ -1598,6 +1611,7 @@ qla1280_intr_handler(int irq, void *dev_
+ 	return IRQ_RETVAL(handled);
+ }
+ 
++
+ static int
+ qla12160_set_target_parameters(struct scsi_qla_host *ha, int bus, int target)
+ {
+@@ -1666,9 +1680,7 @@ qla1280_slave_configure(Scsi_Device *dev
+ 	int target = device->id;
+ 	int status = 0;
+ 	struct nvram *nv;
+-#if LINUX_VERSION_CODE < 0x020500
+ 	unsigned long flags;
+-#endif
+ 
+ 	ha = (struct scsi_qla_host *)device->host->hostdata;
+ 	nv = &ha->nvram;
+@@ -1706,17 +1718,13 @@ qla1280_slave_configure(Scsi_Device *dev
+ 			nv->bus[bus].target[target].ppr_1x160.flags.enable_ppr = 0;
+ 	}
+ 
+-#if LINUX_VERSION_CODE < 0x020500
+ 	spin_lock_irqsave(HOST_LOCK, flags);
+-#endif
+ 	if (nv->bus[bus].target[target].parameter.f.enable_sync) {
+ 		status = qla12160_set_target_parameters(ha, bus, target);
+ 	}
+ 
+ 	qla12160_get_target_parameters(ha, device);
+-#if LINUX_VERSION_CODE < 0x020500
+ 	spin_unlock_irqrestore(HOST_LOCK, flags);
+-#endif
+ 	return status;
+ }
+ 
+@@ -1995,7 +2003,7 @@ qla1280_mem_alloc(struct scsi_qla_host *
+ 	if (ha->request_ring)
+ 		pci_free_consistent(ha->pdev,
+                                     ((REQUEST_ENTRY_CNT + 1) *
+-                                     (sizeof(request_t))),
++				     (sizeof(request_t))),
+                                     ha->request_ring, ha->request_dma);
+  finish:
+ 	LEAVE("qla1280_mem_alloc");
+@@ -2088,6 +2096,9 @@ qla1280_initialize_adapter(struct scsi_q
+ 	struct device_reg *reg;
+ 	int status;
+ 	int bus;
++#if LINUX_VERSION_CODE > 0x020500
++	unsigned long flags;
++#endif
+ 
+ 	ENTER("qla1280_initialize_adapter");
+ 
+@@ -2131,6 +2142,15 @@ qla1280_initialize_adapter(struct scsi_q
+ 			"NVRAM\n");
+ 	}
+ 
++#if LINUX_VERSION_CODE >= 0x020500
++	/*
++	 * It's necessary to grab the spin here as qla1280_mailbox_command
++	 * needs to be able to drop the lock unconditionally to wait
++	 * for completion.
++	 * In 2.4 ->detect is called with the io_request_lock held.
++	 */
++	spin_lock_irqsave(HOST_LOCK, flags);
++#endif
+ 	/* If firmware needs to be loaded */
+ 	if (qla1280_isp_firmware(ha)) {
+ 		if (!(status = qla1280_chip_diag (ha))) {
+@@ -2183,6 +2203,9 @@ qla1280_initialize_adapter(struct scsi_q
+ 		status = 1;
+ 
+  out:
++#if LINUX_VERSION_CODE >= 0x020500
++	spin_unlock_irqrestore(HOST_LOCK, flags);
++#endif
+ 	if (status)
+ 		dprintk(2, "qla1280_initialize_adapter: **** FAILED ****\n");
+ 
+@@ -3208,18 +3231,14 @@ qla1280_mailbox_command(struct scsi_qla_
+ 	timer.function = qla1280_mailbox_timeout;
+ 	add_timer(&timer);
+ 
+-#if LINUX_VERSION_CODE < 0x020500
+ 	spin_unlock_irq(HOST_LOCK);
+-#endif
+ 	WRT_REG_WORD(&reg->host_cmd, HC_SET_HOST_INT);
+ 	data = qla1280_debounce_register(&reg->istatus);
+ 
+ 	wait_for_completion(&wait);
+ 	del_timer_sync(&timer);
+ 
+-#if LINUX_VERSION_CODE < 0x020500
+ 	spin_lock_irq(HOST_LOCK);
+-#endif
+ 
+ 	ha->mailbox_wait = NULL;
+ 
+@@ -3636,7 +3655,7 @@ qla1280_64bit_start_scsi(struct scsi_qla
+ 		(SCSI_TCN_32(cmd) | BIT_7) : SCSI_TCN_32(cmd);
+ 
+ 	/* Enable simple tag queuing if device supports it. */
+-	if (cmd->device->simple_tags)
++	if (DEV_SIMPLE_TAGS(cmd->device))
+ 		pkt->control_flags |= cpu_to_le16(BIT_3);
+ 
+ 	/* Load SCSI command packet. */
+@@ -3936,7 +3955,7 @@ qla1280_32bit_start_scsi(struct scsi_qla
+ 		(SCSI_TCN_32(cmd) | BIT_7) : SCSI_TCN_32(cmd);
+ 
+ 	/* Enable simple tag queuing if device supports it. */
+-	if (cmd->device->simple_tags)
++	if (DEV_SIMPLE_TAGS(cmd->device))
+ 		pkt->control_flags |= cpu_to_le16(BIT_3);
+ 
+ 	/* Load SCSI command packet. */
+@@ -4823,6 +4842,7 @@ qla1280_debounce_register(volatile u16 *
+ 	return ret;
+ }
+ 
++
+ /************************************************************************
+  * qla1280_check_for_dead_scsi_bus                                      *
+  *                                                                      *
+@@ -4891,7 +4911,7 @@ qla12160_get_target_parameters(struct sc
+ 	} else
+ 		printk(" Async");
+ 
+-	if (device->simple_tags)
++	if (DEV_SIMPLE_TAGS(device))
+ 		printk(", Tagged queuing: depth %d", device->queue_depth);
+ 	printk("\n");
+ }
+@@ -5105,6 +5125,7 @@ qla1280_get_token(char *str)
+ 	return ret;
+ }
+ 
++
+ static Scsi_Host_Template driver_template = {
+ 	.proc_info		= qla1280_proc_info,
+ 	.name			= "Qlogic ISP 1280/12160",
+@@ -5132,6 +5153,7 @@ static Scsi_Host_Template driver_templat
+ 
+ #include "scsi_module.c"
+ 
++
+ /*
+  * Overrides for Emacs so that we almost follow Linus's tabbing style.
+  * Emacs will notice this stuff at the end of the file and automatically
+--- linux-2.6.0-test6/drivers/scsi/qlogicfc.c	2003-08-22 19:23:41.000000000 -0700
++++ 25/drivers/scsi/qlogicfc.c	2003-10-05 00:33:24.000000000 -0700
+@@ -718,8 +718,8 @@ int isp2x00_detect(Scsi_Host_Template * 
+ 				continue;
+ 
+ 			/* Try to configure DMA attributes. */
+-			if (pci_set_dma_mask(pdev, (u64) 0xffffffffffffffff) &&
+-			    pci_set_dma_mask(pdev, (u64) 0xffffffff))
++			if (pci_set_dma_mask(pdev, 0xffffffffffffffffULL) &&
++			    pci_set_dma_mask(pdev, 0xffffffffULL))
+ 					continue;
+ 
+ 		        host = scsi_register(tmpt, sizeof(struct isp2x00_hostdata));
+--- linux-2.6.0-test6/drivers/scsi/sd.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/drivers/scsi/sd.c	2003-10-05 00:36:26.000000000 -0700
+@@ -62,6 +62,7 @@
+  */
+ #define SD_MAJORS	16
+ #define SD_DISKS	(SD_MAJORS << 4)
++#define TOTAL_SD_DISKS	CONFIG_MAX_SD_DISKS
+ 
+ /*
+  * Time out in seconds for disks and Magneto-opticals (which are slower).
+@@ -87,7 +88,7 @@ struct scsi_disk {
+ 	unsigned	RCD : 1;	/* state of disk RCD bit, unused */
+ };
+ 
+-static unsigned long sd_index_bits[SD_DISKS / BITS_PER_LONG];
++static unsigned long sd_index_bits[TOTAL_SD_DISKS / BITS_PER_LONG];
+ static spinlock_t sd_index_lock = SPIN_LOCK_UNLOCKED;
+ 
+ static int sd_revalidate_disk(struct gendisk *disk);
+@@ -122,6 +123,9 @@ static int sd_major(int major_idx)
+ 		return SCSI_DISK1_MAJOR + major_idx - 1;
+ 	case 8 ... 15:
+ 		return SCSI_DISK8_MAJOR + major_idx - 8;
++#define MAX_IDX        (TOTAL_SD_DISKS >> 4)
++	case 16 ... MAX_IDX:
++		return SCSI_DISK15_MAJOR;
+ 	default:
+ 		BUG();
+ 		return 0;	/* shut up gcc */
+@@ -348,9 +352,9 @@ queue:
+  *	In the latter case @inode and @filp carry an abridged amount
+  *	of information as noted above.
+  **/
+-static int sd_open(struct inode *inode, struct file *filp)
++static int sd_open(struct block_device *bdev, struct file *filp)
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
++	struct gendisk *disk = bdev->bd_disk;
+ 	struct scsi_disk *sdkp = scsi_disk(disk);
+ 	struct scsi_device *sdev = sdkp->device;
+ 	int retval;
+@@ -370,7 +374,7 @@ static int sd_open(struct inode *inode, 
+ 		goto error_out;
+ 
+ 	if (sdev->removable || sdkp->write_prot)
+-		check_disk_change(inode->i_bdev);
++		check_disk_change(bdev);
+ 
+ 	/*
+ 	 * If the drive is empty, just let the open fail.
+@@ -421,9 +425,8 @@ error_out:
+  *	Note: may block (uninterruptible) if error recovery is underway
+  *	on this disk.
+  **/
+-static int sd_release(struct inode *inode, struct file *filp)
++static int sd_release(struct gendisk *disk)
+ {
+-	struct gendisk *disk = inode->i_bdev->bd_disk;
+ 	struct scsi_disk *sdkp = scsi_disk(disk);
+ 	struct scsi_device *sdev = sdkp->device;
+ 
+@@ -486,10 +489,9 @@ static int sd_hdio_getgeo(struct block_d
+  *	Note: most ioctls are forward onto the block subsystem or further
+  *	down in the scsi subsytem.
+  **/
+-static int sd_ioctl(struct inode * inode, struct file * filp, 
++static int sd_ioctl(struct block_device *bdev, struct file *filp, 
+ 		    unsigned int cmd, unsigned long arg)
+ {
+-	struct block_device *bdev = inode->i_bdev;
+ 	struct gendisk *disk = bdev->bd_disk;
+ 	struct scsi_device *sdp = scsi_disk(disk)->device;
+ 	int error;
+@@ -1275,8 +1277,8 @@ static int sd_probe(struct device *dev)
+ 		goto out_free;
+ 
+ 	spin_lock(&sd_index_lock);
+-	index = find_first_zero_bit(sd_index_bits, SD_DISKS);
+-	if (index == SD_DISKS) {
++	index = find_first_zero_bit(sd_index_bits, TOTAL_SD_DISKS);
++	if (index == TOTAL_SD_DISKS) {
+ 		spin_unlock(&sd_index_lock);
+ 		error = -EBUSY;
+ 		goto out_put;
+@@ -1291,15 +1293,24 @@ static int sd_probe(struct device *dev)
+ 	sdkp->openers = 0;
+ 
+ 	gd->major = sd_major(index >> 4);
+-	gd->first_minor = (index & 15) << 4;
++	if (index > SD_DISKS)
++		gd->first_minor = ((index - SD_DISKS) & 15) << 4;
++	else
++		gd->first_minor = (index & 15) << 4;
+ 	gd->minors = 16;
+ 	gd->fops = &sd_fops;
+ 
+-	if (index >= 26) {
++	if (index < 26) {
++		sprintf(gd->disk_name, "sd%c", 'a' + index % 26);
++	} else if (index < (26*27)) {
+ 		sprintf(gd->disk_name, "sd%c%c",
+ 			'a' + index/26-1,'a' + index % 26);
+ 	} else {
+-		sprintf(gd->disk_name, "sd%c", 'a' + index % 26);
++		const unsigned int m1 = (index/ 26 - 1) / 26 - 1;
++		const unsigned int m2 = (index / 26 - 1) % 26;
++		const unsigned int m3 = index % 26;
++		sprintf(gd->disk_name, "sd%c%c%c",
++			'a' + m1, 'a' + m2, 'a' + m3);
+ 	}
+ 
+ 	strcpy(gd->devfs_name, sdp->devfs_name);
+--- linux-2.6.0-test6/drivers/scsi/sr.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/drivers/scsi/sr.c	2003-10-05 00:34:45.000000000 -0700
+@@ -289,12 +289,12 @@ static int sr_init_command(struct scsi_c
+ 			return 0;
+ 
+ 		memcpy(SCpnt->cmnd, rq->cmd, sizeof(SCpnt->cmnd));
+-		if (rq_data_dir(rq) == WRITE)
++		if (!rq->data_len)
++			SCpnt->sc_data_direction = SCSI_DATA_NONE;
++		else if (rq_data_dir(rq) == WRITE)
+ 			SCpnt->sc_data_direction = SCSI_DATA_WRITE;
+-		else if (rq->data_len)
+-			SCpnt->sc_data_direction = SCSI_DATA_READ;
+ 		else
+-			SCpnt->sc_data_direction = SCSI_DATA_NONE;
++			SCpnt->sc_data_direction = SCSI_DATA_READ;
+ 
+ 		this_count = rq->data_len;
+ 		if (rq->timeout)
+@@ -413,22 +413,22 @@ queue:
+ 	return 1;
+ }
+ 
+-static int sr_block_open(struct inode *inode, struct file *file)
++static int sr_block_open(struct block_device *bdev, struct file *file)
+ {
+-	struct scsi_cd *cd = scsi_cd(inode->i_bdev->bd_disk);
+-	return cdrom_open(&cd->cdi, inode, file);
++	struct scsi_cd *cd = scsi_cd(bdev->bd_disk);
++	return cdrom_open(&cd->cdi, bdev, file);
+ }
+ 
+-static int sr_block_release(struct inode *inode, struct file *file)
++static int sr_block_release(struct gendisk *disk)
+ {
+-	struct scsi_cd *cd = scsi_cd(inode->i_bdev->bd_disk);
+-	return cdrom_release(&cd->cdi, file);
++	struct scsi_cd *cd = scsi_cd(disk);
++	return cdrom_release(&cd->cdi);
+ }
+ 
+-static int sr_block_ioctl(struct inode *inode, struct file *file, unsigned cmd,
+-			  unsigned long arg)
++static int sr_block_ioctl(struct block_device *bdev, struct file *file,
++			  unsigned cmd, unsigned long arg)
+ {
+-	struct scsi_cd *cd = scsi_cd(inode->i_bdev->bd_disk);
++	struct scsi_cd *cd = scsi_cd(bdev->bd_disk);
+ 	struct scsi_device *sdev = cd->device;
+ 
+         /*
+@@ -440,7 +440,7 @@ static int sr_block_ioctl(struct inode *
+                 case SCSI_IOCTL_GET_BUS_NUMBER:
+                         return scsi_ioctl(sdev, cmd, (void *)arg);
+ 	}
+-	return cdrom_ioctl(&cd->cdi, inode, cmd, arg);
++	return cdrom_ioctl(&cd->cdi, bdev, cmd, arg);
+ }
+ 
+ static int sr_block_media_changed(struct gendisk *disk)
+--- linux-2.6.0-test6/drivers/scsi/sun3_scsi.c	2003-07-27 12:14:40.000000000 -0700
++++ 25/drivers/scsi/sun3_scsi.c	2003-10-05 00:33:24.000000000 -0700
+@@ -308,7 +308,6 @@ int sun3scsi_detect(Scsi_Host_Template *
+ 	return 1;
+ }
+ 
+-#ifdef MODULE
+ int sun3scsi_release (struct Scsi_Host *shpnt)
+ {
+ 	if (shpnt->irq != SCSI_IRQ_NONE)
+@@ -318,7 +317,6 @@ int sun3scsi_release (struct Scsi_Host *
+ 
+ 	return 0;
+ }
+-#endif
+ 
+ #ifdef RESET_BOOT
+ /*
+--- linux-2.6.0-test6/drivers/scsi/sun3_scsi.h	2003-09-08 13:58:58.000000000 -0700
++++ 25/drivers/scsi/sun3_scsi.h	2003-10-05 00:33:24.000000000 -0700
+@@ -52,11 +52,7 @@ static int sun3scsi_detect (Scsi_Host_Te
+ static const char *sun3scsi_info (struct Scsi_Host *);
+ static int sun3scsi_bus_reset(Scsi_Cmnd *);
+ static int sun3scsi_queue_command (Scsi_Cmnd *, void (*done)(Scsi_Cmnd *));
+-#ifdef MODULE
+ static int sun3scsi_release (struct Scsi_Host *);
+-#else
+-#define sun3scsi_release NULL
+-#endif
+ 
+ #ifndef CMD_PER_LUN
+ #define CMD_PER_LUN 2
+--- linux-2.6.0-test6/drivers/scsi/sun3_scsi_vme.c	2003-07-27 12:14:40.000000000 -0700
++++ 25/drivers/scsi/sun3_scsi_vme.c	2003-10-05 00:33:24.000000000 -0700
+@@ -140,7 +140,7 @@ static struct Scsi_Host *default_instanc
+  
+ static int sun3scsi_detect(Scsi_Host_Template * tpnt)
+ {
+-	unsigned long ioaddr, irq;
++	unsigned long ioaddr, irq = 0;
+ 	static int called = 0;
+ 	struct Scsi_Host *instance;
+ 	int i;
+@@ -277,17 +277,15 @@ static int sun3scsi_detect(Scsi_Host_Tem
+ 	return 1;
+ }
+ 
+-#ifdef MODULE
+ int sun3scsi_release (struct Scsi_Host *shpnt)
+ {
+ 	if (shpnt->irq != SCSI_IRQ_NONE)
+ 		free_irq (shpnt->irq, NULL);
+ 
+-	iounmap(sun3_scsi_regp);
++	iounmap((void *)sun3_scsi_regp);
+ 
+ 	return 0;
+ }
+-#endif
+ 
+ #ifdef RESET_BOOT
+ /*
+--- linux-2.6.0-test6/drivers/scsi/sym53c8xx_2/sym_glue.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/drivers/scsi/sym53c8xx_2/sym_glue.c	2003-10-05 00:34:19.000000000 -0700
+@@ -2159,8 +2159,7 @@ sym53c8xx_pci_init(struct pci_dev *pdev,
+ 
+ 	/* If the chip can do Memory Write Invalidate, enable it */
+ 	if (chip->features & FE_WRIE) {
+-		if (pci_set_mwi(pdev))
+-			return -1;
++		pci_set_mwi(pdev);
+ 	}
+ 
+ 	/*
+--- linux-2.6.0-test6/drivers/scsi/sym53c8xx_2/sym_glue.h	2003-09-27 18:57:46.000000000 -0700
++++ 25/drivers/scsi/sym53c8xx_2/sym_glue.h	2003-10-05 00:33:24.000000000 -0700
+@@ -70,10 +70,6 @@
+ #include <scsi/scsi_host.h>
+ #include "../scsi.h"		/* XXX: DID_* */
+ 
+-#ifndef bcopy
+-#define bcopy(s, d, n)	memcpy((d), (s), (n))
+-#endif
+-
+ #ifndef bzero
+ #define bzero(d, n)	memset((d), 0, (n))
+ #endif
+--- linux-2.6.0-test6/drivers/scsi/sym53c8xx_2/sym_hipd.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/drivers/scsi/sym53c8xx_2/sym_hipd.c	2003-10-05 00:34:20.000000000 -0700
+@@ -838,7 +838,8 @@ static int sym_prepare_setting(hcb_p np,
+ 
+ 	period = parisc_setup_hcb(np, period);
+ 
+-	if	(period <= 250)		np->minsync = 10;
++	if	(period == 250)		np->minsync = 9;
++	else if	(period <= 250)		np->minsync = 10;
+ 	else if	(period <= 303)		np->minsync = 11;
+ 	else if	(period <= 500)		np->minsync = 12;
+ 	else				np->minsync = (period + 40 - 1) / 40;
+@@ -5889,9 +5890,9 @@ int sym_hcb_attach(hcb_p np, struct sym_
+ 	/*
+ 	 *  Copy scripts to controller instance.
+ 	 */
+-	bcopy(fw->a_base, np->scripta0, np->scripta_sz);
+-	bcopy(fw->b_base, np->scriptb0, np->scriptb_sz);
+-	bcopy(fw->z_base, np->scriptz0, np->scriptz_sz);
++	memcpy(np->scripta0, fw->a_base, np->scripta_sz);
++	memcpy(np->scriptb0, fw->b_base, np->scriptb_sz);
++	memcpy(np->scriptz0, fw->z_base, np->scriptz_sz);
+ 
+ 	/*
+ 	 *  Setup variable parts in scripts and compute
+--- linux-2.6.0-test6/drivers/scsi/sym53c8xx_2/sym_misc.c	2003-06-14 12:18:32.000000000 -0700
++++ 25/drivers/scsi/sym53c8xx_2/sym_misc.c	2003-10-05 00:33:24.000000000 -0700
+@@ -225,7 +225,7 @@ void sym_announce_transfer_rate(hcb_p np
+  */
+ void sym_update_trans_settings(hcb_p np, tcb_p tp)
+ {
+-	bcopy(&tp->tinfo.user, &tp->tinfo.goal, sizeof(tp->tinfo.goal));
++	memcpy(&tp->tinfo.goal, &tp->tinfo.user, sizeof(tp->tinfo.goal));
+ 
+ 	if (tp->inq_version >= 4) {
+ 		switch(tp->inq_byte56 & INQ56_CLOCKING) {
+--- linux-2.6.0-test6/drivers/scsi/sym53c8xx_comm.h	2003-09-27 18:57:46.000000000 -0700
++++ 25/drivers/scsi/sym53c8xx_comm.h	2003-10-05 00:33:24.000000000 -0700
+@@ -88,10 +88,6 @@
+ #define u_int		unsigned int
+ #define u_long		unsigned long
+ 
+-#ifndef bcopy
+-#define bcopy(s, d, n)	memcpy((d), (s), (n))
+-#endif
+-
+ #ifndef bcmp
+ #define bcmp(s, d, n)	memcmp((d), (s), (n))
+ #endif
+--- linux-2.6.0-test6/drivers/serial/8250.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/drivers/serial/8250.c	2003-10-05 00:36:10.000000000 -0700
+@@ -469,8 +469,14 @@ static void autoconfig_16550a(struct uar
+ 	 */
+ 	serial_outp(up, UART_LCR, UART_LCR_DLAB);
+ 	if (serial_in(up, UART_EFR) == 0) {
+-		DEBUG_AUTOCONF("EFRv1 ");
+-		up->port.type = PORT_16650;
++		serial_outp(up, UART_EFR, 0xA8);
++		if (serial_in(up, UART_EFR) != 0) {
++			DEBUG_AUTOCONF("EFRv1 ");
++			up->port.type = PORT_16650;
++		} else {
++			DEBUG_AUTOCONF("Motorola 8xxx DUART ");
++		}
++		serial_outp(up, UART_EFR, 0);
+ 		return;
+ 	}
+ 
+@@ -490,7 +496,9 @@ static void autoconfig_16550a(struct uar
+ 	 * Attempt to switch to bank 2, read the value of the LOOP bit
+ 	 * from EXCR1. Switch back to bank 0, change it in MCR. Then
+ 	 * switch back to bank 2, read it from EXCR1 again and check
+-	 * it's changed. If so, set baud_base in EXCR2 to 921600.
++	 * it's changed. If so, set baud_base in EXCR2 to 921600. -- dwmw2
++	 * On PowerPC we don't want to change baud_base, as we have
++	 * a number of different divisors.  -- Tom Rini
+ 	 */
+ 	serial_outp(up, UART_LCR, 0);
+ 	status1 = serial_in(up, UART_MCR);
+@@ -506,12 +514,14 @@ static void autoconfig_16550a(struct uar
+ 		serial_outp(up, UART_MCR, status1);
+ 
+ 		if ((status2 ^ status1) & UART_MCR_LOOP) {
++#ifndef CONFIG_PPC
+ 			serial_outp(up, UART_LCR, 0xE0);
+ 			status1 = serial_in(up, 0x04); /* EXCR1 */
+ 			status1 &= ~0xB0; /* Disable LOCK, mask out PRESL[01] */
+ 			status1 |= 0x10;  /* 1.625 divisor for baud_base --> 921600 */
+ 			serial_outp(up, 0x04, status1);
+ 			serial_outp(up, UART_LCR, 0);
++#endif
+ 
+ 			up->port.type = PORT_NS16550A;
+ 			up->port.uartclk = 921600*16;
+@@ -825,7 +835,7 @@ receive_chars(struct uart_8250_port *up,
+ 		if (unlikely(tty->flip.count >= TTY_FLIPBUF_SIZE)) {
+ 			tty->flip.work.func((void *)tty);
+ 			if (tty->flip.count >= TTY_FLIPBUF_SIZE)
+-				return; // if TTY_DONT_FLIP is set
++				return;	/* if TTY_DONT_FLIP is set */
+ 		}
+ 		ch = serial_inp(up, UART_RX);
+ 		*tty->flip.char_buf_ptr = ch;
+@@ -1186,12 +1196,21 @@ static void serial8250_break_ctl(struct 
+ 	spin_unlock_irqrestore(&up->port.lock, flags);
+ }
+ 
++#ifdef CONFIG_KGDB
++static int kgdb_irq = -1;
++#endif
++
+ static int serial8250_startup(struct uart_port *port)
+ {
+ 	struct uart_8250_port *up = (struct uart_8250_port *)port;
+ 	unsigned long flags;
+ 	int retval;
+ 
++#ifdef CONFIG_KGDB
++	if (up->port.irq == kgdb_irq)
++		return -EBUSY;
++#endif
++
+ 	up->capabilities = uart_config[up->port.type].flags;
+ 
+ 	if (up->port.type == PORT_16C950) {
+@@ -1857,6 +1876,10 @@ static void __init serial8250_register_p
+ 	for (i = 0; i < UART_NR; i++) {
+ 		struct uart_8250_port *up = &serial8250_ports[i];
+ 
++#ifdef CONFIG_KGDB
++		if (up->port.irq == kgdb_irq)
++			up->port.kgdb = 1;
++#endif
+ 		up->port.line = i;
+ 		up->port.ops = &serial8250_pops;
+ 		init_timer(&up->timer);
+@@ -2101,7 +2124,8 @@ void serial8250_get_irq_map(unsigned int
+ 
+ /**
+  *	serial8250_suspend_port - suspend one serial port
+- *	@line: serial line number
++ *	@line:  serial line number
++ *      @level: the level of port suspension, as per uart_suspend_port
+  *
+  *	Suspend one serial port.
+  */
+@@ -2112,7 +2136,8 @@ void serial8250_suspend_port(int line)
+ 
+ /**
+  *	serial8250_resume_port - resume one serial port
+- *	@line: serial line number
++ *	@line:  serial line number
++ *      @level: the level of port resumption, as per uart_resume_port
+  *
+  *	Resume one serial port.
+  */
+@@ -2121,6 +2146,31 @@ void serial8250_resume_port(int line)
+ 	uart_resume_port(&serial8250_reg, &serial8250_ports[line].port);
+ }
+ 
++#ifdef CONFIG_KGDB
++/*
++ * Find all the ports using the given irq and shut them down.
++ * Result should be that the irq will be released.
++ */
++void shutdown_for_kgdb(struct async_struct * info)
++{
++        int irq = info->state->irq;
++        struct uart_8250_port *up;
++	int ttyS;
++
++	kgdb_irq = irq;			/* save for later init */
++	for (ttyS = 0; ttyS < UART_NR; ttyS++){
++		up =  &serial8250_ports[ttyS];
++		if (up->port.irq == irq && (irq_lists + irq)->head) {
++#ifdef CONFIG_DEBUG_SPINLOCK   /* ugly business... */
++			if(up->port.lock.magic != SPINLOCK_MAGIC)
++				spin_lock_init(&up->port.lock);
++#endif
++			serial8250_shutdown(&up->port);
++		}
++        }
++}
++#endif	/* CONFIG_KGDB */
++
+ static int __init serial8250_init(void)
+ {
+ 	int ret, i;
+--- linux-2.6.0-test6/drivers/serial/serial_core.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/drivers/serial/serial_core.c	2003-10-05 00:36:10.000000000 -0700
+@@ -263,9 +263,9 @@ static void uart_shutdown(struct uart_st
+ 
+ /**
+  *	uart_update_timeout - update per-port FIFO timeout.
+- *	@port: uart_port structure describing the port.
++ *	@port:  uart_port structure describing the port
+  *	@cflag: termios cflag value
+- *	@quot: uart clock divisor quotient
++ *	@baud:  speed of the port
+  *
+  *	Set the port FIFO timeout value.  The @cflag value should
+  *	reflect the actual hardware settings.
+@@ -1973,6 +1973,11 @@ uart_configure_port(struct uart_driver *
+ {
+ 	unsigned int flags;
+ 
++#ifdef CONFIG_KGDB
++	if (port->kgdb)
++		return;
++#endif
++
+ 	/*
+ 	 * If there isn't a port here, don't do anything further.
+ 	 */
+--- linux-2.6.0-test6/drivers/telephony/ixj.h	2003-06-22 12:04:44.000000000 -0700
++++ 25/drivers/telephony/ixj.h	2003-10-05 00:33:24.000000000 -0700
+@@ -42,6 +42,7 @@ static char ixj_h_rcsid[] = "$Id: ixj.h,
+ 
+ #define IXJ_VERSION 3031
+ 
++#include <linux/version.h>
+ #include <linux/types.h>
+ 
+ #include <linux/ixjuser.h>
+--- linux-2.6.0-test6/drivers/telephony/phonedev.c	2003-09-08 13:58:58.000000000 -0700
++++ 25/drivers/telephony/phonedev.c	2003-10-05 00:33:24.000000000 -0700
+@@ -14,7 +14,6 @@
+  *              phone_register_device now works with unit!=PHONE_UNIT_ANY
+  */
+ 
+-#include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+--- linux-2.6.0-test6/drivers/usb/core/inode.c	2003-09-08 13:58:58.000000000 -0700
++++ 25/drivers/usb/core/inode.c	2003-10-05 00:33:24.000000000 -0700
+@@ -38,6 +38,7 @@
+ #include <linux/namei.h>
+ #include <linux/usbdevice_fs.h>
+ #include <linux/smp_lock.h>
++#include <linux/parser.h>
+ #include <asm/byteorder.h>
+ 
+ static struct super_operations usbfs_ops;
+@@ -62,86 +63,94 @@ static umode_t devmode = S_IWUSR | S_IRU
+ static umode_t busmode = S_IXUGO | S_IRUGO;
+ static umode_t listmode = S_IRUGO;
+ 
++enum {
++	Opt_devuid, Opt_devgid, Opt_devmode,
++	Opt_busuid, Opt_busgid, Opt_busmode,
++	Opt_listuid, Opt_listgid, Opt_listmode,
++	Opt_err,
++};
++
++static match_table_t tokens = {
++	{Opt_devuid, "devuid=%u"},
++	{Opt_devgid, "devgid=%u"},
++	{Opt_devmode, "devmode=%o"},
++	{Opt_busuid, "busuid=%u"},
++	{Opt_busgid, "busgid=%u"},
++	{Opt_busmode, "busmode=%o"},
++	{Opt_listuid, "listuid=%u"},
++	{Opt_listgid, "listgid=%u"},
++	{Opt_listmode, "listmode=%o"},
++	{Opt_err, NULL}
++};
++
+ static int parse_options(struct super_block *s, char *data)
+ {
+-	char *curopt = NULL, *value;
++	char *p;
++	int option;
+ 
+-	while ((curopt = strsep(&data, ",")) != NULL) {
+-		if (!*curopt)
++	while ((p = strsep(&data, ",")) != NULL) {
++		substring_t args[MAX_OPT_ARGS];
++		int token;
++		if (!*p)
+ 			continue;
+-		if ((value = strchr(curopt, '=')) != NULL)
+-			*value++ = 0;
+-		if (!strcmp(curopt, "devuid")) {
+-			if (!value || !value[0])
+-				return -EINVAL;
+-			devuid = simple_strtoul(value, &value, 0);
+-			if (*value)
+-				return -EINVAL;
+-		}
+-		if (!strcmp(curopt, "devgid")) {
+-			if (!value || !value[0])
+-				return -EINVAL;
+-			devgid = simple_strtoul(value, &value, 0);
+-			if (*value)
+-				return -EINVAL;
+-		}
+-		if (!strcmp(curopt, "devmode")) {
+-			if (!value || !value[0])
+-				return -EINVAL;
+-			devmode = simple_strtoul(value, &value, 0) & S_IRWXUGO;
+-			if (*value)
+-				return -EINVAL;
+-		}
+-		if (!strcmp(curopt, "busuid")) {
+-			if (!value || !value[0])
+-				return -EINVAL;
+-			busuid = simple_strtoul(value, &value, 0);
+-			if (*value)
+-				return -EINVAL;
+-		}
+-		if (!strcmp(curopt, "busgid")) {
+-			if (!value || !value[0])
+-				return -EINVAL;
+-			busgid = simple_strtoul(value, &value, 0);
+-			if (*value)
+-				return -EINVAL;
+-		}
+-		if (!strcmp(curopt, "busmode")) {
+-			if (!value || !value[0])
+-				return -EINVAL;
+-			busmode = simple_strtoul(value, &value, 0) & S_IRWXUGO;
+-			if (*value)
+-				return -EINVAL;
+-		}
+-		if (!strcmp(curopt, "listuid")) {
+-			if (!value || !value[0])
+-				return -EINVAL;
+-			listuid = simple_strtoul(value, &value, 0);
+-			if (*value)
+-				return -EINVAL;
+-		}
+-		if (!strcmp(curopt, "listgid")) {
+-			if (!value || !value[0])
+-				return -EINVAL;
+-			listgid = simple_strtoul(value, &value, 0);
+-			if (*value)
++
++		token = match_token(p, tokens, args);
++		switch (token) {
++		case Opt_devuid:
++			if (match_int(&args[0], &option))
++			       return -EINVAL;
++			devuid = option;
++			break;
++		case Opt_devgid:
++			if (match_int(&args[0], &option))
++			       return -EINVAL;
++			devgid = option;
++			break;
++		case Opt_devmode:
++			if (match_octal(&args[0], &option))
+ 				return -EINVAL;
+-		}
+-		if (!strcmp(curopt, "listmode")) {
+-			if (!value || !value[0])
++			devmode = option & S_IRWXUGO;
++			break;
++		case Opt_busuid:
++			if (match_int(&args[0], &option))
++			       return -EINVAL;
++			busuid = option;
++			break;
++		case Opt_busgid:
++			if (match_int(&args[0], &option))
++			       return -EINVAL;
++			busgid = option;
++			break;
++		case Opt_busmode:
++			if (match_octal(&args[0], &option))
+ 				return -EINVAL;
+-			listmode = simple_strtoul(value, &value, 0) & S_IRWXUGO;
+-			if (*value)
++			busmode = option & S_IRWXUGO;
++			break;
++		case Opt_listuid:
++			if (match_int(&args[0], &option))
++			       return -EINVAL;
++			listuid = option;
++			break;
++		case Opt_listgid:
++			if (match_int(&args[0], &option))
++			       return -EINVAL;
++			listgid = option;
++			break;
++		case Opt_listmode:
++			if (match_octal(&args[0], &option))
+ 				return -EINVAL;
++			listmode = option & S_IRWXUGO;
++			break;
++		default:
++			err("usbfs: unrecognised mount option \"%s\" "
++			    "or missing value\n", p);
++			return -EINVAL;
+ 		}
+ 	}
+ 
+ 	return 0;
+ }
+ 
+-
+-/* --------------------------------------------------------------------- */
+-
+ static struct inode *usbfs_get_inode (struct super_block *sb, int mode, dev_t dev)
+ {
+ 	struct inode *inode = new_inode(sb);
+--- linux-2.6.0-test6/drivers/usb/host/uhci-debug.c	2003-07-02 14:53:16.000000000 -0700
++++ 25/drivers/usb/host/uhci-debug.c	2003-10-05 00:33:24.000000000 -0700
+@@ -99,82 +99,6 @@ static int uhci_show_td(struct uhci_td *
+ 	return out - buf;
+ }
+ 
+-static int uhci_show_sc(int port, unsigned short status, char *buf, int len)
+-{
+-	char *out = buf;
+-
+-	/* Try to make sure there's enough memory */
+-	if (len < 80)
+-		return 0;
+-
+-	out += sprintf(out, "  stat%d     =     %04x   %s%s%s%s%s%s%s%s\n",
+-		port,
+-		status,
+-		(status & USBPORTSC_SUSP) ? "PortSuspend " : "",
+-		(status & USBPORTSC_PR) ?   "PortReset " : "",
+-		(status & USBPORTSC_LSDA) ? "LowSpeed " : "",
+-		(status & USBPORTSC_RD) ?   "ResumeDetect " : "",
+-		(status & USBPORTSC_PEC) ?  "EnableChange " : "",
+-		(status & USBPORTSC_PE) ?   "PortEnabled " : "",
+-		(status & USBPORTSC_CSC) ?  "ConnectChange " : "",
+-		(status & USBPORTSC_CCS) ?  "PortConnected " : "");
+-
+-	return out - buf;
+-}
+-
+-static int uhci_show_status(struct uhci_hcd *uhci, char *buf, int len)
+-{
+-	char *out = buf;
+-	unsigned int io_addr = uhci->io_addr;
+-	unsigned short usbcmd, usbstat, usbint, usbfrnum;
+-	unsigned int flbaseadd;
+-	unsigned char sof;
+-	unsigned short portsc1, portsc2;
+-
+-	/* Try to make sure there's enough memory */
+-	if (len < 80 * 6)
+-		return 0;
+-
+-	usbcmd    = inw(io_addr + 0);
+-	usbstat   = inw(io_addr + 2);
+-	usbint    = inw(io_addr + 4);
+-	usbfrnum  = inw(io_addr + 6);
+-	flbaseadd = inl(io_addr + 8);
+-	sof       = inb(io_addr + 12);
+-	portsc1   = inw(io_addr + 16);
+-	portsc2   = inw(io_addr + 18);
+-
+-	out += sprintf(out, "  usbcmd    =     %04x   %s%s%s%s%s%s%s%s\n",
+-		usbcmd,
+-		(usbcmd & USBCMD_MAXP) ?    "Maxp64 " : "Maxp32 ",
+-		(usbcmd & USBCMD_CF) ?      "CF " : "",
+-		(usbcmd & USBCMD_SWDBG) ?   "SWDBG " : "",
+-		(usbcmd & USBCMD_FGR) ?     "FGR " : "",
+-		(usbcmd & USBCMD_EGSM) ?    "EGSM " : "",
+-		(usbcmd & USBCMD_GRESET) ?  "GRESET " : "",
+-		(usbcmd & USBCMD_HCRESET) ? "HCRESET " : "",
+-		(usbcmd & USBCMD_RS) ?      "RS " : "");
+-
+-	out += sprintf(out, "  usbstat   =     %04x   %s%s%s%s%s%s\n",
+-		usbstat,
+-		(usbstat & USBSTS_HCH) ?    "HCHalted " : "",
+-		(usbstat & USBSTS_HCPE) ?   "HostControllerProcessError " : "",
+-		(usbstat & USBSTS_HSE) ?    "HostSystemError " : "",
+-		(usbstat & USBSTS_RD) ?     "ResumeDetect " : "",
+-		(usbstat & USBSTS_ERROR) ?  "USBError " : "",
+-		(usbstat & USBSTS_USBINT) ? "USBINT " : "");
+-
+-	out += sprintf(out, "  usbint    =     %04x\n", usbint);
+-	out += sprintf(out, "  usbfrnum  =   (%d)%03x\n", (usbfrnum >> 10) & 1,
+-		0xfff & (4*(unsigned int)usbfrnum));
+-	out += sprintf(out, "  flbaseadd = %08x\n", flbaseadd);
+-	out += sprintf(out, "  sof       =       %02x\n", sof);
+-	out += uhci_show_sc(1, portsc1, out, len - (out - buf));
+-	out += uhci_show_sc(2, portsc2, out, len - (out - buf));
+-
+-	return out - buf;
+-}
+-
+ static int uhci_show_qh(struct uhci_qh *qh, char *buf, int len, int space)
+ {
+ 	char *out = buf;
+@@ -274,6 +198,13 @@ out:
+ 	return out - buf;
+ }
+ 
++#define show_frame_num()	\
++	if (!shown) {		\
++	  shown = 1;		\
++	  out += sprintf(out, "- Frame %d\n", i); \
++	}
++
++#ifdef CONFIG_PROC_FS
+ static const char *qh_names[] = {
+   "skel_int128_qh", "skel_int64_qh",
+   "skel_int32_qh", "skel_int16_qh",
+@@ -283,18 +214,88 @@ static const char *qh_names[] = {
+   "skel_bulk_qh", "skel_term_qh"
+ };
+ 
+-#define show_frame_num()	\
+-	if (!shown) {		\
+-	  shown = 1;		\
+-	  out += sprintf(out, "- Frame %d\n", i); \
+-	}
+-
+ #define show_qh_name()		\
+ 	if (!shown) {		\
+ 	  shown = 1;		\
+ 	  out += sprintf(out, "- %s\n", qh_names[i]); \
+ 	}
+ 
++static int uhci_show_sc(int port, unsigned short status, char *buf, int len)
++{
++	char *out = buf;
++
++	/* Try to make sure there's enough memory */
++	if (len < 80)
++		return 0;
++
++	out += sprintf(out, "  stat%d     =     %04x   %s%s%s%s%s%s%s%s\n",
++		port,
++		status,
++		(status & USBPORTSC_SUSP) ? "PortSuspend " : "",
++		(status & USBPORTSC_PR) ?   "PortReset " : "",
++		(status & USBPORTSC_LSDA) ? "LowSpeed " : "",
++		(status & USBPORTSC_RD) ?   "ResumeDetect " : "",
++		(status & USBPORTSC_PEC) ?  "EnableChange " : "",
++		(status & USBPORTSC_PE) ?   "PortEnabled " : "",
++		(status & USBPORTSC_CSC) ?  "ConnectChange " : "",
++		(status & USBPORTSC_CCS) ?  "PortConnected " : "");
++
++	return out - buf;
++}
++
++static int uhci_show_status(struct uhci_hcd *uhci, char *buf, int len)
++{
++	char *out = buf;
++	unsigned int io_addr = uhci->io_addr;
++	unsigned short usbcmd, usbstat, usbint, usbfrnum;
++	unsigned int flbaseadd;
++	unsigned char sof;
++	unsigned short portsc1, portsc2;
++
++	/* Try to make sure there's enough memory */
++	if (len < 80 * 6)
++		return 0;
++
++	usbcmd    = inw(io_addr + 0);
++	usbstat   = inw(io_addr + 2);
++	usbint    = inw(io_addr + 4);
++	usbfrnum  = inw(io_addr + 6);
++	flbaseadd = inl(io_addr + 8);
++	sof       = inb(io_addr + 12);
++	portsc1   = inw(io_addr + 16);
++	portsc2   = inw(io_addr + 18);
++
++	out += sprintf(out, "  usbcmd    =     %04x   %s%s%s%s%s%s%s%s\n",
++		usbcmd,
++		(usbcmd & USBCMD_MAXP) ?    "Maxp64 " : "Maxp32 ",
++		(usbcmd & USBCMD_CF) ?      "CF " : "",
++		(usbcmd & USBCMD_SWDBG) ?   "SWDBG " : "",
++		(usbcmd & USBCMD_FGR) ?     "FGR " : "",
++		(usbcmd & USBCMD_EGSM) ?    "EGSM " : "",
++		(usbcmd & USBCMD_GRESET) ?  "GRESET " : "",
++		(usbcmd & USBCMD_HCRESET) ? "HCRESET " : "",
++		(usbcmd & USBCMD_RS) ?      "RS " : "");
++
++	out += sprintf(out, "  usbstat   =     %04x   %s%s%s%s%s%s\n",
++		usbstat,
++		(usbstat & USBSTS_HCH) ?    "HCHalted " : "",
++		(usbstat & USBSTS_HCPE) ?   "HostControllerProcessError " : "",
++		(usbstat & USBSTS_HSE) ?    "HostSystemError " : "",
++		(usbstat & USBSTS_RD) ?     "ResumeDetect " : "",
++		(usbstat & USBSTS_ERROR) ?  "USBError " : "",
++		(usbstat & USBSTS_USBINT) ? "USBINT " : "");
++
++	out += sprintf(out, "  usbint    =     %04x\n", usbint);
++	out += sprintf(out, "  usbfrnum  =   (%d)%03x\n", (usbfrnum >> 10) & 1,
++		0xfff & (4*(unsigned int)usbfrnum));
++	out += sprintf(out, "  flbaseadd = %08x\n", flbaseadd);
++	out += sprintf(out, "  sof       =       %02x\n", sof);
++	out += uhci_show_sc(1, portsc1, out, len - (out - buf));
++	out += uhci_show_sc(2, portsc2, out, len - (out - buf));
++
++	return out - buf;
++}
++
+ static int uhci_show_urbp(struct uhci_hcd *uhci, struct urb_priv *urbp, char *buf, int len)
+ {
+ 	struct list_head *tmp;
+@@ -512,7 +513,6 @@ static int uhci_sprint_schedule(struct u
+ 	return out - buf;
+ }
+ 
+-#ifdef CONFIG_PROC_FS
+ #define MAX_OUTPUT	(64 * 1024)
+ 
+ static struct proc_dir_entry *uhci_proc_root = NULL;
+--- linux-2.6.0-test6/drivers/usb/host/uhci-hcd.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/drivers/usb/host/uhci-hcd.c	2003-10-05 00:33:24.000000000 -0700
+@@ -2185,8 +2185,8 @@ static int uhci_reset(struct usb_hcd *hc
+ 	/* Maybe kick BIOS off this hardware.  Then reset, so we won't get
+ 	 * interrupts from any previous setup.
+ 	 */
+-	pci_write_config_word(hcd->pdev, USBLEGSUP, USBLEGSUP_DEFAULT);
+ 	reset_hc(uhci);
++	pci_write_config_word(hcd->pdev, USBLEGSUP, USBLEGSUP_DEFAULT);
+ 	return 0;
+ }
+ 
+--- linux-2.6.0-test6/drivers/usb/input/Kconfig	2003-09-27 18:57:46.000000000 -0700
++++ 25/drivers/usb/input/Kconfig	2003-10-05 00:33:24.000000000 -0700
+@@ -186,8 +186,5 @@ config USB_XPAD
+ 	  For information about how to connect the X-Box pad to USB, see
+ 	  Documentation/input/xpad.txt.
+ 
+-	  This driver is also available as a module ( = code which can be
+-	  inserted in and removed from the running kernel whenever you want).
+-	  The module will be called xpad.  If you want to compile it as a
+-	  module, say M here and read <file:Documentation/modules.txt>.
+-
++	  To compile this driver as a module, choose M here: the
++	  module will be called xpad.
+--- linux-2.6.0-test6/drivers/usb/misc/brlvger.c	2003-09-08 13:58:58.000000000 -0700
++++ 25/drivers/usb/misc/brlvger.c	2003-10-05 00:33:24.000000000 -0700
+@@ -591,14 +591,14 @@ brlvger_write(struct file *file, const c
+ 			int firstpart = 6 - off;
+ 			
+ #ifdef WRITE_DEBUG
+-			dbg3("off: %d, rs: %d, count: %d, firstpart: %d",
++			dbg3("off: %lld, rs: %d, count: %d, firstpart: %d",
+ 			     off, rs, count, firstpart);
+ #endif
+ 
+ 			firstpart = (firstpart < count) ? firstpart : count;
+ 
+ #ifdef WRITE_DEBUG
+-			dbg3("off: %d", off);
++			dbg3("off: %lld", off);
+ 			dbg3("firstpart: %d", firstpart);
+ #endif
+ 
+@@ -618,7 +618,7 @@ brlvger_write(struct file *file, const c
+ 			off +=2;
+ 
+ #ifdef WRITE_DEBUG
+-			dbg3("off: %d, rs: %d, count: %d, firstpart: %d, "
++			dbg3("off: %lld, rs: %d, count: %d, firstpart: %d, "
+ 				"written: %d", 	off, rs, count, firstpart, written);
+ #endif
+ 		}
+--- linux-2.6.0-test6/drivers/usb/misc/speedtch.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/drivers/usb/misc/speedtch.c	2003-10-05 00:33:24.000000000 -0700
+@@ -189,8 +189,7 @@ struct udsl_vcc_data {
+ 	struct atm_vcc *vcc;
+ 
+ 	/* raw cell reassembly */
+-	struct sk_buff *skb;
+-	unsigned int max_pdu;
++	struct sk_buff *sarb;
+ };
+ 
+ /* send */
+@@ -314,12 +313,10 @@ static void udsl_extract_cells (struct u
+ {
+ 	struct udsl_vcc_data *cached_vcc = NULL;
+ 	struct atm_vcc *vcc;
+-	struct sk_buff *skb;
++	struct sk_buff *sarb;
+ 	struct udsl_vcc_data *vcc_data;
+ 	int cached_vci = 0;
+ 	unsigned int i;
+-	unsigned int length;
+-	unsigned int pdu_length;
+ 	int pti;
+ 	int vci;
+ 	short cached_vpi = 0;
+@@ -344,74 +341,73 @@ static void udsl_extract_cells (struct u
+ 		}
+ 
+ 		vcc = vcc_data->vcc;
++		sarb = vcc_data->sarb;
+ 
+-		if (!vcc_data->skb && !(vcc_data->skb = dev_alloc_skb (vcc_data->max_pdu))) {
+-			dbg ("udsl_extract_cells: no memory for skb (vcc: 0x%p)!", vcc);
+-			if (pti)
+-				atomic_inc (&vcc->stats->rx_err);
+-			continue;
+-		}
+-
+-		skb = vcc_data->skb;
+-
+-		if (skb->len + ATM_CELL_PAYLOAD > vcc_data->max_pdu) {
+-			dbg ("udsl_extract_cells: buffer overrun (max_pdu: %u, skb->len %u, vcc: 0x%p)", vcc_data->max_pdu, skb->len, vcc);
++		if (sarb->tail + ATM_CELL_PAYLOAD > sarb->end) {
++			dbg ("udsl_extract_cells: buffer overrun (sarb->len %u, vcc: 0x%p)!", sarb->len, vcc);
+ 			/* discard cells already received */
+-			skb_trim (skb, 0);
+-			DEBUG_ON (vcc_data->max_pdu < ATM_CELL_PAYLOAD);
++			skb_trim (sarb, 0);
+ 		}
+ 
+-		memcpy (skb->tail, source + ATM_CELL_HEADER, ATM_CELL_PAYLOAD);
+-		__skb_put (skb, ATM_CELL_PAYLOAD);
++		memcpy (sarb->tail, source + ATM_CELL_HEADER, ATM_CELL_PAYLOAD);
++		__skb_put (sarb, ATM_CELL_PAYLOAD);
+ 
+ 		if (pti) {
++			struct sk_buff *skb;
++			unsigned int length;
++			unsigned int pdu_length;
++
+ 			length = (source [ATM_CELL_SIZE - 6] << 8) + source [ATM_CELL_SIZE - 5];
+ 
+ 			/* guard against overflow */
+ 			if (length > ATM_MAX_AAL5_PDU) {
+-				dbg ("udsl_extract_cells: bogus length %u (vcc: 0x%p)", length, vcc);
+-				goto drop;
++				dbg ("udsl_extract_cells: bogus length %u (vcc: 0x%p)!", length, vcc);
++				atomic_inc (&vcc->stats->rx_err);
++				goto out;
+ 			}
+ 
+ 			pdu_length = UDSL_NUM_CELLS (length) * ATM_CELL_PAYLOAD;
+ 
+-			if (skb->len < pdu_length) {
+-				dbg ("udsl_extract_cells: bogus pdu_length %u (skb->len: %u, vcc: 0x%p)", pdu_length, skb->len, vcc);
+-				goto drop;
++			if (sarb->len < pdu_length) {
++				dbg ("udsl_extract_cells: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!", pdu_length, sarb->len, vcc);
++				atomic_inc (&vcc->stats->rx_err);
++				goto out;
+ 			}
+ 
+-			if (crc32_be (~0, skb->tail - pdu_length, pdu_length) != 0xc704dd7b) {
+-				dbg ("udsl_extract_cells: packet failed crc check (vcc: 0x%p)", vcc);
+-				goto drop;
++			if (crc32_be (~0, sarb->tail - pdu_length, pdu_length) != 0xc704dd7b) {
++				dbg ("udsl_extract_cells: packet failed crc check (vcc: 0x%p)!", vcc);
++				atomic_inc (&vcc->stats->rx_err);
++				goto out;
+ 			}
+ 
+-			if (!atm_charge (vcc, skb->truesize)) {
+-				dbg ("udsl_extract_cells: failed atm_charge (skb->truesize: %u)", skb->truesize);
+-				goto drop_no_stats; /* atm_charge increments rx_drop */
+-			}
++			vdbg ("udsl_extract_cells: got packet (length: %u, pdu_length: %u, vcc: 0x%p)", length, pdu_length, vcc);
+ 
+-			/* now that we are sure to send the skb, it is ok to change skb->data */
+-			if (skb->len > pdu_length)
+-				skb_pull (skb, skb->len - pdu_length); /* discard initial junk */
++			if (!(skb = dev_alloc_skb (length))) {
++				dbg ("udsl_extract_cells: no memory for skb (length: %u)!", length);
++				atomic_inc (&vcc->stats->rx_drop);
++				goto out;
++			}
+ 
+-			skb_trim (skb, length); /* drop zero padding and trailer */
++			vdbg ("udsl_extract_cells: allocated new sk_buff (skb: 0x%p, skb->truesize: %u)", skb, skb->truesize);
+ 
+-			atomic_inc (&vcc->stats->rx);
++			if (!atm_charge (vcc, skb->truesize)) {
++				dbg ("udsl_extract_cells: failed atm_charge (skb->truesize: %u)!", skb->truesize);
++				dev_kfree_skb (skb);
++				goto out; /* atm_charge increments rx_drop */
++			}
+ 
+-			PACKETDEBUG (skb->data, skb->len);
++			memcpy (skb->data, sarb->tail - pdu_length, length);
++			__skb_put (skb, length);
+ 
+ 			vdbg ("udsl_extract_cells: sending skb 0x%p, skb->len %u, skb->truesize %u", skb, skb->len, skb->truesize);
+ 
+-			vcc->push (vcc, skb);
+-
+-			vcc_data->skb = NULL;
++			PACKETDEBUG (skb->data, skb->len);
+ 
+-			continue;
++			vcc->push (vcc, skb);
+ 
+-drop:
+-			atomic_inc (&vcc->stats->rx_err);
+-drop_no_stats:
+-			skb_trim (skb, 0);
++			atomic_inc (&vcc->stats->rx);
++out:
++			skb_trim (sarb, 0);
+ 		}
+ 	}
+ }
+@@ -871,6 +867,7 @@ static int udsl_atm_open (struct atm_vcc
+ {
+ 	struct udsl_instance_data *instance = vcc->dev->dev_data;
+ 	struct udsl_vcc_data *new;
++	unsigned int max_pdu;
+ 
+ 	dbg ("udsl_atm_open: vpi %hd, vci %d", vpi, vci);
+ 
+@@ -883,8 +880,10 @@ static int udsl_atm_open (struct atm_vcc
+ 		return -EINVAL;
+ 
+ 	/* only support AAL5 */
+-	if ((vcc->qos.aal != ATM_AAL5) || (vcc->qos.rxtp.max_sdu < 0) || (vcc->qos.rxtp.max_sdu > ATM_MAX_AAL5_PDU))
++	if ((vcc->qos.aal != ATM_AAL5) || (vcc->qos.rxtp.max_sdu < 0) || (vcc->qos.rxtp.max_sdu > ATM_MAX_AAL5_PDU)) {
++		dbg ("udsl_atm_open: unsupported ATM type %d!", vcc->qos.aal);
+ 		return -EINVAL;
++	}
+ 
+ 	if (!instance->firmware_loaded) {
+ 		dbg ("udsl_atm_open: firmware not loaded!");
+@@ -894,11 +893,13 @@ static int udsl_atm_open (struct atm_vcc
+ 	down (&instance->serialize); /* vs self, udsl_atm_close */
+ 
+ 	if (udsl_find_vcc (instance, vpi, vci)) {
++		dbg ("udsl_atm_open: %hd/%d already in use!", vpi, vci);
+ 		up (&instance->serialize);
+ 		return -EADDRINUSE;
+ 	}
+ 
+ 	if (!(new = kmalloc (sizeof (struct udsl_vcc_data), GFP_KERNEL))) {
++		dbg ("udsl_atm_open: no memory for vcc_data!");
+ 		up (&instance->serialize);
+ 		return -ENOMEM;
+ 	}
+@@ -907,7 +908,15 @@ static int udsl_atm_open (struct atm_vcc
+ 	new->vcc = vcc;
+ 	new->vpi = vpi;
+ 	new->vci = vci;
+-	new->max_pdu = max (1, UDSL_NUM_CELLS (vcc->qos.rxtp.max_sdu)) * ATM_CELL_PAYLOAD;
++
++	/* udsl_extract_cells requires at least one cell */
++	max_pdu = max (1, UDSL_NUM_CELLS (vcc->qos.rxtp.max_sdu)) * ATM_CELL_PAYLOAD;
++	if (!(new->sarb = alloc_skb (max_pdu, GFP_KERNEL))) {
++		dbg ("udsl_atm_open: no memory for SAR buffer!");
++	        kfree (new);
++		up (&instance->serialize);
++		return -ENOMEM;
++	}
+ 
+ 	vcc->dev_data = new;
+ 	vcc->vpi = vpi;
+@@ -925,7 +934,7 @@ static int udsl_atm_open (struct atm_vcc
+ 
+ 	tasklet_schedule (&instance->receive_tasklet);
+ 
+-	dbg ("udsl_atm_open: allocated vcc data 0x%p (max_pdu: %u)", new, new->max_pdu);
++	dbg ("udsl_atm_open: allocated vcc data 0x%p (max_pdu: %u)", new, max_pdu);
+ 
+ 	return 0;
+ }
+@@ -952,9 +961,8 @@ static void udsl_atm_close (struct atm_v
+ 	list_del (&vcc_data->list);
+ 	tasklet_enable (&instance->receive_tasklet);
+ 
+-	if (vcc_data->skb)
+-		dev_kfree_skb (vcc_data->skb);
+-	vcc_data->skb = NULL;
++	kfree_skb (vcc_data->sarb);
++	vcc_data->sarb = NULL;
+ 
+ 	kfree (vcc_data);
+ 	vcc->dev_data = NULL;
+@@ -1216,7 +1224,7 @@ static void udsl_usb_disconnect (struct 
+ 
+ 	for (i = 0; i < num_rcv_urbs; i++)
+ 		if ((result = usb_unlink_urb (instance->receivers [i].urb)) < 0)
+-			dbg ("udsl_usb_disconnect: usb_unlink_urb on receive urb %d returned %d", i, result);
++			dbg ("udsl_usb_disconnect: usb_unlink_urb on receive urb %d returned %d!", i, result);
+ 
+ 	/* wait for completion handlers to finish */
+ 	do {
+@@ -1252,7 +1260,7 @@ static void udsl_usb_disconnect (struct 
+ 
+ 	for (i = 0; i < num_snd_urbs; i++)
+ 		if ((result = usb_unlink_urb (instance->senders [i].urb)) < 0)
+-			dbg ("udsl_usb_disconnect: usb_unlink_urb on send urb %d returned %d", i, result);
++			dbg ("udsl_usb_disconnect: usb_unlink_urb on send urb %d returned %d!", i, result);
+ 
+ 	/* wait for completion handlers to finish */
+ 	do {
+@@ -1298,11 +1306,9 @@ static void udsl_usb_disconnect (struct 
+ 
+ static int __init udsl_usb_init (void)
+ {
+-	struct sk_buff *skb; /* dummy for sizeof */
+-
+ 	dbg ("udsl_usb_init: driver version " DRIVER_VERSION);
+ 
+-	if (sizeof (struct udsl_control) > sizeof (skb->cb)) {
++	if (sizeof (struct udsl_control) > sizeof (((struct sk_buff *)0)->cb)) {
+ 		printk (KERN_ERR __FILE__ ": unusable with this kernel!\n");
+ 		return -EIO;
+ 	}
+--- linux-2.6.0-test6/drivers/usb/serial/keyspan.c	2003-09-08 13:58:58.000000000 -0700
++++ 25/drivers/usb/serial/keyspan.c	2003-10-05 00:33:24.000000000 -0700
+@@ -28,6 +28,9 @@
+ 
+   Change History
+ 
++    2003sep04	LPM (Keyspan) add support for new single port product USA19HS.
++				Improve setup message handling for all devices.
++
+     Wed Feb 19 22:00:00 PST 2003 (Jeffrey S. Laing <keyspan@jsl.com>)
+       Merged the current (1/31/03) Keyspan code with the current (2.4.21-pre4)
+       Linux source tree.  The Linux tree lacked support for the 49WLC and
+@@ -172,6 +175,7 @@ struct keyspan_port_private {
+ 	int		baud;
+ 	int		old_baud;
+ 	unsigned int	cflag;
++	unsigned int	old_cflag;
+ 	enum		{flow_none, flow_cts, flow_xon} flow_control;
+ 	int		rts_state;	/* Handshaking pins (outputs) */
+ 	int		dtr_state;
+@@ -187,11 +191,12 @@ struct keyspan_port_private {
+ 
+ 	
+ /* Include Keyspan message headers.  All current Keyspan Adapters
+-   make use of one of three message formats which are referred
+-   to as USA-26, USA-28 and USA-49 by Keyspan and within this driver. */
++   make use of one of four message formats which are referred
++   to as USA-26, USA-28 and USA-49, USA-90 by Keyspan and within this driver. */
+ #include "keyspan_usa26msg.h"
+ #include "keyspan_usa28msg.h"
+ #include "keyspan_usa49msg.h"
++#include "keyspan_usa90msg.h"
+ 	
+ 
+ /* Functions used by new usb-serial code. */
+@@ -346,8 +351,8 @@ static int keyspan_ioctl(struct usb_seri
+ 	return -ENOIOCTLCMD;
+ }
+ 
+-	/* Write function is generic for the three protocols used
+-	   with only a minor change for usa49 required */
++	/* Write function is similar for the four protocols used
++	   with only a minor change for usa90 (usa19hs) required */
+ static int keyspan_write(struct usb_serial_port *port, int from_user, 
+ 			 const unsigned char *buf, int count)
+ {
+@@ -356,18 +361,26 @@ static int keyspan_write(struct usb_seri
+ 	int				flip;
+ 	int 				left, todo;
+ 	struct urb			*this_urb;
+-	int 				err;
++ 	int 				err, maxDataLen, dataOffset;
+ 
+ 	p_priv = usb_get_serial_port_data(port);
+ 	d_details = p_priv->device_details;
+ 
++	if (d_details->msg_format == msg_usa90) {
++   		maxDataLen = 64;
++		dataOffset = 0;
++	} else {
++		maxDataLen = 63;
++		dataOffset = 1;
++	}
++	
+ 	dbg("%s - for port %d (%d chars), flip=%d",
+ 	    __FUNCTION__, port->number, count, p_priv->out_flip);
+ 
+ 	for (left = count; left > 0; left -= todo) {
+ 		todo = left;
+-		if (todo > 63)
+-			todo = 63;
++		if (todo > maxDataLen)
++			todo = maxDataLen;
+ 
+ 		flip = p_priv->out_flip;
+ 	
+@@ -390,20 +403,20 @@ static int keyspan_write(struct usb_seri
+ 			break;
+ 		}
+ 
+-		/* First byte in buffer is "last flag" - unused so
++		/* First byte in buffer is "last flag" (except for usa19hx) - unused so
+ 		   for now so set to zero */
+ 		((char *)this_urb->transfer_buffer)[0] = 0;
+ 
+ 		if (from_user) {
+-			if (copy_from_user(this_urb->transfer_buffer + 1, buf, todo))
++			if (copy_from_user(this_urb->transfer_buffer + dataOffset, buf, todo))
+ 				return -EFAULT;
+ 		} else {
+-			memcpy (this_urb->transfer_buffer + 1, buf, todo);
++			memcpy (this_urb->transfer_buffer + dataOffset, buf, todo);
+ 		}
+ 		buf += todo;
+ 
+ 		/* send the data out the bulk port */
+-		this_urb->transfer_buffer_length = todo + 1;
++		this_urb->transfer_buffer_length = todo + dataOffset;
+ 
+ 		this_urb->transfer_flags &= ~URB_ASYNC_UNLINK;
+ 		this_urb->dev = port->serial->dev;
+@@ -443,9 +456,12 @@ static void	usa26_indat_callback(struct 
+ 	if (urb->actual_length) {
+ 		/* 0x80 bit is error flag */
+ 		if ((data[0] & 0x80) == 0) {
+-			/* no error on any byte */
++			/* no errors on individual bytes, only possible overrun err*/
++			if (data[0] & RXERROR_OVERRUN)
++					err = TTY_OVERRUN;
++			else err = 0;
+ 			for (i = 1; i < urb->actual_length ; ++i) {
+-				tty_insert_flip_char(tty, data[i], 0);
++				tty_insert_flip_char(tty, data[i], err);
+ 			}
+ 		} else {
+ 			/* some bytes had errors, every byte has status */
+@@ -474,7 +490,7 @@ static void	usa26_indat_callback(struct 
+ 	return;
+ }
+ 
+-	/* Outdat handling is common for usa26, usa28 and usa49 messages */
++ 	/* Outdat handling is common for all devices */
+ static void	usa2x_outdat_callback(struct urb *urb, struct pt_regs *regs)
+ {
+ 	struct usb_serial_port *port;
+@@ -577,7 +593,7 @@ static void	usa26_glocont_callback(struc
+ }
+ 
+ 
+-static void     usa28_indat_callback(struct urb *urb, struct pt_regs *regs)
++static void usa28_indat_callback(struct urb *urb, struct pt_regs *regs)
+ {
+ 	int                     i, err;
+ 	struct usb_serial_port  *port;
+@@ -861,29 +877,172 @@ static void	usa49_outcont_callback(struc
+ 	dbg ("%s", __FUNCTION__);
+ }
+ 
++static void	usa90_indat_callback(struct urb *urb, struct pt_regs *regs)
++{
++	int			i, err;
++	int			endpoint;
++	struct usb_serial_port	*port;
++	struct keyspan_port_private	 	*p_priv;
++	struct tty_struct	*tty;
++	unsigned char 		*data = urb->transfer_buffer;
++
++	dbg ("%s", __FUNCTION__); 
++
++	endpoint = usb_pipeendpoint(urb->pipe);
++
++
++	if (urb->status) {
++		dbg("%s - nonzero status: %x on endpoint %d.",
++		    __FUNCTION__, urb->status, endpoint);
++		return;
++	}
++
++	port = (struct usb_serial_port *) urb->context;
++	p_priv = usb_get_serial_port_data(port);
++
++	tty = port->tty;
++	if (urb->actual_length) {
++	
++		/* if current mode is DMA, looks like usa28 format
++	   		otherwise looks like usa26 data format */
++
++		if (p_priv->baud > 57600) {
++			for (i = 0; i < urb->actual_length ; ++i) 
++				tty_insert_flip_char(tty, data[i], 0);
++		}
++		else {
++			
++			/* 0x80 bit is error flag */
++			if ((data[0] & 0x80) == 0) {
++				/* no errors on individual bytes, only possible overrun err*/
++				if (data[0] & RXERROR_OVERRUN)
++						err = TTY_OVERRUN;
++				else err = 0;
++				for (i = 1; i < urb->actual_length ; ++i) 
++					tty_insert_flip_char(tty, data[i], err);
++			
++			} 
++			else {
++			/* some bytes had errors, every byte has status */
++				dbg("%s - RX error!!!!", __FUNCTION__);
++				for (i = 0; i + 1 < urb->actual_length; i += 2) {
++					int stat = data[i], flag = 0;
++					if (stat & RXERROR_OVERRUN)
++						flag |= TTY_OVERRUN;
++					if (stat & RXERROR_FRAMING)
++						flag |= TTY_FRAME;
++					if (stat & RXERROR_PARITY)
++						flag |= TTY_PARITY;
++					/* XXX should handle break (0x10) */
++					tty_insert_flip_char(tty, data[i+1], flag);
++				}
++			}
++		}
++		tty_flip_buffer_push(tty);
++	}
++				
++	/* Resubmit urb so we continue receiving */
++	urb->dev = port->serial->dev;
++	if (port->open_count)
++		if ((err = usb_submit_urb(urb, GFP_ATOMIC)) != 0) {
++			dbg("%s - resubmit read urb failed. (%d)", __FUNCTION__, err);
++		}
++	return;
++}
++
++
++static void	usa90_instat_callback(struct urb *urb, struct pt_regs *regs)
++{
++	unsigned char 				*data = urb->transfer_buffer;
++	struct keyspan_usa90_portStatusMessage	*msg;
++	struct usb_serial			*serial;
++	struct usb_serial_port			*port;
++	struct keyspan_port_private	 	*p_priv;
++	int old_dcd_state, err;
++
++	serial = (struct usb_serial *) urb->context;
++
++	if (urb->status) {
++		dbg("%s - nonzero status: %x", __FUNCTION__, urb->status);
++		return;
++	}
++	if (urb->actual_length < 14) {
++		dbg("%s - %d byte report??", __FUNCTION__, urb->actual_length);
++		goto exit;
++	}
++
++	msg = (struct keyspan_usa90_portStatusMessage *)data;
++
++	/* Now do something useful with the data */
++
++	port = serial->port[0];
++	p_priv = usb_get_serial_port_data(port);
++	
++	/* Update handshaking pin state information */
++	old_dcd_state = p_priv->dcd_state;
++	p_priv->cts_state = ((msg->cts) ? 1 : 0);
++	p_priv->dsr_state = ((msg->dsr) ? 1 : 0);
++	p_priv->dcd_state = ((msg->dcd) ? 1 : 0);
++	p_priv->ri_state = ((msg->ri) ? 1 : 0);
++
++	if (port->tty && !C_CLOCAL(port->tty)
++	    && old_dcd_state != p_priv->dcd_state) {
++		if (old_dcd_state)
++			tty_hangup(port->tty);
++		/*  else */
++		/*	wake_up_interruptible(&p_priv->open_wait); */
++	}
++	
++	/* Resubmit urb so we continue receiving */
++	urb->dev = serial->dev;
++	if ((err = usb_submit_urb(urb, GFP_ATOMIC)) != 0) {
++		dbg("%s - resubmit read urb failed. (%d)", __FUNCTION__, err);
++	}
++exit:
++	;
++}
++
++static void	usa90_outcont_callback(struct urb *urb, struct pt_regs *regs)
++{
++	struct usb_serial_port *port;
++	struct keyspan_port_private *p_priv;
++
++	port = (struct usb_serial_port *) urb->context;
++	p_priv = usb_get_serial_port_data(port);
+ 
++	if (p_priv->resend_cont) {
++		dbg ("%s - sending setup", __FUNCTION__); 
++		keyspan_usa90_send_setup(port->serial, port, p_priv->resend_cont - 1);
++	}
++}
+ 
+ static int keyspan_write_room (struct usb_serial_port *port)
+ {
+ 	struct keyspan_port_private	*p_priv;
+ 	const struct keyspan_device_details	*d_details;
+ 	int				flip;
++	int				data_len;
+ 	struct urb			*this_urb;
+ 
+ 	dbg("%s", __FUNCTION__);
+ 	p_priv = usb_get_serial_port_data(port);
+ 	d_details = p_priv->device_details;
+ 
++	if (d_details->msg_format == msg_usa90)
++   		data_len = 64;
++	else
++		data_len = 63;
++
+ 	flip = p_priv->out_flip;
+ 
+ 	/* Check both endpoints to see if any are available. */
+ 	if ((this_urb = p_priv->out_urbs[flip]) != 0) {
+ 		if (this_urb->status != -EINPROGRESS)
+-			return (63);
++			return (data_len);
+ 		flip = (flip + 1) & d_details->outdat_endp_flip;        
+ 		if ((this_urb = p_priv->out_urbs[flip]) != 0) 
+ 			if (this_urb->status != -EINPROGRESS)
+-				return (63);
++				return (data_len);
+ 	}
+ 	return (0);
+ }
+@@ -902,17 +1061,24 @@ static int keyspan_open (struct usb_seri
+ 	struct usb_serial 		*serial = port->serial;
+ 	const struct keyspan_device_details	*d_details;
+ 	int				i, err;
++	int				baud_rate, device_port;
+ 	struct urb			*urb;
++	unsigned int			cflag;
+ 
+ 	s_priv = usb_get_serial_data(serial);
+ 	p_priv = usb_get_serial_port_data(port);
+-	d_details = s_priv->device_details;
++	d_details = p_priv->device_details;
+ 	
+ 	dbg("%s - port%d.", __FUNCTION__, port->number); 
+ 
+ 	/* Set some sane defaults */
+ 	p_priv->rts_state = 1;
+ 	p_priv->dtr_state = 1;
++	p_priv->baud = 9600;
++
++	/* force baud and lcr to be set on open */
++	p_priv->old_baud = 0;
++	p_priv->old_cflag = 0;
+ 
+ 	p_priv->out_flip = 0;
+ 	p_priv->in_flip = 0;
+@@ -922,7 +1088,10 @@ static int keyspan_open (struct usb_seri
+ 		if ((urb = p_priv->in_urbs[i]) == NULL)
+ 			continue;
+ 		urb->dev = serial->dev;
+-		usb_settoggle(urb->dev, usb_pipeendpoint(urb->pipe), usb_pipeout(urb->pipe), 0);
++
++		/* make sure endpoint data toggle is synchronized with the device */
++		
++		usb_clear_halt(urb->dev, urb->pipe);
+ 
+ 		if ((err = usb_submit_urb(urb, GFP_KERNEL)) != 0) {
+ 			dbg("%s - submit urb %d failed (%d)", __FUNCTION__, i, err);
+@@ -937,12 +1106,29 @@ static int keyspan_open (struct usb_seri
+ 		/* usb_settoggle(urb->dev, usb_pipeendpoint(urb->pipe), usb_pipeout(urb->pipe), 0); */
+ 	}
+ 
+-	// if the device is a USA49x, determine whether it is an W or WLC model
+-	// and set the baud clock accordingly
++	/* get the terminal config for the setup message now so we don't 
++	 * need to send 2 of them */
++
++	cflag = port->tty->termios->c_cflag;
++	device_port = port->number - port->serial->minor;
++
++	/* Baud rate calculation takes baud rate as an integer
++	   so other rates can be generated if desired. */
++	baud_rate = tty_get_baud_rate(port->tty);
++	/* If no match or invalid, leave as default */		
++	if (baud_rate >= 0
++	    && d_details->calculate_baud_rate(baud_rate, d_details->baudclk,
++				NULL, NULL, NULL, device_port) == KEYSPAN_BAUD_RATE_OK) {
++		p_priv->baud = baud_rate;
++	}
++
++	/* set CTS/RTS handshake etc. */
++	p_priv->cflag = cflag;
++	p_priv->flow_control = (cflag & CRTSCTS)? flow_cts: flow_none;
+ 
+ 	keyspan_send_setup(port, 1);
+ 	//mdelay(100);
+-	keyspan_set_termios(port, NULL);
++	//keyspan_set_termios(port, NULL);
+ 
+ 	return (0);
+ }
+@@ -977,7 +1163,7 @@ static void keyspan_close(struct usb_ser
+ 		keyspan_send_setup(port, 2);
+ 		/* pilot-xfer seems to work best with this delay */
+ 		mdelay(100);
+-		keyspan_set_termios(port, NULL);
++		// keyspan_set_termios(port, NULL);
+ 	}
+ 
+ 	/*while (p_priv->outcont_urb->status == -EINPROGRESS) {
+@@ -1172,6 +1358,14 @@ static struct callbacks {
+ 		.outdat_callback =	usa2x_outdat_callback,
+ 		.inack_callback =	usa49_inack_callback,
+ 		.outcont_callback =	usa49_outcont_callback,
++	}, {
++		/* msg_usa90 callbacks */
++		.instat_callback =	usa90_instat_callback,
++		.glocont_callback =	usa28_glocont_callback,		
++		.indat_callback =	usa90_indat_callback,
++		.outdat_callback =	usa2x_outdat_callback,
++		.inack_callback =	usa28_inack_callback,
++		.outcont_callback =	usa90_outcont_callback,
+ 	}
+ };
+ 
+@@ -1295,6 +1489,41 @@ static int keyspan_usa19_calc_baud(u32 b
+ 	return (KEYSPAN_BAUD_RATE_OK);
+ }
+ 
++/* usa19hs function doesn't require prescaler */
++static int keyspan_usa19hs_calc_baud(u32 baud_rate, u32 baudclk, u8 *rate_hi,
++				   u8 *rate_low, u8 *prescaler, int portnum)
++{
++	u32 	b16,	/* baud rate times 16 (actual rate used internally) */
++			div;	/* divisor */	
++		
++	dbg ("%s - %d.", __FUNCTION__, baud_rate);
++
++		/* prevent divide by zero...  */
++	if( (b16 = (baud_rate * 16L)) == 0) 
++		return (KEYSPAN_INVALID_BAUD_RATE);
++	
++
++
++		/* calculate the divisor */
++	if( (div = (baudclk / b16)) == 0) 
++		return (KEYSPAN_INVALID_BAUD_RATE);
++
++	if(div > 0xffff) 
++		return (KEYSPAN_INVALID_BAUD_RATE);
++
++		/* return the counter values if non-null */
++	if (rate_low) 
++		*rate_low = (u8) (div & 0xff);
++	
++	if (rate_hi) 
++		*rate_hi = (u8) ((div >> 8) & 0xff);
++	
++	if (rate_low && rate_hi) 
++		dbg ("%s - %d %02x %02x.", __FUNCTION__, baud_rate, *rate_hi, *rate_low);
++	
++	return (KEYSPAN_BAUD_RATE_OK);
++}
++
+ static int keyspan_usa19w_calc_baud(u32 baud_rate, u32 baudclk, u8 *rate_hi,
+ 				    u8 *rate_low, u8 *prescaler, int portnum)
+ {
+@@ -1447,6 +1676,7 @@ static int keyspan_usa26_send_setup(stru
+ 		p_priv->resend_cont = reset_port + 1;
+ 	if (this_urb->status == -EINPROGRESS) {
+ 		/*  dbg ("%s - already writing", __FUNCTION__); */
++		mdelay(5);
+ 		return(-1);
+ 	}
+ 
+@@ -1597,6 +1827,7 @@ static int keyspan_usa28_send_setup(stru
+ 		p_priv->resend_cont = reset_port + 1;
+ 	if (this_urb->status == -EINPROGRESS) {
+ 		dbg ("%s already writing", __FUNCTION__);
++		mdelay(5);
+ 		return(-1);
+ 	}
+ 
+@@ -1729,6 +1960,7 @@ static int keyspan_usa49_send_setup(stru
+ 		p_priv->resend_cont = reset_port + 1;
+ 	if (this_urb->status == -EINPROGRESS) {
+ 		/*  dbg ("%s - already writing", __FUNCTION__); */
++		mdelay(5);
+ 		return(-1);
+ 	}
+ 
+@@ -1857,6 +2089,144 @@ static int keyspan_usa49_send_setup(stru
+ 	return (0);
+ }
+ 
++static int keyspan_usa90_send_setup(struct usb_serial *serial,
++				    struct usb_serial_port *port,
++				    int reset_port)
++{
++	struct keyspan_usa90_portControlMessage	msg;		
++	struct keyspan_serial_private 		*s_priv;
++	struct keyspan_port_private 		*p_priv;
++	const struct keyspan_device_details	*d_details;
++	struct urb				*this_urb;
++	int 					err;
++	u8						prescaler;
++
++	dbg ("%s", __FUNCTION__);
++
++	s_priv = usb_get_serial_data(serial);
++	p_priv = usb_get_serial_port_data(port);
++	d_details = s_priv->device_details;
++
++	/* only do something if we have a bulk out endpoint */
++	if ((this_urb = p_priv->outcont_urb) == NULL) {
++		dbg("%s - oops no urb.", __FUNCTION__);
++		return -1;
++	}
++
++	/* Save reset port val for resend.
++	   Don't overwrite resend for open/close condition. */
++	if ((reset_port + 1) > p_priv->resend_cont)
++		p_priv->resend_cont = reset_port + 1;
++	if (this_urb->status == -EINPROGRESS) {
++		dbg ("%s already writing", __FUNCTION__);
++		mdelay(5);
++		return(-1);
++	}
++
++	memset(&msg, 0, sizeof (struct keyspan_usa90_portControlMessage));
++
++	/* Only set baud rate if it's changed */	
++	if (p_priv->old_baud != p_priv->baud) {
++		p_priv->old_baud = p_priv->baud;
++		msg.setClocking = 0x01;
++		if (d_details->calculate_baud_rate
++		    (p_priv->baud, d_details->baudclk, &msg.baudHi,
++		     &msg.baudLo, &prescaler, 0) == KEYSPAN_INVALID_BAUD_RATE ) {
++			dbg("%s - Invalid baud rate %d requested, using 9600.", __FUNCTION__,
++			    p_priv->baud);
++			p_priv->baud = 9600;
++			d_details->calculate_baud_rate (p_priv->baud, d_details->baudclk, 
++				&msg.baudHi, &msg.baudLo, &prescaler, 0);
++		}
++		msg.setRxMode = 1;
++		msg.setTxMode = 1;
++	}
++
++	/* modes must always be correctly specified */
++	if (p_priv->baud > 57600)
++	{
++		msg.rxMode = RXMODE_DMA;
++		msg.txMode = TXMODE_DMA;
++	}
++	else
++	{
++		msg.rxMode = RXMODE_BYHAND;
++		msg.txMode = TXMODE_BYHAND;
++	}
++
++	msg.lcr = (p_priv->cflag & CSTOPB)? STOPBITS_678_2: STOPBITS_5678_1;
++	switch (p_priv->cflag & CSIZE) {
++	case CS5:
++		msg.lcr |= USA_DATABITS_5;
++		break;
++	case CS6:
++		msg.lcr |= USA_DATABITS_6;
++		break;
++	case CS7:
++		msg.lcr |= USA_DATABITS_7;
++		break;
++	case CS8:
++		msg.lcr |= USA_DATABITS_8;
++		break;
++	}
++	if (p_priv->cflag & PARENB) {
++		/* note USA_PARITY_NONE == 0 */
++		msg.lcr |= (p_priv->cflag & PARODD)?
++			USA_PARITY_ODD: USA_PARITY_EVEN;
++	}
++	if (p_priv->old_cflag != p_priv->cflag) {
++		p_priv->old_cflag = p_priv->cflag;
++		msg.setLcr = 0x01;
++	}
++
++	if (p_priv->flow_control == flow_cts)
++		msg.txFlowControl = TXFLOW_CTS;
++	msg.setTxFlowControl = 0x01;
++	msg.setRxFlowControl = 0x01;
++	
++	msg.rxForwardingLength = 16;
++	msg.rxForwardingTimeout = 16;	
++	msg.txAckSetting = 0;
++	msg.xonChar = 17;
++	msg.xoffChar = 19;
++
++	/* Opening port */ 
++	if (reset_port == 1) {
++		msg.portEnabled = 1;
++		msg.rxFlush = 1;
++		msg.txBreak = (p_priv->break_on);
++	}
++	/* Closing port */
++	else if (reset_port == 2) {
++		msg.portEnabled = 0;
++	}
++	/* Sending intermediate configs */
++	else {
++		if (port->open_count)
++			msg.portEnabled = 1;
++		msg.txBreak = (p_priv->break_on);
++	}
++
++	/* Do handshaking outputs */	
++	msg.setRts = 0x01;
++	msg.rts = p_priv->rts_state;
++
++	msg.setDtr = 0x01;
++	msg.dtr = p_priv->dtr_state;
++		
++	p_priv->resend_cont = 0;
++	memcpy (this_urb->transfer_buffer, &msg, sizeof(msg));
++	
++	/* send the data out the device on control endpoint */
++	this_urb->transfer_buffer_length = sizeof(msg);
++
++	this_urb->dev = serial->dev;
++	if ((err = usb_submit_urb(this_urb, GFP_ATOMIC)) != 0) {
++		dbg("%s - usb_submit_urb(setup) failed (%d)", __FUNCTION__, err);
++	}
++	return (0);
++}
++
+ static void keyspan_send_setup(struct usb_serial_port *port, int reset_port)
+ {
+ 	struct usb_serial *serial = port->serial;
+@@ -1878,9 +2248,13 @@ static void keyspan_send_setup(struct us
+ 	case msg_usa49:
+ 		keyspan_usa49_send_setup(serial, port, reset_port);
+ 		break;
++	case msg_usa90:
++		keyspan_usa90_send_setup(serial, port, reset_port);
++		break;
+ 	}
+ }
+ 
++
+ /* Gets called by the "real" driver (ie once firmware is loaded
+    and renumeration has taken place. */
+ static int keyspan_startup (struct usb_serial *serial)
+--- linux-2.6.0-test6/drivers/usb/serial/keyspan.h	2003-06-14 12:18:25.000000000 -0700
++++ 25/drivers/usb/serial/keyspan.h	2003-10-05 00:33:24.000000000 -0700
+@@ -82,6 +82,10 @@ static int  keyspan_usa28_calc_baud	(u32
+ 					 u8 *rate_hi, u8 *rate_low,
+ 					 u8 *prescaler, int portnum);
+ 
++static int  keyspan_usa19hs_calc_baud	(u32 baud_rate, u32 baudclk,
++					 u8 *rate_hi, u8 *rate_low,
++					 u8 *prescaler, int portnum);
++
+ static int  keyspan_usa28_send_setup	(struct usb_serial *serial,
+ 					 struct usb_serial_port *port,
+ 					 int reset_port);
+@@ -92,6 +96,9 @@ static int  keyspan_usa49_send_setup	(st
+ 					 struct usb_serial_port *port,
+ 					 int reset_port);
+ 
++static int  keyspan_usa90_send_setup	(struct usb_serial *serial,
++					 struct usb_serial_port *port,
++					 int reset_port);
+ 
+ /* Struct used for firmware - increased size of data section
+    to allow Keyspan's 'C' firmware struct to be used unmodified */
+@@ -183,6 +190,7 @@ struct ezusb_hex_record {
+ #define	KEYSPAN_USA18X_BAUDCLK			(12000000L)	/* a guess */
+ #define	KEYSPAN_USA19_BAUDCLK			(12000000L)
+ #define	KEYSPAN_USA19W_BAUDCLK			(24000000L)
++#define	KEYSPAN_USA19HS_BAUDCLK			(14769231L)
+ #define	KEYSPAN_USA28_BAUDCLK			(1843200L)
+ #define	KEYSPAN_USA28X_BAUDCLK			(12000000L)
+ #define	KEYSPAN_USA49W_BAUDCLK			(48000000L)
+@@ -215,6 +223,7 @@ struct ezusb_hex_record {
+ #define	keyspan_usa18x_product_id		0x0112
+ #define	keyspan_usa19_product_id		0x0107
+ #define	keyspan_usa19qi_product_id		0x010c
++#define	keyspan_usa19hs_product_id		0x0121
+ #define	keyspan_mpr_product_id			0x011c
+ #define	keyspan_usa19qw_product_id		0x0119
+ #define	keyspan_usa19w_product_id		0x0108
+@@ -230,7 +239,7 @@ struct keyspan_device_details {
+ 	/* product ID value */
+ 	int	product_id;
+ 
+-	enum	{msg_usa26, msg_usa28, msg_usa49} msg_format;
++	enum	{msg_usa26, msg_usa28, msg_usa49, msg_usa90} msg_format;
+ 
+ 		/* Number of physical ports */
+ 	int	num_ports;
+@@ -349,6 +358,22 @@ static const struct keyspan_device_detai
+ 	.baudclk		= KEYSPAN_USA19W_BAUDCLK,
+ };
+ 
++static const struct keyspan_device_details usa19hs_device_details = {
++	product_id:		keyspan_usa19hs_product_id,
++	msg_format:		msg_usa90,
++	num_ports:		1,
++	indat_endp_flip:	0,
++	outdat_endp_flip:	0,
++	indat_endpoints:	{0x81},
++	outdat_endpoints:	{0x01},
++	inack_endpoints:	{-1},
++	outcont_endpoints:	{0x02},
++	instat_endpoint:	0x82,
++	glocont_endpoint:	-1,
++	calculate_baud_rate:	keyspan_usa19hs_calc_baud,
++	baudclk:		KEYSPAN_USA19HS_BAUDCLK,
++};
++
+ static const struct keyspan_device_details usa28_device_details = {
+ 	.product_id		= keyspan_usa28_product_id,
+ 	.msg_format		= msg_usa28,
+@@ -437,6 +462,7 @@ static const struct keyspan_device_detai
+ 	&usa19qi_device_details,
+ 	&usa19qw_device_details,
+ 	&usa19w_device_details,
++	&usa19hs_device_details,
+ 	&usa28_device_details,
+ 	&usa28x_device_details,
+ 	&usa28xa_device_details,
+@@ -464,6 +490,7 @@ static struct usb_device_id keyspan_ids_
+ 	{ USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa19w_product_id) },
+ 	{ USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa19qi_product_id) },
+ 	{ USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa19qw_product_id) },
++	{ USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa19hs_product_id) },
+ 	{ USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_mpr_product_id) },
+ 	{ USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa28_product_id) },
+ 	{ USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa28x_product_id) },
+@@ -544,8 +571,8 @@ static struct usb_serial_device_type key
+ 	.short_name		= "keyspan_1",
+ 	.id_table		= keyspan_1port_ids,
+ 	.num_interrupt_in	= NUM_DONT_CARE,
+-	.num_bulk_in		= 3,
+-	.num_bulk_out		= 4,
++	.num_bulk_in		= NUM_DONT_CARE,
++	.num_bulk_out		= NUM_DONT_CARE,
+ 	.num_ports		= 1,
+ 	.open			= keyspan_open,
+ 	.close			= keyspan_close,
+--- linux-2.6.0-test6/drivers/usb/serial/keyspan_usa26msg.h	2003-09-08 13:58:58.000000000 -0700
++++ 25/drivers/usb/serial/keyspan_usa26msg.h	2003-10-05 00:33:24.000000000 -0700
+@@ -4,7 +4,7 @@
+ 	Copyright (C) 1998-2000 InnoSys Incorporated.  All Rights Reserved
+ 	This file is available under a BSD-style copyright
+ 
+-	Keyspan USB Async Firmware to run on Anchor EZ-USB
++	Keyspan USB Async Message Formats for the USA28X
+ 
+ 	Redistribution and use in source and binary forms, with or without
+ 	modification, are permitted provided that the following conditions are
+@@ -19,11 +19,7 @@
+ 
+         	This file is available under a BSD-style copyright
+ 
+-	2. Redistributions in binary form must reproduce the above copyright
+-   	notice, this list of conditions and the following disclaimer in the
+-   	documentation and/or other materials provided with the distribution.
+-
+-	3. The name of InnoSys Incorporated may not be used to endorse or promote
++	2. The name of InnoSys Incorporated may not be used to endorse or promote
+    	products derived from this software without specific prior written
+    	permission.
+ 
+--- linux-2.6.0-test6/drivers/usb/serial/keyspan_usa28msg.h	2003-09-08 13:58:58.000000000 -0700
++++ 25/drivers/usb/serial/keyspan_usa28msg.h	2003-10-05 00:33:24.000000000 -0700
+@@ -4,7 +4,7 @@
+ 	Copyright (C) 1998-2000 InnoSys Incorporated.  All Rights Reserved
+ 	This file is available under a BSD-style copyright
+ 
+-	Keyspan USB Async Firmware to run on Anchor EZ-USB
++	Keyspan USB Async Message Formats for the USA26X
+ 
+ 	Redistribution and use in source and binary forms, with or without
+ 	modification, are permitted provided that the following conditions are
+@@ -19,11 +19,7 @@
+ 
+         	This file is available under a BSD-style copyright
+ 
+-	2. Redistributions in binary form must reproduce the above copyright
+-   	notice, this list of conditions and the following disclaimer in the
+-   	documentation and/or other materials provided with the distribution.
+-
+-	3. The name of InnoSys Incorporated may not be used to endorse or promote
++	2. The name of InnoSys Incorporated may not be used to endorse or promote
+    	products derived from this software without specific prior written
+    	permission.
+ 
+--- linux-2.6.0-test6/drivers/usb/serial/keyspan_usa49msg.h	2003-09-08 13:58:58.000000000 -0700
++++ 25/drivers/usb/serial/keyspan_usa49msg.h	2003-10-05 00:33:24.000000000 -0700
+@@ -4,7 +4,7 @@
+ 	Copyright (C) 1998-2000 InnoSys Incorporated.  All Rights Reserved
+ 	This file is available under a BSD-style copyright
+ 
+-	Keyspan USB Async Firmware to run on Anchor EZ-USB
++	Keyspan USB Async Message Formats for the USA49W
+ 
+ 	Redistribution and use in source and binary forms, with or without
+ 	modification, are permitted provided that the following conditions are
+@@ -19,11 +19,7 @@
+ 
+         	This file is available under a BSD-style copyright
+ 
+-	2. Redistributions in binary form must reproduce the above copyright
+-   	notice, this list of conditions and the following disclaimer in the
+-   	documentation and/or other materials provided with the distribution.
+-
+-	3. The name of InnoSys Incorporated may not be used to endorse or promote
++	2. The name of InnoSys Incorporated may not be used to endorse or promote
+    	products derived from this software without specific prior written
+    	permission.
+ 
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/usb/serial/keyspan_usa90msg.h	2003-10-05 00:33:24.000000000 -0700
+@@ -0,0 +1,198 @@
++/*
++	usa90msg.h
++
++	Copyright (c) 1998-2003 InnoSys Incorporated.  All Rights Reserved
++	This file is available under a BSD-style copyright
++
++	Keyspan USB Async Message Formats for the USA19HS
++
++	Redistribution and use in source and binary forms, with or without
++	modification, are permitted provided that the following conditions are
++	met:
++
++	1. Redistributions of source code must retain this licence text
++   	without modification, this list of conditions, and the following
++   	disclaimer.  The following copyright notice must appear immediately at
++   	the beginning of all source files:
++
++        	Copyright (c) 1998-2003 InnoSys Incorporated.  All Rights Reserved
++
++        	This file is available under a BSD-style copyright
++
++	2. The name of InnoSys Incorprated may not be used to endorse or promote
++   	products derived from this software without specific prior written
++   	permission.
++
++	THIS SOFTWARE IS PROVIDED BY INNOSYS CORP. ``AS IS'' AND ANY EXPRESS OR
++	IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++	OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
++	NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
++	INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
++	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
++	SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
++	CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++	LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++	OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++	SUCH DAMAGE.    
++
++	Revisions:
++
++	2003feb14		add setTxMode/txMode  and cancelRxXoff to portControl
++	2003mar21		change name of PARITY_0/1 to add MARK/SPACE
++*/
++
++#ifndef	__USA90MSG__
++#define	__USA90MSG__
++
++struct keyspan_usa90_portControlMessage
++{
++	/*
++		there are three types of "commands" sent in the control message:
++
++		1.	configuration changes which must be requested by setting
++			the corresponding "set" flag (and should only be requested
++			when necessary, to reduce overhead on the device):
++	*/
++
++	u8	setClocking,	// host requests baud rate be set
++		baudLo,			// host does baud divisor calculation
++		baudHi,			// host does baud divisor calculation 
++		
++		setLcr,			// host requests lcr be set
++		lcr,			// use PARITY, STOPBITS, DATABITS below
++		
++		setRxMode,		// set receive mode
++		rxMode,			// RXMODE_DMA or RXMODE_BYHAND
++
++		setTxMode,		// set transmit mode
++		txMode,			// TXMODE_DMA or TXMODE_BYHAND
++
++		setTxFlowControl,	// host requests tx flow control be set
++		txFlowControl	,	// use TX_FLOW... bits below
++		setRxFlowControl,	// host requests rx flow control be set
++		rxFlowControl,	// use RX_FLOW... bits below
++		sendXoff,		// host requests XOFF transmitted immediately
++		sendXon,		// host requests XON char transmitted
++		xonChar,		// specified in current character format
++		xoffChar,		// specified in current character format
++
++		sendChar,		// host requests char transmitted immediately
++		txChar,			// character to send
++
++		setRts,			// host requests RTS output be set
++		rts,			// 1=on, 0=off
++		setDtr, 		// host requests DTR output be set
++		dtr;			// 1=on, 0=off
++
++	
++	/*
++		2.	configuration data which is simply used as is 
++			and must be specified correctly in every host message.
++	*/
++
++	u8	rxForwardingLength,  // forward when this number of chars available
++		rxForwardingTimeout, // (1-31 in ms)
++		txAckSetting;	   // 0=don't ack, 1=normal, 2-255 TBD...
++	/*
++		3.	Firmware states which cause actions if they change					
++		and must be specified correctly in every host message.
++	*/
++
++	u8	portEnabled,	// 0=disabled, 1=enabled
++		txFlush,		// 0=normal, 1=toss outbound data
++		txBreak,		// 0=break off, 1=break on
++		loopbackMode;	// 0=no loopback, 1=loopback enabled
++
++	/*
++		4.	commands which are flags only; these are processed in order
++			(so that, e.g., if rxFlush and rxForward flags are set, the
++			port will have no data to forward); any non-zero value 
++			is respected
++	*/
++
++	u8	rxFlush,		// toss inbound data
++		rxForward,		// forward all inbound data, NOW (as if fwdLen==1)
++		cancelRxXoff,	// cancel any receive XOFF state (_txXoff)
++		returnStatus;	// return current status NOW
++};
++
++// defines for bits in lcr
++#define		USA_DATABITS_5		0x00
++#define		USA_DATABITS_6		0x01
++#define		USA_DATABITS_7		0x02
++#define		USA_DATABITS_8		0x03
++#define		STOPBITS_5678_1		0x00	// 1 stop bit for all byte sizes
++#define		STOPBITS_5_1p5		0x04	// 1.5 stop bits for 5-bit byte
++#define		STOPBITS_678_2		0x04	// 2 stop bits for 6-8 bit byte
++#define		USA_PARITY_NONE		0x00
++#define		USA_PARITY_ODD		0x08
++#define		USA_PARITY_EVEN		0x18
++#define		PARITY_MARK_1  		0x28   	// force parity MARK
++#define		PARITY_SPACE_0 		0x38	// force parity SPACE
++
++#define		TXFLOW_CTS			0x04	
++#define		TXFLOW_DSR			0x08
++#define		TXFLOW_XOFF			0x01	
++#define		TXFLOW_XOFF_ANY		0x02	
++#define		TXFLOW_XOFF_BITS	(TXFLOW_XOFF | TXFLOW_XOFF_ANY)
++
++#define		RXFLOW_XOFF			0x10	
++#define		RXFLOW_RTS			0x20	
++#define		RXFLOW_DTR			0x40
++#define		RXFLOW_DSR_SENSITIVITY	0x80
++
++#define		RXMODE_BYHAND		0x00	
++#define		RXMODE_DMA			0x02	
++
++#define		TXMODE_BYHAND		0x00	
++#define		TXMODE_DMA			0x02	
++
++
++// all things called "StatusMessage" are sent on the status endpoint
++
++struct keyspan_usa90_portStatusMessage	
++{
++	u8	msr,			// reports the actual MSR register
++		cts,			// reports CTS pin
++		dcd,			// reports DCD pin
++		dsr,			// reports DSR pin
++		ri,				// reports RI pin
++		_txXoff,		// port is in XOFF state (we received XOFF)
++		rxBreak,		// reports break state
++		rxOverrun,		// count of overrun errors (since last reported)
++		rxParity,		// count of parity errors (since last reported)
++		rxFrame,		// count of frame errors (since last reported)
++		portState,		// PORTSTATE_xxx bits (useful for debugging)
++		messageAck,		// message acknowledgement
++		charAck,		// character acknowledgement
++		controlResponse;	// (value = returnStatus) a control message has been processed 
++};
++
++// bits in RX data message when STAT byte is included
++
++#define	RXERROR_OVERRUN		0x02
++#define	RXERROR_PARITY		0x04
++#define	RXERROR_FRAMING		0x08
++#define	RXERROR_BREAK		0x10
++
++#define	PORTSTATE_ENABLED	0x80
++#define	PORTSTATE_TXFLUSH	0x01
++#define	PORTSTATE_TXBREAK	0x02
++#define	PORTSTATE_LOOPBACK 	0x04
++
++// MSR bits
++
++#define MSR_dCTS	  		0x01		// CTS has changed since last report	
++#define MSR_dDSR	  		0x02
++#define MSR_dRI				0x04
++#define MSR_dDCD	  		0x08
++
++#define MSR_CTS				0x10	  	// current state of CTS
++#define MSR_DSR				0x20
++#define MSR_RI				0x40
++#define MSR_DCD				0x80
++
++// ie: the maximum length of an endpoint buffer
++#define		MAX_DATA_LEN			64
++
++#endif
+--- linux-2.6.0-test6/drivers/usb/storage/freecom.c	2003-07-13 21:44:34.000000000 -0700
++++ 25/drivers/usb/storage/freecom.c	2003-10-05 00:33:24.000000000 -0700
+@@ -101,7 +101,8 @@ struct freecom_status {
+ #define FCM_PACKET_IDE_READ	0xC0
+ 
+ /* All packets (except for status) are 64 bytes long. */
+-#define FCM_PACKET_LENGTH	64
++#define FCM_PACKET_LENGTH		64
++#define FCM_STATUS_PACKET_LENGTH	4
+ 
+ static int
+ freecom_readdata (Scsi_Cmnd *srb, struct us_data *us,
+@@ -216,7 +217,7 @@ int freecom_transport(Scsi_Cmnd *srb, st
+ 	/* There are times we can optimize out this status read, but it
+ 	 * doesn't hurt us to always do it now. */
+ 	result = usb_stor_bulk_transfer_buf (us, ipipe, fst,
+-			FCM_PACKET_LENGTH, &partial);
++			FCM_STATUS_PACKET_LENGTH, &partial);
+ 	US_DEBUGP("foo Status result %d %u\n", result, partial);
+ 	if (result != USB_STOR_XFER_GOOD)
+ 		return USB_STOR_TRANSPORT_ERROR;
+@@ -256,10 +257,10 @@ int freecom_transport(Scsi_Cmnd *srb, st
+ 
+ 		/* get the data */
+ 		result = usb_stor_bulk_transfer_buf (us, ipipe, fst,
+-				FCM_PACKET_LENGTH, &partial);
++				FCM_STATUS_PACKET_LENGTH, &partial);
+ 
+ 		US_DEBUGP("bar Status result %d %u\n", result, partial);
+-		if (result > USB_STOR_XFER_SHORT)
++		if (result != USB_STOR_XFER_GOOD)
+ 			return USB_STOR_TRANSPORT_ERROR;
+ 
+ 		US_DEBUG(pdump ((void *) fst, partial));
+@@ -302,6 +303,9 @@ int freecom_transport(Scsi_Cmnd *srb, st
+ 
+ 	switch (us->srb->sc_data_direction) {
+ 	case SCSI_DATA_READ:
++		/* catch bogus "read 0 length" case */
++		if (!length)
++			break;
+ 		/* Make sure that the status indicates that the device
+ 		 * wants data as well. */
+ 		if ((fst->Status & DRQ_STAT) == 0 || (fst->Reason & 3) != 2) {
+@@ -331,6 +335,9 @@ int freecom_transport(Scsi_Cmnd *srb, st
+ 		break;
+ 
+ 	case SCSI_DATA_WRITE:
++		/* catch bogus "write 0 length" case */
++		if (!length)
++			break;
+ 		/* Make sure the status indicates that the device wants to
+ 		 * send us data. */
+ 		/* !!IMPLEMENT!! */
+@@ -362,6 +369,7 @@ int freecom_transport(Scsi_Cmnd *srb, st
+ 		break;
+ 
+ 	default:
++		/* should never hit here -- filtered in usb.c */
+ 		US_DEBUGP ("freecom unimplemented direction: %d\n",
+ 				us->srb->sc_data_direction);
+ 		// Return fail, SCSI seems to handle this better.
+--- linux-2.6.0-test6/drivers/usb/storage/unusual_devs.h	2003-09-27 18:57:46.000000000 -0700
++++ 25/drivers/usb/storage/unusual_devs.h	2003-10-05 00:33:24.000000000 -0700
+@@ -394,6 +394,12 @@ UNUSUAL_DEV( 0x0686, 0x4011, 0x0001, 0x0
+ 		"Dimage F300",
+ 		US_SC_SCSI, US_PR_BULK, NULL, 0 ),
+ 
++/* Reported by Miguel A. Fosas <amn3s1a@ono.com> */
++UNUSUAL_DEV(  0x0686, 0x4017, 0x0001, 0x0001,
++                "Minolta",
++                "DIMAGE E223",
++                US_SC_SCSI, US_PR_DEVICE, NULL, 0 ),
++
+ UNUSUAL_DEV(  0x0693, 0x0002, 0x0100, 0x0100, 
+ 		"Hagiwara",
+ 		"FlashGate SmartMedia",
+@@ -542,7 +548,7 @@ UNUSUAL_DEV(  0x07c4, 0xa400, 0x0000, 0x
+  * - They don't like the INQUIRY command. So we must handle this command
+  *   of the SCSI layer ourselves.
+  */
+-UNUSUAL_DEV( 0x07cf, 0x1001, 0x1000, 0x9009,
++UNUSUAL_DEV( 0x07cf, 0x1001, 0x1000, 0x5009,
+ 		"Casio",
+ 		"QV DigitalCamera",
+ 		US_SC_8070, US_PR_CB, NULL,
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/drivers/video/asiliantfb.c	2003-10-05 00:34:22.000000000 -0700
+@@ -0,0 +1,619 @@
++/*
++ * drivers/video/asiliantfb.c
++ *  frame buffer driver for Asiliant 69000 chip
++ *  Copyright (C) 2001-2003 Saito.K & Jeanne
++ *
++ *  from driver/video/chipsfb.c and,
++ *
++ *  drivers/video/asiliantfb.c -- frame buffer device for
++ *  Asiliant 69030 chip (formerly Intel, formerly Chips & Technologies)
++ *  Author: apc@agelectronics.co.uk
++ *  Copyright (C) 2000 AG Electronics
++ *  Note: the data sheets don't seem to be available from Asiliant.
++ *  They are available by searching developer.intel.com, but are not otherwise
++ *  linked to.
++ *
++ *  This driver should be portable with minimal effort to the 69000 display
++ *  chip, and to the twin-display mode of the 69030.
++ *  Contains code from Thomas Hhenleitner <th@visuelle-maschinen.de> (thanks)
++ *
++ *  Derived from the CT65550 driver chipsfb.c:
++ *  Copyright (C) 1998 Paul Mackerras
++ *  ...which was derived from the Powermac "chips" driver:
++ *  Copyright (C) 1997 Fabio Riccardi.
++ *  And from the frame buffer device for Open Firmware-initialized devices:
++ *  Copyright (C) 1997 Geert Uytterhoeven.
++ *
++ *  This file is subject to the terms and conditions of the GNU General Public
++ *  License. See the file COPYING in the main directory of this archive for
++ *  more details.
++ */
++
++#include <linux/config.h>
++#include <linux/module.h>
++#include <linux/kernel.h>
++#include <linux/errno.h>
++#include <linux/string.h>
++#include <linux/mm.h>
++#include <linux/tty.h>
++#include <linux/slab.h>
++#include <linux/vmalloc.h>
++#include <linux/delay.h>
++#include <linux/interrupt.h>
++#include <linux/fb.h>
++#include <linux/init.h>
++#include <linux/pci.h>
++#include <asm/io.h>
++
++static struct fb_info asiliantfb_info;
++
++/* Built in clock of the 69030 */
++const unsigned Fref = 14318180;
++
++static u32 pseudo_palette[17];
++
++#define mmio_base (p->screen_base + 0x400000)
++
++#define mm_write_ind(num, val, ap, dp)	do { \
++	writeb((num), mmio_base + (ap)); writeb((val), mmio_base + (dp)); \
++} while (0)
++
++static void mm_write_xr(struct fb_info *p, u8 reg, u8 data)
++{
++	mm_write_ind(reg, data, 0x7ac, 0x7ad);
++}
++#define write_xr(num, val)	mm_write_xr(p, num, val)
++
++static void mm_write_fr(struct fb_info *p, u8 reg, u8 data)
++{
++	mm_write_ind(reg, data, 0x7a0, 0x7a1);
++}
++#define write_fr(num, val)	mm_write_fr(p, num, val)
++
++static void mm_write_cr(struct fb_info *p, u8 reg, u8 data)
++{
++	mm_write_ind(reg, data, 0x7a8, 0x7a9);
++}
++#define write_cr(num, val)	mm_write_cr(p, num, val)
++
++static void mm_write_gr(struct fb_info *p, u8 reg, u8 data)
++{
++	mm_write_ind(reg, data, 0x79c, 0x79d);
++}
++#define write_gr(num, val)	mm_write_gr(p, num, val)
++
++static void mm_write_sr(struct fb_info *p, u8 reg, u8 data)
++{
++	mm_write_ind(reg, data, 0x788, 0x789);
++}
++#define write_sr(num, val)	mm_write_sr(p, num, val)
++
++static void mm_write_ar(struct fb_info *p, u8 reg, u8 data)
++{
++	readb(mmio_base + 0x7b4);
++	mm_write_ind(reg, data, 0x780, 0x780);
++}
++#define write_ar(num, val)	mm_write_ar(p, num, val)
++
++/*
++ * Exported functions
++ */
++int asiliantfb_init(void);
++
++static int asiliantfb_pci_init(struct pci_dev *dp, const struct pci_device_id *);
++static int asiliantfb_check_var(struct fb_var_screeninfo *var,
++				struct fb_info *info);
++static int asiliantfb_set_par(struct fb_info *info);
++static int asiliantfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
++				u_int transp, struct fb_info *info);
++
++static struct fb_ops asiliantfb_ops = {
++	.owner		= THIS_MODULE,
++	.fb_check_var	= asiliantfb_check_var,
++	.fb_set_par	= asiliantfb_set_par,
++	.fb_setcolreg	= asiliantfb_setcolreg,
++	.fb_fillrect	= cfb_fillrect,
++	.fb_copyarea	= cfb_copyarea,
++	.fb_imageblit	= cfb_imageblit,
++	.fb_cursor	= soft_cursor,
++};
++
++/* Calculate the ratios for the dot clocks without using a single long long
++ * value */
++static void asiliant_calc_dclk2(u32 *ppixclock, u8 *dclk2_m, u8 *dclk2_n, u8 *dclk2_div)
++{
++	unsigned pixclock = *ppixclock;
++	unsigned Ftarget = 1000000 * (1000000 / pixclock);
++	unsigned n;
++	unsigned best_error = 0xffffffff;
++	unsigned best_m = 0xffffffff,
++	         best_n = 0xffffffff;
++	unsigned ratio;
++	unsigned remainder;
++	unsigned char divisor = 0;
++
++	/* Calculate the frequency required. This is hard enough. */
++	ratio = 1000000 / pixclock;
++	remainder = 1000000 % pixclock;
++	Ftarget = 1000000 * ratio + (1000000 * remainder) / pixclock;
++
++	while (Ftarget < 100000000) {
++		divisor += 0x10;
++		Ftarget <<= 1;
++	}
++
++	ratio = Ftarget / Fref;
++	remainder = Ftarget % Fref;
++
++	/* This expresses the constraint that 150kHz <= Fref/n <= 5Mhz,
++	 * together with 3 <= n <= 257. */
++	for (n = 3; n <= 257; n++) {
++		unsigned m = n * ratio + (n * remainder) / Fref;
++
++		/* 3 <= m <= 257 */
++		if (m >= 3 && m <= 257) {
++			unsigned new_error = ((Ftarget * n) - (Fref * m)) >= 0 ?
++					       ((Ftarget * n) - (Fref * m)) : ((Fref * m) - (Ftarget * n));
++			if (new_error < best_error) {
++				best_n = n;
++				best_m = m;
++				best_error = new_error;
++			}
++		}
++		/* But if VLD = 4, then 4m <= 1028 */
++		else if (m <= 1028) {
++			/* remember there are still only 8-bits of precision in m, so
++			 * avoid over-optimistic error calculations */
++			unsigned new_error = ((Ftarget * n) - (Fref * (m & ~3))) >= 0 ?
++					       ((Ftarget * n) - (Fref * (m & ~3))) : ((Fref * (m & ~3)) - (Ftarget * n));
++			if (new_error < best_error) {
++				best_n = n;
++				best_m = m;
++				best_error = new_error;
++			}
++		}
++	}
++	if (best_m > 257)
++		best_m >>= 2;	/* divide m by 4, and leave VCO loop divide at 4 */
++	else
++		divisor |= 4;	/* or set VCO loop divide to 1 */
++	*dclk2_m = best_m - 2;
++	*dclk2_n = best_n - 2;
++	*dclk2_div = divisor;
++	*ppixclock = pixclock;
++	return;
++}
++
++static void asiliant_set_timing(struct fb_info *p)
++{
++	unsigned hd = p->var.xres / 8;
++	unsigned hs = (p->var.xres + p->var.right_margin) / 8;
++       	unsigned he = (p->var.xres + p->var.right_margin + p->var.hsync_len) / 8;
++	unsigned ht = (p->var.left_margin + p->var.xres + p->var.right_margin + p->var.hsync_len) / 8;
++	unsigned vd = p->var.yres;
++	unsigned vs = p->var.yres + p->var.lower_margin;
++	unsigned ve = p->var.yres + p->var.lower_margin + p->var.vsync_len;
++	unsigned vt = p->var.upper_margin + p->var.yres + p->var.lower_margin + p->var.vsync_len;
++	unsigned wd = (p->var.xres_virtual * ((p->var.bits_per_pixel+7)/8)) / 8;
++
++	if ((p->var.xres == 640) && (p->var.yres == 480) && (p->var.pixclock == 39722)) {
++	  write_fr(0x01, 0x02);  /* LCD */
++	} else {
++	  write_fr(0x01, 0x01);  /* CRT */
++	}
++
++	write_cr(0x11, (ve - 1) & 0x0f);
++	write_cr(0x00, (ht - 5) & 0xff);
++	write_cr(0x01, hd - 1);
++	write_cr(0x02, hd);
++	write_cr(0x03, ((ht - 1) & 0x1f) | 0x80);
++	write_cr(0x04, hs);
++	write_cr(0x05, (((ht - 1) & 0x20) <<2) | (he & 0x1f));
++	write_cr(0x3c, (ht - 1) & 0xc0);
++	write_cr(0x06, (vt - 2) & 0xff);
++	write_cr(0x30, (vt - 2) >> 8);
++	write_cr(0x07, 0x00);
++	write_cr(0x08, 0x00);
++	write_cr(0x09, 0x00);
++	write_cr(0x10, (vs - 1) & 0xff);
++	write_cr(0x32, ((vs - 1) >> 8) & 0xf);
++	write_cr(0x11, ((ve - 1) & 0x0f) | 0x80);
++	write_cr(0x12, (vd - 1) & 0xff);
++	write_cr(0x31, ((vd - 1) & 0xf00) >> 8);
++	write_cr(0x13, wd & 0xff);
++	write_cr(0x41, (wd & 0xf00) >> 8);
++	write_cr(0x15, (vs - 1) & 0xff);
++	write_cr(0x33, ((vs - 1) >> 8) & 0xf);
++	write_cr(0x38, ((ht - 5) & 0x100) >> 8);
++	write_cr(0x16, (vt - 1) & 0xff);
++	write_cr(0x18, 0x00);
++
++	if (p->var.xres == 640) {
++	  writeb(0xc7, mmio_base + 0x784);	/* set misc output reg */
++	} else {
++	  writeb(0x07, mmio_base + 0x784);	/* set misc output reg */
++	}
++}
++
++static int asiliantfb_check_var(struct fb_var_screeninfo *var,
++			     struct fb_info *p)
++{
++	unsigned long Ftarget, ratio, remainder;
++
++	ratio = 1000000 / var->pixclock;
++	remainder = 1000000 % var->pixclock;
++	Ftarget = 1000000 * ratio + (1000000 * remainder) / var->pixclock;
++
++	/* First check the constraint that the maximum post-VCO divisor is 32,
++	 * and the maximum Fvco is 220MHz */
++	if (Ftarget > 220000000 || Ftarget < 3125000) {
++		printk(KERN_ERR "asiliantfb dotclock must be between 3.125 and 220MHz\n");
++		return -ENXIO;
++	}
++	var->xres_virtual = var->xres;
++	var->yres_virtual = var->yres;
++
++	if (var->bits_per_pixel == 24) {
++		var->red.offset = 16;
++		var->green.offset = 8;
++		var->blue.offset = 0;
++		var->red.length = var->blue.length = var->green.length = 8;
++	} else if (var->bits_per_pixel == 16) {
++		switch (var->red.offset) {
++			case 11:
++				var->green.length = 6;
++				break;
++			case 10:
++				var->green.length = 5;
++				break;
++			default:
++				return -EINVAL;
++		}
++		var->green.offset = 5;
++		var->blue.offset = 0;
++		var->red.length = var->blue.length = 5;
++	} else if (var->bits_per_pixel == 8) {
++		var->red.offset = var->green.offset = var->blue.offset = 0;
++		var->red.length = var->green.length = var->blue.length = 8;
++	}
++	return 0;
++}
++
++static int asiliantfb_set_par(struct fb_info *p)
++{
++	u8 dclk2_m;		/* Holds m-2 value for register */
++	u8 dclk2_n;		/* Holds n-2 value for register */
++	u8 dclk2_div;		/* Holds divisor bitmask */
++
++	/* Set pixclock */
++	asiliant_calc_dclk2(&p->var.pixclock, &dclk2_m, &dclk2_n, &dclk2_div);
++
++	/* Set color depth */
++	if (p->var.bits_per_pixel == 24) {
++		write_xr(0x81, 0x16);	/* 24 bit packed color mode */
++		write_xr(0x82, 0x00);	/* Disable palettes */
++		write_xr(0x20, 0x20);	/* 24 bit blitter mode */
++	} else if (p->var.bits_per_pixel == 16) {
++		if (p->var.red.offset == 11)
++			write_xr(0x81, 0x15);	/* 16 bit color mode */
++		else
++			write_xr(0x81, 0x14);	/* 15 bit color mode */
++		write_xr(0x82, 0x00);	/* Disable palettes */
++		write_xr(0x20, 0x10);	/* 16 bit blitter mode */
++	} else if (p->var.bits_per_pixel == 8) {
++		write_xr(0x0a, 0x02);	/* Linear */
++		write_xr(0x81, 0x12);	/* 8 bit color mode */
++		write_xr(0x82, 0x00);	/* Graphics gamma enable */
++		write_xr(0x20, 0x00);	/* 8 bit blitter mode */
++	}
++	p->fix.line_length = p->var.xres * (p->var.bits_per_pixel >> 3);
++	p->fix.visual = (p->var.bits_per_pixel == 8) ? FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR;
++	write_xr(0xc4, dclk2_m);
++	write_xr(0xc5, dclk2_n);
++	write_xr(0xc7, dclk2_div);
++	/* Set up the CR registers */
++	asiliant_set_timing(p);
++	return 0;
++}
++
++static int asiliantfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
++			     u_int transp, struct fb_info *p)
++{
++	if (regno > 255)
++		return 1;
++	red >>= 8;
++	green >>= 8;
++	blue >>= 8;
++
++        /* Set hardware palete */
++	writeb(regno, mmio_base + 0x790);
++	udelay(1);
++	writeb(red, mmio_base + 0x791);
++	writeb(green, mmio_base + 0x791);
++	writeb(blue, mmio_base + 0x791);
++
++	switch(p->var.bits_per_pixel) {
++	case 15:
++		if (regno < 16) {
++			((u32 *)(p->pseudo_palette))[regno] =
++				((red & 0xf8) << 7) |
++				((green & 0xf8) << 2) |
++				((blue & 0xf8) >> 3);
++		}
++		break;
++	case 16:
++		if (regno < 16) {
++			((u32 *)(p->pseudo_palette))[regno] =
++				((red & 0xf8) << 8) |
++				((green & 0xfc) << 3) |
++				((blue & 0xf8) >> 3);
++		}
++		break;
++	case 24:
++		if (regno < 24) {
++			((u32 *)(p->pseudo_palette))[regno] =
++				(red << 16)  |
++				(green << 8) |
++				(blue);
++		}
++		break;
++	}
++	return 0;
++}
++
++struct chips_init_reg {
++	unsigned char addr;
++	unsigned char data;
++};
++
++#define N_ELTS(x)	(sizeof(x) / sizeof(x[0]))
++
++static struct chips_init_reg chips_init_sr[] =
++{
++	{0x00, 0x03},		/* Reset register */
++	{0x01, 0x01},		/* Clocking mode */
++	{0x02, 0x0f},		/* Plane mask */
++	{0x04, 0x0e}		/* Memory mode */
++};
++
++static struct chips_init_reg chips_init_gr[] =
++{
++        {0x03, 0x00},		/* Data rotate */
++	{0x05, 0x00},		/* Graphics mode */
++	{0x06, 0x01},		/* Miscellaneous */
++	{0x08, 0x00}		/* Bit mask */
++};
++
++static struct chips_init_reg chips_init_ar[] =
++{
++	{0x10, 0x01},		/* Mode control */
++	{0x11, 0x00},		/* Overscan */
++	{0x12, 0x0f},		/* Memory plane enable */
++	{0x13, 0x00}		/* Horizontal pixel panning */
++};
++
++static struct chips_init_reg chips_init_cr[] =
++{
++	{0x0c, 0x00},		/* Start address high */
++	{0x0d, 0x00},		/* Start address low */
++	{0x40, 0x00},		/* Extended Start Address */
++	{0x41, 0x00},		/* Extended Start Address */
++	{0x14, 0x00},		/* Underline location */
++	{0x17, 0xe3},		/* CRT mode control */
++	{0x70, 0x00}		/* Interlace control */
++};
++
++
++static struct chips_init_reg chips_init_fr[] =
++{
++	{0x01, 0x02},
++	{0x03, 0x08},
++	{0x08, 0xcc},
++	{0x0a, 0x08},
++	{0x18, 0x00},
++	{0x1e, 0x80},
++	{0x40, 0x83},
++	{0x41, 0x00},
++	{0x48, 0x13},
++	{0x4d, 0x60},
++	{0x4e, 0x0f},
++
++	{0x0b, 0x01},
++
++	{0x21, 0x51},
++	{0x22, 0x1d},
++	{0x23, 0x5f},
++	{0x20, 0x4f},
++	{0x34, 0x00},
++	{0x24, 0x51},
++	{0x25, 0x00},
++	{0x27, 0x0b},
++	{0x26, 0x00},
++	{0x37, 0x80},
++	{0x33, 0x0b},
++	{0x35, 0x11},
++	{0x36, 0x02},
++	{0x31, 0xea},
++	{0x32, 0x0c},
++	{0x30, 0xdf},
++	{0x10, 0x0c},
++	{0x11, 0xe0},
++	{0x12, 0x50},
++	{0x13, 0x00},
++	{0x16, 0x03},
++	{0x17, 0xbd},
++	{0x1a, 0x00},
++};
++
++
++static struct chips_init_reg chips_init_xr[] =
++{
++	{0xce, 0x00},		/* set default memory clock */
++	{0xcc, 200 },	        /* MCLK ratio M */
++	{0xcd, 18  },	        /* MCLK ratio N */
++	{0xce, 0x90},		/* MCLK divisor = 2 */
++
++	{0xc4, 209 },
++	{0xc5, 118 },
++	{0xc7, 32  },
++	{0xcf, 0x06},
++	{0x09, 0x01},		/* IO Control - CRT controller extensions */
++	{0x0a, 0x02},		/* Frame buffer mapping */
++	{0x0b, 0x01},		/* PCI burst write */
++	{0x40, 0x03},		/* Memory access control */
++	{0x80, 0x82},		/* Pixel pipeline configuration 0 */
++	{0x81, 0x12},		/* Pixel pipeline configuration 1 */
++	{0x82, 0x08},		/* Pixel pipeline configuration 2 */
++
++	{0xd0, 0x0f},
++	{0xd1, 0x01},
++};
++
++static void __init chips_hw_init(struct fb_info *p)
++{
++	int i;
++
++	for (i = 0; i < N_ELTS(chips_init_xr); ++i)
++		write_xr(chips_init_xr[i].addr, chips_init_xr[i].data);
++	write_xr(0x81, 0x12);
++	write_xr(0x82, 0x08);
++	write_xr(0x20, 0x00);
++	for (i = 0; i < N_ELTS(chips_init_sr); ++i)
++		write_sr(chips_init_sr[i].addr, chips_init_sr[i].data);
++	for (i = 0; i < N_ELTS(chips_init_gr); ++i)
++		write_gr(chips_init_gr[i].addr, chips_init_gr[i].data);
++	for (i = 0; i < N_ELTS(chips_init_ar); ++i)
++		write_ar(chips_init_ar[i].addr, chips_init_ar[i].data);
++	/* Enable video output in attribute index register */
++	writeb(0x20, mmio_base + 0x780);
++	for (i = 0; i < N_ELTS(chips_init_cr); ++i)
++		write_cr(chips_init_cr[i].addr, chips_init_cr[i].data);
++	for (i = 0; i < N_ELTS(chips_init_fr); ++i)
++		write_fr(chips_init_fr[i].addr, chips_init_fr[i].data);
++}
++
++static struct fb_fix_screeninfo asiliantfb_fix __initdata = {
++	.id =		"Asiliant 69000",
++	.type =		FB_TYPE_PACKED_PIXELS,
++	.visual =	FB_VISUAL_PSEUDOCOLOR,
++	.accel =	FB_ACCEL_NONE,
++	.line_length =	640,
++	.smem_len =	0x200000,	/* 2MB */
++};
++
++static struct fb_var_screeninfo asiliantfb_var __initdata = {
++	.xres 		= 640,
++	.yres 		= 480,
++	.xres_virtual 	= 640,
++	.yres_virtual 	= 480,
++	.bits_per_pixel = 8,
++	.red 		= { .length = 8 },
++	.green 		= { .length = 8 },
++	.blue 		= { .length = 8 },
++	.height 	= -1,
++	.width 		= -1,
++	.vmode 		= FB_VMODE_NONINTERLACED,
++	.pixclock 	= 39722,
++	.left_margin 	= 48,
++	.right_margin 	= 16,
++	.upper_margin 	= 33,
++	.lower_margin 	= 10,
++	.hsync_len 	= 96,
++	.vsync_len 	= 2,
++};
++
++static void __init init_asiliant(struct fb_info *p, unsigned long addr)
++{
++	p->fix			= asiliantfb_fix;
++	p->fix.smem_start	= addr;
++	p->var			= asiliantfb_var;
++	p->fbops		= &asiliantfb_ops;
++	p->pseudo_palette	= pseudo_palette;
++	p->flags		= FBINFO_FLAG_DEFAULT;
++
++	fb_alloc_cmap(&p->cmap, 256, 0);
++
++	if (register_framebuffer(p) < 0) {
++		printk(KERN_ERR "C&T 69000 framebuffer failed to register\n");
++		return;
++	}
++
++	printk(KERN_INFO "fb%d: Asiliant 69000 frame buffer (%dK RAM detected)\n",
++		p->node, p->fix.smem_len / 1024);
++
++	writeb(0xff, mmio_base + 0x78c);
++	chips_hw_init(p);
++}
++
++static int __devinit
++asiliantfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
++{
++	struct fb_info *p = &asiliantfb_info;
++	unsigned long addr, size;
++
++	if ((dp->resource[0].flags & IORESOURCE_MEM) == 0)
++		return -ENODEV;
++	addr = pci_resource_start(dp, 0);
++	size = pci_resource_len(dp, 0);
++	if (addr == 0)
++		return -ENODEV;
++	if (p->screen_base != 0)
++		return -EBUSY;
++	if (!request_mem_region(addr, size, "asiliantfb"))
++		return -EBUSY;
++
++	p->screen_base = ioremap(addr, 0x800000);
++	if (p->screen_base == NULL) {
++		release_mem_region(addr, size);
++		return -ENOMEM;
++	}
++
++	pci_write_config_dword(dp, 4, 0x02800083);
++	writeb(3, addr + 0x400784);
++
++	init_asiliant(p, addr);
++
++	/* Clear the entire framebuffer */
++	memset(p->screen_base, 0, 0x200000);
++
++	pci_set_drvdata(dp, p);
++	return 0;
++}
++
++static void __devexit asiliantfb_remove(struct pci_dev *dp)
++{
++	struct fb_info *p = pci_get_drvdata(dp);
++
++	if (p != &asiliantfb_info || p->screen_base == NULL)
++		return;
++	unregister_framebuffer(p);
++	iounmap(p->screen_base);
++	p->screen_base = NULL;
++	release_mem_region(pci_resource_start(dp, 0), pci_resource_len(dp, 0));
++}
++
++static struct pci_device_id asiliantfb_pci_tbl[] __devinitdata = {
++	{ PCI_VENDOR_ID_CT, PCI_DEVICE_ID_CT_69000, PCI_ANY_ID, PCI_ANY_ID },
++	{ 0 }
++};
++
++MODULE_DEVICE_TABLE(pci, asiliantfb_pci_tbl);
++
++static struct pci_driver asiliantfb_driver = {
++	.name =		"asiliantfb",
++	.id_table =	asiliantfb_pci_tbl,
++	.probe =	asiliantfb_pci_init,
++	.remove =	__devexit_p(asiliantfb_remove),
++};
++
++int __init asiliantfb_init(void)
++{
++	return pci_module_init(&asiliantfb_driver);
++}
++
++static void __exit asiliantfb_exit(void)
++{
++	pci_unregister_driver(&asiliantfb_driver);
++}
++
++MODULE_LICENSE("GPL");
+--- linux-2.6.0-test6/drivers/video/aty/aty128fb.c	2003-08-08 22:55:13.000000000 -0700
++++ 25/drivers/video/aty/aty128fb.c	2003-10-05 00:34:46.000000000 -0700
+@@ -2041,9 +2041,9 @@ aty128fb_setcolreg(u_int regno, u_int re
+ #define ATY_MIRROR_CRT_ON	0x00000002
+ 
+ /* out param: u32*	backlight value: 0 to 15 */
+-#define FBIO_ATY128_GET_MIRROR	_IOR('@', 1, sizeof(__u32*))
++#define FBIO_ATY128_GET_MIRROR	_IOR('@', 1, __u32*)
+ /* in param: u32*	backlight value: 0 to 15 */
+-#define FBIO_ATY128_SET_MIRROR	_IOW('@', 2, sizeof(__u32*))
++#define FBIO_ATY128_SET_MIRROR	_IOW('@', 2, __u32*)
+ 
+ static int aty128fb_ioctl(struct inode *inode, struct file *file, u_int cmd,
+ 			  u_long arg, struct fb_info *info)
+--- linux-2.6.0-test6/drivers/video/aty/Makefile	2003-06-14 12:18:06.000000000 -0700
++++ 25/drivers/video/aty/Makefile	2003-10-05 00:34:22.000000000 -0700
+@@ -4,4 +4,3 @@ obj-$(CONFIG_FB_ATY128) += aty128fb.o
+ atyfb-y				:= atyfb_base.o mach64_accel.o
+ atyfb-$(CONFIG_FB_ATY_GX)	+= mach64_gx.o
+ atyfb-$(CONFIG_FB_ATY_CT)	+= mach64_ct.o mach64_cursor.o
+-atyfb-objs			:= $(atyfb-y)
+--- linux-2.6.0-test6/drivers/video/chipsfb.c	2003-08-08 22:55:13.000000000 -0700
++++ 25/drivers/video/chipsfb.c	2003-10-05 00:34:22.000000000 -0700
+@@ -85,7 +85,7 @@ static struct pmu_sleep_notifier chips_s
+ /*
+  * Exported functions
+  */
+-int chips_init(void);
++int chipsfb_init(void);
+ 
+ static int chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *);
+ static int chipsfb_check_var(struct fb_var_screeninfo *var,
+@@ -460,7 +460,7 @@ static struct pci_driver chipsfb_driver 
+ 	.remove =	__devexit_p(chipsfb_remove),
+ };
+ 
+-int __init chips_init(void)
++int __init chipsfb_init(void)
+ {
+ 	return pci_module_init(&chipsfb_driver);
+ }
+--- linux-2.6.0-test6/drivers/video/console/fbcon.c	2003-06-14 12:18:25.000000000 -0700
++++ 25/drivers/video/console/fbcon.c	2003-10-05 00:34:22.000000000 -0700
+@@ -195,8 +195,7 @@ static void fb_flashcursor(void *private
+ {
+ 	struct fb_info *info = (struct fb_info *) private;
+ 
+-	/* Test to see if the cursor is erased but still on */
+-	if (!info || (info->cursor.rop == ROP_COPY))
++	if (!info)
+ 		return;
+ 	info->cursor.enable ^= 1;
+ 	info->fbops->fb_cursor(info, &info->cursor);
+@@ -226,8 +225,7 @@ static void cursor_timer_handler(unsigne
+ 	struct fb_info *info = (struct fb_info *) dev_addr;
+ 	
+ 	schedule_work(&info->queue);	
+-	cursor_timer.expires = jiffies + HZ / 5;
+-	add_timer(&cursor_timer);
++	mod_timer(&cursor_timer, jiffies + HZ/5);
+ }
+ 
+ int __init fb_console_setup(char *this_opt)
+@@ -308,97 +306,6 @@ int set_con2fb_map(int unit, int newidx)
+ }
+ 
+ /*
+- * drawing helpers
+- */
+-static void putcs_unaligned(struct vc_data *vc, struct fb_info *info,
+-			    struct fb_image *image, int count,
+-			    const unsigned short *s)
+-{
+-	unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
+-	unsigned int width = (vc->vc_font.width + 7) >> 3;
+-	unsigned int cellsize = vc->vc_font.height * width;
+-	unsigned int maxcnt = info->pixmap.size/cellsize;
+-	unsigned int shift_low = 0, mod = vc->vc_font.width % 8;
+-	unsigned int shift_high = 8, size, pitch, cnt, k;
+-	unsigned int buf_align = info->pixmap.buf_align - 1;
+-	unsigned int scan_align = info->pixmap.scan_align - 1;
+-	unsigned int idx = vc->vc_font.width >> 3;
+-	u8 mask, *src, *dst, *dst0;
+-
+-	while (count) {
+-		if (count > maxcnt)
+-			cnt = k = maxcnt;
+-		else
+-			cnt = k = count;
+-
+-		image->width = vc->vc_font.width * cnt;
+-		pitch = ((image->width + 7) >> 3) + scan_align;
+-		pitch &= ~scan_align;
+-		size = pitch * vc->vc_font.height + buf_align;
+-		size &= ~buf_align;
+-		dst0 = info->pixmap.addr + fb_get_buffer_offset(info, size);
+-		image->data = dst0;
+-		while (k--) {
+-			src = vc->vc_font.data + (scr_readw(s++) & charmask)*
+-			cellsize;
+-			dst = dst0;
+-			mask = (u8) (0xfff << shift_high);
+-			move_buf_unaligned(info, dst, src, pitch, image->height,
+-					mask, shift_high, shift_low, mod, idx);
+-			shift_low += mod;
+-			dst0 += (shift_low >= 8) ? width : width - 1;
+-			shift_low &= 7;
+-			shift_high = 8 - shift_low;
+-		}
+-		info->fbops->fb_imageblit(info, image);
+-		image->dx += cnt * vc->vc_font.width;
+-		count -= cnt;
+-		atomic_dec(&info->pixmap.count);
+-		smp_mb__after_atomic_dec();
+-	}
+-}
+-
+-static void putcs_aligned(struct vc_data *vc, struct fb_info *info,
+-			  struct fb_image *image, int count,
+-			  const unsigned short *s)
+-{
+-	unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
+-	unsigned int width = vc->vc_font.width >> 3;
+-	unsigned int cellsize = vc->vc_font.height * width;
+-	unsigned int maxcnt = info->pixmap.size/cellsize;
+-	unsigned int scan_align = info->pixmap.scan_align - 1;
+-	unsigned int buf_align = info->pixmap.buf_align - 1;
+-	unsigned int pitch, cnt, size, k;
+-	u8 *src, *dst, *dst0;
+-
+-	while (count) {
+-		if (count > maxcnt)
+-			cnt = k = maxcnt;
+-		else
+-			cnt = k = count;
+-		
+-		pitch = width * cnt + scan_align;
+-		pitch &= ~scan_align;
+-		size = pitch * vc->vc_font.height + buf_align;
+-		size &= ~buf_align;
+-		image->width = vc->vc_font.width * cnt;
+-		dst0 = info->pixmap.addr + fb_get_buffer_offset(info, size);
+-		image->data = dst0;
+-		while (k--) {
+-			src = vc->vc_font.data + (scr_readw(s++)&charmask)*cellsize;
+-			dst = dst0;
+-			move_buf_aligned(info, dst, src, pitch, width, image->height);
+-			dst0 += width;
+-		}
+-		info->fbops->fb_imageblit(info, image);
+-		image->dx += cnt * vc->vc_font.width;
+-		count -= cnt;
+-		atomic_dec(&info->pixmap.count);
+-		smp_mb__after_atomic_dec();
+-	}
+-}
+-
+-/*
+  * Accelerated handlers.
+  */
+ void accel_bmove(struct vc_data *vc, struct fb_info *info, int sy, 
+@@ -432,48 +339,21 @@ void accel_clear(struct vc_data *vc, str
+ 	info->fbops->fb_fillrect(info, &region);
+ }	
+ 
+-static void accel_putc(struct vc_data *vc, struct fb_info *info,
+-                      int c, int ypos, int xpos)
++void accel_putcs(struct vc_data *vc, struct fb_info *info,
++			const unsigned short *s, int count, int yy, int xx)
+ {
+ 	unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
+ 	unsigned int width = (vc->vc_font.width + 7) >> 3;
++	unsigned int cellsize = vc->vc_font.height * width;
++	unsigned int maxcnt = info->pixmap.size/cellsize;
+ 	unsigned int scan_align = info->pixmap.scan_align - 1;
+ 	unsigned int buf_align = info->pixmap.buf_align - 1;
++	unsigned int shift_low = 0, mod = vc->vc_font.width % 8;
++	unsigned int shift_high = 8, pitch, cnt, size, k;
+ 	int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
+ 	int fgshift = (vc->vc_hi_font_mask) ? 9 : 8;
+-	unsigned int size, pitch;
+-	struct fb_image image;
+-	u8 *src, *dst;
+-
+-	image.dx = xpos * vc->vc_font.width;
+-	image.dy = ypos * vc->vc_font.height;
+-	image.width = vc->vc_font.width;
+-	image.height = vc->vc_font.height;
+-	image.fg_color = attr_fgcol(fgshift, c);
+-	image.bg_color = attr_bgcol(bgshift, c);
+-	image.depth = 1;
+-
+-	pitch = width + scan_align;
+-	pitch &= ~scan_align;
+-	size = pitch * vc->vc_font.height;
+-	size += buf_align;
+-	size &= ~buf_align;
+-	dst = info->pixmap.addr + fb_get_buffer_offset(info, size);
+-	image.data = dst;
+-	src = vc->vc_font.data + (c & charmask) * vc->vc_font.height * width;
+-
+-	move_buf_aligned(info, dst, src, pitch, width, image.height);
+-
+-	info->fbops->fb_imageblit(info, &image);
+-	atomic_dec(&info->pixmap.count);
+-	smp_mb__after_atomic_dec();
+-}
+-
+-void accel_putcs(struct vc_data *vc, struct fb_info *info,
+-			const unsigned short *s, int count, int yy, int xx)
+-{
+-	int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
+-	int fgshift = (vc->vc_hi_font_mask) ? 9 : 8;
++	unsigned int idx = vc->vc_font.width >> 3;
++	u8 *src, *dst, *dst0, mask;
+ 	struct fb_image image;
+ 	u16 c = scr_readw(s);
+ 
+@@ -484,10 +364,44 @@ void accel_putcs(struct vc_data *vc, str
+ 	image.height = vc->vc_font.height;
+ 	image.depth = 1;
+ 
+-	if (!(vc->vc_font.width & 7))
+-               putcs_aligned(vc, info, &image, count, s);
+-        else
+-               putcs_unaligned(vc, info, &image, count, s);
++	while (count) {
++		if (count > maxcnt)
++			cnt = k = maxcnt;
++		else
++			cnt = k = count;
++
++		image.width = vc->vc_font.width * cnt;
++		pitch = ((image.width + 7) >> 3) + scan_align;
++		pitch &= ~scan_align;
++		size = pitch * vc->vc_font.height + buf_align;
++		size &= ~buf_align;
++		dst0 = fb_get_buffer_offset(info, &info->pixmap, size);
++		image.data = dst0;
++		while (k--) {
++			src = vc->vc_font.data + (scr_readw(s++) & charmask)*cellsize;
++			dst = dst0;
++
++			if (mod) {
++				mask = (u8) (0xfff << shift_high);
++				move_buf_unaligned(info, &info->pixmap, dst, src, pitch,
++						   image.height, mask, shift_high,
++						   shift_low, mod, idx);
++				shift_low += mod;
++				dst0 += (shift_low >= 8) ? width : width - 1;
++				shift_low &= 7;
++				shift_high = 8 - shift_low;
++			} else {
++				move_buf_aligned(info, &info->pixmap, dst, src, pitch, idx,
++						 image.height);
++				dst0 += width;
++			}
++		}
++		info->fbops->fb_imageblit(info, &image);
++		image.dx += cnt * vc->vc_font.width;
++		count -= cnt;
++		atomic_dec(&info->pixmap.count);
++		smp_mb__after_atomic_dec();
++	}
+ }
+ 
+ void accel_clear_margins(struct vc_data *vc, struct fb_info *info,
+@@ -676,7 +590,7 @@ static const char *fbcon_startup(void)
+ 	if (!info->queue.func) {
+ 		INIT_WORK(&info->queue, fb_flashcursor, info);
+ 		
+-		cursor_timer.expires = jiffies + HZ / 50;
++		cursor_timer.expires = jiffies + HZ / 5;
+ 		cursor_timer.data = (unsigned long ) info;
+ 		add_timer(&cursor_timer);
+ 	}
+@@ -728,15 +642,13 @@ static __inline__ void updatescrollmode(
+ static void fbcon_set_display(struct vc_data *vc, int init, int logo)
+ {
+ 	struct fb_info *info = registered_fb[(int) con2fb_map[vc->vc_num]];
++	int nr_rows, nr_cols, old_rows, old_cols, i, charcnt = 256;
+ 	struct display *p = &fb_display[vc->vc_num];
+-	int nr_rows, nr_cols;
+-	int old_rows, old_cols;
+ 	unsigned short *save = NULL, *r, *q;
+-	int i, charcnt = 256;
+ 	struct font_desc *font;
+ 
+ 	if (vc->vc_num != fg_console || (info->flags & FBINFO_FLAG_MODULE) ||
+-	    info->fix.type == FB_TYPE_TEXT)
++	    (info->fix.type == FB_TYPE_TEXT))
+ 		logo = 0;
+ 
+ 	info->var.xoffset = info->var.yoffset = p->yscroll = 0;	/* reset wrap/pan */
+@@ -960,11 +872,19 @@ static void fbcon_clear(struct vc_data *
+ 		accel_clear(vc, info, real_y(p, sy), sx, height, width);
+ }
+ 
+-
+ static void fbcon_putc(struct vc_data *vc, int c, int ypos, int xpos)
+ {
+ 	struct fb_info *info = registered_fb[(int) con2fb_map[vc->vc_num]];
++	unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
++	unsigned int scan_align = info->pixmap.scan_align - 1;
++	unsigned int buf_align = info->pixmap.buf_align - 1;
++	unsigned int width = (vc->vc_font.width + 7) >> 3;
++	int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
++	int fgshift = (vc->vc_hi_font_mask) ? 9 : 8;
+ 	struct display *p = &fb_display[vc->vc_num];
++	unsigned int size, pitch;
++	struct fb_image image;
++	u8 *src, *dst;
+ 
+ 	if (!info->fbops->fb_blank && console_blanked)
+ 		return;
+@@ -972,7 +892,31 @@ static void fbcon_putc(struct vc_data *v
+ 	if (vt_cons[vc->vc_num]->vc_mode != KD_TEXT)
+ 		return;
+ 
+-	accel_putc(vc, info, c, real_y(p, ypos), xpos);
++	image.dx = xpos * vc->vc_font.width;
++	image.dy = real_y(p, ypos) * vc->vc_font.height;
++	image.width = vc->vc_font.width;
++	image.height = vc->vc_font.height;
++	image.fg_color = attr_fgcol(fgshift, c);
++	image.bg_color = attr_bgcol(bgshift, c);
++	image.depth = 1;
++
++	src = vc->vc_font.data + (c & charmask) * vc->vc_font.height * width;
++
++	pitch = width + scan_align;
++	pitch &= ~scan_align;
++	size = pitch * vc->vc_font.height;
++	size += buf_align;
++	size &= ~buf_align;
++
++	dst = fb_get_buffer_offset(info, &info->pixmap, size);
++	image.data = dst;
++
++	move_buf_aligned(info, &info->pixmap, dst, src, pitch, width,
++			image.height);
++
++	info->fbops->fb_imageblit(info, &image);
++	atomic_dec(&info->pixmap.count);
++	smp_mb__after_atomic_dec();
+ }
+ 
+ static void fbcon_putcs(struct vc_data *vc, const unsigned short *s,
+@@ -994,12 +938,16 @@ static void fbcon_cursor(struct vc_data 
+ {
+ 	struct fb_info *info = registered_fb[(int) con2fb_map[vc->vc_num]];
+ 	unsigned short charmask = vc->vc_hi_font_mask ? 0x1ff : 0xff;
++	unsigned int scan_align = info->sprite.scan_align - 1;
++	unsigned int buf_align = info->sprite.buf_align - 1;
+ 	int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
+ 	int fgshift = (vc->vc_hi_font_mask) ? 9 : 8;
+ 	struct display *p = &fb_display[vc->vc_num];
+-	int w = (vc->vc_font.width + 7) >> 3, c;
+-	int y = real_y(p, vc->vc_y);
++	int y = real_y(p, vc->vc_y), d_pitch, dsize;
++	int s_pitch = (vc->vc_font.width + 7) >> 3;
++	int size = s_pitch * vc->vc_font.height, c;
+ 	struct fb_cursor cursor;
++	u8 *src, *dst;
+ 	
+ 	if (mode & CM_SOFTBACK) {
+ 		mode &= ~CM_SOFTBACK;
+@@ -1012,28 +960,24 @@ static void fbcon_cursor(struct vc_data 
+ 	} else if (softback_lines)
+ 		fbcon_set_origin(vc);
+ 
+- 	c = scr_readw((u16 *) vc->vc_pos);
++	del_timer(&cursor_timer);
++	if (info->cursor.enable) {
++		info->cursor.enable = 0;
++		info->fbops->fb_cursor(info, &info->cursor);
++	}
+ 
+-	cursor.image.data = vc->vc_font.data + ((c & charmask) * (w * vc->vc_font.height));
+-	cursor.set = FB_CUR_SETCUR;
+-	cursor.image.depth = 1;
+-	
+-	switch (mode) {
+-	case CM_ERASE:
+-		if (info->cursor.rop == ROP_XOR) {
+-			info->cursor.enable = 0;
+-			info->cursor.rop = ROP_COPY;
+-			info->fbops->fb_cursor(info, &cursor);
+-		}	
+-		break;
+-	case CM_MOVE:
+-	case CM_DRAW:
++	if (mode != CM_ERASE) {
++		memset(&cursor, 0, sizeof(struct fb_cursor));
+ 		info->cursor.enable = 1;
+-		
++
++ 		c = scr_readw((u16 *) vc->vc_pos);
++
++		src = vc->vc_font.data + ((c & charmask) * size);
+ 		if (info->cursor.image.fg_color != attr_fgcol(fgshift, c) ||
+ 	    	    info->cursor.image.bg_color != attr_bgcol(bgshift, c)) {
+ 			cursor.image.fg_color = attr_fgcol(fgshift, c);
+ 			cursor.image.bg_color = attr_bgcol(bgshift, c);
++			cursor.image.depth = 1;
+ 			cursor.set |= FB_CUR_SETCMAP;
+ 		}
+ 		
+@@ -1056,18 +1000,29 @@ static void fbcon_cursor(struct vc_data 
+ 			cursor.set |= FB_CUR_SETHOT;
+ 		}
+ 
++		src = vc->vc_font.data + ((c & charmask) * size);
++
++		d_pitch = (s_pitch + scan_align) & ~scan_align;
++		dsize = d_pitch * vc->vc_font.height + buf_align;
++		dsize &= ~buf_align;
++		dst = fb_get_buffer_offset(info, &info->sprite, dsize);
++		move_buf_aligned(info, &info->sprite, dst, src, d_pitch, s_pitch, vc->vc_font.height);
++		info->cursor.image.data = dst;
++		cursor.set |= FB_CUR_SETSHAPE;
++
+ 		if ((cursor.set & FB_CUR_SETSIZE) || ((vc->vc_cursor_type & 0x0f) != p->cursor_shape)) {
+-			char *mask = kmalloc(w*vc->vc_font.height, GFP_ATOMIC);
+-			int cur_height, size, i = 0;
++			char *mask = kmalloc(dsize, GFP_ATOMIC);
++			int cur_height, i, j, k;
+ 
+ 			if (!mask)	return;	
+-		
++
++			memset(mask, 0, dsize);
++
+ 			if (info->cursor.mask)
+ 				kfree(info->cursor.mask);
+ 			info->cursor.mask = mask;
+ 	
+ 			p->cursor_shape = vc->vc_cursor_type & 0x0f;
+-			cursor.set |= FB_CUR_SETSHAPE;
+ 
+ 			switch (vc->vc_cursor_type & 0x0f) {
+ 			case CUR_NONE:
+@@ -1090,17 +1045,19 @@ static void fbcon_cursor(struct vc_data 
+ 				cur_height = vc->vc_font.height;
+ 				break;
+ 			}
+-			size = (vc->vc_font.height - cur_height) * w;
+-			while (size--)
+-				mask[i++] = 0;
+-			size = cur_height * w;
+-			while (size--)
+-				mask[i++] = 0xff;
++			i = (vc->vc_font.height - cur_height) * d_pitch;
++			for (j = 0; j < cur_height; j++) {
++				for (k = 0; k < s_pitch; k++)
++					mask[i++] = 0xff;
++				i += (d_pitch - s_pitch);
++			}
+ 		}
+         	info->cursor.rop = ROP_XOR;
+ 		info->fbops->fb_cursor(info, &cursor);
++		atomic_dec(&info->sprite.count);
++		smp_mb__after_atomic_dec();
++		mod_timer(&cursor_timer, jiffies + HZ/5);
+ 		vbl_cursor_cnt = CURSOR_DRAW_DELAY;
+-		break;
+ 	}
+ }
+ 
+@@ -1826,8 +1783,10 @@ static int fbcon_do_set_font(struct vc_d
+ 	vc->vc_font.height = h;
+ 	if (vc->vc_hi_font_mask && cnt == 256) {
+ 		vc->vc_hi_font_mask = 0;
+-		if (vc->vc_can_do_color)
++		if (vc->vc_can_do_color) {
+ 			vc->vc_complement_mask >>= 1;
++			vc->vc_s_complement_mask >>= 1;
++		}
+ 
+ 		/* ++Edmund: reorder the attribute bits */
+ 		if (vc->vc_can_do_color) {
+@@ -1847,8 +1806,10 @@ static int fbcon_do_set_font(struct vc_d
+ 		}
+ 	} else if (!vc->vc_hi_font_mask && cnt == 512) {
+ 		vc->vc_hi_font_mask = 0x100;
+-		if (vc->vc_can_do_color)
++		if (vc->vc_can_do_color) {
+ 			vc->vc_complement_mask <<= 1;
++			vc->vc_s_complement_mask <<= 1;
++		}
+ 
+ 		/* ++Edmund: reorder the attribute bits */
+ 		{
+--- linux-2.6.0-test6/drivers/video/console/Makefile	2003-06-14 12:18:09.000000000 -0700
++++ 25/drivers/video/console/Makefile	2003-10-05 00:34:22.000000000 -0700
+@@ -3,18 +3,16 @@
+ # Rewritten to use lists instead of if-statements.
+ 
+ # Font handling
+-font-objs := fonts.o
++font-y := fonts.o
+ 
+-font-objs-$(CONFIG_FONT_SUN8x16)   += font_sun8x16.o
+-font-objs-$(CONFIG_FONT_SUN12x22)  += font_sun12x22.o
+-font-objs-$(CONFIG_FONT_8x8)       += font_8x8.o
+-font-objs-$(CONFIG_FONT_8x16)      += font_8x16.o
+-font-objs-$(CONFIG_FONT_6x11)      += font_6x11.o
+-font-objs-$(CONFIG_FONT_PEARL_8x8) += font_pearl_8x8.o
+-font-objs-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o
+-font-objs-$(CONFIG_FONT_MINI_4x6)  += font_mini_4x6.o
+-
+-font-objs += $(font-objs-y)
++font-$(CONFIG_FONT_SUN8x16)   += font_sun8x16.o
++font-$(CONFIG_FONT_SUN12x22)  += font_sun12x22.o
++font-$(CONFIG_FONT_8x8)       += font_8x8.o
++font-$(CONFIG_FONT_8x16)      += font_8x16.o
++font-$(CONFIG_FONT_6x11)      += font_6x11.o
++font-$(CONFIG_FONT_PEARL_8x8) += font_pearl_8x8.o
++font-$(CONFIG_FONT_ACORN_8x8) += font_acorn_8x8.o
++font-$(CONFIG_FONT_MINI_4x6)  += font_mini_4x6.o
+ 
+ # Each configuration option enables a list of files.
+ 
+@@ -31,8 +29,11 @@ obj-$(CONFIG_FB_STI)              += sti
+ # Files generated that shall be removed upon make clean
+ clean-files := promcon_tbl.c
+ 
+-$(obj)/promcon_tbl.c: $(src)/prom.uni
+-	$(objtree)/scripts/conmakehash $< | \
++quiet_cmd_promtbl = GEN	$@
++	cmd_promtbl = scripts/conmakehash $< | \
+ 	sed -e '/#include <[^>]*>/p' -e 's/types/init/' \
+ 	    -e 's/dfont\(_uni.*\]\)/promfont\1 __initdata/' > $@
+ 
++$(obj)/promcon_tbl.c: $(src)/prom.uni
++	$(call cmd,promtbl)
++
+--- linux-2.6.0-test6/drivers/video/console/sticore.c	2003-08-08 22:55:13.000000000 -0700
++++ 25/drivers/video/console/sticore.c	2003-10-05 00:33:24.000000000 -0700
+@@ -988,7 +988,7 @@ static int __devinit sticore_pci_init(st
+ 	
+ 	if (!sti) {
+ 		printk(KERN_WARNING "Unable to handle STI device '%s'\n",
+-			pd->dev.name);
++			pci_name(pd));
+ 		return -ENODEV;
+ 	}
+ #endif /* CONFIG_PCI */
+--- linux-2.6.0-test6/drivers/video/controlfb.c	2003-09-08 13:58:58.000000000 -0700
++++ 25/drivers/video/controlfb.c	2003-10-05 00:34:22.000000000 -0700
+@@ -136,8 +136,8 @@ static int controlfb_check_var (struct f
+ /*
+  * inititialization
+  */
+-int control_init(void);
+-void control_setup(char *);
++int controlfb_init(void);
++void controlfb_setup(char *);
+ 
+ /******************** Prototypes for internal functions **********************/
+ 
+@@ -553,7 +553,7 @@ static void control_set_hardware(struct 
+ /*
+  * Called from fbmem.c for probing & initializing
+  */
+-int __init control_init(void)
++int __init controlfb_init(void)
+ {
+ 	struct device_node *dp;
+ 
+@@ -1057,7 +1057,7 @@ static void control_cleanup(void)
+ /*
+  * Parse user speficied options (`video=controlfb:')
+  */
+-void __init control_setup(char *options)
++void __init controlfb_setup(char *options)
+ {
+ 	char *this_opt;
+ 
+--- linux-2.6.0-test6/drivers/video/epson1355fb.c	2003-06-14 12:17:57.000000000 -0700
++++ 25/drivers/video/epson1355fb.c	2003-10-05 00:34:22.000000000 -0700
+@@ -1,541 +1,714 @@
+ /*
+- * linux/drivers/video/epson1355fb.c
+- *	-- Support for the Epson SED1355 LCD/CRT controller
++ * linux/drivers/video/epson1355fb.c -- Epson S1D13505 frame buffer for 2.5.
+  *
+- * Copyright (C) 2000 Philipp Rumpf <prumpf@tux.org>
++ * Epson Research S1D13505 Embedded RAMDAC LCD/CRT Controller
++ *   (previously known as SED1355)
+  *
+- * based on linux/drivers/video/skeletonfb.c, which was
++ * Cf. http://www.erd.epson.com/vdc/html/S1D13505.html
++ *
++ *
++ * Copyright (C) Hewlett-Packard Company.  All rights reserved.
++ *
++ * Written by Christopher Hoover <ch@hpl.hp.com>
++ *
++ * Adapted from:
++ *
++ *  linux/drivers/video/skeletonfb.c
++ *  Modified to new api Jan 2001 by James Simmons (jsimmons@transvirtual.com)
+  *  Created 28 Dec 1997 by Geert Uytterhoeven
+  *
++ *  linux/drivers/video/epson1355fb.c (2.4 driver)
++ *  Copyright (C) 2000 Philipp Rumpf <prumpf@tux.org>
++ *
+  * This file is subject to the terms and conditions of the GNU General Public
+- * License.  See the file COPYING in the main directory of this archive
+- * for more details.
+- */
+-/* TODO (roughly in order of priority):
+- * 16 bpp support
+- * crt support
+- * hw cursor support
+- * SwivelView
++ * License. See the file COPYING in the main directory of this archive for
++ * more details.
++ *
++ *
++ * Noteworthy Issues
++ * -----------------
++ *
++ * This driver is complicated by the fact that this is a 16-bit chip
++ * and, on at least one platform (ceiva), we can only do 16-bit reads
++ * and writes to the framebuffer.  We hide this from user space
++ * except in the case of mmap().
++ *
++ *
++ * To Do
++ * -----
++ *
++ * - Test 8-bit pseudocolor mode
++ * - Allow setting bpp, virtual resolution
++ * - Implement horizontal panning
++ * - (maybe) Implement hardware cursor
+  */
+ 
+-#include <asm/io.h>
+-#include <linux/config.h>
+-#include <linux/delay.h>
+-#include <linux/errno.h>
+-#include <linux/fb.h>
+-#include <linux/init.h>
+-#include <linux/kernel.h>
+-#include <linux/slab.h>
+-#include <linux/mm.h>
+ #include <linux/module.h>
+-#include <linux/sched.h>
++#include <linux/kernel.h>
++#include <linux/errno.h>
+ #include <linux/string.h>
++#include <linux/mm.h>
+ #include <linux/tty.h>
+-#include <video/fbcon-cfb8.h>
+-#include <video/fbcon-mfb.h>
+-#include <video/fbcon.h>
+-
+-/* Register defines.  The docs don't seem to provide nice mnemonic names
+- * so I made them up myself ... */
+-
+-#define E1355_PANEL	0x02
+-#define E1355_DISPLAY	0x0D
+-#define E1355_MISC	0x1B
+-#define E1355_GPIO	0x20
+-#define E1355_LUT_INDEX 0x24
+-#define E1355_LUT_DATA	0x26
++#include <linux/slab.h>
++#include <linux/delay.h>
++#include <linux/fb.h>
++#include <linux/init.h>
++#include <linux/ioport.h>
++#include <asm/types.h>
++#include <asm/io.h>
++#include <asm/uaccess.h>
++
++#include <video/epson1355.h>
++
++static struct fb_info info;
++
++static struct epson1355fb_par {
++	unsigned long reg_addr;
++} par;
++
++static u32 pseudo_palette[16];
++
++/* ------------------------------------------------------------------------- */
+ 
+ #ifdef CONFIG_SUPERH
+-#define E1355_REG_BASE	CONFIG_E1355_REG_BASE
+-#define E1355_FB_BASE	CONFIG_E1355_FB_BASE
+ 
+-static inline u8 e1355_read_reg(int index)
++static inline u8 epson1355_read_reg(int index)
+ {
+-	return ctrl_inb(E1355_REG_BASE + index);
++	return ctrl_inb(par.reg_addr + index);
+ }
+ 
+-static inline void e1355_write_reg(u8 data, int index)
++static inline void epson1355_write_reg(u8 data, int index)
+ {
+-	ctrl_outb(data, E1355_REG_BASE + index);
++	ctrl_outb(data, par.reg_addr + index);
+ }
+ 
+-static inline u16 e1355_read_reg16(int index)
++#elif defined(CONFIG_ARM)
++
++# ifdef CONFIG_ARCH_CEIVA
++#  include <asm/arch/hardware.h>
++#  define EPSON1355FB_BASE_PHYS	(CEIVA_PHYS_SED1355)
++# endif
++
++static inline u8 epson1355_read_reg(int index)
+ {
+-	return e1355_read_reg(index) + (e1355_read_reg(index+1) << 8);
++	return __raw_readb(par.reg_addr + index);
+ }
+ 
+-static inline void e1355_write_reg16(u16 data, int index)
++static inline void epson1355_write_reg(u8 data, int index)
+ {
+-	e1355_write_reg((data&0xff), index);
+-	e1355_write_reg(((data>>8)&0xff), index + 1);
++	__raw_writeb(data, par.reg_addr + index);
+ }
++
+ #else
+-#error unknown architecture
++# error "no architecture-specific epson1355_{read,write}_reg"
+ #endif
+ 
+-struct e1355fb_info {
+-	struct fb_info_gen gen;
+-};
+-
+-static int current_par_valid = 0;
+-static struct display disp;
++#ifndef EPSON1355FB_BASE_PHYS
++# error  "EPSON1355FB_BASE_PHYS is not defined"
++#endif
+ 
+-static struct fb_var_screeninfo default_var;
++#define EPSON1355FB_REGS_OFS	(0)
++#define EPSON1355FB_REGS_PHYS	(EPSON1355FB_BASE_PHYS + EPSON1355FB_REGS_OFS)
++#define EPSON1355FB_REGS_LEN	(64)
+ 
+-int e1355fb_init(void);
+-int e1355fb_setup(char*);
+-static int e1355_encode_var(struct fb_var_screeninfo *var, const void *par,
+-			    struct fb_info_gen *info);
+-/* ------------------- chipset specific functions -------------------------- */
++#define EPSON1355FB_FB_OFS	(0x00200000)
++#define EPSON1355FB_FB_PHYS	(EPSON1355FB_BASE_PHYS + EPSON1355FB_FB_OFS)
++#define EPSON1355FB_FB_LEN	(2 * 1024 * 1024)
+ 
++/* ------------------------------------------------------------------------- */
+ 
+-static void disable_hw_cursor(void)
++static inline u16 epson1355_read_reg16(int index)
+ {
+-	u8 curs;
++	u8 lo = epson1355_read_reg(index);
++	u8 hi = epson1355_read_reg(index + 1);
+ 
+-	curs = e1355_read_reg(0x27);
+-	curs &= ~0xc0;
+-	e1355_write_reg(curs, 0x27);
++	return (hi << 8) | lo;
+ }
+ 
+-static void e1355_detect(void)
++static inline void epson1355_write_reg16(u16 data, int index)
+ {
+-	u8 rev;
++	u8 lo = data & 0xff;
++	u8 hi = (data >> 8) & 0xff;
+ 
+-	e1355_write_reg(0x00, E1355_MISC);
++	epson1355_write_reg(lo, index);
++	epson1355_write_reg(hi, index + 1);
++}
+ 
+-	rev = e1355_read_reg(0x00);
++static inline u32 epson1355_read_reg20(int index)
++{
++	u8 b0 = epson1355_read_reg(index);
++	u8 b1 = epson1355_read_reg(index + 1);
++	u8 b2 = epson1355_read_reg(index + 2);
+ 
+-	if ((rev & 0xfc) != 0x0c) {
+-		printk(KERN_WARNING "Epson 1355 not detected\n");
+-	}
++	return (b2 & 0x0f) << 16 | (b1 << 8) | b0;
++}
+ 
+-	/* XXX */
+-	disable_hw_cursor();
++static inline void epson1355_write_reg20(u32 data, int index)
++{
++	u8 b0 = data & 0xff;
++	u8 b1 = (data >> 8) & 0xff;
++	u8 b2 = (data >> 16) & 0x0f;
+ 
+-	e1355_encode_var(&default_var, NULL, NULL);
++	epson1355_write_reg(b0, index);
++	epson1355_write_reg(b1, index + 1);
++	epson1355_write_reg(b2, index + 2);
+ }
+ 
+-struct e1355_par {
+-	u32 xres;
+-	u32 yres;
++/* ------------------------------------------------------------------------- */
+ 
+-	int bpp;
+-	int mem_bpp;
++static void set_lut(u8 index, u8 r, u8 g, u8 b)
++{
++	epson1355_write_reg(index, REG_LUT_ADDR);
++	epson1355_write_reg(r, REG_LUT_DATA);
++	epson1355_write_reg(g, REG_LUT_DATA);
++	epson1355_write_reg(b, REG_LUT_DATA);
++}
+ 
+-	u32 panel_xres;
+-	u32 panel_yres;
+-	
+-	int panel_width;
+-	int panel_ymul;
+-};
+ 
+-static int e1355_encode_fix(struct fb_fix_screeninfo *fix,
+-			    const void *raw_par,
+-			    struct fb_info_gen *info)
+-{
+-	const struct e1355_par *par = raw_par;
+-	
+-	memset(fix, 0, sizeof *fix);
+-	
+-	fix->type= FB_TYPE_PACKED_PIXELS;
++/**
++ *  	epson1355fb_setcolreg - sets a color register.
++ *      @regno: Which register in the CLUT we are programming
++ *      @red: The red value which can be up to 16 bits wide
++ *	@green: The green value which can be up to 16 bits wide
++ *	@blue:  The blue value which can be up to 16 bits wide.
++ *	@transp: If supported the alpha value which can be up to 16 bits wide.
++ *      @info: frame buffer info structure
++ *
++ *	Returns negative errno on error, or zero on success.
++ */
++static int epson1355fb_setcolreg(unsigned regno, unsigned r, unsigned g,
++				 unsigned b, unsigned transp,
++				 struct fb_info *info)
++{
++	if (info->var.grayscale)
++		r = g = b = (19595 * r + 38470 * g + 7471 * b) >> 16;
++
++	switch (info->fix.visual) {
++	case FB_VISUAL_TRUECOLOR:
++		if (regno >= 16)
++			return -EINVAL;
+ 
+-	if (!par)
+-		BUG();
++		((u32 *) info->pseudo_palette)[regno] =
++		    (r & 0xf800) | (g & 0xfc00) >> 5 | (b & 0xf800) >> 11;
+ 
+-	if (par->bpp == 1) {
+-		fix->visual = FB_VISUAL_MONO10;
+-	} else if (par->bpp <= 8) {
+-		fix->visual = FB_VISUAL_PSEUDOCOLOR;
+-	} else {
+-		fix->visual = FB_VISUAL_TRUECOLOR;
+-	}
++		break;
++	case FB_VISUAL_PSEUDOCOLOR:
++		if (regno >= 256)
++			return -EINVAL;
+ 
+-	return 0;
+-}
++		set_lut(regno, r >> 8, g >> 8, b >> 8);
+ 
+-static int e1355_set_bpp(struct e1355_par *par, int bpp)
+-{
+-	int code;
+-	u8 disp;
+-	u16 bytes_per_line;
+-
+-	switch(bpp) {
+-	case 1:
+-		code = 0; break;
+-	case 2:
+-		code = 1; break;
+-	case 4:
+-		code = 2; break;
+-	case 8:
+-		code = 3; break;
+-	case 16:
+-		code = 5; break;
++		break;
+ 	default:
+-		return -EINVAL; break;
++		return -ENOSYS;
+ 	}
+-
+-	disp = e1355_read_reg(E1355_DISPLAY);
+-	disp &= ~0x1c;
+-	disp |= code << 2;
+-	e1355_write_reg(disp, E1355_DISPLAY);
+-	
+-	bytes_per_line = (par->xres * bpp) >> 3;
+-	
+-	e1355_write_reg16(bytes_per_line, 0x16);
+-
+-	par->bpp = bpp;
+-
+ 	return 0;
+ }
+-		
+-static int e1355_decode_var(const struct fb_var_screeninfo *var,
+-			    void *raw_par,
+-			    struct fb_info_gen *info)
++
++/* ------------------------------------------------------------------------- */
++
++/**
++ *      epson1355fb_pan_display - Pans the display.
++ *      @var: frame buffer variable screen structure
++ *      @info: frame buffer structure that represents a single frame buffer
++ *
++ *	Pan (or wrap, depending on the `vmode' field) the display using the
++ *  	`xoffset' and `yoffset' fields of the `var' structure.
++ *  	If the values don't fit, return -EINVAL.
++ *
++ *      Returns negative errno on error, or zero on success.
++ */
++static int epson1355fb_pan_display(struct fb_var_screeninfo *var,
++				   struct fb_info *info)
+ {
+-	struct e1355_par *par = raw_par;
+-	int ret;
++	u32 start;
+ 
+-	if (!par)
+-		BUG();
++	if (var->xoffset != 0)	/* not yet ... */
++		return -EINVAL;
+ 
+-	/*
+-	 * Don't allow setting any of these yet: xres and yres don't
+-	 * make sense for LCD panels; xres_virtual and yres_virtual
+-	 * should be supported fine by our hardware though.
+-	 */
+-	if (var->xres != par->xres ||
+-	    var->yres != par->yres ||
+-	    var->xres != var->xres_virtual ||
+-	    var->yres != var->yres_virtual ||
+-	    var->xoffset != 0 ||
+-	    var->yoffset != 0)
++	if (var->yoffset + info->var.yres > info->var.yres_virtual)
+ 		return -EINVAL;
+ 
+-	if(var->bits_per_pixel != par->bpp) {
+-		ret = e1355_set_bpp(par, var->bits_per_pixel);
++	start = (info->fix.line_length >> 1) * var->yoffset;
+ 
+-		if (ret)
+-			goto out_err;
+-	}
+-		
+-	return 0;
++	epson1355_write_reg20(start, REG_SCRN1_DISP_START_ADDR0);
+ 
+- out_err:
+-	return ret;
++	return 0;
+ }
+ 
+-static void dump_panel_data(void)
++/* ------------------------------------------------------------------------- */
++
++static void lcd_enable(int enable)
+ {
+-	u8 panel = e1355_read_reg(E1355_PANEL);
+-	int width[2][4] = { { 4, 8, 16, -1 }, { 9, 12, 16, -1 } };
++	u8 mode = epson1355_read_reg(REG_DISPLAY_MODE);
+ 
+-	printk("%s %s %s panel, width %d bits\n",
+-	       panel & 2 ? "dual" : "single",
+-	       panel & 4 ? "color" : "mono",
+-	       panel & 1 ? "TFT" : "passive",
+-	       width[panel&1][(panel>>4)&3]);
++	if (enable)
++		mode |= 1;
++	else
++		mode &= ~1;
+ 
+-	printk("resolution %d x %d\n",
+-	       (e1355_read_reg(0x04) + 1) * 8,
+-	       ((e1355_read_reg16(0x08) + 1) * (1 + ((panel & 3) == 2))));
++	epson1355_write_reg(mode, REG_DISPLAY_MODE);
+ }
+ 
+-static int e1355_bpp_to_var(int bpp, struct fb_var_screeninfo *var)
++#if defined(CONFIG_ARCH_CEIVA)
++static void backlight_enable(int enable)
+ {
+-	switch(bpp) {
+-	case 1:
+-	case 2:
+-	case 4:
+-	case 8:
+-		var->bits_per_pixel = bpp;
+-		var->red.offset = var->green.offset = var->blue.offset = 0;
+-		var->red.length = var->green.length = var->blue.length = bpp;
++	/* ### this should be protected by a spinlock ... */
++	u8 pddr = clps_readb(PDDR);
++	if (enable)
++		pddr |= (1 << 5);
++	else
++		pddr &= ~(1 << 5);
++	clps_writeb(pddr, PDDR);
++}
++#else
++static void backlight_enable(int enable)
++{
++}
++#endif
++
++
++/**
++ *      epson1355fb_blank - blanks the display.
++ *      @blank_mode: the blank mode we want.
++ *      @info: frame buffer structure that represents a single frame buffer
++ *
++ *      Blank the screen if blank_mode != 0, else unblank. Return 0 if
++ *      blanking succeeded, != 0 if un-/blanking failed due to e.g. a
++ *      video mode which doesn't support it. Implements VESA suspend
++ *      and powerdown modes on hardware that supports disabling hsync/vsync:
++ *      blank_mode == 2: suspend vsync
++ *      blank_mode == 3: suspend hsync
++ *      blank_mode == 4: powerdown
++ *
++ *      Returns negative errno on error, or zero on success.
++ *
++ */
++static int epson1355fb_blank(int blank_mode, struct fb_info *info)
++{
++	switch (blank_mode) {
++	case VESA_NO_BLANKING:
++		lcd_enable(1);
++		backlight_enable(1);
+ 		break;
+-	case 16:
+-		var->bits_per_pixel = 16;
+-		var->red.offset = 11;
+-		var->red.length = 5;
+-		var->green.offset = 5;
+-		var->green.length = 6;
+-		var->blue.offset = 0;
+-		var->blue.length = 5;
++	case VESA_VSYNC_SUSPEND:
++	case VESA_HSYNC_SUSPEND:
++		backlight_enable(0);
+ 		break;
++	case VESA_POWERDOWN:
++		backlight_enable(0);
++		lcd_enable(0);
++		break;
++	default:
++		return -EINVAL;
+ 	}
+-
+ 	return 0;
+ }
+ 
+-static int e1355_encode_var(struct fb_var_screeninfo *var, const void *raw_par,
+-			    struct fb_info_gen *info)
++/* ------------------------------------------------------------------------- */
++
++/*
++ * We can't use the cfb generic routines, as we have to limit
++ * ourselves to 16-bit or 8-bit loads and stores to this 16-bit
++ * chip.
++ */
++
++static inline void epson1355fb_fb_writel(unsigned long v, unsigned long *a)
+ {
+-	u8 panel, display;
+-	u32 xres, xres_virtual, yres;
+-	static int width[2][4] = { { 4, 8, 16, -1 }, { 9, 12, 16, -1 } };
+-	static int bpp_tab[8] = { 1, 2, 4, 8, 15, 16 };
+-	int bpp, hw_bpp;
+-	int is_color, is_dual, is_tft;
+-	int lcd_enabled, crt_enabled;
++	u16 *p = (u16 *) a;
++	u16 l = v & 0xffff;
++	u16 h = v >> 16;
+ 
+-	panel = e1355_read_reg(E1355_PANEL);
+-	display = e1355_read_reg(E1355_DISPLAY);
++	fb_writew(l, p);
++	fb_writew(h, p + 1);
++}
+ 
+-	is_color = (panel & 0x04) != 0;
+-	is_dual  = (panel & 0x02) != 0;
+-	is_tft   = (panel & 0x01) != 0;
++static inline unsigned long epson1355fb_fb_readl(const unsigned long *a)
++{
++	const u16 *p = (u16 *) a;
++	u16 l = fb_readw(p);
++	u16 h = fb_readw(p + 1);
+ 
+-	bpp = bpp_tab[(display>>2)&7]; 
+-	e1355_bpp_to_var(bpp, var);
++	return (h << 16) | l;
++}
+ 
+-	crt_enabled = (display & 0x02) != 0;
+-	lcd_enabled = (display & 0x02) != 0;
++#define FB_READL epson1355fb_fb_readl
++#define FB_WRITEL epson1355fb_fb_writel
+ 
+-	hw_bpp = width[is_tft][(panel>>4)&3];
++/* ------------------------------------------------------------------------- */
+ 
+-	xres = e1355_read_reg(0x04) + 1;
+-	yres = e1355_read_reg16(0x08) + 1;
+-	
+-	xres *= 8;
+-	/* talk about weird hardware .. */
+-	yres *= (is_dual && !crt_enabled) ? 2 : 1;
+-
+-	xres_virtual = e1355_read_reg16(0x16);
+-	/* it's in 2-byte words initially */
+-	xres_virtual *= 16;
+-	xres_virtual /= var->bits_per_pixel;
++static inline unsigned long copy_from_user16(void *to, const void *from,
++					     unsigned long n)
++{
++	u16 *dst = (u16 *) to;
++	u16 *src = (u16 *) from;
+ 
+-	var->xres = xres;
+-	var->yres = yres;
+-	var->xres_virtual = xres_virtual;
+-	var->yres_virtual = yres;
++	if (!access_ok(VERIFY_READ, from, n))
++		return n;
+ 
+-	var->xoffset = var->yoffset = 0;
++	while (n > 1) {
++		u16 v;
++		if (__get_user(v, src))
++			return n;
+ 
+-	var->grayscale = !is_color;
+-	
+-	return 0;
+-}
++		fb_writew(v, dst);
+ 
+-#define is_dual(panel) (((panel)&3)==2)
++		src++, dst++;
++		n -= 2;
++	}
+ 
+-static void get_panel_data(struct e1355_par *par)
+-{
+-	u8 panel;
+-	int width[2][4] = { { 4, 8, 16, -1 }, { 9, 12, 16, -1 } };
++	if (n) {
++		u8 v;
+ 
+-	panel = e1355_read_reg(E1355_PANEL);
++		if (__get_user(v, ((u8 *) src)))
++			return n;
+ 
+-	par->panel_width = width[panel&1][(panel>>4)&3];
+-	par->panel_xres = (e1355_read_reg(0x04) + 1) * 8;
+-	par->panel_ymul = is_dual(panel) ? 2 : 1;
+-	par->panel_yres = ((e1355_read_reg16(0x08) + 1)
+-			   * par->panel_ymul);
++		fb_writeb(v, dst);
++	}
++	return 0;
+ }
+ 
+-static void e1355_get_par(void *raw_par, struct fb_info_gen *info)
++static inline unsigned long copy_to_user16(void *to, const void *from,
++					   unsigned long n)
+ {
+-	struct e1355_par *par = raw_par;
++	u16 *dst = (u16 *) to;
++	u16 *src = (u16 *) from;
+ 
+-	get_panel_data(par);
+-}
++	if (!access_ok(VERIFY_WRITE, to, n))
++		return n;
+ 
+-static void e1355_set_par(const void *par, struct fb_info_gen *info)
+-{
+-}
++	while (n > 1) {
++		u16 v = fb_readw(src);
+ 
+-static int e1355_getcolreg(unsigned regno, unsigned *red, unsigned *green,
+-			   unsigned *blue, unsigned *transp,
+-			   struct fb_info *info)
+-{
+-	u8 r, g, b;
++		if (__put_user(v, dst))
++			return n;
+ 
+-	e1355_write_reg(regno, E1355_LUT_INDEX);
+-	r = e1355_read_reg(E1355_LUT_DATA);
+-	g = e1355_read_reg(E1355_LUT_DATA);
+-	b = e1355_read_reg(E1355_LUT_DATA);
++		src++, dst++;
++		n -= 2;
++	}
+ 
+-	*red = r << 8;
+-	*green = g << 8;
+-	*blue = b << 8;
++	if (n) {
++		u8 v = fb_readb(src);
+ 
++		if (__put_user(v, ((u8 *) dst)))
++			return n;
++	}
+ 	return 0;
+ }
+ 
+-static int e1355fb_setcolreg(unsigned regno, unsigned red, unsigned green,
+-			     unsigned blue, unsigned transp,
+-			     struct fb_info *info)
+-{
+-	u8 r = (red >> 8) & 0xf0;
+-	u8 g = (green>>8) & 0xf0;
+-	u8 b = (blue>> 8) & 0xf0;
+-
+-	e1355_write_reg(regno, E1355_LUT_INDEX);
+-	e1355_write_reg(r, E1355_LUT_DATA);
+-	e1355_write_reg(g, E1355_LUT_DATA);
+-	e1355_write_reg(b, E1355_LUT_DATA);
+-	
+-	return 0;
+-}
+ 
+-static int e1355_pan_display(const struct fb_var_screeninfo *var,
+-			     struct fb_info_gen *info)
++static ssize_t
++epson1355fb_read(struct file *file, char *buf, size_t count, loff_t * ppos)
+ {
+-	BUG();
+-	
+-	return -EINVAL;
++	unsigned long p = *ppos;
++
++	/* from fbmem.c except for our own copy_*_user */
++	if (p >= info.fix.smem_len)
++		return 0;
++	if (count >= info.fix.smem_len)
++		count = info.fix.smem_len;
++	if (count + p > info.fix.smem_len)
++		count = info.fix.smem_len - p;
++
++	if (count) {
++		char *base_addr;
++
++		base_addr = info.screen_base;
++		count -= copy_to_user16(buf, base_addr + p, count);
++		if (!count)
++			return -EFAULT;
++		*ppos += count;
++	}
++	return count;
+ }
+ 
+-/*
+- * The AERO_HACKS parts disable/enable the backlight on the Compaq Aero 8000.
+- * I'm not sure they aren't dangerous to the hardware, so be warned.
+- */
+-#undef AERO_HACKS
++static ssize_t
++epson1355fb_write(struct file *file, const char *buf,
++		  size_t count, loff_t * ppos)
++{
++	unsigned long p = *ppos;
++	int err;
++
++	/* from fbmem.c except for our own copy_*_user */
++	if (p > info.fix.smem_len)
++		return -ENOSPC;
++	if (count >= info.fix.smem_len)
++		count = info.fix.smem_len;
++	err = 0;
++	if (count + p > info.fix.smem_len) {
++		count = info.fix.smem_len - p;
++		err = -ENOSPC;
++	}
+ 
+-static int e1355_blank(int blank_mode, struct fb_info_gen *info)
+-{
+-	u8 disp;
++	if (count) {
++		char *base_addr;
+ 
+-	switch (blank_mode) {
+-	case VESA_NO_BLANKING:
+-		disp = e1355_read_reg(E1355_DISPLAY);
+-		disp |= 1;
+-		e1355_write_reg(disp, E1355_DISPLAY);
+- 		
+-#ifdef AERO_HACKS
+-		e1355_write_reg(0x6, 0x20);
+-#endif
+-		break;
++		base_addr = info.screen_base;
++		count -= copy_from_user16(base_addr + p, buf, count);
++		*ppos += count;
++		err = -EFAULT;
++	}
++	if (count)
++		return count;
++	return err;
++}
++
++/* ------------------------------------------------------------------------- */
++
++static struct fb_ops epson1355fb_fbops = {
++	.owner 		= THIS_MODULE,
++	.fb_setcolreg 	= epson1355fb_setcolreg,
++	.fb_pan_display = epson1355fb_pan_display,
++	.fb_blank 	= epson1355fb_blank,
++	.fb_fillrect 	= cfb_fillrect,
++	.fb_copyarea 	= cfb_copyarea,
++	.fb_imageblit 	= cfb_imageblit,
++	.fb_read 	= epson1355fb_read,
++	.fb_write 	= epson1355fb_write,
++	.fb_cursor 	= soft_cursor,
++};
+ 
+-	case VESA_VSYNC_SUSPEND:
+-	case VESA_HSYNC_SUSPEND:
+-	case VESA_POWERDOWN:
+-		disp = e1355_read_reg(E1355_DISPLAY);
+-		disp &= ~1;
+-		e1355_write_reg(disp, E1355_DISPLAY);
++/* ------------------------------------------------------------------------- */
+ 
+-#ifdef AERO_HACKS
+-		e1355_write_reg(0x0, 0x20);
+-#endif
+-		break;
++static __init unsigned int get_fb_size(struct fb_info *info)
++{
++	unsigned int size = 2 * 1024 * 1024;
++	char *p = info->screen_base;
+ 
+-	default:
+-		return -EINVAL;
+-	}
++	/* the 512k framebuffer is aliased at start + 0x80000 * n */
++	fb_writeb(1, p);
++	fb_writeb(0, p + 0x80000);
++	if (!fb_readb(p))
++		size = 512 * 1024;
+ 
+-	return 0;
++	fb_writeb(0, p);
++
++	return size;
+ }
+ 
+-static struct display_switch e1355_dispsw;
++static int epson1355_width_tab[2][4] __initdata =
++    { {4, 8, 16, -1}, {9, 12, 16, -1} };
++static int epson1355_bpp_tab[8] __initdata = { 1, 2, 4, 8, 15, 16 };
+ 
+-static void e1355_set_disp(const void *unused, struct display *disp,
+-			   struct fb_info_gen *info)
++static void __init fetch_hw_state(struct fb_info *info)
+ {
+-	struct display_switch *d;
++	struct fb_var_screeninfo *var = &info->var;
++	struct fb_fix_screeninfo *fix = &info->fix;
++	u8 panel, display;
++	u16 offset;
++	u32 xres, yres;
++	u32 xres_virtual, yres_virtual;
++	int bpp, lcd_bpp;
++	int is_color, is_dual, is_tft;
++	int lcd_enabled, crt_enabled;
++
++	fix->type = FB_TYPE_PACKED_PIXELS;
+ 
+-	disp->dispsw = &e1355_dispsw;
+-	
+-	switch(disp->var.bits_per_pixel) {
+-#ifdef FBCON_HAS_MFB
+-	case 1:
+-		d = &fbcon_mfb; break;
+-#endif	       
+-#ifdef FBCON_HAS_CFB8
++	display = epson1355_read_reg(REG_DISPLAY_MODE);
++	bpp = epson1355_bpp_tab[(display >> 2) & 7];
++
++	switch (bpp) {
+ 	case 8:
+-		d = &fbcon_cfb8; break;
+-#endif
++		fix->visual = FB_VISUAL_PSEUDOCOLOR;
++		var->bits_per_pixel = 8;
++		var->red.offset = var->green.offset = var->blue.offset = 0;
++		var->red.length = var->green.length = var->blue.length = 8;
++		break;
++	case 16:
++		/* 5-6-5 RGB */
++		fix->visual = FB_VISUAL_TRUECOLOR;
++		var->bits_per_pixel = 16;
++		var->red.offset = 11;
++		var->red.length = 5;
++		var->green.offset = 5;
++		var->green.length = 6;
++		var->blue.offset = 0;
++		var->blue.length = 5;
++		break;
+ 	default:
+-		BUG(); break;
++		BUG();
+ 	}
+ 
+-	memcpy(&e1355_dispsw, d, sizeof *d);
++	if (fix->visual == FB_VISUAL_TRUECOLOR) {
++		info->pseudo_palette = &pseudo_palette;
++		fb_alloc_cmap(&(info->cmap), 16, 0);
++	} else
++		fb_alloc_cmap(&(info->cmap), 1 << bpp, 0);
++
++	panel = epson1355_read_reg(REG_PANEL_TYPE);
++	is_color = (panel & 0x04) != 0;
++	is_dual = (panel & 0x02) != 0;
++	is_tft = (panel & 0x01) != 0;
++	crt_enabled = (display & 0x02) != 0;
++	lcd_enabled = (display & 0x01) != 0;
++	lcd_bpp = epson1355_width_tab[is_tft][(panel >> 4) & 3];
++
++	xres = (epson1355_read_reg(REG_HORZ_DISP_WIDTH) + 1) * 8;
++	yres = (epson1355_read_reg16(REG_VERT_DISP_HEIGHT0) + 1) *
++	    ((is_dual && !crt_enabled) ? 2 : 1);
++	offset = epson1355_read_reg16(REG_MEM_ADDR_OFFSET0) & 0x7ff;
++	xres_virtual = offset * 16 / bpp;
++	yres_virtual = fix->smem_len / (offset * 2);
++
++	var->xres = xres;
++	var->yres = yres;
++	var->xres_virtual = xres_virtual;
++	var->yres_virtual = yres_virtual;
++	var->xoffset = var->yoffset = 0;
+ 
+-	/* reading is terribly slow for us */
+-#if 0 /* XXX: need to work out why this doesn't work */
+-	e1355_dispsw.bmove = fbcon_redraw_bmove;
++	fix->line_length = offset * 2;
++
++	fix->xpanstep = 0;	/* no pan yet */
++	fix->ypanstep = 1;
++	fix->ywrapstep = 0;
++	fix->accel = FB_ACCEL_NONE;
++
++	var->grayscale = !is_color;
++
++#ifdef DEBUG
++	printk(KERN_INFO
++	       "epson1355fb: xres=%d, yres=%d, "
++	       "is_color=%d, is_dual=%d, is_tft=%d\n",
++	       xres, yres, is_color, is_dual, is_tft);
++	printk(KERN_INFO
++	       "epson1355fb: bpp=%d, lcd_bpp=%d, "
++	       "crt_enabled=%d, lcd_enabled=%d\n",
++	       bpp, lcd_bpp, crt_enabled, lcd_enabled);
+ #endif
+ }
+ 
+-/* ------------ Interfaces to hardware functions ------------ */
+ 
++static void clearfb16(struct fb_info *info)
++{
++	u16 *dst = (u16 *) info->screen_base;
++	unsigned long n = info->fix.smem_len;
+ 
+-struct fbgen_hwswitch e1355_switch = {
+-	.detect =	e1355_detect,
+-	.encode_fix =	e1355_encode_fix,
+-	.decode_var =	e1355_decode_var,
+-	.encode_var =	e1355_encode_var,
+-	.get_par =	e1355_get_par,
+-	.set_par =	e1355_set_par,
+-	.getcolreg =	e1355_getcolreg,
+-	.pan_display =	e1355_pan_display,
+-	.blank =	e1355_blank,
+-	.set_disp =	e1355_set_disp,
+-};
++	while (n > 1) {
++		fb_writew(0, dst);
++		dst++, n -= 2;
++	}
+ 
++	if (n)
++		fb_writeb(0, dst);
++}
+ 
+-/* ------------ Hardware Independent Functions ------------ */
++static void epson1355fb_deinit(void);
+ 
++int __init epson1355fb_init(void)
++{
++	u8 revision;
++	int rc = 0;
+ 
+-static struct fb_ops e1355fb_ops = {
+-	.owner =	THIS_MODULE,
+-	.fb_get_fix =	fbgen_get_fix,
+-	.fb_get_var =	fbgen_get_var,
+-	.fb_set_var =	fbgen_set_var,
+-	.fb_get_cmap =	fbgen_get_cmap,
+-	.fb_set_cmap =	gen_set_cmap,
+-	.fb_setcolreg =	e1355fb_setcolreg,
+-	.fb_pan_display =fbgen_pan_display,
+-	.fb_blank =	fbgen_blank,
+-};
++	if (!request_mem_region
++	    (EPSON1355FB_REGS_PHYS, EPSON1355FB_REGS_LEN,
++	     "S1D13505 registers")) {
++		printk(KERN_ERR "epson1355fb: unable to reserve "
++		       "registers at 0x%0x\n", EPSON1355FB_REGS_PHYS);
++		rc = -EBUSY;
++		goto bail;
++	}
+ 
+-static struct e1355fb_info fb_info;
++	if (!request_mem_region(EPSON1355FB_FB_PHYS, EPSON1355FB_FB_LEN,
++				"S1D13505 framebuffer")) {
++		printk(KERN_ERR "epson1355fb: unable to reserve "
++		       "framebuffer at 0x%0x\n", EPSON1355FB_FB_PHYS);
++		rc = -EBUSY;
++		goto bail;
++	}
++
++	par.reg_addr = (unsigned long)
++	    ioremap(EPSON1355FB_REGS_PHYS, EPSON1355FB_REGS_LEN);
++	if (!par.reg_addr) {
++		printk(KERN_ERR "epson1355fb: unable to map registers\n");
++		rc = -ENOMEM;
++		goto bail;
++	}
++
++	info.screen_base =
++	    ioremap(EPSON1355FB_FB_PHYS, EPSON1355FB_FB_LEN);
++	if (!info.screen_base) {
++		printk(KERN_ERR
++		       "epson1355fb: unable to map framebuffer\n");
++		rc = -ENOMEM;
++		goto bail;
++	}
++
++	revision = epson1355_read_reg(REG_REVISION_CODE);
++	if ((revision >> 2) != 3) {
++		printk(KERN_INFO "epson1355fb: epson1355 not found\n");
++		rc = -ENODEV;
++		goto bail;
++	}
++
++	info.fix.mmio_start = EPSON1355FB_REGS_PHYS;
++	info.fix.mmio_len = EPSON1355FB_REGS_LEN;
++	info.fix.smem_start = EPSON1355FB_FB_PHYS;
++	info.fix.smem_len = get_fb_size(&info);
++
++	printk(KERN_INFO
++	       "epson1355fb: regs mapped at 0x%lx, fb %d KiB mapped at 0x%p\n",
++	       par.reg_addr, info.fix.smem_len / 1024, info.screen_base);
++
++	strcpy(info.fix.id, "S1D13505");
++	info.par = &par;
++	info.node = NODEV;
++	info.fbops = &epson1355fb_fbops;
++	info.flags = FBINFO_FLAG_DEFAULT;
++
++	/* we expect the boot loader to have initialized the chip
++	   with appropriate parameters from which we can determinte
++	   the flavor of lcd panel attached */
++	fetch_hw_state(&info);
++
++	/* turn this puppy on ... */
++	clearfb16(&info);
++	backlight_enable(1);
++	lcd_enable(1);
++
++	if (register_framebuffer(&info) < 0) {
++		rc = -EINVAL;
++		goto bail;
++	}
++
++	printk(KERN_INFO "fb%d: %s frame buffer device\n",
++	       minor(info.node), info.fix.id);
+ 
+-int __init e1355fb_setup(char *str)
+-{
+ 	return 0;
++
++      bail:
++	epson1355fb_deinit();
++	return rc;
+ }
+ 
+-int __init e1355fb_init(void)
++static void epson1355fb_deinit(void)
+ {
+-	fb_info.gen.fbhw = &e1355_switch;
+-	fb_info.gen.fbhw->detect();
+-	strcpy(fb_info.gen.info.modename, "SED1355");
+-	fb_info.gen.info.changevar = NULL;
+-	fb_info.gen.info.fbops = &e1355fb_ops;
+-	fb_info.gen.info.screen_base = (void *)E1355_FB_BASE;
+-	fb_info.gen.currcon = -1;
+-	fb_info.gen.info.disp = &disp;
+-	fb_info.gen.parsize = sizeof(struct e1355_par);
+-	fb_info.gen.info.switch_con = &fbgen_switch;
+-	fb_info.gen.info.updatevar = &fbgen_update_var;
+-	fb_info.gen.info.flags = FBINFO_FLAG_DEFAULT;
+-	/* This should give a reasonable default video mode */
+-	fbgen_get_var(&disp.var, -1, &fb_info.gen.info);
+-	fbgen_do_set_var(&disp.var, 1, &fb_info.gen);
+-	fbgen_set_disp(-1, &fb_info.gen);
+-	if (disp.var.bits_per_pixel > 1) 
+-		do_install_cmap(0, &fb_info.gen);
+-	if (register_framebuffer(&fb_info.gen.info) < 0)
+-		return -EINVAL;
+-	printk(KERN_INFO "fb%d: %s frame buffer device\n", fb_info.gen.info.node,
+-	       fb_info.gen.info.modename);
++	fb_dealloc_cmap(&info.cmap);
+ 
+-	return 0;
++	if (info.screen_base)
++		iounmap(info.screen_base);
++	if (par.reg_addr)
++		iounmap((void *) par.reg_addr);
++
++	release_mem_region(EPSON1355FB_FB_PHYS, EPSON1355FB_FB_LEN);
++	release_mem_region(EPSON1355FB_REGS_PHYS, EPSON1355FB_REGS_LEN);
+ }
+ 
++static void __exit epson1355fb_cleanup(void)
++{
++	backlight_enable(0);
++	lcd_enable(0);
+ 
+-    /*
+-     *  Cleanup
+-     */
+-
+-void e1355fb_cleanup(struct fb_info *info)
+-{
+-	/*
+-	 *  If your driver supports multiple boards, you should unregister and
+-	 *  clean up all instances.
+-	 */
+-	
+-	unregister_framebuffer(info);
+-	/* ... */
++	unregister_framebuffer(&info);
++	epson1355fb_deinit();
+ }
+ 
++/* ------------------------------------------------------------------------- */
++
++#ifdef MODULE
++module_init(epson1355fb_init);
++#endif
++module_exit(epson1355fb_cleanup);
++
++MODULE_AUTHOR("Christopher Hoover <ch@hpl.hp.com>");
++MODULE_DESCRIPTION("Framebuffer driver for Epson S1D13505");
+ MODULE_LICENSE("GPL");
+--- linux-2.6.0-test6/drivers/video/fbmem.c	2003-09-08 13:58:58.000000000 -0700
++++ 25/drivers/video/fbmem.c	2003-10-05 00:34:22.000000000 -0700
+@@ -25,7 +25,6 @@
+ #include <linux/mman.h>
+ #include <linux/tty.h>
+ #include <linux/init.h>
+-#include <linux/linux_logo.h>
+ #include <linux/proc_fs.h>
+ #ifdef CONFIG_KMOD
+ #include <linux/kmod.h>
+@@ -102,13 +101,13 @@ extern int hgafb_setup(char*);
+ extern int matroxfb_init(void);
+ extern int matroxfb_setup(char*);
+ extern int hpfb_init(void);
+-extern int control_init(void);
+-extern int control_setup(char*);
+-extern int platinum_init(void);
+-extern int platinum_setup(char*);
++extern int controlfb_init(void);
++extern int controlfb_setup(char*);
++extern int platinumfb_init(void);
++extern int platinumfb_setup(char*);
+ extern int valkyriefb_init(void);
+ extern int valkyriefb_setup(char*);
+-extern int chips_init(void);
++extern int chipsfb_init(void);
+ extern int g364fb_init(void);
+ extern int sa1100fb_init(void);
+ extern int fm2fb_init(void);
+@@ -135,14 +134,14 @@ extern int tx3912fb_init(void);
+ extern int tx3912fb_setup(char*);
+ extern int radeonfb_init(void);
+ extern int radeonfb_setup(char*);
+-extern int e1355fb_init(void);
+-extern int e1355fb_setup(char*);
++extern int epson1355fb_init(void);
+ extern int pvr2fb_init(void);
+ extern int pvr2fb_setup(char*);
+ extern int sstfb_init(void);
+ extern int sstfb_setup(char*);
+ extern int i810fb_init(void);
+ extern int i810fb_setup(char*);
++extern int asiliantfb_init(void);
+ extern int ffb_init(void);
+ extern int ffb_setup(char*);
+ extern int cg6_init(void);
+@@ -221,16 +220,16 @@ static struct {
+ 	{ "radeonfb", radeonfb_init, radeonfb_setup },
+ #endif
+ #ifdef CONFIG_FB_CONTROL
+-	{ "controlfb", control_init, control_setup },
++	{ "controlfb", controlfb_init, controlfb_setup },
+ #endif
+ #ifdef CONFIG_FB_PLATINUM
+-	{ "platinumfb", platinum_init, platinum_setup },
++	{ "platinumfb", platinumfb_init, platinumfb_setup },
+ #endif
+ #ifdef CONFIG_FB_VALKYRIE
+ 	{ "valkyriefb", valkyriefb_init, valkyriefb_setup },
+ #endif
+ #ifdef CONFIG_FB_CT65550
+-	{ "chipsfb", chips_init, NULL },
++	{ "chipsfb", chipsfb_init, NULL },
+ #endif
+ #ifdef CONFIG_FB_IMSTT
+ 	{ "imsttfb", imsttfb_init, imsttfb_setup },
+@@ -342,8 +341,8 @@ static struct {
+ #ifdef CONFIG_FB_TX3912
+ 	{ "tx3912fb", tx3912fb_init, tx3912fb_setup },
+ #endif
+-#ifdef CONFIG_FB_E1355
+-	{ "e1355fb", e1355fb_init, e1355fb_setup },
++#ifdef CONFIG_FB_EPSON1355
++	{ "s1d1355fb", epson1355fb_init, NULL },
+ #endif
+ #ifdef CONFIG_FB_PVR2
+ 	{ "pvr2fb", pvr2fb_init, pvr2fb_setup },
+@@ -360,6 +359,10 @@ static struct {
+ #ifdef CONFIG_FB_VOODOO1
+ 	{ "sstfb", sstfb_init, sstfb_setup },
+ #endif
++#ifdef CONFIG_FB_ASILIANT
++	{ "asiliantfb", asiliantfb_init, NULL },
++#endif
++
+ 	/*
+ 	 * Generic drivers that don't use resource management (yet)
+ 	 */
+@@ -409,20 +412,20 @@ void sys_outbuf(u8 *src, u8 *dst, unsign
+ 	memcpy(dst, src, size);
+ }	
+ 
+-void move_buf_aligned(struct fb_info *info, u8 *dst, u8 *src, u32 d_pitch, 
+-			u32 s_pitch, u32 height)
++void move_buf_aligned(struct fb_info *info, struct fb_pixmap *buf, u8 *dst, u8 *src,
++			u32 d_pitch, u32 s_pitch, u32 height)
+ {
+ 	int i;
+ 
+ 	for (i = height; i--; ) {
+-		info->pixmap.outbuf(src, dst, s_pitch);
++		buf->outbuf(src, dst, s_pitch);
+ 		src += s_pitch;
+ 		dst += d_pitch;
+ 	}
+ }
+ 
+-void move_buf_unaligned(struct fb_info *info, u8 *dst, u8 *src, u32 d_pitch, 
+-			u32 height, u32 mask, u32 shift_high, u32 shift_low,
++void move_buf_unaligned(struct fb_info *info, struct fb_pixmap *buf, u8 *dst, u8 *src,
++			u32 d_pitch, u32 height, u32 mask, u32 shift_high, u32 shift_low,
+ 			u32 mod, u32 idx)
+ {
+ 	int i, j;
+@@ -430,21 +433,21 @@ void move_buf_unaligned(struct fb_info *
+ 
+ 	for (i = height; i--; ) {
+ 		for (j = 0; j < idx; j++) {
+-			tmp = info->pixmap.inbuf(dst+j);
++			tmp = buf->inbuf(dst+j);
+ 			tmp &= mask;
+ 			tmp |= *src >> shift_low;
+-			info->pixmap.outbuf(&tmp, dst+j, 1);
++			buf->outbuf(&tmp, dst+j, 1);
+ 			tmp = *src << shift_high;
+-			info->pixmap.outbuf(&tmp, dst+j+1, 1);
++			buf->outbuf(&tmp, dst+j+1, 1);
+ 			src++;
+ 		}
+-		tmp = info->pixmap.inbuf(dst+idx);
++		tmp = buf->inbuf(dst+idx);
+ 		tmp &= mask;
+ 		tmp |= *src >> shift_low;
+-		info->pixmap.outbuf(&tmp, dst+idx, 1);
++		buf->outbuf(&tmp, dst+idx, 1);
+ 		if (shift_high < mod) {
+ 			tmp = *src << shift_high;
+-			info->pixmap.outbuf(&tmp, dst+idx+1, 1);
++			buf->outbuf(&tmp, dst+idx+1, 1);
+ 		}	
+ 		src++;
+ 		dst += d_pitch;
+@@ -455,26 +458,29 @@ void move_buf_unaligned(struct fb_info *
+  * we need to lock this section since fb_cursor
+  * may use fb_imageblit()
+  */
+-u32 fb_get_buffer_offset(struct fb_info *info, u32 size)
++char* fb_get_buffer_offset(struct fb_info *info, struct fb_pixmap *buf, u32 size)
+ {
+-	u32 align = info->pixmap.buf_align - 1;
++	u32 align = buf->buf_align - 1;
+ 	u32 offset, count = 1000;
++	char *addr = buf->addr;
+ 
+-	spin_lock(&info->pixmap.lock);
+-	offset = info->pixmap.offset + align;
+-	offset &= ~align;
+-	if (offset + size > info->pixmap.size) {
+-		while (atomic_read(&info->pixmap.count) && count--);
+-		if (info->fbops->fb_sync && 
+-		    info->pixmap.flags & FB_PIXMAP_SYNC)
+-			info->fbops->fb_sync(info);
+-		offset = 0;
++	spin_lock(&buf->lock);
++	if (!(buf->flags & FB_PIXMAP_IO)) {
++		offset = buf->offset + align;
++		offset &= ~align;
++		if (offset + size > buf->size) {
++			while (atomic_read(&buf->count) && count--);
++			if (info->fbops->fb_sync && (buf->flags & FB_PIXMAP_SYNC))
++				info->fbops->fb_sync(info);
++			offset = 0;
++		}
++		buf->offset = offset + size;
++		addr += offset;
+ 	}
+-	info->pixmap.offset = offset + size;
+-	atomic_inc(&info->pixmap.count);	
++	atomic_inc(&buf->count);
+ 	smp_mb__after_atomic_inc();
+-	spin_unlock(&info->pixmap.lock);
+-	return offset;
++	spin_unlock(&buf->lock);
++	return addr;
+ }
+ 
+ #ifdef CONFIG_LOGO
+@@ -656,7 +662,7 @@ int fb_prepare_logo(struct fb_info *info
+ 	}
+ 
+ 	/* Return if no suitable logo was found */
+-	fb_logo.logo = fb_find_logo(info->var.bits_per_pixel);
++	fb_logo.logo = find_logo(info->var.bits_per_pixel);
+ 	
+ 	if (!fb_logo.logo || fb_logo.logo->height > info->var.yres) {
+ 		fb_logo.logo = NULL;
+@@ -726,8 +732,6 @@ int fb_show_logo(struct fb_info *info)
+ 	     x <= info->var.xres-fb_logo.logo->width; x += (fb_logo.logo->width + 8)) {
+ 		image.dx = x;
+ 		info->fbops->fb_imageblit(info, &image);
+-		//atomic_dec(&info->pixmap.count);
+-		//smp_mb__after_atomic_dec();
+ 	}
+ 	
+ 	if (palette != NULL)
+@@ -1238,6 +1242,22 @@ register_framebuffer(struct fb_info *fb_
+ 		fb_info->pixmap.inbuf = sys_inbuf;
+ 	spin_lock_init(&fb_info->pixmap.lock);
+ 
++	if (fb_info->sprite.addr == NULL) {
++		fb_info->sprite.addr = kmalloc(FBPIXMAPSIZE, GFP_KERNEL);
++		if (fb_info->sprite.addr) {
++			fb_info->sprite.size = FBPIXMAPSIZE;
++			fb_info->sprite.buf_align = 1;
++			fb_info->sprite.scan_align = 1;
++			fb_info->sprite.flags = FB_PIXMAP_IO;
++		}
++	}
++	fb_info->sprite.offset = 0;
++	if (fb_info->sprite.outbuf == NULL)
++		fb_info->sprite.outbuf = sys_outbuf;
++	if (fb_info->sprite.inbuf == NULL)
++		fb_info->sprite.inbuf = sys_inbuf;
++	spin_lock_init(&fb_info->sprite.lock);
++
+ 	registered_fb[i] = fb_info;
+ 
+ 	devfs_mk_cdev(MKDEV(FB_MAJOR, i),
+@@ -1371,6 +1391,33 @@ int __init video_setup(char *options)
+ 
+ __setup("video=", video_setup);
+ 
++static int fbdev_dummy(void)
++{
++	return 0;
++}
++
++#define FBDEV_EMPTY (void *)fbdev_dummy
++
++const struct fb_ops dummy_fbdev = {
++	.fb_open	= FBDEV_EMPTY,
++	.fb_release	= FBDEV_EMPTY,
++	.fb_read	= FBDEV_EMPTY,
++	.fb_write	= FBDEV_EMPTY,
++	.fb_check_var	= FBDEV_EMPTY,
++	.fb_set_par	= FBDEV_EMPTY,
++	.fb_setcolreg	= FBDEV_EMPTY,
++	.fb_blank	= FBDEV_EMPTY,
++	.fb_pan_display	= FBDEV_EMPTY,
++	.fb_fillrect	= FBDEV_EMPTY,
++	.fb_copyarea	= FBDEV_EMPTY,
++	.fb_imageblit	= FBDEV_EMPTY,
++	.fb_cursor	= FBDEV_EMPTY,
++	.fb_rotate	= FBDEV_EMPTY,
++	.fb_sync	= FBDEV_EMPTY,
++	.fb_ioctl	= FBDEV_EMPTY,
++	.fb_mmap	= FBDEV_EMPTY,
++};
++
+     /*
+      *  Visible symbols for modules
+      */
+--- linux-2.6.0-test6/drivers/video/g364fb.c	2003-06-14 12:17:58.000000000 -0700
++++ 25/drivers/video/g364fb.c	2003-10-05 00:34:22.000000000 -0700
+@@ -127,20 +127,55 @@ static struct fb_ops g364fb_ops = {
+ 
+ int g364fb_cursor(struct fb_info *info, struct fb_cursor *cursor)
+ {
++
++	/* Turn the cursor off before we start changing it. */
++	*(unsigned int *) CTLA_REG |= CURS_TOGGLE;
++
++	if (cursor->set & FB_CUR_SETHOT)
++		info->cursor.hot = cursor->hot;
+ 	
+-	switch (cursor->enable) {
+-	case CM_ERASE:
+-		*(unsigned int *) CTLA_REG |= CURS_TOGGLE;
+-		break;
++	if (cursor->set & FB_CUR_SETPOS) {
++		unsigned int tmp;
+ 
+-	case CM_MOVE:
+-	case CM_DRAW:
+-		*(unsigned int *) CTLA_REG &= ~CURS_TOGGLE;
+-		*(unsigned int *) CURS_POS_REG =
+-		    ((x * fontwidth(p)) << 12) | ((y * fontheight(p)) -
+-						  info->var.yoffset);
+-		break;
++		info->cursor.image.dx = cursor->image.dx;
++		info->cursor.image.dy = cursor->image.dy;
++
++		tmp = cursor->image.dy - info->var.yoffset;
++		tmp |= (cursor->image.dx - info->var.xoffset) << 12;
++
++		*(unsigned int *) CURS_POS_REG = tmp;
++	}
++
++	if (cursor->set & FB_CUR_SETSIZE) {
++		info->cursor.image.height = cursor->image.height;
++		info->cursor.image.width = cursor->image.width;
++
++	 	/* set the whole cursor to transparent */
++		for (i = 0; i < 512; i++)
++			*(unsigned short *) (CURS_PAT_REG + i * 8) = 0;
+ 	}
++
++	if (cursor->set & FB_CUR_SETCMAP) {
++		volatile unsigned int *curs_pal_ptr =
++	    			(volatile unsigned int *) CURS_PAL_REG;
++
++		/* setup cursor */
++		curs_pal_ptr[0] |= 0x00ffffff;
++		curs_pal_ptr[2] |= 0x00ffffff;
++		curs_pal_ptr[4] |= 0x00ffffff;
++	}
++
++	if (cursor->set & FB_CUR_SETSHAPE) {
++		/*
++	 	 * switch the last two lines to cursor palette 3
++	 	 * we assume here, that FONTSIZE_X is 8
++	 	 */
++		*(unsigned short *) (CURS_PAT_REG + 14 * 64) = 0xffff;
++		*(unsigned short *) (CURS_PAT_REG + 15 * 64) = 0xffff;
++	}
++
++	if (info->cursor.enable)
++		*(unsigned int *) CTLA_REG &= ~CURS_TOGGLE;
+ 	return 0;
+ }
+ 
+@@ -196,10 +231,6 @@ static int g364fb_setcolreg(u_int regno,
+  */
+ int __init g364fb_init(void)
+ {
+-	volatile unsigned int *pal_ptr =
+-	    (volatile unsigned int *) CLR_PAL_REG;
+-	volatile unsigned int *curs_pal_ptr =
+-	    (volatile unsigned int *) CURS_PAL_REG;
+ 	int mem, i, j;
+ 
+ 	/* TBD: G364 detection */
+@@ -212,23 +243,6 @@ int __init g364fb_init(void)
+ 	    (*((volatile unsigned int *) VDISPLAY_REG) & 0x00ffffff) / 2;
+ 	*(volatile unsigned int *) CTLA_REG |= ENABLE_VTG;
+ 
+-	/* setup cursor */
+-	curs_pal_ptr[0] |= 0x00ffffff;
+-	curs_pal_ptr[2] |= 0x00ffffff;
+-	curs_pal_ptr[4] |= 0x00ffffff;
+-
+-	/*
+-	 * first set the whole cursor to transparent
+-	 */
+-	for (i = 0; i < 512; i++)
+-		*(unsigned short *) (CURS_PAT_REG + i * 8) = 0;
+-
+-	/*
+-	 * switch the last two lines to cursor palette 3
+-	 * we assume here, that FONTSIZE_X is 8
+-	 */
+-	*(unsigned short *) (CURS_PAT_REG + 14 * 64) = 0xffff;
+-	*(unsigned short *) (CURS_PAT_REG + 15 * 64) = 0xffff;
+ 	fb_var.xres_virtual = fbvar.xres;
+ 	fb_fix.line_length = (xres / 8) * fb_var.bits_per_pixel;
+ 	fb_fix.smem_start = 0x40000000;	/* physical address */
+--- linux-2.6.0-test6/drivers/video/i810/Makefile	2003-06-14 12:18:06.000000000 -0700
++++ 25/drivers/video/i810/Makefile	2003-10-05 00:34:22.000000000 -0700
+@@ -1,16 +1,9 @@
+ #
+ # Makefile for the Intel 810/815 framebuffer driver
+ #
+-# Note! Dependencies are done automagically by 'make dep', which also
+-# removes any old dependencies. DON'T put your own dependencies here
+-# unless it's something special (ie not a .c file).
+-#
+-# Note 2! The CFLAGS definitions are now in the main makefile...
+-
+ 
+ obj-$(CONFIG_FB_I810)		+= i810fb.o
+ 
+-
+ i810fb-objs                     := i810_main.o i810_accel.o
+ 
+ ifdef CONFIG_FB_I810_GTF
+--- linux-2.6.0-test6/drivers/video/imsttfb.c	2003-08-08 22:55:13.000000000 -0700
++++ 25/drivers/video/imsttfb.c	2003-10-05 00:34:22.000000000 -0700
+@@ -1495,6 +1495,8 @@ imsttfb_probe(struct pci_dev *pdev, cons
+ 		default:
+ 			printk(KERN_INFO "imsttfb: Device 0x%x unknown, "
+ 					 "contact maintainer.\n", pdev->device);
++			release_mem_region(addr, size);
++			kfree(info);
+ 			return -ENODEV;
+ 	}
+ 
+--- linux-2.6.0-test6/drivers/video/Kconfig	2003-09-27 18:57:46.000000000 -0700
++++ 25/drivers/video/Kconfig	2003-10-05 00:34:22.000000000 -0700
+@@ -188,19 +188,19 @@ config FB_AMIGA_AGA
+ 	  otherwise say N.
+ 
+ config FB_CYBER
+-	tristate "Amiga CyberVision support"
+-	depends on FB && ZORRO
++	tristate "Amiga CyberVision 64 support"
++	depends on FB && ZORRO && BROKEN
+ 	help
+ 	  This enables support for the Cybervision 64 graphics card from
+ 	  Phase5. Please note that its use is not all that intuitive (i.e. if
+ 	  you have any questions, be sure to ask!). Say N unless you have a
+ 	  Cybervision 64 or plan to get one before you next recompile the
+ 	  kernel. Please note that this driver DOES NOT support the
+-	  Cybervision 64 3D card, as they use incompatible video chips.
++	  Cybervision 64/3D card, as they use incompatible video chips.
+ 
+ config FB_VIRGE
+-	bool "Amiga CyberVision3D support "
+-	depends on FB && ZORRO
++	bool "Amiga CyberVision 64/3D support "
++	depends on FB && ZORRO && BROKEN
+ 	help
+ 	  This enables support for the Cybervision 64/3D graphics card from
+ 	  Phase5. Please note that its use is not all that intuitive (i.e. if
+@@ -210,8 +210,8 @@ config FB_VIRGE
+ 	  Cybervision 64 card, as they use incompatible video chips.
+ 
+ config FB_RETINAZ3
+-	tristate "Amiga RetinaZ3 support"
+-	depends on FB && ZORRO
++	tristate "Amiga Retina Z3 support"
++	depends on FB && ZORRO && BROKEN
+ 	help
+ 	  This enables support for the Retina Z3 graphics card. Say N unless
+ 	  you have a Retina Z3 or plan to get one before you next recompile
+@@ -226,7 +226,7 @@ config FB_FM2
+ 
+ config FB_ATARI
+ 	bool "Atari native chipset support"
+-	depends on FB && ATARI
++	depends on FB && ATARI && BROKEN
+ 	help
+ 	  This is the frame buffer device driver for the builtin graphics
+ 	  chipset found in Ataris.
+@@ -266,6 +266,10 @@ config FB_CT65550
+ 	  This is the frame buffer device driver for the Chips & Technologies
+ 	  65550 graphics chip in PowerBooks.
+ 
++config FB_ASILIANT
++	bool "Chips 69000 display support"
++	depends on FB && PCI
++
+ config FB_IMSTT
+ 	bool "IMS Twin Turbo display support"
+ 	depends on FB && PCI
+@@ -367,7 +371,7 @@ config BUS_I2C
+ 
+ config FB_SUN3
+ 	bool "Sun3 framebuffer support"
+-	depends on FB && (SUN3 || SUN3X)
++	depends on FB && (SUN3 || SUN3X) && BROKEN
+ 
+ config FB_BW2
+ 	bool "BWtwo support"
+@@ -414,35 +418,15 @@ config FB_PVR2_DEBUG
+ 	  messages. Most people will want to say N here. If unsure, you will
+ 	  also want to say N.
+ 
+-config FB_E1355
++config FB_EPSON1355
+ 	bool "Epson 1355 framebuffer support"
+-	depends on FB && SUPERH
++	depends on FB && (SUPERH || ARCH_CEIVA)
+ 	help
+ 	  Build in support for the SED1355 Epson Research Embedded RAMDAC
+ 	  LCD/CRT Controller (since redesignated as the S1D13505) as a
+ 	  framebuffer.  Product specs at
+ 	  <http://www.erd.epson.com/vdc/html/products.htm>.
+ 
+-config E1355_REG_BASE
+-	hex "Register Base Address"
+-	depends on FB_E1355
+-	default "a8000000"
+-	help
+-	  Epson SED1355/S1D13505 LCD/CRT controller register base address.
+-	  See the manuals at
+-	  <http://www.erd.epson.com/vdc/html/contents/S1D13505.htm> for
+-	  discussion.
+-
+-config E1355_FB_BASE
+-	hex "Framebuffer Base Address"
+-	depends on FB_E1355
+-	default "a8200000"
+-	help
+-	  Epson SED1355/S1D13505 LCD/CRT controller memory base address.  See
+-	  the manuals at
+-	  <http://www.erd.epson.com/vdc/html/contents/S1D13505.htm> for
+-	  discussion.
+-
+ config FB_RIVA
+ 	tristate "nVidia Riva support"
+ 	depends on FB && PCI
+@@ -703,26 +687,40 @@ config FB_ATY_XL_INIT
+ 	  Say Y here to support booting a Rage XL without BIOS support.
+ 
+ config FB_SIS
+-	tristate "SIS acceleration"
++	tristate "SiS acceleration"
+ 	depends on FB && PCI
+ 	help
+-	  This is the frame buffer device driver for the SiS 630 and 640 Super
+-	  Socket 7 UMA cards.  Specs available at <http://www.sis.com.tw/>.
++	  This is the frame buffer device driver for the SiS 300, 315 and Xabre
++	  series VGA controller.
++
++	  Specs available at <http://www.sis.com.tw/>.
++
++	  See <http://www.winischhofer.net/linuxsisvga.shtml> for
++	  documentation and updates.
++
++	  The driver is also available as a module ( = code which can be
++	  inserted and removed from the running kernel whenever you want). The
++	  module will be called sisfb. If you want to compile it as a
++	  module, say M here and read Documentation/modules.txt.
+ 
+ config FB_SIS_300
+-	bool "SIS 630/540/730 support"
++	bool "SIS 300 series support"
+ 	depends on FB_SIS
+ 	help
+-	  This is the frame buffer device driver for the SiS 630 and related
+-	  Super Socket 7 UMA cards.  Specs available at
+-	  <http://www.sis.com.tw/>.
++	  This is the frame buffer device driver for the SiS 300 series VGA
++	  controllers. This includes the 300, 540, 630, 730.
++	  Documentation and updates available at
++	  http://www.winischhofer.net/linuxsisvga.shtml
+ 
+ config FB_SIS_315
+-	bool "SIS 315H/315 support"
++	bool "SIS 315/Xabre support"
+ 	depends on FB_SIS
+ 	help
+-	  This is the frame buffer device driver for the SiS 315 graphics
+-	  card.  Specs available at <http://www.sis.com.tw/>.
++	  This is the frame buffer device driver for the SiS 315 and Xabre
++	  series VGA controllers. This includes the 315, 315H, 315PRO, 650,
++	  651, M650, 652, M652, 740, 330 (Xabre), 660, M660, 760, M760.
++	  Documentation and updates available at
++	  http://www.winischhofer.net/linuxsisvga.shtml
+ 
+ config FB_NEOMAGIC
+ 	tristate "NeoMagic display support"
+--- linux-2.6.0-test6/drivers/video/logo/logo.c	2003-07-27 12:14:40.000000000 -0700
++++ 25/drivers/video/logo/logo.c	2003-10-05 00:34:22.000000000 -0700
+@@ -32,8 +32,7 @@ extern const struct linux_logo logo_supe
+ extern const struct linux_logo logo_superh_vga16;
+ extern const struct linux_logo logo_superh_clut224;
+ 
+-
+-const struct linux_logo *fb_find_logo(int depth)
++const struct linux_logo *find_logo(int depth)
+ {
+ 	const struct linux_logo *logo = 0;
+ 
+--- linux-2.6.0-test6/drivers/video/Makefile	2003-09-08 13:58:58.000000000 -0700
++++ 25/drivers/video/Makefile	2003-10-05 00:34:22.000000000 -0700
+@@ -22,7 +22,7 @@ obj-$(CONFIG_FB_Q40)              += q40
+ obj-$(CONFIG_FB_ATARI)            += atafb.o
+ obj-$(CONFIG_FB_68328)            += 68328fb.o
+ obj-$(CONFIG_FB_RADEON)		  += radeonfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
+-obj-$(CONFIG_FB_NEOMAGIC)         += neofb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
++obj-$(CONFIG_FB_NEOMAGIC)         += neofb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o vgastate.o
+ obj-$(CONFIG_FB_IGA)              += igafb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
+ obj-$(CONFIG_FB_CONTROL)          += controlfb.o macmodes.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
+ obj-$(CONFIG_FB_PLATINUM)         += platinumfb.o macmodes.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
+@@ -68,9 +68,10 @@ obj-$(CONFIG_FB_HGA)              += hga
+ obj-$(CONFIG_FB_SA1100)           += sa1100fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
+ obj-$(CONFIG_FB_VIRTUAL)          += vfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o 
+ obj-$(CONFIG_FB_HIT)              += hitfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
+-obj-$(CONFIG_FB_E1355)            += epson1355fb.o
+-obj-$(CONFIG_FB_PVR2)             += pvr2fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
++obj-$(CONFIG_FB_EPSON1355)        += epson1355fb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
++obj-$(CONFIG_FB_PVR2)             += pvr2fb.o cfbcillrect.o cfbcopyarea.o cfbimgblt.o
+ obj-$(CONFIG_FB_VOODOO1)          += sstfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
++obj-$(CONFIG_FB_ASILIANT)         += asiliantfb.o cfbfillrect.o cfbcopyarea.o cfbimgblt.o
+ 
+ obj-$(CONFIG_FB_FFB)               += ffb.o sbuslib.o cfbimgblt.o cfbcopyarea.o
+ obj-$(CONFIG_FB_CG6)               += cg6.o sbuslib.o cfbimgblt.o cfbcopyarea.o
+--- linux-2.6.0-test6/drivers/video/neofb.c	2003-08-08 22:55:13.000000000 -0700
++++ 25/drivers/video/neofb.c	2003-10-05 00:34:22.000000000 -0700
+@@ -81,9 +81,10 @@ extern int tosh_smm(SMMRegisters *regs);
+ #include <asm/mtrr.h>
+ #endif
+ 
++#include <video/vga.h>
+ #include <video/neomagic.h>
+ 
+-#define NEOFB_VERSION "0.4.1"
++#define NEOFB_VERSION "0.4.2"
+ 
+ /* --------------------------------------------------------------------- */
+ 
+@@ -152,6 +153,16 @@ static biosMode bios32[] = {
+ };
+ #endif
+ 
++static inline u32 read_le32(int regindex, const struct neofb_par *par)
++{
++	return readl(par->neo2200 + par->cursorOff + regindex);
++}
++
++static inline void write_le32(int regindex, u32 val, const struct neofb_par *par)
++{
++	writel(val, par->neo2200 + par->cursorOff + regindex);
++}
++
+ static int neoFindMode(int xres, int yres, int depth)
+ {
+ 	int xres_s;
+@@ -363,44 +374,61 @@ static int vgaHWInit(const struct fb_var
+ 	par->Attribute[18] = 0x0F;
+ 	par->Attribute[19] = 0x00;
+ 	par->Attribute[20] = 0x00;
+-
+ 	return 0;
+ }
+ 
+-static void vgaHWLock(void)
++static void vgaHWLock(struct vgastate *state)
+ {
+ 	/* Protect CRTC[0-7] */
+-	VGAwCR(0x11, VGArCR(0x11) | 0x80);
++	vga_wcrt(state->vgabase, 0x11, vga_rcrt(state->vgabase, 0x11) | 0x80);
+ }
+ 
+ static void vgaHWUnlock(void)
+ {
+ 	/* Unprotect CRTC[0-7] */
+-	VGAwCR(0x11, VGArCR(0x11) & ~0x80);
++	vga_wcrt(NULL, 0x11, vga_rcrt(NULL, 0x11) & ~0x80);
+ }
+ 
+-static void neoLock(void)
++static void neoLock(struct vgastate *state)
+ {
+-	VGAwGR(0x09, 0x00);
+-	vgaHWLock();
++	vga_wgfx(state->vgabase, 0x09, 0x00);
++	vgaHWLock(state);
+ }
+ 
+ static void neoUnlock(void)
+ {
+ 	vgaHWUnlock();
+-	VGAwGR(0x09, 0x26);
++	vga_wgfx(NULL, 0x09, 0x26);
+ }
+ 
+ /*
+- * vgaHWSeqReset
+- *      perform a sequencer reset.
++ * VGA Palette management
+  */
+-void vgaHWSeqReset(int start)
++static int paletteEnabled = 0;
++
++inline void VGAenablePalette(void)
+ {
+-	if (start)
+-		VGAwSEQ(0x00, 0x01);	/* Synchronous Reset */
++	vga_r(NULL, VGA_IS1_RC);
++	vga_w(NULL, VGA_ATT_W, 0x00);
++	paletteEnabled = 1;
++}
++
++inline void VGAdisablePalette(void)
++{
++	vga_r(NULL, VGA_IS1_RC);
++	vga_w(NULL, VGA_ATT_W, 0x20);
++	paletteEnabled = 0;
++}
++
++inline void VGAwATTR(u8 index, u8 value)
++{
++	if (paletteEnabled)
++		index &= ~0x20;
+ 	else
+-		VGAwSEQ(0x00, 0x03);	/* End Reset */
++		index |= 0x20;
++
++	vga_r(NULL, VGA_IS1_RC);
++	vga_wattr(NULL, index, value);
+ }
+ 
+ void vgaHWProtect(int on)
+@@ -411,21 +439,18 @@ void vgaHWProtect(int on)
+ 		/*
+ 		 * Turn off screen and disable sequencer.
+ 		 */
+-		tmp = VGArSEQ(0x01);
+-
+-		vgaHWSeqReset(1);	/* start synchronous reset */
+-		VGAwSEQ(0x01, tmp | 0x20);	/* disable the display */
++		tmp = vga_rseq(NULL, 0x01);
++		vga_wseq(NULL, 0x00, 0x01);		/* Synchronous Reset */
++		vga_wseq(NULL, 0x01, tmp | 0x20);	/* disable the display */
+ 
+ 		VGAenablePalette();
+ 	} else {
+ 		/*
+ 		 * Reenable sequencer, then turn on screen.
+ 		 */
+-
+-		tmp = VGArSEQ(0x01);
+-
+-		VGAwSEQ(0x01, tmp & ~0x20);	/* reenable display */
+-		vgaHWSeqReset(0);	/* clear synchronousreset */
++		tmp = vga_rseq(NULL, 0x01);
++		vga_wseq(NULL, 0x01, tmp & ~0x20);	/* reenable display */
++		vga_wseq(NULL, 0x00, 0x03);		/* clear synchronousreset */
+ 
+ 		VGAdisablePalette();
+ 	}
+@@ -436,19 +461,19 @@ static void vgaHWRestore(const struct fb
+ {
+ 	int i;
+ 
+-	VGAwMISC(par->MiscOutReg);
++	vga_w(NULL, VGA_MIS_W, par->MiscOutReg);
+ 
+ 	for (i = 1; i < 5; i++)
+-		VGAwSEQ(i, par->Sequencer[i]);
++		vga_wseq(NULL, i, par->Sequencer[i]);
+ 
+ 	/* Ensure CRTC registers 0-7 are unlocked by clearing bit 7 or CRTC[17] */
+-	VGAwCR(17, par->CRTC[17] & ~0x80);
++	vga_wcrt(NULL, 17, par->CRTC[17] & ~0x80);
+ 
+ 	for (i = 0; i < 25; i++)
+-		VGAwCR(i, par->CRTC[i]);
++		vga_wcrt(NULL, i, par->CRTC[i]);
+ 
+ 	for (i = 0; i < 9; i++)
+-		VGAwGR(i, par->Graphics[i]);
++		vga_wgfx(NULL, i, par->Graphics[i]);
+ 
+ 	VGAenablePalette();
+ 
+@@ -535,6 +560,36 @@ static inline void neo2200_accel_init(st
+ /* --------------------------------------------------------------------- */
+ 
+ static int
++neofb_open(struct fb_info *info, int user)
++{
++	struct neofb_par *par = (struct neofb_par *) info->par;
++	int cnt = atomic_read(&par->ref_count);
++
++	if (cnt) {
++		memset(&par->state, 0, sizeof(struct vgastate));
++		par->state.flags = VGA_SAVE_MODE | VGA_SAVE_FONTS;
++		save_vga(&par->state);
++	}
++	atomic_inc(&par->ref_count);
++	return 0;
++}
++
++static int
++neofb_release(struct fb_info *info, int user)
++{
++	struct neofb_par *par = (struct neofb_par *) info->par;
++	int cnt = atomic_read(&par->ref_count);
++
++	if (!cnt)
++		return -EINVAL;
++	if (cnt == 1) {
++		restore_vga(&par->state);
++	}
++	atomic_dec(&par->ref_count);
++	return 0;
++}
++
++static int
+ neofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
+ {
+ 	struct neofb_par *par = (struct neofb_par *) info->par;
+@@ -981,13 +1036,13 @@ static int neofb_set_par(struct fb_info 
+ 	}
+ 
+ 	/* alread unlocked above */
+-	/* BOGUS  VGAwGR (0x09, 0x26); */
++	/* BOGUS  vga_wgfx(NULL, 0x09, 0x26); */
+ 
+ 	/* don't know what this is, but it's 0 from bootup anyway */
+-	VGAwGR(0x15, 0x00);
++	vga_wgfx(NULL, 0x15, 0x00);
+ 
+ 	/* was set to 0x01 by my bios in text and vesa modes */
+-	VGAwGR(0x0A, par->GeneralLockReg);
++	vga_wgfx(NULL, 0x0A, par->GeneralLockReg);
+ 
+ 	/*
+ 	 * The color mode needs to be set before calling vgaHWRestore
+@@ -996,7 +1051,7 @@ static int neofb_set_par(struct fb_info 
+ 	 * NOTE: Make sure we don't change bits make sure we don't change
+ 	 * any reserved bits.
+ 	 */
+-	temp = VGArGR(0x90);
++	temp = vga_rgfx(NULL, 0x90);
+ 	switch (info->fix.accel) {
+ 	case FB_ACCEL_NEOMAGIC_NM2070:
+ 		temp &= 0xF0;	/* Save bits 7:4 */
+@@ -1015,7 +1070,7 @@ static int neofb_set_par(struct fb_info 
+ 		break;
+ 	}
+ 
+-	VGAwGR(0x90, temp);
++	vga_wgfx(NULL, 0x90, temp);
+ 
+ 	/*
+ 	 * In some rare cases a lockup might occur if we don't delay
+@@ -1027,9 +1082,9 @@ static int neofb_set_par(struct fb_info 
+ 	 * Disable horizontal and vertical graphics and text expansions so
+ 	 * that vgaHWRestore works properly.
+ 	 */
+-	temp = VGArGR(0x25);
++	temp = vga_rgfx(NULL, 0x25);
+ 	temp &= 0x39;
+-	VGAwGR(0x25, temp);
++	vga_wgfx(NULL, 0x25, temp);
+ 
+ 	/*
+ 	 * Sleep for 200ms to make sure that the two operations above have
+@@ -1041,19 +1096,18 @@ static int neofb_set_par(struct fb_info 
+ 	 * This function handles restoring the generic VGA registers.  */
+ 	vgaHWRestore(info, par);
+ 
+-
+-	VGAwGR(0x0E, par->ExtCRTDispAddr);
+-	VGAwGR(0x0F, par->ExtCRTOffset);
+-	temp = VGArGR(0x10);
++	vga_wgfx(NULL, 0x0E, par->ExtCRTDispAddr);
++	vga_wgfx(NULL, 0x0F, par->ExtCRTOffset);
++	temp = vga_rgfx(NULL, 0x10);
+ 	temp &= 0x0F;		/* Save bits 3:0 */
+ 	temp |= (par->SysIfaceCntl1 & ~0x0F);	/* VESA Bios sets bit 1! */
+-	VGAwGR(0x10, temp);
++	vga_wgfx(NULL, 0x10, temp);
+ 
+-	VGAwGR(0x11, par->SysIfaceCntl2);
+-	VGAwGR(0x15, 0 /*par->SingleAddrPage */ );
+-	VGAwGR(0x16, 0 /*par->DualAddrPage */ );
++	vga_wgfx(NULL, 0x11, par->SysIfaceCntl2);
++	vga_wgfx(NULL, 0x15, 0 /*par->SingleAddrPage */ );
++	vga_wgfx(NULL, 0x16, 0 /*par->DualAddrPage */ );
+ 
+-	temp = VGArGR(0x20);
++	temp = vga_rgfx(NULL, 0x20);
+ 	switch (info->fix.accel) {
+ 	case FB_ACCEL_NEOMAGIC_NM2070:
+ 		temp &= 0xFC;	/* Save bits 7:2 */
+@@ -1074,79 +1128,78 @@ static int neofb_set_par(struct fb_info 
+ 		temp |= (par->PanelDispCntlReg1 & ~0x98);
+ 		break;
+ 	}
+-	VGAwGR(0x20, temp);
++	vga_wgfx(NULL, 0x20, temp);
+ 
+-	temp = VGArGR(0x25);
++	temp = vga_rgfx(NULL, 0x25);
+ 	temp &= 0x38;		/* Save bits 5:3 */
+ 	temp |= (par->PanelDispCntlReg2 & ~0x38);
+-	VGAwGR(0x25, temp);
++	vga_wgfx(NULL, 0x25, temp);
+ 
+ 	if (info->fix.accel != FB_ACCEL_NEOMAGIC_NM2070) {
+-		temp = VGArGR(0x30);
++		temp = vga_rgfx(NULL, 0x30);
+ 		temp &= 0xEF;	/* Save bits 7:5 and bits 3:0 */
+ 		temp |= (par->PanelDispCntlReg3 & ~0xEF);
+-		VGAwGR(0x30, temp);
++		vga_wgfx(NULL, 0x30, temp);
+ 	}
+ 
+-	VGAwGR(0x28, par->PanelVertCenterReg1);
+-	VGAwGR(0x29, par->PanelVertCenterReg2);
+-	VGAwGR(0x2a, par->PanelVertCenterReg3);
++	vga_wgfx(NULL, 0x28, par->PanelVertCenterReg1);
++	vga_wgfx(NULL, 0x29, par->PanelVertCenterReg2);
++	vga_wgfx(NULL, 0x2a, par->PanelVertCenterReg3);
+ 
+ 	if (info->fix.accel != FB_ACCEL_NEOMAGIC_NM2070) {
+-		VGAwGR(0x32, par->PanelVertCenterReg4);
+-		VGAwGR(0x33, par->PanelHorizCenterReg1);
+-		VGAwGR(0x34, par->PanelHorizCenterReg2);
+-		VGAwGR(0x35, par->PanelHorizCenterReg3);
++		vga_wgfx(NULL, 0x32, par->PanelVertCenterReg4);
++		vga_wgfx(NULL, 0x33, par->PanelHorizCenterReg1);
++		vga_wgfx(NULL, 0x34, par->PanelHorizCenterReg2);
++		vga_wgfx(NULL, 0x35, par->PanelHorizCenterReg3);
+ 	}
+ 
+ 	if (info->fix.accel == FB_ACCEL_NEOMAGIC_NM2160)
+-		VGAwGR(0x36, par->PanelHorizCenterReg4);
++		vga_wgfx(NULL, 0x36, par->PanelHorizCenterReg4);
+ 
+ 	if (info->fix.accel == FB_ACCEL_NEOMAGIC_NM2200 ||
+ 	    info->fix.accel == FB_ACCEL_NEOMAGIC_NM2230 ||
+ 	    info->fix.accel == FB_ACCEL_NEOMAGIC_NM2360 ||
+ 	    info->fix.accel == FB_ACCEL_NEOMAGIC_NM2380) {
+-		VGAwGR(0x36, par->PanelHorizCenterReg4);
+-		VGAwGR(0x37, par->PanelVertCenterReg5);
+-		VGAwGR(0x38, par->PanelHorizCenterReg5);
++		vga_wgfx(NULL, 0x36, par->PanelHorizCenterReg4);
++		vga_wgfx(NULL, 0x37, par->PanelVertCenterReg5);
++		vga_wgfx(NULL, 0x38, par->PanelHorizCenterReg5);
+ 
+ 		clock_hi = 1;
+ 	}
+ 
+ 	/* Program VCLK3 if needed. */
+-	if (par->ProgramVCLK && ((VGArGR(0x9B) != par->VCLK3NumeratorLow)
+-				 || (VGArGR(0x9F) != par->VCLK3Denominator)
+-				 || (clock_hi && ((VGArGR(0x8F) & ~0x0f)
+-						  != (par->
+-						      VCLK3NumeratorHigh &
++	if (par->ProgramVCLK && ((vga_rgfx(NULL, 0x9B) != par->VCLK3NumeratorLow)
++				 || (vga_rgfx(NULL, 0x9F) != par->VCLK3Denominator)
++				 || (clock_hi && ((vga_rgfx(NULL, 0x8F) & ~0x0f)
++						  != (par->VCLK3NumeratorHigh &
+ 						      ~0x0F))))) {
+-		VGAwGR(0x9B, par->VCLK3NumeratorLow);
++		vga_wgfx(NULL, 0x9B, par->VCLK3NumeratorLow);
+ 		if (clock_hi) {
+-			temp = VGArGR(0x8F);
++			temp = vga_rgfx(NULL, 0x8F);
+ 			temp &= 0x0F;	/* Save bits 3:0 */
+ 			temp |= (par->VCLK3NumeratorHigh & ~0x0F);
+-			VGAwGR(0x8F, temp);
++			vga_wgfx(NULL, 0x8F, temp);
+ 		}
+-		VGAwGR(0x9F, par->VCLK3Denominator);
++		vga_wgfx(NULL, 0x9F, par->VCLK3Denominator);
+ 	}
+ 
+ 	if (par->biosMode)
+-		VGAwCR(0x23, par->biosMode);
++		vga_wcrt(NULL, 0x23, par->biosMode);
+ 
+-	VGAwGR(0x93, 0xc0);	/* Gives 5x faster framebuffer writes !!! */
++	vga_wgfx(NULL, 0x93, 0xc0);	/* Gives 5x faster framebuffer writes !!! */
+ 
+ 	/* Program vertical extension register */
+ 	if (info->fix.accel == FB_ACCEL_NEOMAGIC_NM2200 ||
+ 	    info->fix.accel == FB_ACCEL_NEOMAGIC_NM2230 ||
+ 	    info->fix.accel == FB_ACCEL_NEOMAGIC_NM2360 ||
+ 	    info->fix.accel == FB_ACCEL_NEOMAGIC_NM2380) {
+-		VGAwCR(0x70, par->VerticalExt);
++		vga_wcrt(NULL, 0x70, par->VerticalExt);
+ 	}
+ 
+ 	vgaHWProtect(0);	/* Turn on screen */
+ 
+ 	/* Calling this also locks offset registers required in update_start */
+-	neoLock();
++	neoLock(&par->state);
+ 
+ 	info->fix.line_length =
+ 	    info->var.xres_virtual * (info->var.bits_per_pixel >> 3);
+@@ -1167,6 +1220,8 @@ static int neofb_set_par(struct fb_info 
+ static void neofb_update_start(struct fb_info *info,
+ 			       struct fb_var_screeninfo *var)
+ {
++	struct neofb_par *par = (struct neofb_par *) info->par;
++	struct vgastate *state = &par->state;
+ 	int oldExtCRTDispAddr;
+ 	int Base;
+ 
+@@ -1180,18 +1235,18 @@ static void neofb_update_start(struct fb
+ 	/*
+ 	 * These are the generic starting address registers.
+ 	 */
+-	VGAwCR(0x0C, (Base & 0x00FF00) >> 8);
+-	VGAwCR(0x0D, (Base & 0x00FF));
++	vga_wcrt(state->vgabase, 0x0C, (Base & 0x00FF00) >> 8);
++	vga_wcrt(state->vgabase, 0x0D, (Base & 0x00FF));
+ 
+ 	/*
+ 	 * Make sure we don't clobber some other bits that might already
+ 	 * have been set. NOTE: NM2200 has a writable bit 3, but it shouldn't
+ 	 * be needed.
+ 	 */
+-	oldExtCRTDispAddr = VGArGR(0x0E);
+-	VGAwGR(0x0E, (((Base >> 16) & 0x0f) | (oldExtCRTDispAddr & 0xf0)));
++	oldExtCRTDispAddr = vga_rgfx(NULL, 0x0E);
++	vga_wgfx(state->vgabase, 0x0E, (((Base >> 16) & 0x0f) | (oldExtCRTDispAddr & 0xf0)));
+ 
+-	neoLock();
++	neoLock(state);
+ }
+ 
+ /*
+@@ -1353,7 +1408,7 @@ neo2200_fillrect(struct fb_info *info, c
+ 	}
+ 
+ 	par->neo2200->dstStart =
+-	    dst * ((info->var.bits_per_pixel + 7) / 8);
++	    dst * ((info->var.bits_per_pixel + 7) >> 3);
+ 	par->neo2200->xyExt =
+ 	    (rect->height << 16) | (rect->width & 0xffff);
+ }
+@@ -1361,24 +1416,20 @@ neo2200_fillrect(struct fb_info *info, c
+ static void
+ neo2200_copyarea(struct fb_info *info, const struct fb_copyarea *area)
+ {
+-	struct neofb_par *par = (struct neofb_par *) info->par;
+ 	u32 sx = area->sx, sy = area->sy, dx = area->dx, dy = area->dy;
++	struct neofb_par *par = (struct neofb_par *) info->par;
+ 	u_long src, dst, bltCntl;
+ 
+ 	bltCntl = NEO_BC3_FIFO_EN | NEO_BC3_SKIP_MAPPING | 0x0C0000;
+ 
+-	if (sy < dy) {
++	if ((dy > sy) || ((dy == sy) && (dx > sx))) {
++		/* Start with the lower right corner */
+ 		sy += (area->height - 1);
+ 		dy += (area->height - 1);
+-
+-		bltCntl |= NEO_BC0_DST_Y_DEC | NEO_BC0_SRC_Y_DEC;
+-	}
+-
+-	if (area->sx < area->dx) {
+ 		sx += (area->width - 1);
+ 		dx += (area->width - 1);
+ 
+-		bltCntl |= NEO_BC0_X_DEC;
++		bltCntl |= NEO_BC0_X_DEC | NEO_BC0_DST_Y_DEC | NEO_BC0_SRC_Y_DEC;
+ 	}
+ 
+ 	src = sx * (info->var.bits_per_pixel >> 3) + sy*info->fix.line_length;
+@@ -1496,8 +1547,60 @@ neofb_sync(struct fb_info *info)
+ 	return 0;		
+ }
+ 
++static int
++neofb_cursor(struct fb_info *info, struct fb_cursor *cursor)
++{
++	struct neofb_par *par = (struct neofb_par *) info->par;
++
++	/* Disable cursor */
++	write_le32(NEOREG_CURSCNTL, ~NEO_CURS_ENABLE, par);
++
++	if (cursor->set & FB_CUR_SETPOS) {
++		u32 x = cursor->image.dx;
++		u32 y = cursor->image.dy;
++
++		info->cursor.image.dx = x;
++		info->cursor.image.dy = y;
++		write_le32(NEOREG_CURSX, x, par);
++		write_le32(NEOREG_CURSY, y, par);
++	}
++
++	if (cursor->set & FB_CUR_SETSIZE) {
++	}
++
++	if (cursor->set & FB_CUR_SETCMAP) {
++		if (cursor->image.depth == 1) {
++			u32 fg = cursor->image.fg_color;
++			u32 bg = cursor->image.bg_color;
++
++			info->cursor.image.fg_color = fg;
++			info->cursor.image.bg_color = bg;
++
++			fg = ((fg & 0xff0000) >> 16) | ((fg & 0xff) << 16) | (fg & 0xff00);
++			bg = ((bg & 0xff0000) >> 16) | ((bg & 0xff) << 16) | (bg & 0xff00);
++			write_le32(NEOREG_CURSFGCOLOR, fg, par);
++			write_le32(NEOREG_CURSBGCOLOR, bg, par);
++		}
++	}
++
++	if (cursor->set & FB_CUR_SETSHAPE) {
++		unsigned long dest = (unsigned long) par->cursorPad;
++		int i, j;
++
++		//memset_io(par->cursorPad, 0xff, 1);
++		//write_le32(NEOREG_CURSMEMPOS, ((0x000f & (dest >> 10)) << 8) |
++		//		((0x0ff0 & (dest >> 10)) >> 4), par);
++	}
++
++	if (info->cursor.enable)
++		write_le32(NEOREG_CURSCNTL, NEO_CURS_ENABLE, par);
++	return 0;
++}
++
+ static struct fb_ops neofb_ops = {
+ 	.owner		= THIS_MODULE,
++	.fb_open	= neofb_open,
++	.fb_release	= neofb_release,
+ 	.fb_check_var	= neofb_check_var,
+ 	.fb_set_par	= neofb_set_par,
+ 	.fb_setcolreg	= neofb_setcolreg,
+@@ -1507,7 +1610,7 @@ static struct fb_ops neofb_ops = {
+ 	.fb_fillrect	= neofb_fillrect,
+ 	.fb_copyarea	= neofb_copyarea,
+ 	.fb_imageblit	= neofb_imageblit,
+-	.fb_cursor	= soft_cursor,
++	.fb_cursor	= neofb_cursor,
+ };
+ 
+ /* --------------------------------------------------------------------- */
+@@ -1650,6 +1753,7 @@ static int __devinit neo_map_video(struc
+ 				   struct pci_dev *dev, int video_len)
+ {
+ 	struct neofb_par *par = (struct neofb_par *) info->par;
++	unsigned long addr;
+ 
+ 	DBG("neo_map_video");
+ 
+@@ -1681,6 +1785,10 @@ static int __devinit neo_map_video(struc
+ 
+ 	/* Clear framebuffer, it's all white in memory after boot */
+ 	memset(info->screen_base, 0, info->fix.smem_len);
++
++	/* Allocate Cursor drawing pad. */
++	addr = info->fix.smem_start + info->fix.smem_len;
++	par->cursorPad = (u8 *) ioremap(addr, info->sprite.size);
+ 	return 0;
+ }
+ 
+@@ -1725,16 +1833,16 @@ static int __devinit neo_init_hw(struct 
+ 	printk(KERN_DEBUG "--- Neo extended register dump ---\n");
+ 	for (w = 0; w < 0x85; w++)
+ 		printk(KERN_DEBUG "CR %p: %p\n", (void *) w,
+-		       (void *) VGArCR(w));
++		       (void *) vga_rcrt(NULL, w);
+ 	for (w = 0; w < 0xC7; w++)
+ 		printk(KERN_DEBUG "GR %p: %p\n", (void *) w,
+-		       (void *) VGArGR(w));
++		       (void *) vga_rgfx(NULL, w));
+ #endif
+ 
+ 	/* Determine the panel type */
+-	VGAwGR(0x09, 0x26);
+-	type = VGArGR(0x21);
+-	display = VGArGR(0x20);
++	vga_wgfx(NULL, 0x09, 0x26);
++	type = vga_rgfx(NULL, 0x21);
++	display = vga_rgfx(NULL, 0x20);
+ 	if (!par->internal_display && !par->external_display) {
+ 		par->internal_display = display & 2 || !(display & 3) ? 1 : 0;
+ 		par->external_display = display & 1;
+@@ -1744,8 +1852,8 @@ static int __devinit neo_init_hw(struct 
+ 	}
+ 
+ 	/* Determine panel width -- used in NeoValidMode. */
+-	w = VGArGR(0x20);
+-	VGAwGR(0x09, 0x00);
++	w = vga_rgfx(NULL, 0x20);
++	vga_wgfx(NULL, 0x09, 0x00);
+ 	switch ((w & 0x18) >> 3) {
+ 	case 0x00:
+ 		par->NeoPanelWidth = 640;
+@@ -1870,10 +1978,20 @@ static int __devinit neo_init_hw(struct 
+ 		par->neo2200 = (Neo2200 *) par->mmio_vbase;
+ 		break;
+ 	}
+-
++	info->sprite.size = CursorMem;
++	info->sprite.addr = kmalloc(CursorMem, GFP_KERNEL);
++	info->sprite.scan_align = 1;
++	info->sprite.buf_align = 1;
++	info->sprite.flags = FB_PIXMAP_IO;
+ 	par->maxClock = maxClock;
+-
+-	return videoRam * 1024;
++	par->cursorOff = CursorOff;
++	/*
++	 * We decrease the size of the framebuffer by a page
++	 * instead of the size of the cursor pad to avoid
++	 * userland being able to page fault the cursor
++	 * region and start drawing in it.
++	 */
++	return ((videoRam * 1024) - PAGE_SIZE);
+ }
+ 
+ 
+--- linux-2.6.0-test6/drivers/video/platinumfb.c	2003-09-08 13:58:58.000000000 -0700
++++ 25/drivers/video/platinumfb.c	2003-10-05 00:34:22.000000000 -0700
+@@ -104,9 +104,6 @@ static int platinum_var_to_par(const str
+  * Interface used by the world
+  */
+ 
+-int platinum_init(void);
+-int platinum_setup(char*);
+-
+ static struct fb_ops platinumfb_ops = {
+ 	.owner =	THIS_MODULE,
+ 	.fb_check_var	= platinumfb_check_var,
+@@ -492,7 +489,7 @@ static int platinum_par_to_var(struct fb
+ /* 
+  * Parse user speficied options (`video=platinumfb:')
+  */
+-int __init platinum_setup(char *options)
++int __init platinumfb_setup(char *options)
+ {
+ 	char *this_opt;
+ 
+@@ -672,7 +669,7 @@ static struct of_platform_driver platinu
+ 	.remove		= platinumfb_remove,
+ };
+ 
+-int __init platinum_init(void)
++int __init platinumfb_init(void)
+ {
+ 	of_register_driver(&platinum_driver);
+ 
+--- linux-2.6.0-test6/drivers/video/pm3fb.c	2003-06-14 12:18:02.000000000 -0700
++++ 25/drivers/video/pm3fb.c	2003-10-05 00:33:24.000000000 -0700
+@@ -54,7 +54,6 @@
+ 
+ #include <linux/config.h>
+ #include <linux/module.h>
+-#include <linux/version.h>
+ #include <linux/kernel.h>
+ #include <linux/errno.h>
+ #include <linux/string.h>
+--- linux-2.6.0-test6/drivers/video/pvr2fb.c	2003-07-27 12:14:40.000000000 -0700
++++ 25/drivers/video/pvr2fb.c	2003-10-05 00:34:22.000000000 -0700
+@@ -166,6 +166,11 @@ static u_long videomemory = 0xa5000000, 
+ static int cable_type = -1;
+ static int video_output = -1;
+ 
++#ifdef CONFIG_MTRR
++static int enable_mtrr = 1;
++static int mtrr_handle;
++#endif
++
+ static int nopan = 0;
+ static int nowrap = 1;
+ 
+@@ -385,6 +390,7 @@ static int pvr2fb_set_par(struct fb_info
+ 
+ static int pvr2fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
+ {
++	struct pvr2fb_par *par = (struct pvr2fb_par *)info->par;
+ 	u_short vtotal, hsync_total;
+ 	u_long line_length;
+ 
+@@ -413,7 +419,7 @@ static int pvr2fb_check_var(struct fb_va
+ 
+ 	if (var->vmode & FB_VMODE_YWRAP) {
+ 		if (var->xoffset || var->yoffset < 0 || 
+-		    var->yoffset >= var->yres_virtual) {
++		    var->yoffset >= var->yres_virtual)
+ 			var->xoffset = var->yoffset = 0;
+ 		} else {
+ 			if (var->xoffset > var->xres_virtual - var->xres ||
+@@ -421,9 +427,8 @@ static int pvr2fb_check_var(struct fb_va
+ 			    var->xoffset < 0 || var->yoffset < 0)
+ 				var->xoffset = var->yoffset = 0;
+ 		}
+-	} else {
++	} else
+ 		var->xoffset = var->yoffset = 0;
+-	}
+ 
+ 	/* 
+ 	 * XXX: Need to be more creative with this (i.e. allow doublecan for
+@@ -456,7 +461,6 @@ static int pvr2fb_check_var(struct fb_va
+ 				DPRINTK("invalid hsync total for NTSC\n");
+ 				return -EINVAL;
+ 			}
+-		}
+ 	}
+ 	/* Check memory sizes */
+ 	line_length = get_line_length(var->xres_virtual, var->bits_per_pixel);
+@@ -599,10 +603,10 @@ static int pvr2_init_cable(void)
+ 
+ int __init pvr2fb_init(void)
+ {
++	struct fb_var_screeninfo var;
+ 	u_long modememused;
+-	int err = -EINVAL;
+ 
+-	if (!mach_is_dreamcast())
++	if (!MACH_DREAMCAST)
+ 		return -ENXIO;
+ 
+ 	fb_info = kmalloc(sizeof(struct fb_info) + sizeof(struct pvr2fb_par) +
+@@ -650,8 +654,8 @@ int __init pvr2fb_init(void)
+ 	
+ 	if (!fb_info->screen_base) {
+ 		printk("Failed to remap MMIO space\n");
+-		err = -ENXIO;
+-		goto out_err;
++		kfree(fb_info);
++		return -ENXIO;
+ 	}
+ 
+ 	memset_io((unsigned long)fb_info->screen_base, 0, pvr2_fix.smem_len);
+@@ -665,6 +669,8 @@ int __init pvr2fb_init(void)
+ 	fb_info->pseudo_palette	= (void *)(fb_info->par + 1);
+ 	fb_info->flags		= FBINFO_FLAG_DEFAULT;
+ 
++	memset(&var, 0, sizeof(var));
++
+ 	if (video_output == VO_VGA)
+ 		defmode = DEFMODE_VGA;
+ 
+@@ -677,41 +683,46 @@ int __init pvr2fb_init(void)
+ 
+ 	if (request_irq(HW_EVENT_VSYNC, pvr2fb_interrupt, 0,
+ 	                "pvr2 VBL handler", fb_info)) {
+-		err = -EBUSY;
+-		goto out_err;
++		DPRINTK("couldn't register VBL int\n");
++		kfree(fb_info);
++		return 	-EBUSY;
+ 	}
+ 
+-	if (register_framebuffer(fb_info) < 0)
+-		goto reg_failed;
++#ifdef CONFIG_MTRR
++	if (enable_mtrr) {
++		mtrr_handle = mtrr_add(videomemory, videomemorysize, MTRR_TYPE_WRCOMB, 1);
++		printk("pvr2fb: MTRR turned on\n");
++	}
++#endif
+ 
+-	modememused = get_line_length(fb_info->var.xres_virtual,
+-				      fb_info->var.bits_per_pixel);
+-	modememused *= fb_info->var.yres_virtual;
++	if (register_framebuffer(fb_info) < 0) {
++		kfree(fb_info);
++		return -EINVAL;
++	}
+ 
++	modememused = get_line_length(var.xres_virtual, var.bits_per_pixel);
++	modememused *= var.yres_virtual;
+ 	printk("fb%d: %s frame buffer device, using %ldk/%ldk of video memory\n",
+ 	       fb_info->node, fb_info->fix.id, modememused>>10,
+ 	       videomemorysize>>10);
+ 	printk("fb%d: Mode %dx%d-%d pitch = %ld cable: %s video output: %s\n", 
+-	       fb_info->node, fb_info->var.xres, fb_info->var.yres,
+-	       fb_info->var.bits_per_pixel, 
+-	       get_line_length(fb_info->var.xres, fb_info->var.bits_per_pixel),
++	       fb_info->node, var.xres, var.yres, var.bits_per_pixel,
++	       get_line_length(var.xres, var.bits_per_pixel),
+ 	       (char *)pvr2_get_param(cables, NULL, cable_type, 3),
+ 	       (char *)pvr2_get_param(outputs, NULL, video_output, 3));
+ 
+ 	return 0;
+-
+-reg_failed:
+-	free_irq(HW_EVENT_VSYNC, 0);
+-out_err:
+-	kfree(fb_info);
+-
+-	return err;
+ }
+ 
+ static void __exit pvr2fb_exit(void)
+ {
++#ifdef CONFIG_MTRR
++	if (enable_mtrr) {
++		mtrr_del(mtrr_handle, videomemory, videomemorysize);
++		printk("pvr2fb: MTRR turned off\n");
++	}
++#endif
+ 	unregister_framebuffer(fb_info);
+-	free_irq(HW_EVENT_VSYNC, 0);
+ 	kfree(fb_info);
+ }
+ 
+@@ -767,6 +778,10 @@ int __init pvr2fb_setup(char *options)
+ 			nopan = 1;
+ 		} else if (!strncmp(this_opt, "nowrap", 6)) {
+ 			nowrap = 1;
++#ifdef CONFIG_MTRR
++		} else if (!strncmp(this_opt, "nomtrr", 6)) {
++			enable_mtrr = 0;
++#endif
+ 		} else {
+ 			mode_option = this_opt;
+ 		}
+--- linux-2.6.0-test6/drivers/video/radeonfb.c	2003-08-08 22:55:13.000000000 -0700
++++ 25/drivers/video/radeonfb.c	2003-10-05 00:34:47.000000000 -0700
+@@ -1099,7 +1099,7 @@ static int radeon_get_dfpinfo_BIOS(struc
+ 	printk("radeonfb: detected DFP panel size from BIOS: %dx%d\n",
+ 		rinfo->panel_xres, rinfo->panel_yres);
+ 
+-	for(i=0; i<20; i++) {
++	for(i=0; i<21; i++) {
+ 		tmp0 = rinfo->bios_seg + readw(tmp+64+i*2);
+ 		if (tmp0 == 0)
+ 			break;
+@@ -2090,7 +2090,7 @@ static int radeonfb_set_par (struct fb_i
+ 	
+ 	}
+ 	/* Update fix */
+-        info->fix.line_length = rinfo->pitch*64;
++        info->fix.line_length = mode->xres_virtual*(mode->bits_per_pixel/8);
+         info->fix.visual = rinfo->depth == 8 ? FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_DIRECTCOLOR;
+ 
+ #ifdef CONFIG_BOOTX_TEXT
+--- linux-2.6.0-test6/drivers/video/riva/fbdev.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/drivers/video/riva/fbdev.c	2003-10-05 00:34:22.000000000 -0700
+@@ -143,7 +143,17 @@ enum riva_chips {
+ 	CH_GEFORCE4_TI_4200,
+ 	CH_QUADRO4_900XGL,
+ 	CH_QUADRO4_750XGL,
+-	CH_QUADRO4_700XGL
++	CH_QUADRO4_700XGL,
++	CH_GEFORCE4_TI_4800,
++	CH_GEFORCE4_TI_4280,
++	CH_GEFORCE4_TI_4800SE,
++	CH_GEFORCE4_4200_GO,
++	CH_GEFORCE_FX_5800_U,
++	CH_GEFORCE_FX_5800,
++	CH_GEFORCE_FX_5600_U,
++	CH_GEFORCE_FX_5600,
++	CH_GEFORCE_FX_5200_U,
++	CH_GEFORCE_FX_5200
+ };
+ 
+ /* directly indexed by riva_chips enum, above */
+@@ -190,7 +200,17 @@ static struct riva_chip_info {
+ 	{ "GeForce4 Ti 4200", NV_ARCH_20 },
+ 	{ "Quadro4-900-XGL", NV_ARCH_20 },
+ 	{ "Quadro4-750-XGL", NV_ARCH_20 },
+-	{ "Quadro4-700-XGL", NV_ARCH_20 }
++	{ "Quadro4-700-XGL", NV_ARCH_20 },
++	{ "GeForce4 Ti 4800", NV_ARCH_20 },
++	{ "GeForce4 Ti 4280", NV_ARCH_20},
++	{ "GeForce4 Ti 4800 SE", NV_ARCH_20},
++	{ "GeForce4 4200 GO", NV_ARCH_20},
++	{ "GeForce FX 5800 ULTRA", NV_ARCH_20},
++	{ "GeForce FX 5800", NV_ARCH_20},
++	{ "GeForce FX 5600 ULTRA", NV_ARCH_20},
++	{ "GeForce FX 5600", NV_ARCH_20},
++	{ "GeForce FX 5200 ULTRA", NV_ARCH_20},
++	{ "GeForce FX 5200", NV_ARCH_20}
+ };
+ 
+ static struct pci_device_id rivafb_pci_tbl[] = {
+@@ -274,6 +294,26 @@ static struct pci_device_id rivafb_pci_t
+ 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_QUADRO4_750XGL },
+ 	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_QUADRO4_700XGL,
+ 	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_QUADRO4_700XGL },
++	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800,
++	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_GEFORCE4_TI_4800 },
++	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4280,
++	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_GEFORCE4_TI_4280 },
++	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800_SE,
++	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_GEFORCE4_TI_4800SE },
++	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_4200_GO,
++	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_GEFORCE4_4200_GO },
++	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5800_U,
++	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_GEFORCE_FX_5800_U },
++	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5800,
++	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_GEFORCE_FX_5800 },
++	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5600_U,
++	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_GEFORCE_FX_5600_U },
++	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5600,
++	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_GEFORCE_FX_5600 },
++	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200_U,
++	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_GEFORCE_FX_5200_U },
++	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200,
++	  PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_GEFORCE_FX_5200 },
+ 	{ 0, } /* terminate list */
+ };
+ MODULE_DEVICE_TABLE(pci, rivafb_pci_tbl);
+@@ -1469,8 +1509,6 @@ static void rivafb_imageblit(struct fb_i
+ static int rivafb_cursor(struct fb_info *info, struct fb_cursor *cursor)
+ {
+ 	struct riva_par *par = (struct riva_par *) info->par;
+-	u8 data[MAX_CURS * MAX_CURS/8];
+-	u8 mask[MAX_CURS * MAX_CURS/8];
+ 	u16 fg, bg;
+ 	int i;
+ 
+@@ -1492,7 +1530,6 @@ static int rivafb_cursor(struct fb_info 
+ 	if (cursor->set & FB_CUR_SETSIZE) {
+ 		info->cursor.image.height = cursor->image.height;
+ 		info->cursor.image.width = cursor->image.width;
+-		memset_io(par->riva.CURSOR, 0, MAX_CURS * MAX_CURS * 2);
+ 	}
+ 
+ 	if (cursor->set & FB_CUR_SETCMAP) {
+@@ -1503,29 +1540,22 @@ static int rivafb_cursor(struct fb_info 
+ 	if (cursor->set & (FB_CUR_SETSHAPE | FB_CUR_SETCMAP)) {
+ 		u32 bg_idx = info->cursor.image.bg_color;
+ 		u32 fg_idx = info->cursor.image.fg_color;
+-		u32 s_pitch = (info->cursor.image.width+7) >> 3;
+-		u32 d_pitch = MAX_CURS/8;
+-		u8 *dat = (u8 *) cursor->image.data;
++		u8 *dat = (u8 *) info->cursor.image.data;
+ 		u8 *msk = (u8 *) info->cursor.mask;
+ 		u8 src[64];	
+ 		
+ 		switch (info->cursor.rop) {
+ 		case ROP_XOR:
+-			for (i = 0; i < s_pitch * info->cursor.image.height; i++)
++			for (i = 0; i < info->sprite.size; i++)
+ 					src[i] = dat[i] ^ msk[i];
+ 			break;
+ 		case ROP_COPY:
+ 		default:
+-			for (i = 0; i < s_pitch * info->cursor.image.height; i++)
+-				
++			for (i = 0; i < info->sprite.size; i++)
+ 					src[i] = dat[i] & msk[i];
+ 			break;
+ 		}
+ 		
+-		move_buf_aligned(info, data, src, d_pitch, s_pitch, info->cursor.image.height);
+-
+-		move_buf_aligned(info, mask, msk, d_pitch, s_pitch, info->cursor.image.height);
+-
+ 		bg = ((info->cmap.red[bg_idx] & 0xf8) << 7) |
+ 		     ((info->cmap.green[bg_idx] & 0xf8) << 2) |
+ 		     ((info->cmap.blue[bg_idx] & 0xf8) >> 3);
+@@ -1536,7 +1566,7 @@ static int rivafb_cursor(struct fb_info 
+ 
+ 		par->riva.LockUnlock(&par->riva, 0);
+ 
+-		rivafb_load_cursor_image(par, data, mask, bg, fg,
++		rivafb_load_cursor_image(par, dat, msk, bg, fg,
+ 					 info->cursor.image.width, 
+ 					 info->cursor.image.height);
+ 	}
+@@ -1572,7 +1602,7 @@ static struct fb_ops riva_fb_ops = {
+ 	.fb_fillrect 	= rivafb_fillrect,
+ 	.fb_copyarea 	= rivafb_copyarea,
+ 	.fb_imageblit 	= rivafb_imageblit,
+-	.fb_cursor	= rivafb_cursor,	
++	.fb_cursor	= soft_cursor,
+ 	.fb_sync 	= rivafb_sync,
+ };
+ 
+@@ -1603,6 +1633,15 @@ static int __devinit riva_set_fbinfo(str
+ 	info->pixmap.buf_align = 4;
+ 	info->pixmap.scan_align = 4;
+ 	info->pixmap.flags = FB_PIXMAP_SYSTEM;
++/*
++	info->sprite.addr = (char *) par->riva.CURSOR;
++	info->sprite.size = MAX_CURS * MAX_CURS * 2;
++	info->sprite.buf_align = info->sprite.size;
++	info->sprite.scan_align = MAX_CURS >> 3;
++	info->sprite.access_align = 2;
++	info->sprite.flags = FB_PIXMAP_IO;
++	memset_io(par->riva.CURSOR, 0, MAX_CURS * MAX_CURS * 2);
++*/
+ 	return 0;
+ }
+ 
+--- linux-2.6.0-test6/drivers/video/riva/nv_type.h	2003-06-14 12:18:08.000000000 -0700
++++ 25/drivers/video/riva/nv_type.h	2003-10-05 00:34:22.000000000 -0700
+@@ -50,8 +50,16 @@
+ #define NV_CHIP_QUADRO4_900XGL      ((PCI_VENDOR_ID_NVIDIA << 16) | PCI_DEVICE_ID_NVIDIA_QUADRO4_900XGL)
+ #define NV_CHIP_QUADRO4_750XGL      ((PCI_VENDOR_ID_NVIDIA << 16) | PCI_DEVICE_ID_NVIDIA_QUADRO4_750XGL)
+ #define NV_CHIP_QUADRO4_700XGL      ((PCI_VENDOR_ID_NVIDIA << 16) | PCI_DEVICE_ID_NVIDIA_QUADRO4_700XGL)
+-#define NV_CHIP_0x0280              ((PCI_VENDOR_ID_NVIDIA << 16) | 0x0280)
+-#define NV_CHIP_0x0281              ((PCI_VENDOR_ID_NVIDIA << 16) | 0x0281)
++#define NV_CHIP_GEFORCE4_TI_4800    ((PCI_VENDOR_ID_NVIDIA << 16) | PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800)
++#define NV_CHIP_GEFORCE4_TI_4280    ((PCI_VENDOR_ID_NVIDIA << 16) | PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4280)
++#define NV_CHIP_GEFORCE4_TI_4800SE  ((PCI_VENDOR_ID_NVIDIA << 16) | PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800_SE)
++#define NV_CHIP_GEFORCE4_4200_GO    ((PCI_VENDOR_ID_NVIDIA << 16) | PCI_DEVICE_ID_NVIDIA_GEFORCE4_4200_GO)
++#define NV_CHIP_GEFORCE_FX_5800_U   ((PCI_VENDOR_ID_NVIDIA << 16) | PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5800_U)
++#define NV_CHIP_GEFORCE_FX_5800     ((PCI_VENDOR_ID_NVIDIA << 16) | PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5800)
++#define NV_CHIP_GEFORCE_FX_5600_U   ((PCI_VENDOR_ID_NVIDIA << 16) | PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5600_U)
++#define NV_CHIP_GEFORCE_FX_5600     ((PCI_VENDOR_ID_NVIDIA << 16) | PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5600)
++#define NV_CHIP_GEFORCE_FX_5200_U   ((PCI_VENDOR_ID_NVIDIA << 16) | PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200_U)
++#define NV_CHIP_GEFORCE_FX_5200     ((PCI_VENDOR_ID_NVIDIA << 16) | PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200)
+ #define NV_CHIP_0x0288              ((PCI_VENDOR_ID_NVIDIA << 16) | 0x0288)
+ #define NV_CHIP_0x0289              ((PCI_VENDOR_ID_NVIDIA << 16) | 0x0289)
+ 
+--- linux-2.6.0-test6/drivers/video/sis/300vtbl.h	2003-06-14 12:17:59.000000000 -0700
++++ 25/drivers/video/sis/300vtbl.h	2003-10-05 00:34:22.000000000 -0700
+@@ -1,7 +1,37 @@
+-
+-
+-/* Register settings for SiS 300 series */
+-
++/* $XFree86$ */
++/*
++ * Register settings for SiS 300 series
++ *
++ * Copyright 2002, 2003 by Thomas Winischhofer, Vienna, Austria
++ *
++ * If distributed as part of the linux kernel, the contents of this file
++ * is entirely covered by the GPL.
++ *
++ * Otherwise, the following terms apply:
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of the copyright holder not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission.  The copyright holder makes no representations
++ * about the suitability of this software for any purpose.  It is provided
++ * "as is" without express or implied warranty.
++ *
++ * THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++ * EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ *
++ * Author: 	Thomas Winischhofer <thomas@winischhofer.net>
++ *
++ * Based on code by Silicon Intergrated Systems
++ *
++ */
+ 
+ typedef struct _SiS300_StStruct
+ {
+@@ -39,470 +69,109 @@ static const SiS300_StStruct  SiS300_SMo
+ 	{0xff,     0,   0,   0,   0,   0,   0,   0}
+ };
+ 
+-typedef struct _SiS300_StandTableStruct
+-{
+-	UCHAR CRT_COLS;
+-	UCHAR ROWS;
+-	UCHAR CHAR_HEIGHT;
+-	USHORT CRT_LEN;
+-	UCHAR SR[4];
+-	UCHAR MISC;
+-	UCHAR CRTC[0x19];
+-	UCHAR ATTR[0x14];
+-	UCHAR GRC[9];
+-} SiS300_StandTableStruct;
+-
+-static const SiS300_StandTableStruct  SiS300_StandTable[] =
+-{
+- {0x28,0x18,0x08,0x0800,			/* 0x00 */
+-  {0x09,0x03,0x00,0x02},
+-  0x63,
+-  {0x2d,0x27,0x28,0x90,0x2b,0xa0,0xbf,0x1f,
+-   0x00,0xc7,0x06,0x07,0x00,0x00,0x00,0x00,
+-   0x9c,0x8e,0x8f,0x14,0x1f,0x96,0xb9,0xa3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+-   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
+-   0x08,0x00,0x0f,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+-   0xff} },
+- {0x28,0x18,0x08,0x0800,			/* 0x01 */
+-  {0x09,0x03,0x00,0x02},
+-  0x63,
+-  {0x2d,0x27,0x28,0x90,0x2b,0xa0,0xbf,0x1f,
+-   0x00,0xc7,0x06,0x07,0x00,0x00,0x00,0x00,
+-   0x9c,0x8e,0x8f,0x14,0x1f,0x96,0xb9,0xa3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+-   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
+-   0x08,0x00,0x0f,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+-   0xff} },
+- {0x50,0x18,0x08,0x1000,			/* 0x02 */
+-  {0x01,0x03,0x00,0x02},
+-  0x63,
+-  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+-   0x00,0xc7,0x06,0x07,0x00,0x00,0x00,0x00,
+-   0x9c,0x8e,0x8f,0x28,0x1f,0x96,0xb9,0xa3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+-   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
+-   0x08,0x00,0x0f,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+-   0xff} },
+- {0x50,0x18,0x08,0x1000,			/* 0x03 */
+-  {0x01,0x03,0x00,0x02},
+-  0x63,
+-  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+-   0x00,0xc7,0x06,0x07,0x00,0x00,0x00,0x00,
+-   0x9c,0x8e,0x8f,0x28,0x1f,0x96,0xb9,0xa3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+-   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
+-   0x08,0x00,0x0f,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+-   0xff} },
+- {0x28,0x18,0x08,0x4000,			/* 0x04 */
+-  {0x09,0x03,0x00,0x02},
+-  0x63,
+-  {0x2d,0x27,0x28,0x90,0x2b,0x80,0xbf,0x1f,
+-   0x00,0xc1,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0x9c,0x8e,0x8f,0x14,0x00,0x96,0xb9,0xa2,
+-   0xff},
+-  {0x00,0x13,0x15,0x17,0x02,0x04,0x06,0x07,
+-   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
+-   0x01,0x00,0x03,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x30,0x0f,0x00,
+-   0xff} },
+- {0x28,0x18,0x08,0x4000,			/* 0x05 */
+-  {0x09,0x03,0x00,0x02},
+-  0x63,
+-  {0x2d,0x27,0x28,0x90,0x2b,0x80,0xbf,0x1f,
+-   0x00,0xc1,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0x9c,0x8e,0x8f,0x14,0x00,0x96,0xb9,0xa2,
+-   0xff},
+-  {0x00,0x13,0x15,0x17,0x02,0x04,0x06,0x07,
+-   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
+-   0x01,0x00,0x03,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x30,0x0f,0x00,
+-   0xff} },
+- {0x50,0x18,0x08,0x4000,			/* 0x06 */
+-  {0x01,0x01,0x00,0x06},
+-  0x63,
+-  {0x5f,0x4f,0x50,0x82,0x54,0x80,0xbf,0x1f,
+-   0x00,0xc1,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0x9c,0x8e,0x8f,0x28,0x00,0x96,0xb9,0xc2,
+-   0xff},
+-  {0x00,0x17,0x17,0x17,0x17,0x17,0x17,0x17,
+-   0x17,0x17,0x17,0x17,0x17,0x17,0x17,0x17,
+-   0x01,0x00,0x01,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x00,0x0d,0x00,
+-   0xff} },
+- {0x50,0x18,0x0e,0x1000,			/* 0x07 */
+-  {0x00,0x03,0x00,0x03},
+-  0xa6,
+-  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+-   0x00,0x4d,0x0b,0x0c,0x00,0x00,0x00,0x00,
+-   0x83,0x85,0x5d,0x28,0x0d,0x63,0xba,0xa3,
+-   0xff},
+-  {0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x08,
+-   0x10,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
+-   0x0e,0x00,0x0f,0x08},
+-  {0x00,0x00,0x00,0x00,0x00,0x10,0x0a,0x00,
+-   0xff} },
+-/* MDA_DAC*/
+- {0x00,0x00,0x00,0x0000,			/* 0x08 */
+-  {0x00,0x00,0x00,0x15},
+-  0x15,
+-  {0x15,0x15,0x15,0x15,0x15,0x15,0x15,0x15,
+-   0x15,0x15,0x15,0x15,0x15,0x15,0x3f,0x3f,
+-   0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x00,0x00,
+-   0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x15,0x15,0x15,
+-   0x15,0x15,0x15,0x15,0x15,0x15,0x15,0x15,
+-   0x15,0x15,0x15,0x15},
+-  {0x15,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,
+-   0x3f} },
+-/* CGA_DAC*/
+- {0x00,0x10,0x04,0x0114,			/* 0x09 */
+-  {0x11,0x09,0x15,0x00},
+-  0x10,
+-  {0x04,0x14,0x01,0x11,0x09,0x15,0x2a,0x3a,
+-   0x2e,0x3e,0x2b,0x3b,0x2f,0x3f,0x2a,0x3a,
+-   0x2e,0x3e,0x2b,0x3b,0x2f,0x3f,0x00,0x10,
+-   0x04},
+-  {0x14,0x01,0x11,0x09,0x15,0x00,0x10,0x04,
+-   0x14,0x01,0x11,0x09,0x15,0x2a,0x3a,0x2e,
+-   0x3e,0x2b,0x3b,0x2f},
+-  {0x3f,0x2a,0x3a,0x2e,0x3e,0x2b,0x3b,0x2f,
+-   0x3f} },
+-/* EGA_DAC*/
+- {0x00,0x10,0x04,0x0114,			/* 0x0a */
+-  {0x11,0x05,0x15,0x20},
+-  0x30,
+-  {0x24,0x34,0x21,0x31,0x25,0x35,0x08,0x18,
+-   0x0c,0x1c,0x09,0x19,0x0d,0x1d,0x28,0x38,
+-   0x2c,0x3c,0x29,0x39,0x2d,0x3d,0x02,0x12,
+-   0x06},
+-  {0x16,0x03,0x13,0x07,0x17,0x22,0x32,0x26,
+-   0x36,0x23,0x33,0x27,0x37,0x0a,0x1a,0x0e,
+-   0x1e,0x0b,0x1b,0x0f},
+-  {0x1f,0x2a,0x3a,0x2e,0x3e,0x2b,0x3b,0x2f,
+-   0x3f} },
+-/* VGA_DAC*/
+- {0x00,0x10,0x04,0x0114,			/* 0x0b */
+-  {0x11,0x09,0x15,0x2a},
+-  0x3a,
+-  {0x2e,0x3e,0x2b,0x3b,0x2f,0x3f,0x00,0x05,
+-   0x08,0x0b,0x0e,0x11,0x14,0x18,0x1c,0x20,
+-   0x24,0x28,0x2d,0x32,0x38,0x3f,0x00,0x10,
+-   0x1f},
+-  {0x2f,0x3f,0x1f,0x27,0x2f,0x37,0x3f,0x2d,
+-   0x31,0x36,0x3a,0x3f,0x00,0x07,0x0e,0x15,
+-   0x1c,0x0e,0x11,0x15},
+-  {0x18,0x1c,0x14,0x16,0x18,0x1a,0x1c,0x00,
+-   0x04} },
+- {0x08,0x0c,0x10,0x0a08,			/* 0x0c */
+-  {0x0c,0x0e,0x10,0x0b},
+-  0x0c,
+-  {0x0d,0x0f,0x10,0x10,0x01,0x08,0x00,0x00,
+-   0x00,0x00,0x01,0x00,0x02,0x02,0x01,0x00,
+-   0x04,0x04,0x01,0x00,0x05,0x02,0x05,0x00,
+-   0x06},
+-  {0x01,0x06,0x05,0x06,0x00,0x08,0x01,0x08,
+-   0x00,0x07,0x02,0x07,0x06,0x07,0x00,0x00,
+-   0x00,0x00,0x00,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0x00} },
+- {0x28,0x18,0x08,0x2000,			/* 0x0d */
+-  {0x09,0x0f,0x00,0x06},
+-  0x63,
+-  {0x2d,0x27,0x28,0x90,0x2b,0x80,0xbf,0x1f,
+-   0x00,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0x9c,0x8e,0x8f,0x14,0x00,0x96,0xb9,0xe3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+-   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
+-   0x01,0x00,0x0f,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x0f,
+-   0xff} },
+- {0x50,0x18,0x08,0x4000,			/* 0x0e */
+-  {0x01,0x0f,0x00,0x06},
+-  0x63,
+-  {0x5f,0x4f,0x50,0x82,0x54,0x80,0xbf,0x1f,
+-   0x00,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0x9c,0x8e,0x8f,0x28,0x00,0x96,0xb9,0xe3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+-   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
+-   0x01,0x00,0x0f,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x0f,
+-   0xff} },
+- {0x00,0x00,0x00,0x0000,			/* 0x0f */	/* TW: Standtable for VGA modes */
+-  {0x01,0x0f,0x00,0x0e},
+-  0x23,
+-  {0x5f,0x4f,0x50,0x82,0x54,0x80,0x0b,0x3e,
+-   0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0xea,0x8c,0xdf,0x28,0x40,0xe7,0x04,0xa3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+-   0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,
+-   0x01,0x00,0x00,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x40,0x05,0x0f,
+-   0xff} },
+- {0x4a,0x36,0x00,0x00c0,			/* 0x10 */
+-  {0x00,0x00,0x00,0x00},
+-  0x00,
+-  {0x00,0x00,0x00,0x00,0x00,0x00,0x66,0x3a,
+-   0x00,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0x00,0x00,0x1a,0x00,0x57,0x39,0x00,0xc0,
+-   0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0x00,0x00,0x00,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0x00} },
+- {0x50,0x18,0x0e,0x8000,			/* 0x11 */
+-  {0x01,0x0f,0x00,0x06},
+-  0xa2,
+-  {0x5f,0x4f,0x50,0x82,0x54,0x80,0xbf,0x1f,
+-   0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0x83,0x85,0x5d,0x28,0x0f,0x63,0xba,0xe3,
+-   0xff},
+-  {0x00,0x08,0x00,0x00,0x18,0x18,0x00,0x00,
+-   0x00,0x08,0x00,0x00,0x00,0x18,0x00,0x00,
+-   0x0b,0x00,0x05,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x05,
+-   0xff} },
+- {0x50,0x18,0x0e,0x8000,			/* 0x12 */
+-  {0x01,0x0f,0x00,0x06},
+-  0xa3,
+-  {0x5f,0x4f,0x50,0x82,0x54,0x80,0xbf,0x1f,
+-   0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0x83,0x85,0x5d,0x28,0x0f,0x63,0xba,0xe3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
+-   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+-   0x01,0x00,0x0f,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x0f,
+-   0xff} },
+- {0x28,0x18,0x0e,0x0800,			/* 0x13 */
+-  {0x09,0x03,0x00,0x02},
+-  0xa3,
+-  {0x2d,0x27,0x28,0x90,0x2b,0xa0,0xbf,0x1f,
+-   0x00,0x4d,0x0b,0x0c,0x00,0x00,0x00,0x00,
+-   0x83,0x85,0x5d,0x14,0x1f,0x63,0xba,0xa3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
+-   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+-   0x08,0x00,0x0f,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+-   0xff} },
+- {0x28,0x18,0x0e,0x0800,			/* 0x14 */
+-  {0x09,0x03,0x00,0x02},
+-  0xa3,
+-  {0x2d,0x27,0x28,0x90,0x2b,0xa0,0xbf,0x1f,
+-   0x00,0x4d,0x0b,0x0c,0x00,0x00,0x00,0x00,
+-   0x83,0x85,0x5d,0x14,0x1f,0x63,0xba,0xa3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
+-   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+-   0x08,0x00,0x0f,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+-   0xff} },
+- {0x50,0x18,0x0e,0x1000,			/* 0x15 */
+-  {0x01,0x03,0x00,0x02},
+-  0xa3,
+-  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+-   0x00,0x4d,0x0b,0x0c,0x00,0x00,0x00,0x00,
+-   0x83,0x85,0x5d,0x28,0x1f,0x63,0xba,0xa3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
+-   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+-   0x08,0x00,0x0f,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+-   0xff} },
+- {0x50,0x18,0x0e,0x1000,			/* 0x16 */
+-  {0x01,0x03,0x00,0x02},
+-  0xa3,
+-  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+-   0x00,0x4d,0x0b,0x0c,0x00,0x00,0x00,0x00,
+-   0x83,0x85,0x5d,0x28,0x1f,0x63,0xba,0xa3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
+-   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+-   0x08,0x00,0x0f,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+-   0xff} },
+- {0x28,0x18,0x10,0x0800,			/* 0x17 */
+-  {0x08,0x03,0x00,0x02},
+-  0x67,
+-  {0x2d,0x27,0x28,0x90,0x2b,0xa0,0xbf,0x1f,
+-   0x00,0x4f,0x0d,0x0e,0x00,0x00,0x00,0x00,
+-   0x9c,0x8e,0x8f,0x14,0x1f,0x96,0xb9,0xa3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
+-   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+-   0x0c,0x00,0x0f,0x08},
+-  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+-   0xff} },
+- {0x50,0x18,0x10,0x1000,			/* 0x18 */
+-  {0x00,0x03,0x00,0x02},
+-  0x67,
+-  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+-   0x00,0x4f,0x0d,0x0e,0x00,0x00,0x00,0x00,
+-   0x9c,0x8e,0x8f,0x28,0x1f,0x96,0xb9,0xa3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
+-   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+-   0x0c,0x00,0x0f,0x08},
+-  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+-   0xff} },
+- {0x50,0x18,0x10,0x1000,			/* 0x19 */
+-  {0x00,0x03,0x00,0x02},
+-  0x66,
+-  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+-   0x00,0x4f,0x0d,0x0e,0x00,0x00,0x00,0x00,
+-   0x9c,0x8e,0x8f,0x28,0x0f,0x96,0xb9,0xa3,
+-   0xff},
+-  {0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x08,
+-   0x10,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
+-   0x0e,0x00,0x0f,0x08},
+-  {0x00,0x00,0x00,0x00,0x00,0x10,0x0a,0x00,
+-   0xff} },
+- {0x50,0x1d,0x10,0xa000,			/* 0x1a */
+-  {0x01,0x0f,0x00,0x06},
+-  0xe3,
+-  {0x5f,0x4f,0x50,0x82,0x54,0x80,0x0b,0x3e,
+-   0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0xea,0x8c,0xdf,0x28,0x00,0xe7,0x04,0xc3,
+-   0xff},
+-  {0x00,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,
+-   0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,
+-   0x01,0x00,0x0f,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x01,
+-   0xff} },
+- {0x50,0x1d,0x10,0xa000,			/* 0x1b */
+-  {0x01,0x0f,0x00,0x06},
+-  0xe3,
+-  {0x5f,0x4f,0x50,0x82,0x54,0x80,0x0b,0x3e,
+-   0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0xea,0x8c,0xdf,0x28,0x00,0xe7,0x04,0xe3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
+-   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+-   0x01,0x00,0x0f,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x0f,
+-   0xff} },
+- {0x28,0x18,0x08,0x2000,			/* 0x1c */
+-  {0x01,0x0f,0x00,0x0e},
+-  0x63,
+-  {0x5f,0x4f,0x50,0x82,0x54,0x80,0xbf,0x1f,
+-   0x00,0x41,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0x9c,0x8e,0x8f,0x28,0x40,0x96,0xb9,0xa3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+-   0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,
+-   0x41,0x00,0x0f,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x40,0x05,0x0f,
+-   0xff} }
+-};
+-
+ typedef struct _SiS300_ExtStruct
+ {
+-	UCHAR Ext_ModeID;
++	UCHAR  Ext_ModeID;
+ 	USHORT Ext_ModeFlag;
+ 	USHORT Ext_ModeInfo;
+-	USHORT Ext_Point;
+ 	USHORT Ext_VESAID;
+-	UCHAR Ext_VESAMEMSize;
+-	UCHAR Ext_RESINFO;
+-	UCHAR VB_ExtTVFlickerIndex;
+-	UCHAR VB_ExtTVEdgeIndex;
+-	UCHAR VB_ExtTVYFilterIndex;
+-	UCHAR REFindex;
++	UCHAR  Ext_RESINFO;
++	UCHAR  VB_ExtTVFlickerIndex;
++	UCHAR  VB_ExtTVEdgeIndex;
++	UCHAR  VB_ExtTVYFilterIndex;
++	UCHAR  REFindex;
+ } SiS300_ExtStruct;
+ 
+ static const SiS300_ExtStruct  SiS300_EModeIDTable[] =
+ {
+-	{0x6a,0x2212,0x47,0x3563,0x0102,0x08,0x07,0x00,0x00,0x00,0x00},  /* 800x600x? */
+-	{0x2e,0x0a1b,0x36,0x3539,0x0101,0x08,0x06,0x00,0x00,0x00,0x08},
+-	{0x2f,0x021b,0x35,0x3532,0x0100,0x08,0x05,0x00,0x00,0x00,0x10},  /* 640x400x8 */
+-	{0x30,0x2a1b,0x47,0x3563,0x0103,0x08,0x07,0x00,0x00,0x00,0x00},
+-	{0x31,0x0a1b,0xad,0x3630,0x0000,0x08,0x0c,0x00,0x00,0x00,0x11},  /* 720x480x8 */
+-	{0x32,0x2a1b,0xae,0x3637,0x0000,0x08,0x0d,0x00,0x00,0x00,0x12},  /* 720x576x8 */
+-	{0x33,0x0a1d,0xad,0x3630,0x0000,0x08,0x0c,0x00,0x00,0x00,0x11},  /* 720x480x16 */
+-	{0x34,0x2a1d,0xae,0x3637,0x0000,0x08,0x0d,0x00,0x00,0x00,0x12},  /* 720x576x16 */
+-	{0x35,0x0a1f,0xad,0x3630,0x0000,0x08,0x0c,0x00,0x00,0x00,0x11},  /* 720x480x32 */
+-	{0x36,0x2a1f,0xae,0x3637,0x0000,0x08,0x0d,0x00,0x00,0x00,0x12},  /* 720x576x32 */
+-	{0x37,0x0212,0x58,0x358d,0x0104,0x08,0x08,0x00,0x00,0x00,0x13},  /* 1024x768x? */
+-	{0x38,0x0a1b,0x58,0x358d,0x0105,0x08,0x08,0x00,0x00,0x00,0x13},  /* 1024x768x8 */
+-	{0x3a,0x0e3b,0x69,0x35be,0x0107,0x08,0x09,0x00,0x00,0x00,0x1a},  /* 1280x1024x8 */
+-	{0x3c,0x063b,0x7a,0x35d4,0x0130,0x08,0x0a,0x00,0x00,0x00,0x1e},
+-	{0x3d,0x067d,0x7a,0x35d4,0x0131,0x08,0x0a,0x00,0x00,0x00,0x1e},
+-	{0x40,0x921c,0x00,0x3516,0x010d,0x08,0x00,0x00,0x00,0x00,0x23},
+-	{0x41,0x921d,0x00,0x3516,0x010e,0x08,0x00,0x00,0x00,0x00,0x23},
+-	{0x43,0x0a1c,0x36,0x3539,0x0110,0x08,0x06,0x00,0x00,0x00,0x08},
+-	{0x44,0x0a1d,0x36,0x3539,0x0111,0x08,0x06,0x00,0x00,0x00,0x08},
+-	{0x46,0x2a1c,0x47,0x3563,0x0113,0x08,0x07,0x00,0x00,0x00,0x00},  /* 800x600 */
+-	{0x47,0x2a1d,0x47,0x3563,0x0114,0x08,0x07,0x00,0x00,0x00,0x00},  /* 800x600 */
+-	{0x49,0x0a3c,0x58,0x358d,0x0116,0x08,0x08,0x00,0x00,0x00,0x13},
+-	{0x4a,0x0a3d,0x58,0x358d,0x0117,0x08,0x08,0x00,0x00,0x00,0x13},
+-	{0x4c,0x0e7c,0x69,0x35be,0x0119,0x08,0x09,0x00,0x00,0x00,0x1a},
+-	{0x4d,0x0e7d,0x69,0x35be,0x011a,0x08,0x09,0x00,0x00,0x00,0x1a},
+-	{0x50,0x921b,0x01,0x351d,0x0132,0x08,0x01,0x00,0x00,0x00,0x24},
+-	{0x51,0xb21b,0x13,0x3524,0x0133,0x08,0x03,0x00,0x00,0x00,0x25},  /* 400x300 */
+-	{0x52,0x921b,0x24,0x352b,0x0134,0x08,0x04,0x00,0x00,0x00,0x26},
+-	{0x56,0x921d,0x01,0x351d,0x0135,0x08,0x01,0x00,0x00,0x00,0x24},
+-	{0x57,0xb21d,0x13,0x3524,0x0136,0x08,0x03,0x00,0x00,0x00,0x25},  /* 400x300 */
+-	{0x58,0x921d,0x24,0x352b,0x0137,0x08,0x04,0x00,0x00,0x00,0x26},  
+-	{0x59,0x921b,0x00,0x3516,0x0138,0x08,0x00,0x00,0x00,0x00,0x23}, 
+-	{0x5c,0x921f,0x24,0x352b,0x0000,0x08,0x04,0x00,0x00,0x00,0x26},  /* TW: inserted 512x384x32 */
+-	{0x5d,0x021d,0x35,0x3532,0x0139,0x08,0x05,0x00,0x00,0x00,0x10},  /* 640x400x16 */
+- 	{0x5e,0x021f,0x35,0x3532,0x0000,0x08,0x05,0x00,0x00,0x00,0x10},  /* TW: inserted 640x400x32 */
+-	{0x62,0x0a3f,0x36,0x3539,0x013a,0x08,0x06,0x00,0x00,0x00,0x08},
+-	{0x63,0x2a3f,0x47,0x3563,0x013b,0x08,0x07,0x00,0x00,0x00,0x00},  /* 800x600 */
+-	{0x64,0x0a7f,0x58,0x358d,0x013c,0x08,0x08,0x00,0x00,0x00,0x13},
+-	{0x65,0x0eff,0x69,0x35be,0x013d,0x08,0x09,0x00,0x00,0x00,0x1a},
+-	{0x66,0x06ff,0x7a,0x35d4,0x013e,0x08,0x0a,0x00,0x00,0x00,0x1e},
+-	{0x68,0x067b,0x8b,0x35ef,0x013f,0x08,0x0b,0x00,0x00,0x00,0x27},
+-	{0x69,0x06fd,0x8b,0x35ef,0x0140,0x08,0x0b,0x00,0x00,0x00,0x27},
+-	{0x6b,0x07ff,0x8b,0x35ef,0x0000,0x10,0x0b,0x00,0x00,0x00,0x27},
+-	{0x6c,0x067b,0x9c,0x35f6,0x0000,0x08,0x11,0x00,0x00,0x00,0x28},  /* TW: 2048x1536x8 - not in BIOS! */
+-	{0x6d,0x06fd,0x9c,0x35f6,0x0000,0x10,0x11,0x00,0x00,0x00,0x28},  /* TW: 2048x1536x16 - not in BIOS! */
+-	{0x6e,0x0a3b,0x6f,0x35b2,0x0000,0x08,0x0e,0x00,0x00,0x00,0x29},  /* 1280x960x8 */
+-	{0x6f,0x0a7d,0x6f,0x35b2,0x0000,0x08,0x0e,0x00,0x00,0x00,0x29},  /* 1280x960x16 */
+-	/* TW: 16:9 modes copied from 310/325 series - not in ANY BIOS */
+-	{0x70,0x2a1b,0x40,0x3b52,0x0000,0x08,0x12,0x00,0x00,0x07,0x2d},    /* 800x480x8 */
+-	{0x71,0x0a1b,0x51,0x3b63,0x0000,0x08,0x13,0x00,0x00,0x00,0x30},    /* 1024x576x8 */
+-	{0x74,0x0a1d,0x51,0x3b63,0x0000,0x08,0x13,0x00,0x00,0x00,0x30},    /* 1024x576x16 */
+-	{0x75,0x0e3d,0x62,0x3b74,0x0000,0x08,0x14,0x00,0x00,0x00,0x33},	   /* 1280x720x16 */
+-	{0x76,0x2a1f,0x40,0x3b52,0x0000,0x08,0x12,0x00,0x00,0x07,0x2d},    /* 800x480x32 */
+-	{0x77,0x0a3f,0x51,0x3b63,0x0000,0x08,0x13,0x00,0x00,0x00,0x30},	   /* 1024x576x32 */
+-	{0x78,0x0eff,0x62,0x3b74,0x0000,0x08,0x14,0x00,0x00,0x00,0x33},	   /* 1280x720x32 */
+-	{0x79,0x0e3b,0x62,0x3b74,0x0000,0x08,0x14,0x00,0x00,0x00,0x33},	   /* 1280x720x8 */
+-	{0x7a,0x2a1d,0x40,0x3b52,0x0000,0x08,0x12,0x00,0x00,0x07,0x2d},    /* 800x480x16 */
+-	/* TW: End of new 16:9 modes */
+-	{0x7b,0x0aff,0x6f,0x35b2,0x0000,0x08,0x0e,0x00,0x00,0x00,0x29},    /* 1280x960x32 */
+-	{0x20,0x0a1b,0x54,0x0000,0x0000,0x08,0x0f,0x00,0x00,0x00,0x2b},    /* 1024x600 */
+-	{0x21,0x0a3d,0x54,0x0000,0x0000,0x08,0x0f,0x00,0x00,0x00,0x2b},
+-	{0x22,0x0a7f,0x54,0x0000,0x0000,0x08,0x0f,0x00,0x00,0x00,0x2b},
+-	{0x23,0x0a1b,0xc5,0x0000,0x0000,0x08,0x10,0x00,0x00,0x00,0x2c},    /* 1152x768 */
+-	{0x24,0x0a3d,0xc5,0x431d,0x0000,0x08,0x10,0x00,0x00,0x00,0x2c},
+-	{0x25,0x0a7f,0xc5,0x431d,0x0000,0x08,0x10,0x00,0x00,0x00,0x2c},
+-	{0x29,0x0e1b,0xc5,0x0000,0x0000,0x08,0x15,0x00,0x00,0x00,0x36},    /* TW: NEW 1152x864 - not in BIOS */
+-	{0x2a,0x0e3d,0xc5,0x0000,0x0000,0x08,0x15,0x00,0x00,0x00,0x36},
+-	{0x2b,0x0e7f,0xc5,0x0000,0x0000,0x08,0x15,0x00,0x00,0x00,0x36},
+-	{0x39,0x2a1b,0xd6,0x0000,0x0000,0x08,0x16,0x00,0x00,0x00,0x38},    /* TW: NEW 848x480 - not in BIOS */
+-	{0x3b,0x2a3d,0xd6,0x0000,0x0000,0x08,0x16,0x00,0x00,0x00,0x38},
+-	{0x3e,0x2a7f,0xd6,0x0000,0x0000,0x08,0x16,0x00,0x00,0x00,0x38},
+-	{0x3f,0x2a1b,0xd7,0x0000,0x0000,0x08,0x17,0x00,0x00,0x00,0x3a},    /* TW: NEW 856x480 - not in BIOS */
+-	{0x42,0x2a3d,0xd7,0x0000,0x0000,0x08,0x17,0x00,0x00,0x00,0x3a},
+-	{0x45,0x2a7f,0xd7,0x0000,0x0000,0x08,0x17,0x00,0x00,0x00,0x3a},
+-	{0x48,0x223b,0xe8,0x0000,0x0000,0x08,0x18,0x00,0x00,0x00,0x3c},    /* TW: NEW 1360x768 - not in BIOS */
+-	{0x4b,0x227d,0xe8,0x0000,0x0000,0x08,0x18,0x00,0x00,0x00,0x3c},
+-	{0x4e,0x22ff,0xe8,0x0000,0x0000,0x08,0x18,0x00,0x00,0x00,0x3c},
+-	{0xff,0x0000,0x00,0x0000,0xffff,0x00,0x00,0x00,0x00,0x00,0x00}
++	{0x6a,0x2212,0x0407,0x0102,SIS_RI_800x600,  0x00,0x00,0x00,0x00},  /* 800x600x? */
++	{0x2e,0x0a1b,0x0306,0x0101,SIS_RI_640x480,  0x00,0x00,0x00,0x08},
++	{0x2f,0x021b,0x0305,0x0100,SIS_RI_640x400,  0x00,0x00,0x00,0x10},  /* 640x400x8 */
++	{0x30,0x2a1b,0x0407,0x0103,SIS_RI_800x600,  0x00,0x00,0x00,0x00},
++	{0x31,0x0a1b,0x0a0d,0x0000,SIS_RI_720x480,  0x00,0x00,0x00,0x11},  /* 720x480x8 */
++	{0x32,0x2a1b,0x0a0e,0x0000,SIS_RI_720x576,  0x00,0x00,0x00,0x12},  /* 720x576x8 */
++	{0x33,0x0a1d,0x0a0d,0x0000,SIS_RI_720x480,  0x00,0x00,0x00,0x11},  /* 720x480x16 */
++	{0x34,0x2a1d,0x0a0e,0x0000,SIS_RI_720x576,  0x00,0x00,0x00,0x12},  /* 720x576x16 */
++	{0x35,0x0a1f,0x0a0d,0x0000,SIS_RI_720x480,  0x00,0x00,0x00,0x11},  /* 720x480x32 */
++	{0x36,0x2a1f,0x0a0e,0x0000,SIS_RI_720x576,  0x00,0x00,0x00,0x12},  /* 720x576x32 */
++	{0x37,0x0212,0x0508,0x0104,SIS_RI_1024x768, 0x00,0x00,0x00,0x13},  /* 1024x768x? */
++	{0x38,0x0a1b,0x0508,0x0105,SIS_RI_1024x768, 0x00,0x00,0x00,0x13},  /* 1024x768x8 */
++	{0x3a,0x0e3b,0x0609,0x0107,SIS_RI_1280x1024,0x00,0x00,0x00,0x1a},  /* 1280x1024x8 */
++	{0x3c,0x063b,0x070a,0x0130,SIS_RI_1600x1200,0x00,0x00,0x00,0x1e},
++	{0x3d,0x067d,0x070a,0x0131,SIS_RI_1600x1200,0x00,0x00,0x00,0x1e},
++	{0x40,0x921c,0x0000,0x010d,SIS_RI_320x200,  0x00,0x00,0x00,0x23},  /* 320x200x15 */
++	{0x41,0x921d,0x0000,0x010e,SIS_RI_320x200,  0x00,0x00,0x00,0x23},  /* 320x200x16 */
++	{0x43,0x0a1c,0x0306,0x0110,SIS_RI_640x480,  0x00,0x00,0x00,0x08},
++	{0x44,0x0a1d,0x0306,0x0111,SIS_RI_640x480,  0x00,0x00,0x00,0x08},
++	{0x46,0x2a1c,0x0407,0x0113,SIS_RI_800x600,  0x00,0x00,0x00,0x00},  /* 800x600x15 */
++	{0x47,0x2a1d,0x0407,0x0114,SIS_RI_800x600,  0x00,0x00,0x00,0x00},  /* 800x600x16 */
++	{0x49,0x0a3c,0x0508,0x0116,SIS_RI_1024x768, 0x00,0x00,0x00,0x13},
++	{0x4a,0x0a3d,0x0508,0x0117,SIS_RI_1024x768, 0x00,0x00,0x00,0x13},
++	{0x4c,0x0e7c,0x0609,0x0119,SIS_RI_1280x1024,0x00,0x00,0x00,0x1a},
++	{0x4d,0x0e7d,0x0609,0x011a,SIS_RI_1280x1024,0x00,0x00,0x00,0x1a},
++	{0x50,0x921b,0x0001,0x0132,SIS_RI_320x240,  0x00,0x00,0x00,0x24},  /* 320x240x8  */
++	{0x51,0xb21b,0x0103,0x0133,SIS_RI_400x300,  0x00,0x00,0x00,0x25},  /* 400x300x8  */
++	{0x52,0x921b,0x0204,0x0134,SIS_RI_512x384,  0x00,0x00,0x00,0x26},  /* 512x384x8  */
++	{0x56,0x921d,0x0001,0x0135,SIS_RI_320x240,  0x00,0x00,0x00,0x24},  /* 320x240x16 */
++	{0x57,0xb21d,0x0103,0x0136,SIS_RI_400x300,  0x00,0x00,0x00,0x25},  /* 400x300x16 */
++	{0x58,0x921d,0x0204,0x0137,SIS_RI_512x384,  0x00,0x00,0x00,0x26},  /* 512x384x16 */
++	{0x59,0x921b,0x0000,0x0138,SIS_RI_320x200,  0x00,0x00,0x00,0x23},  /* 320x200x8  */
++	{0x5c,0x921f,0x0204,0x0000,SIS_RI_512x384,  0x00,0x00,0x00,0x26},  /* 512x384x32 */
++	{0x5d,0x021d,0x0305,0x0139,SIS_RI_640x400,  0x00,0x00,0x00,0x10},  /* 640x400x16 */
++ 	{0x5e,0x021f,0x0305,0x0000,SIS_RI_640x400,  0x00,0x00,0x00,0x10},  /* 640x400x32 */
++	{0x62,0x0a3f,0x0306,0x013a,SIS_RI_640x480,  0x00,0x00,0x00,0x08},
++	{0x63,0x2a3f,0x0407,0x013b,SIS_RI_800x600,  0x00,0x00,0x00,0x00},  /* 800x600x32 */
++	{0x64,0x0a7f,0x0508,0x013c,SIS_RI_1024x768, 0x00,0x00,0x00,0x13},
++	{0x65,0x0eff,0x0609,0x013d,SIS_RI_1280x1024,0x00,0x00,0x00,0x1a},
++	{0x66,0x06ff,0x070a,0x013e,SIS_RI_1600x1200,0x00,0x00,0x00,0x1e},
++	{0x68,0x067b,0x080b,0x013f,SIS_RI_1920x1440,0x00,0x00,0x00,0x27},
++	{0x69,0x06fd,0x080b,0x0140,SIS_RI_1920x1440,0x00,0x00,0x00,0x27},
++	{0x6b,0x07ff,0x080b,0x0000,SIS_RI_1920x1440,0x00,0x00,0x00,0x27},
++	{0x6c,0x067b,0x090c,0x0000,SIS_RI_2048x1536,0x00,0x00,0x00,0x28},  /* 2048x1536x8 - not in BIOS! */
++	{0x6d,0x06fd,0x090c,0x0000,SIS_RI_2048x1536,0x00,0x00,0x00,0x28},  /* 2048x1536x16 - not in BIOS! */
++	{0x70,0x2a1b,0x0400,0x0000,SIS_RI_800x480,  0x00,0x00,0x07,0x2d},  /* 800x480x8 */
++	{0x71,0x0a1b,0x0501,0x0000,SIS_RI_1024x576, 0x00,0x00,0x00,0x30},  /* 1024x576x8 */
++	{0x74,0x0a1d,0x0501,0x0000,SIS_RI_1024x576, 0x00,0x00,0x00,0x30},  /* 1024x576x16 */
++	{0x75,0x0e3d,0x0602,0x0000,SIS_RI_1280x720, 0x00,0x00,0x00,0x33},  /* 1280x720x16 */
++	{0x76,0x2a1f,0x0400,0x0000,SIS_RI_800x480,  0x00,0x00,0x07,0x2d},  /* 800x480x32 */
++	{0x77,0x0a3f,0x0501,0x0000,SIS_RI_1024x576, 0x00,0x00,0x00,0x30},  /* 1024x576x32 */
++	{0x78,0x0eff,0x0602,0x0000,SIS_RI_1280x720, 0x00,0x00,0x00,0x33},  /* 1280x720x32 */
++	{0x79,0x0e3b,0x0602,0x0000,SIS_RI_1280x720, 0x00,0x00,0x00,0x33},  /* 1280x720x8 */
++	{0x7a,0x2a1d,0x0400,0x0000,SIS_RI_800x480,  0x00,0x00,0x07,0x2d},  /* 800x480x16 */
++	{0x7c,0x0a3b,0x060f,0x0000,SIS_RI_1280x960, 0x00,0x00,0x00,0x29},  /* 1280x960x8 */
++	{0x7d,0x0a7d,0x060f,0x0000,SIS_RI_1280x960, 0x00,0x00,0x00,0x29},  /* 1280x960x16 */
++	{0x7e,0x0aff,0x060f,0x0000,SIS_RI_1280x960, 0x00,0x00,0x00,0x29},  /* 1280x960x32 */
++	{0x20,0x0a1b,0x0504,0x0000,SIS_RI_1024x600, 0x00,0x00,0x00,0x2b},  /* 1024x600 */
++	{0x21,0x0a3d,0x0504,0x0000,SIS_RI_1024x600, 0x00,0x00,0x00,0x2b},
++	{0x22,0x0a7f,0x0504,0x0000,SIS_RI_1024x600, 0x00,0x00,0x00,0x2b},
++	{0x23,0x0a1b,0x0c05,0x0000,SIS_RI_1152x768, 0x00,0x00,0x00,0x2c},  /* 1152x768 */
++	{0x24,0x0a3d,0x0c05,0x0000,SIS_RI_1152x768, 0x00,0x00,0x00,0x2c},
++	{0x25,0x0a7f,0x0c05,0x0000,SIS_RI_1152x768, 0x00,0x00,0x00,0x2c},
++	{0x29,0x0e1b,0x0c05,0x0000,SIS_RI_1152x864, 0x00,0x00,0x00,0x36},  /* 1152x864 */
++	{0x2a,0x0e3d,0x0c05,0x0000,SIS_RI_1152x864, 0x00,0x00,0x00,0x36},
++	{0x2b,0x0e7f,0x0c05,0x0000,SIS_RI_1152x864, 0x00,0x00,0x00,0x36},
++	{0x39,0x2a1b,0x0d06,0x0000,SIS_RI_848x480,  0x00,0x00,0x00,0x38},  /* 848x480 */
++	{0x3b,0x2a3d,0x0d06,0x0000,SIS_RI_848x480,  0x00,0x00,0x00,0x38},
++	{0x3e,0x2a7f,0x0d06,0x0000,SIS_RI_848x480,  0x00,0x00,0x00,0x38},
++	{0x3f,0x2a1b,0x0d07,0x0000,SIS_RI_856x480,  0x00,0x00,0x00,0x3a},  /* 856x480 */
++	{0x42,0x2a3d,0x0d07,0x0000,SIS_RI_856x480,  0x00,0x00,0x00,0x3a},
++	{0x45,0x2a7f,0x0d07,0x0000,SIS_RI_856x480,  0x00,0x00,0x00,0x3a},
++	{0x48,0x223b,0x0e08,0x0000,SIS_RI_1360x768, 0x00,0x00,0x00,0x3c},  /* 1360x768 */
++	{0x4b,0x227d,0x0e08,0x0000,SIS_RI_1360x768, 0x00,0x00,0x00,0x3c},
++	{0x4e,0x22ff,0x0e08,0x0000,SIS_RI_1360x768, 0x00,0x00,0x00,0x3c},
++	{0x4f,0x921f,0x0000,0x0000,SIS_RI_320x200,  0x00,0x00,0x00,0x23},  /* 320x200x32 */
++	{0x53,0x921f,0x0001,0x0000,SIS_RI_320x240,  0x00,0x00,0x00,0x24},  /* 320x240x32 */
++	{0x54,0xb21f,0x0103,0x0000,SIS_RI_400x300,  0x00,0x00,0x00,0x25},  /* 400x300x32 */
++	{0x55,0x2e3b,0x0609,0x0000,SIS_RI_1280x768, 0x00,0x00,0x00,0x3d},  /* 1280x768   */
++	{0x5a,0x2e7d,0x0609,0x0000,SIS_RI_1280x768, 0x00,0x00,0x00,0x3d},
++	{0x5b,0x2eff,0x0609,0x0000,SIS_RI_1280x768, 0x00,0x00,0x00,0x3d},
++	{0x5f,0x2a1b,0x0f0e,0x0000,SIS_RI_768x576,  0x00,0x00,0x00,0x3e},  /* 768x576x8 */
++	{0x60,0x2a1d,0x0f0e,0x0000,SIS_RI_768x576,  0x00,0x00,0x00,0x3e},  /* 768x576x16 */
++	{0x61,0x2a1f,0x0f0e,0x0000,SIS_RI_768x576,  0x00,0x00,0x00,0x3e},  /* 768x576x32 */
++	{0x67,0x2e3b,0x0e08,0x0000,SIS_RI_1360x1024,0x00,0x00,0x00,0x3f},  /* 1360x1024x8 (BARCO) */
++	{0x6f,0x2e7d,0x0e08,0x0000,SIS_RI_1360x1024,0x00,0x00,0x00,0x3f},  /* 1360x1024x16 (BARCO) */
++	{0x72,0x2eff,0x0e08,0x0000,SIS_RI_1360x1024,0x00,0x00,0x00,0x3f},  /* 1360x1024x32 (BARCO) */
++	{0xff,0x0000,0x0000,0xffff,0x00,            0x00,0x00,0x00,0x00}
+ };
+ 
+ typedef struct _SiS300_Ext2Struct
+@@ -514,76 +183,77 @@ typedef struct _SiS300_Ext2Struct
+ 	UCHAR  ModeID;
+ 	USHORT XRes;
+ 	USHORT YRes;
+-	USHORT ROM_OFFSET;
+ } SiS300_Ext2Struct;
+ 
+ static const SiS300_Ext2Struct  SiS300_RefIndex[] =
+ { /* TW: Don't ever insert anything here, table is indexed */
+-	{0x085f,0x0d,0x03,0x05,0x6a, 800, 600,0x3563}, /* 00 */
+-	{0x0467,0x0e,0x44,0x05,0x6a, 800, 600,0x3568}, /* 01 */
+-	{0x0067,0x0f,0x07,0x48,0x6a, 800, 600,0x356d}, /* 02 - CRT1CRTC was 0x4f */
+-	{0x0067,0x10,0x06,0x8b,0x6a, 800, 600,0x3572}, /* 03 */
+-	{0x0147,0x11,0x08,0x00,0x6a, 800, 600,0x3577}, /* 04 */
+-	{0x0147,0x12,0x0c,0x00,0x6a, 800, 600,0x357c}, /* 05 */
+-	{0x0047,0x11,0x4e,0x00,0x6a, 800, 600,0x3581}, /* 06 - CRT1CRTC was 0x51 */
+-	{0x0047,0x11,0x13,0x00,0x6a, 800, 600,0x3586}, /* 07 */
+-	{0xc85f,0x05,0x00,0x04,0x2e, 640, 480,0x3539}, /* 08 */
+-	{0xc067,0x06,0x02,0x04,0x2e, 640, 480,0x353e}, /* 09 */
+-	{0xc067,0x07,0x02,0x47,0x2e, 640, 480,0x3543}, /* 0a */
+-	{0xc067,0x08,0x03,0x8a,0x2e, 640, 480,0x3548}, /* 0b */
+-	{0xc047,0x09,0x05,0x00,0x2e, 640, 480,0x354d}, /* 0c */
+-	{0xc047,0x0a,0x08,0x00,0x2e, 640, 480,0x3552}, /* 0d */
+-	{0xc047,0x0b,0x0a,0x00,0x2e, 640, 480,0x3557}, /* 0e */
+-	{0xc047,0x0c,0x10,0x00,0x2e, 640, 480,0x355c}, /* 0f */
+-	{0x487f,0x04,0x00,0x00,0x2f, 640, 400,0x3532}, /* 10 */
+-	{0xc00f,0x31,0x01,0x06,0x31, 720, 480,0x3630}, /* 11 */
+-	{0x000f,0x32,0x03,0x06,0x32, 720, 576,0x3637}, /* 12 */
+-	{0x0187,0x15,0x05,0x00,0x37,1024, 768,0x358d}, /* 13 */
+-        {0xc877,0x16,0x09,0x06,0x37,1024, 768,0x3592}, /* 14 */
+-	{0xc067,0x17,0x0b,0x49,0x37,1024, 768,0x3597}, /* 15 - CRT1CRTC was 0x97 */
+-	{0x0267,0x18,0x0d,0x00,0x37,1024, 768,0x359c}, /* 16 */
+-	{0x0047,0x19,0x11,0x8c,0x37,1024, 768,0x35a1}, /* 17 - CRT1CRTC was 0x59 */
+-	{0x0047,0x1a,0x52,0x00,0x37,1024, 768,0x35a6}, /* 18 */
+-	{0x0007,0x1b,0x16,0x00,0x37,1024, 768,0x35ab}, /* 19 - CRT1CRTC was 0x5b */
+-	{0x0387,0x1c,0x4d,0x00,0x3a,1280,1024,0x35be}, /* 1a - CRT1CRTC was 0x5c */
+-	{0x0077,0x1d,0x14,0x07,0x3a,1280,1024,0x35c3}, /* 1b */
+-	{0x0047,0x1e,0x17,0x00,0x3a,1280,1024,0x35c8}, /* 1c */
+-	{0x0007,0x1f,0x98,0x00,0x3a,1280,1024,0x35cd}, /* 1d */
+-	{0x0007,0x20,0x59,0x00,0x3c,1600,1200,0x35d4}, /* 1e - CRT1CRTC was 0x60 */
+-	{0x0007,0x21,0x5a,0x00,0x3c,1600,1200,0x35d9}, /* 1f */
+-	{0x0007,0x22,0x1b,0x00,0x3c,1600,1200,0x35de}, /* 20 */
+-	{0x0007,0x23,0x1d,0x00,0x3c,1600,1200,0x35e3}, /* 21 - CRT1CRTC was 0x63 */
+-	{0x0007,0x24,0x1e,0x00,0x3c,1600,1200,0x35e8}, /* 22 */
+-	{0x407f,0x00,0x00,0x00,0x40, 320, 200,0x3516}, /* 23 */
+-	{0xc07f,0x01,0x00,0x04,0x50, 320, 240,0x351d}, /* 24 */
+-	{0x0077,0x02,0x04,0x05,0x51, 400, 300,0x3524}, /* 25 */
+-	{0xc877,0x03,0x09,0x06,0x52, 512, 384,0x352b}, /* 26 */  /* was c077 */
+-	{0x8207,0x25,0x1f,0x00,0x68,1920,1440,0x35ef}, /* 27 */
+-	{0x0007,0x26,0x20,0x00,0x6c,2048,1536,0x35f6}, /* 28 */
+-	{0x0067,0x27,0x14,0x08,0x6e,1280, 960,0x35b7}, /* 29 - TW: 1280x960-60 */
+-	{0x0027,0x45,0x3c,0x08,0x6e,1280, 960,0x35b7}, /* 2a - TW: 1280x960-85 */
+-	{0xc077,0x33,0x09,0x06,0x20,1024, 600,0x0000}, /* 2b */
+-	{0xc077,0x34,0x0b,0x06,0x23,1152, 768,0x0000}, /* 2c */	/* VCLK 0x09 */
+-	{0x0057,0x35,0x27,0x08,0x70, 800, 480,0x3b52}, /* 2d - TW: 16:9 modes */
+-	{0x0047,0x36,0x37,0x08,0x70, 800, 480,0x3b57}, /* 2e */
+-	{0x0047,0x37,0x08,0x08,0x70, 800, 480,0x3b5c}, /* 2f */
+-	{0x0057,0x38,0x09,0x09,0x71,1024, 576,0x3b63}, /* 30 */
+-	{0x0047,0x39,0x38,0x09,0x71,1024, 576,0x3b68}, /* 31 */
+-	{0x0047,0x3a,0x11,0x09,0x71,1024, 576,0x3b6d}, /* 32 */
+-	{0x0057,0x3b,0x39,0x0a,0x75,1280, 720,0x3b74}, /* 33 */
+-	{0x0047,0x3c,0x3a,0x0a,0x75,1280, 720,0x3b79}, /* 34 */
+-	{0x0007,0x3d,0x3b,0x0a,0x75,1280, 720,0x3b7e}, /* 35 - TW: END of 16:9 modes */
+-	{0x0047,0x3e,0x34,0x06,0x29,1152, 864,0x0000}, /* 36 TW: 1152x864-75Hz - Non-BIOS, new */
+-	{0x0047,0x44,0x3a,0x06,0x29,1152, 864,0x0000}, /* 37 TW: 1152x864-85Hz - Non-BIOS, new */
+-	{0x00c7,0x3f,0x28,0x00,0x39, 848, 480,0x0000}, /* 38 TW: 848x480-38Hzi - Non-BIOS, new */
+-	{0xc047,0x40,0x3d,0x00,0x39, 848, 480,0x0000}, /* 39 TW: 848x480-60Hz  - Non-BIOS, new */
+-	{0x00c7,0x41,0x28,0x00,0x3f, 856, 480,0x0000}, /* 3a TW: 856x480-38Hzi - Non-BIOS, new */
+-	{0xc047,0x42,0x28,0x00,0x3f, 856, 480,0x0000}, /* 3b TW: 856x480-60Hz  - Non-BIOS, new */
+-	{0x0047,0x43,0x3e,0x00,0x48,1360, 768,0x0000}, /* 3c TW: 1360x768-60Hz - Non-BIOS, new */
+-	{0xffff,0,0,0,0,0,0,0}
++	{0x085f,0x0d,0x03,0x05,0x6a, 800, 600}, /* 00 */
++	{0x0467,0x0e,0x44,0x05,0x6a, 800, 600}, /* 01 */
++	{0x0067,0x0f,0x07,0x48,0x6a, 800, 600}, /* 02 - CRT1CRTC was 0x4f */
++	{0x0067,0x10,0x06,0x8b,0x6a, 800, 600}, /* 03 */
++	{0x0147,0x11,0x08,0x00,0x6a, 800, 600}, /* 04 */
++	{0x0147,0x12,0x0c,0x00,0x6a, 800, 600}, /* 05 */
++	{0x0047,0x11,0x4e,0x00,0x6a, 800, 600}, /* 06 - CRT1CRTC was 0x51 */
++	{0x0047,0x11,0x13,0x00,0x6a, 800, 600}, /* 07 */
++	{0xc85f,0x05,0x00,0x04,0x2e, 640, 480}, /* 08 */
++	{0xc067,0x06,0x02,0x04,0x2e, 640, 480}, /* 09 */
++	{0xc067,0x07,0x02,0x47,0x2e, 640, 480}, /* 0a */
++	{0xc067,0x08,0x03,0x8a,0x2e, 640, 480}, /* 0b */
++	{0xc047,0x09,0x05,0x00,0x2e, 640, 480}, /* 0c */
++	{0xc047,0x0a,0x08,0x00,0x2e, 640, 480}, /* 0d */
++	{0xc047,0x0b,0x0a,0x00,0x2e, 640, 480}, /* 0e */
++	{0xc047,0x0c,0x10,0x00,0x2e, 640, 480}, /* 0f */
++	{0x487f,0x04,0x00,0x00,0x2f, 640, 400}, /* 10 */
++	{0xc00f,0x31,0x01,0x06,0x31, 720, 480}, /* 11 */
++	{0x000f,0x32,0x03,0x06,0x32, 720, 576}, /* 12 */
++	{0x0187,0x15,0x05,0x00,0x37,1024, 768}, /* 13 */
++        {0xc877,0x16,0x09,0x06,0x37,1024, 768}, /* 14 */
++	{0xc067,0x17,0x0b,0x49,0x37,1024, 768}, /* 15 - CRT1CRTC was 0x97 */
++	{0x0267,0x18,0x0d,0x00,0x37,1024, 768}, /* 16 */
++	{0x0047,0x19,0x11,0x8c,0x37,1024, 768}, /* 17 - CRT1CRTC was 0x59 */
++	{0x0047,0x1a,0x52,0x00,0x37,1024, 768}, /* 18 */
++	{0x0007,0x1b,0x16,0x00,0x37,1024, 768}, /* 19 - CRT1CRTC was 0x5b */
++	{0x0387,0x1c,0x4d,0x00,0x3a,1280,1024}, /* 1a - CRT1CRTC was 0x5c */
++	{0x0077,0x1d,0x14,0x07,0x3a,1280,1024}, /* 1b */
++	{0x0047,0x1e,0x17,0x00,0x3a,1280,1024}, /* 1c */
++	{0x0007,0x1f,0x98,0x00,0x3a,1280,1024}, /* 1d */
++	{0x0007,0x20,0x59,0x00,0x3c,1600,1200}, /* 1e - CRT1CRTC was 0x60 */
++	{0x0007,0x21,0x5a,0x00,0x3c,1600,1200}, /* 1f */
++	{0x0007,0x22,0x1b,0x00,0x3c,1600,1200}, /* 20 */
++	{0x0007,0x23,0x1d,0x00,0x3c,1600,1200}, /* 21 - CRT1CRTC was 0x63 */
++	{0x0007,0x24,0x1e,0x00,0x3c,1600,1200}, /* 22 */
++	{0x407f,0x00,0x00,0x00,0x40, 320, 200}, /* 23 */
++	{0xc07f,0x01,0x00,0x04,0x50, 320, 240}, /* 24 */
++	{0x0077,0x02,0x04,0x05,0x51, 400, 300}, /* 25 */
++	{0xc877,0x03,0x09,0x06,0x52, 512, 384}, /* 26 */  /* was c077 */
++	{0x8207,0x25,0x1f,0x00,0x68,1920,1440}, /* 27 */
++	{0x0007,0x26,0x20,0x00,0x6c,2048,1536}, /* 28 */
++	{0x0067,0x27,0x14,0x08,0x6e,1280, 960}, /* 29 - TW: 1280x960-60 */
++	{0x0027,0x45,0x3c,0x08,0x6e,1280, 960}, /* 2a - TW: 1280x960-85 */
++	{0xc077,0x33,0x09,0x06,0x20,1024, 600}, /* 2b */
++	{0xc077,0x34,0x0b,0x06,0x23,1152, 768}, /* 2c */	/* VCLK 0x09 */
++	{0x0057,0x35,0x27,0x08,0x70, 800, 480}, /* 2d */
++	{0x0047,0x36,0x37,0x08,0x70, 800, 480}, /* 2e */
++	{0x0047,0x37,0x08,0x08,0x70, 800, 480}, /* 2f */
++	{0x0057,0x38,0x09,0x09,0x71,1024, 576}, /* 30 */
++	{0x0047,0x39,0x38,0x09,0x71,1024, 576}, /* 31 */
++	{0x0047,0x3a,0x11,0x09,0x71,1024, 576}, /* 32 */
++	{0x0057,0x3b,0x39,0x0a,0x75,1280, 720}, /* 33 */
++	{0x0047,0x3c,0x3a,0x0a,0x75,1280, 720}, /* 34 */
++	{0x0007,0x3d,0x3b,0x0a,0x75,1280, 720}, /* 35 */
++	{0x0047,0x3e,0x34,0x06,0x29,1152, 864}, /* 36 1152x864-75Hz */
++	{0x0047,0x44,0x3a,0x06,0x29,1152, 864}, /* 37 1152x864-85Hz */
++	{0x00c7,0x3f,0x28,0x00,0x39, 848, 480}, /* 38 848x480-38Hzi */
++	{0xc067,0x40,0x3d,0x0b,0x39, 848, 480}, /* 39 848x480-60Hz  */
++	{0x00c7,0x41,0x28,0x00,0x3f, 856, 480}, /* 3a 856x480-38Hzi */
++	{0xc047,0x42,0x28,0x00,0x3f, 856, 480}, /* 3b 856x480-60Hz  */
++	{0x0067,0x43,0x3e,0x0c,0x48,1360, 768}, /* 3c 1360x768-60Hz */
++	{0x0077,0x46,0x3f,0x08,0x55,1280, 768}, /* 3d 1280x768-60Hz */
++	{0x000f,0x47,0x03,0x06,0x5f, 768, 576}, /* 3e 768x576 */
++	{0x0027,0x48,0x13,0x08,0x67,1360,1024}, /* 3f 1360x1024-59Hz (BARCO1366 only) */
++	{0xffff,   0,   0,   0,   0,   0,   0}
+ };
+ 
+-/*add for 300 oem util*/
+ typedef struct _SiS_VBModeIDTableStruct
+ {
+ 	UCHAR  ModeID;
+@@ -649,9 +319,8 @@ static const SiS_VBModeIDTableStruct  Si
+ 	{0x6e,0x00,0x00,0x01,0x00,0x00,0x0b,0x0d},
+ 	{0x6f,0x00,0x00,0x01,0x00,0x00,0x0b,0x0d},
+ 	{0x7b,0x00,0x00,0x01,0x00,0x00,0x0b,0x0d},
+-	{0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00}  /* TW: added! */
++	{0xff,0x00,0x00,0x00,0x00,0x00,0x00,0x00}
+ };
+-/*end*/
+ 
+ typedef struct _SiS300_CRT1TableStruct
+ {
+@@ -660,15 +329,32 @@ typedef struct _SiS300_CRT1TableStruct
+ 
+ static const SiS300_CRT1TableStruct  SiS300_CRT1Table[] =
+ {
+- {{0x2d,0x27,0x28,0x90,0x2c,0x80,0xbf,0x1f,    /* 0x00 */
+-  0x9c,0x8e,0x8f,0x96,0xb9,0x30,0x00,0x00,
++#if 1
++ {{0x2d,0x27,0x28,0x90,0x2c,0x80,0xbf,0x1f,    /* 0x00 - 320x200 */
++  0x9c,0x8e,0x8f,0x96,0xb9,0x30,0x00,0x00,     /* HRE [4],[15] is invalid - but correcting it does not work */
++  0x00}},
++#endif
++#if 0
++ {{0x2d,0x27,0x27,0x91,0x2c,0x92,0xbf,0x1f,    /* 0x00 - corrected 320x200-72 - does not work */
++  0x9c,0x8e,0x8f,0x96,0xb9,0x30,0x00,0x04,
+   0x00}},
+- {{0x2d,0x27,0x28,0x90,0x2c,0x80,0x0b,0x3e,
+-  0xe9,0x8b,0xdf,0xe7,0x04,0x00,0x00,0x00,
++#endif
++ {{0x2d,0x27,0x28,0x90,0x2c,0x80,0x0b,0x3e,    /* 0x01 */
++  0xe9,0x8b,0xdf,0xe7,0x04,0x00,0x00,0x00,     /* HRE [4],[15] is invalid - but correcting it does not work */
+   0x00}},
+- {{0x3d,0x31,0x31,0x81,0x37,0x1f,0x72,0xf0,
++#if 0
++ {{0x2d,0x27,0x27,0x91,0x2c,0x92,0x0b,0x3e,    /* 0x01 - corrected 320x240-60 - does not work */
++  0xe9,0x8b,0xdf,0xe7,0x04,0x00,0x00,0x04,
++  0x00}},
++#endif
++ {{0x3d,0x31,0x31,0x81,0x37,0x1f,0x72,0xf0,    /* 0x02 */
++  0x58,0x8c,0x57,0x57,0x73,0x20,0x00,0x05,
++  0x01}},
++#if 0
++ {{0x3d,0x31,0x31,0x81,0x37,0x1f,0x72,0xf0,    /* 0x02 - corrected 400x300-60 */
+   0x58,0x8c,0x57,0x57,0x73,0x20,0x00,0x05,
+   0x01}},
++#endif
+  {{0x4f,0x3f,0x3f,0x93,0x45,0x0d,0x24,0xf5,
+   0x02,0x88,0xff,0xff,0x25,0x10,0x00,0x01,
+   0x01}},
+@@ -683,7 +369,7 @@ static const SiS300_CRT1TableStruct  SiS
+  {{0x5f,0x4f,0x4f,0x83,0x55,0x81,0x0b,0x3e,    /* 0x05 - corrected 640x480-60 */
+   0xe9,0x8b,0xdf,0xe8,0x0c,0x00,0x00,0x05,
+   0x00}},
+- #if 0  
++#if 0
+  {{0x63,0x4f,0x50,0x86,0x56,0x9b,0x06,0x3e,    /* 0x06 */
+   0xe8,0x8b,0xdf,0xe7,0xff,0x10,0x00,0x01,
+   0x00}},
+@@ -841,15 +527,10 @@ static const SiS300_CRT1TableStruct  SiS
+  {{0xa3,0x7f,0x7f,0x87,0x86,0x97,0x1e,0xf1,  /* 0x33 - 1024x600 */
+   0xae,0x85,0x57,0x57,0x1f,0x30,0x00,0x02,
+   0x01}},
+-#if 0
+- {{0xa3,0x7f,0x7f,0x87,0x86,0x97,0x24,0xf5,  /* 0x34 - 1152x768 */
+-  0x02,0x88,0xff,0xff,0x25,0x10,0x00,0x02,
+-  0x01}},
+-#endif
+- {{0xa3,0x8f,0x8f,0x97,0x96,0x97,0x24,0xf5,  /* 0x34 - 1152x768 - TW: corrected */
++ {{0xa3,0x8f,0x8f,0x97,0x96,0x97,0x24,0xf5,  /* 0x34 - 1152x768 - corrected */
+   0x02,0x88,0xff,0xff,0x25,0x10,0x00,0x02,
+   0x01}},
+- {{0x7f,0x63,0x63,0x83,0x6c,0x1c,0x72,0xba,  /* 0x35 - NEW 16:9 modes, not in BIOS ------ */
++ {{0x7f,0x63,0x63,0x83,0x6c,0x1c,0x72,0xba,  /* 0x35 */
+    0x27,0x8b,0xdf,0xdf,0x73,0x00,0x00,0x06,
+    0x01}}, /* 0x35 */
+  {{0x7f,0x63,0x63,0x83,0x69,0x13,0x6f,0xba,
+@@ -864,7 +545,7 @@ static const SiS300_CRT1TableStruct  SiS
+  {{0x9f,0x7f,0x7f,0x83,0x85,0x91,0x1e,0xf1,
+    0xad,0x81,0x3f,0x3f,0x1f,0x30,0x00,0x02,
+    0x01}}, /* 0x39 */
+- {{0xa7,0x7f,0x7f,0x88,0x89,0x95,0x26,0xf1,   	/* TW: 95 was 15 - illegal HBE! */
++ {{0xa7,0x7f,0x7f,0x88,0x89,0x95,0x26,0xf1,  /* 95 was 15 - illegal HBE! */
+    0xb1,0x85,0x3f,0x3f,0x27,0x30,0x00,0x02,
+    0x01}}, /* 0x3a */
+  {{0xce,0x9f,0x9f,0x92,0xa9,0x17,0x28,0xc4,
+@@ -875,36 +556,40 @@ static const SiS300_CRT1TableStruct  SiS
+    0x01}}, /* 0x3c */
+  {{0xd3,0x9f,0x9f,0x97,0xab,0x1f,0x2e,0xd4,
+    0x7d,0x81,0xcf,0xcf,0x2f,0x21,0x00,0x07,
+-   0x01}}, /* 0x3d */			     /* TW: End of 16:9 modes --------------- */
+- {{0xc3,0x8f,0x8f,0x87,0x9b,0x0b,0x82,0xef,  /* TW: New, 1152x864-75 (not in any BIOS)   */
++   0x01}}, /* 0x3d */
++ {{0xc3,0x8f,0x8f,0x87,0x9b,0x0b,0x82,0xef,  /* 1152x864-75 */
+    0x60,0x83,0x5f,0x5f,0x83,0x10,0x00,0x07,
+    0x01}},  /* 0x3e */
+- {{0x86,0x69,0x69,0x8A,0x74,0x06,0x8C,0x15,  /* TW: New, 848x480-38i, not in BIOS */
++ {{0x86,0x69,0x69,0x8A,0x74,0x06,0x8C,0x15,  /* 848x480-38i */
+    0x4F,0x83,0xEF,0xEF,0x8D,0x30,0x00,0x02,
+    0x00}}, /* 0x3f */
+-#if 0
+- {{0x81,0x69,0x69,0x85,0x70,0x00,0x0F,0x3E,  /* TW: New, 848x480-60, not in BIOS - incorrect for Philips panel */
+-   0xEB,0x8E,0xDF,0xDF,0x10,0x00,0x00,0x02,
+-   0x00}}, /* 0x40 */
+-#endif
+- {{0x83,0x69,0x69,0x87,0x6f,0x1d,0x03,0x3E,  /* TW: New, 848x480-60, not in BIOS */
++ {{0x83,0x69,0x69,0x87,0x6f,0x1d,0x03,0x3E,  /* 848x480-60  */
+    0xE5,0x8d,0xDF,0xe4,0x04,0x00,0x00,0x06,
+    0x00}}, /* 0x40 */
+- {{0x86,0x6A,0x6A,0x8A,0x74,0x06,0x8C,0x15,  /* TW: New, 856x480-38i, not in BIOS */
++ {{0x86,0x6A,0x6A,0x8A,0x74,0x06,0x8C,0x15,  /* 856x480-38i */
+    0x4F,0x83,0xEF,0xEF,0x8D,0x30,0x00,0x02,
+    0x00}}, /* 0x41 */
+- {{0x81,0x6A,0x6A,0x85,0x70,0x00,0x0F,0x3E,  /* TW: New, 856x480-60, not in BIOS */
++ {{0x81,0x6A,0x6A,0x85,0x70,0x00,0x0F,0x3E,  /* 856x480-60  */
+    0xEB,0x8E,0xDF,0xDF,0x10,0x00,0x00,0x02,
+    0x00}}, /* 0x42 */
+- {{0xdd,0xa9,0xa9,0x81,0xb4,0x97,0x26,0xfd,  /* TW: New, 1360x768-60, not in BIOS */
++ {{0xdd,0xa9,0xa9,0x81,0xb4,0x97,0x26,0xfd,  /* 1360x768-60 */
+    0x01,0x8d,0xff,0x00,0x27,0x10,0x00,0x03,
+    0x01}}, /* 0x43 */
+- {{0xd9,0x8f,0x8f,0x9d,0xba,0x0a,0x8a,0xff,  /* TW: New, 1152x864-84 (not in any BIOS)   */
++ {{0xd9,0x8f,0x8f,0x9d,0xba,0x0a,0x8a,0xff,  /* 1152x864-84 */
+    0x60,0x8b,0x5f,0x5f,0x8b,0x10,0x00,0x03,
+-   0x01}}, /* 0x44 */   
+- {{0xd3,0x9f,0x9f,0x97,0xab,0x1f,0xf1,0xff,  /* TW: New, 1280x960-85 (not in any BIOS)   */
++   0x01}}, /* 0x44 */
++ {{0xd3,0x9f,0x9f,0x97,0xab,0x1f,0xf1,0xff,  /* 1280x960-85 */
+    0xc0,0x83,0xbf,0xbf,0xf2,0x10,0x00,0x07,
+-   0x01}}  /* 0x45 */
++   0x01}}, /* 0x45 */
++ {{0xce,0x9f,0x9f,0x92,0xa9,0x17,0x20,0xf5,  /* 1280x768-60 */
++   0x03,0x88,0xff,0xff,0x21,0x10,0x00,0x07,
++   0x01}},  /* 0x46 */
++ {{0x7b,0x5f,0x63,0x9f,0x6a,0x93,0x6f,0xf0,  /* 768x576 */
++   0x58,0x8a,0x3f,0x57,0x70,0x20,0x00,0x05,
++   0x01}},  /* 0x47 */
++ {{0xce,0xa9,0xa9,0x92,0xb1,0x07,0x28,0x52,  /* 1360x1024 (Barco iQ Pro R300) */
++   0x02,0x8e,0xff,0x00,0x29,0x0d,0x00,0x03,
++   0x00}}   /* 0x48 */
+ };
+ 
+ typedef struct _SiS300_MCLKDataStruct
+@@ -913,8 +598,8 @@ typedef struct _SiS300_MCLKDataStruct
+ 	USHORT CLOCK;
+ } SiS300_MCLKDataStruct;
+ 
+-static const SiS300_MCLKDataStruct  SiS300_MCLKData_630[] =	/* 630 */
+-{ /* TW: at 0x54 in BIOS */
++static const SiS300_MCLKDataStruct  SiS300_MCLKData_630[] =
++{
+ 	{ 0x5a,0x64,0x80, 66},
+ 	{ 0xb3,0x45,0x80, 83},
+ 	{ 0x37,0x61,0x80,100},
+@@ -925,8 +610,8 @@ static const SiS300_MCLKDataStruct  SiS3
+ 	{ 0x37,0x61,0x80,100}
+ };
+ 
+-static const SiS300_MCLKDataStruct  SiS300_MCLKData_300[] =  /* 300 */
+-{ /* TW: at 0x54 in BIOS */
++static const SiS300_MCLKDataStruct  SiS300_MCLKData_300[] =
++{
+ 	{ 0x68,0x43,0x80,125},
+ 	{ 0x68,0x43,0x80,125},
+ 	{ 0x68,0x43,0x80,125},
+@@ -937,6 +622,7 @@ static const SiS300_MCLKDataStruct  SiS3
+ 	{ 0x37,0x61,0x80,100}
+ };
+ 
++#ifdef LINUXBIOS
+ typedef struct _SiS300_ECLKDataStruct
+ {
+ 	UCHAR SR2E,SR2F,SR30;
+@@ -954,6 +640,7 @@ static const SiS300_ECLKDataStruct  SiS3
+ 	{ 0x54,0x43,0x80,100},
+ 	{ 0x54,0x43,0x80,100}
+ };
++#endif
+ 
+ typedef struct _SiS300_VCLKDataStruct
+ {
+@@ -964,71 +651,77 @@ typedef struct _SiS300_VCLKDataStruct
+ static const SiS300_VCLKDataStruct  SiS300_VCLKData[] =
+ {
+ 	{ 0x1b,0xe1, 25}, /* 0x00 */
+-	{ 0x4e,0xe4, 28},
++	{ 0x4e,0xe4, 28}, /* 0x01 */
+ 	{ 0x57,0xe4, 32}, /* 0x02 */
+-	{ 0xc3,0xc8, 36},
++	{ 0xc3,0xc8, 36}, /* 0x03 */
+ 	{ 0x42,0xc3, 40}, /* 0x04 */
+-	{ 0x5d,0xc4, 45},
++	{ 0x5d,0xc4, 45}, /* 0x05 */
+ 	{ 0x52,0x65, 50}, /* 0x06 */
+-	{ 0x53,0x65, 50},
++	{ 0x53,0x65, 50}, /* 0x07 */
+ 	{ 0x6d,0x66, 56}, /* 0x08 */
+-	{ 0x5a,0x64, 65},
++	{ 0x5a,0x64, 65}, /* 0x09 */
+ 	{ 0x46,0x44, 68}, /* 0x0a */
+-	{ 0x3e,0x43, 75},
+-	{ 0x6d,0x46, 76}, /* 0x0c: 800x600 | LVDS_2(CH), MITAC(CH);  - 730, A901(301B): 0xb1,0x46, 76 */
+-	{ 0x41,0x43, 79},
++	{ 0x3e,0x43, 75}, /* 0x0b */
++	{ 0x6d,0x46, 76}, /* 0x0c */  /* 800x600 | LVDS_2(CH), MITAC(CH);  - 730, A901(301B): 0xb1,0x46, 76 */
++	{ 0x41,0x43, 79}, /* 0x0d */
+ 	{ 0x31,0x42, 79}, /* 0x0e */
+-	{ 0x46,0x25, 85},
++	{ 0x46,0x25, 85}, /* 0x0f */
+ 	{ 0x78,0x29, 87}, /* 0x10 */
+-	{ 0x62,0x44, 95},
++	{ 0x62,0x44, 95}, /* 0x11 */
+ 	{ 0x2b,0x22,105}, /* 0x12 */
+-	{ 0x49,0x24,106},
++	{ 0x49,0x24,106}, /* 0x13 */
+ 	{ 0xc3,0x28,108}, /* 0x14 */
+-	{ 0x3c,0x23,109},
++	{ 0x3c,0x23,109}, /* 0x15 */
+ 	{ 0xf7,0x2c,132}, /* 0x16 */
+-	{ 0xd4,0x28,136},
++	{ 0xd4,0x28,136}, /* 0x17 */
+ 	{ 0x41,0x05,158}, /* 0x18 */
+-	{ 0x43,0x05,162},
++	{ 0x43,0x05,162}, /* 0x19 */
+ 	{ 0xe1,0x0f,175}, /* 0x1a */
+ 	{ 0xfc,0x12,189}, /* 0x1b */
+ 	{ 0xde,0x26,194}, /* 0x1c */
+-	{ 0x54,0x05,203},
++	{ 0x54,0x05,203}, /* 0x1d */
+ 	{ 0x3f,0x03,230}, /* 0x1e */
+-	{ 0x30,0x02,234},
++	{ 0x30,0x02,234}, /* 0x1f */
+ 	{ 0x24,0x01,266}, /* 0x20 */
+-	{ 0x52,0x2a, 54}, /* 301 TV */
+-	{ 0x52,0x6a, 27}, /* 301 TV */
+-	{ 0x62,0x24, 70}, /* 301 TV */
+-	{ 0x62,0x64, 70}, /* 301 TV */
+-	{ 0xa8,0x4c, 30}, /* 301 TV */
+-	{ 0x20,0x26, 33}, /* 301 TV */
+-	{ 0x31,0xc2, 39},
+-	{ 0xbf,0xc8, 35}, /* 0x28 - 856x480 */
+-	{ 0x60,0x36, 30}, /* 0x29  CH/UNTSC TEXT | LVDS_2(CH) - 730, A901(301B), Mitac(CH): 0xe0, 0xb6, 30 */
+-	{ 0x40,0x4a, 28},
+-	{ 0x9f,0x46, 44},
+-	{ 0x97,0x2c, 26},
+-	{ 0x44,0xe4, 25},
+-	{ 0x7e,0x32, 47},
+-	{ 0x8a,0x24, 31}, /* 0x2f  CH/PAL TEXT | LVDS_2(CH), Mitac(CH) -  730, A901(301B): 0x57, 0xe4, 31 */
+-	{ 0x97,0x2c, 26},
+-	{ 0xce,0x3c, 39},
+-	{ 0x52,0x4a, 36}, /* 0x32  CH/PAL 800x600 5/6 */
+-	{ 0x34,0x61, 95},
+-	{ 0x78,0x27,108},
+-	{ 0xce,0x25,189}, /* 0x35 */
+-	{ 0x45,0x6b, 21}, /* 0x36 */  /* TW: Added from Mitac */
+-	{ 0x52,0xe2, 49}, /* 0x37 - added for 16:9 modes (not in any BIOS) */
+-	{ 0x2b,0x61, 78}, /* 0x38 - added for 16:9 modes (not in any BIOS) */
+-	{ 0x70,0x44,108}, /* 0x39 - added for 16:9 modes (not in any BIOS) */
+-	{ 0x54,0x42,135}, /* 0x3a - added for 16:9 modes (not in any BIOS) */
+-	{ 0x41,0x22,157}, /* 0x3b - added for 16:9 modes (not in any BIOS) */
+-	{ 0x52,0x07,149}, /* 0x3c - added for 1280x960-85 (not in any BIOS)*/
+-	{ 0x62,0xc6, 34}, /* 0x3d - added for 848x480-60 (not in any BIOS) */
+-	{ 0x30,0x23, 88}, /* 0x3e - added for 1360x768-60 (not in any BIOS)*/
+-	{ 0x3f,0x64, 46}, /* 0x3f - added for 640x480-100 (not in any BIOS)*/
+-	{ 0x72,0x2a, 76}, /* 0x40 - test for SiS730 */
+-	{ 0x15,0x21, 79}, /* 0x41 - test for SiS730 */
++	{ 0x52,0x2a, 54}, /* 0x21 */  /* 301 TV */
++	{ 0x52,0x6a, 27}, /* 0x22 */  /* 301 TV */
++	{ 0x62,0x24, 70}, /* 0x23 */  /* 301 TV */
++	{ 0x62,0x64, 70}, /* 0x24 */  /* 301 TV */
++	{ 0xa8,0x4c, 30}, /* 0x25 */  /* 301 TV */
++	{ 0x20,0x26, 33}, /* 0x26 */  /* 301 TV */
++	{ 0x31,0xc2, 39}, /* 0x27 */
++	{ 0xbf,0xc8, 35}, /* 0x28 */  /* 856x480 */
++	{ 0x60,0x36, 30}, /* 0x29 */  /* CH/UNTSC TEXT | LVDS_2(CH) - 730, A901(301B), Mitac(CH): 0xe0, 0xb6, 30 */
++	{ 0x40,0x4a, 28}, /* 0x2a */
++	{ 0x9f,0x46, 44}, /* 0x2b */
++	{ 0x97,0x2c, 26}, /* 0x2c */
++	{ 0x44,0xe4, 25}, /* 0x2d */
++	{ 0x7e,0x32, 47}, /* 0x2e */
++	{ 0x8a,0x24, 31}, /* 0x2f */  /* CH/PAL TEXT | LVDS_2(CH), Mitac(CH) -  730, A901(301B): 0x57, 0xe4, 31 */
++	{ 0x97,0x2c, 26}, /* 0x30 */
++	{ 0xce,0x3c, 39}, /* 0x31 */
++	{ 0x52,0x4a, 36}, /* 0x32 */  /* CH/PAL 800x600 5/6 */
++	{ 0x34,0x61, 95}, /* 0x33 */
++	{ 0x78,0x27,108}, /* 0x34 */  /* Replacement for index 0x14 for 630 (?) */
++	{ 0xce,0x25,189}, /* 0x35 */  /* Replacement for index 0x1b for 730 (and 540?) */
++	{ 0x45,0x6b, 21}, /* 0x36 */
++	{ 0x52,0xe2, 49}, /* 0x37 */  /* 16:9 modes  */
++	{ 0x2b,0x61, 78}, /* 0x38 */  /* 16:9 modes  */
++	{ 0x70,0x44,108}, /* 0x39 */  /* 16:9 modes  */
++	{ 0x54,0x42,135}, /* 0x3a */  /* 16:9 modes  */
++	{ 0x41,0x22,157}, /* 0x3b */  /* 16:9 modes  */
++	{ 0x52,0x07,149}, /* 0x3c */  /* 1280x960-85 */
++	{ 0x62,0xc6, 34}, /* 0x3d */  /* 848x480-60  */
++	{ 0x30,0x23, 88}, /* 0x3e */  /* 1360x768-60 */
++#if 0
++	{ 0x3f,0x64, 46}, /* 0x3f */  /* 640x480-100 */
++#endif
++        { 0x70,0x29, 81}, /* 0x3f */  /* 1280x768-60 */
++	{ 0x72,0x2a, 76}, /* 0x40 */  /* test for SiS730 */
++	{ 0x15,0x21, 79}, /* 0x41 */  /* test for SiS730 */
++	{ 0xa1,0x42,108}, /* 0x42 */  /* 1280x960 LCD */
++	{ 0x37,0x61,100}, /* 0x43 */  /* 1280x960 LCD */
++	{ 0xe3,0x9a,106}, /* 0x44 */  /* 1360x1024 - special for Barco iQ R300 */
+ 	{ 0xff,0x00,  0}   
+ };
+ 
+@@ -1089,66 +782,10 @@ static const SiS300_VCLKDataStruct  SiS3
+ static const UCHAR  SiS300_ScreenOffset[] =
+ {
+ 	0x14,0x19,0x20,0x28,0x32,0x40,0x50,
+-        0x64,0x78,0x80,0x2d,0x35,0x48,0x35,  /* 0x35 for 848 and 856 */
+-	0x55,0xff			     /* 0x55 for 1360 */	
++        0x64,0x78,0x80,0x2d,0x35,0x48,0x35,
++	0x55,0x30,0xff
+ };
+ 
+-typedef struct _SiS300_StResInfoStruct
+-{
+-	USHORT HTotal;
+-	USHORT VTotal;
+-} SiS300_StResInfoStruct;
+-
+-static const SiS300_StResInfoStruct  SiS300_StResInfo[] =
+-{
+-	{ 640,400},
+-	{ 640,350},
+-	{ 720,400},
+-	{ 720,350},
+-	{ 640,480}
+-};
+-
+-typedef struct _SiS300_ModeResInfoStruct
+-{
+-	USHORT HTotal;
+-	USHORT VTotal;
+-	UCHAR  XChar;
+-	UCHAR  YChar;
+-} SiS300_ModeResInfoStruct;
+-
+-static const SiS300_ModeResInfoStruct  SiS300_ModeResInfo[] =
+-{
+-	{  320, 200, 8, 8},  /* 0x00 */
+-	{  320, 240, 8, 8},  /* 0x01 */
+-	{  320, 400, 8, 8},  /* 0x02 */
+-	{  400, 300, 8, 8},  /* 0x03 */
+-	{  512, 384, 8, 8},  /* 0x04 */
+-	{  640, 400, 8,16},  /* 0x05 */
+-	{  640, 480, 8,16},  /* 0x06 */
+-	{  800, 600, 8,16},  /* 0x07 */
+-	{ 1024, 768, 8,16},  /* 0x08 */
+-	{ 1280,1024, 8,16},  /* 0x09 */
+-	{ 1600,1200, 8,16},  /* 0x0a */
+-	{ 1920,1440, 8,16},  /* 0x0b */
+-	{  720, 480, 8,16},  /* 0x0c */
+-	{  720, 576, 8,16},  /* 0x0d */
+-	{ 1280, 960, 8,16},  /* 0x0e */
+-	{ 1024, 600, 8,16},  /* 0x0f */
+-	{ 1152, 768, 8,16},  /* 0x10 */
+-	{ 2048,1536, 8,16},  /* 0x11 - TW: Not in BIOS! */
+-	{  800, 480, 8,16},  /* 0x12 - TW: New, not in any BIOS */
+-	{ 1024, 576, 8,16},  /* 0x13 - TW: New, not in any BIOS */
+-	{ 1280, 720, 8,16},  /* 0x14 - TW: New, not in any BIOS */
+-	{ 1152, 864, 8,16},  /* 0x15 - TW: New, not in any BIOS */
+-	{  848, 480, 8,16},  /* 0x16 - TW: New, not in any BIOS */
+-	{  856, 480, 8,16},  /* 0x17 - TW: New, not in any BIOS */
+-	{ 1360, 768, 8,16}   /* 0x18 - TW: New, not in any BIOS */
+-};
+-
+-static const UCHAR SiS300_OutputSelect = 0x40;
+-
+-static const UCHAR SiS300_SoftSetting  = 0x30;
+-
+ #ifndef LINUX_XF86
+ static UCHAR SiS300_SR07 = 0x10;
+ #endif
+@@ -1183,7 +820,7 @@ static UCHAR SiS300_CRT2Data_4_10 = 0x80
+ static const USHORT SiS300_RGBSenseData = 0xd1;
+ static const USHORT SiS300_VideoSenseData = 0xb3;
+ static const USHORT SiS300_YCSenseData = 0xb9;
+-static const USHORT SiS300_RGBSenseData2 = 0x0190;     /*301b*/
++static const USHORT SiS300_RGBSenseData2 = 0x0190;
+ static const USHORT SiS300_VideoSenseData2 = 0x0174;
+ static const USHORT SiS300_YCSenseData2 = 0x016b;
+ 
+@@ -1192,15 +829,6 @@ static const UCHAR SiS300_CR40[5][4];
+ static UCHAR SiS300_CR49[2];
+ #endif
+ 
+-static const UCHAR SiS300_NTSCPhase[]  = {0x21,0xed,0xba,0x08};  /* TW: Was {0x21,0xed,0x8a,0x08}; */
+-static const UCHAR SiS300_PALPhase[]   = {0x2a,0x05,0xe3,0x00};  /* TW: Was {0x2a,0x05,0xd3,0x00};  */
+-static const UCHAR SiS300_PALMPhase[]  = {0x21,0xE4,0x2E,0x9B};  /* palmn */
+-static const UCHAR SiS300_PALNPhase[]  = {0x21,0xF4,0x3E,0xBA};
+-static const UCHAR SiS300_NTSCPhase2[] = {0x21,0xF0,0x7B,0xD6};  /* 301b */
+-static const UCHAR SiS300_PALPhase2[]  = {0x2a,0x09,0x86,0xe9};  /* 301b */
+-static const UCHAR SiS300_PALMPhase2[] = {0x21,0xE6,0xEF,0xA4}; /* TW: palm 301b*/
+-static const UCHAR SiS300_PALNPhase2[] = {0x21,0xF6,0x94,0x46}; /* TW: paln 301b*/
+-
+ typedef struct _SiS300_PanelDelayTblStruct
+ {
+ 	UCHAR timer[2];
+@@ -1208,7 +836,7 @@ typedef struct _SiS300_PanelDelayTblStru
+ 
+ static const SiS300_PanelDelayTblStruct  SiS300_PanelDelayTbl[] =
+ {
+-	{{0x05,0xaa}}, /* TW: From 2.04.5a */
++	{{0x05,0xaa}},
+ 	{{0x05,0x14}},
+ 	{{0x05,0x36}},
+ 	{{0x05,0x14}},
+@@ -1355,309 +983,6 @@ static const SiS300_LCDDataStruct  SiS30
+ 	{    1,   1,1688,1066,1688,1066}
+ };
+ 
+-static const SiS300_LCDDataStruct  SiS300_LCD1280x960Data[] =
+-{
+-	{    9,   2, 800, 500,1800,1000},
+-	{    9,   2, 800, 500,1800,1000},
+-	{    4,   1, 900, 500,1800,1000},
+-	{    4,   1, 900, 500,1800,1000},
+-	{    9,   2, 800, 500,1800,1000},
+-	{   30,  11,1056, 625,1800,1000},
+-	{    5,   3,1350, 800,1800,1000},
+-	{    1,   1,1576,1050,1576,1050},
+-	{    1,   1,1800,1000,1800,1000}
+-};
+-
+-static const SiS300_LCDDataStruct  SiS300_ExtLCD1400x1050Data[] =  /* TW: New */
+-{
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0}
+-};
+-
+-static const SiS300_LCDDataStruct  SiS300_ExtLCD1600x1200Data[] =  /* TW: New */
+-{
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0}
+-};
+-
+-static const SiS300_LCDDataStruct  SiS300_StLCD1400x1050Data[] =  /* TW: New */
+-{
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0}
+-};
+-
+-static const SiS300_LCDDataStruct  SiS300_StLCD1600x1200Data[] =  /* TW: New */
+-{
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0}
+-};
+-
+-static const SiS300_LCDDataStruct  SiS300_NoScaleData1400x1050[] =  /* TW: New */
+-{
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0}
+-};
+-
+-static const SiS300_LCDDataStruct  SiS300_NoScaleData1600x1200[] =  /* TW: New */
+-{
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0},
+-	{    0,   0,   0,   0,   0,   0}
+-};
+-
+-
+-typedef struct _SiS300_TVDataStruct
+-{
+-	USHORT RVBHCMAX;
+-	USHORT RVBHCFACT;
+-	USHORT VGAHT;
+-	USHORT VGAVT;
+-	USHORT TVHDE;
+-	USHORT TVVDE;
+-	USHORT RVBHRS;
+-	UCHAR FlickerMode;
+-	USHORT HALFRVBHRS;
+-	UCHAR RY1COE;
+-	UCHAR RY2COE;
+-	UCHAR RY3COE;
+-	UCHAR RY4COE;
+-} SiS300_TVDataStruct;
+-
+-static const SiS300_TVDataStruct  SiS300_StPALData[] =
+-{
+-	{    1,   1, 864, 525,1270, 400, 100,   0, 760,0xf4,0xff,0x1c,0x22},
+-	{    1,   1, 864, 525,1270, 350, 100,   0, 760,0xf4,0xff,0x1c,0x22},
+-	{    1,   1, 864, 525,1270, 400,   0,   0, 720,0xf1,0x04,0x1f,0x18},
+-	{    1,   1, 864, 525,1270, 350,   0,   0, 720,0xf4,0x0b,0x1c,0x0a},
+-	{    1,   1, 864, 525,1270, 480,  50,   0, 760,0xf4,0xff,0x1c,0x22},
+-	{    1,   1, 864, 525,1270, 600,  50,   0,   0,0xf4,0xff,0x1c,0x22}
+-};
+-
+-static const SiS300_TVDataStruct  SiS300_ExtPALData[] =
+-{
+-	{   27,  10, 848, 448,1270, 530,  50,   0,  50,0xf4,0xff,0x1c,0x22},
+-	{  108,  35, 848, 398,1270, 530,  50,   0,  50,0xf4,0xff,0x1c,0x22},
+-	{   12,   5, 954, 448,1270, 530,  50,   0,  50,0xf1,0x04,0x1f,0x18},
+-	{    9,   4, 960, 463,1644, 438,  50,   0,  50,0xf4,0x0b,0x1c,0x0a},
+-	{    9,   4, 848, 528,1270, 530,   0,   0,  50,0xf5,0xfb,0x1b,0x2a},
+-	{   36,  25,1060, 648,1316, 530, 438,   0, 438,0xeb,0x05,0x25,0x16},
+-	{    3,   2,1080, 619,1270, 540, 438,   0, 438,0xf3,0x00,0x1d,0x20},
+-	{    1,   1,1170, 821,1270, 520, 686,   0, 686,0xF3,0x00,0x1D,0x20}
+-
+-};
+-
+-static const SiS300_TVDataStruct  SiS300_StNTSCData[] =
+-{
+-	{    1,   1, 858, 525,1270, 400,  50,   0, 760,0xf1,0x04,0x1f,0x18},
+-	{    1,   1, 858, 525,1270, 350,  50,   0, 640,0xf1,0x04,0x1f,0x18},
+-	{    1,   1, 858, 525,1270, 400,   0,   0, 720,0xf1,0x04,0x1f,0x18},
+-	{    1,   1, 858, 525,1270, 350,   0,   0, 720,0xf4,0x0b,0x1c,0x0a},
+-	{    1,   1, 858, 525,1270, 480,   0,   0, 760,0xf1,0x04,0x1f,0x18}
+-};
+-
+-static const SiS300_TVDataStruct  SiS300_ExtNTSCData[] =
+-{
+-	{  143,  65, 858, 443,1270, 440, 171,   0, 171,0xf1,0x04,0x1f,0x18},
+-	{   88,  35, 858, 393,1270, 440, 171,   0, 171,0xf1,0x04,0x1f,0x18},
+-	{  143,  70, 924, 443,1270, 440,  92,   0,  92,0xf1,0x04,0x1f,0x18},
+-	{  143,  70, 924, 393,1270, 440,  92,   0,  92,0xf4,0x0b,0x1c,0x0a},
+-	{  143,  76, 836, 523,1270, 440, 224,   0,   0,0xf1,0x05,0x1f,0x16},
+-	{  143, 120,1056, 643,1270, 440,   0, 128,   0,0xf4,0x10,0x1c,0x00},
+-	{  143,  76, 836, 523,1270, 440,   0, 128,   0,0xee,0x0c,0x22,0x08},
+-	{   65,  64,1056, 791,1270, 480, 638,   0,   0,0xf1,0x04,0x1f,0x18}
+-};
+-
+-#if 0
+-static const SiS300_TVDataStruct  SiS300_St1HiTVData[]=
+-{
+-  
+-};
+-#endif
+-
+-static const SiS300_TVDataStruct  SiS300_St2HiTVData[]=
+-{
+- {    3,   1, 0x348,0x1e3,0x670,0x3c0,0x032,  0, 0, 0x00,0x00,0x00,0x00},
+- {    1,   1, 0x37c,0x233,0x2b2,0x2bc, 	  0,  0, 0, 0x00,0x00,0x00,0x00},
+- {    3,   1, 0x348,0x1e3,0x670,0x3c0,0x032,  0, 0, 0x00,0x00,0x00,0x00},
+- {    1,   1, 0x3e8,0x233,0x311,0x2bc,    0,  0, 0, 0x00,0x00,0x00,0x00},
+- {    5,   2, 0x348,0x233,0x670,0x3c0,0x08d,128, 0, 0x00,0x00,0x00,0x00},
+- {    8,   5, 0x41a,0x2ab,0x670,0x3c0,0x17c,128, 0, 0x00,0x00,0x00,0x00}
+-};
+-
+-static const SiS300_TVDataStruct  SiS300_ExtHiTVData[]=
+-{
+- {    6,   1, 0x348,0x233,0x660,0x3c0,    0,  0, 0, 0x00,0x00,0x00,0x00},
+- {    3,   1, 0x3c0,0x233,0x660,0x3c0,    0,  0, 0, 0x00,0x00,0x00,0x00},
+- {    3,   1, 0x348,0x1e3,0x660,0x3c0,    0,  0, 0, 0x00,0x00,0x00,0x00},
+- {    3,   1, 0x3c0,0x233,0x660,0x3c0,    0,  0, 0, 0x00,0x00,0x00,0x00},
+- {    5,   1, 0x348,0x233,0x670,0x3c0,0x166,128, 0, 0x00,0x00,0x00,0x00},
+- {   16,   5, 0x41a,0x2ab,0x670,0x3c0,0x143,128, 0, 0x00,0x00,0x00,0x00},
+- {   25,  12, 0x4ec,0x353,0x670,0x3c0,0x032,  0, 0, 0x00,0x00,0x00,0x00},
+- {    5,   4, 0x627,0x464,0x670,0x3c0,0x128,  0, 0, 0x00,0x00,0x00,0x00},
+- {    4,   1, 0x41a,0x233,0x670,0x3c0,0x143,128, 0, 0x00,0x00,0x00,0x00},
+- {    5,   2, 0x578,0x293,0x670,0x3c0,0x032,  0, 0, 0x00,0x00,0x00,0x00},
+- {    8,   5, 0x6d6,0x323,0x670,0x3c0,0x128,  0, 0, 0x00,0x00,0x00,0x00}
+-};
+-
+-static const UCHAR SiS300_NTSCTiming[] =
+-{
+-	0x17,0x1d,0x03,0x09,0x05,0x06,0x0c,0x0c,
+-	0x94,0x49,0x01,0x0a,0x06,0x0d,0x04,0x0a,
+-	0x06,0x14,0x0d,0x04,0x0a,0x00,0x85,0x1b,
+-	0x0c,0x50,0x00,0x97,0x00,0xda,0x4a,0x17,  /* (in 2.06.50) */
+-/*	0x0c,0x50,0x00,0x99,0x00,0xec,0x4a,0x17,     (in 2.04.5a) */
+-	0x7d,0x05,0x4b,0x00,0x00,0xe2,0x00,0x02,  /* (in 2.06.50) */
+-/*	0x88,0x00,0x4b,0x00,0x00,0xe2,0x00,0x02,     (in 2.04.5a) */
+-	0x03,0x0a,0x65,0x9d,0x08,0x92,0x8f,0x40,
+-	0x60,0x80,0x14,0x90,0x8c,0x60,0x14,0x50,
+-	0x00,0x40,0x44,0x00,0xdb,0x02,0x3b,0x00
+-};
+-
+-static const UCHAR SiS300_PALTiming[] =
+-{
+-	0x19,0x52,0x35,0x6e,0x04,0x38,0x3d,0x70,
+-	0x94,0x49,0x01,0x12,0x06,0x3e,0x35,0x6d,
+-	0x06,0x14,0x3e,0x35,0x6d,0x00,0x45,0x2b,
+-        0x70,0x50,0x00,0x9b,0x00,0xd9,0x5d,0x17,  /* (in 2.06.50) */
+-/*	0x70,0x50,0x00,0x97,0x00,0xd7,0x5d,0x17,     (in 2.04.5a) */
+-	0x7d,0x05,0x45,0x00,0x00,0xe8,0x00,0x02,  /* (in 2.06.50) */
+-/*	0x88,0x00,0x45,0x00,0x00,0xe8,0x00,0x02,     (in 2.04.5a) */
+-	0x0d,0x00,0x68,0xb0,0x0b,0x92,0x8f,0x40,
+-	0x60,0x80,0x14,0x90,0x8c,0x60,0x14,0x63,
+-	0x00,0x40,0x3e,0x00,0xe1,0x02,0x28,0x00
+-};
+-
+-static const UCHAR SiS300_HiTVExtTiming[] =	 /* TW: New */
+-{
+-        0x32,0x65,0x2c,0x5f,0x08,0x31,0x3a,0x64,
+-	0x28,0x02,0x01,0x3d,0x06,0x3e,0x35,0x6d,
+-	0x06,0x14,0x3e,0x35,0x6d,0x00,0xc5,0x3f,
+-	0x64,0x90,0x33,0x8c,0x18,0x36,0x3e,0x13,
+-	0x2a,0xde,0x2a,0x44,0x40,0x2a,0x44,0x40,
+-	0x8e,0x8e,0x82,0x07,0x0b,0x92,0x0f,0x40,
+-	0x60,0x80,0x14,0x90,0x8c,0x60,0x14,0x3d,
+-	0x63,0x4f,0x27,0x00,0xfc,0xff,0x6a,0x00
+-};
+-
+-static const UCHAR SiS300_HiTVSt1Timing[] =   	/* TW: New */
+-{
+-        0x32,0x65,0x2c,0x5f,0x08,0x31,0x3a,0x65,
+-	0x28,0x02,0x01,0x3d,0x06,0x3e,0x35,0x6d,
+-	0x06,0x14,0x3e,0x35,0x6d,0x00,0xc5,0x3f,
+-	0x65,0x90,0x7b,0xa8,0x03,0xf0,0x87,0x03,
+-	0x11,0x15,0x11,0xcf,0x10,0x11,0xcf,0x10,
+-	0x35,0x35,0x3b,0x69,0x1d,0x92,0x0f,0x40,
+-	0x60,0x80,0x14,0x90,0x8c,0x60,0x04,0x86,
+-	0xaf,0x5d,0x0e,0x00,0xfc,0xff,0x2d,0x00
+-};
+-
+-static const UCHAR SiS300_HiTVSt2Timing[] =	/* TW: New */
+-{
+-        0x32,0x65,0x2c,0x5f,0x08,0x31,0x3a,0x64,
+-	0x28,0x02,0x01,0x3d,0x06,0x3e,0x35,0x6d,
+-	0x06,0x14,0x3e,0x35,0x6d,0x00,0xc5,0x3f,
+-	0x64,0x90,0x33,0x8c,0x18,0x36,0x3e,0x13,
+-	0x2a,0xde,0x2a,0x44,0x40,0x2a,0x44,0x40,
+-	0x8e,0x8e,0x82,0x07,0x0b,0x92,0x0f,0x40,
+-	0x60,0x80,0x14,0x90,0x8c,0x60,0x14,0x3d,
+-	0x63,0x4f,0x27,0x00,0xfc,0xff,0x6a,0x00
+-};
+-
+-static const UCHAR SiS300_HiTVTextTiming[] =   	/* TW: New */
+-{
+-        0x32,0x65,0x2c,0x5f,0x08,0x31,0x3a,0x65,
+-	0x28,0x02,0x01,0x3d,0x06,0x3e,0x35,0x6d,
+-	0x06,0x14,0x3e,0x35,0x6d,0x00,0xc5,0x3f,
+-	0x65,0x90,0xe7,0xbc,0x03,0x0c,0x97,0x03,
+-	0x14,0x78,0x14,0x08,0x20,0x14,0x08,0x20,
+-	0xc8,0xc8,0x3b,0xd2,0x26,0x92,0x0f,0x40,
+-        0x60,0x80,0x14,0x90,0x8c,0x60,0x04,0x96,
+-	0x72,0x5c,0x11,0x00,0xfc,0xff,0x32,0x00
+-};
+-
+-static const UCHAR SiS300_HiTVGroup3Data[] =   	/* TW: New */
+-{
+-        0x00,0x1a,0x22,0x63,0x62,0x22,0x08,0x5f,
+-	0x05,0x21,0xb2,0xb2,0x55,0x77,0x2a,0xa6,
+-	0x25,0x2f,0x47,0xfa,0xc8,0xff,0x8e,0x20,
+-	0x8c,0x6e,0x60,0x2e,0x58,0x48,0x72,0x44,
+-	0x56,0x36,0x4f,0x6e,0x3f,0x80,0x00,0x80,
+-	0x4f,0x7f,0x03,0xa8,0x7d,0x20,0x1a,0xa9,
+-	0x14,0x05,0x03,0x7e,0x64,0x31,0x14,0x75,
+-	0x18,0x05,0x18,0x05,0x4c,0xa8,0x01
+-};
+-
+-static const UCHAR SiS300_HiTVGroup3Simu[] =   	/* TW: New */
+-{
+-        0x00,0x1a,0x22,0x63,0x62,0x22,0x08,0x95,
+-	0xdb,0x20,0xb8,0xb8,0x55,0x47,0x2a,0xa6,
+-	0x25,0x2f,0x47,0xfa,0xc8,0xff,0x8e,0x20,
+-	0x8c,0x6e,0x60,0x15,0x26,0xd3,0xe4,0x11,
+-	0x56,0x36,0x4f,0x6e,0x3f,0x80,0x00,0x80,
+-	0x67,0x36,0x01,0x47,0x0e,0x10,0xbe,0xb4,
+-	0x01,0x05,0x03,0x7e,0x65,0x31,0x14,0x75,
+-	0x18,0x05,0x18,0x05,0x4c,0xa8,0x01
+-};
+-
+-static const UCHAR SiS300_HiTVGroup3Text[] =   	/* TW: New */
+-{
+-        0x00,0x1a,0x22,0x63,0x62,0x22,0x08,0xa7,
+-	0xf5,0x20,0xce,0xce,0x55,0x47,0x2a,0xa6,
+-	0x25,0x2f,0x47,0xfa,0xc8,0xff,0x8e,0x20,
+-	0x8c,0x6e,0x60,0x18,0x2c,0x0c,0x20,0x22,
+-	0x56,0x36,0x4f,0x6e,0x3f,0x80,0x00,0x80,
+-	0x93,0x3c,0x01,0x50,0x2f,0x10,0xf4,0xca,
+-	0x01,0x05,0x03,0x7e,0x65,0x31,0x14,0x75,
+-	0x18,0x05,0x18,0x05,0x4c,0xa8,0x01
+-};
+-
+ typedef struct _SiS300_LVDSDataStruct
+ {
+ 	USHORT VGAHT;
+@@ -1666,366 +991,14 @@ typedef struct _SiS300_LVDSDataStruct
+ 	USHORT LCDVT;
+ } SiS300_LVDSDataStruct;
+ 
+-static const SiS300_LVDSDataStruct  SiS300_LVDS320x480Data_1[] =
+-{
+-	{848, 433,400, 525},
+-	{848, 389,400, 525},
+-	{848, 433,400, 525},
+-	{848, 389,400, 525},
+-	{848, 518,400, 525},
+-	{1056,628,400, 525},
+-	{400, 525,400, 525},
+-	{800, 449,1000, 644},
+-	{800, 525,1000, 635}
+-};
+-
+-static const SiS300_LVDSDataStruct  SiS300_LVDS800x600Data_1[] =
+-{
+-	{848, 433,1060, 629},
+-	{848, 389,1060, 629},
+-	{848, 433,1060, 629},
+-	{848, 389,1060, 629},
+-	{848, 518,1060, 629},
+-	{1056, 628,1056, 628},
+-	{1056, 628,1056, 628},
+-	{800, 449,1000, 644},
+-	{800, 525,1000, 635}
+-};
+-
+-static const SiS300_LVDSDataStruct  SiS300_LVDS800x600Data_2[] =
+-{
+-	{1056, 628,1056, 628},
+-	{1056, 628,1056, 628},
+-	{1056, 628,1056, 628},
+-	{1056, 628,1056, 628},
+-	{1056, 628,1056, 628},
+-	{1056, 628,1056, 628},
+-	{1056, 628,1056, 628},
+-	{800, 449,1000, 644},
+-	{800, 525,1000, 635}
+-};
+-
+-static const SiS300_LVDSDataStruct  SiS300_LVDS1024x768Data_1[] =
+-{
+-	{840, 438,1344, 806},
+-	{840, 409,1344, 806},
+-	{840, 438,1344, 806},
+-	{840, 409,1344, 806},
+-	{840, 518,1344, 806},
+-	{1050, 638,1344, 806},
+-	{1344, 806,1344, 806},
+-	{800, 449,1280, 801},
+-	{800, 525,1280, 813}
+-};
+-
+-static const SiS300_LVDSDataStruct  SiS300_LVDS1024x768Data_2[] =
+-{
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{800, 449,1280, 801},
+-	{800, 525,1280, 813}
+-};
+-
+-static const SiS300_LVDSDataStruct  SiS300_LVDS1280x1024Data_1[]=  
+-{	
+-	{1048, 442,1688,1066},
+-	{1048, 392,1688,1066},
+-	{1048, 442,1688,1066},
+-	{1048, 392,1688,1066},
+-	{1048, 522,1688,1066},
+-	{1208, 642,1688,1066},
+-	{1432, 810,1688,1066},
+-	{1688,1066,1688,1066}
+-};
+-
+-static const SiS300_LVDSDataStruct  SiS300_LVDS1280x1024Data_2[]=  
+-{	
+-	{1688,1066,1688,1066},
+-	{1688,1066,1688,1066},
+-	{1688,1066,1688,1066},
+-	{1688,1066,1688,1066},
+-	{1688,1066,1688,1066},
+-	{1688,1066,1688,1066},
+-	{1688,1066,1688,1066},
+-	{1688,1066,1688,1066}
+-};
+-
+-static const SiS300_LVDSDataStruct  SiS300_LVDS1400x1050Data_1[] =   
+-{
+-        {928, 416, 1688, 1066},
+-	{928, 366, 1688, 1066},
+-	{928, 416, 1688, 1066},
+-	{928, 366, 1688, 1066},
+-	{928, 496, 1688, 1066},
+-	{1088, 616, 1688, 1066},
+-	{1312, 784, 1688, 1066},
+-	{1568, 1040, 1688, 1066},
+-	{1688, 1066, 1688, 1066}
+-};
+-
+-static const SiS300_LVDSDataStruct  SiS300_LVDS1400x1050Data_2[] =  
+-{
+-        {1688,1066, 1688,1066},
+-	{1688,1066, 1688,1066},
+-	{1688,1066, 1688,1066},
+-	{1688,1066, 1688,1066},
+-	{1688,1066, 1688,1066},
+-	{1688,1066, 1688,1066},
+-	{1688,1066, 1688,1066},
+-	{1688,1066, 1688,1066},
+-	{1688,1066, 1688,1066},
+-};
+-
+-static const SiS300_LVDSDataStruct  SiS300_LVDS1600x1200Data_1[]=  
+-{
+-        {1088, 450, 2048,1250},
+-	{1088, 400, 2048,1250},
+-	{1088, 450, 2048,1250},
+-	{1088, 400, 2048,1250},
+-	{1088, 530, 2048,1250},
+-	{1248, 650, 2048,1250},
+-	{1472, 818, 2048,1250},
+-	{1728,1066, 2048,1250},
+-	{1848,1066, 2048,1250},
+-	{2048,1250, 2048,1250}
+-};
+-
+-static const SiS300_LVDSDataStruct  SiS300_LVDS1600x1200Data_2[]= 
+-{
+-        {2048,1250, 2048,1250},
+-	{2048,1250, 2048,1250},
+-	{2048,1250, 2048,1250},
+-	{2048,1250, 2048,1250},
+-	{2048,1250, 2048,1250},
+-	{2048,1250, 2048,1250},
+-	{2048,1250, 2048,1250},
+-	{2048,1250, 2048,1250},
+-	{2048,1250, 2048,1250},
+-	{2048,1250, 2048,1250}
+-};
+-
+-static const SiS300_LVDSDataStruct  SiS300_LVDS1280x768Data_1[]= 
+-{	
+-	{ 768, 438, 1408, 806},
+-	{ 768, 388, 1408, 806},
+-	{ 768, 438, 1408, 806},
+-	{ 768, 388, 1408, 806},
+-	{ 768, 518, 1408, 806},
+-	{ 928, 638, 1408, 806},
+-	{1152, 806, 1408, 806},
+-	{1408, 806, 1408, 806},
+-	{1408, 806, 1408, 806}
+-};
+-
+-static const SiS300_LVDSDataStruct  SiS300_LVDS1280x768Data_2[]=  
+-{	
+-	{1408, 806, 1408, 806},
+-	{1408, 806, 1408, 806},
+-	{1408, 806, 1408, 806},
+-	{1408, 806, 1408, 806},
+-	{1408, 806, 1408, 806},
+-	{1408, 806, 1408, 806},
+-	{1408, 806, 1408, 806},
+-	{1408, 806, 1408, 806},
+-	{1408, 806, 1408, 806}
+-};
+-
+-static const SiS300_LVDSDataStruct  SiS300_LVDS1024x600Data_1[] =
+-{
+-	{840, 604,1344, 800},
+-	{840, 560,1344, 800},
+-	{840, 604,1344, 800},
+-	{840, 560,1344, 800},
+-	{840, 689,1344, 800},
+-	{1050, 800,1344, 800},
+-	{1344, 800,1344, 800},
+-	{800, 449,1280, 789},
+-	{800, 525,1280, 785}
+-};
+-
+-static const SiS300_LVDSDataStruct  SiS300_LVDS1024x600Data_2[] =
+-{
+-	{1344, 800,1344, 800},
+-	{1344, 800,1344, 800},
+-	{1344, 800,1344, 800},
+-	{1344, 800,1344, 800},
+-	{1344, 800,1344, 800},
+-	{1344, 800,1344, 800},
+-	{1344, 800,1344, 800},
+-	{800, 449,1280, 801},
+-	{800, 525,1280, 813}
+-};
+-
+-static const SiS300_LVDSDataStruct  SiS300_LVDS1152x768Data_1[] =
+-{
+-	{840, 438,1344, 806},
+-	{840, 409,1344, 806},
+-	{840, 438,1344, 806},
+-	{840, 409,1344, 806},
+-	{840, 518,1344, 806},
+-	{1050, 638,1344, 806},
+-	{1344, 806,1344, 806},
+-	{800, 449,1280, 801},
+-	{800, 525,1280, 813}
+-};
+-
+-static const SiS300_LVDSDataStruct  SiS300_LVDS1152x768Data_2[] =
+-{
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{800, 449,1280, 801},
+-	{800, 525,1280, 813}
+-};
+-
+-/* TW: pass 1:1 data */
+-static const SiS300_LVDSDataStruct  SiS300_LVDSXXXxXXXData_1[]=  
+-{
+-        { 800, 449,  800, 449},
+-	{ 800, 449,  800, 449},
+-	{ 900, 449,  900, 449},
+-	{ 900, 449,  900, 449},
+-	{ 800, 525,  800, 525},  /*  640x480   */
+-	{1056, 628, 1056, 628},  /*  800x600   */
+-	{1344, 806, 1344, 806},  /* 1024x768   */
+-	{1344,1066, 1344,1066},  /* 1280x1024  */  /* INSERTED ! */
+- 	{1688, 806, 1688, 806},  /* 1280x768 ! */
+-	/* No other panels ! */
+-};
+-
+-static const SiS300_LVDSDataStruct  SiS300_LVDS640x480Data_1[] =
+-{
+-	{800, 449, 800, 449},
+-	{800, 449, 800, 449},
+-	{800, 449, 800, 449},
+-	{800, 449, 800, 449},
+-	{800, 525, 800, 525},
+-	{1056, 628,1056, 628},
+-	{1056, 628,1056, 628},
+-	{1056, 628,1056, 628},
+-	{1056, 628,1056, 628}
+-};
+-
+-static const SiS300_LVDSDataStruct  SiS300_LVDS1280x960Data_1[] =   /* TW: New */
+-{
+-	{840, 438,1344, 806},
+-	{840, 409,1344, 806},
+-	{840, 438,1344, 806},
+-	{840, 409,1344, 806},
+-	{840, 518,1344, 806},
+-	{1050, 638,1344, 806},
+-	{1344, 806,1344, 806},
+-	{800, 449,1280, 801},
+-	{800, 525,1280, 813}
+-};
+-
+-static const SiS300_LVDSDataStruct  SiS300_LVDS1280x960Data_2[] =   /* TW: New */
+-{
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{800, 449,1280, 801},
+-	{800, 525,1280, 813}
+-};
+-
+-static const SiS300_LVDSDataStruct  SiS300_LCDA1400x1050Data_1[] =   /* TW: New */
+-{	/* TW: Might be temporary (invalid) data */
+-        {928, 416, 1688, 1066},
+-	{928, 366, 1688, 1066},
+-	{1008, 416, 1688, 1066},
+-	{1008, 366, 1688, 1066},
+-	{1200, 530, 1688, 1066},
+-	{1088, 616, 1688, 1066},
+-	{1312, 784, 1688, 1066},
+-	{1568, 1040, 1688, 1066},
+-	{1688, 1066, 1688, 1066}
+-};
+-
+-static const SiS300_LVDSDataStruct  SiS300_LCDA1400x1050Data_2[] =   /* TW: New */
+-{	/* TW: Temporary data. Not valid */
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{800, 449,1280, 801},
+-	{800, 525,1280, 813}
+-};
+-
+-static const SiS300_LVDSDataStruct  SiS300_LCDA1600x1200Data_1[] =   /* TW: New */
+-{	/* TW: Temporary data. Not valid */
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{800, 449,1280, 801},
+-	{800, 525,1280, 813}
+-};
+-
+-static const SiS300_LVDSDataStruct  SiS300_LCDA1600x1200Data_2[] =   /* TW: New */
+-{	/* TW: Temporary data. Not valid */
+-	{0, 0, 0, 0},
+-	{0, 0, 0, 0},
+-	{0, 0, 0, 0},
+-	{0, 0, 0, 0},
+-	{0, 0, 0, 0},
+-	{0, 0, 0, 0},
+-	{0, 0, 0, 0},
+-	{0, 0, 0, 0},
+-	{0, 0, 0, 0},
+-	{0, 0, 0, 0},
+-	{0, 0, 0, 0},
+-	{0, 0, 0, 0}
+-};
+-
+-
+-/* TW: New: */
+-static const SiS300_LVDSDataStruct  SiS300_CHTVUNTSCData[] =
+-{
+-	{840, 600, 840, 600},
+-	{840, 600, 840, 600},
+-	{840, 600, 840, 600},
+-	{840, 600, 840, 600},
+-	{784, 600, 784, 600},
+-	{1064, 750,1064, 750}
+-};
+-
+-static const SiS300_LVDSDataStruct  SiS300_CHTVONTSCData[] =
+-{
+-	{840, 525, 840, 525},
+-	{840, 525, 840, 525},
+-	{840, 525, 840, 525},
+-	{840, 525, 840, 525},
+-	{784, 525, 784, 525},
+-	{1040, 700,1040, 700}
+-};
+-
+ static const SiS300_LVDSDataStruct  SiS300_CHTVUPALData[] =
+ {
+ 	{1008, 625,1008, 625},
+ 	{1008, 625,1008, 625},
+ 	{1008, 625,1008, 625},
+ 	{1008, 625,1008, 625},
+-	{840, 750, 840, 750},
+-	{936, 836, 936, 836}
++	{ 840, 750, 840, 750},
++	{ 936, 836, 936, 836}
+ };
+ 
+ static const SiS300_LVDSDataStruct  SiS300_CHTVOPALData[] =
+@@ -2034,8 +1007,8 @@ static const SiS300_LVDSDataStruct  SiS3
+ 	{1008, 625,1008, 625},
+ 	{1008, 625,1008, 625},
+ 	{1008, 625,1008, 625},
+-	{840, 625, 840, 625},
+-	{960, 750, 960, 750}
++	{ 840, 625, 840, 625},
++	{ 960, 750, 960, 750}
+ };
+ 
+ static const SiS300_LVDSDataStruct  SiS300_CHTVSOPALData[] =
+@@ -2044,12 +1017,10 @@ static const SiS300_LVDSDataStruct  SiS3
+ 	{1008, 625,1008, 625},
+ 	{1008, 625,1008, 625},
+ 	{1008, 625,1008, 625},
+-	{840, 500, 840, 500},
+-	{944, 625, 944, 625}
++	{ 840, 500, 840, 500},
++	{ 944, 625, 944, 625}
+ };
+ 
+-/* TW: new end */
+-
+ typedef struct _SiS300_LVDSDesStruct
+ {
+ 	USHORT LCDHDES;
+@@ -2058,57 +1029,90 @@ typedef struct _SiS300_LVDSDesStruct
+ 
+ static const SiS300_LVDSDesStruct  SiS300_PanelType00_1[] =
+ {
++	{ 1059, 626 },   /* 2.08 */
++	{ 1059, 624 },
++	{ 1059, 626 },
++	{ 1059, 624 },
++	{ 1059, 624 },
++	{    0, 627 },
++	{    0, 627 },
++	{    0,   0 },
++	{    0,   0 }
++#if 0
+ 	{0, 626},
+ 	{0, 624},
+ 	{0, 626},
+ 	{0, 624},
+ 	{0, 624},
+-	{ 0, 627},
+-	{ 0, 627},
+-	{ 0,   0},
+-	{ 0,   0}
++	{0, 627},
++	{0, 627},
++	{0,   0},
++	{0,   0}
++#endif
+ };
+ 
+ static const SiS300_LVDSDesStruct  SiS300_PanelType01_1[] =
+ {
++	{   0,   0 },  /* 2.08 */
++	{   0,   0 },
++	{   0,   0 },
++	{   0,   0 },
++	{   0,   0 },
++	{   0,   0 },
++	{   0,   0 },
++	{   0,   0 },
++	{   0,   0 }
++#if 0
+ 	{1343, 798},
+ 	{1343, 794},
+ 	{1343, 798},
+ 	{1343, 794},
+ 	{1343,   0},
+ 	{1343,   0},
+-	{ 0, 805},
+-	{ 0, 794},
+-	{ 0,   0}
++	{   0, 805},
++	{   0, 794},
++	{   0,   0}
++#endif
+ };
+ 
+ static const SiS300_LVDSDesStruct  SiS300_PanelType02_1[] =
+ {
++	{ 1059, 626 },  /* 2.08 */
++	{ 1059, 624 },
++	{ 1059, 626 },
++	{ 1059, 624 },
++	{ 1059, 624 },
++	{    0, 627 },
++	{    0, 627 },
++	{    0,   0 },
++	{    0,   0 }
++#if 0
+ 	{0, 626},
+ 	{0, 624},
+ 	{0, 626},
+ 	{0, 624},
+ 	{0, 624},
+-	{ 0, 627},
+-	{ 0, 627},
+-	{ 0,   0},
+-	{ 0,   0}
++	{0, 627},
++	{0, 627},
++	{0,   0},
++	{0,   0}
++#endif
+ };
+ 
+ static const SiS300_LVDSDesStruct  SiS300_PanelType03_1[] =
+ {
+-	{ 8, 436},
+-	{ 8, 440},
+-	{ 8, 436},
+-	{ 8, 440},
+-	{ 8, 512},
++	{   8, 436},
++	{   8, 440},
++	{   8, 436},
++	{   8, 440},
++	{   8, 512},
+ 	{1343, 798},
+ 	{1343, 794},
+ 	{1343, 798},
+ 	{1343, 794}
+ };
+ 
+-static const SiS300_LVDSDesStruct  SiS300_PanelType04_1[] =
++static const SiS300_LVDSDesStruct  SiS300_PanelType04_1[] =	/* 1280x1024 */
+ {
+ 	{1343, 798},
+ 	{1343, 794},
+@@ -2116,9 +1120,9 @@ static const SiS300_LVDSDesStruct  SiS30
+ 	{1343, 794},
+ 	{1343,   0},
+ 	{1343,   0},
+-	{ 0, 805},
+-	{ 0, 794},
+-	{ 0,   0}
++	{   0, 805},
++	{   0, 794},
++	{   0,   0}
+ };
+ 
+ static const SiS300_LVDSDesStruct  SiS300_PanelType05_1[] =
+@@ -2129,9 +1133,9 @@ static const SiS300_LVDSDesStruct  SiS30
+ 	{1343, 794},
+ 	{1343,   0},
+ 	{1343,   0},
+-	{ 0, 805},
+-	{ 0, 794},
+-	{ 0,   0}
++	{   0, 805},
++	{   0, 794},
++	{   0,   0}
+ };
+ 
+ static const SiS300_LVDSDesStruct  SiS300_PanelType06_1[] =
+@@ -2142,9 +1146,9 @@ static const SiS300_LVDSDesStruct  SiS30
+ 	{1343, 794},
+ 	{1343,   0},
+ 	{1343,   0},
+-	{ 0, 805},
+-	{ 0, 794},
+-	{ 0,   0}
++	{   0, 805},
++	{   0, 794},
++	{   0,   0}
+ };
+ 
+ static const SiS300_LVDSDesStruct  SiS300_PanelType07_1[] =
+@@ -2155,9 +1159,9 @@ static const SiS300_LVDSDesStruct  SiS30
+ 	{1343, 794},
+ 	{1343,   0},
+ 	{1343,   0},
+-	{ 0, 805},
+-	{ 0, 794},
+-	{ 0,   0}
++	{   0, 805},
++	{   0, 794},
++	{   0,   0}
+ };
+ 
+ static const SiS300_LVDSDesStruct  SiS300_PanelType08_1[] =
+@@ -2167,10 +1171,10 @@ static const SiS300_LVDSDesStruct  SiS30
+ 	{1059, 626},
+ 	{1059, 624},
+ 	{1059, 624},
+-	{ 0, 627},
+-	{ 0, 627},
+-	{ 0,   0},
+-	{ 0,   0}
++	{   0, 627},
++	{   0, 627},
++	{   0,   0},
++	{   0,   0}
+ };
+ 
+ static const SiS300_LVDSDesStruct  SiS300_PanelType09_1[] =
+@@ -2181,9 +1185,9 @@ static const SiS300_LVDSDesStruct  SiS30
+ 	{1343, 794},
+ 	{1343,   0},
+ 	{1343,   0},
+-	{ 0, 805},
+-	{ 0, 794},
+-	{ 0,   0}
++	{   0, 805},
++	{   0, 794},
++	{   0,   0}
+ };
+ 
+ static const SiS300_LVDSDesStruct  SiS300_PanelType0a_1[] =
+@@ -2193,23 +1197,23 @@ static const SiS300_LVDSDesStruct  SiS30
+ 	{1059, 626},
+ 	{1059, 624},
+ 	{1059, 624},
+-	{ 0, 627},
+-	{ 0, 627},
+-	{ 0,   0},
+-	{ 0,   0}
++	{   0, 627},
++	{   0, 627},
++	{   0,   0},
++	{   0,   0}
+ };
+ 
+ static const SiS300_LVDSDesStruct  SiS300_PanelType0b_1[] =
+ {
+-	{1343, 0},
+-	{1343, 0},
+-	{1343, 0},
+-	{1343, 0},
+-	{1343, 0},   /* 640x480 - BIOS 1343, 0 */
+-	{1343, 0},
+-	{ 0, 799},
+-	{ 0, 0},
+-	{ 0, 0}
++	{1343,   0},
++	{1343,   0},
++	{1343,   0},
++	{1343,   0},
++	{1343,   0},
++	{1343,   0},
++	{   0, 799},
++	{   0,   0},
++	{   0,   0}
+ };
+ 
+ static const SiS300_LVDSDesStruct  SiS300_PanelType0c_1[] =
+@@ -2220,9 +1224,9 @@ static const SiS300_LVDSDesStruct  SiS30
+ 	{1343, 794},
+ 	{1343,   0},
+ 	{1343,   0},
+-	{ 0, 805},
+-	{ 0, 794},
+-	{ 0,   0}
++	{   0, 805},
++	{   0, 794},
++	{   0,   0}
+ };
+ 
+ static const SiS300_LVDSDesStruct  SiS300_PanelType0d_1[] =
+@@ -2233,9 +1237,9 @@ static const SiS300_LVDSDesStruct  SiS30
+ 	{1343, 794},
+ 	{1343,   0},
+ 	{1343,   0},
+-	{ 0, 805},
+-	{ 0, 794},
+-	{ 0,   0}
++	{   0, 805},
++	{   0, 794},
++	{   0,   0}
+ };
+ 
+ static const SiS300_LVDSDesStruct  SiS300_PanelType0e_1[] =
+@@ -2244,11 +1248,11 @@ static const SiS300_LVDSDesStruct  SiS30
+ 	{1343, 794},
+ 	{1343, 798},
+ 	{1343, 794},
+-	{1343,   0},  /* 640x480 */
+-	{1343,   0},  /* 800x600 */
+-	{ 0, 805},    /* 1024x768 */
+-	{ 0, 794},    /* 1280x1024 */
+-	{ 0,   0}     /* 1280x960 - not applicable */
++	{1343,   0},    /* 640x480 */
++	{1343,   0},    /* 800x600 */
++	{   0, 805},    /* 1024x768 */
++	{   0, 794},    /* 1280x1024 */
++	{   0,   0}     /* 1280x960 - not applicable */
+ };
+ 
+ static const SiS300_LVDSDesStruct  SiS300_PanelType0f_1[] =
+@@ -2259,9 +1263,9 @@ static const SiS300_LVDSDesStruct  SiS30
+ 	{1343, 794},
+ 	{1343,   0},
+ 	{1343,   0},
+-	{ 0, 805},
+-	{ 0, 794},
+-	{ 0,   0}
++	{   0, 805},
++	{   0, 794},
++	{   0,   0}
+ };
+ 
+ static const SiS300_LVDSDesStruct  SiS300_PanelType00_2[] =
+@@ -2271,10 +1275,10 @@ static const SiS300_LVDSDesStruct  SiS30
+ 	{976, 527},
+ 	{976, 502},
+ 	{976, 567},
+-	{ 0, 627},
+-	{ 0, 627},
+-	{ 0,   0},
+-	{ 0,   0}
++	{  0, 627},
++	{  0, 627},
++	{  0,   0},
++	{  0,   0}
+ };
+ 
+ static const SiS300_LVDSDesStruct  SiS300_PanelType01_2[] =
+@@ -2285,9 +1289,9 @@ static const SiS300_LVDSDesStruct  SiS30
+ 	{1152, 597},
+ 	{1152, 662},
+ 	{1232, 722},
+-	{ 0, 805},
+-	{ 0, 794},
+-	{ 0,   0}
++	{   0, 805},
++	{   0, 794},
++	{   0,   0}
+ };
+ 
+ static const SiS300_LVDSDesStruct  SiS300_PanelType02_2[] =
+@@ -2297,10 +1301,10 @@ static const SiS300_LVDSDesStruct  SiS30
+ 	{976, 527},
+ 	{976, 502},
+ 	{976, 567},
+-	{ 0, 627},
+-	{ 0, 627},
+-	{ 0,   0},
+-	{ 0,   0}
++	{  0, 627},
++	{  0, 627},
++	{  0,   0},
++	{  0,   0}
+ };
+ 
+ static const SiS300_LVDSDesStruct  SiS300_PanelType03_2[] =
+@@ -2472,156 +1476,57 @@ static const SiS300_LVDSDesStruct  SiS30
+  	{   0,   0}
+ };
+ 
+-static const SiS300_LVDSDesStruct  SiS300_PanelTypeNS_1[]= 
++/* Custom data for Barco iQ R200/300/400 (BIOS 2.00.07) */
++static const SiS300_LVDSDesStruct  SiS300_PanelType04_1a[] =	/* 1280x1024 (1366x1024) */
+ {
+-	{ 8,   0},
+-	{ 8,   0},
+-	{ 8,   0},
+-	{ 8,   0},
+-	{ 8,   0},
+-	{ 0,   0},
+-	{ 0,   0},
+-	{ 0,   0},
+-	{ 0, 806},
+-	{ 0, 0 }
+-};
+-
+-static const SiS300_LVDSDesStruct  SiS300_PanelTypeNS_2[] = 
+-{
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0}
+-};
+-
+-static const SiS300_LVDSDesStruct SiS300_PanelType1076_1[] =   /* TW: New */
+-{
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0}
+-};
+-
+-static const SiS300_LVDSDesStruct SiS300_PanelType1076_2[] =   /* TW: New */
+-{
+-	{ 1152, 622 },
+-	{ 1152, 597 },
+-	{ 1152, 622 },
+-	{ 1152, 597 },
+-	{ 1152, 622 },
+-	{ 1232, 722 },
+-	{    0, 0   },
+-	{    0, 794 },
+-	{    0, 0   }
+-};
+-
+-static const SiS300_LVDSDesStruct SiS300_PanelType1210_1[] =   /* TW: New */
+-{
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0}
+-};
+-
+-static const SiS300_LVDSDesStruct SiS300_PanelType1210_2[] =   /* TW: New */
+-{
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0}
+-};
+-
+-static const SiS300_LVDSDesStruct SiS300_PanelType1296_1[] =   /* TW: New */
+-{
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0}
+-};
+-
+-static const SiS300_LVDSDesStruct SiS300_PanelType1296_2[] =   /* TW: New */
+-{
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0}
+-};
+-
+-
+-/* TW: New */
+-static const SiS300_LVDSDesStruct  SiS300_CHTVUNTSCDesData[] =
+-{
+- 	{ 0,   0},
+- 	{ 0,   0},
+- 	{ 0,   0},
+- 	{ 0,   0},
+- 	{ 0,   0},
+- 	{ 0,   0}
+-};
+-
+-static const SiS300_LVDSDesStruct  SiS300_CHTVONTSCDesData[] =
+-{
+- 	{ 0,   0},
+- 	{ 0,   0},
+- 	{ 0,   0},
+- 	{ 0,   0},
+- 	{ 0,   0},
+- 	{ 0,   0}
+-};
+-
+-static const SiS300_LVDSDesStruct  SiS300_CHTVUPALDesData[] =
+-{
+- 	{256,   0},
+- 	{256,   0},
+- 	{256,   0},
+- 	{256,   0},
+- 	{  0,   0},
+- 	{  0,   0}
++	{1330, 798},  /* 320x200 */
++	{1330, 794},
++	{1330, 798},
++	{1330, 794},
++	{1330,   0},  /* 640x480 / 320x240  */
++	{1343,   0},  /* 800x600 / 400x300  */
++	{   0, 805},  /* 1024x768 / 512x384 */
++	{1688,1066},  /* 1280x1024          */
++	{   0,   0}   /* 1360x1024          */
+ };
+ 
+-static const SiS300_LVDSDesStruct  SiS300_CHTVOPALDesData[] =
++static const SiS300_LVDSDesStruct  SiS300_PanelType04_2a[] =
+ {
+- 	{256,   0},
+- 	{256,   0},
+- 	{256,   0},
+- 	{256,   0},
+- 	{  0,   0},
+- 	{  0,   0}
++	{1152, 622},
++	{1152, 597},
++	{1152, 622},
++	{1152, 597},
++	{1152, 662},
++	{1232, 722},
++	{   0, 805},
++	{1688,1066},
++	{   0,   0}
++};
++
++/* Custom data for Barco iQ G200/300/400 (BIOS 2.00.07) */
++static const SiS300_LVDSDesStruct  SiS300_PanelType04_1b[] =	/* 1024x768 */
++{
++	{1330, 798},  /* 320x200 */
++	{1330, 794},
++	{1330, 798},
++	{1330, 794},
++	{1330,   0},  /* 640x480 / 320x240  */
++	{1343,   0},  /* 800x600 / 400x300  */
++	{   0, 805}   /* 1024x768 / 512x384 */
++};
++
++static const SiS300_LVDSDesStruct  SiS300_PanelType04_2b[] =
++{
++	{1152, 622},
++	{1152, 597},
++	{1152, 622},
++	{1152, 597},
++	{1152, 662},
++	{1232, 722},
++	{   0, 805}
+ };
+-/* TW: New end */
+ 
+-/* TW: New for SiS300+301LV */
++
+ typedef struct _SiS300_Part2PortTblStruct
+ {
+  	UCHAR CR[12];
+@@ -2726,6 +1631,28 @@ static const SiS300_LVDSCRT1DataStruct  
+ 	  0x01 }}
+ };
+ 
++static const SiS300_LVDSCRT1DataStruct  SiS300_LVDSCRT1800x600_1_H[] =
++{
++	{{0x30,0x27,0x94,0x2c,0x92,0xaf,0x1f,
++	  0x90,0x85,0x8f,0xab,0x30,0x00,0x04,
++	  0x00 }},
++	{{0x30,0x27,0x94,0x2c,0x92,0x83,0x1f,
++	  0x5e,0x83,0x5d,0x79,0x10,0x00,0x04,
++	  0x00 }},
++	{{0x30,0x27,0x94,0x2c,0x92,0xaf,0x1f,
++	  0x90,0x85,0x8f,0xab,0x30,0x00,0x04,
++	  0x00 }},
++	{{0x30,0x27,0x94,0x2c,0x92,0x83,0x1f,
++	  0x5e,0x83,0x5d,0x79,0x10,0x00,0x04,
++	  0x00 }},
++	{{0x30,0x27,0x94,0x2c,0x92,0x04,0x3e,
++	  0xe0,0x85,0xdf,0xfb,0x10,0x00,0x04,
++	  0x00 }},
++	{{0x3d,0x31,0x81,0x37,0x1f,0x72,0xf0,
++	  0x58,0x8c,0x57,0x73,0x20,0x00,0x05,
++	  0x01 }}
++};
++
+ static const SiS300_LVDSCRT1DataStruct  SiS300_LVDSCRT11024x768_1[] =
+ { 
+ 	{{0x64,0x4f,0x88,0x54,0x9f,0xc4,0x1f,
+@@ -2751,55 +1678,31 @@ static const SiS300_LVDSCRT1DataStruct  
+ 	  0x01}}
+ };
+ 
+-static const SiS300_LVDSCRT1DataStruct  SiS300_LVDSCRT11280x1024_1[] =
+-{
+-	{{0x63,0x4f,0x87,0x54,0x9f,0xb4,0x1f,
+-	  0x92,0x89,0x8f,0xb5,0x30,0x00,0x01,
+-	  0x00 }},
+-	{{0x63,0x4f,0x87,0x54,0x9f,0x82,0x1f,
+-	  0x60,0x87,0x5d,0x83,0x10,0x00,0x01,
+-	  0x00 }},
+-	{{0x63,0x4f,0x87,0x54,0x9f,0xb4,0x1f,
+-	  0x92,0x89,0x8f,0xb5,0x30,0x00,0x01,
+-	  0x00 }},
+-	{{0x63,0x4f,0x87,0x54,0x9f,0x82,0x1f,
+-	  0x60,0x87,0x5d,0x83,0x10,0x00,0x01,
+-	  0x00 }},
+-	{{0x63,0x4f,0x87,0x54,0x9f,0x04,0x3e,
+-	  0xe2,0x89,0xdf,0x05,0x00,0x00,0x01,
+-	  0x00 }},
+-	{{0x7e,0x63,0x82,0x68,0x15,0x7c,0xf0,
+-	  0x5a,0x8f,0x57,0x7d,0x20,0x00,0x26,
+-	  0x01 }},
+-	{{0xa3,0x7f,0x87,0x86,0x97,0x24,0xf5,
+-	  0x02,0x88,0xff,0x25,0x10,0x00,0x02,
+-	  0x01 }}
+-};
+-
+-static const SiS300_LVDSCRT1DataStruct  SiS300_LVDSCRT1800x600_1_H[] =
++static const SiS300_LVDSCRT1DataStruct  SiS300_LVDSCRT11024x768_1_H[] =
+ {
+-	{{0x30,0x27,0x94,0x2c,0x92,0xaf,0x1f,
+-	  0x90,0x85,0x8f,0xab,0x30,0x00,0x04,
+-	  0x00 }},
+-	{{0x30,0x27,0x94,0x2c,0x92,0x83,0x1f,
+-	  0x5e,0x83,0x5d,0x79,0x10,0x00,0x04,
+-	  0x00 }},
+-	{{0x30,0x27,0x94,0x2c,0x92,0xaf,0x1f,
+-	  0x90,0x85,0x8f,0xab,0x30,0x00,0x04,
+-	  0x00 }},
+-	{{0x30,0x27,0x94,0x2c,0x92,0x83,0x1f,
+-	  0x5e,0x83,0x5d,0x79,0x10,0x00,0x04,
+-	  0x00 }},
+-	{{0x30,0x27,0x94,0x2c,0x92,0x04,0x3e,
+-	  0xe0,0x85,0xdf,0xfb,0x10,0x00,0x04,
++	{{0x2f,0x27,0x93,0x2b,0x90,0xc4,0x1f,
++	  0x92,0x89,0x8f,0xb5,0x30,0x00,0x44,
+ 	  0x00 }},
+-	{{0x3d,0x31,0x81,0x37,0x1f,0x72,0xf0,
+-	  0x58,0x8c,0x57,0x73,0x20,0x00,0x05,
++	{{0x2f,0x27,0x93,0x2b,0x90,0x97,0x1f,
++	  0x60,0x87,0x5D,0x83,0x10,0x00,0x44,
++	  0x00}},
++	{{0x2f,0x27,0x93,0x2b,0x90,0xc4,0x1f,
++	  0x92,0x89,0x8f,0xb5,0x30,0x00,0x44,
++	  0x00}},
++	{{0x2f,0x27,0x93,0x2b,0x90,0x97,0x1f,
++	  0x60,0x87,0x5D,0x83,0x10,0x00,0x44,
++	  0x00}},
++	{{0x2f,0x27,0x93,0x2b,0x90,0x04,0x3e,
++	  0xE2,0x89,0xdf,0x05,0x00,0x00,0x44,
++	  0x00}},
++	{{0x3c,0x31,0x80,0x35,0x1c,0x7c,0xf0,
++	  0x5A,0x8F,0x57,0x7D,0x20,0x00,0x55,
++	  0x01}},
++	{{0x4f,0x3F,0x93,0x45,0x0D,0x24,0xf5,
++	  0x02,0x88,0xff,0x25,0x10,0x00,0x01,
+ 	  0x01 }}
+-};
+ 
+-static const SiS300_LVDSCRT1DataStruct  SiS300_LVDSCRT11024x768_1_H[] =
+-{
++#if 0
+ 	{{0x37,0x27,0x9B,0x2b,0x94,0xc4,0x1f,
+ 	  0x92,0x89,0x8f,0xb5,0x30,0x00,0x44,
+ 	  0x00 }},
+@@ -2821,6 +1724,32 @@ static const SiS300_LVDSCRT1DataStruct  
+ 	{{0x4f,0x3F,0x93,0x45,0x0D,0x24,0xf5,
+ 	  0x02,0x88,0xFf,0x25,0x10,0x00,0x01,
+ 	  0x01 }}
++#endif
++};
++
++static const SiS300_LVDSCRT1DataStruct  SiS300_LVDSCRT11280x1024_1[] =
++{
++	{{0x63,0x4f,0x87,0x54,0x9f,0xb4,0x1f,
++	  0x92,0x89,0x8f,0xb5,0x30,0x00,0x01,
++	  0x00 }},
++	{{0x63,0x4f,0x87,0x54,0x9f,0x82,0x1f,
++	  0x60,0x87,0x5d,0x83,0x10,0x00,0x01,
++	  0x00 }},
++	{{0x63,0x4f,0x87,0x54,0x9f,0xb4,0x1f,
++	  0x92,0x89,0x8f,0xb5,0x30,0x00,0x01,
++	  0x00 }},
++	{{0x63,0x4f,0x87,0x54,0x9f,0x82,0x1f,
++	  0x60,0x87,0x5d,0x83,0x10,0x00,0x01,
++	  0x00 }},
++	{{0x63,0x4f,0x87,0x54,0x9f,0x04,0x3e,
++	  0xe2,0x89,0xdf,0x05,0x00,0x00,0x01,
++	  0x00 }},
++	{{0x7e,0x63,0x82,0x68,0x15,0x7c,0xf0,
++	  0x5a,0x8f,0x57,0x7d,0x20,0x00,0x26,
++	  0x01 }},
++	{{0xa3,0x7f,0x87,0x86,0x97,0x24,0xf5,
++	  0x02,0x88,0xff,0x25,0x10,0x00,0x02,
++	  0x01 }}
+ };
+ 
+ static const SiS300_LVDSCRT1DataStruct  SiS300_LVDSCRT11280x1024_1_H[] =
+@@ -2870,32 +1799,29 @@ static const SiS300_LVDSCRT1DataStruct  
+ 	  0x01 }}
+ };
+ 
+-static const SiS300_LVDSCRT1DataStruct  SiS300_LVDSCRT11024x768_2[] =
++static const SiS300_LVDSCRT1DataStruct  SiS300_LVDSCRT1800x600_2_H[] =
+ {
+-	{{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+-	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x06,
++	{{0x3d,0x27,0x81,0x32,0x1a,0x72,0x3e,
++	  0xf4,0x88,0x8f,0x73,0x20,0x00,0x05,
+ 	  0x00 }},
+-	{{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+-	  0x31,0x87,0x5d,0x25,0x30,0x00,0x06,
++	{{0x3d,0x27,0x81,0x32,0x1a,0x72,0x3e,
++	  0xdb,0x8f,0x5d,0x73,0x20,0x00,0x05,
+ 	  0x00 }},
+-	{{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+-	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x06,
++	{{0x3d,0x27,0x81,0x32,0x1a,0x72,0x3e,
++	  0xf4,0x88,0x8f,0x73,0x20,0x00,0x05,
+ 	  0x00 }},
+-	{{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+-	  0x31,0x87,0x5d,0x25,0x30,0x00,0x06,
++	{{0x3d,0x27,0x81,0x3a,0x1a,0x72,0x3e,
++	  0xdb,0x8f,0x5d,0x73,0x20,0x00,0x05,
+ 	  0x00 }},
+-	{{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+-	  0x72,0x88,0xdf,0x25,0x30,0x00,0x06,
++	{{0x3d,0x27,0x81,0x32,0x1a,0x72,0xba,
++	  0x1c,0x80,0xdf,0x73,0x00,0x00,0x05,
+ 	  0x00 }},
+-	{{0xa3,0x63,0x87,0x78,0x89,0x24,0xf1,
+-	  0xae,0x84,0x57,0x25,0x30,0x00,0x02,
+-	  0x01 }},
+-	{{0xa3,0x7f,0x87,0x86,0x97,0x24,0xf5,
+-	  0x02,0x88,0xff,0x25,0x10,0x00,0x02,
++	{{0x3d,0x31,0x81,0x37,0x1f,0x72,0xf0,
++	  0x58,0x8c,0x57,0x73,0x20,0x00,0x05,
+ 	  0x01 }}
+ };
+ 
+-static const SiS300_LVDSCRT1DataStruct  SiS300_LVDSCRT11280x1024_2[] =
++static const SiS300_LVDSCRT1DataStruct  SiS300_LVDSCRT11024x768_2[] =
+ {
+ 	{{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+ 	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x06,
+@@ -2920,28 +1846,6 @@ static const SiS300_LVDSCRT1DataStruct  
+ 	  0x01 }}
+ };
+ 
+-static const SiS300_LVDSCRT1DataStruct  SiS300_LVDSCRT1800x600_2_H[] =
+-{
+-	{{0x3d,0x27,0x81,0x32,0x1a,0x72,0x3e,
+-	  0xf4,0x88,0x8f,0x73,0x20,0x00,0x05,
+-	  0x00 }},
+-	{{0x3d,0x27,0x81,0x32,0x1a,0x72,0x3e,
+-	  0xdb,0x8f,0x5d,0x73,0x20,0x00,0x05,
+-	  0x00 }},
+-	{{0x3d,0x27,0x81,0x32,0x1a,0x72,0x3e,
+-	  0xf4,0x88,0x8f,0x73,0x20,0x00,0x05,
+-	  0x00 }},
+-	{{0x3d,0x27,0x81,0x3a,0x1a,0x72,0x3e,
+-	  0xdb,0x8f,0x5d,0x73,0x20,0x00,0x05,
+-	  0x00 }},
+-	{{0x3d,0x27,0x81,0x32,0x1a,0x72,0xba,
+-	  0x1c,0x80,0xdf,0x73,0x00,0x00,0x05,
+-	  0x00 }},
+-	{{0x3d,0x31,0x81,0x37,0x1f,0x72,0xf0,
+-	  0x58,0x8c,0x57,0x73,0x20,0x00,0x05,
+-	  0x01 }}
+-};
+-
+ static const SiS300_LVDSCRT1DataStruct  SiS300_LVDSCRT11024x768_2_H[] =
+ {
+ 	{{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
+@@ -2967,6 +1871,31 @@ static const SiS300_LVDSCRT1DataStruct  
+ 	  0x01 }}
+ };
+ 
++static const SiS300_LVDSCRT1DataStruct  SiS300_LVDSCRT11280x1024_2[] =
++{
++	{{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
++	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x06,
++	  0x00 }},
++	{{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
++	  0x31,0x87,0x5d,0x25,0x30,0x00,0x06,
++	  0x00 }},
++	{{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
++	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x06,
++	  0x00 }},
++	{{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
++	  0x31,0x87,0x5d,0x25,0x30,0x00,0x06,
++	  0x00 }},
++	{{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
++	  0x72,0x88,0xdf,0x25,0x30,0x00,0x06,
++	  0x00 }},
++	{{0xa3,0x63,0x87,0x78,0x89,0x24,0xf1,
++	  0xae,0x84,0x57,0x25,0x30,0x00,0x02,
++	  0x01 }},
++	{{0xa3,0x7f,0x87,0x86,0x97,0x24,0xf5,
++	  0x02,0x88,0xff,0x25,0x10,0x00,0x02,
++	  0x01 }}
++};
++
+ static const SiS300_LVDSCRT1DataStruct  SiS300_LVDSCRT11280x1024_2_H[] =
+ {
+ 	{{0x4f,0x27,0x93,0x39,0x81,0x24,0xbb,
+@@ -2992,207 +1921,6 @@ static const SiS300_LVDSCRT1DataStruct  
+ 	  0x01}}
+ };
+ 
+-static const SiS300_LVDSCRT1DataStruct  SiS300_LVDSCRT11024x600_1[] =
+-{
+-        {{0x64,0x4f,0x88,0x54,0x9f,0x5a,0x3e,
+-	  0xe8,0x8f,0x8f,0x5b,0x00,0x00,0x01,
+-	  0x00}},
+-        {{0x64,0x4f,0x88,0x54,0x9f,0x2e,0x3e,
+-	  0xb9,0x80,0x5d,0x2f,0x00,0x00,0x01,
+-	  0x00}},
+-        {{0x64,0x4f,0x88,0x54,0x9f,0x5a,0x3e,
+-	  0xe8,0x8f,0x8f,0x5b,0x00,0x00,0x01,
+-	  0x00}},
+-        {{0x64,0x4f,0x88,0x54,0x9f,0x2e,0x3e,
+-	  0xb9,0x80,0x5d,0x2f,0x00,0x00,0x01,
+-	  0x00}},
+-        {{0x64,0x4f,0x88,0x54,0x9f,0xaf,0xba,
+-	  0x3b,0x82,0xdf,0xb0,0x00,0x00,0x01,
+-	  0x00}},
+-        {{0x7e,0x63,0x82,0x68,0x15,0x1e,0xf1,
+-	  0xae,0x85,0x57,0x1f,0x30,0x00,0x26,
+-	  0x01}},
+-        {{0xa3,0x7f,0x87,0x86,0x97,0x1e,0xf1,
+-	  0xae,0x85,0x57,0x1f,0x30,0x00,0x02,
+-	  0x01}}
+-};
+-
+-static const SiS300_LVDSCRT1DataStruct  SiS300_LVDSCRT11024x600_1_H[] =
+-{
+-        {{0x2f,0x27,0x93,0x2b,0x90,0xc4,0x1f,
+-	  0x92,0x89,0x8f,0xb5,0x30,0x00,0x44,
+-	  0x00}},
+-        {{0x2f,0x27,0x93,0x2b,0x90,0x97,0x1f,
+-	  0x60,0x87,0x5d,0x83,0x10,0x00,0x44,
+-          0x00}},
+-        {{0x2f,0x27,0x93,0x2b,0x90,0xc4,0x1f,
+-	  0x92,0x89,0x8f,0xb5,0x30,0x00,0x44,
+-	  0x00}},
+-        {{0x2f,0x27,0x93,0x2b,0x90,0x97,0x1f,
+-	  0x60,0x87,0x5d,0x83,0x10,0x00,0x44,
+-	  0x00}},
+-        {{0x2f,0x27,0x93,0x2b,0x90,0x04,0x3e,
+-	  0xe2,0x89,0xdf,0x05,0x00,0x00,0x44,
+-	  0x00}},
+-        {{0x3c,0x31,0x80,0x35,0x1c,0x7c,0xf0,
+-	  0x5a,0x8f,0x57,0x7d,0x20,0x00,0x55,
+-	  0x01}},
+-        {{0x4f,0x3f,0x93,0x45,0x0d,0x24,0xf5,
+-	  0x02,0x88,0xff,0x25,0x10,0x00,0x01,
+-	  0x01}}
+-};
+-
+-static const SiS300_LVDSCRT1DataStruct  SiS300_LVDSCRT11024x600_2[] =
+-{
+-        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+-	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x06,
+-	  0x00}},
+-        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+-	  0x31,0x87,0x5d,0x25,0x30,0x00,0x06,
+-	  0x00}},
+-        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+-	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x06,
+-	  0x00}},
+-        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+-          0x31,0x87,0x5d,0x25,0x30,0x00,0x06,
+-	  0x00}},
+-        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+-	  0x72,0x88,0xdf,0x25,0x30,0x00,0x06,
+-	  0x00}},
+-        {{0xa3,0x63,0x87,0x78,0x89,0x24,0xf1,
+-	  0xae,0x84,0x57,0x25,0x30,0x00,0x02,
+-	  0x01}},
+-        {{0xa3,0x7f,0x87,0x86,0x97,0x24,0xf5,
+-	  0x02,0x88,0xff,0x25,0x10,0x00,0x02,
+-	  0x01}}
+-};
+-
+-static const SiS300_LVDSCRT1DataStruct  SiS300_LVDSCRT11024x600_2_H[] =
+-{
+-        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
+-	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x01,
+-	  0x00}},
+-        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
+-	  0x31,0x87,0x5d,0x25,0x30,0x00,0x01,
+-	  0x00}},
+-        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
+-	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x01,
+-	  0x00}},
+-        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
+-	  0x31,0x87,0x5d,0x25,0x30,0x00,0x01,
+-	  0x00}},
+-        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
+-	  0x72,0x88,0xdf,0x25,0x30,0x00,0x01,
+-	  0x00}},
+-        {{0x4f,0x31,0x93,0x3e,0x06,0x24,0xf1,
+-	  0xae,0x84,0x57,0x25,0x30,0x00,0x01,
+-	  0x01}},
+-        {{0x4f,0x3f,0x93,0x45,0x0d,0x24,0xf5,
+-	  0x02,0x88,0xff,0x25,0x10,0x00,0x01,
+-	  0x01}}
+-};
+-
+-static const SiS300_LVDSCRT1DataStruct  SiS300_LVDSCRT11152x768_1[] =
+-{
+-        {{0x64,0x4f,0x88,0x54,0x9f,0xc4,0x1f,
+-	  0x92,0x89,0x8f,0xb5,0x30,0x00,0x01,
+-	  0x00}},
+-        {{0x64,0x4f,0x88,0x54,0x9f,0x97,0x1f,
+-	  0x60,0x87,0x5d,0x83,0x10,0x00,0x01,
+-	  0x00}},
+-        {{0x64,0x4f,0x88,0x54,0x9f,0xc4,0x1f,
+-	  0x92,0x89,0x8f,0xb5,0x30,0x00,0x01,
+-	  0x00}},
+-        {{0x64,0x4f,0x88,0x54,0x9f,0x97,0x1f,
+-	  0x60,0x87,0x5d,0x83,0x10,0x00,0x01,
+-	  0x00}},
+-        {{0x64,0x4f,0x88,0x54,0x9f,0x04,0x3e,
+-	  0xe2,0x89,0xdf,0x05,0x00,0x00,0x01,
+-	  0x00}},
+-        {{0x7e,0x63,0x82,0x68,0x15,0x7c,0xf0,
+-	  0x5a,0x8f,0x57,0x7d,0x20,0x00,0x26,
+-	  0x01}},
+-        {{0xa3,0x7f,0x87,0x86,0x97,0x24,0xf5,
+-	  0x02,0x88,0xff,0x25,0x10,0x00,0x02,
+-	  0x01}}
+-};
+-
+-static const SiS300_LVDSCRT1DataStruct  SiS300_LVDSCRT11152x768_1_H[] =
+-{
+-        {{0x2f,0x27,0x93,0x2b,0x90,0xc4,0x1f,
+-	  0x92,0x89,0x8f,0xb5,0x30,0x00,0x44,
+-	  0x00}},
+-        {{0x2f,0x27,0x93,0x2b,0x90,0x97,0x1f,
+-	  0x60,0x87,0x5d,0x83,0x10,0x00,0x44,
+-	  0x00}},
+-        {{0x2f,0x27,0x93,0x2b,0x90,0xc4,0x1f,
+-	  0x92,0x89,0x8f,0xb5,0x30,0x00,0x44,
+-	  0x00}},
+-        {{0x2f,0x27,0x93,0x2b,0x90,0x97,0x1f,
+-	  0x60,0x87,0x5d,0x83,0x10,0x00,0x44,
+-	  0x00}},
+-        {{0x2f,0x27,0x93,0x2b,0x90,0x04,0x3e,
+-	  0xe2,0x89,0xdf,0x05,0x00,0x00,0x44,
+-	  0x00}},
+-        {{0x3c,0x31,0x80,0x35,0x1c,0x7c,0xf0,
+-	  0x5a,0x8f,0x57,0x7d,0x20,0x00,0x55,
+-	  0x01}},
+-        {{0x4f,0x3f,0x93,0x45,0x0d,0x24,0xf5,
+-	  0x02,0x88,0xff,0x25,0x10,0x00,0x01,
+-	  0x01}}
+-};
+-
+-static const SiS300_LVDSCRT1DataStruct  SiS300_LVDSCRT11152x768_2[] =
+-{
+-        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+-	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x06,
+-	  0x00}},
+-        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+-	  0x31,0x87,0x5d,0x25,0x30,0x00,0x06,
+-	  0x00}},
+-        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+-	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x06,
+-	  0x00}},
+-        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+-	  0x31,0x87,0x5d,0x25,0x30,0x00,0x06,
+-	  0x00}},
+-        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+-	  0x72,0x88,0xdf,0x25,0x30,0x00,0x06,
+-	  0x00}},
+-        {{0xa3,0x63,0x87,0x78,0x89,0x24,0xf1,
+-	  0xae,0x84,0x57,0x25,0x30,0x00,0x02,
+-	  0x01}},
+-        {{0xa3,0x7f,0x87,0x86,0x97,0x24,0xf5,
+-	  0x02,0x88,0xff,0x25,0x10,0x00,0x02,
+-	  0x01}}
+-};
+-
+-static const SiS300_LVDSCRT1DataStruct  SiS300_LVDSCRT11152x768_2_H[] =
+-{
+-        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
+-	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x01,
+-	  0x00}},
+-        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
+-	  0x31,0x87,0x5d,0x25,0x30,0x00,0x01,
+-	  0x00}},
+-        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
+-	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x01,
+-	  0x00}},
+-        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
+-	  0x31,0x87,0x5d,0x25,0x30,0x00,0x01,
+-	  0x00}},
+-        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
+-	  0x72,0x88,0xdf,0x25,0x30,0x00,0x01,
+-	  0x00}},
+-        {{0x4f,0x31,0x93,0x3e,0x06,0x24,0xf1,
+-	  0xae,0x84,0x57,0x25,0x30,0x00,0x01,
+-	  0x01}},
+-        {{0x4f,0x3f,0x93,0x45,0x0d,0x24,0xf5,
+-	  0x02,0x88,0xff,0x25,0x10,0x00,0x01,
+-	  0x01}}
+-};
+-
+-/* TW: New */
+ static const SiS300_LVDSCRT1DataStruct  SiS300_CHTVCRT1UNTSC[] =
+ {
+ 	{{0x64,0x4f,0x88,0x56,0x9f,0x56,0x3e,
+@@ -3302,9 +2030,7 @@ static const SiS300_LVDSCRT1DataStruct  
+ 	  0x90,0x8c,0x57,0xed,0x20,0x00,0x05,
+ 	  0x01 }}
+ };
+-/* TW: New end */
+ 
+-/* TW: New */
+ typedef struct _SiS300_CHTVRegDataStruct
+ {
+ 	UCHAR Reg[16];
+@@ -3361,9 +2087,7 @@ static const SiS300_CHTVRegDataStruct Si
+ 	{{0x60,0x30,0x00,0x10,0x00,0,0,0,0,0,0,0,0,0,0,0}}, /* TW: Mode 13: 640x480 PAL 5/4 */
+ 	{{0x81,0x50,0x00,0x1b,0x00,0,0,0,0,0,0,0,0,0,0,0}}  /* TW: Mode 19: 800x600 PAL 1/1 */
+ };
+-/* TW: New end */
+ 
+-/* TW: New */
+ static const UCHAR SiS300_CHTVVCLKUNTSC[]  = {0x29,0x29,0x29,0x29,0x2a,0x2e};
+ 
+ static const UCHAR SiS300_CHTVVCLKONTSC[]  = {0x2c,0x2c,0x2c,0x2c,0x2d,0x2b};
+@@ -3375,6 +2099,5 @@ static const UCHAR SiS300_CHTVVCLKUPAL[]
+ static const UCHAR SiS300_CHTVVCLKOPAL[]   = {0x2f,0x2f,0x2f,0x2f,0x30,0x32};
+ 
+ static const UCHAR SiS300_CHTVVCLKSOPAL[]  = {0x2f,0x2f,0x2f,0x2f,0x36,0x29};
+-/* TW: New end */
+ 
+ 
+--- linux-2.6.0-test6/drivers/video/sis/310vtbl.h	2003-06-14 12:18:23.000000000 -0700
++++ 25/drivers/video/sis/310vtbl.h	2003-10-05 00:34:22.000000000 -0700
+@@ -1,7 +1,37 @@
+-
+-
+-/* Register settings for SiS 310/325/330 series */
+-
++/* $XFree86$ */
++/*
++ * Register settings for SiS 315/330 series
++ *
++ * Copyright 2002, 2003 by Thomas Winischhofer, Vienna, Austria
++ *
++ * If distributed as part of the linux kernel, the contents of this file
++ * is entirely covered by the GPL.
++ *
++ * Otherwise, the following terms apply:
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of the copyright holder not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission.  The copyright holder makes no representations
++ * about the suitability of this software for any purpose.  It is provided
++ * "as is" without express or implied warranty.
++ *
++ * THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++ * EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ *
++ * Author: 	Thomas Winischhofer <thomas@winischhofer.net>
++ *
++ * Based on code by Silicon Intergrated Systems
++ *
++ */
+ 
+ typedef struct _SiS310_StStruct
+ {
+@@ -39,466 +69,12 @@ static const SiS310_StStruct SiS310_SMod
+ 	{0xff,0x0000,0x00,0x00,0x00,0x00,0x00,0x00}
+ };
+ 
+-typedef struct _SiS310_StandTableStruct
+-{
+-	UCHAR CRT_COLS;
+-	UCHAR ROWS;
+-	UCHAR CHAR_HEIGHT;
+-	USHORT CRT_LEN;
+-	UCHAR SR[4];
+-	UCHAR MISC;
+-	UCHAR CRTC[0x19];
+-	UCHAR ATTR[0x14];
+-	UCHAR GRC[9];
+-} SiS310_StandTableStruct;
+-
+-static const SiS310_StandTableStruct SiS310_StandTable[]=
+-{
+-/* 0x00: MD_0_200 */
+- {
+-  0x28,0x18,0x08,0x0800,
+-  {0x09,0x03,0x00,0x02},
+-  0x63,
+-  {0x2d,0x27,0x28,0x90,0x2b,0xa0,0xbf,0x1f,
+-   0x00,0xc7,0x06,0x07,0x00,0x00,0x00,0x00,
+-   0x9c,0x8e,0x8f,0x14,0x1f,0x96,0xb9,0xa3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+-   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
+-   0x08,0x00,0x0f,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+-   0xff}
+- },
+-/* 0x01: MD_1_200 */
+- {
+-  0x28,0x18,0x08,0x0800,
+-  {0x09,0x03,0x00,0x02},
+-  0x63,
+-  {0x2d,0x27,0x28,0x90,0x2b,0xa0,0xbf,0x1f,
+-   0x00,0xc7,0x06,0x07,0x00,0x00,0x00,0x00,
+-   0x9c,0x8e,0x8f,0x14,0x1f,0x96,0xb9,0xa3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+-   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
+-   0x08,0x00,0x0f,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+-   0xff}
+- },
+-/* 0x02: MD_2_200 */
+- {
+-  0x50,0x18,0x08,0x1000,
+-  {0x01,0x03,0x00,0x02},
+-  0x63,
+-  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+-   0x00,0xc7,0x06,0x07,0x00,0x00,0x00,0x00,
+-   0x9c,0x8e,0x8f,0x28,0x1f,0x96,0xb9,0xa3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+-   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
+-   0x08,0x00,0x0f,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+-   0xff}
+- },
+-/* 0x03: MD_3_200 - mode 0x03 - 0 */
+- {
+-  0x50,0x18,0x08,0x1000,
+-  {0x01,0x03,0x00,0x02},
+-  0x63,
+-  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+-   0x00,0xc7,0x06,0x07,0x00,0x00,0x00,0x00,
+-   0x9c,0x8e,0x8f,0x28,0x1f,0x96,0xb9,0xa3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+-   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
+-   0x08,0x00,0x0f,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+-   0xff}
+- },
+-/* 0x04: MD_4 */
+- {
+-  0x28,0x18,0x08,0x4000,
+-  {0x09,0x03,0x00,0x02},
+-  0x63,
+-  {0x2d,0x27,0x28,0x90,0x2c,0x80,0xbf,0x1f,
+-   0x00,0xc1,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0x9c,0x8e,0x8f,0x14,0x00,0x96,0xb9,0xa2,
+-   0xff},
+-  {0x00,0x13,0x15,0x17,0x02,0x04,0x06,0x07,
+-   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
+-   0x01,0x00,0x03,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x30,0x0f,0x00,
+-   0xff}
+- },
+-/* 0x05: MD_5 */
+- {
+-  0x28,0x18,0x08,0x4000,
+-  {0x09,0x03,0x00,0x02},
+-  0x63,
+-  {0x2d,0x27,0x28,0x90,0x2c,0x80,0xbf,0x1f,
+-   0x00,0xc1,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0x9c,0x8e,0x8f,0x14,0x00,0x96,0xb9,0xa2,
+-   0xff},
+-  {0x00,0x13,0x15,0x17,0x02,0x04,0x06,0x07,
+-   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
+-   0x01,0x00,0x03,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x30,0x0f,0x00,
+-   0xff}
+- },
+-/* 0x06: MD_6 */
+- {
+-  0x50,0x18,0x08,0x4000,
+-  {0x01,0x01,0x00,0x06},
+-  0x63,
+-  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+-   0x00,0xc1,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0x9c,0x8e,0x8f,0x28,0x00,0x96,0xb9,0xc2,
+-   0xff},
+-  {0x00,0x17,0x17,0x17,0x17,0x17,0x17,0x17,
+-   0x17,0x17,0x17,0x17,0x17,0x17,0x17,0x17,
+-   0x01,0x00,0x01,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x00,0x0d,0x00,
+-   0xff}
+- },
+-/* 0x07: MD_7 */
+- {
+-  0x50,0x18,0x0e,0x1000,
+-  {0x00,0x03,0x00,0x03},
+-  0xa6,
+-  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+-   0x00,0x4d,0x0b,0x0c,0x00,0x00,0x00,0x00,
+-   0x83,0x85,0x5d,0x28,0x0d,0x63,0xba,0xa3,
+-   0xff},
+-  {0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x08,
+-   0x10,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
+-   0x0e,0x00,0x0f,0x08},
+-  {0x00,0x00,0x00,0x00,0x00,0x10,0x0a,0x00,
+-   0xff}
+- },
+-/* 0x08: MDA_DAC */
+- {
+-  0x00,0x00,0x00,0x0000,
+-  {0x00,0x00,0x00,0x15},
+-  0x15,
+-  {0x15,0x15,0x15,0x15,0x15,0x15,0x15,0x15,
+-   0x15,0x15,0x15,0x15,0x15,0x15,0x3f,0x3f,
+-   0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x00,0x00,
+-   0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x15,0x15,0x15,
+-   0x15,0x15,0x15,0x15,0x15,0x15,0x15,0x15,
+-   0x15,0x15,0x15,0x15},
+-  {0x15,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,
+-   0x3f}
+- },
+-/* 0x09: CGA_DAC */
+- {
+-  0x00,0x10,0x04,0x0114,
+-  {0x11,0x09,0x15,0x00},
+-  0x10,
+-  {0x04,0x14,0x01,0x11,0x09,0x15,0x2a,0x3a,
+-   0x2e,0x3e,0x2b,0x3b,0x2f,0x3f,0x2a,0x3a,
+-   0x2e,0x3e,0x2b,0x3b,0x2f,0x3f,0x00,0x10,
+-   0x04},
+-  {0x14,0x01,0x11,0x09,0x15,0x00,0x10,0x04,
+-   0x14,0x01,0x11,0x09,0x15,0x2a,0x3a,0x2e,
+-   0x3e,0x2b,0x3b,0x2f},
+-  {0x3f,0x2a,0x3a,0x2e,0x3e,0x2b,0x3b,0x2f,
+-   0x3f}
+- },
+-/* 0x0a: EGA_DAC */
+- {
+-  0x00,0x10,0x04,0x0114,
+-  {0x11,0x05,0x15,0x20},
+-  0x30,
+-  {0x24,0x34,0x21,0x31,0x25,0x35,0x08,0x18,
+-   0x0c,0x1c,0x09,0x19,0x0d,0x1d,0x28,0x38,
+-   0x2c,0x3c,0x29,0x39,0x2d,0x3d,0x02,0x12,
+-   0x06},
+-  {0x16,0x03,0x13,0x07,0x17,0x22,0x32,0x26,
+-   0x36,0x23,0x33,0x27,0x37,0x0a,0x1a,0x0e,
+-   0x1e,0x0b,0x1b,0x0f},
+-  {0x1f,0x2a,0x3a,0x2e,0x3e,0x2b,0x3b,0x2f,
+-   0x3f}
+- },
+-/* 0x0b: VGA_DAC */
+- {
+-  0x00,0x10,0x04,0x0114,
+-  {0x11,0x09,0x15,0x2a},
+-  0x3a,
+-  {0x2e,0x3e,0x2b,0x3b,0x2f,0x3f,0x00,0x05,
+-   0x08,0x0b,0x0e,0x11,0x14,0x18,0x1c,0x20,
+-   0x24,0x28,0x2d,0x32,0x38,0x3f,0x00,0x10,
+-   0x1f},
+-  {0x2f,0x3f,0x1f,0x27,0x2f,0x37,0x3f,0x2d,
+-   0x31,0x36,0x3a,0x3f,0x00,0x07,0x0e,0x15,
+-   0x1c,0x0e,0x11,0x15},
+-  {0x18,0x1c,0x14,0x16,0x18,0x1a,0x1c,0x00,
+-   0x04}
+- },
+-/* 0x0c */ 
+- {
+-  0x08,0x0c,0x10,0x0a08,
+-  {0x0c,0x0e,0x10,0x0b},
+-  0x0c,
+-  {0x0d,0x0f,0x10,0x10,0x01,0x08,0x00,0x00,
+-   0x00,0x00,0x01,0x00,0x02,0x02,0x01,0x00,
+-   0x04,0x04,0x01,0x00,0x05,0x02,0x05,0x00,
+-   0x06},
+-  {0x01,0x06,0x05,0x06,0x00,0x08,0x01,0x08,
+-   0x00,0x07,0x02,0x07,0x06,0x07,0x00,0x00,
+-   0x00,0x00,0x00,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0x00}
+- },
+-/* 0x0d: MD_D */
+- {
+-  0x28,0x18,0x08,0x2000,
+-  {0x09,0x0f,0x00,0x06},
+-  0x63,
+-  {0x2d,0x27,0x28,0x90,0x2c,0x80,0xbf,0x1f,
+-   0x00,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0x9c,0x8e,0x8f,0x14,0x00,0x96,0xb9,0xe3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+-   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
+-   0x01,0x00,0x0f,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x0f,
+-   0xff}
+- },
+-/* 0x0e: MD_E */
+- {
+-  0x50,0x18,0x08,0x4000,
+-  {0x01,0x0f,0x00,0x06},
+-  0x63,
+-  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+-   0x00,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0x9c,0x8e,0x8f,0x28,0x00,0x96,0xb9,0xe3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+-   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
+-   0x01,0x00,0x0f,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x0f,
+-   0xff}
+- },
+-/* 0x0f: ExtVGATable - modes > 0x13 */
+- {
+-  0x00,0x00,0x00,0x0000,
+-  {0x01,0x0f,0x00,0x0e},
+-  0x23,
+-  {0x5f,0x4f,0x50,0x82,0x54,0x80,0x0b,0x3e,
+-   0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0xea,0x8c,0xdf,0x28,0x40,0xe7,0x04,0xa3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+-   0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,
+-   0x01,0x00,0x00,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x40,0x05,0x0f,
+-   0xff}
+- },
+-/* 0x10: ROM_SAVEPTR */
+- {
+-  0x9f,0x3b,0x00,0x00c0,
+-  {0x00,0x00,0x00,0x00},
+-  0x00,
+-  {0x00,0x00,0x00,0x00,0x00,0x00,0xbb,0x3f,
+-   0x00,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0x00,0x00,0x1a,0x00,0xac,0x3e,0x00,0xc0,
+-   0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0x00,0x00,0x00,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0x00}
+- },
+-/* 0x11: MD_F */
+- {
+-  0x50,0x18,0x0e,0x8000,
+-  {0x01,0x0f,0x00,0x06},
+-  0xa2,
+-  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+-   0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0x82,0x84,0x5d,0x28,0x0f,0x63,0xba,0xe3,
+-   0xff},
+-  {0x00,0x08,0x00,0x00,0x18,0x18,0x00,0x00,
+-   0x00,0x08,0x00,0x00,0x00,0x18,0x00,0x00,
+-   0x0b,0x00,0x05,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x05,
+-   0xff}
+- },
+-/* 0x12: MD_10 */
+- {
+-  0x50,0x18,0x0e,0x8000,
+-  {0x01,0x0f,0x00,0x06},
+-  0xa3,
+-  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+-   0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0x82,0x84,0x5d,0x28,0x0f,0x63,0xba,0xe3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
+-   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+-   0x01,0x00,0x0f,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x0f,
+-   0xff}
+- },
+-/* 0x13: MD_0_350 */
+- {
+-  0x28,0x18,0x0e,0x0800,
+-  {0x09,0x03,0x00,0x02},
+-  0xa3,
+-  {0x2d,0x27,0x28,0x90,0x2b,0xb1,0xbf,0x1f,
+-   0x00,0x4d,0x0b,0x0c,0x00,0x00,0x00,0x00,
+-   0x83,0x85,0x5d,0x14,0x1f,0x63,0xba,0xa3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
+-   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+-   0x08,0x00,0x0f,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+-   0xff}
+- },
+-/* 0x14: MD_1_350 */
+- {
+-  0x28,0x18,0x0e,0x0800,
+-  {0x09,0x03,0x00,0x02},
+-  0xa3,
+-  {0x2d,0x27,0x28,0x90,0x2b,0xa0,0xbf,0x1f,
+-   0x00,0x4d,0x0b,0x0c,0x00,0x00,0x00,0x00,
+-   0x83,0x85,0x5d,0x14,0x1f,0x63,0xba,0xa3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
+-   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+-   0x08,0x00,0x0f,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+-   0xff}
+- },
+-/* 0x15: MD_2_350 */
+- {
+-  0x50,0x18,0x0e,0x1000,
+-  {0x01,0x03,0x00,0x02},
+-  0xa3,
+-  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+-   0x00,0x4d,0x0b,0x0c,0x00,0x00,0x00,0x00,
+-   0x83,0x85,0x5d,0x28,0x1f,0x63,0xba,0xa3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
+-   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+-   0x08,0x00,0x0f,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+-   0xff}
+- },
+-/* 0x16: MD_3_350 - mode 0x03 - 1 */
+- {
+-  0x50,0x18,0x0e,0x1000,
+-  {0x01,0x03,0x00,0x02},
+-  0xa3,
+-  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+-   0x00,0x4d,0x0b,0x0c,0x00,0x00,0x00,0x00,
+-   0x83,0x85,0x5d,0x28,0x1f,0x63,0xba,0xa3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
+-   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+-   0x08,0x00,0x0f,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+-   0xff}
+- },
+-/* 0x17: MD_0_1_400 */
+- {
+-  0x28,0x18,0x10,0x0800,
+-  {0x08,0x03,0x00,0x02},
+-  0x67,
+-  {0x2d,0x27,0x28,0x90,0x2b,0xb1,0xbf,0x1f,
+-   0x00,0x4f,0x0d,0x0e,0x00,0x00,0x00,0x00,
+-   0x9c,0x8e,0x8f,0x14,0x1f,0x96,0xb9,0xa3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
+-   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+-   0x0c,0x00,0x0f,0x08},
+-  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+-   0xff}
+- },
+-/* 0x18: MD_2_3_400 - mode 0x03 - 2 */
+- {
+-  0x50,0x18,0x10,0x1000,
+-  {0x00,0x03,0x00,0x02},
+-  0x67,
+-  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+-   0x00,0x4f,0x0d,0x0e,0x00,0x00,0x00,0x00,
+-   0x9c,0x8e,0x8f,0x28,0x1f,0x96,0xb9,0xa3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
+-   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+-   0x0c,0x00,0x0f,0x08},
+-  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
+-   0xff}
+- },
+-/* 0x19: MD_7_400 */
+- {
+-  0x50,0x18,0x10,0x1000,
+-  {0x00,0x03,0x00,0x02},
+-  0x66,
+-  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+-   0x00,0x4f,0x0d,0x0e,0x00,0x00,0x00,0x00,
+-   0x9c,0x8e,0x8f,0x28,0x0f,0x96,0xb9,0xa3,
+-   0xff},
+-  {0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x08,
+-   0x10,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
+-   0x0e,0x00,0x0f,0x08},
+-  {0x00,0x00,0x00,0x00,0x00,0x10,0x0a,0x00,
+-   0xff}
+- },
+-/* 0x1a: MD_11 */
+- {
+-  0x50,0x1d,0x10,0xa000,
+-  {0x01,0x0f,0x00,0x06},
+-  0xe3,
+-  {0x5f,0x4f,0x50,0x82,0x55,0x81,0x0b,0x3e,
+-   0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0xe9,0x8b,0xdf,0x28,0x00,0xe7,0x04,0xc3,
+-   0xff},
+-  {0x00,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,
+-   0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,
+-   0x01,0x00,0x0f,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x01,
+-   0xff}
+- },
+-/* 0x1b: ExtEGATable - Modes <= 0x02 */
+- {
+-  0x50,0x1d,0x10,0xa000,
+-  {0x01,0x0f,0x00,0x06},
+-  0xe3,
+-  {0x5f,0x4f,0x50,0x82,0x55,0x81,0x0b,0x3e,
+-   0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0xe9,0x8b,0xdf,0x28,0x00,0xe7,0x04,0xe3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
+-   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
+-   0x01,0x00,0x0f,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x0f,
+-   0xff}
+- },
+-/* 0x1c: MD_13 */
+- {
+-  0x28,0x18,0x08,0x2000,
+-  {0x01,0x0f,0x00,0x0e},
+-  0x63,
+-  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+-   0x00,0x41,0x00,0x00,0x00,0x00,0x00,0x00,
+-   0x9c,0x8e,0x8f,0x28,0x40,0x96,0xb9,0xa3,
+-   0xff},
+-  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+-   0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,
+-   0x41,0x00,0x0f,0x00},
+-  {0x00,0x00,0x00,0x00,0x00,0x40,0x05,0x0f,
+-   0xff}
+- }
+-};
+-
+ typedef struct _SiS310_ExtStruct
+ {
+ 	UCHAR Ext_ModeID;
+ 	USHORT Ext_ModeFlag;
+ 	USHORT Ext_ModeInfo;
+-	USHORT Ext_Point;    /* TW: Address of table entry in (older) BIOS image */
+ 	USHORT Ext_VESAID;
+-	UCHAR Ext_VESAMEMSize;
+ 	UCHAR Ext_RESINFO;
+ 	UCHAR VB_ExtTVFlickerIndex;
+ 	UCHAR VB_ExtTVEdgeIndex;
+@@ -506,93 +82,93 @@ typedef struct _SiS310_ExtStruct
+ 	UCHAR REFindex;
+ } SiS310_ExtStruct;
+ 
+-/* TW: Checked with 650/LVDS and 650/301LVx 1.10.6s */
+ static const SiS310_ExtStruct  SiS310_EModeIDTable[]=
+ {
+-	{0x6a,0x2212,0x0407,0x3a81,0x0102,0x08,0x07,0x00,0x00,0x07,0x00},          /* 800x600x? */
+-	{0x2e,0x0a1b,0x0306,0x3a57,0x0101,0x08,0x06,0x00,0x00,0x05,0x08},          /* 640x480x8 */
+-/*	{0x2e,0x021b,0x0306,0x3a57,0x0101,0x08,0x06,0x00,0x00,0x05,0x08},    */    /* 640x480x8 - 650/LVDS BIOS (no CRt2Mode) */
+-	{0x2f,0x0a1b,0x0305,0x3a50,0x0100,0x08,0x05,0x00,0x00,0x05,0x10},          /* 640x400x8 */
+-/*	{0x2f,0x021b,0x0305,0x3a50,0x0100,0x08,0x05,0x00,0x00,0x05,0x10},    */    /* 640x400x8 - 650/LVDS BIOS (no CRt2Mode) */
+-	{0x30,0x2a1b,0x0407,0x3a81,0x0103,0x08,0x07,0x00,0x00,0x07,0x00},          /* 800x600x8 */
+-/*	{0x30,0x221b,0x0407,0x3a81,0x0103,0x08,0x07,0x00,0x00,0x07,0x00},    */    /* 800x600x8 - 650/LVDS BIOS (no CRt2Mode) */
+-/*      {0x31,0x0a1b,0x030d,0x3b85,0x0000,0x08,0x0d,0x00,0x00,0x06,0x11},    */    /* 720x480x8 */
+-        {0x31,0x0a1b,0x0a0d,0x3b85,0x0000,0x08,0x0d,0x00,0x00,0x06,0x11},          /* 720x480x8 BIOS (301/LVDS) */
+-	{0x32,0x0a1b,0x0a0e,0x3b8c,0x0000,0x08,0x0e,0x00,0x00,0x06,0x12},          /* 720x576x8 */
+-	{0x33,0x0a1d,0x0a0d,0x3b85,0x0000,0x08,0x0d,0x00,0x00,0x06,0x11},          /* 720x480x16 */
+-	{0x34,0x2a1d,0x0a0e,0x3b8c,0x0000,0x08,0x0e,0x00,0x00,0x06,0x12},          /* 720x576x16 */
+-	{0x35,0x0a1f,0x0a0d,0x3b85,0x0000,0x08,0x0d,0x00,0x00,0x06,0x11},          /* 720x480x32 */
+-	{0x36,0x2a1f,0x0a0e,0x3b8c,0x0000,0x08,0x0e,0x00,0x00,0x06,0x12},          /* 720x576x32 */
+-	{0x37,0x0212,0x0508,0x3aab,0x0104,0x08,0x08,0x00,0x00,0x08,0x13},          /* 1024x768x? */
+-	{0x38,0x0a1b,0x0508,0x3aab,0x0105,0x08,0x08,0x00,0x00,0x08,0x13},          /* 1024x768x8 */
+-	{0x3a,0x0e3b,0x0609,0x3adc,0x0107,0x08,0x09,0x00,0x00,0x00,0x1a},          /* 1280x1024x8 */
+-	{0x3c,0x0e3b,0x070a,0x3af2,0x0130,0x08,0x0a,0x00,0x00,0x00,0x1e},          /* 1600x1200x8 */
+-	{0x3d,0x0e7d,0x070a,0x3af2,0x0131,0x08,0x0a,0x00,0x00,0x00,0x1e},          /* 1600x1200x16 - 650/301LVx - no CRT2Mode? */
+-	{0x40,0x9a1c,0x0000,0x3a34,0x010d,0x08,0x00,0x00,0x00,0x04,0x25},
+-	{0x41,0x9a1d,0x0000,0x3a34,0x010e,0x08,0x00,0x00,0x00,0x04,0x25},
+-	{0x43,0x0a1c,0x0306,0x3a57,0x0110,0x08,0x06,0x00,0x00,0x05,0x08},
+-	{0x44,0x0a1d,0x0306,0x3a57,0x0111,0x08,0x06,0x00,0x00,0x05,0x08},          /* 640x480x16 */
+-	{0x46,0x2a1c,0x0407,0x3a81,0x0113,0x08,0x07,0x00,0x00,0x07,0x00},
+-	{0x47,0x2a1d,0x0407,0x3a81,0x0114,0x08,0x07,0x00,0x00,0x07,0x00},          /* 800x600x16 */
+-	{0x49,0x0a3c,0x0508,0x3aab,0x0116,0x08,0x08,0x00,0x00,0x00,0x13},
+-	{0x4a,0x0a3d,0x0508,0x3aab,0x0117,0x08,0x08,0x00,0x00,0x08,0x13},          /* 1024x768x16 */
+-	{0x4c,0x0e7c,0x0609,0x3adc,0x0119,0x08,0x09,0x00,0x00,0x00,0x1a},
+-	{0x4d,0x0e7d,0x0609,0x3adc,0x011a,0x08,0x09,0x00,0x00,0x00,0x1a},          /* 1280x1024x16 */
+-	{0x50,0x9a1b,0x0001,0x3a3b,0x0132,0x08,0x01,0x00,0x00,0x04,0x26},	   /* 320x240 */
+-	{0x51,0xba1b,0x0103,0x3a42,0x0133,0x08,0x03,0x00,0x00,0x07,0x27},
+-  	{0x52,0xba1b,0x0204,0x3a49,0x0134,0x08,0x04,0x00,0x00,0x00,0x28},          /* 650/301 BIOS */
+-	{0x56,0x9a1d,0x0001,0x3a3b,0x0135,0x08,0x01,0x00,0x00,0x04,0x26},
+-	{0x57,0xba1d,0x0103,0x3a42,0x0136,0x08,0x03,0x00,0x00,0x07,0x27},
+- 	{0x58,0xba1d,0x0204,0x3a49,0x0137,0x08,0x04,0x00,0x00,0x00,0x28},          /* BIOS (301+LVDS) */
+-	{0x59,0x9a1b,0x0000,0x3a34,0x0138,0x08,0x00,0x00,0x00,0x04,0x25},	   /* 320x200 */
+-	{0x5A,0x021b,0x0014,0x3b83,0x0138,0x08,0x01,0x00,0x00,0x04,0x3f},          /* 320x480x8 fstn add new mode*/
+-	{0x5B,0x0a1d,0x0014,0x3b83,0x0135,0x08,0x01,0x00,0x00,0x04,0x3f},          /* 320x480x16 fstn add new mode*/
+-	{0x5c,0xba1f,0x0204,0x3a49,0x0000,0x08,0x04,0x00,0x00,0x00,0x28},          /* TW: inserted 512x384x32 */
+-	{0x5d,0x0a1d,0x0305,0x3a50,0x0139,0x08,0x05,0x00,0x00,0x07,0x10},
+-	{0x5e,0x0a1f,0x0305,0x3a50,0x0000,0x08,0x05,0x00,0x00,0x07,0x10},          /* TW: Inserted 640x400x32 */
+-	{0x62,0x0a3f,0x0306,0x3a57,0x013a,0x08,0x06,0x00,0x00,0x05,0x08},          /* 640x480x32 */
+-	{0x63,0x2a3f,0x0407,0x3a81,0x013b,0x08,0x07,0x00,0x00,0x07,0x00},          /* 800x600x32 */
+-	{0x64,0x0a7f,0x0508,0x3aab,0x013c,0x08,0x08,0x00,0x00,0x08,0x13},          /* 1024x768x32 */
+-	{0x65,0x0eff,0x0609,0x3adc,0x013d,0x08,0x09,0x00,0x00,0x00,0x1a},          /* 1280x1024x32 */
+-	{0x66,0x0eff,0x070a,0x3af2,0x013e,0x08,0x0a,0x00,0x00,0x00,0x1e},          /* 1600x1200x32 */
+-	{0x68,0x067b,0x080b,0x3b17,0x013f,0x08,0x0b,0x00,0x00,0x00,0x29},          /* 1920x1440x8 */
+-	{0x69,0x06fd,0x080b,0x3b17,0x0140,0x08,0x0b,0x00,0x00,0x00,0x29},          /* 1920x1440x16 */
+-	{0x6b,0x07ff,0x080b,0x3b17,0x0141,0x10,0x0b,0x00,0x00,0x00,0x29},          /* 1920x1440x32 */
+-	{0x6c,0x067b,0x090c,0x3b37,0x0000,0x08,0x0c,0x00,0x00,0x00,0x2f},          /* 2048x1536x8 */
+-	{0x6d,0x06fd,0x090c,0x3b37,0x0000,0x10,0x0c,0x00,0x00,0x00,0x2f},          /* 2048x1536x16 */
+-	{0x6e,0x07ff,0x090c,0x3b37,0x0000,0x10,0x0c,0x00,0x00,0x00,0x2f},          /* 2048x1536x32 */
+-	{0x70,0x2a1b,0x0410,0x3b52,0x0000,0x08,0x10,0x00,0x00,0x07,0x34},          /* 800x480x8 */
+-	{0x71,0x0a1b,0x0511,0x3b63,0x0000,0x08,0x11,0x00,0x00,0x00,0x37},          /* 1024x576x8 */
+-	{0x74,0x0a1d,0x0511,0x3b63,0x0000,0x08,0x11,0x00,0x00,0x00,0x37},          /* 1024x576x16 */
+-	{0x75,0x0a3d,0x0612,0x3b74,0x0000,0x08,0x12,0x00,0x00,0x00,0x3a},	   /* 1280x720x16 */
+-	{0x76,0x2a1f,0x0410,0x3b52,0x0000,0x08,0x10,0x00,0x00,0x07,0x34},          /* 800x480x32 */
+-	{0x77,0x0a1f,0x0511,0x3b63,0x0000,0x08,0x11,0x00,0x00,0x00,0x37},	   /* 1024x576x32 */
+-	{0x78,0x0a3f,0x0612,0x3b74,0x0000,0x08,0x12,0x00,0x00,0x00,0x3a},	   /* 1280x720x32 */
+-	{0x79,0x0a3b,0x0612,0x3b74,0x0000,0x08,0x12,0x00,0x00,0x00,0x3a},	   /* 1280x720x8 */
+-	{0x7a,0x2a1d,0x0410,0x3b52,0x0000,0x08,0x10,0x00,0x00,0x07,0x34},          /* 800x480x16 */
+-	{0x7c,0x0e3b,0x060f,0x3ad0,0x0000,0x08,0x0f,0x00,0x00,0x00,0x3d},          /* 1280x960x8 - TW */
+-	{0x7d,0x0e7d,0x060f,0x3ad0,0x0000,0x08,0x0f,0x00,0x00,0x00,0x3d},          /* 1280x960x16 - TW */
+-	{0x7e,0x0eff,0x060f,0x3ad0,0x0000,0x08,0x0f,0x00,0x00,0x00,0x3d},          /* 1280x960x32 - TW */
+-        /* TW: 650/LVDS BIOS new modes */
+-	{0x23,0x0e3b,0x0614,0x36f7,0x0000,0x08,0x14,0x00,0x00,0x00,0x40},          /* 1280x768x8 */
+-	{0x24,0x0e7d,0x0614,0x36f7,0x0000,0x08,0x14,0x00,0x00,0x00,0x40},          /* 1280x768x16 */
+-	{0x25,0x0eff,0x0614,0x36f7,0x0000,0x08,0x14,0x00,0x00,0x00,0x40},          /* 1280x768x32 */
+-	{0x26,0x0e3b,0x0c15,0x36fe,0x0000,0x08,0x15,0x00,0x00,0x00,0x41},          /* 1400x1050x8 */
+-	{0x27,0x0e7d,0x0c15,0x36fe,0x0000,0x08,0x15,0x00,0x00,0x00,0x41},          /* 1400x1050x16 */
+-	{0x28,0x0eff,0x0c15,0x36fe,0x0000,0x08,0x15,0x00,0x00,0x00,0x41},          /* 1400x1050x32*/
+-	{0x29,0x0e1b,0x0d16,0x0000,0x0000,0x08,0x16,0x00,0x00,0x00,0x43},    /* TW: NEW 1152x864 - not in BIOS */
+-	{0x2a,0x0e3d,0x0d16,0x0000,0x0000,0x08,0x16,0x00,0x00,0x00,0x43},
+-	{0x2b,0x0e7f,0x0d16,0x0000,0x0000,0x08,0x16,0x00,0x00,0x00,0x43},
+-	{0x39,0x2a1b,0x0b17,0x0000,0x0000,0x08,0x17,0x00,0x00,0x00,0x45},    /* TW: NEW 848x480 - not in BIOS */
+-	{0x3b,0x2a3d,0x0b17,0x0000,0x0000,0x08,0x17,0x00,0x00,0x00,0x45},
+-	{0x3e,0x2a7f,0x0b17,0x0000,0x0000,0x08,0x17,0x00,0x00,0x00,0x45},
+-	{0x3f,0x2a1b,0x0b13,0x0000,0x0000,0x08,0x13,0x00,0x00,0x00,0x47},    /* TW: NEW 856x480 - not in BIOS */
+-	{0x42,0x2a3d,0x0b13,0x0000,0x0000,0x08,0x13,0x00,0x00,0x00,0x47},
+-	{0x45,0x2a7f,0x0b13,0x0000,0x0000,0x08,0x13,0x00,0x00,0x00,0x47},
+-	{0x48,0x2a1b,0x0e18,0x0000,0x0000,0x08,0x18,0x00,0x00,0x00,0x49},    /* TW: NEW 1360x768 - not in BIOS */
+-	{0x4b,0x2a3d,0x0e18,0x0000,0x0000,0x08,0x18,0x00,0x00,0x00,0x49},
+-	{0x4e,0x2a7f,0x0e18,0x0000,0x0000,0x08,0x18,0x00,0x00,0x00,0x49},
+-	{0xff,0x0000,0x0000,0x0000,0x0000,0x00,0x00,0x00,0x00,0x00,0x00}
++	{0x6a,0x2212,0x0407,0x0102,SIS_RI_800x600,  0x00,0x00,0x07,0x00}, /* 800x600x? */
++	{0x2e,0x0a1b,0x0306,0x0101,SIS_RI_640x480,  0x00,0x00,0x05,0x08}, /* 640x480x8 */
++        {0x2f,0x0a1b,0x0305,0x0100,SIS_RI_640x400,  0x00,0x00,0x05,0x10}, /* 640x400x8 */
++	{0x30,0x2a1b,0x0407,0x0103,SIS_RI_800x600,  0x00,0x00,0x07,0x00}, /* 800x600x8 */
++        {0x31,0x0a1b,0x0a0d,0x0000,SIS_RI_720x480,  0x00,0x00,0x06,0x11}, /* 720x480x8 */
++	{0x32,0x0a1b,0x0a0e,0x0000,SIS_RI_720x576,  0x00,0x00,0x06,0x12}, /* 720x576x8 */
++	{0x33,0x0a1d,0x0a0d,0x0000,SIS_RI_720x480,  0x00,0x00,0x06,0x11}, /* 720x480x16 */
++	{0x34,0x2a1d,0x0a0e,0x0000,SIS_RI_720x576,  0x00,0x00,0x06,0x12}, /* 720x576x16 */
++	{0x35,0x0a1f,0x0a0d,0x0000,SIS_RI_720x480,  0x00,0x00,0x06,0x11}, /* 720x480x32 */
++	{0x36,0x2a1f,0x0a0e,0x0000,SIS_RI_720x576,  0x00,0x00,0x06,0x12}, /* 720x576x32 */
++	{0x37,0x0212,0x0508,0x0104,SIS_RI_1024x768, 0x00,0x00,0x08,0x13}, /* 1024x768x? */
++	{0x38,0x0a1b,0x0508,0x0105,SIS_RI_1024x768, 0x00,0x00,0x08,0x13}, /* 1024x768x8 */
++	{0x3a,0x0e3b,0x0609,0x0107,SIS_RI_1280x1024,0x00,0x00,0x00,0x1a}, /* 1280x1024x8 */
++	{0x3c,0x0e3b,0x070a,0x0130,SIS_RI_1600x1200,0x00,0x00,0x00,0x1e}, /* 1600x1200x8 */
++	{0x3d,0x0e7d,0x070a,0x0131,SIS_RI_1600x1200,0x00,0x00,0x00,0x1e}, /* 1600x1200x16 */
++	{0x40,0x9a1c,0x0000,0x010d,SIS_RI_320x200,  0x00,0x00,0x04,0x25}, /* 320x200x15 */
++	{0x41,0x9a1d,0x0000,0x010e,SIS_RI_320x200,  0x00,0x00,0x04,0x25}, /* 320x200x16 */
++	{0x43,0x0a1c,0x0306,0x0110,SIS_RI_640x480,  0x00,0x00,0x05,0x08},
++	{0x44,0x0a1d,0x0306,0x0111,SIS_RI_640x480,  0x00,0x00,0x05,0x08}, /* 640x480x16 */
++	{0x46,0x2a1c,0x0407,0x0113,SIS_RI_800x600,  0x00,0x00,0x07,0x00},
++	{0x47,0x2a1d,0x0407,0x0114,SIS_RI_800x600,  0x00,0x00,0x07,0x00}, /* 800x600x16 */
++	{0x49,0x0a3c,0x0508,0x0116,SIS_RI_1024x768, 0x00,0x00,0x00,0x13},
++	{0x4a,0x0a3d,0x0508,0x0117,SIS_RI_1024x768, 0x00,0x00,0x08,0x13}, /* 1024x768x16 */
++	{0x4c,0x0e7c,0x0609,0x0119,SIS_RI_1280x1024,0x00,0x00,0x00,0x1a},
++	{0x4d,0x0e7d,0x0609,0x011a,SIS_RI_1280x1024,0x00,0x00,0x00,0x1a}, /* 1280x1024x16 */
++	{0x50,0x9a1b,0x0001,0x0132,SIS_RI_320x240,  0x00,0x00,0x04,0x26}, /* 320x240x8  */
++	{0x51,0xba1b,0x0103,0x0133,SIS_RI_400x300,  0x00,0x00,0x07,0x27}, /* 400x300x8  */
++  	{0x52,0xba1b,0x0204,0x0134,SIS_RI_512x384,  0x00,0x00,0x00,0x28}, /* 512x384x8  */
++	{0x56,0x9a1d,0x0001,0x0135,SIS_RI_320x240,  0x00,0x00,0x04,0x26}, /* 320x240x16 */
++	{0x57,0xba1d,0x0103,0x0136,SIS_RI_400x300,  0x00,0x00,0x07,0x27}, /* 400x300x16 */
++ 	{0x58,0xba1d,0x0204,0x0137,SIS_RI_512x384,  0x00,0x00,0x00,0x28}, /* 512x384x16 */
++	{0x59,0x9a1b,0x0000,0x0138,SIS_RI_320x200,  0x00,0x00,0x04,0x25}, /* 320x200x8  */
++	{0x5a,0x021b,0x0014,0x0138,SIS_RI_320x240,  0x00,0x00,0x04,0x3f}, /* 320x240x8  fstn */
++	{0x5b,0x0a1d,0x0014,0x0135,SIS_RI_320x240,  0x00,0x00,0x04,0x3f}, /* 320x240x16 fstn */
++	{0x5c,0xba1f,0x0204,0x0000,SIS_RI_512x384,  0x00,0x00,0x00,0x28}, /* 512x384x32 */
++	{0x5d,0x0a1d,0x0305,0x0139,SIS_RI_640x400,  0x00,0x00,0x07,0x10},
++	{0x5e,0x0a1f,0x0305,0x0000,SIS_RI_640x400,  0x00,0x00,0x07,0x10}, /* 640x400x32 */
++	{0x62,0x0a3f,0x0306,0x013a,SIS_RI_640x480,  0x00,0x00,0x05,0x08}, /* 640x480x32 */
++	{0x63,0x2a3f,0x0407,0x013b,SIS_RI_800x600,  0x00,0x00,0x07,0x00}, /* 800x600x32 */
++	{0x64,0x0a7f,0x0508,0x013c,SIS_RI_1024x768, 0x00,0x00,0x08,0x13}, /* 1024x768x32 */
++	{0x65,0x0eff,0x0609,0x013d,SIS_RI_1280x1024,0x00,0x00,0x00,0x1a}, /* 1280x1024x32 */
++	{0x66,0x0eff,0x070a,0x013e,SIS_RI_1600x1200,0x00,0x00,0x00,0x1e}, /* 1600x1200x32 */
++	{0x68,0x067b,0x080b,0x013f,SIS_RI_1920x1440,0x00,0x00,0x00,0x29}, /* 1920x1440x8 */
++	{0x69,0x06fd,0x080b,0x0140,SIS_RI_1920x1440,0x00,0x00,0x00,0x29}, /* 1920x1440x16 */
++	{0x6b,0x07ff,0x080b,0x0141,SIS_RI_1920x1440,0x00,0x00,0x00,0x29}, /* 1920x1440x32 */
++	{0x6c,0x067b,0x090c,0x0000,SIS_RI_2048x1536,0x00,0x00,0x00,0x2f}, /* 2048x1536x8 */
++	{0x6d,0x06fd,0x090c,0x0000,SIS_RI_2048x1536,0x00,0x00,0x00,0x2f}, /* 2048x1536x16 */
++	{0x6e,0x07ff,0x090c,0x0000,SIS_RI_2048x1536,0x00,0x00,0x00,0x2f}, /* 2048x1536x32 */
++	{0x70,0x2a1b,0x0410,0x0000,SIS_RI_800x480,  0x00,0x00,0x07,0x34}, /* 800x480x8 */
++	{0x71,0x0a1b,0x0511,0x0000,SIS_RI_1024x576, 0x00,0x00,0x00,0x37}, /* 1024x576x8 */
++	{0x74,0x0a1d,0x0511,0x0000,SIS_RI_1024x576, 0x00,0x00,0x00,0x37}, /* 1024x576x16 */
++	{0x75,0x0a3d,0x0612,0x0000,SIS_RI_1280x720, 0x00,0x00,0x00,0x3a}, /* 1280x720x16 */
++	{0x76,0x2a1f,0x0410,0x0000,SIS_RI_800x480,  0x00,0x00,0x07,0x34}, /* 800x480x32 */
++	{0x77,0x0a1f,0x0511,0x0000,SIS_RI_1024x576, 0x00,0x00,0x00,0x37}, /* 1024x576x32 */
++	{0x78,0x0a3f,0x0612,0x0000,SIS_RI_1280x720, 0x00,0x00,0x00,0x3a}, /* 1280x720x32 */
++	{0x79,0x0a3b,0x0612,0x0000,SIS_RI_1280x720, 0x00,0x00,0x00,0x3a}, /* 1280x720x8 */
++	{0x7a,0x2a1d,0x0410,0x0000,SIS_RI_800x480,  0x00,0x00,0x07,0x34}, /* 800x480x16 */
++	{0x7c,0x0e3b,0x060f,0x0000,SIS_RI_1280x960, 0x00,0x00,0x00,0x3d}, /* 1280x960x8 */
++	{0x7d,0x0e7d,0x060f,0x0000,SIS_RI_1280x960, 0x00,0x00,0x00,0x3d}, /* 1280x960x16 */
++	{0x7e,0x0eff,0x060f,0x0000,SIS_RI_1280x960, 0x00,0x00,0x00,0x3d}, /* 1280x960x32 */
++	{0x23,0x0e3b,0x0614,0x0000,SIS_RI_1280x768, 0x00,0x00,0x00,0x40}, /* 1280x768x8 */
++	{0x24,0x0e7d,0x0614,0x0000,SIS_RI_1280x768, 0x00,0x00,0x00,0x40}, /* 1280x768x16 */
++	{0x25,0x0eff,0x0614,0x0000,SIS_RI_1280x768, 0x00,0x00,0x00,0x40}, /* 1280x768x32 */
++	{0x26,0x0e3b,0x0c15,0x0000,SIS_RI_1400x1050,0x00,0x00,0x00,0x41}, /* 1400x1050x8 */
++	{0x27,0x0e7d,0x0c15,0x0000,SIS_RI_1400x1050,0x00,0x00,0x00,0x41}, /* 1400x1050x16 */
++	{0x28,0x0eff,0x0c15,0x0000,SIS_RI_1400x1050,0x00,0x00,0x00,0x41}, /* 1400x1050x32*/
++	{0x29,0x0e1b,0x0d16,0x0000,SIS_RI_1152x864, 0x00,0x00,0x00,0x43}, /* 1152x864 */
++	{0x2a,0x0e3d,0x0d16,0x0000,SIS_RI_1152x864, 0x00,0x00,0x00,0x43},
++	{0x2b,0x0e7f,0x0d16,0x0000,SIS_RI_1152x864, 0x00,0x00,0x00,0x43},
++	{0x39,0x2a1b,0x0b17,0x0000,SIS_RI_848x480,  0x00,0x00,0x00,0x45}, /* 848x480 */
++	{0x3b,0x2a3d,0x0b17,0x0000,SIS_RI_848x480,  0x00,0x00,0x00,0x45},
++	{0x3e,0x2a7f,0x0b17,0x0000,SIS_RI_848x480,  0x00,0x00,0x00,0x45},
++	{0x3f,0x2a1b,0x0b13,0x0000,SIS_RI_856x480,  0x00,0x00,0x00,0x47}, /* 856x480 */
++	{0x42,0x2a3d,0x0b13,0x0000,SIS_RI_856x480,  0x00,0x00,0x00,0x47},
++	{0x45,0x2a7f,0x0b13,0x0000,SIS_RI_856x480,  0x00,0x00,0x00,0x47},
++	{0x48,0x2a1b,0x0e18,0x0000,SIS_RI_1360x768, 0x00,0x00,0x00,0x49}, /* 1360x768 */
++	{0x4b,0x2a3d,0x0e18,0x0000,SIS_RI_1360x768, 0x00,0x00,0x00,0x49},
++	{0x4e,0x2a7f,0x0e18,0x0000,SIS_RI_1360x768, 0x00,0x00,0x00,0x49},
++	{0x4f,0x9a1f,0x0000,0x0000,SIS_RI_320x200,  0x00,0x00,0x04,0x25}, /* 320x200x32 */
++	{0x53,0x9a1f,0x0001,0x0000,SIS_RI_320x240,  0x00,0x00,0x04,0x26}, /* 320x240x32 */
++	{0x54,0xba1f,0x0103,0x0000,SIS_RI_400x300,  0x00,0x00,0x07,0x27}, /* 400x300x32 */
++	{0x5f,0x2a1b,0x0f0e,0x0000,SIS_RI_768x576,  0x00,0x00,0x00,0x4a}, /* 768x576x8 */
++	{0x60,0x2a1d,0x0f0e,0x0000,SIS_RI_768x576,  0x00,0x00,0x00,0x4a}, /* 768x576x16 */
++	{0x61,0x2a1f,0x0f0e,0x0000,SIS_RI_768x576,  0x00,0x00,0x00,0x4a}, /* 768x576x32 */
++	{0xff,0x0000,0x0000,0x0000,0x00,            0x00,0x00,0x00,0x00}
+ };
+ 
+ typedef struct _SiS310_Ext2Struct
+@@ -604,89 +180,87 @@ typedef struct _SiS310_Ext2Struct
+ 	UCHAR  ModeID;
+ 	USHORT XRes;
+ 	USHORT YRes;
+-	USHORT ROM_OFFSET;
+ } SiS310_Ext2Struct;
+ 
+ static const SiS310_Ext2Struct SiS310_RefIndex[]=
+ {
+-/*	{0x005f,0x0d,0x03,0x05,0x6a, 800, 600,0x3a81},    0x0 - TW: Patch for Chrontel 7019  */
+-	{0x085f,0x0d,0x03,0x05,0x6a, 800, 600,0x3a81}, /* 0x0 */
+-	{0x0467,0x0e,0x04,0x05,0x6a, 800, 600,0x3a86}, /* 0x1 */
+-	{0x0067,0x0f,0x08,0x48,0x6a, 800, 600,0x3a8b}, /* 0x2 */
+-	{0x0067,0x10,0x07,0x8b,0x6a, 800, 600,0x3a90}, /* 0x3 */
+-	{0x0147,0x11,0x0a,0x00,0x6a, 800, 600,0x3a95}, /* 0x4 */
+-	{0x0147,0x12,0x0d,0x00,0x6a, 800, 600,0x3a9a}, /* 0x5 - 4147 TW: Test sync change */
+-	{0x0047,0x13,0x13,0x00,0x6a, 800, 600,0x3a9f}, /* 0x6 - 4047 */
+-	{0x0047,0x14,0x1c,0x00,0x6a, 800, 600,0x3aa4}, /* 0x7 - 4047 */
+-/*	{0xc05f,0x05,0x00,0x04,0x2e, 640, 480,0x3a57},    0x8 - TW: Patch for Chrontel 7019  */
+-	{0xc85f,0x05,0x00,0x04,0x2e, 640, 480,0x3a57}, /* 0x8 */
+-	{0xc067,0x06,0x02,0x04,0x2e, 640, 480,0x3a5c}, /* 0x9 */
+-	{0xc067,0x07,0x02,0x47,0x2e, 640, 480,0x3a61}, /* 0xa */
+-	{0xc067,0x08,0x03,0x8a,0x2e, 640, 480,0x3a66}, /* 0xb */
+-	{0xc047,0x09,0x05,0x00,0x2e, 640, 480,0x3a6b}, /* 0xc - 4047 */
+-	{0xc047,0x0a,0x09,0x00,0x2e, 640, 480,0x3a70}, /* 0xd - 4047 */
+-	{0xc047,0x0b,0x0e,0x00,0x2e, 640, 480,0x3a75}, /* 0xe - 4047 */
+-	{0xc047,0x0c,0x15,0x00,0x2e, 640, 480,0x3a7a}, /* 0xf */
+-	{0x407f,0x04,0x00,0x00,0x2f, 640, 400,0x3a50}, /* 0x10 */
+-	{0xc00f,0x3c,0x01,0x06,0x31, 720, 480,0x3b85}, /* 0x11 */
+-	{0x000f,0x3d,0x03,0x06,0x32, 720, 576,0x3b8c}, /* 0x12 */
+-	{0x0187,0x15,0x06,0x00,0x37,1024, 768,0x3aab}, /* 0x13 */
+-	{0xc877,0x16,0x0b,0x06,0x37,1024, 768,0x3ab0}, /* 0x14 */
+-	{0xc067,0x17,0x0f,0x49,0x37,1024, 768,0x3ab5}, /* 0x15 */
+-	{0x0267,0x18,0x11,0x00,0x37,1024, 768,0x3aba}, /* 0x16 */
+-	{0x0047,0x19,0x16,0x8c,0x37,1024, 768,0x3abf}, /* 0x17 */
+-	{0x0047,0x1a,0x1b,0x00,0x37,1024, 768,0x3ac4}, /* 0x18 - 4047 */
+-	{0x0007,0x1b,0x1f,0x00,0x37,1024, 768,0x3ac9}, /* 0x19 - 4047 */
+-	{0x0387,0x1c,0x11,0x00,0x3a,1280,1024,0x3adc}, /* 0x1a */
+-	{0x0077,0x1d,0x19,0x07,0x3a,1280,1024,0x3ae1}, /* 0x1b */
+-	{0x0047,0x1e,0x1e,0x00,0x3a,1280,1024,0x3ae6}, /* 0x1c */
+-	{0x0007,0x1f,0x20,0x00,0x3a,1280,1024,0x3aeb}, /* 0x1d */
+-	{0x0027,0x20,0x21,0x09,0x3c,1600,1200,0x3af2}, /* 0x1e */
+-	{0x0007,0x21,0x22,0x00,0x3c,1600,1200,0x3af7}, /* 0x1f */
+-	{0x0007,0x22,0x23,0x00,0x3c,1600,1200,0x3afc}, /* 0x20 */
+-	{0x0007,0x23,0x25,0x00,0x3c,1600,1200,0x3b01}, /* 0x21 */
+-	{0x0007,0x24,0x26,0x00,0x3c,1600,1200,0x3b06}, /* 0x22 */
+-	{0x0007,0x25,0x2c,0x00,0x3c,1600,1200,0x3b0b}, /* 0x23 */
+-	{0x0007,0x26,0x34,0x00,0x3c,1600,1200,0x3b10}, /* 0x24 */
+-	{0x407f,0x00,0x00,0x00,0x40, 320, 200,0x3a34}, /* 0x25 */
+-	{0xc07f,0x01,0x00,0x04,0x50, 320, 240,0x3a3b}, /* 0x26 */
+-	{0x007f,0x02,0x04,0x05,0x51, 400, 300,0x3a42}, /* 0x27 */
+-	{0xc077,0x03,0x0b,0x06,0x52, 512, 384,0x3a49}, /* 0x28 */
+-	{0x8007,0x27,0x27,0x00,0x68,1920,1440,0x3b17}, /* 0x29 */
+-	{0x4007,0x28,0x29,0x00,0x68,1920,1440,0x3b1c}, /* 0x2a */
+-	{0x4007,0x29,0x2e,0x00,0x68,1920,1440,0x3b21}, /* 0x2b */
+-	{0x4007,0x2a,0x30,0x00,0x68,1920,1440,0x3b26}, /* 0x2c */
+-	{0x4007,0x2b,0x35,0x00,0x68,1920,1440,0x3b2b}, /* 0x2d */
+-	{0x4005,0x2c,0x39,0x00,0x68,1920,1440,0x3b30}, /* 0x2e */
+-	{0x4007,0x2d,0x2b,0x00,0x6c,2048,1536,0x3b37}, /* 0x2f */
+-	{0x4007,0x2e,0x31,0x00,0x6c,2048,1536,0x3b3c}, /* 0x30 */
+-	{0x4007,0x2f,0x33,0x00,0x6c,2048,1536,0x3b41}, /* 0x31 */
+-	{0x4007,0x30,0x37,0x00,0x6c,2048,1536,0x3b46}, /* 0x32 */
+-	{0x4005,0x31,0x38,0x00,0x6c,2048,1536,0x3b4b}, /* 0x33 */
+-	{0x0057,0x32,0x40,0x08,0x70, 800, 480,0x3b52}, /* 0x34 */
+-	{0x0047,0x33,0x07,0x08,0x70, 800, 480,0x3b57}, /* 0x35 */
+-	{0x0047,0x34,0x0a,0x08,0x70, 800, 480,0x3b5c}, /* 0x36 */
+-	{0x0057,0x35,0x0b,0x09,0x71,1024, 576,0x3b63}, /* 0x37 */
+-	{0x0047,0x36,0x11,0x09,0x71,1024, 576,0x3b68}, /* 0x38 */
+-	{0x0047,0x37,0x16,0x09,0x71,1024, 576,0x3b6d}, /* 0x39 */
+-	{0x0057,0x38,0x19,0x0a,0x75,1280, 720,0x3b74}, /* 0x3a */
+-	{0x0047,0x39,0x1e,0x0a,0x75,1280, 720,0x3b79}, /* 0x3b */
+-	{0x0007,0x3a,0x20,0x0a,0x75,1280, 720,0x3b7e}, /* 0x3c */
+-	{0x0067,0x3b,0x19,0x08,0x7c,1280, 960,0x3ad0}, /* 0x3d */
+-	{0x0027,0x4c,0x59,0x08,0x7c,1280, 960,0x3ad0}, /* 0x3e */
+-	{0xc07f,0x01,0x00,0x06,0x5a, 320, 480,0x3b83}, /* 0x3f */    /* FSTN mode */
+-        {0x0077,0x42,0x12,0x08,0x23,1280, 768,0x0000}, /* 0x40 */  
+-	{0x0067,0x43,0x4d,0x08,0x26,1400,1050,0x0000}, /* 0x41 */  
+-	{0x0007,0x4b,0x5a,0x08,0x26,1400,1050,0x0000}, /* 0x42 */    /* TW: new, not in any BIOS */
+-	{0x0047,0x44,0x19,0x00,0x29,1152, 864,0x0000}, /* 0x43 TW: Non-BIOS, new */
+-	{0x0047,0x4a,0x1e,0x00,0x29,1152, 864,0x0000}, /* 0x44 TW: Non-BIOS, new */
+-	{0x00c7,0x45,0x57,0x00,0x39, 848, 480,0x0000}, /* 0x45 TW: 848x480-38Hzi - Non-BIOS, new */
+-	{0xc047,0x46,0x55,0x00,0x39, 848, 480,0x0000}, /* 0x46 TW: 848x480-60Hz  - Non-BIOS, new */
+-	{0x00c7,0x47,0x57,0x00,0x3f, 856, 480,0x0000}, /* 0x47 TW: 856x480-38Hzi - Non-BIOS, new */
+-	{0xc047,0x48,0x57,0x00,0x3f, 856, 480,0x0000}, /* 0x48 TW: 856x480-60Hz  - Non-BIOS, new */
+-	{0x0047,0x49,0x58,0x00,0x48,1360, 768,0x0000}, /* 0x49 TW: 1360x768-60Hz - Non-BIOS, new */
+-	{0xffff,0x00,0x00,0x00,0x00,   0,   0,0x0000}
+-}; 
++	{0x085f,0x0d,0x03,0x05,0x6a, 800, 600}, /* 0x0 */
++	{0x0467,0x0e,0x04,0x05,0x6a, 800, 600}, /* 0x1 */
++	{0x0067,0x0f,0x08,0x48,0x6a, 800, 600}, /* 0x2 */
++	{0x0067,0x10,0x07,0x8b,0x6a, 800, 600}, /* 0x3 */
++	{0x0147,0x11,0x0a,0x00,0x6a, 800, 600}, /* 0x4 */
++	{0x0147,0x12,0x0d,0x00,0x6a, 800, 600}, /* 0x5 - TW: Test sync change */
++	{0x0047,0x13,0x13,0x00,0x6a, 800, 600}, /* 0x6 */
++	{0x0047,0x14,0x1c,0x00,0x6a, 800, 600}, /* 0x7 */
++	{0xc85f,0x05,0x00,0x04,0x2e, 640, 480}, /* 0x8 */
++	{0xc067,0x06,0x02,0x04,0x2e, 640, 480}, /* 0x9 */
++	{0xc067,0x07,0x02,0x47,0x2e, 640, 480}, /* 0xa */
++	{0xc067,0x08,0x03,0x8a,0x2e, 640, 480}, /* 0xb */
++	{0xc047,0x09,0x05,0x00,0x2e, 640, 480}, /* 0xc */
++	{0xc047,0x0a,0x09,0x00,0x2e, 640, 480}, /* 0xd */
++	{0xc047,0x0b,0x0e,0x00,0x2e, 640, 480}, /* 0xe */
++	{0xc047,0x0c,0x15,0x00,0x2e, 640, 480}, /* 0xf */
++	{0x407f,0x04,0x00,0x00,0x2f, 640, 400}, /* 0x10 */
++	{0xc00f,0x3c,0x01,0x06,0x31, 720, 480}, /* 0x11 */
++	{0x000f,0x3d,0x03,0x06,0x32, 720, 576}, /* 0x12 */
++	{0x0187,0x15,0x06,0x00,0x37,1024, 768}, /* 0x13 */
++	{0xc877,0x16,0x0b,0x06,0x37,1024, 768}, /* 0x14 */
++	{0xc067,0x17,0x0f,0x49,0x37,1024, 768}, /* 0x15 */
++	{0x0267,0x18,0x11,0x00,0x37,1024, 768}, /* 0x16 */
++	{0x0047,0x19,0x16,0x8c,0x37,1024, 768}, /* 0x17 */
++	{0x0047,0x1a,0x1b,0x00,0x37,1024, 768}, /* 0x18 */
++	{0x0007,0x1b,0x1f,0x00,0x37,1024, 768}, /* 0x19 */
++	{0x0387,0x1c,0x11,0x00,0x3a,1280,1024}, /* 0x1a */
++	{0x0077,0x1d,0x19,0x07,0x3a,1280,1024}, /* 0x1b */
++	{0x0047,0x1e,0x1e,0x00,0x3a,1280,1024}, /* 0x1c */
++	{0x0007,0x1f,0x20,0x00,0x3a,1280,1024}, /* 0x1d */
++	{0x0867,0x20,0x21,0x09,0x3c,1600,1200}, /* 0x1e */
++	{0x0007,0x21,0x22,0x00,0x3c,1600,1200}, /* 0x1f */
++	{0x0007,0x22,0x23,0x00,0x3c,1600,1200}, /* 0x20 */
++	{0x0007,0x23,0x25,0x00,0x3c,1600,1200}, /* 0x21 */
++	{0x0007,0x24,0x26,0x00,0x3c,1600,1200}, /* 0x22 */
++	{0x0007,0x25,0x2c,0x00,0x3c,1600,1200}, /* 0x23 */
++	{0x0007,0x26,0x34,0x00,0x3c,1600,1200}, /* 0x24 */
++	{0x407f,0x00,0x00,0x00,0x40, 320, 200}, /* 0x25 */
++	{0xc07f,0x01,0x00,0x04,0x50, 320, 240}, /* 0x26 */
++	{0x007f,0x02,0x04,0x05,0x51, 400, 300}, /* 0x27 */
++	{0xc077,0x03,0x0b,0x06,0x52, 512, 384}, /* 0x28 */
++	{0x8007,0x27,0x27,0x00,0x68,1920,1440}, /* 0x29 */
++	{0x4007,0x28,0x29,0x00,0x68,1920,1440}, /* 0x2a */
++	{0x4007,0x29,0x2e,0x00,0x68,1920,1440}, /* 0x2b */
++	{0x4007,0x2a,0x30,0x00,0x68,1920,1440}, /* 0x2c */
++	{0x4007,0x2b,0x35,0x00,0x68,1920,1440}, /* 0x2d */
++	{0x4005,0x2c,0x39,0x00,0x68,1920,1440}, /* 0x2e */
++	{0x4007,0x2d,0x2b,0x00,0x6c,2048,1536}, /* 0x2f */
++	{0x4007,0x2e,0x31,0x00,0x6c,2048,1536}, /* 0x30 */
++	{0x4007,0x2f,0x33,0x00,0x6c,2048,1536}, /* 0x31 */
++	{0x4007,0x30,0x37,0x00,0x6c,2048,1536}, /* 0x32 */
++	{0x4005,0x31,0x38,0x00,0x6c,2048,1536}, /* 0x33 */
++	{0x0057,0x32,0x40,0x08,0x70, 800, 480}, /* 0x34 */
++	{0x0047,0x33,0x07,0x08,0x70, 800, 480}, /* 0x35 */
++	{0x0047,0x34,0x0a,0x08,0x70, 800, 480}, /* 0x36 */
++	{0x0057,0x35,0x0b,0x09,0x71,1024, 576}, /* 0x37 */
++	{0x0047,0x36,0x11,0x09,0x71,1024, 576}, /* 0x38 */
++	{0x0047,0x37,0x16,0x09,0x71,1024, 576}, /* 0x39 */
++	{0x0057,0x38,0x19,0x0a,0x75,1280, 720}, /* 0x3a */
++	{0x0047,0x39,0x1e,0x0a,0x75,1280, 720}, /* 0x3b */
++	{0x0007,0x3a,0x20,0x0a,0x75,1280, 720}, /* 0x3c */
++	{0x0067,0x3b,0x19,0x08,0x7c,1280, 960}, /* 0x3d */
++	{0x0027,0x4c,0x59,0x08,0x7c,1280, 960}, /* 0x3e */
++	{0xc07f,0x4e,0x00,0x06,0x5a, 320, 240}, /* 0x3f */    /* FSTN 320x240 */
++        {0x0077,0x42,0x5b,0x08,0x23,1280, 768}, /* 0x40 */    /* TW: 0x5b was 0x12 */
++	{0x0067,0x43,0x4d,0x08,0x26,1400,1050}, /* 0x41 */
++	{0x0007,0x4b,0x5a,0x08,0x26,1400,1050}, /* 0x42 TW: not in any BIOS */
++	{0x0047,0x44,0x19,0x00,0x29,1152, 864}, /* 0x43 TW: Non-BIOS, new */
++	{0x0047,0x4a,0x1e,0x00,0x29,1152, 864}, /* 0x44 TW: Non-BIOS, new */
++	{0x00c7,0x45,0x57,0x00,0x39, 848, 480}, /* 0x45 TW: 848x480-38Hzi - Non-BIOS, new */
++	{0xc067,0x46,0x55,0x0b,0x39, 848, 480}, /* 0x46 TW: 848x480-60Hz  - Non-BIOS, new */
++	{0x00c7,0x47,0x57,0x00,0x3f, 856, 480}, /* 0x47 TW: 856x480-38Hzi - Non-BIOS, new */
++	{0xc047,0x48,0x57,0x00,0x3f, 856, 480}, /* 0x48 TW: 856x480-60Hz  - Non-BIOS, new */
++	{0x0067,0x49,0x58,0x0c,0x48,1360, 768}, /* 0x49 TW: 1360x768-60Hz - Non-BIOS, new */
++	{0x000f,0x4d,0x03,0x06,0x5f, 768, 576}, /* 0x4a TW: 768x576 */
++	{0xffff,0x00,0x00,0x00,0x00,   0,   0}
++};
+ 
+ typedef struct _SiS310_CRT1TableStruct
+ {
+@@ -710,7 +284,7 @@ static const SiS310_CRT1TableStruct SiS3
+  {{0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
+    0x9c,0x8e,0x8f,0x96,0xb9,0x30,0x00,0x05,
+    0x00}}, /* 0x4 */
+-#if 0   
++#if 0
+  {{0x5f,0x4f,0x50,0x82,0x55,0x81,0x0b,0x3e,
+    0xe9,0x8b,0xdf,0xe7,0x04,0x00,0x00,0x05,
+    0x00}}, /* 0x5 */
+@@ -940,19 +514,25 @@ static const SiS310_CRT1TableStruct SiS3
+    0x00}},  /* 0x4b */ 
+  {{0xd3,0x9f,0x9f,0x97,0xab,0x1f,0xf1,0xff, /* TW: New, 1280x960-85, not in any BIOS */
+    0xc0,0x83,0xbf,0xbf,0xf2,0x10,0x00,0x07,
+-   0x01}}   /* 0x4c */
++   0x01}},  /* 0x4c */
++ {{0x7b,0x5f,0x63,0x9f,0x6a,0x93,0x6f,0xf0, /* 768x576 */
++   0x58,0x8a,0x3f,0x57,0x70,0x20,0x00,0x05,
++   0x01}},  /* 0x4d */
++ {{0x2d,0x27,0x28,0x90,0x2c,0x80,0x0b,0x3e, /* FSTN 320x480, TEMP - possibly invalid */
++   0xe9,0x8b,0xdf,0xe7,0x04,0x00,0x00,0x00,
++   0x00}}   /* 0x4e */
+ };
+ 
+-
+ typedef struct _SiS310_MCLKDataStruct
+ {
+ 	UCHAR SR28,SR29,SR2A;
+ 	USHORT CLOCK;
+ } SiS310_MCLKDataStruct;
+ 
++#ifdef LINUXBIOS
+ static const SiS310_MCLKDataStruct SiS310_MCLKData_0_315[] =
+ {
+-	{ 0x3b,0x22,0x01,143},   /* TW: Was { 0x5c,0x23,0x01,166}, */
++	{ 0x3b,0x22,0x01,143},
+ 	{ 0x5c,0x23,0x01,166},
+ 	{ 0x5c,0x23,0x01,166},
+ 	{ 0x5c,0x23,0x01,166},
+@@ -962,7 +542,7 @@ static const SiS310_MCLKDataStruct SiS31
+ 	{ 0x5c,0x23,0x01,166}
+ };
+ 
+-static const SiS310_MCLKDataStruct SiS310_MCLKData_0_650[] =	/* @ 0x54 */
++static const SiS310_MCLKDataStruct SiS310_MCLKData_0_650[] =
+ {
+ 	{ 0x5a,0x64,0x82, 66},
+ 	{ 0xb3,0x45,0x82, 83},
+@@ -973,8 +553,22 @@ static const SiS310_MCLKDataStruct SiS31
+ 	{ 0x37,0x22,0x82,133},
+ 	{ 0x37,0x22,0x82,133}
+ };
++#endif
++
++static const SiS310_MCLKDataStruct SiS310_MCLKData_0_330[] =
++{
++	{ 0x5c,0x23,0x01,166},
++	{ 0x5c,0x23,0x01,166},
++	{ 0x7c,0x08,0x01,200},
++	{ 0x79,0x06,0x01,250},
++	{ 0x7c,0x08,0x01,200},
++	{ 0x7c,0x08,0x01,200},
++	{ 0x7c,0x08,0x01,200},
++	{ 0x79,0x06,0x01,250}
++};
+ 
+-static const SiS310_MCLKDataStruct SiS310_MCLKData_0_330[] =   /* @ 0x54 */
++#ifdef LINUXBIOS
++static const SiS310_MCLKDataStruct SiS310_MCLKData_0_660[] =  /* TODO */
+ {
+ 	{ 0x5c,0x23,0x01,166},
+ 	{ 0x5c,0x23,0x01,166},
+@@ -985,8 +579,9 @@ static const SiS310_MCLKDataStruct SiS31
+ 	{ 0x7c,0x08,0x01,200},
+ 	{ 0x79,0x06,0x01,250}
+ };
++#endif
+ 
+-static const SiS310_MCLKDataStruct SiS310_MCLKData_1[] =	/* @ 0x155 */
++static const SiS310_MCLKDataStruct SiS310_MCLKData_1[] =
+ {
+         { 0x29,0x21,0x82,150},
+ 	{ 0x5c,0x23,0x82,166},
+@@ -998,6 +593,7 @@ static const SiS310_MCLKDataStruct SiS31
+ 	{ 0x37,0x22,0x82,133}
+ };
+ 
++#ifdef LINUXBIOS
+ typedef struct _SiS310_ECLKDataStruct
+ {
+  	UCHAR SR2E,SR2F,SR30;
+@@ -1011,6 +607,7 @@ static const SiS310_ECLKDataStruct SiS31
+ 	{ 0x5c,0x23,0x01,166},
+ 	{ 0x5c,0x23,0x01,166}
+ };
++#endif
+ 
+ typedef struct _SiS310_VCLKDataStruct
+ {
+@@ -1020,22 +617,22 @@ typedef struct _SiS310_VCLKDataStruct
+ 
+ static const SiS310_VCLKDataStruct SiS310_VCLKData[]=
+ {
+-	{ 0x1b,0xe1, 25}, /* 0x0 */   /* 650/LVDS BIOS: @ 0x5647 */
+-	{ 0x4e,0xe4, 28}, /* 0x1 */
+-	{ 0x57,0xe4, 31}, /* 0x2 */
+-	{ 0xc3,0xc8, 36}, /* 0x3 */
+-	{ 0x42,0xe2, 40}, /* 0x4 */
+-	{ 0xfe,0xcd, 43}, /* 0x5 */
+-	{ 0x5d,0xc4, 44}, /* 0x6 */
+-	{ 0x52,0xe2, 49}, /* 0x7 */
+-	{ 0x53,0xe2, 50}, /* 0x8 */
+-	{ 0x74,0x67, 52}, /* 0x9 */
+-	{ 0x6d,0x66, 56}, /* 0xa */
+-	{ 0x5a,0x64, 65}, /* 0xb */   /* TW: was 6c c3 - WRONG */
+-	{ 0x46,0x44, 67}, /* 0xc */
+-	{ 0xb1,0x46, 68}, /* 0xd */
+-	{ 0xd3,0x4a, 72}, /* 0xe */
+-	{ 0x29,0x61, 75}, /* 0xf */
++	{ 0x1b,0xe1, 25}, /* 0x00 */
++	{ 0x4e,0xe4, 28}, /* 0x01 */
++	{ 0x57,0xe4, 31}, /* 0x02 */
++	{ 0xc3,0xc8, 36}, /* 0x03 */
++	{ 0x42,0xe2, 40}, /* 0x04 */
++	{ 0xfe,0xcd, 43}, /* 0x05 */
++	{ 0x5d,0xc4, 44}, /* 0x06 */
++	{ 0x52,0xe2, 49}, /* 0x07 */
++	{ 0x53,0xe2, 50}, /* 0x08 */
++	{ 0x74,0x67, 52}, /* 0x09 */
++	{ 0x6d,0x66, 56}, /* 0x0a */
++	{ 0x5a,0x64, 65}, /* 0x0b */  /* TW: was 6c c3 - WRONG */
++	{ 0x46,0x44, 67}, /* 0x0c */
++	{ 0xb1,0x46, 68}, /* 0x0d */
++	{ 0xd3,0x4a, 72}, /* 0x0e */
++	{ 0x29,0x61, 75}, /* 0x0f */
+ 	{ 0x6e,0x46, 76}, /* 0x10 */
+ 	{ 0x2b,0x61, 78}, /* 0x11 */
+ 	{ 0x31,0x42, 79}, /* 0x12 */
+@@ -1045,7 +642,7 @@ static const SiS310_VCLKDataStruct SiS31
+ 	{ 0x62,0x44, 94}, /* 0x16 */
+ 	{ 0x2b,0x41,104}, /* 0x17 */
+ 	{ 0x3a,0x23,105}, /* 0x18 */
+-	{ 0x70,0x44,108}, /* 0x19 */
++	{ 0x70,0x44,108}, /* 0x19 */  /* 1400x1050 LCD */
+ 	{ 0x3c,0x23,109}, /* 0x1a */
+ 	{ 0x5e,0x43,113}, /* 0x1b */
+ 	{ 0xbc,0x44,116}, /* 0x1c */
+@@ -1078,12 +675,12 @@ static const SiS310_VCLKDataStruct SiS31
+ 	{ 0xea,0x08,340}, /* 0x37 */
+ 	{ 0xe8,0x07,376}, /* 0x38 */
+ 	{ 0xde,0x06,389}, /* 0x39 */
+-	{ 0x52,0x2a, 54}, /* 0x3a */
+-	{ 0x52,0x6a, 27}, /* 0x3b */
+-	{ 0x62,0x24, 70}, /* 0x3c */
+-	{ 0x62,0x64, 70}, /* 0x3d */
+-	{ 0xa8,0x4c, 30}, /* 0x3e */
+-	{ 0x20,0x26, 33}, /* 0x3f */
++	{ 0x52,0x2a, 54}, /* 0x3a */  /* 301 TV */
++	{ 0x52,0x6a, 27}, /* 0x3b */  /* 301 TV */
++	{ 0x62,0x24, 70}, /* 0x3c */  /* 301 TV */
++	{ 0x62,0x64, 70}, /* 0x3d */  /* 301 TV */
++	{ 0xa8,0x4c, 30}, /* 0x3e */  /* 301 TV */
++	{ 0x20,0x26, 33}, /* 0x3f */  /* 301 TV */
+ 	{ 0x31,0xc2, 39}, /* 0x40 */
+ 	{ 0x60,0x36, 30}, /* 0x41 */  /* Chrontel */
+ 	{ 0x40,0x4a, 28}, /* 0x42 */  /* Chrontel */
+@@ -1096,7 +693,7 @@ static const SiS310_VCLKDataStruct SiS31
+ 	{ 0xce,0x3c, 39}, /* 0x49 */
+ 	{ 0x52,0x4a, 36}, /* 0x4a */  /* Chrontel */
+ 	{ 0x34,0x61, 95}, /* 0x4b */
+-	{ 0x78,0x27,108}, /* 0x4c - was 102 */  /* TW: Last entry in 650/301 BIOS */
++	{ 0x78,0x27,108}, /* 0x4c - was 102 */
+ 	{ 0x66,0x43,123}, /* 0x4d */  /* Modes 0x26-0x28 (1400x1050) */
+ 	{ 0x41,0x4e, 21}, /* 0x4e */
+ 	{ 0xa1,0x4a, 29}, /* 0x4f */  /* Chrontel */
+@@ -1110,7 +707,8 @@ static const SiS310_VCLKDataStruct SiS31
+ 	{ 0xbf,0xc8, 35}, /* 0x57 - added for 856x480-38i,60 (not in any BIOS) */
+ 	{ 0x30,0x23, 88}, /* 0x58 - added for 1360x768-62 (is 60Hz!) (not in any BIOS) */
+ 	{ 0x52,0x07,149}, /* 0x59 - added for 1280x960-85 (Not in any BIOS) */
+-	{ 0x56,0x07,156}  /* 0x5a - added for 1400x1050-75 */
++	{ 0x56,0x07,156}, /* 0x5a - added for 1400x1050-75 */
++   	{ 0x70,0x29, 81}  /* 0x5b */  /* 1280x768 LCD */
+ };
+ 
+ typedef struct _SiS310_VBVCLKDataStruct
+@@ -1121,22 +719,22 @@ typedef struct _SiS310_VBVCLKDataStruct
+ 
+ static const SiS310_VBVCLKDataStruct SiS310_VBVCLKData[]=
+ {
+-	{ 0x1b,0xe1, 25}, /* 0x0 */   /* 650/LVDS BIOS: @ 0x579c */
+-	{ 0x4e,0xe4, 28}, /* 0x1 */
+-	{ 0x57,0xe4, 31}, /* 0x2 */
+-	{ 0xc3,0xc8, 36}, /* 0x3 */
+-	{ 0x42,0x47, 40}, /* 0x4 */
+-	{ 0xfe,0xcd, 43}, /* 0x5 */
+-	{ 0x5d,0xc4, 44}, /* 0x6 */
+-	{ 0x52,0x47, 49}, /* 0x7 */
+-	{ 0x53,0x47, 50}, /* 0x8 */
+-	{ 0x74,0x67, 52}, /* 0x9 */
+-	{ 0x6d,0x66, 56}, /* 0xa */
+-	{ 0x35,0x62, 65}, /* 0xb */  /* Was 0x5a,0x64 - 650/LVDS+301 bios: 35,62  */
+-	{ 0x46,0x44, 67}, /* 0xc */
+-	{ 0xb1,0x46, 68}, /* 0xd */
+-	{ 0xd3,0x4a, 72}, /* 0xe */
+-	{ 0x29,0x61, 75}, /* 0xf */
++	{ 0x1b,0xe1, 25}, /* 0x00 */
++	{ 0x4e,0xe4, 28}, /* 0x01 */
++	{ 0x57,0xe4, 31}, /* 0x02 */
++	{ 0xc3,0xc8, 36}, /* 0x03 */
++	{ 0x42,0x47, 40}, /* 0x04 */
++	{ 0xfe,0xcd, 43}, /* 0x05 */
++	{ 0x5d,0xc4, 44}, /* 0x06 */
++	{ 0x52,0x47, 49}, /* 0x07 */
++	{ 0x53,0x47, 50}, /* 0x08 */
++	{ 0x74,0x67, 52}, /* 0x09 */
++	{ 0x6d,0x66, 56}, /* 0x0a */
++	{ 0x35,0x62, 65}, /* 0x0b */  /* Was 0x5a,0x64 - 650/LVDS+301 bios: 35,62  */
++	{ 0x46,0x44, 67}, /* 0x0c */
++	{ 0xb1,0x46, 68}, /* 0x0d */
++	{ 0xd3,0x4a, 72}, /* 0x0e */
++	{ 0x29,0x61, 75}, /* 0x0f */
+ 	{ 0x6d,0x46, 75}, /* 0x10 */
+ 	{ 0x41,0x43, 78}, /* 0x11 */
+ 	{ 0x31,0x42, 79}, /* 0x12 */
+@@ -1146,7 +744,7 @@ static const SiS310_VBVCLKDataStruct SiS
+ 	{ 0x62,0x44, 94}, /* 0x16 */
+ 	{ 0x2b,0x22,104}, /* 0x17 */
+ 	{ 0x49,0x24,105}, /* 0x18 */
+-	{ 0xf8,0x2f,108}, /* 0x19 */
++	{ 0xf8,0x2f,108}, /* 0x19 */  /* 1400x1050 LCD */
+ 	{ 0x3c,0x23,109}, /* 0x1a */
+ 	{ 0x5e,0x43,113}, /* 0x1b */
+ 	{ 0xbc,0x44,116}, /* 0x1c */
+@@ -1179,19 +777,19 @@ static const SiS310_VBVCLKDataStruct SiS
+ 	{ 0xea,0x08,340}, /* 0x37 */
+ 	{ 0xe8,0x07,376}, /* 0x38 */
+ 	{ 0xde,0x06,389}, /* 0x39 */
+-	{ 0x52,0x2a, 54}, /* 0x3a */
+-	{ 0x52,0x6a, 27}, /* 0x3b */
+-	{ 0x62,0x24, 70}, /* 0x3c */
+-	{ 0x62,0x64, 70}, /* 0x3d */
+-	{ 0xa8,0x4c, 30}, /* 0x3e */
+-	{ 0x20,0x26, 33}, /* 0x3f */
++	{ 0x52,0x2a, 54}, /* 0x3a */  /* 301 TV */
++	{ 0x52,0x6a, 27}, /* 0x3b */  /* 301 TV */
++	{ 0x62,0x24, 70}, /* 0x3c */  /* 301 TV */
++	{ 0x62,0x64, 70}, /* 0x3d */  /* 301 TV */
++	{ 0xa8,0x4c, 30}, /* 0x3e */  /* 301 TV */
++	{ 0x20,0x26, 33}, /* 0x3f */  /* 301 TV */
+ 	{ 0x31,0xc2, 39}, /* 0x40 */
+-	{ 0x2e,0x48, 25}, /* 0x41 */
+-	{ 0x24,0x46, 25}, /* 0x42 */
+-	{ 0x26,0x64, 28}, /* 0x43 */
+-	{ 0x37,0x64, 40}, /* 0x44 */
+-	{ 0xa1,0x42,108}, /* 0x45 */
+-	{ 0x37,0x61,100}, /* 0x46 */
++	{ 0x2e,0x48, 25}, /* 0x41 */  /* Replacement for LCD on 315 for index 0 */
++	{ 0x24,0x46, 25}, /* 0x42 */  /* Replacement for LCD on 315 for modes 0x01, 0x03, 0x0f, 0x10, 0x12 */
++	{ 0x26,0x64, 28}, /* 0x43 */  /* Replacement for LCD on 315 for index 1 */
++	{ 0x37,0x64, 40}, /* 0x44 */  /* Replacement for LCD on 315 for index 4 */
++	{ 0xa1,0x42,108}, /* 0x45 */  /* 1280x960 LCD */
++	{ 0x37,0x61,100}, /* 0x46 */  /* 1280x960 LCD */
+ 	{ 0x78,0x27,108}, /* 0x47 */
+ 	{ 0x97,0x2c, 26}, /* 0x48 */  /* UNUSED - Entries from here new, not in any BIOS */
+ 	{ 0xce,0x3c, 39}, /* 0x49 */  /* UNUSED */
+@@ -1211,72 +809,17 @@ static const SiS310_VBVCLKDataStruct SiS
+ 	{ 0xbf,0xc8, 35}, /* 0x57 */  /* 856x480-38i,60  */
+ 	{ 0x30,0x23, 88}, /* 0x58 */  /* 1360x768-62 (is 60Hz!) TEMP, UNUSED */
+ 	{ 0x52,0x07,149}, /* 0x59 */  /* 1280x960-85  - UNUSED */
+-	{ 0x56,0x07,156}  /* 0x5a */  /* 1400x1050-75 - UNUSED */
++	{ 0x56,0x07,156}, /* 0x5a */  /* 1400x1050-75 - UNUSED */
++   	{ 0x70,0x29, 81}  /* 0x5b */  /* 1280x768 LCD */
+ };
+ 
+ static const UCHAR SiS310_ScreenOffset[] = 
+ {
+         0x14,0x19,0x20,0x28,0x32,0x40,0x50,0x64,
+-	0x78,0x80,0x2d,0x35,0x57,0x48,0x55,
++	0x78,0x80,0x2d,0x35,0x57,0x48,0x55,0x30,
+ 	0xff
+-};      /* TW: Added 1400x1050, 1152x864, 848/856x480, 1360x768 */
+-
+-typedef struct _SiS310_StResInfoStruct
+-{
+-	USHORT HTotal;
+-	USHORT VTotal;
+-} SiS310_StResInfoStruct;
+-
+-static const SiS310_StResInfoStruct SiS310_StResInfo[]=
+-{
+-	{ 640,400},
+-	{ 640,350},
+-	{ 720,400},
+-	{ 720,350},
+-	{ 640,480}
+-};
+-
+-typedef struct _SiS310_ModeResInfoStruct
+-{
+-	USHORT HTotal;
+-	USHORT VTotal;
+-	UCHAR  XChar;
+-	UCHAR  YChar;
+-} SiS310_ModeResInfoStruct;
+-
+-static const SiS310_ModeResInfoStruct SiS310_ModeResInfo[] =
+-{
+-	{  320, 200, 8, 8},   /* 0x00 */
+-	{  320, 240, 8, 8},   /* 0x01 */
+-	{  320, 400, 8, 8},   /* 0x02 */
+-	{  400, 300, 8, 8},   /* 0x03 */
+-	{  512, 384, 8, 8},   /* 0x04 */
+-	{  640, 400, 8,16},   /* 0x05 */
+-	{  640, 480, 8,16},   /* 0x06 */
+-	{  800, 600, 8,16},   /* 0x07 */
+-	{ 1024, 768, 8,16},   /* 0x08 */
+-	{ 1280,1024, 8,16},   /* 0x09 */
+-	{ 1600,1200, 8,16},   /* 0x0a */
+-	{ 1920,1440, 8,16},   /* 0x0b */
+-	{ 2048,1536, 8,16},   /* 0x0c */
+-	{  720, 480, 8,16},   /* 0x0d */
+-	{  720, 576, 8,16},   /* 0x0e */
+-	{ 1280, 960, 8,16},   /* 0x0f */
+-	{  800, 480, 8,16},   /* 0x10 */
+-	{ 1024, 576, 8,16},   /* 0x11 */
+-	{ 1280, 720, 8,16},   /* 0x12 */
+-	{  856, 480, 8,16},   /* 0x13 - TW: New, not in any BIOS */
+-	{ 1280, 768, 8,16},   /* 0x14 20; TW: New */
+-	{ 1400,1050, 8,16},   /* 0x15 21; TW: New */
+-	{ 1152, 864, 8,16},   /* 0x16 - TW: New, not in any BIOS */
+-	{  848, 480, 8,16},   /* 0x17 - TW: New, not in any BIOS */
+-	{ 1360, 768, 8,16}    /* 0x18 - TW: New, not in any BIOS */
+ };
+ 
+-static const UCHAR SiS310_OutputSelect = 0x40;
+-
+-static const UCHAR SiS310_SoftSetting  = 0x30;   /* TW: RAM setting */
+-
+ static const UCHAR SiS310_SR15[8][4]={
+ 	{0x00,0x04,0x60,0x60},
+ 	{0x0f,0x0f,0x0f,0x0f},
+@@ -1322,16 +865,6 @@ static const USHORT SiS310_VideoSenseDat
+ static const USHORT SiS310_YCSenseData2    = 0x016b;
+ #endif
+ 
+-static const UCHAR SiS310_NTSCPhase[]    = {0x21,0xed,0xba,0x08};  /* TW: Was {0x21,0xed,0x8a,0x08}; */
+-static const UCHAR SiS310_PALPhase[]     = {0x2a,0x05,0xe3,0x00};  /* TW: Was {0x2a,0x05,0xd3,0x00}; */
+-static const UCHAR SiS310_PALMPhase[]    = {0x21,0xE4,0x2E,0x9B};  /* TW: palm*/
+-static const UCHAR SiS310_PALNPhase[]    = {0x21,0xF4,0x3E,0xBA};  /* TW: paln*/
+-static const UCHAR SiS310_NTSCPhase2[]   = {0x21,0xF0,0x7B,0xD6};
+-static const UCHAR SiS310_PALPhase2[]    = {0x2a,0x09,0x86,0xe9};
+-static const UCHAR SiS310_PALMPhase2[]   = {0x21,0xE6,0xEF,0xA4};  /* TW: palm 301b*/
+-static const UCHAR SiS310_PALNPhase2[]   = {0x21,0xF6,0x94,0x46};  /* TW: paln 301b*/
+-static const UCHAR SiS310_SpecialPhase[] = {0x1e,0x8c,0x5c,0x7a};
+-
+ typedef struct _SiS310_LCDDataStruct
+ {
+ 	USHORT RVBHCMAX;
+@@ -1353,25 +886,6 @@ static const SiS310_LCDDataStruct  SiS31
+ 	{    1,   1,1344, 806,1344, 806}
+ };
+ 
+-#if 0   /* Seems out-dated, all BIOSes since 03/27/2002 have the other version */
+-static const SiS310_LCDDataStruct  SiS310_ExtLCD1024x768Data[] = 
+-{
+-	{   12,   5, 896, 512,1344, 806},
+-	{   12,   5, 896, 510,1344, 806},
+-	{   32,  15,1008, 505,1344, 806},
+-	{   32,  15,1008, 514,1344, 806},
+-	{   12,   5, 896, 500,1344, 806},
+-	{   42,  25,1024, 625,1344, 806},
+-	{    1,   1,1344, 806,1344, 806},
+-	{   12,   5, 896, 500,1344, 806},
+-	{   42,  25,1024, 625,1344, 806},
+-	{    1,   1,1344, 806,1344, 806},
+-	{   12,   5, 896, 500,1344, 806},
+-	{   42,  25,1024, 625,1344, 806},
+-	{    1,   1,1344, 806,1344, 806}
+-};
+-#endif
+-
+ static const SiS310_LCDDataStruct  SiS310_ExtLCD1024x768Data[] =   
+ {
+ 	{   42,  25,1536, 419,1344, 806},
+@@ -1413,7 +927,7 @@ static const SiS310_LCDDataStruct  SiS31
+ 	{    1,   1,1688,1066,1688,1066}
+ };
+ 
+-static const SiS310_LCDDataStruct  SiS310_ExtLCD1280x1024Data[] = 
++static const SiS310_LCDDataStruct  SiS310_ExtLCD1280x1024Data[] =
+ {
+ 	{  211,  60,1024, 501,1688,1066},
+ 	{  211,  60,1024, 508,1688,1066},
+@@ -1450,7 +964,7 @@ static const SiS310_LCDDataStruct  SiS31
+ 	{    1,   1,1344, 806,1344, 806}
+ };
+ 
+-static const SiS310_LCDDataStruct  SiS310_NoScaleData1280x1024[] =  
++static const SiS310_LCDDataStruct  SiS310_NoScaleData1280x1024[] =
+ {
+         {    1,   1,1688,1066,1688,1066},
+ 	{    1,   1,1688,1066,1688,1066},
+@@ -1463,272 +977,15 @@ static const SiS310_LCDDataStruct  SiS31
+ 	{    1,   1,1688,1066,1688,1066}
+ };
+ 
+-static const SiS310_LCDDataStruct  SiS310_LCD1280x960Data[] =
+-{
+-	{    9,   2, 800, 500,1800,1000},
+-	{    9,   2, 800, 500,1800,1000},
+-	{    4,   1, 900, 500,1800,1000},
+-	{    4,   1, 900, 500,1800,1000},
+-	{    9,   2, 800, 500,1800,1000},
+-	{   30,  11,1056, 625,1800,1000},
+-	{    5,   3,1350, 800,1800,1000},
+-	{    1,   1,1576,1050,1576,1050},
+-	{    1,   1,1800,1000,1800,1000}
+-};
+-
+-static const SiS310_LCDDataStruct  SiS310_StLCD1400x1050Data[] = 
+-{  /* TW: New from 1.11.6s */
+-	{ 211,  100, 2100,  408, 1688, 1066 },
+-	{ 211,   64, 1536,  358, 1688, 1066 },
+-	{ 211,  100, 2100,  408, 1688, 1066 },
+-	{ 211,   64, 1536,  358, 1688, 1066 },
+-	{ 211,   48,  840,  488, 1688, 1066 },
+-	{ 211,   72, 1008,  609, 1688, 1066 },
+-	{ 211,  128, 1400,  776, 1688, 1066 },
+-	{ 211,  205, 1680, 1041, 1688, 1066 },
+-	{   1,    1, 1688, 1066, 1688, 1066 }
+-};
+-
+-static const SiS310_LCDDataStruct  SiS310_ExtLCD1400x1050Data[] = 
+-{  /* TW: New from 1.11.6s */
+-	{ 211,  100, 2100,  408, 1688, 1066 },
+-	{ 211,   64, 1536,  358, 1688, 1066 },
+-	{ 211,  100, 2100,  408, 1688, 1066 },
+-	{ 211,   64, 1536,  358, 1688, 1066 },
+-	{ 211,   48,  840,  488, 1688, 1066 },
+-	{ 211,   72, 1008,  609, 1688, 1066 },
+-	{ 211,  128, 1400,  776, 1688, 1066 },
+-	{ 211,  205, 1680, 1041, 1688, 1066 },
+-	{   1,    1, 1688, 1066, 1688, 1066 }
+-};
+-
+-static const SiS310_LCDDataStruct  SiS310_NoScaleData1400x1050[] = 
+-{  /* TW: To be checked (BIOS uses 1280x1024 data, one line too short) */
+-	{ 1, 1, 1688, 1066, 1688, 1066 },
+-	{ 1, 1, 1688, 1066, 1688, 1066 },
+-	{ 1, 1, 1688, 1066, 1688, 1066 },
+-	{ 1, 1, 1688, 1066, 1688, 1066 },
+-	{ 1, 1, 1688, 1066, 1688, 1066 },
+-	{ 1, 1, 1688, 1066, 1688, 1066 },
+-	{ 1, 1, 1688, 1066, 1688, 1066 },
+-	{ 1, 1, 1688, 1066, 1688, 1066 },
+-	{ 1, 1, 1688, 1066, 1688, 1066 }
+-};
+-
+-static const SiS310_LCDDataStruct  SiS310_StLCD1600x1200Data[] = 
+-{  /* TODO */
+-	{    0,   0,   0,   0,   0,   0}
+-};
+-
+-static const SiS310_LCDDataStruct  SiS310_ExtLCD1600x1200Data[] = 
+-{  /* TODO */
+-	{    0,   0,   0,   0,   0,   0}
+-};
+-
+-static const SiS310_LCDDataStruct  SiS310_NoScaleData1600x1200[] = 
+-{  /* TODO */
+-	{    0,   0,   0,   0,   0,   0}
+-};
+-
+-typedef struct _SiS310_TVDataStruct
+-{
+-	USHORT RVBHCMAX;
+-	USHORT RVBHCFACT;
+-	USHORT VGAHT;
+-	USHORT VGAVT;
+-	USHORT TVHDE;
+-	USHORT TVVDE;
+-	USHORT RVBHRS;
+-	UCHAR FlickerMode;
+-	USHORT HALFRVBHRS;
+-	UCHAR RY1COE;
+-	UCHAR RY2COE;
+-	UCHAR RY3COE;
+-	UCHAR RY4COE;
+-} SiS310_TVDataStruct;
+-
+-static const SiS310_TVDataStruct  SiS310_StPALData[]=
+-{
+- {    1,   1, 864, 525,1270, 400, 100,   0, 760,0xf4,0xff,0x1c,0x22},
+- {    1,   1, 864, 525,1270, 350, 100,   0, 760,0xf4,0xff,0x1c,0x22},
+- {    1,   1, 864, 525,1270, 400,   0,   0, 720,0xf1,0x04,0x1f,0x18},
+- {    1,   1, 864, 525,1270, 350,   0,   0, 720,0xf4,0x0b,0x1c,0x0a},
+- {    1,   1, 864, 525,1270, 480,  50,   0, 760,0xf4,0xff,0x1c,0x22},
+- {    1,   1, 864, 525,1270, 600,  50,   0,   0,0xf4,0xff,0x1c,0x22}
+-};
+-
+-static const SiS310_TVDataStruct  SiS310_ExtPALData[] =   
+-{
+- {   27,  10, 848, 448,1270, 530,  50,   0,  50,0xf4,0xff,0x1c,0x22},
+- {  108,  35, 848, 398,1270, 530,  50,   0,  50,0xf4,0xff,0x1c,0x22},
+- {   12,   5, 954, 448,1270, 530,  50,   0,  50,0xf1,0x04,0x1f,0x18},
+- {    9,   4, 960, 463,1644, 438,  50,   0,  50,0xf4,0x0b,0x1c,0x0a},
+- {    9,   4, 848, 528,1270, 530,   0,   0,  50,0xf5,0xfb,0x1b,0x2a},  /* 640x480 */
+- {   36,  25,1060, 648,1316, 530, 438,   0, 438,0xeb,0x05,0x25,0x16},  /* 800x600 */
+- {    3,   2,1080, 619,1270, 540, 438,   0, 438,0xf3,0x00,0x1d,0x20},  /* 720x480/576 */
+- {    1,   1,1170, 821,1270, 520, 686,   0, 686,0xF3,0x00,0x1D,0x20}   /* 1024x768 */
+-};
+-
+-static const SiS310_TVDataStruct  SiS310_StNTSCData[]=
+-{
+- {    1,   1, 858, 525,1270, 400,  50,   0, 760,0xf1,0x04,0x1f,0x18},
+- {    1,   1, 858, 525,1270, 350,  50,   0, 640,0xf1,0x04,0x1f,0x18},
+- {    1,   1, 858, 525,1270, 400,   0,   0, 720,0xf1,0x04,0x1f,0x18},
+- {    1,   1, 858, 525,1270, 350,   0,   0, 720,0xf4,0x0b,0x1c,0x0a},
+- {    1,   1, 858, 525,1270, 480,   0,   0, 760,0xf1,0x04,0x1f,0x18}
+-};
+-
+-static const SiS310_TVDataStruct  SiS310_ExtNTSCData[]=
+-{
+- {  143,  65, 858, 443,1270, 440, 171,   0, 171,0xf1,0x04,0x1f,0x18},
+- {   88,  35, 858, 393,1270, 440, 171,   0, 171,0xf1,0x04,0x1f,0x18},
+- {  143,  70, 924, 443,1270, 440,  92,   0,  92,0xf1,0x04,0x1f,0x18},
+- {  143,  70, 924, 393,1270, 440,  92,   0,  92,0xf4,0x0b,0x1c,0x0a},
+- {  143,  76, 836, 523,1270, 440, 224,   0,   0,0xf1,0x05,0x1f,0x16},  /* 640x480 */
+- {  143, 120,1056, 643,1270, 440,   0, 128,   0,0xf4,0x10,0x1c,0x00},  /* 800x600  */
+- {    2,   1, 858, 503,1270, 480,   0, 128,   0,0xee,0x0c,0x22,0x08},  /* 720x480/576 */
+- {   65,  64,1056, 791,1270, 480, 638,   0,   0,0xEE,0x0C,0x22,0x08}   /* 1024x768 */
+-};
+-
+-#if 0
+-static const SiS310_TVDataStruct  SiS310_St1HiTVData[]=
+-{
+-  
+-};
+-#endif
+-
+-static const SiS310_TVDataStruct  SiS310_St2HiTVData[]=
+-{
+- {    3,   1, 0x348,0x1e3,0x670,0x3c0,0x032,  0, 0, 0x00,0x00,0x00,0x00},
+- {    1,   1, 0x37c,0x233,0x2b2,0x2bc, 	  0,  0, 0, 0x00,0x00,0x00,0x00},
+- {    3,   1, 0x348,0x1e3,0x670,0x3c0,0x032,  0, 0, 0x00,0x00,0x00,0x00},
+- {    1,   1, 0x3e8,0x233,0x311,0x2bc,    0,  0, 0, 0x00,0x00,0x00,0x00},
+- {    5,   2, 0x348,0x233,0x670,0x3c0,0x08d,128, 0, 0x00,0x00,0x00,0x00},
+- {    8,   5, 0x41a,0x2ab,0x670,0x3c0,0x17c,128, 0, 0x00,0x00,0x00,0x00}
+-};
+-
+-static const SiS310_TVDataStruct  SiS310_ExtHiTVData[]=
+-{
+- {    6,   1, 0x348,0x233,0x660,0x3c0,    0,  0, 0, 0x00,0x00,0x00,0x00},
+- {    3,   1, 0x3c0,0x233,0x660,0x3c0,    0,  0, 0, 0x00,0x00,0x00,0x00},
+- {    3,   1, 0x348,0x1e3,0x660,0x3c0,    0,  0, 0, 0x00,0x00,0x00,0x00},
+- {    3,   1, 0x3c0,0x233,0x660,0x3c0,    0,  0, 0, 0x00,0x00,0x00,0x00},
+- {    5,   1, 0x348,0x233,0x670,0x3c0,0x166,128, 0, 0x00,0x00,0x00,0x00},
+- {   16,   5, 0x41a,0x2ab,0x670,0x3c0,0x143,128, 0, 0x00,0x00,0x00,0x00},
+- {   25,  12, 0x4ec,0x353,0x670,0x3c0,0x032,  0, 0, 0x00,0x00,0x00,0x00},
+- {    5,   4, 0x627,0x464,0x670,0x3c0,0x128,  0, 0, 0x00,0x00,0x00,0x00},
+- {    4,   1, 0x41a,0x233,0x670,0x3c0,0x143,128, 0, 0x00,0x00,0x00,0x00},
+- {    5,   2, 0x578,0x293,0x670,0x3c0,0x032,  0, 0, 0x00,0x00,0x00,0x00},
+- {    8,   5, 0x6d6,0x323,0x670,0x3c0,0x128,  0, 0, 0x00,0x00,0x00,0x00}
+-};
+-
+-static const UCHAR SiS310_NTSCTiming[] = { 
+-	0x17,0x1d,0x03,0x09,0x05,0x06,0x0c,0x0c,
+-	0x94,0x49,0x01,0x0a,0x06,0x0d,0x04,0x0a,
+-	0x06,0x14,0x0d,0x04,0x0a,0x00,0x85,0x1b,
+-	0x0c,0x50,0x00,0x97,0x00,0xda,0x4a,0x17,
+-	0x7d,0x05,0x4b,0x00,0x00,0xe2,0x00,0x02,
+-	0x03,0x0a,0x65,0x9d,0x08,0x92,0x8f,0x40,
+-	0x60,0x80,0x14,0x90,0x8c,0x60,0x14,0x50,
+-	0x00,0x40,0x44,0x00,0xdb,0x02,0x3b,0x00
+-};
+-
+-static const UCHAR SiS310_PALTiming[] = {  
+-	0x19,0x52,0x35,0x6e,0x04,0x38,0x3d,0x70,
+-	0x94,0x49,0x01,0x12,0x06,0x3e,0x35,0x6d,
+-	0x06,0x14,0x3e,0x35,0x6d,0x00,0x45,0x2b,
+-	0x70,0x50,0x00,0x9b,0x00,0xd9,0x5d,0x17,
+-	0x7d,0x05,0x45,0x00,0x00,0xe8,0x00,0x02,
+-	0x0d,0x00,0x68,0xb0,0x0b,0x92,0x8f,0x40,
+-	0x60,0x80,0x14,0x90,0x8c,0x60,0x14,0x63,
+-	0x00,0x40,0x3e,0x00,0xe1,0x02,0x28,0x00
+-};
+-
+-static const UCHAR SiS310_HiTVExtTiming[] = {  
+-        0x32,0x65,0x2c,0x5f,0x08,0x31,0x3a,0x64,
+-	0x28,0x02,0x01,0x3d,0x06,0x3e,0x35,0x6d,
+-	0x06,0x14,0x3e,0x35,0x6d,0x00,0xc5,0x3f,
+-	0x64,0x90,0x33,0x8c,0x18,0x36,0x3e,0x13,
+-	0x2a,0xde,0x2a,0x44,0x40,0x2a,0x44,0x40,
+-	0x8e,0x8e,0x82,0x07,0x0b,0x92,0x0f,0x40,
+-	0x60,0x80,0x14,0x90,0x8c,0x60,0x14,0x3d,
+-	0x63,0x4f,0x27,0x00,0xfc,0xff,0x6a,0x00
+-};
+-
+-static const UCHAR SiS310_HiTVSt1Timing[] = {  
+-        0x32,0x65,0x2c,0x5f,0x08,0x31,0x3a,0x65,
+-	0x28,0x02,0x01,0x3d,0x06,0x3e,0x35,0x6d,
+-	0x06,0x14,0x3e,0x35,0x6d,0x00,0xc5,0x3f,
+-	0x65,0x90,0x7b,0xa8,0x03,0xf0,0x87,0x03,
+-	0x11,0x15,0x11,0xcf,0x10,0x11,0xcf,0x10,
+-	0x35,0x35,0x3b,0x69,0x1d,0x92,0x0f,0x40,
+-	0x60,0x80,0x14,0x90,0x8c,0x60,0x04,0x86,
+-	0xaf,0x5d,0x0e,0x00,0xfc,0xff,0x2d,0x00
+-};
+-
+-static const UCHAR SiS310_HiTVSt2Timing[] = {  
+-        0x32,0x65,0x2c,0x5f,0x08,0x31,0x3a,0x64,
+-	0x28,0x02,0x01,0x3d,0x06,0x3e,0x35,0x6d,
+-	0x06,0x14,0x3e,0x35,0x6d,0x00,0xc5,0x3f,
+-	0x64,0x90,0x33,0x8c,0x18,0x36,0x3e,0x13,
+-	0x2a,0xde,0x2a,0x44,0x40,0x2a,0x44,0x40,
+-	0x8e,0x8e,0x82,0x07,0x0b,0x92,0x0f,0x40,
+-	0x60,0x80,0x14,0x90,0x8c,0x60,0x14,0x3d,
+-	0x63,0x4f,0x27,0x00,0xfc,0xff,0x6a,0x00
+-};
+-
+-static const UCHAR SiS310_HiTVTextTiming[] = {  
+-        0x32,0x65,0x2c,0x5f,0x08,0x31,0x3a,0x65,
+-	0x28,0x02,0x01,0x3d,0x06,0x3e,0x35,0x6d,
+-	0x06,0x14,0x3e,0x35,0x6d,0x00,0xc5,0x3f,
+-	0x65,0x90,0xe7,0xbc,0x03,0x0c,0x97,0x03,
+-	0x14,0x78,0x14,0x08,0x20,0x14,0x08,0x20,
+-	0xc8,0xc8,0x3b,0xd2,0x26,0x92,0x0f,0x40,
+-        0x60,0x80,0x14,0x90,0x8c,0x60,0x04,0x96,
+-	0x72,0x5c,0x11,0x00,0xfc,0xff,0x32,0x00
+-};
+-
+-static const UCHAR SiS310_HiTVGroup3Data[] = {  
+-        0x00,0x1a,0x22,0x63,0x62,0x22,0x08,0x5f,
+-	0x05,0x21,0xb2,0xb2,0x55,0x77,0x2a,0xa6,
+-	0x25,0x2f,0x47,0xfa,0xc8,0xff,0x8e,0x20,
+-	0x8c,0x6e,0x60,0x2e,0x58,0x48,0x72,0x44,
+-	0x56,0x36,0x4f,0x6e,0x3f,0x80,0x00,0x80,
+-	0x4f,0x7f,0x03,0xa8,0x7d,0x20,0x1a,0xa9,
+-	0x14,0x05,0x03,0x7e,0x64,0x31,0x14,0x75,
+-	0x18,0x05,0x18,0x05,0x4c,0xa8,0x01
+-};
+-
+-static const UCHAR SiS310_HiTVGroup3Simu[] = {  
+-        0x00,0x1a,0x22,0x63,0x62,0x22,0x08,0x95,
+-	0xdb,0x20,0xb8,0xb8,0x55,0x47,0x2a,0xa6,
+-	0x25,0x2f,0x47,0xfa,0xc8,0xff,0x8e,0x20,
+-	0x8c,0x6e,0x60,0x15,0x26,0xd3,0xe4,0x11,
+-	0x56,0x36,0x4f,0x6e,0x3f,0x80,0x00,0x80,
+-	0x67,0x36,0x01,0x47,0x0e,0x10,0xbe,0xb4,
+-	0x01,0x05,0x03,0x7e,0x65,0x31,0x14,0x75,
+-	0x18,0x05,0x18,0x05,0x4c,0xa8,0x01
+-};
+-
+-static const UCHAR SiS310_HiTVGroup3Text[] = {  
+-        0x00,0x1a,0x22,0x63,0x62,0x22,0x08,0xa7,
+-	0xf5,0x20,0xce,0xce,0x55,0x47,0x2a,0xa6,
+-	0x25,0x2f,0x47,0xfa,0xc8,0xff,0x8e,0x20,
+-	0x8c,0x6e,0x60,0x18,0x2c,0x0c,0x20,0x22,
+-	0x56,0x36,0x4f,0x6e,0x3f,0x80,0x00,0x80,
+-	0x93,0x3c,0x01,0x50,0x2f,0x10,0xf4,0xca,
+-	0x01,0x05,0x03,0x7e,0x65,0x31,0x14,0x75,
+-	0x18,0x05,0x18,0x05,0x4c,0xa8,0x01
+-};
+ 
+ typedef struct _SiS310_PanelDelayTblStruct
+ {
+  	UCHAR timer[2];
+ } SiS310_PanelDelayTblStruct;
+ 
+-static const SiS310_PanelDelayTblStruct SiS310_PanelDelayTbl[]=  
++static const SiS310_PanelDelayTblStruct SiS310_PanelDelayTbl[]=
+ {
+-        {{0x10,0x40}},		/* TW: from 650/301LVx 1.10.6s BIOS */
++        {{0x10,0x40}},
+ 	{{0x10,0x40}},
+ 	{{0x10,0x40}},
+ 	{{0x10,0x40}},
+@@ -1744,24 +1001,6 @@ static const SiS310_PanelDelayTblStruct 
+ 	{{0x10,0x40}},
+ 	{{0x10,0x40}},
+ 	{{0x10,0x40}}
+-#if 0
+-	{{0x28,0xc8}},		/* TW: from 650/301LV BIOS */
+-	{{0x28,0xc8}},
+-	{{0x28,0xc8}},
+-	{{0x28,0xc8}},
+-	{{0x28,0xc8}},
+-	{{0x28,0xc8}},
+-	{{0x28,0xc8}},
+-	{{0x28,0xc8}},
+-	{{0x28,0xc8}},
+-	{{0x28,0xc8}},
+-	{{0x28,0xc8}},
+-	{{0x28,0xc8}},
+-	{{0x28,0xc8}},
+-	{{0x28,0xc8}},
+-	{{0x28,0xc8}},
+-	{{0x28,0xc8}}
+-#endif
+ };
+ 
+ static const SiS310_PanelDelayTblStruct SiS310_PanelDelayTblLVDS[]=
+@@ -1792,363 +1031,7 @@ typedef struct _SiS310_LVDSDataStruct
+ 	USHORT LCDVT;
+ } SiS310_LVDSDataStruct;
+ 
+-static const SiS310_LVDSDataStruct  SiS310_LVDS320x480Data_1[]=
+-{
+-	{ 848, 433, 400, 525},
+-	{ 848, 389, 400, 525},
+-	{ 848, 433, 400, 525},
+-	{ 848, 389, 400, 525},
+-	{ 848, 518, 400, 525},
+-	{1056, 628, 400, 525},
+-	{ 400, 525, 400, 525},
+-	{ 800, 449,1000, 644},
+-	{ 800, 525,1000, 635}
+-};
+-
+-static const SiS310_LVDSDataStruct  SiS310_LVDS800x600Data_1[]= 
+-{
+-	{ 848, 433,1060, 629},
+-	{ 848, 389,1060, 629},
+-	{ 848, 433,1060, 629},
+-	{ 848, 389,1060, 629},
+-	{ 848, 518,1060, 629},
+-	{1056, 628,1056, 628},
+-	{1056, 628,1056, 628},
+-	{ 800, 449,1000, 644},
+-	{ 800, 525,1000, 635}
+-};
+-
+-static const SiS310_LVDSDataStruct  SiS310_LVDS800x600Data_2[]=  
+-{
+-	{1056, 628,1056, 628},
+-	{1056, 628,1056, 628},
+-	{1056, 628,1056, 628},
+-	{1056, 628,1056, 628},
+-	{1056, 628,1056, 628},
+-	{1056, 628,1056, 628},
+-	{1056, 628,1056, 628},
+-	{ 800, 449,1000, 644},
+-	{ 800, 525,1000, 635}
+-};
+-
+-static const SiS310_LVDSDataStruct  SiS310_LVDS1024x768Data_1[]=  
+-{
+-	{ 840, 438,1344, 806},
+-	{ 840, 409,1344, 806},
+-	{ 840, 438,1344, 806},
+-	{ 840, 409,1344, 806},
+-	{ 840, 518,1344, 806},   /* 640x480 */
+-	{1050, 638,1344, 806},   /* 800x600 */
+-	{1344, 806,1344, 806},   /* 1024x768 */
+-	{ 800, 449,1280, 801},
+-	{ 800, 525,1280, 813}
+-};
+-
+-static const SiS310_LVDSDataStruct  SiS310_LVDS1024x768Data_2[]= 
+-{
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{ 800, 449,1280, 801},
+-	{ 800, 525,1280, 813}
+-};
+-
+-static const SiS310_LVDSDataStruct  SiS310_LVDS1280x1024Data_1[]=  
+-{	
+-	{1048, 442,1688,1066},
+-	{1048, 392,1688,1066},
+-	{1048, 442,1688,1066},
+-	{1048, 392,1688,1066},
+-	{1048, 522,1688,1066},
+-	{1208, 642,1688,1066},
+-	{1432, 810,1688,1066},
+-	{1688,1066,1688,1066}
+-};
+-
+-static const SiS310_LVDSDataStruct  SiS310_LVDS1280x1024Data_2[]=  
+-{	
+-	{1688,1066,1688,1066},
+-	{1688,1066,1688,1066},
+-	{1688,1066,1688,1066},
+-	{1688,1066,1688,1066},
+-	{1688,1066,1688,1066},
+-	{1688,1066,1688,1066},
+-	{1688,1066,1688,1066},
+-	{1688,1066,1688,1066}
+-};
+-
+-static const SiS310_LVDSDataStruct  SiS310_LVDS1400x1050Data_1[]=  
+-{
+-        { 928, 416, 1688,1066},
+-	{ 928, 366, 1688,1066},
+-	{ 928, 416, 1688,1066},
+-	{ 928, 366, 1688,1066},
+-	{ 928, 496, 1688,1066},
+-	{1088, 616, 1688,1066},
+-	{1312, 784, 1688,1066},
+-	{1568,1040, 1688,1066},
+-	{1688,1066, 1688,1066}
+-};
+-
+-static const SiS310_LVDSDataStruct  SiS310_LVDS1400x1050Data_2[]= 
+-{
+-        {1688,1066, 1688,1066},
+-	{1688,1066, 1688,1066},
+-	{1688,1066, 1688,1066},
+-	{1688,1066, 1688,1066},
+-	{1688,1066, 1688,1066},
+-	{1688,1066, 1688,1066},
+-	{1688,1066, 1688,1066},
+-	{1688,1066, 1688,1066},
+-	{1688,1066, 1688,1066},
+-};
+-
+-static const SiS310_LVDSDataStruct  SiS310_LVDS1600x1200Data_1[]=  
+-{
+-        {1088, 450, 2048,1250},
+-	{1088, 400, 2048,1250},
+-	{1088, 450, 2048,1250},
+-	{1088, 400, 2048,1250},
+-	{1088, 530, 2048,1250},
+-	{1248, 650, 2048,1250},
+-	{1472, 818, 2048,1250},
+-	{1728,1066, 2048,1250},
+-	{1848,1066, 2048,1250},
+-	{2048,1250, 2048,1250}
+-};
+-
+-static const SiS310_LVDSDataStruct  SiS310_LVDS1600x1200Data_2[]= 
+-{
+-        {2048,1250, 2048,1250},
+-	{2048,1250, 2048,1250},
+-	{2048,1250, 2048,1250},
+-	{2048,1250, 2048,1250},
+-	{2048,1250, 2048,1250},
+-	{2048,1250, 2048,1250},
+-	{2048,1250, 2048,1250},
+-	{2048,1250, 2048,1250},
+-	{2048,1250, 2048,1250},
+-	{2048,1250, 2048,1250}
+-};
+-
+-static const SiS310_LVDSDataStruct  SiS310_LVDS1280x768Data_1[]= 
+-{	
+-	{ 768, 438, 1408, 806},
+-	{ 768, 388, 1408, 806},
+-	{ 768, 438, 1408, 806},
+-	{ 768, 388, 1408, 806},
+-	{ 768, 518, 1408, 806},
+-	{ 928, 638, 1408, 806},
+-	{1152, 806, 1408, 806},
+-	{1408, 806, 1408, 806},
+-	{1408, 806, 1408, 806}
+-};
+-
+-static const SiS310_LVDSDataStruct  SiS310_LVDS1280x768Data_2[]=  
+-{	
+-	{1408, 806, 1408, 806},
+-	{1408, 806, 1408, 806},
+-	{1408, 806, 1408, 806},
+-	{1408, 806, 1408, 806},
+-	{1408, 806, 1408, 806},
+-	{1408, 806, 1408, 806},
+-	{1408, 806, 1408, 806},
+-	{1408, 806, 1408, 806},
+-	{1408, 806, 1408, 806}
+-};
+-
+-static const SiS310_LVDSDataStruct  SiS310_LVDS1024x600Data_1[]=
+-{
+-	{ 840, 604, 1344, 800},
+-	{ 840, 560, 1344, 800},
+-	{ 840, 604, 1344, 800},
+-	{ 840, 560, 1344, 800},
+-	{ 840, 689, 1344, 800},
+-	{1050, 800, 1344, 800},
+-	{1344, 800, 1344, 800},
+-	{ 800, 449, 1280, 801},
+-	{ 800, 525, 1280, 813}
+-};
+-
+-static const SiS310_LVDSDataStruct  SiS310_LVDS1024x600Data_2[]=
+-{
+-	{1344, 800, 1344, 800},
+-	{1344, 800, 1344, 800},
+-	{1344, 800, 1344, 800},
+-	{1344, 800, 1344, 800},
+-	{1344, 800, 1344, 800},
+-	{1344, 800, 1344, 800},
+-	{1344, 800, 1344, 800},
+-	{ 800, 449, 1280, 801},
+-	{ 800, 525, 1280, 813}
+-};
+-
+-static const SiS310_LVDSDataStruct  SiS310_LVDS1152x768Data_1[]=
+-{
+-	{ 840, 438, 1344, 806},
+-	{ 840, 409, 1344, 806},
+-	{ 840, 438, 1344, 806},
+-	{ 840, 409, 1344, 806},
+-	{ 840, 518, 1344, 806},
+-	{1050, 638, 1344, 806},
+-	{1344, 806, 1344, 806},
+-	{ 800, 449, 1280, 801},
+-	{ 800, 525, 1280, 813}
+-};
+-
+-static const SiS310_LVDSDataStruct  SiS310_LVDS1152x768Data_2[]=
+-{
+-	{1344, 806, 1344, 806},
+-	{1344, 806, 1344, 806},
+-	{1344, 806, 1344, 806},
+-	{1344, 806, 1344, 806},
+-	{1344, 806, 1344, 806},
+-	{1344, 806, 1344, 806},
+-	{1344, 806, 1344, 806},
+-	{ 800, 449, 1280, 801},
+-	{ 800, 525, 1280, 813}
+-};
+-
+-/* TW: Pass 1:1 data */
+-static const SiS310_LVDSDataStruct  SiS310_LVDSXXXxXXXData_1[]=  
+-{
+-        { 800, 449,  800, 449},
+-	{ 800, 449,  800, 449},
+-	{ 900, 449,  900, 449},
+-	{ 900, 449,  900, 449},
+-	{ 800, 525,  800, 525},  /*  640x480   */
+-	{1056, 628, 1056, 628},  /*  800x600   */
+-	{1344, 806, 1344, 806},  /* 1024x768   */
+-	{1344,1066, 1344,1066},  /* 1280x1024  */  /* INSERTED ! */
+- 	{1688, 806, 1688, 806},  /* 1280x768 ! */
+-	/* No other panels ! */
+-};
+-
+-static const SiS310_LVDSDataStruct  SiS310_LVDS640x480Data_1[]=  
+-{
+-	{ 800, 449, 800, 449},
+-	{ 800, 449, 800, 449},
+-	{ 800, 449, 800, 449},
+-	{ 800, 449, 800, 449},
+-	{ 800, 525, 800, 525},
+-	{1056, 628,1056, 628},
+-	{1056, 628,1056, 628},
+-	{1056, 628,1056, 628},
+-	{1056, 628,1056, 628}
+-};
+-
+-static const SiS310_LVDSDataStruct  SiS310_LVDS1280x960Data_1[]=   
+-{
+-	{ 840, 438,1344, 806},
+-	{ 840, 409,1344, 806},
+-	{ 840, 438,1344, 806},
+-	{ 840, 409,1344, 806},
+-	{ 840, 518,1344, 806},
+-	{1050, 638,1344, 806},
+-	{1344, 806,1344, 806},
+-	{ 800, 449,1280, 801},
+-	{ 800, 525,1280, 813}
+-};
+-
+-static const SiS310_LVDSDataStruct  SiS310_LVDS1280x960Data_2[]=  
+-{
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{ 800, 449,1280, 801},
+-	{ 800, 525,1280, 813}
+-};
+-
+-/* LCDA */
+-
+-static const SiS310_LVDSDataStruct  SiS310_LCDA1400x1050Data_1[]=   
+-{	/* TW: Might be temporary (invalid) data */
+-        { 928, 416, 1688,1066},
+-	{ 928, 366, 1688,1066},
+-	{1008, 416, 1688,1066},
+-	{1008, 366, 1688,1066},
+-	{1200, 530, 1688,1066},
+-	{1088, 616, 1688,1066},
+-	{1312, 784, 1688,1066},
+-	{1568,1040, 1688,1066},
+-	{1688,1066, 1688,1066}
+-};
+-
+-static const SiS310_LVDSDataStruct  SiS310_LCDA1400x1050Data_2[]=   
+-{	/* TW: Temporary data. Not valid */
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{ 800, 449,1280, 801},
+-	{ 800, 525,1280, 813}
+-};
+-
+-static const SiS310_LVDSDataStruct  SiS310_LCDA1600x1200Data_1[]=  
+-{	/* TW: Temporary data. Not valid */
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{1344, 806,1344, 806},
+-	{ 800, 449,1280, 801},
+-	{ 800, 525,1280, 813}
+-};
+-
+-static const SiS310_LVDSDataStruct  SiS310_LCDA1600x1200Data_2[]=  
+-{	/* TW: Temporary data. Not valid */
+-	{0, 0, 0, 0},
+-	{0, 0, 0, 0},
+-	{0, 0, 0, 0},
+-	{0, 0, 0, 0},
+-	{0, 0, 0, 0},
+-	{0, 0, 0, 0},
+-	{0, 0, 0, 0},
+-	{0, 0, 0, 0},
+-	{0, 0, 0, 0},
+-	{0, 0, 0, 0},
+-	{0, 0, 0, 0},
+-	{0, 0, 0, 0}
+-};
+-
+-/* Chrontel TV */
+-
+-static const SiS310_LVDSDataStruct  SiS310_CHTVUNTSCData[]=   
+-{
+-	{ 840, 600, 840, 600},
+-	{ 840, 600, 840, 600},
+-	{ 840, 600, 840, 600},
+-	{ 840, 600, 840, 600},
+-	{ 784, 600, 784, 600},
+-	{1064, 750,1064, 750},
+-        {1160, 945,1160, 945}           /* TW: For Ch7019 1024 */
+-};
+-
+-static const SiS310_LVDSDataStruct  SiS310_CHTVONTSCData[]=   
+-{
+-	{ 840, 525, 840, 525},
+-	{ 840, 525, 840, 525},
+-	{ 840, 525, 840, 525},
+-	{ 840, 525, 840, 525},
+-	{ 784, 525, 784, 525},
+-	{1040, 700,1040, 700},
+-        {1160, 840,1160, 840}          	/* TW: For Ch7019 1024 */
+-};
+-
+-static const SiS310_LVDSDataStruct  SiS310_CHTVUPALData[]=   
++static const SiS310_LVDSDataStruct  SiS310_CHTVUPALData[]=
+ {
+ 	{1008, 625,1008, 625},
+ 	{1008, 625,1008, 625},
+@@ -2156,7 +1039,7 @@ static const SiS310_LVDSDataStruct  SiS3
+ 	{1008, 625,1008, 625},
+ 	{ 840, 625, 840, 625},
+ 	{ 960, 750, 960, 750},
+-	{1400,1000,1400,1000}   	/*  TW: For Ch7019 1024 */
++	{1400,1000,1400,1000}
+ };
+ 
+ static const SiS310_LVDSDataStruct  SiS310_CHTVOPALData[]= 
+@@ -2167,7 +1050,7 @@ static const SiS310_LVDSDataStruct  SiS3
+ 	{1008, 625,1008, 625},
+ 	{ 840, 625, 840, 625},
+ 	{ 944, 625, 944, 625},
+-        {1400, 875,1400, 875}       	/*  TW: For Ch7019 1024 */
++        {1400, 875,1400, 875}
+ };
+ 
+ static const SiS310_LVDSDataStruct  SiS310_CHTVUPALMData[]=  
+@@ -2178,7 +1061,7 @@ static const SiS310_LVDSDataStruct  SiS3
+ 	{ 840, 600, 840, 600},
+ 	{ 784, 600, 784, 600},
+ 	{1064, 750,1064, 750},
+-        {1160, 945,1160, 945}           /* TW: For Ch7019 1024 */
++        {1160, 945,1160, 945}
+ };
+ 
+ static const SiS310_LVDSDataStruct  SiS310_CHTVOPALMData[]=  
+@@ -2189,7 +1072,7 @@ static const SiS310_LVDSDataStruct  SiS3
+ 	{ 840, 525, 840, 525},
+ 	{ 784, 525, 784, 525},
+ 	{1040, 700,1040, 700},
+-        {1160, 840,1160, 840}          	/* TW: For Ch7019 1024 */
++        {1160, 840,1160, 840}
+ };
+ 
+ static const SiS310_LVDSDataStruct  SiS310_CHTVUPALNData[]=  
+@@ -2200,7 +1083,7 @@ static const SiS310_LVDSDataStruct  SiS3
+ 	{1008, 625,1008, 625},
+ 	{ 840, 625, 840, 625},
+ 	{ 960, 750, 960, 750},
+-	{1400,1000,1400,1000}   	/*  TW: For Ch7019 1024 */
++	{1400,1000,1400,1000}
+ };
+ 
+ static const SiS310_LVDSDataStruct  SiS310_CHTVOPALNData[]= 
+@@ -2211,7 +1094,7 @@ static const SiS310_LVDSDataStruct  SiS3
+ 	{1008, 625,1008, 625},
+ 	{ 840, 625, 840, 625},
+ 	{ 944, 625, 944, 625},
+-        {1400, 875,1400, 875}       	/*  TW: For Ch7019 1024 */
++        {1400, 875,1400, 875}
+ };
+ 
+ static const SiS310_LVDSDataStruct  SiS310_CHTVSOPALData[]=   /* TW: (super overscan - no effect on 7019) */
+@@ -2231,7 +1114,7 @@ typedef struct _SiS310_LVDSDesStruct
+ 	USHORT LCDVDES;
+ } SiS310_LVDSDesStruct;
+ 
+-static const SiS310_LVDSDesStruct  SiS310_PanelType00_1[]=  
++static const SiS310_LVDSDesStruct  SiS310_PanelType00_1[]=  /* 800x600 */
+ {
+ 	{ 0, 0},
+ 	{ 0, 0},
+@@ -2244,7 +1127,7 @@ static const SiS310_LVDSDesStruct  SiS31
+ 	{ 0, 0}
+ };
+ 
+-static const SiS310_LVDSDesStruct  SiS310_PanelType01_1[]=   
++static const SiS310_LVDSDesStruct  SiS310_PanelType01_1[]=  /* 1024x768 */
+ {
+ 	{ 0, 0},
+ 	{ 0, 0},
+@@ -2257,7 +1140,7 @@ static const SiS310_LVDSDesStruct  SiS31
+ 	{ 0, 0}
+ };
+ 
+-static const SiS310_LVDSDesStruct  SiS310_PanelType02_1[]=  
++static const SiS310_LVDSDesStruct  SiS310_PanelType02_1[]=  /* 1280x1024 */
+ {
+ 	{ 0, 0},
+ 	{ 0, 0},
+@@ -2382,33 +1265,31 @@ static const SiS310_LVDSDesStruct  SiS31
+ 	{ 0, 0}
+ };
+ 
+-static const SiS310_LVDSDesStruct  SiS310_PanelType0b_1[]= 
+-{
+-	{1343, 798},
+-	{1343, 794},
+-	{1343, 798},
+-	{1343, 794},
+-	{1343,   0},
+-	{1343,   0},
+-	{ 0, 805},
+-	{ 0, 794},
+-	{ 0,   0}
+-};
+-
+-static const SiS310_LVDSDesStruct  SiS310_PanelType0c_1[]=  
++static const SiS310_LVDSDesStruct  SiS310_PanelType0b_1[]=  /* 640x480_2 */
+ {
+-	{1343, 798},
+-	{1343, 794},
+-	{1343, 798},
+-	{1343, 794},
+-	{1343,   0},
+-	{1343,   0},
+-	{ 0, 805},
+-	{ 0, 794},
+-	{ 0,   0}
++	{ 0, 524},
++	{ 0, 524},
++	{ 0, 524},
++	{ 0, 524},
++	{ 0, 524},
++	{ 0, 524},
++	{ 8, 524},
++	{ 0, 524}
++};
++
++static const SiS310_LVDSDesStruct  SiS310_PanelType0c_1[]=  /* 640x480_3 */
++{
++	{ 0, 524},
++	{ 0, 524},
++	{ 0, 524},
++	{ 0, 524},
++	{ 0, 524},
++	{ 0, 524},
++	{ 8, 524},
++	{ 0, 524}
+ };
+ 
+-static const SiS310_LVDSDesStruct  SiS310_PanelType0d_1[]= 
++static const SiS310_LVDSDesStruct  SiS310_PanelType0d_1[]=
+ {
+ 	{1343, 798},
+ 	{1343, 794},
+@@ -2604,7 +1485,7 @@ static const SiS310_LVDSDesStruct  SiS31
+ 	{   0,   0}
+ };
+ 
+-static const SiS310_LVDSDesStruct  SiS310_PanelType0b_2[]=  
++static const SiS310_LVDSDesStruct  SiS310_PanelType0b_2[]=  /* 640x480_2 */
+ {
+ 	{1152, 622},
+ 	{1152, 597},
+@@ -2617,7 +1498,7 @@ static const SiS310_LVDSDesStruct  SiS31
+ 	{ 0,   0}
+ };
+ 
+-static const SiS310_LVDSDesStruct  SiS310_PanelType0c_2[]= 
++static const SiS310_LVDSDesStruct  SiS310_PanelType0c_2[]=  /* 640x480_3 */
+ {
+ 	{1152, 622},
+ 	{1152, 597},
+@@ -2669,184 +1550,6 @@ static const SiS310_LVDSDesStruct  SiS31
+ 	{ 0,   0}
+ };
+ 
+-static const SiS310_LVDSDesStruct  SiS310_PanelTypeNS_1[]= 
+-{
+-	{ 8,   0},
+-	{ 8,   0},
+-	{ 8,   0},
+-	{ 8,   0},
+-	{ 8,   0},
+-	{ 0,   0},
+-	{ 0,   0},
+-	{ 0,   0},
+-	{ 0, 806},
+-	{ 0, 0 }
+-};
+-
+-static const SiS310_LVDSDesStruct  SiS310_PanelTypeNS_2[] = 
+-{
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0}
+-};
+-
+-static const SiS310_LVDSDesStruct SiS310_PanelType1076_1[]=  
+-{  /* 1024x768 - Checked (1.10.6s) */
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0}
+-};
+-
+-static const SiS310_LVDSDesStruct SiS310_PanelType1076_2[]=  
+-{  /* 1024x768 - Checked (1.10.6s) */
+-	{ 1184, 622 },
+-	{ 1184, 597 },
+-	{ 1184, 622 },
+-	{ 1184, 597 },
+-	{ 1152, 622 },
+-	{ 1232, 722 },
+-	{    0, 0   },
+-	{    0, 794 },
+-	{    0, 0   }
+-};
+-
+-static const SiS310_LVDSDesStruct SiS310_PanelType1210_1[]=  
+-{  /* 1280x1024 - Checked (1.10.6s) */
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0}
+-};
+-
+-static const SiS310_LVDSDesStruct SiS310_PanelType1210_2[]=  
+-{  /* 1280x1024 - Checked (1.10.6s) */
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0}
+-};
+-
+-static const SiS310_LVDSDesStruct SiS310_PanelType1296_1[]=  
+-{  /* 1400x1050 - Checked (1.10.6s) */
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0}
+-};
+-
+-static const SiS310_LVDSDesStruct SiS310_PanelType1296_2[]=  
+-{  /* 1400x1050 - Checked (1.10.6s) - looks heavily invalid */
+-	{ 808 , 740},
+-	{ 0   , 715},
+-	{ 632 , 740},
+-	{ 632 , 715},
+-	{ 1307, 780},
+-	{ 1387,1157},
+-	{ 1499, 924},
+-	{ 1627,1052},
+-	{ 0 , 0}
+-};
+-
+-static const SiS310_LVDSDesStruct SiS310_PanelType1600_1[]= 
+-{  /* 1600x1200 - Checked (1.10.6s) */
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0}
+-};
+-
+-static const SiS310_LVDSDesStruct SiS310_PanelType1600_2[]= 
+-{  /* 1600x1200 - Checked (1.10.6s) - looks heavily invalid, not copied */
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0},
+-	{ 0 , 0}
+-};
+-
+-static const SiS310_LVDSDesStruct  SiS310_CHTVUNTSCDesData[]=
+-{
+-	{ 0,   0},
+-	{ 0,   0},
+-	{ 0,   0},
+-	{ 0,   0},
+-	{ 0,   0},
+-	{ 0,   0},
+-	{ 0,   0}
+-};
+-
+-static const SiS310_LVDSDesStruct  SiS310_CHTVONTSCDesData[]=
+-{
+-	{ 0,   0},
+-	{ 0,   0},
+-	{ 0,   0},
+-	{ 0,   0},
+-	{ 0,   0},
+-	{ 0,   0},
+-	{ 0,   0}
+-};
+-
+-static const SiS310_LVDSDesStruct  SiS310_CHTVUPALDesData[]=
+-{
+-	{256,   0},
+-	{256,   0},
+-	{256,   0},
+-	{256,   0},
+-	{ 0,   0},
+-	{ 0,   0},
+-	{ 0,   0}
+-};
+-
+-static const SiS310_LVDSDesStruct  SiS310_CHTVOPALDesData[]=
+-{
+-	{256,   0},
+-	{256,   0},
+-	{256,   0},
+-	{256,   0},
+-	{ 0,   0},
+-	{ 0,   0},
+-	{ 0,   0}
+-};
+-
+ typedef struct _SiS310_Part2PortTblStruct
+ {
+  	UCHAR CR[12];
+@@ -2866,16 +1569,15 @@ static const SiS310_Part2PortTblStruct S
+ };
+ 
+ static const SiS310_Part2PortTblStruct SiS310_CRT2Part2_1280x1024_1[] =
+-{	/* TW: Temporary data, invalid */
+- {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}},
+- {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}},
+- {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}},
+- {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}},
+- {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x32}},
+- {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x32}},
+- {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x32}},
+- {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x32}},
+- {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}}
++{	/* TW: BIOS data invalid, last row taken from _3 */
++ {{0x25,0x12,0x51,0x6E,0x48,0x99,0x35,0x89,0x47,0xC1,0x49,0x33}},
++ {{0x2C,0x12,0x38,0x55,0x2F,0x99,0x35,0x89,0x47,0xC1,0x49,0x33}},
++ {{0x25,0x12,0x51,0x6E,0x48,0x99,0x35,0x89,0x47,0xC1,0x49,0x33}},
++ {{0x2C,0x12,0x38,0x55,0x2F,0xC1,0x35,0xB1,0x47,0xE9,0x71,0x33}},
++ {{0x2D,0x12,0x79,0x96,0x70,0x99,0x35,0x89,0x47,0xC1,0x49,0x33}},
++ {{0x29,0x12,0xB5,0xD2,0xAC,0xE9,0x35,0xD9,0x47,0x11,0x99,0x33}},
++ {{0x36,0x13,0x02,0x25,0xFF,0x03,0x45,0x09,0x07,0xF9,0x00,0x24}},
++ {{0x47,0x1C,0x14,0x29,0xFF,0xBD,0x23,0x0A,0x07,0x23,0x8A,0x12}}
+ };
+ 
+ static const SiS310_Part2PortTblStruct SiS310_CRT2Part2_1400x1050_1[] =
+@@ -2892,16 +1594,17 @@ static const SiS310_Part2PortTblStruct S
+ };
+ 
+ static const SiS310_Part2PortTblStruct SiS310_CRT2Part2_1600x1200_1[] =
+-{	/* TW: Temporary data, invalid */
+- {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}},
+- {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}},
+- {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}},
+- {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}},
+- {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x32}},
+- {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x32}},
+- {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x32}},
+- {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x32}},
+- {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}}
++{
++ {{0x4C,0x24,0xC8,0xE1,0xAF,0x70,0x34,0x0A,0x07,0xFC,0x2A,0x53}},
++ {{0x4C,0x24,0xC8,0xE1,0xAF,0x70,0x34,0x0A,0x07,0xFC,0x2A,0x53}},
++ {{0x4C,0x24,0xC8,0xE1,0xAF,0x70,0x34,0x0A,0x07,0xFC,0x2A,0x53}},
++ {{0x4C,0x24,0xC8,0xE1,0xAF,0x70,0x34,0x0A,0x07,0xFC,0x2A,0x53}},
++ {{0x4C,0x24,0xC8,0xE1,0xAF,0x70,0x34,0x0A,0x07,0xFC,0x2A,0x53}},
++ {{0x4C,0x24,0xC8,0xE1,0xAF,0x70,0x34,0x0A,0x07,0xFC,0x2A,0x53}},
++ {{0x4C,0x24,0xC8,0xE1,0xAF,0x70,0x34,0x0A,0x07,0xFC,0x2A,0x53}},
++ {{0x4C,0x24,0xC8,0xE1,0xAF,0x70,0x34,0x0A,0x07,0xFC,0x2A,0x53}},
++ {{0x4C,0x24,0xC8,0xE1,0xAF,0x70,0x34,0x0A,0x07,0xFC,0x2A,0x53}},
++ {{0x4C,0x24,0xC8,0xE1,0xAF,0x70,0x34,0x0A,0x07,0xFC,0x2A,0x53}}
+ };
+ 
+ static const SiS310_Part2PortTblStruct SiS310_CRT2Part2_1024x768_2[] =
+@@ -2912,7 +1615,8 @@ static const SiS310_Part2PortTblStruct S
+  {{0x2c,0x12,0x38,0x55,0x2f,0xc1,0x35,0xb1,0x47,0xe9,0x71,0x33}},
+  {{0x2d,0x12,0x79,0x96,0x70,0x99,0x35,0x89,0x47,0xc1,0x49,0x33}},
+  {{0x29,0x12,0xb5,0xd2,0xac,0xe9,0x35,0xd9,0x47,0x11,0x99,0x33}},
+- {{0x36,0x13,0x13,0x25,0xff,0x59,0x45,0x09,0x07,0xf9,0x09,0x24}},
++ {{0x36,0x13,0x13,0x25,0xff,0x59,0x45,0x09,0x07,0xf9,0x09,0x24}},  /* old  */
++/* 0x36,0x13,0x02,0x25,0xff,0x03,0x45,0x09,0x07,0xf9,0x00,0x24        new? */
+  {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}},
+  {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}
+ };
+@@ -2944,21 +1648,23 @@ static const SiS310_Part2PortTblStruct S
+ };
+ 
+ static const SiS310_Part2PortTblStruct SiS310_CRT2Part2_1600x1200_2[] =
+-{	/* TW: Temporary data, invalid */
+- {{0x2b,0x12,0xd9,0xe5,0xd5,0x2c,0x23,0x98,0x27,0x3e,0x08,0x42}},
+- {{0x22,0x12,0xc0,0xcc,0xbc,0x2c,0x23,0x98,0x27,0x3e,0x08,0x42}},
+- {{0x2b,0x12,0xd9,0xe5,0xd5,0x2c,0x23,0x98,0x27,0x3e,0x08,0x42}},
+- {{0x22,0x12,0xc0,0xcc,0xbc,0x2c,0x23,0x98,0x27,0x3e,0x08,0x42}},
+- {{0x33,0x13,0x01,0x0d,0xfd,0x2c,0x23,0x98,0x27,0x3e,0x08,0x42}},
+- {{0x3f,0x1b,0x3d,0x49,0x39,0x54,0x23,0xc0,0x27,0x66,0x30,0x42}},
+- {{0x33,0x1b,0x91,0x9d,0x8d,0x8c,0x23,0xf8,0x27,0x9e,0x68,0x42}},
+- {{0x43,0x24,0x11,0x1d,0x0d,0xcc,0x23,0x38,0x37,0xde,0xa8,0x42}},
+- {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}}
++{
++ {{0x32,0x1B,0x2C,0x52,0x20,0x80,0x20,0x52,0x30,0xA3,0x3A,0x02}},
++ {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}},
++ {{0x32,0x1B,0x2C,0x52,0x20,0x80,0x20,0x52,0x30,0xA3,0x3A,0x02}},
++ {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}},
++ {{0x3A,0x1B,0x54,0x7A,0x48,0x80,0x24,0x52,0x30,0xA3,0x3A,0x02}},
++ {{0x36,0x1B,0x90,0xB6,0x84,0xA8,0x24,0x7A,0x30,0xCB,0x62,0x02}},
++ {{0x3A,0x1C,0xE4,0x0A,0xD8,0xE0,0x24,0xB2,0x30,0x03,0x9A,0x02}},
++ {{0x4A,0x24,0x64,0x8A,0x58,0x20,0x34,0xF2,0x30,0x43,0xDA,0x52}},
++ {{0x47,0x24,0x71,0x97,0x65,0x3E,0x34,0x10,0x40,0x61,0xF8,0x02}},
++ {{0x4C,0x24,0xC8,0xE1,0xAF,0x70,0x34,0x0A,0x07,0xFC,0x2A,0x53}}
+ };
+ 
+ 
+ static const SiS310_Part2PortTblStruct SiS310_CRT2Part2_1024x768_3[] =
+ {	/* TW: Data from 650/301LVx 1.10.6s */
++#if 0
+  {{0x25,0x13,0xc9,0x25,0xff,0x59,0x45,0x09,0x07,0xf9,0x09,0x24}},
+  {{0x2c,0x13,0x9a,0x25,0xff,0x59,0x45,0x09,0x07,0xf9,0x09,0x24}},
+  {{0x25,0x13,0xc9,0x24,0xff,0x59,0x45,0x09,0x07,0xf9,0x09,0x24}},
+@@ -2968,56 +1674,56 @@ static const SiS310_Part2PortTblStruct S
+  {{0x36,0x13,0x13,0x25,0xff,0x59,0x45,0x09,0x07,0xf9,0x09,0x24}},
+  {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}},
+  {{0x25,0x13,0xc9,0x25,0xff,0xf9,0x45,0x09,0x07,0xf9,0x09,0x24}}
+-#if 0	/* TW: Data from 650/301LV */
+- {{0x25,0x12,0xc9,0xdc,0xb6,0x59,0x45,0x09,0x07,0xf9,0x09,0x24}},
+- {{0x2c,0x12,0x9a,0xae,0x88,0x59,0x45,0x09,0x07,0xf9,0x09,0x24}},
+- {{0x25,0x12,0xc9,0xdc,0xb6,0x59,0x45,0x09,0x07,0xf9,0x09,0x24}},
+- {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}},
+- {{0x38,0x13,0x13,0x25,0xff,0x59,0x45,0x09,0x07,0xf9,0x09,0x24}},
+- {{0x38,0x18,0x16,0x00,0x00,0x59,0x45,0x09,0x07,0xf9,0x09,0x24}},
+- {{0x36,0x13,0x13,0x25,0xff,0x59,0x45,0x09,0x07,0xf9,0x09,0x24}},
+- {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}}
+-#endif
++#endif	/* Data from my 301LV */
++ {{0x36,0x13,0x02,0x25,0xff,0x21,0x45,0x09,0x07,0x88,0x09,0x24}},   /* @@@@@ TEST */
++ {{0x36,0x13,0x02,0x25,0xff,0x21,0x45,0x09,0x07,0x88,0x09,0x24}},
++ {{0x36,0x13,0x02,0x25,0xff,0x21,0x45,0x09,0x07,0x88,0x09,0x24}},
++ {{0x36,0x13,0x02,0x25,0xff,0x21,0x45,0x09,0x07,0x88,0x09,0x24}},
++ {{0x36,0x13,0x02,0x25,0xff,0x21,0x45,0x09,0x07,0x88,0x09,0x24}},
++ {{0x36,0x13,0x02,0x25,0xff,0x21,0x45,0x09,0x07,0x88,0x09,0x24}},
++ {{0x36,0x13,0x02,0x25,0xff,0x21,0x45,0x09,0x07,0x88,0x09,0x24}},
++ {{0x36,0x13,0x02,0x25,0xff,0x21,0x45,0x09,0x07,0x88,0x09,0x24}},
++ {{0x36,0x13,0x02,0x25,0xff,0x21,0x45,0x09,0x07,0x88,0x09,0x24}}
+ };
+ 
+ /*   1     2    4    5    6   1c   1d   1f   20   21   23   25   */
+ static const SiS310_Part2PortTblStruct SiS310_CRT2Part2_1280x1024_3[] =
+-{	/* TW: Temporary data, invalid */
+-  {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}},
+-  {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}},
+-  {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}},
+-  {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}},
+-  {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x32}},
+-  {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x32}},
+-  {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x32}},
+-  {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x32}},
+-  {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x32}}
++{
++ {{0x31,0x1B,0xC4,0xDA,0xB0,0xBD,0x23,0x0A,0x07,0x23,0x8A,0x12}},
++ {{0x34,0x1B,0x9F,0xC0,0x80,0xB8,0x23,0x0A,0x07,0x14,0x8A,0x12}},
++ {{0x3E,0x1B,0xCF,0xF0,0xB0,0xB8,0x23,0x0A,0x07,0x14,0x8A,0x12}},
++ {{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}},
++ {{0x48,0x1C,0x15,0x29,0xFF,0xBD,0x23,0x0A,0x07,0x23,0x8A,0x12}},
++ {{0x48,0x1C,0x15,0x29,0xFF,0xBD,0x23,0x0A,0x07,0x23,0x8A,0x12}},
++ {{0x48,0x1C,0x15,0x29,0xFF,0xBD,0x23,0x0A,0x07,0x23,0x8A,0x12}},
++ {{0x47,0x1C,0x14,0x29,0xFF,0xBD,0x23,0x0A,0x07,0x23,0x8A,0x12}}
+ };
+ 
+ static const SiS310_Part2PortTblStruct SiS310_CRT2Part2_1400x1050_3[] =
+ {	
+-  {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}},
+-  {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}},
+-  {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}},
+-  {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}},
+-  {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x32}},
+-  {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x32}},
+-  {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x32}},
+-  {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x32}},
+-  {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x32}}
++ {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}},
++ {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}},
++ {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}},
++ {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}},
++ {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x32}},
++ {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x32}},
++ {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x32}},
++ {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x32}},
++ {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x32}}
+ };
+ 
+ static const SiS310_Part2PortTblStruct SiS310_CRT2Part2_1600x1200_3[] =
+-{	/* TW: Temporary data, invalid */
+-  {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}},
+-  {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}},
+-  {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}},
+-  {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x42}},
+-  {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x32}},
+-  {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x32}},
+-  {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x32}},
+-  {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x32}},
+-  {{0x43,0x24,0x21,0x29,0x19,0xea,0x23,0x0a,0x07,0x32,0xc6,0x32}}
++{
++ {{0x4C,0x24,0xC8,0xE1,0xAF,0x70,0x34,0x0A,0x07,0xFC,0x2A,0x53}},
++ {{0x4C,0x24,0xC8,0xE1,0xAF,0x70,0x34,0x0A,0x07,0xFC,0x2A,0x53}},
++ {{0x4C,0x24,0xC8,0xE1,0xAF,0x70,0x34,0x0A,0x07,0xFC,0x2A,0x53}},
++ {{0x4C,0x24,0xC8,0xE1,0xAF,0x70,0x34,0x0A,0x07,0xFC,0x2A,0x53}},
++ {{0x4C,0x24,0xC8,0xE1,0xAF,0x70,0x34,0x0A,0x07,0xFC,0x2A,0x53}},
++ {{0x4C,0x24,0xC8,0xE1,0xAF,0x70,0x34,0x0A,0x07,0xFC,0x2A,0x53}},
++ {{0x4C,0x24,0xC8,0xE1,0xAF,0x70,0x34,0x0A,0x07,0xFC,0x2A,0x53}},
++ {{0x4C,0x24,0xC8,0xE1,0xAF,0x70,0x34,0x0A,0x07,0xFC,0x2A,0x53}},
++ {{0x4C,0x24,0xC8,0xE1,0xAF,0x70,0x34,0x0A,0x07,0xFC,0x2A,0x53}},
++ {{0x4C,0x24,0xC8,0xE1,0xAF,0x70,0x34,0x0A,0x07,0xFC,0x2A,0x53}}
+ };
+ 
+ typedef struct _SiS310_LCDACRT1DataStruct
+@@ -3054,7 +1760,7 @@ static const SiS310_LCDACRT1DataStruct  
+ };
+ 
+ static const SiS310_LCDACRT1DataStruct  SiS310_LCDACRT11024x768_1[]=
+-{  /* TW: Checked (1.10.6s) */
++{
+  {{0x73,0x4f,0x4f,0x97,0x55,0x86,0xc4,0x1f,
+    0x92,0x89,0x8f,0x8f,0xb5,0x30,0x00,0x05,
+    0x00}},
+@@ -3079,7 +1785,7 @@ static const SiS310_LCDACRT1DataStruct  
+ };
+ 
+ static const SiS310_LCDACRT1DataStruct  SiS310_LCDACRT11280x1024_1[]=
+-{  /* Checked (1.10.6s) */
++{
+  {{0x7e,0x4f,0x4f,0x82,0x58,0x06,0xb8,0x1f,
+    0x90,0x84,0x8f,0x8f,0xb9,0x30,0x00,0x06,
+    0x00}},
+@@ -3107,7 +1813,7 @@ static const SiS310_LCDACRT1DataStruct  
+ };
+ 
+ static const SiS310_LCDACRT1DataStruct  SiS310_LCDACRT11400x1050_1[]=
+-{    /* Checked (1.10.6s) */
++{
+  {{0x6f,0x4f,0x4f,0x93,0x54,0x82,0x9e,0x1f,
+    0x93,0x86,0x8f,0x8f,0x9f,0x30,0x00,0x05,
+    0x00}},
+@@ -3200,7 +1906,7 @@ static const SiS310_LCDACRT1DataStruct  
+ };
+ 
+ static const SiS310_LCDACRT1DataStruct  SiS310_LCDACRT11024x768_1_H[]=
+-{  /* TW: Checked (1.10.6s) */
++{
+  {{0x4b,0x27,0x27,0x8f,0x2b,0x03,0xc4,0x1f,
+    0x92,0x89,0x8f,0x8f,0xb5,0x30,0x00,0x44,
+    0x00}},
+@@ -3225,7 +1931,7 @@ static const SiS310_LCDACRT1DataStruct  
+ };
+ 
+ static const SiS310_LCDACRT1DataStruct  SiS310_LCDACRT11280x1024_1_H[]=
+-{   /* Checked (1.10.6s) */
++{
+  {{0x56,0x27,0x27,0x9a,0x30,0x1e,0xb8,0x1f,
+    0x90,0x84,0x8f,0x8f,0xb9,0x30,0x00,0x05,
+    0x00}},
+@@ -3250,7 +1956,7 @@ static const SiS310_LCDACRT1DataStruct  
+ };
+ 
+ static const SiS310_LCDACRT1DataStruct  SiS310_LCDACRT11400x1050_1_H[]=
+-{   /* Checked (1.10.6s) */
++{
+   {{0x47,0x27,0x27,0x8b,0x2c,0x1a,0x9e,0x1f,
+     0x93,0x86,0x8f,0x8f,0x9f,0x30,0x00,0x05,
+     0x00}},
+@@ -3343,7 +2049,7 @@ static const SiS310_LCDACRT1DataStruct  
+ };
+ 
+ static const SiS310_LCDACRT1DataStruct  SiS310_LCDACRT11024x768_2[]=
+-{   /* Checked (1.10.6s) */
++{
+  {{0xa3,0x4f,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+    0x4a,0x80,0x8f,0x8f,0x25,0x30,0x00,0x06,
+    0x00}},
+@@ -3368,7 +2074,7 @@ static const SiS310_LCDACRT1DataStruct  
+ };
+ 
+ static const SiS310_LCDACRT1DataStruct  SiS310_LCDACRT11280x1024_2[]=
+-{   /* Checked (1.10.6s) */
++{
+  {{0xa3,0x4f,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+    0x4a,0x80,0x8f,0x8f,0x25,0x30,0x00,0x06,
+    0x00}},
+@@ -3393,7 +2099,7 @@ static const SiS310_LCDACRT1DataStruct  
+ };
+ 
+ static const SiS310_LCDACRT1DataStruct  SiS310_LCDACRT11400x1050_2[]=
+-{    /* Checked (1.10.6s) */
++{
+  {{0xce,0x4f,0x4f,0x92,0x8c,0x1a,0x28,0x9a,
+    0xdb,0x8f,0x8f,0x8f,0x29,0x21,0x00,0x03,
+    0x00}},
+@@ -3486,7 +2192,7 @@ static const SiS310_LCDACRT1DataStruct  
+ };
+ 
+ static const SiS310_LCDACRT1DataStruct  SiS310_LCDACRT11024x768_2_H[]=
+-{   /* Checked (1.10.6s) */
++{
+  {{0x4f,0x27,0x27,0x93,0x39,0x01,0x24,0xbb,
+    0x4a,0x80,0x8f,0x8f,0x25,0x30,0x00,0x01,
+    0x00 }},
+@@ -3511,7 +2217,7 @@ static const SiS310_LCDACRT1DataStruct  
+ };
+ 
+ static const SiS310_LCDACRT1DataStruct  SiS310_LCDACRT11280x1024_2_H[]=
+-{   /* Checked (1.10.6s) */
++{
+  {{0x4f,0x27,0x27,0x93,0x39,0x81,0x24,0xbb,
+    0x4a,0x80,0x8f,0x8f,0x25,0x30,0x00,0x01,
+    0x00 }},
+@@ -3536,7 +2242,7 @@ static const SiS310_LCDACRT1DataStruct  
+ };
+ 
+ static const SiS310_LCDACRT1DataStruct  SiS310_LCDACRT11400x1050_2_H[]=
+-{  /* Checked (1.10.6s) */
++{
+  {{0xa6,0x27,0x27,0x8a,0x64,0x92,0x28,0x9a,
+    0xdb,0x8f,0x8f,0x8f,0x29,0x21,0x00,0x06,
+    0x00}},
+@@ -3605,32 +2311,7 @@ typedef struct _SiS310_LVDSCRT1DataStruc
+  	UCHAR CR[15];
+ } SiS310_LVDSCRT1DataStruct;
+ 
+-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT1320x480_1[] =
+-{
+- {{0x65,0x4f,0x89,0x56,0x83,0xaa,0x1f,
+-   0x90,0x85,0x8f,0xab,0x30,0x00,0x05,
+-   0x00 }},
+- {{0x65,0x4f,0x89,0x56,0x83,0x83,0x1f,
+-   0x5e,0x83,0x5d,0x79,0x10,0x00,0x05,
+-   0x00 }},
+- {{0x65,0x4f,0x89,0x54,0x9f,0xc4,0x1f,
+-   0x92,0x89,0x8f,0xb5,0x30,0x00,0x01,
+-   0x00 }},
+- {{0x65,0x4f,0x89,0x56,0x83,0x83,0x1f,
+-   0x5e,0x83,0x5d,0x79,0x10,0x00,0x05,
+-   0x00 }},
+- {{0x65,0x4f,0x89,0x56,0x83,0x04,0x3e,
+-   0xe0,0x85,0xdf,0xfb,0x10,0x00,0x05,
+-   0x00 }},
+- {{0x7f,0x63,0x83,0x6c,0x1c,0x72,0xf0,
+-   0x58,0x8c,0x57,0x73,0x20,0x00,0x06,
+-   0x01 }},
+- {{0x2d,0x27,0x90,0x2c,0x80,0x0b,0x3e,
+-   0xe9,0x8b,0xe7,0x04,0x00,0x00,0x00,
+-   0x00 }}
+-};
+-
+-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT1800x600_1[] =   
++static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT1800x600_1[] =
+ {
+  {{0x6b,0x4f,0x8f,0x55,0x85,0xaa,0x1f,
+    0x90,0x85,0x8f,0xab,0x30,0x00,0x05,
+@@ -3924,63 +2605,7 @@ static const SiS310_LVDSCRT1DataStruct  
+    0x01}}
+ };
+ 
+-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT1XXXxXXX_1[] =  
+-{
+- {{0x5f,0x4f,0x82,0x55,0x81,0xbf,0x1f,
+-   0x9c,0x8e,0x96,0xb9,0x30,0x00,0x05,
+-   0x00}},
+- {{0x5f,0x4f,0x82,0x55,0x81,0xbf,0x1f,
+-   0x9c,0x8e,0x96,0xb9,0x30,0x00,0x05,
+-   0x00}},
+- {{0x5f,0x4f,0x82,0x55,0x81,0xbf,0x1f,
+-   0x9c,0x8e,0x96,0xb9,0x30,0x00,0x05,
+-   0x00}},
+- {{0x5f,0x4f,0x82,0x55,0x81,0xbf,0x1f,
+-   0x9c,0x8e,0x96,0xb9,0x30,0x00,0x05,
+-   0x00}},
+- {{0x5f,0x4f,0x82,0x55,0x81,0x0b,0x3e,
+-   0xe9,0x8b,0xe7,0x04,0x00,0x00,0x05,
+-   0x00}},
+- {{0x7f,0x63,0x83,0x6c,0x1c,0x72,0xf0,
+-   0x58,0x8c,0x57,0x73,0x20,0x00,0x06,
+-   0x01}},
+- {{0xa3,0x7f,0x87,0x86,0x97,0x24,0xf5,
+-   0x02,0x88,0xff,0x25,0x10,0x00,0x02,
+-   0x01}},
+- {{0xce,0x9f,0x92,0xa8,0x14,0x28,0x5a,
+-   0x00,0x84,0xff,0x29,0x09,0x00,0x07,
+-   0x01}},
+- {{0xce,0x9f,0x92,0xa9,0x17,0x24,0xf5,
+-   0x02,0x88,0xff,0x25,0x10,0x00,0x07,
+-   0x01}}
+-};
+-
+-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT1XXXxXXX_1_H[] = 
+-{
+- {{0x38,0x27,0x9c,0x2c,0x80,0xbf,0x1f,
+-   0x9c,0x8e,0x96,0xb9,0x30,0x00,0x00,
+-   0x00}},
+- {{0x38,0x27,0x9c,0x2c,0x80,0xbf,0x1f,
+-   0x9c,0x8e,0x96,0xb9,0x30,0x00,0x00,
+-   0x00}},
+- {{0x38,0x27,0x9c,0x2c,0x80,0xbf,0x1f,
+-   0x9c,0x8e,0x96,0xb9,0x30,0x00,0x00,
+-   0x00}},
+- {{0x38,0x27,0x9c,0x2c,0x80,0xbf,0x1f,
+-   0x9c,0x8e,0x96,0xb9,0x30,0x00,0x00,
+-   0x00}},
+- {{0x38,0x27,0x9c,0x2c,0x80,0x0b,0x3e,
+-   0xe9,0x8b,0xe7,0x04,0x00,0x00,0x00,
+-   0x00}},
+- {{0x4d,0x31,0x91,0x3b,0x03,0x72,0xf0,
+-   0x58,0x8c,0x57,0x73,0x20,0x00,0x01,
+-   0x01}},
+- {{0x63,0x3f,0x87,0x4a,0x92,0x24,0xf5,
+-   0x02,0x88,0xff,0x25,0x10,0x00,0x01,
+-   0x01}}
+-};
+-
+-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11400x1050_1[] =  
++static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11400x1050_1[] =
+ {
+   {{0x6f,0x4f,0x93,0x54,0x82,0x9e,0x1f,
+     0x8f,0x81,0x8f,0x9f,0x30,0x00,0x05,
+@@ -4220,332 +2845,8 @@ static const SiS310_LVDSCRT1DataStruct  
+ #endif   
+ };
+ 
+-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11280x768_1[] =  
+-{	
+- {{0x5b,0x4f,0x9f,0x55,0x19,0xb4,0x1f,
+-   0x9c,0x8e,0x8f,0xb5,0x10,0x00,0x01,
+-   0x00}},
+- {{0x5b,0x4f,0x9f,0x55,0x19,0x82,0x1f,
+-   0x6a,0x8c,0x5d,0x83,0x30,0x00,0x01,
+-   0x00}},
+- {{0x5b,0x4f,0x9f,0x55,0x19,0xb4,0x1f,
+-   0x9c,0x8e,0x8f,0xb5,0x10,0x00,0x01,
+-   0x00}},
+- {{0x5b,0x4f,0x9f,0x55,0x19,0x82,0x1f,
+-   0x6a,0x8c,0x5d,0x83,0x30,0x00,0x01,
+-   0x00}},
+- {{0x5b,0x4f,0x9f,0x55,0x19,0x04,0x3e,
+-   0xec,0x8e,0xdf,0x05,0x20,0x00,0x01,
+-   0x00}},
+- {{0x6f,0x63,0x93,0x69,0x8d,0x7c,0xf0,
+-   0x64,0x86,0x57,0x7d,0x20,0x00,0x05,
+-   0x01}},
+- {{0x8b,0x7f,0x8f,0x85,0x09,0x24,0xf5,
+-   0x0c,0x8e,0xff,0x25,0x30,0x00,0x02,
+-   0x01}},
+- {{0xab,0x9f,0x8f,0xa5,0x89,0x24,0xf5,
+-   0x0c,0x8e,0xff,0x25,0x30,0x00,0x06,
+-   0x01}},
+- {{0xab,0x9f,0x8f,0xa5,0x89,0x24,0xf5,
+-   0x0c,0x8e,0xff,0x25,0x30,0x00,0x06,
+-   0x01}}
+-};
+-
+-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11280x768_1_H[] = 
+-{
+- {{0x47,0x27,0x8b,0x2c,0x1a,0x9e,0x1f,
+-   0x93,0x86,0x8f,0x9f,0x30,0x00,0x05,
+-   0x00}},
+- {{0x47,0x27,0x8b,0x2c,0x1a,0x6c,0x1f,
+-   0x60,0x84,0x5d,0x6d,0x10,0x00,0x05,
+-   0x00}},
+- {{0x47,0x27,0x8b,0x30,0x1e,0x9e,0x1f,
+-   0x92,0x86,0x8f,0x9f,0x30,0x00,0x05,
+-   0x00}},
+- {{0x47,0x27,0x8b,0x2c,0x1a,0x6c,0x1f,
+-   0x60,0x84,0x5d,0x6d,0x10,0x00,0x05,
+-   0x00}},
+- {{0x47,0x27,0x8b,0x2c,0x1a,0xee,0x1f,
+-   0xe2,0x86,0xdf,0xef,0x10,0x00,0x05,
+-   0x00}},
+- {{0x51,0x31,0x95,0x36,0x04,0x66,0xf0,
+-   0x5a,0x8e,0x57,0x67,0x20,0x00,0x01,
+-   0x01}},
+- {{0x5f,0x3f,0x83,0x44,0x92,0x0e,0xf5,
+-   0x02,0x86,0xff,0x0f,0x10,0x00,0x01,
+-   0x01}},
+- {{0x6f,0x4f,0x93,0x54,0x82,0x0e,0x5a,
+-   0x02,0x86,0xff,0x0f,0x09,0x00,0x05,
+-   0x01}},
+- {{0x6f,0x4f,0x93,0x54,0x82,0x0e,0x5a,
+-   0x02,0x86,0xff,0x0f,0x09,0x00,0x05,
+-   0x01}}
+-};
+-
+-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11280x768_2[] = 
++static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11600x1200_1[] =
+ {
+- {{0xab,0x60,0x9f,0x80,0x04,0x24,0xbb,
+-   0x54,0x86,0xdb,0xda,0x00,0x00,0x02,
+-   0x00}},
+- {{0xab,0x60,0x9f,0x80,0x04,0x24,0xbb,
+-   0x3b,0x8d,0xc2,0xc1,0x00,0x00,0x02,
+-   0x00}},
+- {{0xab,0x60,0x9f,0x80,0x04,0x24,0xbb,
+-   0x54,0x86,0xdb,0xda,0x00,0x00,0x02,
+-   0x00}},
+- {{0xab,0x60,0x9f,0x80,0x04,0x24,0xbb,
+-   0x3b,0x8d,0xc2,0xc1,0x00,0x00,0x02,
+-   0x00}},
+- {{0xab,0x60,0x9f,0x80,0x04,0x24,0xb3,
+-   0x7c,0x8e,0x03,0x02,0x10,0x00,0x02,
+-   0x01}},
+- {{0xab,0x63,0x8f,0x8a,0x8e,0x24,0xf1,
+-   0xb6,0x88,0x57,0x25,0x10,0x00,0x02,
+-   0x01}},
+- {{0xab,0x7f,0x8f,0x98,0x9c,0x24,0xf5,
+-   0x0a,0x8c,0xff,0x25,0x30,0x00,0x02,
+-   0x01}},
+- {{0xab,0x9f,0x8f,0xa8,0x8c,0x24,0xf5,
+-   0x0a,0x8c,0xff,0x25,0x30,0x00,0x06,
+-   0x01}},
+- {{0xab,0x9f,0x8f,0xa8,0x8c,0x24,0xf5,
+-   0x0a,0x8c,0xff,0x25,0x30,0x00,0x06,
+-   0x01}}
+-};
+-
+-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11280x768_2_H[] =
+-{
+- {{0x83,0x38,0x97,0x58,0x9c,0x24,0xbb,
+-   0x54,0x86,0xdb,0xda,0x00,0x00,0x01,
+-   0x00}},
+- {{0x83,0x38,0x97,0x58,0x9c,0x24,0xbb,
+-   0x3b,0x8d,0xc2,0xc1,0x00,0x00,0x01,
+-   0x00}},
+- {{0x83,0x38,0x97,0x58,0x9c,0x24,0xbb,
+-   0x54,0x86,0xdb,0xda,0x00,0x00,0x01,
+-   0x00}},
+- {{0x83,0x38,0x97,0x58,0x9c,0x24,0xbb,
+-   0x3b,0x8d,0xc2,0xc1,0x00,0x00,0x01,
+-   0x00}},
+- {{0x83,0x38,0x97,0x58,0x9c,0x24,0xb3,
+-   0x7c,0x8e,0x03,0x02,0x10,0x00,0x01,
+-   0x01}},
+- {{0x79,0x31,0x9d,0x58,0x9c,0x24,0xf1,
+-   0xb6,0x88,0x57,0x25,0x10,0x00,0x01,
+-   0x01}},
+- {{0x6b,0x3f,0x8f,0x58,0x9c,0x24,0xf5,
+-   0x0a,0x8c,0xff,0x25,0x30,0x00,0x01,
+-   0x01}},
+- {{0xab,0x9f,0x8f,0xa8,0x8c,0x24,0xf5,
+-   0x0a,0x8c,0xff,0x25,0x30,0x00,0x06,
+-   0x01}},
+- {{0xab,0x9f,0x8f,0xa8,0x8c,0x24,0xf5,
+-   0x0a,0x8c,0xff,0x25,0x30,0x00,0x06,
+-   0x01}}
+-};
+-
+-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11024x600_1[] =
+-{
+-        {{0x64,0x4f,0x88,0x54,0x9f,0x5a,0x3e,
+-	  0xe8,0x8f,0x8f,0x5b,0x00,0x00,0x01,
+-	  0x00}},
+-        {{0x64,0x4f,0x88,0x54,0x9f,0x2e,0x3e,
+-	  0xb9,0x80,0x5d,0x2f,0x00,0x00,0x01,
+-	  0x00}},
+-        {{0x64,0x4f,0x88,0x54,0x9f,0x5a,0x3e,
+-	  0xe8,0x8f,0x8f,0x5b,0x00,0x00,0x01,
+-	  0x00}},
+-        {{0x64,0x4f,0x88,0x54,0x9f,0x2e,0x3e,
+-	  0xb9,0x80,0x5d,0x2f,0x00,0x00,0x01,
+-	  0x00}},
+-        {{0x64,0x4f,0x88,0x54,0x9f,0xaf,0xba,
+-	  0x3b,0x82,0xdf,0xb0,0x00,0x00,0x01,
+-	  0x00}},
+-        {{0x7e,0x63,0x82,0x68,0x15,0x1e,0xf1,
+-	  0xae,0x85,0x57,0x1f,0x30,0x00,0x26,
+-	  0x01}},
+-        {{0xa3,0x7f,0x87,0x86,0x97,0x1e,0xf1,
+-	  0xae,0x85,0x57,0x1f,0x30,0x00,0x02,
+-	  0x01}}
+-};
+-
+-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11024x600_1_H[] =
+-{
+-        {{0x2f,0x27,0x93,0x2b,0x90,0xc4,0x1f,
+-	  0x92,0x89,0x8f,0xb5,0x30,0x00,0x44,
+-	  0x00}},
+-        {{0x2f,0x27,0x93,0x2b,0x90,0x97,0x1f,
+-	  0x60,0x87,0x5d,0x83,0x10,0x00,0x44,
+-          0x00}},
+-        {{0x2f,0x27,0x93,0x2b,0x90,0xc4,0x1f,
+-	  0x92,0x89,0x8f,0xb5,0x30,0x00,0x44,
+-	  0x00}},
+-        {{0x2f,0x27,0x93,0x2b,0x90,0x97,0x1f,
+-	  0x60,0x87,0x5d,0x83,0x10,0x00,0x44,
+-	  0x00}},
+-        {{0x2f,0x27,0x93,0x2b,0x90,0x04,0x3e,
+-	  0xe2,0x89,0xdf,0x05,0x00,0x00,0x44,
+-	  0x00}},
+-        {{0x3c,0x31,0x80,0x35,0x1c,0x7c,0xf0,
+-	  0x5a,0x8f,0x57,0x7d,0x20,0x00,0x55,
+-	  0x01}},
+-        {{0x4f,0x3f,0x93,0x45,0x0d,0x24,0xf5,
+-	  0x02,0x88,0xff,0x25,0x10,0x00,0x01,
+-	  0x01}}
+-};
+-
+-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11024x600_2[] =
+-{
+-        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+-	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x06,
+-	  0x00}},
+-        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+-	  0x31,0x87,0x5d,0x25,0x30,0x00,0x06,
+-	  0x00}},
+-        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+-	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x06,
+-	  0x00}},
+-        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+-          0x31,0x87,0x5d,0x25,0x30,0x00,0x06,
+-	  0x00}},
+-        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+-	  0x72,0x88,0xdf,0x25,0x30,0x00,0x06,
+-	  0x00}},
+-        {{0xa3,0x63,0x87,0x78,0x89,0x24,0xf1,
+-	  0xae,0x84,0x57,0x25,0x30,0x00,0x02,
+-	  0x01}},
+-        {{0xa3,0x7f,0x87,0x86,0x97,0x24,0xf5,
+-	  0x02,0x88,0xff,0x25,0x10,0x00,0x02,
+-	  0x01}}
+-};
+-
+-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11024x600_2_H[] =
+-{
+-        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
+-	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x01,
+-	  0x00}},
+-        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
+-	  0x31,0x87,0x5d,0x25,0x30,0x00,0x01,
+-	  0x00}},
+-        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
+-	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x01,
+-	  0x00}},
+-        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
+-	  0x31,0x87,0x5d,0x25,0x30,0x00,0x01,
+-	  0x00}},
+-        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
+-	  0x72,0x88,0xdf,0x25,0x30,0x00,0x01,
+-	  0x00}},
+-        {{0x4f,0x31,0x93,0x3e,0x06,0x24,0xf1,
+-	  0xae,0x84,0x57,0x25,0x30,0x00,0x01,
+-	  0x01}},
+-        {{0x4f,0x3f,0x93,0x45,0x0d,0x24,0xf5,
+-	  0x02,0x88,0xff,0x25,0x10,0x00,0x01,
+-	  0x01}}
+-};
+-
+-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11152x768_1[] =
+-{
+-        {{0x64,0x4f,0x88,0x54,0x9f,0xc4,0x1f,
+-	  0x92,0x89,0x8f,0xb5,0x30,0x00,0x01,
+-	  0x00}},
+-        {{0x64,0x4f,0x88,0x54,0x9f,0x97,0x1f,
+-	  0x60,0x87,0x5d,0x83,0x10,0x00,0x01,
+-	  0x00}},
+-        {{0x64,0x4f,0x88,0x54,0x9f,0xc4,0x1f,
+-	  0x92,0x89,0x8f,0xb5,0x30,0x00,0x01,
+-	  0x00}},
+-        {{0x64,0x4f,0x88,0x54,0x9f,0x97,0x1f,
+-	  0x60,0x87,0x5d,0x83,0x10,0x00,0x01,
+-	  0x00}},
+-        {{0x64,0x4f,0x88,0x54,0x9f,0x04,0x3e,
+-	  0xe2,0x89,0xdf,0x05,0x00,0x00,0x01,
+-	  0x00}},
+-        {{0x7e,0x63,0x82,0x68,0x15,0x7c,0xf0,
+-	  0x5a,0x8f,0x57,0x7d,0x20,0x00,0x26,
+-	  0x01}},
+-        {{0xa3,0x7f,0x87,0x86,0x97,0x24,0xf5,
+-	  0x02,0x88,0xff,0x25,0x10,0x00,0x02,
+-	  0x01}}
+-};
+-
+-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11152x768_1_H[] =
+-{
+-        {{0x2f,0x27,0x93,0x2b,0x90,0xc4,0x1f,
+-	  0x92,0x89,0x8f,0xb5,0x30,0x00,0x44,
+-	  0x00}},
+-        {{0x2f,0x27,0x93,0x2b,0x90,0x97,0x1f,
+-	  0x60,0x87,0x5d,0x83,0x10,0x00,0x44,
+-	  0x00}},
+-        {{0x2f,0x27,0x93,0x2b,0x90,0xc4,0x1f,
+-	  0x92,0x89,0x8f,0xb5,0x30,0x00,0x44,
+-	  0x00}},
+-        {{0x2f,0x27,0x93,0x2b,0x90,0x97,0x1f,
+-	  0x60,0x87,0x5d,0x83,0x10,0x00,0x44,
+-	  0x00}},
+-        {{0x2f,0x27,0x93,0x2b,0x90,0x04,0x3e,
+-	  0xe2,0x89,0xdf,0x05,0x00,0x00,0x44,
+-	  0x00}},
+-        {{0x3c,0x31,0x80,0x35,0x1c,0x7c,0xf0,
+-	  0x5a,0x8f,0x57,0x7d,0x20,0x00,0x55,
+-	  0x01}},
+-        {{0x4f,0x3f,0x93,0x45,0x0d,0x24,0xf5,
+-	  0x02,0x88,0xff,0x25,0x10,0x00,0x01,
+-	  0x01}}
+-};
+-
+-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11152x768_2[] =
+-{
+-        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+-	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x06,
+-	  0x00}},
+-        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+-	  0x31,0x87,0x5d,0x25,0x30,0x00,0x06,
+-	  0x00}},
+-        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+-	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x06,
+-	  0x00}},
+-        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+-	  0x31,0x87,0x5d,0x25,0x30,0x00,0x06,
+-	  0x00}},
+-        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
+-	  0x72,0x88,0xdf,0x25,0x30,0x00,0x06,
+-	  0x00}},
+-        {{0xa3,0x63,0x87,0x78,0x89,0x24,0xf1,
+-	  0xae,0x84,0x57,0x25,0x30,0x00,0x02,
+-	  0x01}},
+-        {{0xa3,0x7f,0x87,0x86,0x97,0x24,0xf5,
+-	  0x02,0x88,0xff,0x25,0x10,0x00,0x02,
+-	  0x01}}
+-};
+-
+-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11152x768_2_H[] =
+-{
+-        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
+-	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x01,
+-	  0x00}},
+-        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
+-	  0x31,0x87,0x5d,0x25,0x30,0x00,0x01,
+-	  0x00}},
+-        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
+-	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x01,
+-	  0x00}},
+-        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
+-	  0x31,0x87,0x5d,0x25,0x30,0x00,0x01,
+-	  0x00}},
+-        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
+-	  0x72,0x88,0xdf,0x25,0x30,0x00,0x01,
+-	  0x00}},
+-        {{0x4f,0x31,0x93,0x3e,0x06,0x24,0xf1,
+-	  0xae,0x84,0x57,0x25,0x30,0x00,0x01,
+-	  0x01}},
+-        {{0x4f,0x3f,0x93,0x45,0x0d,0x24,0xf5,
+-	  0x02,0x88,0xff,0x25,0x10,0x00,0x01,
+-	  0x01}}
+-};
+-
+-static const SiS310_LVDSCRT1DataStruct  SiS310_LVDSCRT11600x1200_1[] =  
+-{    
+  {{0x83,0x4f,0x87,0x51,0x09,0xc0,0x1f,
+    0x90,0x84,0x8f,0xc1,0x30,0x00,0x06,
+    0x00}},
+@@ -4701,7 +3002,7 @@ static const SiS310_LVDSCRT1DataStruct  
+ 	{{0x80,0x63,0x84,0x6d,0x0f,0xec,0xf0,
+ 	  0x7a,0x8f,0x57,0xed,0x20,0x00,0x06,
+ 	  0x01 }},
+-	{{0x8c,0x7f,0x90,0x86,0x09,0xaf,0xf5,  /* TW: 1024x768 */
++	{{0x8c,0x7f,0x90,0x86,0x09,0xaf,0xf5,
+ 	  0x36,0x88,0xff,0xb0,0x10,0x00,0x02,
+ 	  0x01}}
+ };
+@@ -4726,7 +3027,7 @@ static const SiS310_LVDSCRT1DataStruct  
+ 	{{0x7d,0x63,0x81,0x68,0x0e,0xba,0xf0,
+ 	  0x78,0x8a,0x57,0xbb,0x20,0x00,0x06,
+ 	  0x01 }},
+-	{{0x8c,0x7f,0x90,0x82,0x06,0x46,0xf5,   /* TW: 1024x768 */
++	{{0x8c,0x7f,0x90,0x82,0x06,0x46,0xf5,
+ 	  0x15,0x88,0xff,0x47,0x70,0x00,0x02,
+ 	  0x01 }}
+ };
+@@ -4751,7 +3052,7 @@ static const SiS310_LVDSCRT1DataStruct  
+ 	{{0x73,0x63,0x97,0x69,0x8b,0xec,0xf0,
+ 	  0x90,0x8c,0x57,0xed,0x20,0x00,0x05,
+ 	  0x01 }},
+-	{{0xaa,0x7f,0x8e,0x8e,0x96,0xe6,0xf5,   /* TW: 1024x768 */
++	{{0xaa,0x7f,0x8e,0x8e,0x96,0xe6,0xf5,
+ 	  0x50,0x88,0xff,0xe7,0x10,0x00,0x02,
+ 	  0x01}}
+ };
+@@ -4776,7 +3077,7 @@ static const SiS310_LVDSCRT1DataStruct  
+ 	{{0x71,0x63,0x95,0x69,0x8c,0x6f,0xf0,
+ 	  0x5a,0x8b,0x57,0x70,0x20,0x00,0x05,
+ 	  0x01 }},
+-	{{0xaa,0x7f,0x8e,0x8f,0x96,0x69,0xf5,   /* TW:  1024x768 */
++	{{0xaa,0x7f,0x8e,0x8f,0x96,0x69,0xf5,
+ 	  0x28,0x88,0xff,0x6a,0x10,0x00,0x02,
+ 	  0x01 }}
+ };
+@@ -4801,12 +3102,11 @@ static const SiS310_LVDSCRT1DataStruct  
+ 	{{0x71,0x63,0x95,0x69,0x8c,0x6f,0xf0,
+ 	  0x5a,0x8b,0x57,0x70,0x20,0x00,0x05,
+ 	  0x01 }},
+-	{{0xaa,0x7f,0x8e,0x8f,0x96,0x69,0xf5,   /* TW:  1024x768 */
++	{{0xaa,0x7f,0x8e,0x8f,0x96,0x69,0xf5,
+ 	  0x28,0x88,0xff,0x6a,0x10,0x00,0x02,
+ 	  0x01 }}
+ };
+ 
+-/* TW: Data for Chrontel 7019  */
+ typedef struct _SiS310_CHTVRegDataStruct
+ {
+  	UCHAR Reg[16];
+--- linux-2.6.0-test6/drivers/video/sis/init301.c	2003-07-13 21:44:34.000000000 -0700
++++ 25/drivers/video/sis/init301.c	2003-10-05 00:34:22.000000000 -0700
+@@ -1,27 +1,16 @@
+ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/init301.c,v 1.3 2002/22/04 01:16:16 dawes Exp $ */
+ /*
+- * Mode switching code (CRT2 section) for SiS 300/540/630/730/315/550/650/740/330
+- * (Universal module for Linux kernel framebuffer, XFree86 4.x)
++ * Mode switching code (CRT2 section) for SiS 300/540/630/730/315/550/650/740/330/660
++ * (Universal module for Linux kernel framebuffer and XFree86 4.x)
+  *
+  * Assembler-To-C translation
+  * Copyright 2002, 2003 by Thomas Winischhofer <thomas@winischhofer.net>
+- * Minor parts Copyright SiS, Inc.
++ * Formerly based on non-functional code-fragements by SiS, Inc.
+  *
+- * Based on BIOS
+- *     1.10.07, 1.10a for 650/CH7019
+- *     1.11.21a for 740/CH7019
+- *     1.11.05 for 650/LVDS (w/o Chrontel)
+- *     1.07.1b, 1.10.6s, 1.11.6w, 1.11.7w, 1.11.8r for 650/301(B/LV), 650/302LV
+- *     2.04.50 (I) and 2.04.5c (II) for 630/301(B)
+- *     2.02.3b, 2.03.02, 2.04.2c, 2.04.5c, 2.07a and 2.08.b3 for 630/LVDS/LVDS+CH7005
+- *     2.04.5c, 2.04.6c for 730+LVDS+CH7005
+- *     1.09b for 315/301(B)
+- *     1.16.51 for 300+301LV (ECS A907)
+- *     1.01.03 for 330 (Xabre 400)
++ * If distributed as part of the linux kernel, the contents of this file
++ * is entirely covered by the GPL.
+  *
+- * Known bugs:
+- *   1024x768 panel, expanding (CR37=1): Mode 640x480 does not work on SOME panels
+- *       therefore, we always do the scaling ourselves for now.
++ * Otherwise, the following terms apply:
+  *
+  * Permission to use, copy, modify, distribute, and sell this software and its
+  * documentation for any purpose is hereby granted without fee, provided that
+@@ -73,8 +62,8 @@
+ #define SiS_I2CDELAYSHORT  150
+ 
+ BOOLEAN
+-SiS_SetCRT2Group301(SiS_Private *SiS_Pr, USHORT BaseAddr,UCHAR *ROMAddr,USHORT ModeNo,
+-                    PSIS_HW_DEVICE_INFO HwDeviceExtension)
++SiS_SetCRT2Group(SiS_Private *SiS_Pr, USHORT BaseAddr,UCHAR *ROMAddr,USHORT ModeNo,
++                 PSIS_HW_DEVICE_INFO HwDeviceExtension)
+ {
+    USHORT ModeIdIndex;
+    USHORT RefreshRateTableIndex;
+@@ -85,9 +74,9 @@ SiS_SetCRT2Group301(SiS_Private *SiS_Pr,
+       SiS_SearchModeID(SiS_Pr,ROMAddr,&ModeNo,&ModeIdIndex);
+    } else {
+       ModeIdIndex = 0;
+-   }      
++   }
+ 
+-   /* TW: Used for shifting CR33 */
++   /* Used for shifting CR33 */
+    SiS_Pr->SiS_SelectCRT2Rate = 4;
+ 
+    SiS_UnLockCRT2(SiS_Pr, HwDeviceExtension, BaseAddr);
+@@ -110,8 +99,6 @@ SiS_SetCRT2Group301(SiS_Private *SiS_Pr,
+       return(TRUE);
+    }
+ 
+-   if(SiS_Pr->UseCustomMode) return(FALSE);
+-   
+    SiS_GetCRT2Data(SiS_Pr,ROMAddr,ModeNo,ModeIdIndex,RefreshRateTableIndex,
+                    HwDeviceExtension);
+ 
+@@ -153,9 +140,9 @@ SiS_SetCRT2Group301(SiS_Private *SiS_Pr,
+       	   SiS_SetGroup5(SiS_Pr,HwDeviceExtension, BaseAddr,ROMAddr,
+ 	                 ModeNo,ModeIdIndex);
+ 
+-	   /* TW: For 301BDH (Panel link initialization): */
++	   /* For 301BDH (Panel link initialization): */
+ 	   if((SiS_Pr->SiS_VBType & VB_NoLCD) && (SiS_Pr->SiS_VBInfo & SetCRT2ToLCD)) {
+-	      if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel640x480) {	 
++	      if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel640x480) {
+ 		 if(!((SiS_Pr->SiS_SetFlag & SetDOSMode) && ((ModeNo == 0x03) || (ModeNo = 0x10)))) {
+ 		    if(SiS_Pr->SiS_VBInfo & SetInSlaveMode) {
+ 		       SiS_ModCRT1CRTC(SiS_Pr,ROMAddr,ModeNo,ModeIdIndex,
+@@ -176,10 +163,10 @@ SiS_SetCRT2Group301(SiS_Private *SiS_Pr,
+ 	                      RefreshRateTableIndex,HwDeviceExtension);
+ 	   }
+ 	}
+-        if(SiS_Pr->SiS_IF_DEF_FSTN == 0) {
+-     	   SiS_SetCRT2ECLK(SiS_Pr,ROMAddr,ModeNo,ModeIdIndex,
+-	 	           RefreshRateTableIndex,HwDeviceExtension);
+-	}
++
++        SiS_SetCRT2ECLK(SiS_Pr,ROMAddr,ModeNo,ModeIdIndex,
++	                RefreshRateTableIndex,HwDeviceExtension);
++
+ 	if(SiS_LowModeStuff(SiS_Pr,ModeNo,HwDeviceExtension)) {
+      	   if(SiS_Pr->SiS_IF_DEF_CH70xx != 0) {
+ 	      if(SiS_Pr->SiS_VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)) {
+@@ -199,74 +186,64 @@ SiS_SetCRT2Group301(SiS_Private *SiS_Pr,
+    }
+ 
+ #ifdef SIS300
+-   if ( (HwDeviceExtension->jChipType == SIS_540) ||
+-        (HwDeviceExtension->jChipType == SIS_630) ||
+-        (HwDeviceExtension->jChipType == SIS_730) ||
+-        (HwDeviceExtension->jChipType == SIS_300) )
+-    {
+-	if(SiS_LowModeStuff(SiS_Pr,ModeNo,HwDeviceExtension)) {
+-	   if(SiS_Pr->SiS_UseOEM) {
+-	      if((SiS_Pr->SiS_UseROM) && ROMAddr && (SiS_Pr->SiS_UseOEM == -1)) {
+-	         if((ROMAddr[0x233] == 0x12) && (ROMAddr[0x234] == 0x34)) {
+-	            SiS_OEM300Setting(SiS_Pr,HwDeviceExtension,BaseAddr,ROMAddr,ModeNo);
+-	         }
+-	      } else {
+-       	         SiS_OEM300Setting(SiS_Pr,HwDeviceExtension,BaseAddr,ROMAddr,ModeNo);
+-	      }
+-	   }
+-	}
+-    }
+-#endif
+-
+-#ifdef SIS315H
+-   if ( (HwDeviceExtension->jChipType == SIS_315H)  ||
+-        (HwDeviceExtension->jChipType == SIS_315)   ||
+-	(HwDeviceExtension->jChipType == SIS_315PRO)||
+-        (HwDeviceExtension->jChipType == SIS_550)   ||
+-        (HwDeviceExtension->jChipType == SIS_740)   ||
+-        (HwDeviceExtension->jChipType == SIS_650)   ||
+-	(HwDeviceExtension->jChipType == SIS_330) )
+-   {
+-        if(SiS_LowModeStuff(SiS_Pr,ModeNo,HwDeviceExtension)) {
+-	   SiS_FinalizeLCD(SiS_Pr,BaseAddr,ROMAddr,ModeNo,ModeIdIndex, HwDeviceExtension);
+-#if 0      /* Instead of FinalizeLCD(), older BIOSes (A92x) used OEMLCD() */
+-	   SiS_OEMLCD(SiS_Pr,HwDeviceExtension,BaseAddr,ROMAddr,ModeNo,ModeIdIndex);
+-#endif
+-           if(SiS_Pr->SiS_UseOEM) {
+-              SiS_OEM310Setting(SiS_Pr,HwDeviceExtension,BaseAddr,ROMAddr,ModeNo,ModeIdIndex);
+-           }
+-           SiS_CRT2AutoThreshold(SiS_Pr,BaseAddr);
+-        }
+-   }
+-#endif
+-
+    if(HwDeviceExtension->jChipType < SIS_315H) {
++      if(SiS_LowModeStuff(SiS_Pr,ModeNo,HwDeviceExtension)) {
++	 if(SiS_Pr->SiS_UseOEM) {
++	    if((SiS_Pr->SiS_UseROM) && ROMAddr && (SiS_Pr->SiS_UseOEM == -1)) {
++	       if((ROMAddr[0x233] == 0x12) && (ROMAddr[0x234] == 0x34)) {
++	          SiS_OEM300Setting(SiS_Pr,HwDeviceExtension,BaseAddr,ROMAddr,ModeNo,ModeIdIndex,
++	       			    RefreshRateTableIndex);
++	       }
++	    } else {
++       	       SiS_OEM300Setting(SiS_Pr,HwDeviceExtension,BaseAddr,ROMAddr,ModeNo,ModeIdIndex,
++	       			 RefreshRateTableIndex);
++	    }
++	 }
++	 if(SiS_Pr->SiS_IF_DEF_LVDS == 1) {
++            if((SiS_Pr->SiS_CustomT == CUT_BARCO1366) ||
++	       (SiS_Pr->SiS_CustomT == CUT_BARCO1024)) {
++	       SetOEMLCDData2(SiS_Pr,HwDeviceExtension,BaseAddr,ROMAddr,ModeNo,
++	                      ModeIdIndex,RefreshRateTableIndex);
++	    }
++            if(HwDeviceExtension->jChipType == SIS_730) {
++               SiS_DisplayOn(SiS_Pr);
++	    }
++         }
++      }
+       if(SiS_Pr->SiS_IF_DEF_LVDS == 1) {
+           if(HwDeviceExtension->jChipType != SIS_730) {
+              SiS_DisplayOn(SiS_Pr);
+ 	  }
+       }
+    }
++#endif
+ 
+-   if(SiS_LowModeStuff(SiS_Pr,ModeNo,HwDeviceExtension)) {
+-      if(SiS_Pr->SiS_IF_DEF_LVDS == 1) {
+-         if(HwDeviceExtension->jChipType == SIS_730) {
+-            SiS_DisplayOn(SiS_Pr);
+-	 }
++#ifdef SIS315H
++   if(HwDeviceExtension->jChipType >= SIS_315H) {
++      if(SiS_LowModeStuff(SiS_Pr,ModeNo,HwDeviceExtension)) {
++	 SiS_FinalizeLCD(SiS_Pr,BaseAddr,ROMAddr,ModeNo,ModeIdIndex, HwDeviceExtension);
++         if(SiS_Pr->SiS_UseOEM) {
++            SiS_OEM310Setting(SiS_Pr,HwDeviceExtension,BaseAddr,ROMAddr,ModeNo,ModeIdIndex);
++         }
++         SiS_CRT2AutoThreshold(SiS_Pr,BaseAddr);
+       }
++   }
++#endif
++
++   if(SiS_LowModeStuff(SiS_Pr,ModeNo,HwDeviceExtension)) {
+       SiS_EnableBridge(SiS_Pr,HwDeviceExtension,BaseAddr);
+    }
+ 
+    SiS_DisplayOn(SiS_Pr);
+ 
+    if(SiS_Pr->SiS_IF_DEF_CH70xx == 1) {
+-	if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
+-	     /* TW: Disable LCD panel when using TV */
+-	     SiS_SetRegOR(SiS_Pr->SiS_P3c4,0x11,0x0C);
+-	} else {
+-	     /* TW: Disable TV when using LCD */
+-	     SiS_SetCH70xxANDOR(SiS_Pr,0x010E,0xF8);
+-	}
++      if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
++	 /* Disable LCD panel when using TV */
++	 SiS_SetRegOR(SiS_Pr->SiS_P3c4,0x11,0x0C);
++      } else {
++	 /* Disable TV when using LCD */
++	 SiS_SetCH70xxANDOR(SiS_Pr,0x010E,0xF8);
++      }
+    }
+ 
+    if(SiS_LowModeStuff(SiS_Pr,ModeNo,HwDeviceExtension)) {
+@@ -283,7 +260,7 @@ SiS_LowModeStuff(SiS_Private *SiS_Pr, US
+     USHORT temp,temp1,temp2;
+ 
+     if((ModeNo != 0x03) && (ModeNo != 0x10) && (ModeNo != 0x12))
+-         return(1);
++       return(1);
+     temp = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x11);
+     SiS_SetRegOR(SiS_Pr->SiS_P3d4,0x11,0x80);
+     temp1 = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x00);
+@@ -304,7 +281,7 @@ SiS_LowModeStuff(SiS_Private *SiS_Pr, US
+     }
+ }
+ 
+-/* TW: Set Part1 registers */
++/* Set Part1 registers */
+ void
+ SiS_SetGroup1(SiS_Private *SiS_Pr,USHORT BaseAddr,UCHAR *ROMAddr,USHORT ModeNo,
+               USHORT ModeIdIndex,PSIS_HW_DEVICE_INFO HwDeviceExtension,
+@@ -313,31 +290,35 @@ SiS_SetGroup1(SiS_Private *SiS_Pr,USHORT
+   USHORT  temp=0, tempax=0, tempbx=0, tempcx=0;
+   USHORT  pushbx=0, CRT1Index=0;
+ #ifdef SIS315H
+-  USHORT  pushcx=0, tempbl=0;
++  USHORT  tempbl=0;
+ #endif
+   USHORT  modeflag, resinfo=0;
+ 
+-  if(ModeNo<=0x13) {
+-	modeflag = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ModeFlag;
++  if(ModeNo <= 0x13) {
++     modeflag = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ModeFlag;
+   } else {
++     if(SiS_Pr->UseCustomMode) {
++	modeflag = SiS_Pr->CModeFlag;
++     } else {
+     	CRT1Index = SiS_Pr->SiS_RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC;
+     	resinfo = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_RESINFO;
+ 	modeflag = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
++     }
+   }
+ 
+   if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCDA) {
+-
+-	   SiS_SetCRT2Sync(SiS_Pr,BaseAddr,ROMAddr,ModeNo,
+-                           RefreshRateTableIndex,HwDeviceExtension);
+ #ifdef SIS315H
+-	   SiS_SetGroup1_LCDA(SiS_Pr,BaseAddr,ROMAddr,ModeNo,ModeIdIndex,
+-     	                      HwDeviceExtension,RefreshRateTableIndex);
++     SiS_SetCRT2Sync(SiS_Pr,BaseAddr,ROMAddr,ModeNo,
++                     RefreshRateTableIndex,HwDeviceExtension);
++
++     SiS_SetGroup1_LCDA(SiS_Pr,BaseAddr,ROMAddr,ModeNo,ModeIdIndex,
++                        HwDeviceExtension,RefreshRateTableIndex);
+ #endif
+   } else {
+ 
+      if( (HwDeviceExtension->jChipType >= SIS_315H) &&
+          (SiS_Pr->SiS_IF_DEF_LVDS == 1) &&
+-	 (SiS_Pr->SiS_VBInfo & SetInSlaveMode)) {
++	 (SiS_Pr->SiS_VBInfo & SetInSlaveMode) ) {
+ 
+         SiS_SetCRT2Sync(SiS_Pr,BaseAddr,ROMAddr,ModeNo,
+                         RefreshRateTableIndex,HwDeviceExtension);
+@@ -367,13 +348,13 @@ SiS_SetGroup1(SiS_Private *SiS_Pr,USHORT
+ #ifdef SIS300   /* ------------- 300 series --------------*/
+ 
+     		temp = (SiS_Pr->SiS_VGAHT - 1) & 0x0FF;   			/* BTVGA2HT 0x08,0x09 */
+-    		SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x08,temp);                   /* TW: CRT2 Horizontal Total */
++    		SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x08,temp);                   /* CRT2 Horizontal Total */
+ 
+     		temp = (((SiS_Pr->SiS_VGAHT - 1) & 0xFF00) >> 8) << 4;
+-    		SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x09,0x0f,temp);          /* TW: CRT2 Horizontal Total Overflow [7:4] */
++    		SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x09,0x0f,temp);          /* CRT2 Horizontal Total Overflow [7:4] */
+ 
+     		temp = (SiS_Pr->SiS_VGAHDE + 12) & 0x0FF;                       /* BTVGA2HDEE 0x0A,0x0C */
+-    		SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x0A,temp);                   /* TW: CRT2 Horizontal Display Enable End */
++    		SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x0A,temp);                   /* CRT2 Horizontal Display Enable End */
+ 
+     		pushbx = SiS_Pr->SiS_VGAHDE + 12;                               /* bx  BTVGA@HRS 0x0B,0x0C */
+     		tempcx = (SiS_Pr->SiS_VGAHT - SiS_Pr->SiS_VGAHDE) >> 2;
+@@ -382,108 +363,129 @@ SiS_SetGroup1(SiS_Private *SiS_Pr,USHORT
+     		tempcx += tempbx;
+ 
+     		if(SiS_Pr->SiS_IF_DEF_LVDS == 0) {
+-      			if(SiS_Pr->SiS_VBInfo & SetCRT2ToRAMDAC){
+-			        /* CRT1Index &= 0x3F; - Not any longer */
+-        			tempbx = SiS_Pr->SiS_CRT1Table[CRT1Index].CR[4];
+-        			tempbx |= ((SiS_Pr->SiS_CRT1Table[CRT1Index].CR[14] & 0xC0) << 2);
+-        			tempbx = (tempbx - 1) << 3;
+-        			tempcx = SiS_Pr->SiS_CRT1Table[CRT1Index].CR[5];
+-        			tempcx &= 0x1F;
+-        			temp = SiS_Pr->SiS_CRT1Table[CRT1Index].CR[15];
+-        			temp = (temp & 0x04) << (6-2);
+-        			tempcx = (tempcx | temp);
+-				tempcx--;
+-				tempcx <<= 3;
+-      			}
+-
+-    			if((SiS_Pr->SiS_VBInfo & SetCRT2ToTV) && (resinfo == 0x08)){
+-        			if(!(SiS_Pr->SiS_VBInfo & SetPALTV)){
+-      					tempbx = 1040;
+-      					tempcx = 1042;
+-      				}
+-    			}
++
++		   if(SiS_Pr->UseCustomMode) {
++		      tempbx = SiS_Pr->CHSyncStart + 12;
++		      tempcx = SiS_Pr->CHSyncEnd + 12;
++		   }
++
++      		   if(SiS_Pr->SiS_VBInfo & SetCRT2ToRAMDAC) {
++		      unsigned char cr4, cr14, cr5, cr15;
++		      if(SiS_Pr->UseCustomMode) {
++		         cr4  = SiS_Pr->CCRT1CRTC[4];
++			 cr14 = SiS_Pr->CCRT1CRTC[14];
++			 cr5  = SiS_Pr->CCRT1CRTC[5];
++			 cr15 = SiS_Pr->CCRT1CRTC[15];
++		      } else {
++		         cr4  = SiS_Pr->SiS_CRT1Table[CRT1Index].CR[4];
++			 cr14 = SiS_Pr->SiS_CRT1Table[CRT1Index].CR[14];
++			 cr5  = SiS_Pr->SiS_CRT1Table[CRT1Index].CR[5];
++			 cr15 = SiS_Pr->SiS_CRT1Table[CRT1Index].CR[15];
++		      }
++        	      tempbx = ((cr4 | ((cr14 & 0xC0) << 2)) - 1) << 3;
++        	      tempcx = (((cr5 & 0x1F) | ((cr15 & 0x04) << (6-2))) - 1) << 3;
++      		   }
++
++    		   if((SiS_Pr->SiS_VBInfo & SetCRT2ToTV) && (resinfo == SIS_RI_1024x768)){
++        	      if(!(SiS_Pr->SiS_VBInfo & SetPALTV)){
++      			 tempbx = 1040;
++      			 tempcx = 1042;
++      		      }
++    		   }
+ 	        }
+ 
+     		temp = tempbx & 0x00FF;
+-    		SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x0B,temp);                   /* TW: CRT2 Horizontal Retrace Start */
++    		SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x0B,temp);                   /* CRT2 Horizontal Retrace Start */
+ #endif /* SIS300 */
+ 
+  	} else {
+ 
+-#ifdef SIS315H  /* ----------------- 310/325/330 series ------------- */
++#ifdef SIS315H  /* ------------------- 315/330 series --------------- */
+ 
+ 	        tempcx = SiS_Pr->SiS_VGAHT;				       /* BTVGA2HT 0x08,0x09 */
+-		pushcx = tempcx;
+ 		if(modeflag & HalfDCLK) {
+-#ifndef NEWCH701x		
+-		    if((SiS_Pr->SiS_IF_DEF_LVDS == 1) && (SiS_Pr->SiS_IF_DEF_CH70xx == 0)) {
+-#endif		    
++		    if(SiS_Pr->SiS_IF_DEF_LVDS == 1) {
+ 		          tempax = SiS_Pr->SiS_VGAHDE >> 1;
+ 			  tempcx = SiS_Pr->SiS_HT - SiS_Pr->SiS_HDE + tempax;
+ 			  if(SiS_Pr->SiS_LCDInfo & DontExpandLCD) {
+ 			      tempcx = SiS_Pr->SiS_HT - tempax;
+ 			  }
+-#ifndef NEWCH701x					  
+ 		    } else {
+ 			  tempcx >>= 1;
+ 		    }
+-#endif		    
+ 		}
+ 		tempcx--;
+ 
+ 		temp = tempcx & 0xff;
+-		SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x08,temp);                  /* TW: CRT2 Horizontal Total */
++		SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x08,temp);                  /* CRT2 Horizontal Total */
+ 
+ 		temp = ((tempcx & 0xff00) >> 8) << 4;
+-		SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x09,0x0F,temp);         /* TW: CRT2 Horizontal Total Overflow [7:4] */
++		SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x09,0x0F,temp);         /* CRT2 Horizontal Total Overflow [7:4] */
+ 
+-		tempcx = pushcx;					       /* BTVGA2HDEE 0x0A,0x0C */
++		tempcx = SiS_Pr->SiS_VGAHT;				       /* BTVGA2HDEE 0x0A,0x0C */
+ 		tempbx = SiS_Pr->SiS_VGAHDE;
+ 		tempcx -= tempbx;
+ 		tempcx >>= 2;
+ 		if(modeflag & HalfDCLK) {
+-		    tempbx >>= 1;
+-		    tempcx >>= 1;
++		   tempbx >>= 1;
++		   tempcx >>= 1;
+ 		}
+ 		tempbx += 16;
+ 
+ 		temp = tempbx & 0xff;
+-		SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x0A,temp);                  /* TW: CRT2 Horizontal Display Enable End */
++		SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x0A,temp);                  /* CRT2 Horizontal Display Enable End */
+ 
+ 		pushbx = tempbx;
+ 		tempcx >>= 1;
+ 		tempbx += tempcx;
+ 		tempcx += tempbx;
+ 
+-		if(SiS_Pr->SiS_IF_DEF_LVDS==0) {
++		if(SiS_Pr->SiS_IF_DEF_LVDS == 0) {
++
++		   if(SiS_Pr->UseCustomMode) {
++		      tempbx = SiS_Pr->CHSyncStart + 16;
++		      tempcx = SiS_Pr->CHSyncEnd + 16;
++		      tempax = SiS_Pr->SiS_VGAHT;
++		      if(modeflag & HalfDCLK) tempax >>= 1;
++		      tempax--;
++		      if(tempcx > tempax)  tempcx = tempax;
++		   }
++
+              	   if(SiS_Pr->SiS_VBInfo & SetCRT2ToRAMDAC) {
+-                	tempbx = SiS_Pr->SiS_CRT1Table[CRT1Index].CR[4];
+-                	tempbx |= ((SiS_Pr->SiS_CRT1Table[CRT1Index].CR[14] & 0xC0) << 2);
+-                	tempbx = (tempbx - 3) << 3;         		/*(VGAHRS-3)*8 */
+-                	tempcx = SiS_Pr->SiS_CRT1Table[CRT1Index].CR[5];
+-               		tempcx &= 0x1F;
+-                	temp = SiS_Pr->SiS_CRT1Table[CRT1Index].CR[15];
+-                	temp = (temp & 0x04) << (5-2);      		/* VGAHRE D[5] */
+-                	tempcx = (tempcx | temp);	  	  	/* (VGAHRE-3)*8 */
+-			tempcx -= 3;
+-			tempcx <<= 3;
+-			tempcx &= 0x00FF;
+-			tempcx |= (tempbx & 0xFF00);
+-                	tempbx += 16;
+-                	tempcx += 16;
+-			tempax = SiS_Pr->SiS_VGAHT;
+-			if(modeflag & HalfDCLK)  tempax >>= 1;
+-			tempax--;
+-			if(tempcx > tempax)  tempcx = tempax;
++		      unsigned char cr4, cr14, cr5, cr15;
++		      if(SiS_Pr->UseCustomMode) {
++		         cr4  = SiS_Pr->CCRT1CRTC[4];
++			 cr14 = SiS_Pr->CCRT1CRTC[14];
++			 cr5  = SiS_Pr->CCRT1CRTC[5];
++			 cr15 = SiS_Pr->CCRT1CRTC[15];
++		      } else {
++		         cr4  = SiS_Pr->SiS_CRT1Table[CRT1Index].CR[4];
++			 cr14 = SiS_Pr->SiS_CRT1Table[CRT1Index].CR[14];
++			 cr5  = SiS_Pr->SiS_CRT1Table[CRT1Index].CR[5];
++			 cr15 = SiS_Pr->SiS_CRT1Table[CRT1Index].CR[15];
++		      }
++                      tempbx = ((cr4 | ((cr14 & 0xC0) << 2)) - 3) << 3; 		/* (VGAHRS-3)*8 */
++                      tempcx = (((cr5 & 0x1f) | ((cr15 & 0x04) << (5-2))) - 3) << 3; 	/* (VGAHRE-3)*8 */
++		      tempcx &= 0x00FF;
++		      tempcx |= (tempbx & 0xFF00);
++                      tempbx += 16;
++                      tempcx += 16;
++		      tempax = SiS_Pr->SiS_VGAHT;
++		      if(modeflag & HalfDCLK) tempax >>= 1;
++		      tempax--;
++		      if(tempcx > tempax)  tempcx = tempax;
+              	   }
+-         	   if((SiS_Pr->SiS_VBInfo & SetCRT2ToTV) && (resinfo == 0x08)){
+-             	      if(!(SiS_Pr->SiS_VBInfo & SetPALTV)){
+-      		 	 tempbx = 1040;
+-      		 	 tempcx = 1042;
+-      	     	      }
++         	   if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
++		      if(!(SiS_Pr->SiS_VBInfo & SetPALTV)) {
++		         if(resinfo == SIS_RI_1024x768) {
++      		 	    tempbx = 1040;
++      		 	    tempcx = 1042;
++      	     	         }
++		      }
+          	   }
+-		   /* TW: Makes no sense, but is in 650/302LV 1.10.6s */
+-         	   if((SiS_Pr->SiS_VBInfo & SetCRT2ToTV) && (resinfo == 0x08)){
++#if 0
++		   /* Makes no sense, but is in 650/30xLV 1.10.6s */
++         	   if((SiS_Pr->SiS_VBInfo & SetCRT2ToTV) && (resinfo == SIS_RI_1024x768)){
+ 		      if(!(SiS_Pr->SiS_VBInfo & SetCRT2ToHiVisionTV)) {
+              	         if(!(SiS_Pr->SiS_VBInfo & SetPALTV)) {
+       		 	    tempbx = 1040;
+@@ -491,25 +493,26 @@ SiS_SetGroup1(SiS_Private *SiS_Pr,USHORT
+       	     	         }
+ 		      }
+          	   }
++#endif
+                 }
+ 
+ 		temp = tempbx & 0xff;
+-	 	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x0B,temp);                 /* TW: CRT2 Horizontal Retrace Start */
++	 	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x0B,temp);                 /* CRT2 Horizontal Retrace Start */
+ #endif  /* SIS315H */
+ 
+-     	}  /* 310/325/330 series */
++     	}  /* 315/330 series */
+ 
+-  	/* TW: The following is done for all bridge/chip types/series */
++  	/* The following is done for all bridge/chip types/series */
+ 
+   	tempax = tempbx & 0xFF00;
+   	tempbx = pushbx;
+   	tempbx = (tempbx & 0x00FF) | ((tempbx & 0xFF00) << 4);
+   	tempax |= (tempbx & 0xFF00);
+   	temp = (tempax & 0xFF00) >> 8;
+-  	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x0C,temp);                        /* TW: Overflow */
++  	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x0C,temp);                        /* Overflow */
+ 
+   	temp = tempcx & 0x00FF;
+-  	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x0D,temp);                        /* TW: CRT2 Horizontal Retrace End */
++  	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x0D,temp);                        /* CRT2 Horizontal Retrace End */
+ 
+   	/* 2. Vertical setup */
+ 
+@@ -517,30 +520,30 @@ SiS_SetGroup1(SiS_Private *SiS_Pr,USHORT
+   	temp = tempcx & 0x00FF;
+ 
+         if(SiS_Pr->SiS_IF_DEF_LVDS == 1) {
+-	     if(HwDeviceExtension->jChipType < SIS_315H) {
+-	          if(SiS_Pr->SiS_IF_DEF_CH70xx != 0) {
+-		       if(SiS_Pr->SiS_VBInfo & (SetCRT2ToSVIDEO | SetCRT2ToAVIDEO)) {
+-		           temp--;
+-		       }
+-                  }
+-	     } else {
+- 		      temp--;
+-             }
++	   if(HwDeviceExtension->jChipType < SIS_315H) {
++	      if(SiS_Pr->SiS_IF_DEF_CH70xx != 0) {
++	         if(SiS_Pr->SiS_VBInfo & (SetCRT2ToSVIDEO | SetCRT2ToAVIDEO)) {
++	            temp--;
++	         }
++              }
++	   } else {
++ 	      temp--;
++           }
+         } else if(HwDeviceExtension->jChipType >= SIS_315H) {
+-	    /* TW: 650/30xLV 1.10.6s */
+-	    temp--;
++	   /* 650/30xLV 1.10.6s */
++	   temp--;
+ 	}
+-  	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x0E,temp);                        /* TW: CRT2 Vertical Total */
++  	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x0E,temp);                        /* CRT2 Vertical Total */
+ 
+   	tempbx = SiS_Pr->SiS_VGAVDE - 1;
+   	temp = tempbx & 0x00FF;
+-  	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x0F,temp);                        /* TW: CRT2 Vertical Display Enable End */
++  	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x0F,temp);                        /* CRT2 Vertical Display Enable End */
+ 
+   	temp = ((tempbx & 0xFF00) << 3) >> 8;
+   	temp |= ((tempcx & 0xFF00) >> 8);
+-  	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x12,temp);                        /* TW: Overflow (and HWCursor Test Mode) */
++  	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x12,temp);                        /* Overflow (and HWCursor Test Mode) */
+ 
+-	/* TW: 650/LVDS (1.10.07), 650/30xLV (1.10.6s) */
++	/* 650/LVDS (1.10.07), 650/30xLV (1.10.6s) */
+ 	if(HwDeviceExtension->jChipType >= SIS_315H) {
+            tempbx++;
+    	   tempax = tempbx;
+@@ -553,29 +556,44 @@ SiS_SetGroup1(SiS_Private *SiS_Pr,USHORT
+ 	   tempcx += tempbx;
+ 	   tempcx++;
+ 	} else {
+-	   /* TW: 300 series, LVDS/301B: */
++	   /* 300 series, LVDS/301B: */
+   	   tempbx = (SiS_Pr->SiS_VGAVT + SiS_Pr->SiS_VGAVDE) >> 1;                 /*  BTVGA2VRS     0x10,0x11   */
+   	   tempcx = ((SiS_Pr->SiS_VGAVT - SiS_Pr->SiS_VGAVDE) >> 4) + tempbx + 1;  /*  BTVGA2VRE     0x11        */
+ 	}
+ 
+   	if(SiS_Pr->SiS_IF_DEF_LVDS == 0) {
+-    	   if(SiS_Pr->SiS_VBInfo & SetCRT2ToRAMDAC){
+-      		tempbx = SiS_Pr->SiS_CRT1Table[CRT1Index].CR[8];
+-      		temp = SiS_Pr->SiS_CRT1Table[CRT1Index].CR[7];
+-      		if(temp & 0x04) tempbx |= 0x0100;
+-      		if(temp & 0x80) tempbx |= 0x0200;
+-      		temp = SiS_Pr->SiS_CRT1Table[CRT1Index].CR[13];
+-      		if(temp & 0x08) tempbx |= 0x0400;
+-      		temp = SiS_Pr->SiS_CRT1Table[CRT1Index].CR[9];
+-      		tempcx = (tempcx & 0xFF00) | (temp & 0x00FF);
++
++	   if(SiS_Pr->UseCustomMode) {
++	      tempbx = SiS_Pr->CVSyncStart;
++	      tempcx = (tempcx & 0xFF00) | (SiS_Pr->CVSyncEnd & 0x00FF);
++	   }
++
++    	   if(SiS_Pr->SiS_VBInfo & SetCRT2ToRAMDAC) {
++	      unsigned char cr8, cr7, cr13, cr9;
++	      if(SiS_Pr->UseCustomMode) {
++	         cr8  = SiS_Pr->CCRT1CRTC[8];
++		 cr7  = SiS_Pr->CCRT1CRTC[7];
++		 cr13 = SiS_Pr->CCRT1CRTC[13];
++		 cr9  = SiS_Pr->CCRT1CRTC[9];
++	      } else {
++	         cr8  = SiS_Pr->SiS_CRT1Table[CRT1Index].CR[8];
++		 cr7  = SiS_Pr->SiS_CRT1Table[CRT1Index].CR[7];
++		 cr13 = SiS_Pr->SiS_CRT1Table[CRT1Index].CR[13];
++		 cr9  = SiS_Pr->SiS_CRT1Table[CRT1Index].CR[9];
++	      }
++      	      tempbx = cr8;
++      	      if(cr7 & 0x04)  tempbx |= 0x0100;
++      	      if(cr7 & 0x80)  tempbx |= 0x0200;
++      	      if(cr13 & 0x08) tempbx |= 0x0400;
++      	      tempcx = (tempcx & 0xFF00) | (cr9 & 0x00FF);
+     	   }
+   	}
+   	temp = tempbx & 0x00FF;
+-  	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x10,temp);           /* TW: CRT2 Vertical Retrace Start */
++  	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x10,temp);           /* CRT2 Vertical Retrace Start */
+ 
+   	temp = ((tempbx & 0xFF00) >> 8) << 4;
+   	temp |= (tempcx & 0x000F);
+-  	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x11,temp);           /* TW: CRT2 Vert. Retrace End; Overflow; "Enable CRTC Check" */
++  	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x11,temp);           /* CRT2 Vert. Retrace End; Overflow; "Enable CRTC Check" */
+ 
+   	/* 3. Panel compensation delay */
+ 
+@@ -590,18 +608,18 @@ SiS_SetGroup1(SiS_Private *SiS_Pr,USHORT
+ 		   temp = 0x10;
+ 		   if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768)  temp = 0x2c;
+ 		   if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) temp = 0x20;
+-		   if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x960)  temp = 0x24;
+ 		}
+ 		if(SiS_Pr->SiS_VBType & VB_SIS301) {
+ 		   if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) temp = 0x20;
+ 		}
+ 		if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x960)     temp = 0x24;
++		if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_PanelCustom)       temp = 0x2c;
+ 		if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) 		temp = 0x08;
+ 		if(SiS_Pr->SiS_VBInfo & SetCRT2ToHiVisionTV) {
+       		   if(SiS_Pr->SiS_VBInfo & SetInSlaveMode) 	temp = 0x2c;
+       		   else 					temp = 0x20;
+     	        }
+-		if((ROMAddr) && (SiS_Pr->SiS_UseROM) && (SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV)) {
++		if((ROMAddr) && (SiS_Pr->SiS_UseROM)) {
+ 		    if(ROMAddr[0x220] & 0x80) {
+ 		        if(SiS_Pr->SiS_VBInfo & (SetCRT2ToTV-SetCRT2ToHiVisionTV))
+ 				temp = ROMAddr[0x221];
+@@ -636,19 +654,20 @@ SiS_SetGroup1(SiS_Private *SiS_Pr,USHORT
+ 		}
+ 	   }
+ 
+-    	   SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x13,~0x03C,temp);         /* TW: Panel Link Delay Compensation; (Software Command Reset; Power Saving) */
++    	   SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x13,~0x03C,temp);         /* Panel Link Delay Compensation; (Software Command Reset; Power Saving) */
+ 
+ #endif  /* SIS300 */
+ 
+   	} else {
+ 
+-#ifdef SIS315H   /* ----------- 310/325/330 series ---------------*/
++#ifdef SIS315H   /* --------------- 315/330 series ---------------*/
+ 
+ 	   if(SiS_Pr->SiS_IF_DEF_LVDS == 0) {
+                 temp = 0x10;
+                 if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768)  temp = 0x2c;
+     	        if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) temp = 0x20;
+     	        if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x960)  temp = 0x24;
++		if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_PanelCustom)    temp = 0x2c;
+ 		if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
+ 		   temp = 0x08;
+ 		   if(SiS_Pr->SiS_VBInfo & SetCRT2ToHiVisionTV) {
+@@ -664,7 +683,7 @@ SiS_SetGroup1(SiS_Private *SiS_Pr,USHORT
+ 		      }
+     	           }
+ 		}
+-		if(SiS_Pr->SiS_VBType & VB_SIS301B302B) {
++		if((SiS_Pr->SiS_VBType & VB_SIS301B302B) && (!(SiS_Pr->SiS_VBType & VB_NoLCD))) {
+ 		   tempbl = 0x00;
+ 		   if((ROMAddr) && (SiS_Pr->SiS_UseROM)) {
+ 		      if(HwDeviceExtension->jChipType < SIS_330) {
+@@ -689,8 +708,16 @@ SiS_SetGroup1(SiS_Private *SiS_Pr,USHORT
+ 		      if(!(SiS_Pr->SiS_VBInfo & SetCRT2ToTV)) tempbl = 0x0F;
+ 		   }
+ 		}
++
++		if(SiS_Pr->SiS_IF_DEF_DSTN || SiS_Pr->SiS_IF_DEF_FSTN) {
++		   temp = 0x08;
++		   tempbl = 0;
++		   if((ROMAddr) && (SiS_Pr->SiS_UseROM)) {
++		      if(ROMAddr[0x13c] & 0x80) tempbl = 0xf0;
++		   }
++		}
+ 	   }
+-	   SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x2D,tempbl,temp);	    /* TW: Panel Link Delay Compensation */
++	   SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x2D,tempbl,temp);	    /* Panel Link Delay Compensation */
+ 
+     	   tempax = 0;
+     	   if (modeflag & DoubleScanMode) tempax |= 0x80;
+@@ -705,14 +732,13 @@ SiS_SetGroup1(SiS_Private *SiS_Pr,USHORT
+ 
+      if(SiS_Pr->SiS_IF_DEF_LVDS == 0) {
+ 
+-        /* TW: For 301BDH, we set up the Panel Link */
+-        if( (SiS_Pr->SiS_VBType & VB_NoLCD) &&
+-	    (SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) ) {
++        /* For 301BDH with LCD, we set up the Panel Link */
++        if( (SiS_Pr->SiS_VBType & VB_NoLCD) && (SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) ) {
+ 
+ 	    SiS_SetGroup1_LVDS(SiS_Pr,BaseAddr,ROMAddr,ModeNo,ModeIdIndex,
+ 	                       HwDeviceExtension,RefreshRateTableIndex);
+ 
+-        } else if(SiS_Pr->SiS_VBInfo & SetInSlaveMode) {                             
++        } else if(SiS_Pr->SiS_VBInfo & SetInSlaveMode) {
+ 
+     	    SiS_SetGroup1_301(SiS_Pr,BaseAddr,ROMAddr,ModeNo,ModeIdIndex,
+ 	                      HwDeviceExtension,RefreshRateTableIndex);
+@@ -749,23 +775,27 @@ SiS_SetGroup1_301(SiS_Private *SiS_Pr, U
+   USHORT  push1,push2;
+   USHORT  tempax,tempbx,tempcx,temp;
+   USHORT  resinfo,modeflag;
++  unsigned char p1_7, p1_8;
+ 
+   if(ModeNo <= 0x13) {
+-    	modeflag = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ModeFlag;
+-    	resinfo = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ResInfo;
++     modeflag = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ModeFlag;
++     resinfo = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ResInfo;
+   } else {
++     if(SiS_Pr->UseCustomMode) {
++        modeflag = SiS_Pr->CModeFlag;
++	resinfo = 0;
++     } else {
+     	modeflag = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+     	resinfo = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_RESINFO;
++     }
+   }
+ 
+-  /* TW: The following is only done if bridge is in slave mode: */
++  /* The following is only done if bridge is in slave mode: */
+ 
+   tempax = 0xFFFF;
+   if(!(SiS_Pr->SiS_VBInfo & SetCRT2ToTV))  tempax = SiS_GetVGAHT2(SiS_Pr);
+ 
+-  if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
+-  	modeflag |= Charx8Dot;
+-  }
++  if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV)  modeflag |= Charx8Dot;
+ 
+   if(modeflag & Charx8Dot) tempcx = 0x08;
+   else                     tempcx = 0x09;
+@@ -777,8 +807,7 @@ SiS_SetGroup1_301(SiS_Private *SiS_Pr, U
+   tempax = (tempax / tempcx) - 5;
+   tempbx = tempax & 0x00FF;
+ 
+-  temp = 0xFF;                                                  /* set MAX HT */
+-  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x03,temp);
++  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x03,0xff);                 /* set MAX HT */
+ 
+   tempax = SiS_Pr->SiS_VGAHDE;                                 	/* 0x04 Horizontal Display End */
+   if(modeflag & HalfDCLK) tempax >>= 1;
+@@ -789,13 +818,13 @@ SiS_SetGroup1_301(SiS_Private *SiS_Pr, U
+ 
+   temp = (tempbx & 0xFF00) >> 8;
+   if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
+-        if(!(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV)) {        
+-    	    temp += 2;
+-        }
+-  }	
++     if(!(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV)) {
++        temp += 2;
++     }
++  }
+   if(SiS_Pr->SiS_VBInfo & SetCRT2ToHiVisionTV) {
+      if(SiS_Pr->SiS_HiVision == 3) {
+-              if(resinfo == 7) temp -= 2;
++        if(resinfo == SIS_RI_800x600) temp -= 2;
+      }
+   }
+   SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x05,temp);                 /* 0x05 Horizontal Display Start */
+@@ -804,140 +833,133 @@ SiS_SetGroup1_301(SiS_Private *SiS_Pr, U
+ 
+   if((SiS_Pr->SiS_VBInfo & SetCRT2ToHiVisionTV) &&
+      (SiS_Pr->SiS_HiVision == 3)) {
+-    temp = (tempbx & 0x00FF) - 1;
+-    if(!(modeflag & HalfDCLK)) {
+-      temp -= 6;
+-      if(SiS_Pr->SiS_SetFlag & TVSimuMode) {
+-        temp -= 2;
+-        if(ModeNo > 0x13) temp -= 10;
+-      }
+-    }
++     temp = (tempbx & 0x00FF) - 1;
++     if(!(modeflag & HalfDCLK)) {
++        temp -= 6;
++        if(SiS_Pr->SiS_SetFlag & TVSimuMode) {
++           temp -= 2;
++           if(ModeNo > 0x13) temp -= 10;
++        }
++     }
+   } else {
+-    tempcx = tempbx & 0x00FF;
+-    tempbx = (tempbx & 0xFF00) >> 8;
+-    tempcx = (tempcx + tempbx) >> 1;
+-    temp = (tempcx & 0x00FF) + 2;
+-    if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV){
+-       temp--;
+-       if(!(modeflag & HalfDCLK)){
+-          if((modeflag & Charx8Dot)){
+-             temp += 4;
+-             if(SiS_Pr->SiS_VGAHDE >= 800) temp -= 6;
+-             if(HwDeviceExtension->jChipType >= SIS_315H) {
+-	        if(SiS_Pr->SiS_VGAHDE == 800) temp += 2;
+-             }
+-          }
+-       }
+-    } else {
+-       if(!(modeflag & HalfDCLK)) {
+-          temp -= 4;
+-          if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel1280x960) {
+-             if(SiS_Pr->SiS_VGAHDE >= 800) {
+-                temp -= 7;
+-	        if(HwDeviceExtension->jChipType < SIS_315H) {
+-	           /* 650/301LV(x) does not do this, 630/301B, 300/301LV do */
+-                   if(SiS_Pr->SiS_ModeType == ModeEGA) {
+-                      if(SiS_Pr->SiS_VGAVDE == 1024) {
+-                         temp += 15;
+-                         if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel1280x1024) 
+-			    temp += 7;
+-                      }
+-                   }
+-	        }
+-                if(SiS_Pr->SiS_VGAHDE >= 1280) {
+-                   if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel1280x960) {
+-                      if(SiS_Pr->SiS_LCDInfo & DontExpandLCD) temp += 28;
+-                   }
+-                }
+-             }
+-          }
+-       }
+-    }
++     tempcx = tempbx & 0x00FF;
++     tempbx = (tempbx & 0xFF00) >> 8;
++     tempcx = (tempcx + tempbx) >> 1;
++     temp = (tempcx & 0x00FF) + 2;
++     if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
++        temp--;
++        if(!(modeflag & HalfDCLK)) {
++           if((modeflag & Charx8Dot)) {
++              temp += 4;
++              if(SiS_Pr->SiS_VGAHDE >= 800) temp -= 6;
++              if(HwDeviceExtension->jChipType >= SIS_315H) {
++	         if(SiS_Pr->SiS_VGAHDE == 800) temp += 2;
++              }
++           }
++        }
++     } else {
++        if(!(modeflag & HalfDCLK)) {
++           temp -= 4;
++           if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel1280x960) {
++              if(SiS_Pr->SiS_VGAHDE >= 800) {
++                 temp -= 7;
++	         if(HwDeviceExtension->jChipType < SIS_315H) {
++	            /* 650/301LV(x) does not do this, 630/301B, 300/301LV do */
++                    if(SiS_Pr->SiS_ModeType == ModeEGA) {
++                       if(SiS_Pr->SiS_VGAVDE == 1024) {
++                          temp += 15;
++                          if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel1280x1024)
++		  	     temp += 7;
++                       }
++                    }
++	         }
++                 if(SiS_Pr->SiS_VGAHDE >= 1280) {
++                    if(SiS_Pr->SiS_LCDInfo & DontExpandLCD) temp += 28;
++                 }
++              }
++           }
++        }
++     }
+   }
+-  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x07,temp);               	/* 0x07 Horizontal Retrace Start */
+ 
+-  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x08,0x00);                 /* 0x08 Horizontal Retrace End   */
++  p1_7 = temp;
++  p1_8 = 0x00;
+ 
+   if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
+      if(SiS_Pr->SiS_SetFlag & TVSimuMode) {
+-            if(ModeNo <= 0x01) {
+-	        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x07,0x2a);
+-		if(!(SiS_Pr->SiS_VBInfo & SetPALTV)) {
+-		    SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x08,0x61);
+-		} else {
+-		    SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x08,0x41);
+-		}
+-	    } else if(SiS_Pr->SiS_ModeType == ModeText) {
+-	        if(!(SiS_Pr->SiS_VBInfo & SetPALTV)) {
+-		    SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x07,0x54);
+-		} else {
+-		    SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x07,0x55);
+-		}
+-		SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x08,0x00);
+-	    } else if(ModeNo <= 0x13) {
+-	        if(modeflag & HalfDCLK) {
+-		    if(!(SiS_Pr->SiS_VBInfo & SetPALTV)) {
+-		        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x07,0x30);
+-			SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x08,0x03);
+-		    } else {
+-		        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x07,0x2f);
+-			SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x08,0x02);
+-		    }
+-		} else {
+-		    SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x07,0x5b);
+-		    SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x08,0x03);
+-		}
+-	    } else if( ((HwDeviceExtension->jChipType >= SIS_315H) && (ModeNo == 0x50)) ||
+-	               ((HwDeviceExtension->jChipType < SIS_315H) && (resinfo == 0 || resinfo == 1)) ) {
+-	        if(!(SiS_Pr->SiS_VBInfo & SetPALTV)) {
+-		    SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x07,0x30);
+-		    SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x08,0x03);
+-		} else {
+-		    SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x07,0x2f);
+-		    SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x08,0x03);
+-		}
+-	    }
+-
++        if(ModeNo <= 0x01) {
++	   p1_7 = 0x2a;
++	   if(!(SiS_Pr->SiS_VBInfo & SetPALTV)) p1_8 = 0x61;
++	   else 	      			p1_8 = 0x41;
++	} else if(SiS_Pr->SiS_ModeType == ModeText) {
++	   if(!(SiS_Pr->SiS_VBInfo & SetPALTV)) p1_7 = 0x54;
++	   else 	    			p1_7 = 0x55;
++	   p1_8 = 0x00;
++	} else if(ModeNo <= 0x13) {
++	   if(modeflag & HalfDCLK) {
++	      if(!(SiS_Pr->SiS_VBInfo & SetPALTV)) {
++		 p1_7 = 0x30;
++		 p1_8 = 0x03;
++	      } else {
++	 	 p1_7 = 0x2f;
++		 p1_8 = 0x02;
++	      }
++	   } else {
++	      p1_7 = 0x5b;
++	      p1_8 = 0x03;
++	   }
++	} else if( ((HwDeviceExtension->jChipType >= SIS_315H) &&
++	            ((ModeNo == 0x50) || (ModeNo = 0x56) || (ModeNo = 0x53))) ||
++	           ((HwDeviceExtension->jChipType < SIS_315H) &&
++		    (resinfo == SIS_RI_320x200 || resinfo == SIS_RI_320x240)) ) {
++	   if(!(SiS_Pr->SiS_VBInfo & SetPALTV)) {
++	      p1_7 = 0x30,
++	      p1_8 = 0x03;
++	   } else {
++	      p1_7 = 0x2f;
++	      p1_8 = 0x03;
++	   }
++        }
+      }
+   }
++
+   if(SiS_Pr->SiS_VBInfo & SetCRT2ToHiVisionTV) {
+      if(SiS_Pr->SiS_HiVision & 0x03) {
+-        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x07,0xb2);
++	p1_7 = 0xb2;
+ 	if(SiS_Pr->SiS_HiVision & 0x02) {
+-	   SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x07,0xab);
++	   p1_7 = 0xab;
+ 	}
+      }
+   }
+ 
++  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x07,p1_7);			/* 0x07 Horizontal Retrace Start */
++  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x08,p1_8);			/* 0x08 Horizontal Retrace End   */
++
++
+   SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x18,0x03);                	/* 0x18 SR08 (FIFO Threshold?)   */
+ 
+   SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x19,0xF0);
+ 
+-  tempbx = SiS_Pr->SiS_VGAVT;
+-  push1 = tempbx;
+-
+   SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x09,0xFF);                	/* 0x09 Set Max VT    */
+ 
+   tempcx = 0x121;
+   tempbx = SiS_Pr->SiS_VGAVDE;                               	/* 0x0E Vertical Display End */
+-  if(tempbx == 357) tempbx = 350;
+-  if(tempbx == 360) tempbx = 350;
+-  if(tempbx == 375) tempbx = 350;
+-  if(tempbx == 405) tempbx = 400;
+-  if(tempbx == 420) tempbx = 400;
+-  if(tempbx == 525) tempbx = 480;
++  if     (tempbx == 357) tempbx = 350;
++  else if(tempbx == 360) tempbx = 350;
++  else if(tempbx == 375) tempbx = 350;
++  else if(tempbx == 405) tempbx = 400;
++  else if(tempbx == 420) tempbx = 400;
++  else if(tempbx == 525) tempbx = 480;
+   push2 = tempbx;
+   if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
+-    	if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) {
+-      		if(!(SiS_Pr->SiS_SetFlag & LCDVESATiming)) {
+-        		if(tempbx == 350) tempbx += 5;
+-        		if(tempbx == 480) tempbx += 5;
+-      		}
+-    	}
++     if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) {
++      	if(!(SiS_Pr->SiS_SetFlag & LCDVESATiming)) {
++           if     (tempbx == 350) tempbx += 5;
++           else if(tempbx == 480) tempbx += 5;
++      	}
++     }
+   }
+-  tempbx--;
+-  temp = tempbx & 0x00FF;
+-  tempbx--;
++  tempbx -= 2;
+   temp = tempbx & 0x00FF;
+   SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x10,temp);        		/* 0x10 vertical Blank Start */
+ 
+@@ -945,126 +967,91 @@ SiS_SetGroup1_301(SiS_Private *SiS_Pr, U
+   tempbx--;
+   temp = tempbx & 0x00FF;
+ #if 0
+-  /* TW: Missing code from 630/301B 2.04.5a and 650/302LV 1.10.6s (calles int 2f) */
++  /* Missing code from 630/301B 2.04.5a and 650/302LV 1.10.6s (calles int 2f) */
+   if(xxx()) {
+       if(temp == 0xdf) temp = 0xda;
+   }
+ #endif
+   SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x0E,temp);
+ 
+-  if(tempbx & 0x0100) {
+-  	tempcx |= 0x0002;
+-	if(SiS_Pr->SiS_VBType & VB_SIS301) tempcx |= 0x000a;
+-  }
++  if(tempbx & 0x0100)  tempcx |= 0x0002;
+ 
+   tempax = 0x000B;
+   if(modeflag & DoubleScanMode) tempax |= 0x8000;
+ 
+-  if(tempbx & 0x0200) {
+-  	tempcx |= 0x0040;
+-	if(SiS_Pr->SiS_VBType & VB_SIS301) tempax |= 0x2000;
+-  }
+-
+-  if(SiS_Pr->SiS_VBType & VB_SIS301) {
+-        if(SiS_Pr->SiS_VBInfo & SetPALTV) {
+-	      if(SiS_Pr->SiS_VGAVDE == 480) {
+-	             tempax = (tempax & 0x00ff) | 0x2000;
+-		     if(modeflag & DoubleScanMode)  tempax |= 0x8000;
+-	      }
+-	}
+-  }
++  if(tempbx & 0x0200)  tempcx |= 0x0040;
+ 
+   temp = (tempax & 0xFF00) >> 8;
+   SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x0B,temp);
+ 
+-  if(tempbx & 0x0400) tempcx |= 0x0600;
++  if(tempbx & 0x0400)  tempcx |= 0x0600;
+ 
+   SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x11,0x00);                	/* 0x11 Vertical Blank End */
+ 
+-  tempax = push1;
+-  tempax -= tempbx;
+-  tempax >>= 2;
+-  push1 = tempax;
++  tempax = (SiS_Pr->SiS_VGAVT - tempbx) >> 2;
+ 
+-  if(HwDeviceExtension->jChipType >= SIS_315H) {
+-        /* TW: 650/30xLV 1.10.6s */
+-        if(ModeNo > 0x13) {
+-	    if(resinfo != 0x09) {  /* 1280x1024 */
+-	        tempax <<= 1;
+-		tempbx += tempax;
+-	    }
+-	} else {
+-	    if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel1400x1050) {
+-	        tempax <<= 1;
+-		tempbx += tempax;
+-	    }
+-	}
+-  } else if((resinfo != 0x09) || (SiS_Pr->SiS_VBType & VB_SIS301)) {
+-    	tempax <<= 1;
+-    	tempbx += tempax;
++  if((ModeNo > 0x13) || (HwDeviceExtension->jChipType < SIS_315H)) {
++     if(resinfo != SIS_RI_1280x1024) {
++	tempbx += (tempax << 1);
++     }
++  } else if(HwDeviceExtension->jChipType >= SIS_315H) {
++     if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel1400x1050) {
++	tempbx += (tempax << 1);
++     }
+   }
+ 
+-  if( (SiS_Pr->SiS_VBInfo & SetCRT2ToHiVisionTV) &&
+-      (SiS_Pr->SiS_HiVision == 3) ) {
+-    	tempbx -= 10;
++  if((SiS_Pr->SiS_VBInfo & SetCRT2ToHiVisionTV) &&
++     (SiS_Pr->SiS_HiVision == 3)) {
++     tempbx -= 10;
+   } else {
+-    	if(SiS_Pr->SiS_SetFlag & TVSimuMode) {
+-      	   if(SiS_Pr->SiS_VBInfo & SetPALTV) {
+-	       if(!(SiS_Pr->SiS_HiVision & 0x03)) {
+-                    tempbx += 40;
+-		    if(HwDeviceExtension->jChipType >= SIS_315H) {
+-		       if(SiS_Pr->SiS_VGAHDE == 800) tempbx += 10;
+-		    }
+-      	       }
+-	   }
+-    	}
++     if(SiS_Pr->SiS_SetFlag & TVSimuMode) {
++        if(SiS_Pr->SiS_VBInfo & SetPALTV) {
++	   if(!(SiS_Pr->SiS_HiVision & 0x03)) {
++              tempbx += 40;
++	      if(HwDeviceExtension->jChipType >= SIS_315H) {
++	         if(SiS_Pr->SiS_VGAHDE == 800) tempbx += 10;
++	      }
++      	   }
++	}
++     }
+   }
+-  tempax = push1;
+   tempax >>= 2;
+   tempax++;
+   tempax += tempbx;
+   push1 = tempax;
+   if(SiS_Pr->SiS_VBInfo & SetPALTV) {
+-    	if(tempbx <= 513)  {
+-      		if(tempax >= 513) tempbx = 513;
+-    	}
++     if(tempbx <= 513)  {
++     	if(tempax >= 513) tempbx = 513;
++     }
+   }
+   temp = tempbx & 0x00FF;
+   SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x0C,temp);			/* 0x0C Vertical Retrace Start */
+ 
+-  if(!(SiS_Pr->SiS_VBType & VB_SIS301)) {
+-  	tempbx--;
+-  	temp = tempbx & 0x00FF;
+-  	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x10,temp);
+-
+-	if(tempbx & 0x0100) tempcx |= 0x0008;
++  tempbx--;
++  temp = tempbx & 0x00FF;
++  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x10,temp);
+ 
+-  	if(tempbx & 0x0200) {
+-    	   SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x0B,0x20);
+-	}
++  if(tempbx & 0x0100) tempcx |= 0x0008;
+ 
+-  	tempbx++;
++  if(tempbx & 0x0200) {
++     SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x0B,0x20);
+   }
++  tempbx++;
++
+   if(tempbx & 0x0100) tempcx |= 0x0004;
+   if(tempbx & 0x0200) tempcx |= 0x0080;
+   if(tempbx & 0x0400) {
+-        if(SiS_Pr->SiS_VBType & VB_SIS301) tempcx |= 0x0800;
+-  	else                               tempcx |= 0x0C00;
++     if(SiS_Pr->SiS_VBType & VB_SIS301) tempcx |= 0x0800;
++     else                               tempcx |= 0x0C00;
+   }
+ 
+   tempbx = push1;
+-  temp = tempbx & 0x00FF;
+-  temp &= 0x0F;
++  temp = tempbx & 0x000F;
+   SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x0D,temp);        		/* 0x0D vertical Retrace End */
+ 
+   if(tempbx & 0x0010) tempcx |= 0x2000;
+ 
+   temp = tempcx & 0x00FF;
+-  if(SiS_Pr->SiS_VBType & VB_SIS301) {
+-	if(SiS_Pr->SiS_VBInfo & SetPALTV) {
+-	      if(SiS_Pr->SiS_VGAVDE == 480)  temp = 0xa3;
+-	}
+-  }
+   SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x0A,temp);              	/* 0x0A CR07 */
+ 
+   temp = (tempcx & 0xFF00) >> 8;
+@@ -1074,8 +1061,8 @@ SiS_SetGroup1_301(SiS_Private *SiS_Pr, U
+   temp = (tempax & 0xFF00) >> 8;
+   temp = (temp >> 1) & 0x09;
+   if(!(SiS_Pr->SiS_VBType & VB_SIS301)) {
+-       /* Only use 8 dot clock */
+-       temp |= 0x01;
++     /* Only use 8 dot clock */
++     temp |= 0x01;
+   }
+   SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x16,temp);              	/* 0x16 SR01 */
+ 
+@@ -1084,16 +1071,15 @@ SiS_SetGroup1_301(SiS_Private *SiS_Pr, U
+   SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x12,0x00);              	/* 0x12 CR17 */
+ 
+   if(SiS_Pr->SiS_LCDInfo & LCDRGB18Bit) {
+-       if(IS_SIS650) {
+-           /* TW: 650/30xLV 1.10.6s */
+-           if(SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x00) & 0x01) {
+-	       temp = 0x80;
+-	   }
+-       } else temp = 0x80;
+-  } else  temp = 0x00;
++     if(IS_SIS650) {
++        /* 650/30xLV 1.10.6s */
++        if(SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x00) & 0x01) {
++	   temp = 0x80;
++	}
++     } else temp = 0x80;
++  } else temp = 0x00;
+   SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x1A,temp);                	/* 0x1A SR0E */
+ 
+-  return;
+ }
+ 
+ void
+@@ -1108,40 +1094,52 @@ SiS_SetGroup1_LVDS(SiS_Private *SiS_Pr,U
+ #endif
+   ULONG  tempeax=0, tempebx, tempecx, tempvcfact=0;
+ 
++  /* This is not supported on LVDS */
++  if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_PanelCustom) return;
++  if(SiS_Pr->UseCustomMode) return;
++
+   if(ModeNo <= 0x13) {
+-    	modeflag = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ModeFlag;
+-    	resinfo = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ResInfo;
++     modeflag = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ModeFlag;
++     resinfo = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ResInfo;
+   } else {
+-    	modeflag = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+-    	resinfo = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_RESINFO;
++     modeflag = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
++     resinfo = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_RESINFO;
+   }
+ 
+-  /* TW: Set up Panel Link */
++  /* Set up Panel Link */
+ 
+   /* 1. Horizontal setup */
+ 
+   tempax = SiS_Pr->SiS_LCDHDES;
+ 
+-  if( (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480) &&
+-      (!(SiS_Pr->SiS_VBInfo & SetInSlaveMode)) ) {
+-  	tempax -= 8;
++  if((!SiS_Pr->SiS_IF_DEF_FSTN) && (!SiS_Pr->SiS_IF_DEF_DSTN)) {
++     if( (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480) &&
++         (!(SiS_Pr->SiS_VBInfo & SetInSlaveMode)) ) {
++  	   tempax -= 8;
++     }
+   }
+ 
+   tempcx = SiS_Pr->SiS_HT;    				  /* Horiz. Total */
+ 
+   tempbx = SiS_Pr->SiS_HDE;                               /* Horiz. Display End */
+ 
++  if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480_2 ||
++     SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480_3) {
++     tempbx >>= 1;
++  }
++
+   if(!(SiS_Pr->SiS_LCDInfo & LCDPass11)) {
+      if(SiS_Pr->SiS_LCDInfo & DontExpandLCD) {
+-        if((!SiS_Pr->SiS_IF_DEF_DSTN) && (SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel640x480)) {
+- 	   if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel800x600)        tempbx =  800;
+-	   else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x600)  tempbx = 1024;  /* TW */
+-    	   else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768)  tempbx = 1024;
+-	   else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1152x768)  tempbx = 1152;  /* TW */
+-	   else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x768)  tempbx = 1280;
+-	   else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) tempbx = 1280; 
+-	   else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050) tempbx = 1400; 
+-	   else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1600x1200) tempbx = 1600; 
++        if(SiS_Pr->SiS_IF_DEF_FSTN || SiS_Pr->SiS_IF_DEF_DSTN) {
++	   tempbx = SiS_Pr->PanelXRes;
++	} else if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel640x480) {
++	   tempbx = SiS_Pr->PanelXRes;
++	   if(SiS_Pr->SiS_CustomT == CUT_BARCO1024) {
++	      tempbx = 800;
++	      if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel800x600) {
++	         tempbx = 1024;
++	      }
++	   }
+         }
+      }
+   }
+@@ -1154,13 +1152,18 @@ SiS_SetGroup1_LVDS(SiS_Private *SiS_Pr,U
+   if(tempax >= SiS_Pr->SiS_HT) tempax -= SiS_Pr->SiS_HT;
+ 
+   push2 = tempax;
+-  
+-  if(!(SiS_Pr->SiS_LCDInfo & LCDPass11)) { 
+-     if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
+-        if((!SiS_Pr->SiS_IF_DEF_DSTN) && (SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel640x480)) {
+-     	   if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel800x600)        tempcx = 0x0028;
+-	   else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x600)  tempcx = 0x0018;
+-     	   else if( (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) ||
++
++  if((!SiS_Pr->SiS_IF_DEF_FSTN) &&
++     (!SiS_Pr->SiS_IF_DEF_DSTN) &&
++     (SiS_Pr->SiS_CustomT != CUT_BARCO1366) &&
++     (SiS_Pr->SiS_CustomT != CUT_BARCO1024) &&
++     (SiS_Pr->SiS_CustomT != CUT_PANEL848)) {
++     if(!(SiS_Pr->SiS_LCDInfo & LCDPass11)) {
++        if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
++           if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel640x480) {
++     	      if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel800x600)        tempcx = 0x0028;
++	      else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x600)  tempcx = 0x0018;
++     	      else if( (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) ||
+ 	            (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1152x768) ) {
+ 	  	   if(HwDeviceExtension->jChipType < SIS_315H) {
+ 		      if(SiS_Pr->SiS_IF_DEF_LVDS == 1) {
+@@ -1174,11 +1177,12 @@ SiS_SetGroup1_LVDS(SiS_Private *SiS_Pr,U
+ 		   } else {
+ 		      tempcx = 0x0018;
+ 		   }
++	      }
++	      else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x768)  tempcx = 0x0028;
++	      else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) tempcx = 0x0030;
++	      else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050) tempcx = 0x0030;
++	      else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1600x1200) tempcx = 0x0040;
+ 	   }
+-	   else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x768)  tempcx = 0x0028;
+-	   else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) tempcx = 0x0030;
+-	   else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050) tempcx = 0x0030;
+-	   else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1600x1200) tempcx = 0x0040;
+         }
+      }
+   }
+@@ -1188,14 +1192,18 @@ SiS_SetGroup1_LVDS(SiS_Private *SiS_Pr,U
+ 
+   tempax = tempcx >> 3;                          /* BPLHRS */
+   temp = tempax & 0x00FF;
+-  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x14,temp);		 /* Part1_14h; TW: Panel Link Horizontal Retrace Start  */
++  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x14,temp);		 /* Part1_14h; Panel Link Horizontal Retrace Start  */
+ 
+   if(SiS_Pr->SiS_LCDInfo & LCDPass11) {
+      temp = (tempax & 0x00FF) + 2;
+   } else {
+      temp = (tempax & 0x00FF) + 10;
+      if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
+-        if(!SiS_Pr->SiS_IF_DEF_DSTN) {
++        if((!SiS_Pr->SiS_IF_DEF_DSTN) &&
++	   (!SiS_Pr->SiS_IF_DEF_FSTN) &&
++	   (SiS_Pr->SiS_CustomT != CUT_BARCO1366) &&
++	   (SiS_Pr->SiS_CustomT != CUT_BARCO1024) &&
++	   (SiS_Pr->SiS_CustomT != CUT_PANEL848)) {
+            if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel640x480) {
+ 	      temp += 6;
+               if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel800x600) {
+@@ -1219,47 +1227,57 @@ SiS_SetGroup1_LVDS(SiS_Private *SiS_Pr,U
+ 
+   temp &= 0x1F;
+   temp |= ((tempcx & 0x0007) << 5);
+-  if(SiS_Pr->SiS_IF_DEF_FSTN) temp = 0x20;
+-  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x15,temp);    	 /* Part1_15h; TW: Panel Link Horizontal Retrace End/Skew */
++#if 0
++  if(SiS_Pr->SiS_IF_DEF_FSTN) temp = 0x20;       /* WRONG? BIOS loads cl, not ah */
++#endif
++  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x15,temp);    	 /* Part1_15h; Panel Link Horizontal Retrace End/Skew */
+ 
+   tempbx = push2;
+   tempcx = push1;                                /* lcdhdes  */
+ 
+   temp = (tempcx & 0x0007);                      /* BPLHDESKEW  */
+-  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x1A,temp);   	 /* Part1_1Ah; TW: Panel Link Vertical Retrace Start (2:0) */
++  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x1A,temp);   	 /* Part1_1Ah; Panel Link Vertical Retrace Start (2:0) */
+ 
+   tempcx >>= 3;                                  /* BPLHDES */
+   temp = (tempcx & 0x00FF);
+-  if(ModeNo == 0x5b) temp--;                     
+-  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x16,temp);    	 /* Part1_16h; TW: Panel Link Horizontal Display Enable Start  */
++#if 0 /* Not 550 FSTN */
++  if(HwDeviceExtension->jChipType >= SIS_315H) {
++     if(ModeNo == 0x5b) temp--; */
++  }
++#endif
++  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x16,temp);    	 /* Part1_16h; Panel Link Horizontal Display Enable Start  */
+ 
+-  if(HwDeviceExtension->jChipType < SIS_315H) {  
++  if((HwDeviceExtension->jChipType < SIS_315H) ||
++     (SiS_Pr->SiS_IF_DEF_FSTN) ||
++     (SiS_Pr->SiS_IF_DEF_DSTN)) {
+      if(tempbx & 0x07) tempbx += 8;              
+   }
+   tempbx >>= 3;                                  /* BPLHDEE  */
+   temp = tempbx & 0x00FF;
+-  if(ModeNo == 0x5b) temp--;			 
+-  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x17,temp);   	 /* Part1_17h; TW: Panel Link Horizontal Display Enable End  */
++#if 0 /* Not 550 FSTN */
++  if(HwDeviceExtension->jChipType >= SIS_315H) {
++     if(ModeNo == 0x5b) temp--;
++  }
++#endif
++  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x17,temp);   	 /* Part1_17h; Panel Link Horizontal Display Enable End  */
+ 
+   /* 2. Vertical setup */
+ 
+   if(HwDeviceExtension->jChipType < SIS_315H) {
+      tempcx = SiS_Pr->SiS_VGAVT;
+      tempbx = SiS_Pr->SiS_VGAVDE;
+-     if(SiS_Pr->SiS_LCDInfo & DontExpandLCD) {
+-        if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel640x480) {
+-	   if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel800x600)       tempbx =  600;
+-	   else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x600) tempbx =  600;
+-	   else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) tempbx =  768;
+-	   else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1152x768) tempbx =  768;
+-	   else								tempbx = 1024;
+-        }
++     if((SiS_Pr->SiS_CustomT != CUT_BARCO1366) && (SiS_Pr->SiS_CustomT != CUT_BARCO1024)) {
++        if(SiS_Pr->SiS_LCDInfo & DontExpandLCD) {
++           if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel640x480) {
++	      tempbx = SiS_Pr->PanelYRes;
++           }
++	}
+      }
+      tempcx -= tempbx;
+ 
+   } else {
+ 
+-     tempcx = SiS_Pr->SiS_VGAVT - SiS_Pr->SiS_VGAVDE;          /* VGAVT-VGAVDE  */
++     tempcx = SiS_Pr->SiS_VGAVT - SiS_Pr->SiS_VGAVDE;           /* VGAVT-VGAVDE  */
+ 
+   }
+ 
+@@ -1268,18 +1286,20 @@ SiS_SetGroup1_LVDS(SiS_Private *SiS_Pr,U
+ 
+   tempax = SiS_Pr->SiS_VGAVDE;
+ 
+-  if((SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) && (!SiS_Pr->SiS_IF_DEF_DSTN)) {
+-     if( (SiS_Pr->SiS_IF_DEF_TRUMPION == 0)   && 
+-         (!(SiS_Pr->SiS_LCDInfo & LCDPass11)) &&
+-         (SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel640x480) ) {
+-        if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel800x600)        tempax =  600;
+-        else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x600)  tempax =  600;  
+-        else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768)  tempax =  768;
+-        else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1152x768)  tempax =  768;  
+-        else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x768)  tempax =  768;  
+-        else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) tempax = 1024; 
+-        else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050) tempax = 1050; 
+-        else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1600x1200) tempax = 1200; 
++  if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
++     if((SiS_Pr->SiS_CustomT == CUT_BARCO1366) || (SiS_Pr->SiS_CustomT == CUT_BARCO1024)) {
++        if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel640x480) {
++           tempax = 600;
++	   if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel800x600) {
++	      tempax = 768;
++	   }
++	}
++     } else if( (SiS_Pr->SiS_IF_DEF_TRUMPION == 0)   &&
++                (!(SiS_Pr->SiS_LCDInfo & LCDPass11)) &&
++                ((SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel640x480) ||
++	         (SiS_Pr->SiS_IF_DEF_FSTN) ||
++	         (SiS_Pr->SiS_IF_DEF_DSTN)) ) {
++	tempax = SiS_Pr->PanelYRes;
+      }
+   }
+ 
+@@ -1290,11 +1310,25 @@ SiS_SetGroup1_LVDS(SiS_Private *SiS_Pr,U
+ 
+   tempcx >>= 1;
+ 
+-  if((SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) && (SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel640x480)) {
+-     if(!(SiS_Pr->SiS_LCDInfo & LCDPass11)) {
+-        if(!SiS_Pr->SiS_IF_DEF_DSTN) {
+-     	   if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel800x600)        tempcx = 0x0001;
+-	   else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x600)  tempcx = 0x0001;
++  if((SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) &&
++     (SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel640x480) &&
++     (SiS_Pr->SiS_CustomT != CUT_BARCO1366) &&
++     (SiS_Pr->SiS_CustomT != CUT_BARCO1024) &&
++     (SiS_Pr->SiS_CustomT != CUT_PANEL848)) {
++     if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480_2 ||
++        SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480_3) {
++	tempcx = 0x0017;
++     } else if(!(SiS_Pr->SiS_LCDInfo & LCDPass11)) {
++        if(SiS_Pr->SiS_IF_DEF_FSTN || SiS_Pr->SiS_IF_DEF_DSTN) {
++	   if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel800x600)         tempcx = 0x0003;
++  	   else if((SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) ||
++	           (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x768)) tempcx = 0x0003;
++           else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024)  tempcx = 0x0001;
++           else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050)  tempcx = 0x0001;
++	   else 							  tempcx = 0x0057;
++        } else  {
++     	   if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel800x600)         tempcx = 0x0001;
++	   else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x600)   tempcx = 0x0001;
+      	   else if((SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) ||
+ 	           (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1152x768)) {
+ 		   if(HwDeviceExtension->jChipType < SIS_315H) {
+@@ -1304,7 +1338,7 @@ SiS_SetGroup1_LVDS(SiS_Private *SiS_Pr,U
+ 			    tempcx = 0x0003;
+ #endif
+ 		      } else {
+-		            tempcx = 0x0002;   /* TW: A901; sometimes 0x0003; */
++		            tempcx = 0x0002;   /* A901; sometimes 0x0003; */
+ 		      }
+ 		   } else tempcx = 0x0003;
+            }
+@@ -1319,26 +1353,33 @@ SiS_SetGroup1_LVDS(SiS_Private *SiS_Pr,U
+ 
+   tempbx += tempcx;			 	/* BPLVRS  */
+ 
+-  if(HwDeviceExtension->jChipType < SIS_315H) {
+-      tempbx++;
++  if((HwDeviceExtension->jChipType < SIS_315H) ||
++     (SiS_Pr->SiS_IF_DEF_FSTN) ||
++     (SiS_Pr->SiS_IF_DEF_DSTN)) {
++     tempbx++;
+   }
+ 
+   if(tempbx >= SiS_Pr->SiS_VT) tempbx -= SiS_Pr->SiS_VT;
+ 
+   temp = tempbx & 0x00FF;
+-  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x18,temp);       	 /* Part1_18h; TW: Panel Link Vertical Retrace Start  */
++  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x18,temp);       	 /* Part1_18h; Panel Link Vertical Retrace Start  */
+ 
+   tempcx >>= 3;
+ 
+-  if(!(SiS_Pr->SiS_LCDInfo & LCDPass11)) {
++  if((!(SiS_Pr->SiS_LCDInfo & LCDPass11)) &&
++     (SiS_Pr->SiS_CustomT != CUT_BARCO1366) &&
++     (SiS_Pr->SiS_CustomT != CUT_BARCO1024) &&
++     (SiS_Pr->SiS_CustomT != CUT_PANEL848)) {
+      if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
+         if( (HwDeviceExtension->jChipType < SIS_315H) &&
+             (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480) )     tempcx = 0x0001;
++	else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480_2)  tempcx = 0x0002;
++	else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480_3)  tempcx = 0x0002;
+         else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel800x600)    tempcx = 0x0003;
+         else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x600)   tempcx = 0x0005;
+         else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1152x768)   tempcx = 0x0005;
+ 	else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x768)   tempcx = 0x0011;
+-        else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024)  tempcx = 0x0005;	 
++        else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024)  tempcx = 0x0005;
+         else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050)  tempcx = 0x0002;
+         else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1600x1200)  tempcx = 0x0011;
+         else if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel640x480)  {
+@@ -1360,26 +1401,37 @@ SiS_SetGroup1_LVDS(SiS_Private *SiS_Pr,U
+ 
+   tempcx = tempcx + tempbx + 1;                  /* BPLVRE  */
+   temp = tempcx & 0x000F;
+-  SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x19,0xf0,temp); /* Part1_19h; TW: Panel Link Vertical Retrace End (3:0); Misc.  */
++  if(SiS_Pr->SiS_IF_DEF_FSTN ||
++     SiS_Pr->SiS_IF_DEF_DSTN ||
++     (SiS_Pr->SiS_CustomT == CUT_BARCO1366) ||
++     (SiS_Pr->SiS_CustomT == CUT_BARCO1024) ||
++     (SiS_Pr->SiS_CustomT == CUT_PANEL848)) {
++     temp |= 0x30;
++  }
++  SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x19,0xf0,temp); /* Part1_19h; Panel Link Vertical Retrace End (3:0); Misc.  */
+ 
+   temp = ((tempbx & 0x0700) >> 8) << 3;          /* BPLDESKEW =0 */
+-  if(SiS_Pr->SiS_VGAVDE != SiS_Pr->SiS_VDE)  temp |= 0x40;
+-  if(SiS_Pr->SiS_SetFlag & EnableLVDSDDA)    temp |= 0x40;
++  if(SiS_Pr->SiS_IF_DEF_FSTN || SiS_Pr->SiS_IF_DEF_DSTN) {
++     if(SiS_Pr->SiS_HDE != 640) {
++        if(SiS_Pr->SiS_VGAVDE != SiS_Pr->SiS_VDE)   temp |= 0x40;
++     }
++  } else if(SiS_Pr->SiS_VGAVDE != SiS_Pr->SiS_VDE)  temp |= 0x40;
++  if(SiS_Pr->SiS_SetFlag & EnableLVDSDDA)           temp |= 0x40;
+   if(SiS_Pr->SiS_LCDInfo & LCDRGB18Bit) {
+-      if(HwDeviceExtension->jChipType >= SIS_315H) {
+-         if(SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x00) & 0x01) {
+-            temp |= 0x80;
+-         }
+-      } else {
+-	 if( (HwDeviceExtension->jChipType == SIS_630) ||
+-	     (HwDeviceExtension->jChipType == SIS_730) ) {
+-	    if(HwDeviceExtension->jChipRevision >= 0x30) {
+-	       temp |= 0x80;
+-	    }
+-	 }
+-      }
++     if(HwDeviceExtension->jChipType >= SIS_315H) {
++        if(SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x00) & 0x01) {
++           temp |= 0x80;
++        }
++     } else {
++	if( (HwDeviceExtension->jChipType == SIS_630) ||
++	    (HwDeviceExtension->jChipType == SIS_730) ) {
++	   if(HwDeviceExtension->jChipRevision >= 0x30) {
++	      temp |= 0x80;
++	   }
++	}
++     }
+   }
+-  SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x1A,0x87,temp);  /* Part1_1Ah; TW: Panel Link Control Signal (7:3); Vertical Retrace Start (2:0) */
++  SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x1A,0x87,temp);  /* Part1_1Ah; Panel Link Control Signal (7:3); Vertical Retrace Start (2:0) */
+ 
+   if (HwDeviceExtension->jChipType < SIS_315H) {
+ 
+@@ -1396,19 +1448,19 @@ SiS_SetGroup1_LVDS(SiS_Private *SiS_Pr,U
+ 	}
+ 
+   	temp = (USHORT)(tempebx & 0x00FF);
+-  	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x1E,temp);      /* Part1_1Eh; TW: Panel Link Vertical Scaling Factor */
++  	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x1E,temp);      /* Part1_1Eh; Panel Link Vertical Scaling Factor */
+ 
+ #endif /* SIS300 */
+ 
+   } else {
+ 
+-#ifdef SIS315H  /* 310/325 series */
++#ifdef SIS315H  /* 315 series */
+ 
+-#ifdef NEWCH701x
+-        SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x1E,0x03);
+-#else
+-	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x1E,0x23);
+-#endif	
++        if(HwDeviceExtension->jChipType == SIS_740) {
++           SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x1E,0x03);
++        } else {
++	   SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x1E,0x23);
++	}
+ 
+ 	tempeax = SiS_Pr->SiS_VGAVDE << 18;
+     	temp = (USHORT)(tempeax % (ULONG)SiS_Pr->SiS_VDE);
+@@ -1417,12 +1469,13 @@ SiS_SetGroup1_LVDS(SiS_Private *SiS_Pr,U
+     	tempebx = tempeax;                         /* BPLVCFACT  */
+         tempvcfact = tempeax;
+     	temp = (USHORT)(tempebx & 0x00FF);
+-    	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x37,temp);      /* Part1_37h; TW: Panel Link Vertical Scaling Factor */
++    	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x37,temp);      /* Part1_37h; Panel Link Vertical Scaling Factor */
+     	temp = (USHORT)((tempebx & 0x00FF00) >> 8);
+-    	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x36,temp);      /* Part1_36h; TW: Panel Link Vertical Scaling Factor */
++    	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x36,temp);      /* Part1_36h; Panel Link Vertical Scaling Factor */
+     	temp = (USHORT)((tempebx & 0x00030000) >> 16);
++	temp &= 0x03;
+     	if(SiS_Pr->SiS_VDE == SiS_Pr->SiS_VGAVDE) temp |= 0x04;
+-    	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x35,temp);      /* Part1_35h; TW: Panel Link Vertical Scaling Factor */
++    	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x35,temp);      /* Part1_35h; Panel Link Vertical Scaling Factor */
+ 
+ #endif /* SIS315H */
+ 
+@@ -1434,47 +1487,50 @@ SiS_SetGroup1_LVDS(SiS_Private *SiS_Pr,U
+   push1 = temp;					   
+ 
+   if(!(SiS_Pr->SiS_VBInfo & SetInSlaveMode)) {
+-   	if(!SiS_Pr->SiS_IF_DEF_DSTN){
++   	if(!SiS_Pr->SiS_IF_DEF_FSTN && !SiS_Pr->SiS_IF_DEF_DSTN) {
+ 		if(HwDeviceExtension->jChipType < SIS_315H) {
+ 			if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x600) {
+-      				if(resinfo == 15) tempcx++;
++      				if(resinfo == SIS_RI_1024x600) tempcx++;
+ 				if(SiS_Pr->SiS_LCDInfo & DontExpandLCD) {
+-					if(resinfo == 7) tempcx++;
++					if(resinfo == SIS_RI_800x600) tempcx++;
+ 		    		}
+ 			} else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel800x600) {
+-      				if(resinfo == 7) tempcx++;
+-				if(resinfo == 8) tempcx++; /* TW: Doesnt make sense anyway... */
+-			} else  if(resinfo == 8) tempcx++;
++      				if(resinfo == SIS_RI_800x600)  tempcx++;
++				if(resinfo == SIS_RI_1024x768) tempcx++; /* Doesnt make sense anyway... */
++			} else  if(resinfo == SIS_RI_1024x768) tempcx++;
+ 		} else {
+ 			if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel800x600) {
+-      				if(resinfo == 7) tempcx++;
++      				if(resinfo == SIS_RI_800x600)  tempcx++;
+ 			}
+ 		}
+ 	}
+   }
+ 
+   if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480) {
+-     tempcx = SiS_Pr->SiS_VGAVDE;
+-     tempbx = SiS_Pr->SiS_VGAVDE - 1;
++     if((!SiS_Pr->SiS_IF_DEF_FSTN) && (!SiS_Pr->SiS_IF_DEF_DSTN)) {
++        tempcx = SiS_Pr->SiS_VGAVDE;
++        tempbx = SiS_Pr->SiS_VGAVDE - 1;
++     }
+   }
+ 
+   temp = ((tempbx & 0x0700) >> 8) << 3;
+   temp |= ((tempcx & 0x0700) >> 8);
+-  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x1D,temp);     	/* Part1_1Dh; TW: Vertical Display Overflow; Control Signal */
++  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x1D,temp);     	/* Part1_1Dh; Vertical Display Overflow; Control Signal */
+ 
+   temp = tempbx & 0x00FF;
+-  if(SiS_Pr->SiS_IF_DEF_FSTN) temp++;
+-  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x1C,temp);      	/* Part1_1Ch; TW: Panel Link Vertical Display Enable End  */
++  /* if(SiS_Pr->SiS_IF_DEF_FSTN) temp++;  */
++  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x1C,temp);      	/* Part1_1Ch; Panel Link Vertical Display Enable End  */
+ 
+   temp = tempcx & 0x00FF;
+-  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x1B,temp);      	/* Part1_1Bh; TW: Panel Link Vertical Display Enable Start  */
++  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x1B,temp);      	/* Part1_1Bh; Panel Link Vertical Display Enable Start  */
+ 
+   /* 3. Additional horizontal setup (scaling, etc) */
+ 
+   tempecx = SiS_Pr->SiS_VGAHDE;
+   if(HwDeviceExtension->jChipType >= SIS_315H) {
+-     if(modeflag & HalfDCLK)
+-        tempecx >>= 1;
++     if((!SiS_Pr->SiS_IF_DEF_FSTN) && (!SiS_Pr->SiS_IF_DEF_DSTN)) {
++        if(modeflag & HalfDCLK) tempecx >>= 1;
++     }
+   }
+   tempebx = SiS_Pr->SiS_HDE;
+   if(tempecx == tempebx) tempeax = 0xFFFF;
+@@ -1484,139 +1540,165 @@ SiS_SetGroup1_LVDS(SiS_Private *SiS_Pr,U
+      temp = (USHORT)(tempeax % tempebx);
+      tempeax = tempeax / tempebx;
+      if(HwDeviceExtension->jChipType >= SIS_315H) {
+-         if(temp) tempeax++;
++        if(temp) tempeax++;
+      }
+   }
+   tempecx = tempeax;
+ 
+   if(HwDeviceExtension->jChipType >= SIS_315H) {
+-      tempeax = SiS_Pr->SiS_VGAHDE;
+-      if(modeflag & HalfDCLK) tempeax >>= 1;
+-      tempeax <<= 16;
+-      tempeax = (tempeax / tempecx) - 1;
++     tempeax = SiS_Pr->SiS_VGAHDE;
++     if((!SiS_Pr->SiS_IF_DEF_FSTN) && (!SiS_Pr->SiS_IF_DEF_DSTN)) {
++        if(modeflag & HalfDCLK) tempeax >>= 1;
++     }
++     tempeax <<= 16;
++     tempeax = (tempeax / tempecx) - 1;
+   } else {
+-      tempeax = ((SiS_Pr->SiS_VGAHT << 16) / tempecx) - 1;
++     tempeax = ((SiS_Pr->SiS_VGAHT << 16) / tempecx) - 1;
+   }
+   tempecx <<= 16;
+   tempecx |= (tempeax & 0xFFFF);
+   temp = (USHORT)(tempecx & 0x00FF);
+-  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x1F,temp);  	 /* Part1_1Fh; TW: Panel Link DDA Operational Number in each horiz. line */
++  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x1F,temp);  	 /* Part1_1Fh; Panel Link DDA Operational Number in each horiz. line */
+ 
+   tempbx = SiS_Pr->SiS_VDE;
+   if(HwDeviceExtension->jChipType >= SIS_315H) {
+-      tempeax = (SiS_Pr->SiS_VGAVDE << 18) / tempvcfact;
+-      tempbx = (USHORT)(tempeax & 0x0FFFF);
++     tempeax = (SiS_Pr->SiS_VGAVDE << 18) / tempvcfact;
++     tempbx = (USHORT)(tempeax & 0x0FFFF);
+   } else {
+-      tempax = SiS_Pr->SiS_VGAVDE << 6;
+-      tempbx = push1;
+-      tempbx &= 0x3f;
+-      if(tempbx == 0) tempbx = 64;
+-      tempax = tempax / tempbx;
+-      tempbx = tempax;
++     tempeax = SiS_Pr->SiS_VGAVDE << 6;
++     tempbx = push1 & 0x3f;
++     if(tempbx == 0) tempbx = 64;
++     tempeax /= tempbx;
++     tempbx = (USHORT)(tempeax & 0x0FFFF);
+   }
+   if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) tempbx--;
+-  if(SiS_Pr->SiS_SetFlag & EnableLVDSDDA)                 tempbx = 1;
++  if(SiS_Pr->SiS_SetFlag & EnableLVDSDDA) {
++     if((!SiS_Pr->SiS_IF_DEF_FSTN) && (!SiS_Pr->SiS_IF_DEF_DSTN)) tempbx = 1;
++     else if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel640x480)  tempbx = 1;
++  }
+ 
+   temp = ((tempbx & 0xFF00) >> 8) << 3;
+   temp |= (USHORT)((tempecx & 0x0700) >> 8);
+-  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x20,temp);  	/* Part1_20h; TW: Overflow register */
++  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x20,temp);  	/* Part1_20h; Overflow register */
+ 
+   temp = tempbx & 0x00FF;
+-  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x21,temp);  	/* Part1_21h; TW: Panel Link Vertical Accumulator Register */
++  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x21,temp);  	/* Part1_21h; Panel Link Vertical Accumulator Register */
+ 
+   tempecx >>= 16;                               /* BPLHCFACT  */
+-  if(HwDeviceExtension->jChipType < SIS_315H) {
+-      if(modeflag & HalfDCLK) tempecx >>= 1;
++  if((HwDeviceExtension->jChipType < SIS_315H) || (SiS_Pr->SiS_IF_DEF_FSTN) || (SiS_Pr->SiS_IF_DEF_DSTN)) {
++     if(modeflag & HalfDCLK) tempecx >>= 1;
+   }
+   temp = (USHORT)((tempecx & 0xFF00) >> 8);
+-  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x22,temp);     	/* Part1_22h; TW: Panel Link Horizontal Scaling Factor High */
++  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x22,temp);     	/* Part1_22h; Panel Link Horizontal Scaling Factor High */
+ 
+   temp = (USHORT)(tempecx & 0x00FF);
+-  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x23,temp);         /* Part1_22h; TW: Panel Link Horizontal Scaling Factor Low */
++  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x23,temp);         /* Part1_22h; Panel Link Horizontal Scaling Factor Low */
+ 
+   /* 630/301B and 630/LVDS do something for 640x480 panels here */
+ 
+ #ifdef SIS315H
+-  /* TW: DSTN/FSTN initialisation - hardcoded for 320x480 panel */
+-  if(SiS_Pr->SiS_IF_DEF_DSTN) {
+-     	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x1E,0x01);
+-     	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x25,0x00);
+-     	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x26,0x00);
+-     	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x27,0x00);
+-     	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x28,0x87);
+-     	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x29,0x5A);
+-     	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x2A,0x4B);
+-     	SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x44,~0x007,0x03);
+-     	tempbx = SiS_Pr->SiS_HDE + 64;                       	/*Blps = lcdhdee(lcdhdes+HDE) + 64*/
+-     	temp = tempbx & 0x00FF;
+-     	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x38,temp);
+-     	temp=((tempbx & 0xFF00) >> 8) << 3;
+-     	SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x35,~0x078,temp);
+-     	tempbx += 32;		                     		/*Blpe=lBlps+32*/
+-     	temp = tempbx & 0x00FF;
+-     	if(SiS_Pr->SiS_IF_DEF_FSTN)  temp=0;
+-     	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x39,temp);
+-     	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x3A,0x00);        	/*Bflml=0*/
+-     	SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x3C,~0x007,0x00);
+-     	tempbx = SiS_Pr->SiS_VDE / 2;
+-     	temp = tempbx & 0x00FF;
+-     	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x3B,temp);
+-     	temp = ((tempbx & 0xFF00) >> 8) << 3;
+-     	SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x3C,~0x038,temp);
+-     	tempeax = SiS_Pr->SiS_HDE << 2;                       	/* BDxFIFOSTOP = (HDE*4)/128 */
+-     	tempebx = 128;
+-     	temp = (USHORT)(tempeax % tempebx);
+-     	tempeax = tempeax / tempebx;
+-     	if(temp != 0)  tempeax++;
+-     	temp = (USHORT)(tempeax & 0x003F);
+-     	SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x45,~0x0FF,temp);
+-     	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x3F,0x00);         	/* BDxWadrst0 */
+-     	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x3E,0x00);
+-     	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x3D,0x10);
+-     	SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x3C,~0x040,0x00);
+-     	tempax = SiS_Pr->SiS_HDE >> 4;                        	/* BDxWadroff = HDE*4/8/8 */
+-     	pushcx = tempax;
+-     	temp = tempax & 0x00FF;
+-     	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x43,temp);
+-     	temp = ((tempax & 0xFF00) >> 8) << 3;
+-     	SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x44,~0x0F8,temp);
+-     	tempax = SiS_Pr->SiS_VDE;                             /*BDxWadrst1 = BDxWadrst0 + BDxWadroff * VDE */
+-     	tempeax = (tempax * pushcx);
+-     	tempebx = 0x00100000 + tempeax;
+-     	temp = (USHORT)tempebx & 0x000000FF;
+-     	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x42,temp);
+-     	temp = (USHORT)((tempebx & 0x0000FF00)>>8);
+-     	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x41,temp);
+-     	temp = (USHORT)((tempebx & 0x00FF0000)>>16);
+-     	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x40,temp);
+-     	temp = (USHORT)(((tempebx & 0x01000000)>>24) << 7);
+-     	SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x3C,~0x080,temp);
+-     	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x2F,0x03);
+-     	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x03,0x50);
+-     	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x04,0x00);
+-     	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x2F,0x01);
+-     	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x13,0x00);
+-     	SiS_SetReg1(SiS_Pr->SiS_P3c4,0x05,0x86);        /* Unlock */
+-     	SiS_SetReg1(SiS_Pr->SiS_P3c4,0x1e,0x62);
+-     	if(SiS_Pr->SiS_IF_DEF_FSTN){
+-         	SiS_SetReg1(SiS_Pr->SiS_P3c4,0x2b,0x1b);
+-         	SiS_SetReg1(SiS_Pr->SiS_P3c4,0x2c,0xe3);
+-         	SiS_SetReg1(SiS_Pr->SiS_P3c4,0x1e,0x62);
+-         	SiS_SetReg1(SiS_Pr->SiS_P3c4,0x2e,0x04);
+-         	SiS_SetReg1(SiS_Pr->SiS_P3c4,0x2f,0x42);
+-         	SiS_SetReg1(SiS_Pr->SiS_P3c4,0x32,0x01);
+-         	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x2b,0x02);
+-         	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x2c,0x00);
+-         	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x2d,0x00);
+-     	}
+-     	SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x19,0x0f,0x30);
+-     	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x1e,0x7d);
+-     	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x2e,0xe0);
++  if(SiS_Pr->SiS_IF_DEF_FSTN || SiS_Pr->SiS_IF_DEF_DSTN) {
++     SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x25,0x00);
++     SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x26,0x00);
++     SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x27,0x00);
++     SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x28,0x87);
++     SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x29,0x5A);
++     SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x2A,0x4B);
++     SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x44,~0x007,0x03);
++     tempax = SiS_Pr->SiS_HDE;                       		/* Blps = lcdhdee(lcdhdes+HDE) + 64 */
++     if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480_2 ||
++        SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480_3) tempax >>= 1;
++     tempax += 64;
++     temp = tempax & 0x00FF;
++     SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x38,temp);
++     temp = ((tempax & 0xFF00) >> 8) << 3;
++     SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x35,~0x078,temp);
++     tempax += 32;		                     		/* Blpe=lBlps+32 */
++     temp = tempax & 0x00FF;
++     if(SiS_Pr->SiS_IF_DEF_FSTN) temp = 0;
++     SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x39,temp);
++     SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x3A,0x00);        	/* Bflml=0 */
++     SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x3C,~0x007,0x00);
++
++     tempax = SiS_Pr->SiS_VDE;
++     if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480_2 ||
++        SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480_3) tempax >>= 1;
++     tempax >>= 1;
++     temp = tempax & 0x00FF;
++     SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x3B,temp);
++     temp = ((tempax & 0xFF00) >> 8) << 3;
++     SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x3C,~0x038,temp);
++
++     tempeax = SiS_Pr->SiS_HDE;
++     if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480_2 ||
++        SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480_3) tempeax >>= 1;
++     tempeax <<= 2;                       			/* BDxFIFOSTOP = (HDE*4)/128 */
++     tempebx = 128;
++     temp = (USHORT)(tempeax % tempebx);
++     tempeax = tempeax / tempebx;
++     if(temp) tempeax++;
++     temp = (USHORT)(tempeax & 0x003F);
++     SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x45,~0x0FF,temp);
++     SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x3F,0x00);         	/* BDxWadrst0 */
++     SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x3E,0x00);
++     SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x3D,0x10);
++     SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x3C,~0x040,0x00);
++
++     tempax = SiS_Pr->SiS_HDE;
++     if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480_2 ||
++        SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480_3) tempax >>= 1;
++     tempax >>= 4;                        			/* BDxWadroff = HDE*4/8/8 */
++     pushcx = tempax;
++     temp = tempax & 0x00FF;
++     SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x43,temp);
++     temp = ((tempax & 0xFF00) >> 8) << 3;
++     SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x44,~0x0F8,temp);
++
++     tempax = SiS_Pr->SiS_VDE;                             	/* BDxWadrst1 = BDxWadrst0 + BDxWadroff * VDE */
++     if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480_2 ||
++        SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480_3) tempax >>= 1;
++     tempeax = (tempax * pushcx);
++     tempebx = 0x00100000 + tempeax;
++     temp = (USHORT)tempebx & 0x000000FF;
++     SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x42,temp);
++     temp = (USHORT)((tempebx & 0x0000FF00) >> 8);
++     SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x41,temp);
++     temp = (USHORT)((tempebx & 0x00FF0000) >> 16);
++     SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x40,temp);
++     temp = (USHORT)(((tempebx & 0x01000000) >> 24) << 7);
++     SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x3C,~0x080,temp);
++
++     SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x2F,0x03);
++     SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x03,0x50);
++     SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x04,0x00);
++     SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x2F,0x01);
++     SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x19,0x38);
++
++     if(SiS_Pr->SiS_IF_DEF_FSTN) {
++        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x2b,0x02);
++        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x2c,0x00);
++        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x2d,0x00);
++        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x35,0x0c);
++        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x36,0x00);
++        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x37,0x00);
++        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x38,0x80);
++        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x39,0xA0);
++        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x3a,0x00);
++        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x3b,0xf0);
++        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x3c,0x00);
++        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x3d,0x10);
++        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x3e,0x00);
++        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x3f,0x00);
++        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x40,0x10);
++        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x41,0x25);
++        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x42,0x80);
++        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x43,0x14);
++        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x44,0x03);
++        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x45,0x0a);
++     }
+   }
+ #endif  /* SIS315H */
+ 
+-  return;
+-
+ }
+ 
+ #ifdef SIS315H
+@@ -1629,7 +1711,7 @@ SiS_CRT2AutoThreshold(SiS_Private *SiS_P
+ 
+ 
+ #ifdef SIS315H
+-/* TW: For LVDS / 302B/30xLV - LCDA (this must only be called on 310/325 series!) */
++/* For LVDS / 302B/30xLV - LCDA (this must only be called on 315 series!) */
+ void
+ SiS_SetGroup1_LCDA(SiS_Private *SiS_Pr, USHORT  BaseAddr,UCHAR *ROMAddr,USHORT ModeNo,USHORT ModeIdIndex,
+                    PSIS_HW_DEVICE_INFO HwDeviceExtension,USHORT RefreshRateTableIndex)
+@@ -1638,6 +1720,10 @@ SiS_SetGroup1_LCDA(SiS_Private *SiS_Pr, 
+   USHORT push1,push2,tempax,tempbx,tempcx,temp;
+   ULONG tempeax=0,tempebx,tempecx,tempvcfact;
+ 
++  /* This is not supported with LCDA */
++  if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_PanelCustom) return;
++  if(SiS_Pr->UseCustomMode) return;
++
+   if(IS_SIS330) {
+      SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x2D,0x10);			/* Xabre 1.01.03 */
+   } else if(IS_SIS740) {
+@@ -1645,7 +1731,7 @@ SiS_SetGroup1_LCDA(SiS_Private *SiS_Pr, 
+         SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x13,0xfb,0x04);      	/* 740/LVDS */
+ 	SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x2D,0x03);
+      } else {
+-        SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x2D,0x10);			/* 740/301LV 1.10.1i */
++        SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x2D,0x10);			/* 740/301LV, 301BDH */
+      }
+   } else {
+      if(SiS_Pr->SiS_IF_DEF_LVDS == 1) {					/* 650/LVDS */
+@@ -1669,10 +1755,7 @@ SiS_SetGroup1_LCDA(SiS_Private *SiS_Pr, 
+   tempcx = SiS_Pr->SiS_HT;
+ 
+   if(SiS_Pr->SiS_LCDInfo & DontExpandLCD) {
+-        if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768)       tempbx = 1024;
+-	else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050) tempbx = 1400;
+-	else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1600x1200) tempbx = 1600;
+-	else 							      tempbx = 1280;
++        tempbx = SiS_Pr->PanelXRes;
+   }
+   tempcx -= tempbx;                        	            	/* HT-HDE  */
+   push1 = tempax;
+@@ -1684,7 +1767,7 @@ SiS_SetGroup1_LCDA(SiS_Private *SiS_Pr, 
+ 
+   tempcx >>= 2;
+ 
+-  /* TW: 650/30xLV 1.10.6s, 740/LVDS */
++  /* 650/30xLV 1.10.6s, 740/LVDS */
+   if( ((SiS_Pr->SiS_IF_DEF_LVDS == 0) && (SiS_Pr->SiS_VBInfo & SetCRT2ToLCDA)) ||
+       ((SiS_Pr->SiS_IF_DEF_LVDS == 1) && (SiS_Pr->SiS_VBInfo & SetCRT2ToLCD)) ) {
+      if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel640x480) {
+@@ -1748,13 +1831,10 @@ SiS_SetGroup1_LCDA(SiS_Private *SiS_Pr, 
+   tempbx = SiS_Pr->SiS_LCDVDES;                                	/* VGAVDES  */
+   push1 = tempbx;                                      		
+   if(SiS_Pr->SiS_IF_DEF_TRUMPION == 0) {
+-    if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768)        tempax = 768;
+-    else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x768)   tempax = 768;
+-    else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024)  tempax = 1024;
+-    else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050)  tempax = 1050;
+-    else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1600x1200)  tempax = 1200;
+-    else                                                           tempax = 960;
+-  } else tempax = SiS_Pr->SiS_VGAVDE;  /* Trumpion */
++     tempax = SiS_Pr->PanelYRes;
++  } else {
++     tempax = SiS_Pr->SiS_VGAVDE;
++  }
+ 
+   tempbx += tempax;
+   tempax = SiS_Pr->SiS_VT;                                    	/* VT  */
+@@ -1764,7 +1844,7 @@ SiS_SetGroup1_LCDA(SiS_Private *SiS_Pr, 
+  
+   tempcx >>= 2;	
+ 
+-  /* TW: 650/30xLV 1.10.6s, 740/LVDS */
++  /* 650/30xLV 1.10.6s, 740/LVDS */
+   if( ((SiS_Pr->SiS_IF_DEF_LVDS == 0) && (SiS_Pr->SiS_VBInfo & SetCRT2ToLCDA)) ||
+       ((SiS_Pr->SiS_IF_DEF_LVDS == 1) && (SiS_Pr->SiS_VBInfo & SetCRT2ToLCD)) ) {
+      if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel640x480) {
+@@ -1806,7 +1886,7 @@ SiS_SetGroup1_LCDA(SiS_Private *SiS_Pr, 
+   if(SiS_Pr->SiS_IF_DEF_LVDS == 1) {
+      SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x19,0xF0,temp);
+   } else {
+-     /* TW: 650/30xLV 1.10.6s, Xabre */
++     /* 650/30xLV 1.10.6s, Xabre */
+      temp |= 0xC0;
+      SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x19,0xF0,temp);             /* Part1_19h  */
+   }
+@@ -1823,7 +1903,7 @@ SiS_SetGroup1_LCDA(SiS_Private *SiS_Pr, 
+      }
+   } else {
+      if(IS_SIS650) {
+-        /* TW: 650/30xLV 1.10.6s */
++        /* 650/30xLV 1.10.6s */
+         if(SiS_Pr->SiS_LCDInfo & LCDRGB18Bit) {
+            if(SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x00) & 0x01) temp |= 0x80;
+         }
+@@ -1839,7 +1919,7 @@ SiS_SetGroup1_LCDA(SiS_Private *SiS_Pr, 
+ 
+   if(!(SiS_Pr->SiS_VBInfo & SetInSlaveMode)) {
+     if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel800x600) {
+-      if(resinfo == 7) tempcx++;
++      if(resinfo == SIS_RI_800x600) tempcx++;
+     }
+   }
+   if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480) {
+@@ -1925,18 +2005,17 @@ SiS_SetGroup1_LCDA(SiS_Private *SiS_Pr, 
+   SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x23,temp);
+ 
+ #if 0
+-  /* TW: Missing code (calles int 2f) (650/302LV 1.10.6s; 1.10.7w doesn't do this) */
++  /* Missing code (calles int 2f) (650/302LV 1.10.6s; 1.10.7w doesn't do this) */
+   if(xxx()) {
+       SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x0e,0xda);
+   }
+ #endif
+ 
+-  /* TW: Only for LVDS and 301LV/302LV */
++  /* Only for LVDS and 301LV/302LV */
+   if((SiS_Pr->SiS_IF_DEF_LVDS == 1) || (SiS_Pr->SiS_VBInfo & VB_SIS301LV302LV)){
+-  	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x1e,0x20);
++     SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x1e,0x20);
+   }
+ 
+-  return;
+ }
+ #endif  /* SIS 315 */
+ 
+@@ -1951,10 +2030,10 @@ void SiS_SetCRT2Offset(SiS_Private *SiS_
+ 
+   offset = SiS_GetOffset(SiS_Pr,ROMAddr,ModeNo,ModeIdIndex,RefreshRateTableIndex,
+                          HwDeviceExtension);
+-#if 0
+-  if(SiS_Pr->LCDResInfo == 13) offset >>= 1;
+-  if(SiS_Pr->LCDResInfo == 12) offset >>= 1;
+-#endif			 
++
++  if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480_2 ||
++     SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480_3) offset >>= 1;
++
+   temp = (UCHAR)(offset & 0xFF);
+   SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x07,temp);
+   temp = (UCHAR)((offset & 0xFF00) >> 8);
+@@ -1976,13 +2055,7 @@ SiS_GetOffset(SiS_Private *SiS_Pr, UCHAR
+   } else {
+      infoflag = SiS_Pr->SiS_RefIndex[RefreshRateTableIndex].Ext_InfoFlag;
+      modeinfo = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_ModeInfo;
+-  
+-     if(HwDeviceExtension->jChipType < SIS_315H ) {
+-    	index = (modeinfo >> 4) & 0xFF;
+-     } else {
+-    	index = (modeinfo >> 8) & 0xFF;
+-     }
+-
++     index = (modeinfo >> 8) & 0xFF;
+      temp = SiS_Pr->SiS_ScreenOffset[index];
+   }
+   
+@@ -1992,9 +2065,8 @@ SiS_GetOffset(SiS_Private *SiS_Pr, UCHAR
+ 
+   temp *= colordepth;
+ 
+-  /* TW: For 1400x1050 and 856x480 */
+-  if( ( ((ModeNo >= 0x26) && (ModeNo <= 0x28)) || 
+-        ModeNo == 0x3f || 
++  if( ( ((ModeNo >= 0x26) && (ModeNo <= 0x28)) ||
++        ModeNo == 0x3f ||
+ 	ModeNo == 0x42 || 
+ 	ModeNo == 0x45 ) ||
+       (SiS_Pr->UseCustomMode && (SiS_Pr->CHDisplay % 16)) ) {
+@@ -2012,7 +2084,8 @@ SiS_GetColorDepth(SiS_Private *SiS_Pr, U
+   SHORT  index;
+   USHORT modeflag;
+ 
+-  if(SiS_Pr->UseCustomMode) {
++  /* Do NOT check UseCustomMode, will skrew up FIFO */
++  if(ModeNo == 0xfe) {
+      modeflag = SiS_Pr->CModeFlag;
+   } else {
+      if(ModeNo <= 0x13)
+@@ -2035,7 +2108,11 @@ SiS_SetCRT2Sync(SiS_Private *SiS_Pr, USH
+   flag = 0;
+   tempbl = 0xC0;
+ 
+-  infoflag = SiS_Pr->SiS_RefIndex[RefreshRateTableIndex].Ext_InfoFlag;
++  if(SiS_Pr->UseCustomMode) {
++     infoflag = SiS_Pr->CInfoFlag;
++  } else {
++     infoflag = SiS_Pr->SiS_RefIndex[RefreshRateTableIndex].Ext_InfoFlag;
++  }
+ 
+   if(SiS_Pr->SiS_IF_DEF_LVDS == 1) {					/* LVDS */
+ 
+@@ -2044,12 +2121,19 @@ SiS_SetCRT2Sync(SiS_Private *SiS_Pr, USH
+     } else if((SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) && (SiS_Pr->SiS_LCDInfo & LCDSync)) {
+        tempah = SiS_Pr->SiS_LCDInfo;
+     } else tempah = infoflag >> 8;
+-    
++
+     tempah &= 0xC0;
+-    
++
+     tempah |= 0x20;
+     if(!(SiS_Pr->SiS_LCDInfo & LCDRGB18Bit)) tempah |= 0x10;
+ 
++    if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
++       if((SiS_Pr->SiS_CustomT == CUT_BARCO1366) ||
++          (SiS_Pr->SiS_CustomT == CUT_BARCO1024)) {
++	  tempah |= 0xc0;
++       }
++    }
++
+     if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
+        if(HwDeviceExtension->jChipType >= SIS_315H) {
+           tempah >>= 3;
+@@ -2079,9 +2163,11 @@ SiS_SetCRT2Sync(SiS_Private *SiS_Pr, USH
+             tempah |= 0x20;
+             if(!(SiS_Pr->SiS_LCDInfo & LCDRGB18Bit)) tempah |= 0x10;
+ 
++#if 0
+             if (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480) {
+-	       	/* TW: BIOS does something here @@@ */
++	       	/* BIOS does something here @@@ */
+             }
++#endif
+ 
+  	    tempah &= 0x3f;
+   	    tempah |= tempbl;
+@@ -2089,16 +2175,11 @@ SiS_SetCRT2Sync(SiS_Private *SiS_Pr, USH
+ 
+          } else {							/* 630 - 301 */
+ 
+-            if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
+-               tempah = SiS_Pr->SiS_LCDInfo;
+-	       if(SiS_Pr->SiS_LCDInfo & DontExpandLCDShift) { /* ! */
+-	          flag = 1;
+-	       }
+-            }
+-            if(flag != 1) tempah = infoflag >> 8;
++            tempah = infoflag >> 8;
+             tempah &= 0xC0;
+-            tempah |= 0x30;
+-            SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x19,0x3F,tempah);
++            tempah |= 0x20;
++	    if(!(SiS_Pr->SiS_LCDInfo & LCDRGB18Bit)) tempah |= 0x10;
++            SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x19,0x0F,tempah);
+ 
+          }
+ 
+@@ -2106,34 +2187,50 @@ SiS_SetCRT2Sync(SiS_Private *SiS_Pr, USH
+ 
+       } else {
+ 
+-#ifdef SIS315H  /* ----- 310/325 series ---- */
++#ifdef SIS315H  /* ------- 315 series ------ */
+ 
+-         if(SiS_Pr->SiS_VBType & VB_SIS301LV302LV) {	  		/* 310/325 - 30xLV */
++         if(SiS_Pr->SiS_VBType & VB_SIS301LV302LV) {	  		/* 315 - 30xLV */
++
++	    if(SiS_Pr->SiS_CustomT == CUT_COMPAQ1280) {
++	       tempah = infoflag >> 8;
++	       if(SiS_Pr->SiS_LCDInfo & LCDSync) {
++	          tempah = SiS_Pr->SiS_LCDInfo;
++	       }
++	    } else {
++               tempah = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x37);
++	    }
++	    tempah &= 0xC0;
+ 
+-            tempah = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x37);
+-            tempah &= 0xC0;
+             tempah |= 0x20;
+             if(!(SiS_Pr->SiS_LCDInfo & LCDRGB18Bit)) tempah |= 0x10;
+             SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x19,0x0F,tempah);
+ 
+-         } else {							/* 310/325 - 301, 301B */
++         } else {							/* 315 - 301, 301B */
+ 
+             tempah = infoflag >> 8;
+-            tempah &= 0xC0;
+-	    if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
+-	       if(SiS_Pr->SiS_LCDInfo & LCDSync) {
+-	          tempah = SiS_Pr->SiS_LCDInfo;
+-	          tempah &= 0xC0;
++	    if(!SiS_Pr->UseCustomMode) {
++	       if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
++	          if(SiS_Pr->SiS_LCDInfo & LCDSync) {
++	             tempah = SiS_Pr->SiS_LCDInfo;
++	          }
+ 	       }
+ 	    }
++	    tempah &= 0xC0;
+ 	    
+             tempah |= 0x20;
+             if(!(SiS_Pr->SiS_LCDInfo & LCDRGB18Bit)) tempah |= 0x10;
++
+ #if 0
+             if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480) {
+-		/* TW: BIOS does something here @@@ */
++		/* BIOS does something here @@@ */
+             }
+-#endif	    
++#endif
++
++	    if(SiS_Pr->SiS_VBType & VB_NoLCD) {			/* TEST, imitate BIOS bug */
++	       if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
++	          tempah |= 0xc0;
++	       }
++	    }
+             SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x19,0x0F,tempah);
+ 
+          } 
+@@ -2143,7 +2240,7 @@ SiS_SetCRT2Sync(SiS_Private *SiS_Pr, USH
+    }
+ }
+ 
+-/* TW: Set CRT2 FIFO on 300/630/730 */
++/* Set CRT2 FIFO on 300/630/730 */
+ #ifdef SIS300
+ void
+ SiS_SetCRT2FIFO_300(SiS_Private *SiS_Pr, UCHAR *ROMAddr,USHORT ModeNo,
+@@ -2197,7 +2294,7 @@ SiS_SetCRT2FIFO_300(SiS_Private *SiS_Pr,
+ 
+   if(!SiS_Pr->CRT1UsesCustomMode) {
+   
+-     CRT1ModeNo = SiS_Pr->SiS_CRT1Mode;                                 /* get CRT1 ModeNo */
++     CRT1ModeNo = SiS_Pr->SiS_CRT1Mode;                                 	/* get CRT1 ModeNo */
+      SiS_SearchModeID(SiS_Pr,ROMAddr,&CRT1ModeNo,&modeidindex);
+      SiS_Pr->SiS_SetFlag &= (~ProgrammingCRT2);
+      SiS_Pr->SiS_SelectCRT2Rate = 0;
+@@ -2205,20 +2302,32 @@ SiS_SetCRT2FIFO_300(SiS_Private *SiS_Pr,
+ 						modeidindex,HwDeviceExtension);
+ 
+      if(CRT1ModeNo >= 0x13) {
+-       index = SiS_Pr->SiS_RefIndex[refreshratetableindex].Ext_CRTVCLK;
+-       index &= 0x3F;
+-       VCLK = SiS_Pr->SiS_VCLKData[index].CLOCK;			/* Get VCLK */
+-       data2 = SiS_Pr->SiS_ModeType - 2;
++        index = SiS_Pr->SiS_RefIndex[refreshratetableindex].Ext_CRTVCLK;
++        index &= 0x3F;
++        VCLK = SiS_Pr->SiS_VCLKData[index].CLOCK;				/* Get VCLK */
++
++	colorth = SiS_GetColorDepth(SiS_Pr,ROMAddr,CRT1ModeNo,modeidindex); 	/* Get colordepth */
++        colorth >>= 1;
++        if(!colorth) colorth++;
+      }
+-     
++
+   } else {
+   
+      CRT1ModeNo = 0xfe;
+-     VCLK = SiS_Pr->CSRClock;						/* Get VCLK */
+-     data2 = (SiS_Pr->CModeFlag & ModeInfoFlag) - 2;
+-  
+-  }			
+-     
++     VCLK = SiS_Pr->CSRClock_CRT1;						/* Get VCLK */
++     data2 = (SiS_Pr->CModeFlag_CRT1 & ModeInfoFlag) - 2;
++     switch(data2) {								/* Get color depth */
++        case 0 : colorth = 1; break;
++        case 1 : colorth = 1; break;
++        case 2 : colorth = 2; break;
++        case 3 : colorth = 2; break;
++        case 4 : colorth = 3; break;
++        case 5 : colorth = 4; break;
++        default: colorth = 2;
++     }
++
++  }
++
+   if(CRT1ModeNo >= 0x13) {
+     if(HwDeviceExtension->jChipType == SIS_300) {
+        index = SiS_GetReg1(SiS_Pr->SiS_P3c4,0x3A);
+@@ -2227,22 +2336,8 @@ SiS_SetCRT2FIFO_300(SiS_Private *SiS_Pr,
+     }
+     index &= 0x07;
+     MCLK = SiS_Pr->SiS_MCLKData_0[index].CLOCK;				/* Get MCLK */
+-    
+-#ifdef TWDEBUG
+-    xf86DrvMsg(0, X_INFO, "FIFO2: CRT1Mode 0x%x VCLK %d MCLK %d modetype-2 = %d\n",
+-    	CRT1ModeNo, VCLK, MCLK, data2);
+-#endif  
+-  
+-    switch(data2) {							/* Get color depth */
+-      case 0 : 	colorth = 1; break;
+-      case 1 : 	colorth = 1; break;
+-      case 2 : 	colorth = 2; break;
+-      case 3 : 	colorth = 2; break;
+-      case 4 : 	colorth = 3; break;
+-      case 5 : 	colorth = 4; break;
+-      default:  colorth = 2; break;
+-    }
+-    data2 = (colorth * VCLK) / MCLK;  
++
++    data2 = (colorth * VCLK) / MCLK;
+ 
+     temp = SiS_GetReg1(SiS_Pr->SiS_P3c4,0x14);
+     temp = ((temp & 0x00FF) >> 6) << 1;
+@@ -2252,22 +2347,12 @@ SiS_SetCRT2FIFO_300(SiS_Private *SiS_Pr,
+ 
+     data2 = temp - data2;
+     
+-#ifdef TWDEBUG
+-    xf86DrvMsg(0, X_INFO, "FIFO2: data2 (step1) = %d\n",
+-    	data2);
+-#endif    
+-
+     if((28 * 16) % data2) {
+       	data2 = (28 * 16) / data2;
+       	data2++;
+     } else {
+       	data2 = (28 * 16) / data2;
+     }
+-    
+-#ifdef TWDEBUG
+-    xf86DrvMsg(0, X_INFO, "FIFO2: data2 (step2) = %d\n",
+-    	data2);
+-#endif
+ 
+     if(HwDeviceExtension->jChipType == SIS_300) {
+ 
+@@ -2313,10 +2398,6 @@ SiS_SetCRT2FIFO_300(SiS_Private *SiS_Pr,
+        temp &= 0x0F;   
+        tempal |= temp;
+ 
+-#ifdef TWDEBUG
+-       xf86DrvMsg(0, X_INFO, "FIFO2: Latencyfactorindex = 0x%x\n", tempal);
+-#endif
+-      
+        tempbx = tempal;   /* BIOS BUG (2.04.5d, 2.04.6a use ah here, which is unset!) */
+        tempbx = 0;        /* -- do it like the BIOS anyway... */
+        tempax = tempbx;
+@@ -2341,7 +2422,7 @@ SiS_SetCRT2FIFO_300(SiS_Private *SiS_Pr,
+        SiS_SetReg4(0xcf8,0x800000A0);
+        eax = SiS_GetReg3(0xcfc);
+ #else
+-       /* TW: We use pci functions X offers. We use tag 0, because
++       /* We use pci functions X offers. We use tag 0, because
+         * we want to read/write to the host bridge (which is always
+         * 00:00.0 on 630, 730 and 540), not the VGA device.
+         */
+@@ -2368,43 +2449,41 @@ SiS_SetCRT2FIFO_300(SiS_Private *SiS_Pr,
+        if(!(temp & 0x80)) data += 5;
+     }
+     
+-#ifdef TWDEBUG    
+-    xf86DrvMsg(0, X_INFO, "FIFO2: latencyfactor (CRT1) = %d\n", data);
+-#endif
+-
+     data += data2;				/* CRT1 Request Period */
+     
+-#ifdef TWDEBUG    
+-    xf86DrvMsg(0, X_INFO, "FIFO2: CRT1 request period = %d\n", data);
+-#endif
+-
+-    CRT2ModeNo = ModeNo;
+     SiS_Pr->SiS_SetFlag |= ProgrammingCRT2;
+     SiS_Pr->SiS_SelectCRT2Rate = SelectRate_backup;
+-    SiS_SearchModeID(SiS_Pr,ROMAddr,&CRT2ModeNo,&modeidindex);    
+ 
+-    refreshratetableindex = SiS_GetRatePtrCRT2(SiS_Pr,ROMAddr,CRT2ModeNo,
+-                                               modeidindex,HwDeviceExtension);
++    if(!SiS_Pr->UseCustomMode) {
++
++       CRT2ModeNo = ModeNo;
++       SiS_SearchModeID(SiS_Pr,ROMAddr,&CRT2ModeNo,&modeidindex);
++
++       refreshratetableindex = SiS_GetRatePtrCRT2(SiS_Pr,ROMAddr,CRT2ModeNo,
++                                                  modeidindex,HwDeviceExtension);
++
++       index = SiS_GetVCLK2Ptr(SiS_Pr,ROMAddr,CRT2ModeNo,modeidindex,
++                               refreshratetableindex,HwDeviceExtension);
++       VCLK = SiS_Pr->SiS_VCLKData[index].CLOCK;                         	/* Get VCLK  */
++
++       if((SiS_Pr->SiS_CustomT == CUT_BARCO1366) || (SiS_Pr->SiS_CustomT == CUT_BARCO1024)) {
++          if((ROMAddr) && SiS_Pr->SiS_UseROM) {
++	     if(ROMAddr[0x220] & 0x01) {
++                VCLK = ROMAddr[0x229] | (ROMAddr[0x22a] << 8);
++	     }
++          }
++       }
++
++    } else {
++
++       CRT2ModeNo = 0xfe;
++       VCLK = SiS_Pr->CSRClock;							/* Get VCLK */
+ 
+-    index = SiS_GetVCLK2Ptr(SiS_Pr,ROMAddr,CRT2ModeNo,modeidindex,
+-                            refreshratetableindex,HwDeviceExtension);
+-    VCLK = SiS_Pr->SiS_VCLKData[index].CLOCK;                         	/* Get VCLK  */
+-    
+-    data2 = SiS_Pr->SiS_ModeType - 2;
+-    switch(data2) {							/* Get color depth */
+-      case 0 : 	colorth = 1; break;
+-      case 1 : 	colorth = 1; break;
+-      case 2 : 	colorth = 2; break;
+-      case 3 : 	colorth = 2; break;
+-      case 4 : 	colorth = 3; break;
+-      case 5 : 	colorth = 4; break;
+-      default:  colorth = 2; break;
+     }
+-    
+-#ifdef TWDEBUG    
+-    xf86DrvMsg(0, X_INFO, "FIFO2: CRT2Mode 0x%x VCLK %d MCLK %d modetype-2 = %d, colorth %d\n",
+-    	CRT2ModeNo, VCLK, MCLK, data2, colorth);
+-#endif
++
++    colorth = SiS_GetColorDepth(SiS_Pr,ROMAddr,CRT2ModeNo,modeidindex);   	/* Get colordepth */
++    colorth >>= 1;
++    if(!colorth) colorth++;
+ 
+     data = data * VCLK * colorth;
+     if(data % (MCLK << 4)) {
+@@ -2414,10 +2493,6 @@ SiS_SetCRT2FIFO_300(SiS_Private *SiS_Pr,
+       	data = data / (MCLK << 4);
+     }
+     
+-#ifdef TWDEBUG    
+-    xf86DrvMsg(0, X_INFO, "FIFO2: data (unclipped) = 0x%x\n", data);
+-#endif    
+-    
+     if(data <= 6) data = 6;
+     if(data > 0x14) data = 0x14;
+ 
+@@ -2456,13 +2531,13 @@ SiS_SetCRT2FIFO_300(SiS_Private *SiS_Pr,
+ }
+ #endif
+ 
+-/* TW: Set FIFO on 310/325/330 series */
++/* Set FIFO on 315/330 series */
+ #ifdef SIS315H
+ void
+ SiS_SetCRT2FIFO_310(SiS_Private *SiS_Pr, UCHAR *ROMAddr,USHORT ModeNo,
+                     PSIS_HW_DEVICE_INFO HwDeviceExtension)
+ {
+-
++#if 0   /* This code is obsolete */
+   UCHAR CombCode[]  = { 1, 1, 1, 4, 3, 1, 3, 4,
+                         4, 1, 4, 4, 5, 1, 5, 4};
+   UCHAR CRT2ThLow[] = { 39, 63, 55, 79, 78,102, 90,114,
+@@ -2474,11 +2549,13 @@ SiS_SetCRT2FIFO_310(SiS_Private *SiS_Pr,
+   USHORT ModeIdIndex;
+   USHORT RefreshRateTableIndex;
+   USHORT SelectRate_backup;
+-  
++
+   SelectRate_backup = SiS_Pr->SiS_SelectCRT2Rate;
+-  
++#endif
++
+   SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x01,0x3B);
+ 
++#if 0
+   if(!SiS_Pr->CRT1UsesCustomMode) {
+   
+      CRT1ModeNo = SiS_Pr->SiS_CRT1Mode;                                 /* get CRT1 ModeNo */
+@@ -2489,28 +2566,27 @@ SiS_SetCRT2FIFO_310(SiS_Private *SiS_Pr,
+ 
+      /* Get REFIndex for crt1 refreshrate */
+      RefreshRateTableIndex = SiS_GetRatePtrCRT2(SiS_Pr,ROMAddr,CRT1ModeNo,
+-                                             ModeIdIndex,HwDeviceExtension);
++                                                ModeIdIndex,HwDeviceExtension);
++     index = SiS_Pr->SiS_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;
++     tempax = SiS_Pr->SiS_VCLKData[index].CLOCK;			/* Get VCLK */
+ 
+-     index = SiS_GetVCLK2Ptr(SiS_Pr,ROMAddr,CRT1ModeNo,ModeIdIndex,
+-                          RefreshRateTableIndex,HwDeviceExtension);
+-     tempax = SiS_Pr->SiS_VCLKData[index].CLOCK;                        /* Get VCLK */
+-     
+      tempbx = SiS_GetColorDepth(SiS_Pr,ROMAddr,CRT1ModeNo,ModeIdIndex); /* Get colordepth */
+      tempbx >>= 1;
+-     if(!tempbx) tempbx++; 
+-     
++     if(!tempbx) tempbx++;
++
+   } else {
+-  
+-     tempax = SiS_Pr->CSRClock;						/* Get VCLK */
+-     tempbx = (SiS_Pr->CModeFlag & ModeInfoFlag) - 2;
++
++     CRT1ModeNo = 0xfe;
++     tempax = SiS_Pr->CSRClock_CRT1;					/* Get VCLK */
++     tempbx = (SiS_Pr->CModeFlag_CRT1 & ModeInfoFlag) - 2;
+      switch(tempbx) {							/* Get color depth */
+-       case 0 : 	tempbx = 1; break;
+-       case 1 : 	tempbx = 1; break;
+-       case 2 : 	tempbx = 2; break;
+-       case 3 : 	tempbx = 2; break;
+-       case 4 : 	tempbx = 3; break;
+-       case 5 : 	tempbx = 4; break;
+-       default:  	tempbx = 2; break;
++       case 0 : tempbx = 1; break;
++       case 1 : tempbx = 1; break;
++       case 2 : tempbx = 2; break;
++       case 3 : tempbx = 2; break;
++       case 4 : tempbx = 3; break;
++       case 5 : tempbx = 4; break;
++       default: tempbx = 2;
+      }
+   
+   }
+@@ -2523,13 +2599,6 @@ SiS_SetCRT2FIFO_310(SiS_Private *SiS_Pr,
+ 
+   tempbx = tempax;
+ 
+-#if 0 /* TW: BIOS code is skrewed */
+-  if(SiS_GetReg1(SiS_Pr->SiS_P3c4,0x14) & 0x02) {
+-   	tempax = 16;
+-  } else {
+-    	tempax = 8;
+-  }
+-#endif
+   tempax = 16;
+ 
+   tempax -= tempbx;
+@@ -2556,24 +2625,33 @@ SiS_SetCRT2FIFO_310(SiS_Private *SiS_Pr,
+ 
+   tempcx +=  temp3;                                      /* CRT1 Request Period */
+ 
+-  CRT2ModeNo = ModeNo;                                                 /* get CRT2 ModeNo */
+-  SiS_SearchModeID(SiS_Pr,ROMAddr,&CRT2ModeNo,&ModeIdIndex);           /* Get ModeID Table */
+-
+   SiS_Pr->SiS_SetFlag |= ProgrammingCRT2;
+   SiS_Pr->SiS_SelectCRT2Rate = SelectRate_backup;
+ 
+-  RefreshRateTableIndex = SiS_GetRatePtrCRT2(SiS_Pr,ROMAddr,CRT2ModeNo,
+-                                           ModeIdIndex,HwDeviceExtension);
++  if(!SiS_Pr->UseCustomMode) {
++
++     CRT2ModeNo = ModeNo;                                                 /* get CRT2 ModeNo */
++     SiS_SearchModeID(SiS_Pr,ROMAddr,&CRT2ModeNo,&ModeIdIndex);
++
++     RefreshRateTableIndex = SiS_GetRatePtrCRT2(SiS_Pr,ROMAddr,CRT2ModeNo,
++                                                ModeIdIndex,HwDeviceExtension);
++
++     index = SiS_GetVCLK2Ptr(SiS_Pr,ROMAddr,CRT2ModeNo,ModeIdIndex,
++                             RefreshRateTableIndex,HwDeviceExtension);
++     if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCDA) {
++        tempax = SiS_Pr->SiS_VCLKData[index].CLOCK;                       /* Get VCLK  */
++     } else {
++        tempax = SiS_Pr->SiS_VBVCLKData[index].CLOCK;
++     }
+ 
+-  index = SiS_GetVCLK2Ptr(SiS_Pr,ROMAddr,CRT2ModeNo,ModeIdIndex,
+-                          RefreshRateTableIndex,HwDeviceExtension);
+-  if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCDA) {
+-     tempax = SiS_Pr->SiS_VCLKData[index].CLOCK;                       /* Get VCLK  */
+   } else {
+-     tempax = SiS_Pr->SiS_VBVCLKData[index].CLOCK;                     /* Get VCLK  */
++
++     CRT2ModeNo = 0xfe;							  /* Get VCLK  */
++     tempax = SiS_Pr->CSRClock;
++
+   }
+ 
+-  tempbx = SiS_GetColorDepth(SiS_Pr,ROMAddr,CRT2ModeNo,ModeIdIndex);   /* Get colordepth */
++  tempbx = SiS_GetColorDepth(SiS_Pr,ROMAddr,CRT2ModeNo,ModeIdIndex);   	  /* Get colordepth */
+   tempbx >>= 1;
+   if(!tempbx) tempbx++;
+ 
+@@ -2590,12 +2668,16 @@ SiS_SetCRT2FIFO_310(SiS_Private *SiS_Pr,
+ 
+   if (tempax > 0x37)  tempax = 0x37;
+ 
+-  /* TW: 650/LVDS (1.10.07, 1.10.00), 650/301LV, 740, 330 overrule calculated value; 315 does not */
++  /* 650/LVDS, 650/301LV, 740, 330 overrule calculated value; 315 does not */
+   if(HwDeviceExtension->jChipType >= SIS_650) {
+   	tempax = 0x04;
+   }
+-  
+   SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x02,~0x3F,tempax);
++#else
++
++  SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x02,~0x3F,0x04);
++
++#endif
+ }
+ 
+ USHORT
+@@ -2611,9 +2693,10 @@ SiS_GetMCLK(SiS_Private *SiS_Pr, UCHAR *
+     return(SiS_Pr->SiS_MCLKData_0[index].CLOCK);
+   }
+ }
++
+ #endif
+ 
+-/* TW: Checked against 650/LVDS 1.10.07 BIOS */
++/* Checked against 650/LVDS 1.10.07 BIOS */
+ void
+ SiS_GetLVDSDesData(SiS_Private *SiS_Pr, UCHAR *ROMAddr,USHORT ModeNo,USHORT ModeIdIndex,
+                    USHORT RefreshRateTableIndex,
+@@ -2623,7 +2706,15 @@ SiS_GetLVDSDesData(SiS_Private *SiS_Pr, 
+   USHORT PanelIndex,ResIndex;
+   const  SiS_LVDSDesStruct *PanelDesPtr = NULL;
+ 
+-  if((SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) && (SiS_Pr->SiS_VBInfo & SetCRT2ToLCDA) ) {
++  if((SiS_Pr->UseCustomMode) ||
++     (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_PanelCustom) ||
++     (SiS_Pr->SiS_CustomT == CUT_PANEL848)) {
++     SiS_Pr->SiS_LCDHDES = 0;
++     SiS_Pr->SiS_LCDVDES = 0;
++     return;
++  }
++
++  if((SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) && (SiS_Pr->SiS_VBInfo & SetCRT2ToLCDA)) {
+ 
+ #ifdef SIS315H  
+      SiS_GetLVDSDesPtrA(SiS_Pr,ROMAddr,ModeNo,ModeIdIndex,RefreshRateTableIndex,
+@@ -2689,11 +2780,11 @@ SiS_GetLVDSDesData(SiS_Private *SiS_Pr, 
+      	case 52: PanelDesPtr = SiS_Pr->SiS_CHTVUPALDesData;    break;
+      	case 53: PanelDesPtr = SiS_Pr->SiS_CHTVOPALDesData;    break;
+ 	default:
+-		if(HwDeviceExtension->jChipType < SIS_315H)
+-		   PanelDesPtr = SiS_Pr->SiS_PanelType0e_1;
+-		else
+-		   PanelDesPtr = SiS_Pr->SiS_PanelType01_1;
+-		break;
++		 if(HwDeviceExtension->jChipType < SIS_315H)
++		    PanelDesPtr = SiS_Pr->SiS_PanelType0e_1;
++		 else
++		    PanelDesPtr = SiS_Pr->SiS_PanelType01_1;
++		 break;
+      }
+   }
+   SiS_Pr->SiS_LCDHDES = (PanelDesPtr+ResIndex)->LCDHDES;
+@@ -2710,7 +2801,7 @@ SiS_GetLVDSDesData(SiS_Private *SiS_Pr, 
+      } else {
+         if(!(SiS_Pr->SiS_SetFlag & SetDOSMode)) {
+            if( (HwDeviceExtension->jChipType < SIS_315H) || 
+-	       (SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel1280x1024) ) {  
++	       (SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel1280x1024) ) {
+               if(SiS_Pr->SiS_LCDResInfo >= SiS_Pr->SiS_Panel1024x768){
+                  if(ModeNo <= 0x13) {
+ 	            modeflag = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ModeFlag;
+@@ -2737,7 +2828,7 @@ SiS_GetLVDSDesData(SiS_Private *SiS_Pr, 
+         }
+      }
+   }
+-  return;
++
+ }
+ 
+ void
+@@ -2757,11 +2848,11 @@ SiS_GetLVDSDesPtr(SiS_Private *SiS_Pr, U
+ 
+   tempbx = 0;
+   if(SiS_Pr->SiS_IF_DEF_CH70xx != 0) {
+-     if(!(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD)) {
++     if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
+         tempbx = 50;
+         if((SiS_Pr->SiS_VBInfo & SetPALTV) && (!SiS_Pr->SiS_CHPALM)) tempbx += 2;
+         if(SiS_Pr->SiS_VBInfo & SetCHTVOverScan) tempbx += 1;
+-        /* TW: Nothing special needed for SOverscan    */
++        /* Nothing special needed for SOverscan    */
+         /*     PALM uses NTSC data, PALN uses PAL data */
+      }
+   }
+@@ -2773,7 +2864,7 @@ SiS_GetLVDSDesPtr(SiS_Private *SiS_Pr, U
+         if(modeflag & HalfDCLK) tempbx++;
+      }
+   }
+-  /* TW: 630/LVDS and 650/LVDS (1.10.07) BIOS */
++  /* 630/LVDS and 650/LVDS (1.10.07) BIOS */
+   if(SiS_Pr->SiS_SetFlag & SetDOSMode) {
+      if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel640x480)  {
+         tempal = 0x07;
+@@ -2833,14 +2924,13 @@ SiS_SetCRT2ModeRegs(SiS_Private *SiS_Pr,
+      }
+   }
+   
+-  /* TW: BIOS does not do this (neither 301 nor LVDS) */
++  /* BIOS does not do this (neither 301 nor LVDS) */
+   /*     (But it's harmless; see SetCRT2Offset) */
+   SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x03,0x00);   /* fix write part1 index 0  BTDRAM bit Bug */
+ 
+-  /* TW: Removed 301B302B301LV302LV check here to match 650/LVDS BIOS */
+   if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCDA) {
+ 
+-	/* TW:   1. for LVDS/302B/302LV **LCDA** */
++	/*   1. for LVDS/302B/302LV **LCDA** */
+ 
+       SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x00,0xAF,0x40); /* FUNCTION CONTROL */
+       SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x2E,0xF7);
+@@ -2855,23 +2945,23 @@ SiS_SetCRT2ModeRegs(SiS_Private *SiS_Pr,
+ 
+ #ifdef SIS300    /* ---- 300 series ---- */
+ 
+-      /* For 301BDH: */
++      /* For 301BDH: (with LCD via LVDS) */
+       if(SiS_Pr->SiS_VBType & VB_NoLCD) {
+-	  temp = SiS_GetReg1(SiS_Pr->SiS_P3c4,0x32);
+-	  temp &= 0xef;
+-	  temp |= 0x02;
+-	  if((SiS_Pr->SiS_VBInfo & SetCRT2ToTV) || (SiS_Pr->SiS_VBInfo & SetCRT2ToRAMDAC)) {
+-	     temp |= 0x10;
+-	     temp &= 0xfd;
+-	  }
+-	  SiS_SetReg1(SiS_Pr->SiS_P3c4,0x32,temp);
++	 temp = SiS_GetReg1(SiS_Pr->SiS_P3c4,0x32);
++	 temp &= 0xef;
++	 temp |= 0x02;
++	 if((SiS_Pr->SiS_VBInfo & SetCRT2ToTV) || (SiS_Pr->SiS_VBInfo & SetCRT2ToRAMDAC)) {
++	    temp |= 0x10;
++	    temp &= 0xfd;
++	 }
++	 SiS_SetReg1(SiS_Pr->SiS_P3c4,0x32,temp);
+       }
+ 
+       if(ModeNo > 0x13) {
+-        tempcl -= ModeVGA;
+-        if((tempcl > 0) || (tempcl == 0)) {      /* TW: tempcl is USHORT -> always true! */
+-           tempah = ((0x10 >> tempcl) | 0x80);
+-        }
++         tempcl -= ModeVGA;
++         if((tempcl > 0) || (tempcl == 0)) {      /* tempcl is USHORT -> always true! */
++            tempah = ((0x10 >> tempcl) | 0x80);
++         }
+       } else tempah = 0x80;
+ 
+       if(SiS_Pr->SiS_VBInfo & SetInSlaveMode)  tempah ^= 0xA0;
+@@ -2880,7 +2970,7 @@ SiS_SetCRT2ModeRegs(SiS_Private *SiS_Pr,
+ 
+     } else {
+ 
+-#ifdef SIS315H    /* ---- 310/325/330 series ---- */
++#ifdef SIS315H    /* ------- 315/330 series ------ */
+ 
+       if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
+          if(SiS_Pr->SiS_VBInfo & CRT2DisplayFlag) {
+@@ -2889,12 +2979,12 @@ SiS_SetCRT2ModeRegs(SiS_Private *SiS_Pr,
+       }
+ 
+       if(ModeNo > 0x13) {
+-        tempcl -= ModeVGA;
+-        if((tempcl > 0) || (tempcl == 0)) {  /* TW: tempcl is USHORT -> always true! */
+-           tempah = (0x08 >> tempcl);
+-           if (tempah == 0) tempah = 1;
+-           tempah |= 0x40;
+-        }
++         tempcl -= ModeVGA;
++         if((tempcl > 0) || (tempcl == 0)) {  /* tempcl is USHORT -> always true! */
++            tempah = (0x08 >> tempcl);
++            if (tempah == 0) tempah = 1;
++            tempah |= 0x40;
++         }
+       } else tempah = 0x40;
+ 
+       if(SiS_Pr->SiS_VBInfo & SetInSlaveMode)  tempah ^= 0x50;
+@@ -2921,7 +3011,7 @@ SiS_SetCRT2ModeRegs(SiS_Private *SiS_Pr,
+ 
+     if(SiS_Pr->SiS_IF_DEF_LVDS == 0) {
+ 
+-	/* TW:   2. for 301 (301B, 302B 301LV, 302LV non-LCDA) */
++	/*   2. for 301 (301B, 302B 301LV, 302LV non-LCDA) */
+ 
+     	tempah = 0x01;
+     	if(!(SiS_Pr->SiS_VBInfo & SetInSlaveMode)) {
+@@ -2938,7 +3028,7 @@ SiS_SetCRT2ModeRegs(SiS_Private *SiS_Pr,
+ 
+     	if(HwDeviceExtension->jChipType < SIS_315H) {
+ 
+-		/* --- 300 series --- */
++		/* ---- 300 series ---- */
+ 
+       		tempah = (tempah << 5) & 0xFF;
+       		SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x01,tempah);
+@@ -2946,7 +3036,7 @@ SiS_SetCRT2ModeRegs(SiS_Private *SiS_Pr,
+ 
+     	} else {
+ 
+-		/* --- 310 series --- */
++		/* ---- 315 series ---- */
+ 
+       		SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x2E,0xF8,tempah);
+ 
+@@ -2956,9 +3046,9 @@ SiS_SetCRT2ModeRegs(SiS_Private *SiS_Pr,
+       		tempah |= 0x10;
+ 	}
+ 
+-	/* TW: 630/301 BIOS */
+ 	if((HwDeviceExtension->jChipType < SIS_315H) && (SiS_Pr->SiS_VBType & VB_SIS301)) {
+-		if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) {
++		if((SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) ||
++		   (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x960)) {
+ 			tempah |= 0x80;
+ 		}
+ 	} else {
+@@ -2996,28 +3086,31 @@ SiS_SetCRT2ModeRegs(SiS_Private *SiS_Pr,
+       	      }
+ 	   }
+     	}
+-	/* TW: For 302LV dual-channel */
++
++	/* For 302LV dual-channel */
+ 	if(HwDeviceExtension->jChipType >= SIS_315H) {
+-	    if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
+-	        if(SiS_GetReg1(SiS_Pr->SiS_P3d4,0x39) & 0x04)
+-		    tempah |= 0x40;
+-	    }
++	   if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
++	      if(SiS_GetReg1(SiS_Pr->SiS_P3d4,0x39) & 0x04)
++	         tempah |= 0x40;
++	   }
+ 	}
+ 
+ 	if((SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) ||
+-	   (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x960)) {
+-		tempah |= 0x80;
++	   (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x960)  ||
++	   ((SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_PanelCustom) &&
++	    (SiS_Pr->CP_MaxX >= 1280) && (SiS_Pr->CP_MaxY >= 960))) {
++	   tempah |= 0x80;
+ 	}
+ 
+     	SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x0C,tempah);
+ 
+     } else {
+ 
+-    	/* TW: 3. for LVDS */
++    	/* 3. for LVDS */
+ 
+ 	if(HwDeviceExtension->jChipType >= SIS_315H) {
+ 
+-	   /* TW: Inserted this entire section (BIOS 650/LVDS); added ModeType check
++	   /* Inserted this entire section (BIOS 650/LVDS); added ModeType check
+ 	    *     (LVDS can only be slave in 8bpp modes)
+ 	    */
+ 	   tempah = 0x80;
+@@ -3043,7 +3136,7 @@ SiS_SetCRT2ModeRegs(SiS_Private *SiS_Pr,
+ 
+ 	} else {
+ 
+-	   /* TW: (added ModeType check) */
++	   /* (added ModeType check) */
+ 	   tempah = 0;
+ 	   if( (!(SiS_Pr->SiS_VBInfo & SetInSlaveMode)) && (SiS_Pr->SiS_ModeType > ModeVGA) ) {
+                	  tempah |= 0x02;
+@@ -3060,50 +3153,69 @@ SiS_SetCRT2ModeRegs(SiS_Private *SiS_Pr,
+ 
+   }
+ 
+-  /* TW: Inserted the entire following section */
++  /* Inserted the entire following section */
+ 
+   if(SiS_Pr->SiS_IF_DEF_LVDS == 0) {
+ 
+       if(HwDeviceExtension->jChipType >= SIS_315H) {
+ 
+ #ifdef SIS315H
++
++         unsigned char bridgerev = SiS_GetReg1(SiS_Pr->SiS_Part4Port,0x01);;
++
++	 /* The following is nearly unpreditable and varies from machine
++	  * to machine. Especially the 301DH seems to be a real trouble
++	  * maker. Some BIOSes simply set the registers (like in the
++	  * NoLCD-if-statements here), some set them according to the
++	  * LCDA stuff. It is very likely that some machines are not
++	  * treated correctly in the following, very case-orientated
++	  * code. What do I do then...?
++	  */
++
++	 /* 740 variants match for 30xB, 301B-DH, 30xLV */
++
+          if(!(IS_SIS740)) {
+             tempah = 0x04;						   /* For all bridges */
+             tempbl = 0xfb;
+             if(!(SiS_Pr->SiS_VBInfo & SetCRT2ToLCDA)) {
+                tempah = 0x00;
+-	       if(SiS_IsDualEdge(SiS_Pr, HwDeviceExtension, BaseAddr))
++	       if(SiS_IsDualEdge(SiS_Pr, HwDeviceExtension, BaseAddr)) {
+ 	          tempbl = 0xff;
++	       }
+             }
+             SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x13,tempbl,tempah);   
+ 	 }
+-	 
+-	 if(IS_SIS740) {						
++
++	 /* The following two are responsible for eventually wrong colors
++	  * in TV output. The DH (VB_NoLCD) conditions are unknown; the
++	  * b0 was found in some 651 machine (Pim); the b1 version in a
++	  * 650 box (Jake). What is the criteria?
++	  */
++
++	 if(IS_SIS740) {
+ 	    tempah = 0x30;
+ 	    tempbl = 0xcf;
+ 	    if(SiS_Pr->SiS_VBInfo & DisableCRT2Display) {
+ 	       tempah = 0x00;
+ 	    }
+-	    SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x2c,tempbl,tempah);    
++	    SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x2c,tempbl,tempah);
++	 } else if(SiS_Pr->SiS_VBType & VB_SIS301) {
++	    /* Fixes "TV-blue-bug" on 315+301 */
++	    SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x2c,0xCF);          /* For 301   */
++	 } else if(SiS_Pr->SiS_VBType & VB_SIS301LV302LV) {
++	    SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x2c,0xCF,0x30);   /* For 30xLV */
++	 } else if((SiS_Pr->SiS_VBType & VB_NoLCD) && (bridgerev == 0xb0)) {
++	    SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x2c,0xCF,0x30);   /* For 30xB-DH rev b0 (or "DH on 651"?) */
+ 	 } else {
+-	    /* TW: This in order to fix "TV-blue-bug" on 315+301 */
+-            if(SiS_Pr->SiS_VBType & VB_SIS301) {
+-	       SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x2c,0xCF);             /* For 301   */
+-	    } else {
+-	       if(SiS_Pr->SiS_VBType & VB_SIS301LV302LV) {
+-	          SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x2c,0xCF,0x30);   /* For 30xLV */
+-	       } else {
+-	          tempah = 0x30;					   /* For 301B  */
+-	          tempbl = 0xcf;
+-	          if(!(SiS_Pr->SiS_VBInfo & SetCRT2ToLCDA)) {
+-	             tempah = 0x00;
+-		     if(SiS_IsDualEdge(SiS_Pr, HwDeviceExtension, BaseAddr)) {
+-		        tempbl = 0xff;
+-		     }
+-	          }
+-	          SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x2c,tempbl,tempah);    
++	    tempah = 0x30;					     /* For 30xB (and 301BDH rev b1) */
++	    tempbl = 0xcf;
++	    if(!(SiS_Pr->SiS_VBInfo & SetCRT2ToLCDA)) {
++	       tempah = 0x00;
++	       if(SiS_IsDualEdge(SiS_Pr, HwDeviceExtension, BaseAddr)) {
++		  tempbl = 0xff;
+ 	       }
+ 	    }
++	    SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x2c,tempbl,tempah);
+ 	 }
+ 
+ 	 if(IS_SIS740) {
+@@ -3111,25 +3223,25 @@ SiS_SetCRT2ModeRegs(SiS_Private *SiS_Pr,
+   	    tempbl = 0x3f;
+ 	    if(SiS_Pr->SiS_VBInfo & DisableCRT2Display) {
+ 	       tempah = 0x00;
+-	    } 
+-	    SiS_SetRegANDOR(SiS_Pr->SiS_Part4Port,0x21,tempbl,tempah);     
++	    }
++	    SiS_SetRegANDOR(SiS_Pr->SiS_Part4Port,0x21,tempbl,tempah);
++	 } else if(SiS_Pr->SiS_VBType & VB_SIS301LV302LV) {
++	    SiS_SetRegANDOR(SiS_Pr->SiS_Part4Port,0x21,0x3f,0xc0);	/* For 30xLV */
++	 } else if((SiS_Pr->SiS_VBType & VB_NoLCD) && (bridgerev == 0xb0)) {
++	    SiS_SetRegANDOR(SiS_Pr->SiS_Part4Port,0x21,0x3f,0xc0);	/* For 30xB-DH rev b0 (or "DH on 651"? */
+ 	 } else {
+-	    if(SiS_Pr->SiS_VBType & VB_SIS301LV302LV) {			/* For 30xLV */
+-	       SiS_SetRegANDOR(SiS_Pr->SiS_Part4Port,0x21,0x3f,0xc0);
+-	    } else {							/* For 301, 301B */ 
+-	        tempah = 0xc0;
+-	        tempbl = 0x3f;
+-	        if(!(SiS_Pr->SiS_VBInfo & SetCRT2ToLCDA)) {
+-	           tempah = 0x00;
+-		   if(SiS_IsDualEdge(SiS_Pr, HwDeviceExtension, BaseAddr)) {
+-		      tempbl = 0xff;
+-		   }
+-	        }
+-	        SiS_SetRegANDOR(SiS_Pr->SiS_Part4Port,0x21,tempbl,tempah);     
++	    tempah = 0xc0;						/* For 301, 301B (and 301BDH rev b1) */
++	    tempbl = 0x3f;
++	    if(!(SiS_Pr->SiS_VBInfo & SetCRT2ToLCDA)) {
++	       tempah = 0x00;
++	       if(SiS_IsDualEdge(SiS_Pr, HwDeviceExtension, BaseAddr)) {
++		  tempbl = 0xff;
++	       }
+ 	    }
++	    SiS_SetRegANDOR(SiS_Pr->SiS_Part4Port,0x21,tempbl,tempah);
+ 	 }
+ 
+-	 if(IS_SIS740) {						
++	 if(IS_SIS740) {
+ 	    tempah = 0x80;
+ 	    tempbl = 0x7f;
+ 	    if(SiS_Pr->SiS_VBInfo & DisableCRT2Display) {
+@@ -3141,8 +3253,9 @@ SiS_SetCRT2ModeRegs(SiS_Private *SiS_Pr,
+             tempbl = 0x7f;
+             if(!(SiS_Pr->SiS_VBInfo & SetCRT2ToLCDA)) {
+                tempbl = 0xff;
+-	       if(!(SiS_IsDualEdge(SiS_Pr, HwDeviceExtension, BaseAddr)))
++	       if(!(SiS_IsDualEdge(SiS_Pr, HwDeviceExtension, BaseAddr))) {
+ 	          tempah |= 0x80;
++	       }
+             }
+             SiS_SetRegANDOR(SiS_Pr->SiS_Part4Port,0x23,tempbl,tempah);
+ 	 }
+@@ -3174,16 +3287,32 @@ SiS_SetCRT2ModeRegs(SiS_Private *SiS_Pr,
+ 	    tempbl = 0xfb;
+             if(!(SiS_Pr->SiS_VBInfo & SetCRT2ToLCDA)) {
+                tempah = 0x00;
+-	       if(SiS_IsDualEdge(SiS_Pr, HwDeviceExtension, BaseAddr))
++	       if(SiS_IsDualEdge(SiS_Pr, HwDeviceExtension, BaseAddr)) {
+ 	          tempbl = 0xff;
++	       }
+             }
+ 	    SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x13,tempbl,tempah);
+ 
+-	    if(SiS_Pr->SiS_VBInfo & DisableCRT2Display)
++	    if(SiS_Pr->SiS_VBInfo & DisableCRT2Display) {
+ 	       SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x13,0xfb,0x00);
++	    }
+ 
+ 	    SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x2c,0xcf,0x30);
+ 
++	 } else if(HwDeviceExtension->jChipType == SIS_550) {
++
++#if 0
++	    tempah = 0x00;
++	    tempbl = 0xfb;
++	    if(SiS_Pr->SiS_VBInfo & DisableCRT2Display) {
++	       tempah = 0x00;
++	       tempbl = 0xfb;
++	    }
++	    SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x13,tempbl,tempah);
++#endif
++	    SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x13,0xfb);
++
++	    SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x2c,0xcf,0x30);
+ 	 }
+ 
+       }
+@@ -3209,10 +3338,9 @@ SiS_GetCRT2Data(SiS_Private *SiS_Pr, UCH
+ 	                      HwDeviceExtension);
+         } else {
+ 
+-	   if( (SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) &&
+-	       (SiS_Pr->SiS_VBType & VB_NoLCD) ) {
+-	       
+-	      /* TW: Need LVDS Data for LCD on 301BDH */
++	   if( (SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) && (SiS_Pr->SiS_VBType & VB_NoLCD) ) {
++
++	      /* Need LVDS Data for LCD on 301B-DH */
+ 	      SiS_GetCRT2DataLVDS(SiS_Pr,ROMAddr,ModeNo,ModeIdIndex,RefreshRateTableIndex,
+ 	                          HwDeviceExtension);
+ 				  
+@@ -3282,18 +3410,16 @@ SiS_GetCRT2DataLVDS(SiS_Private *SiS_Pr,
+ 
+    } else {
+ 
+-      /* TW: 301BDH needs LVDS Data */
+-      if( (SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) &&
+-          (SiS_Pr->SiS_VBType & VB_NoLCD) ) {
++      /* 301BDH needs LVDS Data */
++      if( (SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) && (SiS_Pr->SiS_VBType & VB_NoLCD) ) {
+ 	      SiS_Pr->SiS_IF_DEF_LVDS = 1;
+       }
+ 
+       SiS_GetCRT2Ptr(SiS_Pr,ROMAddr,ModeNo,ModeIdIndex,RefreshRateTableIndex,
+                      &CRT2Index,&ResIndex,HwDeviceExtension);
+ 
+-      /* TW: 301BDH needs LVDS Data */
+-      if( (SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) &&
+-          (SiS_Pr->SiS_VBType & VB_NoLCD) ) {
++      /* 301BDH needs LVDS Data */
++      if( (SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) && (SiS_Pr->SiS_VBType & VB_NoLCD) ) {
+               SiS_Pr->SiS_IF_DEF_LVDS = 0;
+       }
+ 
+@@ -3321,11 +3447,18 @@ SiS_GetCRT2DataLVDS(SiS_Private *SiS_Pr,
+ 	case 20:  LVDSData = SiS_Pr->SiS_LVDS1280x768Data_2;   break;
+ 	case 21:  LVDSData = SiS_Pr->SiS_LVDS1600x1200Data_1;  break;
+ 	case 22:  LVDSData = SiS_Pr->SiS_LVDS1600x1200Data_2;  break;
++	case 30:  LVDSData = SiS_Pr->SiS_LVDS640x480Data_2;    break;
++	case 80:  LVDSData = SiS_Pr->SiS_LVDSBARCO1366Data_1;  break;
++	case 81:  LVDSData = SiS_Pr->SiS_LVDSBARCO1366Data_2;  break;
++	case 82:  LVDSData = SiS_Pr->SiS_LVDSBARCO1024Data_1;  break;
++	case 83:  LVDSData = SiS_Pr->SiS_LVDSBARCO1024Data_2;  break;
++	case 84:  LVDSData = SiS_Pr->SiS_LVDS848x480Data_1;    break;
++	case 85:  LVDSData = SiS_Pr->SiS_LVDS848x480Data_2;    break;
+ 	case 90:  LVDSData = SiS_Pr->SiS_CHTVUPALMData;        break;
+       	case 91:  LVDSData = SiS_Pr->SiS_CHTVOPALMData;        break;
+       	case 92:  LVDSData = SiS_Pr->SiS_CHTVUPALNData;        break;
+       	case 93:  LVDSData = SiS_Pr->SiS_CHTVOPALNData;        break;
+-	case 99:  LVDSData = SiS_Pr->SiS_CHTVSOPALData;	       break;  /* TW: Super Overscan */
++	case 99:  LVDSData = SiS_Pr->SiS_CHTVSOPALData;	       break;  /* Super Overscan */
+ 	default:  LVDSData = SiS_Pr->SiS_LVDS1024x768Data_1;   break;
+      }
+    }
+@@ -3337,67 +3470,36 @@ SiS_GetCRT2DataLVDS(SiS_Private *SiS_Pr,
+ 
+   if(SiS_Pr->SiS_IF_DEF_LVDS == 0) {
+ 
+-    if(!(SiS_Pr->SiS_LCDInfo & DontExpandLCD)){
+-         if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768){
+-           SiS_Pr->SiS_HDE = 1024;
+-           SiS_Pr->SiS_VDE =  768;
+-         } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024){
+-           SiS_Pr->SiS_HDE = 1280;
+-           SiS_Pr->SiS_VDE = 1024;
+-	 } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050){
+-           SiS_Pr->SiS_HDE = 1400;
+-           SiS_Pr->SiS_VDE = 1050;
+-	 } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1600x1200){
+-           SiS_Pr->SiS_HDE = 1600;
+-           SiS_Pr->SiS_VDE = 1200;
+-         } else {
+-	   SiS_Pr->SiS_HDE = 1280;
+-	   SiS_Pr->SiS_VDE =  960;
+-	 }
+-    }
++     if(!(SiS_Pr->SiS_LCDInfo & DontExpandLCD)) {
++        SiS_Pr->SiS_HDE = SiS_Pr->PanelXRes;
++        SiS_Pr->SiS_VDE = SiS_Pr->PanelYRes;
++     }
+ 
+   } else {
+ 
+-    if(SiS_Pr->SiS_IF_DEF_TRUMPION == 0) {
+-      if((SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) && (!(SiS_Pr->SiS_LCDInfo & LCDPass11))) {
+-        if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel640x480) {
+-          if((!(SiS_Pr->SiS_LCDInfo & DontExpandLCD)) || (SiS_Pr->SiS_SetFlag & SetDOSMode)) {
+-            if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel800x600) {
+-              SiS_Pr->SiS_HDE =  800;
+-              SiS_Pr->SiS_VDE =  600;
+-	    } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x600) {
+-	      SiS_Pr->SiS_HDE = 1024;
+-              SiS_Pr->SiS_VDE =  600;  
+-            } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) {
+-              SiS_Pr->SiS_HDE = 1024;
+-              SiS_Pr->SiS_VDE =  768;
+- 	    } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1152x768) {
+-	      SiS_Pr->SiS_HDE = 1152;
+-	      SiS_Pr->SiS_VDE =  768;	
+-	    } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1152x864) {
+-	      SiS_Pr->SiS_HDE = 1152;
+-	      SiS_Pr->SiS_VDE =  864;  
+-	    } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x768) {
+-	      SiS_Pr->SiS_HDE = 1280;
+-	      SiS_Pr->SiS_VDE =  768;        
+-            } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) {
+-              SiS_Pr->SiS_HDE = 1280;
+-              SiS_Pr->SiS_VDE = 1024;
+-	    } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050) {
+-	      SiS_Pr->SiS_HDE = 1400;
+-              SiS_Pr->SiS_VDE = 1050;
+-	    } else {
+-	      SiS_Pr->SiS_HDE = 1600;
+-	      SiS_Pr->SiS_VDE = 1200;
+-	    }
+-            if(SiS_Pr->SiS_IF_DEF_FSTN) {
+-              SiS_Pr->SiS_HDE = 320;
+-              SiS_Pr->SiS_VDE = 480;
+-            }
+-          }
++     if(SiS_Pr->SiS_IF_DEF_TRUMPION == 0) {
++        if((SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) && (!(SiS_Pr->SiS_LCDInfo & LCDPass11))) {
++           if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel640x480) {
++              if((!(SiS_Pr->SiS_LCDInfo & DontExpandLCD)) || (SiS_Pr->SiS_SetFlag & SetDOSMode)) {
++	         SiS_Pr->SiS_HDE = SiS_Pr->PanelXRes;
++                 SiS_Pr->SiS_VDE = SiS_Pr->PanelYRes;
++
++		 if(SiS_Pr->SiS_CustomT == CUT_BARCO1366) {
++		    if(ResIndex < 0x08) {
++		       SiS_Pr->SiS_HDE = 1280;
++                       SiS_Pr->SiS_VDE = 1024;
++		    }
++		 }
++#if 0
++                 if(SiS_Pr->SiS_IF_DEF_FSTN) {
++                    SiS_Pr->SiS_HDE = 320;
++                    SiS_Pr->SiS_VDE = 480;
++                 }
++#endif
++              }
++           }
+         }
+-      }
+-    }
++     }
+   }
+ }
+ 
+@@ -3413,11 +3515,16 @@ SiS_GetCRT2Data301(SiS_Private *SiS_Pr, 
+   const SiS_TVDataStruct  *TVPtr  = NULL;
+ 
+   if(ModeNo <= 0x13) {
+-    	modeflag = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ModeFlag;
+-    	resinfo = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ResInfo;
++     modeflag = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ModeFlag;
++     resinfo = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ResInfo;
+   } else {
++     if(SiS_Pr->UseCustomMode) {
++        modeflag = SiS_Pr->CModeFlag;
++	resinfo = 0;
++     } else {
+     	modeflag = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+     	resinfo = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_RESINFO;
++     }
+   }
+   
+   SiS_Pr->SiS_NewFlickerMode = 0;
+@@ -3429,17 +3536,26 @@ SiS_GetCRT2Data301(SiS_Private *SiS_Pr, 
+ 
+   SiS_GetCRT2ResInfo(SiS_Pr,ROMAddr,ModeNo,ModeIdIndex,HwDeviceExtension);
+ 
+-  /* TW: For VGA2 ("RAMDAC2") */
+-
+   if(SiS_Pr->SiS_VBInfo & SetCRT2ToRAMDAC){
+-     SiS_GetRAMDAC2DATA(SiS_Pr,ROMAddr,ModeNo,ModeIdIndex,RefreshRateTableIndex,
+-                        HwDeviceExtension);
+-     return;
+-  }
+ 
+-  /* TW: For TV */
++     if(SiS_Pr->UseCustomMode) {
+ 
+-  if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
++        SiS_Pr->SiS_RVBHCMAX  = 1;
++        SiS_Pr->SiS_RVBHCFACT = 1;
++        SiS_Pr->SiS_VGAHT     = SiS_Pr->CHTotal;
++        SiS_Pr->SiS_VGAVT     = SiS_Pr->CVTotal;
++        SiS_Pr->SiS_HT        = SiS_Pr->CHTotal;
++        SiS_Pr->SiS_VT        = SiS_Pr->CVTotal;
++	SiS_Pr->SiS_HDE       = SiS_Pr->SiS_VGAHDE;
++        SiS_Pr->SiS_VDE       = SiS_Pr->SiS_VGAVDE;
++
++     } else {
++
++        SiS_GetRAMDAC2DATA(SiS_Pr,ROMAddr,ModeNo,ModeIdIndex,RefreshRateTableIndex,
++                           HwDeviceExtension);
++     }
++
++  } else if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
+ 
+     SiS_GetCRT2Ptr(SiS_Pr,ROMAddr,ModeNo,ModeIdIndex,RefreshRateTableIndex,
+                    &CRT2Index,&ResIndex,HwDeviceExtension);
+@@ -3452,7 +3568,7 @@ SiS_GetCRT2Data301(SiS_Private *SiS_Pr, 
+       case  4:  TVPtr = SiS_Pr->SiS_ExtNTSCData;   break;
+       case  8:  TVPtr = SiS_Pr->SiS_StPALData;     break;
+       case  9:  TVPtr = SiS_Pr->SiS_StNTSCData;    break;
+-      default:  TVPtr = SiS_Pr->SiS_StPALData;     break;  /* TW: Just to avoid a crash */
++      default:  TVPtr = SiS_Pr->SiS_StPALData;     break;  /* Just to avoid a crash */
+     }
+ 
+     SiS_Pr->SiS_RVBHCMAX  = (TVPtr+ResIndex)->RVBHCMAX;
+@@ -3464,18 +3580,16 @@ SiS_GetCRT2Data301(SiS_Private *SiS_Pr, 
+     SiS_Pr->SiS_RVBHRS    = (TVPtr+ResIndex)->RVBHRS;
+     SiS_Pr->SiS_NewFlickerMode = (TVPtr+ResIndex)->FlickerMode;
+     if(modeflag & HalfDCLK) {
+-	SiS_Pr->SiS_RVBHRS    = (TVPtr+ResIndex)->HALFRVBHRS;
++	SiS_Pr->SiS_RVBHRS     = (TVPtr+ResIndex)->HALFRVBHRS;
+     }
+ 
+     if(SiS_Pr->SiS_VBInfo & SetCRT2ToHiVisionTV) {  
+     
+        if(SiS_Pr->SiS_HiVision != 3) {
+-       
+-      	  if(resinfo == 0x08) SiS_Pr->SiS_NewFlickerMode = 0x40;
+-      	  if(resinfo == 0x09) SiS_Pr->SiS_NewFlickerMode = 0x40;
+-	  if(resinfo == 0x12) SiS_Pr->SiS_NewFlickerMode = 0x40;
+-	  
+-       } 
++      	  if(resinfo == SIS_RI_1024x768)  SiS_Pr->SiS_NewFlickerMode = 0x40;
++      	  if(resinfo == SIS_RI_1280x1024) SiS_Pr->SiS_NewFlickerMode = 0x40;
++	  if(resinfo == SIS_RI_1280x720)  SiS_Pr->SiS_NewFlickerMode = 0x40;
++       }
+        
+        switch(SiS_Pr->SiS_HiVision) {
+        case 2:
+@@ -3504,119 +3618,136 @@ SiS_GetCRT2Data301(SiS_Private *SiS_Pr, 
+ 
+     } else {
+ 
+-      SiS_Pr->SiS_RY1COE = (TVPtr+ResIndex)->RY1COE;
+-      SiS_Pr->SiS_RY2COE = (TVPtr+ResIndex)->RY2COE;
+-      SiS_Pr->SiS_RY3COE = (TVPtr+ResIndex)->RY3COE;
+-      SiS_Pr->SiS_RY4COE = (TVPtr+ResIndex)->RY4COE;
+-
+-      if(modeflag & HalfDCLK) {
+-         SiS_Pr->SiS_RY1COE = 0x00;
+-         SiS_Pr->SiS_RY2COE = 0xf4;
+-         SiS_Pr->SiS_RY3COE = 0x10;
+-         SiS_Pr->SiS_RY4COE = 0x38;
+-      }
+-
+-      if(!(SiS_Pr->SiS_VBInfo & SetPALTV)) {
+-        SiS_Pr->SiS_HT = NTSCHT;
+-	if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {  
+-	   if((ModeNo == 0x4a) || (ModeNo == 0x38)) SiS_Pr->SiS_HT = NTSC2HT;
+-	}  
+-        SiS_Pr->SiS_VT = NTSCVT;
+-      } else {
+-        SiS_Pr->SiS_HT = PALHT;
+-        SiS_Pr->SiS_VT = PALVT;
+-      }
++       SiS_Pr->SiS_RY1COE = (TVPtr+ResIndex)->RY1COE;
++       SiS_Pr->SiS_RY2COE = (TVPtr+ResIndex)->RY2COE;
++       SiS_Pr->SiS_RY3COE = (TVPtr+ResIndex)->RY3COE;
++       SiS_Pr->SiS_RY4COE = (TVPtr+ResIndex)->RY4COE;
++
++       if(modeflag & HalfDCLK) {
++          SiS_Pr->SiS_RY1COE = 0x00;
++          SiS_Pr->SiS_RY2COE = 0xf4;
++          SiS_Pr->SiS_RY3COE = 0x10;
++          SiS_Pr->SiS_RY4COE = 0x38;
++       }
++
++       if(!(SiS_Pr->SiS_VBInfo & SetPALTV)) {
++          SiS_Pr->SiS_HT = NTSCHT;
++	  if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
++	     if((ModeNo == 0x64) || (ModeNo == 0x4a) || (ModeNo == 0x38)) SiS_Pr->SiS_HT = NTSC2HT;
++	  }
++          SiS_Pr->SiS_VT = NTSCVT;
++       } else {
++          SiS_Pr->SiS_HT = PALHT;
++          SiS_Pr->SiS_VT = PALVT;
++       }
+ 
+     }
+ 
+-    return;
+-  }
++  } else if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
+ 
+-  /* TW: For LCD */
++     if(SiS_Pr->UseCustomMode) {
+ 
+-  if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
++        SiS_Pr->SiS_RVBHCMAX  = 1;
++        SiS_Pr->SiS_RVBHCFACT = 1;
++        SiS_Pr->SiS_VGAHT     = SiS_Pr->CHTotal;
++        SiS_Pr->SiS_VGAVT     = SiS_Pr->CVTotal;
++        SiS_Pr->SiS_HT        = SiS_Pr->CHTotal;
++        SiS_Pr->SiS_VT        = SiS_Pr->CVTotal;
++	SiS_Pr->SiS_HDE       = SiS_Pr->SiS_VGAHDE;
++        SiS_Pr->SiS_VDE       = SiS_Pr->SiS_VGAVDE;
+ 
+-    SiS_GetCRT2Ptr(SiS_Pr,ROMAddr,ModeNo,ModeIdIndex,RefreshRateTableIndex,
+-                   &CRT2Index,&ResIndex,HwDeviceExtension);
++     } else {
++
++        SiS_GetCRT2Ptr(SiS_Pr,ROMAddr,ModeNo,ModeIdIndex,RefreshRateTableIndex,
++                      &CRT2Index,&ResIndex,HwDeviceExtension);
++
++        switch(CRT2Index) {
++         case  0: LCDPtr = SiS_Pr->SiS_ExtLCD1024x768Data;        break; /* VESA Timing */
++         case  1: LCDPtr = SiS_Pr->SiS_ExtLCD1280x1024Data;       break; /* VESA Timing */
++         case  5: LCDPtr = SiS_Pr->SiS_StLCD1024x768Data;         break; /* Obviously unused */
++         case  6: LCDPtr = SiS_Pr->SiS_StLCD1280x1024Data;        break; /* Obviously unused */
++         case 10: LCDPtr = SiS_Pr->SiS_St2LCD1024x768Data;        break; /* Non-VESA Timing */
++         case 11: LCDPtr = SiS_Pr->SiS_St2LCD1280x1024Data;       break; /* Non-VESA Timing */
++         case 13: LCDPtr = SiS_Pr->SiS_NoScaleData1024x768;       break; /* Non-expanding */
++         case 14: LCDPtr = SiS_Pr->SiS_NoScaleData1280x1024;      break; /* Non-expanding */
++         case 15: LCDPtr = SiS_Pr->SiS_LCD1280x960Data;           break; /* 1280x960 */
++         case 20: LCDPtr = SiS_Pr->SiS_ExtLCD1400x1050Data;       break; /* VESA Timing */
++         case 21: LCDPtr = SiS_Pr->SiS_NoScaleData1400x1050;      break; /* Non-expanding (let panel scale) */
++         case 22: LCDPtr = SiS_Pr->SiS_StLCD1400x1050Data;        break; /* Non-VESA Timing (let panel scale) */
++         case 23: LCDPtr = SiS_Pr->SiS_ExtLCD1600x1200Data;       break; /* VESA Timing */
++         case 24: LCDPtr = SiS_Pr->SiS_NoScaleData1600x1200;      break; /* Non-expanding */
++         case 25: LCDPtr = SiS_Pr->SiS_StLCD1600x1200Data;        break; /* Non-VESA Timing */
++         case 26: LCDPtr = SiS_Pr->SiS_ExtLCD1280x768Data;        break; /* VESA Timing */
++         case 27: LCDPtr = SiS_Pr->SiS_NoScaleData1280x768;       break; /* Non-expanding */
++         case 28: LCDPtr = SiS_Pr->SiS_StLCD1280x768Data;         break; /* Non-VESA Timing */
++         case 29: LCDPtr = SiS_Pr->SiS_NoScaleData;	          break; /* Generic no-scale data */
++#ifdef SIS315H
++	 case 50: LCDPtr = (SiS_LCDDataStruct *)SiS310_ExtCompaq1280x1024Data;	break;
++	 case 51: LCDPtr = SiS_Pr->SiS_NoScaleData1280x1024;			break;
++	 case 52: LCDPtr = SiS_Pr->SiS_St2LCD1280x1024Data;	  		break;
++#endif
++         default: LCDPtr = SiS_Pr->SiS_ExtLCD1024x768Data;	  break; /* Just to avoid a crash */
++        }
++
++        SiS_Pr->SiS_RVBHCMAX  = (LCDPtr+ResIndex)->RVBHCMAX;
++        SiS_Pr->SiS_RVBHCFACT = (LCDPtr+ResIndex)->RVBHCFACT;
++        SiS_Pr->SiS_VGAHT     = (LCDPtr+ResIndex)->VGAHT;
++        SiS_Pr->SiS_VGAVT     = (LCDPtr+ResIndex)->VGAVT;
++        SiS_Pr->SiS_HT        = (LCDPtr+ResIndex)->LCDHT;
++        SiS_Pr->SiS_VT        = (LCDPtr+ResIndex)->LCDVT;
+ 
+-    switch (CRT2Index) {
+-      case  0: LCDPtr = SiS_Pr->SiS_ExtLCD1024x768Data;        break; /* VESA Timing */
+-      case  1: LCDPtr = SiS_Pr->SiS_ExtLCD1280x1024Data;       break; /* VESA Timing */
+-      case  5: LCDPtr = SiS_Pr->SiS_StLCD1024x768Data;         break; /* Obviously unused */
+-      case  6: LCDPtr = SiS_Pr->SiS_StLCD1280x1024Data;        break; /* Obviously unused */
+-      case 10: LCDPtr = SiS_Pr->SiS_St2LCD1024x768Data;        break; /* Non-VESA Timing */
+-      case 11: LCDPtr = SiS_Pr->SiS_St2LCD1280x1024Data;       break; /* Non-VESA Timing */
+-      case 13: LCDPtr = SiS_Pr->SiS_NoScaleData1024x768;       break; /* Non-expanding */
+-      case 14: LCDPtr = SiS_Pr->SiS_NoScaleData1280x1024;      break; /* Non-expanding */
+-      case 15: LCDPtr = SiS_Pr->SiS_LCD1280x960Data;           break; /* 1280x960 */
+-      case 20: LCDPtr = SiS_Pr->SiS_ExtLCD1400x1050Data;       break; /* VESA Timing */
+-      case 21: LCDPtr = SiS_Pr->SiS_NoScaleData1400x1050;      break; /* Non-expanding (let panel scale) */
+-      case 22: LCDPtr = SiS_Pr->SiS_StLCD1400x1050Data;	       break; /* Non-VESA Timing (let panel scale) */
+-      case 23: LCDPtr = SiS_Pr->SiS_ExtLCD1600x1200Data;       break; /* VESA Timing */
+-      case 24: LCDPtr = SiS_Pr->SiS_NoScaleData1600x1200;      break; /* Non-expanding */
+-      case 25: LCDPtr = SiS_Pr->SiS_StLCD1600x1200Data;	       break; /* Non-VESA Timing */
+-      default: LCDPtr = SiS_Pr->SiS_ExtLCD1024x768Data;	       break; /* Just to avoid a crash */
+-    }
+-
+-    SiS_Pr->SiS_RVBHCMAX  = (LCDPtr+ResIndex)->RVBHCMAX;
+-    SiS_Pr->SiS_RVBHCFACT = (LCDPtr+ResIndex)->RVBHCFACT;
+-    SiS_Pr->SiS_VGAHT     = (LCDPtr+ResIndex)->VGAHT;
+-    SiS_Pr->SiS_VGAVT     = (LCDPtr+ResIndex)->VGAVT;
+-    SiS_Pr->SiS_HT        = (LCDPtr+ResIndex)->LCDHT;
+-    SiS_Pr->SiS_VT        = (LCDPtr+ResIndex)->LCDVT;
+-    
+ #ifdef TWDEBUG
+-    xf86DrvMsg(0, X_INFO,
+-    	"GetCRT2Data: Index %d ResIndex %d\n", CRT2Index, ResIndex);
+-#endif    
++        xf86DrvMsg(0, X_INFO,
++    	    "GetCRT2Data: Index %d ResIndex %d\n", CRT2Index, ResIndex);
++#endif
+ 
+-    tempax = 1024;
+-    if(SiS_Pr->SiS_SetFlag & LCDVESATiming) {
+-      if(HwDeviceExtension->jChipType < SIS_315H) {
+-         if     (SiS_Pr->SiS_VGAVDE == 350) tempbx = 560;
+-         else if(SiS_Pr->SiS_VGAVDE == 400) tempbx = 640;
+-         else                               tempbx = 768;
+-      } else {      
+-         tempbx = 768; 
+-      }
+-    } else {
+-      if     (SiS_Pr->SiS_VGAVDE == 357) tempbx = 527;
+-      else if(SiS_Pr->SiS_VGAVDE == 420) tempbx = 620;
+-      else if(SiS_Pr->SiS_VGAVDE == 525) tempbx = 775;
+-      else if(SiS_Pr->SiS_VGAVDE == 600) tempbx = 775;
+-      else if(SiS_Pr->SiS_VGAVDE == 350) tempbx = 560;
+-      else if(SiS_Pr->SiS_VGAVDE == 400) tempbx = 640;
+-      else                               tempbx = 768;
+-    }
+-    if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) {
+-      tempax = 1280;
+-      if     (SiS_Pr->SiS_VGAVDE == 360) tempbx = 768;
+-      else if(SiS_Pr->SiS_VGAVDE == 375) tempbx = 800;
+-      else if(SiS_Pr->SiS_VGAVDE == 405) tempbx = 864;
+-      else                               tempbx = 1024;
+-    }
+-    if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x960) {
+-      tempax = 1280;
+-      if     (SiS_Pr->SiS_VGAVDE == 350)  tempbx = 700;
+-      else if(SiS_Pr->SiS_VGAVDE == 400)  tempbx = 800;
+-      else if(SiS_Pr->SiS_VGAVDE == 1024) tempbx = 960;
+-      else                                tempbx = 960;
+-    }
+-    if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050) {
+-      tempax = 1400;
+-      tempbx = 1050;
+-    }
+-    if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1600x1200) {
+-      tempax = 1600;
+-      tempbx = 1200;
+-    }
+-    if(SiS_Pr->SiS_LCDInfo & DontExpandLCD) {
+-       tempax = SiS_Pr->SiS_VGAHDE;
+-       tempbx = SiS_Pr->SiS_VGAVDE;
+-    }
+-    SiS_Pr->SiS_HDE = tempax;
+-    SiS_Pr->SiS_VDE = tempbx;
+-    return;
++	if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) {
++           tempax = 1024;
++           if(SiS_Pr->SiS_SetFlag & LCDVESATiming) {
++              if(HwDeviceExtension->jChipType < SIS_315H) {
++                 if     (SiS_Pr->SiS_VGAVDE == 350) tempbx = 560;
++                 else if(SiS_Pr->SiS_VGAVDE == 400) tempbx = 640;
++                 else                               tempbx = 768;
++              } else {
++                 tempbx = 768;
++              }
++           } else {
++              if     (SiS_Pr->SiS_VGAVDE == 357) tempbx = 527;
++              else if(SiS_Pr->SiS_VGAVDE == 420) tempbx = 620;
++              else if(SiS_Pr->SiS_VGAVDE == 525) tempbx = 775;
++              else if(SiS_Pr->SiS_VGAVDE == 600) tempbx = 775;
++              else if(SiS_Pr->SiS_VGAVDE == 350) tempbx = 560;
++              else if(SiS_Pr->SiS_VGAVDE == 400) tempbx = 640;
++              else                               tempbx = 768;
++           }
++	} else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) {
++           tempax = 1280;
++           if     (SiS_Pr->SiS_VGAVDE == 360) tempbx = 768;
++           else if(SiS_Pr->SiS_VGAVDE == 375) tempbx = 800;
++           else if(SiS_Pr->SiS_VGAVDE == 405) tempbx = 864;
++           else                               tempbx = 1024;
++        } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x960) {
++           tempax = 1280;
++           if     (SiS_Pr->SiS_VGAVDE == 350)  tempbx = 700;
++           else if(SiS_Pr->SiS_VGAVDE == 400)  tempbx = 800;
++           else if(SiS_Pr->SiS_VGAVDE == 1024) tempbx = 960;
++           else                                tempbx = 960;
++        } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1600x1200) {
++           tempax = 1600;
++           if     (SiS_Pr->SiS_VGAVDE == 350)  tempbx = 875;
++           else if(SiS_Pr->SiS_VGAVDE == 400)  tempbx = 1000;
++           else                                tempbx = 1200;
++        } else {
++	   tempax = SiS_Pr->PanelXRes;
++           tempbx = SiS_Pr->PanelYRes;
++	}
++        if(SiS_Pr->SiS_LCDInfo & DontExpandLCD) {
++           tempax = SiS_Pr->SiS_VGAHDE;
++           tempbx = SiS_Pr->SiS_VGAVDE;
++        }
++        SiS_Pr->SiS_HDE = tempax;
++        SiS_Pr->SiS_VDE = tempbx;
++     }
+   }
+ }
+ 
+@@ -3626,9 +3757,9 @@ SiS_GetResInfo(SiS_Private *SiS_Pr, UCHA
+   USHORT resindex;
+ 
+   if(ModeNo <= 0x13)
+-    	resindex=SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ResInfo;
++     resindex=SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ResInfo;
+   else
+-    	resindex=SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_RESINFO;
++     resindex=SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_RESINFO;
+ 
+   return(resindex);
+ }
+@@ -3639,41 +3770,46 @@ SiS_GetCRT2ResInfo(SiS_Private *SiS_Pr, 
+ {
+   USHORT xres,yres,modeflag=0,resindex;
+ 
++  if(SiS_Pr->UseCustomMode) {
++     SiS_Pr->SiS_VGAHDE = SiS_Pr->SiS_HDE = SiS_Pr->CHDisplay;
++     SiS_Pr->SiS_VGAVDE = SiS_Pr->SiS_VDE = SiS_Pr->CVDisplay;
++     return;
++  }
++
+   resindex = SiS_GetResInfo(SiS_Pr,ROMAddr,ModeNo,ModeIdIndex);
+ 
+   if(ModeNo <= 0x13) {
+-    	xres = SiS_Pr->SiS_StResInfo[resindex].HTotal;
+-    	yres = SiS_Pr->SiS_StResInfo[resindex].VTotal;
++     xres = SiS_Pr->SiS_StResInfo[resindex].HTotal;
++     yres = SiS_Pr->SiS_StResInfo[resindex].VTotal;
+   } else {
+-	xres = SiS_Pr->SiS_ModeResInfo[resindex].HTotal;
+-    	yres = SiS_Pr->SiS_ModeResInfo[resindex].VTotal;
+-    	modeflag = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
++     xres = SiS_Pr->SiS_ModeResInfo[resindex].HTotal;
++     yres = SiS_Pr->SiS_ModeResInfo[resindex].VTotal;
++     modeflag = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+   }
+ 
+-  if((HwDeviceExtension->jChipType >= SIS_315H) && (SiS_Pr->SiS_IF_DEF_LVDS == 1)) {
+-      if((ModeNo != 0x03) && (SiS_Pr->SiS_SetFlag & SetDOSMode)) {
+-          if(yres == 350) yres = 400;
+-      }
+-      if(SiS_GetReg1(SiS_Pr->SiS_P3d4,0x3a) & 0x01) {
+- 	  if(ModeNo == 0x12) yres = 400;
+-      }
+-  }
++  if((!SiS_Pr->SiS_IF_DEF_DSTN) && (!SiS_Pr->SiS_IF_DEF_FSTN)) {
++
++     if((HwDeviceExtension->jChipType >= SIS_315H) && (SiS_Pr->SiS_IF_DEF_LVDS == 1)) {
++        if((ModeNo != 0x03) && (SiS_Pr->SiS_SetFlag & SetDOSMode)) {
++           if(yres == 350) yres = 400;
++        }
++        if(SiS_GetReg1(SiS_Pr->SiS_P3d4,0x3a) & 0x01) {
++ 	   if(ModeNo == 0x12) yres = 400;
++        }
++     }
++
++     if(ModeNo > 0x13) {
++  	if(modeflag & HalfDCLK)       xres *= 2;
++  	if(modeflag & DoubleScanMode) yres *= 2;
++     }
+ 
+-  if(ModeNo > 0x13) {
+-      if(SiS_Pr->SiS_IF_DEF_FSTN == 1){
+-            xres *= 2;
+-            yres *= 2;
+-      } else {
+-  	    if(modeflag & HalfDCLK)       xres *= 2;
+-  	    if(modeflag & DoubleScanMode) yres *= 2;
+-      }
+   }
+ 
+   if(SiS_Pr->SiS_IF_DEF_LVDS == 0) {
+         if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCDA) {
+            if(xres == 720) xres = 640;
+ 	} else {
+-	   if(SiS_Pr->SiS_VBType & VB_NoLCD) {           /* TW: 301BDH */
++	   if(SiS_Pr->SiS_VBType & VB_NoLCD) {           /* 301BDH */
+ 	        if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
+                    if(xres == 720) xres = 640;
+ 		}
+@@ -3694,17 +3830,16 @@ SiS_GetCRT2ResInfo(SiS_Private *SiS_Pr, 
+ 	         if(xres == 720) xres = 640;
+ 	      }
+ 	      if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
+-    	         if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) {
+-		    if(ModeNo <= 0x13) {
+-		       /* TW: This is wrong for 640x400 *graphics* mode */
++		 if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) {
++		    if(!(SiS_Pr->SiS_LCDInfo & DontExpandLCD)) {
++		       /* BIOS bug - does this regardless of scaling */
+       		       if(yres == 400) yres = 405;
+ 		    }
+       		    if(yres == 350) yres = 360;
+       		    if(SiS_Pr->SiS_SetFlag & LCDVESATiming) {
+         	       if(yres == 360) yres = 375;
+       		    }
+-   	         }
+-    	         if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768){
++   	         } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) {
+       		    if(!(SiS_Pr->SiS_SetFlag & LCDVESATiming)) {
+         	       if(!(SiS_Pr->SiS_LCDInfo & DontExpandLCD)) {
+           	          if(yres == 350) yres = 357;
+@@ -3719,12 +3854,15 @@ SiS_GetCRT2ResInfo(SiS_Private *SiS_Pr, 
+   } else {
+     	if(xres == 720) xres = 640;
+ 	if(SiS_Pr->SiS_SetFlag & SetDOSMode) {
+-	      yres = 400;
+-	      if(HwDeviceExtension->jChipType >= SIS_315H) {
+-	          if(SiS_GetReg1(SiS_Pr->SiS_P3c4,0x17) & 0x80) yres = 480;
+-	      } else {
+-	          if(SiS_GetReg1(SiS_Pr->SiS_P3c4,0x13) & 0x80) yres = 480;
+-	      }
++	   yres = 400;
++	   if(HwDeviceExtension->jChipType >= SIS_315H) {
++	      if(SiS_GetReg1(SiS_Pr->SiS_P3c4,0x17) & 0x80) yres = 480;
++	   } else {
++	      if(SiS_GetReg1(SiS_Pr->SiS_P3c4,0x13) & 0x80) yres = 480;
++	   }
++	   if(SiS_Pr->SiS_IF_DEF_DSTN || SiS_Pr->SiS_IF_DEF_FSTN) {
++	      yres = 480;
++	   }
+ 	}
+   }
+   SiS_Pr->SiS_VGAHDE = SiS_Pr->SiS_HDE = xres;
+@@ -3739,6 +3877,13 @@ SiS_GetCRT2Ptr(SiS_Private *SiS_Pr, UCHA
+   USHORT tempbx=0,tempal=0;
+   USHORT Flag,resinfo=0;
+ 
++  if(ModeNo <= 0x13) {
++     tempal = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_CRT2CRTC;
++  } else {
++     tempal = SiS_Pr->SiS_RefIndex[RefreshRateTableIndex].Ext_CRT2CRTC;
++     resinfo = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_RESINFO;
++  }
++
+   if(SiS_Pr->SiS_IF_DEF_LVDS == 0) {
+ 
+     	if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {                            /* LCD */
+@@ -3753,19 +3898,44 @@ SiS_GetCRT2Ptr(SiS_Private *SiS_Pr, UCHA
+ 		        tempbx = 23;
+ 			if(SiS_Pr->SiS_LCDInfo & DontExpandLCD)         tempbx = 24;
+ 			else if(!(SiS_Pr->SiS_SetFlag & LCDVESATiming)) tempbx = 25;
++#if 0
++	        } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x768) {
++		        tempbx = 26;
++			if(SiS_Pr->SiS_LCDInfo & DontExpandLCD)         tempbx = 27;
++			else if(!(SiS_Pr->SiS_SetFlag & LCDVESATiming)) tempbx = 28;
++#endif
+ 		} else if(SiS_Pr->SiS_LCDInfo & DontExpandLCD) {
+-			tempbx = 13;
+-			if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) tempbx++;
++			if(SiS_Pr->SiS_VBType & VB_SIS301LV302LV) {
++			   if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768)       tempbx = 13;
++			   else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) tempbx = 14;
++			   else 							 tempbx = 29;
++			} else {
++			   tempbx = 29;
++			   if(ModeNo >= 0x13) {
++			      /* 1280x768 and 1280x960 have same CRT2CRTC,
++			       * so we change it here if 1280x960 is chosen
++			       */
++			      if(resinfo == SIS_RI_1280x960) tempal = 10;
++			   }
++			}
+ 		} else {
+       		   tempbx = SiS_Pr->SiS_LCDResInfo - SiS_Pr->SiS_Panel1024x768;
+       		   if(!(SiS_Pr->SiS_SetFlag & LCDVESATiming)) {
+         		tempbx += 5;
+                         /* GetRevisionID();  */
+-			/* TW: BIOS only adds 5 once */
++			/* BIOS only adds 5 once */
+         		tempbx += 5;
+        		   }
+ 	        }
+ 
++#ifdef SIS315H
++		if(SiS_Pr->SiS_CustomT == CUT_COMPAQ1280) {
++		   tempbx = 50;
++		   if(SiS_Pr->SiS_LCDInfo & DontExpandLCD)         tempbx = 51;
++		   else if(!(SiS_Pr->SiS_SetFlag & LCDVESATiming)) tempbx = 52;
++		}
++#endif
++
+      	} else {						  	/* TV */
+ 	
+        		if((SiS_Pr->SiS_VBType & VB_SIS301B302B) &&
+@@ -3773,7 +3943,7 @@ SiS_GetCRT2Ptr(SiS_Private *SiS_Pr, UCHA
+          		if(SiS_Pr->SiS_VGAVDE > 480) SiS_Pr->SiS_SetFlag &= (~TVSimuMode);
+          		tempbx = 2;
+          		if(SiS_Pr->SiS_VBInfo & SetInSlaveMode) {
+-            			if(!(SiS_Pr->SiS_SetFlag & TVSimuMode)) tempbx = 12; 
++            			if(!(SiS_Pr->SiS_SetFlag & TVSimuMode)) tempbx = 12;
+          		}
+        		} else {
+          		if(SiS_Pr->SiS_VBInfo & SetPALTV) tempbx = 3;
+@@ -3783,34 +3953,18 @@ SiS_GetCRT2Ptr(SiS_Private *SiS_Pr, UCHA
+ 		
+      	}
+ 
+-     	if(ModeNo <= 0x13) {
+-       		tempal = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_CRT2CRTC;
+-     	} else {
+-       		tempal = SiS_Pr->SiS_RefIndex[RefreshRateTableIndex].Ext_CRT2CRTC;
+-		resinfo = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_RESINFO;
+-        }
+-
+-     	tempal &= 0x3F;
+-
+-      	if((SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) &&
+-           (SiS_Pr->SiS_VBInfo & (SetCRT2ToTV-SetCRT2ToHiVisionTV))) {
+-      		if(tempal == 0x06) tempal = 0x07;
+-        }
+-
+-	/* TW: 300/301LV BIOS */
+-	if((HwDeviceExtension->jChipType == SIS_300) &&
+-	   (SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV)) {
+-	    if(ModeNo > 0x13) {
+-	        if((resinfo == 0x0c) || (resinfo == 0x0d))  /* 720 (index diff. on 310/325!) */
+-		    tempal = 6;
+-	    }
+-	}
++        tempal &= 0x3F;
+ 
+-	if(HwDeviceExtension->jChipType != SIS_300) {
+-           if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
+-              if((ModeNo == 0x31) || (ModeNo == 0x32)) tempal = 6;
++      	if(SiS_Pr->SiS_VBInfo & (SetCRT2ToTV - SetCRT2ToHiVisionTV)) {
++	   if(ModeNo > 0x13) {
++      	      if(tempal == 6) tempal = 7;
++              if((resinfo == SIS_RI_720x480) ||
++	         (resinfo == SIS_RI_720x576) ||
++	         (resinfo == SIS_RI_768x576)) {
++		 tempal = 6;
++	      }
+ 	   }
+-	}
++        }
+ 
+      	*CRT2Index = tempbx;
+      	*ResIndex = tempal;
+@@ -3820,25 +3974,22 @@ SiS_GetCRT2Ptr(SiS_Private *SiS_Pr, UCHA
+     	Flag = 1;
+     	tempbx = 0;
+     	if(SiS_Pr->SiS_IF_DEF_CH70xx != 0) {
+-	
+-      		if(!(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD)) {
+-        		Flag = 0;
+-        		tempbx = 10;
+-			if(SiS_Pr->SiS_VBInfo & SetCHTVOverScan) tempbx += 1;
+-        		if(SiS_Pr->SiS_VBInfo & SetPALTV) {
+-				tempbx += 2;
+-				if(SiS_Pr->SiS_CHSOverScan) tempbx = 99;
+-				if(SiS_Pr->SiS_CHPALM) {
+-					tempbx = 90;
+-					if(SiS_Pr->SiS_VBInfo & SetCHTVOverScan) tempbx += 1;
+-				} else if(SiS_Pr->SiS_CHPALN) {
+-					tempbx = 92;
+-					if(SiS_Pr->SiS_VBInfo & SetCHTVOverScan) tempbx += 1;
+-				}
+-				
+-			}
+-      		}
+-		
++      	   if(!(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD)) {
++              Flag = 0;
++              tempbx = 10;
++	      if(SiS_Pr->SiS_VBInfo & SetCHTVOverScan) tempbx += 1;
++              if(SiS_Pr->SiS_VBInfo & SetPALTV) {
++		 tempbx += 2;
++		 if(SiS_Pr->SiS_CHSOverScan) tempbx = 99;
++		 if(SiS_Pr->SiS_CHPALM) {
++		    tempbx = 90;
++		    if(SiS_Pr->SiS_VBInfo & SetCHTVOverScan) tempbx += 1;
++		 } else if(SiS_Pr->SiS_CHPALN) {
++		    tempbx = 92;
++		    if(SiS_Pr->SiS_VBInfo & SetCHTVOverScan) tempbx += 1;
++	 	 }
++              }
++           }
+     	}
+ 
+     	if(Flag) {
+@@ -3846,11 +3997,19 @@ SiS_GetCRT2Ptr(SiS_Private *SiS_Pr, UCHA
+ 		if(SiS_Pr->SiS_LCDResInfo <= SiS_Pr->SiS_Panel1280x1024) {
+ 		   tempbx = SiS_Pr->SiS_LCDResInfo - SiS_Pr->SiS_PanelMinLVDS;
+    	      	   if(SiS_Pr->SiS_LCDInfo & DontExpandLCD)  tempbx += 3;
++		   if(SiS_Pr->SiS_CustomT == CUT_BARCO1024) {
++		      tempbx = 82;
++		      if(SiS_Pr->SiS_LCDInfo & DontExpandLCD)  tempbx++;
++		   }
+ 		} else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x768) {
+ 		   tempbx = 18;
+ 		   if(SiS_Pr->SiS_LCDInfo & DontExpandLCD)  tempbx++; 
+-	        } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480) { 
++	        } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480) {
+ 		   tempbx = 6;
++		} else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480_2) {
++		   tempbx = 30;
++		} else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480_3) {
++		   tempbx = 30;
+ 		} else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x600) {
+ 		   tempbx = 15;
+   		   if(SiS_Pr->SiS_LCDInfo & DontExpandLCD)  tempbx += 2;
+@@ -3863,27 +4022,30 @@ SiS_GetCRT2Ptr(SiS_Private *SiS_Pr, UCHA
+ 		} else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1600x1200) {
+ 		   tempbx = 21;
+ 		   if(SiS_Pr->SiS_LCDInfo & DontExpandLCD)  tempbx++;
++		} else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_PanelBarco1366) {
++		   tempbx = 80;
++   	      	   if(SiS_Pr->SiS_LCDInfo & DontExpandLCD)  tempbx++;
+ 		}
+-		
++
+ 		if(SiS_Pr->SiS_LCDInfo & LCDPass11) {
+ 		   tempbx = 7;
+         	}
+-		
+-	}
+ 
+-    	if(ModeNo <= 0x13)
+-      		tempal = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_CRT2CRTC;
+-    	else {
+-      		tempal = SiS_Pr->SiS_RefIndex[RefreshRateTableIndex].Ext_CRT2CRTC;
+-		resinfo = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_RESINFO;
++		if(SiS_Pr->SiS_CustomT == CUT_PANEL848) {
++		   tempbx = 84;
++		   if(SiS_Pr->SiS_LCDInfo & DontExpandLCD)  tempbx++;
++		}
++
+ 	}
+ 
++#if 0
+ 	if(SiS_Pr->SiS_IF_DEF_FSTN){
+        	 	if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel320x480){
+          		tempbx = 14;
+          		tempal = 6;
+         	}
+     	}
++#endif
+ 
+ 	if(SiS_Pr->SiS_SetFlag & SetDOSMode) {
+ 	        if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel640x480) tempal = 7;
+@@ -3895,13 +4057,10 @@ SiS_GetCRT2Ptr(SiS_Private *SiS_Pr, UCHA
+ 
+ 	if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
+ 	    if(ModeNo > 0x13) {
+-	        if(HwDeviceExtension->jChipType < SIS_315H) {
+-	           if((resinfo == 0x0c) || (resinfo == 0x0d))  /* 720 */
+-		       tempal = 6;
+-	        } else {
+-		   if((resinfo == 0x0d) || (resinfo == 0x0e))  /* 720 */
+-		       tempal = 6;
+-		}
++	       if((resinfo == SIS_RI_720x480) ||
++	          (resinfo == SIS_RI_720x576) ||
++		  (resinfo == SIS_RI_768x576))
++		  tempal = 6;
+ 	    }
+ 	}
+ 
+@@ -3940,7 +4099,7 @@ SiS_GetCRT2PtrA(SiS_Private *SiS_Pr, UCH
+ void
+ SiS_GetCRT2Part2Ptr(SiS_Private *SiS_Pr, UCHAR *ROMAddr,USHORT ModeNo,USHORT ModeIdIndex,
+ 		    USHORT RefreshRateTableIndex,USHORT *CRT2Index,
+-		    USHORT *ResIndex)
++		    USHORT *ResIndex,PSIS_HW_DEVICE_INFO HwDeviceExtension)
+ {
+   USHORT tempbx,tempal;
+ 
+@@ -3954,6 +4113,16 @@ SiS_GetCRT2Part2Ptr(SiS_Private *SiS_Pr,
+   if(SiS_Pr->SiS_LCDInfo & DontExpandLCD)      tempbx += 16;
+   else if(SiS_Pr->SiS_SetFlag & LCDVESATiming) tempbx += 32;
+ 
++#ifdef SIS315H
++  if(SiS_Pr->SiS_CustomT == CUT_COMPAQ1280) {
++     if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) {
++        tempbx = 100;
++        if(SiS_Pr->SiS_LCDInfo & DontExpandLCD)      tempbx = 101;
++  	else if(SiS_Pr->SiS_SetFlag & LCDVESATiming) tempbx = 102;
++     }
++  }
++#endif
++
+   *CRT2Index = tempbx;
+   *ResIndex = tempal & 0x3F;
+ }
+@@ -3962,15 +4131,17 @@ USHORT
+ SiS_GetRatePtrCRT2(SiS_Private *SiS_Pr, UCHAR *ROMAddr, USHORT ModeNo, USHORT ModeIdIndex,
+                    PSIS_HW_DEVICE_INFO HwDeviceExtension)
+ {
+-  SHORT  LCDRefreshIndex[] = { 0x00, 0x00, 0x03, 0x01,
++  SHORT  LCDRefreshIndex[] = { 0x00, 0x00, 0x01, 0x01,
+                                0x01, 0x01, 0x01, 0x01,
+ 			       0x01, 0x01, 0x01, 0x01,
+-			       0x01, 0x01, 0x01, 0x01 };
++			       0x01, 0x01, 0x01, 0x01,
++			       0x00, 0x00, 0x00, 0x00 };
+   USHORT RefreshRateTableIndex,i,backup_i;
+   USHORT modeflag,index,temp,backupindex;
+ 
+-  if(SiS_Pr->UseCustomMode) return 0;
+-  
++  /* Do NOT check for UseCustomMode here, will skrew up FIFO */
++  if(ModeNo == 0xfe) return 0;
++
+   if(ModeNo <= 0x13)
+     	modeflag = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ModeFlag;
+   else
+@@ -3984,7 +4155,7 @@ SiS_GetRatePtrCRT2(SiS_Private *SiS_Pr, 
+ 
+   if(ModeNo < 0x14) return(0xFFFF);
+ 
+- /* TW: CR33 holds refresh rate index for CRT1 [3:0] and CRT2 [7:4].
++ /* CR33 holds refresh rate index for CRT1 [3:0] and CRT2 [7:4].
+   *     On LVDS machines, CRT2 index is always 0 and will be
+   *     set to 0 by the following code; this causes the function
+   *     to take the first non-interlaced mode in SiS_Ext2Struct
+@@ -3998,40 +4169,38 @@ SiS_GetRatePtrCRT2(SiS_Private *SiS_Pr, 
+   if(index > 0) index--;
+ 
+   if(SiS_Pr->SiS_SetFlag & ProgrammingCRT2) {
+-      if(SiS_Pr->SiS_IF_DEF_LVDS == 1) {
++     if(SiS_Pr->SiS_IF_DEF_LVDS == 1) {
+         if(SiS_Pr->SiS_VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA))  index = 0;
+-      } else {
++     } else {
+         if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
+-	    if(SiS_Pr->SiS_VBType & VB_NoLCD)
+-	       	    index = 0;
+-	    else if(SiS_Pr->SiS_LCDInfo & DontExpandLCD)
+-	    	    index = backupindex = 0;
++	   if(SiS_Pr->SiS_VBType & VB_NoLCD)
++	      index = 0;
++	   else if(SiS_Pr->SiS_LCDInfo & DontExpandLCD)
++	      index = backupindex = 0;
+ 	}
+-      }
+-  }
++     }
+ 
+-  if(SiS_Pr->SiS_SetFlag & ProgrammingCRT2) {
+-    	if(SiS_Pr->SiS_IF_DEF_CH70xx != 0) {
+-      		if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
+-        		index = 0;
+-      		}
+-    	}
+-    	if(SiS_Pr->SiS_VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)) {
+-      		if(SiS_Pr->SiS_IF_DEF_LVDS == 0) {
+-			if(!(SiS_Pr->SiS_VBType & VB_NoLCD)) {
+-           		   temp = LCDRefreshIndex[SiS_Pr->SiS_LCDResInfo];
+-        		   if(index > temp) index = temp;
+-			}
+-      		} else {
+-        		index = 0;
+-      		}
+-    	}
++     if(SiS_Pr->SiS_IF_DEF_CH70xx != 0) {
++        if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
++           index = 0;
++        }
++     }
++     if(SiS_Pr->SiS_VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)) {
++        if(SiS_Pr->SiS_IF_DEF_LVDS == 0) {
++	   if(!(SiS_Pr->SiS_VBType & VB_NoLCD)) {
++              temp = LCDRefreshIndex[SiS_Pr->SiS_LCDResInfo];
++              if(index > temp) index = temp;
++	   }
++      	} else {
++           index = 0;
++      	}
++     }
+   }
+ 
+   RefreshRateTableIndex = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].REFindex;
+   ModeNo = SiS_Pr->SiS_RefIndex[RefreshRateTableIndex].ModeID;
+ 
+-  /* TW: 650/LVDS 1.10.07, 650/30xLV 1.10.6s */
++  /* 650/LVDS 1.10.07, 650/30xLV 1.10.6s */
+   if(HwDeviceExtension->jChipType >= SIS_315H) {
+      if(!(SiS_Pr->SiS_VBInfo & DriverMode)) {
+         if( (SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_VESAID == 0x105) ||
+@@ -4066,7 +4235,7 @@ SiS_GetRatePtrCRT2(SiS_Private *SiS_Pr, 
+     	backup_i = i;
+     	if (!(SiS_AdjustCRT2Rate(SiS_Pr,ROMAddr,ModeNo,ModeIdIndex,
+ 	                             RefreshRateTableIndex,&i,HwDeviceExtension))) {
+-		/* TW: This is for avoiding random data to be used; i is
++		/* This is for avoiding random data to be used; i is
+ 		 *     in an undefined state if no matching CRT2 mode is
+ 		 *     found.
+ 		 */
+@@ -4085,196 +4254,199 @@ SiS_AdjustCRT2Rate(SiS_Private *SiS_Pr, 
+   USHORT tempax,tempbx,resinfo;
+   USHORT modeflag,infoflag;
+ 
+-  if (ModeNo <= 0x13)
++  if(ModeNo <= 0x13) {
+     	modeflag = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ModeFlag;
+-  else
++	resinfo = 0;
++  } else {
+     	modeflag = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
++        resinfo = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_RESINFO;
++  }
+ 
+-  resinfo = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_RESINFO;
+   tempbx = SiS_Pr->SiS_RefIndex[RefreshRateTableIndex + (*i)].ModeID;
+ 
+   tempax = 0;
++
+   if(SiS_Pr->SiS_IF_DEF_LVDS == 0) {
++
+     	if(SiS_Pr->SiS_VBInfo & SetCRT2ToRAMDAC) {
+       		tempax |= SupportRAMDAC2;
+ 		if(HwDeviceExtension->jChipType >= SIS_315H) {
+-		    tempax |= SupportTV;
+-		    if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
+-		        if(!(SiS_Pr->SiS_VBInfo & SetInSlaveMode)) {
+-			    if(resinfo == 0x0a) tempax |= SupportTV1024;
+-			}
+-		    }
++		   tempax |= SupportTV;
++		   if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
++		      if(!(SiS_Pr->SiS_VBInfo & SetInSlaveMode)) {
++			 if(resinfo == SIS_RI_1600x1200) tempax |= SupportTV1024;
++		      }
++		   }
+ 		}
+-    	}
+-    	if(SiS_Pr->SiS_VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)) {
++    	} else if(SiS_Pr->SiS_VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)) {
+       		tempax |= SupportLCD;
+ 		if(HwDeviceExtension->jChipType >= SIS_315H) {
+                    if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel1600x1200) {
+ 		      if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel1400x1050) {
+-		         if((resinfo == 6) && (SiS_Pr->SiS_LCDInfo & DontExpandLCD)) {
++		         if((resinfo == SIS_RI_640x480) && (SiS_Pr->SiS_LCDInfo & DontExpandLCD)) {
+ 			    (*i) = 0;
+                             return(1);
+ 		         } else {
+       		            if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel1280x1024) {
+-        		      if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel1280x960) {
+-           			if((resinfo == 6) && (SiS_Pr->SiS_LCDInfo & DontExpandLCD)) {
+-				    return(0);
+-				} else {
+-             			    if((resinfo >= 9) && (resinfo != 0x14)) {
++        		       if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel1280x960) {
++           			  if((resinfo == SIS_RI_640x480) && (SiS_Pr->SiS_LCDInfo & DontExpandLCD)) {
++				     return(0);
++				  } else {
++             			     if((resinfo >= SIS_RI_1280x1024) && (resinfo != SIS_RI_1280x768)) {
+                				return(0);
+-             			    }
+-           			}
+-        		      }
++             			     }
++           			  }
++        		       }
+ 		            }
+ 		         }
+ 		      }
+       		   }
+ 		} else {
+ 		  if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x600) {
+-		     if((resinfo != 0x0f) && ((resinfo == 4) || (resinfo >= 8))) return(0);
++		     if( (resinfo != SIS_RI_1024x600) &&
++		         ((resinfo == SIS_RI_512x384) || (resinfo >= SIS_RI_1024x768))) return(0);
+ 		  } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1152x768) {
+-		     if((resinfo != 0x10) && (resinfo > 8)) return(0);
++		     if((resinfo != SIS_RI_1152x768) && (resinfo > SIS_RI_1024x768)) return(0);
+ 		  } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x960) {
+-		     if((resinfo != 0x0e) && (resinfo > 8)) return(0);
++		     if((resinfo != SIS_RI_1280x960) && (resinfo > SIS_RI_1024x768)) return(0);
+ 		  } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) {
+-		     if(resinfo > 9) return(0);
++		     if(resinfo > SIS_RI_1280x1024) return(0);
+ 		  } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) {
+-		     if(resinfo > 8) return(0);
++		     if(resinfo > SIS_RI_1024x768) return(0);
+ 		  } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel800x600) {
+-		     if((resinfo == 4) || (resinfo > 7)) return(0);
++		     if((resinfo == SIS_RI_512x384) || (resinfo > SIS_RI_800x600)) return(0);
+ 		  } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480) {
+-		     if((resinfo == 4) || (resinfo == 3) || (resinfo > 6)) return(0);
++		     if((resinfo == SIS_RI_512x384) ||
++		        (resinfo == SIS_RI_400x300) ||
++			(resinfo > SIS_RI_640x480)) return(0);
+ 		  }
+ 		}
+-    	}
+-    	if(SiS_Pr->SiS_VBInfo & SetCRT2ToHiVisionTV) { 
++    	} else if(SiS_Pr->SiS_VBInfo & SetCRT2ToHiVisionTV) {
+ 	        if(SiS_Pr->SiS_HiVision == 3) {
+ 		      	tempax |= SupportHiVisionTV2;
+       			if(SiS_Pr->SiS_VBInfo & SetInSlaveMode){
+-        			if(resinfo == 4) return(0);
+-        			if(resinfo == 3) return(0);
+-				if(resinfo == 7) {
++        			if(resinfo == SIS_RI_512x384) return(0);
++        			if(resinfo == SIS_RI_400x300) return(0);
++				if(resinfo == SIS_RI_800x600) {
+ 	          			if(SiS_Pr->SiS_SetFlag & TVSimuMode) return(0);
+         			}
+-        			if(resinfo > 7) return(0);
++        			if(resinfo > SIS_RI_800x600) return(0);
+ 			}
+ 		} else {  
+       			tempax |= SupportHiVisionTV;
+       			if(SiS_Pr->SiS_VBInfo & SetInSlaveMode){
+-        			if(resinfo == 4) return(0);
+-        			if((resinfo == 3) || (resinfo == 7)) {
++        			if(resinfo == SIS_RI_512x384) return(0);
++        			if((resinfo == SIS_RI_400x300) || (resinfo == SIS_RI_800x600)) {
+ 	          			if(SiS_Pr->SiS_SetFlag & TVSimuMode) return(0);
+         			}
+-        			if(resinfo > 7) return(0);
++        			if(resinfo > SIS_RI_800x600) return(0);
+ 			}
+ 		}
+-    	} else {
+-      	   if(SiS_Pr->SiS_VBInfo & (SetCRT2ToAVIDEO|SetCRT2ToSVIDEO|SetCRT2ToSCART)) {
++    	} else if(SiS_Pr->SiS_VBInfo & (SetCRT2ToAVIDEO|SetCRT2ToSVIDEO|SetCRT2ToSCART)) {
+         	tempax |= SupportTV;
+ 		tempax |= SupportTV1024;
+ 		if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
+-		    if(SiS_Pr->SiS_VBInfo & SetInSlaveMode) {
+-		        if((SiS_Pr->SiS_VBInfo & SetNotSimuMode) && (SiS_Pr->SiS_VBInfo & SetPALTV)) {
+-			     if(resinfo != 8) {
+-			         if( (!(SiS_Pr->SiS_VBInfo & SetPALTV)) ||
+-				     ((SiS_Pr->SiS_VBInfo & SetPALTV) && (resinfo != 4)) ) {
+-				     tempax &= ~(SupportTV1024);
+-				     if(HwDeviceExtension->jChipType >= SIS_315H) {
+-                                         if((modeflag & NoSupportSimuTV) && (SiS_Pr->SiS_VBInfo & SetInSlaveMode)) {
+-				             if( (!(SiS_Pr->SiS_VBInfo & SetPALTV)) ||
+-			                         ((SiS_Pr->SiS_VBInfo & SetPALTV) && (resinfo != 7)) ) {
+-			                         if(!(SiS_Pr->SiS_VBInfo & SetNotSimuMode)) return(0);
+-		                             }
+-				         }
+-		                     } else {
+-				         if( (resinfo != 3) ||
+-					     (!(SiS_Pr->SiS_VBInfo & SetInSlaveMode)) ||
+-					     (SiS_Pr->SiS_VBInfo & SetNotSimuMode) ) {
+-					     if(!(SiS_Pr->SiS_VBInfo & SetPALTV)) {
+-						 if((modeflag & NoSupportSimuTV) && (SiS_Pr->SiS_VBInfo & SetInSlaveMode)) {
+-						     if(resinfo == 3) return(0);
+-						     if(!(SiS_Pr->SiS_VBInfo & SetNotSimuMode)) return (0);
+-						 }
+-		                             }
+-                                         } else return(0);
+-				     }
+-				 }
+-			     }
+-			} else {
+-			    tempax &= ~(SupportTV1024);
+-			    if(HwDeviceExtension->jChipType >= SIS_315H) {
+-			        if((modeflag & NoSupportSimuTV) && (SiS_Pr->SiS_VBInfo & SetInSlaveMode)) {
+-			            if( (!(SiS_Pr->SiS_VBInfo & SetPALTV)) ||
+-			                ((SiS_Pr->SiS_VBInfo & SetPALTV) && (resinfo != 7)) ) {
++		   if(SiS_Pr->SiS_VBInfo & SetInSlaveMode) {
++		      if((SiS_Pr->SiS_VBInfo & SetNotSimuMode) && (SiS_Pr->SiS_VBInfo & SetPALTV)) {
++		         if(resinfo != SIS_RI_1024x768) {
++			    if( (!(SiS_Pr->SiS_VBInfo & SetPALTV)) ||
++			        ((SiS_Pr->SiS_VBInfo & SetPALTV) && (resinfo != SIS_RI_512x384)) ) {
++			       tempax &= ~(SupportTV1024);
++			       if(HwDeviceExtension->jChipType >= SIS_315H) {
++                                  if((modeflag & NoSupportSimuTV) && (SiS_Pr->SiS_VBInfo & SetInSlaveMode)) {
++			             if( (!(SiS_Pr->SiS_VBInfo & SetPALTV)) ||
++			                 ((SiS_Pr->SiS_VBInfo & SetPALTV) && (resinfo != SIS_RI_800x600)) ) {
+ 			                if(!(SiS_Pr->SiS_VBInfo & SetNotSimuMode)) return(0);
+-		                    }
+-		                }
+-			    } else {
+-			        if( (resinfo != 3) ||
+-				    (!(SiS_Pr->SiS_VBInfo & SetInSlaveMode)) ||
+-				    (SiS_Pr->SiS_VBInfo & SetNotSimuMode) ) {
+-				     if(!(SiS_Pr->SiS_VBInfo & SetPALTV)) {
+-					 if((modeflag & NoSupportSimuTV) && (SiS_Pr->SiS_VBInfo & SetInSlaveMode)) {
+-					     if(resinfo == 3) return(0);
+-					     if(!(SiS_Pr->SiS_VBInfo & SetNotSimuMode)) return (0);
+-					 }
+ 		                     }
+-                                } else return(0);
+-                            }
+-			}
+-		    } else {  /* slavemode */
+-			if(resinfo != 8) {
+-			    if( (!(SiS_Pr->SiS_VBInfo & SetPALTV)) ||
+-			        ((SiS_Pr->SiS_VBInfo & SetPALTV) && (resinfo != 4) ) ) {
+-				 tempax &= ~(SupportTV1024);
+-				 if(HwDeviceExtension->jChipType >= SIS_315H) {
+-				     if((modeflag & NoSupportSimuTV) && (SiS_Pr->SiS_VBInfo & SetInSlaveMode)) {
+-				         if( (!(SiS_Pr->SiS_VBInfo & SetPALTV)) ||
+-			                     ((SiS_Pr->SiS_VBInfo & SetPALTV) && (resinfo != 7)) ) {
+-			                     if(!(SiS_Pr->SiS_VBInfo & SetNotSimuMode))  return(0);
+-		                         }
++				  }
++		               } else {
++				  if( (resinfo != SIS_RI_400x300) ||
++				      (!(SiS_Pr->SiS_VBInfo & SetInSlaveMode)) ||
++				      (SiS_Pr->SiS_VBInfo & SetNotSimuMode) ) {
++				     if(!(SiS_Pr->SiS_VBInfo & SetPALTV)) {
++					if((modeflag & NoSupportSimuTV) && (SiS_Pr->SiS_VBInfo & SetInSlaveMode)) {
++					   if(resinfo == SIS_RI_400x300) return(0);
++					   if(!(SiS_Pr->SiS_VBInfo & SetNotSimuMode)) return (0);
++					}
+ 		                     }
+-			        } else {
+-				    if( (resinfo != 3) ||
+-				        (!(SiS_Pr->SiS_VBInfo & SetInSlaveMode)) ||
+-				        (SiS_Pr->SiS_VBInfo & SetNotSimuMode) ) {
+-				         if(!(SiS_Pr->SiS_VBInfo & SetPALTV)) {
+-					     if((modeflag & NoSupportSimuTV) && (SiS_Pr->SiS_VBInfo & SetInSlaveMode)) {
+-					         if(resinfo == 3) return(0);
+-					         if(!(SiS_Pr->SiS_VBInfo & SetNotSimuMode)) return (0);
+-					     }
+-		                         }
+-                                    } else return(0);
+-				}
++                                  } else return(0);
++			       }
+ 			    }
+-			}
+-		    }
+-		} else {   /* 301 */
+-		    tempax &= ~(SupportTV1024);
+-		    if(HwDeviceExtension->jChipType >= SIS_315H) {
+-		        if((modeflag & NoSupportSimuTV) && (SiS_Pr->SiS_VBInfo & SetInSlaveMode)) {
+-		            if( (!(SiS_Pr->SiS_VBInfo & SetPALTV)) ||
+-			        ((SiS_Pr->SiS_VBInfo & SetPALTV) && (resinfo != 7)) ) {
+-			        if(!(SiS_Pr->SiS_VBInfo & SetNotSimuMode)) return(0);
+-		            }
+-		        }
+-		    } else {
+-		        if( (resinfo != 3) ||
+-			    (!(SiS_Pr->SiS_VBInfo & SetInSlaveMode)) ||
+-			    (SiS_Pr->SiS_VBInfo & SetNotSimuMode) ) {
+-			    if(!(SiS_Pr->SiS_VBInfo & SetPALTV)) {
+-			        if((modeflag & NoSupportSimuTV) && (SiS_Pr->SiS_VBInfo & SetInSlaveMode)) {
+-				    if(resinfo == 3) return(0);
+-				    if(!(SiS_Pr->SiS_VBInfo & SetNotSimuMode)) return (0);
+-				}
++			 }
++		      } else {
++			 tempax &= ~(SupportTV1024);
++			 if(HwDeviceExtension->jChipType >= SIS_315H) {
++			    if((modeflag & NoSupportSimuTV) && (SiS_Pr->SiS_VBInfo & SetInSlaveMode)) {
++			       if( (!(SiS_Pr->SiS_VBInfo & SetPALTV)) ||
++			           ((SiS_Pr->SiS_VBInfo & SetPALTV) && (resinfo != SIS_RI_800x600)) ) {
++			          if(!(SiS_Pr->SiS_VBInfo & SetNotSimuMode)) return(0);
++		               }
+ 		            }
+-                        } else return(0);
+-		    }
+-		}
+-           }
+-    	}
+-	
+-  } else {	/* TW: for LVDS  */
++			 } else {
++			    if( (resinfo != SIS_RI_400x300) ||
++			        (!(SiS_Pr->SiS_VBInfo & SetInSlaveMode)) ||
++				(SiS_Pr->SiS_VBInfo & SetNotSimuMode) ) {
++			       if(!(SiS_Pr->SiS_VBInfo & SetPALTV)) {
++				  if((modeflag & NoSupportSimuTV) && (SiS_Pr->SiS_VBInfo & SetInSlaveMode)) {
++				     if(resinfo == SIS_RI_400x300) return(0);
++				     if(!(SiS_Pr->SiS_VBInfo & SetNotSimuMode)) return(0);
++				  }
++		               }
++                            } else return(0);
++                         }
++		      }
++		   } else {  /* slavemode */
++		      if(resinfo != SIS_RI_1024x768) {
++			 if( (!(SiS_Pr->SiS_VBInfo & SetPALTV)) ||
++			     ((SiS_Pr->SiS_VBInfo & SetPALTV) && (resinfo != SIS_RI_512x384) ) ) {
++			    tempax &= ~(SupportTV1024);
++			    if(HwDeviceExtension->jChipType >= SIS_315H) {
++			       if((modeflag & NoSupportSimuTV) && (SiS_Pr->SiS_VBInfo & SetInSlaveMode)) {
++			          if( (!(SiS_Pr->SiS_VBInfo & SetPALTV)) ||
++			              ((SiS_Pr->SiS_VBInfo & SetPALTV) && (resinfo != SIS_RI_800x600)) ) {
++			             if(!(SiS_Pr->SiS_VBInfo & SetNotSimuMode))  return(0);
++		                  }
++		               }
++			    } else {
++			       if( (resinfo != SIS_RI_400x300) ||
++			           (!(SiS_Pr->SiS_VBInfo & SetInSlaveMode)) ||
++			           (SiS_Pr->SiS_VBInfo & SetNotSimuMode) ) {
++			          if(!(SiS_Pr->SiS_VBInfo & SetPALTV)) {
++				     if((modeflag & NoSupportSimuTV) && (SiS_Pr->SiS_VBInfo & SetInSlaveMode)) {
++				        if(resinfo == SIS_RI_400x300) return(0);
++				        if(!(SiS_Pr->SiS_VBInfo & SetNotSimuMode)) return(0);
++				     }
++		                  }
++                               } else return(0);
++			    }
++		  	 }
++		      }
++		   }
++	        } else {   /* 301 */
++		   tempax &= ~(SupportTV1024);
++		   if(HwDeviceExtension->jChipType >= SIS_315H) {
++		      if((modeflag & NoSupportSimuTV) && (SiS_Pr->SiS_VBInfo & SetInSlaveMode)) {
++		         if( (!(SiS_Pr->SiS_VBInfo & SetPALTV)) ||
++		             ((SiS_Pr->SiS_VBInfo & SetPALTV) && (resinfo != SIS_RI_800x600)) ) {
++		            if(!(SiS_Pr->SiS_VBInfo & SetNotSimuMode)) return(0);
++		         }
++		      }
++		   } else {
++		      if( (resinfo != SIS_RI_400x300) ||
++			  (!(SiS_Pr->SiS_VBInfo & SetInSlaveMode)) ||
++			  (SiS_Pr->SiS_VBInfo & SetNotSimuMode) ) {
++		         if(!(SiS_Pr->SiS_VBInfo & SetPALTV)) {
++			    if((modeflag & NoSupportSimuTV) && (SiS_Pr->SiS_VBInfo & SetInSlaveMode)) {
++			       if(resinfo == SIS_RI_400x300) return(0);
++			       if(!(SiS_Pr->SiS_VBInfo & SetNotSimuMode)) return (0);
++			    }
++		         }
++                      } else return(0);
++		   }
++	        }
++        }
++
++  } else {	/* for LVDS  */
+ 
+     	if(SiS_Pr->SiS_IF_DEF_CH70xx != 0) {
+       		if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
+@@ -4284,24 +4456,33 @@ SiS_AdjustCRT2Rate(SiS_Private *SiS_Pr, 
+     	if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
+       		tempax |= SupportLCD;
+ 		if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x768) {
+-		     if((resinfo != 0x14) && (resinfo > 0x09)) return(0);
++		     if((resinfo != SIS_RI_1280x768) && (resinfo >= SIS_RI_1280x1024)) return(0);
+ 		} else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x600) {
+-		     if((resinfo != 0x0f) && (resinfo > 0x08)) return(0);
++		     if((resinfo != SIS_RI_1024x600) && (resinfo >= SIS_RI_1024x768))  return(0);
+ 		} else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1152x768) {
+-		     if((resinfo != 0x10) && (resinfo > 0x08)) return(0);
++		     if((resinfo != SIS_RI_1152x768) && (resinfo > SIS_RI_1024x768))   return(0);
+ 		} else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050) {
+-		     if((resinfo != 0x15) && (resinfo > 0x09)) return(0);
++		     if((resinfo != SIS_RI_1400x1050) && (resinfo > SIS_RI_1280x1024)) return(0);
++		} else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1600x1200) {
++                     if(resinfo > SIS_RI_1600x1200) return(0);
+ 		} else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) {
+-                     if(resinfo > 0x09) return(0);
++                     if(resinfo > SIS_RI_1280x1024) return(0);
+                 } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) {
+-		     if(resinfo > 0x08) return(0);
++		     if(resinfo > SIS_RI_1024x768)  return(0);
+ 		} else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel800x600){
+-		     if(resinfo > 0x07) return(0);
+-		     if(resinfo == 0x04) return(0);
++		     if(resinfo > SIS_RI_800x600)   return(0);
++		     if(resinfo == SIS_RI_512x384)  return(0);
++		} else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_PanelBarco1366) {
++                     if((resinfo != SIS_RI_1360x1024) && (resinfo > SIS_RI_1280x1024)) return(0);
++		}  else if(SiS_Pr->SiS_LCDResInfo == Panel_848x480) {
++                     if((resinfo != SIS_RI_1360x768) &&
++		        (resinfo != SIS_RI_848x480)  &&
++		        (resinfo > SIS_RI_1024x768)) return(0);
+ 		}
+     	}
+   }
+-  /* TW: Look backwards in table for matching CRT2 mode */
++
++  /* Look backwards in table for matching CRT2 mode */
+   for(; SiS_Pr->SiS_RefIndex[RefreshRateTableIndex+(*i)].ModeID == tempbx; (*i)--) {
+      	infoflag = SiS_Pr->SiS_RefIndex[RefreshRateTableIndex + (*i)].Ext_InfoFlag;
+      	if(infoflag & tempax) {
+@@ -4309,7 +4490,7 @@ SiS_AdjustCRT2Rate(SiS_Private *SiS_Pr, 
+      	}
+      	if ((*i) == 0) break;
+   }
+-  /* TW: Look through the whole mode-section of the table from the beginning
++  /* Look through the whole mode-section of the table from the beginning
+    *     for a matching CRT2 mode if no mode was found yet.
+    */
+   for((*i) = 0; ; (*i)++) {
+@@ -4329,7 +4510,7 @@ SiS_SaveCRT2Info(SiS_Private *SiS_Pr, US
+ {
+   USHORT temp1,temp2;
+ 
+-  /* TW: We store CRT1 ModeNo in CR34 */
++  /* We store CRT1 ModeNo in CR34 */
+   SiS_SetReg1(SiS_Pr->SiS_P3d4,0x34,ModeNo);
+   temp1 = (SiS_Pr->SiS_VBInfo & SetInSlaveMode) >> 8;
+   temp2 = ~(SetInSlaveMode >> 8);
+@@ -4345,16 +4526,16 @@ SiS_GetVBInfo(SiS_Private *SiS_Pr, USHOR
+   USHORT modeflag, resinfo=0;
+   UCHAR  OutputSelect = *SiS_Pr->pSiS_OutputSelect;
+ 
+-  if(SiS_Pr->UseCustomMode) {
+-        modeflag = SiS_Pr->CModeFlag;
++  if(ModeNo <= 0x13) {
++     modeflag = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ModeFlag;
+   } else {
+-    if (ModeNo <= 0x13)
+-    	modeflag = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ModeFlag;
+-    else {
++     if(SiS_Pr->UseCustomMode) {
++        modeflag = SiS_Pr->CModeFlag;
++     } else {
+    	modeflag = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+ 	resinfo = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_RESINFO;
+-    }
+-  }    
++     }
++  }
+ 
+   SiS_Pr->SiS_SetFlag = 0;
+ 
+@@ -4364,22 +4545,24 @@ SiS_GetVBInfo(SiS_Private *SiS_Pr, USHOR
+   if(SiS_BridgeIsOn(SiS_Pr,BaseAddr,HwDeviceExtension) == 0) {  
+     	temp = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x30);
+ #if 0	
+-	/* SiS_HiVision is only used on 310/325/330+30xLV */
++	/* SiS_HiVision is only used on 315/330+30xLV */
+ 	if(SiS_Pr->SiS_VBType & (VB_SIS301LV302LV)) {
+-	   if(SiS_Pr->SiS_HiVision & 0x03) {	/* TW: New from 650/30xLV 1.10.6s */
++	   if(SiS_Pr->SiS_HiVision & 0x03) {	/* New from 650/30xLV 1.10.6s */
+ 	      temp &= (SetCRT2ToHiVisionTV | SwitchToCRT2 | SetSimuScanMode); 	/* 0x83 */
+ 	      temp |= SetCRT2ToHiVisionTV;   					/* 0x80 */
+ 	   }
+-	   if(SiS_Pr->SiS_HiVision & 0x04) {	/* TW: New from 650/30xLV 1.10.6s */
++	   if(SiS_Pr->SiS_HiVision & 0x04) {	/* New from 650/30xLV 1.10.6s */
+ 	      temp &= (SetCRT2ToHiVisionTV | SwitchToCRT2 | SetSimuScanMode); 	/* 0x83 */
+ 	      temp |= SetCRT2ToSVIDEO;  					/* 0x08 */
+ 	   }
+ 	}
+-#endif	
++#endif
++#if 0
+     	if(SiS_Pr->SiS_IF_DEF_FSTN) {   /* fstn must set CR30=0x21 */
+        		temp = (SetCRT2ToLCD | SetSimuScanMode);
+        		SiS_SetReg1(SiS_Pr->SiS_P3d4,0x30,temp);
+     	}
++#endif
+     	tempbx |= temp;
+     	tempax = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x31) << 8;
+         tempax &= (LoadDACFlag | DriverMode | SetDispDevSwitch | SetNotSimuMode | SetPALTV);
+@@ -4519,7 +4702,7 @@ SiS_GetVBInfo(SiS_Private *SiS_Pr, USHOR
+       		tempbx |= SetSimuScanMode;
+     	}
+ 
+-	/* TW: LVDS (LCD/TV) and 301BDH (LCD) can only be slave in 8bpp modes */
++	/* LVDS (LCD/TV) and 301BDH (LCD) can only be slave in 8bpp modes */
+ 	if(SiS_Pr->SiS_ModeType <= ModeVGA) {
+ 	   if( (SiS_Pr->SiS_IF_DEF_LVDS == 1) ||
+ 	       ((tempbx & SetCRT2ToLCD) && (SiS_Pr->SiS_VBType & VB_NoLCD)) ) {
+@@ -4527,12 +4710,12 @@ SiS_GetVBInfo(SiS_Private *SiS_Pr, USHOR
+ 	   }
+ 	}
+ 	
+-    	if(!(tempbx & SetSimuScanMode)){
++    	if(!(tempbx & SetSimuScanMode)) {
+       	    if(tempbx & SwitchToCRT2) {
+         	if((!(modeflag & CRT2Mode)) && (checkcrt2mode)) {
+ 		     if( (HwDeviceExtension->jChipType >= SIS_315H) &&
+ 			 (SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) ) {
+-			 if(resinfo != 0x0a)
++			 if(resinfo != SIS_RI_1600x1200)
+                               tempbx |= SetSimuScanMode;
+ 		     } else {
+             		      tempbx |= SetSimuScanMode;
+@@ -4555,7 +4738,7 @@ SiS_GetVBInfo(SiS_Private *SiS_Pr, USHOR
+           	    if((!(modeflag & CRT2Mode)) && (checkcrt2mode)) {
+ 	                if( (HwDeviceExtension->jChipType >= SIS_315H) &&
+ 			    (SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) ) {
+-			     if(resinfo != 0x0a) {  /* TW: 650/301 BIOS */
++			     if(resinfo != SIS_RI_1600x1200) {  /* 650/301 BIOS */
+ 			          tempbx |= SetInSlaveMode;
+             		          if(SiS_Pr->SiS_IF_DEF_LVDS == 0) {
+               		 	     if(tempbx & SetCRT2ToTV) {
+@@ -4563,7 +4746,7 @@ SiS_GetVBInfo(SiS_Private *SiS_Pr, USHOR
+ 					     SiS_Pr->SiS_SetFlag |= TVSimuMode;
+               			     }
+                                   }
+-			     }                      /* TW: 650/301 BIOS */
++			     }                      /* 650/301 BIOS */
+ 		        } else {
+             		    tempbx |= SetInSlaveMode;
+             		    if(SiS_Pr->SiS_IF_DEF_LVDS == 0) {
+@@ -4621,7 +4804,7 @@ SiS_GetVBInfo(SiS_Private *SiS_Pr, USHOR
+      	if(HwDeviceExtension->jChipType >= SIS_315H) {
+ 	        if(ROMAddr && SiS_Pr->SiS_UseROM) {
+ 		    OutputSelect = ROMAddr[0xf3];
+-		    if(HwDeviceExtension->jChipType == SIS_330) {
++		    if(HwDeviceExtension->jChipType >= SIS_330) {
+ 			OutputSelect = ROMAddr[0x11b];
+ 		    }
+                 }
+@@ -4652,7 +4835,7 @@ SiS_GetVBInfo(SiS_Private *SiS_Pr, USHOR
+   SiS_Pr->SiS_VBInfo = tempbx;
+ 
+   if(HwDeviceExtension->jChipType == SIS_630) {
+-       SiS_WhatIsThis(SiS_Pr, SiS_Pr->SiS_VBInfo);
++       SiS_SetChrontelGPIO(SiS_Pr, SiS_Pr->SiS_VBInfo);
+   }
+ 
+ #ifdef TWDEBUG
+@@ -4666,61 +4849,35 @@ SiS_GetVBInfo(SiS_Private *SiS_Pr, USHOR
+ #endif
+ #endif
+ 
+-#if 0  /* TW: Incomplete! (But does not seem to be required) */
+-  if(HwDeviceExtension->jChipType < SIS_315H) {
+-     /* TW: From A901/630+301B BIOS */
+-     if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
+-         if(SiS_GetReg1(SiS_Pr->SiS_P3c4,0x13) & 0x80)
+-     }
+-     if(!(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD)) {
+-         if(SiS_GetReg1(SiS_Pr->SiS_P3c4,0x13) & 0x80)
+-	     if( [si] == 3) ModeIdIndex = 0x3f2b;
+-	 }
+-     }
+-     SiS_SetRegAND(SiS_Pr->SiS_P3d4, 0x31, 0xF7);
+-     if(ModeNo == 0x13) bp+4 = 0x03;
+-  } else {
+-     /* From 650/30xLV BIOS: */
+-     SiS_SetRegAND(SiS_Pr->SiS_P3d4, 0x31, 0xF7);
+-     if(ModeNo == 0x13) bp+4 = 0x03;
+-     else bp+4 = ModeNo;
+-  }
+-#endif
+-
+-  /* TW: 630/301B and 650/301 (not 301LV!) BIOSes do more here, but this seems for DOS mode */
+-
+ }
+ 
++/* Setup general purpose IO for Chrontel communication */
+ void
+-SiS_WhatIsThis(SiS_Private *SiS_Pr, USHORT myvbinfo)
++SiS_SetChrontelGPIO(SiS_Private *SiS_Pr, USHORT myvbinfo)
+ {
+-   unsigned long eax, temp;
+-   unsigned short temp1;
++   unsigned long  acpibase;
++   unsigned short temp;
+ 
+    if(!(SiS_Pr->SiS_ChSW)) return;
+ 
+ #ifndef LINUX_XF86
+-   SiS_SetReg4(0xcf8,0x80000874);
+-   eax = SiS_GetReg3(0xcfc);
++   SiS_SetReg4(0xcf8,0x80000874);		   /* get ACPI base */
++   acpibase = SiS_GetReg3(0xcfc);
+ #else
+-   eax = pciReadLong(0x00000800, 0x74);
++   acpibase = pciReadLong(0x00000800, 0x74);
+ #endif
+-   eax &= 0xFFFF;
+-   temp = eax;
+-   eax += 0x3c;
+-   temp1 = SiS_GetReg4((USHORT)eax);
+-   temp1 &= 0xFEFF;
+-   SiS_SetReg5((USHORT)eax, temp1);
+-   temp1 = SiS_GetReg4((USHORT)eax);
+-   eax = temp;
+-   eax += 0x3a;
+-   temp1 = SiS_GetReg4((USHORT)eax);
+-   temp1 &= 0xFEFF;
++   acpibase &= 0xFFFF;
++   temp = SiS_GetReg4((USHORT)(acpibase + 0x3c));  /* ACPI register 0x3c: GP Event 1 I/O mode select */
++   temp &= 0xFEFF;
++   SiS_SetReg5((USHORT)(acpibase + 0x3c), temp);
++   temp = SiS_GetReg4((USHORT)(acpibase + 0x3c));
++   temp = SiS_GetReg4((USHORT)(acpibase + 0x3a));  /* ACPI register 0x3a: GP Pin Level (low/high) */
++   temp &= 0xFEFF;
+    if(!(myvbinfo & SetCRT2ToTV)) {
+-      temp1 |= 0x0100;
++      temp |= 0x0100;
+    }
+-   SiS_SetReg5((USHORT)eax, temp1);
+-   temp1 = SiS_GetReg4((USHORT)eax);
++   SiS_SetReg5((USHORT)(acpibase + 0x3a), temp);
++   temp = SiS_GetReg4((USHORT)(acpibase + 0x3a));
+ }
+ 
+ void
+@@ -4731,14 +4888,14 @@ SiS_GetRAMDAC2DATA(SiS_Private *SiS_Pr, 
+   USHORT temp1=0,modeflag=0,tempcx=0;
+   USHORT StandTableIndex,CRT1Index;
+ #ifdef SIS315H   
+-  USHORT ResInfo,DisplayType,temp=0;
++  USHORT ResIndex,DisplayType,temp=0;
+   const  SiS_LVDSCRT1DataStruct *LVDSCRT1Ptr = NULL;
+ #endif
+ 
+   SiS_Pr->SiS_RVBHCMAX  = 1;
+   SiS_Pr->SiS_RVBHCFACT = 1;
+ 
+-  if(ModeNo <= 0x13){
++  if(ModeNo <= 0x13) {
+ 
+     	modeflag = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ModeFlag;
+     	StandTableIndex = SiS_GetModePtr(SiS_Pr,ROMAddr,ModeNo,ModeIdIndex);
+@@ -4752,7 +4909,7 @@ SiS_GetRAMDAC2DATA(SiS_Private *SiS_Pr, 
+ 
+ #ifdef SIS315H     
+     	temp = SiS_GetLVDSCRT1Ptr(SiS_Pr,ROMAddr,ModeNo,ModeIdIndex,
+-			RefreshRateTableIndex,&ResInfo,&DisplayType);
++			RefreshRateTableIndex,&ResIndex,&DisplayType);
+ 
+     	if(temp == 0)  return;
+ 
+@@ -4795,16 +4952,16 @@ SiS_GetRAMDAC2DATA(SiS_Private *SiS_Pr, 
+ 		case 99: LVDSCRT1Ptr = SiS_Pr->SiS_CHTVCRT1OPAL;                break;
+ 		default: LVDSCRT1Ptr = SiS_Pr->SiS_LVDSCRT11024x768_1;          break;
+     	}
+-	tempax = (LVDSCRT1Ptr+ResInfo)->CR[0];
+-	tempax |= (LVDSCRT1Ptr+ResInfo)->CR[14] << 8;
++	tempax = (LVDSCRT1Ptr+ResIndex)->CR[0];
++	tempax |= (LVDSCRT1Ptr+ResIndex)->CR[14] << 8;
+ 	tempax &= 0x03FF;
+-    	tempbx = (LVDSCRT1Ptr+ResInfo)->CR[6];
+-    	tempcx = (LVDSCRT1Ptr+ResInfo)->CR[13] << 8;
++    	tempbx = (LVDSCRT1Ptr+ResIndex)->CR[6];
++    	tempcx = (LVDSCRT1Ptr+ResIndex)->CR[13] << 8;
+     	tempcx &= 0x0100;
+     	tempcx <<= 2;
+     	tempbx |= tempcx;
+-	temp1  = (LVDSCRT1Ptr+ResInfo)->CR[7];
+-#endif	
++	temp1  = (LVDSCRT1Ptr+ResIndex)->CR[7];
++#endif
+ 
+     } else {
+ 
+@@ -4840,11 +4997,12 @@ SiS_GetRAMDAC2DATA(SiS_Private *SiS_Pr, 
+   if(modeflag & Charx8Dot) tempax *= 8;
+   else                     tempax *= 9;
+ 
+-  /* TW: From 650/30xLV 1.10.6s */
++  /* From 650/30xLV 1.10.6s */
+   if(modeflag & HalfDCLK)  tempax <<= 1;
+ 
+-  SiS_Pr->SiS_VGAHT = SiS_Pr->SiS_HT = tempax;
+   tempbx++;
++
++  SiS_Pr->SiS_VGAHT = SiS_Pr->SiS_HT = tempax;
+   SiS_Pr->SiS_VGAVT = SiS_Pr->SiS_VT = tempbx;
+ }
+ 
+@@ -4852,18 +5010,18 @@ void
+ SiS_UnLockCRT2(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension,USHORT BaseAddr)
+ {
+   if(HwDeviceExtension->jChipType >= SIS_315H)
+-    	SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x2f,0x01);
++     SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x2f,0x01);
+   else
+-    	SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x24,0x01);
++     SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x24,0x01);
+ }
+ 
+ void
+ SiS_LockCRT2(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension,USHORT BaseAddr)
+ {
+   if(HwDeviceExtension->jChipType >= SIS_315H)
+-    	SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x2F,0xFE);
++     SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x2F,0xFE);
+   else
+-     	SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x24,0xFE);
++     SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x24,0xFE);
+ }
+ 
+ void
+@@ -4872,7 +5030,6 @@ SiS_EnableCRT2(SiS_Private *SiS_Pr)
+   SiS_SetRegOR(SiS_Pr->SiS_P3c4,0x1E,0x20);
+ }
+ 
+-/* Checked against all BIOSes */
+ void
+ SiS_DisableBridge(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension,USHORT BaseAddr)
+ {
+@@ -4882,9 +5039,9 @@ SiS_DisableBridge(SiS_Private *SiS_Pr, P
+   USHORT temp=0;
+   UCHAR *ROMAddr = HwDeviceExtension->pjVirtualRomBase;
+ 
+-  if (SiS_Pr->SiS_IF_DEF_LVDS == 0) {
++  if(SiS_Pr->SiS_IF_DEF_LVDS == 0) {
+ 
+-      if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {   /* ===== TW: For 30xB/LV ===== */
++      if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {   /* ===== For 30xB/LV ===== */
+ 
+         if(HwDeviceExtension->jChipType < SIS_315H) {
+ 
+@@ -4940,9 +5097,9 @@ SiS_DisableBridge(SiS_Private *SiS_Pr, P
+ 
+         } else {
+ 
+-#ifdef SIS315H	   /* 310/325 series */
++#ifdef SIS315H	   /* 315 series */
+ 
+-           if(IS_SIS650740) {		/* 650, 740 */
++           if(IS_SIS550650740660) {		/* 550, 650, 740, 660 */
+ 
+ #if 0
+ 	      if(SiS_GetReg1(SiS_Pr->SiS_Part4Port,0x00) != 1) return;	/* From 1.10.7w */
+@@ -4950,40 +5107,67 @@ SiS_DisableBridge(SiS_Private *SiS_Pr, P
+ 
+ 	      modenum = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x34);
+ 
+-              if(SiS_Pr->SiS_VBType & VB_SIS301LV302LV) {
++              if(SiS_Pr->SiS_VBType & VB_SIS301LV302LV) {			/* LV */
+ 	      
+ 	         SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x30,0x00);
+ 		 
+ 		 if( (modenum <= 0x13) ||
+ 		     (!(SiS_IsDualEdge(SiS_Pr,HwDeviceExtension, BaseAddr))) ||
+ 		     (SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) ) {
+-	     	      SiS_SetRegANDOR(SiS_Pr->SiS_Part4Port,0x26,0xFE,0x00);
++	     	      SiS_SetRegAND(SiS_Pr->SiS_Part4Port,0x26,0xFE);
++		      if(SiS_Pr->SiS_CustomT == CUT_COMPAQ1280) {
++		         SiS_SetPanelDelay(SiS_Pr,ROMAddr, HwDeviceExtension, 3);
++		      }
+ 	         }
+-		 SiS_DDC2Delay(SiS_Pr,0xff00);
+-		 SiS_DDC2Delay(SiS_Pr,0x6000);
+-		 SiS_DDC2Delay(SiS_Pr,0x8000);
+ 
+-	         SiS_SetReg3(SiS_Pr->SiS_P3c6,0x00);
++		 if(SiS_Pr->SiS_CustomT != CUT_COMPAQ1280) {
++		    SiS_DDC2Delay(SiS_Pr,0xff00);
++		    SiS_DDC2Delay(SiS_Pr,0x6000);
++		    SiS_DDC2Delay(SiS_Pr,0x8000);
+ 
+-                 pushax = SiS_GetReg1(SiS_Pr->SiS_P3c4,0x06);
+-		 
+-		 if(IS_SIS740) {
+-		    SiS_SetRegAND(SiS_Pr->SiS_P3c4,0x06,0xE3);
++	            SiS_SetReg3(SiS_Pr->SiS_P3c6,0x00);
++
++                    pushax = SiS_GetReg1(SiS_Pr->SiS_P3c4,0x06);
++
++		    if(IS_SIS740) {
++		       SiS_SetRegAND(SiS_Pr->SiS_P3c4,0x06,0xE3);
++		    }
++
++	            SiS_SetPanelDelay(SiS_Pr,ROMAddr, HwDeviceExtension, 3);
++
++		    if(!(IS_SIS740)) {
++		       if(!(SiS_IsNotM650or651(SiS_Pr,HwDeviceExtension, BaseAddr))) {
++	                  tempah = 0xef;
++	                  if(SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) {
++	                     tempah = 0xf7;
++                          }
++	                  SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x4c,tempah);
++		       }
++	            }
+ 		 }
+ 
+-	         SiS_SetPanelDelay(SiS_Pr,ROMAddr, HwDeviceExtension, 3);
+-		 
+-		 if(!(SiS_IsNotM650or651(SiS_Pr,HwDeviceExtension, BaseAddr))) {
+-	            tempah = 0xef;
+-	            if(SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) {
+-	               tempah = 0xf7;
+-                    }
+-	            SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x4c,tempah);
+-	         }
++              } else if(SiS_Pr->SiS_VBType & VB_NoLCD) {			/* B-DH */
++	         /* This is actually bullshit. The B-DH bridge has cetainly no
++		  * Part4 Index 26, since it has no ability to drive LCD panels
++		  * at all. But as the BIOS does it, we do it, too...
++		  */
++	         if(HwDeviceExtension->jChipType == SIS_650) {
++	            if(!(SiS_IsNotM650or651(SiS_Pr,HwDeviceExtension, BaseAddr))) {
++	               SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x4c,0xef);
++	            }
++		    if((!(SiS_IsDualEdge(SiS_Pr,HwDeviceExtension, BaseAddr))) ||
++		       (SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) ) {
++	     	       SiS_SetRegANDOR(SiS_Pr->SiS_Part4Port,0x26,0xFE,0x00);
++	            }
++		    SiS_SetPanelDelay(SiS_Pr, ROMAddr, HwDeviceExtension, 3);
++		 }
++	      }
+ 
+-              }
++	      if(SiS_Pr->SiS_CustomT == CUT_COMPAQ1280) {
++	         SiS_SetRegAND(SiS_Pr->SiS_Part4Port,0x1F,0xef);
++	      }
+ 
+-              if(SiS_Pr->SiS_VBType & VB_SIS301B302B) {
++              if((SiS_Pr->SiS_VBType & VB_SIS301B302B) || (SiS_Pr->SiS_CustomT == CUT_COMPAQ1280)) {
+ 	         tempah = 0x3f;
+ 	         if(SiS_IsDualEdge(SiS_Pr,HwDeviceExtension, BaseAddr)) {
+ 	            tempah = 0x7f;
+@@ -4997,7 +5181,7 @@ SiS_DisableBridge(SiS_Private *SiS_Pr, P
+               if((SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) ||
+ 	         ((SiS_Pr->SiS_VBType & VB_SIS301LV302LV) && (modenum <= 0x13))) {
+ 
+-	         if(SiS_Pr->SiS_VBType & VB_SIS301B302B) {
++	         if((SiS_Pr->SiS_VBType & VB_SIS301B302B) || (SiS_Pr->SiS_CustomT == CUT_COMPAQ1280)) {
+ 		    SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x1E,0xDF);
+ 		    SiS_DisplayOff(SiS_Pr);
+ 		    SiS_SetRegAND(SiS_Pr->SiS_P3c4,0x32,0xDF);
+@@ -5020,7 +5204,7 @@ SiS_DisableBridge(SiS_Private *SiS_Pr, P
+ 
+ 	      } else {
+ 
+-	         if(SiS_Pr->SiS_VBType & VB_SIS301B302B) {
++	         if((SiS_Pr->SiS_VBType & VB_SIS301B302B) || (SiS_Pr->SiS_CustomT == CUT_COMPAQ1280)) {
+ 		    if(!(SiS_IsDualEdge(SiS_Pr,HwDeviceExtension, BaseAddr))) {
+ 		       SiS_SetRegAND(SiS_Pr->SiS_Part2Port,0x00,0xdf);
+ 		       SiS_DisplayOff(SiS_Pr);
+@@ -5044,10 +5228,10 @@ SiS_DisableBridge(SiS_Private *SiS_Pr, P
+ 
+ 	      }
+ 
+-	      if(SiS_Pr->SiS_VBType & VB_SIS301LV302LV) {
++	      if((SiS_Pr->SiS_VBType & VB_SIS301LV302LV) && (SiS_Pr->SiS_CustomT != CUT_COMPAQ1280)) {
++
++		 SiS_SetRegAND(SiS_Pr->SiS_Part4Port,0x1f,~0x10);    		/* 1.10.8r, 8m */
+ 
+-		 SiS_SetRegAND(SiS_Pr->SiS_Part4Port,0x1f,~0x10);    /* 1.10.8r */
+-		 
+ 	         tempah = 0x3f;
+ 	         if(SiS_IsDualEdge(SiS_Pr,HwDeviceExtension, BaseAddr)) {
+ 	            tempah = 0x7f;
+@@ -5057,9 +5241,9 @@ SiS_DisableBridge(SiS_Private *SiS_Pr, P
+ 	         }
+ 	         SiS_SetRegAND(SiS_Pr->SiS_Part4Port,0x1F,tempah);
+ 
+-		 if(SiS_IsNotM650or651(SiS_Pr,HwDeviceExtension, BaseAddr)) {   /* 1.10.8r */
++		 if(SiS_IsNotM650or651(SiS_Pr,HwDeviceExtension, BaseAddr)) {   /* 1.10.8r, 8m */
+ 	            SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x2e,0x7f);
+-		 }								/* 1.10.8r */
++		 }								/* 1.10.8r, 8m */
+ 
+ 	         if(!(SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr))) {
+ 	            SiS_SetRegAND(SiS_Pr->SiS_Part2Port,0x00,0xdf);
+@@ -5075,80 +5259,47 @@ SiS_DisableBridge(SiS_Private *SiS_Pr, P
+ 
+ 	         SiS_SetReg1(SiS_Pr->SiS_P3c4,0x06,pushax);
+ 
+-  	      }
++  	      } else if(SiS_Pr->SiS_VBType & VB_NoLCD) {
+ 
+-#if 0
+-          } else if(IS_SIS740) {	/* 740 */
+-	  
+-	     if(SiS_Pr->SiS_VBType & VB_SIS301LV302LV) {   /* 30xLV */
+-	     
+-	        if( (!(SiS_IsDualEdge(SiS_Pr,HwDeviceExtension, BaseAddr))) ||
+-		    (SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) ) {
+-	     	      SiS_SetRegANDOR(SiS_Pr->SiS_Part4Port,0x26,0xFE,0x00);
+-	        }
+-		
+-		SiS_SetReg3(SiS_Pr->SiS_P3c6,0x00);
++	         if(HwDeviceExtension->jChipType == SIS_650) {
++		    if((SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) ||
++		       (!(SiS_IsDualEdge(SiS_Pr,HwDeviceExtension, BaseAddr)))) {
++		       if((!(SiS_WeHaveBacklightCtrl(SiS_Pr,HwDeviceExtension, BaseAddr))) ||
++		          (!(SiS_CRT2IsLCD(SiS_Pr,BaseAddr,HwDeviceExtension)))) {
++			  SiS_SetPanelDelay(SiS_Pr, ROMAddr, HwDeviceExtension, 2);
++	     	          SiS_SetRegAND(SiS_Pr->SiS_Part4Port,0x26,0xFD);
++			  SiS_SetPanelDelay(SiS_Pr, ROMAddr, HwDeviceExtension, 4);
++	               }
++		    }
++		 }
+ 
+-                pushax = SiS_GetReg1(SiS_Pr->SiS_P3c4,0x06);
+-		
+-		SiS_SetRegAND(SiS_Pr->SiS_P3c4,0x06,0xE3);
++	      } else if((SiS_Pr->SiS_VBType & VB_SIS301B302B) || (SiS_Pr->SiS_CustomT == CUT_COMPAQ1280)) {
+ 
+-	        SiS_SetPanelDelay(SiS_Pr,ROMAddr, HwDeviceExtension, 3);
+-		
+-		if(SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) {
+-		   SiS_DisplayOff(SiS_Pr);
+-	           SiS_SetPanelDelay(SiS_Pr,ROMAddr, HwDeviceExtension, 2);
+-	           SiS_SetRegAND(SiS_Pr->SiS_P3c4,0x32,0xDF);
+-	           SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x1E,0xDF);
+-		} else {
+-		   SiS_DisplayOff(SiS_Pr);
+-	           SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x00,0x80);
+-	           SiS_SetPanelDelay(SiS_Pr,ROMAddr, HwDeviceExtension, 2);
+-	           SiS_SetRegAND(SiS_Pr->SiS_P3c4,0x32,0xDF);
+-	           temp = SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x00);
+-                   SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x00,0x10);
+-	           SiS_SetRegAND(SiS_Pr->SiS_P3c4,0x1E,0xDF);
+-	           SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x00,temp);
+-		}
+-		
+-		SiS_SetRegAND(SiS_Pr->SiS_Part4Port,0x1F,0x3F);
+-		SiS_SetRegAND(SiS_Pr->SiS_Part4Port,0x1F,0xEF);  /* (from 650) */
+-		
+-		SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x2e,0x7f);
+-		
+-		if(!(SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr))) {
+-	           SiS_SetRegAND(SiS_Pr->SiS_Part2Port,0x00,0xdf);
+-	        }
+-		
+-		if(!(SiS_WeHaveBacklightCtrl(SiS_Pr,HwDeviceExtension, BaseAddr))) {
+-		   if(!(SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr))) {
+-	              if(!(SiS_CRT2IsLCD(SiS_Pr,BaseAddr,HwDeviceExtension))) {
+-	                 if(!(SiS_IsDualEdge(SiS_Pr,HwDeviceExtension, BaseAddr))) {
+-		            SiS_SetRegANDOR(SiS_Pr->SiS_Part4Port,0x26,0xFD,0x00);
+-                         }
+-                      }
+-	           }
+-		}
+-	        SiS_SetReg1(SiS_Pr->SiS_P3c4,0x06,pushax);
+-	     
+-	     } else {	/* (301,) 301B */
+-	  
+-	        if(SiS_Is301B(SiS_Pr,BaseAddr)) {
+-	           SiS_SetRegAND(SiS_Pr->SiS_Part4Port,0x1F,0x3F);
+-	        }
+-	     
+-	        SiS_SetRegAND(SiS_Pr->SiS_Part2Port,0x00,0xDF);
+-	        SiS_DisplayOff(SiS_Pr);
+-	        SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x00,0x80);
+-	        SiS_SetRegAND(SiS_Pr->SiS_P3c4,0x32,0xDF);
++	         if(HwDeviceExtension->jChipType == SIS_650) {
++		    if(!(SiS_IsNotM650or651(SiS_Pr,HwDeviceExtension, BaseAddr))) {
++	               tempah = 0xef;
++	               if(SiS_IsDualEdge(SiS_Pr,HwDeviceExtension, BaseAddr)) {
++		          if(modenum > 0x13) {
++	                     tempah = 0xf7;
++			  }
++                       }
++	               SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x4c,tempah);
++		    }
++		    if(SiS_Pr->SiS_CustomT == CUT_COMPAQ1280) {
++		       if((SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) ||
++		          (!(SiS_IsDualEdge(SiS_Pr,HwDeviceExtension, BaseAddr)))) {
++		          if((!(SiS_WeHaveBacklightCtrl(SiS_Pr,HwDeviceExtension, BaseAddr))) ||
++		             (!(SiS_CRT2IsLCD(SiS_Pr,BaseAddr,HwDeviceExtension)))) {
++			     SiS_SetPanelDelay(SiS_Pr, ROMAddr, HwDeviceExtension, 2);
++	     	             SiS_SetRegAND(SiS_Pr->SiS_Part4Port,0x26,0xFD);
++			     SiS_SetPanelDelay(SiS_Pr, ROMAddr, HwDeviceExtension, 4);
++	                  }
++		       }
++		    }
++		 }
++
++	      }
+ 
+-	        temp = SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x00);
+-                SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x00,0x10);
+-	        SiS_SetRegAND(SiS_Pr->SiS_P3c4,0x1E,0xDF);
+-	        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x00,temp);
+-		
+-	     }
+-#endif	  
+ 	  } else {			/* 315, 330 - all bridge types */
+ 
+ 	     if(SiS_Is301B(SiS_Pr,BaseAddr)) {
+@@ -5193,13 +5344,13 @@ SiS_DisableBridge(SiS_Private *SiS_Pr, P
+ 
+ 	}
+ 
+-      } else {     /* ============ TW: For 301 ================ */
++      } else {     /* ============ For 301 ================ */
+ 
+         if(HwDeviceExtension->jChipType < SIS_315H) {
+-            if(SiS_CRT2IsLCD(SiS_Pr,BaseAddr,HwDeviceExtension)) {
+-                SiS_SetRegANDOR(SiS_Pr->SiS_P3c4,0x11,0xF0,0x0B);
+-	        SiS_SetPanelDelay(SiS_Pr, ROMAddr, HwDeviceExtension, 1);
+-	    }
++            if(!(SiS_CR36BIOSWord23b(SiS_Pr,HwDeviceExtension))) {
++	      SiS_SetRegANDOR(SiS_Pr->SiS_P3c4,0x11,0xF7,0x08);
++	      SiS_SetPanelDelay(SiS_Pr,ROMAddr, HwDeviceExtension, 3);
++	   }
+ 	}
+ 
+         SiS_SetRegAND(SiS_Pr->SiS_Part2Port,0x00,0xDF);           /* disable VB */
+@@ -5218,18 +5369,23 @@ SiS_DisableBridge(SiS_Private *SiS_Pr, P
+ 	    SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x00,temp);
+ 	} else {
+             SiS_SetRegAND(SiS_Pr->SiS_P3c4,0x1E,0xDF);            /* disable CRT2 */
++	    if( (!(SiS_CRT2IsLCD(SiS_Pr,BaseAddr,HwDeviceExtension))) ||
++	        (!(SiS_CR36BIOSWord23d(SiS_Pr,HwDeviceExtension))) ) {
++		SiS_SetPanelDelay(SiS_Pr,ROMAddr, HwDeviceExtension, 2);
++		SiS_SetRegANDOR(SiS_Pr->SiS_P3c4,0x11,0xFB,0x04);
++	    }
+ 	}
+ 
+       }
+ 
+-  } else {     /* ============ TW: For LVDS =============*/
++  } else {     /* ============ For LVDS =============*/
+ 
+     if(HwDeviceExtension->jChipType < SIS_315H) {
+ 
+ #ifdef SIS300	/* 300 series */
+ 
+ 	if(SiS_Pr->SiS_IF_DEF_CH70xx == 1) {
+-	    SiS_SetCH700x(SiS_Pr,0x090E);
++	   SiS_SetCH700x(SiS_Pr,0x090E);
+ 	}
+ 
+ 	if(HwDeviceExtension->jChipType == SIS_730) {
+@@ -5245,17 +5401,17 @@ SiS_DisableBridge(SiS_Private *SiS_Pr, P
+ 
+ 	      if(!(SiS_GetReg1(SiS_Pr->SiS_P3c4,0x13) & 0x40)) {
+   
+-  	          if(!(SiS_CR36BIOSWord23b(SiS_Pr,HwDeviceExtension))) {
++  	         if(!(SiS_CR36BIOSWord23b(SiS_Pr,HwDeviceExtension))) {
+ 
+-                     SiS_WaitVBRetrace(SiS_Pr,HwDeviceExtension);
++                    SiS_WaitVBRetrace(SiS_Pr,HwDeviceExtension);
+ 
+-		     if(!(SiS_GetReg1(SiS_Pr->SiS_P3c4,0x06) & 0x1c)) {
+-		         SiS_DisplayOff(SiS_Pr);
+-	             }
++		    if(!(SiS_GetReg1(SiS_Pr->SiS_P3c4,0x06) & 0x1c)) {
++		        SiS_DisplayOff(SiS_Pr);
++	            }
+ 
+-	             SiS_SetRegANDOR(SiS_Pr->SiS_P3c4,0x11,0xF7,0x08);
+-	             SiS_SetPanelDelay(SiS_Pr,ROMAddr, HwDeviceExtension, 3);
+-                  }
++	            SiS_SetRegANDOR(SiS_Pr->SiS_P3c4,0x11,0xF7,0x08);
++	            SiS_SetPanelDelay(SiS_Pr,ROMAddr, HwDeviceExtension, 3);
++                 }
+               }
+ 	   }
+ 	}
+@@ -5279,29 +5435,40 @@ SiS_DisableBridge(SiS_Private *SiS_Pr, P
+ 
+     } else {
+ 
+-#ifdef SIS315H	/* 310/325 series */
++#ifdef SIS315H	/* 315 series */
+ 
+ 	if(SiS_Pr->SiS_IF_DEF_CH70xx != 0) {
+-		temp = SiS_GetCH701x(SiS_Pr,0x61);
+-		if(temp < 1) {
+-		   SiS_SetCH701x(SiS_Pr,0xac76);
+-		   SiS_SetCH701x(SiS_Pr,0x0066);
+-		}
+-		
+-		if(!(SiS_IsDualEdge(SiS_Pr,HwDeviceExtension, BaseAddr))) {
++
++		if(HwDeviceExtension->jChipType == SIS_740) {
++		   temp = SiS_GetCH701x(SiS_Pr,0x61);
++		   if(temp < 1) {
++		      SiS_SetCH701x(SiS_Pr,0xac76);
++		      SiS_SetCH701x(SiS_Pr,0x0066);
++		   }
++
++		   if(!(SiS_IsDualEdge(SiS_Pr,HwDeviceExtension, BaseAddr))) {
+ 			SiS_SetCH701x(SiS_Pr,0x3e49);
+-		} else if(SiS_IsTVOrYPbPrOrScart(SiS_Pr,HwDeviceExtension, BaseAddr))  {
++		   } else if(SiS_IsTVOrYPbPrOrScart(SiS_Pr,HwDeviceExtension, BaseAddr))  {
+ 			SiS_SetCH701x(SiS_Pr,0x3e49);
++		   }
+ 		}
+-		
++
+ 		if(!(SiS_IsDualEdge(SiS_Pr,HwDeviceExtension, BaseAddr))) {
+ 			SiS_Chrontel701xBLOff(SiS_Pr);
+-			SiS_Chrontel701xOff(SiS_Pr);
++			SiS_Chrontel701xOff(SiS_Pr,HwDeviceExtension);
+ 		} else if(SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) {
+ 			SiS_Chrontel701xBLOff(SiS_Pr);
+-			SiS_Chrontel701xOff(SiS_Pr);
++			SiS_Chrontel701xOff(SiS_Pr,HwDeviceExtension);
+ 		}
+-		
++
++		if(HwDeviceExtension->jChipType != SIS_740) {
++		   if(!(SiS_IsDualEdge(SiS_Pr,HwDeviceExtension, BaseAddr))) {
++			SiS_SetCH701x(SiS_Pr,0x0149);
++		   } else if(SiS_IsTVOrYPbPrOrScart(SiS_Pr,HwDeviceExtension, BaseAddr))  {
++			SiS_SetCH701x(SiS_Pr,0x0149);
++		   }
++		}
++
+ 	}
+ 
+ 	if(SiS_Pr->SiS_IF_DEF_CH70xx == 0) {
+@@ -5325,6 +5492,10 @@ SiS_DisableBridge(SiS_Private *SiS_Pr, P
+ 		SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x00,0x80);
+ 	}
+ 
++	if(HwDeviceExtension->jChipType == SIS_740) {
++	   SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x2e,0x7f);
++	}
++
+ 	SiS_SetRegAND(SiS_Pr->SiS_P3c4,0x32,0xDF);
+ 
+ 	if(SiS_Pr->SiS_IF_DEF_CH70xx == 0) {
+@@ -5337,15 +5508,27 @@ SiS_DisableBridge(SiS_Private *SiS_Pr, P
+ 
+ 	if(SiS_Pr->SiS_IF_DEF_CH70xx == 0) {
+ 	        if(SiS_CRT2IsLCD(SiS_Pr, BaseAddr,HwDeviceExtension)) {
+-			SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x1e,0xdf);
++		   SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x1e,0xdf);
++		   if(HwDeviceExtension->jChipType == SIS_550) {
++		      SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x1e,0xbf);
++		      SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x1e,0xef);
++		   }
++		}
++	} else {
++	   if(HwDeviceExtension->jChipType == SIS_740) {
++	        if(SiS_IsLCDOrLCDA(SiS_Pr,HwDeviceExtension, BaseAddr)) {
++		   SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x1e,0xdf);
+ 		}
+-	} else if(SiS_IsLCDOrLCDA(SiS_Pr,HwDeviceExtension, BaseAddr)) {
+-		SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x1e,0xdf);
++	   } else {
++	        if(SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) {
++		   SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x1e,0xdf);
++	        }
++	   }
+ 	}
+ 
+ 	if(SiS_Pr->SiS_IF_DEF_CH70xx != 0) {
+ 	    	if(SiS_IsDualEdge(SiS_Pr,HwDeviceExtension, BaseAddr)) {
+-			SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x13,0xff);
++			/* SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x13,0xff); */
+ 		} else {
+ 			SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x13,0xfb);
+ 		}
+@@ -5353,7 +5536,10 @@ SiS_DisableBridge(SiS_Private *SiS_Pr, P
+ 
+ 	SiS_UnLockCRT2(SiS_Pr,HwDeviceExtension, BaseAddr);
+ 
+-	if(SiS_Pr->SiS_IF_DEF_CH70xx == 0) {
++	if(HwDeviceExtension->jChipType == SIS_550) {
++	        SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x01,0x80);
++		SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x02,0x40);
++	} else if(SiS_Pr->SiS_IF_DEF_CH70xx == 0) {
+ 		SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x2e,0xf7);
+ 	} else if(!(SiS_IsDualEdge(SiS_Pr,HwDeviceExtension, BaseAddr))) {
+ 		SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x2e,0xf7);
+@@ -5361,7 +5547,7 @@ SiS_DisableBridge(SiS_Private *SiS_Pr, P
+ 		SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x2e,0xf7);
+ 	}
+ 
+-#if 0  /* TW: BIOS code makes no sense */
++#if 0  /* BIOS code makes no sense */
+        if(SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) {
+            if(!(SiS_IsDualEdge(SiS_Pr,HwDeviceExtension, BaseAddr))) {
+ 	        if(SiS_WeHaveBacklightCtrl(SiS_Pr,HwDeviceExtension, BaseAddr)) {
+@@ -5387,7 +5573,6 @@ SiS_DisableBridge(SiS_Private *SiS_Pr, P
+ 
+ }
+ 
+-/* TW: Checked against all BIOSes */
+ void
+ SiS_EnableBridge(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension, USHORT BaseAddr)
+ {
+@@ -5400,7 +5585,7 @@ SiS_EnableBridge(SiS_Private *SiS_Pr, PS
+ 
+   if(SiS_Pr->SiS_IF_DEF_LVDS == 0) {
+ 
+-    if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {   /* TW: ====== For 301B et al  ====== */
++    if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {   /* ====== For 301B et al  ====== */
+ 
+       if(HwDeviceExtension->jChipType < SIS_315H) {
+ 
+@@ -5497,48 +5682,95 @@ SiS_EnableBridge(SiS_Private *SiS_Pr, PS
+ 
+       } else {
+ 
+-#ifdef SIS315H    /* 310/325 series */
++#ifdef SIS315H    /* 315 series */
+ 
+-	 if(IS_SIS650740) {		/* 650 */
++	 if(IS_SIS550650740660) {		/* 550, 650, 740, 660 */
+ 
+ #if 0
+ 	    if(SiS_GetReg1(SiS_Pr->SiS_Part4Port,0x00) != 1) return;	/* From 1.10.7w */
+ #endif
+ 
+ 	    if(SiS_Pr->SiS_VBType & VB_SIS301LV302LV) {
+-	    
+-	       SiS_SetRegAND(SiS_Pr->SiS_Part4Port,0x1f,0xef);  /* 1.10.7u */
+-	       SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x30,0x00);    /* 1.10.7u */
++
++	       if(SiS_Pr->SiS_CustomT != CUT_COMPAQ1280) {
++	          SiS_SetRegAND(SiS_Pr->SiS_Part4Port,0x1f,0xef);  /* 1.10.7u */
++	          SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x30,0x00);    /* 1.10.7u */
++	       }
+ 
+ 	       if(!(IS_SIS740)) {
+                   if(!(SiS_IsNotM650or651(SiS_Pr,HwDeviceExtension, BaseAddr))) {
+ 	             tempah = 0x10;
+-	             if(SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) {
+-	                tempah = 0x08;
+-                     }
+-	             SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x4c,tempah);
++		     if(SiS_Pr->SiS_CustomT == CUT_COMPAQ1280) {
++		        if(SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x13) & 0x04) {
++			   if((SiS_GetReg1(SiS_Pr->SiS_Part2Port,0x00) & 0x0f) == 0x0c) {
++			      tempah = 0x08;
++			   } else {
++			      tempah = 0x18;
++			   }
++			}
++			SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x4c,tempah);
++		     } else {
++	                if(SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) {
++	                   tempah = 0x08;
++                        }
++			SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x4c,tempah);
++		     }
+ 	          }
+ 	       }
+ 
+-	       SiS_SetReg3(SiS_Pr->SiS_P3c6,0x00);
+-	       SiS_DisplayOff(SiS_Pr);
+-	       pushax = SiS_GetReg1(SiS_Pr->SiS_P3c4,0x06);
+-	       if(IS_SIS740) {
+-	          SiS_SetRegAND(SiS_Pr->SiS_P3c4,0x06,0xE3);
++	       if(SiS_Pr->SiS_CustomT != CUT_COMPAQ1280) {
++	          SiS_SetReg3(SiS_Pr->SiS_P3c6,0x00);
++	          SiS_DisplayOff(SiS_Pr);
++	          pushax = SiS_GetReg1(SiS_Pr->SiS_P3c4,0x06);
++	          if(IS_SIS740) {
++	             SiS_SetRegAND(SiS_Pr->SiS_P3c4,0x06,0xE3);
++	          }
+ 	       }
+ 
+ 	       if( (SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) ||
+ 	           (SiS_CRT2IsLCD(SiS_Pr,BaseAddr,HwDeviceExtension)) ) {
+-                   if(!(SiS_GetReg1(SiS_Pr->SiS_Part4Port,0x26) & 0x02)) {
+-		      SiS_SetPanelDelayLoop(SiS_Pr,ROMAddr, HwDeviceExtension, 3, 2);
+-		      SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x26,0x02);
+-	              SiS_SetPanelDelayLoop(SiS_Pr,ROMAddr, HwDeviceExtension, 3, 2);
+-	           }
++                  if(!(SiS_GetReg1(SiS_Pr->SiS_Part4Port,0x26) & 0x02)) {
++		     if(SiS_Pr->SiS_CustomT != CUT_COMPAQ1280) {
++		        SiS_SetPanelDelayLoop(SiS_Pr,ROMAddr, HwDeviceExtension, 3, 2);
++		     }
++		     SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x26,0x02);
++	             SiS_SetPanelDelayLoop(SiS_Pr,ROMAddr, HwDeviceExtension, 3, 2);
++	          }
++	       }
++
++               if(SiS_Pr->SiS_CustomT != CUT_COMPAQ1280) {
++	          if(!(SiS_GetReg1(SiS_Pr->SiS_P3d4,0x31) & 0x40)) {
++                     SiS_SetPanelDelayLoop(SiS_Pr,ROMAddr, HwDeviceExtension, 3, 10);
++		     delaylong = TRUE;
++		  }
++	       }
++
++	    } else if(SiS_Pr->SiS_VBType & VB_NoLCD) {
++
++	       if(HwDeviceExtension->jChipType == SIS_650) {
++	          if(!(SiS_IsNotM650or651(SiS_Pr,HwDeviceExtension, BaseAddr))) {
++	             SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x4c,0x10);
++	          }
++		  if( (SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) ||
++		      (SiS_CRT2IsLCD(SiS_Pr,BaseAddr,HwDeviceExtension)) ) {
++		     SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x26,0x02);
++		     SiS_SetPanelDelay(SiS_Pr,ROMAddr, HwDeviceExtension, 0);
++		  }
+ 	       }
+ 
+-	       if(!(SiS_GetReg1(SiS_Pr->SiS_P3d4,0x31) & 0x40)) {
+-                  SiS_SetPanelDelayLoop(SiS_Pr,ROMAddr, HwDeviceExtension, 3, 10);
+-		  delaylong = TRUE;
++  	    } else if(SiS_Pr->SiS_VBType & VB_SIS301B302B) {
++
++	       if(HwDeviceExtension->jChipType == SIS_650) {
++		  if(!(SiS_IsNotM650or651(SiS_Pr,HwDeviceExtension, BaseAddr))) {
++	             tempah = 0x10;
++		     if(SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x13) & 0x04) {
++		        tempah = 0x18;
++		        if((SiS_GetReg1(SiS_Pr->SiS_Part2Port,0x00) & 0x0f) == 0x0c) {
++			   tempah = 0x08;
++			}
++		     }
++	             SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x4c,tempah);
++		  }
+ 	       }
+ 
+ 	    }
+@@ -5547,13 +5779,17 @@ SiS_EnableBridge(SiS_Private *SiS_Pr, PS
+                temp = SiS_GetReg1(SiS_Pr->SiS_P3c4,0x32) & 0xDF;
+ 	       if(SiS_BridgeInSlave(SiS_Pr)) {
+                   tempah = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x30);
+-                  if(!(tempah & SetCRT2ToRAMDAC))  temp |= 0x20;
++                  if(!(tempah & SetCRT2ToRAMDAC)) {
++		     if(SiS_Pr->SiS_CustomT == CUT_COMPAQ1280) {
++		        if(!(SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x13) & 0x04)) temp |= 0x20;
++		     } else temp |= 0x20;
++		  }
+                }
+                SiS_SetReg1(SiS_Pr->SiS_P3c4,0x32,temp);
+ 
+ 	       SiS_SetRegOR(SiS_Pr->SiS_P3c4,0x1E,0x20);                   /* enable CRT2 */
+ 	       
+-	       if(SiS_Pr->SiS_VBType & VB_SIS301B302B) {
++	       if((SiS_Pr->SiS_VBType & VB_SIS301B302B) || (SiS_Pr->SiS_CustomT == CUT_COMPAQ1280)) {
+ 	          SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x2e,0x7f);
+ 		  temp = SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x2e);
+ 		  if(!(temp & 0x80)) {
+@@ -5565,12 +5801,12 @@ SiS_EnableBridge(SiS_Private *SiS_Pr, PS
+ 	    }
+ 
+ 	    if(SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) {
+-	          SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x1e,0x20);
++	       SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x1e,0x20);
+ 	    }
+ 
+ 	    SiS_SetRegANDOR(SiS_Pr->SiS_Part2Port,0x00,0x1f,0x20);
+ 
+-	    if(SiS_Pr->SiS_VBType & VB_SIS301B302B) {
++	    if((SiS_Pr->SiS_VBType & VB_SIS301B302B) || (SiS_Pr->SiS_CustomT == CUT_COMPAQ1280)) {
+ 	       temp = SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x2e);
+ 	       if(!(temp & 0x80)) {
+ 		  SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x2e,0x80);
+@@ -5586,7 +5822,9 @@ SiS_EnableBridge(SiS_Private *SiS_Pr, PS
+ 	    }
+             SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x1F,tempah);
+ 
+-	    if(SiS_Pr->SiS_VBType & VB_SIS301B302B) {
++	    if((SiS_Pr->SiS_VBType & VB_SIS301B302B) ||
++	       ((SiS_Pr->SiS_CustomT == CUT_COMPAQ1280) &&
++	        (!(SiS_WeHaveBacklightCtrl(SiS_Pr,HwDeviceExtension, BaseAddr))))) {
+                SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x00,0x7f);
+ 	    }
+ 
+@@ -5595,186 +5833,144 @@ SiS_EnableBridge(SiS_Private *SiS_Pr, PS
+ 	       SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x30,0x00);	/* All this from 1.10.7u */
+ 	       SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x27,0x0c);
+ 	       SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x30,0x20);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x31,0x05);  
+-	       SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x32,0x60);  
+-	       SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x33,0x00);  
+-	       SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x34,0x10); 
+-	       SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x30,0x40); 
+-	       
+-	       SiS_SetPanelDelay(SiS_Pr,ROMAddr, HwDeviceExtension, 2);
+-	    
++
++	       if(SiS_Pr->SiS_CustomT == CUT_COMPAQ1280) {
++
++		  SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x31,0x08);
++	          SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x32,0x10);
++	          SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x33,0x4d);
++		  if((SiS_GetReg1(SiS_Pr->SiS_P3d4,0x36) & 0x0f) != 0x02) {
++		     SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x31,0x0d);
++	             SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x32,0x70);
++	             SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x33,0x6b);
++		  }
++		  SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x34,0x10);
++
++	       } else {
++
++	          SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x31,0x12);
++	          SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x32,0xd0);
++	          SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x33,0x6b);
++	          if((SiS_GetReg1(SiS_Pr->SiS_P3d4,0x36) & 0x0f) == 0x02) {   /* @@@@ really == ? */
++	             SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x31,0x0d);
++	             SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x32,0x70);
++	             SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x33,0x40);
++		     if(((SiS_GetReg1(SiS_Pr->SiS_P3d4,0x36) & 0xf0) != 0x03)) {
++		        SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x31,0x05);
++	                SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x32,0x60);
++	                SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x33,0x33);  /* 00 */
++		     }
++	          }
++	          SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x34,0x10);
++	          if((SiS_GetReg1(SiS_Pr->SiS_P3d4,0x36) & 0x0f) != 0x03) {
++	             SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x30,0x40);
++	          }
++	       }
++
++	       if(SiS_Pr->SiS_CustomT != CUT_COMPAQ1280) {
++	          SiS_SetPanelDelay(SiS_Pr,ROMAddr, HwDeviceExtension, 2);
++	       }
++
+ 	       SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x1f,0x10);  /* 1.10.8r */
+ 
+-	       SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x2e,0x80);
++	       if(SiS_Pr->SiS_CustomT == CUT_COMPAQ1280) {
+ 
+-	       if(!(SiS_WeHaveBacklightCtrl(SiS_Pr,HwDeviceExtension, BaseAddr))) {
+ 	          if( (SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) ||
+ 	              ((SiS_CRT2IsLCD(SiS_Pr,BaseAddr,HwDeviceExtension))) ) {
+-		    SiS_SetPanelDelayLoop(SiS_Pr,ROMAddr, HwDeviceExtension, 3, 10);
+-		    if(delaylong) {
+-			SiS_SetPanelDelayLoop(SiS_Pr,ROMAddr, HwDeviceExtension, 3, 10);
+-		    }
+-                    SiS_WaitVBRetrace(SiS_Pr,HwDeviceExtension);
+-		    SiS_SetRegANDOR(SiS_Pr->SiS_Part4Port,0x26,0xfe,0x01);
+-	         }
+-	      }
++		     SiS_DisplayOn(SiS_Pr);
++		     SiS_SetPanelDelay(SiS_Pr,ROMAddr, HwDeviceExtension, 1);
++		     SiS_WaitVBRetrace(SiS_Pr,HwDeviceExtension);
++		     SiS_SetPanelDelay(SiS_Pr,ROMAddr, HwDeviceExtension, 3);
++	             SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x30,0x40);
++		     if(!(SiS_WeHaveBacklightCtrl(SiS_Pr,HwDeviceExtension, BaseAddr))) {
++		        SiS_SetRegANDOR(SiS_Pr->SiS_Part4Port,0x26,0xfe,0x01);
++	  	     }
++		  }
+ 
+-	      SiS_SetReg1(SiS_Pr->SiS_P3c4,0x06,pushax);
+-	      SiS_DisplayOn(SiS_Pr);
+-	      SiS_SetReg3(SiS_Pr->SiS_P3c6,0xff);
++	       } else {
+ 
+-	      if(!(SiS_WeHaveBacklightCtrl(SiS_Pr,HwDeviceExtension, BaseAddr))) {
+-	          SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x00,0x7f);
+-	      }
+-#if 0
+-              SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x30,0x00);
+-	      SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x27,0x0c);
+-	      SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x30,0x20);
+-	      SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x31,0x05);   /* 1.10.8r: 0x0d */
+-	      SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x32,0x60);   /* 1.10.8r: 0x70 */
+-	      SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x33,0x00);   /* 1.10.8r: 0x40 */
+-	      SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x34,0x10); 
+-	      SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x30,0x40); 
+-#endif	      
++	          SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x2e,0x80);
+ 
+-	  }
++	          if(!(SiS_WeHaveBacklightCtrl(SiS_Pr,HwDeviceExtension, BaseAddr))) {
++	             if( (SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) ||
++	                 ((SiS_CRT2IsLCD(SiS_Pr,BaseAddr,HwDeviceExtension))) ) {
++		        SiS_SetPanelDelayLoop(SiS_Pr,ROMAddr, HwDeviceExtension, 3, 10);
++		        if(delaylong) {
++			   SiS_SetPanelDelayLoop(SiS_Pr,ROMAddr, HwDeviceExtension, 3, 10);
++		        }
++                        SiS_WaitVBRetrace(SiS_Pr,HwDeviceExtension);
++		        SiS_SetRegANDOR(SiS_Pr->SiS_Part4Port,0x26,0xfe,0x01);
++	             }
++	          }
+ 
+-#if 0
+-         } else if(IS_SIS740) {		/* 740 */
+-	 
+-	   if(SiS_Pr->SiS_VBType & VB_SIS301LV302LV) {  /* 30xLV */
+-	   
+-	      SiS_SetReg3(SiS_Pr->SiS_P3c6,0x00);
+-	      SiS_DisplayOff(SiS_Pr);
+-	      pushax = SiS_GetReg1(SiS_Pr->SiS_P3c4,0x06);
+-	      SiS_SetRegAND(SiS_Pr->SiS_P3c4,0x06,0xE3);
+-	      
+-	      if( (SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) ||
+-	          (SiS_CRT2IsLCD(SiS_Pr,BaseAddr,HwDeviceExtension)) ) {
+-                   if(!(SiS_GetReg1(SiS_Pr->SiS_Part4Port,0x26) & 0x02)) {
+-		      SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x26,0x02);
+-	              SiS_SetPanelDelay(SiS_Pr,ROMAddr, HwDeviceExtension, 3);
+-		   }
+-	      }
+-	      
+-	      if(!(SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr))) {
+-	         temp = SiS_GetReg1(SiS_Pr->SiS_P3c4,0x32) & 0xDF;
+-	         if(SiS_BridgeInSlave(SiS_Pr)) {
+-                    tempah = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x30);
+-                    if(!(tempah & SetCRT2ToRAMDAC))  temp |= 0x20;
+-                 }
+-                 SiS_SetReg1(SiS_Pr->SiS_P3c4,0x32,temp);
++	          SiS_SetReg1(SiS_Pr->SiS_P3c4,0x06,pushax);
++	          SiS_DisplayOn(SiS_Pr);
++	          SiS_SetReg3(SiS_Pr->SiS_P3c6,0xff);
+ 
+-	         SiS_SetRegOR(SiS_Pr->SiS_P3c4,0x1E,0x20);  	
+-		 SiS_SetPanelDelay(SiS_Pr,ROMAddr, HwDeviceExtension, 2);
+-	      }
+-	      
+-	      if(SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) {
+-	         SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x1E,0x20);
+-	      }
+-	      
+-	      SiS_SetRegANDOR(SiS_Pr->SiS_Part2Port,0x00,0x1f,0x20);
+-	      SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x1F,0xC0);
+-	      SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x1F,0x10);  /* (taken from 650 1.10.8r) */
+-	      SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x2E,0x80);
+-	      
+-	      if(!(SiS_WeHaveBacklightCtrl(SiS_Pr,HwDeviceExtension, BaseAddr))) {
+-	         if( (SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) ||
+-	             (SiS_CRT2IsLCD(SiS_Pr,BaseAddr,HwDeviceExtension)) ) {
+-		    SiS_SetPanelDelayLoop(SiS_Pr,ROMAddr, HwDeviceExtension, 3, 10);
+-		    if(SiS_GetReg1(SiS_Pr->SiS_P3d4,0x31) & 0x40) {
+-		       SiS_WaitVBRetrace(SiS_Pr,HwDeviceExtension);
+-		    }
+-		    SiS_SetRegANDOR(SiS_Pr->SiS_Part4Port,0x26,0xfe,0x01);
+-		    SiS_SetPanelDelayLoop(SiS_Pr,ROMAddr, HwDeviceExtension, 3, 10);
+-		    SiS_WaitVBRetrace(SiS_Pr,HwDeviceExtension);
+-	         }
+-              }
+-	      
+-	      SiS_SetReg1(SiS_Pr->SiS_P3c4,0x06,pushax);
+-	      SiS_DisplayOn(SiS_Pr);
+-	      SiS_SetReg3(SiS_Pr->SiS_P3c6,0xff);
+-	      
+-	      if(!(SiS_WeHaveBacklightCtrl(SiS_Pr,HwDeviceExtension, BaseAddr))) {
+-	         SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x00,0x7f);
+-	      }
+-	   
+-	   } else {	/* (301), 301B */
+-	 
+-	      if(!(SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr))) {
+-	         temp = SiS_GetReg1(SiS_Pr->SiS_P3c4,0x32) & 0xDF;
+-	         if(SiS_BridgeInSlave(SiS_Pr)) {
+-                    tempah = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x30);
+-                    if(!(tempah & SetCRT2ToRAMDAC))  temp |= 0x20;
+-                 }
+-                 SiS_SetReg1(SiS_Pr->SiS_P3c4,0x32,temp);
++	          if(!(SiS_WeHaveBacklightCtrl(SiS_Pr,HwDeviceExtension, BaseAddr))) {
++	             SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x00,0x7f);
++	          }
+ 
+-	         SiS_SetRegOR(SiS_Pr->SiS_P3c4,0x1E,0x20);                   /* enable CRT2 */
++	       }
+ 
+-	         temp = SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x2E);
+-                 if(!(temp & 0x80))
+-                    SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x2E,0x80);
+-              }
++	    } if(SiS_Pr->SiS_VBType & VB_NoLCD) {
++
++	       if(HwDeviceExtension->jChipType == SIS_650) {
++	          if(!(SiS_WeHaveBacklightCtrl(SiS_Pr,HwDeviceExtension, BaseAddr))) {
++		     if( (SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) ||
++		         (SiS_CRT2IsLCD(SiS_Pr,BaseAddr,HwDeviceExtension)) ) {
++			SiS_SetPanelDelay(SiS_Pr,ROMAddr, HwDeviceExtension, 1);
++		        SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x26,0x01);
++		     }
++		  }
++	       }
+ 
+-	      SiS_SetRegANDOR(SiS_Pr->SiS_Part2Port,0x00,0x1f,0x20);
++  	    }
+ 
+-	      if(SiS_Is301B(SiS_Pr,BaseAddr)) { 
+-	         SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x1F,0xC0);
+-	         SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x00,0x7f);
+-	      } else {
+-	         SiS_VBLongWait(SiS_Pr);
+-                 SiS_DisplayOn(SiS_Pr);
+-	         SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x00,0x7F);
+-                 SiS_VBLongWait(SiS_Pr);
+-	      }
+-	      
+-	   }
+-#endif
+-	  
+ 	 } else {			/* 315, 330 */
+ 
+-	   if(!(SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr))) {
+-	      temp = SiS_GetReg1(SiS_Pr->SiS_P3c4,0x32) & 0xDF;
+-	      if(SiS_BridgeInSlave(SiS_Pr)) {
+-                 tempah = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x30);
+-                 if(!(tempah & SetCRT2ToRAMDAC))  temp |= 0x20;
+-              }
+-              SiS_SetReg1(SiS_Pr->SiS_P3c4,0x32,temp);
++	    if(!(SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr))) {
++	       temp = SiS_GetReg1(SiS_Pr->SiS_P3c4,0x32) & 0xDF;
++	       if(SiS_BridgeInSlave(SiS_Pr)) {
++                  tempah = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x30);
++                  if(!(tempah & SetCRT2ToRAMDAC))  temp |= 0x20;
++               }
++               SiS_SetReg1(SiS_Pr->SiS_P3c4,0x32,temp);
+ 
+-	      SiS_SetRegOR(SiS_Pr->SiS_P3c4,0x1E,0x20);                   /* enable CRT2 */
++	       SiS_SetRegOR(SiS_Pr->SiS_P3c4,0x1E,0x20);                   /* enable CRT2 */
+ 
+-	      temp = SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x2E);
+-              if(!(temp & 0x80))
+-                 SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x2E,0x80);
+-           }
++	       temp = SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x2E);
++               if(!(temp & 0x80))
++                  SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x2E,0x80);
++            }
+ 
+-	   SiS_SetRegANDOR(SiS_Pr->SiS_Part2Port,0x00,0x1f,0x20);
++	    SiS_SetRegANDOR(SiS_Pr->SiS_Part2Port,0x00,0x1f,0x20);
+ 
+-	   if(SiS_Is301B(SiS_Pr,BaseAddr)) {
++	    if(SiS_Is301B(SiS_Pr,BaseAddr)) {
+ 
+-	      temp=SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x2E);
+-              if (!(temp & 0x80))
+-                 SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x2E,0x80);
++	       temp=SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x2E);
++               if(!(temp & 0x80))
++                  SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x2E,0x80);
++
++	       tempah = 0xc0;
++	       if(SiS_IsDualEdge(SiS_Pr,HwDeviceExtension, BaseAddr)) {
++	          tempah = 0x80;
++	          if(!(SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr))) {
++	             tempah = 0x40;
++                  }
++	       }
++               SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x1F,tempah);
+ 
+-	      tempah = 0xc0;
+-	      if(SiS_IsDualEdge(SiS_Pr,HwDeviceExtension, BaseAddr)) {
+-	         tempah = 0x80;
+-	         if(!(SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr))) {
+-	            tempah = 0x40;
+-                 }
+-	      }
+-              SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x1F,tempah);
++	       SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x00,0x7f);
+ 
+-	      SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x00,0x7f);
++	    } else {
+ 
+-	   } else {
+-	   
+-	      SiS_VBLongWait(SiS_Pr);
+-              SiS_DisplayOn(SiS_Pr);
+-	      SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x00,0x7F);
+-              SiS_VBLongWait(SiS_Pr);
++	       SiS_VBLongWait(SiS_Pr);
++               SiS_DisplayOn(SiS_Pr);
++	       SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x00,0x7F);
++               SiS_VBLongWait(SiS_Pr);
+ 
+-	   }
++	    }
+ 
+ 	 }   /* 315, 330 */
+ 
+@@ -5782,11 +5978,11 @@ SiS_EnableBridge(SiS_Private *SiS_Pr, PS
+ 
+       }
+ 
+-    } else {	/* ============  TW: For 301 ================ */
++    } else {	/* ============  For 301 ================ */
+ 
+        if(HwDeviceExtension->jChipType < SIS_315H) {
+             if(SiS_CRT2IsLCD(SiS_Pr,BaseAddr,HwDeviceExtension)) {
+-                SiS_SetRegANDOR(SiS_Pr->SiS_P3c4,0x11,0xF0,0x0B);
++                SiS_SetRegAND(SiS_Pr->SiS_P3c4,0x11,0xFB);
+ 	        SiS_SetPanelDelay(SiS_Pr, ROMAddr, HwDeviceExtension, 0);
+ 	    }
+        }
+@@ -5818,13 +6014,13 @@ SiS_EnableBridge(SiS_Private *SiS_Pr, PS
+        if(HwDeviceExtension->jChipType < SIS_315H) {
+             if(SiS_CRT2IsLCD(SiS_Pr,BaseAddr,HwDeviceExtension)) {
+ 	        SiS_SetPanelDelay(SiS_Pr, ROMAddr, HwDeviceExtension, 1);
+-                SiS_SetRegANDOR(SiS_Pr->SiS_P3c4,0x11,0xF0,0x03);
++                SiS_SetRegAND(SiS_Pr->SiS_P3c4,0x11,0xF7);
+ 	    }
+        }
+ 
+     }
+ 
+-  } else {   /* =================== TW: For LVDS ================== */
++  } else {   /* =================== For LVDS ================== */
+ 
+     if(HwDeviceExtension->jChipType < SIS_315H) {
+ 
+@@ -5847,35 +6043,35 @@ SiS_EnableBridge(SiS_Private *SiS_Pr, PS
+       SiS_UnLockCRT2(SiS_Pr,HwDeviceExtension, BaseAddr);
+       SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x02,0xBF);
+       if(SiS_BridgeInSlave(SiS_Pr)) {
+-      	SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x01,0x1F);
++      	 SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x01,0x1F);
+       } else {
+-      	SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x01,0x1F,0x40);
++      	 SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x01,0x1F,0x40);
+       }
+ 
+       if(SiS_Pr->SiS_IF_DEF_CH70xx == 1) {
+-        if(!(SiS_CRT2IsLCD(SiS_Pr,BaseAddr,HwDeviceExtension))) {
+-	        SiS_SetCH700x(SiS_Pr,0x0B0E);
+-        }
++         if(!(SiS_CRT2IsLCD(SiS_Pr,BaseAddr,HwDeviceExtension))) {
++	    SiS_SetCH700x(SiS_Pr,0x0B0E);
++         }
+       }
+ 
+       if(SiS_CRT2IsLCD(SiS_Pr,BaseAddr,HwDeviceExtension)) {
+-          if(!(SiS_GetReg1(SiS_Pr->SiS_P3c4,0x13) & 0x40)) {
+-              if(!(SiS_GetReg1(SiS_Pr->SiS_P3c4,0x16) & 0x10)) {
+-	          if(!(SiS_CR36BIOSWord23b(SiS_Pr,HwDeviceExtension))) {
+-			SiS_SetPanelDelay(SiS_Pr,ROMAddr, HwDeviceExtension, 1);
+-        		SiS_SetPanelDelay(SiS_Pr,ROMAddr, HwDeviceExtension, 1);
+-		  }
+-		  SiS_WaitVBRetrace(SiS_Pr,HwDeviceExtension);
+-                  SiS_SetRegAND(SiS_Pr->SiS_P3c4,0x11,0xF7);
+-              }
+-	  }
++         if(!(SiS_GetReg1(SiS_Pr->SiS_P3c4,0x13) & 0x40)) {
++            if(!(SiS_GetReg1(SiS_Pr->SiS_P3c4,0x16) & 0x10)) {
++	       if(!(SiS_CR36BIOSWord23b(SiS_Pr,HwDeviceExtension))) {
++		  SiS_SetPanelDelay(SiS_Pr,ROMAddr, HwDeviceExtension, 1);
++        	  SiS_SetPanelDelay(SiS_Pr,ROMAddr, HwDeviceExtension, 1);
++	       }
++	       SiS_WaitVBRetrace(SiS_Pr,HwDeviceExtension);
++               SiS_SetRegAND(SiS_Pr->SiS_P3c4,0x11,0xF7);
++            }
++	 }
+       }
+ 
+ #endif  /* SIS300 */
+ 
+     } else {
+ 
+-#ifdef SIS315H    /* 310/325 series */
++#ifdef SIS315H    /* 315 series */
+ 
+ #if 0  /* BIOS code makes no sense */
+        if(SiS_IsVAMode()) {
+@@ -5902,36 +6098,41 @@ SiS_EnableBridge(SiS_Private *SiS_Pr, PS
+ 	  SiS_Chrontel701xBLOff(SiS_Pr);
+        }
+ 
+-       SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x2e,0x7f);
+-       
+-#ifdef NEWCH701x
+-       if(SiS_Pr->SiS_IF_DEF_CH70xx == 2) {
+-           if(SiS_IsLCDOrLCDA(SiS_Pr,HwDeviceExtension,BaseAddr)) {
++       if(HwDeviceExtension->jChipType != SIS_550) {
++          SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x2e,0x7f);
++       }
++
++       if(HwDeviceExtension->jChipType == SIS_740) {
++          if(SiS_Pr->SiS_IF_DEF_CH70xx == 2) {
++             if(SiS_IsLCDOrLCDA(SiS_Pr,HwDeviceExtension,BaseAddr)) {
+ 	   	SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x1E,0x20);
+-	   }
++	     }
++	  }
+        }
+-#endif       
+ 
+        temp1 = SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x2E);
+-       if (!(temp1 & 0x80))
++       if(!(temp1 & 0x80))
+            SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x2E,0x80);
+ 
+        if(SiS_Pr->SiS_IF_DEF_CH70xx == 2) {
+            if(temp) {
+-	       SiS_Chrontel701xBLOn(SiS_Pr);
++	       SiS_Chrontel701xBLOn(SiS_Pr, HwDeviceExtension);
+ 	   }
+        }
+ 
+        if(SiS_Pr->SiS_IF_DEF_CH70xx == 0) {
+            if(SiS_CRT2IsLCD(SiS_Pr,BaseAddr,HwDeviceExtension)) {
+ 	   	SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x1E,0x20);
++		if(HwDeviceExtension->jChipType == SIS_550) {
++		   SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x1E,0x40);
++		   SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x1E,0x10);
++		}
++	   }
++       } else if(SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) {
++           if(HwDeviceExtension->jChipType != SIS_740) {
++              SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x1E,0x20);
+ 	   }
+-       } 
+-#ifndef NEWCH701x       
+-         else if(SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) {
+-           SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x1E,0x20);
+        }
+-#endif       
+ 
+        if(!(SiS_WeHaveBacklightCtrl(SiS_Pr,HwDeviceExtension, BaseAddr))) {
+            SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x00,0x7f);
+@@ -5954,10 +6155,10 @@ SiS_EnableBridge(SiS_Private *SiS_Pr, PS
+        if(SiS_Pr->SiS_IF_DEF_CH70xx == 2) {
+        	 	if(!(SiS_WeHaveBacklightCtrl(SiS_Pr,HwDeviceExtension, BaseAddr))) {
+  	   		if(SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) {
+-	            		SiS_Chrontel701xBLOn(SiS_Pr);
++	            		SiS_Chrontel701xBLOn(SiS_Pr, HwDeviceExtension);
+ 	            		SiS_ChrontelDoSomething4(SiS_Pr,HwDeviceExtension, BaseAddr);
+            		} else if(SiS_IsLCDOrLCDA(SiS_Pr,HwDeviceExtension, BaseAddr))  {
+-       				SiS_Chrontel701xBLOn(SiS_Pr);
++       				SiS_Chrontel701xBLOn(SiS_Pr, HwDeviceExtension);
+        				SiS_ChrontelDoSomething4(SiS_Pr,HwDeviceExtension, BaseAddr);
+ 	   		}
+        		}
+@@ -5983,7 +6184,7 @@ SiS_SiS30xBLOn(SiS_Private *SiS_Pr, PSIS
+ {
+   USHORT  BaseAddr = (USHORT)HwDeviceExtension->ulIOAddress;
+ 
+-  /* TW: Switch on LCD backlight on SiS30xLV */
++  /* Switch on LCD backlight on SiS30xLV */
+   if( (SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) ||
+       (SiS_CRT2IsLCD(SiS_Pr,BaseAddr,HwDeviceExtension)) ) {
+     if(!(SiS_GetReg1(SiS_Pr->SiS_Part4Port,0x26) & 0x02)) {
+@@ -6001,7 +6202,7 @@ SiS_SiS30xBLOff(SiS_Private *SiS_Pr, PSI
+ {
+   USHORT  BaseAddr = (USHORT)HwDeviceExtension->ulIOAddress;
+ 
+-  /* TW: Switch off LCD backlight on SiS30xLV */
++  /* Switch off LCD backlight on SiS30xLV */
+   if( (!(SiS_IsDualEdge(SiS_Pr,HwDeviceExtension, BaseAddr))) ||
+       (SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) ) {
+ 	 SiS_SetRegANDOR(SiS_Pr->SiS_Part4Port,0x26,0xFE,0x00);
+@@ -6023,12 +6224,14 @@ SiS_CR36BIOSWord23b(SiS_Private *SiS_Pr,
+   UCHAR *ROMAddr;
+ 
+   if((ROMAddr = (UCHAR *)HwDeviceExtension->pjVirtualRomBase) && SiS_Pr->SiS_UseROM) {
+-     temp = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x36) & 0xff;
+-     temp >>= 4;
+-     temp = 1 << temp;
+-     temp1 = (ROMAddr[0x23c] << 8) | ROMAddr[0x23b];
+-     if(temp1 & temp) return(1);
+-     else return(0);
++     if((ROMAddr[0x233] == 0x12) && (ROMAddr[0x234] == 0x34)) {
++        temp = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x36) & 0xff;
++        temp >>= 4;
++        temp = 1 << temp;
++        temp1 = (ROMAddr[0x23c] << 8) | ROMAddr[0x23b];
++        if(temp1 & temp) return(1);
++        else return(0);
++     } else return(0);
+   } else {
+      return(0);
+   }
+@@ -6041,12 +6244,14 @@ SiS_CR36BIOSWord23d(SiS_Private *SiS_Pr,
+   UCHAR *ROMAddr;
+ 
+   if((ROMAddr = (UCHAR *)HwDeviceExtension->pjVirtualRomBase) && SiS_Pr->SiS_UseROM) {
+-     temp = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x36) & 0xff;
+-     temp >>= 4;
+-     temp = 1 << temp;
+-     temp1 = (ROMAddr[0x23e] << 8) | ROMAddr[0x23d];
+-     if(temp1 & temp) return(1);
+-     else return(0);
++     if((ROMAddr[0x233] == 0x12) && (ROMAddr[0x234] == 0x34)) {
++        temp = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x36) & 0xff;
++        temp >>= 4;
++        temp = 1 << temp;
++        temp1 = (ROMAddr[0x23e] << 8) | ROMAddr[0x23d];
++        if(temp1 & temp) return(1);
++        else return(0);
++     } else return(0);
+   } else {
+      return(0);
+   }
+@@ -6143,7 +6348,7 @@ SiS_SetPanelDelay(SiS_Private *SiS_Pr, U
+ 
+ #ifdef SIS315H
+ 
+-      if(SiS_Pr->SiS_IF_DEF_LVDS == 1) {			/* 310/325 series, LVDS */
++      if(SiS_Pr->SiS_IF_DEF_LVDS == 1) {			/* 315 series, LVDS */
+ 
+           if(SiS_Pr->SiS_IF_DEF_CH70xx == 0) {
+               PanelID = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x36);
+@@ -6171,7 +6376,7 @@ SiS_SetPanelDelay(SiS_Private *SiS_Pr, U
+ 	      SiS_ShortDelay(SiS_Pr,Delay);
+ 	  }
+ 
+-      } else {							/* 310/325 series, 301(B) */
++      } else {							/* 315 series, 301(B) */
+ 
+           PanelID = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x36);
+ 	  DelayIndex = PanelID >> 4;
+@@ -6271,14 +6476,7 @@ SiS_IsVAMode(SiS_Private *SiS_Pr, PSIS_H
+   if(HwDeviceExtension->jChipType >= SIS_315H) {
+      flag = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x38);
+      if((flag & EnableDualEdge) && (flag & SetToLCDA))   return(1);
+-#if 0 /* Not done in 650/30xLV 1.10.6s, but in 650/301LV */
+-     else if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
+-       if(flag) return(1);
+-       else     return(0);   			         
+-     }
+-#endif
+-     else
+-       return(0);
++     else return(0);
+   } else
+ #endif
+      return(0);
+@@ -6325,7 +6523,9 @@ SiS_IsNotM650or651(SiS_Private *SiS_Pr, 
+   if(HwDeviceExtension->jChipType == SIS_650) {
+      flag = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x5f);
+      flag &= 0xF0;
+-     if((flag == 0xb0) || (flag == 0x90)) return 0;
++     /* Check for revision != A0 only */
++     if((flag == 0xe0) || (flag == 0xc0) ||
++        (flag == 0xb0) || (flag == 0x90)) return 0;
+      else return 1;
+   } else
+ #endif
+@@ -6443,7 +6643,7 @@ SiS_BridgeIsEnable(SiS_Private *SiS_Pr, 
+       if((flag == 0x80) || (flag == 0x20)) return 0;
+       else	                           return 1;
+     } else {
+-      /* 310/325 series (650/30xLV 1.10.6s) */
++      /* 315 series (650/30xLV 1.10.6s) */
+       flag &= 0x50;
+       if((flag == 0x40) || (flag == 0x10)) return 0;
+       else                                 return 1;
+@@ -6487,14 +6687,14 @@ SiS_SetHiVision(SiS_Private *SiS_Pr, USH
+   }
+ }
+ 
+-BOOLEAN
++void
+ SiS_GetLCDResInfo(SiS_Private *SiS_Pr, UCHAR *ROMAddr,USHORT ModeNo,
+                   USHORT ModeIdIndex, PSIS_HW_DEVICE_INFO HwDeviceExtension)
+ {
+   USHORT temp,modeflag,resinfo=0;
+   const unsigned char SiS300SeriesLCDRes[] =
+-         { 0, 1, 2, 3, 7, 4, 5, 8,
+-	   0, 0, 0, 0, 0, 0, 0, 0 };
++         { 0,  1,  2,  3,  7,  4,  5,  8,
++	   0,  0, 10,  0,  0,  0,  0, 15 };
+ 
+   SiS_Pr->SiS_LCDResInfo = 0;
+   SiS_Pr->SiS_LCDTypeInfo = 0;
+@@ -6511,17 +6711,19 @@ SiS_GetLCDResInfo(SiS_Private *SiS_Pr, U
+      }
+   }
+ 
+-  if(!(SiS_Pr->SiS_VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)))   return 0;
++  if(!(SiS_Pr->SiS_VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)))   return;
+ 
+-  if(!(SiS_Pr->SiS_VBInfo & (SetSimuScanMode | SwitchToCRT2))) return 0;
++  if(!(SiS_Pr->SiS_VBInfo & (SetSimuScanMode | SwitchToCRT2))) return;
+ 
+   temp = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x36);
+ 
++#if 0
+   /* FSTN: Fake CR36 (TypeInfo 2, ResInfo SiS_Panel320x480) */
+   if(SiS_Pr->SiS_IF_DEF_FSTN) {
+    	temp = 0x20 | SiS_Pr->SiS_Panel320x480;
+    	SiS_SetReg1(SiS_Pr->SiS_P3d4,0x36,temp);
+   }
++#endif
+ 
+   if(HwDeviceExtension->jChipType < SIS_315H) {
+   	SiS_Pr->SiS_LCDTypeInfo = temp >> 4;
+@@ -6530,14 +6732,16 @@ SiS_GetLCDResInfo(SiS_Private *SiS_Pr, U
+   }
+   temp &= 0x0f;
+   if(HwDeviceExtension->jChipType < SIS_315H) {
+-      /* TW: Translate 300 series LCDRes to 310/325 series for unified usage */
++      /* Translate 300 series LCDRes to 315 series for unified usage */
+       temp = SiS300SeriesLCDRes[temp];
+   }
+   SiS_Pr->SiS_LCDResInfo = temp;
+ 
++#if 0
+   if(SiS_Pr->SiS_IF_DEF_FSTN){
+        	SiS_Pr->SiS_LCDResInfo = SiS_Pr->SiS_Panel320x480;
+   }
++#endif
+ 
+   if(SiS_Pr->SiS_IF_DEF_LVDS == 0) {
+     	if(SiS_Pr->SiS_LCDResInfo < SiS_Pr->SiS_PanelMin301)
+@@ -6547,75 +6751,115 @@ SiS_GetLCDResInfo(SiS_Private *SiS_Pr, U
+ 		SiS_Pr->SiS_LCDResInfo = SiS_Pr->SiS_PanelMinLVDS;
+   }
+ 
+-  if(SiS_Pr->SiS_LCDResInfo > SiS_Pr->SiS_PanelMax)
++  if((!SiS_Pr->CP_HaveCustomData) || (SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_PanelCustom)) {
++     if(SiS_Pr->SiS_LCDResInfo > SiS_Pr->SiS_PanelMax)
+   	SiS_Pr->SiS_LCDResInfo = SiS_Pr->SiS_Panel1024x768;
++  }
++
++  if(SiS_Pr->SiS_IF_DEF_LVDS == 1) {
++     if(SiS_Pr->SiS_CustomT == CUT_BARCO1366) {
++        SiS_Pr->SiS_LCDResInfo = Panel_Barco1366;
++     } else if(SiS_Pr->SiS_CustomT == CUT_PANEL848) {
++        SiS_Pr->SiS_LCDResInfo = Panel_848x480;
++     }
++  }
++
++  switch(SiS_Pr->SiS_LCDResInfo) {
++     case Panel_800x600:   SiS_Pr->PanelXRes =  800; SiS_Pr->PanelYRes =  600; break;
++     case Panel_1024x768:  SiS_Pr->PanelXRes = 1024; SiS_Pr->PanelYRes =  768; break;
++     case Panel_1280x1024: SiS_Pr->PanelXRes = 1280; SiS_Pr->PanelYRes = 1024; break;
++     case Panel_640x480_3:
++     case Panel_640x480_2:
++     case Panel_640x480:   SiS_Pr->PanelXRes =  640; SiS_Pr->PanelYRes =  480; break;
++     case Panel_1024x600:  SiS_Pr->PanelXRes = 1024; SiS_Pr->PanelYRes =  600; break;
++     case Panel_1152x864:  SiS_Pr->PanelXRes = 1152; SiS_Pr->PanelYRes =  864; break;
++     case Panel_1280x960:  SiS_Pr->PanelXRes = 1280; SiS_Pr->PanelYRes =  960; break;
++     case Panel_1152x768:  SiS_Pr->PanelXRes = 1152; SiS_Pr->PanelYRes =  768; break;
++     case Panel_1400x1050: SiS_Pr->PanelXRes = 1400; SiS_Pr->PanelYRes = 1050; break;
++     case Panel_1280x768:  SiS_Pr->PanelXRes = 1280; SiS_Pr->PanelYRes =  768; break;
++     case Panel_1600x1200: SiS_Pr->PanelXRes = 1600; SiS_Pr->PanelYRes = 1200; break;
++     case Panel_320x480:   SiS_Pr->PanelXRes =  320; SiS_Pr->PanelYRes =  480; break;
++     case Panel_Custom:    SiS_Pr->PanelXRes = SiS_Pr->CP_MaxX;
++    			   SiS_Pr->PanelYRes = SiS_Pr->CP_MaxY;
++			   break;
++     case Panel_Barco1366: SiS_Pr->PanelXRes = 1360; SiS_Pr->PanelYRes = 1024; break;
++     case Panel_848x480:   SiS_Pr->PanelXRes =  848; SiS_Pr->PanelYRes =  480; break;
++     default:		   SiS_Pr->PanelXRes = 1024; SiS_Pr->PanelYRes =  768; break;
++  }
+ 
+   temp = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x37);
++#if 0
+   if(SiS_Pr->SiS_IF_DEF_FSTN){
+-        /* TW: Fake LVDS bridge for FSTN */
++        /* Fake LVDS bridge for FSTN */
+       	temp = 0x04;
+       	SiS_SetReg1(SiS_Pr->SiS_P3d4,0x37,temp);
+   }
++#endif
+   SiS_Pr->SiS_LCDInfo = temp;
+-  
++
++  if(SiS_Pr->SiS_IF_DEF_LVDS == 1) {
++     if(SiS_Pr->SiS_CustomT == CUT_PANEL848) {
++        SiS_Pr->SiS_LCDInfo = 0x80 | 0x40 | 0x20;   /* neg sync, RGB24 */
++     }
++  }
++
+   if(!(SiS_Pr->UsePanelScaler))        SiS_Pr->SiS_LCDInfo &= ~DontExpandLCD;
+   else if(SiS_Pr->UsePanelScaler == 1) SiS_Pr->SiS_LCDInfo |= DontExpandLCD;
+ 
+-  /* TW: Inserted entire 315-block from 650/LVDS/30xLV BIOSes */
++  if(SiS_Pr->SiS_IF_DEF_LVDS == 0) {
++     if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
++        if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_PanelCustom) {
++	   /* For non-standard LCD resolution, we let the panel scale */
++           SiS_Pr->SiS_LCDInfo |= DontExpandLCD;
++        } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) {
++	   if(ModeNo == 0x7c || ModeNo == 0x7d || ModeNo == 0x7e) {
++	      /* Bridge does not scale to 1280x960 */
++              SiS_Pr->SiS_LCDInfo |= DontExpandLCD;
++	   }
++        } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x768) {
++           /* TEMP - no idea about the timing and zoom factors */
++           SiS_Pr->SiS_LCDInfo |= DontExpandLCD;
++        } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050) {
++	   if(ModeNo == 0x3a || ModeNo == 0x4d || ModeNo == 0x65) {
++	      /* Bridge does not scale to 1280x1024 */
++	      SiS_Pr->SiS_LCDInfo |= DontExpandLCD;
++	   }
++	} else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1600x1200) {
++	   /* TEMP - no idea about the timing and zoom factors */
++	   SiS_Pr->SiS_LCDInfo |= DontExpandLCD;
++	}
++     }
++  }
++
++
+   if(HwDeviceExtension->jChipType >= SIS_315H) {
+ #ifdef SIS315H
+-     if(SiS_Pr->SiS_IF_DEF_LVDS == 0) {
+-         if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
+-	     if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050) {
+-		 if(ModeNo == 0x3a || ModeNo == 0x4d || ModeNo == 0x65) {
+-		     /* Bridge does not scale to 1280x1024 */
+-		     SiS_Pr->SiS_LCDInfo |= DontExpandLCD;
+-		 }
+-	     }
+-	     if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) {
+-	         if(ModeNo == 0x7c || ModeNo == 0x7d || ModeNo == 0x7e) {
+-		     /* TW: Bridge does not scale to 1280x960 */
+-		     SiS_Pr->SiS_LCDInfo |= DontExpandLCD;
+-		 }
+-		 if(ModeNo == 0x2f || ModeNo == 0x5d || ModeNo == 0x5e) {
+-		     /* TW: Bridge does not scale to 640x400 */
+-		     SiS_Pr->SiS_LCDInfo |= DontExpandLCD;
+-		 }
+-	     }
+-	     if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) {
+-	         if(ModeNo == 0x2f || ModeNo == 0x5d || ModeNo == 0x5e) {
+-		     /* TW: Most panels can't scale to 640x400 */
+-		     SiS_Pr->SiS_LCDInfo &= ~DontExpandLCD;
+-		 }
+-	     }
+-	 }
+-     }
+      if(SiS_GetReg1(SiS_Pr->SiS_P3d4,0x39) & 0x01) {
+-         SiS_Pr->SiS_LCDInfo &= 0xFFEF;    
+-	 SiS_Pr->SiS_LCDInfo |= LCDPass11;
++        SiS_Pr->SiS_LCDInfo &= 0xFFEF;
++	SiS_Pr->SiS_LCDInfo |= LCDPass11;
+      }
+ #endif
+   } else {
+ #ifdef SIS300
+      if(SiS_Pr->SiS_IF_DEF_LVDS == 1) {
+         if((ROMAddr) && SiS_Pr->SiS_UseROM) {
+-           if(!(ROMAddr[0x235] & 0x02)) {
+-	      SiS_Pr->SiS_LCDInfo &= 0xEF;
++	   if((ROMAddr[0x233] == 0x12) && (ROMAddr[0x234] == 0x34)) {
++              if(!(ROMAddr[0x235] & 0x02)) {
++	         SiS_Pr->SiS_LCDInfo &= 0xEF;
++ 	      }
+ 	   }
+         }
+-     } else {
+-        if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
+-	   if((SiS_Pr->SiS_SetFlag & SetDOSMode) && ((ModeNo == 0x03) || (ModeNo == 0x10))) {
+-               SiS_Pr->SiS_LCDInfo &= 0xEF;
+-	   }
++     } else if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
++	if((SiS_Pr->SiS_SetFlag & SetDOSMode) && ((ModeNo == 0x03) || (ModeNo == 0x10))) {
++           SiS_Pr->SiS_LCDInfo &= 0xEF;
+ 	}
+      }
+ #endif
+   }
+-  
+-  /* TW: With Trumpion, always Expanding */
+-  if(SiS_Pr->SiS_IF_DEF_TRUMPION != 0){
+-       SiS_Pr->SiS_LCDInfo &= (~DontExpandLCD);
++
++  /* Trumpion: Assume non-expanding */
++  if(SiS_Pr->SiS_IF_DEF_TRUMPION != 0) {
++     SiS_Pr->SiS_LCDInfo &= (~DontExpandLCD);
+   }
+ 
+   if(!((HwDeviceExtension->jChipType < SIS_315H) && (SiS_Pr->SiS_SetFlag & SetDOSMode))) {
+@@ -6624,7 +6868,7 @@ SiS_GetLCDResInfo(SiS_Private *SiS_Pr, U
+         if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x600) {
+ 	   if(ModeNo > 0x13) {
+ 	      if(!(SiS_Pr->SiS_LCDInfo & DontExpandLCD)) {
+-                 if((resinfo == 7) || (resinfo == 3)) {
++                 if((resinfo == SIS_RI_800x600) || (resinfo == SIS_RI_400x300)) {
+                     SiS_Pr->SiS_SetFlag |= EnableLVDSDDA;
+ 		 }
+               }
+@@ -6644,9 +6888,9 @@ SiS_GetLCDResInfo(SiS_Private *SiS_Pr, U
+ 	                                      (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480))) {
+                  if(ModeNo > 0x13) {
+                     if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) {
+-                       if(resinfo == 4) SiS_Pr->SiS_SetFlag |= EnableLVDSDDA;     /* 512x384  */
++                       if(resinfo == SIS_RI_512x384) SiS_Pr->SiS_SetFlag |= EnableLVDSDDA;
+                     } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel800x600) {
+-                       if(resinfo == 3) SiS_Pr->SiS_SetFlag |= EnableLVDSDDA;     /* 400x300  */
++                       if(resinfo == SIS_RI_400x300) SiS_Pr->SiS_SetFlag |= EnableLVDSDDA;
+                     }
+                  }
+ 	      } else SiS_Pr->SiS_SetFlag |= EnableLVDSDDA;
+@@ -6665,19 +6909,21 @@ SiS_GetLCDResInfo(SiS_Private *SiS_Pr, U
+   }
+ 
+ #ifdef SIS315H
+-  /* TW: 650/30xLV 1.10.6s */
++  /* 650/30xLV 1.10.6s */
+   if(HwDeviceExtension->jChipType >= SIS_315H) {
+-    if(SiS_Pr->SiS_VBType & (VB_SIS302B | VB_SIS302LV)) {
+-      /* Enable 302B/302LV dual link mode */
+-      /* (302B is a theory - not in any BIOS */
+-      temp = 0x00;
+-      if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050) temp = 0x04;
+-      if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) temp = 0x04;
+-      if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1600x1200) temp = 0x04;
+-      SiS_SetReg1(SiS_Pr->SiS_P3d4,0x39,temp);
+-    } else if(SiS_Pr->SiS_IF_DEF_LVDS == 0) {
+-      SiS_SetReg1(SiS_Pr->SiS_P3d4,0x39,0x00);
+-    }
++     if(SiS_Pr->SiS_IF_DEF_LVDS == 0) {
++        SiS_SetRegAND(SiS_Pr->SiS_P3d4,0x39,~0x04);
++        if(SiS_Pr->SiS_VBType & (VB_SIS302B | VB_SIS302LV)) {
++           /* Enable 302B/302LV dual link mode.
++            * (302B is a theory - not in any BIOS)
++	    */
++           if((SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050) ||
++              (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) ||
++              (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1600x1200)) {
++	      SiS_SetRegOR(SiS_Pr->SiS_P3d4,0x39,0x04);
++	   }
++  	}
++     }
+   }
+ #endif
+ 
+@@ -6693,20 +6939,6 @@ SiS_GetLCDResInfo(SiS_Private *SiS_Pr, U
+ 	SiS_Pr->SiS_LCDInfo, SiS_Pr->SiS_LCDResInfo, SiS_Pr->SiS_LCDTypeInfo, SiS_Pr->SiS_SetFlag);
+ #endif
+ 
+-  return 1;
+-}
+-
+-void
+-SiS_PresetScratchregister(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension)
+-{
+-  return;
+-  /*SiS_SetReg1(SiS_Pr->SiS_P3d4,0x30,0x21);  */
+-  /*SiS_SetReg1(SiS_Pr->SiS_P3d4,0x31,0x41);  */
+-  /*SiS_SetReg1(SiS_Pr->SiS_P3d4,0x32,0x28);  */
+-  /*SiS_SetReg1(SiS_Pr->SiS_P3d4,0x33,0x22);  */
+-  /*SiS_SetReg1(SiS_Pr->SiS_P3d4,0x35,0x43);  */
+-  /*SiS_SetReg1(SiS_Pr->SiS_P3d4,0x36,0x01);  */
+-  /*SiS_SetReg1(SiS_Pr->SiS_P3d4,0x37,0x00);  */
+ }
+ 
+ void
+@@ -6736,7 +6968,6 @@ SiS_VBLongWait(SiS_Private *SiS_Pr)
+   } else {
+     SiS_LongWait(SiS_Pr);
+   }
+-  return;
+ }
+ 
+ void
+@@ -6803,7 +7034,7 @@ SiS_WaitRetrace1(SiS_Private *SiS_Pr, PS
+ #endif
+   } else {
+ #ifdef SIS300
+-#if 0  /* TW: Not done in A901 BIOS */
++#if 0  /* Not done in A901 BIOS */
+      if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
+         if(SiS_GetReg1(SiS_Pr->SiS_P3c4,0x1f) & 0xc0) return;
+      }
+@@ -6898,7 +7129,51 @@ void SiS_SetRegOR(USHORT Port,USHORT Ind
+ 
+ /* ========================================================= */
+ 
+-/* TW: Set 301 TV Encoder (and some LCD relevant) registers */
++static void
++SiS_SetTVSpecial(SiS_Private *SiS_Pr, USHORT ModeNo)
++{
++  if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
++     if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
++        if(!(SiS_Pr->SiS_VBInfo & SetPALTV)) {
++           if((ModeNo == 0x64) || (ModeNo == 0x4a) || (ModeNo == 0x38)) {
++              SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x1c,0xa7);
++              SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x1d,0x07);
++	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x1e,0xf2);
++	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x1f,0x6e);
++	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x20,0x17);
++	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x21,0x8b);
++	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x22,0x73);
++	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x23,0x53);
++	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x24,0x13);
++	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x25,0x40);
++	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x26,0x34);
++	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x27,0xf4);
++	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x28,0x63);
++	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x29,0xbb);
++	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x2a,0xcc);
++	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x2b,0x7a);
++	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x2c,0x58);   /* 48 */
++	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x2d,0xe4);
++	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x2e,0x73);
++	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x2f,0xda);   /* de */
++	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x30,0x13);
++	      if((SiS_GetReg1(SiS_Pr->SiS_P3d4,0x38)) & 0x40) {
++	         SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x01,0x14);
++	      } else {
++	         SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x01,0x15);
++	      }
++	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x02,0x1b);
++	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x43,0x72);
++           }
++        } else {
++	   SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x01,0x21);
++	   SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x02,0x5a);
++	}
++     }
++  }
++}
++
++/* Set 301 TV Encoder (and some LCD relevant) registers */
+ void
+ SiS_SetGroup2(SiS_Private *SiS_Pr, USHORT BaseAddr,UCHAR *ROMAddr, USHORT ModeNo,
+               USHORT ModeIdIndex,USHORT RefreshRateTableIndex,
+@@ -6911,67 +7186,46 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHOR
+ #ifdef SIS315H   
+   const       SiS_Part2PortTblStruct *CRT2Part2Ptr = NULL;
+   USHORT      resindex, CRT2Index;
+-#endif  
++#endif
+   USHORT      modeflag, resinfo, crt2crtc;
+-  ULONG       longtemp, tempeax, tempebx, temp2, tempecx;
++  ULONG       longtemp, tempeax;
++#ifdef SIS300
+   const UCHAR atable[] = {
+                  0xc3,0x9e,0xc3,0x9e,0x02,0x02,0x02,
+ 	         0xab,0x87,0xab,0x9e,0xe7,0x02,0x02
+   };
++#endif
+ 
+ #ifdef SIS315H   
+   if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCDA) {
+-     /* TW: 650/30xLV 1.10.6s: (Is at end of SetGroup2!) */
++     /* 650/30xLV 1.10.6s: (Is at end of SetGroup2!) */
+      if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
+         if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050) {
+ 	   SiS_SetRegANDOR(SiS_Pr->SiS_Part2Port,0x1a,0xfc,0x03);
+-	   temp = 1;
+-	   if(ModeNo <= 0x13) temp = 3;
++	   temp = 0x01;
++	   if(ModeNo <= 0x13) temp = 0x03;
+ 	   SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x0b,temp);
+ 	}
+      }
+-     if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
+-       if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
+-         if(!(SiS_Pr->SiS_VBInfo & SetPALTV)) {
+-           if((ModeNo == 0x4a) || (ModeNo == 0x38)) {
+-               SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x1c,0xa7);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x1d,0x07);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x1e,0xf2);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x1f,0x6e);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x20,0x17);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x21,0x8b);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x22,0x73);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x23,0x53);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x24,0x13);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x25,0x40);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x26,0x34);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x27,0xf4);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x28,0x63);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x29,0xbb);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x2a,0xcc);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x2b,0x7a);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x2c,0x58);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x2d,0xe4);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x2e,0x73);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x2f,0xda);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x30,0x13);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x43,0x72);
+-           }
+-         }
+-       }
+-     }
++     SiS_SetTVSpecial(SiS_Pr, ModeNo);
+      return;
+   }
+-#endif  
++#endif
+ 
+-  if(ModeNo<=0x13) {
+-    	modeflag = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ModeFlag;      /* si+St_ResInfo */
+-    	resinfo = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ResInfo;
+-    	crt2crtc = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_CRT2CRTC;
++  if(ModeNo <= 0x13) {
++     modeflag = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ModeFlag;
++     resinfo = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ResInfo;
++     crt2crtc = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_CRT2CRTC;
+   } else {
+-    	modeflag = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_ModeFlag;     /* si+Ext_ResInfo */
++     if(SiS_Pr->UseCustomMode) {
++        modeflag = SiS_Pr->CModeFlag;
++	resinfo = 0;
++	crt2crtc = 0;
++     } else {
++        modeflag = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+     	resinfo = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_RESINFO;
+     	crt2crtc = SiS_Pr->SiS_RefIndex[RefreshRateTableIndex].Ext_CRT2CRTC;
++     }
+   }
+ 
+   tempcx = SiS_Pr->SiS_VBInfo;
+@@ -6984,9 +7238,9 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHOR
+   temp |= ((tempbx & 0x00FF) >> 3);
+   temp ^= 0x0C;
+ 
+-  /* TW: From 1.10.7w (no vb check there; don't care - this only disables SVIDEO and CVBS signal) */
++  /* From 1.10.7w (no vb check there; don't care - this only disables SVIDEO and CVBS signal) */
+   if(SiS_Pr->SiS_VBType & VB_SIS301LV302LV) {
+-  	temp |= 0x0c;
++     temp |= 0x0c;
+   }
+ 
+   PhasePoint  = SiS_Pr->SiS_PALPhase;
+@@ -6994,44 +7248,44 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHOR
+   
+   if(SiS_Pr->SiS_VBInfo & SetCRT2ToHiVisionTV) {          
+   
+-    temp ^= 0x01;
+-    if(SiS_Pr->SiS_VBInfo & SetInSlaveMode) {
+-      TimingPoint = SiS_Pr->SiS_HiTVSt2Timing;
+-      if(SiS_Pr->SiS_SetFlag & TVSimuMode) {
+-        if(modeflag & Charx8Dot) TimingPoint = SiS_Pr->SiS_HiTVSt1Timing;
+-        else TimingPoint = SiS_Pr->SiS_HiTVTextTiming;
+-      }
+-    } else TimingPoint = SiS_Pr->SiS_HiTVExtTiming;
+-    
+-    if(SiS_Pr->SiS_HiVision & 0x03) temp &= 0xfe;
+-    
++     temp ^= 0x01;
++     if(SiS_Pr->SiS_VBInfo & SetInSlaveMode) {
++        TimingPoint = SiS_Pr->SiS_HiTVSt2Timing;
++        if(SiS_Pr->SiS_SetFlag & TVSimuMode) {
++           if(modeflag & Charx8Dot) TimingPoint = SiS_Pr->SiS_HiTVSt1Timing;
++           else TimingPoint = SiS_Pr->SiS_HiTVTextTiming;
++        }
++     } else TimingPoint = SiS_Pr->SiS_HiTVExtTiming;
++
++     if(SiS_Pr->SiS_HiVision & 0x03) temp &= 0xfe;
++
+   } else {
+-  
+-    if(SiS_Pr->SiS_VBInfo & SetPALTV){
+ 
+-      TimingPoint = SiS_Pr->SiS_PALTiming;
+-      PhasePoint  = SiS_Pr->SiS_PALPhase;
++     if(SiS_Pr->SiS_VBInfo & SetPALTV){
+ 
+-      if( (SiS_Pr->SiS_VBType & VB_SIS301B302B) &&
+-          ( (!(SiS_Pr->SiS_VBInfo & SetInSlaveMode)) ||
+-	    (SiS_Pr->SiS_SetFlag & TVSimuMode) ) ) {
+-         PhasePoint = SiS_Pr->SiS_PALPhase2;
+-      }
++        TimingPoint = SiS_Pr->SiS_PALTiming;
++        PhasePoint  = SiS_Pr->SiS_PALPhase;
+ 
+-    } else {
++        if( (SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) &&
++            ( (!(SiS_Pr->SiS_VBInfo & SetInSlaveMode)) ||
++	      (SiS_Pr->SiS_SetFlag & TVSimuMode) ) ) {
++           PhasePoint = SiS_Pr->SiS_PALPhase2;
++        }
++
++     } else {
+ 
+         temp |= 0x10;
+-	TimingPoint = SiS_Pr->SiS_NTSCTiming;
+-	PhasePoint  = SiS_Pr->SiS_NTSCPhase;
++        TimingPoint = SiS_Pr->SiS_NTSCTiming;
++        PhasePoint  = SiS_Pr->SiS_NTSCPhase;
+ 
+-        if( (SiS_Pr->SiS_VBType & VB_SIS301B302B) &&
++        if( (SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) &&
+ 	    ( (!(SiS_Pr->SiS_VBInfo & SetInSlaveMode)) ||
+ 	      (SiS_Pr->SiS_SetFlag & TVSimuMode) ) ) {
+-        	PhasePoint = SiS_Pr->SiS_NTSCPhase2;
++           PhasePoint = SiS_Pr->SiS_NTSCPhase2;
+         }
+ 
+-    }
+-    
++     }
++
+   }
+   SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x00,temp);
+ 
+@@ -7044,36 +7298,35 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHOR
+      temp = 0x38;
+   }
+   if(temp) {
+-    if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
+-      if(SiS_GetReg1(SiS_Pr->SiS_P3d4,0x31) & 0x01) {
+-          temp1 = SiS_GetReg1(SiS_Pr->SiS_P3d4,temp);
+-          if(temp1 & EnablePALM) {	/* 0x40 */
+-              	PhasePoint = SiS_Pr->SiS_PALMPhase;
+-		if( (SiS_Pr->SiS_VBType & VB_SIS301B302B) &&
+-		    ( (!(SiS_Pr->SiS_VBInfo & SetInSlaveMode)) ||
+-		      (SiS_Pr->SiS_SetFlag & TVSimuMode) ) ) {
+-	           PhasePoint = SiS_Pr->SiS_PALMPhase2;
+-		}
+-	  }
+-          if(temp1 & EnablePALN) {	/* 0x80 */
+-               	PhasePoint = SiS_Pr->SiS_PALNPhase;
+-		if( (SiS_Pr->SiS_VBType & VB_SIS301B302B) &&
+-		    ( (!(SiS_Pr->SiS_VBInfo & SetInSlaveMode)) ||
+-		      (SiS_Pr->SiS_SetFlag & TVSimuMode) ) ) {
+-	           PhasePoint = SiS_Pr->SiS_PALNPhase2;
+-		}
+-	  }
+-      }
+-    }
++     if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
++        if(SiS_GetReg1(SiS_Pr->SiS_P3d4,0x31) & 0x01) {
++           temp1 = SiS_GetReg1(SiS_Pr->SiS_P3d4,temp);
++           if(temp1 & EnablePALM) {	/* 0x40 */
++              PhasePoint = SiS_Pr->SiS_PALMPhase;
++	      if( (SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) &&
++		  ( (!(SiS_Pr->SiS_VBInfo & SetInSlaveMode)) ||
++		    (SiS_Pr->SiS_SetFlag & TVSimuMode) ) ) {
++	         PhasePoint = SiS_Pr->SiS_PALMPhase2;
++	      }
++	   }
++           if(temp1 & EnablePALN) {	/* 0x80 */
++              PhasePoint = SiS_Pr->SiS_PALNPhase;
++	      if( (SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) &&
++		  ( (!(SiS_Pr->SiS_VBInfo & SetInSlaveMode)) ||
++		    (SiS_Pr->SiS_SetFlag & TVSimuMode) ) ) {
++	         PhasePoint = SiS_Pr->SiS_PALNPhase2;
++	      }
++	   }
++        }
++     }
+   }
+ 
+ #ifdef SIS315H
+-  /* TW: 650/301LV BIOS */
+   if(HwDeviceExtension->jChipType >= SIS_315H) {
+      if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {  
+         if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
+            if(!(SiS_Pr->SiS_VBInfo & SetPALTV)) {
+-              if((ModeNo == 0x4a) || (ModeNo == 0x38)) {
++              if((ModeNo == 0x64) || (ModeNo == 0x4a) || (ModeNo == 0x38)) {
+ 	         PhasePoint = SiS_Pr->SiS_SpecialPhase;
+ 	      }
+            }
+@@ -7094,12 +7347,12 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHOR
+   }
+ 
+   if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
+-    if(HwDeviceExtension->jChipType >= SIS_315H) {
+-      if(!(SiS_Pr->SiS_ModeType & 0x07))
++     if(HwDeviceExtension->jChipType >= SIS_315H) {
++        if(!(SiS_Pr->SiS_ModeType & 0x07))
++           SiS_SetRegAND(SiS_Pr->SiS_Part2Port,0x3A,0x1F);
++     } else {
+         SiS_SetRegAND(SiS_Pr->SiS_Part2Port,0x3A,0x1F);
+-    } else {
+-      SiS_SetRegAND(SiS_Pr->SiS_Part2Port,0x3A,0x1F);
+-    }
++     }
+   }
+ 
+   SiS_SetRegOR(SiS_Pr->SiS_Part2Port,0x0A,SiS_Pr->SiS_NewFlickerMode);
+@@ -7110,11 +7363,11 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHOR
+   SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x38,SiS_Pr->SiS_RY4COE);
+ 
+   if(SiS_Pr->SiS_VBInfo & SetCRT2ToHiVisionTV) {
+-      if(SiS_Pr->SiS_HiVision == 3) tempax = 950;
+-      else tempax = 440;
++     if(SiS_Pr->SiS_HiVision == 3) tempax = 950;
++     else tempax = 440;
+   } else {
+-    if(SiS_Pr->SiS_VBInfo & SetPALTV) tempax = 520;
+-    else tempax = 440;
++     if(SiS_Pr->SiS_VBInfo & SetPALTV) tempax = 520;
++     else tempax = 440;
+   }
+ 
+   if( ( ( (!(SiS_Pr->SiS_VBInfo & SetCRT2ToTV)) || (SiS_Pr->SiS_HiVision == 3) ) && (SiS_Pr->SiS_VDE <= tempax) ) ||
+@@ -7134,18 +7387,18 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHOR
+      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x02,temp);
+ 
+      if( (SiS_Pr->SiS_VBInfo & (SetCRT2ToTV - SetCRT2ToHiVisionTV)) &&
+-        (SiS_Pr->SiS_HiVision != 3) &&
+-        (SiS_Pr->SiS_VGAHDE >= 1024) ) {
++         (SiS_Pr->SiS_HiVision != 3) &&
++         (SiS_Pr->SiS_VGAHDE >= 1024) ) {
+         if(SiS_Pr->SiS_VBInfo & SetPALTV) {
+            SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x01,0x19);
+            SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x02,0x52);
+         } else {
+            if(HwDeviceExtension->jChipType >= SIS_315H) {
+-             SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x01,0x17);
+-             SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x02,0x1d);
++              SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x01,0x17);
++              SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x02,0x1d);
+ 	   } else {
+-             SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x01,0x0b);
+-             SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x02,0x11);
++              SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x01,0x0b);
++              SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x02,0x11);
+ 	   }
+         }
+      }
+@@ -7154,7 +7407,7 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHOR
+ 
+   tempcx = SiS_Pr->SiS_HT;
+ 
+-  /* TW: 650/30xLV 1.10.6s */
++  /* 650/30xLV 1.10.6s */
+   if(HwDeviceExtension->jChipType >= SIS_315H) {
+       if(SiS_GetReg1(SiS_Pr->SiS_P3d4,0x39) & 0x04) {
+       	   tempcx >>= 1;
+@@ -7181,7 +7434,7 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHOR
+   tempcx += 7;
+   if((SiS_Pr->SiS_VBInfo & SetCRT2ToHiVisionTV) &&
+      (SiS_Pr->SiS_HiVision == 3)) {
+-       tempcx -= 4;
++     tempcx -= 4;
+   }
+   temp = (tempcx & 0x00FF) << 4;
+   SiS_SetRegANDOR(SiS_Pr->SiS_Part2Port,0x22,0x0F,temp);
+@@ -7201,8 +7454,8 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHOR
+   tempbx += 8;
+   if((SiS_Pr->SiS_VBInfo & SetCRT2ToHiVisionTV) &&
+      (SiS_Pr->SiS_HiVision == 3)) {
+-    tempbx -= 4;
+-    tempcx = tempbx;
++     tempbx -= 4;
++     tempcx = tempbx;
+   }
+   temp = (tempbx & 0x00FF) << 4;
+   SiS_SetRegANDOR(SiS_Pr->SiS_Part2Port,0x29,0x0F,temp);
+@@ -7231,8 +7484,8 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHOR
+ 
+   tempcx -= 11;
+   if(!(SiS_Pr->SiS_VBInfo & SetCRT2ToTV)) {
+-    tempax = SiS_GetVGAHT2(SiS_Pr) - 1;
+-    tempcx = tempax;
++     tempax = SiS_GetVGAHT2(SiS_Pr) - 1;
++     tempcx = tempax;
+   }
+   temp = tempcx & 0x00FF;
+   SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x2E,temp);
+@@ -7242,38 +7495,38 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHOR
+   if(SiS_Pr->SiS_VGAVDE == 375) tempbx = 746;
+   if(SiS_Pr->SiS_VGAVDE == 405) tempbx = 853;
+   if(HwDeviceExtension->jChipType < SIS_315H) {
+-  	if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) tempbx >>= 1;
++     if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) tempbx >>= 1;
+   } else {
+-	if((SiS_Pr->SiS_VBInfo & SetCRT2ToTV) && (!(SiS_Pr->SiS_HiVision & 0x03))) {
+-	   tempbx >>= 1;
+-	   if(SiS_Pr->SiS_SetFlag & TVSimuMode) {
+-	      if(ModeNo <= 0x13) {
+-	         if(crt2crtc == 1) {
+-	            tempbx++;
+-                 }
+-	      }
+-	   } else {
+-              if(SiS_Pr->SiS_VBInfo & SetInSlaveMode) {
+-	         if(crt2crtc == 4)   /* TW: BIOS calls GetRatePtrCRT2 here - does not make sense */
+-                    if(SiS_Pr->SiS_ModeType <= 3) tempbx++;
+-	      }
++     if((SiS_Pr->SiS_VBInfo & SetCRT2ToTV) && (!(SiS_Pr->SiS_HiVision & 0x03))) {
++	tempbx >>= 1;
++	if(SiS_Pr->SiS_SetFlag & TVSimuMode) {
++	   if(ModeNo <= 0x13) {
++	      if(crt2crtc == 1) {
++	         tempbx++;
++              }
+ 	   }
+-        }
++	} else {
++           if(SiS_Pr->SiS_VBInfo & SetInSlaveMode) {
++	      if(crt2crtc == 4)   /* BIOS calls GetRatePtrCRT2 here - does not make sense */
++                 if(SiS_Pr->SiS_ModeType <= 3) tempbx++;
++	   }
++	}
++     }
+   }
+   tempbx -= 2;
+   temp = tempbx & 0x00FF;
+   if((SiS_Pr->SiS_VBInfo & SetCRT2ToHiVisionTV) &&
+      (SiS_Pr->SiS_HiVision == 3)) {
+-    if(SiS_Pr->SiS_VBInfo & SetInSlaveMode) {
+-      if(ModeNo == 0x2f) temp++;
+-    }
++     if(SiS_Pr->SiS_VBInfo & SetInSlaveMode) {
++        if((ModeNo == 0x2f) || (ModeNo == 0x5d) || (ModeNo == 0x5e)) temp++;
++     }
+   }
+-  /* TW: From 1.10.7w - doesn't make sense */
++  /* From 1.10.7w - doesn't make sense */
+   if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
+      if(SiS_Pr->SiS_VBInfo & SetInSlaveMode) {
+         if(!(SiS_Pr->SiS_VBInfo & SetPALTV)) {
+ 	   if(!(SiS_Pr->SiS_SetFlag & LCDVESATiming)) {   /* SetFlag?? */
+-	       if(ModeNo == 0x03) temp++;
++	      if(ModeNo == 0x03) temp++;
+ 	   }
+ 	}
+      }
+@@ -7285,15 +7538,15 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHOR
+   tempax |= (tempbx & 0xFF00);
+   if(HwDeviceExtension->jChipType < SIS_315H) {
+      if(!(SiS_Pr->SiS_VBInfo & SetCRT2ToHiVisionTV)) {
+-        if(!(SiS_Pr->SiS_VBInfo & SetCRT2ToSCART)) {		/* TW: New from 630/301B (II) BIOS */
++        if(!(SiS_Pr->SiS_VBInfo & SetCRT2ToSCART)) {		/* New from 630/301B (II) BIOS */
+            tempax |= 0x1000;
+            if(!(SiS_Pr->SiS_VBInfo & SetCRT2ToSVIDEO))  tempax |= 0x2000;
+         }
+      }
+   } else {
+      /* TODO Check this with other BIOSes */
+-     if((!(SiS_Pr->SiS_VBInfo & SetCRT2ToHiVisionTV)) && 
+-        (SiS_Pr->SiS_HiVision == 3)) {
++     if((!(SiS_Pr->SiS_VBInfo & SetCRT2ToHiVisionTV))
++         /* && (SiS_Pr->SiS_HiVision == 3) */ ) {
+ 	tempax |= 0x1000;
+         if(!(SiS_Pr->SiS_VBInfo & SetCRT2ToSVIDEO))  tempax |= 0x2000;
+      }
+@@ -7301,12 +7554,12 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHOR
+   temp = (tempax & 0xFF00) >> 8;
+   SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x30,temp);
+ 
+-  /* TW: 650/30xLV 1.10.6s */
++  /* 650/30xLV 1.10.6s */
+   if(HwDeviceExtension->jChipType > SIS_315H) {
+      if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
+         if( (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050) ||
+             (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1600x1200) ) {
+-            SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x10,0x60);
++           SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x10,0x60);
+         }
+      }
+   }
+@@ -7322,79 +7575,70 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHOR
+      }
+   }
+ 
+-  if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {     
+-    tempbx = SiS_Pr->SiS_VDE;
+-    if((SiS_Pr->SiS_VBInfo & SetCRT2ToTV) && (!(SiS_Pr->SiS_HiVision & 0x03))) {
+-         tempbx >>= 1;
+-    }
+-    tempbx -= 3;
+-    tempbx &= 0x03ff;
+-    temp = ((tempbx & 0xFF00) >> 8) << 5;
+-    temp |= 0x18;
+-    SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x46,temp);
+-    temp = tempbx & 0x00FF;
+-    SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x47,temp);	/* tv gatingno */
+-    if(HwDeviceExtension->jChipType >= SIS_315H) {	/* TW: 650/30xLV 1.10.6s */
+-       if(SiS_Pr->SiS_VBType & VB_SIS301LV302LV) {
+-          tempax = 0;
+-          if(SiS_Pr->SiS_HiVision & 0x03) {
+-	     tempax = 0x3000;
+-	     if(SiS_Pr->SiS_HiVision & 0x01) tempax = 0x5000;
+-	  }
+-	  temp = (tempax & 0xFF00) >> 8;
+-          SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x4d,temp);
+-       }
+-    }
++  if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
++     tempbx = SiS_Pr->SiS_VDE;
++     if((SiS_Pr->SiS_VBInfo & SetCRT2ToTV) && (!(SiS_Pr->SiS_HiVision & 0x03))) {
++        tempbx >>= 1;
++     }
++     tempbx -= 3;
++     tempbx &= 0x03ff;
++     temp = ((tempbx & 0xFF00) >> 8) << 5;
++     temp |= 0x18;
++     SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x46,temp);
++     temp = tempbx & 0x00FF;
++     SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x47,temp);	/* tv gatingno */
++     if(HwDeviceExtension->jChipType >= SIS_315H) {
++        if(SiS_Pr->SiS_VBType & VB_SIS301LV302LV) {
++           tempax = 0;
++           if(SiS_Pr->SiS_HiVision & 0x03) {
++ 	      tempax = 0x3000;
++	      if(SiS_Pr->SiS_HiVision & 0x01) tempax = 0x5000;
++	   }
++	   temp = (tempax & 0xFF00) >> 8;
++           SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x4d,temp);
++        }
++     }
+   }
+ 
+   tempbx &= 0x00FF;
+   if(!(modeflag & HalfDCLK)) {
+-    tempcx = SiS_Pr->SiS_VGAHDE;
+-    if(tempcx >= SiS_Pr->SiS_HDE) {
+-      tempbx |= 0x2000;
+-      tempax &= 0x00FF;
+-    }
++     if(SiS_Pr->SiS_VGAHDE >= SiS_Pr->SiS_HDE) {
++        tempbx |= 0x2000;
++        tempax &= 0x00FF;
++     }
+   }
+ 
+   tempcx = 0x0101;
+-/*if(SiS_Pr->SiS_VBInfo & (SetPALTV | SetCRT2ToTV)) {  */ /*301b- TW: BIOS BUG? */
++/*if(SiS_Pr->SiS_VBInfo & (SetPALTV | SetCRT2ToTV)) {  */ /* BIOS BUG? */
+   if(SiS_Pr->SiS_VBInfo & (SetCRT2ToTV - SetCRT2ToHiVisionTV)) {
+-    if(!(SiS_Pr->SiS_HiVision & 0x03)) {
+-      if(SiS_Pr->SiS_VGAHDE >= 1024) {
+-        if((!(modeflag & HalfDCLK)) || (HwDeviceExtension->jChipType < SIS_315H)) {   /* TW: This check not in 630/301B */
+-          tempcx = 0x1920;
+-          if(SiS_Pr->SiS_VGAHDE >= 1280) {
+-            tempcx = 0x1420;
+-            tempbx &= 0xDFFF;
+-          }
++     if(!(SiS_Pr->SiS_HiVision & 0x03)) {
++        if(SiS_Pr->SiS_VGAHDE >= 1024) {
++           if((!(modeflag & HalfDCLK)) || (HwDeviceExtension->jChipType < SIS_315H)) {
++              tempcx = 0x1920;
++              if(SiS_Pr->SiS_VGAHDE >= 1280) {
++                 tempcx = 0x1420;
++                 tempbx &= 0xDFFF;
++              }
++           }
+         }
+-      }
+-    }
++     }
+   }
+ 
+   if(!(tempbx & 0x2000)) {
+-    if(modeflag & HalfDCLK) {
+-         tempcx = (tempcx & 0xFF00) | (((tempcx & 0x00FF) << 1) & 0xff);
+-    }
+-    push1 = tempbx;
+-    tempeax = SiS_Pr->SiS_VGAHDE;
+-    tempebx = (tempcx & 0xFF00) >> 8;
+-    longtemp = tempeax * tempebx;
+-    tempecx = tempcx & 0x00FF;
+-    longtemp /= tempecx;
+-    longtemp <<= 0x0d;
+-    if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
++     if(modeflag & HalfDCLK) {
++        tempcx = (tempcx & 0xFF00) | ((tempcx << 1) & 0x00FF);
++     }
++     longtemp = (SiS_Pr->SiS_VGAHDE * ((tempcx & 0xFF00) >> 8)) / (tempcx & 0x00FF);
++     longtemp <<= 13;
++     if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
+      	longtemp <<= 3;
+-    }
+-    tempecx = SiS_Pr->SiS_HDE;
+-    temp2 = longtemp % tempecx;
+-    tempeax = longtemp / tempecx;
+-    if(temp2 != 0) tempeax++;
+-    tempax = (USHORT)tempeax;
+-    tempbx = push1;
+-    tempcx = (tempcx & 0xff00) | (((tempax & 0xFF00) >> 8) >> 5);
+-    tempbx |= (tempax & 0x1F00);
+-    tempax = ((tempax & 0x00FF) << 8) | (tempax & 0x00FF);
++     }
++     tempeax = longtemp / SiS_Pr->SiS_HDE;
++     if(longtemp % SiS_Pr->SiS_HDE) tempeax++;
++     tempax = (USHORT)tempeax;
++     tempcx = (tempcx & 0xFF00) | ((tempax & 0xFF00) >> (8 + 5));
++     tempbx |= (tempax & 0x1F00);
++     tempax = ((tempax & 0x00FF) << 8) | (tempax & 0x00FF);
+   }
+ 
+   temp = (tempax & 0xFF00) >> 8;
+@@ -7403,33 +7647,32 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHOR
+   SiS_SetRegANDOR(SiS_Pr->SiS_Part2Port,0x45,0xC0,temp);
+ 
+   if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
+-       temp = tempcx & 0x00FF;
+-       if(tempbx & 0x2000) temp = 0;
+-       temp |= 0x18;
+-       SiS_SetRegANDOR(SiS_Pr->SiS_Part2Port,0x46,0xE0,temp);
+-       if(SiS_Pr->SiS_VBInfo & SetPALTV) {
+-             tempbx = 0x0382;  
+-             tempcx = 0x007e;  
+-       } else {
+-             tempbx = 0x0369;  
+-             tempcx = 0x0061;  
+-       }
+-       temp = (tempbx & 0x00FF) ;
+-       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x4B,temp);
+-       temp = (tempcx & 0x00FF) ;
+-       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x4C,temp);
+-       tempbx &= 0x03FF;
+-       temp = (tempcx & 0xFF00) >> 8;
+-       temp = (temp & 0x0003) << 2;
+-       temp |= (tempbx >> 8);
+-       if(HwDeviceExtension->jChipType < SIS_315H) {
+-          SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x4D,temp);
+-       } else {
+-          SiS_SetRegANDOR(SiS_Pr->SiS_Part2Port,0x4D,0xF0,temp);
+-       }
++     temp = tempcx & 0x00FF;
++     if(tempbx & 0x2000) temp = 0;
++     temp |= 0x18;
++     SiS_SetRegANDOR(SiS_Pr->SiS_Part2Port,0x46,0xE0,temp);
+ 
+-       temp = SiS_GetReg1(SiS_Pr->SiS_Part2Port,0x43);
+-       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x43,(USHORT)(temp - 3));
++     if(SiS_Pr->SiS_VBInfo & SetPALTV) {
++        tempbx = 0x0382;
++        tempcx = 0x007e;
++     } else {
++        tempbx = 0x0369;
++        tempcx = 0x0061;
++     }
++     temp = (tempbx & 0x00FF) ;
++     SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x4B,temp);
++     temp = (tempcx & 0x00FF) ;
++     SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x4C,temp);
++     temp = (tempcx & 0x0300) >> (8 - 2);
++     temp |= ((tempbx >> 8) & 0x03);
++     if(HwDeviceExtension->jChipType < SIS_315H) {
++        SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x4D,temp);
++     } else {
++        SiS_SetRegANDOR(SiS_Pr->SiS_Part2Port,0x4D,0xF0,temp);
++     }
++
++     temp = SiS_GetReg1(SiS_Pr->SiS_Part2Port,0x43);
++     SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x43,(USHORT)(temp - 3));
+   }
+ 
+   temp = 0;
+@@ -7440,23 +7683,33 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHOR
+      temp = 0x38;
+   }
+   if(temp) {
+-      if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
+-          if(SiS_GetReg1(SiS_Pr->SiS_P3d4,0x31) & 0x01) {
+-               if(SiS_GetReg1(SiS_Pr->SiS_P3d4,temp) & EnablePALM) {  /* 0x40 */
+-                     SiS_SetRegAND(SiS_Pr->SiS_Part2Port,0x00,0xEF);
+-                     temp = SiS_GetReg1(SiS_Pr->SiS_Part2Port,0x01);
+-                     SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x01,temp - 1);
+-               }
+-          }
+-      }
++     if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
++        if(SiS_GetReg1(SiS_Pr->SiS_P3d4,0x31) & 0x01) {
++           if(SiS_GetReg1(SiS_Pr->SiS_P3d4,temp) & EnablePALM) {  /* 0x40 */
++              SiS_SetRegAND(SiS_Pr->SiS_Part2Port,0x00,0xEF);
++              temp = SiS_GetReg1(SiS_Pr->SiS_Part2Port,0x01);
++              SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x01,temp - 1);
++           }
++        }
++     }
+   }
+ 
++  if(HwDeviceExtension->jChipType >= SIS_315H) {
++     if((SiS_Pr->SiS_VBType & VB_SIS301B302B) && (!(SiS_Pr->SiS_VBType & VB_NoLCD))) {
++        if(!(SiS_Pr->SiS_VBInfo & SetInSlaveMode)) {
++           SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x0B,0x00);
++        }
++     }
++  }
++
++#if 0  /* Old: Why HiVision? */
+   if( (SiS_Pr->SiS_VBInfo & SetCRT2ToHiVisionTV) &&
+       (!(SiS_Pr->SiS_VBType & VB_SIS301LV302LV)) ) {
+-    if(!(SiS_Pr->SiS_VBInfo & SetInSlaveMode)) {
+-      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x0B,0x00);
+-    }
++     if(!(SiS_Pr->SiS_VBInfo & SetInSlaveMode)) {
++        SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x0B,0x00);
++     }
+   }
++#endif
+ 
+   if(HwDeviceExtension->jChipType < SIS_315H) {
+      if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
+@@ -7465,74 +7718,43 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHOR
+ 	return;
+      }
+   } else {
+-     /* TW: !!! The following is a duplicate, done for LCDA as well (see above) */
++     /* !!! The following is a duplicate, done for LCDA as well (see above) */
+      if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
+-       if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {    
+-         if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
+-           if(!(SiS_Pr->SiS_VBInfo & SetPALTV)) {
+-             if((ModeNo == 0x4a) || (ModeNo == 0x38)) {
+-               SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x1c,0xa7);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x1d,0x07);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x1e,0xf2);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x1f,0x6e);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x20,0x17);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x21,0x8b);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x22,0x73);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x23,0x53);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x24,0x13);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x25,0x40);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x26,0x34);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x27,0xf4);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x28,0x63);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x29,0xbb);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x2a,0xcc);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x2b,0x7a);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x2c,0x58);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x2d,0xe4);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x2e,0x73);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x2f,0xda);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x30,0x13);
+-	       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x43,0x72);
+-	     }
+-           }
+-         }
+-       }
+-       return;
++        SiS_SetTVSpecial(SiS_Pr, ModeNo);
++        return;
+      }
+   }
+ 
+-  /* TW: From here: Part2 LCD setup */
++  /* From here: Part2 LCD setup */
+ 
+   tempbx = SiS_Pr->SiS_HDE;
+   if(HwDeviceExtension->jChipType >= SIS_315H) {
+-      /* TW: 650/30xLV 1.10.6s */
+-      if(SiS_GetReg1(SiS_Pr->SiS_P3d4,0x39) & 0x04) tempbx >>= 1;
++     /* 650/30xLV 1.10.6s */
++     if(SiS_GetReg1(SiS_Pr->SiS_P3d4,0x39) & 0x04) tempbx >>= 1;
+   }
+   tempbx--;			         	/* RHACTE=HDE-1 */
+   temp = tempbx & 0x00FF;
+   SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x2C,temp);
+-  temp = (tempbx & 0xFF00) >> 8;
+-  temp <<= 4;
++  temp = (tempbx & 0xFF00) >> 4;
+   SiS_SetRegANDOR(SiS_Pr->SiS_Part2Port,0x2B,0x0F,temp);
+ 
+   temp = 0x01;
+   if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) {
+-    if(SiS_Pr->SiS_ModeType == ModeEGA) {
+-      if(SiS_Pr->SiS_VGAHDE >= 1024) {
+-        temp = 0x02;
+-	if(HwDeviceExtension->jChipType >= SIS_315H) {
+-           if(SiS_Pr->SiS_SetFlag & LCDVESATiming) {
+-             temp = 0x01;
++     if(SiS_Pr->SiS_ModeType == ModeEGA) {
++        if(SiS_Pr->SiS_VGAHDE >= 1024) {
++           temp = 0x02;
++	   if(HwDeviceExtension->jChipType >= SIS_315H) {
++              if(SiS_Pr->SiS_SetFlag & LCDVESATiming) {
++                 temp = 0x01;
++	      }
+ 	   }
+-	}
+-      }
+-    }
++        }
++     }
+   }
+   SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x0B,temp);
+ 
+-  tempbx = SiS_Pr->SiS_VDE;         		/* RTVACTEO=(VDE-1)&0xFF */
+-  push1 = tempbx;
+-
++  tempbx = SiS_Pr->SiS_VDE;         		/* RTVACTEO = VDE - 1 */
++  /* push1 = tempbx; */
+   tempbx--;
+   temp = tempbx & 0x00FF;
+   SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x03,temp);
+@@ -7540,10 +7762,9 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHOR
+   SiS_SetRegANDOR(SiS_Pr->SiS_Part2Port,0x0C,0xF8,temp);
+ 
+   tempcx = SiS_Pr->SiS_VT;
+-  push2 = tempcx;
+-
++  /* push2 = tempcx; */
+   tempcx--;
+-  temp = tempcx & 0x00FF;  			 /* RVTVT=VT-1 */
++  temp = tempcx & 0x00FF;  			 /* RVTVT = VT - 1 */
+   SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x19,temp);
+ 
+   temp = (tempcx & 0xFF00) >> 8;
+@@ -7551,40 +7772,42 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHOR
+   
+   /* Enable dithering; newer versions only do this for 32bpp mode */
+   if((HwDeviceExtension->jChipType == SIS_300) && (SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV)) {
+-    if(SiS_Pr->SiS_LCDInfo & LCDRGB18Bit) temp |= 0x10;
++     if(SiS_Pr->SiS_LCDInfo & LCDRGB18Bit) temp |= 0x10;
+   } else if(HwDeviceExtension->jChipType < SIS_315H) {
+-    if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) temp |= 0x10;
+-    else {
+-      if(SiS_Pr->SiS_LCDInfo & LCDSync)       /* TW: 630/301 BIOS checks this */
+-         temp |= 0x10;
+-    }
++     temp |= 0x10;
+   } else {
+-      if(SiS_Pr->SiS_VBType & VB_SIS301LV302LV) {
+-         /* TW: 650/30xLV 1.10.6s */
+-         if(SiS_Pr->SiS_LCDInfo & LCDRGB18Bit) {
+-            if(SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x00) & 0x01) {  /* 32bpp mode? */
+-      	       temp |= 0x10;
+-	    }
+-         }
+-      } else {
+-         temp |= 0x10;
+-      }
++     if(SiS_Pr->SiS_VBType & VB_SIS301LV302LV) {
++        /* 650/30xLV 1.10.6s */
++        if(SiS_Pr->SiS_LCDInfo & LCDRGB18Bit) {
++           if(SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x00) & 0x01) {  /* 32bpp mode? */
++              temp |= 0x10;
++	   }
++        }
++     } else {
++        temp |= 0x10;
++     }
+   }
+ 
+   /* 630/301 does not do all this */
+   if((SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) && (SiS_Pr->SiS_VBInfo & SetCRT2ToLCD)) {
+      if((HwDeviceExtension->jChipType >= SIS_315H) && (SiS_Pr->SiS_VBType & VB_SIS301LV302LV)) {
+-        /* TW: 650/30xLV 1.10.6s */
+-        temp |= (SiS_GetReg1(SiS_Pr->SiS_P3d4,0x37) >> 6);
+-	temp |= 0x08;   					/* From 1.10.7w */
+-	if(!(SiS_Pr->SiS_LCDInfo & LCDRGB18Bit)) temp |= 0x04; 	/* From 1.10.7w */
+-     } else {
+-        tempbx = (tempbx & 0xFF00) | (SiS_Pr->SiS_LCDInfo & 0x0FF);
+-        if(tempbx & LCDSync) {
+-           tempbx &= 0xFFE0;
+-           tempbx = (tempbx & 0xFF00) | ((tempbx & 0x00FF) >> 6);
+-           temp |= (tempbx & 0x00FF);
+-        }
++	if((SiS_Pr->SiS_CustomT == CUT_COMPAQ1280) &&
++	   (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024)) {
++#ifdef SIS315H
++	   if(SiS_Pr->SiS_LCDInfo & LCDSync) {
++	      temp |= (SiS_Pr->SiS_LCDInfo >> 6);
++	   }
++#endif
++	} else {
++	   /* 650/30xLV 1.10.6s */
++           temp |= (SiS_GetReg1(SiS_Pr->SiS_P3d4,0x37) >> 6);
++	   temp |= 0x08;   						/* From 1.10.7w */
++	   if(!(SiS_Pr->SiS_LCDInfo & LCDRGB18Bit)) temp |= 0x04; 	/* From 1.10.7w */
++	}
++     } else {
++        if(SiS_Pr->SiS_LCDInfo & LCDSync) {
++	   temp |= (SiS_Pr->SiS_LCDInfo >> 6);
++	}
+      }
+   }
+   SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x1A,temp);
+@@ -7595,24 +7818,22 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHOR
+   SiS_SetRegAND(SiS_Pr->SiS_Part2Port,0x17,0xFB);
+   SiS_SetRegAND(SiS_Pr->SiS_Part2Port,0x18,0xDF);
+ 
+-  /* 1280x960, 1280x1024 and 1600x1200 data invalid/missing in tables, use old calculation */
+-  if((HwDeviceExtension->jChipType >= SIS_315H)             && 
+-     (SiS_Pr->SiS_VBType & VB_SIS301LV302LV)                &&  
+-     (SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel1280x1024) &&
+-     (SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel1600x1200) &&
+-     (SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel1280x960)) {
++  if((HwDeviceExtension->jChipType >= SIS_315H)         &&
++     (SiS_Pr->SiS_VBType & VB_SIS301LV302LV)            &&
++     ((SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768)  ||
++      (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) ||
++      (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050) ||
++      (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1600x1200)) ) {
+      
+-#ifdef SIS315H 							/* ------------- 310/325/330 series ------------ */
++#ifdef SIS315H 							/* ------------- 315/330 series ------------ */
+ 
+-      /* TW: Inserted this entire section from 650/301LV(x) BIOS */
+-      
+       /* Using this on the 301B with an auto-expanding 1024 panel (CR37=1) results
+        * in a black bar in modes < 1024; if the panel is non-expanding, the bridge
+        * scales all modes to 1024. All modes in both variants (exp/non-exp) work.
+        */
+ 
+       SiS_GetCRT2Part2Ptr(SiS_Pr,ROMAddr,ModeNo,ModeIdIndex,RefreshRateTableIndex,
+-                         &CRT2Index,&resindex);
++                         &CRT2Index,&resindex,HwDeviceExtension);
+ 
+       switch(CRT2Index) {
+         case Panel_1024x768      : CRT2Part2Ptr = SiS_Pr->SiS_CRT2Part2_1024x768_1;  break;  /* "Normal" */
+@@ -7627,6 +7848,9 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHOR
+         case Panel_1280x1024 + 32: CRT2Part2Ptr = SiS_Pr->SiS_CRT2Part2_1280x1024_3; break;
+ 	case Panel_1400x1050 + 32: CRT2Part2Ptr = SiS_Pr->SiS_CRT2Part2_1400x1050_3; break;
+ 	case Panel_1600x1200 + 32: CRT2Part2Ptr = SiS_Pr->SiS_CRT2Part2_1600x1200_3; break;
++	case 100:		   CRT2Part2Ptr = (SiS_Part2PortTblStruct *)SiS310_CRT2Part2_Compaq1280x1024_1; break;  /* Custom */
++	case 101:		   CRT2Part2Ptr = (SiS_Part2PortTblStruct *)SiS310_CRT2Part2_Compaq1280x1024_2; break;
++	case 102:		   CRT2Part2Ptr = (SiS_Part2PortTblStruct *)SiS310_CRT2Part2_Compaq1280x1024_3; break;
+ 	default:                   CRT2Part2Ptr = SiS_Pr->SiS_CRT2Part2_1024x768_3;  break;
+       }
+ 
+@@ -7653,8 +7877,7 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHOR
+ 	  }
+ 	  SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x2f,temp);
+ 	  SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x30,0xb3);
+-	}
+-	if(SiS_Pr->SiS_VGAVDE == 420) {
++	} else if(SiS_Pr->SiS_VGAVDE == 420) {
+ 	  temp = 0x4d;
+ 	  if(SiS_Pr->SiS_ModeType <= ModeVGA) {
+ 	     temp++;
+@@ -7664,7 +7887,6 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHOR
+ 	}
+      }
+ 
+-     /* TW: 650/30xLV 1.10.6s: */
+      /* !!! This is a duplicate, done for LCDA as well - see above */
+      if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
+         if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050) {
+@@ -7683,59 +7905,46 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHOR
+        * the bridge scales all modes to 1024.
+        * !!! Malfunction at 640x480 and 640x400 when panel is auto-expanding - black screen !!!
+        */
+-  
++
++    /* cx = VT - 1 */
++
+     tempcx++;
+-    
+-    if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768)       tempbx =  768;
+-    else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) tempbx = 1024;
+-    else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1600x1200) tempbx = 1200;
+-    else if(SiS_Pr->SiS_VDE != 1024) 				  tempbx =  960;
+-    else            						  tempbx = 1024;
+-    
+-#if 0  /* old */
+-    tempbx = 768;
+-    if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel1024x768) {
+-      tempbx = 1024;
+-      if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel1280x1024) {
+-         tempbx = 1200;
+-         if(SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel1600x1200) {
+-            if(tempbx != SiS_Pr->SiS_VDE) {
+-               tempbx = 960;
+-            }
+-         }
+-      }
+-    }
+-#endif
+-    
++
++    tempbx = SiS_Pr->PanelYRes;
++
+     if(SiS_Pr->SiS_LCDInfo & DontExpandLCD) {
+-      tempbx = SiS_Pr->SiS_VDE - 1;
+-      tempcx--;
++       tempbx = SiS_Pr->SiS_VDE - 1;
++       tempcx--;
+     }
+-    
++
+     tempax = 1;
+     if(!(SiS_Pr->SiS_LCDInfo & DontExpandLCD)) {
+-      if(tempbx != SiS_Pr->SiS_VDE) {
+-        tempax = tempbx;
+-/*	if(SiS_Pr->SiS_VGAVDE == 525) tempax += 60;   in 650/301B BIOS */
+-        if(tempax < SiS_Pr->SiS_VDE) {
+-          tempax = 0;
+-          tempcx = 0;
+-        } else {
+-          tempax -= SiS_Pr->SiS_VDE;
+-        }
+-        tempax >>= 1;
+-      }
+-      tempcx -= tempax; /* lcdvdes */
+-      tempbx -= tempax; /* lcdvdee */
+-    } else {
+-      tempax >>= 1;
+-      tempcx -= tempax; /* lcdvdes */
+-      tempbx -= tempax; /* lcdvdee */
++       if(tempbx != SiS_Pr->SiS_VDE) {
++          tempax = tempbx;
++          if(tempax < SiS_Pr->SiS_VDE) {
++             tempax = 0;
++             tempcx = 0;
++          } else {
++             tempax -= SiS_Pr->SiS_VDE;
++          }
++          tempax >>= 1;
++       }
++       tempcx -= tempax; /* lcdvdes */
++       tempbx -= tempax; /* lcdvdee */
+     }
+-    
++#if 0  /* meaningless: 1 / 2 = 0... */
++    else {
++       tempax >>= 1;
++       tempcx -= tempax; /* lcdvdes */
++       tempbx -= tempax; /* lcdvdee */
++    }
++#endif
++
++    /* Non-expanding: lcdvdees = tempcx = VT-1; lcdvdee = tempbx = VDE-1 */
++
+ #ifdef TWDEBUG
+-    xf86DrvMsg(0, X_INFO, "lcdvds 0x%x lcdvde 0x%x\n", tempcx, tempbx);
+-#endif    
++    xf86DrvMsg(0, X_INFO, "lcdvdes 0x%x lcdvdee 0x%x\n", tempcx, tempbx);
++#endif
+ 
+     temp = tempcx & 0x00FF;   				/* RVEQ1EQ=lcdvdes */
+     SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x05,temp);
+@@ -7746,140 +7955,178 @@ SiS_SetGroup2(SiS_Private *SiS_Pr, USHOR
+     temp |= ((tempcx & 0xFF00) >> 8);
+     SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x02,temp);
+ 
+-    tempbx = push2;
+-    tempax = push1;
+-    tempcx = tempbx;
+-    tempcx -= tempax;
+-    tempcx >>= 4;
++    tempbx = SiS_Pr->SiS_VT;    /* push2; */
++    tempax = SiS_Pr->SiS_VDE;   /* push1; */
++    tempcx = (tempbx - tempax) >> 4;
+     tempbx += tempax;
+     tempbx >>= 1;
+     if(SiS_Pr->SiS_LCDInfo & DontExpandLCD)  tempbx -= 10;
+-    
++
++    /* non-expanding: lcdvrs = tempbx = ((VT + VDE) / 2) - 10 */
++
++    if(SiS_Pr->UseCustomMode) {
++       tempbx = SiS_Pr->CVSyncStart;
++    }
++
+ #ifdef TWDEBUG
+     xf86DrvMsg(0, X_INFO, "lcdvrs 0x%x\n", tempbx);
+ #endif
+ 
+-    temp = tempbx & 0x00FF;   				/* RTVACTEE=lcdvrs */
++    temp = tempbx & 0x00FF;   				/* RTVACTEE = lcdvrs */
+     SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x04,temp);
+ 
+     temp = ((tempbx & 0xFF00) >> 8) << 4;
+     tempbx += (tempcx + 1);
+     temp |= (tempbx & 0x000F);
++
++    if(SiS_Pr->UseCustomMode) {
++       temp &= 0xf0;
++       temp |= (SiS_Pr->CVSyncEnd & 0x0f);
++    }
++
++#ifdef TWDEBUG
++    xf86DrvMsg(0, X_INFO, "lcdvre[3:0] 0x%x\n", (temp & 0x0f));
++#endif
++
+     SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x01,temp);
+ 
+-    /* TW: Code from 630/301B (I+II) BIOS */
++    /* Code from 630/301B (I+II) BIOS */
+ 
+-    if( ( ( (HwDeviceExtension->jChipType == SIS_630) ||
+-            (HwDeviceExtension->jChipType == SIS_730) ) &&
+-          (HwDeviceExtension->jChipRevision > 2) )  &&
+-        (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) &&
+-        (!(SiS_Pr->SiS_SetFlag & LCDVESATiming))  &&
+-        (!(SiS_Pr->SiS_LCDInfo & DontExpandLCD)) ) {
+-            if(ModeNo == 0x13) {
+-              SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x04,0xB9);
+-              SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x05,0xCC);
+-              SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x06,0xA6);
+-            } else {
+-              if((crt2crtc & 0x3F) == 4) {
++    if(!SiS_Pr->UseCustomMode) {
++       if( ( ( (HwDeviceExtension->jChipType == SIS_630) ||
++               (HwDeviceExtension->jChipType == SIS_730) ) &&
++             (HwDeviceExtension->jChipRevision > 2) )  &&
++           (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) &&
++           (!(SiS_Pr->SiS_SetFlag & LCDVESATiming))  &&
++           (!(SiS_Pr->SiS_LCDInfo & DontExpandLCD)) ) {
++          if(ModeNo == 0x13) {
++             SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x04,0xB9);
++             SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x05,0xCC);
++             SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x06,0xA6);
++          } else {
++             if((crt2crtc & 0x3F) == 4) {
+                 SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x01,0x2B);
+                 SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x02,0x13);
+                 SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x04,0xE5);
+                 SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x05,0x08);
+                 SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x06,0xE2);
+-              }
+-            }
++             }
++          }
++       }
+     }
+ 
+-    /* TW: Inserted missing code from 630/301B BIOS;
+-     *     Strangely, this is done in all 650 BIOSes as
+-     *     well (although LCDTypeInfo is not used there
+-     *     in the same way as on 300 series)
+-     */
+-
+-    if(SiS_Pr->SiS_LCDTypeInfo == 0x0c) {
+-         crt2crtc &= 0x1f;
+-         tempcx = 0;
+-         if(!(SiS_Pr->SiS_VBInfo & SetNotSimuMode)) {
+-           if (SiS_Pr->SiS_VBInfo & SetInSlaveMode) {
+-              tempcx += 7;
+-           }
+-         }
+-         tempcx += crt2crtc;
+-         if (crt2crtc >= 4) {
+-           SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x06,0xff);
+-         }
++#ifdef SIS300
++    if(HwDeviceExtension->jChipType < SIS_315H) {
++       if(!SiS_Pr->UseCustomMode) {
++          if(SiS_Pr->SiS_LCDTypeInfo == 0x0c) {
++             crt2crtc &= 0x1f;
++             tempcx = 0;
++             if(!(SiS_Pr->SiS_VBInfo & SetNotSimuMode)) {
++                if(SiS_Pr->SiS_VBInfo & SetInSlaveMode) {
++                   tempcx += 7;
++                }
++             }
++             tempcx += crt2crtc;
++             if(crt2crtc >= 4) {
++                SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x06,0xff);
++             }
+ 
+-         if(!(SiS_Pr->SiS_VBInfo & SetNotSimuMode)) {
+-           if(SiS_Pr->SiS_VBInfo & SetInSlaveMode) {
+-             if(crt2crtc == 4) {
+-                SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x01,0x28);
++             if(!(SiS_Pr->SiS_VBInfo & SetNotSimuMode)) {
++                if(SiS_Pr->SiS_VBInfo & SetInSlaveMode) {
++                   if(crt2crtc == 4) {
++                      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x01,0x28);
++                   }
++                }
+              }
+-           }
+-         }
+-         SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x02,0x18);
+-         SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x04,atable[tempcx]);
++             SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x02,0x18);
++             SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x04,atable[tempcx]);
++          }
++       }
+     }
++#endif
+ 
+-    tempcx = (SiS_Pr->SiS_HT - SiS_Pr->SiS_HDE) >> 2;     /* (HT-HDE)>>2     */
++    tempcx = (SiS_Pr->SiS_HT - SiS_Pr->SiS_HDE) >> 2;     /* (HT - HDE) >> 2 */
+     tempbx = SiS_Pr->SiS_HDE + 7;            		  /* lcdhdee         */
+     if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
+-         tempbx += 2;
++       tempbx += 2;
+     }
+     push1 = tempbx;
++
+ #ifdef TWDEBUG
+-    xf86DrvMsg(0, X_INFO, "lcdhde 0x%x\n", tempbx);
+-#endif    
+-    temp = tempbx & 0x00FF;    			          /* RHEQPLE=lcdhdee */
++    xf86DrvMsg(0, X_INFO, "lcdhdee 0x%x\n", tempbx);
++#endif
++
++    temp = tempbx & 0x00FF;    			          /* RHEQPLE = lcdhdee */
+     SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x23,temp);
+     temp = (tempbx & 0xFF00) >> 8;
+     SiS_SetRegANDOR(SiS_Pr->SiS_Part2Port,0x25,0xF0,temp);
+ 
+     temp = 7;
+     if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
+-         temp += 2;
++       temp += 2;
+     }
+-    SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x1F,temp);  	  /* RHBLKE=lcdhdes[7:0] */
++    SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x1F,temp);  	  /* RHBLKE = lcdhdes[7:0] */
+     SiS_SetRegAND(SiS_Pr->SiS_Part2Port,0x20,0x0F);	  /* lcdhdes [11:8] */
+ 
+     tempbx += tempcx;
+     push2 = tempbx;
++
++    if(SiS_Pr->UseCustomMode) {
++       tempbx = SiS_Pr->CHSyncStart + 7;
++       if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
++          tempbx += 2;
++       }
++    }
++
+ #ifdef TWDEBUG
+     xf86DrvMsg(0, X_INFO, "lcdhrs 0x%x\n", tempbx);
+ #endif
+-    temp = tempbx & 0x00FF;            		          /* RHBURSTS=lcdhrs */
+-    if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) {
+-       if(SiS_Pr->SiS_LCDInfo & DontExpandLCD) { 
+-          if(SiS_Pr->SiS_HDE == 1280) temp = 0x47;
++
++    temp = tempbx & 0x00FF;            		          /* RHBURSTS = lcdhrs */
++    if(!SiS_Pr->UseCustomMode) {
++       if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) {
++          if(SiS_Pr->SiS_LCDInfo & DontExpandLCD) {
++             if(SiS_Pr->SiS_HDE == 1280) temp = 0x47;
++          }
+        }
+     }
+     SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x1C,temp);
+-    temp = ((tempbx & 0xFF00) >> 8) << 4;
++    temp = (tempbx & 0x0F00) >> 4;
+     SiS_SetRegANDOR(SiS_Pr->SiS_Part2Port,0x1D,0x0F,temp);
+ 
+     tempbx = push2;
+     tempcx <<= 1;
+     tempbx += tempcx;
++
++    if(SiS_Pr->UseCustomMode) {
++       tempbx = SiS_Pr->CHSyncEnd + 7;
++       if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
++          tempbx += 2;
++       }
++    }
++
+ #ifdef TWDEBUG
+     xf86DrvMsg(0, X_INFO, "lcdhre 0x%x\n", tempbx);
+-#endif    
+-    temp = tempbx & 0x00FF;            		          /* RHSYEXP2S=lcdhre */
++#endif
++
++    temp = tempbx & 0x00FF;            		          /* RHSYEXP2S = lcdhre */
+     SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x21,temp);
+ 
+     if(!(SiS_Pr->SiS_SetFlag & LCDVESATiming)) {
+-      if(SiS_Pr->SiS_VGAVDE == 525) {
+-        if(SiS_Pr->SiS_ModeType <= ModeVGA)
+-    	   temp=0xC6;
+-        else
+-       	   temp=0xC3;
+-        SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x2f,temp);
+-        SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x30,0xB3);
+-      } else if(SiS_Pr->SiS_VGAVDE == 420) {
+-        if(SiS_Pr->SiS_ModeType <= ModeVGA)
+-	   temp=0x4F;
+-        else
+-       	   temp=0x4D;   
+-        SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x2f,temp);
+-      }
++       if(SiS_Pr->SiS_VGAVDE == 525) {
++          if(SiS_Pr->SiS_ModeType <= ModeVGA)
++    	     temp=0xC6;
++          else
++       	     temp=0xC3;
++          SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x2f,temp);
++          SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x30,0xB3);
++       } else if(SiS_Pr->SiS_VGAVDE == 420) {
++          if(SiS_Pr->SiS_ModeType <= ModeVGA)
++	     temp=0x4F;
++          else
++       	     temp=0x4D;
++          SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x2f,temp);
++       }
+     }
+     SiS_Set300Part2Regs(SiS_Pr, HwDeviceExtension, ModeIdIndex,
+                         RefreshRateTableIndex, BaseAddr, ModeNo);
+@@ -7898,7 +8145,7 @@ SiS_GetVGAHT2(SiS_Private *SiS_Pr)
+   return((USHORT) tempax);
+ }
+ 
+-/* TW: New from 300/301LV BIOS 1.16.51 for ECS A907. Seems highly preliminary. */
++/* New from 300/301LV BIOS 1.16.51 for ECS A907. Seems highly preliminary. */
+ void
+ SiS_Set300Part2Regs(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension,
+     			USHORT ModeIdIndex, USHORT RefreshRateTableIndex,
+@@ -7910,18 +8157,19 @@ SiS_Set300Part2Regs(SiS_Private *SiS_Pr,
+ 
+   if(HwDeviceExtension->jChipType != SIS_300) return;
+   if(!(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV)) return;
++  if(SiS_Pr->UseCustomMode) return;
+ 
+-  if(ModeNo<=0x13) {
+-    	crt2crtc = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_CRT2CRTC;
++  if(ModeNo <= 0x13) {
++     crt2crtc = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_CRT2CRTC;
+   } else {
+-    	crt2crtc = SiS_Pr->SiS_RefIndex[RefreshRateTableIndex].Ext_CRT2CRTC;
++     crt2crtc = SiS_Pr->SiS_RefIndex[RefreshRateTableIndex].Ext_CRT2CRTC;
+   }
+ 
+   resindex = crt2crtc & 0x3F;
+   if(SiS_Pr->SiS_SetFlag & LCDVESATiming) CRT2Part2Ptr = SiS_Pr->SiS_CRT2Part2_1024x768_1;
+   else                                    CRT2Part2Ptr = SiS_Pr->SiS_CRT2Part2_1024x768_2;
+ 
+-  /* TW: The BIOS code (1.16.51) is obviously a fragment! */
++  /* The BIOS code (1.16.51) is obviously a fragment! */
+   if(ModeNo > 0x13) {
+      CRT2Part2Ptr = SiS_Pr->SiS_CRT2Part2_1024x768_1;
+      resindex = 4;
+@@ -7942,7 +8190,6 @@ SiS_Set300Part2Regs(SiS_Private *SiS_Pr,
+   SiS_SetRegANDOR(SiS_Pr->SiS_Part2Port,0x25,0x0f,(CRT2Part2Ptr+resindex)->CR[11]);
+ }
+ 
+-/* TW: Set 301 Macrovision(tm) registers */
+ void
+ SiS_SetGroup3(SiS_Private *SiS_Pr, USHORT  BaseAddr,UCHAR *ROMAddr,USHORT ModeNo,
+               USHORT ModeIdIndex,PSIS_HW_DEVICE_INFO HwDeviceExtension)
+@@ -7954,24 +8201,35 @@ SiS_SetGroup3(SiS_Private *SiS_Pr, USHOR
+ 
+   if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCDA) return;
+ 
+-  if(ModeNo<=0x13)
+-    	modeflag = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ModeFlag;
+-  else
++  if(ModeNo<=0x13) {
++     modeflag = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ModeFlag;
++  } else {
++     if(SiS_Pr->UseCustomMode) {
++        modeflag = SiS_Pr->CModeFlag;
++     } else {
+     	modeflag = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
++     }
++  }
+ 
++#ifndef SIS_CP
+   SiS_SetReg1(SiS_Pr->SiS_Part3Port,0x00,0x00);
++#endif
++
++#ifdef SIS_CP
++  SIS_CP_INIT301_CP
++#endif
+ 
+   if(SiS_Pr->SiS_VBInfo & SetPALTV) {
+-    SiS_SetReg1(SiS_Pr->SiS_Part3Port,0x13,0xFA);
+-    SiS_SetReg1(SiS_Pr->SiS_Part3Port,0x14,0xC8);
++     SiS_SetReg1(SiS_Pr->SiS_Part3Port,0x13,0xFA);
++     SiS_SetReg1(SiS_Pr->SiS_Part3Port,0x14,0xC8);
+   } else {
+-    if(HwDeviceExtension->jChipType >= SIS_315H) {
+-      SiS_SetReg1(SiS_Pr->SiS_Part3Port,0x13,0xF5);
+-      SiS_SetReg1(SiS_Pr->SiS_Part3Port,0x14,0xB7);
+-    } else {
+-      SiS_SetReg1(SiS_Pr->SiS_Part3Port,0x13,0xF6);
+-      SiS_SetReg1(SiS_Pr->SiS_Part3Port,0x14,0xBf);
+-    }
++     if(HwDeviceExtension->jChipType >= SIS_315H) {
++        SiS_SetReg1(SiS_Pr->SiS_Part3Port,0x13,0xF5);
++        SiS_SetReg1(SiS_Pr->SiS_Part3Port,0x14,0xB7);
++     } else {
++        SiS_SetReg1(SiS_Pr->SiS_Part3Port,0x13,0xF6);
++        SiS_SetReg1(SiS_Pr->SiS_Part3Port,0x14,0xBf);
++     }
+   }
+ 
+   temp = 0;
+@@ -7982,38 +8240,41 @@ SiS_SetGroup3(SiS_Private *SiS_Pr, USHOR
+      temp = 0x38;
+   }
+   if(temp) {
+-      if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
+-          if(SiS_GetReg1(SiS_Pr->SiS_P3d4,0x31) & 0x01) {
+-              if(SiS_GetReg1(SiS_Pr->SiS_P3d4,temp) & EnablePALM){  /* 0x40 */
+-                  SiS_SetReg1(SiS_Pr->SiS_Part3Port,0x13,0xFA);
+-                  SiS_SetReg1(SiS_Pr->SiS_Part3Port,0x14,0xC8);
+-                  SiS_SetReg1(SiS_Pr->SiS_Part3Port,0x3D,0xA8);
+-              }
+-          }
+-      }
++     if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
++        if(SiS_GetReg1(SiS_Pr->SiS_P3d4,0x31) & 0x01) {
++           if(SiS_GetReg1(SiS_Pr->SiS_P3d4,temp) & EnablePALM){  /* 0x40 */
++              SiS_SetReg1(SiS_Pr->SiS_Part3Port,0x13,0xFA);
++              SiS_SetReg1(SiS_Pr->SiS_Part3Port,0x14,0xC8);
++              SiS_SetReg1(SiS_Pr->SiS_Part3Port,0x3D,0xA8);
++           }
++        }
++     }
+   }
+ 
+   if(SiS_Pr->SiS_VBInfo & SetCRT2ToHiVisionTV) {
+-    tempdi = SiS_Pr->SiS_HiTVGroup3Data;
+-    if(SiS_Pr->SiS_SetFlag & TVSimuMode) {
+-      tempdi = SiS_Pr->SiS_HiTVGroup3Simu;
+-      if(!(modeflag & Charx8Dot)) {
+-        tempdi = SiS_Pr->SiS_HiTVGroup3Text;
+-      }
+-    }
+-    if(SiS_Pr->SiS_HiVision & 0x03) {
+-       tempdi = SiS_HiTVGroup3_1;
+-       if(SiS_Pr->SiS_HiVision & 0x02) tempdi = SiS_HiTVGroup3_2;
+-    }
+-    for(i=0; i<=0x3E; i++){
+-       SiS_SetReg1(SiS_Pr->SiS_Part3Port,i,tempdi[i]);
+-    }
++     tempdi = SiS_Pr->SiS_HiTVGroup3Data;
++     if(SiS_Pr->SiS_SetFlag & TVSimuMode) {
++        tempdi = SiS_Pr->SiS_HiTVGroup3Simu;
++        if(!(modeflag & Charx8Dot)) {
++           tempdi = SiS_Pr->SiS_HiTVGroup3Text;
++        }
++     }
++     if(SiS_Pr->SiS_HiVision & 0x03) {
++        tempdi = SiS_HiTVGroup3_1;
++        if(SiS_Pr->SiS_HiVision & 0x02) tempdi = SiS_HiTVGroup3_2;
++     }
++     for(i=0; i<=0x3E; i++){
++        SiS_SetReg1(SiS_Pr->SiS_Part3Port,i,tempdi[i]);
++     }
+   }
+ 
+-  return;
++#ifdef SIS_CP
++  SIS_CP_INIT301_CP2
++#endif
++
+ }
+ 
+-/* TW: Set 301 VGA2 registers */
++/* Set 301 VGA2 registers */
+ void
+ SiS_SetGroup4(SiS_Private *SiS_Pr, USHORT  BaseAddr,UCHAR *ROMAddr,USHORT ModeNo,
+               USHORT ModeIdIndex,USHORT RefreshRateTableIndex,
+@@ -8022,17 +8283,20 @@ SiS_SetGroup4(SiS_Private *SiS_Pr, USHOR
+   USHORT tempax,tempcx,tempbx,modeflag,temp,temp2,resinfo;
+   ULONG tempebx,tempeax,templong;
+ 
+-
+-  if(ModeNo<=0x13) {
+-    	modeflag = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ModeFlag;
+-	resinfo = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ResInfo;
++  if(ModeNo <= 0x13) {
++     modeflag = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ModeFlag;
++     resinfo = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ResInfo;
+   } else {
++     if(SiS_Pr->UseCustomMode) {
++        modeflag = SiS_Pr->CModeFlag;
++	resinfo = 0;
++     } else {
+     	modeflag = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+ 	resinfo = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_RESINFO;
++     }
+   }
+ 
+   if(HwDeviceExtension->jChipType >= SIS_315H) {
+-      /* TW: From 650/302LV 1.10.6s (not for 300/301LV - no LCDA on this combination) */
+      if(SiS_Pr->SiS_VBType & VB_SIS301LV302LV) {
+         if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCDA) {
+            SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x24,0x0e);
+@@ -8049,10 +8313,10 @@ SiS_SetGroup4(SiS_Private *SiS_Pr, USHOR
+   if(HwDeviceExtension->jChipType >= SIS_315H) {
+      if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCDA) {
+         if(SiS_Pr->SiS_VBType & VB_SIS301LV302LV) {
+-	   /* TW: From 650/301LV (any, incl. 1.10.6s, 1.10.7w) */
+-  	   /* TW: This is a duplicate; done at the end, too */
++	   /* From 650/301LV (any, incl. 1.10.6s, 1.10.7w) */
++  	   /* This is a duplicate; done at the end, too */
+ 	   if(SiS_GetReg1(SiS_Pr->SiS_P3d4,0x39) & 0x04) {
+-		SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x27,0x2c);
++	      SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x27,0x2c);
+ 	   }
+ 	   SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x2a,0x00);
+ 	   SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x30,0x00);
+@@ -8090,39 +8354,33 @@ SiS_SetGroup4(SiS_Private *SiS_Pr, USHOR
+   tempbx = SiS_Pr->SiS_VGAHDE;
+   if(modeflag & HalfDCLK)  tempbx >>= 1;
+ 
+-  /* TW: New for 650/301LV and 630/301B */
+   temp = 0xA0;
+   if(SiS_Pr->SiS_VBInfo & SetCRT2ToHiVisionTV) {
+-       temp = 0;
+-       if(tempbx > 800) {
+-          temp = 0xA0;
+-          if(tempbx != 1024) {
+-             temp = 0xC0;
+-             if(tempbx != 1280) temp = 0;
+-	  }
+-       }
+-  } else
+-    if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
+-      if(tempbx <= 800) {
+-         temp = 0x80;
+-	 if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
+-            temp = 0;
+-            if(tempbx > 800) temp = 0x60;
+-         }
+-      }
++     temp = 0;
++     if(tempbx > 800) {
++        temp = 0xA0;
++        if(tempbx != 1024) {
++           temp = 0xC0;
++           if(tempbx != 1280) temp = 0;
++	}
++     }
++  } else if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
++     if(tempbx <= 800) {
++        temp = 0x80;
++     }
+   } else {
+-      temp = 0x80;
+-      if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
+-            temp = 0;
+-            if(tempbx > 800) temp = 0x60;
+-      }
++     temp = 0x80;
++     if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
++        temp = 0;
++        if(tempbx > 800) temp = 0x60;
++     }
+   }
+   if(SiS_Pr->SiS_HiVision & 0x03) {
+         temp = 0;
+ 	if(SiS_Pr->SiS_VGAHDE == 1024) temp = 0x20;
+   }
+   if(HwDeviceExtension->jChipType >= SIS_315H) {
+-  	if(SiS_GetReg1(SiS_Pr->SiS_P3d4,0x39) & 0x04) temp = 0;
++     if(SiS_GetReg1(SiS_Pr->SiS_P3d4,0x39) & 0x04) temp = 0;
+   }
+ 
+   if(SiS_Pr->SiS_VBType & VB_SIS301) {
+@@ -8144,10 +8402,10 @@ SiS_SetGroup4(SiS_Private *SiS_Pr, USHOR
+ 
+   tempeax = SiS_Pr->SiS_VGAVDE;
+   tempcx |= 0x4000;
+-  if(tempeax <= tempebx){
+-    tempcx ^= 0x4000;
++  if(tempeax <= tempebx) {
++     tempcx ^= 0x4000;
+   } else {
+-    tempeax -= tempebx;
++     tempeax -= tempebx;
+   }
+ 
+   templong = (tempeax * 256 * 1024) % tempebx;
+@@ -8173,64 +8431,64 @@ SiS_SetGroup4(SiS_Private *SiS_Pr, USHOR
+          tempax = SiS_Pr->SiS_VGAHDE;
+          if(modeflag & HalfDCLK) tempax >>= 1;
+          if((SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) || (SiS_Pr->SiS_HiVision & 0x03)) {
+-	     if(HwDeviceExtension->jChipType >= SIS_315H) {
+-	         if(SiS_GetReg1(SiS_Pr->SiS_P3d4,0x39) & 0x04) tempax >>= 1;
+-		 else if(tempax > 800) tempax -= 800;
+-	     } else {
+-                 if(tempax > 800) tempax -= 800;
+-             }
++	    if(HwDeviceExtension->jChipType >= SIS_315H) {
++	       if(SiS_GetReg1(SiS_Pr->SiS_P3d4,0x39) & 0x04) tempax >>= 1;
++	       else if(tempax > 800) tempax -= 800;
++	    } else {
++               if(tempax > 800) tempax -= 800;
++            }
+          }
+ 
+ /*       if((SiS_Pr->SiS_VBInfo & (SetCRT2ToTV | SetPALTV)) && (!(SiS_Pr->SiS_HiVision & 0x03))) {  */
+  	 if((SiS_Pr->SiS_VBInfo & (SetCRT2ToTV - SetCRT2ToHiVisionTV)) && (!(SiS_Pr->SiS_HiVision & 0x03))) {
+-           if(tempax > 800) {
+-	      tempbx = 8;
+-              if(tempax == 1024)
+-	        tempax *= 25;
+-              else
+-	        tempax *= 20;
+-
+-	      temp = tempax % 32;
+-	      tempax /= 32;
+-	      tempax--;
+-	      if (temp!=0) tempax++;
+-           }
++            if(tempax > 800) {
++	       tempbx = 8;
++               if(tempax == 1024)
++	          tempax *= 25;
++               else
++	          tempax *= 20;
++
++	       temp = tempax % 32;
++	       tempax /= 32;
++	       tempax--;
++	       if (temp!=0) tempax++;
++            }
+          }
+ 	 tempax--;
+          temp = (tempax & 0xFF00) >> 8;
+          temp &= 0x03;
+-	 if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {		/* From 1.10.7w */
+-	 	if(ModeNo > 0x13) {			/* From 1.10.7w */
+-			if(resinfo == 8) tempax = 0x1f;	/* From 1.10.7w */
+-		}					/* From 1.10.7w */
+-	 }						/* From 1.10.7w */
++	 if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {			/* From 1.10.7w */
++	    if(ModeNo > 0x13) {					/* From 1.10.7w */
++	       if(resinfo == SIS_RI_1024x768) tempax = 0x1f;	/* From 1.10.7w */
++	    }							/* From 1.10.7w */
++	 }							/* From 1.10.7w */
+ 	 SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x1D,tempax & 0x00FF);
+ 	 temp <<= 4;
+ 	 temp |= tempbx;
+ 	 SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x1E,temp);
+ 
+ 	 if(SiS_Pr->SiS_VBType & VB_SIS301LV302LV) {
+-	    if(IS_SIS650740) {
+-	        temp = 0x0026;  /* 1.10.7w; 1.10.8r; needs corresponding code in Dis/EnableBridge! */
++	    if(IS_SIS550650740660) {
++	       temp = 0x0026;  /* 1.10.7w; 1.10.8r; needs corresponding code in Dis/EnableBridge! */
+ 	    } else {
+-	        temp = 0x0036;
++	       temp = 0x0036;
+ 	    }
+ 	 } else {
+-	     temp = 0x0036;
++	    temp = 0x0036;
+ 	 }
+          if((SiS_Pr->SiS_VBInfo & (SetCRT2ToTV - SetCRT2ToHiVisionTV)) &&
+ 	                               (!(SiS_Pr->SiS_HiVision & 0x03))) {
+-		temp |= 0x01;
+-	        if(SiS_Pr->SiS_VBInfo & SetInSlaveMode) {
+-	          if(!(SiS_Pr->SiS_SetFlag & TVSimuMode))
+-  	                  temp &= 0xFE;
+-		}
++	    temp |= 0x01;
++	    if(SiS_Pr->SiS_VBInfo & SetInSlaveMode) {
++	       if(!(SiS_Pr->SiS_SetFlag & TVSimuMode))
++  	          temp &= 0xFE;
++	    }
+          }
+          SiS_SetRegANDOR(SiS_Pr->SiS_Part4Port,0x1F,0xC0,temp);
+ 
+ 	 tempbx = SiS_Pr->SiS_HT;
+ 	 if(HwDeviceExtension->jChipType >= SIS_315H) {
+-	 	if(SiS_GetReg1(SiS_Pr->SiS_P3d4,0x39) & 0x04) tempbx >>= 1;
++	    if(SiS_GetReg1(SiS_Pr->SiS_P3d4,0x39) & 0x04) tempbx >>= 1;
+ 	 }
+          tempbx >>= 1;
+ 	 tempbx -= 2;
+@@ -8238,7 +8496,7 @@ SiS_SetGroup4(SiS_Private *SiS_Pr, USHOR
+          SiS_SetRegANDOR(SiS_Pr->SiS_Part4Port,0x21,0xC0,temp);
+          temp = tempbx & 0x00FF;
+          SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x22,temp);
+-	 
++
+          if(SiS_Pr->SiS_VBType & VB_SIS301LV302LV) {
+ 	    if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
+                SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x24,0x0e);
+@@ -8246,24 +8504,24 @@ SiS_SetGroup4(SiS_Private *SiS_Pr, USHOR
+ 	 }
+ 
+ 	 if(HwDeviceExtension->jChipType >= SIS_315H) {
+-	     /* TW: 650/LV BIOS does this for all bridge types - assumingly wrong */
+-	     /* 315, 330, 650+301B BIOS don't do this at all */
+-             /* TW: This is a duplicate; done for LCDA as well (see above) */
+-	     if(SiS_Pr->SiS_VBType & VB_SIS301LV302LV) {
+-	        if(SiS_GetReg1(SiS_Pr->SiS_P3d4,0x39) & 0x04) {
+-		   SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x27,0x2c);
+-	        }
+-	        SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x2a,0x00);
+-	        SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x30,0x00);
+-	        SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x34,0x10);
+-	     }
++	    /* 650/LV BIOS does this for all bridge types - assumingly wrong */
++	    /* 315, 330, 650+301B BIOS don't do this at all */
++            /* This is a duplicate; done for LCDA as well (see above) */
++	    if(SiS_Pr->SiS_VBType & VB_SIS301LV302LV) {
++	       if(SiS_GetReg1(SiS_Pr->SiS_P3d4,0x39) & 0x04) {
++		  SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x27,0x2c);
++	       }
++	       SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x2a,0x00);
++	       SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x30,0x00);
++	       SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x34,0x10);
++	    }
+          } else if(HwDeviceExtension->jChipType == SIS_300) {
+-	     /* TW: 300/301LV BIOS does this for all bridge types - assumingly wrong */
+-	     if(SiS_Pr->SiS_VBType & VB_SIS301LV302LV) {
+-	        SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x2a,0x00);
+-	        SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x30,0x00);
+-	        SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x34,0x10);
+-	     }
++	    /* 300/301LV BIOS does this for all bridge types - assumingly wrong */
++	    if(SiS_Pr->SiS_VBType & VB_SIS301LV302LV) {
++	       SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x2a,0x00);
++	       SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x30,0x00);
++	       SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x34,0x10);
++	    }
+ 	 }
+ 
+   }  /* 301B */
+@@ -8278,21 +8536,26 @@ SiS_SetCRT2VCLK(SiS_Private *SiS_Pr, USH
+                  USHORT RefreshRateTableIndex,PSIS_HW_DEVICE_INFO HwDeviceExtension)
+ {
+   USHORT vclkindex;
+-  USHORT tempah;
++  USHORT temp, reg1, reg2;
+ 
+-  vclkindex = SiS_GetVCLK2Ptr(SiS_Pr,ROMAddr,ModeNo,ModeIdIndex,RefreshRateTableIndex,
+-                              HwDeviceExtension);
++  if(SiS_Pr->UseCustomMode) {
++     reg1 = SiS_Pr->CSR2B;
++     reg2 = SiS_Pr->CSR2C;
++  } else {
++     vclkindex = SiS_GetVCLK2Ptr(SiS_Pr,ROMAddr,ModeNo,ModeIdIndex,RefreshRateTableIndex,
++                                 HwDeviceExtension);
++     reg1 = SiS_Pr->SiS_VBVCLKData[vclkindex].Part4_A;
++     reg2 = SiS_Pr->SiS_VBVCLKData[vclkindex].Part4_B;
++  }
+ 
+   if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
+-     tempah = SiS_Pr->SiS_VBVCLKData[vclkindex].Part4_A;
+-     SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x0A,tempah);
+-     tempah = SiS_Pr->SiS_VBVCLKData[vclkindex].Part4_B;
+-     SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x0B,tempah);
++     SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x0A,reg1);
++     SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x0B,reg2);
+      if(HwDeviceExtension->jChipType >= SIS_315H) {
+ 	if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
+            if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
+ 	      if(!(SiS_Pr->SiS_VBInfo & SetPALTV)) {
+-                 if((ModeNo == 0x4a) || (ModeNo == 0x38)) {
++                 if((ModeNo == 0x64) || (ModeNo == 0x4a) || (ModeNo == 0x38)) {
+ 		    SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x0a,0x57);
+ 		    SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x0b,0x46);
+ 		    SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x1f,0xf6);
+@@ -8303,15 +8566,13 @@ SiS_SetCRT2VCLK(SiS_Private *SiS_Pr, USH
+      }
+   } else {	
+      SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x0A,0x01);
+-     tempah = SiS_Pr->SiS_VBVCLKData[vclkindex].Part4_B;
+-     SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x0B,tempah);
+-     tempah = SiS_Pr->SiS_VBVCLKData[vclkindex].Part4_A;
+-     SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x0A,tempah);
++     SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x0B,reg2);
++     SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x0A,reg1);
+   }
+   SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x12,0x00);
+-  tempah = 0x08;
+-  if(SiS_Pr->SiS_VBInfo & SetCRT2ToRAMDAC) tempah |= 0x20;
+-  SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x12,tempah);
++  temp = 0x08;
++  if(SiS_Pr->SiS_VBInfo & SetCRT2ToRAMDAC) temp |= 0x20;
++  SiS_SetRegOR(SiS_Pr->SiS_Part4Port,0x12,temp);
+ }
+ 
+ USHORT
+@@ -8319,23 +8580,24 @@ SiS_GetVCLK2Ptr(SiS_Private *SiS_Pr, UCH
+                 USHORT RefreshRateTableIndex,PSIS_HW_DEVICE_INFO HwDeviceExtension)
+ {
+   USHORT tempbx;
+-  const USHORT LCDXlat0VCLK[4]    = {VCLK40, VCLK40, VCLK40, VCLK40};
+-  const USHORT LVDSXlat1VCLK[4]   = {VCLK40, VCLK40, VCLK40, VCLK40};
++  const USHORT LCDXlat0VCLK[4]    = {VCLK40,       VCLK40,       VCLK40,       VCLK40};
++  const USHORT LVDSXlat1VCLK[4]   = {VCLK40,       VCLK40,       VCLK40,       VCLK40};
++  const USHORT LVDSXlat4VCLK[4]   = {VCLK28,       VCLK28,       VCLK28,       VCLK28};
+ #ifdef SIS300
+-  const USHORT LCDXlat1VCLK300[4] = {VCLK65,   VCLK65,   VCLK65,   VCLK65};
+-  const USHORT LCDXlat2VCLK300[4] = {VCLK108_2,VCLK108_2,VCLK108_2,VCLK108_2};
+-  const USHORT LVDSXlat2VCLK300[4]= {VCLK65,   VCLK65,   VCLK65,   VCLK65};
+-  const USHORT LVDSXlat3VCLK300[4]= {VCLK65,   VCLK65,   VCLK65,   VCLK65};
++  const USHORT LCDXlat1VCLK300[4] = {VCLK65_300,   VCLK65_300,   VCLK65_300,   VCLK65_300};
++  const USHORT LCDXlat2VCLK300[4] = {VCLK108_2_300,VCLK108_2_300,VCLK108_2_300,VCLK108_2_300};
++  const USHORT LVDSXlat2VCLK300[4]= {VCLK65_300,   VCLK65_300,   VCLK65_300,   VCLK65_300};
++  const USHORT LVDSXlat3VCLK300[4]= {VCLK65_300,   VCLK65_300,   VCLK65_300,   VCLK65_300};
+ #endif
+ #ifdef SIS315H
+-  const USHORT LCDXlat1VCLK310[4] = {VCLK65+2,   VCLK65+2,   VCLK65+2,   VCLK65+2};
+-  const USHORT LCDXlat2VCLK310[4] = {VCLK108_2+5,VCLK108_2+5,VCLK108_2+5,VCLK108_2+5};
+-  const USHORT LVDSXlat2VCLK310[4]= {VCLK65+2,   VCLK65+2,   VCLK65+2,   VCLK65+2};
+-  const USHORT LVDSXlat3VCLK310[4]= {VCLK108_2+5,VCLK108_2+5,VCLK108_2+5,VCLK108_2+5};
++  const USHORT LCDXlat1VCLK310[4] = {VCLK65_315,   VCLK65_315,   VCLK65_315,   VCLK65_315};
++  const USHORT LCDXlat2VCLK310[4] = {VCLK108_2_315,VCLK108_2_315,VCLK108_2_315,VCLK108_2_315};
++  const USHORT LVDSXlat2VCLK310[4]= {VCLK65_315,   VCLK65_315,   VCLK65_315,   VCLK65_315};
++  const USHORT LVDSXlat3VCLK310[4]= {VCLK108_2_315,VCLK108_2_315,VCLK108_2_315,VCLK108_2_315};
+ #endif
+   USHORT CRT2Index,VCLKIndex=0;
+   USHORT modeflag,resinfo;
+-  const UCHAR *CHTVVCLKPtr=NULL;
++  const UCHAR  *CHTVVCLKPtr = NULL;
+   const USHORT *LCDXlatVCLK1 = NULL;
+   const USHORT *LCDXlatVCLK2 = NULL;
+   const USHORT *LVDSXlatVCLK2 = NULL;
+@@ -8372,33 +8634,40 @@ SiS_GetVCLK2Ptr(SiS_Private *SiS_Pr, UCH
+      if(SiS_Pr->SiS_SetFlag & ProgrammingCRT2) {
+ 
+         CRT2Index >>= 6;
+-        if(SiS_Pr->SiS_VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)){      /*  LCD */
++        if(SiS_Pr->SiS_VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)) {      /*  LCD */
+             if(HwDeviceExtension->jChipType < SIS_315H) {
+-	       if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel800x600)
++	       if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel800x600) {
+ 	    		VCLKIndex = LCDXlat0VCLK[CRT2Index];
+-	       else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768)
++	       } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) {
+ 	    		VCLKIndex = LCDXlatVCLK1[CRT2Index];
+-	       else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x600)
++	       } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x600) {
+ 	    		VCLKIndex = LCDXlatVCLK1[CRT2Index];
+-	       else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1152x768)
++	       } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1152x768) {
+ 	    		VCLKIndex = LCDXlatVCLK1[CRT2Index];
+-	       else
++	       } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x768) {
++	                VCLKIndex = VCLK81_300;	/* guessed */
++	       } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x960) {
++		        VCLKIndex = VCLK108_3_300;
++		        if(resinfo == SIS_RI_1280x1024) VCLKIndex = VCLK100_300;
++	       } else {
+ 	    		VCLKIndex = LCDXlatVCLK2[CRT2Index];
++	       }
+ 	    } else {
+-               /* TW: 330, 650/301LV BIOS does not check expanding, 315 does  */
+-	       if( (HwDeviceExtension->jChipType > SIS_315PRO) ||
++	       if( (SiS_Pr->SiS_VBType & VB_SIS301LV302LV) ||
+ 	           (!(SiS_Pr->SiS_LCDInfo & DontExpandLCD)) ) {
+       	          if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) {
+-		     VCLKIndex = 0x19;
++		     VCLKIndex = VCLK108_2_315;
++		  } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x768) {
++		     VCLKIndex = VCLK81_315;  	/* guessed */
+ 		  } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050) {
+-		     VCLKIndex = 0x19;
++		     VCLKIndex = VCLK108_2_315;
+ 		  } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1600x1200) {
+-		     VCLKIndex = 0x21;
++		     VCLKIndex = VCLK162_315;
++		  } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x960) {
++		     VCLKIndex = VCLK108_3_315;
++		     if(resinfo == SIS_RI_1280x1024) VCLKIndex = VCLK100_315;
+ 		  } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) {
+ 		     VCLKIndex = LCDXlatVCLK1[CRT2Index];
+-                  } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x960) {
+-		     VCLKIndex = 0x45;  /* TW: in VBVCLK table */
+-		     if(resinfo == 0x09) VCLKIndex++;
+ 	          } else {
+ 		     VCLKIndex = LCDXlatVCLK2[CRT2Index];
+       	          }
+@@ -8408,12 +8677,18 @@ SiS_GetVCLK2Ptr(SiS_Private *SiS_Pr, UCH
+         	   if(ModeNo > 0x13) {
+           		VCLKIndex = SiS_Pr->SiS_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;
+         	   }
+-		   if(ModeNo <= 0x13) {  /* TW: 315 BIOS */
+-		      if(SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_CRT2CRTC == 1) VCLKIndex = 0x42;
++		   if(ModeNo <= 0x13) {
++		      if(HwDeviceExtension->jChipType <= SIS_315PRO) {
++		         if(SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_CRT2CRTC == 1) VCLKIndex = 0x42;
++	              } else {
++		         if(SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_CRT2CRTC == 1) VCLKIndex = 0x00;
++		      }
++		   }
++		   if(HwDeviceExtension->jChipType <= SIS_315PRO) {
++		      if(VCLKIndex == 0) VCLKIndex = 0x41;
++		      if(VCLKIndex == 1) VCLKIndex = 0x43;
++		      if(VCLKIndex == 4) VCLKIndex = 0x44;
+ 		   }
+-		   if(VCLKIndex == 0) VCLKIndex = 0x41;
+-		   if(VCLKIndex == 1) VCLKIndex = 0x43;
+-		   if(VCLKIndex == 4) VCLKIndex = 0x44;
+ 	       }
+ 	    }
+         } else if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {                 /*  TV */
+@@ -8429,9 +8704,11 @@ SiS_GetVCLK2Ptr(SiS_Private *SiS_Pr, UCH
+        			if(SiS_Pr->SiS_SetFlag & RPLLDIV2XO)  VCLKIndex = TVVCLKDIV2;
+             		else         		              VCLKIndex = TVVCLK;
+           	}
+-		if(HwDeviceExtension->jChipType >= SIS_315H) {
+-              		VCLKIndex += 25;
+-  		}
++		if(HwDeviceExtension->jChipType < SIS_315H) {
++              		VCLKIndex += TVCLKBASE_300;
++  		} else {
++			VCLKIndex += TVCLKBASE_315;
++		}
+         } else {         					/* RAMDAC2 */
+         	VCLKIndex = (UCHAR)SiS_GetReg2((USHORT)(SiS_Pr->SiS_P3ca+0x02));
+         	VCLKIndex = ((VCLKIndex >> 2) & 0x03);
+@@ -8441,7 +8718,11 @@ SiS_GetVCLK2Ptr(SiS_Private *SiS_Pr, UCH
+           			VCLKIndex &= 0x3f;
+ 				if( (HwDeviceExtension->jChipType == SIS_630) &&
+ 				    (HwDeviceExtension->jChipRevision >= 0x30)) {
+-				     if(VCLKIndex == 0x14) VCLKIndex = 0x2e;
++				     /* This is certainly wrong: It replaces clock
++				      * 108 by 47...
++				      */
++				     /* if(VCLKIndex == 0x14) VCLKIndex = 0x2e; */
++				     if(VCLKIndex == 0x14) VCLKIndex = 0x34;
+ 				}
+ 			}
+         	}
+@@ -8505,6 +8786,10 @@ SiS_GetVCLK2Ptr(SiS_Private *SiS_Pr, UCH
+      		if((SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel800x600) ||
+ 		   (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel320x480))
+      			VCLKIndex = LVDSXlat1VCLK[VCLKIndex];
++		else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480   ||
++		        SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480_2 ||
++			SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480_3)
++			VCLKIndex = LVDSXlat4VCLK[VCLKIndex];
+      		else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768)
+      			VCLKIndex = LVDSXlatVCLK2[VCLKIndex];
+ 		else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x600)
+@@ -8513,6 +8798,21 @@ SiS_GetVCLK2Ptr(SiS_Private *SiS_Pr, UCH
+                         VCLKIndex = LVDSXlatVCLK2[VCLKIndex];			
+      		else    VCLKIndex = LVDSXlatVCLK3[VCLKIndex];
+ 
++		if(SiS_Pr->SiS_CustomT == CUT_BARCO1366) {
++		   /* Special Timing: Barco iQ Pro R300/400/... */
++		   VCLKIndex = 0x44;
++		}
++
++		if(SiS_Pr->SiS_CustomT == CUT_PANEL848) {
++		   if(HwDeviceExtension->jChipType < SIS_315H) {
++		      VCLKIndex = VCLK34_300;
++		      /* if(resinfo == SIS_RI_1360x768) VCLKIndex = ?; */
++		   } else {
++		      VCLKIndex = VCLK34_315;
++		      /* if(resinfo == SIS_RI_1360x768) VCLKIndex = ?; */
++		   }
++		}
++
+ 	   } else {
+ 
+ 	        VCLKIndex = (UCHAR)SiS_GetReg2((USHORT)(SiS_Pr->SiS_P3ca+0x02));
+@@ -8556,11 +8856,11 @@ SiS_GetVCLK2Ptr(SiS_Private *SiS_Pr, UCH
+ #ifdef TWDEBUG
+   xf86DrvMsg(0, X_INFO, "VCLKIndex %d (0x%x)\n", VCLKIndex, VCLKIndex);
+ #endif
+-  return (VCLKIndex);
++  return(VCLKIndex);
+ }
+ 
+-/* TW: Set 301 Palette address port registers */
+-/* TW: Checked against 650/301LV BIOS */
++/* Set 301 Palette address port registers */
++/* Checked against 650/301LV BIOS */
+ void
+ SiS_SetGroup5(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension, USHORT BaseAddr,
+               UCHAR *ROMAddr, USHORT ModeNo, USHORT ModeIdIndex)
+@@ -8568,7 +8868,7 @@ SiS_SetGroup5(SiS_Private *SiS_Pr, PSIS_
+ 
+   if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCDA)  return;
+ 
+-  if(SiS_Pr->SiS_ModeType == ModeVGA){
++  if(SiS_Pr->SiS_ModeType == ModeVGA) {
+      if(!(SiS_Pr->SiS_VBInfo & (SetInSlaveMode | LoadDACFlag))){
+         SiS_EnableCRT2(SiS_Pr);
+         SiS_LoadDAC(SiS_Pr,HwDeviceExtension,ROMAddr,ModeNo,ModeIdIndex);
+@@ -8581,17 +8881,22 @@ SiS_ModCRT1CRTC(SiS_Private *SiS_Pr, UCH
+                 USHORT RefreshRateTableIndex,PSIS_HW_DEVICE_INFO HwDeviceExtension)
+ {
+   USHORT temp,tempah,i,modeflag,j;
+-  USHORT ResInfo,DisplayType;
++  USHORT ResIndex,DisplayType;
+   const SiS_LVDSCRT1DataStruct *LVDSCRT1Ptr=NULL;
+ 
+   if(ModeNo <= 0x13) {
+-    	modeflag = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ModeFlag;
++     modeflag = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ModeFlag;
+   } else {
+-    	modeflag = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
++     modeflag = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+   }
+ 
++  if((SiS_Pr->SiS_CustomT == CUT_BARCO1366) ||
++     (SiS_Pr->SiS_CustomT == CUT_BARCO1024) ||
++     (SiS_Pr->SiS_CustomT == CUT_PANEL848))
++     return;
++
+   temp = SiS_GetLVDSCRT1Ptr(SiS_Pr,ROMAddr,ModeNo,ModeIdIndex,RefreshRateTableIndex,
+-                            &ResInfo,&DisplayType);
++                            &ResIndex,&DisplayType);
+ 
+   if(temp == 0) return;
+ 
+@@ -8639,47 +8944,53 @@ SiS_ModCRT1CRTC(SiS_Private *SiS_Pr, UCH
+     case 41: LVDSCRT1Ptr = SiS_Pr->SiS_LVDSCRT11280x768_1_H;        break;
+     case 42: LVDSCRT1Ptr = SiS_Pr->SiS_LVDSCRT11280x768_2;          break;
+     case 43: LVDSCRT1Ptr = SiS_Pr->SiS_LVDSCRT11280x768_2_H;        break;
++    case 50: LVDSCRT1Ptr = SiS_Pr->SiS_LVDSCRT1640x480_1;           break;
++    case 51: LVDSCRT1Ptr = SiS_Pr->SiS_LVDSCRT1640x480_1_H;         break;
++    case 52: LVDSCRT1Ptr = SiS_Pr->SiS_LVDSCRT1640x480_2;           break;
++    case 53: LVDSCRT1Ptr = SiS_Pr->SiS_LVDSCRT1640x480_2_H;         break;
++    case 54: LVDSCRT1Ptr = SiS_Pr->SiS_LVDSCRT1640x480_3;           break;
++    case 55: LVDSCRT1Ptr = SiS_Pr->SiS_LVDSCRT1640x480_3_H;         break;
+     case 99: LVDSCRT1Ptr = SiS_Pr->SiS_CHTVCRT1SOPAL;               break;
+     default: LVDSCRT1Ptr = SiS_Pr->SiS_LVDSCRT11024x768_1;          break;
+   }
+ 
+   SiS_SetRegAND(SiS_Pr->SiS_P3d4,0x11,0x7f);                        /*unlock cr0-7  */
+ 
+-  tempah = (LVDSCRT1Ptr+ResInfo)->CR[0];
++  tempah = (LVDSCRT1Ptr + ResIndex)->CR[0];
+   SiS_SetReg1(SiS_Pr->SiS_P3d4,0x00,tempah);
+ 
+   for(i=0x02,j=1;i<=0x05;i++,j++){
+-    tempah = (LVDSCRT1Ptr+ResInfo)->CR[j];
++    tempah = (LVDSCRT1Ptr + ResIndex)->CR[j];
+     SiS_SetReg1(SiS_Pr->SiS_P3d4,i,tempah);
+   }
+   for(i=0x06,j=5;i<=0x07;i++,j++){
+-    tempah = (LVDSCRT1Ptr+ResInfo)->CR[j];
++    tempah = (LVDSCRT1Ptr + ResIndex)->CR[j];
+     SiS_SetReg1(SiS_Pr->SiS_P3d4,i,tempah);
+   }
+   for(i=0x10,j=7;i<=0x11;i++,j++){
+-    tempah = (LVDSCRT1Ptr+ResInfo)->CR[j];
++    tempah = (LVDSCRT1Ptr + ResIndex)->CR[j];
+     SiS_SetReg1(SiS_Pr->SiS_P3d4,i,tempah);
+   }
+   for(i=0x15,j=9;i<=0x16;i++,j++){
+-    tempah = (LVDSCRT1Ptr+ResInfo)->CR[j];
++    tempah = (LVDSCRT1Ptr + ResIndex)->CR[j];
+     SiS_SetReg1(SiS_Pr->SiS_P3d4,i,tempah);
+   }
+   for(i=0x0A,j=11;i<=0x0C;i++,j++){
+-    tempah = (LVDSCRT1Ptr+ResInfo)->CR[j];
++    tempah = (LVDSCRT1Ptr + ResIndex)->CR[j];
+     SiS_SetReg1(SiS_Pr->SiS_P3c4,i,tempah);
+   }
+ 
+-  tempah = (LVDSCRT1Ptr+ResInfo)->CR[14];
++  tempah = (LVDSCRT1Ptr + ResIndex)->CR[14];
+   tempah &= 0xE0;
+-  SiS_SetRegANDOR(SiS_Pr->SiS_P3c4,0x0E,0x1f,tempah);     
++  SiS_SetRegANDOR(SiS_Pr->SiS_P3c4,0x0E,0x1f,tempah);
+ 
+-  tempah = (LVDSCRT1Ptr+ResInfo)->CR[14];
++  tempah = (LVDSCRT1Ptr + ResIndex)->CR[14];
+   tempah &= 0x01;
+   tempah <<= 5;
+   if(modeflag & DoubleScanMode)  tempah |= 0x080;
+   SiS_SetRegANDOR(SiS_Pr->SiS_P3d4,0x09,~0x020,tempah);
+ 
+-  /* TW: 650/LVDS BIOS - doesn't make sense */
++  /* 650/LVDS BIOS - doesn't make sense */
+   if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
+      if(modeflag & HalfDCLK)
+         SiS_SetRegAND(SiS_Pr->SiS_P3d4,0x11,0x7f);
+@@ -8688,7 +8999,7 @@ SiS_ModCRT1CRTC(SiS_Private *SiS_Pr, UCH
+ 
+ BOOLEAN
+ SiS_GetLVDSCRT1Ptr(SiS_Private *SiS_Pr, UCHAR *ROMAddr,USHORT ModeNo,USHORT ModeIdIndex,
+-		   USHORT RefreshRateTableIndex,USHORT *ResInfo,
++		   USHORT RefreshRateTableIndex,USHORT *ResIndex,
+ 		   USHORT *DisplayType)
+  {
+   USHORT tempbx,modeflag=0;
+@@ -8757,19 +9068,33 @@ SiS_GetLVDSCRT1Ptr(SiS_Private *SiS_Pr, 
+            tempbx = 40;
+ 	   if(SiS_Pr->SiS_LCDInfo & DontExpandLCD) tempbx += 2;
+ 	   if(modeflag & HalfDCLK) tempbx++;
++        } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480_3) {
++           tempbx = 54;
++	   if(modeflag & HalfDCLK) tempbx++;
++	} else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480_2) {
++           tempbx = 52;
++	   if(modeflag & HalfDCLK) tempbx++;
++	} else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480) {
++           tempbx = 50;
++	   if(modeflag & HalfDCLK) tempbx++;
+         }
++
+      }
+      if(SiS_Pr->SiS_LCDInfo & LCDPass11) {
+         tempbx = 12;
+ 	if(modeflag & HalfDCLK) tempbx++;
+      }
+   }
+-  if(SiS_Pr->SiS_IF_DEF_FSTN){
++
++#if 0
++  if(SiS_Pr->SiS_IF_DEF_FSTN) {
+      if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel320x480){
+         tempbx = 22;
+      }
+   }
+-  *ResInfo = CRT2CRTC & 0x3F;
++#endif
++
++  *ResIndex = CRT2CRTC & 0x3F;
+   *DisplayType = tempbx;
+   return 1;
+ }
+@@ -8778,54 +9103,54 @@ void
+ SiS_SetCRT2ECLK(SiS_Private *SiS_Pr, UCHAR *ROMAddr, USHORT ModeNo,USHORT ModeIdIndex,
+            USHORT RefreshRateTableIndex,PSIS_HW_DEVICE_INFO HwDeviceExtension)
+ {
+-  USHORT tempah,tempal,pushax;
+-  USHORT vclkindex=0;
+-    
++  USHORT clkbase, vclkindex=0;
++  UCHAR  sr2b, sr2c;
++
+   if((SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel640x480) || (SiS_Pr->SiS_IF_DEF_TRUMPION == 1)) {
+ 	SiS_Pr->SiS_SetFlag &= (~ProgrammingCRT2);
+-        tempal = SiS_Pr->SiS_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK;
+-    	tempal &= 0x3F;
+-	if(tempal == 2) RefreshRateTableIndex--;
++        if((SiS_Pr->SiS_RefIndex[RefreshRateTableIndex].Ext_CRTVCLK & 0x3f) == 2) {
++	   RefreshRateTableIndex--;
++	}
+ 	vclkindex = SiS_GetVCLK2Ptr(SiS_Pr,ROMAddr,ModeNo,ModeIdIndex,
+-                               RefreshRateTableIndex,HwDeviceExtension);
++                                    RefreshRateTableIndex,HwDeviceExtension);
+ 	SiS_Pr->SiS_SetFlag |= ProgrammingCRT2;
+   } else {
+         vclkindex = SiS_GetVCLK2Ptr(SiS_Pr,ROMAddr,ModeNo,ModeIdIndex,
+-                               RefreshRateTableIndex,HwDeviceExtension);
++                                    RefreshRateTableIndex,HwDeviceExtension);
+   }
+-  
+-  tempal = 0x02B;
++
++  sr2b = SiS_Pr->SiS_VCLKData[vclkindex].SR2B;
++  sr2c = SiS_Pr->SiS_VCLKData[vclkindex].SR2C;
++
++  if((SiS_Pr->SiS_CustomT == CUT_BARCO1366) || (SiS_Pr->SiS_CustomT == CUT_BARCO1024)) {
++     if((ROMAddr) && SiS_Pr->SiS_UseROM) {
++	if(ROMAddr[0x220] & 0x01) {
++           sr2b = ROMAddr[0x227];
++	   sr2c = ROMAddr[0x228];
++	}
++     }
++  }
++
++  clkbase = 0x02B;
+   if(!(SiS_Pr->SiS_VBInfo & SetCRT2ToLCDA)) {
+      if(!(SiS_Pr->SiS_VBInfo & SetInSlaveMode)) {
+-    	tempal += 3;
++    	clkbase += 3;
+      }
+   }
++
+   SiS_SetReg1(SiS_Pr->SiS_P3c4,0x05,0x86);
+-  pushax = tempal;
+   SiS_SetReg1(SiS_Pr->SiS_P3c4,0x31,0x20);
+-  tempah = SiS_Pr->SiS_VCLKData[vclkindex].SR2B;
+-  SiS_SetReg1(SiS_Pr->SiS_P3c4,tempal,tempah);
+-  tempal++;
+-  tempah = SiS_Pr->SiS_VCLKData[vclkindex].SR2C;
+-  SiS_SetReg1(SiS_Pr->SiS_P3c4,tempal,tempah);
++  SiS_SetReg1(SiS_Pr->SiS_P3c4,clkbase,sr2b);
++  SiS_SetReg1(SiS_Pr->SiS_P3c4,clkbase+1,sr2c);
+   SiS_SetReg1(SiS_Pr->SiS_P3c4,0x31,0x10);
+-  tempal = pushax;
+-  tempah = SiS_Pr->SiS_VCLKData[vclkindex].SR2B;
+-  SiS_SetReg1(SiS_Pr->SiS_P3c4,tempal,tempah);
+-  tempal++;
+-  tempah = SiS_Pr->SiS_VCLKData[vclkindex].SR2C;
+-  SiS_SetReg1(SiS_Pr->SiS_P3c4,tempal,tempah);
++  SiS_SetReg1(SiS_Pr->SiS_P3c4,clkbase,sr2b);
++  SiS_SetReg1(SiS_Pr->SiS_P3c4,clkbase+1,sr2c);
+   SiS_SetReg1(SiS_Pr->SiS_P3c4,0x31,0x00);
+-  tempal = pushax;
+-  tempah = SiS_Pr->SiS_VCLKData[vclkindex].SR2B;
+-  SiS_SetReg1(SiS_Pr->SiS_P3c4,tempal,tempah);
+-  tempal++;
+-  tempah = SiS_Pr->SiS_VCLKData[vclkindex].SR2C;
+-  SiS_SetReg1(SiS_Pr->SiS_P3c4,tempal,tempah);
+-  return;
++  SiS_SetReg1(SiS_Pr->SiS_P3c4,clkbase,sr2b);
++  SiS_SetReg1(SiS_Pr->SiS_P3c4,clkbase+1,sr2c);
+ }
+ 
+-#if 0  /* TW: Not used */
++#if 0  /* Not used */
+ void
+ SiS_SetDefCRT2ExtRegs(SiS_Private *SiS_Pr, USHORT BaseAddr)
+ {
+@@ -8844,7 +9169,7 @@ SiS_SetDefCRT2ExtRegs(SiS_Private *SiS_P
+ }
+ #endif
+ 
+-/* TW: Start of Chrontel 70xx functions ---------------------- */
++/* Start of Chrontel 70xx functions ---------------------- */
+ 
+ /* Set-up the Chrontel Registers */
+ void
+@@ -8890,44 +9215,44 @@ SiS_SetCHTVReg(SiS_Private *SiS_Pr, UCHA
+   if(SiS_Pr->SiS_IF_DEF_CH70xx == 1) {
+ 
+ #ifdef SIS300
+-  
+-     /* Chrontel 7005 - I assume that it does not come with a 310/325 series chip */
+ 
+-     /* TW: We don't support modes >800x600 */
++     /* Chrontel 7005 - I assume that it does not come with a 315 series chip */
++
++     /* We don't support modes >800x600 */
+      if (resindex > 5) return;
+ 
+      if(SiS_Pr->SiS_VBInfo & SetPALTV) {
+-    	SiS_SetCH700x(SiS_Pr,0x4304);   /* TW: 0x40=76uA (PAL); 0x03=15bit non-multi RGB*/
+-    	SiS_SetCH700x(SiS_Pr,0x6909);	/* TW: Black level for PAL (105)*/
++    	SiS_SetCH700x(SiS_Pr,0x4304);   /* 0x40=76uA (PAL); 0x03=15bit non-multi RGB*/
++    	SiS_SetCH700x(SiS_Pr,0x6909);	/* Black level for PAL (105)*/
+      } else {
+-    	SiS_SetCH700x(SiS_Pr,0x0304);   /* TW: upper nibble=71uA (NTSC), 0x03=15bit non-multi RGB*/
+-    	SiS_SetCH700x(SiS_Pr,0x7109);	/* TW: Black level for NTSC (113)*/
++    	SiS_SetCH700x(SiS_Pr,0x0304);   /* upper nibble=71uA (NTSC), 0x03=15bit non-multi RGB*/
++    	SiS_SetCH700x(SiS_Pr,0x7109);	/* Black level for NTSC (113)*/
+      }
+ 
+      temp = CHTVRegData[resindex].Reg[0];
+-     tempbx=((temp&0x00FF)<<8)|0x00;	/* TW: Mode register */
++     tempbx=((temp&0x00FF)<<8)|0x00;	/* Mode register */
+      SiS_SetCH700x(SiS_Pr,tempbx);
+      temp = CHTVRegData[resindex].Reg[1];
+-     tempbx=((temp&0x00FF)<<8)|0x07;	/* TW: Start active video register */
++     tempbx=((temp&0x00FF)<<8)|0x07;	/* Start active video register */
+      SiS_SetCH700x(SiS_Pr,tempbx);
+      temp = CHTVRegData[resindex].Reg[2];
+-     tempbx=((temp&0x00FF)<<8)|0x08;	/* TW: Position overflow register */
++     tempbx=((temp&0x00FF)<<8)|0x08;	/* Position overflow register */
+      SiS_SetCH700x(SiS_Pr,tempbx);
+      temp = CHTVRegData[resindex].Reg[3];
+-     tempbx=((temp&0x00FF)<<8)|0x0A;	/* TW: Horiz Position register */
++     tempbx=((temp&0x00FF)<<8)|0x0A;	/* Horiz Position register */
+      SiS_SetCH700x(SiS_Pr,tempbx);
+      temp = CHTVRegData[resindex].Reg[4];
+-     tempbx=((temp&0x00FF)<<8)|0x0B;	/* TW: Vertical Position register */
++     tempbx=((temp&0x00FF)<<8)|0x0B;	/* Vertical Position register */
+      SiS_SetCH700x(SiS_Pr,tempbx);
+ 
+-     /* TW: Set minimum flicker filter for Luma channel (SR1-0=00),
++     /* Set minimum flicker filter for Luma channel (SR1-0=00),
+                 minimum text enhancement (S3-2=10),
+    	        maximum flicker filter for Chroma channel (S5-4=10)
+ 	        =00101000=0x28 (When reading, S1-0->S3-2, and S3-2->S1-0!)
+       */
+      SiS_SetCH700x(SiS_Pr,0x2801);
+ 
+-     /* TW: Set video bandwidth
++     /* Set video bandwidth
+             High bandwith Luma composite video filter(S0=1)
+             low bandwith Luma S-video filter (S2-1=00)
+ 	    disable peak filter in S-video channel (S3=0)
+@@ -8936,22 +9261,24 @@ SiS_SetCHTVReg(SiS_Private *SiS_Pr, UCHA
+      */
+      SiS_SetCH700x(SiS_Pr,0xb103);       /* old: 3103 */
+ 
+-     /* TW: Register 0x3D does not exist in non-macrovision register map
++     /* Register 0x3D does not exist in non-macrovision register map
+             (Maybe this is a macrovision register?)
+       */
+-     /* SiS_SetCH70xx(SiS_Pr,0x003D); */
++#ifndef SIS_CP
++     SiS_SetCH70xx(SiS_Pr,0x003D);
++#endif
+ 
+-     /* TW: Register 0x10 only contains 1 writable bit (S0) for sensing,
++     /* Register 0x10 only contains 1 writable bit (S0) for sensing,
+             all other bits a read-only. Macrovision?
+       */
+      SiS_SetCH70xxANDOR(SiS_Pr,0x0010,0x1F);
+ 
+-     /* TW: Register 0x11 only contains 3 writable bits (S0-S2) for
++     /* Register 0x11 only contains 3 writable bits (S0-S2) for
+             contrast enhancement (set to 010 -> gain 1 Yout = 17/16*(Yin-30) )
+       */
+      SiS_SetCH70xxANDOR(SiS_Pr,0x0211,0xF8);
+ 
+-     /* TW: Clear DSEN
++     /* Clear DSEN
+       */
+      SiS_SetCH70xxANDOR(SiS_Pr,0x001C,0xEF);
+ 
+@@ -8994,7 +9321,7 @@ SiS_SetCHTVReg(SiS_Private *SiS_Pr, UCHA
+          }
+        }
+      } else {				/* ---- PAL ---- */
+-           /* TW: We don't play around with FSCI in PAL mode */
++           /* We don't play around with FSCI in PAL mode */
+          if (resindex == 0x04) {
+            SiS_SetCH70xxANDOR(SiS_Pr,0x0020,0xEF); 	/* loop filter off */
+            SiS_SetCH70xxANDOR(SiS_Pr,0x0121,0xFE);      /* ACIV on */
+@@ -9012,7 +9339,7 @@ SiS_SetCHTVReg(SiS_Private *SiS_Pr, UCHA
+ 
+ #ifdef SIS315H
+ 
+-     /* TW: We don't support modes >1024x768 */
++     /* We don't support modes >1024x768 */
+      if (resindex > 6) return;
+ 
+      temp = CHTVRegData[resindex].Reg[0];
+@@ -9082,26 +9409,29 @@ SiS_SetCHTVReg(SiS_Private *SiS_Pr, UCHA
+ #endif	/* 315 */
+ 
+   }
++
++#ifdef SIS_CP
++  SIS_CP_INIT301_CP3
++#endif
++
+ }
+ 
+-/* TW: Chrontel 701x functions ================================= */
++/* Chrontel 701x functions ================================= */
+ 
+ void
+-SiS_Chrontel701xBLOn(SiS_Private *SiS_Pr)
++SiS_Chrontel701xBLOn(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension)
+ {
+-#ifndef NEWCH701x
+   USHORT temp;
+-#endif  
+ 
+-  /* TW: Enable Chrontel 7019 LCD panel backlight */
++  /* Enable Chrontel 7019 LCD panel backlight */
+   if(SiS_Pr->SiS_IF_DEF_CH70xx == 2) {
+-#ifdef NEWCH701x
++     if(HwDeviceExtension->jChipType == SIS_740) {
+         SiS_SetCH701x(SiS_Pr,0x6566);
+-#else  
++     } else {
+         temp = SiS_GetCH701x(SiS_Pr,0x66);
+         temp |= 0x20;
+ 	SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x66);
+-#endif	
++     }
+   }
+ }
+ 
+@@ -9110,7 +9440,7 @@ SiS_Chrontel701xBLOff(SiS_Private *SiS_P
+ {
+   USHORT temp;
+ 
+-  /* TW: Disable Chrontel 7019 LCD panel backlight */
++  /* Disable Chrontel 7019 LCD panel backlight */
+   if(SiS_Pr->SiS_IF_DEF_CH70xx == 2) {
+         temp = SiS_GetCH701x(SiS_Pr,0x66);
+         temp &= 0xDF;
+@@ -9118,47 +9448,54 @@ SiS_Chrontel701xBLOff(SiS_Private *SiS_P
+   }
+ }
+ 
+-#ifdef SIS315H  /* -------- 310/325 series only --------- */
++#ifdef SIS315H  /* ----------- 315 series only ---------- */
+ 
+ void
+ SiS_SetCH701xForLCD(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension,USHORT BaseAddr)
+ {
+-#ifdef NEWCH701x  
+-  UCHAR regtable[]  = { 0x1c, 0x5f, 0x64, 0x6f, 0x70, 0x71,
+-                        0x72, 0x73, 0x74, 0x76, 0x78, 0x7d, 0x66 };
+-  UCHAR table1024[] = { 0x60, 0x02, 0x00, 0x07, 0x40, 0xed,
+-                        0xa3, 0xc8, 0xc7, 0xac, 0xe0, 0x02, 0x44 }; 
+-  UCHAR table1280[] = { 0x60, 0x03, 0x11, 0x00, 0x40, 0xe3,
+-   			0xad, 0xdb, 0xf6, 0xac, 0xe0, 0x02, 0x44 }; 			
+-  UCHAR table1400[] = { 0x60, 0x03, 0x11, 0x00, 0x40, 0xe3,         
+-                        0xad, 0xdb, 0xf6, 0xac, 0xe0, 0x02, 0x44 }; 
+-  UCHAR table1600[] = { 0x60, 0x04, 0x11, 0x00, 0x40, 0xe3,
+-  			0xad, 0xde, 0xf6, 0xac, 0x60, 0x1a, 0x44 };
+-#else
+-  UCHAR regtable[]  = { 0x1c, 0x5f, 0x64, 0x6f, 0x70, 0x71,
+-                        0x72, 0x73, 0x74, 0x76, 0x78, 0x7d };
+-  UCHAR table1024[] = { 0x60, 0x02, 0x00, 0x07, 0x40, 0xed,
+-                        0xa3, 0xc8, 0xc7, 0xac, 0x60, 0x02 }; 
+-  UCHAR table1280[] = { 0x60, 0x03, 0x11, 0x00, 0x40, 0xe3,
+-   			0xad, 0xdb, 0xf6, 0xac, 0xe0, 0x02 }; 			
+-  UCHAR table1400[] = { 0x60, 0x03, 0x11, 0x00, 0x40, 0xef,   
+-                        0xad, 0xdb, 0xf6, 0xac, 0x60, 0x02 }; 
+-  UCHAR table1600[] = { 0x60, 0x04, 0x11, 0x00, 0x40, 0xe3,
+-  			0xad, 0xde, 0xf6, 0xac, 0x60, 0x1a };
+-#endif			
++  UCHAR regtable[]      = { 0x1c, 0x5f, 0x64, 0x6f, 0x70, 0x71,
++                            0x72, 0x73, 0x74, 0x76, 0x78, 0x7d, 0x66 };
++  UCHAR table1024_740[] = { 0x60, 0x02, 0x00, 0x07, 0x40, 0xed,
++                            0xa3, 0xc8, 0xc7, 0xac, 0xe0, 0x02, 0x44 };
++  UCHAR table1280_740[] = { 0x60, 0x03, 0x11, 0x00, 0x40, 0xe3,
++   			    0xad, 0xdb, 0xf6, 0xac, 0xe0, 0x02, 0x44 };
++  UCHAR table1400_740[] = { 0x60, 0x03, 0x11, 0x00, 0x40, 0xe3,
++                            0xad, 0xdb, 0xf6, 0xac, 0xe0, 0x02, 0x44 };
++  UCHAR table1600_740[] = { 0x60, 0x04, 0x11, 0x00, 0x40, 0xe3,
++  			    0xad, 0xde, 0xf6, 0xac, 0x60, 0x1a, 0x44 };
++  UCHAR table1024_650[] = { 0x60, 0x02, 0x00, 0x07, 0x40, 0xed,
++                            0xa3, 0xc8, 0xc7, 0xac, 0x60, 0x02 };
++  UCHAR table1280_650[] = { 0x60, 0x03, 0x11, 0x00, 0x40, 0xe3,
++   		   	    0xad, 0xdb, 0xf6, 0xac, 0xe0, 0x02 };
++  UCHAR table1400_650[] = { 0x60, 0x03, 0x11, 0x00, 0x40, 0xef,
++                            0xad, 0xdb, 0xf6, 0xac, 0x60, 0x02 };
++  UCHAR table1600_650[] = { 0x60, 0x04, 0x11, 0x00, 0x40, 0xe3,
++  			    0xad, 0xde, 0xf6, 0xac, 0x60, 0x1a };
+   UCHAR *tableptr = NULL;
+   USHORT tempbh;
+   int i;
+ 
+-  if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) {
+-     tableptr = table1024;
+-  } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) {
+-     tableptr = table1280;
+-  } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050) {
+-     tableptr = table1400;
+-  } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1600x1200) {
+-     tableptr = table1600;
+-  } else return;
++  if(HwDeviceExtension->jChipType == SIS_740) {
++     if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) {
++        tableptr = table1024_740;
++     } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) {
++        tableptr = table1280_740;
++     } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050) {
++        tableptr = table1400_740;
++     } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1600x1200) {
++        tableptr = table1600_740;
++     } else return;
++  } else {
++     if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) {
++        tableptr = table1024_650;
++     } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) {
++        tableptr = table1280_650;
++     } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050) {
++        tableptr = table1400_650;
++     } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1600x1200) {
++        tableptr = table1600_650;
++     } else return;
++  }
+ 
+   tempbh = SiS_GetCH701x(SiS_Pr,0x74);
+   if((tempbh == 0xf6) || (tempbh == 0xc7)) {
+@@ -9172,54 +9509,64 @@ SiS_SetCH701xForLCD(SiS_Private *SiS_Pr,
+         if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050) return;
+      }
+   }
+-#ifdef NEWCH701x     /* New from 740/LVDS: */    
+-  for(i=0; i<0x0d; i++) {	
+-#else
+-  for(i=0; i<0x0c; i++) {
+-#endif  
++
++  if(HwDeviceExtension->jChipType == SIS_740) {
++     tempbh = 0x0d;
++  } else {
++     tempbh = 0x0c;
++  }
++  for(i = 0; i < tempbh; i++) {
+      SiS_SetCH701x(SiS_Pr,(tableptr[i] << 8) | regtable[i]);
+   }
+-  SiS_ChrontelPowerSequencing(SiS_Pr);
++  SiS_ChrontelPowerSequencing(SiS_Pr,HwDeviceExtension);
+   tempbh = SiS_GetCH701x(SiS_Pr,0x1e);
+   tempbh |= 0xc0;
+   SiS_SetCH701x(SiS_Pr,(tempbh << 8) | 0x1e);
+-  
+-#ifdef NEWCH701x     /* 740/LVDS: */
+-  tempbh = SiS_GetCH701x(SiS_Pr,0x1c);
+-  tempbh &= 0xfb;
+-  SiS_SetCH701x(SiS_Pr,(tempbh << 8) | 0x1c);
+-  SiS_SetReg1(SiS_Pr->SiS_Part1Port, 0x2d, 0x03);
+-  tempbh = SiS_GetCH701x(SiS_Pr,0x64);
+-  tempbh |= 0x40;
+-  SiS_SetCH701x(SiS_Pr,(tempbh << 8) | 0x64);
+-  tempbh = SiS_GetCH701x(SiS_Pr,0x03);
+-  tempbh &= 0x3f;
+-  SiS_SetCH701x(SiS_Pr,(tempbh << 8) | 0x03);
+-#endif  /* End 740/LVDS */
++
++  if(HwDeviceExtension->jChipType == SIS_740) {
++     tempbh = SiS_GetCH701x(SiS_Pr,0x1c);
++     tempbh &= 0xfb;
++     SiS_SetCH701x(SiS_Pr,(tempbh << 8) | 0x1c);
++     SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x2d,0x03);
++     tempbh = SiS_GetCH701x(SiS_Pr,0x64);
++     tempbh |= 0x40;
++     SiS_SetCH701x(SiS_Pr,(tempbh << 8) | 0x64);
++     tempbh = SiS_GetCH701x(SiS_Pr,0x03);
++     tempbh &= 0x3f;
++     SiS_SetCH701x(SiS_Pr,(tempbh << 8) | 0x03);
++  }
+ }
+ 
+ void
+-SiS_ChrontelPowerSequencing(SiS_Private *SiS_Pr)
+-{
+-  UCHAR regtable[]  = { 0x67, 0x68, 0x69, 0x6a, 0x6b };
+-#ifdef NEWCH701x  
+-  UCHAR table1024[] = { 0x01, 0x02, 0x01, 0x01, 0x01 };
+-  UCHAR table1400[] = { 0x01, 0x6e, 0x01, 0x01, 0x01 };
+-#else
+-  UCHAR table1024[] = { 0x01, 0x02, 0x01, 0x01, 0x02 };
+-  UCHAR table1400[] = { 0x01, 0x02, 0x01, 0x01, 0x02 };
+-#endif  
++SiS_ChrontelPowerSequencing(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension)
++{
++  UCHAR regtable[]      = { 0x67, 0x68, 0x69, 0x6a, 0x6b };
++  UCHAR table1024_740[] = { 0x01, 0x02, 0x01, 0x01, 0x01 };
++  UCHAR table1400_740[] = { 0x01, 0x6e, 0x01, 0x01, 0x01 };
++  UCHAR table1024_650[] = { 0x01, 0x02, 0x01, 0x01, 0x02 };
++  UCHAR table1400_650[] = { 0x01, 0x02, 0x01, 0x01, 0x02 };
+   UCHAR *tableptr = NULL;
+   int i;
+ 
+   /* Set up Power up/down timing */
+-  if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) {
+-     tableptr = table1024;
+-  } else if((SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) ||
+-            (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050) ||
+-	    (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1600x1200)) {
+-     tableptr = table1400;
+-  } else return;
++
++  if(HwDeviceExtension->jChipType == SIS_740) {
++     if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) {
++        tableptr = table1024_740;
++     } else if((SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) ||
++               (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050) ||
++	       (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1600x1200)) {
++        tableptr = table1400_740;
++     } else return;
++  } else {
++     if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) {
++        tableptr = table1024_650;
++     } else if((SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) ||
++               (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050) ||
++	       (SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1600x1200)) {
++        tableptr = table1400_650;
++     } else return;
++  }
+   
+   for(i=0; i<5; i++) {
+      SiS_SetCH701x(SiS_Pr,(tableptr[i] << 8) | regtable[i]);
+@@ -9232,66 +9579,72 @@ SiS_Chrontel701xOn(SiS_Private *SiS_Pr, 
+   USHORT temp;
+ 
+   if(SiS_Pr->SiS_IF_DEF_CH70xx == 2) {
+-#ifdef NEWCH701x
+-     temp = SiS_GetCH701x(SiS_Pr,0x1c);
+-     temp |= 0x04;
+-     SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x1c);
+-#endif 
++     if(HwDeviceExtension->jChipType == SIS_740) {
++        temp = SiS_GetCH701x(SiS_Pr,0x1c);
++        temp |= 0x04;
++        SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x1c);
++     }
+      if(SiS_IsYPbPr(SiS_Pr,HwDeviceExtension, BaseAddr)) {
+         temp = SiS_GetCH701x(SiS_Pr,0x01);
+ 	temp &= 0x3f;
+-	temp |= 0x80;	/* TW: Enable YPrPb (HDTV) */
++	temp |= 0x80;	/* Enable YPrPb (HDTV) */
+ 	SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x01);
+      }
+      if(SiS_IsChScart(SiS_Pr,HwDeviceExtension, BaseAddr)) {
+         temp = SiS_GetCH701x(SiS_Pr,0x01);
+ 	temp &= 0x3f;
+-	temp |= 0xc0;	/* TW: Enable SCART + CVBS */
++	temp |= 0xc0;	/* Enable SCART + CVBS */
+ 	SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x01);
+      }
+-#ifdef NEWCH701x
+-     SiS_ChrontelDoSomething5(SiS_Pr);
+-     SiS_SetCH701x(SiS_Pr,0x2049);   			/* TW: Enable TV path */
+-#else      
+-     SiS_SetCH701x(SiS_Pr,0x2049);   			/* TW: Enable TV path */
+-     temp = SiS_GetCH701x(SiS_Pr,0x49);
+-     if(SiS_IsYPbPr(SiS_Pr,HwDeviceExtension, BaseAddr)) {
+-        temp = SiS_GetCH701x(SiS_Pr,0x73);
+-	temp |= 0x60;
+-	SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x73);
++     if(HwDeviceExtension->jChipType == SIS_740) {
++        SiS_ChrontelDoSomething5(SiS_Pr);
++        SiS_SetCH701x(SiS_Pr,0x2049);   			/* Enable TV path */
++     } else {
++        SiS_SetCH701x(SiS_Pr,0x2049);   			/* Enable TV path */
++        temp = SiS_GetCH701x(SiS_Pr,0x49);
++        if(SiS_IsYPbPr(SiS_Pr,HwDeviceExtension, BaseAddr)) {
++           temp = SiS_GetCH701x(SiS_Pr,0x73);
++	   temp |= 0x60;
++	   SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x73);
++        }
++        temp = SiS_GetCH701x(SiS_Pr,0x47);
++        temp &= 0x7f;
++        SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x47);
++        SiS_LongDelay(SiS_Pr,2);
++        temp = SiS_GetCH701x(SiS_Pr,0x47);
++        temp |= 0x80;
++        SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x47);
+      }
+-     temp = SiS_GetCH701x(SiS_Pr,0x47);
+-     temp &= 0x7f;
+-     SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x47);
+-     SiS_LongDelay(SiS_Pr,2);
+-     temp = SiS_GetCH701x(SiS_Pr,0x47);
+-     temp |= 0x80;
+-     SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x47);
+-#endif     
+   }
+ }
+ 
+ void
+-SiS_Chrontel701xOff(SiS_Private *SiS_Pr)
++SiS_Chrontel701xOff(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension)
+ {
+   USHORT temp;
+ 
++  /* Complete power down of LVDS */
+   if(SiS_Pr->SiS_IF_DEF_CH70xx == 2) {
++     if(HwDeviceExtension->jChipType == SIS_740) {
++        SiS_LongDelay(SiS_Pr,1);
++	SiS_GenericDelay(SiS_Pr,0x16ff);
++	SiS_SetCH701x(SiS_Pr,0xac76);
++	SiS_SetCH701x(SiS_Pr,0x0066);
++     } else {
+         SiS_LongDelay(SiS_Pr,2);
+-	/* TW: Complete power down of LVDS */
+ 	temp = SiS_GetCH701x(SiS_Pr,0x76);
+ 	temp &= 0xfc;
+ 	SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x76);
+ 	SiS_SetCH701x(SiS_Pr,0x0066);
++     }
+   }
+ }
+ 
+-#ifdef NEWCH701x
+ void
+ SiS_ChrontelDoSomething5(SiS_Private *SiS_Pr)
+ {
+      unsigned char temp, temp1;
+-     
++
+      temp1 = SiS_GetCH701x(SiS_Pr,0x49);
+      SiS_SetCH701x(SiS_Pr,0x3e49);
+      temp = SiS_GetCH701x(SiS_Pr,0x47);
+@@ -9303,130 +9656,134 @@ SiS_ChrontelDoSomething5(SiS_Private *Si
+      SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x47);
+      SiS_SetCH701x(SiS_Pr,(temp1 << 8) | 0x49);
+ }
+-#endif
+ 
+ void
+ SiS_ChrontelResetDB(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension, USHORT BaseAddr)
+ {
+-#ifdef NEWCH701x
+      USHORT temp;
+-     
+-     /* 740/LVDS: */
+-     temp = SiS_GetCH701x(SiS_Pr,0x4a);
+-     temp &= 0x01;
+-     if(!(temp)) {
+-     
+-        if(SiS_WeHaveBacklightCtrl(SiS_Pr,HwDeviceExtension, BaseAddr)) {
+-	   temp = SiS_GetCH701x(SiS_Pr,0x49);
+-	   SiS_SetCH701x(SiS_Pr,0x3e49);
+-	}
+-	/* TW: Reset Chrontel 7019 datapath */
++
++     if(HwDeviceExtension->jChipType == SIS_740) {
++        temp = SiS_GetCH701x(SiS_Pr,0x4a);
++        temp &= 0x01;
++        if(!(temp)) {
++
++           if(SiS_WeHaveBacklightCtrl(SiS_Pr,HwDeviceExtension, BaseAddr)) {
++	      temp = SiS_GetCH701x(SiS_Pr,0x49);
++	      SiS_SetCH701x(SiS_Pr,0x3e49);
++	   }
++	   /* Reset Chrontel 7019 datapath */
++           SiS_SetCH701x(SiS_Pr,0x1048);
++           SiS_LongDelay(SiS_Pr,1);
++           SiS_SetCH701x(SiS_Pr,0x1848);
++
++	   if(SiS_WeHaveBacklightCtrl(SiS_Pr,HwDeviceExtension, BaseAddr)) {
++	      SiS_ChrontelDoSomething5(SiS_Pr);
++	      SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x49);
++	   }
++
++        } else {
++
++           temp = SiS_GetCH701x(SiS_Pr,0x5c);
++	   temp &= 0xef;
++	   SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x5c);
++	   temp = SiS_GetCH701x(SiS_Pr,0x5c);
++	   temp |= 0x10;
++	   SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x5c);
++	   temp = SiS_GetCH701x(SiS_Pr,0x5c);
++	   temp &= 0xef;
++	   SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x5c);
++	   temp = SiS_GetCH701x(SiS_Pr,0x61);
++	   if(!temp) {
++	      SiS_SetCH701xForLCD(SiS_Pr,HwDeviceExtension,BaseAddr);
++	   }
++        }
++     } else { /* 650 */
++        /* Reset Chrontel 7019 datapath */
+         SiS_SetCH701x(SiS_Pr,0x1048);
+         SiS_LongDelay(SiS_Pr,1);
+         SiS_SetCH701x(SiS_Pr,0x1848);
+-	
+-	if(SiS_WeHaveBacklightCtrl(SiS_Pr,HwDeviceExtension, BaseAddr)) {
+-	   SiS_ChrontelDoSomething5(SiS_Pr);
+-	   SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x49);
+-	}    
+-     } else {
+-     
+-        temp = SiS_GetCH701x(SiS_Pr,0x5c);
+-	temp &= 0xef;
+-	SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x5c);
+-	temp = SiS_GetCH701x(SiS_Pr,0x5c);
+-	temp |= 0x10;
+-	SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x5c);
+-	temp = SiS_GetCH701x(SiS_Pr,0x5c);
+-	temp &= 0xef;
+-	SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x5c);
+-	temp = SiS_GetCH701x(SiS_Pr,0x61);
+-	if(!temp) {
+-	   SiS_SetCH701xForLCD(SiS_Pr,HwDeviceExtension,BaseAddr);
+-	}
+-     }
+-#else /* pre 740/LVDS code */     
+-     /* TW: Reset Chrontel 7019 datapath */
+-     SiS_SetCH701x(SiS_Pr,0x1048);
+-     SiS_LongDelay(SiS_Pr,1);
+-     SiS_SetCH701x(SiS_Pr,0x1848);
+-#endif     
++     }
+ }
+ 
+ void
+ SiS_ChrontelDoSomething4(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension, USHORT BaseAddr)
+ {
+-#ifdef NEWCH701x
+-     if(!(SiS_WeHaveBacklightCtrl(SiS_Pr,HwDeviceExtension, BaseAddr))) {
+-        SiS_ChrontelDoSomething5(SiS_Pr);
+-     }
+-#else
+      USHORT temp;
+ 
+-     SiS_SetCH701x(SiS_Pr,0xaf76);  /* Power up LVDS block */
+-     temp = SiS_GetCH701x(SiS_Pr,0x49);
+-     temp &= 1;
+-     if(temp != 1) {  /* TV block powered? (0 = yes, 1 = no) */
+-	temp = SiS_GetCH701x(SiS_Pr,0x47);
+-	temp &= 0x70;
+-	SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x47);  /* enable VSYNC */
+-	SiS_LongDelay(SiS_Pr,3);
+-	temp = SiS_GetCH701x(SiS_Pr,0x47);
+-	temp |= 0x80;
+-	SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x47);  /* disable VSYNC */
++     if(HwDeviceExtension->jChipType == SIS_740) {
++
++        if(SiS_WeHaveBacklightCtrl(SiS_Pr,HwDeviceExtension, BaseAddr)) {
++           SiS_ChrontelDoSomething5(SiS_Pr);
++        }
++
++     } else {
++
++        SiS_SetCH701x(SiS_Pr,0xaf76);  /* Power up LVDS block */
++        temp = SiS_GetCH701x(SiS_Pr,0x49);
++        temp &= 1;
++        if(temp != 1) {  /* TV block powered? (0 = yes, 1 = no) */
++	   temp = SiS_GetCH701x(SiS_Pr,0x47);
++	   temp &= 0x70;
++	   SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x47);  /* enable VSYNC */
++	   SiS_LongDelay(SiS_Pr,3);
++	   temp = SiS_GetCH701x(SiS_Pr,0x47);
++	   temp |= 0x80;
++	   SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x47);  /* disable VSYNC */
++        }
++
+      }
+-#endif     
+ }
+ 
+ void
+ SiS_ChrontelDoSomething3(SiS_Private *SiS_Pr, USHORT ModeNo, PSIS_HW_DEVICE_INFO HwDeviceExtension,
+                          USHORT BaseAddr)
+ {
+-#ifdef NEWCH701x
+-     USHORT temp;
+-     
+-     temp = SiS_GetCH701x(SiS_Pr,0x61);
+-     if(temp < 1) {
+-          temp++;
+-	  SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x61);
+-     }
+-     SiS_SetCH701x(SiS_Pr,0x4566);
+-     SiS_SetCH701x(SiS_Pr,0xaf76);
+-     SiS_LongDelay(SiS_Pr,1);
+-     SiS_GenericDelay(SiS_Pr,0x16ff);
+-
+-#else
+      USHORT temp,temp1;
+-     
+-     temp1 = 0;
+-     temp = SiS_GetCH701x(SiS_Pr,0x61);
+-     if(temp < 2) {
+-          temp++;
+-	  SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x61);
+-	  temp1 = 1;
+-     }
+-     SiS_SetCH701x(SiS_Pr,0xac76);
+-     temp = SiS_GetCH701x(SiS_Pr,0x66);
+-     temp |= 0x5f;
+-     SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x66);
+-     if(ModeNo > 0x13) {
+-         if(SiS_WeHaveBacklightCtrl(SiS_Pr,HwDeviceExtension, BaseAddr)) {
+-	    SiS_GenericDelay(SiS_Pr,0x3ff);
+-	 } else {
+-	    SiS_GenericDelay(SiS_Pr,0x2ff);
+-	 }
+-     } else {
+-         if(!temp1)
+-	    SiS_GenericDelay(SiS_Pr,0x2ff);
++
++     if(HwDeviceExtension->jChipType == SIS_740) {
++
++        temp = SiS_GetCH701x(SiS_Pr,0x61);
++        if(temp < 1) {
++           temp++;
++	   SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x61);
++        }
++        SiS_SetCH701x(SiS_Pr,0x4566);
++        SiS_SetCH701x(SiS_Pr,0xaf76);
++        SiS_LongDelay(SiS_Pr,1);
++        SiS_GenericDelay(SiS_Pr,0x16ff);
++
++     } else {  /* 650 */
++
++        temp1 = 0;
++        temp = SiS_GetCH701x(SiS_Pr,0x61);
++        if(temp < 2) {
++           temp++;
++	   SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x61);
++	   temp1 = 1;
++        }
++        SiS_SetCH701x(SiS_Pr,0xac76);
++        temp = SiS_GetCH701x(SiS_Pr,0x66);
++        temp |= 0x5f;
++        SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x66);
++        if(ModeNo > 0x13) {
++           if(SiS_WeHaveBacklightCtrl(SiS_Pr,HwDeviceExtension, BaseAddr)) {
++	      SiS_GenericDelay(SiS_Pr,0x3ff);
++	   } else {
++	      SiS_GenericDelay(SiS_Pr,0x2ff);
++	   }
++        } else {
++           if(!temp1)
++	      SiS_GenericDelay(SiS_Pr,0x2ff);
++        }
++        temp = SiS_GetCH701x(SiS_Pr,0x76);
++        temp |= 0x03;
++        SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x76);
++        temp = SiS_GetCH701x(SiS_Pr,0x66);
++        temp &= 0x7f;
++        SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x66);
++        SiS_LongDelay(SiS_Pr,1);
++
+      }
+-     temp = SiS_GetCH701x(SiS_Pr,0x76);
+-     temp |= 0x03;
+-     SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x76);
+-     temp = SiS_GetCH701x(SiS_Pr,0x66);
+-     temp &= 0x7f;
+-     SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x66);
+-     SiS_LongDelay(SiS_Pr,1);
+-#endif     
+ }
+ 
+ void
+@@ -9443,9 +9800,9 @@ SiS_ChrontelDoSomething2(SiS_Private *Si
+        temp &= 0x04;
+        if(temp == 0x04) break;
+        
+-#ifdef NEWCH701x
+-       SiS_SetCH701x(SiS_Pr,0xac76);    /* 740/LVDS */
+-#endif       
++       if(HwDeviceExtension->jChipType == SIS_740) {
++          SiS_SetCH701x(SiS_Pr,0xac76);
++       }
+ 
+        SiS_SetCH701xForLCD(SiS_Pr,HwDeviceExtension,BaseAddr);
+ 
+@@ -9463,11 +9820,11 @@ SiS_ChrontelDoSomething2(SiS_Private *Si
+        temp = SiS_GetCH701x(SiS_Pr,0x76);
+        temp |= 0x04;
+        SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x76);
+-#ifdef NEWCH701x
+-       SiS_SetCH701x(SiS_Pr,0xe078);
+-#else       
+-       SiS_SetCH701x(SiS_Pr,0x6078);
+-#endif       
++       if(HwDeviceExtension->jChipType == SIS_740) {
++          SiS_SetCH701x(SiS_Pr,0xe078);
++       } else {
++          SiS_SetCH701x(SiS_Pr,0x6078);
++       }
+        SiS_LongDelay(SiS_Pr,2);
+     } while(0);
+ 
+@@ -9485,51 +9842,52 @@ SiS_ChrontelDoSomething1(SiS_Private *Si
+      temp &= 0xbf;	/* Set datapath 2 to LVDS */
+      SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x03);
+      
+-#ifdef NEWCH701x   /* 740/LVDS: */
++     if(HwDeviceExtension->jChipType == SIS_740) {
++
++        temp = SiS_GetCH701x(SiS_Pr,0x1c);
++        temp &= 0xfb;
++        SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x1c);
++
++        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x2d,0x03);
++
++        temp = SiS_GetCH701x(SiS_Pr,0x64);
++        temp |= 0x40;
++        SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x64);
++
++        temp = SiS_GetCH701x(SiS_Pr,0x03);
++        temp &= 0x3f;
++        SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x03);
++
++        temp = SiS_GetCH701x(SiS_Pr,0x66);
++        if(temp != 0x45) {
++           SiS_ChrontelResetDB(SiS_Pr,HwDeviceExtension,BaseAddr);
++           SiS_ChrontelDoSomething2(SiS_Pr,HwDeviceExtension,BaseAddr);
++	   temp = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x34);
++           SiS_ChrontelDoSomething3(SiS_Pr,temp,HwDeviceExtension,BaseAddr);
++        }
++
++     } else { /* 650 */
+ 
+-     temp = SiS_GetCH701x(SiS_Pr,0x1c);
+-     temp &= 0xfb;
+-     SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x1c);
+-     
+-     SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x2d,0x03);
+-     
+-     temp = SiS_GetCH701x(SiS_Pr,0x64);
+-     temp |= 0x40;
+-     SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x64);
+-     
+-     temp = SiS_GetCH701x(SiS_Pr,0x03);
+-     temp &= 0x3f;	
+-     SiS_SetCH701x(SiS_Pr,(temp << 8) | 0x03);
+-     
+-     temp = SiS_GetCH701x(SiS_Pr,0x66);
+-     if(temp != 0x45) {
+         SiS_ChrontelResetDB(SiS_Pr,HwDeviceExtension,BaseAddr);
+-        SiS_ChrontelDoSomething2(SiS_Pr,HwDeviceExtension,BaseAddr);
+-	temp = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x34);
+-        SiS_ChrontelDoSomething3(SiS_Pr,temp,HwDeviceExtension,BaseAddr);
+-     }     
+ 
+-#else  /* pre-740/LVDS: */     
++        SiS_ChrontelDoSomething2(SiS_Pr,HwDeviceExtension,BaseAddr);
+ 
+-     SiS_ChrontelResetDB(SiS_Pr);
++        temp = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x34);
++        SiS_ChrontelDoSomething3(SiS_Pr,temp,HwDeviceExtension,BaseAddr);
+ 
+-     SiS_ChrontelDoSomething2(SiS_Pr,HwDeviceExtension,BaseAddr);
++        SiS_SetCH701x(SiS_Pr,0xaf76);
+ 
+-     temp = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x34);
+-     SiS_ChrontelDoSomething3(SiS_Pr,temp,HwDeviceExtension,BaseAddr);
++     }
+ 
+-     SiS_SetCH701x(SiS_Pr,0xaf76);
+-     
+-#endif  /* End of pre-740/LVDS */
+ }
+ 
+-#endif  /* 310/325 series --------------------------------- */
++#endif  /* 315 series ------------------------------------ */
+ 
+-/* TW: End of Chrontel 701x functions ==================================== */
++/* End of Chrontel 701x functions ==================================== */
+ 
+-/* TW: Generic Read/write routines for Chrontel ========================== */
++/* Generic Read/write routines for Chrontel ========================== */
+ 
+-/* TW: The Chrontel is connected to the 630/730 via
++/* The Chrontel is connected to the 630/730 via
+  * the 630/730's DDC/I2C port.
+  *
+  * On 630(S)T chipset, the index changed from 0x11 to 0x0a,
+@@ -9539,13 +9897,13 @@ SiS_ChrontelDoSomething1(SiS_Private *Si
+ void
+ SiS_SetCH70xx(SiS_Private *SiS_Pr, USHORT tempbx)
+ {
+-   if (SiS_Pr->SiS_IF_DEF_CH70xx == 1)
++   if(SiS_Pr->SiS_IF_DEF_CH70xx == 1)
+       SiS_SetCH700x(SiS_Pr,tempbx);
+    else
+       SiS_SetCH701x(SiS_Pr,tempbx);
+ }
+ 
+-/* TW: Write to Chrontel 700x */
++/* Write to Chrontel 700x */
+ /* Parameter is [Data (S15-S8) | Register no (S7-S0)] */
+ void
+ SiS_SetCH700x(SiS_Private *SiS_Pr, USHORT tempbx)
+@@ -9553,100 +9911,100 @@ SiS_SetCH700x(SiS_Private *SiS_Pr, USHOR
+   USHORT tempah,temp,i;
+ 
+   if(!(SiS_Pr->SiS_ChrontelInit)) {
+-     SiS_Pr->SiS_DDC_Index = 0x11;		   /* TW: Bit 0 = SC;  Bit 1 = SD */
++     SiS_Pr->SiS_DDC_Index = 0x11;		   /* Bit 0 = SC;  Bit 1 = SD */
+      SiS_Pr->SiS_DDC_Data  = 0x02;                 /* Bitmask in IndexReg for Data */
+      SiS_Pr->SiS_DDC_Clk   = 0x01;                 /* Bitmask in IndexReg for Clk */
+      SiS_Pr->SiS_DDC_DataShift = 0x00;
+-     SiS_Pr->SiS_DDC_DeviceAddr = 0xEA;  	   /* TW: DAB (Device Address Byte) */
++     SiS_Pr->SiS_DDC_DeviceAddr = 0xEA;  	   /* DAB (Device Address Byte) */
+   }
+ 
+-  for(i=0;i<10;i++) {	/* TW: Do only 10 attempts to write */
++  for(i=0;i<10;i++) {	/* Do only 10 attempts to write */
+     /* SiS_SetSwitchDDC2(SiS_Pr); */
+-    if(SiS_SetStart(SiS_Pr)) continue;		/* TW: Set start condition */
++    if(SiS_SetStart(SiS_Pr)) continue;		/* Set start condition */
+     tempah = SiS_Pr->SiS_DDC_DeviceAddr;
+-    temp = SiS_WriteDDC2Data(SiS_Pr,tempah);	/* TW: Write DAB (S0=0=write) */
+-    if(temp) continue;				/* TW:    (ERROR: no ack) */
+-    tempah = tempbx & 0x00FF;			/* TW: Write RAB */
+-    tempah |= 0x80;                             /* TW: (set bit 7, see datasheet) */
++    temp = SiS_WriteDDC2Data(SiS_Pr,tempah);	/* Write DAB (S0=0=write) */
++    if(temp) continue;				/*    (ERROR: no ack) */
++    tempah = tempbx & 0x00FF;			/* Write RAB */
++    tempah |= 0x80;                             /* (set bit 7, see datasheet) */
+     temp = SiS_WriteDDC2Data(SiS_Pr,tempah);
+-    if(temp) continue;				/* TW:    (ERROR: no ack) */
++    if(temp) continue;				/*    (ERROR: no ack) */
+     tempah = (tempbx & 0xFF00) >> 8;
+-    temp = SiS_WriteDDC2Data(SiS_Pr,tempah);	/* TW: Write data */
+-    if(temp) continue;				/* TW:    (ERROR: no ack) */
+-    if(SiS_SetStop(SiS_Pr)) continue;		/* TW: Set stop condition */
++    temp = SiS_WriteDDC2Data(SiS_Pr,tempah);	/* Write data */
++    if(temp) continue;				/*    (ERROR: no ack) */
++    if(SiS_SetStop(SiS_Pr)) continue;		/* Set stop condition */
+     SiS_Pr->SiS_ChrontelInit = 1;
+     return;
+   }
+ 
+-  /* TW: For 630ST */
++  /* For 630ST */
+   if(!(SiS_Pr->SiS_ChrontelInit)) {
+-     SiS_Pr->SiS_DDC_Index = 0x0a;		/* TW: Bit 7 = SC;  Bit 6 = SD */
++     SiS_Pr->SiS_DDC_Index = 0x0a;		/* Bit 7 = SC;  Bit 6 = SD */
+      SiS_Pr->SiS_DDC_Data  = 0x80;              /* Bitmask in IndexReg for Data */
+      SiS_Pr->SiS_DDC_Clk   = 0x40;              /* Bitmask in IndexReg for Clk */
+      SiS_Pr->SiS_DDC_DataShift = 0x00;
+-     SiS_Pr->SiS_DDC_DeviceAddr = 0xEA;  	/* TW: DAB (Device Address Byte) */
++     SiS_Pr->SiS_DDC_DeviceAddr = 0xEA;  	/* DAB (Device Address Byte) */
+ 
+-     for(i=0;i<10;i++) {	/* TW: Do only 10 attempts to write */
++     for(i=0;i<10;i++) {	/* Do only 10 attempts to write */
+        /* SiS_SetSwitchDDC2(SiS_Pr); */
+-       if (SiS_SetStart(SiS_Pr)) continue;	/* TW: Set start condition */
++       if (SiS_SetStart(SiS_Pr)) continue;	/* Set start condition */
+        tempah = SiS_Pr->SiS_DDC_DeviceAddr;
+-       temp = SiS_WriteDDC2Data(SiS_Pr,tempah);	/* TW: Write DAB (S0=0=write) */
+-       if(temp) continue;			/* TW:    (ERROR: no ack) */
+-       tempah = tempbx & 0x00FF;		/* TW: Write RAB */
+-       tempah |= 0x80;                          /* TW: (set bit 7, see datasheet) */
++       temp = SiS_WriteDDC2Data(SiS_Pr,tempah);	/* Write DAB (S0=0=write) */
++       if(temp) continue;			/*    (ERROR: no ack) */
++       tempah = tempbx & 0x00FF;		/* Write RAB */
++       tempah |= 0x80;                          /* (set bit 7, see datasheet) */
+        temp = SiS_WriteDDC2Data(SiS_Pr,tempah);
+-       if(temp) continue;			/* TW:    (ERROR: no ack) */
++       if(temp) continue;			/*    (ERROR: no ack) */
+        tempah = (tempbx & 0xFF00) >> 8;
+-       temp = SiS_WriteDDC2Data(SiS_Pr,tempah);	/* TW: Write data */
+-       if(temp) continue;			/* TW:    (ERROR: no ack) */
+-       if(SiS_SetStop(SiS_Pr)) continue;	/* TW: Set stop condition */
++       temp = SiS_WriteDDC2Data(SiS_Pr,tempah);	/* Write data */
++       if(temp) continue;			/*    (ERROR: no ack) */
++       if(SiS_SetStop(SiS_Pr)) continue;	/* Set stop condition */
+        SiS_Pr->SiS_ChrontelInit = 1;
+        return;
+     }
+   }
+ }
+ 
+-/* TW: Write to Chrontel 701x */
++/* Write to Chrontel 701x */
+ /* Parameter is [Data (S15-S8) | Register no (S7-S0)] */
+ void
+ SiS_SetCH701x(SiS_Private *SiS_Pr, USHORT tempbx)
+ {
+   USHORT tempah,temp,i;
+ 
+-  SiS_Pr->SiS_DDC_Index = 0x11;			/* TW: Bit 0 = SC;  Bit 1 = SD */
++  SiS_Pr->SiS_DDC_Index = 0x11;			/* Bit 0 = SC;  Bit 1 = SD */
+   SiS_Pr->SiS_DDC_Data  = 0x08;                 /* Bitmask in IndexReg for Data */
+   SiS_Pr->SiS_DDC_Clk   = 0x04;                 /* Bitmask in IndexReg for Clk */
+   SiS_Pr->SiS_DDC_DataShift = 0x00;
+-  SiS_Pr->SiS_DDC_DeviceAddr = 0xEA;  		/* TW: DAB (Device Address Byte) */
++  SiS_Pr->SiS_DDC_DeviceAddr = 0xEA;  		/* DAB (Device Address Byte) */
+ 
+-  for(i=0;i<10;i++) {	/* TW: Do only 10 attempts to write */
+-    if (SiS_SetStart(SiS_Pr)) continue;		/* TW: Set start condition */
++  for(i=0;i<10;i++) {	/* Do only 10 attempts to write */
++    if (SiS_SetStart(SiS_Pr)) continue;		/* Set start condition */
+     tempah = SiS_Pr->SiS_DDC_DeviceAddr;
+-    temp = SiS_WriteDDC2Data(SiS_Pr,tempah);	/* TW: Write DAB (S0=0=write) */
+-    if(temp) continue;				/* TW:    (ERROR: no ack) */
++    temp = SiS_WriteDDC2Data(SiS_Pr,tempah);	/* Write DAB (S0=0=write) */
++    if(temp) continue;				/*    (ERROR: no ack) */
+     tempah = tempbx & 0x00FF;
+-    temp = SiS_WriteDDC2Data(SiS_Pr,tempah);	/* TW: Write RAB */
+-    if(temp) continue;				/* TW:    (ERROR: no ack) */
++    temp = SiS_WriteDDC2Data(SiS_Pr,tempah);	/* Write RAB */
++    if(temp) continue;				/*    (ERROR: no ack) */
+     tempah = (tempbx & 0xFF00) >> 8;
+-    temp = SiS_WriteDDC2Data(SiS_Pr,tempah);	/* TW: Write data */
+-    if(temp) continue;				/* TW:    (ERROR: no ack) */
+-    if(SiS_SetStop(SiS_Pr)) continue;		/* TW: Set stop condition */
++    temp = SiS_WriteDDC2Data(SiS_Pr,tempah);	/* Write data */
++    if(temp) continue;				/*    (ERROR: no ack) */
++    if(SiS_SetStop(SiS_Pr)) continue;		/* Set stop condition */
+     return;
+   }
+ }
+ 
+-/* TW: Read from Chrontel 70xx */
++/* Read from Chrontel 70xx */
+ /* Parameter is [Register no (S7-S0)] */
+ USHORT
+ SiS_GetCH70xx(SiS_Private *SiS_Pr, USHORT tempbx)
+ {
+-   if (SiS_Pr->SiS_IF_DEF_CH70xx == 1)
++   if(SiS_Pr->SiS_IF_DEF_CH70xx == 1)
+       return(SiS_GetCH700x(SiS_Pr,tempbx));
+    else
+       return(SiS_GetCH701x(SiS_Pr,tempbx));
+ }
+ 
+-/* TW: Read from Chrontel 700x */
++/* Read from Chrontel 700x */
+ /* Parameter is [Register no (S7-S0)] */
+ USHORT
+ SiS_GetCH700x(SiS_Private *SiS_Pr, USHORT tempbx)
+@@ -9654,57 +10012,57 @@ SiS_GetCH700x(SiS_Private *SiS_Pr, USHOR
+   USHORT tempah,temp,i;
+ 
+   if(!(SiS_Pr->SiS_ChrontelInit)) {
+-     SiS_Pr->SiS_DDC_Index = 0x11;		/* TW: Bit 0 = SC;  Bit 1 = SD */
++     SiS_Pr->SiS_DDC_Index = 0x11;		/* Bit 0 = SC;  Bit 1 = SD */
+      SiS_Pr->SiS_DDC_Data  = 0x02;              /* Bitmask in IndexReg for Data */
+      SiS_Pr->SiS_DDC_Clk   = 0x01;              /* Bitmask in IndexReg for Clk */
+      SiS_Pr->SiS_DDC_DataShift = 0x00;
+-     SiS_Pr->SiS_DDC_DeviceAddr = 0xEA;		/* TW: DAB */
++     SiS_Pr->SiS_DDC_DeviceAddr = 0xEA;		/* DAB */
+   }
+ 
+   SiS_Pr->SiS_DDC_ReadAddr = tempbx;
+ 
+-  for(i=0;i<20;i++) {	/* TW: Do only 20 attempts to read */
++  for(i=0;i<20;i++) {	/* Do only 20 attempts to read */
+     /* SiS_SetSwitchDDC2(SiS_Pr); */
+-    if(SiS_SetStart(SiS_Pr)) continue;		/* TW: Set start condition */
++    if(SiS_SetStart(SiS_Pr)) continue;		/* Set start condition */
+     tempah = SiS_Pr->SiS_DDC_DeviceAddr;
+-    temp = SiS_WriteDDC2Data(SiS_Pr,tempah);	/* TW: Write DAB (S0=0=write) */
+-    if(temp) continue;				/* TW:        (ERROR: no ack) */
+-    tempah = SiS_Pr->SiS_DDC_ReadAddr | 0x80;	/* TW: Write RAB | 0x80 */
++    temp = SiS_WriteDDC2Data(SiS_Pr,tempah);	/* Write DAB (S0=0=write) */
++    if(temp) continue;				/*        (ERROR: no ack) */
++    tempah = SiS_Pr->SiS_DDC_ReadAddr | 0x80;	/* Write RAB | 0x80 */
+     temp = SiS_WriteDDC2Data(SiS_Pr,tempah);
+-    if(temp) continue;				/* TW:        (ERROR: no ack) */
+-    if (SiS_SetStart(SiS_Pr)) continue;		/* TW: Re-start */
++    if(temp) continue;				/*        (ERROR: no ack) */
++    if (SiS_SetStart(SiS_Pr)) continue;		/* Re-start */
+     tempah = SiS_Pr->SiS_DDC_DeviceAddr | 0x01; /* DAB | 0x01 = Read */
+-    temp = SiS_WriteDDC2Data(SiS_Pr,tempah);	/* TW: DAB (S0=1=read) */
+-    if(temp) continue;				/* TW:        (ERROR: no ack) */
+-    tempah = SiS_ReadDDC2Data(SiS_Pr,tempah);	/* TW: Read byte */
+-    if (SiS_SetStop(SiS_Pr)) continue;		/* TW: Stop condition */
++    temp = SiS_WriteDDC2Data(SiS_Pr,tempah);	/* DAB (S0=1=read) */
++    if(temp) continue;				/*        (ERROR: no ack) */
++    tempah = SiS_ReadDDC2Data(SiS_Pr,tempah);	/* Read byte */
++    if (SiS_SetStop(SiS_Pr)) continue;		/* Stop condition */
+     SiS_Pr->SiS_ChrontelInit = 1;
+     return(tempah);
+   }
+ 
+-  /* TW: For 630ST */
++  /* For 630ST */
+   if(!SiS_Pr->SiS_ChrontelInit) {
+-     SiS_Pr->SiS_DDC_Index = 0x0a;		/* TW: Bit 0 = SC;  Bit 1 = SD */
++     SiS_Pr->SiS_DDC_Index = 0x0a;		/* Bit 0 = SC;  Bit 1 = SD */
+      SiS_Pr->SiS_DDC_Data  = 0x80;              /* Bitmask in IndexReg for Data */
+      SiS_Pr->SiS_DDC_Clk   = 0x40;              /* Bitmask in IndexReg for Clk */
+      SiS_Pr->SiS_DDC_DataShift = 0x00;
+-     SiS_Pr->SiS_DDC_DeviceAddr = 0xEA;  	/* TW: DAB (Device Address Byte) */
++     SiS_Pr->SiS_DDC_DeviceAddr = 0xEA;  	/* DAB (Device Address Byte) */
+ 
+-     for(i=0;i<20;i++) {	/* TW: Do only 20 attempts to read */
++     for(i=0;i<20;i++) {	/* Do only 20 attempts to read */
+        /* SiS_SetSwitchDDC2(SiS_Pr); */
+-       if(SiS_SetStart(SiS_Pr)) continue;		/* TW: Set start condition */
++       if(SiS_SetStart(SiS_Pr)) continue;		/* Set start condition */
+        tempah = SiS_Pr->SiS_DDC_DeviceAddr;
+-       temp = SiS_WriteDDC2Data(SiS_Pr,tempah);		/* TW: Write DAB (S0=0=write) */
+-       if(temp) continue;				/* TW:        (ERROR: no ack) */
+-       tempah = SiS_Pr->SiS_DDC_ReadAddr | 0x80;	/* TW: Write RAB | 0x80 */
++       temp = SiS_WriteDDC2Data(SiS_Pr,tempah);		/* Write DAB (S0=0=write) */
++       if(temp) continue;				/*        (ERROR: no ack) */
++       tempah = SiS_Pr->SiS_DDC_ReadAddr | 0x80;	/* Write RAB | 0x80 */
+        temp = SiS_WriteDDC2Data(SiS_Pr,tempah);
+-       if(temp) continue;				/* TW:        (ERROR: no ack) */
+-       if (SiS_SetStart(SiS_Pr)) continue;		/* TW: Re-start */
++       if(temp) continue;				/*        (ERROR: no ack) */
++       if (SiS_SetStart(SiS_Pr)) continue;		/* Re-start */
+        tempah = SiS_Pr->SiS_DDC_DeviceAddr | 0x01; 	/* DAB | 0x01 = Read */
+-       temp = SiS_WriteDDC2Data(SiS_Pr,tempah);		/* TW: DAB (S0=1=read) */
+-       if(temp) continue;				/* TW:        (ERROR: no ack) */
+-       tempah = SiS_ReadDDC2Data(SiS_Pr,tempah);	/* TW: Read byte */
+-       if (SiS_SetStop(SiS_Pr)) continue;		/* TW: Stop condition */
++       temp = SiS_WriteDDC2Data(SiS_Pr,tempah);		/* DAB (S0=1=read) */
++       if(temp) continue;				/*        (ERROR: no ack) */
++       tempah = SiS_ReadDDC2Data(SiS_Pr,tempah);	/* Read byte */
++       if (SiS_SetStop(SiS_Pr)) continue;		/* Stop condition */
+        SiS_Pr->SiS_ChrontelInit = 1;
+        return(tempah);
+      }
+@@ -9712,52 +10070,51 @@ SiS_GetCH700x(SiS_Private *SiS_Pr, USHOR
+   return(0xFFFF);
+ }
+ 
+-/* TW: Read from Chrontel 701x */
++/* Read from Chrontel 701x */
+ /* Parameter is [Register no (S7-S0)] */
+ USHORT
+ SiS_GetCH701x(SiS_Private *SiS_Pr, USHORT tempbx)
+ {
+   USHORT tempah,temp,i;
+ 
+-  SiS_Pr->SiS_DDC_Index = 0x11;			/* TW: Bit 0 = SC;  Bit 1 = SD */
++  SiS_Pr->SiS_DDC_Index = 0x11;			/* Bit 0 = SC;  Bit 1 = SD */
+   SiS_Pr->SiS_DDC_Data  = 0x08;                 /* Bitmask in IndexReg for Data */
+   SiS_Pr->SiS_DDC_Clk   = 0x04;                 /* Bitmask in IndexReg for Clk */
+   SiS_Pr->SiS_DDC_DataShift = 0x00;
+-  SiS_Pr->SiS_DDC_DeviceAddr = 0xEA;		/* TW: DAB */
++  SiS_Pr->SiS_DDC_DeviceAddr = 0xEA;		/* DAB */
+   SiS_Pr->SiS_DDC_ReadAddr = tempbx;
+ 
+-   for(i=0;i<20;i++) {	/* TW: Do only 20 attempts to read */
+-    if(SiS_SetStart(SiS_Pr)) continue;		/* TW: Set start condition */
++   for(i=0;i<20;i++) {	/* Do only 20 attempts to read */
++    if(SiS_SetStart(SiS_Pr)) continue;		/* Set start condition */
+     tempah = SiS_Pr->SiS_DDC_DeviceAddr;
+-    temp = SiS_WriteDDC2Data(SiS_Pr,tempah);	/* TW: Write DAB (S0=0=write) */
+-    if(temp) continue;				/* TW:        (ERROR: no ack) */
+-    tempah = SiS_Pr->SiS_DDC_ReadAddr;		/* TW: Write RAB */
++    temp = SiS_WriteDDC2Data(SiS_Pr,tempah);	/* Write DAB (S0=0=write) */
++    if(temp) continue;				/*        (ERROR: no ack) */
++    tempah = SiS_Pr->SiS_DDC_ReadAddr;		/* Write RAB */
+     temp = SiS_WriteDDC2Data(SiS_Pr,tempah);
+-    if(temp) continue;				/* TW:        (ERROR: no ack) */
+-    if (SiS_SetStart(SiS_Pr)) continue;		/* TW: Re-start */
++    if(temp) continue;				/*        (ERROR: no ack) */
++    if (SiS_SetStart(SiS_Pr)) continue;		/* Re-start */
+     tempah = SiS_Pr->SiS_DDC_DeviceAddr | 0x01; /* DAB | 0x01 = Read */
+-    temp = SiS_WriteDDC2Data(SiS_Pr,tempah);	/* TW: DAB (S0=1=read) */
+-    if(temp) continue;				/* TW:        (ERROR: no ack) */
+-    tempah = SiS_ReadDDC2Data(SiS_Pr,tempah);	/* TW: Read byte */
+-    SiS_SetStop(SiS_Pr);			/* TW: Stop condition */
++    temp = SiS_WriteDDC2Data(SiS_Pr,tempah);	/* DAB (S0=1=read) */
++    if(temp) continue;				/*        (ERROR: no ack) */
++    tempah = SiS_ReadDDC2Data(SiS_Pr,tempah);	/* Read byte */
++    SiS_SetStop(SiS_Pr);			/* Stop condition */
+     return(tempah);
+    }
+   return 0xFFFF;
+ }
+ 
+-#ifdef LINUX_XF86
+-/* TW: Our own DDC functions */
++/* Our own DDC functions */
+ USHORT
+-SiS_InitDDCRegs(SiS_Private *SiS_Pr, SISPtr pSiS, USHORT adaptnum, USHORT DDCdatatype,
+-		BOOLEAN checkcr32)
++SiS_InitDDCRegs(SiS_Private *SiS_Pr, unsigned long VBFlags, int VGAEngine,
++                USHORT adaptnum, USHORT DDCdatatype, BOOLEAN checkcr32)
+ {
+      unsigned char ddcdtype[] = { 0xa0, 0xa0, 0xa0, 0xa2, 0xa6 };
+      unsigned char flag, cr32;
+      USHORT        temp = 0, myadaptnum = adaptnum;
+ 
+      if(adaptnum != 0) {
+-        if(!(pSiS->VBFlags & (VB_301|VB_301B|VB_302B))) return 0xFFFF;
+-	if((pSiS->VBFlags & VB_30xBDH) && (adaptnum == 1)) return 0xFFFF;
++        if(!(VBFlags & (VB_301|VB_301B|VB_302B))) return 0xFFFF;
++	if((VBFlags & VB_30xBDH) && (adaptnum == 1)) return 0xFFFF;
+      }	
+      
+      /* adapternum for SiS bridges: 0 = CRT1, 1 = LCD, 2 = VGA2 */
+@@ -9771,8 +10128,9 @@ SiS_InitDDCRegs(SiS_Private *SiS_Pr, SIS
+      flag = 0xff;
+ 
+      cr32 = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x32);
+-  
+-     if(pSiS->VBFlags & VB_SISBRIDGE) {
++
++#if 0
++     if(VBFlags & VB_SISBRIDGE) {
+ 	if(myadaptnum == 0) {
+ 	   if(!(cr32 & 0x20)) {
+ 	      myadaptnum = 2;
+@@ -9785,18 +10143,19 @@ SiS_InitDDCRegs(SiS_Private *SiS_Pr, SIS
+ 	   }
+         }
+      }
++#endif
+ 
+-     if(pSiS->VGAEngine == SIS_300_VGA) {		/* 300 series */
++     if(VGAEngine == SIS_300_VGA) {		/* 300 series */
+ 	
+         if(myadaptnum != 0) {
+ 	   flag = 0;
+-	   if(pSiS->VBFlags & VB_SISBRIDGE) {
++	   if(VBFlags & VB_SISBRIDGE) {
+ 	      SiS_Pr->SiS_DDC_Port = SiS_Pr->SiS_Part4Port;
+               SiS_Pr->SiS_DDC_Index = 0x0f;
+ 	   }
+         }
+ 
+-	if(!(pSiS->VBFlags & VB_301)) {
++	if(!(VBFlags & VB_301)) {
+ 	   if((cr32 & 0x80) && (checkcr32)) {
+               if(myadaptnum >= 1) {
+ 	         if(!(cr32 & 0x08)) {
+@@ -9810,11 +10169,11 @@ SiS_InitDDCRegs(SiS_Private *SiS_Pr, SIS
+ 	temp = 4 - (myadaptnum * 2);
+ 	if(flag) temp = 0;
+ 
+-     } else {						/* 310/325/330 series */
++     } else {						/* 315/330 series */
+ 
+      	/* here we simplify: 0 = CRT1, 1 = CRT2 (VGA, LCD) */
+ 	
+-	if(pSiS->VBFlags & VB_SISBRIDGE) {
++	if(VBFlags & VB_SISBRIDGE) {
+ 	   if(myadaptnum == 2) {
+ 	      myadaptnum = 1;
+            }
+@@ -9822,7 +10181,7 @@ SiS_InitDDCRegs(SiS_Private *SiS_Pr, SIS
+ 
+         if(myadaptnum == 1) {
+      	   flag = 0;
+-	   if(pSiS->VBFlags & VB_SISBRIDGE) {
++	   if(VBFlags & VB_SISBRIDGE) {
+ 	      SiS_Pr->SiS_DDC_Port = SiS_Pr->SiS_Part4Port;
+               SiS_Pr->SiS_DDC_Index = 0x0f;
+ 	   }
+@@ -9840,7 +10199,7 @@ SiS_InitDDCRegs(SiS_Private *SiS_Pr, SIS
+         temp = myadaptnum;
+         if(myadaptnum == 1) {
+            temp = 0;
+-	   if(pSiS->VBFlags & VB_LVDS) flag = 0xff;
++	   if(VBFlags & VB_LVDS) flag = 0xff;
+         }
+ 
+ 	if(flag) temp = 0;
+@@ -9852,7 +10211,7 @@ SiS_InitDDCRegs(SiS_Private *SiS_Pr, SIS
+ #ifdef TWDEBUG
+     xf86DrvMsg(0, X_INFO, "DDC Port %x Index %x Shift %d\n",
+     		SiS_Pr->SiS_DDC_Port, SiS_Pr->SiS_DDC_Index, temp);
+-#endif	 
++#endif
+     
+     return 0;
+ }
+@@ -9862,15 +10221,9 @@ SiS_WriteDABDDC(SiS_Private *SiS_Pr)
+ {
+    if(SiS_SetStart(SiS_Pr)) return 0xFFFF;
+    if(SiS_WriteDDC2Data(SiS_Pr, SiS_Pr->SiS_DDC_DeviceAddr)) {
+-#ifdef TWDEBUG
+-        xf86DrvMsg(0, X_INFO, "WriteDAB 1 failed\n");
+-#endif	 
+   	return 0xFFFF;
+    }
+    if(SiS_WriteDDC2Data(SiS_Pr, SiS_Pr->SiS_DDC_SecAddr)) {
+-#ifdef TWDEBUG
+-        xf86DrvMsg(0, X_INFO, "WriteDAB 2 failed\n");
+-#endif	 
+    	return 0xFFFF;
+    }
+    return(0);
+@@ -9881,9 +10234,6 @@ SiS_PrepareReadDDC(SiS_Private *SiS_Pr)
+ {
+    if(SiS_SetStart(SiS_Pr)) return 0xFFFF;
+    if(SiS_WriteDDC2Data(SiS_Pr, (SiS_Pr->SiS_DDC_DeviceAddr | 0x01))) {
+-#ifdef TWDEBUG
+-        xf86DrvMsg(0, X_INFO, "PrepareReadDDC 1 failed\n");
+-#endif	 
+    	return 0xFFFF;
+    }
+    return(0);
+@@ -9921,9 +10271,6 @@ SiS_DoProbeDDC(SiS_Private *SiS_Pr)
+     SiS_SetSwitchDDC2(SiS_Pr);
+     if(SiS_PrepareDDC(SiS_Pr)) {
+          SiS_SetStop(SiS_Pr);
+-#ifdef TWDEBUG
+-	 xf86DrvMsg(0, X_INFO, "DoProbeDDC 1 failed at PrepareDDC\n");
+-#endif	 
+          return(0xFFFF);
+     }
+     mask = 0xf0;
+@@ -9972,7 +10319,7 @@ SiS_ProbeDDC(SiS_Private *SiS_Pr)
+ }
+ 
+ USHORT
+-SiS_ReadDDC(SiS_Private *SiS_Pr, SISPtr pSiS, USHORT DDCdatatype, unsigned char *buffer)
++SiS_ReadDDC(SiS_Private *SiS_Pr, USHORT DDCdatatype, unsigned char *buffer)
+ {
+    USHORT flag, length, i;
+    unsigned char chksum,gotcha;
+@@ -10004,28 +10351,7 @@ SiS_ReadDDC(SiS_Private *SiS_Pr, SISPtr 
+    return(flag);
+ }
+ 
+-USHORT
+-SiS_ReadLCDDDC(SiS_Private *SiS_Pr, USHORT length, unsigned char *buffer)
+-{
+-   USHORT i=0, flag=0;
+-
+-   length--;
+-   
+-   SiS_SetSwitchDDC2(SiS_Pr);
+-   if(!(SiS_PrepareDDC(SiS_Pr))) {
+-      for(i=0; i<length; i++) {
+-         buffer[i] = (unsigned char)SiS_ReadDDC2Data(SiS_Pr, 0);
+-         SiS_SendACK(SiS_Pr, 0);
+-      }
+-      buffer[i] = (unsigned char)SiS_ReadDDC2Data(SiS_Pr, 0);
+-      SiS_SendACK(SiS_Pr, 1);
+-   } else flag = 0xFFFF;
+-   
+-   SiS_SetStop(SiS_Pr);
+-   return(0);
+-}
+-
+-/* TW: Our private DDC function
++/* Our private DDC functions
+ 
+    It complies somewhat with the corresponding VESA function
+    in arguments and return values.
+@@ -10036,7 +10362,7 @@ SiS_ReadLCDDDC(SiS_Private *SiS_Pr, USHO
+ 
+    Arguments:
+        adaptnum: 0=CRT1, 1=LCD, 2=VGA2
+-                 CRT2 DDC is only supported on SiS301, 301B (non-DH version), 302B.
++                 CRT2 DDC is only supported on SiS301, 301B, 302B.
+        DDCdatatype: 0=Probe, 1=EDID, 2=EDID+VDIF, 3=EDID V2 (P&D), 4=EDID V2 (FPDI-2)
+        buffer: ptr to 256 data bytes which will be filled with read data.
+ 
+@@ -10046,43 +10372,48 @@ SiS_ReadLCDDDC(SiS_Private *SiS_Pr, USHO
+ 
+  */
+ USHORT
+-SiS_HandleDDC(SiS_Private *SiS_Pr, SISPtr pSiS, USHORT adaptnum,
+-              USHORT DDCdatatype, unsigned char *buffer)
++SiS_HandleDDC(SiS_Private *SiS_Pr, unsigned long VBFlags, int VGAEngine,
++              USHORT adaptnum, USHORT DDCdatatype, unsigned char *buffer)
+ {
+    if(adaptnum > 2) return 0xFFFF;
+    if(DDCdatatype > 4) return 0xFFFF;
+-   if((!(pSiS->VBFlags & VB_VIDEOBRIDGE)) && (adaptnum > 0)) return 0xFFFF;
+-   if(SiS_InitDDCRegs(SiS_Pr, pSiS, adaptnum, DDCdatatype, TRUE) == 0xFFFF) return 0xFFFF;
++   if((!(VBFlags & VB_VIDEOBRIDGE)) && (adaptnum > 0)) return 0xFFFF;
++   if(SiS_InitDDCRegs(SiS_Pr, VBFlags, VGAEngine, adaptnum, DDCdatatype, TRUE) == 0xFFFF) return 0xFFFF;
+    if(DDCdatatype == 0) {
+        return(SiS_ProbeDDC(SiS_Pr));
+    } else {
+-       return(SiS_ReadDDC(SiS_Pr, pSiS, DDCdatatype, buffer));
++       return(SiS_ReadDDC(SiS_Pr, DDCdatatype, buffer));
+    }
+ }
+ 
++#ifdef LINUX_XF86
+ /* Sense the LCD parameters (CR36, CR37) via DDC */
+ /* SiS30x(B) only */
+ USHORT
+ SiS_SenseLCDDDC(SiS_Private *SiS_Pr, SISPtr pSiS)
+ {
+-   USHORT DDCdatatype, paneltype, flag, xres, yres;
++   USHORT DDCdatatype, paneltype, flag, xres=0, yres=0;
+    USHORT index, myindex, lumsize, numcodes;
+    unsigned char cr37=0, seekcode;
+    BOOLEAN checkexpand = FALSE;
+    int retry, i;
+    unsigned char buffer[256];
+-   
++
++   for(i=0; i<7; i++) SiS_Pr->CP_DataValid[i] = FALSE;
++   SiS_Pr->CP_HaveCustomData = FALSE;
++   SiS_Pr->CP_MaxX = SiS_Pr->CP_MaxY = SiS_Pr->CP_MaxClock = 0;
++
+    if(!(pSiS->VBFlags & (VB_301|VB_301B|VB_302B))) return 0;
+    if(pSiS->VBFlags & VB_30xBDH) return 0;
+   
+-   if(SiS_InitDDCRegs(SiS_Pr, pSiS, 1, 0, FALSE) == 0xFFFF) return 0;
++   if(SiS_InitDDCRegs(SiS_Pr, pSiS->VBFlags, pSiS->VGAEngine, 1, 0, FALSE) == 0xFFFF) return 0;
+    
+    SiS_Pr->SiS_DDC_SecAddr = 0x00;
+    
+    /* Probe supported DA's */
+    flag = SiS_ProbeDDC(SiS_Pr);
+ #ifdef TWDEBUG   
+-   xf86DrvMsg(pSiS->pScrn->scrnIndex, X_INFO, 
++   xf86DrvMsg(pSiS->pScrn->scrnIndex, X_INFO,
+    	"CRT2 DDC capabilities 0x%x\n", flag);
+ #endif	
+    if(flag & 0x10) {
+@@ -10099,7 +10430,7 @@ SiS_SenseLCDDDC(SiS_Private *SiS_Pr, SIS
+    /* Read the entire EDID */
+    retry = 2;
+    do {
+-      if(SiS_ReadDDC(SiS_Pr, pSiS, DDCdatatype, buffer)) {
++      if(SiS_ReadDDC(SiS_Pr, DDCdatatype, buffer)) {
+          xf86DrvMsg(pSiS->pScrn->scrnIndex, X_INFO, 
+ 	 	"CRT2: DDC read failed (attempt %d), %s\n", 
+ 		(3-retry), (retry == 1) ? "giving up" : "retrying");
+@@ -10132,7 +10463,7 @@ SiS_SenseLCDDDC(SiS_Private *SiS_Pr, SIS
+       }
+       
+       if((buffer[0x18] & 0x18) != 0x08) {
+-         xf86DrvMsg(pSiS->pScrn->scrnIndex, X_PROBED, 
++         xf86DrvMsg(pSiS->pScrn->scrnIndex, X_PROBED,
+ 	 	"CRT2: Attached display is not of RGB but of %s type (0x%02x)\n", 
+ 		((buffer[0x18] & 0x18) == 0x00) ? "monochrome/greyscale" :
+ 		  ( ((buffer[0x18] & 0x18) == 0x10) ? "non-RGB multicolor" : 
+@@ -10140,103 +10471,226 @@ SiS_SenseLCDDDC(SiS_Private *SiS_Pr, SIS
+ 		buffer[0x18]);
+ 	 return 0;
+       }
+-      
+-      /* Now analyze the first Detailed Timing Block and hope
+-       * that the preferred timing mode is stored there.
+-       */	
+-      xres = buffer[0x38] | ((buffer[0x3a] & 0xf0) << 4);
+-      yres = buffer[0x3b] | ((buffer[0x3d] & 0xf0) << 4);
++
++      /* Now analyze the first Detailed Timing Block and see
++       * if the preferred timing mode is stored there. If so,
++       * check if this is a standard panel for which we already
++       * know the timing.
++       */
++
++      paneltype = Panel_Custom;
+       checkexpand = FALSE;
+-      switch(xres) {
+-         case 800:
+-	     if(yres == 600) {
+-	     	paneltype = Panel310_800x600;
+-	     	checkexpand = TRUE;
+-	     }
+-	     break;
+-         case 1024:
+-	     if(yres == 768) {
+-	     	paneltype = Panel310_1024x768;
+-	     	checkexpand = FALSE;    /* expand causes error at 640x480, should otherwise be TRUE; */
+-	     }
+-	     break;
+-	 case 1280:
+-	     if(yres == 960) {
+-	        if(pSiS->VGAEngine == SIS_300_VGA) {
+-		   paneltype = Panel300_1280x960;
+-		} else {
+-		   paneltype = Panel310_1280x960; 
+-		}
+-	     } else if(yres == 1024) {
+-	     	paneltype = Panel310_1280x1024;  
+-		checkexpand = TRUE;
+-	     } else if(pSiS->VGAEngine == SIS_315_VGA) {
++
++      if(buffer[0x18] & 0x02) {
++
++         xres = buffer[0x38] | ((buffer[0x3a] & 0xf0) << 4);
++         yres = buffer[0x3b] | ((buffer[0x3d] & 0xf0) << 4);
++
++	 SiS_Pr->CP_PreferredX = xres;
++	 SiS_Pr->CP_PreferredY = yres;
++
++         switch(xres) {
++            case 800:
++	        if(yres == 600) {
++	     	   paneltype = Panel_800x600;
++	     	   checkexpand = TRUE;
++	        }
++	        break;
++            case 1024:
+ 	        if(yres == 768) {
+-	       	   paneltype = Panel310_1280x768; 	/* Panel size 1280x768 not supported yet */
+-		   checkexpand = TRUE;	
+-	        }	
+-	     }
+-	     break;
+-	 case 1400:
+-	     if(pSiS->VGAEngine == SIS_315_VGA) {
+-	        if(yres == 1050) {
+-	           paneltype = Panel310_1400x1050;
+-		   checkexpand = TRUE; 
+-	        } 
+-	     }
+-      	     break;
+-	 case 1600:
+-	     if(pSiS->VGAEngine == SIS_315_VGA) {
+-	        if(yres == 1200) {
+-	           paneltype = Panel310_1600x1200;
++	     	   paneltype = Panel_1024x768;
++	     	   checkexpand = TRUE;
++	        }
++	        break;
++	    case 1280:
++	        if(yres == 1024) {
++	     	   paneltype = Panel_1280x1024;
+ 		   checkexpand = TRUE;
+-	        } 
+-	     }
+-      	     break;
++	        } else if(yres == 960) {
++	           if(pSiS->VGAEngine == SIS_300_VGA) {
++		      paneltype = Panel300_1280x960;
++		   } else {
++		      paneltype = Panel310_1280x960;
++		   }
++	        } else if(yres == 768) {
++	       	   paneltype = Panel_1280x768;
++		   checkexpand = FALSE;
++		   cr37 |= 0x10;
++	        }
++	        break;
++	    case 1400:
++	        if(pSiS->VGAEngine == SIS_315_VGA) {
++	           if(yres == 1050) {
++	              paneltype = Panel310_1400x1050;
++		      checkexpand = TRUE;
++	           }
++	        }
++      	        break;
++#if 0	    /* Treat this as custom, as we have no valid timing data yet */
++	    case 1600:
++	        if(pSiS->VGAEngine == SIS_315_VGA) {
++	           if(yres == 1200) {
++	              paneltype = Panel310_1600x1200;
++		      checkexpand = TRUE;
++	           }
++	        }
++      	        break;
++#endif
++         }
++
++	 if(paneltype != Panel_Custom) {
++	    if((buffer[0x47] & 0x18) == 0x18) {
++	       cr37 |= ((((buffer[0x47] & 0x06) ^ 0x06) << 5) | 0x20);
++	    } else {
++	       /* What now? There is no digital separate output timing... */
++	       xf86DrvMsg(pSiS->pScrn->scrnIndex, X_WARNING,
++	       	   "CRT2: Unable to retrieve Sync polarity information\n");
++	    }
++	 }
++
+       }
+ 
+-      if(buffer[0x18] & 0x02) {
+-         /* If the preferred timing mode is stored in the first
+-	  * detailed timing block, we now can extract the sync
+-	  * polarisation information as well. This only works
+-	  * if the Flags indicate a digital separate output.
+-	  */
+-	  if((buffer[0x47] & 0x18) == 0x18) {
+-	     cr37 |= ((((buffer[0x47] & 0x06) ^ 0x06) << 5) | 0x20);
+-	  } else {
+-	     /* What now? There is no digital separate output timing... */
+-	     xf86DrvMsg(pSiS->pScrn->scrnIndex, X_WARNING, 
+-	     	"CRT2: Unable to retrieve Sync polarity information\n");
+-	  }
+-	  
+-      } else {
+-         /* If the preferred timing mode is *not* stored in the first
+-	  * detailed timing block, we need to guess the resolution
+-	  * from the supported Established Timings and assume the
+-	  * default sync polarity
+-	  */
++      /* If we still don't know what panel this is, we take it
++       * as a custom panel and derive the timing data from the
++       * detailed timing blocks
++       */
++      if(paneltype == Panel_Custom) {
++
++         BOOLEAN havesync = FALSE;
++	 int i, temp, base = 0x36;
++	 unsigned long estpack;
++	 unsigned short estx[] = {
++	 	720, 720, 640, 640, 640, 640, 800, 800,
++		800, 800, 832,1024,1024,1024,1024,1280,
++		1152
++	 };
++	 unsigned short esty[] = {
++	 	400, 400, 480, 480, 480, 480, 600, 600,
++		600, 600, 624, 768, 768, 768, 768,1024,
++		870
++	 };
++
+ 	 paneltype = 0;
+-	 if(buffer[0x24] & 0x01) { 	
+-	 	paneltype = Panel310_1280x1024;
+-		checkexpand = TRUE;
+-		cr37 |= 0x20;
+-	 } else if(buffer[0x24] & 0x0e) {
+-	 	paneltype = Panel310_1024x768;
+-		cr37 |= 0xe0;
+-		checkexpand = FALSE;		/* Bug at 640x480 */
+-	 } else if(buffer[0x23] & 0x01) {
+-	 	paneltype = Panel310_800x600;
+-		cr37 |= 0xe0;
+-		checkexpand = TRUE;
+-         }
++
++	 /* Find the maximum resolution */
++
++	 /* 1. From Established timings */
++	 estpack = (buffer[0x23] << 9) | (buffer[0x24] << 1) | ((buffer[0x25] >> 7) & 0x01);
++	 for(i=16; i>=0; i--) {
++	     if(estpack & (1 << i)) {
++	        if(estx[16 - i] > SiS_Pr->CP_MaxX) SiS_Pr->CP_MaxX = estx[16 - i];
++		if(esty[16 - i] > SiS_Pr->CP_MaxY) SiS_Pr->CP_MaxY = esty[16 - i];
++	     }
++	 }
++
++	 /* 2. From Standard Timings */
++	 for(i=0x26; i < 0x36; i+=2) {
++	    if((buffer[i] != 0x01) && (buffer[i+1] != 0x01)) {
++	       temp = (buffer[i] + 31) * 8;
++	       if(temp > SiS_Pr->CP_MaxX) SiS_Pr->CP_MaxX = temp;
++	       switch((buffer[i+1] & 0xc0) >> 6) {
++	       case 0x03: temp = temp * 9 / 16; break;
++	       case 0x02: temp = temp * 4 / 5;  break;
++	       case 0x01: temp = temp * 3 / 4;  break;
++	       }
++	       if(temp > SiS_Pr->CP_MaxY) SiS_Pr->CP_MaxY = temp;
++	    }
++	 }
++
++	 /* Now extract the Detailed Timings and convert them into modes */
++
++         for(i = 0; i < 4; i++, base += 18) {
++
++	    /* Is this a detailed timing block or a monitor descriptor? */
++	    if(buffer[base] || buffer[base+1] || buffer[base+2]) {
++
++      	       xres = buffer[base+2] | ((buffer[base+4] & 0xf0) << 4);
++               yres = buffer[base+5] | ((buffer[base+7] & 0xf0) << 4);
++
++	       SiS_Pr->CP_HDisplay[i] = xres;
++	       SiS_Pr->CP_HSyncStart[i] = xres + (buffer[base+8] | ((buffer[base+11] & 0xc0) << 2));
++               SiS_Pr->CP_HSyncEnd[i]   = SiS_Pr->CP_HSyncStart[i] + (buffer[base+9] | ((buffer[base+11] & 0x30) << 4));
++	       SiS_Pr->CP_HTotal[i] = xres + (buffer[base+3] | ((buffer[base+4] & 0x0f) << 8));
++	       SiS_Pr->CP_HBlankStart[i] = xres + 1;
++	       SiS_Pr->CP_HBlankEnd[i] = SiS_Pr->CP_HTotal[i];
++
++	       SiS_Pr->CP_VDisplay[i] = yres;
++               SiS_Pr->CP_VSyncStart[i] = yres + (((buffer[base+10] & 0xf0) >> 4) | ((buffer[base+11] & 0x0c) << 2));
++               SiS_Pr->CP_VSyncEnd[i] = SiS_Pr->CP_VSyncStart[i] + ((buffer[base+10] & 0x0f) | ((buffer[base+11] & 0x03) << 4));
++	       SiS_Pr->CP_VTotal[i] = yres + (buffer[base+6] | ((buffer[base+7] & 0x0f) << 8));
++	       SiS_Pr->CP_VBlankStart[i] = yres + 1;
++	       SiS_Pr->CP_VBlankEnd[i] = SiS_Pr->CP_VTotal[i];
++
++	       SiS_Pr->CP_Clock[i] = (buffer[base] | (buffer[base+1] << 8)) * 10;
++
++	       SiS_Pr->CP_DataValid[i] = TRUE;
++
++	       /* Sort out invalid timings, interlace and too high clocks */
++	       if((SiS_Pr->CP_HDisplay[i] > SiS_Pr->CP_HSyncStart[i])  ||
++	          (SiS_Pr->CP_HDisplay[i] >= SiS_Pr->CP_HSyncEnd[i])   ||
++	          (SiS_Pr->CP_HDisplay[i] >= SiS_Pr->CP_HTotal[i])     ||
++	          (SiS_Pr->CP_HSyncStart[i] >= SiS_Pr->CP_HSyncEnd[i]) ||
++	          (SiS_Pr->CP_HSyncStart[i] > SiS_Pr->CP_HTotal[i])    ||
++	          (SiS_Pr->CP_HSyncEnd[i] > SiS_Pr->CP_HTotal[i])      ||
++	          (SiS_Pr->CP_VDisplay[i] > SiS_Pr->CP_VSyncStart[i])  ||
++	          (SiS_Pr->CP_VDisplay[i] >= SiS_Pr->CP_VSyncEnd[i])   ||
++	          (SiS_Pr->CP_VDisplay[i] >= SiS_Pr->CP_VTotal[i])     ||
++	          (SiS_Pr->CP_VSyncStart[i] > SiS_Pr->CP_VSyncEnd[i])  ||
++	          (SiS_Pr->CP_VSyncStart[i] > SiS_Pr->CP_VTotal[i])    ||
++	          (SiS_Pr->CP_VSyncEnd[i] > SiS_Pr->CP_VTotal[i])      ||
++	          (SiS_Pr->CP_Clock[i] > 108000)                       ||
++		  (buffer[base+17] & 0x80)) {
++
++	          SiS_Pr->CP_DataValid[i] = FALSE;
++
++	       } else {
++
++	          paneltype = Panel_Custom;
++
++		  SiS_Pr->CP_HaveCustomData = TRUE;
++
++		  if(xres > SiS_Pr->CP_MaxX) SiS_Pr->CP_MaxX = xres;
++	          if(yres > SiS_Pr->CP_MaxY) SiS_Pr->CP_MaxY = yres;
++		  if(SiS_Pr->CP_Clock[i] > SiS_Pr->CP_MaxClock) SiS_Pr->CP_MaxClock = SiS_Pr->CP_Clock[i];
++
++		  SiS_Pr->CP_Vendor = buffer[9] | (buffer[8] << 8);
++		  SiS_Pr->CP_Product = buffer[10] | (buffer[11] << 8);
++
++	          /* We must assume the panel can scale, since we have
++	           * no scaling data
++		   */
++	          checkexpand = FALSE;
++	          cr37 |= 0x10;
++
++	          /* Extract the sync polarisation information. This only works
++	           * if the Flags indicate a digital separate output.
++	           */
++	          if((buffer[base+17] & 0x18) == 0x18) {
++		     SiS_Pr->CP_HSync_P[i] = (buffer[base+17] & 0x02) ? TRUE : FALSE;
++		     SiS_Pr->CP_VSync_P[i] = (buffer[base+17] & 0x04) ? TRUE : FALSE;
++		     SiS_Pr->CP_SyncValid[i] = TRUE;
++		     if(!havesync) {
++	                cr37 |= ((((buffer[base+17] & 0x06) ^ 0x06) << 5) | 0x20);
++			havesync = TRUE;
++	   	     }
++	          } else {
++		     SiS_Pr->CP_SyncValid[i] = FALSE;
++		  }
++	       }
++            }
++	 }
++	 if(!havesync) {
++	    xf86DrvMsg(pSiS->pScrn->scrnIndex, X_WARNING,
++	       	   "CRT2: Unable to retrieve Sync polarity information\n");
++   	 }
+       }
+-      
+-      if(checkexpand) {
+-         /* If any of the Established low-res modes is supported, the 
++
++      if(paneltype && checkexpand) {
++         /* If any of the Established low-res modes is supported, the
+ 	  * panel can scale automatically. For 800x600 panels, we only 
+ 	  * check the even lower ones.
+ 	  */
+-	 if(paneltype == Panel310_800x600) {
++	 if(paneltype == Panel_800x600) {
+ 	    if(buffer[0x23] & 0xfc) cr37 |= 0x10;
+ 	 } else {
+             if(buffer[0x23])	    cr37 |= 0x10;
+@@ -10262,20 +10716,31 @@ SiS_SenseLCDDDC(SiS_Private *SiS_Pr, SIS
+ 		buffer[0x41]);
+ 	 return 0;
+       }
+-   
+-      xres = buffer[0x76] | (buffer[0x77] << 8);
+-      yres = buffer[0x78] | (buffer[0x79] << 8);
++
++      paneltype = Panel_Custom;
++      SiS_Pr->CP_MaxX = xres = buffer[0x76] | (buffer[0x77] << 8);
++      SiS_Pr->CP_MaxY = yres = buffer[0x78] | (buffer[0x79] << 8);
+       switch(xres) {
+          case 800:
+ 	     if(yres == 600) {
+-	     	paneltype = Panel310_800x600;
++	     	paneltype = Panel_800x600;
+ 	     	checkexpand = TRUE;
+ 	     }
+ 	     break;
+          case 1024:
+ 	     if(yres == 768) {
+-	     	paneltype = Panel310_1024x768;
+-	     	checkexpand = FALSE;			/* Bug at 640x480; we do the scaling ourselves */
++	     	paneltype = Panel_1024x768;
++	     	checkexpand = TRUE;
++	     }
++	     break;
++	 case 1152:
++	     if(yres == 768) {
++	        if(pSiS->VGAEngine == SIS_300_VGA) {
++		   paneltype = Panel300_1152x768;
++		} else {
++		   paneltype = Panel310_1152x768;
++		}
++	     	checkexpand = TRUE;
+ 	     }
+ 	     break;
+ 	 case 1280:
+@@ -10286,45 +10751,46 @@ SiS_SenseLCDDDC(SiS_Private *SiS_Pr, SIS
+ 		   paneltype = Panel300_1280x960;
+ 		}
+ 	     } else if(yres == 1024) {
+-	     	paneltype = Panel310_1280x1024;  
++	     	paneltype = Panel_1280x1024;
+ 		checkexpand = TRUE;
+-	     } else if(pSiS->VGAEngine == SIS_315_VGA) {
+-	        if(yres == 768) {
+-	       	   paneltype = Panel310_1280x768; 	/* Panel size 1280x768 not supported yet */
+-		   checkexpand = TRUE;
+-	        }
+-	     } 
++	     } else if(yres == 768) {
++	        paneltype = Panel_1280x768;
++		checkexpand = FALSE;
++		cr37 |= 0x10;
++	     }
+ 	     break;
+ 	 case 1400:
+ 	     if(pSiS->VGAEngine == SIS_315_VGA) {
+ 	        if(yres == 1050) {
+ 	           paneltype = Panel310_1400x1050;
+ 		   checkexpand = TRUE;
+-	        } 
++	        }
+ 	     }
+       	     break;
++#if 0    /* Treat this one as custom since we have no timing data yet */
+ 	 case 1600:
+ 	     if(pSiS->VGAEngine == SIS_315_VGA) {
+ 	        if(yres == 1200) {
+ 	           paneltype = Panel310_1600x1200;
+ 		   checkexpand = TRUE;
+-	        } 
++	        }
+ 	     }
+       	     break;
++#endif
+       }
+-                 
++
+       /* Determine if RGB18 or RGB24 */
+       if(index) {
+          if((buffer[index] == 0x20) || (buffer[index] == 0x34)) {
+ 	    cr37 |= 0x01;
+ 	 }
+       }
+-      
++
+       if(checkexpand) {
+          /* TODO - for now, we let the panel scale */
+ 	 cr37 |= 0x10;
+       }
+-     
++
+       /* Now seek 4-Byte Timing codes and extract sync pol info */
+       index = 0x80;
+       if(buffer[0x7e] & 0x20) {			    /* skip Luminance Table (if provided) */
+@@ -10346,28 +10812,117 @@ SiS_SenseLCDDDC(SiS_Private *SiS_Pr, SIS
+ 	 if(buffer[myindex] == seekcode) {
+ 	    cr37 |= ((((buffer[myindex + 1] & 0x0c) ^ 0x0c) << 4) | 0x20);
+ 	 } else {
+-	    xf86DrvMsg(pSiS->pScrn->scrnIndex, X_WARNING, 
+-	    	"CRT2: Unable to retrieve Sync polarity information\n");    
++	    xf86DrvMsg(pSiS->pScrn->scrnIndex, X_WARNING,
++	        "CRT2: Unable to retrieve Sync polarity information\n");
+ 	 }
+       } else {
+-         xf86DrvMsg(pSiS->pScrn->scrnIndex, X_WARNING, 
+-	    	"CRT2: Unable to retrieve Sync polarity information\n");
++         xf86DrvMsg(pSiS->pScrn->scrnIndex, X_WARNING,
++	     "CRT2: Unable to retrieve Sync polarity information\n");
++      }
++
++      /* Now seek the detailed timing descriptions for custom panels */
++      if(paneltype == Panel_Custom) {
++         index += (numcodes * 4);
++	 numcodes = buffer[0x7f] & 0x07;
++	 for(i=0; i<numcodes; i++) {
++	    xres = buffer[index+2] | ((buffer[index+4] & 0xf0) << 4);
++            yres = buffer[index+5] | ((buffer[index+7] & 0xf0) << 4);
++
++	    SiS_Pr->CP_HDisplay[i] = xres;
++	    SiS_Pr->CP_HSyncStart[i] = xres + (buffer[index+8] | ((buffer[index+11] & 0xc0) << 2));
++            SiS_Pr->CP_HSyncEnd[i] = SiS_Pr->CP_HSyncStart[i] + (buffer[index+9] | ((buffer[index+11] & 0x30) << 4));
++	    SiS_Pr->CP_HTotal[i] = xres + (buffer[index+3] | ((buffer[index+4] & 0x0f) << 8));
++	    SiS_Pr->CP_HBlankStart[i] = xres + 1;
++	    SiS_Pr->CP_HBlankEnd[i] = SiS_Pr->CP_HTotal[i];
++
++	    SiS_Pr->CP_VDisplay[i] = yres;
++            SiS_Pr->CP_VSyncStart[i] = yres + (((buffer[index+10] & 0xf0) >> 4) | ((buffer[index+11] & 0x0c) << 2));
++            SiS_Pr->CP_VSyncEnd[i] = SiS_Pr->CP_VSyncStart[i] + ((buffer[index+10] & 0x0f) | ((buffer[index+11] & 0x03) << 4));
++	    SiS_Pr->CP_VTotal[i] = yres + (buffer[index+6] | ((buffer[index+7] & 0x0f) << 8));
++	    SiS_Pr->CP_VBlankStart[i] = yres + 1;
++	    SiS_Pr->CP_VBlankEnd[i] = SiS_Pr->CP_VTotal[i];
++
++	    SiS_Pr->CP_Clock[i] = (buffer[index] | (buffer[index+1] << 8)) * 10;
++
++	    SiS_Pr->CP_DataValid[i] = TRUE;
++
++	    if((SiS_Pr->CP_HDisplay[i] > SiS_Pr->CP_HSyncStart[i])  ||
++	       (SiS_Pr->CP_HDisplay[i] >= SiS_Pr->CP_HSyncEnd[i])   ||
++	       (SiS_Pr->CP_HDisplay[i] >= SiS_Pr->CP_HTotal[i])     ||
++	       (SiS_Pr->CP_HSyncStart[i] >= SiS_Pr->CP_HSyncEnd[i]) ||
++	       (SiS_Pr->CP_HSyncStart[i] > SiS_Pr->CP_HTotal[i])    ||
++	       (SiS_Pr->CP_HSyncEnd[i] > SiS_Pr->CP_HTotal[i])      ||
++	       (SiS_Pr->CP_VDisplay[i] > SiS_Pr->CP_VSyncStart[i])  ||
++	       (SiS_Pr->CP_VDisplay[i] >= SiS_Pr->CP_VSyncEnd[i])   ||
++	       (SiS_Pr->CP_VDisplay[i] >= SiS_Pr->CP_VTotal[i])     ||
++	       (SiS_Pr->CP_VSyncStart[i] > SiS_Pr->CP_VSyncEnd[i])  ||
++	       (SiS_Pr->CP_VSyncStart[i] > SiS_Pr->CP_VTotal[i])    ||
++	       (SiS_Pr->CP_VSyncEnd[i] > SiS_Pr->CP_VTotal[i])      ||
++	       (SiS_Pr->CP_Clock[i] > 108000)                       ||
++	       (buffer[index + 17] & 0x80)) {
++
++	       SiS_Pr->CP_DataValid[i] = FALSE;
++
++	    } else {
++
++	       SiS_Pr->CP_HaveCustomData = TRUE;
++
++	       if(SiS_Pr->CP_Clock[i] > SiS_Pr->CP_MaxClock) SiS_Pr->CP_MaxClock = SiS_Pr->CP_Clock[i];
++
++	       SiS_Pr->CP_HSync_P[i] = (buffer[index + 17] & 0x02) ? TRUE : FALSE;
++	       SiS_Pr->CP_VSync_P[i] = (buffer[index + 17] & 0x04) ? TRUE : FALSE;
++	       SiS_Pr->CP_SyncValid[i] = TRUE;
++
++	       SiS_Pr->CP_Vendor = buffer[2] | (buffer[1] << 8);
++	       SiS_Pr->CP_Product = buffer[3] | (buffer[4] << 8);
++
++	       /* We must assume the panel can scale, since we have
++	        * no scaling data
++    	        */
++	       cr37 |= 0x10;
++
++	    }
++	 }
++
+       }
+ 
+       break;
+-     
++
+    }
+-   
++
+    /* 1280x960 panels are always RGB24, unable to scale and use
+     * high active sync polarity
+     */
+    if(pSiS->VGAEngine == SIS_315_VGA) {
+-      if(paneltype == Panel310_1280x960) cr37 &= 0x0e; 
++      if(paneltype == Panel310_1280x960) cr37 &= 0x0e;
+    } else {
+-      if(paneltype == Panel300_1280x960) cr37 &= 0x0e; 
++      if(paneltype == Panel300_1280x960) cr37 &= 0x0e;
+    }
+-   
++
++   for(i = 0; i < 7; i++) {
++      if(SiS_Pr->CP_DataValid[i]) {
++         xf86DrvMsg(pSiS->pScrn->scrnIndex, X_PROBED,
++            "Non-standard LCD timing data no. %d:\n", i);
++         xf86DrvMsg(pSiS->pScrn->scrnIndex, X_PROBED,
++	    "   HDisplay %d HSync %d HSyncEnd %d HTotal %d\n",
++	    SiS_Pr->CP_HDisplay[i], SiS_Pr->CP_HSyncStart[i],
++	    SiS_Pr->CP_HSyncEnd[i], SiS_Pr->CP_HTotal[i]);
++         xf86DrvMsg(pSiS->pScrn->scrnIndex, X_PROBED,
++            "   VDisplay %d VSync %d VSyncEnd %d VTotal %d\n",
++            SiS_Pr->CP_VDisplay[i], SiS_Pr->CP_VSyncStart[i],
++   	    SiS_Pr->CP_VSyncEnd[i], SiS_Pr->CP_VTotal[i]);
++         xf86DrvMsg(pSiS->pScrn->scrnIndex, X_PROBED,
++	    "   Pixel clock: %3.3fMhz\n", (float)SiS_Pr->CP_Clock[i] / 1000);
++	 xf86DrvMsg(pSiS->pScrn->scrnIndex, X_INFO,
++	    "   To use this, add \"%dx%d\" to the list of Modes in the Display section\n",
++	    SiS_Pr->CP_HDisplay[i],
++	    SiS_Pr->CP_VDisplay[i]);
++      }
++   }
++
+    if(paneltype) {
++       if(!SiS_Pr->CP_PreferredX) SiS_Pr->CP_PreferredX = SiS_Pr->CP_MaxX;
++       if(!SiS_Pr->CP_PreferredY) SiS_Pr->CP_PreferredY = SiS_Pr->CP_MaxY;
+        cr37 &= 0xf1;
+        cr37 |= 0x02;    /* SiS301 */
+        SiS_SetRegANDOR(SiS_Pr->SiS_P3d4,0x36,0xf0,paneltype);
+@@ -10392,7 +10947,7 @@ SiS_SenseVGA2DDC(SiS_Private *SiS_Pr, SI
+    if(!(pSiS->VBFlags & (VB_301|VB_301B|VB_302B))) return 0;
+ /* if(pSiS->VBFlags & VB_30xBDH) return 0;  */
+    
+-   if(SiS_InitDDCRegs(SiS_Pr, pSiS, 2, 0, FALSE) == 0xFFFF) return 0;
++   if(SiS_InitDDCRegs(SiS_Pr, pSiS->VBFlags, pSiS->VGAEngine, 2, 0, FALSE) == 0xFFFF) return 0;
+    
+    SiS_Pr->SiS_DDC_SecAddr = 0x00;
+    
+@@ -10416,7 +10971,7 @@ SiS_SenseVGA2DDC(SiS_Private *SiS_Pr, SI
+    /* Read the entire EDID */
+    retry = 2;
+    do {
+-      if(SiS_ReadDDC(SiS_Pr, pSiS, DDCdatatype, buffer)) {
++      if(SiS_ReadDDC(SiS_Pr, DDCdatatype, buffer)) {
+          xf86DrvMsg(pSiS->pScrn->scrnIndex, X_INFO, 
+ 	 	"CRT2: DDC read failed (attempt %d), %s\n", 
+ 		(3-retry), (retry == 1) ? "giving up" : "retrying");
+@@ -10435,6 +10990,8 @@ SiS_SenseVGA2DDC(SiS_Private *SiS_Pr, SI
+ 	  	"CRT2: Attached display expects digital input\n");
+       	  return 0;  	
+       }
++      SiS_Pr->CP_Vendor = buffer[9] | (buffer[8] << 8);
++      SiS_Pr->CP_Product = buffer[10] | (buffer[11] << 8);
+       foundcrt = TRUE;
+       break;
+    case 3:
+@@ -10448,198 +11005,19 @@ SiS_SenseVGA2DDC(SiS_Private *SiS_Pr, SI
+ 		buffer[0x41]);
+ 	  return 0;
+       }
++      SiS_Pr->CP_Vendor = buffer[2] | (buffer[1] << 8);
++      SiS_Pr->CP_Product = buffer[3] | (buffer[4] << 8);
+       foundcrt = TRUE;
+-      break;	  
++      break;
+    }
+-   
++
+    if(foundcrt) {
+        SiS_SetRegOR(SiS_Pr->SiS_P3d4,0x32,0x10);
+    }
+    return(0);
+ }
+ 
+-#if 0
+-   /* ----- */
+-USHORT
+-SiS_SenseLCDDDC(SiS_Private *SiS_Pr, SISPtr pSiS)
+-{
+-   USHORT DDCdatatype, paneltype, flag;
+-   unsigned char cr36=0, cr37=0;
+-   unsigned char tempal, tempah, tempbl, tempbh;
+-   USHORT tempax, tempbx, tempcx, push1, push2, push3;
+-   unsigned char addresstable[] = { 0x00, 0x22, 0x30, 0x40 };
+-   int i;
+-   unsigned char buffer[256];
+-   
+-   if(pSiS->VGAEngine != SIS_315_VGA) return 0xFFFF;
+-   if(!(pSiS->VBFlags & (VB_301B|VB_302B))) return 0xFFFF;
+-   
+-   if(SiS_InitDDCRegs(SiS_Pr, pSiS, 1, 0, FALSE) == 0xFFFF) return 0xFFFF;   
+-   
+-   flag = SiS_ProbeDDC(SiS_Pr);
+-   if(flag & 0x02) {
+-      SiS_Pr->SiS_DDC_DeviceAddr = 0xa0;	/* EDID V1 */
+-      DDCdatatype = 1;
+-      SiS_Pr->SiS_DDC_SecAddr = 0x3a;
+-   } else if(flag & 0x08) {
+-      SiS_Pr->SiS_DDC_DeviceAddr = 0xa2;	/* EDID V2 (P&D-D Monitor) */
+-      DDCdatatype = 3;
+-      SiS_Pr->SiS_DDC_SecAddr = 0x76;
+-   } else if(flag & 0x10) {
+-      SiS_Pr->SiS_DDC_DeviceAddr = 0xa6;	/* EDID V2 (FP) */
+-      DDCdatatype = 4;
+-      SiS_Pr->SiS_DDC_SecAddr = 0x76;
+-   } else return 0xFFFF;
+-   
+-   
+-   SiS_ReadLCDDDC(SiS_Pr, 4, buffer);
+-   tempbl = buffer[0];  /* 3a - 76 */
+-   tempbh = buffer[1];  /* 3b - 77 */
+-   
+-   if(SiS_Pr->SiS_DDC_DeviceAddr == 0xa0) {
+-   
+-      /* Read and analyze EDID V1 (res) */
+-   
+-      tempah = 0x02;				/* 1024x768 by default */
+-      tempbl &= 0xf0;
+-      if(tempbl != 0x40) {			
+-         tempah = 0x03;				/* 1280x1024 by default */
+-	 if(tempbl == 0x50) {
+-	    if(!tempbh) {
+-	       tempbh = buffer[3] & 0xf0;
+-	       if(tempbh == 0x30) {
+-	           SiS_Pr->SiS_DDC_DeviceAddr = 0xa0;
+-      		   SiS_Pr->SiS_DDC_SecAddr = 0x23;
+-		   SiS_ReadLCDDDC(SiS_Pr, 2, buffer);
+-		   tempbl = buffer[0];  /* 0x23 */
+-		   tempbh = buffer[1];  /* 0x24 */
+-		   if(tempbl) cr37 |= 0x10;
+-		   tempah = 0x0a;		/* 1280x768 */
+-	       }
+-	       if(tempbh == 0x40) {
+-	           SiS_Pr->SiS_DDC_DeviceAddr = 0xa0;
+-      		   SiS_Pr->SiS_DDC_SecAddr = 0x23;
+-		   SiS_ReadLCDDDC(SiS_Pr, 2, buffer);
+-		   tempbl = buffer[0];  /* 0x23 */
+-		   tempbh = buffer[1];  /* 0x24 */
+-		   if(tempbl) cr37 |= 0x10;
+-		   tempah = 0x03;		/* 1280x1024 */
+-	       }
+-	       tempbh = 0x00;
+-	    }
+-	 }
+-	 if(tempbh == 0x00) goto cr36ready;
+-	 tempah = 0x07;				/* 1280x960 */
+-	 if(tempbh == 0xc0) goto cr36ready;
+-      }
+-      SiS_Pr->SiS_DDC_DeviceAddr = 0xa0;
+-      SiS_Pr->SiS_DDC_SecAddr = 0x18;		/* feature support */
+-      SiS_ReadLCDDDC(SiS_Pr, 2, buffer);
+-      tempbl = buffer[0];
+-      tempbh = buffer[1];
+-      if(tempbl & 0x02) goto cr36ready;
+-      SiS_Pr->SiS_DDC_DeviceAddr = 0xa0;
+-      SiS_Pr->SiS_DDC_SecAddr = 0x23;		/* Established Timings */
+-      SiS_ReadLCDDDC(SiS_Pr, 2, buffer);
+-      tempbl = buffer[0];
+-      tempbh = buffer[1];
+-      tempah = 0x03;
+-      if(!(tempbh & 0x01)) tempah = 0x02;
+-      if(!tempbl) cr37 |= 0x10;
+-      
+-  } else {
+-  
+-      /* Read and analyze EDID V2 (res) */
+-      
+-      tempah = 0x02;
+-      tempbx = tempbl | (tempbh << 8);
+-      if(tempbx != 1024) tempah = 0x03;
+-      
+-  }     
+-
+-cr36ready:
+-  cr36 = tempah;      
+-  
+-  if(SiS_Pr->SiS_DDC_DeviceAddr == 0xa0) {
+-  
+-     /* Read and analyze EDID V1 (pol) */
+-  
+-     SiS_Pr->SiS_DDC_SecAddr = 0x47;
+-     SiS_ReadLCDDDC(SiS_Pr, 2, buffer);
+-     tempah = buffer[0];
+-     tempah &= 0x06;
+-     tempah ^= 0x06;
+-     tempah <<= 5;
+-     tempah |= 0x20;
+-     cr37 &= 0x1f;
+-     cr37 |= tempah;
+-     if((cr36 & 0x07) == 0x07) cr37 &= 0x0e;
+-     
+-  } else {
+-  
+-     /* Read and analyze EDID V2 (depth, pol) */
+-  
+-     push1 = tempah;
+-     SiS_Pr->SiS_DDC_SecAddr = 0x45;
+-     SiS_ReadLCDDDC(SiS_Pr, 2, buffer);
+-     tempah = 0x01;
+-     if((buffer[0] != 0x20) && (buffer[0] != 0x34)) {   /* RGB18 or 24? */
+-        tempah = 0x00;
+-     }
+-     cr37 &= 0xfe;
+-     cr37 |= tempah;
+-     
+-     SiS_Pr->SiS_DDC_SecAddr = 0x7e;
+-     SiS_ReadLCDDDC(SiS_Pr, 2, buffer);
+-     tempax = (USHORT)(buffer[0] | (buffer[1] << 8));
+-     push2 = tempax;
+-     tempax &= 0x0003;
+-     tempax *= 0x1b;
+-     push3 = tempax;
+-     tempax = (USHORT)buffer[0];
+-     tempax &= 0x001c;
+-     tempax >>= 2;
+-     tempax *= 8;
+-     tempbx = push3;
+-     tempbx += tempax;
+-     if(buffer[0] & 0x20) {		/* Luminance table provided? */
+-        SiS_Pr->SiS_DDC_SecAddr = 0x80;
+-	SiS_ReadLCDDDC(SiS_Pr, 2, buffer);
+-	tempax = buffer[0] | (buffer[1] << 8);
+-	tempax &= 0x1f;
+-	if(buffer[0] & 0x70) tempax <<= 1;
+-	tempax++;	
+-	tempbx += tempax;        	/* yes -> skip it */
+-     }
+-     tempcx = push2;
+-     tempax = push1 << 8;
+-     tempbx = (tempbx & 0xff00) | (((tempbx & 0x00ff) + 0x80) & 0x00ff);
+-     if(tempcx & 0xf800) {
+-        tempal = addresstable[((tempax & 0xff00) >> 8)];
+-	tempcx &= 0xf8ff;
+-	tempcx >>= 11;
+-	for(i=0; i<tempcx; i++) {
+-	   SiS_Pr->SiS_DDC_SecAddr = (tempbx & 0x00ff);
+-	   SiS_ReadLCDDDC(SiS_Pr, 2, buffer);
+-	   tempbx += 0x04;
+-	   if(buffer[0] == tempal) break;
+-	}
+-	tempah = buffer[1];
+-	tempah &= 0x0c;
+-	tempah ^= 0x0c;
+-	tempah <<= 4;
+-	tempah |= 0x20;
+-        cr37 &= 0x1f;
+-        cr37 |= tempah;
+-	if((cr36 & 0x07) == 0x07) cr37 &= 0x0e;
+-     }
+-  }
+-  xf86DrvMsg(0, X_INFO, "DDC: cr36 = 0x%02x, cr37 = 0x%02x\n", cr36, cr37);
+-  return 0;
+-}
+-#endif
+-
+-/* TW: Generic I2C functions (compliant to i2c library) */
++/* Generic I2C functions (compliant to i2c library) */
+ 
+ #if 0
+ USHORT
+@@ -10675,16 +11053,14 @@ SiS_I2C_Stop(SiS_Private *SiS_Pr)
+ void
+ SiS_SetCH70xxANDOR(SiS_Private *SiS_Pr, USHORT tempax,USHORT tempbh)
+ {
+-  USHORT tempal,tempah,tempbl;
++  USHORT tempbl;
+ 
+-  tempal = tempax & 0x00FF;
+-  tempah =(tempax >> 8) & 0x00FF;
+-  tempbl = SiS_GetCH70xx(SiS_Pr,tempal);
+-  tempbl = (((tempbl & tempbh) | tempah) << 8 | tempal);
++  tempbl = SiS_GetCH70xx(SiS_Pr,(tempax & 0x00FF));
++  tempbl = (((tempbl & tempbh) << 8) | tempax);
+   SiS_SetCH70xx(SiS_Pr,tempbl);
+ }
+ 
+-/* TW: Generic I2C functions for Chrontel --------- */
++/* Generic I2C functions for Chrontel --------- */
+ 
+ void
+ SiS_SetSwitchDDC2(SiS_Private *SiS_Pr)
+@@ -10698,37 +11074,37 @@ SiS_SetSwitchDDC2(SiS_Private *SiS_Pr)
+   SiS_WaitRetraceDDC(SiS_Pr);
+ }
+ 
+-/* TW: Set I2C start condition */
+-/* TW: This is done by a SD high-to-low transition while SC is high */
++/* Set I2C start condition */
++/* This is done by a SD high-to-low transition while SC is high */
+ USHORT
+ SiS_SetStart(SiS_Private *SiS_Pr)
+ {
+-  if(SiS_SetSCLKLow(SiS_Pr)) return 0xFFFF;			           /* TW: (SC->low)  */
++  if(SiS_SetSCLKLow(SiS_Pr)) return 0xFFFF;			           /* (SC->low)  */
+   SiS_SetRegANDOR(SiS_Pr->SiS_DDC_Port,SiS_Pr->SiS_DDC_Index,
+-                  ~SiS_Pr->SiS_DDC_Data,SiS_Pr->SiS_DDC_Data);             /* TW: SD->high */
+-  if(SiS_SetSCLKHigh(SiS_Pr)) return 0xFFFF;			           /* TW: SC->high */
++                  ~SiS_Pr->SiS_DDC_Data,SiS_Pr->SiS_DDC_Data);             /* SD->high */
++  if(SiS_SetSCLKHigh(SiS_Pr)) return 0xFFFF;			           /* SC->high */
+   SiS_SetRegANDOR(SiS_Pr->SiS_DDC_Port,SiS_Pr->SiS_DDC_Index,
+-                  ~SiS_Pr->SiS_DDC_Data,0x00);                             /* TW: SD->low = start condition */
+-  if(SiS_SetSCLKHigh(SiS_Pr)) return 0xFFFF;			           /* TW: (SC->low) */
++                  ~SiS_Pr->SiS_DDC_Data,0x00);                             /* SD->low = start condition */
++  if(SiS_SetSCLKHigh(SiS_Pr)) return 0xFFFF;			           /* (SC->low) */
+   return 0;
+ }
+ 
+-/* TW: Set I2C stop condition */
+-/* TW: This is done by a SD low-to-high transition while SC is high */
++/* Set I2C stop condition */
++/* This is done by a SD low-to-high transition while SC is high */
+ USHORT
+ SiS_SetStop(SiS_Private *SiS_Pr)
+ {
+-  if(SiS_SetSCLKLow(SiS_Pr)) return 0xFFFF;			           /* TW: (SC->low) */
++  if(SiS_SetSCLKLow(SiS_Pr)) return 0xFFFF;			           /* (SC->low) */
+   SiS_SetRegANDOR(SiS_Pr->SiS_DDC_Port,SiS_Pr->SiS_DDC_Index,
+-                  ~SiS_Pr->SiS_DDC_Data,0x00);          		   /* TW: SD->low   */
+-  if(SiS_SetSCLKHigh(SiS_Pr)) return 0xFFFF;			           /* TW: SC->high  */
++                  ~SiS_Pr->SiS_DDC_Data,0x00);          		   /* SD->low   */
++  if(SiS_SetSCLKHigh(SiS_Pr)) return 0xFFFF;			           /* SC->high  */
+   SiS_SetRegANDOR(SiS_Pr->SiS_DDC_Port,SiS_Pr->SiS_DDC_Index,
+-                  ~SiS_Pr->SiS_DDC_Data,SiS_Pr->SiS_DDC_Data);  	   /* TW: SD->high = stop condition */
+-  if(SiS_SetSCLKHigh(SiS_Pr)) return 0xFFFF;			           /* TW: (SC->high) */
++                  ~SiS_Pr->SiS_DDC_Data,SiS_Pr->SiS_DDC_Data);  	   /* SD->high = stop condition */
++  if(SiS_SetSCLKHigh(SiS_Pr)) return 0xFFFF;			           /* (SC->high) */
+   return 0;
+ }
+ 
+-/* TW: Write 8 bits of data */
++/* Write 8 bits of data */
+ USHORT
+ SiS_WriteDDC2Data(SiS_Private *SiS_Pr, USHORT tempax)
+ {
+@@ -10736,18 +11112,18 @@ SiS_WriteDDC2Data(SiS_Private *SiS_Pr, U
+ 
+   flag=0x80;
+   for(i=0;i<8;i++) {
+-    SiS_SetSCLKLow(SiS_Pr);				                      /* TW: SC->low */
++    SiS_SetSCLKLow(SiS_Pr);				                      /* SC->low */
+     if(tempax & flag) {
+       SiS_SetRegANDOR(SiS_Pr->SiS_DDC_Port,SiS_Pr->SiS_DDC_Index,
+-                      ~SiS_Pr->SiS_DDC_Data,SiS_Pr->SiS_DDC_Data);            /* TW: Write bit (1) to SD */
++                      ~SiS_Pr->SiS_DDC_Data,SiS_Pr->SiS_DDC_Data);            /* Write bit (1) to SD */
+     } else {
+       SiS_SetRegANDOR(SiS_Pr->SiS_DDC_Port,SiS_Pr->SiS_DDC_Index,
+-                      ~SiS_Pr->SiS_DDC_Data,0x00);                            /* TW: Write bit (0) to SD */
++                      ~SiS_Pr->SiS_DDC_Data,0x00);                            /* Write bit (0) to SD */
+     }
+-    SiS_SetSCLKHigh(SiS_Pr);				                      /* TW: SC->high */
++    SiS_SetSCLKHigh(SiS_Pr);				                      /* SC->high */
+     flag >>= 1;
+   }
+-  temp = SiS_CheckACK(SiS_Pr);				                      /* TW: Check acknowledge */
++  temp = SiS_CheckACK(SiS_Pr);				                      /* Check acknowledge */
+   return(temp);
+ }
+ 
+@@ -10808,27 +11184,27 @@ SiS_DDC2Delay(SiS_Private *SiS_Pr, USHOR
+   }
+ }
+ 
+-/* TW: Check I2C acknowledge */
++/* Check I2C acknowledge */
+ /* Returns 0 if ack ok, non-0 if ack not ok */
+ USHORT
+ SiS_CheckACK(SiS_Private *SiS_Pr)
+ {
+   USHORT tempah;
+ 
+-  SiS_SetSCLKLow(SiS_Pr);				           /* TW: (SC->low) */
++  SiS_SetSCLKLow(SiS_Pr);				           /* (SC->low) */
+   SiS_SetRegANDOR(SiS_Pr->SiS_DDC_Port,SiS_Pr->SiS_DDC_Index,
+-                  ~SiS_Pr->SiS_DDC_Data,SiS_Pr->SiS_DDC_Data);     /* TW: (SD->high) */
+-  SiS_SetSCLKHigh(SiS_Pr);				           /* TW: SC->high = clock impulse for ack */
+-  tempah = SiS_GetReg1(SiS_Pr->SiS_DDC_Port,SiS_Pr->SiS_DDC_Index);/* TW: Read SD */
+-  SiS_SetSCLKLow(SiS_Pr);				           /* TW: SC->low = end of clock impulse */
+-  if(tempah & SiS_Pr->SiS_DDC_Data) return(1);			   /* TW: Ack OK if bit = 0 */
++                  ~SiS_Pr->SiS_DDC_Data,SiS_Pr->SiS_DDC_Data);     /* (SD->high) */
++  SiS_SetSCLKHigh(SiS_Pr);				           /* SC->high = clock impulse for ack */
++  tempah = SiS_GetReg1(SiS_Pr->SiS_DDC_Port,SiS_Pr->SiS_DDC_Index);/* Read SD */
++  SiS_SetSCLKLow(SiS_Pr);				           /* SC->low = end of clock impulse */
++  if(tempah & SiS_Pr->SiS_DDC_Data) return(1);			   /* Ack OK if bit = 0 */
+   else return(0);
+ }
+ 
+-/* TW: End of I2C functions ----------------------- */
++/* End of I2C functions ----------------------- */
+ 
+ 
+-/* =============== SiS 310/325/330 O.E.M. ================= */
++/* =============== SiS 315/330 O.E.M. ================= */
+ 
+ #ifdef SIS315H
+ 
+@@ -10838,11 +11214,11 @@ GetRAMDACromptr(SiS_Private *SiS_Pr, PSI
+   USHORT romptr;
+ 
+   if(HwDeviceExtension->jChipType < SIS_330) {
+-     romptr = ROMAddr[0x128] | (ROMAddr[0x129] << 8);  
++     romptr = ROMAddr[0x128] | (ROMAddr[0x129] << 8);
+      if(SiS_Pr->SiS_VBType & VB_SIS301B302B)
+         romptr = ROMAddr[0x12a] | (ROMAddr[0x12b] << 8);
+   } else {
+-     romptr = ROMAddr[0x1a8] | (ROMAddr[0x1a9] << 8);  
++     romptr = ROMAddr[0x1a8] | (ROMAddr[0x1a9] << 8);
+      if(SiS_Pr->SiS_VBType & VB_SIS301B302B)
+         romptr = ROMAddr[0x1aa] | (ROMAddr[0x1ab] << 8);
+   }
+@@ -10855,11 +11231,11 @@ GetLCDromptr(SiS_Private *SiS_Pr, PSIS_H
+   USHORT romptr;
+ 
+   if(HwDeviceExtension->jChipType < SIS_330) {
+-     romptr = ROMAddr[0x120] | (ROMAddr[0x121] << 8);  
++     romptr = ROMAddr[0x120] | (ROMAddr[0x121] << 8);
+      if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV)
+         romptr = ROMAddr[0x122] | (ROMAddr[0x123] << 8);
+   } else {
+-     romptr = ROMAddr[0x1a0] | (ROMAddr[0x1a1] << 8);  
++     romptr = ROMAddr[0x1a0] | (ROMAddr[0x1a1] << 8);
+      if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV)
+         romptr = ROMAddr[0x1a2] | (ROMAddr[0x1a3] << 8);
+   }
+@@ -10884,10 +11260,22 @@ GetTVromptr(SiS_Private *SiS_Pr, PSIS_HW
+ }
+ 
+ static USHORT
+-GetLCDPtrIndexBIOS(SiS_Private *SiS_Pr)
++GetLCDPtrIndexBIOS(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension, USHORT BaseAddr)
+ {
+   USHORT index;
+-  
++
++  if((IS_SIS650) && (SiS_Pr->SiS_VBType & VB_SIS301LV302LV)) {
++     if(!(SiS_IsNotM650or651(SiS_Pr,HwDeviceExtension, BaseAddr))) {
++        if((index = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x36) & 0xf0)) {
++	   index >>= 4;
++	   index *= 3;
++	   if(SiS_Pr->SiS_LCDInfo & DontExpandLCD) index += 2;
++           else if(!(SiS_Pr->SiS_SetFlag & LCDVESATiming)) index++;
++           return index;
++	}
++     }
++  }
++
+   index = SiS_Pr->SiS_LCDResInfo & 0x0F;
+   if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050)      index -= 5;
+   else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1600x1200) index -= 6;
+@@ -10895,7 +11283,6 @@ GetLCDPtrIndexBIOS(SiS_Private *SiS_Pr)
+   index *= 3;
+   if(SiS_Pr->SiS_LCDInfo & DontExpandLCD) index += 2;
+   else if(!(SiS_Pr->SiS_SetFlag & LCDVESATiming)) index++;
+-
+   return index;
+ }
+ 
+@@ -10945,8 +11332,9 @@ static void
+ SetDelayComp(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension,USHORT BaseAddr,
+              UCHAR *ROMAddr, USHORT ModeNo)
+ {
+-  USHORT delay,index,myindex,temp,romptr=0;
+-  
++  USHORT delay=0,index,myindex,temp,romptr=0;
++  BOOLEAN dochiptest = TRUE;
++
+   if(SiS_Pr->SiS_VBInfo & SetCRT2ToRAMDAC) {			/* VGA */
+      
+      if((ROMAddr) && SiS_Pr->SiS_UseROM) {
+@@ -10969,61 +11357,81 @@ SetDelayComp(SiS_Private *SiS_Pr, PSIS_H
+         if(SiS_Pr->SiS_IF_DEF_LVDS == 1)
+            delay = 0x00;
+      }
+-  
++
+   } else if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {		/* LCD */
+-  
+-     index = GetLCDPtrIndexBIOS(SiS_Pr);
+-     myindex = GetLCDPtrIndex(SiS_Pr);
+-     
+-     if(IS_SIS650 && (SiS_Pr->SiS_VBType & VB_SIS301LV302LV)) { 	/* 650+30xLV */
+-       if(SiS_IsNotM650or651(SiS_Pr,HwDeviceExtension, BaseAddr)) {
+-          if((ROMAddr) && SiS_Pr->SiS_UseROM) {
+-#if 0	     /* Always use the second pointer on 650; some BIOSes */
+-             /* still carry old 301 data at the first location    */  
+-	     romptr = ROMAddr[0x120] | (ROMAddr[0x121] << 8); 
+-	     if(SiS_Pr->SiS_VBType & VB_SIS302LV) 
+-#endif		
+-	        romptr = ROMAddr[0x122] | (ROMAddr[0x123] << 8);
+-	     if(!romptr) return;
+-	     delay = ROMAddr[(romptr + index)];
+-	  } else {
+-             delay = SiS310_LCDDelayCompensation_650301B[myindex];   
+-#if 0	     
++
++     BOOLEAN gotitfrompci = FALSE;
++
++     if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_PanelCustom) return;
++
++     /* This is a piece of typical SiS crap: They code the OEM LCD
++      * delay into the code, at none defined place in the BIOS.
++      * We now have to start doing a PCI subsystem check here.
++      */
++
++     if(SiS_Pr->SiS_CustomT == CUT_COMPAQ1280) {
++	if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) {
++	   gotitfrompci = TRUE;
++	   dochiptest = FALSE;
++	   delay = 0x03;
++	}
++     }
++
++     if(!gotitfrompci) {
++
++        index = GetLCDPtrIndexBIOS(SiS_Pr, HwDeviceExtension, BaseAddr);
++        myindex = GetLCDPtrIndex(SiS_Pr);
++
++        if(IS_SIS650 && (SiS_Pr->SiS_VBType & VB_SIS301LV302LV)) { 	/* 650+30xLV */
++           if(SiS_IsNotM650or651(SiS_Pr,HwDeviceExtension, BaseAddr)) {
++             if((ROMAddr) && SiS_Pr->SiS_UseROM) {
++#if 0	        /* Always use the second pointer on 650; some BIOSes */
++                /* still carry old 301 data at the first location    */
++	        romptr = ROMAddr[0x120] | (ROMAddr[0x121] << 8);
++	        if(SiS_Pr->SiS_VBType & VB_SIS302LV)
++#endif
++	           romptr = ROMAddr[0x122] | (ROMAddr[0x123] << 8);
++	        if(!romptr) return;
++	        delay = ROMAddr[(romptr + index)];
++	     } else {
++                delay = SiS310_LCDDelayCompensation_650301B[myindex];
++#if 0
++	        if(SiS_Pr->SiS_VBType & VB_SIS302LV)
++	           delay = SiS310_LCDDelayCompensation_650301B[myindex];
++#endif
++	     }
++          } else {
++             delay = SiS310_LCDDelayCompensation_651301LV[myindex];
+ 	     if(SiS_Pr->SiS_VBType & VB_SIS302LV)
+-	        delay = SiS310_LCDDelayCompensation_650301B[myindex];
+-#endif		
+-	  }
+-       } else {
+-          delay = SiS310_LCDDelayCompensation_651301LV[myindex];     
+-	  if(SiS_Pr->SiS_VBType & VB_SIS302LV)
+-	     delay = SiS310_LCDDelayCompensation_651302LV[myindex];  
+-       }
+-     } else {
+-        if((ROMAddr) && SiS_Pr->SiS_UseROM && 				/* 315, 330, 740, 650+301B */
+-	   (SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel1280x1024)) { 
+-           romptr = GetLCDromptr(SiS_Pr, HwDeviceExtension, ROMAddr);
+-	   if(!romptr) return;
+-	   delay = ROMAddr[(romptr + index)];
++	        delay = SiS310_LCDDelayCompensation_651302LV[myindex];
++          }
+         } else {
+-           delay = SiS310_LCDDelayCompensation_301[myindex];
+-           if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
+-#if 0 	      /* This data is (like the one in the BIOS) wrong. */	   
+-	      if(IS_SIS650740) {  /* V */
+-	         delay = SiS310_LCDDelayCompensation_650301B[myindex];
+-	      } else {
+-#endif	      
+-                 delay = SiS310_LCDDelayCompensation_3xx301B[myindex];
+-#if 0		 
++           if((ROMAddr) && SiS_Pr->SiS_UseROM && 				/* 315, 330, 740, 650+301B */
++	      (SiS_Pr->SiS_LCDResInfo != SiS_Pr->SiS_Panel1280x1024)) {
++              romptr = GetLCDromptr(SiS_Pr, HwDeviceExtension, ROMAddr);
++	      if(!romptr) return;
++	      delay = ROMAddr[(romptr + index)];
++           } else {
++              delay = SiS310_LCDDelayCompensation_301[myindex];
++              if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
++#if 0 	         /* This data is (like the one in the BIOS) wrong. */
++	         if(IS_SIS550650740660) {
++	            delay = SiS310_LCDDelayCompensation_650301B[myindex];
++	         } else {
++#endif
++                    delay = SiS310_LCDDelayCompensation_3xx301B[myindex];
++#if 0
++	         }
++#endif
+ 	      }
+-#endif	      
+-	   }
+-           if(SiS_Pr->SiS_IF_DEF_LVDS == 1) {
+-	      if(IS_SIS650) {
+-                 delay = SiS310_LCDDelayCompensation_LVDS650[myindex];
+-	      } else {
+-	         delay = SiS310_LCDDelayCompensation_LVDS740[myindex];
++              if(SiS_Pr->SiS_IF_DEF_LVDS == 1) {
++	         if(IS_SIS650) {
++                    delay = SiS310_LCDDelayCompensation_LVDS650[myindex];
++	         } else {
++	            delay = SiS310_LCDDelayCompensation_LVDS740[myindex];
++	         }
+ 	      }
+-	   }
++           }
+         }
+      }
+      
+@@ -11086,16 +11494,18 @@ SetDelayComp(SiS_Private *SiS_Pr, PSIS_H
+         }
+      }
+   } else {
+-     if(IS_SIS650 && (SiS_Pr->SiS_VBType & VB_SIS301LV302LV)) {
++     if(dochiptest && IS_SIS650 && (SiS_Pr->SiS_VBType & VB_SIS301LV302LV)) {
+         temp = (SiS_GetReg1(SiS_Pr->SiS_P3d4,0x36) & 0xf0) >> 4;
+-        if(temp == 8) {
++        if(temp == 8) {		/* 1400x1050 BIOS */
+ 	   delay &= 0x0f;
+ 	   delay |= 0xb0;
+         } else if(temp == 6) {
+            delay &= 0x0f;
+ 	   delay |= 0xc0;
++        } else if(temp > 7) {	/* 1280x1024 BIOS */
++	   delay = 0x35;
+         }
+-        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x2D,delay);  /* index 2D D[3:0] */
++        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x2D,delay);
+      } else {
+         SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x2D,0xF0,delay);
+      }
+@@ -11118,7 +11528,7 @@ SetAntiFlicker(SiS_Private *SiS_Pr, PSIS
+ 
+   if(ROMAddr && SiS_Pr->SiS_UseROM) {
+      romptr = ROMAddr[0x112] | (ROMAddr[0x113] << 8);
+-     if(HwDeviceExtension->jChipType == SIS_330) {
++     if(HwDeviceExtension->jChipType >= SIS_330) {
+         romptr = ROMAddr[0x192] | (ROMAddr[0x193] << 8);
+      }
+   }
+@@ -11150,7 +11560,7 @@ SetEdgeEnhance(SiS_Private *SiS_Pr, PSIS
+ 
+   if(ROMAddr && SiS_Pr->SiS_UseROM) {
+      romptr = ROMAddr[0x124] | (ROMAddr[0x125] << 8);
+-     if(HwDeviceExtension->jChipType == SIS_330) {
++     if(HwDeviceExtension->jChipType >= SIS_330) {
+         romptr = ROMAddr[0x1a4] | (ROMAddr[0x1a5] << 8);
+      }
+   }
+@@ -11198,7 +11608,7 @@ SetYFilter(SiS_Private *SiS_Pr, PSIS_HW_
+ 
+   if(ROMAddr && SiS_Pr->SiS_UseROM) {
+   	OutputSelect = ROMAddr[0xf3];
+-	if(HwDeviceExtension->jChipType == SIS_330) {
++	if(HwDeviceExtension->jChipType >= SIS_330) {
+ 	    OutputSelect = ROMAddr[0x11b];
+ 	}
+   }
+@@ -11220,6 +11630,7 @@ SetYFilter(SiS_Private *SiS_Pr, PSIS_HW_
+                  }
+               }
+          }
++	 /* PALN : Is this data correct? */
+          if(temp == EnablePALN) {
+               if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
+                  for(i=0x35, j=0; i<=0x38; i++, j++) {
+@@ -11247,13 +11658,13 @@ SetPhaseIncr(SiS_Private *SiS_Pr, PSIS_H
+   if(!(SiS_Pr->SiS_VBInfo & SetCRT2ToTV)) return;
+ 
+   temp1 = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x38);        /* if PALM/N not set */
+-  temp1 &=  (EnablePALM | EnablePALN);
++  temp1 &= (EnablePALM | EnablePALN);
+   if(temp1) return;
+ 
+-  if (ModeNo<=0x13) {
+-    resinfo =  SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ResInfo;
++  if(ModeNo<=0x13) {
++     resinfo = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ResInfo;
+   } else {
+-    resinfo =  SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_RESINFO;
++     resinfo = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_RESINFO;
+   }
+ 
+   temp = GetTVPtrIndex(SiS_Pr);
+@@ -11262,17 +11673,17 @@ SetPhaseIncr(SiS_Private *SiS_Pr, PSIS_H
+    */
+   if((ROMAddr) && SiS_Pr->SiS_UseROM) {
+      romptr = ROMAddr[0x116] | (ROMAddr[0x117] << 8);
+-     if(HwDeviceExtension->jChipType == SIS_330) {
++     if(HwDeviceExtension->jChipType >= SIS_330) {
+         romptr = ROMAddr[0x196] | (ROMAddr[0x197] << 8);
+      }
+      if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
+         romptr = ROMAddr[0x11c] | (ROMAddr[0x11d] << 8);
+-	if(HwDeviceExtension->jChipType == SIS_330) {
++	if(HwDeviceExtension->jChipType >= SIS_330) {
+ 	   romptr = ROMAddr[0x19c] | (ROMAddr[0x19d] << 8);
+ 	}
+ 	if((SiS_Pr->SiS_VBInfo & SetInSlaveMode) && (!(SiS_Pr->SiS_SetFlag & TVSimuMode))) {
+ 	   romptr = ROMAddr[0x116] | (ROMAddr[0x117] << 8);
+-	   if(HwDeviceExtension->jChipType == SIS_330) {
++	   if(HwDeviceExtension->jChipType >= SIS_330) {
+               romptr = ROMAddr[0x196] | (ROMAddr[0x197] << 8);
+            }
+ 	}
+@@ -11296,19 +11707,19 @@ SetPhaseIncr(SiS_Private *SiS_Pr, PSIS_H
+      }
+   }
+ 
+-  if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {    /* TW: 650/301LV: (VB_SIS301LV | VB_SIS302LV)) */
++  if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {    /* 650/301LV: (VB_SIS301LV | VB_SIS302LV)) */
+      if((!(SiS_Pr->SiS_VBInfo & SetPALTV)) && (ModeNo > 0x13)) {
+-        if(resinfo == 6) {
++        if(resinfo == SIS_RI_640x480) {
+ 	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x31,0x21);
+ 	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x32,0xf0);
+ 	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x33,0xf5);
+ 	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x34,0x7f);
+-	} else if (resinfo == 7) {
++	} else if (resinfo == SIS_RI_800x600) {
+ 	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x31,0x21);
+ 	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x32,0xf0);
+ 	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x33,0xf5);
+ 	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x34,0x7f);
+-	} else if (resinfo == 8) {
++	} else if (resinfo == SIS_RI_1024x768) {
+ 	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x31,0x1e);
+ 	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x32,0x8b);
+ 	      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x33,0xfb);
+@@ -11323,7 +11734,9 @@ SiS_OEM310Setting(SiS_Private *SiS_Pr, P
+                   UCHAR *ROMAddr,USHORT ModeNo,USHORT ModeIdIndex)
+ {
+    SetDelayComp(SiS_Pr,HwDeviceExtension,BaseAddr,ROMAddr,ModeNo);
+-   /* TW: The TV functions are not for LVDS */
++
++   if(SiS_Pr->UseCustomMode) return;
++
+    if( (SiS_Pr->SiS_IF_DEF_LVDS == 0) && (SiS_Pr->SiS_VBInfo & SetCRT2ToTV) ) {
+        SetAntiFlicker(SiS_Pr,HwDeviceExtension,BaseAddr,ROMAddr,ModeNo,ModeIdIndex);
+        SetPhaseIncr(SiS_Pr,HwDeviceExtension,BaseAddr,ROMAddr,ModeNo,ModeIdIndex);
+@@ -11335,7 +11748,7 @@ SiS_OEM310Setting(SiS_Private *SiS_Pr, P
+ }
+ 
+ /* FinalizeLCD
+- * This finalizes some Part1 registers for the very panel used.
++ * This finalizes some CRT2 registers for the very panel used.
+  * If we have a backup if these registers, we use it; otherwise
+  * we set the register according to most BIOSes. However, this
+  * function looks quite different in every BIOS, so you better
+@@ -11350,6 +11763,11 @@ SiS_FinalizeLCD(SiS_Private *SiS_Pr, USH
+ 
+   if(!(SiS_Pr->SiS_VBType & VB_SIS301LV302LV)) return;
+ 
++  if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_PanelCustom) return;
++  if(SiS_Pr->UseCustomMode) return;
++
++  if(SiS_Pr->SiS_CustomT == CUT_COMPAQ12802) return;
++
+   if(ModeNo <= 0x13) {
+ 	resinfo = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ResInfo;
+ 	modeflag =  SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ModeFlag;
+@@ -11358,20 +11776,34 @@ SiS_FinalizeLCD(SiS_Private *SiS_Pr, USH
+ 	modeflag =  SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
+   }
+ 
++  if(IS_SIS650) {
++     if((SiS_GetReg1(SiS_Pr->SiS_P3d4, 0x5f) & 0xf0)) {
++        SiS_SetRegOR(SiS_Pr->SiS_Part1Port,0x1e,0x03);
++     }
++  }
++
+   if(SiS_Pr->SiS_VBInfo & (SetCRT2ToLCD | SetCRT2ToLCDA)) {
+      if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) {
+         SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x2a,0x00);
+ 	SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x30,0x00);
+ 	SiS_SetReg1(SiS_Pr->SiS_Part4Port,0x34,0x10);
++     } else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1280x1024) {   /* For all panels? */
++        /* Maybe ACER only? */
++        SiS_SetRegANDOR(SiS_Pr->SiS_Part4Port,0x24,0xfc,0x01);
+      }
+      tempch = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x36);
+      tempch &= 0xf0;
+      tempch >>= 4;
+      if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCDA) {
++        if(tempch == 0x03) {
++	   SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x18,0x02);
++	   SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x1b,0x25);
++	   SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x1c,0x00);
++	   SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x1d,0x1b);
++	}
+ 	if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1400x1050) {
+ 	   SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x1f,0x76);
+-	}
+-	if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) {	
++	} else if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) {
+ 	   if((SiS_Pr->Backup == TRUE) && (SiS_Pr->Backup_Mode == ModeNo)) {
+ 	      SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x14,SiS_Pr->Backup_14);
+ 	      SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x15,SiS_Pr->Backup_15);
+@@ -11387,14 +11819,14 @@ SiS_FinalizeLCD(SiS_Private *SiS_Pr, USH
+ 	       SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x14,0x90);
+ 	       if(ModeNo <= 0x13) {
+ 	          SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x18,0x11);
+-		  if((resinfo == 0) && (resinfo == 2)) return;
++		  if((resinfo == 0) || (resinfo == 2)) return;
+ 		  SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x18,0x18);
+-		  if((resinfo == 1) && (resinfo == 3)) return;
++		  if((resinfo == 1) || (resinfo == 3)) return;
+ 	       }
+ 	       SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x18,0x02);
+-	       if((ModeNo > 0x13) && (resinfo == 8)) {
++	       if((ModeNo > 0x13) && (resinfo == SIS_RI_1024x768)) {
+ 	          SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x18,0x02);  /* 1.10.7u */
+-#if 0	       
++#if 0
+ 	          tempbx = 806;  /* 0x326 */			 /* other older BIOSes */
+ 		  tempbx--;
+ 		  temp = tempbx & 0xff;
+@@ -11449,7 +11881,7 @@ SiS_FinalizeLCD(SiS_Private *SiS_Pr, USH
+ 	tempbl = SiS_GetReg1(SiS_Pr->SiS_Part2Port,0x04);
+ 	tempbx = (tempbh << 8) | tempbl;
+ 	if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) {
+-	   if((resinfo == 8) || (!(SiS_Pr->SiS_LCDInfo & DontExpandLCD))) {
++	   if((resinfo == SIS_RI_1024x768) || (!(SiS_Pr->SiS_LCDInfo & DontExpandLCD))) {
+ 	      if(SiS_Pr->SiS_SetFlag & LCDVESATiming) {
+ 	      	tempbx = 770;
+ 	      } else {
+@@ -11477,67 +11909,56 @@ SiS_FinalizeLCD(SiS_Private *SiS_Pr, USH
+   }
+ }
+ 
+-#if 0
+-/* TW: New and checked from 650/301LV BIOS */
+-/* This might clash with newer "FinalizeLCD()" function */
++#endif
++
++
++/*  =================  SiS 300 O.E.M. ================== */
++
++#ifdef SIS300
++
+ void
+-SiS_OEMLCD(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension,USHORT BaseAddr,
+-                  UCHAR *ROMAddr,USHORT ModeNo,USHORT ModeIdIndex)
++SetOEMLCDData2(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension,USHORT BaseAddr,
++              UCHAR *ROMAddr,USHORT ModeNo,USHORT ModeIdIndex, USHORT RefTabIndex)
+ {
+-   USHORT tempbx,tempah,tempbl,tempbh,tempcl;
+-
+-   if(!(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV)) return;
++  USHORT crt2crtc=0, modeflag, myindex=0;
++  UCHAR  temp;
++  int i;
+ 
+-   if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCDA) {
+-      SiS_UnLockCRT2(SiS_Pr,HwDeviceExtension,BaseAddr);
+-      tempbh = SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x1a);
+-      tempbh &= 0x38;
+-      tempbh >>= 3;
+-      tempbl = SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x18);
+-      tempbx = (tempbh << 8) | tempbl;
+-      if(SiS_Pr->SiS_LCDTypeInfo == 1)  tempbx -= 0x12;
+-      SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x18,tempbx & 0x00ff);
+-      tempah = (tempbx & 0xff00) >> 8;
+-      tempah &= 0x07;
+-      tempah <<= 3;
+-      SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x1a,0xc7,tempah);
+-      tempah = SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x19);
+-      tempah &= 0x0f;
+-      if(SiS_Pr->SiS_LCDTypeInfo == 1)  tempah -= 2;
+-      tempah &= 0x0f;
+-      SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,0x19,0xF0,tempah);
+-      tempah = SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x14);
+-      if(SiS_Pr->SiS_LCDTypeInfo == 1)  tempah++;
+-      tempah -= 8;
+-      SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x14,tempah);
+-   } else if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
+-      tempcl = tempbh = SiS_GetReg1(SiS_Pr->SiS_Part2Port,0x01);
+-      tempbh &= 0x70;
+-      tempbh >>= 4;
+-      tempbl = SiS_GetReg1(SiS_Pr->SiS_Part2Port,0x04);
+-      tempbx = (tempbh << 8) | tempbl;
+-      if(SiS_Pr->SiS_LCDTypeInfo == 1)  {
+-           tempbx -= 0x1e;
+-	   tempcl &= 0x0f;
+-	   tempcl -= 4;
+-	   tempcl &= 0x0f;
+-      }
+-      tempbl = tempbx & 0x00ff;
+-      tempbh = (tempbx >> 8) & 0x00ff;
+-      SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x04,tempbl);
+-      tempbh <<= 4;
+-      tempbh |= tempcl;
+-      SiS_SetRegANDOR(SiS_Pr->SiS_Part2Port,0x01,0x80,tempbh);
+-   }
+-}
+-#endif
++  if(ModeNo <= 0x13) {
++        modeflag = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_ModeFlag;
++	crt2crtc = SiS_Pr->SiS_SModeIDTable[ModeIdIndex].St_CRT2CRTC;
++  } else {
++        modeflag = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].Ext_ModeFlag;
++	crt2crtc = SiS_Pr->SiS_RefIndex[RefTabIndex].Ext_CRT2CRTC;
++  }
+ 
+-#endif
++  crt2crtc &= 0x3f;
+ 
++  if(SiS_Pr->SiS_CustomT == CUT_BARCO1024) {
++     SiS_SetRegAND(SiS_Pr->SiS_Part1Port,0x13,0xdf);
++  }
+ 
+-/*  =================  SiS 300 O.E.M. ================== */
++  if(SiS_Pr->SiS_CustomT == CUT_BARCO1366) {
++     if(modeflag & HalfDCLK) myindex = 1;
+ 
+-#ifdef SIS300
++     if(SiS_LowModeStuff(SiS_Pr,ModeNo,HwDeviceExtension)) {
++        for(i=0; i<7; i++) {
++           if(barco_p1[myindex][crt2crtc][i][0]) {
++	      SiS_SetRegANDOR(SiS_Pr->SiS_Part1Port,
++	                      barco_p1[myindex][crt2crtc][i][0],
++	   	   	      barco_p1[myindex][crt2crtc][i][2],
++			      barco_p1[myindex][crt2crtc][i][1]);
++	   }
++        }
++     }
++     temp = SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x00);
++     if(temp & 0x80) {
++        temp = SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x18);
++        temp++;
++        SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x18,temp);
++     }
++  }
++}
+ 
+ #if 0   /* Not used */
+ static USHORT
+@@ -11582,7 +12003,7 @@ GetOEMLCDPtr(SiS_Private *SiS_Pr, PSIS_H
+ 
+   if(HwDeviceExtension->jChipType == SIS_300) {
+ 
+-    tempbx = SiS_Pr->SiS_LCDResInfo - 2;
++    tempbx = (SiS_GetReg1(SiS_Pr->SiS_P3d4,0x36) & 0x0f) - 2;
+     if(!(SiS_Pr->SiS_SetFlag & LCDVESATiming)) tempbx += 4;
+     if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_Panel1024x768) {
+        if(SiS_Pr->SiS_LCDInfo & DontExpandLCD) tempbx += 3;
+@@ -11636,24 +12057,29 @@ SetOEMLCDDelay(SiS_Private *SiS_Pr, PSIS
+ {
+   USHORT index,temp,romptr=0;
+ 
++  if(SiS_Pr->SiS_LCDResInfo == SiS_Pr->SiS_PanelCustom) return;
++
+   if((ROMAddr) && SiS_Pr->SiS_UseROM) {
+      if(!(ROMAddr[0x237] & 0x01)) return;
+      if(!(ROMAddr[0x237] & 0x02)) return;
+      romptr = ROMAddr[0x24b] | (ROMAddr[0x24c] << 8);
+   }
+ 
+-  /* TW: The Panel Compensation Delay should be set according to tables
+-   *     here. Unfortunately, various BIOS versions don't case about
+-   *     a uniform way using eg. ROM byte 0x220, but use different
+-   *     hard coded delays (0x04, 0x20, 0x18) in SetGroup1().
+-   *     Thus we don't set this if the user select a custom pdc or if
+-   *     we otherwise detected a valid pdc.
++  /* The Panel Compensation Delay should be set according to tables
++   * here. Unfortunately, various BIOS versions don't case about
++   * a uniform way using eg. ROM byte 0x220, but use different
++   * hard coded delays (0x04, 0x20, 0x18) in SetGroup1().
++   * Thus we don't set this if the user select a custom pdc or if
++   * we otherwise detected a valid pdc.
+    */
+   if(HwDeviceExtension->pdc) return;
+ 
+   temp = GetOEMLCDPtr(SiS_Pr,HwDeviceExtension, ROMAddr, 0);
+ 
+-  index = SiS_Pr->SiS_VBModeIDTable[ModeIdIndex].VB_LCDDelayIndex;
++  if(SiS_Pr->UseCustomMode)
++     index = 0;
++  else
++     index = SiS_Pr->SiS_VBModeIDTable[ModeIdIndex].VB_LCDDelayIndex;
+ 
+   if(HwDeviceExtension->jChipType != SIS_300) {
+ 	if(romptr) {
+@@ -11700,9 +12126,9 @@ SetOEMLCDDelay(SiS_Private *SiS_Pr, PSIS
+ 
+ static void
+ SetOEMLCDData(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension,USHORT BaseAddr,
+-               UCHAR *ROMAddr,USHORT ModeNo,USHORT ModeIdIndex)
++              UCHAR *ROMAddr,USHORT ModeNo,USHORT ModeIdIndex)
+ {
+-#if 0  /* TW: Unfinished; VData table missing */
++#if 0  /* Unfinished; Data table missing */
+   USHORT index,temp;
+ 
+   if((ROMAddr) && SiS_Pr->SiS_UseROM) {
+@@ -11899,25 +12325,29 @@ SetOEMYFilter(SiS_Private *SiS_Pr, PSIS_
+ 
+ void
+ SiS_OEM300Setting(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension,
+-		  USHORT BaseAddr,UCHAR *ROMAddr,USHORT ModeNo)
++		  USHORT BaseAddr,UCHAR *ROMAddr,USHORT ModeNo,USHORT ModeIdIndex,
++		  USHORT RefTableIndex)
+ {
+-  USHORT ModeIdIndex;
++  USHORT OEMModeIdIndex=0;
+ 
+-  ModeIdIndex = SiS_SearchVBModeID(SiS_Pr,ROMAddr,&ModeNo);
+-  if(!(ModeIdIndex)) return;
++  if(!SiS_Pr->UseCustomMode) {
++     OEMModeIdIndex = SiS_SearchVBModeID(SiS_Pr,ROMAddr,&ModeNo);
++     if(!(OEMModeIdIndex)) return;
++  }
+ 
+   if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
+-       SetOEMLCDDelay(SiS_Pr,HwDeviceExtension,BaseAddr,ROMAddr,ModeNo,ModeIdIndex);
++       SetOEMLCDDelay(SiS_Pr,HwDeviceExtension,BaseAddr,ROMAddr,ModeNo,OEMModeIdIndex);
+        if(SiS_Pr->SiS_IF_DEF_LVDS == 1) {
+-            SetOEMLCDData(SiS_Pr,HwDeviceExtension,BaseAddr,ROMAddr,ModeNo,ModeIdIndex);
++            SetOEMLCDData(SiS_Pr,HwDeviceExtension,BaseAddr,ROMAddr,ModeNo,OEMModeIdIndex);
+        }
+   }
++  if(SiS_Pr->UseCustomMode) return;
+   if(SiS_Pr->SiS_VBInfo & SetCRT2ToTV) {
+-       SetOEMTVDelay(SiS_Pr,HwDeviceExtension,BaseAddr,ROMAddr,ModeNo,ModeIdIndex);
++       SetOEMTVDelay(SiS_Pr,HwDeviceExtension,BaseAddr,ROMAddr,ModeNo,OEMModeIdIndex);
+        if(SiS_Pr->SiS_IF_DEF_LVDS == 0) {
+-       		SetOEMAntiFlicker(SiS_Pr,HwDeviceExtension,BaseAddr,ROMAddr,ModeNo,ModeIdIndex);
+-    		SetOEMPhaseIncr(SiS_Pr,HwDeviceExtension,BaseAddr,ROMAddr,ModeNo,ModeIdIndex);
+-       		SetOEMYFilter(SiS_Pr,HwDeviceExtension,BaseAddr,ROMAddr,ModeNo,ModeIdIndex);
++       		SetOEMAntiFlicker(SiS_Pr,HwDeviceExtension,BaseAddr,ROMAddr,ModeNo,OEMModeIdIndex);
++    		SetOEMPhaseIncr(SiS_Pr,HwDeviceExtension,BaseAddr,ROMAddr,ModeNo,OEMModeIdIndex);
++       		SetOEMYFilter(SiS_Pr,HwDeviceExtension,BaseAddr,ROMAddr,ModeNo,OEMModeIdIndex);
+        }
+   }
+ }
+--- linux-2.6.0-test6/drivers/video/sis/init301.h	2003-06-14 12:18:21.000000000 -0700
++++ 25/drivers/video/sis/init301.h	2003-10-05 00:34:22.000000000 -0700
+@@ -1,20 +1,47 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/init301.h,v 1.4 2000/12/02 01:16:17 dawes Exp $ */
++/* $XFree86$ */
++/*
++ * Data and prototypes for init301.c
++ *
++ * Copyright 2002, 2003 by Thomas Winischhofer, Vienna, Austria
++ *
++ * If distributed as part of the linux kernel, the contents of this file
++ * is entirely covered by the GPL.
++ *
++ * Otherwise, the following terms apply:
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of the copyright holder not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission.  The copyright holder makes no representations
++ * about the suitability of this software for any purpose.  It is provided
++ * "as is" without express or implied warranty.
++ *
++ * THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++ * EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ *
++ * Author: 	Thomas Winischhofer <thomas@winischhofer.net>
++ *
++ * Based on code by Silicon Intergrated Systems
++ *
++ */
++
+ #ifndef  _INIT301_
+ #define  _INIT301_
+ 
+ #include "osdef.h"
++
+ #include "initdef.h"
+ #include "vgatypes.h"
+ #include "vstruct.h"
+ 
+-#ifdef TC
+-#include <stdio.h>
+-#include <string.h>
+-#include <conio.h>
+-#include <dos.h>
+-#include <stdlib.h>
+-#endif
+-
+ #ifdef LINUX_XF86
+ #include "xf86.h"
+ #include "xf86Pci.h"
+@@ -24,6 +51,9 @@
+ #endif
+ 
+ #ifdef LINUX_KERNEL
++#ifdef SIS_CP
++#undef SIS_CP
++#endif
+ #include <linux/config.h>
+ #include <linux/version.h>
+ #include <asm/io.h>
+@@ -35,24 +65,60 @@
+ #endif
+ #endif
+ 
+-#ifdef WIN2000
+-#include <stdio.h>
+-#include <string.h>
+-#include <miniport.h>
+-#include "dderror.h"
+-#include "devioctl.h"
+-#include "miniport.h"
+-#include "ntddvdeo.h"
+-#include "video.h"
+-#include "sisv.h"
+-#endif
++const UCHAR SiS_HiVisionTable[3][64] = {
++  {
++    0x17, 0x1d, 0x03, 0x09, 0x05, 0x06, 0x0c, 0x0c,
++    0x94, 0x49, 0x01, 0x0a, 0x06, 0x0d, 0x04, 0x0a,
++    0x06, 0x14, 0x0d, 0x04, 0x0a, 0x00, 0x85, 0x1b,
++    0x0c, 0x50, 0x00, 0x97, 0x00, 0xd4, 0x4a, 0x17,
++    0x7d, 0x05, 0x4b, 0x00, 0x00, 0xe2, 0x00, 0x02,
++    0x03, 0x0a, 0x65, 0x9d, 0x08, 0x92, 0x8f, 0x40,
++    0x60, 0x80, 0x14, 0x90, 0x8c, 0x60, 0x14, 0x53,
++    0x00, 0x40, 0x44, 0x00, 0xdb, 0x02, 0x3b, 0x00
++  },
++  {
++    0x1d, 0x1d, 0x06, 0x09, 0x0b, 0x0c, 0x0c, 0x0c,
++    0x98, 0x0a, 0x01, 0x0d, 0x06, 0x0d, 0x04, 0x0a,
++    0x06, 0x14, 0x0d, 0x04, 0x0a, 0x00, 0x85, 0x3f,
++    0x0c, 0x50, 0xb2, 0x2e, 0x16, 0xb5, 0xf4, 0x03,
++    0x7d, 0x11, 0x7d, 0xea, 0x30, 0x36, 0x18, 0x96,
++    0x21, 0x0a, 0x58, 0xee, 0x42, 0x92, 0x0f, 0x40,
++    0x60, 0x80, 0x14, 0x90, 0x8c, 0x60, 0x04, 0xf3,
++    0x00, 0x40, 0x11, 0x00, 0xfc, 0xff, 0x32, 0x00
++  },
++  {
++    0x13, 0x1d, 0xe8, 0x09, 0x09, 0xed, 0x0c, 0x0c,
++    0x98, 0x0a, 0x01, 0x0c, 0x06, 0x0d, 0x04, 0x0a,
++    0x06, 0x14, 0x0d, 0x04, 0x0a, 0x00, 0x85, 0x3f,
++    0xed, 0x50, 0x70, 0x9f, 0x16, 0x59, 0x2b, 0x13,
++    0x27, 0x0b, 0x27, 0xfc, 0x30, 0x27, 0x1c, 0xb0,
++    0x4b, 0x4b, 0x6f, 0x2f, 0x63, 0x92, 0x0f, 0x40,
++    0x60, 0x80, 0x14, 0x90, 0x8c, 0x60, 0x14, 0x2a,
++    0x00, 0x40, 0x11, 0x00, 0xfc, 0xff, 0x32, 0x00
++  }
++};
+ 
+-#if 0
+-extern   const USHORT   SiS_MDA_DAC[];
+-extern   const USHORT   SiS_CGA_DAC[];
+-extern   const USHORT   SiS_EGA_DAC[];
+-extern   const USHORT   SiS_VGA_DAC[];
+-#endif
++const UCHAR SiS_HiTVGroup3_1[] = {
++    0x00, 0x14, 0x15, 0x25, 0x55, 0x15, 0x0b, 0x13,
++    0xb1, 0x41, 0x62, 0x62, 0xff, 0xf4, 0x45, 0xa6,
++    0x25, 0x2f, 0x67, 0xf6, 0xbf, 0xff, 0x8e, 0x20,
++    0xac, 0xda, 0x60, 0xfe, 0x6a, 0x9a, 0x06, 0x10,
++    0xd1, 0x04, 0x18, 0x0a, 0xff, 0x80, 0x00, 0x80,
++    0x3b, 0x77, 0x00, 0xef, 0xe0, 0x10, 0xb0, 0xe0,
++    0x10, 0x4f, 0x0f, 0x0f, 0x05, 0x0f, 0x08, 0x6e,
++    0x1a, 0x1f, 0x25, 0x2a, 0x4c, 0xaa, 0x01
++};
++
++const UCHAR SiS_HiTVGroup3_2[] = {
++    0x00, 0x14, 0x15, 0x25, 0x55, 0x15, 0x0b, 0x7a,
++    0x54, 0x41, 0xe7, 0xe7, 0xff, 0xf4, 0x45, 0xa6,
++    0x25, 0x2f, 0x67, 0xf6, 0xbf, 0xff, 0x8e, 0x20,
++    0xac, 0x6a, 0x60, 0x2b, 0x52, 0xcd, 0x61, 0x10,
++    0x51, 0x04, 0x18, 0x0a, 0x1f, 0x80, 0x00, 0x80,
++    0xff, 0xa4, 0x04, 0x2b, 0x94, 0x21, 0x72, 0x94,
++    0x26, 0x05, 0x01, 0x0f, 0xed, 0x0f, 0x0a, 0x64,
++    0x18, 0x1d, 0x23, 0x28, 0x4c, 0xaa, 0x01
++};
+ 
+ extern   BOOLEAN  SiS_SearchVBModeID(SiS_Private *SiS_Pr, UCHAR *RomAddr, USHORT *);
+ 
+@@ -77,7 +143,8 @@ void     SiS_GetCRT2PtrA(SiS_Private *Si
+                          USHORT RefreshRateTableIndex,USHORT *CRT2Index,USHORT *ResIndex);
+ #endif
+ void     SiS_GetCRT2Part2Ptr(SiS_Private *SiS_Pr, UCHAR *ROMAddr,USHORT ModeNo,USHORT ModeIdIndex,
+-		             USHORT RefreshRateTableIndex,USHORT *CRT2Index, USHORT *ResIndex);
++		             USHORT RefreshRateTableIndex,USHORT *CRT2Index, USHORT *ResIndex,
++			     PSIS_HW_DEVICE_INFO HwDeviceExtension);
+ void     SiS_GetCRT2Data301(SiS_Private *SiS_Pr, UCHAR *ROMAddr,USHORT ModeNo,USHORT ModeIdIndex,
+                             USHORT RefreshRateTableIndex,PSIS_HW_DEVICE_INFO HwDeviceExtension);
+ USHORT   SiS_GetResInfo(SiS_Private *SiS_Pr, UCHAR *ROMAddr,USHORT ModeNo,USHORT ModeIdIndex);
+@@ -129,7 +196,6 @@ void     SiS_GetVBInfo(SiS_Private *SiS_
+ BOOLEAN  SiS_BridgeIsOn(SiS_Private *SiS_Pr, USHORT BaseAddr,PSIS_HW_DEVICE_INFO);
+ BOOLEAN  SiS_BridgeIsEnable(SiS_Private *SiS_Pr, USHORT BaseAddr,PSIS_HW_DEVICE_INFO);
+ BOOLEAN  SiS_BridgeInSlave(SiS_Private *SiS_Pr);
+-void     SiS_PresetScratchregister(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension);
+ void     SiS_SetTVSystem(SiS_Private *SiS_Pr);
+ void     SiS_LongWait(SiS_Private *SiS_Pr);
+ USHORT   SiS_GetQueueConfig(SiS_Private *SiS_Pr);
+@@ -149,7 +215,7 @@ void     SiS_GetLVDSDesPtrA(SiS_Private 
+                             USHORT RefreshRateTableIndex,USHORT *PanelIndex,USHORT *ResIndex);
+ #endif			    
+ void     SiS_SetTPData(SiS_Private *SiS_Pr);
+-void     SiS_WhatIsThis(SiS_Private *SiS_Pr, USHORT myvbinfo);
++void     SiS_SetChrontelGPIO(SiS_Private *SiS_Pr, USHORT myvbinfo);
+ void     SiS_ModCRT1CRTC(SiS_Private *SiS_Pr, UCHAR *ROMAddr,USHORT ModeNo,USHORT ModeIdIndex,
+                          USHORT RefreshRateTableIndex,PSIS_HW_DEVICE_INFO HwDeviceExtension);
+ void     SiS_SetCHTVReg(SiS_Private *SiS_Pr, UCHAR *ROMAddr,USHORT ModeNo,USHORT ModeIdIndex,
+@@ -178,30 +244,28 @@ USHORT   SiS_SetSCLKHigh(SiS_Private *Si
+ USHORT   SiS_ReadDDC2Data(SiS_Private *SiS_Pr, USHORT tempax);
+ USHORT   SiS_WriteDDC2Data(SiS_Private *SiS_Pr, USHORT tempax);
+ USHORT   SiS_CheckACK(SiS_Private *SiS_Pr);
+-USHORT   SiS_ReadLCDDDC(SiS_Private *SiS_Pr, USHORT length, unsigned char *buffer);
+-#ifdef LINUX_XF86
+-USHORT   SiS_SenseLCDDDC(SiS_Private *SiS_Pr, SISPtr pSiS);
+-USHORT   SiS_SenseVGA2DDC(SiS_Private *SiS_Pr, SISPtr pSiS);
+-#endif
++
+ #ifdef SIS315H
+ void     SiS_OEM310Setting(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension,USHORT BaseAddr,
+                            UCHAR *ROMAddr,USHORT ModeNo,USHORT ModeIdIndex);
+ void     SiS_OEMLCD(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension,USHORT BaseAddr,
+-                    UCHAR *ROMAddr,USHORT ModeNo,USHORT ModeIdIndex);
++                    UCHAR *ROMAddr,USHORT ModeNo,USHORT ModeIdIndex,USHORT RefreshRateTableIndex);
+ #endif
+ #ifdef SIS300
+ void     SiS_OEM300Setting(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension,USHORT BaseAddr,
+-                           UCHAR *ROMAddr,USHORT ModeNo);
++                           UCHAR *ROMAddr,USHORT ModeNo, USHORT ModeIdIndex, USHORT RefTabindex);
++void     SetOEMLCDData2(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension,USHORT BaseAddr,
++			UCHAR *ROMAddr, USHORT ModeNo, USHORT ModeIdIndex,USHORT RefTableIndex);
+ #endif
+ BOOLEAN  SiS_LowModeStuff(SiS_Private *SiS_Pr, USHORT ModeNo,PSIS_HW_DEVICE_INFO HwDeviceExtension);
+ 
+-BOOLEAN  SiS_GetLCDResInfo(SiS_Private *SiS_Pr, UCHAR *ROMAddr,USHORT ModeNo, USHORT ModeIdIndex,
++void     SiS_GetLCDResInfo(SiS_Private *SiS_Pr, UCHAR *ROMAddr,USHORT ModeNo, USHORT ModeIdIndex,
+                            PSIS_HW_DEVICE_INFO HwDeviceExtension);
+ /* void    SiS_CHACRT1CRTC(SiS_Private *SiS_Pr, UCHAR *ROMAddr,USHORT ModeNo,USHORT ModeIdIndex,
+                         USHORT RefreshRateTableIndex); */
+ 
+-BOOLEAN  SiS_SetCRT2Group301(SiS_Private *SiS_Pr, USHORT BaseAddr,UCHAR *ROMAddr,USHORT ModeNo,
+-                             PSIS_HW_DEVICE_INFO HwDeviceExtension);
++BOOLEAN  SiS_SetCRT2Group(SiS_Private *SiS_Pr, USHORT BaseAddr,UCHAR *ROMAddr,USHORT ModeNo,
++                          PSIS_HW_DEVICE_INFO HwDeviceExtension);
+ void     SiS_SetGroup1(SiS_Private *SiS_Pr, USHORT BaseAddr,UCHAR *ROMAddr,USHORT ModeNo,USHORT ModeIdIndex,
+                        PSIS_HW_DEVICE_INFO HwDeviceExtension,USHORT RefreshRateTableIndex);
+ void     SiS_SetGroup1_LVDS(SiS_Private *SiS_Pr, USHORT BaseAddr,UCHAR *ROMAddr,USHORT ModeNo,USHORT ModeIdIndex,
+@@ -237,19 +301,19 @@ void     SiS_VBWait(SiS_Private *SiS_Pr)
+ void     SiS_SiS30xBLOn(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension);
+ void     SiS_SiS30xBLOff(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension);
+ 
+-void     SiS_Chrontel701xBLOn(SiS_Private *SiS_Pr);
++void     SiS_Chrontel701xBLOn(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension);
+ void     SiS_Chrontel701xBLOff(SiS_Private *SiS_Pr);
+ #ifdef SIS315H
+ void     SiS_Chrontel701xOn(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension,
+                             USHORT BaseAddr);
+-void     SiS_Chrontel701xOff(SiS_Private *SiS_Pr);
++void     SiS_Chrontel701xOff(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension);
+ void     SiS_ChrontelResetDB(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension, USHORT BaseAddr);
+ void     SiS_ChrontelDoSomething4(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension, USHORT BaseAddr);
+ void     SiS_ChrontelDoSomething3(SiS_Private *SiS_Pr, USHORT ModeNo, PSIS_HW_DEVICE_INFO HwDeviceExtension, USHORT BaseAddr);
+ void     SiS_ChrontelDoSomething2(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension, USHORT BaseAddr);
+ void     SiS_ChrontelDoSomething1(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension, USHORT BaseAddr);
+ BOOLEAN  SiS_WeHaveBacklightCtrl(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension, USHORT BaseAddr);
+-void     SiS_ChrontelPowerSequencing(SiS_Private *SiS_Pr);
++void     SiS_ChrontelPowerSequencing(SiS_Private *SiS_Pr,  PSIS_HW_DEVICE_INFO HwDeviceExtension);
+ void     SiS_SetCH701xForLCD(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension, USHORT BaseAddr);
+ #ifdef NEWCH701x
+ void     SiS_ChrontelDoSomething5(SiS_Private *SiS_Pr);
+@@ -289,73 +353,21 @@ extern   void     SiS_LoadDAC(SiS_Privat
+ extern   UCHAR    SiS_Get310DRAMType(SiS_Private *SiS_Pr, UCHAR *ROMAddr,PSIS_HW_DEVICE_INFO HwDeviceExtension);
+ #endif
+ 
+-#ifdef LINUX_XF86
+ /* DDC functions */
+-USHORT   SiS_InitDDCRegs(SiS_Private *SiS_Pr, SISPtr pSiS, USHORT adaptnum, USHORT DDCdatatype, BOOLEAN checkcr32);
++USHORT   SiS_InitDDCRegs(SiS_Private *SiS_Pr, unsigned long VBFlags, int VGAEngine,
++                         USHORT adaptnum, USHORT DDCdatatype, BOOLEAN checkcr32);
+ USHORT   SiS_WriteDABDDC(SiS_Private *SiS_Pr);
+ USHORT   SiS_PrepareReadDDC(SiS_Private *SiS_Pr);
+ USHORT   SiS_PrepareDDC(SiS_Private *SiS_Pr);
+ void     SiS_SendACK(SiS_Private *SiS_Pr, USHORT yesno);
+ USHORT   SiS_DoProbeDDC(SiS_Private *SiS_Pr);
+ USHORT   SiS_ProbeDDC(SiS_Private *SiS_Pr);
+-USHORT   SiS_ReadDDC(SiS_Private *SiS_Pr, SISPtr pSiS, USHORT DDCdatatype, unsigned char *buffer);
+-USHORT   SiS_HandleDDC(SiS_Private *SiS_Pr, SISPtr pSiS, USHORT adaptnum,
+-                       USHORT DDCdatatype, unsigned char *buffer);
++USHORT   SiS_ReadDDC(SiS_Private *SiS_Pr, USHORT DDCdatatype, unsigned char *buffer);
++USHORT   SiS_HandleDDC(SiS_Private *SiS_Pr, unsigned long VBFlags, int VGAEngine,
++		       USHORT adaptnum, USHORT DDCdatatype, unsigned char *buffer);
++#ifdef LINUX_XF86
++USHORT   SiS_SenseLCDDDC(SiS_Private *SiS_Pr, SISPtr pSiS);
++USHORT   SiS_SenseVGA2DDC(SiS_Private *SiS_Pr, SISPtr pSiS);
+ #endif
+ 
+-const UCHAR SiS_HiVisionTable[3][64] = {
+-  { 
+-    0x17, 0x1d, 0x03, 0x09, 0x05, 0x06, 0x0c, 0x0c,
+-    0x94, 0x49, 0x01, 0x0a, 0x06, 0x0d, 0x04, 0x0a,
+-    0x06, 0x14, 0x0d, 0x04, 0x0a, 0x00, 0x85, 0x1b,
+-    0x0c, 0x50, 0x00, 0x97, 0x00, 0xd4, 0x4a, 0x17,
+-    0x7d, 0x05, 0x4b, 0x00, 0x00, 0xe2, 0x00, 0x02,
+-    0x03, 0x0a, 0x65, 0x9d, 0x08, 0x92, 0x8f, 0x40,
+-    0x60, 0x80, 0x14, 0x90, 0x8c, 0x60, 0x14, 0x53,
+-    0x00, 0x40, 0x44, 0x00, 0xdb, 0x02, 0x3b, 0x00
+-  },
+-  { 
+-    0x1d, 0x1d, 0x06, 0x09, 0x0b, 0x0c, 0x0c, 0x0c,
+-    0x98, 0x0a, 0x01, 0x0d, 0x06, 0x0d, 0x04, 0x0a,
+-    0x06, 0x14, 0x0d, 0x04, 0x0a, 0x00, 0x85, 0x3f,
+-    0x0c, 0x50, 0xb2, 0x2e, 0x16, 0xb5, 0xf4, 0x03,
+-    0x7d, 0x11, 0x7d, 0xea, 0x30, 0x36, 0x18, 0x96,
+-    0x21, 0x0a, 0x58, 0xee, 0x42, 0x92, 0x0f, 0x40,
+-    0x60, 0x80, 0x14, 0x90, 0x8c, 0x60, 0x04, 0xf3,
+-    0x00, 0x40, 0x11, 0x00, 0xfc, 0xff, 0x32, 0x00
+-  },
+-  { 
+-    0x13, 0x1d, 0xe8, 0x09, 0x09, 0xed, 0x0c, 0x0c, 
+-    0x98, 0x0a, 0x01, 0x0c, 0x06, 0x0d, 0x04, 0x0a, 
+-    0x06, 0x14, 0x0d, 0x04, 0x0a, 0x00, 0x85, 0x3f, 
+-    0xed, 0x50, 0x70, 0x9f, 0x16, 0x59, 0x2b, 0x13, 
+-    0x27, 0x0b, 0x27, 0xfc, 0x30, 0x27, 0x1c, 0xb0, 
+-    0x4b, 0x4b, 0x6f, 0x2f, 0x63, 0x92, 0x0f, 0x40, 
+-    0x60, 0x80, 0x14, 0x90, 0x8c, 0x60, 0x14, 0x2a, 
+-    0x00, 0x40, 0x11, 0x00, 0xfc, 0xff, 0x32, 0x00 
+-  }
+-};
+-
+-const UCHAR SiS_HiTVGroup3_1[] = {
+-    0x00, 0x14, 0x15, 0x25, 0x55, 0x15, 0x0b, 0x13,
+-    0xb1, 0x41, 0x62, 0x62, 0xff, 0xf4, 0x45, 0xa6,
+-    0x25, 0x2f, 0x67, 0xf6, 0xbf, 0xff, 0x8e, 0x20,
+-    0xac, 0xda, 0x60, 0xfe, 0x6a, 0x9a, 0x06, 0x10,
+-    0xd1, 0x04, 0x18, 0x0a, 0xff, 0x80, 0x00, 0x80,
+-    0x3b, 0x77, 0x00, 0xef, 0xe0, 0x10, 0xb0, 0xe0,
+-    0x10, 0x4f, 0x0f, 0x0f, 0x05, 0x0f, 0x08, 0x6e,
+-    0x1a, 0x1f, 0x25, 0x2a, 0x4c, 0xaa, 0x01
+-};
+-
+-const UCHAR SiS_HiTVGroup3_2[] = {
+-    0x00, 0x14, 0x15, 0x25, 0x55, 0x15, 0x0b, 0x7a,
+-    0x54, 0x41, 0xe7, 0xe7, 0xff, 0xf4, 0x45, 0xa6,
+-    0x25, 0x2f, 0x67, 0xf6, 0xbf, 0xff, 0x8e, 0x20,
+-    0xac, 0x6a, 0x60, 0x2b, 0x52, 0xcd, 0x61, 0x10,
+-    0x51, 0x04, 0x18, 0x0a, 0x1f, 0x80, 0x00, 0x80,
+-    0xff, 0xa4, 0x04, 0x2b, 0x94, 0x21, 0x72, 0x94,
+-    0x26, 0x05, 0x01, 0x0f, 0xed, 0x0f, 0x0a, 0x64,
+-    0x18, 0x1d, 0x23, 0x28, 0x4c, 0xaa, 0x01
+-};
+-
+ #endif
+--- linux-2.6.0-test6/drivers/video/sis/init.c	2003-06-14 12:18:05.000000000 -0700
++++ 25/drivers/video/sis/init.c	2003-10-05 00:34:22.000000000 -0700
+@@ -1,24 +1,17 @@
+ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/init.c,v 1.3 2002/24/04 01:16:16 dawes Exp $ */
+ /*
+- * Mode switching code (CRT1 section) for SiS 300/540/630/730/315/550/650/740/330
++ * Mode switching code (CRT1 section) for
++ * SiS 300/540/630/730/315/550/650/M650/651/M652/740/330/660/M660/760
+  * (Universal module for Linux kernel framebuffer and XFree86 4.x)
+  *
+  * Assembler-To-C translation
+- * Copyright 2002 by Thomas Winischhofer <thomas@winischhofer.net>
+- * Minor parts Copyright SiS, Inc.
++ * Copyright 2002, 2003 by Thomas Winischhofer <thomas@winischhofer.net>
++ * Formerly based on non-functional code-fragements by SiS, Inc.
+  *
+- * Based on BIOS
+- *     1.10.07, 1.10a for 650/CH7019
+- *     1.11.21a for 740/CH7019
+- *     1.11.05 for 650/LVDS (w/o Chrontel)
+- *     1.07.1b, 1.11.6s, 1.11.6w, 1.11.7w, 1.11.8r for 650/301(B/LV)
+- *     2.04.50 (I) and 2.04.5c (II) for 630/301(B)
+- *     2.06.50 for 630/301B (dual VGA)
+- *     2.02.3b, 2.03.02, 2.04.5c, 2.07a and 2.08.b3 for 630/LVDS/LVDS+CH7005
+- *     2.04.5c, 2.04.6c for 730+LVDS+CH7005
+- *     1.09b for 315/301(B)
+- *     1.16.51 for 300+301LV (ECS A907)
+- *     1.01.03 for 330 (Xabre 400)
++ * If distributed as part of the linux kernel, the contents of this file
++ * is entirely covered by the GPL.
++ *
++ * Otherwise, the following terms apply:
+  *
+  * Permission to use, copy, modify, distribute, and sell this software and its
+  * documentation for any purpose is hereby granted without fee, provided that
+@@ -61,12 +54,12 @@
+ #ifdef LINUX_XF86
+ BOOLEAN SiSBIOSSetMode(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension,
+                        ScrnInfoPtr pScrn, DisplayModePtr mode, BOOLEAN IsCustom);
+-DisplayModePtr SiSBuildBuiltInModeList(ScrnInfoPtr pScrn);
+-#ifdef SISDUALHEAD /* TW: For dual head */
++DisplayModePtr SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN includelcdmodes, BOOLEAN isfordvi);
++#ifdef SISDUALHEAD
+ BOOLEAN SiSBIOSSetModeCRT1(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension,
+                        ScrnInfoPtr pScrn, DisplayModePtr mode, BOOLEAN IsCustom);
+ BOOLEAN SiSBIOSSetModeCRT2(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension,
+-                       ScrnInfoPtr pScrn, DisplayModePtr mode);
++                       ScrnInfoPtr pScrn, DisplayModePtr mode, BOOLEAN IsCustom);
+ #endif /* dual head */
+ #endif /* linux_xf86 */
+ 
+@@ -90,49 +83,201 @@ BOOLEAN SiSSetMode(SiS_Private *SiS_Pr, 
+ static ULONG GetDRAMSize(SiS_Private *SiS_Pr,
+                          PSIS_HW_DEVICE_INFO HwDeviceExtension);
+ 
+-static void DelaySeconds(int seconds);
+-void SiS_DebugCode(SiS_Private *SiS_Pr, UCHAR code);
+-
+ static void
+-DelaySeconds(int seconds)
+-{
+-  int i;
+-#ifdef WIN2000
+-  int j;
+-#endif
+-
+-  for (i=0;i<seconds;i++) {
+-#ifdef TC
+-    delay(1000);
+-#endif
+-
+-#ifdef WIN2000
+-    for (j=0;j<20000;j++)
+-      VideoPortStallExecution(50);
+-#endif
+-
+-#ifdef WINCE_HEADER
+-#endif
+-
+-#ifdef LINUX_KERNEL
+-#endif
+-  }
+-}
+-
+-void
+-SiS_DebugCode(SiS_Private *SiS_Pr, UCHAR code)
++InitCommonPointer(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension)
+ {
+-  OutPortByte(0x80, code);
+-  DelaySeconds(0x3);
++   SiS_Pr->SiS_StResInfo     = SiS_StResInfo;
++   SiS_Pr->SiS_ModeResInfo   = SiS_ModeResInfo;
++   SiS_Pr->SiS_StandTable    = SiS_StandTable;
++   if(HwDeviceExtension->jChipType < SIS_315H) {
++      SiS_StandTable[0x04].CRTC[4] = 0x2b;
++      SiS_StandTable[0x05].CRTC[4] = 0x2b;
++      SiS_StandTable[0x06].CRTC[4] = 0x54;
++      SiS_StandTable[0x06].CRTC[5] = 0x80;
++      SiS_StandTable[0x0d].CRTC[4] = 0x2b;
++      SiS_StandTable[0x0e].CRTC[4] = 0x54;
++      SiS_StandTable[0x0e].CRTC[5] = 0x80;
++      SiS_StandTable[0x11].CRTC[4] = 0x54;
++      SiS_StandTable[0x11].CRTC[5] = 0x80;
++      SiS_StandTable[0x11].CRTC[16] = 0x83;
++      SiS_StandTable[0x11].CRTC[17] = 0x85;
++      SiS_StandTable[0x12].CRTC[4] = 0x54;
++      SiS_StandTable[0x12].CRTC[5] = 0x80;
++      SiS_StandTable[0x12].CRTC[16] = 0x83;
++      SiS_StandTable[0x12].CRTC[17] = 0x85;
++      SiS_StandTable[0x13].CRTC[5] = 0xa0;
++      SiS_StandTable[0x17].CRTC[5] = 0xa0;
++      SiS_StandTable[0x1a].CRTC[4] = 0x54;
++      SiS_StandTable[0x1a].CRTC[5] = 0x80;
++      SiS_StandTable[0x1a].CRTC[16] = 0xea;
++      SiS_StandTable[0x1a].CRTC[17] = 0x8c;
++      SiS_StandTable[0x1b].CRTC[4] = 0x54;
++      SiS_StandTable[0x1b].CRTC[5] = 0x80;
++      SiS_StandTable[0x1b].CRTC[16] = 0xea;
++      SiS_StandTable[0x1b].CRTC[17] = 0x8c;
++      SiS_StandTable[0x1c].CRTC[4] = 0x54;
++      SiS_StandTable[0x1c].CRTC[5] = 0x80;
++   } else {
++      SiS_StandTable[0x04].CRTC[4] = 0x2c;
++      SiS_StandTable[0x05].CRTC[4] = 0x2c;
++      SiS_StandTable[0x06].CRTC[4] = 0x55;
++      SiS_StandTable[0x06].CRTC[5] = 0x81;
++      SiS_StandTable[0x0d].CRTC[4] = 0x2c;
++      SiS_StandTable[0x0e].CRTC[4] = 0x55;
++      SiS_StandTable[0x0e].CRTC[5] = 0x81;
++      SiS_StandTable[0x11].CRTC[4] = 0x55;
++      SiS_StandTable[0x11].CRTC[5] = 0x81;
++      SiS_StandTable[0x11].CRTC[16] = 0x82;
++      SiS_StandTable[0x11].CRTC[17] = 0x84;
++      SiS_StandTable[0x12].CRTC[4] = 0x55;
++      SiS_StandTable[0x12].CRTC[5] = 0x81;
++      SiS_StandTable[0x12].CRTC[16] = 0x82;
++      SiS_StandTable[0x12].CRTC[17] = 0x84;
++      SiS_StandTable[0x13].CRTC[5] = 0xb1;
++      SiS_StandTable[0x17].CRTC[5] = 0xb1;
++      SiS_StandTable[0x1a].CRTC[4] = 0x55;
++      SiS_StandTable[0x1a].CRTC[5] = 0x81;
++      SiS_StandTable[0x1a].CRTC[16] = 0xe9;
++      SiS_StandTable[0x1a].CRTC[17] = 0x8b;
++      SiS_StandTable[0x1b].CRTC[4] = 0x55;
++      SiS_StandTable[0x1b].CRTC[5] = 0x81;
++      SiS_StandTable[0x1b].CRTC[16] = 0xe9;
++      SiS_StandTable[0x1b].CRTC[17] = 0x8b;
++      SiS_StandTable[0x1c].CRTC[4] = 0x55;
++      SiS_StandTable[0x1c].CRTC[5] = 0x81;
++   }
++
++   SiS_Pr->SiS_NTSCPhase    = SiS_NTSCPhase;
++   SiS_Pr->SiS_PALPhase     = SiS_PALPhase;
++   SiS_Pr->SiS_NTSCPhase2   = SiS_NTSCPhase2;
++   SiS_Pr->SiS_PALPhase2    = SiS_PALPhase2;
++   SiS_Pr->SiS_PALMPhase    = SiS_PALMPhase;
++   SiS_Pr->SiS_PALNPhase    = SiS_PALNPhase;
++   SiS_Pr->SiS_PALMPhase2   = SiS_PALMPhase2;
++   SiS_Pr->SiS_PALNPhase2   = SiS_PALNPhase2;
++   SiS_Pr->SiS_SpecialPhase = SiS_SpecialPhase;
++
++   SiS_Pr->SiS_NTSCTiming     = SiS_NTSCTiming;
++   SiS_Pr->SiS_PALTiming      = SiS_PALTiming;
++   SiS_Pr->SiS_HiTVSt1Timing  = SiS_HiTVSt1Timing;
++   SiS_Pr->SiS_HiTVSt2Timing  = SiS_HiTVSt2Timing;
++   SiS_Pr->SiS_HiTVTextTiming = SiS_HiTVTextTiming;
++   SiS_Pr->SiS_HiTVExtTiming  = SiS_HiTVExtTiming;
++   SiS_Pr->SiS_HiTVGroup3Data = SiS_HiTVGroup3Data;
++   SiS_Pr->SiS_HiTVGroup3Simu = SiS_HiTVGroup3Simu;
++   SiS_Pr->SiS_HiTVGroup3Text = SiS_HiTVGroup3Text;
++
++   SiS_Pr->SiS_StPALData   = SiS_StPALData;
++   SiS_Pr->SiS_ExtPALData  = SiS_ExtPALData;
++   SiS_Pr->SiS_StNTSCData  = SiS_StNTSCData;
++   SiS_Pr->SiS_ExtNTSCData = SiS_ExtNTSCData;
++/* SiS_Pr->SiS_St1HiTVData = SiS_St1HiTVData;  */
++   SiS_Pr->SiS_St2HiTVData = SiS_St2HiTVData;
++   SiS_Pr->SiS_ExtHiTVData = SiS_ExtHiTVData;
++
++   SiS_Pr->pSiS_OutputSelect = &SiS_OutputSelect;
++   SiS_Pr->pSiS_SoftSetting  = &SiS_SoftSetting;
++
++   SiS_Pr->SiS_LCD1280x960Data      = SiS_LCD1280x960Data;
++   SiS_Pr->SiS_ExtLCD1400x1050Data  = SiS_ExtLCD1400x1050Data;
++   SiS_Pr->SiS_ExtLCD1600x1200Data  = SiS_ExtLCD1600x1200Data;
++   SiS_Pr->SiS_StLCD1400x1050Data   = SiS_StLCD1400x1050Data;
++   SiS_Pr->SiS_StLCD1600x1200Data   = SiS_StLCD1600x1200Data;
++   SiS_Pr->SiS_NoScaleData1400x1050 = SiS_NoScaleData1400x1050;
++   SiS_Pr->SiS_NoScaleData1600x1200 = SiS_NoScaleData1600x1200;
++   SiS_Pr->SiS_ExtLCD1280x768Data   = SiS_ExtLCD1280x768Data;
++   SiS_Pr->SiS_StLCD1280x768Data    = SiS_StLCD1280x768Data;
++   SiS_Pr->SiS_NoScaleData1280x768  = SiS_NoScaleData1280x768;
++   SiS_Pr->SiS_NoScaleData          = SiS_NoScaleData;
++
++   SiS_Pr->SiS_LVDS320x480Data_1   = SiS_LVDS320x480Data_1;
++   SiS_Pr->SiS_LVDS800x600Data_1   = SiS_LVDS800x600Data_1;
++   SiS_Pr->SiS_LVDS800x600Data_2   = SiS_LVDS800x600Data_2;
++   SiS_Pr->SiS_LVDS1024x768Data_1  = SiS_LVDS1024x768Data_1;
++   SiS_Pr->SiS_LVDS1024x768Data_2  = SiS_LVDS1024x768Data_2;
++   SiS_Pr->SiS_LVDS1280x1024Data_1 = SiS_LVDS1280x1024Data_1;
++   SiS_Pr->SiS_LVDS1280x1024Data_2 = SiS_LVDS1280x1024Data_2;
++   SiS_Pr->SiS_LVDS1400x1050Data_1 = SiS_LVDS1400x1050Data_1;
++   SiS_Pr->SiS_LVDS1400x1050Data_2 = SiS_LVDS1400x1050Data_2;
++   SiS_Pr->SiS_LVDS1600x1200Data_1 = SiS_LVDS1600x1200Data_1;
++   SiS_Pr->SiS_LVDS1600x1200Data_2 = SiS_LVDS1600x1200Data_2;
++   SiS_Pr->SiS_LVDS1280x768Data_1  = SiS_LVDS1280x768Data_1;
++   SiS_Pr->SiS_LVDS1280x768Data_2  = SiS_LVDS1280x768Data_2;
++   SiS_Pr->SiS_LVDS1024x600Data_1  = SiS_LVDS1024x600Data_1;
++   SiS_Pr->SiS_LVDS1024x600Data_2  = SiS_LVDS1024x600Data_2;
++   SiS_Pr->SiS_LVDS1152x768Data_1  = SiS_LVDS1152x768Data_1;
++   SiS_Pr->SiS_LVDS1152x768Data_2  = SiS_LVDS1152x768Data_2;
++   SiS_Pr->SiS_LVDSXXXxXXXData_1   = SiS_LVDSXXXxXXXData_1;
++   SiS_Pr->SiS_LVDS1280x960Data_1  = SiS_LVDS1280x960Data_1;
++   SiS_Pr->SiS_LVDS1280x960Data_2  = SiS_LVDS1280x960Data_2;
++   SiS_Pr->SiS_LVDS640x480Data_1   = SiS_LVDS640x480Data_1;
++   SiS_Pr->SiS_LVDS1280x960Data_1  = SiS_LVDS1280x1024Data_1;
++   SiS_Pr->SiS_LVDS1280x960Data_2  = SiS_LVDS1280x1024Data_2;
++   SiS_Pr->SiS_LVDS640x480Data_1   = SiS_LVDS640x480Data_1;
++   SiS_Pr->SiS_LVDS640x480Data_2   = SiS_LVDS640x480Data_2;
++
++   SiS_Pr->SiS_LVDSBARCO1366Data_1 = SiS_LVDSBARCO1366Data_1;
++   SiS_Pr->SiS_LVDSBARCO1366Data_2 = SiS_LVDSBARCO1366Data_2;
++   SiS_Pr->SiS_LVDSBARCO1024Data_1 = SiS_LVDSBARCO1024Data_1;
++   SiS_Pr->SiS_LVDSBARCO1024Data_2 = SiS_LVDSBARCO1024Data_2;
++   SiS_Pr->SiS_LVDS848x480Data_1   = SiS_LVDS848x480Data_1;
++   SiS_Pr->SiS_LVDS848x480Data_2   = SiS_LVDS848x480Data_2;
++
++   SiS_Pr->SiS_LCDA1400x1050Data_1 = SiS_LCDA1400x1050Data_1;
++   SiS_Pr->SiS_LCDA1400x1050Data_2 = SiS_LCDA1400x1050Data_2;
++   SiS_Pr->SiS_LCDA1600x1200Data_1 = SiS_LCDA1600x1200Data_1;
++   SiS_Pr->SiS_LCDA1600x1200Data_2 = SiS_LCDA1600x1200Data_2;
++   SiS_Pr->SiS_CHTVUNTSCData = SiS_CHTVUNTSCData;
++   SiS_Pr->SiS_CHTVONTSCData = SiS_CHTVONTSCData;
++
++   SiS_Pr->LVDS1024x768Des_1  = SiS_PanelType1076_1;
++   SiS_Pr->LVDS1280x1024Des_1 = SiS_PanelType1210_1;
++   SiS_Pr->LVDS1400x1050Des_1 = SiS_PanelType1296_1;
++   SiS_Pr->LVDS1600x1200Des_1 = SiS_PanelType1600_1;
++   SiS_Pr->LVDS1024x768Des_2  = SiS_PanelType1076_2;
++   SiS_Pr->LVDS1280x1024Des_2 = SiS_PanelType1210_2;
++   SiS_Pr->LVDS1400x1050Des_2 = SiS_PanelType1296_2;
++   SiS_Pr->LVDS1600x1200Des_2 = SiS_PanelType1600_2;
++
++   SiS_Pr->SiS_PanelTypeNS_1 = SiS_PanelTypeNS_1;
++   SiS_Pr->SiS_PanelTypeNS_2 = SiS_PanelTypeNS_2;
++
++   SiS_Pr->SiS_CHTVUNTSCDesData = SiS_CHTVUNTSCDesData;
++   SiS_Pr->SiS_CHTVONTSCDesData = SiS_CHTVONTSCDesData;
++   SiS_Pr->SiS_CHTVUPALDesData  = SiS_CHTVUPALDesData;
++   SiS_Pr->SiS_CHTVOPALDesData  = SiS_CHTVOPALDesData;
++
++   SiS_Pr->SiS_LVDSCRT11280x768_1    = SiS_LVDSCRT11280x768_1;
++   SiS_Pr->SiS_LVDSCRT11024x600_1    = SiS_LVDSCRT11024x600_1;
++   SiS_Pr->SiS_LVDSCRT11152x768_1    = SiS_LVDSCRT11152x768_1;
++   SiS_Pr->SiS_LVDSCRT11280x768_1_H  = SiS_LVDSCRT11280x768_1_H;
++   SiS_Pr->SiS_LVDSCRT11024x600_1_H  = SiS_LVDSCRT11024x600_1_H;
++   SiS_Pr->SiS_LVDSCRT11152x768_1_H  = SiS_LVDSCRT11152x768_1_H;
++   SiS_Pr->SiS_LVDSCRT11280x768_2    = SiS_LVDSCRT11280x768_2;
++   SiS_Pr->SiS_LVDSCRT11024x600_2    = SiS_LVDSCRT11024x600_2;
++   SiS_Pr->SiS_LVDSCRT11152x768_2    = SiS_LVDSCRT11152x768_2;
++   SiS_Pr->SiS_LVDSCRT11280x768_2_H  = SiS_LVDSCRT11280x768_2_H;
++   SiS_Pr->SiS_LVDSCRT11024x600_2_H  = SiS_LVDSCRT11024x600_2_H;
++   SiS_Pr->SiS_LVDSCRT11152x768_2_H  = SiS_LVDSCRT11152x768_2_H;
++   SiS_Pr->SiS_LVDSCRT1320x480_1     = SiS_LVDSCRT1320x480_1;
++   SiS_Pr->SiS_LVDSCRT1XXXxXXX_1     = SiS_LVDSCRT1XXXxXXX_1;
++   SiS_Pr->SiS_LVDSCRT1XXXxXXX_1_H   = SiS_LVDSCRT1XXXxXXX_1_H;
++   SiS_Pr->SiS_LVDSCRT1640x480_1     = SiS_LVDSCRT1640x480_1;
++   SiS_Pr->SiS_LVDSCRT1640x480_1_H   = SiS_LVDSCRT1640x480_1_H;
++   SiS_Pr->SiS_LVDSCRT1640x480_2     = SiS_LVDSCRT1640x480_2;
++   SiS_Pr->SiS_LVDSCRT1640x480_2_H   = SiS_LVDSCRT1640x480_2_H;
++   SiS_Pr->SiS_LVDSCRT1640x480_3     = SiS_LVDSCRT1640x480_3;
++   SiS_Pr->SiS_LVDSCRT1640x480_3_H   = SiS_LVDSCRT1640x480_3_H;
+ }
+ 
+ #ifdef SIS300
+ static void
+ InitTo300Pointer(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension)
+ {
++   InitCommonPointer(SiS_Pr, HwDeviceExtension);
++
+    SiS_Pr->SiS_SModeIDTable  = (SiS_StStruct *)SiS300_SModeIDTable;
+    SiS_Pr->SiS_VBModeIDTable = (SiS_VBModeStruct *)SiS300_VBModeIDTable;
+-   SiS_Pr->SiS_StandTable    = (SiS_StandTableStruct *)SiS300_StandTable;
+    SiS_Pr->SiS_EModeIDTable  = (SiS_ExtStruct *)SiS300_EModeIDTable;
+    SiS_Pr->SiS_RefIndex      = (SiS_Ext2Struct *)SiS300_RefIndex;
+    SiS_Pr->SiS_CRT1Table     = (SiS_CRT1TableStruct *)SiS300_CRT1Table;
+@@ -141,15 +286,12 @@ InitTo300Pointer(SiS_Private *SiS_Pr, PS
+    } else {
+       SiS_Pr->SiS_MCLKData_0    = (SiS_MCLKDataStruct *)SiS300_MCLKData_630; /* 630, 730 */
+    }
++#ifdef LINUXBIOS
+    SiS_Pr->SiS_ECLKData      = (SiS_ECLKDataStruct *)SiS300_ECLKData;
++#endif
+    SiS_Pr->SiS_VCLKData      = (SiS_VCLKDataStruct *)SiS300_VCLKData;
+    SiS_Pr->SiS_VBVCLKData    = (SiS_VBVCLKDataStruct *)SiS300_VCLKData;
+    SiS_Pr->SiS_ScreenOffset  = SiS300_ScreenOffset;
+-   SiS_Pr->SiS_StResInfo     = (SiS_StResInfoStruct *)SiS300_StResInfo;
+-   SiS_Pr->SiS_ModeResInfo   = (SiS_ModeResInfoStruct *)SiS300_ModeResInfo;
+-
+-   SiS_Pr->pSiS_OutputSelect = &SiS300_OutputSelect;
+-   SiS_Pr->pSiS_SoftSetting  = &SiS300_SoftSetting;
+ 
+    SiS_Pr->SiS_SR15  = SiS300_SR15;
+ 
+@@ -178,15 +320,6 @@ InitTo300Pointer(SiS_Private *SiS_Pr, PS
+    SiS_Pr->pSiS_YCSenseData2    = &SiS300_YCSenseData2;
+ #endif
+ 
+-   SiS_Pr->SiS_NTSCPhase  = SiS300_NTSCPhase;
+-   SiS_Pr->SiS_PALPhase   = SiS300_PALPhase;
+-   SiS_Pr->SiS_NTSCPhase2 = SiS300_NTSCPhase2;
+-   SiS_Pr->SiS_PALPhase2  = SiS300_PALPhase2;
+-   SiS_Pr->SiS_PALMPhase  = SiS300_PALMPhase;
+-   SiS_Pr->SiS_PALNPhase  = SiS300_PALNPhase;
+-   SiS_Pr->SiS_PALMPhase2 = SiS300_PALMPhase2;
+-   SiS_Pr->SiS_PALNPhase2 = SiS300_PALNPhase2;
+-
+    SiS_Pr->SiS_StLCD1024x768Data    = (SiS_LCDDataStruct *)SiS300_StLCD1024x768Data;
+    SiS_Pr->SiS_ExtLCD1024x768Data   = (SiS_LCDDataStruct *)SiS300_ExtLCD1024x768Data;
+    SiS_Pr->SiS_St2LCD1024x768Data   = (SiS_LCDDataStruct *)SiS300_St2LCD1024x768Data;
+@@ -195,68 +328,18 @@ InitTo300Pointer(SiS_Private *SiS_Pr, PS
+    SiS_Pr->SiS_St2LCD1280x1024Data  = (SiS_LCDDataStruct *)SiS300_St2LCD1280x1024Data;
+    SiS_Pr->SiS_NoScaleData1024x768  = (SiS_LCDDataStruct *)SiS300_NoScaleData1024x768;
+    SiS_Pr->SiS_NoScaleData1280x1024 = (SiS_LCDDataStruct *)SiS300_NoScaleData1280x1024;
+-   SiS_Pr->SiS_LCD1280x960Data      = (SiS_LCDDataStruct *)SiS300_LCD1280x960Data;
+-   SiS_Pr->SiS_ExtLCD1400x1050Data  = (SiS_LCDDataStruct *)SiS300_ExtLCD1400x1050Data;
+-   SiS_Pr->SiS_ExtLCD1600x1200Data  = (SiS_LCDDataStruct *)SiS300_ExtLCD1600x1200Data;
+-   SiS_Pr->SiS_StLCD1400x1050Data   = (SiS_LCDDataStruct *)SiS300_StLCD1400x1050Data;
+-   SiS_Pr->SiS_StLCD1600x1200Data   = (SiS_LCDDataStruct *)SiS300_StLCD1600x1200Data;
+-   SiS_Pr->SiS_NoScaleData1400x1050 = (SiS_LCDDataStruct *)SiS300_NoScaleData1400x1050;
+-   SiS_Pr->SiS_NoScaleData1600x1200 = (SiS_LCDDataStruct *)SiS300_NoScaleData1600x1200;
+-
+-   SiS_Pr->SiS_StPALData   = (SiS_TVDataStruct *)SiS300_StPALData;
+-   SiS_Pr->SiS_ExtPALData  = (SiS_TVDataStruct *)SiS300_ExtPALData;
+-   SiS_Pr->SiS_StNTSCData  = (SiS_TVDataStruct *)SiS300_StNTSCData;
+-   SiS_Pr->SiS_ExtNTSCData = (SiS_TVDataStruct *)SiS300_ExtNTSCData;
+-/* SiS_Pr->SiS_St1HiTVData = (SiS_TVDataStruct *)SiS300_St1HiTVData;  */
+-   SiS_Pr->SiS_St2HiTVData = (SiS_TVDataStruct *)SiS300_St2HiTVData;
+-   SiS_Pr->SiS_ExtHiTVData = (SiS_TVDataStruct *)SiS300_ExtHiTVData;
+-
+-   SiS_Pr->SiS_NTSCTiming     = SiS300_NTSCTiming;
+-   SiS_Pr->SiS_PALTiming      = SiS300_PALTiming;
+-   SiS_Pr->SiS_HiTVSt1Timing  = SiS300_HiTVSt1Timing;
+-   SiS_Pr->SiS_HiTVSt2Timing  = SiS300_HiTVSt2Timing;
+-   SiS_Pr->SiS_HiTVTextTiming = SiS300_HiTVTextTiming;
+-   SiS_Pr->SiS_HiTVGroup3Data = SiS300_HiTVGroup3Data;
+-   SiS_Pr->SiS_HiTVGroup3Simu = SiS300_HiTVGroup3Simu;
+-   SiS_Pr->SiS_HiTVGroup3Text = SiS300_HiTVGroup3Text;
+ 
+    SiS_Pr->SiS_PanelDelayTbl     = (SiS_PanelDelayTblStruct *)SiS300_PanelDelayTbl;
+    SiS_Pr->SiS_PanelDelayTblLVDS = (SiS_PanelDelayTblStruct *)SiS300_PanelDelayTblLVDS;
+ 
+-   SiS_Pr->SiS_LVDS800x600Data_1   = (SiS_LVDSDataStruct *)SiS300_LVDS800x600Data_1;
+-   SiS_Pr->SiS_LVDS800x600Data_2   = (SiS_LVDSDataStruct *)SiS300_LVDS800x600Data_2;
+-   SiS_Pr->SiS_LVDS1024x768Data_1  = (SiS_LVDSDataStruct *)SiS300_LVDS1024x768Data_1;
+-   SiS_Pr->SiS_LVDS1024x768Data_2  = (SiS_LVDSDataStruct *)SiS300_LVDS1024x768Data_2;
+-   SiS_Pr->SiS_LVDS1280x1024Data_1 = (SiS_LVDSDataStruct *)SiS300_LVDS1280x1024Data_1;
+-   SiS_Pr->SiS_LVDS1280x1024Data_2 = (SiS_LVDSDataStruct *)SiS300_LVDS1280x1024Data_2;
+-   SiS_Pr->SiS_LVDS1280x960Data_1  = (SiS_LVDSDataStruct *)SiS300_LVDS1280x1024Data_1;
+-   SiS_Pr->SiS_LVDS1280x960Data_2  = (SiS_LVDSDataStruct *)SiS300_LVDS1280x1024Data_2;
+-   SiS_Pr->SiS_LVDS1400x1050Data_1 = (SiS_LVDSDataStruct *)SiS300_LVDS1400x1050Data_1;
+-   SiS_Pr->SiS_LVDS1400x1050Data_2 = (SiS_LVDSDataStruct *)SiS300_LVDS1400x1050Data_2;
+-   SiS_Pr->SiS_LVDS1600x1200Data_1 = (SiS_LVDSDataStruct *)SiS300_LVDS1600x1200Data_1;
+-   SiS_Pr->SiS_LVDS1600x1200Data_2 = (SiS_LVDSDataStruct *)SiS300_LVDS1600x1200Data_2;
+-   SiS_Pr->SiS_LVDS1280x768Data_1  = (SiS_LVDSDataStruct *)SiS300_LVDS1280x768Data_1;
+-   SiS_Pr->SiS_LVDS1280x768Data_2  = (SiS_LVDSDataStruct *)SiS300_LVDS1280x768Data_2;
+-   SiS_Pr->SiS_LVDS1024x600Data_1  = (SiS_LVDSDataStruct *)SiS300_LVDS1024x600Data_1;
+-   SiS_Pr->SiS_LVDS1024x600Data_2  = (SiS_LVDSDataStruct *)SiS300_LVDS1024x600Data_2;
+-   SiS_Pr->SiS_LVDS1152x768Data_1  = (SiS_LVDSDataStruct *)SiS300_LVDS1152x768Data_1;
+-   SiS_Pr->SiS_LVDS1152x768Data_2  = (SiS_LVDSDataStruct *)SiS300_LVDS1152x768Data_2;
+-   SiS_Pr->SiS_LVDSXXXxXXXData_1   = (SiS_LVDSDataStruct *)SiS300_LVDSXXXxXXXData_1;
+-   SiS_Pr->SiS_LVDS320x480Data_1   = (SiS_LVDSDataStruct *)SiS300_LVDS320x480Data_1;
+-   SiS_Pr->SiS_LVDS640x480Data_1   = (SiS_LVDSDataStruct *)SiS300_LVDS640x480Data_1;
+-   SiS_Pr->SiS_LCDA1400x1050Data_1 = (SiS_LVDSDataStruct *)SiS300_LCDA1400x1050Data_1;
+-   SiS_Pr->SiS_LCDA1400x1050Data_2 = (SiS_LVDSDataStruct *)SiS300_LCDA1400x1050Data_2;
+-   SiS_Pr->SiS_LCDA1600x1200Data_1 = (SiS_LVDSDataStruct *)SiS300_LCDA1600x1200Data_1;
+-   SiS_Pr->SiS_LCDA1600x1200Data_2 = (SiS_LVDSDataStruct *)SiS300_LCDA1600x1200Data_2;
+-   SiS_Pr->SiS_CHTVUNTSCData = (SiS_LVDSDataStruct *)SiS300_CHTVUNTSCData;
+-   SiS_Pr->SiS_CHTVONTSCData = (SiS_LVDSDataStruct *)SiS300_CHTVONTSCData;
+    SiS_Pr->SiS_CHTVUPALData  = (SiS_LVDSDataStruct *)SiS300_CHTVUPALData;
+    SiS_Pr->SiS_CHTVOPALData  = (SiS_LVDSDataStruct *)SiS300_CHTVOPALData;
+-   SiS_Pr->SiS_CHTVUPALMData = (SiS_LVDSDataStruct *)SiS300_CHTVUNTSCData; /* not supported on 300 series */
+-   SiS_Pr->SiS_CHTVOPALMData = (SiS_LVDSDataStruct *)SiS300_CHTVONTSCData; /* not supported on 300 series */
++   SiS_Pr->SiS_CHTVUPALMData = SiS_CHTVUNTSCData; 			   /* not supported on 300 series */
++   SiS_Pr->SiS_CHTVOPALMData = SiS_CHTVONTSCData; 			   /* not supported on 300 series */
+    SiS_Pr->SiS_CHTVUPALNData = (SiS_LVDSDataStruct *)SiS300_CHTVUPALData;  /* not supported on 300 series */
+    SiS_Pr->SiS_CHTVOPALNData = (SiS_LVDSDataStruct *)SiS300_CHTVOPALData;  /* not supported on 300 series */
+    SiS_Pr->SiS_CHTVSOPALData = (SiS_LVDSDataStruct *)SiS300_CHTVSOPALData;
++
+    SiS_Pr->SiS_PanelType00_1 = (SiS_LVDSDesStruct *)SiS300_PanelType00_1;
+    SiS_Pr->SiS_PanelType01_1 = (SiS_LVDSDesStruct *)SiS300_PanelType01_1;
+    SiS_Pr->SiS_PanelType02_1 = (SiS_LVDSDesStruct *)SiS300_PanelType02_1;
+@@ -289,32 +372,28 @@ InitTo300Pointer(SiS_Private *SiS_Pr, PS
+    SiS_Pr->SiS_PanelType0d_2 = (SiS_LVDSDesStruct *)SiS300_PanelType0d_2;
+    SiS_Pr->SiS_PanelType0e_2 = (SiS_LVDSDesStruct *)SiS300_PanelType0e_2;
+    SiS_Pr->SiS_PanelType0f_2 = (SiS_LVDSDesStruct *)SiS300_PanelType0f_2;
+-   SiS_Pr->SiS_PanelTypeNS_1 = (SiS_LVDSDesStruct *)SiS300_PanelTypeNS_1;
+-   SiS_Pr->SiS_PanelTypeNS_2 = (SiS_LVDSDesStruct *)SiS300_PanelTypeNS_2;
+-   SiS_Pr->SiS_CHTVUNTSCDesData = (SiS_LVDSDesStruct *)SiS300_CHTVUNTSCDesData;
+-   SiS_Pr->SiS_CHTVONTSCDesData = (SiS_LVDSDesStruct *)SiS300_CHTVONTSCDesData;
+-   SiS_Pr->SiS_CHTVUPALDesData  = (SiS_LVDSDesStruct *)SiS300_CHTVUPALDesData;
+-   SiS_Pr->SiS_CHTVOPALDesData  = (SiS_LVDSDesStruct *)SiS300_CHTVOPALDesData;
++
++   if(SiS_Pr->SiS_CustomT == CUT_BARCO1366) {
++      SiS_Pr->SiS_PanelType04_1 = (SiS_LVDSDesStruct *)SiS300_PanelType04_1a;
++      SiS_Pr->SiS_PanelType04_2 = (SiS_LVDSDesStruct *)SiS300_PanelType04_2a;
++   }
++   if(SiS_Pr->SiS_CustomT == CUT_BARCO1024) {
++      SiS_Pr->SiS_PanelType04_1 = (SiS_LVDSDesStruct *)SiS300_PanelType04_1b;
++      SiS_Pr->SiS_PanelType04_2 = (SiS_LVDSDesStruct *)SiS300_PanelType04_2b;
++   }
++
+    SiS_Pr->SiS_LVDSCRT1800x600_1     = (SiS_LVDSCRT1DataStruct *)SiS300_LVDSCRT1800x600_1;
+    SiS_Pr->SiS_LVDSCRT11024x768_1    = (SiS_LVDSCRT1DataStruct *)SiS300_LVDSCRT11024x768_1;
+    SiS_Pr->SiS_LVDSCRT11280x1024_1   = (SiS_LVDSCRT1DataStruct *)SiS300_LVDSCRT11280x1024_1;
+-   SiS_Pr->SiS_LVDSCRT11024x600_1    = (SiS_LVDSCRT1DataStruct *)SiS300_LVDSCRT11024x600_1;
+-   SiS_Pr->SiS_LVDSCRT11152x768_1    = (SiS_LVDSCRT1DataStruct *)SiS300_LVDSCRT11152x768_1;
+    SiS_Pr->SiS_LVDSCRT1800x600_1_H   = (SiS_LVDSCRT1DataStruct *)SiS300_LVDSCRT1800x600_1_H;
+    SiS_Pr->SiS_LVDSCRT11024x768_1_H  = (SiS_LVDSCRT1DataStruct *)SiS300_LVDSCRT11024x768_1_H;
+    SiS_Pr->SiS_LVDSCRT11280x1024_1_H = (SiS_LVDSCRT1DataStruct *)SiS300_LVDSCRT11280x1024_1_H;
+-   SiS_Pr->SiS_LVDSCRT11024x600_1_H  = (SiS_LVDSCRT1DataStruct *)SiS300_LVDSCRT11024x600_1_H;
+-   SiS_Pr->SiS_LVDSCRT11152x768_1_H  = (SiS_LVDSCRT1DataStruct *)SiS300_LVDSCRT11152x768_1_H;
+    SiS_Pr->SiS_LVDSCRT1800x600_2     = (SiS_LVDSCRT1DataStruct *)SiS300_LVDSCRT1800x600_2;
+    SiS_Pr->SiS_LVDSCRT11024x768_2    = (SiS_LVDSCRT1DataStruct *)SiS300_LVDSCRT11024x768_2;
+    SiS_Pr->SiS_LVDSCRT11280x1024_2   = (SiS_LVDSCRT1DataStruct *)SiS300_LVDSCRT11280x1024_2;
+-   SiS_Pr->SiS_LVDSCRT11024x600_2    = (SiS_LVDSCRT1DataStruct *)SiS300_LVDSCRT11024x600_2;
+-   SiS_Pr->SiS_LVDSCRT11152x768_2    = (SiS_LVDSCRT1DataStruct *)SiS300_LVDSCRT11152x768_2;
+    SiS_Pr->SiS_LVDSCRT1800x600_2_H   = (SiS_LVDSCRT1DataStruct *)SiS300_LVDSCRT1800x600_2_H;
+    SiS_Pr->SiS_LVDSCRT11024x768_2_H  = (SiS_LVDSCRT1DataStruct *)SiS300_LVDSCRT11024x768_2_H;
+    SiS_Pr->SiS_LVDSCRT11280x1024_2_H = (SiS_LVDSCRT1DataStruct *)SiS300_LVDSCRT11280x1024_2_H;
+-   SiS_Pr->SiS_LVDSCRT11024x600_2_H  = (SiS_LVDSCRT1DataStruct *)SiS300_LVDSCRT11024x600_2_H;
+-   SiS_Pr->SiS_LVDSCRT11152x768_2_H  = (SiS_LVDSCRT1DataStruct *)SiS300_LVDSCRT11152x768_2_H;
+    SiS_Pr->SiS_CHTVCRT1UNTSC = (SiS_LVDSCRT1DataStruct *)SiS300_CHTVCRT1UNTSC;
+    SiS_Pr->SiS_CHTVCRT1ONTSC = (SiS_LVDSCRT1DataStruct *)SiS300_CHTVCRT1ONTSC;
+    SiS_Pr->SiS_CHTVCRT1UPAL  = (SiS_LVDSCRT1DataStruct *)SiS300_CHTVCRT1UPAL;
+@@ -339,7 +418,6 @@ InitTo300Pointer(SiS_Private *SiS_Pr, PS
+    SiS_Pr->SiS_CHTVVCLKOPALN = SiS300_CHTVVCLKOPAL;   /* not supported on 300 series */
+    SiS_Pr->SiS_CHTVVCLKSOPAL = SiS300_CHTVVCLKSOPAL;
+ 
+-   /* TW: New from 300/301LV BIOS */
+    SiS_Pr->SiS_CRT2Part2_1024x768_1  = (SiS_Part2PortTblStruct *)SiS300_CRT2Part2_1024x768_1;
+    SiS_Pr->SiS_CRT2Part2_1280x1024_1 = (SiS_Part2PortTblStruct *)SiS300_CRT2Part2_1280x1024_1;
+    SiS_Pr->SiS_CRT2Part2_1400x1050_1 = (SiS_Part2PortTblStruct *)SiS300_CRT2Part2_1400x1050_1;
+@@ -353,7 +431,7 @@ InitTo300Pointer(SiS_Private *SiS_Pr, PS
+    SiS_Pr->SiS_CRT2Part2_1400x1050_3 = (SiS_Part2PortTblStruct *)SiS300_CRT2Part2_1400x1050_3;
+    SiS_Pr->SiS_CRT2Part2_1600x1200_3 = (SiS_Part2PortTblStruct *)SiS300_CRT2Part2_1600x1200_3;
+ 
+-   /* TW: LCDResInfo will on 300 series be translated to 310/325 series definitions */
++   /* TW: LCDResInfo will on 300 series be translated to 315 series definitions */
+    SiS_Pr->SiS_Panel320x480   = Panel_320x480;
+    SiS_Pr->SiS_Panel640x480   = Panel_640x480;
+    SiS_Pr->SiS_Panel800x600   = Panel_800x600;
+@@ -362,13 +440,17 @@ InitTo300Pointer(SiS_Private *SiS_Pr, PS
+    SiS_Pr->SiS_Panel1280x960  = Panel_1280x960;
+    SiS_Pr->SiS_Panel1024x600  = Panel_1024x600;
+    SiS_Pr->SiS_Panel1152x768  = Panel_1152x768;
+-   SiS_Pr->SiS_Panel1600x1200 = 16;  		/* TW: Something illegal */
+-   SiS_Pr->SiS_Panel1400x1050 = 16;  		/* TW: Something illegal */
+-   SiS_Pr->SiS_Panel1152x864  = 16;   		/* TW: Something illegal */
+-   SiS_Pr->SiS_Panel1280x768  = 16;   		/* TW: Something illegal */
++   SiS_Pr->SiS_Panel1280x768  = Panel_1280x768;
++   SiS_Pr->SiS_Panel1600x1200 = 255;  		/* TW: Something illegal */
++   SiS_Pr->SiS_Panel1400x1050 = 255;  		/* TW: Something illegal */
++   SiS_Pr->SiS_Panel640x480_2 = 255;  		/* TW: Something illegal */
++   SiS_Pr->SiS_Panel640x480_3 = 255;  		/* TW: Something illegal */
++   SiS_Pr->SiS_Panel1152x864  = 255;   		/* TW: Something illegal */
+    SiS_Pr->SiS_PanelMax       = Panel_320x480;     /* TW: highest value */
+    SiS_Pr->SiS_PanelMinLVDS   = Panel_800x600;     /* TW: Lowest value LVDS */
+    SiS_Pr->SiS_PanelMin301    = Panel_1024x768;    /* TW: lowest value 301 */
++   SiS_Pr->SiS_PanelCustom    = Panel_Custom;
++   SiS_Pr->SiS_PanelBarco1366 = Panel_Barco1366;
+ }
+ #endif
+ 
+@@ -376,29 +458,33 @@ InitTo300Pointer(SiS_Private *SiS_Pr, PS
+ static void
+ InitTo310Pointer(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension)
+ {
++   InitCommonPointer(SiS_Pr, HwDeviceExtension);
++
+    SiS_Pr->SiS_SModeIDTable  = (SiS_StStruct *)SiS310_SModeIDTable;
+-   SiS_Pr->SiS_StandTable    = (SiS_StandTableStruct *)SiS310_StandTable;
+    SiS_Pr->SiS_EModeIDTable  = (SiS_ExtStruct *)SiS310_EModeIDTable;
+    SiS_Pr->SiS_RefIndex      = (SiS_Ext2Struct *)SiS310_RefIndex;
+    SiS_Pr->SiS_CRT1Table     = (SiS_CRT1TableStruct *)SiS310_CRT1Table;
+    /* TW: MCLK is different */
+-   if(HwDeviceExtension->jChipType == SIS_330) {
++#ifdef LINUXBIOS
++   if(HwDeviceExtension->jChipType >= SIS_660) {
++      SiS_Pr->SiS_MCLKData_0 = (SiS_MCLKDataStruct *)SiS310_MCLKData_0_660;  /* 660/760 */
++   } else if(HwDeviceExtension->jChipType == SIS_330) {
++#endif
+       SiS_Pr->SiS_MCLKData_0 = (SiS_MCLKDataStruct *)SiS310_MCLKData_0_330;  /* 330 */
++#ifdef LINUXBIOS
+    } else if(HwDeviceExtension->jChipType > SIS_315PRO) {
+       SiS_Pr->SiS_MCLKData_0 = (SiS_MCLKDataStruct *)SiS310_MCLKData_0_650;  /* 550, 650, 740 */
+    } else {
+       SiS_Pr->SiS_MCLKData_0 = (SiS_MCLKDataStruct *)SiS310_MCLKData_0_315;  /* 315 */
+    }
++#endif
+    SiS_Pr->SiS_MCLKData_1    = (SiS_MCLKDataStruct *)SiS310_MCLKData_1;
++#ifdef LINUXBIOS
+    SiS_Pr->SiS_ECLKData      = (SiS_ECLKDataStruct *)SiS310_ECLKData;
++#endif
+    SiS_Pr->SiS_VCLKData      = (SiS_VCLKDataStruct *)SiS310_VCLKData;
+    SiS_Pr->SiS_VBVCLKData    = (SiS_VBVCLKDataStruct *)SiS310_VBVCLKData;
+    SiS_Pr->SiS_ScreenOffset  = SiS310_ScreenOffset;
+-   SiS_Pr->SiS_StResInfo     = (SiS_StResInfoStruct *)SiS310_StResInfo;
+-   SiS_Pr->SiS_ModeResInfo   = (SiS_ModeResInfoStruct *)SiS310_ModeResInfo;
+-
+-   SiS_Pr->pSiS_OutputSelect = &SiS310_OutputSelect;
+-   SiS_Pr->pSiS_SoftSetting  = &SiS310_SoftSetting;
+ 
+    SiS_Pr->SiS_SR15  = SiS310_SR15;
+ 
+@@ -427,16 +513,6 @@ InitTo310Pointer(SiS_Private *SiS_Pr, PS
+    SiS_Pr->pSiS_YCSenseData2    = &SiS310_YCSenseData2;
+ #endif
+ 
+-   SiS_Pr->SiS_NTSCPhase    = SiS310_NTSCPhase;
+-   SiS_Pr->SiS_PALPhase     = SiS310_PALPhase;
+-   SiS_Pr->SiS_NTSCPhase2   = SiS310_NTSCPhase2;
+-   SiS_Pr->SiS_PALPhase2    = SiS310_PALPhase2;
+-   SiS_Pr->SiS_PALMPhase    = SiS310_PALMPhase;
+-   SiS_Pr->SiS_PALNPhase    = SiS310_PALNPhase;
+-   SiS_Pr->SiS_PALMPhase2   = SiS310_PALMPhase2;
+-   SiS_Pr->SiS_PALNPhase2   = SiS310_PALNPhase2;
+-   SiS_Pr->SiS_SpecialPhase = SiS310_SpecialPhase;
+-
+    SiS_Pr->SiS_StLCD1024x768Data    = (SiS_LCDDataStruct *)SiS310_StLCD1024x768Data;
+    SiS_Pr->SiS_ExtLCD1024x768Data   = (SiS_LCDDataStruct *)SiS310_ExtLCD1024x768Data;
+    SiS_Pr->SiS_St2LCD1024x768Data   = (SiS_LCDDataStruct *)SiS310_St2LCD1024x768Data;
+@@ -445,62 +521,10 @@ InitTo310Pointer(SiS_Private *SiS_Pr, PS
+    SiS_Pr->SiS_St2LCD1280x1024Data  = (SiS_LCDDataStruct *)SiS310_St2LCD1280x1024Data;
+    SiS_Pr->SiS_NoScaleData1024x768  = (SiS_LCDDataStruct *)SiS310_NoScaleData1024x768;
+    SiS_Pr->SiS_NoScaleData1280x1024 = (SiS_LCDDataStruct *)SiS310_NoScaleData1280x1024;
+-   SiS_Pr->SiS_LCD1280x960Data      = (SiS_LCDDataStruct *)SiS310_LCD1280x960Data;
+-   SiS_Pr->SiS_ExtLCD1400x1050Data  = (SiS_LCDDataStruct *)SiS310_ExtLCD1400x1050Data;
+-   SiS_Pr->SiS_ExtLCD1600x1200Data  = (SiS_LCDDataStruct *)SiS310_ExtLCD1600x1200Data;
+-   SiS_Pr->SiS_StLCD1400x1050Data   = (SiS_LCDDataStruct *)SiS310_StLCD1400x1050Data;
+-   SiS_Pr->SiS_StLCD1600x1200Data   = (SiS_LCDDataStruct *)SiS310_StLCD1600x1200Data;
+-   SiS_Pr->SiS_NoScaleData1400x1050 = (SiS_LCDDataStruct *)SiS310_NoScaleData1400x1050;
+-   SiS_Pr->SiS_NoScaleData1600x1200 = (SiS_LCDDataStruct *)SiS310_NoScaleData1600x1200;
+-
+-   SiS_Pr->SiS_StPALData   = (SiS_TVDataStruct *)SiS310_StPALData;
+-   SiS_Pr->SiS_ExtPALData  = (SiS_TVDataStruct *)SiS310_ExtPALData;
+-   SiS_Pr->SiS_StNTSCData  = (SiS_TVDataStruct *)SiS310_StNTSCData;
+-   SiS_Pr->SiS_ExtNTSCData = (SiS_TVDataStruct *)SiS310_ExtNTSCData;
+-/* SiS_Pr->SiS_St1HiTVData = (SiS_TVDataStruct *)SiS310_St1HiTVData;  */
+-   SiS_Pr->SiS_St2HiTVData = (SiS_TVDataStruct *)SiS310_St2HiTVData;
+-   SiS_Pr->SiS_ExtHiTVData = (SiS_TVDataStruct *)SiS310_ExtHiTVData;
+-
+-   SiS_Pr->SiS_NTSCTiming     = SiS310_NTSCTiming;
+-   SiS_Pr->SiS_PALTiming      = SiS310_PALTiming;
+-   SiS_Pr->SiS_HiTVSt1Timing  = SiS310_HiTVSt1Timing;
+-   SiS_Pr->SiS_HiTVSt2Timing  = SiS310_HiTVSt2Timing;
+-   SiS_Pr->SiS_HiTVTextTiming = SiS310_HiTVTextTiming;
+-   SiS_Pr->SiS_HiTVExtTiming  = SiS310_HiTVExtTiming;
+-   SiS_Pr->SiS_HiTVGroup3Data = SiS310_HiTVGroup3Data;
+-   SiS_Pr->SiS_HiTVGroup3Simu = SiS310_HiTVGroup3Simu;
+-   SiS_Pr->SiS_HiTVGroup3Text = SiS310_HiTVGroup3Text;
+ 
+-   SiS_Pr->SiS_PanelDelayTbl = (SiS_PanelDelayTblStruct *)SiS310_PanelDelayTbl;
++   SiS_Pr->SiS_PanelDelayTbl     = (SiS_PanelDelayTblStruct *)SiS310_PanelDelayTbl;
+    SiS_Pr->SiS_PanelDelayTblLVDS = (SiS_PanelDelayTblStruct *)SiS310_PanelDelayTblLVDS;
+ 
+-   SiS_Pr->SiS_LVDS800x600Data_1   = (SiS_LVDSDataStruct *)SiS310_LVDS800x600Data_1;
+-   SiS_Pr->SiS_LVDS800x600Data_2   = (SiS_LVDSDataStruct *)SiS310_LVDS800x600Data_2;
+-   SiS_Pr->SiS_LVDS1024x768Data_1  = (SiS_LVDSDataStruct *)SiS310_LVDS1024x768Data_1;
+-   SiS_Pr->SiS_LVDS1024x768Data_2  = (SiS_LVDSDataStruct *)SiS310_LVDS1024x768Data_2;
+-   SiS_Pr->SiS_LVDS1280x1024Data_1 = (SiS_LVDSDataStruct *)SiS310_LVDS1280x1024Data_1;
+-   SiS_Pr->SiS_LVDS1280x1024Data_2 = (SiS_LVDSDataStruct *)SiS310_LVDS1280x1024Data_2;
+-   SiS_Pr->SiS_LVDS1280x960Data_1  = (SiS_LVDSDataStruct *)SiS310_LVDS1280x960Data_1;
+-   SiS_Pr->SiS_LVDS1280x960Data_2  = (SiS_LVDSDataStruct *)SiS310_LVDS1280x960Data_2;
+-   SiS_Pr->SiS_LVDS1400x1050Data_1 = (SiS_LVDSDataStruct *)SiS310_LVDS1400x1050Data_1;
+-   SiS_Pr->SiS_LVDS1400x1050Data_2 = (SiS_LVDSDataStruct *)SiS310_LVDS1400x1050Data_2;
+-   SiS_Pr->SiS_LVDS1600x1200Data_1 = (SiS_LVDSDataStruct *)SiS310_LVDS1600x1200Data_1;
+-   SiS_Pr->SiS_LVDS1600x1200Data_2 = (SiS_LVDSDataStruct *)SiS310_LVDS1600x1200Data_2;
+-   SiS_Pr->SiS_LVDS1280x768Data_1  = (SiS_LVDSDataStruct *)SiS310_LVDS1280x768Data_1;
+-   SiS_Pr->SiS_LVDS1280x768Data_2  = (SiS_LVDSDataStruct *)SiS310_LVDS1280x768Data_2;
+-   SiS_Pr->SiS_LVDS1024x600Data_1  = (SiS_LVDSDataStruct *)SiS310_LVDS1024x600Data_1;
+-   SiS_Pr->SiS_LVDS1024x600Data_2  = (SiS_LVDSDataStruct *)SiS310_LVDS1024x600Data_2;
+-   SiS_Pr->SiS_LVDS1152x768Data_1  = (SiS_LVDSDataStruct *)SiS310_LVDS1152x768Data_1;
+-   SiS_Pr->SiS_LVDS1152x768Data_2  = (SiS_LVDSDataStruct *)SiS310_LVDS1152x768Data_2;
+-   SiS_Pr->SiS_LVDSXXXxXXXData_1   = (SiS_LVDSDataStruct *)SiS310_LVDSXXXxXXXData_1;
+-   SiS_Pr->SiS_LVDS320x480Data_1   = (SiS_LVDSDataStruct *)SiS310_LVDS320x480Data_1;
+-   SiS_Pr->SiS_LVDS640x480Data_1   = (SiS_LVDSDataStruct *)SiS310_LVDS640x480Data_1;
+-   SiS_Pr->SiS_LCDA1400x1050Data_1  = (SiS_LVDSDataStruct *)SiS310_LCDA1400x1050Data_1;
+-   SiS_Pr->SiS_LCDA1400x1050Data_2  = (SiS_LVDSDataStruct *)SiS310_LCDA1400x1050Data_2;
+-   SiS_Pr->SiS_LCDA1600x1200Data_1  = (SiS_LVDSDataStruct *)SiS310_LCDA1600x1200Data_1;
+-   SiS_Pr->SiS_LCDA1600x1200Data_2  = (SiS_LVDSDataStruct *)SiS310_LCDA1600x1200Data_2;
+-   SiS_Pr->SiS_CHTVUNTSCData = (SiS_LVDSDataStruct *)SiS310_CHTVUNTSCData;
+-   SiS_Pr->SiS_CHTVONTSCData = (SiS_LVDSDataStruct *)SiS310_CHTVONTSCData;
+    SiS_Pr->SiS_CHTVUPALData  = (SiS_LVDSDataStruct *)SiS310_CHTVUPALData;
+    SiS_Pr->SiS_CHTVOPALData  = (SiS_LVDSDataStruct *)SiS310_CHTVOPALData;
+    SiS_Pr->SiS_CHTVUPALMData = (SiS_LVDSDataStruct *)SiS310_CHTVUPALMData;
+@@ -508,6 +532,7 @@ InitTo310Pointer(SiS_Private *SiS_Pr, PS
+    SiS_Pr->SiS_CHTVUPALNData = (SiS_LVDSDataStruct *)SiS310_CHTVUPALNData;
+    SiS_Pr->SiS_CHTVOPALNData = (SiS_LVDSDataStruct *)SiS310_CHTVOPALNData;
+    SiS_Pr->SiS_CHTVSOPALData = (SiS_LVDSDataStruct *)SiS310_CHTVSOPALData;
++
+    SiS_Pr->SiS_PanelType00_1 = (SiS_LVDSDesStruct *)SiS310_PanelType00_1;
+    SiS_Pr->SiS_PanelType01_1 = (SiS_LVDSDesStruct *)SiS310_PanelType01_1;
+    SiS_Pr->SiS_PanelType02_1 = (SiS_LVDSDesStruct *)SiS310_PanelType02_1;
+@@ -540,19 +565,7 @@ InitTo310Pointer(SiS_Private *SiS_Pr, PS
+    SiS_Pr->SiS_PanelType0d_2 = (SiS_LVDSDesStruct *)SiS310_PanelType0d_2;
+    SiS_Pr->SiS_PanelType0e_2 = (SiS_LVDSDesStruct *)SiS310_PanelType0e_2;
+    SiS_Pr->SiS_PanelType0f_2 = (SiS_LVDSDesStruct *)SiS310_PanelType0f_2;
+-   SiS_Pr->SiS_PanelTypeNS_1 = (SiS_LVDSDesStruct *)SiS310_PanelTypeNS_1;
+-   SiS_Pr->SiS_PanelTypeNS_2 = (SiS_LVDSDesStruct *)SiS310_PanelTypeNS_2;
+ 
+-   SiS_Pr->LVDS1024x768Des_1  = (SiS_LVDSDesStruct *)SiS310_PanelType1076_1;
+-   SiS_Pr->LVDS1280x1024Des_1 = (SiS_LVDSDesStruct *)SiS310_PanelType1210_1;
+-   SiS_Pr->LVDS1400x1050Des_1 = (SiS_LVDSDesStruct *)SiS310_PanelType1296_1 ;
+-   SiS_Pr->LVDS1600x1200Des_1 = (SiS_LVDSDesStruct *)SiS310_PanelType1600_1 ;
+-   SiS_Pr->LVDS1024x768Des_2  = (SiS_LVDSDesStruct *)SiS310_PanelType1076_2;
+-   SiS_Pr->LVDS1280x1024Des_2 = (SiS_LVDSDesStruct *)SiS310_PanelType1210_2;
+-   SiS_Pr->LVDS1400x1050Des_2 = (SiS_LVDSDesStruct *)SiS310_PanelType1296_2;
+-   SiS_Pr->LVDS1600x1200Des_2 = (SiS_LVDSDesStruct *)SiS310_PanelType1600_2 ;
+-
+-   /* TW: New from 650/301LV BIOS */
+    SiS_Pr->SiS_CRT2Part2_1024x768_1  = (SiS_Part2PortTblStruct *)SiS310_CRT2Part2_1024x768_1;
+    SiS_Pr->SiS_CRT2Part2_1280x1024_1 = (SiS_Part2PortTblStruct *)SiS310_CRT2Part2_1280x1024_1;
+    SiS_Pr->SiS_CRT2Part2_1400x1050_1 = (SiS_Part2PortTblStruct *)SiS310_CRT2Part2_1400x1050_1;
+@@ -566,51 +579,32 @@ InitTo310Pointer(SiS_Private *SiS_Pr, PS
+    SiS_Pr->SiS_CRT2Part2_1400x1050_3 = (SiS_Part2PortTblStruct *)SiS310_CRT2Part2_1400x1050_3;
+    SiS_Pr->SiS_CRT2Part2_1600x1200_3 = (SiS_Part2PortTblStruct *)SiS310_CRT2Part2_1600x1200_3;
+ 
+-   SiS_Pr->SiS_CHTVUNTSCDesData = (SiS_LVDSDesStruct *)SiS310_CHTVUNTSCDesData;
+-   SiS_Pr->SiS_CHTVONTSCDesData = (SiS_LVDSDesStruct *)SiS310_CHTVONTSCDesData;
+-   SiS_Pr->SiS_CHTVUPALDesData  = (SiS_LVDSDesStruct *)SiS310_CHTVUPALDesData;
+-   SiS_Pr->SiS_CHTVOPALDesData  = (SiS_LVDSDesStruct *)SiS310_CHTVOPALDesData;
+-
+    SiS_Pr->SiS_LVDSCRT1800x600_1     = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT1800x600_1;
+    SiS_Pr->SiS_LVDSCRT11024x768_1    = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT11024x768_1;
+    SiS_Pr->SiS_LVDSCRT11280x1024_1   = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT11280x1024_1;
+    SiS_Pr->SiS_LVDSCRT11400x1050_1   = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT11400x1050_1;
+-   SiS_Pr->SiS_LVDSCRT11280x768_1    = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT11280x768_1;
+-   SiS_Pr->SiS_LVDSCRT11024x600_1    = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT11024x600_1;
+-   SiS_Pr->SiS_LVDSCRT11152x768_1    = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT11152x768_1;
+    SiS_Pr->SiS_LVDSCRT11600x1200_1   = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT11600x1200_1;
+    SiS_Pr->SiS_LVDSCRT1800x600_1_H   = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT1800x600_1_H;
+    SiS_Pr->SiS_LVDSCRT11024x768_1_H  = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT11024x768_1_H;
+    SiS_Pr->SiS_LVDSCRT11280x1024_1_H = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT11280x1024_1_H;
+    SiS_Pr->SiS_LVDSCRT11400x1050_1_H = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT11400x1050_1_H;
+-   SiS_Pr->SiS_LVDSCRT11280x768_1_H  = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT11280x768_1_H;
+-   SiS_Pr->SiS_LVDSCRT11024x600_1_H  = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT11024x600_1_H;
+-   SiS_Pr->SiS_LVDSCRT11152x768_1_H  = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT11152x768_1_H;
+    SiS_Pr->SiS_LVDSCRT11600x1200_1_H = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT11600x1200_1_H;
+    SiS_Pr->SiS_LVDSCRT1800x600_2     = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT1800x600_2;
+    SiS_Pr->SiS_LVDSCRT11024x768_2    = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT11024x768_2;
+    SiS_Pr->SiS_LVDSCRT11280x1024_2   = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT11280x1024_2;
+    SiS_Pr->SiS_LVDSCRT11400x1050_2   = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT11400x1050_2;
+-   SiS_Pr->SiS_LVDSCRT11280x768_2    = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT11280x768_2;
+-   SiS_Pr->SiS_LVDSCRT11024x600_2    = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT11024x600_2;
+-   SiS_Pr->SiS_LVDSCRT11152x768_2    = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT11152x768_2;
+    SiS_Pr->SiS_LVDSCRT11600x1200_2   = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT11600x1200_2;
+    SiS_Pr->SiS_LVDSCRT1800x600_2_H   = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT1800x600_2_H;
+    SiS_Pr->SiS_LVDSCRT11024x768_2_H  = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT11024x768_2_H;
+    SiS_Pr->SiS_LVDSCRT11280x1024_2_H = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT11280x1024_2_H;
+    SiS_Pr->SiS_LVDSCRT11400x1050_2_H = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT11400x1050_2_H;
+-   SiS_Pr->SiS_LVDSCRT11280x768_2_H  = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT11280x768_2_H;
+-   SiS_Pr->SiS_LVDSCRT11024x600_2_H  = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT11024x600_2_H;
+-   SiS_Pr->SiS_LVDSCRT11152x768_2_H  = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT11152x768_2_H;
+    SiS_Pr->SiS_LVDSCRT11600x1200_2_H = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT11600x1200_2_H;
+-   SiS_Pr->SiS_LVDSCRT1XXXxXXX_1     = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT1XXXxXXX_1;
+-   SiS_Pr->SiS_LVDSCRT1XXXxXXX_1_H   = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT1XXXxXXX_1_H;
+-   SiS_Pr->SiS_LVDSCRT1320x480_1     = (SiS_LVDSCRT1DataStruct *)SiS310_LVDSCRT1320x480_1;
+-   SiS_Pr->SiS_CHTVCRT1UNTSC = (SiS_LVDSCRT1DataStruct *)SiS310_CHTVCRT1UNTSC;
+-   SiS_Pr->SiS_CHTVCRT1ONTSC = (SiS_LVDSCRT1DataStruct *)SiS310_CHTVCRT1ONTSC;
+-   SiS_Pr->SiS_CHTVCRT1UPAL  = (SiS_LVDSCRT1DataStruct *)SiS310_CHTVCRT1UPAL;
+-   SiS_Pr->SiS_CHTVCRT1OPAL  = (SiS_LVDSCRT1DataStruct *)SiS310_CHTVCRT1OPAL;
+-   SiS_Pr->SiS_CHTVCRT1SOPAL = (SiS_LVDSCRT1DataStruct *)SiS310_CHTVCRT1SOPAL;
++   SiS_Pr->SiS_CHTVCRT1UNTSC         = (SiS_LVDSCRT1DataStruct *)SiS310_CHTVCRT1UNTSC;
++   SiS_Pr->SiS_CHTVCRT1ONTSC         = (SiS_LVDSCRT1DataStruct *)SiS310_CHTVCRT1ONTSC;
++   SiS_Pr->SiS_CHTVCRT1UPAL          = (SiS_LVDSCRT1DataStruct *)SiS310_CHTVCRT1UPAL;
++   SiS_Pr->SiS_CHTVCRT1OPAL          = (SiS_LVDSCRT1DataStruct *)SiS310_CHTVCRT1OPAL;
++   SiS_Pr->SiS_CHTVCRT1SOPAL         = (SiS_LVDSCRT1DataStruct *)SiS310_CHTVCRT1SOPAL;
++
+    SiS_Pr->SiS_CHTVReg_UNTSC = (SiS_CHTVRegDataStruct *)SiS310_CHTVReg_UNTSC;
+    SiS_Pr->SiS_CHTVReg_ONTSC = (SiS_CHTVRegDataStruct *)SiS310_CHTVReg_ONTSC;
+    SiS_Pr->SiS_CHTVReg_UPAL  = (SiS_CHTVRegDataStruct *)SiS310_CHTVReg_UPAL;
+@@ -620,6 +614,7 @@ InitTo310Pointer(SiS_Private *SiS_Pr, PS
+    SiS_Pr->SiS_CHTVReg_UPALN = (SiS_CHTVRegDataStruct *)SiS310_CHTVReg_UPALN;
+    SiS_Pr->SiS_CHTVReg_OPALN = (SiS_CHTVRegDataStruct *)SiS310_CHTVReg_OPALN;
+    SiS_Pr->SiS_CHTVReg_SOPAL = (SiS_CHTVRegDataStruct *)SiS310_CHTVReg_SOPAL;
++
+    SiS_Pr->SiS_LCDACRT1800x600_1     = (SiS_LCDACRT1DataStruct *)SiS310_LCDACRT1800x600_1;
+    SiS_Pr->SiS_LCDACRT11024x768_1    = (SiS_LCDACRT1DataStruct *)SiS310_LCDACRT11024x768_1;
+    SiS_Pr->SiS_LCDACRT11280x1024_1   = (SiS_LCDACRT1DataStruct *)SiS310_LCDACRT11280x1024_1;
+@@ -640,6 +635,7 @@ InitTo310Pointer(SiS_Private *SiS_Pr, PS
+    SiS_Pr->SiS_LCDACRT11280x1024_2_H = (SiS_LCDACRT1DataStruct *)SiS310_LCDACRT11280x1024_2_H;
+    SiS_Pr->SiS_LCDACRT11400x1050_2_H = (SiS_LCDACRT1DataStruct *)SiS310_LCDACRT11400x1050_2_H;
+    SiS_Pr->SiS_LCDACRT11600x1200_2_H = (SiS_LCDACRT1DataStruct *)SiS310_LCDACRT11600x1200_2_H;
++
+    SiS_Pr->SiS_CHTVVCLKUNTSC = SiS310_CHTVVCLKUNTSC;
+    SiS_Pr->SiS_CHTVVCLKONTSC = SiS310_CHTVVCLKONTSC;
+    SiS_Pr->SiS_CHTVVCLKUPAL  = SiS310_CHTVVCLKUPAL;
+@@ -662,9 +658,13 @@ InitTo310Pointer(SiS_Private *SiS_Pr, PS
+    SiS_Pr->SiS_Panel1152x864  = Panel_1152x864;
+    SiS_Pr->SiS_Panel1280x768  = Panel_1280x768;
+    SiS_Pr->SiS_Panel1024x600  = Panel_1024x600;
++   SiS_Pr->SiS_Panel640x480_2 = Panel_640x480_2;
++   SiS_Pr->SiS_Panel640x480_3 = Panel_640x480_3;
+    SiS_Pr->SiS_PanelMax       = Panel_320x480;    /* TW: highest value */
+    SiS_Pr->SiS_PanelMinLVDS   = Panel_800x600;    /* TW: lowest value LVDS/LCDA */
+    SiS_Pr->SiS_PanelMin301    = Panel_1024x768;   /* TW: lowest value 301 */
++   SiS_Pr->SiS_PanelCustom    = Panel_Custom;
++   SiS_Pr->SiS_PanelBarco1366 = 255;
+ }
+ #endif
+ 
+@@ -727,7 +727,9 @@ SiSInit(SiS_Private *SiS_Pr, PSIS_HW_DEV
+       (HwDeviceExtension->jChipType == SIS_550) ||
+       (HwDeviceExtension->jChipType == SIS_650) ||
+       (HwDeviceExtension->jChipType == SIS_740) ||
+-      (HwDeviceExtension->jChipType == SIS_330))
++      (HwDeviceExtension->jChipType == SIS_330) ||
++      (HwDeviceExtension->jChipType == SIS_660) ||
++      (HwDeviceExtension->jChipType == SIS_760))
+      InitTo310Pointer(SiS_Pr, HwDeviceExtension);
+ #endif
+ 
+@@ -896,7 +898,9 @@ SiSInit(SiS_Private *SiS_Pr, PSIS_HW_DEV
+       (HwDeviceExtension->jChipType == SIS_550) ||
+       (HwDeviceExtension->jChipType == SIS_650) ||
+       (HwDeviceExtension->jChipType == SIS_740) ||
+-      (HwDeviceExtension->jChipType == SIS_330)) {
++      (HwDeviceExtension->jChipType == SIS_330) ||
++      (HwDeviceExtension->jChipType == SIS_660) ||
++      (HwDeviceExtension->jChipType == SIS_760)) {
+    	for(i=0x12; i<=0x1B; i++) SiS_SetReg1(SiS_Pr->SiS_P3c4,i,0);
+    	for(i=0x79; i<=0x7C; i++) SiS_SetReg1(SiS_Pr->SiS_P3d4,i,0);
+    }
+@@ -953,14 +957,16 @@ SiSInit(SiS_Private *SiS_Pr, PSIS_HW_DEV
+    if((HwDeviceExtension->jChipType == SIS_315H)   ||
+       (HwDeviceExtension->jChipType == SIS_315)    ||
+       (HwDeviceExtension->jChipType == SIS_315PRO) ||
+-      (HwDeviceExtension->jChipType == SIS_330) ) {
++      (HwDeviceExtension->jChipType == SIS_330)) {
+       	if((*SiS_Pr->pSiS_SoftSetting & SoftDRAMType) == 0) {
+           	temp = (UCHAR)SiS_GetReg1(SiS_Pr->SiS_P3c4,0x3A) & 0x03;
+         }
+    }
+    if((HwDeviceExtension->jChipType == SIS_550) ||
+       (HwDeviceExtension->jChipType == SIS_740) ||
+-      (HwDeviceExtension->jChipType == SIS_650)) {
++      (HwDeviceExtension->jChipType == SIS_650) ||
++      (HwDeviceExtension->jChipType == SIS_660) ||
++      (HwDeviceExtension->jChipType == SIS_760)) {
+         if((*SiS_Pr->pSiS_SoftSetting & SoftDRAMType) == 0) {
+           	temp = (UCHAR)SiS_GetReg1(SiS_Pr->SiS_P3c4,0x13) & 0x07;
+         }
+@@ -977,7 +983,7 @@ SiSInit(SiS_Private *SiS_Pr, PSIS_HW_DEV
+    if((HwDeviceExtension->jChipType != SIS_540) &&
+       (HwDeviceExtension->jChipType != SIS_630) &&
+       (HwDeviceExtension->jChipType != SIS_730)){
+-     	for(i=0x15;i<0x1C;i++) {
++     	for(i=0x15; i<0x1C; i++) {
+        	    SiS_SetReg1(SiS_Pr->SiS_P3c4,i,SiS_Pr->SiS_SR15[i-0x15][SiS_Pr->SiS_RAMType]);
+      	}
+    }
+@@ -1023,7 +1029,9 @@ SiSInit(SiS_Private *SiS_Pr, PSIS_HW_DEV
+       (HwDeviceExtension->jChipType == SIS_550) ||
+       (HwDeviceExtension->jChipType == SIS_650) ||
+       (HwDeviceExtension->jChipType == SIS_740) ||
+-      (HwDeviceExtension->jChipType == SIS_330))
++      (HwDeviceExtension->jChipType == SIS_330) ||
++      (HwDeviceExtension->jChipType == SIS_660) ||
++      (HwDeviceExtension->jChipType == SIS_760))
+      	SiS_SetReg1(SiS_Pr->SiS_Part1Port,0x2E,0x08);    /* use VB */
+ #endif
+ 
+@@ -1180,7 +1188,9 @@ SiS_Set_LVDS_TRUMPION(SiS_Private *SiS_P
+ #ifdef SIS315H
+   if((HwDeviceExtension->jChipType == SIS_650) ||
+      (HwDeviceExtension->jChipType == SIS_740) ||
+-     (HwDeviceExtension->jChipType == SIS_330)) {
++     (HwDeviceExtension->jChipType == SIS_330) ||
++     (HwDeviceExtension->jChipType == SIS_660) ||
++     (HwDeviceExtension->jChipType == SIS_760)) {
+ #if 0 /* TW: This is not required */
+         /* TW: Read POWER_ON_TRAP and copy to CR37 */
+     	temp = (UCHAR)SiS_GetReg1(SiS_Pr->SiS_P3c4,0x1A);
+@@ -1299,7 +1309,7 @@ SiS_ChkBUSWidth_300(SiS_Private *SiS_Pr,
+ #endif
+ /* ===============  SiS 300 dram sizing end    =============== */
+ 
+-/* ============  SiS 310/325 dram sizing begin  ============== */
++/* ============  SiS 315 dram sizing begin  ============== */
+ #ifdef SIS315H
+ 
+ /* TW: Moved Get310DRAMType further down */
+@@ -1893,8 +1903,7 @@ SiS_Get310DRAMType(SiS_Private *SiS_Pr, 
+    if(*SiS_Pr->pSiS_SoftSetting & SoftDRAMType) {
+      data = *SiS_Pr->pSiS_SoftSetting & 0x03;
+    } else {
+-     if((HwDeviceExtension->jChipType > SIS_315PRO) &&
+-        (HwDeviceExtension->jChipType < SIS_330)) {
++     if(IS_SIS550650740660) {
+         data = SiS_GetReg1(SiS_Pr->SiS_P3c4,0x13) & 0x07;
+      } else {	/* TW: 315, 330 */
+         data = SiS_GetReg1(SiS_Pr->SiS_P3c4,0x3a) & 0x03;
+@@ -1934,13 +1943,17 @@ void SiSRegInit(SiS_Private *SiS_Pr, USH
+    SiS_Pr->SiS_P3c7 = BaseAddr + 0x17;
+    SiS_Pr->SiS_P3c8 = BaseAddr + 0x18;
+    SiS_Pr->SiS_P3c9 = BaseAddr + 0x19;
+-   SiS_Pr->SiS_P3da = BaseAddr + 0x2A;
+-   SiS_Pr->SiS_Part1Port = BaseAddr + SIS_CRT2_PORT_04;   /* Digital video interface registers (LCD) */
+-   SiS_Pr->SiS_Part2Port = BaseAddr + SIS_CRT2_PORT_10;   /* 301 TV Encoder registers */
+-   SiS_Pr->SiS_Part3Port = BaseAddr + SIS_CRT2_PORT_12;   /* 301 Macrovision registers */
+-   SiS_Pr->SiS_Part4Port = BaseAddr + SIS_CRT2_PORT_14;   /* 301 VGA2 (and LCD) registers */
+-   SiS_Pr->SiS_Part5Port = BaseAddr + SIS_CRT2_PORT_14+2; /* 301 palette address port registers */
+-   SiS_Pr->SiS_DDC_Port = BaseAddr + 0x14;                /* DDC Port ( = P3C4, SR11/0A) */
++   SiS_Pr->SiS_P3cb = BaseAddr + 0x1b;
++   SiS_Pr->SiS_P3cd = BaseAddr + 0x1d;
++   SiS_Pr->SiS_P3da = BaseAddr + 0x2a;
++   SiS_Pr->SiS_Part1Port = BaseAddr + SIS_CRT2_PORT_04;     /* Digital video interface registers (LCD) */
++   SiS_Pr->SiS_Part2Port = BaseAddr + SIS_CRT2_PORT_10;     /* 301 TV Encoder registers */
++   SiS_Pr->SiS_Part3Port = BaseAddr + SIS_CRT2_PORT_12;     /* 301 Macrovision registers */
++   SiS_Pr->SiS_Part4Port = BaseAddr + SIS_CRT2_PORT_14;     /* 301 VGA2 (and LCD) registers */
++   SiS_Pr->SiS_Part5Port = BaseAddr + SIS_CRT2_PORT_14 + 2; /* 301 palette address port registers */
++   SiS_Pr->SiS_DDC_Port = BaseAddr + 0x14;                  /* DDC Port ( = P3C4, SR11/0A) */
++   SiS_Pr->SiS_VidCapt = BaseAddr + SIS_VIDEO_CAPTURE;
++   SiS_Pr->SiS_VidPlay = BaseAddr + SIS_VIDEO_PLAYBACK;
+ }
+ 
+ void
+@@ -1965,7 +1978,9 @@ SiSInitPCIetc(SiS_Private *SiS_Pr, PSIS_
+       (HwDeviceExtension->jChipType == SIS_550) ||
+       (HwDeviceExtension->jChipType == SIS_650) ||
+       (HwDeviceExtension->jChipType == SIS_740) ||
+-      (HwDeviceExtension->jChipType == SIS_330)) {
++      (HwDeviceExtension->jChipType == SIS_330) ||
++      (HwDeviceExtension->jChipType == SIS_660) ||
++      (HwDeviceExtension->jChipType == SIS_760)) {
+       /* TW: This seems to be done the same way on these chipsets */
+       SiS_SetReg1(SiS_Pr->SiS_P3c4,0x20,0xa1);
+       SiS_SetRegANDOR(SiS_Pr->SiS_P3c4,0x1E,0xFF,0x5A);
+@@ -1987,10 +2002,14 @@ SiSSetLVDSetc(SiS_Private *SiS_Pr, PSIS_
+ 
+    SiS_Pr->SiS_ChrontelInit = 0;
+ 
+-   if((ModeNo == 0x5a) || (ModeNo == 0x5b)) {
+-   	SiS_Pr->SiS_IF_DEF_DSTN = 1;   /* for 550 dstn */
+-   	SiS_Pr->SiS_IF_DEF_FSTN = 1;   /* for fstn */
++#if 0
++   if(HwDeviceExtension->jChipType >= SIS_315H) {
++      if((ModeNo == 0x5a) || (ModeNo == 0x5b)) {
++   	 SiS_Pr->SiS_IF_DEF_DSTN = 1;   /* for 550 dstn */
++   	 SiS_Pr->SiS_IF_DEF_FSTN = 1;   /* for fstn */
++      }
+    }
++#endif
+ 
+ #ifdef SIS300
+    if((HwDeviceExtension->jChipType == SIS_540) ||
+@@ -2015,11 +2034,15 @@ SiSSetLVDSetc(SiS_Private *SiS_Pr, PSIS_
+    if((HwDeviceExtension->jChipType == SIS_550) ||
+       (HwDeviceExtension->jChipType == SIS_650) ||
+       (HwDeviceExtension->jChipType == SIS_740) ||
+-      (HwDeviceExtension->jChipType == SIS_330))
++      (HwDeviceExtension->jChipType == SIS_330) ||
++      (HwDeviceExtension->jChipType == SIS_660) ||
++      (HwDeviceExtension->jChipType == SIS_760))
+     {
+-        /* TW: CR37 is different on 310/325 series */
++        /* TW: CR37 is different on 315 series */
++#if 0
+         if(SiS_Pr->SiS_IF_DEF_FSTN)                       /* fstn: set CR37=0x04 */
+              SiS_SetReg1(SiS_Pr->SiS_P3d4,0x37,0x04);      /* (fake LVDS bridge) */
++#endif
+ 
+ 	temp=SiS_GetReg1(SiS_Pr->SiS_P3d4,0x37);
+       	temp = (temp & 0x0E) >> 1;
+@@ -2044,7 +2067,9 @@ SiSInitPtr(SiS_Private *SiS_Pr, PSIS_HW_
+       (HwDeviceExtension->jChipType == SIS_550) ||
+       (HwDeviceExtension->jChipType == SIS_650) ||
+       (HwDeviceExtension->jChipType == SIS_740) ||
+-      (HwDeviceExtension->jChipType == SIS_330))
++      (HwDeviceExtension->jChipType == SIS_330) ||
++      (HwDeviceExtension->jChipType == SIS_660) ||
++      (HwDeviceExtension->jChipType == SIS_760))
+      InitTo310Pointer(SiS_Pr, HwDeviceExtension);
+ #endif
+ 
+@@ -2073,14 +2098,21 @@ SiSDetermineROMUsage(SiS_Private *SiS_Pr
+ 	      SiS_Pr->SiS_UseROM = TRUE;
+ 	 else SiS_Pr->SiS_UseROM = FALSE;
+      } else if(HwDeviceExtension->jChipType < SIS_315H) {
++#if 0
+         /* TW: Rest of 300 series: We don't use the ROM image if
+ 	 *     the BIOS version < 2.0.0 as such old BIOSes don't
+ 	 *     have the needed data at the expected locations.
+ 	 */
+         if(ROMAddr[0x06] < '2')  SiS_Pr->SiS_UseROM = FALSE;
+ 	else                     SiS_Pr->SiS_UseROM = TRUE;
++#else
++	/* Sony's VAIO BIOS 1.09 follows the standard, so perhaps
++	 * the others do as well
++	 */
++	SiS_Pr->SiS_UseROM = TRUE;
++#endif
+      } else {
+-        /* TW: 310/325/330 series stick to the standard */
++        /* TW: 315/330 series stick to the standard */
+ 	SiS_Pr->SiS_UseROM = TRUE;
+      }
+    } else SiS_Pr->SiS_UseROM = FALSE;
+@@ -2104,24 +2136,27 @@ SiSBIOSSetMode(SiS_Private *SiS_Pr, PSIS
+    SiS_Pr->UseCustomMode = FALSE;
+ 
+    if((IsCustom) && (SiS_CheckBuildCustomMode(pScrn, mode, pSiS->VBFlags))) {
+-   
+-         xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3, "Setting custom mode %dx%d\n", 
+-	 	SiS_Pr->CHDisplay, SiS_Pr->CVDisplay);
+-		
++
++         xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3, "Setting custom mode %dx%d\n",
++	 	SiS_Pr->CHDisplay,
++		(mode->Flags & V_INTERLACE ? SiS_Pr->CVDisplay * 2 :
++		   (mode->Flags & V_DBLSCAN ? SiS_Pr->CVDisplay / 2 :
++		      SiS_Pr->CVDisplay)));
++
+ 	 return(SiSSetMode(SiS_Pr, HwDeviceExtension, pScrn, ModeNo, TRUE));
+-   
++
+    }
+-   
+-   ModeNo = SiS_CalcModeIndex(pScrn, mode);
++
++   ModeNo = SiS_CalcModeIndex(pScrn, mode, pSiS->HaveCustomModes);
+    if(!ModeNo) return FALSE;
+ 
+-   xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3, "Setting mode 0x%x\n", ModeNo);
++   xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3, "Setting standard mode 0x%x\n", ModeNo);
+ 
+-   return(SiSSetMode(SiS_Pr, HwDeviceExtension, pScrn, ModeNo, TRUE));   
++   return(SiSSetMode(SiS_Pr, HwDeviceExtension, pScrn, ModeNo, TRUE));
+ }
+ 
+ #ifdef SISDUALHEAD
+-/* TW: Set CRT1 mode (used for dual head) */
++/* TW: Set CRT1 mode (used for dual head and MergedFB) */
+ BOOLEAN
+ SiSBIOSSetModeCRT1(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension, ScrnInfoPtr pScrn,
+                DisplayModePtr mode, BOOLEAN IsCustom)
+@@ -2134,31 +2169,37 @@ SiSBIOSSetModeCRT1(SiS_Private *SiS_Pr, 
+    SISEntPtr pSiSEnt = pSiS->entityPrivate;
+    unsigned char backupreg=0;
+    BOOLEAN backupcustom;
+-
+    UShort  ModeNo=0;
+    
+    SiS_Pr->UseCustomMode = FALSE;
+-   
++
+    if((IsCustom) && (SiS_CheckBuildCustomMode(pScrn, mode, pSiS->VBFlags))) {
+-   
++
++         USHORT temptemp = SiS_Pr->CVDisplay;
++
++         if(SiS_Pr->CModeFlag & DoubleScanMode)     temptemp >>= 1;
++         else if(SiS_Pr->CInfoFlag & InterlaceMode) temptemp <<= 1;
++
+          xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
+-	 	"Setting custom mode %dx%d in CRT1\n", 
+-	 	SiS_Pr->CHDisplay, SiS_Pr->CVDisplay);
++	 	"Setting custom mode %dx%d on CRT1\n",
++	 	SiS_Pr->CHDisplay, temptemp);
+ 	 ModeNo = 0xfe;
+-	 
++
+    } else {
+ 
+-         ModeNo = SiS_CalcModeIndex(pScrn, mode);
++         ModeNo = SiS_CalcModeIndex(pScrn, mode, pSiS->HaveCustomModes);
+          if(!ModeNo) return FALSE;
+ 
+          xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
+-	 	"Setting mode 0x%x on CRT1\n", ModeNo);
++	 	"Setting standard mode 0x%x on CRT1\n", ModeNo);
+    }
+ 
+    SiSInitPtr(SiS_Pr, HwDeviceExtension);
+ 
+    SiSRegInit(SiS_Pr, BaseAddr);
+ 
++   SiS_GetSysFlags(SiS_Pr, HwDeviceExtension);
++
+    SiS_Pr->SiS_VGAINFO = SiS_GetSetBIOSScratch(pScrn, 0x489, 0xff);
+ 
+    SiSInitPCIetc(SiS_Pr, HwDeviceExtension);
+@@ -2167,7 +2208,7 @@ SiSBIOSSetModeCRT1(SiS_Private *SiS_Pr, 
+ 
+    SiSDetermineROMUsage(SiS_Pr, HwDeviceExtension, ROMAddr);
+ 
+-   /* TW: We don't clear the buffer under X */
++   /* We don't clear the buffer under X */
+    SiS_Pr->SiS_flag_clearbuffer = 0;
+ 
+    /* 1.Openkey */
+@@ -2175,8 +2216,8 @@ SiSBIOSSetModeCRT1(SiS_Private *SiS_Pr, 
+ 
+    SiS_UnLockCRT2(SiS_Pr, HwDeviceExtension, BaseAddr);
+ 
++   /* 2.Get ModeID Table  */
+    if(!SiS_Pr->UseCustomMode) {
+-      /* 2.Get ModeID Table  */
+       temp = SiS_SearchModeID(SiS_Pr, ROMAddr,&ModeNo,&ModeIdIndex);
+       if(temp == 0)  return(0);
+    } else {
+@@ -2201,53 +2242,65 @@ SiSBIOSSetModeCRT1(SiS_Private *SiS_Pr, 
+    SiS_GetLCDResInfo(SiS_Pr, ROMAddr,ModeNo,ModeIdIndex,HwDeviceExtension);
+ 
+    if(HwDeviceExtension->jChipType >= SIS_315H) {
+-      if(SiS_Pr->SiS_IF_DEF_LVDS == 1) {
+-         if(SiS_GetReg1(SiS_Pr->SiS_P3c4,0x17) & 0x08)  {
++      if(SiS_GetReg1(SiS_Pr->SiS_P3c4,0x17) & 0x08)  {
++         if(SiS_Pr->SiS_IF_DEF_LVDS == 1) {
+             if(ModeNo != 0x10)  SiS_Pr->SiS_SetFlag |= SetDOSMode;
++         } else if((IS_SIS651) && (SiS_Pr->SiS_VBType & VB_NoLCD)) {
++            SiS_Pr->SiS_SetFlag |= SetDOSMode;
+          }
+       }
+ 
+-      /* TW: New from 650/LV 1.10.6x */
+       if(IS_SIS650) {
+-          if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
+-	      SiS_SetRegAND(SiS_Pr->SiS_P3d4,0x51,0x1f);
+-	      SiS_SetRegAND(SiS_Pr->SiS_P3d4,0x56,0xe7);
+-	  }
++         if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
++	    SiS_SetRegAND(SiS_Pr->SiS_P3d4,0x51,0x1f);
++	    if(IS_SIS651) SiS_SetRegOR(SiS_Pr->SiS_P3d4,0x51,0x20);
++	    SiS_SetRegAND(SiS_Pr->SiS_P3d4,0x56,0xe7);
++	 }
+       }
+    }
+ 
+-   /* TW: Set mode on CRT1 */
++   /* Set mode on CRT1 */
+    SiS_SetCRT1Group(SiS_Pr, ROMAddr,HwDeviceExtension,ModeNo,ModeIdIndex,BaseAddr);
+ 
+-   pSiSEnt->CRT1ModeNo = ModeNo;
+-   pSiSEnt->CRT1DMode = mode;
+-
+-   /* TW: SetPitch: Adapt to virtual size & position */
++   /* SetPitch: Adapt to virtual size & position */
+    SiS_SetPitchCRT1(SiS_Pr, pScrn, BaseAddr);
+ 
++   if(pSiS->DualHeadMode) {
++      pSiSEnt->CRT1ModeNo = ModeNo;
++      pSiSEnt->CRT1DMode = mode;
++   }
++
++   if(SiS_Pr->UseCustomMode) {
++      SiS_Pr->CRT1UsesCustomMode = TRUE;
++      SiS_Pr->CSRClock_CRT1 = SiS_Pr->CSRClock;
++      SiS_Pr->CModeFlag_CRT1 = SiS_Pr->CModeFlag;
++   } else {
++      SiS_Pr->CRT1UsesCustomMode = FALSE;
++   }
++
+    /* We have to reset CRT2 if changing mode on CRT1 */
+-   if(pSiSEnt->CRT2ModeNo != -1) {
+-        xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
+-				"(Re-)Setting mode 0x%x on CRT2\n",
+-				pSiSEnt->CRT2ModeNo);
+-	backupcustom = SiS_Pr->UseCustomMode;
+-	if(SiS_Pr->UseCustomMode) {
+-	   SiS_Pr->CRT1UsesCustomMode = TRUE;
+-	} else {
+-	   SiS_Pr->CRT1UsesCustomMode = FALSE;
+-	}
+-	SiSBIOSSetModeCRT2(SiS_Pr, HwDeviceExtension, pSiSEnt->pScrn_1,
+-				pSiSEnt->CRT2DMode);
+-	SiS_Pr->UseCustomMode = backupcustom;
+-	SiS_Pr->CRT1UsesCustomMode = FALSE;
++   if(pSiS->DualHeadMode) {
++      if(pSiSEnt->CRT2ModeNo != -1) {
++         xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
++				"(Re-)Setting mode for CRT2\n");
++	 backupcustom = SiS_Pr->UseCustomMode;
++	 SiSBIOSSetModeCRT2(SiS_Pr, HwDeviceExtension, pSiSEnt->pScrn_1,
++			    pSiSEnt->CRT2DMode, pSiSEnt->CRT2IsCustom);
++	 SiS_Pr->UseCustomMode = backupcustom;
++      }
+    }
+-   
++
++   /* Warning: From here, the custom mode entries in SiS_Pr are
++    * possibly overwritten
++    */
++
+    SiS_HandleCRT1(SiS_Pr);
+ 
++   SiS_StrangeStuff(SiS_Pr, HwDeviceExtension);
++
+    SiS_DisplayOn(SiS_Pr);
+    SiS_SetReg3(SiS_Pr->SiS_P3c6,0xFF);
+ 
+-   /* TW: New from 650/LV 1.10.6x and 1.10.7w, 630/301B 2.06.50 */
+    if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
+       if(HwDeviceExtension->jChipType >= SIS_315H) {
+ 	 SiS_SetReg1(SiS_Pr->SiS_P3d4,0x38,backupreg);
+@@ -2266,7 +2319,7 @@ SiSBIOSSetModeCRT1(SiS_Private *SiS_Pr, 
+ /* TW: Set CRT2 mode (used for dual head) */
+ BOOLEAN
+ SiSBIOSSetModeCRT2(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension, ScrnInfoPtr pScrn,
+-               DisplayModePtr mode)
++               DisplayModePtr mode, BOOLEAN IsCustom)
+ {
+    ULONG   temp;
+    USHORT  ModeIdIndex;
+@@ -2276,16 +2329,52 @@ SiSBIOSSetModeCRT2(SiS_Private *SiS_Pr, 
+    SISPtr  pSiS     = SISPTR(pScrn);
+    SISEntPtr pSiSEnt = pSiS->entityPrivate;
+    unsigned char tempr1, tempr2, backupreg=0;
+-   
++
+    SiS_Pr->UseCustomMode = FALSE;
+-   
+-   ModeNo = SiS_CalcModeIndex(pScrn, mode);
+-   if(!ModeNo) return FALSE;
++
++   /* Remember: Custom modes for CRT2 are ONLY supported
++    * 		-) on 315/330 series,
++    *           -) on the 301 and 30xB, and
++    *           -) if CRT2 is LCD or VGA
++    */
++
++   if((IsCustom) && (SiS_CheckBuildCustomMode(pScrn, mode, pSiS->VBFlags))) {
++
++	 ModeNo = 0xfe;
++
++   } else {
++
++         BOOLEAN havecustommodes = pSiS->HaveCustomModes;
++
++#ifdef SISMERGED
++	 if(pSiS->MergedFB) havecustommodes = pSiS->HaveCustomModes2;
++#endif
++
++         ModeNo = SiS_CalcModeIndex(pScrn, mode, havecustommodes);
++         if(!ModeNo) return FALSE;
++
++   }
++
++   /* Save mode info so we can set it from within SetMode for CRT1 */
++   if(pSiS->DualHeadMode) {
++      pSiSEnt->CRT2ModeNo = ModeNo;
++      pSiSEnt->CRT2DMode = mode;
++      pSiSEnt->CRT2IsCustom = IsCustom;
++
++      /* We can't set CRT2 mode before CRT1 mode is set */
++      if(pSiSEnt->CRT1ModeNo == -1) {
++    	 xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
++		"Setting CRT2 mode delayed until after setting CRT1 mode\n");
++   	 return TRUE;
++      }
++   }
+ 
+    SiSInitPtr(SiS_Pr, HwDeviceExtension);
+ 
+    SiSRegInit(SiS_Pr, BaseAddr);
+ 
++   SiS_GetSysFlags(SiS_Pr, HwDeviceExtension);
++
+    SiS_Pr->SiS_VGAINFO = SiS_GetSetBIOSScratch(pScrn, 0x489, 0xff);
+ 
+    SiSInitPCIetc(SiS_Pr, HwDeviceExtension);
+@@ -2294,22 +2383,26 @@ SiSBIOSSetModeCRT2(SiS_Private *SiS_Pr, 
+ 
+    SiSDetermineROMUsage(SiS_Pr, HwDeviceExtension, ROMAddr);
+ 
+-   /* TW: We don't clear the buffer under X */
++   /* We don't clear the buffer under X */
+    SiS_Pr->SiS_flag_clearbuffer=0;
+ 
+-   /* TW: Save ModeNo so we can set it from within SetMode for CRT1 */
+-   pSiSEnt->CRT2ModeNo = ModeNo;
+-   pSiSEnt->CRT2DMode = mode;
+-
+-   /* TW: We can't set CRT2 mode before CRT1 mode is set */
+-   if(pSiSEnt->CRT1ModeNo == -1) {
+-   	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
+-		"Setting CRT2 mode delayed until after setting CRT1 mode\n");
+-   	return TRUE;
+-   }
++   if(SiS_Pr->UseCustomMode) {
++
++      USHORT temptemp = SiS_Pr->CVDisplay;
++
++      if(SiS_Pr->CModeFlag & DoubleScanMode)     temptemp >>= 1;
++      else if(SiS_Pr->CInfoFlag & InterlaceMode) temptemp <<= 1;
++
++      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
++	  "Setting custom mode %dx%d on CRT2\n",
++	  SiS_Pr->CHDisplay, temptemp);
+ 
+-   xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
+-   		"Setting mode 0x%x on CRT2\n", ModeNo);
++   } else {
++
++      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
++   	  "Setting standard mode 0x%x on CRT2\n", ModeNo);
++
++   }
+ 
+    /* 1.Openkey */
+    SiS_SetReg1(SiS_Pr->SiS_P3c4,0x05,0x86);
+@@ -2317,10 +2410,14 @@ SiSBIOSSetModeCRT2(SiS_Private *SiS_Pr, 
+    SiS_UnLockCRT2(SiS_Pr, HwDeviceExtension, BaseAddr);
+ 
+    /* 2.Get ModeID */
+-   temp = SiS_SearchModeID(SiS_Pr, ROMAddr,&ModeNo,&ModeIdIndex);
+-   if(temp == 0)  return(0);
++   if(!SiS_Pr->UseCustomMode) {
++      temp = SiS_SearchModeID(SiS_Pr, ROMAddr,&ModeNo,&ModeIdIndex);
++      if(temp == 0)  return(0);
++   } else {
++      ModeIdIndex = 0;
++   }
+ 
+-   /* TW: Determine VBType (301,301B,301LV,302B,302LV) */
++   /* Determine VBType (301,301B,301LV,302B,302LV) */
+    SiS_GetVBType(SiS_Pr, BaseAddr,HwDeviceExtension);
+ 
+    if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
+@@ -2343,15 +2440,22 @@ SiSBIOSSetModeCRT2(SiS_Private *SiS_Pr, 
+       }
+    }
+ 
+-   /* TW: Get VB information (connectors, connected devices) */
+-   SiS_GetVBInfo(SiS_Pr, BaseAddr,ROMAddr,ModeNo,ModeIdIndex,HwDeviceExtension,1);
++   /* Get VB information (connectors, connected devices) */
++   if(!SiS_Pr->UseCustomMode) {
++      SiS_GetVBInfo(SiS_Pr, BaseAddr,ROMAddr,ModeNo,ModeIdIndex,HwDeviceExtension,1);
++   } else {
++      /* If this is a custom mode, we don't check the modeflag for CRT2Mode */
++      SiS_GetVBInfo(SiS_Pr, BaseAddr,ROMAddr,ModeNo,ModeIdIndex,HwDeviceExtension,0);
++   }
+    SiS_SetHiVision(SiS_Pr, BaseAddr,HwDeviceExtension);
+    SiS_GetLCDResInfo(SiS_Pr, ROMAddr,ModeNo,ModeIdIndex,HwDeviceExtension);
+ 
+    if(HwDeviceExtension->jChipType >= SIS_315H) {
+-      if(SiS_Pr->SiS_IF_DEF_LVDS == 1) {
+-         if(SiS_GetReg1(SiS_Pr->SiS_P3c4,0x17) & 0x08)  {
++      if(SiS_GetReg1(SiS_Pr->SiS_P3c4,0x17) & 0x08)  {
++         if(SiS_Pr->SiS_IF_DEF_LVDS == 1) {
+             if(ModeNo != 0x10)  SiS_Pr->SiS_SetFlag |= SetDOSMode;
++         } else if((IS_SIS651) && (SiS_Pr->SiS_VBType & VB_NoLCD)) {
++            SiS_Pr->SiS_SetFlag |= SetDOSMode;
+          }
+       }
+    }
+@@ -2364,17 +2468,19 @@ SiSBIOSSetModeCRT2(SiS_Private *SiS_Pr, 
+      case VB_CHIP_302:
+      case VB_CHIP_302B:
+      case VB_CHIP_302LV:
+-        SiS_SetCRT2Group301(SiS_Pr, BaseAddr,ROMAddr,ModeNo,HwDeviceExtension);
++        SiS_SetCRT2Group(SiS_Pr, BaseAddr,ROMAddr,ModeNo,HwDeviceExtension);
+         break;
+      case VB_CHIP_UNKNOWN:
+-        if (SiS_Pr->SiS_IF_DEF_LVDS     == 1 ||
+-	    SiS_Pr->SiS_IF_DEF_CH70xx   != 0 ||
+-	    SiS_Pr->SiS_IF_DEF_TRUMPION != 0) {
+-             	SiS_SetCRT2Group301(SiS_Pr,BaseAddr,ROMAddr,ModeNo,HwDeviceExtension);
++        if(SiS_Pr->SiS_IF_DEF_LVDS     == 1 ||
++	   SiS_Pr->SiS_IF_DEF_CH70xx   != 0 ||
++	   SiS_Pr->SiS_IF_DEF_TRUMPION != 0) {
++           SiS_SetCRT2Group(SiS_Pr,BaseAddr,ROMAddr,ModeNo,HwDeviceExtension);
+   	}
+         break;
+    }
+ 
++   SiS_StrangeStuff(SiS_Pr, HwDeviceExtension);
++
+    SiS_DisplayOn(SiS_Pr);
+    SiS_SetReg3(SiS_Pr->SiS_P3c6,0xFF);
+ 
+@@ -2386,7 +2492,6 @@ SiSBIOSSetModeCRT2(SiS_Private *SiS_Pr, 
+       }
+    }
+ 
+-   /* TW: New from 650/LV 1.10.6x and 1.10.7w, 630 2.06.50 */
+    if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
+       if(HwDeviceExtension->jChipType >= SIS_315H) {
+ 	 if(SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) {
+@@ -2412,7 +2517,7 @@ SiSBIOSSetModeCRT2(SiS_Private *SiS_Pr, 
+       }
+    }
+ 
+-   /* TW: SetPitch: Adapt to virtual size & position */
++   /* SetPitch: Adapt to virtual size & position */
+    SiS_SetPitchCRT2(SiS_Pr, pScrn, BaseAddr);
+ 
+    return TRUE;
+@@ -2442,12 +2547,14 @@ SiSSetMode(SiS_Private *SiS_Pr, PSIS_HW_
+    
+    if(SiS_Pr->UseCustomMode) {
+       ModeNo = 0xfe;
+-   }      
+-   
++   }
++
+    SiSInitPtr(SiS_Pr, HwDeviceExtension);
+ 
+    SiSRegInit(SiS_Pr, BaseAddr);
+ 
++   SiS_GetSysFlags(SiS_Pr, HwDeviceExtension);
++
+ #ifdef LINUX_XF86
+    if(pScrn) SiS_Pr->SiS_VGAINFO = SiS_GetSetBIOSScratch(pScrn, 0x489, 0xff);
+    else
+@@ -2458,7 +2565,7 @@ SiSSetMode(SiS_Private *SiS_Pr, PSIS_HW_
+ #ifdef TWDEBUG
+    xf86DrvMsg(0, X_INFO, "VGAInfo 0x%02x\n", SiS_Pr->SiS_VGAINFO);
+ #endif
+-#endif	 	 
++#endif
+ 
+    SiSInitPCIetc(SiS_Pr, HwDeviceExtension);
+ 
+@@ -2469,10 +2576,10 @@ SiSSetMode(SiS_Private *SiS_Pr, PSIS_HW_
+    if(!SiS_Pr->UseCustomMode) {
+       /* TW: Shift the clear-buffer-bit away */
+       ModeNo = ((ModeNo & 0x80) << 8) | (ModeNo & 0x7f);
+-   }      
++   }
+ 
+ #ifdef LINUX_XF86
+-   /* TW: We never clear the buffer in X */
++   /* We never clear the buffer in X */
+    ModeNo |= 0x8000;
+ #endif
+ 
+@@ -2490,21 +2597,21 @@ SiSSetMode(SiS_Private *SiS_Pr, PSIS_HW_
+    SiS_UnLockCRT2(SiS_Pr, HwDeviceExtension, BaseAddr);
+ 
+    if(!SiS_Pr->UseCustomMode) {
+-   
++
+       /* 2.Get ModeID Table  */
+       temp = SiS_SearchModeID(SiS_Pr,ROMAddr,&ModeNo,&ModeIdIndex);
+       if(temp == 0) return(0);
+-      
++
+    } else {
+-   
++
+       ModeIdIndex = 0;
+-      
++
+    }
+-    
+-   /* TW: Determine VBType (301,301B,301LV,302B,302LV) */
++
++   /* Determine VBType (301,301B,301LV,302B,302LV) */
+    SiS_GetVBType(SiS_Pr,BaseAddr,HwDeviceExtension);
+ 
+-   /* TW: Init/restore some VB registers */
++   /* Init/restore some VB registers */
+    if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
+        if(HwDeviceExtension->jChipType >= SIS_315H) {
+          SiS_UnLockCRT2(SiS_Pr,HwDeviceExtension,BaseAddr);
+@@ -2525,8 +2632,12 @@ SiSSetMode(SiS_Private *SiS_Pr, PSIS_HW_
+        }
+    }
+    
+-   /* TW: Get VB information (connectors, connected devices) */
+-   SiS_GetVBInfo(SiS_Pr,BaseAddr,ROMAddr,ModeNo,ModeIdIndex,HwDeviceExtension,1);
++   /* Get VB information (connectors, connected devices) */
++   if(SiS_Pr->UseCustomMode) {
++      SiS_GetVBInfo(SiS_Pr,BaseAddr,ROMAddr,ModeNo,ModeIdIndex,HwDeviceExtension,0);
++   } else {
++      SiS_GetVBInfo(SiS_Pr,BaseAddr,ROMAddr,ModeNo,ModeIdIndex,HwDeviceExtension,1);
++   }
+    SiS_SetHiVision(SiS_Pr,BaseAddr,HwDeviceExtension);
+    SiS_GetLCDResInfo(SiS_Pr,ROMAddr,ModeNo,ModeIdIndex,HwDeviceExtension);
+ 
+@@ -2535,22 +2646,32 @@ SiSSetMode(SiS_Private *SiS_Pr, PSIS_HW_
+    if(!temp) return(0);
+ 
+    if(HwDeviceExtension->jChipType >= SIS_315H) {
+-      if(SiS_Pr->SiS_IF_DEF_LVDS == 1) {
+-         if(SiS_GetReg1(SiS_Pr->SiS_P3c4,0x17) & 0x08)  {
++      if(SiS_GetReg1(SiS_Pr->SiS_P3c4,0x17) & 0x08)  {
++         if(SiS_Pr->SiS_IF_DEF_LVDS == 1) {
+             if(ModeNo != 0x10)  SiS_Pr->SiS_SetFlag |= SetDOSMode;
++         } else if((IS_SIS651) && (SiS_Pr->SiS_VBType & VB_NoLCD)) {
++            SiS_Pr->SiS_SetFlag |= SetDOSMode;
+          }
+       }
+ 
+-      /* TW: New from 650/LV 1.10.6x; not in any BIOS for other chipsets */
+       if(IS_SIS650) {
+-          if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
+-	      SiS_SetRegAND(SiS_Pr->SiS_P3d4,0x51,0x1f);
+-	      SiS_SetRegAND(SiS_Pr->SiS_P3d4,0x56,0xe7);
+-	  }
++         if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
++	    SiS_SetRegAND(SiS_Pr->SiS_P3d4,0x51,0x1f);
++	    if(IS_SIS651) SiS_SetRegOR(SiS_Pr->SiS_P3d4,0x51,0x20);
++	    SiS_SetRegAND(SiS_Pr->SiS_P3d4,0x56,0xe7);
++	 }
+       }
+    }
+ 
+-   /* TW: Set mode on CRT1 */
++   if(SiS_Pr->UseCustomMode) {
++      SiS_Pr->CRT1UsesCustomMode = TRUE;
++      SiS_Pr->CSRClock_CRT1 = SiS_Pr->CSRClock;
++      SiS_Pr->CModeFlag_CRT1 = SiS_Pr->CModeFlag;
++   } else {
++      SiS_Pr->CRT1UsesCustomMode = FALSE;
++   }
++
++   /* Set mode on CRT1 */
+    if(SiS_Pr->SiS_VBInfo & (SetSimuScanMode | SetCRT2ToLCDA)) {
+    	SiS_SetCRT1Group(SiS_Pr,ROMAddr,HwDeviceExtension,ModeNo,ModeIdIndex,BaseAddr);
+    } else {
+@@ -2559,7 +2680,7 @@ SiSSetMode(SiS_Private *SiS_Pr, PSIS_HW_
+      }
+    }
+ 
+-   /* TW: Set mode on CRT2 */
++   /* Set mode on CRT2 */
+    if(SiS_Pr->SiS_VBInfo & (SetSimuScanMode | SwitchToCRT2 | SetCRT2ToLCDA)) {
+      switch (HwDeviceExtension->ujVBChipID) {
+      case VB_CHIP_301:
+@@ -2568,18 +2689,20 @@ SiSSetMode(SiS_Private *SiS_Pr, PSIS_HW_
+      case VB_CHIP_302:
+      case VB_CHIP_302B:
+      case VB_CHIP_302LV:
+-        SiS_SetCRT2Group301(SiS_Pr,BaseAddr,ROMAddr,ModeNo,HwDeviceExtension);
++        SiS_SetCRT2Group(SiS_Pr,BaseAddr,ROMAddr,ModeNo,HwDeviceExtension);
+         break;
+      case VB_CHIP_UNKNOWN:
+ 	if(SiS_Pr->SiS_IF_DEF_LVDS     == 1 ||
+ 	   SiS_Pr->SiS_IF_DEF_CH70xx   != 0 ||
+ 	   SiS_Pr->SiS_IF_DEF_TRUMPION != 0)
+-             	SiS_SetCRT2Group301(SiS_Pr,BaseAddr,ROMAddr,ModeNo,HwDeviceExtension);
++           SiS_SetCRT2Group(SiS_Pr,BaseAddr,ROMAddr,ModeNo,HwDeviceExtension);
+         break;
+      }
+    }
+    
+    SiS_HandleCRT1(SiS_Pr);
++
++   SiS_StrangeStuff(SiS_Pr, HwDeviceExtension);
+    
+    SiS_DisplayOn(SiS_Pr);
+    SiS_SetReg3(SiS_Pr->SiS_P3c6,0xFF);
+@@ -2592,7 +2715,6 @@ SiSSetMode(SiS_Private *SiS_Pr, PSIS_HW_
+       }
+    }
+ 
+-   /* TW: New from 650/LV 1.10.6x and 1.10.7w */
+    if(SiS_Pr->SiS_VBType & VB_SIS301BLV302BLV) {
+       if(HwDeviceExtension->jChipType >= SIS_315H) {
+ 	 if(SiS_IsVAMode(SiS_Pr,HwDeviceExtension, BaseAddr)) {
+@@ -2627,7 +2749,7 @@ SiSSetMode(SiS_Private *SiS_Pr, PSIS_HW_
+ 
+ #ifdef LINUX_XF86
+    if(pScrn) {
+-      /* TW: SetPitch: Adapt to virtual size & position */
++      /* SetPitch: Adapt to virtual size & position */
+       if((ModeNo > 0x13) && (dosetpitch)) {
+          SiS_SetPitch(SiS_Pr, pScrn, BaseAddr);
+       }
+@@ -2637,7 +2759,7 @@ SiSSetMode(SiS_Private *SiS_Pr, PSIS_HW_
+    }
+ #endif
+ 
+-#ifndef LINUX_XF86  /* TW: We never lock registers in XF86 */
++#ifndef LINUX_XF86  /* We never lock registers in XF86 */
+    if(KeepLockReg == 0xA1) SiS_SetReg1(SiS_Pr->SiS_P3c4,0x05,0x86);
+    else SiS_SetReg1(SiS_Pr->SiS_P3c4,0x05,0x00);
+ #endif
+@@ -2646,10 +2768,15 @@ SiSSetMode(SiS_Private *SiS_Pr, PSIS_HW_
+ }
+ 
+ void
+-SiS_SetEnableDstn(SiS_Private *SiS_Pr)	/* TW: Called from sis_main.c */
++SiS_SetEnableDstn(SiS_Private *SiS_Pr, int enable)
++{
++   SiS_Pr->SiS_IF_DEF_DSTN = enable ? 1 : 0;
++}
++
++void
++SiS_SetEnableFstn(SiS_Private *SiS_Pr, int enable)
+ {
+-   /* For 550 dstn */
+-   SiS_Pr->SiS_IF_DEF_DSTN = 1;
++   SiS_Pr->SiS_IF_DEF_FSTN = enable ? 1 : 0;
+ }
+ 
+ void
+@@ -2663,13 +2790,73 @@ SiS_HandleCRT1(SiS_Private *SiS_Pr)
+   SiS_SetRegAND(SiS_Pr->SiS_P3d4,0x63,0xbf);
+ 
+ #if 0
+-  if(!(SiS_GetReg1(SiS_Pr->SiS_P3c4,0x15) & 0x01))
+-     SiS_SetRegOR(SiS_Pr->SiS_P3d4,0x63,0x40);
++  if(!(SiS_GetReg1(SiS_Pr->SiS_P3c4,0x15) & 0x01)) {
++     if((SiS_GetReg1(SiS_Pr->SiS_P3c4,0x15) & 0x0a) ||
++        (SiS_GetReg1(SiS_Pr->SiS_P3c4,0x16) & 0x01)) {
++        SiS_SetRegOR(SiS_Pr->SiS_P3d4,0x63,0x40);
++     }
+   }
+ #endif
+ }
+ 
+ void
++SiS_GetSysFlags(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension)
++{
++   unsigned char cr5f, temp1, temp2;
++
++   /* You should use the macros, not these flags directly */
++
++   SiS_Pr->SiS_SysFlags = 0;
++   if(HwDeviceExtension->jChipType == SIS_650) {
++      cr5f = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x5f) & 0xf0;
++      SiS_SetRegAND(SiS_Pr->SiS_P3d4,0x5c,0x07);
++      temp1 = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x5c) & 0xf8;
++      SiS_SetRegOR(SiS_Pr->SiS_P3d4,0x5c,0xf8);
++      temp2 = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x5c) & 0xf8;
++      if((!temp1) || (temp2)) {
++         switch(cr5f) {
++	    case 0x80:
++	    case 0x90:
++	    case 0xc0:
++	       SiS_Pr->SiS_SysFlags |= SF_IsM650;  break;
++	    case 0xa0:
++	    case 0xb0:
++	    case 0xe0:
++	       SiS_Pr->SiS_SysFlags |= SF_Is651;   break;
++	 }
++      } else {
++         switch(cr5f) {
++	    case 0x90:
++	       temp1 = SiS_GetReg1(SiS_Pr->SiS_P3d4,0x5c) & 0xf8;
++	       switch(temp1) {
++	          case 0x00: SiS_Pr->SiS_SysFlags |= SF_IsM652; break;
++		  case 0x40: SiS_Pr->SiS_SysFlags |= SF_IsM653; break;
++		  default:   SiS_Pr->SiS_SysFlags |= SF_IsM650; break;
++	       }
++	       break;
++	    case 0xb0:
++	       SiS_Pr->SiS_SysFlags |= SF_Is652;  break;
++	    default:
++	       SiS_Pr->SiS_SysFlags |= SF_IsM650; break;
++	 }
++      }
++   }
++}
++
++void
++SiS_StrangeStuff(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension)
++{
++   if((IS_SIS651) || (IS_SISM650)) {
++      SiS_SetReg1(SiS_Pr->SiS_VidCapt, 0x3f, 0x00);   /* Fiddle with capture regs */
++      SiS_SetReg1(SiS_Pr->SiS_VidCapt, 0x00, 0x00);
++      SiS_SetReg1(SiS_Pr->SiS_VidPlay, 0x00, 0x86);   /* (BIOS does NOT unlock) */
++      SiS_SetRegAND(SiS_Pr->SiS_VidPlay, 0x30, 0xfe); /* Fiddle with video regs */
++      SiS_SetRegAND(SiS_Pr->SiS_VidPlay, 0x3f, 0xef);
++   }
++   /* !!! This does not support modes < 0x13 !!! */
++}
++
++void
+ SiS_SetCRT1Group(SiS_Private *SiS_Pr, UCHAR *ROMAddr,PSIS_HW_DEVICE_INFO HwDeviceExtension,
+                  USHORT ModeNo,USHORT ModeIdIndex,USHORT BaseAddr)
+ {
+@@ -2683,6 +2870,9 @@ SiS_SetCRT1Group(SiS_Private *SiS_Pr, UC
+     }
+   }
+ 
++  /* 550, 651 */
++  SiS_WhatTheHellIsThis(SiS_Pr,HwDeviceExtension,BaseAddr);
++
+   SiS_SetSeqRegs(SiS_Pr,ROMAddr,StandTableIndex);
+   SiS_SetMiscRegs(SiS_Pr,ROMAddr,StandTableIndex);
+   SiS_SetCRTCRegs(SiS_Pr,ROMAddr,HwDeviceExtension,StandTableIndex);
+@@ -2759,15 +2949,20 @@ void
+ SiS_SetPitch(SiS_Private *SiS_Pr, ScrnInfoPtr pScrn, UShort BaseAddr)
+ {
+    SISPtr pSiS = SISPTR(pScrn);
++   BOOLEAN isslavemode = FALSE;
++
++   if( (pSiS->VBFlags & VB_VIDEOBRIDGE) &&
++       ( ((pSiS->VGAEngine == SIS_300_VGA) && (SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x00) & 0xa0) == 0x20) ||
++         ((pSiS->VGAEngine == SIS_315_VGA) && (SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x00) & 0x50) == 0x10) ) ) {
++      isslavemode = TRUE;
++   }
+ 
+-   /* TW: We need to set pitch for CRT1 if bridge is in SlaveMode, too */
+-   if( (pSiS->VBFlags & DISPTYPE_DISP1) ||
+-       ( (pSiS->VBFlags & VB_VIDEOBRIDGE) &&
+-         ( ((pSiS->VGAEngine == SIS_300_VGA) && (SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x00) & 0xa0) == 0x20) ||
+-           ((pSiS->VGAEngine == SIS_315_VGA) && (SiS_GetReg1(SiS_Pr->SiS_Part1Port,0x00) & 0x50) == 0x10) ) ) ) {
++   /* We need to set pitch for CRT1 if bridge is in slave mode, too */
++   if( (pSiS->VBFlags & DISPTYPE_DISP1) || (isslavemode) ) {
+    	SiS_SetPitchCRT1(SiS_Pr, pScrn, BaseAddr);
+    }
+-   if (pSiS->VBFlags & DISPTYPE_DISP2) {
++   /* We must not set the pitch for CRT2 if bridge is in slave mode */
++   if( (pSiS->VBFlags & DISPTYPE_DISP2) && (!isslavemode) ) {
+    	SiS_SetPitchCRT2(SiS_Pr, pScrn, BaseAddr);
+    }
+ }
+@@ -2790,7 +2985,7 @@ SiS_SetPitchCRT2(SiS_Private *SiS_Pr, Sc
+     SISPtr pSiS = SISPTR(pScrn);
+     ULong  HDisplay,temp;
+ 
+-    HDisplay = pSiS->scrnPitch / 8;
++    HDisplay = pSiS->scrnPitch2 / 8;
+ 
+     /* Unlock CRT2 */
+     if (pSiS->VGAEngine == SIS_315_VGA)
+@@ -2880,7 +3075,6 @@ SiS_SearchModeID(SiS_Private *SiS_Pr, UC
+    return TRUE;
+ }
+ 
+-/* For SiS 300 oem util: Search VBModeID */
+ BOOLEAN
+ SiS_SearchVBModeID(SiS_Private *SiS_Pr, UCHAR *ROMAddr, USHORT *ModeNo)
+ {
+@@ -2946,6 +3140,81 @@ SiS_GetModePtr(SiS_Private *SiS_Pr, UCHA
+    return index;
+ }
+ 
++static void
++SiS_WhatIsThis1a(SiS_Private *SiS_Pr, USHORT somevalue)
++{
++   USHORT temp, tempbl, tempbh;
++
++   tempbl = tempbh = somevalue;
++   temp = SiS_GetReg2(SiS_Pr->SiS_P3cb);
++   temp &= 0xf0;
++   tempbl >>= 4;
++   temp |= tempbl;
++   SiS_SetReg3(SiS_Pr->SiS_P3cb, temp);
++   temp = SiS_GetReg2(SiS_Pr->SiS_P3cd);
++   temp &= 0xf0;
++   tempbh &= 0x0f;
++   temp |= tempbh;
++   SiS_SetReg3(SiS_Pr->SiS_P3cd, temp);
++}
++
++static void
++SiS_WhatIsThis1b(SiS_Private *SiS_Pr, USHORT somevalue)
++{
++   USHORT temp, tempbl, tempbh;
++
++   tempbl = tempbh = somevalue;
++   temp = SiS_GetReg2(SiS_Pr->SiS_P3cb);
++   temp &= 0x0f;
++   tempbl &= 0xf0;
++   temp |= tempbl;
++   SiS_SetReg3(SiS_Pr->SiS_P3cb, temp);
++   temp = SiS_GetReg2(SiS_Pr->SiS_P3cd);
++   temp &= 0x0f;
++   tempbh <<= 4;
++   temp |= tempbh;
++   SiS_SetReg3(SiS_Pr->SiS_P3cd, temp);
++}
++
++static void
++SiS_WhatIsThis2b(SiS_Private *SiS_Pr, USHORT somevalue)
++{
++   SiS_WhatIsThis1a(SiS_Pr, somevalue);
++   SiS_WhatIsThis1b(SiS_Pr, somevalue);
++}
++
++static void
++SiS_WhatIsThis1(SiS_Private *SiS_Pr)
++{
++   SiS_WhatIsThis2b(SiS_Pr, 0);
++}
++
++static void
++SiS_WhatIsThis2a(SiS_Private *SiS_Pr, USHORT somevalue)
++{
++   USHORT temp = somevalue >> 8;
++
++   temp &= 0x07;
++   temp |= (temp << 4);
++   SiS_SetReg1(SiS_Pr->SiS_P3c4,0x1d,temp);
++   SiS_WhatIsThis2b(SiS_Pr, somevalue);
++}
++
++static void
++SiS_WhatIsThis2(SiS_Private *SiS_Pr)
++{
++   SiS_WhatIsThis2a(SiS_Pr, 0);
++}
++
++void
++SiS_WhatTheHellIsThis(SiS_Private *SiS_Pr,PSIS_HW_DEVICE_INFO HwDeviceExtension,USHORT BaseAddr)
++{
++   if(IS_SIS65x) {
++      SiS_WhatIsThis1(SiS_Pr);
++      SiS_WhatIsThis2(SiS_Pr);
++   }
++}
++
+ void
+ SiS_SetSeqRegs(SiS_Private *SiS_Pr, UCHAR *ROMAddr,USHORT StandTableIndex)
+ {
+@@ -3027,7 +3296,7 @@ SiS_SetCRTCRegs(SiS_Private *SiS_Pr, UCH
+       (HwDeviceExtension->jChipRevision >= 0x30) ) {       	   /* for 630S0 */
+     if(SiS_Pr->SiS_VBInfo & SetInSlaveMode) {
+       if(SiS_Pr->SiS_VBInfo & (SetCRT2ToLCD | SetCRT2ToTV)) {
+-        SiS_SetReg1(SiS_Pr->SiS_P3d4,0x18,0xFE);
++         SiS_SetReg1(SiS_Pr->SiS_P3d4,0x18,0xFE);
+       }
+     }
+   }
+@@ -3065,7 +3334,7 @@ SiS_SetATTRegs(SiS_Private *SiS_Pr, UCHA
+       }
+       if(SiS_Pr->SiS_VBInfo & SetCRT2ToLCD) {
+          if(HwDeviceExtension->jChipType >= SIS_315H) {
+-	    if(IS_SIS650740 || IS_SIS550) {  
++	    if(IS_SIS550650740660) {
+ 	       /* 315, 330 don't do this */
+ 	       if(SiS_Pr->SiS_VBType & VB_SIS301B302B) { 
+ 	          if(SiS_Pr->SiS_VBInfo & SetInSlaveMode) ARdata=0;
+@@ -3148,7 +3417,7 @@ SiS_SetCRT1CRTC(SiS_Private *SiS_Pr, UCH
+   USHORT tempah,i,modeflag,j;
+ #ifdef SIS315H
+   USHORT temp;
+-  USHORT ResInfo,DisplayType;
++  USHORT ResIndex,DisplayType;
+   const SiS_LCDACRT1DataStruct *LCDACRT1Ptr = NULL;
+ #endif
+ 
+@@ -3171,7 +3440,7 @@ SiS_SetCRT1CRTC(SiS_Private *SiS_Pr, UCH
+      /* LCDA */
+ 
+      temp = SiS_GetLCDACRT1Ptr(SiS_Pr,ROMAddr,ModeNo,ModeIdIndex,
+-                       RefreshRateTableIndex,&ResInfo,&DisplayType);
++                       RefreshRateTableIndex,&ResIndex,&DisplayType);
+ 
+      switch(DisplayType) {
+       case Panel_800x600       : LCDACRT1Ptr = SiS_Pr->SiS_LCDACRT1800x600_1;      break;
+@@ -3197,30 +3466,30 @@ SiS_SetCRT1CRTC(SiS_Private *SiS_Pr, UCH
+       default:                   LCDACRT1Ptr = SiS_Pr->SiS_LCDACRT11024x768_1;     break;
+      }
+ 
+-     tempah = (LCDACRT1Ptr+ResInfo)->CR[0];
++     tempah = (LCDACRT1Ptr+ResIndex)->CR[0];
+      SiS_SetReg1(SiS_Pr->SiS_P3d4,0x00,tempah);
+      for(i=0x01,j=1;i<=0x07;i++,j++){
+-       tempah = (LCDACRT1Ptr+ResInfo)->CR[j];
++       tempah = (LCDACRT1Ptr+ResIndex)->CR[j];
+        SiS_SetReg1(SiS_Pr->SiS_P3d4,i,tempah);
+      }
+      for(i=0x10,j=8;i<=0x12;i++,j++){
+-       tempah = (LCDACRT1Ptr+ResInfo)->CR[j];
++       tempah = (LCDACRT1Ptr+ResIndex)->CR[j];
+        SiS_SetReg1(SiS_Pr->SiS_P3d4,i,tempah);
+      }
+      for(i=0x15,j=11;i<=0x16;i++,j++){
+-       tempah =(LCDACRT1Ptr+ResInfo)->CR[j];
++       tempah =(LCDACRT1Ptr+ResIndex)->CR[j];
+        SiS_SetReg1(SiS_Pr->SiS_P3d4,i,tempah);
+      }
+      for(i=0x0A,j=13;i<=0x0C;i++,j++){
+-       tempah = (LCDACRT1Ptr+ResInfo)->CR[j];
++       tempah = (LCDACRT1Ptr+ResIndex)->CR[j];
+        SiS_SetReg1(SiS_Pr->SiS_P3c4,i,tempah);
+      }
+ 
+-     tempah = (LCDACRT1Ptr+ResInfo)->CR[16];
++     tempah = (LCDACRT1Ptr+ResIndex)->CR[16];
+      tempah &= 0x0E0;
+      SiS_SetReg1(SiS_Pr->SiS_P3c4,0x0E,tempah);
+ 
+-     tempah = (LCDACRT1Ptr+ResInfo)->CR[16];
++     tempah = (LCDACRT1Ptr+ResIndex)->CR[16];
+      tempah &= 0x01;
+      tempah <<= 5;
+      if(modeflag & DoubleScanMode)  tempah |= 0x080;
+@@ -3301,7 +3570,7 @@ SiS_SetCRT1CRTC(SiS_Private *SiS_Pr, UCH
+ 
+ BOOLEAN
+ SiS_GetLCDACRT1Ptr(SiS_Private *SiS_Pr, UCHAR *ROMAddr,USHORT ModeNo,USHORT ModeIdIndex,
+-		   USHORT RefreshRateTableIndex,USHORT *ResInfo,
++		   USHORT RefreshRateTableIndex,USHORT *ResIndex,
+ 		   USHORT *DisplayType)
+  {
+   USHORT tempbx=0,modeflag=0;
+@@ -3320,7 +3589,7 @@ SiS_GetLCDACRT1Ptr(SiS_Private *SiS_Pr, 
+   if(SiS_Pr->SiS_LCDInfo & DontExpandLCD) tempbx += 32;
+   if(modeflag & HalfDCLK)                 tempbx += 16;
+ 
+-  *ResInfo = CRT2CRTC & 0x3F;
++  *ResIndex = CRT2CRTC & 0x3F;
+   *DisplayType = tempbx;
+ 
+   return 1;
+@@ -3470,6 +3739,9 @@ SiS_SetCRT1ModeRegs(SiS_Private *SiS_Pr,
+   USHORT data,data2,data3;
+   USHORT infoflag=0,modeflag;
+   USHORT resindex,xres;
++#ifdef SIS315H
++  ULONG  longdata;
++#endif
+ 
+   if(SiS_Pr->UseCustomMode) {
+      modeflag = SiS_Pr->CModeFlag;
+@@ -3490,11 +3762,11 @@ SiS_SetCRT1ModeRegs(SiS_Private *SiS_Pr,
+ 
+   data2 = 0;
+   if(ModeNo > 0x13) {
+-    if(SiS_Pr->SiS_ModeType > 0x02) {
+-       data2 |= 0x02;
+-       data3 = (SiS_Pr->SiS_ModeType - ModeVGA) << 2;
+-       data2 |= data3;
+-    }
++     if(SiS_Pr->SiS_ModeType > 0x02) {
++        data2 |= 0x02;
++        data3 = (SiS_Pr->SiS_ModeType - ModeVGA) << 2;
++        data2 |= data3;
++     }
+   }
+ #ifdef TWDEBUG
+   xf86DrvMsg(0, X_INFO, "Debug: Mode infoflag = %x, Chiptype %d\n", 
+@@ -3517,7 +3789,8 @@ SiS_SetCRT1ModeRegs(SiS_Private *SiS_Pr,
+   if(HwDeviceExtension->jChipType != SIS_300) {
+      data = 0x0000;
+      if(infoflag & InterlaceMode) {
+-        if(xres == 1024) data = 0x0035;
++        if(xres <= 800)  data = 0x0020;
++        else if(xres <= 1024) data = 0x0035;
+         else data = 0x0048;
+      }
+      data2 = data & 0x00FF;
+@@ -3549,6 +3822,7 @@ SiS_SetCRT1ModeRegs(SiS_Private *SiS_Pr,
+      } else {
+         SiS_SetRegAND(SiS_Pr->SiS_P3c4,0x0F,0xB7);
+      }
++     /* 651 BIOS does something for mode 0x12 here */
+   }
+ 
+   if(HwDeviceExtension->jChipType != SIS_300) {
+@@ -3604,9 +3878,9 @@ SiS_SetCRT1ModeRegs(SiS_Private *SiS_Pr,
+ 	  data2 *= data3;
+ 
+ 	  data3 = SiS_GetMCLK(SiS_Pr,ROMAddr, HwDeviceExtension);
+-	  data3 *= 1024;
++	  longdata = data3 * 1024;
+ 
+-	  data2 = data3 / data2;
++	  data2 = longdata / data2;
+ 
+ 	  if(SiS_Pr->SiS_ModeType != Mode16Bpp) {
+             if(data2 >= 0x19c)      data = 0xba;
+@@ -3679,7 +3953,7 @@ SiS_SetVCLKState(SiS_Private *SiS_Pr, UC
+     if(VCLK >= 150) data2 |= 0x08;       	/* VCLK > 150 */
+     SiS_SetRegANDOR(SiS_Pr->SiS_P3c4,0x32,0xF7,data2);
+ 
+-  } else { 						/* 310/325 series */
++  } else { 						/* 315 series */
+ 
+     data = 0;
+     if(VCLK >= 166) data |= 0x0c;         	/* TW: Was 200; is 166 in 650, 315 and 330 BIOSes */
+@@ -3688,12 +3962,6 @@ SiS_SetVCLKState(SiS_Private *SiS_Pr, UC
+     if(VCLK >= 166) {				/* TW: Was 200, is 166 in 650, 315 and 330 BIOSes */
+        SiS_SetRegAND(SiS_Pr->SiS_P3c4,0x1f,0xe7);
+     }
+-#if 0 /* Not done in 315 and 650/301LV/LVDS BIOSes: */
+-    data = SiS_GetReg1(SiS_Pr->SiS_P3c4,0x1F);	  	/* DAC pedestal */
+-    data &= 0xE7;
+-    if(VCLK<200) data |= 0x10;
+-    SiS_SetReg1(SiS_Pr->SiS_P3c4,0x1F,data);	  	/* DAC pedestal */
+-#endif
+   }
+ 
+   data2 = 0x03;
+@@ -3918,7 +4186,9 @@ GetDRAMSize(SiS_Private *SiS_Pr, PSIS_HW
+ 
+   } else if((HwDeviceExtension->jChipType == SIS_550) ||
+             (HwDeviceExtension->jChipType == SIS_740) ||
+-            (HwDeviceExtension->jChipType == SIS_650)) {
++            (HwDeviceExtension->jChipType == SIS_650) ||
++	    (HwDeviceExtension->jChipType == SIS_660) ||
++	    (HwDeviceExtension->jChipType == SIS_760)) {
+ 
+   	counter = SiS_GetReg1(SiS_Pr->SiS_P3c4,0x14) & 0x3F;
+       	counter++;
+@@ -4728,7 +4998,7 @@ SiS_GetSenseStatus(SiS_Private *SiS_Pr, 
+           SiS_Pr->SiS_SetFlag = 0x00;
+           SiS_Pr->SiS_ModeType = ModeVGA;
+           SiS_Pr->SiS_VBInfo = SetCRT2ToRAMDAC |LoadDACFlag |SetInSlaveMode;
+-          SiS_SetCRT2Group301(SiS_Pr, BaseAddr,ROMAddr,SenseModeNo,HwDeviceExtension);
++          SiS_SetCRT2Group(SiS_Pr, BaseAddr,ROMAddr,SenseModeNo,HwDeviceExtension);
+           for(i=0;i<20;i++) {
+             SiS_LongWait(SiS_Pr);
+           }
+@@ -4766,7 +5036,7 @@ SiS_GetSenseStatus(SiS_Private *SiS_Pr, 
+ #ifdef SIS315H
+ 	   if(HwDeviceExtension->jChipType >= SIS_315H) {
+ 	        OutputSelect = ROMAddr[0xf3];
+-		if(HwDeviceExtension->jChipType == SIS_330) {
++		if(HwDeviceExtension->jChipType >= SIS_330) {
+ 		     OutputSelect = ROMAddr[0x11b];
+ 		}
+ 	   }
+@@ -4814,7 +5084,7 @@ SiS_GetSenseStatus(SiS_Private *SiS_Pr, 
+       SiS_SetReg1(SiS_Pr->SiS_Part2Port,0x00,P2reg0);
+       if(!(P2reg0 & 0x20)) {
+         SiS_Pr->SiS_VBInfo = DisableCRT2Display;
+-        SiS_SetCRT2Group301(SiS_Pr,BaseAddr,ROMAddr,SenseModeNo,HwDeviceExtension);
++        SiS_SetCRT2Group(SiS_Pr,BaseAddr,ROMAddr,SenseModeNo,HwDeviceExtension);
+       }
+     }
+   }
+@@ -4884,111 +5154,6 @@ SiS_SenseCHTV(SiS_Private *SiS_Pr)
+ }
+ #endif /* LINUXBIOS */
+ 
+-/*  ================ for TC only =================  */
+-
+-#ifdef TC
+-
+-int
+-INT1AReturnCode(union REGS regs)
+-{
+-  if (regs.x.cflag)
+-  {
+-    /*printf("Error to find pci device!\n"); */
+-    return 1;
+-  }
+-
+-  switch(regs.h.ah)
+-  {
+-    case 0: return 0;
+-            break;
+-    case 0x81: printf("Function not support\n");
+-               break;
+-    case 0x83: printf("bad vendor id\n");
+-               break;
+-    case 0x86: printf("device not found\n");
+-               break;
+-    case 0x87: printf("bad register number\n");
+-               break;
+-    case 0x88: printf("set failed\n");
+-               break;
+-    case 0x89: printf("buffer too small");
+-               break;
+-  }
+-  return 1;
+-}
+-
+-unsigned
+-FindPCIIOBase(unsigned index,unsigned deviceid)
+-{
+-  union REGS regs;
+-
+-  regs.h.ah = 0xb1;  /*PCI_FUNCTION_ID */
+-  regs.h.al = 0x02;  /*FIND_PCI_DEVICE */
+-  regs.x.cx = deviceid;
+-  regs.x.dx = 0x1039;
+-  regs.x.si = index;  /* find n-th device */
+-
+-  int86(0x1A, &regs, &regs);
+-
+-  if (INT1AReturnCode(regs)!=0)
+-    return 0;
+-
+-  /* regs.h.bh *//* bus number */
+-  /* regs.h.bl *//* device number */
+-  regs.h.ah = 0xb1;  /*PCI_FUNCTION_ID */
+-  regs.h.al = 0x09;  /*READ_CONFIG_WORD */
+-  regs.x.cx = deviceid;
+-  regs.x.dx = 0x1039;
+-  regs.x.di = 0x18;  /* register number */
+-  int86(0x1A, &regs, &regs);
+-
+-  if (INT1AReturnCode(regs)!=0)
+-    return 0;
+-  return regs.x.cx;
+-}
+-
+-
+-void
+-main(int argc, char *argv[])
+-{
+-  SIS_HW_DEVICE_INFO  HwDeviceExtension;
+-  USHORT temp;
+-  USHORT ModeNo;
+-
+-  /*HwDeviceExtension.pjVirtualRomBase =(PUCHAR) MK_FP(0xC000,0); */
+-  /*HwDeviceExtension.pjVideoMemoryAddress = (PUCHAR)MK_FP(0xA000,0);*/
+-
+-#ifdef SIS300  
+-  HwDeviceExtension.ulIOAddress = (FindPCIIOBase(0,0x6300)&0xFF80) + 0x30;
+-  HwDeviceExtension.jChipType = SIS_630;
+-#endif
+-
+-#ifdef SIS315H  
+-//  HwDeviceExtension.ulIOAddress = (FindPCIIOBase(0,0x5315)&0xFF80) + 0x30;
+-//  HwDeviceExtension.jChipType = SIS_550;
+-  HwDeviceExtension.ulIOAddress = (FindPCIIOBase(0,0x325)&0xFF80) + 0x30;
+-  HwDeviceExtension.jChipType = SIS_315H;
+-#endif
+-
+-  HwDeviceExtension.ujVBChipID = VB_CHIP_301;
+-  strcpy(HwDeviceExtension.szVBIOSVer,"0.84");
+-  HwDeviceExtension.bSkipDramSizing = FALSE;
+-  HwDeviceExtension.ulVideoMemorySize = 0;
+-  if(argc==2) {
+-    ModeNo=atoi(argv[1]);
+-  }
+-  else {
+-    ModeNo=0x2e;
+-    /*ModeNo=0x37; */ /* 1024x768x 4bpp */
+-    /*ModeNo=0x38; *//* 1024x768x 8bpp */
+-    /*ModeNo=0x4A; *//* 1024x768x 16bpp */
+-    /*ModeNo=0x47;*/ /* 800x600x 16bpp */
+-  }
+- /* SiSInit(SiS_Pr, &HwDeviceExtension);*/
+-  SiSSetMode(SiS_Pr, &HwDeviceExtension, ModeNo);
+-}
+-#endif /* TC END */
+-
+ /* ================ XFREE86 ================= */
+ 
+ /* Helper functions */
+@@ -5000,44 +5165,78 @@ SiS_CheckBuildCustomMode(ScrnInfoPtr pSc
+    SISPtr pSiS = SISPTR(pScrn);
+    int    out_n, out_dn, out_div, out_sbit, out_scale;
+    int    depth = pSiS->CurrentLayout.bitsPerPixel;
+-   
+-#ifdef SISDUALHEAD
+-   if( ((!pSiS->DualHeadMode) && (VBFlags & DISPTYPE_DISP2)) ||
+-       ((pSiS->DualHeadMode) && (!pSiS->SecondHead)) ) return 0;
+-#else      
+-   if(VBFlags & DISPTYPE_DISP2) return 0; 
+-#endif   
++   unsigned int vclk[5];
++
++#define Midx         0
++#define Nidx         1
++#define VLDidx       2
++#define Pidx         3
++#define PSNidx       4
++
++   pSiS->SiS_Pr->CModeFlag = 0;
+    
+    pSiS->SiS_Pr->CDClock = mode->Clock;
+-   
++
+    pSiS->SiS_Pr->CHDisplay = mode->HDisplay;
+    pSiS->SiS_Pr->CHSyncStart = mode->HSyncStart;
+    pSiS->SiS_Pr->CHSyncEnd = mode->HSyncEnd;
+    pSiS->SiS_Pr->CHTotal = mode->HTotal;
+-   pSiS->SiS_Pr->CHBlankStart = pSiS->SiS_Pr->CHDisplay;
+-   pSiS->SiS_Pr->CHBlankEnd = pSiS->SiS_Pr->CHTotal;
+-   
++
+    pSiS->SiS_Pr->CVDisplay = mode->VDisplay;
+    pSiS->SiS_Pr->CVSyncStart = mode->VSyncStart;
+    pSiS->SiS_Pr->CVSyncEnd = mode->VSyncEnd;
+    pSiS->SiS_Pr->CVTotal = mode->VTotal;
++
++   pSiS->SiS_Pr->CFlags = mode->Flags;
++
++   if(pSiS->SiS_Pr->CFlags & V_INTERLACE) {
++         pSiS->SiS_Pr->CVDisplay >>= 1;
++	 pSiS->SiS_Pr->CVSyncStart >>= 1;
++	 pSiS->SiS_Pr->CVSyncEnd >>= 1;
++	 pSiS->SiS_Pr->CVTotal >>= 1;
++   }
++   if(pSiS->SiS_Pr->CFlags & V_DBLSCAN) {
++         /* pSiS->SiS_Pr->CDClock <<= 1; */
++	 pSiS->SiS_Pr->CVDisplay <<= 1;
++	 pSiS->SiS_Pr->CVSyncStart <<= 1;
++	 pSiS->SiS_Pr->CVSyncEnd <<= 1;
++	 pSiS->SiS_Pr->CVTotal <<= 1;
++   }
++
++   pSiS->SiS_Pr->CHBlankStart = pSiS->SiS_Pr->CHDisplay;
++   pSiS->SiS_Pr->CHBlankEnd = pSiS->SiS_Pr->CHTotal;
+    pSiS->SiS_Pr->CVBlankStart = pSiS->SiS_Pr->CVSyncStart - 1;
+    pSiS->SiS_Pr->CVBlankEnd = pSiS->SiS_Pr->CVTotal;
+-   
+-   pSiS->SiS_Pr->CFlags = mode->Flags;
+ 
+-   SiS_compute_vclk(pSiS->SiS_Pr->CDClock, &out_n, &out_dn, &out_div, &out_sbit, &out_scale);
+-   
++   if(SiS_compute_vclk(pSiS->SiS_Pr->CDClock, &out_n, &out_dn, &out_div, &out_sbit, &out_scale)) {
++      pSiS->SiS_Pr->CSR2B = (out_div == 2) ? 0x80 : 0x00;
++      pSiS->SiS_Pr->CSR2B |= ((out_n - 1) & 0x7f);
++      pSiS->SiS_Pr->CSR2C = (out_dn - 1) & 0x1f;
++      pSiS->SiS_Pr->CSR2C |= (((out_scale - 1) & 3) << 5);
++      pSiS->SiS_Pr->CSR2C |= ((out_sbit & 0x01) << 7);
+ #ifdef TWDEBUG
+-   xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Clock %d: n %d dn %d div %d sb %d sc %d\n",
+-      	pSiS->SiS_Pr->CDClock, out_n, out_dn, out_div, out_sbit, out_scale);
+-#endif	
+-
+-   pSiS->SiS_Pr->CSR2B = (out_div == 2) ? 0x80 : 0x00;
+-   pSiS->SiS_Pr->CSR2B |= ((out_n - 1) & 0x7f);
+-   pSiS->SiS_Pr->CSR2C = (out_dn - 1) & 0x1f;
+-   pSiS->SiS_Pr->CSR2C |= (((out_scale - 1) & 3) << 5);
+-   pSiS->SiS_Pr->CSR2C |= ((out_sbit & 0x01) << 7);
++      xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Clock %d: n %d dn %d div %d sb %d sc %d\n",
++        	pSiS->SiS_Pr->CDClock, out_n, out_dn, out_div, out_sbit, out_scale);
++#endif
++   } else {
++      SiSCalcClock(pScrn, pSiS->SiS_Pr->CDClock, 2, vclk);
++      pSiS->SiS_Pr->CSR2B = (vclk[VLDidx] == 2) ? 0x80 : 0x00;
++      pSiS->SiS_Pr->CSR2B |= (vclk[Midx] - 1) & 0x7f;
++      pSiS->SiS_Pr->CSR2C = (vclk[Nidx] - 1) & 0x1f;
++      if(vclk[Pidx] <= 4) {
++         /* postscale 1,2,3,4 */
++         pSiS->SiS_Pr->CSR2C |= ((vclk[Pidx] - 1) & 3) << 5;
++      } else {
++         /* postscale 6,8 */
++         pSiS->SiS_Pr->CSR2C |= (((vclk[Pidx] / 2) - 1) & 3) << 5;
++	 pSiS->SiS_Pr->CSR2C |= 0x80;
++      }
++#ifdef TWDEBUG
++      xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Clock %d: n %d dn %d div %d sc %d\n",
++        	pSiS->SiS_Pr->CDClock, vclk[Midx], vclk[Nidx], vclk[VLDidx], vclk[Pidx]);
++#endif
++   }
++
+    pSiS->SiS_Pr->CSRClock = (pSiS->SiS_Pr->CDClock / 1000) + 1;
+ 
+    pSiS->SiS_Pr->CCRT1CRTC[0]  =  ((pSiS->SiS_Pr->CHTotal >> 3) - 5) & 0xff;
+@@ -5045,9 +5244,9 @@ SiS_CheckBuildCustomMode(ScrnInfoPtr pSc
+    pSiS->SiS_Pr->CCRT1CRTC[2]  =  (pSiS->SiS_Pr->CHBlankStart >> 3) - 1;
+    pSiS->SiS_Pr->CCRT1CRTC[3]  =  (((pSiS->SiS_Pr->CHBlankEnd >> 3) - 1) & 0x1F) | 0x80;
+    pSiS->SiS_Pr->CCRT1CRTC[4]  =  (pSiS->SiS_Pr->CHSyncStart >> 3) + 3;
+-   pSiS->SiS_Pr->CCRT1CRTC[5]  =  ((((pSiS->SiS_Pr->CHBlankEnd >> 3) - 1) & 0x20) << 2) | 
++   pSiS->SiS_Pr->CCRT1CRTC[5]  =  ((((pSiS->SiS_Pr->CHBlankEnd >> 3) - 1) & 0x20) << 2) |
+        				  (((pSiS->SiS_Pr->CHSyncEnd >> 3) + 3) & 0x1F);
+-   
++
+    pSiS->SiS_Pr->CCRT1CRTC[6]  =  (pSiS->SiS_Pr->CVTotal - 2) & 0xFF;
+    pSiS->SiS_Pr->CCRT1CRTC[7]  =  (((pSiS->SiS_Pr->CVTotal - 2) & 0x100) >> 8)
+  	 			| (((pSiS->SiS_Pr->CVDisplay - 1) & 0x100) >> 7)
+@@ -5057,50 +5256,50 @@ SiS_CheckBuildCustomMode(ScrnInfoPtr pSc
+ 	 			| (((pSiS->SiS_Pr->CVTotal - 2) & 0x200)   >> 4)
+ 	 			| (((pSiS->SiS_Pr->CVDisplay - 1) & 0x200) >> 3)
+ 	 			| ((pSiS->SiS_Pr->CVSyncStart & 0x200) >> 2);
+-    
++
+    pSiS->SiS_Pr->CCRT1CRTC[16] = ((((pSiS->SiS_Pr->CVBlankStart - 1) & 0x200) >> 4) >> 5); 	/* cr9 */
+-    
+-#if 0    
++
++#if 0
+    if (mode->VScan >= 32)
+ 	regp->CRTC[9] |= 0x1F;
+    else if (mode->VScan > 1)
+ 	regp->CRTC[9] |= mode->VScan - 1;
+-#endif	
++#endif
+ 
+-   pSiS->SiS_Pr->CCRT1CRTC[8] =  (pSiS->SiS_Pr->CVSyncStart - 1) & 0xFF;	/* cr10 */
+-   pSiS->SiS_Pr->CCRT1CRTC[9] =  ((pSiS->SiS_Pr->CVSyncEnd - 1) & 0x0F) | 0x80;	/* cr11 */
+-   pSiS->SiS_Pr->CCRT1CRTC[10] = (pSiS->SiS_Pr->CVDisplay - 1) & 0xFF;		/* cr12 */
+-   pSiS->SiS_Pr->CCRT1CRTC[11] = (pSiS->SiS_Pr->CVBlankStart - 1) & 0xFF;	/* cr15 */
+-   pSiS->SiS_Pr->CCRT1CRTC[12] = (pSiS->SiS_Pr->CVBlankEnd - 1) & 0xFF;		/* cr16 */
+-   
+-   pSiS->SiS_Pr->CCRT1CRTC[13] = 
++   pSiS->SiS_Pr->CCRT1CRTC[8] =  (pSiS->SiS_Pr->CVSyncStart     ) & 0xFF;		/* cr10 */
++   pSiS->SiS_Pr->CCRT1CRTC[9] =  ((pSiS->SiS_Pr->CVSyncEnd      ) & 0x0F) | 0x80;	/* cr11 */
++   pSiS->SiS_Pr->CCRT1CRTC[10] = (pSiS->SiS_Pr->CVDisplay    - 1) & 0xFF;		/* cr12 */
++   pSiS->SiS_Pr->CCRT1CRTC[11] = (pSiS->SiS_Pr->CVBlankStart - 1) & 0xFF;		/* cr15 */
++   pSiS->SiS_Pr->CCRT1CRTC[12] = (pSiS->SiS_Pr->CVBlankEnd   - 1) & 0xFF;		/* cr16 */
++
++   pSiS->SiS_Pr->CCRT1CRTC[13] =
+                         GETBITSTR((pSiS->SiS_Pr->CVTotal     -2), 10:10, 0:0) |
+                         GETBITSTR((pSiS->SiS_Pr->CVDisplay   -1), 10:10, 1:1) |
+                         GETBITSTR((pSiS->SiS_Pr->CVBlankStart-1), 10:10, 2:2) |
+                         GETBITSTR((pSiS->SiS_Pr->CVSyncStart   ), 10:10, 3:3) |
+                         GETBITSTR((pSiS->SiS_Pr->CVBlankEnd  -1),   8:8, 4:4) |
+-                        GETBITSTR((pSiS->SiS_Pr->CVSyncEnd   -1),   4:4, 5:5) ;  
++                        GETBITSTR((pSiS->SiS_Pr->CVSyncEnd     ),   4:4, 5:5) ;
+ 
+-   pSiS->SiS_Pr->CCRT1CRTC[14] = 
++   pSiS->SiS_Pr->CCRT1CRTC[14] =
+                         GETBITSTR((pSiS->SiS_Pr->CHTotal      >> 3) - 5, 9:8, 1:0) |
+                         GETBITSTR((pSiS->SiS_Pr->CHDisplay    >> 3) - 1, 9:8, 3:2) |
+                         GETBITSTR((pSiS->SiS_Pr->CHBlankStart >> 3) - 1, 9:8, 5:4) |
+                         GETBITSTR((pSiS->SiS_Pr->CHSyncStart  >> 3) + 3, 9:8, 7:6) ;
+ 
+-        
++
+    pSiS->SiS_Pr->CCRT1CRTC[15] =
+                         GETBITSTR((pSiS->SiS_Pr->CHBlankEnd >> 3) - 1, 7:6, 1:0) |
+-                        GETBITSTR((pSiS->SiS_Pr->CHSyncEnd  >> 3) + 3, 5:5, 2:2) ; 
+-			
++                        GETBITSTR((pSiS->SiS_Pr->CHSyncEnd  >> 3) + 3, 5:5, 2:2) ;
++
+    switch(depth) {
+-   case 8: 			
+-      	pSiS->SiS_Pr->CModeFlag = 0x223b;
++   case 8:
++      	pSiS->SiS_Pr->CModeFlag |= 0x223b;
+ 	break;
+-   case 16: 			
+-      	pSiS->SiS_Pr->CModeFlag = 0x227d;
++   case 16:
++      	pSiS->SiS_Pr->CModeFlag |= 0x227d;
+ 	break;
+-   case 32: 			
+-      	pSiS->SiS_Pr->CModeFlag = 0x22ff;
++   case 32:
++      	pSiS->SiS_Pr->CModeFlag |= 0x22ff;
+ 	break;		
+    default: 
+    	return 0;	
+@@ -5114,9 +5313,9 @@ SiS_CheckBuildCustomMode(ScrnInfoPtr pSc
+ 	pSiS->SiS_Pr->CModeFlag |= LineCompareOff;
+    if(pSiS->SiS_Pr->CFlags & V_CLKDIV2)
+         pSiS->SiS_Pr->CModeFlag |= HalfDCLK;
+-   
++
+    pSiS->SiS_Pr->CInfoFlag = 0x0007;
+-   if(pSiS->SiS_Pr->CFlags & V_NHSYNC) 
++   if(pSiS->SiS_Pr->CFlags & V_NHSYNC)
+    	pSiS->SiS_Pr->CInfoFlag |= 0x4000;
+    if(pSiS->SiS_Pr->CFlags & V_NVSYNC) 
+    	pSiS->SiS_Pr->CInfoFlag |= 0x8000;
+@@ -5152,13 +5351,13 @@ SiS_CheckBuildCustomMode(ScrnInfoPtr pSc
+    	pSiS->SiS_Pr->CSR2B,
+ 	pSiS->SiS_Pr->CSR2C,
+ 	pSiS->SiS_Pr->CSRClock);
+-#endif   	
++#endif
+    return 1;
+ }
+ 
+ /* TW: Build a list of supported modes */
+ DisplayModePtr
+-SiSBuildBuiltInModeList(ScrnInfoPtr pScrn)
++SiSBuildBuiltInModeList(ScrnInfoPtr pScrn, BOOLEAN includelcdmodes, BOOLEAN isfordvi)
+ {
+    SISPtr         pSiS = SISPTR(pScrn);
+    unsigned short VRE, VBE, VRS, VBS, VDE, VT;
+@@ -5166,11 +5365,16 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScr
+    unsigned char  sr_data, cr_data, cr_data2, cr_data3;
+    unsigned char  sr2b, sr2c;
+    float          num, denum, postscalar, divider;
+-   int            A, B, C, D, E, F, temp, i, j, index, vclkindex;
+-   DisplayModePtr new = NULL, current = NULL, first = NULL, backup = NULL;
++   int            A, B, C, D, E, F, temp, i, j, k, l, index, vclkindex;
++   DisplayModePtr new = NULL, current = NULL, first = NULL;
++   BOOLEAN        done = FALSE;
++#if 0
++   DisplayModePtr backup = NULL;
++#endif
+ 
+    pSiS->backupmodelist = NULL;
+-   
++   pSiS->AddedPlasmaModes = FALSE;
++
+    /* Initialize our pointers */
+    if(pSiS->VGAEngine == SIS_300_VGA) {
+ #ifdef SIS300
+@@ -5194,15 +5398,20 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScr
+       if(pSiS->VGAEngine == SIS_300_VGA) index &= 0x3F;
+ #endif      
+ 
+-      if(((pSiS->SiS_Pr->SiS_RefIndex[i].XRes < 512) && (!pSiS->DSTN)) ||
+-      	 ((pSiS->DSTN) &&
+-	  (pSiS->SiS_Pr->SiS_RefIndex[i].XRes < 512) &&
+-	  (pSiS->SiS_Pr->SiS_RefIndex[i].XRes != 320) &&
+-	  (pSiS->SiS_Pr->SiS_RefIndex[i].YRes != 480)))  {
++      /* 0x5a (320x240) is a pure FTSN mode, not DSTN! */
++      if((!pSiS->FSTN) &&
++	 (pSiS->SiS_Pr->SiS_RefIndex[i].ModeID == 0x5a))  {
+            i++;
+       	   continue;
+       }
+-      
++      if((pSiS->FSTN) &&
++         (pSiS->SiS_Pr->SiS_RefIndex[i].XRes == 320) &&
++	 (pSiS->SiS_Pr->SiS_RefIndex[i].YRes == 240) &&
++	 (pSiS->SiS_Pr->SiS_RefIndex[i].ModeID != 0x5a)) {
++	   i++;
++	   continue;
++      }
++
+       if(!(new = xalloc(sizeof(DisplayModeRec)))) return first;
+       memset(new, 0, sizeof(DisplayModeRec));
+       if(!(new->name = xalloc(10))) {
+@@ -5216,13 +5425,13 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScr
+       }
+ 
+       current = new;
+-      
++
+       sprintf(current->name, "%dx%d", pSiS->SiS_Pr->SiS_RefIndex[i].XRes,
+                                       pSiS->SiS_Pr->SiS_RefIndex[i].YRes);
+ 
+       current->status = MODE_OK;
+ 
+-      current->type = M_T_DEFAULT; 
++      current->type = M_T_DEFAULT;
+ 
+       vclkindex = pSiS->SiS_Pr->SiS_RefIndex[i].Ext_CRTVCLK;
+       if(pSiS->VGAEngine == SIS_300_VGA) vclkindex &= 0x3F;
+@@ -5235,7 +5444,7 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScr
+               ( (((sr2c >> 5) & 0x03) == 0x02) ? 6.0 : 8.0) : (((sr2c >> 5) & 0x03) + 1.0);
+       num = (sr2b & 0x7f) + 1.0;
+       denum = (sr2c & 0x1f) + 1.0;
+-      
++
+ #ifdef TWDEBUG
+       xf86DrvMsg(0, X_INFO, "------------\n");
+       xf86DrvMsg(0, X_INFO, "sr2b: %x sr2c %x div %f ps %f num %f denum %f\n",
+@@ -5303,10 +5512,29 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScr
+ 
+       D = B - F - C;
+ 
+-      current->HDisplay   = (E * 8);
+-      current->HSyncStart = (E * 8) + (F * 8);
+-      current->HSyncEnd   = (E * 8) + (F * 8) + (C * 8);
+-      current->HTotal     = (E * 8) + (F * 8) + (C * 8) + (D * 8);
++      if((pSiS->SiS_Pr->SiS_RefIndex[i].XRes == 320) &&
++	 ((pSiS->SiS_Pr->SiS_RefIndex[i].YRes == 200) ||
++	  (pSiS->SiS_Pr->SiS_RefIndex[i].YRes == 240))) {
++
++	 /* Terrible hack, but correct CRTC data for
++	  * these modes only produces a black screen...
++	  * (HRE is 0, leading into a too large C and
++	  * a negative D. The CRT controller does not
++	  * seem to like correcting HRE to 50
++	  */
++	 current->HDisplay   = 320;
++         current->HSyncStart = 328;
++         current->HSyncEnd   = 376;
++         current->HTotal     = 400;
++
++      } else {
++
++         current->HDisplay   = (E * 8);
++         current->HSyncStart = (E * 8) + (F * 8);
++         current->HSyncEnd   = (E * 8) + (F * 8) + (C * 8);
++         current->HTotal     = (E * 8) + (F * 8) + (C * 8) + (D * 8);
++
++      }
+ 
+ #ifdef TWDEBUG
+       xf86DrvMsg(0, X_INFO,
+@@ -5430,7 +5658,7 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScr
+ 	 current->VSyncStart <<= 1;
+ 	 current->VSyncEnd <<= 1;
+ 	 current->VTotal <<= 1;
+-	 current->VTotal |= 1; 
++	 current->VTotal |= 1;
+       }
+       if(current->Flags & V_DBLSCAN) {
+          current->Clock >>= 1;
+@@ -5440,6 +5668,7 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScr
+ 	 current->VTotal >>= 1;
+       }
+ 
++#if 0
+       if((backup = xalloc(sizeof(DisplayModeRec)))) {
+          if(!pSiS->backupmodelist) pSiS->backupmodelist = backup;
+ 	 else {
+@@ -5458,6 +5687,7 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScr
+ 	 backup->Flags = current->Flags;
+ 	 backup->Clock = current->Clock;
+       }
++#endif
+ 
+ #ifdef TWDEBUG
+       xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+@@ -5470,6 +5700,187 @@ SiSBuildBuiltInModeList(ScrnInfoPtr pScr
+       i++;
+    }
+ 
++   /* Add non-standard LCD modes for panel's detailed timings */
++
++   if(!includelcdmodes) return first;
++
++   xf86DrvMsg(0, X_INFO, "Checking database for vendor %x, product %x\n",
++      pSiS->SiS_Pr->CP_Vendor, pSiS->SiS_Pr->CP_Product);
++
++   i = 0;
++   while((!done) && (SiS_PlasmaTable[i].vendor) && (pSiS->SiS_Pr->CP_Vendor)) {
++
++     if(SiS_PlasmaTable[i].vendor == pSiS->SiS_Pr->CP_Vendor) {
++
++        for(j=0; j<SiS_PlasmaTable[i].productnum; j++) {
++
++	    if(SiS_PlasmaTable[i].product[j] == pSiS->SiS_Pr->CP_Product) {
++
++	       xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
++	       	  "Identified %s panel, adding specific modes\n",
++		  SiS_PlasmaTable[i].plasmaname);
++
++	       for(k=0; k<SiS_PlasmaTable[i].modenum; k++) {
++
++	          if(isfordvi) {
++		     if(!(SiS_PlasmaTable[i].plasmamodes[k] & 0x80)) continue;
++		  } else {
++		     if(!(SiS_PlasmaTable[i].plasmamodes[k] & 0x40)) continue;
++		  }
++
++	          if(!(new = xalloc(sizeof(DisplayModeRec)))) return first;
++
++                  memset(new, 0, sizeof(DisplayModeRec));
++                  if(!(new->name = xalloc(10))) {
++      		     xfree(new);
++		     return first;
++                  }
++                  if(!first) first = new;
++                  if(current) {
++                     current->next = new;
++	             new->prev = current;
++                  }
++
++                  current = new;
++
++		  pSiS->AddedPlasmaModes = TRUE;
++
++		  l = SiS_PlasmaTable[i].plasmamodes[k] & 0x3f;
++
++	          sprintf(current->name, "%dx%d", SiS_PlasmaMode[l].HDisplay,
++                                                  SiS_PlasmaMode[l].VDisplay);
++
++                  current->status = MODE_OK;
++
++                  current->type = M_T_BUILTIN;
++
++		  current->Clock = SiS_PlasmaMode[l].clock;
++            	  current->SynthClock = current->Clock;
++
++                  current->HDisplay   = SiS_PlasmaMode[l].HDisplay;
++                  current->HSyncStart = current->HDisplay + SiS_PlasmaMode[l].HFrontPorch;
++                  current->HSyncEnd   = current->HSyncStart + SiS_PlasmaMode[l].HSyncWidth;
++                  current->HTotal     = SiS_PlasmaMode[l].HTotal;
++
++		  current->VDisplay   = SiS_PlasmaMode[l].VDisplay;
++                  current->VSyncStart = current->VDisplay + SiS_PlasmaMode[l].VFrontPorch;
++                  current->VSyncEnd   = current->VSyncStart + SiS_PlasmaMode[l].VSyncWidth;
++                  current->VTotal     = SiS_PlasmaMode[l].VTotal;
++
++                  current->CrtcHDisplay = current->HDisplay;
++                  current->CrtcHBlankStart = current->HSyncStart;
++                  current->CrtcHSyncStart = current->HSyncStart;
++                  current->CrtcHSyncEnd = current->HSyncEnd;
++                  current->CrtcHBlankEnd = current->HSyncEnd;
++                  current->CrtcHTotal = current->HTotal;
++
++                  current->CrtcVDisplay = current->VDisplay;
++                  current->CrtcVBlankStart = current->VSyncStart;
++                  current->CrtcVSyncStart = current->VSyncStart;
++                  current->CrtcVSyncEnd = current->VSyncEnd;
++                  current->CrtcVBlankEnd = current->VSyncEnd;
++                  current->CrtcVTotal = current->VTotal;
++
++                  if(SiS_PlasmaMode[l].SyncFlags & SIS_PL_HSYNCP)
++                     current->Flags |= V_PHSYNC;
++                  else
++                     current->Flags |= V_NHSYNC;
++
++                  if(SiS_PlasmaMode[l].SyncFlags & SIS_PL_VSYNCP)
++                     current->Flags |= V_PVSYNC;
++                  else
++                     current->Flags |= V_NVSYNC;
++
++		  if(current->HDisplay > pSiS->LCDwidth)
++		     pSiS->LCDwidth = pSiS->SiS_Pr->CP_MaxX = current->HDisplay;
++	          if(current->VDisplay > pSiS->LCDheight)
++		     pSiS->LCDheight = pSiS->SiS_Pr->CP_MaxY = current->VDisplay;
++
++               }
++	       done = TRUE;
++	       break;
++	    }
++	}
++     }
++
++     i++;
++
++   }
++
++   if(pSiS->SiS_Pr->CP_HaveCustomData) {
++
++      for(i=0; i<7; i++) {
++
++         if(pSiS->SiS_Pr->CP_DataValid[i]) {
++
++            if(!(new = xalloc(sizeof(DisplayModeRec)))) return first;
++
++            memset(new, 0, sizeof(DisplayModeRec));
++            if(!(new->name = xalloc(10))) {
++      		xfree(new);
++		return first;
++            }
++            if(!first) first = new;
++            if(current) {
++               current->next = new;
++	       new->prev = current;
++            }
++
++            current = new;
++
++            sprintf(current->name, "%dx%d", pSiS->SiS_Pr->CP_HDisplay[i],
++                                            pSiS->SiS_Pr->CP_VDisplay[i]);
++
++            current->status = MODE_OK;
++
++            current->type = M_T_BUILTIN;
++
++            current->Clock = pSiS->SiS_Pr->CP_Clock[i];
++            current->SynthClock = current->Clock;
++
++            current->HDisplay   = pSiS->SiS_Pr->CP_HDisplay[i];
++            current->HSyncStart = pSiS->SiS_Pr->CP_HSyncStart[i];
++            current->HSyncEnd   = pSiS->SiS_Pr->CP_HSyncEnd[i];
++            current->HTotal     = pSiS->SiS_Pr->CP_HTotal[i];
++
++            current->VDisplay   = pSiS->SiS_Pr->CP_VDisplay[i];
++            current->VSyncStart = pSiS->SiS_Pr->CP_VSyncStart[i];
++            current->VSyncEnd   = pSiS->SiS_Pr->CP_VSyncEnd[i];
++            current->VTotal     = pSiS->SiS_Pr->CP_VTotal[i];
++
++            current->CrtcHDisplay = current->HDisplay;
++            current->CrtcHBlankStart = pSiS->SiS_Pr->CP_HBlankStart[i];
++            current->CrtcHSyncStart = current->HSyncStart;
++            current->CrtcHSyncEnd = current->HSyncEnd;
++            current->CrtcHBlankEnd = pSiS->SiS_Pr->CP_HBlankEnd[i];
++            current->CrtcHTotal = current->HTotal;
++
++            current->CrtcVDisplay = current->VDisplay;
++            current->CrtcVBlankStart = pSiS->SiS_Pr->CP_VBlankStart[i];
++            current->CrtcVSyncStart = current->VSyncStart;
++            current->CrtcVSyncEnd = current->VSyncEnd;
++            current->CrtcVBlankEnd = pSiS->SiS_Pr->CP_VBlankEnd[i];
++            current->CrtcVTotal = current->VTotal;
++
++	    if(pSiS->SiS_Pr->CP_SyncValid[i]) {
++               if(pSiS->SiS_Pr->CP_HSync_P[i])
++                  current->Flags |= V_PHSYNC;
++               else
++                  current->Flags |= V_NHSYNC;
++
++               if(pSiS->SiS_Pr->CP_VSync_P[i])
++                  current->Flags |= V_PVSYNC;
++               else
++                  current->Flags |= V_NVSYNC;
++	    } else {
++	       /* No sync data? Use positive sync... */
++	       current->Flags |= V_PHSYNC;
++	       current->Flags |= V_PVSYNC;
++	    }
++         }
++      }
++   }
++
+    return first;
+ 
+ }
+@@ -5486,25 +5897,25 @@ sisfb_mode_rate_to_dclock(SiS_Private *S
+     UCHAR  *ROMAddr  = HwDeviceExtension->pjVirtualRomBase;
+     ULONG  temp = 0;
+     int    Clock;
+-    
++
+     if(HwDeviceExtension->jChipType < SIS_315H) {
+ #ifdef SIS300
+        InitTo300Pointer(SiS_Pr, HwDeviceExtension);
+ #else
+-       return 65;
++       return 65 * 1000 * 1000;
+ #endif
+     } else {
+ #ifdef SIS315H
+        InitTo310Pointer(SiS_Pr, HwDeviceExtension);
+ #else
+-       return 65;
++       return 65 * 1000 * 1000;
+ #endif
+     }
+-    
++
+     temp = SiS_SearchModeID(SiS_Pr, ROMAddr, &ModeNo, &ModeIdIndex);
+     if(!temp) {
+     	printk(KERN_ERR "Could not find mode %x\n", ModeNo);
+-    	return 65;
++    	return 65 * 1000 * 1000;
+     }
+     
+     RefreshRateTableIndex = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].REFindex;
+@@ -5518,6 +5929,56 @@ sisfb_mode_rate_to_dclock(SiS_Private *S
+     return(Clock);
+ }
+ 
++BOOLEAN
++sisfb_gettotalfrommode(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension,
++		       unsigned char modeno, int *htotal, int *vtotal, unsigned char rateindex)
++{
++    USHORT ModeNo = modeno;
++    USHORT ModeIdIndex = 0, CRT1Index = 0;
++    USHORT RefreshRateTableIndex = 0;
++    UCHAR  *ROMAddr  = HwDeviceExtension->pjVirtualRomBase;
++    ULONG  temp = 0;
++    unsigned char  sr_data, cr_data, cr_data2;
++
++    if(HwDeviceExtension->jChipType < SIS_315H) {
++#ifdef SIS300
++       InitTo300Pointer(SiS_Pr, HwDeviceExtension);
++#else
++       return FALSE;
++#endif
++    } else {
++#ifdef SIS315H
++       InitTo310Pointer(SiS_Pr, HwDeviceExtension);
++#else
++       return FALSE;
++#endif
++    }
++
++    temp = SiS_SearchModeID(SiS_Pr, ROMAddr, &ModeNo, &ModeIdIndex);
++    if(!temp) return FALSE;
++
++    RefreshRateTableIndex = SiS_Pr->SiS_EModeIDTable[ModeIdIndex].REFindex;
++    RefreshRateTableIndex += (rateindex - 1);
++    CRT1Index = SiS_Pr->SiS_RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC;
++
++    sr_data = SiS_Pr->SiS_CRT1Table[CRT1Index].CR[14];
++    cr_data = SiS_Pr->SiS_CRT1Table[CRT1Index].CR[0];
++    *htotal = (((cr_data & 0xff) | ((unsigned short) (sr_data & 0x03) << 8)) + 5) * 8;
++
++    sr_data = SiS_Pr->SiS_CRT1Table[CRT1Index].CR[13];
++    cr_data = SiS_Pr->SiS_CRT1Table[CRT1Index].CR[6];
++    cr_data2 = SiS_Pr->SiS_CRT1Table[CRT1Index].CR[7];
++    *vtotal = ((cr_data & 0xFF) |
++               ((unsigned short)(cr_data2 & 0x01) <<  8) |
++	       ((unsigned short)(cr_data2 & 0x20) <<  4) |
++	       ((unsigned short)(sr_data  & 0x01) << 10)) + 2;
++
++    if(SiS_Pr->SiS_RefIndex[RefreshRateTableIndex].Ext_InfoFlag & InterlaceMode)
++       *vtotal *= 2;
++
++    return TRUE;
++}
++
+ int
+ sisfb_mode_rate_to_ddata(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension,
+ 			 unsigned char modeno, unsigned char rateindex,
+@@ -5606,17 +6067,32 @@ sisfb_mode_rate_to_ddata(SiS_Private *Si
+     C = (temp > 0) ? temp : (temp + 64);
+ 
+     D = B - F - C;
+-    
+-    *left_margin = D * 8;
+-    *right_margin = F * 8;
+-    *hsync_len = C * 8;
++
++    if((SiS_Pr->SiS_RefIndex[RefreshRateTableIndex].XRes == 320) &&
++       ((SiS_Pr->SiS_RefIndex[RefreshRateTableIndex].YRes == 200) ||
++	(SiS_Pr->SiS_RefIndex[RefreshRateTableIndex].YRes == 240))) {
++
++	 /* Terrible hack, but the correct CRTC data for
++	  * these modes only produces a black screen...
++	  */
++       *left_margin = (400 - 376);
++       *right_margin = (328 - 320);
++       *hsync_len = (376 - 328);
++
++    } else {
++
++       *left_margin = D * 8;
++       *right_margin = F * 8;
++       *hsync_len = C * 8;
++
++    }
+ 
+     sr_data = SiS_Pr->SiS_CRT1Table[index].CR[13];
+ 
+     cr_data = SiS_Pr->SiS_CRT1Table[index].CR[6];
+-    
++
+     cr_data2 = SiS_Pr->SiS_CRT1Table[index].CR[7];
+-    
++
+     /* Vertical total */
+     VT = (cr_data & 0xFF) |
+          ((unsigned short) (cr_data2 & 0x01) << 8) |
+@@ -5699,19 +6175,19 @@ sisfb_mode_rate_to_ddata(SiS_Private *Si
+ 	  j++;
+       }
+     }       
+-       
+-#if 0  /* That's bullshit, only the resolution needs to be shifted */    
++
+     if((*vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED) {
++#if 0  /* Do this? */
+        *upper_margin <<= 1;
+        *lower_margin <<= 1;
+        *vsync_len <<= 1;
++#endif
+     } else if((*vmode & FB_VMODE_MASK) == FB_VMODE_DOUBLE) {
+        *upper_margin >>= 1;
+        *lower_margin >>= 1;
+        *vsync_len >>= 1;
+-    }  
+-#endif
+-          
++    }
++
+     return 1;       
+ }			  
+ 
+--- linux-2.6.0-test6/drivers/video/sis/initdef.h	2003-06-14 12:18:24.000000000 -0700
++++ 25/drivers/video/sis/initdef.h	2003-10-05 00:34:22.000000000 -0700
+@@ -1,5 +1,37 @@
+ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/initdef.h,v 1.4 2000/12/02 01:16:17 dawes Exp $ */
+-
++/*
++ * Global definitions for init.c and init301.c
++ *
++ * Copyright 2002, 2003 by Thomas Winischhofer, Vienna, Austria
++ *
++ * If distributed as part of the linux kernel, the contents of this file
++ * is entirely covered by the GPL.
++ *
++ * Otherwise, the following terms apply:
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of the copyright holder not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission.  The copyright holder makes no representations
++ * about the suitability of this software for any purpose.  It is provided
++ * "as is" without express or implied warranty.
++ *
++ * THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++ * EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ *
++ * Author: 	Thomas Winischhofer <thomas@winischhofer.net>
++ *
++ * Based on code by Silicon Intergrated Systems
++ *
++ */
+ 
+ #ifndef _INITDEF_
+ #define _INITDEF_
+@@ -22,12 +54,19 @@
+ #define VB_SIS301B302B          (VB_SIS301B|VB_SIS302B)
+ #define VB_SIS301LV302LV        (VB_SIS301LV|VB_SIS302LV)
+ 
+-#define IS_SIS650740            ((HwDeviceExtension->jChipType >= SIS_650) && (HwDeviceExtension->jChipType < SIS_330))
+-
+ #define IS_SIS650		(HwDeviceExtension->jChipType == SIS_650)
+ #define IS_SIS740		(HwDeviceExtension->jChipType == SIS_740)
+ #define IS_SIS330		(HwDeviceExtension->jChipType == SIS_330)
+ #define IS_SIS550		(HwDeviceExtension->jChipType == SIS_550)
++#define IS_SIS651	        (SiS_Pr->SiS_SysFlags & (SF_Is651 | SF_Is652))
++#define IS_SISM650	        (SiS_Pr->SiS_SysFlags & (SF_IsM650 | SF_IsM652 | SF_IsM653))
++#define IS_SIS65x               (IS_SIS651 || IS_SISM650)
++#define IS_SIS660		(HwDeviceExtension->jChipType == SIS_660)
++#define IS_SIS760		(HwDeviceExtension->jChipType == SIS_760)
++#define IS_SIS650660            (IS_SIS650 || IS_SIS660)
++#define IS_SIS650740            ((HwDeviceExtension->jChipType >= SIS_650) && (HwDeviceExtension->jChipType < SIS_330))
++#define IS_SIS650740660         (IS_SIS650 || IS_SIS660 || IS_SIS740 || IS_SIS760)
++#define IS_SIS550650740660      (IS_SIS550 || IS_SIS650 || IS_SIS660 || IS_SIS740 || IS_SIS760)
+ 
+ #define CRT1Len                 17
+ #define LVDSCRT1Len             15
+@@ -63,7 +102,7 @@
+ #define SupportTV               0x0008
+ #define SupportHiVisionTV       0x0010
+ #define SupportLCD              0x0020
+-#define SupportRAMDAC2          0x0040  
++#define SupportRAMDAC2          0x0040
+ #define NoSupportTV             0x0070
+ #define NoSupportHiVisionTV     0x0060
+ #define NoSupportLCD            0x0058
+@@ -105,6 +144,24 @@
+ #define HotKeySwitch            0x8000  /* TW: ? */
+ #define SetCRT2ToLCDA           0x8000
+ 
++/* SetFlag */
++#define ProgrammingCRT2         0x01
++#define TVSimuMode              0x02
++#define RPLLDIV2XO              0x04
++#define LCDVESATiming           0x08
++#define EnableLVDSDDA           0x10
++#define SetDispDevSwitchFlag    0x20
++#define CheckWinDos             0x40
++#define SetDOSMode              0x80
++
++/* SysFlags */
++#define SF_Is651                0x0001
++#define SF_IsM650               0x0002
++#define SF_Is652		0x0004
++#define SF_IsM652		0x0008
++#define SF_IsM653		0x0010
++#define SF_Is660		0x8000
++
+ #define PanelRGB18Bit           0x0100
+ #define PanelRGB24Bit           0x0000
+ 
+@@ -112,7 +169,7 @@
+ #define TVOverScanShift         4
+ #define ClearBufferFlag         0x20
+ 
+-/* CR32 (Newer 630, and 310/325 series)
++/* CR32 (Newer 630, and 315 series)
+ 
+    [0]   VB connected with CVBS
+    [1]   VB connected with SVHS
+@@ -134,7 +191,7 @@
+ 	    011   LVDS + Tumpion Zurac
+ 	    100   LVDS + Chrontel 7005
+ 	    110   Chrontel 7005
+-	  310/325 series
++	  315 series
+ 	    001   SiS30x (never seen)
+ 	    010   LVDS
+ 	    011   LVDS + Chrontel 7019
+@@ -163,14 +220,15 @@
+ #define LCDSyncBit            0x00e0
+ #define LCDSyncShift               6
+ 
+-/* CR38 (310/325 series) */
++/* CR38 (315 series) */
+ #define EnableDualEdge 		0x01   
+ #define SetToLCDA		0x02   /* LCD channel A (302B/LV and 650+LVDS only) */
+ #define EnableSiSHiVision       0x04   /* HiVision (HDTV) on SiS bridge */
+ #define EnableLVDSScart         0x04   /* Scart on Ch7019 (unofficial definition - TW) */
+ #define EnableLVDSHiVision      0x08   /* YPbPr color format (480i HDTV); only on 650/Ch7019 systems */
+-#define SiSHiVision1            0x10   /* See SetHiVision() */
+-#define SiSHiVision2            0x20
++#define EnableHiVision750       0x08   /* Enable 750P HiVision mode (30xLV only) */
++#define EnableHiVision525       0x10   /* Enable 525P HiVision mode (30xLV only) */
++#define SiSHiVision2            0x20   /* ? - |  --- mask 0x38 combinations have different meaning! */
+ #define EnablePALM              0x40   /* 1 = Set PALM */
+ #define EnablePALN              0x80   /* 1 = Set PALN */
+ 
+@@ -184,7 +242,7 @@
+ #define Enable302LV_DualLink    0x04   /* 30xNEW (302LV) only; set by mode switching function */
+ 
+ 
+-/* CR79 (310/325 series only)
++/* CR79 (315 series only)
+    [3-0] Notify driver
+          0001 Mode Switch event (set by BIOS)
+ 	 0010 Epansion On/Off event
+@@ -202,16 +260,6 @@
+    [7]   TV UnderScan/OverScan (set by BIOS)
+ */
+ 
+-/* SetFlag */
+-#define ProgrammingCRT2         0x01
+-#define TVSimuMode              0x02
+-#define RPLLDIV2XO              0x04
+-#define LCDVESATiming           0x08
+-#define EnableLVDSDDA           0x10
+-#define SetDispDevSwitchFlag    0x20
+-#define CheckWinDos             0x40
+-#define SetDOSMode              0x80
+-
+ /* LCDResInfo */
+ #define Panel300_800x600        0x01	/* CR36 */
+ #define Panel300_1024x768       0x02
+@@ -220,7 +268,10 @@
+ #define Panel300_640x480        0x05
+ #define Panel300_1024x600       0x06
+ #define Panel300_1152x768       0x07
+-#define Panel300_320x480        0x08 	/* fstn - TW: This is fake, can be any */
++#define Panel300_1280x768       0x0a
++#define Panel300_320x480        0x0e 	/* fstn - TW: This is fake, can be any */
++#define Panel300_Custom		0x0f
++#define Panel300_Barco1366      0x10
+ 
+ #define Panel310_800x600        0x01
+ #define Panel310_1024x768       0x02
+@@ -231,9 +282,12 @@
+ #define Panel310_1280x960       0x07
+ #define Panel310_1152x768       0x08	/* LVDS only */
+ #define Panel310_1400x1050      0x09
+-#define Panel310_1280x768       0x0a    /* LVDS only */
++#define Panel310_1280x768       0x0a
+ #define Panel310_1600x1200      0x0b
+-#define Panel310_320x480        0x0c    /* fstn - TW: This is fake, can be any */
++#define Panel310_640x480_2      0x0c
++#define Panel310_640x480_3      0x0d
++#define Panel310_320x480        0x0e    /* fstn - TW: This is fake, can be any */
++#define Panel310_Custom		0x0f
+ 
+ #define Panel_800x600           0x01	/* Unified values */
+ #define Panel_1024x768          0x02
+@@ -246,7 +300,43 @@
+ #define Panel_1400x1050         0x09
+ #define Panel_1280x768          0x0a    /* LVDS only */
+ #define Panel_1600x1200         0x0b
+-#define Panel_320x480           0x0c    /* fstn - TW: This is fake, can be any */
++#define Panel_640x480_2		0x0c
++#define Panel_640x480_3		0x0d
++#define Panel_320x480           0x0e    /* fstn - TW: This is fake, can be any */
++#define Panel_Custom		0x0f
++#define Panel_Barco1366         0x10
++#define Panel_848x480		0x11
++
++/* Index in ModeResInfo table */
++#define SIS_RI_320x200 0
++#define SIS_RI_320x240 1
++#define SIS_RI_320x400 2
++#define SIS_RI_400x300 3
++#define SIS_RI_512x384 4
++#define SIS_RI_640x400 5
++#define SIS_RI_640x480 6
++#define SIS_RI_800x600 7
++#define SIS_RI_1024x768 8
++#define SIS_RI_1280x1024 9
++#define SIS_RI_1600x1200 10
++#define SIS_RI_1920x1440 11
++#define SIS_RI_2048x1536 12
++#define SIS_RI_720x480 13
++#define SIS_RI_720x576 14
++#define SIS_RI_1280x960 15
++#define SIS_RI_800x480 16
++#define SIS_RI_1024x576 17
++#define SIS_RI_1280x720 18
++#define SIS_RI_856x480 19
++#define SIS_RI_1280x768 20
++#define SIS_RI_1400x1050 21
++#define SIS_RI_1152x864 22
++#define SIS_RI_848x480 23
++#define SIS_RI_1360x768 24
++#define SIS_RI_1024x600 25
++#define SIS_RI_1152x768 26
++#define SIS_RI_768x576 27
++#define SIS_RI_1360x1024 28
+ 
+ #define ExtChipType             0x0e
+ #define ExtChip301              0x02
+@@ -278,15 +368,34 @@
+ #define VCLKStartFreq           25
+ #define SoftDramType            0x80
+ 
+-#define VCLK40                  0x04   /* Index in VCLKData array */
+-#define VCLK65                  0x09   /* Index in VCLKData array */
+-#define VCLK108_2               0x14   /* Index in VCLKData array */
+-#define TVVCLKDIV2              0x21   /* Indices in (VB)VCLKData arrays */
+-#define TVVCLK                  0x22
+-#define HiTVVCLKDIV2            0x23
+-#define HiTVVCLK                0x24
+-#define HiTVSimuVCLK            0x25
+-#define HiTVTextVCLK            0x26
++/* Indices in (VB)VCLKData tables */
++
++#define VCLK28                  0x00   /* Index in VCLKData table (300 and 315) */
++#define VCLK40                  0x04   /* Index in VCLKData table (300 and 315) */
++#define VCLK65_300              0x09   /* Index in VCLKData table (300) */
++#define VCLK108_2_300           0x14   /* Index in VCLKData table (300) */
++#define VCLK81_300		0x3f   /* Index in VCLKData table (300) */
++#define VCLK108_3_300           0x42   /* Index in VCLKData table (300) */
++#define VCLK100_300             0x43   /* Index in VCLKData table (300) */
++#define VCLK34_300              0x3d   /* Index in VCLKData table (300) */
++#define VCLK65_315              0x0b   /* Index in (VB)VCLKData table (315) */
++#define VCLK108_2_315           0x19   /* Index in (VB)VCLKData table (315) */
++#define VCLK81_315		0x5b   /* Index in (VB)VCLKData table (315) */
++#define VCLK162_315             0x21   /* Index in (VB)VCLKData table (315) */
++#define VCLK108_3_315           0x45   /* Index in VBVCLKData table (315) */
++#define VCLK100_315             0x46   /* Index in VBVCLKData table (315) */
++#define VCLK34_315              0x55   /* Index in VBVCLKData table (315) */
++
++#define TVCLKBASE_300		0x21   /* Indices on TV clocks in VCLKData table (300) */
++#define TVCLKBASE_315	        0x3a   /* Indices on TV clocks in (VB)VCLKData table (315) */
++#define TVVCLKDIV2              0x00   /* Index relative to TVCLKBASE */
++#define TVVCLK                  0x01   /* Index relative to TVCLKBASE */
++#define HiTVVCLKDIV2            0x02   /* Index relative to TVCLKBASE */
++#define HiTVVCLK                0x03   /* Index relative to TVCLKBASE */
++#define HiTVSimuVCLK            0x04   /* Index relative to TVCLKBASE */
++#define HiTVTextVCLK            0x05   /* Index relative to TVCLKBASE */
++
++/* ------------------------------ */
+ 
+ #define LoadDACFlag             0x1000
+ #define AfterLockCRT2           0x4000
+@@ -306,6 +415,8 @@
+ #define HotPlugFunction         0x08
+ #define StStructSize            0x06
+ 
++#define SIS_VIDEO_CAPTURE       0x00 - 0x30
++#define SIS_VIDEO_PLAYBACK      0x02 - 0x30
+ #define SIS_CRT2_PORT_04        0x04 - 0x30
+ #define SIS_CRT2_PORT_10        0x10 - 0x30
+ #define SIS_CRT2_PORT_12        0x12 - 0x30
+@@ -393,7 +504,7 @@
+ 
+ /*
+   =============================================================
+-   			for 310/325 series
++   			  for 315 series
+   =============================================================
+ */
+ #define SoftDRAMType        0x80
+--- linux-2.6.0-test6/drivers/video/sis/init.h	2003-06-14 12:18:30.000000000 -0700
++++ 25/drivers/video/sis/init.h	2003-10-05 00:34:22.000000000 -0700
+@@ -1,19 +1,47 @@
++/* $XFree86$ */
++/*
++ * Data and prototypes for init.c
++ *
++ * Copyright 2002, 2003 by Thomas Winischhofer, Vienna, Austria
++ *
++ * If distributed as part of the linux kernel, the contents of this file
++ * is entirely covered by the GPL.
++ *
++ * Otherwise, the following terms apply:
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of the copyright holder not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission.  The copyright holder makes no representations
++ * about the suitability of this software for any purpose.  It is provided
++ * "as is" without express or implied warranty.
++ *
++ * THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++ * EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ *
++ * Author: 	Thomas Winischhofer <thomas@winischhofer.net>
++ *
++ * Based on code by Silicon Intergrated Systems
++ *
++ */
++
+ #ifndef _INIT_
+ #define _INIT_
+ 
+ #include "osdef.h"
++
+ #include "initdef.h"
+ #include "vgatypes.h"
+ #include "vstruct.h"
+ 
+-#ifdef TC
+-#include <stdio.h>
+-#include <string.h>
+-#include <conio.h>
+-#include <dos.h>
+-#include <stdlib.h>
+-#endif
+-
+ #ifdef LINUX_XF86
+ #include "xf86.h"
+ #include "xf86Pci.h"
+@@ -24,6 +52,9 @@
+ #endif
+ 
+ #ifdef LINUX_KERNEL
++#ifdef SIS_CP
++#undef SIS_CP
++#endif
+ #include <linux/config.h>
+ #include <linux/version.h>
+ #include <linux/types.h>
+@@ -36,19 +67,6 @@
+ #endif
+ #endif
+ 
+-#ifdef WIN2000
+-#include <stdio.h>
+-#include <string.h>
+-#include <miniport.h>
+-#include "dderror.h"
+-#include "devioctl.h"
+-#include "miniport.h"
+-#include "ntddvdeo.h"
+-#include "video.h"
+-#include "sisv.h"
+-#include "tools.h"
+-#endif
+-
+ const USHORT SiS_DRAMType[17][5]={
+ 	{0x0C,0x0A,0x02,0x40,0x39},
+ 	{0x0D,0x0A,0x01,0x40,0x48},
+@@ -144,6 +162,2227 @@ const USHORT SiS_VGA_DAC[] =
+ 	0x0B,0x0C,0x0D,0x0F,0x10
+ };
+ 
++static const SiS_StResInfoStruct SiS_StResInfo[]=
++{
++	{ 640,400},
++	{ 640,350},
++	{ 720,400},
++	{ 720,350},
++	{ 640,480}
++};
++
++static const SiS_ModeResInfoStruct SiS_ModeResInfo[] =
++{
++	{  320, 200, 8, 8},   /* 0x00 */
++	{  320, 240, 8, 8},   /* 0x01 */
++	{  320, 400, 8, 8},   /* 0x02 */
++	{  400, 300, 8, 8},   /* 0x03 */
++	{  512, 384, 8, 8},   /* 0x04 */
++	{  640, 400, 8,16},   /* 0x05 */
++	{  640, 480, 8,16},   /* 0x06 */
++	{  800, 600, 8,16},   /* 0x07 */
++	{ 1024, 768, 8,16},   /* 0x08 */
++	{ 1280,1024, 8,16},   /* 0x09 */
++	{ 1600,1200, 8,16},   /* 0x0a */
++	{ 1920,1440, 8,16},   /* 0x0b */
++	{ 2048,1536, 8,16},   /* 0x0c */
++	{  720, 480, 8,16},   /* 0x0d */
++	{  720, 576, 8,16},   /* 0x0e */
++	{ 1280, 960, 8,16},   /* 0x0f */
++	{  800, 480, 8,16},   /* 0x10 */
++	{ 1024, 576, 8,16},   /* 0x11 */
++	{ 1280, 720, 8,16},   /* 0x12 */
++	{  856, 480, 8,16},   /* 0x13 */
++	{ 1280, 768, 8,16},   /* 0x14 */
++	{ 1400,1050, 8,16},   /* 0x15 */
++	{ 1152, 864, 8,16},   /* 0x16 */
++	{  848, 480, 8,16},   /* 0x17 */
++	{ 1360, 768, 8,16},   /* 0x18 */
++	{ 1024, 600, 8,16},   /* 0x19 */
++	{ 1152, 768, 8,16},   /* 0x1a */
++	{  768, 576, 8,16},   /* 0x1b */
++	{ 1360,1024, 8,16}    /* 0x1c */
++};
++
++static SiS_StandTableStruct SiS_StandTable[]=
++{
++/* 0x00: MD_0_200 */
++ {
++  0x28,0x18,0x08,0x0800,
++  {0x09,0x03,0x00,0x02},
++  0x63,
++  {0x2d,0x27,0x28,0x90,0x2b,0xa0,0xbf,0x1f,
++   0x00,0xc7,0x06,0x07,0x00,0x00,0x00,0x00,
++   0x9c,0x8e,0x8f,0x14,0x1f,0x96,0xb9,0xa3,
++   0xff},
++  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
++   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
++   0x08,0x00,0x0f,0x00},
++  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
++   0xff}
++ },
++/* 0x01: MD_1_200 */
++ {
++  0x28,0x18,0x08,0x0800,
++  {0x09,0x03,0x00,0x02},
++  0x63,
++  {0x2d,0x27,0x28,0x90,0x2b,0xa0,0xbf,0x1f,
++   0x00,0xc7,0x06,0x07,0x00,0x00,0x00,0x00,
++   0x9c,0x8e,0x8f,0x14,0x1f,0x96,0xb9,0xa3,
++   0xff},
++  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
++   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
++   0x08,0x00,0x0f,0x00},
++  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
++   0xff}
++ },
++/* 0x02: MD_2_200 */
++ {
++  0x50,0x18,0x08,0x1000,
++  {0x01,0x03,0x00,0x02},
++  0x63,
++  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
++   0x00,0xc7,0x06,0x07,0x00,0x00,0x00,0x00,
++   0x9c,0x8e,0x8f,0x28,0x1f,0x96,0xb9,0xa3,
++   0xff},
++  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
++   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
++   0x08,0x00,0x0f,0x00},
++  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
++   0xff}
++ },
++/* 0x03: MD_3_200 - mode 0x03 - 0 */
++ {
++  0x50,0x18,0x08,0x1000,
++  {0x01,0x03,0x00,0x02},
++  0x63,
++  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
++   0x00,0xc7,0x06,0x07,0x00,0x00,0x00,0x00,
++   0x9c,0x8e,0x8f,0x28,0x1f,0x96,0xb9,0xa3,
++   0xff},
++  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
++   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
++   0x08,0x00,0x0f,0x00},
++  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
++   0xff}
++ },
++/* 0x04: MD_4 */
++ {
++  0x28,0x18,0x08,0x4000,
++  {0x09,0x03,0x00,0x02},
++  0x63,
++  {0x2d,0x27,0x28,0x90,0x2c,0x80,0xbf,0x1f,   /* 0x2c is 2b for 300 */
++   0x00,0xc1,0x00,0x00,0x00,0x00,0x00,0x00,
++   0x9c,0x8e,0x8f,0x14,0x00,0x96,0xb9,0xa2,
++   0xff},
++  {0x00,0x13,0x15,0x17,0x02,0x04,0x06,0x07,
++   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
++   0x01,0x00,0x03,0x00},
++  {0x00,0x00,0x00,0x00,0x00,0x30,0x0f,0x00,
++   0xff}
++ },
++/* 0x05: MD_5 */
++ {
++  0x28,0x18,0x08,0x4000,
++  {0x09,0x03,0x00,0x02},
++  0x63,
++  {0x2d,0x27,0x28,0x90,0x2c,0x80,0xbf,0x1f,   /* 0x2c is 2b for 300 */
++   0x00,0xc1,0x00,0x00,0x00,0x00,0x00,0x00,
++   0x9c,0x8e,0x8f,0x14,0x00,0x96,0xb9,0xa2,
++   0xff},
++  {0x00,0x13,0x15,0x17,0x02,0x04,0x06,0x07,
++   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
++   0x01,0x00,0x03,0x00},
++  {0x00,0x00,0x00,0x00,0x00,0x30,0x0f,0x00,
++   0xff}
++ },
++/* 0x06: MD_6 */
++ {
++  0x50,0x18,0x08,0x4000,
++  {0x01,0x01,0x00,0x06},
++  0x63,
++  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,   /* 55,81 is 54,80 for 300 */
++   0x00,0xc1,0x00,0x00,0x00,0x00,0x00,0x00,
++   0x9c,0x8e,0x8f,0x28,0x00,0x96,0xb9,0xc2,
++   0xff},
++  {0x00,0x17,0x17,0x17,0x17,0x17,0x17,0x17,
++   0x17,0x17,0x17,0x17,0x17,0x17,0x17,0x17,
++   0x01,0x00,0x01,0x00},
++  {0x00,0x00,0x00,0x00,0x00,0x00,0x0d,0x00,
++   0xff}
++ },
++/* 0x07: MD_7 */
++ {
++  0x50,0x18,0x0e,0x1000,
++  {0x00,0x03,0x00,0x03},
++  0xa6,
++  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
++   0x00,0x4d,0x0b,0x0c,0x00,0x00,0x00,0x00,
++   0x83,0x85,0x5d,0x28,0x0d,0x63,0xba,0xa3,
++   0xff},
++  {0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x08,
++   0x10,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
++   0x0e,0x00,0x0f,0x08},
++  {0x00,0x00,0x00,0x00,0x00,0x10,0x0a,0x00,
++   0xff}
++ },
++/* 0x08: MDA_DAC */
++ {
++  0x00,0x00,0x00,0x0000,
++  {0x00,0x00,0x00,0x15},
++  0x15,
++  {0x15,0x15,0x15,0x15,0x15,0x15,0x15,0x15,
++   0x15,0x15,0x15,0x15,0x15,0x15,0x3f,0x3f,
++   0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x00,0x00,
++   0x00},
++  {0x00,0x00,0x00,0x00,0x00,0x15,0x15,0x15,
++   0x15,0x15,0x15,0x15,0x15,0x15,0x15,0x15,
++   0x15,0x15,0x15,0x15},
++  {0x15,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,
++   0x3f}
++ },
++/* 0x09: CGA_DAC */
++ {
++  0x00,0x10,0x04,0x0114,
++  {0x11,0x09,0x15,0x00},
++  0x10,
++  {0x04,0x14,0x01,0x11,0x09,0x15,0x2a,0x3a,
++   0x2e,0x3e,0x2b,0x3b,0x2f,0x3f,0x2a,0x3a,
++   0x2e,0x3e,0x2b,0x3b,0x2f,0x3f,0x00,0x10,
++   0x04},
++  {0x14,0x01,0x11,0x09,0x15,0x00,0x10,0x04,
++   0x14,0x01,0x11,0x09,0x15,0x2a,0x3a,0x2e,
++   0x3e,0x2b,0x3b,0x2f},
++  {0x3f,0x2a,0x3a,0x2e,0x3e,0x2b,0x3b,0x2f,
++   0x3f}
++ },
++/* 0x0a: EGA_DAC */
++ {
++  0x00,0x10,0x04,0x0114,
++  {0x11,0x05,0x15,0x20},
++  0x30,
++  {0x24,0x34,0x21,0x31,0x25,0x35,0x08,0x18,
++   0x0c,0x1c,0x09,0x19,0x0d,0x1d,0x28,0x38,
++   0x2c,0x3c,0x29,0x39,0x2d,0x3d,0x02,0x12,
++   0x06},
++  {0x16,0x03,0x13,0x07,0x17,0x22,0x32,0x26,
++   0x36,0x23,0x33,0x27,0x37,0x0a,0x1a,0x0e,
++   0x1e,0x0b,0x1b,0x0f},
++  {0x1f,0x2a,0x3a,0x2e,0x3e,0x2b,0x3b,0x2f,
++   0x3f}
++ },
++/* 0x0b: VGA_DAC */
++ {
++  0x00,0x10,0x04,0x0114,
++  {0x11,0x09,0x15,0x2a},
++  0x3a,
++  {0x2e,0x3e,0x2b,0x3b,0x2f,0x3f,0x00,0x05,
++   0x08,0x0b,0x0e,0x11,0x14,0x18,0x1c,0x20,
++   0x24,0x28,0x2d,0x32,0x38,0x3f,0x00,0x10,
++   0x1f},
++  {0x2f,0x3f,0x1f,0x27,0x2f,0x37,0x3f,0x2d,
++   0x31,0x36,0x3a,0x3f,0x00,0x07,0x0e,0x15,
++   0x1c,0x0e,0x11,0x15},
++  {0x18,0x1c,0x14,0x16,0x18,0x1a,0x1c,0x00,
++   0x04}
++ },
++/* 0x0c */
++ {
++  0x08,0x0c,0x10,0x0a08,
++  {0x0c,0x0e,0x10,0x0b},
++  0x0c,
++  {0x0d,0x0f,0x10,0x10,0x01,0x08,0x00,0x00,
++   0x00,0x00,0x01,0x00,0x02,0x02,0x01,0x00,
++   0x04,0x04,0x01,0x00,0x05,0x02,0x05,0x00,
++   0x06},
++  {0x01,0x06,0x05,0x06,0x00,0x08,0x01,0x08,
++   0x00,0x07,0x02,0x07,0x06,0x07,0x00,0x00,
++   0x00,0x00,0x00,0x00},
++  {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++   0x00}
++ },
++/* 0x0d: MD_D */
++ {
++  0x28,0x18,0x08,0x2000,
++  {0x09,0x0f,0x00,0x06},
++  0x63,
++  {0x2d,0x27,0x28,0x90,0x2c,0x80,0xbf,0x1f,     /* 2c is 2b for 300 */
++   0x00,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,
++   0x9c,0x8e,0x8f,0x14,0x00,0x96,0xb9,0xe3,
++   0xff},
++  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
++   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
++   0x01,0x00,0x0f,0x00},
++  {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x0f,
++   0xff}
++ },
++/* 0x0e: MD_E */
++ {
++  0x50,0x18,0x08,0x4000,
++  {0x01,0x0f,0x00,0x06},
++  0x63,
++  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,     /* 55,81 is 54,80 for 300 */
++   0x00,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,
++   0x9c,0x8e,0x8f,0x28,0x00,0x96,0xb9,0xe3,
++   0xff},
++  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
++   0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
++   0x01,0x00,0x0f,0x00},
++  {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x0f,
++   0xff}
++ },
++/* 0x0f: ExtVGATable - modes > 0x13 */
++ {
++  0x00,0x00,0x00,0x0000,
++  {0x01,0x0f,0x00,0x0e},
++  0x23,
++  {0x5f,0x4f,0x50,0x82,0x54,0x80,0x0b,0x3e,
++   0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
++   0xea,0x8c,0xdf,0x28,0x40,0xe7,0x04,0xa3,
++   0xff},
++  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
++   0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,
++   0x01,0x00,0x00,0x00},
++  {0x00,0x00,0x00,0x00,0x00,0x40,0x05,0x0f,
++   0xff}
++ },
++/* 0x10: ROM_SAVEPTR - totally different for 300 */
++ {
++  0x9f,0x3b,0x00,0x00c0,
++  {0x00,0x00,0x00,0x00},
++  0x00,
++  {0x00,0x00,0x00,0x00,0x00,0x00,0xbb,0x3f,
++   0x00,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,
++   0x00,0x00,0x1a,0x00,0xac,0x3e,0x00,0xc0,
++   0x00},
++  {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++   0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++   0x00,0x00,0x00,0x00},
++  {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
++   0x00}
++ },
++/* 0x11: MD_F */
++ {
++  0x50,0x18,0x0e,0x8000,
++  {0x01,0x0f,0x00,0x06},
++  0xa2,
++  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,    /* 55,81 is 54,80 on 300 */
++   0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
++   0x82,0x84,0x5d,0x28,0x0f,0x63,0xba,0xe3,    /* 82,84 is 83,85 on 300 */
++   0xff},
++  {0x00,0x08,0x00,0x00,0x18,0x18,0x00,0x00,
++   0x00,0x08,0x00,0x00,0x00,0x18,0x00,0x00,
++   0x0b,0x00,0x05,0x00},
++  {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x05,
++   0xff}
++ },
++/* 0x12: MD_10 */
++ {
++  0x50,0x18,0x0e,0x8000,
++  {0x01,0x0f,0x00,0x06},
++  0xa3,
++  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,    /* 55,81 is 54,80 on 300 */
++   0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
++   0x82,0x84,0x5d,0x28,0x0f,0x63,0xba,0xe3,    /* 82,84 is 83,85 on 300 */
++   0xff},
++  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
++   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
++   0x01,0x00,0x0f,0x00},
++  {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x0f,
++   0xff}
++ },
++/* 0x13: MD_0_350 */
++ {
++  0x28,0x18,0x0e,0x0800,
++  {0x09,0x03,0x00,0x02},
++  0xa3,
++  {0x2d,0x27,0x28,0x90,0x2b,0xb1,0xbf,0x1f,    /* b1 is a0 on 300 */
++   0x00,0x4d,0x0b,0x0c,0x00,0x00,0x00,0x00,
++   0x83,0x85,0x5d,0x14,0x1f,0x63,0xba,0xa3,
++   0xff},
++  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
++   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
++   0x08,0x00,0x0f,0x00},
++  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
++   0xff}
++ },
++/* 0x14: MD_1_350 */
++ {
++  0x28,0x18,0x0e,0x0800,
++  {0x09,0x03,0x00,0x02},
++  0xa3,
++  {0x2d,0x27,0x28,0x90,0x2b,0xa0,0xbf,0x1f,
++   0x00,0x4d,0x0b,0x0c,0x00,0x00,0x00,0x00,
++   0x83,0x85,0x5d,0x14,0x1f,0x63,0xba,0xa3,
++   0xff},
++  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
++   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
++   0x08,0x00,0x0f,0x00},
++  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
++   0xff}
++ },
++/* 0x15: MD_2_350 */
++ {
++  0x50,0x18,0x0e,0x1000,
++  {0x01,0x03,0x00,0x02},
++  0xa3,
++  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
++   0x00,0x4d,0x0b,0x0c,0x00,0x00,0x00,0x00,
++   0x83,0x85,0x5d,0x28,0x1f,0x63,0xba,0xa3,
++   0xff},
++  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
++   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
++   0x08,0x00,0x0f,0x00},
++  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
++   0xff}
++ },
++/* 0x16: MD_3_350 - mode 0x03 - 1 */
++ {
++  0x50,0x18,0x0e,0x1000,
++  {0x01,0x03,0x00,0x02},
++  0xa3,
++  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
++   0x00,0x4d,0x0b,0x0c,0x00,0x00,0x00,0x00,
++   0x83,0x85,0x5d,0x28,0x1f,0x63,0xba,0xa3,
++   0xff},
++  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
++   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
++   0x08,0x00,0x0f,0x00},
++  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
++   0xff}
++ },
++/* 0x17: MD_0_1_400 */
++ {
++  0x28,0x18,0x10,0x0800,
++  {0x08,0x03,0x00,0x02},
++  0x67,
++  {0x2d,0x27,0x28,0x90,0x2b,0xb1,0xbf,0x1f,    /* b1 is a0 on 300 */
++   0x00,0x4f,0x0d,0x0e,0x00,0x00,0x00,0x00,
++   0x9c,0x8e,0x8f,0x14,0x1f,0x96,0xb9,0xa3,
++   0xff},
++  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
++   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
++   0x0c,0x00,0x0f,0x08},
++  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
++   0xff}
++ },
++/* 0x18: MD_2_3_400 - mode 0x03 - 2 */
++ {
++  0x50,0x18,0x10,0x1000,
++  {0x00,0x03,0x00,0x02},
++  0x67,
++  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
++   0x00,0x4f,0x0d,0x0e,0x00,0x00,0x00,0x00,
++   0x9c,0x8e,0x8f,0x28,0x1f,0x96,0xb9,0xa3,
++   0xff},
++  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
++   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
++   0x0c,0x00,0x0f,0x08},
++  {0x00,0x00,0x00,0x00,0x00,0x10,0x0e,0x00,
++   0xff}
++ },
++/* 0x19: MD_7_400 */
++ {
++  0x50,0x18,0x10,0x1000,
++  {0x00,0x03,0x00,0x02},
++  0x66,
++  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,
++   0x00,0x4f,0x0d,0x0e,0x00,0x00,0x00,0x00,
++   0x9c,0x8e,0x8f,0x28,0x0f,0x96,0xb9,0xa3,
++   0xff},
++  {0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x08,
++   0x10,0x18,0x18,0x18,0x18,0x18,0x18,0x18,
++   0x0e,0x00,0x0f,0x08},
++  {0x00,0x00,0x00,0x00,0x00,0x10,0x0a,0x00,
++   0xff}
++ },
++/* 0x1a: MD_11 */
++ {
++  0x50,0x1d,0x10,0xa000,
++  {0x01,0x0f,0x00,0x06},
++  0xe3,
++  {0x5f,0x4f,0x50,0x82,0x55,0x81,0x0b,0x3e,    /* 55,81 is 54,80 on 300 */
++   0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
++   0xe9,0x8b,0xdf,0x28,0x00,0xe7,0x04,0xc3,    /* e9,8b is ea,8c on 300 */
++   0xff},
++  {0x00,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,
++   0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,0x3f,
++   0x01,0x00,0x0f,0x00},
++  {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x01,
++   0xff}
++ },
++/* 0x1b: ExtEGATable - Modes <= 0x02 */
++ {
++  0x50,0x1d,0x10,0xa000,
++  {0x01,0x0f,0x00,0x06},
++  0xe3,
++  {0x5f,0x4f,0x50,0x82,0x55,0x81,0x0b,0x3e,    /* 55,81 is 54,80 on 300 */
++   0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,
++   0xe9,0x8b,0xdf,0x28,0x00,0xe7,0x04,0xe3,    /* e9,8b is ea,8c on 300 */
++   0xff},
++  {0x00,0x01,0x02,0x03,0x04,0x05,0x14,0x07,
++   0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,
++   0x01,0x00,0x0f,0x00},
++  {0x00,0x00,0x00,0x00,0x00,0x00,0x05,0x0f,
++   0xff}
++ },
++/* 0x1c: MD_13 */
++ {
++  0x28,0x18,0x08,0x2000,
++  {0x01,0x0f,0x00,0x0e},
++  0x63,
++  {0x5f,0x4f,0x50,0x82,0x55,0x81,0xbf,0x1f,    /* 55,81 is 54,80 on 300 */
++   0x00,0x41,0x00,0x00,0x00,0x00,0x00,0x00,
++   0x9c,0x8e,0x8f,0x28,0x40,0x96,0xb9,0xa3,
++   0xff},
++  {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
++   0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,
++   0x41,0x00,0x0f,0x00},
++  {0x00,0x00,0x00,0x00,0x00,0x40,0x05,0x0f,
++   0xff}
++ }
++};
++
++static const UCHAR SiS_NTSCTiming[] = {
++	0x17,0x1d,0x03,0x09,0x05,0x06,0x0c,0x0c,
++	0x94,0x49,0x01,0x0a,0x06,0x0d,0x04,0x0a,
++	0x06,0x14,0x0d,0x04,0x0a,0x00,0x85,0x1b,
++	0x0c,0x50,0x00,0x97,0x00,0xda,0x4a,0x17,
++	0x7d,0x05,0x4b,0x00,0x00,0xe2,0x00,0x02,
++	0x03,0x0a,0x65,0x9d,0x08,0x92,0x8f,0x40,
++	0x60,0x80,0x14,0x90,0x8c,0x60,0x14,0x50,
++	0x00,0x40,0x44,0x00,0xdb,0x02,0x3b,0x00
++};
++
++static const UCHAR SiS_PALTiming[] = {
++	0x19,0x52,0x35,0x6e,0x04,0x38,0x3d,0x70,
++	0x94,0x49,0x01,0x12,0x06,0x3e,0x35,0x6d,
++	0x06,0x14,0x3e,0x35,0x6d,0x00,0x45,0x2b,
++	0x70,0x50,0x00,0x9b,0x00,0xd9,0x5d,0x17,
++	0x7d,0x05,0x45,0x00,0x00,0xe8,0x00,0x02,
++	0x0d,0x00,0x68,0xb0,0x0b,0x92,0x8f,0x40,
++	0x60,0x80,0x14,0x90,0x8c,0x60,0x14,0x63,
++	0x00,0x40,0x3e,0x00,0xe1,0x02,0x28,0x00
++};
++
++static const UCHAR SiS_HiTVExtTiming[] = {
++        0x32,0x65,0x2c,0x5f,0x08,0x31,0x3a,0x64,
++	0x28,0x02,0x01,0x3d,0x06,0x3e,0x35,0x6d,
++	0x06,0x14,0x3e,0x35,0x6d,0x00,0xc5,0x3f,
++	0x64,0x90,0x33,0x8c,0x18,0x36,0x3e,0x13,
++	0x2a,0xde,0x2a,0x44,0x40,0x2a,0x44,0x40,
++	0x8e,0x8e,0x82,0x07,0x0b,0x92,0x0f,0x40,
++	0x60,0x80,0x14,0x90,0x8c,0x60,0x14,0x3d,
++	0x63,0x4f,0x27,0x00,0xfc,0xff,0x6a,0x00
++};
++
++static const UCHAR SiS_HiTVSt1Timing[] = {
++        0x32,0x65,0x2c,0x5f,0x08,0x31,0x3a,0x65,
++	0x28,0x02,0x01,0x3d,0x06,0x3e,0x35,0x6d,
++	0x06,0x14,0x3e,0x35,0x6d,0x00,0xc5,0x3f,
++	0x65,0x90,0x7b,0xa8,0x03,0xf0,0x87,0x03,
++	0x11,0x15,0x11,0xcf,0x10,0x11,0xcf,0x10,
++	0x35,0x35,0x3b,0x69,0x1d,0x92,0x0f,0x40,
++	0x60,0x80,0x14,0x90,0x8c,0x60,0x04,0x86,
++	0xaf,0x5d,0x0e,0x00,0xfc,0xff,0x2d,0x00
++};
++
++static const UCHAR SiS_HiTVSt2Timing[] = {
++        0x32,0x65,0x2c,0x5f,0x08,0x31,0x3a,0x64,
++	0x28,0x02,0x01,0x3d,0x06,0x3e,0x35,0x6d,
++	0x06,0x14,0x3e,0x35,0x6d,0x00,0xc5,0x3f,
++	0x64,0x90,0x33,0x8c,0x18,0x36,0x3e,0x13,
++	0x2a,0xde,0x2a,0x44,0x40,0x2a,0x44,0x40,
++	0x8e,0x8e,0x82,0x07,0x0b,0x92,0x0f,0x40,
++	0x60,0x80,0x14,0x90,0x8c,0x60,0x14,0x3d,
++	0x63,0x4f,0x27,0x00,0xfc,0xff,0x6a,0x00
++};
++
++static const UCHAR SiS_HiTVTextTiming[] = {
++        0x32,0x65,0x2c,0x5f,0x08,0x31,0x3a,0x65,
++	0x28,0x02,0x01,0x3d,0x06,0x3e,0x35,0x6d,
++	0x06,0x14,0x3e,0x35,0x6d,0x00,0xc5,0x3f,
++	0x65,0x90,0xe7,0xbc,0x03,0x0c,0x97,0x03,
++	0x14,0x78,0x14,0x08,0x20,0x14,0x08,0x20,
++	0xc8,0xc8,0x3b,0xd2,0x26,0x92,0x0f,0x40,
++        0x60,0x80,0x14,0x90,0x8c,0x60,0x04,0x96,
++	0x72,0x5c,0x11,0x00,0xfc,0xff,0x32,0x00
++};
++
++static const UCHAR SiS_HiTVGroup3Data[] = {
++        0x00,0x1a,0x22,0x63,0x62,0x22,0x08,0x5f,
++	0x05,0x21,0xb2,0xb2,0x55,0x77,0x2a,0xa6,
++	0x25,0x2f,0x47,0xfa,0xc8,0xff,0x8e,0x20,
++	0x8c,0x6e,0x60,0x2e,0x58,0x48,0x72,0x44,
++	0x56,0x36,0x4f,0x6e,0x3f,0x80,0x00,0x80,
++	0x4f,0x7f,0x03,0xa8,0x7d,0x20,0x1a,0xa9,
++	0x14,0x05,0x03,0x7e,0x64,0x31,0x14,0x75,
++	0x18,0x05,0x18,0x05,0x4c,0xa8,0x01
++};
++
++static const UCHAR SiS_HiTVGroup3Simu[] = {
++        0x00,0x1a,0x22,0x63,0x62,0x22,0x08,0x95,
++	0xdb,0x20,0xb8,0xb8,0x55,0x47,0x2a,0xa6,
++	0x25,0x2f,0x47,0xfa,0xc8,0xff,0x8e,0x20,
++	0x8c,0x6e,0x60,0x15,0x26,0xd3,0xe4,0x11,
++	0x56,0x36,0x4f,0x6e,0x3f,0x80,0x00,0x80,
++	0x67,0x36,0x01,0x47,0x0e,0x10,0xbe,0xb4,
++	0x01,0x05,0x03,0x7e,0x65,0x31,0x14,0x75,
++	0x18,0x05,0x18,0x05,0x4c,0xa8,0x01
++};
++
++static const UCHAR SiS_HiTVGroup3Text[] = {
++        0x00,0x1a,0x22,0x63,0x62,0x22,0x08,0xa7,
++	0xf5,0x20,0xce,0xce,0x55,0x47,0x2a,0xa6,
++	0x25,0x2f,0x47,0xfa,0xc8,0xff,0x8e,0x20,
++	0x8c,0x6e,0x60,0x18,0x2c,0x0c,0x20,0x22,
++	0x56,0x36,0x4f,0x6e,0x3f,0x80,0x00,0x80,
++	0x93,0x3c,0x01,0x50,0x2f,0x10,0xf4,0xca,
++	0x01,0x05,0x03,0x7e,0x65,0x31,0x14,0x75,
++	0x18,0x05,0x18,0x05,0x4c,0xa8,0x01
++};
++
++static const UCHAR SiS_NTSCPhase[]    = {0x21,0xed,0xba,0x08};  /* Was {0x21,0xed,0x8a,0x08}; */
++static const UCHAR SiS_PALPhase[]     = {0x2a,0x05,0xe3,0x00};  /* Was {0x2a,0x05,0xd3,0x00};  */
++static const UCHAR SiS_PALMPhase[]    = {0x21,0xE4,0x2E,0x9B};
++static const UCHAR SiS_PALNPhase[]    = {0x21,0xF4,0x3E,0xBA};
++static const UCHAR SiS_NTSCPhase2[]   = {0x21,0xF0,0x7B,0xD6};
++static const UCHAR SiS_PALPhase2[]    = {0x2a,0x09,0x86,0xe9};
++static const UCHAR SiS_PALMPhase2[]   = {0x21,0xE6,0xEF,0xA4};
++static const UCHAR SiS_PALNPhase2[]   = {0x21,0xF6,0x94,0x46};
++static const UCHAR SiS_SpecialPhase[] = {0x1e,0x8c,0x5c,0x7a};
++
++static const SiS_TVDataStruct  SiS_StPALData[]=
++{
++ {    1,   1, 864, 525,1270, 400, 100,   0, 760,0xf4,0xff,0x1c,0x22},
++ {    1,   1, 864, 525,1270, 350, 100,   0, 760,0xf4,0xff,0x1c,0x22},
++ {    1,   1, 864, 525,1270, 400,   0,   0, 720,0xf1,0x04,0x1f,0x18},
++ {    1,   1, 864, 525,1270, 350,   0,   0, 720,0xf4,0x0b,0x1c,0x0a},
++ {    1,   1, 864, 525,1270, 480,  50,   0, 760,0xf4,0xff,0x1c,0x22},
++ {    1,   1, 864, 525,1270, 600,  50,   0,   0,0xf4,0xff,0x1c,0x22}
++};
++
++static const SiS_TVDataStruct  SiS_ExtPALData[] =
++{
++ {   27,  10, 848, 448,1270, 530,  50,   0,  50,0xf4,0xff,0x1c,0x22},  /* 640x400, 320x200 */
++ {  108,  35, 848, 398,1270, 530,  50,   0,  50,0xf4,0xff,0x1c,0x22},
++ {   12,   5, 954, 448,1270, 530,  50,   0,  50,0xf1,0x04,0x1f,0x18},
++ {    9,   4, 960, 463,1644, 438,  50,   0,  50,0xf4,0x0b,0x1c,0x0a},
++ {    9,   4, 848, 528,1270, 530,   0,   0,  50,0xf5,0xfb,0x1b,0x2a},  /* 640x480, 320x240 */
++ {   36,  25,1060, 648,1316, 530, 438,   0, 438,0xeb,0x05,0x25,0x16},  /* 800x600, 400x300 */
++ {    3,   2,1080, 619,1270, 540, 438,   0, 438,0xf3,0x00,0x1d,0x20},  /* 720x576 */
++ {    1,   1,1170, 821,1270, 520, 686,   0, 686,0xF3,0x00,0x1D,0x20}   /* 1024x768 */
++};
++
++static const SiS_TVDataStruct  SiS_StNTSCData[]=
++{
++ {    1,   1, 858, 525,1270, 400,  50,   0, 760,0xf1,0x04,0x1f,0x18},
++ {    1,   1, 858, 525,1270, 350,  50,   0, 640,0xf1,0x04,0x1f,0x18},
++ {    1,   1, 858, 525,1270, 400,   0,   0, 720,0xf1,0x04,0x1f,0x18},
++ {    1,   1, 858, 525,1270, 350,   0,   0, 720,0xf4,0x0b,0x1c,0x0a},
++ {    1,   1, 858, 525,1270, 480,   0,   0, 760,0xf1,0x04,0x1f,0x18}
++};
++
++static const SiS_TVDataStruct  SiS_ExtNTSCData[]=
++{
++ {  143,  65, 858, 443,1270, 440, 171,   0, 171,0xf1,0x04,0x1f,0x18},    /* 640x400, 320x200 */
++ {   88,  35, 858, 393,1270, 440, 171,   0, 171,0xf1,0x04,0x1f,0x18},
++ {  143,  70, 924, 443,1270, 440,  92,   0,  92,0xf1,0x04,0x1f,0x18},
++ {  143,  70, 924, 393,1270, 440,  92,   0,  92,0xf4,0x0b,0x1c,0x0a},
++ {  143,  76, 836, 523,1270, 440, 224,   0,   0,0xf1,0x05,0x1f,0x16},    /* 640x480, 320x240 */
++ {  143, 120,1056, 643,1270, 440,   0, 128,   0,0xf4,0x10,0x1c,0x00},    /* 800x600, 400x300  */
++ {  143,  76, 836, 523,1270, 440,   0, 128,   0,0xee,0x0c,0x22,0x08},    /* 720x480 - BETTER (from 300 series) */
++/*{   2,   1, 858, 503,1270, 480,   0, 128,   0,0xee,0x0c,0x22,0x08},*/  /* 720x480  (old, from 650) */
++ {    1,   1,1100, 811,1412, 440,   0, 128,   0,0xee,0x0c,0x22,0x08}     /* 1024x768 CORRECTED */
++/*{  65,  64,1056, 791,1270, 480, 638,   0,   0,0xEE,0x0C,0x22,0x08} */  /* 1024x768 */
++#if 0  /* 300 series was: */
++ {  143,  65, 858, 443,1270, 440, 171,   0, 171,0xf1,0x04,0x1f,0x18},
++ {   88,  35, 858, 393,1270, 440, 171,   0, 171,0xf1,0x04,0x1f,0x18},
++ {  143,  70, 924, 443,1270, 440,  92,   0,  92,0xf1,0x04,0x1f,0x18},
++ {  143,  70, 924, 393,1270, 440,  92,   0,  92,0xf4,0x0b,0x1c,0x0a},
++ {  143,  76, 836, 523,1270, 440, 224,   0,   0,0xf1,0x05,0x1f,0x16},
++ {  143, 120,1056, 643,1270, 440,   0, 128,   0,0xf4,0x10,0x1c,0x00},
++ {  143,  76, 836, 523,1270, 440,   0, 128,   0,0xee,0x0c,0x22,0x08},
++ {   65,  64,1056, 791,1270, 480, 638,   0,   0,0xf1,0x04,0x1f,0x18}
++#endif
++};
++
++
++static const SiS_TVDataStruct  SiS_St2HiTVData[]=
++{
++ {    3,   1, 0x348,0x1e3,0x670,0x3c0,0x032,  0, 0, 0x00,0x00,0x00,0x00},
++ {    1,   1, 0x37c,0x233,0x2b2,0x2bc, 	  0,  0, 0, 0x00,0x00,0x00,0x00},
++ {    3,   1, 0x348,0x1e3,0x670,0x3c0,0x032,  0, 0, 0x00,0x00,0x00,0x00},
++ {    1,   1, 0x3e8,0x233,0x311,0x2bc,    0,  0, 0, 0x00,0x00,0x00,0x00},
++ {    5,   2, 0x348,0x233,0x670,0x3c0,0x08d,128, 0, 0x00,0x00,0x00,0x00},
++ {    8,   5, 0x41a,0x2ab,0x670,0x3c0,0x17c,128, 0, 0x00,0x00,0x00,0x00}
++};
++
++static const SiS_TVDataStruct  SiS_ExtHiTVData[]=
++{
++ {    6,   1, 0x348,0x233,0x660,0x3c0,    0,  0, 0, 0x00,0x00,0x00,0x00},
++ {    3,   1, 0x3c0,0x233,0x660,0x3c0,    0,  0, 0, 0x00,0x00,0x00,0x00},
++ {    3,   1, 0x348,0x1e3,0x660,0x3c0,    0,  0, 0, 0x00,0x00,0x00,0x00},
++ {    3,   1, 0x3c0,0x233,0x660,0x3c0,    0,  0, 0, 0x00,0x00,0x00,0x00},
++ {    5,   1, 0x348,0x233,0x670,0x3c0,0x166,128, 0, 0x00,0x00,0x00,0x00},  /* 640x480   */
++ {   16,   5, 0x41a,0x2ab,0x670,0x3c0,0x143,128, 0, 0x00,0x00,0x00,0x00},  /* 800x600   */
++ {   25,  12, 0x4ec,0x353,0x670,0x3c0,0x032,  0, 0, 0x00,0x00,0x00,0x00},  /* 1024x768  */
++ {    5,   4, 0x627,0x464,0x670,0x3c0,0x128,  0, 0, 0x00,0x00,0x00,0x00},  /* 1280x1024 */
++ {    4,   1, 0x41a,0x233,0x670,0x3c0,0x143,128, 0, 0x00,0x00,0x00,0x00},  /* 800x480   */
++ {    5,   2, 0x578,0x293,0x670,0x3c0,0x032,  0, 0, 0x00,0x00,0x00,0x00},  /* 1024x576  */
++ {    8,   5, 0x6d6,0x323,0x670,0x3c0,0x128,  0, 0, 0x00,0x00,0x00,0x00}   /* 1280x720  */
++};
++
++static const UCHAR SiS_OutputSelect = 0x40;
++
++static const UCHAR SiS_SoftSetting  = 0x30;   /* RAM setting */
++
++static const SiS_LCDDataStruct  SiS_LCD1280x960Data[] =
++{
++	{    9,   2, 800, 500,1800,1000},
++	{    9,   2, 800, 500,1800,1000},
++	{    4,   1, 900, 500,1800,1000},
++	{    4,   1, 900, 500,1800,1000},
++	{    9,   2, 800, 500,1800,1000},
++	{   30,  11,1056, 625,1800,1000},
++	{    5,   3,1350, 800,1800,1000},
++	{    1,   1,1576,1050,1576,1050},
++	{    1,   1,1800,1000,1800,1000}
++};
++
++static const SiS_LCDDataStruct  SiS_StLCD1280x768Data[] =
++{
++	{ 211,  100, 2100,  408, 1688,  802 }, /* These values are *wrong* */
++	{ 211,   64, 1536,  358, 1688,  802 }, /* (which is why they aren't used yet) */
++	{ 211,  100, 2100,  408, 1688,  802 },
++	{ 211,   64, 1536,  358, 1688,  802 },
++	{ 211,   48,  840,  488, 1688,  802 },
++	{ 211,   72, 1008,  609, 1688,  802 },
++	{ 211,  128, 1400,  776, 1688,  802 },
++	{ 211,  205, 1680, 1041, 1688,  802 },
++	{ 1,      1, 1688,  802, 1688,  802 }  /* That's the only one that *might* be correct */
++};
++
++static const SiS_LCDDataStruct  SiS_ExtLCD1280x768Data[] =
++{
++	{ 211,  100, 2100,  408, 1688,  802 }, /* These values are *wrong* */
++	{ 211,   64, 1536,  358, 1688,  802 }, /* (which is why they aren't used yet) */
++	{ 211,  100, 2100,  408, 1688,  802 },
++	{ 211,   64, 1536,  358, 1688,  802 },
++	{ 211,   48,  840,  488, 1688,  802 },
++	{ 211,   72, 1008,  609, 1688,  802 },
++	{ 211,  128, 1400,  776, 1688,  802 },
++	{ 211,  205, 1680, 1041, 1688,  802 },
++	{ 1,      1, 1688,  802, 1688,  802 }  /* That's the only one that *might* be correct */
++};
++
++static const SiS_LCDDataStruct  SiS_NoScaleData1280x768[] =
++{  /* All values guessed */
++        { 1, 1, 1688,  802, 1688,  802},
++	{ 1, 1, 1688,  802, 1688,  802},
++	{ 1, 1, 1688,  802, 1688,  802},
++	{ 1, 1, 1688,  802, 1688,  802},
++	{ 1, 1, 1688,  802, 1688,  802},
++	{ 1, 1, 1688,  802, 1688,  802},
++	{ 1, 1, 1688,  802, 1688,  802},
++	{ 1, 1, 1688,  802, 1688,  802},
++	{ 1, 1, 1688,  802, 1688,  802}
++};
++
++static const SiS_LCDDataStruct  SiS_StLCD1400x1050Data[] =
++{
++	{ 211,  100, 2100,  408, 1688, 1066 },
++	{ 211,   64, 1536,  358, 1688, 1066 },
++	{ 211,  100, 2100,  408, 1688, 1066 },
++	{ 211,   64, 1536,  358, 1688, 1066 },
++	{ 211,   48,  840,  488, 1688, 1066 },
++	{ 211,   72, 1008,  609, 1688, 1066 },
++	{ 211,  128, 1400,  776, 1688, 1066 },
++	{ 211,  205, 1680, 1041, 1688, 1066 },
++	{   1,    1, 1688, 1066, 1688, 1066 }
++};
++
++static const SiS_LCDDataStruct  SiS_ExtLCD1400x1050Data[] =
++{
++	{ 211,  100, 2100,  408, 1688, 1066 },
++	{ 211,   64, 1536,  358, 1688, 1066 },
++	{ 211,  100, 2100,  408, 1688, 1066 },
++	{ 211,   64, 1536,  358, 1688, 1066 },
++	{ 211,   48,  840,  488, 1688, 1066 },
++	{ 211,   72, 1008,  609, 1688, 1066 },
++	{ 211,  128, 1400,  776, 1688, 1066 },
++	{ 211,  205, 1680, 1041, 1688, 1066 },
++	{   1,    1, 1688, 1066, 1688, 1066 }
++};
++
++static const SiS_LCDDataStruct  SiS_NoScaleData1400x1050[] =
++{
++	{ 1, 1, 1688, 1066, 1688, 1066 },
++	{ 1, 1, 1688, 1066, 1688, 1066 },
++	{ 1, 1, 1688, 1066, 1688, 1066 },
++	{ 1, 1, 1688, 1066, 1688, 1066 },
++	{ 1, 1, 1688, 1066, 1688, 1066 },
++	{ 1, 1, 1688, 1066, 1688, 1066 },
++	{ 1, 1, 1688, 1066, 1688, 1066 },
++	{ 1, 1, 1688, 1066, 1688, 1066 },
++	{ 1, 1, 1688, 1066, 1688, 1066 }
++};
++
++static const SiS_LCDDataStruct  SiS_StLCD1600x1200Data[] =
++{
++	{27,  4, 800, 500, 2160, 1250 },
++	{27,  4, 800, 500, 2160, 1250 },
++	{ 6,  1, 900, 500, 2160, 1250 },
++	{ 6,  1, 900, 500, 2160, 1250 },
++	{27,  1, 800, 500, 2160, 1250 },
++	{ 4,  1,1080, 625, 2160, 1250 },
++	{ 5,  2,1350, 800, 2160, 1250 },
++	{135,88,1600,1100, 2160, 1250 },
++	{135,88,1600,1100, 2160, 1250 },
++	{ 1,  1,2160,1250, 2160, 1250 }
++};
++
++static const SiS_LCDDataStruct  SiS_ExtLCD1600x1200Data[] =
++{
++	{27, 4, 800, 500, 2160, 1250 },
++	{27, 4, 800, 500, 2160, 1250 },
++	{ 6, 1, 900, 500, 2160, 1250 },
++	{ 6, 1, 900, 500, 2160, 1250 },
++	{27, 1, 800, 500, 2160, 1250 },
++	{ 4, 1,1080, 625, 2160, 1250 },
++	{ 5, 2,1350, 800, 2160, 1250 },
++	{27,16,1500,1064, 2160, 1250 },
++	{27,16,1500,1064, 2160, 1250 },
++	{ 1, 1,2160,1250, 2160, 1250 }
++};
++
++static const SiS_LCDDataStruct  SiS_NoScaleData1600x1200[] =
++{
++        {1,  1, 2160, 1250, 2048, 1250},
++	{1,  1, 2160, 1250, 2048, 1250},
++	{1,  1, 2160, 1250, 2048, 1250},
++	{1,  1, 2160, 1250, 2048, 1250},
++	{1,  1, 2160, 1250, 2048, 1250},
++	{1,  1, 2160, 1250, 2048, 1250},
++	{1,  1, 2160, 1250, 2048, 1250},
++	{1,  1, 2160, 1250, 2048, 1250},
++	{1,  1, 2160, 1250, 2048, 1250},
++	{1,  1, 2160, 1250, 2048, 1250},
++};
++
++static const SiS_LCDDataStruct  SiS_NoScaleData[] =
++{
++	{ 1, 1, 800, 449, 800, 449 },
++	{ 1, 1, 800, 449, 800, 449 },
++	{ 1, 1, 900, 449, 900, 449 },
++	{ 1, 1, 900, 449, 900, 449 },
++	{ 1, 1, 800, 525, 800, 525 },
++	{ 1, 1,1056, 628,1056, 628 },
++	{ 1, 1,1344, 806,1344, 806 },
++	{ 1, 1,1688,1066,1688,1066 },
++        { 1, 1,1688, 802,1688, 802 },  /* 1280x768: 802 was 806 in both cases */
++        { 1, 1,2160,1250,2160,1250 },  /* 1600x1200 */
++	{ 1, 1,1800,1000,1800,1000 }   /* 1280x960 */
++};
++
++static const SiS_LVDSDataStruct  SiS_LVDS320x480Data_1[]=
++{
++	{ 848, 433, 400, 525},
++	{ 848, 389, 400, 525},
++	{ 848, 433, 400, 525},
++	{ 848, 389, 400, 525},
++	{ 848, 518, 400, 525},
++	{1056, 628, 400, 525},
++	{ 400, 525, 400, 525},
++	{ 800, 449,1000, 644},
++	{ 800, 525,1000, 635}
++};
++
++static const SiS_LVDSDataStruct  SiS_LVDS800x600Data_1[]=
++{
++	{ 848, 433,1060, 629},
++	{ 848, 389,1060, 629},
++	{ 848, 433,1060, 629},
++	{ 848, 389,1060, 629},
++	{ 848, 518,1060, 629},
++	{1056, 628,1056, 628},
++	{1056, 628,1056, 628},
++	{ 800, 449,1000, 644},
++	{ 800, 525,1000, 635}
++};
++
++static const SiS_LVDSDataStruct  SiS_LVDS800x600Data_2[]=
++{
++	{1056, 628,1056, 628},
++	{1056, 628,1056, 628},
++	{1056, 628,1056, 628},
++	{1056, 628,1056, 628},
++	{1056, 628,1056, 628},
++	{1056, 628,1056, 628},
++	{1056, 628,1056, 628},
++	{ 800, 449,1000, 644},
++	{ 800, 525,1000, 635}
++};
++
++
++
++static const SiS_LVDSDataStruct  SiS_LVDS1280x1024Data_1[]=
++{
++	{1048, 442,1688,1066},
++	{1048, 392,1688,1066},
++	{1048, 442,1688,1066},
++	{1048, 392,1688,1066},
++	{1048, 522,1688,1066},
++	{1208, 642,1688,1066},
++	{1432, 810,1688,1066},
++	{1688,1066,1688,1066}
++};
++
++static const SiS_LVDSDataStruct  SiS_LVDS1280x1024Data_2[]=
++{
++	{1688,1066,1688,1066},
++	{1688,1066,1688,1066},
++	{1688,1066,1688,1066},
++	{1688,1066,1688,1066},
++	{1688,1066,1688,1066},
++	{1688,1066,1688,1066},
++	{1688,1066,1688,1066},
++	{1688,1066,1688,1066}
++};
++
++static const SiS_LVDSDataStruct  SiS_LVDS1024x768Data_1[]=
++{
++	{ 840, 438,1344, 806},
++	{ 840, 409,1344, 806},
++	{ 840, 438,1344, 806},
++	{ 840, 409,1344, 806},
++	{ 840, 518,1344, 806},   /* 640x480 */
++	{1050, 638,1344, 806},   /* 800x600 */
++	{1344, 806,1344, 806},   /* 1024x768 */
++	{ 800, 449,1280, 801},
++	{ 800, 525,1280, 813}
++};
++
++static const SiS_LVDSDataStruct  SiS_LVDS1024x768Data_2[]=
++{
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{ 800, 449,1280, 801},
++	{ 800, 525,1280, 813}
++};
++
++/* Custom data for Barco iQ R300 */
++static const SiS_LVDSDataStruct  SiS_LVDSBARCO1366Data_1[]=
++{
++	{ 832, 438,1331, 806},
++	{ 832, 388,1331, 806},
++	{ 832, 438,1331, 806},
++	{ 832, 388,1331, 806},
++	{ 832, 518,1331, 806},
++	{1050, 638,1344, 806},
++	{1344, 806,1344, 806},
++	{1688,1066,1688,1066},
++	{1688,1066,1688,1066}   /* 1360x1024 */
++};
++
++/* Custom data for Barco iQ R300 */
++static const SiS_LVDSDataStruct  SiS_LVDSBARCO1366Data_2[]=
++{
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1688,1066,1688,1066},
++	{1688,1066,1688,1066}   /* 1360x1024 */
++};
++
++static const SiS_LVDSDataStruct  SiS_LVDSBARCO1024Data_1[]=
++{
++	{ 832, 438,1331, 806},
++	{ 832, 409,1331, 806},
++	{ 832, 438,1331, 806},
++	{ 832, 409,1331, 806},
++	{ 832, 518,1331, 806},   /* 640x480 */
++	{1050, 638,1344, 806},   /* 800x600 */
++	{1344, 806,1344, 806},   /* 1024x768 */
++};
++
++static const SiS_LVDSDataStruct  SiS_LVDSBARCO1024Data_2[]=
++{
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++};
++
++static const SiS_LVDSDataStruct  SiS_LVDS1400x1050Data_1[]=
++{
++        { 928, 416, 1688,1066},
++	{ 928, 366, 1688,1066},
++	{ 928, 416, 1688,1066},
++	{ 928, 366, 1688,1066},
++	{ 928, 496, 1688,1066},
++	{1088, 616, 1688,1066},
++	{1312, 784, 1688,1066},
++	{1568,1040, 1688,1066},
++	{1688,1066, 1688,1066}
++};
++
++static const SiS_LVDSDataStruct  SiS_LVDS1400x1050Data_2[]=
++{
++        {1688,1066, 1688,1066},
++	{1688,1066, 1688,1066},
++	{1688,1066, 1688,1066},
++	{1688,1066, 1688,1066},
++	{1688,1066, 1688,1066},
++	{1688,1066, 1688,1066},
++	{1688,1066, 1688,1066},
++	{1688,1066, 1688,1066},
++	{1688,1066, 1688,1066},
++};
++
++static const SiS_LVDSDataStruct  SiS_LVDS1600x1200Data_1[]=
++{
++        {1088, 450, 2048,1250},
++	{1088, 400, 2048,1250},
++	{1088, 450, 2048,1250},
++	{1088, 400, 2048,1250},
++	{1088, 530, 2048,1250},
++	{1248, 650, 2048,1250},
++	{1472, 818, 2048,1250},
++	{1728,1066, 2048,1250},
++	{1848,1066, 2048,1250},
++	{2048,1250, 2048,1250}
++};
++
++static const SiS_LVDSDataStruct  SiS_LVDS1600x1200Data_2[]=
++{
++        {2048,1250, 2048,1250},
++	{2048,1250, 2048,1250},
++	{2048,1250, 2048,1250},
++	{2048,1250, 2048,1250},
++	{2048,1250, 2048,1250},
++	{2048,1250, 2048,1250},
++	{2048,1250, 2048,1250},
++	{2048,1250, 2048,1250},
++	{2048,1250, 2048,1250},
++	{2048,1250, 2048,1250}
++};
++
++static const SiS_LVDSDataStruct  SiS_LVDS1280x768Data_1[]=
++{
++	{ 768, 438, 1408, 806},
++	{ 768, 388, 1408, 806},
++	{ 768, 438, 1408, 806},
++	{ 768, 388, 1408, 806},
++	{ 768, 518, 1408, 806},
++	{ 928, 638, 1408, 806},
++	{1152, 806, 1408, 806},
++	{1408, 806, 1408, 806},
++	{1408, 806, 1408, 806}
++};
++
++static const SiS_LVDSDataStruct  SiS_LVDS1280x768Data_2[]=
++{
++	{1408, 806, 1408, 806},
++	{1408, 806, 1408, 806},
++	{1408, 806, 1408, 806},
++	{1408, 806, 1408, 806},
++	{1408, 806, 1408, 806},
++	{1408, 806, 1408, 806},
++	{1408, 806, 1408, 806},
++	{1408, 806, 1408, 806},
++	{1408, 806, 1408, 806}
++};
++
++static const SiS_LVDSDataStruct  SiS_LVDS1024x600Data_1[] =
++{
++	{840, 604,1344, 800},
++	{840, 560,1344, 800},
++	{840, 604,1344, 800},
++	{840, 560,1344, 800},
++	{840, 689,1344, 800},
++	{1050, 800,1344, 800},
++	{1344, 800,1344, 800},
++	{800, 449,1280, 789},
++	{800, 525,1280, 785}
++};
++
++static const SiS_LVDSDataStruct  SiS_LVDS1024x600Data_2[] =
++{
++	{1344, 800,1344, 800},
++	{1344, 800,1344, 800},
++	{1344, 800,1344, 800},
++	{1344, 800,1344, 800},
++	{1344, 800,1344, 800},
++	{1344, 800,1344, 800},
++	{1344, 800,1344, 800},
++	{ 800, 449,1280, 801},
++	{ 800, 525,1280, 813}
++};
++
++static const SiS_LVDSDataStruct  SiS_LVDS1152x768Data_1[] =
++{
++	{ 840, 438,1344, 806},
++	{ 840, 409,1344, 806},
++	{ 840, 438,1344, 806},
++	{ 840, 409,1344, 806},
++	{ 840, 518,1344, 806},
++	{1050, 638,1344, 806},
++	{1344, 806,1344, 806},
++	{ 800, 449,1280, 801},
++	{ 800, 525,1280, 813}
++};
++
++static const SiS_LVDSDataStruct  SiS_LVDS1152x768Data_2[] =
++{
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{ 800, 449,1280, 801},
++	{ 800, 525,1280, 813}
++};
++
++/* TW: Pass 1:1 data */
++static const SiS_LVDSDataStruct  SiS_LVDSXXXxXXXData_1[]=
++{
++        { 800, 449,  800, 449},
++	{ 800, 449,  800, 449},
++	{ 900, 449,  900, 449},
++	{ 900, 449,  900, 449},
++	{ 800, 525,  800, 525},  /*  640x480   */
++	{1056, 628, 1056, 628},  /*  800x600   */
++	{1344, 806, 1344, 806},  /* 1024x768   */
++	{1344,1066, 1344,1066},  /* 1280x1024  */  /* INSERTED ! */
++ 	{1688, 806, 1688, 806},  /* 1280x768   */
++	/* No other panels ! */
++};
++
++static const SiS_LVDSDataStruct  SiS_LVDS640x480Data_1[]=
++{
++	{ 800, 445, 800, 525},   /* 800, 449, 800, 449 */
++	{ 800, 395, 800, 525},
++	{ 800, 445, 800, 525},
++	{ 800, 395, 800, 525},
++	{ 800, 525, 800, 525},
++	{ 800, 525, 800, 525},   /* pseudo */
++	{ 800, 525, 800, 525}    /* pseudo */
++};
++
++/* FSTN 320x240 */
++static const SiS_LVDSDataStruct  SiS_LVDS640x480Data_2[]=
++{
++	{ 800, 445, 800, 525},
++	{ 800, 395, 800, 525},
++	{ 800, 445, 800, 525},
++	{ 800, 395, 800, 525},
++	{ 800, 525, 800, 525},
++        { 800, 525, 800, 525},   /* pseudo */
++	{ 800, 525, 800, 525}    /* pseudo */
++};
++
++
++static const SiS_LVDSDataStruct  SiS_LVDS1280x960Data_1[]=
++{
++	{ 840, 438,1344, 806},
++	{ 840, 409,1344, 806},
++	{ 840, 438,1344, 806},
++	{ 840, 409,1344, 806},
++	{ 840, 518,1344, 806},
++	{1050, 638,1344, 806},
++	{1344, 806,1344, 806},
++	{ 800, 449,1280, 801},
++	{ 800, 525,1280, 813}
++};
++
++static const SiS_LVDSDataStruct  SiS_LVDS1280x960Data_2[]=
++{
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{ 800, 449,1280, 801},
++	{ 800, 525,1280, 813}
++};
++
++static const SiS_LVDSDataStruct  SiS_LVDS848x480Data_1[]=
++{
++	{   0,   0,   0,   0},
++	{   0,   0,   0,   0},
++	{   0,   0,   0,   0},
++	{   0,   0,   0,   0},
++	{1088, 525,1088, 525},  /* 640x480 TODO */
++	{1088, 525,1088, 525},  /* 800x600 TODO */
++	{1088, 525,1088, 525},  /* 1024x768 TODO */
++	{   0,   0,   0,   0},
++	{   0,   0,   0,   0},
++	{   0,   0,   0,   0},
++	{   0,   0,   0,   0},
++	{1088, 525,1088, 525},  /* 848x480 */
++	{1088, 525,1088, 525}   /* 1360x768 TODO */
++};
++
++static const SiS_LVDSDataStruct  SiS_LVDS848x480Data_2[]=
++{
++	{   0,   0,   0,   0},
++	{   0,   0,   0,   0},
++	{   0,   0,   0,   0},
++	{   0,   0,   0,   0},
++	{1088, 525,1088, 525},  /*  640x480 */
++	{1088, 525,1088, 525},  /*  800x600 */
++	{1088, 525,1088, 525},  /* 1024x768 */
++	{   0,   0,   0,   0},
++	{   0,   0,   0,   0},
++	{   0,   0,   0,   0},
++	{   0,   0,   0,   0},
++	{1088, 525,1088, 525},  /* 848x480 */
++	{1088, 525,1088, 525}	/* 1360x768 TODO */
++};
++
++/* LCDA */
++
++static const SiS_LVDSDataStruct  SiS_LCDA1400x1050Data_1[]=
++{	/* TW: Might be temporary (invalid) data */
++        { 928, 416, 1688,1066},
++	{ 928, 366, 1688,1066},
++	{1008, 416, 1688,1066},
++	{1008, 366, 1688,1066},
++	{1200, 530, 1688,1066},
++	{1088, 616, 1688,1066},
++	{1312, 784, 1688,1066},
++	{1568,1040, 1688,1066},
++	{1688,1066, 1688,1066}
++};
++
++static const SiS_LVDSDataStruct  SiS_LCDA1400x1050Data_2[]=
++{	/* TW: Temporary data. Not valid */
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{ 800, 449,1280, 801},
++	{ 800, 525,1280, 813}
++};
++
++static const SiS_LVDSDataStruct  SiS_LCDA1600x1200Data_1[]=
++{	/* TW: Temporary data. Not valid */
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{1344, 806,1344, 806},
++	{ 800, 449,1280, 801},
++	{ 800, 525,1280, 813}
++};
++
++static const SiS_LVDSDataStruct  SiS_LCDA1600x1200Data_2[]=
++{	/* TW: Temporary data. Not valid */
++	{0, 0, 0, 0},
++	{0, 0, 0, 0},
++	{0, 0, 0, 0},
++	{0, 0, 0, 0},
++	{0, 0, 0, 0},
++	{0, 0, 0, 0},
++	{0, 0, 0, 0},
++	{0, 0, 0, 0},
++	{0, 0, 0, 0},
++	{0, 0, 0, 0},
++	{0, 0, 0, 0},
++	{0, 0, 0, 0}
++};
++
++static const SiS_LVDSDataStruct  SiS_CHTVUNTSCData[]=
++{
++	{ 840, 600, 840, 600},
++	{ 840, 600, 840, 600},
++	{ 840, 600, 840, 600},
++	{ 840, 600, 840, 600},
++	{ 784, 600, 784, 600},
++	{1064, 750,1064, 750},
++        {1160, 945,1160, 945}
++};
++
++static const SiS_LVDSDataStruct  SiS_CHTVONTSCData[]=
++{
++	{ 840, 525, 840, 525},
++	{ 840, 525, 840, 525},
++	{ 840, 525, 840, 525},
++	{ 840, 525, 840, 525},
++	{ 784, 525, 784, 525},
++	{1040, 700,1040, 700},
++        {1160, 840,1160, 840}
++};
++
++static const SiS_LVDSDesStruct SiS_PanelType1076_1[]=
++{  /* 1024x768 */
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0}
++};
++
++static const SiS_LVDSDesStruct SiS_PanelType1076_2[]=
++{  /* 1024x768 */
++	{ 1184, 622 },
++	{ 1184, 597 },
++	{ 1184, 622 },
++	{ 1184, 597 },
++	{ 1152, 622 },
++	{ 1232, 722 },
++	{    0, 0   },
++	{    0, 794 },
++	{    0, 0   }
++};
++
++static const SiS_LVDSDesStruct SiS_PanelType1210_1[]=
++{  /* 1280x1024 */
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0}
++};
++
++static const SiS_LVDSDesStruct SiS_PanelType1210_2[]=
++{  /* 1280x1024 */
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0}
++};
++
++static const SiS_LVDSDesStruct SiS_PanelType1296_1[]=
++{  /* 1400x1050 */
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0}
++};
++
++static const SiS_LVDSDesStruct SiS_PanelType1296_2[]=
++{  /* 1400x1050 - looks heavily invalid */
++	{ 808 , 740},
++	{ 0   , 715},
++	{ 632 , 740},
++	{ 632 , 715},
++	{ 1307, 780},
++	{ 1387,1157},
++	{ 1499, 924},
++	{ 1627,1052},
++	{ 0 , 0}
++};
++
++static const SiS_LVDSDesStruct SiS_PanelType1600_1[]=
++{  /* 1600x1200 */
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0}
++};
++
++static const SiS_LVDSDesStruct SiS_PanelType1600_2[]=
++{  /* 1600x1200 - BIOS looks heavily invalid, not copied */
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0}
++};
++
++static const SiS_LVDSDesStruct  SiS_PanelTypeNS_1[]=
++{
++	{ 8,   0},
++	{ 8,   0},
++	{ 8,   0},
++	{ 8,   0},
++	{ 8,   0},
++	{ 0,   0},
++	{ 0,   0},
++	{ 0,   0},
++	{ 0, 806},
++	{ 0, 0 }
++};
++
++static const SiS_LVDSDesStruct  SiS_PanelTypeNS_2[] =
++{
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0},
++	{ 0 , 0}
++};
++
++static const SiS_LVDSDesStruct  SiS_CHTVUNTSCDesData[]=
++{
++	{ 0,   0},
++	{ 0,   0},
++	{ 0,   0},
++	{ 0,   0},
++	{ 0,   0},
++	{ 0,   0},
++	{ 0,   0}
++};
++
++static const SiS_LVDSDesStruct  SiS_CHTVONTSCDesData[]=
++{
++	{ 0,   0},
++	{ 0,   0},
++	{ 0,   0},
++	{ 0,   0},
++	{ 0,   0},
++	{ 0,   0},
++	{ 0,   0}
++};
++
++static const SiS_LVDSDesStruct  SiS_CHTVUPALDesData[]=
++{
++	{256,   0},
++	{256,   0},
++	{256,   0},
++	{256,   0},
++	{ 0,   0},
++	{ 0,   0},
++	{ 0,   0}
++};
++
++static const SiS_LVDSDesStruct  SiS_CHTVOPALDesData[]=
++{
++	{256,   0},
++	{256,   0},
++	{256,   0},
++	{256,   0},
++	{ 0,   0},
++	{ 0,   0},
++	{ 0,   0}
++};
++
++static const SiS_LVDSCRT1DataStruct  SiS_LVDSCRT1320x480_1[] =
++{
++ {{0x65,0x4f,0x89,0x56,0x83,0xaa,0x1f,
++   0x90,0x85,0x8f,0xab,0x30,0x00,0x05,
++   0x00 }},
++ {{0x65,0x4f,0x89,0x56,0x83,0x83,0x1f,
++   0x5e,0x83,0x5d,0x79,0x10,0x00,0x05,
++   0x00 }},
++ {{0x65,0x4f,0x89,0x54,0x9f,0xc4,0x1f,
++   0x92,0x89,0x8f,0xb5,0x30,0x00,0x01,
++   0x00 }},
++ {{0x65,0x4f,0x89,0x56,0x83,0x83,0x1f,
++   0x5e,0x83,0x5d,0x79,0x10,0x00,0x05,
++   0x00 }},
++ {{0x65,0x4f,0x89,0x56,0x83,0x04,0x3e,
++   0xe0,0x85,0xdf,0xfb,0x10,0x00,0x05,
++   0x00 }},
++ {{0x7f,0x63,0x83,0x6c,0x1c,0x72,0xf0,
++   0x58,0x8c,0x57,0x73,0x20,0x00,0x06,
++   0x01 }},
++ {{0x2d,0x27,0x90,0x2c,0x80,0x0b,0x3e,
++   0xe9,0x8b,0xe7,0x04,0x00,0x00,0x00,
++   0x00 }}
++};
++
++static const SiS_LVDSCRT1DataStruct  SiS_LVDSCRT11024x600_1[] =
++{
++        {{0x64,0x4f,0x88,0x54,0x9f,0x5a,0x3e,
++	  0xe8,0x8f,0x8f,0x5b,0x00,0x00,0x01,
++	  0x00}},
++        {{0x64,0x4f,0x88,0x54,0x9f,0x2e,0x3e,
++	  0xb9,0x80,0x5d,0x2f,0x00,0x00,0x01,
++	  0x00}},
++        {{0x64,0x4f,0x88,0x54,0x9f,0x5a,0x3e,
++	  0xe8,0x8f,0x8f,0x5b,0x00,0x00,0x01,
++	  0x00}},
++        {{0x64,0x4f,0x88,0x54,0x9f,0x2e,0x3e,
++	  0xb9,0x80,0x5d,0x2f,0x00,0x00,0x01,
++	  0x00}},
++        {{0x64,0x4f,0x88,0x54,0x9f,0xaf,0xba,
++	  0x3b,0x82,0xdf,0xb0,0x00,0x00,0x01,
++	  0x00}},
++        {{0x7e,0x63,0x82,0x68,0x15,0x1e,0xf1,
++	  0xae,0x85,0x57,0x1f,0x30,0x00,0x26,
++	  0x01}},
++        {{0xa3,0x7f,0x87,0x86,0x97,0x1e,0xf1,
++	  0xae,0x85,0x57,0x1f,0x30,0x00,0x02,
++	  0x01}}
++};
++
++static const SiS_LVDSCRT1DataStruct  SiS_LVDSCRT11024x600_1_H[] =
++{
++        {{0x2f,0x27,0x93,0x2b,0x90,0xc4,0x1f,
++	  0x92,0x89,0x8f,0xb5,0x30,0x00,0x44,
++	  0x00}},
++        {{0x2f,0x27,0x93,0x2b,0x90,0x97,0x1f,
++	  0x60,0x87,0x5d,0x83,0x10,0x00,0x44,
++          0x00}},
++        {{0x2f,0x27,0x93,0x2b,0x90,0xc4,0x1f,
++	  0x92,0x89,0x8f,0xb5,0x30,0x00,0x44,
++	  0x00}},
++        {{0x2f,0x27,0x93,0x2b,0x90,0x97,0x1f,
++	  0x60,0x87,0x5d,0x83,0x10,0x00,0x44,
++	  0x00}},
++        {{0x2f,0x27,0x93,0x2b,0x90,0x04,0x3e,
++	  0xe2,0x89,0xdf,0x05,0x00,0x00,0x44,
++	  0x00}},
++        {{0x3c,0x31,0x80,0x35,0x1c,0x7c,0xf0,
++	  0x5a,0x8f,0x57,0x7d,0x20,0x00,0x55,
++	  0x01}},
++        {{0x4f,0x3f,0x93,0x45,0x0d,0x24,0xf5,
++	  0x02,0x88,0xff,0x25,0x10,0x00,0x01,
++	  0x01}}
++};
++
++static const SiS_LVDSCRT1DataStruct  SiS_LVDSCRT11024x600_2[] =
++{
++        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
++	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x06,
++	  0x00}},
++        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
++	  0x31,0x87,0x5d,0x25,0x30,0x00,0x06,
++	  0x00}},
++        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
++	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x06,
++	  0x00}},
++        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
++          0x31,0x87,0x5d,0x25,0x30,0x00,0x06,
++	  0x00}},
++        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
++	  0x72,0x88,0xdf,0x25,0x30,0x00,0x06,
++	  0x00}},
++        {{0xa3,0x63,0x87,0x78,0x89,0x24,0xf1,
++	  0xae,0x84,0x57,0x25,0x30,0x00,0x02,
++	  0x01}},
++        {{0xa3,0x7f,0x87,0x86,0x97,0x24,0xf5,
++	  0x02,0x88,0xff,0x25,0x10,0x00,0x02,
++	  0x01}}
++};
++
++static const SiS_LVDSCRT1DataStruct  SiS_LVDSCRT11024x600_2_H[] =
++{
++        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
++	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x01,
++	  0x00}},
++        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
++	  0x31,0x87,0x5d,0x25,0x30,0x00,0x01,
++	  0x00}},
++        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
++	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x01,
++	  0x00}},
++        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
++	  0x31,0x87,0x5d,0x25,0x30,0x00,0x01,
++	  0x00}},
++        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
++	  0x72,0x88,0xdf,0x25,0x30,0x00,0x01,
++	  0x00}},
++        {{0x4f,0x31,0x93,0x3e,0x06,0x24,0xf1,
++	  0xae,0x84,0x57,0x25,0x30,0x00,0x01,
++	  0x01}},
++        {{0x4f,0x3f,0x93,0x45,0x0d,0x24,0xf5,
++	  0x02,0x88,0xff,0x25,0x10,0x00,0x01,
++	  0x01}}
++};
++
++static const SiS_LVDSCRT1DataStruct  SiS_LVDSCRT11152x768_1[] =
++{
++        {{0x64,0x4f,0x88,0x54,0x9f,0xc4,0x1f,
++	  0x92,0x89,0x8f,0xb5,0x30,0x00,0x01,
++	  0x00}},
++        {{0x64,0x4f,0x88,0x54,0x9f,0x97,0x1f,
++	  0x60,0x87,0x5d,0x83,0x10,0x00,0x01,
++	  0x00}},
++        {{0x64,0x4f,0x88,0x54,0x9f,0xc4,0x1f,
++	  0x92,0x89,0x8f,0xb5,0x30,0x00,0x01,
++	  0x00}},
++        {{0x64,0x4f,0x88,0x54,0x9f,0x97,0x1f,
++	  0x60,0x87,0x5d,0x83,0x10,0x00,0x01,
++	  0x00}},
++        {{0x64,0x4f,0x88,0x54,0x9f,0x04,0x3e,
++	  0xe2,0x89,0xdf,0x05,0x00,0x00,0x01,
++	  0x00}},
++        {{0x7e,0x63,0x82,0x68,0x15,0x7c,0xf0,
++	  0x5a,0x8f,0x57,0x7d,0x20,0x00,0x26,
++	  0x01}},
++        {{0xa3,0x7f,0x87,0x86,0x97,0x24,0xf5,
++	  0x02,0x88,0xff,0x25,0x10,0x00,0x02,
++	  0x01}}
++};
++
++static const SiS_LVDSCRT1DataStruct  SiS_LVDSCRT11152x768_1_H[] =
++{
++        {{0x2f,0x27,0x93,0x2b,0x90,0xc4,0x1f,
++	  0x92,0x89,0x8f,0xb5,0x30,0x00,0x44,
++	  0x00}},
++        {{0x2f,0x27,0x93,0x2b,0x90,0x97,0x1f,
++	  0x60,0x87,0x5d,0x83,0x10,0x00,0x44,
++	  0x00}},
++        {{0x2f,0x27,0x93,0x2b,0x90,0xc4,0x1f,
++	  0x92,0x89,0x8f,0xb5,0x30,0x00,0x44,
++	  0x00}},
++        {{0x2f,0x27,0x93,0x2b,0x90,0x97,0x1f,
++	  0x60,0x87,0x5d,0x83,0x10,0x00,0x44,
++	  0x00}},
++        {{0x2f,0x27,0x93,0x2b,0x90,0x04,0x3e,
++	  0xe2,0x89,0xdf,0x05,0x00,0x00,0x44,
++	  0x00}},
++        {{0x3c,0x31,0x80,0x35,0x1c,0x7c,0xf0,
++	  0x5a,0x8f,0x57,0x7d,0x20,0x00,0x55,
++	  0x01}},
++        {{0x4f,0x3f,0x93,0x45,0x0d,0x24,0xf5,
++	  0x02,0x88,0xff,0x25,0x10,0x00,0x01,
++	  0x01}}
++};
++
++static const SiS_LVDSCRT1DataStruct  SiS_LVDSCRT11152x768_2[] =
++{
++        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
++	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x06,
++	  0x00}},
++        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
++	  0x31,0x87,0x5d,0x25,0x30,0x00,0x06,
++	  0x00}},
++        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
++	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x06,
++	  0x00}},
++        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
++	  0x31,0x87,0x5d,0x25,0x30,0x00,0x06,
++	  0x00}},
++        {{0xa3,0x4f,0x87,0x6e,0x9f,0x24,0xbb,
++	  0x72,0x88,0xdf,0x25,0x30,0x00,0x06,
++	  0x00}},
++        {{0xa3,0x63,0x87,0x78,0x89,0x24,0xf1,
++	  0xae,0x84,0x57,0x25,0x30,0x00,0x02,
++	  0x01}},
++        {{0xa3,0x7f,0x87,0x86,0x97,0x24,0xf5,
++	  0x02,0x88,0xff,0x25,0x10,0x00,0x02,
++	  0x01}}
++};
++
++static const SiS_LVDSCRT1DataStruct  SiS_LVDSCRT11152x768_2_H[] =
++{
++        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
++	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x01,
++	  0x00}},
++        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
++	  0x31,0x87,0x5d,0x25,0x30,0x00,0x01,
++	  0x00}},
++        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
++	  0x4a,0x80,0x8f,0x25,0x30,0x00,0x01,
++	  0x00}},
++        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
++	  0x31,0x87,0x5d,0x25,0x30,0x00,0x01,
++	  0x00}},
++        {{0x4f,0x27,0x93,0x39,0x01,0x24,0xbb,
++	  0x72,0x88,0xdf,0x25,0x30,0x00,0x01,
++	  0x00}},
++        {{0x4f,0x31,0x93,0x3e,0x06,0x24,0xf1,
++	  0xae,0x84,0x57,0x25,0x30,0x00,0x01,
++	  0x01}},
++        {{0x4f,0x3f,0x93,0x45,0x0d,0x24,0xf5,
++	  0x02,0x88,0xff,0x25,0x10,0x00,0x01,
++	  0x01}}
++};
++
++static const SiS_LVDSCRT1DataStruct  SiS_LVDSCRT11280x768_1[] =
++{
++ {{0x5b,0x4f,0x9f,0x55,0x19,0xb4,0x1f,
++   0x9c,0x8e,0x8f,0xb5,0x10,0x00,0x01,
++   0x00}},
++ {{0x5b,0x4f,0x9f,0x55,0x19,0x82,0x1f,
++   0x6a,0x8c,0x5d,0x83,0x30,0x00,0x01,
++   0x00}},
++ {{0x5b,0x4f,0x9f,0x55,0x19,0xb4,0x1f,
++   0x9c,0x8e,0x8f,0xb5,0x10,0x00,0x01,
++   0x00}},
++ {{0x5b,0x4f,0x9f,0x55,0x19,0x82,0x1f,
++   0x6a,0x8c,0x5d,0x83,0x30,0x00,0x01,
++   0x00}},
++ {{0x5b,0x4f,0x9f,0x55,0x19,0x04,0x3e,
++   0xec,0x8e,0xdf,0x05,0x20,0x00,0x01,
++   0x00}},
++ {{0x6f,0x63,0x93,0x69,0x8d,0x7c,0xf0,
++   0x64,0x86,0x57,0x7d,0x20,0x00,0x05,
++   0x01}},
++ {{0x8b,0x7f,0x8f,0x85,0x09,0x24,0xf5,
++   0x0c,0x8e,0xff,0x25,0x30,0x00,0x02,
++   0x01}},
++ {{0xab,0x9f,0x8f,0xa5,0x89,0x24,0xf5,
++   0x0c,0x8e,0xff,0x25,0x30,0x00,0x06,
++   0x01}},
++ {{0xab,0x9f,0x8f,0xa5,0x89,0x24,0xf5,
++   0x0c,0x8e,0xff,0x25,0x30,0x00,0x06,
++   0x01}}
++};
++
++static const SiS_LVDSCRT1DataStruct  SiS_LVDSCRT11280x768_1_H[] =
++{
++ {{0x47,0x27,0x8b,0x2c,0x1a,0x9e,0x1f,
++   0x93,0x86,0x8f,0x9f,0x30,0x00,0x05,
++   0x00}},
++ {{0x47,0x27,0x8b,0x2c,0x1a,0x6c,0x1f,
++   0x60,0x84,0x5d,0x6d,0x10,0x00,0x05,
++   0x00}},
++ {{0x47,0x27,0x8b,0x30,0x1e,0x9e,0x1f,
++   0x92,0x86,0x8f,0x9f,0x30,0x00,0x05,
++   0x00}},
++ {{0x47,0x27,0x8b,0x2c,0x1a,0x6c,0x1f,
++   0x60,0x84,0x5d,0x6d,0x10,0x00,0x05,
++   0x00}},
++ {{0x47,0x27,0x8b,0x2c,0x1a,0xee,0x1f,
++   0xe2,0x86,0xdf,0xef,0x10,0x00,0x05,
++   0x00}},
++ {{0x51,0x31,0x95,0x36,0x04,0x66,0xf0,
++   0x5a,0x8e,0x57,0x67,0x20,0x00,0x01,
++   0x01}},
++ {{0x5f,0x3f,0x83,0x44,0x92,0x0e,0xf5,
++   0x02,0x86,0xff,0x0f,0x10,0x00,0x01,
++   0x01}},
++ {{0x6f,0x4f,0x93,0x54,0x82,0x0e,0x5a,
++   0x02,0x86,0xff,0x0f,0x09,0x00,0x05,
++   0x01}},
++ {{0x6f,0x4f,0x93,0x54,0x82,0x0e,0x5a,
++   0x02,0x86,0xff,0x0f,0x09,0x00,0x05,
++   0x01}}
++};
++
++static const SiS_LVDSCRT1DataStruct  SiS_LVDSCRT11280x768_2[] =
++{
++ {{0xab,0x60,0x9f,0x80,0x04,0x24,0xbb,
++   0x54,0x86,0xdb,0xda,0x00,0x00,0x02,
++   0x00}},
++ {{0xab,0x60,0x9f,0x80,0x04,0x24,0xbb,
++   0x3b,0x8d,0xc2,0xc1,0x00,0x00,0x02,
++   0x00}},
++ {{0xab,0x60,0x9f,0x80,0x04,0x24,0xbb,
++   0x54,0x86,0xdb,0xda,0x00,0x00,0x02,
++   0x00}},
++ {{0xab,0x60,0x9f,0x80,0x04,0x24,0xbb,
++   0x3b,0x8d,0xc2,0xc1,0x00,0x00,0x02,
++   0x00}},
++ {{0xab,0x60,0x9f,0x80,0x04,0x24,0xb3,
++   0x7c,0x8e,0x03,0x02,0x10,0x00,0x02,
++   0x01}},
++ {{0xab,0x63,0x8f,0x8a,0x8e,0x24,0xf1,
++   0xb6,0x88,0x57,0x25,0x10,0x00,0x02,
++   0x01}},
++ {{0xab,0x7f,0x8f,0x98,0x9c,0x24,0xf5,
++   0x0a,0x8c,0xff,0x25,0x30,0x00,0x02,
++   0x01}},
++ {{0xab,0x9f,0x8f,0xa8,0x8c,0x24,0xf5,
++   0x0a,0x8c,0xff,0x25,0x30,0x00,0x06,
++   0x01}},
++ {{0xab,0x9f,0x8f,0xa8,0x8c,0x24,0xf5,
++   0x0a,0x8c,0xff,0x25,0x30,0x00,0x06,
++   0x01}}
++};
++
++static const SiS_LVDSCRT1DataStruct  SiS_LVDSCRT11280x768_2_H[] =
++{
++ {{0x83,0x38,0x97,0x58,0x9c,0x24,0xbb,
++   0x54,0x86,0xdb,0xda,0x00,0x00,0x01,
++   0x00}},
++ {{0x83,0x38,0x97,0x58,0x9c,0x24,0xbb,
++   0x3b,0x8d,0xc2,0xc1,0x00,0x00,0x01,
++   0x00}},
++ {{0x83,0x38,0x97,0x58,0x9c,0x24,0xbb,
++   0x54,0x86,0xdb,0xda,0x00,0x00,0x01,
++   0x00}},
++ {{0x83,0x38,0x97,0x58,0x9c,0x24,0xbb,
++   0x3b,0x8d,0xc2,0xc1,0x00,0x00,0x01,
++   0x00}},
++ {{0x83,0x38,0x97,0x58,0x9c,0x24,0xb3,
++   0x7c,0x8e,0x03,0x02,0x10,0x00,0x01,
++   0x01}},
++ {{0x79,0x31,0x9d,0x58,0x9c,0x24,0xf1,
++   0xb6,0x88,0x57,0x25,0x10,0x00,0x01,
++   0x01}},
++ {{0x6b,0x3f,0x8f,0x58,0x9c,0x24,0xf5,
++   0x0a,0x8c,0xff,0x25,0x30,0x00,0x01,
++   0x01}},
++ {{0xab,0x9f,0x8f,0xa8,0x8c,0x24,0xf5,
++   0x0a,0x8c,0xff,0x25,0x30,0x00,0x06,
++   0x01}},
++ {{0xab,0x9f,0x8f,0xa8,0x8c,0x24,0xf5,
++   0x0a,0x8c,0xff,0x25,0x30,0x00,0x06,
++   0x01}}
++};
++
++static const SiS_LVDSCRT1DataStruct  SiS_LVDSCRT1XXXxXXX_1[] =
++{
++ {{0x5f,0x4f,0x82,0x55,0x81,0xbf,0x1f,
++   0x9c,0x8e,0x96,0xb9,0x30,0x00,0x05,
++   0x00}},
++ {{0x5f,0x4f,0x82,0x55,0x81,0xbf,0x1f,
++   0x9c,0x8e,0x96,0xb9,0x30,0x00,0x05,
++   0x00}},
++ {{0x5f,0x4f,0x82,0x55,0x81,0xbf,0x1f,
++   0x9c,0x8e,0x96,0xb9,0x30,0x00,0x05,
++   0x00}},
++ {{0x5f,0x4f,0x82,0x55,0x81,0xbf,0x1f,
++   0x9c,0x8e,0x96,0xb9,0x30,0x00,0x05,
++   0x00}},
++ {{0x5f,0x4f,0x82,0x55,0x81,0x0b,0x3e,
++   0xe9,0x8b,0xe7,0x04,0x00,0x00,0x05,
++   0x00}},
++ {{0x7f,0x63,0x83,0x6c,0x1c,0x72,0xf0,
++   0x58,0x8c,0x57,0x73,0x20,0x00,0x06,
++   0x01}},
++ {{0xa3,0x7f,0x87,0x86,0x97,0x24,0xf5,
++   0x02,0x88,0xff,0x25,0x10,0x00,0x02,
++   0x01}},
++ {{0xce,0x9f,0x92,0xa8,0x14,0x28,0x5a,
++   0x00,0x84,0xff,0x29,0x09,0x00,0x07,
++   0x01}},
++ {{0xce,0x9f,0x92,0xa9,0x17,0x24,0xf5,
++   0x02,0x88,0xff,0x25,0x10,0x00,0x07,
++   0x01}}
++};
++
++static const SiS_LVDSCRT1DataStruct  SiS_LVDSCRT1XXXxXXX_1_H[] =
++{
++ {{0x38,0x27,0x9c,0x2c,0x80,0xbf,0x1f,
++   0x9c,0x8e,0x96,0xb9,0x30,0x00,0x00,
++   0x00}},
++ {{0x38,0x27,0x9c,0x2c,0x80,0xbf,0x1f,
++   0x9c,0x8e,0x96,0xb9,0x30,0x00,0x00,
++   0x00}},
++ {{0x38,0x27,0x9c,0x2c,0x80,0xbf,0x1f,
++   0x9c,0x8e,0x96,0xb9,0x30,0x00,0x00,
++   0x00}},
++ {{0x38,0x27,0x9c,0x2c,0x80,0xbf,0x1f,
++   0x9c,0x8e,0x96,0xb9,0x30,0x00,0x00,
++   0x00}},
++ {{0x38,0x27,0x9c,0x2c,0x80,0x0b,0x3e,
++   0xe9,0x8b,0xe7,0x04,0x00,0x00,0x00,
++   0x00}},
++ {{0x4d,0x31,0x91,0x3b,0x03,0x72,0xf0,
++   0x58,0x8c,0x57,0x73,0x20,0x00,0x01,
++   0x01}},
++ {{0x63,0x3f,0x87,0x4a,0x92,0x24,0xf5,
++   0x02,0x88,0xff,0x25,0x10,0x00,0x01,
++   0x01}}
++};
++
++static const SiS_LVDSCRT1DataStruct  SiS_LVDSCRT1640x480_1[] =
++{
++ {{0x5f,0x4f,0x82,0x55,0x81,0x0b,0x3e,
++   0xe9,0x8b,0xdf,0x04,0x30,0x00,0x05,
++   0x00}},
++ {{0x5f,0x4f,0x82,0x55,0x81,0x0b,0x3e,
++   0xe9,0x8b,0xdf,0x04,0x30,0x00,0x05,
++   0x00}},
++ {{0x5f,0x4f,0x82,0x55,0x81,0x0b,0x3e,
++   0xe9,0x8b,0xdf,0x04,0x30,0x00,0x05,
++   0x00}},
++ {{0x5f,0x4f,0x82,0x55,0x81,0x0b,0x3e,
++   0xe9,0x8b,0xdf,0x04,0x30,0x00,0x05,
++   0x00}},
++ {{0x5f,0x4f,0x82,0x55,0x81,0x0b,0x3e,
++   0xe9,0x8b,0xdf,0x04,0x30,0x00,0x05,
++   0x00}},
++ {{0x7f,0x63,0x83,0x6c,0x1c,0x72,0xf0,
++   0x58,0x8c,0x57,0x73,0x20,0x00,0x06,
++   0x01}}
++};
++
++static const SiS_LVDSCRT1DataStruct  SiS_LVDSCRT1640x480_1_H[] =
++{
++ {{0x2d,0x28,0x90,0x2b,0xa0,0xbf,0x1f,
++   0x9c,0x8e,0x96,0xb9,0x00,0x00,0x00,
++   0x00}},
++ {{0x2d,0x28,0x90,0x2b,0xa0,0xbf,0x1f,
++   0x83,0x85,0x63,0xba,0x00,0x00,0x00,
++   0x00}},
++ {{0x2d,0x28,0x90,0x2b,0xa0,0xbf,0x1f,
++   0x9c,0x8e,0x96,0xb9,0x00,0x00,0x00,
++   0x00}},
++ {{0x2d,0x28,0x90,0x2b,0xa0,0xbf,0x1f,
++   0x83,0x85,0x63,0xba,0x00,0x00,0x00,
++   0x00}},
++ {{0x2d,0x28,0x90,0x2c,0x80,0x0b,0x3e,
++   0xe9,0x8b,0xe7,0x04,0x00,0x00,0x00,
++   0x00}}
++};
++
++static const SiS_LVDSCRT1DataStruct  SiS_LVDSCRT1640x480_2[] =
++{
++ {{0x5f,0x4f,0x82,0x55,0x81,0x0b,0x3e,
++   0xe9,0x8b,0xdf,0x04,0x30,0x00,0x05,
++   0x00}},
++ {{0x5f,0x4f,0x82,0x55,0x81,0x0b,0x3e,
++   0xe9,0x8b,0xdf,0x04,0x30,0x00,0x05,
++   0x00}},
++ {{0x5f,0x4f,0x82,0x55,0x81,0x0b,0x3e,
++   0xe9,0x8b,0xdf,0x04,0x30,0x00,0x05,
++   0x00}},
++ {{0x5f,0x4f,0x82,0x55,0x81,0x0b,0x3e,
++   0xe9,0x8b,0xdf,0x04,0x30,0x00,0x05,
++   0x00}},
++ {{0x5f,0x4f,0x82,0x55,0x81,0x0b,0x3e,
++   0xe9,0x8b,0xdf,0x04,0x30,0x00,0x05,
++   0x00}},
++ {{0x7f,0x63,0x83,0x6c,0x1c,0x72,0xf0,
++   0x58,0x8c,0x57,0x73,0x20,0x00,0x06,
++   0x01}},
++ {{0x2d,0x27,0x90,0x2c,0x80,0x0b,0x3e,
++   0xe9,0x8b,0xe7,0x04,0x00,0x00,0x00,
++   0x00}}
++};
++
++static const SiS_LVDSCRT1DataStruct  SiS_LVDSCRT1640x480_2_H[] =
++{
++ {{0x65,0x4f,0x89,0x56,0x83,0xaa,0x1f,
++   0x90,0x85,0x8f,0xab,0x30,0x00,0x05,
++   0x00}},
++ {{0x65,0x4f,0x89,0x56,0x83,0x83,0x1f,
++   0x5e,0x83,0x5d,0x79,0x10,0x00,0x05,
++   0x00}},
++ {{0x65,0x4f,0x89,0x54,0x9f,0xc4,0x1f,
++   0x92,0x89,0x8f,0xb5,0x30,0x00,0x01,
++   0x00}},
++ {{0x65,0x4f,0x89,0x56,0x83,0x83,0x1f,
++   0x5e,0x83,0x5d,0x79,0x10,0x00,0x05,
++   0x00}},
++ {{0x65,0x4f,0x89,0x56,0x83,0x04,0x3e,
++   0xe0,0x85,0xdf,0xfb,0x10,0x00,0x05,
++   0x00}},
++ {{0x7f,0x63,0x83,0x6c,0x1c,0x72,0xf0,
++   0x58,0x8c,0x57,0x73,0x20,0x00,0x06,
++   0x01}},
++ {{0x2d,0x27,0x90,0x2c,0x80,0x0b,0x3e,
++   0xe9,0x8b,0xe7,0x04,0x00,0x00,0x00,
++   0x00}}
++};
++
++static const SiS_LVDSCRT1DataStruct  SiS_LVDSCRT1640x480_3[] =
++{
++ {{0x5f,0x4f,0x82,0x55,0x81,0x0b,0x3e,
++   0xe9,0x8b,0xdf,0x04,0x00,0x00,0x05,
++   0x00}},
++ {{0x5f,0x4f,0x82,0x55,0x81,0x0b,0x3e,
++   0xe9,0x8b,0xdf,0x04,0x00,0x00,0x05,
++   0x00}},
++ {{0x5f,0x4f,0x82,0x55,0x81,0x0b,0x3e,
++   0xe9,0x8b,0xdf,0x04,0x00,0x00,0x05,
++   0x00}},
++ {{0x5f,0x4f,0x82,0x55,0x81,0x0b,0x3e,
++   0xe9,0x8b,0xdf,0x04,0x00,0x00,0x05,
++   0x00}},
++ {{0x5f,0x4f,0x82,0x55,0x81,0x0b,0x3e,
++   0xe9,0x8b,0xdf,0x04,0x00,0x00,0x05,
++   0x00}},
++ {{0x7f,0x63,0x83,0x6c,0x1c,0x72,0xf0,
++   0x58,0x8c,0x57,0x73,0x20,0x00,0x06,
++   0x01}},
++ {{0x2d,0x27,0x90,0x2c,0x80,0x0b,0x3e,
++   0xe9,0x8b,0xe7,0x04,0x00,0x00,0x00,
++   0x00}}
++};
++
++static const SiS_LVDSCRT1DataStruct  SiS_LVDSCRT1640x480_3_H[] =
++{
++ {{0x65,0x4f,0x89,0x56,0x83,0xaa,0x1f,
++   0x90,0x85,0x8f,0xab,0x30,0x00,0x05,
++   0x00}},
++ {{0x65,0x4f,0x89,0x56,0x83,0x83,0x1f,
++   0x5e,0x83,0x5d,0x79,0x10,0x00,0x05,
++   0x00}},
++ {{0x65,0x4f,0x89,0x54,0x9f,0xc4,0x1f,
++   0x92,0x89,0x8f,0xb5,0x30,0x00,0x01,
++   0x00}},
++ {{0x65,0x4f,0x89,0x56,0x83,0x83,0x1f,
++   0x5e,0x83,0x5d,0x79,0x10,0x00,0x05,
++   0x00}},
++ {{0x65,0x4f,0x89,0x56,0x83,0x04,0x3e,
++   0xe0,0x85,0xdf,0xfb,0x10,0x00,0x05,
++   0x00}},
++ {{0x7f,0x63,0x83,0x6c,0x1c,0x72,0xf0,
++   0x58,0x8c,0x57,0x73,0x20,0x00,0x06,
++   0x01}},
++ {{0x2d,0x27,0x90,0x2c,0x80,0x0b,0x3e,
++   0xe9,0x8b,0xe7,0x04,0x00,0x00,0x00,
++   0x00}}
++};
++
++#define SIS_PL_HSYNCP 0x01
++#define SIS_PL_HSYNCN 0x02
++#define SIS_PL_VSYNCP 0x04
++#define SIS_PL_VSYNCN 0x08
++#define SIS_PL_DVI    0x80
++
++typedef struct _SiS_PlasmaModes
++{
++  const char *name;
++  ULONG  clock;
++  USHORT HDisplay, HTotal, HFrontPorch, HSyncWidth;
++  USHORT VDisplay, VTotal, VFrontPorch, VSyncWidth;
++  UCHAR  SyncFlags;
++} SiS_PlasmaModes;
++
++
++typedef struct _SiS_PlasmaTables
++{
++   USHORT vendor;
++   UCHAR  productnum;
++   USHORT product[5];
++   const char *plasmaname;
++   UCHAR  modenum;
++   UCHAR  plasmamodes[20];  /* | 0x80 = DVI-capable, | 0x40 = analog */
++} SiS_PlasmaTables;
++
++static const SiS_PlasmaModes SiS_PlasmaMode[] = {
++   {  "640x400",		/* 00: IBM 400@70 */
++      25175,
++       640,  800, 17,  64,
++       400,  449, 13,   2,
++      SIS_PL_HSYNCN | SIS_PL_VSYNCN },
++   {  "640x480",		/* 01: VESA 480@72 */
++      31500,
++       640,  832, 24,  40,
++       480,  520,  9,   3,
++      SIS_PL_HSYNCN | SIS_PL_VSYNCN },
++   {  "800x600",		/* 02: VESA 600@72 */
++      50000,
++       800, 1040, 56, 120,
++       600,  666, 37,   6,
++      SIS_PL_HSYNCP | SIS_PL_VSYNCP },
++   {  "864x480",		/* 03: Cereb wide 1 */
++      42526,
++       864, 1134, 22,  86,
++       480,  500,  1,   3,
++      SIS_PL_HSYNCP | SIS_PL_VSYNCN },
++   {  "848x480",		/* 04: VESA wide (NEC1) */
++      33750,
++       848, 1088, 16, 112,
++       480,  517,  6,   8,
++      SIS_PL_HSYNCP | SIS_PL_VSYNCP },
++   {  "1024x576",		/* 05: VESA wide (NEC2) */
++      47250,
++      1024, 1320, 16, 144,
++       576,  596,  2,   4,
++      SIS_PL_HSYNCP | SIS_PL_VSYNCP },
++   {  "1280x720",		/* 06: VESA wide (NEC3) */
++      76500,
++      1280, 1696, 48, 176,
++       720,  750,  4,   8,
++      SIS_PL_HSYNCP | SIS_PL_VSYNCP },
++   {  "1360x765",		/* 07: VESA wide (NEC4) */
++      85500,
++      1360, 1792, 64, 176,
++       765,  795,  4,   8,
++      SIS_PL_HSYNCP | SIS_PL_VSYNCP },
++   {  "1024x600",		/* 08: CEREB wide 2 */
++      51200,
++      1024, 1352, 51, 164,
++       600,  628,  1,   4,
++      SIS_PL_HSYNCN | SIS_PL_VSYNCP },
++   {  "1024x768",		/* 09: VESA 768@75 */
++      78750,
++      1024, 1312,  16, 96,
++       768,  800,   1,  3,
++      SIS_PL_HSYNCP | SIS_PL_VSYNCP },
++   {  "1152x864",		/* 10: VESA 1152x864@75 */
++      108000,
++      1152, 1600, 64, 128,
++       864,  900,  1,   3,
++      SIS_PL_HSYNCP | SIS_PL_VSYNCP },
++   {  "1280x1024",		/* 11: VESA 1024@60 */
++      108000,
++      1280, 1688, 48, 112,
++      1024, 1066,  1,   3,
++      SIS_PL_HSYNCP | SIS_PL_VSYNCP },
++   {  "1280x768",		/* 12: W_XGA */
++      81000,
++      1280, 1688, 48, 112,
++       768,  802,  3,   6,
++      SIS_PL_HSYNCP | SIS_PL_VSYNCN },
++   {  "1280x768",		/* 13: I/O Data W_XGA@56Hz */
++      76064,
++      1280, 1688, 48, 112,
++       768,  802,  2,   3,
++      SIS_PL_HSYNCP | SIS_PL_VSYNCP },
++   {  "1376x768",		/* 14: I/O Wide XGA */
++      87340,
++      1376, 1808, 32, 128,
++       768,  806,  3,   6,
++      SIS_PL_HSYNCN | SIS_PL_VSYNCP },
++   {  "1280x960",		/* 15: VESA 960@60 */
++      108000,
++      1280, 1800, 96, 112,
++       960, 1000,  1,   3,
++      SIS_PL_HSYNCP | SIS_PL_VSYNCP },
++   {  "1400x1050",		/* 16: VESA 1050@60Hz */
++      108000,
++      1400, 1688, 48, 112,
++      1050, 1066,  1,   3,
++      SIS_PL_HSYNCN | SIS_PL_VSYNCN },
++   {  "1360x768",		/* 17: VESA wide (NEC4/2) */
++      85500,
++      1360, 1792, 64, 112,
++       765,  795,  3,   6,
++      SIS_PL_HSYNCP | SIS_PL_VSYNCP },
++   {  "800x600",		/* 18: VESA 600@56 */
++      36000,
++       800, 1024, 24,   2,
++       600,  625,  1,   2,
++      SIS_PL_HSYNCP | SIS_PL_VSYNCP }
++};
++
++static const SiS_PlasmaTables SiS_PlasmaTable[] = {
++#if 0  /* Product IDs missing */
++   { 0x38a3, 4,
++     { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 },
++     "NEC PlasmaSync 42VP4/42VP4D/42VP4G/42VP4DG",
++     14,   /* All DVI, except 0, 7, 13; 3, 15, 16 unknown */
++     { 0|0x40, 1|0xc0, 2|0xc0, 3|0xc0, 4|0xc0, 7|0x40, 9|0xc0,10|0xc0,11|0xc0,12|0xc0,
++      13|0x40,14|0xc0,15|0xc0,16|0xc0, 0     , 0     , 0     , 0     , 0     , 0 }
++   },
++   { 0x38a3, 3,
++     { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 },
++     "NEC PlasmaSync 42PD1/50PD1/50PD2",
++     5,   /* DVI entirely unknown */
++     { 0|0x40, 1|0xc0, 2|0xc0, 4|0xc0, 9|0xc0, 0     , 0     , 0     , 0     , 0     ,
++       0     , 0     , 0     , 0     , 0     , 0     , 0     , 0     , 0     , 0       }
++   },
++   { 0x38a3, 1,
++     { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 },
++     "NEC PlasmaSync 42PD3",
++     10,   /* DVI entirely unknown */
++     { 0|0x40, 1|0xc0, 2|0xc0, 3|0xc0, 4|0xc0, 5|0xc0, 6|0xc0, 7|0x40, 8|0xc0, 9|0xc0,
++       0     , 0     , 0     , 0     , 0     , 0     , 0     , 0     , 0     , 0       }
++   },
++   { 0x38a3, 2,
++     { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 },
++     "NEC PlasmaSync 42VM3/61XM1",
++     11,  /* DVI entirely unknown */
++     { 0|0x40, 1|0xc0, 2|0xc0, 3|0xc0, 4|0xc0, 5|0xc0, 6|0xc0, 8|0xc0, 9|0xc0,11|0xc0,
++      17|0xc0, 0     , 0     , 0     , 0     , 0     , 0     , 0     , 0     , 0       }
++   },
++   { 0x38a3, 2,
++     { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 },
++     "NEC PlasmaSync 42MP1/42MP2",
++     6,   /* DVI entirely unknown */
++     { 0|0x40, 1|0xc0, 2|0xc0, 4|0xc0, 9|0xc0,11|0xc0, 0     , 0     , 0     , 0     ,
++       0     , 0     , 0     , 0     , 0     , 0     , 0     , 0     , 0     , 0       }
++   },
++   { 0x38a3, 1,
++     { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 },
++     "NEC PlasmaSync 50MP1",
++     10,   /* DVI entirely unknown */
++     { 0|0x40, 1|0xc0, 2|0xc0, 4|0xc0, 7|0x40, 9|0xc0,10|0xc0,11|0xc0,13|0x40,14|0xc0,
++       0     , 0     , 0     , 0     , 0     , 0     , 0     , 0     , 0     , 0       }
++   },
++#endif
++   { 0x38a3, 4,
++     { 0xa482, 0xa483, 0x0000, 0x0000, 0x0000 },
++     "NEC PlasmaSync 42MP3/42MP4/50MP2/61MP1",
++     11,   /* All DVI except 0, 7, 13, 17 */
++     { 0|0x40, 1|0xc0, 2|0xc0, 4|0xc0, 7|0x40, 9|0xc0,10|0xc0,11|0xc0,13|0x40,14|0xc0,
++      17|0x40, 0     , 0     , 0     , 0     , 0     , 0     , 0     , 0     , 0       }
++   },
++#if 0  /* Product IDs missing */
++   { 0x38a3, 1,
++     { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 },
++     "NEC PlasmaSync 3300W",
++     3,
++     { 0|0x40, 1|0xc0,18|0xc0, 0     , 0     , 0     , 0     , 0     , 0     , 0     ,
++       0     , 0     , 0     , 0     , 0     , 0     , 0     , 0     , 0     , 0       }
++   },
++   { 0x38a3, 1,
++     { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 },
++     "NEC PlasmaSync 4200W",
++     4,   /* DVI entirely unknown */
++     { 0|0x40, 1|0xc0, 2|0xc0, 4|0xc0, 0     , 0     , 0     , 0     , 0     , 0     ,
++       0     , 0     , 0     , 0     , 0     , 0     , 0     , 0     , 0     , 0       }
++   },
++   { 0x38a3, 1,
++     { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 },
++     "NEC PlasmaSync 4210W",
++     6,   /* DVI entirely unknown */
++     { 0|0x40, 1|0xc0, 2|0xc0, 4|0xc0, 9|0xc0,11|0xc0, 0     , 0     , 0     , 0     ,
++       0     , 0     , 0     , 0     , 0     , 0     , 0     , 0     , 0     , 0       }
++   },
++   { 0x38a3, 1,
++     { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000 },
++     "NEC PlasmaSync 5000W",
++     7,   /* DVI entirely unknown */
++     { 0|0x40, 1|0xc0, 2|0xc0, 4|0xc0, 7|0x40, 9|0xc0,11|0xc0, 0     , 0     , 0     ,
++       0     , 0     , 0     , 0     , 0     , 0     , 0     , 0     , 0     , 0       }
++   },
++#endif
++   { 0x412f, 2,
++     { 0x000c, 0x000b, 0x0000, 0x0000, 0x0000 },
++     "Pioneer 503CMX/PDA-5002",
++     6,   /* DVI unknown */
++     { 1|0xc0, 2|0xc0, 9|0xc0,11|0xc0,12|0xc0,15|0xc0, 0     , 0     , 0     , 0     ,
++       0     , 0     , 0     , 0     , 0     , 0     , 0     , 0     , 0     , 0       }
++   },
++   { 0x34a9, 1,
++     { 0xa00e, 0x0000, 0x0000, 0x0000, 0x0000 },
++     "Panasonic TH-42",
++     5,   /* No DVI output */
++     { 1|0x40, 2|0x40, 4|0x40, 9|0x40,15|0x40, 0     , 0     , 0     , 0     , 0     ,
++       0     , 0     , 0     , 0     , 0     , 0     , 0     , 0     , 0     , 0       }
++   },
++   { 0x0000 }
++};
++
+ void     SiS_SetReg1(USHORT, USHORT, USHORT);
+ void     SiS_SetReg2(SiS_Private *, USHORT, USHORT, USHORT);
+ void     SiS_SetReg3(USHORT, USHORT);
+@@ -158,6 +2397,7 @@ void     SiS_SetMemoryClock(SiS_Private 
+ void     SiS_SetDRAMModeRegister(SiS_Private *SiS_Pr, UCHAR *ROMAddr,PSIS_HW_DEVICE_INFO HwDeviceExtension);
+ BOOLEAN  SiS_SearchVBModeID(SiS_Private *SiS_Pr, UCHAR *ROMAddr, USHORT *ModeNo);
+ void     SiS_IsLowResolution(SiS_Private *SiS_Pr, UCHAR *ROMAddr,USHORT ModeNo,USHORT ModeIdIndex);
++void     SiS_GetSysFlags(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension);
+ 
+ #ifdef SIS300
+ void     SiS_SetDRAMSize_300(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension);
+@@ -192,12 +2432,15 @@ void     SiS_VerifyMclk(SiS_Private *SiS
+ 
+ void     SiS_HandleCRT1(SiS_Private *SiS_Pr);
+ void     SiS_Handle301B_1400x1050(SiS_Private *SiS_Pr, USHORT ModeNo);
+-void     SiS_SetEnableDstn(SiS_Private *SiS_Pr);
++void     SiS_SetEnableDstn(SiS_Private *SiS_Pr, int enable);
++void     SiS_SetEnableFstn(SiS_Private *SiS_Pr, int enable);
+ void     SiS_Delay15us(SiS_Private *SiS_Pr);
+ BOOLEAN  SiS_SearchModeID(SiS_Private *SiS_Pr, UCHAR *ROMAddr, USHORT *ModeNo,USHORT *ModeIdIndex);
+ BOOLEAN  SiS_CheckMemorySize(SiS_Private *SiS_Pr, UCHAR *ROMAddr,PSIS_HW_DEVICE_INFO HwDeviceExtension,
+                              USHORT ModeNo,USHORT ModeIdIndex);
+ UCHAR    SiS_GetModePtr(SiS_Private *SiS_Pr, UCHAR *ROMAddr, USHORT ModeNo,USHORT ModeIdIndex);
++void     SiS_WhatTheHellIsThis(SiS_Private *SiS_Pr,PSIS_HW_DEVICE_INFO HwDeviceExtension,USHORT BaseAddr);
++void     SiS_StrangeStuff(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension);
+ void     SiS_SetSeqRegs(SiS_Private *SiS_Pr, UCHAR *ROMAddr,USHORT StandTableIndex);
+ void     SiS_SetMiscRegs(SiS_Private *SiS_Pr, UCHAR *ROMAddr,USHORT StandTableIndex);
+ void     SiS_SetCRTCRegs(SiS_Private *SiS_Pr, UCHAR *ROMAddr,PSIS_HW_DEVICE_INFO HwDeviceExtension,
+@@ -267,26 +2510,26 @@ void    	SiS_SetPitchCRT1(SiS_Private *S
+ void    	SiS_SetPitchCRT2(SiS_Private *SiS_Pr, ScrnInfoPtr pScrn, UShort BaseAddr);
+ extern int      SiS_compute_vclk(int Clock, int *out_n, int *out_dn, int *out_div,
+ 	     	 		    int *out_sbit, int *out_scale);
++extern void 	SiSCalcClock(ScrnInfoPtr pScrn, int clock, int max_VLD, unsigned int *vclk);
++
+ extern unsigned char SiS_GetSetBIOSScratch(ScrnInfoPtr pScrn, USHORT offset, unsigned char value);
+ extern unsigned char SiS_GetSetModeID(ScrnInfoPtr pScrn, unsigned char id);
+-extern USHORT 	     SiS_CalcModeIndex(ScrnInfoPtr pScrn, DisplayModePtr mode);
++extern USHORT 	     SiS_CalcModeIndex(ScrnInfoPtr pScrn, DisplayModePtr mode, BOOLEAN hcm);
+ #endif
+ 
+ extern USHORT    SiS_GetOffset(SiS_Private *SiS_Pr, UCHAR *ROMAddr,USHORT ModeNo,USHORT ModeIdIndex,
+                        USHORT RefreshRateTableIndex,PSIS_HW_DEVICE_INFO HwDeviceExtension);
+ extern USHORT    SiS_GetColorDepth(SiS_Private *SiS_Pr, UCHAR *ROMAddr,USHORT ModeNo,USHORT ModeIdIndex);
+ extern void      SiS_DisableBridge(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension, USHORT BaseAddr);
+-extern BOOLEAN   SiS_SetCRT2Group301(SiS_Private *SiS_Pr, USHORT BaseAddr,UCHAR *ROMAddr,USHORT ModeNo,
+-                                     PSIS_HW_DEVICE_INFO HwDeviceExtension);
+-extern void      SiS_PresetScratchregister(SiS_Private *SiS_Pr, USHORT SiS_P3d4,
+-                                           PSIS_HW_DEVICE_INFO HwDeviceExtension);
++extern BOOLEAN   SiS_SetCRT2Group(SiS_Private *SiS_Pr, USHORT BaseAddr,UCHAR *ROMAddr,USHORT ModeNo,
++                                  PSIS_HW_DEVICE_INFO HwDeviceExtension);
+ extern void      SiS_UnLockCRT2(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension,USHORT BaseAddr);
+ extern void      SiS_LockCRT2(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension,USHORT BaseAddr);
+ extern BOOLEAN   SiS_BridgeIsOn(SiS_Private *SiS_Pr, USHORT BaseAddr);
+ extern BOOLEAN   SiS_BridgeIsEnable(SiS_Private *SiS_Pr, USHORT BaseAddr,PSIS_HW_DEVICE_INFO );
+ extern void      SiS_GetVBInfo(SiS_Private *SiS_Pr, USHORT BaseAddr,UCHAR *ROMAddr,USHORT ModeNo,
+                                USHORT ModeIdIndex,PSIS_HW_DEVICE_INFO HwDeviceExtension, int chkcrt2mode);
+-extern BOOLEAN   SiS_GetLCDResInfo(SiS_Private *SiS_Pr, UCHAR *ROMAddr,USHORT ModeNo,
++extern void      SiS_GetLCDResInfo(SiS_Private *SiS_Pr, UCHAR *ROMAddr,USHORT ModeNo,
+                                    USHORT ModeIdIndex, PSIS_HW_DEVICE_INFO HwDeviceExtension);
+ extern void      SiS_SetHiVision(SiS_Private *SiS_Pr, USHORT BaseAddr,PSIS_HW_DEVICE_INFO HwDeviceExtension);
+ extern USHORT    SiS_GetRatePtrCRT2(SiS_Private *SiS_Pr, UCHAR *ROMAddr, USHORT ModeNo,USHORT ModeIdIndex,
+@@ -321,10 +2564,12 @@ int    sisfb_mode_rate_to_dclock(SiS_Pri
+ 			      unsigned char modeno, unsigned char rateindex);
+ int    sisfb_mode_rate_to_ddata(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension,
+ 			 unsigned char modeno, unsigned char rateindex,
+-			 ULONG *left_margin, ULONG *right_margin, 
++			 ULONG *left_margin, ULONG *right_margin,
+ 			 ULONG *upper_margin, ULONG *lower_margin,
+ 			 ULONG *hsync_len, ULONG *vsync_len,
+ 			 ULONG *sync, ULONG *vmode);
++BOOLEAN sisfb_gettotalfrommode(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension,
++		       unsigned char modeno, int *htotal, int *vtotal, unsigned char rateindex);
+ #endif
+ 
+ #endif
+--- linux-2.6.0-test6/drivers/video/sis/oem300.h	2003-06-14 12:18:05.000000000 -0700
++++ 25/drivers/video/sis/oem300.h	2003-10-05 00:34:22.000000000 -0700
+@@ -1,5 +1,37 @@
+-
+-/* OEM Data for 300 series */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/oem300.h.c,v 1.0 2001/11/30 12:12:01 eich Exp $ */
++/*
++ * OEM Data for 300 series
++ *
++ * Copyright 2002, 2003 by Thomas Winischhofer, Vienna, Austria
++ *
++ * If distributed as part of the linux kernel, the contents of this file
++ * is entirely covered by the GPL.
++ *
++ * Otherwise, the following terms apply:
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of the copyright holder not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission.  The copyright holder makes no representations
++ * about the suitability of this software for any purpose.  It is provided
++ * "as is" without express or implied warranty.
++ *
++ * THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++ * EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ *
++ * Author: 	Thomas Winischhofer <thomas@winischhofer.net>
++ *
++ * Based on code by Silicon Intergrated Systems
++ *
++ */
+ 
+ const UCHAR SiS300_OEMTVDelay301[8][4] =
+ {
+@@ -680,325 +712,147 @@ const UCHAR SiS300_Filter2[10][9][7] =
+     }
+ };
+ 
+-const UCHAR SiS300_LCDHData[24][11][5] = {
++/* Custom data for Barco iQ Pro R300 */
++const UCHAR barco_p1[2][9][7][3] = {
+     {
+-        {0x67,0x91,0x84,0x5e,0x00},
+-	{0x67,0x91,0x84,0x5e,0x00},
+-	{0x67,0x91,0x84,0x5e,0x00},
+-	{0x67,0x91,0x84,0x5e,0x00},
+-	{0x67,0x91,0x84,0x5e,0x00},
+-	{0x67,0x91,0x84,0x5e,0x00},
+-	{0x67,0x91,0x84,0x5e,0x00},
+-	{0x65,0xef,0x83,0x5c,0x00},
+-	{0x65,0xef,0x83,0x5c,0x00},
+-	{0x8a,0x14,0x00,0x80,0x00},
+-	{0x8a,0x14,0x00,0x80,0x00}
+-    },
+-    {
+-        {0x4e,0x18,0x90,0x38,0x00},
+-	{0x4e,0x18,0x90,0x38,0x00},
+-	{0x8e,0x18,0x28,0x78,0x00},
+-	{0x8e,0x18,0x28,0x78,0x00},
+-	{0x8e,0x18,0x28,0x78,0x00},
+-	{0x4e,0x18,0x90,0x38,0x00},
+-	{0x4e,0x18,0x90,0x38,0x00},
+-	{0x67,0x11,0x9a,0x56,0x00},
+-        {0x67,0x11,0x9a,0x56,0x00},
+-	{0x8a,0x14,0x00,0x80,0x00},
+-	{0x8a,0x14,0x00,0x80,0x00}
+-    },
+-    {
+-        {0x67,0x91,0x84,0x5e,0x00},
+-	{0x67,0x91,0x84,0x5e,0x00},
+-	{0x67,0x91,0x84,0x5e,0x00},
+-	{0x67,0x91,0x84,0x5e,0x00},
+-	{0x67,0x91,0x84,0x5e,0x00},
+-	{0x67,0x91,0x84,0x5e,0x00},
+-	{0x67,0x91,0x84,0x5e,0x00},
+-	{0x65,0xef,0x83,0x5c,0x00},
+-	{0x65,0xef,0x83,0x5c,0x00},
+-	{0x8a,0x14,0x00,0x80,0x00},
+-	{0x8a,0x14,0x00,0x80,0x00}
+-    },
+-    {
+-    	{0x4e,0x18,0x90,0x38,0x00},
+-	{0x4e,0x18,0x90,0x38,0x00},
+-	{0x8e,0x18,0x28,0x78,0x00},
+-	{0x8e,0x18,0x28,0x78,0x00},
+-	{0x8e,0x18,0x28,0x78,0x00},
+-	{0x4e,0x18,0x90,0x38,0x00},
+-	{0x4e,0x18,0x90,0x38,0x00},
+-	{0x67,0x11,0x9a,0x56,0x00},
+-	{0x67,0x11,0x9a,0x56,0x00},
+-	{0x8a,0x14,0x00,0x80,0x00},
+-	{0x8a,0x14,0x00,0x80,0x00}
+-    },
+-    {
+-    	{0x67,0x91,0x84,0x5e,0x00},
+-	{0x67,0x91,0x84,0x5e,0x00},
+-	{0x67,0x91,0x84,0x5e,0x00},
+-	{0x67,0x91,0x84,0x5e,0x00},
+-	{0x67,0x91,0x84,0x5e,0x00},
+-	{0x67,0x91,0x84,0x5e,0x00},
+-	{0x67,0x91,0x84,0x5e,0x00},
+-	{0x65,0xef,0x83,0x5c,0x00},
+-	{0x65,0xef,0x83,0x5c,0x00},
+-	{0x8a,0x14,0x00,0x80,0x00},
+-	{0x8a,0x14,0x00,0x80,0x00}
+-    },
+-    {
+-        {0x4E,0x18,0x90,0x38,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x67,0x11,0x9A,0x56,0x00},
+-	{0x67,0x11,0x9A,0x56,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00}
+-    },
+-    {
+-    	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-    	{0x67,0x91,0x84,0x5E,0x00},
+-    	{0x67,0x91,0x84,0x5E,0x00},
+-    	{0x67,0x91,0x84,0x5E,0x00},
+-    	{0x67,0x91,0x84,0x5E,0x00},
+-    	{0x65,0xEF,0x83,0x5C,0x00},
+-    	{0x65,0xEF,0x83,0x5C,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00}
+-    },
+-    {
+-    	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x67,0x11,0x9A,0x56,0x00},
+-	{0x67,0x11,0x9A,0x56,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00}
+-    },
+-    {
+-    	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x65,0xEF,0x83,0x5C,0x00},
+-	{0x65,0xEF,0x83,0x5C,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00}
+-    },
+-    {
+-    	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x67,0x11,0x9A,0x56,0x00},
+-	{0x67,0x11,0x9A,0x56,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00}
+-    },
+-    {
+-    	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x65,0xEF,0x83,0x5C,0x00},
+-	{0x65,0xEF,0x83,0x5C,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00}
+-    },
+-    {
+-    	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x67,0x11,0x9A,0x56,0x00},
+-	{0x67,0x11,0x9A,0x56,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00}
+-    },
+-    {
+-    	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x65,0xEF,0x83,0x5C,0x00},
+-	{0x65,0xEF,0x83,0x5C,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00}
+-    },
+-    {
+-    	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x67,0x11,0x9A,0x56,0x00},
+-	{0x67,0x11,0x9A,0x56,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00}
+-    },
+-    {
+-    	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x65,0xEF,0x83,0x5C,0x00},
+-	{0x65,0xEF,0x83,0x5C,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00}
+-    },
+-    {
+-    	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x67,0x11,0x9A,0x56,0x00},
+-	{0x67,0x11,0x9A,0x56,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00}
+-    },
+-    {
+-    	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x65,0xEF,0x83,0x5C,0x00},
+-	{0x65,0xEF,0x83,0x5C,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00}
+-    },
+-    {
+-    	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x67,0x11,0x9A,0x56,0x00},
+-	{0x67,0x11,0x9A,0x56,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00}
+-    },
+-    {
+-    	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x65,0xEF,0x83,0x5C,0x00},
+-	{0x65,0xEF,0x83,0x5C,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00}
+-    },
+-    {
+-    	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x67,0x11,0x9A,0x56,0x00},
+-	{0x67,0x11,0x9A,0x56,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00}
+-    },
+-    {
+-    	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x65,0xEF,0x83,0x5C,0x00},
+-	{0x65,0xEF,0x83,0x5C,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00}
+-    },
+-    {
+-    	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x67,0x11,0x9A,0x56,0x00},
+-	{0x67,0x11,0x9A,0x56,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00}
+-    },
+-    {
+-    	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x67,0x91,0x84,0x5E,0x00},
+-	{0x65,0xEF,0x83,0x5C,0x00},
+-	{0x65,0xEF,0x83,0x5C,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00}
+-    },
+-    {
+-    	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x8E,0x18,0x28,0x78,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x4E,0x18,0x90,0x38,0x00},
+-	{0x67,0x11,0x9A,0x56,0x00},
+-	{0x67,0x11,0x9A,0x56,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00},
+-	{0x8A,0x14,0x00,0x80,0x00}
++	{  { 0x16, 0xcf, 0x00 },
++	   { 0x18, 0x00, 0x00 },
++	   { 0x1a, 0xe7, 0x00 },
++	   { 0x1b, 0x26, 0x00 },
++	   { 0x1c, 0xff, 0x00 },
++	   { 0x1d, 0x1c, 0x00 },
++	   { 0x1e, 0x19, 0x00 }
++	},
++	{
++	   { 0x16, 0xcf, 0x00 },
++	   { 0x18, 0x00, 0x00 },
++	   { 0x1a, 0xe7, 0x00 },
++	   { 0x1b, 0x1e, 0x00 },
++	   { 0x1c, 0xff, 0x00 },
++	   { 0x1d, 0x1c, 0x00 },
++	   { 0x1e, 0x16, 0x00 }
++	},
++	{
++	   { 0x16, 0xcf, 0x00 },
++	   { 0x1a, 0xe7, 0x00 },
++	   { 0x1b, 0x26, 0x00 },
++	   { 0x1c, 0xff, 0x00 },
++	   { 0x1d, 0x1c, 0x00 },
++	   { 0x1e, 0x19, 0x00 },
++	   {    0,    0,    0 }
++	},
++	{
++	   {    0,    0,    0 }
++	},
++	{
++	   { 0x16, 0xcf, 0x00 },
++	   { 0x1a, 0xe7, 0x00 },
++	   { 0x1b, 0x26, 0x00 },
++	   { 0x1c, 0xff, 0x00 },
++	   { 0x1d, 0x1c, 0x00 },
++	   { 0x1e, 0x1e, 0x00 },
++	   {    0,    0,    0 }
++	},
++	{
++	   { 0x16, 0xd1, 0x00 },
++	   { 0x18, 0x00, 0x00 },
++	   { 0x1a, 0xe7, 0x00 },
++	   { 0x1b, 0x11, 0x00 },
++	   { 0x1c, 0xff, 0x00 },
++	   { 0x1d, 0x1c, 0x00 },
++	   { 0x1e, 0x26, 0x00 }
++	},
++	{
++	   { 0x16, 0xd1, 0x00 },
++	   { 0x1a, 0xe7, 0x00 },
++	   { 0x1b, 0x26, 0x00 },
++	   { 0x1c, 0xff, 0x00 },
++	   { 0x1d, 0x1c, 0x00 },
++	   { 0x1e, 0x30, 0x00 },
++	   {    0,    0,    0 }
++	},
++	{
++	   { 0x16, 0x00, 0x00 },
++	   { 0x17, 0xa0, 0x00 },
++	   { 0x1a, 0xa0, 0x00 },
++	   { 0x1b, 0x2a, 0x00 },
++	   { 0x1c, 0xff, 0x00 },
++	   { 0x1d, 0x1c, 0x00 },
++	   {    0,    0,    0 }
++	},
++	{
++	   { 0x16, 0x00, 0x00 },
++	   { 0x17, 0xaa, 0x00 },
++	   { 0x1a, 0xa0, 0x00 },
++	   { 0x1b, 0x2a, 0x00 },
++	   { 0x1c, 0xff, 0x00 },
++	   { 0x1d, 0x1c, 0x00 },
++	   {    0,    0,    0 }
++	}
++    },
++    {
++	{
++	   { 0x16, 0xcf, 0x00 },
++	   { 0x18, 0x00, 0x00 },
++	   { 0x1a, 0xe7, 0x00 },
++	   { 0x1b, 0x26, 0x00 },
++	   { 0x1c, 0xff, 0x00 },
++	   { 0x1d, 0x1c, 0x00 },
++	   { 0x1e, 0x19, 0x00 }
++	},
++	{
++	   {    0,    0,    0 }
++	},
++	{
++	   { 0x16, 0xcf, 0x00 },
++	   { 0x18, 0x00, 0x00 },
++	   { 0x1a, 0xe7, 0x00 },
++	   { 0x1b, 0x26, 0x00 },
++	   { 0x1c, 0xff, 0x00 },
++	   { 0x1d, 0x1c, 0x00 },
++	   { 0x1e, 0x19, 0x00 },
++	},
++	{
++	   {    0,    0,    0 }
++	},
++	{
++	   { 0x16, 0xcf, 0x00 },
++	   { 0x18, 0x00, 0x00 },
++	   { 0x1a, 0xe7, 0x00 },
++	   { 0x1b, 0x26, 0x00 },
++	   { 0x1c, 0xff, 0x00 },
++	   { 0x1d, 0x1c, 0x00 },
++	   { 0x1e, 0x1e, 0x00 }
++	},
++	{
++	   { 0x16, 0xd1, 0x00 },
++	   { 0x18, 0x00, 0x00 },
++	   { 0x1a, 0xe6, 0x00 },
++	   { 0x1b, 0x11, 0x00 },
++	   { 0x1c, 0xff, 0x00 },
++	   { 0x1d, 0x1c, 0x00 },
++	   { 0x1e, 0x26, 0x00 }
++	},
++	{
++	   { 0x18, 0x00, 0x00 },
++	   { 0x1a, 0xe0, 0x00 },
++	   { 0x1b, 0x26, 0x00 },
++	   { 0x1c, 0xff, 0x00 },
++	   { 0x1d, 0x1c, 0x00 },
++	   { 0x1e, 0x30, 0x00 },
++	   {    0,    0,    0 }
++	},
++	{
++	   {    0,    0,    0 }
++	},
++	{
++	   {    0,    0,    0 }
++	}
+     }
+ };
+ 
+-#if 0
+-const UCHAR SiS300_LCDVData[24][11][6] = {
+-    {
+-        {
+-    },
+-};
+-#endif
++
++
++
++
++
+--- linux-2.6.0-test6/drivers/video/sis/oem310.h	2003-06-14 12:17:55.000000000 -0700
++++ 25/drivers/video/sis/oem310.h	2003-10-05 00:34:22.000000000 -0700
+@@ -1,5 +1,37 @@
+-
+-/* OEM Data for 310/325/330 series */
++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/oem300.h.c,v 1.0 2001/11/30 12:12:01 eich Exp $ */
++/*
++ * OEM Data for 315/330 series
++ *
++ * Copyright 2002, 2003 by Thomas Winischhofer, Vienna, Austria
++ *
++ * If distributed as part of the linux kernel, the contents of this file
++ * is entirely covered by the GPL.
++ *
++ * Otherwise, the following terms apply:
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of the copyright holder not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission.  The copyright holder makes no representations
++ * about the suitability of this software for any purpose.  It is provided
++ * "as is" without express or implied warranty.
++ *
++ * THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++ * EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ *
++ * Author: 	Thomas Winischhofer <thomas@winischhofer.net>
++ *
++ * Based on code by Silicon Intergrated Systems
++ *
++ */
+ 
+ const UCHAR SiS310_LCDDelayCompensation_301[] =	    	/* 301 */
+ {
+@@ -100,7 +132,7 @@ const UCHAR SiS310_LCDDelayCompensation_
+ 
+ const UCHAR SiS310_LCDDelayCompensation_651301LV[] =	  /* M650/651 301LV */
+ {
+-                 0x33,0x33,0x33,    /*   800x600 (guessed) */
++                 0x33,0x33,0x33,    /*   800x600 (guessed) - new: PanelType, not PanelRes ! */
+ 		 0x33,0x33,0x33,    /*  1024x768 */
+ 		 0x33,0x33,0x33,    /* 1280x1024 */
+ 		 0x33,0x33,0x33,    /*   640x480 (unknown) */
+@@ -361,5 +393,55 @@ const UCHAR SiS310_TVPhaseIncr2[3][2][4]
+  }
+ };
+ 
++/* OEM data for Compaq Presario 3045US */
++static const SiS_LCDDataStruct  SiS310_ExtCompaq1280x1024Data[] =
++{
++	{  211,  60,1024, 501,1688,1066},
++	{  211,  60,1024, 508,1688,1066},
++	{  211,  60,1024, 501,1688,1066},
++	{  211,  60,1024, 508,1688,1066},
++	{   32,  15,1696, 501,1696,1066},
++	{  212,  75,1024, 621,1696,1066},
++	{    4,   3,1696, 810,1696,1066},
++	{    1,   1,1696,1066,1696,1066}
++};
++
++static const SiS_Part2PortTblStruct SiS310_CRT2Part2_Compaq1280x1024_1[] =
++{
++ {{0x3F,0x1B,0xD0,0xF0,0xB0,0xB8,0x23,0x0A,0x07,0x14,0x8A,0x12}},
++ {{0x35,0x1B,0xA0,0xC0,0x80,0xB8,0x23,0x0A,0x07,0x14,0x8A,0x12}},
++ {{0x3F,0x1B,0xD0,0xF0,0xB0,0xB8,0x23,0x0A,0x07,0x14,0x8A,0x12}},
++ {{0x3F,0x1B,0xD0,0xF0,0xB0,0xB8,0x23,0x0A,0x07,0x14,0x8A,0x12}},
++ {{0x45,0x1C,0x20,0x3F,0xFF,0xB8,0x23,0x0A,0x07,0x14,0x8A,0x12}},
++ {{0x49,0x1C,0x40,0x7F,0xFF,0xAD,0x23,0x0A,0x07,0xF3,0x8A,0x12}},
++ {{0x4C,0x1C,0x18,0x2F,0xFF,0xBD,0x23,0x0A,0x07,0x23,0x8A,0x12}},
++ {{0x48,0x1C,0x15,0x29,0xFF,0xBD,0x23,0x0A,0x07,0x23,0x8A,0x12}}
++};
++
++static const SiS_Part2PortTblStruct SiS310_CRT2Part2_Compaq1280x1024_2[] =
++{
++ {{0x2B,0x12,0xD9,0xE5,0xD5,0x2C,0x23,0x98,0x27,0x3E,0x08,0x42}},
++ {{0x22,0x12,0xC0,0xCC,0xBC,0x2C,0x23,0x98,0x27,0x3E,0x08,0x42}},
++ {{0x2B,0x12,0xD9,0xE5,0xD5,0x2C,0x23,0x98,0x27,0x3E,0x08,0x42}},
++ {{0x22,0x12,0xC0,0xCC,0xBC,0x2C,0x23,0x98,0x27,0x3E,0x08,0x42}},
++ {{0x33,0x13,0x01,0x0D,0xFD,0x2C,0x23,0x98,0x27,0x3E,0x08,0x42}},
++ {{0x3F,0x1B,0x3D,0x49,0x39,0x54,0x23,0xC0,0x27,0x66,0x30,0x42}},
++ {{0x33,0x1B,0x91,0x9D,0x8D,0x8C,0x23,0xF8,0x27,0x9E,0x68,0x42}},
++ {{0x43,0x24,0x11,0x1D,0x0D,0xCC,0x23,0x38,0x37,0xDE,0xA8,0x42}},
++ {{0x43,0x24,0x21,0x29,0x19,0xEA,0x23,0x0A,0x07,0x32,0xC6,0x42}}
++};
++
++static const SiS_Part2PortTblStruct SiS310_CRT2Part2_Compaq1280x1024_3[] =
++{
++ {{0x47,0x1C,0x14,0x29,0xFF,0xBD,0x23,0x0A,0x07,0x23,0x8A,0x12}},
++ {{0x47,0x1C,0x14,0x29,0xFF,0xBD,0x23,0x0A,0x07,0x23,0x8A,0x12}},
++ {{0x47,0x1C,0x14,0x29,0xFF,0xBD,0x23,0x0A,0x07,0x23,0x8A,0x12}},
++ {{0x47,0x1C,0x14,0x29,0xFF,0xBD,0x23,0x0A,0x07,0x23,0x8A,0x12}},
++ {{0x47,0x1C,0x14,0x29,0xFF,0xBE,0x23,0x0A,0x07,0x26,0x8A,0x42}},
++ {{0x47,0x1C,0x14,0x29,0xFF,0xBE,0x23,0x0A,0x07,0x26,0x8A,0x42}},
++ {{0x47,0x1C,0x14,0x29,0xFF,0xBE,0x23,0x0A,0x07,0x26,0x8A,0x42}},
++ {{0x47,0x1C,0x14,0x29,0xFF,0xBE,0x23,0x0A,0x07,0x26,0x8A,0x42}}
++};
++
+ 
+ 
+--- linux-2.6.0-test6/drivers/video/sis/osdef.h	2003-06-14 12:17:56.000000000 -0700
++++ 25/drivers/video/sis/osdef.h	2003-10-05 00:34:22.000000000 -0700
+@@ -1,79 +1,43 @@
+-/* #define WINCE_HEADER */
+-/* #define WIN2000 */
+-/* #define TC */
++
++/* OS depending defines */
++
++/* The choices are: */
++
+ #define LINUX_KERNEL	   /* Kernel framebuffer */
+ /* #define LINUX_XF86 */   /* XFree86 */
+ 
+ /**********************************************************************/
+-#ifdef LINUX_KERNEL
+-	#include <linux/config.h>
+-	#include <linux/version.h>
+-	#ifdef CONFIG_FB_SIS_300
+- 		#define SIS300
+-	#endif
+-
+-	#ifdef CONFIG_FB_SIS_315
+-		#define SIS315H
+-	#endif
+-	#if 1
+-		#define SISFBACCEL	/* Include 2D acceleration */
+-	#endif
+-	#if 1
+-		#define SISFB_PAN	/* Include Y-Panning code */
+-	#endif
+-#else
+-/*	#define SIS300*/
+-	#define SIS315H
+-#endif
+-#ifdef LINUX_XF86
+-	#define SIS300
+-	/* #define SIS315H */ /* TW: done above */
+-#endif
++#ifdef LINUX_KERNEL  /* -------------------------- */
++#include <linux/config.h>
++#include <linux/version.h>
+ 
+-/**********************************************************************/
+-#ifdef TC
+-#endif
+-#ifdef WIN2000
+-#endif
+-#ifdef WINCE_HEADER
+-#endif
+-#ifdef LINUX_XF86
++#ifdef CONFIG_FB_SIS_300
++#define SIS300
+ #endif
+-#ifdef LINUX_KERNEL
+-#endif
+-/**********************************************************************/
+-#ifdef TC
+-#define SiS_SetMemory(MemoryAddress,MemorySize,value) memset(MemoryAddress, value, MemorySize);
+-#endif
+-#ifdef WIN2000
+-#define SiS_SetMemory(MemoryAddress,MemorySize,value) MemFill((PVOID) MemoryAddress,(ULONG) MemorySize,(UCHAR) value);
++
++#ifdef CONFIG_FB_SIS_315
++#define SIS315H
+ #endif
+-#ifdef WINCE_HEADER
+-#define SiS_SetMemory(MemoryAddress,MemorySize,value) memset(MemoryAddress, value, MemorySize);
++
++#if 1
++#define SISFBACCEL	/* Include 2D acceleration */
+ #endif
+-#ifdef LINUX_XF86
+-#define SiS_SetMemory(MemoryAddress,MemorySize,value) memset(MemoryAddress, value, MemorySize)
++
+ #endif
+-#ifdef LINUX_KERNEL
+-#define SiS_SetMemory(MemoryAddress,MemorySize,value) memset(MemoryAddress, value, MemorySize)
++
++#ifdef LINUX_XF86 /* ----------------------------- */
++#define SIS300
++#define SIS315H
+ #endif
+-/**********************************************************************/
+ 
+ /**********************************************************************/
+-
+-#ifdef TC
+-#define SiS_MemoryCopy(Destination,Soruce,Length) memmove(Destination, Soruce, Length);
+-#endif
+-#ifdef WIN2000
+-#define SiS_MemoryCopy(Destination,Soruce,Length)  /*VideoPortMoveMemory((PUCHAR)Destination , Soruce,length);*/
+-#endif
+-#ifdef WINCE_HEADER
+-#define SiS_MemoryCopy(Destination,Soruce,Length) memmove(Destination, Soruce, Length);
+-#endif
+ #ifdef LINUX_XF86
++#define SiS_SetMemory(MemoryAddress,MemorySize,value) memset(MemoryAddress, value, MemorySize)
+ #define SiS_MemoryCopy(Destination,Soruce,Length) memcpy(Destination,Soruce,Length)
+ #endif
++
+ #ifdef LINUX_KERNEL
++#define SiS_SetMemory(MemoryAddress,MemorySize,value) memset(MemoryAddress, value, MemorySize)
+ #define SiS_MemoryCopy(Destination,Soruce,Length) memcpy(Destination,Soruce,Length)
+ #endif
+ 
+@@ -104,19 +68,6 @@
+ #endif /* InPortLong */
+ 
+ /**********************************************************************/
+-/*  TC                                                                */
+-/**********************************************************************/
+-
+-#ifdef TC
+-#define OutPortByte(p,v) outp((unsigned short)(p),(unsigned char)(v))
+-#define OutPortWord(p,v) outp((unsigned short)(p),(unsigned short)(v))
+-#define OutPortLong(p,v) outp((unsigned short)(p),(unsigned long)(v))
+-#define InPortByte(p)    inp((unsigned short)(p))
+-#define InPortWord(p)    inp((unsigned short)(p))
+-#define InPortLong(p)    ((inp((unsigned short)(p+2))<<16) | inp((unsigned short)(p)))
+-#endif
+-
+-/**********************************************************************/
+ /*  LINUX XF86                                                        */
+ /**********************************************************************/
+ 
+@@ -142,29 +93,4 @@
+ #define InPortLong(p)    inl((u16)(p))
+ #endif
+ 
+-/**********************************************************************/
+-/*  WIN 2000                                                          */
+-/**********************************************************************/
+-
+-#ifdef WIN2000
+-#define OutPortByte(p,v) VideoPortWritePortUchar ((PUCHAR) (p), (UCHAR) (v))
+-#define OutPortWord(p,v) VideoPortWritePortUshort((PUSHORT) (p), (USHORT) (v))
+-#define OutPortLong(p,v) VideoPortWritePortUlong ((PULONG) (p), (ULONG) (v))
+-#define InPortByte(p)    VideoPortReadPortUchar  ((PUCHAR) (p))
+-#define InPortWord(p)    VideoPortReadPortUshort ((PUSHORT) (p))
+-#define InPortLong(p)    VideoPortReadPortUlong  ((PULONG) (p))
+-#endif
+ 
+-
+-/**********************************************************************/
+-/*  WIN CE                                                            */
+-/**********************************************************************/
+-
+-#ifdef WINCE_HEADER
+-#define OutPortByte(p,v) WRITE_PORT_UCHAR ((PUCHAR) (p), (UCHAR) (v))
+-#define OutPortWord(p,v) WRITE_PORT_USHORT((PUSHORT) (p), (USHORT) (v))
+-#define OutPortLong(p,v) WRITE_PORT_ULONG ((PULONG) (p), (ULONG) (v))
+-#define InPortByte(p)    READ_PORT_UCHAR  ((PUCHAR) (p))
+-#define InPortWord(p)    READ_PORT_USHORT ((PUSHORT) (p))
+-#define InPortLong(p)    READ_PORT_ULONG  ((PULONG) (p))
+-#endif
+--- linux-2.6.0-test6/drivers/video/sis/sis_accel.c	2003-06-14 12:18:52.000000000 -0700
++++ 25/drivers/video/sis/sis_accel.c	2003-10-05 00:34:22.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * SiS 300/630/730/540/315/550/650/740 frame buffer driver
++ * SiS 300/630/730/540/315/550/650/740/330/660 frame buffer driver
+  * for Linux kernels 2.4.x and 2.5.x
+  *
+  * 2D acceleration part
+@@ -211,7 +211,7 @@ SiS300SubsequentSolidFillRect(int x, int
+ 	SiS300DoCMD
+ }
+ 
+-/* 310/325 series ------------------------------------------------ */
++/* 315 series ---------------------------------------------------- */
+ 
+ static void
+ SiS310SetupForScreenToScreenCopy(int xdir, int ydir, int rop,
+@@ -230,7 +230,7 @@ SiS310SetupForScreenToScreenCopy(int xdi
+ 		/* SiSSetupCMDFlag(BITBLT | SRCVIDEO) */
+ 	}
+ 	SiS310SetupCMDFlag(ivideo.SiS310_AccelDepth)
+-	/* TW: The 310/325 series is smart enough to know the direction */
++	/* The 315 series is smart enough to know the direction */
+ }
+ 
+ static void
+@@ -328,11 +328,13 @@ void sisfb_syncaccel(void)
+     }
+ }
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,34)  /* --- KERNEL 2.5.34 and later --- */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)  /* --------------- 2.5 --------------- */
+ 
+ int fbcon_sis_sync(struct fb_info *info)
+ {
+-   if(!sisfb_accel) return 0;
++   if(!ivideo.accel)
++   	return 0;
++
+    CRITFLAGS
+    if(sisvga_engine == SIS_300_VGA) {
+       SiS300Sync();
+@@ -352,7 +354,7 @@ void fbcon_sis_fillrect(struct fb_info *
+    if(!rect->width || !rect->height)
+    	return;
+ 
+-   if(!sisfb_accel) {
++   if(!ivideo.accel) {
+ 	cfb_fillrect(info, rect);
+ 	return;
+    }
+@@ -388,7 +390,7 @@ void fbcon_sis_copyarea(struct fb_info *
+    CRITFLAGS
+ 
+    TWDEBUG("Inside sis_copyarea");
+-   if(!sisfb_accel) {
++   if(!ivideo.accel) {
+    	cfb_copyarea(info, area);
+ 	return;
+    }
+@@ -418,7 +420,7 @@ void fbcon_sis_copyarea(struct fb_info *
+ 
+ #endif
+ 
+-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,33)  /* ------ KERNEL <2.5.34 ------ */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)  /* -------------- 2.4 --------------- */
+ 
+ void fbcon_sis_bmove(struct display *p, int srcy, int srcx,
+ 			    int dsty, int dstx, int height, int width)
+@@ -591,38 +593,38 @@ void fbcon_sis_revc(struct display *p, i
+ 
+ #ifdef FBCON_HAS_CFB8
+ struct display_switch fbcon_sis8 = {
+-	setup:			fbcon_cfb8_setup,
+-	bmove:			fbcon_sis_bmove,
+-	clear:			fbcon_sis_clear8,
+-	putc:			fbcon_cfb8_putc,
+-	putcs:			fbcon_cfb8_putcs,
+-	revc:			fbcon_cfb8_revc,
+-	clear_margins:		fbcon_cfb8_clear_margins,
+-	fontwidthmask:		FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
++	.setup			= fbcon_cfb8_setup,
++	.bmove			= fbcon_sis_bmove,
++	.clear			= fbcon_sis_clear8,
++	.putc			= fbcon_cfb8_putc,
++	.putcs			= fbcon_cfb8_putcs,
++	.revc			= fbcon_cfb8_revc,
++	.clear_margins		= fbcon_cfb8_clear_margins,
++	.fontwidthmask		= FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
+ };
+ #endif
+ #ifdef FBCON_HAS_CFB16
+ struct display_switch fbcon_sis16 = {
+-	setup:			fbcon_cfb16_setup,
+-	bmove:			fbcon_sis_bmove,
+-	clear:			fbcon_sis_clear16,
+-	putc:			fbcon_cfb16_putc,
+-	putcs:			fbcon_cfb16_putcs,
+-	revc:			fbcon_sis_revc,
+-	clear_margins:		fbcon_cfb16_clear_margins,
+-	fontwidthmask:		FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
++	.setup			= fbcon_cfb16_setup,
++	.bmove			= fbcon_sis_bmove,
++	.clear			= fbcon_sis_clear16,
++	.putc			= fbcon_cfb16_putc,
++	.putcs			= fbcon_cfb16_putcs,
++	.revc			= fbcon_sis_revc,
++	.clear_margins		= fbcon_cfb16_clear_margins,
++	.fontwidthmask		= FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
+ };
+ #endif
+ #ifdef FBCON_HAS_CFB32
+ struct display_switch fbcon_sis32 = {
+-	setup:			fbcon_cfb32_setup,
+-	bmove:			fbcon_sis_bmove,
+-	clear:			fbcon_sis_clear32,
+-	putc:			fbcon_cfb32_putc,
+-	putcs:			fbcon_cfb32_putcs,
+-	revc:			fbcon_sis_revc,
+-	clear_margins:		fbcon_cfb32_clear_margins,
+-	fontwidthmask:		FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
++	.setup			= fbcon_cfb32_setup,
++	.bmove			= fbcon_sis_bmove,
++	.clear			= fbcon_sis_clear32,
++	.putc			= fbcon_cfb32_putc,
++	.putcs			= fbcon_cfb32_putcs,
++	.revc			= fbcon_sis_revc,
++	.clear_margins		= fbcon_cfb32_clear_margins,
++	.fontwidthmask		= FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16)
+ };
+ #endif
+ 
+--- linux-2.6.0-test6/drivers/video/sis/sis_accel.h	2003-06-14 12:18:08.000000000 -0700
++++ 25/drivers/video/sis/sis_accel.h	2003-10-05 00:34:22.000000000 -0700
+@@ -47,7 +47,7 @@
+ #define TRAPAZOID_FILL          0x00000005  /* Fill trapezoid */
+ #define TRANSPARENT_BITBLT      0x00000006  /* Transparent Blit */
+ 
+-/* Additional engine commands for 310/325 */
++/* Additional engine commands for 315 */
+ #define ALPHA_BLEND		0x00000007  /* Alpha blend ? */
+ #define A3D_FUNCTION		0x00000008  /* 3D command ? */
+ #define	CLEAR_Z_BUFFER		0x00000009  /* ? */
+@@ -90,11 +90,11 @@
+ #define NO_RESET_COUNTER        0x00400000
+ #define NO_LAST_PIXEL           0x00200000
+ 
+-/* Subfunctions for Color/Enhanced Color Expansion (310/325 only) */
++/* Subfunctions for Color/Enhanced Color Expansion (315 only) */
+ #define COLOR_TO_MONO		0x00100000
+ #define AA_TEXT			0x00200000
+ 
+-/* Some general registers for 310/325 series */
++/* Some general registers for 315 series */
+ #define SRC_ADDR		0x8200
+ #define SRC_PITCH		0x8204
+ #define AGP_BASE		0x8206 /* color-depth dependent value */
+@@ -326,7 +326,7 @@ int     CmdQueLen;
+ 
+ 
+ 
+-/* ----------- SiS 310/325 series --------------- */
++/* -------------- SiS 315 series --------------- */
+ 
+ /* Q_STATUS:
+    bit 31 = 1: All engines idle and all queues empty
+@@ -342,16 +342,27 @@ int     CmdQueLen;
+    bits 7:0:   2D counter 1
+ 
+    Where is the command queue length (current amount of commands the queue
+-   can accept) on the 310/325 series? (The current implementation is taken
+-   from 300 series and certainly wrong...)
++   can accept) on the 315 series?
+ */
+ 
+ /* TW: FIXME: CmdQueLen is... where....? */
++/* We assume a length of 4 bytes per command; since 512K of
++ * of RAM are allocated, the number of commands is easily
++ * calculated (assuming that there is no 3D support yet)
++ * We calculate it very cautiously (128K only) and let the
++ * rest to the (never?)-to-come (?) 3D engine. (The 3D engine
++ * can use a similar technique, using the remaining 384K,
++ * hence a queue overflow is avoided)
++ * UPDATE: This technique causes a terrible system latency
++ * on integrated chipsets. Disable the queue handling for
++ * now.
++ */
+ #define SiS310Idle \
+   { \
+   while( (MMIO_IN16(ivideo.mmio_vbase, Q_STATUS+2) & 0x8000) != 0x8000){}; \
+   while( (MMIO_IN16(ivideo.mmio_vbase, Q_STATUS+2) & 0x8000) != 0x8000){}; \
+-  CmdQueLen=MMIO_IN16(ivideo.mmio_vbase, Q_STATUS); \
++  CmdQueLen = 0; \
++  /*CmdQueLen = ((128 * 1024) / 4) - 64; */ \
+   }
+ 
+ #define SiS310SetupSRCBase(base) \
+--- linux-2.6.0-test6/drivers/video/sis/sis_main.c	2003-06-14 12:18:25.000000000 -0700
++++ 25/drivers/video/sis/sis_main.c	2003-10-05 00:34:22.000000000 -0700
+@@ -1,25 +1,20 @@
+ /*
+- * SiS 300/630/730/540/315/550/650/740 frame buffer device
++ * SiS 300/630/730/540/315/550/650/740/330/660/760 frame buffer driver
+  * for Linux kernels 2.4.x and 2.5.x
+  *
+- * Partly based on the VBE 2.0 compliant graphic boards framebuffer driver,
++ * (C) 1999 Silicon Integrated Systems, Inc.
++ * (C) 2001-2003 Thomas Winischhofer, Vienna, Austria.
++ *
++ * Author:   	Thomas Winischhofer <thomas@winischhofer.net>
++ *
++ * Author of code base:
++ *		SiS (www.sis.com.tw)
++ *
++ * See http://www.winischhofer.net/ for more information and updates
++ *
++ * Originally based on the VBE 2.0 compliant graphic boards framebuffer driver,
+  * which is (c) 1998 Gerd Knorr <kraxel@goldbach.in-berlin.de>
+  *
+- * Authors:   	SiS (www.sis.com.tw)
+- *		(Various others)
+- *		Thomas Winischhofer <thomas@winischhofer.net>:
+- *			- SiS Xabre (330) support
+- *			- many fixes and enhancements for all chipset series,
+- *			- extended bridge handling, TV output for Chrontel 7005
+- *                      - 650/LVDS support (for LCD panels up to 1600x1200)
+- *                      - 650/740/Chrontel 7019 support
+- *                      - 30xB/30xLV LCD, TV and VGA2 support
+- *			- memory queue handling enhancements,
+- *                      - 2D acceleration and y-panning,
+- *                      - portation to 2.5 API
+- *			- etc.
+- *			(see http://www.winischhofer.net/
+- *			for more information and updates)
+  */
+ 
+ #include <linux/config.h>
+@@ -43,6 +38,8 @@
+ #include <linux/fs.h>
+ #include <linux/agp_backend.h>
+ #include <linux/types.h>
++#include <linux/vmalloc.h>
++#include <asm/uaccess.h>
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+ #include <linux/spinlock.h>
+@@ -79,6 +76,12 @@
+ #endif
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,69)
++#error "This version of sisfb requires at least 2.5.69"
++#endif
++#endif
++
+ /* -------------------- Macro definitions ---------------------------- */
+ 
+ #undef SISFBDEBUG 	/* TW: no debugging */
+@@ -134,9 +137,19 @@ sisfb_query_VGA_config_space(PSIS_HW_DEV
+ 
+ 	if (!init) {
+ 		init = TRUE;
+-		pdev = pci_find_device(PCI_VENDOR_ID_SI, ivideo.chip_id, pdev);
+-		if (pdev)
+-			valid_pdev = TRUE;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,74)
++		pci_for_each_dev(pdev) {
++#else
++		while((pdev = pci_find_device(PCI_VENDOR_ID_SI, PCI_ANY_ID, pdev))) {
++#endif
++			DPRINTK("sisfb: Current: 0x%x, target: 0x%x\n",
++			         pdev->device, ivideo.chip_id);
++			if ((pdev->vendor == PCI_VENDOR_ID_SI)
++			           && (pdev->device == ivideo.chip_id)) {
++				valid_pdev = TRUE;
++				break;
++			}
++		}
+ 	}
+ 
+ 	if (!valid_pdev) {
+@@ -163,6 +176,7 @@ BOOLEAN sisfb_query_north_bridge_space(P
+ 	if (!init) {
+ 		init = TRUE;
+ 		switch (ivideo.chip) {
++#ifdef CONFIG_FB_SIS_300
+ 		case SIS_540:
+ 			nbridge_id = PCI_DEVICE_ID_SI_540;
+ 			break;
+@@ -172,23 +186,42 @@ BOOLEAN sisfb_query_north_bridge_space(P
+ 		case SIS_730:
+ 			nbridge_id = PCI_DEVICE_ID_SI_730;
+ 			break;
++#endif
++#ifdef CONFIG_FB_SIS_315
+ 		case SIS_550:
+ 			nbridge_id = PCI_DEVICE_ID_SI_550;
+ 			break;
+ 		case SIS_650:
+ 			nbridge_id = PCI_DEVICE_ID_SI_650;
+ 			break;
+-		case SIS_740:			
++		case SIS_740:
+ 			nbridge_id = PCI_DEVICE_ID_SI_740;
+ 			break;
++		case SIS_660:
++			nbridge_id = PCI_DEVICE_ID_SI_660;
++			break;
++		case SIS_760:
++			nbridge_id = PCI_DEVICE_ID_SI_760;
++			break;
++#endif
+ 		default:
+ 			nbridge_id = 0;
+ 			break;
+ 		}
+ 
+-		pdev = pci_find_device(PCI_VENDOR_ID_SI, nbridge_id, pdev);
+-		if (pdev)
+-			valid_pdev = TRUE;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,74)
++		pci_for_each_dev(pdev) {
++#else
++		while((pdev = pci_find_device(PCI_VENDOR_ID_SI, PCI_ANY_ID, pdev))) {
++#endif
++			DPRINTK("Current: 0x%x, target: 0x%x\n",
++					pdev->device, ivideo.chip_id);
++			if ((pdev->vendor == PCI_VENDOR_ID_SI)
++					&& (pdev->device == nbridge_id)) {
++				valid_pdev = TRUE;
++				break;
++			}
++		}
+ 	}
+ 
+ 	if (!valid_pdev) {
+@@ -207,66 +240,291 @@ BOOLEAN sisfb_query_north_bridge_space(P
+ 
+ /* ------------------ Internal helper routines ----------------- */
+ 
+-static void sisfb_search_mode(const char *name)
++static BOOLEAN sisfb_verify_rate(struct sisfb_monitor *monitor, int mode_idx, int rate_idx, int rate)
+ {
+-	int i = 0, j = 0;
++	int htotal, vtotal;
++	unsigned int dclock, hsync;
+ 
+-	if(name == NULL) {
+-	   printk(KERN_ERR "sisfb: Internal error, using default mode.\n");
+-	   sisfb_mode_idx = DEFAULT_MODE;
+-	   return;
++	if(!monitor->datavalid) return TRUE;
++
++	if(mode_idx < 0) return FALSE;
++
++	if(rate < (monitor->vmin - 1)) return FALSE;
++	if(rate > (monitor->vmax + 1)) return FALSE;
++
++	if(sisfb_gettotalfrommode(&SiS_Pr, &sishw_ext, sisbios_mode[mode_idx].mode_no,
++	                          &htotal, &vtotal, rate_idx)) {
++		dclock = (htotal * vtotal * rate) / 1000;
++		if(dclock > (monitor->dclockmax + 1000)) return FALSE;
++		hsync = dclock / htotal;
++		if(hsync < (monitor->hmin - 1)) return FALSE;
++		if(hsync > (monitor->hmax + 1)) return FALSE;
++        } else {
++	  	return FALSE;
+ 	}
+-		
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)		
+-        if (!strcmp(name, sisbios_mode[MODE_INDEX_NONE].name)) {
+-	   printk(KERN_ERR "sisfb: Mode 'none' not supported anymore. Using default.\n");
+-	   sisfb_mode_idx = DEFAULT_MODE;
+-	   return;
++	return TRUE;
++};
++
++static BOOLEAN sisfb_interpret_edid(struct sisfb_monitor *monitor, unsigned char *buffer)
++{
++	int i, j, xres, yres, refresh, index;
++	u32 emodes;
++
++	if(buffer[0] != 0x00 || buffer[1] != 0xff ||
++	   buffer[2] != 0xff || buffer[3] != 0xff ||
++	   buffer[4] != 0xff || buffer[5] != 0xff ||
++	   buffer[6] != 0xff || buffer[7] != 0x00) {
++	   printk(KERN_DEBUG "sisfb: Bad EDID header\n");
++	   return FALSE;
+ 	}
+-#endif		
+ 
+-	while(sisbios_mode[i].mode_no != 0) {
+-		if (!strcmp(name, sisbios_mode[i].name)) {
+-			sisfb_mode_idx = i;
+-			j = 1;
+-			break;
+-		}
+-		i++;
++	if(buffer[0x12] != 0x01) {
++	   printk(KERN_INFO "sisfb: EDID version %d not supported\n",
++	   	buffer[0x12]);
++	   return FALSE;
++	}
++
++	monitor->feature = buffer[0x18];
++
++	if(!buffer[0x14] & 0x80) {
++	   if(!(buffer[0x14] & 0x08)) {
++	      printk(KERN_INFO "sisfb: WARNING: Monitor does not support separate syncs\n");
++	   }
++	}
++
++	if(buffer[0x13] >= 0x01) {
++	   /* EDID V1 rev 1 and 2: Search for monitor descriptor
++	    * to extract ranges
++	    */
++	    j = 0x36;
++	    for(i=0; i<4; i++) {
++	       if(buffer[j]     == 0x00 && buffer[j + 1] == 0x00 &&
++	          buffer[j + 2] == 0x00 && buffer[j + 3] == 0xfd &&
++		  buffer[j + 4] == 0x00) {
++		  monitor->hmin = buffer[j + 7];
++		  monitor->hmax = buffer[j + 8];
++		  monitor->vmin = buffer[j + 5];
++		  monitor->vmax = buffer[j + 6];
++		  monitor->dclockmax = buffer[j + 9] * 10 * 1000;
++		  monitor->datavalid = TRUE;
++		  break;
++	       }
++	       j += 18;
++	    }
++	}
++
++	if(!monitor->datavalid) {
++	   /* Otherwise: Get a range from the list of supported
++	    * Estabished Timings. This is not entirely accurate,
++	    * because fixed frequency monitors are not supported
++	    * that way.
++	    */
++	   monitor->hmin = 65535; monitor->hmax = 0;
++	   monitor->vmin = 65535; monitor->vmax = 0;
++	   monitor->dclockmax = 0;
++	   emodes = buffer[0x23] | (buffer[0x24] << 8) | (buffer[0x25] << 16);
++	   for(i = 0; i < 13; i++) {
++	      if(emodes & sisfb_ddcsmodes[i].mask) {
++	         if(monitor->hmin > sisfb_ddcsmodes[i].h) monitor->hmin = sisfb_ddcsmodes[i].h;
++		 if(monitor->hmax < sisfb_ddcsmodes[i].h) monitor->hmax = sisfb_ddcsmodes[i].h + 1;
++		 if(monitor->vmin > sisfb_ddcsmodes[i].v) monitor->vmin = sisfb_ddcsmodes[i].v;
++		 if(monitor->vmax < sisfb_ddcsmodes[i].v) monitor->vmax = sisfb_ddcsmodes[i].v;
++		 if(monitor->dclockmax < sisfb_ddcsmodes[i].d) monitor->dclockmax = sisfb_ddcsmodes[i].d;
++	      }
++	   }
++	   index = 0x26;
++	   for(i = 0; i < 8; i++) {
++	      xres = (buffer[index] + 31) * 8;
++	      switch(buffer[index + 1] & 0xc0) {
++	         case 0xc0: yres = (xres * 9) / 16; break;
++	         case 0x80: yres = (xres * 4) /  5; break;
++	         case 0x40: yres = (xres * 3) /  4; break;
++	         default:   yres = xres;	    break;
++	      }
++	      refresh = (buffer[index + 1] & 0x3f) + 60;
++	      if((xres >= 640) && (yres >= 480)) {
++                 for(j = 0; j < 8; j++) {
++	            if((xres == sisfb_ddcfmodes[j].x) &&
++	               (yres == sisfb_ddcfmodes[j].y) &&
++		       (refresh == sisfb_ddcfmodes[j].v)) {
++		      if(monitor->hmin > sisfb_ddcfmodes[j].h) monitor->hmin = sisfb_ddcfmodes[j].h;
++		      if(monitor->hmax < sisfb_ddcfmodes[j].h) monitor->hmax = sisfb_ddcfmodes[j].h + 1;
++		      if(monitor->vmin > sisfb_ddcsmodes[j].v) monitor->vmin = sisfb_ddcsmodes[j].v;
++		      if(monitor->vmax < sisfb_ddcsmodes[j].v) monitor->vmax = sisfb_ddcsmodes[j].v;
++		      if(monitor->dclockmax < sisfb_ddcsmodes[j].d) monitor->dclockmax = sisfb_ddcsmodes[i].d;
++	            }
++	         }
++	      }
++	      index += 2;
++           }
++	   if((monitor->hmin <= monitor->hmax) && (monitor->vmin <= monitor->vmax)) {
++	      monitor->datavalid = TRUE;
++	   }
++	}
++
++ 	return(monitor->datavalid);
++}
++
++static void sisfb_handle_ddc(struct sisfb_monitor *monitor, int crtno)
++{
++	USHORT        temp, i, realcrtno = crtno;
++   	unsigned char buffer[256];
++
++	monitor->datavalid = FALSE;
++
++	if(crtno) {
++       	   if(ivideo.vbflags & CRT2_LCD)      realcrtno = 1;
++      	   else if(ivideo.vbflags & CRT2_VGA) realcrtno = 2;
++      	   else return;
++   	}
++
++	if((sisfb_crt1off) && (!crtno)) return;
++
++    	temp = SiS_HandleDDC(&SiS_Pr, ivideo.vbflags, sisvga_engine, realcrtno, 0, &buffer[0]);
++   	if((!temp) || (temp == 0xffff)) {
++      	   printk(KERN_INFO "sisfb: CRT%d DDC probing failed\n", crtno + 1);
++	   return;
++   	} else {
++      	   printk(KERN_INFO "sisfb: CRT%d DDC supported\n", crtno + 1);
++      	   printk(KERN_INFO "sisfb: CRT%d DDC level: %s%s%s%s\n",
++	   	crtno + 1,
++	   	(temp & 0x1a) ? "" : "[none of the supported]",
++	   	(temp & 0x02) ? "2 " : "",
++	   	(temp & 0x08) ? "D&P" : "",
++           	(temp & 0x10) ? "FPDI-2" : "");
++      	   if(temp & 0x02) {
++	      i = 3;  /* Number of retrys */
++	      do {
++	    	 temp = SiS_HandleDDC(&SiS_Pr, ivideo.vbflags, sisvga_engine,
++				     realcrtno, 1, &buffer[0]);
++	      } while((temp) && i--);
++              if(!temp) {
++	    	 if(sisfb_interpret_edid(monitor, &buffer[0])) {
++		    printk(KERN_INFO "sisfb: Monitor range H %d-%dKHz, V %d-%dHz, Max. dotclock %dMHz\n",
++		    	monitor->hmin, monitor->hmax, monitor->vmin, monitor->vmax,
++			monitor->dclockmax / 1000);
++		 } else {
++	       	    printk(KERN_INFO "sisfb: CRT%d DDC EDID corrupt\n", crtno + 1);
++	    	 }
++	      } else {
++            	 printk(KERN_INFO "sisfb: CRT%d DDC reading failed\n", crtno + 1);
++	      }
++	   } else {
++	      printk(KERN_INFO "sisfb: VESA D&P and FPDI-2 not supported yet\n");
++	   }
+ 	}
+-	if(!j) printk(KERN_INFO "sisfb: Invalid mode '%s'\n", name);
+ }
+ 
+-static void sisfb_search_vesamode(unsigned int vesamode)
++static void sisfb_search_vesamode(unsigned int vesamode, BOOLEAN quiet)
+ {
+ 	int i = 0, j = 0;
+ 
+ 	if(vesamode == 0) {
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)	
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ 		sisfb_mode_idx = MODE_INDEX_NONE;
+ #else
+-		printk(KERN_ERR "sisfb: Mode 'none' not supported anymore. Using default.\n");
++		if(!quiet)
++		   printk(KERN_ERR "sisfb: Mode 'none' not supported anymore. Using default.\n");
+ 		sisfb_mode_idx = DEFAULT_MODE;
+-#endif		
++#endif
+ 		return;
+ 	}
+ 
+ 	vesamode &= 0x1dff;  /* Clean VESA mode number from other flags */
+ 
++	while(sisbios_mode[i++].mode_no != 0) {
++		if( (sisbios_mode[i-1].vesa_mode_no_1 == vesamode) ||
++		    (sisbios_mode[i-1].vesa_mode_no_2 == vesamode) ) {
++		    if(sisfb_fstn) {
++		       if(sisbios_mode[i-1].mode_no == 0x50 ||
++		          sisbios_mode[i-1].mode_no == 0x56 ||
++		          sisbios_mode[i-1].mode_no == 0x53) continue;
++	            } else {
++		       if(sisbios_mode[i-1].mode_no == 0x5a ||
++		          sisbios_mode[i-1].mode_no == 0x5b) continue;
++		    }
++		    sisfb_mode_idx = i - 1;
++		    j = 1;
++		    break;
++		}
++	}
++	if((!j) && !quiet) printk(KERN_ERR "sisfb: Invalid VESA mode 0x%x'\n", vesamode);
++}
++
++static void sisfb_search_mode(char *name, BOOLEAN quiet)
++{
++	int i = 0;
++	unsigned int j = 0, xres = 0, yres = 0, depth = 0, rate = 0;
++	char strbuf[16], strbuf1[20];
++	char *nameptr = name;
++
++	if(name == NULL) {
++	   if(!quiet)
++	      printk(KERN_ERR "sisfb: Internal error, using default mode.\n");
++	   sisfb_mode_idx = DEFAULT_MODE;
++	   return;
++	}
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
++        if (!strnicmp(name, sisbios_mode[MODE_INDEX_NONE].name, strlen(name))) {
++	   if(!quiet)
++	      printk(KERN_ERR "sisfb: Mode 'none' not supported anymore. Using default.\n");
++	   sisfb_mode_idx = DEFAULT_MODE;
++	   return;
++	}
++#endif
++	if(strlen(name) <= 19) {
++	   strcpy(strbuf1, name);
++	   for(i=0; i<strlen(strbuf1); i++) {
++	      if(strbuf1[i] < '0' || strbuf1[i] > '9') strbuf1[i] = ' ';
++	   }
++
++	   /* This does some fuzzy mode naming detection */
++	   if(sscanf(strbuf1, "%u %u %u %u", &xres, &yres, &depth, &rate) == 4) {
++	      if((rate <= 32) || (depth > 32)) {
++	         j = rate; rate = depth; depth = j;
++	      }
++	      sprintf(strbuf, "%ux%ux%u", xres, yres, depth);
++	      nameptr = strbuf;
++	      ivideo.refresh_rate = sisfb_parm_rate = rate;
++	   } else if(sscanf(strbuf1, "%u %u %u", &xres, &yres, &depth) == 3) {
++	      sprintf(strbuf, "%ux%ux%u", xres, yres, depth);
++	      nameptr = strbuf;
++	   } else {
++	      xres = 0;
++	      if((sscanf(strbuf1, "%u %u", &xres, &yres) == 2) && (xres != 0)) {
++	         sprintf(strbuf, "%ux%ux8", xres, yres);
++	         nameptr = strbuf;
++	      } else {
++	         sisfb_search_vesamode(simple_strtoul(name, NULL, 0), quiet);
++	         return;
++	      }
++	   }
++	}
++
++	i = 0; j = 0;
+ 	while(sisbios_mode[i].mode_no != 0) {
+-		if( (sisbios_mode[i].vesa_mode_no_1 == vesamode) ||
+-		    (sisbios_mode[i].vesa_mode_no_2 == vesamode) ) {
+-			sisfb_mode_idx = i;
+-			j = 1;
+-			break;
++		if(!strnicmp(nameptr, sisbios_mode[i++].name, strlen(nameptr))) {
++		   if(sisfb_fstn) {
++		      if(sisbios_mode[i-1].mode_no == 0x50 ||
++		         sisbios_mode[i-1].mode_no == 0x56 ||
++		         sisbios_mode[i-1].mode_no == 0x53) continue;
++	           } else {
++		      if(sisbios_mode[i-1].mode_no == 0x5a ||
++		         sisbios_mode[i-1].mode_no == 0x5b) continue;
++		   }
++		   sisfb_mode_idx = i - 1;
++		   j = 1;
++		   break;
+ 		}
+-		i++;
+ 	}
+-	if(!j) printk(KERN_INFO "sisfb: Invalid VESA mode 0x%x'\n", vesamode);
++	if((!j) && !quiet) printk(KERN_ERR "sisfb: Invalid mode '%s'\n", nameptr);
++
+ }
+ 
+-static int sisfb_validate_mode(int myindex)
++static int sisfb_validate_mode(int myindex, unsigned long vbflags)
+ {
+-   u16 xres, yres;
++   u16 xres, yres, myres;
+ 
+ #ifdef CONFIG_FB_SIS_300
+    if(sisvga_engine == SIS_300_VGA) {
+@@ -283,8 +541,10 @@ static int sisfb_validate_mode(int myind
+    }
+ #endif
+ 
+-   switch (ivideo.disp_state & DISPTYPE_DISP2) {
+-     case DISPTYPE_LCD:
++   myres = sisbios_mode[myindex].yres;
++
++   switch (vbflags & VB_DISPTYPE_DISP2) {
++     case CRT2_LCD:
+ 	switch (sishw_ext.ulCRT2LCDType) {
+ 	case LCD_640x480:
+ 		xres =  640; yres =  480;  break;
+@@ -306,140 +566,209 @@ static int sisfb_validate_mode(int myind
+ 		xres = 1400; yres = 1050;  break;		
+ 	case LCD_1600x1200:
+ 		xres = 1600; yres = 1200;  break;
+-	case LCD_320x480:				/* TW: FSTN */
++	case LCD_320x480:				/* FSTN (old) */
+ 		xres =  320; yres =  480;  break;
++	case LCD_640x480_2:				/* FSTN (new) */
++	case LCD_640x480_3:
++		xres =  640; yres =  480;  break;
+ 	default:
+ 	        xres =    0; yres =    0;  break;
+ 	}
+-	if(sisbios_mode[myindex].xres > xres) {
+-	        return(-1);
++
++	if(SiS_Pr.SiS_CustomT == CUT_BARCO1366) {
++	   	xres = 1360; yres = 1024;
+ 	}
+-        if(sisbios_mode[myindex].yres > yres) {
++
++	if(SiS_Pr.SiS_CustomT == CUT_PANEL848) {
++	   	xres = 848;  yres =  480;
++	} else {
++	   if(sisbios_mode[myindex].xres > xres) {
++	        return(-1);
++	   }
++           if(myres > yres) {
+ 	        return(-1);
++	   }
+ 	}
+-	if((sishw_ext.usExternalChip == 0x01) ||   /* LVDS */
+-           (sishw_ext.usExternalChip == 0x05) ||   /* LVDS+Chrontel */
+-	   (sishw_ext.Is301BDH)) {		   /* 301B-DH */
++
++	if(vbflags & (VB_LVDS | VB_30xBDH)) {
+ 	   switch (sisbios_mode[myindex].xres) {
++	   	case 320:
++			if((myres != 200) && (myres != 240))
++		          	return(-1);
++			if((myres == 240) || (myres == 480)) {
++			   	if(!sisfb_fstn) {
++				   if(sisbios_mode[myindex].mode_no == 0x5a ||
++				      sisbios_mode[myindex].mode_no == 0x5b)
++					return(-1);
++			        } else {
++				   if(sisbios_mode[myindex].mode_no == 0x50 ||
++				      sisbios_mode[myindex].mode_no == 0x56 ||
++				      sisbios_mode[myindex].mode_no == 0x53)
++					return(-1);
++				}
++			}
++			if(SiS_Pr.SiS_CustomT == CUT_PANEL848) return(-1);
++			break;
++		case 400:
++	       		if(myres != 300) return(-1);
++			if(SiS_Pr.SiS_CustomT == CUT_PANEL848) return(-1);
++	       		break;
+ 	   	case 512:
+-	       		if(sisbios_mode[myindex].yres != 512) return -1;
+-			if(sishw_ext.ulCRT2LCDType == LCD_1024x600) return -1;
++	       		if(myres != 384) return(-1);
++			if(sishw_ext.ulCRT2LCDType == LCD_1024x600) return(-1);
++			if(SiS_Pr.SiS_CustomT == CUT_PANEL848) return(-1);
+ 	       		break;
+ 	   	case 640:
+-		       	if((sisbios_mode[myindex].yres != 400) &&
+-	           	   (sisbios_mode[myindex].yres != 480))
++		       	if((myres != 400) && (myres != 480))
+ 		          	return -1;
++			if(SiS_Pr.SiS_CustomT == CUT_PANEL848) {
++			   if(myres == 400)
++			 	return(-1);
++			}
+ 	       		break;
+ 	   	case 800:
+-		       	if(sisbios_mode[myindex].yres != 600) return -1;
++		       	if(myres != 600) return(-1);
++	       		break;
++		case 848:
++		        if(SiS_Pr.SiS_CustomT != CUT_PANEL848) return(-1);
++		       	if(myres != 480) return(-1);
+ 	       		break;
+ 	   	case 1024:
+-		       	if((sisbios_mode[myindex].yres != 600) &&
+-	           	   (sisbios_mode[myindex].yres != 768))
+-		          	return -1;
+-			if((sisbios_mode[myindex].yres == 600) &&
++		       	if((myres != 600) && (myres != 768))
++		          	return(-1);
++			if((myres == 600) &&
+ 			   (sishw_ext.ulCRT2LCDType != LCD_1024x600))
+-			   	return -1;
++			   	return(-1);
+ 			break;
+ 		case 1152:
+-			if((sisbios_mode[myindex].yres) != 768) return -1;
+-			if(sishw_ext.ulCRT2LCDType != LCD_1152x768) return -1;
++			if(myres != 768) return(-1);
++			if(sishw_ext.ulCRT2LCDType != LCD_1152x768) return(-1);
+ 			break;
+ 	   	case 1280:
+-		   	if((sisbios_mode[myindex].yres != 768) &&
+-	           	   (sisbios_mode[myindex].yres != 1024))
+-		          	return -1;
+-			if((sisbios_mode[myindex].yres == 768) &&
++		   	if((myres != 768) && (myres != 1024))
++		          	return(-1);
++			if((myres == 768) &&
+ 			   (sishw_ext.ulCRT2LCDType != LCD_1280x768))
+-			   	return -1;				
++			   	return(-1);
++			if(SiS_Pr.SiS_CustomT == CUT_PANEL848) return(-1);
++			break;
++		case 1360:
++			if(SiS_Pr.SiS_CustomT != CUT_BARCO1366) return(-1);
++			if(myres != 1024) return(-1);
+ 			break;
+ 	   	case 1400:
+-		   	if(sisbios_mode[myindex].yres != 1050) return -1;
++		   	if(myres != 1050) return(-1);
++			if(SiS_Pr.SiS_CustomT == CUT_PANEL848) return(-1);
+ 			break;
+ 	   	case 1600:
+-		   	if(sisbios_mode[myindex].yres != 1200) return -1;
++		   	if(myres != 1200) return(-1);
++			if(SiS_Pr.SiS_CustomT == CUT_PANEL848) return(-1);
+ 			break;
+ 	   	default:
+-		        return -1;		
++		        return(-1);
+ 	   }
+ 	} else {
+ 	   switch (sisbios_mode[myindex].xres) {
++	   	case 320:
++			if((myres != 200) && (myres != 240))
++		          	return -1;
++			break;
++		case 400:
++	       		if(myres != 300) return(-1);
++	       		break;
+ 	   	case 512:
+-	       		if(sisbios_mode[myindex].yres != 512) return -1;
++	       		if(myres != 384) return(-1);
+ 	       		break;
+ 	   	case 640:
+-		       	if((sisbios_mode[myindex].yres != 400) &&
+-	           	   (sisbios_mode[myindex].yres != 480))
+-		          	return -1;
++		       	if((myres != 400) && (myres != 480))
++		          	return(-1);
+ 	       		break;
+ 	   	case 800:
+-		       	if(sisbios_mode[myindex].yres != 600) return -1;
++		       	if(myres != 600) return(-1);
+ 	       		break;
+ 	   	case 1024:
+-		       	if(sisbios_mode[myindex].yres != 768) return -1;
++		       	if(myres != 768) return(-1);
+ 			break;
+ 	   	case 1280:
+-		   	if((sisbios_mode[myindex].yres != 960) &&
+-	           	   (sisbios_mode[myindex].yres != 1024))
+-		          	return -1;
+-			if(sisbios_mode[myindex].yres == 960) {
+-			    if(sishw_ext.ulCRT2LCDType == LCD_1400x1050) 
+-			   	return -1;
++		   	if((myres != 960) && (myres != 768) && (myres != 1024))
++		          	return(-1);
++			if((myres == 768) || (myres == 960)) {
++			    	if(sishw_ext.ulCRT2LCDType == LCD_1400x1050)
++			   		return(-1);
++			}
++			if(myres == 768) {
++			    	if(sishw_ext.ulCRT2LCDType == LCD_1280x960)
++			   		return(-1);
+ 			}
+ 			break;
+ 	   	case 1400:
+-		   	if(sisbios_mode[myindex].yres != 1050) return -1;
++		   	if(myres != 1050) return(-1);
+ 			break;
+ 	   	case 1600:
+-		   	if(sisbios_mode[myindex].yres != 1200) return -1;
++		   	if(myres != 1200) return(-1);
+ 			break;
+ 	   	default:
+-		        return -1;		
++		        return(-1);
+ 	   }
+ 	}
+ 	break;
+-     case DISPTYPE_TV:
++
++     case CRT2_TV:
+ 	switch (sisbios_mode[myindex].xres) {
++	case 320:
++		if(vbflags & VB_CHRONTEL) return(-1);
++		if((myres != 200) && (myres != 240))
++		       	return(-1);
++		break;
++	case 400:
++		if(vbflags & VB_CHRONTEL) return(-1);
++		if(myres != 300) return(-1);
++		break;
+ 	case 512:
++		if(vbflags & VB_CHRONTEL) return(-1);
++		if((vbflags & VB_SISBRIDGE) && (vbflags & TV_NTSC))
++		   	return(-1);
++		if(myres != 384) return(-1);
++		break;
+ 	case 640:
+-	case 800:
++		if((myres != 400) && (myres != 480))
++		       	return(-1);
++		if((vbflags & VB_CHRONTEL) && (myres == 400))
++		   	return(-1);
+ 		break;
+ 	case 720:
+-		if (ivideo.TV_type == TVMODE_NTSC) {
+-			if (sisbios_mode[myindex].yres != 480) {
+-				return(-1);
+-			}
+-		} else if (ivideo.TV_type == TVMODE_PAL) {
+-			if (sisbios_mode[myindex].yres != 576) {
+-				return(-1);
+-			}
+-		}
+-		/* TW: LVDS/CHRONTEL does not support 720 */
+-		if (ivideo.hasVB == HASVB_LVDS_CHRONTEL ||
+-					ivideo.hasVB == HASVB_CHRONTEL) {
+-				return(-1);
+-		}
++		if(vbflags & VB_CHRONTEL) return(-1);
++		if((vbflags & TV_NTSC) && (myres != 480))
++			return(-1);
++		if((vbflags & TV_PAL) && (myres != 576))
++			return(-1);
++		break;
++	case 768:
++		if(vbflags & VB_CHRONTEL) return(-1);
++		if(!(vbflags & TV_PAL)) return(-1);
++		if(myres != 576) return(-1);
++		break;
++	case 800:
++		if(myres != 600) return(-1);
+ 		break;
+ 	case 1024:
+-		if (ivideo.TV_type == TVMODE_NTSC) {
+-			if(sisbios_mode[myindex].bpp == 32) {
+-			       return(-1);
+-			}
+-		}
+-		/* TW: LVDS/CHRONTEL only supports < 800 (1024 on 650/Ch7019)*/
+-		if (ivideo.hasVB == HASVB_LVDS_CHRONTEL ||
+-					ivideo.hasVB == HASVB_CHRONTEL) {
+-		    if(ivideo.chip < SIS_315H) {
++		if(vbflags & VB_301) return(-1);
++		if(vbflags & VB_CHRONTEL) {
++		    	if(ivideo.chip < SIS_315H) {
+ 				return(-1);
+-		    }
++		    	}
+ 		}
+ 		break;
+ 	default:
+ 		return(-1);
+ 	}
+ 	break;
+-     case DISPTYPE_CRT2:	
+-        if(sisbios_mode[myindex].xres > 1280) return -1;
++
++     case CRT2_VGA:
++        if(sisbios_mode[myindex].xres > 1600) return(-1);
++	if(!(vbflags & (VB_301B|VB_302B))) {
++	   if(sisbios_mode[myindex].xres > 1400) return(-1);
++	}
+ 	break;	
+      }
+      return(myindex);
+@@ -453,15 +782,20 @@ static void sisfb_search_crt2type(const 
+ 		return;
+ 
+ 	while(sis_crt2type[i].type_no != -1) {
+-		if (!strcmp(name, sis_crt2type[i].name)) {
++		if (!strnicmp(name, sis_crt2type[i].name, strlen(sis_crt2type[i].name))) {
+ 			sisfb_crt2type = sis_crt2type[i].type_no;
+ 			sisfb_tvplug = sis_crt2type[i].tvplug_no;
++			sisfb_dstn = (sis_crt2type[i].flags & FL_550_DSTN) ? 1 : 0;
++			sisfb_fstn = (sis_crt2type[i].flags & FL_550_FSTN) ? 1 : 0;
+ 			break;
+ 		}
+ 		i++;
+ 	}
+ 	if(sisfb_crt2type < 0)
+-		printk(KERN_INFO "sisfb: Invalid CRT2 type: %s\n", name);
++		printk(KERN_ERR "sisfb: Invalid CRT2 type: %s\n", name);
++        if(ivideo.chip != SIS_550) {
++	   sisfb_dstn = sisfb_fstn = 0;
++	}
+ }
+ 
+ static void sisfb_search_queuemode(const char *name)
+@@ -472,23 +806,23 @@ static void sisfb_search_queuemode(const
+ 		return;
+ 
+ 	while (sis_queuemode[i].type_no != -1) {
+-		if (!strcmp(name, sis_queuemode[i].name)) {
++		if (!strnicmp(name, sis_queuemode[i].name, strlen(sis_queuemode[i].name))) {
+ 			sisfb_queuemode = sis_queuemode[i].type_no;
+ 			break;
+ 		}
+ 		i++;
+ 	}
+ 	if (sisfb_queuemode < 0)
+-		printk(KERN_INFO "sisfb: Invalid queuemode type: %s\n", name);
++		printk(KERN_ERR "sisfb: Invalid queuemode type: %s\n", name);
+ }
+ 
+-static u8 sisfb_search_refresh_rate(unsigned int rate)
++static u8 sisfb_search_refresh_rate(unsigned int rate, int mode_idx)
+ {
+ 	u16 xres, yres;
+ 	int i = 0;
+ 
+-	xres = sisbios_mode[sisfb_mode_idx].xres;
+-	yres = sisbios_mode[sisfb_mode_idx].yres;
++	xres = sisbios_mode[mode_idx].xres;
++	yres = sisbios_mode[mode_idx].yres;
+ 
+ 	sisfb_rate_idx = 0;
+ 	while ((sisfb_vrate[i].idx != 0) && (sisfb_vrate[i].xres <= xres)) {
+@@ -536,23 +870,60 @@ static void sisfb_search_tvstd(const cha
+ 		return;
+ 
+ 	while (sis_tvtype[i].type_no != -1) {
+-		if (!strcmp(name, sis_tvtype[i].name)) {
+-			sisfb_tvmode = sis_tvtype[i].type_no;
++		if (!strnicmp(name, sis_tvtype[i].name, strlen(sis_tvtype[i].name))) {
++			ivideo.vbflags |= sis_tvtype[i].type_no;
+ 			break;
+ 		}
+ 		i++;
+ 	}
+ }
+ 
++static void sisfb_search_specialtiming(const char *name)
++{
++	int i = 0;
++	BOOLEAN found = FALSE;
++
++	if(name == NULL)
++		return;
++
++	if(!strnicmp(name, "none", 4)) {
++	        SiS_Pr.SiS_CustomT = CUT_FORCENONE;
++		printk(KERN_DEBUG "sisfb: Special timing disabled\n");
++	} else {
++	   while(mycustomttable[i].chipID != 0) {
++	      if(!strnicmp(name,mycustomttable[i].optionName, strlen(mycustomttable[i].optionName))) {
++		 SiS_Pr.SiS_CustomT = mycustomttable[i].SpecialID;
++		 found = TRUE;
++		 printk(KERN_INFO "sisfb: Special timing for %s %s forced\n",
++		 mycustomttable[i].vendorName, mycustomttable[i].cardName);
++		 break;
++	      }
++	      i++;
++	   }
++	   if(!found) {
++	      printk(KERN_WARNING "sisfb: Invalid SpecialTiming parameter, valid are:");
++	      printk(KERN_WARNING "\t\"none\" (to disable special timings)\n");
++	      i = 0;
++	      while(mycustomttable[i].chipID != 0) {
++		 printk(KERN_WARNING "\t\"%s\" (for %s %s)\n",
++		     mycustomttable[i].optionName,
++		     mycustomttable[i].vendorName,
++		     mycustomttable[i].cardName);
++		 i++;
++	      }
++           }
++ 	}
++}
++
+ static BOOLEAN sisfb_bridgeisslave(void)
+ {
+-   unsigned char usScratchP1_00;
++   unsigned char P1_00;
+ 
+-   if(ivideo.hasVB == HASVB_NONE) return FALSE;
++   if(!(ivideo.vbflags & VB_VIDEOBRIDGE)) return FALSE;
+ 
+-   inSISIDXREG(SISPART1,0x00,usScratchP1_00);
+-   if( ((sisvga_engine == SIS_300_VGA) && (usScratchP1_00 & 0xa0) == 0x20) ||
+-       ((sisvga_engine == SIS_315_VGA) && (usScratchP1_00 & 0x50) == 0x10) ) {
++   inSISIDXREG(SISPART1,0x00,P1_00);
++   if( ((sisvga_engine == SIS_300_VGA) && (P1_00 & 0xa0) == 0x20) ||
++       ((sisvga_engine == SIS_315_VGA) && (P1_00 & 0x50) == 0x10) ) {
+ 	   return TRUE;
+    } else {
+            return FALSE;
+@@ -597,7 +968,7 @@ static BOOLEAN sisfbcheckvretracecrt2(vo
+ 
+ static BOOLEAN sisfb_CheckVBRetrace(void) 
+ {
+-   if(ivideo.disp_state & DISPTYPE_DISP2) {
++   if(ivideo.currentvbflags & VB_DISPTYPE_DISP2) {
+       if(sisfb_bridgeisslave()) {
+          return(sisfbcheckvretracecrt1());
+       } else {
+@@ -607,60 +978,195 @@ static BOOLEAN sisfb_CheckVBRetrace(void
+    return(sisfbcheckvretracecrt1());
+ }
+ 
++static int sisfb_myblank(int blank)
++{
++   u8 sr01, sr11, sr1f, cr63=0, p2_0, p1_13;
++   BOOLEAN backlight = TRUE;
++
++   switch(blank) {
++   case 0:	/* on */
++      sr01  = 0x00;
++      sr11  = 0x00;
++      sr1f  = 0x00;
++      cr63  = 0x00;
++      p2_0  = 0x20;
++      p1_13 = 0x00;
++      backlight = TRUE;
++      break;
++   case 1:	/* blank */
++      sr01  = 0x20;
++      sr11  = 0x00;
++      sr1f  = 0x00;
++      cr63  = 0x00;
++      p2_0  = 0x20;
++      p1_13 = 0x00;
++      backlight = TRUE;
++      break;
++   case 2:	/* no vsync */
++      sr01  = 0x20;
++      sr11  = 0x08;
++      sr1f  = 0x80;
++      cr63  = 0x40;
++      p2_0  = 0x40;
++      p1_13 = 0x80;
++      backlight = FALSE;
++      break;
++   case 3:	/* no hsync */
++      sr01  = 0x20;
++      sr11  = 0x08;
++      sr1f  = 0x40;
++      cr63  = 0x40;
++      p2_0  = 0x80;
++      p1_13 = 0x40;
++      backlight = FALSE;
++      break;
++   case 4:	/* off */
++      sr01  = 0x20;
++      sr11  = 0x08;
++      sr1f  = 0xc0;
++      cr63  = 0x40;
++      p2_0  = 0xc0;
++      p1_13 = 0xc0;
++      backlight = FALSE;
++      break;
++   default:
++      return 1;
++   }
++
++   if(ivideo.currentvbflags & VB_DISPTYPE_CRT1) {
++
++      setSISIDXREG(SISSR, 0x01, ~0x20, sr01);
++
++      if( (!sisfb_thismonitor.datavalid) ||
++          ((sisfb_thismonitor.datavalid) &&
++           (sisfb_thismonitor.feature & 0xe0))) {
++
++	 if(sisvga_engine == SIS_315_VGA) {
++	    setSISIDXREG(SISCR, 0x63, 0xbf, cr63);
++	 }
++
++	 setSISIDXREG(SISSR, 0x1f, 0x3f, sr1f);
++      }
++
++   }
++
++   if(ivideo.currentvbflags & CRT2_LCD) {
++
++      if(ivideo.vbflags & (VB_301LV|VB_302LV)) {
++	 if(backlight) {
++	    SiS_SiS30xBLOn(&SiS_Pr, &sishw_ext);
++	 } else {
++	    SiS_SiS30xBLOff(&SiS_Pr, &sishw_ext);
++	 }
++      } else if(sisvga_engine == SIS_315_VGA) {
++	 if(ivideo.vbflags & VB_CHRONTEL) {
++	    if(backlight) {
++	       SiS_Chrontel701xBLOn(&SiS_Pr,&sishw_ext);
++	    } else {
++	       SiS_Chrontel701xBLOff(&SiS_Pr);
++	    }
++	 }
++      }
++
++      if(((sisvga_engine == SIS_300_VGA) &&
++          (ivideo.vbflags & (VB_301|VB_30xBDH|VB_LVDS))) ||
++         ((sisvga_engine == SIS_315_VGA) &&
++          ((ivideo.vbflags & (VB_LVDS | VB_CHRONTEL)) == VB_LVDS))) {
++          setSISIDXREG(SISSR, 0x11, ~0x0c, sr11);
++      }
++
++      if(sisvga_engine == SIS_300_VGA) {
++         if((ivideo.vbflags & (VB_301B|VB_302B)) &&
++            (!(ivideo.vbflags & VB_30xBDH))) {
++	    setSISIDXREG(SISPART1, 0x13, 0x3f, p1_13);
++	 }
++      } else if(sisvga_engine == SIS_315_VGA) {
++         if((ivideo.vbflags & (VB_301B|VB_302B)) &&
++            (!(ivideo.vbflags & VB_30xBDH))) {
++	    setSISIDXREG(SISPART2, 0x00, 0x1f, p2_0);
++	 }
++      }
++
++   } else if(ivideo.currentvbflags & CRT2_VGA) {
++
++      if(ivideo.vbflags & (VB_301B|VB_302B)) {
++         setSISIDXREG(SISPART2, 0x00, 0x1f, p2_0);
++      }
++
++   }
++
++   return(0);
++}
++
+ /* ----------- FBDev related routines for all series ----------- */
+ 
++static void sisfb_set_vparms(void)
++{
++   switch(ivideo.video_bpp) {
++   case 8:
++       	ivideo.DstColor = 0x0000;
++	ivideo.SiS310_AccelDepth = 0x00000000;
++	ivideo.video_cmap_len = 256;
++       	break;
++   case 16:
++       	ivideo.DstColor = 0x8000;
++       	ivideo.SiS310_AccelDepth = 0x00010000;
++	ivideo.video_cmap_len = 16;
++       	break;
++   case 32:
++       	ivideo.DstColor = 0xC000;
++	ivideo.SiS310_AccelDepth = 0x00020000;
++	ivideo.video_cmap_len = 16;
++       	break;
++   default:
++ 	ivideo.video_cmap_len = 16;
++	printk(KERN_ERR "sisfb: Unsupported depth %d", ivideo.video_bpp);
++	ivideo.accel = 0;
++	break;
++   }
++}
++
+ static int sisfb_do_set_var(struct fb_var_screeninfo *var, int isactive,
+ 		      struct fb_info *info)
+ {
+-	unsigned int htotal =
+-		var->left_margin + var->xres + var->right_margin +
+-		var->hsync_len;
+-	unsigned int vtotal = 0; 
++	unsigned int htotal = 0, vtotal = 0;
+ 	double drate = 0, hrate = 0;
+ 	int found_mode = 0;
+ 	int old_mode;
+-	unsigned char reg;
++	u32 pixclock;
+ 
+-	TWDEBUG("Inside do_set_var");
+-	
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)	
+-	inSISIDXREG(SISCR,0x34,reg);
+-	if(reg & 0x80) {
+-	   printk(KERN_INFO "sisfb: Cannot change display mode, X server is active\n");
+-	   return -EBUSY;
+-	}
+-#endif	
++	htotal = var->left_margin + var->xres + var->right_margin + var->hsync_len;
++
++	vtotal = var->upper_margin + var->lower_margin + var->vsync_len;
++
++	pixclock = var->pixclock;
+ 
+ 	if((var->vmode & FB_VMODE_MASK) == FB_VMODE_NONINTERLACED) {
+-		vtotal = var->upper_margin + var->yres + var->lower_margin +
+-		         var->vsync_len;
++		vtotal += var->yres;
+ 		vtotal <<= 1;
+ 	} else if((var->vmode & FB_VMODE_MASK) == FB_VMODE_DOUBLE) {
+-		vtotal = var->upper_margin + var->yres + var->lower_margin +
+-		         var->vsync_len;
++		vtotal += var->yres;
+ 		vtotal <<= 2;
+ 	} else if((var->vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED) {
+-		vtotal = var->upper_margin + (var->yres/2) + var->lower_margin +
+-		         var->vsync_len; 
+-	} else 	vtotal = var->upper_margin + var->yres + var->lower_margin +
+-		         var->vsync_len;
++		vtotal += var->yres;
++		vtotal <<= 1;
++	} else 	vtotal += var->yres;
+ 
+ 	if(!(htotal) || !(vtotal)) {
+ 		DPRINTK("sisfb: Invalid 'var' information\n");
+ 		return -EINVAL;
+ 	}
+ 
+-	if(var->pixclock && htotal && vtotal) {
+-	   drate = 1E12 / var->pixclock;
++	if(pixclock && htotal && vtotal) {
++	   drate = 1E12 / pixclock;
+ 	   hrate = drate / htotal;
+ 	   ivideo.refresh_rate = (unsigned int) (hrate / vtotal * 2 + 0.5);
+ 	} else ivideo.refresh_rate = 60;
+ 
+-	/* TW: Calculation wrong for 1024x600 - force it to 60Hz */
+-	if((var->xres == 1024) && (var->yres == 600)) ivideo.refresh_rate = 60;
+-
++#if 0
+ 	printk(KERN_DEBUG "sisfb: Change mode to %dx%dx%d-%dHz\n",
+ 		var->xres,var->yres,var->bits_per_pixel,ivideo.refresh_rate);
++#endif
+ 
+ 	old_mode = sisfb_mode_idx;
+ 	sisfb_mode_idx = 0;
+@@ -678,7 +1184,7 @@ static int sisfb_do_set_var(struct fb_va
+ 	}
+ 
+ 	if(found_mode)
+-		sisfb_mode_idx = sisfb_validate_mode(sisfb_mode_idx);
++		sisfb_mode_idx = sisfb_validate_mode(sisfb_mode_idx, ivideo.currentvbflags);
+ 	else
+ 		sisfb_mode_idx = -1;
+ 
+@@ -689,12 +1195,21 @@ static int sisfb_do_set_var(struct fb_va
+ 		return -EINVAL;
+ 	}
+ 
+-	if(sisfb_search_refresh_rate(ivideo.refresh_rate) == 0) {
++	if(sisfb_search_refresh_rate(ivideo.refresh_rate, sisfb_mode_idx) == 0) {
+ 		sisfb_rate_idx = sisbios_mode[sisfb_mode_idx].rate_idx;
+ 		ivideo.refresh_rate = 60;
+ 	}
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
++	if(sisfb_thismonitor.datavalid) {
++	   if(!sisfb_verify_rate(&sisfb_thismonitor, sisfb_mode_idx,
++	                         sisfb_rate_idx, ivideo.refresh_rate)) {
++	      printk(KERN_INFO "sisfb: WARNING: Refresh rate exceeds monitor specs!\n");
++	   }
++	}
++#endif
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ 	if(((var->activate & FB_ACTIVATE_MASK) == FB_ACTIVATE_NOW) && isactive) {
+ #else
+ 	if(isactive) {
+@@ -708,14 +1223,6 @@ static int sisfb_do_set_var(struct fb_va
+ 
+ 		outSISIDXREG(SISSR, IND_SIS_PASSWORD, SIS_PASSWORD);
+ 
+-		sisfb_post_setmode();
+-
+-		DPRINTK("sisfb: Set new mode: %dx%dx%d-%d \n",
+-			sisbios_mode[sisfb_mode_idx].xres,
+-			sisbios_mode[sisfb_mode_idx].yres,
+-			sisbios_mode[sisfb_mode_idx].bpp,
+-			ivideo.refresh_rate);
+-
+ 		ivideo.video_bpp = sisbios_mode[sisfb_mode_idx].bpp;
+ 		ivideo.video_vwidth = ivideo.video_width = sisbios_mode[sisfb_mode_idx].xres;
+ 		ivideo.video_vheight = ivideo.video_height = sisbios_mode[sisfb_mode_idx].yres;
+@@ -725,53 +1232,38 @@ static int sisfb_do_set_var(struct fb_va
+ 		if(sisfb_accel) {
+ 		   ivideo.accel = (var->accel_flags & FB_ACCELF_TEXT) ? -1 : 0;
+ 		}
+-		switch(ivideo.video_bpp) {
+-        	case 8:
+-            		ivideo.DstColor = 0x0000;
+-	    		ivideo.SiS310_AccelDepth = 0x00000000;
+-			ivideo.video_cmap_len = 256;
+-            		break;
+-        	case 16:
+-            		ivideo.DstColor = 0x8000;
+-            		ivideo.SiS310_AccelDepth = 0x00010000;
+-			ivideo.video_cmap_len = 16;
+-            		break;
+-        	case 32:
+-            		ivideo.DstColor = 0xC000;
+-	    		ivideo.SiS310_AccelDepth = 0x00020000;
+-			ivideo.video_cmap_len = 16;
+-            		break;
+-		default:
+-			ivideo.video_cmap_len = 16;
+-		        printk(KERN_ERR "sisfb: Unsupported depth %d", ivideo.video_bpp);
+-			ivideo.accel = 0;
+-			break;
+-    		}
++
++		sisfb_set_vparms();
++
++		ivideo.current_width = ivideo.video_width;
++		ivideo.current_height = ivideo.video_height;
++		ivideo.current_bpp = ivideo.video_bpp;
++		ivideo.current_htotal = htotal;
++		ivideo.current_vtotal = vtotal;
++		ivideo.current_pixclock = var->pixclock;
++		ivideo.current_refresh_rate = ivideo.refresh_rate;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
++                sisfb_lastrates[sisfb_mode_no] = ivideo.refresh_rate;
++#endif
++
++		sisfb_post_setmode();
+ 
+ 	}
+-	TWDEBUG("End of do_set_var");
+ 	return 0;
+ }
+ 
+-#ifdef SISFB_PAN
+ static int sisfb_pan_var(struct fb_var_screeninfo *var)
+ {
+ 	unsigned int base;
+ 
+-	TWDEBUG("Inside pan_var");
+-	
+ 	if (var->xoffset > (var->xres_virtual - var->xres)) {
+-	        printk(KERN_INFO "Pan: xo: %d xv %d xr %d\n",
+-			var->xoffset, var->xres_virtual, var->xres);
+ 		return -EINVAL;
+ 	}
+ 	if(var->yoffset > (var->yres_virtual - var->yres)) {
+-		printk(KERN_INFO "Pan: yo: %d yv %d yr %d\n",
+-			var->yoffset, var->yres_virtual, var->yres);
+ 		return -EINVAL;
+ 	}
+ 
+-        base = var->yoffset * var->xres_virtual + var->xoffset;
++	base = var->yoffset * var->xres_virtual + var->xoffset;
+ 
+         /* calculate base bpp dep. */
+         switch(var->bits_per_pixel) {
+@@ -794,7 +1286,7 @@ static int sisfb_pan_var(struct fb_var_s
+ 	if(sisvga_engine == SIS_315_VGA) {
+ 		setSISIDXREG(SISSR, 0x37, 0xFE, (base >> 24) & 0x01);
+ 	}
+-        if(ivideo.disp_state & DISPTYPE_DISP2) {
++        if(ivideo.currentvbflags & VB_DISPTYPE_DISP2) {
+ 		orSISIDXREG(SISPART1, sisfb_CRT2_write_enable, 0x01);
+         	outSISIDXREG(SISPART1, 0x06, (base & 0xFF));
+         	outSISIDXREG(SISPART1, 0x05, ((base >> 8) & 0xFF));
+@@ -803,10 +1295,8 @@ static int sisfb_pan_var(struct fb_var_s
+ 			setSISIDXREG(SISPART1, 0x02, 0x7F, ((base >> 24) & 0x01) << 7);
+ 		}
+         }
+-	TWDEBUG("End of pan_var");
+ 	return 0;
+ }
+-#endif
+ 
+ static void sisfb_bpp_to_var(struct fb_var_screeninfo *var)
+ {
+@@ -843,22 +1333,24 @@ static void sisfb_bpp_to_var(struct fb_v
+ 
+ void sis_dispinfo(struct ap_data *rec)
+ {
+-	rec->minfo.bpp    = ivideo.video_bpp;
+-	rec->minfo.xres   = ivideo.video_width;
+-	rec->minfo.yres   = ivideo.video_height;
+-	rec->minfo.v_xres = ivideo.video_vwidth;
+-	rec->minfo.v_yres = ivideo.video_vheight;
+-	rec->minfo.org_x  = ivideo.org_x;
+-	rec->minfo.org_y  = ivideo.org_y;
+-	rec->minfo.vrate  = ivideo.refresh_rate;
+-	rec->iobase       = ivideo.vga_base - 0x30;
+-	rec->mem_size     = ivideo.video_size;
+-	rec->disp_state   = ivideo.disp_state; 
+-	rec->version      = (VER_MAJOR << 24) | (VER_MINOR << 16) | VER_LEVEL; 
+-	rec->hasVB        = ivideo.hasVB; 
+-	rec->TV_type      = ivideo.TV_type; 
+-	rec->TV_plug      = ivideo.TV_plug; 
+-	rec->chip         = ivideo.chip;
++	rec->minfo.bpp      = ivideo.video_bpp;
++	rec->minfo.xres     = ivideo.video_width;
++	rec->minfo.yres     = ivideo.video_height;
++	rec->minfo.v_xres   = ivideo.video_vwidth;
++	rec->minfo.v_yres   = ivideo.video_vheight;
++	rec->minfo.org_x    = ivideo.org_x;
++	rec->minfo.org_y    = ivideo.org_y;
++	rec->minfo.vrate    = ivideo.refresh_rate;
++	rec->iobase         = ivideo.vga_base - 0x30;
++	rec->mem_size       = ivideo.video_size;
++	rec->disp_state     = ivideo.disp_state;
++	rec->version        = (VER_MAJOR << 24) | (VER_MINOR << 16) | VER_LEVEL;
++	rec->hasVB          = ivideo.hasVB;
++	rec->TV_type        = ivideo.TV_type;
++	rec->TV_plug        = ivideo.TV_plug;
++	rec->chip           = ivideo.chip;
++	rec->vbflags	    = ivideo.vbflags;
++	rec->currentvbflags = ivideo.currentvbflags;
+ }
+ 
+ /* ------------ FBDev related routines for 2.4 series ----------- */
+@@ -873,7 +1365,6 @@ static void sisfb_crtc_to_var(struct fb_
+ 	int A, B, C, D, E, F, temp;
+ 	double hrate, drate;
+ 
+-	TWDEBUG("Inside crtc_to_var");
+ 	inSISIDXREG(SISSR, IND_SIS_COLOR_MODE, sr_data);
+ 
+ 	if (sr_data & SIS_INTERLACED_MODE)
+@@ -921,6 +1412,8 @@ static void sisfb_crtc_to_var(struct fb_
+ 
+ 	inSISIDXREG(SISCR, 0x09, cr_data3);
+ 
++	if(cr_data3 & 0x80) var->vmode = FB_VMODE_DOUBLE;
++
+ 	VBS = (cr_data & 0xff) | ((u16) (cr_data2 & 0x08) << 5) |
+ 	      ((u16) (cr_data3 & 0x20) << 4) | ((u16) (sr_data & 0x04) << 8);
+ 
+@@ -939,26 +1432,22 @@ static void sisfb_crtc_to_var(struct fb_
+ 	D = B - F - C;
+ 
+         var->yres = E;
+-#ifndef SISFB_PAN
+-	var->yres_virtual = E;
+-#endif
+-	/* TW: We have to report the physical dimension to the console! */
++	var->upper_margin = D;
++	var->lower_margin = F;
++	var->vsync_len = C;
++
+ 	if ((var->vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED) {
+ 		var->yres <<= 1;
+-#ifndef SISFB_PAN
+-		var->yres_virtual <<= 1;
+-#endif
++		var->upper_margin <<= 1;
++		var->lower_margin <<= 1;
++		var->vsync_len <<= 1;
+ 	} else if ((var->vmode & FB_VMODE_MASK) == FB_VMODE_DOUBLE) {
+ 		var->yres >>= 1;
+-#ifndef SISFB_PAN
+-		var->yres_virtual >>= 1;
+-#endif
++		var->upper_margin >>= 1;
++		var->lower_margin >>= 1;
++		var->vsync_len >>= 1;
+ 	}
+ 
+-	var->upper_margin = D;
+-	var->lower_margin = F;
+-	var->vsync_len = C;
+-
+ 	inSISIDXREG(SISSR, 0x0b, sr_data);
+ 
+ 	inSISIDXREG(SISCR, 0x00, cr_data);
+@@ -999,10 +1488,20 @@ static void sisfb_crtc_to_var(struct fb_
+ 	D = B - F - C;
+ 
+ 	var->xres = var->xres_virtual = E * 8;
+-	var->left_margin = D * 8;
+-	var->right_margin = F * 8;
+-	var->hsync_len = C * 8;
+ 
++	if((var->xres == 320) &&
++	   (var->yres == 200 || var->yres == 240)) {
++		/* Terrible hack, but the correct CRTC data for
++	  	 * these modes only produces a black screen...
++	  	 */
++       		var->left_margin = (400 - 376);
++       		var->right_margin = (328 - 320);
++       		var->hsync_len = (376 - 328);
++	} else {
++	   	var->left_margin = D * 8;
++	   	var->right_margin = F * 8;
++	   	var->hsync_len = C * 8;
++	}
+ 	var->activate = FB_ACTIVATE_NOW;
+ 
+ 	var->sync = 0;
+@@ -1022,21 +1521,21 @@ static void sisfb_crtc_to_var(struct fb_
+ 	VT <<= 1;
+ 	HT = (HT + 5) * 8;
+ 
++	if ((var->vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED) {
++		VT <<= 1;
++	}
+ 	hrate = (double) ivideo.refresh_rate * (double) VT / 2;
+ 	drate = hrate * HT;
+ 	var->pixclock = (u32) (1E12 / drate);
+ 
+-#ifdef SISFB_PAN
+ 	if(sisfb_ypan) {
+ 	    var->yres_virtual = ivideo.heapstart / (var->xres * (var->bits_per_pixel >> 3));
+ 	    if(var->yres_virtual <= var->yres) {
+ 	        var->yres_virtual = var->yres;
+ 	    }
+ 	} else
+-#endif
+-	   var->yres_virtual = var->yres;
++	    var->yres_virtual = var->yres;
+ 
+-        TWDEBUG("end of crtc_to_var");
+ }
+ 
+ static int sis_getcolreg(unsigned regno, unsigned *red, unsigned *green, unsigned *blue,
+@@ -1069,7 +1568,7 @@ static int sisfb_setcolreg(unsigned regn
+ 		outSISREG(SISDACD, (red >> 10));
+ 		outSISREG(SISDACD, (green >> 10));
+ 		outSISREG(SISDACD, (blue >> 10));
+-		if (ivideo.disp_state & DISPTYPE_DISP2) {
++		if (ivideo.currentvbflags & VB_DISPTYPE_DISP2) {
+ 		        outSISREG(SISDAC2A, regno);
+ 			outSISREG(SISDAC2D, (red >> 8));
+ 			outSISREG(SISDAC2D, (green >> 8));
+@@ -1118,7 +1617,7 @@ static void sisfb_set_disp(int con, stru
+ 	display->ywrapstep = fix.ywrapstep;
+ 	display->line_length = fix.line_length;
+ 	display->next_line = fix.line_length;
+-	display->can_soft_blank = 0;
++	display->can_soft_blank = 1;
+ 	display->inverse = sisfb_inverse;
+ 	display->var = *var;
+ 
+@@ -1162,17 +1661,12 @@ static void sisfb_set_disp(int con, stru
+ 	display->dispsw = &sisfb_sw;
+ 	restore_flags(flags);
+ 
+-#ifdef SISFB_PAN
+-        if((ivideo.accel) && (sisfb_ypan)) {
+-  	    /* display->scrollmode = SCROLL_YPAN; - not defined */
++        if(sisfb_ypan) {
++  	    /* display->scrollmode = 0;  */
+ 	} else {
+ 	    display->scrollmode = SCROLL_YREDRAW;
+ 	    sisfb_sw.bmove = fbcon_redraw_bmove;
+ 	}
+-#else
+-	display->scrollmode = SCROLL_YREDRAW;
+-	sisfb_sw.bmove = fbcon_redraw_bmove;
+-#endif
+ }
+ 
+ static void sisfb_do_install_cmap(int con, struct fb_info *info)
+@@ -1191,17 +1685,16 @@ static void sisfb_do_install_cmap(int co
+ static int sisfb_get_var(struct fb_var_screeninfo *var, int con,
+ 			 struct fb_info *info)
+ {
+-	TWDEBUG("inside get_var");
+ 	if(con == -1)
+ 		memcpy(var, &default_var, sizeof(struct fb_var_screeninfo));
+ 	else
+ 		*var = fb_display[con].var;
+ 
+- 	/* For FSTN, DSTN */
+-	if (var->xres == 320 && var->yres == 480)
++	if(sisfb_fstn) {
++	   if (var->xres == 320 && var->yres == 480)
+ 		var->yres = 240;
+-		
+-	TWDEBUG("end of get_var");
++        }
++
+ 	return 0;
+ }
+ 
+@@ -1211,8 +1704,6 @@ static int sisfb_set_var(struct fb_var_s
+ 	int err;
+ 	unsigned int cols, rows;
+ 
+-	TWDEBUG("inside set_var");
+-
+ 	fb_display[con].var.activate = FB_ACTIVATE_NOW;
+         if(sisfb_do_set_var(var, con == currcon, info)) {
+ 		sisfb_crtc_to_var(var);
+@@ -1233,16 +1724,17 @@ static int sisfb_set_var(struct fb_var_s
+ 
+ 	cols = sisbios_mode[sisfb_mode_idx].cols;
+ 	rows = sisbios_mode[sisfb_mode_idx].rows;
+-	vc_resize_con(rows, cols, fb_display[con].conp->vc_num);
++#if 0
++	/* Why was this called here? */
++ 	vc_resize_con(rows, cols, fb_display[con].conp->vc_num);
++#endif
+ 
+-	TWDEBUG("end of set_var");
+ 	return 0;
+ }
+ 
+ static int sisfb_get_cmap(struct fb_cmap *cmap, int kspc, int con,
+ 			  struct fb_info *info)
+ {
+-	TWDEBUG("inside get_cmap");
+         if (con == currcon)
+ 		return fb_get_cmap(cmap, kspc, sis_getcolreg, info);
+ 
+@@ -1251,7 +1743,6 @@ static int sisfb_get_cmap(struct fb_cmap
+ 	else
+ 		fb_copy_cmap(fb_default_cmap(ivideo.video_cmap_len), cmap, kspc ? 0 : 2);
+ 
+-	TWDEBUG("end of get_cmap");
+ 	return 0;
+ }
+ 
+@@ -1260,7 +1751,6 @@ static int sisfb_set_cmap(struct fb_cmap
+ {
+ 	int err;
+ 
+-	TWDEBUG("inside set_cmap");
+ 	if (!fb_display[con].cmap.len) {
+ 		err = fb_alloc_cmap(&fb_display[con].cmap, ivideo.video_cmap_len, 0);
+ 		if (err)
+@@ -1272,17 +1762,15 @@ static int sisfb_set_cmap(struct fb_cmap
+ 
+ 	else
+ 		fb_copy_cmap(cmap, &fb_display[con].cmap, kspc ? 0 : 1);
+-	TWDEBUG("end of set_cmap");
++
+ 	return 0;
+ }
+ 
+-#ifdef SISFB_PAN
+ static int sisfb_pan_display(struct fb_var_screeninfo *var, int con,
+ 			     struct fb_info* info)
+ {
+ 	int err;
+-	
+-	TWDEBUG("inside pan_display");
++
+ 	if (var->vmode & FB_VMODE_YWRAP) {
+ 		if (var->yoffset < 0 || var->yoffset >= fb_display[con].var.yres_virtual || var->xoffset)
+ 			return -EINVAL;
+@@ -1303,10 +1791,8 @@ static int sisfb_pan_display(struct fb_v
+ 	else
+ 		fb_display[con].var.vmode &= ~FB_VMODE_YWRAP;
+ 
+-	TWDEBUG("end of pan_display");
+ 	return 0;
+ }
+-#endif
+ 
+ static int sisfb_mmap(struct fb_info *info, struct file *file,
+ 		      struct vm_area_struct *vma)
+@@ -1316,7 +1802,6 @@ static int sisfb_mmap(struct fb_info *in
+ 	unsigned long off;
+ 	u32 len, mmio_off;
+ 
+-	TWDEBUG("inside mmap");
+ 	if(vma->vm_pgoff > (~0UL >> PAGE_SHIFT))  return -EINVAL;
+ 
+ 	off = vma->vm_pgoff << PAGE_SHIFT;
+@@ -1351,11 +1836,11 @@ static int sisfb_mmap(struct fb_info *in
+ 	if (boot_cpu_data.x86 > 3)
+ 		pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;
+ #endif
++        /* RedHat requires vma as the first paramater to the following call */
+ 	if (io_remap_page_range(vma->vm_start, off, vma->vm_end - vma->vm_start,
+ 				vma->vm_page_prot))
+ 		return -EAGAIN;
+ 
+-        TWDEBUG("end of mmap");
+ 	return 0;
+ }
+ 
+@@ -1368,7 +1853,6 @@ static void sis_get_glyph(struct fb_info
+ 	u8 *gbuf = gly->gmask;
+ 	int size;
+ 
+-	TWDEBUG("Inside get_glyph");
+ 	gly->fontheight = fontheight(p);
+ 	gly->fontwidth = fontwidth(p);
+ 	widthb = (fontwidth(p) + 7) / 8;
+@@ -1382,16 +1866,11 @@ static void sis_get_glyph(struct fb_info
+ 	size = fontheight(p) * widthb;
+ 	memcpy(gbuf, cdat, size);
+ 	gly->ngmask = size;
+-	TWDEBUG("End of get_glyph");
+ }
+ 
+ static int sisfb_update_var(int con, struct fb_info *info)
+ {
+-#ifdef SISFB_PAN
+         return(sisfb_pan_var(&fb_display[con].var));
+-#else
+-	return 0;
+-#endif	
+ }
+ 
+ static int sisfb_switch(int con, struct fb_info *info)
+@@ -1428,127 +1907,7 @@ static int sisfb_switch(int con, struct 
+ 
+ static void sisfb_blank(int blank, struct fb_info *info)
+ {
+-	u8 reg;
+-
+-	inSISIDXREG(SISCR, 0x17, reg);
+-
+-	if(blank > 0)
+-		reg &= 0x7f;
+-	else
+-		reg |= 0x80;
+-
+-        outSISIDXREG(SISCR, 0x17, reg);		
+-	outSISIDXREG(SISSR, 0x00, 0x01);    /* Synchronous Reset */
+-	outSISIDXREG(SISSR, 0x00, 0x03);    /* End Reset */
+-	printk(KERN_DEBUG "sisfb_blank() called (%d)\n", blank);
+-}
+-
+-
+-static int sisfb_ioctl(struct inode *inode, struct file *file,
+-		       unsigned int cmd, unsigned long arg, int con,
+-		       struct fb_info *info)
+-{
+-	TWDEBUG("inside ioctl");
+-	switch (cmd) {
+-	   case FBIO_ALLOC:
+-		if (!capable(CAP_SYS_RAWIO))
+-			return -EPERM;
+-		sis_malloc((struct sis_memreq *) arg);
+-		break;
+-	   case FBIO_FREE:
+-		if (!capable(CAP_SYS_RAWIO))
+-			return -EPERM;
+-		sis_free(*(unsigned long *) arg);
+-		break;
+-	   case FBIOGET_GLYPH:
+-                sis_get_glyph(info,(SIS_GLYINFO *) arg);
+-		break;	
+-	   case FBIOGET_HWCINFO:
+-		{
+-			unsigned long *hwc_offset = (unsigned long *) arg;
+-
+-			if (sisfb_caps & HW_CURSOR_CAP)
+-				*hwc_offset = sisfb_hwcursor_vbase -
+-				    (unsigned long) ivideo.video_vbase;
+-			else
+-				*hwc_offset = 0;
+-
+-			break;
+-		}
+-	   case FBIOPUT_MODEINFO:
+-		{
+-			struct mode_info *x = (struct mode_info *)arg;
+-
+-			ivideo.video_bpp        = x->bpp;
+-			ivideo.video_width      = x->xres;
+-			ivideo.video_height     = x->yres;
+-			ivideo.video_vwidth     = x->v_xres;
+-			ivideo.video_vheight    = x->v_yres;
+-			ivideo.org_x            = x->org_x;
+-			ivideo.org_y            = x->org_y;
+-			ivideo.refresh_rate     = x->vrate;
+-			ivideo.video_linelength = ivideo.video_vwidth * (ivideo.video_bpp >> 3);
+-			switch(ivideo.video_bpp) {
+-        		case 8:
+-            			ivideo.DstColor = 0x0000;
+-	    			ivideo.SiS310_AccelDepth = 0x00000000;
+-				ivideo.video_cmap_len = 256;
+-            			break;
+-        		case 16:
+-            			ivideo.DstColor = 0x8000;
+-            			ivideo.SiS310_AccelDepth = 0x00010000;
+-				ivideo.video_cmap_len = 16;
+-            			break;
+-        		case 32:
+-            			ivideo.DstColor = 0xC000;
+-	    			ivideo.SiS310_AccelDepth = 0x00020000;
+-				ivideo.video_cmap_len = 16;
+-            			break;
+-			default:
+-				ivideo.video_cmap_len = 16;
+-		       	 	printk(KERN_ERR "sisfb: Unsupported depth %d", ivideo.video_bpp);
+-				ivideo.accel = 0;
+-				break;
+-    			}
+-
+-			break;
+-		}
+-	   case FBIOGET_DISPINFO:
+-		sis_dispinfo((struct ap_data *)arg);
+-		break;
+-	   case SISFB_GET_INFO:  /* TW: New for communication with X driver */
+-	        {
+-			sisfb_info *x = (sisfb_info *)arg;
+-
+-			x->sisfb_id = SISFB_ID;
+-			x->sisfb_version = VER_MAJOR;
+-			x->sisfb_revision = VER_MINOR;
+-			x->sisfb_patchlevel = VER_LEVEL;
+-			x->chip_id = ivideo.chip_id;
+-			x->memory = ivideo.video_size / 1024;
+-			x->heapstart = ivideo.heapstart / 1024;
+-			x->fbvidmode = sisfb_mode_no;
+-			x->sisfb_caps = sisfb_caps;
+-			x->sisfb_tqlen = 512; /* yet unused */
+-			x->sisfb_pcibus = ivideo.pcibus;
+-			x->sisfb_pcislot = ivideo.pcislot;
+-			x->sisfb_pcifunc = ivideo.pcifunc;
+-			x->sisfb_lcdpdc = sisfb_detectedpdc;
+-			x->sisfb_lcda = sisfb_detectedlcda;
+-	                break;
+-		}
+-	   case SISFB_GET_VBRSTATUS:
+-	        {
+-			unsigned long *vbrstatus = (unsigned long *) arg;
+-			if(sisfb_CheckVBRetrace()) *vbrstatus = 1;
+-			else		           *vbrstatus = 0;
+-		}
+-	   default:
+-		return -EINVAL;
+-	}
+-	TWDEBUG("end of ioctl");
+-	return 0;
+-
++	sisfb_myblank(blank);
+ }
+ #endif
+ 
+@@ -1575,11 +1934,9 @@ static int sisfb_get_cmap_len(const stru
+ 		rc = 256;	
+ 		break;
+ 	case 16:
+-		rc = 16;	
+-		break;		
+ 	case 32:
+ 		rc = 16;
+-		break;	
++		break;
+ 	}
+ 	return rc;
+ }
+@@ -1596,7 +1953,7 @@ static int sisfb_setcolreg(unsigned regn
+ 		outSISREG(SISDACD, (red >> 10));
+ 		outSISREG(SISDACD, (green >> 10));
+ 		outSISREG(SISDACD, (blue >> 10));
+-		if (ivideo.disp_state & DISPTYPE_DISP2) {
++		if (ivideo.currentvbflags & VB_DISPTYPE_DISP2) {
+ 		        outSISREG(SISDAC2A, regno);
+ 			outSISREG(SISDAC2D, (red >> 8));
+ 			outSISREG(SISDAC2D, (green >> 8));
+@@ -1622,63 +1979,52 @@ static int sisfb_set_par(struct fb_info 
+ {
+ 	int err;
+ 
+-	TWDEBUG("inside set_par");
+         if((err = sisfb_do_set_var(&info->var, 1, info)))
+ 		return err;
+ 
+ 	sisfb_get_fix(&info->fix, info->currcon, info);
+ 
+-	TWDEBUG("end of set_par");
+ 	return 0;
+ }
+ 
+ static int sisfb_check_var(struct fb_var_screeninfo *var,
+                            struct fb_info *info)
+ {
+-	unsigned int htotal =
+-		var->left_margin + var->xres + var->right_margin +
+-		var->hsync_len;
+-	unsigned int vtotal = 0;
++	unsigned int htotal = 0, vtotal = 0, myrateindex = 0;
+ 	double drate = 0, hrate = 0;
+ 	int found_mode = 0;
+ 	int refresh_rate, search_idx;
++	BOOLEAN recalc_clock = FALSE;
++	u32 pixclock;
++
++	htotal = var->left_margin + var->xres + var->right_margin + var->hsync_len;
++
++	vtotal = var->upper_margin + var->lower_margin + var->vsync_len;
+ 
+-	TWDEBUG("Inside check_var");
++	pixclock = var->pixclock;
+ 
+ 	if((var->vmode & FB_VMODE_MASK) == FB_VMODE_NONINTERLACED) {
+-		vtotal = var->upper_margin + var->yres + var->lower_margin +
+-		         var->vsync_len;   
++		vtotal += var->yres;
+ 		vtotal <<= 1;
+ 	} else if((var->vmode & FB_VMODE_MASK) == FB_VMODE_DOUBLE) {
+-		vtotal = var->upper_margin + var->yres + var->lower_margin +
+-		         var->vsync_len;   
++		vtotal += var->yres;
+ 		vtotal <<= 2;
+ 	} else if((var->vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED) {
+-		vtotal = var->upper_margin + (var->yres/2) + var->lower_margin +
+-		         var->vsync_len;   
+-	} else 	vtotal = var->upper_margin + var->yres + var->lower_margin +
+-		         var->vsync_len;
++		vtotal += var->yres;
++		vtotal <<= 1;
++	} else 	vtotal += var->yres;
+ 
+ 	if(!(htotal) || !(vtotal)) {
+ 		SISFAIL("sisfb: no valid timing data");
+ 	}
+ 
+-	if((var->pixclock) && (htotal)) {
+-	   drate = 1E12 / var->pixclock;
+-	   hrate = drate / htotal;
+-	   refresh_rate = (unsigned int) (hrate / vtotal * 2 + 0.5);
+-	} else refresh_rate = 60;
+-
+-	/* TW: Calculation wrong for 1024x600 - force it to 60Hz */
+-	if((var->xres == 1024) && (var->yres == 600)) refresh_rate = 60;
+-
+ 	search_idx = 0;
+ 	while( (sisbios_mode[search_idx].mode_no != 0) &&
+ 	       (sisbios_mode[search_idx].xres <= var->xres) ) {
+ 		if( (sisbios_mode[search_idx].xres == var->xres) &&
+ 		    (sisbios_mode[search_idx].yres == var->yres) &&
+ 		    (sisbios_mode[search_idx].bpp == var->bits_per_pixel)) {
+-		        if(sisfb_validate_mode(search_idx) > 0) {
++		        if(sisfb_validate_mode(search_idx, ivideo.currentvbflags) > 0) {
+ 			   found_mode = 1;
+ 			   break;
+ 			}
+@@ -1687,38 +2033,95 @@ static int sisfb_check_var(struct fb_var
+ 	}
+ 
+ 	if(!found_mode) {
+-	
+-		printk(KERN_ERR "sisfb: %dx%dx%d is no valid mode\n", 
+-			var->xres, var->yres, var->bits_per_pixel);
+-			
++
+                 search_idx = 0;
+ 		while(sisbios_mode[search_idx].mode_no != 0) {
+-		       
+ 		   if( (var->xres <= sisbios_mode[search_idx].xres) &&
+-		       (var->yres <= sisbios_mode[search_idx].yres) && 
++		       (var->yres <= sisbios_mode[search_idx].yres) &&
+ 		       (var->bits_per_pixel == sisbios_mode[search_idx].bpp) ) {
+-		          if(sisfb_validate_mode(search_idx) > 0) {
++		          if(sisfb_validate_mode(search_idx, ivideo.currentvbflags) > 0) {
+ 			     found_mode = 1;
+ 			     break;
+ 			  }
+ 		   }
+ 		   search_idx++;
+-	        }			
++	        }
+ 		if(found_mode) {
++			printk(KERN_DEBUG "sisfb: Adapted from %dx%dx%d to %dx%dx%d\n",
++		   		var->xres, var->yres, var->bits_per_pixel,
++				sisbios_mode[search_idx].xres,
++				sisbios_mode[search_idx].yres,
++				var->bits_per_pixel);
+ 			var->xres = sisbios_mode[search_idx].xres;
+ 		      	var->yres = sisbios_mode[search_idx].yres;
+-		      	printk(KERN_DEBUG "sisfb: Adapted to mode %dx%dx%d\n",
+-		   		var->xres, var->yres, var->bits_per_pixel);
+-		   
++
++
+ 		} else {
+-		   	printk(KERN_ERR "sisfb: Failed to find similar mode to %dx%dx%d\n", 
++		   	printk(KERN_ERR "sisfb: Failed to find supported mode near %dx%dx%d\n",
+ 				var->xres, var->yres, var->bits_per_pixel);
+ 		   	return -EINVAL;
+ 		}
+ 	}
+ 
+-	/* TW: TODO: Check the refresh rate */		
+-	
++	if( ((ivideo.vbflags & VB_LVDS) ||			/* Slave modes on LVDS and 301B-DH */
++	     ((ivideo.vbflags & VB_30xBDH) && (ivideo.currentvbflags & CRT2_LCD))) &&
++	    (var->bits_per_pixel == 8) ) {
++	    	refresh_rate = 60;
++		recalc_clock = TRUE;
++	} else if( (ivideo.current_htotal == htotal) &&		/* x=x & y=y & c=c -> assume depth change */
++	    	   (ivideo.current_vtotal == vtotal) &&
++	    	   (ivideo.current_pixclock == pixclock) ) {
++		drate = 1E12 / pixclock;
++	   	hrate = drate / htotal;
++	   	refresh_rate = (unsigned int) (hrate / vtotal * 2 + 0.5);
++	} else if( ( (ivideo.current_htotal != htotal) ||	/* x!=x | y!=y & c=c -> invalid pixclock */
++	    	     (ivideo.current_vtotal != vtotal) ) &&
++	    	   (ivideo.current_pixclock == var->pixclock) ) {
++		if(sisfb_lastrates[sisbios_mode[search_idx].mode_no]) {
++			refresh_rate = sisfb_lastrates[sisbios_mode[search_idx].mode_no];
++		} else if(sisfb_parm_rate != -1) {
++			refresh_rate = sisfb_parm_rate;
++		} else {
++			refresh_rate = 60;
++		}
++		recalc_clock = TRUE;
++	} else if((pixclock) && (htotal) && (vtotal)) {
++	   	drate = 1E12 / pixclock;
++	   	hrate = drate / htotal;
++	   	refresh_rate = (unsigned int) (hrate / vtotal * 2 + 0.5);
++	} else if(ivideo.current_refresh_rate) {
++		refresh_rate = ivideo.current_refresh_rate;
++		recalc_clock = TRUE;
++	} else {
++		refresh_rate = 60;
++		recalc_clock = TRUE;
++	}
++
++	myrateindex = sisfb_search_refresh_rate(refresh_rate, search_idx);
++
++	/* Eventually recalculate timing and clock */
++	if(recalc_clock) {
++	   if(!myrateindex) myrateindex = sisbios_mode[search_idx].rate_idx;
++	   var->pixclock = (u32) (1E12 / sisfb_mode_rate_to_dclock(&SiS_Pr, &sishw_ext,
++						sisbios_mode[search_idx].mode_no, myrateindex));
++	   sisfb_mode_rate_to_ddata(&SiS_Pr, &sishw_ext,
++		 			sisbios_mode[search_idx].mode_no, myrateindex,
++		 			&var->left_margin, &var->right_margin,
++		 			&var->upper_margin, &var->lower_margin,
++		 			&var->hsync_len, &var->vsync_len,
++		 			&var->sync, &var->vmode);
++	   if((var->vmode & FB_VMODE_MASK) == FB_VMODE_DOUBLE) {
++		var->pixclock <<= 1;
++	   }
++	}
++
++	if(sisfb_thismonitor.datavalid) {
++	   if(!sisfb_verify_rate(&sisfb_thismonitor, search_idx,
++	                         myrateindex, refresh_rate)) {
++	      printk(KERN_INFO "sisfb: WARNING: Refresh rate exceeds monitor specs!\n");
++	   }
++	}
++
+ 	/* Adapt RGB settings */
+ 	sisfb_bpp_to_var(var);	
+ 	
+@@ -1732,17 +2135,19 @@ static int sisfb_check_var(struct fb_var
+ 	if(var->xres != var->xres_virtual)
+ 		var->xres_virtual = var->xres;
+ 
+-	if(!sisfb_ypan) {
+-		if(var->yres != var->yres_virtual)
+-			var->yres_virtual = var->yres;
+-	} else {
++	if(sisfb_ypan) {
+ 	   /* TW: Now patch yres_virtual if we use panning */
+ 	   /* *** May I do this? *** */
+ 	   var->yres_virtual = ivideo.heapstart / (var->xres * (var->bits_per_pixel >> 3));
+-	    if(var->yres_virtual <= var->yres) {
++	   if(var->yres_virtual <= var->yres) {
+ 	    	/* TW: Paranoia check */
+ 	        var->yres_virtual = var->yres;
+-	    }
++	   }
++	} else {
++	   if(var->yres != var->yres_virtual)
++		var->yres_virtual = var->yres;
++	   var->xoffset = 0;
++	   var->yoffset = 0;
+ 	}
+ 	
+ 	/* Truncate offsets to maximum if too high */
+@@ -1757,28 +2162,25 @@ static int sisfb_check_var(struct fb_var
+ 	    var->green.msb_right =
+ 	    var->blue.msb_right =
+ 	    var->transp.offset = var->transp.length = var->transp.msb_right = 0;		
+-		
+-	TWDEBUG("end of check_var");
++
+ 	return 0;
+ }
+ 
+-#ifdef SISFB_PAN
+ static int sisfb_pan_display(struct fb_var_screeninfo *var,
+ 			     struct fb_info* info)
+ {
+ 	int err;
+-	
+-	TWDEBUG("inside pan_display");
+-	
++
+ 	if (var->xoffset > (var->xres_virtual - var->xres))
+ 		return -EINVAL;
+ 	if (var->yoffset > (var->yres_virtual - var->yres))
+ 		return -EINVAL;
+ 
+ 	if (var->vmode & FB_VMODE_YWRAP) {
+-		if (var->yoffset < 0
+-		    || var->yoffset >= info->var.yres_virtual
+-		    || var->xoffset) return -EINVAL;
++		if (var->yoffset < 0 ||
++		    var->yoffset >= info->var.yres_virtual ||
++		    var->xoffset)
++		    	return -EINVAL;
+ 	} else {
+ 		if (var->xoffset + info->var.xres > info->var.xres_virtual ||
+ 		    var->yoffset + info->var.yres > info->var.yres_virtual)
+@@ -1794,10 +2196,8 @@ static int sisfb_pan_display(struct fb_v
+ 	else
+ 		info->var.vmode &= ~FB_VMODE_YWRAP;
+ 
+-	TWDEBUG("end of pan_display");
+ 	return 0;
+ }
+-#endif
+ 
+ static int sisfb_mmap(struct fb_info *info, struct file *file,
+ 		      struct vm_area_struct *vma)
+@@ -1806,7 +2206,6 @@ static int sisfb_mmap(struct fb_info *in
+ 	unsigned long off;
+ 	u32 len, mmio_off;
+ 
+-	TWDEBUG("inside mmap");
+ 	if(vma->vm_pgoff > (~0UL >> PAGE_SHIFT))  return -EINVAL;
+ 
+ 	off = vma->vm_pgoff << PAGE_SHIFT;
+@@ -1844,139 +2243,143 @@ static int sisfb_mmap(struct fb_info *in
+ 				vma->vm_page_prot))
+ 		return -EAGAIN;
+ 
+-        TWDEBUG("end of mmap");
+ 	return 0;
+ }
+ 
+ static int sisfb_blank(int blank, struct fb_info *info)
+ {
+-	u8 reg;
++	return(sisfb_myblank(blank));
++}
+ 
+-	inSISIDXREG(SISCR, 0x17, reg);
++#endif
+ 
+-	if(blank > 0)
+-		reg &= 0x7f;
+-	else
+-		reg |= 0x80;
++/* ----------- FBDev related routines for all series ---------- */
+ 
+-        outSISIDXREG(SISCR, 0x17, reg);		
+-	outSISIDXREG(SISSR, 0x00, 0x01);    /* Synchronous Reset */
+-	outSISIDXREG(SISSR, 0x00, 0x03);    /* End Reset */
+-        return(0);
+-}
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
++static int sisfb_ioctl(struct inode *inode, struct file *file,
++		       unsigned int cmd, unsigned long arg,
++		       struct fb_info *info)
++#else
+ static int sisfb_ioctl(struct inode *inode, struct file *file,
+-		       unsigned int cmd, unsigned long arg, 
++		       unsigned int cmd, unsigned long arg, int con,
+ 		       struct fb_info *info)
++#endif
+ {
+-	TWDEBUG("inside ioctl");
++	struct sis_memreq sismemreq;
++	struct ap_data sisapdata;
++	unsigned long sismembase = 0;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
++	SIS_GLYINFO sisglyinfo;
++#endif
++
+ 	switch (cmd) {
+ 	   case FBIO_ALLOC:
+-		if (!capable(CAP_SYS_RAWIO))
++		if(!capable(CAP_SYS_RAWIO))
+ 			return -EPERM;
+-		sis_malloc((struct sis_memreq *) arg);
++		if(copy_from_user(&sismemreq, (void *)arg, sizeof(sismemreq)))
++		   	return -EFAULT;
++        	sis_malloc(&sismemreq);
++		if(copy_to_user((void *)arg, &sismemreq, sizeof(sismemreq))) {
++			sis_free(sismemreq.offset);
++		    	return -EFAULT;
++		}
+ 		break;
+ 	   case FBIO_FREE:
+-		if (!capable(CAP_SYS_RAWIO))
++		if(!capable(CAP_SYS_RAWIO))
+ 			return -EPERM;
+-		sis_free(*(unsigned long *) arg);
++		if(get_user(sismembase, (unsigned long *) arg))
++			return -EFAULT;
++		sis_free(sismembase);
+ 		break;
+-	   case FBIOGET_HWCINFO:
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
++	   case FBIOGET_GLYPH:
++	        if(copy_from_user(&sisglyinfo, (void *)arg, sizeof(sisglyinfo)))
++			return -EFAULT;
++                sis_get_glyph(info, &sisglyinfo);
++		break;
++	   case FBIOPUT_MODEINFO:
+ 		{
+-			unsigned long *hwc_offset = (unsigned long *) arg;
++			struct mode_info x;
+ 
+-			if (sisfb_caps & HW_CURSOR_CAP)
+-				*hwc_offset = sisfb_hwcursor_vbase -
+-				    (unsigned long) ivideo.video_vbase;
+-			else
+-				*hwc_offset = 0;
++			if(copy_from_user(&x, (void *)arg, sizeof(x)))
++				return -EFAULT;
+ 
++			ivideo.video_bpp        = x.bpp;
++			ivideo.video_width      = x.xres;
++			ivideo.video_height     = x.yres;
++			ivideo.video_vwidth     = x.v_xres;
++			ivideo.video_vheight    = x.v_yres;
++			ivideo.org_x            = x.org_x;
++			ivideo.org_y            = x.org_y;
++			ivideo.refresh_rate     = x.vrate;
++			ivideo.video_linelength = ivideo.video_vwidth * (ivideo.video_bpp >> 3);
++			sisfb_set_vparms();
+ 			break;
+ 		}
+-	   case FBIOPUT_MODEINFO:
++#endif
++	   case FBIOGET_HWCINFO:
+ 		{
+-			struct mode_info *x = (struct mode_info *)arg;
++			unsigned long myhwcoffset = 0;
+ 
+-			ivideo.video_bpp        = x->bpp;
+-			ivideo.video_width      = x->xres;
+-			ivideo.video_height     = x->yres;
+-			ivideo.video_vwidth     = x->v_xres;
+-			ivideo.video_vheight    = x->v_yres;
+-			ivideo.org_x            = x->org_x;
+-			ivideo.org_y            = x->org_y;
+-			ivideo.refresh_rate     = x->vrate;
+-			ivideo.video_linelength = ivideo.video_vwidth * (ivideo.video_bpp >> 3);
+-			switch(ivideo.video_bpp) {
+-        		case 8:
+-            			ivideo.DstColor = 0x0000;
+-	    			ivideo.SiS310_AccelDepth = 0x00000000;
+-				ivideo.video_cmap_len = 256;
+-            			break;
+-        		case 16:
+-            			ivideo.DstColor = 0x8000;
+-            			ivideo.SiS310_AccelDepth = 0x00010000;
+-				ivideo.video_cmap_len = 16;
+-            			break;
+-        		case 32:
+-            			ivideo.DstColor = 0xC000;
+-	    			ivideo.SiS310_AccelDepth = 0x00020000;
+-				ivideo.video_cmap_len = 16;
+-            			break;
+-			default:
+-				ivideo.video_cmap_len = 16;
+-		       	 	printk(KERN_ERR "sisfb: Unsupported accel depth %d", ivideo.video_bpp);
+-				ivideo.accel = 0;
+-				break;
+-    			}
++			if(sisfb_caps & HW_CURSOR_CAP)
++				myhwcoffset = sisfb_hwcursor_vbase -
++				    (unsigned long) ivideo.video_vbase;
++
++			return put_user(myhwcoffset, (unsigned long *)arg);
+ 
+ 			break;
+ 		}
+ 	   case FBIOGET_DISPINFO:
+-		sis_dispinfo((struct ap_data *)arg);
++	   	sis_dispinfo(&sisapdata);
++		if(copy_to_user((void *)arg, &sisapdata, sizeof(sisapdata)))
++			return -EFAULT;
+ 		break;
+-	   case SISFB_GET_INFO:  /* TW: New for communication with X driver */
++	   case SISFB_GET_INFO:  /* For communication with X driver */
+ 	        {
+-			sisfb_info *x = (sisfb_info *)arg;
++			sisfb_info x;
+ 
+-			x->sisfb_id = SISFB_ID;
+-			x->sisfb_version = VER_MAJOR;
+-			x->sisfb_revision = VER_MINOR;
+-			x->sisfb_patchlevel = VER_LEVEL;
+-			x->chip_id = ivideo.chip_id;
+-			x->memory = ivideo.video_size / 1024;
+-			x->heapstart = ivideo.heapstart / 1024;
+-			x->fbvidmode = sisfb_mode_no;
+-			x->sisfb_caps = sisfb_caps;
+-			x->sisfb_tqlen = 512; /* yet unused */
+-			x->sisfb_pcibus = ivideo.pcibus;
+-			x->sisfb_pcislot = ivideo.pcislot;
+-			x->sisfb_pcifunc = ivideo.pcifunc;
+-			x->sisfb_lcdpdc = sisfb_detectedpdc;
+-			x->sisfb_lcda = sisfb_detectedlcda;
++			x.sisfb_id = SISFB_ID;
++			x.sisfb_version = VER_MAJOR;
++			x.sisfb_revision = VER_MINOR;
++			x.sisfb_patchlevel = VER_LEVEL;
++			x.chip_id = ivideo.chip_id;
++			x.memory = ivideo.video_size / 1024;
++			x.heapstart = ivideo.heapstart / 1024;
++			x.fbvidmode = sisfb_mode_no;
++			x.sisfb_caps = sisfb_caps;
++			x.sisfb_tqlen = 512; /* yet unused */
++			x.sisfb_pcibus = ivideo.pcibus;
++			x.sisfb_pcislot = ivideo.pcislot;
++			x.sisfb_pcifunc = ivideo.pcifunc;
++			x.sisfb_lcdpdc = sisfb_detectedpdc;
++			x.sisfb_lcda = sisfb_detectedlcda;
++			x.sisfb_vbflags = ivideo.vbflags;
++			x.sisfb_currentvbflags = ivideo.currentvbflags;
++			x.sisfb_scalelcd = SiS_Pr.UsePanelScaler;
++			x.sisfb_specialtiming = SiS_Pr.SiS_CustomT;
++			if(copy_to_user((void *)arg, &x, sizeof(x)))
++				return -EFAULT;
+ 	                break;
+ 		}
+ 	   case SISFB_GET_VBRSTATUS:
+ 	        {
+-			unsigned long *vbrstatus = (unsigned long *) arg;
+-			if(sisfb_CheckVBRetrace()) *vbrstatus = 1;
+-			else		           *vbrstatus = 0;
++			if(sisfb_CheckVBRetrace())
++				return put_user(1UL, (unsigned long *) arg);
++			else
++				return put_user(0UL, (unsigned long *) arg);
++			break;
+ 		}
+ 	   default:
+ 		return -EINVAL;
+ 	}
+-	TWDEBUG("end of ioctl");
+ 	return 0;
+-
+ }
+ 
+-#endif
+-
+-/* ----------- FBDev related routines for all series ---------- */
+ 
+ static int sisfb_get_fix(struct fb_fix_screeninfo *fix, int con,
+ 			 struct fb_info *info)
+ {
+-	TWDEBUG("inside get_fix");
+ 	memset(fix, 0, sizeof(struct fb_fix_screeninfo));
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)	
+@@ -1987,45 +2390,47 @@ static int sisfb_get_fix(struct fb_fix_s
+ 
+ 	fix->smem_start = ivideo.video_base;
+ 
+-        /* TW */
+         if((!sisfb_mem) || (sisfb_mem > (ivideo.video_size/1024))) {
+-	    if (ivideo.video_size > 0x1000000) {
+-	        fix->smem_len = 0xc00000;
+-	    } else if (ivideo.video_size > 0x800000)
+-		fix->smem_len = 0x800000;
+-	    else
+-		fix->smem_len = 0x400000;
++	    if(sisvga_engine == SIS_300_VGA) {
++	       if(ivideo.video_size > 0x1000000) {
++	          	fix->smem_len = 0xc00000;
++	       } else if(ivideo.video_size > 0x800000)
++		  	fix->smem_len = 0x800000;
++	       else
++		  	fix->smem_len = 0x400000;
++            } else {
++	       	fix->smem_len = ivideo.video_size - 0x100000;
++	    }
+         } else
+ 		fix->smem_len = sisfb_mem * 1024;
+ 
+-	fix->type        = video_type;
++	fix->type        = FB_TYPE_PACKED_PIXELS;
+ 	fix->type_aux    = 0;
+ 	if(ivideo.video_bpp == 8)
+ 		fix->visual = FB_VISUAL_PSEUDOCOLOR;
+ 	else
+ 		fix->visual = FB_VISUAL_TRUECOLOR;
+ 	fix->xpanstep    = 0;
+-#ifdef SISFB_PAN
++
+         if(sisfb_ypan) 	 fix->ypanstep = 1;
+-#endif
++
+ 	fix->ywrapstep   = 0;
+ 	fix->line_length = ivideo.video_linelength;
+ 	fix->mmio_start  = ivideo.mmio_base;
+ 	fix->mmio_len    = sisfb_mmio_size;
+ 	if(sisvga_engine == SIS_300_VGA) 
+ 	   fix->accel    = FB_ACCEL_SIS_GLAMOUR;
+-	else if(ivideo.chip == SIS_330)
++	else if((ivideo.chip == SIS_330) || (ivideo.chip == SIS_660) || (ivideo.chip == SIS_760))
+ 	   fix->accel    = FB_ACCEL_SIS_XABRE;
+-	else 
++	else
+ 	   fix->accel    = FB_ACCEL_SIS_GLAMOUR_2;
+-	
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)		
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ 	fix->reserved[0] = ivideo.video_size & 0xFFFF;
+ 	fix->reserved[1] = (ivideo.video_size >> 16) & 0xFFFF;
+ 	fix->reserved[2] = sisfb_caps;
+-#endif	
++#endif
+ 
+-	TWDEBUG("end of get_fix");
+ 	return 0;
+ }
+ 
+@@ -2033,17 +2438,15 @@ static int sisfb_get_fix(struct fb_fix_s
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ static struct fb_ops sisfb_ops = {
+-	owner:		THIS_MODULE,
+-	fb_get_fix:	sisfb_get_fix,
+-	fb_get_var:	sisfb_get_var,
+-	fb_set_var:	sisfb_set_var,
+-	fb_get_cmap:	sisfb_get_cmap,
+-	fb_set_cmap:	sisfb_set_cmap,
+-#ifdef SISFB_PAN
+-        fb_pan_display:	sisfb_pan_display,
+-#endif
+-	fb_ioctl:	sisfb_ioctl,
+-	fb_mmap:	sisfb_mmap,
++	.owner		= THIS_MODULE,
++	.fb_get_fix	= sisfb_get_fix,
++	.fb_get_var	= sisfb_get_var,
++	.fb_set_var	= sisfb_set_var,
++	.fb_get_cmap	= sisfb_get_cmap,
++	.fb_set_cmap	= sisfb_set_cmap,
++        .fb_pan_display = sisfb_pan_display,
++	.fb_ioctl	= sisfb_ioctl,
++	.fb_mmap	= sisfb_mmap,
+ };
+ #endif
+ 
+@@ -2056,9 +2459,7 @@ static struct fb_ops sisfb_ops = {
+ 	.fb_check_var = sisfb_check_var,
+ 	.fb_set_par   = sisfb_set_par,
+ 	.fb_setcolreg = sisfb_setcolreg,
+-#ifdef SISFB_PAN
+         .fb_pan_display = sisfb_pan_display,
+-#endif	
+         .fb_blank     = sisfb_blank,
+ 	.fb_fillrect  = fbcon_sis_fillrect,
+ 	.fb_copyarea  = fbcon_sis_copyarea,
+@@ -2105,35 +2506,42 @@ static int sisfb_get_dram_size_300(void)
+ 
+ 	} else {		/* 540, 630, 730 */
+ 
+-		pdev = pci_find_device(PCI_VENDOR_ID_SI, nbridge_id, pdev);
+-		if (pdev) {
+-			pci_read_config_byte(pdev, IND_BRI_DRAM_STATUS, &pci_data);
+-			pci_data = (pci_data & BRI_DRAM_SIZE_MASK) >> 4;
+-			ivideo.video_size = (unsigned int)(1 << (pci_data+21));
+-			pdev_valid = 1;
+-
+-			reg = SIS_DATA_BUS_64 << 6;
+-			switch (pci_data) {
+-			   case BRI_DRAM_SIZE_2MB:
+-				reg |= SIS_DRAM_SIZE_2MB;
+-				break;
+-			   case BRI_DRAM_SIZE_4MB:
+-				reg |= SIS_DRAM_SIZE_4MB;
+-				break;
+-			   case BRI_DRAM_SIZE_8MB:
+-				reg |= SIS_DRAM_SIZE_8MB;
+-				break;
+-			   case BRI_DRAM_SIZE_16MB:
+-				reg |= SIS_DRAM_SIZE_16MB;
+-				break;
+-			   case BRI_DRAM_SIZE_32MB:
+-				reg |= SIS_DRAM_SIZE_32MB;
+-				break;
+-			   case BRI_DRAM_SIZE_64MB:
+-				reg |= SIS_DRAM_SIZE_64MB;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,74)
++		pci_for_each_dev(pdev) {
++#else
++		while((pdev = pci_find_device(PCI_VENDOR_ID_SI, PCI_ANY_ID, pdev))) {
++#endif
++			if ((pdev->vendor == PCI_VENDOR_ID_SI)
++				       && (pdev->device == nbridge_id)) {
++				pci_read_config_byte(pdev, IND_BRI_DRAM_STATUS, &pci_data);
++				pci_data = (pci_data & BRI_DRAM_SIZE_MASK) >> 4;
++				ivideo.video_size = (unsigned int)(1 << (pci_data+21));
++				pdev_valid = 1;
++
++				reg = SIS_DATA_BUS_64 << 6;
++				switch (pci_data) {
++				   case BRI_DRAM_SIZE_2MB:
++					reg |= SIS_DRAM_SIZE_2MB;
++					break;
++				   case BRI_DRAM_SIZE_4MB:
++					reg |= SIS_DRAM_SIZE_4MB;
++					break;
++				   case BRI_DRAM_SIZE_8MB:
++					reg |= SIS_DRAM_SIZE_8MB;
++					break;
++				   case BRI_DRAM_SIZE_16MB:
++					reg |= SIS_DRAM_SIZE_16MB;
++					break;
++				   case BRI_DRAM_SIZE_32MB:
++					reg |= SIS_DRAM_SIZE_32MB;
++					break;
++				   case BRI_DRAM_SIZE_64MB:
++					reg |= SIS_DRAM_SIZE_64MB;
++					break;
++				}
++				outSISIDXREG(SISSR, IND_SIS_DRAM_SIZE, reg);
+ 				break;
+ 			}
+-			outSISIDXREG(SISSR, IND_SIS_DRAM_SIZE, reg);
+ 		}
+ 	
+ 		if (!pdev_valid)  return -1;
+@@ -2141,171 +2549,10 @@ static int sisfb_get_dram_size_300(void)
+ 	return 0;
+ }
+ 
+-static void sisfb_detect_VB_connect_300()
+-{
+-	u8 sr16, sr17, cr32, temp;
+-
+-	ivideo.TV_plug = ivideo.TV_type = 0;
+-
+-        switch(ivideo.hasVB) {
+-	  case HASVB_LVDS_CHRONTEL:
+-	  case HASVB_CHRONTEL:
+-	     SiS_SenseCh();
+-	     break;
+-	  case HASVB_301:
+-	  case HASVB_302:
+-	     SiS_Sense30x();
+-	     break;
+-	}
+-
+-	inSISIDXREG(SISSR, IND_SIS_SCRATCH_REG_17, sr17);
+-        inSISIDXREG(SISCR, IND_SIS_SCRATCH_REG_CR32, cr32);
+-
+-	if ((sr17 & 0x0F) && (ivideo.chip != SIS_300)) {
+-
+-		if ((sr17 & 0x01) && !sisfb_crt1off)
+-			sisfb_crt1off = 0;
+-		else {
+-			if (sr17 & 0x0E)
+-				sisfb_crt1off = 1;
+-			else
+-				sisfb_crt1off = 0;
+-		}
+-
+-		if (sisfb_crt2type != -1)
+-			/* TW: override detected CRT2 type */
+-			ivideo.disp_state = sisfb_crt2type;
+-                else if (sr17 & 0x04)
+-			ivideo.disp_state = DISPTYPE_TV;			
+-		else if (sr17 & 0x02)
+-			ivideo.disp_state = DISPTYPE_LCD;			
+-		else if (sr17 & 0x08 )
+-			ivideo.disp_state = DISPTYPE_CRT2;
+-		else
+-			ivideo.disp_state = 0;
+-
+-		if(sisfb_tvplug != -1)
+-			/* PR/TW: override detected TV type */
+-			ivideo.TV_plug = sisfb_tvplug;
+-		else if (sr17 & 0x20)
+-			ivideo.TV_plug = TVPLUG_SVIDEO;
+-		else if (sr17 & 0x10)
+-			ivideo.TV_plug = TVPLUG_COMPOSITE;
+-
+-		inSISIDXREG(SISSR, IND_SIS_SCRATCH_REG_16, sr16);
+-		if (sr16 & 0x20)
+-			ivideo.TV_type = TVMODE_PAL;
+-		else
+-			ivideo.TV_type = TVMODE_NTSC;
+-
+-	} else {
+-
+-		if ((cr32 & SIS_CRT1) && !sisfb_crt1off)
+-			sisfb_crt1off = 0;
+-		else {
+-			if (cr32 & 0x5F)
+-				sisfb_crt1off = 1;
+-			else
+-				sisfb_crt1off = 0;
+-		}
+-
+-		if (sisfb_crt2type != -1)
+-			/* TW: override detected CRT2 type */
+-			ivideo.disp_state = sisfb_crt2type;
+-		else if (cr32 & SIS_VB_TV)
+-			ivideo.disp_state = DISPTYPE_TV;
+-		else if (cr32 & SIS_VB_LCD)
+-			ivideo.disp_state = DISPTYPE_LCD;
+-		else if (cr32 & SIS_VB_CRT2)
+-			ivideo.disp_state = DISPTYPE_CRT2;
+-		else
+-			ivideo.disp_state = 0;
+-
+-		/* TW: Detect TV plug & type */
+-		if(sisfb_tvplug != -1)
+-			/* PR/TW: override with option */
+-		        ivideo.TV_plug = sisfb_tvplug;
+-		else if (cr32 & SIS_VB_HIVISION) {
+-			ivideo.TV_type = TVMODE_HIVISION;
+-			ivideo.TV_plug = TVPLUG_SVIDEO;
+-		}
+-		else if (cr32 & SIS_VB_SVIDEO)
+-			ivideo.TV_plug = TVPLUG_SVIDEO;
+-		else if (cr32 & SIS_VB_COMPOSITE)
+-			ivideo.TV_plug = TVPLUG_COMPOSITE;
+-		else if (cr32 & SIS_VB_SCART)
+-			ivideo.TV_plug = TVPLUG_SCART;
+-
+-		if (ivideo.TV_type == 0) {
+-		        inSISIDXREG(SISSR, IND_SIS_POWER_ON_TRAP, temp);
+-			if (temp & 0x01)
+-				ivideo.TV_type = TVMODE_PAL;
+-			else
+-				ivideo.TV_type = TVMODE_NTSC;
+-		}
+-
+-	}
+-
+-	/* TW: Copy forceCRT1 option to CRT1off if option is given */
+-    	if (sisfb_forcecrt1 != -1) {
+-    		if(sisfb_forcecrt1) sisfb_crt1off = 0;
+-		else                sisfb_crt1off = 1;
+-    	}
+-}
+-
+-static void sisfb_get_VB_type_300(void)
+-{
+-	u8 reg;
+-
+-	if(ivideo.chip != SIS_300) {
+-		if(!sisfb_has_VB_300()) {
+-		        inSISIDXREG(SISCR, IND_SIS_SCRATCH_REG_CR37, reg);
+-			switch ((reg & SIS_EXTERNAL_CHIP_MASK) >> 1) {
+-			   case SIS_EXTERNAL_CHIP_LVDS:
+-				ivideo.hasVB = HASVB_LVDS;
+-				break;
+-			   case SIS_EXTERNAL_CHIP_TRUMPION:
+-				ivideo.hasVB = HASVB_TRUMPION;
+-				break;
+-			   case SIS_EXTERNAL_CHIP_LVDS_CHRONTEL:
+-				ivideo.hasVB = HASVB_LVDS_CHRONTEL;
+-				break;
+-			   case SIS_EXTERNAL_CHIP_CHRONTEL:
+-				ivideo.hasVB = HASVB_CHRONTEL;
+-				break;
+-			   default:
+-				break;
+-			}
+-		}
+-	} else {
+-		sisfb_has_VB_300();
+-	}
+-}
+-
+-static int sisfb_has_VB_300(void)
+-{
+-	u8 vb_chipid;
+-
+-	inSISIDXREG(SISPART4, 0x00, vb_chipid);
+-	switch (vb_chipid) {
+-	   case 0x01:
+-		ivideo.hasVB = HASVB_301;
+-		break;
+-	   case 0x02:
+-		ivideo.hasVB = HASVB_302;
+-		break;
+-	   default:
+-		ivideo.hasVB = HASVB_NONE;
+-		return FALSE;
+-	}
+-	return TRUE;
+-
+-}
+-
+ #endif  /* CONFIG_FB_SIS_300 */
+ 
+ 
+-#ifdef CONFIG_FB_SIS_315    /* for SiS 315/550/650/740/330 */
++#ifdef CONFIG_FB_SIS_315    /* for SiS 315/550/650/740/330/660/760 */
+ 
+ static int sisfb_get_dram_size_315(void)
+ {
+@@ -2314,21 +2561,33 @@ static int sisfb_get_dram_size_315(void)
+ 	u8  pci_data;
+ 	u8  reg = 0;
+ 
+-	if (ivideo.chip == SIS_550 || ivideo.chip == SIS_650 || ivideo.chip == SIS_740) {
++	if (ivideo.chip == SIS_550 ||
++	    ivideo.chip == SIS_650 ||
++	    ivideo.chip == SIS_740 ||
++	    ivideo.chip == SIS_660 ||
++	    ivideo.chip == SIS_760) {
+ 
+ #ifdef LINUXBIOS
+ 
+-		while ((pdev = pci_find_device(PCI_VENDOR_ID_SI, PCI_ANY_ID, pdev)) != NULL) {
+-			if ((pdev->device == PCI_DEVICE_ID_SI_550) ||
+-			     (pdev->device == PCI_DEVICE_ID_SI_650) ||
+-			     (pdev->device == PCI_DEVICE_ID_SI_740)) {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,74)
++		pci_for_each_dev(pdev) {
++#else
++		while((pdev = pci_find_device(PCI_VENDOR_ID_SI, PCI_ANY_ID, pdev))) {
++#endif
++
++			if ( (pdev->vendor == PCI_VENDOR_ID_SI)
++				&& ( (pdev->device == PCI_DEVICE_ID_SI_550) ||
++				     (pdev->device == PCI_DEVICE_ID_SI_650) ||
++				     (pdev->device == PCI_DEVICE_ID_SI_740) ||
++				     (pdev->device == PCI_DEVICE_ID_SI_660) ||
++				     (pdev->device == PCI_DEVICE_ID_SI_760))) {
+ 				pci_read_config_byte(pdev, IND_BRI_DRAM_STATUS,
+ 				                     &pci_data);
+ 				pci_data = (pci_data & BRI_DRAM_SIZE_MASK) >> 4;
+ 				ivideo.video_size = (unsigned int)(1 << (pci_data + 21));
+ 				pdev_valid = 1;
+ 
+-				/* TW: Initialize SR14 "by hand" */
++				/* Initialize SR14 "by hand" */
+ 				inSISIDXREG(SISSR, IND_SIS_DRAM_SIZE, reg);
+ 				reg &= 0xC0;
+ 				switch (pci_data) {
+@@ -2390,7 +2649,15 @@ static int sisfb_get_dram_size_315(void)
+ 			       "now reading from PCI config\n");
+ 			pdev_valid = 0;
+ 
+-			while ((pdev = pci_find_device(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_550, pdev)) != NULL) {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,74)
++			pci_for_each_dev(pdev) {
++#else
++			while((pdev = pci_find_device(PCI_VENDOR_ID_SI, PCI_ANY_ID, pdev))) {
++#endif
++
++			   if ( (pdev->vendor == PCI_VENDOR_ID_SI)
++			         && (pdev->device == PCI_DEVICE_ID_SI_550) ) {
++
+ 				pci_read_config_byte(pdev, IND_BRI_DRAM_STATUS,
+ 				                     &pci_data);
+ 				pci_data = (pci_data & BRI_DRAM_SIZE_MASK) >> 4;
+@@ -2415,6 +2682,7 @@ static int sisfb_get_dram_size_315(void)
+ 					return -1;
+ 				}
+ 				outSISIDXREG(SISSR, IND_SIS_DRAM_SIZE, reg);
++			   }
+ 			}
+ 			if (!pdev_valid) {
+ 				printk(KERN_INFO "sisfb: Total confusion - No SiS PCI VGA device found?!\n");
+@@ -2425,7 +2693,7 @@ static int sisfb_get_dram_size_315(void)
+ #endif
+ 		return 0;
+ 
+-	} else {	/* 315 */
++	} else {	/* 315, 330 */
+ 
+ 	        inSISIDXREG(SISSR, IND_SIS_DRAM_SIZE, reg);
+ 		switch ((reg & SIS315_DRAM_SIZE_MASK) >> 4) {
+@@ -2458,7 +2726,7 @@ static int sisfb_get_dram_size_315(void)
+ 		reg >>= 2;
+ 		
+ 		if(ivideo.chip == SIS_330) {
+-		
++
+ 		   if(reg) ivideo.video_size <<= 1;
+ 		
+ 		} else {
+@@ -2470,7 +2738,7 @@ static int sisfb_get_dram_size_315(void)
+ 		      case SIS315_DUAL_CHANNEL_1_RANK:
+ 			   ivideo.video_size <<= 1;
+ 			   break;
+-		      case SIS315_ASYM_DDR:		/* TW: DDR asymentric */
++		      case SIS315_ASYM_DDR:		/* TW: DDR asymetric */
+ 			   ivideo.video_size += (ivideo.video_size/2);
+ 			   break;
+ 		   }
+@@ -2483,127 +2751,241 @@ static int sisfb_get_dram_size_315(void)
+ 	
+ }
+ 
+-static void sisfb_detect_VB_connect_315(void)
++#endif   /* CONFIG_FB_SIS_315 */
++
++
++/* -------------- video bridge detection --------------- */
++
++static void sisfb_detect_VB_connect()
+ {
+-	u8 cr32, temp=0;
++	u8 sr16, sr17, cr32, temp;
++
++	if(sisvga_engine == SIS_300_VGA) {
+ 
+-	ivideo.TV_plug = ivideo.TV_type = 0;
++		inSISIDXREG(SISSR, IND_SIS_SCRATCH_REG_17, sr17);
++
++		if ((sr17 & 0x0F) && (ivideo.chip != SIS_300)) {
++
++			/* Old BIOSes store the detected CRT2 type in SR17
++		 	 * instead of CR32. However, since our detection
++			 * routines store their results to CR32, we now copy
++			 * the remaining bits (for LCD and VGA) to CR32 for
++			 * unified usage.
++			 * SR17[0] CRT1    [1] LCD     [2] TV    [3] VGA2
++			 *     [4] AVIDEO  [5] SVIDEO
++			 */
++
++#if 0
++			if (sr17 & 0x01) orSISIDXREG(SISCR, 0x32, SIS_CRT1);
++			else		 andSISIDXREG(SISCR, 0x32, ~SIS_CRT1);
++
++			if (sr17 & 0x02) orSISIDXREG(SISCR, 0x32, SIS_VB_LCD);
++			else		 andSISIDXREG(SISCR, 0x32, ~SIS_VB_LCD);
++
++			/* no HiVision and no DVI connector here */
++			andSISIDXREG(SISCR, 0x32, ~0xc0);
++#endif
++
++			/* PAL/NTSC is stored on SR16 on such machines */
++			if (!(ivideo.vbflags & (TV_PAL | TV_NTSC))) {
++		   		inSISIDXREG(SISSR, IND_SIS_SCRATCH_REG_16, sr16);
++				if (sr16 & 0x20)
++					ivideo.vbflags |= TV_PAL;
++				else
++					ivideo.vbflags |= TV_NTSC;
++			}
++
++		}
+ 
+-        switch(ivideo.hasVB) {
+-	  case HASVB_LVDS_CHRONTEL:
+-	  case HASVB_CHRONTEL:
+-	     SiS_SenseCh();
+-	     break;
+-	  case HASVB_301:
+-	  case HASVB_302:
+-	     SiS_Sense30x();
+-	     break;
+ 	}
+ 
+ 	inSISIDXREG(SISCR, IND_SIS_SCRATCH_REG_CR32, cr32);
+ 
+-	if ((cr32 & SIS_CRT1) && !sisfb_crt1off)
++	if (cr32 & SIS_CRT1)
+ 		sisfb_crt1off = 0;
+ 	else {
+-		if (cr32 & 0x5F)   
++		if (cr32 & 0x5F)
+ 			sisfb_crt1off = 1;
+ 		else
+ 			sisfb_crt1off = 0;
+ 	}
+ 
+-	if (sisfb_crt2type != -1)
+-		/* TW: Override with option */
+-		ivideo.disp_state = sisfb_crt2type;
+-	else if (cr32 & SIS_VB_TV)
+-		ivideo.disp_state = DISPTYPE_TV;		
+-	else if (cr32 & SIS_VB_LCD)
+-		ivideo.disp_state = DISPTYPE_LCD;		
+-	else if (cr32 & SIS_VB_CRT2)
+-		ivideo.disp_state = DISPTYPE_CRT2;
+-	else
+-		ivideo.disp_state = 0;
++	ivideo.vbflags &= ~(CRT2_TV | CRT2_LCD | CRT2_VGA);
+ 
++	if (cr32 & SIS_VB_TV)
++		ivideo.vbflags |= CRT2_TV;
++	if (cr32 & SIS_VB_LCD)
++		ivideo.vbflags |= CRT2_LCD;
++	if (cr32 & SIS_VB_CRT2)
++		ivideo.vbflags |= CRT2_VGA;
++
++	/* TW: Detect/set TV plug & type */
+ 	if(sisfb_tvplug != -1)
+-		/* PR/TW: Override with option */
+-	        ivideo.TV_plug = sisfb_tvplug;
+-	else if (cr32 & SIS_VB_HIVISION) {
+-		ivideo.TV_type = TVMODE_HIVISION;
+-		ivideo.TV_plug = TVPLUG_SVIDEO;
+-	}
++	        ivideo.vbflags |= sisfb_tvplug;
++	if (cr32 & SIS_VB_HIVISION)
++		ivideo.vbflags |= (TV_HIVISION | TV_SVIDEO);
+ 	else if (cr32 & SIS_VB_SVIDEO)
+-		ivideo.TV_plug = TVPLUG_SVIDEO;
++		ivideo.vbflags |= TV_SVIDEO;
+ 	else if (cr32 & SIS_VB_COMPOSITE)
+-		ivideo.TV_plug = TVPLUG_COMPOSITE;
++		ivideo.vbflags |= TV_AVIDEO;
+ 	else if (cr32 & SIS_VB_SCART)
+-		ivideo.TV_plug = TVPLUG_SCART;
++		ivideo.vbflags |= TV_SCART;
+ 
+-	if(ivideo.TV_type == 0) {
+-	    /* TW: PAL/NTSC changed for 650 */
+-	    if((ivideo.chip <= SIS_315PRO) || (ivideo.chip >= SIS_330)) {
+-
+-                inSISIDXREG(SISCR, 0x38, temp);
+-		if(temp & 0x10)
+-			ivideo.TV_type = TVMODE_PAL;
+-		else
+-			ivideo.TV_type = TVMODE_NTSC;
++	if (!(ivideo.vbflags & (TV_PAL | TV_NTSC))) {
++		if(sisvga_engine == SIS_300_VGA) {
++	        	inSISIDXREG(SISSR, IND_SIS_POWER_ON_TRAP, temp);
++			if (temp & 0x01)
++				ivideo.vbflags |= TV_PAL;
++			else
++				ivideo.vbflags |= TV_NTSC;
++		} else if((ivideo.chip <= SIS_315PRO) || (ivideo.chip == SIS_330)) {
+ 
+-	    } else {
++                	inSISIDXREG(SISCR, 0x38, temp);
++			if(temp & 0x10)
++				ivideo.vbflags |= TV_PAL;
++			else
++				ivideo.vbflags |= TV_NTSC;
+ 
+-	        inSISIDXREG(SISCR, 0x79, temp);
+-		if(temp & 0x20)
+-			ivideo.TV_type = TVMODE_PAL;
+-		else
+-			ivideo.TV_type = TVMODE_NTSC;
+-	    }
++	    	} else {
++
++	        	inSISIDXREG(SISCR, 0x79, temp);
++			if(temp & 0x20)
++				ivideo.vbflags |= TV_PAL;
++			else
++				ivideo.vbflags |= TV_NTSC;
++	    	}
+ 	}
+ 
+ 	/* TW: Copy forceCRT1 option to CRT1off if option is given */
+     	if (sisfb_forcecrt1 != -1) {
+-    		if (sisfb_forcecrt1) sisfb_crt1off = 0;
+-		else   	             sisfb_crt1off = 1;
++    		if(sisfb_forcecrt1) sisfb_crt1off = 0;
++		else                sisfb_crt1off = 1;
+     	}
+-}
+-
+-static void sisfb_get_VB_type_315(void)
+-{
+-	u8 reg;
+ 
+-	if (!sisfb_has_VB_315()) {
+-	        inSISIDXREG(SISCR, IND_SIS_SCRATCH_REG_CR37, reg);
+-		switch ((reg & SIS_EXTERNAL_CHIP_MASK) >> 1) {
+-	 	   case SIS310_EXTERNAL_CHIP_LVDS:
+-			ivideo.hasVB = HASVB_LVDS;
+-			break;
+-		   case SIS310_EXTERNAL_CHIP_LVDS_CHRONTEL:
+-			ivideo.hasVB = HASVB_LVDS_CHRONTEL;
+-			break;
+-		   default:
+-			break;
+-		}
+-	}
+ }
+ 
+-
+-static int sisfb_has_VB_315(void)
++static void sisfb_get_VB_type(void)
+ {
+ 	u8 vb_chipid;
++	u8 reg;
++	char stdstr[]    = "sisfb: Detected";
++	char bridgestr[] = "video bridge";
++	char lvdsstr[]   = "LVDS transmitter";
++  	char chrstr[]    = "Chrontel TV encoder";
++
++	ivideo.hasVB = HASVB_NONE;
++	sishw_ext.ujVBChipID = VB_CHIP_UNKNOWN;
++	sishw_ext.Is301BDH = FALSE;
++	sishw_ext.usExternalChip = 0;
+ 
+ 	inSISIDXREG(SISPART4, 0x00, vb_chipid);
+ 	switch (vb_chipid) {
+ 	   case 0x01:
+ 		ivideo.hasVB = HASVB_301;
++		inSISIDXREG(SISPART4, 0x01, reg);
++		if(reg < 0xb0) {
++			ivideo.vbflags |= VB_301;
++			sishw_ext.ujVBChipID = VB_CHIP_301;
++			printk(KERN_INFO "%s SiS301 %s\n", stdstr, bridgestr);
++		} else if(reg < 0xd0) {
++		 	ivideo.vbflags |= VB_301B;
++			sishw_ext.ujVBChipID = VB_CHIP_301B;
++			printk(KERN_INFO "%s SiS301B %s\n", stdstr, bridgestr);
++		} else if(reg < 0xe0) {
++			ivideo.vbflags |= VB_301LV;
++			sishw_ext.ujVBChipID = VB_CHIP_301LV;
++			printk(KERN_INFO "%s SiS301LV %s\n", stdstr, bridgestr);
++		} else if(reg <= 0xe1) {
++			ivideo.vbflags |= VB_302LV;
++			sishw_ext.ujVBChipID = VB_CHIP_302LV;
++			printk(KERN_INFO "%s SiS302LV %s\n", stdstr, bridgestr);
++		}
+ 		break;
+ 	   case 0x02:
+ 		ivideo.hasVB = HASVB_302;
++		inSISIDXREG(SISPART4, 0x01, reg);
++		if(reg < 0xd0) {
++			ivideo.vbflags |= VB_302B;
++			sishw_ext.ujVBChipID = VB_CHIP_302B;
++			printk(KERN_INFO "%s SiS302B %s\n", stdstr, bridgestr);
++		} else if(reg < 0xe0) {
++		 	ivideo.vbflags |= VB_301LV;
++			sishw_ext.ujVBChipID = VB_CHIP_301LV;
++			printk(KERN_INFO "%s SiS301LV %s\n", stdstr, bridgestr);
++		} else if(reg <= 0xe1) {
++			ivideo.vbflags |= VB_302LV;
++			sishw_ext.ujVBChipID = VB_CHIP_302LV;
++			printk(KERN_INFO "%s SiS302LV %s\n", stdstr, bridgestr);
++		}
+ 		break;
+-	   default:
+-		ivideo.hasVB = HASVB_NONE;
+-		return FALSE;
+ 	}
+-	return TRUE;
+-}
+ 
+-#endif   /* CONFIG_FB_SIS_315 */
++	if(ivideo.vbflags & (VB_301B | VB_302B)) {
++		inSISIDXREG(SISPART4,0x23,reg);
++		if(!(reg & 0x02)) {
++			sishw_ext.Is301BDH = TRUE;
++			ivideo.vbflags |= VB_30xBDH;
++			printk(KERN_INFO "This %s does not support LCD output\n", bridgestr);
++		}
++	}
++
++	if((!(ivideo.vbflags & VB_VIDEOBRIDGE)) && (ivideo.chip != SIS_300)) {
++		inSISIDXREG(SISCR, IND_SIS_SCRATCH_REG_CR37, reg);
++		reg &= SIS_EXTERNAL_CHIP_MASK;
++		reg >>= 1;
++		if(sisvga_engine == SIS_300_VGA) {
++			switch (reg) {
++			   case SIS_EXTERNAL_CHIP_LVDS:
++				ivideo.hasVB = HASVB_LVDS;
++				ivideo.vbflags |= VB_LVDS;
++				sishw_ext.usExternalChip = 0x01;
++				printk(KERN_INFO "%s %s\n", stdstr, lvdsstr);
++				break;
++			   case SIS_EXTERNAL_CHIP_TRUMPION:
++				ivideo.hasVB = HASVB_TRUMPION;
++				ivideo.vbflags |= VB_TRUMPION;
++				sishw_ext.usExternalChip = 0x02;
++				printk(KERN_INFO "%s Trumpion LCD scaler\n", stdstr);
++				break;
++			   case SIS_EXTERNAL_CHIP_CHRONTEL:
++				ivideo.hasVB = HASVB_CHRONTEL;
++				ivideo.vbflags |= VB_CHRONTEL;
++				sishw_ext.usExternalChip = 0x04;
++				printk(KERN_INFO "%s %s\n", stdstr, chrstr);
++				break;
++			   case SIS_EXTERNAL_CHIP_LVDS_CHRONTEL:
++				ivideo.hasVB = HASVB_LVDS_CHRONTEL;
++				ivideo.vbflags |= (VB_LVDS | VB_CHRONTEL);
++				sishw_ext.usExternalChip = 0x05;
++				printk(KERN_INFO "%s %s and %s\n", stdstr, lvdsstr, chrstr);
++				break;
++			}
++		} else {
++			switch (reg) {
++	 	   	   case SIS310_EXTERNAL_CHIP_LVDS:
++				ivideo.hasVB = HASVB_LVDS;
++				ivideo.vbflags |= VB_LVDS;
++				sishw_ext.usExternalChip = 0x01;
++				printk(KERN_INFO "%s %s\n", stdstr, lvdsstr);
++				break;
++		   	   case SIS310_EXTERNAL_CHIP_LVDS_CHRONTEL:
++				ivideo.hasVB = HASVB_LVDS_CHRONTEL;
++				ivideo.vbflags |= (VB_LVDS | VB_CHRONTEL);
++				sishw_ext.usExternalChip = 0x05;
++				printk(KERN_INFO "%s %s and %s\n", stdstr, lvdsstr, chrstr);
++				break;
++			}
++		}
++
++	}
++
++	if(ivideo.vbflags & VB_SISBRIDGE) {
++		SiS_Sense30x();
++	} else if(ivideo.vbflags & VB_CHRONTEL) {
++		SiS_SenseCh();
++	}
++
++}
+ 
+ /* ------------------ Sensing routines ------------------ */
+ 
+@@ -2621,34 +3003,39 @@ SISDoSense(int tempbl, int tempbh, int t
+     inSISIDXREG(SISPART4,0x03,temp);
+     temp ^= 0x0e;
+     temp &= tempch;
+-    return(temp);
++    return((temp == tempch));
+ }
+ 
+ void
+ SiS_Sense30x(void)
+ {
+-  u8 backupP4_0d;
++  u8 backupP4_0d,backupP2_00;
+   u8 testsvhs_tempbl, testsvhs_tempbh;
+   u8 testsvhs_tempcl, testsvhs_tempch;
+   u8 testcvbs_tempbl, testcvbs_tempbh;
+   u8 testcvbs_tempcl, testcvbs_tempch;
+   u8 testvga2_tempbl, testvga2_tempbh;
+   u8 testvga2_tempcl, testvga2_tempch;
+-  int myflag, result;
++  int myflag, result, haveresult, i, j;
++  char stdstr[] = "sisfb: Detected";
++  char tvstr[]  = "TV connected to";
+ 
+   inSISIDXREG(SISPART4,0x0d,backupP4_0d);
+   outSISIDXREG(SISPART4,0x0d,(backupP4_0d | 0x04));
+ 
++  inSISIDXREG(SISPART2,0x00,backupP2_00);
++  outSISIDXREG(SISPART2,0x00,(backupP2_00 | 0x1c));
++
+   if(sisvga_engine == SIS_300_VGA) {
+ 
+-  	testvga2_tempbh = 0x00; testvga2_tempbl = 0xd1;
+-        testsvhs_tempbh = 0x00; testsvhs_tempbl = 0xb9;
+-	testcvbs_tempbh = 0x00; testcvbs_tempbl = 0xb3;
+-	if((sishw_ext.ujVBChipID != VB_CHIP_301) &&
+-	   (sishw_ext.ujVBChipID != VB_CHIP_302) ) {
+-	   testvga2_tempbh = 0x01; testvga2_tempbl = 0x90;
+-	   testsvhs_tempbh = 0x01; testsvhs_tempbl = 0x6b;
+-	   testcvbs_tempbh = 0x01; testcvbs_tempbl = 0x74;
++	if(ivideo.vbflags & (VB_301B|VB_302B|VB_301LV|VB_302LV)) {
++	   	testvga2_tempbh = 0x01; testvga2_tempbl = 0x90;
++	   	testsvhs_tempbh = 0x01; testsvhs_tempbl = 0x6b;
++	   	testcvbs_tempbh = 0x01; testcvbs_tempbl = 0x74;
++	} else {
++		testvga2_tempbh = 0x00; testvga2_tempbl = 0xd1;
++        	testsvhs_tempbh = 0x00; testsvhs_tempbl = 0xb9;
++		testcvbs_tempbh = 0x00; testcvbs_tempbl = 0xb3;
+ 	}
+ 	inSISIDXREG(SISPART4,0x01,myflag);
+ 	if(myflag & 0x04) {
+@@ -2657,35 +3044,36 @@ SiS_Sense30x(void)
+ 	   testcvbs_tempbh = 0x00; testcvbs_tempbl = 0xee;
+ 	}
+ 	testvga2_tempch = 0x0e;	testvga2_tempcl = 0x08;
+-	testsvhs_tempch = 0x06;	testsvhs_tempcl = 0x04;
++	testsvhs_tempch = 0x04;	testsvhs_tempcl = 0x04;
+ 	testcvbs_tempch = 0x08; testcvbs_tempcl = 0x04;
++	if(ivideo.vbflags & (VB_301LV|VB_302LV)) {
++	   	testvga2_tempbh = 0x00; testvga2_tempbl = 0x00;
++	   	testvga2_tempch = 0x00; testvga2_tempcl = 0x00;
++	 }
+ 	if(ivideo.chip == SIS_300) {
+ 	   inSISIDXREG(SISSR,0x3b,myflag);
+ 	   if(!(myflag & 0x01)) {
+-	      testvga2_tempbh = 0x00; testvga2_tempbl = 0x00;
+-	      testvga2_tempch = 0x00; testvga2_tempcl = 0x00;
++	      	testvga2_tempbh = 0x00; testvga2_tempbl = 0x00;
++	      	testvga2_tempch = 0x00; testvga2_tempcl = 0x00;
+ 	   }
+ 	}
+ 
+   } else {
+ 
+-	testvga2_tempbh = 0x00; testvga2_tempbl = 0xd1;
+-        testsvhs_tempbh = 0x00; testsvhs_tempbl = 0xb9;
+-	testcvbs_tempbh = 0x00; testcvbs_tempbl = 0xb3;
+-	if((sishw_ext.ujVBChipID != VB_CHIP_301) &&
+-	   (sishw_ext.ujVBChipID != VB_CHIP_302)) {
+-	      testvga2_tempbh = 0x01; testvga2_tempbl = 0x90;
+-	      testsvhs_tempbh = 0x01; testsvhs_tempbl = 0x6b;
+-	      testcvbs_tempbh = 0x01; testcvbs_tempbl = 0x74;
+-	      if(sishw_ext.ujVBChipID == VB_CHIP_301LV ||
+-	         sishw_ext.ujVBChipID == VB_CHIP_302LV) {
+-	         testvga2_tempbh = 0x00; testvga2_tempbl = 0x00;
+-	         testsvhs_tempbh = 0x02; testsvhs_tempbl = 0x00;
+-	         testcvbs_tempbh = 0x01; testcvbs_tempbl = 0x00;
+-	      }
++	if(ivideo.vbflags & (VB_301B|VB_302B)) {
++		testvga2_tempbh = 0x01; testvga2_tempbl = 0x90;
++		testsvhs_tempbh = 0x01; testsvhs_tempbl = 0x6b;
++		testcvbs_tempbh = 0x01; testcvbs_tempbl = 0x74;
++	} else if(ivideo.vbflags & (VB_301LV|VB_302LV)) {
++	      	testvga2_tempbh = 0x00; testvga2_tempbl = 0x00;
++	      	testsvhs_tempbh = 0x02; testsvhs_tempbl = 0x00;
++	      	testcvbs_tempbh = 0x01; testcvbs_tempbl = 0x00;
++	} else {
++		testvga2_tempbh = 0x00; testvga2_tempbl = 0xd1;
++        	testsvhs_tempbh = 0x00; testsvhs_tempbl = 0xb9;
++		testcvbs_tempbh = 0x00; testcvbs_tempbl = 0xb3;
+ 	}
+-	if(sishw_ext.ujVBChipID != VB_CHIP_301LV &&
+-	   sishw_ext.ujVBChipID != VB_CHIP_302LV) {
++	if(ivideo.vbflags & (VB_301|VB_301B|VB_302B)) {
+ 	   inSISIDXREG(SISPART4,0x01,myflag);
+ 	   if(myflag & 0x04) {
+ 	      testvga2_tempbh = 0x00; testvga2_tempbl = 0xfd;
+@@ -2693,49 +3081,78 @@ SiS_Sense30x(void)
+ 	      testcvbs_tempbh = 0x00; testcvbs_tempbl = 0xee;
+ 	   }
+ 	}
+-	if((sishw_ext.ujVBChipID == VB_CHIP_301LV) ||
+-	   (sishw_ext.ujVBChipID == VB_CHIP_302LV) ) {
++	if(ivideo.vbflags & (VB_301LV|VB_302LV)) {
+ 	   testvga2_tempbh = 0x00; testvga2_tempbl = 0x00;
+ 	   testvga2_tempch = 0x00; testvga2_tempcl = 0x00;
+ 	   testsvhs_tempch = 0x04; testsvhs_tempcl = 0x08;
+ 	   testcvbs_tempch = 0x08; testcvbs_tempcl = 0x08;
+ 	} else {
+ 	   testvga2_tempch = 0x0e; testvga2_tempcl = 0x08;
+-	   testsvhs_tempch = 0x06; testsvhs_tempcl = 0x04;
++	   testsvhs_tempch = 0x04; testsvhs_tempcl = 0x04;
+ 	   testcvbs_tempch = 0x08; testcvbs_tempcl = 0x04;
+ 	}
+     } 
+ 
+     if(testvga2_tempch || testvga2_tempcl || testvga2_tempbh || testvga2_tempbl) {
+-        result = SISDoSense(testvga2_tempbl, testvga2_tempbh,
+-                            testvga2_tempcl, testvga2_tempch);
+- 	if(result) {
+-        	printk(KERN_INFO "sisfb: Detected secondary VGA connection\n");
+-		orSISIDXREG(SISCR, 0x32, 0x10);
+-	}
++       haveresult = 0;
++       for(j = 0; j < 10; j++) {
++          result = 0;
++          for(i = 0; i < 3; i++) {
++             if(SISDoSense(testvga2_tempbl, testvga2_tempbh,
++                           testvga2_tempcl, testvga2_tempch))
++	        result++;
++          }
++	  if((result == 0) || (result >= 2)) break;
++       }
++       if(result) {
++          printk(KERN_INFO "%s secondary VGA connection\n", stdstr);
++	  orSISIDXREG(SISCR, 0x32, 0x10);
++       } else {
++	  andSISIDXREG(SISCR, 0x32, ~0x10);
++       }
++    }
++
++    haveresult = 0;
++    for(j = 0; j < 10; j++) {
++       result = 0;
++       for(i = 0; i < 3; i++) {
++          if(SISDoSense(testsvhs_tempbl, testsvhs_tempbh,
++                        testsvhs_tempcl, testsvhs_tempch))
++	        result++;
++       }
++       if((result == 0) || (result >= 2)) break;
+     }
+-    
+-    result = SISDoSense(testsvhs_tempbl, testsvhs_tempbh,
+-                        testsvhs_tempcl, testsvhs_tempch);
+     if(result) {
+-        printk(KERN_INFO "sisfb: Detected TV connected to SVHS output\n");
+-        /* TW: So we can be sure that there IS a SVHS output */
+-	ivideo.TV_plug = TVPLUG_SVIDEO;
++        printk(KERN_INFO "%s %s SVIDEO output\n", stdstr, tvstr);
++	ivideo.vbflags |= TV_SVIDEO;
+ 	orSISIDXREG(SISCR, 0x32, 0x02);
++	andSISIDXREG(SISCR, 0x32, ~0x05);
+     }
+ 
+     if(!result) {
+-        result = SISDoSense(testcvbs_tempbl, testcvbs_tempbh,
+-	                    testcvbs_tempcl, testcvbs_tempch);
++
++	haveresult = 0;
++       	for(j = 0; j < 10; j++) {
++           result = 0;
++           for(i = 0; i < 3; i++) {
++              if(SISDoSense(testcvbs_tempbl, testcvbs_tempbh,
++	                    testcvbs_tempcl, testcvbs_tempch))
++	        result++;
++           }
++           if((result == 0) || (result >= 2)) break;
++        }
+ 	if(result) {
+-	    printk(KERN_INFO "sisfb: Detected TV connected to CVBS output\n");
+-	    /* TW: So we can be sure that there IS a CVBS output */
+-	    ivideo.TV_plug = TVPLUG_COMPOSITE;
++	    printk(KERN_INFO "%s %s COMPOSITE output\n", stdstr, tvstr);
++	    ivideo.vbflags |= TV_AVIDEO;
+ 	    orSISIDXREG(SISCR, 0x32, 0x01);
++	    andSISIDXREG(SISCR, 0x32, ~0x06);
++	} else {
++	    andSISIDXREG(SISCR, 0x32, ~0x07);
+ 	}
+     }
+     SISDoSense(0, 0, 0, 0);
+ 
++    outSISIDXREG(SISPART2,0x00,backupP2_00);
+     outSISIDXREG(SISPART4,0x0d,backupP4_0d);
+ }
+ 
+@@ -2744,51 +3161,84 @@ void
+ SiS_SenseCh(void)
+ {
+ 
+-   u8 temp1;
+-#ifdef CONFIG_FB_SIS_315
+-   u8 temp2;
++   u8 temp1, temp2;
++#ifdef CONFIG_FB_SIS_300
++   unsigned char test[3];
++   int i;
+ #endif
++   char stdstr[] = "sisfb: Chrontel: Detected TV connected to";
+ 
+    if(ivideo.chip < SIS_315H) {
+ 
+ #ifdef CONFIG_FB_SIS_300
+-       SiS_Pr.SiS_IF_DEF_CH70xx = 1;		/* TW: Chrontel 7005 */
++       SiS_Pr.SiS_IF_DEF_CH70xx = 1;		/* Chrontel 700x */
++       SiS_SetChrontelGPIO(&SiS_Pr, 0x9c);	/* Set general purpose IO for Chrontel communication */
++       SiS_DDC2Delay(&SiS_Pr, 1000);
+        temp1 = SiS_GetCH700x(&SiS_Pr, 0x25);
+-       if ((temp1 >= 50) && (temp1 <= 100)) {
+-	   /* TW: Read power status */
++       /* TW: See Chrontel TB31 for explanation */
++       temp2 = SiS_GetCH700x(&SiS_Pr, 0x0e);
++       if(((temp2 & 0x07) == 0x01) || (temp2 & 0x04)) {
++	  SiS_SetCH700x(&SiS_Pr, 0x0b0e);
++	  SiS_DDC2Delay(&SiS_Pr, 300);
++       }
++       temp2 = SiS_GetCH700x(&SiS_Pr, 0x25);
++       if(temp2 != temp1) temp1 = temp2;
++
++       if((temp1 >= 0x22) && (temp1 <= 0x50)) {
++	   /* Read power status */
+ 	   temp1 = SiS_GetCH700x(&SiS_Pr, 0x0e);
+ 	   if((temp1 & 0x03) != 0x03) {
+-     	        /* TW: Power all outputs */
+-		SiS_SetCH70xxANDOR(&SiS_Pr, 0x030E,0xF8);
++     	        /* Power all outputs */
++		SiS_SetCH700x(&SiS_Pr, 0x0B0E);
++		SiS_DDC2Delay(&SiS_Pr, 300);
+ 	   }
+-	   /* TW: Sense connected TV devices */
+-	   SiS_SetCH700x(&SiS_Pr, 0x0110);
+-	   SiS_SetCH700x(&SiS_Pr, 0x0010);
+-	   temp1 = SiS_GetCH700x(&SiS_Pr, 0x10);
+-	   if(!(temp1 & 0x08)) {
+-		printk(KERN_INFO
+-		   "sisfb: Chrontel: Detected TV connected to SVHS output\n");
+-		/* TW: So we can be sure that there IS a SVHS output */
+-		ivideo.TV_plug = TVPLUG_SVIDEO;
++	   /* Sense connected TV devices */
++	   for(i = 0; i < 3; i++) {
++	       SiS_SetCH700x(&SiS_Pr, 0x0110);
++	       SiS_DDC2Delay(&SiS_Pr, 0x96);
++	       SiS_SetCH700x(&SiS_Pr, 0x0010);
++	       SiS_DDC2Delay(&SiS_Pr, 0x96);
++	       temp1 = SiS_GetCH700x(&SiS_Pr, 0x10);
++	       if(!(temp1 & 0x08))       test[i] = 0x02;
++	       else if(!(temp1 & 0x02))  test[i] = 0x01;
++	       else                      test[i] = 0;
++	       SiS_DDC2Delay(&SiS_Pr, 0x96);
++	   }
++
++	   if(test[0] == test[1])      temp1 = test[0];
++	   else if(test[0] == test[2]) temp1 = test[0];
++	   else if(test[1] == test[2]) temp1 = test[1];
++	   else {
++	   	printk(KERN_INFO
++			"sisfb: TV detection unreliable - test results varied\n");
++		temp1 = test[2];
++	   }
++	   if(temp1 == 0x02) {
++		printk(KERN_INFO "%s SVIDEO output\n", stdstr);
++		ivideo.vbflags |= TV_SVIDEO;
+ 		orSISIDXREG(SISCR, 0x32, 0x02);
+-	   } else if (!(temp1 & 0x02)) {
+-		printk(KERN_INFO
+-		   "sisfb: Chrontel: Detected TV connected to CVBS output\n");
+-		/* TW: So we can be sure that there IS a CVBS output */
+-		ivideo.TV_plug = TVPLUG_COMPOSITE;
++		andSISIDXREG(SISCR, 0x32, ~0x05);
++	   } else if (temp1 == 0x01) {
++		printk(KERN_INFO "%s CVBS output\n", stdstr);
++		ivideo.vbflags |= TV_AVIDEO;
+ 		orSISIDXREG(SISCR, 0x32, 0x01);
++		andSISIDXREG(SISCR, 0x32, ~0x06);
+ 	   } else {
+  		SiS_SetCH70xxANDOR(&SiS_Pr, 0x010E,0xF8);
++		andSISIDXREG(SISCR, 0x32, ~0x07);
+ 	   }
+        } else if(temp1 == 0) {
+ 	  SiS_SetCH70xxANDOR(&SiS_Pr, 0x010E,0xF8);
++	  andSISIDXREG(SISCR, 0x32, ~0x07);
+        }
++       /* Set general purpose IO for Chrontel communication */
++       SiS_SetChrontelGPIO(&SiS_Pr, 0x00);
+ #endif
+ 
+    } else {
+ 
+ #ifdef CONFIG_FB_SIS_315
+-	SiS_Pr.SiS_IF_DEF_CH70xx = 2;		/* TW: Chrontel 7019 */
++	SiS_Pr.SiS_IF_DEF_CH70xx = 2;		/* Chrontel 7019 */
+         temp1 = SiS_GetCH701x(&SiS_Pr, 0x49);
+ 	SiS_SetCH701x(&SiS_Pr, 0x2049);
+ 	SiS_DDC2Delay(&SiS_Pr, 0x96);
+@@ -2808,22 +3258,24 @@ SiS_SenseCh(void)
+ 	if( (temp1 & 0x01) && (temp1 & 0x02) ) temp1 = 0x04;
+ 	switch(temp1) {
+ 	case 0x01:
+-	     printk(KERN_INFO
+-		"sisfb: Chrontel: Detected TV connected to CVBS output\n");
+-	     ivideo.TV_plug = TVPLUG_COMPOSITE;
++	     printk(KERN_INFO "%s CVBS output\n", stdstr);
++	     ivideo.vbflags |= TV_AVIDEO;
+ 	     orSISIDXREG(SISCR, 0x32, 0x01);
++	     andSISIDXREG(SISCR, 0x32, ~0x06);
+              break;
+ 	case 0x02:
+-	     printk(KERN_INFO
+-		"sisfb: Chrontel: Detected TV connected to SVHS output\n");
+-	     ivideo.TV_plug = TVPLUG_SVIDEO;
++	     printk(KERN_INFO "%s SVIDEO output\n", stdstr);
++	     ivideo.vbflags |= TV_SVIDEO;
+ 	     orSISIDXREG(SISCR, 0x32, 0x02);
++	     andSISIDXREG(SISCR, 0x32, ~0x05);
+              break;
+ 	case 0x04:
+-	     /* TW: This should not happen */
+-	     printk(KERN_INFO
+-		"sisfb: Chrontel: Detected TV connected to SCART output\n");
++	     printk(KERN_INFO "%s SCART output\n", stdstr);
++	     orSISIDXREG(SISCR, 0x32, 0x04);
++	     andSISIDXREG(SISCR, 0x32, ~0x03);
+              break;
++	default:
++	     andSISIDXREG(SISCR, 0x32, ~0x07);
+ 	}
+ #endif
+ 
+@@ -2845,8 +3297,8 @@ static int sisfb_heap_init(void)
+ 	unsigned long *write_port = 0;
+ 	SIS_CMDTYPE    cmd_type;
+ #ifndef AGPOFF
+-	struct agp_kern_info  *agp_info;
+-	struct agp_memory     *agp;
++	agp_kern_info  *agp_info;
++	agp_memory     *agp;
+ 	u32            agp_phys;
+ #endif
+ #endif
+@@ -2860,14 +3312,21 @@ static int sisfb_heap_init(void)
+  *     in XF86Config-4.
+  *     The heap start can also be specified by parameter "mem" when starting the sisfb
+  *     driver. sisfb mem=1024 lets heap starts at 1MB, etc.
++ *
++ *     On the 315 and Xabre series, the default is a 1MB heap since DRI is not
++ *     supported there.
+  */
+      if ((!sisfb_mem) || (sisfb_mem > (ivideo.video_size/1024))) {
+-        if (ivideo.video_size > 0x1000000) {
++        if(sisvga_engine == SIS_300_VGA) {
++           if (ivideo.video_size > 0x1000000) {
+ 	        ivideo.heapstart = 0xc00000;
+-	} else if (ivideo.video_size > 0x800000) {
++	   } else if (ivideo.video_size > 0x800000) {
+ 	        ivideo.heapstart = 0x800000;
+-	} else {
++	   } else {
+ 		ivideo.heapstart = 0x400000;
++	   }
++	} else {
++	   ivideo.heapstart = ivideo.video_size - 0x100000;
+ 	}
+      } else {
+            ivideo.heapstart = sisfb_mem * 1024;
+@@ -2883,7 +3342,7 @@ static int sisfb_heap_init(void)
+ #ifdef CONFIG_FB_SIS_315
+      if (sisvga_engine == SIS_315_VGA) {
+         /* TW: Now initialize the 310 series' command queue mode.
+-	 * On 310/325, there are three queue modes available which
++	 * On 315, there are three queue modes available which
+ 	 * are chosen by setting bits 7:5 in SR26:
+ 	 * 1. MMIO queue mode (bit 5, 0x20). The hardware will keep
+ 	 *    track of the queue, the FIFO, command parsing and so
+@@ -2923,8 +3382,8 @@ static int sisfb_heap_init(void)
+ 
+ #ifndef AGPOFF
+ 	if (sisfb_queuemode == AGP_CMD_QUEUE) {
+-		agp_info = vmalloc(sizeof(*agp_info));
+-		memset((void*)agp_info, 0x00, sizeof(*agp_info));
++		agp_info = vmalloc(sizeof(agp_kern_info));
++		memset((void*)agp_info, 0x00, sizeof(agp_kern_info));
+ 		agp_copy_info(agp_info);
+ 
+ 		agp_backend_acquire();
+@@ -3025,10 +3484,6 @@ static int sisfb_heap_init(void)
+ 		break;
+ 
+ 	   default:  /* MMIO */
+-	   	/* TW: This previously only wrote SIS_MMIO_CMD_ENABLE
+-		 * to IND_SIS_CMDQUEUE_SET. I doubt that this is
+-		 * enough. Reserve memory in any way.
+-		 */
+ 	   	sisfb_heap_end -= COMMAND_QUEUE_AREA_SIZE;
+ 		sisfb_heap_size -= COMMAND_QUEUE_AREA_SIZE;
+ 
+@@ -3037,7 +3492,7 @@ static int sisfb_heap_init(void)
+ 
+ 		*write_port = *read_port;
+ 
+-		/* TW: Set Auto_Correction bit */
++		/* Set Auto_Correction bit */
+ 		temp |= (SIS_MMIO_CMD_ENABLE | SIS_CMD_AUTO_CORR);
+ 		outSISIDXREG(SISSR, IND_SIS_CMDQUEUE_SET, temp);
+ 
+@@ -3333,7 +3788,6 @@ void sis_malloc(struct sis_memreq *req)
+ 		req->offset = poh->offset;
+ 		req->size = poh->size;
+ 	}
+-
+ }
+ 
+ void sis_free(unsigned long base)
+@@ -3352,35 +3806,70 @@ void sis_free(unsigned long base)
+ 
+ static void sisfb_pre_setmode(void)
+ {
+-	u8 cr30 = 0, cr31 = 0;
++	u8 cr30 = 0, cr31 = 0, cr33 = 0;
++
++	ivideo.currentvbflags &= (VB_VIDEOBRIDGE | VB_DISPTYPE_DISP2);
+ 
+ 	inSISIDXREG(SISCR, 0x31, cr31);
+ 	cr31 &= ~0x60;
++	cr31 |= 0x04;
+ 
+-	switch (ivideo.disp_state & DISPTYPE_DISP2) {
+-	   case DISPTYPE_CRT2:
+-		cr30 = (SIS_VB_OUTPUT_CRT2 | SIS_SIMULTANEOUS_VIEW_ENABLE);
+-		cr31 |= SIS_DRIVER_MODE;
+-		break;
+-	   case DISPTYPE_LCD:
+-		cr30  = (SIS_VB_OUTPUT_LCD | SIS_SIMULTANEOUS_VIEW_ENABLE);
+-		cr31 |= SIS_DRIVER_MODE;
+-		break;
+-	   case DISPTYPE_TV:
+-		if (ivideo.TV_type == TVMODE_HIVISION)
++	cr33 = sisfb_rate_idx & 0x0F;
++
++	SiS_SetEnableDstn(&SiS_Pr, FALSE);
++	SiS_SetEnableFstn(&SiS_Pr, FALSE);
++
++	switch (ivideo.currentvbflags & VB_DISPTYPE_DISP2) {
++	   case CRT2_TV:
++		ivideo.disp_state = DISPTYPE_TV;
++		if (ivideo.vbflags & TV_HIVISION) {
+ 			cr30 = (SIS_VB_OUTPUT_HIVISION | SIS_SIMULTANEOUS_VIEW_ENABLE);
+-		else if (ivideo.TV_plug == TVPLUG_SVIDEO)
++			ivideo.currentvbflags |= (TV_HIVISION | TV_SVIDEO);
++			ivideo.TV_type = TVMODE_HIVISION;
++			ivideo.TV_plug = TVPLUG_SVIDEO;
++		} else if (ivideo.vbflags & TV_SVIDEO) {
+ 			cr30 = (SIS_VB_OUTPUT_SVIDEO | SIS_SIMULTANEOUS_VIEW_ENABLE);
+-		else if (ivideo.TV_plug == TVPLUG_COMPOSITE)
++			ivideo.currentvbflags |= TV_SVIDEO;
++			ivideo.TV_plug = TVPLUG_SVIDEO;
++		} else if (ivideo.vbflags & TV_AVIDEO) {
+ 			cr30 = (SIS_VB_OUTPUT_COMPOSITE | SIS_SIMULTANEOUS_VIEW_ENABLE);
+-		else if (ivideo.TV_plug == TVPLUG_SCART)
++			ivideo.currentvbflags |= TV_AVIDEO;
++			ivideo.TV_plug = TVPLUG_COMPOSITE;
++		} else if (ivideo.vbflags & TV_SCART) {
+ 			cr30 = (SIS_VB_OUTPUT_SCART | SIS_SIMULTANEOUS_VIEW_ENABLE);
++			ivideo.currentvbflags |= TV_SCART;
++			ivideo.TV_plug = TVPLUG_SCART;
++		}
+ 		cr31 |= SIS_DRIVER_MODE;
+ 
+-	        if (sisfb_tvmode == 1 || ivideo.TV_type == TVMODE_PAL)
+-			cr31 |= 0x01;
+-                else
+-                        cr31 &= ~0x01;
++		if(!(ivideo.vbflags & TV_HIVISION)) {
++	        	if (ivideo.vbflags & TV_PAL) {
++		 		cr31 |= 0x01;
++				ivideo.currentvbflags |= TV_PAL;
++				ivideo.TV_type = TVMODE_PAL;
++                	} else {
++		       		cr31 &= ~0x01;
++				ivideo.currentvbflags |= TV_NTSC;
++				ivideo.TV_type = TVMODE_NTSC;
++			}
++		}
++		break;
++	   case CRT2_LCD:
++		ivideo.disp_state = DISPTYPE_LCD;
++		cr30  = (SIS_VB_OUTPUT_LCD | SIS_SIMULTANEOUS_VIEW_ENABLE);
++		cr31 |= SIS_DRIVER_MODE;
++		SiS_SetEnableDstn(&SiS_Pr, sisfb_dstn);
++	        SiS_SetEnableFstn(&SiS_Pr, sisfb_fstn);
++		break;
++	   case CRT2_VGA:
++		ivideo.disp_state = DISPTYPE_CRT2;
++		cr30 = (SIS_VB_OUTPUT_CRT2 | SIS_SIMULTANEOUS_VIEW_ENABLE);
++		cr31 |= SIS_DRIVER_MODE;
++		if(sisfb_nocrt2rate) {
++			cr33 |= (sisbios_mode[sisfb_mode_idx].rate_idx << 4);
++		} else {
++			cr33 |= ((sisfb_rate_idx & 0x0F) << 4);
++		}
+ 		break;
+ 	   default:	/* disable CRT2 */
+ 		cr30 = 0x00;
+@@ -3389,8 +3878,14 @@ static void sisfb_pre_setmode(void)
+ 
+ 	outSISIDXREG(SISCR, IND_SIS_SCRATCH_REG_CR30, cr30);
+ 	outSISIDXREG(SISCR, IND_SIS_SCRATCH_REG_CR31, cr31);
++	outSISIDXREG(SISCR, IND_SIS_SCRATCH_REG_CR33, cr33);
+ 
+-        outSISIDXREG(SISCR, IND_SIS_SCRATCH_REG_CR33, (sisfb_rate_idx & 0x0F));
++#ifdef CONFIG_FB_SIS_315
++        if(sisvga_engine == SIS_315_VGA) {
++	   /* Clear LCDA and PAL-N/M bits */
++	   andSISIDXREG(SISCR,0x38,~0xc3);
++	}
++#endif
+ 
+ 	if(ivideo.accel) sisfb_syncaccel();
+ 
+@@ -3400,67 +3895,89 @@ static void sisfb_pre_setmode(void)
+ static void sisfb_post_setmode(void)
+ {
+ 	u8 reg;
++	BOOLEAN crt1isoff = FALSE;
++#ifdef CONFIG_FB_SIS_315
++	u8 reg1;
++#endif
++#ifdef CONFIG_FB_SIS_300
+ 	BOOLEAN doit = TRUE;
+-#if 0	/* TW: Wrong: Is not in MMIO space, but in RAM */
+-	/* Backup mode number to MMIO space */
+-	if(ivideo.mmio_vbase) {
+-	  *(volatile u8 *)(((u8*)ivideo.mmio_vbase) + 0x449) = (unsigned char)sisfb_mode_no;
+-	}
+-#endif	
+-
+-	if (ivideo.video_bpp == 8) {
+-		/* TW: We can't switch off CRT1 on LVDS/Chrontel in 8bpp Modes */
+-		if ((ivideo.hasVB == HASVB_LVDS) || (ivideo.hasVB == HASVB_LVDS_CHRONTEL)) {
+-			doit = FALSE;
+-		}
+-		/* TW: We can't switch off CRT1 on 301B-DH in 8bpp Modes if using LCD */
+-		if ( (sishw_ext.Is301BDH) && (ivideo.disp_state & DISPTYPE_LCD) ) {
+-	        	doit = FALSE;
+-	        }
+-	}
+-
++#endif
+ 	/* TW: We can't switch off CRT1 if bridge is in slave mode */
+-	if(ivideo.hasVB != HASVB_NONE) {
+-		inSISIDXREG(SISPART1, 0x00, reg);
++	if(ivideo.vbflags & VB_VIDEOBRIDGE) {
++#ifdef CONFIG_FB_SIS_300
+ 		if(sisvga_engine == SIS_300_VGA) {
++			inSISIDXREG(SISPART1, 0x00, reg);
+ 			if((reg & 0xa0) == 0x20) {
+ 				doit = FALSE;
+ 			}
+ 		}
+-		if(sisvga_engine == SIS_315_VGA) {
+-			if((reg & 0x50) == 0x10) {
+-				doit = FALSE;
+-			}
+-		}
++#endif
+ 	} else sisfb_crt1off = 0;
+ 
+-	inSISIDXREG(SISCR, 0x17, reg);
+-	if((sisfb_crt1off) && (doit))
+-		reg &= ~0x80;
+-	else 	      
+-		reg |= 0x80;
+-	outSISIDXREG(SISCR, 0x17, reg);
++	if(sisvga_engine == SIS_300_VGA) {
+ 
+-        andSISIDXREG(SISSR, IND_SIS_RAMDAC_CONTROL, ~0x04);
++#ifdef CONFIG_FB_SIS_300
++	   if((sisfb_crt1off) && (doit)) {
++	        crt1isoff = TRUE;
++		reg = 0x00;
++	   } else {
++	        crt1isoff = FALSE;
++		reg = 0x80;
++	   }
++	   setSISIDXREG(SISCR, 0x17, 0x7f, reg);
++#endif
++
++	} else {
++
++#ifdef CONFIG_FB_SIS_315
++	   if(sisfb_crt1off) {
++	        crt1isoff = TRUE;
++		reg  = 0x40;
++		reg1 = 0xc0;
++	   } else {
++	        crt1isoff = FALSE;
++		reg  = 0x00;
++		reg1 = 0x00;
+ 
+-	if((ivideo.disp_state & DISPTYPE_TV) && (ivideo.hasVB == HASVB_301)) {
++	   }
++	   setSISIDXREG(SISCR, 0x63, ~0x40, reg);
++	   setSISIDXREG(SISSR, 0x1f, ~0xc0, reg1);
++#endif
++
++	}
++
++	if(crt1isoff) {
++	   ivideo.currentvbflags &= ~VB_DISPTYPE_CRT1;
++	   ivideo.currentvbflags |= VB_SINGLE_MODE;
++	   ivideo.disp_state |= DISPMODE_SINGLE;
++	} else {
++	   ivideo.currentvbflags |= VB_DISPTYPE_CRT1;
++	   ivideo.disp_state |= DISPTYPE_CRT1;
++	   if(ivideo.currentvbflags & VB_DISPTYPE_CRT2) {
++	  	ivideo.currentvbflags |= VB_MIRROR_MODE;
++		ivideo.disp_state |= DISPMODE_MIRROR;
++	   } else {
++	 	ivideo.currentvbflags |= VB_SINGLE_MODE;
++		ivideo.disp_state |= DISPMODE_SINGLE;
++	   }
++	}
+ 
+-	   inSISIDXREG(SISPART4, 0x01, reg);
++        andSISIDXREG(SISSR, IND_SIS_RAMDAC_CONTROL, ~0x04);
+ 
+-	   if(reg < 0xB0) {        	/* Set filter for SiS301 */
++	if((ivideo.currentvbflags & CRT2_TV) && (ivideo.vbflags & VB_301)) {  /* Set filter for SiS301 */
+ 
+ 		switch (ivideo.video_width) {
+ 		   case 320:
+-			filter_tb = (ivideo.TV_type == TVMODE_NTSC) ? 4 : 12;
++			filter_tb = (ivideo.vbflags & TV_NTSC) ? 4 : 12;
+ 			break;
+ 		   case 640:
+-			filter_tb = (ivideo.TV_type == TVMODE_NTSC) ? 5 : 13;
++			filter_tb = (ivideo.vbflags & TV_NTSC) ? 5 : 13;
+ 			break;
+ 		   case 720:
+-			filter_tb = (ivideo.TV_type == TVMODE_NTSC) ? 6 : 14;
++			filter_tb = (ivideo.vbflags & TV_NTSC) ? 6 : 14;
+ 			break;
+ 		   case 800:
+-			filter_tb = (ivideo.TV_type == TVMODE_NTSC) ? 7 : 15;
++			filter_tb = (ivideo.vbflags & TV_NTSC) ? 7 : 15;
+ 			break;
+ 		   default:
+ 			filter = -1;
+@@ -3469,15 +3986,15 @@ static void sisfb_post_setmode(void)
+ 
+ 		orSISIDXREG(SISPART1, sisfb_CRT2_write_enable, 0x01);
+ 
+-		if(ivideo.TV_type == TVMODE_NTSC) {
++		if(ivideo.vbflags & TV_NTSC) {
+ 
+ 		        andSISIDXREG(SISPART2, 0x3a, 0x1f);
+ 
+-			if (ivideo.TV_plug == TVPLUG_SVIDEO) {
++			if (ivideo.vbflags & TV_SVIDEO) {
+ 
+ 			        andSISIDXREG(SISPART2, 0x30, 0xdf);
+ 
+-			} else if (ivideo.TV_plug == TVPLUG_COMPOSITE) {
++			} else if (ivideo.vbflags & TV_AVIDEO) {
+ 
+ 			        orSISIDXREG(SISPART2, 0x30, 0x20);
+ 
+@@ -3503,15 +4020,15 @@ static void sisfb_post_setmode(void)
+ 				}
+ 			}
+ 
+-		} else if(ivideo.TV_type == TVMODE_PAL) {
++		} else if(ivideo.vbflags & TV_PAL) {
+ 
+ 			andSISIDXREG(SISPART2, 0x3A, 0x1F);
+ 
+-			if (ivideo.TV_plug == TVPLUG_SVIDEO) {
++			if (ivideo.vbflags & TV_SVIDEO) {
+ 
+ 			        andSISIDXREG(SISPART2, 0x30, 0xDF);
+ 
+-			} else if (ivideo.TV_plug == TVPLUG_COMPOSITE) {
++			} else if (ivideo.vbflags & TV_AVIDEO) {
+ 
+ 			        orSISIDXREG(SISPART2, 0x30, 0x20);
+ 
+@@ -3539,7 +4056,7 @@ static void sisfb_post_setmode(void)
+ 		}
+ 
+ 		if ((filter >= 0) && (filter <=7)) {
+-			DPRINTK("FilterTable[%d]-%d: %02x %02x %02x %02x\n", filter_tb, filter, 
++			DPRINTK("FilterTable[%d]-%d: %02x %02x %02x %02x\n", filter_tb, filter,
+ 				sis_TV_filter[filter_tb].filter[filter][0],
+ 				sis_TV_filter[filter_tb].filter[filter][1],
+ 				sis_TV_filter[filter_tb].filter[filter][2],
+@@ -3550,8 +4067,6 @@ static void sisfb_post_setmode(void)
+ 			outSISIDXREG(SISPART2, 0x37, (sis_TV_filter[filter_tb].filter[filter][2]));
+ 			outSISIDXREG(SISPART2, 0x38, (sis_TV_filter[filter_tb].filter[filter][3]));
+ 		}
+-
+-	     }
+ 	  
+ 	}
+ 
+@@ -3567,8 +4082,10 @@ int sisfb_setup(char *options)
+ #endif	
+ 
+ 	ivideo.refresh_rate = 0;
++	SiS_Pr.SiS_CustomT = CUT_NONE;
++	SiS_Pr.UsePanelScaler = -1;
+ 
+-        printk(KERN_INFO "sisfb: Options %s\n", options);
++        printk(KERN_DEBUG "sisfb: Options %s\n", options);
+ 
+ 	if (!options || !*options)
+ 		return 0;
+@@ -3577,72 +4094,75 @@ int sisfb_setup(char *options)
+ 
+ 		if (!*this_opt)	continue;
+ 
+-		if (!strncmp(this_opt, "mode:", 5)) {
+-			sisfb_search_mode(this_opt + 5);
+-		} else if (!strncmp(this_opt, "vesa:", 5)) {
+-			sisfb_search_vesamode(simple_strtoul(this_opt + 5, NULL, 0));
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)			
+-		} else if (!strcmp(this_opt, "inverse")) {
++		if (!strnicmp(this_opt, "mode:", 5)) {
++			sisfb_search_mode(this_opt + 5, FALSE);
++		} else if (!strnicmp(this_opt, "vesa:", 5)) {
++			sisfb_search_vesamode(simple_strtoul(this_opt + 5, NULL, 0), FALSE);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
++		} else if (!strnicmp(this_opt, "inverse", 7)) {
+ 			sisfb_inverse = 1;
+ 			/* fb_invert_cmaps(); */
+-		} else if (!strncmp(this_opt, "font:", 5)) {
++		} else if (!strnicmp(this_opt, "font:", 5)) {
+ 			strcpy(sis_fb_info.fontname, this_opt + 5);
+-#endif			
+-		} else if (!strncmp(this_opt, "mode:", 5)) {
+-			sisfb_search_mode(this_opt + 5);
+-		} else if (!strncmp(this_opt, "vesa:", 5)) {
+-			sisfb_search_vesamode(simple_strtoul(this_opt + 5, NULL, 0));
+-		} else if (!strncmp(this_opt, "vrate:", 6)) {
++#endif
++		} else if (!strnicmp(this_opt, "vrate:", 6)) {
+ 			ivideo.refresh_rate = simple_strtoul(this_opt + 6, NULL, 0);
+-		} else if (!strncmp(this_opt, "rate:", 5)) {
++			sisfb_parm_rate = ivideo.refresh_rate;
++		} else if (!strnicmp(this_opt, "rate:", 5)) {
+ 			ivideo.refresh_rate = simple_strtoul(this_opt + 5, NULL, 0);
+-		} else if (!strncmp(this_opt, "off", 3)) {
++			sisfb_parm_rate = ivideo.refresh_rate;
++		} else if (!strnicmp(this_opt, "off", 3)) {
+ 			sisfb_off = 1;
+-		} else if (!strncmp(this_opt, "crt1off", 7)) {
++		} else if (!strnicmp(this_opt, "crt1off", 7)) {
+ 			sisfb_crt1off = 1;
+-		} else if (!strncmp(this_opt, "filter:", 7)) {
++		} else if (!strnicmp(this_opt, "filter:", 7)) {
+ 			filter = (int)simple_strtoul(this_opt + 7, NULL, 0);
+-		} else if (!strncmp(this_opt, "forcecrt2type:", 14)) {
++		} else if (!strnicmp(this_opt, "forcecrt2type:", 14)) {
+ 			sisfb_search_crt2type(this_opt + 14);
+-		} else if (!strncmp(this_opt, "forcecrt1:", 10)) {
++		} else if (!strnicmp(this_opt, "forcecrt1:", 10)) {
+ 			sisfb_forcecrt1 = (int)simple_strtoul(this_opt + 10, NULL, 0);
+-                } else if (!strncmp(this_opt, "tvmode:",7)) {
++                } else if (!strnicmp(this_opt, "tvmode:",7)) {
+ 		        sisfb_search_tvstd(this_opt + 7);
+-                } else if (!strncmp(this_opt, "tvstandard:",11)) {
++                } else if (!strnicmp(this_opt, "tvstandard:",11)) {
+ 			sisfb_search_tvstd(this_opt + 7);
+-                } else if (!strncmp(this_opt, "mem:",4)) {
++                } else if (!strnicmp(this_opt, "mem:",4)) {
+ 		        sisfb_mem = simple_strtoul(this_opt + 4, NULL, 0);
+-                } else if (!strncmp(this_opt, "dstn", 4)) {
+-			enable_dstn = 1;
+-			/* TW: DSTN overrules forcecrt2type */
+-			sisfb_crt2type = DISPTYPE_LCD;
+-		} else if (!strncmp(this_opt, "queuemode:", 10)) {
++		} else if (!strnicmp(this_opt, "queuemode:", 10)) {
+ 			sisfb_search_queuemode(this_opt + 10);
+-		} else if (!strncmp(this_opt, "pdc:", 4)) {
++		} else if (!strnicmp(this_opt, "pdc:", 4)) {
+ 		        sisfb_pdc = simple_strtoul(this_opt + 4, NULL, 0);
+ 		        if(sisfb_pdc & ~0x3c) {
+ 			   printk(KERN_INFO "sisfb: Illegal pdc parameter\n");
+ 			   sisfb_pdc = 0;
+ 		        }
+-		} else if (!strncmp(this_opt, "noaccel", 7)) {
++		} else if (!strnicmp(this_opt, "noaccel", 7)) {
+ 			sisfb_accel = 0;
+-		} else if (!strncmp(this_opt, "noypan", 6)) {
++		} else if (!strnicmp(this_opt, "noypan", 6)) {
+ 		        sisfb_ypan = 0;
+-		} else if (!strncmp(this_opt, "userom:", 7)) {
++		} else if (!strnicmp(this_opt, "userom:", 7)) {
+ 			sisfb_userom = (int)simple_strtoul(this_opt + 7, NULL, 0);
+-		} else if (!strncmp(this_opt, "useoem:", 7)) {
++		} else if (!strnicmp(this_opt, "useoem:", 7)) {
+ 			sisfb_useoem = (int)simple_strtoul(this_opt + 7, NULL, 0);
++		} else if (!strnicmp(this_opt, "nocrt2rate", 10)) {
++			sisfb_nocrt2rate = 1;
++	 	} else if (!strnicmp(this_opt, "scalelcd:", 9)) {
++		        unsigned long temp = 2;
++		        temp = simple_strtoul(this_opt + 9, NULL, 0);
++		        if((temp == 0) || (temp == 1)) {
++			   SiS_Pr.UsePanelScaler = temp ^ 1;
++		        }
++		} else if (!strnicmp(this_opt, "specialtiming:", 14)) {
++			sisfb_search_specialtiming(this_opt + 14);
++		} else if(this_opt[0] >= '0' && this_opt[0] <= '9') {
++			sisfb_search_mode(this_opt, TRUE);
+ 		} else {
+ 			printk(KERN_INFO "sisfb: Invalid option %s\n", this_opt);
+ 		}
+ 
+ 		/* TW: Acceleration only with MMIO mode */
+ 		if((sisfb_queuemode != -1) && (sisfb_queuemode != MMIO_CMD)) {
+-			sisfb_ypan = 0;
+ 			sisfb_accel = 0;
+ 		}
+-		/* TW: Panning only with acceleration */
+-		if(sisfb_accel == 0) sisfb_ypan = 0;
+ 
+ 	}
+ 	return 0;
+@@ -3661,14 +4181,14 @@ static char *sis_find_rom(void)
+         char *sis_sig_300[4] = {
+           "300", "540", "630", "730"
+         };
+-        char *sis_sig_310[7] = {
+-          "315", "315", "315", "5315", "6325", "6325", "Xabre"
++        char *sis_sig_310[9] = {
++          "315", "315", "315", "5315", "6325", "6325", "Xabre", "6330", "6330"
+         };
+ 	ushort sis_nums_300[4] = {
+ 	  SIS_300, SIS_540, SIS_630, SIS_730
+ 	};
+-	unsigned short sis_nums_310[7] = {
+-	  SIS_315PRO, SIS_315H, SIS_315, SIS_550, SIS_650, SIS_740, SIS_330
++	unsigned short sis_nums_310[9] = {
++	  SIS_315PRO, SIS_315H, SIS_315, SIS_550, SIS_650, SIS_740, SIS_330, SIS_660, SIS_760
+ 	};
+ 
+         for(segstart=0x000c0000; segstart<0x000f0000; segstart+=0x00001000) {
+@@ -3705,7 +4225,7 @@ static char *sis_find_rom(void)
+                     }
+                 }
+ 		if(stage != 4) {
+-                   for(i = 0;(i < 7) && (stage != 4); i++) {
++                   for(i = 0;(i < 9) && (stage != 4); i++) {
+                       if(strncmp(sis_sig_310[i], rom, strlen(sis_sig_310[i])) == 0) {
+ 		          if(sis_nums_310[i] == ivideo.chip) {
+                              stage = 4;
+@@ -3735,7 +4255,7 @@ int __init sisfb_init(void)
+ 	int pdev_valid = 0;
+ 	u32 reg32;
+ 	u16 reg16;
+-	u8  reg, reg1;
++	u8  reg;
+ 
+ 	/* outb(0x77, 0x80); */  /* What is this? */
+ 
+@@ -3751,18 +4271,24 @@ int __init sisfb_init(void)
+ 	if (sisfb_off)
+ 		return -ENXIO;
+ 
+-	if (enable_dstn)
+-		SiS_SetEnableDstn(&SiS_Pr);
+-		
+ 	sisfb_registered = 0;
++	sisfb_thismonitor.datavalid = FALSE;
+ 
+ 	memset(&sis_fb_info, 0, sizeof(sis_fb_info));
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
++        memset(&sisfb_lastrates[0], 0, 128);
++#endif
+ 	
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)	
+ 	memset(&sis_disp, 0, sizeof(sis_disp));
+ #endif	
+ 
+-	while ((pdev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pdev)) != NULL) {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,74)
++	pci_for_each_dev(pdev) {
++#else
++	while((pdev = pci_find_device(PCI_VENDOR_ID_SI, PCI_ANY_ID, pdev))) {
++#endif
+ 		for (b = sisdev_list; b->vendor; b++) {
+ 			if ((b->vendor == pdev->vendor)
+ 			    && (b->device == pdev->device)) {
+@@ -3804,18 +4330,17 @@ int __init sisfb_init(void)
+ 		break;
+ 	   case PCI_DEVICE_ID_SI_630_VGA:
+ 		{
++			ivideo.chip = SIS_630;
+ 			sisfb_set_reg4(0xCF8, 0x80000000);
+ 			reg32 = sisfb_get_reg3(0xCFC);
+ 			if(reg32 == 0x07301039) {
+ 				ivideo.chip = SIS_730;
+-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0)				
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0)
+ 				strcpy(sis_fb_info.modename, "SIS 730");
+ #else
+ 				strcpy(myid, "SIS 730");
+-#endif				
+-			} else
+-				ivideo.chip = SIS_630;
+-
++#endif
++			}
+ 			sisvga_engine = SIS_300_VGA;
+ 			sisfb_hwcursor_size = HW_CURSOR_AREA_SIZE_300 * 2;
+ 			sisfb_CRT2_write_enable = IND_SIS_CRT2_WRITE_ENABLE_300;
+@@ -3860,11 +4385,11 @@ int __init sisfb_init(void)
+ 			reg32 = sisfb_get_reg3(0xCFC);
+ 			if(reg32 == 0x07401039) {
+ 				ivideo.chip = SIS_740;
+-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0)				
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0)
+ 				strcpy(sis_fb_info.modename, "SIS 740");
+ #else
+-				strcpy(myid, "SIS 740");				
+-#endif				
++				strcpy(myid, "SIS 740");
++#endif
+ 			}
+ 			sisvga_engine = SIS_315_VGA;
+ 			sisfb_hwcursor_size = HW_CURSOR_AREA_SIZE_315 * 2;
+@@ -3877,6 +4402,24 @@ int __init sisfb_init(void)
+ 		sisfb_hwcursor_size = HW_CURSOR_AREA_SIZE_315 * 2;
+ 		sisfb_CRT2_write_enable = IND_SIS_CRT2_WRITE_ENABLE_315;
+ 		break;
++	   case PCI_DEVICE_ID_SI_660_VGA:
++	   	{
++			ivideo.chip = SIS_660;
++			sisfb_set_reg4(0xCF8, 0x80000000);
++			reg32 = sisfb_get_reg3(0xCFC);
++			if(reg32 == 0x07601039) {
++				ivideo.chip = SIS_760;
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0)
++				strcpy(sis_fb_info.modename, "SIS 760");
++#else
++				strcpy(myid, "SIS 760");
++#endif
++			}
++			sisvga_engine = SIS_315_VGA;
++			sisfb_hwcursor_size = HW_CURSOR_AREA_SIZE_315 * 2;
++			sisfb_CRT2_write_enable = IND_SIS_CRT2_WRITE_ENABLE_315;
++			break;
++		}
+ #endif
+            default:
+ 	        return -ENODEV;
+@@ -3903,29 +4446,31 @@ int __init sisfb_init(void)
+         SiS_Pr.SiS_CHOverScan = -1;
+         SiS_Pr.SiS_ChSW = FALSE;
+ 	SiS_Pr.SiS_UseLCDA = FALSE;
+-	SiS_Pr.UsePanelScaler = -1;
+ 	SiSRegInit(&SiS_Pr, (USHORT)sishw_ext.ulIOAddress);
+ 
+ #ifdef CONFIG_FB_SIS_300
+-	/* TW: Find PCI systems for Chrontel/ISA bridge manipulation */
++	/* TW: Find PCI systems for Chrontel/GPIO communication setup */
+ 	if(ivideo.chip == SIS_630) {
+-	  int i=0;
+-          do {
+-	    if(mychswtable[i].subsysVendor == ivideo.subsysvendor &&
+-	       mychswtable[i].subsysCard   == ivideo.subsysdevice) {
+-		SiS_Pr.SiS_ChSW = TRUE;
+-            }
+-            i++;
+-          } while(mychswtable[i].subsysVendor != 0);
++	   int i=0;
++           do {
++	      if(mychswtable[i].subsysVendor == ivideo.subsysvendor &&
++	         mychswtable[i].subsysCard   == ivideo.subsysdevice) {
++		 SiS_Pr.SiS_ChSW = TRUE;
++		 printk(KERN_DEBUG "sisfb: Identified [%s %s] requiring Chrontel/GPIO setup\n",
++		        mychswtable[i].vendorName, mychswtable[i].cardName);
++		 break;
++              }
++              i++;
++           } while(mychswtable[i].subsysVendor != 0);
+ 	}
+ #endif
+ 
+         outSISIDXREG(SISSR, IND_SIS_PASSWORD, SIS_PASSWORD);
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)		
+-#ifdef MODULE	
++#ifdef MODULE
+ 	inSISIDXREG(SISCR,0x34,reg);
+-	if(reg & 0x80) {
++	if((reg & 0x80) && (reg != 0xff)) {
+ 	   if((sisbios_mode[sisfb_mode_idx].mode_no) != 0xFF) {
+ 	      printk(KERN_INFO "sisfb: Cannot initialize display mode, X server is active\n");
+ 	      return -EBUSY;
+@@ -3938,7 +4483,7 @@ int __init sisfb_init(void)
+ 
+ #ifdef CONFIG_FB_SIS_300
+ 	if (sisvga_engine == SIS_300_VGA) {
+-	        outSISIDXREG(SISSR, 0x28, 0x37);
++	        outSISIDXREG(SISSR, 0x28, 0x37);	/* Reset memory clock */
+ 
+                 outSISIDXREG(SISSR, 0x29, 0x61);
+ 
+@@ -3946,7 +4491,9 @@ int __init sisfb_init(void)
+ 	}
+ #endif
+ #ifdef CONFIG_FB_SIS_315
+-	if (ivideo.chip == SIS_550 || ivideo.chip == SIS_650 || ivideo.chip == SIS_740) {
++	if (ivideo.chip == SIS_550 || ivideo.chip == SIS_650 ||
++	    ivideo.chip == SIS_740 || ivideo.chip == SIS_660 ||
++	    ivideo.chip == SIS_760) {
+ 	        outSISIDXREG(SISSR, 0x28, 0x5a);
+ 
+                 outSISIDXREG(SISSR, 0x29, 0x64);
+@@ -3967,6 +4514,8 @@ int __init sisfb_init(void)
+ 		   case SIS_550:
+ 		   case SIS_650:
+ 		   case SIS_740:
++		   case SIS_660:
++		   case SIS_760:
+ 			sishw_ext.bIntegratedMMEnabled = TRUE;
+ 			break;
+ 		   default:
+@@ -4006,13 +4555,56 @@ int __init sisfb_init(void)
+ 	sishw_ext.pQueryNorthBridgeSpace = &sisfb_query_north_bridge_space;
+ 	strcpy(sishw_ext.szVBIOSVer, "0.84");
+ 
+-	/* TW: Mode numbers for 1280x960 are different for 300 and 310/325 series */
++        /* Find systems for special custom timing */
++	if((sishw_ext.UseROM) && (SiS_Pr.SiS_CustomT == CUT_NONE)) {
++	   int i=0,j;
++	   unsigned char *biosver = sishw_ext.pjVirtualRomBase + 0x06;
++           unsigned char *biosdate = sishw_ext.pjVirtualRomBase + 0x2c;
++	   BOOLEAN footprint;
++	   unsigned long chksum = 0;
++
++           for(i=0; i<32768; i++) chksum += sishw_ext.pjVirtualRomBase[i];
++
++	   i=0;
++           do {
++	      if( (mycustomttable[i].chipID == ivideo.chip) &&
++	          ((!strlen(mycustomttable[i].biosversion)) ||
++		   (!strncmp(mycustomttable[i].biosversion, biosver, strlen(mycustomttable[i].biosversion)))) &&
++	          ((!strlen(mycustomttable[i].biosdate)) ||
++		   (!strncmp(mycustomttable[i].biosdate, biosdate, strlen(mycustomttable[i].biosdate)))) &&
++		  ((!mycustomttable[i].bioschksum) ||
++	           (mycustomttable[i].bioschksum == chksum))	&&
++		  (mycustomttable[i].pcisubsysvendor == ivideo.subsysvendor) &&
++		  (mycustomttable[i].pcisubsyscard == ivideo.subsysdevice) ) {
++		 footprint = TRUE;
++	         for(j=0; j<5; j++) {
++	           if(mycustomttable[i].biosFootprintAddr[j]) {
++	              if(sishw_ext.pjVirtualRomBase[mycustomttable[i].biosFootprintAddr[j]] !=
++		      		mycustomttable[i].biosFootprintData[j])
++		         footprint = FALSE;
++		   }
++	         }
++	         if(footprint) {
++	 	    SiS_Pr.SiS_CustomT = mycustomttable[i].SpecialID;
++		    printk(KERN_DEBUG "sisfb: Identified [%s %s], special timing applies\n",
++		        mycustomttable[i].vendorName,
++			mycustomttable[i].cardName);
++	            break;
++                 }
++	      }
++              i++;
++           } while(mycustomttable[i].chipID);
++	}
++
++#ifdef CONFIG_FB_SIS_300
++	/* Mode numbers for 1280x768 are different for 300 and 315 series */
+ 	if(sisvga_engine == SIS_300_VGA) {
+-		sisbios_mode[MODEINDEX_1280x960].mode_no = 0x6e;
+-		sisbios_mode[MODEINDEX_1280x960+1].mode_no = 0x6f;
+-		sisbios_mode[MODEINDEX_1280x960+2].mode_no = 0x7b;
+-		sisbios_mode[MODEINDEX_1280x960+3].mode_no = 0x7b;
++		sisbios_mode[MODEINDEX_1280x768].mode_no = 0x55;
++		sisbios_mode[MODEINDEX_1280x768+1].mode_no = 0x5a;
++		sisbios_mode[MODEINDEX_1280x768+2].mode_no = 0x5b;
++		sisbios_mode[MODEINDEX_1280x768+3].mode_no = 0x5b;
+ 	}
++#endif
+ 
+ 	sishw_ext.pSR = vmalloc(sizeof(SIS_DSReg) * SR_BUFFER_SIZE);
+ 	if (sishw_ext.pSR == NULL) {
+@@ -4168,120 +4760,53 @@ int __init sisfb_init(void)
+ 
+ 	ivideo.mtrr = (unsigned int) 0;
+ 
+-	if((sisfb_mode_idx < 0) || ((sisbios_mode[sisfb_mode_idx].mode_no) != 0xFF)) { 
+-
+-#ifdef CONFIG_FB_SIS_300
+-		if (sisvga_engine == SIS_300_VGA) {
+-			sisfb_get_VB_type_300();
+-		}
+-#endif
++	ivideo.vbflags = 0;
+ 
+-#ifdef CONFIG_FB_SIS_315
+-		if (sisvga_engine == SIS_315_VGA) {
+-			sisfb_get_VB_type_315();
+-		}
+-#endif
++	if((sisfb_mode_idx < 0) || ((sisbios_mode[sisfb_mode_idx].mode_no) != 0xFF)) {
+ 
+ 		sishw_ext.ujVBChipID = VB_CHIP_UNKNOWN;
+ 		sishw_ext.Is301BDH = FALSE;
+ 		sishw_ext.usExternalChip = 0;
+ 
+-		switch (ivideo.hasVB) {
++		sisfb_get_VB_type();
+ 
+-		case HASVB_301:
+-		        inSISIDXREG(SISPART4, 0x01, reg);
+-			if (reg >= 0xE0) {
+-				sishw_ext.ujVBChipID = VB_CHIP_302LV;
+-				printk(KERN_INFO "sisfb: SiS302LV bridge detected (revision 0x%02x)\n",reg);
+-	  		} else if (reg >= 0xD0) {
+-				sishw_ext.ujVBChipID = VB_CHIP_301LV;
+-				printk(KERN_INFO "sisfb: SiS301LV bridge detected (revision 0x%02x)\n",reg);
+-	  		} else if (reg >= 0xB0) {
+-				sishw_ext.ujVBChipID = VB_CHIP_301B;
+-				inSISIDXREG(SISPART4,0x23,reg1);
+-				if(!(reg1 & 0x02)) sishw_ext.Is301BDH = TRUE;
+-				printk(KERN_INFO "sisfb: SiS301B%s bridge detected (revision 0x%02x)\n",
+-					(sishw_ext.Is301BDH ? "-DH" : ""), reg);
+-			} else {
+-				sishw_ext.ujVBChipID = VB_CHIP_301;
+-				printk(KERN_INFO "sisfb: SiS301 bridge detected\n");
+-			}
+-			break;
+-		case HASVB_302:
+-		        inSISIDXREG(SISPART4, 0x01, reg);
+-			if (reg >= 0xE0) {
+-				sishw_ext.ujVBChipID = VB_CHIP_302LV;
+-				printk(KERN_INFO "sisfb: SiS302LV bridge detected (revision 0x%02x)\n",reg);
+-	  		} else if (reg >= 0xD0) {
+-				sishw_ext.ujVBChipID = VB_CHIP_301LV;
+-				printk(KERN_INFO "sisfb: SiS302LV bridge detected (revision 0x%02x)\n",reg);
+-	  		} else if (reg >= 0xB0) {
+-				inSISIDXREG(SISPART4,0x23,reg1);
+-				if(!(reg1 & 0x02)) sishw_ext.Is301BDH = TRUE;
+-			        sishw_ext.ujVBChipID = VB_CHIP_302B;
+-				printk(KERN_INFO "sisfb: SiS302B%s bridge detected (revision 0x%02x)\n",
+-					(sishw_ext.Is301BDH ? "-DH" : ""), reg);
+-			} else {
+-			        sishw_ext.ujVBChipID = VB_CHIP_302;
+-				printk(KERN_INFO "sisfb: SiS302 bridge detected\n");
+-			}
+-			break;
+-		case HASVB_LVDS:
+-			sishw_ext.usExternalChip = 0x1;
+-			printk(KERN_INFO "sisfb: LVDS transmitter detected\n");
+-			break;
+-		case HASVB_TRUMPION:
+-			sishw_ext.usExternalChip = 0x2;
+-			printk(KERN_INFO "sisfb: Trumpion Zurac LVDS scaler detected\n");
+-			break;
+-		case HASVB_CHRONTEL:
+-			sishw_ext.usExternalChip = 0x4;
+-			printk(KERN_INFO "sisfb: Chrontel TV encoder detected\n");
+-			break;
+-		case HASVB_LVDS_CHRONTEL:
+-			sishw_ext.usExternalChip = 0x5;
+-			printk(KERN_INFO "sisfb: LVDS transmitter and Chrontel TV encoder detected\n");
+-			break;
+-		default:
+-			printk(KERN_INFO "sisfb: No or unknown bridge type detected\n");
+-			break;
++		if(ivideo.vbflags & VB_VIDEOBRIDGE) {
++			sisfb_detect_VB_connect();
+ 		}
+ 
+-		if (ivideo.hasVB != HASVB_NONE) {
+-#ifdef CONFIG_FB_SIS_300
+-		      if (sisvga_engine == SIS_300_VGA) {
+-				sisfb_detect_VB_connect_300();
+-                      }
+-#endif
+-#ifdef CONFIG_FB_SIS_315
+-		      if (sisvga_engine == SIS_315_VGA) {
+-				sisfb_detect_VB_connect_315();
+-                      }
+-#endif
+-		}
++		ivideo.currentvbflags = ivideo.vbflags & VB_VIDEOBRIDGE;
+ 
+-		if (ivideo.disp_state & DISPTYPE_DISP2) {
+-			if (sisfb_crt1off)
+-				ivideo.disp_state |= DISPMODE_SINGLE;
+-			else
+-				ivideo.disp_state |= (DISPMODE_MIRROR | DISPTYPE_CRT1);
+-		} else {
+-			ivideo.disp_state = DISPMODE_SINGLE | DISPTYPE_CRT1;
++		if(ivideo.vbflags & VB_VIDEOBRIDGE) {
++		   if(sisfb_crt2type != -1) {
++		      if((sisfb_crt2type == CRT2_LCD) && (ivideo.vbflags & CRT2_LCD)) {
++		         ivideo.currentvbflags |= CRT2_LCD;
++		      } else if(sisfb_crt2type != CRT2_LCD) {
++		         ivideo.currentvbflags |= sisfb_crt2type;
++		      }
++		   } else {
++		      /* Chrontel 700x TV detection often unreliable, therefore use a
++		       * different default order on such machines
++		       */
++		      if((sisvga_engine == SIS_300_VGA) && (ivideo.vbflags & VB_CHRONTEL)) {
++		         if(ivideo.vbflags & CRT2_LCD)      ivideo.currentvbflags |= CRT2_LCD;
++		         else if(ivideo.vbflags & CRT2_TV)  ivideo.currentvbflags |= CRT2_TV;
++		         else if(ivideo.vbflags & CRT2_VGA) ivideo.currentvbflags |= CRT2_VGA;
++		      } else {
++		         if(ivideo.vbflags & CRT2_TV)       ivideo.currentvbflags |= CRT2_TV;
++		         else if(ivideo.vbflags & CRT2_LCD) ivideo.currentvbflags |= CRT2_LCD;
++		         else if(ivideo.vbflags & CRT2_VGA) ivideo.currentvbflags |= CRT2_VGA;
++		      }
++		   }
+ 		}
+ 
+-		if (ivideo.disp_state & DISPTYPE_LCD) {
+-		    if (!enable_dstn) {
+-		        inSISIDXREG(SISCR, IND_SIS_LCD_PANEL, reg);
+-			reg &= 0x0f;
+-			if (sisvga_engine == SIS_300_VGA) {
+-			    sishw_ext.ulCRT2LCDType = sis300paneltype[reg];
+-			} else {
+-			    sishw_ext.ulCRT2LCDType = sis310paneltype[reg];
+-			}
+-		    } else {
+-		        /* TW: FSTN/DSTN */
+-			sishw_ext.ulCRT2LCDType = LCD_320x480;
+-		    }
++		if(ivideo.vbflags & CRT2_LCD) {
++		   inSISIDXREG(SISCR, IND_SIS_LCD_PANEL, reg);
++		   reg &= 0x0f;
++		   if(sisvga_engine == SIS_300_VGA) {
++		      sishw_ext.ulCRT2LCDType = sis300paneltype[reg];
++		   } else {
++		      sishw_ext.ulCRT2LCDType = sis310paneltype[reg];
++		   }
+ 		}
+ 		
+ 		sisfb_detectedpdc = 0;
+@@ -4289,9 +4814,7 @@ int __init sisfb_init(void)
+ #ifdef CONFIG_FB_SIS_300
+                 /* TW: Save the current PanelDelayCompensation if the LCD is currently used */
+ 		if(sisvga_engine == SIS_300_VGA) {
+-	          if((sishw_ext.usExternalChip == 0x01) ||   /* LVDS */
+-		     (sishw_ext.usExternalChip == 0x05) ||   /* LVDS+Chrontel */
+-		     (sishw_ext.Is301BDH)) {		     /* 301B-DH */
++	          if(ivideo.vbflags & (VB_LVDS | VB_30xBDH)) {
+ 		       int tmp;
+ 		       inSISIDXREG(SISCR,0x30,tmp);
+ 		       if(tmp & 0x20) {
+@@ -4320,54 +4843,57 @@ int __init sisfb_init(void)
+ #ifdef CONFIG_FB_SIS_315
+                 /* TW: Try to find about LCDA */
+ 		if(sisvga_engine == SIS_315_VGA) {
+-	          if((sishw_ext.ujVBChipID == VB_CHIP_302B) ||
+-		     (sishw_ext.ujVBChipID == VB_CHIP_301LV) ||
+-		     (sishw_ext.ujVBChipID == VB_CHIP_302LV)) {
+-		       int tmp;
+-		       inSISIDXREG(SISCR,0x34,tmp);
+-		       if(tmp <= 0x13) {	
+-		          /* Currently on LCDA? (Some BIOSes leave CR38) */
+-		          inSISIDXREG(SISCR,0x38,tmp);
+-			  if((tmp & 0x03) == 0x03) {
+-			     SiS_Pr.SiS_UseLCDA = TRUE;
+-			  } else {
+-			     /* Currently on LCDA? (Some newer BIOSes set D0 in CR35) */
+-			     inSISIDXREG(SISCR,0x35,tmp);
+-			     if(tmp & 0x01) {
+-			        SiS_Pr.SiS_UseLCDA = TRUE;
+-			     } else {
+-			        /* Currently on LCD? If so, we can find out 
+-				   by peeking the mode register 
+-				 */
+-			        inSISIDXREG(SISCR,0x30,tmp);
+-			        if(tmp & 0x20) {
+-			           inSISIDXREG(SISPART1,0x13,tmp);
+-				   if(tmp & 0x04) {
+-				      SiS_Pr.SiS_UseLCDA = TRUE;
+-				   }
+-			        }
+-			     }
+-			  }
+-		       } 
+-		       if(SiS_Pr.SiS_UseLCDA) {
+-		          sisfb_detectedlcda = 0x03;
+-		          printk(KERN_INFO
+-			         "sisfb: Bridge uses LCDA for low resolution and text modes\n");
+-		       }
++		   if(ivideo.vbflags & (VB_302B | VB_301LV | VB_302LV)) {
++		      int tmp;
++		      inSISIDXREG(SISCR,0x34,tmp);
++		      if((tmp <= 0x13) || (tmp == 0xff)) {
++		         /* Currently on LCDA? (Some BIOSes leave CR38) */
++		         inSISIDXREG(SISCR,0x38,tmp);
++			 if((tmp & 0x03) == 0x03)  SiS_Pr.SiS_UseLCDA = TRUE;
++			 else {
++			    /* Currently on LCDA? (Some newer BIOSes set D0 in CR35) */
++			    inSISIDXREG(SISCR,0x35,tmp);
++			    if(tmp & 0x01) SiS_Pr.SiS_UseLCDA = TRUE;
++			    else {
++			       /* Currently on LCD? If so, we can find out
++			        * by peeking the mode register
++				*/
++			       inSISIDXREG(SISCR,0x30,tmp);
++			       if(tmp & 0x20) {
++			          inSISIDXREG(SISPART1,0x13,tmp);
++				  if(tmp & 0x04) SiS_Pr.SiS_UseLCDA = TRUE;
++			       }
++			    }
++			 }
++		      }
++		      if(SiS_Pr.SiS_UseLCDA) {
++		         sisfb_detectedlcda = 0x03;
++		         printk(KERN_DEBUG
++			        "sisfb: Bridge uses LCDA for low resolution and text modes\n");
++		      }
+ 	          }
+ 		}
+ #endif
+ #endif
+ 
++		if (!sisfb_crt1off) {
++		   	sisfb_handle_ddc(&sisfb_thismonitor, 0);
++		} else {
++		   	if ((ivideo.vbflags & (VB_301|VB_301B|VB_302B)) &&
++		      	    (ivideo.vbflags & (CRT2_VGA | CRT2_LCD))) {
++		      		sisfb_handle_ddc(&sisfb_thismonitor, 1);
++		   	}
++		}
++
+ 		if (sisfb_mode_idx >= 0)
+-			sisfb_mode_idx = sisfb_validate_mode(sisfb_mode_idx);
++			sisfb_mode_idx = sisfb_validate_mode(sisfb_mode_idx, ivideo.currentvbflags);
+ 
+ 		if (sisfb_mode_idx < 0) {
+-			switch (ivideo.disp_state & DISPTYPE_DISP2) {
+-			   case DISPTYPE_LCD:
++			switch (ivideo.currentvbflags & VB_DISPTYPE_DISP2) {
++			   case CRT2_LCD:
+ 				sisfb_mode_idx = DEFAULT_LCDMODE;
+ 				break;
+-			   case DISPTYPE_TV:
++			   case CRT2_TV:
+ 				sisfb_mode_idx = DEFAULT_TVMODE;
+ 				break;
+ 			   default:
+@@ -4379,39 +4905,27 @@ int __init sisfb_init(void)
+ 		sisfb_mode_no = sisbios_mode[sisfb_mode_idx].mode_no;
+ 
+ 		if (ivideo.refresh_rate != 0)
+-			sisfb_search_refresh_rate(ivideo.refresh_rate);
++			sisfb_search_refresh_rate(ivideo.refresh_rate, sisfb_mode_idx);
+ 
+ 		if (sisfb_rate_idx == 0) {
+ 			sisfb_rate_idx = sisbios_mode[sisfb_mode_idx].rate_idx;
+ 			ivideo.refresh_rate = 60;
+ 		}
+ 
++		if (sisfb_thismonitor.datavalid) {
++			if(!sisfb_verify_rate(&sisfb_thismonitor, sisfb_mode_idx,
++			                      sisfb_rate_idx, ivideo.refresh_rate)) {
++				printk(KERN_INFO "sisfb: WARNING: Refresh rate exceeds monitor specs!\n");
++			}
++		}
++
+ 		ivideo.video_bpp = sisbios_mode[sisfb_mode_idx].bpp;
+ 		ivideo.video_vwidth = ivideo.video_width = sisbios_mode[sisfb_mode_idx].xres;
+ 		ivideo.video_vheight = ivideo.video_height = sisbios_mode[sisfb_mode_idx].yres;
+ 		ivideo.org_x = ivideo.org_y = 0;
+ 		ivideo.video_linelength = ivideo.video_width * (ivideo.video_bpp >> 3);
+-		switch(ivideo.video_bpp) {
+-        	case 8:
+-            		ivideo.DstColor = 0x0000;
+-	    		ivideo.SiS310_AccelDepth = 0x00000000;
+-			ivideo.video_cmap_len = 256;
+-            		break;
+-        	case 16:
+-            		ivideo.DstColor = 0x8000;
+-            		ivideo.SiS310_AccelDepth = 0x00010000;
+-			ivideo.video_cmap_len = 16;
+-            		break;
+-        	case 32:
+-            		ivideo.DstColor = 0xC000;
+-	    		ivideo.SiS310_AccelDepth = 0x00020000;
+-			ivideo.video_cmap_len = 16;
+-            		break;
+-		default:
+-			ivideo.video_cmap_len = 16;
+-		        printk(KERN_INFO "sisfb: Unsupported depth %d", ivideo.video_bpp);
+-			break;
+-    		}
++
++		sisfb_set_vparms();
+ 		
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)	
+ 
+@@ -4424,27 +4938,49 @@ int __init sisfb_init(void)
+ 		sisfb_pre_setmode();
+ 
+ 		if (SiSSetMode(&SiS_Pr, &sishw_ext, sisfb_mode_no) == 0) {
+-			printk(KERN_ERR "sisfb: Setting mode[0x%x] failed, using default mode\n", 
++			printk(KERN_ERR "sisfb: Fatal error: Setting mode[0x%x] failed\n",
+ 				sisfb_mode_no);
+-			return -1;
++			vfree(sishw_ext.pSR);
++			vfree(sishw_ext.pCR);
++			release_mem_region(ivideo.video_base, ivideo.video_size);
++			release_mem_region(ivideo.mmio_base, sisfb_mmio_size);
++			return -EINVAL;
+ 		}
+ 
+ 		outSISIDXREG(SISSR, IND_SIS_PASSWORD, SIS_PASSWORD);
+ 
+ 		sisfb_post_setmode();
+ 
++		ivideo.accel = 0;
++		if(sisfb_accel) {
++		   ivideo.accel = -1;
++		   default_var.accel_flags |= FB_ACCELF_TEXT;
++		   sisfb_initaccel();
++		}
++
+ 		sisfb_crtc_to_var(&default_var);
+ 		
++		sis_fb_info.node = -1;
++		sis_fb_info.flags = FBINFO_FLAG_DEFAULT;
++		sis_fb_info.blank = &sisfb_blank;
++		sis_fb_info.fbops = &sisfb_ops;
++		sis_fb_info.switch_con = &sisfb_switch;
++		sis_fb_info.updatevar = &sisfb_update_var;
++		sis_fb_info.changevar = NULL;
++		sis_fb_info.disp = &sis_disp;
++
++		sisfb_set_disp(-1, &default_var, &sis_fb_info);
++
+ #else		/* --------- For 2.5: Setup a somewhat sane default var ------------ */
+ 
+ 		printk(KERN_INFO "sisfb: Default mode is %dx%dx%d (%dHz)\n",
+ 	       		ivideo.video_width, ivideo.video_height, ivideo.video_bpp,
+ 			ivideo.refresh_rate);
+-			
++
+ 		default_var.xres = default_var.xres_virtual = ivideo.video_width;
+ 		default_var.yres = default_var.yres_virtual = ivideo.video_height;
+ 		default_var.bits_per_pixel = ivideo.video_bpp;
+-		
++
+ 		sisfb_bpp_to_var(&default_var);
+ 		
+ 		default_var.pixclock = (u32) (1E12 /
+@@ -4457,28 +4993,10 @@ int __init sisfb_init(void)
+ 			 &default_var.upper_margin, &default_var.lower_margin,
+ 			 &default_var.hsync_len, &default_var.vsync_len,
+ 			 &default_var.sync, &default_var.vmode)) {
+-			 
+-		   if((default_var.vmode & FB_VMODE_MASK) == FB_VMODE_INTERLACED) {
+-		      default_var.yres <<= 1;
+-		      default_var.yres_virtual <<= 1;
+-		   } else if((default_var.vmode	& FB_VMODE_MASK) == FB_VMODE_DOUBLE) {
+-		      default_var.pixclock >>= 1;
+-		      default_var.yres >>= 1;
+-		      default_var.yres_virtual >>= 1;
+-		   }
+-		   
++			if((default_var.vmode & FB_VMODE_MASK) == FB_VMODE_DOUBLE) {
++				default_var.pixclock <<= 1;
++	   		}
+ 	        }
+-#ifdef SISFB_PAN
+-		if(sisfb_ypan) {
+-	    		default_var.yres_virtual = 
+-				ivideo.heapstart / (default_var.xres * (default_var.bits_per_pixel >> 3));
+-	    		if(default_var.yres_virtual <= default_var.yres) {
+-	        		default_var.yres_virtual = default_var.yres;
+-	    		}
+-		} 
+-#endif
+-		
+-#endif
+ 
+ 		ivideo.accel = 0;
+ 		if(sisfb_accel) {
+@@ -4487,20 +5005,14 @@ int __init sisfb_init(void)
+ 		   sisfb_initaccel();
+ 		}
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)		/* ---- 2.4 series init ---- */
+-		sis_fb_info.node = -1;
+-		sis_fb_info.flags = FBINFO_FLAG_DEFAULT;
+-		sis_fb_info.blank = &sisfb_blank;
+-		sis_fb_info.fbops = &sisfb_ops;
+-		sis_fb_info.switch_con = &sisfb_switch;
+-		sis_fb_info.updatevar = &sisfb_update_var;
+-		sis_fb_info.changevar = NULL;
+-		sis_fb_info.disp = &sis_disp;
+-			
+-		sisfb_set_disp(-1, &default_var, &sis_fb_info);
+-#endif
++		if(sisfb_ypan) {
++	    		default_var.yres_virtual =
++				ivideo.heapstart / (default_var.xres * (default_var.bits_per_pixel >> 3));
++	    		if(default_var.yres_virtual <= default_var.yres) {
++	        		default_var.yres_virtual = default_var.yres;
++	    		}
++		}
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)		/* ---- 2.5 series init ---- */
+ 		sis_fb_info.flags = FBINFO_FLAG_DEFAULT;
+ 		sis_fb_info.var = default_var;
+ 		sis_fb_info.fix = sisfb_fix;
+@@ -4513,6 +5025,8 @@ int __init sisfb_init(void)
+ 		fb_alloc_cmap(&sis_fb_info.cmap, 256 , 0);
+ #endif
+ 
++		printk(KERN_INFO "sisfb: Initial vbflags 0x%lx\n", ivideo.vbflags);
++
+ #ifdef CONFIG_MTRR
+ 		ivideo.mtrr = mtrr_add((unsigned int) ivideo.video_base,
+ 				(unsigned int) ivideo.video_size,
+@@ -4520,20 +5034,28 @@ int __init sisfb_init(void)
+ 		if(ivideo.mtrr) {
+ 			printk(KERN_INFO "sisfb: Added MTRRs\n");
+ 		}
++
+ #endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ 		vc_resize_con(1, 1, 0);
+ #endif
+ 
+-		TWDEBUG("Before calling register_framebuffer");
+-		
+-		if(register_framebuffer(&sis_fb_info) < 0)
++		if(register_framebuffer(&sis_fb_info) < 0) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
++			vfree(sishw_ext.pSR);
++			vfree(sishw_ext.pCR);
++			release_mem_region(ivideo.video_base, ivideo.video_size);
++			release_mem_region(ivideo.mmio_base, sisfb_mmio_size);
++#endif
++			printk(KERN_ERR "sisfb: Fatal error: Failed to register framebuffer\n");
+ 			return -EINVAL;
+-			
++		}
++
+ 		sisfb_registered = 1;			
+ 
+ 		printk(KERN_INFO "sisfb: Installed SISFB_GET_INFO ioctl (%x)\n", SISFB_GET_INFO);
++		printk(KERN_INFO "sisfb: Installed SISFB_GET_VBRSTATUS ioctl (%x)\n", SISFB_GET_VBRSTATUS);
+ 		
+ 		printk(KERN_INFO "sisfb: 2D acceleration is %s, scrolling mode %s\n",
+ 		     sisfb_accel ? "enabled" : "disabled",
+@@ -4547,9 +5069,11 @@ int __init sisfb_init(void)
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+ 		printk(KERN_INFO "fb%d: %s frame buffer device, Version %d.%d.%02d\n",
+-	       		sis_fb_info.node, myid, VER_MAJOR, VER_MINOR, VER_LEVEL);			     
++	       		sis_fb_info.node, myid, VER_MAJOR, VER_MINOR, VER_LEVEL);
+ #endif
+ 
++		printk(KERN_INFO "sisfb: (C) 2001-2003 Thomas Winischhofer. All rights reserved.\n");
++
+ 	}	/* TW: if mode = "none" */
+ 	return 0;
+ }
+@@ -4562,7 +5086,6 @@ static int          vesa = -1;
+ static unsigned int rate = 0;
+ static unsigned int crt1off = 1;
+ static unsigned int mem = 0;
+-static unsigned int dstn = 0;
+ static char         *forcecrt2type = NULL;
+ static int          forcecrt1 = -1;
+ static char         *queuemode = NULL;
+@@ -4575,25 +5098,33 @@ static int          inverse = 0;
+ static int          userom = 1;
+ static int          useoem = -1;
+ static char         *tvstandard = NULL;
++static int	    nocrt2rate = 0;
++static int          scalelcd = -1;
++static char	    *specialtiming = NULL;
+ 
+-MODULE_DESCRIPTION("SiS 300/540/630/730/315/550/650/740/330 framebuffer driver");
++MODULE_DESCRIPTION("SiS 300/540/630/730/315/550/650/740/330/660/760 framebuffer driver");
+ MODULE_LICENSE("GPL");
+-MODULE_AUTHOR("SiS; Thomas Winischhofer <thomas@winischhofer.net>; Various others");
++MODULE_AUTHOR("Thomas Winischhofer <thomas@winischhofer.net>; SiS; Various others");
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ MODULE_PARM(mode, "s");
+ MODULE_PARM_DESC(mode,
+        "\nSelects the desired display mode in the format [X]x[Y]x[Depth], eg.\n"
+-         "800x600x16 (default: none if sisfb is a module; this leaves the\n"
+-	 "console untouched and the driver will only do the video memory\n"
+-	 "management for eg. DRM/DRI; 800x600x8 if sisfb is in the kernel)");
++         "1024x768x16. Other formats supported include XxY-Depth and\n"
++	 "XxY-Depth@Rate. If the parameter is only one (decimal or hexadecimal)\n"
++	 "number, it will be interpreted as a VESA mode number. (default: none if\n"
++	 "sisfb is a module; this leaves the console untouched and the driver will\n"
++	 "only do the video memory management for eg. DRM/DRI; 800x600x8 if sisfb\n"
++	 "is in the kernel)");
+ #endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)	 
+ MODULE_PARM(mode, "s");
+ MODULE_PARM_DESC(mode,
+-       "\nSelects the desired default display mode in the format [X]x[Y]x[Depth],\n"
+-         "eg. 1024x768x16 (default: 800x600x8)");
+-#endif	 
++       "\nSelects the desired default display mode in the format XxYxDepth,\n"
++         "eg. 1024x768x16. Other formats supported include XxY-Depth and\n"
++	 "XxY-Depth@Rate. If the parameter is only one (decimal or hexadecimal)\n"
++	 "number, it will be interpreted as a VESA mode number. (default: 800x600x8)");
++#endif
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ MODULE_PARM(vesa, "i");
+@@ -4603,17 +5134,18 @@ MODULE_PARM_DESC(vesa,
+ 	 "and the driver will only do the video memory management for eg. DRM/DRI;\n"
+ 	 "0x0103 if sisfb is in the kernel)");
+ #endif
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)	 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+ MODULE_PARM(vesa, "i");
+ MODULE_PARM_DESC(vesa,
+        "\nSelects the desired default display mode by VESA defined mode number, eg.\n"
+          "0x117 (default: 0x0103)");
+-#endif	 
++#endif
+ 
+ MODULE_PARM(rate, "i");
+ MODULE_PARM_DESC(rate,
+ 	"\nSelects the desired vertical refresh rate for CRT1 (external VGA) in Hz.\n"
+-	"(default: 60)");
++	  "If the mode is specified in the format XxY-Depth@Rate, this parameter\n"
++	  "will be ignored (default: 60)");
+ 
+ MODULE_PARM(crt1off,   "i");
+ MODULE_PARM_DESC(crt1off,
+@@ -4624,14 +5156,9 @@ MODULE_PARM_DESC(filter,
+ 	"\nSelects TV flicker filter type (only for systems with a SiS301 video bridge).\n"
+ 	  "(Possible values 0-7, default: [no filter])");
+ 
+-MODULE_PARM(dstn,   "i");
+-MODULE_PARM_DESC(dstn,
+-	"\nSelects DSTN/FSTN display mode for SiS550. This sets CRT2 type to LCD and\n"
+-	  "overrides forcecrt2type setting. (1=ON, 0=OFF) (default: 0)");
+-
+ MODULE_PARM(queuemode,   "s");
+ MODULE_PARM_DESC(queuemode,
+-	"\nSelects the queue mode on 315/550/650/740/330. Possible choices are AGP, VRAM or\n"
++	"\nSelects the queue mode on 315/550/650/740/330/660. Possible choices are AGP, VRAM,\n"
+   	  "MMIO. AGP is only available if the kernel has AGP support. The queue mode is\n"
+ 	  "important to programs using the 2D/3D accelerator of the SiS chip. The modes\n"
+ 	  "require a totally different way of programming the engines. If any mode than\n"
+@@ -4642,11 +5169,12 @@ MODULE_PARM_DESC(queuemode,
+ MODULE_PARM(mem,    "i");
+ MODULE_PARM_DESC(mem,
+ 	"\nDetermines the beginning of the video memory heap in KB. This heap is used\n"
+-	  "for video RAM management for eg. DRM/DRI. The default depends on the amount\n"
+-	  "of video RAM available. If 8MB of video RAM or less is available, the heap\n"
+-	  "starts at 4096KB, if between 8 and 16MB are available at 8192KB, otherwise\n"
+-	  "at 12288KB. The value is to be specified without 'KB' and should match\n"
+-	  "the MaxXFBMem setting for XFree 4.x (x>=2).");
++	  "for video RAM management for eg. DRM/DRI. On 300 series, the default depends\n"
++	  "on the amount of video RAM available. If 8MB of video RAM or less is available,\n"
++	  "the heap starts at 4096KB, if between 8 and 16MB are available at 8192KB,\n"
++	  "otherwise at 12288KB. On 315 and Xabre series, the heap is 1MB by default. The\n"
++	  "value is to be specified without 'KB' and should match the MaxXFBMem setting for\n"
++	  "XFree 4.x (x>=2).");
+ 
+ MODULE_PARM(forcecrt2type, "s");
+ MODULE_PARM_DESC(forcecrt2type,
+@@ -4673,56 +5201,76 @@ MODULE_PARM_DESC(pdc,
+ MODULE_PARM(noaccel, "i");
+ MODULE_PARM_DESC(noaccel,
+         "\nIf set to anything other than 0, 2D acceleration and y-panning will be\n"
+-	"disabled. (default: 0)");
++	  "disabled. (default: 0)");
+ 
+ MODULE_PARM(noypan, "i");
+ MODULE_PARM_DESC(noypan,
+         "\nIf set to anything other than 0, y-panning will be disabled and scrolling\n"
+-	"will be performed by redrawing the screen. This required 2D acceleration, so\n"
+-	"if the option noaccel is set, y-panning will be disabled. (default: 0)");
++ 	  "will be performed by redrawing the screen. (default: 0)");
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)	
+ MODULE_PARM(inverse, "i");
+ MODULE_PARM_DESC(inverse,
+         "\nSetting this to anything but 0 should invert the display colors, but this\n"
+-	"does not seem to work. (default: 0)");
++	  "does not seem to work. (default: 0)");
+ #endif	
+ 
+ MODULE_PARM(userom, "i");
+ MODULE_PARM_DESC(userom,
+         "\nSetting this to 0 keeps sisfb from using the video BIOS data which is needed\n"
+-	"for some LCD and TV setup. (default: 1)");
++	  "for some LCD and TV setup. (default: 1)");
+ 
+ MODULE_PARM(useoem, "i");
+ MODULE_PARM_DESC(useoem,
+         "\nSetting this to 0 keeps sisfb from using its internel OEM data for some LCD\n"
+-	"panels and TV connector types. (default: auto)");
++	  "panels and TV connector types. (default: [auto])");
+ 
+ MODULE_PARM(tvstandard, "s");
+ MODULE_PARM_DESC(tvstandard,
+ 	"\nThis allows overriding the BIOS default for the TV standard. Valid choices are\n"
+-	"pal and ntsc. (default: auto)");
++	  "pal and ntsc. (default: [auto])");
++
++MODULE_PARM(nocrt2rate, "i");
++MODULE_PARM_DESC(nocrt2rate,
++	"\nSetting this to 1 will force the driver to use the default refresh rate for\n"
++	  "CRT2 if CRT2 type is VGA. (default: 0, use same rate as CRT1)");
++
++MODULE_PARM(scalelcd, "i");
++MODULE_PARM_DESC(scalelcd,
++	"\nSetting this to 1 will force the driver to scale the LCD image to the panel's\n"
++	  "native resolution. Setting it to 0 will disable scaling; if the panel can scale\n"
++	  "by itself, it will probably do this, otherwise you will see a black bar around\n"
++	  "the screen image. Default: [autodetect if panel can scale]");
++
++MODULE_PARM(specialtiming, "s");
+ 
+ int init_module(void)
+ {
+ 	int err;
+-	
++
++	SiS_Pr.UsePanelScaler = -1;
++	SiS_Pr.SiS_CustomT = CUT_NONE;
++
++	ivideo.refresh_rate = sisfb_parm_rate = rate;
++
++	if((scalelcd == 0) || (scalelcd == 1)) {
++	   SiS_Pr.UsePanelScaler = scalelcd ^ 1;
++	}
++
+ 	if(mode)
+-		sisfb_search_mode(mode);
++		sisfb_search_mode(mode, FALSE);
+ 	else if(vesa != -1)
+-		sisfb_search_vesamode(vesa);
+-	else  
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)	
++		sisfb_search_vesamode(vesa, FALSE);
++	else
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ 		/* For 2.4, set mode=none if no mode is given  */
+ 		sisfb_mode_idx = MODE_INDEX_NONE;
+ #endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+-		/* For 2.5, we don't need this "mode=none" stuff anymore */	
++		/* For 2.5, we don't need this "mode=none" stuff anymore */
+ 		sisfb_mode_idx = DEFAULT_MODE;
+ #endif
+ 
+-	ivideo.refresh_rate = rate;
+-
+ 	if(forcecrt2type)
+ 		sisfb_search_crt2type(forcecrt2type);
+ 
+@@ -4745,9 +5293,6 @@ int init_module(void)
+ 
+ 	if(noypan == 1)       sisfb_ypan = 0;
+ 	else if(noypan == 0)  sisfb_ypan = 1;
+-
+-	/* TW: Panning only with acceleration */
+-	if(sisfb_accel == 0)  sisfb_ypan = 0;
+ 	
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ 	if(inverse)           sisfb_inverse = 1;
+@@ -4759,17 +5304,11 @@ int init_module(void)
+ 
+ 	sisfb_useoem = useoem;
+ 
+-	enable_dstn = dstn;
+-
+-	/* TW: DSTN overrules forcecrt2type */
+-	if (enable_dstn)      sisfb_crt2type = DISPTYPE_LCD;
+-
+ 	if (queuemode)        sisfb_search_queuemode(queuemode);
+ 	
+ 	/* TW: If other queuemode than MMIO, disable 2D accel and ypan */
+ 	if((sisfb_queuemode != -1) && (sisfb_queuemode != MMIO_CMD)) {
+ 	        sisfb_accel = 0;
+-		sisfb_ypan = 0;
+ 	}
+ 
+         if(pdc) {
+@@ -4778,6 +5317,11 @@ int init_module(void)
+ 	   }
+ 	}
+ 
++	sisfb_nocrt2rate = nocrt2rate;
++
++	if(specialtiming)
++		sisfb_search_specialtiming(specialtiming);
++
+ 	if((err = sisfb_init()) < 0) return err;
+ 
+ 	return 0;
+@@ -4788,7 +5332,7 @@ void cleanup_module(void)
+ 	/* TW: Release mem regions */
+ 	release_mem_region(ivideo.video_base, ivideo.video_size);
+ 	release_mem_region(ivideo.mmio_base, sisfb_mmio_size);
+-	
++
+ #ifdef CONFIG_MTRR
+ 	/* TW: Release MTRR region */
+ 	if(ivideo.mtrr) {
+@@ -4802,11 +5346,17 @@ void cleanup_module(void)
+ 	if(sisfb_registered) {
+ 		unregister_framebuffer(&sis_fb_info);
+ 	}
+-	
++
+ 	if(sishw_ext.pSR) vfree(sishw_ext.pSR);
+ 	if(sishw_ext.pCR) vfree(sishw_ext.pCR);
+ 	
+-	/* TODO: Restore the initial mode */
++	/* TODO: Restore the initial mode
++	 * This sounds easy but is as good as impossible
++	 * on many machines with SiS chip and video bridge
++	 * since text modes are always set up differently
++	 * from machine to machine. Depends on the type
++	 * of integration between chipset and bridge.
++	 */
+ 	
+ 	printk(KERN_INFO "sisfb: Module unloaded\n");
+ }
+--- linux-2.6.0-test6/drivers/video/sis/sis_main.h	2003-06-14 12:18:04.000000000 -0700
++++ 25/drivers/video/sis/sis_main.h	2003-10-05 00:34:22.000000000 -0700
+@@ -1,8 +1,6 @@
+ #ifndef _SISFB_MAIN
+ #define _SISFB_MAIN
+ 
+-/* Comments and changes marked with "TW" by Thomas Winischhofer <thomas@winischhofer.net> */
+-
+ #include "vstruct.h"
+ 
+ /* ------------------- Constant Definitions ------------------------- */
+@@ -14,11 +12,11 @@
+ 
+ #define VER_MAJOR                 1
+ #define VER_MINOR                 6
+-#define VER_LEVEL                 1
++#define VER_LEVEL                 13
+ 
+ #include "sis.h"
+ 
+-/* TW: To be included in pci_ids.h */
++/* To be included in pci_ids.h */
+ #ifndef PCI_DEVICE_ID_SI_650_VGA
+ #define PCI_DEVICE_ID_SI_650_VGA  0x6325
+ #endif
+@@ -31,13 +29,22 @@
+ #ifndef PCI_DEVICE_ID_SI_330
+ #define PCI_DEVICE_ID_SI_330      0x0330
+ #endif
++#ifndef PCI_DEVICE_ID_SI_660
++#define PCI_DEVICE_ID_SI_660      0x0660
++#endif
++#ifndef PCI_DEVICE_ID_SI_660_VGA
++#define PCI_DEVICE_ID_SI_660_VGA  0x6330
++#endif
++#ifndef PCI_DEVICE_ID_SI_760
++#define PCI_DEVICE_ID_SI_760      0x0760
++#endif
+ 
+ /* To be included in fb.h */
+ #ifndef FB_ACCEL_SIS_GLAMOUR_2
+ #define FB_ACCEL_SIS_GLAMOUR_2  40	/* SiS 315, 650, 740		*/
+ #endif
+ #ifndef FB_ACCEL_SIS_XABRE
+-#define FB_ACCEL_SIS_XABRE      41	/* SiS 330 ("Xabre")		*/
++#define FB_ACCEL_SIS_XABRE      41	/* SiS 330, 660, 760 ("Xabre")	*/
+ #endif
+ 
+ #define MAX_ROM_SCAN              0x10000
+@@ -53,13 +60,12 @@
+ #define TURBO_QUEUE_AREA_SIZE     0x80000 /* 512K */
+ #endif
+ 
+-/* For 315 series */
++/* For 315/Xabre series */
+ #ifdef CONFIG_FB_SIS_315
+ #define COMMAND_QUEUE_AREA_SIZE   0x80000 /* 512K */
+ #define COMMAND_QUEUE_THRESHOLD   0x1F
+ #endif
+ 
+-/* TW */
+ #define HW_CURSOR_AREA_SIZE_315   0x4000  /* 16K */
+ #define HW_CURSOR_AREA_SIZE_300   0x1000  /* 4K */
+ 
+@@ -283,48 +289,46 @@
+ /* Fbcon variables */
+ static struct fb_info sis_fb_info;
+ 
+-static int    video_type = FB_TYPE_PACKED_PIXELS;
+-
+ static struct fb_var_screeninfo default_var = {
+-	.xres		= 0,
+-	.yres		= 0,
+-	.xres_virtual	= 0,
+-	.yres_virtual	= 0,
+-	.xoffset	= 0,
+-	.yoffset	= 0,
+-	.bits_per_pixel	= 0,
+-	.grayscale	= 0,
+-	.red		= {0, 8, 0},
+-	.green		= {0, 8, 0},
+-	.blue		= {0, 8, 0},
+-	.transp		= {0, 0, 0},
+-	.nonstd		= 0,
+-	.activate	= FB_ACTIVATE_NOW,
+-	.height		= -1,
+-	.width		= -1,
+-	.accel_flags	= 0,
+-	.pixclock	= 0,
+-	.left_margin	= 0,
+-	.right_margin	= 0,
+-	.upper_margin	= 0,
+-	.lower_margin	= 0,
+-	.hsync_len	= 0,
+-	.vsync_len	= 0,
+-	.sync		= 0,
+-	.vmode		= FB_VMODE_NONINTERLACED,
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)	
+-	.reserved	= {0, 0, 0, 0, 0, 0}
+-#endif	
++	.xres            = 0,
++	.yres            = 0,
++	.xres_virtual    = 0,
++	.yres_virtual    = 0,
++	.xoffset         = 0,
++	.yoffset         = 0,
++	.bits_per_pixel  = 0,
++	.grayscale       = 0,
++	.red             = {0, 8, 0},
++	.green           = {0, 8, 0},
++	.blue            = {0, 8, 0},
++	.transp          = {0, 0, 0},
++	.nonstd          = 0,
++	.activate        = FB_ACTIVATE_NOW,
++	.height          = -1,
++	.width           = -1,
++	.accel_flags     = 0,
++	.pixclock        = 0,
++	.left_margin     = 0,
++	.right_margin    = 0,
++	.upper_margin    = 0,
++	.lower_margin    = 0,
++	.hsync_len       = 0,
++	.vsync_len       = 0,
++	.sync            = 0,
++	.vmode           = FB_VMODE_NONINTERLACED,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
++	.reserved        = {0, 0, 0, 0, 0, 0}
++#endif
+ };
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
+ static struct fb_fix_screeninfo sisfb_fix = {
+ 	.id		= "SiS",
+ 	.type		= FB_TYPE_PACKED_PIXELS,
+-	.xpanstep	= 1,
++	.xpanstep	= 0,
+ 	.ypanstep	= 1,
+ };
+-static char myid[20];
++static char myid[40];
+ static u32 pseudo_palette[17];
+ #endif
+ 
+@@ -347,26 +351,24 @@ static union {
+ } sis_fbcon_cmap;
+ 
+ static int sisfb_inverse = 0;
++static int currcon = 0;
+ #endif
+ 
+-/* display status */
++/* global flags */
+ static int sisfb_off = 0;
+ static int sisfb_crt1off = 0;
+ static int sisfb_forcecrt1 = -1;
+ static int sisvga_enabled = 0;
+ static int sisfb_userom = 1;
+ static int sisfb_useoem = -1;
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+-static int currcon = 0;
+-#endif
+-
+-/* global flags */
+-static int sisfb_registered;
+-static int sisfb_tvmode = 0;
++static int sisfb_parm_rate = -1;
++static int sisfb_registered = 0;
+ static int sisfb_mem = 0;
+ static int sisfb_pdc = 0;
+-static int enable_dstn = 0;
+ static int sisfb_ypan = -1;
++static int sisfb_nocrt2rate = 0;
++static int sisfb_dstn = 0;
++static int sisfb_fstn = 0;
+ 
+ VGA_ENGINE sisvga_engine = UNKNOWN_VGA;
+ int 	   sisfb_accel = -1;
+@@ -375,22 +377,22 @@ int 	   sisfb_accel = -1;
+ static int sisfb_hwcursor_size = 0;
+ static int sisfb_CRT2_write_enable = 0;
+ 
+-int sisfb_crt2type  = -1;	/* TW: CRT2 type (for overriding autodetection) */
+-int sisfb_tvplug    = -1;	/* PR: Tv plug type (for overriding autodetection) */
++int sisfb_crt2type  = -1;	/* CRT2 type (for overriding autodetection) */
++int sisfb_tvplug    = -1;	/* Tv plug type (for overriding autodetection) */
+ 
+-int sisfb_queuemode = -1; 	/* TW: Use MMIO queue mode by default (310/325 series only) */
++int sisfb_queuemode = -1; 	/* Use MMIO queue mode by default (315 series only) */
+ 
+ unsigned char sisfb_detectedpdc = 0;
+ 
+ unsigned char sisfb_detectedlcda = 0xff;
+ 
+-/* data for sis components */
++/* data for sis hardware ("par") */
+ struct video_info ivideo;
+ 
+-/* TW: For ioctl SISFB_GET_INFO */
++/* For ioctl SISFB_GET_INFO */
+ sisfb_info sisfbinfo;
+ 
+-/* TW: Hardware extension; contains data on hardware */
++/* Hardware extension; contains data on hardware */
+ HW_DEVICE_EXTENSION sishw_ext = {
+ 	NULL, NULL, FALSE, NULL, NULL,
+ 	0, 0, 0, 0, 0, 0, 0, 0, 0,
+@@ -399,10 +401,10 @@ HW_DEVICE_EXTENSION sishw_ext = {
+ 	0
+ };
+ 
+-/* TW: SiS private structure */
++/* SiS private structure */
+ SiS_Private  SiS_Pr;
+ 
+-/* card parameters */
++/* Card parameters */
+ static unsigned long sisfb_mmio_size = 0;
+ static u8            sisfb_caps = 0;
+ 
+@@ -412,7 +414,7 @@ typedef enum _SIS_CMDTYPE {
+ 	VM_CMD_QUEUE,
+ } SIS_CMDTYPE;
+ 
+-/* Supported SiS Chips list */
++/* List of supported chips */
+ static struct board {
+ 	u16 vendor, device;
+ 	const char *name;
+@@ -424,16 +426,17 @@ static struct board {
+ 	{PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_315,     "SIS 315"},
+ 	{PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_315PRO,  "SIS 315PRO"},
+ 	{PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_550_VGA, "SIS 550 VGA"},
+-	{PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_650_VGA, "SIS 650/M650/651/740 VGA"},
++	{PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_650_VGA, "SIS 650/M650/651/M652/740 VGA"},
+ 	{PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_330,     "SIS 330"},
++	{PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_660_VGA, "SIS 660/M660/760/M760 VGA"},
+ 	{0, 0, NULL}
+ };
+ 
+ #define MD_SIS300 1
+ #define MD_SIS315 2
+ 
+-/* mode table */
+-/* NOT const - will be patched for 1280x960 mode number chaos reasons */
++/* Mode table */
++/* NOT const - will be patched for 1280x768 mode number chaos reasons */
+ struct _sisbios_mode {
+ 	char name[15];
+ 	u8 mode_no;
+@@ -447,14 +450,33 @@ struct _sisbios_mode {
+ 	u16 rows;
+ 	u8  chipset;
+ } sisbios_mode[] = {
+-#define MODE_INDEX_NONE           0  /* TW: index for mode=none */
+-	{"none",         0xFF, 0x0000, 0x0000,    0,    0,  0, 0,   0,  0, MD_SIS300|MD_SIS315},  /* TW: for mode "none" */
+-	{"320x240x16",   0x56, 0x0000, 0x0000,  320,  240, 16, 1,  40, 15,           MD_SIS315},
+-	{"320x480x8",    0x5A, 0x0000, 0x0000,  320,  480,  8, 1,  40, 30,           MD_SIS315},  /* TW: FSTN */
+-	{"320x480x16",   0x5B, 0x0000, 0x0000,  320,  480, 16, 1,  40, 30,           MD_SIS315},  /* TW: FSTN */
+-	{"640x480x8",    0x2E, 0x0101, 0x0101,  640,  480,  8, 1,  80, 30, MD_SIS300|MD_SIS315},
++#define MODE_INDEX_NONE           0  /* index for mode=none */
++	{"none",         0xff, 0x0000, 0x0000,    0,    0,  0, 0,   0,  0, MD_SIS300|MD_SIS315},
++	{"320x200x8",    0x59, 0x0138, 0x0000,  320,  200,  8, 1,  40, 12, MD_SIS300|MD_SIS315},
++	{"320x200x16",   0x41, 0x010e, 0x0000,  320,  200, 16, 1,  40, 12, MD_SIS300|MD_SIS315},
++	{"320x200x24",   0x4f, 0x0000, 0x0000,  320,  200, 32, 1,  40, 12, MD_SIS300|MD_SIS315},  /* TW: That's for people who mix up color- and fb depth */
++	{"320x200x32",   0x4f, 0x0000, 0x0000,  320,  200, 32, 1,  40, 12, MD_SIS300|MD_SIS315},
++	{"320x240x8",    0x50, 0x0132, 0x0000,  320,  240,  8, 1,  40, 15, MD_SIS300|MD_SIS315},
++	{"320x240x16",   0x56, 0x0135, 0x0000,  320,  240, 16, 1,  40, 15, MD_SIS300|MD_SIS315},
++	{"320x240x24",   0x53, 0x0000, 0x0000,  320,  240, 32, 1,  40, 15, MD_SIS300|MD_SIS315},
++	{"320x240x32",   0x53, 0x0000, 0x0000,  320,  240, 32, 1,  40, 15, MD_SIS300|MD_SIS315},
++	{"320x240x8",    0x5a, 0x0132, 0x0000,  320,  480,  8, 1,  40, 30,           MD_SIS315},  /* TW: FSTN */
++	{"320x240x16",   0x5b, 0x0135, 0x0000,  320,  480, 16, 1,  40, 30,           MD_SIS315},  /* TW: FSTN */
++	{"400x300x8",    0x51, 0x0133, 0x0000,  400,  300,  8, 1,  50, 18, MD_SIS300|MD_SIS315},
++	{"400x300x16",   0x57, 0x0136, 0x0000,  400,  300, 16, 1,  50, 18, MD_SIS300|MD_SIS315},
++	{"400x300x24",   0x54, 0x0000, 0x0000,  400,  300, 32, 1,  50, 18, MD_SIS300|MD_SIS315},
++	{"400x300x32",   0x54, 0x0000, 0x0000,  400,  300, 32, 1,  50, 18, MD_SIS300|MD_SIS315},
++	{"512x384x8",    0x52, 0x0000, 0x0000,  512,  384,  8, 1,  64, 24, MD_SIS300|MD_SIS315},
++	{"512x384x16",   0x58, 0x0000, 0x0000,  512,  384, 16, 1,  64, 24, MD_SIS300|MD_SIS315},
++	{"512x384x24",   0x5c, 0x0000, 0x0000,  512,  384, 32, 1,  64, 24, MD_SIS300|MD_SIS315},
++	{"512x384x32",   0x5c, 0x0000, 0x0000,  512,  384, 32, 1,  64, 24, MD_SIS300|MD_SIS315},
++	{"640x400x8",    0x2f, 0x0000, 0x0000,  640,  400,  8, 1,  80, 25, MD_SIS300|MD_SIS315},
++	{"640x400x16",   0x5d, 0x0000, 0x0000,  640,  400, 16, 1,  80, 25, MD_SIS300|MD_SIS315},
++	{"640x400x24",   0x5e, 0x0000, 0x0000,  640,  400, 32, 1,  80, 25, MD_SIS300|MD_SIS315},
++	{"640x400x32",   0x5e, 0x0000, 0x0000,  640,  400, 32, 1,  80, 25, MD_SIS300|MD_SIS315},
++	{"640x480x8",    0x2e, 0x0101, 0x0101,  640,  480,  8, 1,  80, 30, MD_SIS300|MD_SIS315},
+ 	{"640x480x16",   0x44, 0x0111, 0x0111,  640,  480, 16, 1,  80, 30, MD_SIS300|MD_SIS315},
+-	{"640x480x24",   0x62, 0x013a, 0x0112,  640,  480, 32, 1,  80, 30, MD_SIS300|MD_SIS315},  /* TW: That's for people who mix up color- and fb depth */
++	{"640x480x24",   0x62, 0x013a, 0x0112,  640,  480, 32, 1,  80, 30, MD_SIS300|MD_SIS315},
+ 	{"640x480x32",   0x62, 0x013a, 0x0112,  640,  480, 32, 1,  80, 30, MD_SIS300|MD_SIS315},
+ 	{"720x480x8",    0x31, 0x0000, 0x0000,  720,  480,  8, 1,  90, 30, MD_SIS300|MD_SIS315},
+ 	{"720x480x16",   0x33, 0x0000, 0x0000,  720,  480, 16, 1,  90, 30, MD_SIS300|MD_SIS315},
+@@ -464,63 +486,87 @@ struct _sisbios_mode {
+ 	{"720x576x16",   0x34, 0x0000, 0x0000,  720,  576, 16, 1,  90, 36, MD_SIS300|MD_SIS315},
+ 	{"720x576x24",   0x36, 0x0000, 0x0000,  720,  576, 32, 1,  90, 36, MD_SIS300|MD_SIS315},
+ 	{"720x576x32",   0x36, 0x0000, 0x0000,  720,  576, 32, 1,  90, 36, MD_SIS300|MD_SIS315},
++	{"768x576x8",    0x5f, 0x0000, 0x0000,  768,  576,  8, 1,  96, 36, MD_SIS300|MD_SIS315},
++	{"768x576x16",   0x60, 0x0000, 0x0000,  768,  576, 16, 1,  96, 36, MD_SIS300|MD_SIS315},
++	{"768x576x24",   0x61, 0x0000, 0x0000,  768,  576, 32, 1,  96, 36, MD_SIS300|MD_SIS315},
++	{"768x576x32",   0x61, 0x0000, 0x0000,  768,  576, 32, 1,  96, 36, MD_SIS300|MD_SIS315},
+ 	{"800x480x8",    0x70, 0x0000, 0x0000,  800,  480,  8, 1, 100, 30, MD_SIS300|MD_SIS315},
+ 	{"800x480x16",   0x7a, 0x0000, 0x0000,  800,  480, 16, 1, 100, 30, MD_SIS300|MD_SIS315},
+ 	{"800x480x24",   0x76, 0x0000, 0x0000,  800,  480, 32, 1, 100, 30, MD_SIS300|MD_SIS315},
+ 	{"800x480x32",   0x76, 0x0000, 0x0000,  800,  480, 32, 1, 100, 30, MD_SIS300|MD_SIS315},
+-#define DEFAULT_MODE              20 /* TW: index for 800x600x8 */
+-#define DEFAULT_LCDMODE           20 /* TW: index for 800x600x8 */
+-#define DEFAULT_TVMODE            20 /* TW: index for 800x600x8 */
++#define DEFAULT_MODE              43 /* index for 800x600x8 */
++#define DEFAULT_LCDMODE           43 /* index for 800x600x8 */
++#define DEFAULT_TVMODE            43 /* index for 800x600x8 */
+ 	{"800x600x8",    0x30, 0x0103, 0x0103,  800,  600,  8, 2, 100, 37, MD_SIS300|MD_SIS315},
+ 	{"800x600x16",   0x47, 0x0114, 0x0114,  800,  600, 16, 2, 100, 37, MD_SIS300|MD_SIS315},
+ 	{"800x600x24",   0x63, 0x013b, 0x0115,  800,  600, 32, 2, 100, 37, MD_SIS300|MD_SIS315},
+ 	{"800x600x32",   0x63, 0x013b, 0x0115,  800,  600, 32, 2, 100, 37, MD_SIS300|MD_SIS315},
++	{"848x480x8",    0x39, 0x0000, 0x0000,  848,  480,  8, 2, 106, 30, MD_SIS300|MD_SIS315},
++	{"848x480x16",   0x3b, 0x0000, 0x0000,  848,  480, 16, 2, 106, 30, MD_SIS300|MD_SIS315},
++	{"848x480x24",   0x3e, 0x0000, 0x0000,  848,  480, 32, 2, 106, 30, MD_SIS300|MD_SIS315},
++	{"848x480x32",   0x3e, 0x0000, 0x0000,  848,  480, 32, 2, 106, 30, MD_SIS300|MD_SIS315},
++	{"856x480x8",    0x3f, 0x0000, 0x0000,  856,  480,  8, 2, 107, 30, MD_SIS300|MD_SIS315},
++	{"856x480x16",   0x42, 0x0000, 0x0000,  856,  480, 16, 2, 107, 30, MD_SIS300|MD_SIS315},
++	{"856x480x24",   0x45, 0x0000, 0x0000,  856,  480, 32, 2, 107, 30, MD_SIS300|MD_SIS315},
++	{"856x480x32",   0x45, 0x0000, 0x0000,  856,  480, 32, 2, 107, 30, MD_SIS300|MD_SIS315},
+ 	{"1024x576x8",   0x71, 0x0000, 0x0000, 1024,  576,  8, 1, 128, 36, MD_SIS300|MD_SIS315},
+ 	{"1024x576x16",  0x74, 0x0000, 0x0000, 1024,  576, 16, 1, 128, 36, MD_SIS300|MD_SIS315},
+ 	{"1024x576x24",  0x77, 0x0000, 0x0000, 1024,  576, 32, 1, 128, 36, MD_SIS300|MD_SIS315},
+ 	{"1024x576x32",  0x77, 0x0000, 0x0000, 1024,  576, 32, 1, 128, 36, MD_SIS300|MD_SIS315},
+-	{"1024x600x8",   0x20, 0x0000, 0x0000, 1024,  600,  8, 1, 128, 37, MD_SIS300          },  /* TW: 300 series only */
++	{"1024x600x8",   0x20, 0x0000, 0x0000, 1024,  600,  8, 1, 128, 37, MD_SIS300          },
+ 	{"1024x600x16",  0x21, 0x0000, 0x0000, 1024,  600, 16, 1, 128, 37, MD_SIS300          },
+ 	{"1024x600x24",  0x22, 0x0000, 0x0000, 1024,  600, 32, 1, 128, 37, MD_SIS300          },
+ 	{"1024x600x32",  0x22, 0x0000, 0x0000, 1024,  600, 32, 1, 128, 37, MD_SIS300          },
+ 	{"1024x768x8",   0x38, 0x0105, 0x0105, 1024,  768,  8, 2, 128, 48, MD_SIS300|MD_SIS315},
+-	{"1024x768x16",  0x4A, 0x0117, 0x0117, 1024,  768, 16, 2, 128, 48, MD_SIS300|MD_SIS315},
++	{"1024x768x16",  0x4a, 0x0117, 0x0117, 1024,  768, 16, 2, 128, 48, MD_SIS300|MD_SIS315},
+ 	{"1024x768x24",  0x64, 0x013c, 0x0118, 1024,  768, 32, 2, 128, 48, MD_SIS300|MD_SIS315},
+ 	{"1024x768x32",  0x64, 0x013c, 0x0118, 1024,  768, 32, 2, 128, 48, MD_SIS300|MD_SIS315},
+-	{"1152x768x8",   0x23, 0x0000, 0x0000, 1152,  768,  8, 1, 144, 48, MD_SIS300          },  /* TW: 300 series only */
++	{"1152x768x8",   0x23, 0x0000, 0x0000, 1152,  768,  8, 1, 144, 48, MD_SIS300          },
+ 	{"1152x768x16",  0x24, 0x0000, 0x0000, 1152,  768, 16, 1, 144, 48, MD_SIS300          },
+ 	{"1152x768x24",  0x25, 0x0000, 0x0000, 1152,  768, 32, 1, 144, 48, MD_SIS300          },
+ 	{"1152x768x32",  0x25, 0x0000, 0x0000, 1152,  768, 32, 1, 144, 48, MD_SIS300          },
++	{"1152x864x8",   0x29, 0x0000, 0x0000, 1152,  864,  8, 1, 144, 54, MD_SIS300|MD_SIS315},
++	{"1152x864x16",  0x2a, 0x0000, 0x0000, 1152,  864, 16, 1, 144, 54, MD_SIS300|MD_SIS315},
++	{"1152x864x24",  0x2b, 0x0000, 0x0000, 1152,  864, 32, 1, 144, 54, MD_SIS300|MD_SIS315},
++	{"1152x864x32",  0x2b, 0x0000, 0x0000, 1152,  864, 32, 1, 144, 54, MD_SIS300|MD_SIS315},
+ 	{"1280x720x8",   0x79, 0x0000, 0x0000, 1280,  720,  8, 1, 160, 45, MD_SIS300|MD_SIS315},
+ 	{"1280x720x16",  0x75, 0x0000, 0x0000, 1280,  720, 16, 1, 160, 45, MD_SIS300|MD_SIS315},
+ 	{"1280x720x24",  0x78, 0x0000, 0x0000, 1280,  720, 32, 1, 160, 45, MD_SIS300|MD_SIS315},
+ 	{"1280x720x32",  0x78, 0x0000, 0x0000, 1280,  720, 32, 1, 160, 45, MD_SIS300|MD_SIS315},
+-	{"1280x768x8",   0x23, 0x0000, 0x0000, 1280,  768,  8, 1, 160, 48,           MD_SIS315},  /* TW: 310/325 series only */
+-	{"1280x768x16",  0x24, 0x0000, 0x0000, 1280,  768, 16, 1, 160, 48,           MD_SIS315},
+-	{"1280x768x24",  0x25, 0x0000, 0x0000, 1280,  768, 32, 1, 160, 48,           MD_SIS315},
+-	{"1280x768x32",  0x25, 0x0000, 0x0000, 1280,  768, 32, 1, 160, 48,           MD_SIS315},
+-#define MODEINDEX_1280x960 48
+-	{"1280x960x8",   0x7C, 0x0000, 0x0000, 1280,  960,  8, 1, 160, 60, MD_SIS300|MD_SIS315},  /* TW: Modenumbers being patched */
+-	{"1280x960x16",  0x7D, 0x0000, 0x0000, 1280,  960, 16, 1, 160, 60, MD_SIS300|MD_SIS315},
+-	{"1280x960x24",  0x7E, 0x0000, 0x0000, 1280,  960, 32, 1, 160, 60, MD_SIS300|MD_SIS315},
+-	{"1280x960x32",  0x7E, 0x0000, 0x0000, 1280,  960, 32, 1, 160, 60, MD_SIS300|MD_SIS315},
+-	{"1280x1024x8",  0x3A, 0x0107, 0x0107, 1280, 1024,  8, 2, 160, 64, MD_SIS300|MD_SIS315},
+-	{"1280x1024x16", 0x4D, 0x011a, 0x011a, 1280, 1024, 16, 2, 160, 64, MD_SIS300|MD_SIS315},
++#define MODEINDEX_1280x768 79
++	{"1280x768x8",   0x23, 0x0000, 0x0000, 1280,  768,  8, 1, 160, 48, MD_SIS300|MD_SIS315},
++	{"1280x768x16",  0x24, 0x0000, 0x0000, 1280,  768, 16, 1, 160, 48, MD_SIS300|MD_SIS315},
++	{"1280x768x24",  0x25, 0x0000, 0x0000, 1280,  768, 32, 1, 160, 48, MD_SIS300|MD_SIS315},
++	{"1280x768x32",  0x25, 0x0000, 0x0000, 1280,  768, 32, 1, 160, 48, MD_SIS300|MD_SIS315},
++	{"1280x960x8",   0x7c, 0x0000, 0x0000, 1280,  960,  8, 1, 160, 60, MD_SIS300|MD_SIS315},
++	{"1280x960x16",  0x7d, 0x0000, 0x0000, 1280,  960, 16, 1, 160, 60, MD_SIS300|MD_SIS315},
++	{"1280x960x24",  0x7e, 0x0000, 0x0000, 1280,  960, 32, 1, 160, 60, MD_SIS300|MD_SIS315},
++	{"1280x960x32",  0x7e, 0x0000, 0x0000, 1280,  960, 32, 1, 160, 60, MD_SIS300|MD_SIS315},
++	{"1280x1024x8",  0x3a, 0x0107, 0x0107, 1280, 1024,  8, 2, 160, 64, MD_SIS300|MD_SIS315},
++	{"1280x1024x16", 0x4d, 0x011a, 0x011a, 1280, 1024, 16, 2, 160, 64, MD_SIS300|MD_SIS315},
+ 	{"1280x1024x24", 0x65, 0x013d, 0x011b, 1280, 1024, 32, 2, 160, 64, MD_SIS300|MD_SIS315},
+ 	{"1280x1024x32", 0x65, 0x013d, 0x011b, 1280, 1024, 32, 2, 160, 64, MD_SIS300|MD_SIS315},
+-	{"1400x1050x8",  0x26, 0x0000, 0x0000, 1400, 1050,  8, 1, 175, 65,           MD_SIS315},  /* TW: 310/325 series only */
++	{"1360x768x8",   0x48, 0x0000, 0x0000, 1360,  768,  8, 1, 170, 48, MD_SIS300|MD_SIS315},
++	{"1360x768x16",  0x4b, 0x0000, 0x0000, 1360,  768, 16, 1, 170, 48, MD_SIS300|MD_SIS315},
++	{"1360x768x24",  0x4e, 0x0000, 0x0000, 1360,  768, 32, 1, 170, 48, MD_SIS300|MD_SIS315},
++	{"1360x768x32",  0x4e, 0x0000, 0x0000, 1360,  768, 32, 1, 170, 48, MD_SIS300|MD_SIS315},
++	{"1360x1024x8",  0x67, 0x0000, 0x0000, 1360, 1024,  8, 1, 170, 64, MD_SIS300          },
++	{"1360x1024x16", 0x6f, 0x0000, 0x0000, 1360, 1024, 16, 1, 170, 64, MD_SIS300          },
++	{"1360x1024x24", 0x72, 0x0000, 0x0000, 1360, 1024, 32, 1, 170, 64, MD_SIS300          },
++	{"1360x1024x32", 0x72, 0x0000, 0x0000, 1360, 1024, 32, 1, 170, 64, MD_SIS300          },
++	{"1400x1050x8",  0x26, 0x0000, 0x0000, 1400, 1050,  8, 1, 175, 65,           MD_SIS315},
+ 	{"1400x1050x16", 0x27, 0x0000, 0x0000, 1400, 1050, 16, 1, 175, 65,           MD_SIS315},
+ 	{"1400x1050x24", 0x28, 0x0000, 0x0000, 1400, 1050, 32, 1, 175, 65,           MD_SIS315},
+ 	{"1400x1050x32", 0x28, 0x0000, 0x0000, 1400, 1050, 32, 1, 175, 65,           MD_SIS315},
+-	{"1600x1200x8",  0x3C, 0x0130, 0x011c, 1600, 1200,  8, 1, 200, 75, MD_SIS300|MD_SIS315},
+-	{"1600x1200x16", 0x3D, 0x0131, 0x011e, 1600, 1200, 16, 1, 200, 75, MD_SIS300|MD_SIS315},
++	{"1600x1200x8",  0x3c, 0x0130, 0x011c, 1600, 1200,  8, 1, 200, 75, MD_SIS300|MD_SIS315},
++	{"1600x1200x16", 0x3d, 0x0131, 0x011e, 1600, 1200, 16, 1, 200, 75, MD_SIS300|MD_SIS315},
+ 	{"1600x1200x24", 0x66, 0x013e, 0x011f, 1600, 1200, 32, 1, 200, 75, MD_SIS300|MD_SIS315},
+ 	{"1600x1200x32", 0x66, 0x013e, 0x011f, 1600, 1200, 32, 1, 200, 75, MD_SIS300|MD_SIS315},
+ 	{"1920x1440x8",  0x68, 0x013f, 0x0000, 1920, 1440,  8, 1, 240, 75, MD_SIS300|MD_SIS315},
+ 	{"1920x1440x16", 0x69, 0x0140, 0x0000, 1920, 1440, 16, 1, 240, 75, MD_SIS300|MD_SIS315},
+-	{"1920x1440x24", 0x6B, 0x0141, 0x0000, 1920, 1440, 32, 1, 240, 75, MD_SIS300|MD_SIS315},
+-	{"1920x1440x32", 0x6B, 0x0141, 0x0000, 1920, 1440, 32, 1, 240, 75, MD_SIS300|MD_SIS315},
+-	{"2048x1536x8",  0x6c, 0x0000, 0x0000, 2048, 1536,  8, 1, 256, 96,           MD_SIS315},  /* TW: 310/325 series only */
++	{"1920x1440x24", 0x6b, 0x0141, 0x0000, 1920, 1440, 32, 1, 240, 75, MD_SIS300|MD_SIS315},
++	{"1920x1440x32", 0x6b, 0x0141, 0x0000, 1920, 1440, 32, 1, 240, 75, MD_SIS300|MD_SIS315},
++	{"2048x1536x8",  0x6c, 0x0000, 0x0000, 2048, 1536,  8, 1, 256, 96,           MD_SIS315},
+ 	{"2048x1536x16", 0x6d, 0x0000, 0x0000, 2048, 1536, 16, 1, 256, 96,           MD_SIS315},
+ 	{"2048x1536x24", 0x6e, 0x0000, 0x0000, 2048, 1536, 32, 1, 256, 96,           MD_SIS315},
+ 	{"2048x1536x32", 0x6e, 0x0000, 0x0000, 2048, 1536, 32, 1, 256, 96,           MD_SIS315},
+@@ -538,37 +584,36 @@ u8  sisfb_rate_idx = 0;
+ 
+ /* TW: CR36 evaluation */
+ const USHORT sis300paneltype[] =
+-    { LCD_UNKNOWN,   LCD_800x600,  LCD_1024x768,  LCD_1280x1024,
+-      LCD_1280x960,  LCD_640x480,  LCD_1024x600,  LCD_1152x768,
+-      LCD_320x480,   LCD_1024x768, LCD_1024x768,  LCD_1024x768,
+-      LCD_1024x768,  LCD_1024x768, LCD_1024x768,  LCD_1024x768 };
++    { LCD_UNKNOWN,   LCD_800x600,   LCD_1024x768,  LCD_1280x1024,
++      LCD_1280x960,  LCD_640x480,   LCD_1024x600,  LCD_1152x768,
++      LCD_1024x768,  LCD_1024x768,  LCD_1024x768,  LCD_1024x768,
++      LCD_1024x768,  LCD_1024x768,  LCD_320x480,   LCD_1024x768 };
+ 
+ const USHORT sis310paneltype[] =
+-    { LCD_UNKNOWN,   LCD_800x600,  LCD_1024x768,  LCD_1280x1024,
+-      LCD_640x480,   LCD_1024x600, LCD_1152x864,  LCD_1280x960,
+-      LCD_1152x768,  LCD_1400x1050,LCD_1280x768,  LCD_1600x1200,
+-      LCD_320x480,   LCD_1024x768, LCD_1024x768,  LCD_1024x768 };
++    { LCD_UNKNOWN,   LCD_800x600,   LCD_1024x768,  LCD_1280x1024,
++      LCD_640x480,   LCD_1024x600,  LCD_1152x864,  LCD_1280x960,
++      LCD_1152x768,  LCD_1400x1050, LCD_1280x768,  LCD_1600x1200,
++      LCD_640x480_2, LCD_640x480_3, LCD_320x480,   LCD_1024x768 };
++
++#define FL_550_DSTN 0x01
++#define FL_550_FSTN 0x02
+ 
+ static const struct _sis_crt2type {
+ 	char name[10];
+ 	int type_no;
+ 	int tvplug_no;
++	unsigned short flags;
+ } sis_crt2type[] = {
+-	{"NONE", 	0, 		-1},
+-	{"LCD",  	DISPTYPE_LCD, 	-1},
+-	{"TV",   	DISPTYPE_TV, 	-1},
+-	{"VGA",  	DISPTYPE_CRT2, 	-1},
+-	{"SVIDEO", 	DISPTYPE_TV, 	TVPLUG_SVIDEO},
+-	{"COMPOSITE", 	DISPTYPE_TV, 	TVPLUG_COMPOSITE},
+-	{"SCART", 	DISPTYPE_TV, 	TVPLUG_SCART},
+-	{"none", 	0, 		-1},
+-	{"lcd",  	DISPTYPE_LCD, 	-1},
+-	{"tv",   	DISPTYPE_TV, 	-1},
+-	{"vga",  	DISPTYPE_CRT2, 	-1},
+-	{"svideo", 	DISPTYPE_TV, 	TVPLUG_SVIDEO},
+-	{"composite", 	DISPTYPE_TV, 	TVPLUG_COMPOSITE},
+-	{"scart", 	DISPTYPE_TV, 	TVPLUG_SCART},
+-	{"\0",  	-1, 		-1}
++	{"NONE", 	0, 		-1,        0},
++	{"LCD",  	CRT2_LCD, 	-1,        0},
++	{"TV",   	CRT2_TV, 	-1,        0},
++	{"VGA",  	CRT2_VGA, 	-1,        0},
++	{"SVIDEO", 	CRT2_TV, 	TV_SVIDEO, 0},
++	{"COMPOSITE", 	CRT2_TV, 	TV_AVIDEO, 0},
++	{"SCART", 	CRT2_TV, 	TV_SCART,  0},
++	{"DSTN",        CRT2_LCD,       -1,        FL_550_DSTN},
++	{"FSTN",        CRT2_LCD,       -1,        FL_550_FSTN},
++	{"\0",  	-1, 		-1,        0}
+ };
+ 
+ /* Queue mode selection for 310 series */
+@@ -579,9 +624,6 @@ static const struct _sis_queuemode {
+ 	{"AGP",  	AGP_CMD_QUEUE},
+ 	{"VRAM", 	VM_CMD_QUEUE},
+ 	{"MMIO", 	MMIO_CMD},
+-	{"agp",  	AGP_CMD_QUEUE},
+-	{"vram", 	VM_CMD_QUEUE},
+-	{"mmio", 	MMIO_CMD},
+ 	{"\0",   	-1}
+ };
+ 
+@@ -590,10 +632,8 @@ static const struct _sis_tvtype {
+ 	char name[6];
+ 	int type_no;
+ } sis_tvtype[] = {
+-	{"PAL",  	1},
+-	{"NTSC", 	2},
+-	{"pal", 	1},
+-	{"ntsc",  	2},
++	{"PAL",  	TV_PAL},
++	{"NTSC", 	TV_NTSC},
+ 	{"\0",   	-1}
+ };
+ 
+@@ -602,33 +642,102 @@ static const struct _sis_vrate {
+ 	u16 xres;
+ 	u16 yres;
+ 	u16 refresh;
++	BOOLEAN SiS730valid32bpp;
+ } sisfb_vrate[] = {
+-	{1,  640,  480, 60}, {2,  640,  480,  72}, {3, 640,   480,  75}, {4,  640, 480,  85},
+-	{5,  640,  480,100}, {6,  640,  480, 120}, {7, 640,   480, 160}, {8,  640, 480, 200},
+-	{1,  720,  480, 60},
+-	{1,  720,  576, 58},
+-	{1,  800,  480, 60}, {2,  800,  480,  75}, {3, 800,   480,  85},
+-	{1,  800,  600, 56}, {2,  800,  600,  60}, {3, 800,   600,  72}, {4,  800, 600,  75},
+-	{5,  800,  600, 85}, {6,  800,  600, 100}, {7, 800,   600, 120}, {8,  800, 600, 160},
+-	{1, 1024,  768, 43}, {2, 1024,  768,  60}, {3, 1024,  768,  70}, {4, 1024, 768,  75},
+-	{5, 1024,  768, 85}, {6, 1024,  768, 100}, {7, 1024,  768, 120},
+-	{1, 1024,  576, 60}, {2, 1024,  576,  75}, {3, 1024,  576,  85},
+-	{1, 1024,  600, 60},
+-	{1, 1152,  768, 60},
+-	{1, 1280,  720, 60}, {2, 1280,  720,  75}, {3, 1280,  720,  85},
+-	{1, 1280,  768, 60},
+-	{1, 1280, 1024, 43}, {2, 1280, 1024,  60}, {3, 1280, 1024,  75}, {4, 1280, 1024,  85},
+-	{1, 1280,  960, 70},
+-	{1, 1400, 1050, 60},
+-	{1, 1600, 1200, 60}, {2, 1600, 1200,  65}, {3, 1600, 1200,  70}, {4, 1600, 1200,  75},
+-	{5, 1600, 1200, 85}, {6, 1600, 1200, 100}, {7, 1600, 1200, 120},
+-	{1, 1920, 1440, 60}, {2, 1920, 1440,  65}, {3, 1920, 1440,  70}, {4, 1920, 1440,  75},
+-	{5, 1920, 1440, 85}, {6, 1920, 1440, 100},
+-	{1, 2048, 1536, 60}, {2, 2048, 1536,  65}, {3, 2048, 1536,  70}, {4, 2048, 1536,  75},
+-	{5, 2048, 1536, 85},
+-	{0, 0, 0, 0}
++	{1,  320,  200,  70,  TRUE},
++	{1,  320,  240,  60,  TRUE},
++	{1,  320,  480,  60,  TRUE},
++	{1,  400,  300,  60,  TRUE},
++	{1,  512,  384,  60,  TRUE},
++	{1,  640,  400,  72,  TRUE},
++	{1,  640,  480,  60,  TRUE}, {2,  640,  480,  72,  TRUE}, {3,  640,  480,  75,  TRUE},
++	{4,  640,  480,  85,  TRUE}, {5,  640,  480, 100,  TRUE}, {6,  640,  480, 120,  TRUE},
++	{7,  640,  480, 160,  TRUE}, {8,  640,  480, 200,  TRUE},
++	{1,  720,  480,  60,  TRUE},
++	{1,  720,  576,  58,  TRUE},
++	{1,  800,  480,  60,  TRUE}, {2,  800,  480,  75,  TRUE}, {3,  800,  480,  85,  TRUE},
++	{1,  800,  600,  56,  TRUE}, {2,  800,  600,  60,  TRUE}, {3,  800,  600,  72,  TRUE},
++	{4,  800,  600,  75,  TRUE}, {5,  800,  600,  85,  TRUE}, {6,  800,  600, 105,  TRUE},
++	{7,  800,  600, 120,  TRUE}, {8,  800,  600, 160,  TRUE},
++	{1,  848,  480,  39,  TRUE}, {2,  848,  480,  60,  TRUE},
++	{1,  856,  480,  39,  TRUE}, {2,  856,  480,  60,  TRUE},
++	{1, 1024,  576,  60,  TRUE}, {2, 1024,  576,  75,  TRUE}, {3, 1024,  576,  85,  TRUE},
++	{1, 1024,  600,  60,  TRUE},
++	{1, 1024,  768,  43,  TRUE}, {2, 1024,  768,  60,  TRUE}, {3, 1024,  768,  70, FALSE},
++	{4, 1024,  768,  75, FALSE}, {5, 1024,  768,  85,  TRUE}, {6, 1024,  768, 100,  TRUE},
++	{7, 1024,  768, 120,  TRUE},
++	{1, 1152,  768,  60,  TRUE},
++	{1, 1152,  864,  75,  TRUE}, {2, 1152,  864,  84,  TRUE},
++	{1, 1280,  720,  60,  TRUE}, {2, 1280,  720,  75,  TRUE}, {3, 1280,  720,  85,  TRUE},
++	{1, 1280,  768,  60,  TRUE},
++	{1, 1280,  960,  60,  TRUE}, {2, 1280,  960,  85,  TRUE},
++	{1, 1280, 1024,  43,  TRUE}, {2, 1280, 1024,  60,  TRUE}, {3, 1280, 1024,  75,  TRUE},
++	{4, 1280, 1024,  85,  TRUE},
++	{1, 1360,  768,  60,  TRUE},
++	{1, 1360, 1024,  59,  TRUE},
++	{1, 1400, 1050,  60,  TRUE}, {2, 1400, 1050,  75,  TRUE},
++	{1, 1600, 1200,  60,  TRUE}, {2, 1600, 1200,  65,  TRUE}, {3, 1600, 1200,  70,  TRUE},
++	{4, 1600, 1200,  75,  TRUE}, {5, 1600, 1200,  85,  TRUE}, {6, 1600, 1200, 100,  TRUE},
++	{7, 1600, 1200, 120,  TRUE},
++	{1, 1920, 1440,  60,  TRUE}, {2, 1920, 1440,  65,  TRUE}, {3, 1920, 1440,  70,  TRUE},
++	{4, 1920, 1440,  75,  TRUE}, {5, 1920, 1440,  85,  TRUE}, {6, 1920, 1440, 100,  TRUE},
++	{1, 2048, 1536,  60,  TRUE}, {2, 2048, 1536,  65,  TRUE}, {3, 2048, 1536,  70,  TRUE},
++	{4, 2048, 1536,  75,  TRUE}, {5, 2048, 1536,  85,  TRUE},
++	{0,    0,    0,   0, FALSE}
+ };
+ 
++static struct sisfb_monitor {
++	u16 hmin;
++	u16 hmax;
++	u16 vmin;
++	u16 vmax;
++	u32 dclockmax;
++	u8  feature;
++	BOOLEAN datavalid;
++} sisfb_thismonitor;
++
++static const struct _sisfbddcsmodes {
++	u32 mask;
++	u16 h;
++	u16 v;
++	u32 d;
++} sisfb_ddcsmodes[] = {
++	{ 0x10000, 67, 75, 108000},
++	{ 0x08000, 48, 72,  50000},
++	{ 0x04000, 46, 75,  49500},
++	{ 0x01000, 35, 43,  44900},
++	{ 0x00800, 48, 60,  65000},
++	{ 0x00400, 56, 70,  75000},
++	{ 0x00200, 60, 75,  78800},
++	{ 0x00100, 80, 75, 135000},
++	{ 0x00020, 31, 60,  25200},
++	{ 0x00008, 38, 72,  31500},
++	{ 0x00004, 37, 75,  31500},
++	{ 0x00002, 35, 56,  36000},
++	{ 0x00001, 38, 60,  40000}
++};
++
++static const struct _sisfbddcfmodes {
++	u16 x;
++	u16 y;
++	u16 v;
++	u16 h;
++	u32 d;
++} sisfb_ddcfmodes[] = {
++       { 1280, 1024, 85, 92, 157500},
++       { 1600, 1200, 60, 75, 162000},
++       { 1600, 1200, 65, 82, 175500},
++       { 1600, 1200, 70, 88, 189000},
++       { 1600, 1200, 75, 94, 202500},
++       { 1600, 1200, 85, 107,229500},
++       { 1920, 1440, 60, 90, 234000},
++       { 1920, 1440, 75, 113,297000}
++};
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
++static u8 sisfb_lastrates[128];
++#endif
++
+ static const struct _chswtable {
+     int subsysVendor;
+     int subsysCard;
+@@ -636,9 +745,61 @@ static const struct _chswtable {
+     char *cardName;
+ } mychswtable[] = {
+         { 0x1631, 0x1002, "Mitachi", "0x1002" },
++	{ 0x1071, 0x7521, "Mitac"  , "7521P"  },
+ 	{ 0,      0,      ""       , ""       }
+ };
+ 
++static const struct _customttable {
++    unsigned short chipID;
++    char *biosversion;
++    char *biosdate;
++    unsigned long bioschksum;
++    unsigned short biosFootprintAddr[5];
++    unsigned char biosFootprintData[5];
++    unsigned short pcisubsysvendor;
++    unsigned short pcisubsyscard;
++    char *vendorName;
++    char *cardName;
++    unsigned long SpecialID;
++    char *optionName;
++} mycustomttable[] = {
++        { SIS_630, "2.00.07", "09/27/2002-13:38:25",
++	  0x3240A8,
++	  { 0x220, 0x227, 0x228, 0x229, 0x22a },
++	  {  0x01,  0xe3,  0x9a,  0x6a,  0x00 },
++	  0x1039, 0x6300,
++	  "Barco", "iQ R200L/300/400", CUT_BARCO1366, "BARCO1366"
++	},
++	{ SIS_630, "2.00.07", "09/27/2002-13:38:25",
++	  0x323FBD,
++	  { 0x220, 0x227, 0x228, 0x229, 0x22a },
++	  {  0x00,  0x5a,  0x64,  0x41,  0x00 },
++	  0x1039, 0x6300,
++	  "Barco", "iQ G200L/300/400/500", CUT_BARCO1024, "BARCO1024"
++	},
++	{ SIS_650, "", "",
++	  0,
++	  { 0, 0, 0, 0, 0 },
++	  { 0, 0, 0, 0, 0 },
++	  0x0e11, 0x083c,
++	  "Compaq", "Presario 3045US", CUT_COMPAQ12802, "COMPAQ1280"
++	},
++	{ 4321, "", "",			/* This is hopefully NEVER autodetected */
++	  0,
++	  { 0, 0, 0, 0, 0 },
++	  { 0, 0, 0, 0, 0 },
++	  0, 0,
++	  "Generic", "LVDS/Parallel 848x480", CUT_PANEL848, "PANEL848x480"
++	},
++	{ 0, "", "",
++	  0,
++	  { 0, 0, 0, 0 },
++	  { 0, 0, 0, 0 },
++	  0, 0,
++	  "", "", CUT_NONE, ""
++	}
++};
++
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ /* Offscreen layout */
+ typedef struct _SIS_GLYINFO {
+@@ -677,7 +838,6 @@ static unsigned long sisfb_heap_end;
+ static unsigned long sisfb_heap_size;
+ static SIS_HEAP      sisfb_heap;
+ 
+-// Eden Chen
+ static const struct _sis_TV_filter {
+ 	u8 filter[9][4];
+ } sis_TV_filter[] = {
+@@ -829,9 +989,8 @@ static const struct _sis_TV_filter {
+ 
+ static int           filter = -1;
+ static unsigned char filter_tb;
+-//~Eden Chen
+ 
+-/* ---------------------- Routine prototypes ------------------------- */
++/* ---------------------- Prototypes ------------------------- */
+ 
+ /* Interface used by the world */
+ #ifndef MODULE
+@@ -894,10 +1053,6 @@ extern void     fbcon_sis_fillrect(struc
+                                    const struct fb_fillrect *rect);
+ extern void     fbcon_sis_copyarea(struct fb_info *info, 
+                                    const struct fb_copyarea *area);
+-#if 0				   
+-extern void     cfb_imageblit(struct fb_info *info, 
+-                              const struct fb_image *image);
+-#endif			      
+ extern int      fbcon_sis_sync(struct fb_info *info);
+ static int      sisfb_ioctl(struct inode *inode, 
+ 	 		    struct file *file,
+@@ -912,7 +1067,7 @@ extern int      sisfb_mode_rate_to_ddata
+ 			 unsigned int *left_margin, unsigned int *right_margin, 
+ 			 unsigned int *upper_margin, unsigned int *lower_margin,
+ 			 unsigned int *hsync_len, unsigned int *vsync_len,
+-			 unsigned int *sync, unsigned int *vmode);			      		    			      
++			 unsigned int *sync, unsigned int *vmode);
+ #endif
+ 			
+ static int      sisfb_get_fix(struct fb_fix_screeninfo *fix, int con,
+@@ -923,9 +1078,9 @@ extern int      sisfb_initaccel(void);
+ extern void     sisfb_syncaccel(void);
+ 
+ /* Internal general routines */
+-static void     sisfb_search_mode(const char *name);
+-static int      sisfb_validate_mode(int modeindex);
+-static u8       sisfb_search_refresh_rate(unsigned int rate);
++static void     sisfb_search_mode(char *name, BOOLEAN quiet);
++static int      sisfb_validate_mode(int modeindex, unsigned long vbflags);
++static u8       sisfb_search_refresh_rate(unsigned int rate, int index);
+ static int      sisfb_setcolreg(unsigned regno, unsigned red, unsigned green,
+ 			unsigned blue, unsigned transp,
+ 			struct fb_info *fb_info);
+@@ -939,6 +1094,12 @@ static BOOLEAN  sisfb_CheckVBRetrace(voi
+ static BOOLEAN  sisfbcheckvretracecrt2(void);
+ static BOOLEAN  sisfbcheckvretracecrt1(void);
+ static BOOLEAN  sisfb_bridgeisslave(void);
++static void     sisfb_detect_VB_connect(void);
++static void     sisfb_get_VB_type(void);
++
++static void     sisfb_handle_ddc(struct sisfb_monitor *monitor, int crtno);
++static BOOLEAN  sisfb_interpret_edid(struct sisfb_monitor *monitor, unsigned char *buffer);
++
+ 
+ /* SiS-specific Export functions */
+ void            sis_dispinfo(struct ap_data *rec);
+@@ -952,15 +1113,9 @@ u32             sisfb_get_reg3(u16 port)
+ /* Chipset-dependent internal routines */
+ #ifdef CONFIG_FB_SIS_300
+ static int      sisfb_get_dram_size_300(void);
+-static void     sisfb_detect_VB_connect_300(void);
+-static void     sisfb_get_VB_type_300(void);
+-static int      sisfb_has_VB_300(void);
+ #endif
+ #ifdef CONFIG_FB_SIS_315
+ static int      sisfb_get_dram_size_315(void);
+-static void     sisfb_detect_VB_connect_315(void);
+-static void     sisfb_get_VB_type_315(void);
+-static int      sisfb_has_VB_315(void);
+ #endif
+ 
+ /* Internal heap routines */
+@@ -978,23 +1133,33 @@ BOOLEAN         sisfb_query_VGA_config_s
+ BOOLEAN         sisfb_query_north_bridge_space(PSIS_HW_DEVICE_INFO psishw_ext,
+ 	         	unsigned long offset, unsigned long set, unsigned long *value);
+ 
+-
+ /* Routines from init.c/init301.c */
+ extern void 	SiSRegInit(SiS_Private *SiS_Pr, USHORT BaseAddr);
+ extern BOOLEAN  SiSInit(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension);
+ extern BOOLEAN  SiSSetMode(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension, USHORT ModeNo);
+-extern void     SiS_SetEnableDstn(SiS_Private *SiS_Pr);
++extern void     SiS_SetEnableDstn(SiS_Private *SiS_Pr, int enable);
++extern void     SiS_SetEnableFstn(SiS_Private *SiS_Pr, int enable);
+ extern void     SiS_LongWait(SiS_Private *SiS_Pr);
+ 
+-/* TW: Chrontel TV functions */
++extern BOOLEAN  sisfb_gettotalfrommode(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension,
++		       unsigned char modeno, int *htotal, int *vtotal, unsigned char rateindex);
++
++/* Chrontel TV functions */
+ extern USHORT 	SiS_GetCH700x(SiS_Private *SiS_Pr, USHORT tempbx);
+ extern void 	SiS_SetCH700x(SiS_Private *SiS_Pr, USHORT tempbx);
+ extern USHORT 	SiS_GetCH701x(SiS_Private *SiS_Pr, USHORT tempbx);
+ extern void 	SiS_SetCH701x(SiS_Private *SiS_Pr, USHORT tempbx);
+ extern void     SiS_SetCH70xxANDOR(SiS_Private *SiS_Pr, USHORT tempax,USHORT tempbh);
+ extern void     SiS_DDC2Delay(SiS_Private *SiS_Pr, USHORT delaytime);
++extern void     SiS_SetChrontelGPIO(SiS_Private *SiS_Pr, USHORT myvbinfo);
++extern USHORT   SiS_HandleDDC(SiS_Private *SiS_Pr, unsigned long VBFlags, int VGAEngine,
++		              USHORT adaptnum, USHORT DDCdatatype, unsigned char *buffer);
++extern void SiS_Chrontel701xBLOn(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension);
++extern void SiS_Chrontel701xBLOff(SiS_Private *SiS_Pr);
++extern void SiS_SiS30xBLOn(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension);
++extern void SiS_SiS30xBLOff(SiS_Private *SiS_Pr, PSIS_HW_DEVICE_INFO HwDeviceExtension);
+ 
+-/* TW: Sensing routines */
++/* Sensing routines */
+ void            SiS_Sense30x(void);
+ int             SISDoSense(int tempbl, int tempbh, int tempcl, int tempch);
+ void            SiS_SenseCh(void);			
+--- linux-2.6.0-test6/drivers/video/sis/vgatypes.h	2003-06-14 12:17:55.000000000 -0700
++++ 25/drivers/video/sis/vgatypes.h	2003-10-05 00:34:22.000000000 -0700
+@@ -1,3 +1,36 @@
++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/vgatypes.h,v 1.0 2001/06/15 21:23:00 dawes Exp $ */
++/*
++ * General type definitions for universal mode switching modules
++ *
++ * Copyright 2002, 2003 by Thomas Winischhofer, Vienna, Austria
++ *
++ * If distributed as part of the linux kernel, the contents of this file
++ * is entirely covered by the GPL.
++ *
++ * Otherwise, the following terms apply:
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of the copyright holder not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission.  The copyright holder makes no representations
++ * about the suitability of this software for any purpose.  It is provided
++ * "as is" without express or implied warranty.
++ *
++ * THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++ * EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ *
++ * Authors: 	Thomas Winischhofer <thomas@winischhofer.net>
++ *		Silicon Integrated Systems
++ *
++ */
+ #ifndef _VGATYPES_
+ #define _VGATYPES_
+ 
+@@ -5,7 +38,7 @@
+ #include "xf86Pci.h"
+ #endif
+ 
+-#ifdef LINUX_KERNEL  /* TW: We don't want the X driver to depend on kernel source */
++#ifdef LINUX_KERNEL  /* We don't want the X driver to depend on kernel source */
+ #include <linux/ioctl.h>
+ #endif
+ 
+@@ -72,18 +105,15 @@ typedef void VOID;
+ typedef UCHAR BOOLEAN;
+ #endif
+ 
+-#ifndef WINCE_HEADER
+ #ifndef bool
+ typedef UCHAR bool;
+ #endif
+-#endif /*WINCE_HEADER*/
+ 
+ #ifndef VBIOS_VER_MAX_LENGTH
+ #define VBIOS_VER_MAX_LENGTH         4
+ #endif
+ 
+ #ifndef LINUX_KERNEL   /* For kernel, this is defined in sisfb.h */
+-#ifndef WIN2000
+ #ifndef SIS_CHIP_TYPE
+ typedef enum _SIS_CHIP_TYPE {
+     SIS_VGALegacy = 0,
+@@ -101,19 +131,19 @@ typedef enum _SIS_CHIP_TYPE {
+     SIS_550,
+     SIS_650,
+     SIS_740,
+-    SIS_330, 
++    SIS_330,
++    SIS_660,
++    SIS_760,
+     MAX_SIS_CHIP
+ } SIS_CHIP_TYPE;
+ #endif
+ #endif
+-#endif
+ 
+-#ifndef WIN2000
+ #ifndef SIS_VB_CHIP_TYPE
+ typedef enum _SIS_VB_CHIP_TYPE {
+     VB_CHIP_Legacy = 0,
+     VB_CHIP_301,
+-    VB_CHIP_301B,      
++    VB_CHIP_301B,
+     VB_CHIP_301LV,
+     VB_CHIP_302,
+     VB_CHIP_302B,
+@@ -122,9 +152,7 @@ typedef enum _SIS_VB_CHIP_TYPE {
+     MAX_VB_CHIP
+ } SIS_VB_CHIP_TYPE;
+ #endif
+-#endif
+ 
+-#ifndef WIN2000
+ #ifndef SIS_LCD_TYPE
+ typedef enum _SIS_LCD_TYPE {
+     LCD_INVALID = 0,
+@@ -136,18 +164,20 @@ typedef enum _SIS_LCD_TYPE {
+     LCD_1600x1200,
+     LCD_1920x1440,
+     LCD_2048x1536,
+-    LCD_320x480,       /* TW: FSTN */
++    LCD_320x480,       /* FSTN, DSTN */
+     LCD_1400x1050,
+     LCD_1152x864,
+     LCD_1152x768,
+     LCD_1280x768,
+     LCD_1024x600,
++    LCD_640x480_2,     /* FSTN, DSTN */
++    LCD_640x480_3,     /* FSTN, DSTN */
++    LCD_848x480,
++    LCD_CUSTOM,
+     LCD_UNKNOWN
+ } SIS_LCD_TYPE;
+ #endif
+-#endif
+ 
+-#ifndef WIN2000 /* mark by Paul, Move definition to sisv.h*/
+ #ifndef PSIS_DSReg
+ typedef struct _SIS_DSReg
+ {
+@@ -162,7 +192,6 @@ typedef struct _SIS_HW_DEVICE_INFO  SIS_
+ 
+ typedef BOOLEAN (*PSIS_QUERYSPACE)   (PSIS_HW_DEVICE_INFO, ULONG, ULONG, ULONG *);
+ 
+-
+ struct _SIS_HW_DEVICE_INFO
+ {
+     PVOID  pDevice;              /* The pointer to the physical device data structure
+@@ -173,7 +202,7 @@ struct _SIS_HW_DEVICE_INFO
+                                  /* Note:ROM image file is the file of VBIOS ROM */
+ 
+     BOOLEAN UseROM;		 /* TW: Use the ROM image if provided */
+- 
++
+     UCHAR  *pjCustomizedROMImage;/* base virtual address of ROM image file. */
+                                  /* wincE:ROM image file is the file for OEM */
+                                  /*       customized table */
+@@ -195,7 +224,7 @@ struct _SIS_HW_DEVICE_INFO
+                                  /* defined in the data structure type */
+                                  /* "SIS_VB_CHIP_TYPE" */
+ 
+-    USHORT usExternalChip;       /* NO VB or other video bridge(not  */
++    USHORT usExternalChip;       /* NO VB or other video bridge (other than  */
+                                  /* SiS video bridge) */
+                                  /* if ujVBChipID = VB_CHIP_UNKNOWN, */
+                                  /* then bit0=1 : LVDS,bit1=1 : trumpion, */
+@@ -207,7 +236,7 @@ struct _SIS_HW_DEVICE_INFO
+                                  /*             011:Trumpion LVDS Scaling Chip */
+                                  /*             100:LVDS(LCD-out)+Chrontel 7005 */
+                                  /*             101:Single Chrontel 7005 */
+-				 /* TW: This has changed on 310/325 series! */
++				 /* TW: This has changed on 315 series! */
+ 
+     ULONG  ulCRT2LCDType;        /* defined in the data structure type */
+                                  /* "SIS_LCD_TYPE" */
+@@ -244,7 +273,6 @@ struct _SIS_HW_DEVICE_INFO
+ #endif
+ };
+ #endif
+-#endif 
+ 
+ 
+ /* TW: Addtional IOCTL for communication sisfb <> X driver        */
+@@ -284,12 +312,16 @@ struct _SISFB_INFO {
+ 	
+ 	unsigned char sisfb_lcda;
+ 
+-	char reserved[235]; 		/* for future use */
++	unsigned long sisfb_vbflags;
++	unsigned long sisfb_currentvbflags;
++
++	int sisfb_scalelcd;
++	unsigned long sisfb_specialtiming;
++
++	char reserved[219]; 		/* for future use */
+ };
+ #endif
+ 
+-#ifndef WIN2000
+-#ifndef WINCE_HEADER
+ #ifndef BUS_DATA_TYPE
+ typedef enum _BUS_DATA_TYPE {
+     ConfigurationSpaceUndefined = -1,
+@@ -307,7 +339,6 @@ typedef enum _BUS_DATA_TYPE {
+     MaximumBusDataType
+ } BUS_DATA_TYPE, *PBUS_DATA_TYPE;
+ #endif
+-#endif /* WINCE_HEADER */
+ 
+ #ifndef PCI_TYPE0_ADDRESSES
+ #define PCI_TYPE0_ADDRESSES             6
+@@ -317,7 +348,6 @@ typedef enum _BUS_DATA_TYPE {
+ #define PCI_TYPE1_ADDRESSES             2
+ #endif
+ 
+-#ifndef WINCE_HEADER
+ #ifndef PCI_COMMON_CONFIG
+ typedef struct _PCI_COMMON_CONFIG {
+     USHORT  VendorID;                   /* (ro)                 */
+@@ -355,7 +385,6 @@ typedef struct _PCI_COMMON_CONFIG {
+ 
+ } PCI_COMMON_CONFIG, *PPCI_COMMON_CONFIG;
+ #endif
+-#endif /* WINCE_HEADER */
+ 
+ #ifndef FIELD_OFFSET
+ #define FIELD_OFFSET(type, field)    ((LONG)&(((type *)0)->field))
+@@ -364,6 +393,6 @@ typedef struct _PCI_COMMON_CONFIG {
+ #ifndef PCI_COMMON_HDR_LENGTH
+ #define PCI_COMMON_HDR_LENGTH (FIELD_OFFSET (PCI_COMMON_CONFIG, DeviceSpecific))
+ #endif
+-#endif
+ 
+ #endif
++
+--- linux-2.6.0-test6/drivers/video/sis/vstruct.h	2003-06-14 12:18:25.000000000 -0700
++++ 25/drivers/video/sis/vstruct.h	2003-10-05 00:34:22.000000000 -0700
+@@ -1,3 +1,37 @@
++/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/vstruct.h,v 1.0 2001/06/15 21:23:00 dawes Exp $ */
++/*
++ * General structure definitions for universal mode switching modules
++ *
++ * Copyright 2002, 2003 by Thomas Winischhofer, Vienna, Austria
++ *
++ * If distributed as part of the linux kernel, the contents of this file
++ * is entirely covered by the GPL.
++ *
++ * Otherwise, the following terms apply:
++ *
++ * Permission to use, copy, modify, distribute, and sell this software and its
++ * documentation for any purpose is hereby granted without fee, provided that
++ * the above copyright notice appear in all copies and that both that
++ * copyright notice and this permission notice appear in supporting
++ * documentation, and that the name of the copyright holder not be used in
++ * advertising or publicity pertaining to distribution of the software without
++ * specific, written prior permission.  The copyright holder makes no representations
++ * about the suitability of this software for any purpose.  It is provided
++ * "as is" without express or implied warranty.
++ *
++ * THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++ * EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++ * PERFORMANCE OF THIS SOFTWARE.
++ *
++ * Authors: 	Thomas Winischhofer <thomas@winischhofer.net>
++ *              Silicon Integrated Systems
++ *
++ */
++
+ #ifdef _INIT_
+ #define EXTERN
+ #else
+@@ -58,7 +92,6 @@ typedef struct _SiS_LVDSCRT1DataStruct
+ 	UCHAR  CR[15];
+ } SiS_LVDSCRT1DataStruct;
+ 
+-/*add for LCDA*/
+ typedef struct _SiS_LCDACRT1DataStruct
+ {
+ 	UCHAR  CR[17];
+@@ -111,9 +144,7 @@ typedef struct _SiS_ExtStruct
+ 	UCHAR  Ext_ModeID;
+ 	USHORT Ext_ModeFlag;
+ 	USHORT Ext_ModeInfo;
+-	USHORT Ext_Point;
+ 	USHORT Ext_VESAID;
+-	UCHAR  Ext_VESAMEMSize;
+ 	UCHAR  Ext_RESINFO;
+ 	UCHAR  VB_ExtTVFlickerIndex;
+ 	UCHAR  VB_ExtTVEdgeIndex;
+@@ -130,7 +161,6 @@ typedef struct _SiS_Ext2Struct
+ 	UCHAR  ModeID;
+ 	USHORT XRes;
+ 	USHORT YRes;
+-	USHORT ROM_OFFSET;
+ } SiS_Ext2Struct;
+ 
+ typedef struct _SiS_Part2PortTblStruct
+@@ -183,6 +213,15 @@ typedef struct _SiS_ModeResInfoStruct
+ 
+ typedef UCHAR DRAM4Type[4];
+ 
++/* Defines for SiS_Customt */
++#define CUT_NONE        0
++#define CUT_FORCENONE   1
++#define CUT_BARCO1366   2
++#define CUT_BARCO1024   3
++#define CUT_COMPAQ1280  4
++#define CUT_COMPAQ12802 5
++#define CUT_PANEL848    6
++
+ typedef struct _SiS_Private
+ {
+ #ifdef LINUX_KERNEL
+@@ -198,25 +237,34 @@ typedef struct _SiS_Private
+ 	USHORT SiS_P3c7;
+ 	USHORT SiS_P3c8;
+ 	USHORT SiS_P3c9;
++	USHORT SiS_P3cb;
++	USHORT SiS_P3cd;
+ 	USHORT SiS_P3da;
+ 	USHORT SiS_Part1Port;
+ 	USHORT SiS_Part2Port;
+ 	USHORT SiS_Part3Port;
+ 	USHORT SiS_Part4Port;
+ 	USHORT SiS_Part5Port;
++	USHORT SiS_VidCapt;
++	USHORT SiS_VidPlay;
+ 	USHORT SiS_IF_DEF_LVDS;
+ 	USHORT SiS_IF_DEF_TRUMPION;
+ 	USHORT SiS_IF_DEF_DSTN;
+ 	USHORT SiS_IF_DEF_FSTN;
+ 	USHORT SiS_IF_DEF_CH70xx;
+ 	USHORT SiS_IF_DEF_HiVision;
++	USHORT SiS_SysFlags;
+ 	UCHAR  SiS_VGAINFO;
++#ifndef LINUX_KERNEL
++        USHORT SiS_CP1, SiS_CP2, SiS_CP3, SiS_CP4;
++#endif
+ 	BOOLEAN SiS_UseROM;
+ 	int    SiS_CHOverScan;
+ 	BOOLEAN SiS_CHSOverScan;
+ 	BOOLEAN SiS_ChSW;
+ 	BOOLEAN SiS_UseLCDA;
+ 	int    SiS_UseOEM;
++	ULONG  SiS_CustomT;
+ 	USHORT SiS_Backup70xx;
+ 	USHORT SiS_CRT1Mode;
+ 	USHORT SiS_flag_clearbuffer;
+@@ -270,15 +318,18 @@ typedef struct _SiS_Private
+ 	USHORT SiS_Panel1280x768;
+ 	USHORT SiS_Panel1024x600;
+ 	USHORT SiS_Panel640x480;
++	USHORT SiS_Panel640x480_2;
++	USHORT SiS_Panel640x480_3;
+ 	USHORT SiS_Panel1152x864;
++	USHORT SiS_PanelCustom;
++	USHORT SiS_PanelBarco1366;
+ 	USHORT SiS_PanelMax;
+ 	USHORT SiS_PanelMinLVDS;
+ 	USHORT SiS_PanelMin301;
+ 	USHORT SiS_ChrontelInit;
+ 	
+-	/* Pointers: */
+ 	const SiS_StStruct          *SiS_SModeIDTable;
+-	const SiS_StandTableStruct  *SiS_StandTable;
++	SiS_StandTableStruct        *SiS_StandTable;
+ 	const SiS_ExtStruct         *SiS_EModeIDTable;
+ 	const SiS_Ext2Struct        *SiS_RefIndex;
+ 	const SiS_VBModeStruct      *SiS_VBModeIDTable;
+@@ -316,7 +367,7 @@ typedef struct _SiS_Private
+ 	const USHORT *pSiS_RGBSenseData;
+ 	const USHORT *pSiS_VideoSenseData;
+ 	const USHORT *pSiS_YCSenseData;
+-	const USHORT *pSiS_RGBSenseData2; /*301b*/
++	const USHORT *pSiS_RGBSenseData2;
+ 	const USHORT *pSiS_VideoSenseData2;
+ 	const USHORT *pSiS_YCSenseData2;
+ #endif
+@@ -340,15 +391,18 @@ typedef struct _SiS_Private
+ 	const SiS_LCDDataStruct  *SiS_LCD1280x960Data;
+ 	const SiS_LCDDataStruct  *SiS_NoScaleData1400x1050;
+ 	const SiS_LCDDataStruct  *SiS_NoScaleData1600x1200;
++	const SiS_LCDDataStruct  *SiS_NoScaleData1280x768;
+ 	const SiS_LCDDataStruct  *SiS_StLCD1400x1050Data;
+ 	const SiS_LCDDataStruct  *SiS_StLCD1600x1200Data;
++	const SiS_LCDDataStruct  *SiS_StLCD1280x768Data;
+ 	const SiS_LCDDataStruct  *SiS_ExtLCD1400x1050Data;
+ 	const SiS_LCDDataStruct  *SiS_ExtLCD1600x1200Data;
++	const SiS_LCDDataStruct  *SiS_ExtLCD1280x768Data;
++	const SiS_LCDDataStruct  *SiS_NoScaleData;
+ 	const SiS_TVDataStruct   *SiS_StPALData;
+ 	const SiS_TVDataStruct   *SiS_ExtPALData;
+ 	const SiS_TVDataStruct   *SiS_StNTSCData;
+ 	const SiS_TVDataStruct   *SiS_ExtNTSCData;
+-/*	const SiS_TVDataStruct   *SiS_St1HiTVData;  */
+ 	const SiS_TVDataStruct   *SiS_St2HiTVData;
+ 	const SiS_TVDataStruct   *SiS_ExtHiTVData;
+ 	const UCHAR *SiS_NTSCTiming;
+@@ -381,12 +435,19 @@ typedef struct _SiS_Private
+ 	const SiS_LVDSDataStruct  *SiS_LVDS1152x768Data_1;
+ 	const SiS_LVDSDataStruct  *SiS_LVDS1152x768Data_2;
+ 	const SiS_LVDSDataStruct  *SiS_LVDS640x480Data_1;
++	const SiS_LVDSDataStruct  *SiS_LVDS640x480Data_2;
+ 	const SiS_LVDSDataStruct  *SiS_LVDS320x480Data_1;
+ 	const SiS_LVDSDataStruct  *SiS_LCDA1400x1050Data_1;
+ 	const SiS_LVDSDataStruct  *SiS_LCDA1400x1050Data_2;
+ 	const SiS_LVDSDataStruct  *SiS_LCDA1600x1200Data_1;
+ 	const SiS_LVDSDataStruct  *SiS_LCDA1600x1200Data_2;
+ 	const SiS_LVDSDataStruct  *SiS_LVDSXXXxXXXData_1;
++	const SiS_LVDSDataStruct  *SiS_LVDSBARCO1366Data_1;
++	const SiS_LVDSDataStruct  *SiS_LVDSBARCO1366Data_2;
++	const SiS_LVDSDataStruct  *SiS_LVDSBARCO1024Data_1;
++	const SiS_LVDSDataStruct  *SiS_LVDSBARCO1024Data_2;
++	const SiS_LVDSDataStruct  *SiS_LVDS848x480Data_1;
++	const SiS_LVDSDataStruct  *SiS_LVDS848x480Data_2;
+ 	const SiS_LVDSDataStruct  *SiS_CHTVUNTSCData;
+ 	const SiS_LVDSDataStruct  *SiS_CHTVONTSCData;
+ 	const SiS_LVDSDataStruct  *SiS_CHTVUPALData;
+@@ -478,6 +539,12 @@ typedef struct _SiS_Private
+ 	const SiS_LVDSCRT1DataStruct  *SiS_LVDSCRT11600x1200_2_H;
+ 	const SiS_LVDSCRT1DataStruct  *SiS_LVDSCRT1XXXxXXX_1;
+ 	const SiS_LVDSCRT1DataStruct  *SiS_LVDSCRT1XXXxXXX_1_H;
++	const SiS_LVDSCRT1DataStruct  *SiS_LVDSCRT1640x480_1;
++	const SiS_LVDSCRT1DataStruct  *SiS_LVDSCRT1640x480_1_H;
++	const SiS_LVDSCRT1DataStruct  *SiS_LVDSCRT1640x480_2;
++	const SiS_LVDSCRT1DataStruct  *SiS_LVDSCRT1640x480_2_H;
++	const SiS_LVDSCRT1DataStruct  *SiS_LVDSCRT1640x480_3;
++	const SiS_LVDSCRT1DataStruct  *SiS_LVDSCRT1640x480_3_H;
+ 	const SiS_LVDSCRT1DataStruct  *SiS_CHTVCRT1UNTSC;
+ 	const SiS_LVDSCRT1DataStruct  *SiS_CHTVCRT1ONTSC;
+ 	const SiS_LVDSCRT1DataStruct  *SiS_CHTVCRT1UPAL;
+@@ -507,7 +574,6 @@ typedef struct _SiS_Private
+ 	const SiS_LCDACRT1DataStruct  *SiS_LCDACRT11400x1050_2_H;
+ 	const SiS_LCDACRT1DataStruct  *SiS_LCDACRT11600x1200_2_H;
+ 
+-	/* TW: New for 650/301LV */
+ 	const SiS_Part2PortTblStruct *SiS_CRT2Part2_1024x768_1;
+ 	const SiS_Part2PortTblStruct *SiS_CRT2Part2_1280x1024_1;
+ 	const SiS_Part2PortTblStruct *SiS_CRT2Part2_1400x1050_1;
+@@ -539,6 +605,9 @@ typedef struct _SiS_Private
+ 	const UCHAR *SiS_CHTVVCLKUPALN;
+ 	const UCHAR *SiS_CHTVVCLKOPALN;
+ 	const UCHAR *SiS_CHTVVCLKSOPAL;
++
++	USHORT  PanelXRes;
++	USHORT  PanelYRes;
+ 	
+ 	BOOLEAN UseCustomMode;
+ 	BOOLEAN CRT1UsesCustomMode;
+@@ -560,8 +629,11 @@ typedef struct _SiS_Private
+ 	UCHAR   CSR2B;
+ 	UCHAR   CSR2C;
+ 	USHORT  CSRClock;
++	USHORT  CSRClock_CRT1;
+ 	USHORT  CModeFlag;
++	USHORT  CModeFlag_CRT1;
+ 	USHORT  CInfoFlag;
++
+ 	BOOLEAN SiS_CHPALM;
+ 	BOOLEAN SiS_CHPALN;
+ 	
+@@ -578,7 +650,21 @@ typedef struct _SiS_Private
+ 	UCHAR Backup_1c;
+ 	UCHAR Backup_1d;
+ 	
+-	int    UsePanelScaler;
++	int     UsePanelScaler;
++
++	USHORT  CP_Vendor, CP_Product;
++	BOOLEAN CP_HaveCustomData;
++	int     CP_PreferredX, CP_PreferredY;
++	int	CP_MaxX, CP_MaxY, CP_MaxClock;
++	int     CP_HDisplay[7], CP_VDisplay[7];	/* For Custom LCD panel dimensions */
++    	int     CP_HTotal[7], CP_VTotal[7];
++    	int     CP_HSyncStart[7], CP_VSyncStart[7];
++    	int     CP_HSyncEnd[7], CP_VSyncEnd[7];
++	int     CP_HBlankStart[7], CP_VBlankStart[7];
++	int     CP_HBlankEnd[7], CP_VBlankEnd[7];
++    	int     CP_Clock[7];
++	BOOLEAN CP_DataValid[7];
++	BOOLEAN CP_HSync_P[7], CP_VSync_P[7], CP_SyncValid[7];
+ } SiS_Private;
+ 
+ #endif
+--- linux-2.6.0-test6/drivers/video/skeletonfb.c	2003-06-14 12:17:59.000000000 -0700
++++ 25/drivers/video/skeletonfb.c	2003-10-05 00:34:22.000000000 -0700
+@@ -1,7 +1,7 @@
+ /*
+  * linux/drivers/video/skeletonfb.c -- Skeleton for a frame buffer device
+  *
+- *  Modified to new api Jan 2001 by James Simmons (jsimmons@transvirtual.com)
++ *  Modified to new api Jan 2001 by James Simmons (jsimmons@infradead.org)
+  *
+  *  Created 28 Dec 1997 by Geert Uytterhoeven
+  *
+@@ -469,15 +469,71 @@ void xxxfb_imageblit(struct fb_info *p, 
+ int xxxfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
+ {
+ /*
+- *      @set: 	Which fields we are altering in struct fb_cursor 
++ *      @set: 	 Which fields we are altering in struct fb_cursor
+  *	@enable: Disable or enable the cursor 
+- *      @rop: 	The bit operation we want to do. 
+- *      @mask:  This is the cursor mask bitmap. 
+- *      @dest:  A image of the area we are going to display the cursor.
+- *		Used internally by the driver.	 
+- *      @hot:	The hot spot. 
+- *	@image:	The actual data for the cursor image.
+- */
++ *      @rop: 	 The bit operation we want to do.
++ *      @hot:	 The hot spot.
++ *	@image:	 The actual data for the cursor image.
++ *      @mask:   This is the cursor mask bitmap.
++ */
++
++   /* Disable hardware cursor. We don't want to display the cursor
++      while changing it. Note we use the enable and rop fields in
++      struct fb_cursor that is apart of struct fb_info. Not the
++      cursor data passed in from userland. */
++
++   if (cursor->set & FB_CUR_SETHOT) {
++	info->cursor.hot = cursor->hot;
++   	/* Set the hardware cursor's hot spot  */
++   }
++
++   if (cursor->set & FB_CUR_SETPOS) {
++	info->cursor.image.dx = cursor->image.dx;
++	info->cursor.image.dy = cursor->image.dy;
++   	/* Set the hardware cursor's position */
++   }
++
++   if (cursor->set & FB_CUR_SETSIZE) {
++	info->cursor.image.height = cursor->image.height;
++	info->cursor.image.width = cursor->image.width;
++   	/* Set the hardware cursor's size */
++   }
++
++   if (cursor->set & FB_CUR_SETCMAP) {
++	if (cursor->image.depth == 1) {
++		info->cursor.image.fg_color = cursor->image.fg_color;
++		info->cursor.image.bg_color = cursor->image.bg_color;
++	} else {
++		if (cursor->image.cmap.len)
++			fb_copy_cmap(&cursor->image.cmap, &info->cursor.image.cmap, 0);
++	}
++	info->curosr.image.depth = cursor->image.depth;
++
++   	/* Set the hardware cursor's color map */
++   }
++
++   /*
++    * Set the cursor shape. The two pieces needed to create
++    * the final image is mask and image.data. The mask is
++    * combined with image.data according to the rop field.
++    */
++   if (cursor->set & FB_CUR_SETSHAPE) {
++ 	switch (info->cursor.rop) {
++	case ROP_XOR:
++		/* ... */
++		break;
++	case ROP_COPY:
++	default:
++		/* ... */
++		break;
++   	}
++	/* ... */
++   }
++
++   if (info->cursor.enable) {
++	/* Now we turn the hardware cursor on */
++   }
++   return 0;
+ }
+ 
+ /**
+--- linux-2.6.0-test6/drivers/video/softcursor.c	2003-06-14 12:18:22.000000000 -0700
++++ 25/drivers/video/softcursor.c	2003-10-05 00:34:28.000000000 -0700
+@@ -21,8 +21,13 @@ int soft_cursor(struct fb_info *info, st
+ {
+ 	unsigned int scan_align = info->pixmap.scan_align - 1;
+ 	unsigned int buf_align = info->pixmap.buf_align - 1;
+-	unsigned int i, size, dsize, s_pitch, d_pitch;
+-	u8 *dst, src[64];
++	u8 *dst = (u8 *) info->cursor.image.data;
++	unsigned int i, size, pitch;
++
++	pitch = ((info->cursor.image.width + 7) >> 3) + scan_align;
++	pitch &= ~scan_align;
++	size = pitch * info->cursor.image.height + buf_align;
++	size &= ~buf_align;
+ 
+ 	if (cursor->set & FB_CUR_SETSIZE) {
+ 		info->cursor.image.height = cursor->image.height;
+@@ -48,34 +53,33 @@ int soft_cursor(struct fb_info *info, st
+ 		info->cursor.image.depth = cursor->image.depth;
+ 	}	
+ 
+-	s_pitch = (info->cursor.image.width + 7) >> 3;
+-	dsize = s_pitch * info->cursor.image.height;
+-	d_pitch = (s_pitch + scan_align) & ~scan_align;
+-	size = d_pitch * info->cursor.image.height + buf_align;
+-	size &= ~buf_align;
+-	dst = info->pixmap.addr + fb_get_buffer_offset(info, size);
+-
+-	if (info->cursor.enable) {
++	if (cursor->set & FB_CUR_SETSHAPE) {
+ 		switch (info->cursor.rop) {
+ 		case ROP_XOR:
+-			for (i = 0; i < dsize; i++)
+-				src[i] = cursor->image.data[i] ^ info->cursor.mask[i]; 
++			for (i = 0; i < size; i++)
++				dst[i] ^= info->cursor.mask[i];
+ 			break;
+ 		case ROP_COPY:
+ 		default:
+-			for (i = 0; i < dsize; i++)
+-				src[i] = cursor->image.data[i] & info->cursor.mask[i];
++			for (i = 0; i < size; i++)
++				dst[i] &= info->cursor.mask[i];
+ 			break;
+ 		}
+-	} else 
+-		memcpy(src, cursor->image.data, dsize);
+-	
+-	move_buf_aligned(info, dst, src, d_pitch, s_pitch, info->cursor.image.height);
+-	info->cursor.image.data = dst;
++	}
+ 	
+-	info->fbops->fb_imageblit(info, &info->cursor.image);
+-	atomic_dec(&info->pixmap.count);
+-	smp_mb__after_atomic_dec();
++	if (!info->cursor.enable) {
++		for (i = 0; i < size; i++)
++			dst[i] ^= info->cursor.mask[i];
++	}
++
++	if (info->cursor.image.data)
++		info->fbops->fb_imageblit(info, &info->cursor.image);
++
++	if (!info->cursor.enable) {
++		for (i = 0; i < size; i++)
++			dst[i] ^= info->cursor.mask[i];
++	}
++
+ 	return 0;
+ }
+ 
+--- linux-2.6.0-test6/drivers/video/sstfb.c	2003-08-08 22:55:13.000000000 -0700
++++ 25/drivers/video/sstfb.c	2003-10-05 00:33:24.000000000 -0700
+@@ -94,7 +94,6 @@
+ #include <linux/pci.h>
+ #include <linux/delay.h>
+ #include <linux/init.h>
+-#include <linux/version.h>
+ #include <linux/slab.h>
+ #include <asm/io.h>
+ #include <asm/ioctl.h>
+--- linux-2.6.0-test6/drivers/video/stifb.c	2003-09-08 13:58:58.000000000 -0700
++++ 25/drivers/video/stifb.c	2003-10-05 00:33:24.000000000 -0700
+@@ -1238,7 +1238,7 @@ stifb_init_fb(struct sti_struct *sti, in
+ 
+ 
+ 	/* get framebuffer physical and virtual base addr & len (64bit ready) */
+-	fix->smem_start = fb->sti->regions_phys[1] | 0xffffffff00000000;
++	fix->smem_start = F_EXTEND(fb->sti->regions_phys[1]);
+ 	fix->smem_len = fb->sti->regions[1].region_desc.length * 4096;
+ 
+ 	fix->line_length = (fb->sti->glob_cfg->total_x * bpp) / 8;
+--- linux-2.6.0-test6/drivers/video/valkyriefb.c	2003-07-27 12:14:40.000000000 -0700
++++ 25/drivers/video/valkyriefb.c	2003-10-05 00:34:22.000000000 -0700
+@@ -51,7 +51,6 @@
+ #include <linux/delay.h>
+ #include <linux/interrupt.h>
+ #include <linux/fb.h>
+-#include <linux/selection.h>
+ #include <linux/init.h>
+ #include <linux/pci.h>
+ #include <linux/nvram.h>
+--- linux-2.6.0-test6/fs/adfs/super.c	2003-09-08 13:58:58.000000000 -0700
++++ 25/fs/adfs/super.c	2003-10-05 00:33:24.000000000 -0700
+@@ -18,6 +18,7 @@
+ #include <linux/init.h>
+ #include <linux/buffer_head.h>
+ #include <linux/vfs.h>
++#include <linux/parser.h>
+ 
+ #include <asm/bitops.h>
+ #include <asm/uaccess.h>
+@@ -133,50 +134,56 @@ static void adfs_put_super(struct super_
+ 	sb->s_fs_info = NULL;
+ }
+ 
++enum {Opt_uid, Opt_gid, Opt_ownmask, Opt_othmask, Opt_err};
++
++static match_table_t tokens = {
++	{Opt_uid, "uid=%u"},
++	{Opt_gid, "gid=%u"},
++	{Opt_ownmask, "ownmask=%o"},
++	{Opt_othmask, "othmask=%o"},
++	{Opt_err, NULL}
++};
++
+ static int parse_options(struct super_block *sb, char *options)
+ {
+-	char *value, *opt;
++	char *p;
+ 	struct adfs_sb_info *asb = ADFS_SB(sb);
++	int option;
+ 
+ 	if (!options)
+ 		return 0;
+ 
+-	while ((opt = strsep(&options, ",")) != NULL) {
+-		if (!*opt)
++	while ((p = strsep(&options, ",")) != NULL) {
++		substring_t args[MAX_OPT_ARGS];
++		int token;
++		if (!*p)
+ 			continue;
+-		value = strchr(opt, '=');
+-		if (value)
+-			*value++ = '\0';
+ 
+-		if (!strcmp(opt, "uid")) {	/* owner of all files */
+-			if (!value || !*value)
+-				return -EINVAL;
+-			asb->s_uid = simple_strtoul(value, &value, 0);
+-			if (*value)
+-				return -EINVAL;
+-		} else
+-		if (!strcmp(opt, "gid")) {	/* group owner of all files */
+-			if (!value || !*value)
+-				return -EINVAL;
+-			asb->s_gid = simple_strtoul(value, &value, 0);
+-			if (*value)
+-				return -EINVAL;
+-		} else
+-		if (!strcmp(opt, "ownmask")) {	/* owner permission mask */
+-			if (!value || !*value)
++		token = match_token(p, tokens, args);
++		switch (token) {
++		case Opt_uid:
++			if (match_int(args, &option))
+ 				return -EINVAL;
+-			asb->s_owner_mask = simple_strtoul(value, &value, 8);
+-			if (*value)
++			asb->s_uid = option;
++			break;
++		case Opt_gid:
++			if (match_int(args, &option))
+ 				return -EINVAL;
+-		} else
+-		if (!strcmp(opt, "othmask")) {	/* others permission mask */
+-			if (!value || !*value)
++			asb->s_gid = option;
++			break;
++		case Opt_ownmask:
++			if (match_octal(args, &option))
+ 				return -EINVAL;
+-			asb->s_other_mask = simple_strtoul(value, &value, 8);
+-			if (*value)
++			asb->s_owner_mask = option;
++			break;
++		case Opt_othmask:
++			if (match_octal(args, &option))
+ 				return -EINVAL;
+-		} else {			/* eh? say again. */
+-			printk("ADFS-fs: unrecognised mount option %s\n", opt);
++			asb->s_other_mask = option;
++			break;
++		default:
++			printk("ADFS-fs: unrecognised mount option \"%s\" "
++					"or missing value\n", p);
+ 			return -EINVAL;
+ 		}
+ 	}
+--- linux-2.6.0-test6/fs/affs/file.c	2003-09-08 13:58:58.000000000 -0700
++++ 25/fs/affs/file.c	2003-10-05 00:33:24.000000000 -0700
+@@ -39,7 +39,7 @@ static int affs_grow_extcache(struct ino
+ static struct buffer_head *affs_alloc_extblock(struct inode *inode, struct buffer_head *bh, u32 ext);
+ static inline struct buffer_head *affs_get_extblock(struct inode *inode, u32 ext);
+ static struct buffer_head *affs_get_extblock_slow(struct inode *inode, u32 ext);
+-static ssize_t affs_file_write(struct file *filp, const char *buf, size_t count, loff_t *ppos);
++static ssize_t affs_file_write(struct file *filp, const char __user *buf, size_t count, loff_t *ppos);
+ static int affs_file_open(struct inode *inode, struct file *filp);
+ static int affs_file_release(struct inode *inode, struct file *filp);
+ 
+@@ -491,7 +491,8 @@ affs_getemptyblk_ino(struct inode *inode
+ }
+ 
+ static ssize_t
+-affs_file_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
++affs_file_write(struct file *file, const char __user *buf,
++		size_t count, loff_t *ppos)
+ {
+ 	ssize_t retval;
+ 
+--- linux-2.6.0-test6/fs/affs/super.c	2003-06-22 12:04:44.000000000 -0700
++++ 25/fs/affs/super.c	2003-10-05 00:33:24.000000000 -0700
+@@ -28,6 +28,7 @@
+ #include <linux/smp_lock.h>
+ #include <linux/buffer_head.h>
+ #include <linux/vfs.h>
++#include <linux/parser.h>
+ #include <asm/system.h>
+ #include <asm/uaccess.h>
+ 
+@@ -142,12 +143,37 @@ static struct super_operations affs_sops
+ 	.remount_fs	= affs_remount,
+ };
+ 
++enum {
++	Opt_bs, Opt_mode, Opt_mufs, Opt_prefix, Opt_protect,
++	Opt_reserved, Opt_root, Opt_setgid, Opt_setuid,
++	Opt_verbose, Opt_volume, Opt_ignore, Opt_err,
++};
++
++static match_table_t tokens = {
++	{Opt_bs, "bs=%d"},
++	{Opt_mode, "mode=%o"},
++	{Opt_mufs, "mufs"},
++	{Opt_prefix, "prefix=%s"},
++	{Opt_protect, "protect"},
++	{Opt_reserved, "reserved=%d"},
++	{Opt_root, "root=%d"},
++	{Opt_setgid, "setgid=%d"},
++	{Opt_setuid, "setuid=%d"},
++	{Opt_verbose, "verbose"},
++	{Opt_volume, "volume=%s"},
++	{Opt_ignore, "grpquota"},
++	{Opt_ignore, "noquota"},
++	{Opt_ignore, "quota"},
++	{Opt_ignore, "usrquota"},
++	{Opt_err, NULL},
++};
++
+ static int
+ parse_options(char *options, uid_t *uid, gid_t *gid, int *mode, int *reserved, s32 *root,
+ 		int *blocksize, char **prefix, char *volume, unsigned long *mount_opts)
+ {
+-	char	*this_char, *value, *optn;
+-	int	 f;
++	char *p;
++	substring_t args[MAX_OPT_ARGS];
+ 
+ 	/* Fill in defaults */
+ 
+@@ -161,109 +187,85 @@ parse_options(char *options, uid_t *uid,
+ 	*mount_opts = 0;
+ 	if (!options)
+ 		return 1;
+-	while ((this_char = strsep(&options, ",")) != NULL) {
+-		if (!*this_char)
++
++	while ((p = strsep(&options, ",")) != NULL) {
++		int token, n, option;
++		if (!*p)
+ 			continue;
+-		f = 0;
+-		if ((value = strchr(this_char,'=')) != NULL)
+-			*value++ = 0;
+-		if ((optn = "protect") && !strcmp(this_char, optn)) {
+-			if (value)
+-				goto out_inv_arg;
+-			*mount_opts |= SF_IMMUTABLE;
+-		} else if ((optn = "verbose") && !strcmp(this_char, optn)) {
+-			if (value)
+-				goto out_inv_arg;
+-			*mount_opts |= SF_VERBOSE;
+-		} else if ((optn = "mufs") && !strcmp(this_char, optn)) {
+-			if (value)
+-				goto out_inv_arg;
+-			*mount_opts |= SF_MUFS;
+-		} else if ((f = !strcmp(this_char,"setuid")) || !strcmp(this_char,"setgid")) {
+-			if (value) {
+-				if (!*value) {
+-					printk("AFFS: Argument for set[ug]id option missing\n");
+-					return 0;
+-				} else {
+-					(f ? *uid : *gid) = simple_strtoul(value,&value,0);
+-					if (*value) {
+-						printk("AFFS: Bad set[ug]id argument\n");
+-						return 0;
+-					}
+-					*mount_opts |= f ? SF_SETUID : SF_SETGID;
+-				}
++
++		token = match_token(p, tokens, args);
++		switch (token) {
++		case Opt_bs:
++			if (match_int(&args[0], &n))
++				return -EINVAL;
++			if (n != 512 && n != 1024 && n != 2048
++			    && n != 4096) {
++				printk ("AFFS: Invalid blocksize (512, 1024, 2048, 4096 allowed)\n");
++				return 0;
+ 			}
+-		} else if (!strcmp(this_char,"prefix")) {
+-			optn = "prefix";
+-			if (!value || !*value)
+-				goto out_no_arg;
++			*blocksize = n;
++			break;
++		case Opt_mode:
++			if (match_octal(&args[0], &option))
++				return 1;
++			*mode = option & 0777;
++			*mount_opts |= SF_SETMODE;
++			break;
++		case Opt_mufs:
++			*mount_opts |= SF_MUFS;
++			break;
++		case Opt_prefix:
+ 			if (*prefix) {		/* Free any previous prefix */
+ 				kfree(*prefix);
+ 				*prefix = NULL;
+ 			}
+-			*prefix = kmalloc(strlen(value) + 1,GFP_KERNEL);
++			*prefix = match_strdup(&args[0]);
+ 			if (!*prefix)
+ 				return 0;
+-			strcpy(*prefix,value);
+ 			*mount_opts |= SF_PREFIX;
+-		} else if (!strcmp(this_char,"volume")) {
+-			optn = "volume";
+-			if (!value || !*value)
+-				goto out_no_arg;
+-			strlcpy(volume,value,31);
+-		} else if (!strcmp(this_char,"mode")) {
+-			optn = "mode";
+-			if (!value || !*value)
+-				goto out_no_arg;
+-			*mode = simple_strtoul(value,&value,8) & 0777;
+-			if (*value)
+-				return 0;
+-			*mount_opts |= SF_SETMODE;
+-		} else if (!strcmp(this_char,"reserved")) {
+-			optn = "reserved";
+-			if (!value || !*value)
+-				goto out_no_arg;
+-			*reserved = simple_strtoul(value,&value,0);
+-			if (*value)
+-				return 0;
+-		} else if (!strcmp(this_char,"root")) {
+-			optn = "root";
+-			if (!value || !*value)
+-				goto out_no_arg;
+-			*root = simple_strtoul(value,&value,0);
+-			if (*value)
+-				return 0;
+-		} else if (!strcmp(this_char,"bs")) {
+-			optn = "bs";
+-			if (!value || !*value)
+-				goto out_no_arg;
+-			*blocksize = simple_strtoul(value,&value,0);
+-			if (*value)
+-				return 0;
+-			if (*blocksize != 512 && *blocksize != 1024 && *blocksize != 2048
+-			    && *blocksize != 4096) {
+-				printk ("AFFS: Invalid blocksize (512, 1024, 2048, 4096 allowed)\n");
+-				return 0;
+-			}
+-		} else if (!strcmp (this_char, "grpquota")
+-			 || !strcmp (this_char, "noquota")
+-			 || !strcmp (this_char, "quota")
+-			 || !strcmp (this_char, "usrquota"))
+-			 /* Silently ignore the quota options */
+-			;
+-		else {
+-			printk("AFFS: Unrecognized mount option %s\n", this_char);
++			break;
++		case Opt_protect:
++			*mount_opts |= SF_IMMUTABLE;
++			break;
++		case Opt_reserved:
++			if (match_int(&args[0], reserved))
++				return 1;
++			break;
++		case Opt_root:
++			if (match_int(&args[0], root))
++				return 1;
++			break;
++		case Opt_setgid:
++			if (match_int(&args[0], &option))
++				return 1;
++			*gid = option;
++			*mount_opts |= SF_SETGID;
++			break;
++		case Opt_setuid:
++			if (match_int(&args[0], &option))
++				return -EINVAL;
++			*uid = option;
++			*mount_opts |= SF_SETUID;
++			break;
++		case Opt_verbose:
++			*mount_opts |= SF_VERBOSE;
++			break;
++		case Opt_volume: {
++			char *vol = match_strdup(&args[0]);
++			strlcpy(volume, vol, 32);
++			kfree(vol);
++			break;
++		}
++		case Opt_ignore:
++		 	/* Silently ignore the quota options */
++			break;
++		default:
++			printk("AFFS: Unrecognized mount option \"%s\" "
++					"or missing value\n", p);
+ 			return 0;
+ 		}
+ 	}
+ 	return 1;
+-
+-out_no_arg:
+-	printk("AFFS: The %s option requires an argument\n", optn);
+-	return 0;
+-out_inv_arg:
+-	printk("AFFS: Option %s does not take an argument\n", optn);
+-	return 0;
+ }
+ 
+ /* This function definitely needs to be split up. Some fine day I'll
+--- linux-2.6.0-test6/fs/aio.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/aio.c	2003-10-05 00:37:05.000000000 -0700
+@@ -27,6 +27,8 @@
+ #include <linux/aio.h>
+ #include <linux/highmem.h>
+ #include <linux/workqueue.h>
++#include <linux/writeback.h>
++#include <linux/pagemap.h>
+ 
+ #include <asm/kmap_types.h>
+ #include <asm/uaccess.h>
+@@ -38,6 +40,9 @@
+ #define dprintk(x...)	do { ; } while (0)
+ #endif
+ 
++long aio_run = 0; /* for testing only */
++long aio_wakeups = 0; /* for testing only */
++
+ /*------ sysctl variables----*/
+ atomic_t aio_nr = ATOMIC_INIT(0);	/* current system wide number of aio requests */
+ unsigned aio_max_nr = 0x10000;	/* system wide maximum number of aio requests */
+@@ -47,6 +52,7 @@ static kmem_cache_t	*kiocb_cachep;
+ static kmem_cache_t	*kioctx_cachep;
+ 
+ static struct workqueue_struct *aio_wq;
++static struct workqueue_struct *aio_fput_wq;
+ 
+ /* Used for rare fput completion. */
+ static void aio_fput_routine(void *);
+@@ -74,6 +80,7 @@ static int __init aio_setup(void)
+ 		panic("unable to create kioctx cache");
+ 
+ 	aio_wq = create_workqueue("aio");
++	aio_fput_wq = create_workqueue("aio_fput");
+ 
+ 	pr_debug("aio_setup: sizeof(struct page) = %d\n", (int)sizeof(struct page));
+ 
+@@ -281,6 +288,7 @@ static void aio_cancel_all(struct kioctx
+ 		struct kiocb *iocb = list_kiocb(pos);
+ 		list_del_init(&iocb->ki_list);
+ 		cancel = iocb->ki_cancel;
++		kiocbSetCancelled(iocb);
+ 		if (cancel) {
+ 			iocb->ki_users++;
+ 			spin_unlock_irq(&ctx->ctx_lock);
+@@ -341,6 +349,11 @@ void exit_aio(struct mm_struct *mm)
+ 		aio_cancel_all(ctx);
+ 
+ 		wait_for_all_aios(ctx);
++		/*
++		 * this is an overkill, but ensures we don't leave
++		 * the ctx on the aio_wq
++		 */
++		flush_workqueue(aio_wq);
+ 
+ 		if (1 != atomic_read(&ctx->users))
+ 			printk(KERN_DEBUG
+@@ -395,6 +408,7 @@ static struct kiocb *__aio_get_req(struc
+ 	req->ki_cancel = NULL;
+ 	req->ki_retry = NULL;
+ 	req->ki_user_obj = NULL;
++	INIT_LIST_HEAD(&req->ki_run_list);
+ 
+ 	/* Check if the completion queue has enough free space to
+ 	 * accept an event from this io.
+@@ -494,7 +508,7 @@ static int __aio_put_req(struct kioctx *
+ 		spin_lock(&fput_lock);
+ 		list_add(&req->ki_list, &fput_head);
+ 		spin_unlock(&fput_lock);
+-		queue_work(aio_wq, &fput_work);
++		queue_work(aio_fput_wq, &fput_work);
+ 	} else
+ 		really_put_req(ctx, req);
+ 	return 1;
+@@ -536,65 +550,307 @@ struct kioctx *lookup_ioctx(unsigned lon
+ 	return ioctx;
+ }
+ 
++/*
++ * use_mm
++ * 	Makes the calling kernel thread take on the specified
++ * 	mm context.
++ * 	Called by the retry thread execute retries within the
++ * 	iocb issuer's mm context, so that copy_from/to_user
++ * 	operations work seamlessly for aio.
++ * 	(Note: this routine is intended to be called only
++ * 	from a kernel thread context)
++ */
+ static void use_mm(struct mm_struct *mm)
+ {
+-	struct mm_struct *active_mm = current->active_mm;
++	struct mm_struct *active_mm;
++	struct task_struct *tsk = current;
++
++	task_lock(tsk);
++	active_mm = tsk->active_mm;
+ 	atomic_inc(&mm->mm_count);
+-	current->mm = mm;
+-	if (mm != active_mm) {
+-		current->active_mm = mm;
+-		activate_mm(active_mm, mm);
+-	}
++	tsk->mm = mm;
++	tsk->active_mm = mm;
++	activate_mm(active_mm, mm);
++	task_unlock(tsk);
++
+ 	mmdrop(active_mm);
+ }
+ 
+-static void unuse_mm(struct mm_struct *mm)
++/*
++ * unuse_mm
++ * 	Reverses the effect of use_mm, i.e. releases the
++ * 	specified mm context which was earlier taken on
++ * 	by the calling kernel thread
++ * 	(Note: this routine is intended to be called only
++ * 	from a kernel thread context)
++ *
++ * Comments: Called with ctx->ctx_lock held. This nests
++ * task_lock instead ctx_lock.
++ */
++void unuse_mm(struct mm_struct *mm)
+ {
+-	current->mm = NULL;
++	struct task_struct *tsk = current;
++
++	task_lock(tsk);
++	tsk->mm = NULL;
+ 	/* active_mm is still 'mm' */
+-	enter_lazy_tlb(mm, current);
++	enter_lazy_tlb(mm, tsk);
++	task_unlock(tsk);
+ }
+ 
+-/* Run on kevent's context.  FIXME: needs to be per-cpu and warn if an
+- * operation blocks.
++/*
++ * Queue up a kiocb to be retried. Assumes that the kiocb
++ * has already been marked as kicked, and places it on
++ * the retry run list for the corresponding ioctx, if it
++ * isn't already queued. Returns 1 if it actually queued
++ * the kiocb (to tell the caller to activate the work
++ * queue to process it), or 0, if it found that it was
++ * already queued.
++ *
++ * Should be called with the spin lock iocb->ki_ctx->ctx_lock
++ * held
+  */
+-static void aio_kick_handler(void *data)
++static inline int __queue_kicked_iocb(struct kiocb *iocb)
+ {
+-	struct kioctx *ctx = data;
++	struct kioctx	*ctx = iocb->ki_ctx;
+ 
+-	use_mm(ctx->mm);
++	if (list_empty(&iocb->ki_run_list)) {
++		list_add_tail(&iocb->ki_run_list,
++			&ctx->run_list);
++		iocb->ki_queued++;
++		return 1;
++	}
++	return 0;
++}
+ 
+-	spin_lock_irq(&ctx->ctx_lock);
+-	while (!list_empty(&ctx->run_list)) {
+-		struct kiocb *iocb;
+-		long ret;
++/* aio_run_iocb
++ * 	 This is the core aio execution routine. It is
++ * 	 invoked both for initial i/o submission and
++ * 	 subsequent retries via the aio_kick_handler.
++ *       Expects to be invoked with iocb->ki_ctx->lock
++ *       already held. The lock is released and reaquired
++ *       as needed during processing.
++ *
++ * Calls the iocb retry method (already setup for the
++ * iocb on initial submission) for operation specific
++ * handling, but takes care of most of common retry
++ * execution details for a given iocb. The retry method
++ * needs to be non-blocking as far as possible, to avoid
++ * holding up other iocbs waiting to be serviced by the
++ * retry kernel thread.
++ *
++ * The trickier parts in this code have to do with
++ * ensuring that only one retry instance is in progress
++ * for a given iocb at any time. Providing that guarantee
++ * simplifies the coding of individual aio operations as
++ * it avoids various potential races.
++ */
++static ssize_t aio_run_iocb(struct kiocb *iocb)
++{
++	struct kioctx	*ctx = iocb->ki_ctx;
++	ssize_t (*retry)(struct kiocb *);
++	ssize_t ret;
+ 
+-		iocb = list_entry(ctx->run_list.next, struct kiocb,
+-				  ki_run_list);
+-		list_del(&iocb->ki_run_list);
+-		iocb->ki_users ++;
+-		spin_unlock_irq(&ctx->ctx_lock);
++	if (iocb->ki_retried++ > 1024*1024) {
++		printk("Maximal retry count.  Bytes done %Zd\n",
++			iocb->ki_nbytes - iocb->ki_left);
++		return -EAGAIN;
++	}
++
++	if (!(iocb->ki_retried & 0xff)) {
++		pr_debug("%ld retry: %d of %d (kick %ld, Q %ld run %ld, wake %ld)\n",
++			iocb->ki_retried,
++			iocb->ki_nbytes - iocb->ki_left, iocb->ki_nbytes,
++			iocb->ki_kicked, iocb->ki_queued, aio_run, aio_wakeups);
++	}
++
++	if (!(retry = iocb->ki_retry)) {
++		printk("aio_run_iocb: iocb->ki_retry = NULL\n");
++		return 0;
++	}
++
++	/*
++	 * We don't want the next retry iteration for this
++	 * operation to start until this one has returned and
++	 * updated the iocb state. However, wait_queue functions
++	 * can trigger a kick_iocb from interrupt context in the
++	 * meantime, indicating that data is available for the next
++	 * iteration. We want to remember that and enable the
++	 * next retry iteration _after_ we are through with
++	 * this one.
++	 *
++	 * So, in order to be able to register a "kick", but
++	 * prevent it from being queued now, we clear the kick
++	 * flag, but make the kick code *think* that the iocb is
++	 * still on the run list until we are actually done.
++	 * When we are done with this iteration, we check if
++	 * the iocb was kicked in the meantime and if so, queue
++	 * it up afresh.
++	 */
++
++	kiocbClearKicked(iocb);
++
++	/*
++	 * This is so that aio_complete knows it doesn't need to
++	 * pull the iocb off the run list (We can't just call
++	 * INIT_LIST_HEAD because we don't want a kick_iocb to
++	 * queue this on the run list yet)
++	 */
++	iocb->ki_run_list.next = iocb->ki_run_list.prev = NULL;
++	iocb->ki_retry = NULL;
++	spin_unlock_irq(&ctx->ctx_lock);
++
++	/* Quit retrying if the i/o has been cancelled */
++	if (kiocbIsCancelled(iocb)) {
++		ret = -EINTR;
++		aio_complete(iocb, ret, 0);
++		/* must not access the iocb after this */
++		goto out;
++	}
++
++	/*
++	 * Now we are all set to call the retry method in async
++	 * context. By setting this thread's io_wait context
++	 * to point to the wait queue entry inside the currently
++	 * running iocb for the duration of the retry, we ensure
++	 * that async notification wakeups are queued by the
++	 * operation instead of blocking waits, and when notified,
++	 * cause the iocb to be kicked for continuation (through
++	 * the aio_wake_function callback).
++	 */
++	BUG_ON(current->io_wait != NULL);
++	current->io_wait = &iocb->ki_wait;
++	ret = retry(iocb);
++	current->io_wait = NULL;
+ 
+-		kiocbClearKicked(iocb);
+-		ret = iocb->ki_retry(iocb);
++	if (-EIOCBRETRY != ret) {
+ 		if (-EIOCBQUEUED != ret) {
++			BUG_ON(!list_empty(&iocb->ki_wait.task_list));
+ 			aio_complete(iocb, ret, 0);
+-			iocb = NULL;
++			/* must not access the iocb after this */
+ 		}
++	} else {
++		/*
++		 * Issue an additional retry to avoid waiting forever if
++		 * no waits were queued (e.g. in case of a short read).
++		 */
++		if (list_empty(&iocb->ki_wait.task_list))
++			kiocbSetKicked(iocb);
++	}
++out:
++	spin_lock_irq(&ctx->ctx_lock);
+ 
+-		spin_lock_irq(&ctx->ctx_lock);
+-		if (NULL != iocb)
+-			__aio_put_req(ctx, iocb);
++	if (-EIOCBRETRY == ret) {
++		/*
++		 * OK, now that we are done with this iteration
++		 * and know that there is more left to go,
++		 * this is where we let go so that a subsequent
++		 * "kick" can start the next iteration
++		 */
++		iocb->ki_retry = retry;
++		/* will make __queue_kicked_iocb succeed from here on */
++		INIT_LIST_HEAD(&iocb->ki_run_list);
++		/* we must queue the next iteration ourselves, if it
++		 * has already been kicked */
++		if (kiocbIsKicked(iocb)) {
++			__queue_kicked_iocb(iocb);
++		}
+ 	}
++	return ret;
++}
++
++/*
++ * __aio_run_iocbs:
++ * 	Process all pending retries queued on the ioctx
++ * 	run list.
++ * Assumes it is operating within the aio issuer's mm
++ * context. Expects to be called with ctx->ctx_lock held
++ */
++static void __aio_run_iocbs(struct kioctx *ctx)
++{
++	struct kiocb *iocb;
++	int count = 0;
++
++	while (!list_empty(&ctx->run_list)) {
++		iocb = list_entry(ctx->run_list.next, struct kiocb,
++			ki_run_list);
++		list_del(&iocb->ki_run_list);
++		/*
++		 * Hold an extra reference while retrying i/o.
++		 */
++		iocb->ki_users++;	/* grab extra reference */
++		aio_run_iocb(iocb);
++		if (__aio_put_req(ctx, iocb))  /* drop extra ref */
++			put_ioctx(ctx);
++		count++;
++	}
++	aio_run++;
++}
++
++/*
++ * aio_run_iocbs:
++ * 	Process all pending retries queued on the ioctx
++ * 	run list.
++ * Assumes it is operating within the aio issuer's mm
++ * context.
++ */
++static inline void aio_run_iocbs(struct kioctx *ctx)
++{
++	spin_lock_irq(&ctx->ctx_lock);
++	__aio_run_iocbs(ctx);
+ 	spin_unlock_irq(&ctx->ctx_lock);
++}
++
++/*
++ * aio_kick_handler:
++ * 	Work queue handler triggered to process pending
++ * 	retries on an ioctx. Takes on the aio issuer's
++ * 	mm context before running the iocbs.
++ * Run on aiod's context.
++ */
++static void aio_kick_handler(void *data)
++{
++	struct kioctx *ctx = data;
+ 
++	use_mm(ctx->mm);
++	spin_lock_irq(&ctx->ctx_lock);
++	__aio_run_iocbs(ctx);
+ 	unuse_mm(ctx->mm);
++	spin_unlock_irq(&ctx->ctx_lock);
+ }
+ 
+-void kick_iocb(struct kiocb *iocb)
++
++/*
++ * Called by kick_iocb to queue the kiocb for retry
++ * and if required activate the aio work queue to process
++ * it
++ */
++void queue_kicked_iocb(struct kiocb *iocb)
+ {
+ 	struct kioctx	*ctx = iocb->ki_ctx;
++	unsigned long flags;
++	int run = 0;
+ 
++	WARN_ON((!list_empty(&iocb->ki_wait.task_list)));
++
++	spin_lock_irqsave(&ctx->ctx_lock, flags);
++	run = __queue_kicked_iocb(iocb);
++	spin_unlock_irqrestore(&ctx->ctx_lock, flags);
++	if (run) {
++		queue_work(aio_wq, &ctx->wq);
++		aio_wakeups++;
++	}
++}
++
++/*
++ * kick_iocb:
++ * 	Called typically from a wait queue callback context
++ * 	(aio_wake_function) to trigger a retry of the iocb.
++ * 	The retry is usually executed by aio workqueue
++ * 	threads (See aio_kick_handler).
++ */
++void kick_iocb(struct kiocb *iocb)
++{
+ 	/* sync iocbs are easy: they can only ever be executing from a 
+ 	 * single context. */
+ 	if (is_sync_kiocb(iocb)) {
+@@ -603,12 +859,10 @@ void kick_iocb(struct kiocb *iocb)
+ 		return;
+ 	}
+ 
++	iocb->ki_kicked++;
++	/* If its already kicked we shouldn't queue it again */
+ 	if (!kiocbTryKick(iocb)) {
+-		unsigned long flags;
+-		spin_lock_irqsave(&ctx->ctx_lock, flags);
+-		list_add_tail(&iocb->ki_run_list, &ctx->run_list);
+-		spin_unlock_irqrestore(&ctx->ctx_lock, flags);
+-		schedule_work(&ctx->wq);
++		queue_kicked_iocb(iocb);
+ 	}
+ }
+ 
+@@ -661,6 +915,9 @@ int aio_complete(struct kiocb *iocb, lon
+ 	 */
+ 	spin_lock_irqsave(&ctx->ctx_lock, flags);
+ 
++	if (iocb->ki_run_list.prev && !list_empty(&iocb->ki_run_list))
++		list_del_init(&iocb->ki_run_list);
++
+ 	ring = kmap_atomic(info->ring_pages[0], KM_IRQ1);
+ 
+ 	tail = info->tail;
+@@ -689,6 +946,11 @@ int aio_complete(struct kiocb *iocb, lon
+ 
+ 	pr_debug("added to ring %p at [%lu]\n", iocb, tail);
+ 
++	pr_debug("%ld retries: %d of %d (kicked %ld, Q %ld run %ld wake %ld)\n",
++		iocb->ki_retried,
++		iocb->ki_nbytes - iocb->ki_left, iocb->ki_nbytes,
++		iocb->ki_kicked, iocb->ki_queued, aio_run, aio_wakeups);
++
+ 	/* everything turned out well, dispose of the aiocb. */
+ 	ret = __aio_put_req(ctx, iocb);
+ 
+@@ -803,6 +1065,7 @@ static int read_events(struct kioctx *ct
+ 	int			i = 0;
+ 	struct io_event		ent;
+ 	struct timeout		to;
++	int 			event_loop = 0; /* testing only */
+ 
+ 	/* needed to zero any padding within an entry (there shouldn't be 
+ 	 * any, but C is fun!
+@@ -852,7 +1115,6 @@ static int read_events(struct kioctx *ct
+ 		add_wait_queue_exclusive(&ctx->wait, &wait);
+ 		do {
+ 			set_task_state(tsk, TASK_INTERRUPTIBLE);
+-
+ 			ret = aio_read_evt(ctx, &ent);
+ 			if (ret)
+ 				break;
+@@ -862,6 +1124,7 @@ static int read_events(struct kioctx *ct
+ 			if (to.timed_out)	/* Only check after read evt */
+ 				break;
+ 			schedule();
++			event_loop++;
+ 			if (signal_pending(tsk)) {
+ 				ret = -EINTR;
+ 				break;
+@@ -889,6 +1152,9 @@ static int read_events(struct kioctx *ct
+ 	if (timeout)
+ 		clear_timeout(&to);
+ out:
++	pr_debug("event loop executed %d times\n", event_loop);
++	pr_debug("aio_run %ld\n", aio_run);
++	pr_debug("aio_wakeups %ld\n", aio_wakeups);
+ 	return i ? i : ret;
+ }
+ 
+@@ -918,6 +1184,11 @@ static void io_destroy(struct kioctx *io
+ 
+ 	aio_cancel_all(ioctx);
+ 	wait_for_all_aios(ioctx);
++	/*
++	 * this is an overkill, but ensures we don't leave
++	 * the ctx on the aio_wq
++	 */
++	flush_workqueue(aio_wq);
+ 	put_ioctx(ioctx);	/* once for the lookup */
+ }
+ 
+@@ -980,13 +1251,192 @@ asmlinkage long sys_io_destroy(aio_conte
+ 	return -EINVAL;
+ }
+ 
++/*
++ * Retry method for aio_read (also used for first time submit)
++ * Responsible for updating iocb state as retries progress
++ */
++static ssize_t aio_pread(struct kiocb *iocb)
++{
++	struct file *file = iocb->ki_filp;
++	ssize_t ret = 0;
++
++	ret = file->f_op->aio_read(iocb, iocb->ki_buf,
++		iocb->ki_left, iocb->ki_pos);
++
++	/*
++	 * Can't just depend on iocb->ki_left to determine
++	 * whether we are done. This may have been a short read.
++	 */
++	if (ret > 0) {
++		iocb->ki_buf += ret;
++		iocb->ki_left -= ret;
++
++		ret = -EIOCBRETRY;
++	}
++
++	/* This means we must have transferred all that we could */
++	/* No need to retry anymore */
++	if ((ret == 0) || (iocb->ki_left == 0))
++		ret = iocb->ki_nbytes - iocb->ki_left;
++
++	return ret;
++}
++
++/*
++ * Retry method for aio_write (also used for first time submit)
++ * Responsible for updating iocb state as retries progress
++ */
++static ssize_t aio_pwrite(struct kiocb *iocb)
++{
++	struct file *file = iocb->ki_filp;
++	struct address_space *mapping = file->f_mapping;
++	struct inode *inode = mapping->host;
++	ssize_t ret = 0;
++
++	ret = file->f_op->aio_write(iocb, iocb->ki_buf,
++				iocb->ki_left, iocb->ki_pos);
++
++	/*
++	 * Even if iocb->ki_left = 0, we may need to wait
++	 * for a balance_dirty_pages to complete
++	 */
++	if (ret > 0) {
++		iocb->ki_buf += iocb->ki_buf ? ret : 0;
++		iocb->ki_left -= ret;
++
++		ret = -EIOCBRETRY;
++	}
++
++	/* This means we must have transferred all that we could */
++	/* No need to retry anymore unless we need to osync data */
++	if (ret == 0) {
++		ret = iocb->ki_nbytes - iocb->ki_left;
++		if (!iocb->ki_buf)
++			return ret;
++
++		/* Set things up for potential O_SYNC */
++		if (ret > 0 && ((file->f_flags & O_SYNC) || IS_SYNC(inode))) {
++			iocb->ki_buf = NULL;
++			iocb->ki_pos -= ret; /* back up fpos */
++			iocb->ki_left = ret; /* sync what we have written out */
++			iocb->ki_nbytes = ret;
++			ret = -EIOCBRETRY;
++		}
++	}
++
++	return ret;
++}
++
++static ssize_t aio_fdsync(struct kiocb *iocb)
++{
++	struct file *file = iocb->ki_filp;
++	ssize_t ret = -EINVAL;
++
++	if (file->f_op->aio_fsync)
++		ret = file->f_op->aio_fsync(iocb, 1);
++	return ret;
++}
++
++static ssize_t aio_fsync(struct kiocb *iocb)
++{
++	struct file *file = iocb->ki_filp;
++	ssize_t ret = -EINVAL;
++
++	if (file->f_op->aio_fsync)
++		ret = file->f_op->aio_fsync(iocb, 0);
++	return ret;
++}
++
++/*
++ * aio_setup_iocb:
++ *	Performs the initial checks and aio retry method
++ *	setup for the kiocb at the time of io submission.
++ */
++ssize_t aio_setup_iocb(struct kiocb *kiocb)
++{
++	struct file *file = kiocb->ki_filp;
++	ssize_t ret = 0;
++
++	switch (kiocb->ki_opcode) {
++	case IOCB_CMD_PREAD:
++		ret = -EBADF;
++		if (unlikely(!(file->f_mode & FMODE_READ)))
++			break;
++		ret = -EFAULT;
++		if (unlikely(!access_ok(VERIFY_WRITE, kiocb->ki_buf,
++			kiocb->ki_left)))
++			break;
++		ret = -EINVAL;
++		if (file->f_op->aio_read)
++			kiocb->ki_retry = aio_pread;
++		break;
++	case IOCB_CMD_PWRITE:
++		ret = -EBADF;
++		if (unlikely(!(file->f_mode & FMODE_WRITE)))
++			break;
++		ret = -EFAULT;
++		if (unlikely(!access_ok(VERIFY_READ, kiocb->ki_buf,
++			kiocb->ki_left)))
++			break;
++		ret = -EINVAL;
++		if (file->f_op->aio_write)
++			kiocb->ki_retry = aio_pwrite;
++		break;
++	case IOCB_CMD_FDSYNC:
++		ret = -EINVAL;
++		if (file->f_op->aio_fsync)
++			kiocb->ki_retry = aio_fdsync;
++		break;
++	case IOCB_CMD_FSYNC:
++		ret = -EINVAL;
++		if (file->f_op->aio_fsync)
++			kiocb->ki_retry = aio_fsync;
++		break;
++	default:
++		dprintk("EINVAL: io_submit: no operation provided\n");
++		ret = -EINVAL;
++	}
++
++	if (!kiocb->ki_retry)
++		return ret;
++
++	return 0;
++}
++
++/*
++ * aio_wake_function:
++ * 	wait queue callback function for aio notification,
++ * 	Simply triggers a retry of the operation via kick_iocb.
++ *
++ * 	This callback is specified in the wait queue entry in
++ *	a kiocb	(current->io_wait points to this wait queue
++ *	entry when an aio operation executes; it is used
++ * 	instead of a synchronous wait when an i/o blocking
++ *	condition is encountered during aio).
++ *
++ * Note:
++ * This routine is executed with the wait queue lock held.
++ * Since kick_iocb acquires iocb->ctx->ctx_lock, it nests
++ * the ioctx lock inside the wait queue lock. This is safe
++ * because this callback isn't used for wait queues which
++ * are nested inside ioctx lock (i.e. ctx->wait)
++ */
++int aio_wake_function(wait_queue_t *wait, unsigned mode, int sync)
++{
++	struct kiocb *iocb = container_of(wait, struct kiocb, ki_wait);
++
++	list_del_init(&wait->task_list);
++	kick_iocb(iocb);
++	return 1;
++}
++
+ int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
+ 			 struct iocb *iocb)
+ {
+ 	struct kiocb *req;
+ 	struct file *file;
+ 	ssize_t ret;
+-	char *buf;
++	int need_putctx;
+ 
+ 	/* enforce forwards compatibility on users */
+ 	if (unlikely(iocb->aio_reserved1 || iocb->aio_reserved2 ||
+@@ -1027,51 +1477,41 @@ int io_submit_one(struct kioctx *ctx, st
+ 	req->ki_user_data = iocb->aio_data;
+ 	req->ki_pos = iocb->aio_offset;
+ 
+-	buf = (char *)(unsigned long)iocb->aio_buf;
++	req->ki_buf = (char *)(unsigned long)iocb->aio_buf;
++	req->ki_left = req->ki_nbytes = iocb->aio_nbytes;
++	req->ki_opcode = iocb->aio_lio_opcode;
++	init_waitqueue_func_entry(&req->ki_wait, aio_wake_function);
++	INIT_LIST_HEAD(&req->ki_wait.task_list);
++	req->ki_run_list.next = req->ki_run_list.prev = NULL;
++	req->ki_retry = NULL;
++	req->ki_retried = 0;
++	req->ki_kicked = 0;
++	req->ki_queued = 0;
++	aio_run = 0;
++	aio_wakeups = 0;
+ 
+-	switch (iocb->aio_lio_opcode) {
+-	case IOCB_CMD_PREAD:
+-		ret = -EBADF;
+-		if (unlikely(!(file->f_mode & FMODE_READ)))
+-			goto out_put_req;
+-		ret = -EFAULT;
+-		if (unlikely(!access_ok(VERIFY_WRITE, buf, iocb->aio_nbytes)))
+-			goto out_put_req;
+-		ret = -EINVAL;
+-		if (file->f_op->aio_read)
+-			ret = file->f_op->aio_read(req, buf,
+-					iocb->aio_nbytes, req->ki_pos);
+-		break;
+-	case IOCB_CMD_PWRITE:
+-		ret = -EBADF;
+-		if (unlikely(!(file->f_mode & FMODE_WRITE)))
+-			goto out_put_req;
+-		ret = -EFAULT;
+-		if (unlikely(!access_ok(VERIFY_READ, buf, iocb->aio_nbytes)))
+-			goto out_put_req;
+-		ret = -EINVAL;
+-		if (file->f_op->aio_write)
+-			ret = file->f_op->aio_write(req, buf,
+-					iocb->aio_nbytes, req->ki_pos);
+-		break;
+-	case IOCB_CMD_FDSYNC:
+-		ret = -EINVAL;
+-		if (file->f_op->aio_fsync)
+-			ret = file->f_op->aio_fsync(req, 1);
+-		break;
+-	case IOCB_CMD_FSYNC:
+-		ret = -EINVAL;
+-		if (file->f_op->aio_fsync)
+-			ret = file->f_op->aio_fsync(req, 0);
+-		break;
+-	default:
+-		dprintk("EINVAL: io_submit: no operation provided\n");
+-		ret = -EINVAL;
+-	}
++	ret = aio_setup_iocb(req);
++
++	if (ret)
++		goto out_put_req;
++
++	spin_lock_irq(&ctx->ctx_lock);
++	/*
++	 * Hold an extra reference while submitting the i/o.
++	 * This prevents races between the aio code path referencing the
++	 * req (after submitting it) and aio_complete() freeing the req.
++	 */
++	req->ki_users++;			/* grab extra reference */
++	ret = aio_run_iocb(req);
++	need_putctx = __aio_put_req(ctx, req);	/* drop the extra reference */
++	spin_unlock_irq(&ctx->ctx_lock);
++
++	if (-EIOCBRETRY == ret)
++		queue_work(aio_wq, &ctx->wq);
++
++	if (need_putctx)
++		put_ioctx(ctx);
+ 
+-	if (likely(-EIOCBQUEUED == ret))
+-		return 0;
+-	aio_complete(req, ret, 0);
+ 	return 0;
+ 
+ out_put_req:
+--- linux-2.6.0-test6/fs/autofs4/inode.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/autofs4/inode.c	2003-10-05 00:33:24.000000000 -0700
+@@ -14,6 +14,7 @@
+ #include <linux/slab.h>
+ #include <linux/file.h>
+ #include <linux/pagemap.h>
++#include <linux/parser.h>
+ #include <asm/bitops.h>
+ #include "autofs_i.h"
+ #include <linux/module.h>
+@@ -94,11 +95,25 @@ static struct super_operations autofs4_s
+ 	.statfs		= simple_statfs,
+ };
+ 
++enum {Opt_err, Opt_fd, Opt_uid, Opt_gid, Opt_pgrp, Opt_minproto, Opt_maxproto};
++
++static match_table_t tokens = {
++	{Opt_fd, "fd=%d"},
++	{Opt_uid, "uid=%d"},
++	{Opt_gid, "gid=%d"},
++	{Opt_pgrp, "pgrp=%d"},
++	{Opt_minproto, "minproto=%d"},
++	{Opt_maxproto, "maxproto=%d"},
++	{Opt_err, NULL}
++};
++
+ static int parse_options(char *options, int *pipefd, uid_t *uid, gid_t *gid,
+ 			 pid_t *pgrp, int *minproto, int *maxproto)
+ {
+-	char *this_char, *value;
+-	
++	char *p;
++	substring_t args[MAX_OPT_ARGS];
++	int option;
++
+ 	*uid = current->uid;
+ 	*gid = current->gid;
+ 	*pgrp = process_group(current);
+@@ -108,55 +123,48 @@ static int parse_options(char *options, 
+ 
+ 	*pipefd = -1;
+ 
+-	if ( !options ) return 1;
+-	while ((this_char = strsep(&options,",")) != NULL) {
+-		if (!*this_char)
++	if (!options)
++		return 1;
++
++	while ((p = strsep(&options, ",")) != NULL) {
++		int token;
++		if (!*p)
+ 			continue;
+-		if ((value = strchr(this_char,'=')) != NULL)
+-			*value++ = 0;
+-		if (!strcmp(this_char,"fd")) {
+-			if (!value || !*value)
+-				return 1;
+-			*pipefd = simple_strtoul(value,&value,0);
+-			if (*value)
+-				return 1;
+-		}
+-		else if (!strcmp(this_char,"uid")) {
+-			if (!value || !*value)
+-				return 1;
+-			*uid = simple_strtoul(value,&value,0);
+-			if (*value)
+-				return 1;
+-		}
+-		else if (!strcmp(this_char,"gid")) {
+-			if (!value || !*value)
+-				return 1;
+-			*gid = simple_strtoul(value,&value,0);
+-			if (*value)
+-				return 1;
+-		}
+-		else if (!strcmp(this_char,"pgrp")) {
+-			if (!value || !*value)
+-				return 1;
+-			*pgrp = simple_strtoul(value,&value,0);
+-			if (*value)
+-				return 1;
+-		}
+-		else if (!strcmp(this_char,"minproto")) {
+-			if (!value || !*value)
+-				return 1;
+-			*minproto = simple_strtoul(value,&value,0);
+-			if (*value)
+-				return 1;
+-		}
+-		else if (!strcmp(this_char,"maxproto")) {
+-			if (!value || !*value)
+-				return 1;
+-			*maxproto = simple_strtoul(value,&value,0);
+-			if (*value)
+-				return 1;
++
++		token = match_token(p, tokens, args);
++		switch (token) {
++		case Opt_fd:
++			if (match_int(args, pipefd))
++				return 1;
++			break;
++		case Opt_uid:
++			if (match_int(args, &option))
++				return 1;
++			*uid = option;
++			break;
++		case Opt_gid:
++			if (match_int(args, &option))
++				return 1;
++			*gid = option;
++			break;
++		case Opt_pgrp:
++			if (match_int(args, &option))
++				return 1;
++			*pgrp = option;
++			break;
++		case Opt_minproto:
++			if (match_int(args, &option))
++				return 1;
++			*minproto = option;
++			break;
++		case Opt_maxproto:
++			if (match_int(args, &option))
++				return 1;
++			*maxproto = option;
++			break;
++		default:
++			return 1;
+ 		}
+-		else break;
+ 	}
+ 	return (*pipefd < 0);
+ }
+--- linux-2.6.0-test6/fs/autofs/inode.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/autofs/inode.c	2003-10-05 00:33:24.000000000 -0700
+@@ -14,6 +14,7 @@
+ #include <linux/mm.h>
+ #include <linux/slab.h>
+ #include <linux/file.h>
++#include <linux/parser.h>
+ #include <asm/bitops.h>
+ #include "autofs_i.h"
+ #include <linux/module.h>
+@@ -45,10 +46,24 @@ static struct super_operations autofs_so
+ 	.statfs		= simple_statfs,
+ };
+ 
++enum {Opt_err, Opt_fd, Opt_uid, Opt_gid, Opt_pgrp, Opt_minproto, Opt_maxproto};
++
++static match_table_t autofs_tokens = {
++	{Opt_fd, "fd=%d"},
++	{Opt_uid, "uid=%d"},
++	{Opt_gid, "gid=%d"},
++	{Opt_pgrp, "pgrp=%d"},
++	{Opt_minproto, "minproto=%d"},
++	{Opt_maxproto, "maxproto=%d"},
++	{Opt_err, NULL}
++};
++
+ static int parse_options(char *options, int *pipefd, uid_t *uid, gid_t *gid, pid_t *pgrp, int *minproto, int *maxproto)
+ {
+-	char *this_char, *value;
+-	
++	char *p;
++	substring_t args[MAX_OPT_ARGS];
++	int option;
++
+ 	*uid = current->uid;
+ 	*gid = current->gid;
+ 	*pgrp = process_group(current);
+@@ -57,55 +72,49 @@ static int parse_options(char *options, 
+ 
+ 	*pipefd = -1;
+ 
+-	if ( !options ) return 1;
+-	while ((this_char = strsep(&options,",")) != NULL) {
+-		if (!*this_char)
++	if (!options)
++		return 1;
++
++	while ((p = strsep(&options, ",")) != NULL) {
++		int token;
++		if (!*p)
+ 			continue;
+-		if ((value = strchr(this_char,'=')) != NULL)
+-			*value++ = 0;
+-		if (!strcmp(this_char,"fd")) {
+-			if (!value || !*value)
+-				return 1;
+-			*pipefd = simple_strtoul(value,&value,0);
+-			if (*value)
+-				return 1;
+-		}
+-		else if (!strcmp(this_char,"uid")) {
+-			if (!value || !*value)
+-				return 1;
+-			*uid = simple_strtoul(value,&value,0);
+-			if (*value)
+-				return 1;
+-		}
+-		else if (!strcmp(this_char,"gid")) {
+-			if (!value || !*value)
+-				return 1;
+-			*gid = simple_strtoul(value,&value,0);
+-			if (*value)
+-				return 1;
+-		}
+-		else if (!strcmp(this_char,"pgrp")) {
+-			if (!value || !*value)
+-				return 1;
+-			*pgrp = simple_strtoul(value,&value,0);
+-			if (*value)
+-				return 1;
+-		}
+-		else if (!strcmp(this_char,"minproto")) {
+-			if (!value || !*value)
+-				return 1;
+-			*minproto = simple_strtoul(value,&value,0);
+-			if (*value)
+-				return 1;
+-		}
+-		else if (!strcmp(this_char,"maxproto")) {
+-			if (!value || !*value)
+-				return 1;
+-			*maxproto = simple_strtoul(value,&value,0);
+-			if (*value)
+-				return 1;
++
++		token = match_token(p, autofs_tokens, args);
++		switch (token) {
++		case Opt_fd:
++			if (match_int(&args[0], &option))
++				return 1;
++			*pipefd = option;
++			break;
++		case Opt_uid:
++			if (match_int(&args[0], &option))
++				return 1;
++			*uid = option;
++			break;
++		case Opt_gid:
++			if (match_int(&args[0], &option))
++				return 1;
++			*gid = option;
++			break;
++		case Opt_pgrp:
++			if (match_int(&args[0], &option))
++				return 1;
++			*pgrp = option;
++			break;
++		case Opt_minproto:
++			if (match_int(&args[0], &option))
++				return 1;
++			*minproto = option;
++			break;
++		case Opt_maxproto:
++			if (match_int(&args[0], &option))
++				return 1;
++			*maxproto = option;
++			break;
++		default:
++			return 1;
+ 		}
+-		else break;
+ 	}
+ 	return (*pipefd < 0);
+ }
+--- linux-2.6.0-test6/fs/befs/linuxvfs.c	2003-07-10 18:50:31.000000000 -0700
++++ 25/fs/befs/linuxvfs.c	2003-10-05 00:33:24.000000000 -0700
+@@ -13,6 +13,7 @@
+ #include <linux/nls.h>
+ #include <linux/buffer_head.h>
+ #include <linux/vfs.h>
++#include <linux/parser.h>
+ 
+ #include "befs.h"
+ #include "btree.h"
+@@ -39,7 +40,7 @@ static struct inode *befs_alloc_inode(st
+ static void befs_destroy_inode(struct inode *inode);
+ static int befs_init_inodecache(void);
+ static void befs_destroy_inodecache(void);
+-static int befs_readlink(struct dentry *, char *, int);
++static int befs_readlink(struct dentry *, char __user *, int);
+ static int befs_follow_link(struct dentry *, struct nameidata *nd);
+ static int befs_utf2nls(struct super_block *sb, const char *in, int in_len,
+ 			char **out, int *out_len);
+@@ -494,7 +495,7 @@ befs_follow_link(struct dentry *dentry, 
+ }
+ 
+ static int
+-befs_readlink(struct dentry *dentry, char *buffer, int buflen)
++befs_readlink(struct dentry *dentry, char __user *buffer, int buflen)
+ {
+ 	struct super_block *sb = dentry->d_sb;
+ 	befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
+@@ -667,12 +668,27 @@ befs_nls2utf(struct super_block *sb, con
+ 	return -EILSEQ;
+ }
+ 
++/**
++ * Use the
++ *
++ */
++enum {
++	Opt_uid, Opt_gid, Opt_charset, Opt_debug,
++};
++
++static match_table_t befs_tokens = {
++	{Opt_uid, "uid=%d"},
++	{Opt_gid, "gid=%d"},
++	{Opt_charset, "iocharset=%s"},
++	{Opt_debug, "debug"}
++};
++
+ static int
+ parse_options(char *options, befs_mount_options * opts)
+ {
+-	char *this_char;
+-	char *value;
+-	int ret = 1;
++	char *p;
++	substring_t args[MAX_OPT_ARGS];
++	int option;
+ 
+ 	/* Initialize options */
+ 	opts->uid = 0;
+@@ -683,64 +699,56 @@ parse_options(char *options, befs_mount_
+ 	opts->debug = 0;
+ 
+ 	if (!options)
+-		return ret;
+-
+-	while ((this_char = strsep(&options, ",")) != NULL) {
+-
+-		if ((value = strchr(this_char, '=')) != NULL)
+-			*value++ = 0;
++		return 1;
+ 
+-		if (!strcmp(this_char, "uid")) {
+-			if (!value || !*value) {
+-				ret = 0;
+-			} else {
+-				opts->uid = simple_strtoul(value, &value, 0);
+-				opts->use_uid = 1;
+-				if (*value) {
+-					printk(KERN_ERR "BEFS: Invalid uid "
+-					       "option: %s\n", value);
+-					ret = 0;
+-				}
++	while ((p = strsep(&options, ",")) != NULL) {
++		int token;
++		if (!*p)
++			continue;
++
++		token = match_token(p, befs_tokens, args);
++		switch (token) {
++		case Opt_uid:
++			if (match_int(&args[0], &option))
++				return 0;
++			if (option < 0) {
++				printk(KERN_ERR "BeFS: Invalid uid %d, "
++						"using default\n", option);
++				break;
+ 			}
+-		} else if (!strcmp(this_char, "gid")) {
+-			if (!value || !*value)
+-				ret = 0;
+-			else {
+-				opts->gid = simple_strtoul(value, &value, 0);
+-				opts->use_gid = 1;
+-				if (*value) {
+-					printk(KERN_ERR
+-					       "BEFS: Invalid gid option: "
+-					       "%s\n", value);
+-					ret = 0;
+-				}
++			opts->uid = option;
++			opts->use_uid = 1;
++			break;
++		case Opt_gid:
++			if (match_int(&args[0], &option))
++				return 0;
++			if (option < 0) {
++				printk(KERN_ERR "BeFS: Invalid gid %d, "
++						"using default\n", option);
++				break;
+ 			}
+-		} else if (!strcmp(this_char, "iocharset") && value) {
+-			char *p = value;
+-			int len;
+-
+-			while (*value && *value != ',')
+-				value++;
+-			len = value - p;
+-			if (len) {
+-				char *buffer = kmalloc(len + 1, GFP_NOFS);
+-				if (buffer) {
+-					opts->iocharset = buffer;
+-					memcpy(buffer, p, len);
+-					buffer[len] = 0;
+-
+-				} else {
+-					printk(KERN_ERR "BEFS: "
+-					       "cannot allocate memory\n");
+-					ret = 0;
+-				}
++			opts->gid = option;
++			opts->use_gid = 1;
++			break;
++		case Opt_charset:
++			kfree(opts->iocharset);
++			opts->iocharset = match_strdup(&args[0]);
++			if (!opts->iocharset) {
++				printk(KERN_ERR "BeFS: allocation failure for "
++						"iocharset string\n");
++				return 0;
+ 			}
+-		} else if (!strcmp(this_char, "debug")) {
++			break;
++		case Opt_debug:
+ 			opts->debug = 1;
++			break;
++		default:
++			printk(KERN_ERR "BeFS: Unrecognized mount option \"%s\" "
++					"or missing value\n", p);
++			return 0;
+ 		}
+ 	}
+-
+-	return ret;
++	return 1;
+ }
+ 
+ /* This function has the responsibiltiy of getting the
+@@ -939,9 +947,19 @@ init_befs_fs(void)
+ 
+ 	err = befs_init_inodecache();
+ 	if (err)
+-		return err;
++		goto unaquire_none;
++
++	err = register_filesystem(&befs_fs_type);
++	if (err)
++		goto unaquire_inodecache;
++
++	return 0;
++
++unaquire_inodecache:
++	befs_destroy_inodecache();
+ 
+-	return register_filesystem(&befs_fs_type);
++unaquire_none:
++	return err;
+ }
+ 
+ static void __exit
+--- linux-2.6.0-test6/fs/binfmt_elf.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/binfmt_elf.c	2003-10-05 00:36:15.000000000 -0700
+@@ -134,7 +134,7 @@ create_elf_tables(struct linux_binprm *b
+ 	elf_addr_t *sp, *u_platform;
+ 	const char *k_platform = ELF_PLATFORM;
+ 	int items;
+-	elf_addr_t elf_info[40];
++	elf_addr_t *elf_info;
+ 	int ei_index = 0;
+ 	struct task_struct *tsk = current;
+ 
+@@ -169,6 +169,7 @@ create_elf_tables(struct linux_binprm *b
+ 	}
+ 
+ 	/* Create the ELF interpreter info */
++	elf_info = (elf_addr_t *) current->mm->saved_auxv;
+ #define NEW_AUX_ENT(id, val) \
+ 	do { elf_info[ei_index++] = id; elf_info[ei_index++] = val; } while (0)
+ 
+@@ -196,8 +197,13 @@ create_elf_tables(struct linux_binprm *b
+ 	if (k_platform) {
+ 		NEW_AUX_ENT(AT_PLATFORM, (elf_addr_t)(long)u_platform);
+ 	}
+-	NEW_AUX_ENT(AT_NULL, 0);
+ #undef NEW_AUX_ENT
++	/* AT_NULL is zero; clear the rest too */
++	memset(&elf_info[ei_index], 0,
++	       sizeof current->mm->saved_auxv - ei_index * sizeof elf_info[0]);
++
++	/* And advance past the AT_NULL entry.  */
++	ei_index += 2;
+ 
+ 	sp = STACK_ADD(p, ei_index);
+ 
+@@ -1078,7 +1084,7 @@ static void fill_prstatus(struct elf_prs
+ 	prstatus->pr_pid = p->pid;
+ 	prstatus->pr_ppid = p->parent->pid;
+ 	prstatus->pr_pgrp = process_group(p);
+-	prstatus->pr_sid = p->session;
++	prstatus->pr_sid = process_session(p);
+ 	jiffies_to_timeval(p->utime, &prstatus->pr_utime);
+ 	jiffies_to_timeval(p->stime, &prstatus->pr_stime);
+ 	jiffies_to_timeval(p->cutime, &prstatus->pr_cutime);
+@@ -1106,7 +1112,7 @@ static void fill_psinfo(struct elf_prpsi
+ 	psinfo->pr_pid = p->pid;
+ 	psinfo->pr_ppid = p->parent->pid;
+ 	psinfo->pr_pgrp = process_group(p);
+-	psinfo->pr_sid = p->session;
++	psinfo->pr_sid = process_session(p);
+ 
+ 	i = p->state ? ffz(~p->state) + 1 : 0;
+ 	psinfo->pr_state = i;
+@@ -1186,7 +1192,7 @@ static int elf_dump_thread_status(long s
+  */
+ static int elf_core_dump(long signr, struct pt_regs * regs, struct file * file)
+ {
+-#define	NUM_NOTES	5
++#define	NUM_NOTES	6
+ 	int has_dumped = 0;
+ 	mm_segment_t fs;
+ 	int segs;
+@@ -1196,7 +1202,7 @@ static int elf_core_dump(long signr, str
+ 	struct elfhdr *elf = NULL;
+ 	off_t offset = 0, dataoff;
+ 	unsigned long limit = current->rlim[RLIMIT_CORE].rlim_cur;
+-	int numnote = NUM_NOTES;
++	int numnote;
+ 	struct memelfnote *notes = NULL;
+ 	struct elf_prstatus *prstatus = NULL;	/* NT_PRSTATUS */
+ 	struct elf_prpsinfo *psinfo = NULL;	/* NT_PRPSINFO */
+@@ -1208,6 +1214,7 @@ static int elf_core_dump(long signr, str
+ 	elf_fpxregset_t *xfpu = NULL;
+ #endif
+ 	int thread_status_size = 0;
++	elf_addr_t *auxv;
+ 
+ 	/*
+ 	 * We no longer stop all VM operations.
+@@ -1287,18 +1294,25 @@ static int elf_core_dump(long signr, str
+ 	
+ 	fill_note(notes +2, "CORE", NT_TASKSTRUCT, sizeof(*current), current);
+   
++	numnote = 3;
++
++	auxv = (elf_addr_t *) current->mm->saved_auxv;
++
++	i = 0;
++	do
++		i += 2;
++	while (auxv[i - 2] != AT_NULL);
++	fill_note(&notes[numnote++], "CORE", NT_AUXV,
++		  i * sizeof (elf_addr_t), auxv);
++
+   	/* Try to dump the FPU. */
+ 	if ((prstatus->pr_fpvalid = elf_core_copy_task_fpregs(current, regs, fpu)))
+-		fill_note(notes +3, "CORE", NT_PRFPREG, sizeof(*fpu), fpu);
+-	else
+-		--numnote;
++		fill_note(notes + numnote++,
++			  "CORE", NT_PRFPREG, sizeof(*fpu), fpu);
+ #ifdef ELF_CORE_COPY_XFPREGS
+ 	if (elf_core_copy_task_xfpregs(current, xfpu))
+-		fill_note(notes +4, "LINUX", NT_PRXFPREG, sizeof(*xfpu), xfpu);
+-	else
+-		--numnote;
+-#else
+-	numnote--;
++		fill_note(notes + numnote++,
++			  "LINUX", NT_PRXFPREG, sizeof(*xfpu), xfpu);
+ #endif	
+   
+ 	fs = get_fs();
+--- linux-2.6.0-test6/fs/block_dev.c	2003-09-08 13:58:58.000000000 -0700
++++ 25/fs/block_dev.c	2003-10-05 00:34:12.000000000 -0700
+@@ -25,6 +25,22 @@
+ #include <linux/namei.h>
+ #include <asm/uaccess.h>
+ 
++struct bdev_inode {
++	struct block_device bdev;
++	struct inode vfs_inode;
++};
++
++static inline struct bdev_inode *BDEV_I(struct inode *inode)
++{
++	return container_of(inode, struct bdev_inode, vfs_inode);
++}
++
++inline struct block_device *I_BDEV(struct inode *inode)
++{
++	return &BDEV_I(inode)->bdev;
++}
++
++EXPORT_SYMBOL(I_BDEV);
+ 
+ static sector_t max_block(struct block_device *bdev)
+ {
+@@ -70,6 +86,8 @@ int set_blocksize(struct block_device *b
+ 	return 0;
+ }
+ 
++EXPORT_SYMBOL(set_blocksize);
++
+ int sb_set_blocksize(struct super_block *sb, int size)
+ {
+ 	int bits;
+@@ -82,6 +100,8 @@ int sb_set_blocksize(struct super_block 
+ 	return sb->s_blocksize;
+ }
+ 
++EXPORT_SYMBOL(sb_set_blocksize);
++
+ int sb_min_blocksize(struct super_block *sb, int size)
+ {
+ 	int minsize = bdev_hardsect_size(sb->s_bdev);
+@@ -90,14 +110,16 @@ int sb_min_blocksize(struct super_block 
+ 	return sb_set_blocksize(sb, size);
+ }
+ 
++EXPORT_SYMBOL(sb_min_blocksize);
++
+ static int
+ blkdev_get_block(struct inode *inode, sector_t iblock,
+ 		struct buffer_head *bh, int create)
+ {
+-	if (iblock >= max_block(inode->i_bdev))
++	if (iblock >= max_block(I_BDEV(inode)))
+ 		return -EIO;
+ 
+-	bh->b_bdev = inode->i_bdev;
++	bh->b_bdev = I_BDEV(inode);
+ 	bh->b_blocknr = iblock;
+ 	set_buffer_mapped(bh);
+ 	return 0;
+@@ -107,10 +129,10 @@ static int
+ blkdev_get_blocks(struct inode *inode, sector_t iblock,
+ 		unsigned long max_blocks, struct buffer_head *bh, int create)
+ {
+-	if ((iblock + max_blocks) > max_block(inode->i_bdev))
++	if ((iblock + max_blocks) > max_block(I_BDEV(inode)))
+ 		return -EIO;
+ 
+-	bh->b_bdev = inode->i_bdev;
++	bh->b_bdev = I_BDEV(inode);
+ 	bh->b_blocknr = iblock;
+ 	bh->b_size = max_blocks << inode->i_blkbits;
+ 	set_buffer_mapped(bh);
+@@ -122,9 +144,9 @@ blkdev_direct_IO(int rw, struct kiocb *i
+ 			loff_t offset, unsigned long nr_segs)
+ {
+ 	struct file *file = iocb->ki_filp;
+-	struct inode *inode = file->f_dentry->d_inode->i_mapping->host;
++	struct inode *inode = file->f_mapping->host;
+ 
+-	return blockdev_direct_IO(rw, iocb, inode, inode->i_bdev, iov, offset,
++	return blockdev_direct_IO(rw, iocb, inode, I_BDEV(inode), iov, offset,
+ 				nr_segs, blkdev_get_blocks, NULL);
+ }
+ 
+@@ -155,11 +177,10 @@ static int blkdev_commit_write(struct fi
+  */
+ static loff_t block_llseek(struct file *file, loff_t offset, int origin)
+ {
+-	struct inode *bd_inode;
++	struct inode *bd_inode = file->f_mapping->host;
+ 	loff_t size;
+ 	loff_t retval;
+ 
+-	bd_inode = file->f_dentry->d_inode->i_bdev->bd_inode;
+ 	down(&bd_inode->i_sem);
+ 	size = i_size_read(bd_inode);
+ 
+@@ -182,15 +203,13 @@ static loff_t block_llseek(struct file *
+ }
+ 	
+ /*
+- *	Filp may be NULL when we are called by an msync of a vma
+- *	since the vma has no handle.
++ *	Filp is never NULL; the only case when ->fsync() is called with
++ *	NULL first argument is nfsd_sync_dir() and that's not a directory.
+  */
+  
+ static int block_fsync(struct file *filp, struct dentry *dentry, int datasync)
+ {
+-	struct inode * inode = dentry->d_inode;
+-
+-	return sync_blockdev(inode->i_bdev);
++	return sync_blockdev(I_BDEV(filp->f_mapping->host));
+ }
+ 
+ /*
+@@ -200,16 +219,6 @@ static int block_fsync(struct file *filp
+ static spinlock_t bdev_lock __cacheline_aligned_in_smp = SPIN_LOCK_UNLOCKED;
+ static kmem_cache_t * bdev_cachep;
+ 
+-struct bdev_inode {
+-	struct block_device bdev;
+-	struct inode vfs_inode;
+-};
+-
+-static inline struct bdev_inode *BDEV_I(struct inode *inode)
+-{
+-	return container_of(inode, struct bdev_inode, vfs_inode);
+-}
+-
+ static struct inode *bdev_alloc_inode(struct super_block *sb)
+ {
+ 	struct bdev_inode *ei = kmem_cache_alloc(bdev_cachep, SLAB_KERNEL);
+@@ -243,7 +252,6 @@ static inline void __bd_forget(struct in
+ {
+ 	list_del_init(&inode->i_devices);
+ 	inode->i_bdev = NULL;
+-	inode->i_mapping = &inode->i_data;
+ }
+ 
+ static void bdev_clear_inode(struct inode *inode)
+@@ -358,6 +366,8 @@ struct block_device *bdget(dev_t dev)
+ 	return bdev;
+ }
+ 
++EXPORT_SYMBOL(bdget);
++
+ long nr_blockdev_pages(void)
+ {
+ 	struct list_head *p;
+@@ -376,27 +386,29 @@ void bdput(struct block_device *bdev)
+ {
+ 	iput(bdev->bd_inode);
+ }
++
++EXPORT_SYMBOL(bdput);
+  
+-int bd_acquire(struct inode *inode)
++static struct block_device *bd_acquire(struct inode *inode)
+ {
+ 	struct block_device *bdev;
+ 	spin_lock(&bdev_lock);
+-	if (inode->i_bdev && igrab(inode->i_bdev->bd_inode)) {
++	bdev = inode->i_bdev;
++	if (bdev && igrab(bdev->bd_inode)) {
+ 		spin_unlock(&bdev_lock);
+-		return 0;
++		return bdev;
+ 	}
+ 	spin_unlock(&bdev_lock);
+ 	bdev = bdget(inode->i_rdev);
+-	if (!bdev)
+-		return -ENOMEM;
+-	spin_lock(&bdev_lock);
+-	if (inode->i_bdev)
+-		__bd_forget(inode);
+-	inode->i_bdev = bdev;
+-	inode->i_mapping = bdev->bd_inode->i_mapping;
+-	list_add(&inode->i_devices, &bdev->bd_inodes);
+-	spin_unlock(&bdev_lock);
+-	return 0;
++	if (bdev) {
++		spin_lock(&bdev_lock);
++		if (inode->i_bdev)
++			__bd_forget(inode);
++		inode->i_bdev = bdev;
++		list_add(&inode->i_devices, &bdev->bd_inodes);
++		spin_unlock(&bdev_lock);
++	}
++	return bdev;
+ }
+ 
+ /* Call when you free inode */
+@@ -444,6 +456,8 @@ int bd_claim(struct block_device *bdev, 
+ 	return res;
+ }
+ 
++EXPORT_SYMBOL(bd_claim);
++
+ void bd_release(struct block_device *bdev)
+ {
+ 	spin_lock(&bdev_lock);
+@@ -454,6 +468,8 @@ void bd_release(struct block_device *bde
+ 	spin_unlock(&bdev_lock);
+ }
+ 
++EXPORT_SYMBOL(bd_release);
++
+ /*
+  * Tries to open block device by device number.  Use it ONLY if you
+  * really do not have anything better - i.e. when you are behind a
+@@ -471,6 +487,8 @@ struct block_device *open_by_devnum(dev_
+ 	return err ? ERR_PTR(err) : bdev;
+ }
+ 
++EXPORT_SYMBOL(open_by_devnum);
++
+ /*
+  * This routine checks whether a removable media has been changed,
+  * and invalidates all buffer-cache-entries in that case. This
+@@ -500,6 +518,8 @@ int check_disk_change(struct block_devic
+ 	return 1;
+ }
+ 
++EXPORT_SYMBOL(check_disk_change);
++
+ static void bd_set_size(struct block_device *bdev, loff_t size)
+ {
+ 	unsigned bsize = bdev_hardsect_size(bdev);
+@@ -513,13 +533,14 @@ static void bd_set_size(struct block_dev
+ 	bdev->bd_inode->i_blkbits = blksize_bits(bsize);
+ }
+ 
+-static int do_open(struct block_device *bdev, struct inode *inode, struct file *file)
++static int do_open(struct block_device *bdev, struct file *file)
+ {
+ 	struct module *owner = NULL;
+ 	struct gendisk *disk;
+ 	int ret = -ENXIO;
+ 	int part;
+ 
++	file->f_mapping = bdev->bd_inode->i_mapping;
+ 	lock_kernel();
+ 	disk = get_gendisk(bdev->bd_dev, &part);
+ 	if (!disk) {
+@@ -536,7 +557,7 @@ static int do_open(struct block_device *
+ 		if (!part) {
+ 			struct backing_dev_info *bdi;
+ 			if (disk->fops->open) {
+-				ret = disk->fops->open(inode, file);
++				ret = disk->fops->open(bdev, file);
+ 				if (ret)
+ 					goto out_first;
+ 			}
+@@ -581,7 +602,7 @@ static int do_open(struct block_device *
+ 		module_put(owner);
+ 		if (bdev->bd_contains == bdev) {
+ 			if (bdev->bd_disk->fops->open) {
+-				ret = bdev->bd_disk->fops->open(inode, file);
++				ret = bdev->bd_disk->fops->open(bdev, file);
+ 				if (ret)
+ 					goto out;
+ 			}
+@@ -629,9 +650,11 @@ int blkdev_get(struct block_device *bdev
+ 	fake_file.f_dentry = &fake_dentry;
+ 	fake_dentry.d_inode = bdev->bd_inode;
+ 
+-	return do_open(bdev, bdev->bd_inode, &fake_file);
++	return do_open(bdev, &fake_file);
+ }
+ 
++EXPORT_SYMBOL(blkdev_get);
++
+ int blkdev_open(struct inode * inode, struct file * filp)
+ {
+ 	struct block_device *bdev;
+@@ -645,10 +668,9 @@ int blkdev_open(struct inode * inode, st
+ 	 */
+ 	filp->f_flags |= O_LARGEFILE;
+ 
+-	bd_acquire(inode);
+-	bdev = inode->i_bdev;
++	bdev = bd_acquire(inode);
+ 
+-	res = do_open(bdev, inode, filp);
++	res = do_open(bdev, filp);
+ 	if (res)
+ 		return res;
+ 
+@@ -662,10 +684,11 @@ int blkdev_open(struct inode * inode, st
+ 	return res;
+ }
+ 
++EXPORT_SYMBOL(blkdev_open);
++
+ int blkdev_put(struct block_device *bdev, int kind)
+ {
+ 	int ret = 0;
+-	struct inode *bd_inode = bdev->bd_inode;
+ 	struct gendisk *disk = bdev->bd_disk;
+ 
+ 	down(&bdev->bd_sem);
+@@ -674,14 +697,14 @@ int blkdev_put(struct block_device *bdev
+ 		switch (kind) {
+ 		case BDEV_FILE:
+ 		case BDEV_FS:
+-			sync_blockdev(bd_inode->i_bdev);
++			sync_blockdev(bdev);
+ 			break;
+ 		}
+ 		kill_bdev(bdev);
+ 	}
+ 	if (bdev->bd_contains == bdev) {
+ 		if (disk->fops->release)
+-			ret = disk->fops->release(bd_inode, NULL);
++			ret = disk->fops->release(disk);
+ 	} else {
+ 		down(&bdev->bd_contains->bd_sem);
+ 		bdev->bd_contains->bd_part_count--;
+@@ -710,11 +733,14 @@ int blkdev_put(struct block_device *bdev
+ 	return ret;
+ }
+ 
+-int blkdev_close(struct inode * inode, struct file * filp)
++EXPORT_SYMBOL(blkdev_put);
++
++static int blkdev_close(struct inode * inode, struct file * filp)
+ {
+-	if (inode->i_bdev->bd_holder == filp)
+-		bd_release(inode->i_bdev);
+-	return blkdev_put(inode->i_bdev, BDEV_FILE);
++	struct block_device *bdev = I_BDEV(filp->f_mapping->host);
++	if (bdev->bd_holder == filp)
++		bd_release(bdev);
++	return blkdev_put(bdev, BDEV_FILE);
+ }
+ 
+ static ssize_t blkdev_file_write(struct file *file, const char __user *buf,
+@@ -733,6 +759,11 @@ static ssize_t blkdev_file_aio_write(str
+ 	return generic_file_aio_write_nolock(iocb, &local_iov, 1, &iocb->ki_pos);
+ }
+ 
++static int block_ioctl(struct inode *inode, struct file *file, unsigned cmd,
++			unsigned long arg)
++{
++	return blkdev_ioctl(I_BDEV(file->f_mapping->host), file, cmd, arg);
++}
+ 
+ struct address_space_operations def_blk_aops = {
+ 	.readpage	= blkdev_readpage,
+@@ -754,22 +785,26 @@ struct file_operations def_blk_fops = {
+   	.aio_write	= blkdev_file_aio_write, 
+ 	.mmap		= generic_file_mmap,
+ 	.fsync		= block_fsync,
+-	.ioctl		= blkdev_ioctl,
++	.ioctl		= block_ioctl,
+ 	.readv		= generic_file_readv,
+ 	.writev		= generic_file_writev,
+ 	.sendfile	= generic_file_sendfile,
+ };
+ 
++EXPORT_SYMBOL(def_blk_fops);
++
+ int ioctl_by_bdev(struct block_device *bdev, unsigned cmd, unsigned long arg)
+ {
+ 	int res;
+ 	mm_segment_t old_fs = get_fs();
+ 	set_fs(KERNEL_DS);
+-	res = blkdev_ioctl(bdev->bd_inode, NULL, cmd, arg);
++	res = blkdev_ioctl(bdev, NULL, cmd, arg);
+ 	set_fs(old_fs);
+ 	return res;
+ }
+ 
++EXPORT_SYMBOL(ioctl_by_bdev);
++
+ /**
+  * lookup_bdev  - lookup a struct block_device by name
+  *
+@@ -800,11 +835,10 @@ struct block_device *lookup_bdev(const c
+ 	error = -EACCES;
+ 	if (nd.mnt->mnt_flags & MNT_NODEV)
+ 		goto fail;
+-	error = bd_acquire(inode);
+-	if (error)
++	error = -ENOMEM;
++	bdev = bd_acquire(inode);
++	if (!bdev)
+ 		goto fail;
+-	bdev = inode->i_bdev;
+-
+ out:
+ 	path_release(&nd);
+ 	return bdev;
+@@ -854,6 +888,8 @@ blkdev_put:
+ 	return ERR_PTR(error);
+ }
+ 
++EXPORT_SYMBOL(open_bdev_excl);
++
+ /**
+  * close_bdev_excl  -  release a blockdevice openen by open_bdev_excl()
+  *
+@@ -867,3 +903,5 @@ void close_bdev_excl(struct block_device
+ 	bd_release(bdev);
+ 	blkdev_put(bdev, kind);
+ }
++
++EXPORT_SYMBOL(close_bdev_excl);
+--- linux-2.6.0-test6/fs/buffer.c	2003-08-22 19:23:42.000000000 -0700
++++ 25/fs/buffer.c	2003-10-05 00:36:59.000000000 -0700
+@@ -116,27 +116,50 @@ void unlock_buffer(struct buffer_head *b
+ }
+ 
+ /*
+- * Block until a buffer comes unlocked.  This doesn't stop it
++ * Wait until a buffer comes unlocked.  This doesn't stop it
+  * from becoming locked again - you have to lock it yourself
+  * if you want to preserve its state.
++ * If the wait queue parameter specifies an async i/o callback,
++ * then instead of blocking, we just queue up the callback
++ * on the wait queue for async notification when the buffer gets
++ * unlocked.
++ * A NULL wait queue parameter defaults to synchronous behaviour
+  */
+-void __wait_on_buffer(struct buffer_head * bh)
++int __wait_on_buffer_wq(struct buffer_head * bh, wait_queue_t *wait)
+ {
+ 	wait_queue_head_t *wqh = bh_waitq_head(bh);
+-	DEFINE_WAIT(wait);
++	DEFINE_WAIT(local_wait);
++
++	if (!wait)
++		wait = &local_wait;
+ 
+ 	if (atomic_read(&bh->b_count) == 0 &&
+ 			(!bh->b_page || !PageLocked(bh->b_page)))
+ 		buffer_error();
+ 
+ 	do {
+-		prepare_to_wait(wqh, &wait, TASK_UNINTERRUPTIBLE);
++		prepare_to_wait(wqh, wait, TASK_UNINTERRUPTIBLE);
+ 		if (buffer_locked(bh)) {
+ 			blk_run_queues();
++			if (!is_sync_wait(wait)) {
++				/*
++				 * if we've queued an async wait queue
++				 * callback do not block; just tell the
++				 * caller to return and retry later when
++				 * the callback is notified
++				 */
++				return -EIOCBRETRY;
++			}
+ 			io_schedule();
+ 		}
+ 	} while (buffer_locked(bh));
+-	finish_wait(wqh, &wait);
++	finish_wait(wqh, wait);
++	return 0;
++}
++
++void __wait_on_buffer(struct buffer_head * bh)
++{
++	__wait_on_buffer_wq(bh, NULL);
+ }
+ 
+ static void
+@@ -314,8 +337,7 @@ int file_fsync(struct file *filp, struct
+ asmlinkage long sys_fsync(unsigned int fd)
+ {
+ 	struct file * file;
+-	struct dentry * dentry;
+-	struct inode * inode;
++	struct address_space *mapping;
+ 	int ret, err;
+ 
+ 	ret = -EBADF;
+@@ -323,8 +345,7 @@ asmlinkage long sys_fsync(unsigned int f
+ 	if (!file)
+ 		goto out;
+ 
+-	dentry = file->f_dentry;
+-	inode = dentry->d_inode;
++	mapping = file->f_mapping;
+ 
+ 	ret = -EINVAL;
+ 	if (!file->f_op || !file->f_op->fsync) {
+@@ -333,17 +354,17 @@ asmlinkage long sys_fsync(unsigned int f
+ 	}
+ 
+ 	/* We need to protect against concurrent writers.. */
+-	down(&inode->i_sem);
++	down(&mapping->host->i_sem);
+ 	current->flags |= PF_SYNCWRITE;
+-	ret = filemap_fdatawrite(inode->i_mapping);
+-	err = file->f_op->fsync(file, dentry, 0);
++	ret = filemap_fdatawrite(mapping);
++	err = file->f_op->fsync(file, file->f_dentry, 0);
+ 	if (!ret)
+ 		ret = err;
+-	err = filemap_fdatawait(inode->i_mapping);
++	err = filemap_fdatawait(mapping);
+ 	if (!ret)
+ 		ret = err;
+ 	current->flags &= ~PF_SYNCWRITE;
+-	up(&inode->i_sem);
++	up(&mapping->host->i_sem);
+ 
+ out_putf:
+ 	fput(file);
+@@ -354,8 +375,7 @@ out:
+ asmlinkage long sys_fdatasync(unsigned int fd)
+ {
+ 	struct file * file;
+-	struct dentry * dentry;
+-	struct inode * inode;
++	struct address_space *mapping;
+ 	int ret, err;
+ 
+ 	ret = -EBADF;
+@@ -363,24 +383,23 @@ asmlinkage long sys_fdatasync(unsigned i
+ 	if (!file)
+ 		goto out;
+ 
+-	dentry = file->f_dentry;
+-	inode = dentry->d_inode;
+-
+ 	ret = -EINVAL;
+ 	if (!file->f_op || !file->f_op->fsync)
+ 		goto out_putf;
+ 
+-	down(&inode->i_sem);
++	mapping = file->f_mapping;
++
++	down(&mapping->host->i_sem);
+ 	current->flags |= PF_SYNCWRITE;
+-	ret = filemap_fdatawrite(inode->i_mapping);
+-	err = file->f_op->fsync(file, dentry, 1);
++	ret = filemap_fdatawrite(mapping);
++	err = file->f_op->fsync(file, file->f_dentry, 1);
+ 	if (!ret)
+ 		ret = err;
+-	err = filemap_fdatawait(inode->i_mapping);
++	err = filemap_fdatawait(mapping);
+ 	if (!ret)
+ 		ret = err;
+ 	current->flags &= ~PF_SYNCWRITE;
+-	up(&inode->i_sem);
++	up(&mapping->host->i_sem);
+ 
+ out_putf:
+ 	fput(file);
+@@ -1296,9 +1315,12 @@ void __bforget(struct buffer_head *bh)
+ 	__brelse(bh);
+ }
+ 
+-static struct buffer_head *__bread_slow(struct buffer_head *bh)
++static struct buffer_head *__bread_slow_wq(struct buffer_head *bh,
++		wait_queue_t *wait)
+ {
+-	lock_buffer(bh);
++	if (-EIOCBRETRY == lock_buffer_wq(bh, wait))
++		return ERR_PTR(-EIOCBRETRY);
++
+ 	if (buffer_uptodate(bh)) {
+ 		unlock_buffer(bh);
+ 		return bh;
+@@ -1308,7 +1330,8 @@ static struct buffer_head *__bread_slow(
+ 		get_bh(bh);
+ 		bh->b_end_io = end_buffer_read_sync;
+ 		submit_bh(READ, bh);
+-		wait_on_buffer(bh);
++		if (-EIOCBRETRY == wait_on_buffer_wq(bh, wait))
++			return ERR_PTR(-EIOCBRETRY);
+ 		if (buffer_uptodate(bh))
+ 			return bh;
+ 	}
+@@ -1316,6 +1339,11 @@ static struct buffer_head *__bread_slow(
+ 	return NULL;
+ }
+ 
++static inline struct buffer_head *__bread_slow(struct buffer_head *bh)
++{
++	return __bread_slow_wq(bh, NULL);
++}
++
+ /*
+  * Per-cpu buffer LRU implementation.  To reduce the cost of __find_get_block().
+  * The bhs[] array is sorted - newest buffer is at bhs[0].  Buffers have their
+@@ -1503,6 +1531,18 @@ __bread(struct block_device *bdev, secto
+ }
+ EXPORT_SYMBOL(__bread);
+ 
++struct buffer_head *
++__bread_wq(struct block_device *bdev, sector_t block, int size,
++	wait_queue_t *wait)
++{
++	struct buffer_head *bh = __getblk(bdev, block, size);
++
++	if (!buffer_uptodate(bh))
++		bh = __bread_slow_wq(bh, wait);
++	return bh;
++}
++EXPORT_SYMBOL(__bread_wq);
++
+ /*
+  * invalidate_bh_lrus() is called rarely - at unmount.  Because it is only for
+  * unmount it only needs to ensure that all buffers from the target device are
+@@ -1980,8 +2020,9 @@ static int __block_prepare_write(struct 
+ 	/*
+ 	 * If we issued read requests - let them complete.
+ 	 */
+-	while(wait_bh > wait) {
+-		wait_on_buffer(*--wait_bh);
++	while (wait_bh > wait) {
++		if ((err = wait_on_buffer_wq(*--wait_bh, current->io_wait)))
++			return err;
+ 		if (!buffer_uptodate(*wait_bh))
+ 			return -EIO;
+ 	}
+@@ -3035,3 +3076,32 @@ void __init buffer_init(void)
+ 				(void *)(long)smp_processor_id());
+ 	register_cpu_notifier(&buffer_nb);
+ }
++
++EXPORT_SYMBOL(__bforget);
++EXPORT_SYMBOL(__brelse);
++EXPORT_SYMBOL(__wait_on_buffer);
++EXPORT_SYMBOL(__wait_on_buffer_wq);
++EXPORT_SYMBOL(block_commit_write);
++EXPORT_SYMBOL(block_prepare_write);
++EXPORT_SYMBOL(block_read_full_page);
++EXPORT_SYMBOL(block_sync_page);
++EXPORT_SYMBOL(block_truncate_page);
++EXPORT_SYMBOL(block_write_full_page);
++EXPORT_SYMBOL(buffer_insert_list);
++EXPORT_SYMBOL(cont_prepare_write);
++EXPORT_SYMBOL(end_buffer_async_write);
++EXPORT_SYMBOL(end_buffer_read_sync);
++EXPORT_SYMBOL(end_buffer_write_sync);
++EXPORT_SYMBOL(file_fsync);
++EXPORT_SYMBOL(fsync_bdev);
++EXPORT_SYMBOL(fsync_buffers_list);
++EXPORT_SYMBOL(generic_block_bmap);
++EXPORT_SYMBOL(generic_commit_write);
++EXPORT_SYMBOL(generic_cont_expand);
++EXPORT_SYMBOL(init_buffer);
++EXPORT_SYMBOL(invalidate_bdev);
++EXPORT_SYMBOL(ll_rw_block);
++EXPORT_SYMBOL(mark_buffer_dirty);
++EXPORT_SYMBOL(submit_bh);
++EXPORT_SYMBOL(sync_dirty_buffer);
++EXPORT_SYMBOL(unlock_buffer);
+--- linux-2.6.0-test6/fs/coda/file.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/coda/file.c	2003-10-05 00:34:03.000000000 -0700
+@@ -89,6 +89,7 @@ coda_file_mmap(struct file *coda_file, s
+ 
+ 	coda_inode = coda_file->f_dentry->d_inode;
+ 	host_inode = host_file->f_dentry->d_inode;
++	coda_file->f_mapping = host_file->f_mapping;
+ 	if (coda_inode->i_mapping == &coda_inode->i_data)
+ 		coda_inode->i_mapping = host_inode->i_mapping;
+ 
+--- linux-2.6.0-test6/fs/compat_ioctl.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/compat_ioctl.c	2003-10-05 00:34:44.000000000 -0700
+@@ -106,6 +106,7 @@
+ #include <linux/nbd.h>
+ #include <linux/random.h>
+ #include <linux/filter.h>
++#include <linux/msdos_fs.h>
+ 
+ #undef INCLUDES
+ #endif
+@@ -576,54 +577,45 @@ static int ethtool_ioctl(unsigned int fd
+ 
+ static int bond_ioctl(unsigned long fd, unsigned int cmd, unsigned long arg)
+ {
+-	struct ifreq ifr;
++	struct ifreq kifr;
++	struct ifreq *uifr;
++	struct ifreq32 *ifr32 = (struct ifreq32 *) arg;
+ 	mm_segment_t old_fs;
+-	int err, len;
++	int err;
+ 	u32 data;
+-	
+-	if (copy_from_user(&ifr, (struct ifreq32 *)arg, sizeof(struct ifreq32)))
+-		return -EFAULT;
+-	ifr.ifr_data = (__kernel_caddr_t)get_zeroed_page(GFP_KERNEL);
+-	if (!ifr.ifr_data)
+-		return -EAGAIN;
++	void *datap;
+ 
+ 	switch (cmd) {
+ 	case SIOCBONDENSLAVE:
+ 	case SIOCBONDRELEASE:
+ 	case SIOCBONDSETHWADDR:
+ 	case SIOCBONDCHANGEACTIVE:
+-		len = IFNAMSIZ * sizeof(char);
+-		break;
++		if (copy_from_user(&kifr, ifr32, sizeof(struct ifreq32)))
++			return -EFAULT;
++
++		old_fs = get_fs();
++		set_fs (KERNEL_DS);
++		err = sys_ioctl (fd, cmd, (unsigned long)&kifr);
++		set_fs (old_fs);
++
++		return err;
+ 	case SIOCBONDSLAVEINFOQUERY:
+-		len = sizeof(struct ifslave);
+-		break;
+ 	case SIOCBONDINFOQUERY:
+-		len = sizeof(struct ifbond);
+-		break;
+-	default:
+-		err = -EINVAL;
+-		goto out;
+-	};
++		uifr = compat_alloc_user_space(sizeof(*uifr));
++		if (copy_in_user(&uifr->ifr_name, &ifr32->ifr_name, IFNAMSIZ))
++			return -EFAULT;
+ 
+-	__get_user(data, &(((struct ifreq32 *)arg)->ifr_ifru.ifru_data));
+-	if (copy_from_user(ifr.ifr_data, compat_ptr(data), len)) {
+-		err = -EFAULT;
+-		goto out;
+-	}
++		if (get_user(data, &ifr32->ifr_ifru.ifru_data))
++			return -EFAULT;
+ 
+-	old_fs = get_fs();
+-	set_fs (KERNEL_DS);
+-	err = sys_ioctl (fd, cmd, (unsigned long)&ifr);
+-	set_fs (old_fs);
+-	if (!err) {
+-		len = copy_to_user(compat_ptr(data), ifr.ifr_data, len);
+-		if (len)
+-			err = -EFAULT;
+-	}
++		datap = compat_ptr(data);
++		if (put_user(datap, &uifr->ifr_ifru.ifru_data))
++			return -EFAULT;
+ 
+-out:
+-	free_page((unsigned long)ifr.ifr_data);
+-	return err;
++		return sys_ioctl (fd, cmd, (unsigned long)uifr);
++	default:
++		return -EINVAL;
++	};
+ }
+ 
+ int siocdevprivate_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg)
+@@ -1035,6 +1027,7 @@ static int sg_build_iovec(sg_io_hdr_t *s
+ 			return -EFAULT;
+ 	}
+ 
++	sgio->dxferp = iov;
+ 	return 0;
+ }
+ 
+@@ -1581,7 +1574,7 @@ static int vt_check(struct file *file)
+ 	 * To have permissions to do most of the vt ioctls, we either have
+ 	 * to be the owner of the tty, or super-user.
+ 	 */
+-	if (current->tty == tty || capable(CAP_SYS_ADMIN))
++	if (process_tty(current) == tty || capable(CAP_SYS_ADMIN))
+ 		return 1;
+ 	return 0;                                                    
+ }
+@@ -2310,6 +2303,572 @@ static int mtd_rw_oob(unsigned int fd, u
+ 	return err;
+ }	
+ 
++#define	VFAT_IOCTL_READDIR_BOTH32	_IOR('r', 1, struct compat_dirent[2])
++#define	VFAT_IOCTL_READDIR_SHORT32	_IOR('r', 2, struct compat_dirent[2])
++
++static long
++put_dirent32 (struct dirent *d, struct compat_dirent *d32)
++{
++        int ret;
++
++        if ((ret = verify_area(VERIFY_WRITE, d32,
++                               sizeof(struct compat_dirent))))
++                return ret;
++
++        __put_user(d->d_ino, &d32->d_ino);
++        __put_user(d->d_off, &d32->d_off);
++        __put_user(d->d_reclen, &d32->d_reclen);
++        __copy_to_user(d32->d_name, d->d_name, d->d_reclen);
++        return ret;
++}
++
++static int vfat_ioctl32(unsigned fd, unsigned cmd,  void *ptr)
++{
++	int ret;
++	mm_segment_t oldfs = get_fs();
++	struct dirent d[2];
++
++	switch(cmd)
++	{
++        	case VFAT_IOCTL_READDIR_BOTH32:
++                	cmd = VFAT_IOCTL_READDIR_BOTH;
++                	break;
++        	case VFAT_IOCTL_READDIR_SHORT32:
++                	cmd = VFAT_IOCTL_READDIR_SHORT;
++                	break;
++	}
++
++	set_fs(KERNEL_DS);
++	ret = sys_ioctl(fd,cmd,(unsigned long)&d);
++	set_fs(oldfs);
++	if (ret >= 0) {
++		ret |= put_dirent32(&d[0], (struct compat_dirent *)ptr);
++		ret |= put_dirent32(&d[1], ((struct compat_dirent *)ptr) + 1);
++	}
++	return ret;
++}
++
++#define REISERFS_IOC_UNPACK32               _IOW(0xCD,1,int)
++
++static int reiserfs_ioctl32(unsigned fd, unsigned cmd, unsigned long ptr)
++{
++        if (cmd == REISERFS_IOC_UNPACK32)
++                cmd = REISERFS_IOC_UNPACK;
++
++        return sys_ioctl(fd,cmd,ptr);
++}
++
++struct raw32_config_request
++{
++        compat_int_t    raw_minor;
++        __u64   block_major;
++        __u64   block_minor;
++} __attribute__((packed));
++
++static int get_raw32_request(struct raw_config_request *req, struct raw32_config_request *user_req)
++{
++        __u32   lo_maj, hi_maj, lo_min, hi_min;
++        int ret;
++
++        if ((ret = verify_area(VERIFY_READ, user_req,
++                               sizeof(struct raw32_config_request))))
++                return ret;
++
++        __get_user(req->raw_minor, &user_req->raw_minor);
++        __get_user(lo_maj, (__u32*)&user_req->block_major);
++        __get_user(hi_maj, ((__u32*)(&user_req->block_major) + 1));
++        __get_user(lo_min, (__u32*)&user_req->block_minor);
++        __get_user(hi_min, ((__u32*)(&user_req->block_minor) + 1));
++
++        req->block_major = lo_maj | (((__u64)hi_maj) << 32);
++        req->block_minor = lo_min | (((__u64)lo_min) << 32);
++
++        return ret;
++}
++
++static int set_raw32_request(struct raw_config_request *req, struct raw32_config_request *user_req)
++{
++	int ret;
++
++        if ((ret = verify_area(VERIFY_WRITE, user_req,
++                               sizeof(struct raw32_config_request))))
++                return ret;
++
++        __put_user(req->raw_minor, &user_req->raw_minor);
++        __put_user((__u32)(req->block_major), (__u32*)&user_req->block_major);
++        __put_user((__u32)(req->block_major >> 32), ((__u32*)(&user_req->block_major) + 1));
++        __put_user((__u32)(req->block_minor), (__u32*)&user_req->block_minor);
++        __put_user((__u32)(req->block_minor >> 32), ((__u32*)(&user_req->block_minor) + 1));
++
++        return ret;
++}
++
++static int raw_ioctl(unsigned fd, unsigned cmd,  void *ptr)
++{
++        int ret;
++
++        switch (cmd) {
++        case RAW_SETBIND:
++        case RAW_GETBIND: {
++                struct raw_config_request req;
++                struct raw32_config_request *user_req = ptr;
++                mm_segment_t oldfs = get_fs();
++
++                if ((ret = get_raw32_request(&req, user_req)))
++                        return ret;
++
++                set_fs(KERNEL_DS);
++                ret = sys_ioctl(fd,cmd,(unsigned long)&req);
++                set_fs(oldfs);
++
++                if ((!ret) && (cmd == RAW_GETBIND)) {
++                        ret = set_raw32_request(&req, user_req);
++                }
++                break;
++        }
++        default:
++                ret = sys_ioctl(fd,cmd,(unsigned long)ptr);
++                break;
++        }
++        return ret;
++}
++
++struct serial_struct32 {
++        compat_int_t    type;
++        compat_int_t    line;
++        compat_uint_t   port;
++        compat_int_t    irq;
++        compat_int_t    flags;
++        compat_int_t    xmit_fifo_size;
++        compat_int_t    custom_divisor;
++        compat_int_t    baud_base;
++        unsigned short  close_delay;
++        char    io_type;
++        char    reserved_char[1];
++        compat_int_t    hub6;
++        unsigned short  closing_wait; /* time to wait before closing */
++        unsigned short  closing_wait2; /* no longer used... */
++        compat_uint_t   iomem_base;
++        unsigned short  iomem_reg_shift;
++        unsigned int    port_high;
++        compat_int_t    reserved[1];
++};
++
++static int serial_struct_ioctl(unsigned fd, unsigned cmd,  void *ptr)
++{
++        typedef struct serial_struct SS;
++        typedef struct serial_struct32 SS32;
++        struct serial_struct32 *ss32 = ptr;
++        int err;
++        struct serial_struct ss;
++        mm_segment_t oldseg = get_fs();
++        __u32 udata;
++
++        if (cmd == TIOCSSERIAL) {
++                if (verify_area(VERIFY_READ, ss32, sizeof(SS32)))
++                        return -EFAULT;
++                __copy_from_user(&ss, ss32, offsetof(SS32, iomem_base));
++                __get_user(udata, &ss32->iomem_base);
++                ss.iomem_base = compat_ptr(udata);
++                __get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift);
++                __get_user(ss.port_high, &ss32->port_high);
++                ss.iomap_base = 0UL;
++        }
++        set_fs(KERNEL_DS);
++                err = sys_ioctl(fd,cmd,(unsigned long)(&ss));
++        set_fs(oldseg);
++        if (cmd == TIOCGSERIAL && err >= 0) {
++                if (verify_area(VERIFY_WRITE, ss32, sizeof(SS32)))
++                        return -EFAULT;
++                __copy_to_user(ss32,&ss,offsetof(SS32,iomem_base));
++                __put_user((unsigned long)ss.iomem_base  >> 32 ?
++                            0xffffffff : (unsigned)(unsigned long)ss.iomem_base,
++                            &ss32->iomem_base);
++                __put_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift);
++                __put_user(ss.port_high, &ss32->port_high);
++
++        }
++        return err;
++}
++
++struct usbdevfs_ctrltransfer32 {
++        u8 bRequestType;
++        u8 bRequest;
++        u16 wValue;
++        u16 wIndex;
++        u16 wLength;
++        u32 timeout;  /* in milliseconds */
++        compat_caddr_t data;
++};
++
++#define USBDEVFS_CONTROL32           _IOWR('U', 0, struct usbdevfs_ctrltransfer32)
++
++static int do_usbdevfs_control(unsigned int fd, unsigned int cmd, unsigned long arg)
++{
++        struct usbdevfs_ctrltransfer kctrl;
++        struct usbdevfs_ctrltransfer32 *uctrl;
++        mm_segment_t old_fs;
++        __u32 udata;
++        void *uptr, *kptr;
++        int err;
++
++        uctrl = (struct usbdevfs_ctrltransfer32 *) arg;
++
++        if (copy_from_user(&kctrl, uctrl,
++                           (sizeof(struct usbdevfs_ctrltransfer32) -
++                            sizeof(compat_caddr_t))))
++                return -EFAULT;
++
++        if (get_user(udata, &uctrl->data))
++                return -EFAULT;
++        uptr = compat_ptr(udata);
++        /* In usbdevice_fs, it limits the control buffer to a page,
++         * for simplicity so do we.
++         */
++        if (!uptr || kctrl.wLength > PAGE_SIZE)
++                return -EINVAL;
++
++        kptr = (void *)__get_free_page(GFP_KERNEL);
++
++        if ((kctrl.bRequestType & USB_DIR_IN) == 0) {
++                err = -EFAULT;
++                if (copy_from_user(kptr, uptr, kctrl.wLength))
++                        goto out;
++        }
++
++        kctrl.data = kptr;
++
++        old_fs = get_fs();
++        set_fs(KERNEL_DS);
++        err = sys_ioctl(fd, USBDEVFS_CONTROL, (unsigned long)&kctrl);
++        set_fs(old_fs);
++
++        if (err >= 0 &&
++            ((kctrl.bRequestType & USB_DIR_IN) != 0)) {
++                if (copy_to_user(uptr, kptr, kctrl.wLength))
++                        err = -EFAULT;
++        }
++
++out:
++        free_page((unsigned long) kptr);
++        return err;
++}
++
++
++struct usbdevfs_bulktransfer32 {
++        compat_uint_t ep;
++        compat_uint_t len;
++        compat_uint_t timeout; /* in milliseconds */
++        compat_caddr_t data;
++};
++
++#define USBDEVFS_BULK32              _IOWR('U', 2, struct usbdevfs_bulktransfer32)
++
++static int do_usbdevfs_bulk(unsigned int fd, unsigned int cmd, unsigned long arg)
++{
++        struct usbdevfs_bulktransfer kbulk;
++        struct usbdevfs_bulktransfer32 *ubulk;
++        mm_segment_t old_fs;
++        __u32 udata;
++        void *uptr, *kptr;
++        int err;
++
++	ubulk = (struct usbdevfs_bulktransfer32 *) arg;
++
++        if (get_user(kbulk.ep, &ubulk->ep) ||
++            get_user(kbulk.len, &ubulk->len) ||
++            get_user(kbulk.timeout, &ubulk->timeout) ||
++            get_user(udata, &ubulk->data))
++                return -EFAULT;
++
++        uptr = compat_ptr(udata);
++
++        /* In usbdevice_fs, it limits the control buffer to a page,
++         * for simplicity so do we.
++         */
++        if (!uptr || kbulk.len > PAGE_SIZE)
++                return -EINVAL;
++
++        kptr = (void *) __get_free_page(GFP_KERNEL);
++
++        if ((kbulk.ep & 0x80) == 0) {
++                err = -EFAULT;
++	        if (copy_from_user(kptr, uptr, kbulk.len))
++                        goto out;
++        }
++
++        kbulk.data = kptr;
++
++	old_fs = get_fs();
++        set_fs(KERNEL_DS);
++        err = sys_ioctl(fd, USBDEVFS_BULK, (unsigned long) &kbulk);
++        set_fs(old_fs);
++
++        if (err >= 0 &&
++            ((kbulk.ep & 0x80) != 0)) {
++                if (copy_to_user(uptr, kptr, kbulk.len))
++                        err = -EFAULT;
++        }
++
++out:
++        free_page((unsigned long) kptr);
++        return err;
++}
++
++/* This needs more work before we can enable it.  Unfortunately
++ * because of the fancy asynchronous way URB status/error is written
++ * back to userspace, we'll need to fiddle with USB devio internals
++ * and/or reimplement entirely the frontend of it ourselves. -DaveM
++ *
++ * The issue is:
++ *
++ *	When an URB is submitted via usbdevicefs it is put onto an
++ *	asynchronous queue.  When the URB completes, it may be reaped
++ *	via another ioctl.  During this reaping the status is written
++ *	back to userspace along with the length of the transfer.
++ *
++ *	We must translate into 64-bit kernel types so we pass in a kernel
++ *	space copy of the usbdevfs_urb structure.  This would mean that we
++ *	must do something to deal with the async entry reaping.  First we
++ *	have to deal somehow with this transitory memory we've allocated.
++ *	This is problematic since there are many call sites from which the
++ *	async entries can be destroyed (and thus when we'd need to free up
++ *	this kernel memory).  One of which is the close() op of usbdevicefs.
++ *	To handle that we'd need to make our own file_operations struct which
++ *	overrides usbdevicefs's release op with our own which runs usbdevicefs's
++ *	real release op then frees up the kernel memory.
++ *
++ *	But how to keep track of these kernel buffers?  We'd need to either
++ *	keep track of them in some table _or_ know about usbdevicefs internals
++ *	(ie. the exact layout of its file private, which is actually defined
++ *	in linux/usbdevice_fs.h, the layout of the async queues are private to
++ *	devio.c)
++ *
++ * There is one possible other solution I considered, also involving knowledge
++ * of usbdevicefs internals:
++ *
++ *	After an URB is submitted, we "fix up" the address back to the user
++ *	space one.  This would work if the status/length fields written back
++ *	by the async URB completion lines up perfectly in the 32-bit type with
++ *	the 64-bit kernel type.  Unfortunately, it does not because the iso
++ *	frame descriptors, at the end of the struct, can be written back.
++ *
++ * I think we'll just need to simply duplicate the devio URB engine here.
++ */
++#if 0
++struct usbdevfs_urb32 {
++	unsigned char type;
++	unsigned char endpoint;
++	compat_int_t status;
++	compat_uint_t flags;
++	compat_caddr_t buffer;
++	compat_int_t buffer_length;
++	compat_int_t actual_length;
++	compat_int_t start_frame;
++	compat_int_t number_of_packets;
++	compat_int_t error_count;
++	compat_uint_t signr;
++	compat_caddr_t usercontext; /* unused */
++	struct usbdevfs_iso_packet_desc iso_frame_desc[0];
++};
++
++#define USBDEVFS_SUBMITURB32       _IOR('U', 10, struct usbdevfs_urb32)
++
++static int get_urb32(struct usbdevfs_urb *kurb,
++		     struct usbdevfs_urb32 *uurb)
++{
++	if (get_user(kurb->type, &uurb->type) ||
++	    __get_user(kurb->endpoint, &uurb->endpoint) ||
++	    __get_user(kurb->status, &uurb->status) ||
++	    __get_user(kurb->flags, &uurb->flags) ||
++	    __get_user(kurb->buffer_length, &uurb->buffer_length) ||
++	    __get_user(kurb->actual_length, &uurb->actual_length) ||
++	    __get_user(kurb->start_frame, &uurb->start_frame) ||
++	    __get_user(kurb->number_of_packets, &uurb->number_of_packets) ||
++	    __get_user(kurb->error_count, &uurb->error_count) ||
++	    __get_user(kurb->signr, &uurb->signr))
++		return -EFAULT;
++
++	kurb->usercontext = 0; /* unused currently */
++
++	return 0;
++}
++
++/* Just put back the values which usbdevfs actually changes. */
++static int put_urb32(struct usbdevfs_urb *kurb,
++		     struct usbdevfs_urb32 *uurb)
++{
++	if (put_user(kurb->status, &uurb->status) ||
++	    __put_user(kurb->actual_length, &uurb->actual_length) ||
++	    __put_user(kurb->error_count, &uurb->error_count))
++		return -EFAULT;
++
++	if (kurb->number_of_packets != 0) {
++		int i;
++
++		for (i = 0; i < kurb->number_of_packets; i++) {
++			if (__put_user(kurb->iso_frame_desc[i].actual_length,
++				       &uurb->iso_frame_desc[i].actual_length) ||
++			    __put_user(kurb->iso_frame_desc[i].status,
++				       &uurb->iso_frame_desc[i].status))
++				return -EFAULT;
++		}
++	}
++
++	return 0;
++}
++
++static int get_urb32_isoframes(struct usbdevfs_urb *kurb,
++			       struct usbdevfs_urb32 *uurb)
++{
++	unsigned int totlen;
++	int i;
++
++	if (kurb->type != USBDEVFS_URB_TYPE_ISO) {
++		kurb->number_of_packets = 0;
++		return 0;
++	}
++
++	if (kurb->number_of_packets < 1 ||
++	    kurb->number_of_packets > 128)
++		return -EINVAL;
++
++	if (copy_from_user(&kurb->iso_frame_desc[0],
++			   &uurb->iso_frame_desc[0],
++			   sizeof(struct usbdevfs_iso_packet_desc) *
++			   kurb->number_of_packets))
++		return -EFAULT;
++
++	totlen = 0;
++	for (i = 0; i < kurb->number_of_packets; i++) {
++		unsigned int this_len;
++
++		this_len = kurb->iso_frame_desc[i].length;
++		if (this_len > 1023)
++			return -EINVAL;
++
++		totlen += this_len;
++	}
++
++	if (totlen > 32768)
++		return -EINVAL;
++
++	kurb->buffer_length = totlen;
++
++	return 0;
++}
++
++static int do_usbdevfs_urb(unsigned int fd, unsigned int cmd, unsigned long arg)
++{
++	struct usbdevfs_urb *kurb;
++	struct usbdevfs_urb32 *uurb;
++	mm_segment_t old_fs;
++	__u32 udata;
++	void *uptr, *kptr;
++	unsigned int buflen;
++	int err;
++
++	uurb = (struct usbdevfs_urb32 *) arg;
++
++	err = -ENOMEM;
++	kurb = kmalloc(sizeof(struct usbdevfs_urb) +
++		       (sizeof(struct usbdevfs_iso_packet_desc) * 128),
++		       GFP_KERNEL);
++	if (!kurb)
++		goto out;
++
++	err = -EFAULT;
++	if (get_urb32(kurb, uurb))
++		goto out;
++
++	err = get_urb32_isoframes(kurb, uurb);
++	if (err)
++		goto out;
++
++	err = -EFAULT;
++	if (__get_user(udata, &uurb->buffer))
++		goto out;
++	uptr = compat_ptr(udata);
++
++	buflen = kurb->buffer_length;
++	err = verify_area(VERIFY_WRITE, uptr, buflen);
++	if (err)
++		goto out;
++
++
++	old_fs = get_fs();
++	set_fs(KERNEL_DS);
++	err = sys_ioctl(fd, USBDEVFS_SUBMITURB, (unsigned long) kurb);
++	set_fs(old_fs);
++
++	if (err >= 0) {
++		/* RED-PEN Shit, this doesn't work for async URBs :-( XXX */
++		if (put_urb32(kurb, uurb)) {
++			err = -EFAULT;
++		}
++	}
++
++out:
++	kfree(kurb);
++	return err;
++}
++#endif
++
++#define USBDEVFS_REAPURB32         _IOW('U', 12, u32)
++#define USBDEVFS_REAPURBNDELAY32   _IOW('U', 13, u32)
++
++static int do_usbdevfs_reapurb(unsigned int fd, unsigned int cmd, unsigned long arg)
++{
++        mm_segment_t old_fs;
++        void *kptr;
++        int err;
++
++        old_fs = get_fs();
++        set_fs(KERNEL_DS);
++        err = sys_ioctl(fd,
++                        (cmd == USBDEVFS_REAPURB32 ?
++                         USBDEVFS_REAPURB :
++                         USBDEVFS_REAPURBNDELAY),
++                        (unsigned long) &kptr);
++        set_fs(old_fs);
++
++        if (err >= 0 &&
++            put_user((u32)(u64)kptr, (u32 *)arg))
++                err = -EFAULT;
++
++        return err;
++}
++
++struct usbdevfs_disconnectsignal32 {
++        compat_int_t signr;
++        compat_caddr_t context;
++};
++
++#define USBDEVFS_DISCSIGNAL32      _IOR('U', 14, struct usbdevfs_disconnectsignal32)
++
++static int do_usbdevfs_discsignal(unsigned int fd, unsigned int cmd, unsigned long arg)
++{
++        struct usbdevfs_disconnectsignal kdis;
++        struct usbdevfs_disconnectsignal32 *udis;
++        mm_segment_t old_fs;
++        u32 uctx;
++        int err;
++
++        udis = (struct usbdevfs_disconnectsignal32 *) arg;
++
++        if (get_user(kdis.signr, &udis->signr) ||
++            __get_user(uctx, &udis->context))
++                return -EFAULT;
++
++        kdis.context = (void *) (long)uctx;
++
++        old_fs = get_fs();
++        set_fs(KERNEL_DS);
++        err = sys_ioctl(fd, USBDEVFS_DISCSIGNAL, (unsigned long) &kdis);
++        set_fs(old_fs);
++
++        return err;
++}
+ #undef CODE
+ #endif
+ 
+@@ -2451,6 +3010,22 @@ HANDLE_IOCTL(SONET_GETFRSENSE, do_atm_io
+ HANDLE_IOCTL(BLKBSZGET_32, do_blkbszget)
+ HANDLE_IOCTL(BLKBSZSET_32, do_blkbszset)
+ HANDLE_IOCTL(BLKGETSIZE64_32, do_blkgetsize64)
+-
++/* vfat */
++HANDLE_IOCTL(VFAT_IOCTL_READDIR_BOTH32, vfat_ioctl32)
++HANDLE_IOCTL(VFAT_IOCTL_READDIR_SHORT32, vfat_ioctl32)
++HANDLE_IOCTL(REISERFS_IOC_UNPACK32, reiserfs_ioctl32)
++/* Raw devices */
++HANDLE_IOCTL(RAW_SETBIND, raw_ioctl)
++HANDLE_IOCTL(RAW_GETBIND, raw_ioctl)
++/* Serial */
++HANDLE_IOCTL(TIOCGSERIAL, serial_struct_ioctl)
++HANDLE_IOCTL(TIOCSSERIAL, serial_struct_ioctl)
++/* Usbdevfs */
++HANDLE_IOCTL(USBDEVFS_CONTROL32, do_usbdevfs_control)
++HANDLE_IOCTL(USBDEVFS_BULK32, do_usbdevfs_bulk)
++/*HANDLE_IOCTL(USBDEVFS_SUBMITURB32, do_usbdevfs_urb)*/
++HANDLE_IOCTL(USBDEVFS_REAPURB32, do_usbdevfs_reapurb)
++HANDLE_IOCTL(USBDEVFS_REAPURBNDELAY32, do_usbdevfs_reapurb)
++HANDLE_IOCTL(USBDEVFS_DISCSIGNAL32, do_usbdevfs_discsignal)
+ #undef DECLARES
+ #endif
+--- linux-2.6.0-test6/fs/dcache.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/dcache.c	2003-10-05 00:33:24.000000000 -0700
+@@ -1639,3 +1639,27 @@ void __init vfs_caches_init(unsigned lon
+ 	bdev_cache_init();
+ 	chrdev_init();
+ }
++
++EXPORT_SYMBOL(d_alloc);
++EXPORT_SYMBOL(d_alloc_anon);
++EXPORT_SYMBOL(d_alloc_root);
++EXPORT_SYMBOL(d_delete);
++EXPORT_SYMBOL(d_find_alias);
++EXPORT_SYMBOL(d_instantiate);
++EXPORT_SYMBOL(d_invalidate);
++EXPORT_SYMBOL(d_lookup);
++EXPORT_SYMBOL(d_move);
++EXPORT_SYMBOL(d_path);
++EXPORT_SYMBOL(d_prune_aliases);
++EXPORT_SYMBOL(d_rehash);
++EXPORT_SYMBOL(d_splice_alias);
++EXPORT_SYMBOL(d_validate);
++EXPORT_SYMBOL(dget_locked);
++EXPORT_SYMBOL(dput);
++EXPORT_SYMBOL(find_inode_number);
++EXPORT_SYMBOL(have_submounts);
++EXPORT_SYMBOL(is_subdir);
++EXPORT_SYMBOL(names_cachep);
++EXPORT_SYMBOL(shrink_dcache_anon);
++EXPORT_SYMBOL(shrink_dcache_parent);
++EXPORT_SYMBOL(shrink_dcache_sb);
+--- linux-2.6.0-test6/fs/devfs/base.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/devfs/base.c	2003-10-05 00:36:10.000000000 -0700
+@@ -973,8 +973,9 @@ static struct devfs_entry *_devfs_search
+ 
+ /**
+  *	_devfs_alloc_entry - Allocate a devfs entry.
+- *	@name:  The name of the entry.
+- *	@namelen:  The number of characters in @name.
++ *	@name:     the name of the entry
++ *	@namelen:  the number of characters in @name
++ *      @mode:     the mode for the entry
+  *
+  *  Allocate a devfs entry and returns a pointer to the entry on success, else
+  *   %NULL.
+@@ -1954,15 +1955,9 @@ static int devfs_notify_change (struct d
+     return 0;
+ }   /*  End Function devfs_notify_change  */
+ 
+-static void devfs_clear_inode (struct inode *inode)
+-{
+-    if ( S_ISBLK (inode->i_mode) ) bdput (inode->i_bdev);
+-}   /*  End Function devfs_clear_inode  */
+-
+ static struct super_operations devfs_sops =
+ { 
+     .drop_inode    = generic_delete_inode,
+-    .clear_inode   = devfs_clear_inode,
+     .statfs        = simple_statfs,
+ };
+ 
+@@ -2014,11 +2009,7 @@ static struct inode *_devfs_get_vfs_inod
+ 	inode->i_rdev = de->u.cdev.dev;
+     }
+     else if ( S_ISBLK (de->mode) )
+-    {
+-	inode->i_rdev = de->u.bdev.dev;
+-	if (bd_acquire (inode) != 0)
+-		PRINTK ("(%d): no block device from bdget()\n",(int)inode->i_ino);
+-    }
++	init_special_inode(inode, de->mode, de->u.bdev.dev);
+     else if ( S_ISFIFO (de->mode) )
+     	inode->i_fop = &def_fifo_fops;
+     else if ( S_ISDIR (de->mode) )
+@@ -2117,11 +2108,7 @@ static int devfs_open (struct inode *ino
+     if (de == NULL) return -ENODEV;
+     if ( S_ISDIR (de->mode) ) return 0;
+     file->private_data = de->info;
+-    if ( S_ISBLK (inode->i_mode) )
+-    {
+-	file->f_op = &def_blk_fops;
+-	err = def_blk_fops.open (inode, file); /* Module refcount unchanged */
+-    } else if (S_ISCHR(inode->i_mode)) {
++    if (S_ISCHR(inode->i_mode)) {
+ 	ops = devfs_get_ops (de);  /*  Now have module refcount  */
+ 	file->f_op = ops;
+ 	if (file->f_op)
+--- linux-2.6.0-test6/fs/direct-io.c	2003-08-08 22:55:13.000000000 -0700
++++ 25/fs/direct-io.c	2003-10-05 00:36:53.000000000 -0700
+@@ -51,6 +51,10 @@
+  *
+  * If blkfactor is zero then the user's request was aligned to the filesystem's
+  * blocksize.
++ *
++ * needs_locking is set for regular files on direct-IO-naive filesystems.  It
++ * determines whether we need to do the fancy locking which prevents direct-IO
++ * from being able to read uninitialised disk blocks.
+  */
+ 
+ struct dio {
+@@ -58,6 +62,7 @@ struct dio {
+ 	struct bio *bio;		/* bio under assembly */
+ 	struct inode *inode;
+ 	int rw;
++	int needs_locking;		/* doesn't change */
+ 	unsigned blkbits;		/* doesn't change */
+ 	unsigned blkfactor;		/* When we're using an alignment which
+ 					   is finer than the filesystem's soft
+@@ -205,6 +210,8 @@ static void dio_complete(struct dio *dio
+ {
+ 	if (dio->end_io)
+ 		dio->end_io(dio->inode, offset, bytes, dio->map_bh.b_private);
++	if (dio->needs_locking)
++		up_read(&dio->inode->i_alloc_sem);
+ }
+ 
+ /*
+@@ -448,6 +455,7 @@ static int get_more_blocks(struct dio *d
+ 	unsigned long fs_count;	/* Number of filesystem-sized blocks */
+ 	unsigned long dio_count;/* Number of dio_block-sized blocks */
+ 	unsigned long blkmask;
++	int beyond_eof = 0;
+ 
+ 	/*
+ 	 * If there was a memory error and we've overwritten all the
+@@ -465,8 +473,19 @@ static int get_more_blocks(struct dio *d
+ 		if (dio_count & blkmask)	
+ 			fs_count++;
+ 
++		if (dio->needs_locking) {
++			if (dio->block_in_file >= (i_size_read(dio->inode) >>
++							dio->blkbits))
++				beyond_eof = 1;
++		}
++		/*
++		 * For writes inside i_size we forbid block creations: only
++		 * overwrites are permitted.  We fall back to buffered writes
++		 * at a higher level for inside-i_size block-instantiating
++		 * writes.
++		 */
+ 		ret = (*dio->get_blocks)(dio->inode, fs_startblk, fs_count,
+-				map_bh, dio->rw == WRITE);
++				map_bh, (dio->rw == WRITE) && beyond_eof);
+ 	}
+ 	return ret;
+ }
+@@ -773,6 +792,10 @@ do_holes:
+ 			if (!buffer_mapped(map_bh)) {
+ 				char *kaddr;
+ 
++				/* AKPM: eargh, -ENOTBLK is a hack */
++				if (dio->rw == WRITE)
++					return -ENOTBLK;
++
+ 				if (dio->block_in_file >=
+ 					i_size_read(dio->inode)>>blkbits) {
+ 					/* We hit eof */
+@@ -838,21 +861,21 @@ out:
+ 	return ret;
+ }
+ 
++/*
++ * Releases both i_sem and i_alloc_sem
++ */
+ static int
+ direct_io_worker(int rw, struct kiocb *iocb, struct inode *inode, 
+ 	const struct iovec *iov, loff_t offset, unsigned long nr_segs, 
+-	unsigned blkbits, get_blocks_t get_blocks, dio_iodone_t end_io)
++	unsigned blkbits, get_blocks_t get_blocks, dio_iodone_t end_io,
++	struct dio *dio)
+ {
+ 	unsigned long user_addr; 
+ 	int seg;
+ 	int ret = 0;
+ 	int ret2;
+-	struct dio *dio;
+ 	size_t bytes;
+ 
+-	dio = kmalloc(sizeof(*dio), GFP_KERNEL);
+-	if (!dio)
+-		return -ENOMEM;
+ 	dio->is_async = !is_sync_kiocb(iocb);
+ 
+ 	dio->bio = NULL;
+@@ -863,7 +886,6 @@ direct_io_worker(int rw, struct kiocb *i
+ 	dio->start_zero_done = 0;
+ 	dio->block_in_file = offset >> blkbits;
+ 	dio->blocks_available = 0;
+-
+ 	dio->cur_page = NULL;
+ 
+ 	dio->boundary = 0;
+@@ -946,6 +968,13 @@ direct_io_worker(int rw, struct kiocb *i
+ 		dio_bio_submit(dio);
+ 
+ 	/*
++	 * All new block allocations have been performed.  We can let i_sem
++	 * go now.
++	 */
++	if (dio->needs_locking)
++		up(&dio->inode->i_sem);
++
++	/*
+ 	 * OK, all BIOs are submitted, so we can decrement bio_count to truly
+ 	 * reflect the number of to-be-processed BIOs.
+ 	 */
+@@ -980,11 +1009,17 @@ direct_io_worker(int rw, struct kiocb *i
+ 
+ /*
+  * This is a library function for use by filesystem drivers.
++ *
++ * For writes to S_ISREG files, we are called under i_sem and return with i_sem
++ * held, even though it is internally dropped.
++ *
++ * For writes to S_ISBLK files, i_sem is not held on entry; it is never taken.
+  */
+ int
+-blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode, 
++__blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
+ 	struct block_device *bdev, const struct iovec *iov, loff_t offset, 
+-	unsigned long nr_segs, get_blocks_t get_blocks, dio_iodone_t end_io)
++	unsigned long nr_segs, get_blocks_t get_blocks, dio_iodone_t end_io,
++	int needs_special_locking)
+ {
+ 	int seg;
+ 	size_t size;
+@@ -993,6 +1028,8 @@ blockdev_direct_IO(int rw, struct kiocb 
+ 	unsigned bdev_blkbits = 0;
+ 	unsigned blocksize_mask = (1 << blkbits) - 1;
+ 	ssize_t retval = -EINVAL;
++	struct dio *dio;
++	int needs_locking;
+ 
+ 	if (bdev)
+ 		bdev_blkbits = blksize_bits(bdev_hardsect_size(bdev));
+@@ -1018,8 +1055,37 @@ blockdev_direct_IO(int rw, struct kiocb 
+ 		}
+ 	}
+ 
+-	retval = direct_io_worker(rw, iocb, inode, iov, offset, 
+-				nr_segs, blkbits, get_blocks, end_io);
++	dio = kmalloc(sizeof(*dio), GFP_KERNEL);
++	retval = -ENOMEM;
++	if (!dio)
++		goto out;
++
++	/*
++	 * For regular files,
++	 *	readers need to grab i_sem and i_alloc_sem
++	 *	writers need to grab i_alloc_sem only (i_sem is already held)
++	 */
++	needs_locking = 0;
++	if (S_ISREG(inode->i_mode) && needs_special_locking) {
++		needs_locking = 1;
++		if (rw == READ) {
++			down(&inode->i_sem);
++			retval = filemap_write_and_wait(inode->i_mapping);
++			if (retval) {
++				up(&inode->i_sem);
++				kfree(dio);
++				goto out;
++			}
++		}
++		down_read(&inode->i_alloc_sem);
++	}
++	dio->needs_locking = needs_locking;
++
++	retval = direct_io_worker(rw, iocb, inode, iov, offset,
++				nr_segs, blkbits, get_blocks, end_io, dio);
++	if (needs_locking && rw == WRITE)
++		down(&inode->i_sem);
+ out:
+ 	return retval;
+ }
++EXPORT_SYMBOL(__blockdev_direct_IO);
+--- linux-2.6.0-test6/fs/dquot.c	2003-07-10 18:50:31.000000000 -0700
++++ 25/fs/dquot.c	2003-10-05 00:36:15.000000000 -0700
+@@ -668,12 +668,12 @@ static void print_warning(struct dquot *
+ 
+ 	if (!need_print_warning(dquot) || (flag && test_and_set_bit(flag, &dquot->dq_flags)))
+ 		return;
+-	tty_write_message(current->tty, dquot->dq_sb->s_id);
++	tty_write_message(process_tty(current), dquot->dq_sb->s_id);
+ 	if (warntype == ISOFTWARN || warntype == BSOFTWARN)
+-		tty_write_message(current->tty, ": warning, ");
++		tty_write_message(process_tty(current), ": warning, ");
+ 	else
+-		tty_write_message(current->tty, ": write failed, ");
+-	tty_write_message(current->tty, quotatypes[dquot->dq_type]);
++		tty_write_message(process_tty(current), ": write failed, ");
++	tty_write_message(process_tty(current), quotatypes[dquot->dq_type]);
+ 	switch (warntype) {
+ 		case IHARDWARN:
+ 			msg = " file limit reached.\n";
+@@ -694,7 +694,7 @@ static void print_warning(struct dquot *
+ 			msg = " block quota exceeded.\n";
+ 			break;
+ 	}
+-	tty_write_message(current->tty, msg);
++	tty_write_message(process_tty(current), msg);
+ }
+ 
+ static inline void flush_warnings(struct dquot **dquots, char *warntype)
+--- linux-2.6.0-test6/fs/efs/super.c	2003-06-22 12:04:44.000000000 -0700
++++ 25/fs/efs/super.c	2003-10-05 00:33:24.000000000 -0700
+@@ -218,7 +218,11 @@ int efs_fill_super(struct super_block *s
+ 	memset(sb, 0, sizeof(struct efs_sb_info));
+  
+ 	s->s_magic		= EFS_SUPER_MAGIC;
+-	sb_set_blocksize(s, EFS_BLOCKSIZE);
++	if (!sb_set_blocksize(s, EFS_BLOCKSIZE)) {
++		printk(KERN_ERR "EFS: device does not support %d byte blocks\n",
++			EFS_BLOCKSIZE);
++		goto out_no_fs_ul;
++	}
+   
+ 	/* read the vh (volume header) block */
+ 	bh = sb_bread(s, 0);
+--- linux-2.6.0-test6/fs/eventpoll.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/eventpoll.c	2003-10-05 00:34:03.000000000 -0700
+@@ -740,6 +740,7 @@ static int ep_getfd(int *efd, struct ino
+ 	d_add(dentry, inode);
+ 	file->f_vfsmnt = mntget(eventpoll_mnt);
+ 	file->f_dentry = dget(dentry);
++	file->f_mapping = inode->i_mapping;
+ 
+ 	file->f_pos = 0;
+ 	file->f_flags = O_RDONLY;
+--- linux-2.6.0-test6/fs/exec.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/exec.c	2003-10-05 00:36:15.000000000 -0700
+@@ -83,6 +83,8 @@ int register_binfmt(struct linux_binfmt 
+ 	return 0;	
+ }
+ 
++EXPORT_SYMBOL(register_binfmt);
++
+ int unregister_binfmt(struct linux_binfmt * fmt)
+ {
+ 	struct linux_binfmt ** tmp = &formats;
+@@ -100,6 +102,8 @@ int unregister_binfmt(struct linux_binfm
+ 	return -EINVAL;
+ }
+ 
++EXPORT_SYMBOL(unregister_binfmt);
++
+ static inline void put_binfmt(struct linux_binfmt * fmt)
+ {
+ 	module_put(fmt->module);
+@@ -281,6 +285,8 @@ int copy_strings_kernel(int argc,char **
+ 	return r;
+ }
+ 
++EXPORT_SYMBOL(copy_strings_kernel);
++
+ #ifdef CONFIG_MMU
+ /*
+  * This routine is used to map in a page into an address space: needed by
+@@ -443,6 +449,8 @@ int setup_arg_pages(struct linux_binprm 
+ 	return 0;
+ }
+ 
++EXPORT_SYMBOL(setup_arg_pages);
++
+ #define free_arg_pages(bprm) do { } while (0)
+ 
+ #else
+@@ -493,6 +501,8 @@ out:
+ 	goto out;
+ }
+ 
++EXPORT_SYMBOL(open_exec);
++
+ int kernel_read(struct file *file, unsigned long offset,
+ 	char *addr, unsigned long count)
+ {
+@@ -508,6 +518,8 @@ int kernel_read(struct file *file, unsig
+ 	return result;
+ }
+ 
++EXPORT_SYMBOL(kernel_read);
++
+ static int exec_mmap(struct mm_struct *mm)
+ {
+ 	struct task_struct *tsk;
+@@ -584,6 +596,11 @@ static inline int de_thread(struct task_
+ 		newsig->group_stop_count = 0;
+ 		newsig->curr_target = NULL;
+ 		init_sigpending(&newsig->shared_pending);
++
++		newsig->pgrp = oldsig->pgrp;
++		newsig->session = oldsig->session;
++		newsig->leader = oldsig->leader;
++		newsig->tty_old_pgrp = oldsig->tty_old_pgrp;
+ 	}
+ 
+ 	if (thread_group_empty(current))
+@@ -822,6 +839,8 @@ out:
+ 	return retval;
+ }
+ 
++EXPORT_SYMBOL(flush_old_exec);
++
+ /*
+  * We mustn't allow tracing of suid binaries, unless
+  * the tracer has the capability to trace anything..
+@@ -878,6 +897,8 @@ int prepare_binprm(struct linux_binprm *
+ 	return kernel_read(bprm->file,0,bprm->buf,BINPRM_BUF_SIZE);
+ }
+ 
++EXPORT_SYMBOL(prepare_binprm);
++
+ /*
+  * This function is used to produce the new IDs and capabilities
+  * from the old ones and the file's capabilities.
+@@ -918,6 +939,8 @@ void compute_creds(struct linux_binprm *
+ 	security_bprm_compute_creds(bprm);
+ }
+ 
++EXPORT_SYMBOL(compute_creds);
++
+ void remove_arg_zero(struct linux_binprm *bprm)
+ {
+ 	if (bprm->argc) {
+@@ -942,6 +965,8 @@ inside:
+ 	}
+ }
+ 
++EXPORT_SYMBOL(remove_arg_zero);
++
+ /*
+  * cycle the list of binary formats handler, until one recognizes the image
+  */
+@@ -1037,6 +1062,8 @@ int search_binary_handler(struct linux_b
+ 	return retval;
+ }
+ 
++EXPORT_SYMBOL(search_binary_handler);
++
+ /*
+  * sys_execve() executes a new program.
+  */
+@@ -1133,6 +1160,8 @@ out_file:
+ 	return retval;
+ }
+ 
++EXPORT_SYMBOL(do_execve);
++
+ int set_binfmt(struct linux_binfmt *new)
+ {
+ 	struct linux_binfmt *old = current->binfmt;
+@@ -1147,6 +1176,8 @@ int set_binfmt(struct linux_binfmt *new)
+ 	return 0;
+ }
+ 
++EXPORT_SYMBOL(set_binfmt);
++
+ #define CORENAME_MAX_SIZE 64
+ 
+ /* format_corename will inspect the pattern parameter, and output a
+--- linux-2.6.0-test6/fs/ext2/inode.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/ext2/inode.c	2003-10-05 00:36:59.000000000 -0700
+@@ -257,11 +257,12 @@ static int ext2_block_to_path(struct ino
+  *	or when it reads all @depth-1 indirect blocks successfully and finds
+  *	the whole chain, all way to the data (returns %NULL, *err == 0).
+  */
+-static Indirect *ext2_get_branch(struct inode *inode,
++static Indirect *ext2_get_branch_wq(struct inode *inode,
+ 				 int depth,
+ 				 int *offsets,
+ 				 Indirect chain[4],
+-				 int *err)
++				 int *err,
++				 wait_queue_t *wait)
+ {
+ 	struct super_block *sb = inode->i_sb;
+ 	Indirect *p = chain;
+@@ -273,8 +274,8 @@ static Indirect *ext2_get_branch(struct 
+ 	if (!p->key)
+ 		goto no_block;
+ 	while (--depth) {
+-		bh = sb_bread(sb, le32_to_cpu(p->key));
+-		if (!bh)
++		bh = sb_bread_wq(sb, le32_to_cpu(p->key), wait);
++		if (!bh || IS_ERR(bh))
+ 			goto failure;
+ 		read_lock(&EXT2_I(inode)->i_meta_lock);
+ 		if (!verify_chain(chain, p))
+@@ -292,11 +293,21 @@ changed:
+ 	*err = -EAGAIN;
+ 	goto no_block;
+ failure:
+-	*err = -EIO;
++	*err = IS_ERR(bh) ? PTR_ERR(bh) : -EIO;
+ no_block:
+ 	return p;
+ }
+ 
++static Indirect *ext2_get_branch(struct inode *inode,
++				 int depth,
++				 int *offsets,
++				 Indirect chain[4],
++				 int *err)
++{
++	return ext2_get_branch_wq(inode, depth, offsets, chain,
++		err, NULL);
++}
++
+ /**
+  *	ext2_find_near - find a place for allocation with sufficient locality
+  *	@inode: owner
+@@ -536,7 +547,8 @@ changed:
+  * reachable from inode.
+  */
+ 
+-static int ext2_get_block(struct inode *inode, sector_t iblock, struct buffer_head *bh_result, int create)
++static int ext2_get_block_wq(struct inode *inode, sector_t iblock,
++	struct buffer_head *bh_result, int create, wait_queue_t *wait)
+ {
+ 	int err = -EIO;
+ 	int offsets[4];
+@@ -551,7 +563,8 @@ static int ext2_get_block(struct inode *
+ 		goto out;
+ 
+ reread:
+-	partial = ext2_get_branch(inode, depth, offsets, chain, &err);
++	partial = ext2_get_branch_wq(inode, depth, offsets, chain, &err,
++		wait);
+ 
+ 	/* Simplest case - block found, no allocation needed */
+ 	if (!partial) {
+@@ -565,7 +578,7 @@ got_it:
+ 	}
+ 
+ 	/* Next simple case - plain lookup or failed read of indirect block */
+-	if (!create || err == -EIO) {
++	if (!create || err == -EIO || err == -EIOCBRETRY) {
+ cleanup:
+ 		while (partial > chain) {
+ 			brelse(partial->bh);
+@@ -606,6 +619,19 @@ changed:
+ 	goto reread;
+ }
+ 
++static int ext2_get_block_async(struct inode *inode, sector_t iblock,
++	struct buffer_head *bh_result, int create)
++{
++	return ext2_get_block_wq(inode, iblock, bh_result, create,
++		current->io_wait);
++}
++
++static int ext2_get_block(struct inode *inode, sector_t iblock,
++	struct buffer_head *bh_result, int create)
++{
++	return ext2_get_block_wq(inode, iblock, bh_result, create, NULL);
++}
++
+ static int ext2_writepage(struct page *page, struct writeback_control *wbc)
+ {
+ 	return block_write_full_page(page, ext2_get_block, wbc);
+@@ -627,7 +653,7 @@ static int
+ ext2_prepare_write(struct file *file, struct page *page,
+ 			unsigned from, unsigned to)
+ {
+-	return block_prepare_write(page,from,to,ext2_get_block);
++	return block_prepare_write(page,from,to,ext2_get_block_async);
+ }
+ 
+ static int
+@@ -659,7 +685,7 @@ ext2_direct_IO(int rw, struct kiocb *ioc
+ 			loff_t offset, unsigned long nr_segs)
+ {
+ 	struct file *file = iocb->ki_filp;
+-	struct inode *inode = file->f_dentry->d_inode->i_mapping->host;
++	struct inode *inode = file->f_mapping->host;
+ 
+ 	return blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev, iov,
+ 				offset, nr_segs, ext2_get_blocks, NULL);
+@@ -1228,6 +1254,7 @@ static int ext2_update_inode(struct inod
+ 			raw_inode->i_block[0] = 0;
+ 			raw_inode->i_block[1] =
+ 				cpu_to_le32(new_encode_dev(inode->i_rdev));
++			raw_inode->i_block[2] = 0;
+ 		}
+ 	} else for (n = 0; n < EXT2_N_BLOCKS; n++)
+ 		raw_inode->i_block[n] = ei->i_data[n];
+--- linux-2.6.0-test6/fs/ext2/super.c	2003-07-10 18:50:31.000000000 -0700
++++ 25/fs/ext2/super.c	2003-10-05 00:33:24.000000000 -0700
+@@ -22,6 +22,7 @@
+ #include <linux/slab.h>
+ #include <linux/init.h>
+ #include <linux/blkdev.h>
++#include <linux/parser.h>
+ #include <linux/random.h>
+ #include <linux/buffer_head.h>
+ #include <linux/smp_lock.h>
+@@ -265,149 +266,157 @@ static unsigned long get_sb_block(void *
+ 	return sb_block;
+ }
+ 
+-static int want_value(char *value, char *option)
+-{
+-	if (!value || !*value) {
+-		printk(KERN_NOTICE "EXT2-fs: the %s option needs an argument\n",
+-		       option);
+-		return -1;
+-	}
+-	return 0;
+-}
+-
+-static int want_null_value(char *value, char *option)
+-{
+-	if (*value) {
+-		printk(KERN_NOTICE "EXT2-fs: Invalid %s argument: %s\n",
+-		       option, value);
+-		return -1;
+-	}
+-	return 0;
+-}
++enum {
++	Opt_bsd_df, Opt_minix_df, Opt_grpid, Opt_nogrpid,
++	Opt_resgid, Opt_resuid, Opt_sb, Opt_err_cont, Opt_err_panic, Opt_err_ro,
++	Opt_nouid32, Opt_check, Opt_nocheck, Opt_debug, Opt_oldalloc, Opt_orlov, Opt_nobh,
++	Opt_user_xattr, Opt_nouser_xattr, Opt_acl, Opt_noacl,
++	Opt_ignore, Opt_err,
++};
+ 
+-static int want_numeric(char *value, char *option, unsigned long *number)
+-{
+-	if (want_value(value, option))
+-		return -1;
+-	*number = simple_strtoul(value, &value, 0);
+-	if (want_null_value(value, option))
+-		return -1;
+-	return 0;
+-}
++static match_table_t tokens = {
++	{Opt_bsd_df, "bsddf"},
++	{Opt_minix_df, "minixdf"},
++	{Opt_grpid, "grpid"},
++	{Opt_grpid, "bsdgroups"},
++	{Opt_nogrpid, "nogrpid"},
++	{Opt_nogrpid, "sysvgroups"},
++	{Opt_resgid, "resgid=%d"},
++	{Opt_resuid, "resuid=%d"},
++	{Opt_sb, "sb=%d"},
++	{Opt_err_cont, "errors=continue"},
++	{Opt_err_panic, "errors=panic"},
++	{Opt_err_ro, "errors=remount-ro"},
++	{Opt_nouid32, "nouid32"},
++	{Opt_nocheck, "check=none"},
++	{Opt_nocheck, "nocheck"},
++	{Opt_check, "check"},
++	{Opt_debug, "debug"},
++	{Opt_oldalloc, "oldalloc"},
++	{Opt_orlov, "orlov"},
++	{Opt_nobh, "nobh"},
++	{Opt_user_xattr, "user_xattr"},
++	{Opt_nouser_xattr, "nouser_xattr"},
++	{Opt_acl, "acl"},
++	{Opt_noacl, "noacl"},
++	{Opt_ignore, "grpquota"},
++	{Opt_ignore, "noquota"},
++	{Opt_ignore, "quota"},
++	{Opt_ignore, "usrquota"},
++	{Opt_err, NULL}
++};
+ 
+-/*
+- * This function has been shamelessly adapted from the msdos fs
+- */
+ static int parse_options (char * options,
+ 			  struct ext2_sb_info *sbi)
+ {
+-	char * this_char;
+-	char * value;
++	char * p;
++	substring_t args[MAX_OPT_ARGS];
++	unsigned long kind = EXT2_MOUNT_ERRORS_CONT;
++	int option;
+ 
+ 	if (!options)
+ 		return 1;
+-	while ((this_char = strsep (&options, ",")) != NULL) {
+-		if (!*this_char)
++
++	while ((p = strsep (&options, ",")) != NULL) {
++		int token;
++		if (!*p)
+ 			continue;
+-		if ((value = strchr (this_char, '=')) != NULL)
+-			*value++ = 0;
++
++		token = match_token(p, tokens, args);
++		switch (token) {
++		case Opt_bsd_df:
++			clear_opt (sbi->s_mount_opt, MINIX_DF);
++			break;
++		case Opt_minix_df:
++			set_opt (sbi->s_mount_opt, MINIX_DF);
++			break;
++		case Opt_grpid:
++			set_opt (sbi->s_mount_opt, GRPID);
++			break;
++		case Opt_nogrpid:
++			clear_opt (sbi->s_mount_opt, GRPID);
++			break;
++		case Opt_resuid:
++			if (match_int(&args[0], &option))
++				return 0;
++			sbi->s_resuid = option;
++			break;
++		case Opt_resgid:
++			if (match_int(&args[0], &option))
++				return 0;
++			sbi->s_resgid = option;
++			break;
++		case Opt_sb:
++			/* handled by get_sb_block() instead of here */
++			/* *sb_block = match_int(&args[0]); */
++			break;
++		case Opt_err_panic:
++			kind = EXT2_MOUNT_ERRORS_PANIC;
++			break;
++		case Opt_err_ro:
++			kind = EXT2_MOUNT_ERRORS_RO;
++			break;
++		case Opt_err_cont:
++			kind = EXT2_MOUNT_ERRORS_CONT;
++			break;
++		case Opt_nouid32:
++			set_opt (sbi->s_mount_opt, NO_UID32);
++			break;
++		case Opt_check:
++#ifdef CONFIG_EXT2_CHECK
++			set_opt (sbi->s_mount_opt, CHECK);
++#else
++			printk("EXT2 Check option not supported\n");
++#endif
++			break;
++		case Opt_nocheck:
++			clear_opt (sbi->s_mount_opt, CHECK);
++			break;
++		case Opt_debug:
++			set_opt (sbi->s_mount_opt, DEBUG);
++			break;
++		case Opt_oldalloc:
++			set_opt (sbi->s_mount_opt, OLDALLOC);
++			break;
++		case Opt_orlov:
++			clear_opt (sbi->s_mount_opt, OLDALLOC);
++			break;
++		case Opt_nobh:
++			set_opt (sbi->s_mount_opt, NOBH);
++			break;
+ #ifdef CONFIG_EXT2_FS_XATTR
+-		if (!strcmp (this_char, "user_xattr"))
++		case Opt_user_xattr:
+ 			set_opt (sbi->s_mount_opt, XATTR_USER);
+-		else if (!strcmp (this_char, "nouser_xattr"))
++			break;
++		case Opt_nouser_xattr:
+ 			clear_opt (sbi->s_mount_opt, XATTR_USER);
+-		else
++			break;
++#else
++		case Opt_user_xattr:
++		case Opt_nouser_xattr:
++			printk("EXT2 (no)user_xattr options not supported\n");
++			break;
+ #endif
+ #ifdef CONFIG_EXT2_FS_POSIX_ACL
+-		if (!strcmp(this_char, "acl"))
++		case Opt_acl:
+ 			set_opt(sbi->s_mount_opt, POSIX_ACL);
+-		else if (!strcmp(this_char, "noacl"))
++			break;
++		case Opt_noacl:
+ 			clear_opt(sbi->s_mount_opt, POSIX_ACL);
+-		else
+-#endif
+-		if (!strcmp (this_char, "bsddf"))
+-			clear_opt (sbi->s_mount_opt, MINIX_DF);
+-		else if (!strcmp (this_char, "nouid32")) {
+-			set_opt (sbi->s_mount_opt, NO_UID32);
+-		}
+-		else if (!strcmp (this_char, "check")) {
+-			if (!value || !*value || !strcmp (value, "none"))
+-				clear_opt (sbi->s_mount_opt, CHECK);
+-			else
+-#ifdef CONFIG_EXT2_CHECK
+-				set_opt (sbi->s_mount_opt, CHECK);
++			break;
+ #else
+-				printk("EXT2 Check option not supported\n");
++		case Opt_acl:
++		case Opt_noacl:
++			printk("EXT2 (no)acl options not supported\n");
++			break;
+ #endif
+-		}
+-		else if (!strcmp (this_char, "debug"))
+-			set_opt (sbi->s_mount_opt, DEBUG);
+-		else if (!strcmp (this_char, "errors")) {
+-			if (!value || !*value) {
+-				printk ("EXT2-fs: the errors option requires "
+-					"an argument\n");
+-				return 0;
+-			}
+-			if (!strcmp (value, "continue")) {
+-				clear_opt (sbi->s_mount_opt, ERRORS_RO);
+-				clear_opt (sbi->s_mount_opt, ERRORS_PANIC);
+-				set_opt (sbi->s_mount_opt, ERRORS_CONT);
+-			}
+-			else if (!strcmp (value, "remount-ro")) {
+-				clear_opt (sbi->s_mount_opt, ERRORS_CONT);
+-				clear_opt (sbi->s_mount_opt, ERRORS_PANIC);
+-				set_opt (sbi->s_mount_opt, ERRORS_RO);
+-			}
+-			else if (!strcmp (value, "panic")) {
+-				clear_opt (sbi->s_mount_opt, ERRORS_CONT);
+-				clear_opt (sbi->s_mount_opt, ERRORS_RO);
+-				set_opt (sbi->s_mount_opt, ERRORS_PANIC);
+-			}
+-			else {
+-				printk ("EXT2-fs: Invalid errors option: %s\n",
+-					value);
+-				return 0;
+-			}
+-		}
+-		else if (!strcmp (this_char, "grpid") ||
+-			 !strcmp (this_char, "bsdgroups"))
+-			set_opt (sbi->s_mount_opt, GRPID);
+-		else if (!strcmp (this_char, "minixdf"))
+-			set_opt (sbi->s_mount_opt, MINIX_DF);
+-		else if (!strcmp (this_char, "nocheck"))
+-			clear_opt (sbi->s_mount_opt, CHECK);
+-		else if (!strcmp (this_char, "nogrpid") ||
+-			 !strcmp (this_char, "sysvgroups"))
+-			clear_opt (sbi->s_mount_opt, GRPID);
+-		else if (!strcmp (this_char, "resgid")) {
+-			unsigned long v;
+-			if (want_numeric(value, "resgid", &v))
+-				return 0;
+-			sbi->s_resgid = v;
+-		}
+-		else if (!strcmp (this_char, "resuid")) {
+-			unsigned long v;
+-			if (want_numeric(value, "resuid", &v))
+-				return 0;
+-			sbi->s_resuid = v;
+-		}
+-		else if (!strcmp (this_char, "oldalloc"))
+-			set_opt (sbi->s_mount_opt, OLDALLOC);
+-		else if (!strcmp (this_char, "orlov"))
+-			clear_opt (sbi->s_mount_opt, OLDALLOC);
+-		else if (!strcmp (this_char, "nobh"))
+-			set_opt(sbi->s_mount_opt, NOBH);
+-		/* Silently ignore the quota options */
+-		else if (!strcmp (this_char, "grpquota")
+-		         || !strcmp (this_char, "noquota")
+-		         || !strcmp (this_char, "quota")
+-		         || !strcmp (this_char, "usrquota"))
+-			/* Don't do anything ;-) */ ;
+-		else {
+-			printk ("EXT2-fs: Unrecognized mount option %s\n", this_char);
++		case Opt_ignore:
++			break;
++		default:
+ 			return 0;
+ 		}
+ 	}
++	sbi->s_mount_opt |= kind;
+ 	return 1;
+ }
+ 
+--- linux-2.6.0-test6/fs/ext3/file.c	2003-08-08 22:55:13.000000000 -0700
++++ 25/fs/ext3/file.c	2003-10-05 00:33:24.000000000 -0700
+@@ -47,7 +47,7 @@ static int ext3_release_file (struct ino
+  * the caller didn't specify O_LARGEFILE.  On 64bit systems we force
+  * on this flag in sys_open.
+  */
+-static int ext3_open_file (struct inode * inode, struct file * filp)
++static int ext3_open_file (struct inode *inode, struct file *filp)
+ {
+ 	if (!(filp->f_flags & O_LARGEFILE) &&
+ 	    inode->i_size > 0x7FFFFFFFLL)
+@@ -56,7 +56,7 @@ static int ext3_open_file (struct inode 
+ }
+ 
+ static ssize_t
+-ext3_file_write(struct kiocb *iocb, const char *buf, size_t count, loff_t pos)
++ext3_file_write(struct kiocb *iocb, const char __user *buf, size_t count, loff_t pos)
+ {
+ 	struct file *file = iocb->ki_filp;
+ 	struct inode *inode = file->f_dentry->d_inode;
+@@ -117,8 +117,8 @@ struct file_operations ext3_file_operati
+ 	.llseek		= generic_file_llseek,
+ 	.read		= do_sync_read,
+ 	.write		= do_sync_write,
+-	.aio_read		= generic_file_aio_read,
+-	.aio_write		= ext3_file_write,
++	.aio_read	= generic_file_aio_read,
++	.aio_write	= ext3_file_write,
+ 	.readv		= generic_file_readv,
+ 	.writev		= generic_file_writev,
+ 	.ioctl		= ext3_ioctl,
+--- linux-2.6.0-test6/fs/ext3/inode.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/ext3/inode.c	2003-10-05 00:36:12.000000000 -0700
+@@ -812,15 +812,17 @@ out:
+ 	if (err == -EAGAIN)
+ 		goto changed;
+ 
+-	if (ext3_find_goal(inode, iblock, chain, partial, &goal) < 0)
++	down(&ei->truncate_sem);
++	if (ext3_find_goal(inode, iblock, chain, partial, &goal) < 0) {
++		up(&ei->truncate_sem);
+ 		goto changed;
++	}
+ 
+ 	left = (chain + depth) - partial;
+ 
+ 	/*
+ 	 * Block out ext3_truncate while we alter the tree
+ 	 */
+-	down_read(&ei->truncate_sem);
+ 	err = ext3_alloc_branch(handle, inode, left, goal,
+ 					offsets+(partial-chain), partial);
+ 
+@@ -832,7 +834,7 @@ out:
+ 	if (!err)
+ 		err = ext3_splice_branch(handle, inode, iblock, chain,
+ 					 partial, left);
+-	up_read(&ei->truncate_sem);
++	up(&ei->truncate_sem);
+ 	if (err == -EAGAIN)
+ 		goto changed;
+ 	if (err)
+@@ -1537,7 +1539,7 @@ static int ext3_direct_IO(int rw, struct
+ 			unsigned long nr_segs)
+ {
+ 	struct file *file = iocb->ki_filp;
+-	struct inode *inode = file->f_dentry->d_inode->i_mapping->host;
++	struct inode *inode = file->f_mapping->host;
+ 	struct ext3_inode_info *ei = EXT3_I(inode);
+ 	handle_t *handle = NULL;
+ 	int ret;
+@@ -2205,7 +2207,7 @@ void ext3_truncate(struct inode * inode)
+ 	 * From here we block out all ext3_get_block() callers who want to
+ 	 * modify the block allocation tree.
+ 	 */
+-	down_write(&ei->truncate_sem);
++	down(&ei->truncate_sem);
+ 
+ 	if (n == 1) {		/* direct blocks */
+ 		ext3_free_data(handle, inode, NULL, i_data+offsets[0],
+@@ -2269,7 +2271,7 @@ do_indirects:
+ 		case EXT3_TIND_BLOCK:
+ 			;
+ 	}
+-	up_write(&ei->truncate_sem);
++	up(&ei->truncate_sem);
+ 	inode->i_mtime = inode->i_ctime = CURRENT_TIME;
+ 	ext3_mark_inode_dirty(handle, inode);
+ 
+@@ -2679,6 +2681,7 @@ static int ext3_do_update_inode(handle_t
+ 			raw_inode->i_block[0] = 0;
+ 			raw_inode->i_block[1] =
+ 				cpu_to_le32(new_encode_dev(inode->i_rdev));
++			raw_inode->i_block[2] = 0;
+ 		}
+ 	} else for (block = 0; block < EXT3_N_BLOCKS; block++)
+ 		raw_inode->i_block[block] = ei->i_data[block];
+--- linux-2.6.0-test6/fs/ext3/super.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/ext3/super.c	2003-10-05 00:36:12.000000000 -0700
+@@ -27,6 +27,7 @@
+ #include <linux/slab.h>
+ #include <linux/init.h>
+ #include <linux/blkdev.h>
++#include <linux/parser.h>
+ #include <linux/smp_lock.h>
+ #include <linux/buffer_head.h>
+ #include <linux/vfs.h>
+@@ -459,7 +460,7 @@ static void init_once(void * foo, kmem_c
+ #ifdef CONFIG_EXT3_FS_XATTR
+ 		init_rwsem(&ei->xattr_sem);
+ #endif
+-		init_rwsem(&ei->truncate_sem);
++		init_MUTEX(&ei->truncate_sem);
+ 		inode_init_once(&ei->vfs_inode);
+ 	}
+ }
+@@ -526,36 +527,54 @@ static struct export_operations ext3_exp
+ 	.get_parent = ext3_get_parent,
+ };
+ 
++enum {
++	Opt_bsd_df, Opt_minix_df, Opt_grpid, Opt_nogrpid,
++	Opt_resgid, Opt_resuid, Opt_sb, Opt_err_cont, Opt_err_panic, Opt_err_ro,
++	Opt_nouid32, Opt_check, Opt_nocheck, Opt_debug, Opt_oldalloc, Opt_orlov,
++	Opt_user_xattr, Opt_nouser_xattr, Opt_acl, Opt_noacl, Opt_noload,
++	Opt_commit, Opt_journal_update, Opt_journal_inum,
++	Opt_abort, Opt_data_journal, Opt_data_ordered, Opt_data_writeback,
++	Opt_ignore, Opt_err,
++};
+ 
+-static int want_value(char *value, char *option)
+-{
+-	if (!value || !*value) {
+-		printk(KERN_NOTICE "EXT3-fs: the %s option needs an argument\n",
+-		       option);
+-		return -1;
+-	}
+-	return 0;
+-}
+-
+-static int want_null_value(char *value, char *option)
+-{
+-	if (*value) {
+-		printk(KERN_NOTICE "EXT3-fs: Invalid %s argument: %s\n",
+-		       option, value);
+-		return -1;
+-	}
+-	return 0;
+-}
+-
+-static int want_numeric(char *value, char *option, unsigned long *number)
+-{
+-	if (want_value(value, option))
+-		return -1;
+-	*number = simple_strtoul(value, &value, 0);
+-	if (want_null_value(value, option))
+-		return -1;
+-	return 0;
+-}
++static match_table_t tokens = {
++	{Opt_bsd_df, "bsddf"},
++	{Opt_minix_df, "minixdf"},
++	{Opt_grpid, "grpid"},
++	{Opt_grpid, "bsdgroups"},
++	{Opt_nogrpid, "nogrpid"},
++	{Opt_nogrpid, "sysvgroups"},
++	{Opt_resgid, "resgid=%d"},
++	{Opt_resuid, "resuid=%d"},
++	{Opt_sb, "sb=%d"},
++	{Opt_err_cont, "errors=continue"},
++	{Opt_err_panic, "errors=panic"},
++	{Opt_err_ro, "errors=remount-ro"},
++	{Opt_nouid32, "nouid32"},
++	{Opt_nocheck, "nocheck"},
++	{Opt_nocheck, "check=none"},
++	{Opt_check, "check"},
++	{Opt_debug, "debug"},
++	{Opt_oldalloc, "oldalloc"},
++	{Opt_orlov, "orlov"},
++	{Opt_user_xattr, "user_xattr"},
++	{Opt_nouser_xattr, "nouser_xattr"},
++	{Opt_acl, "acl"},
++	{Opt_noacl, "noacl"},
++	{Opt_noload, "noload"},
++	{Opt_commit, "commit=%u"},
++	{Opt_journal_update, "journal=update"},
++	{Opt_journal_inum, "journal=%u"},
++	{Opt_abort, "abort"},
++	{Opt_data_journal, "data=journal"},
++	{Opt_data_ordered, "data=ordered"},
++	{Opt_data_writeback, "data=writeback"},
++	{Opt_ignore, "grpquota"},
++	{Opt_ignore, "noquota"},
++	{Opt_ignore, "quota"},
++	{Opt_ignore, "usrquota"},
++	{Opt_err, NULL}
++};
+ 
+ static unsigned long get_sb_block(void **data)
+ {
+@@ -577,175 +596,180 @@ static unsigned long get_sb_block(void *
+ 	return sb_block;
+ }
+ 
+-/*
+- * This function has been shamelessly adapted from the msdos fs
+- */
+ static int parse_options (char * options, struct ext3_sb_info *sbi,
+ 			  unsigned long * inum, int is_remount)
+ {
+-	char * this_char;
+-	char * value;
++	char * p;
++	substring_t args[MAX_OPT_ARGS];
++	int data_opt = 0;
++	int option;
+ 
+ 	if (!options)
+ 		return 1;
+-	while ((this_char = strsep (&options, ",")) != NULL) {
+-		if (!*this_char)
++
++	while ((p = strsep (&options, ",")) != NULL) {
++		int token;
++		if (!*p)
+ 			continue;
+-		if ((value = strchr (this_char, '=')) != NULL)
+-			*value++ = 0;
+-#ifdef CONFIG_EXT3_FS_XATTR
+-		if (!strcmp (this_char, "user_xattr"))
+-			set_opt (sbi->s_mount_opt, XATTR_USER);
+-		else if (!strcmp (this_char, "nouser_xattr"))
+-			clear_opt (sbi->s_mount_opt, XATTR_USER);
+-		else
+-#endif
+-#ifdef CONFIG_EXT3_FS_POSIX_ACL
+-		if (!strcmp(this_char, "acl"))
+-			set_opt (sbi->s_mount_opt, POSIX_ACL);
+-		else if (!strcmp(this_char, "noacl"))
+-			clear_opt (sbi->s_mount_opt, POSIX_ACL);
+-		else
+-#endif
+-		if (!strcmp (this_char, "bsddf"))
++
++		token = match_token(p, tokens, args);
++		switch (token) {
++		case Opt_bsd_df:
+ 			clear_opt (sbi->s_mount_opt, MINIX_DF);
+-		else if (!strcmp (this_char, "nouid32")) {
++			break;
++		case Opt_minix_df:
++			set_opt (sbi->s_mount_opt, MINIX_DF);
++			break;
++		case Opt_grpid:
++			set_opt (sbi->s_mount_opt, GRPID);
++			break;
++		case Opt_nogrpid:
++			clear_opt (sbi->s_mount_opt, GRPID);
++			break;
++		case Opt_resuid:
++			if (match_int(&args[0], &option))
++				return 0;
++			sbi->s_resuid = option;
++			break;
++		case Opt_resgid:
++			if (match_int(&args[0], &option))
++				return 0;
++			sbi->s_resgid = option;
++			break;
++		case Opt_sb:
++			/* handled by get_sb_block() instead of here */
++			/* *sb_block = match_int(&args[0]); */
++			break;
++		case Opt_err_panic:
++			clear_opt (sbi->s_mount_opt, ERRORS_CONT);
++			clear_opt (sbi->s_mount_opt, ERRORS_RO);
++			set_opt (sbi->s_mount_opt, ERRORS_PANIC);
++			break;
++		case Opt_err_ro:
++			clear_opt (sbi->s_mount_opt, ERRORS_CONT);
++			clear_opt (sbi->s_mount_opt, ERRORS_PANIC);
++			set_opt (sbi->s_mount_opt, ERRORS_RO);
++			break;
++		case Opt_err_cont:
++			clear_opt (sbi->s_mount_opt, ERRORS_RO);
++			clear_opt (sbi->s_mount_opt, ERRORS_PANIC);
++			set_opt (sbi->s_mount_opt, ERRORS_CONT);
++			break;
++		case Opt_nouid32:
+ 			set_opt (sbi->s_mount_opt, NO_UID32);
+-		}
+-		else if (!strcmp (this_char, "abort"))
+-			set_opt (sbi->s_mount_opt, ABORT);
+-		else if (!strcmp (this_char, "check")) {
+-			if (!value || !*value || !strcmp (value, "none"))
+-				clear_opt (sbi->s_mount_opt, CHECK);
+-			else
++			break;
++		case Opt_check:
+ #ifdef CONFIG_EXT3_CHECK
+-				set_opt (sbi->s_mount_opt, CHECK);
++			set_opt (sbi->s_mount_opt, CHECK);
+ #else
+-				printk(KERN_ERR 
+-				       "EXT3 Check option not supported\n");
++			printk(KERN_ERR
++			       "EXT3 Check option not supported\n");
+ #endif
+-		}
+-		else if (!strcmp (this_char, "debug"))
+-			set_opt (sbi->s_mount_opt, DEBUG);
+-		else if (!strcmp (this_char, "errors")) {
+-			if (want_value(value, "errors"))
+-				return 0;
+-			if (!strcmp (value, "continue")) {
+-				clear_opt (sbi->s_mount_opt, ERRORS_RO);
+-				clear_opt (sbi->s_mount_opt, ERRORS_PANIC);
+-				set_opt (sbi->s_mount_opt, ERRORS_CONT);
+-			}
+-			else if (!strcmp (value, "remount-ro")) {
+-				clear_opt (sbi->s_mount_opt, ERRORS_CONT);
+-				clear_opt (sbi->s_mount_opt, ERRORS_PANIC);
+-				set_opt (sbi->s_mount_opt, ERRORS_RO);
+-			}
+-			else if (!strcmp (value, "panic")) {
+-				clear_opt (sbi->s_mount_opt, ERRORS_CONT);
+-				clear_opt (sbi->s_mount_opt, ERRORS_RO);
+-				set_opt (sbi->s_mount_opt, ERRORS_PANIC);
+-			}
+-			else {
+-				printk (KERN_ERR
+-					"EXT3-fs: Invalid errors option: %s\n",
+-					value);
+-				return 0;
+-			}
+-		}
+-		else if (!strcmp (this_char, "grpid") ||
+-			 !strcmp (this_char, "bsdgroups"))
+-			set_opt (sbi->s_mount_opt, GRPID);
+-		else if (!strcmp (this_char, "minixdf"))
+-			set_opt (sbi->s_mount_opt, MINIX_DF);
+-		else if (!strcmp (this_char, "nocheck"))
++			break;
++		case Opt_nocheck:
+ 			clear_opt (sbi->s_mount_opt, CHECK);
+-		else if (!strcmp (this_char, "nogrpid") ||
+-			 !strcmp (this_char, "sysvgroups"))
+-			clear_opt (sbi->s_mount_opt, GRPID);
+-		else if (!strcmp (this_char, "resgid")) {
+-			unsigned long v;
+-			if (want_numeric(value, "resgid", &v))
+-				return 0;
+-			sbi->s_resgid = v;
+-		}
+-		else if (!strcmp (this_char, "resuid")) {
+-			unsigned long v;
+-			if (want_numeric(value, "resuid", &v))
+-				return 0;
+-			sbi->s_resuid = v;
+-		}
+-		else if (!strcmp (this_char, "oldalloc"))
++			break;
++		case Opt_debug:
++			set_opt (sbi->s_mount_opt, DEBUG);
++			break;
++		case Opt_oldalloc:
+ 			set_opt (sbi->s_mount_opt, OLDALLOC);
+-		else if (!strcmp (this_char, "orlov"))
++			break;
++		case Opt_orlov:
+ 			clear_opt (sbi->s_mount_opt, OLDALLOC);
+-		/* Silently ignore the quota options */
+-		else if (!strcmp (this_char, "grpquota")
+-		         || !strcmp (this_char, "noquota")
+-		         || !strcmp (this_char, "quota")
+-		         || !strcmp (this_char, "usrquota"))
+-			/* Don't do anything ;-) */ ;
+-		else if (!strcmp (this_char, "journal")) {
++			break;
++#ifdef CONFIG_EXT3_FS_XATTR
++		case Opt_user_xattr:
++			set_opt (sbi->s_mount_opt, XATTR_USER);
++			break;
++		case Opt_nouser_xattr:
++			clear_opt (sbi->s_mount_opt, XATTR_USER);
++			break;
++#else
++		case Opt_user_xattr:
++		case Opt_nouser_xattr:
++			printk("EXT3 (no)user_xattr options not supported\n");
++			break;
++#endif
++#ifdef CONFIG_EXT3_FS_POSIX_ACL
++		case Opt_acl:
++			set_opt(sbi->s_mount_opt, POSIX_ACL);
++			break;
++		case Opt_noacl:
++			clear_opt(sbi->s_mount_opt, POSIX_ACL);
++			break;
++#else
++		case Opt_acl:
++		case Opt_noacl:
++			printk("EXT3 (no)acl options not supported\n");
++			break;
++#endif
++		case Opt_journal_update:
+ 			/* @@@ FIXME */
+ 			/* Eventually we will want to be able to create
+-                           a journal file here.  For now, only allow the
+-                           user to specify an existing inode to be the
+-                           journal file. */
++			   a journal file here.  For now, only allow the
++			   user to specify an existing inode to be the
++			   journal file. */
+ 			if (is_remount) {
+ 				printk(KERN_ERR "EXT3-fs: cannot specify "
+ 				       "journal on remount\n");
+ 				return 0;
+ 			}
+-
+-			if (want_value(value, "journal"))
++			set_opt (sbi->s_mount_opt, UPDATE_JOURNAL);
++			break;
++		case Opt_journal_inum:
++			if (is_remount) {
++				printk(KERN_ERR "EXT3-fs: cannot specify "
++				       "journal on remount\n");
+ 				return 0;
+-			if (!strcmp (value, "update"))
+-				set_opt (sbi->s_mount_opt, UPDATE_JOURNAL);
+-			else if (want_numeric(value, "journal", inum))
++			}
++			if (match_int(&args[0], &option))
+ 				return 0;
+-		}
+-		else if (!strcmp (this_char, "noload"))
++			*inum = option;
++			break;
++		case Opt_noload:
+ 			set_opt (sbi->s_mount_opt, NOLOAD);
+-		else if (!strcmp (this_char, "data")) {
+-			int data_opt = 0;
+-
+-			if (want_value(value, "data"))
+-				return 0;
+-			if (!strcmp (value, "journal"))
+-				data_opt = EXT3_MOUNT_JOURNAL_DATA;
+-			else if (!strcmp (value, "ordered"))
+-				data_opt = EXT3_MOUNT_ORDERED_DATA;
+-			else if (!strcmp (value, "writeback"))
+-				data_opt = EXT3_MOUNT_WRITEBACK_DATA;
+-			else {
+-				printk (KERN_ERR 
+-					"EXT3-fs: Invalid data option: %s\n",
+-					value);
++			break;
++		case Opt_commit:
++			if (match_int(&args[0], &option))
+ 				return 0;
+-			}
++			sbi->s_commit_interval = HZ * option;
++			break;
++		case Opt_data_journal:
++			data_opt = EXT3_MOUNT_JOURNAL_DATA;
++			goto datacheck;
++		case Opt_data_ordered:
++			data_opt = EXT3_MOUNT_ORDERED_DATA;
++			goto datacheck;
++		case Opt_data_writeback:
++			data_opt = EXT3_MOUNT_WRITEBACK_DATA;
++		datacheck:
+ 			if (is_remount) {
+-				if ((sbi->s_mount_opt & EXT3_MOUNT_DATA_FLAGS) !=
+-							data_opt) {
++				if ((sbi->s_mount_opt & EXT3_MOUNT_DATA_FLAGS)
++						!= data_opt) {
+ 					printk(KERN_ERR
+-					       "EXT3-fs: cannot change data "
+-					       "mode on remount\n");
++						"EXT3-fs: cannot change data "
++						"mode on remount\n");
+ 					return 0;
+ 				}
+ 			} else {
+ 				sbi->s_mount_opt &= ~EXT3_MOUNT_DATA_FLAGS;
+ 				sbi->s_mount_opt |= data_opt;
+ 			}
+-		} else if (!strcmp (this_char, "commit")) {
+-			unsigned long v;
+-			if (want_numeric(value, "commit", &v))
+-				return 0;
+-			sbi->s_commit_interval = (HZ * v);
+-		} else {
+-			printk (KERN_ERR 
+-				"EXT3-fs: Unrecognized mount option %s\n",
+-				this_char);
++			break;
++		case Opt_abort:
++			set_opt(sbi->s_mount_opt, ABORT);
++			break;
++		case Opt_ignore:
++			break;
++		default:
++			printk (KERN_ERR
++				"EXT3-fs: Unrecognized mount option \"%s\" "
++				"or missing value\n", p);
+ 			return 0;
+ 		}
+ 	}
++
+ 	return 1;
+ }
+ 
+--- linux-2.6.0-test6/fs/ext3/symlink.c	2003-06-14 12:18:22.000000000 -0700
++++ 25/fs/ext3/symlink.c	2003-10-05 00:33:24.000000000 -0700
+@@ -22,7 +22,8 @@
+ #include <linux/ext3_fs.h>
+ #include "xattr.h"
+ 
+-static int ext3_readlink(struct dentry *dentry, char *buffer, int buflen)
++static int
++ext3_readlink(struct dentry *dentry, char __user *buffer, int buflen)
+ {
+ 	struct ext3_inode_info *ei = EXT3_I(dentry->d_inode);
+ 	return vfs_readlink(dentry, buffer, buflen, (char*)ei->i_data);
+--- linux-2.6.0-test6/fs/fat/dir.c	2003-08-08 22:55:13.000000000 -0700
++++ 25/fs/fat/dir.c	2003-10-05 00:33:24.000000000 -0700
+@@ -663,7 +663,7 @@ int fat_dir_ioctl(struct inode * inode, 
+ 		return -EINVAL;
+ 	}
+ 
+-	d1 = (struct dirent *)arg;
++	d1 = (struct dirent __user *)arg;
+ 	if (!access_ok(VERIFY_WRITE, d1, sizeof(struct dirent[2])))
+ 		return -EFAULT;
+ 	/*
+--- linux-2.6.0-test6/fs/fat/inode.c	2003-08-08 22:55:13.000000000 -0700
++++ 25/fs/fat/inode.c	2003-10-05 00:33:24.000000000 -0700
+@@ -20,6 +20,7 @@
+ #include <linux/buffer_head.h>
+ #include <linux/mount.h>
+ #include <linux/vfs.h>
++#include <linux/parser.h>
+ #include <asm/unaligned.h>
+ 
+ /*
+@@ -183,20 +184,6 @@ void fat_put_super(struct super_block *s
+ 	kfree(sbi);
+ }
+ 
+-static int simple_getbool(char *s, int *setval)
+-{
+-	if (s) {
+-		if (!strcmp(s,"1") || !strcmp(s,"yes") || !strcmp(s,"true"))
+-			*setval = 1;
+-		else if (!strcmp(s,"0") || !strcmp(s,"no") || !strcmp(s,"false"))
+-			*setval = 0;
+-		else
+-			return 0;
+-	} else
+-		*setval = 1;
+-	return 1;
+-}
+-
+ static int fat_show_options(struct seq_file *m, struct vfsmount *mnt)
+ {
+ 	struct msdos_sb_info *sbi = MSDOS_SB(mnt->mnt_sb);
+@@ -259,11 +246,95 @@ static int fat_show_options(struct seq_f
+ 	return 0;
+ }
+ 
++static void print_obsolete_option(char *optname)
++{
++	printk(KERN_INFO "FAT: %s option is obsolete, "
++			"not supported now\n", optname);
++}
++
++enum {
++	Opt_blocksize, Opt_charset, Opt_check_n, Opt_check_r, Opt_check_s,
++	Opt_fat, Opt_codepage, Opt_conv_a, Opt_conv_b, Opt_conv_t,
++	Opt_debug, Opt_dots, Opt_err, Opt_gid, Opt_immutable,
++	Opt_nocase, Opt_nodots, Opt_quiet, Opt_showexec, Opt_uid,
++	Opt_shortname_lower, Opt_shortname_win95, Opt_shortname_winnt, Opt_shortname_mixed,
++	Opt_umask, Opt_dmask, Opt_fmask, Opt_posix, Opt_cvf_format, Opt_cvf_options,
++	Opt_utf8_off, Opt_utf8_no, Opt_utf8_false,
++	Opt_utf8_on, Opt_utf8_yes, Opt_utf8_true, Opt_utf8_opt,
++	Opt_uni_xl_off, Opt_uni_xl_no, Opt_uni_xl_false,
++	Opt_uni_xl_on, Opt_uni_xl_yes, Opt_uni_xl_true, Opt_uni_xl_opt,
++	Opt_nonumtail_off, Opt_nonumtail_no, Opt_nonumtail_false,
++	Opt_nonumtail_on, Opt_nonumtail_yes, Opt_nonumtail_true, Opt_nonumtail_opt,
++};
++
++static match_table_t FAT_tokens = {
++	{Opt_check_r, "check=relaxed"},
++	{Opt_check_s, "check=strict"},
++	{Opt_check_n, "check=normal"},
++	{Opt_check_r, "check=r"},
++	{Opt_check_s, "check=s"},
++	{Opt_check_n, "check=n"},
++	{Opt_conv_b, "conv=binary"},
++	{Opt_conv_t, "conv=text"},
++	{Opt_conv_a, "conv=auto"},
++	{Opt_conv_b, "conv=b"},
++	{Opt_conv_t, "conv=t"},
++	{Opt_conv_a, "conv=a"},
++	{Opt_nodots, "nodots"},
++	{Opt_nodots, "dotsOK=no"},
++	{Opt_dots, "dotsOK=yes"},
++	{Opt_dots, "dots"},
++	{Opt_uid, "uid=%d"},
++	{Opt_gid, "gid=%d"},
++	{Opt_umask, "umask=%o"},
++	{Opt_dmask, "dmask=%o"},
++	{Opt_fmask, "fmask=%o"},
++	{Opt_fat, "fat=%d"},
++	{Opt_codepage, "codepage=%d"},
++	{Opt_charset, "iocharset=%s"},
++	{Opt_blocksize, "blocksize=%d"},
++	{Opt_nocase, "nocase"},
++	{Opt_cvf_format, "cvf_format=%20s"},
++	{Opt_cvf_options, "cvf_options=%100s"},
++	{Opt_shortname_lower, "shortname=lower"},
++	{Opt_shortname_win95, "shortname=win95"},
++	{Opt_shortname_winnt, "shortname=winnt"},
++	{Opt_shortname_mixed, "shortname=mixed"},
++	{Opt_utf8_off, "utf8=0"},	/* 0 or no or false */
++	{Opt_utf8_no, "utf8=no"},
++	{Opt_utf8_false, "utf8=false"},
++	{Opt_utf8_on, "utf8=1"},	/* empty or 1 or yes or true */
++	{Opt_utf8_yes, "utf8=yes"},
++	{Opt_utf8_true, "utf8=true"},
++	{Opt_utf8_opt, "utf8"},
++	{Opt_uni_xl_off, "uni_xlate=0"},	/* 0 or no or false */
++	{Opt_uni_xl_no, "uni_xlate=no"},
++	{Opt_uni_xl_false, "uni_xlate=false"},
++	{Opt_uni_xl_on, "uni_xlate=1"},		/* empty or 1 or yes or true */
++	{Opt_uni_xl_yes, "uni_xlate=yes"},
++	{Opt_uni_xl_true, "uni_xlate=true"},
++	{Opt_uni_xl_opt, "uni_xlate"},
++	{Opt_nonumtail_off, "nonumtail=0"},	/* 0 or no or false */
++	{Opt_nonumtail_no, "nonumtail=no"},
++	{Opt_nonumtail_false, "nonumtail=false"},
++	{Opt_nonumtail_on, "nonumtail=1"},	/* empty or 1 or yes or true */
++	{Opt_nonumtail_yes, "nonumtail=yes"},
++	{Opt_nonumtail_true, "nonumtail=true"},
++	{Opt_nonumtail_opt, "nonumtail"},
++	{Opt_quiet, "quiet"},
++	{Opt_showexec, "showexec"},
++	{Opt_debug, "debug"},
++	{Opt_immutable, "sys_immutable"},
++	{Opt_posix, "posix"},
++	{Opt_err, NULL}
++};
++
+ static int parse_options(char *options, int is_vfat, int *debug,
+ 			 struct fat_mount_options *opts)
+ {
+-	char *this_char, *value, *p;
+-	int ret = 1, val, len;
++	char *p;
++	substring_t args[MAX_OPT_ARGS];
++	int option;
+ 
+ 	opts->isvfat = is_vfat;
+ 
+@@ -284,183 +355,198 @@ static int parse_options(char *options, 
+ 	*debug = 0;
+ 
+ 	if (!options)
+-		goto out;
+-	while ((this_char = strsep(&options,",")) != NULL) {
+-		if (!*this_char)
++		return 1;
++
++	while ((p = strsep(&options, ",")) != NULL) {
++		int token;
++		if (!*p)
+ 			continue;
+-		if ((value = strchr(this_char,'=')) != NULL)
+-			*value++ = 0;
+ 
+-		if (!strcmp(this_char,"check") && value) {
+-			if (value[0] && !value[1] && strchr("rns",*value))
+-				opts->name_check = *value;
+-			else if (!strcmp(value,"relaxed"))
+-				opts->name_check = 'r';
+-			else if (!strcmp(value,"normal"))
+-				opts->name_check = 'n';
+-			else if (!strcmp(value,"strict"))
+-				opts->name_check = 's';
+-			else ret = 0;
+-		}
+-		else if (!strcmp(this_char,"conv") && value) {
+-			printk(KERN_INFO "FAT: conv option is obsolete, "
+-			       "not supported now\n");
+-		}
+-		else if (!strcmp(this_char,"nocase")) {
++		token = match_token(p, FAT_tokens, args);
++		switch (token) {
++		case Opt_check_s:
++			opts->name_check = 's';
++			break;
++		case Opt_check_r:
++ 				opts->name_check = 'r';
++			break;
++		case Opt_check_n:
++ 				opts->name_check = 'n';
++			break;
++		case Opt_dots:		/* msdos specific */
++			if (!is_vfat)
++				opts->dotsOK = 1;
++			break;
++		case Opt_nodots:	/* msdos specific */
++			if (!is_vfat)
++				opts->dotsOK = 0;
++			break;
++		case Opt_nocase:
+ 			if (!is_vfat)
+ 				opts->nocase = 1;
+ 			else {
+-				/* for backward compatible */
++				/* for backward compatibility */
+ 				opts->shortname = VFAT_SFN_DISPLAY_WIN95
+ 					| VFAT_SFN_CREATE_WIN95;
+ 			}
+-		}
+-		else if (!strcmp(this_char,"showexec")) {
++			break;
++		case Opt_quiet:
++			opts->quiet = 1;
++			break;
++		case Opt_showexec:
+ 			opts->showexec = 1;
+-		}
+-		else if (!strcmp(this_char,"uid")) {
+-			if (!value || !*value) ret = 0;
+-			else {
+-				opts->fs_uid = simple_strtoul(value,&value,0);
+-				if (*value) ret = 0;
+-			}
+-		}
+-		else if (!strcmp(this_char,"gid")) {
+-			if (!value || !*value) ret= 0;
+-			else {
+-				opts->fs_gid = simple_strtoul(value,&value,0);
+-				if (*value) ret = 0;
+-			}
+-		}
+-		else if (!strcmp(this_char,"umask")) {
+-			if (!value || !*value) ret = 0;
+-			else {
+-				opts->fs_fmask = opts->fs_dmask =
+-					simple_strtoul(value,&value,8);
+-				if (*value) ret = 0;
+-			}
+-		}
+-		else if (!strcmp(this_char,"fmask")) {
+-			if (!value || !*value) ret = 0;
+-			else {
+-				opts->fs_fmask = simple_strtoul(value,&value,8);
+-				if (*value) ret = 0;
+-			}
+-		}
+-		else if (!strcmp(this_char,"dmask")) {
+-			if (!value || !*value) ret = 0;
+-			else {
+-				opts->fs_dmask = simple_strtoul(value,&value,8);
+-				if (*value) ret = 0;
+-			}
+-		}
+-		else if (!strcmp(this_char,"debug")) {
+-			if (value) ret = 0;
+-			else *debug = 1;
+-		}
+-		else if (!strcmp(this_char,"fat")) {
+-			printk(KERN_INFO "FAT: fat option is obsolete, "
+-			       "not supported now\n");
+-		}
+-		else if (!strcmp(this_char,"quiet")) {
+-			if (value) ret = 0;
+-			else opts->quiet = 1;
+-		}
+-		else if (!strcmp(this_char,"blocksize")) {
+-			printk(KERN_INFO "FAT: blocksize option is obsolete, "
+-			       "not supported now\n");
+-		}
+-		else if (!strcmp(this_char,"sys_immutable")) {
+-			if (value) ret = 0;
+-			else opts->sys_immutable = 1;
+-		}
+-		else if (!strcmp(this_char,"codepage") && value) {
+-			opts->codepage = simple_strtoul(value,&value,0);
+-			if (*value) ret = 0;
+-		}
+-
+-		/* msdos specific */
+-		else if (!is_vfat && !strcmp(this_char,"dots")) {
+-			opts->dotsOK = 1;
+-		}
+-		else if (!is_vfat && !strcmp(this_char,"nodots")) {
+-			opts->dotsOK = 0;
+-		}
+-		else if (!is_vfat && !strcmp(this_char,"dotsOK") && value) {
+-			if (!strcmp(value,"yes")) opts->dotsOK = 1;
+-			else if (!strcmp(value,"no")) opts->dotsOK = 0;
+-			else ret = 0;
+-		}
++			break;
++		case Opt_debug:
++			*debug = 1;
++			break;
++		case Opt_immutable:
++			opts->sys_immutable = 1;
++			break;
++		case Opt_uid:
++			if (match_int(&args[0], &option))
++				return 0;
++			opts->fs_uid = option;
++			break;
++		case Opt_gid:
++			if (match_int(&args[0], &option))
++				return 0;
++			opts->fs_gid = option;
++			break;
++		case Opt_umask:
++			if (match_octal(&args[0], &option))
++				return 0;
++			opts->fs_fmask = opts->fs_dmask = option;
++			break;
++		case Opt_dmask:
++			if (match_octal(&args[0], &option))
++				return 0;
++			opts->fs_dmask = option;
++			break;
++		case Opt_fmask:
++			if (match_octal(&args[0], &option))
++				return 0;
++			opts->fs_fmask = option;
++			break;
++		case Opt_codepage:
++			if (match_int(&args[0], &option))
++				return 0;
++			opts->codepage = option;
++			printk("MSDOS FS: Using codepage %d\n",
++ 					opts->codepage);
++			break;
+ 
+ 		/* vfat specific */
+-		else if (is_vfat && !strcmp(this_char,"iocharset") && value) {
+-			p = value;
+-			while (*value && *value != ',')
+-				value++;
+-			len = value - p;
+-			if (len) {
+-				char *buffer;
+-
+-				if (opts->iocharset != NULL) {
+-					kfree(opts->iocharset);
+-					opts->iocharset = NULL;
+-				}
+-				buffer = kmalloc(len + 1, GFP_KERNEL);
+-				if (buffer != NULL) {
+-					opts->iocharset = buffer;
+-					memcpy(buffer, p, len);
+-					buffer[len] = 0;
+-				} else
+-					ret = 0;
++		case Opt_charset:
++			if (is_vfat) {
++				kfree(opts->iocharset);
++				opts->iocharset = match_strdup(&args[0]);
++				if (!opts->iocharset)
++					return 0;
++				printk("MSDOS FS: IO charset %s\n",
++					opts->iocharset);
+ 			}
+-		}
+-		else if (is_vfat && !strcmp(this_char,"utf8")) {
+-			ret = simple_getbool(value, &val);
+-			if (ret) opts->utf8 = val;
+-		}
+-		else if (is_vfat && !strcmp(this_char,"uni_xlate")) {
+-			ret = simple_getbool(value, &val);
+-			if (ret) opts->unicode_xlate = val;
+-		}
+-		else if (is_vfat && !strcmp(this_char,"posix")) {
+-			printk(KERN_INFO "FAT: posix option is obsolete, "
+-			       "not supported now\n");
+-		}
+-		else if (is_vfat && !strcmp(this_char,"nonumtail")) {
+-			ret = simple_getbool(value, &val);
+-			if (ret) {
+-				opts->numtail = !val;
+-			}
+-		}
+-		else if (is_vfat && !strcmp(this_char, "shortname")) {
+-			if (!strcmp(value, "lower"))
++			break;
++		case Opt_shortname_lower:
++			if (is_vfat) {
+ 				opts->shortname = VFAT_SFN_DISPLAY_LOWER
+ 						| VFAT_SFN_CREATE_WIN95;
+-			else if (!strcmp(value, "win95"))
++			}
++			break;
++		case Opt_shortname_win95:
++			if (is_vfat) {
+ 				opts->shortname = VFAT_SFN_DISPLAY_WIN95
+ 						| VFAT_SFN_CREATE_WIN95;
+-			else if (!strcmp(value, "winnt"))
++			}
++			break;
++		case Opt_shortname_winnt:
++			if (is_vfat) {
+ 				opts->shortname = VFAT_SFN_DISPLAY_WINNT
+ 						| VFAT_SFN_CREATE_WINNT;
+-			else if (!strcmp(value, "mixed"))
++			}
++			break;
++		case Opt_shortname_mixed:
++			if (is_vfat) {
+ 				opts->shortname = VFAT_SFN_DISPLAY_WINNT
+ 						| VFAT_SFN_CREATE_WIN95;
+-			else
+-				ret = 0;
+-		} else {
+-			printk(KERN_ERR "FAT: Unrecognized mount option %s\n",
+-			       this_char);
+-			ret = 0;
+-		}
++			}
++			break;
++		case Opt_utf8_off:	/* 0 or no or false */
++		case Opt_utf8_no:
++		case Opt_utf8_false:
++			if (is_vfat) {
++				opts->utf8 = 0;
++			}
++			break;
++		case Opt_utf8_on:	/* empty or 1 or yes or true */
++		case Opt_utf8_opt:
++		case Opt_utf8_yes:
++		case Opt_utf8_true:
++			if (is_vfat) {
++				opts->utf8 = 1;
++			}
++			break;
++		case Opt_uni_xl_off:	/* 0 or no or false */
++		case Opt_uni_xl_no:
++		case Opt_uni_xl_false:
++			if (is_vfat) {
++				opts->unicode_xlate = 0;
++			}
++			break;
++		case Opt_uni_xl_on:	/* empty or 1 or yes or true */
++		case Opt_uni_xl_yes:
++		case Opt_uni_xl_true:
++		case Opt_uni_xl_opt:
++			if (is_vfat) {
++				opts->unicode_xlate = 1;
++			}
++			break;
++		case Opt_nonumtail_off:		/* 0 or no or false */
++		case Opt_nonumtail_no:
++		case Opt_nonumtail_false:
++			if (is_vfat) {
++					opts->numtail = 1;	/* negated option */
++			}
++			break;
++		case Opt_nonumtail_on:		/* empty or 1 or yes or true */
++		case Opt_nonumtail_yes:
++		case Opt_nonumtail_true:
++		case Opt_nonumtail_opt:
++			if (is_vfat) {
++					opts->numtail = 0;	/* negated option */
++			}
++			break;
+ 
+-		if (ret == 0)
++		/* obsolete mount options */
++		case Opt_conv_b:
++		case Opt_conv_t:
++		case Opt_conv_a:
++			print_obsolete_option("conv");
++			break;
++		case Opt_blocksize:
++			print_obsolete_option("blocksize");
++			break;
++		case Opt_posix:
++			print_obsolete_option("posix");
++			break;
++		case Opt_fat:
++			print_obsolete_option("fat");
++			break;
++		case Opt_cvf_format:
++		case Opt_cvf_options:
++			print_obsolete_option("cvf");
+ 			break;
++		/* unknown option */
++		default:
++			printk(KERN_ERR "FAT: Unrecognized mount option \"%s\" "
++					"or missing value\n", p);
++			return 0;
++		}
+ 	}
+-out:
++
+ 	if (opts->unicode_xlate)
+ 		opts->utf8 = 0;
+ 	
+-	return ret;
++	return 1;
+ }
+ 
+ static int fat_calc_dir_size(struct inode *inode)
+--- linux-2.6.0-test6/fs/fcntl.c	2003-09-08 13:58:58.000000000 -0700
++++ 25/fs/fcntl.c	2003-10-05 00:34:08.000000000 -0700
+@@ -229,8 +229,8 @@ static int setfl(int fd, struct file * f
+ 		   arg |= O_NONBLOCK;
+ 
+ 	if (arg & O_DIRECT) {
+-		if (!inode->i_mapping || !inode->i_mapping->a_ops ||
+-			!inode->i_mapping->a_ops->direct_IO)
++		if (!filp->f_mapping || !filp->f_mapping->a_ops ||
++			!filp->f_mapping->a_ops->direct_IO)
+ 				return -EINVAL;
+ 	}
+ 
+@@ -619,3 +619,6 @@ module_init(fasync_init)
+ 
+ EXPORT_SYMBOL(f_setown);
+ EXPORT_SYMBOL(f_delown);
++#ifdef CONFIG_NET
++EXPORT_SYMBOL(__kill_fasync);
++#endif
+--- linux-2.6.0-test6/fs/file_table.c	2003-08-08 22:55:13.000000000 -0700
++++ 25/fs/file_table.c	2003-10-05 00:34:03.000000000 -0700
+@@ -114,6 +114,7 @@ int open_private_file(struct file *filp,
+ 	filp->f_mode   = (flags+1) & O_ACCMODE;
+ 	atomic_set(&filp->f_count, 1);
+ 	filp->f_dentry = dentry;
++	filp->f_mapping = dentry->d_inode->i_mapping;
+ 	filp->f_uid    = current->fsuid;
+ 	filp->f_gid    = current->fsgid;
+ 	filp->f_op     = dentry->d_inode->i_fop;
+@@ -285,3 +286,5 @@ void __init files_init(unsigned long mem
+ 		files_stat.max_files = NR_FILE;
+ } 
+ 
++/* Needed by unix.o */
++EXPORT_SYMBOL(files_stat);
+--- linux-2.6.0-test6/fs/freevxfs/vxfs_immed.c	2003-06-14 12:18:25.000000000 -0700
++++ 25/fs/freevxfs/vxfs_immed.c	2003-10-05 00:33:24.000000000 -0700
+@@ -39,7 +39,7 @@
+ #include "vxfs_inode.h"
+ 
+ 
+-static int	vxfs_immed_readlink(struct dentry *, char *, int);
++static int	vxfs_immed_readlink(struct dentry *, char __user *, int);
+ static int	vxfs_immed_follow_link(struct dentry *, struct nameidata *);
+ 
+ static int	vxfs_immed_readpage(struct file *, struct page *);
+@@ -77,7 +77,7 @@ struct address_space_operations vxfs_imm
+  *   Number of bytes successfully copied to userspace.
+  */
+ static int
+-vxfs_immed_readlink(struct dentry *dp, char *bp, int buflen)
++vxfs_immed_readlink(struct dentry *dp, char __user *bp, int buflen)
+ {
+ 	struct vxfs_inode_info		*vip = VXFS_INO(dp->d_inode);
+ 
+--- linux-2.6.0-test6/fs/fs-writeback.c	2003-07-10 18:50:31.000000000 -0700
++++ 25/fs/fs-writeback.c	2003-10-05 00:34:09.000000000 -0700
+@@ -510,7 +510,7 @@ void write_inode_now(struct inode *inode
+  *    OSYNC_INODE:    the inode itself
+  */
+ 
+-int generic_osync_inode(struct inode *inode, int what)
++int generic_osync_inode(struct inode *inode, struct address_space *mapping, int what)
+ {
+ 	int err = 0;
+ 	int need_write_inode_now = 0;
+@@ -518,14 +518,14 @@ int generic_osync_inode(struct inode *in
+ 
+ 	current->flags |= PF_SYNCWRITE;
+ 	if (what & OSYNC_DATA)
+-		err = filemap_fdatawrite(inode->i_mapping);
++		err = filemap_fdatawrite(mapping);
+ 	if (what & (OSYNC_METADATA|OSYNC_DATA)) {
+-		err2 = sync_mapping_buffers(inode->i_mapping);
++		err2 = sync_mapping_buffers(mapping);
+ 		if (!err)
+ 			err = err2;
+ 	}
+ 	if (what & OSYNC_DATA) {
+-		err2 = filemap_fdatawait(inode->i_mapping);
++		err2 = filemap_fdatawait(mapping);
+ 		if (!err)
+ 			err = err2;
+ 	}
+--- linux-2.6.0-test6/fs/hfs/file.c	2003-06-14 12:18:06.000000000 -0700
++++ 25/fs/hfs/file.c	2003-10-05 00:33:24.000000000 -0700
+@@ -25,10 +25,10 @@
+ 
+ /*================ Forward declarations ================*/
+ 
+-static hfs_rwret_t hfs_file_read(struct file *, char *, hfs_rwarg_t,
++static hfs_rwret_t hfs_file_read(struct file *, char __user *, hfs_rwarg_t,
+ 				 loff_t *);
+-static hfs_rwret_t hfs_file_write(struct file *, const char *, hfs_rwarg_t,
+-				  loff_t *);
++static hfs_rwret_t hfs_file_write(struct file *, const char __user *,
++				  hfs_rwarg_t, loff_t *);
+ static void hfs_file_truncate(struct inode *);
+ 
+ /*================ Global variables ================*/
+@@ -139,7 +139,7 @@ int hfs_get_block(struct inode *inode, s
+  * user-space at the address 'buf'.  Returns the number of bytes
+  * successfully transferred.  This function checks the arguments, does
+  * some setup and then calls hfs_do_read() to do the actual transfer.  */
+-static hfs_rwret_t hfs_file_read(struct file * filp, char * buf, 
++static hfs_rwret_t hfs_file_read(struct file *filp, char __user *buf, 
+ 				 hfs_rwarg_t count, loff_t *ppos)
+ {
+         struct inode *inode = filp->f_dentry->d_inode;
+@@ -181,7 +181,7 @@ static hfs_rwret_t hfs_file_read(struct 
+  * 'file->f_pos' from user-space at the address 'buf'.  The return
+  * value is the number of bytes actually transferred.
+  */
+-static hfs_rwret_t hfs_file_write(struct file * filp, const char * buf,
++static hfs_rwret_t hfs_file_write(struct file *filp, const char __user *buf,
+ 				  hfs_rwarg_t count, loff_t *ppos)
+ {
+         struct inode    *inode = filp->f_dentry->d_inode;
+@@ -242,7 +242,7 @@ static void hfs_file_truncate(struct ino
+  *
+  * Like copy_to_user() while translating CR->NL.
+  */
+-static inline void xlate_to_user(char *buf, const char *data, int count)
++static inline void xlate_to_user(char __user *buf, const char *data, int count)
+ {
+ 	char ch;
+ 
+@@ -257,7 +257,8 @@ static inline void xlate_to_user(char *b
+  *
+  * Like copy_from_user() while translating NL->CR;
+  */
+-static inline int xlate_from_user(char *data, const char *buf, int count)
++static inline
++int xlate_from_user(char *data, const char __user *buf, int count)
+ {
+ 	int i;
+ 
+@@ -290,8 +291,8 @@ static inline int xlate_from_user(char *
+  * This is based on Linus's minix_file_read().
+  * It has been changed to take into account that HFS files have no holes.
+  */
+-hfs_s32 hfs_do_read(struct inode *inode, struct hfs_fork * fork, hfs_u32 pos,
+-		    char * buf, hfs_u32 count)
++hfs_s32 hfs_do_read(struct inode *inode, struct hfs_fork *fork, hfs_u32 pos,
++		    char __user *buf, hfs_u32 count)
+ {
+ 	hfs_s32 size, chars, offset, block, blocks, read = 0;
+ 	int bhrequest, uptodate;
+@@ -436,8 +437,8 @@ hfs_s32 hfs_do_read(struct inode *inode,
+  * 
+  * This is just a minor edit of Linus's minix_file_write().
+  */
+-hfs_s32 hfs_do_write(struct inode *inode, struct hfs_fork * fork, hfs_u32 pos,
+-		     const char * buf, hfs_u32 count)
++hfs_s32 hfs_do_write(struct inode *inode, struct hfs_fork *fork, hfs_u32 pos,
++		     const char __user *buf, hfs_u32 count)
+ {
+ 	hfs_s32 written, c;
+ 	struct buffer_head * bh;
+--- linux-2.6.0-test6/fs/hfs/file_cap.c	2003-06-14 12:18:22.000000000 -0700
++++ 25/fs/hfs/file_cap.c	2003-10-05 00:33:24.000000000 -0700
+@@ -29,9 +29,9 @@
+ /*================ Forward declarations ================*/
+ static loff_t      cap_info_llseek(struct file *, loff_t,
+                                    int);
+-static hfs_rwret_t cap_info_read(struct file *, char *,
++static hfs_rwret_t cap_info_read(struct file *, char __user *,
+ 				 hfs_rwarg_t, loff_t *);
+-static hfs_rwret_t cap_info_write(struct file *, const char *,
++static hfs_rwret_t cap_info_write(struct file *, const char __user *,
+ 				  hfs_rwarg_t, loff_t *);
+ /*================ Function-like macros ================*/
+ 
+@@ -121,7 +121,7 @@ static loff_t cap_info_llseek(struct fil
+  * 'file->f_pos' to user-space at the address 'buf'.  The return value
+  * is the number of bytes actually transferred.
+  */
+-static hfs_rwret_t cap_info_read(struct file *filp, char *buf,
++static hfs_rwret_t cap_info_read(struct file *filp, char __user *buf,
+ 				 hfs_rwarg_t count, loff_t *ppos)
+ {
+ 	struct inode *inode = filp->f_dentry->d_inode;
+@@ -189,7 +189,7 @@ static hfs_rwret_t cap_info_read(struct 
+  * '*ppos' from user-space at the address 'buf'.
+  * The return value is the number of bytes actually transferred.
+  */
+-static hfs_rwret_t cap_info_write(struct file *filp, const char *buf, 
++static hfs_rwret_t cap_info_write(struct file *filp, const char __user *buf, 
+ 				  hfs_rwarg_t count, loff_t *ppos)
+ {
+         struct inode *inode = filp->f_dentry->d_inode;
+--- linux-2.6.0-test6/fs/hfs/file_hdr.c	2003-06-14 12:18:25.000000000 -0700
++++ 25/fs/hfs/file_hdr.c	2003-10-05 00:33:24.000000000 -0700
+@@ -41,8 +41,9 @@
+ 
+ /*================ Forward declarations ================*/
+ static loff_t      hdr_llseek(struct file *, loff_t, int);
+-static hfs_rwret_t hdr_read(struct file *, char *, hfs_rwarg_t, loff_t *);
+-static hfs_rwret_t hdr_write(struct file *, const char *,
++static hfs_rwret_t hdr_read(struct file *, char __user *,
++			    hfs_rwarg_t, loff_t *);
++static hfs_rwret_t hdr_write(struct file *, const char __user *,
+ 			     hfs_rwarg_t, loff_t *);
+ /*================ Global variables ================*/
+ 
+@@ -382,7 +383,7 @@ loff_t hdr_llseek(struct file *file, lof
+  * successfully transferred.
+  */
+ /* XXX: what about the entry count changing on us? */
+-static hfs_rwret_t hdr_read(struct file * filp, char * buf, 
++static hfs_rwret_t hdr_read(struct file *filp, char __user *buf, 
+ 			    hfs_rwarg_t count, loff_t *ppos)
+ {
+ 	struct inode *inode = filp->f_dentry->d_inode;
+@@ -633,7 +634,7 @@ done:
+  * '*ppos' from user-space at the address 'buf'.
+  * The return value is the number of bytes actually transferred.
+  */
+-static hfs_rwret_t hdr_write(struct file *filp, const char *buf,
++static hfs_rwret_t hdr_write(struct file *filp, const char __user *buf,
+ 			     hfs_rwarg_t count, loff_t *ppos)
+ {
+ 	struct inode *inode = filp->f_dentry->d_inode;
+--- linux-2.6.0-test6/fs/hfs/super.c	2003-06-22 12:04:44.000000000 -0700
++++ 25/fs/hfs/super.c	2003-10-05 00:33:24.000000000 -0700
+@@ -31,6 +31,7 @@
+ #include <linux/blkdev.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
++#include <linux/parser.h>
+ #include <linux/smp_lock.h>
+ #include <linux/vfs.h>
+ 
+@@ -211,6 +212,60 @@ static int hfs_statfs(struct super_block
+ 	return 0;
+ }
+ 
++enum {
++	Opt_version, Opt_uid, Opt_gid, Opt_umask, Opt_part,
++	Opt_type, Opt_creator, Opt_quiet, Opt_afpd,
++	Opt_names_netatalk, Opt_names_trivial, Opt_names_alpha, Opt_names_latin,
++	Opt_names_7bit, Opt_names_8bit, Opt_names_cap,
++	Opt_fork_netatalk, Opt_fork_single, Opt_fork_double, Opt_fork_cap,
++	Opt_case_lower, Opt_case_asis,
++	Opt_conv_binary, Opt_conv_text, Opt_conv_auto,
++};
++
++static match_table_t tokens = {
++	{Opt_version, "version=%u"},
++	{Opt_uid, "uid=%u"},
++	{Opt_gid, "gid=%u"},
++	{Opt_umask, "umask=%o"},
++	{Opt_part, "part=%u"},
++	{Opt_type, "type=%s"},
++	{Opt_creator, "creator=%s"},
++	{Opt_quiet, "quiet"},
++	{Opt_afpd, "afpd"},
++	{Opt_names_netatalk, "names=netatalk"},
++	{Opt_names_trivial, "names=trivial"},
++	{Opt_names_alpha, "names=alpha"},
++	{Opt_names_latin, "names=latin"},
++	{Opt_names_7bit, "names=7bit"},
++	{Opt_names_8bit, "names=8bit"},
++	{Opt_names_cap, "names=cap"},
++	{Opt_names_netatalk, "names=n"},
++	{Opt_names_trivial, "names=t"},
++	{Opt_names_alpha, "names=a"},
++	{Opt_names_latin, "names=l"},
++	{Opt_names_7bit, "names=7"},
++	{Opt_names_8bit, "names=8"},
++	{Opt_names_cap, "names=c"},
++	{Opt_fork_netatalk, "fork=netatalk"},
++	{Opt_fork_single, "fork=single"},
++	{Opt_fork_double, "fork=double"},
++	{Opt_fork_cap, "fork=cap"},
++	{Opt_fork_netatalk, "fork=n"},
++	{Opt_fork_single, "fork=s"},
++	{Opt_fork_double, "fork=d"},
++	{Opt_fork_cap, "fork=c"},
++	{Opt_case_lower, "case=lower"},
++	{Opt_case_asis, "case=asis"},
++	{Opt_case_lower, "case=l"},
++	{Opt_case_asis, "case=a"},
++	{Opt_conv_binary, "conv=binary"},
++	{Opt_conv_text, "conv=text"},
++	{Opt_conv_auto, "conv=auto"},
++	{Opt_conv_binary, "conv=b"},
++	{Opt_conv_text, "conv=t"},
++	{Opt_conv_auto, "conv=a"},
++};
++
+ /*
+  * parse_options()
+  * 
+@@ -219,8 +274,10 @@ static int hfs_statfs(struct super_block
+  */
+ static int parse_options(char *options, struct hfs_sb_info *hsb, int *part)
+ {
+-	char *this_char, *value;
++	char *p;
+ 	char names, fork;
++	substring_t args[MAX_OPT_ARGS];
++	int option;
+ 
+ 	/* initialize the sb with defaults */
+ 	memset(hsb, 0, sizeof(*hsb));
+@@ -243,117 +300,109 @@ static int parse_options(char *options, 
+ 	if (!options) {
+ 		goto done;
+ 	}
+-	while ((this_char = strsep(&options,",")) != NULL) {
+-		if (!*this_char)
++	while ((p = strsep(&options,",")) != NULL) {
++		int token;
++		if (!*p)
+ 			continue;
+-		if ((value = strchr(this_char,'=')) != NULL) {
+-			*value++ = 0;
+-		}
+-	/* Numeric-valued options */
+-		if (!strcmp(this_char, "version")) {
+-			if (!value || !*value) {
+-				return 0;
+-			}
+-			hsb->s_version = simple_strtoul(value,&value,0);
+-			if (*value) {
+-				return 0;
+-			}
+-		} else if (!strcmp(this_char,"uid")) {
+-			if (!value || !*value) {
+-				return 0;
+-			}
+-			hsb->s_uid = simple_strtoul(value,&value,0);
+-			if (*value) {
+-				return 0;
+-			}
+-		} else if (!strcmp(this_char,"gid")) {
+-			if (!value || !*value) {
+-				return 0;
+-			}
+-			hsb->s_gid = simple_strtoul(value,&value,0);
+-			if (*value) {
+-				return 0;
+-			}
+-		} else if (!strcmp(this_char,"umask")) {
+-			if (!value || !*value) {
+-				return 0;
+-			}
+-			hsb->s_umask = simple_strtoul(value,&value,8);
+-			if (*value) {
+-				return 0;
+-			}
+-		} else if (!strcmp(this_char,"part")) {
+-			if (!value || !*value) {
+-				return 0;
+-			}
+-			*part = simple_strtoul(value,&value,0);
+-			if (*value) {
+-				return 0;
+-			}
+-	/* String-valued options */
+-		} else if (!strcmp(this_char,"type") && value) {
+-			if (strlen(value) != 4) {
+-				return 0;
+-			}
+-			hsb->s_type = hfs_get_nl(value);
+-		} else if (!strcmp(this_char,"creator") && value) {
+-			if (strlen(value) != 4) {
+-				return 0;
+-			}
+-			hsb->s_creator = hfs_get_nl(value);
+-	/* Boolean-valued options */
+-		} else if (!strcmp(this_char,"quiet")) {
+-			if (value) {
+-				return 0;
+-			}
++
++		token = match_token(p, tokens, args);
++		switch (token) {
++		/* Numeric-valued options */
++		case Opt_version:
++			if (match_int(&args[0], &option))
++				return 0;
++			hsb->s_version = option;
++			break;
++		case Opt_uid:
++			if (match_int(&args[0], &option))
++				return 0;
++			hsb->s_uid = option;
++			break;
++		case Opt_gid:
++			if (match_int(&args[0], &option))
++				return 0;
++			hsb->s_gid = option;
++			break;
++		case Opt_umask:
++			if (match_octal(&args[0], &option))
++				return 0;
++			hsb->s_umask = option;
++			break;
++		case Opt_part:
++			if (match_int(&args[0], &option))
++				return 0;
++			*part = option;
++			break;
++		/* String-valued options */
++		case Opt_type:
++			if (strlen(args[0].from) != 4) {
++				return 0;
++			}
++			hsb->s_type = hfs_get_nl(args[0].from);
++			break;
++		case Opt_creator:
++			if (strlen(args[0].from) != 4) {
++				return 0;
++			}
++			hsb->s_creator = hfs_get_nl(args[0].from);
++			break;
++		/* Boolean-valued options */
++		case Opt_quiet:
+ 			hsb->s_quiet = 1;
+-		} else if (!strcmp(this_char,"afpd")) {
+-			if (value) {
+-				return 0;
+-			}
++			break;
++		case Opt_afpd:
+ 			hsb->s_afpd = 1;
+-	/* Multiple choice options */
+-		} else if (!strcmp(this_char,"names") && value) {
+-			if ((*value && !value[1] && strchr("ntal78c",*value)) ||
+-			    !strcmp(value,"netatalk") ||
+-			    !strcmp(value,"trivial") ||
+-			    !strcmp(value,"alpha") ||
+-			    !strcmp(value,"latin") ||
+-			    !strcmp(value,"7bit") ||
+-			    !strcmp(value,"8bit") ||
+-			    !strcmp(value,"cap")) {
+-				names = *value;
+-			} else {
+-				return 0;
+-			}
+-		} else if (!strcmp(this_char,"fork") && value) {
+-			if ((*value && !value[1] && strchr("nsdc",*value)) ||
+-			    !strcmp(value,"netatalk") ||
+-			    !strcmp(value,"single") ||
+-			    !strcmp(value,"double") ||
+-			    !strcmp(value,"cap")) {
+-				fork = *value;
+-			} else {
+-				return 0;
+-			}
+-		} else if (!strcmp(this_char,"case") && value) {
+-			if ((*value && !value[1] && strchr("la",*value)) ||
+-			    !strcmp(value,"lower") ||
+-			    !strcmp(value,"asis")) {
+-				hsb->s_lowercase = (*value == 'l');
+-			} else {
+-				return 0;
+-			}
+-		} else if (!strcmp(this_char,"conv") && value) {
+-			if ((*value && !value[1] && strchr("bta",*value)) ||
+-			    !strcmp(value,"binary") ||
+-			    !strcmp(value,"text") ||
+-			    !strcmp(value,"auto")) {
+-				hsb->s_conv = *value;
+-			} else {
+-				return 0;
+-			}
+-		} else {
++			break;
++		/* Multiple choice options */
++		case Opt_names_netatalk:
++			names = 'n';
++			break;
++		case Opt_names_trivial:
++			names = 't';
++			break;
++		case Opt_names_alpha:
++			names = 'a';
++			break;
++		case Opt_names_latin:
++			names = 'l';
++			break;
++		case Opt_names_7bit:
++			names = '7';
++			break;
++		case Opt_names_8bit:
++			names = '8';
++			break;
++		case Opt_names_cap:
++			names = 'c';
++			break;
++		case Opt_fork_netatalk:
++			fork = 'n';
++			break;
++		case Opt_fork_single:
++			fork = 's';
++			break;
++		case Opt_fork_double:
++			fork = 'd';
++			break;
++		case Opt_fork_cap:
++			fork = 'c';
++			break;
++		case Opt_case_lower:
++			hsb->s_lowercase = 1;
++			break;
++		case Opt_case_asis:
++			hsb->s_lowercase = 0;
++			break;
++		case Opt_conv_binary:
++			hsb->s_conv = 'b';
++			break;
++		case Opt_conv_text:
++			hsb->s_conv = 't';
++			break;
++		case Opt_conv_auto:
++			hsb->s_conv = 'a';
++			break;
++		default:
+ 			return 0;
+ 		}
+ 	}
+--- linux-2.6.0-test6/fs/hpfs/file.c	2003-06-14 12:18:35.000000000 -0700
++++ 25/fs/hpfs/file.c	2003-10-05 00:33:24.000000000 -0700
+@@ -124,7 +124,8 @@ struct address_space_operations hpfs_aop
+ 	.bmap = _hpfs_bmap
+ };
+ 
+-ssize_t hpfs_file_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
++ssize_t hpfs_file_write(struct file *file, const char __user *buf,
++			size_t count, loff_t *ppos)
+ {
+ 	ssize_t retval;
+ 
+--- linux-2.6.0-test6/fs/hpfs/hpfs_fn.h	2003-07-10 18:50:31.000000000 -0700
++++ 25/fs/hpfs/hpfs_fn.h	2003-10-05 00:33:24.000000000 -0700
+@@ -249,7 +249,7 @@ int hpfs_file_fsync(struct file *, struc
+ secno hpfs_bmap(struct inode *, unsigned);
+ void hpfs_truncate(struct inode *);
+ int hpfs_get_block(struct inode *inode, sector_t iblock, struct buffer_head *bh_result, int create);
+-ssize_t hpfs_file_write(struct file *file, const char *buf, size_t count, loff_t *ppos);
++ssize_t hpfs_file_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos);
+ 
+ /* inode.c */
+ 
+--- linux-2.6.0-test6/fs/hpfs/super.c	2003-06-22 12:04:44.000000000 -0700
++++ 25/fs/hpfs/super.c	2003-10-05 00:33:24.000000000 -0700
+@@ -10,6 +10,7 @@
+ #include <linux/string.h>
+ #include "hpfs_fn.h"
+ #include <linux/module.h>
++#include <linux/parser.h>
+ #include <linux/init.h>
+ #include <linux/vfs.h>
+ 
+@@ -219,15 +220,52 @@ static struct super_operations hpfs_sops
+ 
+ /*
+  * A tiny parser for option strings, stolen from dosfs.
+- *
+  * Stolen again from read-only hpfs.
++ * And updated for table-driven option parsing.
+  */
+ 
++enum {
++	Opt_help, Opt_uid, Opt_gid, Opt_umask, Opt_case_lower, Opt_case_asis,
++	Opt_conv_binary, Opt_conv_text, Opt_conv_auto,
++	Opt_check_none, Opt_check_normal, Opt_check_strict,
++	Opt_err_cont, Opt_err_ro, Opt_err_panic,
++	Opt_eas_no, Opt_eas_ro, Opt_eas_rw,
++	Opt_chkdsk_no, Opt_chkdsk_errors, Opt_chkdsk_always,
++	Opt_timeshift, Opt_err,
++};
++
++static match_table_t tokens = {
++	{Opt_help, "help"},
++	{Opt_uid, "uid=%u"},
++	{Opt_gid, "gid=%u"},
++	{Opt_umask, "umask=%o"},
++	{Opt_case_lower, "case=lower"},
++	{Opt_case_asis, "case=asis"},
++	{Opt_conv_binary, "conv=binary"},
++	{Opt_conv_text, "conv=text"},
++	{Opt_conv_auto, "conv=auto"},
++	{Opt_check_none, "check=none"},
++	{Opt_check_normal, "check=normal"},
++	{Opt_check_strict, "check=strict"},
++	{Opt_err_cont, "errors=continue"},
++	{Opt_err_ro, "errors=remount-ro"},
++	{Opt_err_panic, "errors=panic"},
++	{Opt_eas_no, "eas=no"},
++	{Opt_eas_ro, "eas=ro"},
++	{Opt_eas_rw, "eas=rw"},
++	{Opt_chkdsk_no, "chkdsk=no"},
++	{Opt_chkdsk_errors, "chkdsk=errors"},
++	{Opt_chkdsk_always, "chkdsk=always"},
++	{Opt_timeshift, "timeshift=%d"},
++	{Opt_err, NULL},
++};
++
+ int parse_opts(char *opts, uid_t *uid, gid_t *gid, umode_t *umask,
+ 	       int *lowercase, int *conv, int *eas, int *chk, int *errs,
+ 	       int *chkdsk, int *timeshift)
+ {
+-	char *p, *rhs;
++	char *p;
++	int option;
+ 
+ 	if (!opts)
+ 		return 1;
+@@ -235,34 +273,85 @@ int parse_opts(char *opts, uid_t *uid, g
+ 	/*printk("Parsing opts: '%s'\n",opts);*/
+ 
+ 	while ((p = strsep(&opts, ",")) != NULL) {
++		substring_t args[MAX_OPT_ARGS];
++		int token;
+ 		if (!*p)
+ 			continue;
+-		if ((rhs = strchr(p, '=')) != 0)
+-			*rhs++ = '\0';
+-		if (!strcmp(p, "help")) return 2;
+-		if (!strcmp(p, "uid")) {
+-			if (!rhs || !*rhs)
+-				return 0;
+-			*uid = simple_strtoul(rhs, &rhs, 0);
+-			if (*rhs)
+-				return 0;
+-		}
+-		else if (!strcmp(p, "gid")) {
+-			if (!rhs || !*rhs)
+-				return 0;
+-			*gid = simple_strtoul(rhs, &rhs, 0);
+-			if (*rhs)
+-				return 0;
+-		}
+-		else if (!strcmp(p, "umask")) {
+-			if (!rhs || !*rhs)
+-				return 0;
+-			*umask = simple_strtoul(rhs, &rhs, 8);
+-			if (*rhs)
+-				return 0;
+-		}
+-		else if (!strcmp(p, "timeshift")) {
++
++		token = match_token(p, tokens, args);
++		switch (token) {
++		case Opt_help:
++			return 2;
++		case Opt_uid:
++			if (match_int(args, &option))
++				return 0;
++			*uid = option;
++			break;
++		case Opt_gid:
++			if (match_int(args, &option))
++				return 0;
++			*gid = option;
++			break;
++		case Opt_umask:
++			if (match_octal(args, &option))
++				return 0;
++			*umask = option;
++			break;
++		case Opt_case_lower:
++			*lowercase = 1;
++			break;
++		case Opt_case_asis:
++			*lowercase = 0;
++			break;
++		case Opt_conv_binary:
++			*conv = CONV_BINARY;
++			break;
++		case Opt_conv_text:
++			*conv = CONV_TEXT;
++			break;
++		case Opt_conv_auto:
++			*conv = CONV_AUTO;
++			break;
++		case Opt_check_none:
++			*chk = 0;
++			break;
++		case Opt_check_normal:
++			*chk = 1;
++			break;
++		case Opt_check_strict:
++			*chk = 2;
++			break;
++		case Opt_err_cont:
++			*errs = 0;
++			break;
++		case Opt_err_ro:
++			*errs = 1;
++			break;
++		case Opt_err_panic:
++			*errs = 2;
++			break;
++		case Opt_eas_no:
++			*eas = 0;
++			break;
++		case Opt_eas_ro:
++			*eas = 1;
++			break;
++		case Opt_eas_rw:
++			*eas = 2;
++			break;
++		case Opt_chkdsk_no:
++			*chkdsk = 0;
++			break;
++		case Opt_chkdsk_errors:
++			*chkdsk = 1;
++			break;
++		case Opt_chkdsk_always:
++			*chkdsk = 2;
++			break;
++		case Opt_timeshift:
++		{
+ 			int m = 1;
++			char *rhs = args[0].from;
+ 			if (!rhs || !*rhs)
+ 				return 0;
+ 			if (*rhs == '-') m = -1;
+@@ -270,79 +359,11 @@ int parse_opts(char *opts, uid_t *uid, g
+ 			*timeshift = simple_strtoul(rhs, &rhs, 0) * m;
+ 			if (*rhs)
+ 				return 0;
++			break;
+ 		}
+-		else if (!strcmp(p, "case")) {
+-			if (!rhs || !*rhs)
+-				return 0;
+-			if (!strcmp(rhs, "lower"))
+-				*lowercase = 1;
+-			else if (!strcmp(rhs, "asis"))
+-				*lowercase = 0;
+-			else
+-				return 0;
+-		}
+-		else if (!strcmp(p, "conv")) {
+-			if (!rhs || !*rhs)
+-				return 0;
+-			if (!strcmp(rhs, "binary"))
+-				*conv = CONV_BINARY;
+-			else if (!strcmp(rhs, "text"))
+-				*conv = CONV_TEXT;
+-			else if (!strcmp(rhs, "auto"))
+-				*conv = CONV_AUTO;
+-			else
+-				return 0;
+-		}
+-		else if (!strcmp(p, "check")) {
+-			if (!rhs || !*rhs)
+-				return 0;
+-			if (!strcmp(rhs, "none"))
+-				*chk = 0;
+-			else if (!strcmp(rhs, "normal"))
+-				*chk = 1;
+-			else if (!strcmp(rhs, "strict"))
+-				*chk = 2;
+-			else
+-				return 0;
+-		}
+-		else if (!strcmp(p, "errors")) {
+-			if (!rhs || !*rhs)
+-				return 0;
+-			if (!strcmp(rhs, "continue"))
+-				*errs = 0;
+-			else if (!strcmp(rhs, "remount-ro"))
+-				*errs = 1;
+-			else if (!strcmp(rhs, "panic"))
+-				*errs = 2;
+-			else
+-				return 0;
+-		}
+-		else if (!strcmp(p, "eas")) {
+-			if (!rhs || !*rhs)
+-				return 0;
+-			if (!strcmp(rhs, "no"))
+-				*eas = 0;
+-			else if (!strcmp(rhs, "ro"))
+-				*eas = 1;
+-			else if (!strcmp(rhs, "rw"))
+-				*eas = 2;
+-			else
+-				return 0;
+-		}
+-		else if (!strcmp(p, "chkdsk")) {
+-			if (!rhs || !*rhs)
+-				return 0;
+-			if (!strcmp(rhs, "no"))
+-				*chkdsk = 0;
+-			else if (!strcmp(rhs, "errors"))
+-				*chkdsk = 1;
+-			else if (!strcmp(rhs, "always"))
+-				*chkdsk = 2;
+-			else
+-				return 0;
+-		}
+-		else
++		default:
+ 			return 0;
++		}
+ 	}
+ 	return 1;
+ }
+--- linux-2.6.0-test6/fs/hugetlbfs/inode.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/hugetlbfs/inode.c	2003-10-05 00:37:03.000000000 -0700
+@@ -165,7 +165,7 @@ void truncate_hugepages(struct address_s
+ 	pagevec_init(&pvec, 0);
+ 	next = start;
+ 	while (1) {
+-		if (!pagevec_lookup(&pvec, mapping, next, PAGEVEC_SIZE)) {
++		if (!pagevec_lookup(&pvec, mapping, &next, PAGEVEC_SIZE)) {
+ 			if (next == start)
+ 				break;
+ 			next = start;
+@@ -176,9 +176,6 @@ void truncate_hugepages(struct address_s
+ 			struct page *page = pvec.pages[i];
+ 
+ 			lock_page(page);
+-			if (page->index > next)
+-				next = page->index;
+-			++next;
+ 			truncate_huge_page(page);
+ 			unlock_page(page);
+ 			hugetlb_put_quota(mapping);
+@@ -648,11 +645,6 @@ hugetlbfs_fill_super(struct super_block 
+ 	struct hugetlbfs_config config;
+ 	struct hugetlbfs_sb_info *sbinfo;
+ 
+-	sbinfo = kmalloc(sizeof(struct hugetlbfs_sb_info), GFP_KERNEL);
+-	if (!sbinfo)
+-		return -ENOMEM;
+-	sb->s_fs_info = sbinfo;
+-
+ 	config.nr_blocks = -1; /* No limit on size by default */
+ 	config.nr_inodes = -1; /* No limit on number of inodes by default */
+ 	config.uid = current->fsuid;
+@@ -663,6 +655,10 @@ hugetlbfs_fill_super(struct super_block 
+ 	if (ret)
+ 		return ret;
+ 
++	sbinfo = kmalloc(sizeof(struct hugetlbfs_sb_info), GFP_KERNEL);
++	if (!sbinfo)
++		return -ENOMEM;
++	sb->s_fs_info = sbinfo;
+ 	spin_lock_init(&sbinfo->stat_lock);
+ 	sbinfo->max_blocks = config.nr_blocks;
+ 	sbinfo->free_blocks = config.nr_blocks;
+@@ -675,15 +671,18 @@ hugetlbfs_fill_super(struct super_block 
+ 	inode = hugetlbfs_get_inode(sb, config.uid, config.gid,
+ 					S_IFDIR | config.mode, 0);
+ 	if (!inode)
+-		return -ENOMEM;
++		goto out_free;
+ 
+ 	root = d_alloc_root(inode);
+ 	if (!root) {
+ 		iput(inode);
+-		return -ENOMEM;
++		goto out_free;
+ 	}
+ 	sb->s_root = root;
+ 	return 0;
++out_free:
++	kfree(sbinfo);
++	return -ENOMEM;
+ }
+ 
+ int hugetlb_get_quota(struct address_space *mapping)
+@@ -772,6 +771,7 @@ struct file *hugetlb_zero_setup(size_t s
+ 	inode->i_nlink = 0;
+ 	file->f_vfsmnt = mntget(hugetlbfs_vfsmount);
+ 	file->f_dentry = dentry;
++	file->f_mapping = inode->i_mapping;
+ 	file->f_op = &hugetlbfs_file_operations;
+ 	file->f_mode = FMODE_WRITE | FMODE_READ;
+ 	return file;
+--- linux-2.6.0-test6/fs/inode.c	2003-09-08 13:58:58.000000000 -0700
++++ 25/fs/inode.c	2003-10-05 00:36:52.000000000 -0700
+@@ -183,6 +183,7 @@ void inode_init_once(struct inode *inode
+ 	INIT_LIST_HEAD(&inode->i_dentry);
+ 	INIT_LIST_HEAD(&inode->i_devices);
+ 	sema_init(&inode->i_sem, 1);
++	init_rwsem(&inode->i_alloc_sem);
+ 	INIT_RADIX_TREE(&inode->i_data.page_tree, GFP_ATOMIC);
+ 	spin_lock_init(&inode->i_data.page_lock);
+ 	init_MUTEX(&inode->i_data.i_shared_sem);
+@@ -195,6 +196,8 @@ void inode_init_once(struct inode *inode
+ 	i_size_ordered_init(inode);
+ }
+ 
++EXPORT_SYMBOL(inode_init_once);
++
+ static void init_once(void * foo, kmem_cache_t * cachep, unsigned long flags)
+ {
+ 	struct inode * inode = (struct inode *) foo;
+@@ -229,7 +232,6 @@ void __iget(struct inode * inode)
+  * that the inode is no longer useful. We just
+  * terminate it with extreme prejudice.
+  */
+- 
+ void clear_inode(struct inode *inode)
+ {
+ 	invalidate_inode_buffers(inode);
+@@ -251,7 +253,12 @@ void clear_inode(struct inode *inode)
+ 	inode->i_state = I_CLEAR;
+ }
+ 
++EXPORT_SYMBOL(clear_inode);
++
+ /*
++ * dispose_list - dispose of the contents of a local list
++ * @head: the head of the list to free
++ *
+  * Dispose-list gets a local list with local inodes in it, so it doesn't
+  * need to worry about list corruption and SMP locks.
+  */
+@@ -327,7 +334,6 @@ static int invalidate_list(struct list_h
+  *	fails because there are busy inodes then a non zero value is returned.
+  *	If the discard is successful all the inodes have been discarded.
+  */
+- 
+ int invalidate_inodes(struct super_block * sb)
+ {
+ 	int busy;
+@@ -346,6 +352,8 @@ int invalidate_inodes(struct super_block
+ 
+ 	return busy;
+ }
++
++EXPORT_SYMBOL(invalidate_inodes);
+  
+ int __invalidate_device(struct block_device *bdev, int do_sync)
+ {
+@@ -372,6 +380,8 @@ int __invalidate_device(struct block_dev
+ 	return res;
+ }
+ 
++EXPORT_SYMBOL(__invalidate_device);
++
+ static int can_unuse(struct inode *inode)
+ {
+ 	if (inode->i_state)
+@@ -532,7 +542,6 @@ repeat:
+  *
+  *	Allocates a new inode for given superblock.
+  */
+- 
+ struct inode *new_inode(struct super_block *sb)
+ {
+ 	static unsigned long last_ino;
+@@ -552,6 +561,8 @@ struct inode *new_inode(struct super_blo
+ 	return inode;
+ }
+ 
++EXPORT_SYMBOL(new_inode);
++
+ void unlock_new_inode(struct inode *inode)
+ {
+ 	/*
+@@ -565,6 +576,7 @@ void unlock_new_inode(struct inode *inod
+ 	inode->i_state &= ~(I_LOCK|I_NEW);
+ 	wake_up_inode(inode);
+ }
++
+ EXPORT_SYMBOL(unlock_new_inode);
+ 
+ /*
+@@ -685,7 +697,6 @@ static inline unsigned long hash(struct 
+  *	With a large number of inodes live on the file system this function
+  *	currently becomes quite slow.
+  */
+- 
+ ino_t iunique(struct super_block *sb, ino_t max_reserved)
+ {
+ 	static ino_t counter;
+@@ -709,6 +720,8 @@ retry:
+ 	
+ }
+ 
++EXPORT_SYMBOL(iunique);
++
+ struct inode *igrab(struct inode *inode)
+ {
+ 	spin_lock(&inode_lock);
+@@ -725,14 +738,16 @@ struct inode *igrab(struct inode *inode)
+ 	return inode;
+ }
+ 
++EXPORT_SYMBOL(igrab);
++
+ /**
+  * ifind - internal function, you want ilookup5() or iget5().
+  * @sb:		super block of file system to search
+- * @hashval:	hash value (usually inode number) to search for
++ * @head:       the head of the list to search
+  * @test:	callback used for comparisons between inodes
+  * @data:	opaque data pointer to pass to @test
+  *
+- * ifind() searches for the inode specified by @hashval and @data in the inode
++ * ifind() searches for the inode specified by @data in the inode
+  * cache. This is a generalized version of ifind_fast() for file systems where
+  * the inode number is not sufficient for unique identification of an inode.
+  *
+@@ -764,6 +779,7 @@ static inline struct inode *ifind(struct
+ /**
+  * ifind_fast - internal function, you want ilookup() or iget().
+  * @sb:		super block of file system to search
++ * @head:       head of the list to search
+  * @ino:	inode number to search for
+  *
+  * ifind_fast() searches for the inode @ino in the inode cache. This is for
+@@ -818,6 +834,7 @@ struct inode *ilookup5(struct super_bloc
+ 
+ 	return ifind(sb, head, test, data);
+ }
++
+ EXPORT_SYMBOL(ilookup5);
+ 
+ /**
+@@ -840,6 +857,7 @@ struct inode *ilookup(struct super_block
+ 
+ 	return ifind_fast(sb, head, ino);
+ }
++
+ EXPORT_SYMBOL(ilookup);
+ 
+ /**
+@@ -880,6 +898,7 @@ struct inode *iget5_locked(struct super_
+ 	 */
+ 	return get_new_inode(sb, head, test, set, data);
+ }
++
+ EXPORT_SYMBOL(iget5_locked);
+ 
+ /**
+@@ -913,6 +932,7 @@ struct inode *iget_locked(struct super_b
+ 	 */
+ 	return get_new_inode_fast(sb, head, ino);
+ }
++
+ EXPORT_SYMBOL(iget_locked);
+ 
+ /**
+@@ -923,7 +943,6 @@ EXPORT_SYMBOL(iget_locked);
+  *
+  *	Add an inode to the inode hash for this superblock.
+  */
+- 
+ void __insert_inode_hash(struct inode *inode, unsigned long hashval)
+ {
+ 	struct hlist_head *head = inode_hashtable + hash(inode->i_sb, hashval);
+@@ -932,13 +951,14 @@ void __insert_inode_hash(struct inode *i
+ 	spin_unlock(&inode_lock);
+ }
+ 
++EXPORT_SYMBOL(__insert_inode_hash);
++
+ /**
+  *	remove_inode_hash - remove an inode from the hash
+  *	@inode: inode to unhash
+  *
+  *	Remove an inode from the superblock.
+  */
+- 
+ void remove_inode_hash(struct inode *inode)
+ {
+ 	spin_lock(&inode_lock);
+@@ -946,6 +966,8 @@ void remove_inode_hash(struct inode *ino
+ 	spin_unlock(&inode_lock);
+ }
+ 
++EXPORT_SYMBOL(remove_inode_hash);
++
+ /*
+  * Tell the filesystem that this inode is no longer of any interest and should
+  * be completely destroyed.
+@@ -988,6 +1010,7 @@ void generic_delete_inode(struct inode *
+ 		BUG();
+ 	destroy_inode(inode);
+ }
++
+ EXPORT_SYMBOL(generic_delete_inode);
+ 
+ static void generic_forget_inode(struct inode *inode)
+@@ -1059,7 +1082,6 @@ static inline void iput_final(struct ino
+  *	Puts an inode, dropping its usage count. If the inode use count hits
+  *	zero the inode is also then freed and may be destroyed.
+  */
+- 
+ void iput(struct inode *inode)
+ {
+ 	if (inode) {
+@@ -1076,6 +1098,8 @@ void iput(struct inode *inode)
+ 	}
+ }
+ 
++EXPORT_SYMBOL(iput);
++
+ /**
+  *	bmap	- find a block number in a file
+  *	@inode: inode of file
+@@ -1087,7 +1111,6 @@ void iput(struct inode *inode)
+  *	disk block relative to the disk start that holds that block of the 
+  *	file.
+  */
+- 
+ sector_t bmap(struct inode * inode, sector_t block)
+ {
+ 	sector_t res = 0;
+@@ -1096,6 +1119,8 @@ sector_t bmap(struct inode * inode, sect
+ 	return res;
+ }
+ 
++EXPORT_SYMBOL(bmap);
++
+ /*
+  * Return true if the filesystem which backs this inode considers the two
+  * passed timespecs to be sufficiently different to warrant flushing the
+@@ -1117,7 +1142,6 @@ static int inode_times_differ(struct ino
+  *	This function automatically handles read only file systems and media,
+  *	as well as the "noatime" flag and inode specific "noatime" markers.
+  */
+- 
+ void update_atime(struct inode *inode)
+ {
+ 	struct timespec now;
+@@ -1139,6 +1163,8 @@ void update_atime(struct inode *inode)
+ 	}
+ }
+ 
++EXPORT_SYMBOL(update_atime);
++
+ /**
+  *	inode_update_time	-	update mtime and ctime time
+  *	@inode: inode accessed
+@@ -1170,6 +1196,7 @@ void inode_update_time(struct inode *ino
+ 	if (sync_it)
+ 		mark_inode_dirty_sync(inode);
+ }
++
+ EXPORT_SYMBOL(inode_update_time);
+ 
+ int inode_needs_sync(struct inode *inode)
+@@ -1180,6 +1207,7 @@ int inode_needs_sync(struct inode *inode
+ 		return 1;
+ 	return 0;
+ }
++
+ EXPORT_SYMBOL(inode_needs_sync);
+ 
+ /*
+@@ -1375,3 +1403,5 @@ void init_special_inode(struct inode *in
+ 		printk(KERN_DEBUG "init_special_inode: bogus i_mode (%o)\n",
+ 		       mode);
+ }
++
++EXPORT_SYMBOL(init_special_inode);
+--- linux-2.6.0-test6/fs/intermezzo/file.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/intermezzo/file.c	2003-10-05 00:34:01.000000000 -0700
+@@ -337,7 +337,7 @@ static void presto_apply_write_policy(st
+                                 unlock_kernel();
+                                 return; 
+                         }
+-                        error = presto_journal_close(&rec, fset, file,
++                        error = presto_journal_close(&rec, fset, fdata,
+                                                      file->f_dentry,
+                                                      &fdata->fd_version,
+                                                      &new_file_ver);
+--- linux-2.6.0-test6/fs/intermezzo/intermezzo_fs.h	2003-07-10 18:50:31.000000000 -0700
++++ 25/fs/intermezzo/intermezzo_fs.h	2003-10-05 00:34:01.000000000 -0700
+@@ -603,7 +603,7 @@ int presto_journal_rename(struct rec_inf
+ int presto_journal_open(struct rec_info *, struct presto_file_set *,
+                         struct dentry *, struct presto_version *old_ver);
+ int presto_journal_close(struct rec_info *rec, struct presto_file_set *,
+-                         struct file *, struct dentry *,
++                         struct presto_file_data *, struct dentry *,
+                          struct presto_version *old_file_ver,
+                          struct presto_version *new_file_ver);
+ int presto_write_lml_close(struct rec_info *rec,
+--- linux-2.6.0-test6/fs/intermezzo/journal.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/intermezzo/journal.c	2003-10-05 00:34:01.000000000 -0700
+@@ -2104,12 +2104,11 @@ int presto_journal_unlink(struct rec_inf
+ 
+ int
+ presto_journal_close(struct rec_info *rec, struct presto_file_set *fset,
+-                     struct file *file, struct dentry *dentry,
++                     struct presto_file_data *fd, struct dentry *dentry,
+                      struct presto_version *old_file_ver,
+                      struct presto_version *new_file_ver)
+ {
+         int opcode = KML_OPCODE_CLOSE;
+-        struct presto_file_data *fd;
+         char *buffer, *path, *logrecord, record[316];
+         struct dentry *root;
+         int error, size, i;
+@@ -2138,7 +2137,6 @@ presto_journal_close(struct rec_info *re
+ 
+         root = fset->fset_dentry;
+ 
+-        fd = (struct presto_file_data *)file->private_data;
+         if (fd) {
+                 open_ngroups = fd->fd_ngroups;
+                 for (i = 0; i < fd->fd_ngroups; i++)
+--- linux-2.6.0-test6/fs/intermezzo/presto.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/intermezzo/presto.c	2003-10-05 00:34:01.000000000 -0700
+@@ -260,11 +260,8 @@ int lento_cancel_lml(char *path, 
+ 
+ 
+         if (info->flags & LENTO_FL_WRITE_KML) {
+-                struct file file;
+-                file.private_data = NULL;
+-                file.f_dentry = dentry; 
+                 presto_getversion(&new_ver, dentry->d_inode);
+-                error = presto_journal_close(&rec, fset, &file, dentry, 
++                error = presto_journal_close(&rec, fset, NULL, dentry, 
+                                              &new_ver);
+                 if ( error ) {
+                         EXIT; 
+--- linux-2.6.0-test6/fs/intermezzo/vfs.c	2003-09-08 13:58:58.000000000 -0700
++++ 25/fs/intermezzo/vfs.c	2003-10-05 00:34:03.000000000 -0700
+@@ -322,7 +322,7 @@ int presto_do_close(struct presto_file_s
+         }
+ 
+         if (fdata->fd_info.flags & LENTO_FL_KML) 
+-                rc = presto_journal_close(&rec, fset, file, file->f_dentry,
++                rc = presto_journal_close(&rec, fset, fdata, file->f_dentry,
+                                           &fdata->fd_version, 
+                                           &fdata->fd_info.remote_version);
+         if (rc) { 
+@@ -432,14 +432,11 @@ int presto_do_setattr(struct presto_file
+ 
+         if ( presto_do_kml(info, dentry) ) {
+                 if ((iattr->ia_valid & ATTR_SIZE) && (old_size != inode->i_size)) {
+-                        struct file file;
+                         /* Journal a close whenever we see a potential truncate
+                         * At the receiving end, lento should explicitly remove
+                         * ATTR_SIZE from the list of valid attributes */
+                         presto_getversion(&new_ver, inode);
+-                        file.private_data = NULL;
+-                        file.f_dentry = dentry;
+-                        error = presto_journal_close(&rec, fset, &file, dentry,
++                        error = presto_journal_close(&rec, fset, NULL, dentry,
+                                                      &old_ver, &new_ver);
+                 }
+ 
+@@ -2087,7 +2084,9 @@ static struct file *presto_filp_dopen(st
+                 }
+         }
+ 
++	/* XXX: where the fuck is ->f_vfsmnt? */
+         f->f_dentry = dentry;
++        f->f_mapping = dentry->d_inode->i_mapping;
+         f->f_pos = 0;
+         //f->f_reada = 0;
+         f->f_op = NULL;
+--- linux-2.6.0-test6/fs/ioctl.c	2003-07-13 21:44:35.000000000 -0700
++++ 25/fs/ioctl.c	2003-10-05 00:34:08.000000000 -0700
+@@ -22,7 +22,7 @@ static int file_ioctl(struct file *filp,
+ 	switch (cmd) {
+ 		case FIBMAP:
+ 		{
+-			struct address_space *mapping = inode->i_mapping;
++			struct address_space *mapping = filp->f_mapping;
+ 			int res;
+ 			/* do we support this mess? */
+ 			if (!mapping->a_ops->bmap)
+--- linux-2.6.0-test6/fs/isofs/inode.c	2003-09-08 13:58:58.000000000 -0700
++++ 25/fs/isofs/inode.c	2003-10-05 00:33:24.000000000 -0700
+@@ -29,6 +29,7 @@
+ #include <linux/blkdev.h>
+ #include <linux/buffer_head.h>
+ #include <linux/vfs.h>
++#include <linux/parser.h>
+ #include <asm/system.h>
+ #include <asm/uaccess.h>
+ 
+@@ -328,9 +329,52 @@ isofs_dentry_cmpi_ms(struct dentry *dent
+ }
+ #endif
+ 
++enum {
++	Opt_block, Opt_check_r, Opt_check_s, Opt_cruft, Opt_gid, Opt_ignore,
++	Opt_iocharset, Opt_map_a, Opt_map_n, Opt_map_o, Opt_mode, Opt_nojoliet,
++	Opt_norock, Opt_sb, Opt_session, Opt_uid, Opt_unhide, Opt_utf8, Opt_err,
++	Opt_nocompress,
++};
++
++static match_table_t tokens = {
++	{Opt_norock, "norock"},
++	{Opt_nojoliet, "nojoliet"},
++	{Opt_unhide, "unhide"},
++	{Opt_cruft, "cruft"},
++	{Opt_utf8, "utf8"},
++	{Opt_iocharset, "iocharset=%s"},
++	{Opt_map_a, "map=acorn"},
++	{Opt_map_a, "map=a"},
++	{Opt_map_n, "map=normal"},
++	{Opt_map_n, "map=n"},
++	{Opt_map_o, "map=off"},
++	{Opt_map_o, "map=o"},
++	{Opt_session, "session=%u"},
++	{Opt_sb, "sbsector=%u"},
++	{Opt_check_r, "check=relaxed"},
++	{Opt_check_r, "check=r"},
++	{Opt_check_s, "check=strict"},
++	{Opt_check_s, "check=s"},
++	{Opt_uid, "uid=%u"},
++	{Opt_gid, "gid=%u"},
++	{Opt_mode, "mode=%u"},
++	{Opt_block, "block=%u"},
++	{Opt_ignore, "conv=binary"},
++	{Opt_ignore, "conv=b"},
++	{Opt_ignore, "conv=text"},
++	{Opt_ignore, "conv=t"},
++	{Opt_ignore, "conv=mtext"},
++	{Opt_ignore, "conv=m"},
++	{Opt_ignore, "conv=auto"},
++	{Opt_ignore, "conv=a"},
++	{Opt_nocompress, "nocompress"},
++	{Opt_err, NULL}
++};
++
+ static int parse_options(char *options, struct iso9660_options * popt)
+ {
+-	char *this_char,*value;
++	char *p;
++	int option;
+ 
+ 	popt->map = 'n';
+ 	popt->rock = 'y';
+@@ -350,112 +394,101 @@ static int parse_options(char *options, 
+ 	popt->utf8 = 0;
+ 	popt->session=-1;
+ 	popt->sbsector=-1;
+-	if (!options) return 1;
+-	while ((this_char = strsep(&options,",")) != NULL) {
+-		if (!*this_char)
++	if (!options)
++		return 1;
++
++	while ((p = strsep(&options, ",")) != NULL) {
++		int token;
++		substring_t args[MAX_OPT_ARGS];
++		unsigned n;
++
++		if (!*p)
+ 			continue;
+-	        if (strncmp(this_char,"norock",6) == 0) {
+-		  popt->rock = 'n';
+-		  continue;
+-		}
+-	        if (strncmp(this_char,"nojoliet",8) == 0) {
+-		  popt->joliet = 'n';
+-		  continue;
+-		}
+-	        if (strncmp(this_char,"unhide",6) == 0) {
+-		  popt->unhide = 'y';
+-		  continue;
+-		}
+-	        if (strncmp(this_char,"cruft",5) == 0) {
+-		  popt->cruft = 'y';
+-		  continue;
+-		}
+-	        if (strncmp(this_char,"utf8",4) == 0) {
+-		  popt->utf8 = 1;
+-		  continue;
+-		}
+-	        if (strncmp(this_char,"nocompress",10) == 0) {
+-		  popt->nocompress = 1;
+-		  continue;
+-		}
+-		if ((value = strchr(this_char,'=')) != NULL)
+-			*value++ = 0;
+ 
++		token = match_token(p, tokens, args);
++		switch (token) {
++		case Opt_norock:
++			popt->rock = 'n';
++			break;
++		case Opt_nojoliet:
++			popt->joliet = 'n';
++			break;
++		case Opt_unhide:
++			popt->unhide = 'y';
++			break;
++		case Opt_cruft:
++			popt->cruft = 'y';
++			break;
++		case Opt_utf8:
++			popt->utf8 = 1;
++			break;
+ #ifdef CONFIG_JOLIET
+-		if (!strcmp(this_char,"iocharset") && value) {
+-			popt->iocharset = value;
+-			while (*value && *value != ',')
+-				value++;
+-			if (value == popt->iocharset)
+-				return 0;
+-			*value = 0;
+-		} else
++		case Opt_iocharset:
++			popt->iocharset = match_strdup(&args[0]);
++			break;
+ #endif
+-		if (!strcmp(this_char,"map") && value) {
+-			if (value[0] && !value[1] && strchr("ano",*value))
+-				popt->map = *value;
+-			else if (!strcmp(value,"off")) popt->map = 'o';
+-			else if (!strcmp(value,"normal")) popt->map = 'n';
+-			else if (!strcmp(value,"acorn")) popt->map = 'a';
+-			else return 0;
+-		}
+-		if (!strcmp(this_char,"session") && value) {
+-			char * vpnt = value;
+-			unsigned int ivalue = simple_strtoul(vpnt, &vpnt, 0);
+-			if(ivalue < 0 || ivalue >99) return 0;
+-			popt->session=ivalue+1;
+-		}
+-		if (!strcmp(this_char,"sbsector") && value) {
+-			char * vpnt = value;
+-			unsigned int ivalue = simple_strtoul(vpnt, &vpnt, 0);
+-			if(ivalue < 0 || ivalue >660*512) return 0;
+-			popt->sbsector=ivalue;
+-		}
+-		else if (!strcmp(this_char,"check") && value) {
+-			if (value[0] && !value[1] && strchr("rs",*value))
+-				popt->check = *value;
+-			else if (!strcmp(value,"relaxed")) popt->check = 'r';
+-			else if (!strcmp(value,"strict")) popt->check = 's';
+-			else return 0;
+-		}
+-		else if (!strcmp(this_char,"conv") && value) {
+-			/* no conversion is done anymore;
+-			   we still accept the same mount options,
+-			   but ignore them */
+-			if (value[0] && !value[1] && strchr("btma",*value)) ;
+-			else if (!strcmp(value,"binary")) ;
+-			else if (!strcmp(value,"text")) ;
+-			else if (!strcmp(value,"mtext")) ;
+-			else if (!strcmp(value,"auto")) ;
+-			else return 0;
+-		}
+-		else if (value &&
+-			 (!strcmp(this_char,"block") ||
+-			  !strcmp(this_char,"mode") ||
+-			  !strcmp(this_char,"uid") ||
+-			  !strcmp(this_char,"gid"))) {
+-		  char * vpnt = value;
+-		  unsigned int ivalue = simple_strtoul(vpnt, &vpnt, 0);
+-		  if (*vpnt) return 0;
+-		  switch(*this_char) {
+-		  case 'b':
+-		    if (   ivalue != 512
+-			&& ivalue != 1024
+-			&& ivalue != 2048) return 0;
+-		    popt->blocksize = ivalue;
+-		    break;
+-		  case 'u':
+-		    popt->uid = ivalue;
+-		    break;
+-		  case 'g':
+-		    popt->gid = ivalue;
+-		    break;
+-		  case 'm':
+-		    popt->mode = ivalue;
+-		    break;
+-		  }
++		case Opt_map_a:
++			popt->map = 'a';
++			break;
++		case Opt_map_o:
++			popt->map = 'o';
++			break;
++		case Opt_map_n:
++			popt->map = 'n';
++			break;
++		case Opt_session:
++			if (match_int(&args[0], &option))
++				return 0;
++			n = option;
++			if (n > 99)
++				return 0;
++			popt->session = n + 1;
++			break;
++		case Opt_sb:
++			if (match_int(&args[0], &option))
++				return 0;
++			n = option;
++			if (n > 660 * 512)
++				return 0;
++			popt->sbsector = n;
++			break;
++		case Opt_check_r:
++			popt->check = 'r';
++			break;
++		case Opt_check_s:
++			popt->check = 's';
++			break;
++		case Opt_ignore:
++			break;
++		case Opt_uid:
++			if (match_int(&args[0], &option))
++				return 0;
++			popt->uid = option;
++			break;
++		case Opt_gid:
++			if (match_int(&args[0], &option))
++				return 0;
++			popt->gid = option;
++			break;
++		case Opt_mode:
++			if (match_int(&args[0], &option))
++				return 0;
++			popt->mode = option;
++			break;
++		case Opt_block:
++			if (match_int(&args[0], &option))
++				return 0;
++			n = option;
++			if (n != 512 && n != 1024 && n != 2048)
++				return 0;
++			popt->blocksize = n;
++			break;
++		case Opt_nocompress:
++			popt->nocompress = 1;
++			break;
++		default:
++			return 0;
+ 		}
+-		else return 1;
+ 	}
+ 	return 1;
+ }
+@@ -842,6 +875,9 @@ root_found:
+ 	if (opt.check == 'r') table++;
+ 	s->s_root->d_op = &isofs_dentry_ops[table];
+ 
++	if (opt.iocharset)
++		kfree(opt.iocharset);
++
+ 	return 0;
+ 
+ 	/*
+@@ -879,6 +915,8 @@ out_unknown_format:
+ out_freebh:
+ 	brelse(bh);
+ out_freesbi:
++	if (opt.iocharset)
++		kfree(opt.iocharset);
+ 	kfree(sbi);
+ 	s->s_fs_info = NULL;
+ 	return -EINVAL;
+--- linux-2.6.0-test6/fs/jbd/journal.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/jbd/journal.c	2003-10-05 00:33:24.000000000 -0700
+@@ -1800,7 +1800,7 @@ int read_jbd_debug(char *page, char **st
+ 	return ret;
+ }
+ 
+-int write_jbd_debug(struct file *file, const char *buffer,
++int write_jbd_debug(struct file *file, const char __user *buffer,
+ 			   unsigned long count, void *data)
+ {
+ 	char buf[32];
+--- linux-2.6.0-test6/fs/jffs/intrep.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/jffs/intrep.c	2003-10-05 00:34:48.000000000 -0700
+@@ -3337,18 +3337,16 @@ jffs_garbage_collect_thread(void *ptr)
+ 	int result = 0;
+ 	D1(int i = 1);
+ 
++	daemonize("jffs_gcd");
++
+ 	c->gc_task = current;
+ 
+ 	lock_kernel();
+-	exit_mm(c->gc_task);
+-
+-	set_special_pids(1, 1);
+ 	init_completion(&c->gc_thread_comp); /* barrier */ 
+ 	spin_lock_irq(&current->sighand->siglock);
+ 	siginitsetinv (&current->blocked, sigmask(SIGHUP) | sigmask(SIGKILL) | sigmask(SIGSTOP) | sigmask(SIGCONT));
+ 	recalc_sigpending();
+ 	spin_unlock_irq(&current->sighand->siglock);
+-	strcpy(current->comm, "jffs_gcd");
+ 
+ 	D1(printk (KERN_NOTICE "jffs_garbage_collect_thread(): Starting infinite loop.\n"));
+ 
+--- linux-2.6.0-test6/fs/jfs/inode.c	2003-09-08 13:58:58.000000000 -0700
++++ 25/fs/jfs/inode.c	2003-10-05 00:34:07.000000000 -0700
+@@ -302,7 +302,7 @@ static int jfs_direct_IO(int rw, struct 
+ 			loff_t offset, unsigned long nr_segs)
+ {
+ 	struct file *file = iocb->ki_filp;
+-	struct inode *inode = file->f_dentry->d_inode->i_mapping->host;
++	struct inode *inode = file->f_mapping->host;
+ 
+ 	return blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev, iov,
+ 				offset, nr_segs, jfs_get_blocks, NULL);
+--- linux-2.6.0-test6/fs/jfs/jfs_debug.c	2003-06-14 12:18:29.000000000 -0700
++++ 25/fs/jfs/jfs_debug.c	2003-10-05 00:33:24.000000000 -0700
+@@ -81,7 +81,7 @@ static int loglevel_read(char *page, cha
+ 	return len;
+ }
+ 
+-static int loglevel_write(struct file *file, const char *buffer,
++static int loglevel_write(struct file *file, const char __user *buffer,
+ 			unsigned long count, void *data)
+ {
+ 	char c;
+--- linux-2.6.0-test6/fs/jfs/jfs_imap.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/jfs/jfs_imap.c	2003-10-05 00:33:24.000000000 -0700
+@@ -838,7 +838,7 @@ int diWrite(tid_t tid, struct inode *ip)
+ 	 */
+ 	if (S_ISDIR(ip->i_mode)
+ 	    && (ip->i_ipmnt->i_mntflag & JFS_DASD_ENABLED))
+-		bcopy(&ip->i_DASD, &dp->di_DASD, sizeof(struct dasd));
++		memcpy(&dp->di_DASD, &ip->i_DASD, sizeof(struct dasd));
+ #endif				/*  _JFS_FASTDASD */
+ 
+ 	/* release the buffer holding the updated on-disk inode. 
+--- linux-2.6.0-test6/fs/jfs/super.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/jfs/super.c	2003-10-05 00:33:24.000000000 -0700
+@@ -20,6 +20,7 @@
+ #include <linux/fs.h>
+ #include <linux/config.h>
+ #include <linux/module.h>
++#include <linux/parser.h>
+ #include <linux/completion.h>
+ #include <linux/vfs.h>
+ #include <asm/uaccess.h>
+@@ -164,59 +165,82 @@ static void jfs_put_super(struct super_b
+ 	kfree(sbi);
+ }
+ 
++enum {
++	Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
++	Opt_ignore, Opt_err,
++};
++
++static match_table_t tokens = {
++	{Opt_integrity, "integrity"},
++	{Opt_nointegrity, "nointegrity"},
++	{Opt_iocharset, "iocharset=%s"},
++	{Opt_resize, "resize=%u"},
++	{Opt_ignore, "noquota"},
++	{Opt_ignore, "quota"},
++	{Opt_ignore, "usrquota"},
++	{Opt_ignore, "grpquota"},
++	{Opt_err, NULL}
++};
++
+ static int parse_options(char *options, struct super_block *sb, s64 *newLVSize,
+ 			 int *flag)
+ {
+ 	void *nls_map = NULL;
+-	char *this_char;
+-	char *value;
++	char *p;
+ 	struct jfs_sb_info *sbi = JFS_SBI(sb);
+ 
+ 	*newLVSize = 0;
+ 
+ 	if (!options)
+ 		return 1;
+-	while ((this_char = strsep(&options, ",")) != NULL) {
+-		if (!*this_char)
++
++	while ((p = strsep(&options, ",")) != NULL) {
++		substring_t args[MAX_OPT_ARGS];
++		int token;
++		if (!*p)
+ 			continue;
+-		if ((value = strchr(this_char, '=')) != NULL)
+-			*value++ = 0;
+-		if (!strcmp(this_char, "integrity")) {
++
++		token = match_token(p, tokens, args);
++		switch (token) {
++		case Opt_integrity:
+ 			*flag &= ~JFS_NOINTEGRITY;
+-		} else 	if (!strcmp(this_char, "nointegrity")) {
++			break;
++		case Opt_nointegrity:
+ 			*flag |= JFS_NOINTEGRITY;
+-		} else if (!strcmp(this_char, "iocharset")) {
+-			if (!value || !*value)
+-				goto needs_arg;
++			break;
++		case Opt_ignore:
++			/* Silently ignore the quota options */
++			/* Don't do anything ;-) */
++			break;
++		case Opt_iocharset:
+ 			if (nls_map)	/* specified iocharset twice! */
+ 				unload_nls(nls_map);
+-			nls_map = load_nls(value);
++			nls_map = load_nls(args[0].from);
+ 			if (!nls_map) {
+ 				printk(KERN_ERR "JFS: charset not found\n");
+ 				goto cleanup;
+ 			}
+-		} else if (!strcmp(this_char, "resize")) {
+-			if (!value || !*value) {
++			break;
++		case Opt_resize:
++		{
++			char *resize = args[0].from;
++			if (!resize || !*resize) {
+ 				*newLVSize = sb->s_bdev->bd_inode->i_size >>
+ 					sb->s_blocksize_bits;
+ 				if (*newLVSize == 0)
+ 					printk(KERN_ERR
+-					 "JFS: Cannot determine volume size\n");
++					"JFS: Cannot determine volume size\n");
+ 			} else
+-				*newLVSize = simple_strtoull(value, &value, 0);
+-
+-			/* Silently ignore the quota options */
+-		} else if (!strcmp(this_char, "grpquota")
+-			   || !strcmp(this_char, "noquota")
+-			   || !strcmp(this_char, "quota")
+-			   || !strcmp(this_char, "usrquota"))
+-			/* Don't do anything ;-) */ ;
+-		else {
+-			printk("jfs: Unrecognized mount option %s\n",
+-			       this_char);
++				*newLVSize = simple_strtoull(resize, &resize, 0);
++			break;
++		}
++		default:
++			printk("jfs: Unrecognized mount option \"%s\" "
++					" or missing value\n", p);
+ 			goto cleanup;
+ 		}
+ 	}
++
+ 	if (nls_map) {
+ 		/* Discard old (if remount) */
+ 		if (sbi->nls_tab)
+@@ -224,8 +248,7 @@ static int parse_options(char *options, 
+ 		sbi->nls_tab = nls_map;
+ 	}
+ 	return 1;
+-needs_arg:
+-	printk(KERN_ERR "JFS: %s needs an argument\n", this_char);
++
+ cleanup:
+ 	if (nls_map)
+ 		unload_nls(nls_map);
+--- linux-2.6.0-test6/fs/jfs/symlink.c	2003-06-14 12:18:51.000000000 -0700
++++ 25/fs/jfs/symlink.c	2003-10-05 00:33:24.000000000 -0700
+@@ -26,7 +26,7 @@ static int jfs_follow_link(struct dentry
+ 	return vfs_follow_link(nd, s);
+ }
+ 
+-static int jfs_readlink(struct dentry *dentry, char *buffer, int buflen)
++static int jfs_readlink(struct dentry *dentry, char __user *buffer, int buflen)
+ {
+ 	char *s = JFS_IP(dentry->d_inode)->i_inline;
+ 	return vfs_readlink(dentry, buffer, buflen, s);
+--- linux-2.6.0-test6/fs/Kconfig	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/Kconfig	2003-10-05 00:36:47.000000000 -0700
+@@ -874,6 +874,7 @@ config TMPFS
+ 
+ config HUGETLBFS
+ 	bool "HugeTLB file system support"
++	depends X86 || IA64 || PPC64 || SPARC64 || X86_64 || BROKEN
+ 
+ config HUGETLB_PAGE
+ 	def_bool HUGETLBFS
+@@ -1254,6 +1255,8 @@ menu "Network File Systems"
+ config NFS_FS
+ 	tristate "NFS file system support"
+ 	depends on INET
++	select LOCKD
++	select SUNRPC
+ 	help
+ 	  If you are connected to some other (usually local) Unix computer
+ 	  (using SLIP, PLIP, PPP or Ethernet) and want to mount files residing
+@@ -1306,9 +1309,36 @@ config NFS_V4
+ 
+ 	  If unsure, say N.
+ 
++config NFS_DIRECTIO
++	bool
++	depends on NFS_FS
++	default y
++	help
++	  This option enables applications to perform uncached I/O on files
++	  in NFS file systems using the O_DIRECT open() flag.  When O_DIRECT
++	  is set for a file, its data is not cached in the system's page
++	  cache.  Data is moved to and from user-level application buffers
++	  directly.  Unlike local disk-based file systems, NFS O_DIRECT has
++	  no alignment restrictions.
++
++	  Unless your program is designed to use O_DIRECT properly, you are
++	  much better off allowing the NFS client to manage data caching for
++	  you.  Misusing O_DIRECT can cause poor server performance or network
++	  storms.  This kernel build option defaults OFF to avoid exposing
++	  system administrators unwittingly to a potentially hazardous
++	  feature.
++
++	  For more details on NFS O_DIRECT, see fs/nfs/direct.c.
++
++	  If unsure, say N.  This reduces the size of the NFS client, and
++	  causes open() to return EINVAL if a file residing in NFS is
++	  opened with the O_DIRECT flag.
++
+ config NFSD
+ 	tristate "NFS server support"
+ 	depends on INET
++	select LOCKD
++	select SUNRPC
+ 	help
+ 	  If you want your Linux box to act as an NFS *server*, so that other
+ 	  computers on your local network which support NFS can access certain
+@@ -1371,8 +1401,6 @@ config ROOT_NFS
+ 
+ config LOCKD
+ 	tristate
+-	default m if NFS_FS!=y && NFSD!=y && (NFS_FS=m || NFSD=m)
+-	default y if NFS_FS=y || NFSD=y
+ 
+ config LOCKD_V4
+ 	bool
+@@ -1385,8 +1413,6 @@ config EXPORTFS
+ 
+ config SUNRPC
+ 	tristate
+-	default m if NFS_FS!=y && NFSD!=y && (NFS_FS=m || NFSD=m)
+-	default y if NFS_FS=y || NFSD=y
+ 
+ config SUNRPC_GSS
+ 	tristate "Provide RPCSEC_GSS authentication (EXPERIMENTAL)"
+@@ -1565,6 +1591,7 @@ config AFS_FS
+ # for fs/nls/Config.in
+ 	tristate "Andrew File System support (AFS) (Experimental)"
+ 	depends on INET && EXPERIMENTAL
++	select RXRPC
+ 	help
+ 	  If you say Y here, you will get an experimental Andrew File System
+ 	  driver. It currently only supports unsecured read-only AFS access.
+@@ -1575,8 +1602,6 @@ config AFS_FS
+ 
+ config RXRPC
+ 	tristate
+-	default m if AFS_FS=m
+-	default y if AFS_FS=y
+ 
+ endmenu
+ 
+--- linux-2.6.0-test6/fs/libfs.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/libfs.c	2003-10-05 00:33:24.000000000 -0700
+@@ -429,3 +429,26 @@ void simple_release_fs(struct vfsmount *
+ 	spin_unlock(&pin_fs_lock);
+ 	mntput(mnt);
+ }
++
++EXPORT_SYMBOL(dcache_dir_close);
++EXPORT_SYMBOL(dcache_dir_lseek);
++EXPORT_SYMBOL(dcache_dir_open);
++EXPORT_SYMBOL(dcache_readdir);
++EXPORT_SYMBOL(generic_read_dir);
++EXPORT_SYMBOL(simple_commit_write);
++EXPORT_SYMBOL(simple_dir_inode_operations);
++EXPORT_SYMBOL(simple_dir_operations);
++EXPORT_SYMBOL(simple_empty);
++EXPORT_SYMBOL(simple_fill_super);
++EXPORT_SYMBOL(simple_getattr);
++EXPORT_SYMBOL(simple_link);
++EXPORT_SYMBOL(simple_lookup);
++EXPORT_SYMBOL(simple_pin_fs);
++EXPORT_SYMBOL(simple_prepare_write);
++EXPORT_SYMBOL(simple_readpage);
++EXPORT_SYMBOL(simple_release_fs);
++EXPORT_SYMBOL(simple_rename);
++EXPORT_SYMBOL(simple_rmdir);
++EXPORT_SYMBOL(simple_statfs);
++EXPORT_SYMBOL(simple_sync_file);
++EXPORT_SYMBOL(simple_unlink);
+--- linux-2.6.0-test6/fs/locks.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/locks.c	2003-10-05 00:36:10.000000000 -0700
+@@ -928,10 +928,10 @@ int locks_mandatory_locked(struct inode 
+  * locks_mandatory_area - Check for a conflicting lock
+  * @read_write: %FLOCK_VERIFY_WRITE for exclusive access, %FLOCK_VERIFY_READ
+  *		for shared
+- * @inode: the file to check
+- * @file: how the file was opened (if it was)
+- * @offset: start of area to check
+- * @count: length of area to check
++ * @inode:      the file to check
++ * @filp:       how the file was opened (if it was)
++ * @offset:     start of area to check
++ * @count:      length of area to check
+  *
+  * Searches the inode's list of locks to find any POSIX locks which conflict.
+  * This function is called from locks_verify_area() and
+@@ -1119,6 +1119,7 @@ out:
+ /**
+  *	lease_get_mtime
+  *	@inode: the inode
++ *      @time:  pointer to a timespec which will contain the last modified time
+  *
+  * This is to force NFS clients to flush their caches for files with
+  * exclusive leases.  The justification is that if someone has an
+@@ -1434,7 +1435,7 @@ int fcntl_setlk(struct file *filp, unsig
+ 	 */
+ 	if (IS_MANDLOCK(inode) &&
+ 	    (inode->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID) {
+-		struct address_space *mapping = inode->i_mapping;
++		struct address_space *mapping = filp->f_mapping;
+ 
+ 		if (!list_empty(&mapping->i_mmap_shared)) {
+ 			error = -EAGAIN;
+@@ -1572,7 +1573,7 @@ int fcntl_setlk64(struct file *filp, uns
+ 	 */
+ 	if (IS_MANDLOCK(inode) &&
+ 	    (inode->i_mode & (S_ISGID | S_IXGRP)) == S_ISGID) {
+-		struct address_space *mapping = inode->i_mapping;
++		struct address_space *mapping = filp->f_mapping;
+ 
+ 		if (!list_empty(&mapping->i_mmap_shared)) {
+ 			error = -EAGAIN;
+@@ -1726,6 +1727,7 @@ posix_block_lock(struct file_lock *block
+ 
+ /**
+  *	posix_unblock_lock - stop waiting for a file lock
++ *      @filp:   how the file was opened
+  *	@waiter: the lock which was waiting
+  *
+  *	lockd needs to block waiting for locks.
+--- linux-2.6.0-test6/fs/namei.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/namei.c	2003-10-05 00:33:24.000000000 -0700
+@@ -15,6 +15,7 @@
+  */
+ 
+ #include <linux/init.h>
++#include <linux/module.h>
+ #include <linux/slab.h>
+ #include <linux/fs.h>
+ #include <linux/namei.h>
+@@ -218,7 +219,7 @@ int permission(struct inode * inode,int 
+ 	if (retval)
+ 		return retval;
+ 
+-	return security_inode_permission(inode, mask);
++	return security_inode_permission(inode, mask, nd);
+ }
+ 
+ /*
+@@ -302,7 +303,8 @@ static struct dentry * cached_lookup(str
+  * short-cut DAC fails, then call permission() to do more
+  * complete permission check.
+  */
+-static inline int exec_permission_lite(struct inode *inode)
++static inline int exec_permission_lite(struct inode *inode,
++				       struct nameidata *nd)
+ {
+ 	umode_t	mode = inode->i_mode;
+ 
+@@ -325,7 +327,7 @@ static inline int exec_permission_lite(s
+ 
+ 	return -EACCES;
+ ok:
+-	return security_inode_permission(inode, MAY_EXEC);
++	return security_inode_permission(inode, MAY_EXEC, nd);
+ }
+ 
+ /*
+@@ -584,7 +586,7 @@ int link_path_walk(const char * name, st
+ 		struct qstr this;
+ 		unsigned int c;
+ 
+-		err = exec_permission_lite(inode);
++		err = exec_permission_lite(inode, nd);
+ 		if (err == -EAGAIN) { 
+ 			err = permission(inode, MAY_EXEC, nd);
+ 		}
+@@ -2275,3 +2277,33 @@ struct inode_operations page_symlink_ino
+ 	.readlink	= page_readlink,
+ 	.follow_link	= page_follow_link,
+ };
++
++EXPORT_SYMBOL(__user_walk);
++EXPORT_SYMBOL(follow_down);
++EXPORT_SYMBOL(follow_up);
++EXPORT_SYMBOL(get_write_access); /* binfmt_aout */
++EXPORT_SYMBOL(getname);
++EXPORT_SYMBOL(lock_rename);
++EXPORT_SYMBOL(lookup_create);
++EXPORT_SYMBOL(lookup_hash);
++EXPORT_SYMBOL(lookup_one_len);
++EXPORT_SYMBOL(page_follow_link);
++EXPORT_SYMBOL(page_readlink);
++EXPORT_SYMBOL(page_symlink);
++EXPORT_SYMBOL(page_symlink_inode_operations);
++EXPORT_SYMBOL(path_lookup);
++EXPORT_SYMBOL(path_release);
++EXPORT_SYMBOL(path_walk);
++EXPORT_SYMBOL(permission);
++EXPORT_SYMBOL(unlock_rename);
++EXPORT_SYMBOL(vfs_create);
++EXPORT_SYMBOL(vfs_follow_link);
++EXPORT_SYMBOL(vfs_link);
++EXPORT_SYMBOL(vfs_mkdir);
++EXPORT_SYMBOL(vfs_mknod);
++EXPORT_SYMBOL(vfs_permission);
++EXPORT_SYMBOL(vfs_readlink);
++EXPORT_SYMBOL(vfs_rename);
++EXPORT_SYMBOL(vfs_rmdir);
++EXPORT_SYMBOL(vfs_symlink);
++EXPORT_SYMBOL(vfs_unlink);
+--- linux-2.6.0-test6/fs/nfs/direct.c	2003-06-26 22:07:25.000000000 -0700
++++ 25/fs/nfs/direct.c	2003-10-05 00:36:46.000000000 -0700
+@@ -1,7 +1,7 @@
+ /*
+  * linux/fs/nfs/direct.c
+  *
+- * Copyright (C) 2001 by Chuck Lever <cel@netapp.com>
++ * Copyright (C) 2003 by Chuck Lever <cel@netapp.com>
+  *
+  * High-performance uncached I/O for the Linux NFS client
+  *
+@@ -26,19 +26,23 @@
+  * also supports uncaching whole NFS partitions with "-o forcedirectio,"
+  * an undocumented mount option.
+  *
+- * Designed by Jeff Kimmel, Chuck Lever, and Trond Myklebust.
++ * Designed by Jeff Kimmel, Chuck Lever, and Trond Myklebust, with
++ * help from Andrew Morton.
+  *
+  * 18 Dec 2001	Initial implementation for 2.4  --cel
+  * 08 Jul 2002	Version for 2.4.19, with bug fixes --trondmy
+- * 24 Sep 2002	Rewrite to use asynchronous RPCs, port to 2.5  --cel
++ * 08 Jun 2003	Port to 2.5 APIs  --cel
+  *
+  */
+ 
+ #include <linux/config.h>
++#include <linux/errno.h>
+ #include <linux/sched.h>
+ #include <linux/kernel.h>
++#include <linux/smp_lock.h>
+ #include <linux/file.h>
+-#include <linux/errno.h>
++#include <linux/pagemap.h>
++
+ #include <linux/nfs_fs.h>
+ #include <linux/nfs_page.h>
+ #include <linux/sunrpc/clnt.h>
+@@ -46,35 +50,41 @@
+ #include <asm/system.h>
+ #include <asm/uaccess.h>
+ 
+-#define NFSDBG_FACILITY		(NFSDBG_PAGECACHE | NFSDBG_VFS)
++#define NFSDBG_FACILITY		NFSDBG_VFS
+ #define VERF_SIZE		(2 * sizeof(__u32))
++#define MAX_DIRECTIO_SIZE	(4096UL << PAGE_SHIFT)
+ 
+ 
+ /**
+- * nfs_get_user_pages - find and set up page representing user buffer
+- * addr: user-space address of target buffer
+- * size: total size in bytes of target buffer
+- * @pages: returned array of page struct pointers underlying target buffer
+- * write: whether or not buffer is target of a write operation
++ * nfs_get_user_pages - find and set up pages underlying user's buffer
++ * rw: direction (read or write)
++ * user_addr: starting address of this segment of user's buffer
++ * count: size of this segment
++ * @pages: returned array of page struct pointers underlying user's buffer
+  */
+ static inline int
+-nfs_get_user_pages(unsigned long addr, size_t size,
+-		struct page ***pages, int rw)
++nfs_get_user_pages(int rw, unsigned long user_addr, size_t size,
++		struct page ***pages)
+ {
+ 	int result = -ENOMEM;
+-	unsigned page_count = (unsigned) size >> PAGE_SHIFT;
+-	unsigned array_size = (page_count * sizeof(struct page *)) + 2U;
++	unsigned long page_count;
++	size_t array_size;
++
++	/* set an arbitrary limit to prevent arithmetic overflow */
++	if (size > MAX_DIRECTIO_SIZE)
++		return -EFBIG;
+ 
+-	*pages = (struct page **) kmalloc(array_size, GFP_KERNEL);
++	page_count = (user_addr + size + PAGE_SIZE - 1) >> PAGE_SHIFT;
++	page_count -= user_addr >> PAGE_SHIFT;
++
++	array_size = (page_count * sizeof(struct page *));
++	*pages = kmalloc(array_size, GFP_KERNEL);
+ 	if (*pages) {
+ 		down_read(&current->mm->mmap_sem);
+-		result = get_user_pages(current, current->mm, addr,
+-					page_count, (rw == WRITE), 0,
++		result = get_user_pages(current, current->mm, user_addr,
++					page_count, (rw == READ), 0,
+ 					*pages, NULL);
+ 		up_read(&current->mm->mmap_sem);
+-		if (result < 0)
+-			printk(KERN_ERR "%s: get_user_pages result %d\n",
+-					__FUNCTION__, result);
+ 	}
+ 	return result;
+ }
+@@ -84,176 +94,349 @@ nfs_get_user_pages(unsigned long addr, s
+  * @pages: array of page struct pointers underlying target buffer
+  */
+ static inline void
+-nfs_free_user_pages(struct page **pages, unsigned count)
++nfs_free_user_pages(struct page **pages)
+ {
+-	unsigned page = 0;
++	kfree(pages);
++}
+ 
+-	while (count--)
+-		page_cache_release(pages[page++]);
++/**
++ * nfs_direct_read_seg - Read in one iov segment.  Generate separate
++ *                        read RPCs for each "rsize" bytes.
++ * @inode: target inode
++ * @cred: user's credential
++ * user_addr: starting address of this segment of user's buffer
++ * count: size of this segment
++ * file_offset: offset in file to begin the operation
++ * @pages: array of addresses of page structs defining user's buffer
++ * nr_pages: size of pages array
++ */
++static int
++nfs_direct_read_seg(struct inode *inode, struct rpc_cred *cred,
++		unsigned long user_addr, size_t count, loff_t file_offset,
++		struct page **pages, int nr_pages)
++{
++	const unsigned int rsize = NFS_SERVER(inode)->rsize;
++	int tot_bytes = 0;
++	int curpage = 0;
++	struct nfs_read_data	rdata = {
++		.flags		= 0,
++		.cred		= cred,
++		.inode		= inode,
++		.args		= {
++			.fh		= NFS_FH(inode),
++		},
++		.res		= {
++			.fattr		= &rdata.fattr,
++		},
++	};
++
++        do {
++		int request, result;
++
++                request = count;
++                if (count > rsize)
++                        request = rsize;
++		rdata.args.count = request,
++		rdata.args.pgbase = user_addr & ~PAGE_MASK;
++		rdata.args.offset = file_offset;
++		rdata.args.pages = &pages[curpage];
++
++		dprintk("NFS: direct read: c=%u o=%Ld ua=%lu, pb=%u, cp=%u\n",
++			rdata.args.count, (long long) rdata.args.offset,
++			user_addr, rdata.args.pgbase, curpage);
++
++		lock_kernel();
++		result = NFS_PROTO(inode)->read(&rdata);
++		unlock_kernel();
++
++		if (result < 0) {
++			if (result == -EISDIR)
++				result = -EINVAL;
++			return result;
++		}
+ 
+-	kfree(pages);
++                tot_bytes += result;
++                count -= result;
++                file_offset += result;
++		user_addr += result;
++
++		if (rdata.res.eof)
++			break;
++
++		curpage += (rdata.args.pgbase + result) >> PAGE_SHIFT;
++	} while (count);
++
++	/* XXX: should we zero the rest of the user's buffer if we
++	 *      hit eof? */
++
++	return tot_bytes;
+ }
+ 
+ /**
+- * nfs_iov2pagelist - convert an array of iovecs to a list of page requests
+- * @inode: inode of target file
+- * @cred: credentials of user who requested I/O
++ * nfs_direct_read - For each iov segment, map the user's buffer
++ *                   then generate read RPCs.
++ * @inode: target inode
++ * @cred: user's credential
+  * @iov: array of vectors that define I/O buffer
+- * offset: where in file to begin the read
++ * file_offset: offset in file to begin the operation
+  * nr_segs: size of iovec array
+- * @requests: append new page requests to this list head
++ *
++ * generic_file_direct_IO has already pushed out any non-direct
++ * writes so that this read will see them when we read from the
++ * server.
+  */
+ static int
+-nfs_iov2pagelist(int rw, const struct inode *inode,
+-		const struct rpc_cred *cred,
+-		const struct iovec *iov, loff_t offset,
+-		unsigned long nr_segs, struct list_head *requests)
++nfs_direct_read(struct inode *inode, struct rpc_cred *cred,
++		const struct iovec *iov, loff_t file_offset,
++		unsigned long nr_segs)
+ {
+-	unsigned seg;
+ 	int tot_bytes = 0;
+-	struct page **pages;
++	unsigned long seg = 0;
+ 
+-	/* for each iovec in the array... */
+-	for (seg = 0; seg < nr_segs; seg++) {
+-		const unsigned long user_addr =
+-					(unsigned long) iov[seg].iov_base;
+-		size_t bytes = iov[seg].iov_len;
+-		unsigned int pg_offset = (user_addr & ~PAGE_MASK);
+-		int page_count, page = 0;
+-
+-		page_count = nfs_get_user_pages(user_addr, bytes, &pages, rw);
+-		if (page_count < 0) {
+-			nfs_release_list(requests);
+-			return page_count;
++	while ((seg < nr_segs) && (tot_bytes >= 0)) {
++		int result, page_count;
++		struct page **pages;
++		const struct iovec *vec = &iov[seg++];
++		unsigned long user_addr = (unsigned long) vec->iov_base;
++		size_t size = vec->iov_len;
++
++                page_count = nfs_get_user_pages(READ, user_addr, size, &pages);
++                if (page_count < 0) {
++                        nfs_free_user_pages(pages);
++                        return page_count;
++                }
++
++		result = nfs_direct_read_seg(inode, cred, user_addr, size,
++				file_offset, pages, page_count);
++		if (result < 0)
++			tot_bytes = result;
++		else {
++			tot_bytes += result;
++			file_offset += result;
+ 		}
+ 
+-		/* ...build as many page requests as required */
+-		while (bytes > 0) {
+-			struct nfs_page *new;
+-			const unsigned int pg_bytes = (bytes > PAGE_SIZE) ?
+-							PAGE_SIZE : bytes;
+-
+-			new = nfs_create_request((struct rpc_cred *) cred,
+-						 (struct inode *) inode,
+-						 pages[page],
+-						 pg_offset, pg_bytes);
+-			if (IS_ERR(new)) {
+-				nfs_free_user_pages(pages, page_count);
+-				nfs_release_list(requests);
+-				return PTR_ERR(new);
+-			}
+-			new->wb_index = offset;
+-			nfs_list_add_request(new, requests);
+-
+-			/* after the first page */
+-			pg_offset = 0;
+-			offset += PAGE_SIZE;
+-			tot_bytes += pg_bytes;
+-			bytes -= pg_bytes;
+-			page++;
++		nfs_free_user_pages(pages);
++	}
++
++	return tot_bytes;
++}
++
++/**
++ * nfs_direct_write_seg - Write out one iov segment.  Generate separate
++ *                        write RPCs for each "wsize" bytes, then commit.
++ * @inode: target inode
++ * @cred: user's credential
++ * user_addr: starting address of this segment of user's buffer
++ * count: size of this segment
++ * file_offset: offset in file to begin the operation
++ * @pages: array of addresses of page structs defining user's buffer
++ * nr_pages: size of pages array
++ */
++static int
++nfs_direct_write_seg(struct inode *inode, struct rpc_cred *cred,
++		unsigned long user_addr, size_t count, loff_t file_offset,
++		struct page **pages, int nr_pages)
++{
++	const unsigned int wsize = NFS_SERVER(inode)->wsize;
++	loff_t save_offset = file_offset;
++	size_t save_count = count;
++	int need_commit = 0;
++	int tot_bytes = 0;
++	int curpage = 0;
++	struct nfs_writeverf first_verf;
++	struct nfs_write_data	wdata = {
++		.cred		= cred,
++		.inode		= inode,
++		.args		= {
++			.fh		= NFS_FH(inode),
++		},
++		.res		= {
++			.fattr		= &wdata.fattr,
++			.verf		= &wdata.verf,
++		},
++	};
++
++	wdata.args.stable = NFS_UNSTABLE;
++	if (IS_SYNC(inode) || NFS_PROTO(inode)->version == 2 || count <= wsize)
++		wdata.args.stable = NFS_FILE_SYNC;
++
++retry:
++        do {
++		int request, result;
++
++                request = count;
++                if (count > wsize)
++                        request = wsize;
++		wdata.args.count = request,
++		wdata.args.pgbase = user_addr & ~PAGE_MASK;
++		wdata.args.offset = file_offset;
++		wdata.args.pages = &pages[curpage];
++
++		dprintk("NFS: direct write: c=%u o=%Ld ua=%lu, pb=%u, cp=%u\n",
++			wdata.args.count, (long long) wdata.args.offset,
++			user_addr, wdata.args.pgbase, curpage);
++
++		lock_kernel();
++		result = NFS_PROTO(inode)->write(&wdata);
++		unlock_kernel();
++
++		if (result < 0)
++			return result;
++
++		if (!tot_bytes)
++			memcpy(&first_verf.verifier, &wdata.verf.verifier,
++								VERF_SIZE);
++		if (wdata.verf.committed != NFS_FILE_SYNC) {
++			need_commit = 1;
++			if (memcmp(&first_verf.verifier,
++					&wdata.verf.verifier, VERF_SIZE))
++				goto sync_retry;
+ 		}
+ 
+-		/* don't release pages here -- I/O completion will do that */
+-		nfs_free_user_pages(pages, 0);
++                tot_bytes += result;
++                count -= result;
++                file_offset += result;
++		user_addr += result;
++
++		curpage += (wdata.args.pgbase + result) >> PAGE_SHIFT;
++	} while (count);
++
++	/*
++	 * Commit data written so far, even in the event of an error
++	 */
++	if (need_commit) {
++		int result;
++
++		wdata.args.count = tot_bytes;
++		wdata.args.offset = save_offset;
++
++		lock_kernel();
++		result = NFS_PROTO(inode)->commit(&wdata);
++		unlock_kernel();
++
++		if (result < 0)
++			goto sync_retry;
++		if (memcmp(&first_verf.verifier, &wdata.verf.verifier,
++								VERF_SIZE))
++			goto sync_retry;
+ 	}
+ 
+ 	return tot_bytes;
++
++sync_retry:
++	wdata.args.stable = NFS_FILE_SYNC;
++	file_offset = save_offset;
++	count = save_count;
++	goto retry;
+ }
+ 
+ /**
+- * do_nfs_direct_IO - Read or write data without caching
+- * @inode: inode of target file
+- * @cred: credentials of user who requested I/O
++ * nfs_direct_write - For each iov segment, map the user's buffer
++ *                    then generate write and commit RPCs.
++ * @inode: target inode
++ * @cred: user's credential
+  * @iov: array of vectors that define I/O buffer
+- * offset: where in file to begin the read
++ * file_offset: offset in file to begin the operation
+  * nr_segs: size of iovec array
+  *
+- * Break the passed-in iovec into a series of page-sized or smaller
+- * requests, where each page is mapped for direct user-land I/O.
+- *
+- * For each of these pages, create an NFS page request and
+- * append it to an automatic list of page requests.
+- *
+- * When all page requests have been queued, start the I/O on the
+- * whole list.  The underlying routines coalesce the pages on the
+- * list into a bunch of asynchronous "r/wsize" network requests.
+- *
+- * I/O completion automatically unmaps and releases the pages.
++ * Upon return, generic_file_direct_IO invalidates any cached pages
++ * that non-direct readers might access, so they will pick up these
++ * writes immediately.
+  */
+ static int
+-do_nfs_direct_IO(int rw, const struct inode *inode,
+-		const struct rpc_cred *cred, const struct iovec *iov,
+-		loff_t offset, unsigned long nr_segs)
++nfs_direct_write(struct inode *inode, struct rpc_cred *cred,
++		const struct iovec *iov, loff_t file_offset,
++		unsigned long nr_segs)
+ {
+-	LIST_HEAD(requests);
+-	int result, tot_bytes;
++	int tot_bytes = 0;
++	unsigned long seg = 0;
+ 
+-	result = nfs_iov2pagelist(rw, inode, cred, iov, offset, nr_segs,
+-								&requests);
+-	if (result < 0)
+-		return result;
+-	tot_bytes = result;
++	while ((seg < nr_segs) && (tot_bytes >= 0)) {
++		int result, page_count;
++		struct page **pages;
++		const struct iovec *vec = &iov[seg++];
++		unsigned long user_addr = (unsigned long) vec->iov_base;
++		size_t size = vec->iov_len;
++
++                page_count = nfs_get_user_pages(WRITE, user_addr, size, &pages);
++                if (page_count < 0) {
++                        nfs_free_user_pages(pages);
++                        return page_count;
++                }
+ 
+-	switch (rw) {
+-	case READ:
+-		if (IS_SYNC(inode) || (NFS_SERVER(inode)->rsize < PAGE_SIZE)) {
+-			result = nfs_direct_read_sync(inode, cred, iov, offset, nr_segs);
+-			break;
++		result = nfs_direct_write_seg(inode, cred, user_addr, size,
++				file_offset, pages, page_count);
++		if (result < 0)
++			tot_bytes = result;
++		else {
++			tot_bytes += result;
++			file_offset += result;
+ 		}
+-		result = nfs_pagein_list(&requests, NFS_SERVER(inode)->rpages);
+-		nfs_wait_for_reads(&requests);
+-		break;
+-	case WRITE:
+-		if (IS_SYNC(inode) || (NFS_SERVER(inode)->wsize < PAGE_SIZE))
+-			result = nfs_direct_write_sync(inode, cred, iov, offset, nr_segs);
+-		else
+-			result = nfs_flush_list(&requests,
+-					NFS_SERVER(inode)->wpages, FLUSH_WAIT);
+ 
+-		/* invalidate cache so non-direct readers pick up changes */
+-		invalidate_inode_pages((struct inode *) inode);
+-		break;
+-	default:
+-		result = -EINVAL;
+-		break;
++		nfs_free_user_pages(pages);
+ 	}
+ 
+-	if (result < 0)
+-		return result;
+ 	return tot_bytes;
+ }
+ 
+ /**
+  * nfs_direct_IO - NFS address space operation for direct I/O
+  * rw: direction (read or write)
+- * @file: file struct of target file
++ * @iocb: target I/O control block
+  * @iov: array of vectors that define I/O buffer
+- * offset: offset in file to begin the operation
++ * file_offset: offset in file to begin the operation
+  * nr_segs: size of iovec array
+  *
++ * Usually a file system implements direct I/O by calling out to
++ * blockdev_direct_IO.  The NFS client doesn't have a backing block
++ * device, so we do everything by hand instead.
++ *
+  * The inode's i_sem is no longer held by the VFS layer before it calls
+  * this function to do a write.
+  */
+ int
+ nfs_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov,
+-		loff_t offset, unsigned long nr_segs)
++		loff_t file_offset, unsigned long nr_segs)
+ {
+-	/* None of this works yet, so prevent it from compiling. */
+-#if 0
+-	int result;
++	int result = -EINVAL;
++	struct file *file = iocb->ki_filp;
+ 	struct dentry *dentry = file->f_dentry;
+-	const struct inode *inode = dentry->d_inode->i_mapping->host;
+-	const struct rpc_cred *cred = nfs_file_cred(file);
+-#endif
+-
+-	dfprintk(VFS, "NFS: direct_IO(%s) (%s/%s) off/no(%Lu/%lu)\n",
+-				((rw == READ) ? "READ" : "WRITE"),
+-				dentry->d_parent->d_name.name,
+-				dentry->d_name.name, offset, nr_segs);
++	struct inode *inode = dentry->d_inode;
++	struct rpc_cred *cred;
++
++	/*
++	 * No support for async yet
++	 */
++	if (!is_sync_kiocb(iocb))
++		goto out;
++
++	cred = get_rpccred(nfs_file_cred(file));
++	if (!cred)
++		cred = get_rpccred(NFS_I(inode)->mm_cred);
++
++	switch (rw) {
++	case READ:
++		dprintk("NFS: direct_IO(read) (%s) off/no(%Lu/%lu)\n",
++				dentry->d_name.name, file_offset, nr_segs);
++
++		result = nfs_direct_read(inode, cred, iov,
++						file_offset, nr_segs);
++		break;
++	case WRITE:
++		dprintk("NFS: direct_IO(write) (%s) off/no(%Lu/%lu)\n",
++				dentry->d_name.name, file_offset, nr_segs);
+ 
+-	result = do_nfs_direct_IO(rw, inode, cred, iov, offset, nr_segs);
++		result = nfs_direct_write(inode, cred, iov,
++						file_offset, nr_segs);
++		break;
++	default:
++		break;
++	}
+ 
+-	dfprintk(VFS, "NFS: direct_IO result = %d\n", result);
++	if (cred)
++		put_rpccred(cred);
+ 
++out:
++	dprintk("NFS: direct_IO result=%d\n", result);
+ 	return result;
+ }
+--- linux-2.6.0-test6/fs/nfsd/nfsctl.c	2003-07-02 14:53:16.000000000 -0700
++++ 25/fs/nfsd/nfsctl.c	2003-10-05 00:33:24.000000000 -0700
+@@ -429,6 +429,7 @@ static struct file_system_type nfsd_fs_t
+ 
+ static int __init init_nfsd(void)
+ {
++	int retval;
+ 	printk(KERN_INFO "Installing knfsd (copyright (C) 1996 okir@monad.swb.de).\n");
+ 
+ 	nfsd_stat_init();	/* Statistics */
+@@ -441,8 +442,16 @@ static int __init init_nfsd(void)
+ 		if (entry)
+ 			entry->proc_fops =  &exports_operations;
+ 	}
+-	register_filesystem(&nfsd_fs_type);
+-	return 0;
++	retval = register_filesystem(&nfsd_fs_type);
++	if (retval) {
++		nfsd_export_shutdown();
++		nfsd_cache_shutdown();
++		remove_proc_entry("fs/nfs/exports", NULL);
++		remove_proc_entry("fs/nfs", NULL);
++		nfsd_stat_shutdown();
++		nfsd_lockd_shutdown();
++	}
++	return retval;
+ }
+ 
+ static void __exit exit_nfsd(void)
+--- linux-2.6.0-test6/fs/nfs/file.c	2003-07-10 18:50:32.000000000 -0700
++++ 25/fs/nfs/file.c	2003-10-05 00:34:08.000000000 -0700
+@@ -262,7 +262,7 @@ out_swapfile:
+ int
+ nfs_lock(struct file *filp, int cmd, struct file_lock *fl)
+ {
+-	struct inode * inode = filp->f_dentry->d_inode;
++	struct inode * inode = filp->f_mapping->host;
+ 	int	status = 0;
+ 	int	status2;
+ 
+@@ -305,13 +305,13 @@ nfs_lock(struct file *filp, int cmd, str
+ 	 * Flush all pending writes before doing anything
+ 	 * with locks..
+ 	 */
+-	status = filemap_fdatawrite(inode->i_mapping);
++	status = filemap_fdatawrite(filp->f_mapping);
+ 	down(&inode->i_sem);
+ 	status2 = nfs_wb_all(inode);
+ 	if (!status)
+ 		status = status2;
+ 	up(&inode->i_sem);
+-	status2 = filemap_fdatawait(inode->i_mapping);
++	status2 = filemap_fdatawait(filp->f_mapping);
+ 	if (!status)
+ 		status = status2;
+ 	if (status < 0)
+@@ -331,11 +331,11 @@ nfs_lock(struct file *filp, int cmd, str
+ 	 */
+  out_ok:
+ 	if ((IS_SETLK(cmd) || IS_SETLKW(cmd)) && fl->fl_type != F_UNLCK) {
+-		filemap_fdatawrite(inode->i_mapping);
++		filemap_fdatawrite(filp->f_mapping);
+ 		down(&inode->i_sem);
+ 		nfs_wb_all(inode);      /* we may have slept */
+ 		up(&inode->i_sem);
+-		filemap_fdatawait(inode->i_mapping);
++		filemap_fdatawait(filp->f_mapping);
+ 		nfs_zap_caches(inode);
+ 	}
+ 	return status;
+--- linux-2.6.0-test6/fs/nfs/nfs3proc.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/nfs/nfs3proc.c	2003-10-05 00:36:45.000000000 -0700
+@@ -225,81 +225,74 @@ nfs3_proc_readlink(struct inode *inode, 
+ }
+ 
+ static int
+-nfs3_proc_read(struct inode *inode, struct rpc_cred *cred,
+-	       struct nfs_fattr *fattr, int flags,
+-	       unsigned int base, unsigned int count, struct page *page,
+-	       int *eofp)
+-{
+-	u64			offset = page_offset(page) + base;
+-	struct nfs_readargs	arg = {
+-		.fh		= NFS_FH(inode),
+-		.offset		= offset,
+-		.count		= count,
+-		.pgbase		= base,
+-		.pages		= &page
+-	};
+-	struct nfs_readres	res = {
+-		.fattr		= fattr,
+-		.count		= count,
+-	};
++nfs3_proc_read(struct nfs_read_data *rdata)
++{
++	int			flags = rdata->flags;
++	struct inode *		inode = rdata->inode;
++	struct nfs_fattr *	fattr = rdata->res.fattr;
+ 	struct rpc_message	msg = {
+ 		.rpc_proc	= &nfs3_procedures[NFS3PROC_READ],
+-		.rpc_argp	= &arg,
+-		.rpc_resp	= &res,
+-		.rpc_cred	= cred
++		.rpc_argp	= &rdata->args,
++		.rpc_resp	= &rdata->res,
++		.rpc_cred	= rdata->cred,
+ 	};
+ 	int			status;
+ 
+-	dprintk("NFS call  read %d @ %Ld\n", count, (long long)offset);
++	dprintk("NFS call  read %d @ %Ld\n", rdata->args.count,
++			(long long) rdata->args.offset);
+ 	fattr->valid = 0;
+ 	status = rpc_call_sync(NFS_CLIENT(inode), &msg, flags);
+ 	if (status >= 0)
+ 		nfs_refresh_inode(inode, fattr);
+ 	dprintk("NFS reply read: %d\n", status);
+-	*eofp = res.eof;
+ 	return status;
+ }
+ 
+ static int
+-nfs3_proc_write(struct inode *inode, struct rpc_cred *cred,
+-		struct nfs_fattr *fattr, int flags,
+-		unsigned int base, unsigned int count,
+-		struct page *page, struct nfs_writeverf *verf)
++nfs3_proc_write(struct nfs_write_data *wdata)
+ {
+-	u64			offset = page_offset(page) + base;
+-	struct nfs_writeargs	arg = {
+-		.fh		= NFS_FH(inode),
+-		.offset		= offset,
+-		.count		= count,
+-		.stable		= NFS_FILE_SYNC,
+-		.pgbase		= base,
+-		.pages		= &page
+-	};
+-	struct nfs_writeres	res = {
+-		.fattr		= fattr,
+-		.verf		= verf,
+-	};
++	int			rpcflags = wdata->flags;
++	struct inode *		inode = wdata->inode;
++	struct nfs_fattr *	fattr = wdata->res.fattr;
+ 	struct rpc_message	msg = {
+ 		.rpc_proc	= &nfs3_procedures[NFS3PROC_WRITE],
+-		.rpc_argp	= &arg,
+-		.rpc_resp	= &res,
+-		.rpc_cred	= cred
++		.rpc_argp	= &wdata->args,
++		.rpc_resp	= &wdata->res,
++		.rpc_cred	= wdata->cred,
+ 	};
+-	int			status, rpcflags = 0;
++	int			status;
+ 
+-	dprintk("NFS call  write %d @ %Ld\n", count, (long long)offset);
++	dprintk("NFS call  write %d @ %Ld\n", wdata->args.count,
++			(long long) wdata->args.offset);
+ 	fattr->valid = 0;
+-	if (flags & NFS_RW_SWAP)
+-		rpcflags |= NFS_RPC_SWAPFLAGS;
+-	arg.stable = (flags & NFS_RW_SYNC) ? NFS_FILE_SYNC : NFS_UNSTABLE;
+-
+ 	status = rpc_call_sync(NFS_CLIENT(inode), &msg, rpcflags);
+-
+ 	if (status >= 0)
+ 		nfs3_write_refresh_inode(inode, fattr);
++	dprintk("NFS reply write: %d\n", status);
++	return status < 0? status : wdata->res.count;
++}
+ 
+-	dprintk("NFS reply read: %d\n", status);
+-	return status < 0? status : res.count;
++static int
++nfs3_proc_commit(struct nfs_write_data *cdata)
++{
++	struct inode *		inode = cdata->inode;
++	struct nfs_fattr *	fattr = cdata->res.fattr;
++	struct rpc_message	msg = {
++		.rpc_proc	= &nfs3_procedures[NFS3PROC_COMMIT],
++		.rpc_argp	= &cdata->args,
++		.rpc_resp	= &cdata->res,
++		.rpc_cred	= cdata->cred,
++	};
++	int			status;
++
++	dprintk("NFS call  commit %d @ %Ld\n", cdata->args.count,
++			(long long) cdata->args.offset);
++	fattr->valid = 0;
++	status = rpc_call_sync(NFS_CLIENT(inode), &msg, 0);
++	if (status >= 0)
++		nfs3_write_refresh_inode(inode, fattr);
++	dprintk("NFS reply commit: %d\n", status);
++	return status;
+ }
+ 
+ /*
+@@ -863,6 +856,7 @@ struct nfs_rpc_ops	nfs_v3_clientops = {
+ 	.readlink	= nfs3_proc_readlink,
+ 	.read		= nfs3_proc_read,
+ 	.write		= nfs3_proc_write,
++	.commit		= nfs3_proc_commit,
+ 	.create		= nfs3_proc_create,
+ 	.remove		= nfs3_proc_remove,
+ 	.unlink_setup	= nfs3_proc_unlink_setup,
+--- linux-2.6.0-test6/fs/nfs/nfs4proc.c	2003-06-26 22:07:25.000000000 -0700
++++ 25/fs/nfs/nfs4proc.c	2003-10-05 00:36:45.000000000 -0700
+@@ -1012,45 +1012,36 @@ nfs4_proc_readlink(struct inode *inode, 
+ }
+ 
+ static int
+-nfs4_proc_read(struct inode *inode, struct rpc_cred *cred,
+-	       struct nfs_fattr *fattr, int flags,
+-	       unsigned int base, unsigned int count,
+-	       struct page *page, int *eofp)
++nfs4_proc_read(struct nfs_read_data *rdata)
+ {
++	int flags = rdata->flags;
++	struct inode *inode = rdata->inode;
++	struct nfs_fattr *fattr = rdata->res.fattr;
++	nfs4_stateid *stateid = &rdata->args.stateid;
+ 	struct nfs_server *server = NFS_SERVER(inode);
+ 	struct nfs4_shareowner	*sp;
+-	uint64_t offset = page_offset(page) + base;
+-	struct nfs_readargs arg = {
+-		.fh		= NFS_FH(inode),
+-		.offset		= offset,
+-		.count		= count,
+-		.pgbase		= base,
+-		.pages		= &page,
+-	};
+-	struct nfs_readres res = {
+-		.fattr		= fattr,
+-		.count		= count,
+-	};
+ 	struct rpc_message msg = {
+ 		.rpc_proc	= &nfs4_procedures[NFSPROC4_CLNT_READ],
+-		.rpc_argp	= &arg,
+-		.rpc_resp	= &res,
+-		.rpc_cred	= cred,
++		.rpc_argp	= &rdata->args,
++		.rpc_resp	= &rdata->res,
++		.rpc_cred	= rdata->cred,
+ 	};
+ 	unsigned long timestamp = jiffies;
+ 	int status;
+ 
+-	dprintk("NFS call  read %d @ %Ld\n", count, (long long)offset);
++	dprintk("NFS call  read %d @ %Ld\n", rdata->args.count,
++			(long long) rdata->args.offset);
++
+ 	/*
+-	* Try first to use O_RDONLY, then O_RDWR stateid.
+-	*/
++	 * Try first to use O_RDONLY, then O_RDWR stateid.
++	 */
+ 	sp = nfs4_get_inode_share(inode, O_RDONLY);
+ 	if (!sp)
+ 		sp = nfs4_get_inode_share(inode, O_RDWR);
+ 	if (sp)
+-		memcpy(arg.stateid,sp->so_stateid, sizeof(nfs4_stateid));
++		memcpy(stateid, sp->so_stateid, sizeof(nfs4_stateid));
+ 	else
+-		memcpy(arg.stateid, zero_stateid, sizeof(nfs4_stateid));
++		memcpy(stateid, zero_stateid, sizeof(nfs4_stateid));
+ 
+ 	fattr->valid = 0;
+ 	status = rpc_call_sync(server->client, &msg, flags);
+@@ -1061,56 +1052,82 @@ nfs4_proc_read(struct inode *inode, stru
+ 			nfs_zap_caches(inode);
+ 	}
+ 	dprintk("NFS reply read: %d\n", status);
+-	*eofp = res.eof;
+ 	return status;
+ }
+ 
+ static int
+-nfs4_proc_write(struct inode *inode, struct rpc_cred *cred,
+-		struct nfs_fattr *fattr, int flags,
+-		unsigned int base, unsigned int count,
+-		struct page *page, struct nfs_writeverf *verf)
++nfs4_proc_write(struct nfs_write_data *wdata)
+ {
++	int rpcflags = wdata->flags;
++	struct inode *inode = wdata->inode;
++	struct nfs_fattr *fattr = wdata->res.fattr;
++	nfs4_stateid *stateid = &wdata->args.stateid;
+ 	struct nfs_server *server = NFS_SERVER(inode);
+-	struct nfs4_shareowner	*sp;
+-	uint64_t offset = page_offset(page) + base;
+-	struct nfs_writeargs arg = {
+-		.fh		= NFS_FH(inode),
+-		.offset		= offset,
+-		.count		= count,
+-		.stable		= (flags & NFS_RW_SYNC) ? NFS_FILE_SYNC : NFS_UNSTABLE,
+-		.pgbase		= base,
+-		.pages		= &page,
+-	};
+-	struct nfs_writeres res = {
+-		.fattr		= fattr,
+-		.count		= count,
+-		.verf		= verf,
+-	};
++	struct nfs4_shareowner *sp;
+ 	struct rpc_message msg = {
+ 		.rpc_proc	= &nfs4_procedures[NFSPROC4_CLNT_WRITE],
+-		.rpc_argp	= &arg,
+-		.rpc_resp	= &res,
+-		.rpc_cred	= cred,
++		.rpc_argp	= &wdata->args,
++		.rpc_resp	= &wdata->res,
++		.rpc_cred	= wdata->cred,
++	};
++	int status;
++
++	dprintk("NFS call  write %d @ %Ld\n", wdata->args.count,
++			(long long) wdata->args.offset);
++
++	/*
++	 * Try first to use O_WRONLY, then O_RDWR stateid.
++	 */
++	sp = nfs4_get_inode_share(inode, O_WRONLY);
++	if (!sp)
++		sp = nfs4_get_inode_share(inode, O_RDWR);
++
++	if (sp)
++		memcpy(stateid, sp->so_stateid, sizeof(nfs4_stateid));
++	else
++		memcpy(stateid, zero_stateid, sizeof(nfs4_stateid));
++
++	fattr->valid = 0;
++	status = rpc_call_sync(server->client, &msg, rpcflags);
++	dprintk("NFS reply write: %d\n", status);
++	return status;
++}
++
++static int
++nfs4_proc_commit(struct nfs_write_data *cdata)
++{
++	struct inode *inode = cdata->inode;
++	struct nfs_fattr *fattr = cdata->res.fattr;
++	nfs4_stateid *stateid = &cdata->args.stateid;
++	struct nfs_server *server = NFS_SERVER(inode);
++	struct nfs4_shareowner *sp;
++	struct rpc_message msg = {
++		.rpc_proc	= &nfs4_procedures[NFSPROC4_CLNT_COMMIT],
++		.rpc_argp	= &cdata->args,
++		.rpc_resp	= &cdata->res,
++		.rpc_cred	= cdata->cred,
+ 	};
+-	int			rpcflags = (flags & NFS_RW_SWAP) ? NFS_RPC_SWAPFLAGS : 0;
++	int status;
+ 
+-	dprintk("NFS call  write %d @ %Ld\n", count, (long long)offset);
++	dprintk("NFS call  commit %d @ %Ld\n", cdata->args.count,
++			(long long) cdata->args.offset);
+ 
+ 	/*
+-	* Try first to use O_WRONLY, then O_RDWR stateid.
+-	*/
++	 * Try first to use O_WRONLY, then O_RDWR stateid.
++	 */
+ 	sp = nfs4_get_inode_share(inode, O_WRONLY);
+ 	if (!sp)
+ 		sp = nfs4_get_inode_share(inode, O_RDWR);
+ 
+ 	if (sp)
+-		memcpy(arg.stateid,sp->so_stateid, sizeof(nfs4_stateid));
++		memcpy(stateid, sp->so_stateid, sizeof(nfs4_stateid));
+ 	else
+-		memcpy(arg.stateid, zero_stateid, sizeof(nfs4_stateid));
++		memcpy(stateid, zero_stateid, sizeof(nfs4_stateid));
+ 
+ 	fattr->valid = 0;
+-	return rpc_call_sync(server->client, &msg, rpcflags);
++	status = rpc_call_sync(server->client, &msg, 0);
++	dprintk("NFS reply commit: %d\n", status);
++	return status;
+ }
+ 
+ /*
+@@ -1752,7 +1769,7 @@ struct nfs_rpc_ops	nfs_v4_clientops = {
+ 	.readlink	= nfs4_proc_readlink,
+ 	.read		= nfs4_proc_read,
+ 	.write		= nfs4_proc_write,
+-	.commit		= NULL,
++	.commit		= nfs4_proc_commit,
+ 	.create		= nfs4_proc_create,
+ 	.remove		= nfs4_proc_remove,
+ 	.unlink_setup	= nfs4_proc_unlink_setup,
+--- linux-2.6.0-test6/fs/nfs/pagelist.c	2003-06-26 22:07:25.000000000 -0700
++++ 25/fs/nfs/pagelist.c	2003-10-05 00:36:43.000000000 -0700
+@@ -154,26 +154,6 @@ nfs_release_request(struct nfs_page *req
+ }
+ 
+ /**
+- * nfs_release_list - cleanly dispose of an unattached list of page requests
+- * @list: list of doomed page requests
+- */
+-void
+-nfs_release_list(struct list_head *list)
+-{
+-	while (!list_empty(list)) {
+-		struct nfs_page *req = nfs_list_entry(list);
+-
+-		nfs_list_remove_request(req);
+-
+-		page_cache_release(req->wb_page);
+-
+-		/* Release struct file or cached credential */
+-		nfs_clear_request(req);
+-		nfs_page_free(req);
+-	}
+-}
+-
+-/**
+  * nfs_list_add_request - Insert a request into a sorted list
+  * @req: request
+  * @head: head of list into which to insert the request.
+@@ -222,37 +202,6 @@ nfs_wait_on_request(struct nfs_page *req
+ }
+ 
+ /**
+- * nfs_wait_for_reads - wait for outstanding requests to complete
+- * @head: list of page requests to wait for
+- */
+-int
+-nfs_wait_for_reads(struct list_head *head)
+-{
+-	struct list_head *p = head->next;
+-	unsigned int res = 0;
+-
+-	while (p != head) {
+-		struct nfs_page *req = nfs_list_entry(p);
+-		int error;
+-
+-		if (!NFS_WBACK_BUSY(req))
+-			continue;
+-
+-		req->wb_count++;
+-		error = nfs_wait_on_request(req);
+-		if (error < 0)
+-			return error;
+-		nfs_list_remove_request(req);
+-		nfs_clear_request(req);
+-		nfs_page_free(req);
+-
+-		p = head->next;
+-		res++;
+-	}
+-	return res;
+-}
+-
+-/**
+  * nfs_coalesce_requests - Split coalesced requests out from a list.
+  * @head: source list
+  * @dst: destination list
+--- linux-2.6.0-test6/fs/nfs/proc.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/nfs/proc.c	2003-10-05 00:36:44.000000000 -0700
+@@ -149,82 +149,62 @@ nfs_proc_readlink(struct inode *inode, s
+ }
+ 
+ static int
+-nfs_proc_read(struct inode *inode, struct rpc_cred *cred,
+-	      struct nfs_fattr *fattr, int flags,
+-	      unsigned int base, unsigned int count, struct page *page,
+-	      int *eofp)
+-{
+-	u64			offset = page_offset(page) + base;
+-	struct nfs_readargs	arg = {
+-		.fh		= NFS_FH(inode),
+-		.offset		= offset,
+-		.count		= count,
+-		.pgbase		= base,
+-		.pages		= &page
+-	};
+-	struct nfs_readres	res = {
+-		.fattr		= fattr,
+-		.count		= count
+-	};
++nfs_proc_read(struct nfs_read_data *rdata)
++{
++	int			flags = rdata->flags;
++	struct inode *		inode = rdata->inode;
++	struct nfs_fattr *	fattr = rdata->res.fattr;
+ 	struct rpc_message	msg = {
+ 		.rpc_proc	= &nfs_procedures[NFSPROC_READ],
+-		.rpc_argp	= &arg,
+-		.rpc_resp	= &res,
+-		.rpc_cred	= cred
++		.rpc_argp	= &rdata->args,
++		.rpc_resp	= &rdata->res,
++		.rpc_cred	= rdata->cred,
+ 	};
+ 	int			status;
+ 
+-	dprintk("NFS call  read %d @ %Ld\n", count, (long long)offset);
++	dprintk("NFS call  read %d @ %Ld\n", rdata->args.count,
++			(long long) rdata->args.offset);
+ 	fattr->valid = 0;
+ 	status = rpc_call_sync(NFS_CLIENT(inode), &msg, flags);
+-
+-	if (status >= 0)
++	if (status >= 0) {
+ 		nfs_refresh_inode(inode, fattr);
++		/* NFSv2 reads don't return an eof flag, so we make
++		 * up a value here.  XDR has already set eof to 0. */
++		if (status < rdata->args.count)
++			rdata->res.eof = 1;
++	}
+ 	dprintk("NFS reply read: %d\n", status);
+-	*eofp = res.eof;
+ 	return status;
+ }
+ 
+ static int
+-nfs_proc_write(struct inode *inode, struct rpc_cred *cred,
+-	       struct nfs_fattr *fattr, int how,
+-	       unsigned int base, unsigned int count,
+-	       struct page *page, struct nfs_writeverf *verf)
++nfs_proc_write(struct nfs_write_data *wdata)
+ {
+-	u64			offset = page_offset(page) + base;
+-	struct nfs_writeargs	arg = {
+-		.fh		= NFS_FH(inode),
+-		.offset		= offset,
+-		.count		= count,
+-		.stable		= NFS_FILE_SYNC,
+-		.pgbase		= base,
+-		.pages		= &page
+-	};
+-	struct nfs_writeres     res = {
+-		.fattr		= fattr,
+-		.verf		= verf,
+-		.count		= count
+-	};
++	int			flags = wdata->flags;
++	struct inode *		inode = wdata->inode;
++	struct nfs_fattr *	fattr = wdata->res.fattr;
+ 	struct rpc_message	msg = {
+ 		.rpc_proc	= &nfs_procedures[NFSPROC_WRITE],
+-		.rpc_argp	= &arg,
+-		.rpc_resp	= &res,
+-		.rpc_cred	= cred
++		.rpc_argp	= &wdata->args,
++		.rpc_resp	= &wdata->res,
++		.rpc_cred	= wdata->cred
+ 	};
+-	int			status, flags = 0;
++	int			status;
+ 
+-	dprintk("NFS call  write %d @ %Ld\n", count, (long long)offset);
++	dprintk("NFS call  write %d @ %Ld\n", wdata->args.count,
++			(long long) wdata->args.offset);
+ 	fattr->valid = 0;
+-	if (how & NFS_RW_SWAP)
+-		flags |= NFS_RPC_SWAPFLAGS;
+ 	status = rpc_call_sync(NFS_CLIENT(inode), &msg, flags);
+-
+-	if (status >= 0)
++	if (status >= 0) {
+ 		nfs_write_refresh_inode(inode, fattr);
+-
++		/* NFSv2 writes don't return a byte count or write
++		 * verifier, so we make up values here.  Note that
++		 * v2 writes are always NFS_FILE_SYNC writes. */
++		wdata->res.count = wdata->args.count;
++		wdata->verf.committed = NFS_FILE_SYNC;
++	}
+ 	dprintk("NFS reply write: %d\n", status);
+-	verf->committed = NFS_FILE_SYNC;      /* NFSv2 always syncs data */
+-	return status < 0? status : count;
++	return status < 0? status : wdata->res.count;
+ }
+ 
+ static int
+--- linux-2.6.0-test6/fs/nfs/read.c	2003-06-26 22:07:25.000000000 -0700
++++ 25/fs/nfs/read.c	2003-10-05 00:36:44.000000000 -0700
+@@ -69,19 +69,28 @@ void nfs_readdata_release(struct rpc_tas
+ static int
+ nfs_readpage_sync(struct file *file, struct inode *inode, struct page *page)
+ {
+-	struct rpc_cred	*cred = NULL;
+-	struct nfs_fattr fattr;
+-	unsigned int	offset = 0;
+ 	unsigned int	rsize = NFS_SERVER(inode)->rsize;
+ 	unsigned int	count = PAGE_CACHE_SIZE;
+ 	int		result;
+-	int		flags = IS_SWAPFILE(inode)? NFS_RPC_SWAPFLAGS : 0;
+-	int		eof;
++	struct nfs_read_data	rdata = {
++		.flags		= (IS_SWAPFILE(inode)? NFS_RPC_SWAPFLAGS : 0),
++		.cred		= NULL,
++		.inode		= inode,
++		.args		= {
++			.fh		= NFS_FH(inode),
++			.pages		= &page,
++			.pgbase		= 0UL,
++			.count		= rsize,
++		},
++		.res		= {
++			.fattr		= &rdata.fattr,
++		}
++	};
+ 
+ 	dprintk("NFS: nfs_readpage_sync(%p)\n", page);
+ 
+ 	if (file)
+-		cred = nfs_file_cred(file);
++		rdata.cred = nfs_file_cred(file);
+ 
+ 	/*
+ 	 * This works now because the socket layer never tries to DMA
+@@ -89,17 +98,19 @@ nfs_readpage_sync(struct file *file, str
+ 	 */
+ 	do {
+ 		if (count < rsize)
+-			rsize = count;
++			rdata.args.count = count;
++		rdata.res.count = rdata.args.count;
++		rdata.args.offset = page_offset(page) + rdata.args.pgbase;
+ 
+ 		dprintk("NFS: nfs_proc_read(%s, (%s/%Ld), %Lu, %u)\n",
+ 			NFS_SERVER(inode)->hostname,
+ 			inode->i_sb->s_id,
+ 			(long long)NFS_FILEID(inode),
+-			(unsigned long long)offset, rsize);
++			(unsigned long long)rdata.args.pgbase,
++			rdata.args.count);
+ 
+ 		lock_kernel();
+-		result = NFS_PROTO(inode)->read(inode, cred, &fattr, flags,
+-						offset, rsize, page, &eof);
++		result = NFS_PROTO(inode)->read(&rdata);
+ 		unlock_kernel();
+ 
+ 		/*
+@@ -111,14 +122,15 @@ nfs_readpage_sync(struct file *file, str
+ 				result = -EINVAL;
+ 			goto io_error;
+ 		}
+-		count  -= result;
+-		offset += result;
+-		if (result < rsize)	/* NFSv2ism */
++		count -= result;
++		rdata.args.pgbase += result;
++
++		if (rdata.res.eof)
+ 			break;
+ 	} while (count);
+ 
+ 	if (count)
+-		memclear_highpage_flush(page, offset, count);
++		memclear_highpage_flush(page, rdata.args.pgbase, count);
+ 	SetPageUptodate(page);
+ 	if (PageError(page))
+ 		ClearPageError(page);
+--- linux-2.6.0-test6/fs/nfs/write.c	2003-08-22 19:23:42.000000000 -0700
++++ 25/fs/nfs/write.c	2003-10-05 00:36:44.000000000 -0700
+@@ -132,66 +132,73 @@ static int
+ nfs_writepage_sync(struct file *file, struct inode *inode, struct page *page,
+ 		   unsigned int offset, unsigned int count)
+ {
+-	struct rpc_cred	*cred = NULL;
+-	loff_t		base;
+ 	unsigned int	wsize = NFS_SERVER(inode)->wsize;
+-	int		result, refresh = 0, written = 0, flags;
+-	u8		*buffer;
+-	struct nfs_fattr fattr;
+-	struct nfs_writeverf verf;
+-
++	int		result, written = 0;
++	int		swapfile = IS_SWAPFILE(inode);
++	struct nfs_write_data	wdata = {
++		.flags		= swapfile ? NFS_RPC_SWAPFLAGS : 0,
++		.cred		= NULL,
++		.inode		= inode,
++		.args		= {
++			.fh		= NFS_FH(inode),
++			.pages		= &page,
++			.stable		= NFS_FILE_SYNC,
++			.pgbase		= offset,
++			.count		= wsize,
++		},
++		.res		= {
++			.fattr		= &wdata.fattr,
++			.verf		= &wdata.verf,
++		},
++	};
+ 
+ 	if (file)
+-		cred = get_rpccred(nfs_file_cred(file));
+-	if (!cred)
+-		cred = get_rpccred(NFS_I(inode)->mm_cred);
++		wdata.cred = get_rpccred(nfs_file_cred(file));
++	if (!wdata.cred)
++		wdata.cred = get_rpccred(NFS_I(inode)->mm_cred);
+ 
+ 	dprintk("NFS:      nfs_writepage_sync(%s/%Ld %d@%Ld)\n",
+ 		inode->i_sb->s_id,
+ 		(long long)NFS_FILEID(inode),
+ 		count, (long long)(page_offset(page) + offset));
+ 
+-	base = page_offset(page) + offset;
+-
+-	flags = ((IS_SWAPFILE(inode)) ? NFS_RW_SWAP : 0) | NFS_RW_SYNC;
+-
+ 	do {
+-		if (count < wsize && !IS_SWAPFILE(inode))
+-			wsize = count;
++		if (count < wsize && !swapfile)
++			wdata.args.count = count;
++		wdata.args.offset = page_offset(page) + wdata.args.pgbase;
+ 
+-		result = NFS_PROTO(inode)->write(inode, cred, &fattr, flags,
+-						 offset, wsize, page, &verf);
++		result = NFS_PROTO(inode)->write(&wdata);
+ 
+ 		if (result < 0) {
+ 			/* Must mark the page invalid after I/O error */
+ 			ClearPageUptodate(page);
+ 			goto io_error;
+ 		}
+-		if (result != wsize)
+-			printk("NFS: short write, wsize=%u, result=%d\n",
+-			wsize, result);
+-		refresh = 1;
+-		buffer  += wsize;
+-		base    += wsize;
+-	        offset  += wsize;
+-		written += wsize;
+-		count   -= wsize;
++		if (result < wdata.args.count)
++			printk(KERN_WARNING "NFS: short write, count=%u, result=%d\n",
++					wdata.args.count, result);
++
++		wdata.args.offset += result;
++	        wdata.args.pgbase += result;
++		written += result;
++		count -= result;
++
+ 		/*
+ 		 * If we've extended the file, update the inode
+ 		 * now so we don't invalidate the cache.
+ 		 */
+-		if (base > i_size_read(inode))
+-			i_size_write(inode, base);
++		if (wdata.args.offset > i_size_read(inode))
++			i_size_write(inode, wdata.args.offset);
+ 	} while (count);
+ 
+ 	if (PageError(page))
+ 		ClearPageError(page);
+ 
+ io_error:
+-	if (cred)
+-		put_rpccred(cred);
++	if (wdata.cred)
++		put_rpccred(wdata.cred);
+ 
+-	return written? written : result;
++	return written ? written : result;
+ }
+ 
+ static int
+--- linux-2.6.0-test6/fs/open.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/open.c	2003-10-05 00:36:52.000000000 -0700
+@@ -190,7 +190,9 @@ int do_truncate(struct dentry *dentry, l
+ 	newattrs.ia_size = length;
+ 	newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
+ 	down(&dentry->d_inode->i_sem);
++	down_write(&dentry->d_inode->i_alloc_sem);
+ 	err = notify_change(dentry, &newattrs);
++	up_write(&dentry->d_inode->i_alloc_sem);
+ 	up(&dentry->d_inode->i_sem);
+ 	return err;
+ }
+@@ -772,7 +774,8 @@ struct file *dentry_open(struct dentry *
+ 			goto cleanup_file;
+ 	}
+ 
+-	file_ra_state_init(&f->f_ra, inode->i_mapping);
++	f->f_mapping = inode->i_mapping;
++	file_ra_state_init(&f->f_ra, f->f_mapping);
+ 	f->f_dentry = dentry;
+ 	f->f_vfsmnt = mnt;
+ 	f->f_pos = 0;
+@@ -788,8 +791,8 @@ struct file *dentry_open(struct dentry *
+ 
+ 	/* NB: we're sure to have correct a_ops only after f_op->open */
+ 	if (f->f_flags & O_DIRECT) {
+-		if (!inode->i_mapping || !inode->i_mapping->a_ops ||
+-			!inode->i_mapping->a_ops->direct_IO) {
++		if (!f->f_mapping || !f->f_mapping->a_ops ||
++			!f->f_mapping->a_ops->direct_IO) {
+ 				fput(f);
+ 				f = ERR_PTR(-EINVAL);
+ 		}
+@@ -1019,7 +1022,7 @@ out_unlock:
+ asmlinkage long sys_vhangup(void)
+ {
+ 	if (capable(CAP_SYS_TTY_CONFIG)) {
+-		tty_vhangup(current->tty);
++		tty_vhangup(process_tty(current));
+ 		return 0;
+ 	}
+ 	return -EPERM;
+--- linux-2.6.0-test6/fs/pipe.c	2003-08-22 19:23:42.000000000 -0700
++++ 25/fs/pipe.c	2003-10-05 00:34:03.000000000 -0700
+@@ -580,6 +580,7 @@ int do_pipe(int *fd)
+ 	d_add(dentry, inode);
+ 	f1->f_vfsmnt = f2->f_vfsmnt = mntget(mntget(pipe_mnt));
+ 	f1->f_dentry = f2->f_dentry = dget(dentry);
++	f1->f_mapping = f2->f_mapping = inode->i_mapping;
+ 
+ 	/* read file */
+ 	f1->f_pos = f2->f_pos = 0;
+--- linux-2.6.0-test6/fs/proc/array.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/proc/array.c	2003-10-05 00:36:15.000000000 -0700
+@@ -304,9 +304,9 @@ int proc_pid_stat(struct task_struct *ta
+ 	mm = task->mm;
+ 	if(mm)
+ 		mm = mmgrab(mm);
+-	if (task->tty) {
+-		tty_pgrp = task->tty->pgrp;
+-		tty_nr = new_encode_dev(tty_devnum(task->tty));
++	if (process_tty(task)) {
++		tty_pgrp = process_tty(task)->pgrp;
++		tty_nr = new_encode_dev(tty_devnum(process_tty(task)));
+ 	}
+ 	task_unlock(task);
+ 	if (mm) {
+@@ -345,7 +345,7 @@ int proc_pid_stat(struct task_struct *ta
+ 		state,
+ 		ppid,
+ 		process_group(task),
+-		task->session,
++		process_session(task),
+ 		tty_nr,
+ 		tty_pgrp,
+ 		task->flags,
+--- linux-2.6.0-test6/fs/proc/base.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/proc/base.c	2003-10-05 00:36:09.000000000 -0700
+@@ -53,6 +53,7 @@ enum pid_directory_inos {
+ 	PROC_TGID_EXE,
+ 	PROC_TGID_FD,
+ 	PROC_TGID_ENVIRON,
++	PROC_TGID_AUXV,
+ 	PROC_TGID_CMDLINE,
+ 	PROC_TGID_STAT,
+ 	PROC_TGID_STATM,
+@@ -75,6 +76,7 @@ enum pid_directory_inos {
+ 	PROC_TID_EXE,
+ 	PROC_TID_FD,
+ 	PROC_TID_ENVIRON,
++	PROC_TID_AUXV,
+ 	PROC_TID_CMDLINE,
+ 	PROC_TID_STAT,
+ 	PROC_TID_STATM,
+@@ -104,6 +106,7 @@ static struct pid_entry tgid_base_stuff[
+ 	E(PROC_TGID_TASK,      "task",    S_IFDIR|S_IRUGO|S_IXUGO),
+ 	E(PROC_TGID_FD,        "fd",      S_IFDIR|S_IRUSR|S_IXUSR),
+ 	E(PROC_TGID_ENVIRON,   "environ", S_IFREG|S_IRUSR),
++	E(PROC_TGID_AUXV,      "auxv",	  S_IFREG|S_IRUSR),
+ 	E(PROC_TGID_STATUS,    "status",  S_IFREG|S_IRUGO),
+ 	E(PROC_TGID_CMDLINE,   "cmdline", S_IFREG|S_IRUGO),
+ 	E(PROC_TGID_STAT,      "stat",    S_IFREG|S_IRUGO),
+@@ -125,6 +128,7 @@ static struct pid_entry tgid_base_stuff[
+ static struct pid_entry tid_base_stuff[] = {
+ 	E(PROC_TID_FD,         "fd",      S_IFDIR|S_IRUSR|S_IXUSR),
+ 	E(PROC_TID_ENVIRON,    "environ", S_IFREG|S_IRUSR),
++	E(PROC_TID_AUXV,       "auxv",	  S_IFREG|S_IRUSR),
+ 	E(PROC_TID_STATUS,     "status",  S_IFREG|S_IRUGO),
+ 	E(PROC_TID_CMDLINE,    "cmdline", S_IFREG|S_IRUGO),
+ 	E(PROC_TID_STAT,       "stat",    S_IFREG|S_IRUGO),
+@@ -322,6 +326,25 @@ out:
+ 	return res;
+ }
+ 
++static int proc_pid_auxv(struct task_struct *task, char *buffer)
++{
++	int res = 0;
++	struct mm_struct *mm = get_task_mm(task);
++	if (mm) {
++		unsigned int nwords = 0;
++		do
++			nwords += 2;
++		while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
++		res = nwords * sizeof(mm->saved_auxv[0]);
++		if (res > PAGE_SIZE)
++			res = PAGE_SIZE;
++		memcpy(buffer, mm->saved_auxv, res);
++		mmput(mm);
++	}
++	return res;
++}
++
++
+ #ifdef CONFIG_KALLSYMS
+ /*
+  * Provides a wchan file via kallsyms in a proper one-value-per-file format.
+@@ -1271,6 +1294,11 @@ static struct dentry *proc_pident_lookup
+ 			inode->i_fop = &proc_info_file_operations;
+ 			ei->op.proc_read = proc_pid_environ;
+ 			break;
++		case PROC_TID_AUXV:
++		case PROC_TGID_AUXV:
++			inode->i_fop = &proc_info_file_operations;
++			ei->op.proc_read = proc_pid_auxv;
++			break;
+ 		case PROC_TID_STATUS:
+ 		case PROC_TGID_STATUS:
+ 			inode->i_fop = &proc_info_file_operations;
+--- linux-2.6.0-test6/fs/proc/inode.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/proc/inode.c	2003-10-05 00:33:24.000000000 -0700
+@@ -14,6 +14,7 @@
+ #include <linux/limits.h>
+ #include <linux/init.h>
+ #include <linux/module.h>
++#include <linux/parser.h>
+ #include <linux/smp_lock.h>
+ 
+ #include <asm/system.h>
+@@ -135,34 +136,47 @@ static struct super_operations proc_sops
+ 	.statfs		= simple_statfs,
+ };
+ 
++enum {
++	Opt_uid, Opt_gid, Opt_err
++};
++
++static match_table_t tokens = {
++	{Opt_uid, "uid=%u"},
++	{Opt_gid, "gid=%u"},
++	{Opt_err, NULL}
++};
++
+ static int parse_options(char *options,uid_t *uid,gid_t *gid)
+ {
+-	char *this_char,*value;
++	char *p;
++	int option;
+ 
+ 	*uid = current->uid;
+ 	*gid = current->gid;
+ 	if (!options)
+ 		return 1;
+-	while ((this_char = strsep(&options,",")) != NULL) {
+-		if (!*this_char)
++
++	while ((p = strsep(&options, ",")) != NULL) {
++		substring_t args[MAX_OPT_ARGS];
++		int token;
++		if (!*p)
+ 			continue;
+-		if ((value = strchr(this_char,'=')) != NULL)
+-			*value++ = 0;
+-		if (!strcmp(this_char,"uid")) {
+-			if (!value || !*value)
+-				return 0;
+-			*uid = simple_strtoul(value,&value,0);
+-			if (*value)
+-				return 0;
+-		}
+-		else if (!strcmp(this_char,"gid")) {
+-			if (!value || !*value)
++
++		token = match_token(p, tokens, args);
++		switch (token) {
++		case Opt_uid:
++			if (match_int(args, &option))
+ 				return 0;
+-			*gid = simple_strtoul(value,&value,0);
+-			if (*value)
++			*uid = option;
++			break;
++		case Opt_gid:
++			if (match_int(args, &option))
+ 				return 0;
++			*gid = option;
++			break;
++		default:
++			return 0;
+ 		}
+-		else return 1;
+ 	}
+ 	return 1;
+ }
+--- linux-2.6.0-test6/fs/proc/proc_misc.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/proc/proc_misc.c	2003-10-05 00:36:40.000000000 -0700
+@@ -638,6 +638,36 @@ static void create_seq_entry(char *name,
+ 		entry->proc_fops = f;
+ }
+ 
++#ifdef CONFIG_LOCKMETER
++extern ssize_t get_lockmeter_info(char *, size_t, loff_t *);
++extern ssize_t put_lockmeter_info(const char *, size_t);
++extern int get_lockmeter_info_size(void);
++
++/*
++ * This function accesses lock metering information.
++ */
++static ssize_t read_lockmeter(struct file *file, char *buf,
++			      size_t count, loff_t *ppos)
++{
++	return get_lockmeter_info(buf, count, ppos);
++}
++
++/*
++ * Writing to /proc/lockmeter resets the counters
++ */
++static ssize_t write_lockmeter(struct file * file, const char * buf,
++			       size_t count, loff_t *ppos)
++{
++	return put_lockmeter_info(buf, count);
++}
++
++static struct file_operations proc_lockmeter_operations = {
++	NULL,           /* lseek */
++	read:		read_lockmeter,
++	write:		write_lockmeter,
++};
++#endif  /* CONFIG_LOCKMETER */
++
+ void __init proc_misc_init(void)
+ {
+ 	struct proc_dir_entry *entry;
+@@ -705,6 +735,13 @@ void __init proc_misc_init(void)
+ 	if (entry)
+ 		entry->proc_fops = &proc_sysrq_trigger_operations;
+ #endif
++#ifdef CONFIG_LOCKMETER
++	entry = create_proc_entry("lockmeter", S_IWUSR | S_IRUGO, NULL);
++	if (entry) {
++		entry->proc_fops = &proc_lockmeter_operations;
++		entry->size = get_lockmeter_info_size();
++	}
++#endif
+ #ifdef CONFIG_PPC32
+ 	{
+ 		extern struct file_operations ppc_htab_operations;
+--- linux-2.6.0-test6/fs/read_write.c	2003-07-13 21:44:35.000000000 -0700
++++ 25/fs/read_write.c	2003-10-05 00:34:07.000000000 -0700
+@@ -26,7 +26,7 @@ struct file_operations generic_ro_fops =
+ loff_t generic_file_llseek(struct file *file, loff_t offset, int origin)
+ {
+ 	long long retval;
+-	struct inode *inode = file->f_dentry->d_inode->i_mapping->host;
++	struct inode *inode = file->f_mapping->host;
+ 
+ 	down(&inode->i_sem);
+ 	switch (origin) {
+--- linux-2.6.0-test6/fs/reiserfs/file.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/reiserfs/file.c	2003-10-05 00:34:11.000000000 -0700
+@@ -1052,7 +1052,7 @@ ssize_t reiserfs_file_write( struct file
+     /* Check if we can write to specified region of file, file
+        is not overly big and this kind of stuff. Adjust pos and
+        count, if needed */
+-    res = generic_write_checks(inode, file, &pos, &count, 0);
++    res = generic_write_checks(file, &pos, &count, 0);
+     if (res)
+ 	goto out;
+ 
+@@ -1179,7 +1179,7 @@ ssize_t reiserfs_file_write( struct file
+     }
+ 
+     if ((file->f_flags & O_SYNC) || IS_SYNC(inode))
+-	res = generic_osync_inode(inode, OSYNC_METADATA|OSYNC_DATA);
++	res = generic_osync_inode(inode, file->f_mapping, OSYNC_METADATA|OSYNC_DATA);
+ 
+     up(&inode->i_sem);
+     return (already_written != 0)?already_written:res;
+--- linux-2.6.0-test6/fs/reiserfs/inode.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/reiserfs/inode.c	2003-10-05 00:34:07.000000000 -0700
+@@ -2375,7 +2375,7 @@ static int reiserfs_direct_IO(int rw, st
+ 			      loff_t offset, unsigned long nr_segs)
+ {
+     struct file *file = iocb->ki_filp;
+-    struct inode *inode = file->f_dentry->d_inode->i_mapping->host;
++    struct inode *inode = file->f_mapping->host;
+ 
+     return blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev, iov,
+ 			      offset, nr_segs, reiserfs_get_blocks_direct_io, NULL);
+--- linux-2.6.0-test6/fs/reiserfs/journal.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/reiserfs/journal.c	2003-10-05 00:34:11.000000000 -0700
+@@ -1937,18 +1937,13 @@ static int journal_init_dev( struct supe
+ 
+ 	journal -> j_dev_file = filp_open( jdev_name, 0, 0 );
+ 	if( !IS_ERR( journal -> j_dev_file ) ) {
+-		struct inode *jdev_inode;
+-
+-		jdev_inode = journal -> j_dev_file -> f_dentry -> d_inode;
+-		journal -> j_dev_bd = jdev_inode -> i_bdev;
++		struct inode *jdev_inode = journal->j_dev_file->f_mapping->host;
+ 		if( !S_ISBLK( jdev_inode -> i_mode ) ) {
+ 			printk( "journal_init_dev: '%s' is not a block device\n", jdev_name );
+ 			result = -ENOTBLK;
+-		} else if( jdev_inode -> i_bdev == NULL ) {
+-			printk( "journal_init_dev: bdev uninitialized for '%s'\n", jdev_name );
+-			result = -ENOMEM;
+ 		} else  {
+ 			/* ok */
++			journal->j_dev_bd = I_BDEV(jdev_inode);
+ 			set_blocksize(journal->j_dev_bd, super->s_blocksize);
+ 		}
+ 	} else {
+--- linux-2.6.0-test6/fs/seq_file.c	2003-06-14 12:18:28.000000000 -0700
++++ 25/fs/seq_file.c	2003-10-05 00:33:24.000000000 -0700
+@@ -6,6 +6,7 @@
+  */
+ 
+ #include <linux/fs.h>
++#include <linux/module.h>
+ #include <linux/seq_file.h>
+ #include <linux/slab.h>
+ 
+@@ -37,6 +38,8 @@ int seq_open(struct file *file, struct s
+ 	return 0;
+ }
+ 
++EXPORT_SYMBOL(seq_open);
++
+ /**
+  *	seq_read -	->read() method for sequential files.
+  *	@file, @buf, @size, @ppos: see file_operations method
+@@ -144,6 +147,8 @@ Efault:
+ 	goto Done;
+ }
+ 
++EXPORT_SYMBOL(seq_read);
++
+ static int traverse(struct seq_file *m, loff_t offset)
+ {
+ 	loff_t pos = 0;
+@@ -228,6 +233,8 @@ loff_t seq_lseek(struct file *file, loff
+ 	return retval;
+ }
+ 
++EXPORT_SYMBOL(seq_lseek);
++
+ /**
+  *	seq_release -	free the structures associated with sequential file.
+  *	@file: file in question
+@@ -244,6 +251,8 @@ int seq_release(struct inode *inode, str
+ 	return 0;
+ }
+ 
++EXPORT_SYMBOL(seq_release);
++
+ /**
+  *	seq_escape -	print string into buffer, escaping some characters
+  *	@m:	target buffer
+@@ -279,6 +288,8 @@ int seq_escape(struct seq_file *m, const
+         return 0;
+ }
+ 
++EXPORT_SYMBOL(seq_escape);
++
+ int seq_printf(struct seq_file *m, const char *f, ...)
+ {
+ 	va_list args;
+@@ -297,9 +308,11 @@ int seq_printf(struct seq_file *m, const
+ 	return -1;
+ }
+ 
++EXPORT_SYMBOL(seq_printf);
++
+ int seq_path(struct seq_file *m,
+-		struct vfsmount *mnt, struct dentry *dentry,
+-		char *esc)
++	     struct vfsmount *mnt, struct dentry *dentry,
++	     char *esc)
+ {
+ 	if (m->count < m->size) {
+ 		char *s = m->buf + m->count;
+@@ -328,6 +341,8 @@ int seq_path(struct seq_file *m,
+ 	return -1;
+ }
+ 
++EXPORT_SYMBOL(seq_path);
++
+ static void *single_start(struct seq_file *p, loff_t *pos)
+ {
+ 	return NULL + (*pos == 0);
+@@ -343,7 +358,8 @@ static void single_stop(struct seq_file 
+ {
+ }
+ 
+-int single_open(struct file *file, int (*show)(struct seq_file *, void*), void *data)
++int single_open(struct file *file, int (*show)(struct seq_file *, void *),
++		void *data)
+ {
+ 	struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
+ 	int res = -ENOMEM;
+@@ -362,6 +378,8 @@ int single_open(struct file *file, int (
+ 	return res;
+ }
+ 
++EXPORT_SYMBOL(single_open);
++
+ int single_release(struct inode *inode, struct file *file)
+ {
+ 	struct seq_operations *op = ((struct seq_file *)file->private_data)->op;
+@@ -370,6 +388,8 @@ int single_release(struct inode *inode, 
+ 	return res;
+ }
+ 
++EXPORT_SYMBOL(single_release);
++
+ int seq_release_private(struct inode *inode, struct file *file)
+ {
+ 	struct seq_file *seq = file->private_data;
+@@ -379,3 +399,4 @@ int seq_release_private(struct inode *in
+ 	return seq_release(inode, file);
+ }
+ 
++EXPORT_SYMBOL(seq_release_private);
+--- linux-2.6.0-test6/fs/smbfs/inode.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/smbfs/inode.c	2003-10-05 00:33:24.000000000 -0700
+@@ -551,8 +551,8 @@ int smb_fill_super(struct super_block *s
+ 	if (ver == SMB_MOUNT_OLDVERSION) {
+ 		mnt->version = oldmnt->version;
+ 
+-		mnt->uid = low2highuid(oldmnt->uid);
+-		mnt->gid = low2highuid(oldmnt->gid);
++		mnt->uid = OLD_TO_NEW_UID(oldmnt->uid);
++		mnt->gid = OLD_TO_NEW_GID(oldmnt->gid);
+ 
+ 		mnt->file_mode = (oldmnt->file_mode & S_IRWXUGO) | S_IFREG;
+ 		mnt->dir_mode = (oldmnt->dir_mode & S_IRWXUGO) | S_IFDIR;
+--- linux-2.6.0-test6/fs/super.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/super.c	2003-10-05 00:36:10.000000000 -0700
+@@ -21,6 +21,7 @@
+  */
+ 
+ #include <linux/config.h>
++#include <linux/module.h>
+ #include <linux/slab.h>
+ #include <linux/smp_lock.h>
+ #include <linux/acct.h>
+@@ -134,9 +135,11 @@ void deactivate_super(struct super_block
+ 	}
+ }
+ 
++EXPORT_SYMBOL(deactivate_super);
++
+ /**
+- *	grab_super	- acquire an active reference
+- *	@s	- reference we are trying to make active
++ *	grab_super - acquire an active reference
++ *	@s: reference we are trying to make active
+  *
+  *	Tries to acquire an active reference.  grab_super() is used when we
+  * 	had just found a superblock in super_blocks or fs_type->fs_supers
+@@ -214,6 +217,8 @@ void generic_shutdown_super(struct super
+ 	up_write(&sb->s_umount);
+ }
+ 
++EXPORT_SYMBOL(generic_shutdown_super);
++
+ /**
+  *	sget	-	find or create a superblock
+  *	@type:	filesystem type superblock should belong to
+@@ -226,13 +231,10 @@ struct super_block *sget(struct file_sys
+ 			int (*set)(struct super_block *,void *),
+ 			void *data)
+ {
+-	struct super_block *s = alloc_super();
++	struct super_block *s = NULL;
+ 	struct list_head *p;
+ 	int err;
+ 
+-	if (!s)
+-		return ERR_PTR(-ENOMEM);
+-
+ retry:
+ 	spin_lock(&sb_lock);
+ 	if (test) list_for_each(p, &type->fs_supers) {
+@@ -242,9 +244,18 @@ retry:
+ 			continue;
+ 		if (!grab_super(old))
+ 			goto retry;
+-		destroy_super(s);
++		if (s)
++			destroy_super(s);
+ 		return old;
+ 	}
++	if (!s) {
++		spin_unlock(&sb_lock);
++		s = alloc_super();
++		if (!s)
++			return ERR_PTR(-ENOMEM);
++		goto retry;
++	}
++		
+ 	err = set(s, data);
+ 	if (err) {
+ 		spin_unlock(&sb_lock);
+@@ -259,12 +270,16 @@ retry:
+ 	return s;
+ }
+ 
++EXPORT_SYMBOL(sget);
++
+ void drop_super(struct super_block *sb)
+ {
+ 	up_read(&sb->s_umount);
+ 	put_super(sb);
+ }
+ 
++EXPORT_SYMBOL(drop_super);
++
+ static inline void write_super(struct super_block *sb)
+ {
+ 	lock_super(sb);
+@@ -353,8 +368,8 @@ restart:
+ }
+ 
+ /**
+- *	get_super	-	get the superblock of a device
+- *	@dev: device to get the superblock for
++ *	get_super - get the superblock of a device
++ *	@bdev: device to get the superblock for
+  *	
+  *	Scans the superblock list and finds the superblock of the file system
+  *	mounted on the device given. %NULL is returned if no match is found.
+@@ -382,6 +397,8 @@ rescan:
+ 	spin_unlock(&sb_lock);
+ 	return NULL;
+ }
++
++EXPORT_SYMBOL(get_super);
+  
+ struct super_block * user_get_super(dev_t dev)
+ {
+@@ -405,6 +422,8 @@ rescan:
+ 	return NULL;
+ }
+ 
++EXPORT_SYMBOL(user_get_super);
++
+ asmlinkage long sys_ustat(unsigned dev, struct ustat __user * ubuf)
+ {
+         struct super_block *s;
+@@ -442,10 +461,11 @@ static void mark_files_ro(struct super_b
+ }
+ 
+ /**
+- *	do_remount_sb	-	asks filesystem to change mount options.
++ *	do_remount_sb - asks filesystem to change mount options.
+  *	@sb:	superblock in question
+  *	@flags:	numeric part of options
+  *	@data:	the rest of options
++ *      @force: whether or not to force the change
+  *
+  *	Alters the mount options of a mounted file system.
+  */
+@@ -534,6 +554,8 @@ int set_anon_super(struct super_block *s
+ 	return 0;
+ }
+ 
++EXPORT_SYMBOL(set_anon_super);
++
+ void kill_anon_super(struct super_block *sb)
+ {
+ 	int slot = MINOR(sb->s_dev);
+@@ -543,6 +565,8 @@ void kill_anon_super(struct super_block 
+ 	spin_unlock(&unnamed_dev_lock);
+ }
+ 
++EXPORT_SYMBOL(kill_anon_super);
++
+ void kill_litter_super(struct super_block *sb)
+ {
+ 	if (sb->s_root)
+@@ -550,6 +574,8 @@ void kill_litter_super(struct super_bloc
+ 	kill_anon_super(sb);
+ }
+ 
++EXPORT_SYMBOL(kill_litter_super);
++
+ static int set_bdev_super(struct super_block *s, void *data)
+ {
+ 	s->s_bdev = data;
+@@ -608,6 +634,8 @@ out:
+ 	return s;
+ }
+ 
++EXPORT_SYMBOL(get_sb_bdev);
++
+ void kill_block_super(struct super_block *sb)
+ {
+ 	struct block_device *bdev = sb->s_bdev;
+@@ -616,6 +644,8 @@ void kill_block_super(struct super_block
+ 	close_bdev_excl(bdev, BDEV_FS);
+ }
+ 
++EXPORT_SYMBOL(kill_block_super);
++
+ struct super_block *get_sb_nodev(struct file_system_type *fs_type,
+ 	int flags, void *data,
+ 	int (*fill_super)(struct super_block *, void *, int))
+@@ -638,6 +668,8 @@ struct super_block *get_sb_nodev(struct 
+ 	return s;
+ }
+ 
++EXPORT_SYMBOL(get_sb_nodev);
++
+ static int compare_single(struct super_block *s, void *p)
+ {
+ 	return 1;
+@@ -667,6 +699,8 @@ struct super_block *get_sb_single(struct
+ 	return s;
+ }
+ 
++EXPORT_SYMBOL(get_sb_single);
++
+ struct vfsmount *
+ do_kern_mount(const char *fstype, int flags, const char *name, void *data)
+ {
+@@ -709,3 +743,5 @@ struct vfsmount *kern_mount(struct file_
+ {
+ 	return do_kern_mount(type->name, 0, type->name, NULL);
+ }
++
++EXPORT_SYMBOL(kern_mount);
+--- linux-2.6.0-test6/fs/sysfs/dir.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/sysfs/dir.c	2003-10-05 00:34:36.000000000 -0700
+@@ -82,8 +82,16 @@ static void remove_dir(struct dentry * d
+ {
+ 	struct dentry * parent = dget(d->d_parent);
+ 	down(&parent->d_inode->i_sem);
+-	d_delete(d);
+-	simple_rmdir(parent->d_inode,d);
++	/*
++	 * It is possible that parent has already been removed, in which
++	 * case directory is already unhashed and dput.
++	 * Note that this won't update parent->d_inode->i_nlink; OTOH
++	 * parent should already be dead
++	 */
++	if (!d_unhashed(d)) {
++		d_delete(d);
++		simple_rmdir(parent->d_inode,d);
++	}
+ 
+ 	pr_debug(" o %s removing done (%d)\n",d->d_name.name,
+ 		 atomic_read(&d->d_count));
+--- linux-2.6.0-test6/fs/udf/inode.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/fs/udf/inode.c	2003-10-05 00:33:24.000000000 -0700
+@@ -127,6 +127,7 @@ no_delete:
+ void udf_clear_inode(struct inode *inode)
+ {
+ 	kfree(UDF_I_DATA(inode));
++	UDF_I_DATA(inode) = NULL;
+ }
+ 
+ void udf_discard_prealloc(struct inode * inode)
+--- linux-2.6.0-test6/fs/udf/super.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/fs/udf/super.c	2003-10-05 00:33:24.000000000 -0700
+@@ -50,6 +50,7 @@
+ #include <linux/slab.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
++#include <linux/parser.h>
+ #include <linux/stat.h>
+ #include <linux/cdrom.h>
+ #include <linux/nls.h>
+@@ -132,8 +133,10 @@ static void init_once(void * foo, kmem_c
+ 	struct udf_inode_info *ei = (struct udf_inode_info *) foo;
+ 
+ 	if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
+-	    SLAB_CTOR_CONSTRUCTOR)
++	    SLAB_CTOR_CONSTRUCTOR) {
++		ei->i_ext.i_data = NULL;
+ 		inode_init_once(&ei->vfs_inode);
++	}
+ }
+ 
+ static int init_inodecache(void)
+@@ -225,7 +228,7 @@ module_exit(exit_udf_fs)
+  *	gid=		Set the default group.
+  *	umask=		Set the default umask.
+  *	uid=		Set the default user.
+- *	bs=			Set the block size.
++ *	bs=		Set the block size.
+  *	unhide		Show otherwise hidden files.
+  *	undelete	Show deleted files in lists.
+  *	adinicb		Embed data in the inode (default)
+@@ -259,18 +262,53 @@ module_exit(exit_udf_fs)
+  *	uopts		Pointer to mount options variable.
+  *
+  * POST-CONDITIONS
+- *	<return>	0	Mount options parsed okay.
+- *	<return>	-1	Error parsing mount options.
++ *	<return>	1	Mount options parsed okay.
++ *	<return>	0	Error parsing mount options.
+  *
+  * HISTORY
+  *	July 1, 1997 - Andrew E. Mileski
+  *	Written, tested, and released.
+  */
+ 
++enum {
++	Opt_novrs, Opt_nostrict, Opt_bs, Opt_unhide, Opt_undelete,
++	Opt_noadinicb, Opt_adinicb, Opt_shortad, Opt_longad,
++	Opt_gid, Opt_uid, Opt_umask, Opt_session, Opt_lastblock,
++	Opt_anchor, Opt_volume, Opt_partition, Opt_fileset,
++	Opt_rootdir, Opt_utf8, Opt_iocharset,
++	Opt_err
++};
++
++static match_table_t tokens = {
++	{Opt_novrs, "novrs"},
++	{Opt_nostrict, "nostrict"},
++	{Opt_bs, "bs=%u"},
++	{Opt_unhide, "unhide"},
++	{Opt_undelete, "undelete"},
++	{Opt_noadinicb, "noadinicb"},
++	{Opt_adinicb, "adinicb"},
++	{Opt_shortad, "shortad"},
++	{Opt_longad, "longad"},
++	{Opt_gid, "gid=%u"},
++	{Opt_uid, "uid=%u"},
++	{Opt_umask, "umask=%o"},
++	{Opt_session, "session=%u"},
++	{Opt_lastblock, "lastblock=%u"},
++	{Opt_anchor, "anchor=%u"},
++	{Opt_volume, "volume=%u"},
++	{Opt_partition, "partition=%u"},
++	{Opt_fileset, "fileset=%u"},
++	{Opt_rootdir, "rootdir=%u"},
++	{Opt_utf8, "utf8"},
++	{Opt_iocharset, "iocharset=%s"},
++	{Opt_err, NULL}
++};
++
+ static int
+ udf_parse_options(char *options, struct udf_options *uopt)
+ {
+-	char *opt, *val;
++	char *p;
++	int option;
+ 
+ 	uopt->novrs = 0;
+ 	uopt->blocksize = 2048;
+@@ -286,71 +324,106 @@ udf_parse_options(char *options, struct 
+ 	if (!options)
+ 		return 1;
+ 
+-	while ((opt = strsep(&options, ",")) != NULL)
+-	{
+-		if (!*opt)
++	while ((p = strsep(&options, ",")) != NULL) {
++		substring_t args[MAX_OPT_ARGS];
++		int token;
++		if (!*p)
+ 			continue;
+-		/* Make "opt=val" into two strings */
+-		val = strchr(opt, '=');
+-		if (val)
+-			*(val++) = 0;
+-		if (!strcmp(opt, "novrs") && !val)
++
++		token = match_token(p, tokens, args);
++		switch (token) {
++		case Opt_novrs:
+ 			uopt->novrs = 1;
+-		else if (!strcmp(opt, "bs") && val)
+-			uopt->blocksize = simple_strtoul(val, NULL, 0);
+-		else if (!strcmp(opt, "unhide") && !val)
++			break;
++		case Opt_bs:
++			if (match_int(&args[0], &option))
++				return 0;
++			uopt->blocksize = option;
++			break;
++		case Opt_unhide:
+ 			uopt->flags |= (1 << UDF_FLAG_UNHIDE);
+-		else if (!strcmp(opt, "undelete") && !val)
++			break;
++		case Opt_undelete:
+ 			uopt->flags |= (1 << UDF_FLAG_UNDELETE);
+-		else if (!strcmp(opt, "noadinicb") && !val)
++			break;
++		case Opt_noadinicb:
+ 			uopt->flags &= ~(1 << UDF_FLAG_USE_AD_IN_ICB);
+-		else if (!strcmp(opt, "adinicb") && !val)
++			break;
++		case Opt_adinicb:
+ 			uopt->flags |= (1 << UDF_FLAG_USE_AD_IN_ICB);
+-		else if (!strcmp(opt, "shortad") && !val)
++			break;
++		case Opt_shortad:
+ 			uopt->flags |= (1 << UDF_FLAG_USE_SHORT_AD);
+-		else if (!strcmp(opt, "longad") && !val)
++			break;
++		case Opt_longad:
+ 			uopt->flags &= ~(1 << UDF_FLAG_USE_SHORT_AD);
+-		else if (!strcmp(opt, "gid") && val)
+-			uopt->gid = simple_strtoul(val, NULL, 0);
+-		else if (!strcmp(opt, "umask") && val)
+-			uopt->umask = simple_strtoul(val, NULL, 0);
+-		else if (!strcmp(opt, "nostrict") && !val)
++			break;
++		case Opt_gid:
++			if (match_int(args, &option))
++				return 0;
++			uopt->gid = option;
++			break;
++		case Opt_uid:
++			if (match_int(args, &option))
++				return 0;
++			uopt->uid = option;
++			break;
++		case Opt_umask:
++			if (match_octal(args, &option))
++				return 0;
++			uopt->umask = option;
++			break;
++		case Opt_nostrict:
+ 			uopt->flags &= ~(1 << UDF_FLAG_STRICT);
+-		else if (!strcmp(opt, "uid") && val)
+-			uopt->uid = simple_strtoul(val, NULL, 0);
+-		else if (!strcmp(opt, "session") && val)
+-			uopt->session = simple_strtoul(val, NULL, 0);
+-		else if (!strcmp(opt, "lastblock") && val)
+-			uopt->lastblock = simple_strtoul(val, NULL, 0);
+-		else if (!strcmp(opt, "anchor") && val)
+-			uopt->anchor = simple_strtoul(val, NULL, 0);
+-		else if (!strcmp(opt, "volume") && val)
+-			uopt->volume = simple_strtoul(val, NULL, 0);
+-		else if (!strcmp(opt, "partition") && val)
+-			uopt->partition = simple_strtoul(val, NULL, 0);
+-		else if (!strcmp(opt, "fileset") && val)
+-			uopt->fileset = simple_strtoul(val, NULL, 0);
+-		else if (!strcmp(opt, "rootdir") && val)
+-			uopt->rootdir = simple_strtoul(val, NULL, 0);
++			break;
++		case Opt_session:
++			if (match_int(args, &option))
++				return 0;
++			uopt->session = option;
++			break;
++		case Opt_lastblock:
++			if (match_int(args, &option))
++				return 0;
++			uopt->lastblock = option;
++			break;
++		case Opt_anchor:
++			if (match_int(args, &option))
++				return 0;
++			uopt->anchor = option;
++			break;
++		case Opt_volume:
++			if (match_int(args, &option))
++				return 0;
++			uopt->volume = option;
++			break;
++		case Opt_partition:
++			if (match_int(args, &option))
++				return 0;
++			uopt->partition = option;
++			break;
++		case Opt_fileset:
++			if (match_int(args, &option))
++				return 0;
++			uopt->fileset = option;
++			break;
++		case Opt_rootdir:
++			if (match_int(args, &option))
++				return 0;
++			uopt->rootdir = option;
++			break;
++		case Opt_utf8:
++			uopt->flags |= (1 << UDF_FLAG_UTF8);
++			break;
+ #ifdef CONFIG_NLS
+-		else if (!strcmp(opt, "iocharset") && val)
+-		{
+-			uopt->nls_map = load_nls(val);
++		case Opt_iocharset:
++			uopt->nls_map = load_nls(args[0].from);
+ 			uopt->flags |= (1 << UDF_FLAG_NLS_MAP);
+-		}
++			break;
+ #endif
+-		else if (!strcmp(opt, "utf8") && !val)
+-			uopt->flags |= (1 << UDF_FLAG_UTF8);
+-		else if (val)
+-		{
+-			printk(KERN_ERR "udf: bad mount option \"%s=%s\"\n",
+-				opt, val);
+-			return 0;
+-		}
+-		else
+-		{
+-			printk(KERN_ERR "udf: bad mount option \"%s\"\n",
+-				opt);
++		default:
++			printk(KERN_ERR "udf: bad mount option \"%s\" "
++					"or missing value\n",
++				p);
+ 			return 0;
+ 		}
+ 	}
+--- linux-2.6.0-test6/fs/ufs/super.c	2003-06-22 12:04:44.000000000 -0700
++++ 25/fs/ufs/super.c	2003-10-05 00:33:24.000000000 -0700
+@@ -79,6 +79,7 @@
+ #include <linux/string.h>
+ #include <linux/blkdev.h>
+ #include <linux/init.h>
++#include <linux/parser.h>
+ #include <linux/smp_lock.h>
+ #include <linux/buffer_head.h>
+ #include <linux/vfs.h>
+@@ -250,64 +251,99 @@ void ufs_warning (struct super_block * s
+ 		sb->s_id, function, error_buf);
+ }
+ 
++enum {
++	Opt_type_old, Opt_type_sunx86, Opt_type_sun, Opt_type_44bsd,
++	Opt_type_hp, Opt_type_nextstepcd, Opt_type_nextstep,
++	Opt_type_openstep, Opt_onerror_panic, Opt_onerror_lock,
++	Opt_onerror_umount, Opt_onerror_repair, Opt_err
++};
++
++static match_table_t tokens = {
++	{Opt_type_old, "ufstype=old"},
++	{Opt_type_sunx86, "ufstype=sunx86"},
++	{Opt_type_sun, "ufstype=sun"},
++	{Opt_type_44bsd, "ufstype=44bsd"},
++	{Opt_type_hp, "ufstype=hp"},
++	{Opt_type_nextstepcd, "ufstype=nextstep-cd"},
++	{Opt_type_nextstep, "ufstype=nextstep"},
++	{Opt_type_openstep, "ufstype=openstep"},
++	{Opt_onerror_panic, "onerror=panic"},
++	{Opt_onerror_lock, "onerror=lock"},
++	{Opt_onerror_umount, "onerror=umount"},
++	{Opt_onerror_repair, "onerror=repair"},
++	{Opt_err, NULL}
++};
++
+ static int ufs_parse_options (char * options, unsigned * mount_options)
+ {
+-	char * this_char;
+-	char * value;
++	char * p;
+ 	
+ 	UFSD(("ENTER\n"))
+ 	
+ 	if (!options)
+ 		return 1;
+ 
+-	while ((this_char = strsep (&options, ",")) != NULL) {
+-		if (!*this_char)
++	while ((p = strsep(&options, ",")) != NULL) {
++		substring_t args[MAX_OPT_ARGS];
++		int token;
++		if (!*p)
+ 			continue;
+-		if ((value = strchr (this_char, '=')) != NULL)
+-			*value++ = 0;
+-		if (!strcmp (this_char, "ufstype")) {
++
++		token = match_token(p, tokens, args);
++		switch (token) {
++		case Opt_type_old:
+ 			ufs_clear_opt (*mount_options, UFSTYPE);
+-			if (!strcmp (value, "old"))
+-				ufs_set_opt (*mount_options, UFSTYPE_OLD);
+-			else if (!strcmp (value, "sun"))
+-				ufs_set_opt (*mount_options, UFSTYPE_SUN);
+-			else if (!strcmp (value, "44bsd"))
+-				ufs_set_opt (*mount_options, UFSTYPE_44BSD);
+-			else if (!strcmp (value, "nextstep"))
+-				ufs_set_opt (*mount_options, UFSTYPE_NEXTSTEP);
+-			else if (!strcmp (value, "nextstep-cd"))
+-				ufs_set_opt (*mount_options, UFSTYPE_NEXTSTEP_CD);
+-			else if (!strcmp (value, "openstep"))
+-				ufs_set_opt (*mount_options, UFSTYPE_OPENSTEP);
+-			else if (!strcmp (value, "sunx86"))
+-				ufs_set_opt (*mount_options, UFSTYPE_SUNx86);
+-			else if (!strcmp (value, "hp"))
+-				ufs_set_opt (*mount_options, UFSTYPE_HP);
+-			else {
+-				printk ("UFS-fs: Invalid type option: %s\n", value);
+-				return 0;
+-			}
+-		}
+-		else if (!strcmp (this_char, "onerror")) {
++			ufs_set_opt (*mount_options, UFSTYPE_OLD);
++			break;
++		case Opt_type_sunx86:
++			ufs_clear_opt (*mount_options, UFSTYPE);
++			ufs_set_opt (*mount_options, UFSTYPE_SUNx86);
++			break;
++		case Opt_type_sun:
++			ufs_clear_opt (*mount_options, UFSTYPE);
++			ufs_set_opt (*mount_options, UFSTYPE_SUN);
++			break;
++		case Opt_type_44bsd:
++			ufs_clear_opt (*mount_options, UFSTYPE);
++			ufs_set_opt (*mount_options, UFSTYPE_44BSD);
++			break;
++		case Opt_type_hp:
++			ufs_clear_opt (*mount_options, UFSTYPE);
++			ufs_set_opt (*mount_options, UFSTYPE_HP);
++			break;
++		case Opt_type_nextstepcd:
++			ufs_clear_opt (*mount_options, UFSTYPE);
++			ufs_set_opt (*mount_options, UFSTYPE_NEXTSTEP_CD);
++			break;
++		case Opt_type_nextstep:
++			ufs_clear_opt (*mount_options, UFSTYPE);
++			ufs_set_opt (*mount_options, UFSTYPE_NEXTSTEP);
++			break;
++		case Opt_type_openstep:
++			ufs_clear_opt (*mount_options, UFSTYPE);
++			ufs_set_opt (*mount_options, UFSTYPE_OPENSTEP);
++			break;
++		case Opt_onerror_panic:
+ 			ufs_clear_opt (*mount_options, ONERROR);
+-			if (!strcmp (value, "panic"))
+-				ufs_set_opt (*mount_options, ONERROR_PANIC);
+-			else if (!strcmp (value, "lock"))
+-				ufs_set_opt (*mount_options, ONERROR_LOCK);
+-			else if (!strcmp (value, "umount"))
+-				ufs_set_opt (*mount_options, ONERROR_UMOUNT);
+-			else if (!strcmp (value, "repair")) {
+-				printk("UFS-fs: Unable to do repair on error, "
+-					"will lock lock instead \n");
+-				ufs_set_opt (*mount_options, ONERROR_REPAIR);
+-			}
+-			else {
+-				printk ("UFS-fs: Invalid action onerror: %s\n", value);
+-				return 0;
+-			}
+-		}
+-		else {
+-			printk("UFS-fs: Invalid option: %s\n", this_char);
++			ufs_set_opt (*mount_options, ONERROR_PANIC);
++			break;
++		case Opt_onerror_lock:
++			ufs_clear_opt (*mount_options, ONERROR);
++			ufs_set_opt (*mount_options, ONERROR_LOCK);
++			break;
++		case Opt_onerror_umount:
++			ufs_clear_opt (*mount_options, ONERROR);
++			ufs_set_opt (*mount_options, ONERROR_UMOUNT);
++			break;
++		case Opt_onerror_repair:
++			printk("UFS-fs: Unable to do repair on error, "
++				"will lock lock instead\n");
++			ufs_clear_opt (*mount_options, ONERROR);
++			ufs_set_opt (*mount_options, ONERROR_REPAIR);
++			break;
++		default:
++			printk("UFS-fs: Invalid option: \"%s\" "
++					"or missing value\n", p);
+ 			return 0;
+ 		}
+ 	}
+--- linux-2.6.0-test6/fs/xfs/linux/xfs_aops.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/linux/xfs_aops.c	2003-10-05 00:36:53.000000000 -0700
+@@ -461,7 +461,8 @@ map_unwritten(
+ 		struct page		*page;
+ 
+ 		tlast = i_size_read(inode) >> PAGE_CACHE_SHIFT;
+-		tloff = min(tlast, start_page->index + pb->pb_page_count - 1);
++		tloff = (mp->pbm_offset + mp->pbm_bsize) >> PAGE_CACHE_SHIFT;
++		tloff = min(tlast, tloff);
+ 		for (tindex = start_page->index + 1; tindex < tloff; tindex++) {
+ 			page = probe_unwritten_page(mapping, tindex, mp, pb,
+ 						PAGE_CACHE_SIZE, &bs, bbits);
+@@ -973,7 +974,7 @@ linvfs_direct_IO(
+ 	unsigned long		nr_segs)
+ {
+ 	struct file	*file = iocb->ki_filp;
+-	struct inode	*inode = file->f_dentry->d_inode->i_mapping->host;
++	struct inode	*inode = file->f_mapping->host;
+ 	vnode_t		*vp = LINVFS_GET_VP(inode);
+ 	page_buf_bmap_t	pbmap;
+ 	int		maps = 1;
+@@ -983,7 +984,7 @@ linvfs_direct_IO(
+ 	if (error)
+ 		return -error;
+ 
+-        return blockdev_direct_IO(rw, iocb, inode,
++        return blockdev_direct_IO_no_locking(rw, iocb, inode,
+ 		pbmap.pbm_target->pbr_bdev,
+ 		iov, offset, nr_segs,
+ 		linvfs_get_blocks_direct,
+@@ -1041,6 +1042,8 @@ count_page_state(
+ 	do {
+ 		if (buffer_uptodate(bh) && !buffer_mapped(bh))
+ 			(*unmapped) = 1;
++		else if (buffer_unwritten(bh) && !buffer_delay(bh))
++			clear_buffer_unwritten(bh);
+ 		else if (buffer_unwritten(bh))
+ 			(*unwritten) = 1;
+ 		else if (buffer_delay(bh))
+--- linux-2.6.0-test6/fs/xfs/linux/xfs_file.c	2003-08-22 19:23:42.000000000 -0700
++++ 25/fs/xfs/linux/xfs_file.c	2003-10-05 00:34:07.000000000 -0700
+@@ -86,7 +86,7 @@ linvfs_write(
+ {
+ 	struct iovec	iov = {(void *)buf, count};
+ 	struct file	*file = iocb->ki_filp;
+-	struct inode	*inode = file->f_dentry->d_inode->i_mapping->host;
++	struct inode	*inode = file->f_mapping->host;
+ 	vnode_t		*vp = LINVFS_GET_VP(inode);
+ 	int		error;
+ 	int		direct = file->f_flags & O_DIRECT;
+@@ -111,7 +111,7 @@ linvfs_readv(
+ 	unsigned long		nr_segs,
+ 	loff_t			*ppos)
+ {
+-	struct inode	*inode = file->f_dentry->d_inode->i_mapping->host;
++	struct inode	*inode = file->f_mapping->host;
+ 	vnode_t		*vp = LINVFS_GET_VP(inode);
+ 	struct		kiocb kiocb;
+ 	int		error;
+@@ -133,7 +133,7 @@ linvfs_writev(
+ 	unsigned long		nr_segs,
+ 	loff_t			*ppos)
+ {
+-	struct inode	*inode = file->f_dentry->d_inode->i_mapping->host;
++	struct inode	*inode = file->f_mapping->host;
+ 	vnode_t		*vp = LINVFS_GET_VP(inode);
+ 	struct		kiocb kiocb;
+ 	int		error;
+--- linux-2.6.0-test6/fs/xfs/linux/xfs_iops.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/linux/xfs_iops.c	2003-10-05 00:33:24.000000000 -0700
+@@ -386,6 +386,7 @@ linvfs_readlink(
+ 	uio.uio_segflg = UIO_USERSPACE;
+ 	uio.uio_resid = size;
+ 	uio.uio_iovcnt = 1;
++	uio.uio_fmode = 0;
+ 
+ 	VOP_READLINK(vp, &uio, NULL, error);
+ 	if (error)
+--- linux-2.6.0-test6/fs/xfs/linux/xfs_lrw.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/linux/xfs_lrw.c	2003-10-05 00:33:24.000000000 -0700
+@@ -218,7 +218,7 @@ xfs_read(
+ 		int error;
+ 		vrwlock_t locktype = VRWLOCK_READ;
+ 
+-		error = XFS_SEND_DATA(mp, DM_EVENT_READ, bdp, *offset, size,
++		error = XFS_SEND_DATA(mp, DM_EVENT_READ, BHV_TO_VNODE(bdp), *offset, size,
+ 				      FILP_DELAY_FLAG(file), &locktype);
+ 		if (error) {
+ 			xfs_iunlock(ip, XFS_IOLOCK_SHARED);
+@@ -278,7 +278,7 @@ xfs_sendfile(
+ 		vrwlock_t locktype = VRWLOCK_READ;
+ 		int error;
+ 
+-		error = XFS_SEND_DATA(mp, DM_EVENT_READ, bdp, *offset, count,
++		error = XFS_SEND_DATA(mp, DM_EVENT_READ, BHV_TO_VNODE(bdp), *offset, count,
+ 				      FILP_DELAY_FLAG(filp), &locktype);
+ 		if (error) {
+ 			xfs_iunlock(ip, XFS_IOLOCK_SHARED);
+@@ -612,7 +612,7 @@ start:
+ 		loff_t		savedsize = *offset;
+ 
+ 		xfs_iunlock(xip, XFS_ILOCK_EXCL);
+-		error = XFS_SEND_DATA(xip->i_mount, DM_EVENT_WRITE, bdp,
++		error = XFS_SEND_DATA(xip->i_mount, DM_EVENT_WRITE, vp,
+ 				      *offset, size,
+ 				      FILP_DELAY_FLAG(file), &locktype);
+ 		if (error) {
+--- linux-2.6.0-test6/fs/xfs/linux/xfs_stats.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/linux/xfs_stats.c	2003-10-05 00:33:24.000000000 -0700
+@@ -33,7 +33,7 @@
+ #include "xfs.h"
+ #include <linux/proc_fs.h>
+ 
+-struct xfsstats xfsstats;
++DEFINE_PER_CPU(struct xfsstats, xfsstats);
+ 
+ STATIC int
+ xfs_read_xfsstats(
+@@ -44,7 +44,11 @@ xfs_read_xfsstats(
+ 	int		*eof,
+ 	void		*data)
+ {
+-	int		i, j, len;
++	int		c, i, j, len, val;
++	__uint64_t	xs_xstrat_bytes = 0;
++	__uint64_t	xs_write_bytes = 0;
++	__uint64_t	xs_read_bytes = 0;
++
+ 	static struct xstats_entry {
+ 		char	*desc;
+ 		int	endpoint;
+@@ -65,21 +69,32 @@ xfs_read_xfsstats(
+ 		{ "vnodes",		XFSSTAT_END_VNODE_OPS		},
+ 	};
+ 
++	/* Loop over all stats groups */
+ 	for (i=j=len = 0; i < sizeof(xstats)/sizeof(struct xstats_entry); i++) {
+ 		len += sprintf(buffer + len, xstats[i].desc);
+ 		/* inner loop does each group */
+ 		while (j < xstats[i].endpoint) {
+-			len += sprintf(buffer + len, " %u",
+-					*(((__u32*)&xfsstats) + j));
++			val = 0;
++			/* sum over all cpus */
++			for (c = 0; c < NR_CPUS; c++) {
++				if (!cpu_possible(c)) continue;
++				val += *(((__u32*)&per_cpu(xfsstats, c) + j));
++			}
++			len += sprintf(buffer + len, " %u", val);
+ 			j++;
+ 		}
+ 		buffer[len++] = '\n';
+ 	}
+ 	/* extra precision counters */
++	for (i = 0; i < NR_CPUS; i++) {
++		if (!cpu_possible(i)) continue;
++		xs_xstrat_bytes += per_cpu(xfsstats, i).xs_xstrat_bytes;
++		xs_write_bytes += per_cpu(xfsstats, i).xs_write_bytes;
++		xs_read_bytes += per_cpu(xfsstats, i).xs_read_bytes;
++	}
++
+ 	len += sprintf(buffer + len, "xpc %Lu %Lu %Lu\n",
+-			xfsstats.xs_xstrat_bytes,
+-			xfsstats.xs_write_bytes,
+-			xfsstats.xs_read_bytes);
++			xs_xstrat_bytes, xs_write_bytes, xs_read_bytes);
+ 	len += sprintf(buffer + len, "debug %u\n",
+ #if defined(XFSDEBUG)
+ 		1);
+--- linux-2.6.0-test6/fs/xfs/linux/xfs_stats.h	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/linux/xfs_stats.h	2003-10-05 00:33:24.000000000 -0700
+@@ -35,6 +35,8 @@
+ 
+ #if defined(CONFIG_PROC_FS) && !defined(XFS_STATS_OFF)
+ 
++#include <linux/percpu.h>
++
+ /*
+  * XFS global statistics
+  */
+@@ -126,11 +128,13 @@ struct xfsstats {
+ 	__uint64_t		xs_read_bytes;
+ };
+ 
+-extern struct xfsstats xfsstats;
++DECLARE_PER_CPU(struct xfsstats, xfsstats);
+ 
+-# define XFS_STATS_INC(count)		( xfsstats.count++ )
+-# define XFS_STATS_DEC(count)		( xfsstats.count-- )
+-# define XFS_STATS_ADD(count, inc)	( xfsstats.count += (inc) )
++/* We don't disable preempt, not too worried about poking the
++ * wrong cpu's stat for now */
++#define XFS_STATS_INC(count)		(__get_cpu_var(xfsstats).count++)
++#define XFS_STATS_DEC(count)		(__get_cpu_var(xfsstats).count--)
++#define XFS_STATS_ADD(count, inc)	(__get_cpu_var(xfsstats).count += (inc))
+ 
+ extern void xfs_init_procfs(void);
+ extern void xfs_cleanup_procfs(void);
+--- linux-2.6.0-test6/fs/xfs/linux/xfs_super.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/linux/xfs_super.c	2003-10-05 00:33:24.000000000 -0700
+@@ -315,8 +315,8 @@ xfs_setsize_buftarg(
+ 
+ 	if (set_blocksize(btp->pbr_bdev, sectorsize)) {
+ 		printk(KERN_WARNING
+-			"XFS: Cannot set_blocksize to %u on device %u:%u\n",
+-			sectorsize, MAJOR(btp->pbr_dev), MINOR(btp->pbr_dev));
++			"XFS: Cannot set_blocksize to %u on device %s\n",
++			sectorsize, XFS_BUFTARG_NAME(btp));
+ 	}
+ }
+ 
+--- linux-2.6.0-test6/fs/xfs/linux/xfs_sysctl.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/linux/xfs_sysctl.c	2003-10-05 00:33:24.000000000 -0700
+@@ -48,17 +48,23 @@ xfs_stats_clear_proc_handler(
+ 	void		*buffer,
+ 	size_t		*lenp)
+ {
+-	int		ret, *valp = ctl->data;
++	int		c, ret, *valp = ctl->data;
+ 	__uint32_t	vn_active;
+ 
+ 	ret = proc_doulongvec_minmax(ctl, write, filp, buffer, lenp);
+ 
+ 	if (!ret && write && *valp) {
+ 		printk("XFS Clearing xfsstats\n");
+-		/* save vn_active, it's a universal truth! */
+-		vn_active = xfsstats.vn_active;
+-		memset(&xfsstats, 0, sizeof(xfsstats));
+-		xfsstats.vn_active = vn_active;
++		for (c = 0; c < NR_CPUS; c++) {
++			if (!cpu_possible(c)) continue;
++			preempt_disable();
++			/* save vn_active, it's a universal truth! */
++			vn_active = per_cpu(xfsstats, c).vn_active;
++			memset(&per_cpu(xfsstats, c), 0,
++			       sizeof(struct xfsstats));
++			per_cpu(xfsstats, c).vn_active = vn_active;
++			preempt_enable();
++		}
+ 		xfs_stats_clear = 0;
+ 	}
+ 
+--- linux-2.6.0-test6/fs/xfs/linux/xfs_vnode.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/linux/xfs_vnode.c	2003-10-05 00:33:24.000000000 -0700
+@@ -200,7 +200,7 @@ vn_revalidate(
+ 	vn_trace_entry(vp, "vn_revalidate", (inst_t *)__return_address);
+ 	ASSERT(vp->v_fbhv != NULL);
+ 
+-	va.va_mask = XFS_AT_STAT|XFS_AT_GENCOUNT;
++	va.va_mask = XFS_AT_STAT|XFS_AT_XFLAGS;
+ 	VOP_GETATTR(vp, &va, 0, NULL, error);
+ 	if (!error) {
+ 		inode = LINVFS_GET_IP(vp);
+--- linux-2.6.0-test6/fs/xfs/linux/xfs_vnode.h	2003-08-08 22:55:13.000000000 -0700
++++ 25/fs/xfs/linux/xfs_vnode.h	2003-10-05 00:33:24.000000000 -0700
+@@ -28,6 +28,37 @@
+  * For further information regarding this notice, see:
+  *
+  * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
++ *
++ * Portions Copyright (c) 1989, 1993
++ *      The Regents of the University of California.  All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. All advertising materials mentioning features or use of this software
++ *    must display the following acknowledgement:
++ *      This product includes software developed by the University of
++ *      California, Berkeley and its contributors.
++ * 4. Neither the name of the University nor the names of its contributors
++ *    may be used to endorse or promote products derived from this software
++ *    without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ * SUCH DAMAGE.
+  */
+ #ifndef __XFS_VNODE_H__
+ #define __XFS_VNODE_H__
+@@ -39,19 +70,9 @@ struct page_buf_bmap_s;
+ struct attrlist_cursor_kern;
+ 
+ /*
+- * Vnode types (unrelated to on-disk inodes).  VNON means no type.
++ * Vnode types.  VNON means no type.
+  */
+-typedef enum vtype {
+-	VNON	= 0,
+-	VREG	= 1,
+-	VDIR	= 2,
+-	VBLK	= 3,
+-	VCHR	= 4,
+-	VLNK	= 5,
+-	VFIFO	= 6,
+-	VBAD	= 7,
+-	VSOCK	= 8
+-} vtype_t;
++enum vtype	{ VNON, VREG, VDIR, VBLK, VCHR, VLNK, VFIFO, VBAD, VSOCK };
+ 
+ typedef xfs_ino_t vnumber_t;
+ typedef struct dentry vname_t;
+@@ -115,14 +136,15 @@ typedef enum {
+ #define LINVFS_GET_IP(vp)	(&(vp)->v_inode)
+ 
+ /*
+- * Conversion between vnode types/modes and encoded type/mode as
+- * seen by stat(2) and mknod(2).
++ * Convert between vnode types and inode formats (since POSIX.1
++ * defines mode word of stat structure in terms of inode formats).
+  */
+-extern enum vtype       iftovt_tab[];
+-extern ushort           vttoif_tab[];
+-#define IFTOVT(M)       (iftovt_tab[((M) & S_IFMT) >> 12])
+-#define VTTOIF(T)       (vttoif_tab[(int)(T)])
+-#define MAKEIMODE(T, M)	(VTTOIF(T) | ((M) & ~S_IFMT))
++extern enum vtype	iftovt_tab[];
++extern u_short		vttoif_tab[];
++#define IFTOVT(mode)	(iftovt_tab[((mode) & S_IFMT) >> 12])
++#define VTTOIF(indx)	(vttoif_tab[(int)(indx)])
++#define MAKEIMODE(indx, mode)	(int)(VTTOIF(indx) | (mode))
++
+ 
+ /*
+  * Vnode flags.
+@@ -370,31 +392,29 @@ typedef struct vnodeops {
+ 
+ /*
+  * Vnode attributes.  va_mask indicates those attributes the caller
+- * wants to set (setattr) or extract (getattr).
++ * wants to set or extract.
+  */
+ typedef struct vattr {
+-	int		va_mask;	/* bit-mask of attributes */
+-	vtype_t		va_type;	/* vnode type (for create) */
+-	mode_t		va_mode;	/* file access mode */
++	int		va_mask;	/* bit-mask of attributes present */
++	enum vtype	va_type;	/* vnode type (for create) */
++	mode_t		va_mode;	/* file access mode and type */
++	nlink_t		va_nlink;	/* number of references to file */
+ 	uid_t		va_uid;		/* owner user id */
+ 	gid_t		va_gid;		/* owner group id */
+-	xfs_dev_t	va_fsid;	/* file system id (dev for now) */
+-	xfs_ino_t	va_nodeid;	/* node id */
+-	nlink_t		va_nlink;	/* number of references to file */
++	xfs_ino_t	va_nodeid;	/* file id */
+ 	xfs_off_t	va_size;	/* file size in bytes */
+-	timespec_t	va_atime;	/* time of last access */
+-	timespec_t	va_mtime;	/* time of last modification */
+-	timespec_t	va_ctime;	/* time file ``created'' */
+-	xfs_dev_t	va_rdev;	/* device the file represents */
+-	u_long		va_blksize;	/* fundamental block size */
+-	__int64_t	va_nblocks;	/* # of blocks allocated */
+-	u_long		va_vcode;	/* version code */
++	u_long		va_blocksize;	/* blocksize preferred for i/o */
++	struct timespec	va_atime;	/* time of last access */
++	struct timespec	va_mtime;	/* time of last modification */
++	struct timespec	va_ctime;	/* time file changed */
++	u_int		va_gen;		/* generation number of file */
++	xfs_dev_t	va_rdev;	/* device the special file represents */
++	__int64_t	va_nblocks;	/* number of blocks allocated */
+ 	u_long		va_xflags;	/* random extended file flags */
+ 	u_long		va_extsize;	/* file extent size */
+ 	u_long		va_nextents;	/* number of extents in file */
+ 	u_long		va_anextents;	/* number of attr extents in file */
+ 	int		va_projid;	/* project id */
+-	u_int		va_gencount;	/* object generation count */
+ } vattr_t;
+ 
+ /*
+@@ -450,11 +470,17 @@ typedef struct vattr {
+ 		XFS_AT_TYPE|XFS_AT_BLKSIZE|XFS_AT_NBLOCKS|XFS_AT_VCODE|\
+ 		XFS_AT_NEXTENTS|XFS_AT_ANEXTENTS|XFS_AT_GENCOUNT)
+ 
+-#define VREAD		00400
+-#define VWRITE		00200
+-#define VEXEC		00100
+-#define VSGID		02000		/* set group id on execution */
+-#define MODEMASK	07777		/* mode bits plus permission bits */
++/*
++ *  Modes.
++ */
++#define VSUID	S_ISUID		/* set user id on execution */
++#define VSGID	S_ISGID		/* set group id on execution */
++#define VSVTX	S_ISVTX		/* save swapped text even after use */
++#define VREAD	S_IRUSR		/* read, write, execute permissions */
++#define VWRITE	S_IWUSR
++#define VEXEC	S_IXUSR
++
++#define MODEMASK S_IALLUGO	/* mode bits plus permission bits */
+ 
+ /*
+  * Check whether mandatory file locking is enabled.
+@@ -569,13 +595,9 @@ static __inline__ void vn_flagclr(struct
+  * Flags to VOP_SETATTR/VOP_GETATTR.
+  */
+ #define	ATTR_UTIME	0x01	/* non-default utime(2) request */
+-#define	ATTR_EXEC	0x02	/* invocation from exec(2) */
+-#define	ATTR_COMM	0x04	/* yield common vp attributes */
+ #define	ATTR_DMI	0x08	/* invocation from a DMI function */
+ #define	ATTR_LAZY	0x80	/* set/get attributes lazily */
+ #define	ATTR_NONBLOCK	0x100	/* return EAGAIN if operation would block */
+-#define ATTR_NOLOCK	0x200	/* Don't grab any conflicting locks */
+-#define ATTR_NOSIZETOK	0x400	/* Don't get the DVN_SIZE_READ token */
+ 
+ /*
+  * Flags to VOP_FSYNC and VOP_RECLAIM.
+--- linux-2.6.0-test6/fs/xfs/pagebuf/page_buf.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/pagebuf/page_buf.c	2003-10-05 00:33:24.000000000 -0700
+@@ -141,7 +141,7 @@ pagebuf_param_t pb_params = {
+  * Pagebuf statistics variables
+  */
+ 
+-struct pbstats pbstats;
++DEFINE_PER_CPU(struct pbstats, pbstats);
+ 
+ /*
+  * Pagebuf allocation / freeing.
+@@ -293,7 +293,7 @@ _pagebuf_initialize(
+ 	atomic_set(&pb->pb_pin_count, 0);
+ 	init_waitqueue_head(&pb->pb_waiters);
+ 
+-	PB_STATS_INC(pbstats.pb_create);
++	PB_STATS_INC(pb_create);
+ 	PB_TRACE(pb, PB_TRACE_REC(get), target);
+ }
+ 
+@@ -485,7 +485,7 @@ _pagebuf_lookup_pages(
+ 			page = find_or_create_page(aspace, index, gfp_mask);
+ 			if (!page) {
+ 				if (--retry_count > 0) {
+-					PB_STATS_INC(pbstats.pb_page_retries);
++					PB_STATS_INC(pb_page_retries);
+ 					pagebuf_daemon_wakeup(1);
+ 					current->state = TASK_UNINTERRUPTIBLE;
+ 					schedule_timeout(10);
+@@ -495,7 +495,7 @@ _pagebuf_lookup_pages(
+ 				all_mapped = 0;
+ 				continue;
+ 			}
+-			PB_STATS_INC(pbstats.pb_page_found);
++			PB_STATS_INC(pb_page_found);
+ 			mark_page_accessed(page);
+ 			pb->pb_pages[pi] = page;
+ 		} else {
+@@ -645,7 +645,7 @@ _pagebuf_find(				/* find buffer for blo
+ 		h->pb_count++;
+ 		list_add(&new_pb->pb_hash_list, &h->pb_hash);
+ 	} else {
+-		PB_STATS_INC(pbstats.pb_miss_locked);
++		PB_STATS_INC(pb_miss_locked);
+ 	}
+ 
+ 	spin_unlock(&h->pb_hash_lock);
+@@ -665,7 +665,7 @@ found:
+ 			/* wait for buffer ownership */
+ 			PB_TRACE(pb, PB_TRACE_REC(get_lk), 0);
+ 			pagebuf_lock(pb);
+-			PB_STATS_INC(pbstats.pb_get_locked_waited);
++			PB_STATS_INC(pb_get_locked_waited);
+ 		} else {
+ 			/* We asked for a trylock and failed, no need
+ 			 * to look at file offset and length here, we
+@@ -675,7 +675,7 @@ found:
+ 			 */
+ 
+ 			pagebuf_rele(pb);
+-			PB_STATS_INC(pbstats.pb_busy_locked);
++			PB_STATS_INC(pb_busy_locked);
+ 			return (NULL);
+ 		}
+ 	} else {
+@@ -691,7 +691,7 @@ found:
+ 				_PBF_ADDR_ALLOCATED | \
+ 				_PBF_MEM_ALLOCATED;
+ 	PB_TRACE(pb, PB_TRACE_REC(got_lk), 0);
+-	PB_STATS_INC(pbstats.pb_get_locked);
++	PB_STATS_INC(pb_get_locked);
+ 	return (pb);
+ }
+ 
+@@ -747,7 +747,7 @@ pagebuf_get(				/* allocate a buffer		*/
+ 			return (NULL);
+ 	}
+ 
+-	PB_STATS_INC(pbstats.pb_get);
++	PB_STATS_INC(pb_get);
+ 
+ 	/* fill in any missing pages */
+ 	error = _pagebuf_lookup_pages(pb, pb->pb_target->pbr_mapping, flags);
+@@ -766,7 +766,7 @@ pagebuf_get(				/* allocate a buffer		*/
+ 	if (flags & PBF_READ) {
+ 		if (PBF_NOT_DONE(pb)) {
+ 			PB_TRACE(pb, PB_TRACE_REC(get_read), flags);
+-			PB_STATS_INC(pbstats.pb_get_read);
++			PB_STATS_INC(pb_get_read);
+ 			pagebuf_iostart(pb, flags);
+ 		} else if (flags & PBF_ASYNC) {
+ 			/*
+@@ -1677,6 +1677,9 @@ pagebuf_daemon(
+ 					break;
+ 				}
+ 
++				pb->pb_flags &= ~PBF_DELWRI;
++				pb->pb_flags |= PBF_WRITE;
++
+ 				list_del(&pb->pb_list);
+ 				list_add(&pb->pb_list, &tmp);
+ 
+@@ -1688,8 +1691,6 @@ pagebuf_daemon(
+ 		while (!list_empty(&tmp)) {
+ 			pb = list_entry(tmp.next, page_buf_t, pb_list);
+ 			list_del_init(&pb->pb_list);
+-			pb->pb_flags &= ~PBF_DELWRI;
+-			pb->pb_flags |= PBF_WRITE;
+ 
+ 			pagebuf_iostrategy(pb);
+ 		}
+@@ -1720,6 +1721,7 @@ pagebuf_delwri_flush(
+ 	int			flush_cnt = 0;
+ 
+ 	pagebuf_runall_queues(pagebuf_dataio_workqueue);
++	pagebuf_runall_queues(pagebuf_logio_workqueue);
+ 
+ 	spin_lock(&pbd_delwrite_lock);
+ 	INIT_LIST_HEAD(&tmp);
+@@ -1742,47 +1744,32 @@ pagebuf_delwri_flush(
+ 			continue;
+ 		}
+ 
+-		if (flags & PBDF_TRYLOCK) {
+-			if (!pagebuf_cond_lock(pb)) {
+-				pincount++;
+-				continue;
+-			}
+-		}
+-
+-		list_del_init(&pb->pb_list);
+-		if (flags & PBDF_WAIT) {
+-			list_add(&pb->pb_list, &tmp);
+-			pb->pb_flags &= ~PBF_ASYNC;
+-		}
+-
+-		spin_unlock(&pbd_delwrite_lock);
+-
+-		if ((flags & PBDF_TRYLOCK) == 0) {
+-			pagebuf_lock(pb);
+-		}
+-
+ 		pb->pb_flags &= ~PBF_DELWRI;
+ 		pb->pb_flags |= PBF_WRITE;
++		list_move(&pb->pb_list, &tmp);
++	}
++	/* ok found all the items that can be worked on 
++	 * drop the lock and process the private list */
++	spin_unlock(&pbd_delwrite_lock);
++
++	list_for_each_safe(curr, next, &tmp) {
++		pb = list_entry(curr, page_buf_t, pb_list);
++
++		if (flags & PBDF_WAIT)
++			pb->pb_flags &= ~PBF_ASYNC;
++		else
++			list_del_init(curr);
+ 
++		pagebuf_lock(pb);
+ 		pagebuf_iostrategy(pb);
+ 		if (++flush_cnt > 32) {
+ 			blk_run_queues();
+ 			flush_cnt = 0;
+ 		}
+-
+-		spin_lock(&pbd_delwrite_lock);
+ 	}
+ 
+-	spin_unlock(&pbd_delwrite_lock);
+-
+ 	blk_run_queues();
+ 
+-	if (pinptr)
+-		*pinptr = pincount;
+-
+-	if ((flags & PBDF_WAIT) == 0)
+-		return;
+-
+ 	while (!list_empty(&tmp)) {
+ 		pb = list_entry(tmp.next, page_buf_t, pb_list);
+ 
+@@ -1792,6 +1779,9 @@ pagebuf_delwri_flush(
+ 			pagebuf_unlock(pb);
+ 		pagebuf_rele(pb);
+ 	}
++
++	if (pinptr)
++		*pinptr = pincount;
+ }
+ 
+ STATIC int
+@@ -1846,14 +1836,18 @@ pb_stats_clear_handler(
+ 	void			*buffer,
+ 	size_t			*lenp)
+ {
+-	int			ret;
++	int			c, ret;
+ 	int			*valp = ctl->data;
+ 
+ 	ret = proc_doulongvec_minmax(ctl, write, filp, buffer, lenp);
+ 
+ 	if (!ret && write && *valp) {
+ 		printk("XFS Clearing pbstats\n");
+-		memset(&pbstats, 0, sizeof(pbstats));
++		for (c = 0; c < NR_CPUS; c++) {
++			if (!cpu_possible(c)) continue;
++				memset(&per_cpu(pbstats, c), 0,
++				       sizeof(struct pbstats));
++		}
+ 		pb_params.stats_clear.val = 0;
+ 	}
+ 
+@@ -1907,13 +1901,17 @@ pagebuf_readstats(
+ 	int			*eof,
+ 	void			*data)
+ {
+-	int			i, len;
++	int			c, i, len, val;
+ 
+ 	len = 0;
+ 	len += sprintf(buffer + len, "pagebuf");
+-	for (i = 0; i < sizeof(pbstats) / sizeof(u_int32_t); i++) {
+-		len += sprintf(buffer + len, " %u",
+-			*(((u_int32_t*)&pbstats) + i));
++	for (i = 0; i < sizeof(struct pbstats) / sizeof(u_int32_t); i++) {
++		val = 0;
++		for (c = 0 ; c < NR_CPUS; c++) {
++			if (!cpu_possible(c)) continue;
++			val += *(((u_int32_t*)&per_cpu(pbstats, c) + i));
++		}
++		len += sprintf(buffer + len, " %u", val);
+ 	}
+ 	buffer[len++] = '\n';
+ 
+--- linux-2.6.0-test6/fs/xfs/pagebuf/page_buf.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/fs/xfs/pagebuf/page_buf.h	2003-10-05 00:33:24.000000000 -0700
+@@ -136,9 +136,6 @@ typedef enum page_buf_flags_e {		/* pb_f
+ #define PBF_NOT_DONE(pb) (((pb)->pb_flags & (PBF_PARTIAL|PBF_NONE)) != 0)
+ #define PBF_DONE(pb) (((pb)->pb_flags & (PBF_PARTIAL|PBF_NONE)) == 0)
+ 
+-#define PBR_SECTOR_ONLY	1	/* only use sector size buffer heads */
+-#define PBR_ALIGNED_ONLY 2	/* only use aligned I/O */
+-
+ typedef struct pb_target {
+ 	dev_t			pbr_dev;
+ 	struct block_device	*pbr_bdev;
+@@ -371,7 +368,6 @@ extern int pagebuf_ispin(		/* check if b
+ /* Delayed Write Buffer Routines */
+ 
+ #define PBDF_WAIT    0x01
+-#define PBDF_TRYLOCK 0x02
+ extern void pagebuf_delwri_flush(
+ 		pb_target_t *,
+ 		unsigned long,
+--- linux-2.6.0-test6/fs/xfs/pagebuf/page_buf_internal.h	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/pagebuf/page_buf_internal.h	2003-10-05 00:33:24.000000000 -0700
+@@ -37,6 +37,7 @@
+ #ifndef __PAGE_BUF_PRIVATE_H__
+ #define __PAGE_BUF_PRIVATE_H__
+ 
++#include <linux/percpu.h>
+ #include "page_buf.h"
+ 
+ #define _PAGE_BUF_INTERNAL_
+@@ -120,9 +121,11 @@ struct pbstats {
+ 	u_int32_t	pb_get_read;
+ };
+ 
+-extern struct pbstats pbstats;
++DECLARE_PER_CPU(struct pbstats, pbstats);
+ 
+-#define PB_STATS_INC(count)	( count ++ )
++/* We don't disable preempt, not too worried about poking the
++ * wrong cpu's stat for now */
++#define PB_STATS_INC(count)	(__get_cpu_var(pbstats).count++)
+ 
+ #ifndef STATIC
+ # define STATIC	static
+--- linux-2.6.0-test6/fs/xfs/quota/xfs_dquot.c	2003-06-14 12:18:09.000000000 -0700
++++ 25/fs/xfs/quota/xfs_dquot.c	2003-10-05 00:33:24.000000000 -0700
+@@ -87,9 +87,9 @@
+ STATIC void		xfs_qm_dqflush_done(xfs_buf_t *, xfs_dq_logitem_t *);
+ 
+ #ifdef DEBUG
+-dev_t xfs_dqerror_dev = 0;
+-int xfs_do_dqerror = 0;
+-int xfs_dqreq_num = 0;
++xfs_buftarg_t *xfs_dqerror_target;
++int xfs_do_dqerror;
++int xfs_dqreq_num;
+ int xfs_dqerror_mod = 33;
+ #endif
+ 
+@@ -911,7 +911,7 @@ xfs_qm_dqget(
+ 
+ #ifdef DEBUG
+ 	if (xfs_do_dqerror) {
+-		if ((xfs_dqerror_dev == mp->m_dev) &&
++		if ((xfs_dqerror_target == mp->m_ddev_targp) &&
+ 		    (xfs_dqreq_num++ % xfs_dqerror_mod) == 0) {
+ 			cmn_err(CE_DEBUG, "Returning error in dqget");
+ 			return (EIO);
+--- linux-2.6.0-test6/fs/xfs/quota/xfs_qm.h	2003-06-14 12:18:06.000000000 -0700
++++ 25/fs/xfs/quota/xfs_qm.h	2003-10-05 00:33:24.000000000 -0700
+@@ -165,9 +165,9 @@ typedef struct xfs_dquot_acct {
+  * Users are allowed to have a usage exceeding their softlimit for
+  * a period this long.
+  */
+-#define XFS_QM_BTIMELIMIT	DQ_BTIMELIMIT
+-#define XFS_QM_RTBTIMELIMIT	DQ_BTIMELIMIT
+-#define XFS_QM_ITIMELIMIT	DQ_FTIMELIMIT
++#define XFS_QM_BTIMELIMIT	(7 * 24*60*60)          /* 1 week */
++#define XFS_QM_RTBTIMELIMIT	(7 * 24*60*60)          /* 1 week */
++#define XFS_QM_ITIMELIMIT	(7 * 24*60*60)          /* 1 week */
+ 
+ #define XFS_QM_BWARNLIMIT	5
+ #define XFS_QM_IWARNLIMIT	5
+--- linux-2.6.0-test6/fs/xfs/support/move.c	2003-06-14 12:18:22.000000000 -0700
++++ 25/fs/xfs/support/move.c	2003-10-05 00:33:24.000000000 -0700
+@@ -38,57 +38,37 @@
+ #include "debug.h"
+ #include "move.h"
+ 
+-/*
+- * Move "n" bytes at byte address "cp"; "rw" indicates the direction
+- * of the move, and the I/O parameters are provided in "uio", which is
+- * update to reflect the data which was moved.  Returns 0 on success or
+- * a non-zero errno on failure.
++/* Read from kernel buffer at src to user/kernel buffer defined
++ * by the uio structure. Advance the pointer in the uio struct
++ * as we go.
+  */
+ int
+-uiomove(void *cp, size_t n, enum uio_rw rw, struct uio *uio)
++uio_read(caddr_t src, size_t len, struct uio *uio)
+ {
+-	register struct iovec *iov;
++	struct iovec *iov;
+ 	u_int cnt;
+ 	int error;
+ 
+-	while (n > 0 && uio->uio_resid) {
++	if (len > 0 && uio->uio_resid) {
+ 		iov = uio->uio_iov;
+ 		cnt = (u_int)iov->iov_len;
+-		if (cnt == 0) {
+-			uio->uio_iov++;
+-			uio->uio_iovcnt--;
+-			continue;
+-		}
+-		if (cnt > n)
+-			cnt = (u_int)n;
+-		switch (uio->uio_segflg) {
+-		case UIO_USERSPACE:
+-			if (rw == UIO_READ)
+-				error = copy_to_user(iov->iov_base, cp, cnt);
+-			else
+-				error = copy_from_user(cp, iov->iov_base, cnt);
++		if (cnt == 0)
++			return 0;
++		if (cnt > len)
++			cnt = (u_int)len;
++		if (uio->uio_segflg == UIO_USERSPACE) {
++			error = copy_to_user(iov->iov_base, src, cnt);
+ 			if (error)
+ 				return EFAULT;
+-			break;
+-
+-
+-		case UIO_SYSSPACE:
+-			if (rw == UIO_READ)
+-				memcpy(iov->iov_base, cp, cnt);
+-			else
+-				memcpy(cp, iov->iov_base, cnt);
+-			break;
+-
+-		default:
++		} else if (uio->uio_segflg == UIO_SYSSPACE) {
++			memcpy(iov->iov_base, src, cnt);
++		} else {
+ 			ASSERT(0);
+-			break;
+ 		}
+ 		iov->iov_base = (void *)((char *)iov->iov_base + cnt);
+ 		iov->iov_len -= cnt;
+ 		uio->uio_resid -= cnt;
+ 		uio->uio_offset += cnt;
+-		cp = (void *)((char *)cp + cnt);
+-		n -= cnt;
+ 	}
+ 	return 0;
+ }
+--- linux-2.6.0-test6/fs/xfs/support/move.h	2003-06-14 12:18:20.000000000 -0700
++++ 25/fs/xfs/support/move.h	2003-10-05 00:33:24.000000000 -0700
+@@ -48,11 +48,6 @@ typedef struct uio {
+ } uio_t;
+ 
+ /*
+- * I/O direction.
+- */
+-typedef enum uio_rw { UIO_READ, UIO_WRITE } uio_rw_t;
+-
+-/*
+  * Segment flag values.
+  */
+ typedef enum uio_seg {
+@@ -60,7 +55,6 @@ typedef enum uio_seg {
+ 	UIO_SYSSPACE,           /* uio_iov describes system space */
+ } uio_seg_t;
+ 
+-
+-extern int	uiomove (void *, size_t, uio_rw_t, uio_t *);
++extern int	uio_read (caddr_t, size_t, uio_t *);
+ 
+ #endif  /* __XFS_SUPPORT_MOVE_H__ */
+--- linux-2.6.0-test6/fs/xfs/xfs_attr_fetch.c	2003-06-14 12:18:25.000000000 -0700
++++ /dev/null	2002-08-30 16:31:37.000000000 -0700
+@@ -1,100 +0,0 @@
+-/*
+- * Copyright (c) 2000, 2002 Silicon Graphics, Inc.  All Rights Reserved.
+- *
+- * This program is free software; you can redistribute it and/or modify it
+- * under the terms of version 2 of the GNU General Public License as
+- * published by the Free Software Foundation.
+- *
+- * This program is distributed in the hope that it would be useful, but
+- * WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+- *
+- * Further, this software is distributed without any warranty that it is
+- * free of the rightful claim of any third person regarding infringement
+- * or the like.  Any license provided herein, whether implied or
+- * otherwise, applies only to this software file.  Patent licenses, if
+- * any, provided herein do not apply to combinations of this program with
+- * other software, or any other product whatsoever.
+- *
+- * You should have received a copy of the GNU General Public License along
+- * with this program; if not, write the Free Software Foundation, Inc., 59
+- * Temple Place - Suite 330, Boston MA 02111-1307, USA.
+- *
+- * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
+- * Mountain View, CA  94043, or:
+- *
+- * http://www.sgi.com
+- *
+- * For further information regarding this notice, see:
+- *
+- * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
+- */
+-
+-#include "xfs.h"
+-
+-#include "xfs_macros.h"
+-#include "xfs_types.h"
+-#include "xfs_inum.h"
+-#include "xfs_log.h"
+-#include "xfs_trans.h"
+-#include "xfs_sb.h"
+-#include "xfs_ag.h"
+-#include "xfs_dir.h"
+-#include "xfs_dir2.h"
+-#include "xfs_dmapi.h"
+-#include "xfs_mount.h"
+-#include "xfs_alloc_btree.h"
+-#include "xfs_bmap_btree.h"
+-#include "xfs_ialloc_btree.h"
+-#include "xfs_itable.h"
+-#include "xfs_btree.h"
+-#include "xfs_ialloc.h"
+-#include "xfs_alloc.h"
+-#include "xfs_attr_sf.h"
+-#include "xfs_dir_sf.h"
+-#include "xfs_dir2_sf.h"
+-#include "xfs_dinode.h"
+-#include "xfs_inode_item.h"
+-#include "xfs_inode.h"
+-#include "xfs_bmap.h"
+-#include "xfs_da_btree.h"
+-#include "xfs_attr.h"
+-#include "xfs_attr_leaf.h"
+-
+-int
+-xfs_attr_fetch(xfs_inode_t *ip, char *name, char *value, int valuelen)
+-{
+-	xfs_da_args_t args;
+-	int error;
+-
+-	if (XFS_IFORK_Q(ip) == 0)
+-		return ENOATTR;
+-	/*
+-	 * Do the argument setup for the xfs_attr routines.
+-	 */
+-	memset((char *)&args, 0, sizeof(args));
+-	args.dp = ip;
+-	args.flags = ATTR_ROOT;
+-	args.whichfork = XFS_ATTR_FORK;
+-	args.name = name;
+-	args.namelen = strlen(name);
+-	args.value = value;
+-	args.valuelen = valuelen;
+-	args.hashval = xfs_da_hashname(args.name, args.namelen);
+-	args.oknoent = 1;
+-
+-	/*
+-	 * Decide on what work routines to call based on the inode size.
+-	 */
+-	if (args.dp->i_d.di_aformat == XFS_DINODE_FMT_LOCAL)
+-		error = xfs_attr_shortform_getvalue(&args);
+-	else if (xfs_bmap_one_block(args.dp, XFS_ATTR_FORK))
+-		error = xfs_attr_leaf_get(&args);
+-	else
+-		error = xfs_attr_node_get(&args);
+-
+-	if (error == EEXIST)
+-		error = 0;
+-
+-	return(error);
+-}
+--- linux-2.6.0-test6/fs/xfs/xfs_bmap.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/xfs_bmap.c	2003-10-05 00:33:24.000000000 -0700
+@@ -5553,7 +5553,7 @@ xfs_getbmap(
+ 	    && DM_EVENT_ENABLED(vp->v_vfsp, ip, DM_EVENT_READ)
+ 	    && whichfork == XFS_DATA_FORK) {
+ 
+-		error = XFS_SEND_DATA(mp, DM_EVENT_READ, bdp, 0, 0, 0, NULL);
++		error = XFS_SEND_DATA(mp, DM_EVENT_READ, vp, 0, 0, 0, NULL);
+ 		if (error)
+ 			return XFS_ERROR(error);
+ 	}
+--- linux-2.6.0-test6/fs/xfs/xfs_buf.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/fs/xfs/xfs_buf.h	2003-10-05 00:33:24.000000000 -0700
+@@ -194,7 +194,10 @@ extern inline xfs_caddr_t xfs_buf_offset
+ 	(bp)->pb_target = (target)
+ 
+ #define XFS_BUF_TARGET(bp)	((bp)->pb_target)
+-#define XFS_BUF_TARGET_DEV(bp)	((bp)->pb_target->pbr_dev)
++
++#define XFS_BUFTARG_NAME(target) \
++	({ char __b[BDEVNAME_SIZE]; bdevname((target->pbr_bdev), __b); __b; })
++	
+ #define XFS_BUF_SET_VTYPE_REF(bp, type, ref)
+ #define XFS_BUF_SET_VTYPE(bp, type)
+ #define XFS_BUF_SET_REF(bp, ref)
+--- linux-2.6.0-test6/fs/xfs/xfs_buf_item.c	2003-06-14 12:17:56.000000000 -0700
++++ 25/fs/xfs/xfs_buf_item.c	2003-10-05 00:33:24.000000000 -0700
+@@ -1007,7 +1007,7 @@ xfs_buf_iodone_callbacks(
+ {
+ 	xfs_log_item_t	*lip;
+ 	static ulong	lasttime;
+-	static dev_t	lastdev;
++	static xfs_buftarg_t *lasttarg;
+ 	xfs_mount_t	*mp;
+ 
+ 	ASSERT(XFS_BUF_FSPRIVATE(bp, void *) != NULL);
+@@ -1045,15 +1045,15 @@ xfs_buf_iodone_callbacks(
+ 			return;
+ 		}
+ 
+-		if ((XFS_BUF_TARGET_DEV(bp) != lastdev) ||
++		if ((XFS_BUF_TARGET(bp) != lasttarg) ||
+ 		    (time_after(jiffies, (lasttime + 5*HZ)))) {
+ 			lasttime = jiffies;
+ 			prdev("XFS write error in file system meta-data "
+ 			      "block 0x%Lx in %s",
+-			      XFS_BUF_TARGET_DEV(bp),
++			      XFS_BUF_TARGET(bp),
+ 			      XFS_BUF_ADDR(bp), mp->m_fsname);
+ 		}
+-		lastdev = XFS_BUF_TARGET_DEV(bp);
++		lasttarg = XFS_BUF_TARGET(bp);
+ 
+ 		if (XFS_BUF_ISASYNC(bp)) {
+ 			/*
+--- linux-2.6.0-test6/fs/xfs/xfs_da_btree.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/xfs_da_btree.c	2003-10-05 00:33:24.000000000 -0700
+@@ -2450,7 +2450,7 @@ xfs_da_buf_make(int nbuf, xfs_buf_t **bp
+ 	dabuf->dirty = 0;
+ #ifdef XFS_DABUF_DEBUG
+ 	dabuf->ra = ra;
+-	dabuf->dev = XFS_BUF_TARGET_DEV(bps[0]);
++	dabuf->target = XFS_BUF_TARGET(bps[0]);
+ 	dabuf->blkno = XFS_BUF_ADDR(bps[0]);
+ #endif
+ 	if (nbuf == 1) {
+@@ -2480,7 +2480,7 @@ xfs_da_buf_make(int nbuf, xfs_buf_t **bp
+ 		s = mutex_spinlock(&xfs_dabuf_global_lock);
+ 		for (p = xfs_dabuf_global_list; p; p = p->next) {
+ 			ASSERT(p->blkno != dabuf->blkno ||
+-			       p->dev != dabuf->dev);
++			       p->target != dabuf->target);
+ 		}
+ 		dabuf->prev = NULL;
+ 		if (xfs_dabuf_global_list)
+--- linux-2.6.0-test6/fs/xfs/xfs_da_btree.h	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/xfs_da_btree.h	2003-10-05 00:33:24.000000000 -0700
+@@ -212,7 +212,7 @@ typedef struct xfs_dabuf {
+ 	inst_t		*ra;		/* return address of caller to make */
+ 	struct xfs_dabuf *next;		/* next in global chain */
+ 	struct xfs_dabuf *prev;		/* previous in global chain */
+-	dev_t		dev;		/* device for buffer */
++	struct xfs_buftarg *target;	/* device for buffer */
+ 	xfs_daddr_t	blkno;		/* daddr first in bps[0] */
+ #endif
+ 	struct xfs_buf	*bps[1];	/* actually nbuf of these */
+--- linux-2.6.0-test6/fs/xfs/xfs_dinode.h	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/xfs_dinode.h	2003-10-05 00:33:24.000000000 -0700
+@@ -439,25 +439,21 @@ void xfs_dfork_next_set(xfs_dinode_t *di
+ /*
+  * File types (mode field)
+  */
+-#define	IFMT		0170000		/* type of file */
+-#define	IFIFO		0010000		/* named pipe (fifo) */
+-#define	IFCHR		0020000		/* character special */
+-#define	IFDIR		0040000		/* directory */
+-#define	IFBLK		0060000		/* block special */
+-#define	IFREG		0100000		/* regular */
+-#define	IFLNK		0120000		/* symbolic link */
+-#define	IFSOCK		0140000		/* socket */
+-#define	IFMNT		0160000		/* mount point */
++#define	IFMT		S_IFMT
++#define	IFSOCK		S_IFSOCK
++#define	IFLNK		S_IFLNK
++#define	IFREG		S_IFREG
++#define	IFBLK		S_IFBLK
++#define	IFDIR		S_IFDIR
++#define	IFCHR		S_IFCHR
++#define	IFIFO		S_IFIFO
+ 
+-/*
+- * File execution and access modes.
+- */
+-#define	ISUID		04000		/* set user id on execution */
+-#define	ISGID		02000		/* set group id on execution */
+-#define	ISVTX		01000		/* sticky directory */
+-#define	IREAD		0400		/* read, write, execute permissions */
+-#define	IWRITE		0200
+-#define	IEXEC		0100
++#define	ISUID		S_ISUID
++#define	ISGID		S_ISGID
++#define	ISVTX		S_ISVTX
++#define	IREAD		S_IRUSR
++#define	IWRITE		S_IWUSR
++#define	IEXEC		S_IXUSR
+ 
+ #if XFS_WANT_FUNCS || (XFS_WANT_SPACE && XFSSO_XFS_BUF_TO_DINODE)
+ xfs_dinode_t *xfs_buf_to_dinode(struct xfs_buf *bp);
+--- linux-2.6.0-test6/fs/xfs/xfs_dir2.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/xfs_dir2.c	2003-10-05 00:33:24.000000000 -0700
+@@ -773,7 +773,7 @@ xfs_dir2_put_dirent64_uio(
+ 	idbp->d_off = pa->cook;
+ 	idbp->d_name[namelen] = '\0';
+ 	memcpy(idbp->d_name, pa->name, namelen);
+-	rval = uiomove((caddr_t)idbp, reclen, UIO_READ, uio);
++	rval = uio_read((caddr_t)idbp, reclen, uio);
+ 	pa->done = (rval == 0);
+ 	return rval;
+ }
+--- linux-2.6.0-test6/fs/xfs/xfs_dir_leaf.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/xfs_dir_leaf.c	2003-10-05 00:33:24.000000000 -0700
+@@ -2225,7 +2225,7 @@ xfs_dir_put_dirent64_uio(xfs_dir_put_arg
+ 	idbp->d_off = pa->cook.o;
+ 	idbp->d_name[namelen] = '\0';
+ 	memcpy(idbp->d_name, pa->name, namelen);
+-	retval = uiomove((caddr_t)idbp, reclen, UIO_READ, uio);
++	retval = uio_read((caddr_t)idbp, reclen, uio);
+ 	pa->done = (retval == 0);
+ 	return retval;
+ }
+--- linux-2.6.0-test6/fs/xfs/xfs_error.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/xfs_error.c	2003-10-05 00:33:24.000000000 -0700
+@@ -329,6 +329,7 @@ xfs_corruption_error(
+ 	int		linenum,
+ 	inst_t		*ra)
+ {
+-	xfs_hex_dump(p, 16);
++	if (level <= xfs_error_level)
++		xfs_hex_dump(p, 16);
+ 	xfs_error_report(tag, level, mp, fname, linenum, ra);
+ }
+--- linux-2.6.0-test6/fs/xfs/xfs_error.h	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/xfs_error.h	2003-10-05 00:33:24.000000000 -0700
+@@ -32,8 +32,8 @@
+ #ifndef	__XFS_ERROR_H__
+ #define	__XFS_ERROR_H__
+ 
+-#define prdev(fmt,dev,args...) \
+-	printk("XFS: device %u:%u- " fmt "\n", MAJOR(dev), MINOR(dev), ## args)
++#define prdev(fmt,targ,args...) \
++	printk("XFS: device %s- " fmt "\n", XFS_BUFTARG_NAME(targ), ## args)
+ 
+ #define XFS_ERECOVER	1	/* Failure to recover log */
+ #define XFS_ELOGSTAT	2	/* Failure to stat log in user space */
+--- linux-2.6.0-test6/fs/xfs/xfs_fs.h	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/xfs_fs.h	2003-10-05 00:33:24.000000000 -0700
+@@ -392,22 +392,17 @@ typedef struct xfs_fsop_attrmulti_handle
+ } xfs_fsop_attrmulti_handlereq_t;
+ 
+ /*
+- * File system identifier. Should be unique (at least per machine).
++ * per machine unique filesystem identifier types.
+  */
+-typedef struct {
+-	__u32 val[2];			/* file system id type */
+-} xfs_fsid_t;
++typedef struct { __u32 val[2]; } xfs_fsid_t; /* file system id type */
++
+ 
+-/*
+- * File identifier.  Should be unique per filesystem on a single machine.
+- * This is typically called by a stateless file server in order to generate
+- * "file handles".
+- */
+ #ifndef HAVE_FID
+ #define MAXFIDSZ	46
++
+ typedef struct fid {
+ 	__u16		fid_len;		/* length of data in bytes */
+-	unsigned char	fid_data[MAXFIDSZ];	/* data (variable length)  */
++	unsigned char	fid_data[MAXFIDSZ];	/* data (fid_len worth)  */
+ } fid_t;
+ #endif
+ 
+--- linux-2.6.0-test6/fs/xfs/xfsidbg.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/xfsidbg.c	2003-10-05 00:33:24.000000000 -0700
+@@ -3739,9 +3739,9 @@ xfsidbg_xdabuf(xfs_dabuf_t *dabuf)
+ 		kdb_printf(" %d:0x%p", i, dabuf->bps[i]);
+ 	kdb_printf("\n");
+ #ifdef XFS_DABUF_DEBUG
+-	kdb_printf(" ra 0x%x prev 0x%x next 0x%x dev %u:%u blkno 0x%x\n",
++	kdb_printf(" ra 0x%x prev 0x%x next 0x%x dev %s blkno 0x%x\n",
+ 		dabuf->ra, dabuf->prev, dabuf->next,
+-		MAJOR(dabuf->dev), MINOR(dabuf->dev), dabuf->blkno);
++		XFS_BUFTARG_NAME(dabuf->dev), dabuf->blkno);
+ #endif
+ }
+ 
+@@ -4269,9 +4269,8 @@ xfsidbg_xlog(xlog_t *log)
+ 			xfsidbg_get_cstate(log->l_covered_state));
+ 	kdb_printf("flags: ");
+ 	printflags(log->l_flags, t_flags,"log");
+-	kdb_printf("  dev: %u:%u logBBstart: %lld logsize: %d logBBsize: %d\n",
+-		MAJOR(log->l_dev), MINOR(log->l_dev),
+-		(long long) log->l_logBBstart,
++	kdb_printf("  dev: %s logBBstart: %lld logsize: %d logBBsize: %d\n",
++		XFS_BUFTARG_NAME(log->l_targ), (long long) log->l_logBBstart,
+ 		log->l_logsize,log->l_logBBsize);
+ 	kdb_printf("curr_cycle: %d  prev_cycle: %d  curr_block: %d  prev_block: %d\n",
+ 	     log->l_curr_cycle, log->l_prev_cycle, log->l_curr_block,
+@@ -4646,14 +4645,14 @@ xfsidbg_xmount(xfs_mount_t *mp)
+ 		XFS_MTOVFS(mp), mp->m_tid, &mp->m_ail_lock, &mp->m_ail);
+ 	kdb_printf("ail_gen 0x%x &sb 0x%p\n",
+ 		mp->m_ail_gen, &mp->m_sb);
+-	kdb_printf("sb_lock 0x%p sb_bp 0x%p dev %u:%u logdev %u:%u rtdev %u:%u\n",
++	kdb_printf("sb_lock 0x%p sb_bp 0x%p dev %s logdev %s rtdev %s\n",
+ 		&mp->m_sb_lock, mp->m_sb_bp,
+-		mp->m_ddev_targp ? MAJOR(mp->m_ddev_targp->pbr_dev) : 0,
+-		mp->m_ddev_targp ? MINOR(mp->m_ddev_targp->pbr_dev) : 0,
+-		mp->m_logdev_targp ? MAJOR(mp->m_logdev_targp->pbr_dev) : 0,
+-		mp->m_logdev_targp ? MINOR(mp->m_logdev_targp->pbr_dev) : 0,
+-		mp->m_rtdev_targp ? MAJOR(mp->m_rtdev_targp->pbr_dev) : 0,
+-		mp->m_rtdev_targp ? MINOR(mp->m_rtdev_targp->pbr_dev) : 0);
++		mp->m_ddev_targp ?
++			XFS_BUFTARG_NAME(mp->m_ddev_targp) : "none",
++		mp->m_logdev_targp ?
++			XFS_BUFTARG_NAME(mp->m_logdev_targp) : "none",
++		mp->m_rtdev_targp ?
++			XFS_BUFTARG_NAME(mp->m_rtdev_targp) : "none");
+ 	kdb_printf("bsize %d agfrotor %d agirotor %d ihash 0x%p ihsize %d\n",
+ 		mp->m_bsize, mp->m_agfrotor, mp->m_agirotor,
+ 		mp->m_ihash, mp->m_ihsize);
+@@ -4824,9 +4823,8 @@ xfsidbg_xnode(xfs_inode_t *ip)
+ 		ip->i_mnext,
+ 		ip->i_mprev,
+ 		XFS_ITOV_NULL(ip));
+-	kdb_printf("dev %u:%u ino %s\n",
+-		MAJOR(ip->i_mount->m_dev),
+-		MINOR(ip->i_mount->m_dev),
++	kdb_printf("dev %s ino %s\n",
++		XFS_BUFTARG_NAME(ip->i_mount->m_ddev_targp),
+ 		xfs_fmtino(ip->i_ino, ip->i_mount));
+ 	kdb_printf("blkno 0x%llx len 0x%x boffset 0x%x\n",
+ 		(long long) ip->i_blkno,
+--- linux-2.6.0-test6/fs/xfs/xfs_inode.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/xfs_inode.c	2003-10-05 00:33:24.000000000 -0700
+@@ -408,8 +408,9 @@ xfs_itobp(
+ 		if (unlikely(XFS_TEST_ERROR(!di_ok, mp, XFS_ERRTAG_ITOBP_INOTOBP,
+ 				 XFS_RANDOM_ITOBP_INOTOBP))) {
+ #ifdef DEBUG
+-			prdev("bad inode magic/vsn daddr 0x%llx #%d (magic=%x)",
+-				mp->m_dev, (unsigned long long)imap.im_blkno, i,
++			prdev("bad inode magic/vsn daddr %lld #%d (magic=%x)",
++				mp->m_ddev_targp,
++				(unsigned long long)imap.im_blkno, i,
+ 				INT_GET(dip->di_core.di_magic, ARCH_CONVERT));
+ #endif
+ 			XFS_CORRUPTION_ERROR("xfs_itobp", XFS_ERRLEVEL_HIGH,
+--- linux-2.6.0-test6/fs/xfs/xfs_log.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/xfs_log.c	2003-10-05 00:33:24.000000000 -0700
+@@ -65,7 +65,7 @@ STATIC int	 xlog_bdstrat_cb(struct xfs_b
+ STATIC int	 xlog_commit_record(xfs_mount_t *mp, xlog_ticket_t *ticket,
+ 				    xlog_in_core_t **, xfs_lsn_t *);
+ STATIC xlog_t *  xlog_alloc_log(xfs_mount_t	*mp,
+-				dev_t		log_dev,
++				xfs_buftarg_t	*log_target,
+ 				xfs_daddr_t	blk_offset,
+ 				int		num_bblks);
+ STATIC int	 xlog_space_left(xlog_t *log, int cycle, int bytes);
+@@ -155,7 +155,7 @@ int xlog_error_mod = 33;
+  */
+ #if defined(XLOG_NOLOG) || defined(DEBUG)
+ int   xlog_debug = 1;
+-dev_t xlog_devt  = 0;
++xfs_buftarg_t *xlog_target;
+ #endif
+ 
+ #if defined(XFS_LOG_TRACE)
+@@ -274,7 +274,7 @@ xfs_log_done(xfs_mount_t	*mp,
+ 	xfs_lsn_t	lsn	= 0;
+ 
+ #if defined(DEBUG) || defined(XLOG_NOLOG)
+-	if (! xlog_debug && xlog_devt == log->l_dev)
++	if (!xlog_debug && xlog_target == log->l_targ)
+ 		return 0;
+ #endif
+ 
+@@ -339,7 +339,7 @@ xfs_log_force(xfs_mount_t *mp,
+ 	xlog_t *log = mp->m_log;
+ 
+ #if defined(DEBUG) || defined(XLOG_NOLOG)
+-	if (! xlog_debug && xlog_devt == log->l_dev)
++	if (!xlog_debug && xlog_target == log->l_targ)
+ 		return 0;
+ #endif
+ 
+@@ -378,7 +378,7 @@ xfs_log_notify(xfs_mount_t	  *mp,		/* mo
+ 	int	abortflg, spl;
+ 
+ #if defined(DEBUG) || defined(XLOG_NOLOG)
+-	if (! xlog_debug && xlog_devt == log->l_dev)
++	if (!xlog_debug && xlog_target == log->l_targ)
+ 		return 0;
+ #endif
+ 	cb->cb_next = 0;
+@@ -436,7 +436,7 @@ xfs_log_reserve(xfs_mount_t	 *mp,
+ 	int		retval;
+ 
+ #if defined(DEBUG) || defined(XLOG_NOLOG)
+-	if (! xlog_debug && xlog_devt == log->l_dev)
++	if (!xlog_debug && xlog_target == log->l_targ)
+ 		return 0;
+ #endif
+ 	retval = 0;
+@@ -472,7 +472,7 @@ xfs_log_reserve(xfs_mount_t	 *mp,
+  * Mount a log filesystem
+  *
+  * mp		- ubiquitous xfs mount point structure
+- * log_dev	- device number of on-disk log device
++ * log_target	- buftarg of on-disk log device
+  * blk_offset	- Start block # where block size is 512 bytes (BBSIZE)
+  * num_bblocks	- Number of BBSIZE blocks in on-disk log
+  *
+@@ -480,7 +480,7 @@ xfs_log_reserve(xfs_mount_t	 *mp,
+  */
+ int
+ xfs_log_mount(xfs_mount_t	*mp,
+-	      dev_t		log_dev,
++	      xfs_buftarg_t	*log_target,
+ 	      xfs_daddr_t	blk_offset,
+ 	      int		num_bblks)
+ {
+@@ -493,12 +493,11 @@ xfs_log_mount(xfs_mount_t	*mp,
+ 		ASSERT(XFS_MTOVFS(mp)->vfs_flag & VFS_RDONLY);
+ 	}
+ 
+-	mp->m_log = xlog_alloc_log(mp, log_dev, blk_offset, num_bblks);
++	mp->m_log = xlog_alloc_log(mp, log_target, blk_offset, num_bblks);
+ 
+ #if defined(DEBUG) || defined(XLOG_NOLOG)
+-	if (! xlog_debug) {
+-		cmn_err(CE_NOTE, "log dev: %u:%u",
+-			MAJOR(log_dev), MINOR(log_dev));
++	if (!xlog_debug) {
++		cmn_err(CE_NOTE, "log dev: %s", XFS_BUFTARG_NAME(log_target));
+ 		return 0;
+ 	}
+ #endif
+@@ -606,7 +605,7 @@ xfs_log_unmount_write(xfs_mount_t *mp)
+ 	} magic = { XLOG_UNMOUNT_TYPE, 0, 0 };
+ 
+ #if defined(DEBUG) || defined(XLOG_NOLOG)
+-	if (! xlog_debug && xlog_devt == log->l_dev)
++	if (!xlog_debug && xlog_target == log->l_targ)
+ 		return 0;
+ #endif
+ 
+@@ -734,9 +733,9 @@ xfs_log_write(xfs_mount_t *	mp,
+ {
+ 	int	error;
+ 	xlog_t *log = mp->m_log;
+-#if defined(DEBUG) || defined(XLOG_NOLOG)
+ 
+-	if (! xlog_debug && xlog_devt == log->l_dev) {
++#if defined(DEBUG) || defined(XLOG_NOLOG)
++	if (!xlog_debug && xlog_target == log->l_targ) {
+ 		*start_lsn = 0;
+ 		return 0;
+ 	}
+@@ -761,7 +760,7 @@ xfs_log_move_tail(xfs_mount_t	*mp,
+ 	SPLDECL(s);
+ 
+ #if defined(DEBUG) || defined(XLOG_NOLOG)
+-	if (!xlog_debug && xlog_devt == log->l_dev)
++	if (!xlog_debug && xlog_target == log->l_targ)
+ 		return;
+ #endif
+ 	/* XXXsup tmp */
+@@ -1059,14 +1058,14 @@ xlog_get_iclog_buffer_size(xfs_mount_t	*
+ 	/*
+ 	 * When logbufs == 0, someone has disabled the log from the FSTAB
+ 	 * file.  This is not a documented feature.  We need to set xlog_debug
+-	 * to zero (this deactivates the log) and set xlog_devt to the
++	 * to zero (this deactivates the log) and set xlog_target to the
+ 	 * appropriate dev_t.  Only one filesystem may be affected as such
+ 	 * since this is just a performance hack to test what we might be able
+ 	 * to get if the log were not present.
+ 	 */
+ 	if (mp->m_logbufs == 0) {
+ 		xlog_debug = 0;
+-		xlog_devt = log->l_dev;
++		xlog_target = log->l_targ;
+ 		log->l_iclog_bufs = XLOG_MIN_ICLOGS;
+ 	} else
+ #endif
+@@ -1089,8 +1088,8 @@ xlog_get_iclog_buffer_size(xfs_mount_t	*
+ 
+ #if defined(DEBUG) || defined(XLOG_NOLOG)
+ 		/* We are reactivating a filesystem after it was active */
+-		if (log->l_dev == xlog_devt) {
+-			xlog_devt = 1;
++		if (log->l_targ == xlog_target) {
++			xlog_target = 1; /* XXX(hch): WTF? */
+ 			xlog_debug = 1;
+ 		}
+ #endif
+@@ -1176,7 +1175,7 @@ xlog_get_iclog_buffer_size(xfs_mount_t	*
+  */
+ STATIC xlog_t *
+ xlog_alloc_log(xfs_mount_t	*mp,
+-	       dev_t		log_dev,
++	       xfs_buftarg_t	*log_target,
+ 	       xfs_daddr_t	blk_offset,
+ 	       int		num_bblks)
+ {
+@@ -1191,7 +1190,7 @@ xlog_alloc_log(xfs_mount_t	*mp,
+ 	log = (xlog_t *)kmem_zalloc(sizeof(xlog_t), KM_SLEEP);
+ 
+ 	log->l_mp	   = mp;
+-	log->l_dev	   = log_dev;
++	log->l_targ	   = log_target;
+ 	log->l_logsize     = BBTOB(num_bblks);
+ 	log->l_logBBstart  = blk_offset;
+ 	log->l_logBBsize   = num_bblks;
+--- linux-2.6.0-test6/fs/xfs/xfs_log.h	2003-06-14 12:18:52.000000000 -0700
++++ 25/fs/xfs/xfs_log.h	2003-10-05 00:33:24.000000000 -0700
+@@ -153,10 +153,10 @@ xfs_lsn_t xfs_log_done(struct xfs_mount 
+ int	  xfs_log_force(struct xfs_mount *mp,
+ 			xfs_lsn_t	 lsn,
+ 			uint		 flags);
+-int	  xfs_log_mount(struct xfs_mount *mp,
+-			dev_t		 log_dev,
+-			xfs_daddr_t		 start_block,
+-			int		 num_bblocks);
++int	  xfs_log_mount(struct xfs_mount	*mp,
++			struct xfs_buftarg	*log_target,
++			xfs_daddr_t		start_block,
++			int		 	num_bblocks);
+ int	  xfs_log_mount_finish(struct xfs_mount *mp, int);
+ void	  xfs_log_move_tail(struct xfs_mount	*mp,
+ 			    xfs_lsn_t		tail_lsn);
+--- linux-2.6.0-test6/fs/xfs/xfs_log_priv.h	2003-08-08 22:55:13.000000000 -0700
++++ 25/fs/xfs/xfs_log_priv.h	2003-10-05 00:33:24.000000000 -0700
+@@ -504,7 +504,7 @@ typedef struct log {
+ 	struct xfs_mount	*l_mp;	        /* mount point */
+ 	struct xfs_buf		*l_xbuf;        /* extra buffer for log
+ 						 * wrapping */
+-	dev_t			l_dev;	        /* dev_t of log */
++	struct xfs_buftarg	*l_targ;        /* buftarg of log */
+ 	xfs_daddr_t		l_logBBstart;   /* start block of log */
+ 	int			l_logsize;      /* size of log in bytes */
+ 	int			l_logBBsize;    /* size of log in BB chunks */
+--- linux-2.6.0-test6/fs/xfs/xfs_log_recover.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/xfs_log_recover.c	2003-10-05 00:33:24.000000000 -0700
+@@ -2179,8 +2179,8 @@ xlog_recover_do_buffer_trans(
+ 		break;
+ 	default:
+ 		xfs_fs_cmn_err(CE_ALERT, log->l_mp,
+-			"xfs_log_recover: unknown buffer type 0x%x, dev %u:%u",
+-			buf_f->blf_type, MAJOR(log->l_dev), MINOR(log->l_dev));
++			"xfs_log_recover: unknown buffer type 0x%x, dev %s",
++			buf_f->blf_type, XFS_BUFTARG_NAME(log->l_targ));
+ 		XFS_ERROR_REPORT("xlog_recover_do_buffer_trans",
+ 				 XFS_ERRLEVEL_LOW, log->l_mp);
+ 		return XFS_ERROR(EFSCORRUPTED);
+@@ -3889,9 +3889,8 @@ xlog_recover(
+ 		}
+ 
+ 		cmn_err(CE_NOTE,
+-			"Starting XFS recovery on filesystem: %s (dev: %d/%d)",
+-			log->l_mp->m_fsname, MAJOR(log->l_dev),
+-			MINOR(log->l_dev));
++			"Starting XFS recovery on filesystem: %s (dev: %s)",
++			log->l_mp->m_fsname, XFS_BUFTARG_NAME(log->l_targ));
+ 
+ 		error = xlog_do_recover(log, head_blk, tail_blk);
+ 		log->l_flags |= XLOG_RECOVERY_NEEDED;
+@@ -3939,10 +3938,8 @@ xlog_recover_finish(
+ 		xlog_recover_check_summary(log);
+ 
+ 		cmn_err(CE_NOTE,
+-			"Ending XFS recovery on filesystem: %s (dev: %d/%d)",
+-			log->l_mp->m_fsname, MAJOR(log->l_dev),
+-			MINOR(log->l_dev));
+-
++			"Ending XFS recovery on filesystem: %s (dev: %s)",
++			log->l_mp->m_fsname, XFS_BUFTARG_NAME(log->l_targ));
+ 		log->l_flags &= ~XLOG_RECOVERY_NEEDED;
+ 	} else {
+ 		cmn_err(CE_DEBUG,
+--- linux-2.6.0-test6/fs/xfs/xfs_mount.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/xfs_mount.c	2003-10-05 00:33:24.000000000 -0700
+@@ -285,9 +285,9 @@ xfs_mount_validate_sb(
+ #if !XFS_BIG_BLKNOS
+ 	if (unlikely(
+ 	    (sbp->sb_dblocks << (__uint64_t)(sbp->sb_blocklog - BBSHIFT))
+-		> INT_MAX ||
++		> UINT_MAX ||
+ 	    (sbp->sb_rblocks << (__uint64_t)(sbp->sb_blocklog - BBSHIFT))
+-		> INT_MAX)) {
++		> UINT_MAX)) {
+ 		cmn_err(CE_WARN,
+ 	"XFS: File system is too large to be mounted on this system.");
+ 		return XFS_ERROR(E2BIG);
+@@ -949,7 +949,7 @@ xfs_mountfs(
+ 	 * log's mount-time initialization. Perform 1st part recovery if needed
+ 	 */
+ 	if (likely(sbp->sb_logblocks > 0)) {	/* check for volume case */
+-		error = xfs_log_mount(mp, mp->m_logdev_targp->pbr_dev,
++		error = xfs_log_mount(mp, mp->m_logdev_targp,
+ 				      XFS_FSB_TO_DADDR(mp, sbp->sb_logstart),
+ 				      XFS_FSB_TO_BB(mp, sbp->sb_logblocks));
+ 		if (error) {
+@@ -980,7 +980,7 @@ xfs_mountfs(
+ 	if (unlikely((rip->i_d.di_mode & IFMT) != IFDIR)) {
+ 		cmn_err(CE_WARN, "XFS: corrupted root inode");
+ 		prdev("Root inode %llu is not a directory",
+-		      mp->m_dev, (unsigned long long)rip->i_ino);
++		      mp->m_ddev_targp, (unsigned long long)rip->i_ino);
+ 		xfs_iunlock(rip, XFS_ILOCK_EXCL);
+ 		XFS_ERROR_REPORT("xfs_mountfs_int(2)", XFS_ERRLEVEL_LOW,
+ 				 mp);
+--- linux-2.6.0-test6/fs/xfs/xfs_mount.h	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/xfs_mount.h	2003-10-05 00:33:24.000000000 -0700
+@@ -91,10 +91,10 @@ struct xfs_bmap_free;
+  * Prototypes and functions for the Data Migration subsystem.
+  */
+ 
+-typedef int	(*xfs_send_data_t)(int, struct bhv_desc *,
++typedef int	(*xfs_send_data_t)(int, struct vnode *,
+ 			xfs_off_t, size_t, int, vrwlock_t *);
+ typedef int	(*xfs_send_mmap_t)(struct vm_area_struct *, uint);
+-typedef int	(*xfs_send_destroy_t)(struct bhv_desc *, dm_right_t);
++typedef int	(*xfs_send_destroy_t)(struct vnode *, dm_right_t);
+ typedef int	(*xfs_send_namesp_t)(dm_eventtype_t, struct vnode *,
+ 			dm_right_t, struct vnode *, dm_right_t,
+ 			char *, char *, mode_t, int, int);
+@@ -109,12 +109,12 @@ typedef struct xfs_dmops {
+ 	xfs_send_unmount_t	xfs_send_unmount;
+ } xfs_dmops_t;
+ 
+-#define XFS_SEND_DATA(mp, ev,bdp,off,len,fl,lock) \
+-	(*(mp)->m_dm_ops.xfs_send_data)(ev,bdp,off,len,fl,lock)
++#define XFS_SEND_DATA(mp, ev,vp,off,len,fl,lock) \
++	(*(mp)->m_dm_ops.xfs_send_data)(ev,vp,off,len,fl,lock)
+ #define XFS_SEND_MMAP(mp, vma,fl) \
+ 	(*(mp)->m_dm_ops.xfs_send_mmap)(vma,fl)
+-#define XFS_SEND_DESTROY(mp, bdp,right) \
+-	(*(mp)->m_dm_ops.xfs_send_destroy)(bdp,right)
++#define XFS_SEND_DESTROY(mp, vp,right) \
++	(*(mp)->m_dm_ops.xfs_send_destroy)(vp,right)
+ #define XFS_SEND_NAMESP(mp, ev,b1,r1,b2,r2,n1,n2,mode,rval,fl) \
+ 	(*(mp)->m_dm_ops.xfs_send_namesp)(ev,b1,r1,b2,r2,n1,n2,mode,rval,fl)
+ #define XFS_SEND_UNMOUNT(mp, vfsp,vp,right,mode,rval,fl) \
+--- linux-2.6.0-test6/fs/xfs/xfs_rw.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/xfs_rw.c	2003-10-05 00:33:24.000000000 -0700
+@@ -260,11 +260,10 @@ xfs_ioerror_alert(
+ 	xfs_daddr_t		blkno)
+ {
+ 	cmn_err(CE_ALERT,
+- "I/O error in filesystem (\"%s\") meta-data dev %u:%u block 0x%llx"
++ "I/O error in filesystem (\"%s\") meta-data dev %s block 0x%llx"
+  "       (\"%s\") error %d buf count %u",
+ 		(!mp || !mp->m_fsname) ? "(fs name not set)" : mp->m_fsname,
+-		MAJOR(XFS_BUF_TARGET_DEV(bp)),
+-		MINOR(XFS_BUF_TARGET_DEV(bp)),
++		XFS_BUFTARG_NAME(bp->pb_target),
+ 		(__uint64_t)blkno,
+ 		func,
+ 		XFS_BUF_GETERROR(bp),
+--- linux-2.6.0-test6/fs/xfs/xfs_trans_buf.c	2003-06-14 12:17:57.000000000 -0700
++++ 25/fs/xfs/xfs_trans_buf.c	2003-10-05 00:33:24.000000000 -0700
+@@ -264,7 +264,7 @@ xfs_trans_getsb(xfs_trans_t	*tp,
+ }
+ 
+ #ifdef DEBUG
+-dev_t	xfs_error_dev = 0;
++xfs_buftarg_t *xfs_error_target;
+ int	xfs_do_error;
+ int	xfs_req_num;
+ int	xfs_error_mod = 33;
+@@ -322,7 +322,7 @@ xfs_trans_read_buf(
+ 		}
+ #ifdef DEBUG
+ 		if (xfs_do_error && (bp != NULL)) {
+-			if (xfs_error_dev == target->pbr_dev) {
++			if (xfs_error_target == target) {
+ 				if (((xfs_req_num++) % xfs_error_mod) == 0) {
+ 					xfs_buf_relse(bp);
+ 					printk("Returning error!\n");
+@@ -425,7 +425,7 @@ xfs_trans_read_buf(
+ 	}
+ #ifdef DEBUG
+ 	if (xfs_do_error && !(tp->t_flags & XFS_TRANS_DIRTY)) {
+-		if (xfs_error_dev == target->pbr_dev) {
++		if (xfs_error_target == target) {
+ 			if (((xfs_req_num++) % xfs_error_mod) == 0) {
+ 				xfs_force_shutdown(tp->t_mountp,
+ 						   XFS_METADATA_IO_ERROR);
+--- linux-2.6.0-test6/fs/xfs/xfs_trans.h	2003-08-08 22:55:13.000000000 -0700
++++ 25/fs/xfs/xfs_trans.h	2003-10-05 00:33:24.000000000 -0700
+@@ -995,7 +995,6 @@ void		xfs_trans_dquot_buf(xfs_trans_t *,
+ void		xfs_trans_inode_alloc_buf(xfs_trans_t *, struct xfs_buf *);
+ int		xfs_trans_iget(struct xfs_mount *, xfs_trans_t *,
+ 			       xfs_ino_t , uint, struct xfs_inode **);
+-void		xfs_trans_iput(xfs_trans_t *, struct xfs_inode *, uint);
+ void		xfs_trans_ijoin(xfs_trans_t *, struct xfs_inode *, uint);
+ void		xfs_trans_ihold(xfs_trans_t *, struct xfs_inode *);
+ void		xfs_trans_ihold_release(xfs_trans_t *, struct xfs_inode *);
+--- linux-2.6.0-test6/fs/xfs/xfs_trans_inode.c	2003-06-14 12:17:56.000000000 -0700
++++ 25/fs/xfs/xfs_trans_inode.c	2003-10-05 00:33:24.000000000 -0700
+@@ -188,106 +188,6 @@ xfs_trans_iget(
+ 
+ 
+ /*
+- * Release the inode ip which was previously acquired with xfs_trans_iget()
+- * or added with xfs_trans_ijoin(). This will decrement the lock
+- * recursion count of the inode item.  If the count goes to less than 0,
+- * the inode will be unlocked and disassociated from the transaction.
+- *
+- * If the inode has been modified within the transaction, it will not be
+- * unlocked until the transaction commits.
+- */
+-void
+-xfs_trans_iput(
+-	xfs_trans_t	*tp,
+-	xfs_inode_t	*ip,
+-	uint		lock_flags)
+-{
+-	xfs_inode_log_item_t	*iip;
+-	xfs_log_item_desc_t	*lidp;
+-
+-	/*
+-	 * If the transaction pointer is NULL, just call xfs_iput().
+-	 */
+-	if (tp == NULL) {
+-		xfs_iput(ip, lock_flags);
+-	}
+-
+-	ASSERT(ip->i_transp == tp);
+-	iip = ip->i_itemp;
+-	ASSERT(iip != NULL);
+-
+-	/*
+-	 * Find the item descriptor pointing to this inode's
+-	 * log item.  It must be there.
+-	 */
+-	lidp = xfs_trans_find_item(tp, (xfs_log_item_t*)iip);
+-	ASSERT(lidp != NULL);
+-	ASSERT(lidp->lid_item == (xfs_log_item_t*)iip);
+-
+-	/*
+-	 * Be consistent about the bookkeeping for the inode's
+-	 * io lock, but it doesn't mean much really.
+-	 */
+-	ASSERT((iip->ili_flags & XFS_ILI_IOLOCKED_ANY) != XFS_ILI_IOLOCKED_ANY);
+-	if (lock_flags & (XFS_IOLOCK_EXCL | XFS_IOLOCK_SHARED)) {
+-		ASSERT(iip->ili_flags & XFS_ILI_IOLOCKED_ANY);
+-		ASSERT((!(lock_flags & XFS_IOLOCK_EXCL)) ||
+-		       (iip->ili_flags & XFS_ILI_IOLOCKED_EXCL));
+-		ASSERT((!(lock_flags & XFS_IOLOCK_SHARED)) ||
+-		       (iip->ili_flags &
+-			(XFS_ILI_IOLOCKED_EXCL | XFS_ILI_IOLOCKED_SHARED)));
+-		if (iip->ili_iolock_recur > 0) {
+-			iip->ili_iolock_recur--;
+-		}
+-	}
+-
+-	/*
+-	 * If the release is just for a recursive lock on the inode lock,
+-	 * then decrement the count and return.  We can assert that
+-	 * the caller is dropping an EXCL lock on the inode, because
+-	 * inode must be locked EXCL within transactions.
+-	 */
+-	ASSERT(lock_flags & XFS_ILOCK_EXCL);
+-	if (iip->ili_ilock_recur > 0) {
+-		iip->ili_ilock_recur--;
+-		return;
+-	}
+-	ASSERT(iip->ili_iolock_recur == 0);
+-
+-	/*
+-	 * If the inode was dirtied within this transaction, it cannot
+-	 * be released until the transaction commits.
+-	 */
+-	if (lidp->lid_flags & XFS_LID_DIRTY) {
+-		return;
+-	}
+-
+-	xfs_trans_free_item(tp, lidp);
+-
+-	/*
+-	 * Clear the hold and iolocked flags in the inode log item.
+-	 * We wouldn't want the next user of the inode to
+-	 * get confused.  Assert that if the iolocked flag is set
+-	 * in the item then we are unlocking it in the call to xfs_iput()
+-	 * below.
+-	 */
+-	ASSERT((!(iip->ili_flags & XFS_ILI_IOLOCKED_ANY)) ||
+-	       (lock_flags & (XFS_IOLOCK_EXCL | XFS_IOLOCK_SHARED)));
+-	if (iip->ili_flags & (XFS_ILI_HOLD | XFS_ILI_IOLOCKED_ANY)) {
+-		iip->ili_flags &= ~(XFS_ILI_HOLD | XFS_ILI_IOLOCKED_ANY);
+-	}
+-
+-	/*
+-	 * Unlike xfs_brelse() the inode log item cannot be
+-	 * freed, because it is embedded within the inode.
+-	 * All we have to do is release the inode.
+-	 */
+-	xfs_iput(ip, lock_flags);
+-	return;
+-}
+-
+-
+-/*
+  * Add the locked inode to the transaction.
+  * The inode must be locked, and it cannot be associated with any
+  * transaction.  The caller must specify the locks already held
+--- linux-2.6.0-test6/fs/xfs/xfs_types.h	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/xfs_types.h	2003-10-05 00:33:24.000000000 -0700
+@@ -83,7 +83,7 @@ typedef __uint64_t __psunsigned_t;
+  * XFS_BIG_INUMS needs the VFS inode number to be 64 bits, as well
+  * as requiring XFS_BIG_BLKNOS to be set.
+  */
+-#if defined(CONFIG_LBD) || (defined(HAVE_SECTOR_T) && (BITS_PER_LONG == 64))
++#if defined(CONFIG_LBD) || (BITS_PER_LONG == 64)
+ # define XFS_BIG_BLKNOS	1
+ # if BITS_PER_LONG == 64
+ #  define XFS_BIG_INUMS	1
+--- linux-2.6.0-test6/fs/xfs/xfs_vfsops.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/xfs_vfsops.c	2003-10-05 00:33:24.000000000 -0700
+@@ -1776,7 +1776,6 @@ xfs_showargs(
+ 	};
+ 	struct proc_xfs_info	*xfs_infop;
+ 	struct xfs_mount	*mp = XFS_BHVTOM(bhv);
+-	char			b[BDEVNAME_SIZE];
+ 
+ 	for (xfs_infop = xfs_info; xfs_infop->flag; xfs_infop++) {
+ 		if (mp->m_flags & xfs_infop->flag)
+@@ -1792,14 +1791,13 @@ xfs_showargs(
+ 	if (mp->m_logbsize > 0)
+ 		seq_printf(m, "," MNTOPT_LOGBSIZE "=%d", mp->m_logbsize);
+ 
+-	if (mp->m_ddev_targp->pbr_dev != mp->m_logdev_targp->pbr_dev)
++	if (mp->m_ddev_targp != mp->m_logdev_targp)
+ 		seq_printf(m, "," MNTOPT_LOGDEV "=%s",
+-				bdevname(mp->m_logdev_targp->pbr_bdev, b));
++				XFS_BUFTARG_NAME(mp->m_logdev_targp));
+ 
+-	if (mp->m_rtdev_targp &&
+-	    mp->m_ddev_targp->pbr_dev != mp->m_rtdev_targp->pbr_dev)
++	if (mp->m_rtdev_targp && mp->m_ddev_targp != mp->m_rtdev_targp)
+ 		seq_printf(m, "," MNTOPT_RTDEV "=%s",
+-				bdevname(mp->m_rtdev_targp->pbr_bdev, b));
++				XFS_BUFTARG_NAME(mp->m_rtdev_targp));
+ 
+ 	if (mp->m_dalign > 0)
+ 		seq_printf(m, "," MNTOPT_SUNIT "=%d",
+--- linux-2.6.0-test6/fs/xfs/xfs_vnodeops.c	2003-09-27 18:57:46.000000000 -0700
++++ 25/fs/xfs/xfs_vnodeops.c	2003-10-05 00:33:24.000000000 -0700
+@@ -144,14 +144,11 @@ xfs_getattr(
+ 		xfs_ilock(ip, XFS_ILOCK_SHARED);
+ 
+ 	vap->va_size = ip->i_d.di_size;
+-	if (vap->va_mask == XFS_AT_SIZE) {
+-		if (!(flags & ATTR_LAZY))
+-			xfs_iunlock(ip, XFS_ILOCK_SHARED);
+-		return 0;
+-	}
++	if (vap->va_mask == XFS_AT_SIZE)
++		goto all_done;
++
+ 	vap->va_nblocks =
+ 		XFS_FSB_TO_BB(mp, ip->i_d.di_nblocks + ip->i_delayed_blks);
+-	vap->va_fsid = mp->m_dev;
+ 	vap->va_nodeid = ip->i_ino;
+ #if XFS_BIG_INUMS
+ 	vap->va_nodeid += mp->m_inoadd;
+@@ -163,11 +160,8 @@ xfs_getattr(
+ 	 */
+ 	if ((vap->va_mask &
+ 	    ~(XFS_AT_SIZE|XFS_AT_FSID|XFS_AT_NODEID|
+-	      XFS_AT_NLINK|XFS_AT_BLKSIZE)) == 0) {
+-		if (!(flags & ATTR_LAZY))
+-			xfs_iunlock(ip, XFS_ILOCK_SHARED);
+-		return 0;
+-	}
++	      XFS_AT_NLINK|XFS_AT_BLKSIZE)) == 0)
++		goto all_done;
+ 
+ 	/*
+ 	 * Copy from in-core inode.
+@@ -194,7 +188,7 @@ xfs_getattr(
+ 			 * stripe size through is not a good
+ 			 * idea for now.
+ 			 */
+-			vap->va_blksize = mp->m_swidth ?
++			vap->va_blocksize = mp->m_swidth ?
+ 				/*
+ 				 * If the underlying volume is a stripe, then
+ 				 * return the stripe width in bytes as the
+@@ -211,7 +205,7 @@ xfs_getattr(
+ 					       mp->m_writeio_log));
+ 
+ #else
+-			vap->va_blksize =
++			vap->va_blocksize =
+ 				/*
+ 				 * Return the largest of the preferred buffer
+ 				 * sizes since doing small I/Os into larger
+@@ -229,13 +223,13 @@ xfs_getattr(
+ 			 * realtime extent size or the realtime volume's
+ 			 * extent size.
+ 			 */
+-			vap->va_blksize = ip->i_d.di_extsize ?
++			vap->va_blocksize = ip->i_d.di_extsize ?
+ 				(ip->i_d.di_extsize << mp->m_sb.sb_blocklog) :
+ 				(mp->m_sb.sb_rextsize << mp->m_sb.sb_blocklog);
+ 		}
+ 	} else {
+ 		vap->va_rdev = ip->i_df.if_u2.if_rdev;
+-		vap->va_blksize = BLKDEV_IOSIZE;
++		vap->va_blocksize = BLKDEV_IOSIZE;
+ 	}
+ 
+ 	vap->va_atime.tv_sec = ip->i_d.di_atime.t_sec;
+@@ -251,46 +245,53 @@ xfs_getattr(
+ 	 */
+ 	if ((vap->va_mask &
+ 	     (XFS_AT_XFLAGS|XFS_AT_EXTSIZE|XFS_AT_NEXTENTS|XFS_AT_ANEXTENTS|
+-	      XFS_AT_GENCOUNT|XFS_AT_VCODE)) == 0) {
+-		if (!(flags & ATTR_LAZY))
+-			xfs_iunlock(ip, XFS_ILOCK_SHARED);
+-		return 0;
+-	}
++	      XFS_AT_GENCOUNT|XFS_AT_VCODE)) == 0)
++		goto all_done;
++
+ 	/*
+ 	 * convert di_flags to xflags
+ 	 */
+-	vap->va_xflags =
+-		((ip->i_d.di_flags & XFS_DIFLAG_REALTIME) ?
+-			XFS_XFLAG_REALTIME : 0) |
+-		((ip->i_d.di_flags & XFS_DIFLAG_PREALLOC) ?
+-			XFS_XFLAG_PREALLOC : 0) |
+-	        ((ip->i_d.di_flags & XFS_DIFLAG_IMMUTABLE) ?
+-		        XFS_XFLAG_IMMUTABLE : 0) |
+-		((ip->i_d.di_flags & XFS_DIFLAG_APPEND) ?
+-		        XFS_XFLAG_APPEND : 0) |
+-		((ip->i_d.di_flags & XFS_DIFLAG_SYNC) ?
+-		        XFS_XFLAG_SYNC : 0) |
+-		((ip->i_d.di_flags & XFS_DIFLAG_NOATIME) ?
+-		        XFS_XFLAG_NOATIME : 0) |
+-		((ip->i_d.di_flags & XFS_DIFLAG_NODUMP) ?
+-		        XFS_XFLAG_NODUMP: 0) |
+-		(XFS_IFORK_Q(ip) ?
+-			XFS_XFLAG_HASATTR : 0);
++	vap->va_xflags = 0;
++	if (ip->i_d.di_flags & XFS_DIFLAG_REALTIME)
++		vap->va_xflags |= XFS_XFLAG_REALTIME;
++	if (ip->i_d.di_flags & XFS_DIFLAG_PREALLOC)
++		vap->va_xflags |= XFS_XFLAG_PREALLOC;
++	if (ip->i_d.di_flags & XFS_DIFLAG_IMMUTABLE)
++		vap->va_xflags |= XFS_XFLAG_IMMUTABLE;
++	if (ip->i_d.di_flags & XFS_DIFLAG_APPEND)
++		vap->va_xflags |= XFS_XFLAG_APPEND;
++	if (ip->i_d.di_flags & XFS_DIFLAG_SYNC)
++		vap->va_xflags |= XFS_XFLAG_SYNC;
++	if (ip->i_d.di_flags & XFS_DIFLAG_NOATIME)
++		vap->va_xflags |= XFS_XFLAG_NOATIME;
++	if (ip->i_d.di_flags & XFS_DIFLAG_NODUMP)
++		vap->va_xflags |= XFS_XFLAG_NODUMP;
++	if (XFS_IFORK_Q(ip))
++		vap->va_xflags |= XFS_XFLAG_HASATTR;
++	/*
++	 * Exit for inode revalidate.  See if any of the rest of
++	 * the fields to be filled in are needed.
++	 */
++	if ((vap->va_mask &
++	     (XFS_AT_EXTSIZE|XFS_AT_NEXTENTS|XFS_AT_ANEXTENTS|
++	      XFS_AT_GENCOUNT|XFS_AT_VCODE)) == 0)
++		goto all_done;
++
+ 	vap->va_extsize = ip->i_d.di_extsize << mp->m_sb.sb_blocklog;
+ 	vap->va_nextents =
+ 		(ip->i_df.if_flags & XFS_IFEXTENTS) ?
+ 			ip->i_df.if_bytes / sizeof(xfs_bmbt_rec_t) :
+ 			ip->i_d.di_nextents;
+-	if (ip->i_afp != NULL)
++	if (ip->i_afp)
+ 		vap->va_anextents =
+ 			(ip->i_afp->if_flags & XFS_IFEXTENTS) ?
+ 				ip->i_afp->if_bytes / sizeof(xfs_bmbt_rec_t) :
+ 				 ip->i_d.di_anextents;
+ 	else
+ 		vap->va_anextents = 0;
+-	vap->va_gencount = ip->i_d.di_gen;
+-	vap->va_vcode = 0L;
++	vap->va_gen = ip->i_d.di_gen;
+ 
++ all_done:
+ 	if (!(flags & ATTR_LAZY))
+ 		xfs_iunlock(ip, XFS_ILOCK_SHARED);
+ 	return 0;
+@@ -415,7 +416,7 @@ xfs_setattr(
+ 	} else {
+ 		if (DM_EVENT_ENABLED (vp->v_vfsp, ip, DM_EVENT_TRUNCATE) &&
+ 		    !(flags & ATTR_DMI)) {
+-			code = XFS_SEND_DATA(mp, DM_EVENT_TRUNCATE, bdp,
++			code = XFS_SEND_DATA(mp, DM_EVENT_TRUNCATE, vp,
+ 				vap->va_size, 0, AT_DELAY_FLAG(flags), NULL);
+ 			if (code) {
+ 				lock_flags = 0;
+@@ -1042,7 +1043,7 @@ xfs_readlink(
+ 	pathlen = (int)ip->i_d.di_size;
+ 
+ 	if (ip->i_df.if_flags & XFS_IFINLINE) {
+-		error = uiomove(ip->i_df.if_u1.if_data, pathlen, UIO_READ, uiop);
++		error = uio_read(ip->i_df.if_u1.if_data, pathlen, uiop);
+ 	}
+ 	else {
+ 		/*
+@@ -1073,8 +1074,7 @@ xfs_readlink(
+ 				byte_cnt = pathlen;
+ 			pathlen -= byte_cnt;
+ 
+-			error = uiomove(XFS_BUF_PTR(bp), byte_cnt,
+-					 UIO_READ, uiop);
++			error = uio_read(XFS_BUF_PTR(bp), byte_cnt, uiop);
+ 			xfs_buf_relse (bp);
+ 		}
+ 
+@@ -1729,7 +1729,7 @@ xfs_inactive(
+ 
+ 	if (ip->i_d.di_nlink == 0 &&
+ 	    DM_EVENT_ENABLED(vp->v_vfsp, ip, DM_EVENT_DESTROY)) {
+-		(void) XFS_SEND_DESTROY(mp, bdp, DM_RIGHT_NULL);
++		(void) XFS_SEND_DESTROY(mp, vp, DM_RIGHT_NULL);
+ 	}
+ 
+ 	error = 0;
+@@ -4163,7 +4163,7 @@ xfs_alloc_file_space(
+ 		end_dmi_offset = offset+len;
+ 		if (end_dmi_offset > ip->i_d.di_size)
+ 			end_dmi_offset = ip->i_d.di_size;
+-		error = XFS_SEND_DATA(mp, DM_EVENT_WRITE, XFS_ITOBHV(ip),
++		error = XFS_SEND_DATA(mp, DM_EVENT_WRITE, XFS_ITOV(ip),
+ 			offset, end_dmi_offset - offset,
+ 			0, NULL);
+ 		if (error)
+@@ -4410,7 +4410,7 @@ xfs_free_file_space(
+ 	    DM_EVENT_ENABLED(XFS_MTOVFS(mp), ip, DM_EVENT_WRITE)) {
+ 		if (end_dmi_offset > ip->i_d.di_size)
+ 			end_dmi_offset = ip->i_d.di_size;
+-		error = XFS_SEND_DATA(mp, DM_EVENT_WRITE, XFS_ITOBHV(ip),
++		error = XFS_SEND_DATA(mp, DM_EVENT_WRITE, XFS_ITOV(ip),
+ 				offset, end_dmi_offset - offset,
+ 				AT_DELAY_FLAG(attr_flags), NULL);
+ 		if (error)
+--- linux-2.6.0-test6/include/acpi/acconfig.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/include/acpi/acconfig.h	2003-10-05 00:33:24.000000000 -0700
+@@ -64,7 +64,7 @@
+ 
+ /* Version string */
+ 
+-#define ACPI_CA_VERSION                 0x20030813
++#define ACPI_CA_VERSION                 0x20030918
+ 
+ /* Maximum objects in the various object caches */
+ 
+--- linux-2.6.0-test6/include/acpi/acdisasm.h	2003-06-14 12:18:22.000000000 -0700
++++ 25/include/acpi/acdisasm.h	2003-10-05 00:33:24.000000000 -0700
+@@ -152,10 +152,6 @@ void
+ acpi_dm_decode_internal_object (
+ 	union acpi_operand_object       *obj_desc);
+ 
+-void
+-acpi_dm_decode_node (
+-	struct acpi_namespace_node      *node);
+-
+ u32
+ acpi_dm_block_type (
+ 	union acpi_parse_object         *op);
+--- linux-2.6.0-test6/include/acpi/acstruct.h	2003-06-14 12:17:57.000000000 -0700
++++ 25/include/acpi/acstruct.h	2003-10-05 00:33:24.000000000 -0700
+@@ -91,11 +91,12 @@ struct acpi_walk_state
+ 	struct acpi_namespace_node          arguments[ACPI_METHOD_NUM_ARGS];    /* Control method arguments */
+ 	union acpi_operand_object           **caller_return_desc;
+ 	union acpi_generic_state            *control_state;                     /* List of control states (nested IFs) */
++	struct acpi_namespace_node          *deferred_node;                      /* Used when executing deferred opcodes */
+ 	struct acpi_namespace_node          local_variables[ACPI_METHOD_NUM_LOCALS];    /* Control method locals */
+ 	struct acpi_namespace_node          *method_call_node;                  /* Called method Node*/
+ 	union acpi_parse_object             *method_call_op;                    /* method_call Op if running a method */
+ 	union acpi_operand_object           *method_desc;                       /* Method descriptor if running a method */
+-	struct acpi_namespace_node          *method_node;                       /* Method Node if running a method */
++	struct acpi_namespace_node          *method_node;                       /* Method node if running a method. */
+ 	union acpi_parse_object             *op;                                /* Current parser op */
+ 	union acpi_operand_object           *operands[ACPI_OBJ_NUM_OPERANDS+1]; /* Operands passed to the interpreter (+1 for NULL terminator) */
+ 	const struct acpi_opcode_info       *op_info;                           /* Info on current opcode */
+--- linux-2.6.0-test6/include/asm-alpha/cacheflush.h	2003-06-14 12:18:25.000000000 -0700
++++ 25/include/asm-alpha/cacheflush.h	2003-10-05 00:33:24.000000000 -0700
+@@ -10,6 +10,8 @@
+ #define flush_cache_range(vma, start, end)	do { } while (0)
+ #define flush_cache_page(vma, vmaddr)		do { } while (0)
+ #define flush_dcache_page(page)			do { } while (0)
++#define flush_cache_vmap(start, end)		do { } while (0)
++#define flush_cache_vunmap(start, end)		do { } while (0)
+ 
+ /* Note that the following two definitions are _highly_ dependent
+    on the contexts in which they are used in the kernel.  I personally
+@@ -60,4 +62,11 @@ extern void flush_icache_user_range(stru
+ #define flush_icache_page(vma, page) \
+   flush_icache_user_range((vma), (page), 0, 0)
+ 
++#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
++do { memcpy(dst, src, len); \
++     flush_icache_user_range(vma, page, vaddr, len); \
++} while (0)
++#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
++
+ #endif /* _ALPHA_CACHEFLUSH_H */
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-alpha/lockmeter.h	2003-10-05 00:36:40.000000000 -0700
+@@ -0,0 +1,90 @@
++/*
++ *  Written by John Hawkes (hawkes@sgi.com)
++ *  Based on klstat.h by Jack Steiner (steiner@sgi.com)
++ *
++ *  Modified by Peter Rival (frival@zk3.dec.com)
++ */
++
++#ifndef _ALPHA_LOCKMETER_H
++#define _ALPHA_LOCKMETER_H
++
++#include <asm/hwrpb.h>
++#define CPU_CYCLE_FREQUENCY	hwrpb->cycle_freq
++
++#define get_cycles64()		get_cycles()
++
++#define THIS_CPU_NUMBER		smp_processor_id()
++
++#include <linux/version.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)
++#define local_irq_save(x) \
++	__save_and_cli(x)
++#define local_irq_restore(x) \
++	__restore_flags(x)
++#endif	/* Linux version 2.2.x */
++
++#define SPINLOCK_MAGIC_INIT /**/
++
++/*
++ * Macros to cache and retrieve an index value inside of a lock
++ * these macros assume that there are less than 65536 simultaneous
++ * (read mode) holders of a rwlock.
++ * We also assume that the hash table has less than 32767 entries.
++ * the high order bit is used for write locking a rw_lock
++ * Note: although these defines and macros are the same as what is being used
++ *       in include/asm-i386/lockmeter.h, they are present here to easily
++ *	 allow an alternate Alpha implementation.
++ */
++/*
++ * instrumented spinlock structure -- never used to allocate storage
++ * only used in macros below to overlay a spinlock_t
++ */
++typedef struct inst_spinlock_s {
++	/* remember, Alpha is little endian */
++	unsigned short lock;
++	unsigned short index;
++} inst_spinlock_t;
++#define PUT_INDEX(lock_ptr,indexv)	((inst_spinlock_t *)(lock_ptr))->index = indexv
++#define GET_INDEX(lock_ptr)		((inst_spinlock_t *)(lock_ptr))->index
++
++/*
++ * macros to cache and retrieve an index value in a read/write lock
++ * as well as the cpu where a reader busy period started
++ * we use the 2nd word (the debug word) for this, so require the
++ * debug word to be present
++ */
++/*
++ * instrumented rwlock structure -- never used to allocate storage
++ * only used in macros below to overlay a rwlock_t
++ */
++typedef struct inst_rwlock_s {
++	volatile int lock;
++	unsigned short index;
++	unsigned short cpu;
++} inst_rwlock_t;
++#define PUT_RWINDEX(rwlock_ptr,indexv)	((inst_rwlock_t *)(rwlock_ptr))->index = indexv
++#define GET_RWINDEX(rwlock_ptr)		((inst_rwlock_t *)(rwlock_ptr))->index
++#define PUT_RW_CPU(rwlock_ptr,cpuv)	((inst_rwlock_t *)(rwlock_ptr))->cpu = cpuv
++#define GET_RW_CPU(rwlock_ptr)		((inst_rwlock_t *)(rwlock_ptr))->cpu
++
++/*
++ * return true if rwlock is write locked
++ * (note that other lock attempts can cause the lock value to be negative)
++ */
++#define RWLOCK_IS_WRITE_LOCKED(rwlock_ptr) (((inst_rwlock_t *)rwlock_ptr)->lock & 1)
++#define IABS(x) ((x) > 0 ? (x) : -(x))
++
++#define RWLOCK_READERS(rwlock_ptr)	rwlock_readers(rwlock_ptr)
++extern inline int rwlock_readers(rwlock_t *rwlock_ptr)
++{
++	int tmp = (int) ((inst_rwlock_t *)rwlock_ptr)->lock;
++	/* readers subtract 2, so we have to:		*/
++	/* 	- andnot off a possible writer (bit 0)	*/
++	/*	- get the absolute value		*/
++	/*	- divide by 2 (right shift by one)	*/
++	/* to find the number of readers		*/
++	if (tmp == 0) return(0);
++	else return(IABS(tmp & ~1)>>1);
++}
++
++#endif /* _ALPHA_LOCKMETER_H */
+--- linux-2.6.0-test6/include/asm-alpha/numnodes.h	2003-06-14 12:17:58.000000000 -0700
++++ 25/include/asm-alpha/numnodes.h	2003-10-05 00:34:38.000000000 -0700
+@@ -1,6 +1,7 @@
+ #ifndef _ASM_MAX_NUMNODES_H
+ #define _ASM_MAX_NUMNODES_H
+ 
+-#define MAX_NUMNODES		128 /* Marvel */
++/* Max 128 Nodes - Marvel */
++#define NODES_SHIFT	7
+ 
+ #endif /* _ASM_MAX_NUMNODES_H */
+--- linux-2.6.0-test6/include/asm-alpha/pgtable.h	2003-06-14 12:18:06.000000000 -0700
++++ 25/include/asm-alpha/pgtable.h	2003-10-05 00:33:24.000000000 -0700
+@@ -49,7 +49,6 @@
+ #else
+ #define VMALLOC_START		(-2*PGDIR_SIZE)
+ #endif
+-#define VMALLOC_VMADDR(x)	((unsigned long)(x))
+ #define VMALLOC_END		(-PGDIR_SIZE)
+ 
+ /*
+--- linux-2.6.0-test6/include/asm-alpha/spinlock.h	2003-06-26 22:07:25.000000000 -0700
++++ 25/include/asm-alpha/spinlock.h	2003-10-05 00:36:40.000000000 -0700
+@@ -6,6 +6,10 @@
+ #include <linux/kernel.h>
+ #include <asm/current.h>
+ 
++#ifdef CONFIG_LOCKMETER
++#undef DEBUG_SPINLOCK
++#undef DEBUG_RWLOCK
++#endif
+ 
+ /*
+  * Simple spin lock operations.  There are two variants, one clears IRQ's
+@@ -95,9 +99,18 @@ static inline int _raw_spin_trylock(spin
+ 
+ typedef struct {
+ 	volatile int write_lock:1, read_counter:31;
++#ifdef CONFIG_LOCKMETER
++	/* required for LOCKMETER since all bits in lock are used */
++	/* need this storage for CPU and lock INDEX ............. */
++	unsigned magic;
++#endif
+ } /*__attribute__((aligned(32)))*/ rwlock_t;
+ 
++#ifdef CONFIG_LOCKMETER
++#define RW_LOCK_UNLOCKED (rwlock_t) { 0, 0, 0 }
++#else
+ #define RW_LOCK_UNLOCKED (rwlock_t) { 0, 0 }
++#endif
+ 
+ #define rwlock_init(x)	do { *(x) = RW_LOCK_UNLOCKED; } while(0)
+ #define rwlock_is_locked(x)	(*(volatile int *)(x) != 0)
+@@ -169,4 +182,41 @@ static inline void _raw_read_unlock(rwlo
+ 	: "m" (*lock) : "memory");
+ }
+ 
++#ifdef CONFIG_LOCKMETER
++static inline int _raw_write_trylock(rwlock_t *lock)
++{
++	long temp,result;
++
++	__asm__ __volatile__(
++	"	ldl_l %1,%0\n"
++	"	mov $31,%2\n"
++	"	bne %1,1f\n"
++	"	or $31,1,%2\n"
++	"	stl_c %2,%0\n"
++	"1:	mb\n"
++	: "=m" (*(volatile int *)lock), "=&r" (temp), "=&r" (result)
++	: "m" (*(volatile int *)lock)
++	);
++
++	return (result);
++}
++
++static inline int _raw_read_trylock(rwlock_t *lock)
++{
++	unsigned long temp,result;
++
++	__asm__ __volatile__(
++	"	ldl_l %1,%0\n"
++	"	mov $31,%2\n"
++	"	blbs %1,1f\n"
++	"	subl %1,2,%2\n"
++	"	stl_c %2,%0\n"
++	"1:	mb\n"
++	: "=m" (*(volatile int *)lock), "=&r" (temp), "=&r" (result)
++	: "m" (*(volatile int *)lock)
++	);
++	return (result);
++}
++#endif /* CONFIG_LOCKMETER */
++
+ #endif /* _ALPHA_SPINLOCK_H */
+--- linux-2.6.0-test6/include/asm-arm26/cacheflush.h	2003-06-14 12:18:29.000000000 -0700
++++ 25/include/asm-arm26/cacheflush.h	2003-10-05 00:33:24.000000000 -0700
+@@ -25,6 +25,8 @@
+ #define flush_cache_range(vma,start,end)        do { } while (0)
+ #define flush_cache_page(vma,vmaddr)            do { } while (0)
+ #define flush_page_to_ram(page)                 do { } while (0)
++#define flush_cache_vmap(start, end)		do { } while (0)
++#define flush_cache_vunmap(start, end)		do { } while (0)
+ 
+ #define invalidate_dcache_range(start,end)      do { } while (0)
+ #define clean_dcache_range(start,end)           do { } while (0)
+@@ -37,6 +39,11 @@
+ #define flush_icache_range(start,end)           do { } while (0)
+ #define flush_icache_page(vma,page)             do { } while (0)
+ 
++#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
++#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
++
+ /* DAG: ARM3 will flush cache on MEMC updates anyway? so don't bother */
+ /* IM : Yes, it will, but only if setup to do so (we do this). */
+ #define clean_cache_area(_start,_size)          do { } while (0)
+--- linux-2.6.0-test6/include/asm-arm26/pgtable.h	2003-07-10 18:50:32.000000000 -0700
++++ 25/include/asm-arm26/pgtable.h	2003-10-05 00:33:24.000000000 -0700
+@@ -173,7 +173,6 @@ extern struct page *empty_zero_page;
+  * area for the same reason. ;) FIXME: surely 1 page not 4k ?
+  */
+ #define VMALLOC_START     0x01a00000
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ #define VMALLOC_END       0x01c00000
+ 
+ /* Is pmd_page supposed to return a pointer to a page in some arches? ours seems to
+--- linux-2.6.0-test6/include/asm-arm/arch-adifcc/vmalloc.h	2003-06-14 12:17:58.000000000 -0700
++++ 25/include/asm-arm/arch-adifcc/vmalloc.h	2003-10-05 00:33:24.000000000 -0700
+@@ -12,7 +12,6 @@
+  */
+ #define VMALLOC_OFFSET	  (8*1024*1024)
+ #define VMALLOC_START	  (((unsigned long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ #define VMALLOC_END       (0xe8000000)
+ 
+ #define MODULE_START	(PAGE_OFFSET - 16*1048576)
+--- linux-2.6.0-test6/include/asm-arm/arch-anakin/vmalloc.h	2003-06-14 12:18:04.000000000 -0700
++++ 25/include/asm-arm/arch-anakin/vmalloc.h	2003-10-05 00:33:24.000000000 -0700
+@@ -19,8 +19,7 @@
+  * linux/arch/arm/kernel/traps.c)
+  */
+ #define VMALLOC_ARCH_OFFSET	(8 * 1024 * 1024)
+-#define VMALLOC_VMADDR(a)	((unsigned int) (a))
+-#define VMALLOC_START		((VMALLOC_VMADDR(high_memory) + VMALLOC_ARCH_OFFSET) & ~(VMALLOC_ARCH_OFFSET - 1))
++#define VMALLOC_START		(((unsigned long) (high_memory) + VMALLOC_ARCH_OFFSET) & ~(VMALLOC_ARCH_OFFSET - 1))
+ #define VMALLOC_END		(PAGE_OFFSET + 0x10000000)
+ 
+ #define MODULE_START	(PAGE_OFFSET - 16*1048576)
+--- linux-2.6.0-test6/include/asm-arm/arch-cl7500/vmalloc.h	2003-06-14 12:18:32.000000000 -0700
++++ 25/include/asm-arm/arch-cl7500/vmalloc.h	2003-10-05 00:33:24.000000000 -0700
+@@ -12,7 +12,6 @@
+  */
+ #define VMALLOC_OFFSET	  (8*1024*1024)
+ #define VMALLOC_START	  (((unsigned long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ #define VMALLOC_END       (PAGE_OFFSET + 0x1c000000)
+ 
+ #define MODULE_START	(PAGE_OFFSET - 16*1048576)
+--- linux-2.6.0-test6/include/asm-arm/arch-clps711x/memory.h	2003-06-14 12:17:56.000000000 -0700
++++ 25/include/asm-arm/arch-clps711x/memory.h	2003-10-05 00:34:40.000000000 -0700
+@@ -109,8 +109,6 @@
+  * 	node 3:  0xd8000000 - 0xdfffffff
+  */
+ 
+-#define NR_NODES	4
+-
+ /*
+  * Given a kernel address, find the home node of the underlying memory.
+  */
+--- linux-2.6.0-test6/include/asm-arm/arch-clps711x/vmalloc.h	2003-06-14 12:17:56.000000000 -0700
++++ 25/include/asm-arm/arch-clps711x/vmalloc.h	2003-10-05 00:33:24.000000000 -0700
+@@ -28,7 +28,6 @@
+  */
+ #define VMALLOC_OFFSET	  (8*1024*1024)
+ #define VMALLOC_START	  (((unsigned long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ #define VMALLOC_END       (PAGE_OFFSET + 0x10000000)
+ 
+ #define MODULE_START	(PAGE_OFFSET - 16*1048576)
+--- linux-2.6.0-test6/include/asm-arm/arch-ebsa110/vmalloc.h	2003-06-14 12:18:07.000000000 -0700
++++ 25/include/asm-arm/arch-ebsa110/vmalloc.h	2003-10-05 00:33:24.000000000 -0700
+@@ -18,7 +18,6 @@
+  */
+ #define VMALLOC_OFFSET	  (8*1024*1024)
+ #define VMALLOC_START	  (((unsigned long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ #define VMALLOC_END       (PAGE_OFFSET + 0x1f000000)
+ 
+ #define MODULE_START	(PAGE_OFFSET - 16*1048576)
+--- linux-2.6.0-test6/include/asm-arm/arch-ebsa285/vmalloc.h	2003-06-14 12:18:08.000000000 -0700
++++ 25/include/asm-arm/arch-ebsa285/vmalloc.h	2003-10-05 00:33:24.000000000 -0700
+@@ -18,7 +18,6 @@
+  */
+ #define VMALLOC_OFFSET	  (8*1024*1024)
+ #define VMALLOC_START	  (((unsigned long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ 
+ #ifdef CONFIG_ARCH_FOOTBRIDGE
+ #define VMALLOC_END       (PAGE_OFFSET + 0x30000000)
+--- linux-2.6.0-test6/include/asm-arm/arch-epxa10db/vmalloc.h	2003-06-14 12:17:58.000000000 -0700
++++ 25/include/asm-arm/arch-epxa10db/vmalloc.h	2003-10-05 00:33:24.000000000 -0700
+@@ -28,7 +28,6 @@
+  */
+ #define VMALLOC_OFFSET	  (8*1024*1024)
+ #define VMALLOC_START	  (((unsigned long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ #define VMALLOC_END       (PAGE_OFFSET + 0x10000000)
+ 
+ #define MODULE_START	(PAGE_OFFSET - 16*1048576)
+--- linux-2.6.0-test6/include/asm-arm/arch-integrator/irqs.h	2003-06-14 12:17:57.000000000 -0700
++++ 25/include/asm-arm/arch-integrator/irqs.h	2003-10-05 00:33:24.000000000 -0700
+@@ -19,116 +19,39 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
+-/* Use the integrator definitions */
+-#include <asm/arch/platform.h>
+-
+-/* 
+- *  IRQ interrupts definitions are the same the INT definitions
+- *  held within platform.h
+- */
+-#define IRQ_SOFTINT                     INT_SOFTINT
+-#define IRQ_UARTINT0                    INT_UARTINT0
+-#define IRQ_UARTINT1                    INT_UARTINT1
+-#define IRQ_KMIINT0                     INT_KMIINT0
+-#define IRQ_KMIINT1                     INT_KMIINT1
+-#define IRQ_TIMERINT0                   INT_TIMERINT0
+-#define IRQ_TIMERINT1                   INT_TIMERINT1
+-#define IRQ_TIMERINT2                   INT_TIMERINT2
+-#define IRQ_RTCINT                      INT_RTCINT
+-#define IRQ_EXPINT0                     INT_EXPINT0
+-#define IRQ_EXPINT1                     INT_EXPINT1
+-#define IRQ_EXPINT2                     INT_EXPINT2
+-#define IRQ_EXPINT3                     INT_EXPINT3
+-#define IRQ_PCIINT0                     INT_PCIINT0
+-#define IRQ_PCIINT1                     INT_PCIINT1
+-#define IRQ_PCIINT2                     INT_PCIINT2
+-#define IRQ_PCIINT3                     INT_PCIINT3
+-#define IRQ_V3INT                       INT_V3INT
+-#define IRQ_CPINT0                      INT_CPINT0
+-#define IRQ_CPINT1                      INT_CPINT1
+-#define IRQ_LBUSTIMEOUT                 INT_LBUSTIMEOUT
+-#define IRQ_APCINT                      INT_APCINT
+-
+-#define IRQMASK_SOFTINT                 INTMASK_SOFTINT
+-#define IRQMASK_UARTINT0                INTMASK_UARTINT0
+-#define IRQMASK_UARTINT1                INTMASK_UARTINT1
+-#define IRQMASK_KMIINT0                 INTMASK_KMIINT0
+-#define IRQMASK_KMIINT1                 INTMASK_KMIINT1
+-#define IRQMASK_TIMERINT0               INTMASK_TIMERINT0
+-#define IRQMASK_TIMERINT1               INTMASK_TIMERINT1
+-#define IRQMASK_TIMERINT2               INTMASK_TIMERINT2
+-#define IRQMASK_RTCINT                  INTMASK_RTCINT
+-#define IRQMASK_EXPINT0                 INTMASK_EXPINT0
+-#define IRQMASK_EXPINT1                 INTMASK_EXPINT1
+-#define IRQMASK_EXPINT2                 INTMASK_EXPINT2
+-#define IRQMASK_EXPINT3                 INTMASK_EXPINT3
+-#define IRQMASK_PCIINT0                 INTMASK_PCIINT0
+-#define IRQMASK_PCIINT1                 INTMASK_PCIINT1
+-#define IRQMASK_PCIINT2                 INTMASK_PCIINT2
+-#define IRQMASK_PCIINT3                 INTMASK_PCIINT3
+-#define IRQMASK_V3INT                   INTMASK_V3INT
+-#define IRQMASK_CPINT0                  INTMASK_CPINT0
+-#define IRQMASK_CPINT1                  INTMASK_CPINT1
+-#define IRQMASK_LBUSTIMEOUT             INTMASK_LBUSTIMEOUT
+-#define IRQMASK_APCINT                  INTMASK_APCINT
+-
+ /* 
+- *  FIQ interrupts definitions are the same the INT definitions.
++ *  Interrupt numbers
+  */
+-#define FIQ_SOFTINT                     INT_SOFTINT
+-#define FIQ_UARTINT0                    INT_UARTINT0
+-#define FIQ_UARTINT1                    INT_UARTINT1
+-#define FIQ_KMIINT0                     INT_KMIINT0
+-#define FIQ_KMIINT1                     INT_KMIINT1
+-#define FIQ_TIMERINT0                   INT_TIMERINT0
+-#define FIQ_TIMERINT1                   INT_TIMERINT1
+-#define FIQ_TIMERINT2                   INT_TIMERINT2
+-#define FIQ_RTCINT                      INT_RTCINT
+-#define FIQ_EXPINT0                     INT_EXPINT0
+-#define FIQ_EXPINT1                     INT_EXPINT1
+-#define FIQ_EXPINT2                     INT_EXPINT2
+-#define FIQ_EXPINT3                     INT_EXPINT3
+-#define FIQ_PCIINT0                     INT_PCIINT0
+-#define FIQ_PCIINT1                     INT_PCIINT1
+-#define FIQ_PCIINT2                     INT_PCIINT2
+-#define FIQ_PCIINT3                     INT_PCIINT3
+-#define FIQ_V3INT                       INT_V3INT
+-#define FIQ_CPINT0                      INT_CPINT0
+-#define FIQ_CPINT1                      INT_CPINT1
+-#define FIQ_LBUSTIMEOUT                 INT_LBUSTIMEOUT
+-#define FIQ_APCINT                      INT_APCINT
+-
+-#define FIQMASK_SOFTINT                 INTMASK_SOFTINT
+-#define FIQMASK_UARTINT0                INTMASK_UARTINT0
+-#define FIQMASK_UARTINT1                INTMASK_UARTINT1
+-#define FIQMASK_KMIINT0                 INTMASK_KMIINT0
+-#define FIQMASK_KMIINT1                 INTMASK_KMIINT1
+-#define FIQMASK_TIMERINT0               INTMASK_TIMERINT0
+-#define FIQMASK_TIMERINT1               INTMASK_TIMERINT1
+-#define FIQMASK_TIMERINT2               INTMASK_TIMERINT2
+-#define FIQMASK_RTCINT                  INTMASK_RTCINT
+-#define FIQMASK_EXPINT0                 INTMASK_EXPINT0
+-#define FIQMASK_EXPINT1                 INTMASK_EXPINT1
+-#define FIQMASK_EXPINT2                 INTMASK_EXPINT2
+-#define FIQMASK_EXPINT3                 INTMASK_EXPINT3
+-#define FIQMASK_PCIINT0                 INTMASK_PCIINT0
+-#define FIQMASK_PCIINT1                 INTMASK_PCIINT1
+-#define FIQMASK_PCIINT2                 INTMASK_PCIINT2
+-#define FIQMASK_PCIINT3                 INTMASK_PCIINT3
+-#define FIQMASK_V3INT                   INTMASK_V3INT
+-#define FIQMASK_CPINT0                  INTMASK_CPINT0
+-#define FIQMASK_CPINT1                  INTMASK_CPINT1
+-#define FIQMASK_LBUSTIMEOUT             INTMASK_LBUSTIMEOUT
+-#define FIQMASK_APCINT                  INTMASK_APCINT
+-
+-/* 
+- *  Misc. interrupt definitions
+- */
+-#define IRQ_KEYBDINT                    INT_KMIINT0
+-#define IRQ_MOUSEINT                    INT_KMIINT1
+-
+-#define IRQMASK_KEYBDINT                INTMASK_KMIINT0
+-#define IRQMASK_MOUSEINT                INTMASK_KMIINT1
++#define IRQ_PIC_START			0
++#define IRQ_SOFTINT			0
++#define IRQ_UARTINT0			1
++#define IRQ_UARTINT1			2
++#define IRQ_KMIINT0			3
++#define IRQ_KMIINT1			4
++#define IRQ_TIMERINT0			5
++#define IRQ_TIMERINT1			6
++#define IRQ_TIMERINT2			7
++#define IRQ_RTCINT			8
++#define IRQ_AP_EXPINT0			9
++#define IRQ_AP_EXPINT1			10
++#define IRQ_AP_EXPINT2			11
++#define IRQ_AP_EXPINT3			12
++#define IRQ_AP_PCIINT0			13
++#define IRQ_AP_PCIINT1			14
++#define IRQ_AP_PCIINT2			15
++#define IRQ_AP_PCIINT3			16
++#define IRQ_AP_V3INT			17
++#define IRQ_AP_CPINT0			18
++#define IRQ_AP_CPINT1			19
++#define IRQ_AP_LBUSTIMEOUT 		20
++#define IRQ_AP_APCINT			21
++#define IRQ_PIC_END			31
++
++#define IRQ_CIC_START			32
++#define IRQ_CM_SOFTINT			32
++#define IRQ_CM_COMMRX			33
++#define IRQ_CM_COMMTX			34
++#define IRQ_CIC_END			34
+ 
+-#define NR_IRQS                         (MAXIRQNUM + 1)
++#define NR_IRQS                         47
+ 
+--- linux-2.6.0-test6/include/asm-arm/arch-integrator/platform.h	2003-06-14 12:18:22.000000000 -0700
++++ 25/include/asm-arm/arch-integrator/platform.h	2003-10-05 00:33:24.000000000 -0700
+@@ -386,85 +386,6 @@
+  * 
+  */
+ 
+-/* 
+- *  As the interrupt bit definitions for FIQ/IRQ there is a common
+- *  set of definitions prefixed INT/INTMASK.  The FIQ/IRQ definitions
+- *  have been left to maintain backwards compatible.
+- * 
+- */
+-
+-/* 
+- *  Interrupt numbers
+- * 
+- */
+-#define INT_SOFTINT                     0
+-#define INT_UARTINT0                    1
+-#define INT_UARTINT1                    2
+-#define INT_KMIINT0                     3
+-#define INT_KMIINT1                     4
+-#define INT_TIMERINT0                   5
+-#define INT_TIMERINT1                   6
+-#define INT_TIMERINT2                   7
+-#define INT_RTCINT                      8
+-#define INT_EXPINT0                     9
+-#define INT_EXPINT1                     10
+-#define INT_EXPINT2                     11
+-#define INT_EXPINT3                     12
+-#define INT_PCIINT0                     13
+-#define INT_PCIINT1                     14
+-#define INT_PCIINT2                     15
+-#define INT_PCIINT3                     16
+-#define INT_V3INT                       17
+-#define INT_CPINT0                      18
+-#define INT_CPINT1                      19
+-#define INT_LBUSTIMEOUT                 20
+-#define INT_APCINT                      21
+-#define INT_CM_SOFTINT                  24
+-#define INT_CM_COMMRX                   25
+-#define INT_CM_COMMTX                   26
+-
+-/* 
+- *  Interrupt bit positions
+- * 
+- */
+-#define INTMASK_SOFTINT                 (1 << INT_SOFTINT)
+-#define INTMASK_UARTINT0                (1 << INT_UARTINT0)
+-#define INTMASK_UARTINT1                (1 << INT_UARTINT1)
+-#define INTMASK_KMIINT0                 (1 << INT_KMIINT0)
+-#define INTMASK_KMIINT1                 (1 << INT_KMIINT1)
+-#define INTMASK_TIMERINT0               (1 << INT_TIMERINT0)
+-#define INTMASK_TIMERINT1               (1 << INT_TIMERINT1)
+-#define INTMASK_TIMERINT2               (1 << INT_TIMERINT2)
+-#define INTMASK_RTCINT                  (1 << INT_RTCINT)
+-#define INTMASK_EXPINT0                 (1 << INT_EXPINT0)
+-#define INTMASK_EXPINT1                 (1 << INT_EXPINT1)
+-#define INTMASK_EXPINT2                 (1 << INT_EXPINT2)
+-#define INTMASK_EXPINT3                 (1 << INT_EXPINT3)
+-#define INTMASK_PCIINT0                 (1 << INT_PCIINT0)
+-#define INTMASK_PCIINT1                 (1 << INT_PCIINT1)
+-#define INTMASK_PCIINT2                 (1 << INT_PCIINT2)
+-#define INTMASK_PCIINT3                 (1 << INT_PCIINT3)
+-#define INTMASK_V3INT                   (1 << INT_V3INT)
+-#define INTMASK_CPINT0                  (1 << INT_CPINT0)
+-#define INTMASK_CPINT1                  (1 << INT_CPINT1)
+-#define INTMASK_LBUSTIMEOUT             (1 << INT_LBUSTIMEOUT)
+-#define INTMASK_APCINT                  (1 << INT_APCINT)
+-#define INTMASK_CM_SOFTINT              (1 << INT_CM_SOFTINT)
+-#define INTMASK_CM_COMMRX               (1 << INT_CM_COMMRX)
+-#define INTMASK_CM_COMMTX               (1 << INT_CM_COMMTX)
+-
+-/* 
+- *  INTEGRATOR_CM_INT0      - Interrupt number of first CM interrupt
+- *  INTEGRATOR_SC_VALID_INT - Mask of valid system controller interrupts
+- * 
+- */
+-#define INTEGRATOR_CM_INT0              INT_CM_SOFTINT
+-#define INTEGRATOR_SC_VALID_INT         0x003FFFFF
+-
+-#define MAXIRQNUM                       31
+-#define MAXFIQNUM                       31
+-#define MAXSWINUM                       31
+- 
+ /* ------------------------------------------------------------------------
+  *  LED's - The header LED is not accessible via the uHAL API
+  * ------------------------------------------------------------------------
+--- linux-2.6.0-test6/include/asm-arm/arch-integrator/time.h	2003-06-14 12:18:29.000000000 -0700
++++ 25/include/asm-arm/arch-integrator/time.h	2003-10-05 00:33:24.000000000 -0700
+@@ -86,7 +86,7 @@ static unsigned long integrator_gettimeo
+ 	/*
+ 	 * Interrupt pending?  If so, we've reloaded once already.
+ 	 */
+-	if (status & IRQMASK_TIMERINT1)
++	if (status & (1 << IRQ_TIMERINT1))
+ 		ticks1 += TIMER_RELOAD;
+ 
+ 	/*
+--- linux-2.6.0-test6/include/asm-arm/arch-integrator/vmalloc.h	2003-06-14 12:17:57.000000000 -0700
++++ 25/include/asm-arm/arch-integrator/vmalloc.h	2003-10-05 00:33:24.000000000 -0700
+@@ -28,7 +28,6 @@
+  */
+ #define VMALLOC_OFFSET	  (8*1024*1024)
+ #define VMALLOC_START	  (((unsigned long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ #define VMALLOC_END       (PAGE_OFFSET + 0x10000000)
+ 
+ #define MODULE_START	(PAGE_OFFSET - 16*1048576)
+--- linux-2.6.0-test6/include/asm-arm/arch-iop3xx/vmalloc.h	2003-06-14 12:18:25.000000000 -0700
++++ 25/include/asm-arm/arch-iop3xx/vmalloc.h	2003-10-05 00:33:24.000000000 -0700
+@@ -12,7 +12,6 @@
+  */
+ #define VMALLOC_OFFSET	  (8*1024*1024)
+ #define VMALLOC_START	  (((unsigned long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ #define VMALLOC_END       (0xe8000000)
+ 
+ #define MODULE_START	(PAGE_OFFSET - 16*1048576)
+--- linux-2.6.0-test6/include/asm-arm/arch-l7200/vmalloc.h	2003-06-14 12:17:59.000000000 -0700
++++ 25/include/asm-arm/arch-l7200/vmalloc.h	2003-10-05 00:33:24.000000000 -0700
+@@ -12,7 +12,6 @@
+  */
+ #define VMALLOC_OFFSET	  (8*1024*1024)
+ #define VMALLOC_START	  (((unsigned long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ #define VMALLOC_END       (PAGE_OFFSET + 0x10000000)
+ 
+ #define MODULE_START	(PAGE_OFFSET - 16*1048576)
+--- linux-2.6.0-test6/include/asm-arm/arch-nexuspci/vmalloc.h	2003-06-14 12:18:21.000000000 -0700
++++ 25/include/asm-arm/arch-nexuspci/vmalloc.h	2003-10-05 00:33:24.000000000 -0700
+@@ -12,7 +12,6 @@
+  */
+ #define VMALLOC_OFFSET	  (8*1024*1024)
+ #define VMALLOC_START	  (((unsigned long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ #define VMALLOC_END       (PAGE_OFFSET + 0x20000000)
+ 
+ #define MODULE_START	(PAGE_OFFSET - 16*1048576)
+--- linux-2.6.0-test6/include/asm-arm/arch-pxa/irqs.h	2003-09-27 18:57:46.000000000 -0700
++++ 25/include/asm-arm/arch-pxa/irqs.h	2003-10-05 00:33:24.000000000 -0700
+@@ -13,7 +13,7 @@
+ #include <linux/config.h>
+ 
+ #define PXA_IRQ_SKIP	7	/* The first 7 IRQs are not yet used */
+-#define PXA_IRQ(x)		((x) - PXA_IRQ_SKIP)
++#define PXA_IRQ(x)	((x) - PXA_IRQ_SKIP)
+ 
+ #define IRQ_HWUART	PXA_IRQ(7)	/* HWUART Transmit/Receive/Error */
+ #define	IRQ_GPIO0	PXA_IRQ(8)	/* GPIO0 Edge Detect */
+@@ -47,7 +47,7 @@
+ 
+ #define IRQ_TO_GPIO_2_80(i)	\
+ 			((i) - PXA_IRQ(32) + 2)
+-#define IRQ_TO_GPIO(i)	((i) - (((i) > IRQ_GPIO1) ? IRQ_GPIO(2) : IRQ_GPIO(0)))
++#define IRQ_TO_GPIO(i)	((i) - (((i) > IRQ_GPIO1) ? IRQ_GPIO(2) - 2 : IRQ_GPIO(0)))
+ 
+ /*
+  * The next 16 interrupts are for board specific purposes.  Since
+@@ -131,8 +131,10 @@
+ #define LUBBOCK_IRQ(x)		(IRQ_BOARD_START + (x))
+ #define LUBBOCK_SD_IRQ		LUBBOCK_IRQ(0)
+ #define LUBBOCK_SA1111_IRQ	LUBBOCK_IRQ(1)
+-#define LUBBOCK_USB_IRQ		LUBBOCK_IRQ(2)
++#define LUBBOCK_USB_IRQ		LUBBOCK_IRQ(2)  /* usb connect */
+ #define LUBBOCK_ETH_IRQ		LUBBOCK_IRQ(3)
+ #define LUBBOCK_UCB1400_IRQ	LUBBOCK_IRQ(4)
+ #define LUBBOCK_BB_IRQ		LUBBOCK_IRQ(5)
++#define LUBBOCK_USB_DISC_IRQ	LUBBOCK_IRQ(6)  /* usb disconnect */
++#define LUBBOCK_LAST_IRQ	LUBBOCK_IRQ(6)
+ 
+--- linux-2.6.0-test6/include/asm-arm/arch-pxa/lubbock.h	2003-06-14 12:17:59.000000000 -0700
++++ 25/include/asm-arm/arch-pxa/lubbock.h	2003-10-05 00:33:24.000000000 -0700
+@@ -12,7 +12,8 @@
+ 
+ #define LUBBOCK_FPGA_PHYS	PXA_CS2_PHYS
+ #define LUBBOCK_FPGA_VIRT	(0xf0000000)	/* phys 0x08000000 */
+-#define LUBBOCK_ETH_BASE	(0xf1000000)	/* phys 0x0c000000 */
++#define LUBBOCK_ETH_PHYS	PXA_CS3_PHYS
++#define LUBBOCK_ETH_VIRT	(0xf1000000)
+ 
+ #define LUB_P2V(x)		((x) - LUBBOCK_FPGA_PHYS + LUBBOCK_FPGA_VIRT)
+ #define LUB_V2P(x)		((x) - LUBBOCK_FPGA_VIRT + LUBBOCK_FPGA_PHYS)
+--- linux-2.6.0-test6/include/asm-arm/arch-pxa/vmalloc.h	2003-06-14 12:18:21.000000000 -0700
++++ 25/include/asm-arm/arch-pxa/vmalloc.h	2003-10-05 00:33:24.000000000 -0700
+@@ -19,7 +19,6 @@
+  */
+ #define VMALLOC_OFFSET	  (8*1024*1024)
+ #define VMALLOC_START	  (((unsigned long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ #define VMALLOC_END       (0xe8000000)
+ 
+ #define MODULE_START	(PAGE_OFFSET - 16*1048576)
+--- linux-2.6.0-test6/include/asm-arm/arch-rpc/vmalloc.h	2003-06-14 12:18:25.000000000 -0700
++++ 25/include/asm-arm/arch-rpc/vmalloc.h	2003-10-05 00:33:24.000000000 -0700
+@@ -18,7 +18,6 @@
+  */
+ #define VMALLOC_OFFSET	  (8*1024*1024)
+ #define VMALLOC_START	  (((unsigned long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ #define VMALLOC_END       (PAGE_OFFSET + 0x1c000000)
+ 
+ #define MODULE_START	(PAGE_OFFSET - 16*1048576)
+--- linux-2.6.0-test6/include/asm-arm/arch-sa1100/memory.h	2003-06-14 12:17:56.000000000 -0700
++++ 25/include/asm-arm/arch-sa1100/memory.h	2003-10-05 00:34:40.000000000 -0700
+@@ -74,8 +74,6 @@
+  * 	node 3:  0xd8000000 - 0xdfffffff
+  */
+ 
+-#define NR_NODES	4
+-
+ /*
+  * Given a kernel address, find the home node of the underlying memory.
+  */
+--- linux-2.6.0-test6/include/asm-arm/arch-sa1100/vmalloc.h	2003-06-14 12:18:51.000000000 -0700
++++ 25/include/asm-arm/arch-sa1100/vmalloc.h	2003-10-05 00:33:24.000000000 -0700
+@@ -12,7 +12,6 @@
+  */
+ #define VMALLOC_OFFSET	  (8*1024*1024)
+ #define VMALLOC_START	  (((unsigned long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ #define VMALLOC_END       (0xe8000000)
+ 
+ #define MODULE_START	(PAGE_OFFSET - 16*1048576)
+--- linux-2.6.0-test6/include/asm-arm/arch-shark/vmalloc.h	2003-06-14 12:17:59.000000000 -0700
++++ 25/include/asm-arm/arch-shark/vmalloc.h	2003-10-05 00:33:24.000000000 -0700
+@@ -12,7 +12,6 @@
+  */
+ #define VMALLOC_OFFSET	  (8*1024*1024)
+ #define VMALLOC_START	  (((unsigned long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ #define VMALLOC_END       (PAGE_OFFSET + 0x10000000)
+ 
+ #define MODULE_START	(PAGE_OFFSET - 16*1048576)
+--- linux-2.6.0-test6/include/asm-arm/arch-tbox/vmalloc.h	2003-06-14 12:17:56.000000000 -0700
++++ 25/include/asm-arm/arch-tbox/vmalloc.h	2003-10-05 00:33:24.000000000 -0700
+@@ -12,7 +12,6 @@
+  */
+ #define VMALLOC_OFFSET	  (8*1024*1024)
+ #define VMALLOC_START	  (((unsigned long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ #define VMALLOC_END       (PAGE_OFFSET + 0x10000000)
+ 
+ #define MODULE_START	(PAGE_OFFSET - 16*1048576)
+--- linux-2.6.0-test6/include/asm-arm/cacheflush.h	2003-09-27 18:57:46.000000000 -0700
++++ 25/include/asm-arm/cacheflush.h	2003-10-05 00:33:24.000000000 -0700
+@@ -207,6 +207,15 @@ extern void dmac_inv_range(unsigned long
+ extern void dmac_clean_range(unsigned long, unsigned long);
+ extern void dmac_flush_range(unsigned long, unsigned long);
+ 
++#define flush_cache_vmap(start, end)		flush_cache_all()
++#define flush_cache_vunmap(start, end)		flush_cache_all()
++#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
++do { memcpy(dst, src, len); \
++     flush_icache_user_range(vma, page, vaddr, len); \
++} while (0)
++#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
++
+ #endif
+ 
+ /*
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-arm/mach/flash.h	2003-10-05 00:33:24.000000000 -0700
+@@ -0,0 +1,19 @@
++/*
++ *  linux/include/asm-arm/mach/flash.h
++ *
++ *  Copyright (C) 2003 Russell King, All Rights Reserved.
++ */
++#ifndef ASMARM_MACH_FLASH_H
++#define ASMAMR_MACH_FLASH_H
++
++struct mtd_partition;
++
++struct flash_platform_data {
++	const char	*map_name;
++	int		width;
++	int		(*init)(void);
++	void		(*exit)(void);
++	void		(*set_vpp)(int on);
++};
++
++#endif
+--- linux-2.6.0-test6/include/asm-arm/memory.h	2003-09-08 13:58:59.000000000 -0700
++++ 25/include/asm-arm/memory.h	2003-10-05 00:34:41.000000000 -0700
+@@ -84,24 +84,24 @@ static inline void *phys_to_virt(unsigne
+ 
+ #define PHYS_TO_NID(addr)	(0)
+ 
+-#else
++#else /* CONFIG_DISCONTIGMEM */
++
+ /*
+  * This is more complex.  We have a set of mem_map arrays spread
+  * around in memory.
+  */
++#include <linux/numa.h>
++
+ #define page_to_pfn(page)					\
+ 	(( (page) - page_zone(page)->zone_mem_map)		\
+ 	  + page_zone(page)->zone_start_pfn)
+-
+ #define pfn_to_page(pfn)					\
+ 	(PFN_TO_MAPBASE(pfn) + LOCAL_MAP_NR((pfn) << PAGE_SHIFT))
+-
+-#define pfn_valid(pfn)		(PFN_TO_NID(pfn) < NR_NODES)
++#define pfn_valid(pfn)		(PFN_TO_NID(pfn) < MAX_NUMNODES)
+ 
+ #define virt_to_page(kaddr)					\
+ 	(ADDR_TO_MAPBASE(kaddr) + LOCAL_MAP_NR(kaddr))
+-
+-#define virt_addr_valid(kaddr)	(KVADDR_TO_NID(kaddr) < NR_NODES)
++#define virt_addr_valid(kaddr)	(KVADDR_TO_NID(kaddr) < MAX_NUMNODES)
+ 
+ /*
+  * Common discontigmem stuff.
+@@ -109,7 +109,7 @@ static inline void *phys_to_virt(unsigne
+  */
+ #define PHYS_TO_NID(addr)	PFN_TO_NID((addr) >> PAGE_SHIFT)
+ 
+-#endif
++#endif /* !CONFIG_DISCONTIGMEM */
+ 
+ /*
+  * For BIO.  "will die".  Kill me when bio_to_phys() and bvec_to_phys() die.
+--- linux-2.6.0-test6/include/asm-arm/numnodes.h	2003-06-14 12:18:07.000000000 -0700
++++ 25/include/asm-arm/numnodes.h	2003-10-05 00:34:40.000000000 -0700
+@@ -10,8 +10,7 @@
+ #ifndef __ASM_ARM_NUMNODES_H
+ #define __ASM_ARM_NUMNODES_H
+ 
+-#include <asm/memory.h>
+-
+-#define MAX_NUMNODES	NR_NODES
++/* Max 4 Nodes */
++#define NODES_SHIFT	2
+ 
+ #endif
+--- linux-2.6.0-test6/include/asm-arm/unistd.h	2003-09-08 13:58:59.000000000 -0700
++++ 25/include/asm-arm/unistd.h	2003-10-05 00:33:24.000000000 -0700
+@@ -32,7 +32,7 @@
+ #define __NR_write			(__NR_SYSCALL_BASE+  4)
+ #define __NR_open			(__NR_SYSCALL_BASE+  5)
+ #define __NR_close			(__NR_SYSCALL_BASE+  6)
+-#define __NR_waitpid			(__NR_SYSCALL_BASE+  7)	/* removed */
++					/* 7 was sys_waitpid */
+ #define __NR_creat			(__NR_SYSCALL_BASE+  8)
+ #define __NR_link			(__NR_SYSCALL_BASE+  9)
+ #define __NR_unlink			(__NR_SYSCALL_BASE+ 10)
+@@ -42,7 +42,7 @@
+ #define __NR_mknod			(__NR_SYSCALL_BASE+ 14)
+ #define __NR_chmod			(__NR_SYSCALL_BASE+ 15)
+ #define __NR_lchown			(__NR_SYSCALL_BASE+ 16)
+-#define __NR_break			(__NR_SYSCALL_BASE+ 17)	/* removed */
++					/* 17 was sys_break */
+ 					/* 18 was sys_stat */
+ #define __NR_lseek			(__NR_SYSCALL_BASE+ 19)
+ #define __NR_getpid			(__NR_SYSCALL_BASE+ 20)
+@@ -53,14 +53,14 @@
+ #define __NR_stime			(__NR_SYSCALL_BASE+ 25)
+ #define __NR_ptrace			(__NR_SYSCALL_BASE+ 26)
+ #define __NR_alarm			(__NR_SYSCALL_BASE+ 27)
+-
++					/* 28 was sys_fstat */
+ #define __NR_pause			(__NR_SYSCALL_BASE+ 29)
+ #define __NR_utime			(__NR_SYSCALL_BASE+ 30)
+-#define __NR_stty			(__NR_SYSCALL_BASE+ 31)	/* removed */
+-#define __NR_gtty			(__NR_SYSCALL_BASE+ 32)	/* removed */
++					/* 31 was sys_stty */
++					/* 32 was sys_gtty */
+ #define __NR_access			(__NR_SYSCALL_BASE+ 33)
+ #define __NR_nice			(__NR_SYSCALL_BASE+ 34)
+-#define __NR_ftime			(__NR_SYSCALL_BASE+ 35)	/* removed */
++					/* 35 was sys_ftime */
+ #define __NR_sync			(__NR_SYSCALL_BASE+ 36)
+ #define __NR_kill			(__NR_SYSCALL_BASE+ 37)
+ #define __NR_rename			(__NR_SYSCALL_BASE+ 38)
+@@ -69,21 +69,21 @@
+ #define __NR_dup			(__NR_SYSCALL_BASE+ 41)
+ #define __NR_pipe			(__NR_SYSCALL_BASE+ 42)
+ #define __NR_times			(__NR_SYSCALL_BASE+ 43)
+-#define __NR_prof			(__NR_SYSCALL_BASE+ 44)	/* removed */
++					/* 44 was sys_prof */
+ #define __NR_brk			(__NR_SYSCALL_BASE+ 45)
+ #define __NR_setgid			(__NR_SYSCALL_BASE+ 46)
+ #define __NR_getgid			(__NR_SYSCALL_BASE+ 47)
+-#define __NR_signal			(__NR_SYSCALL_BASE+ 48)	/* removed */
++					/* 48 was sys_signal */
+ #define __NR_geteuid			(__NR_SYSCALL_BASE+ 49)
+ #define __NR_getegid			(__NR_SYSCALL_BASE+ 50)
+ #define __NR_acct			(__NR_SYSCALL_BASE+ 51)
+ #define __NR_umount2			(__NR_SYSCALL_BASE+ 52)
+-#define __NR_lock			(__NR_SYSCALL_BASE+ 53)	/* removed */
++					/* 53 was sys_lock */
+ #define __NR_ioctl			(__NR_SYSCALL_BASE+ 54)
+ #define __NR_fcntl			(__NR_SYSCALL_BASE+ 55)
+-#define __NR_mpx			(__NR_SYSCALL_BASE+ 56)	/* removed */
++					/* 56 was sys_mpx */
+ #define __NR_setpgid			(__NR_SYSCALL_BASE+ 57)
+-#define __NR_ulimit			(__NR_SYSCALL_BASE+ 58)	/* removed */
++					/* 58 was sys_ulimit */
+ 					/* 59 was sys_olduname */
+ #define __NR_umask			(__NR_SYSCALL_BASE+ 60)
+ #define __NR_chroot			(__NR_SYSCALL_BASE+ 61)
+@@ -93,8 +93,8 @@
+ #define __NR_getpgrp			(__NR_SYSCALL_BASE+ 65)
+ #define __NR_setsid			(__NR_SYSCALL_BASE+ 66)
+ #define __NR_sigaction			(__NR_SYSCALL_BASE+ 67)
+-#define __NR_sgetmask			(__NR_SYSCALL_BASE+ 68)	/* removed */
+-#define __NR_ssetmask			(__NR_SYSCALL_BASE+ 69)	/* removed */
++					/* 68 was sys_sgetmask */
++					/* 69 was sys_ssetmask */
+ #define __NR_setreuid			(__NR_SYSCALL_BASE+ 70)
+ #define __NR_setregid			(__NR_SYSCALL_BASE+ 71)
+ #define __NR_sigsuspend			(__NR_SYSCALL_BASE+ 72)
+@@ -123,10 +123,10 @@
+ #define __NR_fchown			(__NR_SYSCALL_BASE+ 95)
+ #define __NR_getpriority		(__NR_SYSCALL_BASE+ 96)
+ #define __NR_setpriority		(__NR_SYSCALL_BASE+ 97)
+-#define __NR_profil			(__NR_SYSCALL_BASE+ 98)	/* removed */
++					/* 98 was sys_profil */
+ #define __NR_statfs			(__NR_SYSCALL_BASE+ 99)
+ #define __NR_fstatfs			(__NR_SYSCALL_BASE+100)
+-#define __NR_ioperm			(__NR_SYSCALL_BASE+101)
++					/* 101 was sys_ioperm */
+ #define __NR_socketcall			(__NR_SYSCALL_BASE+102)
+ #define __NR_syslog			(__NR_SYSCALL_BASE+103)
+ #define __NR_setitimer			(__NR_SYSCALL_BASE+104)
+@@ -137,7 +137,7 @@
+ 					/* 109 was sys_uname */
+ 					/* 110 was sys_iopl */
+ #define __NR_vhangup			(__NR_SYSCALL_BASE+111)
+-#define __NR_idle			(__NR_SYSCALL_BASE+112)
++					/* 112 was sys_idle */
+ #define __NR_syscall			(__NR_SYSCALL_BASE+113) /* syscall to call a syscall! */
+ #define __NR_wait4			(__NR_SYSCALL_BASE+114)
+ #define __NR_swapoff			(__NR_SYSCALL_BASE+115)
+@@ -148,21 +148,21 @@
+ #define __NR_clone			(__NR_SYSCALL_BASE+120)
+ #define __NR_setdomainname		(__NR_SYSCALL_BASE+121)
+ #define __NR_uname			(__NR_SYSCALL_BASE+122)
+-#define __NR_modify_ldt			(__NR_SYSCALL_BASE+123)
++					/* 123 was sys_modify_ldt */
+ #define __NR_adjtimex			(__NR_SYSCALL_BASE+124)
+ #define __NR_mprotect			(__NR_SYSCALL_BASE+125)
+ #define __NR_sigprocmask		(__NR_SYSCALL_BASE+126)
+-#define __NR_create_module		(__NR_SYSCALL_BASE+127)	/* removed */
++					/* 127 was sys_create_module */
+ #define __NR_init_module		(__NR_SYSCALL_BASE+128)
+ #define __NR_delete_module		(__NR_SYSCALL_BASE+129)
+-#define __NR_get_kernel_syms		(__NR_SYSCALL_BASE+130)	/* removed */
++					/* 130 was sys_get_kernel_syms */
+ #define __NR_quotactl			(__NR_SYSCALL_BASE+131)
+ #define __NR_getpgid			(__NR_SYSCALL_BASE+132)
+ #define __NR_fchdir			(__NR_SYSCALL_BASE+133)
+ #define __NR_bdflush			(__NR_SYSCALL_BASE+134)
+ #define __NR_sysfs			(__NR_SYSCALL_BASE+135)
+ #define __NR_personality		(__NR_SYSCALL_BASE+136)
+-#define __NR_afs_syscall		(__NR_SYSCALL_BASE+137) /* Syscall for Andrew File System */
++					/* 137 was sys_afs_syscall */
+ #define __NR_setfsuid			(__NR_SYSCALL_BASE+138)
+ #define __NR_setfsgid			(__NR_SYSCALL_BASE+139)
+ #define __NR__llseek			(__NR_SYSCALL_BASE+140)
+@@ -191,8 +191,8 @@
+ #define __NR_mremap			(__NR_SYSCALL_BASE+163)
+ #define __NR_setresuid			(__NR_SYSCALL_BASE+164)
+ #define __NR_getresuid			(__NR_SYSCALL_BASE+165)
+-#define __NR_vm86			(__NR_SYSCALL_BASE+166)	/* removed */
+-#define __NR_query_module		(__NR_SYSCALL_BASE+167)	/* removed */
++					/* 166 was sys_vm86 */
++					/* 167 was sys_query_module */
+ #define __NR_poll			(__NR_SYSCALL_BASE+168)
+ #define __NR_nfsservctl			(__NR_SYSCALL_BASE+169)
+ #define __NR_setresgid			(__NR_SYSCALL_BASE+170)
+--- linux-2.6.0-test6/include/asm-cris/arch-v10/pgtable.h	2003-07-10 18:50:32.000000000 -0700
++++ 25/include/asm-cris/arch-v10/pgtable.h	2003-10-05 00:33:24.000000000 -0700
+@@ -7,11 +7,9 @@
+ 
+ #ifdef CONFIG_CRIS_LOW_MAP
+ #define VMALLOC_START     KSEG_7
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ #define VMALLOC_END       KSEG_8
+ #else
+ #define VMALLOC_START     KSEG_D
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ #define VMALLOC_END       KSEG_E
+ #endif
+ 
+--- linux-2.6.0-test6/include/asm-cris/cacheflush.h	2003-07-10 18:50:32.000000000 -0700
++++ 25/include/asm-cris/cacheflush.h	2003-10-05 00:33:24.000000000 -0700
+@@ -16,6 +16,13 @@
+ #define flush_icache_range(start, end)		do { } while (0)
+ #define flush_icache_page(vma,pg)		do { } while (0)
+ #define flush_icache_user_range(vma,pg,adr,len)	do { } while (0)
++#define flush_cache_vmap(start, end)		do { } while (0)
++#define flush_cache_vunmap(start, end)		do { } while (0)
++
++#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
++#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
+ 
+ void global_flush_tlb(void); 
+ int change_page_attr(struct page *page, int numpages, pgprot_t prot);
+--- linux-2.6.0-test6/include/asm-h8300/cacheflush.h	2003-06-14 12:18:07.000000000 -0700
++++ 25/include/asm-h8300/cacheflush.h	2003-10-05 00:33:24.000000000 -0700
+@@ -11,7 +11,6 @@
+  */
+ 
+ #define flush_cache_all()
+-#define	flush_cache_all()
+ #define	flush_cache_mm(mm)
+ #define	flush_cache_range(vma,a,b)
+ #define	flush_cache_page(vma,p)
+@@ -20,6 +19,8 @@
+ #define	flush_icache()
+ #define	flush_icache_page(vma,page)
+ #define	flush_icache_range(start,len)
++#define flush_cache_vmap(start, end)
++#define flush_cache_vunmap(start, end)
+ #define	cache_push_v(vaddr,len)
+ #define	cache_push(paddr,len)
+ #define	cache_clear(paddr,len)
+@@ -28,4 +29,9 @@
+ 
+ #define	flush_icache_user_range(vma,page,addr,len)
+ 
++#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
++#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
++
+ #endif /* _ASM_H8300_CACHEFLUSH_H */
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-i386/atomic_kmap.h	2003-10-05 00:36:48.000000000 -0700
+@@ -0,0 +1,95 @@
++/*
++ * atomic_kmap.h: temporary virtual kernel memory mappings
++ *
++ * Copyright (C) 2003 Ingo Molnar <mingo@redhat.com>
++ */
++
++#ifndef _ASM_ATOMIC_KMAP_H
++#define _ASM_ATOMIC_KMAP_H
++
++#ifdef __KERNEL__
++
++#include <linux/config.h>
++#include <asm/tlbflush.h>
++
++#ifdef CONFIG_DEBUG_HIGHMEM
++#define HIGHMEM_DEBUG 1
++#else
++#define HIGHMEM_DEBUG 0
++#endif
++
++extern pte_t *kmap_pte;
++#define kmap_prot PAGE_KERNEL
++
++#define PKMAP_BASE (0xff000000UL)
++#define NR_SHARED_PMDS ((0xffffffff-PKMAP_BASE+1)/PMD_SIZE)
++
++static inline unsigned long __kmap_atomic_vaddr(enum km_type type)
++{
++	enum fixed_addresses idx;
++
++	idx = type + KM_TYPE_NR*smp_processor_id();
++	return __fix_to_virt(FIX_KMAP_BEGIN + idx);
++}
++
++static inline void *__kmap_atomic_noflush(struct page *page, enum km_type type)
++{
++	enum fixed_addresses idx;
++	unsigned long vaddr;
++
++	idx = type + KM_TYPE_NR*smp_processor_id();
++	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
++	/*
++	 * NOTE: entries that rely on some secondary TLB-flush
++	 * effect must not be global:
++	 */
++	set_pte(kmap_pte-idx, mk_pte(page, PAGE_KERNEL));
++
++	return (void*) vaddr;
++}
++
++static inline void *__kmap_atomic(struct page *page, enum km_type type)
++{
++	enum fixed_addresses idx;
++	unsigned long vaddr;
++
++	idx = type + KM_TYPE_NR*smp_processor_id();
++	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
++#if HIGHMEM_DEBUG
++	BUG_ON(!pte_none(*(kmap_pte-idx)));
++#else
++	/*
++	 * Performance optimization - do not flush if the new
++	 * pte is the same as the old one:
++	 */
++	if (pte_val(*(kmap_pte-idx)) == pte_val(mk_pte(page, kmap_prot)))
++		return (void *) vaddr;
++#endif
++	set_pte(kmap_pte-idx, mk_pte(page, kmap_prot));
++	__flush_tlb_one(vaddr);
++
++	return (void*) vaddr;
++}
++
++static inline void __kunmap_atomic(void *kvaddr, enum km_type type)
++{
++#if HIGHMEM_DEBUG
++	unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK;
++	enum fixed_addresses idx = type + KM_TYPE_NR*smp_processor_id();
++
++	BUG_ON(vaddr != __fix_to_virt(FIX_KMAP_BEGIN+idx));
++	/*
++	 * force other mappings to Oops if they'll try to access
++	 * this pte without first remap it
++	 */
++	pte_clear(kmap_pte-idx);
++	__flush_tlb_one(vaddr);
++#endif
++}
++
++#define __kunmap_atomic_type(type) \
++		__kunmap_atomic((void *)__kmap_atomic_vaddr(type), (type))
++
++#endif /* __KERNEL__ */
++
++#endif /* _ASM_ATOMIC_KMAP_H */
+--- linux-2.6.0-test6/include/asm-i386/bugs.h	2003-09-08 13:58:59.000000000 -0700
++++ 25/include/asm-i386/bugs.h	2003-10-05 00:33:38.000000000 -0700
+@@ -1,11 +1,11 @@
+ /*
+  *  include/asm-i386/bugs.h
+  *
+- *  Copyright (C) 1994  Linus Torvalds
++ *  Copyright (C) 1994	Linus Torvalds
+  *
+  *  Cyrix stuff, June 1998 by:
+  *	- Rafael R. Reilova (moved everything from head.S),
+- *        <rreilova@ececs.uc.edu>
++ *	  <rreilova@ececs.uc.edu>
+  *	- Channing Corn (tests & fixes),
+  *	- Andrew D. Balsa (code cleanup).
+  *
+@@ -25,7 +25,20 @@
+ #include <asm/processor.h>
+ #include <asm/i387.h>
+ #include <asm/msr.h>
+-
++#ifdef CONFIG_KGDB
++/*
++ * Provied the command line "gdb" initial break
++ */
++int __init kgdb_initial_break(char * str)
++{
++	if (*str == '\0'){
++		breakpoint();
++		return 1;
++	}
++	return 0;
++}
++__setup("gdb",kgdb_initial_break);
++#endif
+ static int __init no_halt(char *s)
+ {
+ 	boot_cpu_data.hlt_works_ok = 0;
+@@ -140,7 +153,7 @@ static void __init check_popad(void)
+ 	  : "ecx", "edi" );
+ 	/* If this fails, it means that any user program may lock the CPU hard. Too bad. */
+ 	if (res != 12345678) printk( "Buggy.\n" );
+-		        else printk( "OK.\n" );
++			else printk( "OK.\n" );
+ #endif
+ }
+ 
+--- linux-2.6.0-test6/include/asm-i386/cacheflush.h	2003-07-10 18:50:32.000000000 -0700
++++ 25/include/asm-i386/cacheflush.h	2003-10-05 00:33:24.000000000 -0700
+@@ -13,6 +13,13 @@
+ #define flush_icache_range(start, end)		do { } while (0)
+ #define flush_icache_page(vma,pg)		do { } while (0)
+ #define flush_icache_user_range(vma,pg,adr,len)	do { } while (0)
++#define flush_cache_vmap(start, end)		do { } while (0)
++#define flush_cache_vunmap(start, end)		do { } while (0)
++
++#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
++#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
+ 
+ void global_flush_tlb(void); 
+ int change_page_attr(struct page *page, int numpages, pgprot_t prot);
+--- linux-2.6.0-test6/include/asm-i386/checksum.h	2003-06-14 12:18:29.000000000 -0700
++++ 25/include/asm-i386/checksum.h	2003-10-05 00:36:48.000000000 -0700
+@@ -25,7 +25,7 @@ asmlinkage unsigned int csum_partial(con
+  * better 64-bit) boundary
+  */
+ 
+-asmlinkage unsigned int csum_partial_copy_generic( const char *src, char *dst, int len, int sum,
++asmlinkage unsigned int direct_csum_partial_copy_generic( const char *src, char *dst, int len, int sum,
+ 						   int *src_err_ptr, int *dst_err_ptr);
+ 
+ /*
+@@ -39,14 +39,19 @@ static __inline__
+ unsigned int csum_partial_copy_nocheck ( const char *src, char *dst,
+ 					int len, int sum)
+ {
+-	return csum_partial_copy_generic ( src, dst, len, sum, NULL, NULL);
++	/*
++	 * The direct function is OK for kernel-space => kernel-space copies:
++	 */
++	return direct_csum_partial_copy_generic ( src, dst, len, sum, NULL, NULL);
+ }
+ 
+ static __inline__
+ unsigned int csum_partial_copy_from_user ( const char *src, char *dst,
+ 						int len, int sum, int *err_ptr)
+ {
+-	return csum_partial_copy_generic ( src, dst, len, sum, err_ptr, NULL);
++	if (copy_from_user(dst, src, len))
++		*err_ptr = -EFAULT;
++	return csum_partial(dst, len, sum);
+ }
+ 
+ /*
+@@ -171,11 +176,26 @@ static __inline__ unsigned short int csu
+  *	Copy and checksum to user
+  */
+ #define HAVE_CSUM_COPY_USER
+-static __inline__ unsigned int csum_and_copy_to_user(const char *src, char *dst,
++static __inline__ unsigned int direct_csum_and_copy_to_user(const char *src, char *dst,
+ 				    int len, int sum, int *err_ptr)
+ {
+ 	if (access_ok(VERIFY_WRITE, dst, len))
+-		return csum_partial_copy_generic(src, dst, len, sum, NULL, err_ptr);
++		return direct_csum_partial_copy_generic(src, dst, len, sum, NULL, err_ptr);
++
++	if (len)
++		*err_ptr = -EFAULT;
++
++	return -1; /* invalid checksum */
++}
++
++static __inline__ unsigned int csum_and_copy_to_user(const char *src, char *dst,
++				    int len, int sum, int *err_ptr)
++{
++	if (access_ok(VERIFY_WRITE, dst, len)) {
++		if (copy_to_user(dst, src, len))
++			*err_ptr = -EFAULT;
++		return csum_partial(src, len, sum);
++	}
+ 
+ 	if (len)
+ 		*err_ptr = -EFAULT;
+--- linux-2.6.0-test6/include/asm-i386/desc.h	2003-06-14 12:17:55.000000000 -0700
++++ 25/include/asm-i386/desc.h	2003-10-05 00:36:48.000000000 -0700
+@@ -21,6 +21,13 @@ struct Xgt_desc_struct {
+ 
+ extern struct Xgt_desc_struct idt_descr, cpu_gdt_descr[NR_CPUS];
+ 
++extern void trap_init_virtual_IDT(void);
++extern void trap_init_virtual_GDT(void);
++
++asmlinkage int system_call(void);
++asmlinkage void lcall7(void);
++asmlinkage void lcall27(void);
++
+ #define load_TR_desc() __asm__ __volatile__("ltr %%ax"::"a" (GDT_ENTRY_TSS*8))
+ #define load_LDT_desc() __asm__ __volatile__("lldt %%ax"::"a" (GDT_ENTRY_LDT*8))
+ 
+@@ -30,6 +37,7 @@ extern struct Xgt_desc_struct idt_descr,
+  */
+ extern struct desc_struct default_ldt[];
+ extern void set_intr_gate(unsigned int irq, void * addr);
++extern void set_trap_gate(unsigned int n, void *addr);
+ 
+ #define _set_tssldt_desc(n,addr,limit,type) \
+ __asm__ __volatile__ ("movw %w3,0(%2)\n\t" \
+@@ -90,31 +98,8 @@ static inline void load_TLS(struct threa
+ #undef C
+ }
+ 
+-static inline void clear_LDT(void)
+-{
+-	int cpu = get_cpu();
+-
+-	set_ldt_desc(cpu, &default_ldt[0], 5);
+-	load_LDT_desc();
+-	put_cpu();
+-}
+-
+-/*
+- * load one particular LDT into the current CPU
+- */
+-static inline void load_LDT_nolock(mm_context_t *pc, int cpu)
+-{
+-	void *segments = pc->ldt;
+-	int count = pc->size;
+-
+-	if (likely(!count)) {
+-		segments = &default_ldt[0];
+-		count = 5;
+-	}
+-		
+-	set_ldt_desc(cpu, segments, count);
+-	load_LDT_desc();
+-}
++extern struct page *default_ldt_page;
++extern void load_LDT_nolock(mm_context_t *pc, int cpu);
+ 
+ static inline void load_LDT(mm_context_t *pc)
+ {
+@@ -123,6 +108,6 @@ static inline void load_LDT(mm_context_t
+ 	put_cpu();
+ }
+ 
+-#endif /* !__ASSEMBLY__ */
+ 
++#endif /* !__ASSEMBLY__ */
+ #endif
+--- linux-2.6.0-test6/include/asm-i386/elf.h	2003-06-14 12:18:25.000000000 -0700
++++ 25/include/asm-i386/elf.h	2003-10-05 00:33:24.000000000 -0700
+@@ -127,11 +127,6 @@ extern int dump_task_extended_fpu (struc
+ #define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) dump_task_fpu(tsk, elf_fpregs)
+ #define ELF_CORE_COPY_XFPREGS(tsk, elf_xfpregs) dump_task_extended_fpu(tsk, elf_xfpregs)
+ 
+-#ifdef CONFIG_SMP
+-extern void dump_smp_unlazy_fpu(void);
+-#define ELF_CORE_SYNC dump_smp_unlazy_fpu
+-#endif
+-
+ #define VSYSCALL_BASE	(__fix_to_virt(FIX_VSYSCALL))
+ #define VSYSCALL_EHDR	((const struct elfhdr *) VSYSCALL_BASE)
+ #define VSYSCALL_ENTRY	((unsigned long) &__kernel_vsyscall)
+@@ -162,7 +157,10 @@ do {									      \
+ 	for (i = 0; i < VSYSCALL_EHDR->e_phnum; ++i) {			      \
+ 		struct elf_phdr phdr = vsyscall_phdrs[i];		      \
+ 		if (phdr.p_type == PT_LOAD) {				      \
++			BUG_ON(ofs != 0);				      \
+ 			ofs = phdr.p_offset = offset;			      \
++			phdr.p_memsz = PAGE_ALIGN(phdr.p_memsz);	      \
++			phdr.p_filesz = phdr.p_memsz;			      \
+ 			offset += phdr.p_filesz;			      \
+ 		}							      \
+ 		else							      \
+@@ -180,7 +178,7 @@ do {									      \
+ 	for (i = 0; i < VSYSCALL_EHDR->e_phnum; ++i) {			      \
+ 		if (vsyscall_phdrs[i].p_type == PT_LOAD)		      \
+ 			DUMP_WRITE((void *) vsyscall_phdrs[i].p_vaddr,	      \
+-				   vsyscall_phdrs[i].p_filesz);		      \
++				   PAGE_ALIGN(vsyscall_phdrs[i].p_memsz));    \
+ 	}								      \
+ } while (0)
+ 
+--- linux-2.6.0-test6/include/asm-i386/fixmap.h	2003-06-14 12:17:57.000000000 -0700
++++ 25/include/asm-i386/fixmap.h	2003-10-05 00:36:48.000000000 -0700
+@@ -18,17 +18,15 @@
+ #include <asm/acpi.h>
+ #include <asm/apicdef.h>
+ #include <asm/page.h>
+-#ifdef CONFIG_HIGHMEM
+ #include <linux/threads.h>
+ #include <asm/kmap_types.h>
+-#endif
+ 
+ /*
+  * Here we define all the compile-time 'special' virtual
+  * addresses. The point is to have a constant address at
+  * compile time, but to set the physical address only
+- * in the boot process. We allocate these special addresses
+- * from the end of virtual memory (0xfffff000) backwards.
++ * in the boot process. We allocate these special  addresses
++ * from the end of virtual memory (0xffffe000) backwards.
+  * Also this lets us do fail-safe vmalloc(), we
+  * can guarantee that these special addresses and
+  * vmalloc()-ed addresses never overlap.
+@@ -41,11 +39,20 @@
+  * TLB entries of such buffers will not be flushed across
+  * task switches.
+  */
++
++/*
++ * on UP currently we will have no trace of the fixmap mechanizm,
++ * no page table allocations, etc. This might change in the
++ * future, say framebuffers for the console driver(s) could be
++ * fix-mapped?
++ */
+ enum fixed_addresses {
+ 	FIX_HOLE,
+ 	FIX_VSYSCALL,
+ #ifdef CONFIG_X86_LOCAL_APIC
+ 	FIX_APIC_BASE,	/* local (CPU) APIC) -- required for SMP or not */
++#else
++	FIX_VSTACK_HOLE_1,
+ #endif
+ #ifdef CONFIG_X86_IO_APIC
+ 	FIX_IO_APIC_BASE_0,
+@@ -57,16 +64,21 @@ enum fixed_addresses {
+ 	FIX_LI_PCIA,	/* Lithium PCI Bridge A */
+ 	FIX_LI_PCIB,	/* Lithium PCI Bridge B */
+ #endif
+-#ifdef CONFIG_X86_F00F_BUG
+-	FIX_F00F_IDT,	/* Virtual mapping for IDT */
+-#endif
++	FIX_IDT,
++	FIX_GDT_1,
++	FIX_GDT_0,
++	FIX_TSS_3,
++	FIX_TSS_2,
++	FIX_TSS_1,
++	FIX_TSS_0,
++	FIX_ENTRY_TRAMPOLINE_1,
++	FIX_ENTRY_TRAMPOLINE_0,
+ #ifdef CONFIG_X86_CYCLONE_TIMER
+ 	FIX_CYCLONE_TIMER, /*cyclone timer register*/
++	FIX_VSTACK_HOLE_2,
+ #endif 
+-#ifdef CONFIG_HIGHMEM
+ 	FIX_KMAP_BEGIN,	/* reserved pte's for temporary kernel mappings */
+ 	FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,
+-#endif
+ #ifdef CONFIG_ACPI_BOOT
+ 	FIX_ACPI_BEGIN,
+ 	FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1,
+@@ -95,12 +107,15 @@ extern void __set_fixmap (enum fixed_add
+ 		__set_fixmap(idx, 0, __pgprot(0))
+ 
+ /*
+- * used by vmalloc.c.
++ * used by vmalloc.c and various other places.
+  *
+  * Leave one empty page between vmalloc'ed areas and
+  * the start of the fixmap.
++ *
++ * IMPORTANT: dont change FIXADDR_TOP without adjusting KM_VSTACK0
++ * and KM_VSTACK1 so that the virtual stack is 8K aligned.
+  */
+-#define FIXADDR_TOP	(0xfffff000UL)
++#define FIXADDR_TOP	(0xffffe000UL)
+ #define __FIXADDR_SIZE	(__end_of_permanent_fixed_addresses << PAGE_SHIFT)
+ #define FIXADDR_START	(FIXADDR_TOP - __FIXADDR_SIZE)
+ 
+--- linux-2.6.0-test6/include/asm-i386/highmem.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/include/asm-i386/highmem.h	2003-10-05 00:36:48.000000000 -0700
+@@ -25,26 +25,19 @@
+ #include <linux/threads.h>
+ #include <asm/kmap_types.h>
+ #include <asm/tlbflush.h>
++#include <asm/atomic_kmap.h>
+ 
+ /* declarations for highmem.c */
+ extern unsigned long highstart_pfn, highend_pfn;
+ 
+-extern pte_t *kmap_pte;
+-extern pgprot_t kmap_prot;
+ extern pte_t *pkmap_page_table;
+-
+-extern void kmap_init(void);
++extern void kmap_init(void) __init;
+ 
+ /*
+  * Right now we initialize only a single pte table. It can be extended
+  * easily, subsequent pte tables have to be allocated in one physical
+  * chunk of RAM.
+  */
+-#if NR_CPUS <= 32
+-#define PKMAP_BASE (0xff800000UL)
+-#else
+-#define PKMAP_BASE (0xff600000UL)
+-#endif
+ #ifdef CONFIG_X86_PAE
+ #define LAST_PKMAP 512
+ #else
+@@ -63,6 +56,8 @@ void *kmap_atomic(struct page *page, enu
+ void kunmap_atomic(void *kvaddr, enum km_type type);
+ struct page *kmap_atomic_to_page(void *ptr);
+ 
++#define flush_cache_kmaps()	do { } while (0)
++
+ #endif /* __KERNEL__ */
+ 
+ #endif /* _ASM_HIGHMEM_H */
+--- linux-2.6.0-test6/include/asm-i386/hw_irq.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/include/asm-i386/hw_irq.h	2003-10-05 00:36:27.000000000 -0700
+@@ -25,8 +25,9 @@
+  * Interrupt entry/exit code at both C and assembly level
+  */
+ 
+-extern int irq_vector[NR_IRQS];
+-#define IO_APIC_VECTOR(irq)	irq_vector[irq]
++extern u8 *irq_vector;
++#define IO_APIC_VECTOR(irq)	((int)irq_vector[(irq)])
++extern int nr_irqs;
+ 
+ extern void (*interrupt[NR_IRQS])(void);
+ 
+@@ -41,6 +42,7 @@ asmlinkage void apic_timer_interrupt(voi
+ asmlinkage void error_interrupt(void);
+ asmlinkage void spurious_interrupt(void);
+ asmlinkage void thermal_interrupt(struct pt_regs);
++#define platform_legacy_irq(irq)	((irq) < 16)
+ #endif
+ 
+ void mask_irq(unsigned int irq);
+--- linux-2.6.0-test6/include/asm-i386/io_apic.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/include/asm-i386/io_apic.h	2003-10-05 00:36:21.000000000 -0700
+@@ -13,6 +13,46 @@
+ 
+ #ifdef CONFIG_X86_IO_APIC
+ 
++#ifdef CONFIG_PCI_USE_VECTOR
++static inline int use_pci_vector(void)	{return 1;}
++static inline void disable_edge_ioapic_vector(unsigned int vector) { }
++static inline void mask_and_ack_level_ioapic_vector(unsigned int vector) { }
++static inline void end_edge_ioapic_vector (unsigned int vector) { }
++#define startup_level_ioapic	startup_level_ioapic_vector
++#define shutdown_level_ioapic	mask_IO_APIC_vector
++#define enable_level_ioapic	unmask_IO_APIC_vector
++#define disable_level_ioapic	mask_IO_APIC_vector
++#define mask_and_ack_level_ioapic mask_and_ack_level_ioapic_vector
++#define end_level_ioapic	end_level_ioapic_vector
++#define set_ioapic_affinity	set_ioapic_affinity_vector
++
++#define startup_edge_ioapic 	startup_edge_ioapic_vector
++#define shutdown_edge_ioapic 	disable_edge_ioapic_vector
++#define enable_edge_ioapic 	unmask_IO_APIC_vector
++#define disable_edge_ioapic 	disable_edge_ioapic_vector
++#define ack_edge_ioapic 	ack_edge_ioapic_vector
++#define end_edge_ioapic 	end_edge_ioapic_vector
++#else
++static inline int use_pci_vector(void)	{return 0;}
++static inline void disable_edge_ioapic_irq(unsigned int irq) { }
++static inline void mask_and_ack_level_ioapic_irq(unsigned int irq) { }
++static inline void end_edge_ioapic_irq (unsigned int irq) { }
++#define startup_level_ioapic	startup_level_ioapic_irq
++#define shutdown_level_ioapic	mask_IO_APIC_irq
++#define enable_level_ioapic	unmask_IO_APIC_irq
++#define disable_level_ioapic	mask_IO_APIC_irq
++#define mask_and_ack_level_ioapic mask_and_ack_level_ioapic_irq
++#define end_level_ioapic	end_level_ioapic_irq
++#define set_ioapic_affinity	set_ioapic_affinity_irq
++
++#define startup_edge_ioapic 	startup_edge_ioapic_irq
++#define shutdown_edge_ioapic 	disable_edge_ioapic_irq
++#define enable_edge_ioapic 	unmask_IO_APIC_irq
++#define disable_edge_ioapic 	disable_edge_ioapic_irq
++#define ack_edge_ioapic 	ack_edge_ioapic_irq
++#define end_edge_ioapic 	end_edge_ioapic_irq
++#endif
++
+ #define APIC_MISMATCH_DEBUG
+ 
+ #define IO_APIC_BASE(idx) \
+@@ -177,4 +217,6 @@ extern int io_apic_set_pci_routing (int 
+ #define io_apic_assign_pci_irqs 0
+ #endif
+ 
++extern int assign_irq_vector(int irq);
++
+ #endif
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-i386/kgdb.h	2003-10-05 00:33:50.000000000 -0700
+@@ -0,0 +1,76 @@
++#ifndef __KGDB
++#define __KGDB
++
++/*
++ * This file should not include ANY others.  This makes it usable
++ * most anywhere without the fear of include order or inclusion.
++ * Make it so!
++ *
++ * This file may be included all the time.  It is only active if
++ * CONFIG_KGDB is defined, otherwise it stubs out all the macros
++ * and entry points.
++ */
++#if defined(CONFIG_KGDB) && !defined(__ASSEMBLY__)
++
++extern void breakpoint(void);
++#define INIT_KGDB_INTS kgdb_enable_ints()
++
++#ifndef BREAKPOINT
++#define BREAKPOINT   asm("   int $3")
++#endif
++
++struct sk_buff;
++
++extern int kgdb_eth;
++extern unsigned kgdb_remoteip;
++extern unsigned short kgdb_listenport;
++extern unsigned short kgdb_sendport;
++extern unsigned char kgdb_remotemac[6];
++extern unsigned char kgdb_localmac[6];
++extern int kgdb_eth_need_breakpoint[];
++
++extern int kgdb_tty_hook(void);
++extern int kgdb_eth_hook(void);
++extern int gdb_net_interrupt(struct sk_buff *skb);
++
++/*
++ * GDB debug stub (or any debug stub) can point the 'linux_debug_hook'
++ * pointer to its routine and it will be entered as the first thing
++ * when a trap occurs.
++ *
++ * Return values are, at present, undefined.
++ *
++ * The debug hook routine does not necessarily return to its caller.
++ * It has the register image and thus may choose to resume execution
++ * anywhere it pleases.
++ */
++struct pt_regs;
++struct sk_buff;
++
++extern int kgdb_handle_exception(int trapno,
++				 int signo, int err_code, struct pt_regs *regs);
++extern int in_kgdb(struct pt_regs *regs);
++extern int kgdb_net_interrupt(struct sk_buff *skb);
++
++#ifdef CONFIG_KGDB_TS
++void kgdb_tstamp(int line, char *source, int data0, int data1);
++/*
++ * This is the time stamp function.  The macro adds the source info and
++ * does a cast on the data to allow most any 32-bit value.
++ */
++
++#define kgdb_ts(data0,data1) kgdb_tstamp(__LINE__,__FILE__,(int)data0,(int)data1)
++#else
++#define kgdb_ts(data0,data1)
++#endif
++#else				/* CONFIG_KGDB  && ! __ASSEMBLY__ ,stubs follow... */
++#ifndef BREAKPOINT
++#define BREAKPOINT
++#endif
++#define kgdb_ts(data0,data1)
++#define in_kgdb
++#define kgdb_handle_exception
++#define breakpoint
++#define INIT_KGDB_INTS
++#endif
++#endif				/* __KGDB */
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-i386/kgdb_local.h	2003-10-05 00:33:38.000000000 -0700
+@@ -0,0 +1,102 @@
++#ifndef __KGDB_LOCAL
++#define ___KGDB_LOCAL
++#include <linux/config.h>
++#include <linux/types.h>
++#include <linux/serial.h>
++#include <linux/serialP.h>
++#include <linux/spinlock.h>
++#include <asm/processor.h>
++#include <asm/msr.h>
++#include <asm/kgdb.h>
++
++#define PORT 0x3f8
++#ifdef CONFIG_KGDB_PORT
++#undef PORT
++#define PORT CONFIG_KGDB_PORT
++#endif
++#define IRQ 4
++#ifdef CONFIG_KGDB_IRQ
++#undef IRQ
++#define IRQ CONFIG_KGDB_IRQ
++#endif
++#define SB_CLOCK 1843200
++#define SB_BASE (SB_CLOCK/16)
++#define SB_BAUD9600 SB_BASE/9600
++#define SB_BAUD192  SB_BASE/19200
++#define SB_BAUD384  SB_BASE/38400
++#define SB_BAUD576  SB_BASE/57600
++#define SB_BAUD1152 SB_BASE/115200
++#ifdef CONFIG_KGDB_9600BAUD
++#define SB_BAUD SB_BAUD9600
++#endif
++#ifdef CONFIG_KGDB_19200BAUD
++#define SB_BAUD SB_BAUD192
++#endif
++#ifdef CONFIG_KGDB_38400BAUD
++#define SB_BAUD SB_BAUD384
++#endif
++#ifdef CONFIG_KGDB_57600BAUD
++#define SB_BAUD SB_BAUD576
++#endif
++#ifdef CONFIG_KGDB_115200BAUD
++#define SB_BAUD SB_BAUD1152
++#endif
++#ifndef SB_BAUD
++#define SB_BAUD SB_BAUD1152	/* Start with this if not given */
++#endif
++
++#ifndef CONFIG_X86_TSC
++#undef rdtsc
++#define rdtsc(a,b) if (a++ > 10000){a = 0; b++;}
++#undef rdtscll
++#define rdtscll(s) s++
++#endif
++
++#ifdef _raw_read_unlock		/* must use a name that is "define"ed, not an inline */
++#undef spin_lock
++#undef spin_trylock
++#undef spin_unlock
++#define spin_lock	 _raw_spin_lock
++#define spin_trylock	 _raw_spin_trylock
++#define spin_unlock	 _raw_spin_unlock
++#else
++#endif
++#undef spin_unlock_wait
++#define spin_unlock_wait(x)  do { cpu_relax(); barrier();} \
++                                     while(spin_is_locked(x))
++
++#define SB_IER 1
++#define SB_MCR UART_MCR_OUT2 | UART_MCR_DTR | UART_MCR_RTS
++
++#define FLAGS 0
++#define SB_STATE { \
++     magic: SSTATE_MAGIC, \
++     baud_base: SB_BASE,  \
++     port:      PORT,     \
++     irq:       IRQ,      \
++     flags:     FLAGS,    \
++     custom_divisor:SB_BAUD}
++#define SB_INFO  { \
++      magic: SERIAL_MAGIC, \
++      port:  PORT,0,FLAGS, \
++      state: &state,       \
++      tty:   (struct tty_struct *)&state, \
++      IER:   SB_IER,       \
++      MCR:   SB_MCR}
++extern void putDebugChar(int);
++/* RTAI support needs us to really stop/start interrupts */
++
++#define kgdb_sti() __asm__ __volatile__("sti": : :"memory")
++#define kgdb_cli() __asm__ __volatile__("cli": : :"memory")
++#define kgdb_local_save_flags(x) __asm__ __volatile__(\
++                                   "pushfl ; popl %0":"=g" (x): /* no input */)
++#define kgdb_local_irq_restore(x) __asm__ __volatile__(\
++                                   "pushl %0 ; popfl": \
++                                     /* no output */ :"g" (x):"memory", "cc")
++#define kgdb_local_irq_save(x) kgdb_local_save_flags(x); kgdb_cli()
++
++#ifdef CONFIG_SERIAL
++extern void shutdown_for_kgdb(struct async_struct *info);
++#endif
++#define INIT_KDEBUG putDebugChar("+");
++#endif				/* __KGDB_LOCAL */
+--- linux-2.6.0-test6/include/asm-i386/kmap_types.h	2003-06-14 12:18:28.000000000 -0700
++++ 25/include/asm-i386/kmap_types.h	2003-10-05 00:36:48.000000000 -0700
+@@ -3,30 +3,36 @@
+ 
+ #include <linux/config.h>
+ 
+-#ifdef CONFIG_DEBUG_HIGHMEM
+-# define D(n) __KM_FENCE_##n ,
+-#else
+-# define D(n)
+-#endif
+-
+ enum km_type {
+-D(0)	KM_BOUNCE_READ,
+-D(1)	KM_SKB_SUNRPC_DATA,
+-D(2)	KM_SKB_DATA_SOFTIRQ,
+-D(3)	KM_USER0,
+-D(4)	KM_USER1,
+-D(5)	KM_BIO_SRC_IRQ,
+-D(6)	KM_BIO_DST_IRQ,
+-D(7)	KM_PTE0,
+-D(8)	KM_PTE1,
+-D(9)	KM_PTE2,
+-D(10)	KM_IRQ0,
+-D(11)	KM_IRQ1,
+-D(12)	KM_SOFTIRQ0,
+-D(13)	KM_SOFTIRQ1,
+-D(14)	KM_TYPE_NR
+-};
+-
+-#undef D
++	/*
++	 * IMPORTANT: don't move these 3 entries, and only add entries in
++	 * pairs: the 4G/4G virtual stack must be 8K aligned on each cpu.
++	 */
++	KM_BOUNCE_READ,
++	KM_VSTACK1,
++	KM_VSTACK0,
+ 
++	KM_LDT_PAGE15,
++	KM_LDT_PAGE0 = KM_LDT_PAGE15 + 16-1,
++	KM_USER_COPY,
++	KM_VSTACK_HOLE,
++	KM_SKB_SUNRPC_DATA,
++	KM_SKB_DATA_SOFTIRQ,
++	KM_USER0,
++	KM_USER1,
++	KM_BIO_SRC_IRQ,
++	KM_BIO_DST_IRQ,
++	KM_PTE0,
++	KM_PTE1,
++	KM_PTE2,
++	KM_IRQ0,
++	KM_IRQ1,
++	KM_SOFTIRQ0,
++	KM_SOFTIRQ1,
++	/*
++	 * Add new entries in pairs:
++	 * the 4G/4G virtual stack must be 8K aligned on each cpu.
++	 */
++	KM_TYPE_NR
++};
+ #endif
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-i386/lockmeter.h	2003-10-05 00:36:40.000000000 -0700
+@@ -0,0 +1,127 @@
++/*
++ *  Copyright (C) 1999,2000 Silicon Graphics, Inc.
++ *
++ *  Written by John Hawkes (hawkes@sgi.com)
++ *  Based on klstat.h by Jack Steiner (steiner@sgi.com)
++ *
++ *  Modified by Ray Bryant (raybry@us.ibm.com)
++ *  Changes Copyright (C) 2000 IBM, Inc.
++ *  Added save of index in spinlock_t to improve efficiency
++ *  of "hold" time reporting for spinlocks.
++ *  Added support for hold time statistics for read and write
++ *  locks.
++ *  Moved machine dependent code here from include/lockmeter.h.
++ *
++ */
++
++#ifndef _I386_LOCKMETER_H
++#define _I386_LOCKMETER_H
++
++#include <asm/spinlock.h>
++#include <asm/rwlock.h>
++
++#include <linux/version.h>
++
++#ifdef __KERNEL__
++extern unsigned long cpu_khz;
++#define CPU_CYCLE_FREQUENCY	(cpu_khz * 1000)
++#else
++#define CPU_CYCLE_FREQUENCY	450000000
++#endif
++
++#define THIS_CPU_NUMBER		smp_processor_id()
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)
++#define local_irq_save(x) \
++    __asm__ __volatile__("pushfl ; popl %0 ; cli":"=g" (x): /* no input */ :"memory")
++
++#define local_irq_restore(x) \
++    __asm__ __volatile__("pushl %0 ; popfl": /* no output */ :"g" (x):"memory")
++#endif	/* Linux version 2.2.x */
++
++/*
++ * macros to cache and retrieve an index value inside of a spin lock
++ * these macros assume that there are less than 65536 simultaneous
++ * (read mode) holders of a rwlock.  Not normally a problem!!
++ * we also assume that the hash table has less than 65535 entries.
++ */
++/*
++ * instrumented spinlock structure -- never used to allocate storage
++ * only used in macros below to overlay a spinlock_t
++ */
++typedef struct inst_spinlock_s {
++	/* remember, Intel is little endian */
++	unsigned short lock;
++	unsigned short index;
++} inst_spinlock_t;
++#define PUT_INDEX(lock_ptr,indexv) ((inst_spinlock_t *)(lock_ptr))->index = indexv
++#define GET_INDEX(lock_ptr)        ((inst_spinlock_t *)(lock_ptr))->index
++
++/*
++ * macros to cache and retrieve an index value in a read/write lock
++ * as well as the cpu where a reader busy period started
++ * we use the 2nd word (the debug word) for this, so require the
++ * debug word to be present
++ */
++/*
++ * instrumented rwlock structure -- never used to allocate storage
++ * only used in macros below to overlay a rwlock_t
++ */
++typedef struct inst_rwlock_s {
++	volatile int lock;
++	unsigned short index;
++	unsigned short cpu;
++} inst_rwlock_t;
++#define PUT_RWINDEX(rwlock_ptr,indexv) ((inst_rwlock_t *)(rwlock_ptr))->index = indexv
++#define GET_RWINDEX(rwlock_ptr)        ((inst_rwlock_t *)(rwlock_ptr))->index
++#define PUT_RW_CPU(rwlock_ptr,cpuv)    ((inst_rwlock_t *)(rwlock_ptr))->cpu = cpuv
++#define GET_RW_CPU(rwlock_ptr)         ((inst_rwlock_t *)(rwlock_ptr))->cpu
++
++/*
++ * return the number of readers for a rwlock_t
++ */
++#define RWLOCK_READERS(rwlock_ptr)   rwlock_readers(rwlock_ptr)
++
++extern inline int rwlock_readers(rwlock_t *rwlock_ptr)
++{
++	int tmp = (int) rwlock_ptr->lock;
++	/* read and write lock attempts may cause the lock value to temporarily */
++	/* be negative.  Until it is >= 0 we know nothing (i. e. can't tell if  */
++	/* is -1 because it was write locked and somebody tried to read lock it */
++	/* or if it is -1 because it was read locked and somebody tried to write*/
++	/* lock it. ........................................................... */
++	do {
++		tmp = (int) rwlock_ptr->lock;
++	} while (tmp < 0);
++	if (tmp == 0) return(0);
++	else return(RW_LOCK_BIAS-tmp);
++}
++
++/*
++ * return true if rwlock is write locked
++ * (note that other lock attempts can cause the lock value to be negative)
++ */
++#define RWLOCK_IS_WRITE_LOCKED(rwlock_ptr) ((rwlock_ptr)->lock <= 0)
++#define IABS(x) ((x) > 0 ? (x) : -(x))
++#define RWLOCK_IS_READ_LOCKED(rwlock_ptr)  ((IABS((rwlock_ptr)->lock) % RW_LOCK_BIAS) != 0)
++
++/* this is a lot of typing just to get gcc to emit "rdtsc" */
++static inline long long get_cycles64 (void)
++{
++#ifndef CONFIG_X86_TSC
++	#error this code requires CONFIG_X86_TSC
++#else
++	union longlong_u {
++		long long intlong;
++		struct intint_s {
++			uint32_t eax;
++			uint32_t edx;
++		} intint;
++	} longlong;
++
++	rdtsc(longlong.intint.eax,longlong.intint.edx);
++	return longlong.intlong;
++#endif
++}
++
++#endif /* _I386_LOCKMETER_H */
+--- linux-2.6.0-test6/include/asm-i386/mach-default/irq_vectors.h	2003-06-14 12:18:04.000000000 -0700
++++ 25/include/asm-i386/mach-default/irq_vectors.h	2003-10-05 00:36:20.000000000 -0700
+@@ -76,11 +76,21 @@
+  * Since vectors 0x00-0x1f are used/reserved for the CPU,
+  * the usable vector space is 0x20-0xff (224 vectors)
+  */
++/*
++ * The maximum number of vectors supported by i386 processors
++ * is limited to 256. For processors other than i386, NR_VECTORS
++ * should be changed accordingly.
++ */
++#define NR_VECTORS 256
++#ifdef CONFIG_PCI_USE_VECTOR
++#define NR_IRQS FIRST_SYSTEM_VECTOR
++#else
+ #ifdef CONFIG_X86_IO_APIC
+ #define NR_IRQS 224
+ #else
+ #define NR_IRQS 16
+ #endif
++#endif
+ 
+ #define FPU_IRQ			13
+ 
+--- linux-2.6.0-test6/include/asm-i386/mman.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-i386/mman.h	2003-10-05 00:33:24.000000000 -0700
+@@ -8,8 +8,6 @@
+ #define PROT_NONE	0x0		/* page can not be accessed */
+ #define PROT_GROWSDOWN	0x01000000	/* mprotect flag: extend change to start of growsdown vma */
+ #define PROT_GROWSUP	0x02000000	/* mprotect flag: extend change to end of growsup vma */
+-#define PROT_GROWSDOWN	0x01000000	/* mprotect flag: extend change to start of growsdown vma */
+-#define PROT_GROWSUP	0x02000000	/* mprotect flag: extend change to end of growsup vma */
+ 
+ #define MAP_SHARED	0x01		/* Share changes */
+ #define MAP_PRIVATE	0x02		/* Changes are private */
+--- linux-2.6.0-test6/include/asm-i386/mmu_context.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/include/asm-i386/mmu_context.h	2003-10-05 00:36:48.000000000 -0700
+@@ -29,6 +29,10 @@ static inline void switch_mm(struct mm_s
+ {
+ 	int cpu = smp_processor_id();
+ 
++#ifdef CONFIG_X86_SWITCH_PAGETABLES
++	if (tsk->mm)
++		tsk->thread_info->user_pgd = (void *)__pa(tsk->mm->pgd);
++#endif
+ 	if (likely(prev != next)) {
+ 		/* stop flush ipis for the previous mm */
+ 		cpu_clear(cpu, prev->cpu_vm_mask);
+@@ -39,12 +43,14 @@ static inline void switch_mm(struct mm_s
+ 		cpu_set(cpu, next->cpu_vm_mask);
+ 
+ 		/* Re-load page tables */
++#if !defined(CONFIG_X86_SWITCH_PAGETABLES)
+ 		load_cr3(next->pgd);
++#endif
+ 
+ 		/*
+ 		 * load the LDT, if the LDT is different:
+ 		 */
+-		if (unlikely(prev->context.ldt != next->context.ldt))
++		if (unlikely(prev->context.size + next->context.size))
+ 			load_LDT_nolock(&next->context, cpu);
+ 	}
+ #ifdef CONFIG_SMP
+@@ -56,7 +62,9 @@ static inline void switch_mm(struct mm_s
+ 			/* We were in lazy tlb mode and leave_mm disabled 
+ 			 * tlb flush IPI delivery. We must reload %cr3.
+ 			 */
++#if !defined(CONFIG_X86_SWITCH_PAGETABLES)
+ 			load_cr3(next->pgd);
++#endif
+ 			load_LDT_nolock(&next->context, cpu);
+ 		}
+ 	}
+@@ -67,6 +75,6 @@ static inline void switch_mm(struct mm_s
+ 	asm("movl %0,%%fs ; movl %0,%%gs": :"r" (0))
+ 
+ #define activate_mm(prev, next) \
+-	switch_mm((prev),(next),NULL)
++	switch_mm((prev),(next),current)
+ 
+ #endif
+--- linux-2.6.0-test6/include/asm-i386/mmu.h	2003-06-14 12:18:24.000000000 -0700
++++ 25/include/asm-i386/mmu.h	2003-10-05 00:36:48.000000000 -0700
+@@ -8,10 +8,13 @@
+  *
+  * cpu_vm_mask is used to optimize ldt flushing.
+  */
++
++#define MAX_LDT_PAGES 16
++
+ typedef struct { 
+ 	int size;
+ 	struct semaphore sem;
+-	void *ldt;
++	struct page *ldt_pages[MAX_LDT_PAGES];
+ } mm_context_t;
+ 
+ #endif
+--- linux-2.6.0-test6/include/asm-i386/numaq.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-i386/numaq.h	2003-10-05 00:34:38.000000000 -0700
+@@ -28,7 +28,6 @@
+ 
+ #ifdef CONFIG_X86_NUMAQ
+ 
+-#define MAX_NUMNODES		16
+ extern int get_memcfg_numaq(void);
+ 
+ /*
+--- linux-2.6.0-test6/include/asm-i386/numnodes.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-i386/numnodes.h	2003-10-05 00:34:38.000000000 -0700
+@@ -4,11 +4,15 @@
+ #include <linux/config.h>
+ 
+ #ifdef CONFIG_X86_NUMAQ
+-#include <asm/numaq.h>
+-#elif CONFIG_ACPI_SRAT
+-#include <asm/srat.h>
+-#else
+-#define MAX_NUMNODES	1
++
++/* Max 16 Nodes */
++#define NODES_SHIFT	4
++
++#elif defined(CONFIG_ACPI_SRAT)
++
++/* Max 8 Nodes */
++#define NODES_SHIFT	3
++
+ #endif /* CONFIG_X86_NUMAQ */
+ 
+ #endif /* _ASM_MAX_NUMNODES_H */
+--- linux-2.6.0-test6/include/asm-i386/page.h	2003-06-26 22:07:25.000000000 -0700
++++ 25/include/asm-i386/page.h	2003-10-05 00:36:48.000000000 -0700
+@@ -1,6 +1,8 @@
+ #ifndef _I386_PAGE_H
+ #define _I386_PAGE_H
+ 
++#include <linux/config.h>
++
+ /* PAGE_SHIFT determines the page size */
+ #define PAGE_SHIFT	12
+ #define PAGE_SIZE	(1UL << PAGE_SHIFT)
+@@ -9,11 +11,10 @@
+ #define LARGE_PAGE_MASK (~(LARGE_PAGE_SIZE-1))
+ #define LARGE_PAGE_SIZE (1UL << PMD_SHIFT)
+ 
+-#ifdef __KERNEL__
+-#ifndef __ASSEMBLY__
+-
+ #include <linux/config.h>
+ 
++#ifdef __KERNEL__
++#ifndef __ASSEMBLY__
+ #ifdef CONFIG_X86_USE_3DNOW
+ 
+ #include <asm/mmx.h>
+@@ -88,8 +89,19 @@ typedef struct { unsigned long pgprot; }
+  *
+  * If you want more physical memory than this then see the CONFIG_HIGHMEM4G
+  * and CONFIG_HIGHMEM64G options in the kernel configuration.
++ *
++ * Note: on PAE the kernel must never go below 32 MB, we use the
++ * first 8 entries of the 2-level boot pgd for PAE magic.
+  */
+ 
++#ifdef CONFIG_X86_4G_VM_LAYOUT
++#define __PAGE_OFFSET		(0x02000000)
++#define TASK_SIZE		(0xff000000)
++#else
++#define __PAGE_OFFSET		(0xc0000000)
++#define TASK_SIZE		(0xc0000000)
++#endif
++
+ /*
+  * This much address space is reserved for vmalloc() and iomap()
+  * as well as fixmap mappings.
+@@ -114,16 +126,10 @@ static __inline__ int get_order(unsigned
+ 
+ #endif /* __ASSEMBLY__ */
+ 
+-#ifdef __ASSEMBLY__
+-#define __PAGE_OFFSET		(0xC0000000)
+-#else
+-#define __PAGE_OFFSET		(0xC0000000UL)
+-#endif
+-
+-
+ #define PAGE_OFFSET		((unsigned long)__PAGE_OFFSET)
+ #define VMALLOC_RESERVE		((unsigned long)__VMALLOC_RESERVE)
+-#define MAXMEM			(-__PAGE_OFFSET-__VMALLOC_RESERVE)
++#define __MAXMEM		(-__PAGE_OFFSET-__VMALLOC_RESERVE)
++#define MAXMEM			((unsigned long)(-PAGE_OFFSET-VMALLOC_RESERVE))
+ #define __pa(x)			((unsigned long)(x)-PAGE_OFFSET)
+ #define __va(x)			((void *)((unsigned long)(x)+PAGE_OFFSET))
+ #define pfn_to_kaddr(pfn)      __va((pfn) << PAGE_SHIFT)
+--- linux-2.6.0-test6/include/asm-i386/pgtable.h	2003-08-08 22:55:13.000000000 -0700
++++ 25/include/asm-i386/pgtable.h	2003-10-05 00:36:48.000000000 -0700
+@@ -32,16 +32,17 @@
+ #define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
+ extern unsigned long empty_zero_page[1024];
+ extern pgd_t swapper_pg_dir[1024];
+-extern kmem_cache_t *pgd_cache;
+-extern kmem_cache_t *pmd_cache;
++extern kmem_cache_t *pgd_cache, *pmd_cache, *kpmd_cache;
+ extern spinlock_t pgd_lock;
+ extern struct list_head pgd_list;
+ 
+ void pmd_ctor(void *, kmem_cache_t *, unsigned long);
++void kpmd_ctor(void *, kmem_cache_t *, unsigned long);
+ void pgd_ctor(void *, kmem_cache_t *, unsigned long);
+ void pgd_dtor(void *, kmem_cache_t *, unsigned long);
+ void pgtable_cache_init(void);
+ void paging_init(void);
++void setup_identity_mappings(pgd_t *pgd_base, unsigned long start, unsigned long end);
+ 
+ #endif /* !__ASSEMBLY__ */
+ 
+@@ -51,6 +52,11 @@ void paging_init(void);
+  * newer 3-level PAE-mode page tables.
+  */
+ #ifndef __ASSEMBLY__
++
++extern void set_system_gate(unsigned int n, void *addr);
++extern void init_entry_mappings(void);
++extern void entry_trampoline_setup(void);
++
+ #ifdef CONFIG_X86_PAE
+ # include <asm/pgtable-3level.h>
+ #else
+@@ -63,7 +69,12 @@ void paging_init(void);
+ #define PGDIR_SIZE	(1UL << PGDIR_SHIFT)
+ #define PGDIR_MASK	(~(PGDIR_SIZE-1))
+ 
+-#define USER_PTRS_PER_PGD	(TASK_SIZE/PGDIR_SIZE)
++#if defined(CONFIG_X86_PAE) && defined(CONFIG_X86_4G_VM_LAYOUT)
++# define USER_PTRS_PER_PGD	4
++#else
++# define USER_PTRS_PER_PGD	((TASK_SIZE/PGDIR_SIZE) + ((TASK_SIZE % PGDIR_SIZE) + PGDIR_SIZE-1)/PGDIR_SIZE)
++#endif
++
+ #define FIRST_USER_PGD_NR	0
+ 
+ #define USER_PGD_PTRS (PAGE_OFFSET >> PGDIR_SHIFT)
+@@ -85,7 +96,6 @@ void paging_init(void);
+ #define VMALLOC_OFFSET	(8*1024*1024)
+ #define VMALLOC_START	(((unsigned long) high_memory + 2*VMALLOC_OFFSET-1) & \
+ 						~(VMALLOC_OFFSET-1))
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ #ifdef CONFIG_HIGHMEM
+ # define VMALLOC_END	(PKMAP_BASE-2*PAGE_SIZE)
+ #else
+@@ -234,6 +244,7 @@ static inline void ptep_mkdirty(pte_t *p
+ 
+ #define mk_pte(page, pgprot)	pfn_pte(page_to_pfn(page), (pgprot))
+ #define mk_pte_huge(entry) ((entry).pte_low |= _PAGE_PRESENT | _PAGE_PSE)
++#define mk_pte_phys(physpage, pgprot) pfn_pte((physpage) >> PAGE_SHIFT, pgprot)
+ 
+ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
+ {
+--- linux-2.6.0-test6/include/asm-i386/processor.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-i386/processor.h	2003-10-05 00:36:49.000000000 -0700
+@@ -291,11 +291,6 @@ extern unsigned int machine_submodel_id;
+ extern unsigned int BIOS_revision;
+ extern unsigned int mca_pentium_flag;
+ 
+-/*
+- * User space process size: 3GB (default).
+- */
+-#define TASK_SIZE	(PAGE_OFFSET)
+-
+ /* This decides where the kernel will search for a free chunk of vm
+  * space during mmap's.
+  */
+@@ -406,6 +401,7 @@ struct tss_struct {
+ struct thread_struct {
+ /* cached TLS descriptors. */
+ 	struct desc_struct tls_array[GDT_ENTRY_TLS_ENTRIES];
++	void *stack_page0, *stack_page1;
+ 	unsigned long	esp0;
+ 	unsigned long	eip;
+ 	unsigned long	esp;
+@@ -491,6 +487,13 @@ extern void prepare_to_copy(struct task_
+  */
+ extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
+ 
++#ifdef CONFIG_X86_HIGH_ENTRY
++#define virtual_esp0(tsk) \
++	((unsigned long)(tsk)->thread_info->virtual_stack + ((tsk)->thread.esp0 - (unsigned long)(tsk)->thread_info->real_stack))
++#else
++# define virtual_esp0(tsk) ((tsk)->thread.esp0)
++#endif
++
+ extern unsigned long thread_saved_pc(struct task_struct *tsk);
+ void show_trace(struct task_struct *task, unsigned long *stack);
+ 
+@@ -585,12 +588,12 @@ static inline void rep_nop(void)
+ 
+ /* Prefetch instructions for Pentium III and AMD Athlon */
+ /* It's not worth to care about 3dnow! prefetches for the K6
+-   because they are microcoded there and very slow. */
++   because they are microcoded there and very slow.
++   However we don't do prefetches for pre XP Athlons currently
++   That should be fixed. */
+ #define ARCH_HAS_PREFETCH
+ extern inline void prefetch(const void *x)
+ {
+-	if (cpu_data[0].x86_vendor == X86_VENDOR_AMD)
+-		return;		/* Some athlons fault if the address is bad */
+ 	alternative_input(ASM_NOP4,
+ 			  "prefetchnta (%1)",
+ 			  X86_FEATURE_XMM,
+--- linux-2.6.0-test6/include/asm-i386/rwlock.h	2003-06-26 22:07:25.000000000 -0700
++++ 25/include/asm-i386/rwlock.h	2003-10-05 00:34:17.000000000 -0700
+@@ -20,28 +20,52 @@
+ #define RW_LOCK_BIAS		 0x01000000
+ #define RW_LOCK_BIAS_STR	"0x01000000"
+ 
+-#define __build_read_lock_ptr(rw, helper)   \
+-	asm volatile(LOCK "subl $1,(%0)\n\t" \
+-		     "js 2f\n" \
+-		     "1:\n" \
+-		     LOCK_SECTION_START("") \
+-		     "2:\tcall " helper "\n\t" \
+-		     "jmp 1b\n" \
+-		     LOCK_SECTION_END \
+-		     ::"a" (rw) : "memory")
+-
+-#define __build_read_lock_const(rw, helper)   \
+-	asm volatile(LOCK "subl $1,%0\n\t" \
+-		     "js 2f\n" \
+-		     "1:\n" \
+-		     LOCK_SECTION_START("") \
+-		     "2:\tpushl %%eax\n\t" \
+-		     "leal %0,%%eax\n\t" \
+-		     "call " helper "\n\t" \
+-		     "popl %%eax\n\t" \
+-		     "jmp 1b\n" \
+-		     LOCK_SECTION_END \
+-		     :"=m" (*(volatile int *)rw) : : "memory")
++#ifdef CONFIG_SPINLINE
++
++	#define __build_read_lock_ptr(rw, helper)   \
++		asm volatile(LOCK "subl $1,(%0)\n\t" \
++			     "jns 1f\n\t" \
++			     "call " helper "\n\t" \
++			     "1:\t" \
++			     ::"a" (rw) : "memory")
++
++	#define __build_read_lock_const(rw, helper)   \
++		asm volatile(LOCK "subl $1,%0\n\t" \
++			     "jns 1f\n\t" \
++			     "pushl %%eax\n\t" \
++			     "leal %0,%%eax\n\t" \
++			     "call " helper "\n\t" \
++			     "popl %%eax\n\t" \
++			     "1:\t" \
++			     :"=m" (*(volatile int *)rw) : : "memory")
++
++#else /* !CONFIG_SPINLINE */
++
++	#define __build_read_lock_ptr(rw, helper)   \
++		asm volatile(LOCK "subl $1,(%0)\n\t" \
++			     "js 2f\n" \
++			     "1:\n" \
++			     LOCK_SECTION_START("") \
++			     "2:\tcall " helper "\n\t" \
++			     "jmp 1b\n" \
++			     LOCK_SECTION_END \
++			     ::"a" (rw) : "memory")
++
++	#define __build_read_lock_const(rw, helper)   \
++		asm volatile(LOCK "subl $1,%0\n\t" \
++			     "js 2f\n" \
++			     "1:\n" \
++			     LOCK_SECTION_START("") \
++			     "2:\tpushl %%eax\n\t" \
++			     "leal %0,%%eax\n\t" \
++			     "call " helper "\n\t" \
++			     "popl %%eax\n\t" \
++			     "jmp 1b\n" \
++			     LOCK_SECTION_END \
++			     :"=m" (*(volatile int *)rw) : : "memory")
++
++#endif /* CONFIG_SPINLINE */
++
+ 
+ #define __build_read_lock(rw, helper)	do { \
+ 						if (__builtin_constant_p(rw)) \
+@@ -50,28 +74,51 @@
+ 							__build_read_lock_ptr(rw, helper); \
+ 					} while (0)
+ 
+-#define __build_write_lock_ptr(rw, helper) \
+-	asm volatile(LOCK "subl $" RW_LOCK_BIAS_STR ",(%0)\n\t" \
+-		     "jnz 2f\n" \
+-		     "1:\n" \
+-		     LOCK_SECTION_START("") \
+-		     "2:\tcall " helper "\n\t" \
+-		     "jmp 1b\n" \
+-		     LOCK_SECTION_END \
+-		     ::"a" (rw) : "memory")
+-
+-#define __build_write_lock_const(rw, helper) \
+-	asm volatile(LOCK "subl $" RW_LOCK_BIAS_STR ",%0\n\t" \
+-		     "jnz 2f\n" \
+-		     "1:\n" \
+-		     LOCK_SECTION_START("") \
+-		     "2:\tpushl %%eax\n\t" \
+-		     "leal %0,%%eax\n\t" \
+-		     "call " helper "\n\t" \
+-		     "popl %%eax\n\t" \
+-		     "jmp 1b\n" \
+-		     LOCK_SECTION_END \
+-		     :"=m" (*(volatile int *)rw) : : "memory")
++#ifdef CONFIG_SPINLINE
++
++	#define __build_write_lock_ptr(rw, helper) \
++		asm volatile(LOCK "subl $" RW_LOCK_BIAS_STR ",(%0)\n\t" \
++			     "jz 1f\n\t" \
++			     "call " helper "\n\t" \
++			     "1:\n" \
++			     ::"a" (rw) : "memory")
++
++	#define __build_write_lock_const(rw, helper) \
++		asm volatile(LOCK "subl $" RW_LOCK_BIAS_STR ",%0\n\t" \
++			     "jz 1f\n\t" \
++			     "pushl %%eax\n\t" \
++			     "leal %0,%%eax\n\t" \
++			     "call " helper "\n\t" \
++			     "popl %%eax\n\t" \
++			     "1:\n" \
++			     :"=m" (*(volatile int *)rw) : : "memory")
++
++#else /* !CONFIG_SPINLINE */
++
++	#define __build_write_lock_ptr(rw, helper) \
++		asm volatile(LOCK "subl $" RW_LOCK_BIAS_STR ",(%0)\n\t" \
++			     "jnz 2f\n" \
++			     "1:\n" \
++			     LOCK_SECTION_START("") \
++			     "2:\tcall " helper "\n\t" \
++			     "jmp 1b\n" \
++			     LOCK_SECTION_END \
++			     ::"a" (rw) : "memory")
++
++	#define __build_write_lock_const(rw, helper) \
++		asm volatile(LOCK "subl $" RW_LOCK_BIAS_STR ",%0\n\t" \
++			     "jnz 2f\n" \
++			     "1:\n" \
++			     LOCK_SECTION_START("") \
++			     "2:\tpushl %%eax\n\t" \
++			     "leal %0,%%eax\n\t" \
++			     "call " helper "\n\t" \
++			     "popl %%eax\n\t" \
++			     "jmp 1b\n" \
++			     LOCK_SECTION_END \
++			     :"=m" (*(volatile int *)rw) : : "memory")
++
++#endif /* CONFIG_SPINLINE */
+ 
+ #define __build_write_lock(rw, helper)	do { \
+ 						if (__builtin_constant_p(rw)) \
+--- linux-2.6.0-test6/include/asm-i386/setup.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-i386/setup.h	2003-10-05 00:36:22.000000000 -0700
+@@ -29,6 +29,11 @@
+ #define IST_INFO   (*(struct ist_info *) (PARAM+0x60))
+ #define DRIVE_INFO (*(struct drive_info_struct *) (PARAM+0x80))
+ #define SYS_DESC_TABLE (*(struct sys_desc_table_struct*)(PARAM+0xa0))
++#define EFI_SYSTAB ((efi_system_table_t *) *((unsigned long *)(PARAM+0x1c4)))
++#define EFI_MEMDESC_SIZE (*((unsigned long *) (PARAM+0x1c8)))
++#define EFI_MEMDESC_VERSION (*((unsigned long *) (PARAM+0x1cc)))
++#define EFI_MEMMAP ((efi_memory_desc_t *) *((unsigned long *)(PARAM+0x1d0)))
++#define EFI_MEMMAP_SIZE (*((unsigned long *) (PARAM+0x1d4)))
+ #define MOUNT_ROOT_RDONLY (*(unsigned short *) (PARAM+0x1F2))
+ #define RAMDISK_FLAGS (*(unsigned short *) (PARAM+0x1F8))
+ #define VIDEO_MODE (*(unsigned short *) (PARAM+0x1FA))
+--- linux-2.6.0-test6/include/asm-i386/spinlock.h	2003-06-26 22:07:25.000000000 -0700
++++ 25/include/asm-i386/spinlock.h	2003-10-05 00:36:40.000000000 -0700
+@@ -43,18 +43,35 @@ typedef struct {
+ #define spin_is_locked(x)	(*(volatile signed char *)(&(x)->lock) <= 0)
+ #define spin_unlock_wait(x)	do { barrier(); } while(spin_is_locked(x))
+ 
+-#define spin_lock_string \
+-	"\n1:\t" \
+-	"lock ; decb %0\n\t" \
+-	"js 2f\n" \
+-	LOCK_SECTION_START("") \
+-	"2:\t" \
+-	"rep;nop\n\t" \
+-	"cmpb $0,%0\n\t" \
+-	"jle 2b\n\t" \
+-	"jmp 1b\n" \
+-	LOCK_SECTION_END
++#ifdef CONFIG_SPINLINE
+ 
++	#define spin_lock_string \
++		"\n1:\t" \
++		"lock ; decb %0\n\t" \
++		"js 2f\n" \
++		"jmp 3f\n" \
++		"2:\t" \
++		"rep;nop\n\t" \
++		"cmpb $0,%0\n\t" \
++		"jle 2b\n\t" \
++		"jmp 1b\n" \
++		"3:\t"
++
++#else /* !CONFIG_SPINLINE */
++
++	#define spin_lock_string \
++		"\n1:\t" \
++		"lock ; decb %0\n\t" \
++		"js 2f\n" \
++		LOCK_SECTION_START("") \
++		"2:\t" \
++		"rep;nop\n\t" \
++		"cmpb $0,%0\n\t" \
++		"jle 2b\n\t" \
++		"jmp 1b\n" \
++		LOCK_SECTION_END
++
++#endif /* CONFIG_SPINLINE */
+ /*
+  * This works. Despite all the confusion.
+  * (except on PPro SMP or if we are using OOSTORE)
+@@ -138,6 +155,11 @@ here:
+  */
+ typedef struct {
+ 	volatile unsigned int lock;
++#ifdef CONFIG_LOCKMETER
++	/* required for LOCKMETER since all bits in lock are used */
++	/* and we need this storage for CPU and lock INDEX        */
++	unsigned lockmeter_magic;
++#endif
+ #ifdef CONFIG_DEBUG_SPINLOCK
+ 	unsigned magic;
+ #endif
+@@ -145,11 +167,19 @@ typedef struct {
+ 
+ #define RWLOCK_MAGIC	0xdeaf1eed
+ 
++#ifdef CONFIG_LOCKMETER
++#ifdef CONFIG_DEBUG_SPINLOCK
++#define RWLOCK_MAGIC_INIT	, 0, RWLOCK_MAGIC
++#else
++#define RWLOCK_MAGIC_INIT	, 0
++#endif
++#else /* !CONFIG_LOCKMETER */
+ #ifdef CONFIG_DEBUG_SPINLOCK
+ #define RWLOCK_MAGIC_INIT	, RWLOCK_MAGIC
+ #else
+ #define RWLOCK_MAGIC_INIT	/* */
+ #endif
++#endif /* !CONFIG_LOCKMETER */
+ 
+ #define RW_LOCK_UNLOCKED (rwlock_t) { RW_LOCK_BIAS RWLOCK_MAGIC_INIT }
+ 
+@@ -196,4 +226,58 @@ static inline int _raw_write_trylock(rwl
+ 	return 0;
+ }
+ 
++#ifdef CONFIG_LOCKMETER
++static inline int _raw_read_trylock(rwlock_t *lock)
++{
++/* FIXME -- replace with assembler */
++	atomic_t *count = (atomic_t *)lock;
++	atomic_dec(count);
++	if (count->counter > 0)
++		return 1;
++	atomic_inc(count);
++	return 0;
++}
++#endif
++
++#if defined(CONFIG_LOCKMETER) && defined(CONFIG_HAVE_DEC_LOCK)
++extern void _metered_spin_lock  (spinlock_t *lock);
++extern void _metered_spin_unlock(spinlock_t *lock);
++
++/*
++ *  Matches what is in arch/i386/lib/dec_and_lock.c, except this one is
++ *  "static inline" so that the spin_lock(), if actually invoked, is charged
++ *  against the real caller, not against the catch-all atomic_dec_and_lock
++ */
++static inline int atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock)
++{
++	int counter;
++	int newcount;
++
++repeat:
++	counter = atomic_read(atomic);
++	newcount = counter-1;
++
++	if (!newcount)
++		goto slow_path;
++
++	asm volatile("lock; cmpxchgl %1,%2"
++		:"=a" (newcount)
++		:"r" (newcount), "m" (atomic->counter), "0" (counter));
++
++	/* If the above failed, "eax" will have changed */
++	if (newcount != counter)
++		goto repeat;
++	return 0;
++
++slow_path:
++	_metered_spin_lock(lock);
++	if (atomic_dec_and_test(atomic))
++		return 1;
++	_metered_spin_unlock(lock);
++	return 0;
++}
++
++#define ATOMIC_DEC_AND_LOCK
++#endif
++
+ #endif /* __ASM_SPINLOCK_H */
+--- linux-2.6.0-test6/include/asm-i386/srat.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-i386/srat.h	2003-10-05 00:34:38.000000000 -0700
+@@ -31,7 +31,6 @@
+ #error CONFIG_ACPI_SRAT not defined, and srat.h header has been included
+ #endif
+ 
+-#define MAX_NUMNODES		8
+ extern int get_memcfg_from_srat(void);
+ extern unsigned long *get_zholes_size(int);
+ 
+--- linux-2.6.0-test6/include/asm-i386/string.h	2003-06-14 12:18:51.000000000 -0700
++++ 25/include/asm-i386/string.h	2003-10-05 00:36:48.000000000 -0700
+@@ -56,6 +56,29 @@ __asm__ __volatile__(
+ return dest;
+ }
+ 
++/*
++ * This is a more generic variant of strncpy_count() suitable for
++ * implementing string-access routines with all sorts of return
++ * code semantics. It's used by mm/usercopy.c.
++ */
++static inline size_t strncpy_count(char * dest,const char *src,size_t count)
++{
++	__asm__ __volatile__(
++
++	"1:\tdecl %0\n\t"
++	"js 2f\n\t"
++	"lodsb\n\t"
++	"stosb\n\t"
++	"testb %%al,%%al\n\t"
++	"jne 1b\n\t"
++	"2:"
++	"incl %0"
++	: "=c" (count)
++	:"S" (src),"D" (dest),"0" (count) : "memory");
++
++	return count;
++}
++
+ #define __HAVE_ARCH_STRCAT
+ static inline char * strcat(char * dest,const char * src)
+ {
+--- linux-2.6.0-test6/include/asm-i386/thread_info.h	2003-07-27 12:14:40.000000000 -0700
++++ 25/include/asm-i386/thread_info.h	2003-10-05 00:36:48.000000000 -0700
+@@ -33,23 +33,12 @@ struct thread_info {
+ 					 	   0-0xBFFFFFFF for user-thead
+ 						   0-0xFFFFFFFF for kernel-thread
+ 						*/
+-	struct restart_block    restart_block;
++	void *real_stack, *virtual_stack, *user_pgd;
+ 
++	struct restart_block    restart_block;
+ 	__u8			supervisor_stack[0];
+ };
+ 
+-#else /* !__ASSEMBLY__ */
+-
+-/* offsets into the thread_info struct for assembly code access */
+-#define TI_TASK		0x00000000
+-#define TI_EXEC_DOMAIN	0x00000004
+-#define TI_FLAGS	0x00000008
+-#define TI_STATUS	0x0000000C
+-#define TI_CPU		0x00000010
+-#define TI_PRE_COUNT	0x00000014
+-#define TI_ADDR_LIMIT	0x00000018
+-#define TI_RESTART_BLOCK 0x000001C
+-
+ #endif
+ 
+ #define PREEMPT_ACTIVE		0x4000000
+@@ -61,7 +50,7 @@ struct thread_info {
+  */
+ #ifndef __ASSEMBLY__
+ 
+-#define INIT_THREAD_INFO(tsk)			\
++#define INIT_THREAD_INFO(tsk, thread_info)	\
+ {						\
+ 	.task		= &tsk,			\
+ 	.exec_domain	= &default_exec_domain,	\
+@@ -72,6 +61,7 @@ struct thread_info {
+ 	.restart_block = {			\
+ 		.fn = do_no_restart_syscall,	\
+ 	},					\
++	.real_stack	= &thread_info,		\
+ }
+ 
+ #define init_thread_info	(init_thread_union.thread_info)
+@@ -113,6 +103,7 @@ static inline struct thread_info *curren
+ #define TIF_NEED_RESCHED	3	/* rescheduling necessary */
+ #define TIF_SINGLESTEP		4	/* restore singlestep on return to user mode */
+ #define TIF_IRET		5	/* return with iret */
++#define TIF_DB7			6	/* has debug registers */
+ #define TIF_POLLING_NRFLAG	16	/* true if poll_idle() is polling TIF_NEED_RESCHED */
+ 
+ #define _TIF_SYSCALL_TRACE	(1<<TIF_SYSCALL_TRACE)
+@@ -121,6 +112,7 @@ static inline struct thread_info *curren
+ #define _TIF_NEED_RESCHED	(1<<TIF_NEED_RESCHED)
+ #define _TIF_SINGLESTEP		(1<<TIF_SINGLESTEP)
+ #define _TIF_IRET		(1<<TIF_IRET)
++#define _TIF_DB7		(1<<TIF_DB7)
+ #define _TIF_POLLING_NRFLAG	(1<<TIF_POLLING_NRFLAG)
+ 
+ #define _TIF_WORK_MASK		0x0000FFFE	/* work to do on interrupt/exception return */
+--- linux-2.6.0-test6/include/asm-i386/tlbflush.h	2003-06-14 12:18:35.000000000 -0700
++++ 25/include/asm-i386/tlbflush.h	2003-10-05 00:36:48.000000000 -0700
+@@ -85,22 +85,28 @@ extern unsigned long pgkern_mask;
+ 
+ static inline void flush_tlb_mm(struct mm_struct *mm)
+ {
++#ifndef CONFIG_X86_SWITCH_PAGETABLES
+ 	if (mm == current->active_mm)
+ 		__flush_tlb();
++#endif
+ }
+ 
+ static inline void flush_tlb_page(struct vm_area_struct *vma,
+ 	unsigned long addr)
+ {
++#ifndef CONFIG_X86_SWITCH_PAGETABLES
+ 	if (vma->vm_mm == current->active_mm)
+ 		__flush_tlb_one(addr);
++#endif
+ }
+ 
+ static inline void flush_tlb_range(struct vm_area_struct *vma,
+ 	unsigned long start, unsigned long end)
+ {
++#ifndef CONFIG_X86_SWITCH_PAGETABLES
+ 	if (vma->vm_mm == current->active_mm)
+ 		__flush_tlb();
++#endif
+ }
+ 
+ #else
+@@ -111,11 +117,10 @@ static inline void flush_tlb_range(struc
+ 	__flush_tlb()
+ 
+ extern void flush_tlb_all(void);
+-extern void flush_tlb_current_task(void);
+ extern void flush_tlb_mm(struct mm_struct *);
+ extern void flush_tlb_page(struct vm_area_struct *, unsigned long);
+ 
+-#define flush_tlb()	flush_tlb_current_task()
++#define flush_tlb()	flush_tlb_all()
+ 
+ static inline void flush_tlb_range(struct vm_area_struct * vma, unsigned long start, unsigned long end)
+ {
+--- linux-2.6.0-test6/include/asm-i386/uaccess.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-i386/uaccess.h	2003-10-05 00:36:48.000000000 -0700
+@@ -26,7 +26,7 @@
+ 
+ 
+ #define KERNEL_DS	MAKE_MM_SEG(0xFFFFFFFFUL)
+-#define USER_DS		MAKE_MM_SEG(PAGE_OFFSET)
++#define USER_DS		MAKE_MM_SEG(TASK_SIZE)
+ 
+ #define get_ds()	(KERNEL_DS)
+ #define get_fs()	(current_thread_info()->addr_limit)
+@@ -149,6 +149,45 @@ extern void __get_user_4(void);
+ 		:"=a" (ret),"=d" (x) \
+ 		:"0" (ptr))
+ 
++extern int get_user_size(unsigned int size, void *val, const void *ptr);
++extern int put_user_size(unsigned int size, const void *val, void *ptr);
++extern int zero_user_size(unsigned int size, void *ptr);
++extern int copy_str_fromuser_size(unsigned int size, void *val, const void *ptr);
++extern int strlen_fromuser_size(unsigned int size, const void *ptr);
++
++
++# define indirect_get_user(x,ptr)					\
++({	int __ret_gu,__val_gu;						\
++	__typeof__(ptr) __ptr_gu = (ptr);				\
++	__ret_gu = get_user_size(sizeof(*__ptr_gu), &__val_gu,__ptr_gu) ? -EFAULT : 0;\
++	(x) = (__typeof__(*__ptr_gu))__val_gu;				\
++	__ret_gu;							\
++})
++#define indirect_put_user(x,ptr)					\
++({									\
++	__typeof__(*(ptr)) *__ptr_pu = (ptr), __x_pu = (x);		\
++	put_user_size(sizeof(*__ptr_pu), &__x_pu, __ptr_pu) ? -EFAULT : 0; \
++})
++#define __indirect_put_user indirect_put_user
++#define __indirect_get_user indirect_get_user
++
++#define indirect_copy_from_user(to,from,n) get_user_size(n,to,from)
++#define indirect_copy_to_user(to,from,n) put_user_size(n,from,to)
++
++#define __indirect_copy_from_user indirect_copy_from_user
++#define __indirect_copy_to_user indirect_copy_to_user
++
++#define indirect_strncpy_from_user(dst, src, count) \
++		copy_str_fromuser_size(count, dst, src)
++
++extern int strlen_fromuser_size(unsigned int size, const void *ptr);
++#define indirect_strnlen_user(str, n) strlen_fromuser_size(n, str)
++#define indirect_strlen_user(str) indirect_strnlen_user(str, ~0UL >> 1)
++
++extern int zero_user_size(unsigned int size, void *ptr);
++
++#define indirect_clear_user(mem, len) zero_user_size(len, mem)
++#define __indirect_clear_user clear_user
+ 
+ /* Careful: we have to cast the result to the type of the pointer for sign reasons */
+ /**
+@@ -168,7 +207,7 @@ extern void __get_user_4(void);
+  * Returns zero on success, or -EFAULT on error.
+  * On error, the variable @x is set to zero.
+  */
+-#define get_user(x,ptr)							\
++#define direct_get_user(x,ptr)						\
+ ({	int __ret_gu,__val_gu;						\
+ 	switch(sizeof (*(ptr))) {					\
+ 	case 1:  __get_user_x(1,__ret_gu,__val_gu,ptr); break;		\
+@@ -198,7 +237,7 @@ extern void __put_user_bad(void);
+  *
+  * Returns zero on success, or -EFAULT on error.
+  */
+-#define put_user(x,ptr)							\
++#define direct_put_user(x,ptr)						\
+   __put_user_check((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr)))
+ 
+ 
+@@ -222,7 +261,7 @@ extern void __put_user_bad(void);
+  * Returns zero on success, or -EFAULT on error.
+  * On error, the variable @x is set to zero.
+  */
+-#define __get_user(x,ptr) \
++#define __direct_get_user(x,ptr) \
+   __get_user_nocheck((x),(ptr),sizeof(*(ptr)))
+ 
+ 
+@@ -245,7 +284,7 @@ extern void __put_user_bad(void);
+  *
+  * Returns zero on success, or -EFAULT on error.
+  */
+-#define __put_user(x,ptr) \
++#define __direct_put_user(x,ptr) \
+   __put_user_nocheck((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr)))
+ 
+ #define __put_user_nocheck(x,ptr,size)				\
+@@ -396,7 +435,7 @@ unsigned long __copy_from_user_ll(void *
+  * On success, this will be zero.
+  */
+ static inline unsigned long
+-__copy_to_user(void __user *to, const void *from, unsigned long n)
++__direct_copy_to_user(void __user *to, const void *from, unsigned long n)
+ {
+ 	if (__builtin_constant_p(n)) {
+ 		unsigned long ret;
+@@ -434,7 +473,7 @@ __copy_to_user(void __user *to, const vo
+  * data to the requested size using zero bytes.
+  */
+ static inline unsigned long
+-__copy_from_user(void *to, const void __user *from, unsigned long n)
++__direct_copy_from_user(void *to, const void __user *from, unsigned long n)
+ {
+ 	if (__builtin_constant_p(n)) {
+ 		unsigned long ret;
+@@ -468,11 +507,11 @@ __copy_from_user(void *to, const void __
+  * On success, this will be zero.
+  */
+ static inline unsigned long
+-copy_to_user(void __user *to, const void *from, unsigned long n)
++direct_copy_to_user(void __user *to, const void *from, unsigned long n)
+ {
+ 	might_sleep();
+ 	if (access_ok(VERIFY_WRITE, to, n))
+-		n = __copy_to_user(to, from, n);
++		n = __direct_copy_to_user(to, from, n);
+ 	return n;
+ }
+ 
+@@ -493,11 +532,11 @@ copy_to_user(void __user *to, const void
+  * data to the requested size using zero bytes.
+  */
+ static inline unsigned long
+-copy_from_user(void *to, const void __user *from, unsigned long n)
++direct_copy_from_user(void *to, const void __user *from, unsigned long n)
+ {
+ 	might_sleep();
+ 	if (access_ok(VERIFY_READ, from, n))
+-		n = __copy_from_user(to, from, n);
++		n = __direct_copy_from_user(to, from, n);
+ 	else
+ 		memset(to, 0, n);
+ 	return n;
+@@ -520,10 +559,68 @@ long __strncpy_from_user(char *dst, cons
+  * If there is a limit on the length of a valid string, you may wish to
+  * consider using strnlen_user() instead.
+  */
+-#define strlen_user(str) strnlen_user(str, ~0UL >> 1)
+ 
+-long strnlen_user(const char __user *str, long n);
+-unsigned long clear_user(void __user *mem, unsigned long len);
+-unsigned long __clear_user(void __user *mem, unsigned long len);
++long direct_strncpy_from_user(char *dst, const char *src, long count);
++long __direct_strncpy_from_user(char *dst, const char *src, long count);
++#define direct_strlen_user(str) direct_strnlen_user(str, ~0UL >> 1)
++long direct_strnlen_user(const char *str, long n);
++unsigned long direct_clear_user(void *mem, unsigned long len);
++unsigned long __direct_clear_user(void *mem, unsigned long len);
++
++extern int indirect_uaccess;
++
++#ifdef CONFIG_X86_UACCESS_INDIRECT
++
++/*
++ * Return code and zeroing semantics:
++
++ __clear_user          0                      <-> bytes not done
++ clear_user            0                      <-> bytes not done
++ __copy_to_user        0                      <-> bytes not done
++ copy_to_user          0                      <-> bytes not done
++ __copy_from_user      0                      <-> bytes not done, zero rest
++ copy_from_user        0                      <-> bytes not done, zero rest
++ __get_user            0                      <-> -EFAULT
++ get_user              0                      <-> -EFAULT
++ __put_user            0                      <-> -EFAULT
++ put_user              0                      <-> -EFAULT
++ strlen_user           strlen + 1             <-> 0
++ strnlen_user          strlen + 1 (or n+1)    <-> 0
++ strncpy_from_user     strlen (or n)          <-> -EFAULT
++
++ */
++
++#define __clear_user(mem,len) __indirect_clear_user(mem,len)
++#define clear_user(mem,len) indirect_clear_user(mem,len)
++#define __copy_to_user(to,from,n) __indirect_copy_to_user(to,from,n)
++#define copy_to_user(to,from,n) indirect_copy_to_user(to,from,n)
++#define __copy_from_user(to,from,n) __indirect_copy_from_user(to,from,n)
++#define copy_from_user(to,from,n) indirect_copy_from_user(to,from,n)
++#define __get_user(val,ptr) __indirect_get_user(val,ptr)
++#define get_user(val,ptr) indirect_get_user(val,ptr)
++#define __put_user(val,ptr) __indirect_put_user(val,ptr)
++#define put_user(val,ptr) indirect_put_user(val,ptr)
++#define strlen_user(str) indirect_strlen_user(str)
++#define strnlen_user(src,count) indirect_strnlen_user(src,count)
++#define strncpy_from_user(dst,src,count) \
++			indirect_strncpy_from_user(dst,src,count)
++
++#else
++
++#define __clear_user __direct_clear_user
++#define clear_user direct_clear_user
++#define __copy_to_user __direct_copy_to_user
++#define copy_to_user direct_copy_to_user
++#define __copy_from_user __direct_copy_from_user
++#define copy_from_user direct_copy_from_user
++#define __get_user __direct_get_user
++#define get_user direct_get_user
++#define __put_user __direct_put_user
++#define put_user direct_put_user
++#define strlen_user direct_strlen_user
++#define strnlen_user direct_strnlen_user
++#define strncpy_from_user direct_strncpy_from_user
++
++#endif /* CONFIG_X86_UACCESS_INDIRECT */
+ 
+ #endif /* __i386_UACCESS_H */
+--- linux-2.6.0-test6/include/asm-i386/unistd.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/include/asm-i386/unistd.h	2003-10-05 00:33:24.000000000 -0700
+@@ -278,8 +278,9 @@
+ #define __NR_tgkill		270
+ #define __NR_utimes		271
+ #define __NR_fadvise64_64	272
++#define __NR_vserver		273
+ 
+-#define NR_syscalls 273
++#define NR_syscalls 274
+ 
+ /* user-visible error numbers are in the range -1 - -124: see <asm-i386/errno.h> */
+ 
+--- linux-2.6.0-test6/include/asm-ia64/acpi.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-ia64/acpi.h	2003-10-05 00:34:41.000000000 -0700
+@@ -99,7 +99,7 @@ int acpi_get_addr_space (void *obj, u8 t
+ /* Proximity bitmap length; _PXM is at most 255 (8 bit)*/
+ #define MAX_PXM_DOMAINS (256)
+ extern int __initdata pxm_to_nid_map[MAX_PXM_DOMAINS];
+-extern int __initdata nid_to_pxm_map[NR_NODES];
++extern int __initdata nid_to_pxm_map[MAX_NUMNODES];
+ #endif
+ 
+ #endif /*__KERNEL__*/
+--- linux-2.6.0-test6/include/asm-ia64/cacheflush.h	2003-06-14 12:18:00.000000000 -0700
++++ 25/include/asm-ia64/cacheflush.h	2003-10-05 00:33:24.000000000 -0700
+@@ -21,6 +21,8 @@
+ #define flush_cache_range(vma, start, end)	do { } while (0)
+ #define flush_cache_page(vma, vmaddr)		do { } while (0)
+ #define flush_icache_page(vma,page)		do { } while (0)
++#define flush_cache_vmap(start, end)		do { } while (0)
++#define flush_cache_vunmap(start, end)		do { } while (0)
+ 
+ #define flush_dcache_page(page)			\
+ do {						\
+@@ -35,4 +37,11 @@ do {												\
+ 	flush_icache_range(_addr, _addr + (len));						\
+ } while (0)
+ 
++#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
++do { memcpy(dst, src, len); \
++     flush_icache_user_range(vma, page, vaddr, len); \
++} while (0)
++#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
++
+ #endif /* _ASM_IA64_CACHEFLUSH_H */
+--- linux-2.6.0-test6/include/asm-ia64/elf.h	2003-07-27 12:14:40.000000000 -0700
++++ 25/include/asm-ia64/elf.h	2003-10-05 00:33:24.000000000 -0700
+@@ -206,42 +206,46 @@ do {										\
+ 	NEW_AUX_ENT(AT_SYSINFO_EHDR, (unsigned long) GATE_EHDR);		\
+ } while (0)
+ 
++
+ /*
+- * These macros parameterize elf_core_dump in fs/binfmt_elf.c to write out extra segments
+- * containing the gate DSO contents.  Dumping its contents makes post-mortem fully
+- * interpretable later without matching up the same kernel and hardware config to see what
+- * IP values meant.  Dumping its extra ELF program headers includes all the other
+- * information a debugger needs to easily find how the gate DSO was being used.
++ * These macros parameterize elf_core_dump in fs/binfmt_elf.c to write out
++ * extra segments containing the gate DSO contents.  Dumping its
++ * contents makes post-mortem fully interpretable later without matching up
++ * the same kernel and hardware config to see what PC values meant.
++ * Dumping its extra ELF program headers includes all the other information
++ * a debugger needs to easily find how the gate DSO was being used.
+  */
+ #define ELF_CORE_EXTRA_PHDRS		(GATE_EHDR->e_phnum)
+ #define ELF_CORE_WRITE_EXTRA_PHDRS						\
+ do {										\
+-	const struct elf_phdr *const gate_phdrs =				\
+-		(const struct elf_phdr *) (GATE_ADDR + GATE_EHDR->e_phoff);	\
++	const struct elf_phdr *const vsyscall_phdrs =			      \
++		(const struct elf_phdr *) (GATE_ADDR + GATE_EHDR->e_phoff);   \
+ 	int i;									\
+-	Elf64_Off ofs = 0;							\
++	Elf32_Off ofs = 0;						      \
+ 	for (i = 0; i < GATE_EHDR->e_phnum; ++i) {				\
+-		struct elf_phdr phdr = gate_phdrs[i];				\
++		struct elf_phdr phdr = vsyscall_phdrs[i];		      \
+ 		if (phdr.p_type == PT_LOAD) {					\
++			BUG_ON(ofs != 0);				      \
+ 			ofs = phdr.p_offset = offset;				\
++			phdr.p_memsz = PAGE_ALIGN(phdr.p_memsz);	      \
++			phdr.p_filesz = phdr.p_memsz;			      \
+ 			offset += phdr.p_filesz;				\
+-		} else								\
++		}							      \
++		else							      \
+ 			phdr.p_offset += ofs;					\
+ 		phdr.p_paddr = 0; /* match other core phdrs */			\
+ 		DUMP_WRITE(&phdr, sizeof(phdr));				\
+ 	}									\
+ } while (0)
+-
+ #define ELF_CORE_WRITE_EXTRA_DATA					\
+ do {									\
+-	const struct elf_phdr *const gate_phdrs =			\
+-		(const struct elf_phdr *) (GATE_ADDR			\
+-					   + GATE_EHDR->e_phoff);	\
++	const struct elf_phdr *const vsyscall_phdrs =			      \
++		(const struct elf_phdr *) (GATE_ADDR + GATE_EHDR->e_phoff);   \
+ 	int i;								\
+ 	for (i = 0; i < GATE_EHDR->e_phnum; ++i) {			\
+-		if (gate_phdrs[i].p_type == PT_LOAD)			\
+-			DUMP_WRITE((void *) gate_phdrs[i].p_vaddr,	\
+-				   gate_phdrs[i].p_filesz);		\
++		if (vsyscall_phdrs[i].p_type == PT_LOAD)		      \
++			DUMP_WRITE((void *) vsyscall_phdrs[i].p_vaddr,	      \
++				   PAGE_ALIGN(vsyscall_phdrs[i].p_memsz));    \
+ 	}								\
+ } while (0)
+ 
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-ia64/lockmeter.h	2003-10-05 00:36:40.000000000 -0700
+@@ -0,0 +1,72 @@
++/*
++ *  Copyright (C) 1999,2000 Silicon Graphics, Inc.
++ *
++ *  Written by John Hawkes (hawkes@sgi.com)
++ *  Based on klstat.h by Jack Steiner (steiner@sgi.com)
++ */
++
++#ifndef _IA64_LOCKMETER_H
++#define _IA64_LOCKMETER_H
++
++#ifdef local_cpu_data
++#define CPU_CYCLE_FREQUENCY	local_cpu_data->itc_freq
++#else
++#define CPU_CYCLE_FREQUENCY	my_cpu_data.itc_freq
++#endif
++#define get_cycles64()		get_cycles()
++
++#define THIS_CPU_NUMBER		smp_processor_id()
++
++/*
++ * macros to cache and retrieve an index value inside of a lock
++ * these macros assume that there are less than 65536 simultaneous
++ * (read mode) holders of a rwlock.
++ * we also assume that the hash table has less than 32767 entries.
++ */
++/*
++ * instrumented spinlock structure -- never used to allocate storage
++ * only used in macros below to overlay a spinlock_t
++ */
++typedef struct inst_spinlock_s {
++	/* remember, Intel is little endian */
++	volatile unsigned short lock;
++	volatile unsigned short index;
++} inst_spinlock_t;
++#define PUT_INDEX(lock_ptr,indexv) ((inst_spinlock_t *)(lock_ptr))->index = indexv
++#define GET_INDEX(lock_ptr)        ((inst_spinlock_t *)(lock_ptr))->index
++
++/*
++ * macros to cache and retrieve an index value in a read/write lock
++ * as well as the cpu where a reader busy period started
++ * we use the 2nd word (the debug word) for this, so require the
++ * debug word to be present
++ */
++/*
++ * instrumented rwlock structure -- never used to allocate storage
++ * only used in macros below to overlay a rwlock_t
++ */
++typedef struct inst_rwlock_s {
++	volatile int read_counter:31;
++	volatile int write_lock:1;
++	volatile unsigned short index;
++	volatile unsigned short cpu;
++} inst_rwlock_t;
++#define PUT_RWINDEX(rwlock_ptr,indexv) ((inst_rwlock_t *)(rwlock_ptr))->index = indexv
++#define GET_RWINDEX(rwlock_ptr)        ((inst_rwlock_t *)(rwlock_ptr))->index
++#define PUT_RW_CPU(rwlock_ptr,cpuv)    ((inst_rwlock_t *)(rwlock_ptr))->cpu = cpuv
++#define GET_RW_CPU(rwlock_ptr)         ((inst_rwlock_t *)(rwlock_ptr))->cpu
++
++/*
++ * return the number of readers for a rwlock_t
++ */
++#define RWLOCK_READERS(rwlock_ptr)	((rwlock_ptr)->read_counter)
++
++/*
++ * return true if rwlock is write locked
++ * (note that other lock attempts can cause the lock value to be negative)
++ */
++#define RWLOCK_IS_WRITE_LOCKED(rwlock_ptr) ((rwlock_ptr)->write_lock)
++#define RWLOCK_IS_READ_LOCKED(rwlock_ptr)  ((rwlock_ptr)->read_counter)
++
++#endif /* _IA64_LOCKMETER_H */
++
+--- linux-2.6.0-test6/include/asm-ia64/mmzone.h	2003-06-14 12:18:52.000000000 -0700
++++ 25/include/asm-ia64/mmzone.h	2003-10-05 00:34:41.000000000 -0700
+@@ -92,14 +92,12 @@
+ extern unsigned long max_low_pfn;
+ 
+ 
+-#ifdef CONFIG_IA64_DIG
++#if defined(CONFIG_IA64_DIG)
+ 
+ /*
+  * Platform definitions for DIG platform with contiguous memory.
+  */
+-#define MAX_PHYSNODE_ID	8	/* Maximum node number +1 */
+-#define NR_NODES	8	/* Maximum number of nodes in SSI */
+-
++#define MAX_PHYSNODE_ID	8		/* Maximum node number +1 */
+ #define MAX_PHYS_MEMORY	(1UL << 40)	/* 1 TB */
+ 
+ /*
+@@ -119,37 +117,34 @@ extern unsigned long max_low_pfn;
+ # error Unsupported bank and nodesize!
+ #endif
+ #define BANKSIZE		(1UL << BANKSHIFT)
+-#define BANK_OFFSET(addr)	((unsigned long)(addr) & (BANKSIZE-1))
+-#define NR_BANKS		(NR_BANKS_PER_NODE * NR_NODES)
+-
+-/*
+- * VALID_MEM_KADDR returns a boolean to indicate if a kaddr is
+- * potentially a valid cacheable identity mapped RAM memory address.
+- * Note that the RAM may or may not actually be present!!
+- */
+-#define VALID_MEM_KADDR(kaddr)	1
+-
+-/*
+- * Given a nodeid & a bank number, find the address of the mem_map
+- * entry for the first page of the bank.
+- */
+-#define BANK_MEM_MAP_INDEX(kaddr) \
+-	(((unsigned long)(kaddr) & (MAX_PHYS_MEMORY-1)) >> BANKSHIFT)
+ 
+ #elif defined(CONFIG_IA64_SGI_SN2)
++
+ /*
+  * SGI SN2 discontig definitions
+  */
+ #define MAX_PHYSNODE_ID	2048	/* 2048 node ids (also called nasid) */
+-#define NR_NODES	128	/* Maximum number of nodes in SSI */
+ #define MAX_PHYS_MEMORY	(1UL << 49)
+ 
+-#define BANKSHIFT		38
+ #define NR_BANKS_PER_NODE	4
++#define BANKSHIFT		38
+ #define SN2_NODE_SIZE		(64UL*1024*1024*1024)	/* 64GB per node */
+ #define BANKSIZE		(SN2_NODE_SIZE/NR_BANKS_PER_NODE)
++
++#endif /* CONFIG_IA64_DIG */
++
++#if defined(CONFIG_IA64_DIG) || defined (CONFIG_IA64_SGI_SN2)
++/* Common defines for both platforms */
++#include <asm/numnodes.h>
+ #define BANK_OFFSET(addr)	((unsigned long)(addr) & (BANKSIZE-1))
+-#define NR_BANKS		(NR_BANKS_PER_NODE * NR_NODES)
++#define NR_BANKS		(NR_BANKS_PER_NODE * (1 << NODES_SHIFT))
++#define NR_MEMBLKS		(NR_BANKS)
++
++/*
++ * VALID_MEM_KADDR returns a boolean to indicate if a kaddr is
++ * potentially a valid cacheable identity mapped RAM memory address.
++ * Note that the RAM may or may not actually be present!!
++ */
+ #define VALID_MEM_KADDR(kaddr)	1
+ 
+ /*
+@@ -159,5 +154,6 @@ extern unsigned long max_low_pfn;
+ #define BANK_MEM_MAP_INDEX(kaddr) \
+ 	(((unsigned long)(kaddr) & (MAX_PHYS_MEMORY-1)) >> BANKSHIFT)
+ 
+-#endif /* CONFIG_IA64_DIG */
++#endif /* CONFIG_IA64_DIG || CONFIG_IA64_SGI_SN2 */
++
+ #endif /* _ASM_IA64_MMZONE_H */
+--- linux-2.6.0-test6/include/asm-ia64/nodedata.h	2003-06-22 12:04:45.000000000 -0700
++++ 25/include/asm-ia64/nodedata.h	2003-10-05 00:34:41.000000000 -0700
+@@ -8,12 +8,10 @@
+  * Copyright (c) 2002 Erich Focht <efocht@ess.nec.de>
+  * Copyright (c) 2002 Kimio Suganuma <k-suganuma@da.jp.nec.com>
+  */
+-
+-
+ #ifndef _ASM_IA64_NODEDATA_H
+ #define _ASM_IA64_NODEDATA_H
+ 
+-
++#include <linux/numa.h>
+ #include <asm/mmzone.h>
+ 
+ /*
+@@ -24,9 +22,9 @@ struct pglist_data;
+ struct ia64_node_data {
+ 	short			active_cpu_count;
+ 	short			node;
+-        struct pglist_data	*pg_data_ptrs[NR_NODES];
++	struct pglist_data	*pg_data_ptrs[MAX_NUMNODES];
+ 	struct page		*bank_mem_map_base[NR_BANKS];
+-	struct ia64_node_data	*node_data_ptrs[NR_NODES];
++	struct ia64_node_data	*node_data_ptrs[MAX_NUMNODES];
+ 	short			node_id_map[NR_BANKS];
+ };
+ 
+--- linux-2.6.0-test6/include/asm-ia64/numa.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-ia64/numa.h	2003-10-05 00:34:41.000000000 -0700
+@@ -16,17 +16,11 @@
+ 
+ #ifdef CONFIG_NUMA
+ 
+-#ifdef CONFIG_DISCONTIGMEM
+-# include <asm/mmzone.h>
+-# define NR_MEMBLKS   (NR_BANKS)
+-#else
+-# define NR_NODES     (8)
+-# define NR_MEMBLKS   (NR_NODES * 8)
+-#endif
+-
++#include <linux/numa.h>
+ #include <linux/cache.h>
++
+ extern volatile char cpu_to_node_map[NR_CPUS] __cacheline_aligned;
+-extern volatile cpumask_t node_to_cpu_mask[NR_NODES] __cacheline_aligned;
++extern volatile cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
+ 
+ /* Stuff below this line could be architecture independent */
+ 
+@@ -60,7 +54,7 @@ extern struct node_cpuid_s node_cpuid[NR
+  * proportional to the memory access latency ratios.
+  */
+ 
+-extern u8 numa_slit[NR_NODES * NR_NODES];
++extern u8 numa_slit[MAX_NUMNODES * MAX_NUMNODES];
+ #define node_distance(from,to) (numa_slit[from * numnodes + to])
+ 
+ extern int paddr_to_nid(unsigned long paddr);
+--- linux-2.6.0-test6/include/asm-ia64/numnodes.h	2003-06-14 12:18:52.000000000 -0700
++++ 25/include/asm-ia64/numnodes.h	2003-10-05 00:34:41.000000000 -0700
+@@ -1,7 +1,12 @@
+ #ifndef _ASM_MAX_NUMNODES_H
+ #define _ASM_MAX_NUMNODES_H
+ 
+-#include <asm/mmzone.h>
+-#define MAX_NUMNODES	NR_NODES
++#ifdef CONFIG_IA64_DIG
++/* Max 8 Nodes */
++#define NODES_SHIFT	3
++#elif defined(CONFIG_IA64_SGI_SN2)
++/* Max 128 Nodes */
++#define NODES_SHIFT	7
++#endif
+ 
+ #endif /* _ASM_MAX_NUMNODES_H */
+--- linux-2.6.0-test6/include/asm-ia64/pgtable.h	2003-06-22 12:04:45.000000000 -0700
++++ 25/include/asm-ia64/pgtable.h	2003-10-05 00:33:24.000000000 -0700
+@@ -207,7 +207,6 @@ ia64_phys_addr_valid (unsigned long addr
+ #define RGN_KERNEL	7
+ 
+ #define VMALLOC_START		0xa000000200000000
+-#define VMALLOC_VMADDR(x)	((unsigned long)(x))
+ #ifdef CONFIG_VIRTUAL_MEM_MAP
+ # define VMALLOC_END_INIT	(0xa000000000000000 + (1UL << (4*PAGE_SHIFT - 9)))
+ # define VMALLOC_END		vmalloc_end
+--- linux-2.6.0-test6/include/asm-ia64/sn/pda.h	2003-06-22 12:04:45.000000000 -0700
++++ 25/include/asm-ia64/sn/pda.h	2003-10-05 00:34:41.000000000 -0700
+@@ -10,6 +10,7 @@
+ 
+ #include <linux/config.h>
+ #include <linux/cache.h>
++#include <linux/numa.h>
+ #include <asm/percpu.h>
+ #include <asm/system.h>
+ #include <asm/processor.h>
+@@ -56,7 +57,7 @@ typedef struct pda_s {
+ 
+ 	unsigned long	sn_soft_irr[4];
+ 	unsigned long	sn_in_service_ivecs[4];
+-	short		cnodeid_to_nasid_table[NR_NODES];	
++	short		cnodeid_to_nasid_table[MAX_NUMNODES];
+ 	int		sn_lb_int_war_ticks;
+ 	int		sn_last_irq;
+ 	int		sn_first_irq;
+--- linux-2.6.0-test6/include/asm-ia64/spinlock.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-ia64/spinlock.h	2003-10-05 00:36:40.000000000 -0700
+@@ -110,8 +110,18 @@ do {											\
+ typedef struct {
+ 	volatile int read_counter	: 31;
+ 	volatile int write_lock		:  1;
++#ifdef CONFIG_LOCKMETER
++	/* required for LOCKMETER since all bits in lock are used */
++	/* and we need this storage for CPU and lock INDEX        */
++	unsigned lockmeter_magic;
++#endif
+ } rwlock_t;
++
++#ifdef CONFIG_LOCKMETER
++#define RW_LOCK_UNLOCKED (rwlock_t) { 0, 0, 0 }
++#else
+ #define RW_LOCK_UNLOCKED (rwlock_t) { 0, 0 }
++#endif
+ 
+ #define rwlock_init(x)		do { *(x) = RW_LOCK_UNLOCKED; } while(0)
+ #define rwlock_is_locked(x)	(*(volatile int *) (x) != 0)
+@@ -127,6 +137,48 @@ do {											\
+ 	}										\
+ } while (0)
+ 
++#ifdef CONFIG_LOCKMETER
++/*
++ * HACK: This works, but still have a timing window that affects performance:
++ * we see that no one owns the Write lock, then someone * else grabs for Write
++ * lock before we do a read_lock().
++ * This means that on rare occasions our read_lock() will stall and spin-wait
++ * until we acquire for Read, instead of simply returning a trylock failure.
++ */
++static inline int _raw_read_trylock(rwlock_t *rw)
++{
++	if (rw->write_lock) {
++		return 0;
++	} else {
++		_raw_read_lock(rw);
++		return 1;
++	}
++}
++
++static inline int _raw_write_trylock(rwlock_t *rw)
++{
++	if (!(rw->write_lock)) {
++	    /* isn't currently write-locked... that looks promising... */
++	    if (test_and_set_bit(31, rw) == 0) {
++		/* now it is write-locked by me... */
++		if (rw->read_counter) {
++		    /* really read-locked, so release write-lock and fail */
++		    clear_bit(31, rw);
++		} else {
++		    /* we've the the write-lock, no read-lockers... success! */
++		    barrier();
++		    return 1;
++		}
++
++	    }
++	}
++
++	/* falls through ... fails to write-lock */
++	barrier();
++	return 0;
++}
++#endif
++
+ #define _raw_read_unlock(rw)					\
+ do {								\
+ 	rwlock_t *__read_lock_ptr = (rw);			\
+@@ -190,4 +242,25 @@ do {										\
+ 	clear_bit(31, (x));								\
+ })
+ 
++#ifdef CONFIG_LOCKMETER
++extern void _metered_spin_lock  (spinlock_t *lock);
++extern void _metered_spin_unlock(spinlock_t *lock);
++
++/*
++ *  Use a less efficient, and inline, atomic_dec_and_lock() if lockmetering
++ *  so we can see the callerPC of who is actually doing the spin_lock().
++ *  Otherwise, all we see is the generic rollup of all locks done by
++ *  atomic_dec_and_lock().
++ */
++static inline int atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock)
++{
++	_metered_spin_lock(lock);
++	if (atomic_dec_and_test(atomic))
++		return 1;
++	_metered_spin_unlock(lock);
++	return 0;
++}
++#define ATOMIC_DEC_AND_LOCK
++#endif
++
+ #endif /*  _ASM_IA64_SPINLOCK_H */
+--- linux-2.6.0-test6/include/asm-m68k/bitops.h	2003-06-14 12:18:52.000000000 -0700
++++ 25/include/asm-m68k/bitops.h	2003-10-05 00:33:24.000000000 -0700
+@@ -164,9 +164,10 @@ extern __inline__ int test_bit(int nr, c
+ 	return ((1UL << (nr & 31)) & (((const volatile unsigned long *) vaddr)[nr >> 5])) != 0;
+ }
+ 
+-extern __inline__ int find_first_zero_bit(unsigned long * vaddr, unsigned size)
++extern __inline__ int find_first_zero_bit(const unsigned long *vaddr,
++					  unsigned size)
+ {
+-	unsigned long *p = vaddr, *addr = vaddr;
++	const unsigned long *p = vaddr, *addr = vaddr;
+ 	unsigned long allones = ~0UL;
+ 	int res;
+ 	unsigned long num;
+@@ -187,11 +188,11 @@ extern __inline__ int find_first_zero_bi
+ 	return ((p - addr) << 5) + (res ^ 31);
+ }
+ 
+-extern __inline__ int find_next_zero_bit (unsigned long *vaddr, int size,
++extern __inline__ int find_next_zero_bit (const unsigned long *vaddr, int size,
+ 				      int offset)
+ {
+-	unsigned long *addr = vaddr;
+-	unsigned long *p = addr + (offset >> 5);
++	const unsigned long *addr = vaddr;
++	const unsigned long *p = addr + (offset >> 5);
+ 	int set = 0, bit = offset & 31UL, res;
+ 
+ 	if (offset >= size)
+@@ -263,7 +264,7 @@ static inline int fls(int x)
+  * unlikely to be set. It's guaranteed that at least one of the 140
+  * bits is cleared.
+  */
+-static inline int sched_find_first_bit(unsigned long *b)
++static inline int sched_find_first_bit(const unsigned long *b)
+ {
+ 	if (unlikely(b[0]))
+ 		return __ffs(b[0]);
+--- linux-2.6.0-test6/include/asm-m68k/cacheflush.h	2003-07-27 12:14:40.000000000 -0700
++++ 25/include/asm-m68k/cacheflush.h	2003-10-05 00:33:24.000000000 -0700
+@@ -80,6 +80,9 @@ extern void cache_push_v(unsigned long v
+ 
+ #define flush_cache_all() __flush_cache_all()
+ 
++#define flush_cache_vmap(start, end)		flush_cache_all()
++#define flush_cache_vunmap(start, end)		flush_cache_all()
++
+ extern inline void flush_cache_mm(struct mm_struct *mm)
+ {
+ 	if (mm == current->mm)
+@@ -127,6 +130,10 @@ extern inline void __flush_page_to_ram(v
+ #define flush_dcache_page(page)		__flush_page_to_ram(page_address(page))
+ #define flush_icache_page(vma, page)	__flush_page_to_ram(page_address(page))
+ #define flush_icache_user_range(vma,pg,adr,len)	do { } while (0)
++#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
++#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
+ 
+ extern void flush_icache_range(unsigned long address, unsigned long endaddr);
+ 
+--- linux-2.6.0-test6/include/asm-m68knommu/cacheflush.h	2003-06-14 12:18:34.000000000 -0700
++++ 25/include/asm-m68knommu/cacheflush.h	2003-10-05 00:33:24.000000000 -0700
+@@ -15,7 +15,13 @@
+ #define flush_icache_range(start,len)		__flush_cache_all()
+ #define flush_icache_page(vma,pg)		do { } while (0)
+ #define flush_icache_user_range(vma,pg,adr,len)	do { } while (0)
++#define flush_cache_vmap(start, end)		flush_cache_all()
++#define flush_cache_vunmap(start, end)		flush_cache_all()
+ 
++#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
++#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
+ 
+ extern inline void __flush_cache_all(void)
+ {
+--- linux-2.6.0-test6/include/asm-m68k/pci.h	2003-06-14 12:18:09.000000000 -0700
++++ 25/include/asm-m68k/pci.h	2003-10-05 00:33:24.000000000 -0700
+@@ -7,6 +7,8 @@
+  * Written by Wout Klaren.
+  */
+ 
++#include <asm/scatterlist.h>
++
+ struct pci_ops;
+ 
+ /*
+--- linux-2.6.0-test6/include/asm-m68k/pgtable.h	2003-06-14 12:18:32.000000000 -0700
++++ 25/include/asm-m68k/pgtable.h	2003-10-05 00:33:24.000000000 -0700
+@@ -79,12 +79,10 @@
+  */
+ #define VMALLOC_OFFSET	(8*1024*1024)
+ #define VMALLOC_START (((unsigned long) high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ #define VMALLOC_END KMAP_START
+ #else
+ extern unsigned long vmalloc_end;
+ #define VMALLOC_START 0x0f800000
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ #define VMALLOC_END vmalloc_end
+ #endif /* CONFIG_SUN3 */
+ 
+--- linux-2.6.0-test6/include/asm-m68k/zorro.h	2003-06-14 12:18:03.000000000 -0700
++++ 25/include/asm-m68k/zorro.h	2003-10-05 00:33:24.000000000 -0700
+@@ -42,4 +42,4 @@ extern inline void *z_remap_fullcache(un
+ #define z_iounmap iounmap
+ #define z_ioremap z_remap_nocache_ser
+ 
+-#endif /* _ASM_ZORRO_H */
++#endif /* _ASM_M68K_ZORRO_H */
+--- linux-2.6.0-test6/include/asm-mips/cacheflush.h	2003-08-08 22:55:13.000000000 -0700
++++ 25/include/asm-mips/cacheflush.h	2003-10-05 00:33:24.000000000 -0700
+@@ -43,7 +43,15 @@ extern void (*flush_icache_page)(struct 
+ extern void (*flush_icache_range)(unsigned long start, unsigned long end);
+ #define flush_icache_user_range(vma, page, addr, len)   \
+ 					flush_icache_page(vma, page)
++#define flush_cache_vmap(start, end)		flush_cache_all()
++#define flush_cache_vunmap(start, end)		flush_cache_all()
+ 
++#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
++do { memcpy(dst, src, len); \
++     flush_icache_user_range(vma, page, vaddr, len); \
++} while (0)
++#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
+ 
+ extern void (*flush_cache_sigtramp)(unsigned long addr);
+ extern void (*flush_icache_all)(void);
+--- linux-2.6.0-test6/include/asm-mips/highmem.h	2003-07-02 14:53:17.000000000 -0700
++++ 25/include/asm-mips/highmem.h	2003-10-05 00:33:24.000000000 -0700
+@@ -54,6 +54,8 @@ extern void *kmap_atomic(struct page *pa
+ extern void kunmap_atomic(void *kvaddr, enum km_type type);
+ extern struct page *kmap_atomic_to_page(void *ptr);
+ 
++#define flush_cache_kmaps()	flush_cache_all()
++
+ #endif /* __KERNEL__ */
+ 
+ #endif /* _ASM_HIGHMEM_H */
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-mips/lockmeter.h	2003-10-05 00:36:40.000000000 -0700
+@@ -0,0 +1,126 @@
++/*
++ *  Copyright (C) 1999,2000 Silicon Graphics, Inc.
++ *
++ *  Written by John Hawkes (hawkes@sgi.com)
++ *  Based on klstat.h by Jack Steiner (steiner@sgi.com)
++ *  Ported to mips32 for Asita Technologies
++ *   by D.J. Barrow ( dj.barrow@asitatechnologies.com )
++ */
++#ifndef _ASM_LOCKMETER_H
++#define _ASM_LOCKMETER_H
++
++/* do_gettimeoffset is a function pointer on mips */
++/* & it is not included by <linux/time.h> */
++#include <asm/time.h>
++#include <linux/time.h>
++#include <asm/div64.h>
++
++#define SPINLOCK_MAGIC_INIT	/* */
++
++#define CPU_CYCLE_FREQUENCY	get_cpu_cycle_frequency()
++
++#define THIS_CPU_NUMBER		smp_processor_id()
++
++static uint32_t cpu_cycle_frequency = 0;
++
++static uint32_t get_cpu_cycle_frequency(void)
++{
++    /* a total hack, slow and invasive, but ... it works */
++    int sec;
++    uint32_t start_cycles;
++    struct timeval tv;
++
++    if (cpu_cycle_frequency == 0) {	/* uninitialized */
++	do_gettimeofday(&tv);
++	sec = tv.tv_sec;	/* set up to catch the tv_sec rollover */
++	while (sec == tv.tv_sec) { do_gettimeofday(&tv); }
++	sec = tv.tv_sec;	/* rolled over to a new sec value */
++	start_cycles = get_cycles();
++	while (sec == tv.tv_sec) { do_gettimeofday(&tv); }
++	cpu_cycle_frequency = get_cycles() - start_cycles;
++    }
++
++    return cpu_cycle_frequency;
++}
++
++extern struct timeval xtime;
++
++static uint64_t get_cycles64(void)
++{
++    static uint64_t last_get_cycles64 = 0;
++    uint64_t ret;
++    unsigned long sec;
++    unsigned long usec, usec_offset;
++
++again:
++    sec  = xtime.tv_sec;
++    usec = xtime.tv_usec;
++    usec_offset = do_gettimeoffset();
++    if ((xtime.tv_sec != sec)  ||
++	(xtime.tv_usec != usec)||
++	(usec_offset >= 20000))
++	goto again;
++
++    ret = ((uint64_t)(usec + usec_offset) * cpu_cycle_frequency);
++    /* We can't do a normal 64 bit division on mips without libgcc.a */
++    do_div(ret,1000000);
++    ret +=  ((uint64_t)sec * cpu_cycle_frequency);
++
++    /* XXX why does time go backwards?  do_gettimeoffset?  general time adj? */
++    if (ret <= last_get_cycles64)
++	ret  = last_get_cycles64+1;
++    last_get_cycles64 = ret;
++
++    return ret;
++}
++
++/*
++ * macros to cache and retrieve an index value inside of a lock
++ * these macros assume that there are less than 65536 simultaneous
++ * (read mode) holders of a rwlock.
++ * we also assume that the hash table has less than 32767 entries.
++ * the high order bit is used for write locking a rw_lock
++ */
++#define INDEX_MASK   0x7FFF0000
++#define READERS_MASK 0x0000FFFF
++#define INDEX_SHIFT 16
++#define PUT_INDEX(lockp,index)   \
++        lockp->lock = (((lockp->lock) & ~INDEX_MASK) | (index) << INDEX_SHIFT)
++#define GET_INDEX(lockp) \
++        (((lockp->lock) & INDEX_MASK) >> INDEX_SHIFT)
++
++/*
++ * macros to cache and retrieve an index value in a read/write lock
++ * as well as the cpu where a reader busy period started
++ * we use the 2nd word (the debug word) for this, so require the
++ * debug word to be present
++ */
++/*
++ * instrumented rwlock structure -- never used to allocate storage
++ * only used in macros below to overlay a rwlock_t
++ */
++typedef struct inst_rwlock_s {
++	volatile int lock;
++	unsigned short index;
++	unsigned short cpu;
++} inst_rwlock_t;
++#define PUT_RWINDEX(rwlock_ptr,indexv) ((inst_rwlock_t *)(rwlock_ptr))->index = indexv
++#define GET_RWINDEX(rwlock_ptr)        ((inst_rwlock_t *)(rwlock_ptr))->index
++#define PUT_RW_CPU(rwlock_ptr,cpuv)    ((inst_rwlock_t *)(rwlock_ptr))->cpu = cpuv
++#define GET_RW_CPU(rwlock_ptr)         ((inst_rwlock_t *)(rwlock_ptr))->cpu
++
++/*
++ * return the number of readers for a rwlock_t
++ */
++#define RWLOCK_READERS(rwlock_ptr)   rwlock_readers(rwlock_ptr)
++
++extern inline int rwlock_readers(rwlock_t *rwlock_ptr)
++{
++	int tmp = (int) rwlock_ptr->lock;
++	return (tmp >= 0) ? tmp : 0;
++}
++
++#define RWLOCK_IS_WRITE_LOCKED(rwlock_ptr) ((rwlock_ptr)->lock < 0)
++#define RWLOCK_IS_READ_LOCKED(rwlock_ptr)  ((rwlock_ptr)->lock > 0)
++
++#endif /* _ASM_LOCKMETER_H */
+--- linux-2.6.0-test6/include/asm-mips/pgtable-32.h	2003-08-08 22:55:13.000000000 -0700
++++ 25/include/asm-mips/pgtable-32.h	2003-10-05 00:33:24.000000000 -0700
+@@ -79,7 +79,6 @@ extern int add_temporary_entry(unsigned 
+ #define FIRST_USER_PGD_NR	0
+ 
+ #define VMALLOC_START     KSEG2
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ 
+ #if CONFIG_HIGHMEM
+ # define VMALLOC_END	(PKMAP_BASE-2*PAGE_SIZE)
+--- linux-2.6.0-test6/include/asm-mips/pgtable-64.h	2003-08-08 22:55:13.000000000 -0700
++++ 25/include/asm-mips/pgtable-64.h	2003-10-05 00:33:24.000000000 -0700
+@@ -64,7 +64,6 @@
+ #define FIRST_USER_PGD_NR	0
+ 
+ #define VMALLOC_START		XKSEG
+-#define VMALLOC_VMADDR(x)	((unsigned long)(x))
+ #define VMALLOC_END	\
+ 	(VMALLOC_START + ((1 << PGD_ORDER) * PTRS_PER_PTE * PAGE_SIZE))
+ 
+--- linux-2.6.0-test6/include/asm-mips/spinlock.h	2003-07-02 14:53:17.000000000 -0700
++++ 25/include/asm-mips/spinlock.h	2003-10-05 00:36:40.000000000 -0700
+@@ -91,9 +91,18 @@ static inline unsigned int _raw_spin_try
+ 
+ typedef struct {
+ 	volatile unsigned int lock;
++#ifdef CONFIG_LOCKMETER
++	/* required for LOCKMETER since all bits in lock are used */
++	/* and we need this storage for CPU and lock INDEX        */
++	unsigned lockmeter_magic;
++#endif
+ } rwlock_t;
+ 
++#ifdef CONFIG_LOCKMETER
++#define RW_LOCK_UNLOCKED (rwlock_t) { 0, 0 }
++#else
+ #define RW_LOCK_UNLOCKED (rwlock_t) { 0 }
++#endif
+ 
+ #define rwlock_init(x)  do { *(x) = RW_LOCK_UNLOCKED; } while(0)
+ 
+--- linux-2.6.0-test6/include/asm-parisc/atomic.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-parisc/atomic.h	2003-10-05 00:33:24.000000000 -0700
+@@ -129,8 +129,9 @@ __cmpxchg(volatile void *ptr, unsigned l
+ 
+ 
+ /* It's possible to reduce all atomic operations to either
+- * __atomic_add_return, __atomic_set and __atomic_ret (the latter
+- * is there only for consistency). */
++ * __atomic_add_return, atomic_set and atomic_read (the latter
++ * is there only for consistency).
++ */
+ 
+ static __inline__ int __atomic_add_return(int i, atomic_t *v)
+ {
+@@ -144,7 +145,7 @@ static __inline__ int __atomic_add_retur
+ 	return ret;
+ }
+ 
+-static __inline__ void __atomic_set(atomic_t *v, int i) 
++static __inline__ void atomic_set(atomic_t *v, int i) 
+ {
+ 	unsigned long flags;
+ 	SPIN_LOCK_IRQSAVE(ATOMIC_HASH(v), flags);
+@@ -154,28 +155,25 @@ static __inline__ void __atomic_set(atom
+ 	SPIN_UNLOCK_IRQRESTORE(ATOMIC_HASH(v), flags);
+ }
+ 
+-static __inline__ int __atomic_read(atomic_t *v)
++static __inline__ int atomic_read(const atomic_t *v)
+ {
+ 	return v->counter;
+ }
+ 
+ /* exported interface */
+ 
+-#define atomic_add(i,v)		((void)(__atomic_add_return( (i),(v))))
+-#define atomic_sub(i,v)		((void)(__atomic_add_return(-(i),(v))))
+-#define atomic_inc(v)		((void)(__atomic_add_return(   1,(v))))
+-#define atomic_dec(v)		((void)(__atomic_add_return(  -1,(v))))
++#define atomic_add(i,v)	((void)(__atomic_add_return( ((int)i),(v))))
++#define atomic_sub(i,v)	((void)(__atomic_add_return(-((int)i),(v))))
++#define atomic_inc(v)	((void)(__atomic_add_return(   1,(v))))
++#define atomic_dec(v)	((void)(__atomic_add_return(  -1,(v))))
+ 
+-#define atomic_add_return(i,v)	(__atomic_add_return( (i),(v)))
+-#define atomic_sub_return(i,v)	(__atomic_add_return(-(i),(v)))
++#define atomic_add_return(i,v)	(__atomic_add_return( ((int)i),(v)))
++#define atomic_sub_return(i,v)	(__atomic_add_return(-((int)i),(v)))
+ #define atomic_inc_return(v)	(__atomic_add_return(   1,(v)))
+ #define atomic_dec_return(v)	(__atomic_add_return(  -1,(v)))
+ 
+ #define atomic_dec_and_test(v)	(atomic_dec_return(v) == 0)
+ 
+-#define atomic_set(v,i)		(__atomic_set((v),i))
+-#define atomic_read(v)		(__atomic_read(v))
+-
+ #define ATOMIC_INIT(i)	{ (i) }
+ 
+ #define smp_mb__before_atomic_dec()	smp_mb()
+--- linux-2.6.0-test6/include/asm-parisc/bitops.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-parisc/bitops.h	2003-10-05 00:33:24.000000000 -0700
+@@ -232,24 +232,24 @@ static __inline__ unsigned long __ffs(un
+ #if BITS_PER_LONG > 32
+ 		" ldi       63,%1\n"
+ 		" extrd,u,*<>  %0,63,32,%%r0\n"
+-		" extrd,u,*TR  %0,31,32,%0\n"
++		" extrd,u,*TR  %0,31,32,%0\n"	/* move top 32-bits down */
+ 		" addi    -32,%1,%1\n"
+ #else
+ 		" ldi       31,%1\n"
+ #endif
+ 		" extru,<>  %0,31,16,%%r0\n"
+-		" extru,TR  %0,15,16,%0\n"
++		" extru,TR  %0,15,16,%0\n"	/* xxxx0000 -> 0000xxxx */
+ 		" addi    -16,%1,%1\n"
+ 		" extru,<>  %0,31,8,%%r0\n"
+-		" extru,TR  %0,23,8,%0\n"
++		" extru,TR  %0,23,8,%0\n"	/* 0000xx00 -> 000000xx */
+ 		" addi    -8,%1,%1\n"
+ 		" extru,<>  %0,31,4,%%r0\n"
+-		" extru,TR  %0,27,4,%0\n"
++		" extru,TR  %0,27,4,%0\n"	/* 000000x0 -> 0000000x */
+ 		" addi    -4,%1,%1\n"
+ 		" extru,<>  %0,31,2,%%r0\n"
+-		" extru,TR  %0,29,2,%0\n"
++		" extru,TR  %0,29,2,%0\n"	/* 0000000y, 1100b -> 0011b */
+ 		" addi    -2,%1,%1\n"
+-		" extru,=  %0,31,1,%%r0\n"
++		" extru,=  %0,31,1,%%r0\n"	/* check last bit */
+ 		" addi    -1,%1,%1\n"
+ 			: "+r" (x), "=r" (ret) );
+ 	return ret;
+@@ -291,7 +291,7 @@ static __inline__ int fls(int x)
+ 	"	zdep,TR		%0,27,28,%0\n"		/* x0000000 */
+ 	"	addi		4,%1,%1\n"
+ 	"	extru,<>	%0,1,2,%%r0\n"
+-	"	zdep,TR		%0,29,30,%0\n"		/* y0000000 (y&3 = 0 */
++	"	zdep,TR		%0,29,30,%0\n"		/* y0000000 (y&3 = 0) */
+ 	"	addi		2,%1,%1\n"
+ 	"	extru,=		%0,0,1,%%r0\n"
+ 	"	addi		1,%1,%1\n"		/* if y & 8, add 1 */
+--- linux-2.6.0-test6/include/asm-parisc/cacheflush.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-parisc/cacheflush.h	2003-10-05 00:33:24.000000000 -0700
+@@ -30,6 +30,9 @@ static inline void flush_cache_all(void)
+ 	on_each_cpu(cacheflush_h_tmp_function, NULL, 1, 1);
+ }
+ 
++#define flush_cache_vmap(start, end)		flush_cache_all()
++#define flush_cache_vunmap(start, end)		flush_cache_all()
++
+ /* The following value needs to be tuned and probably scaled with the
+  * cache size.
+  */
+@@ -82,6 +85,13 @@ static inline void flush_dcache_page(str
+         flush_user_dcache_range(addr, addr + len); \
+ 	flush_user_icache_range(addr, addr + len); } while (0)
+ 
++#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
++do { memcpy(dst, src, len); \
++     flush_icache_user_range(vma, page, vaddr, len); \
++} while (0)
++#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
++
+ static inline void flush_cache_range(struct vm_area_struct *vma,
+ 		unsigned long start, unsigned long end)
+ {
+--- linux-2.6.0-test6/include/asm-parisc/dma-mapping.h	2003-06-14 12:18:07.000000000 -0700
++++ 25/include/asm-parisc/dma-mapping.h	2003-10-05 00:33:24.000000000 -0700
+@@ -2,6 +2,7 @@
+ #define _PARISC_DMA_MAPPING_H
+ 
+ #include <linux/mm.h>
++#include <linux/config.h>
+ #include <asm/cacheflush.h>
+ 
+ /*
+--- linux-2.6.0-test6/include/asm-parisc/elf.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-parisc/elf.h	2003-10-05 00:33:24.000000000 -0700
+@@ -144,6 +144,30 @@
+ #define R_PARISC_LTOFF_TP16DF	231	/* 16 bits LT-TP-rel. address.  */
+ #define R_PARISC_HIRESERVE	255
+ 
++#define PA_PLABEL_FDESC		0x02	/* bit set if PLABEL points to
++					 * a function descriptor, not
++					 * an address */
++
++/* The following are PA function descriptors 
++ *
++ * addr:	the absolute address of the function
++ * gp:		either the data pointer (r27) for non-PIC code or the
++ *		the PLT pointer (r19) for PIC code */
++
++/* Format for the Elf32 Function descriptor */
++typedef struct elf32_fdesc {
++	__u32	addr;
++	__u32	gp;
++} Elf32_Fdesc;
++
++/* Format for the Elf64 Function descriptor */
++typedef struct elf64_fdesc {
++	__u64	dummy[2]; /* FIXME: nothing uses these, why waste
++			   * the space */
++	__u64	addr;
++	__u64	gp;
++} Elf64_Fdesc;
++
+ /* Legal values for p_type field of Elf32_Phdr/Elf64_Phdr.  */
+ 
+ #define PT_HP_TLS		(PT_LOOS + 0x0)
+@@ -215,7 +239,10 @@ typedef unsigned long elf_greg_t;
+ 
+ #ifdef __KERNEL__
+ #define SET_PERSONALITY(ex, ibcs2) \
+-	current->personality = PER_LINUX
++	current->personality = PER_LINUX; \
++	current->thread.map_base = DEFAULT_MAP_BASE; \
++	current->thread.task_size = DEFAULT_TASK_SIZE \
++
+ #endif
+ 
+ /*
+--- linux-2.6.0-test6/include/asm-parisc/ioctl.h	2003-06-14 12:17:55.000000000 -0700
++++ 25/include/asm-parisc/ioctl.h	2003-10-05 00:33:24.000000000 -0700
+@@ -44,11 +44,21 @@
+ 	 ((nr)   << _IOC_NRSHIFT) | \
+ 	 ((size) << _IOC_SIZESHIFT))
+ 
++/* provoke compile error for invalid uses of size argument */
++extern int __invalid_size_argument_for_IOC;
++#define _IOC_TYPECHECK(t) \
++	((sizeof(t) == sizeof(t[1]) && \
++	  sizeof(t) < (1 << _IOC_SIZEBITS)) ? \
++	  sizeof(t) : __invalid_size_argument_for_IOC)
++
+ /* used to create numbers */
+ #define _IO(type,nr)		_IOC(_IOC_NONE,(type),(nr),0)
+-#define _IOR(type,nr,size)	_IOC(_IOC_READ,(type),(nr),sizeof(size))
+-#define _IOW(type,nr,size)	_IOC(_IOC_WRITE,(type),(nr),sizeof(size))
+-#define _IOWR(type,nr,size)	_IOC(_IOC_READ|_IOC_WRITE,(type),(nr),sizeof(size))
++#define _IOR(type,nr,size)	_IOC(_IOC_READ,(type),(nr),(_IOC_TYPECHECK(size)))
++#define _IOW(type,nr,size)	_IOC(_IOC_WRITE,(type),(nr),(_IOC_TYPECHECK(size)))
++#define _IOWR(type,nr,size)	_IOC(_IOC_READ|_IOC_WRITE,(type),(nr),(_IOC_TYPECHECK(size)))
++#define _IOR_BAD(type,nr,size)	_IOC(_IOC_READ,(type),(nr),sizeof(size))
++#define _IOW_BAD(type,nr,size)	_IOC(_IOC_WRITE,(type),(nr),sizeof(size))
++#define _IOWR_BAD(type,nr,size)	_IOC(_IOC_READ|_IOC_WRITE,(type),(nr),sizeof(size))
+ 
+ /* used to decode ioctl numbers.. */
+ #define _IOC_DIR(nr)		(((nr) >> _IOC_DIRSHIFT) & _IOC_DIRMASK)
+--- linux-2.6.0-test6/include/asm-parisc/irq.h	2003-06-14 12:18:07.000000000 -0700
++++ 25/include/asm-parisc/irq.h	2003-10-05 00:33:24.000000000 -0700
+@@ -17,6 +17,7 @@
+ 
+ #include <linux/string.h>
+ #include <linux/interrupt.h>
++#include <linux/config.h>
+ 
+ 
+ #define CPU_IRQ_REGION		1
+--- linux-2.6.0-test6/include/asm-parisc/keyboard.h	2003-06-14 12:18:04.000000000 -0700
++++ 25/include/asm-parisc/keyboard.h	2003-10-05 00:33:24.000000000 -0700
+@@ -25,8 +25,6 @@
+ #ifndef _PARISC_KEYBOARD_H
+ #define _PARISC_KEYBOARD_H
+ 
+-#include <linux/config.h>
+-
+ #ifdef __KERNEL__
+ 
+ #include <linux/kernel.h>
+--- linux-2.6.0-test6/include/asm-parisc/page.h	2003-06-14 12:18:00.000000000 -0700
++++ 25/include/asm-parisc/page.h	2003-10-05 00:33:24.000000000 -0700
+@@ -7,6 +7,7 @@
+ #define PAGE_MASK	(~(PAGE_SIZE-1))
+ 
+ #ifdef __KERNEL__
++#include <linux/config.h>
+ #ifndef __ASSEMBLY__
+ 
+ #include <asm/cache.h>
+--- linux-2.6.0-test6/include/asm-parisc/param.h	2003-06-14 12:18:08.000000000 -0700
++++ 25/include/asm-parisc/param.h	2003-10-05 00:33:24.000000000 -0700
+@@ -2,6 +2,7 @@
+ #define _ASMPARISC_PARAM_H
+ 
+ #ifdef __KERNEL__
++#include <linux/config.h>
+ # ifdef CONFIG_PA20
+ #  define HZ		1000		/* Faster machines */
+ # else
+--- linux-2.6.0-test6/include/asm-parisc/pci.h	2003-06-14 12:18:29.000000000 -0700
++++ 25/include/asm-parisc/pci.h	2003-10-05 00:33:24.000000000 -0700
+@@ -1,6 +1,7 @@
+ #ifndef __ASM_PARISC_PCI_H
+ #define __ASM_PARISC_PCI_H
+ 
++#include <linux/config.h>
+ #include <asm/scatterlist.h>
+ 
+ /*
+--- linux-2.6.0-test6/include/asm-parisc/pdc.h	2003-06-14 12:17:55.000000000 -0700
++++ 25/include/asm-parisc/pdc.h	2003-10-05 00:33:24.000000000 -0700
+@@ -1,6 +1,8 @@
+ #ifndef _PARISC_PDC_H
+ #define _PARISC_PDC_H
+ 
++#include <linux/config.h>
++
+ /*
+  *	PDC return values ...
+  *	All PDC calls return a subset of these errors. 
+@@ -191,8 +193,8 @@ typedef struct {
+ 
+ #define PDC_IO		135		/* log error info, reset IO system */
+ #define PDC_IO_READ_AND_CLEAR_ERRORS	0
+-#define PDC_IO_READ_AND_LOG_ERRORS	1
+-#define PDC_IO_SUSPEND_USB		2
++#define PDC_IO_RESET			1
++#define PDC_IO_RESET_DEVICES		2
+ /* sets bits 6&7 (little endian) of the HcControl Register */
+ #define PDC_IO_USB_SUSPEND	0xC000000000000000
+ #define PDC_IO_EEPROM_IO_ERR_TABLE_FULL	-5	/* return value */
+@@ -951,7 +953,8 @@ int pdc_do_firm_test_reset(unsigned long
+ int pdc_do_reset(void);
+ int pdc_soft_power_info(unsigned long *power_reg);
+ int pdc_soft_power_button(int sw_control);
+-void pdc_suspend_usb(void);
++void pdc_io_reset(void);
++void pdc_io_reset_devices(void);
+ int pdc_iodc_getc(void);
+ void pdc_iodc_putc(unsigned char c);
+ void pdc_iodc_outc(unsigned char c);
+--- linux-2.6.0-test6/include/asm-parisc/pgalloc.h	2003-06-14 12:18:35.000000000 -0700
++++ 25/include/asm-parisc/pgalloc.h	2003-10-05 00:33:24.000000000 -0700
+@@ -1,7 +1,6 @@
+ #ifndef _ASM_PGALLOC_H
+ #define _ASM_PGALLOC_H
+ 
+-#include <linux/config.h>
+ #include <linux/gfp.h>
+ #include <linux/mm.h>
+ #include <linux/threads.h>
+--- linux-2.6.0-test6/include/asm-parisc/pgtable.h	2003-07-13 21:44:35.000000000 -0700
++++ 25/include/asm-parisc/pgtable.h	2003-10-05 00:33:24.000000000 -0700
+@@ -1,6 +1,7 @@
+ #ifndef _PARISC_PGTABLE_H
+ #define _PARISC_PGTABLE_H
+ 
++#include <linux/config.h>
+ #include <asm/fixmap.h>
+ 
+ #ifndef __ASSEMBLY__
+@@ -108,7 +109,6 @@
+ extern  void *vmalloc_start;
+ #define PCXL_DMA_MAP_SIZE   (8*1024*1024)
+ #define VMALLOC_START   ((unsigned long)vmalloc_start)
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ /* this is a fixmap remnant, see fixmap.h */
+ #define VMALLOC_END	(TMPALIAS_MAP_START)
+ #endif
+--- linux-2.6.0-test6/include/asm-parisc/processor.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-parisc/processor.h	2003-10-05 00:33:24.000000000 -0700
+@@ -36,10 +36,18 @@
+ #define current_text_addr() ({ void *pc; __asm__("\n\tblr 0,%0\n\tnop":"=r" (pc)); pc; })
+ 
+ #define TASK_SIZE               (current->thread.task_size)
+-#define DEFAULT_TASK_SIZE       (0xFFF00000UL)
+-
+ #define TASK_UNMAPPED_BASE      (current->thread.map_base)
+-#define DEFAULT_MAP_BASE        (0x40000000UL)
++
++#define DEFAULT_TASK_SIZE32	(0xFFF00000UL)
++#define DEFAULT_MAP_BASE32	(0x40000000UL)
++
++#ifdef __LP64__
++#define DEFAULT_TASK_SIZE       (MAX_ADDRESS-0xf000000)
++#define DEFAULT_MAP_BASE        (0x200000000UL)
++#else
++#define DEFAULT_TASK_SIZE	DEFAULT_TASK_SIZE32
++#define DEFAULT_MAP_BASE	DEFAULT_MAP_BASE32
++#endif
+ 
+ #ifndef __ASSEMBLY__
+ 
+@@ -247,8 +255,18 @@ on downward growing arches, it looks lik
+  *
+  * Note that the S/390 people took the easy way out and hacked their
+  * GCC to make the stack grow downwards.
++ *
++ * Final Note: For entry from syscall, the W (wide) bit of the PSW
++ * is stuffed into the lowest bit of the user sp (%r30), so we fill
++ * it in here from the current->personality
+  */
+ 
++#ifdef __LP64__
++#define USER_WIDE_MODE	(personality(current->personality) == PER_LINUX)
++#else
++#define USER_WIDE_MODE	0
++#endif
++
+ #define start_thread(regs, new_pc, new_sp) do {		\
+ 	elf_addr_t *sp = (elf_addr_t *)new_sp;		\
+ 	__u32 spaceid = (__u32)current->mm->context;	\
+@@ -266,12 +284,12 @@ on downward growing arches, it looks lik
+ 	regs->sr[5] = spaceid;				\
+ 	regs->sr[6] = spaceid;				\
+ 	regs->sr[7] = spaceid;				\
+-	regs->gr[ 0] = USER_PSW;                        \
++	regs->gr[ 0] = USER_PSW | (USER_WIDE_MODE ? PSW_W : 0); \
+ 	regs->fr[ 0] = 0LL;                            	\
+ 	regs->fr[ 1] = 0LL;                            	\
+ 	regs->fr[ 2] = 0LL;                            	\
+ 	regs->fr[ 3] = 0LL;                            	\
+-	regs->gr[30] = ((unsigned long)sp + 63) &~ 63;	\
++	regs->gr[30] = (((unsigned long)sp + 63) &~ 63) | (USER_WIDE_MODE ? 1 : 0); \
+ 	regs->gr[31] = pc;				\
+ 							\
+ 	get_user(regs->gr[25], (argv - 1));		\
+@@ -299,8 +317,6 @@ static inline unsigned long get_wchan(st
+ #define KSTK_EIP(tsk)	((tsk)->thread.regs.iaoq[0])
+ #define KSTK_ESP(tsk)	((tsk)->thread.regs.gr[30])
+ 
+-#endif /* __ASSEMBLY__ */
+-
+ #ifdef  CONFIG_PA20
+ #define ARCH_HAS_PREFETCH
+ extern inline void prefetch(const void *addr)
+@@ -317,4 +333,6 @@ extern inline void prefetchw(const void 
+ 
+ #define cpu_relax()	barrier()
+ 
++#endif /* __ASSEMBLY__ */
++
+ #endif /* __ASM_PARISC_PROCESSOR_H */
+--- linux-2.6.0-test6/include/asm-parisc/rt_sigframe.h	2003-06-14 12:18:08.000000000 -0700
++++ 25/include/asm-parisc/rt_sigframe.h	2003-10-05 00:33:24.000000000 -0700
+@@ -13,7 +13,20 @@ struct rt_sigframe {
+  * which Linux/parisc uses is sp-20 for the saved return pointer...)
+  * Then, the stack pointer must be rounded to a cache line (64 bytes).
+  */
++#define SIGFRAME32		64
++#define FUNCTIONCALLFRAME32	48
++#define PARISC_RT_SIGFRAME_SIZE32					\
++	(((sizeof(struct rt_sigframe) + FUNCTIONCALLFRAME32) + SIGFRAME32) & -SIGFRAME32)
++
++#ifdef __LP64__
++#define	SIGFRAME		128
++#define FUNCTIONCALLFRAME	96
+ #define PARISC_RT_SIGFRAME_SIZE					\
+-	(((sizeof(struct rt_sigframe) + 48) + 63) & -64)
++	(((sizeof(struct rt_sigframe) + FUNCTIONCALLFRAME) + SIGFRAME) & -SIGFRAME)
++#else
++#define	SIGFRAME		SIGFRAME32
++#define FUNCTIONCALLFRAME	FUNCTIONCALLFRAME32
++#define PARISC_RT_SIGFRAME_SIZE	PARISC_RT_SIGFRAME_SIZE32
++#endif
+ 
+ #endif
+--- linux-2.6.0-test6/include/asm-parisc/tlbflush.h	2003-06-14 12:18:51.000000000 -0700
++++ 25/include/asm-parisc/tlbflush.h	2003-10-05 00:33:24.000000000 -0700
+@@ -3,6 +3,7 @@
+ 
+ /* TLB flushing routines.... */
+ 
++#include <linux/config.h>
+ #include <linux/mm.h>
+ #include <asm/mmu_context.h>
+ 
+--- linux-2.6.0-test6/include/asm-ppc64/cacheflush.h	2003-06-14 12:17:57.000000000 -0700
++++ 25/include/asm-ppc64/cacheflush.h	2003-10-05 00:33:24.000000000 -0700
+@@ -14,12 +14,22 @@
+ #define flush_cache_range(vma, start, end)	do { } while (0)
+ #define flush_cache_page(vma, vmaddr)		do { } while (0)
+ #define flush_icache_page(vma, page)		do { } while (0)
++#define flush_cache_vmap(start, end)		do { } while (0)
++#define flush_cache_vunmap(start, end)		do { } while (0)
+ 
+ extern void flush_dcache_page(struct page *page);
+ extern void flush_icache_range(unsigned long, unsigned long);
+ extern void flush_icache_user_range(struct vm_area_struct *vma,
+ 				    struct page *page, unsigned long addr,
+ 				    int len);
++
++#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
++do { memcpy(dst, src, len); \
++     flush_icache_user_range(vma, page, vaddr, len); \
++} while (0)
++#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
++
+ extern void __flush_dcache_icache(void *page_va);
+ 
+ #endif /* _PPC64_CACHEFLUSH_H */
+--- linux-2.6.0-test6/include/asm-ppc64/elf.h	2003-06-14 12:18:29.000000000 -0700
++++ 25/include/asm-ppc64/elf.h	2003-10-05 00:33:24.000000000 -0700
+@@ -128,11 +128,6 @@ static inline int dump_task_regs(struct 
+ extern int dump_task_fpu(struct task_struct *, elf_fpregset_t *); 
+ #define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) dump_task_fpu(tsk, elf_fpregs)
+ 
+-#ifdef CONFIG_SMP
+-extern void dump_smp_unlazy_fpu(void);
+-#define ELF_CORE_SYNC dump_smp_unlazy_fpu
+-#endif
+-
+ #endif
+ 
+ /* This yields a mask that user programs can use to figure out what
+--- linux-2.6.0-test6/include/asm-ppc64/numnodes.h	2003-06-14 12:18:30.000000000 -0700
++++ 25/include/asm-ppc64/numnodes.h	2003-10-05 00:34:38.000000000 -0700
+@@ -1,6 +1,7 @@
+ #ifndef _ASM_MAX_NUMNODES_H
+ #define _ASM_MAX_NUMNODES_H
+ 
+-#define MAX_NUMNODES 16
++/* Max 16 Nodes */
++#define NODES_SHIFT	4
+ 
+ #endif /* _ASM_MAX_NUMNODES_H */
+--- linux-2.6.0-test6/include/asm-ppc64/pgtable.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-ppc64/pgtable.h	2003-10-05 00:33:24.000000000 -0700
+@@ -45,7 +45,6 @@
+  * Define the address range of the vmalloc VM area.
+  */
+ #define VMALLOC_START (0xD000000000000000)
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ #define VMALLOC_END   (VMALLOC_START + VALID_EA_BITS)
+ 
+ /*
+--- linux-2.6.0-test6/include/asm-ppc64/semaphore.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-ppc64/semaphore.h	2003-10-05 00:34:19.000000000 -0700
+@@ -22,6 +22,7 @@ struct semaphore {
+ 	 * sleeping on `wait'.
+ 	 */
+ 	atomic_t count;
++	int sleepers;
+ 	wait_queue_head_t wait;
+ #ifdef WAITQUEUE_DEBUG
+ 	long __magic;
+@@ -37,6 +38,7 @@ struct semaphore {
+ 
+ #define __SEMAPHORE_INITIALIZER(name, count) \
+ 	{ ATOMIC_INIT(count), \
++	  0, \
+ 	  __WAIT_QUEUE_HEAD_INITIALIZER((name).wait) \
+ 	  __SEM_DEBUG_INIT(name) }
+ 
+@@ -52,6 +54,7 @@ struct semaphore {
+ static inline void sema_init (struct semaphore *sem, int val)
+ {
+ 	atomic_set(&sem->count, val);
++	sem->sleepers = 0;
+ 	init_waitqueue_head(&sem->wait);
+ #ifdef WAITQUEUE_DEBUG
+ 	sem->__magic = (long)&sem->__magic;
+--- linux-2.6.0-test6/include/asm-ppc/cacheflush.h	2003-06-14 12:18:29.000000000 -0700
++++ 25/include/asm-ppc/cacheflush.h	2003-10-05 00:33:24.000000000 -0700
+@@ -24,12 +24,21 @@
+ #define flush_cache_range(vma, a, b)	do { } while (0)
+ #define flush_cache_page(vma, p)	do { } while (0)
+ #define flush_icache_page(vma, page)	do { } while (0)
++#define flush_cache_vmap(start, end)	do { } while (0)
++#define flush_cache_vunmap(start, end)	do { } while (0)
+ 
+ extern void flush_dcache_page(struct page *page);
+ extern void flush_icache_range(unsigned long, unsigned long);
+ extern void flush_icache_user_range(struct vm_area_struct *vma,
+ 		struct page *page, unsigned long addr, int len);
+ 
++#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
++do { memcpy(dst, src, len); \
++     flush_icache_user_range(vma, page, vaddr, len); \
++} while (0)
++#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
++
+ extern void __flush_dcache_icache(void *page_va);
+ extern void __flush_dcache_icache_phys(unsigned long physaddr);
+ 
+--- linux-2.6.0-test6/include/asm-ppc/highmem.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-ppc/highmem.h	2003-10-05 00:33:24.000000000 -0700
+@@ -132,6 +132,8 @@ static inline struct page *kmap_atomic_t
+ 	return pte_page(kmap_pte[idx]);
+ }
+ 
++#define flush_cache_kmaps()	flush_cache_all()
++
+ #endif /* __KERNEL__ */
+ 
+ #endif /* _ASM_HIGHMEM_H */
+--- linux-2.6.0-test6/include/asm-ppc/pgtable.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/asm-ppc/pgtable.h	2003-10-05 00:33:24.000000000 -0700
+@@ -129,7 +129,6 @@ extern unsigned long ioremap_bot, iorema
+ #else
+ #define VMALLOC_START ((((long)high_memory + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1)))
+ #endif
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ #define VMALLOC_END	ioremap_bot
+ 
+ /*
+--- linux-2.6.0-test6/include/asm-ppc/zorro.h	2003-06-14 12:18:30.000000000 -0700
++++ 25/include/asm-ppc/zorro.h	2003-10-05 00:33:24.000000000 -0700
+@@ -27,4 +27,4 @@ extern void *__ioremap(unsigned long add
+ #define z_ioremap ioremap
+ #define z_iounmap iounmap
+ 
+-#endif /* _ASM_ZORRO_H */
++#endif /* _ASM_PPC_ZORRO_H */
+--- linux-2.6.0-test6/include/asm-s390/cacheflush.h	2003-06-14 12:18:51.000000000 -0700
++++ 25/include/asm-s390/cacheflush.h	2003-10-05 00:33:24.000000000 -0700
+@@ -13,5 +13,12 @@
+ #define flush_icache_range(start, end)		do { } while (0)
+ #define flush_icache_page(vma,pg)		do { } while (0)
+ #define flush_icache_user_range(vma,pg,adr,len)	do { } while (0)
++#define flush_cache_vmap(start, end)		do { } while (0)
++#define flush_cache_vunmap(start, end)		do { } while (0)
++
++#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
++#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
+ 
+ #endif /* _S390_CACHEFLUSH_H */
+--- linux-2.6.0-test6/include/asm-s390/pgtable.h	2003-06-14 12:18:30.000000000 -0700
++++ 25/include/asm-s390/pgtable.h	2003-10-05 00:33:24.000000000 -0700
+@@ -117,7 +117,6 @@ extern char empty_zero_page[PAGE_SIZE];
+ #define VMALLOC_OFFSET  (8*1024*1024)
+ #define VMALLOC_START   (((unsigned long) high_memory + VMALLOC_OFFSET) \
+ 			 & ~(VMALLOC_OFFSET-1))
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ #ifndef __s390x__
+ # define VMALLOC_END     (0x7fffffffL)
+ #else /* __s390x__ */
+--- linux-2.6.0-test6/include/asm-sh/cacheflush.h	2003-07-02 14:53:18.000000000 -0700
++++ 25/include/asm-sh/cacheflush.h	2003-10-05 00:33:24.000000000 -0700
+@@ -10,4 +10,14 @@ extern void __flush_purge_region(void *s
+ /* Flush (invalidate only) a region (smaller than a page) */
+ extern void __flush_invalidate_region(void *start, int size);
+ 
++#define flush_cache_vmap(start, end)		flush_cache_all()
++#define flush_cache_vunmap(start, end)		flush_cache_all()
++
++#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
++do { memcpy(dst, src, len); \
++     flush_icache_user_range(vma, page, vaddr, len); \
++} while (0)
++#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
++
+ #endif /* __ASM_SH_CACHEFLUSH_H */
+--- linux-2.6.0-test6/include/asm-sh/mmzone.h	2003-07-02 14:53:18.000000000 -0700
++++ 25/include/asm-sh/mmzone.h	2003-10-05 00:34:40.000000000 -0700
+@@ -10,14 +10,14 @@
+ 
+ #include <linux/config.h>
+ 
++#ifdef CONFIG_DISCONTIGMEM
++
+ /* Currently, just for HP690 */
+ #define PHYSADDR_TO_NID(phys)	((((phys) - __MEMORY_START) >= 0x01000000)?1:0)
+-#define NR_NODES 2
+ 
+-extern pg_data_t discontig_page_data[NR_NODES];
+-extern bootmem_data_t discontig_node_bdata[NR_NODES];
++extern pg_data_t discontig_page_data[MAX_NUMNODES];
++extern bootmem_data_t discontig_node_bdata[MAX_NUMNODES];
+ 
+-#ifdef CONFIG_DISCONTIGMEM
+ /*
+  * Following are macros that each numa implmentation must define.
+  */
+@@ -46,7 +46,7 @@ static inline int is_valid_page(struct p
+ {
+ 	unsigned int i;
+ 
+-	for (i = 0; i < NR_NODES; i++) {
++	for (i = 0; i < MAX_NUMNODES; i++) {
+ 		if (page >= NODE_MEM_MAP(i) &&
+ 		    page < NODE_MEM_MAP(i) + NODE_DATA(i)->node_size)
+ 			return 1;
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-sh/numnodes.h	2003-10-05 00:34:40.000000000 -0700
+@@ -0,0 +1,7 @@
++#ifndef _ASM_MAX_NUMNODES_H
++#define _ASM_MAX_NUMNODES_H
++
++/* Max 2 Nodes */
++#define NODES_SHIFT	1
++
++#endif /* _ASM_MAX_NUMNODES_H */
+--- linux-2.6.0-test6/include/asm-sh/pgtable.h	2003-07-02 14:53:18.000000000 -0700
++++ 25/include/asm-sh/pgtable.h	2003-10-05 00:33:24.000000000 -0700
+@@ -51,7 +51,6 @@ extern unsigned long empty_zero_page[102
+  * Currently only 4-enty (16kB) is used (see arch/sh/mm/cache.c)
+  */
+ #define VMALLOC_START	(P3SEG+0x00100000)
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ #define VMALLOC_END	P4SEG
+ 
+ /*			0x001     WT-bit on SH-4, 0 on SH-3 */
+--- linux-2.6.0-test6/include/asm-sparc64/cacheflush.h	2003-06-14 12:18:35.000000000 -0700
++++ 25/include/asm-sparc64/cacheflush.h	2003-10-05 00:33:24.000000000 -0700
+@@ -33,21 +33,17 @@ extern void flush_dcache_page_all(struct
+ 
+ extern void __flush_dcache_range(unsigned long start, unsigned long end);
+ 
+-extern void __flush_cache_all(void);
+-
+-#ifndef CONFIG_SMP
+-
+-#define flush_cache_all()	__flush_cache_all()
+-
+-#else /* CONFIG_SMP */
+-
+-extern void smp_flush_cache_all(void);
+-
+-#endif /* ! CONFIG_SMP */
+-
+ #define flush_icache_page(vma, pg)	do { } while(0)
+ #define flush_icache_user_range(vma,pg,adr,len)	do { } while (0)
+ 
++#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
++#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
++
+ extern void flush_dcache_page(struct page *page);
+ 
++#define flush_cache_vmap(start, end)		do { } while (0)
++#define flush_cache_vunmap(start, end)		do { } while (0)
++
+ #endif /* _SPARC64_CACHEFLUSH_H */
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-sparc64/lockmeter.h	2003-10-05 00:36:40.000000000 -0700
+@@ -0,0 +1,45 @@
++/*
++ * Copyright (C) 2000 Anton Blanchard (anton@linuxcare.com)
++ * Copyright (C) 2003 David S. Miller (davem@redhat.com)
++ */
++
++#ifndef _SPARC64_LOCKMETER_H
++#define _SPARC64_LOCKMETER_H
++
++#include <linux/smp.h>
++#include <asm/spinlock.h>
++#include <asm/timer.h>
++#include <asm/timex.h>
++
++/* Actually, this is not the CPU frequency by the system tick
++ * frequency which is good enough for lock metering.
++ */
++#define CPU_CYCLE_FREQUENCY	(timer_tick_offset * HZ)
++#define THIS_CPU_NUMBER		smp_processor_id()
++
++#define PUT_INDEX(lock_ptr,indexv)	(lock_ptr)->index = (indexv)
++#define GET_INDEX(lock_ptr)		(lock_ptr)->index
++
++#define PUT_RWINDEX(rwlock_ptr,indexv) (rwlock_ptr)->index = (indexv)
++#define GET_RWINDEX(rwlock_ptr)        (rwlock_ptr)->index
++#define PUT_RW_CPU(rwlock_ptr,cpuv)    (rwlock_ptr)->cpu = (cpuv)
++#define GET_RW_CPU(rwlock_ptr)         (rwlock_ptr)->cpu
++
++#define RWLOCK_READERS(rwlock_ptr)	rwlock_readers(rwlock_ptr)
++
++extern inline int rwlock_readers(rwlock_t *rwlock_ptr)
++{
++	signed int tmp = rwlock_ptr->lock;
++
++	if (tmp > 0)
++		return tmp;
++	else
++		return 0;
++}
++
++#define RWLOCK_IS_WRITE_LOCKED(rwlock_ptr)	((signed int)((rwlock_ptr)->lock) < 0)
++#define RWLOCK_IS_READ_LOCKED(rwlock_ptr)	((signed int)((rwlock_ptr)->lock) > 0)
++
++#define get_cycles64()	get_cycles()
++
++#endif /* _SPARC64_LOCKMETER_H */
+--- linux-2.6.0-test6/include/asm-sparc64/pgtable.h	2003-06-14 12:17:56.000000000 -0700
++++ 25/include/asm-sparc64/pgtable.h	2003-10-05 00:33:24.000000000 -0700
+@@ -30,7 +30,6 @@
+ #define MODULES_LEN		0x000000007e000000
+ #define MODULES_END		0x0000000080000000
+ #define VMALLOC_START		0x0000000140000000
+-#define VMALLOC_VMADDR(x)	((unsigned long)(x))
+ #define VMALLOC_END		0x0000000200000000
+ #define LOW_OBP_ADDRESS		0x00000000f0000000
+ #define HI_OBP_ADDRESS		0x0000000100000000
+--- linux-2.6.0-test6/include/asm-sparc64/spinlock.h	2003-06-26 22:07:26.000000000 -0700
++++ 25/include/asm-sparc64/spinlock.h	2003-10-05 00:36:40.000000000 -0700
+@@ -30,15 +30,23 @@
+ 
+ #ifndef CONFIG_DEBUG_SPINLOCK
+ 
+-typedef unsigned char spinlock_t;
+-#define SPIN_LOCK_UNLOCKED	0
++typedef struct {
++	unsigned char lock;
++	unsigned int  index;
++} spinlock_t;
+ 
+-#define spin_lock_init(lock)	(*((unsigned char *)(lock)) = 0)
+-#define spin_is_locked(lock)	(*((volatile unsigned char *)(lock)) != 0)
++#ifdef CONFIG_LOCKMETER
++#define SPIN_LOCK_UNLOCKED	(spinlock_t) {0, 0}
++#else
++#define SPIN_LOCK_UNLOCKED	(spinlock_t) { 0 }
++#endif
+ 
+-#define spin_unlock_wait(lock)	\
++#define spin_lock_init(__lock)	do { *(__lock) = SPIN_LOCK_UNLOCKED; } while(0)
++#define spin_is_locked(__lock)	(*((volatile unsigned char *)(&((__lock)->lock))) != 0)
++
++#define spin_unlock_wait(__lock)	\
+ do {	membar("#LoadLoad");	\
+-} while(*((volatile unsigned char *)lock))
++} while(*((volatile unsigned char *)(&(((spinlock_t *)__lock)->lock))))
+ 
+ static __inline__ void _raw_spin_lock(spinlock_t *lock)
+ {
+@@ -109,18 +117,34 @@ extern int _spin_trylock (spinlock_t *lo
+ 
+ #ifndef CONFIG_DEBUG_SPINLOCK
+ 
+-typedef unsigned int rwlock_t;
+-#define RW_LOCK_UNLOCKED	0
+-#define rwlock_init(lp) do { *(lp) = RW_LOCK_UNLOCKED; } while(0)
+-#define rwlock_is_locked(x) (*(x) != RW_LOCK_UNLOCKED)
++#ifdef CONFIG_LOCKMETER
++typedef struct {
++	unsigned int lock;
++	unsigned int index;
++	unsigned int cpu;
++} rwlock_t;
++#define RW_LOCK_UNLOCKED       (rwlock_t) { 0, 0, 0xff }
++#else
++typedef struct {
++	unsigned int lock;
++} rwlock_t;
++#define RW_LOCK_UNLOCKED        (rwlock_t) { 0 }
++#endif
++
++#define rwlock_init(lp)		do { *(lp) = RW_LOCK_UNLOCKED; } while(0)
++#define rwlock_is_locked(x)	((x)->lock != 0)
+ 
++extern int __read_trylock(rwlock_t *);
+ extern void __read_lock(rwlock_t *);
+ extern void __read_unlock(rwlock_t *);
++extern int __write_trylock(rwlock_t *);
+ extern void __write_lock(rwlock_t *);
+ extern void __write_unlock(rwlock_t *);
+ 
++#define _raw_read_trylock(p)	__read_trylock(p)
+ #define _raw_read_lock(p)	__read_lock(p)
+ #define _raw_read_unlock(p)	__read_unlock(p)
++#define _raw_write_trylock(p)	__write_trylock(p)
+ #define _raw_write_lock(p)	__write_lock(p)
+ #define _raw_write_unlock(p)	__write_unlock(p)
+ 
+--- linux-2.6.0-test6/include/asm-sparc64/tlbflush.h	2003-06-14 12:18:29.000000000 -0700
++++ 25/include/asm-sparc64/tlbflush.h	2003-10-05 00:33:24.000000000 -0700
+@@ -70,7 +70,6 @@ extern void smp_flush_tlb_range(struct m
+ extern void smp_flush_tlb_kernel_range(unsigned long start, unsigned long end);
+ extern void smp_flush_tlb_page(struct mm_struct *mm, unsigned long page);
+ 
+-#define flush_cache_all()	smp_flush_cache_all()
+ #define flush_tlb_all()		smp_flush_tlb_all()
+ #define flush_tlb_mm(mm)	smp_flush_tlb_mm(mm)
+ #define flush_tlb_range(vma, start, end) \
+--- linux-2.6.0-test6/include/asm-sparc64/unistd.h	2003-09-08 13:58:59.000000000 -0700
++++ 25/include/asm-sparc64/unistd.h	2003-10-05 00:33:24.000000000 -0700
+@@ -285,7 +285,8 @@
+ #define __NR_timer_getoverrun	264
+ #define __NR_timer_delete	265
+ #define __NR_timer_create	266
+-/* WARNING: You MAY NOT add syscall numbers larger than 266, since
++/* #define __NR_vserver		267 Reserved for VSERVER */
++/* WARNING: You MAY NOT add syscall numbers larger than 267, since
+  *          all of the syscall tables in the Sparc kernel are
+  *          sized to have 267 entries (starting at zero).  Therefore
+  *          find a free slot in the 0-266 range.
+--- linux-2.6.0-test6/include/asm-sparc64/visasm.h	2003-06-14 12:17:58.000000000 -0700
++++ 25/include/asm-sparc64/visasm.h	2003-10-05 00:33:24.000000000 -0700
+@@ -17,7 +17,8 @@
+ 	andcc		%o5, (FPRS_FEF|FPRS_DU), %g0;	\
+ 	be,pt		%icc, 297f;			\
+ 	 sethi		%hi(297f), %g7;			\
+-	ba,pt		%xcc, VISenter;			\
++	sethi		%hi(VISenter), %g1;		\
++	jmpl		%g1 + %lo(VISenter), %g0;	\
+ 	 or		%g7, %lo(297f), %g7;		\
+ 297:	wr		%g0, FPRS_FEF, %fprs;		\
+ 
+@@ -32,7 +33,8 @@
+ 	andcc		%o5, FPRS_FEF, %g0;		\
+ 	be,pt		%icc, 297f;			\
+ 	 sethi		%hi(298f), %g7;			\
+-	ba,pt		%xcc, VISenterhalf;		\
++	sethi		%hi(VISenterhalf), %g1;		\
++	jmpl		%g1 + %lo(VISenterhalf), %g0;	\
+ 	 or		%g7, %lo(298f), %g7;		\
+ 	clr		%o5;				\
+ 297:	wr		%o5, FPRS_FEF, %fprs;		\
+@@ -48,7 +50,8 @@ static __inline__ void save_and_clear_fp
+ "		andcc %%o5, %0, %%g0\n"
+ "		be,pt %%icc, 299f\n"
+ "		 sethi %%hi(298f), %%g7\n"
+-"		ba VISenter	! Note. This cannot be bp, as it may be too far from VISenter.\n"
++"		sethi %%hi(VISenter), %%g1\n"
++"		jmpl %%g1 + %%lo(VISenter), %%g0\n"
+ "		 or %%g7, %%lo(298f), %%g7\n"
+ "	298:	wr %%g0, 0, %%fprs\n"
+ "	299:\n"
+--- linux-2.6.0-test6/include/asm-sparc/cacheflush.h	2003-06-14 12:18:06.000000000 -0700
++++ 25/include/asm-sparc/cacheflush.h	2003-10-05 00:33:24.000000000 -0700
+@@ -56,6 +56,11 @@ BTFIXUPDEF_CALL(void, flush_cache_page, 
+ 
+ #define flush_icache_user_range(vma,pg,adr,len)	do { } while (0)
+ 
++#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
++#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
++
+ BTFIXUPDEF_CALL(void, __flush_page_to_ram, unsigned long)
+ BTFIXUPDEF_CALL(void, flush_sig_insns, struct mm_struct *, unsigned long)
+ 
+@@ -66,4 +71,7 @@ extern void sparc_flush_page_to_ram(stru
+ 
+ #define flush_dcache_page(page)			sparc_flush_page_to_ram(page)
+ 
++#define flush_cache_vmap(start, end)		flush_cache_all()
++#define flush_cache_vunmap(start, end)		flush_cache_all()
++
+ #endif /* _SPARC_CACHEFLUSH_H */
+--- linux-2.6.0-test6/include/asm-sparc/highmem.h	2003-06-14 12:18:51.000000000 -0700
++++ 25/include/asm-sparc/highmem.h	2003-10-05 00:33:24.000000000 -0700
+@@ -89,6 +89,8 @@ static inline struct page *kmap_atomic_t
+ 	return pte_page(*pte);
+ }
+ 
++#define flush_cache_kmaps()	flush_cache_all()
++
+ #endif /* __KERNEL__ */
+ 
+ #endif /* _ASM_HIGHMEM_H */
+--- linux-2.6.0-test6/include/asm-sparc/pgtable.h	2003-06-14 12:18:22.000000000 -0700
++++ 25/include/asm-sparc/pgtable.h	2003-10-05 00:33:24.000000000 -0700
+@@ -101,8 +101,6 @@ BTFIXUPDEF_SIMM13(ptrs_per_pmd)
+ BTFIXUPDEF_SIMM13(ptrs_per_pgd)
+ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
+ 
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+-
+ #define pte_ERROR(e)   __builtin_trap()
+ #define pmd_ERROR(e)   __builtin_trap()
+ #define pgd_ERROR(e)   __builtin_trap()
+--- linux-2.6.0-test6/include/asm-sparc/unistd.h	2003-09-08 13:58:59.000000000 -0700
++++ 25/include/asm-sparc/unistd.h	2003-10-05 00:33:24.000000000 -0700
+@@ -283,7 +283,8 @@
+ #define __NR_timer_getoverrun	264
+ #define __NR_timer_delete	265
+ #define __NR_timer_create	266
+-/* WARNING: You MAY NOT add syscall numbers larger than 266, since
++/* #define __NR_vserver		267 Reserved for VSERVER */
++/* WARNING: You MAY NOT add syscall numbers larger than 267, since
+  *          all of the syscall tables in the Sparc kernel are
+  *          sized to have 267 entries (starting at zero).  Therefore
+  *          find a free slot in the 0-266 range.
+--- linux-2.6.0-test6/include/asm-um/archparam-i386.h	2003-06-14 12:18:30.000000000 -0700
++++ 25/include/asm-um/archparam-i386.h	2003-10-05 00:34:32.000000000 -0700
+@@ -56,6 +56,65 @@ typedef elf_greg_t elf_gregset_t[ELF_NGR
+ 	pr_reg[16] = PT_REGS_SS(regs);		\
+ } while(0);
+ 
++#define VSYSCALL_BASE	(__fix_to_virt(FIX_VSYSCALL))
++#define VSYSCALL_EHDR	((const struct elfhdr *) VSYSCALL_BASE)
++#define VSYSCALL_ENTRY	((unsigned long) &__kernel_vsyscall)
++extern void *__kernel_vsyscall;
++
++/*
++ * Architecture-neutral AT_ values in 0-17, leave some room
++ * for more of them, start the x86-specific ones at 32.
++ */
++#define AT_SYSINFO		32
++#define AT_SYSINFO_EHDR		33
++
++#define ARCH_DLINFO						\
++do {								\
++		NEW_AUX_ENT(AT_SYSINFO,	VSYSCALL_ENTRY);	\
++		NEW_AUX_ENT(AT_SYSINFO_EHDR, VSYSCALL_BASE);	\
++} while (0)
++
++/*
++ * These macros parameterize elf_core_dump in fs/binfmt_elf.c to write out
++ * extra segments containing the vsyscall DSO contents.  Dumping its
++ * contents makes post-mortem fully interpretable later without matching up
++ * the same kernel and hardware config to see what PC values meant.
++ * Dumping its extra ELF program headers includes all the other information
++ * a debugger needs to easily find how the vsyscall DSO was being used.
++ */
++#define ELF_CORE_EXTRA_PHDRS		(VSYSCALL_EHDR->e_phnum)
++#define ELF_CORE_WRITE_EXTRA_PHDRS					      \
++do {									      \
++	const struct elf_phdr *const vsyscall_phdrs =			      \
++		(const struct elf_phdr *) (VSYSCALL_BASE		      \
++					   + VSYSCALL_EHDR->e_phoff);	      \
++	int i;								      \
++	Elf32_Off ofs = 0;						      \
++	for (i = 0; i < VSYSCALL_EHDR->e_phnum; ++i) {			      \
++		struct elf_phdr phdr = vsyscall_phdrs[i];		      \
++		if (phdr.p_type == PT_LOAD) {				      \
++			ofs = phdr.p_offset = offset;			      \
++			offset += phdr.p_filesz;			      \
++		}							      \
++		else							      \
++			phdr.p_offset += ofs;				      \
++		phdr.p_paddr = 0; /* match other core phdrs */		      \
++		DUMP_WRITE(&phdr, sizeof(phdr));			      \
++	}								      \
++} while (0)
++#define ELF_CORE_WRITE_EXTRA_DATA					      \
++do {									      \
++	const struct elf_phdr *const vsyscall_phdrs =			      \
++		(const struct elf_phdr *) (VSYSCALL_BASE		      \
++					   + VSYSCALL_EHDR->e_phoff);	      \
++	int i;								      \
++	for (i = 0; i < VSYSCALL_EHDR->e_phnum; ++i) {			      \
++		if (vsyscall_phdrs[i].p_type == PT_LOAD)		      \
++			DUMP_WRITE((void *) vsyscall_phdrs[i].p_vaddr,	      \
++				   vsyscall_phdrs[i].p_filesz);		      \
++	}								      \
++} while (0)
++
+ /********* Bits for asm-um/delay.h **********/
+ 
+ typedef unsigned long um_udelay_t;
+--- linux-2.6.0-test6/include/asm-um/common.lds.S	2003-06-14 12:18:00.000000000 -0700
++++ 25/include/asm-um/common.lds.S	2003-10-05 00:34:32.000000000 -0700
+@@ -1,3 +1,5 @@
++#include <asm-generic/vmlinux.lds.h>
++
+   .fini      : { *(.fini)    } =0x9090
+   _etext = .;
+   PROVIDE (etext = .);
+@@ -67,6 +69,10 @@
+   }
+   __initcall_end = .;
+ 
++  __con_initcall_start = .;
++  .con_initcall.init : { *(.con_initcall.init) }
++  __con_initcall_end = .;
++
+   __uml_initcall_start = .;
+   .uml.initcall.init : { *(.uml.initcall.init) }
+   __uml_initcall_end = .;
+@@ -80,7 +86,33 @@
+   .uml.exitcall : { *(.uml.exitcall.exit) }
+   __uml_exitcall_end = .;
+ 
+-  . = ALIGN(4096);
++  . = ALIGN(4);
++  __alt_instructions = .;
++  .altinstructions : { *(.altinstructions) } 
++  __alt_instructions_end = .; 
++  .altinstr_replacement : { *(.altinstr_replacement) } 
++  /* .exit.text is discard at runtime, not link time, to deal with references
++     from .altinstructions and .eh_frame */
++  .exit.text : { *(.exit.text) }
++  .exit.data : { *(.exit.data) }
++ 
++  __preinit_array_start = .;
++  .preinit_array : { *(.preinit_array) }
++  __preinit_array_end = .;
++  __init_array_start = .;
++  .init_array : { *(.init_array) }
++  __init_array_end = .;
++  __fini_array_start = .;
++  .fini_array : { *(.fini_array) }
++  __fini_array_end = .;
++
++   . = ALIGN(4096);
+   __initramfs_start = .;
+   .init.ramfs : { *(.init.ramfs) }
+   __initramfs_end = .;
++
++  /* Sections to be discarded */
++  /DISCARD/ : {
++ 	*(.exitcall.exit)
++  }
++ 
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-um/cpufeature.h	2003-10-05 00:34:32.000000000 -0700
+@@ -0,0 +1,6 @@
++#ifndef __UM_CPUFEATURE_H
++#define __UM_CPUFEATURE_H
++
++#include "asm/arch/cpufeature.h"
++
++#endif
+--- linux-2.6.0-test6/include/asm-um/current.h	2003-06-14 12:17:57.000000000 -0700
++++ 25/include/asm-um/current.h	2003-10-05 00:34:32.000000000 -0700
+@@ -16,8 +16,10 @@ struct thread_info;
+ #define CURRENT_THREAD(dummy) (((unsigned long) &dummy) & \
+ 			        (PAGE_MASK << CONFIG_KERNEL_STACK_ORDER))
+ 
+-#define current ({ int dummy; \
+-                   ((struct thread_info *) CURRENT_THREAD(dummy))->task; })
++#define current_thread \
++	({ int dummy; ((struct thread_info *) CURRENT_THREAD(dummy)); })
++
++#define current (current_thread->task)
+ 
+ #endif /* __ASSEMBLY__ */
+ 
+--- linux-2.6.0-test6/include/asm-um/fixmap.h	2003-06-14 12:18:33.000000000 -0700
++++ 25/include/asm-um/fixmap.h	2003-10-05 00:34:32.000000000 -0700
+@@ -34,6 +34,7 @@ enum fixed_addresses {
+ 	FIX_KMAP_BEGIN,	/* reserved pte's for temporary kernel mappings */
+ 	FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,
+ #endif
++	FIX_VSYSCALL,
+ 	__end_of_fixed_addresses
+ };
+ 
+@@ -63,6 +64,13 @@ extern unsigned long get_kmem_end(void);
+ #define __fix_to_virt(x)	(FIXADDR_TOP - ((x) << PAGE_SHIFT))
+ #define __virt_to_fix(x)      ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT)
+ 
++/*
++ * This is the range that is readable by user mode, and things
++ * acting like user mode such as get_user_pages.
++ */
++#define FIXADDR_USER_START	(__fix_to_virt(FIX_VSYSCALL))
++#define FIXADDR_USER_END	(FIXADDR_USER_START + PAGE_SIZE)
++
+ extern void __this_fixmap_does_not_exist(void);
+ 
+ /*
+--- linux-2.6.0-test6/include/asm-um/irq.h	2003-06-14 12:18:49.000000000 -0700
++++ 25/include/asm-um/irq.h	2003-10-05 00:34:32.000000000 -0700
+@@ -1,15 +1,6 @@
+ #ifndef __UM_IRQ_H
+ #define __UM_IRQ_H
+ 
+-/* The i386 irq.h has a struct task_struct in a prototype without including
+- * sched.h.  This forward declaration kills the resulting warning.
+- */
+-struct task_struct;
+-
+-#include "asm/ptrace.h"
+-
+-#undef NR_IRQS
+-
+ #define TIMER_IRQ		0
+ #define UMN_IRQ			1
+ #define CONSOLE_IRQ		2
+@@ -28,8 +19,4 @@ struct task_struct;
+ #define LAST_IRQ XTERM_IRQ
+ #define NR_IRQS (LAST_IRQ + 1)
+ 
+-extern int um_request_irq(unsigned int irq, int fd, int type,
+-			  void (*handler)(int, void *, struct pt_regs *),
+-			  unsigned long irqflags,  const char * devname,
+-			  void *dev_id);
+ #endif
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-um/local.h	2003-10-05 00:34:32.000000000 -0700
+@@ -0,0 +1,6 @@
++#ifndef __UM_LOCAL_H
++#define __UM_LOCAL_H
++
++#include "asm/arch/local.h"
++
++#endif
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-um/module-generic.h	2003-10-05 00:34:32.000000000 -0700
+@@ -0,0 +1,6 @@
++#ifndef __UM_MODULE_GENERIC_H
++#define __UM_MODULE_GENERIC_H
++
++#include "asm/arch/module.h"
++
++#endif
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-um/module-i386.h	2003-10-05 00:34:32.000000000 -0700
+@@ -0,0 +1,13 @@
++#ifndef __UM_MODULE_I386_H
++#define __UM_MODULE_I386_H
++
++/* UML is simple */
++struct mod_arch_specific
++{
++};
++
++#define Elf_Shdr Elf32_Shdr
++#define Elf_Sym Elf32_Sym
++#define Elf_Ehdr Elf32_Ehdr
++
++#endif
+--- linux-2.6.0-test6/include/asm-um/page.h	2003-06-14 12:18:23.000000000 -0700
++++ 25/include/asm-um/page.h	2003-10-05 00:34:32.000000000 -0700
+@@ -4,7 +4,6 @@
+ struct page;
+ 
+ #include "asm/arch/page.h"
+-#include "asm/bug.h"
+ 
+ #undef __pa
+ #undef __va
+--- linux-2.6.0-test6/include/asm-um/pgtable.h	2003-06-14 12:18:52.000000000 -0700
++++ 25/include/asm-um/pgtable.h	2003-10-05 00:34:32.000000000 -0700
+@@ -69,7 +69,6 @@ extern unsigned long high_physmem;
+ 
+ #define VMALLOC_OFFSET	(__va_space)
+ #define VMALLOC_START	(((unsigned long) high_physmem + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ 
+ #ifdef CONFIG_HIGHMEM
+ # define VMALLOC_END	(PKMAP_BASE-2*PAGE_SIZE)
+@@ -79,12 +78,13 @@ extern unsigned long high_physmem;
+ 
+ #define _PAGE_PRESENT	0x001
+ #define _PAGE_NEWPAGE	0x002
+-#define _PAGE_PROTNONE	0x004	/* If not present */
+-#define _PAGE_RW	0x008
+-#define _PAGE_USER	0x010
+-#define _PAGE_ACCESSED	0x020
+-#define _PAGE_DIRTY	0x040
+-#define _PAGE_NEWPROT   0x080
++#define _PAGE_NEWPROT   0x004
++#define _PAGE_FILE	0x008   /* set:pagecache unset:swap */
++#define _PAGE_PROTNONE	0x010	/* If not present */
++#define _PAGE_RW	0x020
++#define _PAGE_USER	0x040
++#define _PAGE_ACCESSED	0x080
++#define _PAGE_DIRTY	0x100
+ 
+ #define REGION_MASK	0xf0000000
+ #define REGION_SHIFT	28
+@@ -203,6 +203,16 @@ extern unsigned long pfn_to_phys(unsigne
+ #define pfn_pte(pfn, prot) __pte(pfn_to_phys(pfn) | pgprot_val(prot))
+ #define pfn_pmd(pfn, prot) __pmd(pfn_to_phys(pfn) | pgprot_val(prot))
+ 
++/*
++ * Bits 0 through 3 are taken
++ */
++#define PTE_FILE_MAX_BITS	28
++
++#define pte_to_pgoff(pte) ((pte).pte_low >> 4)
++
++#define pgoff_to_pte(off) \
++	((pte_t) { ((off) << 4) + _PAGE_FILE })
++
+ static inline pte_t pte_mknewprot(pte_t pte)
+ {
+  	pte_val(pte) |= _PAGE_NEWPROT;
+@@ -236,6 +246,12 @@ static inline void set_pte(pte_t *pteptr
+  * The following only work if pte_present() is true.
+  * Undefined behaviour if not..
+  */
++static inline int pte_user(pte_t pte)
++{ 
++	return((pte_val(pte) & _PAGE_USER) && 
++	       !(pte_val(pte) & _PAGE_PROTNONE));
++}
++
+ static inline int pte_read(pte_t pte)
+ { 
+ 	return((pte_val(pte) & _PAGE_USER) && 
+@@ -253,6 +269,14 @@ static inline int pte_write(pte_t pte)
+ 	       !(pte_val(pte) & _PAGE_PROTNONE));
+ }
+ 
++/*
++ * The following only works if pte_present() is not true.
++ */
++static inline int pte_file(pte_t pte)
++{ 
++	return (pte).pte_low & _PAGE_FILE; 
++}
++
+ static inline int pte_dirty(pte_t pte)	{ return pte_val(pte) & _PAGE_DIRTY; }
+ static inline int pte_young(pte_t pte)	{ return pte_val(pte) & _PAGE_ACCESSED; }
+ static inline int pte_newpage(pte_t pte) { return pte_val(pte) & _PAGE_NEWPAGE; }
+@@ -355,14 +379,26 @@ static inline pte_t pte_modify(pte_t pte
+ #define pmd_page(pmd) (phys_mem_map(pmd_val(pmd) & PAGE_MASK) + \
+ 		       ((phys_addr(pmd_val(pmd)) >> PAGE_SHIFT)))
+ 
+-/* to find an entry in a page-table-directory. */
++/*
++ * the pgd page can be thought of an array like this: pgd_t[PTRS_PER_PGD]
++ *
++ * this macro returns the index of the entry in the pgd page which would
++ * control the given virtual address
++ */
+ #define pgd_index(address) ((address >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))
+ 
+-/* to find an entry in a page-table-directory */
++/*
++ * pgd_offset() returns a (pgd_t *)
++ * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
++ */
+ #define pgd_offset(mm, address) \
+ ((mm)->pgd + ((address) >> PGDIR_SHIFT))
+ 
+-/* to find an entry in a kernel page-table-directory */
++
++/*
++ * a shortcut which implies the use of the kernel's pgd, instead
++ * of a process's
++ */
+ #define pgd_offset_k(address) pgd_offset(&init_mm, address)
+ 
+ #define pmd_index(address) \
+@@ -374,7 +410,12 @@ static inline pmd_t * pmd_offset(pgd_t *
+ 	return (pmd_t *) dir;
+ }
+ 
+-/* Find an entry in the third-level page table.. */ 
++/*
++ * the pte page can be thought of an array like this: pte_t[PTRS_PER_PTE]
++ *
++ * this macro returns the index of the entry in the pte page which would
++ * control the given virtual address
++ */
+ #define pte_index(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
+ #define pte_offset_kernel(dir, address) \
+ 	((pte_t *) pmd_page_kernel(*(dir)) +  pte_index(address))
+@@ -400,11 +441,11 @@ typedef pte_t *pte_addr_t;
+ #define update_mmu_cache(vma,address,pte) do ; while (0)
+ 
+ /* Encode and de-code a swap entry */
+-#define __swp_type(x)			(((x).val >> 3) & 0x7f)
+-#define __swp_offset(x)			((x).val >> 10)
++#define __swp_type(x)			(((x).val >> 4) & 0x3f)
++#define __swp_offset(x)			((x).val >> 11)
+ 
+ #define __swp_entry(type, offset) \
+-	((swp_entry_t) { ((type) << 3) | ((offset) << 10) })
++	((swp_entry_t) { ((type) << 4) | ((offset) << 11) })
+ #define __pte_to_swp_entry(pte) \
+ 	((swp_entry_t) { pte_val(pte_mkuptodate(pte)) })
+ #define __swp_entry_to_pte(x)		((pte_t) { (x).val })
+--- linux-2.6.0-test6/include/asm-um/processor-generic.h	2003-06-14 12:17:59.000000000 -0700
++++ 25/include/asm-um/processor-generic.h	2003-10-05 00:34:32.000000000 -0700
+@@ -11,9 +11,7 @@ struct pt_regs;
+ struct task_struct;
+ 
+ #include "linux/config.h"
+-#include "linux/signal.h"
+ #include "asm/ptrace.h"
+-#include "asm/siginfo.h"
+ #include "choose-mode.h"
+ 
+ struct mm_struct;
+@@ -101,14 +99,19 @@ typedef struct {
+ } mm_segment_t;
+ 
+ extern struct task_struct *alloc_task_struct(void);
+-extern void free_task_struct(struct task_struct *task);
+ 
+ extern void release_thread(struct task_struct *);
+ extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
+ extern void dump_thread(struct pt_regs *regs, struct user *u);
++extern void prepare_to_copy(struct task_struct *tsk);
+ 
+ extern unsigned long thread_saved_pc(struct task_struct *t);
+ 
++static inline void mm_copy_segments(struct mm_struct *from_mm, 
++				    struct mm_struct *new_mm)
++{
++}
++
+ #define init_stack	(init_thread_union.stack)
+ 
+ /*
+--- linux-2.6.0-test6/include/asm-um/processor-i386.h	2003-06-14 12:17:57.000000000 -0700
++++ 25/include/asm-um/processor-i386.h	2003-10-05 00:34:32.000000000 -0700
+@@ -6,8 +6,8 @@
+ #ifndef __UM_PROCESSOR_I386_H
+ #define __UM_PROCESSOR_I386_H
+ 
+-extern int cpu_has_xmm;
+-extern int cpu_has_cmov;
++extern int host_has_xmm;
++extern int host_has_cmov;
+ 
+ struct arch_thread {
+ 	unsigned long debugregs[8];
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/asm-um/sections.h	2003-10-05 00:34:32.000000000 -0700
+@@ -0,0 +1,7 @@
++#ifndef _UM_SECTIONS_H
++#define _UM_SECTIONS_H
++
++/* nothing to see, move along */
++#include <asm-generic/sections.h>
++
++#endif
+--- linux-2.6.0-test6/include/asm-um/smp.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/include/asm-um/smp.h	2003-10-05 00:34:32.000000000 -0700
+@@ -10,7 +10,7 @@
+ 
+ extern cpumask_t cpu_online_map;
+ 
+-#define smp_processor_id() (current->thread_info->cpu)
++#define smp_processor_id() (current_thread->cpu)
+ #define cpu_logical_map(n) (n)
+ #define cpu_number_map(n) (n)
+ #define PROC_CHANGE_PENALTY	15 /* Pick a number, any number */
+--- linux-2.6.0-test6/include/asm-um/system-generic.h	2003-06-14 12:18:51.000000000 -0700
++++ 25/include/asm-um/system-generic.h	2003-10-05 00:34:32.000000000 -0700
+@@ -23,8 +23,10 @@ extern int get_signals(void);
+ extern void block_signals(void);
+ extern void unblock_signals(void);
+ 
+-#define local_save_flags(flags) do { (flags) = get_signals(); } while(0)
+-#define local_irq_restore(flags) do { set_signals(flags); } while(0)
++#define local_save_flags(flags) do { typecheck(unsigned long, flags); \
++				     (flags) = get_signals(); } while(0)
++#define local_irq_restore(flags) do { typecheck(unsigned long, flags); \
++				      set_signals(flags); } while(0)
+ 
+ #define local_irq_save(flags) do { local_save_flags(flags); \
+                                    local_irq_disable(); } while(0)
+@@ -39,4 +41,7 @@ extern void unblock_signals(void);
+         (flags == 0);                   \
+ })
+ 
++extern void *_switch_to(void *prev, void *next, void *last);
++#define switch_to(prev, next, last) prev = _switch_to(prev, next, last)
++
+ #endif
+--- linux-2.6.0-test6/include/asm-um/thread_info.h	2003-06-14 12:18:06.000000000 -0700
++++ 25/include/asm-um/thread_info.h	2003-10-05 00:34:32.000000000 -0700
+@@ -9,6 +9,7 @@
+ #ifndef __ASSEMBLY__
+ 
+ #include <asm/processor.h>
++#include <asm/types.h>
+ 
+ struct thread_info {
+ 	struct task_struct	*task;		/* main task structure */
+@@ -43,15 +44,18 @@ struct thread_info {
+ static inline struct thread_info *current_thread_info(void)
+ {
+ 	struct thread_info *ti;
+-	__asm__("andl %%esp,%0; ":"=r" (ti) : "0" (~16383UL));
++	unsigned long mask = PAGE_SIZE * 
++		(1 << CONFIG_KERNEL_STACK_ORDER) - 1;
++	__asm__("andl %%esp,%0; ":"=r" (ti) : "0" (~mask));
+ 	return ti;
+ }
+ 
+ /* thread information allocation */
+-#define THREAD_SIZE (4*PAGE_SIZE)
+-#define alloc_thread_info(tsk) ((struct thread_info *) \
+-	__get_free_pages(GFP_KERNEL,2))
+-#define free_thread_info(ti) free_pages((unsigned long) (ti), 2)
++#define THREAD_SIZE ((1 << CONFIG_KERNEL_STACK_ORDER) * PAGE_SIZE)
++#define alloc_thread_info(tsk) \
++	((struct thread_info *) kmalloc(THREAD_SIZE, GFP_KERNEL))
++#define free_thread_info(ti) kfree(ti)
++	
+ #define get_thread_info(ti) get_task_struct((ti)->task)
+ #define put_thread_info(ti) put_task_struct((ti)->task)
+ 
+@@ -65,11 +69,13 @@ static inline struct thread_info *curren
+ #define TIF_POLLING_NRFLAG      3       /* true if poll_idle() is polling 
+ 					 * TIF_NEED_RESCHED 
+ 					 */
++#define TIF_RESTART_BLOCK 	4
+ 
+ #define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)
+ #define _TIF_SIGPENDING		(1 << TIF_SIGPENDING)
+ #define _TIF_NEED_RESCHED	(1 << TIF_NEED_RESCHED)
+ #define _TIF_POLLING_NRFLAG     (1 << TIF_POLLING_NRFLAG)
++#define _TIF_RESTART_BLOCK	(1 << TIF_RESTART_BLOCK)
+ 
+ #endif
+ 
+--- linux-2.6.0-test6/include/asm-um/timex.h	2003-06-14 12:18:24.000000000 -0700
++++ 25/include/asm-um/timex.h	2003-10-05 00:34:32.000000000 -0700
+@@ -1,8 +1,6 @@
+ #ifndef __UM_TIMEX_H
+ #define __UM_TIMEX_H
+ 
+-#include "linux/time.h"
+-
+ typedef unsigned long cycles_t;
+ 
+ #define cacheflush_time (0)
+--- linux-2.6.0-test6/include/asm-v850/cacheflush.h	2003-07-27 12:14:40.000000000 -0700
++++ 25/include/asm-v850/cacheflush.h	2003-10-05 00:33:24.000000000 -0700
+@@ -27,6 +27,8 @@
+ #define flush_cache_range(vma, start, end)	((void)0)
+ #define flush_cache_page(vma, vmaddr)		((void)0)
+ #define flush_dcache_page(page)			((void)0)
++#define flush_cache_vmap(start, end)		((void)0)
++#define flush_cache_vunmap(start, end)		((void)0)
+ 
+ #ifdef CONFIG_NO_CACHE
+ 
+@@ -55,5 +57,11 @@ extern void flush_cache_sigtramp (unsign
+ 
+ #endif /* CONFIG_NO_CACHE */
+ 
++#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
++do { memcpy(dst, src, len); \
++     flush_icache_user_range(vma, page, vaddr, len); \
++} while (0)
++#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
+ 
+ #endif /* __V850_CACHEFLUSH_H__ */
+--- linux-2.6.0-test6/include/asm-x86_64/cacheflush.h	2003-06-14 12:17:59.000000000 -0700
++++ 25/include/asm-x86_64/cacheflush.h	2003-10-05 00:33:24.000000000 -0700
+@@ -13,6 +13,13 @@
+ #define flush_icache_range(start, end)		do { } while (0)
+ #define flush_icache_page(vma,pg)		do { } while (0)
+ #define flush_icache_user_range(vma,pg,adr,len)	do { } while (0)
++#define flush_cache_vmap(start, end)		do { } while (0)
++#define flush_cache_vunmap(start, end)		do { } while (0)
++
++#define copy_to_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
++#define copy_from_user_page(vma, page, vaddr, dst, src, len) \
++	memcpy(dst, src, len)
+ 
+ void global_flush_tlb(void); 
+ int change_page_attr(struct page *page, int numpages, pgprot_t prot);
+--- linux-2.6.0-test6/include/asm-x86_64/elf.h	2003-06-14 12:18:30.000000000 -0700
++++ 25/include/asm-x86_64/elf.h	2003-10-05 00:33:24.000000000 -0700
+@@ -150,11 +150,6 @@ extern int dump_task_fpu (struct task_st
+ #define ELF_CORE_COPY_TASK_REGS(tsk, elf_regs) dump_task_regs(tsk, elf_regs)
+ #define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) dump_task_fpu(tsk, elf_fpregs)
+ 
+-#ifdef CONFIG_SMP
+-extern void dump_smp_unlazy_fpu(void);
+-#define ELF_CORE_SYNC dump_smp_unlazy_fpu
+-#endif
+-
+ #endif
+ 
+ #endif
+--- linux-2.6.0-test6/include/asm-x86_64/mmzone.h	2003-07-10 18:50:32.000000000 -0700
++++ 25/include/asm-x86_64/mmzone.h	2003-10-05 00:34:38.000000000 -0700
+@@ -10,7 +10,6 @@
+ 
+ #define VIRTUAL_BUG_ON(x) 
+ 
+-#include <asm/numnodes.h>
+ #include <asm/smp.h>
+ 
+ #define MAXNODE 8 
+--- linux-2.6.0-test6/include/asm-x86_64/numnodes.h	2003-06-14 12:18:08.000000000 -0700
++++ 25/include/asm-x86_64/numnodes.h	2003-10-05 00:34:38.000000000 -0700
+@@ -3,10 +3,7 @@
+ 
+ #include <linux/config.h>
+ 
+-#ifdef CONFIG_DISCONTIGMEM
+-#define MAX_NUMNODES 8	/* APIC limit currently */
+-#else
+-#define MAX_NUMNODES 1
+-#endif
++/* Max 8 Nodes - APIC limit currently */
++#define NODES_SHIFT	3
+ 
+ #endif
+--- linux-2.6.0-test6/include/asm-x86_64/pgtable.h	2003-07-02 14:53:18.000000000 -0700
++++ 25/include/asm-x86_64/pgtable.h	2003-10-05 00:33:24.000000000 -0700
+@@ -126,7 +126,6 @@ static inline void set_pml4(pml4_t *dst,
+ #ifndef __ASSEMBLY__
+ #define VMALLOC_START    0xffffff0000000000
+ #define VMALLOC_END      0xffffff7fffffffff
+-#define VMALLOC_VMADDR(x) ((unsigned long)(x))
+ #define MODULES_VADDR    0xffffffffa0000000
+ #define MODULES_END      0xffffffffafffffff
+ #define MODULES_LEN   (MODULES_END - MODULES_VADDR)
+--- linux-2.6.0-test6/include/linux/acpi.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/include/linux/acpi.h	2003-10-05 00:33:24.000000000 -0700
+@@ -424,17 +424,17 @@ int ec_write(u8 addr, u8 val);
+ 
+ #endif /*CONFIG_ACPI_EC*/
+ 
+-#ifdef CONFIG_ACPI
++#ifdef CONFIG_ACPI_INTERPRETER
+ 
+ int acpi_blacklisted(void);
+ 
+-#else
++#else /*!CONFIG_ACPI_INTERPRETER*/
+ 
+ static inline int acpi_blacklisted(void)
+ {
+ 	return 0;
+ }
+ 
+-#endif /*CONFIG_ACPI*/
++#endif /*!CONFIG_ACPI_INTERPRETER*/
+ 
+ #endif /*_LINUX_ACPI_H*/
+--- linux-2.6.0-test6/include/linux/aio.h	2003-06-26 22:07:26.000000000 -0700
++++ 25/include/linux/aio.h	2003-10-05 00:37:05.000000000 -0700
+@@ -29,21 +29,26 @@ struct kioctx;
+ #define KIF_LOCKED		0
+ #define KIF_KICKED		1
+ #define KIF_CANCELLED		2
++#define KIF_SYNCED		3
+ 
+ #define kiocbTryLock(iocb)	test_and_set_bit(KIF_LOCKED, &(iocb)->ki_flags)
+ #define kiocbTryKick(iocb)	test_and_set_bit(KIF_KICKED, &(iocb)->ki_flags)
++#define kiocbTrySync(iocb)	test_and_set_bit(KIF_SYNCED, &(iocb)->ki_flags)
+ 
+ #define kiocbSetLocked(iocb)	set_bit(KIF_LOCKED, &(iocb)->ki_flags)
+ #define kiocbSetKicked(iocb)	set_bit(KIF_KICKED, &(iocb)->ki_flags)
+ #define kiocbSetCancelled(iocb)	set_bit(KIF_CANCELLED, &(iocb)->ki_flags)
++#define kiocbSetSynced(iocb)	set_bit(KIF_SYNCED, &(iocb)->ki_flags)
+ 
+ #define kiocbClearLocked(iocb)	clear_bit(KIF_LOCKED, &(iocb)->ki_flags)
+ #define kiocbClearKicked(iocb)	clear_bit(KIF_KICKED, &(iocb)->ki_flags)
+ #define kiocbClearCancelled(iocb)	clear_bit(KIF_CANCELLED, &(iocb)->ki_flags)
++#define kiocbClearSynced(iocb)	clear_bit(KIF_SYNCED, &(iocb)->ki_flags)
+ 
+ #define kiocbIsLocked(iocb)	test_bit(KIF_LOCKED, &(iocb)->ki_flags)
+ #define kiocbIsKicked(iocb)	test_bit(KIF_KICKED, &(iocb)->ki_flags)
+ #define kiocbIsCancelled(iocb)	test_bit(KIF_CANCELLED, &(iocb)->ki_flags)
++#define kiocbIsSynced(iocb)	test_bit(KIF_SYNCED, &(iocb)->ki_flags)
+ 
+ struct kiocb {
+ 	struct list_head	ki_run_list;
+@@ -54,7 +59,7 @@ struct kiocb {
+ 	struct file		*ki_filp;
+ 	struct kioctx		*ki_ctx;	/* may be NULL for sync ops */
+ 	int			(*ki_cancel)(struct kiocb *, struct io_event *);
+-	long			(*ki_retry)(struct kiocb *);
++	ssize_t			(*ki_retry)(struct kiocb *);
+ 
+ 	struct list_head	ki_list;	/* the aio core uses this
+ 						 * for cancellation */
+@@ -63,6 +68,16 @@ struct kiocb {
+ 	__u64			ki_user_data;	/* user's data for completion */
+ 	loff_t			ki_pos;
+ 
++	/* State that we remember to be able to restart/retry  */
++	unsigned short		ki_opcode;
++	size_t			ki_nbytes; 	/* copy of iocb->aio_nbytes */
++	char 			*ki_buf;	/* remaining iocb->aio_buf */
++	size_t			ki_left; 	/* remaining bytes */
++	wait_queue_t		ki_wait;
++	long			ki_retried; 	/* just for testing */
++	long			ki_kicked; 	/* just for testing */
++	long			ki_queued; 	/* just for testing */
++
+ 	char			private[KIOCB_PRIVATE_SIZE];
+ };
+ 
+@@ -77,6 +92,8 @@ struct kiocb {
+ 		(x)->ki_ctx = &tsk->active_mm->default_kioctx;	\
+ 		(x)->ki_cancel = NULL;			\
+ 		(x)->ki_user_obj = tsk;			\
++		(x)->ki_user_data = 0;			\
++		init_wait((&(x)->ki_wait));		\
+ 	} while (0)
+ 
+ #define AIO_RING_MAGIC			0xa10a10a1
+@@ -159,6 +176,17 @@ int FASTCALL(io_submit_one(struct kioctx
+ #define get_ioctx(kioctx)	do { if (unlikely(atomic_read(&(kioctx)->users) <= 0)) BUG(); atomic_inc(&(kioctx)->users); } while (0)
+ #define put_ioctx(kioctx)	do { if (unlikely(atomic_dec_and_test(&(kioctx)->users))) __put_ioctx(kioctx); else if (unlikely(atomic_read(&(kioctx)->users) < 0)) BUG(); } while (0)
+ 
++#define in_aio() !is_sync_wait(current->io_wait)
++/* may be used for debugging */
++#define warn_if_async()	if (in_aio()) {\
++	printk(KERN_ERR "%s(%s:%d) called in async context!\n", \
++	__FUNCTION__, __FILE__, __LINE__); \
++	dump_stack(); \
++	}
++
++#define io_wait_to_kiocb(wait) container_of(wait, struct kiocb, ki_wait)
++#define is_retried_kiocb(iocb) ((iocb)->ki_retried > 1)
++
+ #include <linux/aio_abi.h>
+ 
+ static inline struct kiocb *list_kiocb(struct list_head *h)
+--- linux-2.6.0-test6/include/linux/blkdev.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/linux/blkdev.h	2003-10-05 00:36:58.000000000 -0700
+@@ -585,6 +585,7 @@ extern void blk_queue_free_tags(request_
+ extern int blk_queue_resize_tags(request_queue_t *, int);
+ extern void blk_queue_invalidate_tags(request_queue_t *);
+ extern void blk_congestion_wait(int rw, long timeout);
++extern int blk_congestion_wait_wq(int rw, long timeout, wait_queue_t *wait);
+ 
+ extern void blk_rq_bio_prep(request_queue_t *, struct request *, struct bio *);
+ extern void blk_rq_prep_restart(struct request *);
+--- linux-2.6.0-test6/include/linux/buffer_head.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/include/linux/buffer_head.h	2003-10-05 00:37:00.000000000 -0700
+@@ -162,6 +162,7 @@ void mark_buffer_async_write(struct buff
+ void invalidate_bdev(struct block_device *, int);
+ int sync_blockdev(struct block_device *bdev);
+ void __wait_on_buffer(struct buffer_head *);
++int __wait_on_buffer_wq(struct buffer_head *, wait_queue_t *wait);
+ wait_queue_head_t *bh_waitq_head(struct buffer_head *bh);
+ void wake_up_buffer(struct buffer_head *bh);
+ int fsync_bdev(struct block_device *);
+@@ -173,6 +174,8 @@ void __brelse(struct buffer_head *);
+ void __bforget(struct buffer_head *);
+ void __breadahead(struct block_device *, sector_t block, int size);
+ struct buffer_head *__bread(struct block_device *, sector_t block, int size);
++struct buffer_head *__bread_wq(struct block_device *, sector_t block,
++	int size, wait_queue_t *wait);
+ struct buffer_head *alloc_buffer_head(int gfp_flags);
+ void free_buffer_head(struct buffer_head * bh);
+ void FASTCALL(unlock_buffer(struct buffer_head *bh));
+@@ -207,12 +210,6 @@ int nobh_prepare_write(struct page*, uns
+ int nobh_commit_write(struct file *, struct page *, unsigned, unsigned);
+ int nobh_truncate_page(struct address_space *, loff_t);
+ 
+-#define OSYNC_METADATA	(1<<0)
+-#define OSYNC_DATA	(1<<1)
+-#define OSYNC_INODE	(1<<2)
+-int generic_osync_inode(struct inode *, int);
+-
+-
+ /*
+  * inline definitions
+  */
+@@ -230,13 +227,13 @@ static inline void put_bh(struct buffer_
+ 
+ static inline void brelse(struct buffer_head *bh)
+ {
+-	if (bh)
++	if (bh && !IS_ERR(bh))
+ 		__brelse(bh);
+ }
+ 
+ static inline void bforget(struct buffer_head *bh)
+ {
+-	if (bh)
++	if (bh && !IS_ERR(bh))
+ 		__bforget(bh);
+ }
+ 
+@@ -253,7 +250,12 @@ sb_breadahead(struct super_block *sb, se
+ }
+ 
+ static inline struct buffer_head *
+-sb_getblk(struct super_block *sb, sector_t block)
++sb_bread_wq(struct super_block *sb, sector_t block, wait_queue_t *wait)
++{
++	return __bread_wq(sb->s_bdev, block, sb->s_blocksize, wait);
++}
++
++static inline struct buffer_head *sb_getblk(struct super_block *sb, sector_t block)
+ {
+ 	return __getblk(sb->s_bdev, block, sb->s_blocksize);
+ }
+@@ -277,16 +279,34 @@ map_bh(struct buffer_head *bh, struct su
+  * __wait_on_buffer() just to trip a debug check.  Because debug code in inline
+  * functions is bloaty.
+  */
+-static inline void wait_on_buffer(struct buffer_head *bh)
++
++static inline int wait_on_buffer_wq(struct buffer_head *bh, wait_queue_t *wait)
+ {
+ 	if (buffer_locked(bh) || atomic_read(&bh->b_count) == 0)
+-		__wait_on_buffer(bh);
++		return __wait_on_buffer_wq(bh, wait);
++
++	return 0;
++}
++
++static inline void wait_on_buffer(struct buffer_head *bh)
++{
++	wait_on_buffer_wq(bh, NULL);
++}
++
++static inline int lock_buffer_wq(struct buffer_head *bh, wait_queue_t *wait)
++{
++	while (test_set_buffer_locked(bh)) {
++		int ret = __wait_on_buffer_wq(bh, wait);
++		if (ret)
++			return ret;
++	}
++
++	return 0;
+ }
+ 
+ static inline void lock_buffer(struct buffer_head *bh)
+ {
+-	while (test_set_buffer_locked(bh))
+-		__wait_on_buffer(bh);
++	lock_buffer_wq(bh, NULL);
+ }
+ 
+ #endif /* _LINUX_BUFFER_HEAD_H */
+--- linux-2.6.0-test6/include/linux/cdrom.h	2003-07-02 14:53:18.000000000 -0700
++++ 25/include/linux/cdrom.h	2003-10-05 00:33:59.000000000 -0700
+@@ -743,6 +743,7 @@ struct cdrom_device_info {
+ /* per-device flags */
+         __u8 sanyo_slot		: 2;	/* Sanyo 3 CD changer support */
+         __u8 reserved		: 6;	/* not used yet */
++	int for_data;
+ 	struct cdrom_write_settings write;
+ };
+ 
+@@ -776,9 +777,9 @@ struct cdrom_device_ops {
+ };
+ 
+ /* the general block_device operations structure: */
+-extern int cdrom_open(struct cdrom_device_info *, struct inode *, struct file *);
+-extern int cdrom_release(struct cdrom_device_info *, struct file *);
+-extern int cdrom_ioctl(struct cdrom_device_info *, struct inode *, unsigned, unsigned long);
++extern int cdrom_open(struct cdrom_device_info *, struct block_device *, struct file *);
++extern int cdrom_release(struct cdrom_device_info *);
++extern int cdrom_ioctl(struct cdrom_device_info *, struct block_device *, unsigned, unsigned long);
+ extern int cdrom_media_changed(struct cdrom_device_info *);
+ 
+ extern int register_cdrom(struct cdrom_device_info *cdi);
+--- linux-2.6.0-test6/include/linux/compat.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/include/linux/compat.h	2003-10-05 00:34:44.000000000 -0700
+@@ -90,5 +90,12 @@ struct compat_statfs64 {
+ 	__u32 f_spare[5];
+ };
+ 
++struct compat_dirent {
++	u32		d_ino;
++	compat_off_t	d_off;
++	u16		d_reclen;
++	char		d_name[256];
++};
++
+ #endif /* CONFIG_COMPAT */
+ #endif /* _LINUX_COMPAT_H */
+--- linux-2.6.0-test6/include/linux/compat_ioctl.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/linux/compat_ioctl.h	2003-10-05 00:33:24.000000000 -0700
+@@ -68,7 +68,7 @@ COMPATIBLE_IOCTL(HDIO_SET_MULTCOUNT)
+ COMPATIBLE_IOCTL(HDIO_DRIVE_CMD)
+ COMPATIBLE_IOCTL(HDIO_SET_PIO_MODE)
+ COMPATIBLE_IOCTL(HDIO_SET_NICE)
+-#ifndef CONFIG_ARCH_S390
++#ifdef CONFIG_BLK_DEV_FD
+ /* 0x02 -- Floppy ioctls */
+ COMPATIBLE_IOCTL(FDMSGON)
+ COMPATIBLE_IOCTL(FDMSGOFF)
+--- linux-2.6.0-test6/include/linux/compiler-gcc.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/linux/compiler-gcc.h	2003-10-05 00:34:18.000000000 -0700
+@@ -13,5 +13,5 @@
+    shouldn't recognize the original var, and make assumptions about it */
+ #define RELOC_HIDE(ptr, off)					\
+   ({ unsigned long __ptr;					\
+-    __asm__ ("" : "=g"(__ptr) : "0"(ptr));		\
++	__asm__ ("" : "=r"(__ptr) : "0"(ptr));			\
+     (typeof(ptr)) (__ptr + (off)); })
+--- linux-2.6.0-test6/include/linux/config.h	2003-06-26 22:07:26.000000000 -0700
++++ 25/include/linux/config.h	2003-10-05 00:33:43.000000000 -0700
+@@ -2,5 +2,8 @@
+ #define _LINUX_CONFIG_H
+ 
+ #include <linux/autoconf.h>
++#if defined(__i386__) && !defined(IN_BOOTLOADER)
++#include <asm/kgdb.h>
++#endif
+ 
+ #endif
+--- linux-2.6.0-test6/include/linux/dqblk_xfs.h	2003-06-14 12:18:29.000000000 -0700
++++ 25/include/linux/dqblk_xfs.h	2003-10-05 00:33:24.000000000 -0700
+@@ -105,15 +105,6 @@ typedef struct fs_disk_quota {
+ #define FS_DQ_TIMER_MASK	(FS_DQ_BTIMER | FS_DQ_ITIMER | FS_DQ_RTBTIMER)
+ 
+ /*
+- * The following constants define the default amount of time given a user
+- * before the soft limits are treated as hard limits (usually resulting
+- * in an allocation failure).  These may be modified by the quotactl(2)
+- * system call with the Q_XSETQLIM command.
+- */
+-#define	DQ_FTIMELIMIT	(7 * 24*60*60)		/* 1 week */
+-#define	DQ_BTIMELIMIT	(7 * 24*60*60)		/* 1 week */
+-
+-/*
+  * Various flags related to quotactl(2).  Only relevant to XFS filesystems.
+  */
+ #define XFS_QUOTA_UDQ_ACCT	(1<<0)  /* user quota accounting */
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/linux/dwarf2.h	2003-10-05 00:33:38.000000000 -0700
+@@ -0,0 +1,738 @@
++/* Declarations and definitions of codes relating to the DWARF2 symbolic
++   debugging information format.
++   Copyright (C) 1992, 1993, 1995, 1996, 1997, 1999, 2000, 2001, 2002
++   Free Software Foundation, Inc.
++
++   Written by Gary Funck (gary@intrepid.com) The Ada Joint Program
++   Office (AJPO), Florida State Unviversity and Silicon Graphics Inc.
++   provided support for this effort -- June 21, 1995.
++
++   Derived from the DWARF 1 implementation written by Ron Guilmette
++   (rfg@netcom.com), November 1990.
++
++   This file is part of GCC.
++
++   GCC is free software; you can redistribute it and/or modify it under
++   the terms of the GNU General Public License as published by the Free
++   Software Foundation; either version 2, or (at your option) any later
++   version.
++
++   GCC is distributed in the hope that it will be useful, but WITHOUT
++   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
++   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
++   License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with GCC; see the file COPYING.  If not, write to the Free
++   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
++   02111-1307, USA.  */
++
++/* This file is derived from the DWARF specification (a public document)
++   Revision 2.0.0 (July 27, 1993) developed by the UNIX International
++   Programming Languages Special Interest Group (UI/PLSIG) and distributed
++   by UNIX International.  Copies of this specification are available from
++   UNIX International, 20 Waterview Boulevard, Parsippany, NJ, 07054.
++
++   This file also now contains definitions from the DWARF 3 specification.  */
++
++/* This file is shared between GCC and GDB, and should not contain
++   prototypes.	*/
++
++#ifndef _ELF_DWARF2_H
++#define _ELF_DWARF2_H
++
++/* Structure found in the .debug_line section.	*/
++#ifndef __ASSEMBLY__
++typedef struct
++{
++  unsigned char li_length	   [4];
++  unsigned char li_version	   [2];
++  unsigned char li_prologue_length [4];
++  unsigned char li_min_insn_length [1];
++  unsigned char li_default_is_stmt [1];
++  unsigned char li_line_base	   [1];
++  unsigned char li_line_range	   [1];
++  unsigned char li_opcode_base	   [1];
++}
++DWARF2_External_LineInfo;
++
++typedef struct
++{
++  unsigned long  li_length;
++  unsigned short li_version;
++  unsigned int	 li_prologue_length;
++  unsigned char  li_min_insn_length;
++  unsigned char  li_default_is_stmt;
++  int		 li_line_base;
++  unsigned char  li_line_range;
++  unsigned char  li_opcode_base;
++}
++DWARF2_Internal_LineInfo;
++
++/* Structure found in .debug_pubnames section.	*/
++typedef struct
++{
++  unsigned char pn_length  [4];
++  unsigned char pn_version [2];
++  unsigned char pn_offset  [4];
++  unsigned char pn_size    [4];
++}
++DWARF2_External_PubNames;
++
++typedef struct
++{
++  unsigned long  pn_length;
++  unsigned short pn_version;
++  unsigned long  pn_offset;
++  unsigned long  pn_size;
++}
++DWARF2_Internal_PubNames;
++
++/* Structure found in .debug_info section.  */
++typedef struct
++{
++  unsigned char  cu_length	  [4];
++  unsigned char  cu_version	  [2];
++  unsigned char  cu_abbrev_offset [4];
++  unsigned char  cu_pointer_size  [1];
++}
++DWARF2_External_CompUnit;
++
++typedef struct
++{
++  unsigned long  cu_length;
++  unsigned short cu_version;
++  unsigned long  cu_abbrev_offset;
++  unsigned char  cu_pointer_size;
++}
++DWARF2_Internal_CompUnit;
++
++typedef struct
++{
++  unsigned char  ar_length	 [4];
++  unsigned char  ar_version	 [2];
++  unsigned char  ar_info_offset  [4];
++  unsigned char  ar_pointer_size [1];
++  unsigned char  ar_segment_size [1];
++}
++DWARF2_External_ARange;
++
++typedef struct
++{
++  unsigned long  ar_length;
++  unsigned short ar_version;
++  unsigned long  ar_info_offset;
++  unsigned char  ar_pointer_size;
++  unsigned char  ar_segment_size;
++}
++DWARF2_Internal_ARange;
++
++#define ENUM(name) enum name {
++#define IF_NOT_ASM(a) a
++#define COMMA ,
++#else
++#define ENUM(name)
++#define IF_NOT_ASM(a)
++#define COMMA
++
++#endif
++
++/* Tag names and codes.  */
++ENUM(dwarf_tag)
++
++    DW_TAG_padding = 0x00 COMMA
++    DW_TAG_array_type = 0x01 COMMA
++    DW_TAG_class_type = 0x02 COMMA
++    DW_TAG_entry_point = 0x03 COMMA
++    DW_TAG_enumeration_type = 0x04 COMMA
++    DW_TAG_formal_parameter = 0x05 COMMA
++    DW_TAG_imported_declaration = 0x08 COMMA
++    DW_TAG_label = 0x0a COMMA
++    DW_TAG_lexical_block = 0x0b COMMA
++    DW_TAG_member = 0x0d COMMA
++    DW_TAG_pointer_type = 0x0f COMMA
++    DW_TAG_reference_type = 0x10 COMMA
++    DW_TAG_compile_unit = 0x11 COMMA
++    DW_TAG_string_type = 0x12 COMMA
++    DW_TAG_structure_type = 0x13 COMMA
++    DW_TAG_subroutine_type = 0x15 COMMA
++    DW_TAG_typedef = 0x16 COMMA
++    DW_TAG_union_type = 0x17 COMMA
++    DW_TAG_unspecified_parameters = 0x18 COMMA
++    DW_TAG_variant = 0x19 COMMA
++    DW_TAG_common_block = 0x1a COMMA
++    DW_TAG_common_inclusion = 0x1b COMMA
++    DW_TAG_inheritance = 0x1c COMMA
++    DW_TAG_inlined_subroutine = 0x1d COMMA
++    DW_TAG_module = 0x1e COMMA
++    DW_TAG_ptr_to_member_type = 0x1f COMMA
++    DW_TAG_set_type = 0x20 COMMA
++    DW_TAG_subrange_type = 0x21 COMMA
++    DW_TAG_with_stmt = 0x22 COMMA
++    DW_TAG_access_declaration = 0x23 COMMA
++    DW_TAG_base_type = 0x24 COMMA
++    DW_TAG_catch_block = 0x25 COMMA
++    DW_TAG_const_type = 0x26 COMMA
++    DW_TAG_constant = 0x27 COMMA
++    DW_TAG_enumerator = 0x28 COMMA
++    DW_TAG_file_type = 0x29 COMMA
++    DW_TAG_friend = 0x2a COMMA
++    DW_TAG_namelist = 0x2b COMMA
++    DW_TAG_namelist_item = 0x2c COMMA
++    DW_TAG_packed_type = 0x2d COMMA
++    DW_TAG_subprogram = 0x2e COMMA
++    DW_TAG_template_type_param = 0x2f COMMA
++    DW_TAG_template_value_param = 0x30 COMMA
++    DW_TAG_thrown_type = 0x31 COMMA
++    DW_TAG_try_block = 0x32 COMMA
++    DW_TAG_variant_part = 0x33 COMMA
++    DW_TAG_variable = 0x34 COMMA
++    DW_TAG_volatile_type = 0x35 COMMA
++    /* DWARF 3.  */
++    DW_TAG_dwarf_procedure = 0x36 COMMA
++    DW_TAG_restrict_type = 0x37 COMMA
++    DW_TAG_interface_type = 0x38 COMMA
++    DW_TAG_namespace = 0x39 COMMA
++    DW_TAG_imported_module = 0x3a COMMA
++    DW_TAG_unspecified_type = 0x3b COMMA
++    DW_TAG_partial_unit = 0x3c COMMA
++    DW_TAG_imported_unit = 0x3d COMMA
++    /* SGI/MIPS Extensions.  */
++    DW_TAG_MIPS_loop = 0x4081 COMMA
++    /* GNU extensions.	*/
++    DW_TAG_format_label = 0x4101 COMMA	/* For FORTRAN 77 and Fortran 90.  */
++    DW_TAG_function_template = 0x4102 COMMA	/* For C++.  */
++    DW_TAG_class_template = 0x4103 COMMA	/* For C++.  */
++    DW_TAG_GNU_BINCL = 0x4104 COMMA
++    DW_TAG_GNU_EINCL = 0x4105 COMMA
++    /* Extensions for UPC.  See: http://upc.gwu.edu/~upc.  */
++    DW_TAG_upc_shared_type = 0x8765 COMMA
++    DW_TAG_upc_strict_type = 0x8766 COMMA
++    DW_TAG_upc_relaxed_type = 0x8767
++IF_NOT_ASM(};)
++
++#define DW_TAG_lo_user	0x4080
++#define DW_TAG_hi_user	0xffff
++
++/* Flag that tells whether entry has a child or not.  */
++#define DW_children_no	 0
++#define	DW_children_yes  1
++
++/* Form names and codes.  */
++ENUM(dwarf_form)
++
++    DW_FORM_addr = 0x01 COMMA
++    DW_FORM_block2 = 0x03 COMMA
++    DW_FORM_block4 = 0x04 COMMA
++    DW_FORM_data2 = 0x05 COMMA
++    DW_FORM_data4 = 0x06 COMMA
++    DW_FORM_data8 = 0x07 COMMA
++    DW_FORM_string = 0x08 COMMA
++    DW_FORM_block = 0x09 COMMA
++    DW_FORM_block1 = 0x0a COMMA
++    DW_FORM_data1 = 0x0b COMMA
++    DW_FORM_flag = 0x0c COMMA
++    DW_FORM_sdata = 0x0d COMMA
++    DW_FORM_strp = 0x0e COMMA
++    DW_FORM_udata = 0x0f COMMA
++    DW_FORM_ref_addr = 0x10 COMMA
++    DW_FORM_ref1 = 0x11 COMMA
++    DW_FORM_ref2 = 0x12 COMMA
++    DW_FORM_ref4 = 0x13 COMMA
++    DW_FORM_ref8 = 0x14 COMMA
++    DW_FORM_ref_udata = 0x15 COMMA
++    DW_FORM_indirect = 0x16
++IF_NOT_ASM(};)
++
++/* Attribute names and codes.  */
++
++ENUM(dwarf_attribute)
++
++    DW_AT_sibling = 0x01 COMMA
++    DW_AT_location = 0x02 COMMA
++    DW_AT_name = 0x03 COMMA
++    DW_AT_ordering = 0x09 COMMA
++    DW_AT_subscr_data = 0x0a COMMA
++    DW_AT_byte_size = 0x0b COMMA
++    DW_AT_bit_offset = 0x0c COMMA
++    DW_AT_bit_size = 0x0d COMMA
++    DW_AT_element_list = 0x0f COMMA
++    DW_AT_stmt_list = 0x10 COMMA
++    DW_AT_low_pc = 0x11 COMMA
++    DW_AT_high_pc = 0x12 COMMA
++    DW_AT_language = 0x13 COMMA
++    DW_AT_member = 0x14 COMMA
++    DW_AT_discr = 0x15 COMMA
++    DW_AT_discr_value = 0x16 COMMA
++    DW_AT_visibility = 0x17 COMMA
++    DW_AT_import = 0x18 COMMA
++    DW_AT_string_length = 0x19 COMMA
++    DW_AT_common_reference = 0x1a COMMA
++    DW_AT_comp_dir = 0x1b COMMA
++    DW_AT_const_value = 0x1c COMMA
++    DW_AT_containing_type = 0x1d COMMA
++    DW_AT_default_value = 0x1e COMMA
++    DW_AT_inline = 0x20 COMMA
++    DW_AT_is_optional = 0x21 COMMA
++    DW_AT_lower_bound = 0x22 COMMA
++    DW_AT_producer = 0x25 COMMA
++    DW_AT_prototyped = 0x27 COMMA
++    DW_AT_return_addr = 0x2a COMMA
++    DW_AT_start_scope = 0x2c COMMA
++    DW_AT_stride_size = 0x2e COMMA
++    DW_AT_upper_bound = 0x2f COMMA
++    DW_AT_abstract_origin = 0x31 COMMA
++    DW_AT_accessibility = 0x32 COMMA
++    DW_AT_address_class = 0x33 COMMA
++    DW_AT_artificial = 0x34 COMMA
++    DW_AT_base_types = 0x35 COMMA
++    DW_AT_calling_convention = 0x36 COMMA
++    DW_AT_count = 0x37 COMMA
++    DW_AT_data_member_location = 0x38 COMMA
++    DW_AT_decl_column = 0x39 COMMA
++    DW_AT_decl_file = 0x3a COMMA
++    DW_AT_decl_line = 0x3b COMMA
++    DW_AT_declaration = 0x3c COMMA
++    DW_AT_discr_list = 0x3d COMMA
++    DW_AT_encoding = 0x3e COMMA
++    DW_AT_external = 0x3f COMMA
++    DW_AT_frame_base = 0x40 COMMA
++    DW_AT_friend = 0x41 COMMA
++    DW_AT_identifier_case = 0x42 COMMA
++    DW_AT_macro_info = 0x43 COMMA
++    DW_AT_namelist_items = 0x44 COMMA
++    DW_AT_priority = 0x45 COMMA
++    DW_AT_segment = 0x46 COMMA
++    DW_AT_specification = 0x47 COMMA
++    DW_AT_static_link = 0x48 COMMA
++    DW_AT_type = 0x49 COMMA
++    DW_AT_use_location = 0x4a COMMA
++    DW_AT_variable_parameter = 0x4b COMMA
++    DW_AT_virtuality = 0x4c COMMA
++    DW_AT_vtable_elem_location = 0x4d COMMA
++    /* DWARF 3 values.	*/
++    DW_AT_allocated	= 0x4e COMMA
++    DW_AT_associated	= 0x4f COMMA
++    DW_AT_data_location = 0x50 COMMA
++    DW_AT_stride	= 0x51 COMMA
++    DW_AT_entry_pc	= 0x52 COMMA
++    DW_AT_use_UTF8	= 0x53 COMMA
++    DW_AT_extension	= 0x54 COMMA
++    DW_AT_ranges	= 0x55 COMMA
++    DW_AT_trampoline	= 0x56 COMMA
++    DW_AT_call_column	= 0x57 COMMA
++    DW_AT_call_file	= 0x58 COMMA
++    DW_AT_call_line	= 0x59 COMMA
++    /* SGI/MIPS extensions.  */
++    DW_AT_MIPS_fde = 0x2001 COMMA
++    DW_AT_MIPS_loop_begin = 0x2002 COMMA
++    DW_AT_MIPS_tail_loop_begin = 0x2003 COMMA
++    DW_AT_MIPS_epilog_begin = 0x2004 COMMA
++    DW_AT_MIPS_loop_unroll_factor = 0x2005 COMMA
++    DW_AT_MIPS_software_pipeline_depth = 0x2006 COMMA
++    DW_AT_MIPS_linkage_name = 0x2007 COMMA
++    DW_AT_MIPS_stride = 0x2008 COMMA
++    DW_AT_MIPS_abstract_name = 0x2009 COMMA
++    DW_AT_MIPS_clone_origin = 0x200a COMMA
++    DW_AT_MIPS_has_inlines = 0x200b COMMA
++    /* GNU extensions.	*/
++    DW_AT_sf_names   = 0x2101 COMMA
++    DW_AT_src_info   = 0x2102 COMMA
++    DW_AT_mac_info   = 0x2103 COMMA
++    DW_AT_src_coords = 0x2104 COMMA
++    DW_AT_body_begin = 0x2105 COMMA
++    DW_AT_body_end   = 0x2106 COMMA
++    DW_AT_GNU_vector = 0x2107 COMMA
++    /* VMS extensions.	*/
++    DW_AT_VMS_rtnbeg_pd_address = 0x2201 COMMA
++    /* UPC extension.  */
++    DW_AT_upc_threads_scaled = 0x3210
++IF_NOT_ASM(};)
++
++#define DW_AT_lo_user	0x2000	/* Implementation-defined range start.	*/
++#define DW_AT_hi_user	0x3ff0	/* Implementation-defined range end.  */
++
++/* Location atom names and codes.  */
++ENUM(dwarf_location_atom)
++
++    DW_OP_addr = 0x03 COMMA
++    DW_OP_deref = 0x06 COMMA
++    DW_OP_const1u = 0x08 COMMA
++    DW_OP_const1s = 0x09 COMMA
++    DW_OP_const2u = 0x0a COMMA
++    DW_OP_const2s = 0x0b COMMA
++    DW_OP_const4u = 0x0c COMMA
++    DW_OP_const4s = 0x0d COMMA
++    DW_OP_const8u = 0x0e COMMA
++    DW_OP_const8s = 0x0f COMMA
++    DW_OP_constu = 0x10 COMMA
++    DW_OP_consts = 0x11 COMMA
++    DW_OP_dup = 0x12 COMMA
++    DW_OP_drop = 0x13 COMMA
++    DW_OP_over = 0x14 COMMA
++    DW_OP_pick = 0x15 COMMA
++    DW_OP_swap = 0x16 COMMA
++    DW_OP_rot = 0x17 COMMA
++    DW_OP_xderef = 0x18 COMMA
++    DW_OP_abs = 0x19 COMMA
++    DW_OP_and = 0x1a COMMA
++    DW_OP_div = 0x1b COMMA
++    DW_OP_minus = 0x1c COMMA
++    DW_OP_mod = 0x1d COMMA
++    DW_OP_mul = 0x1e COMMA
++    DW_OP_neg = 0x1f COMMA
++    DW_OP_not = 0x20 COMMA
++    DW_OP_or = 0x21 COMMA
++    DW_OP_plus = 0x22 COMMA
++    DW_OP_plus_uconst = 0x23 COMMA
++    DW_OP_shl = 0x24 COMMA
++    DW_OP_shr = 0x25 COMMA
++    DW_OP_shra = 0x26 COMMA
++    DW_OP_xor = 0x27 COMMA
++    DW_OP_bra = 0x28 COMMA
++    DW_OP_eq = 0x29 COMMA
++    DW_OP_ge = 0x2a COMMA
++    DW_OP_gt = 0x2b COMMA
++    DW_OP_le = 0x2c COMMA
++    DW_OP_lt = 0x2d COMMA
++    DW_OP_ne = 0x2e COMMA
++    DW_OP_skip = 0x2f COMMA
++    DW_OP_lit0 = 0x30 COMMA
++    DW_OP_lit1 = 0x31 COMMA
++    DW_OP_lit2 = 0x32 COMMA
++    DW_OP_lit3 = 0x33 COMMA
++    DW_OP_lit4 = 0x34 COMMA
++    DW_OP_lit5 = 0x35 COMMA
++    DW_OP_lit6 = 0x36 COMMA
++    DW_OP_lit7 = 0x37 COMMA
++    DW_OP_lit8 = 0x38 COMMA
++    DW_OP_lit9 = 0x39 COMMA
++    DW_OP_lit10 = 0x3a COMMA
++    DW_OP_lit11 = 0x3b COMMA
++    DW_OP_lit12 = 0x3c COMMA
++    DW_OP_lit13 = 0x3d COMMA
++    DW_OP_lit14 = 0x3e COMMA
++    DW_OP_lit15 = 0x3f COMMA
++    DW_OP_lit16 = 0x40 COMMA
++    DW_OP_lit17 = 0x41 COMMA
++    DW_OP_lit18 = 0x42 COMMA
++    DW_OP_lit19 = 0x43 COMMA
++    DW_OP_lit20 = 0x44 COMMA
++    DW_OP_lit21 = 0x45 COMMA
++    DW_OP_lit22 = 0x46 COMMA
++    DW_OP_lit23 = 0x47 COMMA
++    DW_OP_lit24 = 0x48 COMMA
++    DW_OP_lit25 = 0x49 COMMA
++    DW_OP_lit26 = 0x4a COMMA
++    DW_OP_lit27 = 0x4b COMMA
++    DW_OP_lit28 = 0x4c COMMA
++    DW_OP_lit29 = 0x4d COMMA
++    DW_OP_lit30 = 0x4e COMMA
++    DW_OP_lit31 = 0x4f COMMA
++    DW_OP_reg0 = 0x50 COMMA
++    DW_OP_reg1 = 0x51 COMMA
++    DW_OP_reg2 = 0x52 COMMA
++    DW_OP_reg3 = 0x53 COMMA
++    DW_OP_reg4 = 0x54 COMMA
++    DW_OP_reg5 = 0x55 COMMA
++    DW_OP_reg6 = 0x56 COMMA
++    DW_OP_reg7 = 0x57 COMMA
++    DW_OP_reg8 = 0x58 COMMA
++    DW_OP_reg9 = 0x59 COMMA
++    DW_OP_reg10 = 0x5a COMMA
++    DW_OP_reg11 = 0x5b COMMA
++    DW_OP_reg12 = 0x5c COMMA
++    DW_OP_reg13 = 0x5d COMMA
++    DW_OP_reg14 = 0x5e COMMA
++    DW_OP_reg15 = 0x5f COMMA
++    DW_OP_reg16 = 0x60 COMMA
++    DW_OP_reg17 = 0x61 COMMA
++    DW_OP_reg18 = 0x62 COMMA
++    DW_OP_reg19 = 0x63 COMMA
++    DW_OP_reg20 = 0x64 COMMA
++    DW_OP_reg21 = 0x65 COMMA
++    DW_OP_reg22 = 0x66 COMMA
++    DW_OP_reg23 = 0x67 COMMA
++    DW_OP_reg24 = 0x68 COMMA
++    DW_OP_reg25 = 0x69 COMMA
++    DW_OP_reg26 = 0x6a COMMA
++    DW_OP_reg27 = 0x6b COMMA
++    DW_OP_reg28 = 0x6c COMMA
++    DW_OP_reg29 = 0x6d COMMA
++    DW_OP_reg30 = 0x6e COMMA
++    DW_OP_reg31 = 0x6f COMMA
++    DW_OP_breg0 = 0x70 COMMA
++    DW_OP_breg1 = 0x71 COMMA
++    DW_OP_breg2 = 0x72 COMMA
++    DW_OP_breg3 = 0x73 COMMA
++    DW_OP_breg4 = 0x74 COMMA
++    DW_OP_breg5 = 0x75 COMMA
++    DW_OP_breg6 = 0x76 COMMA
++    DW_OP_breg7 = 0x77 COMMA
++    DW_OP_breg8 = 0x78 COMMA
++    DW_OP_breg9 = 0x79 COMMA
++    DW_OP_breg10 = 0x7a COMMA
++    DW_OP_breg11 = 0x7b COMMA
++    DW_OP_breg12 = 0x7c COMMA
++    DW_OP_breg13 = 0x7d COMMA
++    DW_OP_breg14 = 0x7e COMMA
++    DW_OP_breg15 = 0x7f COMMA
++    DW_OP_breg16 = 0x80 COMMA
++    DW_OP_breg17 = 0x81 COMMA
++    DW_OP_breg18 = 0x82 COMMA
++    DW_OP_breg19 = 0x83 COMMA
++    DW_OP_breg20 = 0x84 COMMA
++    DW_OP_breg21 = 0x85 COMMA
++    DW_OP_breg22 = 0x86 COMMA
++    DW_OP_breg23 = 0x87 COMMA
++    DW_OP_breg24 = 0x88 COMMA
++    DW_OP_breg25 = 0x89 COMMA
++    DW_OP_breg26 = 0x8a COMMA
++    DW_OP_breg27 = 0x8b COMMA
++    DW_OP_breg28 = 0x8c COMMA
++    DW_OP_breg29 = 0x8d COMMA
++    DW_OP_breg30 = 0x8e COMMA
++    DW_OP_breg31 = 0x8f COMMA
++    DW_OP_regx = 0x90 COMMA
++    DW_OP_fbreg = 0x91 COMMA
++    DW_OP_bregx = 0x92 COMMA
++    DW_OP_piece = 0x93 COMMA
++    DW_OP_deref_size = 0x94 COMMA
++    DW_OP_xderef_size = 0x95 COMMA
++    DW_OP_nop = 0x96 COMMA
++    /* DWARF 3 extensions.  */
++    DW_OP_push_object_address = 0x97 COMMA
++    DW_OP_call2 = 0x98 COMMA
++    DW_OP_call4 = 0x99 COMMA
++    DW_OP_call_ref = 0x9a COMMA
++    /* GNU extensions.	*/
++    DW_OP_GNU_push_tls_address = 0xe0
++IF_NOT_ASM(};)
++
++#define DW_OP_lo_user	0xe0	/* Implementation-defined range start.	*/
++#define DW_OP_hi_user	0xff	/* Implementation-defined range end.  */
++
++/* Type encodings.  */
++ENUM(dwarf_type)
++
++    DW_ATE_void = 0x0 COMMA
++    DW_ATE_address = 0x1 COMMA
++    DW_ATE_boolean = 0x2 COMMA
++    DW_ATE_complex_float = 0x3 COMMA
++    DW_ATE_float = 0x4 COMMA
++    DW_ATE_signed = 0x5 COMMA
++    DW_ATE_signed_char = 0x6 COMMA
++    DW_ATE_unsigned = 0x7 COMMA
++    DW_ATE_unsigned_char = 0x8 COMMA
++    /* DWARF 3.  */
++    DW_ATE_imaginary_float = 0x9
++IF_NOT_ASM(};)
++
++#define	DW_ATE_lo_user 0x80
++#define	DW_ATE_hi_user 0xff
++
++/* Array ordering names and codes.  */
++ENUM(dwarf_array_dim_ordering)
++
++    DW_ORD_row_major = 0 COMMA
++    DW_ORD_col_major = 1
++IF_NOT_ASM(};)
++
++/* Access attribute.  */
++ENUM(dwarf_access_attribute)
++
++    DW_ACCESS_public = 1 COMMA
++    DW_ACCESS_protected = 2 COMMA
++    DW_ACCESS_private = 3
++IF_NOT_ASM(};)
++
++/* Visibility.	*/
++ENUM(dwarf_visibility_attribute)
++
++    DW_VIS_local = 1 COMMA
++    DW_VIS_exported = 2 COMMA
++    DW_VIS_qualified = 3
++IF_NOT_ASM(};)
++
++/* Virtuality.	*/
++ENUM(dwarf_virtuality_attribute)
++
++    DW_VIRTUALITY_none = 0 COMMA
++    DW_VIRTUALITY_virtual = 1 COMMA
++    DW_VIRTUALITY_pure_virtual = 2
++IF_NOT_ASM(};)
++
++/* Case sensitivity.  */
++ENUM(dwarf_id_case)
++
++    DW_ID_case_sensitive = 0 COMMA
++    DW_ID_up_case = 1 COMMA
++    DW_ID_down_case = 2 COMMA
++    DW_ID_case_insensitive = 3
++IF_NOT_ASM(};)
++
++/* Calling convention.	*/
++ENUM(dwarf_calling_convention)
++
++    DW_CC_normal = 0x1 COMMA
++    DW_CC_program = 0x2 COMMA
++    DW_CC_nocall = 0x3
++IF_NOT_ASM(};)
++
++#define DW_CC_lo_user 0x40
++#define DW_CC_hi_user 0xff
++
++/* Inline attribute.  */
++ENUM(dwarf_inline_attribute)
++
++    DW_INL_not_inlined = 0 COMMA
++    DW_INL_inlined = 1 COMMA
++    DW_INL_declared_not_inlined = 2 COMMA
++    DW_INL_declared_inlined = 3
++IF_NOT_ASM(};)
++
++/* Discriminant lists.	*/
++ENUM(dwarf_discrim_list)
++
++    DW_DSC_label = 0 COMMA
++    DW_DSC_range = 1
++IF_NOT_ASM(};)
++
++/* Line number opcodes.  */
++ENUM(dwarf_line_number_ops)
++
++    DW_LNS_extended_op = 0 COMMA
++    DW_LNS_copy = 1 COMMA
++    DW_LNS_advance_pc = 2 COMMA
++    DW_LNS_advance_line = 3 COMMA
++    DW_LNS_set_file = 4 COMMA
++    DW_LNS_set_column = 5 COMMA
++    DW_LNS_negate_stmt = 6 COMMA
++    DW_LNS_set_basic_block = 7 COMMA
++    DW_LNS_const_add_pc = 8 COMMA
++    DW_LNS_fixed_advance_pc = 9 COMMA
++    /* DWARF 3.  */
++    DW_LNS_set_prologue_end = 10 COMMA
++    DW_LNS_set_epilogue_begin = 11 COMMA
++    DW_LNS_set_isa = 12
++IF_NOT_ASM(};)
++
++/* Line number extended opcodes.  */
++ENUM(dwarf_line_number_x_ops)
++
++    DW_LNE_end_sequence = 1 COMMA
++    DW_LNE_set_address = 2 COMMA
++    DW_LNE_define_file = 3
++IF_NOT_ASM(};)
++
++/* Call frame information.  */
++ENUM(dwarf_call_frame_info)
++
++    DW_CFA_advance_loc = 0x40 COMMA
++    DW_CFA_offset = 0x80 COMMA
++    DW_CFA_restore = 0xc0 COMMA
++    DW_CFA_nop = 0x00 COMMA
++    DW_CFA_set_loc = 0x01 COMMA
++    DW_CFA_advance_loc1 = 0x02 COMMA
++    DW_CFA_advance_loc2 = 0x03 COMMA
++    DW_CFA_advance_loc4 = 0x04 COMMA
++    DW_CFA_offset_extended = 0x05 COMMA
++    DW_CFA_restore_extended = 0x06 COMMA
++    DW_CFA_undefined = 0x07 COMMA
++    DW_CFA_same_value = 0x08 COMMA
++    DW_CFA_register = 0x09 COMMA
++    DW_CFA_remember_state = 0x0a COMMA
++    DW_CFA_restore_state = 0x0b COMMA
++    DW_CFA_def_cfa = 0x0c COMMA
++    DW_CFA_def_cfa_register = 0x0d COMMA
++    DW_CFA_def_cfa_offset = 0x0e COMMA
++
++    /* DWARF 3.  */
++    DW_CFA_def_cfa_expression = 0x0f COMMA
++    DW_CFA_expression = 0x10 COMMA
++    DW_CFA_offset_extended_sf = 0x11 COMMA
++    DW_CFA_def_cfa_sf = 0x12 COMMA
++    DW_CFA_def_cfa_offset_sf = 0x13 COMMA
++
++    /* SGI/MIPS specific.  */
++    DW_CFA_MIPS_advance_loc8 = 0x1d COMMA
++
++    /* GNU extensions.	*/
++    DW_CFA_GNU_window_save = 0x2d COMMA
++    DW_CFA_GNU_args_size = 0x2e COMMA
++    DW_CFA_GNU_negative_offset_extended = 0x2f
++IF_NOT_ASM(};)
++
++#define DW_CIE_ID	  0xffffffff
++#define DW_CIE_VERSION	  1
++
++#define DW_CFA_extended   0
++#define DW_CFA_lo_user	  0x1c
++#define DW_CFA_hi_user	  0x3f
++
++#define DW_CHILDREN_no		     0x00
++#define DW_CHILDREN_yes		     0x01
++
++#define DW_ADDR_none		0
++
++/* Source language names and codes.  */
++ENUM(dwarf_source_language)
++
++    DW_LANG_C89 = 0x0001 COMMA
++    DW_LANG_C = 0x0002 COMMA
++    DW_LANG_Ada83 = 0x0003 COMMA
++    DW_LANG_C_plus_plus = 0x0004 COMMA
++    DW_LANG_Cobol74 = 0x0005 COMMA
++    DW_LANG_Cobol85 = 0x0006 COMMA
++    DW_LANG_Fortran77 = 0x0007 COMMA
++    DW_LANG_Fortran90 = 0x0008 COMMA
++    DW_LANG_Pascal83 = 0x0009 COMMA
++    DW_LANG_Modula2 = 0x000a COMMA
++    DW_LANG_Java = 0x000b COMMA
++    /* DWARF 3.  */
++    DW_LANG_C99 = 0x000c COMMA
++    DW_LANG_Ada95 = 0x000d COMMA
++    DW_LANG_Fortran95 = 0x000e COMMA
++    /* MIPS.  */
++    DW_LANG_Mips_Assembler = 0x8001 COMMA
++    /* UPC.  */
++    DW_LANG_Upc = 0x8765
++IF_NOT_ASM(};)
++
++#define DW_LANG_lo_user 0x8000	/* Implementation-defined range start.	*/
++#define DW_LANG_hi_user 0xffff	/* Implementation-defined range start.	*/
++
++/* Names and codes for macro information.  */
++ENUM(dwarf_macinfo_record_type)
++
++    DW_MACINFO_define = 1 COMMA
++    DW_MACINFO_undef = 2 COMMA
++    DW_MACINFO_start_file = 3 COMMA
++    DW_MACINFO_end_file = 4 COMMA
++    DW_MACINFO_vendor_ext = 255
++IF_NOT_ASM(};)
++
++/* @@@ For use with GNU frame unwind information.  */
++
++#define DW_EH_PE_absptr		0x00
++#define DW_EH_PE_omit		0xff
++
++#define DW_EH_PE_uleb128	0x01
++#define DW_EH_PE_udata2		0x02
++#define DW_EH_PE_udata4		0x03
++#define DW_EH_PE_udata8		0x04
++#define DW_EH_PE_sleb128	0x09
++#define DW_EH_PE_sdata2		0x0A
++#define DW_EH_PE_sdata4		0x0B
++#define DW_EH_PE_sdata8		0x0C
++#define DW_EH_PE_signed		0x08
++
++#define DW_EH_PE_pcrel		0x10
++#define DW_EH_PE_textrel	0x20
++#define DW_EH_PE_datarel	0x30
++#define DW_EH_PE_funcrel	0x40
++#define DW_EH_PE_aligned	0x50
++
++#define DW_EH_PE_indirect	0x80
++
++#endif /* _ELF_DWARF2_H */
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/linux/dwarf2-lang.h	2003-10-05 00:33:38.000000000 -0700
+@@ -0,0 +1,132 @@
++#ifndef DWARF2_LANG
++#define DWARF2_LANG
++#include <linux/dwarf2.h>
++
++/*
++ * This is free software; you can redistribute it and/or modify it under
++ * the terms of the GNU General Public License as published by the Free
++ * Software Foundation; either version 2, or (at your option) any later
++ * version.
++ */
++/*
++ * This file defines macros that allow generation of DWARF debug records
++ * for asm files.  This file is platform independent.  Register numbers
++ * (which are about the only thing that is platform dependent) are to be
++ * supplied by a platform defined file.
++ */
++#define DWARF_preamble()	.section	.debug_frame,"",@progbits
++/*
++ * This macro starts a debug frame section.  The debug_frame describes
++ * where to find the registers that the enclosing function saved on
++ * entry.
++ *
++ * ORD is use by the label generator and should be the same as what is
++ * passed to CFI_postamble.
++ *
++ * pc,	pc register gdb ordinal.
++ *
++ * code_align this is the factor used to define locations or regions
++ * where the given definitions apply.  If you use labels to define these
++ * this should be 1.
++ *
++ * data_align this is the factor used to define register offsets.  If
++ * you use struct offset, this should be the size of the register in
++ * bytes or the negative of that.  This is how it is used: you will
++ * define a register as the reference register, say the stack pointer,
++ * then you will say where a register is located relative to this
++ * reference registers value, say 40 for register 3 (the gdb register
++ * number).  The <40> will be multiplied by <data_align> to define the
++ * byte offset of the given register (3, in this example).  So if your
++ * <40> is the byte offset and the reference register points at the
++ * begining, you would want 1 for the data_offset.  If <40> was the 40th
++ * 4-byte element in that structure you would want 4.  And if your
++ * reference register points at the end of the structure you would want
++ * a negative data_align value(and you would have to do other math as
++ * well).
++ */
++
++#define CFI_preamble(ORD, pc, code_align, data_align)	\
++.section	.debug_frame,"",@progbits ;		\
++frame/**/_/**/ORD:						\
++	.long end/**/_/**/ORD-start/**/_/**/ORD;			\
++start/**/_/**/ORD:						\
++	.long	DW_CIE_ID;				\
++	.byte	DW_CIE_VERSION;			\
++	.byte 0	 ;				\
++	.uleb128 code_align;				\
++	.sleb128 data_align;				\
++	.byte pc;
++
++/*
++ * After the above macro and prior to the CFI_postamble, you need to
++ * define the initial state.  This starts with defining the reference
++ * register and, usually the pc.  Here are some helper macros:
++ */
++
++#define CFA_define_reference(reg, offset)	\
++	.byte DW_CFA_def_cfa;			\
++	.uleb128 reg;				\
++	.uleb128 (offset);
++
++#define CFA_define_offset(reg, offset)		\
++	.byte (DW_CFA_offset + reg);		\
++	.uleb128 (offset);
++
++#define CFI_postamble(ORD)			\
++	.align 4;				\
++end/**/_/**/ORD:
++/*
++ * So now your code pushs stuff on the stack, you need a new location
++ * and the rules for what to do.  This starts a running description of
++ * the call frame.  You need to describe what changes with respect to
++ * the call registers as the location of the pc moves through the code.
++ * The following builds an FDE (fram descriptor entry?).  Like the
++ * above, it has a preamble and a postamble.  It also is tied to the CFI
++ * above.
++ * The first entry after the preamble must be the location in the code
++ * that the call frame is being described for.
++ */
++#define FDE_preamble(ORD, fde_no, initial_address, length)	\
++	.long FDE_end/**/_/**/fde_no-FDE_start/**/_/**/fde_no;		\
++FDE_start/**/_/**/fde_no:						\
++	.long frame/**/_/**/ORD;					\
++	.long initial_address;					\
++	.long length;
++
++#define FDE_postamble(fde_no)			\
++	.align 4;				\
++FDE_end/**/_/**/fde_no:
++/*
++ * That done, you can now add registers, subtract registers, move the
++ * reference and even change the reference.  You can also define a new
++ * area of code the info applies to.  For discontinuous bits you should
++ * start a new FDE.  You may have as many as you like.
++ */
++
++/*
++ * To advance the address by <bytes>
++ */
++
++#define FDE_advance(bytes)			\
++	.byte DW_CFA_advance_loc4		\
++	.long bytes
++
++
++
++/*
++ * With the above you can define all the register locations.  But
++ * suppose the reference register moves... Takes the new offset NOT an
++ * increment.  This is how esp is tracked if it is not saved.
++ */
++
++#define CFA_define_cfa_offset(offset) \
++	.byte $DW_CFA_def_cfa_offset; \
++	.uleb128 (offset);
++/*
++ * Or suppose you want to use a different reference register...
++ */
++#define CFA_define_cfa_register(reg)		\
++	.byte DW_CFA_def_cfa_register;		\
++	.uleb128 reg;
++
++#endif
+--- linux-2.6.0-test6/include/linux/efi.h	2003-08-08 22:55:14.000000000 -0700
++++ 25/include/linux/efi.h	2003-10-05 00:36:22.000000000 -0700
+@@ -16,6 +16,8 @@
+ #include <linux/time.h>
+ #include <linux/types.h>
+ #include <linux/proc_fs.h>
++#include <linux/rtc.h>
++#include <linux/ioport.h>
+ 
+ #include <asm/page.h>
+ #include <asm/system.h>
+@@ -89,6 +91,11 @@ typedef	struct {
+ 
+ #define EFI_PAGE_SHIFT		12
+ 
++/*
++ * For current x86 implementations of EFI, there is
++ * additional padding in the mem descriptors.  This is not
++ * the case in ia64.  Need to have this fixed in the f/w.
++ */
+ typedef struct {
+ 	u32 type;
+ 	u32 pad;
+@@ -96,6 +103,9 @@ typedef struct {
+ 	u64 virt_addr;
+ 	u64 num_pages;
+ 	u64 attribute;
++#if defined (__i386__)
++	u64 pad1;
++#endif
+ } efi_memory_desc_t;
+ 
+ typedef int efi_freemem_callback_t (unsigned long start, unsigned long end, void *arg);
+@@ -132,6 +142,7 @@ typedef struct {
+  */
+ #define EFI_RESET_COLD 0
+ #define EFI_RESET_WARM 1
++#define EFI_RESET_SHUTDOWN 2
+ 
+ /*
+  * EFI Runtime Services table
+@@ -169,6 +180,10 @@ typedef efi_status_t efi_set_variable_t 
+ typedef efi_status_t efi_get_next_high_mono_count_t (u32 *count);
+ typedef void efi_reset_system_t (int reset_type, efi_status_t status,
+ 				 unsigned long data_size, efi_char16_t *data);
++typedef efi_status_t efi_set_virtual_address_map_t (unsigned long memory_map_size,
++						unsigned long descriptor_size,
++						u32 descriptor_version,
++						efi_memory_desc_t *virtual_map);
+ 
+ /*
+  *  EFI Configuration Table and GUID definitions
+@@ -194,6 +209,9 @@ typedef void efi_reset_system_t (int res
+ #define HCDP_TABLE_GUID	\
+     EFI_GUID(  0xf951938d, 0x620b, 0x42ef, 0x82, 0x79, 0xa8, 0x4b, 0x79, 0x61, 0x78, 0x98 )
+ 
++#define UGA_IO_PROTOCOL_GUID \
++    EFI_GUID(  0x61a4d49e, 0x6f68, 0x4f1b, 0xb9, 0x22, 0xa8, 0x6e, 0xed, 0xb, 0x7, 0xa2 )
++
+ typedef struct {
+ 	efi_guid_t guid;
+ 	unsigned long table;
+@@ -218,6 +236,13 @@ typedef struct {
+ 	unsigned long tables;
+ } efi_system_table_t;
+ 
++struct efi_memory_map {
++	efi_memory_desc_t *phys_map;
++	efi_memory_desc_t *map;
++	int nr_map;
++	unsigned long desc_version;
++};
++
+ /*
+  * All runtime access to EFI goes through this structure:
+  */
+@@ -230,6 +255,7 @@ extern struct efi {
+ 	void *sal_systab;		/* SAL system table */
+ 	void *boot_info;		/* boot info table */
+ 	void *hcdp;			/* HCDP table */
++	void *uga;			/* UGA table */
+ 	efi_get_time_t *get_time;
+ 	efi_set_time_t *set_time;
+ 	efi_get_wakeup_time_t *get_wakeup_time;
+@@ -239,6 +265,7 @@ extern struct efi {
+ 	efi_set_variable_t *set_variable;
+ 	efi_get_next_high_mono_count_t *get_next_high_mono_count;
+ 	efi_reset_system_t *reset_system;
++	efi_set_virtual_address_map_t *set_virtual_address_map;
+ } efi;
+ 
+ static inline int
+@@ -260,12 +287,18 @@ efi_guid_unparse(efi_guid_t *guid, char 
+ 
+ extern void efi_init (void);
+ extern void efi_map_pal_code (void);
++extern void efi_map_memmap(void);
+ extern void efi_memmap_walk (efi_freemem_callback_t callback, void *arg);
+ extern void efi_gettimeofday (struct timespec *ts);
+ extern void efi_enter_virtual_mode (void);	/* switch EFI to virtual mode, if possible */
+ extern u64 efi_get_iobase (void);
+ extern u32 efi_mem_type (unsigned long phys_addr);
+ extern u64 efi_mem_attributes (unsigned long phys_addr);
++extern void efi_initialize_iomem_resources(struct resource *code_resource,
++					struct resource *data_resource);
++extern efi_status_t phys_efi_get_time(efi_time_t *tm, efi_time_cap_t *tc);
++extern struct efi_memory_map memmap;
++extern int efi_enabled;
+ 
+ /*
+  * Variable Attributes
+--- linux-2.6.0-test6/include/linux/eisa.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/linux/eisa.h	2003-10-05 00:36:11.000000000 -0700
+@@ -4,16 +4,6 @@
+ #include <linux/ioport.h>
+ #include <linux/device.h>
+ 
+-#ifdef CONFIG_EISA
+-# ifdef CONFIG_EISA_ALWAYS
+-#  define EISA_bus 1
+-# else
+-   extern int EISA_bus;
+-# endif
+-#else
+-# define EISA_bus 0
+-#endif
+-
+ #define EISA_SIG_LEN   8
+ #define EISA_MAX_SLOTS 8
+ 
+@@ -108,4 +98,10 @@ struct eisa_root_device {
+ 
+ int eisa_root_register (struct eisa_root_device *root);
+ 
++#ifdef CONFIG_EISA
++extern int EISA_bus;
++#else
++# define EISA_bus 0
++#endif
++
+ #endif
+--- linux-2.6.0-test6/include/linux/elevator.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/linux/elevator.h	2003-10-05 00:34:17.000000000 -0700
+@@ -94,6 +94,11 @@ extern elevator_t iosched_deadline;
+  */
+ extern elevator_t iosched_as;
+ 
++/*
++ * completely fair queueing I/O scheduler
++ */
++extern elevator_t iosched_cfq;
++
+ extern int elevator_init(request_queue_t *, elevator_t *);
+ extern void elevator_exit(request_queue_t *);
+ extern inline int elv_rq_merge_ok(struct request *, struct bio *);
+--- linux-2.6.0-test6/include/linux/elf.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/linux/elf.h	2003-10-05 00:33:24.000000000 -0700
+@@ -395,6 +395,7 @@ typedef struct elf64_shdr {
+ #define NT_PRFPREG	2
+ #define NT_PRPSINFO	3
+ #define NT_TASKSTRUCT	4
++#define NT_AUXV		6
+ #define NT_PRXFPREG     0x46e62b7f      /* copied from gdb5.1/include/elf/common.h */
+ 
+ 
+--- linux-2.6.0-test6/include/linux/errno.h	2003-06-26 22:07:26.000000000 -0700
++++ 25/include/linux/errno.h	2003-10-05 00:36:54.000000000 -0700
+@@ -22,6 +22,7 @@
+ #define EBADTYPE	527	/* Type not supported by server */
+ #define EJUKEBOX	528	/* Request initiated, but will not complete before timeout */
+ #define EIOCBQUEUED	529	/* iocb queued, will get completion event */
++#define EIOCBRETRY	530	/* iocb queued, will trigger a retry */
+ 
+ #endif
+ 
+--- linux-2.6.0-test6/include/linux/ext3_fs_i.h	2003-07-10 18:50:32.000000000 -0700
++++ 25/include/linux/ext3_fs_i.h	2003-10-05 00:36:12.000000000 -0700
+@@ -106,7 +106,7 @@ struct ext3_inode_info {
+ 	 * during recovery.  Hence we must fix the get_block-vs-truncate race
+ 	 * by other means, so we have truncate_sem.
+ 	 */
+-	struct rw_semaphore truncate_sem;
++	struct semaphore truncate_sem;
+ 	struct inode vfs_inode;
+ };
+ 
+--- linux-2.6.0-test6/include/linux/fb.h	2003-06-14 12:18:06.000000000 -0700
++++ 25/include/linux/fb.h	2003-10-05 00:34:22.000000000 -0700
+@@ -2,7 +2,6 @@
+ #define _LINUX_FB_H
+ 
+ #include <linux/tty.h>
+-#include <linux/workqueue.h>
+ #include <asm/types.h>
+ #include <asm/io.h>
+ 
+@@ -326,28 +325,38 @@ struct fb_cursor {
+ 	struct fb_image	image;	/* Cursor image */
+ };
+ 
++#ifdef __KERNEL__
++
++#include <linux/fs.h>
++#include <linux/init.h>
++#include <linux/workqueue.h>
++#include <linux/devfs_fs_kernel.h>
++
++/*
++ * The purpose of this structure is to translate data
++ * from the hardwre independent format of fbdev to what
++ * format the hardware needs.
++ */
++
+ #define FB_PIXMAP_DEFAULT 1     /* used internally by fbcon */
+ #define FB_PIXMAP_SYSTEM  2     /* memory is in system RAM  */
+ #define FB_PIXMAP_IO      4     /* memory is iomapped       */
+ #define FB_PIXMAP_SYNC    256   /* set if GPU can DMA       */
+ 
+ struct fb_pixmap {
+-        __u8  *addr;                      /* pointer to memory             */  
+-	__u32 size;                       /* size of buffer in bytes       */
+-	__u32 offset;                     /* current offset to buffer      */
+-	__u32 buf_align;                  /* byte alignment of each bitmap */
+-	__u32 scan_align;                 /* alignment per scanline        */
+-	__u32 flags;                      /* see FB_PIXMAP_*               */
+-					  /* access methods                */
+-	void (*outbuf)(u8 *dst, u8 *addr, unsigned int size); 
+-	u8   (*inbuf) (u8 *addr);
+-	spinlock_t lock;                  /* spinlock                      */
++	u8  *addr;		/* pointer to memory 			*/
++	u32 size;		/* size of buffer in bytes 		*/
++	u32 offset;		/* current offset to buffer 		*/
++	u32 buf_align;		/* byte alignment of each bitmap 	*/
++	u32 scan_align;		/* alignment per scanline 		*/
++	u32 access_align;	/* alignment per read/write		*/
++	u32 flags;		/* see FB_PIXMAP_* 			*/
++	spinlock_t lock;	/* spinlock 				*/
+ 	atomic_t count;
++	/* access methods */
++	void (*outbuf)(u8 *addr, u8 *dst, unsigned int size);
++	u8   (*inbuf) (u8 *addr);
+ };
+-#ifdef __KERNEL__
+-
+-#include <linux/fs.h>
+-#include <linux/init.h>
+ 
+ struct fb_info;
+ struct vm_area_struct;
+@@ -396,24 +405,24 @@ struct fb_ops {
+ };
+ 
+ struct fb_info {
+-   int node;
+-   int flags;
+-   int open;                            /* Has this been open already ? */
++	int node;
++	int flags;
+ #define FBINFO_FLAG_MODULE	1	/* Low-level driver is a module */
+-   struct fb_var_screeninfo var;        /* Current var */
+-   struct fb_fix_screeninfo fix;        /* Current fix */
+-   struct fb_monspecs monspecs;         /* Current Monitor specs */
+-   struct fb_cursor cursor;		/* Current cursor */	
+-   struct work_struct queue;		/* Framebuffer event queue */
+-   struct fb_pixmap pixmap;	        /* Current pixmap */
+-   struct fb_cmap cmap;                 /* Current cmap */
+-   struct fb_ops *fbops;
+-   char *screen_base;                   /* Virtual address */
+-   struct vc_data *display_fg;		/* Console visible on this display */
+-   int currcon;				/* Current VC. */	
+-   void *pseudo_palette;                /* Fake palette of 16 colors */ 
+-   /* From here on everything is device dependent */
+-   void *par;	
++	struct fb_var_screeninfo var;	/* Current var */
++	struct fb_fix_screeninfo fix;	/* Current fix */
++	struct fb_monspecs monspecs;	/* Current Monitor specs */
++	struct fb_cursor cursor;	/* Current cursor */
++	struct work_struct queue;	/* Framebuffer event queue */
++	struct fb_pixmap pixmap;	/* Image HW mapper */
++	struct fb_pixmap sprite;	/* Cursor HW mapper */
++	struct fb_cmap cmap;		/* Current cmap */
++	struct fb_ops *fbops;
++	char *screen_base;		/* Virtual address */
++	struct vc_data *display_fg;	/* Console visible on this display */
++	void *pseudo_palette;		/* Fake palette of 16 colors */
++	int currcon;			/* Current VC. */
++	/* From here on everything is device dependent */
++	void *par;
+ };
+ 
+ #ifdef MODULE
+@@ -481,12 +490,12 @@ extern int register_framebuffer(struct f
+ extern int unregister_framebuffer(struct fb_info *fb_info);
+ extern int fb_prepare_logo(struct fb_info *fb_info);
+ extern int fb_show_logo(struct fb_info *fb_info);
+-extern u32 fb_get_buffer_offset(struct fb_info *info, u32 size);
+-extern void move_buf_unaligned(struct fb_info *info, u8 *dst, u8 *src, u32 d_pitch,
+-			     	u32 height, u32 mask, u32 shift_high, u32 shift_low,
++extern char* fb_get_buffer_offset(struct fb_info *info, struct fb_pixmap *buf, u32 size);
++extern void move_buf_unaligned(struct fb_info *info, struct fb_pixmap *buf, u8 *dst, u8 *src,
++				u32 d_pitch, u32 height, u32 mask, u32 shift_high, u32 shift_low,
+ 				u32 mod, u32 idx);
+-extern void move_buf_aligned(struct fb_info *info, u8 *dst, u8 *src, u32 d_pitch,
+-			     u32 s_pitch, u32 height);
++extern void move_buf_aligned(struct fb_info *info, struct fb_pixmap *buf, u8 *dst, u8 *src,
++			     u32 d_pitch, u32 s_pitch, u32 height);
+ extern struct fb_info *registered_fb[FB_MAX];
+ extern int num_registered_fb;
+ 
+--- linux-2.6.0-test6/include/linux/fs.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/linux/fs.h	2003-10-05 00:37:00.000000000 -0700
+@@ -388,6 +388,7 @@ struct inode {
+ 	unsigned short          i_bytes;
+ 	spinlock_t		i_lock;	/* i_blocks, i_bytes, maybe i_size */
+ 	struct semaphore	i_sem;
++	struct rw_semaphore	i_alloc_sem;
+ 	struct inode_operations	*i_op;
+ 	struct file_operations	*i_fop;	/* former ->i_op->default_file_ops */
+ 	struct super_block	*i_sb;
+@@ -480,6 +481,8 @@ static inline unsigned imajor(struct ino
+ 	return MAJOR(inode->i_rdev);
+ }
+ 
++extern struct block_device *I_BDEV(struct inode *inode);
++
+ struct fown_struct {
+ 	rwlock_t lock;          /* protects pid, uid, euid fields */
+ 	int pid;		/* pid or -pgrp where SIGIO should be sent */
+@@ -526,6 +529,7 @@ struct file {
+ 	/* Used by fs/eventpoll.c to link all the hooks to this file */
+ 	struct list_head	f_ep_links;
+ 	spinlock_t		f_ep_lock;
++	struct address_space	*f_mapping;
+ };
+ extern spinlock_t files_lock;
+ #define file_list_lock() spin_lock(&files_lock);
+@@ -749,6 +753,11 @@ extern int vfs_rename(struct inode *, st
+ #define DT_SOCK		12
+ #define DT_WHT		14
+ 
++#define OSYNC_METADATA	(1<<0)
++#define OSYNC_DATA	(1<<1)
++#define OSYNC_INODE	(1<<2)
++int generic_osync_inode(struct inode *, struct address_space *, int);
++
+ /*
+  * This is the "filldir" function type, used by readdir() to let
+  * the kernel specify what kind of dirent layout it wants to have.
+@@ -758,9 +767,9 @@ extern int vfs_rename(struct inode *, st
+ typedef int (*filldir_t)(void *, const char *, int, loff_t, ino_t, unsigned);
+ 
+ struct block_device_operations {
+-	int (*open) (struct inode *, struct file *);
+-	int (*release) (struct inode *, struct file *);
+-	int (*ioctl) (struct inode *, struct file *, unsigned, unsigned long);
++	int (*open) (struct block_device *, struct file *);
++	int (*release) (struct gendisk *);
++	int (*ioctl) (struct block_device *, struct file *, unsigned, unsigned long);
+ 	int (*media_changed) (struct gendisk *);
+ 	int (*revalidate_disk) (struct gendisk *);
+ 	struct module *owner;
+@@ -1123,11 +1132,9 @@ enum {BDEV_FILE, BDEV_SWAP, BDEV_FS, BDE
+ extern int register_blkdev(unsigned int, const char *);
+ extern int unregister_blkdev(unsigned int, const char *);
+ extern struct block_device *bdget(dev_t);
+-extern int bd_acquire(struct inode *inode);
+ extern void bd_forget(struct inode *inode);
+ extern void bdput(struct block_device *);
+ extern int blkdev_open(struct inode *, struct file *);
+-extern int blkdev_close(struct inode *, struct file *);
+ extern struct block_device *open_by_devnum(dev_t, unsigned, int);
+ extern struct file_operations def_blk_fops;
+ extern struct address_space_operations def_blk_aops;
+@@ -1135,7 +1142,7 @@ extern struct file_operations def_chr_fo
+ extern struct file_operations bad_sock_fops;
+ extern struct file_operations def_fifo_fops;
+ extern int ioctl_by_bdev(struct block_device *, unsigned, unsigned long);
+-extern int blkdev_ioctl(struct inode *, struct file *, unsigned, unsigned long);
++extern int blkdev_ioctl(struct block_device *, struct file *, unsigned, unsigned long);
+ extern int blkdev_get(struct block_device *, mode_t, unsigned, int);
+ extern int blkdev_put(struct block_device *, int);
+ extern int bd_claim(struct block_device *, void *);
+@@ -1202,6 +1209,7 @@ extern void write_inode_now(struct inode
+ extern int filemap_fdatawrite(struct address_space *);
+ extern int filemap_flush(struct address_space *);
+ extern int filemap_fdatawait(struct address_space *);
++extern int filemap_write_and_wait(struct address_space *mapping);
+ extern void sync_supers(void);
+ extern void sync_filesystems(int wait);
+ extern void emergency_sync(void);
+@@ -1295,8 +1303,7 @@ extern int generic_file_readonly_mmap(st
+ extern int file_read_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size);
+ extern int file_send_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size);
+ extern ssize_t generic_file_read(struct file *, char __user *, size_t, loff_t *);
+-int generic_write_checks(struct inode *inode, struct file *file,
+-			loff_t *pos, size_t *count, int isblk);
++int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk);
+ extern ssize_t generic_file_write(struct file *, const char __user *, size_t, loff_t *);
+ extern ssize_t generic_file_aio_read(struct kiocb *, char __user *, size_t, loff_t);
+ extern ssize_t __generic_file_aio_read(struct kiocb *, const struct iovec *, unsigned long, loff_t *);
+@@ -1314,9 +1321,6 @@ extern void
+ file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping);
+ extern ssize_t generic_file_direct_IO(int rw, struct kiocb *iocb,
+ 	const struct iovec *iov, loff_t offset, unsigned long nr_segs);
+-extern int blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode, 
+-	struct block_device *bdev, const struct iovec *iov, loff_t offset, 
+-	unsigned long nr_segs, get_blocks_t *get_blocks, dio_iodone_t *end_io);
+ extern ssize_t generic_file_readv(struct file *filp, const struct iovec *iov, 
+ 	unsigned long nr_segs, loff_t *ppos);
+ ssize_t generic_file_writev(struct file *filp, const struct iovec *iov, 
+@@ -1330,7 +1334,7 @@ static inline void do_generic_file_read(
+ 					read_descriptor_t * desc,
+ 					read_actor_t actor)
+ {
+-	do_generic_mapping_read(filp->f_dentry->d_inode->i_mapping,
++	do_generic_mapping_read(filp->f_mapping,
+ 				&filp->f_ra,
+ 				filp,
+ 				ppos,
+@@ -1338,6 +1342,32 @@ static inline void do_generic_file_read(
+ 				actor);
+ }
+ 
++int __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
++	struct block_device *bdev, const struct iovec *iov, loff_t offset,
++	unsigned long nr_segs, get_blocks_t get_blocks, dio_iodone_t end_io,
++	int needs_special_locking);
++
++/*
++ * For filesystems which need locking between buffered and direct access
++ */
++static inline int blockdev_direct_IO(int rw, struct kiocb *iocb,
++	struct inode *inode, struct block_device *bdev, const struct iovec *iov,
++	loff_t offset, unsigned long nr_segs, get_blocks_t get_blocks,
++	dio_iodone_t end_io)
++{
++	return __blockdev_direct_IO(rw, iocb, inode, bdev, iov, offset,
++				nr_segs, get_blocks, end_io, 1);
++}
++
++static inline int blockdev_direct_IO_no_locking(int rw, struct kiocb *iocb,
++	struct inode *inode, struct block_device *bdev, const struct iovec *iov,
++	loff_t offset, unsigned long nr_segs, get_blocks_t get_blocks,
++	dio_iodone_t end_io)
++{
++	return __blockdev_direct_IO(rw, iocb, inode, bdev, iov, offset,
++				nr_segs, get_blocks, end_io, 0);
++}
++
+ extern struct file_operations generic_ro_fops;
+ 
+ #define special_file(m) (S_ISCHR(m)||S_ISBLK(m)||S_ISFIFO(m)||S_ISSOCK(m))
+--- linux-2.6.0-test6/include/linux/ftape.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/linux/ftape.h	2003-10-05 00:33:24.000000000 -0700
+@@ -35,7 +35,6 @@
+ #include <linux/mm.h>
+ #endif
+ #include <linux/types.h>
+-#include <linux/version.h>
+ #include <linux/config.h>
+ #include <linux/mtio.h>
+ 
+--- linux-2.6.0-test6/include/linux/hdlcdrv.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/linux/hdlcdrv.h	2003-10-05 00:33:24.000000000 -0700
+@@ -359,11 +359,11 @@ static inline int hdlcdrv_ptt(struct hdl
+ void hdlcdrv_receiver(struct net_device *, struct hdlcdrv_state *);
+ void hdlcdrv_transmitter(struct net_device *, struct hdlcdrv_state *);
+ void hdlcdrv_arbitrate(struct net_device *, struct hdlcdrv_state *);
+-int hdlcdrv_register_hdlcdrv(struct net_device *dev, const struct hdlcdrv_ops *ops,
+-			     unsigned int privsize, char *ifname,
+-			     unsigned int baseaddr, unsigned int irq, 
+-			     unsigned int dma);
+-int hdlcdrv_unregister_hdlcdrv(struct net_device *dev);
++struct net_device *hdlcdrv_register(const struct hdlcdrv_ops *ops,
++				    unsigned int privsize, const char *ifname,
++				    unsigned int baseaddr, unsigned int irq, 
++				    unsigned int dma);
++void hdlcdrv_unregister(struct net_device *dev);
+ 
+ /* -------------------------------------------------------------------- */
+ 
+--- linux-2.6.0-test6/include/linux/hfs_fs.h	2003-07-10 18:50:32.000000000 -0700
++++ 25/include/linux/hfs_fs.h	2003-10-05 00:33:24.000000000 -0700
+@@ -267,9 +267,9 @@ extern void hfs_nat_drop_dentry(struct d
+ 
+ /* file.c */
+ extern hfs_s32 hfs_do_read(struct inode *, struct hfs_fork *, hfs_u32,
+-			   char *, hfs_u32);
++			   char __user *, hfs_u32);
+ extern hfs_s32 hfs_do_write(struct inode *, struct hfs_fork *, hfs_u32,
+-			    const char *, hfs_u32);
++			    const char __user *, hfs_u32);
+ extern void hfs_file_fix_mode(struct hfs_cat_entry *entry);
+ extern struct inode_operations hfs_file_inode_operations;
+ extern struct file_operations hfs_file_operations;
+--- linux-2.6.0-test6/include/linux/highuid.h	2003-06-14 12:18:23.000000000 -0700
++++ 25/include/linux/highuid.h	2003-10-05 00:33:24.000000000 -0700
+@@ -56,6 +56,8 @@ extern int overflowgid;
+ #define SET_GID16(var, gid)	var = high2lowgid(gid)
+ #define NEW_TO_OLD_UID(uid)	high2lowuid(uid)
+ #define NEW_TO_OLD_GID(gid)	high2lowgid(gid)
++#define OLD_TO_NEW_UID(uid)	low2highuid(uid)
++#define OLD_TO_NEW_GID(gid)	low2highgid(gid)
+ 
+ /* specific to fs/stat.c */
+ #define SET_OLDSTAT_UID(stat, uid)	(stat).st_uid = high2lowuid(uid)
+@@ -69,6 +71,8 @@ extern int overflowgid;
+ #define SET_GID16(var, gid)	do { ; } while (0)
+ #define NEW_TO_OLD_UID(uid)	(uid)
+ #define NEW_TO_OLD_GID(gid)	(gid)
++#define OLD_TO_NEW_UID(uid)	(uid)
++#define OLD_TO_NEW_GID(gid)	(gid)
+ 
+ #define SET_OLDSTAT_UID(stat, uid)	(stat).st_uid = (uid)
+ #define SET_OLDSTAT_GID(stat, gid)	(stat).st_gid = (gid)
+--- linux-2.6.0-test6/include/linux/init_task.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/include/linux/init_task.h	2003-10-05 00:36:54.000000000 -0700
+@@ -108,6 +108,7 @@
+ 	.proc_lock	= SPIN_LOCK_UNLOCKED,				\
+ 	.switch_lock	= SPIN_LOCK_UNLOCKED,				\
+ 	.journal_info	= NULL,						\
++	.io_wait	= NULL,						\
+ }
+ 
+ 
+--- linux-2.6.0-test6/include/linux/input.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/linux/input.h	2003-10-05 00:34:14.000000000 -0700
+@@ -870,6 +870,7 @@ struct input_handler {
+ 	char *name;
+ 
+ 	struct input_device_id *id_table;
++	struct input_device_id *blacklist;
+ 
+ 	struct list_head	h_list;
+ 	struct list_head	node;
+--- linux-2.6.0-test6/include/linux/istallion.h	2003-06-14 12:18:01.000000000 -0700
++++ 25/include/linux/istallion.h	2003-10-05 00:33:24.000000000 -0700
+@@ -21,6 +21,8 @@
+  *	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
++#include <linux/version.h>
++
+ /*****************************************************************************/
+ #ifndef	_ISTALLION_H
+ #define	_ISTALLION_H
+--- linux-2.6.0-test6/include/linux/linux_logo.h	2003-06-14 12:18:05.000000000 -0700
++++ 25/include/linux/linux_logo.h	2003-10-05 00:34:22.000000000 -0700
+@@ -16,13 +16,11 @@
+ 
+ #include <linux/init.h>
+ 
+-
+ #define LINUX_LOGO_MONO		1	/* monochrome black/white */
+ #define LINUX_LOGO_VGA16	2	/* 16 colors VGA text palette */
+ #define LINUX_LOGO_CLUT224	3	/* 224 colors */
+ #define LINUX_LOGO_GRAY256	4	/* 256 levels grayscale */
+ 
+-
+ struct linux_logo {
+ 	int type;			/* one of LINUX_LOGO_* */
+ 	unsigned int width;
+@@ -32,6 +30,6 @@ struct linux_logo {
+ 	const unsigned char *data;
+ };
+ 
+-extern const struct linux_logo *fb_find_logo(int depth);
++extern const struct linux_logo *find_logo(int depth);
+ 
+ #endif /* _LINUX_LINUX_LOGO_H */
+--- linux-2.6.0-test6/include/linux/list.h	2003-06-26 22:07:26.000000000 -0700
++++ 25/include/linux/list.h	2003-10-05 00:36:37.000000000 -0700
+@@ -142,8 +142,11 @@ static inline void __list_del(struct lis
+  * Note: list_empty on entry does not return true after this, the entry is
+  * in an undefined state.
+  */
++#include <linux/kernel.h>	/* BUG_ON */
+ static inline void list_del(struct list_head *entry)
+ {
++	BUG_ON(entry->prev->next != entry);
++	BUG_ON(entry->next->prev != entry);
+ 	__list_del(entry->prev, entry->next);
+ 	entry->next = LIST_POISON1;
+ 	entry->prev = LIST_POISON2;
+@@ -325,6 +328,19 @@ static inline void list_splice_init(stru
+ 	     pos = list_entry(pos->member.prev, typeof(*pos), member),	\
+ 		     prefetch(pos->member.prev))
+ 
++/**
++ * list_for_each_entry_continue -	iterate over list of given type
++ *			continuing after existing point
++ * @pos:	the type * to use as a loop counter.
++ * @head:	the head for your list.
++ * @member:	the name of the list_struct within the struct.
++ */
++#define list_for_each_entry_continue(pos, head, member) 		\
++	for (pos = list_entry(pos->member.next, typeof(*pos), member),	\
++		     prefetch(pos->member.next);			\
++	     &pos->member != (head);					\
++	     pos = list_entry(pos->member.next, typeof(*pos), member),	\
++		     prefetch(pos->member.next))
+ 
+ /**
+  * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry
+@@ -436,7 +452,7 @@ static __inline__ void hlist_del(struct 
+ 
+ /**
+  * hlist_del_rcu - deletes entry from hash list without re-initialization
+- * @entry: the element to delete from the hash list.
++ * @n: the element to delete from the hash list.
+  *
+  * Note: list_unhashed() on entry does not return true after this, 
+  * the entry is in an undefined state. It is useful for RCU based
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/linux/lockmeter.h	2003-10-05 00:36:40.000000000 -0700
+@@ -0,0 +1,320 @@
++/*
++ *  Copyright (C) 1999-2002 Silicon Graphics, Inc.
++ *
++ *  Written by John Hawkes (hawkes@sgi.com)
++ *  Based on klstat.h by Jack Steiner (steiner@sgi.com)
++ *
++ *  Modified by Ray Bryant (raybry@us.ibm.com) Feb-Apr 2000
++ *  Changes Copyright (C) 2000 IBM, Inc.
++ *  Added save of index in spinlock_t to improve efficiency
++ *  of "hold" time reporting for spinlocks
++ *  Added support for hold time statistics for read and write
++ *  locks.
++ *  Moved machine dependent code to include/asm/lockmeter.h.
++ *
++ */
++
++#ifndef _LINUX_LOCKMETER_H
++#define _LINUX_LOCKMETER_H
++
++
++/*---------------------------------------------------
++ *	architecture-independent lockmeter.h
++ *-------------------------------------------------*/
++
++/*
++ * raybry -- version 2: added efficient hold time statistics
++ *           requires lstat recompile, so flagged as new version
++ * raybry -- version 3: added global reader lock data
++ * hawkes -- version 4: removed some unnecessary fields to simplify mips64 port
++ */
++#define LSTAT_VERSION	5
++
++int	lstat_update(void*, void*, int);
++int	lstat_update_time(void*, void*, int, uint32_t);
++
++/*
++ * Currently, the mips64 and sparc64 kernels talk to a 32-bit lockstat, so we
++ * need to force compatibility in the inter-communication data structure.
++ */
++
++#if defined(CONFIG_MIPS32_COMPAT)
++#define TIME_T		uint32_t
++#elif defined(CONFIG_SPARC) || defined(CONFIG_SPARC64)
++#define TIME_T		uint64_t
++#else
++#define TIME_T		time_t
++#endif
++
++#if defined(__KERNEL__) || (!defined(CONFIG_MIPS32_COMPAT) && !defined(CONFIG_SPARC) && !defined(CONFIG_SPARC64)) || (_MIPS_SZLONG==32)
++#define POINTER		void *
++#else
++#define	POINTER		int64_t
++#endif
++
++/*
++ * Values for the "action" parameter passed to lstat_update.
++ *	ZZZ - do we want a try-success status here???
++ */
++#define LSTAT_ACT_NO_WAIT	0
++#define LSTAT_ACT_SPIN		1
++#define LSTAT_ACT_REJECT	2
++#define LSTAT_ACT_WW_SPIN       3
++#define LSTAT_ACT_SLEPT		4 /* UNUSED */
++
++#define LSTAT_ACT_MAX_VALUES	4 /* NOTE: Increase to 5 if use ACT_SLEPT */
++
++/*
++ * Special values for the low 2 bits of an RA passed to
++ * lstat_update.
++ */
++/* we use these values to figure out what kind of lock data */
++/* is stored in the statistics table entry at index ....... */
++#define LSTAT_RA_SPIN           0  /* spin lock data */
++#define LSTAT_RA_READ           1  /* read lock statistics */
++#define LSTAT_RA_SEMA		2  /* RESERVED */
++#define LSTAT_RA_WRITE          3  /* write lock statistics*/
++
++#define LSTAT_RA(n)	\
++	((void*)( ((unsigned long)__builtin_return_address(0) & ~3) | n) )
++
++/*
++ * Constants used for lock addresses in the lstat_directory
++ * to indicate special values of the lock address.
++ */
++#define	LSTAT_MULTI_LOCK_ADDRESS	NULL
++
++/*
++ * Maximum size of the lockstats tables. Increase this value
++ * if its not big enough. (Nothing bad happens if its not
++ * big enough although some locks will not be monitored.)
++ * We record overflows of this quantity in lstat_control.dir_overflows
++ *
++ * Note:  The max value here must fit into the field set
++ * and obtained by the macro's PUT_INDEX() and GET_INDEX().
++ * This value depends on how many bits are available in the
++ * lock word in the particular machine implementation we are on.
++ */
++#define LSTAT_MAX_STAT_INDEX		2000
++
++/*
++ * Size and mask for the hash table into the directory.
++ */
++#define LSTAT_HASH_TABLE_SIZE		4096		/* must be 2**N */
++#define LSTAT_HASH_TABLE_MASK		(LSTAT_HASH_TABLE_SIZE-1)
++
++#define DIRHASH(ra)      ((unsigned long)(ra)>>2 & LSTAT_HASH_TABLE_MASK)
++
++/*
++ *	This defines an entry in the lockstat directory. It contains
++ *	information about a lock being monitored.
++ *	A directory entry only contains the lock identification -
++ *	counts on usage of the lock are kept elsewhere in a per-cpu
++ *	data structure to minimize cache line pinging.
++ */
++typedef struct {
++	POINTER	caller_ra;		  /* RA of code that set lock */
++	POINTER	lock_ptr;		  /* lock address */
++	ushort	next_stat_index;  /* Used to link multiple locks that have the same hash table value */
++} lstat_directory_entry_t;
++
++/*
++ *	A multi-dimensioned array used to contain counts for lock accesses.
++ *	The array is 3-dimensional:
++ *		- CPU number. Keep from thrashing cache lines between CPUs
++ *		- Directory entry index. Identifies the lock
++ *		- Action. Indicates what kind of contention occurred on an
++ *		  access to the lock.
++ *
++ *	The index of an entry in the directory is the same as the 2nd index
++ *	of the entry in the counts array.
++ */
++/*
++ *  This table contains data for spin_locks, write locks, and read locks
++ *  Not all data is used for all cases.  In particular, the hold time
++ *  information is not stored here for read locks since that is a global
++ *  (e. g. cannot be separated out by return address) quantity.
++ *  See the lstat_read_lock_counts_t structure for the global read lock
++ *  hold time.
++ */
++typedef struct {
++	uint64_t    cum_wait_ticks;	/* sum of wait times               */
++	                                /* for write locks, sum of time a  */
++					/* writer is waiting for a reader  */
++	int64_t	    cum_hold_ticks;	/* cumulative sum of holds         */
++	                                /* not used for read mode locks    */
++					/* must be signed. ............... */
++	uint32_t    max_wait_ticks;	/* max waiting time                */
++	uint32_t    max_hold_ticks;	/* max holding time                */
++	uint64_t    cum_wait_ww_ticks;  /* sum times writer waits on writer*/
++	uint32_t    max_wait_ww_ticks;  /* max wait time writer vs writer  */
++	                                /* prev 2 only used for write locks*/
++	uint32_t    acquire_time;       /* time lock acquired this CPU     */
++	uint32_t    count[LSTAT_ACT_MAX_VALUES];
++} lstat_lock_counts_t;
++
++typedef lstat_lock_counts_t	lstat_cpu_counts_t[LSTAT_MAX_STAT_INDEX];
++
++/*
++ * User request to:
++ *	- turn statistic collection on/off, or to reset
++ */
++#define LSTAT_OFF	 0
++#define LSTAT_ON	 1
++#define LSTAT_RESET      2
++#define LSTAT_RELEASE    3
++
++#define LSTAT_MAX_READ_LOCK_INDEX 1000
++typedef struct {
++	POINTER	    lock_ptr;            /* address of lock for output stats */
++	uint32_t    read_lock_count;
++	int64_t     cum_hold_ticks;       /* sum of read lock hold times over */
++	                                  /* all callers. ....................*/
++	uint32_t    write_index;          /* last write lock hash table index */
++	uint32_t    busy_periods;         /* count of busy periods ended this */
++	uint64_t    start_busy;           /* time this busy period started. ..*/
++	uint64_t    busy_ticks;           /* sum of busy periods this lock. ..*/
++	uint64_t    max_busy;             /* longest busy period for this lock*/
++	uint32_t    max_readers;          /* maximum number of readers ...... */
++#ifdef USER_MODE_TESTING
++	rwlock_t    entry_lock;           /* lock for this read lock entry... */
++	                                  /* avoid having more than one rdr at*/
++	                                  /* needed for user space testing... */
++	                                  /* not needed for kernel 'cause it  */
++					  /* is non-preemptive. ............. */
++#endif
++} lstat_read_lock_counts_t;
++typedef lstat_read_lock_counts_t	lstat_read_lock_cpu_counts_t[LSTAT_MAX_READ_LOCK_INDEX];
++
++#if defined(__KERNEL__) || defined(USER_MODE_TESTING)
++
++#ifndef USER_MODE_TESTING
++#include <asm/lockmeter.h>
++#else
++#include "asm_newlockmeter.h"
++#endif
++
++/*
++ * Size and mask for the hash table into the directory.
++ */
++#define LSTAT_HASH_TABLE_SIZE		4096		/* must be 2**N */
++#define LSTAT_HASH_TABLE_MASK		(LSTAT_HASH_TABLE_SIZE-1)
++
++#define DIRHASH(ra)      ((unsigned long)(ra)>>2 & LSTAT_HASH_TABLE_MASK)
++
++/*
++ * This version eliminates the per processor lock stack.  What we do is to
++ * store the index of the lock hash structure in unused bits in the lock
++ * itself.  Then on unlock we can find the statistics record without doing
++ * any additional hash or lock stack lookup.  This works for spin_locks.
++ * Hold time reporting is now basically as cheap as wait time reporting
++ * so we ignore the difference between LSTAT_ON_HOLD and LSTAT_ON_WAIT
++ * as in version 1.1.* of lockmeter.
++ *
++ * For rw_locks, we store the index of a global reader stats structure in
++ * the lock and the writer index is stored in the latter structure.
++ * For read mode locks we hash at the time of the lock to find an entry
++ * in the directory for reader wait time and the like.
++ * At unlock time for read mode locks, we update just the global structure
++ * so we don't need to know the reader directory index value at unlock time.
++ *
++ */
++
++/*
++ * Protocol to change lstat_control.state
++ *   This is complicated because we don't want the cum_hold_time for
++ * a rw_lock to be decremented in _read_lock_ without making sure it
++ * is incremented in _read_lock_ and vice versa.  So here is the
++ * way we change the state of lstat_control.state:
++ * I.  To Turn Statistics On
++ *     After allocating storage, set lstat_control.state non-zero.
++ * This works because we don't start updating statistics for in use
++ * locks until the reader lock count goes to zero.
++ * II. To Turn Statistics Off:
++ * (0)  Disable interrupts on this CPU
++ * (1)  Seize the lstat_control.directory_lock
++ * (2)  Obtain the current value of lstat_control.next_free_read_lock_index
++ * (3)  Store a zero in lstat_control.state.
++ * (4)  Release the lstat_control.directory_lock
++ * (5)  For each lock in the read lock list up to the saved value
++ *      (well, -1) of the next_free_read_lock_index, do the following:
++ *      (a)  Check validity of the stored lock address
++ *           by making sure that the word at the saved addr
++ *           has an index that matches this entry.  If not
++ *           valid, then skip this entry.
++ *      (b)  If there is a write lock already set on this lock,
++ *           skip to (d) below.
++ *      (c)  Set a non-metered write lock on the lock
++ *      (d)  set the cached INDEX in the lock to zero
++ *      (e)  Release the non-metered write lock.
++ * (6)  Re-enable interrupts
++ *
++ * These rules ensure that a read lock will not have its statistics
++ * partially updated even though the global lock recording state has
++ * changed.  See put_lockmeter_info() for implementation.
++ *
++ * The reason for (b) is that there may be write locks set on the
++ * syscall path to put_lockmeter_info() from user space.  If we do
++ * not do this check, then we can deadlock.  A similar problem would
++ * occur if the lock was read locked by the current CPU.  At the
++ * moment this does not appear to happen.
++ */
++
++/*
++ * Main control structure for lockstat. Used to turn statistics on/off
++ * and to maintain directory info.
++ */
++typedef struct {
++	int				state;
++	spinlock_t		control_lock;		/* used to serialize turning statistics on/off   */
++	spinlock_t		directory_lock;		/* for serialize adding entries to directory     */
++	volatile int	next_free_dir_index;/* next free entry in the directory */
++	/* FIXME not all of these fields are used / needed .............. */
++                /* the following fields represent data since     */
++		/* first "lstat on" or most recent "lstat reset" */
++	TIME_T      first_started_time;     /* time when measurement first enabled */
++	TIME_T      started_time;           /* time when measurement last started  */
++	TIME_T      ending_time;            /* time when measurement last disabled */
++	uint64_t    started_cycles64;       /* cycles when measurement last started          */
++	uint64_t    ending_cycles64;        /* cycles when measurement last disabled         */
++	uint64_t    enabled_cycles64;       /* total cycles with measurement enabled         */
++	int         intervals;              /* number of measurement intervals recorded      */
++	                                    /* i. e. number of times did lstat on;lstat off  */
++	lstat_directory_entry_t	*dir;		/* directory */
++	int         dir_overflow;           /* count of times ran out of space in directory  */
++	int         rwlock_overflow;        /* count of times we couldn't allocate a rw block*/
++	ushort		*hashtab;		 	    /* hash table for quick dir scans */
++	lstat_cpu_counts_t	*counts[NR_CPUS];	 /* Array of pointers to per-cpu stats */
++    int         next_free_read_lock_index;   /* next rwlock reader (global) stats block  */
++    lstat_read_lock_cpu_counts_t *read_lock_counts[NR_CPUS]; /* per cpu read lock stats  */
++} lstat_control_t;
++
++#endif	/* defined(__KERNEL__) || defined(USER_MODE_TESTING) */
++
++typedef struct {
++	short		lstat_version;		/* version of the data */
++	short		state;			/* the current state is returned */
++	int		maxcpus;		/* Number of cpus present */
++	int		next_free_dir_index;	/* index of the next free directory entry */
++	TIME_T          first_started_time;	/* when measurement enabled for first time */
++	TIME_T          started_time;		/* time in secs since 1969 when stats last turned on  */
++	TIME_T		ending_time;		/* time in secs since 1969 when stats last turned off */
++	uint32_t	cycleval;		/* cycles per second */
++#ifdef notyet
++	void		*kernel_magic_addr;	/* address of kernel_magic */
++	void		*kernel_end_addr;	/* contents of kernel magic (points to "end") */
++#endif
++	int              next_free_read_lock_index; /* index of next (global) read lock stats struct */
++	uint64_t         started_cycles64;	/* cycles when measurement last started        */
++	uint64_t         ending_cycles64;	/* cycles when stats last turned off           */
++	uint64_t         enabled_cycles64;	/* total cycles with measurement enabled       */
++	int              intervals;		/* number of measurement intervals recorded      */
++						/* i.e. number of times we did lstat on;lstat off*/
++	int              dir_overflow;		/* number of times we wanted more space in directory */
++	int              rwlock_overflow;	/* # of times we wanted more space in read_locks_count */
++	struct new_utsname   uts;		/* info about machine where stats are measured */
++						/* -T option of lockstat allows data to be     */
++						/* moved to another machine. ................. */
++} lstat_user_request_t;
++
++#endif /* _LINUX_LOCKMETER_H */
+--- linux-2.6.0-test6/include/linux/mca.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/include/linux/mca.h	2003-10-05 00:33:24.000000000 -0700
+@@ -136,10 +136,6 @@ extern void mca_unregister_driver(struct
+ /* WARNING: only called by the boot time device setup */
+ extern int mca_register_device(int bus, struct mca_device *mca_dev);
+ 
+-#ifdef CONFIG_MCA_LEGACY
+-#include <linux/mca-legacy.h>
+-#endif
+-
+ #ifdef CONFIG_MCA_PROC_FS
+ extern void mca_do_proc_init(void);
+ extern void mca_set_adapter_procfn(int slot, MCA_ProcFn, void* dev);
+--- linux-2.6.0-test6/include/linux/mca-legacy.h	2003-06-14 12:18:51.000000000 -0700
++++ 25/include/linux/mca-legacy.h	2003-10-05 00:33:24.000000000 -0700
+@@ -7,6 +7,8 @@
+ #ifndef _LINUX_MCA_LEGACY_H
+ #define _LINUX_MCA_LEGACY_H
+ 
++#include <linux/mca.h>
++
+ #warning "MCA legacy - please move your driver to the new sysfs api"
+ 
+ /* MCA_NOTFOUND is an error condition.  The other two indicate
+--- linux-2.6.0-test6/include/linux/mman.h	2003-09-08 13:58:59.000000000 -0700
++++ 25/include/linux/mman.h	2003-10-05 00:34:49.000000000 -0700
+@@ -28,8 +28,13 @@ static inline void vm_unacct_memory(long
+ 	vm_acct_memory(-pages);
+ }
+ 
+-/* Optimisation macro. */
+-#define _calc_vm_trans(x,bit1,bit2) \
++/*
++ * Optimisation macro.  It is equivalent to:
++ *      (x & bit1) ? bit2 : 0
++ * but this version is faster.
++ * ("bit1" and "bit2" must be single bits)
++ */
++#define _calc_vm_trans(x, bit1, bit2) \
+   ((bit1) <= (bit2) ? ((x) & (bit1)) * ((bit2) / (bit1)) \
+    : ((x) & (bit1)) / ((bit1) / (bit2)))
+ 
+--- linux-2.6.0-test6/include/linux/mm.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/linux/mm.h	2003-10-05 00:34:41.000000000 -0700
+@@ -196,7 +196,7 @@ struct page {
+ #if defined(WANT_PAGE_VIRTUAL)
+ 	void *virtual;			/* Kernel virtual address (NULL if
+ 					   not kmapped, ie. highmem) */
+-#endif /* CONFIG_HIGMEM || WANT_PAGE_VIRTUAL */
++#endif /* WANT_PAGE_VIRTUAL */
+ };
+ 
+ /*
+@@ -323,7 +323,6 @@ static inline void put_page(struct page 
+  * The zone field is never updated after free_area_init_core()
+  * sets it, so none of the operations on it need to be atomic.
+  */
+-#define NODE_SHIFT 4
+ #define ZONE_SHIFT (BITS_PER_LONG - 8)
+ 
+ struct zone;
+--- linux-2.6.0-test6/include/linux/mmzone.h	2003-09-08 13:58:59.000000000 -0700
++++ 25/include/linux/mmzone.h	2003-10-05 00:34:41.000000000 -0700
+@@ -10,13 +10,8 @@
+ #include <linux/wait.h>
+ #include <linux/cache.h>
+ #include <linux/threads.h>
++#include <linux/numa.h>
+ #include <asm/atomic.h>
+-#ifdef CONFIG_DISCONTIGMEM
+-#include <asm/numnodes.h>
+-#endif
+-#ifndef MAX_NUMNODES
+-#define MAX_NUMNODES 1
+-#endif
+ 
+ /* Free memory management - zoned buddy allocator.  */
+ #ifndef CONFIG_FORCE_MAX_ZONEORDER
+@@ -303,19 +298,34 @@ extern void setup_per_zone_pages_min(voi
+ #define numa_node_id()		(cpu_to_node(smp_processor_id()))
+ 
+ #ifndef CONFIG_DISCONTIGMEM
++
+ extern struct pglist_data contig_page_data;
+ #define NODE_DATA(nid)		(&contig_page_data)
+ #define NODE_MEM_MAP(nid)	mem_map
+-#define MAX_NR_NODES		1
++#define MAX_NODES_SHIFT		0
++
+ #else /* CONFIG_DISCONTIGMEM */
+ 
+ #include <asm/mmzone.h>
+ 
+-/* page->zone is currently 8 bits ... */
+-#define MAX_NR_NODES		(255 / MAX_NR_ZONES)
++#if BITS_PER_LONG == 32
++/*
++ * with 32 bit flags field, page->zone is currently 8 bits.
++ * there are 3 zones (2 bits) and this leaves 8-2=6 bits for nodes.
++ */
++#define MAX_NODES_SHIFT		6
++#elif BITS_PER_LONG == 64
++/*
++ * with 64 bit flags field, there's plenty of room.
++ */
++#define MAX_NODES_SHIFT		10
++#endif
+ 
+ #endif /* !CONFIG_DISCONTIGMEM */
+ 
++#if NODES_SHIFT > MAX_NODES_SHIFT
++#error NODES_SHIFT > MAX_NODES_SHIFT
++#endif
+ 
+ extern DECLARE_BITMAP(node_online_map, MAX_NUMNODES);
+ extern DECLARE_BITMAP(memblk_online_map, MAX_NR_MEMBLKS);
+--- linux-2.6.0-test6/include/linux/moduleparam.h	2003-06-16 22:32:21.000000000 -0700
++++ 25/include/linux/moduleparam.h	2003-10-05 00:33:24.000000000 -0700
+@@ -3,6 +3,7 @@
+ /* (C) Copyright 2001, 2002 Rusty Russell IBM Corporation */
+ #include <linux/init.h>
+ #include <linux/stringify.h>
++#include <linux/kernel.h>
+ 
+ /* You can override this manually, but generally this should match the
+    module name. */
+@@ -33,6 +34,17 @@ struct kparam_string {
+ 	char *string;
+ };
+ 
++/* Special one for arrays */
++struct kparam_array
++{
++	unsigned int max;
++	unsigned int *num;
++	param_set_fn set;
++	param_get_fn get;
++	unsigned int elemsize;
++	void *elem;
++};
++
+ /* This is the fundamental function for registering boot/module
+    parameters.  perm sets the visibility in driverfs: 000 means it's
+    not there, read bits mean it's readable, write bits mean it's
+@@ -112,10 +124,16 @@ extern int param_set_invbool(const char 
+ extern int param_get_invbool(char *buffer, struct kernel_param *kp);
+ #define param_check_invbool(name, p) __param_check(name, p, int)
+ 
+-/* First two elements are the max and min array length (which don't change) */
+-extern int param_set_intarray(const char *val, struct kernel_param *kp);
+-extern int param_get_intarray(char *buffer, struct kernel_param *kp);
+-#define param_check_intarray(name, p) __param_check(name, p, int *)
++/* Comma-separated array: num is set to number they actually specified. */
++#define module_param_array(name, type, num, perm)			\
++	static struct kparam_array __param_arr_##name			\
++	= { ARRAY_SIZE(name), &num, param_set_##type, param_get_##type,	\
++	    sizeof(name[0]), name };					\
++	module_param_call(name, param_array_set, param_array_get, 	\
++			  &__param_arr_##name, perm)
++
++extern int param_array_set(const char *val, struct kernel_param *kp);
++extern int param_array_get(char *buffer, struct kernel_param *kp);
+ 
+ extern int param_set_copystring(const char *val, struct kernel_param *kp);
+ 
+@@ -123,5 +141,6 @@ int param_array(const char *name,
+ 		const char *val,
+ 		unsigned int min, unsigned int max,
+ 		void *elem, int elemsize,
+-		int (*set)(const char *, struct kernel_param *kp));
++		int (*set)(const char *, struct kernel_param *kp),
++		int *num);
+ #endif /* _LINUX_MODULE_PARAM_TYPES_H */
+--- linux-2.6.0-test6/include/linux/netdevice.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/linux/netdevice.h	2003-10-05 00:33:46.000000000 -0700
+@@ -456,6 +456,13 @@ struct net_device
+ 	/* bridge stuff */
+ 	struct net_bridge_port	*br_port;
+ 
++#ifdef CONFIG_KGDB
++	int			kgdb_is_trapped;
++#endif
++#ifdef CONFIG_NET_POLL_CONTROLLER
++	void			(*poll_controller)(struct net_device *);
++#endif
++
+ #ifdef CONFIG_NET_FASTROUTE
+ #define NETDEV_FASTROUTE_HMASK 0xF
+ 	/* Semi-private data. Keep it at the end of device struct. */
+@@ -530,6 +537,11 @@ extern int		dev_new_index(void);
+ extern struct net_device	*dev_get_by_index(int ifindex);
+ extern struct net_device	*__dev_get_by_index(int ifindex);
+ extern int		dev_restart(struct net_device *dev);
++#ifdef CONFIG_KGDB
++extern int		kgdb_eth_is_trapped(void);
++extern int		kgdb_net_interrupt(struct sk_buff *skb);
++extern void		kgdb_send_arp_request(void);
++#endif
+ 
+ typedef int gifconf_func_t(struct net_device * dev, char * bufptr, int len);
+ extern int		register_gifconf(unsigned int family, gifconf_func_t * gifconf);
+@@ -588,12 +600,22 @@ static inline void netif_start_queue(str
+ 
+ static inline void netif_wake_queue(struct net_device *dev)
+ {
++#ifdef CONFIG_KGDB
++	if (kgdb_eth_is_trapped()) {
++		return;
++	}
++#endif
+ 	if (test_and_clear_bit(__LINK_STATE_XOFF, &dev->state))
+ 		__netif_schedule(dev);
+ }
+ 
+ static inline void netif_stop_queue(struct net_device *dev)
+ {
++#ifdef CONFIG_KGDB
++	if (kgdb_eth_is_trapped()) {
++		return;
++	}
++#endif
+ 	set_bit(__LINK_STATE_XOFF, &dev->state);
+ }
+ 
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/linux/netfilter_bridge/ebt_limit.h	2003-10-05 00:33:24.000000000 -0700
+@@ -0,0 +1,23 @@
++#ifndef __LINUX_BRIDGE_EBT_LIMIT_H
++#define __LINUX_BRIDGE_EBT_LIMIT_H
++
++#define EBT_LIMIT_MATCH "limit"
++
++/* timings are in milliseconds. */
++#define EBT_LIMIT_SCALE 10000
++
++/* 1/10,000 sec period => max of 10,000/sec.  Min rate is then 429490
++   seconds, or one every 59 hours. */
++
++struct ebt_limit_info
++{
++	u_int32_t avg;    /* Average secs between packets * scale */
++	u_int32_t burst;  /* Period multiplier for upper limit. */
++
++	/* Used internally by the kernel */
++	unsigned long prev;
++	u_int32_t credit;
++	u_int32_t credit_cap, cost;
++};
++
++#endif
+--- linux-2.6.0-test6/include/linux/netfilter_ipv4/ip_conntrack_tuple.h	2003-06-14 12:18:29.000000000 -0700
++++ 25/include/linux/netfilter_ipv4/ip_conntrack_tuple.h	2003-10-05 00:33:24.000000000 -0700
+@@ -62,6 +62,14 @@ struct ip_conntrack_tuple
+ 	} dst;
+ };
+ 
++/* This is optimized opposed to a memset of the whole structure.  Everything we
++ * really care about is the  source/destination unions */
++#define IP_CT_TUPLE_U_BLANK(tuple) 				\
++	do {							\
++		(tuple)->src.u.all = 0;				\
++		(tuple)->dst.u.all = 0;				\
++	} while (0)
++
+ enum ip_conntrack_dir
+ {
+ 	IP_CT_DIR_ORIGINAL,
+--- linux-2.6.0-test6/include/linux/netfilter_ipv4/ip_nat_rule.h	2003-06-14 12:18:33.000000000 -0700
++++ 25/include/linux/netfilter_ipv4/ip_nat_rule.h	2003-10-05 00:33:24.000000000 -0700
+@@ -14,5 +14,10 @@ extern int ip_nat_rule_find(struct sk_bu
+ 			    const struct net_device *out,
+ 			    struct ip_conntrack *ct,
+ 			    struct ip_nat_info *info);
++
++extern unsigned int
++alloc_null_binding(struct ip_conntrack *conntrack,
++		   struct ip_nat_info *info,
++		   unsigned int hooknum);
+ #endif
+ #endif /* _IP_NAT_RULE_H */
+--- linux-2.6.0-test6/include/linux/nfs_fs.h	2003-07-27 12:14:40.000000000 -0700
++++ 25/include/linux/nfs_fs.h	2003-10-05 00:36:42.000000000 -0700
+@@ -271,7 +271,7 @@ nfs_file_cred(struct file *file)
+ /*
+  * linux/fs/nfs/direct.c
+  */
+-extern int nfs_direct_IO(int, struct file *, const struct iovec *, loff_t,
++extern int nfs_direct_IO(int, struct kiocb *, const struct iovec *, loff_t,
+ 			unsigned long);
+ 
+ /*
+--- linux-2.6.0-test6/include/linux/nfs_page.h	2003-06-26 22:07:26.000000000 -0700
++++ 25/include/linux/nfs_page.h	2003-10-05 00:36:43.000000000 -0700
+@@ -46,7 +46,6 @@ extern	struct nfs_page *nfs_create_reque
+ 					    unsigned int, unsigned int);
+ extern	void nfs_clear_request(struct nfs_page *req);
+ extern	void nfs_release_request(struct nfs_page *req);
+-extern	void nfs_release_list(struct list_head *list);
+ 
+ 
+ extern	void nfs_list_add_request(struct nfs_page *, struct list_head *);
+@@ -56,7 +55,6 @@ extern	int nfs_scan_list(struct list_hea
+ extern	int nfs_coalesce_requests(struct list_head *, struct list_head *,
+ 				  unsigned int);
+ extern  int nfs_wait_on_request(struct nfs_page *);
+-extern	int nfs_wait_for_reads(struct list_head *);
+ 
+ extern	spinlock_t nfs_wreq_lock;
+ 
+--- linux-2.6.0-test6/include/linux/nfs_xdr.h	2003-09-08 13:58:59.000000000 -0700
++++ 25/include/linux/nfs_xdr.h	2003-10-05 00:36:45.000000000 -0700
+@@ -591,6 +591,7 @@ struct nfs4_compound {
+ #endif /* CONFIG_NFS_V4 */
+ 
+ struct nfs_read_data {
++	int			flags;
+ 	struct rpc_task		task;
+ 	struct inode		*inode;
+ 	struct rpc_cred		*cred;
+@@ -605,6 +606,7 @@ struct nfs_read_data {
+ };
+ 
+ struct nfs_write_data {
++	int			flags;
+ 	struct rpc_task		task;
+ 	struct inode		*inode;
+ 	struct rpc_cred		*cred;
+@@ -634,16 +636,9 @@ struct nfs_rpc_ops {
+ 			    struct nfs_fh *, struct nfs_fattr *);
+ 	int	(*access)  (struct inode *, struct rpc_cred *, int);
+ 	int	(*readlink)(struct inode *, struct page *);
+-	int	(*read)    (struct inode *, struct rpc_cred *,
+-			    struct nfs_fattr *,
+-			    int, unsigned int, unsigned int,
+-			    struct page *, int *eofp);
+-	int	(*write)   (struct inode *, struct rpc_cred *,
+-			    struct nfs_fattr *,
+-			    int, unsigned int, unsigned int,
+-			    struct page *, struct nfs_writeverf *verfp);
+-	int	(*commit)  (struct inode *, struct nfs_fattr *,
+-			    unsigned long, unsigned int);
++	int	(*read)    (struct nfs_read_data *);
++	int	(*write)   (struct nfs_write_data *);
++	int	(*commit)  (struct nfs_write_data *);
+ 	int	(*create)  (struct inode *, struct qstr *, struct iattr *,
+ 			    int, struct nfs_fh *, struct nfs_fattr *);
+ 	int	(*remove)  (struct inode *, struct qstr *);
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/linux/numa.h	2003-10-05 00:34:41.000000000 -0700
+@@ -0,0 +1,16 @@
++#ifndef _LINUX_NUMA_H
++#define _LINUX_NUMA_H
++
++#include <linux/config.h>
++
++#ifdef CONFIG_DISCONTIGMEM
++#include <asm/numnodes.h>
++#endif
++
++#ifndef NODES_SHIFT
++#define NODES_SHIFT     0
++#endif
++
++#define MAX_NUMNODES    (1 << NODES_SHIFT)
++
++#endif /* _LINUX_NUMA_H */
+--- linux-2.6.0-test6/include/linux/pagemap.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/include/linux/pagemap.h	2003-10-05 00:37:03.000000000 -0700
+@@ -71,7 +71,7 @@ extern struct page * find_trylock_page(s
+ extern struct page * find_or_create_page(struct address_space *mapping,
+ 				unsigned long index, unsigned int gfp_mask);
+ extern unsigned int find_get_pages(struct address_space *mapping,
+-				pgoff_t start, unsigned int nr_pages,
++				pgoff_t *next, unsigned int nr_pages,
+ 				struct page **pages);
+ 
+ /*
+@@ -153,17 +153,27 @@ static inline void ___add_to_page_cache(
+ extern void FASTCALL(__lock_page(struct page *page));
+ extern void FASTCALL(unlock_page(struct page *page));
+ 
+-static inline void lock_page(struct page *page)
++
++extern int FASTCALL(__lock_page_wq(struct page *page, wait_queue_t *wait));
++static inline int lock_page_wq(struct page *page, wait_queue_t *wait)
+ {
+ 	if (TestSetPageLocked(page))
+-		__lock_page(page);
++		return __lock_page_wq(page, wait);
++	else
++		return 0;
++}
++
++static inline void lock_page(struct page *page)
++{
++	lock_page_wq(page, NULL);
+ }
+ 	
+ /*
+  * This is exported only for wait_on_page_locked/wait_on_page_writeback.
+  * Never use this directly!
+  */
+-extern void FASTCALL(wait_on_page_bit(struct page *page, int bit_nr));
++extern int FASTCALL(wait_on_page_bit_wq(struct page *page, int bit_nr,
++	wait_queue_t *wait));
+ 
+ /* 
+  * Wait for a page to be unlocked.
+@@ -172,19 +182,33 @@ extern void FASTCALL(wait_on_page_bit(st
+  * ie with increased "page->count" so that the page won't
+  * go away during the wait..
+  */
+-static inline void wait_on_page_locked(struct page *page)
++static inline int wait_on_page_locked_wq(struct page *page, wait_queue_t *wait)
+ {
+ 	if (PageLocked(page))
+-		wait_on_page_bit(page, PG_locked);
++		return wait_on_page_bit_wq(page, PG_locked, wait);
++	return 0;
++}
++
++static inline int wait_on_page_writeback_wq(struct page *page,
++						wait_queue_t *wait)
++{
++	if (PageWriteback(page))
++		return wait_on_page_bit_wq(page, PG_writeback, wait);
++	return 0;
++}
++
++static inline void wait_on_page_locked(struct page *page)
++{
++	wait_on_page_locked_wq(page, NULL);
+ }
+ 
+ /* 
+  * Wait for a page to complete writeback
+  */
++
+ static inline void wait_on_page_writeback(struct page *page)
+ {
+-	if (PageWriteback(page))
+-		wait_on_page_bit(page, PG_writeback);
++	wait_on_page_writeback_wq(page, NULL);
+ }
+ 
+ extern void end_page_writeback(struct page *page);
+--- linux-2.6.0-test6/include/linux/pagevec.h	2003-06-14 12:18:51.000000000 -0700
++++ 25/include/linux/pagevec.h	2003-10-05 00:37:03.000000000 -0700
+@@ -23,7 +23,7 @@ void __pagevec_lru_add(struct pagevec *p
+ void __pagevec_lru_add_active(struct pagevec *pvec);
+ void pagevec_strip(struct pagevec *pvec);
+ unsigned int pagevec_lookup(struct pagevec *pvec, struct address_space *mapping,
+-		pgoff_t start, unsigned int nr_pages);
++		pgoff_t *next, unsigned int nr_pages);
+ 
+ static inline void pagevec_init(struct pagevec *pvec, int cold)
+ {
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/linux/parser.h	2003-10-05 00:33:24.000000000 -0700
+@@ -0,0 +1,21 @@
++struct match_token {
++	int token;
++	char *pattern;
++};
++
++typedef struct match_token match_table_t[];
++
++enum {MAX_OPT_ARGS = 3};
++
++typedef struct {
++	char *from;
++	char *to;
++} substring_t;
++
++int match_token(char *s, match_table_t table, substring_t args[]);
++
++int match_int(substring_t *, int *result);
++int match_octal(substring_t *, int *result);
++int match_hex(substring_t *, int *result);
++void match_strcpy(char *, substring_t *);
++char *match_strdup(substring_t *);
+--- linux-2.6.0-test6/include/linux/pci.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/include/linux/pci.h	2003-10-05 00:36:20.000000000 -0700
+@@ -36,6 +36,7 @@
+ #define  PCI_COMMAND_WAIT 	0x80	/* Enable address/data stepping */
+ #define  PCI_COMMAND_SERR	0x100	/* Enable SERR */
+ #define  PCI_COMMAND_FAST_BACK	0x200	/* Enable back-to-back writes */
++#define  PCI_COMMAND_INTX_DISABLE 0x400 /* INTx Emulation Disable */
+ 
+ #define PCI_STATUS		0x06	/* 16 bits */
+ #define  PCI_STATUS_CAP_LIST	0x10	/* Support Capability List */
+@@ -198,6 +199,8 @@
+ #define  PCI_CAP_ID_MSI		0x05	/* Message Signalled Interrupts */
+ #define  PCI_CAP_ID_CHSWP	0x06	/* CompactPCI HotSwap */
+ #define  PCI_CAP_ID_PCIX	0x07	/* PCI-X */
++#define  PCI_CAP_ID_EXP 	0x10	/* PCI Express */
++#define  PCI_CAP_ID_MSIX	0x11	/* MSI-X */
+ #define PCI_CAP_LIST_NEXT	1	/* Next capability in the list */
+ #define PCI_CAP_FLAGS		2	/* Capability defined flags (16 bits) */
+ #define PCI_CAP_SIZEOF		4
+@@ -275,11 +278,13 @@
+ #define  PCI_MSI_FLAGS_QSIZE	0x70	/* Message queue size configured */
+ #define  PCI_MSI_FLAGS_QMASK	0x0e	/* Maximum queue size available */
+ #define  PCI_MSI_FLAGS_ENABLE	0x01	/* MSI feature enabled */
++#define  PCI_MSI_FLAGS_MASKBIT	0x100	/* 64-bit mask bits allowed */
+ #define PCI_MSI_RFU		3	/* Rest of capability flags */
+ #define PCI_MSI_ADDRESS_LO	4	/* Lower 32 bits */
+ #define PCI_MSI_ADDRESS_HI	8	/* Upper 32 bits (if PCI_MSI_FLAGS_64BIT set) */
+ #define PCI_MSI_DATA_32		8	/* 16 bits of data for 32-bit devices */
+ #define PCI_MSI_DATA_64		12	/* 16 bits of data for 64-bit devices */
++#define PCI_MSI_MASK_BIT	16	/* Mask bits register */
+ 
+ /* CompactPCI Hotswap Register */
+ 
+@@ -515,7 +520,6 @@ struct pci_driver {
+ 	const struct pci_device_id *id_table;	/* must be non-NULL for probe to be called */
+ 	int  (*probe)  (struct pci_dev *dev, const struct pci_device_id *id);	/* New device inserted */
+ 	void (*remove) (struct pci_dev *dev);	/* Device removed (NULL if not a hot-plug capable driver) */
+-	int  (*save_state) (struct pci_dev *dev, u32 state);    /* Save Device Context */
+ 	int  (*suspend) (struct pci_dev *dev, u32 state);	/* Device suspended */
+ 	int  (*resume) (struct pci_dev *dev);	                /* Device woken up */
+ 	int  (*enable_wake) (struct pci_dev *dev, u32 state, int enable);   /* Enable wake event */
+@@ -696,6 +700,18 @@ void pci_pool_free (struct pci_pool *poo
+ extern struct pci_dev *isa_bridge;
+ #endif
+ 
++#ifndef CONFIG_PCI_USE_VECTOR
++static inline void pci_scan_msi_device(struct pci_dev *dev) {}
++static inline int pci_enable_msi(struct pci_dev *dev) {return -1;}
++static inline void msi_remove_pci_irq_vectors(struct pci_dev *dev) {}
++#else
++extern void pci_scan_msi_device(struct pci_dev *dev);
++extern int pci_enable_msi(struct pci_dev *dev);
++extern void msi_remove_pci_irq_vectors(struct pci_dev *dev);
++extern int msi_alloc_vectors(struct pci_dev* dev, int *vector, int nvec);
++extern int msi_free_vectors(struct pci_dev* dev, int *vector, int nvec);
++#endif
++
+ #endif /* CONFIG_PCI */
+ 
+ /* Include architecture-dependent settings and functions */
+--- linux-2.6.0-test6/include/linux/pci_ids.h	2003-09-08 13:58:59.000000000 -0700
++++ 25/include/linux/pci_ids.h	2003-10-05 00:36:28.000000000 -0700
+@@ -519,6 +519,7 @@
+ #define PCI_DEVICE_ID_CT_65550		0x00e0
+ #define PCI_DEVICE_ID_CT_65554		0x00e4
+ #define PCI_DEVICE_ID_CT_65555		0x00e5
++#define PCI_DEVICE_ID_CT_69000		0x00c0
+ 
+ #define PCI_VENDOR_ID_MIRO		0x1031
+ #define PCI_DEVICE_ID_MIRO_36050	0x5601
+@@ -896,6 +897,7 @@
+ 
+ #define PCI_VENDOR_ID_SGI		0x10a9
+ #define PCI_DEVICE_ID_SGI_IOC3		0x0003
++#define PCI_DEVICE_ID_SGI_IOC4		0x100a
+ #define PCI_VENDOR_ID_SGI_LITHIUM	0x1002
+ 
+ #define PCI_VENDOR_ID_ACC		0x10aa
+@@ -1060,6 +1062,16 @@
+ #define PCI_DEVICE_ID_NVIDIA_QUADRO4_900XGL	0x0258
+ #define PCI_DEVICE_ID_NVIDIA_QUADRO4_750XGL	0x0259
+ #define PCI_DEVICE_ID_NVIDIA_QUADRO4_700XGL	0x025B
++#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800	0x0280
++#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4280	0x0281
++#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_TI_4800_SE 0x0282
++#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_4200_GO	0x0286
++#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5800_U	0x0301
++#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5800	0x0302
++#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5600_U	0x0311
++#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5600	0x0312
++#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200_U	0x0321
++#define PCI_DEVICE_ID_NVIDIA_GEFORCE_FX_5200	0x0322
+ 
+ #define PCI_VENDOR_ID_IMS		0x10e0
+ #define PCI_DEVICE_ID_IMS_8849		0x8849
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/linux/pci_msi.h	2003-10-05 00:36:20.000000000 -0700
+@@ -0,0 +1,193 @@
++/*
++ *	../include/linux/pci_msi.h
++ *
++ */
++
++#ifndef _ASM_PCI_MSI_H
++#define _ASM_PCI_MSI_H
++
++#include <linux/pci.h>
++
++#define MSI_AUTO -1
++#define NR_REPEATS	23
++#define NR_RESERVED_VECTORS 3 /*FIRST_DEVICE_VECTOR,FIRST_SYSTEM_VECTOR,0x80 */
++
++/*
++ * Assume the maximum number of hot plug slots supported by the system is about
++ * ten. The worstcase is that each of these slots is hot-added with a device,
++ * which has two MSI/MSI-X capable functions. To avoid any MSI-X driver, which
++ * attempts to request all available vectors, NR_HP_RESERVED_VECTORS is defined
++ * as below to ensure at least one message is assigned to each detected MSI/
++ * MSI-X device function.
++ */
++#define NR_HP_RESERVED_VECTORS 	20
++
++extern int vector_irq[NR_IRQS];
++extern cpumask_t pending_irq_balance_cpumask[NR_IRQS];
++extern void (*interrupt[NR_IRQS])(void);
++
++#ifdef CONFIG_SMP
++#define set_msi_irq_affinity	set_msi_affinity
++#else
++#define set_msi_irq_affinity	NULL
++static inline void move_msi(int vector) {}
++#endif
++
++#ifndef CONFIG_X86_IO_APIC
++static inline int get_ioapic_vector(struct pci_dev *dev) { return -1;}
++static inline void restore_ioapic_irq_handler(int irq) {}
++#else
++extern void restore_ioapic_irq_handler(int irq);
++#endif
++
++/*
++ * MSI-X Address Register
++ */
++#define PCI_MSIX_FLAGS_QSIZE		0x7FF
++#define PCI_MSIX_FLAGS_ENABLE		(1 << 15)
++#define PCI_MSIX_FLAGS_BIRMASK		(7 << 0)
++#define PCI_MSIX_FLAGS_BITMASK		(1 << 0)
++
++#define PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET	0
++#define PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET	4
++#define PCI_MSIX_ENTRY_DATA_OFFSET		8
++#define PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET	12
++#define PCI_MSIX_ENTRY_SIZE			16
++
++#define msi_control_reg(base)		(base + PCI_MSI_FLAGS)
++#define msi_lower_address_reg(base)	(base + PCI_MSI_ADDRESS_LO)
++#define msi_upper_address_reg(base)	(base + PCI_MSI_ADDRESS_HI)
++#define msi_data_reg(base, is64bit)	\
++	( (is64bit == 1) ? base+PCI_MSI_DATA_64 : base+PCI_MSI_DATA_32 )
++#define msi_mask_bits_reg(base, is64bit) \
++	( (is64bit == 1) ? base+PCI_MSI_MASK_BIT : base+PCI_MSI_MASK_BIT-4)
++#define msi_disable(control)		control &= ~PCI_MSI_FLAGS_ENABLE
++#define multi_msi_capable(control) \
++	(1 << ((control & PCI_MSI_FLAGS_QMASK) >> 1))
++#define multi_msi_enable(control, num) \
++	control |= (((num >> 1) << 4) & PCI_MSI_FLAGS_QSIZE);
++#define is_64bit_address(control)	(control & PCI_MSI_FLAGS_64BIT)
++#define is_mask_bit_support(control)	(control & PCI_MSI_FLAGS_MASKBIT)
++#define msi_enable(control, num) multi_msi_enable(control, num); \
++	control |= PCI_MSI_FLAGS_ENABLE
++
++#define msix_control_reg		msi_control_reg
++#define msix_table_offset_reg(base)	(base + 0x04)
++#define msix_pba_offset_reg(base)	(base + 0x08)
++#define msix_enable(control)	 	control |= PCI_MSIX_FLAGS_ENABLE
++#define msix_disable(control)	 	control &= ~PCI_MSIX_FLAGS_ENABLE
++#define msix_table_size(control) 	((control & PCI_MSIX_FLAGS_QSIZE)+1)
++#define multi_msix_capable		msix_table_size
++#define msix_unmask(address)	 	(address & ~PCI_MSIX_FLAGS_BITMASK)
++#define msix_mask(address)		(address | PCI_MSIX_FLAGS_BITMASK)
++#define msix_is_pending(address) 	(address & PCI_MSIX_FLAGS_PENDMASK)
++
++extern char __dbg_str_buf[256];
++#define _DEFINE_DBG_BUFFER	char __dbg_str_buf[256];
++#define _DBG_K_TRACE_ENTRY	((unsigned int)0x00000001)
++#define _DBG_K_TRACE_EXIT	((unsigned int)0x00000002)
++#define _DBG_K_INFO		((unsigned int)0x00000004)
++#define _DBG_K_ERROR		((unsigned int)0x00000008)
++#define _DBG_K_TRACE	(_DBG_K_TRACE_ENTRY | _DBG_K_TRACE_EXIT)
++
++#define _DEBUG_LEVEL	(_DBG_K_INFO | _DBG_K_ERROR | _DBG_K_TRACE)
++#define _DBG_PRINT( dbg_flags, args... )		\
++if ( _DEBUG_LEVEL & (dbg_flags) )			\
++{							\
++	int len;					\
++	len = sprintf(__dbg_str_buf, "%s:%d: %s ", 	\
++		__FILE__, __LINE__, __FUNCTION__ ); 	\
++	sprintf(__dbg_str_buf + len, args);		\
++	printk(KERN_INFO "%s\n", __dbg_str_buf);	\
++}
++
++#define MSI_FUNCTION_TRACE_ENTER	\
++	_DBG_PRINT (_DBG_K_TRACE_ENTRY, "%s", "[Entry]");
++#define MSI_FUNCTION_TRACE_EXIT		\
++	_DBG_PRINT (_DBG_K_TRACE_EXIT, "%s", "[Entry]");
++
++/*
++ * MSI Defined Data Structures
++ */
++#define MSI_ADDRESS_HEADER		0xfee
++#define MSI_ADDRESS_HEADER_SHIFT	12
++#define MSI_ADDRESS_HEADER_MASK		0xfff000
++#define MSI_TARGET_CPU_SHIFT		4
++#define MSI_TARGET_CPU_MASK		0xff
++#define MSI_DELIVERY_MODE		0
++#define MSI_LEVEL_MODE			1	/* Edge always assert */
++#define MSI_TRIGGER_MODE		0	/* MSI is edge sensitive */
++#define MSI_LOGICAL_MODE		1
++#define MSI_REDIRECTION_HINT_MODE	0
++#ifdef CONFIG_SMP
++#define MSI_TARGET_CPU			logical_smp_processor_id()
++#else
++#define MSI_TARGET_CPU			TARGET_CPUS
++#endif
++
++struct msg_data {
++#if defined(__LITTLE_ENDIAN_BITFIELD)
++	__u32	vector		:  8;
++	__u32	delivery_mode	:  3;	/* 000b: FIXED | 001b: lowest prior */
++	__u32	reserved_1	:  3;
++	__u32	level		:  1;	/* 0: deassert | 1: assert */
++	__u32	trigger		:  1;	/* 0: edge | 1: level */
++	__u32	reserved_2	: 16;
++#elif defined(__BIG_ENDIAN_BITFIELD)
++	__u32	reserved_2	: 16;
++	__u32	trigger		:  1;	/* 0: edge | 1: level */
++	__u32	level		:  1;	/* 0: deassert | 1: assert */
++	__u32	reserved_1	:  3;
++	__u32	delivery_mode	:  3;	/* 000b: FIXED | 001b: lowest prior */
++	__u32	vector		:  8;
++#else
++#error "Bitfield endianness not defined! Check your byteorder.h"
++#endif
++} __attribute__ ((packed));
++
++struct msg_address {
++	union {
++		struct {
++#if defined(__LITTLE_ENDIAN_BITFIELD)
++			__u32	reserved_1	:  2;
++			__u32	dest_mode	:  1;	/*0:physic | 1:logic */
++			__u32	redirection_hint:  1;  	/*0: dedicated CPU
++							  1: lowest priority */
++			__u32	reserved_2	:  4;
++ 			__u32	dest_id		: 24;	/* Destination ID */
++#elif defined(__BIG_ENDIAN_BITFIELD)
++ 			__u32	dest_id		: 24;	/* Destination ID */
++			__u32	reserved_2	:  4;
++			__u32	redirection_hint:  1;  	/*0: dedicated CPU
++							  1: lowest priority */
++			__u32	dest_mode	:  1;	/*0:physic | 1:logic */
++			__u32	reserved_1	:  2;
++#else
++#error "Bitfield endianness not defined! Check your byteorder.h"
++#endif
++      		}u;
++       		__u32  value;
++	}lo_address;
++	__u32 	hi_address;
++} __attribute__ ((packed));
++
++struct msi_desc {
++	struct {
++		__u8	type	: 5; 	/* {0: unused, 5h:MSI, 11h:MSI-X} */
++		__u8	maskbit	: 1; 	/* mask-pending bit supported ?   */
++		__u8	reserved: 2; 	/* reserved			  */
++		__u8	entry_nr;    	/* specific enabled entry 	  */
++		__u8	default_vector; /* default pre-assigned vector    */
++		__u8	current_cpu; 	/* current destination cpu	  */
++	}msi_attrib;
++
++	struct {
++		__u16	head;
++		__u16	tail;
++	}link;
++
++	unsigned long mask_base;
++	struct pci_dev *dev;
++};
++
++#endif /* _ASM_PCI_MSI_H */
+--- linux-2.6.0-test6/include/linux/raw.h	2003-06-14 12:18:25.000000000 -0700
++++ 25/include/linux/raw.h	2003-10-05 00:33:24.000000000 -0700
+@@ -13,4 +13,6 @@ struct raw_config_request 
+ 	__u64	block_minor;
+ };
+ 
++#define MAX_RAW_MINORS CONFIG_MAX_RAW_DEVS
++
+ #endif /* __LINUX_RAW_H */
+--- linux-2.6.0-test6/include/linux/rcupdate.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/include/linux/rcupdate.h	2003-10-05 00:33:24.000000000 -0700
+@@ -15,7 +15,7 @@
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  *
+- * Copyright (c) IBM Corporation, 2001
++ * Copyright (C) IBM Corporation, 2001
+  *
+  * Author: Dipankar Sarma <dipankar@in.ibm.com>
+  * 
+--- linux-2.6.0-test6/include/linux/sched.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/linux/sched.h	2003-10-05 00:36:54.000000000 -0700
+@@ -151,6 +151,7 @@ extern void init_idle(task_t *idle, int 
+ 
+ extern void show_state(void);
+ extern void show_regs(struct pt_regs *);
++extern void show_trace_task(task_t *tsk);
+ 
+ /*
+  * TASK is a pointer to the task whose backtrace we want to see (or NULL for current
+@@ -207,6 +208,8 @@ struct mm_struct {
+ 	cpumask_t cpu_vm_mask;
+ 	unsigned long swap_address;
+ 
++	unsigned long saved_auxv[40]; /* for /proc/PID/auxv */
++
+ 	unsigned dumpable:1;
+ #ifdef CONFIG_HUGETLB_PAGE
+ 	int used_hugetlb;
+@@ -262,6 +265,15 @@ struct signal_struct {
+ 
+ 	/* thread group stop support, overloads group_exit_code too */
+ 	int			group_stop_count;
++
++	/* job control IDs */
++	pid_t pgrp;
++	pid_t tty_old_pgrp;
++	pid_t session;
++	/* boolean value for session group leader */
++	int leader;
++
++	struct tty_struct *tty; /* NULL if no tty */
+ };
+ 
+ /*
+@@ -364,12 +376,7 @@ struct task_struct {
+ 	unsigned long personality;
+ 	int did_exec:1;
+ 	pid_t pid;
+-	pid_t __pgrp;		/* Accessed via process_group() */
+-	pid_t tty_old_pgrp;
+-	pid_t session;
+ 	pid_t tgid;
+-	/* boolean value for session group leader */
+-	int leader;
+ 	/* 
+ 	 * pointers to (original) parent process, youngest child, younger sibling,
+ 	 * older sibling, respectively.  (p->father can be replaced with 
+@@ -413,7 +420,6 @@ struct task_struct {
+ 	char comm[16];
+ /* file system info */
+ 	int link_count, total_link_count;
+-	struct tty_struct *tty; /* NULL if no tty */
+ 	unsigned int locks; /* How many file locks are being held */
+ /* ipc stuff */
+ 	struct sysv_sem sysvsem;
+@@ -463,11 +469,33 @@ struct task_struct {
+ 
+ 	unsigned long ptrace_message;
+ 	siginfo_t *last_siginfo; /* For ptrace use.  */
++/*
++ * current io wait handle: wait queue entry to use for io waits
++ * If this thread is processing aio, this points at the waitqueue
++ * inside the currently handled kiocb. It may be NULL (i.e. default
++ * to a stack based synchronous wait) if its doing sync IO.
++ */
++	wait_queue_t *io_wait;
+ };
+ 
+ static inline pid_t process_group(struct task_struct *tsk)
+ {
+-	return tsk->group_leader->__pgrp;
++	return tsk->signal->pgrp;
++}
++
++static inline pid_t process_session(struct task_struct *tsk)
++{
++	return tsk->signal->session;
++}
++
++static inline int process_session_leader(struct task_struct *tsk)
++{
++	return tsk->signal->leader;
++}
++
++static inline struct tty_struct *process_tty(struct task_struct *tsk)
++{
++	return tsk->signal->tty;
+ }
+ 
+ extern void __put_task_struct(struct task_struct *tsk);
+--- linux-2.6.0-test6/include/linux/sctp.h	2003-09-08 13:58:59.000000000 -0700
++++ 25/include/linux/sctp.h	2003-10-05 00:33:24.000000000 -0700
+@@ -524,113 +524,4 @@ typedef struct sctp_addip_chunk {
+ 	sctp_addiphdr_t addip_hdr;
+ } sctp_addip_chunk_t __attribute__((packed));
+ 
+-/* FIXME:  Cleanup needs to continue below this line. */
+-
+-
+-/* ADDIP Section 3.1.1
+- *
+- * ASCONF-Request Correlation ID: 32 bits (unsigned integer)
+- *
+- * This is an opaque integer assigned by the sender to identify each
+- * request parameter. It is in host byte order and is only meaningful
+- * to the sender. The receiver of the ASCONF Chunk will copy this 32
+- * bit value into the ASCONF Correlation ID field of the
+- * ASCONF-ACK. The sender of the ASCONF can use this same value in the
+- * ASCONF-ACK to find which request the response is for.
+- *
+- * ASCONF Parameter: TLV format
+- *
+- * Each Address configuration change is represented by a TLV parameter
+- * as defined in Section 3.2. One or more requests may be present in
+- * an ASCONF Chunk.
+- */
+-typedef struct {
+-	__u32	correlation;
+-	sctp_paramhdr_t p;
+-	__u8		payload[0];
+-} sctpAsconfReq_t;
+-
+-/* ADDIP
+- * 3.1.1  Address/Stream Configuration Change Chunk (ASCONF)
+- *
+- * This chunk is used to communicate to the remote endpoint one of the
+- * configuration change requests that MUST be acknowledged.  The
+- * information carried in the ASCONF Chunk uses the form of a
+- * Tag-Length-Value (TLV), as described in "3.2.1
+- * Optional/Variable-length Parameter Format" in [RFC2960], for all
+- * variable parameters.
+- */
+-typedef struct {
+-	__u32	serial;
+-	__u8	reserved[3];
+-	__u8	addr_type;
+-	__u32	addr[4];
+-	sctpAsconfReq_t requests[0];
+-} sctpAsconf_t;
+-
+-/* ADDIP
+- * 3.1.2 Address/Stream Configuration Acknowledgment Chunk (ASCONF-ACK)
+- *
+- * ASCONF-Request Correlation ID: 32 bits (unsigned integer)
+- *
+- * This value is copied from the ASCONF Correlation ID received in the
+- * ASCONF Chunk. It is used by the receiver of the ASCONF-ACK to identify
+- * which ASCONF parameter this response is associated with.
+- *
+- * ASCONF Parameter Response : TLV format
+- *
+- * The ASCONF Parameter Response is used in the ASCONF-ACK to report
+- * status of ASCONF processing. By default, if a responding endpoint
+- * does not include any Error Cause, a success is indicated. Thus a
+- * sender of an ASCONF-ACK MAY indicate complete success of all TLVs in
+- * an ASCONF by returning only the Chunk Type, Chunk Flags, Chunk Length
+- * (set to 8) and the Serial Number.
+- */
+-typedef union {
+-	struct {
+-		__u32		correlation;
+-		sctp_paramhdr_t header;	/* success report */
+-	} success;
+-	struct {
+-		__u32		correlation;
+-		sctp_paramhdr_t header;	/* error cause indication */
+-		sctp_paramhdr_t errcause;
+-		uint8_t request[0];	/* original request from ASCONF */
+-	} error;
+-#define __correlation	success.correlation
+-#define __header	success.header
+-#define __cause		error.errcause
+-#define __request	error.request
+-}  sctpAsconfAckRsp_t;
+-
+-/* ADDIP
+- * 3.1.2 Address/Stream Configuration Acknowledgment Chunk (ASCONF-ACK)
+- *
+- * This chunk is used by the receiver of an ASCONF Chunk to
+- * acknowledge the reception. It carries zero or more results for any
+- * ASCONF Parameters that were processed by the receiver.
+- */
+-typedef struct {
+-	__u32	serial;
+-	sctpAsconfAckRsp_t responses[0];
+-} sctpAsconfAck_t;
+-
+-/*********************************************************************
+- * Internal structures
+- *
+- * These are data structures which never go out on the wire.
+- *********************************************************************/
+-
+-/* What is this data structure for?  The TLV isn't one--it is just a
+- * value.  Perhaps this data structure ought to have a type--otherwise
+- * it is not unambigiously parseable.  --piggy
+- */
+-typedef struct {
+-	struct list_head hook;
+-	int length;	/* length of the TLV */
+-
+-	/* the actually TLV to be copied into ASCONF_ACK */
+-	sctpAsconfAckRsp_t TLV;
+-} sctpAsconfAckRspNode_t;
+-
+ #endif /* __LINUX_SCTP_H__ */
+--- linux-2.6.0-test6/include/linux/security.h	2003-07-10 18:50:32.000000000 -0700
++++ 25/include/linux/security.h	2003-10-05 00:33:24.000000000 -0700
+@@ -334,6 +334,7 @@ struct swap_info_struct;
+  *	called when the actual read/write operations are performed.
+  *	@inode contains the inode structure to check.
+  *	@mask contains the permission mask.
++ *     @nd contains the nameidata (may be NULL).
+  *	Return 0 if permission is granted.
+  * @inode_setattr:
+  *	Check permission before setting file attributes.  Note that the kernel
+@@ -1055,7 +1056,7 @@ struct security_operations {
+ 	                           struct dentry *new_dentry);
+ 	int (*inode_readlink) (struct dentry *dentry);
+ 	int (*inode_follow_link) (struct dentry *dentry, struct nameidata *nd);
+-	int (*inode_permission) (struct inode *inode, int mask);
++	int (*inode_permission) (struct inode *inode, int mask, struct nameidata *nd);
+ 	int (*inode_setattr)	(struct dentry *dentry, struct iattr *attr);
+ 	int (*inode_getattr) (struct vfsmount *mnt, struct dentry *dentry);
+         void (*inode_delete) (struct inode *inode);
+@@ -1474,9 +1475,10 @@ static inline int security_inode_follow_
+ 	return security_ops->inode_follow_link (dentry, nd);
+ }
+ 
+-static inline int security_inode_permission (struct inode *inode, int mask)
++static inline int security_inode_permission (struct inode *inode, int mask,
++					     struct nameidata *nd)
+ {
+-	return security_ops->inode_permission (inode, mask);
++	return security_ops->inode_permission (inode, mask, nd);
+ }
+ 
+ static inline int security_inode_setattr (struct dentry *dentry,
+@@ -2110,7 +2112,8 @@ static inline int security_inode_follow_
+ 	return 0;
+ }
+ 
+-static inline int security_inode_permission (struct inode *inode, int mask)
++static inline int security_inode_permission (struct inode *inode, int mask,
++					     struct nameidata *nd)
+ {
+ 	return 0;
+ }
+--- linux-2.6.0-test6/include/linux/serial_core.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/linux/serial_core.h	2003-10-05 00:33:38.000000000 -0700
+@@ -158,7 +158,9 @@ struct uart_port {
+ 	unsigned char		x_char;			/* xon/xoff char */
+ 	unsigned char		regshift;		/* reg offset shift */
+ 	unsigned char		iotype;			/* io access style */
+-
++#ifdef CONFIG_KGDB
++	int			kgdb;			/* in use by kgdb */
++#endif
+ #define UPIO_PORT		(0)
+ #define UPIO_HUB6		(1)
+ #define UPIO_MEM		(2)
+--- linux-2.6.0-test6/include/linux/serialP.h	2003-06-14 12:17:57.000000000 -0700
++++ 25/include/linux/serialP.h	2003-10-05 00:33:25.000000000 -0700
+@@ -19,6 +19,7 @@
+  * For definitions of the flags field, see tty.h
+  */
+ 
++#include <linux/version.h>
+ #include <linux/config.h>
+ #include <linux/termios.h>
+ #include <linux/workqueue.h>
+--- linux-2.6.0-test6/include/linux/serio.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/linux/serio.h	2003-10-05 00:34:15.000000000 -0700
+@@ -53,6 +53,7 @@ struct serio_dev {
+ 	irqreturn_t (*interrupt)(struct serio *, unsigned char,
+ 			unsigned int, struct pt_regs *);
+ 	void (*connect)(struct serio *, struct serio_dev *dev);
++	int  (*reconnect)(struct serio *);
+ 	void (*disconnect)(struct serio *);
+ 	void (*cleanup)(struct serio *);
+ 
+@@ -62,12 +63,13 @@ struct serio_dev {
+ int serio_open(struct serio *serio, struct serio_dev *dev);
+ void serio_close(struct serio *serio);
+ void serio_rescan(struct serio *serio);
++void serio_reconnect(struct serio *serio);
+ irqreturn_t serio_interrupt(struct serio *serio, unsigned char data, unsigned int flags, struct pt_regs *regs);
+ 
+ void serio_register_port(struct serio *serio);
+-void serio_register_slave_port(struct serio *serio);
++void __serio_register_port(struct serio *serio);
+ void serio_unregister_port(struct serio *serio);
+-void serio_unregister_slave_port(struct serio *serio);
++void __serio_unregister_port(struct serio *serio);
+ void serio_register_device(struct serio_dev *dev);
+ void serio_unregister_device(struct serio_dev *dev);
+ 
+--- linux-2.6.0-test6/include/linux/skbuff.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/linux/skbuff.h	2003-10-05 00:36:10.000000000 -0700
+@@ -152,6 +152,7 @@ struct skb_shared_info {
+  *	@sk: Socket we are owned by
+  *	@stamp: Time we arrived
+  *	@dev: Device we arrived on/are leaving by
++ *      @real_dev: The real device we are using
+  *	@h: Transport layer header
+  *	@nh: Network layer header
+  *	@mac: Link layer header
+@@ -179,6 +180,7 @@ struct skb_shared_info {
+  *	@nfct: Associated connection, if any
+  *	@nf_debug: Netfilter debugging
+  *	@nf_bridge: Saved data about a bridged frame - see br_netfilter.c
++ *      @private: Data which is private to the HIPPI implementation
+  *	@tc_index: Traffic control index
+  */
+ 
+@@ -885,7 +887,7 @@ static inline char *__skb_pull(struct sk
+  */
+ static inline unsigned char *skb_pull(struct sk_buff *skb, unsigned int len)
+ {
+-	return (len > skb->len) ? NULL : __skb_pull(skb, len);
++	return unlikely(len > skb->len) ? NULL : __skb_pull(skb, len);
+ }
+ 
+ extern unsigned char *__pskb_pull_tail(struct sk_buff *skb, int delta);
+@@ -901,7 +903,7 @@ static inline char *__pskb_pull(struct s
+ 
+ static inline unsigned char *pskb_pull(struct sk_buff *skb, unsigned int len)
+ {
+-	return (len > skb->len) ? NULL : __pskb_pull(skb, len);
++	return unlikely(len > skb->len) ? NULL : __pskb_pull(skb, len);
+ }
+ 
+ static inline int pskb_may_pull(struct sk_buff *skb, unsigned int len)
+@@ -1052,7 +1054,7 @@ static inline struct sk_buff *__dev_allo
+ 					      int gfp_mask)
+ {
+ 	struct sk_buff *skb = alloc_skb(length + 16, gfp_mask);
+-	if (skb)
++	if (likely(skb))
+ 		skb_reserve(skb, 16);
+ 	return skb;
+ }
+--- linux-2.6.0-test6/include/linux/spinlock.h	2003-07-02 14:53:18.000000000 -0700
++++ 25/include/linux/spinlock.h	2003-10-05 00:36:40.000000000 -0700
+@@ -15,6 +15,12 @@
+ 
+ #include <asm/processor.h>	/* for cpu relax */
+ #include <asm/system.h>
++#ifdef CONFIG_KGDB
++#include <asm/current.h>
++#define SET_WHO(x, him) (x)->who = him;
++#else
++#define SET_WHO(x, him)
++#endif
+ 
+ /*
+  * Must define these before including other files, inline functions need them
+@@ -55,6 +61,9 @@ typedef struct {
+ 	const char *module;
+ 	char *owner;
+ 	int oline;
++#ifdef CONFIG_KGDB
++	struct task_struct *who;
++#endif
+ } spinlock_t;
+ #define SPIN_LOCK_UNLOCKED (spinlock_t) { SPINLOCK_MAGIC, 0, 10, __FILE__ , NULL, 0}
+ 
+@@ -66,6 +75,7 @@ typedef struct {
+ 		(x)->module = __FILE__; \
+ 		(x)->owner = NULL; \
+ 		(x)->oline = 0; \
++                SET_WHO(x, NULL) \
+ 	} while (0)
+ 
+ #define CHECK_LOCK(x) \
+@@ -88,6 +98,7 @@ typedef struct {
+ 		(x)->lock = 1; \
+ 		(x)->owner = __FILE__; \
+ 		(x)->oline = __LINE__; \
++                SET_WHO(x, current)       \
+ 	} while (0)
+ 
+ /* without debugging, spin_is_locked on UP always says
+@@ -118,6 +129,7 @@ typedef struct {
+ 		(x)->lock = 1; \
+ 		(x)->owner = __FILE__; \
+ 		(x)->oline = __LINE__; \
++                SET_WHO(x, current)       \
+ 		1; \
+ 	})
+ 
+@@ -184,6 +196,17 @@ typedef struct {
+ 
+ #endif /* !SMP */
+ 
++#ifdef CONFIG_LOCKMETER
++extern void _metered_spin_lock   (spinlock_t *lock);
++extern void _metered_spin_unlock (spinlock_t *lock);
++extern int  _metered_spin_trylock(spinlock_t *lock);
++extern void _metered_read_lock    (rwlock_t *lock);
++extern void _metered_read_unlock  (rwlock_t *lock);
++extern void _metered_write_lock   (rwlock_t *lock);
++extern void _metered_write_unlock (rwlock_t *lock);
++extern int  _metered_write_trylock(rwlock_t *lock);
++#endif
++
+ /*
+  * Define the various spin_lock and rw_lock methods.  Note we define these
+  * regardless of whether CONFIG_SMP or CONFIG_PREEMPT are set. The various
+@@ -389,6 +412,141 @@ do { \
+ 				_raw_spin_trylock(lock) ? 1 : \
+ 				({preempt_enable(); local_bh_enable(); 0;});})
+ 
++#ifdef CONFIG_LOCKMETER
++#undef spin_lock
++#undef spin_trylock
++#undef spin_unlock
++#undef spin_lock_irqsave
++#undef spin_lock_irq
++#undef spin_lock_bh
++#undef read_lock
++#undef read_unlock
++#undef write_lock
++#undef write_unlock
++#undef write_trylock
++#undef spin_unlock_bh
++#undef read_lock_irqsave
++#undef read_lock_irq
++#undef read_lock_bh
++#undef read_unlock_bh
++#undef write_lock_irqsave
++#undef write_lock_irq
++#undef write_lock_bh
++#undef write_unlock_bh
++
++#define spin_lock(lock) \
++do { \
++	preempt_disable(); \
++	_metered_spin_lock(lock); \
++} while(0)
++
++#define spin_trylock(lock)     ({preempt_disable(); _metered_spin_trylock(lock) ? \
++				1 : ({preempt_enable(); 0;});})
++#define spin_unlock(lock) \
++do { \
++	_metered_spin_unlock(lock); \
++	preempt_enable(); \
++} while (0)
++
++#define spin_lock_irqsave(lock, flags) \
++do { \
++	local_irq_save(flags); \
++	preempt_disable(); \
++	_metered_spin_lock(lock); \
++} while (0)
++
++#define spin_lock_irq(lock) \
++do { \
++	local_irq_disable(); \
++	preempt_disable(); \
++	_metered_spin_lock(lock); \
++} while (0)
++
++#define spin_lock_bh(lock) \
++do { \
++	local_bh_disable(); \
++	preempt_disable(); \
++	_metered_spin_lock(lock); \
++} while (0)
++
++#define spin_unlock_bh(lock) \
++do { \
++	_metered_spin_unlock(lock); \
++	preempt_enable(); \
++	local_bh_enable(); \
++} while (0)
++
++
++#define read_lock(lock)                ({preempt_disable(); _metered_read_lock(lock);})
++#define read_unlock(lock)      ({_metered_read_unlock(lock); preempt_enable();})
++#define write_lock(lock)       ({preempt_disable(); _metered_write_lock(lock);})
++#define write_unlock(lock)     ({_metered_write_unlock(lock); preempt_enable();})
++#define write_trylock(lock)    ({preempt_disable();_metered_write_trylock(lock) ? \
++				1 : ({preempt_enable(); 0;});})
++#define spin_unlock_no_resched(lock) \
++do { \
++	_metered_spin_unlock(lock); \
++	preempt_enable_no_resched(); \
++} while (0)
++
++#define read_lock_irqsave(lock, flags) \
++do { \
++	local_irq_save(flags); \
++	preempt_disable(); \
++	_metered_read_lock(lock); \
++} while (0)
++
++#define read_lock_irq(lock) \
++do { \
++	local_irq_disable(); \
++	preempt_disable(); \
++	_metered_read_lock(lock); \
++} while (0)
++
++#define read_lock_bh(lock) \
++do { \
++	local_bh_disable(); \
++	preempt_disable(); \
++	_metered_read_lock(lock); \
++} while (0)
++
++#define read_unlock_bh(lock) \
++do { \
++	_metered_read_unlock(lock); \
++	preempt_enable(); \
++	local_bh_enable(); \
++} while (0)
++
++#define write_lock_irqsave(lock, flags) \
++do { \
++	local_irq_save(flags); \
++	preempt_disable(); \
++	_metered_write_lock(lock); \
++} while (0)
++
++#define write_lock_irq(lock) \
++do { \
++	local_irq_disable(); \
++	preempt_disable(); \
++	_metered_write_lock(lock); \
++} while (0)
++
++#define write_lock_bh(lock) \
++do { \
++	local_bh_disable(); \
++	preempt_disable(); \
++	_metered_write_lock(lock); \
++} while (0)
++
++#define write_unlock_bh(lock) \
++do { \
++	_metered_write_unlock(lock); \
++	preempt_enable(); \
++	local_bh_enable(); \
++} while (0)
++
++#endif /* !CONFIG_LOCKMETER */
++
+ /* "lock on reference count zero" */
+ #ifndef ATOMIC_DEC_AND_LOCK
+ #include <asm/atomic.h>
+--- linux-2.6.0-test6/include/linux/stallion.h	2003-06-14 12:18:32.000000000 -0700
++++ 25/include/linux/stallion.h	2003-10-05 00:33:25.000000000 -0700
+@@ -21,6 +21,8 @@
+  *	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+  */
+ 
++#include <linux/version.h>
++
+ /*****************************************************************************/
+ #ifndef	_STALLION_H
+ #define	_STALLION_H
+--- linux-2.6.0-test6/include/linux/sysctl.h	2003-09-08 13:58:59.000000000 -0700
++++ 25/include/linux/sysctl.h	2003-10-05 00:33:25.000000000 -0700
+@@ -244,6 +244,7 @@ enum
+ 	NET_IPV4_NEIGH=17,
+ 	NET_IPV4_ROUTE=18,
+ 	NET_IPV4_FIB_HASH=19,
++	NET_IPV4_NETFILTER=20,
+ 
+ 	NET_IPV4_TCP_TIMESTAMPS=33,
+ 	NET_IPV4_TCP_WINDOW_SCALING=34,
+@@ -358,6 +359,24 @@ enum
+ 	NET_IPV4_CONF_NOPOLICY=16,
+ };
+ 
++/* /proc/sys/net/ipv4/netfilter */
++enum
++{
++	NET_IPV4_NF_CONNTRACK_MAX=1,
++	NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_SYN_SENT=2,
++	NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_SYN_RECV=3,
++	NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_ESTABLISHED=4,
++	NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_FIN_WAIT=5,
++	NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_CLOSE_WAIT=6,
++	NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_LAST_ACK=7,
++	NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_TIME_WAIT=8,
++	NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_CLOSE=9,
++	NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT=10,
++	NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT_STREAM=11,
++	NET_IPV4_NF_CONNTRACK_ICMP_TIMEOUT=12,
++	NET_IPV4_NF_CONNTRACK_GENERIC_TIMEOUT=13,
++};
++ 
+ /* /proc/sys/net/ipv6 */
+ enum {
+ 	NET_IPV6_CONF=16,
+--- linux-2.6.0-test6/include/linux/toshiba.h	2003-09-08 13:58:59.000000000 -0700
++++ 25/include/linux/toshiba.h	2003-10-05 00:33:25.000000000 -0700
+@@ -33,4 +33,13 @@ typedef struct {
+ 	unsigned int edi __attribute__ ((packed));
+ } SMMRegisters;
+ 
++#ifdef CONFIG_PROC_FS
++static int tosh_get_info(char *, char **, off_t, int);
++#else /* !CONFIG_PROC_FS */
++inline int tosh_get_info(char *buffer, char **start, off_t fpos, int lenght)
++{
++	return 0;
++}
++#endif /* CONFIG_PROC_FS */
++
+ #endif
+--- linux-2.6.0-test6/include/linux/usb.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/linux/usb.h	2003-10-05 00:33:25.000000000 -0700
+@@ -1038,9 +1038,9 @@ void usb_show_string(struct usb_device *
+ #define dbg(format, arg...) do {} while (0)
+ #endif
+ 
+-#define err(format, arg...) printk(KERN_ERR __FILE__ ": " format "\n" , ## arg)
+-#define info(format, arg...) printk(KERN_INFO __FILE__ ": " format "\n" , ## arg)
+-#define warn(format, arg...) printk(KERN_WARNING __FILE__ ": " format "\n" , ## arg)
++#define err(format, arg...) printk(KERN_ERR "%s: " format "\n" , __FILE__ , ## arg)
++#define info(format, arg...) printk(KERN_INFO "%s: " format "\n" , __FILE__ , ## arg)
++#define warn(format, arg...) printk(KERN_WARNING "%s: " format "\n" , __FILE__ , ## arg)
+ 
+ 
+ #endif  /* __KERNEL__ */
+--- linux-2.6.0-test6/include/linux/wait.h	2003-09-08 13:58:59.000000000 -0700
++++ 25/include/linux/wait.h	2003-10-05 00:36:54.000000000 -0700
+@@ -80,6 +80,15 @@ static inline int waitqueue_active(wait_
+ 	return !list_empty(&q->task_list);
+ }
+ 
++/*
++ * Used to distinguish between sync and async io wait context:
++ * sync i/o typically specifies a NULL wait queue entry or a wait
++ * queue entry bound to a task (current task) to wake up.
++ * aio specifies a wait queue entry with an async notification
++ * callback routine, not associated with any task.
++ */
++#define is_sync_wait(wait)	(!(wait) || ((wait)->task))
++
+ extern void FASTCALL(add_wait_queue(wait_queue_head_t *q, wait_queue_t * wait));
+ extern void FASTCALL(add_wait_queue_exclusive(wait_queue_head_t *q, wait_queue_t * wait));
+ extern void FASTCALL(remove_wait_queue(wait_queue_head_t *q, wait_queue_t * wait));
+--- linux-2.6.0-test6/include/linux/writeback.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/include/linux/writeback.h	2003-10-05 00:37:01.000000000 -0700
+@@ -84,9 +84,13 @@ int dirty_writeback_centisecs_handler(st
+ 				      void __user *, size_t *);
+ 
+ void page_writeback_init(void);
+-void balance_dirty_pages_ratelimited(struct address_space *mapping);
++int balance_dirty_pages_ratelimited(struct address_space *mapping);
+ int pdflush_operation(void (*fn)(unsigned long), unsigned long arg0);
+ int do_writepages(struct address_space *mapping, struct writeback_control *wbc);
++ssize_t sync_page_range(struct inode *inode, struct address_space *mapping,
++			loff_t pos, size_t count);
++ssize_t sync_page_range_nolock(struct inode *inode, struct address_space
++		*mapping, loff_t pos, size_t count);
+ 
+ /* pdflush.c */
+ extern int nr_pdflush_threads;	/* Global so it can be exported to sysctl
+--- linux-2.6.0-test6/include/net/irda/irda_device.h	2003-08-22 19:23:42.000000000 -0700
++++ 25/include/net/irda/irda_device.h	2003-10-05 00:33:25.000000000 -0700
+@@ -128,6 +128,7 @@ struct dongle_reg {
+ 	void (*close)(dongle_t *dongle);
+ 	int  (*reset)(struct irda_task *task);
+ 	int  (*change_speed)(struct irda_task *task);
++	struct module *owner;
+ };
+ 
+ /* 
+@@ -223,6 +224,7 @@ int  irda_device_set_raw_mode(struct net
+ int  irda_device_set_dtr_rts(struct net_device *dev, int dtr, int rts);
+ int  irda_device_change_speed(struct net_device *dev, __u32 speed);
+ void irda_device_setup(struct net_device *dev);
++struct net_device *alloc_irdadev(int sizeof_priv);
+ 
+ /* Dongle interface */
+ void irda_device_unregister_dongle(struct dongle_reg *dongle);
+--- linux-2.6.0-test6/include/net/pkt_sched.h	2003-08-08 22:55:14.000000000 -0700
++++ 25/include/net/pkt_sched.h	2003-10-05 00:33:25.000000000 -0700
+@@ -8,6 +8,7 @@
+ #define PSCHED_CLOCK_SOURCE	PSCHED_JIFFIES
+ 
+ #include <linux/config.h>
++#include <linux/netdevice.h>
+ #include <linux/types.h>
+ #include <linux/pkt_sched.h>
+ #include <net/pkt_cls.h>
+--- linux-2.6.0-test6/include/net/scm.h	2003-06-14 12:18:20.000000000 -0700
++++ 25/include/net/scm.h	2003-10-05 00:33:25.000000000 -0700
+@@ -39,7 +39,7 @@ static __inline__ int scm_send(struct so
+ 	memset(scm, 0, sizeof(*scm));
+ 	scm->creds.uid = current->uid;
+ 	scm->creds.gid = current->gid;
+-	scm->creds.pid = current->pid;
++	scm->creds.pid = current->tgid;
+ 	if (msg->msg_controllen <= 0)
+ 		return 0;
+ 	return __scm_send(sock, msg, scm);
+--- linux-2.6.0-test6/include/net/sctp/command.h	2003-08-08 22:55:14.000000000 -0700
++++ 25/include/net/sctp/command.h	2003-10-05 00:33:25.000000000 -0700
+@@ -1,5 +1,6 @@
+-/* SCTP kernel reference Implementation Copyright (C) 1999-2001
+- * Cisco, Motorola, and IBM
++/* SCTP kernel reference Implementation
++ * (C) Copyright IBM Corp. 2001, 2003
++ * Copyright (C) 1999-2001 Cisco, Motorola
+  *
+  * This file is part of the SCTP kernel reference Implementation
+  *
+@@ -88,6 +89,7 @@ typedef enum {
+ 	SCTP_CMD_PART_DELIVER,	 /* Partial data delivery considerations. */
+ 	SCTP_CMD_RENEGE,         /* Renege data on an association. */
+ 	SCTP_CMD_SETUP_T4,	 /* ADDIP, setup T4 RTO timer parms. */
++	SCTP_CMD_PROCESS_OPERR,  /* Process an ERROR chunk. */
+ 	SCTP_CMD_LAST
+ } sctp_verb_t;
+ 
+--- linux-2.6.0-test6/include/net/sctp/sctp.h	2003-09-08 13:58:59.000000000 -0700
++++ 25/include/net/sctp/sctp.h	2003-10-05 00:33:25.000000000 -0700
+@@ -116,6 +116,9 @@
+ #define SCTP_STATIC static
+ #endif
+ 
++#define MSECS_TO_JIFFIES(msec) (msec * HZ / 1000)
++#define JIFFIES_TO_MSECS(jiff) (jiff * 1000 / HZ)
++
+ /*
+  * Function declarations.
+  */
+@@ -495,22 +498,19 @@ for (err = (sctp_errhdr_t *)((void *)chu
+ #define tv_lt(s, t) \
+    (s.tv_sec < t.tv_sec || (s.tv_sec == t.tv_sec && s.tv_usec < t.tv_usec))
+ 
+-/* Stolen from net/profile.h.  Using it from there is more grief than
+- * it is worth.
+- */
+-static inline void tv_add(const struct timeval *entered, struct timeval *leaved)
+-{
+-	time_t usecs = leaved->tv_usec + entered->tv_usec;
+-	time_t secs = leaved->tv_sec + entered->tv_sec;
+-
+-	if (usecs >= 1000000) {
+-		usecs -= 1000000;
+-		secs++;
+-	}
+-	leaved->tv_sec = secs;
+-	leaved->tv_usec = usecs;
+-}
+-
++/* Add tv1 to tv2. */
++#define TIMEVAL_ADD(tv1, tv2) \
++({ \
++        suseconds_t usecs = (tv2).tv_usec + (tv1).tv_usec; \
++        time_t secs = (tv2).tv_sec + (tv1).tv_sec; \
++\
++        if (usecs >= 1000000) { \
++                usecs -= 1000000; \
++                secs++; \
++        } \
++        (tv2).tv_sec = secs; \
++        (tv2).tv_usec = usecs; \
++})
+ 
+ /* External references. */
+ 
+--- linux-2.6.0-test6/include/net/sctp/sm.h	2003-09-08 13:58:59.000000000 -0700
++++ 25/include/net/sctp/sm.h	2003-10-05 00:33:25.000000000 -0700
+@@ -265,13 +265,19 @@ struct sctp_chunk *sctp_make_op_error(co
+ struct sctp_chunk *sctp_make_asconf(struct sctp_association *asoc,
+ 				    union sctp_addr *addr,
+ 				    int vparam_len);
++struct sctp_chunk *sctp_make_asconf_update_ip(struct sctp_association *,
++					      union sctp_addr *,
++					      struct sockaddr *,
++					      int, int);
++struct sctp_chunk *sctp_make_asconf_set_prim(struct sctp_association *asoc,
++					     union sctp_addr *addr);
++struct sctp_chunk *sctp_make_asconf_ack(struct sctp_association *asoc,
++					int serial, int vparam_len);
++
+ struct sctp_chunk *sctp_process_asconf(struct sctp_association *asoc,
+ 				       struct sctp_chunk *asconf,
+ 				       int vparam_len);
+ 
+-struct sctp_chunk *sctp_make_asconf_set_prim(struct sctp_association *asoc,
+-					     union sctp_addr *addr);
+-
+ void sctp_chunk_assign_tsn(struct sctp_chunk *);
+ void sctp_chunk_assign_ssn(struct sctp_chunk *);
+ 
+--- linux-2.6.0-test6/include/net/sctp/structs.h	2003-09-08 13:58:59.000000000 -0700
++++ 25/include/net/sctp/structs.h	2003-10-05 00:33:25.000000000 -0700
+@@ -1085,6 +1085,10 @@ int sctp_add_bind_addr(struct sctp_bind_
+ int sctp_del_bind_addr(struct sctp_bind_addr *, union sctp_addr *);
+ int sctp_bind_addr_match(struct sctp_bind_addr *, const union sctp_addr *,
+ 			 struct sctp_opt *);
++union sctp_addr *sctp_find_unmatch_addr(struct sctp_bind_addr	*bp,
++					const union sctp_addr	*addrs,
++					int			addrcnt,
++					struct sctp_opt		*opt);
+ union sctp_params sctp_bind_addrs_to_raw(const struct sctp_bind_addr *bp,
+ 					 int *addrs_len, int gfp);
+ int sctp_raw_to_bind_addrs(struct sctp_bind_addr *bp, __u8 *raw, int len,
+@@ -1389,6 +1393,10 @@ struct sctp_association {
+ 		__u8	ipv4_address;	 /* Peer understands IPv4 addresses? */
+ 		__u8	ipv6_address;	 /* Peer understands IPv6 addresses? */
+ 		__u8	hostname_address;/* Peer understands DNS addresses? */
++
++		/* Does peer support ADDIP? */
++		__u8    asconf_capable;
++
+ 		struct sctp_inithdr i;
+ 		int cookie_len;
+ 		void *cookie;
+--- linux-2.6.0-test6/include/sound/sndmagic.h	2003-06-14 12:18:06.000000000 -0700
++++ 25/include/sound/sndmagic.h	2003-10-05 00:33:25.000000000 -0700
+@@ -198,6 +198,8 @@ static inline int _snd_magic_bad(void *o
+ #define vx_pipe_t_magic				0xa15a4112
+ #define azf3328_t_magic				0xa15a4200
+ 
++#define snd_card_harmony_t_magic		0xa15a4300
++
+ #else
+ 
+ #define snd_magic_kcalloc(type, extra, flags) (type *) snd_kcalloc(sizeof(type) + extra, flags)
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/include/video/epson1355.h	2003-10-05 00:34:22.000000000 -0700
+@@ -0,0 +1,64 @@
++/*
++ * include/video/epson13xx.h -- Epson 13xx frame buffer
++ *
++ * Copyright (C) Hewlett-Packard Company.  All rights reserved.
++ *
++ * Written by Christopher Hoover <ch@hpl.hp.com>
++ *
++ */
++
++#ifndef _EPSON13XX_H_
++#define _EPSON13XX_H_
++
++#define REG_REVISION_CODE              0x00
++#define REG_MEMORY_CONFIG              0x01
++#define REG_PANEL_TYPE                 0x02
++#define REG_MOD_RATE                   0x03
++#define REG_HORZ_DISP_WIDTH            0x04
++#define REG_HORZ_NONDISP_PERIOD        0x05
++#define REG_HRTC_START_POSITION        0x06
++#define REG_HRTC_PULSE_WIDTH           0x07
++#define REG_VERT_DISP_HEIGHT0          0x08
++#define REG_VERT_DISP_HEIGHT1          0x09
++#define REG_VERT_NONDISP_PERIOD        0x0A
++#define REG_VRTC_START_POSITION        0x0B
++#define REG_VRTC_PULSE_WIDTH           0x0C
++#define REG_DISPLAY_MODE               0x0D
++#define REG_SCRN1_LINE_COMPARE0        0x0E
++#define REG_SCRN1_LINE_COMPARE1        0x0F
++#define REG_SCRN1_DISP_START_ADDR0     0x10
++#define REG_SCRN1_DISP_START_ADDR1     0x11
++#define REG_SCRN1_DISP_START_ADDR2     0x12
++#define REG_SCRN2_DISP_START_ADDR0     0x13
++#define REG_SCRN2_DISP_START_ADDR1     0x14
++#define REG_SCRN2_DISP_START_ADDR2     0x15
++#define REG_MEM_ADDR_OFFSET0           0x16
++#define REG_MEM_ADDR_OFFSET1           0x17
++#define REG_PIXEL_PANNING              0x18
++#define REG_CLOCK_CONFIG               0x19
++#define REG_POWER_SAVE_CONFIG          0x1A
++#define REG_MISC                       0x1B
++#define REG_MD_CONFIG_READBACK0        0x1C
++#define REG_MD_CONFIG_READBACK1        0x1D
++#define REG_GPIO_CONFIG0               0x1E
++#define REG_GPIO_CONFIG1               0x1F
++#define REG_GPIO_CONTROL0              0x20
++#define REG_GPIO_CONTROL1              0x21
++#define REG_PERF_ENHANCEMENT0          0x22
++#define REG_PERF_ENHANCEMENT1          0x23
++#define REG_LUT_ADDR                   0x24
++#define REG_RESERVED_1                 0x25
++#define REG_LUT_DATA                   0x26
++#define REG_INK_CURSOR_CONTROL         0x27
++#define REG_CURSOR_X_POSITION0         0x28
++#define REG_CURSOR_X_POSITION1         0x29
++#define REG_CURSOR_Y_POSITION0         0x2A
++#define REG_CURSOR_Y_POSITION1         0x2B
++#define REG_INK_CURSOR_COLOR0_0        0x2C
++#define REG_INK_CURSOR_COLOR0_1        0x2D
++#define REG_INK_CURSOR_COLOR1_0        0x2E
++#define REG_INK_CURSOR_COLOR1_1        0x2F
++#define REG_INK_CURSOR_START_ADDR      0x30
++#define REG_ALTERNATE_FRM              0x31
++
++#endif
+--- linux-2.6.0-test6/include/video/neomagic.h	2003-06-14 12:18:07.000000000 -0700
++++ 25/include/video/neomagic.h	2003-10-05 00:34:22.000000000 -0700
+@@ -55,6 +55,20 @@
+ #define NEO_MODE1_X_1600        0x1c00
+ #define NEO_MODE1_BLT_ON_ADDR   0x2000
+ 
++/* These are offseted in MMIO space by par->CursorOff */
++#define NEOREG_CURSCNTL		0x00
++#define NEOREG_CURSX		0x04
++#define NEOREG_CURSY		0x08
++#define NEOREG_CURSBGCOLOR	0x0C
++#define NEOREG_CURSFGCOLOR	0x10
++#define NEOREG_CURSMEMPOS	0x14
++
++#define NEO_CURS_DISABLE	0x00000000
++#define NEO_CURS_ENABLE		0x00000001
++#define NEO_ICON64_ENABLE	0x00000008
++#define NEO_ICON128_ENABLE	0x0000000C
++#define NEO_ICON_BLANK		0x00000010
++
+ #ifdef __KERNEL__
+ 
+ #ifdef NEOFB_DEBUG
+@@ -75,45 +89,45 @@
+ 
+ 
+ struct xtimings {
+-  unsigned int pixclock;
+-  unsigned int HDisplay;
+-  unsigned int HSyncStart;
+-  unsigned int HSyncEnd;
+-  unsigned int HTotal;
+-  unsigned int VDisplay;
+-  unsigned int VSyncStart;
+-  unsigned int VSyncEnd;
+-  unsigned int VTotal;
+-  unsigned int sync;
+-  int	       dblscan;
+-  int	       interlaced;
++	unsigned int pixclock;
++	unsigned int HDisplay;
++	unsigned int HSyncStart;
++	unsigned int HSyncEnd;
++	unsigned int HTotal;
++	unsigned int VDisplay;
++	unsigned int VSyncStart;
++	unsigned int VSyncEnd;
++	unsigned int VTotal;
++	unsigned int sync;
++	int dblscan;
++	int interlaced;
+ };
+ 
+ 
+ /* --------------------------------------------------------------------- */
+ 
+ typedef volatile struct {
+-  __u32 bltStat;
+-  __u32 bltCntl;
+-  __u32 xpColor;
+-  __u32 fgColor;
+-  __u32 bgColor;
+-  __u32 pitch;
+-  __u32 clipLT;
+-  __u32 clipRB;
+-  __u32 srcBitOffset;
+-  __u32 srcStart;
+-  __u32 reserved0;
+-  __u32 dstStart;
+-  __u32 xyExt;
+-
+-  __u32 reserved1[19];
+-
+-  __u32 pageCntl;
+-  __u32 pageBase;
+-  __u32 postBase;
+-  __u32 postPtr;
+-  __u32 dataPtr;
++	__u32 bltStat;
++	__u32 bltCntl;
++	__u32 xpColor;
++	__u32 fgColor;
++	__u32 bgColor;
++	__u32 pitch;
++	__u32 clipLT;
++	__u32 clipRB;
++	__u32 srcBitOffset;
++	__u32 srcStart;
++	__u32 reserved0;
++	__u32 dstStart;
++	__u32 xyExt;
++
++	__u32 reserved1[19];
++
++	__u32 pageCntl;
++	__u32 pageBase;
++	__u32 postBase;
++	__u32 postPtr;
++	__u32 dataPtr;
+ } Neo2200;
+ 
+ #define NR_PALETTE	256
+@@ -124,142 +138,69 @@ typedef volatile struct {
+ #define NEO_EXT_GR_MAX 0xC7
+ 
+ struct neofb_par {
+-  
+-  unsigned char MiscOutReg;     /* Misc */
+-  unsigned char CRTC[25];       /* Crtc Controller */
+-  unsigned char Sequencer[5];   /* Video Sequencer */
+-  unsigned char Graphics[9];    /* Video Graphics */
+-  unsigned char Attribute[21];  /* Video Atribute */
+-
+-  unsigned char GeneralLockReg;
+-  unsigned char ExtCRTDispAddr;
+-  unsigned char ExtCRTOffset;
+-  unsigned char SysIfaceCntl1;
+-  unsigned char SysIfaceCntl2;
+-  unsigned char ExtColorModeSelect;
+-  unsigned char biosMode;
+-
+-  unsigned char PanelDispCntlReg1;
+-  unsigned char PanelDispCntlReg2;
+-  unsigned char PanelDispCntlReg3;
+-  unsigned char PanelVertCenterReg1;
+-  unsigned char PanelVertCenterReg2;
+-  unsigned char PanelVertCenterReg3;
+-  unsigned char PanelVertCenterReg4;
+-  unsigned char PanelVertCenterReg5;
+-  unsigned char PanelHorizCenterReg1;
+-  unsigned char PanelHorizCenterReg2;
+-  unsigned char PanelHorizCenterReg3;
+-  unsigned char PanelHorizCenterReg4;
+-  unsigned char PanelHorizCenterReg5;
+-
+-  int           ProgramVCLK;
+-  unsigned char VCLK3NumeratorLow;
+-  unsigned char VCLK3NumeratorHigh;
+-  unsigned char VCLK3Denominator;
+-  unsigned char VerticalExt;
++	struct vgastate state;
++	atomic_t ref_count;
++
++	unsigned char MiscOutReg;	/* Misc */
++	unsigned char CRTC[25];		/* Crtc Controller */
++	unsigned char Sequencer[5];	/* Video Sequencer */
++	unsigned char Graphics[9];	/* Video Graphics */
++	unsigned char Attribute[21];	/* Video Atribute */
++
++	unsigned char GeneralLockReg;
++	unsigned char ExtCRTDispAddr;
++	unsigned char ExtCRTOffset;
++	unsigned char SysIfaceCntl1;
++	unsigned char SysIfaceCntl2;
++	unsigned char ExtColorModeSelect;
++	unsigned char biosMode;
++
++	unsigned char PanelDispCntlReg1;
++	unsigned char PanelDispCntlReg2;
++	unsigned char PanelDispCntlReg3;
++	unsigned char PanelVertCenterReg1;
++	unsigned char PanelVertCenterReg2;
++	unsigned char PanelVertCenterReg3;
++	unsigned char PanelVertCenterReg4;
++	unsigned char PanelVertCenterReg5;
++	unsigned char PanelHorizCenterReg1;
++	unsigned char PanelHorizCenterReg2;
++	unsigned char PanelHorizCenterReg3;
++	unsigned char PanelHorizCenterReg4;
++	unsigned char PanelHorizCenterReg5;
++
++	int ProgramVCLK;
++	unsigned char VCLK3NumeratorLow;
++	unsigned char VCLK3NumeratorHigh;
++	unsigned char VCLK3Denominator;
++	unsigned char VerticalExt;
+ 
+ #ifdef CONFIG_MTRR
+-  int    mtrr;
++	int mtrr;
+ #endif
+-  u8    *mmio_vbase;
+-
+-  Neo2200 *neo2200;
+-
+-  /* Panels size */
+-  int NeoPanelWidth;
+-  int NeoPanelHeight;
+-
+-  int maxClock;
+-
+-  int pci_burst;
+-  int lcd_stretch;
+-  int internal_display;
+-  int external_display;
+-  int libretto;
++	u8 *mmio_vbase;
++	u8 cursorOff;
++	u8 *cursorPad;		/* Must die !! */
++
++	Neo2200 *neo2200;
++
++	/* Panels size */
++	int NeoPanelWidth;
++	int NeoPanelHeight;
++
++	int maxClock;
++
++	int pci_burst;
++	int lcd_stretch;
++	int internal_display;
++	int external_display;
++	int libretto;
+ };
+ 
+ typedef struct {
+-    int x_res;
+-    int y_res;
+-    int mode;
++	int x_res;
++	int y_res;
++	int mode;
+ } biosMode;
+ 
+-/* vga IO functions */
+-static inline u8 VGArCR (u8 index)
+-{
+-  outb (index, 0x3d4);
+-  return inb (0x3d5);
+-}
+-
+-static inline void VGAwCR (u8 index, u8 val)
+-{
+-  outb (index, 0x3d4);
+-  outb (val, 0x3d5);
+-}
+-
+-static inline u8 VGArGR (u8 index)
+-{
+-  outb (index, 0x3ce);
+-  return inb (0x3cf);
+-}
+-
+-static inline void VGAwGR (u8 index, u8 val)
+-{
+-  outb (index, 0x3ce);
+-  outb (val, 0x3cf);
+-}
+-
+-static inline u8 VGArSEQ (u8 index)
+-{
+-  outb (index, 0x3c4);
+-  return inb (0x3c5);
+-}
+-
+-static inline void VGAwSEQ (u8 index, u8 val)
+-{
+-  outb (index, 0x3c4);
+-  outb (val, 0x3c5);
+-}
+-
+-
+-static int paletteEnabled = 0;
+-
+-static inline void VGAenablePalette (void)
+-{
+-  u8 tmp;
+-
+-  tmp = inb (0x3da);
+-  outb (0x00, 0x3c0);
+-  paletteEnabled = 1;
+-}
+-
+-static inline void VGAdisablePalette (void)
+-{
+-  u8 tmp;
+-
+-  tmp = inb (0x3da);
+-  outb (0x20, 0x3c0);
+-  paletteEnabled = 0;
+-}
+-
+-static inline void VGAwATTR (u8 index, u8 value)
+-{
+-  u8 tmp;
+-
+-  if (paletteEnabled)
+-    index &= ~0x20;
+-  else
+-    index |= 0x20;
+-
+-  tmp = inb (0x3da);
+-  outb (index, 0x3c0);
+-  outb (value, 0x3c0);
+-}
+-
+-static inline void VGAwMISC (u8 value)
+-{
+-  outb (value, 0x3c2);
+-}
+ #endif
+-
+--- linux-2.6.0-test6/include/video/sisfb.h	2003-09-08 13:58:59.000000000 -0700
++++ 25/include/video/sisfb.h	2003-10-05 00:34:22.000000000 -0700
+@@ -6,6 +6,53 @@
+ #include <asm/ioctl.h>
+ #include <asm/types.h>
+ 
++/* TW: vbflags */
++#define CRT2_DEFAULT            0x00000001
++#define CRT2_LCD                0x00000002  /* TW: Never change the order of the CRT2_XXX entries */
++#define CRT2_TV                 0x00000004  /*     (see SISCycleCRT2Type())                       */
++#define CRT2_VGA                0x00000008
++#define CRT2_ENABLE		(CRT2_LCD | CRT2_TV | CRT2_VGA)
++#define VB_DISPTYPE_DISP2	CRT2_ENABLE
++#define VB_DISPTYPE_CRT2	CRT2_ENABLE
++#define TV_NTSC                 0x00000010
++#define TV_PAL                  0x00000020
++#define TV_HIVISION             0x00000040
++#define TV_HIVISION_LV          0x00000080
++#define TV_TYPE                 (TV_NTSC | TV_PAL | TV_HIVISION | TV_HIVISION_LV)
++#define TV_AVIDEO               0x00000100
++#define TV_SVIDEO               0x00000200
++#define TV_SCART                0x00000400
++#define TV_INTERFACE            (TV_AVIDEO | TV_SVIDEO | TV_SCART | TV_CHSCART | TV_CHHDTV)
++#define VB_USELCDA		0x00000800
++#define TV_PALM                 0x00001000
++#define TV_PALN                 0x00002000
++#define TV_CHSCART              0x00008000
++#define TV_CHHDTV               0x00010000
++#define VGA2_CONNECTED          0x00040000
++#define VB_DISPTYPE_CRT1	0x00080000  	/* CRT1 connected and used */
++#define VBDISPTYPE_DISP1	VB_DISPTYPE_CRT1
++#define VB_301                  0x00100000	/* Video bridge type */
++#define VB_301B                 0x00200000
++#define VB_302B                 0x00400000
++#define VB_30xBDH		0x00800000      /* 30xB DH version (w/o LCD support) */
++#define VB_LVDS                 0x01000000
++#define VB_CHRONTEL             0x02000000
++#define VB_301LV                0x04000000
++#define VB_302LV                0x08000000
++#define VB_TRUMPION		0x10000000
++#define VB_VIDEOBRIDGE		(VB_301|VB_301B|VB_302B|VB_301LV|VB_302LV| \
++				 VB_LVDS|VB_CHRONTEL|VB_TRUMPION)
++#define VB_SISBRIDGE            (VB_301|VB_301B|VB_302B|VB_301LV|VB_302LV)
++#define VB_SINGLE_MODE          0x20000000   	 /* CRT1 or CRT2; determined by VB_DISPTYPE_CRTx */
++#define VB_DISPMODE_SINGLE	VB_SINGLE_MODE
++#define VB_MIRROR_MODE		0x40000000   	 /* CRT1 + CRT2 identical (mirror mode) */
++#define VB_DISPMODE_MIRROR	VB_MIRROR_MODE
++#define VB_DUALVIEW_MODE	0x80000000   	 /* CRT1 + CRT2 independent (dual head mode) */
++#define VB_DISPMODE_DUAL	VB_DUALVIEW_MODE
++#define VB_DISPLAY_MODE         (VB_SINGLE_MODE | VB_MIRROR_MODE | VB_DUALVIEW_MODE)
++
++
++/* entries for disp_state - deprecated as of 1.6.02 */
+ #define DISPTYPE_CRT1       0x00000008L
+ #define DISPTYPE_CRT2       0x00000004L
+ #define DISPTYPE_LCD        0x00000002L
+@@ -16,6 +63,7 @@
+ #define DISPMODE_MIRROR	    0x00000010L
+ #define DISPMODE_DUALVIEW   0x00000040L
+ 
++/* Deprecated as of 1.6.02 - use vbflags instead */
+ #define HASVB_NONE      	0x00
+ #define HASVB_301       	0x01
+ #define HASVB_LVDS      	0x02
+@@ -39,6 +87,8 @@ typedef enum _SIS_CHIP_TYPE {
+ 	SIS_650,
+ 	SIS_740,
+ 	SIS_330,
++	SIS_660,
++	SIS_760,
+ 	MAX_SIS_CHIP
+ } SIS_CHIP_TYPE;
+ 
+@@ -83,13 +133,15 @@ struct ap_data {
+ 	struct mode_info minfo;
+ 	unsigned long iobase;
+ 	unsigned int  mem_size;
+-	unsigned long disp_state;    	
++	unsigned long disp_state;  /* deprecated */
+ 	SIS_CHIP_TYPE chip;
+ 	unsigned char hasVB;
+-	SIS_TV_TYPE TV_type;
+-	SIS_TV_PLUG TV_plug;
++	SIS_TV_TYPE TV_type;	   /* deprecated */
++	SIS_TV_PLUG TV_plug;	   /* deprecated */
+ 	unsigned long version;
+-	char reserved[256];
++	unsigned long vbflags;	   /* replaces deprecated entries above */
++	unsigned long currentvbflags;
++	char reserved[248];
+ };
+ 
+ struct video_info {
+@@ -114,10 +166,10 @@ struct video_info {
+ 	int    video_linelength;
+ 	unsigned int refresh_rate;
+ 
+-	unsigned long disp_state;
+-	unsigned char hasVB;
+-	unsigned char TV_type;
+-	unsigned char TV_plug;
++	unsigned long disp_state;		/* DEPRECATED */
++	unsigned char hasVB;			/* DEPRECATED */
++	unsigned char TV_type;			/* DEPRECATED */
++	unsigned char TV_plug;			/* DEPRECATED */
+ 
+ 	SIS_CHIP_TYPE chip;
+ 	unsigned char revision_id;
+@@ -137,7 +189,18 @@ struct video_info {
+ 	unsigned short subsysvendor;
+ 	unsigned short subsysdevice;
+ 
+-	char reserved[236];
++	unsigned long  vbflags;			/* Replacing deprecated stuff from above */
++	unsigned long  currentvbflags;
++
++	int    current_bpp;
++	int    current_width;
++	int    current_height;
++	int    current_htotal;
++	int    current_vtotal;
++	__u32  current_pixclock;
++	int    current_refresh_rate;
++
++	char reserved[200];
+ };
+ 
+ 
+@@ -185,7 +248,13 @@ struct _SISFB_INFO {
+ 	
+ 	unsigned char sisfb_lcda;	/* Detected status of LCDA for low res/text modes */
+ 
+-	char reserved[235]; 		/* for future use */
++	unsigned long sisfb_vbflags;
++	unsigned long sisfb_currentvbflags;
++
++	int sisfb_scalelcd;
++	unsigned long sisfb_specialtiming;
++
++	char reserved[219]; 		/* for future use */
+ };
+ 
+ #ifdef __KERNEL__
+--- linux-2.6.0-test6/init/do_mounts.h	2003-09-27 18:57:47.000000000 -0700
++++ 25/init/do_mounts.h	2003-10-05 00:33:25.000000000 -0700
+@@ -104,4 +104,3 @@ void md_run_setup(void);
+ static inline void md_run_setup(void) {}
+ 
+ #endif
+-
+--- linux-2.6.0-test6/init/do_mounts_initrd.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/init/do_mounts_initrd.c	2003-10-05 00:33:53.000000000 -0700
+@@ -9,6 +9,8 @@
+ 
+ #include "do_mounts.h"
+ 
++unsigned long initrd_start, initrd_end;
++int initrd_below_start_ok;
+ unsigned int real_root_dev;	/* do_proc_dointvec cannot handle kdev_t */
+ static int __initdata old_fd, root_fd;
+ static int __initdata mount_initrd = 1;
+@@ -99,18 +101,20 @@ static void __init handle_initrd(void)
+ 
+ int __init initrd_load(void)
+ {
+-	if (!mount_initrd)
+-		return 0;
+-
+-	create_dev("/dev/ram", MKDEV(RAMDISK_MAJOR, 0), NULL);
+-	create_dev("/dev/initrd", MKDEV(RAMDISK_MAJOR, INITRD_MINOR), NULL);
+-	/* Load the initrd data into /dev/ram0. Execute it as initrd unless
+-	 * /dev/ram0 is supposed to be our actual root device, in
+-	 * that case the ram disk is just set up here, and gets
+-	 * mounted in the normal path. */
+-	if (rd_load_image("/dev/initrd") && ROOT_DEV != Root_RAM0) {
+-		handle_initrd();
+-		return 1;
++	if (mount_initrd) {
++		create_dev("/dev/ram", Root_RAM0, NULL);
++		/*
++		 * Load the initrd data into /dev/ram0. Execute it as initrd
++		 * unless /dev/ram0 is supposed to be our actual root device,
++		 * in that case the ram disk is just set up here, and gets
++		 * mounted in the normal path.
++		 */
++		if (rd_load_image("/dev/initrd") && ROOT_DEV != Root_RAM0) {
++			sys_unlink("/dev/initrd");
++			handle_initrd();
++			return 1;
++		}
+ 	}
++	sys_unlink("/dev/initrd");
+ 	return 0;
+ }
+--- linux-2.6.0-test6/init/initramfs.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/init/initramfs.c	2003-10-05 00:33:53.000000000 -0700
+@@ -8,9 +8,11 @@
+ #include <linux/delay.h>
+ #include <linux/string.h>
+ 
++static __initdata char *message;
+ static void __init error(char *x)
+ {
+-	panic("populate_root: %s\n", x);
++	if (!message)
++		message = x;
+ }
+ 
+ static void __init *malloc(int size)
+@@ -63,7 +65,7 @@ static char __init *find_link(int major,
+ 	}
+ 	q = (struct hash *)malloc(sizeof(struct hash));
+ 	if (!q)
+-		error("can't allocate link hash entry");
++		panic("can't allocate link hash entry");
+ 	q->ino = ino;
+ 	q->minor = minor;
+ 	q->major = major;
+@@ -119,7 +121,7 @@ static void __init parse_header(char *s)
+ 
+ /* FSM */
+ 
+-enum state {
++static __initdata enum state {
+ 	Start,
+ 	Collect,
+ 	GotHeader,
+@@ -130,9 +132,11 @@ enum state {
+ 	Reset
+ } state, next_state;
+ 
+-char *victim;
+-unsigned count;
+-loff_t this_header, next_header;
++static __initdata char *victim;
++static __initdata unsigned count;
++static __initdata loff_t this_header, next_header;
++
++static __initdata int dry_run;
+ 
+ static inline void eat(unsigned n)
+ {
+@@ -185,23 +189,30 @@ static int __init do_collect(void)
+ 
+ static int __init do_header(void)
+ {
++	if (memcmp(collected, "070701", 6)) {
++		error("no cpio magic");
++		return 1;
++	}
+ 	parse_header(collected);
+ 	next_header = this_header + N_ALIGN(name_len) + body_len;
+ 	next_header = (next_header + 3) & ~3;
++	if (dry_run) {
++		read_into(name_buf, N_ALIGN(name_len), GotName);
++		return 0;
++	}
++	state = SkipIt;
+ 	if (name_len <= 0 || name_len > PATH_MAX)
+-		state = SkipIt;
+-	else if (S_ISLNK(mode)) {
++		return 0;
++	if (S_ISLNK(mode)) {
+ 		if (body_len > PATH_MAX)
+-			state = SkipIt;
+-		else {
+-			collect = collected = symlink_buf;
+-			remains = N_ALIGN(name_len) + body_len;
+-			next_state = GotSymlink;
+-			state = Collect;
+-		}
+-	} else if (body_len && !S_ISREG(mode))
+-		state = SkipIt;
+-	else
++			return 0;
++		collect = collected = symlink_buf;
++		remains = N_ALIGN(name_len) + body_len;
++		next_state = GotSymlink;
++		state = Collect;
++		return 0;
++	}
++	if (S_ISREG(mode) || !body_len)
+ 		read_into(name_buf, N_ALIGN(name_len), GotName);
+ 	return 0;
+ }
+@@ -248,6 +259,8 @@ static int __init do_name(void)
+ 		next_state = Reset;
+ 		return 0;
+ 	}
++	if (dry_run)
++		return 0;
+ 	if (S_ISREG(mode)) {
+ 		if (maybe_link() >= 0) {
+ 			wfd = sys_open(collected, O_WRONLY|O_CREAT, mode);
+@@ -268,8 +281,7 @@ static int __init do_name(void)
+ 			sys_chown(collected, uid, gid);
+ 			sys_chmod(collected, mode);
+ 		}
+-	} else
+-		panic("populate_root: bogus mode: %o\n", mode);
++	}
+ 	return 0;
+ }
+ 
+@@ -323,13 +335,14 @@ static int __init write_buffer(char *buf
+ static void __init flush_buffer(char *buf, unsigned len)
+ {
+ 	int written;
+-	while ((written = write_buffer(buf, len)) < len) {
++	if (message)
++		return;
++	while ((written = write_buffer(buf, len)) < len && !message) {
+ 		char c = buf[written];
+ 		if (c == '0') {
+ 			buf += written;
+ 			len -= written;
+ 			state = Start;
+-			continue;
+ 		} else
+ 			error("junk in compressed archive");
+ 	}
+@@ -408,18 +421,20 @@ static void __init flush_window(void)
+ 	outcnt = 0;
+ }
+ 
+-static void __init unpack_to_rootfs(char *buf, unsigned len)
++char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only)
+ {
+ 	int written;
++	dry_run = check_only;
+ 	header_buf = malloc(110);
+ 	symlink_buf = malloc(PATH_MAX + N_ALIGN(PATH_MAX) + 1);
+ 	name_buf = malloc(N_ALIGN(PATH_MAX));
+ 	window = malloc(WSIZE);
+ 	if (!window || !header_buf || !symlink_buf || !name_buf)
+-		error("can't allocate buffers");
++		panic("can't allocate buffers");
+ 	state = Start;
+ 	this_header = 0;
+-	while (len) {
++	message = NULL;
++	while (!message && len) {
+ 		loff_t saved_offset = this_header;
+ 		if (*buf == '0' && !(this_header & 3)) {
+ 			state = Start;
+@@ -427,7 +442,8 @@ static void __init unpack_to_rootfs(char
+ 			buf += written;
+ 			len -= written;
+ 			continue;
+-		} else if (!*buf) {
++		}
++		if (!*buf) {
+ 			buf++;
+ 			len--;
+ 			this_header++;
+@@ -442,7 +458,7 @@ static void __init unpack_to_rootfs(char
+ 		crc = (ulg)0xffffffffL; /* shift register contents */
+ 		makecrc();
+ 		if (gunzip())
+-			error("ungzip failed");
++			message = "ungzip failed";
+ 		if (state != Reset)
+ 			error("junk in gzipped archive");
+ 		this_header = saved_offset + inptr;
+@@ -453,12 +469,41 @@ static void __init unpack_to_rootfs(char
+ 	free(name_buf);
+ 	free(symlink_buf);
+ 	free(header_buf);
++	return message;
+ }
+ 
+ extern char __initramfs_start, __initramfs_end;
++#ifdef CONFIG_BLK_DEV_INITRD
++#include <linux/initrd.h>
++#endif
+ 
+ void __init populate_rootfs(void)
+ {
+-	unpack_to_rootfs(&__initramfs_start,
+-			 &__initramfs_end - &__initramfs_start);
++	char *err = unpack_to_rootfs(&__initramfs_start,
++			 &__initramfs_end - &__initramfs_start, 0);
++	if (err)
++		panic(err);
++#ifdef CONFIG_BLK_DEV_INITRD
++	if (initrd_start) {
++		int fd;
++		printk(KERN_INFO "checking if image is initramfs...");
++		err = unpack_to_rootfs((char *)initrd_start,
++			initrd_end - initrd_start, 1);
++		if (!err) {
++			printk(" it is\n");
++			unpack_to_rootfs((char *)initrd_start,
++				initrd_end - initrd_start, 0);
++			free_initrd_mem(initrd_start, initrd_end);
++			return;
++		}
++		printk("it isn't (%s); looks like an initrd\n", err);
++		fd = sys_open("/dev/initrd", O_WRONLY|O_CREAT, 700);
++		if (fd >= 0) {
++			sys_write(fd, (char *)initrd_start,
++					initrd_end - initrd_start);
++			sys_close(fd);
++			free_initrd_mem(initrd_start, initrd_end);
++		}
++	}
++#endif
+ }
+--- linux-2.6.0-test6/init/main.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/init/main.c	2003-10-05 00:36:25.000000000 -0700
+@@ -37,6 +37,7 @@
+ #include <linux/moduleparam.h>
+ #include <linux/writeback.h>
+ #include <linux/cpu.h>
++#include <linux/efi.h>
+ 
+ #include <asm/io.h>
+ #include <asm/bugs.h>
+@@ -436,6 +437,10 @@ asmlinkage void __init start_kernel(void
+ 	pidmap_init();
+ 	pgtable_cache_init();
+ 	pte_chain_init();
++#ifdef CONFIG_X86
++	if (efi_enabled)
++		efi_enter_virtual_mode();
++#endif
+ 	fork_init(num_physpages);
+ 	proc_caches_init();
+ 	buffer_init();
+--- linux-2.6.0-test6/kernel/acct.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/kernel/acct.c	2003-10-05 00:36:15.000000000 -0700
+@@ -343,7 +343,7 @@ static void do_acct_process(long exitcod
+ 	/* we really need to bite the bullet and change layout */
+ 	ac.ac_uid = current->uid;
+ 	ac.ac_gid = current->gid;
+-	ac.ac_tty = current->tty ? old_encode_dev(tty_devnum(current->tty)) : 0;
++	ac.ac_tty = process_tty(current) ? old_encode_dev(tty_devnum(process_tty(current))) : 0;
+ 
+ 	ac.ac_flag = 0;
+ 	if (current->flags & PF_FORKNOEXEC)
+--- linux-2.6.0-test6/kernel/exit.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/kernel/exit.c	2003-10-05 00:36:15.000000000 -0700
+@@ -119,13 +119,13 @@ int session_of_pgrp(int pgrp)
+ 
+ 	read_lock(&tasklist_lock);
+ 	for_each_task_pid(pgrp, PIDTYPE_PGID, p, l, pid)
+-		if (p->session > 0) {
+-			sid = p->session;
++		if (process_session(p) > 0) {
++			sid = process_session(p);
+ 			goto out;
+ 		}
+ 	p = find_task_by_pid(pgrp);
+ 	if (p)
+-		sid = p->session;
++		sid = process_session(p);
+ out:
+ 	read_unlock(&tasklist_lock);
+ 	
+@@ -153,7 +153,7 @@ static int will_become_orphaned_pgrp(int
+ 				|| p->real_parent->pid == 1)
+ 			continue;
+ 		if (process_group(p->real_parent) != pgrp
+-			    && p->real_parent->session == p->session) {
++			    && process_session(p->real_parent) == process_session(p)) {
+ 			ret = 0;
+ 			break;
+ 		}
+@@ -242,14 +242,14 @@ void __set_special_pids(pid_t session, p
+ {
+ 	struct task_struct *curr = current;
+ 
+-	if (curr->session != session) {
++	if (process_session(curr) != session) {
+ 		detach_pid(curr, PIDTYPE_SID);
+-		curr->session = session;
++		curr->signal->session = session;
+ 		attach_pid(curr, PIDTYPE_SID, session);
+ 	}
+ 	if (process_group(curr) != pgrp) {
+ 		detach_pid(curr, PIDTYPE_PGID);
+-		curr->group_leader->__pgrp = pgrp;
++		curr->signal->pgrp = pgrp;
+ 		attach_pid(curr, PIDTYPE_PGID, pgrp);
+ 	}
+ }
+@@ -303,7 +303,7 @@ void daemonize(const char *name, ...)
+ 	exit_mm(current);
+ 
+ 	set_special_pids(1, 1);
+-	current->tty = NULL;
++	current->signal->tty = NULL;
+ 
+ 	/* Block and flush all signals */
+ 	sigfillset(&blocked);
+@@ -509,7 +509,7 @@ static inline void reparent_thread(task_
+ 	 * outside, so the child pgrp is now orphaned.
+ 	 */
+ 	if ((process_group(p) != process_group(father)) &&
+-	    (p->session == father->session)) {
++	    (process_session(p) == process_session(father))) {
+ 		int pgrp = process_group(p);
+ 
+ 		if (will_become_orphaned_pgrp(pgrp, NULL) && has_stopped_jobs(pgrp)) {
+@@ -619,7 +619,7 @@ static void exit_notify(struct task_stru
+ 	t = tsk->real_parent;
+ 	
+ 	if ((process_group(t) != process_group(tsk)) &&
+-	    (t->session == tsk->session) &&
++	    (process_session(t) == process_session(tsk)) &&
+ 	    will_become_orphaned_pgrp(process_group(tsk), tsk) &&
+ 	    has_stopped_jobs(process_group(tsk))) {
+ 		__kill_pg_info(SIGHUP, (void *)1, process_group(tsk));
+@@ -714,7 +714,7 @@ NORET_TYPE void do_exit(long code)
+ 	exit_itimers(tsk);
+ 	exit_thread();
+ 
+-	if (tsk->leader)
++	if (process_session_leader(tsk))
+ 		disassociate_ctty(1);
+ 
+ 	module_put(tsk->thread_info->exec_domain->module);
+--- linux-2.6.0-test6/kernel/fork.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/kernel/fork.c	2003-10-05 00:36:54.000000000 -0700
+@@ -121,7 +121,12 @@ void prepare_to_wait(wait_queue_head_t *
+ {
+ 	unsigned long flags;
+ 
+-	__set_current_state(state);
++	/*
++	 * don't alter the task state if this is just going to
++	 * queue an async wait queue callback
++	 */
++	if (is_sync_wait(wait))
++		__set_current_state(state);
+ 	wait->flags &= ~WQ_FLAG_EXCLUSIVE;
+ 	spin_lock_irqsave(&q->lock, flags);
+ 	if (list_empty(&wait->task_list))
+@@ -134,7 +139,12 @@ prepare_to_wait_exclusive(wait_queue_hea
+ {
+ 	unsigned long flags;
+ 
+-	__set_current_state(state);
++	/*
++	 * don't alter the task state if this is just going to
++	 * queue an async wait queue callback
++	 */
++	if (is_sync_wait(wait))
++		__set_current_state(state);
+ 	wait->flags |= WQ_FLAG_EXCLUSIVE;
+ 	spin_lock_irqsave(&q->lock, flags);
+ 	if (list_empty(&wait->task_list))
+@@ -274,9 +284,9 @@ static inline int dup_mmap(struct mm_str
+ 				atomic_dec(&inode->i_writecount);
+       
+ 			/* insert tmp into the share list, just after mpnt */
+-			down(&inode->i_mapping->i_shared_sem);
++			down(&file->f_mapping->i_shared_sem);
+ 			list_add_tail(&tmp->shared, &mpnt->shared);
+-			up(&inode->i_mapping->i_shared_sem);
++			up(&file->f_mapping->i_shared_sem);
+ 		}
+ 
+ 		/*
+@@ -725,6 +735,12 @@ static inline int copy_signal(unsigned l
+ 	sig->curr_target = NULL;
+ 	init_sigpending(&sig->shared_pending);
+ 
++	sig->tty = process_tty(current);
++	sig->pgrp = process_group(current);
++	sig->session = process_session(current);
++	sig->leader = 0;	/* session leadership doesn't inherit */
++	sig->tty_old_pgrp = 0;
++
+ 	return 0;
+ }
+ 
+@@ -771,7 +787,9 @@ struct task_struct *copy_process(unsigne
+ 	 * Thread groups must share signals as well, and detached threads
+ 	 * can only be started up within the thread group.
+ 	 */
+-	if ((clone_flags & CLONE_THREAD) && !(clone_flags & CLONE_SIGHAND))
++	if ((clone_flags & CLONE_THREAD) &&
++		(clone_flags & (CLONE_SIGHAND|CLONE_DETACHED)) !=
++			(CLONE_SIGHAND|CLONE_DETACHED))
+ 		return ERR_PTR(-EINVAL);
+ 
+ 	/*
+@@ -876,8 +894,6 @@ struct task_struct *copy_process(unsigne
+ 	init_timer(&p->real_timer);
+ 	p->real_timer.data = (unsigned long) p;
+ 
+-	p->leader = 0;		/* session leadership doesn't inherit */
+-	p->tty_old_pgrp = 0;
+ 	p->utime = p->stime = 0;
+ 	p->cutime = p->cstime = 0;
+ 	p->array = NULL;
+@@ -885,6 +901,7 @@ struct task_struct *copy_process(unsigne
+ 	p->start_time = get_jiffies_64();
+ 	p->security = NULL;
+ 	p->io_context = NULL;
++	p->io_wait = NULL;
+ 
+ 	retval = -ENOMEM;
+ 	if ((retval = security_task_alloc(p)))
+@@ -1022,7 +1039,7 @@ struct task_struct *copy_process(unsigne
+ 	if (thread_group_leader(p)) {
+ 		attach_pid(p, PIDTYPE_TGID, p->tgid);
+ 		attach_pid(p, PIDTYPE_PGID, process_group(p));
+-		attach_pid(p, PIDTYPE_SID, p->session);
++		attach_pid(p, PIDTYPE_SID, process_session(p));
+ 		if (p->pid)
+ 			__get_cpu_var(process_counts)++;
+ 	} else
+--- linux-2.6.0-test6/kernel/futex.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/kernel/futex.c	2003-10-05 00:34:38.000000000 -0700
+@@ -45,6 +45,9 @@
+  * Futexes are matched on equal values of this key.
+  * The key type depends on whether it's a shared or private mapping.
+  * Don't rearrange members without looking at hash_futex().
++ *
++ * offset is aligned to a multiple of sizeof(u32) (== 4) by definition.
++ * We set bit 0 to indicate if it's an inode-based key.
+  */
+ union futex_key {
+ 	struct {
+@@ -66,12 +69,20 @@ union futex_key {
+ 
+ /*
+  * We use this hashed waitqueue instead of a normal wait_queue_t, so
+- * we can wake only the relevant ones (hashed queues may be shared):
++ * we can wake only the relevant ones (hashed queues may be shared).
++ *
++ * A futex_q has a woken state, just like tasks have TASK_RUNNING.
++ * It is considered woken when list_empty(&q->list) || q->lock_ptr == 0.
++ * The order of wakup is always to make the first condition true, then
++ * wake up q->waiters, then make the second condition true.
+  */
+ struct futex_q {
+ 	struct list_head list;
+ 	wait_queue_head_t waiters;
+ 
++	/* Which hash list lock to use. */
++	spinlock_t *lock_ptr;
++
+ 	/* Key which the futex is hashed on. */
+ 	union futex_key key;
+ 
+@@ -124,8 +135,7 @@ static inline int match_futex(union fute
+  * Returns: 0, or negative error code.
+  * The key words are stored in *key on success.
+  *
+- * Should be called with &current->mm->mmap_sem,
+- * but NOT &futex_lock or &current->mm->page_table_lock.
++ * Should be called with &current->mm->mmap_sem but NOT any spinlocks.
+  */
+ static int get_futex_key(unsigned long uaddr, union futex_key *key)
+ {
+@@ -172,9 +182,10 @@ static int get_futex_key(unsigned long u
+ 	}
+ 
+ 	/*
+-	 * Linear mappings are also simple.
++	 * Linear file mappings are also simple.
+ 	 */
+ 	key->shared.inode = vma->vm_file->f_dentry->d_inode;
++	key->both.offset++; /* Bit 0 of offset indicates inode-based key. */
+ 	if (likely(!(vma->vm_flags & VM_NONLINEAR))) {
+ 		key->shared.pgoff = (((uaddr - vma->vm_start) >> PAGE_SHIFT)
+ 				     + vma->vm_pgoff);
+@@ -214,16 +225,68 @@ static int get_futex_key(unsigned long u
+ 	return err;
+ }
+ 
++/*
++ * Take a reference to the resource addressed by a key.
++ * Can be called while holding spinlocks.
++ *
++ * NOTE: mmap_sem MUST be held between get_futex_key() and calling this
++ * function, if it is called at all.  mmap_sem keeps key->shared.inode valid.
++ */
++static inline void get_key_refs(union futex_key *key)
++{
++	if (key->both.ptr != 0) {
++		if (key->both.offset & 1)
++			atomic_inc(&key->shared.inode->i_count);
++		else
++			atomic_inc(&key->private.mm->mm_count);
++	}
++}
++
++/*
++ * Drop a reference to the resource addressed by a key.
++ * The hash bucket spinlock must not be held.
++ */
++static void drop_key_refs(union futex_key *key)
++{
++	if (key->both.ptr != 0) {
++		if (key->both.offset & 1)
++			iput(key->shared.inode);
++		else
++			mmdrop(key->private.mm);
++	}
++}
++
++/*
++ * The hash bucket lock must be held when this is called.
++ * Afterwards, the futex_q must not be accessed.
++ */
++static void wake_futex(struct futex_q *q)
++{
++	list_del_init(&q->list);
++	if (q->filp)
++		send_sigio(&q->filp->f_owner, q->fd, POLL_IN);
++	/*
++	 * The lock in wake_up_all() is a crucial memory barrier after the
++	 * list_del_init() and also before assigning to q->lock_ptr.
++	 */
++	wake_up_all(&q->waiters);
++	/*
++	 * The waiting task can free the futex_q as soon as this is written,
++	 * without taking any locks.  This must come last.
++	 */
++	q->lock_ptr = 0;
++}
+ 
+ /*
+  * Wake up all waiters hashed on the physical page that is mapped
+  * to this virtual address:
+  */
+-static int futex_wake(unsigned long uaddr, int num)
++static int futex_wake(unsigned long uaddr, int nr_wake)
+ {
+-	struct list_head *i, *next, *head;
+-	struct futex_hash_bucket *bh;
+ 	union futex_key key;
++	struct futex_hash_bucket *bh;
++	struct list_head *head;
++	struct futex_q *this, *next;
+ 	int ret;
+ 
+ 	down_read(&current->mm->mmap_sem);
+@@ -236,21 +299,15 @@ static int futex_wake(unsigned long uadd
+ 	spin_lock(&bh->lock);
+ 	head = &bh->chain;
+ 
+-	list_for_each_safe(i, next, head) {
+-		struct futex_q *this = list_entry(i, struct futex_q, list);
+-
++	list_for_each_entry_safe(this, next, head, list) {
+ 		if (match_futex (&this->key, &key)) {
+-			list_del_init(i);
+-			wake_up_all(&this->waiters);
+-			if (this->filp)
+-				send_sigio(&this->filp->f_owner, this->fd, POLL_IN);
+-			ret++;
+-			if (ret >= num)
++			wake_futex(this);
++			if (++ret >= nr_wake)
+ 				break;
+ 		}
+ 	}
+-	spin_unlock(&bh->lock);
+ 
++	spin_unlock(&bh->lock);
+ out:
+ 	up_read(&current->mm->mmap_sem);
+ 	return ret;
+@@ -263,10 +320,11 @@ out:
+ static int futex_requeue(unsigned long uaddr1, unsigned long uaddr2,
+ 				int nr_wake, int nr_requeue)
+ {
+-	struct list_head *i, *next, *head1, *head2;
+-	struct futex_hash_bucket *bh1, *bh2;
+ 	union futex_key key1, key2;
+-	int ret;
++	struct futex_hash_bucket *bh1, *bh2;
++	struct list_head *head1;
++	struct futex_q *this, *next;
++	int ret, drop_count = 0;
+ 
+ 	down_read(&current->mm->mmap_sem);
+ 
+@@ -279,78 +337,107 @@ static int futex_requeue(unsigned long u
+ 
+ 	bh1 = hash_futex(&key1);
+ 	bh2 = hash_futex(&key2);
+-	if (bh1 < bh2) {
++
++	if (bh1 < bh2)
++		spin_lock(&bh1->lock);
++	spin_lock(&bh2->lock);
++	if (bh1 > bh2)
+ 		spin_lock(&bh1->lock);
+-		spin_lock(&bh2->lock);
+-	} else {
+-		spin_lock(&bh2->lock);
+-		if (bh1 > bh2)
+-			spin_lock(&bh1->lock);
+-	}
+-	head1 = &bh1->chain;
+-	head2 = &bh2->chain;
+ 
+-	list_for_each_safe(i, next, head1) {
+-		struct futex_q *this = list_entry(i, struct futex_q, list);
++	head1 = &bh1->chain;
++	list_for_each_entry_safe(this, next, head1, list) {
++		if (!match_futex (&this->key, &key1))
++			continue;
++		if (++ret <= nr_wake) {
++			wake_futex(this);
++		} else {
++			list_move_tail(&this->list, &bh2->chain);
++			this->lock_ptr = &bh2->lock;
++			this->key = key2;
++			get_key_refs(&key2);
++			drop_count++;
+ 
+-		if (match_futex (&this->key, &key1)) {
+-			list_del_init(i);
+-			if (++ret <= nr_wake) {
+-				wake_up_all(&this->waiters);
+-				if (this->filp)
+-					send_sigio(&this->filp->f_owner,
+-							this->fd, POLL_IN);
+-			} else {
+-				list_add_tail(i, head2);
+-				this->key = key2;
+-				if (ret - nr_wake >= nr_requeue)
+-					break;
+-				/* Make sure to stop if key1 == key2 */
+-				if (head1 == head2 && head1 != next)
+-					head1 = i;
+-			}
++			if (ret - nr_wake >= nr_requeue)
++				break;
++			/* Make sure to stop if key1 == key2 */
++			if (head1 == &bh2->chain && head1 != &next->list)
++				head1 = &this->list;
+ 		}
+ 	}
+-	if (bh1 < bh2) {
+-		spin_unlock(&bh2->lock);
+-		spin_unlock(&bh1->lock);
+-	} else {
+-		if (bh1 > bh2)
+-			spin_unlock(&bh1->lock);
++
++	spin_unlock(&bh1->lock);
++	if (bh1 != bh2)
+ 		spin_unlock(&bh2->lock);
+-	}
++
++	/* drop_key_refs() must be called outside the spinlocks. */
++	while (--drop_count >= 0)
++		drop_key_refs(&key1);
++
+ out:
+ 	up_read(&current->mm->mmap_sem);
+ 	return ret;
+ }
+ 
+-static inline void queue_me(struct futex_q *q, union futex_key *key,
+-			    int fd, struct file *filp)
++/*
++ * queue_me and unqueue_me must be called as a pair, each
++ * exactly once.  They are called with the hashed spinlock held.
++ */
++
++/* The key must be already stored in q->key. */
++static void queue_me(struct futex_q *q, int fd, struct file *filp)
+ {
+-	struct futex_hash_bucket *bh = hash_futex(key);
+-	struct list_head *head = &bh->chain;
++	struct futex_hash_bucket *bh;
+ 
+-	q->key = *key;
+ 	q->fd = fd;
+ 	q->filp = filp;
+ 
++	init_waitqueue_head(&q->waiters);
++
++	get_key_refs(&q->key);
++	bh = hash_futex(&q->key);
++	q->lock_ptr = &bh->lock;
++
+ 	spin_lock(&bh->lock);
+-	list_add_tail(&q->list, head);
++	list_add_tail(&q->list, &bh->chain);
+ 	spin_unlock(&bh->lock);
+ }
+ 
+ /* Return 1 if we were still queued (ie. 0 means we were woken) */
+-static inline int unqueue_me(struct futex_q *q)
++static int unqueue_me(struct futex_q *q)
+ {
+-	struct futex_hash_bucket *bh = hash_futex(&q->key);
+ 	int ret = 0;
++	spinlock_t *lock_ptr;
+ 
+-	spin_lock(&bh->lock);
+-	if (!list_empty(&q->list)) {
+-		list_del(&q->list);
+-		ret = 1;
++	/* In the common case we don't take the spinlock, which is nice. */
++ retry:
++	lock_ptr = q->lock_ptr;
++	if (lock_ptr != 0) {
++		spin_lock(lock_ptr);
++		/*
++		 * q->lock_ptr can change between reading it and
++		 * spin_lock(), causing us to take the wrong lock.  This
++		 * corrects the race condition.
++		 *
++		 * Reasoning goes like this: if we have the wrong lock,
++		 * q->lock_ptr must have changed (maybe several times)
++		 * between reading it and the spin_lock().  It can
++		 * change again after the spin_lock() but only if it was
++		 * already changed before the spin_lock().  It cannot,
++		 * however, change back to the original value.  Therefore
++		 * we can detect whether we acquired the correct lock.
++		 */
++		if (unlikely(lock_ptr != q->lock_ptr)) {
++			spin_unlock(lock_ptr);
++			goto retry;
++		}
++		if (likely(!list_empty(&q->list))) {
++			list_del(&q->list);
++			ret = 1;
++		}
++		spin_unlock(lock_ptr);
+ 	}
+-	spin_unlock(&bh->lock);
++
++	drop_key_refs(&q->key);
+ 	return ret;
+ }
+ 
+@@ -358,19 +445,15 @@ static int futex_wait(unsigned long uadd
+ {
+ 	DECLARE_WAITQUEUE(wait, current);
+ 	int ret, curval;
+-	union futex_key key;
+ 	struct futex_q q;
+-	struct futex_hash_bucket *bh = NULL;
+-
+-	init_waitqueue_head(&q.waiters);
+ 
+ 	down_read(&current->mm->mmap_sem);
+ 
+-	ret = get_futex_key(uaddr, &key);
++	ret = get_futex_key(uaddr, &q.key);
+ 	if (unlikely(ret != 0))
+ 		goto out_release_sem;
+ 
+-	queue_me(&q, &key, -1, NULL);
++	queue_me(&q, -1, NULL);
+ 
+ 	/*
+ 	 * Access the page after the futex is queued.
+@@ -400,23 +483,17 @@ static int futex_wait(unsigned long uadd
+ 	 * rely on the futex_wake() code removing us from hash when it
+ 	 * wakes us up.
+ 	 */
+-	add_wait_queue(&q.waiters, &wait);
+-	bh = hash_futex(&key);
+-	spin_lock(&bh->lock);
+-	set_current_state(TASK_INTERRUPTIBLE);
+-
+-	if (unlikely(list_empty(&q.list))) {
+-		/*
+-		 * We were woken already.
+-		 */
+-		spin_unlock(&bh->lock);
+-		set_current_state(TASK_RUNNING);
+-		return 0;
+-	}
+ 
+-	spin_unlock(&bh->lock);
+-	time = schedule_timeout(time);
+-	set_current_state(TASK_RUNNING);
++	/* add_wait_queue is the barrier after __set_current_state. */
++	__set_current_state(TASK_INTERRUPTIBLE);
++	add_wait_queue(&q.waiters, &wait);
++	/*
++	 * !list_empty() is safe here without any lock.
++	 * q.lock_ptr != 0 is not safe, because of ordering against wakeup.
++	 */
++	if (likely(!list_empty(&q.list)))
++		time = schedule_timeout(time);
++	__set_current_state(TASK_RUNNING);
+ 
+ 	/*
+ 	 * NOTE: we don't remove ourselves from the waitqueue because
+@@ -446,7 +523,7 @@ static int futex_close(struct inode *ino
+ 	struct futex_q *q = filp->private_data;
+ 
+ 	unqueue_me(q);
+-	kfree(filp->private_data);
++	kfree(q);
+ 	return 0;
+ }
+ 
+@@ -455,14 +532,16 @@ static unsigned int futex_poll(struct fi
+ 			       struct poll_table_struct *wait)
+ {
+ 	struct futex_q *q = filp->private_data;
+-	struct futex_hash_bucket *bh = hash_futex(&q->key);
+ 	int ret = 0;
+ 
+ 	poll_wait(filp, &q->waiters, wait);
+-	spin_lock(&bh->lock);
++
++	/*
++	 * list_empty() is safe here without any lock.
++	 * q->lock_ptr != 0 is not safe, because of ordering against wakeup.
++	 */
+ 	if (list_empty(&q->list))
+ 		ret = POLLIN | POLLRDNORM;
+-	spin_unlock(&bh->lock);
+ 
+ 	return ret;
+ }
+@@ -472,12 +551,13 @@ static struct file_operations futex_fops
+ 	.poll		= futex_poll,
+ };
+ 
+-/* Signal allows caller to avoid the race which would occur if they
+-   set the sigio stuff up afterwards. */
++/*
++ * Signal allows caller to avoid the race which would occur if they
++ * set the sigio stuff up afterwards.
++ */
+ static int futex_fd(unsigned long uaddr, int signal)
+ {
+ 	struct futex_q *q;
+-	union futex_key key;
+ 	struct file *filp;
+ 	int ret, err;
+ 
+@@ -497,6 +577,7 @@ static int futex_fd(unsigned long uaddr,
+ 	filp->f_op = &futex_fops;
+ 	filp->f_vfsmnt = mntget(futex_mnt);
+ 	filp->f_dentry = dget(futex_mnt->mnt_root);
++	filp->f_mapping = filp->f_dentry->d_inode->i_mapping;
+ 
+ 	if (signal) {
+ 		int err;
+@@ -519,20 +600,24 @@ static int futex_fd(unsigned long uaddr,
+ 	}
+ 
+ 	down_read(&current->mm->mmap_sem);
+-	err = get_futex_key(uaddr, &key);
+-	up_read(&current->mm->mmap_sem);
++	err = get_futex_key(uaddr, &q->key);
+ 
+ 	if (unlikely(err != 0)) {
++		up_read(&current->mm->mmap_sem);
+ 		put_unused_fd(ret);
+ 		put_filp(filp);
+ 		kfree(q);
+ 		return err;
+ 	}
+ 
+-	init_waitqueue_head(&q->waiters);
++	/*
++	 * queue_me() must be called before releasing mmap_sem, because
++	 * key->shared.inode needs to be referenced while holding it.
++	 */
+ 	filp->private_data = q;
+ 
+-	queue_me(q, &key, ret, filp);
++	queue_me(q, ret, filp);
++	up_read(&current->mm->mmap_sem);
+ 
+ 	/* Now we map fd to filp, so userspace can access it */
+ 	fd_install(ret, filp);
+--- linux-2.6.0-test6/kernel/kmod.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/kernel/kmod.c	2003-10-05 00:36:10.000000000 -0700
+@@ -47,7 +47,8 @@ char modprobe_path[256] = "/sbin/modprob
+ 
+ /**
+  * request_module - try to load a kernel module
+- * @module_name: Name of module
++ * @fmt:     printf style format string for the name of the module
++ * @varargs: arguements as specified in the format string
+  *
+  * Load a module using the user mode module loader. The function returns
+  * zero on success or a negative errno code on failure. Note that a
+@@ -184,14 +185,19 @@ static int wait_for_helper(void *data)
+ 
+ 	sub_info->retval = 0;
+ 	pid = kernel_thread(____call_usermodehelper, sub_info, SIGCHLD);
+-	if (pid < 0)
++	if (pid < 0) {
+ 		sub_info->retval = pid;
+-	else
++	} else {
+ 		/* We don't have a SIGCHLD signal handler, so this
+ 		 * always returns -ECHILD, but the important thing is
+ 		 * that it blocks. */
+-		sys_wait4(pid, NULL, 0, NULL);
++		mm_segment_t fs;
+ 
++		fs = get_fs();
++		set_fs(KERNEL_DS);
++		sys_wait4(pid, &sub_info->retval, 0, NULL);
++		set_fs(fs);
++	}
+ 	complete(sub_info->complete);
+ 	return 0;
+ }
+@@ -209,7 +215,7 @@ static void __call_usermodehelper(void *
+ 	 * until that is done.  */
+ 	if (sub_info->wait)
+ 		pid = kernel_thread(wait_for_helper, sub_info,
+-				    CLONE_KERNEL | SIGCHLD);
++				    CLONE_FS | CLONE_FILES | SIGCHLD);
+ 	else
+ 		pid = kernel_thread(____call_usermodehelper, sub_info,
+ 				    CLONE_VFORK | SIGCHLD);
+--- linux-2.6.0-test6/kernel/ksyms.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/kernel/ksyms.c	2003-10-05 00:36:58.000000000 -0700
+@@ -45,8 +45,6 @@
+ #include <linux/uio.h>
+ #include <linux/tty.h>
+ #include <linux/in6.h>
+-#include <linux/completion.h>
+-#include <linux/seq_file.h>
+ #include <linux/binfmts.h>
+ #include <linux/namei.h>
+ #include <linux/buffer_head.h>
+@@ -126,11 +124,11 @@ EXPORT_SYMBOL(get_unmapped_area);
+ EXPORT_SYMBOL(init_mm);
+ EXPORT_SYMBOL(blk_queue_bounce);
+ EXPORT_SYMBOL(blk_congestion_wait);
++EXPORT_SYMBOL(blk_congestion_wait_wq);
+ #ifdef CONFIG_HIGHMEM
+ EXPORT_SYMBOL(kmap_high);
+ EXPORT_SYMBOL(kunmap_high);
+ EXPORT_SYMBOL(highmem_start_page);
+-EXPORT_SYMBOL(kmap_prot);
+ EXPORT_SYMBOL(kmap_pte);
+ #endif
+ #ifdef HASHED_PAGE_VIRTUAL
+@@ -139,49 +137,12 @@ EXPORT_SYMBOL(page_address);
+ EXPORT_SYMBOL(get_user_pages);
+ 
+ /* filesystem internal functions */
+-EXPORT_SYMBOL(def_blk_fops);
+-EXPORT_SYMBOL(update_atime);
+ EXPORT_SYMBOL(get_fs_type);
+-EXPORT_SYMBOL(user_get_super);
+-EXPORT_SYMBOL(get_super);
+-EXPORT_SYMBOL(drop_super);
+-EXPORT_SYMBOL(getname);
+-EXPORT_SYMBOL(names_cachep);
+ EXPORT_SYMBOL(fput);
+ EXPORT_SYMBOL(fget);
+-EXPORT_SYMBOL(igrab);
+-EXPORT_SYMBOL(iunique);
+-EXPORT_SYMBOL(iput);
+-EXPORT_SYMBOL(inode_init_once);
+-EXPORT_SYMBOL(follow_up);
+-EXPORT_SYMBOL(follow_down);
+ EXPORT_SYMBOL(lookup_mnt);
+-EXPORT_SYMBOL(lookup_create);
+-EXPORT_SYMBOL(path_lookup);
+-EXPORT_SYMBOL(path_walk);
+-EXPORT_SYMBOL(path_release);
+-EXPORT_SYMBOL(__user_walk);
+-EXPORT_SYMBOL(lookup_one_len);
+-EXPORT_SYMBOL(lookup_hash);
+ EXPORT_SYMBOL(sys_close);
+ EXPORT_SYMBOL(dcache_lock);
+-EXPORT_SYMBOL(d_alloc_root);
+-EXPORT_SYMBOL(d_delete);
+-EXPORT_SYMBOL(dget_locked);
+-EXPORT_SYMBOL(d_validate);
+-EXPORT_SYMBOL(d_rehash);
+-EXPORT_SYMBOL(d_invalidate);	/* May be it will be better in dcache.h? */
+-EXPORT_SYMBOL(d_move);
+-EXPORT_SYMBOL(d_instantiate);
+-EXPORT_SYMBOL(d_alloc);
+-EXPORT_SYMBOL(d_alloc_anon);
+-EXPORT_SYMBOL(d_splice_alias);
+-EXPORT_SYMBOL(d_lookup);
+-EXPORT_SYMBOL(d_path);
+-EXPORT_SYMBOL(mark_buffer_dirty);
+-EXPORT_SYMBOL(end_buffer_read_sync);
+-EXPORT_SYMBOL(end_buffer_write_sync);
+-EXPORT_SYMBOL(end_buffer_async_write);
+ EXPORT_SYMBOL(__mark_inode_dirty);
+ EXPORT_SYMBOL(get_empty_filp);
+ EXPORT_SYMBOL(open_private_file);
+@@ -190,79 +151,20 @@ EXPORT_SYMBOL(filp_open);
+ EXPORT_SYMBOL(filp_close);
+ EXPORT_SYMBOL(put_filp);
+ EXPORT_SYMBOL(files_lock);
+-EXPORT_SYMBOL(check_disk_change);
+-EXPORT_SYMBOL(invalidate_bdev);
+-EXPORT_SYMBOL(invalidate_inodes);
+-EXPORT_SYMBOL(__invalidate_device);
+ EXPORT_SYMBOL(invalidate_inode_pages);
+ EXPORT_SYMBOL_GPL(invalidate_inode_pages2);
+ EXPORT_SYMBOL(truncate_inode_pages);
+-EXPORT_SYMBOL(fsync_bdev);
+-EXPORT_SYMBOL(permission);
+-EXPORT_SYMBOL(vfs_permission);
+ EXPORT_SYMBOL(inode_setattr);
+ EXPORT_SYMBOL(inode_change_ok);
+ EXPORT_SYMBOL(write_inode_now);
+ EXPORT_SYMBOL(notify_change);
+-EXPORT_SYMBOL(set_blocksize);
+-EXPORT_SYMBOL(sb_set_blocksize);
+-EXPORT_SYMBOL(sb_min_blocksize);
+-EXPORT_SYMBOL(bdget);
+-EXPORT_SYMBOL(bdput);
+-EXPORT_SYMBOL(bd_claim);
+-EXPORT_SYMBOL(bd_release);
+-EXPORT_SYMBOL(open_bdev_excl);
+-EXPORT_SYMBOL(close_bdev_excl);
+-EXPORT_SYMBOL(open_by_devnum);
+-EXPORT_SYMBOL(__brelse);
+-EXPORT_SYMBOL(__bforget);
+-EXPORT_SYMBOL(ll_rw_block);
+-EXPORT_SYMBOL(sync_dirty_buffer);
+-EXPORT_SYMBOL(submit_bh);
+-EXPORT_SYMBOL(unlock_buffer);
+-EXPORT_SYMBOL(__wait_on_buffer);
+-EXPORT_SYMBOL(blockdev_direct_IO);
+-EXPORT_SYMBOL(block_write_full_page);
+-EXPORT_SYMBOL(block_read_full_page);
+-EXPORT_SYMBOL(block_prepare_write);
+-EXPORT_SYMBOL(block_sync_page);
+-EXPORT_SYMBOL(generic_cont_expand);
+-EXPORT_SYMBOL(cont_prepare_write);
+-EXPORT_SYMBOL(generic_commit_write);
+-EXPORT_SYMBOL(block_commit_write);
+-EXPORT_SYMBOL(block_truncate_page);
+-EXPORT_SYMBOL(generic_block_bmap);
+-EXPORT_SYMBOL(generic_file_read);
+-EXPORT_SYMBOL(generic_file_sendfile);
+-EXPORT_SYMBOL(do_generic_mapping_read);
+ EXPORT_SYMBOL(file_ra_state_init);
+-EXPORT_SYMBOL(generic_file_write);
+-EXPORT_SYMBOL(generic_file_write_nolock);
+-EXPORT_SYMBOL(generic_file_mmap);
+-EXPORT_SYMBOL(generic_file_readonly_mmap);
+ EXPORT_SYMBOL(generic_ro_fops);
+-EXPORT_SYMBOL(dput);
+-EXPORT_SYMBOL(have_submounts);
+-EXPORT_SYMBOL(d_find_alias);
+-EXPORT_SYMBOL(d_prune_aliases);
+-EXPORT_SYMBOL(shrink_dcache_sb);
+-EXPORT_SYMBOL(shrink_dcache_parent);
+-EXPORT_SYMBOL(shrink_dcache_anon);
+-EXPORT_SYMBOL(find_inode_number);
+-EXPORT_SYMBOL(is_subdir);
+ EXPORT_SYMBOL(get_unused_fd);
+ EXPORT_SYMBOL(vfs_read);
+ EXPORT_SYMBOL(vfs_readv);
+ EXPORT_SYMBOL(vfs_write);
+ EXPORT_SYMBOL(vfs_writev);
+-EXPORT_SYMBOL(vfs_create);
+-EXPORT_SYMBOL(vfs_mkdir);
+-EXPORT_SYMBOL(vfs_mknod);
+-EXPORT_SYMBOL(vfs_symlink);
+-EXPORT_SYMBOL(vfs_link);
+-EXPORT_SYMBOL(vfs_rmdir);
+-EXPORT_SYMBOL(vfs_unlink);
+-EXPORT_SYMBOL(vfs_rename);
+ EXPORT_SYMBOL(vfs_statfs);
+ EXPORT_SYMBOL(vfs_fstat);
+ EXPORT_SYMBOL(vfs_stat);
+@@ -272,9 +174,6 @@ EXPORT_SYMBOL(inode_add_bytes);
+ EXPORT_SYMBOL(inode_sub_bytes);
+ EXPORT_SYMBOL(inode_get_bytes);
+ EXPORT_SYMBOL(inode_set_bytes);
+-EXPORT_SYMBOL(lock_rename);
+-EXPORT_SYMBOL(unlock_rename);
+-EXPORT_SYMBOL(generic_read_dir);
+ EXPORT_SYMBOL(generic_fillattr);
+ EXPORT_SYMBOL(generic_file_llseek);
+ EXPORT_SYMBOL(remote_llseek);
+@@ -282,70 +181,21 @@ EXPORT_SYMBOL(no_llseek);
+ EXPORT_SYMBOL(poll_initwait);
+ EXPORT_SYMBOL(poll_freewait);
+ EXPORT_SYMBOL(ROOT_DEV);
+-EXPORT_SYMBOL(find_get_page);
+-EXPORT_SYMBOL(find_lock_page);
+-EXPORT_SYMBOL(find_trylock_page);
+-EXPORT_SYMBOL(find_or_create_page);
+-EXPORT_SYMBOL(grab_cache_page_nowait);
+-EXPORT_SYMBOL(read_cache_page);
+ EXPORT_SYMBOL(read_cache_pages);
+ EXPORT_SYMBOL(mark_page_accessed);
+-EXPORT_SYMBOL(vfs_readlink);
+-EXPORT_SYMBOL(vfs_follow_link);
+-EXPORT_SYMBOL(page_readlink);
+-EXPORT_SYMBOL(page_follow_link);
+-EXPORT_SYMBOL(page_symlink_inode_operations);
+-EXPORT_SYMBOL(page_symlink);
+ EXPORT_SYMBOL(vfs_readdir);
+ EXPORT_SYMBOL(__break_lease);
+ EXPORT_SYMBOL(lease_get_mtime);
+ EXPORT_SYMBOL(lock_may_read);
+ EXPORT_SYMBOL(lock_may_write);
+-EXPORT_SYMBOL(dcache_dir_open);
+-EXPORT_SYMBOL(dcache_dir_close);
+-EXPORT_SYMBOL(dcache_dir_lseek);
+-EXPORT_SYMBOL(dcache_readdir);
+-EXPORT_SYMBOL(simple_getattr);
+-EXPORT_SYMBOL(simple_statfs);
+-EXPORT_SYMBOL(simple_lookup);
+-EXPORT_SYMBOL(simple_dir_operations);
+-EXPORT_SYMBOL(simple_dir_inode_operations);
+-EXPORT_SYMBOL(simple_link);
+-EXPORT_SYMBOL(simple_unlink);
+-EXPORT_SYMBOL(simple_rmdir);
+-EXPORT_SYMBOL(simple_rename);
+-EXPORT_SYMBOL(simple_sync_file);
+-EXPORT_SYMBOL(simple_readpage);
+-EXPORT_SYMBOL(simple_prepare_write);
+-EXPORT_SYMBOL(simple_commit_write);
+-EXPORT_SYMBOL(simple_empty);
+-EXPORT_SYMBOL(simple_fill_super);
+-EXPORT_SYMBOL(simple_pin_fs);
+-EXPORT_SYMBOL(simple_release_fs);
+ EXPORT_SYMBOL(fd_install);
+ EXPORT_SYMBOL(put_unused_fd);
+-EXPORT_SYMBOL(get_sb_bdev);
+-EXPORT_SYMBOL(kill_block_super);
+-EXPORT_SYMBOL(get_sb_nodev);
+-EXPORT_SYMBOL(get_sb_single);
+-EXPORT_SYMBOL(kill_anon_super);
+-EXPORT_SYMBOL(kill_litter_super);
+-EXPORT_SYMBOL(generic_shutdown_super);
+-EXPORT_SYMBOL(deactivate_super);
+-EXPORT_SYMBOL(sget);
+-EXPORT_SYMBOL(set_anon_super);
+ EXPORT_SYMBOL(do_select);
+ 
+ /* for stackable file systems (lofs, wrapfs, cryptfs, etc.) */
+ EXPORT_SYMBOL(default_llseek);
+ EXPORT_SYMBOL(dentry_open);
+-#ifdef CONFIG_MMU
+-EXPORT_SYMBOL(filemap_nopage);
+-#endif
+-EXPORT_SYMBOL(filemap_fdatawrite);
+-EXPORT_SYMBOL(filemap_fdatawait);
+ EXPORT_SYMBOL(lock_page);
+-EXPORT_SYMBOL(unlock_page);
+ 
+ /* device registration */
+ EXPORT_SYMBOL(register_blkdev);
+@@ -355,16 +205,7 @@ EXPORT_SYMBOL(tty_unregister_driver);
+ EXPORT_SYMBOL(tty_std_termios);
+ 
+ /* block device driver support */
+-EXPORT_SYMBOL(bmap);
+-EXPORT_SYMBOL(blkdev_open);
+-EXPORT_SYMBOL(blkdev_get);
+-EXPORT_SYMBOL(blkdev_put);
+-EXPORT_SYMBOL(ioctl_by_bdev);
+ EXPORT_SYMBOL(read_dev_sector);
+-EXPORT_SYMBOL(init_buffer);
+-EXPORT_SYMBOL_GPL(generic_file_direct_IO);
+-EXPORT_SYMBOL(generic_file_readv);
+-EXPORT_SYMBOL(generic_file_writev);
+ EXPORT_SYMBOL(iov_shorten);
+ EXPORT_SYMBOL_GPL(default_backing_dev_info);
+ 
+@@ -375,32 +216,9 @@ EXPORT_SYMBOL(tty_flip_buffer_push);
+ /* filesystem registration */
+ EXPORT_SYMBOL(register_filesystem);
+ EXPORT_SYMBOL(unregister_filesystem);
+-EXPORT_SYMBOL(kern_mount);
+ EXPORT_SYMBOL(__mntput);
+ EXPORT_SYMBOL(may_umount);
+ 
+-/* executable format registration */
+-EXPORT_SYMBOL(register_binfmt);
+-EXPORT_SYMBOL(unregister_binfmt);
+-EXPORT_SYMBOL(search_binary_handler);
+-EXPORT_SYMBOL(prepare_binprm);
+-EXPORT_SYMBOL(compute_creds);
+-EXPORT_SYMBOL(remove_arg_zero);
+-EXPORT_SYMBOL(set_binfmt);
+-
+-/* sysctl table registration */
+-EXPORT_SYMBOL(register_sysctl_table);
+-EXPORT_SYMBOL(unregister_sysctl_table);
+-EXPORT_SYMBOL(sysctl_string);
+-EXPORT_SYMBOL(sysctl_intvec);
+-EXPORT_SYMBOL(sysctl_jiffies);
+-EXPORT_SYMBOL(proc_dostring);
+-EXPORT_SYMBOL(proc_dointvec);
+-EXPORT_SYMBOL(proc_dointvec_jiffies);
+-EXPORT_SYMBOL(proc_dointvec_minmax);
+-EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
+-EXPORT_SYMBOL(proc_doulongvec_minmax);
+-
+ /* interrupt handling */
+ EXPORT_SYMBOL(request_irq);
+ EXPORT_SYMBOL(free_irq);
+@@ -414,10 +232,6 @@ EXPORT_SYMBOL(prepare_to_wait_exclusive)
+ EXPORT_SYMBOL(finish_wait);
+ EXPORT_SYMBOL(autoremove_wake_function);
+ 
+-/* completion handling */
+-EXPORT_SYMBOL(wait_for_completion);
+-EXPORT_SYMBOL(complete);
+-
+ /* The notion of irq probe/assignment is foreign to S/390 */
+ 
+ #if !defined(CONFIG_ARCH_S390)
+@@ -449,30 +263,11 @@ EXPORT_SYMBOL(iomem_resource);
+ 
+ /* process management */
+ EXPORT_SYMBOL(complete_and_exit);
+-EXPORT_SYMBOL(default_wake_function);
+-EXPORT_SYMBOL(__wake_up);
+ #ifdef CONFIG_SMP
+ EXPORT_SYMBOL_GPL(__wake_up_sync); /* internal use only */
+ #endif
+-EXPORT_SYMBOL(wake_up_process);
+-EXPORT_SYMBOL(sleep_on);
+-EXPORT_SYMBOL(sleep_on_timeout);
+-EXPORT_SYMBOL(interruptible_sleep_on);
+-EXPORT_SYMBOL(interruptible_sleep_on_timeout);
+-EXPORT_SYMBOL(schedule);
+-#ifdef CONFIG_PREEMPT
+-EXPORT_SYMBOL(preempt_schedule);
+-#endif
+ EXPORT_SYMBOL(schedule_timeout);
+-EXPORT_SYMBOL(yield);
+-EXPORT_SYMBOL(io_schedule);
+-EXPORT_SYMBOL(__cond_resched);
+-EXPORT_SYMBOL(set_user_nice);
+-EXPORT_SYMBOL(task_nice);
+ EXPORT_SYMBOL_GPL(idle_cpu);
+-#ifdef CONFIG_SMP
+-EXPORT_SYMBOL_GPL(set_cpus_allowed);
+-#endif
+ #if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
+ EXPORT_SYMBOL(kernel_flag);
+ #endif
+@@ -485,18 +280,10 @@ EXPORT_SYMBOL(do_settimeofday);
+ #if (BITS_PER_LONG < 64)
+ EXPORT_SYMBOL(get_jiffies_64);
+ #endif
+-#ifdef CONFIG_DEBUG_SPINLOCK_SLEEP
+-EXPORT_SYMBOL(__might_sleep);
+-#endif
+-#if defined(CONFIG_SMP) && defined(CONFIG_PREEMPT)
+-EXPORT_SYMBOL(__preempt_spin_lock);
+-EXPORT_SYMBOL(__preempt_write_lock);
+-#endif
+ #if !defined(__ia64__)
+ EXPORT_SYMBOL(loops_per_jiffy);
+ #endif
+ 
+-
+ /* misc */
+ EXPORT_SYMBOL(panic);
+ EXPORT_SYMBOL(panic_notifier_list);
+@@ -524,45 +311,16 @@ EXPORT_SYMBOL(securebits);
+ EXPORT_SYMBOL(cap_bset);
+ EXPORT_SYMBOL(daemonize);
+ EXPORT_SYMBOL(csum_partial); /* for networking and md */
+-EXPORT_SYMBOL(seq_escape);
+-EXPORT_SYMBOL(seq_printf);
+-EXPORT_SYMBOL(seq_path);
+-EXPORT_SYMBOL(seq_open);
+-EXPORT_SYMBOL(seq_release);
+-EXPORT_SYMBOL(seq_read);
+-EXPORT_SYMBOL(seq_lseek);
+-EXPORT_SYMBOL(single_open);
+-EXPORT_SYMBOL(single_release);
+-EXPORT_SYMBOL(seq_release_private);
+-
+-/* Program loader interfaces */
+-#ifdef CONFIG_MMU
+-EXPORT_SYMBOL(setup_arg_pages);
+-#endif
+-EXPORT_SYMBOL(copy_strings_kernel);
+-EXPORT_SYMBOL(do_execve);
+-EXPORT_SYMBOL(flush_old_exec);
+-EXPORT_SYMBOL(kernel_read);
+-EXPORT_SYMBOL(open_exec);
+ 
+ /* Miscellaneous access points */
+ EXPORT_SYMBOL(si_meminfo);
+ 
+ /* Added to make file system as module */
+ EXPORT_SYMBOL(sys_tz);
+-EXPORT_SYMBOL(file_fsync);
+-EXPORT_SYMBOL(fsync_buffers_list);
+-EXPORT_SYMBOL(clear_inode);
+-EXPORT_SYMBOL(init_special_inode);
+-EXPORT_SYMBOL(new_inode);
+-EXPORT_SYMBOL(__insert_inode_hash);
+-EXPORT_SYMBOL(remove_inode_hash);
+-EXPORT_SYMBOL(buffer_insert_list);
+ EXPORT_SYMBOL(make_bad_inode);
+ EXPORT_SYMBOL(is_bad_inode);
+ EXPORT_SYMBOL(__inode_dir_notify);
+ EXPORT_SYMBOL(generic_osync_inode);
+-EXPORT_SYMBOL(remove_suid);
+ 
+ #ifdef CONFIG_UID16
+ EXPORT_SYMBOL(overflowuid);
+@@ -575,9 +333,6 @@ EXPORT_SYMBOL(fs_overflowgid);
+ EXPORT_SYMBOL(fasync_helper);
+ EXPORT_SYMBOL(kill_fasync);
+ 
+-/* binfmt_aout */
+-EXPORT_SYMBOL(get_write_access);
+-
+ /* library functions */
+ EXPORT_SYMBOL(strnicmp);
+ EXPORT_SYMBOL(strspn);
+@@ -607,6 +362,16 @@ EXPORT_SYMBOL(__per_cpu_offset);
+ EXPORT_SYMBOL(set_fs_pwd);
+ EXPORT_SYMBOL(set_fs_root);
+ 
++#if defined(CONFIG_LOCKMETER)
++EXPORT_SYMBOL(_metered_spin_lock);
++EXPORT_SYMBOL(_metered_spin_unlock);
++EXPORT_SYMBOL(_metered_spin_trylock);
++EXPORT_SYMBOL(_metered_read_lock);
++EXPORT_SYMBOL(_metered_read_unlock);
++EXPORT_SYMBOL(_metered_write_lock);
++EXPORT_SYMBOL(_metered_write_unlock);
++#endif
++
+ /* debug */
+ EXPORT_SYMBOL(dump_stack);
+ EXPORT_SYMBOL(ptrace_notify);
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/kernel/lockmeter.c	2003-10-05 00:36:40.000000000 -0700
+@@ -0,0 +1,1169 @@
++/*
++ *  Copyright (C) 1999,2000 Silicon Graphics, Inc.
++ *
++ *  Written by John Hawkes (hawkes@sgi.com)
++ *  Based on klstat.c by Jack Steiner (steiner@sgi.com)
++ *
++ *  Modified by Ray Bryant (raybry@us.ibm.com)
++ *  Changes Copyright (C) 2000 IBM, Inc.
++ *  Added save of index in spinlock_t to improve efficiency
++ *  of "hold" time reporting for spinlocks
++ *  Added support for hold time statistics for read and write
++ *  locks.
++ */
++
++#include <linux/config.h>
++#include <linux/types.h>
++#include <linux/errno.h>
++#include <linux/slab.h>
++#include <linux/sched.h>
++#include <linux/smp.h>
++#include <linux/threads.h>
++#include <linux/version.h>
++#include <linux/vmalloc.h>
++#include <linux/spinlock.h>
++#include <linux/utsname.h>
++#include <asm/system.h>
++#include <asm/uaccess.h>
++
++#include <linux/lockmeter.h>
++
++#define ASSERT(cond)
++#define bzero(loc,size)		memset(loc,0,size)
++
++/*<---------------------------------------------------*/
++/*              lockmeter.c                           */
++/*>---------------------------------------------------*/
++
++static lstat_control_t lstat_control __cacheline_aligned =
++	{ LSTAT_OFF, SPIN_LOCK_UNLOCKED, SPIN_LOCK_UNLOCKED,
++	  19 * 0, NR_CPUS * 0, 0, NR_CPUS * 0 };
++
++static ushort lstat_make_dir_entry(void *, void *);
++
++/*
++ * lstat_lookup
++ *
++ * Given a RA, locate the directory entry for the lock.
++ */
++static ushort
++lstat_lookup(void *lock_ptr, void *caller_ra)
++{
++	ushort index;
++	lstat_directory_entry_t *dirp;
++
++	dirp = lstat_control.dir;
++
++	index = lstat_control.hashtab[DIRHASH(caller_ra)];
++	while (dirp[index].caller_ra != caller_ra) {
++		if (index == 0) {
++			return lstat_make_dir_entry(lock_ptr, caller_ra);
++		}
++		index = dirp[index].next_stat_index;
++	}
++
++	if (dirp[index].lock_ptr != NULL && dirp[index].lock_ptr != lock_ptr) {
++		dirp[index].lock_ptr = NULL;
++	}
++
++	return index;
++}
++
++/*
++ * lstat_make_dir_entry
++ * Called to add a new lock to the lock directory.
++ */
++static ushort
++lstat_make_dir_entry(void *lock_ptr, void *caller_ra)
++{
++	lstat_directory_entry_t *dirp;
++	ushort index, hindex;
++	unsigned long flags;
++
++	/* lock the table without recursively reentering this metering code */
++	local_irq_save(flags);
++	_raw_spin_lock(&lstat_control.directory_lock);
++
++	hindex = DIRHASH(caller_ra);
++	index = lstat_control.hashtab[hindex];
++	dirp = lstat_control.dir;
++	while (index && dirp[index].caller_ra != caller_ra)
++		index = dirp[index].next_stat_index;
++
++	if (index == 0) {
++		if (lstat_control.next_free_dir_index < LSTAT_MAX_STAT_INDEX) {
++			index = lstat_control.next_free_dir_index++;
++			lstat_control.dir[index].caller_ra = caller_ra;
++			lstat_control.dir[index].lock_ptr = lock_ptr;
++			lstat_control.dir[index].next_stat_index =
++				lstat_control.hashtab[hindex];
++			lstat_control.hashtab[hindex] = index;
++		} else {
++			lstat_control.dir_overflow++;
++		}
++	}
++	_raw_spin_unlock(&lstat_control.directory_lock);
++	local_irq_restore(flags);
++	return index;
++}
++
++int
++lstat_update(void *lock_ptr, void *caller_ra, int action)
++{
++	int index;
++	int cpu;
++
++	ASSERT(action < LSTAT_ACT_MAX_VALUES);
++
++	if (lstat_control.state == LSTAT_OFF)
++		return 0;
++
++	index = lstat_lookup(lock_ptr, caller_ra);
++	cpu = THIS_CPU_NUMBER;
++	(*lstat_control.counts[cpu])[index].count[action]++;
++	(*lstat_control.counts[cpu])[index].acquire_time = get_cycles();
++
++	return index;
++}
++
++int
++lstat_update_time(void *lock_ptr, void *caller_ra, int action, uint32_t ticks)
++{
++	ushort index;
++	int cpu;
++
++	ASSERT(action < LSTAT_ACT_MAX_VALUES);
++
++	if (lstat_control.state == LSTAT_OFF)
++		return 0;
++
++	index = lstat_lookup(lock_ptr, caller_ra);
++	cpu = THIS_CPU_NUMBER;
++	(*lstat_control.counts[cpu])[index].count[action]++;
++	(*lstat_control.counts[cpu])[index].cum_wait_ticks += (uint64_t) ticks;
++	if ((*lstat_control.counts[cpu])[index].max_wait_ticks < ticks)
++		(*lstat_control.counts[cpu])[index].max_wait_ticks = ticks;
++
++	(*lstat_control.counts[cpu])[index].acquire_time = get_cycles();
++
++	return index;
++}
++
++void
++_metered_spin_lock(spinlock_t * lock_ptr)
++{
++	if (lstat_control.state == LSTAT_OFF) {
++		_raw_spin_lock(lock_ptr);	/* do the real lock */
++		PUT_INDEX(lock_ptr, 0);	/* clean index in case lockmetering  */
++		/* gets turned on before unlock */
++	} else {
++		void *this_pc = LSTAT_RA(LSTAT_RA_SPIN);
++		int index;
++
++		if (_raw_spin_trylock(lock_ptr)) {
++			index = lstat_update(lock_ptr, this_pc,
++						LSTAT_ACT_NO_WAIT);
++		} else {
++			uint32_t start_cycles = get_cycles();
++			_raw_spin_lock(lock_ptr);	/* do the real lock */
++			index = lstat_update_time(lock_ptr, this_pc,
++				LSTAT_ACT_SPIN, get_cycles() - start_cycles);
++		}
++		/* save the index in the lock itself for use in spin unlock */
++		PUT_INDEX(lock_ptr, index);
++	}
++}
++
++int
++_metered_spin_trylock(spinlock_t * lock_ptr)
++{
++	if (lstat_control.state == LSTAT_OFF) {
++		return _raw_spin_trylock(lock_ptr);
++	} else {
++		int retval;
++		void *this_pc = LSTAT_RA(LSTAT_RA_SPIN);
++
++		if ((retval = _raw_spin_trylock(lock_ptr))) {
++			int index = lstat_update(lock_ptr, this_pc,
++						LSTAT_ACT_NO_WAIT);
++			/*
++			 * save the index in the lock itself for use in spin
++			 * unlock
++			 */
++			PUT_INDEX(lock_ptr, index);
++		} else {
++			lstat_update(lock_ptr, this_pc, LSTAT_ACT_REJECT);
++		}
++
++		return retval;
++	}
++}
++
++void
++_metered_spin_unlock(spinlock_t * lock_ptr)
++{
++	int index = -1;
++
++	if (lstat_control.state != LSTAT_OFF) {
++		index = GET_INDEX(lock_ptr);
++		/*
++		 * If statistics were turned off when we set the lock,
++		 * then the index can be zero.  If that is the case,
++		 * then collect no stats on this call.
++		 */
++		if (index > 0) {
++			uint32_t hold_time;
++			int cpu = THIS_CPU_NUMBER;
++			hold_time = get_cycles() -
++			 (*lstat_control.counts[cpu])[index].acquire_time;
++			(*lstat_control.counts[cpu])[index].cum_hold_ticks +=
++				(uint64_t) hold_time;
++			if ((*lstat_control.counts[cpu])[index].max_hold_ticks <
++			    hold_time)
++				(*lstat_control.counts[cpu])[index].
++				    max_hold_ticks = hold_time;
++		}
++	}
++
++	/* make sure we don't have a stale index value saved */
++	PUT_INDEX(lock_ptr, 0);
++	_raw_spin_unlock(lock_ptr);	/* do the real unlock */
++}
++
++/*
++ * allocate the next global read lock structure and store its index
++ * in the rwlock at "lock_ptr".
++ */
++uint32_t
++alloc_rwlock_struct(rwlock_t * rwlock_ptr)
++{
++	int index;
++	unsigned long flags;
++	int cpu = THIS_CPU_NUMBER;
++
++	/* If we've already overflowed, then do a quick exit */
++	if (lstat_control.next_free_read_lock_index >
++			LSTAT_MAX_READ_LOCK_INDEX) {
++		lstat_control.rwlock_overflow++;
++		return 0;
++	}
++
++	local_irq_save(flags);
++	_raw_spin_lock(&lstat_control.directory_lock);
++
++	/* It is possible this changed while we were waiting for the directory_lock */
++	if (lstat_control.state == LSTAT_OFF) {
++		index = 0;
++		goto unlock;
++	}
++
++	/* It is possible someone else got here first and set the index */
++	if ((index = GET_RWINDEX(rwlock_ptr)) == 0) {
++		/*
++		 * we can't turn on read stats for this lock while there are
++		 * readers (this would mess up the running hold time sum at
++		 * unlock time)
++		 */
++		if (RWLOCK_READERS(rwlock_ptr) != 0) {
++			index = 0;
++			goto unlock;
++		}
++
++		/*
++		 * if stats are turned on after being off, we may need to
++		 * return an old index from when the statistics were on last
++		 * time.
++		 */
++		for (index = 1; index < lstat_control.next_free_read_lock_index;
++				index++)
++			if ((*lstat_control.read_lock_counts[cpu])[index].
++					lock_ptr == rwlock_ptr)
++				goto put_index_and_unlock;
++
++		/* allocate the next global read lock structure */
++		if (lstat_control.next_free_read_lock_index >=
++		    LSTAT_MAX_READ_LOCK_INDEX) {
++			lstat_control.rwlock_overflow++;
++			index = 0;
++			goto unlock;
++		}
++		index = lstat_control.next_free_read_lock_index++;
++
++		/*
++		 * initialize the global read stats data structure for each
++		 * cpu
++		 */
++		for (cpu = 0; cpu < num_online_cpus(); cpu++) {
++			(*lstat_control.read_lock_counts[cpu])[index].lock_ptr =
++				rwlock_ptr;
++		}
++put_index_and_unlock:
++		/* store the index for the read lock structure into the lock */
++		PUT_RWINDEX(rwlock_ptr, index);
++	}
++
++unlock:
++	_raw_spin_unlock(&lstat_control.directory_lock);
++	local_irq_restore(flags);
++	return index;
++}
++
++void
++_metered_read_lock(rwlock_t * rwlock_ptr)
++{
++	void *this_pc;
++	uint32_t start_cycles;
++	int index;
++	int cpu;
++	unsigned long flags;
++	int readers_before, readers_after;
++	uint64_t cycles64;
++
++	if (lstat_control.state == LSTAT_OFF) {
++		_raw_read_lock(rwlock_ptr);
++		/* clean index in case lockmetering turns on before an unlock */
++		PUT_RWINDEX(rwlock_ptr, 0);
++		return;
++	}
++
++	this_pc = LSTAT_RA(LSTAT_RA_READ);
++	cpu = THIS_CPU_NUMBER;
++	index = GET_RWINDEX(rwlock_ptr);
++
++	/* allocate the global stats entry for this lock, if needed */
++	if (index == 0)
++		index = alloc_rwlock_struct(rwlock_ptr);
++
++	readers_before = RWLOCK_READERS(rwlock_ptr);
++	if (_raw_read_trylock(rwlock_ptr)) {
++		/*
++		 * We have decremented the lock to count a new reader,
++		 * and have confirmed that no writer has it locked.
++		 */
++		/* update statistics if enabled */
++		if (index > 0) {
++			local_irq_save(flags);
++			lstat_update((void *) rwlock_ptr, this_pc,
++					LSTAT_ACT_NO_WAIT);
++			/* preserve value of TSC so cum_hold_ticks and start_busy use same value */
++			cycles64 = get_cycles64();
++			(*lstat_control.read_lock_counts[cpu])[index].
++				cum_hold_ticks -= cycles64;
++
++			/* record time and cpu of start of busy period */
++			/* this is not perfect (some race conditions are possible) */
++			if (readers_before == 0) {
++				(*lstat_control.read_lock_counts[cpu])[index].
++					start_busy = cycles64;
++				PUT_RW_CPU(rwlock_ptr, cpu);
++			}
++			readers_after = RWLOCK_READERS(rwlock_ptr);
++			if (readers_after >
++				(*lstat_control.read_lock_counts[cpu])[index].
++					max_readers)
++				(*lstat_control.read_lock_counts[cpu])[index].
++					max_readers = readers_after;
++			local_irq_restore(flags);
++		}
++
++		return;
++	}
++	/* If we get here, then we could not quickly grab the read lock */
++
++	start_cycles = get_cycles();	/* start counting the wait time */
++
++	/* Now spin until read_lock is successful */
++	_raw_read_lock(rwlock_ptr);
++
++	lstat_update_time((void *) rwlock_ptr, this_pc, LSTAT_ACT_SPIN,
++			  get_cycles() - start_cycles);
++
++	/* update statistics if they are enabled for this lock */
++	if (index > 0) {
++		local_irq_save(flags);
++		cycles64 = get_cycles64();
++		(*lstat_control.read_lock_counts[cpu])[index].cum_hold_ticks -=
++				cycles64;
++
++		/* this is not perfect (some race conditions are possible) */
++		if (readers_before == 0) {
++			(*lstat_control.read_lock_counts[cpu])[index].
++				start_busy = cycles64;
++			PUT_RW_CPU(rwlock_ptr, cpu);
++		}
++		readers_after = RWLOCK_READERS(rwlock_ptr);
++		if (readers_after >
++		    (*lstat_control.read_lock_counts[cpu])[index].max_readers)
++			(*lstat_control.read_lock_counts[cpu])[index].
++				max_readers = readers_after;
++		local_irq_restore(flags);
++	}
++}
++
++void
++_metered_read_unlock(rwlock_t * rwlock_ptr)
++{
++	int index;
++	int cpu;
++	unsigned long flags;
++	uint64_t busy_length;
++	uint64_t cycles64;
++
++	if (lstat_control.state == LSTAT_OFF) {
++		_raw_read_unlock(rwlock_ptr);
++		return;
++	}
++
++	index = GET_RWINDEX(rwlock_ptr);
++	cpu = THIS_CPU_NUMBER;
++
++	if (index > 0) {
++		local_irq_save(flags);
++		/*
++		 * preserve value of TSC so cum_hold_ticks and busy_ticks are
++		 * consistent.
++		 */
++		cycles64 = get_cycles64();
++		(*lstat_control.read_lock_counts[cpu])[index].cum_hold_ticks +=
++			cycles64;
++		(*lstat_control.read_lock_counts[cpu])[index].read_lock_count++;
++
++		/*
++		 * once again, this is not perfect (some race conditions are
++		 * possible)
++		 */
++		if (RWLOCK_READERS(rwlock_ptr) == 1) {
++			int cpu1 = GET_RW_CPU(rwlock_ptr);
++			uint64_t last_start_busy =
++				(*lstat_control.read_lock_counts[cpu1])[index].
++					start_busy;
++			(*lstat_control.read_lock_counts[cpu])[index].
++				busy_periods++;
++			if (cycles64 > last_start_busy) {
++				busy_length = cycles64 - last_start_busy;
++				(*lstat_control.read_lock_counts[cpu])[index].
++					busy_ticks += busy_length;
++				if (busy_length >
++					(*lstat_control.
++						read_lock_counts[cpu])[index].
++							max_busy)
++					(*lstat_control.
++					 read_lock_counts[cpu])[index].
++						max_busy = busy_length;
++			}
++		}
++		local_irq_restore(flags);
++	}
++	_raw_read_unlock(rwlock_ptr);
++}
++
++void
++_metered_write_lock(rwlock_t * rwlock_ptr)
++{
++	uint32_t start_cycles;
++	void *this_pc;
++	uint32_t spin_ticks = 0; /* in anticipation of a potential wait */
++	int index;
++	int write_index = 0;
++	int cpu;
++	enum {
++		writer_writer_conflict,
++		writer_reader_conflict
++	} why_wait = writer_writer_conflict;
++
++	if (lstat_control.state == LSTAT_OFF) {
++		_raw_write_lock(rwlock_ptr);
++		/* clean index in case lockmetering turns on before an unlock */
++		PUT_RWINDEX(rwlock_ptr, 0);
++		return;
++	}
++
++	this_pc = LSTAT_RA(LSTAT_RA_WRITE);
++	cpu = THIS_CPU_NUMBER;
++	index = GET_RWINDEX(rwlock_ptr);
++
++	/* allocate the global stats entry for this lock, if needed */
++	if (index == 0) {
++		index = alloc_rwlock_struct(rwlock_ptr);
++	}
++
++	if (_raw_write_trylock(rwlock_ptr)) {
++		/* We acquired the lock on the first try */
++		write_index = lstat_update((void *) rwlock_ptr, this_pc,
++					LSTAT_ACT_NO_WAIT);
++		/* save the write_index for use in unlock if stats enabled */
++		if (index > 0)
++			(*lstat_control.read_lock_counts[cpu])[index].
++				write_index = write_index;
++		return;
++	}
++
++	/* If we get here, then we could not quickly grab the write lock */
++	start_cycles = get_cycles();	/* start counting the wait time */
++
++	why_wait = RWLOCK_READERS(rwlock_ptr) ?
++			writer_reader_conflict : writer_writer_conflict;
++
++	/* Now set the lock and wait for conflicts to disappear */
++	_raw_write_lock(rwlock_ptr);
++
++	spin_ticks = get_cycles() - start_cycles;
++
++	/* update stats -- if enabled */
++	if (index > 0 && spin_ticks) {
++		if (why_wait == writer_reader_conflict) {
++			/* waited due to a reader holding the lock */
++			write_index = lstat_update_time((void *)rwlock_ptr,
++					this_pc, LSTAT_ACT_SPIN, spin_ticks);
++		} else {
++			/*
++			 * waited due to another writer holding the lock
++			 */
++			write_index = lstat_update_time((void *)rwlock_ptr,
++				this_pc, LSTAT_ACT_WW_SPIN, spin_ticks);
++			(*lstat_control.counts[cpu])[write_index].
++				cum_wait_ww_ticks += spin_ticks;
++			if (spin_ticks >
++				(*lstat_control.counts[cpu])[write_index].
++					max_wait_ww_ticks) {
++				(*lstat_control.counts[cpu])[write_index].
++					max_wait_ww_ticks = spin_ticks;
++			}
++		}
++
++		/* save the directory index for use on write_unlock */
++		(*lstat_control.read_lock_counts[cpu])[index].
++			write_index = write_index;
++	}
++}
++
++void
++_metered_write_unlock(rwlock_t * rwlock_ptr)
++{
++	int index;
++	int cpu;
++	int write_index;
++	uint32_t hold_time;
++
++	if (lstat_control.state == LSTAT_OFF) {
++		_raw_write_unlock(rwlock_ptr);
++		return;
++	}
++
++	cpu = THIS_CPU_NUMBER;
++	index = GET_RWINDEX(rwlock_ptr);
++
++	/* update statistics if stats enabled for this lock */
++	if (index > 0) {
++		write_index =
++		    (*lstat_control.read_lock_counts[cpu])[index].write_index;
++
++		hold_time = get_cycles() -
++			(*lstat_control.counts[cpu])[write_index].acquire_time;
++		(*lstat_control.counts[cpu])[write_index].cum_hold_ticks +=
++			(uint64_t) hold_time;
++		if ((*lstat_control.counts[cpu])[write_index].max_hold_ticks <
++				hold_time)
++			(*lstat_control.counts[cpu])[write_index].
++				max_hold_ticks = hold_time;
++	}
++	_raw_write_unlock(rwlock_ptr);
++}
++
++int
++_metered_write_trylock(rwlock_t * rwlock_ptr)
++{
++	int retval;
++	void *this_pc = LSTAT_RA(LSTAT_RA_WRITE);
++
++	if ((retval = _raw_write_trylock(rwlock_ptr))) {
++		lstat_update(rwlock_ptr, this_pc, LSTAT_ACT_NO_WAIT);
++	} else {
++		lstat_update(rwlock_ptr, this_pc, LSTAT_ACT_REJECT);
++	}
++
++	return retval;
++}
++
++static void
++init_control_space(void)
++{
++	/* Set all control space pointers to null and indices to "empty" */
++	int cpu;
++
++	/*
++	 * Access CPU_CYCLE_FREQUENCY at the outset, which in some
++	 * architectures may trigger a runtime calculation that uses a
++	 * spinlock.  Let's do this before lockmetering is turned on.
++	 */
++	if (CPU_CYCLE_FREQUENCY == 0)
++		BUG();
++
++	lstat_control.hashtab = NULL;
++	lstat_control.dir = NULL;
++	for (cpu = 0; cpu < NR_CPUS; cpu++) {
++		lstat_control.counts[cpu] = NULL;
++		lstat_control.read_lock_counts[cpu] = NULL;
++	}
++}
++
++static int
++reset_lstat_data(void)
++{
++	int cpu, flags;
++
++	flags = 0;
++	lstat_control.next_free_dir_index = 1;	/* 0 is for overflows */
++	lstat_control.next_free_read_lock_index = 1;
++	lstat_control.dir_overflow = 0;
++	lstat_control.rwlock_overflow = 0;
++
++	lstat_control.started_cycles64 = 0;
++	lstat_control.ending_cycles64 = 0;
++	lstat_control.enabled_cycles64 = 0;
++	lstat_control.first_started_time = 0;
++	lstat_control.started_time = 0;
++	lstat_control.ending_time = 0;
++	lstat_control.intervals = 0;
++
++	/*
++	 * paranoia -- in case someone does a "lockstat reset" before
++	 * "lockstat on"
++	 */
++	if (lstat_control.hashtab) {
++		bzero(lstat_control.hashtab,
++			LSTAT_HASH_TABLE_SIZE * sizeof (short));
++		bzero(lstat_control.dir, LSTAT_MAX_STAT_INDEX *
++				sizeof (lstat_directory_entry_t));
++
++		for (cpu = 0; cpu < num_online_cpus(); cpu++) {
++			bzero(lstat_control.counts[cpu],
++				sizeof (lstat_cpu_counts_t));
++			bzero(lstat_control.read_lock_counts[cpu],
++				sizeof (lstat_read_lock_cpu_counts_t));
++		}
++	}
++#ifdef NOTDEF
++	_raw_spin_unlock(&lstat_control.directory_lock);
++	local_irq_restore(flags);
++#endif
++	return 1;
++}
++
++static void
++release_control_space(void)
++{
++	/*
++	 * Called when either (1) allocation of kmem
++	 * or (2) when user writes LSTAT_RELEASE to /pro/lockmeter.
++	 * Assume that all pointers have been initialized to zero,
++	 * i.e., nonzero pointers are valid addresses.
++	 */
++	int cpu;
++
++	if (lstat_control.hashtab) {
++		kfree(lstat_control.hashtab);
++		lstat_control.hashtab = NULL;
++	}
++
++	if (lstat_control.dir) {
++		vfree(lstat_control.dir);
++		lstat_control.dir = NULL;
++	}
++
++	for (cpu = 0; cpu < NR_CPUS; cpu++) {
++		if (lstat_control.counts[cpu]) {
++			vfree(lstat_control.counts[cpu]);
++			lstat_control.counts[cpu] = NULL;
++		}
++		if (lstat_control.read_lock_counts[cpu]) {
++			kfree(lstat_control.read_lock_counts[cpu]);
++			lstat_control.read_lock_counts[cpu] = NULL;
++		}
++	}
++}
++
++int
++get_lockmeter_info_size(void)
++{
++	return sizeof (lstat_user_request_t)
++		+ num_online_cpus() * sizeof (lstat_cpu_counts_t)
++		+ num_online_cpus() * sizeof (lstat_read_lock_cpu_counts_t)
++		+ (LSTAT_MAX_STAT_INDEX * sizeof (lstat_directory_entry_t));
++}
++
++ssize_t
++get_lockmeter_info(char *buffer, size_t max_len, loff_t * last_index)
++{
++	lstat_user_request_t req;
++	struct timeval tv;
++	ssize_t next_ret_bcount;
++	ssize_t actual_ret_bcount = 0;
++	int cpu;
++
++	*last_index = 0;	/* a one-shot read */
++
++	req.lstat_version = LSTAT_VERSION;
++	req.state = lstat_control.state;
++	req.maxcpus = num_online_cpus();
++	req.cycleval = CPU_CYCLE_FREQUENCY;
++#ifdef notyet
++	req.kernel_magic_addr = (void *) &_etext;
++	req.kernel_end_addr = (void *) &_etext;
++#endif
++	req.uts = system_utsname;
++	req.intervals = lstat_control.intervals;
++
++	req.first_started_time = lstat_control.first_started_time;
++	req.started_time = lstat_control.started_time;
++	req.started_cycles64 = lstat_control.started_cycles64;
++
++	req.next_free_dir_index = lstat_control.next_free_dir_index;
++	req.next_free_read_lock_index = lstat_control.next_free_read_lock_index;
++	req.dir_overflow = lstat_control.dir_overflow;
++	req.rwlock_overflow = lstat_control.rwlock_overflow;
++
++	if (lstat_control.state == LSTAT_OFF) {
++		if (req.intervals == 0) {
++			/* mesasurement is off and no valid data present */
++			next_ret_bcount = sizeof (lstat_user_request_t);
++			req.enabled_cycles64 = 0;
++
++			if ((actual_ret_bcount + next_ret_bcount) > max_len)
++				return actual_ret_bcount;
++
++			copy_to_user(buffer, (void *) &req, next_ret_bcount);
++			actual_ret_bcount += next_ret_bcount;
++			return actual_ret_bcount;
++		} else {
++			/*
++			 * measurement is off but valid data present
++			 * fetch time info from lstat_control
++			 */
++			req.ending_time = lstat_control.ending_time;
++			req.ending_cycles64 = lstat_control.ending_cycles64;
++			req.enabled_cycles64 = lstat_control.enabled_cycles64;
++		}
++	} else {
++		/*
++		 * this must be a read while data active--use current time,
++		 * etc
++		 */
++		do_gettimeofday(&tv);
++		req.ending_time = tv.tv_sec;
++		req.ending_cycles64 = get_cycles64();
++		req.enabled_cycles64 = req.ending_cycles64 -
++			req.started_cycles64 + lstat_control.enabled_cycles64;
++	}
++
++	next_ret_bcount = sizeof (lstat_user_request_t);
++	if ((actual_ret_bcount + next_ret_bcount) > max_len)
++		return actual_ret_bcount;
++
++	copy_to_user(buffer, (void *) &req, next_ret_bcount);
++	actual_ret_bcount += next_ret_bcount;
++
++	if (!lstat_control.counts[0])	/* not initialized? */
++		return actual_ret_bcount;
++
++	next_ret_bcount = sizeof (lstat_cpu_counts_t);
++	for (cpu = 0; cpu < num_online_cpus(); cpu++) {
++		if ((actual_ret_bcount + next_ret_bcount) > max_len)
++			return actual_ret_bcount;	/* leave early */
++		copy_to_user(buffer + actual_ret_bcount,
++				lstat_control.counts[cpu], next_ret_bcount);
++		actual_ret_bcount += next_ret_bcount;
++	}
++
++	next_ret_bcount = LSTAT_MAX_STAT_INDEX *
++			sizeof (lstat_directory_entry_t);
++	if (((actual_ret_bcount + next_ret_bcount) > max_len)
++			|| !lstat_control.dir)
++		return actual_ret_bcount;	/* leave early */
++
++	copy_to_user(buffer + actual_ret_bcount, lstat_control.dir,
++			next_ret_bcount);
++	actual_ret_bcount += next_ret_bcount;
++
++	next_ret_bcount = sizeof (lstat_read_lock_cpu_counts_t);
++	for (cpu = 0; cpu < num_online_cpus(); cpu++) {
++		if (actual_ret_bcount + next_ret_bcount > max_len)
++			return actual_ret_bcount;
++		copy_to_user(buffer + actual_ret_bcount,
++				lstat_control.read_lock_counts[cpu],
++				next_ret_bcount);
++		actual_ret_bcount += next_ret_bcount;
++	}
++
++	return actual_ret_bcount;
++}
++
++/*
++ *  Writing to the /proc lockmeter node enables or disables metering.
++ *  based upon the first byte of the "written" data.
++ *  The following values are defined:
++ *  LSTAT_ON: 1st call: allocates storage, intializes and turns on measurement
++ *            subsequent calls just turn on measurement
++ *  LSTAT_OFF: turns off measurement
++ *  LSTAT_RESET: resets statistics
++ *  LSTAT_RELEASE: releases statistics storage
++ *
++ *  This allows one to accumulate statistics over several lockstat runs:
++ *
++ *  lockstat on
++ *  lockstat off
++ *  ...repeat above as desired...
++ *  lockstat get
++ *  ...now start a new set of measurements...
++ *  lockstat reset
++ *  lockstat on
++ *  ...
++ *
++ */
++ssize_t
++put_lockmeter_info(const char *buffer, size_t len)
++{
++	int error = 0;
++	int dirsize, countsize, read_lock_countsize, hashsize;
++	int cpu;
++	char put_char;
++	int i, read_lock_blocks;
++	unsigned long flags;
++	rwlock_t *lock_ptr;
++	struct timeval tv;
++
++	if (len <= 0)
++		return -EINVAL;
++
++	_raw_spin_lock(&lstat_control.control_lock);
++
++	get_user(put_char, buffer);
++	switch (put_char) {
++
++	case LSTAT_OFF:
++		if (lstat_control.state != LSTAT_OFF) {
++			/*
++			 * To avoid seeing read lock hold times in an
++			 * inconsisent state, we have to follow this protocol
++			 * to turn off statistics
++			 */
++			local_irq_save(flags);
++			/*
++			 * getting this lock will stop any read lock block
++			 * allocations
++			 */
++			_raw_spin_lock(&lstat_control.directory_lock);
++			/*
++			 * keep any more read lock blocks from being
++			 * allocated
++			 */
++			lstat_control.state = LSTAT_OFF;
++			/* record how may read lock blocks there are */
++			read_lock_blocks =
++				lstat_control.next_free_read_lock_index;
++			_raw_spin_unlock(&lstat_control.directory_lock);
++			/* now go through the list of read locks */
++			cpu = THIS_CPU_NUMBER;
++			for (i = 1; i < read_lock_blocks; i++) {
++				lock_ptr =
++				    (*lstat_control.read_lock_counts[cpu])[i].
++				    lock_ptr;
++				/* is this saved lock address still valid? */
++				if (GET_RWINDEX(lock_ptr) == i) {
++					/*
++					 * lock address appears to still be
++					 * valid because we only hold one lock
++					 * at a time, this can't cause a
++					 * deadlock unless this is a lock held
++					 * as part of the current system call
++					 * path. At the moment there
++					 * are no READ mode locks held to get
++					 * here from user space, so we solve
++					 * this by skipping locks held in
++					 * write mode.
++					 */
++					if (RWLOCK_IS_WRITE_LOCKED(lock_ptr)) {
++						PUT_RWINDEX(lock_ptr, 0);
++						continue;
++					}
++					/*
++					 * now we know there are no read
++					 * holders of this lock! stop
++					 * statistics collection for this
++					 * lock
++					 */
++					_raw_write_lock(lock_ptr);
++					PUT_RWINDEX(lock_ptr, 0);
++					_raw_write_unlock(lock_ptr);
++				}
++				/*
++				 * it may still be possible for the hold time
++				 * sum to be negative e.g. if a lock is
++				 * reallocated while "busy" we will have to fix
++				 * this up in the data reduction program.
++				 */
++			}
++			local_irq_restore(flags);
++			lstat_control.intervals++;
++			lstat_control.ending_cycles64 = get_cycles64();
++			lstat_control.enabled_cycles64 +=
++				lstat_control.ending_cycles64 -
++				lstat_control.started_cycles64;
++			do_gettimeofday(&tv);
++			lstat_control.ending_time = tv.tv_sec;
++			/*
++			 * don't deallocate the structures -- we may do a
++			 * lockstat on to add to the data that is already
++			 * there. Use LSTAT_RELEASE to release storage
++			 */
++		} else {
++			error = -EBUSY;	/* already OFF */
++		}
++		break;
++
++	case LSTAT_ON:
++		if (lstat_control.state == LSTAT_OFF) {
++#ifdef DEBUG_LOCKMETER
++			printk("put_lockmeter_info(cpu=%d): LSTAT_ON\n",
++				THIS_CPU_NUMBER);
++#endif
++			lstat_control.next_free_dir_index = 1;	/* 0 is for overflows */
++
++			dirsize = LSTAT_MAX_STAT_INDEX *
++					sizeof (lstat_directory_entry_t);
++			hashsize =
++				(1 + LSTAT_HASH_TABLE_SIZE) * sizeof (ushort);
++			countsize = sizeof (lstat_cpu_counts_t);
++			read_lock_countsize =
++				sizeof (lstat_read_lock_cpu_counts_t);
++#ifdef DEBUG_LOCKMETER
++			printk(" dirsize:%d", dirsize);
++			printk(" hashsize:%d", hashsize);
++			printk(" countsize:%d", countsize);
++			printk(" read_lock_countsize:%d\n",
++				read_lock_countsize);
++#endif
++#ifdef DEBUG_LOCKMETER
++			{
++				int secs;
++				unsigned long cycles;
++				uint64_t cycles64;
++
++				do_gettimeofday(&tv);
++				secs = tv.tv_sec;
++				do {
++					do_gettimeofday(&tv);
++				} while (secs == tv.tv_sec);
++				cycles = get_cycles();
++				cycles64 = get_cycles64();
++				secs = tv.tv_sec;
++				do {
++					do_gettimeofday(&tv);
++				} while (secs == tv.tv_sec);
++				cycles = get_cycles() - cycles;
++				cycles64 = get_cycles64() - cycles;
++				printk("lockmeter: cycleFrequency:%d "
++					"cycles:%d cycles64:%d\n",
++					CPU_CYCLE_FREQUENCY, cycles, cycles64);
++			}
++#endif
++
++			/*
++			 * if this is the first call, allocate storage and
++			 * initialize
++			 */
++			if (!lstat_control.hashtab) {
++
++				spin_lock_init(&lstat_control.directory_lock);
++
++				/* guarantee all pointers at zero */
++				init_control_space();
++
++				lstat_control.hashtab =
++				    kmalloc(hashsize, GFP_KERNEL);
++				if (!lstat_control.hashtab) {
++					error = -ENOSPC;
++#ifdef DEBUG_LOCKMETER
++					printk("!!error kmalloc of hashtab\n");
++#endif
++				}
++				lstat_control.dir = vmalloc(dirsize);
++				if (!lstat_control.dir) {
++					error = -ENOSPC;
++#ifdef DEBUG_LOCKMETER
++					printk("!!error kmalloc of dir\n");
++#endif
++				}
++
++				for (cpu = 0; cpu < num_online_cpus(); cpu++) {
++					lstat_control.counts[cpu] =
++						vmalloc(countsize);
++					if (!lstat_control.counts[cpu]) {
++						error = -ENOSPC;
++#ifdef DEBUG_LOCKMETER
++						printk("!!error vmalloc of "
++							"counts[%d]\n", cpu);
++#endif
++					}
++					lstat_control.read_lock_counts[cpu] =
++						(lstat_read_lock_cpu_counts_t *)
++						kmalloc(read_lock_countsize,
++							GFP_KERNEL);
++					if (!lstat_control.
++							read_lock_counts[cpu]) {
++						error = -ENOSPC;
++#ifdef DEBUG_LOCKMETER
++						printk("!!error kmalloc of "
++						  "read_lock_counts[%d]\n",
++							cpu);
++#endif
++					}
++				}
++			}
++
++			if (error) {
++				/*
++				 * One or more kmalloc failures -- free
++				 * everything
++				 */
++				release_control_space();
++			} else {
++
++				if (!reset_lstat_data()) {
++					error = -EINVAL;
++					break;
++				};
++
++				/*
++				 * record starting and ending times and the
++				 * like
++				 */
++				if (lstat_control.intervals == 0) {
++					do_gettimeofday(&tv);
++					lstat_control.first_started_time =
++						tv.tv_sec;
++				}
++				lstat_control.started_cycles64 = get_cycles64();
++				do_gettimeofday(&tv);
++				lstat_control.started_time = tv.tv_sec;
++
++				lstat_control.state = LSTAT_ON;
++			}
++		} else {
++			error = -EBUSY;	/* already ON */
++		}
++		break;
++
++	case LSTAT_RESET:
++		if (lstat_control.state == LSTAT_OFF) {
++			if (!reset_lstat_data())
++				error = -EINVAL;
++		} else {
++			error = -EBUSY;	/* still on; can't reset */
++		}
++		break;
++
++	case LSTAT_RELEASE:
++		if (lstat_control.state == LSTAT_OFF) {
++			release_control_space();
++			lstat_control.intervals = 0;
++			lstat_control.enabled_cycles64 = 0;
++		} else {
++			error = -EBUSY;
++		}
++		break;
++
++	default:
++		error = -EINVAL;
++	}			/* switch */
++
++	_raw_spin_unlock(&lstat_control.control_lock);
++	return error ? error : len;
++}
++
++#ifdef USER_MODE_TESTING
++/* following used for user mode testing */
++void
++lockmeter_init()
++{
++	int dirsize, hashsize, countsize, read_lock_countsize, cpu;
++
++	printf("lstat_control is at %x size=%d\n", &lstat_control,
++		sizeof (lstat_control));
++	printf("sizeof(spinlock_t)=%d\n", sizeof (spinlock_t));
++	lstat_control.state = LSTAT_ON;
++
++	lstat_control.directory_lock = SPIN_LOCK_UNLOCKED;
++	lstat_control.next_free_dir_index = 1;	/* 0 is for overflows */
++	lstat_control.next_free_read_lock_index = 1;
++
++	dirsize = LSTAT_MAX_STAT_INDEX * sizeof (lstat_directory_entry_t);
++	hashsize = (1 + LSTAT_HASH_TABLE_SIZE) * sizeof (ushort);
++	countsize = sizeof (lstat_cpu_counts_t);
++	read_lock_countsize = sizeof (lstat_read_lock_cpu_counts_t);
++
++	lstat_control.hashtab = (ushort *) malloc(hashsize);
++
++	if (lstat_control.hashtab == 0) {
++		printf("malloc failure for at line %d in lockmeter.c\n",
++			__LINE__);
++		exit(0);
++	}
++
++	lstat_control.dir = (lstat_directory_entry_t *) malloc(dirsize);
++
++	if (lstat_control.dir == 0) {
++		printf("malloc failure for at line %d in lockmeter.c\n", cpu,
++			__LINE__);
++		exit(0);
++	}
++
++	for (cpu = 0; cpu < num_online_cpus(); cpu++) {
++		int j, k;
++		j = (int) (lstat_control.counts[cpu] =
++			   (lstat_cpu_counts_t *) malloc(countsize));
++		k = (int) (lstat_control.read_lock_counts[cpu] =
++			   (lstat_read_lock_cpu_counts_t *)
++			   malloc(read_lock_countsize));
++		if (j * k == 0) {
++			printf("malloc failure for cpu=%d at line %d in "
++				"lockmeter.c\n", cpu, __LINE__);
++			exit(0);
++		}
++	}
++
++	memset(lstat_control.hashtab, 0, hashsize);
++	memset(lstat_control.dir, 0, dirsize);
++
++	for (cpu = 0; cpu < num_online_cpus(); cpu++) {
++		memset(lstat_control.counts[cpu], 0, countsize);
++		memset(lstat_control.read_lock_counts[cpu], 0,
++			read_lock_countsize);
++	}
++}
++
++asm(" \
++.align	4 \
++.globl	__write_lock_failed \
++__write_lock_failed: \
++	" LOCK "addl	$" RW_LOCK_BIAS_STR ",(%eax) \
++1:	cmpl	$" RW_LOCK_BIAS_STR ",(%eax) \
++	jne	1b \
++\
++	" LOCK "subl	$" RW_LOCK_BIAS_STR ",(%eax) \
++	jnz	__write_lock_failed \
++	ret \
++\
++\
++.align	4 \
++.globl	__read_lock_failed \
++__read_lock_failed: \
++	lock ; incl	(%eax) \
++1:	cmpl	$1,(%eax) \
++	js	1b \
++\
++	lock ; decl	(%eax) \
++	js	__read_lock_failed \
++	ret \
++");
++#endif
+--- linux-2.6.0-test6/kernel/Makefile	2003-09-27 18:57:47.000000000 -0700
++++ 25/kernel/Makefile	2003-10-05 00:36:40.000000000 -0700
+@@ -11,6 +11,7 @@ obj-y     = sched.o fork.o exec_domain.o
+ obj-$(CONFIG_FUTEX) += futex.o
+ obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o
+ obj-$(CONFIG_SMP) += cpu.o
++obj-$(CONFIG_LOCKMETER) += lockmeter.o
+ obj-$(CONFIG_UID16) += uid16.o
+ obj-$(CONFIG_MODULES) += ksyms.o module.o
+ obj-$(CONFIG_KALLSYMS) += kallsyms.o
+--- linux-2.6.0-test6/kernel/module.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/kernel/module.c	2003-10-05 00:33:25.000000000 -0700
+@@ -844,6 +844,7 @@ int set_obsolete(const char *val, struct
+ {
+ 	unsigned int min, max;
+ 	unsigned int size, maxsize;
++	int dummy;
+ 	char *endp;
+ 	const char *p;
+ 	struct obsolete_modparm *obsparm = kp->arg;
+@@ -866,19 +867,19 @@ int set_obsolete(const char *val, struct
+ 	switch (*endp) {
+ 	case 'b':
+ 		return param_array(kp->name, val, min, max, obsparm->addr,
+-				   1, param_set_byte);
++				   1, param_set_byte, &dummy);
+ 	case 'h':
+ 		return param_array(kp->name, val, min, max, obsparm->addr,
+-				   sizeof(short), param_set_short);
++				   sizeof(short), param_set_short, &dummy);
+ 	case 'i':
+ 		return param_array(kp->name, val, min, max, obsparm->addr,
+-				   sizeof(int), param_set_int);
++				   sizeof(int), param_set_int, &dummy);
+ 	case 'l':
+ 		return param_array(kp->name, val, min, max, obsparm->addr,
+-				   sizeof(long), param_set_long);
++				   sizeof(long), param_set_long, &dummy);
+ 	case 's':
+ 		return param_array(kp->name, val, min, max, obsparm->addr,
+-				   sizeof(char *), param_set_charp);
++				   sizeof(char *), param_set_charp, &dummy);
+ 
+ 	case 'c':
+ 		/* Undocumented: 1-5c50 means 1-5 strings of up to 49 chars,
+@@ -895,7 +896,7 @@ int set_obsolete(const char *val, struct
+ 		if (size >= maxsize) 
+ 			goto oversize;
+ 		return param_array(kp->name, val, min, max, obsparm->addr,
+-				   maxsize, obsparm_copy_string);
++				   maxsize, obsparm_copy_string, &dummy);
+ 	}
+ 	printk(KERN_ERR "Unknown obsolete parameter type %s\n", obsparm->type);
+ 	return -EINVAL;
+--- linux-2.6.0-test6/kernel/params.c	2003-08-22 19:23:42.000000000 -0700
++++ 25/kernel/params.c	2003-10-05 00:33:25.000000000 -0700
+@@ -242,10 +242,10 @@ int param_array(const char *name,
+ 		const char *val,
+ 		unsigned int min, unsigned int max,
+ 		void *elem, int elemsize,
+-		int (*set)(const char *, struct kernel_param *kp))
++		int (*set)(const char *, struct kernel_param *kp),
++		int *num)
+ {
+ 	int ret;
+-	unsigned int count = 0;
+ 	struct kernel_param kp;
+ 	char save;
+ 
+@@ -259,11 +259,12 @@ int param_array(const char *name,
+ 		return -EINVAL;
+ 	}
+ 
++	*num = 0;
+ 	/* We expect a comma-separated list of values. */
+ 	do {
+ 		int len;
+ 
+-		if (count > max) {
++		if (*num == max) {
+ 			printk(KERN_ERR "%s: can only take %i arguments\n",
+ 			       name, max);
+ 			return -EINVAL;
+@@ -279,10 +280,10 @@ int param_array(const char *name,
+ 			return ret;
+ 		kp.arg += elemsize;
+ 		val += len+1;
+-		count++;
++		(*num)++;
+ 	} while (save == ',');
+ 
+-	if (count < min) {
++	if (*num < min) {
+ 		printk(KERN_ERR "%s: needs at least %i arguments\n",
+ 		       name, min);
+ 		return -EINVAL;
+@@ -290,29 +291,32 @@ int param_array(const char *name,
+ 	return 0;
+ }
+ 
+-/* First two elements are the max and min array length (which don't change) */
+-int param_set_intarray(const char *val, struct kernel_param *kp)
++int param_array_set(const char *val, struct kernel_param *kp)
+ {
+-	int *array;
++	struct kparam_array *arr = kp->arg;
+ 
+-	/* Grab min and max as first two elements */
+-	array = kp->arg;
+-	return param_array(kp->name, val, array[0], array[1], &array[2],
+-			   sizeof(int), param_set_int);
++	return param_array(kp->name, val, 1, arr->max, arr->elem,
++			   arr->elemsize, arr->set, arr->num);
+ }
+ 
+-int param_get_intarray(char *buffer, struct kernel_param *kp)
++int param_array_get(char *buffer, struct kernel_param *kp)
+ {
+-	int max;
+-	int *array;
+-	unsigned int i;
+-
+-	array = kp->arg;
+-	max = array[1];
+-
+-	for (i = 2; i < max + 2; i++)
+-		sprintf(buffer, "%s%i", i > 2 ? "," : "", array[i]);
+-	return strlen(buffer);
++	int i, off, ret;
++	struct kparam_array *arr = kp->arg;
++	struct kernel_param p;
++
++	p = *kp;
++	for (i = off = 0; i < *arr->num; i++) {
++		if (i)
++			buffer[off++] = ',';
++		p.arg = arr->elem + arr->elemsize * i;
++		ret = arr->get(buffer + off, &p);
++		if (ret < 0)
++			return ret;
++		off += ret;
++	}
++	buffer[off] = '\0';
++	return off;
+ }
+ 
+ int param_set_copystring(const char *val, struct kernel_param *kp)
+@@ -346,6 +350,6 @@ EXPORT_SYMBOL(param_set_bool);
+ EXPORT_SYMBOL(param_get_bool);
+ EXPORT_SYMBOL(param_set_invbool);
+ EXPORT_SYMBOL(param_get_invbool);
+-EXPORT_SYMBOL(param_set_intarray);
+-EXPORT_SYMBOL(param_get_intarray);
++EXPORT_SYMBOL(param_array_set);
++EXPORT_SYMBOL(param_array_get);
+ EXPORT_SYMBOL(param_set_copystring);
+--- linux-2.6.0-test6/kernel/pid.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/kernel/pid.c	2003-10-05 00:36:15.000000000 -0700
+@@ -250,14 +250,14 @@ void switch_exec_pids(task_t *leader, ta
+ 
+ 	attach_pid(thread, PIDTYPE_PID, thread->pid);
+ 	attach_pid(thread, PIDTYPE_TGID, thread->tgid);
+-	attach_pid(thread, PIDTYPE_PGID, leader->__pgrp);
+-	attach_pid(thread, PIDTYPE_SID, thread->session);
++	attach_pid(thread, PIDTYPE_PGID, thread->signal->pgrp);
++	attach_pid(thread, PIDTYPE_SID, thread->signal->session);
+ 	list_add_tail(&thread->tasks, &init_task.tasks);
+ 
+ 	attach_pid(leader, PIDTYPE_PID, leader->pid);
+ 	attach_pid(leader, PIDTYPE_TGID, leader->tgid);
+-	attach_pid(leader, PIDTYPE_PGID, leader->__pgrp);
+-	attach_pid(leader, PIDTYPE_SID, leader->session);
++	attach_pid(leader, PIDTYPE_PGID, leader->signal->pgrp);
++	attach_pid(leader, PIDTYPE_SID, leader->signal->session);
+ }
+ 
+ /*
+@@ -265,6 +265,9 @@ void switch_exec_pids(task_t *leader, ta
+  * machine.  From a minimum of 16 slots up to 4096 slots at one gigabyte or
+  * more.
+  */
++#ifdef CONFIG_KGDB
++int kgdb_pid_init_done; /* so we don't call prior to... */
++#endif
+ void __init pidhash_init(void)
+ {
+ 	int i, j, pidhash_size;
+@@ -286,6 +289,9 @@ void __init pidhash_init(void)
+ 		for (j = 0; j < pidhash_size; j++)
+ 			INIT_LIST_HEAD(&pid_hash[i][j]);
+ 	}
++#ifdef CONFIG_KGDB
++	kgdb_pid_init_done++;
++#endif
+ }
+ 
+ void __init pidmap_init(void)
+--- linux-2.6.0-test6/kernel/printk.c	2003-07-02 14:53:18.000000000 -0700
++++ 25/kernel/printk.c	2003-10-05 00:36:41.000000000 -0700
+@@ -29,11 +29,11 @@
+ #include <linux/delay.h>
+ #include <linux/smp.h>
+ #include <linux/security.h>
++#include <linux/bootmem.h>
+ 
+ #include <asm/uaccess.h>
+ 
+-#define LOG_BUF_LEN	(1 << CONFIG_LOG_BUF_SHIFT)
+-#define LOG_BUF_MASK	(LOG_BUF_LEN-1)
++#define __LOG_BUF_LEN	(1 << CONFIG_LOG_BUF_SHIFT)
+ 
+ /* printk's without a loglevel use this.. */
+ #define DEFAULT_MESSAGE_LOGLEVEL 4 /* KERN_WARNING */
+@@ -68,17 +68,21 @@ struct console *console_drivers;
+  */
+ static spinlock_t logbuf_lock = SPIN_LOCK_UNLOCKED;
+ 
+-static char log_buf[LOG_BUF_LEN];
++static char __log_buf[__LOG_BUF_LEN];
++static char *log_buf = __log_buf;
++static int log_buf_len = __LOG_BUF_LEN;
++
++#define LOG_BUF_MASK	(log_buf_len-1)
+ #define LOG_BUF(idx) (log_buf[(idx) & LOG_BUF_MASK])
+ 
+ /*
+- * The indices into log_buf are not constrained to LOG_BUF_LEN - they
++ * The indices into log_buf are not constrained to log_buf_len - they
+  * must be masked before subscripting
+  */
+-static unsigned long log_start;			/* Index into log_buf: next char to be read by syslog() */
+-static unsigned long con_start;			/* Index into log_buf: next char to be sent to consoles */
+-static unsigned long log_end;			/* Index into log_buf: most-recently-written-char + 1 */
+-static unsigned long logged_chars;		/* Number of chars produced since last read+clear operation */
++static unsigned long log_start;	/* Index into log_buf: next char to be read by syslog() */
++static unsigned long con_start;	/* Index into log_buf: next char to be sent to consoles */
++static unsigned long log_end;	/* Index into log_buf: most-recently-written-char + 1 */
++static unsigned long logged_chars; /* Number of chars produced since last read+clear operation */
+ 
+ struct console_cmdline console_cmdline[MAX_CMDLINECONSOLES];
+ static int preferred_console = -1;
+@@ -141,6 +145,45 @@ static int __init console_setup(char *st
+ 
+ __setup("console=", console_setup);
+ 
++static int __init log_buf_len_setup(char *str)
++{
++	unsigned long size = memparse(str, &str);
++
++	if (size > log_buf_len) {
++		unsigned long start, dest_idx, offset;
++		char * new_log_buf;
++
++		new_log_buf = alloc_bootmem(size);
++		if (!new_log_buf) {
++			printk("log_buf_len: allocation failed\n");
++			goto out;
++		}
++
++		spin_lock_irq(&logbuf_lock);
++		log_buf_len = size;
++		log_buf = new_log_buf;
++
++		offset = start = min(con_start, log_start);
++		dest_idx = 0;
++		while (start != log_end) {
++			log_buf[dest_idx] = __log_buf[start & (__LOG_BUF_LEN - 1)];
++			start++;
++			dest_idx++;
++		}
++		log_start -= offset;
++		con_start -= offset;
++		log_end -= offset;
++		spin_unlock_irq(&logbuf_lock);
++
++		printk("log_buf_len: %d\n", log_buf_len);
++	}
++out:
++
++	return 1;
++}
++
++__setup("log_buf_len=", log_buf_len_setup);
++
+ /*
+  * Commands to do_syslog:
+  *
+@@ -213,8 +256,8 @@ int do_syslog(int type, char __user * bu
+ 		if (error)
+ 			goto out;
+ 		count = len;
+-		if (count > LOG_BUF_LEN)
+-			count = LOG_BUF_LEN;
++		if (count > log_buf_len)
++			count = log_buf_len;
+ 		spin_lock_irq(&logbuf_lock);
+ 		if (count > logged_chars)
+ 			count = logged_chars;
+@@ -229,7 +272,7 @@ int do_syslog(int type, char __user * bu
+ 		 */
+ 		for(i = 0; i < count && !error; i++) {
+ 			j = limit-1-i;
+-			if (j+LOG_BUF_LEN < log_end)
++			if (j + log_buf_len < log_end)
+ 				break;
+ 			c = LOG_BUF(j);
+ 			spin_unlock_irq(&logbuf_lock);
+@@ -302,12 +345,15 @@ static void __call_console_drivers(unsig
+ /*
+  * Write out chars from start to end - 1 inclusive
+  */
+-static void _call_console_drivers(unsigned long start, unsigned long end, int msg_log_level)
++static void _call_console_drivers(unsigned long start,
++				unsigned long end, int msg_log_level)
+ {
+-	if (msg_log_level < console_loglevel && console_drivers && start != end) {
++	if (msg_log_level < console_loglevel &&
++			console_drivers && start != end) {
+ 		if ((start & LOG_BUF_MASK) > (end & LOG_BUF_MASK)) {
+ 			/* wrapped write */
+-			__call_console_drivers(start & LOG_BUF_MASK, LOG_BUF_LEN);
++			__call_console_drivers(start & LOG_BUF_MASK,
++						log_buf_len);
+ 			__call_console_drivers(0, end & LOG_BUF_MASK);
+ 		} else {
+ 			__call_console_drivers(start, end);
+@@ -370,11 +416,11 @@ static void emit_log_char(char c)
+ {
+ 	LOG_BUF(log_end) = c;
+ 	log_end++;
+-	if (log_end - log_start > LOG_BUF_LEN)
+-		log_start = log_end - LOG_BUF_LEN;
+-	if (log_end - con_start > LOG_BUF_LEN)
+-		con_start = log_end - LOG_BUF_LEN;
+-	if (logged_chars < LOG_BUF_LEN)
++	if (log_end - log_start > log_buf_len)
++		log_start = log_end - log_buf_len;
++	if (log_end - con_start > log_buf_len)
++		con_start = log_end - log_buf_len;
++	if (logged_chars < log_buf_len)
+ 		logged_chars++;
+ }
+ 
+@@ -399,9 +445,13 @@ asmlinkage int printk(const char *fmt, .
+ 	char *p;
+ 	static char printk_buf[1024];
+ 	static int log_level_unknown = 1;
++	static int printk_cpu = -1;
+ 
+-	if (oops_in_progress) {
+-		/* If a crash is occurring, make sure we can't deadlock */
++	if (oops_in_progress && printk_cpu == smp_processor_id()) {
++		/*
++		 * If a crash is occurring during printk() on this CPU, make
++		 * sure we can't deadlock
++		 */
+ 		spin_lock_init(&logbuf_lock);
+ 		/* And make sure that we print immediately */
+ 		init_MUTEX(&console_sem);
+@@ -409,6 +459,7 @@ asmlinkage int printk(const char *fmt, .
+ 
+ 	/* This stops the holder of console_sem just where we want him */
+ 	spin_lock_irqsave(&logbuf_lock, flags);
++	printk_cpu = smp_processor_id();
+ 
+ 	/* Emit the output into the temporary buffer */
+ 	va_start(args, fmt);
+--- linux-2.6.0-test6/kernel/ptrace.c	2003-08-22 19:23:42.000000000 -0700
++++ 25/kernel/ptrace.c	2003-10-05 00:33:25.000000000 -0700
+@@ -179,19 +179,14 @@ int access_process_vm(struct task_struct
+ 
+ 		flush_cache_page(vma, addr);
+ 
+-		/*
+-		 * FIXME!  We used to have flush_page_to_ram() in here, but
+-		 * that was wrong.  davem says we need a new per-arch primitive
+-		 * to handle this correctly.
+-		 */
+-
+ 		maddr = kmap(page);
+ 		if (write) {
+-			memcpy(maddr + offset, buf, bytes);
+-			flush_icache_user_range(vma, page, addr, bytes);
++			copy_to_user_page(vma, page, addr,
++					  maddr + offset, buf, bytes);
+ 			set_page_dirty_lock(page);
+ 		} else {
+-			memcpy(buf, maddr + offset, bytes);
++			copy_from_user_page(vma, page, addr,
++					    buf, maddr + offset, bytes);
+ 		}
+ 		kunmap(page);
+ 		page_cache_release(page);
+--- linux-2.6.0-test6/kernel/rcupdate.c	2003-08-22 19:23:42.000000000 -0700
++++ 25/kernel/rcupdate.c	2003-10-05 00:33:25.000000000 -0700
+@@ -15,7 +15,7 @@
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  *
+- * Copyright (c) IBM Corporation, 2001
++ * Copyright (C) IBM Corporation, 2001
+  *
+  * Author: Dipankar Sarma <dipankar@in.ibm.com>
+  * 
+--- linux-2.6.0-test6/kernel/sched.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/kernel/sched.c	2003-10-05 00:36:39.000000000 -0700
+@@ -18,6 +18,7 @@
+  */
+ 
+ #include <linux/mm.h>
++#include <linux/module.h>
+ #include <linux/nmi.h>
+ #include <linux/init.h>
+ #include <asm/uaccess.h>
+@@ -642,6 +643,8 @@ int wake_up_process(task_t * p)
+ 	return try_to_wake_up(p, TASK_STOPPED | TASK_INTERRUPTIBLE | TASK_UNINTERRUPTIBLE, 0, 0);
+ }
+ 
++EXPORT_SYMBOL(wake_up_process);
++
+ int wake_up_process_kick(task_t * p)
+ {
+ 	return try_to_wake_up(p, TASK_STOPPED | TASK_INTERRUPTIBLE | TASK_UNINTERRUPTIBLE, 0, 1);
+@@ -1585,6 +1588,8 @@ switch_tasks:
+ 		goto need_resched;
+ }
+ 
++EXPORT_SYMBOL(schedule);
++
+ #ifdef CONFIG_PREEMPT
+ /*
+  * this is is the entry point to schedule() from in-kernel preemption
+@@ -1612,6 +1617,8 @@ need_resched:
+ 	if (unlikely(test_thread_flag(TIF_NEED_RESCHED)))
+ 		goto need_resched;
+ }
++
++EXPORT_SYMBOL(preempt_schedule);
+ #endif /* CONFIG_PREEMPT */
+ 
+ int default_wake_function(wait_queue_t *curr, unsigned mode, int sync)
+@@ -1620,6 +1627,8 @@ int default_wake_function(wait_queue_t *
+ 	return try_to_wake_up(p, mode, sync, 0);
+ }
+ 
++EXPORT_SYMBOL(default_wake_function);
++
+ /*
+  * The core wakeup function.  Non-exclusive wakeups (nr_exclusive == 0) just
+  * wake everything up.  If it's an exclusive wakeup (nr_exclusive == small +ve
+@@ -1660,6 +1669,8 @@ void __wake_up(wait_queue_head_t *q, uns
+ 	spin_unlock_irqrestore(&q->lock, flags);
+ }
+ 
++EXPORT_SYMBOL(__wake_up);
++
+ /*
+  * Same as __wake_up but called with the spinlock in wait_queue_head_t held.
+  */
+@@ -1696,6 +1707,8 @@ void __wake_up_sync(wait_queue_head_t *q
+ 	spin_unlock_irqrestore(&q->lock, flags);
+ }
+ 
++EXPORT_SYMBOL(__wake_up_sync);
++
+ void complete(struct completion *x)
+ {
+ 	unsigned long flags;
+@@ -1706,6 +1719,8 @@ void complete(struct completion *x)
+ 	spin_unlock_irqrestore(&x->wait.lock, flags);
+ }
+ 
++EXPORT_SYMBOL(complete);
++
+ void complete_all(struct completion *x)
+ {
+ 	unsigned long flags;
+@@ -1737,6 +1752,8 @@ void wait_for_completion(struct completi
+ 	spin_unlock_irq(&x->wait.lock);
+ }
+ 
++EXPORT_SYMBOL(wait_for_completion);
++
+ #define	SLEEP_ON_VAR				\
+ 	unsigned long flags;			\
+ 	wait_queue_t wait;			\
+@@ -1763,6 +1780,8 @@ void interruptible_sleep_on(wait_queue_h
+ 	SLEEP_ON_TAIL
+ }
+ 
++EXPORT_SYMBOL(interruptible_sleep_on);
++
+ long interruptible_sleep_on_timeout(wait_queue_head_t *q, long timeout)
+ {
+ 	SLEEP_ON_VAR
+@@ -1776,6 +1795,8 @@ long interruptible_sleep_on_timeout(wait
+ 	return timeout;
+ }
+ 
++EXPORT_SYMBOL(interruptible_sleep_on_timeout);
++
+ void sleep_on(wait_queue_head_t *q)
+ {
+ 	SLEEP_ON_VAR
+@@ -1787,6 +1808,8 @@ void sleep_on(wait_queue_head_t *q)
+ 	SLEEP_ON_TAIL
+ }
+ 
++EXPORT_SYMBOL(sleep_on);
++
+ long sleep_on_timeout(wait_queue_head_t *q, long timeout)
+ {
+ 	SLEEP_ON_VAR
+@@ -1800,6 +1823,8 @@ long sleep_on_timeout(wait_queue_head_t 
+ 	return timeout;
+ }
+ 
++EXPORT_SYMBOL(sleep_on_timeout);
++
+ void scheduling_functions_end_here(void) { }
+ 
+ void set_user_nice(task_t *p, long nice)
+@@ -1849,6 +1874,15 @@ out_unlock:
+ 	task_rq_unlock(rq, &flags);
+ }
+ 
++EXPORT_SYMBOL(set_user_nice);
++
++#if defined( CONFIG_KGDB)
++struct task_struct * kgdb_get_idle(int this_cpu)
++{
++        return cpu_rq(this_cpu)->idle;
++}
++#endif
++
+ #ifndef __alpha__
+ 
+ /*
+@@ -1915,6 +1949,8 @@ int task_nice(task_t *p)
+ 	return TASK_NICE(p);
+ }
+ 
++EXPORT_SYMBOL(task_nice);
++
+ /**
+  * task_curr - is this task currently executing on a CPU?
+  * @p: the task in question.
+@@ -1933,6 +1969,8 @@ int idle_cpu(int cpu)
+ 	return cpu_curr(cpu) == cpu_rq(cpu)->idle;
+ }
+ 
++EXPORT_SYMBOL(idle_cpu);
++
+ /**
+  * find_process_by_pid - find a process with a matching PID value.
+  * @pid: the pid in question.
+@@ -2260,6 +2298,8 @@ void __cond_resched(void)
+ 	schedule();
+ }
+ 
++EXPORT_SYMBOL(__cond_resched);
++
+ /**
+  * yield - yield the current processor to other threads.
+  *
+@@ -2272,6 +2312,8 @@ void yield(void)
+ 	sys_sched_yield();
+ }
+ 
++EXPORT_SYMBOL(yield);
++
+ /*
+  * This task is about to go to sleep on IO.  Increment rq->nr_iowait so
+  * that process accounting knows that this is a task in IO wait state.
+@@ -2288,6 +2330,8 @@ void io_schedule(void)
+ 	atomic_dec(&rq->nr_iowait);
+ }
+ 
++EXPORT_SYMBOL(io_schedule);
++
+ long io_schedule_timeout(long timeout)
+ {
+ 	struct runqueue *rq = this_rq();
+@@ -2402,17 +2446,16 @@ static inline struct task_struct *younge
+ 
+ static void show_task(task_t * p)
+ {
+-	unsigned long free = 0;
+ 	task_t *relative;
+-	int state;
+-	static const char * stat_nam[] = { "R", "S", "D", "T", "Z", "W" };
++	unsigned state;
++	static const char *stat_nam[] = { "R", "S", "D", "T", "Z", "W" };
+ 
+ 	printk("%-13.13s ", p->comm);
+ 	state = p->state ? __ffs(p->state) + 1 : 0;
+-	if (((unsigned) state) < sizeof(stat_nam)/sizeof(char *))
++	if (state < ARRAY_SIZE(stat_nam))
+ 		printk(stat_nam[state]);
+ 	else
+-		printk(" ");
++		printk("?");
+ #if (BITS_PER_LONG == 32)
+ 	if (p == current)
+ 		printk(" current  ");
+@@ -2424,13 +2467,7 @@ static void show_task(task_t * p)
+ 	else
+ 		printk(" %016lx ", thread_saved_pc(p));
+ #endif
+-	{
+-		unsigned long * n = (unsigned long *) (p->thread_info+1);
+-		while (!*n)
+-			n++;
+-		free = (unsigned long) n - (unsigned long)(p+1);
+-	}
+-	printk("%5lu %5d %6d ", free, p->pid, p->parent->pid);
++	printk("%5d %6d ", p->pid, p->parent->pid);
+ 	if ((relative = eldest_child(p)))
+ 		printk("%5d ", relative->pid);
+ 	else
+@@ -2457,12 +2494,12 @@ void show_state(void)
+ 
+ #if (BITS_PER_LONG == 32)
+ 	printk("\n"
+-	       "                         free                        sibling\n");
+-	printk("  task             PC    stack   pid father child younger older\n");
++	       "                                               sibling\n");
++	printk("  task             PC      pid father child younger older\n");
+ #else
+ 	printk("\n"
+-	       "                                 free                        sibling\n");
+-	printk("  task                 PC        stack   pid father child younger older\n");
++	       "                                                       sibling\n");
++	printk("  task                 PC          pid father child younger older\n");
+ #endif
+ 	read_lock(&tasklist_lock);
+ 	do_each_thread(g, p) {
+@@ -2574,6 +2611,8 @@ int set_cpus_allowed(task_t *p, cpumask_
+ 	return 0;
+ }
+ 
++EXPORT_SYMBOL_GPL(set_cpus_allowed);
++
+ /* Move (not current) task off this cpu, onto dest cpu. */
+ static void move_task_away(struct task_struct *p, int dest_cpu)
+ {
+@@ -2819,6 +2858,7 @@ void __might_sleep(char *file, int line)
+ 	}
+ #endif
+ }
++EXPORT_SYMBOL(__might_sleep);
+ #endif
+ 
+ 
+@@ -2847,6 +2887,8 @@ void __preempt_spin_lock(spinlock_t *loc
+ 	} while (!_raw_spin_trylock(lock));
+ }
+ 
++EXPORT_SYMBOL(__preempt_spin_lock);
++
+ void __preempt_write_lock(rwlock_t *lock)
+ {
+ 	if (preempt_count() > 1) {
+@@ -2861,4 +2903,6 @@ void __preempt_write_lock(rwlock_t *lock
+ 		preempt_disable();
+ 	} while (!_raw_write_trylock(lock));
+ }
+-#endif
++
++EXPORT_SYMBOL(__preempt_write_lock);
++#endif /* defined(CONFIG_SMP) && defined(CONFIG_PREEMPT) */
+--- linux-2.6.0-test6/kernel/signal.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/kernel/signal.c	2003-10-05 00:36:15.000000000 -0700
+@@ -593,7 +593,8 @@ static int check_kill_permission(int sig
+ 	error = -EPERM;
+ 	if ((!info || ((unsigned long)info != 1 &&
+ 			(unsigned long)info != 2 && SI_FROMUSER(info)))
+-	    && ((sig != SIGCONT) || (current->session != t->session))
++	    && ((sig != SIGCONT) ||
++		(process_session(current) != process_session(t)))
+ 	    && (current->euid ^ t->suid) && (current->euid ^ t->uid)
+ 	    && (current->uid ^ t->suid) && (current->uid ^ t->uid)
+ 	    && !capable(CAP_KILL))
+@@ -1102,7 +1103,7 @@ kill_sl_info(int sig, struct siginfo *in
+ 	retval = -ESRCH;
+ 	read_lock(&tasklist_lock);
+ 	for_each_task_pid(sid, PIDTYPE_SID, p, l, pid) {
+-		if (!p->leader)
++		if (!process_session_leader(p))
+ 			continue;
+ 		err = group_send_sig_info(sig, info, p);
+ 		if (retval)
+--- linux-2.6.0-test6/kernel/sys.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/kernel/sys.c	2003-10-05 00:36:15.000000000 -0700
+@@ -951,7 +951,7 @@ asmlinkage long sys_setpgid(pid_t pid, p
+ 
+ 	if (p->parent == current || p->real_parent == current) {
+ 		err = -EPERM;
+-		if (p->session != current->session)
++		if (process_session(p) != process_session(current))
+ 			goto out;
+ 		err = -EACCES;
+ 		if (p->did_exec)
+@@ -963,7 +963,7 @@ asmlinkage long sys_setpgid(pid_t pid, p
+ 	}
+ 
+ 	err = -EPERM;
+-	if (p->leader)
++	if (process_session_leader(p))
+ 		goto out;
+ 
+ 	if (pgid != pid) {
+@@ -972,7 +972,7 @@ asmlinkage long sys_setpgid(pid_t pid, p
+ 		struct list_head *l;
+ 
+ 		for_each_task_pid(pgid, PIDTYPE_PGID, p, l, pid)
+-			if (p->session == current->session)
++			if (process_session(p) == process_session(current))
+ 				goto ok_pgid;
+ 		goto out;
+ 	}
+@@ -984,7 +984,7 @@ ok_pgid:
+ 
+ 	if (process_group(p) != pgid) {
+ 		detach_pid(p, PIDTYPE_PGID);
+-		p->group_leader->__pgrp = pgid;
++		p->signal->pgrp = pgid;
+ 		attach_pid(p, PIDTYPE_PGID, pgid);
+ 	}
+ 
+@@ -1026,7 +1026,7 @@ asmlinkage long sys_getpgrp(void)
+ asmlinkage long sys_getsid(pid_t pid)
+ {
+ 	if (!pid) {
+-		return current->session;
++		return process_session(current);
+ 	} else {
+ 		int retval;
+ 		struct task_struct *p;
+@@ -1038,7 +1038,7 @@ asmlinkage long sys_getsid(pid_t pid)
+ 		if(p) {
+ 			retval = security_task_getsid(p);
+ 			if (!retval)
+-				retval = p->session;
++				retval = process_session(p);
+ 		}
+ 		read_unlock(&tasklist_lock);
+ 		return retval;
+@@ -1059,10 +1059,10 @@ asmlinkage long sys_setsid(void)
+ 	if (pid)
+ 		goto out;
+ 
+-	current->leader = 1;
++	current->signal->leader = 1;
+ 	__set_special_pids(current->pid, current->pid);
+-	current->tty = NULL;
+-	current->tty_old_pgrp = 0;
++	current->signal->tty = NULL;
++	current->signal->tty_old_pgrp = 0;
+ 	err = process_group(current);
+ out:
+ 	write_unlock_irq(&tasklist_lock);
+--- linux-2.6.0-test6/kernel/sysctl.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/kernel/sysctl.c	2003-10-05 00:33:25.000000000 -0700
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include <linux/config.h>
++#include <linux/module.h>
+ #include <linux/mm.h>
+ #include <linux/swap.h>
+ #include <linux/slab.h>
+@@ -136,17 +137,14 @@ extern ctl_table random_table[];
+ 
+ static ssize_t proc_readsys(struct file *, char __user *, size_t, loff_t *);
+ static ssize_t proc_writesys(struct file *, const char __user *, size_t, loff_t *);
+-static int proc_sys_permission(struct inode *, int, struct nameidata *);
++static int proc_opensys(struct inode *, struct file *);
+ 
+ struct file_operations proc_sys_file_operations = {
++	.open		= proc_opensys,
+ 	.read		= proc_readsys,
+ 	.write		= proc_writesys,
+ };
+ 
+-static struct inode_operations proc_sys_inode_operations = {
+-	.permission	= proc_sys_permission,
+-};
+-
+ extern struct proc_dir_entry *proc_sys_root;
+ 
+ static void register_proc_table(ctl_table *, struct proc_dir_entry *);
+@@ -1140,10 +1138,8 @@ static void register_proc_table(ctl_tabl
+ 			if (!de)
+ 				continue;
+ 			de->data = (void *) table;
+-			if (table->proc_handler) {
++			if (table->proc_handler)
+ 				de->proc_fops = &proc_sys_file_operations;
+-				de->proc_iops = &proc_sys_inode_operations;
+-			}
+ 		}
+ 		table->de = de;
+ 		if (de->mode & S_IFDIR)
+@@ -1212,6 +1208,20 @@ static ssize_t do_rw_proc(int write, str
+ 	return res;
+ }
+ 
++static int proc_opensys(struct inode *inode, struct file *file)
++{
++	if (file->f_mode & FMODE_WRITE) {
++		/*
++		 * sysctl entries that are not writable,
++		 * are _NOT_ writable, capabilities or not.
++		 */
++		if (!(inode->i_mode & S_IWUSR))
++			return -EPERM;
++	}
++
++	return 0;
++}
++
+ static ssize_t proc_readsys(struct file * file, char __user * buf,
+ 			    size_t count, loff_t *ppos)
+ {
+@@ -1224,11 +1234,6 @@ static ssize_t proc_writesys(struct file
+ 	return do_rw_proc(1, file, (char __user *) buf, count, ppos);
+ }
+ 
+-static int proc_sys_permission(struct inode *inode, int op, struct nameidata *nd)
+-{
+-	return test_perm(inode->i_mode, op);
+-}
+-
+ /**
+  * proc_dostring - read a string sysctl
+  * @table: the sysctl table
+@@ -1994,3 +1999,19 @@ void unregister_sysctl_table(struct ctl_
+ }
+ 
+ #endif /* CONFIG_SYSCTL */
++
++/*
++ * No sense putting this after each symbol definition, twice,
++ * exception granted :-)
++ */
++EXPORT_SYMBOL(proc_dointvec);
++EXPORT_SYMBOL(proc_dointvec_jiffies);
++EXPORT_SYMBOL(proc_dointvec_minmax);
++EXPORT_SYMBOL(proc_dostring);
++EXPORT_SYMBOL(proc_doulongvec_minmax);
++EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
++EXPORT_SYMBOL(register_sysctl_table);
++EXPORT_SYMBOL(sysctl_intvec);
++EXPORT_SYMBOL(sysctl_jiffies);
++EXPORT_SYMBOL(sysctl_string);
++EXPORT_SYMBOL(unregister_sysctl_table);
+--- linux-2.6.0-test6/lib/kobject.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/lib/kobject.c	2003-10-05 00:34:36.000000000 -0700
+@@ -236,8 +236,6 @@ static void unlink(struct kobject * kobj
+ 		list_del_init(&kobj->entry);
+ 		up_write(&kobj->kset->subsys->rwsem);
+ 	}
+-	if (kobj->parent) 
+-		kobject_put(kobj->parent);
+ 	kobject_put(kobj);
+ }
+ 
+@@ -448,6 +446,8 @@ void kobject_cleanup(struct kobject * ko
+ 	if (kobj->k_name != kobj->name)
+ 		kfree(kobj->k_name);
+ 	kobj->k_name = NULL;
++	if (kobj->parent)
++		kobject_put(kobj->parent);
+ 	if (t && t->release)
+ 		t->release(kobj);
+ 	if (s)
+--- linux-2.6.0-test6/lib/Makefile	2003-09-27 18:57:47.000000000 -0700
++++ 25/lib/Makefile	2003-10-05 00:33:25.000000000 -0700
+@@ -5,7 +5,7 @@
+ 
+ lib-y := errno.o ctype.o string.o vsprintf.o cmdline.o \
+ 	 bust_spinlocks.o rbtree.o radix-tree.o dump_stack.o \
+-	 kobject.o idr.o div64.o
++	 kobject.o idr.o div64.o parser.o
+ 
+ lib-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o
+ lib-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem.o
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/lib/parser.c	2003-10-05 00:33:25.000000000 -0700
+@@ -0,0 +1,138 @@
++/*
++ * lib/parser.c - simple parser for mount, etc. options.
++ *
++ * This source code is licensed under the GNU General Public License,
++ * Version 2.  See the file COPYING for more details.
++ */
++
++#include <linux/ctype.h>
++#include <linux/module.h>
++#include <linux/parser.h>
++#include <linux/slab.h>
++#include <linux/string.h>
++
++static int match_one(char *s, char *p, substring_t args[])
++{
++	char *meta;
++	int argc = 0;
++
++	if (!p)
++		return 1;
++
++	while(1) {
++		int len = -1;
++		meta = strchr(p, '%');
++		if (!meta)
++			return strcmp(p, s) == 0;
++
++		if (strncmp(p, s, meta-p))
++			return 0;
++
++		s += meta - p;
++		p = meta + 1;
++
++		if (isdigit(*p))
++			len = simple_strtoul(p, &p, 10);
++		else if (*p == '%') {
++			if (*s++ != '%')
++				return 0;
++			continue;
++		}
++
++		if (argc >= MAX_OPT_ARGS)
++			return 0;
++
++		args[argc].from = s;
++		switch (*p++) {
++		case 's':
++			if (len == -1 || len > strlen(s))
++				len = strlen(s);
++			args[argc].to = s + len;
++			break;
++		case 'd':
++			simple_strtol(s, &args[argc].to, 0);
++			goto num;
++		case 'u':
++			simple_strtoul(s, &args[argc].to, 0);
++			goto num;
++		case 'o':
++			simple_strtoul(s, &args[argc].to, 8);
++			goto num;
++		case 'x':
++			simple_strtoul(s, &args[argc].to, 16);
++		num:
++			if (args[argc].to == args[argc].from)
++				return 0;
++			break;
++		default:
++			return 0;
++		}
++		s = args[argc].to;
++		argc++;
++	}
++}
++
++int match_token(char *s, match_table_t table, substring_t args[])
++{
++	struct match_token *p;
++
++	for (p = table; !match_one(s, p->pattern, args) ; p++)
++		;
++
++	return p->token;
++}
++
++static int match_number(substring_t *s, int *result, int base)
++{
++	char *endp;
++	char *buf;
++	int ret;
++
++	buf = kmalloc(s->to - s->from + 1, GFP_KERNEL);
++	if (!buf)
++		return -ENOMEM;
++	memcpy(buf, s->from, s->to - s->from);
++	buf[s->to - s->from] = '\0';
++	*result = simple_strtol(buf, &endp, base);
++	ret = 0;
++	if (endp == buf)
++		ret = -EINVAL;
++	kfree(buf);
++	return ret;
++}
++
++int match_int(substring_t *s, int *result)
++{
++	return match_number(s, result, 0);
++}
++
++int match_octal(substring_t *s, int *result)
++{
++	return match_number(s, result, 8);
++}
++
++int match_hex(substring_t *s, int *result)
++{
++	return match_number(s, result, 16);
++}
++
++void match_strcpy(char *to, substring_t *s)
++{
++	memcpy(to, s->from, s->to - s->from);
++	to[s->to - s->from] = '\0';
++}
++
++char *match_strdup(substring_t *s)
++{
++	char *p = kmalloc(s->to - s->from + 1, GFP_KERNEL);
++	if (p)
++		match_strcpy(p, s);
++	return p;
++}
++
++EXPORT_SYMBOL(match_token);
++EXPORT_SYMBOL(match_int);
++EXPORT_SYMBOL(match_octal);
++EXPORT_SYMBOL(match_hex);
++EXPORT_SYMBOL(match_strcpy);
++EXPORT_SYMBOL(match_strdup);
+--- linux-2.6.0-test6/MAINTAINERS	2003-09-27 18:57:43.000000000 -0700
++++ 25/MAINTAINERS	2003-10-05 00:34:22.000000000 -0700
+@@ -114,8 +114,8 @@ W:	http://sourceforge.net/projects/gkern
+ S:	Maintained
+ 
+ 8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
+-P:	Theodore Ts'o
+-M:	tytso@mit.edu
++P:	Russell King
++M:	rmk+serial@arm.linux.org.uk
+ L:	linux-serial@vger.kernel.org
+ W:	http://serial.sourceforge.net
+ S:	Maintained
+@@ -284,6 +284,16 @@ P:	Jonathan Layes
+ L:	linux-net@vger.kernel.org
+ S:	Maintained
+ 
++ASUS ACPI EXTRAS DRIVER
++P:	Karol Kozimor
++M:	sziwan@users.sourceforge.net
++P:	Julien Lerouge
++M:	julien.lerouge@free.fr
++L:	acpi4asus-user@lists.sourceforge.net
++W:	http://sourceforge.net/projects/acpi4asus
++W:	http://julien.lerouge.free.fr
++S:	Maintained
++
+ ATM
+ P:	Chas Williams
+ M:	chas@cmf.nrl.navy.mil
+@@ -509,7 +519,7 @@ S:	Maintained
+ 
+ CRYPTO API
+ P:	James Morris
+-M:	jmorris@intercode.com.au
++M:	jmorris@redhat.com
+ P:	David S. Miller
+ M:	davem@redhat.com
+ W	http://samba.org/~jamesm/crypto/
+@@ -624,7 +634,7 @@ DIGIBOARD PC/XE AND PC/XI DRIVER
+ P:	Christoph Lameter
+ M:	christoph@lameter.com
+ W:	http://www.digi.com
+-L:	digilnux@dgii.com
++L:	digilnux@digi.com
+ S:	Orphaned
+ 
+ DIRECTORY NOTIFICATION
+@@ -669,6 +679,12 @@ M:	romieu@cogenit.fr
+ M:	romieu@ensta.fr
+ S:	Maintained
+ 
++DVB SUBSYSTEM AND DRIVERS
++P:	LinuxTV.org Project
++L: 	linux-dvb@linuxtv.org
++W:	http://linuxtv.org/developer/dvb.xml
++S:	Supported
++
+ EATA-DMA SCSI DRIVER
+ P:	Michael Neuffer
+ L:	linux-eata@i-connect.net, linux-scsi@vger.kernel.org
+@@ -706,6 +722,11 @@ L:	emu10k1-devel@lists.sourceforge.net
+ W:	http://sourceforge.net/projects/emu10k1/
+ S:	Maintained
+ 
++EPSON 1355 FRAMEBUFFER DRIVER
++P:	Christopher Hoover
++M:	ch@murgatroid.com, ch@hpl.hp.com
++S:	Maintained
++
+ ETHEREXPRESS-16 NETWORK DRIVER
+ P:	Philip Blundell
+ M:	Philip.Blundell@pobox.com
+@@ -1139,6 +1160,12 @@ W:	http://sf.net/projects/kernel-janitor
+ W:	http://developer.osdl.org/rddunlap/kj-patches/
+ S:	Maintained
+ 
++KGDB FOR I386 PLATFORM
++P:	George Anzinger
++M:	george@mvista.com
++L:	linux-net@vger.kernel.org
++S:	Supported
++
+ KERNEL NFSD
+ P:	Neil Brown
+ M:	neilb@cse.unsw.edu.au
+@@ -1386,7 +1413,7 @@ M:	kuznet@ms2.inr.ac.ru
+ P:	Pekka Savola (ipv6)
+ M:	pekkas@netcore.fi
+ P:	James Morris
+-M:	jmorris@intercode.com.au
++M:	jmorris@redhat.com
+ P:	Hideaki YOSHIFUJI
+ M:	yoshfuji@linux-ipv6.org
+ L:	netdev@oss.sgi.com
+@@ -1658,6 +1685,12 @@ L:	linux-390@vm.marist.edu
+ W:	http://oss.software.ibm.com/developerworks/opensource/linux390
+ S:	Supported
+ 
++SAA7146 VIDEO4LINUX-2 DRIVER
++P:	Michael Hunold
++M:	michael@mihu.de
++W:	http://www.mihu.de/linux/saa7146
++S:	Maintained
++
+ SA1100 SUPPORT
+ P:	Nicolas Pitre
+ M:	nico@cam.org
+--- linux-2.6.0-test6/Makefile	2003-09-27 18:57:43.000000000 -0700
++++ 25/Makefile	2003-10-05 00:37:37.000000000 -0700
+@@ -1,7 +1,7 @@
+ VERSION = 2
+ PATCHLEVEL = 6
+ SUBLEVEL = 0
+-EXTRAVERSION = -test6
++EXTRAVERSION = -test6-mm4
+ 
+ # *DOCUMENTATION*
+ # To see a list of typical targets execute "make help"
+@@ -37,7 +37,7 @@ ifdef V
+   endif
+ endif
+ ifndef KBUILD_VERBOSE
+-  KBUILD_VERBOSE = 0 
++  KBUILD_VERBOSE = 0
+ endif
+ 
+ # Call sparse as part of compilation of C files
+@@ -79,16 +79,24 @@ ifdef O
+   endif
+ endif
+ 
++# That's our default target when none is given on the command line
++.PHONY: all
++all:
++  
+ ifneq ($(KBUILD_OUTPUT),)
+ # Invoke a second make in the output directory, passing relevant variables
+-	KBUILD_OUTPUT := $(shell cd $(KBUILD_OUTPUT); /bin/pwd)
++# check that the output directory actually exists
++saved-output := $(KBUILD_OUTPUT)
++KBUILD_OUTPUT := $(shell cd $(KBUILD_OUTPUT) && /bin/pwd)
++$(if $(wildcard $(KBUILD_OUTPUT)),, \
++     $(error output directory "$(saved-output)" does not exist))
+ 
+-.PHONY: $(MAKECMDGOALS) all
++.PHONY: $(MAKECMDGOALS)
+ 
+-$(MAKECMDGOALS) all:
++$(filter-out all,$(MAKECMDGOALS)) all:
+ 	$(if $(KBUILD_VERBOSE:1=),@)$(MAKE) -C $(KBUILD_OUTPUT)		\
+ 	KBUILD_SRC=$(CURDIR)	KBUILD_VERBOSE=$(KBUILD_VERBOSE)	\
+-	KBUILD_CHECK=$(KBUILD_CHECK) -f $(CURDIR)/Makefile $(MAKECMDGOALS)
++	KBUILD_CHECK=$(KBUILD_CHECK) -f $(CURDIR)/Makefile $@
+ 
+ # Leave processing to above invocation of make
+ skip-makefile := 1
+@@ -156,13 +164,6 @@ HOSTCXX  	= g++
+ HOSTCFLAGS	= -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
+ HOSTCXXFLAGS	= -O2
+ 
+-
+-# 	That's our default target when none is given on the command line
+-#	Note that 'modules' will be added as a prerequisite as well, 
+-#	in the CONFIG_MODULES part below
+-
+-all:	vmlinux
+-
+ # 	Decide whether to build built-in, modular, or both.
+ #	Normally, just do built-in.
+ 
+@@ -366,6 +367,12 @@ else
+ # Build targets only - this includes vmlinux, arch specific targets, clean
+ # targets and others. In general all targets except *config targets.
+ 
++# That's our default target when none is given on the command line
++# Note that 'modules' will be added as a prerequisite as well, 
++# in the CONFIG_MODULES part below
++
++all:	vmlinux
++
+ # Objects we will link into vmlinux / subdirs we need to visit
+ init-y		:= init/
+ drivers-y	:= drivers/ sound/
+@@ -753,7 +760,7 @@ MRPROPER_FILES += \
+ 	.menuconfig.log \
+ 	include/asm \
+ 	.hdepend include/linux/modversions.h \
+-	tags TAGS cscope.out kernel.spec \
++	tags TAGS cscope* kernel.spec \
+ 	.tmp*
+ 
+ # Directories removed with 'make mrproper'
+@@ -877,7 +884,7 @@ help:
+ 	@echo  '  mrproper	  - remove all generated files + config + various backup files'
+ 	@echo  ''
+ 	@echo  'Configuration targets:'
+-	@$(MAKE) -f scripts/kconfig/Makefile help
++	@$(MAKE) -f $(srctree)/scripts/kconfig/Makefile help
+ 	@echo  ''
+ 	@echo  'Other generic targets:'
+ 	@echo  '  all		  - Build all targets marked with [*]'
+@@ -890,7 +897,7 @@ help:
+ 	@echo  '  tags/TAGS	  - Generate tags file for editors'
+ 	@echo  ''
+ 	@echo  'Documentation targets:'
+-	@$(MAKE) -f Documentation/DocBook/Makefile dochelp
++	@$(MAKE) -f $(srctree)/Documentation/DocBook/Makefile dochelp
+ 	@echo  ''
+ 	@echo  'Architecture specific targets ($(ARCH)):'
+ 	@$(if $(archhelp),$(archhelp),\
+--- linux-2.6.0-test6/mm/bootmem.c	2003-08-08 22:55:14.000000000 -0700
++++ 25/mm/bootmem.c	2003-10-05 00:33:25.000000000 -0700
+@@ -146,7 +146,7 @@ static void __init free_bootmem_core(boo
+  * We 'merge' subsequent allocations to save space. We might 'lose'
+  * some fraction of a page if allocations cannot be satisfied due to
+  * size constraints on boxes where there is physical RAM space
+- * fragmentation - in these cases * (mostly large memory boxes) this
++ * fragmentation - in these cases (mostly large memory boxes) this
+  * is not a problem.
+  *
+  * On low memory boxes we get it right in 100% of the cases.
+--- linux-2.6.0-test6/mm/fadvise.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/mm/fadvise.c	2003-10-05 00:34:08.000000000 -0700
+@@ -23,7 +23,6 @@
+ asmlinkage long sys_fadvise64_64(int fd, loff_t offset, loff_t len, int advice)
+ {
+ 	struct file *file = fget(fd);
+-	struct inode *inode;
+ 	struct address_space *mapping;
+ 	struct backing_dev_info *bdi;
+ 	pgoff_t start_index;
+@@ -33,8 +32,7 @@ asmlinkage long sys_fadvise64_64(int fd,
+ 	if (!file)
+ 		return -EBADF;
+ 
+-	inode = file->f_dentry->d_inode;
+-	mapping = inode->i_mapping;
++	mapping = file->f_mapping;
+ 	if (!mapping) {
+ 		ret = -EINVAL;
+ 		goto out;
+--- linux-2.6.0-test6/mm/filemap.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/mm/filemap.c	2003-10-05 00:37:07.000000000 -0700
+@@ -61,6 +61,9 @@
+  *        ->swap_device_lock	(exclusive_swap_page, others)
+  *          ->mapping->page_lock
+  *
++ *  ->i_sem
++ *    ->i_shared_sem		(truncate->invalidate_mmap_range)
++ *
+  *  ->mmap_sem
+  *    ->i_shared_sem		(various places)
+  *
+@@ -70,6 +73,9 @@
+  *  ->mmap_sem
+  *    ->i_sem			(msync)
+  *
++ *  ->i_sem
++ *    ->i_alloc_sem             (various)
++ *
+  *  ->inode_lock
+  *    ->sb_lock			(fs/fs-writeback.c)
+  *    ->mapping->page_lock	(__sync_single_inode)
+@@ -151,6 +157,8 @@ int filemap_fdatawrite(struct address_sp
+ 	return __filemap_fdatawrite(mapping, WB_SYNC_ALL);
+ }
+ 
++EXPORT_SYMBOL(filemap_fdatawrite);
++
+ /*
+  * This is a mostly non-blocking flush.  Not suitable for data-integrity
+  * purposes.
+@@ -216,6 +224,20 @@ restart:
+ 	return ret;
+ }
+ 
++EXPORT_SYMBOL(filemap_fdatawait);
++
++int filemap_write_and_wait(struct address_space *mapping)
++{
++	int retval = 0;
++
++	if (mapping->nrpages) {
++		retval = filemap_fdatawrite(mapping);
++		if (retval == 0)
++			retval = filemap_fdatawait(mapping);
++	}
++	return retval;
++}
++
+ /*
+  * This adds a page to the page cache, starting out as locked, unreferenced,
+  * not uptodate and with no errors.
+@@ -253,6 +275,7 @@ int add_to_page_cache(struct page *page,
+ 	}
+ 	return error;
+ }
++
+ EXPORT_SYMBOL(add_to_page_cache);
+ 
+ int add_to_page_cache_lru(struct page *page, struct address_space *mapping,
+@@ -281,21 +304,42 @@ static wait_queue_head_t *page_waitqueue
+ 	return &zone->wait_table[hash_ptr(page, zone->wait_table_bits)];
+ }
+ 
+-void wait_on_page_bit(struct page *page, int bit_nr)
++/*
++ * wait for the specified page bit to be cleared
++ * this could be a synchronous wait or could just queue an async
++ * notification callback depending on the wait queue entry parameter
++ *
++ * A NULL wait queue parameter defaults to sync behaviour
++ */
++int wait_on_page_bit_wq(struct page *page, int bit_nr, wait_queue_t *wait)
+ {
+ 	wait_queue_head_t *waitqueue = page_waitqueue(page);
+-	DEFINE_WAIT(wait);
++	DEFINE_WAIT(local_wait);
++
++	if (!wait)
++		wait = &local_wait; /* default to a sync wait entry */
+ 
+ 	do {
+-		prepare_to_wait(waitqueue, &wait, TASK_UNINTERRUPTIBLE);
++		prepare_to_wait(waitqueue, wait, TASK_UNINTERRUPTIBLE);
+ 		if (test_bit(bit_nr, &page->flags)) {
+ 			sync_page(page);
++			if (!is_sync_wait(wait)) {
++				/*
++				 * if we've queued an async wait queue
++				 * callback do not block; just tell the
++				 * caller to return and retry later when
++				 * the callback is notified
++				 */
++				return -EIOCBRETRY;
++			}
+ 			io_schedule();
+ 		}
+ 	} while (test_bit(bit_nr, &page->flags));
+-	finish_wait(waitqueue, &wait);
++	finish_wait(waitqueue, wait);
++
++	return 0;
+ }
+-EXPORT_SYMBOL(wait_on_page_bit);
++EXPORT_SYMBOL(wait_on_page_bit_wq);
+ 
+ /**
+  * unlock_page() - unlock a locked page
+@@ -305,7 +349,9 @@ EXPORT_SYMBOL(wait_on_page_bit);
+  * Unlocks the page and wakes up sleepers in ___wait_on_page_locked().
+  * Also wakes sleepers in wait_on_page_writeback() because the wakeup
+  * mechananism between PageLocked pages and PageWriteback pages is shared.
+- * But that's OK - sleepers in wait_on_page_writeback() just go back to sleep.
++ * But that's OK - sleepers in wait_on_page_writeback() just go back to sleep,
++ * or in case the wakeup notifies async wait queue entries, as in the case
++ * of aio, retries would be triggered and may re-queue their callbacks.
+  *
+  * The first mb is necessary to safely close the critical section opened by the
+  * TestSetPageLocked(), the second mb is necessary to enforce ordering between
+@@ -323,6 +369,8 @@ void unlock_page(struct page *page)
+ 		wake_up_all(waitqueue);
+ }
+ 
++EXPORT_SYMBOL(unlock_page);
++
+ /*
+  * End writeback against a page.
+  */
+@@ -339,30 +387,57 @@ void end_page_writeback(struct page *pag
+ 	if (waitqueue_active(waitqueue))
+ 		wake_up_all(waitqueue);
+ }
++
+ EXPORT_SYMBOL(end_page_writeback);
+ 
+ /*
+- * Get a lock on the page, assuming we need to sleep to get it.
++ * Get a lock on the page, assuming we need to either sleep to get it
++ * or to queue an async notification callback to try again when its
++ * available.
++ *
++ * A NULL wait queue parameter defaults to sync behaviour. Otherwise
++ * it specifies the wait queue entry to be used for async notification
++ * or waiting.
+  *
+  * Ugly: running sync_page() in state TASK_UNINTERRUPTIBLE is scary.  If some
+  * random driver's requestfn sets TASK_RUNNING, we could busywait.  However
+  * chances are that on the second loop, the block layer's plug list is empty,
+  * so sync_page() will then return in state TASK_UNINTERRUPTIBLE.
+  */
+-void __lock_page(struct page *page)
++int __lock_page_wq(struct page *page, wait_queue_t *wait)
+ {
+ 	wait_queue_head_t *wqh = page_waitqueue(page);
+-	DEFINE_WAIT(wait);
++	DEFINE_WAIT(local_wait);
++
++	if (!wait)
++		wait = &local_wait;
+ 
+ 	while (TestSetPageLocked(page)) {
+-		prepare_to_wait(wqh, &wait, TASK_UNINTERRUPTIBLE);
++		prepare_to_wait(wqh, wait, TASK_UNINTERRUPTIBLE);
+ 		if (PageLocked(page)) {
+ 			sync_page(page);
++			if (!is_sync_wait(wait)) {
++				/*
++				 * if we've queued an async wait queue
++				 * callback do not block; just tell the
++				 * caller to return and retry later when
++				 * the callback is notified
++				 */
++				return -EIOCBRETRY;
++			}
+ 			io_schedule();
+ 		}
+ 	}
+-	finish_wait(wqh, &wait);
++	finish_wait(wqh, wait);
++	return 0;
++}
++EXPORT_SYMBOL(__lock_page_wq);
++
++void __lock_page(struct page *page)
++{
++	__lock_page_wq(page, NULL);
+ }
++
+ EXPORT_SYMBOL(__lock_page);
+ 
+ /*
+@@ -385,6 +460,8 @@ struct page * find_get_page(struct addre
+ 	return page;
+ }
+ 
++EXPORT_SYMBOL(find_get_page);
++
+ /*
+  * Same as above, but trylock it instead of incrementing the count.
+  */
+@@ -400,6 +477,8 @@ struct page *find_trylock_page(struct ad
+ 	return page;
+ }
+ 
++EXPORT_SYMBOL(find_trylock_page);
++
+ /**
+  * find_lock_page - locate, pin and lock a pagecache page
+  *
+@@ -411,8 +490,8 @@ struct page *find_trylock_page(struct ad
+  *
+  * Returns zero if the page was not present. find_lock_page() may sleep.
+  */
+-struct page *find_lock_page(struct address_space *mapping,
+-				unsigned long offset)
++struct page *find_lock_page_wq(struct address_space *mapping,
++				unsigned long offset, wait_queue_t *wait)
+ {
+ 	struct page *page;
+ 
+@@ -423,7 +502,10 @@ repeat:
+ 		page_cache_get(page);
+ 		if (TestSetPageLocked(page)) {
+ 			spin_unlock(&mapping->page_lock);
+-			lock_page(page);
++			if (-EIOCBRETRY == lock_page_wq(page, wait)) {
++				page_cache_release(page);
++				return ERR_PTR(-EIOCBRETRY);
++			}
+ 			spin_lock(&mapping->page_lock);
+ 
+ 			/* Has the page been truncated while we slept? */
+@@ -438,6 +520,14 @@ repeat:
+ 	return page;
+ }
+ 
++EXPORT_SYMBOL(find_lock_page);
++
++struct page *find_lock_page(struct address_space *mapping,
++				unsigned long offset)
++{
++	return find_lock_page_wq(mapping, offset, NULL);
++}
++
+ /**
+  * find_or_create_page - locate or add a pagecache page
+  *
+@@ -482,6 +572,8 @@ repeat:
+ 	return page;
+ }
+ 
++EXPORT_SYMBOL(find_or_create_page);
++
+ /**
+  * find_get_pages - gang pagecache lookup
+  * @mapping:	The address_space to search
+@@ -496,9 +588,12 @@ repeat:
+  * The search returns a group of mapping-contiguous pages with ascending
+  * indexes.  There may be holes in the indices due to not-present pages.
+  *
+- * find_get_pages() returns the number of pages which were found.
++ * find_get_pages() returns the number of pages which were found
++ * and also atomically sets the next offset to continue looking up
++ * mapping contiguous pages from (useful when doing a range of
++ * pagevec lookups in chunks of PAGEVEC_SIZE).
+  */
+-unsigned int find_get_pages(struct address_space *mapping, pgoff_t start,
++unsigned int find_get_pages(struct address_space *mapping, pgoff_t *next,
+ 			    unsigned int nr_pages, struct page **pages)
+ {
+ 	unsigned int i;
+@@ -506,9 +601,12 @@ unsigned int find_get_pages(struct addre
+ 
+ 	spin_lock(&mapping->page_lock);
+ 	ret = radix_tree_gang_lookup(&mapping->page_tree,
+-				(void **)pages, start, nr_pages);
++				(void **)pages, *next, nr_pages);
+ 	for (i = 0; i < ret; i++)
+ 		page_cache_get(pages[i]);
++	if (ret)
++		*next = pages[ret - 1]->index + 1;
++
+ 	spin_unlock(&mapping->page_lock);
+ 	return ret;
+ }
+@@ -543,6 +641,8 @@ grab_cache_page_nowait(struct address_sp
+ 	return page;
+ }
+ 
++EXPORT_SYMBOL(grab_cache_page_nowait);
++
+ /*
+  * This is a generic file read routine, and uses the
+  * inode->i_op->readpage() function for the actual low-level
+@@ -560,21 +660,47 @@ void do_generic_mapping_read(struct addr
+ 			     read_actor_t actor)
+ {
+ 	struct inode *inode = mapping->host;
+-	unsigned long index, offset;
++	unsigned long index, offset, first, last, end_index;
+ 	struct page *cached_page;
++	loff_t isize = i_size_read(inode);
+ 	int error;
+ 
+ 	cached_page = NULL;
+-	index = *ppos >> PAGE_CACHE_SHIFT;
++	first = *ppos >> PAGE_CACHE_SHIFT;
+ 	offset = *ppos & ~PAGE_CACHE_MASK;
+ 
++	last = (*ppos + desc->count) >> PAGE_CACHE_SHIFT;
++	end_index = isize >> PAGE_CACHE_SHIFT;
++	if (last > end_index)
++		last = end_index;
++
++	/* Don't repeat the readahead if we are executing aio retries */
++	if (in_aio()) {
++		if (is_retried_kiocb(io_wait_to_kiocb(current->io_wait)))
++			goto done_readahead;
++	}
++
++	/*
++	 * Let the readahead logic know upfront about all
++	 * the pages we'll need to satisfy this request
++	 */
++	for (index = first ; index < last; index++)
++		page_cache_readahead(mapping, ra, filp, index);
++
++	if (ra->next_size == -1UL) {
++		/* the readahead window was maximally shrunk */
++		/* explicitly readahead at least what is needed now */
++		for (index = first; index < last; index++)
++			handle_ra_miss(mapping, ra, index);
++		do_page_cache_readahead(mapping, filp, first, last - first);
++	}
++
++done_readahead:
++	index = first;
+ 	for (;;) {
+ 		struct page *page;
+-		unsigned long end_index, nr, ret;
+-		loff_t isize = i_size_read(inode);
++		unsigned long nr, ret;
+ 
+-		end_index = isize >> PAGE_CACHE_SHIFT;
+-			
+ 		if (index > end_index)
+ 			break;
+ 		nr = PAGE_CACHE_SIZE;
+@@ -585,7 +711,6 @@ void do_generic_mapping_read(struct addr
+ 		}
+ 
+ 		cond_resched();
+-		page_cache_readahead(mapping, ra, filp, index);
+ 
+ 		nr = nr - offset;
+ find_page:
+@@ -635,7 +760,12 @@ page_not_up_to_date:
+ 			goto page_ok;
+ 
+ 		/* Get exclusive access to the page ... */
+-		lock_page(page);
++
++		if (lock_page_wq(page, current->io_wait)) {
++			pr_debug("queued lock page \n");
++			error = -EIOCBRETRY;
++			goto sync_error;
++		}
+ 
+ 		/* Did it get unhashed before we got the lock? */
+ 		if (!page->mapping) {
+@@ -657,13 +787,23 @@ readpage:
+ 		if (!error) {
+ 			if (PageUptodate(page))
+ 				goto page_ok;
+-			wait_on_page_locked(page);
++			if (wait_on_page_locked_wq(page, current->io_wait)) {
++				pr_debug("queued wait_on_page \n");
++				error = -EIOCBRETRY;
++				goto sync_error;
++			}
++
+ 			if (PageUptodate(page))
+ 				goto page_ok;
+ 			error = -EIO;
+ 		}
+ 
+-		/* UHHUH! A synchronous read error occurred. Report it */
++sync_error:
++		/* We don't have uptodate data in the page yet */
++		/* Could be due to an error or because we need to
++		 * retry when we get an async i/o notification.
++		 * Report the reason.
++		 */
+ 		desc->error = error;
+ 		page_cache_release(page);
+ 		break;
+@@ -699,6 +839,8 @@ no_cached_page:
+ 	update_atime(inode);
+ }
+ 
++EXPORT_SYMBOL(do_generic_mapping_read);
++
+ int file_read_actor(read_descriptor_t *desc, struct page *page,
+ 			unsigned long offset, unsigned long size)
+ {
+@@ -775,7 +917,7 @@ __generic_file_aio_read(struct kiocb *io
+ 		struct address_space *mapping;
+ 		struct inode *inode;
+ 
+-		mapping = filp->f_dentry->d_inode->i_mapping;
++		mapping = filp->f_mapping;
+ 		inode = mapping->host;
+ 		retval = 0;
+ 		if (!count)
+@@ -815,20 +957,19 @@ __generic_file_aio_read(struct kiocb *io
+ out:
+ 	return retval;
+ }
++EXPORT_SYMBOL(__generic_file_aio_read);
+ 
+-ssize_t
+-generic_file_aio_read(struct kiocb *iocb, char __user *buf, size_t count, loff_t pos)
++ssize_t generic_file_aio_read(struct kiocb *iocb, char __user *buf,
++				size_t count, loff_t pos)
+ {
+ 	struct iovec local_iov = { .iov_base = buf, .iov_len = count };
+ 
+-	BUG_ON(iocb->ki_pos != pos);
+ 	return __generic_file_aio_read(iocb, &local_iov, 1, &iocb->ki_pos);
+ }
+ EXPORT_SYMBOL(generic_file_aio_read);
+-EXPORT_SYMBOL(__generic_file_aio_read);
+ 
+-ssize_t
+-generic_file_read(struct file *filp, char __user *buf, size_t count, loff_t *ppos)
++ssize_t generic_file_read(struct file *filp, char __user *buf,
++				size_t count, loff_t *ppos)
+ {
+ 	struct iovec local_iov = { .iov_base = buf, .iov_len = count };
+ 	struct kiocb kiocb;
+@@ -840,8 +981,10 @@ generic_file_read(struct file *filp, cha
+ 		ret = wait_on_sync_kiocb(&kiocb);
+ 	return ret;
+ }
++EXPORT_SYMBOL(generic_file_read);
+ 
+-int file_send_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size)
++int file_send_actor(read_descriptor_t * desc, struct page *page,
++				unsigned long offset, unsigned long size)
+ {
+ 	ssize_t written;
+ 	unsigned long count = desc->count;
+@@ -880,6 +1023,8 @@ ssize_t generic_file_sendfile(struct fil
+ 	return desc.error;
+ }
+ 
++EXPORT_SYMBOL(generic_file_sendfile);
++
+ static ssize_t
+ do_readahead(struct address_space *mapping, struct file *filp,
+ 	     unsigned long index, unsigned long nr)
+@@ -901,7 +1046,7 @@ asmlinkage ssize_t sys_readahead(int fd,
+ 	file = fget(fd);
+ 	if (file) {
+ 		if (file->f_mode & FMODE_READ) {
+-			struct address_space *mapping = file->f_dentry->d_inode->i_mapping;
++			struct address_space *mapping = file->f_mapping;
+ 			unsigned long start = offset >> PAGE_CACHE_SHIFT;
+ 			unsigned long end = (offset + count - 1) >> PAGE_CACHE_SHIFT;
+ 			unsigned long len = end - start + 1;
+@@ -920,7 +1065,7 @@ asmlinkage ssize_t sys_readahead(int fd,
+ static int FASTCALL(page_cache_read(struct file * file, unsigned long offset));
+ static int page_cache_read(struct file * file, unsigned long offset)
+ {
+-	struct address_space *mapping = file->f_dentry->d_inode->i_mapping;
++	struct address_space *mapping = file->f_mapping;
+ 	struct page *page; 
+ 	int error;
+ 
+@@ -959,7 +1104,7 @@ struct page * filemap_nopage(struct vm_a
+ {
+ 	int error;
+ 	struct file *file = area->vm_file;
+-	struct address_space *mapping = file->f_dentry->d_inode->i_mapping;
++	struct address_space *mapping = file->f_mapping;
+ 	struct file_ra_state *ra = &file->f_ra;
+ 	struct inode *inode = mapping->host;
+ 	struct page *page;
+@@ -1126,10 +1271,12 @@ page_not_uptodate:
+ 	return NULL;
+ }
+ 
++EXPORT_SYMBOL(filemap_nopage);
++
+ static struct page * filemap_getpage(struct file *file, unsigned long pgoff,
+ 					int nonblock)
+ {
+-	struct address_space *mapping = file->f_dentry->d_inode->i_mapping;
++	struct address_space *mapping = file->f_mapping;
+ 	struct page *page;
+ 	int error;
+ 
+@@ -1241,7 +1388,7 @@ static int filemap_populate(struct vm_ar
+ 			int nonblock)
+ {
+ 	struct file *file = vma->vm_file;
+-	struct address_space *mapping = file->f_dentry->d_inode->i_mapping;
++	struct address_space *mapping = file->f_mapping;
+ 	struct inode *inode = mapping->host;
+ 	unsigned long size;
+ 	struct mm_struct *mm = vma->vm_mm;
+@@ -1300,7 +1447,7 @@ static struct vm_operations_struct gener
+ 
+ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
+ {
+-	struct address_space *mapping = file->f_dentry->d_inode->i_mapping;
++	struct address_space *mapping = file->f_mapping;
+ 	struct inode *inode = mapping->host;
+ 
+ 	if (!mapping->a_ops->readpage)
+@@ -1330,6 +1477,9 @@ int generic_file_readonly_mmap(struct fi
+ }
+ #endif /* CONFIG_MMU */
+ 
++EXPORT_SYMBOL(generic_file_mmap);
++EXPORT_SYMBOL(generic_file_readonly_mmap);
++
+ static inline struct page *__read_cache_page(struct address_space *mapping,
+ 				unsigned long index,
+ 				int (*filler)(void *,struct page*),
+@@ -1406,6 +1556,8 @@ retry:
+ 	return page;
+ }
+ 
++EXPORT_SYMBOL(read_cache_page);
++
+ /*
+  * If the page was newly created, increment its refcount and add it to the
+  * caller's lru-buffering pagevec.  This function is specifically for
+@@ -1418,7 +1570,9 @@ __grab_cache_page(struct address_space *
+ 	int err;
+ 	struct page *page;
+ repeat:
+-	page = find_lock_page(mapping, index);
++	page = find_lock_page_wq(mapping, index, current->io_wait);
++	if (IS_ERR(page))
++		return page;
+ 	if (!page) {
+ 		if (!*cached_page) {
+ 			*cached_page = page_cache_alloc(mapping);
+@@ -1456,6 +1610,8 @@ void remove_suid(struct dentry *dentry)
+ 	}
+ }
+ 
++EXPORT_SYMBOL(remove_suid);
++
+ /*
+  * Copy as much as we can into the page and return the number of bytes which
+  * were sucessfully copied.  If a fault is encountered then clear the page
+@@ -1561,9 +1717,9 @@ filemap_set_next_iovec(const struct iove
+  * Returns appropriate error code that caller should return or
+  * zero in case that write should be allowed.
+  */
+-inline int generic_write_checks(struct inode *inode,
+-		struct file *file, loff_t *pos, size_t *count, int isblk)
++inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk)
+ {
++	struct inode *inode = file->f_mapping->host;
+ 	unsigned long limit = current->rlim[RLIMIT_FSIZE].rlim_cur;
+ 
+         if (unlikely(*pos < 0))
+@@ -1625,7 +1781,7 @@ inline int generic_write_checks(struct i
+ 			*count = inode->i_sb->s_maxbytes - *pos;
+ 	} else {
+ 		loff_t isize;
+-		if (bdev_read_only(inode->i_bdev))
++		if (bdev_read_only(I_BDEV(inode)))
+ 			return -EPERM;
+ 		isize = i_size_read(inode);
+ 		if (*pos >= isize) {
+@@ -1638,10 +1794,12 @@ inline int generic_write_checks(struct i
+ 	}
+ 	return 0;
+ }
++
+ EXPORT_SYMBOL(generic_write_checks);
+ 
+ /*
+  * Write to a file through the page cache. 
++ * Called under i_sem for S_ISREG files.
+  *
+  * We put everything into the page cache prior to writing it. This is not a
+  * problem when writing full pages. With partial pages, however, we first have
+@@ -1650,11 +1808,11 @@ EXPORT_SYMBOL(generic_write_checks);
+  *							okir@monad.swb.de
+  */
+ ssize_t
+-generic_file_aio_write_nolock(struct kiocb *iocb, const struct iovec *iov,
++__generic_file_aio_write_nolock(struct kiocb *iocb, const struct iovec *iov,
+ 				unsigned long nr_segs, loff_t *ppos)
+ {
+ 	struct file *file = iocb->ki_filp;
+-	struct address_space * mapping = file->f_dentry->d_inode->i_mapping;
++	struct address_space * mapping = file->f_mapping;
+ 	struct address_space_operations *a_ops = mapping->a_ops;
+ 	size_t ocount;		/* original count */
+ 	size_t count;		/* after file limit checks */
+@@ -1701,11 +1859,10 @@ generic_file_aio_write_nolock(struct kio
+ 	current->backing_dev_info = mapping->backing_dev_info;
+ 	written = 0;
+ 
+-	err = generic_write_checks(inode, file, &pos, &count, isblk);
++	err = generic_write_checks(file, &pos, &count, isblk);
+ 	if (err)
+ 		goto out;
+ 
+-
+ 	if (count == 0)
+ 		goto out;
+ 
+@@ -1730,12 +1887,19 @@ generic_file_aio_write_nolock(struct kio
+ 		/*
+ 		 * Sync the fs metadata but not the minor inode changes and
+ 		 * of course not the data as we did direct DMA for the IO.
++		 * i_sem is held, which protects generic_osync_inode() from
++		 * livelocking.
+ 		 */
+ 		if (written >= 0 && file->f_flags & O_SYNC)
+-			status = generic_osync_inode(inode, OSYNC_METADATA);
++			status = generic_osync_inode(inode, mapping, OSYNC_METADATA);
+ 		if (written >= 0 && !is_sync_kiocb(iocb))
+ 			written = -EIOCBQUEUED;
+-		goto out_status;
++		if (written != -ENOTBLK)
++			goto out_status;
++		/*
++		 * direct-io write to a hole: fall through to buffered I/O
++		 */
++		written = 0;
+ 	}
+ 
+ 	buf = iov->iov_base;
+@@ -1759,6 +1923,10 @@ generic_file_aio_write_nolock(struct kio
+ 		fault_in_pages_readable(buf, bytes);
+ 
+ 		page = __grab_cache_page(mapping,index,&cached_page,&lru_pvec);
++		if (IS_ERR(page)) {
++			status = PTR_ERR(page);
++			break;
++		}
+ 		if (!page) {
+ 			status = -ENOMEM;
+ 			break;
+@@ -1807,7 +1975,11 @@ generic_file_aio_write_nolock(struct kio
+ 		page_cache_release(page);
+ 		if (status < 0)
+ 			break;
+-		balance_dirty_pages_ratelimited(mapping);
++		status = balance_dirty_pages_ratelimited(mapping);
++		if (status < 0) {
++			pr_debug("async balance_dirty_pages\n");
++			break;
++		}
+ 		cond_resched();
+ 	} while (count);
+ 	*ppos = pos;
+@@ -1818,12 +1990,22 @@ generic_file_aio_write_nolock(struct kio
+ 	/*
+ 	 * For now, when the user asks for O_SYNC, we'll actually give O_DSYNC
+ 	 */
+-	if (status >= 0) {
+-		if ((file->f_flags & O_SYNC) || IS_SYNC(inode))
+-			status = generic_osync_inode(inode,
+-					OSYNC_METADATA|OSYNC_DATA);
+-	}
++	if (likely(status >= 0)) {
++		if (unlikely((file->f_flags & O_SYNC) || IS_SYNC(inode))) {
++			if (!a_ops->writepage)
++				status = generic_osync_inode(inode, mapping,
++						OSYNC_METADATA|OSYNC_DATA);
++		}
++  	}
+ 	
++	/*
++	 * If we get here for O_DIRECT writes then we must have fallen through
++	 * to buffered writes (block instantiation inside i_size).  So we sync
++	 * the file data here, to try to honour O_DIRECT expectations.
++	 */
++	if (unlikely(file->f_flags & O_DIRECT) && written)
++		status = filemap_write_and_wait(mapping);
++
+ out_status:	
+ 	err = written ? written : status;
+ out:
+@@ -1832,6 +2014,57 @@ out:
+ 	return err;
+ }
+ 
++EXPORT_SYMBOL(generic_file_aio_write_nolock);
++
++ssize_t
++generic_file_aio_write_nolock(struct kiocb *iocb, const struct iovec *iov,
++				unsigned long nr_segs, loff_t *ppos)
++{
++	struct file *file = iocb->ki_filp;
++	struct address_space *mapping = file->f_mapping;
++	struct inode *inode = mapping->host;
++	ssize_t ret;
++	loff_t pos = *ppos;
++
++	if (!iov->iov_base && !is_sync_kiocb(iocb)) {
++		/* nothing to transfer, may just need to sync data */
++		ret = iov->iov_len; /* vector AIO not supported yet */
++		goto osync;
++	}
++
++	ret = __generic_file_aio_write_nolock(iocb, iov, nr_segs, ppos);
++
++	/*
++	 * Avoid doing a sync in parts for aio - its more efficient to
++	 * call in again after all the data has been copied
++	 */
++	if (!is_sync_kiocb(iocb))
++		return ret;
++
++osync:
++	if (ret > 0 && ((file->f_flags & O_SYNC) || IS_SYNC(inode))) {
++		ret = sync_page_range_nolock(inode, mapping, pos, ret);
++		if (ret >= 0)
++			*ppos = pos + ret;
++	}
++	return ret;
++}
++
++
++ssize_t
++__generic_file_write_nolock(struct file *file, const struct iovec *iov,
++				unsigned long nr_segs, loff_t *ppos)
++{
++	struct kiocb kiocb;
++	ssize_t ret;
++
++	init_sync_kiocb(&kiocb, file);
++	ret = __generic_file_aio_write_nolock(&kiocb, iov, nr_segs, ppos);
++	if (-EIOCBQUEUED == ret)
++		ret = wait_on_sync_kiocb(&kiocb);
++	return ret;
++}
++
+ ssize_t
+ generic_file_write_nolock(struct file *file, const struct iovec *iov,
+ 				unsigned long nr_segs, loff_t *ppos)
+@@ -1846,39 +2079,69 @@ generic_file_write_nolock(struct file *f
+ 	return ret;
+ }
+ 
++EXPORT_SYMBOL(generic_file_write_nolock);
++
+ ssize_t generic_file_aio_write(struct kiocb *iocb, const char __user *buf,
+ 			       size_t count, loff_t pos)
+ {
+ 	struct file *file = iocb->ki_filp;
+-	struct inode *inode = file->f_dentry->d_inode->i_mapping->host;
+-	ssize_t err;
+-	struct iovec local_iov = { .iov_base = (void __user *)buf, .iov_len = count };
++	struct address_space *mapping = file->f_mapping;
++	struct inode *inode = mapping->host;
++	ssize_t ret;
++	struct iovec local_iov = { .iov_base = (void __user *)buf,
++					.iov_len = count };
+ 
+-	BUG_ON(iocb->ki_pos != pos);
++	if (!buf && !is_sync_kiocb(iocb)) {
++		/* nothing to transfer, may just need to sync data */
++		ret = count;
++		goto osync;
++	}
+ 
+ 	down(&inode->i_sem);
+-	err = generic_file_aio_write_nolock(iocb, &local_iov, 1, 
++	ret = __generic_file_aio_write_nolock(iocb, &local_iov, 1,
+ 						&iocb->ki_pos);
+ 	up(&inode->i_sem);
+ 
+-	return err;
++	/*
++	 * Avoid doing a sync in parts for aio - its more efficient to
++	 * call in again after all the data has been copied
++	 */
++	if (!is_sync_kiocb(iocb))
++		return ret;
++
++osync:
++	if (ret > 0 && ((file->f_flags & O_SYNC) || IS_SYNC(inode))) {
++		ret = sync_page_range(inode, mapping, pos, ret);
++		if (ret >= 0)
++			iocb->ki_pos = pos + ret;
++	}
++	return ret;
+ }
+ EXPORT_SYMBOL(generic_file_aio_write);
+-EXPORT_SYMBOL(generic_file_aio_write_nolock);
+ 
+ ssize_t generic_file_write(struct file *file, const char __user *buf,
+ 			   size_t count, loff_t *ppos)
+ {
+-	struct inode	*inode = file->f_dentry->d_inode->i_mapping->host;
+-	ssize_t		err;
+-	struct iovec local_iov = { .iov_base = (void __user *)buf, .iov_len = count };
++	struct address_space *mapping = file->f_mapping;
++	struct inode *inode = mapping->host;
++	ssize_t	ret;
++	struct iovec local_iov = { .iov_base = (void __user *)buf,
++					.iov_len = count };
+ 
+ 	down(&inode->i_sem);
+-	err = generic_file_write_nolock(file, &local_iov, 1, ppos);
++	ret = __generic_file_write_nolock(file, &local_iov, 1, ppos);
+ 	up(&inode->i_sem);
+ 
+-	return err;
++	if (ret > 0 && ((file->f_flags & O_SYNC) || IS_SYNC(inode))) {
++		ssize_t err;
++
++		err = sync_page_range(inode, mapping, *ppos - ret, ret);
++		if (err < 0)
++			ret = err;
++	}
++	return ret;
+ }
++EXPORT_SYMBOL(generic_file_write);
+ 
+ ssize_t generic_file_readv(struct file *filp, const struct iovec *iov,
+ 			unsigned long nr_segs, loff_t *ppos)
+@@ -1893,37 +2156,50 @@ ssize_t generic_file_readv(struct file *
+ 	return ret;
+ }
+ 
++EXPORT_SYMBOL(generic_file_readv);
++
+ ssize_t generic_file_writev(struct file *file, const struct iovec *iov,
+-			unsigned long nr_segs, loff_t * ppos) 
++			unsigned long nr_segs, loff_t *ppos)
+ {
+-	struct inode *inode = file->f_dentry->d_inode;
++	struct address_space *mapping = file->f_mapping;
++	struct inode *inode = mapping->host;
+ 	ssize_t ret;
+ 
+ 	down(&inode->i_sem);
+-	ret = generic_file_write_nolock(file, iov, nr_segs, ppos);
++	ret = __generic_file_write_nolock(file, iov, nr_segs, ppos);
+ 	up(&inode->i_sem);
++
++	if (ret > 0 && ((file->f_flags & O_SYNC) || IS_SYNC(inode))) {
++		ssize_t err;
++
++		err = sync_page_range(inode, mapping, *ppos - ret, ret);
++		if (err < 0)
++			ret = err;
++	}
+ 	return ret;
+ }
+ 
++EXPORT_SYMBOL(generic_file_writev);
++
++/*
++ * Called under i_sem for writes to S_ISREG files
++ */
+ ssize_t
+ generic_file_direct_IO(int rw, struct kiocb *iocb, const struct iovec *iov,
+ 	loff_t offset, unsigned long nr_segs)
+ {
+ 	struct file *file = iocb->ki_filp;
+-	struct address_space *mapping = file->f_dentry->d_inode->i_mapping;
++	struct address_space *mapping = file->f_mapping;
+ 	ssize_t retval;
+ 
+-	if (mapping->nrpages) {
+-		retval = filemap_fdatawrite(mapping);
+-		if (retval == 0)
+-			retval = filemap_fdatawait(mapping);
+-		if (retval)
+-			goto out;
++	retval = filemap_write_and_wait(mapping);
++	if (retval == 0) {
++		retval = mapping->a_ops->direct_IO(rw, iocb, iov,
++						offset, nr_segs);
++		if (rw == WRITE && mapping->nrpages)
++			invalidate_inode_pages2(mapping);
+ 	}
+-
+-	retval = mapping->a_ops->direct_IO(rw, iocb, iov, offset, nr_segs);
+-	if (rw == WRITE && mapping->nrpages)
+-		invalidate_inode_pages2(mapping);
+-out:
+ 	return retval;
+ }
++
++EXPORT_SYMBOL_GPL(generic_file_direct_IO);
+--- linux-2.6.0-test6/mm/highmem.c	2003-06-14 12:18:24.000000000 -0700
++++ 25/mm/highmem.c	2003-10-05 00:33:25.000000000 -0700
+@@ -24,6 +24,7 @@
+ #include <linux/blkdev.h>
+ #include <linux/init.h>
+ #include <linux/hash.h>
++#include <linux/highmem.h>
+ #include <asm/pgalloc.h>
+ #include <asm/tlbflush.h>
+ 
+@@ -62,7 +63,7 @@ static void flush_all_zero_pkmaps(void)
+ {
+ 	int i;
+ 
+-	flush_cache_all();
++	flush_cache_kmaps();
+ 
+ 	for (i = 0; i < LAST_PKMAP; i++) {
+ 		struct page *page;
+--- linux-2.6.0-test6/mm/madvise.c	2003-08-08 22:55:14.000000000 -0700
++++ 25/mm/madvise.c	2003-10-05 00:34:07.000000000 -0700
+@@ -65,7 +65,7 @@ static long madvise_willneed(struct vm_a
+ 		end = vma->vm_end;
+ 	end = ((end - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
+ 
+-	force_page_cache_readahead(file->f_dentry->d_inode->i_mapping,
++	force_page_cache_readahead(file->f_mapping,
+ 			file, start, max_sane_readahead(end - start));
+ 	return 0;
+ }
+--- linux-2.6.0-test6/mm/Makefile	2003-09-08 13:58:59.000000000 -0700
++++ 25/mm/Makefile	2003-10-05 00:36:48.000000000 -0700
+@@ -12,3 +12,6 @@ obj-y			:= bootmem.o filemap.o mempool.o
+ 			   slab.o swap.o truncate.o vmscan.o $(mmu-y)
+ 
+ obj-$(CONFIG_SWAP)	+= page_io.o swap_state.o swapfile.o
++
++obj-$(CONFIG_X86_4G) += usercopy.o
++
+--- linux-2.6.0-test6/mm/memory.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/mm/memory.c	2003-10-05 00:36:48.000000000 -0700
+@@ -100,7 +100,8 @@ static inline void free_one_pmd(struct m
+ 	pte_free_tlb(tlb, page);
+ }
+ 
+-static inline void free_one_pgd(struct mmu_gather *tlb, pgd_t * dir)
++static inline void free_one_pgd(struct mmu_gather *tlb, pgd_t * dir,
++							int pgd_idx)
+ {
+ 	int j;
+ 	pmd_t * pmd;
+@@ -114,8 +115,11 @@ static inline void free_one_pgd(struct m
+ 	}
+ 	pmd = pmd_offset(dir, 0);
+ 	pgd_clear(dir);
+-	for (j = 0; j < PTRS_PER_PMD ; j++)
++	for (j = 0; j < PTRS_PER_PMD ; j++) {
++		if (pgd_idx * PGDIR_SIZE + j * PMD_SIZE >= TASK_SIZE)
++			break;
+ 		free_one_pmd(tlb, pmd+j);
++	}
+ 	pmd_free_tlb(tlb, pmd);
+ }
+ 
+@@ -128,11 +132,13 @@ static inline void free_one_pgd(struct m
+ void clear_page_tables(struct mmu_gather *tlb, unsigned long first, int nr)
+ {
+ 	pgd_t * page_dir = tlb->mm->pgd;
++	int pgd_idx = first;
+ 
+ 	page_dir += first;
+ 	do {
+-		free_one_pgd(tlb, page_dir);
++		free_one_pgd(tlb, page_dir, pgd_idx);
+ 		page_dir++;
++		pgd_idx++;
+ 	} while (--nr);
+ }
+ 
+@@ -430,7 +436,7 @@ zap_pmd_range(struct mmu_gather *tlb, pg
+ 		unsigned long address, unsigned long size)
+ {
+ 	pmd_t * pmd;
+-	unsigned long end;
++	unsigned long end, pgd_boundary;
+ 
+ 	if (pgd_none(*dir))
+ 		return;
+@@ -441,8 +447,9 @@ zap_pmd_range(struct mmu_gather *tlb, pg
+ 	}
+ 	pmd = pmd_offset(dir, address);
+ 	end = address + size;
+-	if (end > ((address + PGDIR_SIZE) & PGDIR_MASK))
+-		end = ((address + PGDIR_SIZE) & PGDIR_MASK);
++	pgd_boundary = ((address + PGDIR_SIZE) & PGDIR_MASK);
++	if (pgd_boundary && (end > pgd_boundary))
++		end = pgd_boundary;
+ 	do {
+ 		zap_pte_range(tlb, pmd, address, end - address);
+ 		address = (address + PMD_SIZE) & PMD_MASK; 
+@@ -518,7 +525,7 @@ int unmap_vmas(struct mmu_gather **tlbp,
+ 		unsigned long end_addr, unsigned long *nr_accounted)
+ {
+ 	unsigned long zap_bytes = ZAP_BLOCK_SIZE;
+-	unsigned long tlb_start;	/* For tlb_finish_mmu */
++	unsigned long tlb_start = 0;	/* For tlb_finish_mmu */
+ 	int tlb_start_valid = 0;
+ 	int ret = 0;
+ 
+@@ -596,6 +603,11 @@ void zap_page_range(struct vm_area_struc
+ 	might_sleep();
+ 
+ 	if (is_vm_hugetlb_page(vma)) {
++		static int x;
++		if (x < 10) {
++			x++;
++			dump_stack();
++		}
+ 		zap_hugepage_range(vma, address, size);
+ 		return;
+ 	}
+@@ -678,6 +690,7 @@ int get_user_pages(struct task_struct *t
+ 		struct page **pages, struct vm_area_struct **vmas)
+ {
+ 	int i;
++	int vm_io;
+ 	unsigned int flags;
+ 
+ 	/* 
+@@ -734,8 +747,10 @@ int get_user_pages(struct task_struct *t
+ 		}
+ #endif
+ 
+-		if (!vma || (pages && (vma->vm_flags & VM_IO))
+-				|| !(flags & vma->vm_flags))
++		if (!vma)
++			return i ? : -EFAULT;
++		vm_io = vma->vm_flags & VM_IO;
++		if ((pages && vm_io) || !(flags & vma->vm_flags))
+ 			return i ? : -EFAULT;
+ 
+ 		if (is_vm_hugetlb_page(vma)) {
+@@ -743,9 +758,17 @@ int get_user_pages(struct task_struct *t
+ 						&start, &len, i);
+ 			continue;
+ 		}
++
+ 		spin_lock(&mm->page_table_lock);
+ 		do {
+-			struct page *map;
++			struct page *map = NULL;
++
++			/*
++			 * We don't follow pagetables for VM_IO regions - they
++			 * may have no pageframes.
++			 */
++			if (vm_io)
++				goto no_follow;
+ 			while (!(map = follow_page(mm, start, write))) {
+ 				spin_unlock(&mm->page_table_lock);
+ 				switch (handle_mm_fault(mm,vma,start,write)) {
+@@ -777,6 +800,7 @@ int get_user_pages(struct task_struct *t
+ 				if (!PageReserved(pages[i]))
+ 					page_cache_get(pages[i]);
+ 			}
++no_follow:
+ 			if (vmas)
+ 				vmas[i] = vma;
+ 			i++;
+@@ -1398,7 +1422,7 @@ do_no_page(struct mm_struct *mm, struct 
+ 	spin_unlock(&mm->page_table_lock);
+ 
+ 	if (vma->vm_file) {
+-		mapping = vma->vm_file->f_dentry->d_inode->i_mapping;
++		mapping = vma->vm_file->f_mapping;
+ 		sequence = atomic_read(&mapping->truncate_count);
+ 	}
+ 	smp_rmb();  /* Prevent CPU from reordering lock-free ->nopage() */
+@@ -1441,6 +1465,7 @@ retry:
+ 		sequence = atomic_read(&mapping->truncate_count);
+ 		spin_unlock(&mm->page_table_lock);
+ 		page_cache_release(new_page);
++		pte_chain_free(pte_chain);
+ 		goto retry;
+ 	}
+ 	page_table = pte_offset_map(pmd, address);
+--- linux-2.6.0-test6/mm/mincore.c	2003-06-14 12:18:48.000000000 -0700
++++ 25/mm/mincore.c	2003-10-05 00:34:07.000000000 -0700
+@@ -26,7 +26,7 @@ static unsigned char mincore_page(struct
+ 	unsigned long pgoff)
+ {
+ 	unsigned char present = 0;
+-	struct address_space * as = vma->vm_file->f_dentry->d_inode->i_mapping;
++	struct address_space * as = vma->vm_file->f_mapping;
+ 	struct page * page;
+ 
+ 	page = find_get_page(as, pgoff);
+--- linux-2.6.0-test6/mm/mmap.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/mm/mmap.c	2003-10-05 00:36:32.000000000 -0700
+@@ -79,11 +79,10 @@ static void remove_shared_vm_struct(stru
+ 	struct file *file = vma->vm_file;
+ 
+ 	if (file) {
+-		struct inode *inode = file->f_dentry->d_inode;
+-
+-		down(&inode->i_mapping->i_shared_sem);
+-		__remove_shared_vm_struct(vma, inode);
+-		up(&inode->i_mapping->i_shared_sem);
++		struct address_space *mapping = file->f_mapping;
++		down(&mapping->i_shared_sem);
++		__remove_shared_vm_struct(vma, file->f_dentry->d_inode);
++		up(&mapping->i_shared_sem);
+ 	}
+ }
+ 
+@@ -234,11 +233,10 @@ static inline void __vma_link_file(struc
+ 
+ 	file = vma->vm_file;
+ 	if (file) {
+-		struct inode * inode = file->f_dentry->d_inode;
+-		struct address_space *mapping = inode->i_mapping;
++		struct address_space *mapping = file->f_mapping;
+ 
+ 		if (vma->vm_flags & VM_DENYWRITE)
+-			atomic_dec(&inode->i_writecount);
++			atomic_dec(&file->f_dentry->d_inode->i_writecount);
+ 
+ 		if (vma->vm_flags & VM_SHARED)
+ 			list_add_tail(&vma->shared, &mapping->i_mmap_shared);
+@@ -264,7 +262,7 @@ static void vma_link(struct mm_struct *m
+ 	struct address_space *mapping = NULL;
+ 
+ 	if (vma->vm_file)
+-		mapping = vma->vm_file->f_dentry->d_inode->i_mapping;
++		mapping = vma->vm_file->f_mapping;
+ 
+ 	if (mapping)
+ 		down(&mapping->i_shared_sem);
+@@ -280,6 +278,26 @@ static void vma_link(struct mm_struct *m
+ }
+ 
+ /*
++ * Insert vm structure into process list sorted by address and into the inode's
++ * i_mmap ring. The caller should hold mm->page_table_lock and
++ * ->f_mappping->i_shared_sem if vm_file is non-NULL.
++ */
++static void
++__insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
++{
++	struct vm_area_struct * __vma, * prev;
++	struct rb_node ** rb_link, * rb_parent;
++
++	__vma = find_vma_prepare(mm, vma->vm_start,&prev, &rb_link, &rb_parent);
++	if (__vma && __vma->vm_start < vma->vm_end)
++		BUG();
++	__vma_link(mm, vma, prev, rb_link, rb_parent);
++	mark_mm_hugetlb(mm, vma);
++	mm->map_count++;
++	validate_mm(mm);
++}
++
++/*
+  * If the vma has a ->close operation then the driver probably needs to release
+  * per-vma resources, so we don't attempt to merge those.
+  */
+@@ -351,7 +369,8 @@ static int vma_merge(struct mm_struct *m
+ 			unsigned long end, unsigned long vm_flags,
+ 			struct file *file, unsigned long pgoff)
+ {
+-	spinlock_t * lock = &mm->page_table_lock;
++	spinlock_t *lock = &mm->page_table_lock;
++	struct semaphore *i_shared_sem;
+ 
+ 	/*
+ 	 * We later require that vma->vm_flags == vm_flags, so this tests
+@@ -360,6 +379,8 @@ static int vma_merge(struct mm_struct *m
+ 	if (vm_flags & VM_SPECIAL)
+ 		return 0;
+ 
++	i_shared_sem = file ? &file->f_mapping->i_shared_sem : NULL;
++
+ 	if (!prev) {
+ 		prev = rb_entry(rb_parent, struct vm_area_struct, vm_rb);
+ 		goto merge_next;
+@@ -377,7 +398,7 @@ static int vma_merge(struct mm_struct *m
+ 
+ 		if (unlikely(file && prev->vm_next &&
+ 				prev->vm_next->vm_file == file)) {
+-			down(&inode->i_mapping->i_shared_sem);
++			down(i_shared_sem);
+ 			need_up = 1;
+ 		}
+ 		spin_lock(lock);
+@@ -395,7 +416,7 @@ static int vma_merge(struct mm_struct *m
+ 			__remove_shared_vm_struct(next, inode);
+ 			spin_unlock(lock);
+ 			if (need_up)
+-				up(&inode->i_mapping->i_shared_sem);
++				up(i_shared_sem);
+ 			if (file)
+ 				fput(file);
+ 
+@@ -405,7 +426,7 @@ static int vma_merge(struct mm_struct *m
+ 		}
+ 		spin_unlock(lock);
+ 		if (need_up)
+-			up(&inode->i_mapping->i_shared_sem);
++			up(i_shared_sem);
+ 		return 1;
+ 	}
+ 
+@@ -419,14 +440,17 @@ static int vma_merge(struct mm_struct *m
+ 				pgoff, (end - addr) >> PAGE_SHIFT))
+ 			return 0;
+ 		if (end == prev->vm_start) {
++			if (file)
++				down(i_shared_sem); /* invalidate_mmap_range */
+ 			spin_lock(lock);
+ 			prev->vm_start = addr;
+ 			prev->vm_pgoff -= (end - addr) >> PAGE_SHIFT;
+ 			spin_unlock(lock);
++			if (file)
++				up(i_shared_sem);
+ 			return 1;
+ 		}
+ 	}
+-
+ 	return 0;
+ }
+ 
+@@ -1136,6 +1160,7 @@ int split_vma(struct mm_struct * mm, str
+ 	      unsigned long addr, int new_below)
+ {
+ 	struct vm_area_struct *new;
++	struct address_space *mapping = NULL;
+ 
+ 	if (mm->map_count >= MAX_MAP_COUNT)
+ 		return -ENOMEM;
+@@ -1149,12 +1174,9 @@ int split_vma(struct mm_struct * mm, str
+ 
+ 	INIT_LIST_HEAD(&new->shared);
+ 
+-	if (new_below) {
++	if (new_below)
+ 		new->vm_end = addr;
+-		vma->vm_start = addr;
+-		vma->vm_pgoff += ((addr - new->vm_start) >> PAGE_SHIFT);
+-	} else {
+-		vma->vm_end = addr;
++	else {
+ 		new->vm_start = addr;
+ 		new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
+ 	}
+@@ -1165,7 +1187,25 @@ int split_vma(struct mm_struct * mm, str
+ 	if (new->vm_ops && new->vm_ops->open)
+ 		new->vm_ops->open(new);
+ 
+-	insert_vm_struct(mm, new);
++	if (vma->vm_file)
++		 mapping = vma->vm_file->f_mapping;
++
++	if (mapping)
++		down(&mapping->i_shared_sem);
++	spin_lock(&mm->page_table_lock);
++
++	if (new_below) {
++		vma->vm_start = addr;
++		vma->vm_pgoff += ((addr - new->vm_start) >> PAGE_SHIFT);
++	} else
++		vma->vm_end = addr;
++
++	__insert_vm_struct(mm, new);
++
++	spin_unlock(&mm->page_table_lock);
++	if (mapping)
++		up(&mapping->i_shared_sem);
++
+ 	return 0;
+ }
+ 
+--- linux-2.6.0-test6/mm/msync.c	2003-06-14 12:18:07.000000000 -0700
++++ 25/mm/msync.c	2003-10-05 00:34:08.000000000 -0700
+@@ -146,20 +146,20 @@ static int msync_interval(struct vm_area
+ 		ret = filemap_sync(vma, start, end-start, flags);
+ 
+ 		if (!ret && (flags & MS_SYNC)) {
+-			struct inode *inode = file->f_dentry->d_inode;
++			struct address_space *mapping = file->f_mapping;
+ 			int err;
+ 
+-			down(&inode->i_sem);
+-			ret = filemap_fdatawrite(inode->i_mapping);
++			down(&mapping->host->i_sem);
++			ret = filemap_fdatawrite(mapping);
+ 			if (file->f_op && file->f_op->fsync) {
+ 				err = file->f_op->fsync(file,file->f_dentry,1);
+ 				if (err && !ret)
+ 					ret = err;
+ 			}
+-			err = filemap_fdatawait(inode->i_mapping);
++			err = filemap_fdatawait(mapping);
+ 			if (!ret)
+ 				ret = err;
+-			up(&inode->i_sem);
++			up(&mapping->host->i_sem);
+ 		}
+ 	}
+ 	return ret;
+--- linux-2.6.0-test6/mm/page_alloc.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/mm/page_alloc.c	2003-10-05 00:34:39.000000000 -0700
+@@ -50,7 +50,7 @@ EXPORT_SYMBOL(nr_swap_pages);
+  * Used by page_zone() to look up the address of the struct zone whose
+  * id is encoded in the upper bits of page->flags
+  */
+-struct zone *zone_table[MAX_NR_ZONES*MAX_NR_NODES];
++struct zone *zone_table[MAX_NR_ZONES*MAX_NUMNODES];
+ EXPORT_SYMBOL(zone_table);
+ 
+ static char *zone_names[MAX_NR_ZONES] = { "DMA", "Normal", "HighMem" };
+--- linux-2.6.0-test6/mm/page-writeback.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/mm/page-writeback.c	2003-10-05 00:37:06.000000000 -0700
+@@ -28,6 +28,7 @@
+ #include <linux/smp.h>
+ #include <linux/sysctl.h>
+ #include <linux/cpu.h>
++#include <linux/pagevec.h>
+ 
+ /*
+  * The maximum number of pages to writeout in a single bdflush/kupdate
+@@ -146,7 +147,7 @@ get_dirty_limits(struct page_state *ps, 
+  * If we're over `background_thresh' then pdflush is woken to perform some
+  * writeout.
+  */
+-static void balance_dirty_pages(struct address_space *mapping)
++static int balance_dirty_pages(struct address_space *mapping)
+ {
+ 	struct page_state ps;
+ 	long nr_reclaimable;
+@@ -163,6 +164,7 @@ static void balance_dirty_pages(struct a
+ 			.sync_mode	= WB_SYNC_NONE,
+ 			.older_than_this = NULL,
+ 			.nr_to_write	= write_chunk,
++			.nonblocking	= !is_sync_wait(current->io_wait)
+ 		};
+ 
+ 		get_dirty_limits(&ps, &background_thresh, &dirty_thresh);
+@@ -189,7 +191,11 @@ static void balance_dirty_pages(struct a
+ 			if (pages_written >= write_chunk)
+ 				break;		/* We've done our duty */
+ 		}
+-		blk_congestion_wait(WRITE, HZ/10);
++		if (-EIOCBRETRY == blk_congestion_wait_wq(WRITE, HZ/10,
++			current->io_wait)) {
++			pr_debug("async blk congestion wait\n");
++			return -EIOCBRETRY;
++		}
+ 	}
+ 
+ 	if (nr_reclaimable + ps.nr_writeback <= dirty_thresh)
+@@ -197,6 +203,8 @@ static void balance_dirty_pages(struct a
+ 
+ 	if (!writeback_in_progress(bdi) && nr_reclaimable > background_thresh)
+ 		pdflush_operation(background_writeout, 0);
++
++	return 0;
+ }
+ 
+ /**
+@@ -212,7 +220,7 @@ static void balance_dirty_pages(struct a
+  * decrease the ratelimiting by a lot, to prevent individual processes from
+  * overshooting the limit by (ratelimit_pages) each.
+  */
+-void balance_dirty_pages_ratelimited(struct address_space *mapping)
++int balance_dirty_pages_ratelimited(struct address_space *mapping)
+ {
+ 	static DEFINE_PER_CPU(int, ratelimits) = 0;
+ 	long ratelimit;
+@@ -228,10 +236,10 @@ void balance_dirty_pages_ratelimited(str
+ 	if (get_cpu_var(ratelimits)++ >= ratelimit) {
+ 		__get_cpu_var(ratelimits) = 0;
+ 		put_cpu_var(ratelimits);
+-		balance_dirty_pages(mapping);
+-		return;
++		return balance_dirty_pages(mapping);
+ 	}
+ 	put_cpu_var(ratelimits);
++	return 0;
+ }
+ 
+ /*
+@@ -566,3 +574,152 @@ int test_clear_page_dirty(struct page *p
+ 	return 0;
+ }
+ EXPORT_SYMBOL(test_clear_page_dirty);
++
++
++static ssize_t operate_on_page_range(struct address_space *mapping,
++		loff_t pos, size_t count, int (*operator)(struct page *))
++{
++	pgoff_t first = pos >> PAGE_CACHE_SHIFT;
++	pgoff_t last = (pos + count - 1) >> PAGE_CACHE_SHIFT;	/* inclusive */
++	pgoff_t next = first, curr = first;
++	struct pagevec pvec;
++	ssize_t ret = 0, bytes = 0;
++	int i, nr;
++
++	if (count == 0)
++		return 0;
++
++	pagevec_init(&pvec, 0);
++	while ((nr = pagevec_lookup(&pvec, mapping, &next,
++				min((pgoff_t)PAGEVEC_SIZE, last - next + 1)))) {
++		for (i = 0; i < pagevec_count(&pvec); i++) {
++			struct page *page = pvec.pages[i];
++
++			curr = page->index;
++			if (page->mapping != mapping) /* truncated ?*/ {
++				curr = next;
++				break;
++			} else {
++				ret = (*operator)(page);
++				if (ret == -EIOCBRETRY)
++					break;
++				if (PageError(page)) {
++					if (!ret)
++						ret = -EIO;
++				} else
++					curr++;
++			}
++		}
++		pagevec_release(&pvec);
++		if ((ret == -EIOCBRETRY) || (next > last))
++			break;
++	}
++	if (!nr)
++		curr = last + 1;
++
++	bytes = (curr << PAGE_CACHE_SHIFT) - pos;
++	if (bytes > count)
++		bytes = count;
++	return (bytes && (!ret || (ret == -EIOCBRETRY))) ? bytes : ret;
++}
++
++static int page_waiter(struct page *page)
++{
++	return wait_on_page_writeback_wq(page, current->io_wait);
++}
++
++static size_t
++wait_on_page_range(struct address_space *mapping, loff_t pos, size_t count)
++{
++	return operate_on_page_range(mapping, pos, count, page_waiter);
++}
++
++static int page_writer(struct page *page)
++{
++	struct writeback_control wbc = {
++		.sync_mode	= WB_SYNC_ALL,
++		.nr_to_write	= 1,
++	};
++
++	lock_page(page);
++	if (!page->mapping) {	/* truncated */
++		unlock_page(page);
++		return 0;
++	}
++	if (!test_clear_page_dirty(page)) {
++		unlock_page(page);
++		return 0;
++	}
++	wait_on_page_writeback(page);
++	return page->mapping->a_ops->writepage(page, &wbc);
++}
++
++static ssize_t
++write_out_page_range(struct address_space *mapping, loff_t pos, size_t count)
++{
++	return operate_on_page_range(mapping, pos, count, page_writer);
++}
++
++/*
++ * Write and wait upon all the pages in the passed range.  This is a "data
++ * integrity" operation.  It waits upon in-flight writeout before starting and
++ * waiting upon new writeout.  If there was an IO error, return it.
++ *
++ * We need to re-take i_sem during the generic_osync_inode list walk because
++ * it is otherwise livelockable.
++ */
++ssize_t sync_page_range(struct inode *inode, struct address_space *mapping,
++			loff_t pos, size_t count)
++{
++	int ret = 0;
++
++	if (in_aio()) {
++		/* Already issued writeouts for this iocb ? */
++		if (kiocbTrySync(io_wait_to_kiocb(current->io_wait)))
++			goto do_wait; /* just need to check if done */
++	}
++	if (!mapping->a_ops->writepage)
++		return 0;
++	if (mapping->backing_dev_info->memory_backed)
++		return 0;
++	ret = write_out_page_range(mapping, pos, count);
++	if (ret >= 0) {
++		down(&inode->i_sem);
++		ret = generic_osync_inode(inode, mapping, OSYNC_METADATA);
++		up(&inode->i_sem);
++	}
++do_wait:
++	if (ret >= 0)
++		ret = wait_on_page_range(mapping, pos, count);
++	return ret;
++}
++
++/*
++ * It is really better to use sync_page_range, rather than call
++ * sync_page_range_nolock while holding i_sem, if you don't
++ * want to block parallel O_SYNC writes until the pages in this
++ * range are written out.
++ */
++ssize_t sync_page_range_nolock(struct inode *inode, struct address_space
++	*mapping, loff_t pos, size_t count)
++{
++	ssize_t ret = 0;
++
++	if (in_aio()) {
++		/* Already issued writeouts for this iocb ? */
++		if (kiocbTrySync(io_wait_to_kiocb(current->io_wait)))
++			goto do_wait; /* just need to check if done */
++	}
++	if (!mapping->a_ops->writepage)
++		return 0;
++	if (mapping->backing_dev_info->memory_backed)
++		return 0;
++	ret = write_out_page_range(mapping, pos, count);
++	if (ret >= 0) {
++		ret = generic_osync_inode(inode, mapping, OSYNC_METADATA);
++	}
++do_wait:
++	if (ret >= 0)
++		ret = wait_on_page_range(mapping, pos, count);
++	return ret;
++}
+--- linux-2.6.0-test6/mm/pdflush.c	2003-06-14 12:18:52.000000000 -0700
++++ 25/mm/pdflush.c	2003-10-05 00:34:35.000000000 -0700
+@@ -84,6 +84,8 @@ struct pdflush_work {
+ 	unsigned long when_i_went_to_sleep;
+ };
+ 
++static int wakeup_count = 100;
++
+ static int __pdflush(struct pdflush_work *my_work)
+ {
+ 	daemonize("pdflush");
+@@ -112,7 +114,10 @@ static int __pdflush(struct pdflush_work
+ 
+ 		spin_lock_irq(&pdflush_lock);
+ 		if (!list_empty(&my_work->list)) {
+-			printk("pdflush: bogus wakeup!\n");
++			if (wakeup_count > 0) {
++				wakeup_count--;
++				printk("pdflush: bogus wakeup!\n");
++			}
+ 			my_work->fn = NULL;
+ 			continue;
+ 		}
+@@ -182,6 +187,7 @@ int pdflush_operation(void (*fn)(unsigne
+ {
+ 	unsigned long flags;
+ 	int ret = 0;
++	static int poke_count = 0;
+ 
+ 	if (fn == NULL)
+ 		BUG();		/* Hard to diagnose if it's deferred */
+@@ -190,9 +196,19 @@ int pdflush_operation(void (*fn)(unsigne
+ 	if (list_empty(&pdflush_list)) {
+ 		spin_unlock_irqrestore(&pdflush_lock, flags);
+ 		ret = -1;
++		if (wakeup_count < 100 && poke_count < 10) {
++			printk("%s: no threads\n", __FUNCTION__);
++			dump_stack();
++			poke_count++;
++		}
+ 	} else {
+ 		struct pdflush_work *pdf;
+ 
++		if (wakeup_count < 100 && poke_count < 10) {
++			printk("%s: found a thread\n", __FUNCTION__);
++			dump_stack();
++			poke_count++;
++		}
+ 		pdf = list_entry(pdflush_list.next, struct pdflush_work, list);
+ 		list_del_init(&pdf->list);
+ 		if (list_empty(&pdflush_list))
+--- linux-2.6.0-test6/mm/shmem.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/mm/shmem.c	2003-10-05 00:34:11.000000000 -0700
+@@ -1147,7 +1147,7 @@ shmem_file_write(struct file *file, cons
+ 	pos = *ppos;
+ 	written = 0;
+ 
+-	err = generic_write_checks(inode, file, &pos, &count, 0);
++	err = generic_write_checks(file, &pos, &count, 0);
+ 	if (err || !count)
+ 		goto out;
+ 
+@@ -1933,6 +1933,7 @@ struct file *shmem_file_setup(char *name
+ 	inode->i_nlink = 0;	/* It is unlinked */
+ 	file->f_vfsmnt = mntget(shm_mnt);
+ 	file->f_dentry = dentry;
++	file->f_mapping = inode->i_mapping;
+ 	file->f_op = &shmem_file_operations;
+ 	file->f_mode = FMODE_WRITE | FMODE_READ;
+ 	return(file);
+--- linux-2.6.0-test6/mm/slab.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/mm/slab.c	2003-10-05 00:36:48.000000000 -0700
+@@ -250,7 +250,7 @@ struct kmem_cache_s {
+ 	unsigned int		limit;
+ /* 2) touched by every alloc & free from the backend */
+ 	struct kmem_list3	lists;
+-	/* NUMA: kmem_3list_t	*nodelists[NR_NODES] */
++	/* NUMA: kmem_3list_t	*nodelists[MAX_NUMNODES] */
+ 	unsigned int		objsize;
+ 	unsigned int	 	flags;	/* constant flags */
+ 	unsigned int		num;	/* # of objs per slab */
+@@ -1178,7 +1178,8 @@ next:
+ 		cachep = NULL;
+ 		goto opps;
+ 	}
+-	slab_size = L1_CACHE_ALIGN(cachep->num*sizeof(kmem_bufctl_t)+sizeof(struct slab));
++	slab_size = L1_CACHE_ALIGN(cachep->num*sizeof(kmem_bufctl_t) +
++			sizeof(struct slab));
+ 
+ 	/*
+ 	 * If the slab has been placed off-slab, and we have enough space then
+@@ -1222,10 +1223,13 @@ next:
+ 			 * the cache that's used by kmalloc(24), otherwise
+ 			 * the creation of further caches will BUG().
+ 			 */
+-			cachep->array[smp_processor_id()] = &initarray_generic.cache;
++			cachep->array[smp_processor_id()] =
++					&initarray_generic.cache;
+ 			g_cpucache_up = PARTIAL;
+ 		} else {
+-			cachep->array[smp_processor_id()] = kmalloc(sizeof(struct arraycache_init),GFP_KERNEL);
++			cachep->array[smp_processor_id()] =
++				kmalloc(sizeof(struct arraycache_init),
++					GFP_KERNEL);
+ 		}
+ 		BUG_ON(!ac_data(cachep));
+ 		ac_data(cachep)->avail = 0;
+@@ -1239,7 +1243,7 @@ next:
+ 	} 
+ 
+ 	cachep->lists.next_reap = jiffies + REAPTIMEOUT_LIST3 +
+-					((unsigned long)cachep)%REAPTIMEOUT_LIST3;
++				((unsigned long)cachep)%REAPTIMEOUT_LIST3;
+ 
+ 	/* Need the semaphore to access the chain. */
+ 	down(&cache_chain_sem);
+@@ -1252,16 +1256,24 @@ next:
+ 		list_for_each(p, &cache_chain) {
+ 			kmem_cache_t *pc = list_entry(p, kmem_cache_t, next);
+ 			char tmp;
+-			/* This happens when the module gets unloaded and doesn't
+-			   destroy its slab cache and noone else reuses the vmalloc
+-			   area of the module. Print a warning. */
+-			if (__get_user(tmp,pc->name)) { 
+-				printk("SLAB: cache with size %d has lost its name\n", 
+-					pc->objsize); 
++
++			/*
++			 * This happens when the module gets unloaded and
++			 * doesn't destroy its slab cache and noone else reuses
++			 * the vmalloc area of the module. Print a warning.
++			 */
++#ifdef CONFIG_X86_UACCESS_INDIRECT
++			if (__direct_get_user(tmp,pc->name)) {
++#else
++			if (__get_user(tmp,pc->name)) {
++#endif
++				printk("SLAB: cache with size %d has lost its "
++						"name\n", pc->objsize);
+ 				continue; 
+ 			} 	
+ 			if (!strcmp(pc->name,name)) { 
+-				printk("kmem_cache_create: duplicate cache %s\n",name); 
++				printk("kmem_cache_create: duplicate "
++						"cache %s\n",name);
+ 				up(&cache_chain_sem); 
+ 				BUG(); 
+ 			}	
+@@ -2675,8 +2687,8 @@ struct seq_operations slabinfo_op = {
+  * slabinfo_write - Tuning for the slab allocator
+  * @file: unused
+  * @buffer: user buffer
+- * @count: data len
+- * @data: unused
++ * @count: data length
++ * @ppos: unused
+  */
+ ssize_t slabinfo_write(struct file *file, const char __user *buffer,
+ 				size_t count, loff_t *ppos)
+--- linux-2.6.0-test6/mm/swap.c	2003-07-10 18:50:32.000000000 -0700
++++ 25/mm/swap.c	2003-10-05 00:37:03.000000000 -0700
+@@ -339,12 +339,15 @@ void pagevec_strip(struct pagevec *pvec)
+  * The search returns a group of mapping-contiguous pages with ascending
+  * indexes.  There may be holes in the indices due to not-present pages.
+  *
+- * pagevec_lookup() returns the number of pages which were found.
++ * pagevec_lookup() returns the number of pages which were found
++ * and also atomically sets the next offset to continue looking up
++ * mapping contiguous pages from (useful when doing a range of
++ * pagevec lookups in chunks of PAGEVEC_SIZE).
+  */
+ unsigned int pagevec_lookup(struct pagevec *pvec, struct address_space *mapping,
+-		pgoff_t start, unsigned int nr_pages)
++		pgoff_t *next, unsigned int nr_pages)
+ {
+-	pvec->nr = find_get_pages(mapping, start, nr_pages, pvec->pages);
++	pvec->nr = find_get_pages(mapping, next, nr_pages, pvec->pages);
+ 	return pagevec_count(pvec);
+ }
+ 
+--- linux-2.6.0-test6/mm/swapfile.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/mm/swapfile.c	2003-10-05 00:34:11.000000000 -0700
+@@ -912,7 +912,7 @@ static int setup_swap_extents(struct swa
+ 	sector_t last_block;
+ 	int ret;
+ 
+-	inode = sis->swap_file->f_dentry->d_inode;
++	inode = sis->swap_file->f_mapping->host;
+ 	if (S_ISBLK(inode->i_mode)) {
+ 		ret = add_swap_extent(sis, 0, sis->max, 0);
+ 		goto done;
+@@ -1031,13 +1031,13 @@ asmlinkage long sys_swapoff(const char _
+ 	if (IS_ERR(victim))
+ 		goto out;
+ 
+-	mapping = victim->f_dentry->d_inode->i_mapping;
++	mapping = victim->f_mapping;
+ 	prev = -1;
+ 	swap_list_lock();
+ 	for (type = swap_list.head; type >= 0; type = swap_info[type].next) {
+ 		p = swap_info + type;
+ 		if ((p->flags & SWP_ACTIVE) == SWP_ACTIVE) {
+-			if (p->swap_file->f_dentry->d_inode->i_mapping==mapping)
++			if (p->swap_file->f_mapping == mapping)
+ 				break;
+ 		}
+ 		prev = type;
+@@ -1099,13 +1099,12 @@ asmlinkage long sys_swapoff(const char _
+ 	swap_device_unlock(p);
+ 	swap_list_unlock();
+ 	vfree(swap_map);
+-	if (S_ISBLK(swap_file->f_dentry->d_inode->i_mode)) {
+-		struct block_device *bdev;
+-		bdev = swap_file->f_dentry->d_inode->i_bdev;
++	if (S_ISBLK(mapping->host->i_mode)) {
++		struct block_device *bdev = I_BDEV(mapping->host);
+ 		set_blocksize(bdev, p->old_block_size);
+ 		bd_release(bdev);
+ 	} else {
+-		up(&swap_file->f_dentry->d_inode->i_mapping->host->i_sem);
++		up(&mapping->host->i_sem);
+ 	}
+ 	filp_close(swap_file, NULL);
+ 	err = 0;
+@@ -1231,8 +1230,8 @@ asmlinkage long sys_swapon(const char __
+ 	int swapfilesize;
+ 	unsigned short *swap_map;
+ 	struct page *page = NULL;
+-	struct inode *inode;
+-	struct inode *downed_inode = NULL;
++	struct inode *inode = NULL;
++	int did_down = 0;
+ 
+ 	if (!capable(CAP_SYS_ADMIN))
+ 		return -EPERM;
+@@ -1279,8 +1278,8 @@ asmlinkage long sys_swapon(const char __
+ 	}
+ 
+ 	p->swap_file = swap_file;
+-	inode = swap_file->f_dentry->d_inode;
+-	mapping = swap_file->f_dentry->d_inode->i_mapping;
++	mapping = swap_file->f_mapping;
++	inode = mapping->host;
+ 
+ 	error = -EBUSY;
+ 	for (i = 0; i < nr_swapfiles; i++) {
+@@ -1288,32 +1287,32 @@ asmlinkage long sys_swapon(const char __
+ 
+ 		if (i == type || !q->swap_file)
+ 			continue;
+-		if (mapping == q->swap_file->f_dentry->d_inode->i_mapping)
++		if (mapping == q->swap_file->f_mapping)
+ 			goto bad_swap;
+ 	}
+ 
+ 	error = -EINVAL;
+ 	if (S_ISBLK(inode->i_mode)) {
+-		bdev = inode->i_bdev;
++		bdev = I_BDEV(inode);
+ 		error = bd_claim(bdev, sys_swapon);
+ 		if (error < 0) {
+ 			bdev = NULL;
+ 			goto bad_swap;
+ 		}
+ 		p->old_block_size = block_size(bdev);
+-		error = set_blocksize(inode->i_bdev, PAGE_SIZE);
++		error = set_blocksize(bdev, PAGE_SIZE);
+ 		if (error < 0)
+ 			goto bad_swap;
+ 		p->bdev = bdev;
+ 	} else if (S_ISREG(inode->i_mode)) {
+ 		p->bdev = inode->i_sb->s_bdev;
+-		downed_inode = mapping->host;
+-		down(&downed_inode->i_sem);
++		down(&inode->i_sem);
++		did_down = 1;
+ 	} else {
+ 		goto bad_swap;
+ 	}
+ 
+-	swapfilesize = i_size_read(mapping->host) >> PAGE_SHIFT;
++	swapfilesize = i_size_read(inode) >> PAGE_SHIFT;
+ 
+ 	/*
+ 	 * Read the swap header.
+@@ -1461,8 +1460,8 @@ out:
+ 	}
+ 	if (name)
+ 		putname(name);
+-	if (error && downed_inode)
+-		up(&downed_inode->i_sem);
++	if (error && did_down)
++		up(&inode->i_sem);
+ 	return error;
+ }
+ 
+--- linux-2.6.0-test6/mm/truncate.c	2003-06-14 12:18:34.000000000 -0700
++++ 25/mm/truncate.c	2003-10-05 00:37:03.000000000 -0700
+@@ -121,14 +121,10 @@ void truncate_inode_pages(struct address
+ 
+ 	pagevec_init(&pvec, 0);
+ 	next = start;
+-	while (pagevec_lookup(&pvec, mapping, next, PAGEVEC_SIZE)) {
++	while (pagevec_lookup(&pvec, mapping, &next, PAGEVEC_SIZE)) {
+ 		for (i = 0; i < pagevec_count(&pvec); i++) {
+ 			struct page *page = pvec.pages[i];
+-			pgoff_t page_index = page->index;
+ 
+-			if (page_index > next)
+-				next = page_index;
+-			next++;
+ 			if (TestSetPageLocked(page))
+ 				continue;
+ 			if (PageWriteback(page)) {
+@@ -154,7 +150,7 @@ void truncate_inode_pages(struct address
+ 
+ 	next = start;
+ 	for ( ; ; ) {
+-		if (!pagevec_lookup(&pvec, mapping, next, PAGEVEC_SIZE)) {
++		if (!pagevec_lookup(&pvec, mapping, &next, PAGEVEC_SIZE)) {
+ 			if (next == start)
+ 				break;
+ 			next = start;
+@@ -165,9 +161,6 @@ void truncate_inode_pages(struct address
+ 
+ 			lock_page(page);
+ 			wait_on_page_writeback(page);
+-			if (page->index > next)
+-				next = page->index;
+-			next++;
+ 			truncate_complete_page(mapping, page);
+ 			unlock_page(page);
+ 		}
+@@ -198,17 +191,13 @@ unsigned long invalidate_mapping_pages(s
+ 
+ 	pagevec_init(&pvec, 0);
+ 	while (next <= end &&
+-			pagevec_lookup(&pvec, mapping, next, PAGEVEC_SIZE)) {
++			pagevec_lookup(&pvec, mapping, &next, PAGEVEC_SIZE)) {
+ 		for (i = 0; i < pagevec_count(&pvec); i++) {
+ 			struct page *page = pvec.pages[i];
+ 
+ 			if (TestSetPageLocked(page)) {
+-				next++;
+ 				continue;
+ 			}
+-			if (page->index > next)
+-				next = page->index;
+-			next++;
+ 			if (PageDirty(page) || PageWriteback(page))
+ 				goto unlock;
+ 			if (page_mapped(page))
+@@ -245,14 +234,13 @@ void invalidate_inode_pages2(struct addr
+ 	int i;
+ 
+ 	pagevec_init(&pvec, 0);
+-	while (pagevec_lookup(&pvec, mapping, next, PAGEVEC_SIZE)) {
++	while (pagevec_lookup(&pvec, mapping, &next, PAGEVEC_SIZE)) {
+ 		for (i = 0; i < pagevec_count(&pvec); i++) {
+ 			struct page *page = pvec.pages[i];
+ 
+ 			lock_page(page);
+ 			if (page->mapping == mapping) {	/* truncate race? */
+ 				wait_on_page_writeback(page);
+-				next = page->index + 1;
+ 				if (page_mapped(page))
+ 					clear_page_dirty(page);
+ 				else
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/mm/usercopy.c	2003-10-05 00:36:48.000000000 -0700
+@@ -0,0 +1,279 @@
++/*
++ * linux/mm/usercopy.c
++ *
++ * (C) Copyright 2003 Ingo Molnar
++ *
++ * Generic implementation of all the user-VM access functions, without
++ * relying on being able to access the VM directly.
++ */
++
++#include <linux/module.h>
++#include <linux/sched.h>
++#include <linux/errno.h>
++#include <linux/mm.h>
++#include <linux/highmem.h>
++#include <linux/pagemap.h>
++#include <linux/smp_lock.h>
++#include <linux/ptrace.h>
++#include <linux/interrupt.h>
++
++#include <asm/pgtable.h>
++#include <asm/uaccess.h>
++#include <asm/atomic_kmap.h>
++
++/*
++ * Get kernel address of the user page and pin it.
++ */
++static inline struct page *pin_page(unsigned long addr, int write)
++{
++	struct mm_struct *mm = current->mm ? : &init_mm;
++	struct page *page = NULL;
++	int ret;
++
++	spin_lock(&mm->page_table_lock);
++	/*
++	 * Do a quick atomic lookup first - this is the fastpath.
++	 */
++	page = follow_page(mm, addr, write);
++	if (likely(page != NULL)) {
++		if (!PageReserved(page))
++			get_page(page);
++		spin_unlock(&mm->page_table_lock);
++		return page;
++	}
++
++	/*
++	 * No luck - bad address or need to fault in the page:
++	 */
++	spin_unlock(&mm->page_table_lock);
++
++	/*
++	 * In the context of filemap_copy_from_user(), we are not allowed
++	 * to sleep.  We must fail this usercopy attempt and allow
++	 * filemap_copy_from_user() to recover: drop its atomic kmap and use
++	 * a sleeping kmap instead.
++	 */
++	if (in_atomic())
++		return NULL;
++
++	down_read(&mm->mmap_sem);
++	ret = get_user_pages(current, mm, addr, 1, write, 0, &page, NULL);
++	up_read(&mm->mmap_sem);
++	if (ret <= 0)
++		return NULL;
++	return page;
++}
++
++static inline void unpin_page(struct page *page)
++{
++	put_page(page);
++}
++
++/*
++ * Access another process' address space.
++ * Source/target buffer must be kernel space,
++ * Do not walk the page table directly, use get_user_pages
++ */
++static int rw_vm(unsigned long addr, void *buf, int len, int write)
++{
++	if (!len)
++		return 0;
++
++	/* ignore errors, just check how much was sucessfully transfered */
++	while (len) {
++		struct page *page = NULL;
++		int bytes, offset;
++		void *maddr;
++
++		page = pin_page(addr, write);
++		if (!page)
++			break;
++
++		bytes = len;
++		offset = addr & (PAGE_SIZE-1);
++		if (bytes > PAGE_SIZE-offset)
++			bytes = PAGE_SIZE-offset;
++
++		maddr = kmap_atomic(page, KM_USER_COPY);
++
++#define HANDLE_TYPE(type) \
++	case sizeof(type): *(type *)(maddr+offset) = *(type *)(buf); break;
++
++		if (write) {
++			switch (bytes) {
++			HANDLE_TYPE(char);
++			HANDLE_TYPE(int);
++			HANDLE_TYPE(long long);
++			default:
++				memcpy(maddr + offset, buf, bytes);
++			}
++		} else {
++#undef HANDLE_TYPE
++#define HANDLE_TYPE(type) \
++	case sizeof(type): *(type *)(buf) = *(type *)(maddr+offset); break;
++			switch (bytes) {
++			HANDLE_TYPE(char);
++			HANDLE_TYPE(int);
++			HANDLE_TYPE(long long);
++			default:
++				memcpy(buf, maddr + offset, bytes);
++			}
++#undef HANDLE_TYPE
++		}
++		kunmap_atomic(maddr, KM_USER_COPY);
++		unpin_page(page);
++		len -= bytes;
++		buf += bytes;
++		addr += bytes;
++	}
++
++	return len;
++}
++
++static int str_vm(unsigned long addr, void *buf0, int len, int copy)
++{
++	struct mm_struct *mm = current->mm ? : &init_mm;
++	struct page *page;
++	void *buf = buf0;
++
++	if (!len)
++		return len;
++
++	down_read(&mm->mmap_sem);
++	/* ignore errors, just check how much was sucessfully transfered */
++	while (len) {
++		int bytes, ret, offset, left, copied;
++		char *maddr;
++
++		ret = get_user_pages(current, mm, addr, 1, copy == 2, 0, &page, NULL);
++		if (ret <= 0) {
++			up_read(&mm->mmap_sem);
++			return -EFAULT;
++		}
++
++		bytes = len;
++		offset = addr & (PAGE_SIZE-1);
++		if (bytes > PAGE_SIZE-offset)
++			bytes = PAGE_SIZE-offset;
++
++		maddr = kmap_atomic(page, KM_USER_COPY);
++		if (copy == 2) {
++			memset(maddr + offset, 0, bytes);
++			copied = bytes;
++			left = 0;
++		} else if (copy == 1) {
++			left = strncpy_count(buf, maddr + offset, bytes);
++			copied = bytes - left;
++		} else {
++			copied = strnlen(maddr + offset, bytes);
++			left = bytes - copied;
++		}
++		BUG_ON(bytes < 0 || copied < 0);
++		kunmap_atomic(maddr, KM_USER_COPY);
++		page_cache_release(page);
++		len -= copied;
++		buf += copied;
++		addr += copied;
++		if (left)
++			break;
++	}
++	up_read(&mm->mmap_sem);
++
++	return len;
++}
++
++/*
++ * Copies memory from userspace (ptr) into kernelspace (val).
++ *
++ * returns # of bytes not copied.
++ */
++int get_user_size(unsigned int size, void *val, const void *ptr)
++{
++	int ret;
++
++	if (unlikely(segment_eq(get_fs(), KERNEL_DS))) {
++		__direct_copy_from_user(val, ptr, size);
++		return 0;
++	}
++	ret = rw_vm((unsigned long)ptr, val, size, 0);
++	if (ret)
++		/*
++		 * Zero the rest:
++		 */
++		memset(val + size - ret, 0, ret);
++	return ret;
++}
++
++/*
++ * Copies memory from kernelspace (val) into userspace (ptr).
++ *
++ * returns # of bytes not copied.
++ */
++int put_user_size(unsigned int size, const void *val, void *ptr)
++{
++	if (unlikely(segment_eq(get_fs(), KERNEL_DS))) {
++		__direct_copy_to_user(ptr, val, size);
++		return 0;
++	}
++	return rw_vm((unsigned long)ptr, (void *)val, size, 1);
++}
++
++int copy_str_fromuser_size(unsigned int size, void *val, const void *ptr)
++{
++	int copied, left;
++
++	if (unlikely(segment_eq(get_fs(), KERNEL_DS))) {
++		left = strncpy_count(val, ptr, size);
++		copied = size - left;
++		BUG_ON(copied < 0);
++
++		return copied;
++	}
++	left = str_vm((unsigned long)ptr, val, size, 1);
++	if (left < 0)
++		return left;
++	copied = size - left;
++	BUG_ON(copied < 0);
++
++	return copied;
++}
++
++int strlen_fromuser_size(unsigned int size, const void *ptr)
++{
++	int copied, left;
++
++	if (unlikely(segment_eq(get_fs(), KERNEL_DS))) {
++		copied = strnlen(ptr, size) + 1;
++		BUG_ON(copied < 0);
++
++		return copied;
++	}
++	left = str_vm((unsigned long)ptr, NULL, size, 0);
++	if (left < 0)
++		return 0;
++	copied = size - left + 1;
++	BUG_ON(copied < 0);
++
++	return copied;
++}
++
++int zero_user_size(unsigned int size, void *ptr)
++{
++	int left;
++
++	if (unlikely(segment_eq(get_fs(), KERNEL_DS))) {
++		memset(ptr, 0, size);
++		return 0;
++	}
++	left = str_vm((unsigned long)ptr, NULL, size, 2);
++	if (left < 0)
++		return size;
++	return left;
++}
++
++EXPORT_SYMBOL(get_user_size);
++EXPORT_SYMBOL(put_user_size);
++EXPORT_SYMBOL(zero_user_size);
++EXPORT_SYMBOL(copy_str_fromuser_size);
++EXPORT_SYMBOL(strlen_fromuser_size);
++
+--- linux-2.6.0-test6/mm/vmalloc.c	2003-08-22 19:23:42.000000000 -0700
++++ 25/mm/vmalloc.c	2003-10-05 00:33:25.000000000 -0700
+@@ -135,23 +135,23 @@ static int map_area_pmd(pmd_t *pmd, unsi
+ 
+ void unmap_vm_area(struct vm_struct *area)
+ {
+-	unsigned long address = VMALLOC_VMADDR(area->addr);
++	unsigned long address = (unsigned long) area->addr;
+ 	unsigned long end = (address + area->size);
+ 	pgd_t *dir;
+ 
+ 	dir = pgd_offset_k(address);
+-	flush_cache_all();
++	flush_cache_vunmap(address, end);
+ 	do {
+ 		unmap_area_pmd(dir, address, end - address);
+ 		address = (address + PGDIR_SIZE) & PGDIR_MASK;
+ 		dir++;
+ 	} while (address && (address < end));
+-	flush_tlb_kernel_range(VMALLOC_VMADDR(area->addr), end);
++	flush_tlb_kernel_range((unsigned long) area->addr, end);
+ }
+ 
+ int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
+ {
+-	unsigned long address = VMALLOC_VMADDR(area->addr);
++	unsigned long address = (unsigned long) area->addr;
+ 	unsigned long end = address + (area->size-PAGE_SIZE);
+ 	pgd_t *dir;
+ 	int err = 0;
+@@ -174,7 +174,7 @@ int map_vm_area(struct vm_struct *area, 
+ 	} while (address && (address < end));
+ 
+ 	spin_unlock(&init_mm.page_table_lock);
+-	flush_cache_all();
++	flush_cache_vmap((unsigned long) area->addr, end);
+ 	return err;
+ }
+ 
+--- linux-2.6.0-test6/net/802/fddi.c	2003-06-14 12:18:30.000000000 -0700
++++ 25/net/802/fddi.c	2003-10-05 00:33:25.000000000 -0700
+@@ -27,6 +27,7 @@
+  */
+  
+ #include <linux/config.h>
++#include <linux/module.h>
+ #include <asm/system.h>
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+@@ -163,3 +164,5 @@ unsigned short fddi_type_trans(struct sk
+ 
+ 	return(type);
+ }
++
++EXPORT_SYMBOL(fddi_type_trans);
+--- linux-2.6.0-test6/net/802/hippi.c	2003-06-14 12:18:21.000000000 -0700
++++ 25/net/802/hippi.c	2003-10-05 00:33:25.000000000 -0700
+@@ -20,6 +20,7 @@
+  *		2 of the License, or (at your option) any later version.
+  */
+ 
++#include <linux/module.h>
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/sched.h>
+@@ -151,3 +152,5 @@ unsigned short hippi_type_trans(struct s
+ 
+ 	return hip->snap.ethertype;
+ }
++
++EXPORT_SYMBOL(hippi_type_trans);
+--- linux-2.6.0-test6/net/802/p8023.c	2003-06-14 12:17:57.000000000 -0700
++++ 25/net/802/p8023.c	2003-10-05 00:33:25.000000000 -0700
+@@ -12,22 +12,24 @@
+  *	running raw 802.3 on different devices. Thankfully nobody else
+  *	has done anything like the old IPX.
+  */
+- 
++
++#include <linux/in.h>
++#include <linux/mm.h>
++#include <linux/module.h>
+ #include <linux/netdevice.h>
+ #include <linux/skbuff.h>
++
+ #include <net/datalink.h>
+-#include <linux/mm.h>
+-#include <linux/in.h>
+ 
+ /*
+  *	Place an 802.3 header on a packet. The driver will do the mac
+  *	addresses, we just need to give it the buffer length.
+  */
+- 
+-static int p8023_request(struct datalink_proto *dl, 
+-		struct sk_buff *skb, unsigned char *dest_node)
++static int p8023_request(struct datalink_proto *dl,
++			 struct sk_buff *skb, unsigned char *dest_node)
+ {
+-	struct net_device	*dev = skb->dev;
++	struct net_device *dev = skb->dev;
++
+ 	dev->hard_header(skb, dev, ETH_P_802_3, dest_node, NULL, skb->len);
+ 	return dev_queue_xmit(skb);
+ }
+@@ -35,16 +37,13 @@ static int p8023_request(struct datalink
+ /*
+  *	Create an 802.3 client. Note there can be only one 802.3 client
+  */
+- 
+ struct datalink_proto *make_8023_client(void)
+ {
+-	struct datalink_proto	*proto;
++	struct datalink_proto *proto = kmalloc(sizeof(*proto), GFP_ATOMIC);
+ 
+-	proto = (struct datalink_proto *) kmalloc(sizeof(*proto), GFP_ATOMIC);
+-	if (proto != NULL) 
+-	{
++	if (proto) {
+ 		proto->header_length = 0;
+-		proto->request = p8023_request;
++		proto->request	     = p8023_request;
+ 	}
+ 	return proto;
+ }
+@@ -52,10 +51,11 @@ struct datalink_proto *make_8023_client(
+ /*
+  *	Destroy the 802.3 client.
+  */
+- 
+ void destroy_8023_client(struct datalink_proto *dl)
+ {
+ 	if (dl)
+ 		kfree(dl);
+ }
+ 
++EXPORT_SYMBOL(destroy_8023_client);
++EXPORT_SYMBOL(make_8023_client);
+--- linux-2.6.0-test6/net/802/tr.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/net/802/tr.c	2003-10-05 00:33:25.000000000 -0700
+@@ -18,6 +18,7 @@
+ #include <asm/uaccess.h>
+ #include <asm/system.h>
+ #include <linux/config.h>
++#include <linux/module.h>
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/jiffies.h>
+@@ -600,3 +601,6 @@ static int __init rif_init(void)
+ }
+ 
+ module_init(rif_init);
++
++EXPORT_SYMBOL(tr_source_route);
++EXPORT_SYMBOL(tr_type_trans);
+--- /dev/null	2002-08-30 16:31:37.000000000 -0700
++++ 25/net/bridge/netfilter/ebt_limit.c	2003-10-05 00:33:25.000000000 -0700
+@@ -0,0 +1,104 @@
++/*
++ *  ebt_limit
++ *
++ *	Authors:
++ *	Tom Marshall <tommy@home.tig-grr.com>
++ *
++ *	Mostly copied from netfilter's ipt_limit.c, see that file for
++ *	more explanation
++ *
++ *  September, 2003
++ *
++ */
++
++#include <linux/netfilter_bridge/ebtables.h>
++#include <linux/netfilter_bridge/ebt_limit.h>
++#include <linux/module.h>
++
++#include <linux/netdevice.h>
++#include <linux/spinlock.h>
++
++static spinlock_t limit_lock = SPIN_LOCK_UNLOCKED;
++
++#define CREDITS_PER_JIFFY 128
++
++static int ebt_limit_match(const struct sk_buff *skb,
++   const struct net_device *in, const struct net_device *out,
++   const void *data, unsigned int datalen)
++{
++	struct ebt_limit_info *info = (struct ebt_limit_info *)data;
++	unsigned long now = jiffies;
++
++	spin_lock_bh(&limit_lock);
++	info->credit += (now - xchg(&info->prev, now)) * CREDITS_PER_JIFFY;
++	if (info->credit > info->credit_cap)
++		info->credit = info->credit_cap;
++
++	if (info->credit >= info->cost) {
++		/* We're not limited. */
++		info->credit -= info->cost;
++		spin_unlock_bh(&limit_lock);
++		return EBT_MATCH;
++	}
++
++	spin_unlock_bh(&limit_lock);
++	return EBT_NOMATCH;
++}
++
++/* Precision saver. */
++static u_int32_t
++user2credits(u_int32_t user)
++{
++	/* If multiplying would overflow... */
++	if (user > 0xFFFFFFFF / (HZ*CREDITS_PER_JIFFY))
++		/* Divide first. */
++		return (user / EBT_LIMIT_SCALE) * HZ * CREDITS_PER_JIFFY;
++
++	return (user * HZ * CREDITS_PER_JIFFY) / EBT_LIMIT_SCALE;
++}
++
++static int ebt_limit_check(const char *tablename, unsigned int hookmask,
++   const struct ebt_entry *e, void *data, unsigned int datalen)
++{
++	struct ebt_limit_info *info = (struct ebt_limit_info *)data;
++
++	if (datalen != EBT_ALIGN(sizeof(struct ebt_limit_info)))
++		return -EINVAL;
++
++	/* Check for overflow. */
++	if (info->burst == 0 ||
++	    user2credits(info->avg * info->burst) < user2credits(info->avg)) {
++		printk("Overflow in ebt_limit: %u/%u\n",
++			info->avg, info->burst);
++		return -EINVAL;
++	}
++
++	/* User avg in seconds * EBT_LIMIT_SCALE: convert to jiffies * 128. */
++	info->prev = jiffies;
++	info->credit = user2credits(info->avg * info->burst);
++	info->credit_cap = user2credits(info->avg * info->burst);
++	info->cost = user2credits(info->avg);
++	return 0;
++}
++
++static struct ebt_match ebt_limit_reg =
++{
++	.name		= EBT_LIMIT_MATCH,
++	.match		= ebt_limit_match,
++	.check		= ebt_limit_check,
++	.me		= THIS_MODULE,
++};
++
++static int __init init(void)
++{
++	return ebt_register_match(&ebt_limit_reg);
++}
++
++static void __exit fini(void)
++{
++	ebt_unregister_match(&ebt_limit_reg);
++}
++
++module_init(init);
++module_exit(fini);
++MODULE_LICENSE("GPL");
+--- linux-2.6.0-test6/net/bridge/netfilter/ebt_vlan.c	2003-07-27 12:14:40.000000000 -0700
++++ 25/net/bridge/netfilter/ebt_vlan.c	2003-10-05 00:33:25.000000000 -0700
+@@ -48,7 +48,7 @@ ebt_filter_vlan(const struct sk_buff *sk
+ 		const void *data, unsigned int datalen)
+ {
+ 	struct ebt_vlan_info *info = (struct ebt_vlan_info *) data;
+-	struct vlan_ethhdr frame;
++	struct vlan_hdr frame;
+ 
+ 	unsigned short TCI;	/* Whole TCI, given from parsed frame */
+ 	unsigned short id;	/* VLAN ID, given from frame TCI */
+--- linux-2.6.0-test6/net/bridge/netfilter/Kconfig	2003-09-27 18:57:47.000000000 -0700
++++ 25/net/bridge/netfilter/Kconfig	2003-10-05 00:33:25.000000000 -0700
+@@ -73,6 +73,17 @@ config BRIDGE_EBT_IP
+ 
+ 	  To compile it as a module, choose M here.  If unsure, say N.
+ 
++config BRIDGE_EBT_LIMIT
++	tristate "ebt: limit match support"
++	depends on BRIDGE_NF_EBTABLES
++	help
++	  This option adds the limit match, which allows you to control
++	  the rate at which a rule can be matched. This match is the
++	  equivalent of the iptables limit match.
++
++	  If you want to compile it as a module, say M here and read
++	  <file:Documentation/modules.txt>.  If unsure, say `N'.
++
+ config BRIDGE_EBT_MARK
+ 	tristate "ebt: mark filter support"
+ 	depends on BRIDGE_NF_EBTABLES
+--- linux-2.6.0-test6/net/bridge/netfilter/Makefile	2003-09-08 13:58:59.000000000 -0700
++++ 25/net/bridge/netfilter/Makefile	2003-10-05 00:33:25.000000000 -0700
+@@ -13,6 +13,7 @@ obj-$(CONFIG_BRIDGE_EBT_T_NAT) += ebtabl
+ obj-$(CONFIG_BRIDGE_EBT_802_3) += ebt_802_3.o
+ obj-$(CONFIG_BRIDGE_EBT_ARP) += ebt_arp.o
+ obj-$(CONFIG_BRIDGE_EBT_IP) += ebt_ip.o
++obj-$(CONFIG_BRIDGE_EBT_LIMIT) += ebt_limit.o
+ obj-$(CONFIG_BRIDGE_EBT_MARK) += ebt_mark_m.o
+ obj-$(CONFIG_BRIDGE_EBT_PKTTYPE) += ebt_pkttype.o
+ obj-$(CONFIG_BRIDGE_EBT_STP) += ebt_stp.o
+--- linux-2.6.0-test6/net/core/datagram.c	2003-06-14 12:18:24.000000000 -0700
++++ 25/net/core/datagram.c	2003-10-05 00:33:25.000000000 -0700
+@@ -33,6 +33,7 @@
+  *
+  */
+ 
++#include <linux/module.h>
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <asm/uaccess.h>
+@@ -485,3 +486,10 @@ unsigned int datagram_poll(struct file *
+ 
+ 	return mask;
+ }
++
++EXPORT_SYMBOL(datagram_poll);
++EXPORT_SYMBOL(skb_copy_and_csum_datagram_iovec);
++EXPORT_SYMBOL(skb_copy_datagram);
++EXPORT_SYMBOL(skb_copy_datagram_iovec);
++EXPORT_SYMBOL(skb_free_datagram);
++EXPORT_SYMBOL(skb_recv_datagram);
+--- linux-2.6.0-test6/net/core/dev.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/net/core/dev.c	2003-10-05 00:36:10.000000000 -0700
+@@ -111,6 +111,10 @@
+ #endif	/* CONFIG_NET_RADIO */
+ #include <asm/current.h>
+ 
++#ifdef CONFIG_KGDB
++#include <asm/kgdb.h>
++#endif
++
+ /* This define, if set, will randomly drop a packet when congestion
+  * is more than moderate.  It helps fairness in the multi-interface
+  * case when one of them is a hog, but it kills performance for the
+@@ -915,6 +919,8 @@ int unregister_netdevice_notifier(struct
+ 
+ /**
+  *	call_netdevice_notifiers - call all network notifier blocks
++ *      @val: value passed unmodified to notifier function
++ *      @v:   pointer passed unmodified to notifier function
+  *
+  *	Call all network notifier blocks.  Parameters and return value
+  *	are as for notifier_call_chain().
+@@ -1322,7 +1328,6 @@ static void sample_queue(unsigned long d
+ }
+ #endif
+ 
+-
+ /**
+  *	netif_rx	-	post buffer to the network code
+  *	@skb: buffer to post
+@@ -1347,6 +1352,21 @@ int netif_rx(struct sk_buff *skb)
+ 	struct softnet_data *queue;
+ 	unsigned long flags;
+ 
++#ifdef CONFIG_KGDB
++	/* See if kgdb_eth wants this packet */
++	if (!kgdb_net_interrupt(skb)) {
++		/* No.. if we're 'trapped' then junk it */
++		if (kgdb_eth_is_trapped()) {
++			kfree_skb(skb);
++			return NET_RX_DROP;
++		}
++	} else {
++		/* kgdb_eth ate the packet... drop it silently */
++		kfree_skb(skb);
++		return NET_RX_DROP;
++	}
++#endif
++
+ 	if (!skb->stamp.tv_sec)
+ 		do_gettimeofday(&skb->stamp);
+ 
+@@ -1488,6 +1508,18 @@ static void net_tx_action(struct softirq
+ 	}
+ }
+ 
++static __inline__ int deliver_skb(struct sk_buff *skb,
++				  struct packet_type *pt_prev, int last)
++{
++	if (unlikely(!pt_prev->data))
++		return deliver_to_old_ones(pt_prev, skb, last);
++	else {
++		atomic_inc(&skb->users);
++		return pt_prev->func(skb, skb->dev, pt_prev);
++	}
++}
++
++
+ #if defined(CONFIG_BRIDGE) || defined (CONFIG_BRIDGE_MODULE)
+ int (*br_handle_frame_hook)(struct sk_buff *skb);
+ 
+@@ -1495,15 +1527,8 @@ static __inline__ int handle_bridge(stru
+ 				     struct packet_type *pt_prev)
+ {
+ 	int ret = NET_RX_DROP;
+-
+-	if (pt_prev) {
+-		if (!pt_prev->data)
+-			ret = deliver_to_old_ones(pt_prev, skb, 0);
+-		else {
+-			atomic_inc(&skb->users);
+-			ret = pt_prev->func(skb, skb->dev, pt_prev);
+-		}
+-	}
++	if (pt_prev)
++		ret = deliver_skb(skb, pt_prev, 0);
+ 
+ 	return ret;
+ }
+@@ -1551,16 +1576,8 @@ int netif_receive_skb(struct sk_buff *sk
+ 	rcu_read_lock();
+ 	list_for_each_entry_rcu(ptype, &ptype_all, list) {
+ 		if (!ptype->dev || ptype->dev == skb->dev) {
+-			if (pt_prev) {
+-				if (!pt_prev->data) {
+-					ret = deliver_to_old_ones(pt_prev,
+-								  skb, 0);
+-				} else {
+-					atomic_inc(&skb->users);
+-					ret = pt_prev->func(skb, skb->dev,
+-							    pt_prev);
+-				}
+-			}
++			if (pt_prev) 
++				ret = deliver_skb(skb, pt_prev, 0);
+ 			pt_prev = ptype;
+ 		}
+ 	}
+@@ -1573,16 +1590,8 @@ int netif_receive_skb(struct sk_buff *sk
+ 	list_for_each_entry_rcu(ptype, &ptype_base[ntohs(type)&15], list) {
+ 		if (ptype->type == type &&
+ 		    (!ptype->dev || ptype->dev == skb->dev)) {
+-			if (pt_prev) {
+-				if (!pt_prev->data) {
+-					ret = deliver_to_old_ones(pt_prev,
+-								  skb, 0);
+-				} else {
+-					atomic_inc(&skb->users);
+-					ret = pt_prev->func(skb, skb->dev,
+-							    pt_prev);
+-				}
+-			}
++			if (pt_prev) 
++				ret = deliver_skb(skb, pt_prev, 0);
+ 			pt_prev = ptype;
+ 		}
+ 	}
+@@ -1637,8 +1646,8 @@ static int process_backlog(struct net_de
+ #ifdef CONFIG_NET_HW_FLOWCONTROL
+ 		if (queue->throttle &&
+ 		    queue->input_pkt_queue.qlen < no_cong_thresh ) {
++			queue->throttle = 0;
+ 			if (atomic_dec_and_test(&netdev_dropping)) {
+-				queue->throttle = 0;
+ 				netdev_wakeup();
+ 				break;
+ 			}
+@@ -3036,3 +3045,63 @@ out:
+ }
+ 
+ subsys_initcall(net_dev_init);
++
++EXPORT_SYMBOL(__dev_get);
++EXPORT_SYMBOL(__dev_get_by_flags);
++EXPORT_SYMBOL(__dev_get_by_index);
++EXPORT_SYMBOL(__dev_get_by_name);
++EXPORT_SYMBOL(__dev_remove_pack);
++EXPORT_SYMBOL(__skb_linearize);
++EXPORT_SYMBOL(call_netdevice_notifiers);
++EXPORT_SYMBOL(dev_add_pack);
++EXPORT_SYMBOL(dev_alloc);
++EXPORT_SYMBOL(dev_alloc_name);
++EXPORT_SYMBOL(dev_close);
++EXPORT_SYMBOL(dev_get_by_flags);
++EXPORT_SYMBOL(dev_get_by_index);
++EXPORT_SYMBOL(dev_get_by_name);
++EXPORT_SYMBOL(dev_getbyhwaddr);
++EXPORT_SYMBOL(dev_ioctl);
++EXPORT_SYMBOL(dev_new_index);
++EXPORT_SYMBOL(dev_open);
++EXPORT_SYMBOL(dev_queue_xmit);
++EXPORT_SYMBOL(dev_queue_xmit_nit);
++EXPORT_SYMBOL(dev_remove_pack);
++EXPORT_SYMBOL(dev_set_allmulti);
++EXPORT_SYMBOL(dev_set_promiscuity);
++EXPORT_SYMBOL(free_netdev);
++EXPORT_SYMBOL(netdev_boot_setup_check);
++EXPORT_SYMBOL(netdev_set_master);
++EXPORT_SYMBOL(netdev_state_change);
++EXPORT_SYMBOL(netif_receive_skb);
++EXPORT_SYMBOL(netif_rx);
++EXPORT_SYMBOL(register_gifconf);
++EXPORT_SYMBOL(register_netdevice);
++EXPORT_SYMBOL(register_netdevice_notifier);
++EXPORT_SYMBOL(skb_checksum_help);
++EXPORT_SYMBOL(synchronize_net);
++EXPORT_SYMBOL(unregister_netdevice);
++EXPORT_SYMBOL(unregister_netdevice_notifier);
++
++#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
++EXPORT_SYMBOL(br_handle_frame_hook);
++#endif
++/* for 801q VLAN support */
++#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
++EXPORT_SYMBOL(dev_change_flags);
++#endif
++#ifdef CONFIG_KMOD
++EXPORT_SYMBOL(dev_load);
++#endif
++#ifdef CONFIG_NET_HW_FLOWCONTROL
++EXPORT_SYMBOL(netdev_dropping);
++EXPORT_SYMBOL(netdev_fc_xoff);
++EXPORT_SYMBOL(netdev_register_fc);
++EXPORT_SYMBOL(netdev_unregister_fc);
++#endif
++#ifdef CONFIG_NET_FASTROUTE
++EXPORT_SYMBOL(netdev_fastroute);
++EXPORT_SYMBOL(netdev_fastroute_obstacles);
++#endif
++
++EXPORT_PER_CPU_SYMBOL(softnet_data);
+--- linux-2.6.0-test6/net/core/dev_mcast.c	2003-06-14 12:18:06.000000000 -0700
++++ 25/net/core/dev_mcast.c	2003-10-05 00:33:25.000000000 -0700
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include <linux/config.h> 
++#include <linux/module.h> 
+ #include <asm/uaccess.h>
+ #include <asm/system.h>
+ #include <asm/bitops.h>
+@@ -273,3 +274,6 @@ void __init dev_mcast_init(void)
+ #endif
+ }
+ 
++EXPORT_SYMBOL(dev_mc_add);
++EXPORT_SYMBOL(dev_mc_delete);
++EXPORT_SYMBOL(dev_mc_upload);
+--- linux-2.6.0-test6/net/core/dst.c	2003-06-14 12:18:23.000000000 -0700
++++ 25/net/core/dst.c	2003-10-05 00:33:25.000000000 -0700
+@@ -6,15 +6,16 @@
+  */
+ 
+ #include <linux/bitops.h>
+-#include <linux/types.h>
++#include <linux/errno.h>
++#include <linux/init.h>
+ #include <linux/kernel.h>
+-#include <linux/sched.h>
+ #include <linux/mm.h>
+-#include <linux/string.h>
+-#include <linux/errno.h>
++#include <linux/module.h>
+ #include <linux/netdevice.h>
++#include <linux/sched.h>
+ #include <linux/skbuff.h>
+-#include <linux/init.h>
++#include <linux/string.h>
++#include <linux/types.h>
+ 
+ #include <net/dst.h>
+ 
+@@ -257,3 +258,7 @@ void __init dst_init(void)
+ {
+ 	register_netdevice_notifier(&dst_dev_notifier);
+ }
++
++EXPORT_SYMBOL(__dst_free);
++EXPORT_SYMBOL(dst_alloc);
++EXPORT_SYMBOL(dst_destroy);
+--- linux-2.6.0-test6/net/core/dv.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/net/core/dv.c	2003-10-05 00:33:25.000000000 -0700
+@@ -10,6 +10,7 @@
+  * 		Dave Miller:	improvement on the code (correctness, performance and source files)
+  *
+  */
++#include <linux/module.h>
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/sched.h>
+@@ -237,7 +238,7 @@ int divert_ioctl(unsigned int cmd, struc
+ 
+ 		default:
+ 			return -EINVAL;
+-		};
++		}
+ 
+ 		break;
+ 
+@@ -281,7 +282,7 @@ int divert_ioctl(unsigned int cmd, struc
+ 
+ 			default:
+ 				return -EINVAL;
+-			};
++			}
+ 
+ 			break;
+ 
+@@ -301,7 +302,7 @@ int divert_ioctl(unsigned int cmd, struc
+ 
+ 			default:
+ 				return -EINVAL;
+-			};
++			}
+ 
+ 			break;
+ 
+@@ -321,7 +322,7 @@ int divert_ioctl(unsigned int cmd, struc
+ 
+ 			default:
+ 				return -EINVAL;
+-			};
++			}
+ 
+ 			break;
+ 
+@@ -337,7 +338,7 @@ int divert_ioctl(unsigned int cmd, struc
+ 
+ 			default:
+ 				return -EINVAL;
+-			};
++			}
+ 
+ 			break;
+ 
+@@ -353,7 +354,7 @@ int divert_ioctl(unsigned int cmd, struc
+ 
+ 			default:
+ 				return -EINVAL;
+-			};
++			}
+ 
+ 			break;
+ 
+@@ -373,7 +374,7 @@ int divert_ioctl(unsigned int cmd, struc
+ 
+ 			default:
+ 				return -EINVAL;
+-			};
++			}
+ 
+ 			break;
+ 
+@@ -389,7 +390,7 @@ int divert_ioctl(unsigned int cmd, struc
+ 
+ 			default:
+ 				return -EINVAL;
+-			};
++			}
+ 
+ 			break;
+ 
+@@ -405,7 +406,7 @@ int divert_ioctl(unsigned int cmd, struc
+ 
+ 			default:
+ 				return -EINVAL;
+-			};
++			}
+ 
+ 			break;
+ 
+@@ -425,19 +426,19 @@ int divert_ioctl(unsigned int cmd, struc
+ 
+ 			default:
+ 				return -EINVAL;
+-			};
++			}
+ 
+ 			break;
+ 
+ 		default:
+ 			return -EINVAL;
+-		};
++		}
+ 
+ 		break;
+ 
+ 	default:
+ 		return -EINVAL;
+-	};
++	}
+ 
+ 	return 0;
+ }
+@@ -550,8 +551,8 @@ void divert_frame(struct sk_buff *skb)
+ 			}
+ 		}
+ 		break;
+-	};
+-
+-	return;
++	}
+ }
+ 
++EXPORT_SYMBOL(alloc_divert_blk);
++EXPORT_SYMBOL(free_divert_blk);
+--- linux-2.6.0-test6/net/core/ethtool.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/net/core/ethtool.c	2003-10-05 00:33:25.000000000 -0700
+@@ -9,6 +9,7 @@
+  * It's GPL, stupid.
+  */
+ 
++#include <linux/module.h>
+ #include <linux/types.h>
+ #include <linux/errno.h>
+ #include <linux/ethtool.h>
+@@ -727,3 +728,11 @@ int dev_ethtool(struct ifreq *ifr)
+ 		return dev->do_ioctl(dev, ifr, SIOCETHTOOL);
+ 	return -EOPNOTSUPP;
+ }
++
++EXPORT_SYMBOL(ethtool_op_get_link);
++EXPORT_SYMBOL(ethtool_op_get_sg);
++EXPORT_SYMBOL(ethtool_op_get_tso);
++EXPORT_SYMBOL(ethtool_op_get_tx_csum);
++EXPORT_SYMBOL(ethtool_op_set_sg);
++EXPORT_SYMBOL(ethtool_op_set_tso);
++EXPORT_SYMBOL(ethtool_op_set_tx_csum);
+--- linux-2.6.0-test6/net/core/filter.c	2003-07-27 12:14:40.000000000 -0700
++++ 25/net/core/filter.c	2003-10-05 00:33:25.000000000 -0700
+@@ -424,3 +424,6 @@ int sk_attach_filter(struct sock_fprog *
+ 		sk_filter_release(sk, fp);
+ 	return err;
+ }
++
++EXPORT_SYMBOL(sk_chk_filter);
++EXPORT_SYMBOL(sk_run_filter);
+--- linux-2.6.0-test6/net/core/flow.c	2003-06-22 12:04:45.000000000 -0700
++++ 25/net/core/flow.c	2003-10-05 00:33:25.000000000 -0700
+@@ -5,6 +5,7 @@
+  */
+ 
+ #include <linux/kernel.h>
++#include <linux/module.h>
+ #include <linux/list.h>
+ #include <linux/jhash.h>
+ #include <linux/interrupt.h>
+@@ -401,3 +402,6 @@ static int __init flow_cache_init(void)
+ }
+ 
+ module_init(flow_cache_init);
++
++EXPORT_SYMBOL(flow_cache_genid);
++EXPORT_SYMBOL(flow_cache_lookup);
+--- linux-2.6.0-test6/net/core/iovec.c	2003-06-14 12:18:52.000000000 -0700
++++ 25/net/core/iovec.c	2003-10-05 00:33:25.000000000 -0700
+@@ -16,8 +16,8 @@
+  *		Andi Kleen	:	Fix csum*fromiovecend for IPv6.
+  */
+ 
+-
+ #include <linux/errno.h>
++#include <linux/module.h>
+ #include <linux/sched.h>
+ #include <linux/kernel.h>
+ #include <linux/mm.h>
+@@ -254,3 +254,9 @@ out_fault:
+ 	err = -EFAULT;
+ 	goto out;
+ }
++
++EXPORT_SYMBOL(csum_partial_copy_fromiovecend);
++EXPORT_SYMBOL(memcpy_fromiovec);
++EXPORT_SYMBOL(memcpy_fromiovecend);
++EXPORT_SYMBOL(memcpy_toiovec);
++EXPORT_SYMBOL(memcpy_tokerneliovec);
+--- linux-2.6.0-test6/net/core/link_watch.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/net/core/link_watch.c	2003-10-05 00:33:25.000000000 -0700
+@@ -1,5 +1,5 @@
+ /*
+- * Linux network device link state notifaction
++ * Linux network device link state notification
+  *
+  * Author:
+  *     Stefan Rompf <sux@loplof.de>
+@@ -12,6 +12,7 @@
+  */
+ 
+ #include <linux/config.h>
++#include <linux/module.h>
+ #include <linux/netdevice.h>
+ #include <linux/if.h>
+ #include <linux/rtnetlink.h>
+@@ -132,3 +133,4 @@ void linkwatch_fire_event(struct net_dev
+ 	}
+ }
+ 
++EXPORT_SYMBOL(linkwatch_fire_event);
+--- linux-2.6.0-test6/net/core/neighbour.c	2003-08-22 19:23:42.000000000 -0700
++++ 25/net/core/neighbour.c	2003-10-05 00:33:25.000000000 -0700
+@@ -17,6 +17,7 @@
+ #include <linux/config.h>
+ #include <linux/types.h>
+ #include <linux/kernel.h>
++#include <linux/module.h>
+ #include <linux/socket.h>
+ #include <linux/sched.h>
+ #include <linux/netdevice.h>
+@@ -1683,3 +1684,34 @@ void neigh_sysctl_unregister(struct neig
+ }
+ 
+ #endif	/* CONFIG_SYSCTL */
++
++EXPORT_SYMBOL(__neigh_event_send);
++EXPORT_SYMBOL(neigh_add);
++EXPORT_SYMBOL(neigh_changeaddr);
++EXPORT_SYMBOL(neigh_compat_output);
++EXPORT_SYMBOL(neigh_connected_output);
++EXPORT_SYMBOL(neigh_create);
++EXPORT_SYMBOL(neigh_delete);
++EXPORT_SYMBOL(neigh_destroy);
++EXPORT_SYMBOL(neigh_dump_info);
++EXPORT_SYMBOL(neigh_event_ns);
++EXPORT_SYMBOL(neigh_ifdown);
++EXPORT_SYMBOL(neigh_lookup);
++EXPORT_SYMBOL(neigh_parms_alloc);
++EXPORT_SYMBOL(neigh_parms_release);
++EXPORT_SYMBOL(neigh_rand_reach_time);
++EXPORT_SYMBOL(neigh_resolve_output);
++EXPORT_SYMBOL(neigh_table_clear);
++EXPORT_SYMBOL(neigh_table_init);
++EXPORT_SYMBOL(neigh_update);
++EXPORT_SYMBOL(neigh_update_hhs);
++EXPORT_SYMBOL(pneigh_enqueue);
++EXPORT_SYMBOL(pneigh_lookup);
++
++#ifdef CONFIG_ARPD
++EXPORT_SYMBOL(neigh_app_ns);
++#endif
++#ifdef CONFIG_SYSCTL
++EXPORT_SYMBOL(neigh_sysctl_register);
++EXPORT_SYMBOL(neigh_sysctl_unregister);
++#endif
+--- linux-2.6.0-test6/net/core/netfilter.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/net/core/netfilter.c	2003-10-05 00:33:25.000000000 -0700
+@@ -759,3 +759,17 @@ void __init netfilter_init(void)
+ 			INIT_LIST_HEAD(&nf_hooks[i][h]);
+ 	}
+ }
++
++EXPORT_SYMBOL(ip_ct_attach);
++EXPORT_SYMBOL(ip_route_me_harder);
++EXPORT_SYMBOL(nf_getsockopt);
++EXPORT_SYMBOL(nf_hook_slow);
++EXPORT_SYMBOL(nf_hooks);
++EXPORT_SYMBOL(nf_register_hook);
++EXPORT_SYMBOL(nf_register_queue_handler);
++EXPORT_SYMBOL(nf_register_sockopt);
++EXPORT_SYMBOL(nf_reinject);
++EXPORT_SYMBOL(nf_setsockopt);
++EXPORT_SYMBOL(nf_unregister_hook);
++EXPORT_SYMBOL(nf_unregister_queue_handler);
++EXPORT_SYMBOL(nf_unregister_sockopt);
+--- linux-2.6.0-test6/net/core/rtnetlink.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/net/core/rtnetlink.c	2003-10-05 00:33:25.000000000 -0700
+@@ -18,6 +18,7 @@
+ 
+ #include <linux/config.h>
+ #include <linux/errno.h>
++#include <linux/module.h>
+ #include <linux/types.h>
+ #include <linux/socket.h>
+ #include <linux/kernel.h>
+@@ -556,7 +557,6 @@ struct notifier_block rtnetlink_dev_noti
+ 	.notifier_call	= rtnetlink_event,
+ };
+ 
+-
+ void __init rtnetlink_init(void)
+ {
+ 	rtnl = netlink_kernel_create(NETLINK_ROUTE, rtnetlink_rcv);
+@@ -567,3 +567,13 @@ void __init rtnetlink_init(void)
+ 	rtnetlink_links[PF_UNSPEC] = link_rtnetlink_table;
+ 	rtnetlink_links[PF_PACKET] = link_rtnetlink_table;
+ }
++
++EXPORT_SYMBOL(__rta_fill);
++EXPORT_SYMBOL(rtattr_parse);
++EXPORT_SYMBOL(rtnetlink_dump_ifinfo);
++EXPORT_SYMBOL(rtnetlink_links);
++EXPORT_SYMBOL(rtnetlink_put_metrics);
++EXPORT_SYMBOL(rtnl);
++EXPORT_SYMBOL(rtnl_lock);
++EXPORT_SYMBOL(rtnl_sem);
++EXPORT_SYMBOL(rtnl_unlock);
+--- linux-2.6.0-test6/net/core/scm.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/net/core/scm.c	2003-10-05 00:33:25.000000000 -0700
+@@ -9,6 +9,7 @@
+  *		2 of the License, or (at your option) any later version.
+  */
+ 
++#include <linux/module.h>
+ #include <linux/signal.h>
+ #include <linux/errno.h>
+ #include <linux/sched.h>
+@@ -282,3 +283,9 @@ struct scm_fp_list *scm_fp_dup(struct sc
+ 	}
+ 	return new_fpl;
+ }
++
++EXPORT_SYMBOL(__scm_destroy);
++EXPORT_SYMBOL(__scm_send);
++EXPORT_SYMBOL(put_cmsg);
++EXPORT_SYMBOL(scm_detach_fds);
++EXPORT_SYMBOL(scm_fp_dup);
+--- linux-2.6.0-test6/net/core/skbuff.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/net/core/skbuff.c	2003-10-05 00:33:25.000000000 -0700
+@@ -39,6 +39,7 @@
+  */
+ 
+ #include <linux/config.h>
++#include <linux/module.h>
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/sched.h>
+@@ -1103,3 +1104,22 @@ void __init skb_init(void)
+ 	if (!skbuff_head_cache)
+ 		panic("cannot create skbuff cache");
+ }
++
++EXPORT_SYMBOL(___pskb_trim);
++EXPORT_SYMBOL(__kfree_skb);
++EXPORT_SYMBOL(__pskb_pull_tail);
++EXPORT_SYMBOL(alloc_skb);
++EXPORT_SYMBOL(pskb_copy);
++EXPORT_SYMBOL(pskb_expand_head);
++EXPORT_SYMBOL(skb_checksum);
++EXPORT_SYMBOL(skb_clone);
++EXPORT_SYMBOL(skb_clone_fraglist);
++EXPORT_SYMBOL(skb_copy);
++EXPORT_SYMBOL(skb_copy_and_csum_bits);
++EXPORT_SYMBOL(skb_copy_and_csum_dev);
++EXPORT_SYMBOL(skb_copy_bits);
++EXPORT_SYMBOL(skb_copy_expand);
++EXPORT_SYMBOL(skb_over_panic);
++EXPORT_SYMBOL(skb_pad);
++EXPORT_SYMBOL(skb_realloc_headroom);
++EXPORT_SYMBOL(skb_under_panic);
+--- linux-2.6.0-test6/net/core/sock.c	2003-06-14 12:18:29.000000000 -0700
++++ 25/net/core/sock.c	2003-10-05 00:33:25.000000000 -0700
+@@ -98,6 +98,7 @@
+ #include <linux/in.h>
+ #include <linux/kernel.h>
+ #include <linux/major.h>
++#include <linux/module.h>
+ #include <linux/sched.h>
+ #include <linux/timer.h>
+ #include <linux/string.h>
+@@ -1111,3 +1112,40 @@ void sock_init_data(struct socket *sock,
+ 
+ 	atomic_set(&sk->sk_refcnt, 1);
+ }
++
++EXPORT_SYMBOL(__lock_sock);
++EXPORT_SYMBOL(__release_sock);
++EXPORT_SYMBOL(sk_alloc);
++EXPORT_SYMBOL(sk_free);
++EXPORT_SYMBOL(sk_send_sigurg);
++EXPORT_SYMBOL(sock_alloc_send_pskb);
++EXPORT_SYMBOL(sock_alloc_send_skb);
++EXPORT_SYMBOL(sock_getsockopt);
++EXPORT_SYMBOL(sock_init_data);
++EXPORT_SYMBOL(sock_kfree_s);
++EXPORT_SYMBOL(sock_kmalloc);
++EXPORT_SYMBOL(sock_no_accept);
++EXPORT_SYMBOL(sock_no_bind);
++EXPORT_SYMBOL(sock_no_connect);
++EXPORT_SYMBOL(sock_no_getname);
++EXPORT_SYMBOL(sock_no_getsockopt);
++EXPORT_SYMBOL(sock_no_ioctl);
++EXPORT_SYMBOL(sock_no_listen);
++EXPORT_SYMBOL(sock_no_mmap);
++EXPORT_SYMBOL(sock_no_poll);
++EXPORT_SYMBOL(sock_no_recvmsg);
++EXPORT_SYMBOL(sock_no_release);
++EXPORT_SYMBOL(sock_no_sendmsg);
++EXPORT_SYMBOL(sock_no_sendpage);
++EXPORT_SYMBOL(sock_no_setsockopt);
++EXPORT_SYMBOL(sock_no_shutdown);
++EXPORT_SYMBOL(sock_no_socketpair);
++EXPORT_SYMBOL(sock_rfree);
++EXPORT_SYMBOL(sock_rmalloc);
++EXPORT_SYMBOL(sock_setsockopt);
++EXPORT_SYMBOL(sock_wfree);
++EXPORT_SYMBOL(sock_wmalloc);
++#ifdef CONFIG_SYSCTL
++EXPORT_SYMBOL(sysctl_rmem_max);
++EXPORT_SYMBOL(sysctl_wmem_max);
++#endif
+--- linux-2.6.0-test6/net/core/utils.c	2003-06-14 12:17:55.000000000 -0700
++++ 25/net/core/utils.c	2003-10-05 00:33:25.000000000 -0700
+@@ -13,13 +13,15 @@
+  *      2 of the License, or (at your option) any later version.
+  */
+ 
+-#include <asm/uaccess.h>
+-#include <asm/system.h>
+-#include <linux/types.h>
+-#include <linux/kernel.h>
++#include <linux/module.h>
+ #include <linux/jiffies.h>
+-#include <linux/string.h>
++#include <linux/kernel.h>
+ #include <linux/mm.h>
++#include <linux/string.h>
++#include <linux/types.h>
++
++#include <asm/system.h>
++#include <asm/uaccess.h>
+ 
+ static unsigned long net_rand_seed = 152L;
+ 
+@@ -71,3 +73,7 @@ int net_ratelimit(void)
+ 	spin_unlock_irqrestore(&ratelimit_lock, flags);
+ 	return 0;
+ }
++
++EXPORT_SYMBOL(net_random);
++EXPORT_SYMBOL(net_ratelimit);
++EXPORT_SYMBOL(net_srandom);
+--- linux-2.6.0-test6/net/core/wireless.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/net/core/wireless.c	2003-10-05 00:33:25.000000000 -0700
+@@ -1365,3 +1365,10 @@ void wireless_spy_update(struct net_devi
+ #endif /* IW_WIRELESS_THRSPY */
+ #endif /* IW_WIRELESS_SPY */
+ }
++
++EXPORT_SYMBOL(iw_handler_get_spy);
++EXPORT_SYMBOL(iw_handler_get_thrspy);
++EXPORT_SYMBOL(iw_handler_set_spy);
++EXPORT_SYMBOL(iw_handler_set_thrspy);
++EXPORT_SYMBOL(wireless_send_event);
++EXPORT_SYMBOL(wireless_spy_update);
+--- linux-2.6.0-test6/net/ethernet/eth.c	2003-06-22 12:04:45.000000000 -0700
++++ 25/net/ethernet/eth.c	2003-10-05 00:33:25.000000000 -0700
+@@ -37,6 +37,7 @@
+  *		as published by the Free Software Foundation; either version
+  *		2 of the License, or (at your option) any later version.
+  */
++#include <linux/module.h>
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/sched.h>
+@@ -241,3 +242,5 @@ void eth_header_cache_update(struct hh_c
+ 	memcpy(((u8*)hh->hh_data) + HH_DATA_OFF(sizeof(struct ethhdr)),
+ 	       haddr, dev->addr_len);
+ }
++
++EXPORT_SYMBOL(eth_type_trans);
+--- linux-2.6.0-test6/net/ethernet/pe2.c	2003-06-14 12:18:51.000000000 -0700
++++ 25/net/ethernet/pe2.c	2003-10-05 00:33:25.000000000 -0700
+@@ -1,27 +1,28 @@
++#include <linux/in.h>
++#include <linux/mm.h>
++#include <linux/module.h>
+ #include <linux/netdevice.h>
+ #include <linux/skbuff.h>
++
+ #include <net/datalink.h>
+-#include <linux/mm.h>
+-#include <linux/in.h>
+ 
+-static int pEII_request(struct datalink_proto *dl, 
+-		struct sk_buff *skb, unsigned char *dest_node)
++static int pEII_request(struct datalink_proto *dl,
++			struct sk_buff *skb, unsigned char *dest_node)
+ {
+-	struct net_device	*dev = skb->dev;
++	struct net_device *dev = skb->dev;
+ 
+-	skb->protocol = htons (ETH_P_IPX);
+-	if(dev->hard_header)
+-		dev->hard_header(skb, dev, ETH_P_IPX, dest_node, NULL, skb->len);
++	skb->protocol = htons(ETH_P_IPX);
++	if (dev->hard_header)
++		dev->hard_header(skb, dev, ETH_P_IPX,
++				 dest_node, NULL, skb->len);
+ 	return dev_queue_xmit(skb);
+ }
+ 
+-struct datalink_proto *
+-make_EII_client(void)
++struct datalink_proto *make_EII_client(void)
+ {
+-	struct datalink_proto	*proto;
++	struct datalink_proto *proto = kmalloc(sizeof(*proto), GFP_ATOMIC);
+ 
+-	proto = (struct datalink_proto *) kmalloc(sizeof(*proto), GFP_ATOMIC);
+-	if (proto != NULL) {
++	if (proto) {
+ 		proto->header_length = 0;
+ 		proto->request = pEII_request;
+ 	}
+@@ -34,3 +35,6 @@ void destroy_EII_client(struct datalink_
+ 	if (dl)
+ 		kfree(dl);
+ }
++
++EXPORT_SYMBOL(destroy_EII_client);
++EXPORT_SYMBOL(make_EII_client);
+--- linux-2.6.0-test6/net/ipv4/af_inet.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/net/ipv4/af_inet.c	2003-10-05 00:33:25.000000000 -0700
+@@ -74,6 +74,7 @@
+ #include <linux/in.h>
+ #include <linux/kernel.h>
+ #include <linux/major.h>
++#include <linux/module.h>
+ #include <linux/sched.h>
+ #include <linux/timer.h>
+ #include <linux/string.h>
+@@ -1246,4 +1247,33 @@ int __init ipv4_proc_init(void)
+ 	return 0;
+ }
+ #endif /* CONFIG_PROC_FS */
++
+ MODULE_ALIAS_NETPROTO(PF_INET);
++
++EXPORT_SYMBOL(inet_accept);
++EXPORT_SYMBOL(inet_bind);
++EXPORT_SYMBOL(inet_dgram_connect);
++EXPORT_SYMBOL(inet_dgram_ops);
++EXPORT_SYMBOL(inet_family_ops);
++EXPORT_SYMBOL(inet_getname);
++EXPORT_SYMBOL(inet_getsockopt);
++EXPORT_SYMBOL(inet_ioctl);
++EXPORT_SYMBOL(inet_listen);
++EXPORT_SYMBOL(inet_recvmsg);
++EXPORT_SYMBOL(inet_register_protosw);
++EXPORT_SYMBOL(inet_release);
++EXPORT_SYMBOL(inet_sendmsg);
++EXPORT_SYMBOL(inet_setsockopt);
++EXPORT_SYMBOL(inet_shutdown);
++EXPORT_SYMBOL(inet_sock_destruct);
++EXPORT_SYMBOL(inet_sock_release);
++EXPORT_SYMBOL(inet_stream_connect);
++EXPORT_SYMBOL(inet_stream_ops);
++EXPORT_SYMBOL(inet_unregister_protosw);
++EXPORT_SYMBOL(net_statistics);
++EXPORT_SYMBOL(tcp_protocol);
++EXPORT_SYMBOL(udp_protocol);
++
++#ifdef INET_REFCNT_DEBUG
++EXPORT_SYMBOL(inet_sock_nr);
++#endif
+--- linux-2.6.0-test6/net/ipv4/arp.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/net/ipv4/arp.c	2003-10-05 00:33:25.000000000 -0700
+@@ -69,6 +69,7 @@
+  *		Arnaldo C. Melo :	convert /proc/net/arp to seq_file
+  */
+ 
++#include <linux/module.h>
+ #include <linux/types.h>
+ #include <linux/string.h>
+ #include <linux/kernel.h>
+@@ -630,12 +631,6 @@ int arp_process(struct sk_buff *skb)
+ 	if (in_dev == NULL)
+ 		goto out;
+ 
+-	/* ARP header, plus 2 device addresses, plus 2 IP addresses.  */
+-	if (!pskb_may_pull(skb, (sizeof(struct arphdr) +
+-				 (2 * dev->addr_len) +
+-				 (2 * sizeof(u32)))))
+-		goto out;
+-
+ 	arp = skb->nh.arph;
+ 
+ 	switch (dev_type) {
+@@ -835,8 +830,15 @@ out:
+ 
+ int arp_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt)
+ {
+-	struct arphdr *arp = skb->nh.arph;
++	struct arphdr *arp;
++
++	/* ARP header, plus 2 device addresses, plus 2 IP addresses.  */
++	if (!pskb_may_pull(skb, (sizeof(struct arphdr) +
++				 (2 * dev->addr_len) +
++				 (2 * sizeof(u32)))))
++		goto freeskb;
+ 
++	arp = skb->nh.arph;
+ 	if (arp->ar_hln != dev->addr_len ||
+ 	    dev->flags & IFF_NOARP ||
+ 	    skb->pkt_type == PACKET_OTHERHOST ||
+@@ -1429,3 +1431,13 @@ static int __init arp_proc_init(void)
+ }
+ 
+ #endif /* CONFIG_PROC_FS */
++
++EXPORT_SYMBOL(arp_broken_ops);
++EXPORT_SYMBOL(arp_find);
++EXPORT_SYMBOL(arp_rcv);
++EXPORT_SYMBOL(arp_send);
++EXPORT_SYMBOL(arp_tbl);
++
++#if defined(CONFIG_ATM_CLIP) || defined(CONFIG_ATM_CLIP_MODULE)
++EXPORT_SYMBOL(clip_tbl_hook);
++#endif
+--- linux-2.6.0-test6/net/ipv4/devinet.c	2003-08-22 19:23:42.000000000 -0700
++++ 25/net/ipv4/devinet.c	2003-10-05 00:33:25.000000000 -0700
+@@ -32,6 +32,7 @@
+ #include <asm/uaccess.h>
+ #include <asm/system.h>
+ #include <asm/bitops.h>
++#include <linux/module.h>
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/sched.h>
+@@ -1354,3 +1355,11 @@ void __init devinet_init(void)
+ 	devinet_sysctl_register(NULL, &ipv4_devconf_dflt);
+ #endif
+ }
++
++EXPORT_SYMBOL(devinet_ioctl);
++EXPORT_SYMBOL(in_dev_finish_destroy);
++EXPORT_SYMBOL(inet_select_addr);
++EXPORT_SYMBOL(inetdev_by_index);
++EXPORT_SYMBOL(inetdev_lock);
++EXPORT_SYMBOL(register_inetaddr_notifier);
++EXPORT_SYMBOL(unregister_inetaddr_notifier);
+--- linux-2.6.0-test6/net/ipv4/fib_frontend.c	2003-06-14 12:18:51.000000000 -0700
++++ 25/net/ipv4/fib_frontend.c	2003-10-05 00:33:25.000000000 -0700
+@@ -16,6 +16,7 @@
+  */
+ 
+ #include <linux/config.h>
++#include <linux/module.h>
+ #include <asm/uaccess.h>
+ #include <asm/system.h>
+ #include <asm/bitops.h>
+@@ -605,3 +606,6 @@ void __init ip_fib_init(void)
+ 	register_inetaddr_notifier(&fib_inetaddr_notifier);
+ }
+ 
++EXPORT_SYMBOL(inet_addr_type);
++EXPORT_SYMBOL(ip_dev_find);
++EXPORT_SYMBOL(ip_rt_ioctl);
+--- linux-2.6.0-test6/net/ipv4/icmp.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/net/ipv4/icmp.c	2003-10-05 00:33:25.000000000 -0700
+@@ -65,6 +65,7 @@
+  */
+ 
+ #include <linux/config.h>
++#include <linux/module.h>
+ #include <linux/types.h>
+ #include <linux/jiffies.h>
+ #include <linux/kernel.h>
+@@ -1126,3 +1127,8 @@ void __init icmp_init(struct net_proto_f
+ 		per_cpu(__icmp_socket, i)->sk->sk_prot->unhash(per_cpu(__icmp_socket, i)->sk);
+ 	}
+ }
++
++EXPORT_SYMBOL(icmp_err_convert);
++EXPORT_SYMBOL(icmp_send);
++EXPORT_SYMBOL(icmp_statistics);
++EXPORT_SYMBOL(xrlim_allow);
+--- linux-2.6.0-test6/net/ipv4/igmp.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/net/ipv4/igmp.c	2003-10-05 00:33:25.000000000 -0700
+@@ -72,8 +72,8 @@
+  *					Vinay Kulkarni
+  */
+ 
+-
+ #include <linux/config.h>
++#include <linux/module.h>
+ #include <asm/uaccess.h>
+ #include <asm/system.h>
+ #include <linux/types.h>
+@@ -2438,3 +2438,6 @@ int __init igmp_mc_proc_init(void)
+ }
+ #endif
+ 
++EXPORT_SYMBOL(ip_mc_dec_group);
++EXPORT_SYMBOL(ip_mc_inc_group);
++EXPORT_SYMBOL(ip_mc_join_group);
+--- linux-2.6.0-test6/net/ipv4/inetpeer.c	2003-06-14 12:18:33.000000000 -0700
++++ 25/net/ipv4/inetpeer.c	2003-10-05 00:33:25.000000000 -0700
+@@ -8,6 +8,7 @@
+  *  Authors:	Andrey V. Savochkin <saw@msu.ru>
+  */
+ 
++#include <linux/module.h>
+ #include <linux/types.h>
+ #include <linux/slab.h>
+ #include <linux/interrupt.h>
+@@ -452,3 +453,5 @@ static void peer_check_expire(unsigned l
+ 			peer_total / inet_peer_threshold * HZ;
+ 	add_timer(&peer_periodic_timer);
+ }
++
++EXPORT_SYMBOL(inet_peer_idlock);
+--- linux-2.6.0-test6/net/ipv4/ip_fragment.c	2003-06-14 12:18:05.000000000 -0700
++++ 25/net/ipv4/ip_fragment.c	2003-10-05 00:33:25.000000000 -0700
+@@ -23,6 +23,7 @@
+  */
+ 
+ #include <linux/config.h>
++#include <linux/module.h>
+ #include <linux/types.h>
+ #include <linux/mm.h>
+ #include <linux/jiffies.h>
+@@ -675,3 +676,5 @@ void ipfrag_init(void)
+ 	ipfrag_secret_timer.expires = jiffies + sysctl_ipfrag_secret_interval;
+ 	add_timer(&ipfrag_secret_timer);
+ }
++
++EXPORT_SYMBOL(ip_defrag);
+--- linux-2.6.0-test6/net/ipv4/ip_input.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/net/ipv4/ip_input.c	2003-10-05 00:33:25.000000000 -0700
+@@ -116,6 +116,7 @@
+  */
+ 
+ #include <asm/system.h>
++#include <linux/module.h>
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/string.h>
+@@ -432,3 +433,5 @@ out:
+         return NET_RX_DROP;
+ }
+ 
++EXPORT_SYMBOL(ip_rcv);
++EXPORT_SYMBOL(ip_statistics);
+--- linux-2.6.0-test6/net/ipv4/ipip.c	2003-08-22 19:23:42.000000000 -0700
++++ 25/net/ipv4/ipip.c	2003-10-05 00:33:25.000000000 -0700
+@@ -483,6 +483,11 @@ static int ipip_rcv(struct sk_buff *skb)
+ 
+ 	read_lock(&ipip_lock);
+ 	if ((tunnel = ipip_tunnel_lookup(iph->saddr, iph->daddr)) != NULL) {
++		if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
++			kfree_skb(skb);
++			return 0;
++		}
++
+ 		tunnel->stat.rx_packets++;
+ 		tunnel->stat.rx_bytes += skb->len;
+ 		skb->dev = tunnel->dev;
+--- linux-2.6.0-test6/net/ipv4/ip_options.c	2003-06-14 12:18:28.000000000 -0700
++++ 25/net/ipv4/ip_options.c	2003-10-05 00:33:25.000000000 -0700
+@@ -11,6 +11,7 @@
+  *		
+  */
+ 
++#include <linux/module.h>
+ #include <linux/types.h>
+ #include <asm/uaccess.h>
+ #include <linux/skbuff.h>
+@@ -617,3 +618,6 @@ int ip_options_rcv_srr(struct sk_buff *s
+ 	}
+ 	return 0;
+ }
++
++EXPORT_SYMBOL(ip_options_compile);
++EXPORT_SYMBOL(ip_options_undo);
+--- linux-2.6.0-test6/net/ipv4/ip_output.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/net/ipv4/ip_output.c	2003-10-05 00:33:25.000000000 -0700
+@@ -46,6 +46,7 @@
+ 
+ #include <asm/uaccess.h>
+ #include <asm/system.h>
++#include <linux/module.h>
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/sched.h>
+@@ -1317,3 +1318,13 @@ void __init ip_init(void)
+ 	igmp_mc_proc_init();
+ #endif
+ }
++
++EXPORT_SYMBOL(ip_finish_output);
++EXPORT_SYMBOL(ip_fragment);
++EXPORT_SYMBOL(ip_generic_getfrag);
++EXPORT_SYMBOL(ip_queue_xmit);
++EXPORT_SYMBOL(ip_send_check);
++
++#ifdef CONFIG_SYSCTL
++EXPORT_SYMBOL(sysctl_ip_default_ttl);
++#endif
+--- linux-2.6.0-test6/net/ipv4/ip_sockglue.c	2003-06-14 12:18:06.000000000 -0700
++++ 25/net/ipv4/ip_sockglue.c	2003-10-05 00:33:25.000000000 -0700
+@@ -18,6 +18,7 @@
+  */
+ 
+ #include <linux/config.h>
++#include <linux/module.h>
+ #include <linux/types.h>
+ #include <linux/mm.h>
+ #include <linux/sched.h>
+@@ -1055,3 +1056,10 @@ int ip_getsockopt(struct sock *sk, int l
+ 	}
+ 	return 0;
+ }
++
++EXPORT_SYMBOL(ip_cmsg_recv);
++
++#ifdef CONFIG_IP_SCTP_MODULE
++EXPORT_SYMBOL(ip_getsockopt);
++EXPORT_SYMBOL(ip_setsockopt);
++#endif
+--- linux-2.6.0-test6/net/ipv4/ipvs/ip_vs_lblc.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/net/ipv4/ipvs/ip_vs_lblc.c	2003-10-05 00:33:25.000000000 -0700
+@@ -458,10 +458,11 @@ __ip_vs_wlc_schedule(struct ip_vs_servic
+ 	 * The server with weight=0 is quiesced and will not receive any
+ 	 * new connection.
+ 	 */
+-	list_for_each_entry(least, &svc->destinations, n_list) {
+-		if (least->flags & IP_VS_DEST_F_OVERLOAD)
++	list_for_each_entry(dest, &svc->destinations, n_list) {
++		if (dest->flags & IP_VS_DEST_F_OVERLOAD)
+ 			continue;
+-		if (atomic_read(&least->weight) > 0) {
++		if (atomic_read(&dest->weight) > 0) {
++			least = dest;
+ 			loh = atomic_read(&least->activeconns) * 50
+ 				+ atomic_read(&least->inactconns);
+ 			goto nextstage;
+@@ -473,7 +474,7 @@ __ip_vs_wlc_schedule(struct ip_vs_servic
+ 	 *    Find the destination with the least load.
+ 	 */
+   nextstage:
+-	list_for_each_entry(dest, &svc->destinations, n_list) {
++	list_for_each_entry_continue(dest, &svc->destinations, n_list) {
+ 		if (dest->flags & IP_VS_DEST_F_OVERLOAD)
+ 			continue;
+ 
+--- linux-2.6.0-test6/net/ipv4/ipvs/ip_vs_lblcr.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/net/ipv4/ipvs/ip_vs_lblcr.c	2003-10-05 00:33:25.000000000 -0700
+@@ -711,11 +711,12 @@ __ip_vs_wlc_schedule(struct ip_vs_servic
+ 	 * The server with weight=0 is quiesced and will not receive any
+ 	 * new connection.
+ 	 */
+-	list_for_each_entry(least, &svc->destinations, n_list) {
+-		if (least->flags & IP_VS_DEST_F_OVERLOAD)
++	list_for_each_entry(dest, &svc->destinations, n_list) {
++		if (dest->flags & IP_VS_DEST_F_OVERLOAD)
+ 			continue;
+ 
+-		if (atomic_read(&least->weight) > 0) {
++		if (atomic_read(&dest->weight) > 0) {
++			least = dest;
+ 			loh = atomic_read(&least->activeconns) * 50
+ 				+ atomic_read(&least->inactconns);
+ 			goto nextstage;
+@@ -727,7 +728,7 @@ __ip_vs_wlc_schedule(struct ip_vs_servic
+ 	 *    Find the destination with the least load.
+ 	 */
+   nextstage:
+-	list_for_each_entry(dest, &svc->destinations, n_list) {
++	list_for_each_entry_continue(dest, &svc->destinations, n_list) {
+ 		if (dest->flags & IP_VS_DEST_F_OVERLOAD)
+ 			continue;
+ 
+--- linux-2.6.0-test6/net/ipv4/ipvs/ip_vs_lc.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/net/ipv4/ipvs/ip_vs_lc.c	2003-10-05 00:33:25.000000000 -0700
+@@ -65,8 +65,8 @@ ip_vs_lc_dest_overhead(struct ip_vs_dest
+ static struct ip_vs_dest *
+ ip_vs_lc_schedule(struct ip_vs_service *svc, struct iphdr *iph)
+ {
+-	struct ip_vs_dest *dest, *least;
+-	unsigned int loh, doh;
++	struct ip_vs_dest *dest, *least = NULL;
++	unsigned int loh = 0, doh;
+ 
+ 	IP_VS_DBG(6, "ip_vs_lc_schedule(): Scheduling...\n");
+ 
+@@ -79,31 +79,18 @@ ip_vs_lc_schedule(struct ip_vs_service *
+ 	 * served, but no new connection is assigned to the server.
+ 	 */
+ 
+-	list_for_each_entry(least, &svc->destinations, n_list) {
+-		if (least->flags & IP_VS_DEST_F_OVERLOAD)
+-			continue;
+-		if (atomic_read(&least->weight) > 0) {
+-			loh = ip_vs_lc_dest_overhead(least);
+-			goto nextstage;
+-		}
+-	}
+-	return NULL;
+-
+-	/*
+-	 *    Find the destination with the least load.
+-	 */
+-  nextstage:
+ 	list_for_each_entry(dest, &svc->destinations, n_list) {
+ 		if ((dest->flags & IP_VS_DEST_F_OVERLOAD) ||
+ 		    atomic_read(&dest->weight) == 0)
+ 			continue;
+ 		doh = ip_vs_lc_dest_overhead(dest);
+-		if (doh < loh) {
++		if (!least || doh < loh) {
+ 			least = dest;
+ 			loh = doh;
+ 		}
+ 	}
+ 
++	if (least)
+ 	IP_VS_DBG(6, "LC: server %u.%u.%u.%u:%u activeconns %d inactconns %d\n",
+ 		  NIPQUAD(least->addr), ntohs(least->port),
+ 		  atomic_read(&least->activeconns),
+--- linux-2.6.0-test6/net/ipv4/ipvs/ip_vs_nq.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/net/ipv4/ipvs/ip_vs_nq.c	2003-10-05 00:33:25.000000000 -0700
+@@ -81,8 +81,8 @@ ip_vs_nq_dest_overhead(struct ip_vs_dest
+ static struct ip_vs_dest *
+ ip_vs_nq_schedule(struct ip_vs_service *svc, struct iphdr *iph)
+ {
+-	struct ip_vs_dest *dest, *least;
+-	unsigned int loh, doh;
++	struct ip_vs_dest *dest, *least = NULL;
++	unsigned int loh = 0, doh;
+ 
+ 	IP_VS_DBG(6, "ip_vs_nq_schedule(): Scheduling...\n");
+ 
+@@ -99,27 +99,10 @@ ip_vs_nq_schedule(struct ip_vs_service *
+ 	 * new connections.
+ 	 */
+ 
+-	list_for_each_entry(least, &svc->destinations, n_list) {
+-		if (!(least->flags & IP_VS_DEST_F_OVERLOAD) &&
+-		    atomic_read(&least->weight) > 0) {
+-			loh = ip_vs_nq_dest_overhead(least);
+-
+-			/* return the server directly if it is idle */
+-			if (atomic_read(&least->activeconns) == 0)
+-				goto out;
+-
+-			goto nextstage;
+-		}
+-	}
+-	return NULL;
+-
+-	/*
+-	 *    Find the destination with the least load.
+-	 */
+-  nextstage:
+ 	list_for_each_entry(dest, &svc->destinations, n_list) {
+ 
+-		if (dest->flags & IP_VS_DEST_F_OVERLOAD)
++		if (dest->flags & IP_VS_DEST_F_OVERLOAD ||
++		    !atomic_read(&dest->weight))
+ 			continue;
+ 
+ 		doh = ip_vs_nq_dest_overhead(dest);
+@@ -127,16 +110,21 @@ ip_vs_nq_schedule(struct ip_vs_service *
+ 		/* return the server directly if it is idle */
+ 		if (atomic_read(&dest->activeconns) == 0) {
+ 			least = dest;
++			loh = doh;
+ 			goto out;
+ 		}
+ 
+-		if (loh * atomic_read(&dest->weight) >
+-		    doh * atomic_read(&least->weight)) {
++		if (!least ||
++		    (loh * atomic_read(&dest->weight) >
++		     doh * atomic_read(&least->weight))) {
+ 			least = dest;
+ 			loh = doh;
+ 		}
+ 	}
+ 
++	if (!least)
++		return NULL;
++
+   out:
+ 	IP_VS_DBG(6, "NQ: server %u.%u.%u.%u:%u "
+ 		  "activeconns %d refcnt %d weight %d overhead %d\n",
+--- linux-2.6.0-test6/net/ipv4/ipvs/ip_vs_sed.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/net/ipv4/ipvs/ip_vs_sed.c	2003-10-05 00:33:25.000000000 -0700
+@@ -103,9 +103,10 @@ ip_vs_sed_schedule(struct ip_vs_service 
+ 	 * new connections.
+ 	 */
+ 
+-	list_for_each_entry(least, &svc->destinations, n_list) {
+-		if (!(least->flags & IP_VS_DEST_F_OVERLOAD) &&
+-		    atomic_read(&least->weight) > 0) {
++	list_for_each_entry(dest, &svc->destinations, n_list) {
++		if (!(dest->flags & IP_VS_DEST_F_OVERLOAD) &&
++		    atomic_read(&dest->weight) > 0) {
++			least = dest;
+ 			loh = ip_vs_sed_dest_overhead(least);
+ 			goto nextstage;
+ 		}
+@@ -116,7 +117,7 @@ ip_vs_sed_schedule(struct ip_vs_service 
+ 	 *    Find the destination with the least load.
+ 	 */
+   nextstage:
+-	list_for_each_entry(dest, &svc->destinations, n_list) {
++	list_for_each_entry_continue(dest, &svc->destinations, n_list) {
+ 		if (dest->flags & IP_VS_DEST_F_OVERLOAD)
+ 			continue;
+ 		doh = ip_vs_sed_dest_overhead(dest);
+--- linux-2.6.0-test6/net/ipv4/ipvs/ip_vs_wlc.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/net/ipv4/ipvs/ip_vs_wlc.c	2003-10-05 00:33:25.000000000 -0700
+@@ -91,9 +91,10 @@ ip_vs_wlc_schedule(struct ip_vs_service 
+ 	 * new connections.
+ 	 */
+ 
+-	list_for_each_entry(least, &svc->destinations, n_list) {
+-		if (!(least->flags & IP_VS_DEST_F_OVERLOAD) &&
+-		    atomic_read(&least->weight) > 0) {
++	list_for_each_entry(dest, &svc->destinations, n_list) {
++		if (!(dest->flags & IP_VS_DEST_F_OVERLOAD) &&
++		    atomic_read(&dest->weight) > 0) {
++			least = dest;
+ 			loh = ip_vs_wlc_dest_overhead(least);
+ 			goto nextstage;
+ 		}
+@@ -104,7 +105,7 @@ ip_vs_wlc_schedule(struct ip_vs_service 
+ 	 *    Find the destination with the least load.
+ 	 */
+   nextstage:
+-	list_for_each_entry(dest, &svc->destinations, n_list) {
++	list_for_each_entry_continue(dest, &svc->destinations, n_list) {
+ 		if (dest->flags & IP_VS_DEST_F_OVERLOAD)
+ 			continue;
+ 		doh = ip_vs_wlc_dest_overhead(dest);
+--- linux-2.6.0-test6/net/ipv4/ipvs/ip_vs_wrr.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/net/ipv4/ipvs/ip_vs_wrr.c	2003-10-05 00:33:25.000000000 -0700
+@@ -58,26 +58,18 @@ static int ip_vs_wrr_gcd_weight(struct i
+ {
+ 	struct ip_vs_dest *dest;
+ 	int weight;
+-	int g = 1;
++	int g = 0;
+ 
+ 	list_for_each_entry(dest, &svc->destinations, n_list) {
+ 		weight = atomic_read(&dest->weight);
+ 		if (weight > 0) {
+-			g = weight;
+-			goto search_gcd;
++			if (g > 0)
++				g = gcd(weight, g);
++			else
++				g = weight;
+ 		}
+ 	}
+-
+-	return g;
+-
+- search_gcd:
+-	list_for_each_entry(dest, &svc->destinations, n_list) {
+-		weight = atomic_read(&dest->weight);
+-		if (weight > 0)
+-			g = gcd(weight, g);
+-	}
+-
+-	return g;
++	return g ? g : 1;
+ }
+ 
+ 
+--- linux-2.6.0-test6/net/ipv4/netfilter/ip_conntrack_core.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/net/ipv4/netfilter/ip_conntrack_core.c	2003-10-05 00:33:25.000000000 -0700
+@@ -59,7 +59,7 @@ LIST_HEAD(ip_conntrack_expect_list);
+ LIST_HEAD(protocol_list);
+ static LIST_HEAD(helpers);
+ unsigned int ip_conntrack_htable_size = 0;
+-static int ip_conntrack_max;
++int ip_conntrack_max;
+ static atomic_t ip_conntrack_count = ATOMIC_INIT(0);
+ struct list_head *ip_conntrack_hash;
+ static kmem_cache_t *ip_conntrack_cachep;
+@@ -301,7 +301,7 @@ clean_from_lists(struct ip_conntrack *ct
+ static void
+ destroy_conntrack(struct nf_conntrack *nfct)
+ {
+-	struct ip_conntrack *ct = (struct ip_conntrack *)nfct;
++	struct ip_conntrack *ct = (struct ip_conntrack *)nfct, *master = NULL;
+ 	struct ip_conntrack_protocol *proto;
+ 
+ 	DEBUGP("destroy_conntrack(%p)\n", ct);
+@@ -328,12 +328,15 @@ destroy_conntrack(struct nf_conntrack *n
+ 			/* can't call __unexpect_related here,
+ 			 * since it would screw up expect_list */
+ 			list_del(&ct->master->expected_list);
+-			ip_conntrack_put(ct->master->expectant);
++			master = ct->master->expectant;
+ 		}
+ 		kfree(ct->master);
+ 	}
+ 	WRITE_UNLOCK(&ip_conntrack_lock);
+ 
++	if (master)
++		ip_conntrack_put(master);
++
+ 	DEBUGP("destroy_conntrack: returning ct=%p to slab\n", ct);
+ 	kmem_cache_free(ip_conntrack_cachep, ct);
+ 	atomic_dec(&ip_conntrack_count);
+@@ -1276,11 +1279,14 @@ getorigdst(struct sock *sk, int optval, 
+ {
+ 	struct inet_opt *inet = inet_sk(sk);
+ 	struct ip_conntrack_tuple_hash *h;
+-	struct ip_conntrack_tuple tuple = { { inet->rcv_saddr,
+-						{ .tcp = { inet->sport } } },
+-					    { inet->daddr,
+-						{ .tcp = { inet->dport } },
+-					      IPPROTO_TCP } };
++	struct ip_conntrack_tuple tuple;
++	
++	IP_CT_TUPLE_U_BLANK(&tuple);
++	tuple.src.ip = inet->rcv_saddr;
++	tuple.src.u.tcp.port = inet->sport;
++	tuple.dst.ip = inet->daddr;
++	tuple.dst.u.tcp.port = inet->dport;
++	tuple.dst.protonum = IPPROTO_TCP;
+ 
+ 	/* We only do TCP at the moment: is there a better way? */
+ 	if (strcmp(sk->sk_prot->name, "TCP")) {
+@@ -1325,45 +1331,6 @@ static struct nf_sockopt_ops so_getorigd
+ 	.get		= &getorigdst,
+ };
+ 
+-#define NET_IP_CONNTRACK_MAX 2089
+-#define NET_IP_CONNTRACK_MAX_NAME "ip_conntrack_max"
+-
+-#ifdef CONFIG_SYSCTL
+-static struct ctl_table_header *ip_conntrack_sysctl_header;
+-
+-static ctl_table ip_conntrack_table[] = {
+-	{
+-		.ctl_name	= NET_IP_CONNTRACK_MAX,
+-		.procname	= NET_IP_CONNTRACK_MAX_NAME,
+-		.data		= &ip_conntrack_max,
+-		.maxlen		= sizeof(ip_conntrack_max),
+-		.mode		= 0644,
+-		.proc_handler	= proc_dointvec
+-	},
+- 	{ .ctl_name = 0 }
+-};
+-
+-static ctl_table ip_conntrack_dir_table[] = {
+-	{
+-		.ctl_name	= NET_IPV4,
+-		.procname	= "ipv4",
+-		.mode		= 0555,
+-		.child		= ip_conntrack_table
+-	},
+-	{ .ctl_name = 0 }
+-};
+-
+-static ctl_table ip_conntrack_root_table[] = {
+-	{
+-		.ctl_name	= CTL_NET,
+-		.procname	= "net",
+-		.mode		= 0555,
+-		.child		= ip_conntrack_dir_table
+-	},
+-	{ .ctl_name = 0 }
+-};
+-#endif /*CONFIG_SYSCTL*/
+-
+ static int kill_all(const struct ip_conntrack *i, void *data)
+ {
+ 	return 1;
+@@ -1373,9 +1340,6 @@ static int kill_all(const struct ip_conn
+    supposed to kill the mall. */
+ void ip_conntrack_cleanup(void)
+ {
+-#ifdef CONFIG_SYSCTL
+-	unregister_sysctl_table(ip_conntrack_sysctl_header);
+-#endif
+ 	ip_ct_attach = NULL;
+ 	/* This makes sure all current packets have passed through
+            netfilter framework.  Roll on, two-stage module
+@@ -1453,25 +1417,10 @@ int __init ip_conntrack_init(void)
+ 	for (i = 0; i < ip_conntrack_htable_size; i++)
+ 		INIT_LIST_HEAD(&ip_conntrack_hash[i]);
+ 
+-/* This is fucking braindead.  There is NO WAY of doing this without
+-   the CONFIG_SYSCTL unless you don't want to detect errors.
+-   Grrr... --RR */
+-#ifdef CONFIG_SYSCTL
+-	ip_conntrack_sysctl_header
+-		= register_sysctl_table(ip_conntrack_root_table, 0);
+-	if (ip_conntrack_sysctl_header == NULL) {
+-		goto err_free_ct_cachep;
+-	}
+-#endif /*CONFIG_SYSCTL*/
+-
+ 	/* For use by ipt_REJECT */
+ 	ip_ct_attach = ip_conntrack_attach;
+ 	return ret;
+ 
+-#ifdef CONFIG_SYSCTL
+-err_free_ct_cachep:
+-	kmem_cache_destroy(ip_conntrack_cachep);
+-#endif /*CONFIG_SYSCTL*/
+ err_free_hash:
+ 	vfree(ip_conntrack_hash);
+ err_unreg_sockopt:
+--- linux-2.6.0-test6/net/ipv4/netfilter/ip_conntrack_irc.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/net/ipv4/netfilter/ip_conntrack_irc.c	2003-10-05 00:33:25.000000000 -0700
+@@ -177,7 +177,10 @@ static int help(struct sk_buff *skb,
+ 			DEBUGP("DCC bound ip/port: %u.%u.%u.%u:%u\n",
+ 				HIPQUAD(dcc_ip), dcc_port);
+ 
+-			if (ct->tuplehash[dir].tuple.src.ip != htonl(dcc_ip)) {
++			/* dcc_ip can be the internal OR external (NAT'ed) IP
++			 * Tiago Sousa <mirage@kaotik.org> */
++			if (ct->tuplehash[dir].tuple.src.ip != htonl(dcc_ip)
++			    && ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.ip != htonl(dcc_ip)) {
+ 				if (net_ratelimit())
+ 					printk(KERN_WARNING
+ 						"Forged DCC command from "
+@@ -201,7 +204,7 @@ static int help(struct sk_buff *skb,
+ 
+ 			exp->tuple = ((struct ip_conntrack_tuple)
+ 				{ { 0, { 0 } },
+-				  { htonl(dcc_ip), { .tcp = { htons(dcc_port) } },
++				  { ct->tuplehash[dir].tuple.src.ip, { .tcp = { htons(dcc_port) } },
+ 				    IPPROTO_TCP }});
+ 			exp->mask = ((struct ip_conntrack_tuple)
+ 				{ { 0, { 0 } },
+--- linux-2.6.0-test6/net/ipv4/netfilter/ip_conntrack_proto_generic.c	2003-06-14 12:18:07.000000000 -0700
++++ 25/net/ipv4/netfilter/ip_conntrack_proto_generic.c	2003-10-05 00:33:25.000000000 -0700
+@@ -4,7 +4,7 @@
+ #include <linux/netfilter.h>
+ #include <linux/netfilter_ipv4/ip_conntrack_protocol.h>
+ 
+-#define GENERIC_TIMEOUT (600*HZ)
++unsigned long ip_ct_generic_timeout = 600*HZ;
+ 
+ static int generic_pkt_to_tuple(const struct sk_buff *skb,
+ 				unsigned int dataoff,
+@@ -44,7 +44,7 @@ static int packet(struct ip_conntrack *c
+ 		  const struct sk_buff *skb,
+ 		  enum ip_conntrack_info conntrackinfo)
+ {
+-	ip_ct_refresh(conntrack, GENERIC_TIMEOUT);
++	ip_ct_refresh(conntrack, ip_ct_generic_timeout);
+ 	return NF_ACCEPT;
+ }
+ 
+--- linux-2.6.0-test6/net/ipv4/netfilter/ip_conntrack_proto_icmp.c	2003-06-14 12:17:56.000000000 -0700
++++ 25/net/ipv4/netfilter/ip_conntrack_proto_icmp.c	2003-10-05 00:33:25.000000000 -0700
+@@ -6,7 +6,7 @@
+ #include <linux/icmp.h>
+ #include <linux/netfilter_ipv4/ip_conntrack_protocol.h>
+ 
+-#define ICMP_TIMEOUT (30*HZ)
++unsigned long ip_ct_icmp_timeout = 30*HZ;
+ 
+ #if 0
+ #define DEBUGP printk
+@@ -86,7 +86,7 @@ static int icmp_packet(struct ip_conntra
+ 			ct->timeout.function((unsigned long)ct);
+ 	} else {
+ 		atomic_inc(&ct->proto.icmp.count);
+-		ip_ct_refresh(ct, ICMP_TIMEOUT);
++		ip_ct_refresh(ct, ip_ct_icmp_timeout);
+ 	}
+ 
+ 	return NF_ACCEPT;
+--- linux-2.6.0-test6/net/ipv4/netfilter/ip_conntrack_proto_tcp.c	2003-06-14 12:18:51.000000000 -0700
++++ 25/net/ipv4/netfilter/ip_conntrack_proto_tcp.c	2003-10-05 00:33:25.000000000 -0700
+@@ -49,20 +49,28 @@ static const char *tcp_conntrack_names[]
+ #define HOURS * 60 MINS
+ #define DAYS * 24 HOURS
+ 
+-
+-static unsigned long tcp_timeouts[]
+-= { 30 MINS, 	/*	TCP_CONNTRACK_NONE,	*/
+-    5 DAYS,	/*	TCP_CONNTRACK_ESTABLISHED,	*/
+-    2 MINS,	/*	TCP_CONNTRACK_SYN_SENT,	*/
+-    60 SECS,	/*	TCP_CONNTRACK_SYN_RECV,	*/
+-    2 MINS,	/*	TCP_CONNTRACK_FIN_WAIT,	*/
+-    2 MINS,	/*	TCP_CONNTRACK_TIME_WAIT,	*/
+-    10 SECS,	/*	TCP_CONNTRACK_CLOSE,	*/
+-    60 SECS,	/*	TCP_CONNTRACK_CLOSE_WAIT,	*/
+-    30 SECS,	/*	TCP_CONNTRACK_LAST_ACK,	*/
+-    2 MINS,	/*	TCP_CONNTRACK_LISTEN,	*/
+-};
+-
++unsigned long ip_ct_tcp_timeout_syn_sent =      2 MINS;
++unsigned long ip_ct_tcp_timeout_syn_recv =     60 SECS;
++unsigned long ip_ct_tcp_timeout_established =   5 DAYS;
++unsigned long ip_ct_tcp_timeout_fin_wait =      2 MINS;
++unsigned long ip_ct_tcp_timeout_close_wait =    3 DAYS;
++unsigned long ip_ct_tcp_timeout_last_ack =     30 SECS;
++unsigned long ip_ct_tcp_timeout_time_wait =     2 MINS;
++unsigned long ip_ct_tcp_timeout_close =        10 SECS;
++
++static unsigned long * tcp_timeouts[]
++= { 0,                                 /*      TCP_CONNTRACK_NONE */
++    &ip_ct_tcp_timeout_established,    /*      TCP_CONNTRACK_ESTABLISHED,      */
++    &ip_ct_tcp_timeout_syn_sent,       /*      TCP_CONNTRACK_SYN_SENT, */
++    &ip_ct_tcp_timeout_syn_recv,       /*      TCP_CONNTRACK_SYN_RECV, */
++    &ip_ct_tcp_timeout_fin_wait,       /*      TCP_CONNTRACK_FIN_WAIT, */
++    &ip_ct_tcp_timeout_time_wait,      /*      TCP_CONNTRACK_TIME_WAIT,        */
++    &ip_ct_tcp_timeout_close,          /*      TCP_CONNTRACK_CLOSE,    */
++    &ip_ct_tcp_timeout_close_wait,     /*      TCP_CONNTRACK_CLOSE_WAIT,       */
++    &ip_ct_tcp_timeout_last_ack,       /*      TCP_CONNTRACK_LAST_ACK, */
++    0,                                 /*      TCP_CONNTRACK_LISTEN */
++ };
++ 
+ #define sNO TCP_CONNTRACK_NONE
+ #define sES TCP_CONNTRACK_ESTABLISHED
+ #define sSS TCP_CONNTRACK_SYN_SENT
+@@ -204,7 +212,7 @@ static int tcp_packet(struct ip_conntrac
+ 			set_bit(IPS_ASSURED_BIT, &conntrack->status);
+ 
+ 		WRITE_UNLOCK(&tcp_lock);
+-		ip_ct_refresh(conntrack, tcp_timeouts[newconntrack]);
++		ip_ct_refresh(conntrack, *tcp_timeouts[newconntrack]);
+ 	}
+ 
+ 	return NF_ACCEPT;
+--- linux-2.6.0-test6/net/ipv4/netfilter/ip_conntrack_proto_udp.c	2003-06-14 12:17:55.000000000 -0700
++++ 25/net/ipv4/netfilter/ip_conntrack_proto_udp.c	2003-10-05 00:33:25.000000000 -0700
+@@ -6,8 +6,8 @@
+ #include <linux/udp.h>
+ #include <linux/netfilter_ipv4/ip_conntrack_protocol.h>
+ 
+-#define UDP_TIMEOUT (30*HZ)
+-#define UDP_STREAM_TIMEOUT (180*HZ)
++unsigned long ip_ct_udp_timeout = 30*HZ;
++unsigned long ip_ct_udp_timeout_stream = 180*HZ;
+ 
+ static int udp_pkt_to_tuple(const struct sk_buff *skb,
+ 			     unsigned int dataoff,
+@@ -57,11 +57,11 @@ static int udp_packet(struct ip_conntrac
+ 	/* If we've seen traffic both ways, this is some kind of UDP
+ 	   stream.  Extend timeout. */
+ 	if (test_bit(IPS_SEEN_REPLY_BIT, &conntrack->status)) {
+-		ip_ct_refresh(conntrack, UDP_STREAM_TIMEOUT);
++		ip_ct_refresh(conntrack, ip_ct_udp_timeout_stream);
+ 		/* Also, more likely to be important, and not a probe */
+ 		set_bit(IPS_ASSURED_BIT, &conntrack->status);
+ 	} else
+-		ip_ct_refresh(conntrack, UDP_TIMEOUT);
++		ip_ct_refresh(conntrack, ip_ct_udp_timeout);
+ 
+ 	return NF_ACCEPT;
+ }
+--- linux-2.6.0-test6/net/ipv4/netfilter/ip_conntrack_standalone.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/net/ipv4/netfilter/ip_conntrack_standalone.c	2003-10-05 00:33:25.000000000 -0700
+@@ -7,6 +7,7 @@
+ /* (c) 1999 Paul `Rusty' Russell.  Licenced under the GNU General
+    Public Licence. */
+ 
++#include <linux/config.h>
+ #include <linux/types.h>
+ #include <linux/ip.h>
+ #include <linux/netfilter.h>
+@@ -14,6 +15,9 @@
+ #include <linux/module.h>
+ #include <linux/skbuff.h>
+ #include <linux/proc_fs.h>
++#ifdef CONFIG_SYSCTL
++#include <linux/sysctl.h>
++#endif
+ #include <net/checksum.h>
+ 
+ #define ASSERT_READ_LOCK(x) MUST_BE_READ_LOCKED(&ip_conntrack_lock)
+@@ -256,6 +260,98 @@ static struct nf_hook_ops ip_conntrack_l
+ 	.priority	= NF_IP_PRI_LAST-1,
+ };
+ 
++/* Sysctl support */
++
++#ifdef CONFIG_SYSCTL
++
++/* From ip_conntrack_core.c */
++extern int ip_conntrack_max;
++
++/* From ip_conntrack_proto_tcp.c */
++extern unsigned long ip_ct_tcp_timeout_syn_sent;
++extern unsigned long ip_ct_tcp_timeout_syn_recv;
++extern unsigned long ip_ct_tcp_timeout_established;
++extern unsigned long ip_ct_tcp_timeout_fin_wait;
++extern unsigned long ip_ct_tcp_timeout_close_wait;
++extern unsigned long ip_ct_tcp_timeout_last_ack;
++extern unsigned long ip_ct_tcp_timeout_time_wait;
++extern unsigned long ip_ct_tcp_timeout_close;
++
++/* From ip_conntrack_proto_udp.c */
++extern unsigned long ip_ct_udp_timeout;
++extern unsigned long ip_ct_udp_timeout_stream;
++
++/* From ip_conntrack_proto_icmp.c */
++extern unsigned long ip_ct_icmp_timeout;
++
++/* From ip_conntrack_proto_icmp.c */
++extern unsigned long ip_ct_generic_timeout;
++
++static struct ctl_table_header *ip_ct_sysctl_header;
++
++static ctl_table ip_ct_sysctl_table[] = {
++	{NET_IPV4_NF_CONNTRACK_MAX, "ip_conntrack_max",
++	 &ip_conntrack_max, sizeof(int), 0644, NULL,
++	 &proc_dointvec},
++	{NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_SYN_SENT, "ip_conntrack_tcp_timeout_syn_sent",
++	 &ip_ct_tcp_timeout_syn_sent, sizeof(unsigned int), 0644, NULL,
++	 &proc_dointvec_jiffies},
++	{NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_SYN_RECV, "ip_conntrack_tcp_timeout_syn_recv",
++	 &ip_ct_tcp_timeout_syn_recv, sizeof(unsigned int), 0644, NULL,
++	 &proc_dointvec_jiffies},
++	{NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_ESTABLISHED, "ip_conntrack_tcp_timeout_established",
++	 &ip_ct_tcp_timeout_established, sizeof(unsigned int), 0644, NULL,
++	 &proc_dointvec_jiffies},
++	{NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_FIN_WAIT, "ip_conntrack_tcp_timeout_fin_wait",
++	 &ip_ct_tcp_timeout_fin_wait, sizeof(unsigned int), 0644, NULL,
++	 &proc_dointvec_jiffies},
++	{NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_CLOSE_WAIT, "ip_conntrack_tcp_timeout_close_wait",
++	 &ip_ct_tcp_timeout_close_wait, sizeof(unsigned int), 0644, NULL,
++	 &proc_dointvec_jiffies},
++	{NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_LAST_ACK, "ip_conntrack_tcp_timeout_last_ack",
++	 &ip_ct_tcp_timeout_last_ack, sizeof(unsigned int), 0644, NULL,
++	 &proc_dointvec_jiffies},
++	{NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_TIME_WAIT, "ip_conntrack_tcp_timeout_time_wait",
++	 &ip_ct_tcp_timeout_time_wait, sizeof(unsigned int), 0644, NULL,
++	 &proc_dointvec_jiffies},
++	{NET_IPV4_NF_CONNTRACK_TCP_TIMEOUT_CLOSE, "ip_conntrack_tcp_timeout_close",
++	 &ip_ct_tcp_timeout_close, sizeof(unsigned int), 0644, NULL,
++	 &proc_dointvec_jiffies},
++	{NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT, "ip_conntrack_udp_timeout",
++	 &ip_ct_udp_timeout, sizeof(unsigned int), 0644, NULL,
++	 &proc_dointvec_jiffies},
++	{NET_IPV4_NF_CONNTRACK_UDP_TIMEOUT_STREAM, "ip_conntrack_udp_timeout_stream",
++	 &ip_ct_udp_timeout_stream, sizeof(unsigned int), 0644, NULL,
++	 &proc_dointvec_jiffies},
++	{NET_IPV4_NF_CONNTRACK_ICMP_TIMEOUT, "ip_conntrack_icmp_timeout",
++	 &ip_ct_icmp_timeout, sizeof(unsigned int), 0644, NULL,
++	 &proc_dointvec_jiffies},
++	{NET_IPV4_NF_CONNTRACK_GENERIC_TIMEOUT, "ip_conntrack_generic_timeout",
++	 &ip_ct_generic_timeout, sizeof(unsigned int), 0644, NULL,
++	 &proc_dointvec_jiffies},
++	{0}
++};
++
++#define NET_IP_CONNTRACK_MAX 2089
++
++static ctl_table ip_ct_netfilter_table[] = {
++	{NET_IPV4_NETFILTER, "netfilter", NULL, 0, 0555, ip_ct_sysctl_table, 0, 0, 0, 0, 0},
++	{NET_IP_CONNTRACK_MAX, "ip_conntrack_max",
++	 &ip_conntrack_max, sizeof(int), 0644, NULL,
++	 &proc_dointvec},
++	{0}
++};
++
++static ctl_table ip_ct_ipv4_table[] = {
++	{NET_IPV4, "ipv4", NULL, 0, 0555, ip_ct_netfilter_table, 0, 0, 0, 0, 0},
++	{0}
++};
++
++static ctl_table ip_ct_net_table[] = {
++	{CTL_NET, "net", NULL, 0, 0555, ip_ct_ipv4_table, 0, 0, 0, 0, 0},
++	{0}
++};
++#endif
+ static int init_or_cleanup(int init)
+ {
+ 	struct proc_dir_entry *proc;
+@@ -291,10 +387,20 @@ static int init_or_cleanup(int init)
+ 		printk("ip_conntrack: can't register local in hook.\n");
+ 		goto cleanup_inoutandlocalops;
+ 	}
++#ifdef CONFIG_SYSCTL
++	ip_ct_sysctl_header = register_sysctl_table(ip_ct_net_table, 0);
++	if (ip_ct_sysctl_header == NULL) {
++		printk("ip_conntrack: can't register to sysctl.\n");
++		goto cleanup;
++	}
++#endif
+ 
+ 	return ret;
+ 
+  cleanup:
++#ifdef CONFIG_SYSCTL
++ 	unregister_sysctl_table(ip_ct_sysctl_header);
++#endif
+ 	nf_unregister_hook(&ip_conntrack_local_in_ops);
+  cleanup_inoutandlocalops:
+ 	nf_unregister_hook(&ip_conntrack_out_ops);
+--- linux-2.6.0-test6/net/ipv4/netfilter/ip_nat_core.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/net/ipv4/netfilter/ip_nat_core.c	2003-10-05 00:33:25.000000000 -0700
+@@ -516,12 +516,14 @@ ip_nat_setup_info(struct ip_conntrack *c
+ 	struct ip_conntrack_tuple new_tuple, inv_tuple, reply;
+ 	struct ip_conntrack_tuple orig_tp;
+ 	struct ip_nat_info *info = &conntrack->nat.info;
++	int in_hashes = info->initialized;
+ 
+ 	MUST_BE_WRITE_LOCKED(&ip_nat_lock);
+ 	IP_NF_ASSERT(hooknum == NF_IP_PRE_ROUTING
+ 		     || hooknum == NF_IP_POST_ROUTING
+ 		     || hooknum == NF_IP_LOCAL_OUT);
+ 	IP_NF_ASSERT(info->num_manips < IP_NAT_MAX_MANIPS);
++	IP_NF_ASSERT(!(info->initialized & (1 << HOOK2MANIP(hooknum))));
+ 
+ 	/* What we've got will look like inverse of reply. Normally
+ 	   this is what is in the conntrack, except for prior
+@@ -638,6 +640,14 @@ ip_nat_setup_info(struct ip_conntrack *c
+ 
+ 	/* It's done. */
+ 	info->initialized |= (1 << HOOK2MANIP(hooknum));
++
++	if (in_hashes) {
++		IP_NF_ASSERT(info->bysource.conntrack);
++		replace_in_hashes(conntrack, info);
++	} else {
++		place_in_hashes(conntrack, info);
++	}
++
+ 	return NF_ACCEPT;
+ }
+ 
+@@ -761,11 +771,6 @@ do_bindings(struct ip_conntrack *ct,
+ 	enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo);
+ 	int proto = (*pskb)->nh.iph->protocol;
+ 
+-	/* Skip everything and don't call helpers if there are no
+-	 * manips for this connection */
+-	if (info->num_manips == 0)
+-		return NF_ACCEPT;
+-
+ 	/* Need nat lock to protect against modification, but neither
+ 	   conntrack (referenced) and helper (deleted with
+ 	   synchronize_bh()) can vanish. */
+--- linux-2.6.0-test6/net/ipv4/netfilter/ip_nat_helper.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/net/ipv4/netfilter/ip_nat_helper.c	2003-10-05 00:33:25.000000000 -0700
+@@ -122,7 +122,6 @@ static void mangle_contents(struct sk_bu
+ 	/* fix IP hdr checksum information */
+ 	skb->nh.iph->tot_len = htons(skb->len);
+ 	ip_send_check(skb->nh.iph);
+-	skb->csum = csum_partial(data, skb->len - dataoff, 0);
+ }
+ 
+ /* Unusual, but possible case. */
+@@ -167,6 +166,7 @@ ip_nat_mangle_tcp_packet(struct sk_buff 
+ {
+ 	struct iphdr *iph;
+ 	struct tcphdr *tcph;
++	int datalen;
+ 
+ 	if (!skb_ip_make_writable(pskb, (*pskb)->len))
+ 		return 0;
+@@ -184,11 +184,11 @@ ip_nat_mangle_tcp_packet(struct sk_buff 
+ 	mangle_contents(*pskb, iph->ihl*4 + tcph->doff*4,
+ 			match_offset, match_len, rep_buffer, rep_len);
+ 
++	datalen = (*pskb)->len - iph->ihl*4;
+ 	tcph->check = 0;
+-	tcph->check = tcp_v4_check(tcph, (*pskb)->len - iph->ihl*4,
+-				   iph->saddr, iph->daddr,
+-				   csum_partial((char *)tcph, tcph->doff*4,
+-						(*pskb)->csum));
++	tcph->check = tcp_v4_check(tcph, datalen, iph->saddr, iph->daddr,
++				   csum_partial((char *)tcph, datalen, 0));
++
+ 	adjust_tcp_sequence(ntohl(tcph->seq),
+ 			    (int)rep_len - (int)match_len,
+ 			    ct, ctinfo);
+@@ -216,7 +216,12 @@ ip_nat_mangle_udp_packet(struct sk_buff 
+ {
+ 	struct iphdr *iph;
+ 	struct udphdr *udph;
+-	int need_csum = ((*pskb)->csum != 0);
++
++	/* UDP helpers might accidentally mangle the wrong packet */
++	iph = (*pskb)->nh.iph;
++	if ((*pskb)->len < iph->ihl*4 + sizeof(*udph) + 
++	                       match_offset + match_len)
++		return 0;
+ 
+ 	if (!skb_ip_make_writable(pskb, (*pskb)->len))
+ 		return 0;
+@@ -235,17 +240,15 @@ ip_nat_mangle_udp_packet(struct sk_buff 
+ 	udph->len = htons((*pskb)->len - iph->ihl*4);
+ 
+ 	/* fix udp checksum if udp checksum was previously calculated */
+-	if (need_csum) {
++	if (udph->check) {
++		int datalen = (*pskb)->len - iph->ihl * 4;
+ 		udph->check = 0;
+-		udph->check
+-			= csum_tcpudp_magic(iph->saddr, iph->daddr,
+-					    (*pskb)->len - iph->ihl*4,
+-					    IPPROTO_UDP,
+-					    csum_partial((char *)udph,
+-							 sizeof(struct udphdr),
+-							 (*pskb)->csum));
+-	} else
+-		(*pskb)->csum = 0;
++		udph->check = csum_tcpudp_magic(iph->saddr, iph->daddr,
++		                                datalen, IPPROTO_UDP,
++		                                csum_partial((char *)udph,
++		                                             datalen, 0));
++	}
++
+ 	return 1;
+ }
+ 
+--- linux-2.6.0-test6/net/ipv4/netfilter/ip_nat_rule.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/net/ipv4/netfilter/ip_nat_rule.c	2003-10-05 00:33:25.000000000 -0700
+@@ -233,7 +233,7 @@ static int ipt_dnat_checkentry(const cha
+ 	return 1;
+ }
+ 
+-static inline unsigned int
++inline unsigned int
+ alloc_null_binding(struct ip_conntrack *conntrack,
+ 		   struct ip_nat_info *info,
+ 		   unsigned int hooknum)
+--- linux-2.6.0-test6/net/ipv4/netfilter/ip_nat_standalone.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/net/ipv4/netfilter/ip_nat_standalone.c	2003-10-05 00:33:25.000000000 -0700
+@@ -119,7 +119,6 @@ ip_nat_fn(unsigned int hooknum,
+ 		/* Seen it before?  This can happen for loopback, retrans,
+ 		   or local packets.. */
+ 		if (!(info->initialized & (1 << maniptype))) {
+-			int in_hashes = info->initialized;
+ 			unsigned int ret;
+ 
+ 			if (ct->master
+@@ -130,9 +129,10 @@ ip_nat_fn(unsigned int hooknum,
+ 			} else {
+ #ifdef CONFIG_IP_NF_NAT_LOCAL
+ 				/* LOCAL_IN hook doesn't have a chain!  */
+-				if (hooknum == NF_IP_LOCAL_IN) {
+-					ret = NF_ACCEPT;
+-				} else
++				if (hooknum == NF_IP_LOCAL_IN)
++					ret = alloc_null_binding(ct, info,
++								 hooknum);
++				else
+ #endif
+ 				ret = ip_nat_rule_find(pskb, hooknum, in, out,
+ 						       ct, info);
+@@ -142,13 +142,6 @@ ip_nat_fn(unsigned int hooknum,
+ 				WRITE_UNLOCK(&ip_nat_lock);
+ 				return ret;
+ 			}
+-
+-			if (in_hashes) {
+-				IP_NF_ASSERT(info->bysource.conntrack);
+-				replace_in_hashes(ct, info);
+-			} else {
+-				place_in_hashes(ct, info);
+-			}
+ 		} else
+ 			DEBUGP("Already setup manip %s for ct %p\n",
+ 			       maniptype == IP_NAT_MANIP_SRC ? "SRC" : "DST",
+@@ -199,6 +192,7 @@ ip_nat_out(unsigned int hooknum,
+ 	return ip_nat_fn(hooknum, pskb, in, out, okfn);
+ }
+ 
++#ifdef CONFIG_IP_NF_NAT_LOCAL
+ static unsigned int
+ ip_nat_local_fn(unsigned int hooknum,
+ 		struct sk_buff **pskb,
+@@ -224,6 +218,7 @@ ip_nat_local_fn(unsigned int hooknum,
+ 		return ip_route_me_harder(pskb) == 0 ? ret : NF_DROP;
+ 	return ret;
+ }
++#endif
+ 
+ /* We must be after connection tracking and before packet filtering. */
+ 
+@@ -245,6 +240,7 @@ static struct nf_hook_ops ip_nat_out_ops
+ 	.priority	= NF_IP_PRI_NAT_SRC,
+ };
+ 
++#ifdef CONFIG_IP_NF_NAT_LOCAL
+ /* Before packet filtering, change destination */
+ static struct nf_hook_ops ip_nat_local_out_ops = {
+ 	.hook		= ip_nat_local_fn,
+@@ -254,7 +250,7 @@ static struct nf_hook_ops ip_nat_local_o
+ 	.priority	= NF_IP_PRI_NAT_DST,
+ };
+ 
+-#ifdef CONFIG_IP_NF_NAT_LOCAL
++/* After packet filtering, change source for reply packets of LOCAL_OUT DNAT */
+ static struct nf_hook_ops ip_nat_local_in_ops = {
+ 	.hook		= ip_nat_fn,
+ 	.owner		= THIS_MODULE,
+@@ -324,12 +320,12 @@ static int init_or_cleanup(int init)
+ 		printk("ip_nat_init: can't register out hook.\n");
+ 		goto cleanup_inops;
+ 	}
++#ifdef CONFIG_IP_NF_NAT_LOCAL
+ 	ret = nf_register_hook(&ip_nat_local_out_ops);
+ 	if (ret < 0) {
+ 		printk("ip_nat_init: can't register local out hook.\n");
+ 		goto cleanup_outops;
+ 	}
+-#ifdef CONFIG_IP_NF_NAT_LOCAL
+ 	ret = nf_register_hook(&ip_nat_local_in_ops);
+ 	if (ret < 0) {
+ 		printk("ip_nat_init: can't register local in hook.\n");
+@@ -342,9 +338,9 @@ static int init_or_cleanup(int init)
+ #ifdef CONFIG_IP_NF_NAT_LOCAL
+ 	nf_unregister_hook(&ip_nat_local_in_ops);
+  cleanup_localoutops:
+-#endif
+ 	nf_unregister_hook(&ip_nat_local_out_ops);
+  cleanup_outops:
++#endif
+ 	nf_unregister_hook(&ip_nat_out_ops);
+  cleanup_inops:
+ 	nf_unregister_hook(&ip_nat_in_ops);
+--- linux-2.6.0-test6/net/ipv4/netfilter/ipt_owner.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/net/ipv4/netfilter/ipt_owner.c	2003-10-05 00:36:15.000000000 -0700
+@@ -90,7 +90,7 @@ match_sid(const struct sk_buff *skb, pid
+ 	read_lock(&tasklist_lock);
+ 	do_each_thread(g, p) {
+ 		struct files_struct *files;
+-		if (p->session != sid)
++		if (process_session(p) != sid)
+ 			continue;
+ 
+ 		task_lock(p);
+--- linux-2.6.0-test6/net/ipv4/netfilter/ipt_REJECT.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/net/ipv4/netfilter/ipt_REJECT.c	2003-10-05 00:33:25.000000000 -0700
+@@ -40,16 +40,17 @@ static void connection_attach(struct sk_
+ 	}
+ }
+ 
+-static inline struct rtable *route_reverse(struct sk_buff *skb, int local)
++static inline struct rtable *route_reverse(struct sk_buff *skb, int hook)
+ {
+ 	struct iphdr *iph = skb->nh.iph;
+ 	struct dst_entry *odst;
+ 	struct flowi fl = {};
+ 	struct rtable *rt;
+ 
+-	if (local) {
++	if (hook != NF_IP_FORWARD) {
+ 		fl.nl_u.ip4_u.daddr = iph->saddr;
+-		fl.nl_u.ip4_u.saddr = iph->daddr;
++		if (hook == NF_IP_LOCAL_IN)
++			fl.nl_u.ip4_u.saddr = iph->daddr;
+ 		fl.nl_u.ip4_u.tos = RT_TOS(iph->tos);
+ 
+ 		if (ip_route_output_key(&rt, &fl) != 0)
+@@ -81,7 +82,7 @@ static inline struct rtable *route_rever
+ }
+ 
+ /* Send RST reply */
+-static void send_reset(struct sk_buff *oldskb, int local)
++static void send_reset(struct sk_buff *oldskb, int hook)
+ {
+ 	struct sk_buff *nskb;
+ 	struct tcphdr otcph, *tcph;
+@@ -104,7 +105,7 @@ static void send_reset(struct sk_buff *o
+ 		return;
+ 
+ 	/* FIXME: Check checksum --RR */
+-	if ((rt = route_reverse(oldskb, local)) == NULL)
++	if ((rt = route_reverse(oldskb, hook)) == NULL)
+ 		return;
+ 
+ 	hh_len = (rt->u.dst.dev->hard_header_len + 15)&~15;
+@@ -390,7 +391,7 @@ static unsigned int reject(struct sk_buf
+ 		send_unreach(*pskb, ICMP_PKT_FILTERED);
+ 		break;
+ 	case IPT_TCP_RESET:
+-		send_reset(*pskb, hooknum == NF_IP_LOCAL_IN);
++		send_reset(*pskb, hooknum);
+ 	case IPT_ICMP_ECHOREPLY:
+ 		/* Doesn't happen. */
+ 		break;
+--- linux-2.6.0-test6/net/ipv4/protocol.c	2003-06-14 12:17:58.000000000 -0700
++++ 25/net/ipv4/protocol.c	2003-10-05 00:33:25.000000000 -0700
+@@ -27,6 +27,7 @@
+ 
+ #include <asm/uaccess.h>
+ #include <asm/system.h>
++#include <linux/module.h>
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/sched.h>
+@@ -95,3 +96,6 @@ int inet_del_protocol(struct inet_protoc
+ 
+ 	return ret;
+ }
++
++EXPORT_SYMBOL(inet_add_protocol);
++EXPORT_SYMBOL(inet_del_protocol);
+--- linux-2.6.0-test6/net/ipv4/route.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/net/ipv4/route.c	2003-10-05 00:33:25.000000000 -0700
+@@ -62,6 +62,7 @@
+  */
+ 
+ #include <linux/config.h>
++#include <linux/module.h>
+ #include <asm/uaccess.h>
+ #include <asm/system.h>
+ #include <asm/bitops.h>
+@@ -2823,3 +2824,7 @@ out_enomem1:
+ 	rc = -ENOMEM;
+ 	goto out;
+ }
++
++EXPORT_SYMBOL(__ip_select_ident);
++EXPORT_SYMBOL(ip_route_input);
++EXPORT_SYMBOL(ip_route_output_key);
+--- linux-2.6.0-test6/net/ipv4/sysctl_net_ipv4.c	2003-08-22 19:23:42.000000000 -0700
++++ 25/net/ipv4/sysctl_net_ipv4.c	2003-10-05 00:33:25.000000000 -0700
+@@ -8,6 +8,7 @@
+  */
+ 
+ #include <linux/mm.h>
++#include <linux/module.h>
+ #include <linux/sysctl.h>
+ #include <linux/config.h>
+ #include <net/snmp.h>
+@@ -587,3 +588,5 @@ ctl_table ipv4_table[] = {
+ };
+ 
+ #endif /* CONFIG_SYSCTL */
++
++EXPORT_SYMBOL(ipv4_config);
+--- linux-2.6.0-test6/net/ipv4/tcp.c	2003-06-22 12:04:45.000000000 -0700
++++ 25/net/ipv4/tcp.c	2003-10-05 00:33:25.000000000 -0700
+@@ -248,6 +248,7 @@
+  */
+ 
+ #include <linux/config.h>
++#include <linux/module.h>
+ #include <linux/types.h>
+ #include <linux/fcntl.h>
+ #include <linux/poll.h>
+@@ -2682,3 +2683,26 @@ void __init tcp_init(void)
+ 
+ 	tcpdiag_init();
+ }
++
++EXPORT_SYMBOL(__tcp_mem_reclaim);
++EXPORT_SYMBOL(sysctl_tcp_rmem);
++EXPORT_SYMBOL(sysctl_tcp_wmem);
++EXPORT_SYMBOL(tcp_accept);
++EXPORT_SYMBOL(tcp_close);
++EXPORT_SYMBOL(tcp_close_state);
++EXPORT_SYMBOL(tcp_destroy_sock);
++EXPORT_SYMBOL(tcp_disconnect);
++EXPORT_SYMBOL(tcp_getsockopt);
++EXPORT_SYMBOL(tcp_ioctl);
++EXPORT_SYMBOL(tcp_openreq_cachep);
++EXPORT_SYMBOL(tcp_poll);
++EXPORT_SYMBOL(tcp_read_sock);
++EXPORT_SYMBOL(tcp_recvmsg);
++EXPORT_SYMBOL(tcp_sendmsg);
++EXPORT_SYMBOL(tcp_sendpage);
++EXPORT_SYMBOL(tcp_setsockopt);
++EXPORT_SYMBOL(tcp_shutdown);
++EXPORT_SYMBOL(tcp_sockets_allocated);
++EXPORT_SYMBOL(tcp_statistics);
++EXPORT_SYMBOL(tcp_timewait_cachep);
++EXPORT_SYMBOL(tcp_write_space);
+--- linux-2.6.0-test6/net/ipv4/tcp_input.c	2003-07-27 12:14:40.000000000 -0700
++++ 25/net/ipv4/tcp_input.c	2003-10-05 00:33:25.000000000 -0700
+@@ -65,6 +65,7 @@
+ 
+ #include <linux/config.h>
+ #include <linux/mm.h>
++#include <linux/module.h>
+ #include <linux/sysctl.h>
+ #include <net/tcp.h>
+ #include <net/inet_common.h>
+@@ -4089,3 +4090,10 @@ discard:
+ 	}
+ 	return 0;
+ }
++
++EXPORT_SYMBOL(sysctl_tcp_ecn);
++EXPORT_SYMBOL(sysctl_tcp_reordering);
++EXPORT_SYMBOL(tcp_cwnd_application_limited);
++EXPORT_SYMBOL(tcp_parse_options);
++EXPORT_SYMBOL(tcp_rcv_established);
++EXPORT_SYMBOL(tcp_rcv_state_process);
+--- linux-2.6.0-test6/net/ipv4/tcp_ipv4.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/net/ipv4/tcp_ipv4.c	2003-10-05 00:33:25.000000000 -0700
+@@ -56,6 +56,7 @@
+ 
+ #include <linux/types.h>
+ #include <linux/fcntl.h>
++#include <linux/module.h>
+ #include <linux/random.h>
+ #include <linux/cache.h>
+ #include <linux/jhash.h>
+@@ -2644,3 +2645,32 @@ void __init tcp_v4_init(struct net_proto
+ 	 */
+ 	tcp_socket->sk->sk_prot->unhash(tcp_socket->sk);
+ }
++
++EXPORT_SYMBOL(ipv4_specific);
++EXPORT_SYMBOL(tcp_bind_hash);
++EXPORT_SYMBOL(tcp_bucket_create);
++EXPORT_SYMBOL(tcp_hashinfo);
++EXPORT_SYMBOL(tcp_inherit_port);
++EXPORT_SYMBOL(tcp_listen_wlock);
++EXPORT_SYMBOL(tcp_port_rover);
++EXPORT_SYMBOL(tcp_prot);
++EXPORT_SYMBOL(tcp_put_port);
++EXPORT_SYMBOL(tcp_unhash);
++EXPORT_SYMBOL(tcp_v4_conn_request);
++EXPORT_SYMBOL(tcp_v4_connect);
++EXPORT_SYMBOL(tcp_v4_do_rcv);
++EXPORT_SYMBOL(tcp_v4_lookup_listener);
++EXPORT_SYMBOL(tcp_v4_rebuild_header);
++EXPORT_SYMBOL(tcp_v4_remember_stamp);
++EXPORT_SYMBOL(tcp_v4_send_check);
++EXPORT_SYMBOL(tcp_v4_syn_recv_sock);
++
++#ifdef CONFIG_PROC_FS
++EXPORT_SYMBOL(tcp_proc_register);
++EXPORT_SYMBOL(tcp_proc_unregister);
++#endif
++#ifdef CONFIG_SYSCTL
++EXPORT_SYMBOL(sysctl_local_port_range);
++EXPORT_SYMBOL(sysctl_max_syn_backlog);
++EXPORT_SYMBOL(sysctl_tcp_low_latency);
++#endif
+--- linux-2.6.0-test6/net/ipv4/tcp_minisocks.c	2003-07-02 14:53:18.000000000 -0700
++++ 25/net/ipv4/tcp_minisocks.c	2003-10-05 00:33:25.000000000 -0700
+@@ -22,6 +22,7 @@
+ 
+ #include <linux/config.h>
+ #include <linux/mm.h>
++#include <linux/module.h>
+ #include <linux/sysctl.h>
+ #include <linux/workqueue.h>
+ #include <net/tcp.h>
+@@ -1053,3 +1054,13 @@ int tcp_child_process(struct sock *paren
+ 	sock_put(child);
+ 	return ret;
+ }
++
++EXPORT_SYMBOL(tcp_check_req);
++EXPORT_SYMBOL(tcp_child_process);
++EXPORT_SYMBOL(tcp_create_openreq_child);
++EXPORT_SYMBOL(tcp_timewait_state_process);
++EXPORT_SYMBOL(tcp_tw_deschedule);
++
++#ifdef CONFIG_SYSCTL
++EXPORT_SYMBOL(sysctl_tcp_tw_recycle);
++#endif
+--- linux-2.6.0-test6/net/ipv4/tcp_output.c	2003-07-02 14:53:18.000000000 -0700
++++ 25/net/ipv4/tcp_output.c	2003-10-05 00:33:25.000000000 -0700
+@@ -39,6 +39,7 @@
+ #include <net/tcp.h>
+ 
+ #include <linux/compiler.h>
++#include <linux/module.h>
+ #include <linux/smp_lock.h>
+ 
+ /* People can turn this off for buggy TCP's found in printers etc. */
+@@ -1542,3 +1543,14 @@ void tcp_send_probe0(struct sock *sk)
+ 				      min(tp->rto << tp->backoff, TCP_RESOURCE_PROBE_INTERVAL));
+ 	}
+ }
++
++EXPORT_SYMBOL(tcp_acceptable_seq);
++EXPORT_SYMBOL(tcp_connect);
++EXPORT_SYMBOL(tcp_connect_init);
++EXPORT_SYMBOL(tcp_make_synack);
++EXPORT_SYMBOL(tcp_send_synack);
++EXPORT_SYMBOL(tcp_simple_retransmit);
++EXPORT_SYMBOL(tcp_sync_mss);
++EXPORT_SYMBOL(tcp_transmit_skb);
++EXPORT_SYMBOL(tcp_write_wakeup);
++EXPORT_SYMBOL(tcp_write_xmit);
+--- linux-2.6.0-test6/net/ipv4/tcp_timer.c	2003-06-16 22:32:21.000000000 -0700
++++ 25/net/ipv4/tcp_timer.c	2003-10-05 00:33:25.000000000 -0700
+@@ -20,6 +20,7 @@
+  *		Jorge Cwik, <jorge@laser.satlink.net>
+  */
+ 
++#include <linux/module.h>
+ #include <net/tcp.h>
+ 
+ int sysctl_tcp_syn_retries = TCP_SYN_RETRIES; 
+@@ -656,3 +657,8 @@ out:
+ 	bh_unlock_sock(sk);
+ 	sock_put(sk);
+ }
++
++EXPORT_SYMBOL(tcp_clear_xmit_timers);
++EXPORT_SYMBOL(tcp_delete_keepalive_timer);
++EXPORT_SYMBOL(tcp_init_xmit_timers);
++EXPORT_SYMBOL(tcp_reset_keepalive_timer);
+--- linux-2.6.0-test6/net/ipv4/udp.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/net/ipv4/udp.c	2003-10-05 00:33:25.000000000 -0700
+@@ -83,6 +83,7 @@
+ #include <asm/ioctls.h>
+ #include <linux/types.h>
+ #include <linux/fcntl.h>
++#include <linux/module.h>
+ #include <linux/socket.h>
+ #include <linux/sockios.h>
+ #include <linux/in.h>
+@@ -1532,3 +1533,17 @@ void udp4_proc_exit(void)
+ 	udp_proc_unregister(&udp4_seq_afinfo);
+ }
+ #endif /* CONFIG_PROC_FS */
++
++EXPORT_SYMBOL(udp_connect);
++EXPORT_SYMBOL(udp_disconnect);
++EXPORT_SYMBOL(udp_hash);
++EXPORT_SYMBOL(udp_hash_lock);
++EXPORT_SYMBOL(udp_ioctl);
++EXPORT_SYMBOL(udp_port_rover);
++EXPORT_SYMBOL(udp_prot);
++EXPORT_SYMBOL(udp_sendmsg);
++
++#ifdef CONFIG_PROC_FS
++EXPORT_SYMBOL(udp_proc_register);
++EXPORT_SYMBOL(udp_proc_unregister);
++#endif
+--- linux-2.6.0-test6/net/ipv4/utils.c	2003-07-02 14:53:18.000000000 -0700
++++ 25/net/ipv4/utils.c	2003-10-05 00:33:25.000000000 -0700
+@@ -21,6 +21,7 @@
+  *		2 of the License, or (at your option) any later version.
+  */
+ 
++#include <linux/module.h>
+ #include <linux/types.h>
+ #include <asm/byteorder.h>
+ 
+@@ -55,3 +56,4 @@ __u32 in_aton(const char *str)
+ 	return(htonl(l));
+ }
+ 
++EXPORT_SYMBOL(in_aton);
+--- linux-2.6.0-test6/net/ipv4/xfrm4_tunnel.c	2003-08-22 19:23:42.000000000 -0700
++++ 25/net/ipv4/xfrm4_tunnel.c	2003-10-05 00:33:25.000000000 -0700
+@@ -169,6 +169,7 @@ static struct xfrm_type ipip_type = {
+ static struct inet_protocol ipip_protocol = {
+ 	.handler	=	ipip_rcv,
+ 	.err_handler	=	ipip_err,
++	.no_policy	=	1,
+ };
+ 
+ static int __init ipip_init(void)
+--- linux-2.6.0-test6/net/ipv6/netfilter/ip6t_ipv6header.c	2003-06-14 12:18:51.000000000 -0700
++++ 25/net/ipv6/netfilter/ip6t_ipv6header.c	2003-10-05 00:33:25.000000000 -0700
+@@ -126,18 +126,11 @@ ipv6header_checkentry(const char *tablen
+ 	return 1;
+ }
+ 
+-static void
+-ipv6header_destroy(void *matchinfo,
+-		   unsigned int matchinfosize)
+-{
+-	return;
+-}
+-
+ static struct ip6t_match ip6t_ipv6header_match = {
+ 	.name		= "ipv6header",
+ 	.match		= &ipv6header_match,
+ 	.checkentry	= &ipv6header_checkentry,
+-	.destroy	= &ipv6header_destroy,
++	.destroy	= NULL,
+ 	.me		= THIS_MODULE,
+ };
+ 
+--- linux-2.6.0-test6/net/ipv6/netfilter/ip6t_owner.c	2003-06-14 12:18:30.000000000 -0700
++++ 25/net/ipv6/netfilter/ip6t_owner.c	2003-10-05 00:36:15.000000000 -0700
+@@ -56,7 +56,7 @@ match_sid(const struct sk_buff *skb, pid
+ 	read_lock(&tasklist_lock);
+ 	do_each_thread(g, p) {
+ 		struct files_struct *files;
+-		if (p->session != sid)
++		if (process_session(p) != sid)
+ 			continue;
+ 
+ 		task_lock(p);
+--- linux-2.6.0-test6/net/irda/irda_device.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/net/irda/irda_device.c	2003-10-05 00:33:25.000000000 -0700
+@@ -85,7 +85,7 @@ static void irda_task_timer_expired(void
+ 
+ int __init irda_device_init( void)
+ {
+-	dongles = hashbin_new(HB_LOCK);
++	dongles = hashbin_new(HB_NOLOCK);
+ 	if (dongles == NULL) {
+ 		printk(KERN_WARNING "IrDA: Can't allocate dongles hashbin!\n");
+ 		return -ENOMEM;
+@@ -109,7 +109,9 @@ void __exit irda_device_cleanup(void)
+ 	IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
+ 
+ 	hashbin_delete(tasks, (FREE_FUNC) __irda_task_delete);
++	spin_lock(&dongles->hb_spinlock);
+ 	hashbin_delete(dongles, NULL);
++	spin_unlock(&dongles->hb_spinlock);
+ }
+ 
+ /*
+@@ -378,8 +380,6 @@ void irda_device_setup(struct net_device
+         dev->hard_header_len = 0;
+         dev->addr_len        = 0;
+ 
+-	dev->destructor      = free_netdev;
+-
+         dev->type            = ARPHRD_IRDA;
+         dev->tx_queue_len    = 8; /* Window size + 1 s-frame */
+ 
+@@ -390,6 +390,17 @@ void irda_device_setup(struct net_device
+ }
+ 
+ /*
++ * Funciton  alloc_irdadev 
++ * 	Allocates and sets up an IRDA device in a manner similar to
++ * 	alloc_etherdev.
++ */
++struct net_device *alloc_irdadev(int sizeof_priv)
++{
++	return alloc_netdev(sizeof_priv, "irda%d", irda_device_setup);
++}
++
++
++/*
+  * Function irda_device_txqueue_empty (dev)
+  *
+  *    Check if there is still some frames in the transmit queue for this
+@@ -415,25 +426,34 @@ int irda_device_txqueue_empty(struct net
+ dongle_t *irda_device_dongle_init(struct net_device *dev, int type)
+ {
+ 	struct dongle_reg *reg;
+-	dongle_t *dongle;
++	dongle_t *dongle = NULL;
++
++	might_sleep();
+ 
+-	ASSERT(dev != NULL, return NULL;);
++	spin_lock(&dongles->hb_spinlock);
++	reg = hashbin_find(dongles, type, NULL);
+ 
+ #ifdef CONFIG_KMOD
+-	ASSERT(!in_interrupt(), return NULL;);
+ 	/* Try to load the module needed */
+-	request_module("irda-dongle-%d", type);
++	if (!reg && capable(CAP_SYS_MODULE)) {
++		spin_unlock(&dongles->hb_spinlock);
++	
++		request_module("irda-dongle-%d", type);
++		
++		spin_lock(&dongles->hb_spinlock);
++		reg = hashbin_find(dongles, type, NULL);
++	}
+ #endif
+ 
+-	if (!(reg = hashbin_lock_find(dongles, type, NULL))) {
+-		ERROR("IrDA: Unable to find requested dongle\n");
+-		return NULL;
++	if (!reg || !try_module_get(reg->owner) ) {
++		ERROR("IrDA: Unable to find requested dongle type %x\n", type);
++		goto out;
+ 	}
+ 
+ 	/* Allocate dongle info for this instance */
+ 	dongle = kmalloc(sizeof(dongle_t), GFP_KERNEL);
+ 	if (!dongle)
+-		return NULL;
++		goto out;
+ 
+ 	memset(dongle, 0, sizeof(dongle_t));
+ 
+@@ -441,6 +461,8 @@ dongle_t *irda_device_dongle_init(struct
+ 	dongle->issue = reg;
+ 	dongle->dev = dev;
+ 
++ out:
++	spin_unlock(&dongles->hb_spinlock);
+ 	return dongle;
+ }
+ 
+@@ -452,7 +474,7 @@ int irda_device_dongle_cleanup(dongle_t 
+ 	ASSERT(dongle != NULL, return -1;);
+ 
+ 	dongle->issue->close(dongle);
+-
++	module_put(dongle->issue->owner);
+ 	kfree(dongle);
+ 
+ 	return 0;
+@@ -463,14 +485,16 @@ int irda_device_dongle_cleanup(dongle_t 
+  */
+ int irda_device_register_dongle(struct dongle_reg *new)
+ {
++	spin_lock(&dongles->hb_spinlock);
+ 	/* Check if this dongle has been registered before */
+-	if (hashbin_lock_find(dongles, new->type, NULL)) {
+-		MESSAGE("%s: Dongle already registered\n", __FUNCTION__);
+-                return 0;
+-        }
+-
+-	/* Insert IrDA dongle into hashbin */
+-	hashbin_insert(dongles, (irda_queue_t *) new, new->type, NULL);
++	if (hashbin_find(dongles, new->type, NULL)) {
++		MESSAGE("%s: Dongle type %x already registered\n", 
++			__FUNCTION__, new->type);
++        } else {
++		/* Insert IrDA dongle into hashbin */
++		hashbin_insert(dongles, (irda_queue_t *) new, new->type, NULL);
++	}
++	spin_unlock(&dongles->hb_spinlock);
+ 
+         return 0;
+ }
+@@ -485,11 +509,11 @@ void irda_device_unregister_dongle(struc
+ {
+ 	struct dongle *node;
+ 
++	spin_lock(&dongles->hb_spinlock);
+ 	node = hashbin_remove(dongles, dongle->type, NULL);
+-	if (!node) {
++	if (!node) 
+ 		ERROR("%s: dongle not found!\n", __FUNCTION__);
+-		return;
+-	}
++	spin_unlock(&dongles->hb_spinlock);
+ }
+ 
+ /*
+--- linux-2.6.0-test6/net/irda/irsyms.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/net/irda/irsyms.c	2003-10-05 00:33:25.000000000 -0700
+@@ -150,6 +150,7 @@ EXPORT_SYMBOL(irlap_close);
+ EXPORT_SYMBOL(irda_init_max_qos_capabilies);
+ EXPORT_SYMBOL(irda_qos_bits_to_value);
+ EXPORT_SYMBOL(irda_device_setup);
++EXPORT_SYMBOL(alloc_irdadev);
+ EXPORT_SYMBOL(irda_device_set_media_busy);
+ EXPORT_SYMBOL(irda_device_txqueue_empty);
+ 
+--- linux-2.6.0-test6/net/Makefile	2003-06-14 12:18:08.000000000 -0700
++++ 25/net/Makefile	2003-10-05 00:33:25.000000000 -0700
+@@ -40,6 +40,5 @@ obj-$(CONFIG_VLAN_8021Q)	+= 8021q/
+ obj-$(CONFIG_IP_SCTP)		+= sctp/
+ 
+ ifeq ($(CONFIG_NET),y)
+-obj-$(CONFIG_MODULES)		+= netsyms.o
+ obj-$(CONFIG_SYSCTL)		+= sysctl_net.o
+ endif
+--- linux-2.6.0-test6/net/netlink/af_netlink.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/net/netlink/af_netlink.c	2003-10-05 00:33:25.000000000 -0700
+@@ -1133,4 +1133,22 @@ core_initcall(netlink_proto_init);
+ module_exit(netlink_proto_exit);
+ 
+ MODULE_LICENSE("GPL");
++
+ MODULE_ALIAS_NETPROTO(PF_NETLINK);
++
++EXPORT_SYMBOL(netlink_ack);
++EXPORT_SYMBOL(netlink_broadcast);
++EXPORT_SYMBOL(netlink_broadcast_deliver);
++EXPORT_SYMBOL(netlink_dump_start);
++EXPORT_SYMBOL(netlink_kernel_create);
++EXPORT_SYMBOL(netlink_register_notifier);
++EXPORT_SYMBOL(netlink_set_err);
++EXPORT_SYMBOL(netlink_set_nonroot);
++EXPORT_SYMBOL(netlink_unicast);
++EXPORT_SYMBOL(netlink_unregister_notifier);
++
++#if defined(CONFIG_NETLINK_DEV) || defined(CONFIG_NETLINK_DEV_MODULE)
++EXPORT_SYMBOL(netlink_attach);
++EXPORT_SYMBOL(netlink_detach);
++EXPORT_SYMBOL(netlink_post);
++#endif
+--- linux-2.6.0-test6/net/netsyms.c	2003-09-27 18:57:47.000000000 -0700
++++ /dev/null	2002-08-30 16:31:37.000000000 -0700
+@@ -1,640 +0,0 @@
+-/*
+- *  linux/net/netsyms.c
+- *
+- *  Symbol table for the linux networking subsystem. Moved here to
+- *  make life simpler in ksyms.c.
+- */
+-
+-#include <linux/config.h>
+-#include <linux/module.h>
+-
+-#include <linux/types.h>
+-#include <linux/net.h>
+-#include <linux/in.h>
+-#include <linux/netdevice.h>
+-#include <linux/inetdevice.h>
+-#include <linux/fddidevice.h>
+-#include <linux/trdevice.h>
+-#include <linux/fcdevice.h>
+-#include <linux/ioport.h>
+-#include <linux/tty.h>
+-#include <linux/ethtool.h>
+-#include <net/neighbour.h>
+-#include <net/snmp.h>
+-#include <net/dst.h>
+-#include <net/checksum.h>
+-#include <linux/etherdevice.h>
+-#include <net/route.h>
+-#ifdef CONFIG_HIPPI
+-#include <linux/hippidevice.h>
+-#endif
+-#include <net/pkt_sched.h>
+-#include <net/scm.h>
+-#include <linux/if_bridge.h>
+-#include <linux/if_vlan.h>
+-#include <linux/random.h>
+-#ifdef CONFIG_NET_DIVERT
+-#include <linux/divert.h>
+-#endif /* CONFIG_NET_DIVERT */
+-
+-#ifdef CONFIG_NET
+-extern __u32 sysctl_wmem_max;
+-extern __u32 sysctl_rmem_max;
+-#endif
+-
+-#ifdef CONFIG_INET
+-#include <linux/ip.h>
+-#include <net/protocol.h>
+-#include <net/arp.h>
+-#if defined(CONFIG_ATM_CLIP) || defined(CONFIG_ATM_CLIP_MODULE)
+-#include <net/atmclip.h>
+-#endif
+-#include <net/ip.h>
+-#include <net/udp.h>
+-#include <net/tcp.h>
+-#include <net/icmp.h>
+-#include <net/inet_common.h>
+-#include <linux/inet.h>
+-#include <linux/mroute.h>
+-#include <linux/igmp.h>
+-#if defined(CONFIG_INET_AH) || defined(CONFIG_INET_AH_MODULE) || defined(CONFIG_INET6_AH) || defined(CONFIG_INET6_AH_MODULE)
+-#include <net/ah.h>
+-#endif
+-#if defined(CONFIG_INET_ESP) || defined(CONFIG_INET_ESP_MODULE) || defined(CONFIG_INET6_ESP) || defined(CONFIG_INET6_ESP_MODULE)
+-#include <net/esp.h>
+-#endif
+-
+-extern struct net_proto_family inet_family_ops;
+-
+-#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) \
+-   || defined (CONFIG_IP_SCTP_MODULE)
+-#include <linux/in6.h>
+-#include <linux/icmpv6.h>
+-#include <net/ipv6.h>
+-#include <net/ndisc.h>
+-#include <net/transp_v6.h>
+-#include <net/addrconf.h>
+-
+-extern int sysctl_local_port_range[2];
+-extern int tcp_port_rover;
+-extern int udp_port_rover;
+-#endif
+-
+-#endif
+-
+-#include <linux/rtnetlink.h>
+-
+-#ifdef CONFIG_IPX_MODULE
+-extern struct datalink_proto   *make_EII_client(void);
+-extern struct datalink_proto   *make_8023_client(void);
+-extern void destroy_EII_client(struct datalink_proto *);
+-extern void destroy_8023_client(struct datalink_proto *);
+-#endif
+-
+-#ifdef CONFIG_ATALK_MODULE
+-#include <net/sock.h>
+-#endif
+-
+-#ifdef CONFIG_SYSCTL
+-extern int sysctl_max_syn_backlog;
+-#endif
+-
+-/* Skbuff symbols. */
+-EXPORT_SYMBOL(skb_over_panic);
+-EXPORT_SYMBOL(skb_under_panic);
+-
+-/* Socket layer registration */
+-EXPORT_SYMBOL(sock_register);
+-EXPORT_SYMBOL(sock_unregister);
+-
+-/* Socket locking */
+-EXPORT_SYMBOL(__lock_sock);
+-EXPORT_SYMBOL(__release_sock);
+-
+-/* Socket layer support routines */
+-EXPORT_SYMBOL(memcpy_fromiovec);
+-EXPORT_SYMBOL(memcpy_tokerneliovec);
+-EXPORT_SYMBOL(sock_create);
+-EXPORT_SYMBOL(sock_alloc);
+-EXPORT_SYMBOL(sock_release);
+-EXPORT_SYMBOL(sock_setsockopt);
+-EXPORT_SYMBOL(sock_getsockopt);
+-EXPORT_SYMBOL(sock_sendmsg);
+-EXPORT_SYMBOL(sock_recvmsg);
+-EXPORT_SYMBOL(sk_alloc);
+-EXPORT_SYMBOL(sk_free);
+-EXPORT_SYMBOL(sk_send_sigurg);
+-EXPORT_SYMBOL(sock_wake_async);
+-EXPORT_SYMBOL(sock_alloc_send_skb);
+-EXPORT_SYMBOL(sock_alloc_send_pskb);
+-EXPORT_SYMBOL(sock_init_data);
+-EXPORT_SYMBOL(sock_no_release);
+-EXPORT_SYMBOL(sock_no_bind);
+-EXPORT_SYMBOL(sock_no_connect);
+-EXPORT_SYMBOL(sock_no_socketpair);
+-EXPORT_SYMBOL(sock_no_accept);
+-EXPORT_SYMBOL(sock_no_getname);
+-EXPORT_SYMBOL(sock_no_poll);
+-EXPORT_SYMBOL(sock_no_ioctl);
+-EXPORT_SYMBOL(sock_no_listen);
+-EXPORT_SYMBOL(sock_no_shutdown);
+-EXPORT_SYMBOL(sock_no_getsockopt);
+-EXPORT_SYMBOL(sock_no_setsockopt);
+-EXPORT_SYMBOL(sock_no_sendmsg);
+-EXPORT_SYMBOL(sock_no_recvmsg);
+-EXPORT_SYMBOL(sock_no_mmap);
+-EXPORT_SYMBOL(sock_no_sendpage);
+-EXPORT_SYMBOL(sock_rfree);
+-EXPORT_SYMBOL(sock_wfree);
+-EXPORT_SYMBOL(sock_wmalloc);
+-EXPORT_SYMBOL(sock_rmalloc);
+-EXPORT_SYMBOL(__skb_linearize);
+-EXPORT_SYMBOL(skb_checksum);
+-EXPORT_SYMBOL(skb_checksum_help);
+-EXPORT_SYMBOL(skb_recv_datagram);
+-EXPORT_SYMBOL(skb_free_datagram);
+-EXPORT_SYMBOL(skb_copy_datagram);
+-EXPORT_SYMBOL(skb_copy_datagram_iovec);
+-EXPORT_SYMBOL(skb_copy_and_csum_datagram_iovec);
+-EXPORT_SYMBOL(skb_copy_bits);
+-EXPORT_SYMBOL(skb_copy_and_csum_bits);
+-EXPORT_SYMBOL(skb_copy_and_csum_dev);
+-EXPORT_SYMBOL(skb_copy_expand);
+-EXPORT_SYMBOL(___pskb_trim);
+-EXPORT_SYMBOL(__pskb_pull_tail);
+-EXPORT_SYMBOL(pskb_expand_head);
+-EXPORT_SYMBOL(pskb_copy);
+-EXPORT_SYMBOL(skb_realloc_headroom);
+-EXPORT_SYMBOL(datagram_poll);
+-EXPORT_SYMBOL(put_cmsg);
+-EXPORT_SYMBOL(sock_kmalloc);
+-EXPORT_SYMBOL(sock_kfree_s);
+-EXPORT_SYMBOL(sock_map_fd);
+-EXPORT_SYMBOL(sockfd_lookup);
+-
+-EXPORT_SYMBOL(sk_run_filter);
+-EXPORT_SYMBOL(sk_chk_filter);
+-
+-EXPORT_SYMBOL(neigh_table_init);
+-EXPORT_SYMBOL(neigh_table_clear);
+-EXPORT_SYMBOL(neigh_resolve_output);
+-EXPORT_SYMBOL(neigh_connected_output);
+-EXPORT_SYMBOL(neigh_update);
+-EXPORT_SYMBOL(neigh_create);
+-EXPORT_SYMBOL(neigh_lookup);
+-EXPORT_SYMBOL(__neigh_event_send);
+-EXPORT_SYMBOL(neigh_event_ns);
+-EXPORT_SYMBOL(neigh_ifdown);
+-#ifdef CONFIG_ARPD
+-EXPORT_SYMBOL(neigh_app_ns);
+-#endif
+-#ifdef CONFIG_SYSCTL
+-EXPORT_SYMBOL(neigh_sysctl_register);
+-EXPORT_SYMBOL(neigh_sysctl_unregister);
+-#endif
+-EXPORT_SYMBOL(pneigh_lookup);
+-EXPORT_SYMBOL(pneigh_enqueue);
+-EXPORT_SYMBOL(neigh_destroy);
+-EXPORT_SYMBOL(neigh_parms_alloc);
+-EXPORT_SYMBOL(neigh_parms_release);
+-EXPORT_SYMBOL(neigh_rand_reach_time);
+-EXPORT_SYMBOL(neigh_compat_output); 
+-EXPORT_SYMBOL(neigh_changeaddr); 
+-
+-/*	dst_entry	*/
+-EXPORT_SYMBOL(dst_alloc);
+-EXPORT_SYMBOL(__dst_free);
+-EXPORT_SYMBOL(dst_destroy);
+-
+-/*	misc. support routines */
+-EXPORT_SYMBOL(net_ratelimit);
+-EXPORT_SYMBOL(net_random);
+-EXPORT_SYMBOL(net_srandom);
+-
+-/* Needed by smbfs.o */
+-EXPORT_SYMBOL(__scm_destroy);
+-EXPORT_SYMBOL(__scm_send);
+-
+-/* Needed by unix.o */
+-EXPORT_SYMBOL(scm_fp_dup);
+-EXPORT_SYMBOL(files_stat);
+-EXPORT_SYMBOL(memcpy_toiovec);
+-
+-#ifdef CONFIG_IPX_MODULE
+-EXPORT_SYMBOL(make_8023_client);
+-EXPORT_SYMBOL(destroy_8023_client);
+-EXPORT_SYMBOL(make_EII_client);
+-EXPORT_SYMBOL(destroy_EII_client);
+-#endif
+-
+-/* for 801q VLAN support */
+-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
+-EXPORT_SYMBOL(dev_change_flags);
+-#endif
+-
+-EXPORT_SYMBOL(scm_detach_fds);
+-
+-#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
+-EXPORT_SYMBOL(br_handle_frame_hook);
+-#endif
+-
+-#ifdef CONFIG_NET_DIVERT
+-EXPORT_SYMBOL(alloc_divert_blk);
+-EXPORT_SYMBOL(free_divert_blk);
+-#endif /* CONFIG_NET_DIVERT */
+-
+-#ifdef CONFIG_INET
+-/* Internet layer registration */
+-EXPORT_SYMBOL(inetdev_lock);
+-EXPORT_SYMBOL(inet_add_protocol);
+-EXPORT_SYMBOL(inet_del_protocol);
+-EXPORT_SYMBOL(inet_register_protosw);
+-EXPORT_SYMBOL(inet_unregister_protosw);
+-EXPORT_SYMBOL(ip_route_output_key);
+-EXPORT_SYMBOL(ip_route_input);
+-EXPORT_SYMBOL(icmp_send);
+-EXPORT_SYMBOL(icmp_statistics);
+-EXPORT_SYMBOL(icmp_err_convert);
+-EXPORT_SYMBOL(ip_options_compile);
+-EXPORT_SYMBOL(ip_options_undo);
+-EXPORT_SYMBOL(arp_send);
+-EXPORT_SYMBOL(arp_broken_ops);
+-EXPORT_SYMBOL(__ip_select_ident);
+-EXPORT_SYMBOL(ip_send_check);
+-EXPORT_SYMBOL(ip_fragment);
+-EXPORT_SYMBOL(inet_family_ops);
+-EXPORT_SYMBOL(in_aton);
+-EXPORT_SYMBOL(ip_mc_inc_group);
+-EXPORT_SYMBOL(ip_mc_dec_group);
+-EXPORT_SYMBOL(ip_mc_join_group);
+-EXPORT_SYMBOL(ip_finish_output);
+-EXPORT_SYMBOL(inet_stream_ops);
+-EXPORT_SYMBOL(inet_dgram_ops);
+-EXPORT_SYMBOL(ip_cmsg_recv);
+-EXPORT_SYMBOL(inet_addr_type); 
+-EXPORT_SYMBOL(inet_select_addr);
+-EXPORT_SYMBOL(ip_dev_find);
+-EXPORT_SYMBOL(inetdev_by_index);
+-EXPORT_SYMBOL(in_dev_finish_destroy);
+-EXPORT_SYMBOL(ip_defrag);
+-EXPORT_SYMBOL(inet_peer_idlock);
+-
+-/* Route manipulation */
+-EXPORT_SYMBOL(ip_rt_ioctl);
+-EXPORT_SYMBOL(devinet_ioctl);
+-EXPORT_SYMBOL(register_inetaddr_notifier);
+-EXPORT_SYMBOL(unregister_inetaddr_notifier);
+-
+-/* proc */
+-#ifdef CONFIG_PROC_FS
+-EXPORT_SYMBOL(udp_proc_register);
+-EXPORT_SYMBOL(udp_proc_unregister);
+-EXPORT_SYMBOL(tcp_proc_register);
+-EXPORT_SYMBOL(tcp_proc_unregister);
+-#endif
+-
+-/* needed for ip_gre -cw */
+-EXPORT_SYMBOL(ip_statistics);
+-#if defined(CONFIG_INET_ESP) || defined(CONFIG_INET_ESP_MODULE) || defined(CONFIG_INET6_ESP) || defined(CONFIG_INET6_ESP_MODULE)
+-EXPORT_SYMBOL_GPL(skb_cow_data);
+-EXPORT_SYMBOL_GPL(pskb_put);
+-EXPORT_SYMBOL_GPL(skb_to_sgvec);
+-#endif
+-
+-EXPORT_SYMBOL(flow_cache_lookup);
+-EXPORT_SYMBOL(flow_cache_genid);
+-
+-#if defined (CONFIG_IPV6_MODULE) || defined (CONFIG_IP_SCTP_MODULE)
+-/* inet functions common to v4 and v6 */
+-EXPORT_SYMBOL(inet_release);
+-EXPORT_SYMBOL(inet_stream_connect);
+-EXPORT_SYMBOL(inet_dgram_connect);
+-EXPORT_SYMBOL(inet_accept);
+-EXPORT_SYMBOL(inet_listen);
+-EXPORT_SYMBOL(inet_shutdown);
+-EXPORT_SYMBOL(inet_setsockopt);
+-EXPORT_SYMBOL(inet_getsockopt);
+-EXPORT_SYMBOL(inet_sendmsg);
+-EXPORT_SYMBOL(inet_recvmsg);
+-#ifdef INET_REFCNT_DEBUG
+-EXPORT_SYMBOL(inet_sock_nr);
+-#endif
+-EXPORT_SYMBOL(inet_sock_destruct);
+-EXPORT_SYMBOL(inet_sock_release);
+-
+-/* Socket demultiplexing. */
+-EXPORT_SYMBOL(tcp_hashinfo);
+-EXPORT_SYMBOL(tcp_listen_wlock);
+-EXPORT_SYMBOL(udp_hash);
+-EXPORT_SYMBOL(udp_hash_lock);
+-
+-EXPORT_SYMBOL(tcp_destroy_sock);
+-EXPORT_SYMBOL(ip_queue_xmit);
+-EXPORT_SYMBOL(memcpy_fromiovecend);
+-EXPORT_SYMBOL(csum_partial_copy_fromiovecend);
+-EXPORT_SYMBOL(tcp_v4_lookup_listener);
+-/* UDP/TCP exported functions for TCPv6 */
+-EXPORT_SYMBOL(udp_ioctl);
+-EXPORT_SYMBOL(udp_connect);
+-EXPORT_SYMBOL(udp_disconnect);
+-EXPORT_SYMBOL(udp_sendmsg);
+-EXPORT_SYMBOL(tcp_bind_hash);
+-EXPORT_SYMBOL(tcp_close);
+-EXPORT_SYMBOL(tcp_disconnect);
+-EXPORT_SYMBOL(tcp_accept);
+-EXPORT_SYMBOL(tcp_write_wakeup);
+-EXPORT_SYMBOL(tcp_write_space);
+-EXPORT_SYMBOL(tcp_poll);
+-EXPORT_SYMBOL(tcp_ioctl);
+-EXPORT_SYMBOL(tcp_shutdown);
+-EXPORT_SYMBOL(tcp_setsockopt);
+-EXPORT_SYMBOL(tcp_getsockopt);
+-EXPORT_SYMBOL(tcp_recvmsg);
+-EXPORT_SYMBOL(tcp_send_synack);
+-EXPORT_SYMBOL(tcp_check_req);
+-EXPORT_SYMBOL(tcp_child_process);
+-EXPORT_SYMBOL(tcp_parse_options);
+-EXPORT_SYMBOL(tcp_rcv_established);
+-EXPORT_SYMBOL(tcp_init_xmit_timers);
+-EXPORT_SYMBOL(tcp_clear_xmit_timers);
+-EXPORT_SYMBOL(tcp_statistics);
+-EXPORT_SYMBOL(tcp_rcv_state_process);
+-EXPORT_SYMBOL(tcp_timewait_state_process);
+-EXPORT_SYMBOL(tcp_timewait_cachep);
+-EXPORT_SYMBOL(tcp_sendmsg);
+-EXPORT_SYMBOL(tcp_v4_rebuild_header);
+-EXPORT_SYMBOL(tcp_v4_send_check);
+-EXPORT_SYMBOL(tcp_v4_conn_request);
+-EXPORT_SYMBOL(tcp_create_openreq_child);
+-EXPORT_SYMBOL(tcp_bucket_create);
+-EXPORT_SYMBOL(tcp_put_port);
+-EXPORT_SYMBOL(tcp_inherit_port);
+-EXPORT_SYMBOL(tcp_v4_syn_recv_sock);
+-EXPORT_SYMBOL(tcp_v4_do_rcv);
+-EXPORT_SYMBOL(tcp_v4_connect);
+-EXPORT_SYMBOL(tcp_unhash);
+-EXPORT_SYMBOL(udp_prot);
+-EXPORT_SYMBOL(tcp_prot);
+-EXPORT_SYMBOL(tcp_openreq_cachep);
+-EXPORT_SYMBOL(ipv4_specific);
+-EXPORT_SYMBOL(tcp_simple_retransmit);
+-EXPORT_SYMBOL(tcp_transmit_skb);
+-EXPORT_SYMBOL(tcp_connect);
+-EXPORT_SYMBOL(tcp_make_synack);
+-EXPORT_SYMBOL(tcp_tw_deschedule);
+-EXPORT_SYMBOL(tcp_delete_keepalive_timer);
+-EXPORT_SYMBOL(tcp_reset_keepalive_timer);
+-EXPORT_SYMBOL(sysctl_local_port_range);
+-EXPORT_SYMBOL(tcp_port_rover);
+-EXPORT_SYMBOL(udp_port_rover);
+-EXPORT_SYMBOL(tcp_sync_mss);
+-EXPORT_SYMBOL(net_statistics); 
+-EXPORT_SYMBOL(__tcp_mem_reclaim);
+-EXPORT_SYMBOL(tcp_sockets_allocated);
+-EXPORT_SYMBOL(sysctl_tcp_reordering);
+-EXPORT_SYMBOL(sysctl_tcp_rmem);
+-EXPORT_SYMBOL(sysctl_tcp_wmem);
+-EXPORT_SYMBOL(sysctl_tcp_ecn);
+-EXPORT_SYMBOL(tcp_cwnd_application_limited);
+-EXPORT_SYMBOL(tcp_sendpage);
+-EXPORT_SYMBOL(sysctl_tcp_low_latency);
+-
+-EXPORT_SYMBOL(tcp_write_xmit);
+-
+-EXPORT_SYMBOL(tcp_v4_remember_stamp); 
+-
+-extern int sysctl_tcp_tw_recycle;
+-
+-#ifdef CONFIG_SYSCTL
+-EXPORT_SYMBOL(sysctl_tcp_tw_recycle); 
+-EXPORT_SYMBOL(sysctl_max_syn_backlog);
+-#endif
+-
+-EXPORT_SYMBOL(ip_generic_getfrag);
+-
+-#endif
+-
+-EXPORT_SYMBOL(tcp_read_sock);
+-
+-#ifdef CONFIG_IP_SCTP_MODULE
+-EXPORT_SYMBOL(ip_setsockopt);
+-EXPORT_SYMBOL(ip_getsockopt);
+-EXPORT_SYMBOL(inet_ioctl);
+-EXPORT_SYMBOL(inet_bind);
+-EXPORT_SYMBOL(inet_getname);
+-#endif /* CONFIG_IP_SCTP_MODULE */
+-
+-EXPORT_SYMBOL(netlink_set_err);
+-EXPORT_SYMBOL(netlink_broadcast);
+-EXPORT_SYMBOL(netlink_unicast);
+-EXPORT_SYMBOL(netlink_kernel_create);
+-EXPORT_SYMBOL(netlink_dump_start);
+-EXPORT_SYMBOL(netlink_ack);
+-EXPORT_SYMBOL(netlink_set_nonroot);
+-EXPORT_SYMBOL(netlink_register_notifier);
+-EXPORT_SYMBOL(netlink_unregister_notifier);
+-#if defined(CONFIG_NETLINK_DEV) || defined(CONFIG_NETLINK_DEV_MODULE)
+-EXPORT_SYMBOL(netlink_attach);
+-EXPORT_SYMBOL(netlink_detach);
+-EXPORT_SYMBOL(netlink_post);
+-#endif
+-
+-EXPORT_SYMBOL(rtattr_parse);
+-EXPORT_SYMBOL(__rta_fill);
+-EXPORT_SYMBOL(neigh_delete);
+-EXPORT_SYMBOL(neigh_add);
+-EXPORT_SYMBOL(neigh_dump_info);
+-
+-
+-/* ABI emulation layers need this */
+-EXPORT_SYMBOL(move_addr_to_kernel);
+-EXPORT_SYMBOL(move_addr_to_user);
+-                  
+-/* Used by at least ipip.c.  */
+-EXPORT_SYMBOL(ipv4_config);
+-
+-/* Used by other modules */
+-EXPORT_SYMBOL(xrlim_allow);
+-
+-EXPORT_SYMBOL(ip_rcv);
+-EXPORT_SYMBOL(arp_rcv);
+-EXPORT_SYMBOL(arp_tbl);
+-#if defined(CONFIG_ATM_CLIP) || defined(CONFIG_ATM_CLIP_MODULE)
+-EXPORT_SYMBOL(clip_tbl_hook);
+-#endif
+-EXPORT_SYMBOL(arp_find);
+-
+-#endif  /* CONFIG_INET */
+-
+-#ifdef CONFIG_TR
+-EXPORT_SYMBOL(tr_source_route);
+-EXPORT_SYMBOL(tr_type_trans);
+-#endif
+-
+-/* Device callback registration */
+-EXPORT_SYMBOL(register_netdevice_notifier);
+-EXPORT_SYMBOL(unregister_netdevice_notifier);
+-EXPORT_SYMBOL(call_netdevice_notifiers);
+-
+-/* support for loadable net drivers */
+-#ifdef CONFIG_NET
+-EXPORT_SYMBOL(loopback_dev);
+-EXPORT_SYMBOL(register_netdevice);
+-EXPORT_SYMBOL(unregister_netdevice);
+-EXPORT_SYMBOL(free_netdev);
+-EXPORT_SYMBOL(synchronize_net);
+-EXPORT_SYMBOL(netdev_state_change);
+-EXPORT_SYMBOL(netdev_boot_setup_check);
+-EXPORT_SYMBOL(dev_new_index);
+-EXPORT_SYMBOL(dev_get_by_flags);
+-EXPORT_SYMBOL(__dev_get_by_flags);
+-EXPORT_SYMBOL(dev_get_by_index);
+-EXPORT_SYMBOL(__dev_get_by_index);
+-EXPORT_SYMBOL(dev_get_by_name);
+-EXPORT_SYMBOL(__dev_get_by_name);
+-EXPORT_SYMBOL(dev_getbyhwaddr);
+-EXPORT_SYMBOL(netdev_set_master);
+-EXPORT_SYMBOL(eth_type_trans);
+-#ifdef CONFIG_FDDI
+-EXPORT_SYMBOL(fddi_type_trans);
+-#endif /* CONFIG_FDDI */
+-#if 0
+-EXPORT_SYMBOL(eth_copy_and_sum);
+-#endif
+-EXPORT_SYMBOL(alloc_skb);
+-EXPORT_SYMBOL(__kfree_skb);
+-EXPORT_SYMBOL(skb_clone);
+-EXPORT_SYMBOL(skb_copy);
+-EXPORT_SYMBOL(skb_pad);
+-EXPORT_SYMBOL(netif_rx);
+-EXPORT_SYMBOL(netif_receive_skb);
+-EXPORT_SYMBOL(dev_add_pack);
+-EXPORT_SYMBOL(dev_remove_pack);
+-EXPORT_SYMBOL(__dev_remove_pack);
+-EXPORT_SYMBOL(__dev_get);
+-EXPORT_SYMBOL(dev_alloc);
+-EXPORT_SYMBOL(dev_alloc_name);
+-EXPORT_SYMBOL(__netdev_watchdog_up);
+-#ifdef CONFIG_KMOD
+-EXPORT_SYMBOL(dev_load);
+-#endif
+-EXPORT_SYMBOL(dev_ioctl);
+-EXPORT_SYMBOL(dev_queue_xmit);
+-#ifdef CONFIG_NET_HW_FLOWCONTROL
+-EXPORT_SYMBOL(netdev_dropping);
+-EXPORT_SYMBOL(netdev_register_fc);
+-EXPORT_SYMBOL(netdev_unregister_fc);
+-EXPORT_SYMBOL(netdev_fc_xoff);
+-#endif
+-EXPORT_SYMBOL(dev_base);
+-EXPORT_SYMBOL(dev_base_lock);
+-EXPORT_SYMBOL(dev_open);
+-EXPORT_SYMBOL(dev_close);
+-EXPORT_SYMBOL(dev_mc_add);
+-EXPORT_SYMBOL(dev_mc_delete);
+-EXPORT_SYMBOL(dev_mc_upload);
+-EXPORT_SYMBOL(dev_set_allmulti);
+-EXPORT_SYMBOL(dev_set_promiscuity);
+-EXPORT_SYMBOL(__kill_fasync);
+-
+-EXPORT_SYMBOL(rtnl);
+-EXPORT_SYMBOL(rtnetlink_links);
+-EXPORT_SYMBOL(rtnetlink_dump_ifinfo);
+-EXPORT_SYMBOL(rtnetlink_put_metrics);
+-EXPORT_SYMBOL(rtnl_sem);
+-EXPORT_SYMBOL(rtnl_lock);
+-EXPORT_SYMBOL(rtnl_unlock);
+-
+-#ifdef CONFIG_HIPPI
+-EXPORT_SYMBOL(hippi_type_trans);
+-#endif
+-
+-#ifdef CONFIG_NET_FASTROUTE
+-EXPORT_SYMBOL(netdev_fastroute);
+-#endif
+-
+-#ifdef CONFIG_SYSCTL
+-EXPORT_SYMBOL(sysctl_wmem_max);
+-EXPORT_SYMBOL(sysctl_rmem_max);
+-#ifdef CONFIG_INET
+-EXPORT_SYMBOL(sysctl_ip_default_ttl);
+-#endif
+-#endif
+-
+-/* Packet scheduler modules want these. */
+-EXPORT_SYMBOL(qdisc_destroy);
+-EXPORT_SYMBOL(qdisc_reset);
+-EXPORT_SYMBOL(qdisc_restart);
+-EXPORT_SYMBOL(qdisc_create_dflt);
+-EXPORT_SYMBOL(noop_qdisc);
+-EXPORT_SYMBOL(qdisc_tree_lock);
+-#ifdef CONFIG_NET_SCHED
+-PSCHED_EXPORTLIST;
+-EXPORT_SYMBOL(pfifo_qdisc_ops);
+-EXPORT_SYMBOL(bfifo_qdisc_ops);
+-EXPORT_SYMBOL(register_qdisc);
+-EXPORT_SYMBOL(unregister_qdisc);
+-EXPORT_SYMBOL(qdisc_get_rtab);
+-EXPORT_SYMBOL(qdisc_put_rtab);
+-EXPORT_SYMBOL(qdisc_copy_stats);
+-#ifdef CONFIG_NET_ESTIMATOR
+-EXPORT_SYMBOL(qdisc_new_estimator);
+-EXPORT_SYMBOL(qdisc_kill_estimator);
+-#endif
+-#ifdef CONFIG_NET_CLS_POLICE
+-EXPORT_SYMBOL(tcf_police);
+-EXPORT_SYMBOL(tcf_police_locate);
+-EXPORT_SYMBOL(tcf_police_destroy);
+-EXPORT_SYMBOL(tcf_police_dump);
+-#endif
+-#endif
+-#ifdef CONFIG_NET_CLS
+-EXPORT_SYMBOL(register_tcf_proto_ops);
+-EXPORT_SYMBOL(unregister_tcf_proto_ops);
+-#endif
+-#ifdef CONFIG_NETFILTER
+-#include <linux/netfilter.h>
+-EXPORT_SYMBOL(nf_register_hook);
+-EXPORT_SYMBOL(nf_unregister_hook);
+-EXPORT_SYMBOL(nf_register_sockopt);
+-EXPORT_SYMBOL(nf_unregister_sockopt);
+-EXPORT_SYMBOL(nf_reinject);
+-EXPORT_SYMBOL(nf_register_queue_handler);
+-EXPORT_SYMBOL(nf_unregister_queue_handler);
+-EXPORT_SYMBOL(nf_hook_slow);
+-EXPORT_SYMBOL(nf_hooks);
+-EXPORT_SYMBOL(nf_setsockopt);
+-EXPORT_SYMBOL(nf_getsockopt);
+-EXPORT_SYMBOL(ip_ct_attach);
+-#ifdef CONFIG_INET
+-#include <linux/netfilter_ipv4.h>
+-EXPORT_SYMBOL(ip_route_me_harder);
+-#endif
+-#endif
+-
+-EXPORT_SYMBOL(register_gifconf);
+-
+-EXPORT_PER_CPU_SYMBOL(softnet_data);
+-
+-#ifdef CONFIG_NET_RADIO
+-#include <net/iw_handler.h>		/* Wireless Extensions driver API */
+-EXPORT_SYMBOL(wireless_send_event);
+-EXPORT_SYMBOL(iw_handler_set_spy);
+-EXPORT_SYMBOL(iw_handler_get_spy);
+-EXPORT_SYMBOL(iw_handler_set_thrspy);
+-EXPORT_SYMBOL(iw_handler_get_thrspy);
+-EXPORT_SYMBOL(wireless_spy_update);
+-#endif	/* CONFIG_NET_RADIO */
+-
+-EXPORT_SYMBOL(linkwatch_fire_event);
+-
+-/* ethtool.c */
+-EXPORT_SYMBOL(ethtool_op_get_link);
+-EXPORT_SYMBOL(ethtool_op_get_tx_csum);
+-EXPORT_SYMBOL(ethtool_op_set_tx_csum);
+-EXPORT_SYMBOL(ethtool_op_get_sg);
+-EXPORT_SYMBOL(ethtool_op_set_sg);
+-EXPORT_SYMBOL(ethtool_op_get_tso);
+-EXPORT_SYMBOL(ethtool_op_set_tso);
+-
+-#endif  /* CONFIG_NET */
+--- linux-2.6.0-test6/net/sched/cls_api.c	2003-06-14 12:18:03.000000000 -0700
++++ 25/net/sched/cls_api.c	2003-10-05 00:33:25.000000000 -0700
+@@ -467,3 +467,6 @@ int __init tc_filter_init(void)
+ #endif
+ 	return 0;
+ }
++
++EXPORT_SYMBOL(register_tcf_proto_ops);
++EXPORT_SYMBOL(unregister_tcf_proto_ops);
+--- linux-2.6.0-test6/net/sched/estimator.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/net/sched/estimator.c	2003-10-05 00:33:25.000000000 -0700
+@@ -12,6 +12,7 @@
+ #include <asm/uaccess.h>
+ #include <asm/system.h>
+ #include <asm/bitops.h>
++#include <linux/module.h>
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/jiffies.h>
+@@ -194,3 +195,5 @@ void qdisc_kill_estimator(struct tc_stat
+ 	}
+ }
+ 
++EXPORT_SYMBOL(qdisc_kill_estimator);
++EXPORT_SYMBOL(qdisc_new_estimator);
+--- linux-2.6.0-test6/net/sched/police.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/net/sched/police.c	2003-10-05 00:33:25.000000000 -0700
+@@ -13,6 +13,7 @@
+ #include <asm/system.h>
+ #include <asm/bitops.h>
+ #include <linux/config.h>
++#include <linux/module.h>
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/sched.h>
+@@ -248,3 +249,12 @@ rtattr_failure:
+ 	skb_trim(skb, b - skb->data);
+ 	return -1;
+ }
++
++EXPORT_SYMBOL(tcf_police);
++EXPORT_SYMBOL(tcf_police_destroy);
++EXPORT_SYMBOL(tcf_police_dump);
++EXPORT_SYMBOL(tcf_police_hash);
++EXPORT_SYMBOL(tcf_police_ht);
++EXPORT_SYMBOL(tcf_police_locate);
++EXPORT_SYMBOL(tcf_police_lookup);
++EXPORT_SYMBOL(tcf_police_new_index);
+--- linux-2.6.0-test6/net/sched/sch_api.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/net/sched/sch_api.c	2003-10-05 00:33:25.000000000 -0700
+@@ -1255,3 +1255,10 @@ int __init pktsched_init(void)
+ 
+ 	return 0;
+ }
++
++EXPORT_SYMBOL(qdisc_copy_stats);
++EXPORT_SYMBOL(qdisc_get_rtab);
++EXPORT_SYMBOL(qdisc_put_rtab);
++EXPORT_SYMBOL(register_qdisc);
++EXPORT_SYMBOL(unregister_qdisc);
++PSCHED_EXPORTLIST;
+--- linux-2.6.0-test6/net/sched/sch_fifo.c	2003-07-10 18:50:32.000000000 -0700
++++ 25/net/sched/sch_fifo.c	2003-10-05 00:33:25.000000000 -0700
+@@ -203,3 +203,6 @@ struct Qdisc_ops bfifo_qdisc_ops = {
+ 	.dump		=	fifo_dump,
+ 	.owner		=	THIS_MODULE,
+ };
++
++EXPORT_SYMBOL(bfifo_qdisc_ops);
++EXPORT_SYMBOL(pfifo_qdisc_ops);
+--- linux-2.6.0-test6/net/sched/sch_generic.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/net/sched/sch_generic.c	2003-10-05 00:33:25.000000000 -0700
+@@ -531,3 +531,12 @@ void dev_shutdown(struct net_device *dev
+ 	spin_unlock_bh(&dev->queue_lock);
+ 	write_unlock(&qdisc_tree_lock);
+ }
++
++EXPORT_SYMBOL(__netdev_watchdog_up);
++EXPORT_SYMBOL(noop_qdisc);
++EXPORT_SYMBOL(noop_qdisc_ops);
++EXPORT_SYMBOL(qdisc_create_dflt);
++EXPORT_SYMBOL(qdisc_destroy);
++EXPORT_SYMBOL(qdisc_reset);
++EXPORT_SYMBOL(qdisc_restart);
++EXPORT_SYMBOL(qdisc_tree_lock);
+--- linux-2.6.0-test6/net/sctp/associola.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/net/sctp/associola.c	2003-10-05 00:33:25.000000000 -0700
+@@ -141,9 +141,9 @@ struct sctp_association *sctp_associatio
+ 	 * socket values.
+ 	 */
+ 	asoc->max_retrans = sp->assocparams.sasoc_asocmaxrxt;
+-	asoc->rto_initial = sp->rtoinfo.srto_initial * HZ / 1000;
+-	asoc->rto_max = sp->rtoinfo.srto_max * HZ / 1000;
+-	asoc->rto_min = sp->rtoinfo.srto_min * HZ / 1000;
++	asoc->rto_initial = MSECS_TO_JIFFIES(sp->rtoinfo.srto_initial);
++	asoc->rto_max = MSECS_TO_JIFFIES(sp->rtoinfo.srto_max);
++	asoc->rto_min = MSECS_TO_JIFFIES(sp->rtoinfo.srto_min);
+ 
+ 	asoc->overall_error_count = 0;
+ 
+@@ -168,7 +168,8 @@ struct sctp_association *sctp_associatio
+ 	asoc->c.sinit_num_ostreams  = sp->initmsg.sinit_num_ostreams;
+ 	asoc->max_init_attempts	= sp->initmsg.sinit_max_attempts;
+ 
+-	asoc->max_init_timeo    = sp->initmsg.sinit_max_init_timeo * HZ / 1000;
++	asoc->max_init_timeo =
++		 MSECS_TO_JIFFIES(sp->initmsg.sinit_max_init_timeo);
+ 
+ 	/* Allocate storage for the ssnmap after the inbound and outbound
+ 	 * streams have been negotiated during Init.
+@@ -246,6 +247,11 @@ struct sctp_association *sctp_associatio
+ 	 */
+ 	asoc->peer.sack_needed = 1;
+ 
++	/* Assume that the peer recongizes ASCONF until reported otherwise
++	 * via an ERROR chunk.
++	 */
++	asoc->peer.asconf_capable = 1;
++
+ 	/* Create an input queue.  */
+ 	sctp_inq_init(&asoc->base.inqueue);
+ 	sctp_inq_set_th_handler(&asoc->base.inqueue,
+@@ -495,7 +501,7 @@ struct sctp_transport *sctp_assoc_add_pe
+ 	/* Initialize the peer's heartbeat interval based on the
+ 	 * sock configured value.
+ 	 */
+-	peer->hb_interval = sp->paddrparam.spp_hbinterval * HZ;
++	peer->hb_interval = MSECS_TO_JIFFIES(sp->paddrparam.spp_hbinterval);
+ 
+ 	/* Set the path max_retrans.  */
+ 	peer->max_retrans = asoc->max_retrans;
+--- linux-2.6.0-test6/net/sctp/bind_addr.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/net/sctp/bind_addr.c	2003-10-05 00:33:25.000000000 -0700
+@@ -324,6 +324,43 @@ int sctp_bind_addr_match(struct sctp_bin
+ 	return 0;
+ }
+ 
++/* Find the first address in the bind address list that is not present in
++ * the addrs packed array.
++ */
++union sctp_addr *sctp_find_unmatch_addr(struct sctp_bind_addr	*bp,
++					const union sctp_addr	*addrs,
++					int			addrcnt,
++					struct sctp_opt		*opt)
++{
++	struct sctp_sockaddr_entry	*laddr;
++	union sctp_addr			*addr;
++	void 				*addr_buf;
++	struct sctp_af			*af;
++	struct list_head		*pos;
++	int				i;
++
++	list_for_each(pos, &bp->address_list) {
++		laddr = list_entry(pos, struct sctp_sockaddr_entry, list);
++		
++		addr_buf = (union sctp_addr *)addrs;
++		for (i = 0; i < addrcnt; i++) {
++			addr = (union sctp_addr *)addr_buf;
++			af = sctp_get_af_specific(addr->v4.sin_family);
++			if (!af) 
++				return NULL;
++
++			if (opt->pf->cmp_addr(&laddr->a, addr, opt))
++				break;
++
++			addr_buf += af->sockaddr_len;
++		}
++		if (i == addrcnt)
++			return &laddr->a;
++	}
++
++	return NULL;
++}
++
+ /* Copy out addresses from the global local address list. */
+ static int sctp_copy_one_addr(struct sctp_bind_addr *dest, 
+ 			      union sctp_addr *addr,
+--- linux-2.6.0-test6/net/sctp/endpointola.c	2003-08-08 22:55:14.000000000 -0700
++++ 25/net/sctp/endpointola.c	2003-10-05 00:33:25.000000000 -0700
+@@ -129,7 +129,7 @@ struct sctp_endpoint *sctp_endpoint_init
+ 	ep->timeouts[SCTP_EVENT_TIMEOUT_T1_INIT] =
+ 		SCTP_DEFAULT_TIMEOUT_T1_INIT;
+ 	ep->timeouts[SCTP_EVENT_TIMEOUT_T2_SHUTDOWN] =
+-		sp->rtoinfo.srto_initial * HZ / 1000;
++		MSECS_TO_JIFFIES(sp->rtoinfo.srto_initial);
+ 	ep->timeouts[SCTP_EVENT_TIMEOUT_T3_RTX] = 0;
+ 	ep->timeouts[SCTP_EVENT_TIMEOUT_T4_RTO] = 0;
+ 
+@@ -138,7 +138,7 @@ struct sctp_endpoint *sctp_endpoint_init
+ 	 * recommended value of 5 times 'RTO.Max'.
+ 	 */
+         ep->timeouts[SCTP_EVENT_TIMEOUT_T5_SHUTDOWN_GUARD]
+-		= 5 * (sp->rtoinfo.srto_max * HZ / 1000);
++		= 5 * MSECS_TO_JIFFIES(sp->rtoinfo.srto_max);
+ 
+ 	ep->timeouts[SCTP_EVENT_TIMEOUT_HEARTBEAT] =
+ 		SCTP_DEFAULT_TIMEOUT_HEARTBEAT;
+--- linux-2.6.0-test6/net/sctp/sm_make_chunk.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/net/sctp/sm_make_chunk.c	2003-10-05 00:33:25.000000000 -0700
+@@ -1,5 +1,5 @@
+ /* SCTP kernel reference Implementation
+- * Copyright (C) IBM Corp. 2001, 2003
++ * (C) Copyright IBM Corp. 2001, 2003
+  * Copyright (c) 1999-2000 Cisco, Inc.
+  * Copyright (c) 1999-2001 Motorola, Inc.
+  * Copyright (c) 2001-2002 Intel Corp.
+@@ -1288,7 +1288,7 @@ sctp_cookie_param_t *sctp_pack_cookie(co
+ 
+ 	/* Set an expiration time for the cookie.  */
+ 	do_gettimeofday(&cookie->c.expiration);
+-	tv_add(&asoc->cookie_life, &cookie->c.expiration);
++	TIMEVAL_ADD(asoc->cookie_life, cookie->c.expiration);
+ 
+ 	/* Copy the peer's init packet.  */
+ 	memcpy(&cookie->c.peer_init[0], init_chunk->chunk_hdr,
+@@ -2021,11 +2021,11 @@ struct sctp_chunk *sctp_make_asconf(stru
+ 	sctp_addiphdr_t asconf;
+ 	struct sctp_chunk *retval;
+ 	int length = sizeof(asconf) + vparam_len;
+-	union sctp_params addrparam;
++	union sctp_addr_param addrparam;
+ 	int addrlen;
+ 	struct sctp_af *af = sctp_get_af_specific(addr->v4.sin_family);
+ 
+-	addrlen = af->to_addr_param(addr, (union sctp_addr_param *)&addrparam);
++	addrlen = af->to_addr_param(addr, &addrparam);
+ 	if (!addrlen)
+ 		return NULL;
+ 	length += addrlen;
+@@ -2046,6 +2046,83 @@ struct sctp_chunk *sctp_make_asconf(stru
+ }
+ 
+ /* ADDIP
++ * 3.2.1 Add IP Address
++ * 	0                   1                   2                   3
++ * 	0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
++ *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
++ *     |        Type = 0xC001          |    Length = Variable          |
++ *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
++ *     |               ASCONF-Request Correlation ID                   |
++ *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
++ *     |                       Address Parameter                       |
++ *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
++ *
++ * 3.2.2 Delete IP Address
++ * 	0                   1                   2                   3
++ * 	0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
++ *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
++ *     |        Type = 0xC002          |    Length = Variable          |
++ *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
++ *     |               ASCONF-Request Correlation ID                   |
++ *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
++ *     |                       Address Parameter                       |
++ *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
++ *
++ */
++struct sctp_chunk *sctp_make_asconf_update_ip(struct sctp_association *asoc,
++					      union sctp_addr	      *laddr,
++					      struct sockaddr	      *addrs,
++					      int		      addrcnt,
++					      int		      flags)
++{
++	sctp_addip_param_t	param;
++	struct sctp_chunk	*retval;
++	union sctp_addr_param	addr_param;
++	union sctp_addr		*addr;
++	void			*addr_buf;
++	struct sctp_af		*af;
++	int			paramlen = sizeof(param);
++	int			addr_param_len = 0;
++	int 			totallen = 0;
++	int 			i;
++
++	/* Get total length of all the address parameters. */
++	addr_buf = addrs;
++	for (i = 0; i < addrcnt; i++) {
++		addr = (union sctp_addr *)addr_buf;
++		af = sctp_get_af_specific(addr->v4.sin_family);
++		addr_param_len = af->to_addr_param(addr, &addr_param);
++
++		totallen += paramlen;
++		totallen += addr_param_len;
++
++		addr_buf += af->sockaddr_len;
++	}
++
++	/* Create an asconf chunk with the required length. */
++	retval = sctp_make_asconf(asoc, laddr, totallen);
++	if (!retval)
++		return NULL;
++
++	/* Add the address parameters to the asconf chunk. */
++	addr_buf = addrs;
++	for (i = 0; i < addrcnt; i++) {
++		addr = (union sctp_addr *)addr_buf;
++		af = sctp_get_af_specific(addr->v4.sin_family);
++		addr_param_len = af->to_addr_param(addr, &addr_param);
++		param.param_hdr.type = flags;
++		param.param_hdr.length = htons(paramlen + addr_param_len);
++		param.crr_id = htonl(i);
++
++		sctp_addto_chunk(retval, paramlen, &param);
++		sctp_addto_chunk(retval, addr_param_len, &addr_param);
++
++		addr_buf += af->sockaddr_len;
++	}
++	return retval;
++}
++
++/* ADDIP
+  * 3.2.4 Set Primary IP Address
+  *	0                   1                   2                   3
+  *	0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+@@ -2065,11 +2142,11 @@ struct sctp_chunk *sctp_make_asconf_set_
+ 	sctp_addip_param_t	param;
+ 	struct sctp_chunk 	*retval;
+ 	int 			len = sizeof(param);
+-	union sctp_params	addrparam;
++	union sctp_addr_param	addrparam;
+ 	int			addrlen;
+ 	struct sctp_af		*af = sctp_get_af_specific(addr->v4.sin_family);
+ 
+-	addrlen = af->to_addr_param(addr, (union sctp_addr_param *)&addrparam);
++	addrlen = af->to_addr_param(addr, &addrparam);
+ 	if (!addrlen)
+ 		return NULL;
+ 	len += addrlen;
+@@ -2089,11 +2166,7 @@ struct sctp_chunk *sctp_make_asconf_set_
+ 	return retval;
+ }
+ 
+-/*
+- * Unpack the parameters in an ASCONF chunk into an association and
+- * generate ASCONF-ACK chunk.
+- *
+- * ADDIP 3.1.2 Address Configuration Acknowledgement Chunk (ASCONF-ACK)
++/* ADDIP 3.1.2 Address Configuration Acknowledgement Chunk (ASCONF-ACK)
+  *      0                   1                   2                   3
+  *      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+  *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+@@ -2110,8 +2183,28 @@ struct sctp_chunk *sctp_make_asconf_set_
+  *     |                 ASCONF Parameter Response#N                   |
+  *     +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+  *
+- * All the parameter respoinces will be added in this function.
++ * Create an ASCONF_ACK chunk with enough space for the parameter responses. 
+  */
++struct sctp_chunk *sctp_make_asconf_ack(struct sctp_association	*asoc,
++					int serial, int vparam_len)
++{
++	sctp_addiphdr_t		asconf;
++	struct sctp_chunk	*retval;
++	int			length = sizeof(asconf) + vparam_len;
++
++	/* Create the chunk.  */
++	retval = sctp_make_chunk(asoc, SCTP_CID_ASCONF_ACK, 0, length);
++	if (!retval)
++		return NULL;
++
++	asconf.serial = serial;
++
++	retval->subh.addip_hdr =
++		sctp_addto_chunk(retval, sizeof(asconf), &asconf);
++
++	return retval;
++}
++
+ struct sctp_chunk *sctp_process_asconf(struct sctp_association *asoc,
+ 					struct sctp_chunk *asconf,
+ 					int vparam_len)
+--- linux-2.6.0-test6/net/sctp/sm_sideeffect.c	2003-08-08 22:55:14.000000000 -0700
++++ 25/net/sctp/sm_sideeffect.c	2003-10-05 00:33:25.000000000 -0700
+@@ -1,7 +1,7 @@
+ /* SCTP kernel reference Implementation
++ * (C) Copyright IBM Corp. 2001, 2003
+  * Copyright (c) 1999 Cisco, Inc.
+  * Copyright (c) 1999-2001 Motorola, Inc.
+- * Copyright (c) 2001-2002 International Business Machines Corp.
+  *
+  * This file is part of the SCTP kernel reference Implementation
+  *
+@@ -690,6 +690,44 @@ static void sctp_cmd_setup_t4(sctp_cmd_s
+ 	chunk->transport = t;
+ }
+ 
++/* Process an incoming Operation Error Chunk. */ 
++static void sctp_cmd_process_operr(sctp_cmd_seq_t *cmds,
++				   struct sctp_association *asoc,
++				   struct sctp_chunk *chunk)
++{
++	struct sctp_operr_chunk *operr_chunk;
++	struct sctp_errhdr *err_hdr;
++
++	operr_chunk = (struct sctp_operr_chunk *)chunk->chunk_hdr;
++	err_hdr = &operr_chunk->err_hdr;
++
++	switch (err_hdr->cause) {
++	case SCTP_ERROR_UNKNOWN_CHUNK:
++	{
++		struct sctp_chunkhdr *unk_chunk_hdr;
++
++		unk_chunk_hdr = (struct sctp_chunkhdr *)err_hdr->variable;
++		switch (unk_chunk_hdr->type) {
++		/* ADDIP 4.1 A9) If the peer responds to an ASCONF with an
++		 * ERROR chunk reporting that it did not recognized the ASCONF
++		 * chunk type, the sender of the ASCONF MUST NOT send any
++		 * further ASCONF chunks and MUST stop its T-4 timer.
++		 */
++		case SCTP_CID_ASCONF:
++			asoc->peer.asconf_capable = 0;
++			sctp_add_cmd_sf(cmds, SCTP_CMD_TIMER_STOP,
++					SCTP_TO(SCTP_EVENT_TIMEOUT_T4_RTO));
++			break;
++		default:
++			break;
++		}
++		break;
++	}
++	default:
++		break;
++	}
++}
++
+ /* These three macros allow us to pull the debugging code out of the
+  * main flow of sctp_do_sm() to keep attention focused on the real
+  * functionality there.
+@@ -1205,6 +1243,9 @@ int sctp_cmd_interpreter(sctp_event_t ev
+ 			sctp_cmd_setup_t4(commands, asoc, cmd->obj.ptr);
+ 			break;
+ 
++		case SCTP_CMD_PROCESS_OPERR:
++			sctp_cmd_process_operr(commands, asoc, chunk);
++			break;
+ 		default:
+ 			printk(KERN_WARNING "Impossible command: %u, %p\n",
+ 			       cmd->verb, cmd->obj.ptr);
+--- linux-2.6.0-test6/net/sctp/sm_statefuns.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/net/sctp/sm_statefuns.c	2003-10-05 00:33:25.000000000 -0700
+@@ -1,7 +1,7 @@
+ /* SCTP kernel reference Implementation
++ * (C) Copyright IBM Corp. 2001, 2003
+  * Copyright (c) 1999-2000 Cisco, Inc.
+  * Copyright (c) 1999-2001 Motorola, Inc.
+- * Copyright (c) 2001-2002 International Business Machines, Corp.
+  * Copyright (c) 2001-2002 Intel Corp.
+  * Copyright (c) 2002      Nokia Corp.
+  *
+@@ -2864,6 +2864,9 @@ sctp_disposition_t sctp_sf_operr_notify(
+ 			sctp_ulpevent_free(ev);
+ 			goto nomem;
+ 		}
++
++		sctp_add_cmd_sf(commands, SCTP_CMD_PROCESS_OPERR,
++				SCTP_CHUNK(chunk));	
+ 	}
+ 	return SCTP_DISPOSITION_CONSUME;
+ 
+--- linux-2.6.0-test6/net/sctp/socket.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/net/sctp/socket.c	2003-10-05 00:33:25.000000000 -0700
+@@ -97,6 +97,8 @@ static void sctp_wait_for_close(struct s
+ static inline int sctp_verify_addr(struct sock *, union sctp_addr *, int);
+ static int sctp_bindx_add(struct sock *, struct sockaddr *, int);
+ static int sctp_bindx_rem(struct sock *, struct sockaddr *, int);
++static int sctp_send_asconf_add_ip(struct sock *, struct sockaddr *, int);
++static int sctp_send_asconf_del_ip(struct sock *, struct sockaddr *, int);
+ static int sctp_do_bind(struct sock *, union sctp_addr *, int);
+ static int sctp_autobind(struct sock *sk);
+ static void sctp_sock_migrate(struct sock *, struct sock *,
+@@ -349,6 +351,106 @@ err_bindx_add:
+ 	return retval;
+ }
+ 
++/* Send an ASCONF chunk with Add IP address parameters to all the peers of the
++ * associations that are part of the endpoint indicating that a list of local
++ * addresses are added to the endpoint.
++ *
++ * If any of the addresses is already in the bind address list of the 
++ * association, we do not send the chunk for that association.  But it will not
++ * affect other associations.
++ *
++ * Only sctp_setsockopt_bindx() is supposed to call this function.
++ */
++static int sctp_send_asconf_add_ip(struct sock		*sk, 
++				   struct sockaddr	*addrs,
++				   int 			addrcnt)
++{
++	struct sctp_opt			*sp;
++	struct sctp_endpoint		*ep;
++	struct sctp_association		*asoc;
++	struct sctp_bind_addr		*bp;
++	struct sctp_chunk		*chunk;
++	struct sctp_sockaddr_entry	*laddr;
++	union sctp_addr			*addr;
++	void				*addr_buf;
++	struct sctp_af			*af;
++	struct list_head		*pos;
++	struct list_head		*p;
++	int 				i;
++	int 				retval = 0;
++
++	sp = sctp_sk(sk);
++	ep = sp->ep;
++
++	SCTP_DEBUG_PRINTK("%s: (sk: %p, addrs: %p, addrcnt: %d)\n",
++			  __FUNCTION__, sk, addrs, addrcnt);
++
++	list_for_each(pos, &ep->asocs) {
++		asoc = list_entry(pos, struct sctp_association, asocs);
++
++		if (!sctp_state(asoc, ESTABLISHED))
++			continue;
++
++		if (!asoc->peer.asconf_capable)
++			continue;
++		
++		/* Check if any address in the packed array of addresses is
++	         * in the bind address list of the association. If so, 
++		 * do not send the asconf chunk to its peer, but continue with 
++		 * other associations.
++		 */
++		addr_buf = addrs;
++		for (i = 0; i < addrcnt; i++) {
++			addr = (union sctp_addr *)addr_buf;
++			af = sctp_get_af_specific(addr->v4.sin_family);
++			if (!af) {
++				retval = -EINVAL;
++				goto out;
++			}
++
++			if (sctp_assoc_lookup_laddr(asoc, addr))		
++				break;
++			
++			addr_buf += af->sockaddr_len;
++		}
++		if (i < addrcnt)
++			continue;
++
++		/* Use the first address in bind addr list of association as
++		 * Address Parameter of ASCONF CHUNK.
++		 */
++		sctp_read_lock(&asoc->base.addr_lock);
++		bp = &asoc->base.bind_addr;
++		p = bp->address_list.next;
++		laddr = list_entry(p, struct sctp_sockaddr_entry, list);
++		sctp_read_unlock(&asoc->base.addr_lock);
++
++		chunk = sctp_make_asconf_update_ip(asoc, &laddr->a, addrs,
++						   addrcnt, SCTP_PARAM_ADD_IP);
++		if (!chunk) {
++			retval = -ENOMEM;
++			goto out;
++		}
++
++		retval = sctp_primitive_ASCONF(asoc, chunk);
++		if (retval) {
++			sctp_chunk_free(chunk);
++			goto out;
++		}
++
++		/* FIXME: After sending the add address ASCONF chunk, we 
++		 * cannot append the address to the association's binding 
++		 * address list, because the new address may be used as the
++		 * source of a message sent to the peer before the ASCONF
++		 * chunk is received by the peer.  So we should wait until
++		 * ASCONF_ACK is received.
++		 */
++	}
++
++out:
++	return retval;
++}
++
+ /* Remove a list of addresses from bind addresses list.  Do not remove the
+  * last address.
+  *
+@@ -436,6 +538,106 @@ err_bindx_rem:
+ 	return retval;
+ }
+ 
++/* Send an ASCONF chunk with Delete IP address parameters to all the peers of
++ * the associations that are part of the endpoint indicating that a list of
++ * local addresses are removed from the endpoint.
++ *
++ * If any of the addresses is already in the bind address list of the 
++ * association, we do not send the chunk for that association.  But it will not
++ * affect other associations.
++ *
++ * Only sctp_setsockopt_bindx() is supposed to call this function.
++ */
++static int sctp_send_asconf_del_ip(struct sock		*sk,
++				   struct sockaddr	*addrs,
++				   int			addrcnt)
++{
++	struct sctp_opt		*sp;
++	struct sctp_endpoint	*ep;
++	struct sctp_association	*asoc;
++	struct sctp_bind_addr	*bp;
++	struct sctp_chunk	*chunk;
++	union sctp_addr		*laddr;
++	void			*addr_buf;
++	struct sctp_af		*af;
++	struct list_head	*pos;
++	int 			i;
++	int 			retval = 0;
++
++	sp = sctp_sk(sk);
++	ep = sp->ep;
++
++	SCTP_DEBUG_PRINTK("%s: (sk: %p, addrs: %p, addrcnt: %d)\n",
++			  __FUNCTION__, sk, addrs, addrcnt);
++
++	list_for_each(pos, &ep->asocs) {
++		asoc = list_entry(pos, struct sctp_association, asocs);
++
++		if (!sctp_state(asoc, ESTABLISHED))
++			continue;
++
++		if (!asoc->peer.asconf_capable)
++			continue;
++
++		/* Check if any address in the packed array of addresses is
++	         * not present in the bind address list of the association.
++		 * If so, do not send the asconf chunk to its peer, but
++		 * continue with other associations.
++		 */
++		addr_buf = addrs;
++		for (i = 0; i < addrcnt; i++) {
++			laddr = (union sctp_addr *)addr_buf;
++			af = sctp_get_af_specific(laddr->v4.sin_family);
++			if (!af) {
++				retval = -EINVAL;
++				goto out;
++			}
++
++			if (!sctp_assoc_lookup_laddr(asoc, laddr))		
++				break;
++			
++			addr_buf += af->sockaddr_len;
++		}
++		if (i < addrcnt)
++			continue;
++
++		/* Find one address in the association's bind address list
++		 * that is not in the packed array of addresses. This is to
++		 * make sure that we do not delete all the addresses in the
++		 * association.
++		 */
++		sctp_read_lock(&asoc->base.addr_lock);
++		bp = &asoc->base.bind_addr;
++		laddr = sctp_find_unmatch_addr(bp, (union sctp_addr *)addrs,
++					       addrcnt, sp);
++		sctp_read_unlock(&asoc->base.addr_lock);		
++		if (!laddr)
++			continue;
++
++		chunk = sctp_make_asconf_update_ip(asoc, laddr, addrs, addrcnt, 
++						   SCTP_PARAM_DEL_IP);
++		if (!chunk) {
++			retval = -ENOMEM;
++			goto out;
++		}
++
++		retval = sctp_primitive_ASCONF(asoc, chunk);
++		if (retval) {
++			sctp_chunk_free(chunk);
++			goto out;
++		}
++
++		/* FIXME: After sending the delete address ASCONF chunk, we
++		 * cannot remove the addresses from the association's bind
++		 * address list, because there maybe some packet send to
++		 * the delete addresses, so we should wait until ASCONF_ACK 
++		 * packet is received.
++		 */
++	}
++out:
++	return retval;
++}
++
+ /* Helper for tunneling sctp_bindx() requests through sctp_setsockopt()
+  *
+  * API 8.1
+@@ -564,10 +766,16 @@ SCTP_STATIC int sctp_setsockopt_bindx(st
+ 	switch (op) {
+ 	case SCTP_BINDX_ADD_ADDR:
+ 		err = sctp_bindx_add(sk, kaddrs, addrcnt);
++		if (err)
++			goto out;
++		err = sctp_send_asconf_add_ip(sk, kaddrs, addrcnt);
+ 		break;
+ 
+ 	case SCTP_BINDX_REM_ADDR:
+ 		err = sctp_bindx_rem(sk, kaddrs, addrcnt);
++		if (err)
++			goto out;
++		err = sctp_send_asconf_del_ip(sk, kaddrs, addrcnt);
+ 		break;
+ 
+ 	default:
+@@ -575,6 +783,7 @@ SCTP_STATIC int sctp_setsockopt_bindx(st
+ 		break;
+         };
+ 
++out:
+ 	kfree(kaddrs);
+ 
+ 	return err;
+@@ -962,8 +1171,8 @@ SCTP_STATIC int sctp_sendmsg(struct kioc
+ 					= sinit->sinit_max_attempts;
+ 			}
+ 			if (sinit->sinit_max_init_timeo) {
+-				asoc->max_init_timeo
+-					= sinit->sinit_max_init_timeo * HZ;
++				asoc->max_init_timeo = 
++				 MSECS_TO_JIFFIES(sinit->sinit_max_init_timeo);
+ 			}
+ 		}
+ 
+@@ -1401,7 +1610,8 @@ static int sctp_setsockopt_peer_addr_par
+ 	 */
+ 		if (params.spp_hbinterval) {
+ 			trans->hb_allowed = 1;
+-			trans->hb_interval = params.spp_hbinterval * HZ / 1000;
++			trans->hb_interval = 
++				MSECS_TO_JIFFIES(params.spp_hbinterval);
+ 		} else
+ 			trans->hb_allowed = 0;
+ 	}
+@@ -1560,11 +1770,12 @@ static int sctp_setsockopt_rtoinfo(struc
+ 
+ 	if (asoc) {
+ 		if (rtoinfo.srto_initial != 0)
+-			asoc->rto_initial = rtoinfo.srto_initial * HZ / 1000;
++			asoc->rto_initial = 
++				MSECS_TO_JIFFIES(rtoinfo.srto_initial);
+ 		if (rtoinfo.srto_max != 0)
+-			asoc->rto_max = rtoinfo.srto_max * HZ / 1000;
++			asoc->rto_max = MSECS_TO_JIFFIES(rtoinfo.srto_max);
+ 		if (rtoinfo.srto_min != 0)
+-			asoc->rto_min = rtoinfo.srto_min * HZ / 1000;
++			asoc->rto_min = MSECS_TO_JIFFIES(rtoinfo.srto_min);
+ 	} else {
+ 		/* If there is no association or the association-id = 0
+ 		 * set the values to the endpoint.
+@@ -2088,14 +2299,14 @@ SCTP_STATIC int sctp_init_sock(struct so
+ 	sp->initmsg.sinit_num_ostreams   = sctp_max_outstreams;
+ 	sp->initmsg.sinit_max_instreams  = sctp_max_instreams;
+ 	sp->initmsg.sinit_max_attempts   = sctp_max_retrans_init;
+-	sp->initmsg.sinit_max_init_timeo = (sctp_rto_max / HZ) * 1000;
++	sp->initmsg.sinit_max_init_timeo = JIFFIES_TO_MSECS(sctp_rto_max);
+ 
+ 	/* Initialize default RTO related parameters.  These parameters can
+ 	 * be modified for with the SCTP_RTOINFO socket option.
+ 	 */
+-	sp->rtoinfo.srto_initial = (sctp_rto_initial / HZ) * 1000;
+-	sp->rtoinfo.srto_max     = (sctp_rto_max / HZ) * 1000;
+-	sp->rtoinfo.srto_min     = (sctp_rto_min / HZ) * 1000;
++	sp->rtoinfo.srto_initial = JIFFIES_TO_MSECS(sctp_rto_initial);
++	sp->rtoinfo.srto_max     = JIFFIES_TO_MSECS(sctp_rto_max);
++	sp->rtoinfo.srto_min     = JIFFIES_TO_MSECS(sctp_rto_min);
+ 
+ 	/* Initialize default association related parameters. These parameters
+ 	 * can be modified with the SCTP_ASSOCINFO socket option.
+@@ -2104,8 +2315,8 @@ SCTP_STATIC int sctp_init_sock(struct so
+ 	sp->assocparams.sasoc_number_peer_destinations = 0;
+ 	sp->assocparams.sasoc_peer_rwnd = 0;
+ 	sp->assocparams.sasoc_local_rwnd = 0;
+-	sp->assocparams.sasoc_cookie_life = (sctp_valid_cookie_life / HZ)
+-					* 1000;
++	sp->assocparams.sasoc_cookie_life = 
++		JIFFIES_TO_MSECS(sctp_valid_cookie_life);
+ 
+ 	/* Initialize default event subscriptions. By default, all the
+ 	 * options are off. 
+@@ -2115,7 +2326,7 @@ SCTP_STATIC int sctp_init_sock(struct so
+ 	/* Default Peer Address Parameters.  These defaults can
+ 	 * be modified via SCTP_PEER_ADDR_PARAMS
+ 	 */
+-	sp->paddrparam.spp_hbinterval = (sctp_hb_interval / HZ) * 1000;
++	sp->paddrparam.spp_hbinterval = JIFFIES_TO_MSECS(sctp_hb_interval);
+ 	sp->paddrparam.spp_pathmaxrxt = sctp_max_retrans_path;
+ 
+ 	/* If enabled no SCTP message fragmentation will be performed.
+@@ -2265,7 +2476,7 @@ static int sctp_getsockopt_sctp_status(s
+ 	status.sstat_primary.spinfo_state = transport->active;
+ 	status.sstat_primary.spinfo_cwnd = transport->cwnd;
+ 	status.sstat_primary.spinfo_srtt = transport->srtt;
+-	status.sstat_primary.spinfo_rto = (transport->rto / HZ) * 1000;
++	status.sstat_primary.spinfo_rto = JIFFIES_TO_MSECS(transport->rto);
+ 	status.sstat_primary.spinfo_mtu = transport->pmtu;
+ 
+ 	if (put_user(len, optlen)) {
+@@ -2320,7 +2531,7 @@ static int sctp_getsockopt_peer_addr_inf
+ 	pinfo.spinfo_state = transport->active;
+ 	pinfo.spinfo_cwnd = transport->cwnd;
+ 	pinfo.spinfo_srtt = transport->srtt;
+-	pinfo.spinfo_rto = (transport->rto / HZ) * 1000;
++	pinfo.spinfo_rto = JIFFIES_TO_MSECS(transport->rto);
+ 	pinfo.spinfo_mtu = transport->pmtu;
+ 
+ 	if (put_user(len, optlen)) {
+@@ -2524,7 +2735,7 @@ static int sctp_getsockopt_peer_addr_par
+ 	if (!trans->hb_allowed)
+ 		params.spp_hbinterval = 0;
+ 	else
+-		params.spp_hbinterval = trans->hb_interval * 1000 / HZ;
++		params.spp_hbinterval = JIFFIES_TO_MSECS(trans->hb_interval);
+ 
+ 	/* spp_pathmaxrxt contains the maximum number of retransmissions
+ 	 * before this address shall be considered unreachable.
+@@ -2582,10 +2793,8 @@ static int sctp_getsockopt_peer_addrs_nu
+ 	list_for_each(pos, &asoc->peer.transport_addr_list) {
+ 		cnt ++;
+ 	}
+-	if (copy_to_user(optval, &cnt, sizeof(int)))
+-		return -EFAULT;
+ 
+-	return 0;
++	return cnt;
+ }
+ 
+ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len,
+@@ -2666,10 +2875,8 @@ static int sctp_getsockopt_local_addrs_n
+ 	list_for_each(pos, &bp->address_list) {
+ 		cnt ++;
+ 	}
+-	if (copy_to_user(optval, &cnt, sizeof(int)))
+-		return -EFAULT;
+ 
+-	return 0;
++	return cnt;
+ }
+ 
+ static int sctp_getsockopt_local_addrs(struct sock *sk, int len,
+@@ -2879,9 +3086,9 @@ static int sctp_getsockopt_rtoinfo(struc
+ 
+ 	/* Values corresponding to the specific association. */
+ 	if (asoc) {
+-		rtoinfo.srto_initial = (asoc->rto_initial / HZ) * 1000;
+-		rtoinfo.srto_max = (asoc->rto_max / HZ) * 1000;
+-		rtoinfo.srto_min = (asoc->rto_min / HZ) * 1000;
++		rtoinfo.srto_initial = JIFFIES_TO_MSECS(asoc->rto_initial);
++		rtoinfo.srto_max = JIFFIES_TO_MSECS(asoc->rto_max);
++		rtoinfo.srto_min = JIFFIES_TO_MSECS(asoc->rto_min);
+ 	} else {
+ 		/* Values corresponding to the endpoint. */
+ 		struct sctp_opt *sp = sctp_sk(sk);
+--- linux-2.6.0-test6/net/sctp/sysctl.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/net/sctp/sysctl.c	2003-10-05 00:33:25.000000000 -0700
+@@ -44,7 +44,7 @@
+ #include <linux/sysctl.h>
+ 
+ static ctl_handler sctp_sysctl_jiffies_ms;
+-static long rto_timer_min = 0;
++static long rto_timer_min = 1;
+ static long rto_timer_max = 86400000; /* One day */
+ 
+ static ctl_table sctp_table[] = {
+--- linux-2.6.0-test6/net/socket.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/net/socket.c	2003-10-05 00:34:03.000000000 -0700
+@@ -394,6 +394,7 @@ int sock_map_fd(struct socket *sock)
+ 		file->f_dentry->d_op = &sockfs_dentry_operations;
+ 		d_add(file->f_dentry, SOCK_INODE(sock));
+ 		file->f_vfsmnt = mntget(sock_mnt);
++		file->f_mapping = file->f_dentry->d_inode->i_mapping;
+ 
+ 		sock->file = file;
+ 		file->f_op = SOCK_INODE(sock)->i_fop = &socket_file_ops;
+@@ -1989,3 +1990,18 @@ void socket_seq_show(struct seq_file *se
+ 	seq_printf(seq, "sockets: used %d\n", counter);
+ }
+ #endif /* CONFIG_PROC_FS */
++
++/* ABI emulation layers need these two */
++EXPORT_SYMBOL(move_addr_to_kernel);
++EXPORT_SYMBOL(move_addr_to_user);
++EXPORT_SYMBOL(sock_alloc);
++EXPORT_SYMBOL(sock_alloc_inode);
++EXPORT_SYMBOL(sock_create);
++EXPORT_SYMBOL(sock_map_fd);
++EXPORT_SYMBOL(sock_recvmsg);
++EXPORT_SYMBOL(sock_register);
++EXPORT_SYMBOL(sock_release);
++EXPORT_SYMBOL(sock_sendmsg);
++EXPORT_SYMBOL(sock_unregister);
++EXPORT_SYMBOL(sock_wake_async);
++EXPORT_SYMBOL(sockfd_lookup);
+--- linux-2.6.0-test6/net/unix/af_unix.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/net/unix/af_unix.c	2003-10-05 00:33:25.000000000 -0700
+@@ -448,7 +448,7 @@ static int unix_listen(struct socket *so
+ 	sk->sk_max_ack_backlog	= backlog;
+ 	sk->sk_state		= TCP_LISTEN;
+ 	/* set credentials so connect can copy them */
+-	sk->sk_peercred.pid	= current->pid;
++	sk->sk_peercred.pid	= current->tgid;
+ 	sk->sk_peercred.uid	= current->euid;
+ 	sk->sk_peercred.gid	= current->egid;
+ 	err = 0;
+@@ -983,7 +983,7 @@ restart:
+ 	unix_peer(newsk)	= sk;
+ 	newsk->sk_state		= TCP_ESTABLISHED;
+ 	newsk->sk_type		= SOCK_STREAM;
+-	newsk->sk_peercred.pid	= current->pid;
++	newsk->sk_peercred.pid	= current->tgid;
+ 	newsk->sk_peercred.uid	= current->euid;
+ 	newsk->sk_peercred.gid	= current->egid;
+ 	newu = unix_sk(newsk);
+@@ -1045,7 +1045,7 @@ static int unix_socketpair(struct socket
+ 	sock_hold(skb);
+ 	unix_peer(ska)=skb;
+ 	unix_peer(skb)=ska;
+-	ska->sk_peercred.pid = skb->sk_peercred.pid = current->pid;
++	ska->sk_peercred.pid = skb->sk_peercred.pid = current->tgid;
+ 	ska->sk_peercred.uid = skb->sk_peercred.uid = current->euid;
+ 	ska->sk_peercred.gid = skb->sk_peercred.gid = current->egid;
+ 
+--- linux-2.6.0-test6/net/x25/af_x25.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/net/x25/af_x25.c	2003-10-05 00:34:48.000000000 -0700
+@@ -345,10 +345,8 @@ void x25_destroy_socket(struct sock *sk)
+ 	if (atomic_read(&sk->sk_wmem_alloc) ||
+ 	    atomic_read(&sk->sk_rmem_alloc)) {
+ 		/* Defer: outstanding buffers */
+-		init_timer(&sk->sk_timer);
+ 		sk->sk_timer.expires  = jiffies + 10 * HZ;
+ 		sk->sk_timer.function = x25_destroy_timer;
+-		sk->sk_timer.data     = (unsigned long)sk;
+ 		add_timer(&sk->sk_timer);
+ 	} else {
+ 		/* drop last reference so sock_put will free */
+@@ -463,6 +461,8 @@ frees:
+ 	goto out;
+ }
+ 
++void x25_init_timers(struct sock *sk);
++
+ static int x25_create(struct socket *sock, int protocol)
+ {
+ 	struct sock *sk;
+@@ -481,7 +481,7 @@ static int x25_create(struct socket *soc
+ 	sock_init_data(sock, sk);
+ 	sk_set_owner(sk, THIS_MODULE);
+ 
+-	init_timer(&x25->timer);
++	x25_init_timers(sk);
+ 
+ 	sock->ops    = &x25_proto_ops;
+ 	sk->sk_protocol = protocol;
+@@ -537,7 +537,7 @@ static struct sock *x25_make_new(struct 
+ 	x25->facilities = ox25->facilities;
+ 	x25->qbitincl   = ox25->qbitincl;
+ 
+-	init_timer(&x25->timer);
++	x25_init_timers(sk);
+ out:
+ 	return sk;
+ }
+--- linux-2.6.0-test6/net/x25/x25_link.c	2003-06-14 12:17:57.000000000 -0700
++++ 25/net/x25/x25_link.c	2003-10-05 00:34:48.000000000 -0700
+@@ -51,15 +51,9 @@ static void x25_t20timer_expiry(unsigned
+ /*
+  *	Linux set/reset timer routines
+  */
+-static void x25_start_t20timer(struct x25_neigh *nb)
++static inline void x25_start_t20timer(struct x25_neigh *nb)
+ {
+-	del_timer(&nb->t20timer);
+-
+-	nb->t20timer.data     = (unsigned long)nb;
+-	nb->t20timer.function = &x25_t20timer_expiry;
+-	nb->t20timer.expires  = jiffies + nb->t20;
+-
+-	add_timer(&nb->t20timer);
++	mod_timer(&nb->t20timer, jiffies + nb->t20);
+ }
+ 
+ static void x25_t20timer_expiry(unsigned long param)
+@@ -71,12 +65,12 @@ static void x25_t20timer_expiry(unsigned
+ 	x25_start_t20timer(nb);
+ }
+ 
+-static void x25_stop_t20timer(struct x25_neigh *nb)
++static inline void x25_stop_t20timer(struct x25_neigh *nb)
+ {
+ 	del_timer(&nb->t20timer);
+ }
+ 
+-static int x25_t20timer_pending(struct x25_neigh *nb)
++static inline int x25_t20timer_pending(struct x25_neigh *nb)
+ {
+ 	return timer_pending(&nb->t20timer);
+ }
+@@ -291,6 +285,8 @@ void x25_link_device_up(struct net_devic
+ 	skb_queue_head_init(&nb->queue);
+ 
+ 	init_timer(&nb->t20timer);
++	nb->t20timer.data     = (unsigned long)nb;
++	nb->t20timer.function = &x25_t20timer_expiry;
+ 
+ 	dev_hold(dev);
+ 	nb->dev      = dev;
+--- linux-2.6.0-test6/net/x25/x25_timer.c	2003-06-14 12:17:57.000000000 -0700
++++ 25/net/x25/x25_timer.c	2003-10-05 00:34:48.000000000 -0700
+@@ -43,15 +43,22 @@
+ static void x25_heartbeat_expiry(unsigned long);
+ static void x25_timer_expiry(unsigned long);
+ 
+-void x25_start_heartbeat(struct sock *sk)
++void x25_init_timers(struct sock *sk)
+ {
+-	del_timer(&sk->sk_timer);
++	struct x25_opt *x25 = x25_sk(sk);
+ 
++	init_timer(&x25->timer);
++	x25->timer.data     = (unsigned long)sk;
++	x25->timer.function = &x25_timer_expiry;
++
++	/* initialized by sock_init_data */
+ 	sk->sk_timer.data     = (unsigned long)sk;
+ 	sk->sk_timer.function = &x25_heartbeat_expiry;
+-	sk->sk_timer.expires  = jiffies + 5 * HZ;
++}
+ 
+-	add_timer(&sk->sk_timer);
++void x25_start_heartbeat(struct sock *sk)
++{
++	mod_timer(&sk->sk_timer, jiffies + 5 * HZ);
+ }
+ 
+ void x25_stop_heartbeat(struct sock *sk)
+@@ -63,52 +70,28 @@ void x25_start_t2timer(struct sock *sk)
+ {
+ 	struct x25_opt *x25 = x25_sk(sk);
+ 
+-	del_timer(&x25->timer);
+-
+-	x25->timer.data     = (unsigned long)sk;
+-	x25->timer.function = &x25_timer_expiry;
+-	x25->timer.expires  = jiffies + x25->t2;
+-
+-	add_timer(&x25->timer);
++	mod_timer(&x25->timer, jiffies + x25->t2);
+ }
+ 
+ void x25_start_t21timer(struct sock *sk)
+ {
+ 	struct x25_opt *x25 = x25_sk(sk);
+ 
+-	del_timer(&x25->timer);
+-
+-	x25->timer.data     = (unsigned long)sk;
+-	x25->timer.function = &x25_timer_expiry;
+-	x25->timer.expires  = jiffies + x25->t21;
+-
+-	add_timer(&x25->timer);
++	mod_timer(&x25->timer, jiffies + x25->t21);
+ }
+ 
+ void x25_start_t22timer(struct sock *sk)
+ {
+ 	struct x25_opt *x25 = x25_sk(sk);
+ 
+-	del_timer(&x25->timer);
+-
+-	x25->timer.data     = (unsigned long)sk;
+-	x25->timer.function = &x25_timer_expiry;
+-	x25->timer.expires  = jiffies + x25->t22;
+-
+-	add_timer(&x25->timer);
++	mod_timer(&x25->timer, jiffies + x25->t22);
+ }
+ 
+ void x25_start_t23timer(struct sock *sk)
+ {
+ 	struct x25_opt *x25 = x25_sk(sk);
+ 
+-	del_timer(&x25->timer);
+-
+-	x25->timer.data     = (unsigned long)sk;
+-	x25->timer.function = &x25_timer_expiry;
+-	x25->timer.expires  = jiffies + x25->t23;
+-
+-	add_timer(&x25->timer);
++	mod_timer(&x25->timer, jiffies + x25->t23);
+ }
+ 
+ void x25_stop_timer(struct sock *sk)
+--- linux-2.6.0-test6/net/xfrm/xfrm_algo.c	2003-08-22 19:23:42.000000000 -0700
++++ 25/net/xfrm/xfrm_algo.c	2003-10-05 00:33:25.000000000 -0700
+@@ -8,7 +8,9 @@
+  * Software Foundation; either version 2 of the License, or (at your option) 
+  * any later version.
+  */
++
+ #include <linux/config.h>
++#include <linux/module.h>
+ #include <linux/kernel.h>
+ #include <linux/pfkeyv2.h>
+ #include <net/xfrm.h>
+@@ -617,6 +619,7 @@ skb_to_sgvec(struct sk_buff *skb, struct
+ 		BUG();
+ 	return elt;
+ }
++EXPORT_SYMBOL_GPL(skb_to_sgvec);
+ 
+ /* Check that skb data bits are writable. If they are not, copy data
+  * to newly created private area. If "tailbits" is given, make sure that
+@@ -717,6 +720,7 @@ int skb_cow_data(struct sk_buff *skb, in
+ 
+ 	return elt;
+ }
++EXPORT_SYMBOL_GPL(skb_cow_data);
+ 
+ void *pskb_put(struct sk_buff *skb, struct sk_buff *tail, int len)
+ {
+@@ -726,4 +730,5 @@ void *pskb_put(struct sk_buff *skb, stru
+ 	}
+ 	return skb_put(tail, len);
+ }
++EXPORT_SYMBOL_GPL(pskb_put);
+ #endif
+--- linux-2.6.0-test6/scripts/bin2c.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/scripts/bin2c.c	2003-10-05 00:33:25.000000000 -0700
+@@ -1,3 +1,12 @@
++/*
++ * Unloved program to convert a binary on stdin to a C include on stdout
++ *
++ * Jan 1999 Matt Mackall <mpm@selenic.com>
++ *
++ * This software may be used and distributed according to the terms
++ * of the GNU General Public License, incorporated herein by reference.
++ */
++
+ #include <stdio.h>
+ 
+ int main(int argc, char *argv[])
+--- linux-2.6.0-test6/scripts/pnmtologo.c	2003-08-08 22:55:14.000000000 -0700
++++ 25/scripts/pnmtologo.c	2003-10-05 00:33:25.000000000 -0700
+@@ -119,7 +119,8 @@ static unsigned int get_number255(FILE *
+ static void read_image(void)
+ {
+     FILE *fp;
+-    int i, j, magic;
++    unsigned int i, j;
++    int magic;
+     unsigned int maxval;
+ 
+     /* open image file */
+@@ -274,7 +275,7 @@ static void write_hex(unsigned char byte
+ 
+ static void write_logo_mono(void)
+ {
+-    int i, j;
++    unsigned int i, j;
+     unsigned char val, bit;
+ 
+     /* validate image */
+@@ -302,7 +303,7 @@ static void write_logo_mono(void)
+ 
+ static void write_logo_vga16(void)
+ {
+-    int i, j, k;
++    unsigned int i, j, k;
+     unsigned char val;
+ 
+     /* validate image */
+@@ -342,7 +343,7 @@ static void write_logo_vga16(void)
+ 
+ static void write_logo_clut224(void)
+ {
+-    int i, j, k;
++    unsigned int i, j, k;
+ 
+     /* validate image */
+     for (i = 0; i < logo_height; i++)
+@@ -388,7 +389,7 @@ static void write_logo_clut224(void)
+ 
+ static void write_logo_gray256(void)
+ {
+-    int i, j;
++    unsigned int i, j;
+ 
+     /* validate image */
+     for (i = 0; i < logo_height; i++)
+--- linux-2.6.0-test6/security/dummy.c	2003-07-10 18:50:32.000000000 -0700
++++ 25/security/dummy.c	2003-10-05 00:33:25.000000000 -0700
+@@ -364,7 +364,7 @@ static int dummy_inode_follow_link (stru
+ 	return 0;
+ }
+ 
+-static int dummy_inode_permission (struct inode *inode, int mask)
++static int dummy_inode_permission (struct inode *inode, int mask, struct nameidata *nd)
+ {
+ 	return 0;
+ }
+--- linux-2.6.0-test6/security/selinux/hooks.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/security/selinux/hooks.c	2003-10-05 00:33:25.000000000 -0700
+@@ -1730,13 +1730,18 @@ static int selinux_inode_follow_link(str
+ 	return dentry_has_perm(current, NULL, dentry, FILE__READ);
+ }
+ 
+-static int selinux_inode_permission(struct inode *inode, int mask)
++static int selinux_inode_permission(struct inode *inode, int mask,
++				    struct nameidata *nd)
+ {
+ 	if (!mask) {
+ 		/* No permission to check.  Existence test. */
+ 		return 0;
+ 	}
+ 
++	if (nd && nd->dentry)
++		return dentry_has_perm(current, nd->mnt, nd->dentry,
++				       file_mask_to_av(inode->i_mode, mask));
++
+ 	return inode_has_perm(current, inode,
+ 			       file_mask_to_av(inode->i_mode, mask), NULL, NULL);
+ }
+--- linux-2.6.0-test6/security/selinux/ss/services.c	2003-08-08 22:55:14.000000000 -0700
++++ 25/security/selinux/ss/services.c	2003-10-05 00:33:25.000000000 -0700
+@@ -896,7 +896,7 @@ static int convert_context(u32 key,
+ 	struct user_datum *usrdatum;
+ 	char *s;
+ 	u32 len;
+-	int rc = -EINVAL;
++	int rc;
+ 
+ 	args = p;
+ 
+@@ -904,6 +904,8 @@ static int convert_context(u32 key,
+ 	if (rc)
+ 		goto out;
+ 
++	rc = -EINVAL;
++
+ 	/* Convert the user. */
+ 	usrdatum = hashtab_search(args->newp->p_users.table,
+ 	                          args->oldp->p_user_val_to_name[c->user - 1]);
+--- linux-2.6.0-test6/sound/oss/ac97_codec.c	2003-09-27 18:57:47.000000000 -0700
++++ 25/sound/oss/ac97_codec.c	2003-10-05 00:33:25.000000000 -0700
+@@ -46,7 +46,6 @@
+  *	Isolated from trident.c to support multiple ac97 codec
+  */
+ #include <linux/module.h>
+-#include <linux/version.h>
+ #include <linux/kernel.h>
+ #include <linux/slab.h>
+ #include <linux/string.h>
+--- linux-2.6.0-test6/sound/oss/ali5455.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/sound/oss/ali5455.c	2003-10-05 00:33:25.000000000 -0700
+@@ -47,7 +47,6 @@
+  */
+ 
+ #include <linux/module.h>
+-#include <linux/version.h>
+ #include <linux/string.h>
+ #include <linux/ctype.h>
+ #include <linux/ioport.h>
+--- linux-2.6.0-test6/sound/oss/au1000.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/sound/oss/au1000.c	2003-10-05 00:33:25.000000000 -0700
+@@ -50,7 +50,6 @@
+  *                channels [stevel].
+  *
+  */
+-#include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/string.h>
+ #include <linux/ioport.h>
+@@ -2223,8 +2222,9 @@ static int __init au1000_setup(char *opt
+ 	if (!options || !*options)
+ 		return 0;
+ 
+-	for(this_opt=strtok(options, ",");
+-	    this_opt; this_opt=strtok(NULL, ",")) {
++	while (this_opt = strsep(&options, ",")) {
++		if (!*this_opt)
++			continue;
+ 		if (!strncmp(this_opt, "vra", 3)) {
+ 			vra = 1;
+ 		}
+--- linux-2.6.0-test6/sound/oss/btaudio.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/sound/oss/btaudio.c	2003-10-05 00:33:25.000000000 -0700
+@@ -177,8 +177,11 @@ static int alloc_buffer(struct btaudio *
+ 		bta->risc_size = PAGE_SIZE;
+ 		bta->risc_cpu = pci_alloc_consistent
+ 			(bta->pci, bta->risc_size, &bta->risc_dma);
+-		if (NULL == bta->risc_cpu)
++		if (NULL == bta->risc_cpu) {
++			pci_free_consistent(bta->pci, bta->buf_size, bta->buf_cpu, bta->buf_dma);
++			bta->buf_cpu = NULL;
+ 			return -ENOMEM;
++		}
+ 	}
+ 	return 0;
+ }
+--- linux-2.6.0-test6/sound/oss/dmasound/dac3550a.c	2003-09-27 18:57:48.000000000 -0700
++++ 25/sound/oss/dmasound/dac3550a.c	2003-10-05 00:33:25.000000000 -0700
+@@ -7,7 +7,6 @@
+  *  for more details.
+  */
+ 
+-#include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/slab.h>
+ #include <linux/proc_fs.h>
+--- linux-2.6.0-test6/sound/oss/dmasound/Kconfig	2003-09-27 18:57:47.000000000 -0700
++++ 25/sound/oss/dmasound/Kconfig	2003-10-05 00:33:25.000000000 -0700
+@@ -1,7 +1,7 @@
+-# drivers/sound/dmasound/Config.in
+ config DMASOUND_ATARI
+ 	tristate "Atari DMA sound support"
+ 	depends on ATARI && SOUND
++	select DMASOUND
+ 	help
+ 	  If you want to use the internal audio of your Atari in Linux, answer
+ 	  Y to this question. This will provide a Sun-like /dev/audio,
+@@ -15,6 +15,7 @@ config DMASOUND_ATARI
+ config DMASOUND_PMAC
+ 	tristate "PowerMac DMA sound support"
+ 	depends on PPC_PMAC && SOUND && I2C
++ 	select DMASOUND
+ 	help
+ 	  If you want to use the internal audio of your PowerMac in Linux,
+ 	  answer Y to this question. This will provide a Sun-like /dev/audio,
+@@ -28,6 +29,7 @@ config DMASOUND_PMAC
+ config DMASOUND_PAULA
+ 	tristate "Amiga DMA sound support"
+ 	depends on (AMIGA || APUS) && SOUND
++	select DMASOUND
+ 	help
+ 	  If you want to use the internal audio of your Amiga in Linux, answer
+ 	  Y to this question. This will provide a Sun-like /dev/audio,
+@@ -41,6 +43,7 @@ config DMASOUND_PAULA
+ config DMASOUND_Q40
+ 	tristate "Q40 sound support"
+ 	depends on Q40 && SOUND
++	select DMASOUND
+ 	help
+ 	  If you want to use the internal audio of your Q40 in Linux, answer
+ 	  Y to this question. This will provide a Sun-like /dev/audio,
+@@ -53,13 +56,3 @@ config DMASOUND_Q40
+ 
+ config DMASOUND
+ 	tristate
+-	depends on SOUND!=n
+-	default m if DMASOUND_ATARI!=y && DMASOUND_AWACS!=y && DMASOUND_PAULA!=y && DMASOUND_Q40!=y && (DMASOUND_ATARI=m || DMASOUND_AWACS=m || DMASOUND_PAULA=m || DMASOUND_Q40=m)
+-	default y if DMASOUND_ATARI=y || DMASOUND_AWACS=y || DMASOUND_PAULA=y || DMASOUND_Q40=y
+-	help
+-	  Support built-in audio chips accessible by DMA on various machines
+-	  that have them.  Note that this symbol does not affect the kernel
+-	  directly; rather, it controls whether configuration questions
+-	  enabling DMA sound drivers for various specific machine
+-	  architectures will be used.
+-
+--- linux-2.6.0-test6/sound/oss/dmasound/tas3001c.c	2003-09-27 18:57:48.000000000 -0700
++++ 25/sound/oss/dmasound/tas3001c.c	2003-10-05 00:33:25.000000000 -0700
+@@ -15,7 +15,6 @@
+  *
+  */
+ 
+-#include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/slab.h>
+ #include <linux/proc_fs.h>
+--- linux-2.6.0-test6/sound/oss/dmasound/tas3004.c	2003-09-27 18:57:48.000000000 -0700
++++ 25/sound/oss/dmasound/tas3004.c	2003-10-05 00:33:25.000000000 -0700
+@@ -13,7 +13,6 @@
+  *
+  */
+ 
+-#include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/slab.h>
+ #include <linux/proc_fs.h>
+--- linux-2.6.0-test6/sound/oss/dmasound/tas_common.c	2003-09-27 18:57:48.000000000 -0700
++++ 25/sound/oss/dmasound/tas_common.c	2003-10-05 00:33:25.000000000 -0700
+@@ -1,4 +1,3 @@
+-#include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/slab.h>
+ #include <linux/proc_fs.h>
+--- linux-2.6.0-test6/sound/oss/harmony.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/sound/oss/harmony.c	2003-10-05 00:33:25.000000000 -0700
+@@ -28,14 +28,14 @@ TODO:
+ #include <linux/delay.h>
+ #include <linux/errno.h>
+ #include <linux/init.h>
++#include <linux/interrupt.h>
+ #include <linux/ioport.h>
+ #include <linux/types.h>
+ #include <linux/mm.h>
+ #include <linux/pci.h>
+ 
+-#include <asm/gsc.h>
++#include <asm/parisc-device.h>
+ #include <asm/io.h>
+-#include <asm/pgalloc.h>
+ 
+ #include "sound_config.h"
+ 
+--- linux-2.6.0-test6/sound/oss/ite8172.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/sound/oss/ite8172.c	2003-10-05 00:33:25.000000000 -0700
+@@ -54,7 +54,6 @@
+  *    07.30.2003  Removed initialisation to zero for static variables
+  *		   (spdif[NR_DEVICE], i2s_fmt[NR_DEVICE], and devindex)
+  */
+-#include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/string.h>
+ #include <linux/ioport.h>
+@@ -2238,8 +2237,9 @@ static int __init it8172_setup(char *opt
+ 	if (!options || !*options)
+ 		return 0;
+ 
+-	for(this_opt=strtok(options, ",");
+-	    this_opt; this_opt=strtok(NULL, ",")) {
++	while (this_opt = strsep(&options, ",")) {
++		if (!*this_opt)
++			continue;
+ 		if (!strncmp(this_opt, "spdif", 5)) {
+ 			spdif[nr_dev] = 1;
+ 		} else if (!strncmp(this_opt, "i2s:", 4)) {
+--- linux-2.6.0-test6/sound/oss/opl3sa2.c	2003-08-22 19:23:43.000000000 -0700
++++ 25/sound/oss/opl3sa2.c	2003-10-05 00:33:25.000000000 -0700
+@@ -324,15 +324,6 @@ static void opl3sa3_set_treble(opl3sa2_s
+ }
+ 
+ 
+-static void opl3sa3_set_wide(opl3sa2_state_t* devc, int left, int right)
+-{	
+-	unsigned char wide;
+-
+-	wide = left ? ((unsigned char) (8 * left / 101)) : 0; 
+-	wide |= (right ? ((unsigned char) (8 * right / 101)) : 0) << 4;
+-
+-	opl3sa2_write(devc->cfg_port, OPL3SA3_WIDE, wide);
+-}
+ 
+ 
+ static void opl3sa2_mixer_reset(opl3sa2_state_t* devc)
+@@ -401,7 +392,7 @@ static inline int ret_vol_stereo(int lef
+ 
+ static int opl3sa2_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg)
+ {
+-	int cmdf = cmd & 0xff;
++	int retval, value, cmdf = cmd & 0xff;
+ 
+ 	opl3sa2_state_t* devc = &opl3sa2_state[dev];
+ 	
+@@ -422,23 +413,31 @@ static int opl3sa2_mixer_ioctl(int dev, 
+ 	if (((cmd >> 8) & 0xff) != 'M')
+ 		return -EINVAL;
+ 		
++	retval = 0;
+ 	if (_SIOC_DIR (cmd) & _SIOC_WRITE) {
+ 		switch (cmdf) {
+ 			case SOUND_MIXER_VOLUME:
+-				arg_to_vol_stereo(*(unsigned int*)arg,
+-						  &devc->volume_l, &devc->volume_r); 
++				retval = get_user(value, (unsigned int *) arg);
++				if (retval)
++					break;
++				arg_to_vol_stereo(value, &devc->volume_l, &devc->volume_r);
+ 				opl3sa2_set_volume(devc, devc->volume_l, devc->volume_r);
+-				*(int*)arg = ret_vol_stereo(devc->volume_l, devc->volume_r);
+-				return 0;
++				value = ret_vol_stereo(devc->volume_l, devc->volume_r);
++				retval = put_user(value, (int *) arg);
++				break;
+ 		  
+ 			case SOUND_MIXER_MIC:
+-				arg_to_vol_mono(*(unsigned int*)arg, &devc->mic);
++				retval = get_user(value, (unsigned int *) arg);
++				if (retval)
++					break;
++				arg_to_vol_mono(value, &devc->mic);
+ 				opl3sa2_set_mic(devc, devc->mic);
+-				*(int*)arg = ret_vol_mono(devc->mic);
+-				return 0;
++				value = ret_vol_mono(devc->mic);
++				retval = put_user(value, (int *) arg);
++				break;
+ 
+ 			default:
+-				return -EINVAL;
++				retval = -EINVAL;
+ 		}
+ 	}
+ 	else {
+@@ -447,122 +446,72 @@ static int opl3sa2_mixer_ioctl(int dev, 
+ 		 */
+ 		switch (cmdf) {
+ 			case SOUND_MIXER_DEVMASK:
+-				*(int*)arg = (SOUND_MASK_VOLUME | SOUND_MASK_MIC);
+-				return 0;
++				retval = put_user(SOUND_MASK_VOLUME | SOUND_MASK_MIC, (int *) arg);
++				break;
+ 		  
+ 			case SOUND_MIXER_STEREODEVS:
+-				*(int*)arg = SOUND_MASK_VOLUME;
+-				return 0;
++				retval = put_user(SOUND_MASK_VOLUME, (int *) arg);
++				break;
+ 		  
+ 			case SOUND_MIXER_RECMASK:
+ 				/* No recording devices */
+-				return (*(int*)arg = 0);
++				retval = put_user(0, (int *) arg);
++				break;
+ 
+ 			case SOUND_MIXER_CAPS:
+-				*(int*)arg = SOUND_CAP_EXCL_INPUT;
+-				return 0;
++				retval = put_user(SOUND_CAP_EXCL_INPUT, (int *) arg);
++				break;
+ 
+ 			case SOUND_MIXER_RECSRC:
+ 				/* No recording source */
+-				return (*(int*)arg = 0);
++				retval = put_user(0, (int *) arg);
++				break;
+ 
+ 			case SOUND_MIXER_VOLUME:
+-				*(int*)arg = ret_vol_stereo(devc->volume_l, devc->volume_r);
+-				return 0;
++				value = ret_vol_stereo(devc->volume_l, devc->volume_r);
++				retval = put_user(value, (int *) arg);
++				break;
+ 			  
+ 			case SOUND_MIXER_MIC:
+-				*(int*)arg = ret_vol_mono(devc->mic);
+-				return 0;
++				value = ret_vol_mono(devc->mic);
++				put_user(value, (int *) arg);
++				break;
+ 
+ 			default:
+-				return -EINVAL;
++				retval = -EINVAL;
+ 		}
+ 	}
++	return retval;
+ }
+ /* opl3sa2_mixer_ioctl end */
+ 
+ 
+ static int opl3sa3_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg)
+ {
+-	int cmdf = cmd & 0xff;
++	int value, retval, cmdf = cmd & 0xff;
+ 
+ 	opl3sa2_state_t* devc = &opl3sa2_state[dev];
+ 
+ 	switch (cmdf) {
+-		case SOUND_MIXER_BASS:
+-		case SOUND_MIXER_TREBLE:
+-		case SOUND_MIXER_DIGITAL1:
+-		case SOUND_MIXER_DEVMASK:
+-		case SOUND_MIXER_STEREODEVS: 
+-			break;
+-
+-		default:
+-			return opl3sa2_mixer_ioctl(dev, cmd, arg);
+-	}
+-
+-	if (((cmd >> 8) & 0xff) != 'M')
+-		return -EINVAL;
++	case SOUND_MIXER_BASS:
++		value = ret_vol_stereo(devc->bass_l, devc->bass_r);
++		retval = put_user(value, (int *) arg);
++		break;
+ 		
+-	if (_SIOC_DIR (cmd) & _SIOC_WRITE) {
+-		switch (cmdf) {
+-			case SOUND_MIXER_BASS:
+-				arg_to_vol_stereo(*(unsigned int*)arg,
+-						  &devc->bass_l, &devc->bass_r); 
+-				opl3sa3_set_bass(devc, devc->bass_l, devc->bass_r);
+-				*(int*)arg = ret_vol_stereo(devc->bass_l, devc->bass_r);
+-				return 0;
+-		  
+-			case SOUND_MIXER_TREBLE:
+-				arg_to_vol_stereo(*(unsigned int*)arg,
+-						  &devc->treble_l, &devc->treble_r); 
+-				opl3sa3_set_treble(devc, devc->treble_l, devc->treble_r);
+-				*(int*)arg = ret_vol_stereo(devc->treble_l, devc->treble_r);
+-				return 0;
+-
+-			case SOUND_MIXER_DIGITAL1:
+-				arg_to_vol_stereo(*(unsigned int*)arg,
+-						  &devc->wide_l, &devc->wide_r); 
+-				opl3sa3_set_wide(devc, devc->wide_l, devc->wide_r);
+-				*(int*)arg = ret_vol_stereo(devc->wide_l, devc->wide_r);
+-				return 0;
++	case SOUND_MIXER_TREBLE:
++		value = ret_vol_stereo(devc->treble_l, devc->treble_r);
++		retval = put_user(value, (int *) arg);
++		break;
+ 
+-			default:
+-				return -EINVAL;
+-		}
+-	}
+-	else			
+-	{
+-		/*
+-		 * Return parameters
+-		 */
+-		switch (cmdf) {
+-			case SOUND_MIXER_DEVMASK:
+-				*(int*)arg = (SOUND_MASK_VOLUME | SOUND_MASK_MIC |
+-					      SOUND_MASK_BASS | SOUND_MASK_TREBLE |
+-					      SOUND_MASK_DIGITAL1);
+-				return 0;
+-		  
+-			case SOUND_MIXER_STEREODEVS:
+-				*(int*)arg = (SOUND_MASK_VOLUME | SOUND_MASK_BASS |
+-					      SOUND_MASK_TREBLE | SOUND_MASK_DIGITAL1);
+-				return 0;
+-		  
+-			case SOUND_MIXER_BASS:
+-				*(int*)arg = ret_vol_stereo(devc->bass_l, devc->bass_r);
+-				return 0;
+-			  
+-			case SOUND_MIXER_TREBLE:
+-				*(int*)arg = ret_vol_stereo(devc->treble_l, devc->treble_r);
+-				return 0;
+-
+-			case SOUND_MIXER_DIGITAL1:
+-				*(int*)arg = ret_vol_stereo(devc->wide_l, devc->wide_r);
+-				return 0;
++	case SOUND_MIXER_DIGITAL1:
++		value = ret_vol_stereo(devc->wide_l, devc->wide_r);
++		retval = put_user(value, (int *) arg);
++		break;
+ 
+-			default:
+-				return -EINVAL;
+-		}
++	default:
++		retval = -EINVAL;
+ 	}
++	return retval;
+ }
+ /* opl3sa3_mixer_ioctl end */
+ 
+--- linux-2.6.0-test6/sound/oss/swarm_cs4297a.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/sound/oss/swarm_cs4297a.c	2003-10-05 00:33:25.000000000 -0700
+@@ -59,7 +59,6 @@
+ *******************************************************************************/
+ 
+ #include <linux/list.h>
+-#include <linux/version.h>
+ #include <linux/module.h>
+ #include <linux/string.h>
+ #include <linux/ioport.h>
+--- linux-2.6.0-test6/sound/oss/via82cxxx_audio.c	2003-09-08 13:58:59.000000000 -0700
++++ 25/sound/oss/via82cxxx_audio.c	2003-10-05 00:36:10.000000000 -0700
+@@ -1844,6 +1844,7 @@ static void via_ac97_cleanup (struct via
+ 
+ /**
+  *	via_intr_channel - handle an interrupt for a single channel
++ *      @card: unused
+  *	@chan: handle interrupt for this channel
+  *
+  *	This is the "meat" of the interrupt handler,
+--- linux-2.6.0-test6/sound/parisc/harmony.c	2003-08-22 19:23:43.000000000 -0700
++++ 25/sound/parisc/harmony.c	2003-10-05 00:33:25.000000000 -0700
+@@ -66,6 +66,7 @@
+ #include <linux/delay.h>
+ #include <sound/driver.h>
+ #include <linux/init.h>
++#include <linux/interrupt.h>
+ #include <linux/slab.h>
+ #include <linux/time.h>
+ #include <linux/wait.h>
+@@ -77,8 +78,8 @@
+ #include <sound/initval.h>
+ #include <sound/info.h>
+ #include <asm/hardware.h>
+-#include <asm/gsc.h>
+ #include <asm/io.h>
++#include <asm/parisc-device.h>
+ 
+ MODULE_AUTHOR("Laurent Canet <canetl@esiee.fr>");
+ MODULE_DESCRIPTION("ALSA Harmony sound driver");
+@@ -709,8 +710,8 @@ static int snd_card_harmony_playback_ope
+ 	 * harmony is not "real" pci, but we need a pci_dev
+ 	 * to alloc PCI DMA pages
+ 	 */
+-	substream->dma_private = harmony->fake_pci_dev;
+-	substream->dma_type = SNDRV_PCM_DMA_TYPE_PCI;
++	substream->runtime->dma_private = harmony->fake_pci_dev;
++//	substream->dma_type = SNDRV_PCM_DMA_TYPE_PCI;
+ 	
+ 	harmony->playback_substream = substream;
+ 	runtime->hw = snd_card_harmony_playback;
+@@ -733,8 +734,8 @@ static int snd_card_harmony_capture_open
+ 	 * harmony is not "real" pci, but we need a pci_dev
+ 	 * to alloc PCI DMA pages
+ 	 */
+-	substream->dma_private = harmony->fake_pci_dev;
+-	substream->dma_type = SNDRV_PCM_DMA_TYPE_PCI;
++	substream->runtime->dma_private = harmony->fake_pci_dev;
++//	substream->dma_type = SNDRV_PCM_DMA_TYPE_PCI;
+ 
+ 	harmony->capture_substream = substream;
+ 	runtime->hw = snd_card_harmony_capture;
+--- linux-2.6.0-test6/sound/pci/cmipci.c	2003-08-08 22:55:15.000000000 -0700
++++ 25/sound/pci/cmipci.c	2003-10-05 00:33:25.000000000 -0700
+@@ -2791,6 +2791,7 @@ static int __devinit snd_cmipci_mixer_ne
+  * proc interface
+  */
+ 
++#ifdef CONFIG_PROC_FS
+ static void snd_cmipci_proc_read(snd_info_entry_t *entry, 
+ 				 snd_info_buffer_t *buffer)
+ {
+@@ -2817,6 +2818,9 @@ static void __devinit snd_cmipci_proc_in
+ 	if (! snd_card_proc_new(cm->card, "cmipci", &entry))
+ 		snd_info_set_text_ops(entry, cm, snd_cmipci_proc_read);
+ }
++#else /* !CONFIG_PROC_FS */
++static inline void snd_cmipci_proc_init(cmipci_t *cm) {}
++#endif
+ 
+ 
+ static struct pci_device_id snd_cmipci_ids[] = {
+--- linux-2.6.0-test6/sound/pci/intel8x0.c	2003-09-27 18:57:48.000000000 -0700
++++ 25/sound/pci/intel8x0.c	2003-10-05 00:34:31.000000000 -0700
+@@ -2271,10 +2271,8 @@ static void __devinit intel8x0_measure_a
+ 
+ 	t = stop_time.tv_sec - start_time.tv_sec;
+ 	t *= 1000000;
+-	if (stop_time.tv_usec < start_time.tv_usec)
+-		t -= start_time.tv_usec - stop_time.tv_usec;
+-	else
+-		t += stop_time.tv_usec - start_time.tv_usec;
++	t += stop_time.tv_usec - start_time.tv_usec;
++	printk(KERN_INFO "%s: measured %lu usecs\n", __FUNCTION__, t);
+ 	if (t == 0) {
+ 		snd_printk(KERN_ERR "?? calculation error..\n");
+ 		return;
+--- linux-2.6.0-test6/sound/pci/Kconfig	2003-09-27 18:57:48.000000000 -0700
++++ 25/sound/pci/Kconfig	2003-10-05 00:34:45.000000000 -0700
+@@ -17,7 +17,8 @@ config SND_AZT3328
+ 
+ config SND_CS46XX
+ 	tristate "Cirrus Logic (Sound Fusion) CS4280/CS461x/CS462x/CS463x"
+-	depends on SND && GAMEPORT
++	depends on SND
++	select GAMEPORT
+ 	help
+ 	  Say 'Y' or 'M' to include support for Cirrus Logic CS4610 / CS4612 /
+ 	  CS4614 / CS4615 / CS4622 / CS4624 / CS4630 / CS4280 chips.
+@@ -30,7 +31,8 @@ config SND_CS46XX_NEW_DSP
+ 
+ config SND_CS4281
+ 	tristate "Cirrus Logic (Sound Fusion) CS4281"
+-	depends on SND && GAMEPORT
++	depends on SND
++	select GAMEPORT
+ 	help
+ 	  Say 'Y' or 'M' to include support for Cirrus Logic CS4281.
+ 
+@@ -83,7 +85,8 @@ config SND_HDSP
+ 
+ config SND_TRIDENT
+ 	tristate "Trident 4D-Wave DX/NX; SiS 7018"
+-	depends on SND && GAMEPORT
++	depends on SND
++	select GAMEPORT
+ 	help
+ 	  Say 'Y' or 'M' to include support for Trident 4D-Wave DX/NX and
+ 	  SiS 7018 soundcards.
+@@ -110,20 +113,23 @@ config SND_CMIPCI
+ 
+ config SND_ENS1370
+ 	tristate "(Creative) Ensoniq AudioPCI 1370"
+-	depends on SND && GAMEPORT
++	depends on SND
++	select GAMEPORT
+ 	help
+ 	  Say 'Y' or 'M' to include support for Ensoniq AudioPCI ES1370.
+ 
+ config SND_ENS1371
+ 	tristate "(Creative) Ensoniq AudioPCI 1371/1373"
+-	depends on SND && GAMEPORT
++	depends on SND
++	select GAMEPORT
+ 	help
+ 	  Say 'Y' or 'M' to include support for Ensoniq AudioPCI ES1371 and
+ 	  Sound Blaster PCI 64 or 128 soundcards.
+ 
+ config SND_ES1938
+ 	tristate "ESS ES1938/1946/1969 (Solo-1)"
+-	depends on SND && GAMEPORT
++	depends on SND
++	select GAMEPORT
+ 	help
+ 	  Say 'Y' or 'M' to include support for ESS Solo-1 (ES1938, ES1946, ES1969)
+ 	  soundcard.
+@@ -173,7 +179,8 @@ config SND_INTEL8X0
+ 
+ config SND_SONICVIBES
+ 	tristate "S3 SonicVibes"
+-	depends on SND && GAMEPORT
++	depends on SND
++	select GAMEPORT
+ 	help
+ 	  Say 'Y' or 'M' to include support for S3 SonicVibes based soundcards.
+ 
diff --git a/lustre/kernel_patches/patches/add_page_private.patch b/lustre/kernel_patches/patches/add_page_private.patch
index f7cc567..f82fb92 100644
--- a/lustre/kernel_patches/patches/add_page_private.patch
+++ b/lustre/kernel_patches/patches/add_page_private.patch
@@ -1,8 +1,10 @@
-Index: linux-ia64/include/linux/mm.h
-===================================================================
---- linux-ia64.orig/include/linux/mm.h	2004-04-27 12:39:16.000000000 -0700
-+++ linux-ia64/include/linux/mm.h	2004-04-27 12:42:10.000000000 -0700
-@@ -205,6 +205,7 @@ typedef struct page {
+ include/linux/mm.h |    1 +
+ 1 files changed, 1 insertion(+)
+
+--- linux-2.4.20-b_llpio-l21/include/linux/mm.h~add_page_private	2003-07-21 21:42:50.000000000 -0700
++++ linux-2.4.20-b_llpio-l21-zab/include/linux/mm.h	2003-07-21 21:44:16.000000000 -0700
+@@ -162,6 +162,7 @@ typedef struct page {
+ 					   protected by pagemap_lru_lock !! */
  	struct page **pprev_hash;	/* Complement to *next_hash. */
  	struct buffer_head * buffers;	/* Buffer maps us to a disk block. */
 +	unsigned long private;
@@ -11,13 +13,3 @@ Index: linux-ia64/include/linux/mm.h
  	 * On machines where all RAM is mapped into kernel address space,
 
 _
-Index: linux-ia64/mm/filemap.c
-===================================================================
---- linux-ia64.orig/mm/filemap.c	2004-04-27 12:35:18.000000000 -0700
-+++ linux-ia64/mm/filemap.c	2004-04-27 12:42:47.000000000 -0700
-@@ -676,6 +676,7 @@ static inline void __add_to_page_cache(s
- 	page_cache_get(page);
- 	page->index = offset;
-+	page->private = 0;
- 	add_page_to_inode_queue(mapping, page);
- 	add_page_to_hash_queue(page, hash);
diff --git a/lustre/kernel_patches/patches/bproc-patch-2.4.20 b/lustre/kernel_patches/patches/bproc-patch-2.4.20
index 0144b9f..a92008a 100644
--- a/lustre/kernel_patches/patches/bproc-patch-2.4.20
+++ b/lustre/kernel_patches/patches/bproc-patch-2.4.20
@@ -1,3 +1,5 @@
+$Id: bproc-patch-2.4.20,v 1.11 2004/05/17 11:48:37 phil Exp $
+
 Index: linux/fs/exec.c
 ===================================================================
 --- linux.orig/fs/exec.c	2003-09-03 17:52:00.000000000 -0400
@@ -762,7 +764,7 @@ Index: linux/kernel/bproc_hook.c
 + *  along with this program; if not, write to the Free Software
 + *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 + *
-+ * Id: bproc-patch-2.4.20,v 1.8 2004/04/12 21:44:45 nic Exp $
++ * $Id: bproc-patch-2.4.20,v 1.11 2004/05/17 11:48:37 phil Exp $
 + *-----------------------------------------------------------------------*/
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -830,7 +832,7 @@ Index: linux/include/linux/bproc.h
 + *  along with this program; if not, write to the Free Software
 + *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 + *
-+ * Id: bproc-patch-2.4.20,v 1.8 2004/04/12 21:44:45 nic Exp $
++ * $Id: bproc-patch-2.4.20,v 1.11 2004/05/17 11:48:37 phil Exp $
 + *-----------------------------------------------------------------------*/
 +#ifndef _LINUX_BPROC_H
 +#define _LINUX_BPROC_H
diff --git a/lustre/kernel_patches/patches/cifs_2.6.5.patch b/lustre/kernel_patches/patches/cifs_2.6.5.patch
deleted file mode 100644
index 35db137..0000000
--- a/lustre/kernel_patches/patches/cifs_2.6.5.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-#EJF i took out part of this change set
-
-
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-#   2004/01/30 17:20:19-06:00 stevef@stevef95.austin.ibm.com 
-#   Relax requested CIFS permissions on open to simply request GENERIC_READ and GENERIC_WRITE (instead of GENERIC_ALL which
-#   can unnecessarily conflict with share permissions by asking implicitly for take ownership and other unneeded flags)
-# 
-# fs/cifs/dir.c
-#   2004/01/30 17:20:13-06:00 stevef@stevef95.austin.ibm.com +7 -3
-#   Relax requested CIFS permissions on open to simply request GENERIC_READ and GENERIC_WRITE (instead of GENERIC_ALL which
-#   can unnecessarily conflict with share permissions by asking implicitly for take ownership and other unneeded flags)
-# 
-# fs/cifs/file.c
-#   2004/01/30 17:20:13-06:00 stevef@stevef95.austin.ibm.com +12 -4
-#   Relax requested CIFS permissions on open to simply request GENERIC_READ and GENERIC_WRITE (instead of GENERIC_ALL which
-#   can unnecessarily conflict with share permissions by asking implicitly for take ownership and other unneeded flags)
-# 
-diff -Nru a/fs/cifs/dir.c b/fs/cifs/dir.c
---- a/fs/cifs/dir.c	Mon May  3 16:32:08 2004
-+++ b/fs/cifs/dir.c	Mon May  3 16:32:08 2004
-@@ -125,7 +125,7 @@
- 	int rc = -ENOENT;
- 	int xid;
- 	int oplock = 0;
--	int desiredAccess = GENERIC_ALL;
-+	int desiredAccess = GENERIC_READ | GENERIC_WRITE;
- 	__u16 fileHandle;
- 	struct cifs_sb_info *cifs_sb;
- 	struct cifsTconInfo *pTcon;
-@@ -150,8 +150,12 @@
- 			desiredAccess = GENERIC_READ;
- 		else if ((nd->intent.open.flags & O_ACCMODE) == O_WRONLY)
- 			desiredAccess = GENERIC_WRITE;
--		else if ((nd->intent.open.flags & O_ACCMODE) == O_RDWR)
--			desiredAccess = GENERIC_ALL;
-+		else if ((nd->intent.open.flags & O_ACCMODE) == O_RDWR) {
-+			/* GENERIC_ALL is too much permission to request */
-+			/* can cause unnecessary access denied on create */
-+			/* desiredAccess = GENERIC_ALL; */
-+			desiredAccess = GENERIC_READ | GENERIC_WRITE;
-+		}
- 
- 		if((nd->intent.open.flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL))
- 			disposition = FILE_CREATE;
-diff -Nru a/fs/cifs/file.c b/fs/cifs/file.c
---- a/fs/cifs/file.c	Mon May  3 16:32:08 2004
-+++ b/fs/cifs/file.c	Mon May  3 16:32:08 2004
-@@ -87,8 +87,12 @@
- 		desiredAccess = GENERIC_READ;
- 	else if ((file->f_flags & O_ACCMODE) == O_WRONLY)
- 		desiredAccess = GENERIC_WRITE;
--	else if ((file->f_flags & O_ACCMODE) == O_RDWR)
--		desiredAccess = GENERIC_ALL;
-+	else if ((file->f_flags & O_ACCMODE) == O_RDWR) {
-+		/* GENERIC_ALL is too much permission to request */
-+		/* can cause unnecessary access denied on create */
-+		/* desiredAccess = GENERIC_ALL; */
-+		desiredAccess = GENERIC_READ | GENERIC_WRITE;
-+	}
- 
- /*********************************************************************
-  *  open flag mapping table:
diff --git a/lustre/kernel_patches/patches/configurable-x86-stack-2.4.21-sles8sp3.patch b/lustre/kernel_patches/patches/configurable-x86-stack-2.4.21-sles8sp3.patch
deleted file mode 100644
index bc0a1b7..0000000
--- a/lustre/kernel_patches/patches/configurable-x86-stack-2.4.21-sles8sp3.patch
+++ /dev/null
@@ -1,330 +0,0 @@
-Index: linux-2.4.21/arch/i386/kernel/entry.S
-===================================================================
---- linux-2.4.21.orig/arch/i386/kernel/entry.S	2004-04-24 02:39:01.000000000 -0400
-+++ linux-2.4.21/arch/i386/kernel/entry.S	2004-04-24 02:42:58.000000000 -0400
-@@ -45,6 +45,7 @@
- #include <linux/linkage.h>
- #include <asm/segment.h>
- #include <asm/smp.h>
-+#include <asm/current.h>
- 
- EBX		= 0x00
- ECX		= 0x04
-@@ -130,10 +131,6 @@
- 	.long 3b,6b;	\
- .previous
- 
--#define GET_CURRENT(reg) \
--	movl $-8192, reg; \
--	andl %esp, reg
--
- ENTRY(lcall7)
- 	pushfl			# We get a different stack layout with call gates,
- 	pushl %eax		# which has to be cleaned up later..
-@@ -149,7 +146,7 @@
- 	movl %ecx,CS(%esp)	#
- 	movl %esp,%ebx
- 	pushl %ebx
--	andl $-8192,%ebx	# GET_CURRENT
-+	andl $-THREAD_SIZE,%ebx	# GET_CURRENT
- 	movl exec_domain(%ebx),%edx	# Get the execution domain
- 	movl 4(%edx),%edx	# Get the lcall7 handler for the domain
- 	pushl $0x7
-@@ -173,7 +170,7 @@
- 	movl %ecx,CS(%esp)	#
- 	movl %esp,%ebx
- 	pushl %ebx
--	andl $-8192,%ebx	# GET_CURRENT
-+	andl $-THREAD_SIZE,%ebx	# GET_CURRENT
- 	movl exec_domain(%ebx),%edx	# Get the execution domain
- 	movl 4(%edx),%edx	# Get the lcall7 handler for the domain
- 	pushl $0x27
-Index: linux-2.4.21/arch/i386/kernel/smpboot.c
-===================================================================
---- linux-2.4.21.orig/arch/i386/kernel/smpboot.c	2004-04-24 02:39:05.000000000 -0400
-+++ linux-2.4.21/arch/i386/kernel/smpboot.c	2004-04-24 02:42:58.000000000 -0400
-@@ -837,7 +837,7 @@
- 
- 	/* So we see what's up   */
- 	printk("Booting processor %d/%d eip %lx\n", cpu, apicid, start_eip);
--	stack_start.esp = (void *) (1024 + PAGE_SIZE + (char *)idle);
-+	stack_start.esp = (void *)idle->thread.esp;
- 
- 	/*
- 	 * This grunge runs the startup process for
-@@ -918,7 +918,7 @@
- 			Dprintk("CPU has booted.\n");
- 		} else {
- 			boot_error= 1;
--			if (*((volatile unsigned char *)phys_to_virt(8192))
-+			if (*((volatile unsigned char *)phys_to_virt(THREAD_SIZE))
- 					== 0xA5)
- 				/* trampoline started but...? */
- 				printk("Stuck ??\n");
-@@ -941,7 +941,7 @@
- 	}
- 
- 	/* mark "stuck" area as not stuck */
--	*((volatile unsigned long *)phys_to_virt(8192)) = 0;
-+	*((volatile unsigned long *)phys_to_virt(THREAD_SIZE)) = 0;
- 
- #ifdef CONFIG_ES7000
- 	if (!es7000_plat)
-Index: linux-2.4.21/arch/i386/kernel/traps.c
-===================================================================
---- linux-2.4.21.orig/arch/i386/kernel/traps.c	2004-04-24 02:39:18.000000000 -0400
-+++ linux-2.4.21/arch/i386/kernel/traps.c	2004-04-24 02:42:58.000000000 -0400
-@@ -304,7 +304,7 @@
- 	unsigned long esp = tsk->thread.esp;
- 
- 	/* User space on another CPU? */
--	if ((esp ^ (unsigned long)tsk) & (PAGE_MASK<<1))
-+	if ((esp ^ (unsigned long)tsk) & ~(THREAD_SIZE - 1))
- 		return;
- 	show_trace((unsigned long *)esp);
- }
-Index: linux-2.4.21/arch/i386/kernel/head.S
-===================================================================
---- linux-2.4.21.orig/arch/i386/kernel/head.S	2004-04-24 02:38:42.000000000 -0400
-+++ linux-2.4.21/arch/i386/kernel/head.S	2004-04-24 02:42:58.000000000 -0400
-@@ -15,6 +15,7 @@
- #include <asm/page.h>
- #include <asm/pgtable.h>
- #include <asm/desc.h>
-+#include <asm/current.h>
- 
- #define OLD_CL_MAGIC_ADDR	0x90020
- #define OLD_CL_MAGIC		0xA33F
-@@ -326,7 +327,7 @@
- 	ret
- 
- ENTRY(stack_start)
--	.long SYMBOL_NAME(init_task_union)+8192
-+	.long SYMBOL_NAME(init_task_union)+THREAD_SIZE
- 	.long __KERNEL_DS
- 
- /* This is the default interrupt "handler" :-) */
-Index: linux-2.4.21/arch/i386/kernel/irq.c
-===================================================================
---- linux-2.4.21.orig/arch/i386/kernel/irq.c	2004-04-24 02:39:18.000000000 -0400
-+++ linux-2.4.21/arch/i386/kernel/irq.c	2004-04-24 02:44:26.000000000 -0400
-@@ -602,7 +602,10 @@
- 	long esp;
- 
- 	/* Debugging check for stack overflow: is there less than 1KB free? */
--	__asm__ __volatile__("andl %%esp,%0" : "=r" (esp) : "0" (8191));
-+        __asm__ __volatile__(
-+                "andl %%esp,%0"
-+                : "=r" (esp) : "0" (THREAD_SIZE-1));
-+
- 	if (unlikely(esp < (sizeof(struct task_struct) + sysctl_stackwarn))) {
- 		static unsigned long next_jiffies;	/* ratelimiting */
- 		static long least_esp = THREAD_SIZE;
-Index: linux-2.4.21/arch/i386/lib/getuser.S
-===================================================================
---- linux-2.4.21.orig/arch/i386/lib/getuser.S	1998-01-12 16:42:52.000000000 -0500
-+++ linux-2.4.21/arch/i386/lib/getuser.S	2004-04-24 02:42:58.000000000 -0400
-@@ -21,6 +21,10 @@
-  * as they get called from within inline assembly.
-  */
- 
-+/* Duplicated from asm/processor.h */
-+#include <asm/current.h>
-+#include <linux/config.h>
-+
- addr_limit = 12
- 
- .text
-@@ -28,7 +32,7 @@
- .globl __get_user_1
- __get_user_1:
- 	movl %esp,%edx
--	andl $0xffffe000,%edx
-+	andl $~(THREAD_SIZE - 1),%edx
- 	cmpl addr_limit(%edx),%eax
- 	jae bad_get_user
- 1:	movzbl (%eax),%edx
-@@ -41,7 +45,7 @@
- 	addl $1,%eax
- 	movl %esp,%edx
- 	jc bad_get_user
--	andl $0xffffe000,%edx
-+	andl $~(THREAD_SIZE - 1),%edx
- 	cmpl addr_limit(%edx),%eax
- 	jae bad_get_user
- 2:	movzwl -1(%eax),%edx
-@@ -54,7 +58,7 @@
- 	addl $3,%eax
- 	movl %esp,%edx
- 	jc bad_get_user
--	andl $0xffffe000,%edx
-+	andl $~(THREAD_SIZE - 1),%edx
- 	cmpl addr_limit(%edx),%eax
- 	jae bad_get_user
- 3:	movl -3(%eax),%edx
-Index: linux-2.4.21/arch/i386/config.in
-===================================================================
---- linux-2.4.21.orig/arch/i386/config.in	2004-04-24 02:39:21.000000000 -0400
-+++ linux-2.4.21/arch/i386/config.in	2004-04-24 02:42:58.000000000 -0400
-@@ -326,6 +326,29 @@
- if [ "$CONFIG_SMP" = "y" -a "$CONFIG_X86_CMPXCHG" = "y" ]; then
-    define_bool CONFIG_HAVE_DEC_LOCK y
- fi
-+
-+choice 'Bigger Stack Size Support' \
-+     "off    CONFIG_NOBIGSTACK \
-+      16KB   CONFIG_STACK_SIZE_16KB \
-+      32KB   CONFIG_STACK_SIZE_32KB \
-+      64KB   CONFIG_STACK_SIZE_64KB" off
-+
-+if [ "$CONFIG_NOBIGSTACK" = "y" ]; then
-+   define_int CONFIG_STACK_SIZE_SHIFT 1
-+else
-+  if [ "$CONFIG_STACK_SIZE_16KB" = "y" ]; then
-+     define_int CONFIG_STACK_SIZE_SHIFT 2
-+  else
-+    if [ "$CONFIG_STACK_SIZE_32KB" = "y" ]; then
-+      define_int CONFIG_STACK_SIZE_SHIFT 3
-+    else
-+      if [ "$CONFIG_STACK_SIZE_64KB" = "y" ]; then
-+        define_int CONFIG_STACK_SIZE_SHIFT 4
-+      fi
-+    fi
-+  fi
-+fi
-+ 
- endmenu
- 
- mainmenu_option next_comment
-Index: linux-2.4.21/arch/i386/vmlinux.lds.S
-===================================================================
---- linux-2.4.21.orig/arch/i386/vmlinux.lds.S	2004-04-24 02:38:06.000000000 -0400
-+++ linux-2.4.21/arch/i386/vmlinux.lds.S	2004-04-24 02:42:58.000000000 -0400
-@@ -39,7 +39,8 @@
- 
-   _edata = .;			/* End of data section */
- 
--  . = ALIGN(8192);		/* init_task */
-+/* chose the biggest of the possible stack sizes here? */
-+  . = ALIGN(65536);		/* init_task */
-   .data.init_task : { *(.data.init_task) }
- 
-   . = ALIGN(4096);		/* Init code and data */
-Index: linux-2.4.21/include/asm-i386/current.h
-===================================================================
---- linux-2.4.21.orig/include/asm-i386/current.h	1998-08-14 19:35:22.000000000 -0400
-+++ linux-2.4.21/include/asm-i386/current.h	2004-04-24 02:42:58.000000000 -0400
-@@ -1,15 +1,43 @@
- #ifndef _I386_CURRENT_H
- #define _I386_CURRENT_H
-+#include <asm/page.h>
-+
-+/*
-+ * Configurable page sizes on i386, mainly for debugging purposes.
-+ * (c) Balbir Singh
-+ */
-+
-+#ifdef __ASSEMBLY__
-+
-+#define PAGE_SIZE      4096    /* as cannot handle 1UL << 12 */
-+#define THREAD_SIZE ((1 << CONFIG_STACK_SIZE_SHIFT) * PAGE_SIZE)
-+
-+#define GET_CURRENT(reg) \
-+        movl $-THREAD_SIZE, reg; \
-+        andl %esp, reg
-+
-+#else  /* __ASSEMBLY__ */
-+
-+#define THREAD_SIZE ((1 << CONFIG_STACK_SIZE_SHIFT) * PAGE_SIZE)
-+#define alloc_task_struct() \
-+  ((struct task_struct *) __get_free_pages(GFP_KERNEL,CONFIG_STACK_SIZE_SHIFT))
-+
-+#define free_task_struct(p) \
-+  free_pages((unsigned long) (p), CONFIG_STACK_SIZE_SHIFT)
-+
-+#define INIT_TASK_SIZE THREAD_SIZE
- 
- struct task_struct;
- 
- static inline struct task_struct * get_current(void)
- {
- 	struct task_struct *current;
--	__asm__("andl %%esp,%0; ":"=r" (current) : "0" (~8191UL));
-+	__asm__("andl %%esp,%0; ":"=r" (current) : "0" (~(THREAD_SIZE - 1)));
- 	return current;
-  }
-  
- #define current get_current()
- 
-+#endif /* __ASSEMBLY__ */
-+
- #endif /* !(_I386_CURRENT_H) */
-Index: linux-2.4.21/include/asm-i386/hw_irq.h
-===================================================================
---- linux-2.4.21.orig/include/asm-i386/hw_irq.h	2004-04-24 02:39:05.000000000 -0400
-+++ linux-2.4.21/include/asm-i386/hw_irq.h	2004-04-24 02:42:58.000000000 -0400
-@@ -16,6 +16,7 @@
- #include <linux/sched.h>
- #include <asm/atomic.h>
- #include <asm/irq.h>
-+#include <asm/current.h>
- 
- /*
-  * IDT vectors usable for external interrupt sources start
-@@ -120,10 +121,6 @@
- #define IRQ_NAME2(nr) nr##_interrupt(void)
- #define IRQ_NAME(nr) IRQ_NAME2(IRQ##nr)
- 
--#define GET_CURRENT \
--	"movl %esp, %ebx\n\t" \
--	"andl $-8192, %ebx\n\t"
--
- /*
-  *	SMP has a few special interrupts for IPI messages
-  */
-Index: linux-2.4.21/include/asm-i386/processor.h
-===================================================================
---- linux-2.4.21.orig/include/asm-i386/processor.h	2004-04-24 02:39:21.000000000 -0400
-+++ linux-2.4.21/include/asm-i386/processor.h	2004-04-24 02:42:58.000000000 -0400
-@@ -14,6 +14,7 @@
- #include <asm/types.h>
- #include <asm/sigcontext.h>
- #include <asm/cpufeature.h>
-+#include <asm/current.h>
- #include <linux/cache.h>
- #include <linux/config.h>
- #include <linux/threads.h>
-@@ -466,9 +467,6 @@
- #define KSTK_EIP(tsk)	(((unsigned long *)(4096+(unsigned long)(tsk)))[1019])
- #define KSTK_ESP(tsk)	(((unsigned long *)(4096+(unsigned long)(tsk)))[1022])
- 
--#define THREAD_SIZE (2*PAGE_SIZE)
--#define alloc_task_struct() ((struct task_struct *) __get_free_pages(GFP_KERNEL,1))
--#define free_task_struct(p) free_pages((unsigned long) (p), 1)
- #define get_task_struct(tsk)      atomic_inc(&virt_to_page(tsk)->count)
- 
- #define init_task	(init_task_union.task)
-Index: linux-2.4.21/include/linux/sched.h
-===================================================================
---- linux-2.4.21.orig/include/linux/sched.h	2004-04-24 02:39:20.000000000 -0400
-+++ linux-2.4.21/include/linux/sched.h	2004-04-24 02:42:58.000000000 -0400
-@@ -2,6 +2,7 @@
- #define _LINUX_SCHED_H
- 
- #include <asm/param.h>	/* for HZ */
-+#include <asm/current.h>	/* maybe for INIT_TASK_SIZE */
- 
- extern unsigned long event;
- 
-Index: linux-2.4.21/include/asm-x86_64/current.h
-===================================================================
---- linux-2.4.21.orig/include/asm-x86_64/current.h	2002-11-28 18:53:15.000000000 -0500
-+++ linux-2.4.21/include/asm-x86_64/current.h	2004-04-24 02:42:58.000000000 -0400
-@@ -5,6 +5,7 @@
- struct task_struct;
- 
- #include <asm/pda.h>
-+#include <asm/page.h>
- 
- static inline struct task_struct *get_current(void) 
- { 
diff --git a/lustre/kernel_patches/patches/dev_read_only-suse-2.4.19.patch b/lustre/kernel_patches/patches/dev_read_only-suse-2.4.19.patch
deleted file mode 100644
index f2eb39a..0000000
--- a/lustre/kernel_patches/patches/dev_read_only-suse-2.4.19.patch
+++ /dev/null
@@ -1,76 +0,0 @@
- drivers/block/blkpg.c  |   36 ++++++++++++++++++++++++++++++++++++
- drivers/block/loop.c   |    3 +++
- drivers/ide/ide-disk.c |    4 ++++
- 3 files changed, 43 insertions(+)
-
-Index: linux-2.4.19/drivers/block/blkpg.c
-===================================================================
---- linux-2.4.19.orig/drivers/block/blkpg.c	2002-08-02 20:39:43.000000000 -0400
-+++ linux-2.4.19/drivers/block/blkpg.c	2004-04-23 18:24:40.000000000 -0400
-@@ -296,3 +296,37 @@
- }
- 
- EXPORT_SYMBOL(blk_ioctl);
-+
-+#define NUM_DEV_NO_WRITE 16
-+static int dev_no_write[NUM_DEV_NO_WRITE];
-+/*
-+ * Debug code for turning block devices "read-only" (will discard writes
-+ * silently).  This is for filesystem crash/recovery testing.
-+ */
-+void dev_set_rdonly(kdev_t dev, int no_write)
-+{
-+      if (dev) {
-+              printk(KERN_WARNING "Turning device %s read-only\n",
-+                     bdevname(dev));
-+              dev_no_write[no_write] = 0xdead0000 + dev;
-+      }
-+}
-+
-+int dev_check_rdonly(kdev_t dev) {
-+      int i;
-+
-+      for (i = 0; i < NUM_DEV_NO_WRITE; i++) {
-+      if ((dev_no_write[i] & 0xffff0000) == 0xdead0000 &&
-+              dev == (dev_no_write[i] & 0xffff))
-+              return 1;
-+      }
-+      return 0;
-+}
-+
-+void dev_clear_rdonly(int no_write) {
-+      dev_no_write[no_write] = 0;
-+}
-+
-+EXPORT_SYMBOL(dev_set_rdonly);
-+EXPORT_SYMBOL(dev_check_rdonly);
-+EXPORT_SYMBOL(dev_clear_rdonly);
-Index: linux-2.4.19/drivers/block/loop.c
-===================================================================
---- linux-2.4.19.orig/drivers/block/loop.c	2004-04-23 17:53:56.000000000 -0400
-+++ linux-2.4.19/drivers/block/loop.c	2004-04-23 18:23:16.000000000 -0400
-@@ -478,6 +478,9 @@
- 	spin_unlock_irq(&lo->lo_lock);
- 
- 	if (rw == WRITE) {
-+		if (dev_check_rdonly(rbh->b_rdev))
-+			goto err;
-+
- 		if (lo->lo_flags & LO_FLAGS_READ_ONLY)
- 			goto err;
- 	} else if (rw == READA) {
-Index: linux-2.4.19/drivers/ide/ide-disk.c
-===================================================================
---- linux-2.4.19.orig/drivers/ide/ide-disk.c	2004-04-23 17:53:51.000000000 -0400
-+++ linux-2.4.19/drivers/ide/ide-disk.c	2004-04-23 18:23:16.000000000 -0400
-@@ -558,6 +558,10 @@
-  */
- static ide_startstop_t do_rw_disk (ide_drive_t *drive, struct request *rq, unsigned long block)
- {
-+	if (rq->cmd == WRITE && dev_check_rdonly(rq->rq_dev)) {
-+		ide_end_request(1, HWGROUP(drive));
-+		return ide_stopped;
-+	}
- 	if (IDE_CONTROL_REG)
- 		OUT_BYTE(drive->ctl,IDE_CONTROL_REG);
- 
diff --git a/lustre/kernel_patches/patches/dev_read_only-2.6-suse.patch b/lustre/kernel_patches/patches/dev_read_only_2.6.0.patch
similarity index 100%
rename from lustre/kernel_patches/patches/dev_read_only-2.6-suse.patch
rename to lustre/kernel_patches/patches/dev_read_only_2.6.0.patch
diff --git a/lustre/kernel_patches/patches/directio-2.4.24.patch b/lustre/kernel_patches/patches/directio-2.4.24.patch
deleted file mode 100644
index ba63e78..0000000
--- a/lustre/kernel_patches/patches/directio-2.4.24.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: lum/mm/filemap.c
-===================================================================
---- lum.orig/mm/filemap.c	2004-04-25 14:58:10.000000000 -0400
-+++ lum/mm/filemap.c	2004-04-25 16:23:32.000000000 -0400
-@@ -1614,8 +1614,8 @@
- 		new_iobuf = 1;
- 	}
- 
--	blocksize = 1 << inode->i_blkbits;
--	blocksize_bits = inode->i_blkbits;
-+	blocksize = 512 /*1 << inode->i_blkbits*/;
-+	blocksize_bits = 9 /*inode->i_blkbits*/;
- 	blocksize_mask = blocksize - 1;
- 	chunk_size = KIO_MAX_ATOMIC_IO << 10;
- 
diff --git a/lustre/kernel_patches/patches/dynamic-locks-2.4.24.patch b/lustre/kernel_patches/patches/dynamic-locks-2.4.24.patch
new file mode 100644
index 0000000..b80f057
--- /dev/null
+++ b/lustre/kernel_patches/patches/dynamic-locks-2.4.24.patch
@@ -0,0 +1,217 @@
+ include/linux/dynlocks.h |   33 ++++++++++
+ lib/Makefile             |    4 -
+ lib/dynlocks.c           |  152 +++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 187 insertions(+), 2 deletions(-)
+
+Index: linux-2.4.24/include/linux/dynlocks.h
+===================================================================
+--- linux-2.4.24.orig/include/linux/dynlocks.h	2003-01-30 13:24:37.000000000 +0300
++++ linux-2.4.24/include/linux/dynlocks.h	2004-03-01 19:29:53.000000000 +0300
+@@ -0,0 +1,33 @@
++#ifndef _LINUX_DYNLOCKS_H
++#define _LINUX_DYNLOCKS_H
++
++#include <linux/list.h>
++#include <linux/wait.h>
++
++struct dynlock_member {
++	struct list_head	dl_list;
++	unsigned long		dl_value;	/* lock value */
++	int			dl_refcount;	/* number of users */
++	int			dl_readers;
++	int			dl_writers;
++	int			dl_pid;		/* holder of the lock */
++	wait_queue_head_t	dl_wait;
++};
++
++/*
++ * lock's namespace:
++ *   - list of locks
++ *   - lock to protect this list
++ */
++struct dynlock {
++	struct list_head dl_list;
++	spinlock_t dl_list_lock;
++};
++
++void dynlock_init(struct dynlock *dl);
++void *dynlock_lock(struct dynlock *dl, unsigned long value, int rw, int gfp);
++void dynlock_unlock(struct dynlock *dl, void *lock);
++
++
++#endif
++
+Index: linux-2.4.24/lib/dynlocks.c
+===================================================================
+--- linux-2.4.24.orig/lib/dynlocks.c	2003-01-30 13:24:37.000000000 +0300
++++ linux-2.4.24/lib/dynlocks.c	2004-03-01 19:29:53.000000000 +0300
+@@ -0,0 +1,152 @@
++/*
++ * Dynamic Locks
++ *
++ * struct dynlock is lockspace
++ * one may request lock (exclusive or shared) for some value
++ * in that lockspace
++ *
++ */
++
++#include <linux/dynlocks.h>
++#include <linux/module.h>
++#include <linux/slab.h>
++#include <linux/sched.h>
++
++/*
++ * dynlock_init
++ *
++ * initialize lockspace
++ *
++ */
++void dynlock_init(struct dynlock *dl)
++{
++	spin_lock_init(&dl->dl_list_lock);
++	INIT_LIST_HEAD(&dl->dl_list);
++}
++
++/*
++ * dynlock_lock
++ *
++ * acquires lock (exclusive or shared) in specified lockspace
++ * each lock in lockspace is allocated separately, so user have
++ * to specify GFP flags.
++ * routine returns pointer to lock. this pointer is intended to
++ * be passed to dynlock_unlock
++ *
++ */
++void *dynlock_lock(struct dynlock *dl, unsigned long value, int rw, int gfp)
++{
++	struct dynlock_member *nhl = NULL; 
++	struct dynlock_member *hl; 
++	struct list_head *cur;
++
++repeat:
++	/* find requested lock in lockspace */
++	spin_lock(&dl->dl_list_lock);
++	list_for_each(cur, &dl->dl_list) {
++		hl = list_entry(cur, struct dynlock_member, dl_list);
++		if (hl->dl_value == value) {
++			/* lock is found */
++			if (nhl) {
++				/* someone else just allocated
++				 * lock we didn't find and just created
++				 * so, we drop our lock
++				 */
++				kfree(nhl);
++				nhl = NULL;
++			}
++			hl->dl_refcount++;
++			goto found;
++		}
++	}
++	/* lock not found */
++	if (nhl) {
++		/* we already have allocated lock. use it */
++		hl = nhl;
++		nhl = NULL;
++		list_add(&hl->dl_list, &dl->dl_list);
++		goto found;
++	}
++	spin_unlock(&dl->dl_list_lock);
++	
++	/* lock not found and we haven't allocated lock yet. allocate it */
++	nhl = kmalloc(sizeof(struct dynlock_member), gfp);
++	if (nhl == NULL)
++		return NULL;
++	nhl->dl_refcount = 1;
++	nhl->dl_value = value;
++	nhl->dl_readers = 0;
++	nhl->dl_writers = 0;
++	init_waitqueue_head(&nhl->dl_wait);
++
++	/* while lock is being allocated, someone else may allocate it
++	 * and put onto to list. check this situation
++	 */
++	goto repeat;
++
++found:
++	if (rw) {
++		/* exclusive lock: user don't want to share lock at all
++		 * NOTE: one process may take the same lock several times
++		 * this functionaly is useful for rename operations */
++		while ((hl->dl_writers && hl->dl_pid != current->pid) ||
++				hl->dl_readers) {
++			spin_unlock(&dl->dl_list_lock);
++			wait_event(hl->dl_wait,
++				hl->dl_writers == 0 && hl->dl_readers == 0);
++			spin_lock(&dl->dl_list_lock);
++		}
++		hl->dl_writers++;
++	} else {
++		/* shared lock: user do not want to share lock with writer */
++		while (hl->dl_writers) {
++			spin_unlock(&dl->dl_list_lock);
++			wait_event(hl->dl_wait, hl->dl_writers == 0);
++			spin_lock(&dl->dl_list_lock);
++		}
++		hl->dl_readers++;
++	}
++	hl->dl_pid = current->pid;
++	spin_unlock(&dl->dl_list_lock);
++
++	return hl;
++}
++
++
++/*
++ * dynlock_unlock
++ *
++ * user have to specify lockspace (dl) and pointer to lock structure
++ * returned by dynlock_lock()
++ *
++ */
++void dynlock_unlock(struct dynlock *dl, void *lock)
++{
++	struct dynlock_member *hl = lock;
++	int wakeup = 0;
++	
++	spin_lock(&dl->dl_list_lock);
++	if (hl->dl_writers) {
++		hl->dl_writers--;
++		if (hl->dl_writers == 0)
++			wakeup = 1;
++	} else {
++		hl->dl_readers--;
++		if (hl->dl_readers == 0)
++			wakeup = 1;
++	}
++	if (wakeup) {
++		hl->dl_pid = 0;
++		wake_up(&hl->dl_wait);
++	}
++	if (--(hl->dl_refcount) == 0) 
++		list_del(&hl->dl_list);
++	spin_unlock(&dl->dl_list_lock);
++	if (hl->dl_refcount == 0)
++		kfree(hl);
++}
++
++EXPORT_SYMBOL(dynlock_init);
++EXPORT_SYMBOL(dynlock_lock);
++EXPORT_SYMBOL(dynlock_unlock);
++
+Index: linux-2.4.24/lib/Makefile
+===================================================================
+--- linux-2.4.24.orig/lib/Makefile	2004-02-02 21:52:31.000000000 +0300
++++ linux-2.4.24/lib/Makefile	2004-03-01 19:30:25.000000000 +0300
+@@ -9,10 +9,10 @@
+ L_TARGET := lib.a
+ 
+ export-objs := cmdline.o dec_and_lock.o rwsem-spinlock.o rwsem.o \
+-	       rbtree.o crc32.o firmware_class.o
++	       rbtree.o crc32.o firmware_class.o dynlocks.o
+ 
+ obj-y := errno.o ctype.o string.o vsprintf.o brlock.o cmdline.o \
+-	 bust_spinlocks.o rbtree.o dump_stack.o
++	 bust_spinlocks.o rbtree.o dump_stack.o dynlocks.o
+ 
+ obj-$(CONFIG_FW_LOADER) += firmware_class.o
+ obj-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o
diff --git a/lustre/kernel_patches/patches/export-2.6-suse.patch b/lustre/kernel_patches/patches/export-2.6-suse.patch
deleted file mode 100644
index 3ab1740..0000000
--- a/lustre/kernel_patches/patches/export-2.6-suse.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: linux-2.6.3/fs/open.c
-===================================================================
---- linux-2.6.3.orig/fs/open.c	2004-02-23 14:36:25.000000000 -0800
-+++ linux-2.6.3/fs/open.c	2004-02-23 20:09:34.000000000 -0800
-@@ -881,6 +881,7 @@
- 	return ERR_PTR(error);
- }
- 
-+EXPORT_SYMBOL(filp_open);
- 
- struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
- {
-Index: linux-2.6.3/fs/jbd/journal.c
-===================================================================
---- linux-2.6.3.orig/fs/jbd/journal.c	2004-01-08 22:59:10.000000000 -0800
-+++ linux-2.6.3/fs/jbd/journal.c	2004-02-23 20:09:34.000000000 -0800
-@@ -71,6 +71,7 @@
- EXPORT_SYMBOL(journal_errno);
- EXPORT_SYMBOL(journal_ack_err);
- EXPORT_SYMBOL(journal_clear_err);
-+EXPORT_SYMBOL(log_start_commit);
- EXPORT_SYMBOL(log_wait_commit);
- EXPORT_SYMBOL(journal_start_commit);
- EXPORT_SYMBOL(journal_wipe);
diff --git a/lustre/kernel_patches/patches/export-2.6.3.patch b/lustre/kernel_patches/patches/export-2.6.3.patch
new file mode 100644
index 0000000..8821d86
--- /dev/null
+++ b/lustre/kernel_patches/patches/export-2.6.3.patch
@@ -0,0 +1,57 @@
+Index: linux-2.6.3/fs/open.c
+===================================================================
+--- linux-2.6.3.orig/fs/open.c	2004-02-23 14:36:25.000000000 -0800
++++ linux-2.6.3/fs/open.c	2004-02-23 20:09:34.000000000 -0800
+@@ -881,6 +881,7 @@
+ 	return ERR_PTR(error);
+ }
+ 
++EXPORT_SYMBOL(filp_open);
+ 
+ struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
+ {
+Index: linux-2.6.3/fs/jbd/journal.c
+===================================================================
+--- linux-2.6.3.orig/fs/jbd/journal.c	2004-01-08 22:59:10.000000000 -0800
++++ linux-2.6.3/fs/jbd/journal.c	2004-02-23 20:09:34.000000000 -0800
+@@ -71,6 +71,7 @@
+ EXPORT_SYMBOL(journal_errno);
+ EXPORT_SYMBOL(journal_ack_err);
+ EXPORT_SYMBOL(journal_clear_err);
++EXPORT_SYMBOL(log_start_commit);
+ EXPORT_SYMBOL(log_wait_commit);
+ EXPORT_SYMBOL(journal_start_commit);
+ EXPORT_SYMBOL(journal_wipe);
+Index: linux-2.6.3/fs/ext3/super.c
+===================================================================
+--- linux-2.6.3.orig/fs/ext3/super.c	2004-02-23 14:36:26.000000000 -0800
++++ linux-2.6.3/fs/ext3/super.c	2004-02-23 20:24:30.000000000 -0800
+@@ -115,6 +115,8 @@
+ 		handle->h_err = err;
+ }
+ 
++EXPORT_SYMBOL(ext3_journal_abort_handle);
++
+ static char error_buf[1024];
+ 
+ /* Deal with the reporting of failure conditions on a filesystem such as
+@@ -1772,6 +1774,8 @@
+ 	return ret;
+ }
+ 
++EXPORT_SYMBOL(ext3_force_commit);
++
+ /*
+  * Ext3 always journals updates to the superblock itself, so we don't
+  * have to propagate any other updates to the superblock on disk at this
+@@ -2059,6 +2063,10 @@
+                         unsigned long *blocks, int *created, int create);
+ EXPORT_SYMBOL(ext3_map_inode_page);
+ 
++EXPORT_SYMBOL(ext3_xattr_get);
++EXPORT_SYMBOL(ext3_xattr_set_handle);
++EXPORT_SYMBOL(ext3_bread);
++
+ MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others");
+ MODULE_DESCRIPTION("Second Extended Filesystem with journaling extensions");
+ MODULE_LICENSE("GPL");
diff --git a/lustre/kernel_patches/patches/export-ext3-2.6-suse.patch b/lustre/kernel_patches/patches/export-ext3-2.6-suse.patch
deleted file mode 100644
index 638b4bf..0000000
--- a/lustre/kernel_patches/patches/export-ext3-2.6-suse.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: linux-stage/fs/ext3/super.c
-===================================================================
---- linux-stage.orig/fs/ext3/super.c	2004-04-02 16:40:18.000000000 -0500
-+++ linux-stage/fs/ext3/super.c	2004-04-02 16:40:18.000000000 -0500
-@@ -115,6 +115,8 @@
- 		handle->h_err = err;
- }
- 
-+EXPORT_SYMBOL(ext3_journal_abort_handle);
-+
- static char error_buf[1024];
- 
- /* Deal with the reporting of failure conditions on a filesystem such as
-@@ -1774,6 +1776,8 @@
- 	return ret;
- }
- 
-+EXPORT_SYMBOL(ext3_force_commit);
-+
- /*
-  * Ext3 always journals updates to the superblock itself, so we don't
-  * have to propagate any other updates to the superblock on disk at this
-@@ -2088,6 +2092,10 @@
-                         unsigned long *blocks, int *created, int create);
- EXPORT_SYMBOL(ext3_map_inode_page);
- 
-+EXPORT_SYMBOL(ext3_xattr_get);
-+EXPORT_SYMBOL(ext3_xattr_set_handle);
-+EXPORT_SYMBOL(ext3_bread);
-+
- MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others");
- MODULE_DESCRIPTION("Second Extended Filesystem with journaling extensions");
- MODULE_LICENSE("GPL");
diff --git a/lustre/kernel_patches/patches/export-truncate-2.6-suse.patch b/lustre/kernel_patches/patches/export-truncate-2.5.63.patch
similarity index 100%
rename from lustre/kernel_patches/patches/export-truncate-2.6-suse.patch
rename to lustre/kernel_patches/patches/export-truncate-2.5.63.patch
diff --git a/lustre/kernel_patches/patches/export_symbols-2.6.0-test6.patch b/lustre/kernel_patches/patches/export_symbols-2.6.0-test6.patch
new file mode 100644
index 0000000..93aa5ff
--- /dev/null
+++ b/lustre/kernel_patches/patches/export_symbols-2.6.0-test6.patch
@@ -0,0 +1,68 @@
+Index: linux-2.6.0-test6/fs/filesystems.c
+===================================================================
+--- linux-2.6.0-test6.orig/fs/filesystems.c	2003-09-28 08:50:40.000000000 +0800
++++ linux-2.6.0-test6/fs/filesystems.c	2003-10-07 18:07:58.000000000 +0800
+@@ -27,7 +27,7 @@
+  */
+ 
+ static struct file_system_type *file_systems;
+-static rwlock_t file_systems_lock = RW_LOCK_UNLOCKED;
++rwlock_t file_systems_lock = RW_LOCK_UNLOCKED;
+ 
+ /* WARNING: This can be used only if we _already_ own a reference */
+ void get_filesystem(struct file_system_type *fs)
+Index: linux-2.6.0-test6/include/linux/fs.h
+===================================================================
+--- linux-2.6.0-test6.orig/include/linux/fs.h	2003-10-07 16:09:11.000000000 +0800
++++ linux-2.6.0-test6/include/linux/fs.h	2003-10-09 19:47:24.996871688 +0800
+@@ -1385,6 +1385,7 @@
+ 
+ extern struct file_operations generic_ro_fops;
+ 
++extern rwlock_t file_systems_lock;
+ #define special_file(m) (S_ISCHR(m)||S_ISBLK(m)||S_ISFIFO(m)||S_ISSOCK(m))
+ 
+ extern int vfs_readlink(struct dentry *, char __user *, int, const char *);
+Index: linux-2.6.0-test6/kernel/ksyms.c
+===================================================================
+--- linux-2.6.0-test6.orig/kernel/ksyms.c	2003-10-07 16:09:09.000000000 +0800
++++ linux-2.6.0-test6/kernel/ksyms.c	2003-10-07 18:07:58.000000000 +0800
+@@ -393,3 +393,4 @@
+ EXPORT_SYMBOL(dump_oncpu);
+ EXPORT_SYMBOL(dump_function_ptr);
+ #endif
++EXPORT_SYMBOL(file_systems_lock);
+Index: linux-2.6.0-test6/include/linux/ext2_fs_sb.h
+===================================================================
+--- linux-2.6.0-test6.orig/include/linux/ext2_fs_sb.h	2003-09-28 08:50:57.000000000 +0800
++++ linux-2.6.0-test6/include/linux/ext2_fs_sb.h	2003-10-07 18:07:58.000000000 +0800
+@@ -16,9 +16,11 @@
+ #ifndef _LINUX_EXT2_FS_SB
+ #define _LINUX_EXT2_FS_SB
+ 
++#ifndef EXT_INCLUDE
++#define EXT_INCLUDE
+ #include <linux/blockgroup_lock.h>
+ #include <linux/percpu_counter.h>
+-
++#endif
+ /*
+  * second extended-fs super-block data in memory
+  */
+Index: linux-2.6.0-test6/include/linux/ext3_fs_sb.h
+===================================================================
+--- linux-2.6.0-test6.orig/include/linux/ext3_fs_sb.h	2003-09-28 08:51:00.000000000 +0800
++++ linux-2.6.0-test6/include/linux/ext3_fs_sb.h	2003-10-07 18:07:58.000000000 +0800
+@@ -19,9 +19,12 @@
+ #ifdef __KERNEL__
+ #include <linux/timer.h>
+ #include <linux/wait.h>
++#ifndef EXT_INCLUDE
++#define EXT_INCLUDE
+ #include <linux/blockgroup_lock.h>
+ #include <linux/percpu_counter.h>
+ #endif
++#endif
+ 
+ /*
+  * third extended-fs super-block data in memory
diff --git a/lustre/kernel_patches/patches/export_symbols-2.6-suse.patch b/lustre/kernel_patches/patches/export_symbols-2.6.0.patch
similarity index 50%
rename from lustre/kernel_patches/patches/export_symbols-2.6-suse.patch
rename to lustre/kernel_patches/patches/export_symbols-2.6.0.patch
index b22d925..02fa56e 100644
--- a/lustre/kernel_patches/patches/export_symbols-2.6-suse.patch
+++ b/lustre/kernel_patches/patches/export_symbols-2.6.0.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.4-51.0/fs/filesystems.c
+Index: linux-2.6.0/fs/filesystems.c
 ===================================================================
---- linux-2.6.4-51.0.orig/fs/filesystems.c	2004-04-05 12:41:59.000000000 -0400
-+++ linux-2.6.4-51.0/fs/filesystems.c	2004-04-15 14:59:56.000000000 -0400
+--- linux-2.6.0.orig/fs/filesystems.c	2003-12-30 08:32:44.000000000 +0300
++++ linux-2.6.0/fs/filesystems.c	2003-12-31 01:10:16.000000000 +0300
 @@ -27,7 +27,9 @@
   */
  
@@ -13,11 +13,11 @@ Index: linux-2.6.4-51.0/fs/filesystems.c
  
  /* WARNING: This can be used only if we _already_ own a reference */
  void get_filesystem(struct file_system_type *fs)
-Index: linux-2.6.4-51.0/include/linux/fs.h
+Index: linux-2.6.0/include/linux/fs.h
 ===================================================================
---- linux-2.6.4-51.0.orig/include/linux/fs.h	2004-04-15 14:59:50.000000000 -0400
-+++ linux-2.6.4-51.0/include/linux/fs.h	2004-04-15 14:59:56.000000000 -0400
-@@ -1432,6 +1432,7 @@
+--- linux-2.6.0.orig/include/linux/fs.h	2003-12-31 00:33:41.000000000 +0300
++++ linux-2.6.0/include/linux/fs.h	2003-12-31 01:09:26.000000000 +0300
+@@ -1390,6 +1390,7 @@
  
  extern struct file_operations generic_ro_fops;
  
@@ -25,10 +25,10 @@ Index: linux-2.6.4-51.0/include/linux/fs.h
  #define special_file(m) (S_ISCHR(m)||S_ISBLK(m)||S_ISFIFO(m)||S_ISSOCK(m))
  
  extern int vfs_readlink(struct dentry *, char __user *, int, const char *);
-Index: linux-2.6.4-51.0/include/linux/ext2_fs_sb.h
+Index: linux-2.6.0/include/linux/ext2_fs_sb.h
 ===================================================================
---- linux-2.6.4-51.0.orig/include/linux/ext2_fs_sb.h	2004-04-05 12:42:07.000000000 -0400
-+++ linux-2.6.4-51.0/include/linux/ext2_fs_sb.h	2004-04-15 14:59:56.000000000 -0400
+--- linux-2.6.0.orig/include/linux/ext2_fs_sb.h	2003-05-15 20:10:39.000000000 +0400
++++ linux-2.6.0/include/linux/ext2_fs_sb.h	2003-12-31 01:09:26.000000000 +0300
 @@ -16,9 +16,11 @@
  #ifndef _LINUX_EXT2_FS_SB
  #define _LINUX_EXT2_FS_SB
@@ -42,12 +42,20 @@ Index: linux-2.6.4-51.0/include/linux/ext2_fs_sb.h
  /*
   * second extended-fs super-block data in memory
   */
-Index: linux-2.6.4-51.0/kernel/kallsyms.c
+Index: linux-2.6.0/include/linux/ext3_fs_sb.h
 ===================================================================
---- linux-2.6.4-51.0.orig/kernel/kallsyms.c	2004-04-05 12:42:08.000000000 -0400
-+++ linux-2.6.4-51.0/kernel/kallsyms.c	2004-04-15 15:00:56.000000000 -0400
-@@ -329,3 +329,4 @@
+--- linux-2.6.0.orig/include/linux/ext3_fs_sb.h	2003-06-24 18:05:26.000000000 +0400
++++ linux-2.6.0/include/linux/ext3_fs_sb.h	2003-12-31 01:09:26.000000000 +0300
+@@ -19,9 +19,12 @@
+ #ifdef __KERNEL__
+ #include <linux/timer.h>
+ #include <linux/wait.h>
++#ifndef EXT_INCLUDE
++#define EXT_INCLUDE
+ #include <linux/blockgroup_lock.h>
+ #include <linux/percpu_counter.h>
+ #endif
++#endif
  
- EXPORT_SYMBOL(kallsyms_lookup);
- EXPORT_SYMBOL(__print_symbol);
-+EXPORT_SYMBOL(kernel_text_address);
+ /*
+  * third extended-fs super-block data in memory
diff --git a/lustre/kernel_patches/patches/export_symbols-ext3-2.6-suse.patch b/lustre/kernel_patches/patches/export_symbols-ext3-2.6-suse.patch
deleted file mode 100644
index 2327263..0000000
--- a/lustre/kernel_patches/patches/export_symbols-ext3-2.6-suse.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: linux-2.6.0/include/linux/ext3_fs_sb.h
-===================================================================
---- linux-2.6.0.orig/include/linux/ext3_fs_sb.h	2003-06-24 18:05:26.000000000 +0400
-+++ linux-2.6.0/include/linux/ext3_fs_sb.h	2003-12-31 01:09:26.000000000 +0300
-@@ -19,9 +19,12 @@
- #ifdef __KERNEL__
- #include <linux/timer.h>
- #include <linux/wait.h>
-+#ifndef EXT_INCLUDE
-+#define EXT_INCLUDE
- #include <linux/blockgroup_lock.h>
- #include <linux/percpu_counter.h>
- #endif
-+#endif
- 
- /*
-  * third extended-fs super-block data in memory
diff --git a/lustre/kernel_patches/patches/exports_2.4.19-suse.patch b/lustre/kernel_patches/patches/exports_2.4.19-suse.patch
index 769f411..feaeec6 100644
--- a/lustre/kernel_patches/patches/exports_2.4.19-suse.patch
+++ b/lustre/kernel_patches/patches/exports_2.4.19-suse.patch
@@ -4,10 +4,8 @@
  kernel/ksyms.c     |    4 ++++
  4 files changed, 8 insertions(+), 1 deletion(-)
 
-Index: linux-2.4.19/fs/ext3/Makefile
-===================================================================
---- linux-2.4.19.orig/fs/ext3/Makefile	2004-04-23 17:53:55.000000000 -0400
-+++ linux-2.4.19/fs/ext3/Makefile	2004-04-23 18:25:03.000000000 -0400
+--- linux/fs/ext3/Makefile~exports_2.4.20	Wed Apr  9 10:07:14 2003
++++ linux-mmonroe/fs/ext3/Makefile	Wed Apr  9 10:19:53 2003
 @@ -9,6 +9,8 @@
  
  O_TARGET := ext3.o
@@ -17,12 +15,10 @@ Index: linux-2.4.19/fs/ext3/Makefile
  obj-y    := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
  		ioctl.o namei.o super.o symlink.o
  obj-m    := $(O_TARGET)
-Index: linux-2.4.19/fs/ext3/super.c
-===================================================================
---- linux-2.4.19.orig/fs/ext3/super.c	2004-04-23 17:53:55.000000000 -0400
-+++ linux-2.4.19/fs/ext3/super.c	2004-04-23 18:25:03.000000000 -0400
-@@ -1821,7 +1821,7 @@
- 	exit_ext3_xattr();
+--- linux/fs/ext3/super.c~exports_2.4.20	Wed Apr  9 10:07:14 2003
++++ linux-mmonroe/fs/ext3/super.c	Wed Apr  9 10:19:53 2003
+@@ -1769,7 +1769,7 @@ static void __exit exit_ext3_fs(void)
+ 	unregister_filesystem(&ext3_fs_type);
  }
  
 -EXPORT_NO_SYMBOLS;
@@ -30,23 +26,19 @@ Index: linux-2.4.19/fs/ext3/super.c
  
  MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others");
  MODULE_DESCRIPTION("Second Extended Filesystem with journaling extensions");
-Index: linux-2.4.19/include/linux/fs.h
-===================================================================
---- linux-2.4.19.orig/include/linux/fs.h	2004-04-23 17:54:14.000000000 -0400
-+++ linux-2.4.19/include/linux/fs.h	2004-04-23 18:25:27.000000000 -0400
-@@ -1183,6 +1183,7 @@
+--- linux/include/linux/fs.h~exports_2.4.20	Wed Apr  9 10:07:14 2003
++++ linux-mmonroe/include/linux/fs.h	Wed Apr  9 10:19:53 2003
+@@ -1020,6 +1020,7 @@ extern int unregister_filesystem(struct 
  extern struct vfsmount *kern_mount(struct file_system_type *);
  extern int may_umount(struct vfsmount *);
  extern long do_mount(char *, char *, char *, unsigned long, void *);
 +struct vfsmount *do_kern_mount(const char *type, int flags, char *name, void *data);
- extern void umount_tree(struct vfsmount *);
  
  #define kern_umount mntput
-Index: linux-2.4.19/kernel/ksyms.c
-===================================================================
---- linux-2.4.19.orig/kernel/ksyms.c	2004-04-23 17:54:14.000000000 -0400
-+++ linux-2.4.19/kernel/ksyms.c	2004-04-23 18:25:03.000000000 -0400
-@@ -330,6 +330,10 @@
+ 
+--- linux/kernel/ksyms.c~exports_2.4.20	Wed Apr  9 10:07:14 2003
++++ linux-mmonroe/kernel/ksyms.c	Wed Apr  9 10:19:53 2003
+@@ -308,6 +308,10 @@ EXPORT_SYMBOL(dcache_dir_fsync);
  EXPORT_SYMBOL(dcache_readdir);
  EXPORT_SYMBOL(dcache_dir_ops);
  
@@ -57,3 +49,5 @@ Index: linux-2.4.19/kernel/ksyms.c
  /* for stackable file systems (lofs, wrapfs, cryptfs, etc.) */
  EXPORT_SYMBOL(default_llseek);
  EXPORT_SYMBOL(dentry_open);
+
+_
diff --git a/lustre/kernel_patches/patches/ext-2.4-patch-1-suse-2.4.19.patch b/lustre/kernel_patches/patches/ext-2.4-patch-1-suse-2.4.19.patch
deleted file mode 100644
index e937932..0000000
--- a/lustre/kernel_patches/patches/ext-2.4-patch-1-suse-2.4.19.patch
+++ /dev/null
@@ -1,2551 +0,0 @@
- fs/ext3/Makefile           |    2 
- fs/ext3/dir.c              |  299 +++++++++
- fs/ext3/file.c             |    3 
- fs/ext3/hash.c             |  215 ++++++
- fs/ext3/namei.c            | 1388 ++++++++++++++++++++++++++++++++++++++++-----
- fs/ext3/super.c            |    7 
- include/linux/ext3_fs.h    |   85 ++
- include/linux/ext3_fs_sb.h |    2 
- include/linux/ext3_jbd.h   |    2 
- include/linux/rbtree.h     |    2 
- lib/rbtree.c               |   42 +
- 11 files changed, 1887 insertions(+), 160 deletions(-)
-
-Index: linux-2.4.19/fs/ext3/Makefile
-===================================================================
---- linux-2.4.19.orig/fs/ext3/Makefile	2004-04-23 18:25:03.000000000 -0400
-+++ linux-2.4.19/fs/ext3/Makefile	2004-04-23 18:26:27.000000000 -0400
-@@ -12,7 +12,7 @@
- export-objs :=	super.o inode.o
- 
- obj-y    := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
--		ioctl.o namei.o super.o symlink.o
-+		ioctl.o namei.o super.o symlink.o hash.o
- obj-m    := $(O_TARGET)
- 
- obj-$(CONFIG_EXT3_FS_XATTR) += xattr.o
-Index: linux-2.4.19/fs/ext3/dir.c
-===================================================================
---- linux-2.4.19.orig/fs/ext3/dir.c	2001-11-09 17:25:04.000000000 -0500
-+++ linux-2.4.19/fs/ext3/dir.c	2004-04-23 18:26:27.000000000 -0400
-@@ -21,12 +21,16 @@
- #include <linux/fs.h>
- #include <linux/jbd.h>
- #include <linux/ext3_fs.h>
-+#include <linux/slab.h>
-+#include <linux/rbtree.h>
- 
- static unsigned char ext3_filetype_table[] = {
- 	DT_UNKNOWN, DT_REG, DT_DIR, DT_CHR, DT_BLK, DT_FIFO, DT_SOCK, DT_LNK
- };
- 
- static int ext3_readdir(struct file *, void *, filldir_t);
-+static int ext3_dx_readdir(struct file * filp,
-+			   void * dirent, filldir_t filldir);
- 
- struct file_operations ext3_dir_operations = {
- 	read:		generic_read_dir,
-@@ -35,6 +39,17 @@
- 	fsync:		ext3_sync_file,		/* BKL held */
- };
- 
-+
-+static unsigned char get_dtype(struct super_block *sb, int filetype)
-+{
-+	if (!EXT3_HAS_INCOMPAT_FEATURE(sb, EXT3_FEATURE_INCOMPAT_FILETYPE) ||
-+	    (filetype >= EXT3_FT_MAX))
-+		return DT_UNKNOWN;
-+
-+	return (ext3_filetype_table[filetype]);
-+}
-+			       
-+
- int ext3_check_dir_entry (const char * function, struct inode * dir,
- 			  struct ext3_dir_entry_2 * de,
- 			  struct buffer_head * bh,
-@@ -79,6 +94,16 @@
- 
- 	sb = inode->i_sb;
- 
-+	if (is_dx(inode)) {
-+		err = ext3_dx_readdir(filp, dirent, filldir);
-+		if (err != ERR_BAD_DX_DIR)
-+			return err;
-+		/*
-+		 * We don't set the inode dirty flag since it's not
-+		 * critical that it get flushed back to the disk.
-+		 */
-+		EXT3_I(filp->f_dentry->d_inode)->i_flags &= ~EXT3_INDEX_FL;
-+	}
- 	stored = 0;
- 	bh = NULL;
- 	offset = filp->f_pos & (sb->s_blocksize - 1);
-@@ -162,18 +187,12 @@
- 				 * during the copy operation.
- 				 */
- 				unsigned long version = filp->f_version;
--				unsigned char d_type = DT_UNKNOWN;
- 
--				if (EXT3_HAS_INCOMPAT_FEATURE(sb,
--						EXT3_FEATURE_INCOMPAT_FILETYPE)
--						&& de->file_type < EXT3_FT_MAX)
--					d_type =
--					  ext3_filetype_table[de->file_type];
- 				error = filldir(dirent, de->name,
- 						de->name_len,
- 						filp->f_pos,
- 						le32_to_cpu(de->inode),
--						d_type);
-+						get_dtype(sb, de->file_type));
- 				if (error)
- 					break;
- 				if (version != filp->f_version)
-@@ -188,3 +207,269 @@
- 	UPDATE_ATIME(inode);
- 	return 0;
- }
-+
-+#ifdef CONFIG_EXT3_INDEX
-+/*
-+ * These functions convert from the major/minor hash to an f_pos
-+ * value.
-+ * 
-+ * Currently we only use major hash numer.  This is unfortunate, but
-+ * on 32-bit machines, the same VFS interface is used for lseek and
-+ * llseek, so if we use the 64 bit offset, then the 32-bit versions of
-+ * lseek/telldir/seekdir will blow out spectacularly, and from within
-+ * the ext2 low-level routine, we don't know if we're being called by
-+ * a 64-bit version of the system call or the 32-bit version of the
-+ * system call.  Worse yet, NFSv2 only allows for a 32-bit readdir
-+ * cookie.  Sigh.
-+ */
-+#define hash2pos(major, minor)	(major >> 1)
-+#define pos2maj_hash(pos)	((pos << 1) & 0xffffffff)
-+#define pos2min_hash(pos)	(0)
-+
-+/*
-+ * This structure holds the nodes of the red-black tree used to store
-+ * the directory entry in hash order.
-+ */
-+struct fname {
-+	__u32		hash;
-+	__u32		minor_hash;
-+	rb_node_t	rb_hash; 
-+	struct fname	*next;
-+	__u32		inode;
-+	__u8		name_len;
-+	__u8		file_type;
-+	char		name[0];
-+};
-+
-+/*
-+ * This functoin implements a non-recursive way of freeing all of the
-+ * nodes in the red-black tree.
-+ */
-+static void free_rb_tree_fname(rb_root_t *root)
-+{
-+	rb_node_t	*n = root->rb_node;
-+	rb_node_t	*parent;
-+	struct fname	*fname;
-+
-+	while (n) {
-+		/* Do the node's children first */
-+		if ((n)->rb_left) {
-+			n = n->rb_left;
-+			continue;
-+		}
-+		if (n->rb_right) {
-+			n = n->rb_right;
-+			continue;
-+		}
-+		/*
-+		 * The node has no children; free it, and then zero
-+		 * out parent's link to it.  Finally go to the
-+		 * beginning of the loop and try to free the parent
-+		 * node.
-+		 */
-+		parent = n->rb_parent;
-+		fname = rb_entry(n, struct fname, rb_hash);
-+		kfree(fname);
-+		if (!parent)
-+			root->rb_node = 0;
-+		else if (parent->rb_left == n)
-+			parent->rb_left = 0;
-+		else if (parent->rb_right == n)
-+			parent->rb_right = 0;
-+		n = parent;
-+	}
-+	root->rb_node = 0;
-+}
-+
-+
-+struct dir_private_info *create_dir_info(loff_t pos)
-+{
-+	struct dir_private_info *p;
-+
-+	p = kmalloc(sizeof(struct dir_private_info), GFP_KERNEL);
-+	if (!p)
-+		return NULL;
-+	p->root.rb_node = 0;
-+	p->curr_node = 0;
-+	p->extra_fname = 0;
-+	p->last_pos = 0;
-+	p->curr_hash = pos2maj_hash(pos);
-+	p->curr_minor_hash = pos2min_hash(pos);
-+	p->next_hash = 0;
-+	return p;
-+}
-+
-+void ext3_htree_free_dir_info(struct dir_private_info *p)
-+{
-+	free_rb_tree_fname(&p->root);
-+	kfree(p);
-+}
-+		
-+/*
-+ * Given a directory entry, enter it into the fname rb tree.
-+ */
-+void ext3_htree_store_dirent(struct file *dir_file, __u32 hash,
-+			     __u32 minor_hash,
-+			     struct ext3_dir_entry_2 *dirent)
-+{
-+	rb_node_t **p, *parent = NULL;
-+	struct fname * fname, *new_fn;
-+	struct dir_private_info *info;
-+	int len;
-+
-+	info = (struct dir_private_info *) dir_file->private_data;
-+	p = &info->root.rb_node;
-+
-+	/* Create and allocate the fname structure */
-+	len = sizeof(struct fname) + dirent->name_len + 1;
-+	new_fn = kmalloc(len, GFP_KERNEL);
-+	memset(new_fn, 0, len);
-+	new_fn->hash = hash;
-+	new_fn->minor_hash = minor_hash;
-+	new_fn->inode = le32_to_cpu(dirent->inode);
-+	new_fn->name_len = dirent->name_len;
-+	new_fn->file_type = dirent->file_type;
-+	memcpy(new_fn->name, dirent->name, dirent->name_len);
-+	new_fn->name[dirent->name_len] = 0;
-+	
-+	while (*p) {
-+		parent = *p;
-+		fname = rb_entry(parent, struct fname, rb_hash);
-+
-+		/*
-+		 * If the hash and minor hash match up, then we put
-+		 * them on a linked list.  This rarely happens...
-+		 */
-+		if ((new_fn->hash == fname->hash) &&
-+		    (new_fn->minor_hash == fname->minor_hash)) {
-+			new_fn->next = fname->next;
-+			fname->next = new_fn;
-+			return;
-+		}
-+			
-+		if (new_fn->hash < fname->hash)
-+			p = &(*p)->rb_left;
-+		else if (new_fn->hash > fname->hash)
-+			p = &(*p)->rb_right;
-+		else if (new_fn->minor_hash < fname->minor_hash)
-+			p = &(*p)->rb_left;
-+		else /* if (new_fn->minor_hash > fname->minor_hash) */
-+			p = &(*p)->rb_right;
-+	}
-+
-+	rb_link_node(&new_fn->rb_hash, parent, p);
-+	rb_insert_color(&new_fn->rb_hash, &info->root);
-+}
-+
-+
-+
-+/*
-+ * This is a helper function for ext3_dx_readdir.  It calls filldir
-+ * for all entres on the fname linked list.  (Normally there is only
-+ * one entry on the linked list, unless there are 62 bit hash collisions.)
-+ */
-+static int call_filldir(struct file * filp, void * dirent,
-+			filldir_t filldir, struct fname *fname)
-+{
-+	struct dir_private_info *info = filp->private_data;
-+	loff_t	curr_pos;
-+	struct inode *inode = filp->f_dentry->d_inode;
-+	struct super_block * sb;
-+	int error;
-+
-+	sb = inode->i_sb;
-+	
-+	if (!fname) {
-+		printk("call_filldir: called with null fname?!?\n");
-+		return 0;
-+	}
-+	curr_pos = hash2pos(fname->hash, fname->minor_hash);
-+	while (fname) {
-+		error = filldir(dirent, fname->name,
-+				fname->name_len, curr_pos, 
-+				fname->inode,
-+				get_dtype(sb, fname->file_type));
-+		if (error) {
-+			filp->f_pos = curr_pos;
-+			info->extra_fname = fname->next;
-+			return error;
-+		}
-+		fname = fname->next;
-+	}
-+	return 0;
-+}
-+
-+static int ext3_dx_readdir(struct file * filp,
-+			 void * dirent, filldir_t filldir)
-+{
-+	struct dir_private_info *info = filp->private_data;
-+	struct inode *inode = filp->f_dentry->d_inode;
-+	struct fname *fname;
-+	int	ret;
-+
-+	if (!info) {
-+		info = create_dir_info(filp->f_pos);
-+		if (!info)
-+			return -ENOMEM;
-+		filp->private_data = info;
-+	}
-+
-+	/* Some one has messed with f_pos; reset the world */
-+	if (info->last_pos != filp->f_pos) {
-+		free_rb_tree_fname(&info->root);
-+		info->curr_node = 0;
-+		info->extra_fname = 0;
-+		info->curr_hash = pos2maj_hash(filp->f_pos);
-+		info->curr_minor_hash = pos2min_hash(filp->f_pos);
-+	}
-+
-+	/*
-+	 * If there are any leftover names on the hash collision
-+	 * chain, return them first.
-+	 */
-+	if (info->extra_fname &&
-+	    call_filldir(filp, dirent, filldir, info->extra_fname))
-+		goto finished;
-+
-+	if (!info->curr_node)
-+		info->curr_node = rb_get_first(&info->root);
-+
-+	while (1) {
-+		/*
-+		 * Fill the rbtree if we have no more entries,
-+		 * or the inode has changed since we last read in the
-+		 * cached entries. 
-+		 */
-+		if ((!info->curr_node) ||
-+		    (filp->f_version != inode->i_version)) {
-+			info->curr_node = 0;
-+			free_rb_tree_fname(&info->root);
-+			filp->f_version = inode->i_version;
-+			ret = ext3_htree_fill_tree(filp, info->curr_hash,
-+						   info->curr_minor_hash,
-+						   &info->next_hash);
-+			if (ret < 0)
-+				return ret;
-+			if (ret == 0)
-+				break;
-+			info->curr_node = rb_get_first(&info->root);
-+		}
-+
-+		fname = rb_entry(info->curr_node, struct fname, rb_hash);
-+		info->curr_hash = fname->hash;
-+		info->curr_minor_hash = fname->minor_hash;
-+		if (call_filldir(filp, dirent, filldir, fname))
-+			break;
-+
-+		info->curr_node = rb_get_next(info->curr_node);
-+		if (!info->curr_node) {
-+			info->curr_hash = info->next_hash;
-+			info->curr_minor_hash = 0;
-+		}
-+	}
-+finished:
-+	info->last_pos = filp->f_pos;
-+	UPDATE_ATIME(inode);
-+	return 0;
-+}
-+#endif
-Index: linux-2.4.19/fs/ext3/file.c
-===================================================================
---- linux-2.4.19.orig/fs/ext3/file.c	2004-04-23 17:54:02.000000000 -0400
-+++ linux-2.4.19/fs/ext3/file.c	2004-04-23 18:26:27.000000000 -0400
-@@ -38,6 +38,9 @@
- {
- 	if (filp->f_mode & FMODE_WRITE)
- 		ext3_discard_prealloc (inode);
-+	if (is_dx(inode) && filp->private_data)
-+		ext3_htree_free_dir_info(filp->private_data);
-+
- 	return 0;
- }
- 
-Index: linux-2.4.19/fs/ext3/hash.c
-===================================================================
---- linux-2.4.19.orig/fs/ext3/hash.c	2003-01-30 05:24:37.000000000 -0500
-+++ linux-2.4.19/fs/ext3/hash.c	2004-04-23 18:26:27.000000000 -0400
-@@ -0,0 +1,215 @@
-+/*
-+ *  linux/fs/ext3/hash.c
-+ *
-+ * Copyright (C) 2002 by Theodore Ts'o
-+ *
-+ * This file is released under the GPL v2.
-+ * 
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ */
-+
-+#include <linux/fs.h>
-+#include <linux/jbd.h>
-+#include <linux/sched.h>
-+#include <linux/ext3_fs.h>
-+
-+#define DELTA 0x9E3779B9
-+
-+static void TEA_transform(__u32 buf[4], __u32 const in[])
-+{
-+	__u32	sum = 0;
-+	__u32	b0 = buf[0], b1 = buf[1];
-+	__u32	a = in[0], b = in[1], c = in[2], d = in[3];
-+	int	n = 16;
-+
-+	do {							
-+		sum += DELTA;					
-+		b0 += ((b1 << 4)+a) ^ (b1+sum) ^ ((b1 >> 5)+b);	
-+		b1 += ((b0 << 4)+c) ^ (b0+sum) ^ ((b0 >> 5)+d);	
-+	} while(--n);
-+
-+	buf[0] += b0;
-+	buf[1] += b1;
-+}
-+
-+/* F, G and H are basic MD4 functions: selection, majority, parity */
-+#define F(x, y, z) ((z) ^ ((x) & ((y) ^ (z))))
-+#define G(x, y, z) (((x) & (y)) + (((x) ^ (y)) & (z)))
-+#define H(x, y, z) ((x) ^ (y) ^ (z))
-+
-+/*
-+ * The generic round function.  The application is so specific that
-+ * we don't bother protecting all the arguments with parens, as is generally
-+ * good macro practice, in favor of extra legibility.
-+ * Rotation is separate from addition to prevent recomputation
-+ */
-+#define ROUND(f, a, b, c, d, x, s)	\
-+	(a += f(b, c, d) + x, a = (a << s) | (a >> (32-s)))
-+#define K1 0
-+#define K2 013240474631UL
-+#define K3 015666365641UL
-+
-+/*
-+ * Basic cut-down MD4 transform.  Returns only 32 bits of result.
-+ */
-+static void halfMD4Transform (__u32 buf[4], __u32 const in[])
-+{
-+	__u32	a = buf[0], b = buf[1], c = buf[2], d = buf[3];
-+
-+	/* Round 1 */
-+	ROUND(F, a, b, c, d, in[0] + K1,  3);
-+	ROUND(F, d, a, b, c, in[1] + K1,  7);
-+	ROUND(F, c, d, a, b, in[2] + K1, 11);
-+	ROUND(F, b, c, d, a, in[3] + K1, 19);
-+	ROUND(F, a, b, c, d, in[4] + K1,  3);
-+	ROUND(F, d, a, b, c, in[5] + K1,  7);
-+	ROUND(F, c, d, a, b, in[6] + K1, 11);
-+	ROUND(F, b, c, d, a, in[7] + K1, 19);
-+
-+	/* Round 2 */
-+	ROUND(G, a, b, c, d, in[1] + K2,  3);
-+	ROUND(G, d, a, b, c, in[3] + K2,  5);
-+	ROUND(G, c, d, a, b, in[5] + K2,  9);
-+	ROUND(G, b, c, d, a, in[7] + K2, 13);
-+	ROUND(G, a, b, c, d, in[0] + K2,  3);
-+	ROUND(G, d, a, b, c, in[2] + K2,  5);
-+	ROUND(G, c, d, a, b, in[4] + K2,  9);
-+	ROUND(G, b, c, d, a, in[6] + K2, 13);
-+
-+	/* Round 3 */
-+	ROUND(H, a, b, c, d, in[3] + K3,  3);
-+	ROUND(H, d, a, b, c, in[7] + K3,  9);
-+	ROUND(H, c, d, a, b, in[2] + K3, 11);
-+	ROUND(H, b, c, d, a, in[6] + K3, 15);
-+	ROUND(H, a, b, c, d, in[1] + K3,  3);
-+	ROUND(H, d, a, b, c, in[5] + K3,  9);
-+	ROUND(H, c, d, a, b, in[0] + K3, 11);
-+	ROUND(H, b, c, d, a, in[4] + K3, 15);
-+
-+	buf[0] += a;
-+	buf[1] += b;
-+	buf[2] += c;
-+	buf[3] += d;
-+}
-+
-+#undef ROUND
-+#undef F
-+#undef G
-+#undef H
-+#undef K1
-+#undef K2
-+#undef K3
-+
-+/* The old legacy hash */
-+static __u32 dx_hack_hash (const char *name, int len)
-+{
-+	__u32 hash0 = 0x12a3fe2d, hash1 = 0x37abe8f9;
-+	while (len--) {
-+		__u32 hash = hash1 + (hash0 ^ (*name++ * 7152373));
-+		
-+		if (hash & 0x80000000) hash -= 0x7fffffff;
-+		hash1 = hash0;
-+		hash0 = hash;
-+	}
-+	return (hash0 << 1);
-+}
-+
-+static void str2hashbuf(const char *msg, int len, __u32 *buf, int num)
-+{
-+	__u32	pad, val;
-+	int	i;
-+
-+	pad = (__u32)len | ((__u32)len << 8);
-+	pad |= pad << 16;
-+
-+	val = pad;
-+	if (len > num*4)
-+		len = num * 4;
-+	for (i=0; i < len; i++) {
-+		if ((i % 4) == 0)
-+			val = pad;
-+		val = msg[i] + (val << 8);
-+		if ((i % 4) == 3) {
-+			*buf++ = val;
-+			val = pad;
-+			num--;
-+		}
-+	}
-+	if (--num >= 0)
-+		*buf++ = val;
-+	while (--num >= 0)
-+		*buf++ = pad;
-+}
-+
-+/*
-+ * Returns the hash of a filename.  If len is 0 and name is NULL, then
-+ * this function can be used to test whether or not a hash version is
-+ * supported.
-+ * 
-+ * The seed is an 4 longword (32 bits) "secret" which can be used to
-+ * uniquify a hash.  If the seed is all zero's, then some default seed
-+ * may be used.
-+ * 
-+ * A particular hash version specifies whether or not the seed is
-+ * represented, and whether or not the returned hash is 32 bits or 64
-+ * bits.  32 bit hashes will return 0 for the minor hash.
-+ */
-+int ext3fs_dirhash(const char *name, int len, struct dx_hash_info *hinfo)
-+{
-+	__u32	hash;
-+	__u32	minor_hash = 0;
-+	const char	*p;
-+	int		i;
-+	__u32 		in[8], buf[4];
-+
-+	/* Initialize the default seed for the hash checksum functions */
-+	buf[0] = 0x67452301;
-+	buf[1] = 0xefcdab89;
-+	buf[2] = 0x98badcfe;
-+	buf[3] = 0x10325476;
-+
-+	/* Check to see if the seed is all zero's */
-+	if (hinfo->seed) {
-+		for (i=0; i < 4; i++) {
-+			if (hinfo->seed[i])
-+				break;
-+		}
-+		if (i < 4)
-+			memcpy(buf, hinfo->seed, sizeof(buf));
-+	}
-+		
-+	switch (hinfo->hash_version) {
-+	case DX_HASH_LEGACY:
-+		hash = dx_hack_hash(name, len);
-+		break;
-+	case DX_HASH_HALF_MD4:
-+		p = name;
-+		while (len > 0) {
-+			str2hashbuf(p, len, in, 8);
-+			halfMD4Transform(buf, in);
-+			len -= 32;
-+			p += 32;
-+		}
-+		minor_hash = buf[2];
-+		hash = buf[1];
-+		break;
-+	case DX_HASH_TEA:
-+		p = name;
-+		while (len > 0) {
-+			str2hashbuf(p, len, in, 4);
-+			TEA_transform(buf, in);
-+			len -= 16;
-+			p += 16;
-+		}
-+		hash = buf[0];
-+		minor_hash = buf[1];
-+		break;
-+	default:
-+		hinfo->hash = 0;
-+		return -1;
-+	}
-+	hinfo->hash = hash & ~1;
-+	hinfo->minor_hash = minor_hash;
-+	return 0;
-+}
-Index: linux-2.4.19/fs/ext3/namei.c
-===================================================================
---- linux-2.4.19.orig/fs/ext3/namei.c	2004-04-23 17:53:55.000000000 -0400
-+++ linux-2.4.19/fs/ext3/namei.c	2004-04-23 22:24:05.000000000 -0400
-@@ -16,6 +16,12 @@
-  *        David S. Miller (davem@caip.rutgers.edu), 1995
-  *  Directory entry file type support and forward compatibility hooks
-  *  	for B-tree directories by Theodore Ts'o (tytso@mit.edu), 1998
-+ *  Hash Tree Directory indexing (c)
-+ *  	Daniel Phillips, 2001
-+ *  Hash Tree Directory indexing porting
-+ *  	Christopher Li, 2002
-+ *  Hash Tree Directory indexing cleanup
-+ * 	Theodore Ts'o, 2002
-  */
- 
- #include <linux/fs.h>
-@@ -40,6 +46,630 @@
- #define NAMEI_RA_SIZE        (NAMEI_RA_CHUNKS * NAMEI_RA_BLOCKS)
- #define NAMEI_RA_INDEX(c,b)  (((c) * NAMEI_RA_BLOCKS) + (b))
- 
-+static struct buffer_head *ext3_append(handle_t *handle,
-+					struct inode *inode,
-+					u32 *block, int *err)
-+{
-+	struct buffer_head *bh;
-+
-+	*block = inode->i_size >> inode->i_sb->s_blocksize_bits;
-+
-+	if ((bh = ext3_bread(handle, inode, *block, 1, err))) {
-+		inode->i_size += inode->i_sb->s_blocksize;
-+		EXT3_I(inode)->i_disksize = inode->i_size;
-+		ext3_journal_get_write_access(handle,bh);
-+	}
-+	return bh;
-+}
-+
-+#ifndef assert
-+#define assert(test) J_ASSERT(test)
-+#endif
-+
-+#ifndef swap
-+#define swap(x, y) do { typeof(x) z = x; x = y; y = z; } while (0)
-+#endif
-+
-+typedef struct { u32 v; } le_u32;
-+typedef struct { u16 v; } le_u16;
-+
-+#ifdef DX_DEBUG
-+#define dxtrace(command) command
-+#else
-+#define dxtrace(command) 
-+#endif
-+
-+struct fake_dirent
-+{
-+	/*le*/u32 inode;
-+	/*le*/u16 rec_len;
-+	u8 name_len;
-+	u8 file_type;
-+};
-+
-+struct dx_countlimit
-+{
-+	le_u16 limit;
-+	le_u16 count;
-+};
-+
-+struct dx_entry
-+{
-+	le_u32 hash;
-+	le_u32 block;
-+};
-+
-+/*
-+ * dx_root_info is laid out so that if it should somehow get overlaid by a
-+ * dirent the two low bits of the hash version will be zero.  Therefore, the
-+ * hash version mod 4 should never be 0.  Sincerely, the paranoia department.
-+ */
-+
-+struct dx_root
-+{
-+	struct fake_dirent dot;
-+	char dot_name[4];
-+	struct fake_dirent dotdot;
-+	char dotdot_name[4];
-+	struct dx_root_info
-+	{
-+		le_u32 reserved_zero;
-+		u8 hash_version;
-+		u8 info_length; /* 8 */
-+		u8 indirect_levels;
-+		u8 unused_flags;
-+	}
-+	info;
-+	struct dx_entry	entries[0];
-+};
-+
-+struct dx_node
-+{
-+	struct fake_dirent fake;
-+	struct dx_entry	entries[0];
-+};
-+
-+
-+struct dx_frame
-+{
-+	struct buffer_head *bh;
-+	struct dx_entry *entries;
-+	struct dx_entry *at;
-+};
-+
-+struct dx_map_entry
-+{
-+	u32 hash;
-+	u32 offs;
-+};
-+
-+#ifdef CONFIG_EXT3_INDEX
-+static inline unsigned dx_get_block (struct dx_entry *entry);
-+static void dx_set_block (struct dx_entry *entry, unsigned value);
-+static inline unsigned dx_get_hash (struct dx_entry *entry);
-+static void dx_set_hash (struct dx_entry *entry, unsigned value);
-+static unsigned dx_get_count (struct dx_entry *entries);
-+static unsigned dx_get_limit (struct dx_entry *entries);
-+static void dx_set_count (struct dx_entry *entries, unsigned value);
-+static void dx_set_limit (struct dx_entry *entries, unsigned value);
-+static unsigned dx_root_limit (struct inode *dir, unsigned infosize);
-+static unsigned dx_node_limit (struct inode *dir);
-+static struct dx_frame *dx_probe(struct dentry *dentry,
-+				 struct inode *dir,
-+				 struct dx_hash_info *hinfo,
-+				 struct dx_frame *frame,
-+				 int *err);
-+static void dx_release (struct dx_frame *frames);
-+static int dx_make_map (struct ext3_dir_entry_2 *de, int size,
-+			struct dx_hash_info *hinfo, struct dx_map_entry map[]);
-+static void dx_sort_map(struct dx_map_entry *map, unsigned count);
-+static struct ext3_dir_entry_2 *dx_move_dirents (char *from, char *to,
-+		struct dx_map_entry *offsets, int count);
-+static struct ext3_dir_entry_2* dx_pack_dirents (char *base, int size);
-+static void dx_insert_block (struct dx_frame *frame, u32 hash, u32 block);
-+static int ext3_htree_next_block(struct inode *dir, __u32 hash,
-+				 struct dx_frame *frame,
-+				 struct dx_frame *frames, int *err,
-+				 __u32 *start_hash);
-+static struct buffer_head * ext3_dx_find_entry(struct dentry *dentry,
-+		       struct ext3_dir_entry_2 **res_dir, int *err);
-+static int ext3_dx_add_entry(handle_t *handle, struct dentry *dentry,
-+			     struct inode *inode);
-+
-+/*
-+ * Future: use high four bits of block for coalesce-on-delete flags
-+ * Mask them off for now.
-+ */
-+
-+static inline unsigned dx_get_block (struct dx_entry *entry)
-+{
-+	return le32_to_cpu(entry->block.v) & 0x00ffffff;
-+}
-+
-+static inline void dx_set_block (struct dx_entry *entry, unsigned value)
-+{
-+	entry->block.v = cpu_to_le32(value);
-+}
-+
-+static inline unsigned dx_get_hash (struct dx_entry *entry)
-+{
-+	return le32_to_cpu(entry->hash.v);
-+}
-+
-+static inline void dx_set_hash (struct dx_entry *entry, unsigned value)
-+{
-+	entry->hash.v = cpu_to_le32(value);
-+}
-+
-+static inline unsigned dx_get_count (struct dx_entry *entries)
-+{
-+	return le16_to_cpu(((struct dx_countlimit *) entries)->count.v);
-+}
-+
-+static inline unsigned dx_get_limit (struct dx_entry *entries)
-+{
-+	return le16_to_cpu(((struct dx_countlimit *) entries)->limit.v);
-+}
-+
-+static inline void dx_set_count (struct dx_entry *entries, unsigned value)
-+{
-+	((struct dx_countlimit *) entries)->count.v = cpu_to_le16(value);
-+}
-+
-+static inline void dx_set_limit (struct dx_entry *entries, unsigned value)
-+{
-+	((struct dx_countlimit *) entries)->limit.v = cpu_to_le16(value);
-+}
-+
-+static inline unsigned dx_root_limit (struct inode *dir, unsigned infosize)
-+{
-+	unsigned entry_space = dir->i_sb->s_blocksize - EXT3_DIR_REC_LEN(1) -
-+		EXT3_DIR_REC_LEN(2) - infosize;
-+	return 0? 20: entry_space / sizeof(struct dx_entry);
-+}
-+
-+static inline unsigned dx_node_limit (struct inode *dir)
-+{
-+	unsigned entry_space = dir->i_sb->s_blocksize - EXT3_DIR_REC_LEN(0);
-+	return 0? 22: entry_space / sizeof(struct dx_entry);
-+}
-+
-+/*
-+ * Debug
-+ */
-+#ifdef DX_DEBUG
-+struct stats
-+{ 
-+	unsigned names;
-+	unsigned space;
-+	unsigned bcount;
-+};
-+
-+static struct stats dx_show_leaf(struct dx_hash_info *hinfo, struct ext3_dir_entry_2 *de,
-+				 int size, int show_names)
-+{
-+	unsigned names = 0, space = 0;
-+	char *base = (char *) de;
-+	struct dx_hash_info h = *hinfo;
-+	
-+	printk("names: ");
-+	while ((char *) de < base + size)
-+	{
-+		if (de->inode)
-+		{
-+			if (show_names)
-+			{
-+				int len = de->name_len;
-+				char *name = de->name;
-+				while (len--) printk("%c", *name++);
-+				ext3fs_dirhash(de->name, de->name_len, &h);
-+				printk(":%x.%u ", h.hash,
-+				       ((char *) de - base));
-+			}
-+			space += EXT3_DIR_REC_LEN(de->name_len);
-+	 		names++;
-+		}
-+		de = (struct ext3_dir_entry_2 *) ((char *) de + le16_to_cpu(de->rec_len));
-+	}
-+	printk("(%i)\n", names);
-+	return (struct stats) { names, space, 1 };
-+}
-+
-+struct stats dx_show_entries(struct dx_hash_info *hinfo, struct inode *dir,
-+			     struct dx_entry *entries, int levels)
-+{
-+	unsigned blocksize = dir->i_sb->s_blocksize;
-+	unsigned count = dx_get_count (entries), names = 0, space = 0, i;
-+	unsigned bcount = 0;
-+	struct buffer_head *bh;
-+	int err;
-+	printk("%i indexed blocks...\n", count);
-+	for (i = 0; i < count; i++, entries++)
-+	{
-+		u32 block = dx_get_block(entries), hash = i? dx_get_hash(entries): 0;
-+		u32 range = i < count - 1? (dx_get_hash(entries + 1) - hash): ~hash;
-+		struct stats stats;
-+		printk("%s%3u:%03u hash %8x/%8x ",levels?"":"   ", i, block, hash, range);
-+		if (!(bh = ext3_bread (NULL,dir, block, 0,&err))) continue;
-+		stats = levels?
-+		   dx_show_entries(hinfo, dir, ((struct dx_node *) bh->b_data)->entries, levels - 1):
-+		   dx_show_leaf(hinfo, (struct ext3_dir_entry_2 *) bh->b_data, blocksize, 0);
-+		names += stats.names;
-+		space += stats.space;
-+		bcount += stats.bcount;
-+		brelse (bh);
-+	}
-+	if (bcount)
-+		printk("%snames %u, fullness %u (%u%%)\n", levels?"":"   ",
-+			names, space/bcount,(space/bcount)*100/blocksize);
-+	return (struct stats) { names, space, bcount};
-+}
-+#endif /* DX_DEBUG */
-+
-+/*
-+ * Probe for a directory leaf block to search.
-+ *
-+ * dx_probe can return ERR_BAD_DX_DIR, which means there was a format
-+ * error in the directory index, and the caller should fall back to
-+ * searching the directory normally.  The callers of dx_probe **MUST**
-+ * check for this error code, and make sure it never gets reflected
-+ * back to userspace.
-+ */
-+static struct dx_frame *
-+dx_probe(struct dentry *dentry, struct inode *dir,
-+	 struct dx_hash_info *hinfo, struct dx_frame *frame_in, int *err)
-+{
-+	unsigned count, indirect;
-+	struct dx_entry *at, *entries, *p, *q, *m;
-+	struct dx_root *root;
-+	struct buffer_head *bh;
-+	struct dx_frame *frame = frame_in;
-+	u32 hash;
-+
-+	frame->bh = NULL;
-+	if (dentry)
-+		dir = dentry->d_parent->d_inode;
-+	if (!(bh = ext3_bread (NULL,dir, 0, 0, err)))
-+		goto fail;
-+	root = (struct dx_root *) bh->b_data;
-+	if (root->info.hash_version != DX_HASH_TEA &&
-+	    root->info.hash_version != DX_HASH_HALF_MD4 &&
-+	    root->info.hash_version != DX_HASH_LEGACY) {
-+		ext3_warning(dir->i_sb, __FUNCTION__,
-+			     "Unrecognised inode hash code %d",
-+			     root->info.hash_version);
-+		brelse(bh);
-+		*err = ERR_BAD_DX_DIR;
-+		goto fail;
-+	}
-+	hinfo->hash_version = root->info.hash_version;
-+	hinfo->seed = dir->i_sb->u.ext3_sb.s_hash_seed;
-+	if (dentry)
-+		ext3fs_dirhash(dentry->d_name.name, dentry->d_name.len, hinfo);
-+	hash = hinfo->hash;
-+
-+	if (root->info.unused_flags & 1) {
-+		ext3_warning(dir->i_sb, __FUNCTION__,
-+			     "Unimplemented inode hash flags: %#06x",
-+			     root->info.unused_flags);
-+		brelse(bh);
-+		*err = ERR_BAD_DX_DIR;
-+		goto fail;
-+	}
-+
-+	if ((indirect = root->info.indirect_levels) > 1) {
-+		ext3_warning(dir->i_sb, __FUNCTION__,
-+			     "Unimplemented inode hash depth: %#06x",
-+			     root->info.indirect_levels);
-+		brelse(bh);
-+		*err = ERR_BAD_DX_DIR;
-+		goto fail;
-+	}
-+
-+	entries = (struct dx_entry *) (((char *)&root->info) +
-+				       root->info.info_length);
-+	assert(dx_get_limit(entries) == dx_root_limit(dir,
-+						      root->info.info_length));
-+	dxtrace (printk("Look up %x", hash));
-+	while (1)
-+	{
-+		count = dx_get_count(entries);
-+		assert (count && count <= dx_get_limit(entries));
-+		p = entries + 1;
-+		q = entries + count - 1;
-+		while (p <= q)
-+		{
-+			m = p + (q - p)/2;
-+			dxtrace(printk("."));
-+			if (dx_get_hash(m) > hash)
-+				q = m - 1;
-+			else
-+				p = m + 1;
-+		}
-+
-+		if (0) // linear search cross check
-+		{
-+			unsigned n = count - 1;
-+			at = entries;
-+			while (n--)
-+			{
-+				dxtrace(printk(","));
-+				if (dx_get_hash(++at) > hash)
-+				{
-+					at--;
-+					break;
-+				}
-+			}
-+			assert (at == p - 1);
-+		}
-+
-+		at = p - 1;
-+		dxtrace(printk(" %x->%u\n", at == entries? 0: dx_get_hash(at), dx_get_block(at)));
-+		frame->bh = bh;
-+		frame->entries = entries;
-+		frame->at = at;
-+		if (!indirect--) return frame;
-+		if (!(bh = ext3_bread (NULL,dir, dx_get_block(at), 0, err)))
-+			goto fail2;
-+		at = entries = ((struct dx_node *) bh->b_data)->entries;
-+		assert (dx_get_limit(entries) == dx_node_limit (dir));
-+		frame++;
-+	}
-+fail2:
-+	while (frame >= frame_in) {
-+		brelse(frame->bh);
-+		frame--;
-+	}
-+fail:
-+	return NULL;
-+}
-+
-+static void dx_release (struct dx_frame *frames)
-+{
-+	if (frames[0].bh == NULL)
-+		return;
-+
-+	if (((struct dx_root *) frames[0].bh->b_data)->info.indirect_levels)
-+		brelse(frames[1].bh);
-+	brelse(frames[0].bh);
-+}
-+
-+/*
-+ * This function increments the frame pointer to search the next leaf
-+ * block, and reads in the necessary intervening nodes if the search
-+ * should be necessary.  Whether or not the search is necessary is
-+ * controlled by the hash parameter.  If the hash value is even, then
-+ * the search is only continued if the next block starts with that
-+ * hash value.  This is used if we are searching for a specific file.
-+ *
-+ * If the hash value is HASH_NB_ALWAYS, then always go to the next block.
-+ *
-+ * This function returns 1 if the caller should continue to search,
-+ * or 0 if it should not.  If there is an error reading one of the
-+ * index blocks, it will return -1.
-+ *
-+ * If start_hash is non-null, it will be filled in with the starting
-+ * hash of the next page.
-+ */
-+static int ext3_htree_next_block(struct inode *dir, __u32 hash,
-+				 struct dx_frame *frame,
-+				 struct dx_frame *frames, int *err,
-+				 __u32 *start_hash)
-+{
-+	struct dx_frame *p;
-+	struct buffer_head *bh;
-+	int num_frames = 0;
-+	__u32 bhash;
-+
-+	*err = ENOENT;
-+	p = frame;
-+	/*
-+	 * Find the next leaf page by incrementing the frame pointer.
-+	 * If we run out of entries in the interior node, loop around and
-+	 * increment pointer in the parent node.  When we break out of
-+	 * this loop, num_frames indicates the number of interior
-+	 * nodes need to be read.
-+	 */
-+	while (1) {
-+		if (++(p->at) < p->entries + dx_get_count(p->entries))
-+			break;
-+		if (p == frames)
-+			return 0;
-+		num_frames++;
-+		p--;
-+	}
-+
-+	/*
-+	 * If the hash is 1, then continue only if the next page has a
-+	 * continuation hash of any value.  This is used for readdir
-+	 * handling.  Otherwise, check to see if the hash matches the
-+	 * desired contiuation hash.  If it doesn't, return since
-+	 * there's no point to read in the successive index pages.
-+	 */
-+	bhash = dx_get_hash(p->at);
-+	if (start_hash)
-+		*start_hash = bhash;
-+	if ((hash & 1) == 0) {
-+		if ((bhash & ~1) != hash)
-+			return 0;
-+	}
-+	/*
-+	 * If the hash is HASH_NB_ALWAYS, we always go to the next
-+	 * block so no check is necessary
-+	 */
-+	while (num_frames--) {
-+		if (!(bh = ext3_bread(NULL, dir, dx_get_block(p->at),
-+				      0, err)))
-+			return -1; /* Failure */
-+		p++;
-+		brelse (p->bh);
-+		p->bh = bh;
-+		p->at = p->entries = ((struct dx_node *) bh->b_data)->entries;
-+	}
-+	return 1;
-+}
-+
-+
-+/*
-+ * p is at least 6 bytes before the end of page
-+ */
-+static inline struct ext3_dir_entry_2 *ext3_next_entry(struct ext3_dir_entry_2 *p)
-+{
-+	return (struct ext3_dir_entry_2 *)((char*)p + le16_to_cpu(p->rec_len));
-+}
-+
-+/*
-+ * This function fills a red-black tree with information from a
-+ * directory.  We start scanning the directory in hash order, starting
-+ * at start_hash and start_minor_hash.
-+ *
-+ * This function returns the number of entries inserted into the tree,
-+ * or a negative error code.
-+ */
-+int ext3_htree_fill_tree(struct file *dir_file, __u32 start_hash,
-+			 __u32 start_minor_hash, __u32 *next_hash)
-+{
-+	struct dx_hash_info hinfo;
-+	struct buffer_head *bh;
-+	struct ext3_dir_entry_2 *de, *top;
-+	static struct dx_frame frames[2], *frame;
-+	struct inode *dir;
-+	int block, err;
-+	int count = 0;
-+	int ret;
-+	__u32 hashval;
-+	
-+	dxtrace(printk("In htree_fill_tree, start hash: %x:%x\n", start_hash,
-+		       start_minor_hash));
-+	dir = dir_file->f_dentry->d_inode;
-+	hinfo.hash = start_hash;
-+	hinfo.minor_hash = 0;
-+	frame = dx_probe(0, dir_file->f_dentry->d_inode, &hinfo, frames, &err);
-+	if (!frame)
-+		return err;
-+
-+	while (1) {
-+		block = dx_get_block(frame->at);
-+		dxtrace(printk("Reading block %d\n", block));
-+		if (!(bh = ext3_bread (NULL, dir, block, 0, &err)))
-+			goto errout;
-+	
-+		de = (struct ext3_dir_entry_2 *) bh->b_data;
-+		top = (struct ext3_dir_entry_2 *) ((char *) de + dir->i_sb->s_blocksize -
-+				       EXT3_DIR_REC_LEN(0));
-+		for (; de < top; de = ext3_next_entry(de)) {
-+			ext3fs_dirhash(de->name, de->name_len, &hinfo);
-+			if ((hinfo.hash < start_hash) ||
-+			    ((hinfo.hash == start_hash) &&
-+			     (hinfo.minor_hash < start_minor_hash)))
-+				continue;
-+			ext3_htree_store_dirent(dir_file, hinfo.hash,
-+						hinfo.minor_hash, de);
-+			count++;
-+		}
-+		brelse (bh);
-+		hashval = ~1;
-+		ret = ext3_htree_next_block(dir, HASH_NB_ALWAYS, 
-+					    frame, frames, &err, &hashval);
-+		if (next_hash)
-+			*next_hash = hashval;
-+		if (ret == -1)
-+			goto errout;
-+		/*
-+		 * Stop if:  (a) there are no more entries, or
-+		 * (b) we have inserted at least one entry and the
-+		 * next hash value is not a continuation
-+		 */
-+		if ((ret == 0) ||
-+		    (count && ((hashval & 1) == 0)))
-+			break;
-+	}
-+	dx_release(frames);
-+	dxtrace(printk("Fill tree: returned %d entries\n", count));
-+	return count;
-+errout:
-+	dx_release(frames);
-+	return (err);
-+}
-+
-+
-+/*
-+ * Directory block splitting, compacting
-+ */
-+
-+static int dx_make_map (struct ext3_dir_entry_2 *de, int size,
-+			struct dx_hash_info *hinfo, struct dx_map_entry *map_tail)
-+{
-+	int count = 0;
-+	char *base = (char *) de;
-+	struct dx_hash_info h = *hinfo;
-+	
-+	while ((char *) de < base + size)
-+	{
-+		if (de->name_len && de->inode) {
-+			ext3fs_dirhash(de->name, de->name_len, &h);
-+			map_tail--;
-+			map_tail->hash = h.hash;
-+			map_tail->offs = (u32) ((char *) de - base);
-+			count++;
-+		}
-+		/* XXX: do we need to check rec_len == 0 case? -Chris */
-+		de = (struct ext3_dir_entry_2 *) ((char *) de + le16_to_cpu(de->rec_len));
-+	}
-+	return count;
-+}
-+
-+static void dx_sort_map (struct dx_map_entry *map, unsigned count)
-+{
-+	struct dx_map_entry *p, *q, *top = map + count - 1;
-+	int more;
-+	/* Combsort until bubble sort doesn't suck */
-+	while (count > 2)
-+	{
-+		count = count*10/13;
-+		if (count - 9 < 2) /* 9, 10 -> 11 */
-+			count = 11;
-+		for (p = top, q = p - count; q >= map; p--, q--)
-+			if (p->hash < q->hash)
-+				swap(*p, *q);
-+	}
-+	/* Garden variety bubble sort */
-+	do {
-+		more = 0;
-+		q = top;
-+		while (q-- > map)
-+		{
-+			if (q[1].hash >= q[0].hash)
-+				continue;
-+			swap(*(q+1), *q);
-+			more = 1;
-+		}
-+	} while(more);
-+}
-+
-+static void dx_insert_block(struct dx_frame *frame, u32 hash, u32 block)
-+{
-+	struct dx_entry *entries = frame->entries;
-+	struct dx_entry *old = frame->at, *new = old + 1;
-+	int count = dx_get_count(entries);
-+
-+	assert(count < dx_get_limit(entries));
-+	assert(old < entries + count);
-+	memmove(new + 1, new, (char *)(entries + count) - (char *)(new));
-+	dx_set_hash(new, hash);
-+	dx_set_block(new, block);
-+	dx_set_count(entries, count + 1);
-+}
-+#endif
-+
-+
-+static void ext3_update_dx_flag(struct inode *inode)
-+{
-+	if (!EXT3_HAS_COMPAT_FEATURE(inode->i_sb,
-+				     EXT3_FEATURE_COMPAT_DIR_INDEX))
-+		EXT3_I(inode)->i_flags &= ~EXT3_INDEX_FL;
-+}
-+
- /*
-  * NOTE! unlike strncmp, ext3_match returns 1 for success, 0 for failure.
-  *
-@@ -96,6 +726,7 @@
- 	return 0;
- }
- 
-+
- /*
-  *	ext3_find_entry()
-  *
-@@ -107,6 +738,8 @@
-  * The returned buffer_head has ->b_count elevated.  The caller is expected
-  * to brelse() it when appropriate.
-  */
-+
-+	
- static struct buffer_head * ext3_find_entry (struct dentry *dentry,
- 					struct ext3_dir_entry_2 ** res_dir)
- {
-@@ -121,12 +754,32 @@
- 	int num = 0;
- 	int nblocks, i, err;
- 	struct inode *dir = dentry->d_parent->d_inode;
-+	int namelen;
-+	const u8 *name;
-+	unsigned blocksize;
- 
- 	*res_dir = NULL;
- 	sb = dir->i_sb;
--
-+	blocksize = sb->s_blocksize;
-+	namelen = dentry->d_name.len;
-+	name = dentry->d_name.name;
-+	if (namelen > EXT3_NAME_LEN)
-+		return NULL;
-+#ifdef CONFIG_EXT3_INDEX
-+	if (is_dx(dir)) {
-+		bh = ext3_dx_find_entry(dentry, res_dir, &err);
-+		/*
-+		 * On success, or if the error was file not found,
-+		 * return.  Otherwise, fall back to doing a search the
-+		 * old fashioned way.
-+		 */
-+		if (bh || (err != ERR_BAD_DX_DIR))
-+			return bh;
-+		dxtrace(printk("ext3_find_entry: dx failed, falling back\n"));
-+	}
-+#endif
- 	nblocks = dir->i_size >> EXT3_BLOCK_SIZE_BITS(sb);
--	start = dir->u.ext3_i.i_dir_start_lookup;
-+	start = EXT3_I(dir)->i_dir_start_lookup;
- 	if (start >= nblocks)
- 		start = 0;
- 	block = start;
-@@ -167,7 +820,7 @@
- 		i = search_dirblock(bh, dir, dentry,
- 			    block << EXT3_BLOCK_SIZE_BITS(sb), res_dir);
- 		if (i == 1) {
--			dir->u.ext3_i.i_dir_start_lookup = block;
-+			EXT3_I(dir)->i_dir_start_lookup = block;
- 			ret = bh;
- 			goto cleanup_and_exit;
- 		} else {
-@@ -198,6 +851,66 @@
- 	return ret;
- }
- 
-+#ifdef CONFIG_EXT3_INDEX
-+static struct buffer_head * ext3_dx_find_entry(struct dentry *dentry,
-+		       struct ext3_dir_entry_2 **res_dir, int *err)
-+{
-+	struct super_block * sb;
-+	struct dx_hash_info	hinfo;
-+	u32 hash;
-+	struct dx_frame frames[2], *frame;
-+	struct ext3_dir_entry_2 *de, *top;
-+	struct buffer_head *bh;
-+	unsigned long block;
-+	int retval;
-+	int namelen = dentry->d_name.len;
-+	const u8 *name = dentry->d_name.name;
-+	struct inode *dir = dentry->d_parent->d_inode;
-+	
-+	sb = dir->i_sb;
-+	if (!(frame = dx_probe (dentry, 0, &hinfo, frames, err)))
-+		return NULL;
-+	hash = hinfo.hash;
-+	do {
-+		block = dx_get_block(frame->at);
-+		if (!(bh = ext3_bread (NULL,dir, block, 0, err)))
-+			goto errout;
-+		de = (struct ext3_dir_entry_2 *) bh->b_data;
-+		top = (struct ext3_dir_entry_2 *) ((char *) de + sb->s_blocksize -
-+				       EXT3_DIR_REC_LEN(0));
-+		for (; de < top; de = ext3_next_entry(de))
-+		if (ext3_match (namelen, name, de)) {
-+			if (!ext3_check_dir_entry("ext3_find_entry",
-+						  dir, de, bh,
-+				  (block<<EXT3_BLOCK_SIZE_BITS(sb))
-+					  +((char *)de - bh->b_data))) {
-+				brelse (bh);
-+				goto errout;
-+			}
-+			*res_dir = de;
-+			dx_release (frames);
-+			return bh;
-+		}
-+		brelse (bh);
-+		/* Check to see if we should continue to search */
-+		retval = ext3_htree_next_block(dir, hash, frame,
-+					       frames, err, 0);
-+		if (retval == -1) {
-+			ext3_warning(sb, __FUNCTION__,
-+			     "error reading index page in directory #%lu",
-+			     dir->i_ino);
-+			goto errout;
-+		}
-+	} while (retval == 1);
-+	
-+	*err = -ENOENT;
-+errout:
-+	dxtrace(printk("%s not found\n", name));
-+	dx_release (frames);
-+	return NULL;
-+}
-+#endif
-+
- static struct dentry *ext3_lookup(struct inode * dir, struct dentry *dentry)
- {
- 	struct inode * inode;
-@@ -214,8 +927,9 @@
- 		brelse (bh);
- 		inode = iget(dir->i_sb, ino);
- 
--		if (!inode)
-+		if (!inode) {
- 			return ERR_PTR(-EACCES);
-+		}
- 	}
- 	d_add(dentry, inode);
- 	return NULL;
-@@ -239,6 +953,301 @@
- 		de->file_type = ext3_type_by_mode[(mode & S_IFMT)>>S_SHIFT];
- }
- 
-+#ifdef CONFIG_EXT3_INDEX
-+static struct ext3_dir_entry_2 *
-+dx_move_dirents(char *from, char *to, struct dx_map_entry *map, int count)
-+{
-+	unsigned rec_len = 0;
-+
-+	while (count--) {
-+		struct ext3_dir_entry_2 *de = (struct ext3_dir_entry_2 *) (from + map->offs);
-+		rec_len = EXT3_DIR_REC_LEN(de->name_len);
-+		memcpy (to, de, rec_len);
-+		((struct ext3_dir_entry_2 *) to)->rec_len = rec_len;
-+		de->inode = 0;
-+		map++;
-+		to += rec_len;
-+	}
-+	return (struct ext3_dir_entry_2 *) (to - rec_len);
-+}
-+
-+static struct ext3_dir_entry_2* dx_pack_dirents(char *base, int size)
-+{
-+	struct ext3_dir_entry_2 *next, *to, *prev, *de = (struct ext3_dir_entry_2 *) base;
-+	unsigned rec_len = 0;
-+
-+	prev = to = de;
-+	while ((char*)de < base + size) {
-+		next = (struct ext3_dir_entry_2 *) ((char *) de +
-+						    le16_to_cpu(de->rec_len));
-+		if (de->inode && de->name_len) {
-+			rec_len = EXT3_DIR_REC_LEN(de->name_len);
-+			if (de > to)
-+				memmove(to, de, rec_len);
-+			to->rec_len = rec_len;
-+			prev = to;
-+			to = (struct ext3_dir_entry_2 *) (((char *) to) + rec_len);
-+		}
-+		de = next;
-+	}
-+	return prev;
-+}
-+
-+static struct ext3_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,
-+			struct buffer_head **bh,struct dx_frame *frame,
-+			struct dx_hash_info *hinfo, int *error)
-+{
-+	unsigned blocksize = dir->i_sb->s_blocksize;
-+	unsigned count, continued;
-+	struct buffer_head *bh2;
-+	u32 newblock;
-+	u32 hash2;
-+	struct dx_map_entry *map;
-+	char *data1 = (*bh)->b_data, *data2;
-+	unsigned split;
-+	struct ext3_dir_entry_2 *de = NULL, *de2;
-+	int	err;
-+
-+	bh2 = ext3_append (handle, dir, &newblock, error);
-+	if (!(bh2)) {
-+		brelse(*bh);
-+		*bh = NULL;
-+		goto errout;
-+	}
-+
-+	BUFFER_TRACE(*bh, "get_write_access");
-+	err = ext3_journal_get_write_access(handle, *bh);
-+	if (err) {
-+	journal_error:
-+		brelse(*bh);
-+		brelse(bh2);
-+		*bh = NULL;
-+		ext3_std_error(dir->i_sb, err);
-+		goto errout;
-+	}
-+	BUFFER_TRACE(frame->bh, "get_write_access");
-+	err = ext3_journal_get_write_access(handle, frame->bh);
-+	if (err)
-+		goto journal_error;
-+
-+	data2 = bh2->b_data;
-+
-+	/* create map in the end of data2 block */
-+	map = (struct dx_map_entry *) (data2 + blocksize);
-+	count = dx_make_map ((struct ext3_dir_entry_2 *) data1,
-+			     blocksize, hinfo, map);
-+	map -= count;
-+	split = count/2; // need to adjust to actual middle
-+	dx_sort_map (map, count);
-+	hash2 = map[split].hash;
-+	continued = hash2 == map[split - 1].hash;
-+	dxtrace(printk("Split block %i at %x, %i/%i\n",
-+		dx_get_block(frame->at), hash2, split, count-split));
-+
-+	/* Fancy dance to stay within two buffers */
-+	de2 = dx_move_dirents(data1, data2, map + split, count - split);
-+	de = dx_pack_dirents(data1,blocksize);
-+	de->rec_len = cpu_to_le16(data1 + blocksize - (char *) de);
-+	de2->rec_len = cpu_to_le16(data2 + blocksize - (char *) de2);
-+	dxtrace(dx_show_leaf (hinfo, (struct ext3_dir_entry_2 *) data1, blocksize, 1));
-+	dxtrace(dx_show_leaf (hinfo, (struct ext3_dir_entry_2 *) data2, blocksize, 1));
-+
-+	/* Which block gets the new entry? */
-+	if (hinfo->hash >= hash2)
-+	{
-+		swap(*bh, bh2);
-+		de = de2;
-+	}
-+	dx_insert_block (frame, hash2 + continued, newblock);
-+	err = ext3_journal_dirty_metadata (handle, bh2);
-+	if (err)
-+		goto journal_error;
-+	err = ext3_journal_dirty_metadata (handle, frame->bh);
-+	if (err)
-+		goto journal_error;
-+	brelse (bh2);
-+	dxtrace(dx_show_index ("frame", frame->entries));
-+errout:
-+	return de;
-+}
-+#endif
-+
-+
-+/*
-+ * Add a new entry into a directory (leaf) block.  If de is non-NULL,
-+ * it points to a directory entry which is guaranteed to be large
-+ * enough for new directory entry.  If de is NULL, then
-+ * add_dirent_to_buf will attempt search the directory block for
-+ * space.  It will return -ENOSPC if no space is available, and -EIO
-+ * and -EEXIST if directory entry already exists.
-+ * 
-+ * NOTE!  bh is NOT released in the case where ENOSPC is returned.  In
-+ * all other cases bh is released.
-+ */
-+static int add_dirent_to_buf(handle_t *handle, struct dentry *dentry,
-+			     struct inode *inode, struct ext3_dir_entry_2 *de,
-+			     struct buffer_head * bh)
-+{
-+	struct inode	*dir = dentry->d_parent->d_inode;
-+	const char	*name = dentry->d_name.name;
-+	int		namelen = dentry->d_name.len;
-+	unsigned long	offset = 0;
-+	unsigned short	reclen;
-+	int		nlen, rlen, err;
-+	char		*top;
-+	
-+	reclen = EXT3_DIR_REC_LEN(namelen);
-+	if (!de) {
-+		de = (struct ext3_dir_entry_2 *)bh->b_data;
-+		top = bh->b_data + dir->i_sb->s_blocksize - reclen;
-+		while ((char *) de <= top) {
-+			if (!ext3_check_dir_entry("ext3_add_entry", dir, de,
-+						  bh, offset)) {
-+				brelse (bh);
-+				return -EIO;
-+			}
-+			if (ext3_match (namelen, name, de)) {
-+				brelse (bh);
-+				return -EEXIST;
-+			}
-+			nlen = EXT3_DIR_REC_LEN(de->name_len);
-+			rlen = le16_to_cpu(de->rec_len);
-+			if ((de->inode? rlen - nlen: rlen) >= reclen)
-+				break;
-+			de = (struct ext3_dir_entry_2 *)((char *)de + rlen);
-+			offset += rlen;
-+		}
-+		if ((char *) de > top)
-+			return -ENOSPC;
-+	}
-+	BUFFER_TRACE(bh, "get_write_access");
-+	err = ext3_journal_get_write_access(handle, bh);
-+	if (err) {
-+		ext3_std_error(dir->i_sb, err);
-+		brelse(bh);
-+		return err;
-+	}
-+	
-+	/* By now the buffer is marked for journaling */
-+	nlen = EXT3_DIR_REC_LEN(de->name_len);
-+	rlen = le16_to_cpu(de->rec_len);
-+	if (de->inode) {
-+		struct ext3_dir_entry_2 *de1 = (struct ext3_dir_entry_2 *)((char *)de + nlen);
-+		de1->rec_len = cpu_to_le16(rlen - nlen);
-+		de->rec_len = cpu_to_le16(nlen);
-+		de = de1;
-+	}
-+	de->file_type = EXT3_FT_UNKNOWN;
-+	if (inode) {
-+		de->inode = cpu_to_le32(inode->i_ino);
-+		ext3_set_de_type(dir->i_sb, de, inode->i_mode);
-+	} else
-+		de->inode = 0;
-+	de->name_len = namelen;
-+	memcpy (de->name, name, namelen);
-+	/*
-+	 * XXX shouldn't update any times until successful
-+	 * completion of syscall, but too many callers depend
-+	 * on this.
-+	 *
-+	 * XXX similarly, too many callers depend on
-+	 * ext3_new_inode() setting the times, but error
-+	 * recovery deletes the inode, so the worst that can
-+	 * happen is that the times are slightly out of date
-+	 * and/or different from the directory change time.
-+	 */
-+	dir->i_mtime = dir->i_ctime = CURRENT_TIME;
-+	ext3_update_dx_flag(dir);
-+	dir->i_version = ++event;
-+	ext3_mark_inode_dirty(handle, dir);
-+	BUFFER_TRACE(bh, "call ext3_journal_dirty_metadata");
-+	err = ext3_journal_dirty_metadata(handle, bh);
-+	if (err)
-+		ext3_std_error(dir->i_sb, err);
-+	brelse(bh);
-+	return 0;
-+}
-+
-+#ifdef CONFIG_EXT3_INDEX
-+/*
-+ * This converts a one block unindexed directory to a 3 block indexed
-+ * directory, and adds the dentry to the indexed directory.
-+ */
-+static int make_indexed_dir(handle_t *handle, struct dentry *dentry,
-+			    struct inode *inode, struct buffer_head *bh)
-+{
-+	struct inode	*dir = dentry->d_parent->d_inode;
-+	const char	*name = dentry->d_name.name;
-+	int		namelen = dentry->d_name.len;
-+	struct buffer_head *bh2;
-+	struct dx_root	*root;
-+	struct dx_frame	frames[2], *frame;
-+	struct dx_entry *entries;
-+	struct ext3_dir_entry_2	*de, *de2;
-+	char		*data1, *top;
-+	unsigned	len;
-+	int		retval;
-+	unsigned	blocksize;
-+	struct dx_hash_info hinfo;
-+	u32		block;
-+		
-+	blocksize =  dir->i_sb->s_blocksize;
-+	dxtrace(printk("Creating index\n"));
-+	retval = ext3_journal_get_write_access(handle, bh);
-+	if (retval) {
-+		ext3_std_error(dir->i_sb, retval);
-+		brelse(bh);
-+		return retval;
-+	}
-+	root = (struct dx_root *) bh->b_data;
-+		
-+	EXT3_I(dir)->i_flags |= EXT3_INDEX_FL;
-+	bh2 = ext3_append (handle, dir, &block, &retval);
-+	if (!(bh2)) {
-+		brelse(bh);
-+		return retval;
-+	}
-+	data1 = bh2->b_data;
-+
-+	/* The 0th block becomes the root, move the dirents out */
-+	de = (struct ext3_dir_entry_2 *) &root->dotdot;
-+	de = (struct ext3_dir_entry_2 *) ((char *)de + de->rec_len);
-+	len = ((char *) root) + blocksize - (char *) de;
-+	memcpy (data1, de, len);
-+	de = (struct ext3_dir_entry_2 *) data1;
-+	top = data1 + len;
-+	while (((char *) de2=(char*)de+le16_to_cpu(de->rec_len)) < top)
-+		de = de2;
-+	de->rec_len = cpu_to_le16(data1 + blocksize - (char *) de);
-+	/* Initialize the root; the dot dirents already exist */
-+	de = (struct ext3_dir_entry_2 *) (&root->dotdot);
-+	de->rec_len = cpu_to_le16(blocksize - EXT3_DIR_REC_LEN(2));
-+	memset (&root->info, 0, sizeof(root->info));
-+	root->info.info_length = sizeof(root->info);
-+	root->info.hash_version = dir->i_sb->u.ext3_sb.s_def_hash_version;
-+	entries = root->entries;
-+	dx_set_block (entries, 1);
-+	dx_set_count (entries, 1);
-+	dx_set_limit (entries, dx_root_limit(dir, sizeof(root->info)));
-+
-+	/* Initialize as for dx_probe */
-+	hinfo.hash_version = root->info.hash_version;
-+	hinfo.seed = dir->i_sb->u.ext3_sb.s_hash_seed;
-+	ext3fs_dirhash(name, namelen, &hinfo);
-+	frame = frames;
-+	frame->entries = entries;
-+	frame->at = entries;
-+	frame->bh = bh;
-+	bh = bh2;
-+	de = do_split(handle,dir, &bh, frame, &hinfo, &retval);
-+	dx_release (frames);
-+	if (!(de))
-+		return retval;
-+
-+	return add_dirent_to_buf(handle, dentry, inode, de, bh);
-+}
-+#endif
-+
- /*
-  *	ext3_add_entry()
-  *
-@@ -249,127 +1258,197 @@
-  * may not sleep between calling this and putting something into
-  * the entry, as someone else might have used it while you slept.
-  */
--
--/*
-- * AKPM: the journalling code here looks wrong on the error paths
-- */
- static int ext3_add_entry (handle_t *handle, struct dentry *dentry,
- 	struct inode *inode)
- {
- 	struct inode *dir = dentry->d_parent->d_inode;
--	const char *name = dentry->d_name.name;
--	int namelen = dentry->d_name.len;
- 	unsigned long offset;
--	unsigned short rec_len;
- 	struct buffer_head * bh;
--	struct ext3_dir_entry_2 * de, * de1;
-+	struct ext3_dir_entry_2 *de;
- 	struct super_block * sb;
- 	int	retval;
-+#ifdef CONFIG_EXT3_INDEX
-+        int     dx_fallback=0;
-+#endif
-+        unsigned blocksize;
-+        unsigned nlen, rlen;
-+        u32 block, blocks;
- 
- 	sb = dir->i_sb;
--
--	if (!namelen)
-+        blocksize = sb->s_blocksize;
-+	if (!dentry->d_name.len)
- 		return -EINVAL;
--	bh = ext3_bread (handle, dir, 0, 0, &retval);
-+#ifdef CONFIG_EXT3_INDEX
-+        if (is_dx(dir)) {
-+                retval = ext3_dx_add_entry(handle, dentry, inode);
-+                if (!retval || (retval != ERR_BAD_DX_DIR))
-+                        return retval;
-+                EXT3_I(dir)->i_flags &= ~EXT3_INDEX_FL;
-+                dx_fallback++;
-+                ext3_mark_inode_dirty(handle, dir);
-+        }
-+#endif
-+        blocks = dir->i_size >> sb->s_blocksize_bits;
-+        for (block = 0, offset = 0; block < blocks; block++) {
-+                bh = ext3_bread(handle, dir, block, 0, &retval);
-+                if(!bh)
-+                        return retval;
-+                retval = add_dirent_to_buf(handle, dentry, inode, 0, bh);
-+                if (retval != -ENOSPC)
-+                        return retval;
-+
-+#ifdef CONFIG_EXT3_INDEX
-+                if (blocks == 1 && !dx_fallback &&
-+                    EXT3_HAS_COMPAT_FEATURE(sb, EXT3_FEATURE_COMPAT_DIR_INDEX))
-+                        return make_indexed_dir(handle, dentry, inode, bh);
-+#endif
-+                brelse(bh);
-+        }
-+        bh = ext3_append(handle, dir, &block, &retval);
- 	if (!bh)
- 		return retval;
--	rec_len = EXT3_DIR_REC_LEN(namelen);
--	offset = 0;
- 	de = (struct ext3_dir_entry_2 *) bh->b_data;
--	while (1) {
--		if ((char *)de >= sb->s_blocksize + bh->b_data) {
--			brelse (bh);
--			bh = NULL;
--			bh = ext3_bread (handle, dir,
--				offset >> EXT3_BLOCK_SIZE_BITS(sb), 1, &retval);
--			if (!bh)
--				return retval;
--			if (dir->i_size <= offset) {
--				if (dir->i_size == 0) {
--					brelse(bh);
--					return -ENOENT;
--				}
--
--				ext3_debug ("creating next block\n");
--
--				BUFFER_TRACE(bh, "get_write_access");
--				ext3_journal_get_write_access(handle, bh);
--				de = (struct ext3_dir_entry_2 *) bh->b_data;
--				de->inode = 0;
--				de->rec_len = le16_to_cpu(sb->s_blocksize);
--				dir->u.ext3_i.i_disksize =
--					dir->i_size = offset + sb->s_blocksize;
--				dir->u.ext3_i.i_flags &= ~EXT3_INDEX_FL;
--				ext3_mark_inode_dirty(handle, dir);
--			} else {
--
--				ext3_debug ("skipping to next block\n");
-+        de->inode = 0;
-+        de->rec_len = cpu_to_le16(rlen = blocksize);
-+        nlen = 0;
-+        return add_dirent_to_buf(handle, dentry, inode, de, bh);
-+}
- 
--				de = (struct ext3_dir_entry_2 *) bh->b_data;
--			}
--		}
--		if (!ext3_check_dir_entry ("ext3_add_entry", dir, de, bh,
--					   offset)) {
--			brelse (bh);
--			return -ENOENT;
--		}
--		if (ext3_match (namelen, name, de)) {
--				brelse (bh);
--				return -EEXIST;
-+#ifdef CONFIG_EXT3_INDEX
-+/*
-+ * Returns 0 for success, or a negative error value
-+ */
-+static int ext3_dx_add_entry(handle_t *handle, struct dentry *dentry,
-+                             struct inode *inode)
-+{
-+        struct dx_frame frames[2], *frame;
-+        struct dx_entry *entries, *at;
-+        struct dx_hash_info hinfo;
-+        struct buffer_head * bh;
-+        struct inode *dir = dentry->d_parent->d_inode;
-+        struct super_block * sb = dir->i_sb;
-+        struct ext3_dir_entry_2 *de;
-+        int err;
-+
-+        frame = dx_probe(dentry, 0, &hinfo, frames, &err);
-+        if (!frame)
-+                return err;
-+        entries = frame->entries;
-+        at = frame->at;
-+
-+        if (!(bh = ext3_bread(handle,dir, dx_get_block(frame->at), 0, &err)))
-+                goto cleanup;
-+
-+        BUFFER_TRACE(bh, "get_write_access");
-+        err = ext3_journal_get_write_access(handle, bh);
-+        if (err)
-+                goto journal_error;
-+
-+        err = add_dirent_to_buf(handle, dentry, inode, 0, bh);
-+        if (err != -ENOSPC) {
-+                bh = 0;
-+                goto cleanup;
-+        }
-+
-+        /* Block full, should compress but for now just split */
-+        dxtrace(printk("using %u of %u node entries\n",
-+                       dx_get_count(entries), dx_get_limit(entries)));
-+        /* Need to split index? */
-+        if (dx_get_count(entries) == dx_get_limit(entries)) {
-+                u32 newblock;
-+                unsigned icount = dx_get_count(entries);
-+                int levels = frame - frames;
-+                struct dx_entry *entries2;
-+                struct dx_node *node2;
-+                struct buffer_head *bh2;
-+
-+                if (levels && (dx_get_count(frames->entries) ==
-+                               dx_get_limit(frames->entries))) {
-+                        ext3_warning(sb, __FUNCTION__,
-+                                     "Directory index full!\n");
-+                        err = -ENOSPC;
-+                        goto cleanup;
- 		}
--		if ((le32_to_cpu(de->inode) == 0 &&
--				le16_to_cpu(de->rec_len) >= rec_len) ||
--		    (le16_to_cpu(de->rec_len) >=
--				EXT3_DIR_REC_LEN(de->name_len) + rec_len)) {
--			BUFFER_TRACE(bh, "get_write_access");
--			ext3_journal_get_write_access(handle, bh);
--			/* By now the buffer is marked for journaling */
--			offset += le16_to_cpu(de->rec_len);
--			if (le32_to_cpu(de->inode)) {
--				de1 = (struct ext3_dir_entry_2 *) ((char *) de +
--					EXT3_DIR_REC_LEN(de->name_len));
--				de1->rec_len =
--					cpu_to_le16(le16_to_cpu(de->rec_len) -
--					EXT3_DIR_REC_LEN(de->name_len));
--				de->rec_len = cpu_to_le16(
--						EXT3_DIR_REC_LEN(de->name_len));
--				de = de1;
-+
-+                bh2 = ext3_append (handle, dir, &newblock, &err);
-+                if (!(bh2))
-+                        goto cleanup;
-+                node2 = (struct dx_node *)(bh2->b_data);
-+                entries2 = node2->entries;
-+                node2->fake.rec_len = cpu_to_le16(sb->s_blocksize);
-+                node2->fake.inode = 0;
-+                BUFFER_TRACE(frame->bh, "get_write_access");
-+                err = ext3_journal_get_write_access(handle, frame->bh);
-+                if (err)
-+                        goto journal_error;
-+                if (levels) {
-+                        unsigned icount1 = icount/2, icount2 = icount - icount1;+                       unsigned hash2 = dx_get_hash(entries + icount1);
-+                        dxtrace(printk("Split index %i/%i\n", icount1, icount2));
-+
-+                        BUFFER_TRACE(frame->bh, "get_write_access"); /* index root */
-+                        err = ext3_journal_get_write_access(handle,
-+                                                            frames[0].bh);
-+                        if (err)
-+                                goto journal_error;
-+
-+                        memcpy ((char *) entries2, (char *) (entries + icount1),+                               icount2 * sizeof(struct dx_entry));
-+                        dx_set_count (entries, icount1);
-+                        dx_set_count (entries2, icount2);
-+                        dx_set_limit (entries2, dx_node_limit(dir));
-+
-+                        /* Which index block gets the new entry? */
-+                        if (at - entries >= icount1) {
-+                                frame->at = at = at - entries - icount1 + entries2;
-+                                frame->entries = entries = entries2;
-+                                swap(frame->bh, bh2);
- 			}
--			de->file_type = EXT3_FT_UNKNOWN;
--			if (inode) {
--				de->inode = cpu_to_le32(inode->i_ino);
--				ext3_set_de_type(dir->i_sb, de, inode->i_mode);
--			} else
--				de->inode = 0;
--			de->name_len = namelen;
--			memcpy (de->name, name, namelen);
--			/*
--			 * XXX shouldn't update any times until successful
--			 * completion of syscall, but too many callers depend
--			 * on this.
--			 *
--			 * XXX similarly, too many callers depend on
--			 * ext3_new_inode() setting the times, but error
--			 * recovery deletes the inode, so the worst that can
--			 * happen is that the times are slightly out of date
--			 * and/or different from the directory change time.
--			 */
--			dir->i_mtime = dir->i_ctime = CURRENT_TIME;
--			dir->u.ext3_i.i_flags &= ~EXT3_INDEX_FL;
--			ext3_mark_inode_dirty(handle, dir);
--			dir->i_version = ++event;
--			BUFFER_TRACE(bh, "call ext3_journal_dirty_metadata");
--			ext3_journal_dirty_metadata(handle, bh);
--			brelse(bh);
--			return 0;
-+                        dx_insert_block (frames + 0, hash2, newblock);
-+                        dxtrace(dx_show_index ("node", frames[1].entries));
-+                        dxtrace(dx_show_index ("node",
-+                               ((struct dx_node *) bh2->b_data)->entries));
-+                        err = ext3_journal_dirty_metadata(handle, bh2);
-+                        if (err)
-+                                goto journal_error;
-+                        brelse (bh2);
-+                } else {
-+                        dxtrace(printk("Creating second level index...\n"));
-+                        memcpy((char *) entries2, (char *) entries,
-+                               icount * sizeof(struct dx_entry));
-+                        dx_set_limit(entries2, dx_node_limit(dir));
-+
-+                        /* Set up root */
-+                        dx_set_count(entries, 1);
-+                        dx_set_block(entries + 0, newblock);
-+                        ((struct dx_root *) frames[0].bh->b_data)->info.indirect_levels = 1;
-+
-+                        /* Add new access path frame */
-+                        frame = frames + 1;
-+                        frame->at = at = at - entries + entries2;
-+                        frame->entries = entries = entries2;
-+                        frame->bh = bh2;
-+                        err = ext3_journal_get_write_access(handle,
-+                                                            frame->bh);
-+                        if (err)
-+                                goto journal_error;
- 		}
--		offset += le16_to_cpu(de->rec_len);
--		de = (struct ext3_dir_entry_2 *)
--			((char *) de + le16_to_cpu(de->rec_len));
-+                ext3_journal_dirty_metadata(handle, frames[0].bh);
- 	}
--	brelse (bh);
--	return -ENOSPC;
-+        de = do_split(handle, dir, &bh, frame, &hinfo, &err);
-+        if (!de)
-+                goto cleanup;
-+        err = add_dirent_to_buf(handle, dentry, inode, de, bh);
-+        bh = 0;
-+        goto cleanup;
-+
-+journal_error:
-+        ext3_std_error(dir->i_sb, err);
-+cleanup:
-+        if (bh)
-+                brelse(bh);
-+        dx_release(frames);
-+        return err;
- }
-+#endif
- 
- /*
-  * ext3_delete_entry deletes a directory entry by merging it with the
-@@ -453,9 +1532,11 @@
- 	struct inode * inode;
- 	int err;
- 
--	handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS + 3);
--	if (IS_ERR(handle))
-+	handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS +
-+					EXT3_INDEX_EXTRA_TRANS_BLOCKS + 3);
-+	if (IS_ERR(handle)) {
- 		return PTR_ERR(handle);
-+	}
- 
- 	if (IS_SYNC(dir))
- 		handle->h_sync = 1;
-@@ -480,9 +1561,11 @@
- 	struct inode *inode;
- 	int err;
- 
--	handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS + 3);
--	if (IS_ERR(handle))
-+	handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS +
-+			 		EXT3_INDEX_EXTRA_TRANS_BLOCKS + 3);
-+	if (IS_ERR(handle)) {
- 		return PTR_ERR(handle);
-+	}
- 
- 	if (IS_SYNC(dir))
- 		handle->h_sync = 1;
-@@ -512,9 +1595,11 @@
- 	if (dir->i_nlink >= EXT3_LINK_MAX)
- 		return -EMLINK;
- 
--	handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS + 3);
--	if (IS_ERR(handle))
-+	handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS +
-+					EXT3_INDEX_EXTRA_TRANS_BLOCKS + 3);
-+	if (IS_ERR(handle)) {
- 		return PTR_ERR(handle);
-+	}
- 
- 	if (IS_SYNC(dir))
- 		handle->h_sync = 1;
-@@ -526,7 +1611,8 @@
- 
- 	inode->i_op = &ext3_dir_inode_operations;
- 	inode->i_fop = &ext3_dir_operations;
--	inode->i_size = inode->u.ext3_i.i_disksize = inode->i_sb->s_blocksize;
-+        inode->i_size = EXT3_I(inode)->i_disksize = inode->i_sb->s_blocksize;
-+        inode->i_blocks = 0;
- 	dir_block = ext3_bread (handle, inode, 0, 1, &err);
- 	if (!dir_block) {
- 		inode->i_nlink--; /* is this nlink == 0? */
-@@ -555,21 +1641,19 @@
- 	brelse (dir_block);
- 	ext3_mark_inode_dirty(handle, inode);
- 	err = ext3_add_entry (handle, dentry, inode);
--	if (err)
--		goto out_no_entry;
-+	if (err) {
-+		inode->i_nlink = 0;
-+		ext3_mark_inode_dirty(handle, inode);
-+		iput (inode);
-+		goto out_stop;
-+	}
- 	dir->i_nlink++;
--	dir->u.ext3_i.i_flags &= ~EXT3_INDEX_FL;
-+	ext3_update_dx_flag(dir);
- 	ext3_mark_inode_dirty(handle, dir);
- 	d_instantiate(dentry, inode);
- out_stop:
- 	ext3_journal_stop(handle, dir);
- 	return err;
--
--out_no_entry:
--	inode->i_nlink = 0;
--	ext3_mark_inode_dirty(handle, inode);
--	iput (inode);
--	goto out_stop;
- }
- 
- /*
-@@ -656,7 +1740,7 @@
- 	int err = 0, rc;
- 	
- 	lock_super(sb);
--	if (!list_empty(&inode->u.ext3_i.i_orphan))
-+	if (!list_empty(&EXT3_I(inode)->i_orphan))
- 		goto out_unlock;
- 
- 	/* Orphan handling is only valid for files with data blocks
-@@ -697,7 +1781,7 @@
- 	 * This is safe: on error we're going to ignore the orphan list
- 	 * anyway on the next recovery. */
- 	if (!err)
--		list_add(&inode->u.ext3_i.i_orphan, &EXT3_SB(sb)->s_orphan);
-+		list_add(&EXT3_I(inode)->i_orphan, &EXT3_SB(sb)->s_orphan);
- 
- 	jbd_debug(4, "superblock will point to %ld\n", inode->i_ino);
- 	jbd_debug(4, "orphan inode %ld will point to %d\n",
-@@ -715,25 +1799,26 @@
- int ext3_orphan_del(handle_t *handle, struct inode *inode)
- {
- 	struct list_head *prev;
-+        struct ext3_inode_info *ei = EXT3_I(inode);
- 	struct ext3_sb_info *sbi;
- 	ino_t ino_next; 
- 	struct ext3_iloc iloc;
- 	int err = 0;
- 	
- 	lock_super(inode->i_sb);
--	if (list_empty(&inode->u.ext3_i.i_orphan)) {
-+        if (list_empty(&ei->i_orphan)) {
- 		unlock_super(inode->i_sb);
- 		return 0;
- 	}
- 
- 	ino_next = NEXT_ORPHAN(inode);
--	prev = inode->u.ext3_i.i_orphan.prev;
-+        prev = ei->i_orphan.prev;
- 	sbi = EXT3_SB(inode->i_sb);
- 
- 	jbd_debug(4, "remove inode %ld from orphan list\n", inode->i_ino);
- 
--	list_del(&inode->u.ext3_i.i_orphan);
--	INIT_LIST_HEAD(&inode->u.ext3_i.i_orphan);
-+        list_del(&ei->i_orphan);
-+        INIT_LIST_HEAD(&ei->i_orphan);
- 
- 	/* If we're on an error path, we may not have a valid
- 	 * transaction handle with which to update the orphan list on
-@@ -794,8 +1879,9 @@
- 	handle_t *handle;
- 
- 	handle = ext3_journal_start(dir, EXT3_DELETE_TRANS_BLOCKS);
--	if (IS_ERR(handle))
-+	if (IS_ERR(handle)) {
- 		return PTR_ERR(handle);
-+	}
- 
- 	retval = -ENOENT;
- 	bh = ext3_find_entry (dentry, &de);
-@@ -833,7 +1919,7 @@
- 	ext3_mark_inode_dirty(handle, inode);
- 	dir->i_nlink--;
- 	inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME;
--	dir->u.ext3_i.i_flags &= ~EXT3_INDEX_FL;
-+        ext3_update_dx_flag(dir);
- 	ext3_mark_inode_dirty(handle, dir);
- 
- end_rmdir:
-@@ -851,8 +1937,9 @@
- 	handle_t *handle;
- 
- 	handle = ext3_journal_start(dir, EXT3_DELETE_TRANS_BLOCKS);
--	if (IS_ERR(handle))
-+	if (IS_ERR(handle)) {
- 		return PTR_ERR(handle);
-+	}
- 
- 	if (IS_SYNC(dir))
- 		handle->h_sync = 1;
-@@ -879,7 +1966,7 @@
- 	if (retval)
- 		goto end_unlink;
- 	dir->i_ctime = dir->i_mtime = CURRENT_TIME;
--	dir->u.ext3_i.i_flags &= ~EXT3_INDEX_FL;
-+	ext3_update_dx_flag(dir);
- 	ext3_mark_inode_dirty(handle, dir);
- 	inode->i_nlink--;
- 	if (!inode->i_nlink)
-@@ -905,9 +1992,11 @@
- 	if (l > dir->i_sb->s_blocksize)
- 		return -ENAMETOOLONG;
- 
--	handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS + 5);
--	if (IS_ERR(handle))
-+	handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS +
-+			 		EXT3_INDEX_EXTRA_TRANS_BLOCKS + 5);
-+	if (IS_ERR(handle)) {
- 		return PTR_ERR(handle);
-+	}
- 
- 	if (IS_SYNC(dir))
- 		handle->h_sync = 1;
-@@ -917,7 +2006,7 @@
- 	if (IS_ERR(inode))
- 		goto out_stop;
- 
--	if (l > sizeof (inode->u.ext3_i.i_data)) {
-+        if (l > sizeof (EXT3_I(inode)->i_data)) {
- 		inode->i_op = &ext3_symlink_inode_operations;
- 		inode->i_mapping->a_ops = &ext3_aops;
- 		/*
-@@ -926,25 +2015,23 @@
- 		 * i_size in generic_commit_write().
- 		 */
- 		err = block_symlink(inode, symname, l);
--		if (err)
--			goto out_no_entry;
-+                if (err) {
-+                        ext3_dec_count(handle, inode);
-+                        ext3_mark_inode_dirty(handle, inode);
-+                        iput (inode);
-+                        goto out_stop;
-+                }
- 	} else {
- 		inode->i_op = &ext3_fast_symlink_inode_operations;
--		memcpy((char*)&inode->u.ext3_i.i_data,symname,l);
-+                memcpy((char*)&EXT3_I(inode)->i_data,symname,l);
- 		inode->i_size = l-1;
- 	}
--	inode->u.ext3_i.i_disksize = inode->i_size;
-+        EXT3_I(inode)->i_disksize = inode->i_size;
- 	ext3_mark_inode_dirty(handle, inode);
- 	err = ext3_add_nondir(handle, dentry, inode);
- out_stop:
- 	ext3_journal_stop(handle, dir);
- 	return err;
--
--out_no_entry:
--	ext3_dec_count(handle, inode);
--	ext3_mark_inode_dirty(handle, inode);
--	iput (inode);
--	goto out_stop;
- }
- 
- static int ext3_link (struct dentry * old_dentry,
-@@ -957,12 +2044,15 @@
- 	if (S_ISDIR(inode->i_mode))
- 		return -EPERM;
- 
--	if (inode->i_nlink >= EXT3_LINK_MAX)
-+	if (inode->i_nlink >= EXT3_LINK_MAX) {
- 		return -EMLINK;
-+	}
- 
--	handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS);
--	if (IS_ERR(handle))
-+	handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS +
-+					EXT3_INDEX_EXTRA_TRANS_BLOCKS);
-+	if (IS_ERR(handle)) {
- 		return PTR_ERR(handle);
-+	}
- 
- 	if (IS_SYNC(dir))
- 		handle->h_sync = 1;
-@@ -996,9 +2086,11 @@
- 
- 	old_bh = new_bh = dir_bh = NULL;
- 
--	handle = ext3_journal_start(old_dir, 2 * EXT3_DATA_TRANS_BLOCKS + 2);
--	if (IS_ERR(handle))
-+	handle = ext3_journal_start(old_dir, 2 * EXT3_DATA_TRANS_BLOCKS +
-+			 		EXT3_INDEX_EXTRA_TRANS_BLOCKS + 2);
-+	if (IS_ERR(handle)) {
- 		return PTR_ERR(handle);
-+	}
- 
- 	if (IS_SYNC(old_dir) || IS_SYNC(new_dir))
- 		handle->h_sync = 1;
-@@ -1078,7 +2170,7 @@
- 		new_inode->i_ctime = CURRENT_TIME;
- 	}
- 	old_dir->i_ctime = old_dir->i_mtime = CURRENT_TIME;
--	old_dir->u.ext3_i.i_flags &= ~EXT3_INDEX_FL;
-+	ext3_update_dx_flag(old_dir);
- 	if (dir_bh) {
- 		BUFFER_TRACE(dir_bh, "get_write_access");
- 		ext3_journal_get_write_access(handle, dir_bh);
-@@ -1090,7 +2182,7 @@
- 			new_inode->i_nlink--;
- 		} else {
- 			new_dir->i_nlink++;
--			new_dir->u.ext3_i.i_flags &= ~EXT3_INDEX_FL;
-+			ext3_update_dx_flag(new_dir);
- 			ext3_mark_inode_dirty(handle, new_dir);
- 		}
- 	}
-Index: linux-2.4.19/fs/ext3/super.c
-===================================================================
---- linux-2.4.19.orig/fs/ext3/super.c	2004-04-23 18:25:03.000000000 -0400
-+++ linux-2.4.19/fs/ext3/super.c	2004-04-23 18:26:27.000000000 -0400
-@@ -741,6 +741,7 @@
- 	es->s_mtime = cpu_to_le32(CURRENT_TIME);
- 	ext3_update_dynamic_rev(sb);
- 	EXT3_SET_INCOMPAT_FEATURE(sb, EXT3_FEATURE_INCOMPAT_RECOVER);
-+
- 	ext3_commit_super (sb, es, 1);
- 	if (test_opt (sb, DEBUG))
- 		printk (KERN_INFO
-@@ -751,6 +752,7 @@
- 			EXT3_BLOCKS_PER_GROUP(sb),
- 			EXT3_INODES_PER_GROUP(sb),
- 			sbi->s_mount_opt);
-+
- 	printk(KERN_INFO "EXT3 FS " EXT3FS_VERSION ", " EXT3FS_DATE " on %s, ",
- 				bdevname(sb->s_dev));
- 	if (EXT3_SB(sb)->s_journal->j_inode == NULL) {
-@@ -925,6 +927,7 @@
- 	return res;
- }
- 
-+
- struct super_block * ext3_read_super (struct super_block * sb, void * data,
- 				      int silent)
- {
-@@ -1113,6 +1116,9 @@
- 	sbi->s_mount_state = le16_to_cpu(es->s_state);
- 	sbi->s_addr_per_block_bits = log2(EXT3_ADDR_PER_BLOCK(sb));
- 	sbi->s_desc_per_block_bits = log2(EXT3_DESC_PER_BLOCK(sb));
-+	for (i=0; i < 4; i++)
-+		sbi->s_hash_seed[i] = le32_to_cpu(es->s_hash_seed[i]);
-+	sbi->s_def_hash_version = es->s_def_hash_version;
- 
- 	if (sbi->s_blocks_per_group > blocksize * 8) {
- 		printk (KERN_ERR
-@@ -1821,6 +1827,7 @@
- 	exit_ext3_xattr();
- }
- 
-+EXPORT_SYMBOL(ext3_force_commit);
- EXPORT_SYMBOL(ext3_bread);
- 
- MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others");
-Index: linux-2.4.19/include/linux/ext3_fs.h
-===================================================================
---- linux-2.4.19.orig/include/linux/ext3_fs.h	2004-04-23 17:53:55.000000000 -0400
-+++ linux-2.4.19/include/linux/ext3_fs.h	2004-04-23 18:26:27.000000000 -0400
-@@ -40,6 +40,11 @@
- #define EXT3FS_VERSION		"2.4-0.9.18"
- 
- /*
-+ * Always enable hashed directories
-+ */
-+#define CONFIG_EXT3_INDEX
-+
-+/*
-  * Debug code
-  */
- #ifdef EXT3FS_DEBUG
-@@ -414,8 +419,11 @@
- /*E0*/	__u32	s_journal_inum;		/* inode number of journal file */
- 	__u32	s_journal_dev;		/* device number of journal file */
- 	__u32	s_last_orphan;		/* start of list of inodes to delete */
--
--/*EC*/	__u32	s_reserved[197];	/* Padding to the end of the block */
-+	__u32	s_hash_seed[4];		/* HTREE hash seed */
-+	__u8	s_def_hash_version;	/* Default hash version to use */
-+	__u8	s_reserved_char_pad;
-+	__u16	s_reserved_word_pad;
-+	__u32	s_reserved[192];	/* Padding to the end of the block */
- };
- 
- #ifdef __KERNEL__
-@@ -552,9 +560,46 @@
- #define EXT3_DIR_ROUND			(EXT3_DIR_PAD - 1)
- #define EXT3_DIR_REC_LEN(name_len)	(((name_len) + 8 + EXT3_DIR_ROUND) & \
- 					 ~EXT3_DIR_ROUND)
-+/*
-+ * Hash Tree Directory indexing
-+ * (c) Daniel Phillips, 2001
-+ */
-+
-+#ifdef CONFIG_EXT3_INDEX
-+  #define is_dx(dir) (EXT3_HAS_COMPAT_FEATURE(dir->i_sb, \
-+					      EXT3_FEATURE_COMPAT_DIR_INDEX) && \
-+		      (EXT3_I(dir)->i_flags & EXT3_INDEX_FL))
-+#define EXT3_DIR_LINK_MAX(dir) (!is_dx(dir) && (dir)->i_nlink >= EXT3_LINK_MAX)
-+#define EXT3_DIR_LINK_EMPTY(dir) ((dir)->i_nlink == 2 || (dir)->i_nlink == 1)
-+#else
-+  #define is_dx(dir) 0
-+#define EXT3_DIR_LINK_MAX(dir) ((dir)->i_nlink >= EXT3_LINK_MAX)
-+#define EXT3_DIR_LINK_EMPTY(dir) ((dir)->i_nlink == 2)
-+#endif
-+
-+/* Legal values for the dx_root hash_version field: */
-+
-+#define DX_HASH_LEGACY		0
-+#define DX_HASH_HALF_MD4	1
-+#define DX_HASH_TEA		2
-+
-+/* hash info structure used by the directory hash */
-+struct dx_hash_info
-+{
-+	u32		hash;
-+	u32		minor_hash;
-+	int		hash_version;
-+	u32		*seed;
-+};
- 
- #ifdef __KERNEL__
- /*
-+ * Control parameters used by ext3_htree_next_block
-+ */
-+#define HASH_NB_ALWAYS		1
-+
-+
-+/*
-  * Describe an inode's exact location on disk and in memory
-  */
- struct ext3_iloc
-@@ -564,6 +609,27 @@
- 	unsigned long block_group;
- };
- 
-+
-+/*
-+ * This structure is stuffed into the struct file's private_data field
-+ * for directories.  It is where we put information so that we can do
-+ * readdir operations in hash tree order.
-+ */
-+struct dir_private_info {
-+	rb_root_t	root;
-+	rb_node_t	*curr_node;
-+	struct fname	*extra_fname;
-+	loff_t		last_pos;
-+	__u32		curr_hash;
-+	__u32		curr_minor_hash;
-+	__u32		next_hash;
-+};
-+
-+/*
-+ * Special error return code only used by dx_probe() and its callers.
-+ */
-+#define ERR_BAD_DX_DIR	-75000
-+
- /*
-  * Function prototypes
-  */
-@@ -591,11 +657,20 @@
- 
- /* dir.c */
- extern int ext3_check_dir_entry(const char *, struct inode *,
--				struct ext3_dir_entry_2 *, struct buffer_head *,
--				unsigned long);
-+				struct ext3_dir_entry_2 *,
-+				struct buffer_head *, unsigned long);
-+extern void ext3_htree_store_dirent(struct file *dir_file, __u32 hash,
-+				    __u32 minor_hash,
-+				    struct ext3_dir_entry_2 *dirent);
-+extern void ext3_htree_free_dir_info(struct dir_private_info *p);
-+
- /* fsync.c */
- extern int ext3_sync_file (struct file *, struct dentry *, int);
- 
-+/* hash.c */
-+extern int ext3fs_dirhash(const char *name, int len, struct
-+			  dx_hash_info *hinfo);
-+
- /* ialloc.c */
- extern struct inode * ext3_new_inode (handle_t *, struct inode *, int);
- extern void ext3_free_inode (handle_t *, struct inode *);
-@@ -628,6 +703,8 @@
- /* namei.c */
- extern int ext3_orphan_add(handle_t *, struct inode *);
- extern int ext3_orphan_del(handle_t *, struct inode *);
-+extern int ext3_htree_fill_tree(struct file *dir_file, __u32 start_hash,
-+				__u32 start_minor_hash, __u32 *next_hash);
- 
- /* super.c */
- extern void ext3_error (struct super_block *, const char *, const char *, ...)
-Index: linux-2.4.19/include/linux/ext3_fs_sb.h
-===================================================================
---- linux-2.4.19.orig/include/linux/ext3_fs_sb.h	2004-04-23 17:53:54.000000000 -0400
-+++ linux-2.4.19/include/linux/ext3_fs_sb.h	2004-04-23 18:26:27.000000000 -0400
-@@ -62,6 +62,8 @@
- 	int s_inode_size;
- 	int s_first_ino;
- 	u32 s_next_generation;
-+	u32 s_hash_seed[4];
-+	int s_def_hash_version;
- 
- 	/* Journaling */
- 	struct inode * s_journal_inode;
-Index: linux-2.4.19/include/linux/ext3_jbd.h
-===================================================================
---- linux-2.4.19.orig/include/linux/ext3_jbd.h	2004-04-23 17:53:54.000000000 -0400
-+++ linux-2.4.19/include/linux/ext3_jbd.h	2004-04-23 18:26:27.000000000 -0400
-@@ -69,6 +69,8 @@
- 
- #define EXT3_RESERVE_TRANS_BLOCKS	12
- 
-+#define EXT3_INDEX_EXTRA_TRANS_BLOCKS	8
-+
- int
- ext3_mark_iloc_dirty(handle_t *handle, 
- 		     struct inode *inode,
-Index: linux-2.4.19/include/linux/rbtree.h
-===================================================================
---- linux-2.4.19.orig/include/linux/rbtree.h	2001-11-22 14:46:18.000000000 -0500
-+++ linux-2.4.19/include/linux/rbtree.h	2004-04-23 18:26:27.000000000 -0400
-@@ -120,6 +120,8 @@
- 
- extern void rb_insert_color(rb_node_t *, rb_root_t *);
- extern void rb_erase(rb_node_t *, rb_root_t *);
-+extern rb_node_t *rb_get_first(rb_root_t *root);
-+extern rb_node_t *rb_get_next(rb_node_t *n);
- 
- static inline void rb_link_node(rb_node_t * node, rb_node_t * parent, rb_node_t ** rb_link)
- {
-Index: linux-2.4.19/lib/rbtree.c
-===================================================================
---- linux-2.4.19.orig/lib/rbtree.c	2002-08-02 20:39:46.000000000 -0400
-+++ linux-2.4.19/lib/rbtree.c	2004-04-23 18:26:27.000000000 -0400
-@@ -17,6 +17,8 @@
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
-   linux/lib/rbtree.c
-+
-+  rb_get_first and rb_get_next written by Theodore Ts'o, 9/8/2002
- */
- 
- #include <linux/rbtree.h>
-@@ -294,3 +296,43 @@
- 		__rb_erase_color(child, parent, root);
- }
- EXPORT_SYMBOL(rb_erase);
-+
-+/*
-+ * This function returns the first node (in sort order) of the tree.
-+ */
-+rb_node_t *rb_get_first(rb_root_t *root)
-+{
-+	rb_node_t	*n;
-+
-+	n = root->rb_node;
-+	if (!n)
-+		return 0;
-+	while (n->rb_left)
-+		n = n->rb_left;
-+	return n;
-+}
-+EXPORT_SYMBOL(rb_get_first);
-+
-+/*
-+ * Given a node, this function will return the next node in the tree.
-+ */
-+rb_node_t *rb_get_next(rb_node_t *n)
-+{
-+	rb_node_t	*parent;
-+
-+	if (n->rb_right) {
-+		n = n->rb_right;
-+		while (n->rb_left)
-+			n = n->rb_left;
-+		return n;
-+	} else {
-+		while ((parent = n->rb_parent)) {
-+			if (n == parent->rb_left)
-+				return parent;
-+			n = parent;
-+		}
-+		return 0;
-+	}
-+}
-+EXPORT_SYMBOL(rb_get_next);
-+
diff --git a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.18-chaos.patch b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.18-chaos.patch
index b6dc0dd..108cc43 100644
--- a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.18-chaos.patch
+++ b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.18-chaos.patch
@@ -40,7 +40,7 @@
  			goto out_brelse;
  	}
 +	if (ei->i_state & EXT3_STATE_NEW)
-+		memset(raw_inode, 0, EXT3_INODE_SIZE(inode->i_sb));
++		memset(raw_inode, 0, EXT3_INODE_SIZE(inode->i_sb)); 
  	raw_inode->i_mode = cpu_to_le16(inode->i_mode);
  	if(!(test_opt(inode->i_sb, NO_UID32))) {
  		raw_inode->i_uid_low = cpu_to_le16(low_16_bits(inode->i_uid));
@@ -171,7 +171,7 @@
 +	/* try to find attribute in inode body */
 +	err = ext3_xattr_ibody_get(inode, name_index, name,
 +					buffer, buffer_size);
-+	if (err < 0)
++	if (err < 0) 
 +		/* search was unsuccessful, try to find EA in dedicated block */
 +		err = ext3_xattr_block_get(inode, name_index, name,
 +				buffer, buffer_size);
@@ -214,7 +214,7 @@
 +		return 0;
 +
 +	ret = ext3_get_inode_loc(inode, &iloc);
-+	if (ret)
++	if (ret) 
 +		return ret;
 +	raw_inode = iloc.raw_inode;
 +
@@ -294,7 +294,7 @@
 +	/* get list of attributes stored in inode body */
 +	error = ext3_xattr_ibody_list(inode, buffer, buffer_size);
 +	if (error < 0) {
-+		/* some error occured while collecting
++		/* some error occured while collecting 
 +		 * attributes in inode body */
 +		size = 0;
 +		goto cleanup;
@@ -307,12 +307,12 @@
 +		if (buffer_size <= 0) {
 +			buffer = NULL;
 +			buffer_size = 0;
-+		} else
++		} else 
 +			buffer += error;
 +	}
 +
 +	error = ext3_xattr_block_list(inode, buffer, buffer_size);
-+	if (error < 0)
++	if (error < 0) 
 +		/* listing was successful, so we return len */
 +		size = 0;
 +
@@ -333,7 +333,7 @@
 + * NOTE: free space includes space our attribute hold
 + */
 +int
-+ext3_xattr_ibody_find(struct inode *inode, int name_index,
++ext3_xattr_ibody_find(struct inode *inode, int name_index, 
 +		const char *name, struct ext3_xattr_entry *rentry, int *free)
 +{
 +	struct ext3_xattr_entry *last;
@@ -348,7 +348,7 @@
 +		return ret;
 +
 +	err = ext3_get_inode_loc(inode, &iloc);
-+	if (err)
++	if (err) 
 +		return -EIO;
 +	raw_inode = iloc.raw_inode;
 +
@@ -457,7 +457,7 @@
 +
 +/*
 + * ext3_xattr_inode_set()
-+ *
++ * 
 + * this routine add/remove/replace attribute in inode body
 + */
 +int
@@ -517,7 +517,7 @@
 +		}
 +		if (name_index == last->e_name_index &&
 +			name_len == last->e_name_len &&
-+			!memcmp(name, last->e_name, name_len))
++			!memcmp(name, last->e_name, name_len)) 
 +			here = last;
 +		else {
 +			/* we calculate all but our attribute
@@ -554,9 +554,9 @@
 +		e = (struct ext3_xattr_entry *) start;
 +		while (!IS_LAST_ENTRY(e)) {
 +			struct ext3_xattr_entry *next = EXT3_XATTR_NEXT(e);
-+			int offs = le16_to_cpu(e->e_value_offs);
-+			if (offs < border)
-+				e->e_value_offs =
++			int offs = le16_to_cpu(e->e_value_offs); 
++			if (offs < border) 
++				e->e_value_offs = 
 +					cpu_to_le16(offs + size);
 +			e = next;
 +		}
@@ -697,7 +697,7 @@
 +
 +/*
 + * ext3_xattr_block_set()
-+ *
++ * 
 + * this routine add/remove/replace attribute in EA block
 + */
 +int
@@ -738,7 +738,7 @@
  	 */
  	loff_t	i_disksize;
  
-+	/* on-disk additional length */
++	/* on-disk additional lenght */
 +	__u16 i_extra_isize;
 +
  	/*
diff --git a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.20.patch b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.20.patch
index aeff645..55fa141 100644
--- a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.20.patch
+++ b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.20.patch
@@ -41,7 +41,7 @@
  			goto out_brelse;
  	}
 +	if (EXT3_I(inode)->i_state & EXT3_STATE_NEW)
-+		memset(raw_inode, 0, EXT3_INODE_SIZE(inode->i_sb));
++		memset(raw_inode, 0, EXT3_INODE_SIZE(inode->i_sb)); 
  	raw_inode->i_mode = cpu_to_le16(inode->i_mode);
  	if(!(test_opt(inode->i_sb, NO_UID32))) {
  		raw_inode->i_uid_low = cpu_to_le16(low_16_bits(inode->i_uid));
@@ -173,7 +173,7 @@
 +	/* try to find attribute in inode body */
 +	err = ext3_xattr_ibody_get(inode, name_index, name,
 +					buffer, buffer_size);
-+	if (err < 0)
++	if (err < 0) 
 +		/* search was unsuccessful, try to find EA in dedicated block */
 +		err = ext3_xattr_block_get(inode, name_index, name,
 +				buffer, buffer_size);
@@ -216,7 +216,7 @@
 +		return 0;
 +
 +	ret = ext3_get_inode_loc(inode, &iloc);
-+	if (ret)
++	if (ret) 
 +		return ret;
 +	raw_inode = iloc.raw_inode;
 +
@@ -296,7 +296,7 @@
 +	/* get list of attributes stored in inode body */
 +	error = ext3_xattr_ibody_list(inode, buffer, buffer_size);
 +	if (error < 0) {
-+		/* some error occured while collecting
++		/* some error occured while collecting 
 +		 * attributes in inode body */
 +		size = 0;
 +		goto cleanup;
@@ -309,12 +309,12 @@
 +		if (buffer_size <= 0) {
 +			buffer = NULL;
 +			buffer_size = 0;
-+		} else
++		} else 
 +			buffer += error;
 +	}
 +
 +	error = ext3_xattr_block_list(inode, buffer, buffer_size);
-+	if (error < 0)
++	if (error < 0) 
 +		/* listing was successful, so we return len */
 +		size = 0;
 +
@@ -335,7 +335,7 @@
 + * NOTE: free space includes space our attribute hold
 + */
 +int
-+ext3_xattr_ibody_find(struct inode *inode, int name_index,
++ext3_xattr_ibody_find(struct inode *inode, int name_index, 
 +		const char *name, struct ext3_xattr_entry *rentry, int *free)
 +{
 +	struct ext3_xattr_entry *last;
@@ -350,7 +350,7 @@
 +		return ret;
 +
 +	err = ext3_get_inode_loc(inode, &iloc);
-+	if (err)
++	if (err) 
 +		return -EIO;
 +	raw_inode = iloc.raw_inode;
 +
@@ -459,7 +459,7 @@
 +
 +/*
 + * ext3_xattr_inode_set()
-+ *
++ * 
 + * this routine add/remove/replace attribute in inode body
 + */
 +int
@@ -519,7 +519,7 @@
 +		}
 +		if (name_index == last->e_name_index &&
 +			name_len == last->e_name_len &&
-+			!memcmp(name, last->e_name, name_len))
++			!memcmp(name, last->e_name, name_len)) 
 +			here = last;
 +		else {
 +			/* we calculate all but our attribute
@@ -556,9 +556,9 @@
 +		e = (struct ext3_xattr_entry *) start;
 +		while (!IS_LAST_ENTRY(e)) {
 +			struct ext3_xattr_entry *next = EXT3_XATTR_NEXT(e);
-+			int offs = le16_to_cpu(e->e_value_offs);
-+			if (offs < border)
-+				e->e_value_offs =
++			int offs = le16_to_cpu(e->e_value_offs); 
++			if (offs < border) 
++				e->e_value_offs = 
 +					cpu_to_le16(offs + size);
 +			e = next;
 +		}
@@ -699,7 +699,7 @@
 +
 +/*
 + * ext3_xattr_block_set()
-+ *
++ * 
 + * this routine add/remove/replace attribute in EA block
 + */
 +int
@@ -724,7 +724,7 @@
  	 */
  	loff_t	i_disksize;
  
-+	/* on-disk additional length */
++	/* on-disk additional lenght */
 +	__u16 i_extra_isize;
 +
  	/*
diff --git a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.21-chaos.patch b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.21-chaos.patch
index 031e46d..4a68c63 100644
--- a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.21-chaos.patch
+++ b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.21-chaos.patch
@@ -45,7 +45,7 @@ Index: linux-2.4.21-chaos/fs/ext3/inode.c
  			goto out_brelse;
  	}
 +	if (EXT3_I(inode)->i_state & EXT3_STATE_NEW)
-+		memset(raw_inode, 0, EXT3_INODE_SIZE(inode->i_sb));
++		memset(raw_inode, 0, EXT3_INODE_SIZE(inode->i_sb)); 
  	raw_inode->i_mode = cpu_to_le16(inode->i_mode);
  	if(!(test_opt(inode->i_sb, NO_UID32))) {
  		raw_inode->i_uid_low = cpu_to_le16(low_16_bits(inode->i_uid));
@@ -179,7 +179,7 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 +	/* try to find attribute in inode body */
 +	err = ext3_xattr_ibody_get(inode, name_index, name,
 +					buffer, buffer_size);
-+	if (err < 0)
++	if (err < 0) 
 +		/* search was unsuccessful, try to find EA in dedicated block */
 +		err = ext3_xattr_block_get(inode, name_index, name,
 +				buffer, buffer_size);
@@ -222,7 +222,7 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 +		return 0;
 +
 +	ret = ext3_get_inode_loc(inode, &iloc);
-+	if (ret)
++	if (ret) 
 +		return ret;
 +	raw_inode = iloc.raw_inode;
 +
@@ -302,7 +302,7 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 +	/* get list of attributes stored in inode body */
 +	error = ext3_xattr_ibody_list(inode, buffer, buffer_size);
 +	if (error < 0) {
-+		/* some error occured while collecting
++		/* some error occured while collecting 
 +		 * attributes in inode body */
 +		size = 0;
 +		goto cleanup;
@@ -315,12 +315,12 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 +		if (buffer_size <= 0) {
 +			buffer = NULL;
 +			buffer_size = 0;
-+		} else
++		} else 
 +			buffer += error;
 +	}
 +
 +	error = ext3_xattr_block_list(inode, buffer, buffer_size);
-+	if (error < 0)
++	if (error < 0) 
 +		/* listing was successful, so we return len */
 +		size = 0;
 +
@@ -426,7 +426,7 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 +
 +/*
 + * ext3_xattr_block_set()
-+ *
++ * 
 + * this routine add/remove/replace attribute in EA block
 + */
 +int
@@ -444,7 +444,7 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 + * NOTE: free space includes space our attribute hold
 + */
 +int
-+ext3_xattr_ibody_find(struct inode *inode, int name_index,
++ext3_xattr_ibody_find(struct inode *inode, int name_index, 
 +		const char *name, struct ext3_xattr_entry *rentry, int *free)
 +{
 +	struct ext3_xattr_entry *last;
@@ -459,7 +459,7 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 +		return ret;
 +
 +	err = ext3_get_inode_loc(inode, &iloc);
-+	if (err)
++	if (err) 
 +		return -EIO;
 +	raw_inode = iloc.raw_inode;
 +
@@ -568,7 +568,7 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 +
 +/*
 + * ext3_xattr_inode_set()
-+ *
++ * 
 + * this routine add/remove/replace attribute in inode body
 + */
 +int
@@ -628,7 +628,7 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 +		}
 +		if (name_index == last->e_name_index &&
 +			name_len == last->e_name_len &&
-+			!memcmp(name, last->e_name, name_len))
++			!memcmp(name, last->e_name, name_len)) 
 +			here = last;
 +		else {
 +			/* we calculate all but our attribute
@@ -665,9 +665,9 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 +		e = (struct ext3_xattr_entry *) start;
 +		while (!IS_LAST_ENTRY(e)) {
 +			struct ext3_xattr_entry *next = EXT3_XATTR_NEXT(e);
-+			int offs = le16_to_cpu(e->e_value_offs);
-+			if (offs < border)
-+				e->e_value_offs =
++			int offs = le16_to_cpu(e->e_value_offs); 
++			if (offs < border) 
++				e->e_value_offs = 
 +					cpu_to_le16(offs + size);
 +			e = next;
 +		}
@@ -752,7 +752,7 @@ Index: linux-2.4.21-chaos/include/linux/ext3_fs_i.h
  	 */
  	loff_t	i_disksize;
  
-+	/* on-disk additional length */
++	/* on-disk additional lenght */
 +	__u16 i_extra_isize;
 +
  	/*
diff --git a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.21-suse2.patch b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.21-suse2.patch
index edcf826..0f0490b 100644
--- a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.21-suse2.patch
+++ b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.21-suse2.patch
@@ -45,7 +45,7 @@ Index: linux-2.4.21-chaos/fs/ext3/inode.c
  			goto out_brelse;
  	}
 +	if (EXT3_I(inode)->i_state & EXT3_STATE_NEW)
-+		memset(raw_inode, 0, EXT3_INODE_SIZE(inode->i_sb));
++		memset(raw_inode, 0, EXT3_INODE_SIZE(inode->i_sb)); 
  	raw_inode->i_mode = cpu_to_le16(inode->i_mode);
  	if(!(test_opt(inode->i_sb, NO_UID32))) {
  		raw_inode->i_uid_low = cpu_to_le16(low_16_bits(inode->i_uid));
@@ -179,7 +179,7 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 +	/* try to find attribute in inode body */
 +	err = ext3_xattr_ibody_get(inode, name_index, name,
 +					buffer, buffer_size);
-+	if (err < 0)
++	if (err < 0) 
 +		/* search was unsuccessful, try to find EA in dedicated block */
 +		err = ext3_xattr_block_get(inode, name_index, name,
 +				buffer, buffer_size);
@@ -222,7 +222,7 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 +		return 0;
 +
 +	ret = ext3_get_inode_loc(inode, &iloc);
-+	if (ret)
++	if (ret) 
 +		return ret;
 +	raw_inode = iloc.raw_inode;
 +
@@ -302,7 +302,7 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 +	/* get list of attributes stored in inode body */
 +	error = ext3_xattr_ibody_list(inode, buffer, buffer_size);
 +	if (error < 0) {
-+		/* some error occured while collecting
++		/* some error occured while collecting 
 +		 * attributes in inode body */
 +		size = 0;
 +		goto cleanup;
@@ -315,12 +315,12 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 +		if (buffer_size <= 0) {
 +			buffer = NULL;
 +			buffer_size = 0;
-+		} else
++		} else 
 +			buffer += error;
 +	}
 +
 +	error = ext3_xattr_block_list(inode, buffer, buffer_size);
-+	if (error < 0)
++	if (error < 0) 
 +		/* listing was successful, so we return len */
 +		size = 0;
 +
@@ -426,7 +426,7 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 +
 +/*
 + * ext3_xattr_block_set()
-+ *
++ * 
 + * this routine add/remove/replace attribute in EA block
 + */
 +int
@@ -444,7 +444,7 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 + * NOTE: free space includes space our attribute hold
 + */
 +int
-+ext3_xattr_ibody_find(struct inode *inode, int name_index,
++ext3_xattr_ibody_find(struct inode *inode, int name_index, 
 +		const char *name, struct ext3_xattr_entry *rentry, int *free)
 +{
 +	struct ext3_xattr_entry *last;
@@ -459,7 +459,7 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 +		return ret;
 +
 +	err = ext3_get_inode_loc(inode, &iloc);
-+	if (err)
++	if (err) 
 +		return -EIO;
 +	raw_inode = iloc.raw_inode;
 +
@@ -568,7 +568,7 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 +
 +/*
 + * ext3_xattr_inode_set()
-+ *
++ * 
 + * this routine add/remove/replace attribute in inode body
 + */
 +int
@@ -628,7 +628,7 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 +		}
 +		if (name_index == last->e_name_index &&
 +			name_len == last->e_name_len &&
-+			!memcmp(name, last->e_name, name_len))
++			!memcmp(name, last->e_name, name_len)) 
 +			here = last;
 +		else {
 +			/* we calculate all but our attribute
@@ -665,9 +665,9 @@ Index: linux-2.4.21-chaos/fs/ext3/xattr.c
 +		e = (struct ext3_xattr_entry *) start;
 +		while (!IS_LAST_ENTRY(e)) {
 +			struct ext3_xattr_entry *next = EXT3_XATTR_NEXT(e);
-+			int offs = le16_to_cpu(e->e_value_offs);
-+			if (offs < border)
-+				e->e_value_offs =
++			int offs = le16_to_cpu(e->e_value_offs); 
++			if (offs < border) 
++				e->e_value_offs = 
 +					cpu_to_le16(offs + size);
 +			e = next;
 +		}
@@ -752,7 +752,7 @@ Index: linux-2.4.21-chaos/include/linux/ext3_fs_i.h
  	 */
  	loff_t	i_disksize;
  
-+	/* on-disk additional length */
++	/* on-disk additional lenght */
 +	__u16 i_extra_isize;
 +
  	/*
diff --git a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.22-rh.patch b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.22-rh.patch
index e6eaaf8..736a930 100644
--- a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.22-rh.patch
+++ b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.4.22-rh.patch
@@ -41,7 +41,7 @@
  			goto out_brelse;
  	}
 +	if (EXT3_I(inode)->i_state & EXT3_STATE_NEW)
-+		memset(raw_inode, 0, EXT3_INODE_SIZE(inode->i_sb));
++		memset(raw_inode, 0, EXT3_INODE_SIZE(inode->i_sb)); 
  	raw_inode->i_mode = cpu_to_le16(inode->i_mode);
  	if(!(test_opt(inode->i_sb, NO_UID32))) {
  		raw_inode->i_uid_low = cpu_to_le16(low_16_bits(inode->i_uid));
@@ -188,7 +188,7 @@
 +	/* try to find attribute in inode body */
 +	err = ext3_xattr_ibody_get(inode, name_index, name,
 +					buffer, buffer_size);
-+	if (err < 0)
++	if (err < 0) 
 +		/* search was unsuccessful, try to find EA in dedicated block */
 +		err = ext3_xattr_block_get(inode, name_index, name,
 +				buffer, buffer_size);
@@ -231,7 +231,7 @@
 +		return 0;
 +
 +	ret = ext3_get_inode_loc(inode, &iloc);
-+	if (ret)
++	if (ret) 
 +		return ret;
 +	raw_inode = iloc.raw_inode;
 +
@@ -311,7 +311,7 @@
 +	/* get list of attributes stored in inode body */
 +	error = ext3_xattr_ibody_list(inode, buffer, buffer_size);
 +	if (error < 0) {
-+		/* some error occured while collecting
++		/* some error occured while collecting 
 +		 * attributes in inode body */
 +		size = 0;
 +		goto cleanup;
@@ -324,12 +324,12 @@
 +		if (buffer_size <= 0) {
 +			buffer = NULL;
 +			buffer_size = 0;
-+		} else
++		} else 
 +			buffer += error;
 +	}
 +
 +	error = ext3_xattr_block_list(inode, buffer, buffer_size);
-+	if (error < 0)
++	if (error < 0) 
 +		/* listing was successful, so we return len */
 +		size = 0;
 +
@@ -350,7 +350,7 @@
 + * NOTE: free space includes space our attribute hold
 + */
 +int
-+ext3_xattr_ibody_find(struct inode *inode, int name_index,
++ext3_xattr_ibody_find(struct inode *inode, int name_index, 
 +		const char *name, struct ext3_xattr_entry *rentry, int *free)
 +{
 +	struct ext3_xattr_entry *last;
@@ -365,7 +365,7 @@
 +		return ret;
 +
 +	err = ext3_get_inode_loc(inode, &iloc);
-+	if (err)
++	if (err) 
 +		return -EIO;
 +	raw_inode = iloc.raw_inode;
 +
@@ -474,7 +474,7 @@
 +
 +/*
 + * ext3_xattr_inode_set()
-+ *
++ * 
 + * this routine add/remove/replace attribute in inode body
 + */
 +int
@@ -534,7 +534,7 @@
 +		}
 +		if (name_index == last->e_name_index &&
 +			name_len == last->e_name_len &&
-+			!memcmp(name, last->e_name, name_len))
++			!memcmp(name, last->e_name, name_len)) 
 +			here = last;
 +		else {
 +			/* we calculate all but our attribute
@@ -571,9 +571,9 @@
 +		e = (struct ext3_xattr_entry *) start;
 +		while (!IS_LAST_ENTRY(e)) {
 +			struct ext3_xattr_entry *next = EXT3_XATTR_NEXT(e);
-+			int offs = le16_to_cpu(e->e_value_offs);
-+			if (offs < border)
-+				e->e_value_offs =
++			int offs = le16_to_cpu(e->e_value_offs); 
++			if (offs < border) 
++				e->e_value_offs = 
 +					cpu_to_le16(offs + size);
 +			e = next;
 +		}
@@ -714,7 +714,7 @@
 +
 +/*
 + * ext3_xattr_block_set()
-+ *
++ * 
 + * this routine add/remove/replace attribute in EA block
 + */
 +int
@@ -747,7 +747,7 @@
  	 */
  	loff_t	i_disksize;
  
-+	/* on-disk additional length */
++	/* on-disk additional lenght */
 +	__u16 i_extra_isize;
 +
  	/*
diff --git a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.6-suse.patch b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.6.0.patch
similarity index 98%
rename from lustre/kernel_patches/patches/ext3-ea-in-inode-2.6-suse.patch
rename to lustre/kernel_patches/patches/ext3-ea-in-inode-2.6.0.patch
index 39fa9ce..5e755d9 100644
--- a/lustre/kernel_patches/patches/ext3-ea-in-inode-2.6-suse.patch
+++ b/lustre/kernel_patches/patches/ext3-ea-in-inode-2.6.0.patch
@@ -189,7 +189,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c
 +	/* try to find attribute in inode body */
 +	err = ext3_xattr_ibody_get(inode, name_index, name,
 +					buffer, buffer_size);
-+	if (err < 0)
++	if (err < 0) 
 +		/* search was unsuccessful, try to find EA in dedicated block */
 +		err = ext3_xattr_block_get(inode, name_index, name,
 +				buffer, buffer_size);
@@ -252,7 +252,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c
 +		return 0;
 +
 +	ret = ext3_get_inode_loc(inode, &iloc);
-+	if (ret)
++	if (ret) 
 +		return ret;
 +	raw_inode = ext3_raw_inode(&iloc);
 +
@@ -334,7 +334,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c
 +	/* get list of attributes stored in inode body */
 +	error = ext3_xattr_ibody_list(inode, buffer, buffer_size);
 +	if (error < 0) {
-+		/* some error occured while collecting
++		/* some error occured while collecting 
 +		 * attributes in inode body */
 +		size = 0;
 +		goto cleanup;
@@ -347,12 +347,12 @@ Index: linux-2.6.0/fs/ext3/xattr.c
 +		if (buffer_size <= 0) {
 +			buffer = NULL;
 +			buffer_size = 0;
-+		} else
++		} else 
 +			buffer += error;
 +	}
 +
 +	error = ext3_xattr_block_list(inode, buffer, buffer_size);
-+	if (error < 0)
++	if (error < 0) 
 +		/* listing was successful, so we return len */
 +		size = 0;
 +
@@ -374,7 +374,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c
 + * NOTE: free space includes space our attribute hold
 + */
 +int
-+ext3_xattr_ibody_find(struct inode *inode, int name_index,
++ext3_xattr_ibody_find(struct inode *inode, int name_index, 
 +		const char *name, struct ext3_xattr_entry *rentry, int *free)
 +{
 +	struct ext3_xattr_entry *last;
@@ -389,7 +389,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c
 +		return ret;
 +
 +	err = ext3_get_inode_loc(inode, &iloc);
-+	if (err)
++	if (err) 
 +		return -EIO;
 +	raw_inode = ext3_raw_inode(&iloc);
 +
@@ -498,7 +498,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c
 +
 +/*
 + * ext3_xattr_inode_set()
-+ *
++ * 
 + * this routine add/remove/replace attribute in inode body
 + */
 +int
@@ -558,7 +558,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c
 +		}
 +		if (name_index == last->e_name_index &&
 +			name_len == last->e_name_len &&
-+			!memcmp(name, last->e_name, name_len))
++			!memcmp(name, last->e_name, name_len)) 
 +			here = last;
 +		else {
 +			/* we calculate all but our attribute
@@ -595,9 +595,9 @@ Index: linux-2.6.0/fs/ext3/xattr.c
 +		e = (struct ext3_xattr_entry *) start;
 +		while (!IS_LAST_ENTRY(e)) {
 +			struct ext3_xattr_entry *next = EXT3_XATTR_NEXT(e);
-+			int offs = le16_to_cpu(e->e_value_offs);
-+			if (offs < border)
-+				e->e_value_offs =
++			int offs = le16_to_cpu(e->e_value_offs); 
++			if (offs < border) 
++				e->e_value_offs = 
 +					cpu_to_le16(offs + size);
 +			e = next;
 +		}
@@ -741,7 +741,7 @@ Index: linux-2.6.0/fs/ext3/xattr.c
 +
 +/*
 + * ext3_xattr_block_set()
-+ *
++ * 
 + * this routine add/remove/replace attribute in EA block
 + */
 +int
@@ -815,7 +815,7 @@ Index: linux-2.6.0/include/linux/ext3_fs_i.h
  	 */
  	loff_t	i_disksize;
  
-+	/* on-disk additional length */
++	/* on-disk additional lenght */
 +	__u16 i_extra_isize;
 +
  	/*
diff --git a/lustre/kernel_patches/patches/ext3-extents-2.4.18-chaos-pdirops.patch b/lustre/kernel_patches/patches/ext3-extents-2.4.18-chaos-pdirops.patch
index 592af93..c931e8d 100644
--- a/lustre/kernel_patches/patches/ext3-extents-2.4.18-chaos-pdirops.patch
+++ b/lustre/kernel_patches/patches/ext3-extents-2.4.18-chaos-pdirops.patch
@@ -1762,7 +1762,7 @@
 @@ -12,7 +12,8 @@ O_TARGET := ext3.o
  export-objs :=	ext3-exports.o
  
- obj-y    := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o iopen.o \
+ obj-y    := balloc.o iopen.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
 -		ioctl.o namei.o super.o symlink.o xattr.o hash.o ext3-exports.o
 +		ioctl.o namei.o super.o symlink.o xattr.o hash.o ext3-exports.o \
 +		extents.o
diff --git a/lustre/kernel_patches/patches/ext3-extents-2.4.18-chaos.patch b/lustre/kernel_patches/patches/ext3-extents-2.4.18-chaos.patch
index a0b4230..a88b30d 100644
--- a/lustre/kernel_patches/patches/ext3-extents-2.4.18-chaos.patch
+++ b/lustre/kernel_patches/patches/ext3-extents-2.4.18-chaos.patch
@@ -1760,7 +1760,7 @@ Index: linux-2.4.18-chaos/fs/ext3/Makefile
 @@ -12,7 +12,8 @@
  export-objs :=	ext3-exports.o
  
- obj-y    := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o iopen.o \
+ obj-y    := balloc.o iopen.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
 -		ioctl.o namei.o super.o symlink.o xattr.o ext3-exports.o
 +		ioctl.o namei.o super.o symlink.o xattr.o ext3-exports.o \
 +		extents.o
diff --git a/lustre/kernel_patches/patches/ext3-extents-2.4.24.patch b/lustre/kernel_patches/patches/ext3-extents-2.4.24.patch
deleted file mode 100644
index 1122ba4..0000000
--- a/lustre/kernel_patches/patches/ext3-extents-2.4.24.patch
+++ /dev/null
@@ -1,2810 +0,0 @@
-Index: linux-2.4.24-mb34/fs/ext3/extents.c
-===================================================================
---- linux-2.4.24-mb34.orig/fs/ext3/extents.c	1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.4.24-mb34/fs/ext3/extents.c	2004-05-05 14:27:07.000000000 -0700
-@@ -0,0 +1,2346 @@
-+/*
-+ * Copyright (C) 2003 Alex Tomas <alex@clusterfs.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public Licens
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-
-+ */
-+
-+/*
-+ * Extents support for EXT3
-+ *
-+ * TODO:
-+ *   - ext3_ext_walk_space() sould not use ext3_ext_find_extent()
-+ *   - ext3_ext_calc_credits() could take 'mergable' into account
-+ *   - ext3*_error() should be used in some situations
-+ *   - find_goal() [to be tested and improved]
-+ *   - smart tree reduction
-+ *   - arch-independence
-+ *     common on-disk format for big/little-endian arch
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/fs.h>
-+#include <linux/time.h>
-+#include <linux/ext3_jbd.h>
-+#include <linux/jbd.h>
-+#include <linux/smp_lock.h>
-+#include <linux/highuid.h>
-+#include <linux/pagemap.h>
-+#include <linux/quotaops.h>
-+#include <linux/string.h>
-+#include <linux/slab.h>
-+#include <linux/locks.h>
-+#include <linux/ext3_extents.h>
-+#include <asm/uaccess.h>
-+
-+static handle_t *ext3_ext_journal_restart(handle_t *handle, int needed)
-+{
-+	int err;
-+
-+	if (handle->h_buffer_credits > needed)
-+		return handle;
-+	if (!ext3_journal_extend(handle, needed))
-+		return handle;
-+	err = ext3_journal_restart(handle, needed);
-+	
-+	return handle;
-+}
-+
-+static int inline
-+ext3_ext_get_access_for_root(handle_t *h, struct ext3_extents_tree *tree)
-+{
-+	if (tree->get_write_access)
-+		return tree->get_write_access(h,tree->buffer);
-+	else
-+		return 0;
-+}
-+
-+static int inline
-+ext3_ext_mark_root_dirty(handle_t *h, struct ext3_extents_tree *tree)
-+{
-+	if (tree->mark_buffer_dirty)
-+		return tree->mark_buffer_dirty(h,tree->buffer);
-+	else
-+		return 0;
-+}
-+
-+/*
-+ * could return:
-+ *  - EROFS
-+ *  - ENOMEM
-+ */
-+static int ext3_ext_get_access(handle_t *handle,
-+				struct ext3_extents_tree *tree,
-+				struct ext3_ext_path *path)
-+{
-+	int err;
-+
-+	if (path->p_bh) {
-+		/* path points to block */
-+		err = ext3_journal_get_write_access(handle, path->p_bh);
-+	} else {
-+		/* path points to leaf/index in inode body */
-+		err = ext3_ext_get_access_for_root(handle, tree);
-+	}
-+	return err;
-+}
-+
-+/*
-+ * could return:
-+ *  - EROFS
-+ *  - ENOMEM
-+ *  - EIO
-+ */
-+static int ext3_ext_dirty(handle_t *handle, struct ext3_extents_tree *tree,
-+				struct ext3_ext_path *path)
-+{
-+	int err;
-+	if (path->p_bh) {
-+		/* path points to block */
-+		err =ext3_journal_dirty_metadata(handle, path->p_bh);
-+	} else {
-+		/* path points to leaf/index in inode body */
-+		err = ext3_ext_mark_root_dirty(handle, tree);
-+	}
-+	return err;
-+}
-+
-+static int inline
-+ext3_ext_new_block(handle_t *handle, struct ext3_extents_tree *tree,
-+			struct ext3_ext_path *path, struct ext3_extent *ex,
-+			int *err)
-+{
-+	int goal, depth, newblock;
-+	struct inode *inode;
-+
-+	EXT_ASSERT(tree);
-+	if (tree->new_block)
-+		return tree->new_block(handle, tree, path, ex, err);
-+
-+	inode = tree->inode;
-+	depth = EXT_DEPTH(tree);
-+	if (path && depth > 0) {
-+		goal = path[depth-1].p_block;
-+	} else {
-+		struct ext3_inode_info *ei = EXT3_I(inode);
-+		unsigned long bg_start;
-+		unsigned long colour;
-+
-+		bg_start = (ei->i_block_group *
-+				EXT3_BLOCKS_PER_GROUP(inode->i_sb)) +
-+			le32_to_cpu(EXT3_SB(inode->i_sb)->s_es->s_first_data_block);
-+		colour = (current->pid % 16) *
-+			(EXT3_BLOCKS_PER_GROUP(inode->i_sb) / 16);
-+		goal = bg_start + colour;
-+	}
-+
-+	newblock = ext3_new_block(handle, inode, goal, 0, 0, err);
-+	return newblock;
-+}
-+
-+static inline void ext3_ext_tree_changed(struct ext3_extents_tree *tree)
-+{
-+	struct ext3_extent_header *neh;
-+	neh = EXT_ROOT_HDR(tree);
-+	neh->e_generation++;
-+}
-+
-+static inline int ext3_ext_space_block(struct ext3_extents_tree *tree)
-+{
-+	int size;
-+
-+	size = (tree->inode->i_sb->s_blocksize -
-+			sizeof(struct ext3_extent_header))
-+				/ sizeof(struct ext3_extent);
-+#ifdef AGRESSIVE_TEST
-+	size = 6;
-+#endif
-+	return size;
-+}
-+
-+static inline int ext3_ext_space_block_idx(struct ext3_extents_tree *tree)
-+{
-+	int size;
-+
-+	size = (tree->inode->i_sb->s_blocksize -
-+			sizeof(struct ext3_extent_header))
-+				/ sizeof(struct ext3_extent_idx);
-+#ifdef AGRESSIVE_TEST
-+	size = 5;
-+#endif
-+	return size;
-+}
-+
-+static inline int ext3_ext_space_root(struct ext3_extents_tree *tree)
-+{
-+	int size;
-+
-+	size = (tree->buffer_len - sizeof(struct ext3_extent_header))
-+			/ sizeof(struct ext3_extent);
-+#ifdef AGRESSIVE_TEST
-+	size = 3;
-+#endif
-+	return size;
-+}
-+
-+static inline int ext3_ext_space_root_idx(struct ext3_extents_tree *tree)
-+{
-+	int size;
-+
-+	size = (tree->buffer_len -
-+			sizeof(struct ext3_extent_header))
-+			/ sizeof(struct ext3_extent_idx);
-+#ifdef AGRESSIVE_TEST
-+	size = 4;
-+#endif
-+	return size;
-+}
-+
-+static void ext3_ext_show_path(struct ext3_extents_tree *tree,
-+				struct ext3_ext_path *path)
-+{
-+#ifdef EXT_DEBUG
-+	int k, l = path->p_depth;
-+
-+	ext_debug(tree, "path:");
-+	for (k = 0; k <= l; k++, path++) {
-+		if (path->p_idx) {
-+			ext_debug(tree, "  %d->%d", path->p_idx->e_block,
-+					path->p_idx->e_leaf);
-+		} else if (path->p_ext) {
-+			ext_debug(tree, "  %d:%d:%d",
-+					path->p_ext->e_block,
-+					path->p_ext->e_num,
-+					path->p_ext->e_start);
-+		} else
-+			ext_debug(tree, "  []");
-+	}
-+	ext_debug(tree, "\n");
-+#endif
-+}
-+
-+static void ext3_ext_show_leaf(struct ext3_extents_tree *tree,
-+				struct ext3_ext_path *path)
-+{
-+#ifdef EXT_DEBUG
-+	int depth = EXT_DEPTH(tree);
-+	struct ext3_extent_header *eh;
-+	struct ext3_extent *ex;
-+	int i;
-+
-+	if (!path)
-+		return;
-+
-+	eh = path[depth].p_hdr;
-+	ex = EXT_FIRST_EXTENT(eh);
-+
-+	for (i = 0; i < eh->e_num; i++, ex++) {
-+		ext_debug(tree, "%d:%d:%d ",
-+				ex->e_block, ex->e_num, ex->e_start);
-+	}
-+	ext_debug(tree, "\n");
-+#endif
-+}
-+
-+static void ext3_ext_drop_refs(struct ext3_ext_path *path)
-+{
-+	int depth = path->p_depth;
-+	int i;
-+
-+	for (i = 0; i <= depth; i++, path++)
-+		if (path->p_bh) {
-+			brelse(path->p_bh);
-+			path->p_bh = NULL;
-+		}
-+}
-+
-+/*
-+ * binary search for closest index by given block
-+ */
-+static inline void
-+ext3_ext_binsearch_idx(struct ext3_extents_tree *tree,
-+			struct ext3_ext_path *path, int block)
-+{
-+	struct ext3_extent_header *eh = path->p_hdr;
-+	struct ext3_extent_idx *ix;
-+	int l = 0, k, r;
-+
-+	EXT_ASSERT(eh->e_magic == EXT3_EXT_MAGIC);
-+	EXT_ASSERT(eh->e_num <= eh->e_max);
-+	EXT_ASSERT(eh->e_num > 0);
-+
-+	ext_debug(tree, "binsearch for %d(idx):  ", block);
-+
-+	path->p_idx = ix = EXT_FIRST_INDEX(eh);
-+
-+	r = k = eh->e_num;
-+	while (k > 1) {
-+		k = (r - l) / 2;
-+		if (block < ix[l + k].e_block)
-+			r -= k;
-+		else
-+			l += k;
-+		ext_debug(tree, "%d:%d:%d ", k, l, r);
-+	}
-+
-+	ix += l;
-+	path->p_idx = ix;
-+	ext_debug(tree, "  -> %d->%d ", path->p_idx->e_block, path->p_idx->e_leaf);
-+
-+	while (l++ < r) {
-+		if (block < ix->e_block) 
-+			break;
-+		path->p_idx = ix++;
-+	}
-+	ext_debug(tree, "  -> %d->%d\n", path->p_idx->e_block,
-+			path->p_idx->e_leaf);
-+
-+#ifdef CHECK_BINSEARCH 
-+	{
-+		struct ext3_extent_idx *chix;
-+
-+		chix = ix = EXT_FIRST_INDEX(eh);
-+		for (k = 0; k < eh->e_num; k++, ix++) {
-+			if (k != 0 && ix->e_block <= ix[-1].e_block) {
-+				printk("k=%d, ix=0x%p, first=0x%p\n", k,
-+					ix, EXT_FIRST_INDEX(eh));
-+				printk("%u <= %u\n",
-+					ix->e_block,ix[-1].e_block);
-+			}
-+			EXT_ASSERT(k == 0 || ix->e_block > ix[-1].e_block);
-+			if (block < ix->e_block) 
-+				break;
-+			chix = ix;
-+		}
-+		EXT_ASSERT(chix == path->p_idx);
-+	}
-+#endif
-+
-+}
-+
-+/*
-+ * binary search for closest extent by given block
-+ */
-+static inline void
-+ext3_ext_binsearch(struct ext3_extents_tree *tree,
-+			struct ext3_ext_path *path, int block)
-+{
-+	struct ext3_extent_header *eh = path->p_hdr;
-+	struct ext3_extent *ex;
-+	int l = 0, k, r;
-+
-+	EXT_ASSERT(eh->e_magic == EXT3_EXT_MAGIC);
-+	EXT_ASSERT(eh->e_num <= eh->e_max);
-+
-+	if (eh->e_num == 0) {
-+		/*
-+		 * this leaf is empty yet:
-+		 *  we get such a leaf in split/add case
-+		 */
-+		return;
-+	}
-+	
-+	ext_debug(tree, "binsearch for %d:  ", block);
-+
-+	path->p_ext = ex = EXT_FIRST_EXTENT(eh);
-+
-+	r = k = eh->e_num;
-+	while (k > 1) {
-+		k = (r - l) / 2;
-+		if (block < ex[l + k].e_block)
-+			r -= k;
-+		else
-+			l += k;
-+		ext_debug(tree, "%d:%d:%d ", k, l, r);
-+	}
-+
-+	ex += l;
-+	path->p_ext = ex;
-+	ext_debug(tree, "  -> %d:%d:%d ", path->p_ext->e_block,
-+			path->p_ext->e_start, path->p_ext->e_num);
-+
-+	while (l++ < r) {
-+		if (block < ex->e_block) 
-+			break;
-+		path->p_ext = ex++;
-+	}
-+	ext_debug(tree, "  -> %d:%d:%d\n", path->p_ext->e_block,
-+			path->p_ext->e_start, path->p_ext->e_num);
-+
-+#ifdef CHECK_BINSEARCH 
-+	{
-+		struct ext3_extent *chex;
-+
-+		chex = ex = EXT_FIRST_EXTENT(eh);
-+		for (k = 0; k < eh->e_num; k++, ex++) {
-+			EXT_ASSERT(k == 0 || ex->e_block > ex[-1].e_block);
-+			if (block < ex->e_block) 
-+				break;
-+			chex = ex;
-+		}
-+		EXT_ASSERT(chex == path->p_ext);
-+	}
-+#endif
-+
-+}
-+
-+int ext3_extent_tree_init(handle_t *handle, struct ext3_extents_tree *tree)
-+{
-+	struct ext3_extent_header *eh;
-+
-+	BUG_ON(tree->buffer_len == 0);
-+	ext3_ext_get_access_for_root(handle, tree);
-+	eh = EXT_ROOT_HDR(tree);
-+	eh->e_depth = 0;
-+	eh->e_num = 0;
-+	eh->e_magic = EXT3_EXT_MAGIC;
-+	eh->e_max = ext3_ext_space_root(tree);
-+	ext3_ext_mark_root_dirty(handle, tree);
-+	return 0;
-+}
-+
-+struct ext3_ext_path *
-+ext3_ext_find_extent(struct ext3_extents_tree *tree, int block,
-+			struct ext3_ext_path *path)
-+{
-+	struct ext3_extent_header *eh;
-+	struct buffer_head *bh;
-+	int depth, i, ppos = 0;
-+
-+	EXT_ASSERT(tree);
-+	EXT_ASSERT(tree->inode);
-+	EXT_ASSERT(tree->root);
-+
-+	eh = EXT_ROOT_HDR(tree);
-+	EXT_ASSERT(eh);
-+	i = depth = EXT_DEPTH(tree);
-+	EXT_ASSERT(eh->e_max);
-+	EXT_ASSERT(eh->e_magic == EXT3_EXT_MAGIC);
-+	EXT_ASSERT(i == 0 || eh->e_num > 0);
-+	
-+	/* account possible depth increase */
-+	if (!path) {
-+		path = kmalloc(sizeof(struct ext3_ext_path) * (depth + 2),
-+				GFP_NOFS);
-+		if (!path)
-+			return ERR_PTR(-ENOMEM);
-+	}
-+	memset(path, 0, sizeof(struct ext3_ext_path) * (depth + 1));
-+	path[0].p_hdr = eh;
-+
-+	/* walk through the tree */
-+	while (i) {
-+		ext_debug(tree, "depth %d: num %d, max %d\n",
-+				ppos, eh->e_num, eh->e_max);
-+		ext3_ext_binsearch_idx(tree, path + ppos, block);
-+		path[ppos].p_block = path[ppos].p_idx->e_leaf;
-+		path[ppos].p_depth = i;
-+		path[ppos].p_ext = NULL;
-+
-+		bh = sb_bread(tree->inode->i_sb, path[ppos].p_block);
-+		if (!bh) {
-+			ext3_ext_drop_refs(path);
-+			kfree(path);
-+			return ERR_PTR(-EIO);
-+		}
-+		eh = EXT_BLOCK_HDR(bh);
-+		ppos++;
-+		EXT_ASSERT(ppos <= depth);
-+		path[ppos].p_bh = bh;
-+		path[ppos].p_hdr = eh;
-+		i--;
-+	}
-+
-+	path[ppos].p_depth = i;
-+	path[ppos].p_hdr = eh;
-+	path[ppos].p_ext = NULL;
-+
-+	/* find extent */
-+	ext3_ext_binsearch(tree, path + ppos, block);
-+
-+	ext3_ext_show_path(tree, path);
-+
-+	return path;
-+}
-+
-+/*
-+ * insert new index [logical;ptr] into the block at cupr
-+ * it check where to insert: before curp or after curp
-+ */
-+static int ext3_ext_insert_index(handle_t *handle,
-+				struct ext3_extents_tree *tree,
-+				struct ext3_ext_path *curp,
-+				int logical, int ptr)
-+{
-+	struct ext3_extent_idx *ix;
-+	int len, err;
-+
-+	if ((err = ext3_ext_get_access(handle, tree, curp)))
-+		return err;
-+
-+	EXT_ASSERT(logical != curp->p_idx->e_block);
-+	len = EXT_MAX_INDEX(curp->p_hdr) - curp->p_idx;
-+	if (logical > curp->p_idx->e_block) {
-+		/* insert after */
-+		if (curp->p_idx != EXT_LAST_INDEX(curp->p_hdr)) {
-+			len = (len - 1) * sizeof(struct ext3_extent_idx);
-+			len = len < 0 ? 0 : len;
-+			ext_debug(tree, "insert new index %d after: %d. "
-+					"move %d from 0x%p to 0x%p\n",
-+					logical, ptr, len,
-+					(curp->p_idx + 1), (curp->p_idx + 2));
-+			memmove(curp->p_idx + 2, curp->p_idx + 1, len);
-+		}
-+		ix = curp->p_idx + 1;
-+	} else {
-+		/* insert before */
-+		len = len * sizeof(struct ext3_extent_idx);
-+		len = len < 0 ? 0 : len;
-+		ext_debug(tree, "insert new index %d before: %d. "
-+				"move %d from 0x%p to 0x%p\n",
-+				logical, ptr, len,
-+				curp->p_idx, (curp->p_idx + 1));
-+		memmove(curp->p_idx + 1, curp->p_idx, len);
-+		ix = curp->p_idx;
-+	}
-+
-+	ix->e_block = logical;
-+	ix->e_leaf = ptr;
-+	curp->p_hdr->e_num++;
-+
-+	EXT_ASSERT(curp->p_hdr->e_num <= curp->p_hdr->e_max);
-+	EXT_ASSERT(ix <= EXT_LAST_INDEX(curp->p_hdr));
-+
-+	err = ext3_ext_dirty(handle, tree, curp);
-+	ext3_std_error(tree->inode->i_sb, err);
-+
-+	return err;
-+}
-+
-+/*
-+ * routine inserts new subtree into the path, using free index entry
-+ * at depth 'at:
-+ *  - allocates all needed blocks (new leaf and all intermediate index blocks)
-+ *  - makes decision where to split
-+ *  - moves remaining extens and index entries (right to the split point)
-+ *    into the newly allocated blocks
-+ *  - initialize subtree
-+ */
-+static int ext3_ext_split(handle_t *handle, struct ext3_extents_tree *tree,
-+				struct ext3_ext_path *path,
-+				struct ext3_extent *newext, int at)
-+{
-+	struct buffer_head *bh = NULL;
-+	int depth = EXT_DEPTH(tree);
-+	struct ext3_extent_header *neh;
-+	struct ext3_extent_idx *fidx;
-+	struct ext3_extent *ex;
-+	int i = at, k, m, a;
-+	unsigned long newblock, oldblock, border;
-+	int *ablocks = NULL; /* array of allocated blocks */
-+	int err = 0;
-+
-+	/* make decision: where to split? */
-+	/* FIXME: now desicion is simplest: at current extent */
-+
-+	/* if current leaf will be splitted, then we should use 
-+	 * border from split point */
-+	EXT_ASSERT(path[depth].p_ext <= EXT_MAX_EXTENT(path[depth].p_hdr));
-+	if (path[depth].p_ext != EXT_MAX_EXTENT(path[depth].p_hdr)) {
-+		border = path[depth].p_ext[1].e_block;
-+		ext_debug(tree, "leaf will be splitted."
-+				" next leaf starts at %d\n",
-+				(int)border);
-+	} else {
-+		border = newext->e_block;
-+		ext_debug(tree, "leaf will be added."
-+				" next leaf starts at %d\n",
-+				(int)border);
-+	}
-+
-+	/* 
-+	 * if error occurs, then we break processing
-+	 * and turn filesystem read-only. so, index won't
-+	 * be inserted and tree will be in consistent
-+	 * state. next mount will repair buffers too
-+	 */
-+
-+	/*
-+	 * get array to track all allocated blocks
-+	 * we need this to handle errors and free blocks
-+	 * upon them
-+	 */
-+	ablocks = kmalloc(sizeof(unsigned long) * depth, GFP_NOFS);
-+	if (!ablocks)
-+		return -ENOMEM;
-+	memset(ablocks, 0, sizeof(unsigned long) * depth);
-+
-+	/* allocate all needed blocks */
-+	ext_debug(tree, "allocate %d blocks for indexes/leaf\n", depth - at);
-+	for (a = 0; a < depth - at; a++) {
-+		newblock = ext3_ext_new_block(handle, tree, path, newext, &err);
-+		if (newblock == 0)
-+			goto cleanup;
-+		ablocks[a] = newblock;
-+	}
-+
-+	/* initialize new leaf */
-+	newblock = ablocks[--a];
-+	EXT_ASSERT(newblock);
-+	bh = sb_getblk(tree->inode->i_sb, newblock);
-+	if (!bh) {
-+		err = -EIO;
-+		goto cleanup;
-+	}
-+	lock_buffer(bh);
-+
-+	if ((err = ext3_journal_get_create_access(handle, bh)))
-+		goto cleanup;
-+
-+	neh = EXT_BLOCK_HDR(bh);
-+	neh->e_num = 0;
-+	neh->e_max = ext3_ext_space_block(tree);
-+	neh->e_magic = EXT3_EXT_MAGIC;
-+	neh->e_depth = 0;
-+	ex = EXT_FIRST_EXTENT(neh);
-+
-+	/* move remain of path[depth] to the new leaf */
-+	EXT_ASSERT(path[depth].p_hdr->e_num == path[depth].p_hdr->e_max);
-+	/* start copy from next extent */
-+	/* TODO: we could do it by single memmove */
-+	m = 0;
-+	path[depth].p_ext++;
-+	while (path[depth].p_ext <=
-+			EXT_MAX_EXTENT(path[depth].p_hdr)) {
-+		ext_debug(tree, "move %d:%d:%d in new leaf %lu\n",
-+				path[depth].p_ext->e_block,
-+				path[depth].p_ext->e_start,
-+				path[depth].p_ext->e_num,
-+				newblock);
-+		memmove(ex++, path[depth].p_ext++,
-+				sizeof(struct ext3_extent));
-+		neh->e_num++;
-+		m++;
-+	}
-+	mark_buffer_uptodate(bh, 1);
-+	unlock_buffer(bh);
-+
-+	if ((err = ext3_journal_dirty_metadata(handle, bh)))
-+		goto cleanup;	
-+	brelse(bh);
-+	bh = NULL;
-+
-+	/* correct old leaf */
-+	if (m) {
-+		if ((err = ext3_ext_get_access(handle, tree, path + depth)))
-+			goto cleanup;
-+		path[depth].p_hdr->e_num -= m;
-+		if ((err = ext3_ext_dirty(handle, tree, path + depth)))
-+			goto cleanup;
-+		
-+	}
-+
-+	/* create intermediate indexes */
-+	k = depth - at - 1;
-+	EXT_ASSERT(k >= 0);
-+	if (k)
-+		ext_debug(tree,	"create %d intermediate indices\n", k);
-+	/* insert new index into current index block */
-+	/* current depth stored in i var */
-+	i = depth - 1;
-+	while (k--) {
-+		oldblock = newblock;
-+		newblock = ablocks[--a];
-+		bh = sb_getblk(tree->inode->i_sb, newblock);
-+		if (!bh) {
-+			err = -EIO;
-+			goto cleanup;
-+		}
-+		lock_buffer(bh);
-+
-+		if ((err = ext3_journal_get_create_access(handle, bh)))
-+			goto cleanup;
-+
-+		neh = EXT_BLOCK_HDR(bh);
-+		neh->e_num = 1;
-+		neh->e_magic = EXT3_EXT_MAGIC;
-+		neh->e_max = ext3_ext_space_block_idx(tree);
-+		neh->e_depth = depth - i; 
-+		fidx = EXT_FIRST_INDEX(neh);
-+		fidx->e_block = border;
-+		fidx->e_leaf = oldblock;
-+
-+		ext_debug(tree,	"int.index at %d (block %lu): %lu -> %lu\n",
-+				i, newblock, border, oldblock);
-+		/* copy indexes */
-+		m = 0;
-+		path[i].p_idx++;
-+
-+		ext_debug(tree, "cur 0x%p, last 0x%p\n", path[i].p_idx,
-+				EXT_MAX_INDEX(path[i].p_hdr));
-+		EXT_ASSERT(EXT_MAX_INDEX(path[i].p_hdr) ==
-+				EXT_LAST_INDEX(path[i].p_hdr));
-+		while (path[i].p_idx <= EXT_MAX_INDEX(path[i].p_hdr)) {
-+			ext_debug(tree, "%d: move %d:%d in new index %lu\n",
-+					i, path[i].p_idx->e_block,
-+					path[i].p_idx->e_leaf, newblock);
-+			memmove(++fidx, path[i].p_idx++,
-+					sizeof(struct ext3_extent_idx));
-+			neh->e_num++;
-+			EXT_ASSERT(neh->e_num <= neh->e_max);
-+			m++;
-+		}
-+		mark_buffer_uptodate(bh, 1);
-+		unlock_buffer(bh);
-+
-+		if ((err = ext3_journal_dirty_metadata(handle, bh)))
-+			goto cleanup;
-+		brelse(bh);
-+		bh = NULL;
-+
-+		/* correct old index */
-+		if (m) {
-+			err = ext3_ext_get_access(handle, tree, path + i);
-+			if (err)
-+				goto cleanup;
-+			path[i].p_hdr->e_num -= m;
-+			err = ext3_ext_dirty(handle, tree, path + i);
-+			if (err)
-+				goto cleanup;
-+		}
-+
-+		i--;
-+	}
-+
-+	/* insert new index */
-+	if (!err)
-+		err = ext3_ext_insert_index(handle, tree, path + at,
-+						border, newblock);
-+
-+cleanup:
-+	if (bh) {
-+		if (buffer_locked(bh))
-+			unlock_buffer(bh);
-+		brelse(bh);
-+	}
-+
-+	if (err) {
-+		/* free all allocated blocks in error case */
-+		for (i = 0; i < depth; i++)
-+			if (!ablocks[i])
-+				continue;
-+			ext3_free_blocks(handle, tree->inode, ablocks[i], 1);
-+	}
-+	kfree(ablocks);
-+
-+	return err;
-+}
-+
-+/*
-+ * routine implements tree growing procedure:
-+ *  - allocates new block
-+ *  - moves top-level data (index block or leaf) into the new block
-+ *  - initialize new top-level, creating index that points to the
-+ *    just created block
-+ */
-+static int ext3_ext_grow_indepth(handle_t *handle,
-+					struct ext3_extents_tree *tree,
-+					struct ext3_ext_path *path,
-+					struct ext3_extent *newext)
-+{
-+	struct ext3_ext_path *curp = path;
-+	struct ext3_extent_header *neh;
-+	struct ext3_extent_idx *fidx;
-+	struct buffer_head *bh;
-+	unsigned long newblock;
-+	int err = 0;
-+
-+	newblock = ext3_ext_new_block(handle, tree, path, newext, &err);
-+	if (newblock == 0)
-+		return err;
-+
-+	bh = sb_getblk(tree->inode->i_sb, newblock);
-+	if (!bh) {
-+		err = -EIO;
-+		ext3_std_error(tree->inode->i_sb, err);
-+		return err;
-+	}
-+	lock_buffer(bh);
-+
-+	if ((err = ext3_journal_get_create_access(handle, bh))) {
-+		unlock_buffer(bh);
-+		goto out;	
-+	}
-+
-+	/* move top-level index/leaf into new block */
-+	memmove(bh->b_data, curp->p_hdr, tree->buffer_len);
-+
-+	/* set size of new block */
-+	neh = EXT_BLOCK_HDR(bh);
-+	/* old root could have indexes or leaves
-+	 * so calculate e_max right way */
-+	if (EXT_DEPTH(tree))
-+		neh->e_max = ext3_ext_space_block_idx(tree);
-+	else
-+		neh->e_max = ext3_ext_space_block(tree);
-+	neh->e_magic = EXT3_EXT_MAGIC;
-+	mark_buffer_uptodate(bh, 1);
-+	unlock_buffer(bh);
-+
-+	if ((err = ext3_journal_dirty_metadata(handle, bh)))
-+		goto out;
-+
-+	/* create index in new top-level index: num,max,pointer */
-+	if ((err = ext3_ext_get_access(handle, tree, curp)))
-+		goto out;
-+
-+	curp->p_hdr->e_magic = EXT3_EXT_MAGIC;
-+	curp->p_hdr->e_max = ext3_ext_space_root_idx(tree);
-+	curp->p_hdr->e_num = 1;
-+	curp->p_idx = EXT_FIRST_INDEX(curp->p_hdr);
-+	/* FIXME: it works, but actually path[0] can be index */
-+	curp->p_idx->e_block = EXT_FIRST_EXTENT(path[0].p_hdr)->e_block;
-+	curp->p_idx->e_leaf = newblock;
-+
-+	neh = EXT_ROOT_HDR(tree);
-+	fidx = EXT_FIRST_INDEX(neh);
-+	ext_debug(tree, "new root: num %d(%d), lblock %d, ptr %d\n",
-+			neh->e_num, neh->e_max, fidx->e_block, fidx->e_leaf); 
-+
-+	neh->e_depth = path->p_depth + 1;
-+	err = ext3_ext_dirty(handle, tree, curp);
-+out:
-+	brelse(bh);
-+
-+	return err;
-+}
-+
-+/*
-+ * routine finds empty index and adds new leaf. if no free index found
-+ * then it requests in-depth growing
-+ */
-+static int ext3_ext_create_new_leaf(handle_t *handle,
-+					struct ext3_extents_tree *tree,
-+					struct ext3_ext_path *path,
-+					struct ext3_extent *newext)
-+{
-+	struct ext3_ext_path *curp;
-+	int depth, i, err = 0;
-+
-+repeat:
-+	i = depth = EXT_DEPTH(tree);
-+	
-+	/* walk up to the tree and look for free index entry */
-+	curp = path + depth;
-+	while (i > 0 && !EXT_HAS_FREE_INDEX(curp)) {
-+		i--;
-+		curp--;
-+	}
-+
-+	/* we use already allocated block for index block
-+	 * so, subsequent data blocks should be contigoues */
-+	if (EXT_HAS_FREE_INDEX(curp)) {
-+		/* if we found index with free entry, then use that
-+		 * entry: create all needed subtree and add new leaf */
-+		err = ext3_ext_split(handle, tree, path, newext, i);
-+
-+		/* refill path */
-+		ext3_ext_drop_refs(path);
-+		path = ext3_ext_find_extent(tree, newext->e_block, path);
-+		if (IS_ERR(path))
-+			err = PTR_ERR(path);
-+	} else {
-+		/* tree is full, time to grow in depth */
-+		err = ext3_ext_grow_indepth(handle, tree, path, newext);
-+
-+		/* refill path */
-+		ext3_ext_drop_refs(path);
-+		path = ext3_ext_find_extent(tree, newext->e_block, path);
-+		if (IS_ERR(path))
-+			err = PTR_ERR(path);
-+
-+		/*
-+		 * only first (depth 0 -> 1) produces free space
-+		 * in all other cases we have to split growed tree
-+		 */
-+		depth = EXT_DEPTH(tree);
-+		if (path[depth].p_hdr->e_num == path[depth].p_hdr->e_max) {
-+			/* now we need split */
-+			goto repeat;
-+		}
-+	}
-+
-+	if (err)
-+		return err;
-+
-+	return 0;
-+}
-+
-+/*
-+ * returns allocated block in subsequent extent or 0xffffffff
-+ * NOTE: it consider block number from index entry as
-+ * allocated block. thus, index entries have to be consistent
-+ * with leafs
-+ */
-+static unsigned long
-+ext3_ext_next_allocated_block(struct ext3_ext_path *path)
-+{
-+	int depth;
-+
-+	EXT_ASSERT(path != NULL);
-+	depth = path->p_depth;
-+
-+	if (depth == 0 && path->p_ext == NULL)
-+		return 0xffffffff;
-+
-+	/* FIXME: what if index isn't full ?! */
-+	while (depth >= 0) {
-+		if (depth == path->p_depth) {
-+			/* leaf */
-+			if (path[depth].p_ext !=
-+					EXT_LAST_EXTENT(path[depth].p_hdr))
-+				return path[depth].p_ext[1].e_block;
-+		} else {
-+			/* index */
-+			if (path[depth].p_idx !=
-+					EXT_LAST_INDEX(path[depth].p_hdr))
-+				return path[depth].p_idx[1].e_block;
-+		}
-+		depth--;        
-+	}
-+
-+	return 0xffffffff;
-+}
-+
-+/*
-+ * returns first allocated block from next leaf or 0xffffffff
-+ */
-+static unsigned ext3_ext_next_leaf_block(struct ext3_extents_tree *tree,
-+                                               struct ext3_ext_path *path)
-+{
-+	int depth;
-+
-+	EXT_ASSERT(path != NULL);
-+	depth = path->p_depth;
-+
-+	/* zero-tree has no leaf blocks at all */
-+	if (depth == 0)
-+		return 0xffffffff;
-+
-+	/* go to index block */
-+	depth--;
-+	
-+	while (depth >= 0) {
-+		if (path[depth].p_idx !=
-+				EXT_LAST_INDEX(path[depth].p_hdr))
-+			return path[depth].p_idx[1].e_block;
-+		depth--;        
-+	}
-+
-+	return 0xffffffff;
-+}
-+
-+/*
-+ * if leaf gets modified and modified extent is first in the leaf
-+ * then we have to correct all indexes above
-+ * TODO: do we need to correct tree in all cases?
-+ */
-+int ext3_ext_correct_indexes(handle_t *handle, struct ext3_extents_tree *tree,
-+				struct ext3_ext_path *path)
-+{
-+	struct ext3_extent_header *eh;
-+	int depth = EXT_DEPTH(tree);	
-+	struct ext3_extent *ex;
-+	unsigned long border;
-+	int k, err = 0;
-+	
-+	eh = path[depth].p_hdr;
-+	ex = path[depth].p_ext;
-+	EXT_ASSERT(ex);
-+	EXT_ASSERT(eh);
-+	
-+	if (depth == 0) {
-+		/* there is no tree at all */
-+		return 0;
-+	}
-+	
-+	if (ex != EXT_FIRST_EXTENT(eh)) {
-+		/* we correct tree if first leaf got modified only */
-+		return 0;
-+	}
-+	
-+	/*
-+	 * TODO: we need correction if border is smaller then current one
-+	 */
-+	k = depth - 1;
-+	border = path[depth].p_ext->e_block;
-+	if ((err = ext3_ext_get_access(handle, tree, path + k)))
-+		return err;
-+	path[k].p_idx->e_block = border;
-+	if ((err = ext3_ext_dirty(handle, tree, path + k)))
-+		return err;
-+
-+	while (k--) {
-+		/* change all left-side indexes */
-+		if (path[k+1].p_idx != EXT_FIRST_INDEX(path[k+1].p_hdr))
-+			break;
-+		if ((err = ext3_ext_get_access(handle, tree, path + k)))
-+			break;
-+		path[k].p_idx->e_block = border;
-+		if ((err = ext3_ext_dirty(handle, tree, path + k)))
-+			break;
-+	}
-+
-+	return err;
-+}
-+
-+static int inline
-+ext3_can_extents_be_merged(struct ext3_extents_tree *tree,
-+				struct ext3_extent *ex1,
-+				struct ext3_extent *ex2)
-+{
-+	if (ex1->e_block + ex1->e_num != ex2->e_block)
-+		return 0;
-+
-+#ifdef AGRESSIVE_TEST
-+	if (ex1->e_num >= 4)
-+		return 0;
-+#endif
-+
-+	if (!tree->mergable)
-+		return 1;
-+
-+	return tree->mergable(ex1, ex2);
-+}
-+
-+/*
-+ * this routine tries to merge requsted extent into the existing
-+ * extent or inserts requested extent as new one into the tree,
-+ * creating new leaf in no-space case
-+ */
-+int ext3_ext_insert_extent(handle_t *handle, struct ext3_extents_tree *tree,
-+				struct ext3_ext_path *path,
-+				struct ext3_extent *newext)
-+{
-+	struct ext3_extent_header * eh;
-+	struct ext3_extent *ex, *fex;
-+	struct ext3_extent *nearex; /* nearest extent */
-+	struct ext3_ext_path *npath = NULL;
-+	int depth, len, err, next;
-+
-+	depth = EXT_DEPTH(tree);
-+	ex = path[depth].p_ext;
-+	EXT_ASSERT(path[depth].p_hdr);
-+
-+	/* try to insert block into found extent and return */
-+	if (ex && ext3_can_extents_be_merged(tree, ex, newext)) {
-+		ext_debug(tree, "append %d block to %d:%d (from %d)\n",
-+				newext->e_num, ex->e_block, ex->e_num,
-+				ex->e_start);
-+		if ((err = ext3_ext_get_access(handle, tree, path + depth)))
-+			return err;
-+		ex->e_num += newext->e_num;
-+		eh = path[depth].p_hdr;
-+		nearex = ex;
-+		goto merge;
-+	}
-+
-+repeat:
-+	depth = EXT_DEPTH(tree);
-+	eh = path[depth].p_hdr;
-+	if (eh->e_num < eh->e_max)
-+		goto has_space;
-+
-+	/* probably next leaf has space for us? */
-+	fex = EXT_LAST_EXTENT(eh);
-+	next = ext3_ext_next_leaf_block(tree, path);
-+	if (newext->e_block > fex->e_block && next != 0xffffffff) {
-+		ext_debug(tree, "next leaf block - %d\n", next);
-+		EXT_ASSERT(!npath);
-+		npath = ext3_ext_find_extent(tree, next, NULL);
-+		if (IS_ERR(npath))
-+			return PTR_ERR(npath);
-+		EXT_ASSERT(npath->p_depth == path->p_depth);
-+		eh = npath[depth].p_hdr;
-+		if (eh->e_num < eh->e_max) {
-+			ext_debug(tree,	"next leaf isnt full(%d)\n",
-+					eh->e_num);
-+			path = npath;
-+			goto repeat;
-+		}
-+		ext_debug(tree, "next leaf hasno free space(%d,%d)\n",
-+				eh->e_num, eh->e_max);
-+	}
-+
-+	/*
-+	 * there is no free space in found leaf
-+	 * we're gonna add new leaf in the tree
-+	 */
-+	err = ext3_ext_create_new_leaf(handle, tree, path, newext);
-+	if (err)
-+		goto cleanup;
-+	depth = EXT_DEPTH(tree);
-+	eh = path[depth].p_hdr;
-+
-+has_space:
-+	nearex = path[depth].p_ext;
-+
-+	if ((err = ext3_ext_get_access(handle, tree, path + depth)))
-+		goto cleanup;
-+
-+	if (!nearex) {
-+		/* there is no extent in this leaf, create first one */
-+		ext_debug(tree, "first extent in the leaf: %d:%d:%d\n",
-+				newext->e_block, newext->e_start,
-+				newext->e_num);
-+		path[depth].p_ext = EXT_FIRST_EXTENT(eh);
-+	} else if (newext->e_block > nearex->e_block) {
-+		EXT_ASSERT(newext->e_block != nearex->e_block);
-+		if (nearex != EXT_LAST_EXTENT(eh)) {
-+			len = EXT_MAX_EXTENT(eh) - nearex;
-+			len = (len - 1) * sizeof(struct ext3_extent);
-+			len = len < 0 ? 0 : len;
-+			ext_debug(tree, "insert %d:%d:%d after: nearest 0x%p, "
-+					"move %d from 0x%p to 0x%p\n",
-+					newext->e_block, newext->e_start,
-+					newext->e_num,
-+					nearex, len, nearex + 1, nearex + 2);
-+			memmove(nearex + 2, nearex + 1, len);
-+		}
-+		path[depth].p_ext = nearex + 1;
-+	} else {
-+		EXT_ASSERT(newext->e_block != nearex->e_block);
-+		len = (EXT_MAX_EXTENT(eh) - nearex) * sizeof(struct ext3_extent);
-+		len = len < 0 ? 0 : len;
-+		ext_debug(tree, "insert %d:%d:%d before: nearest 0x%p, "
-+				"move %d from 0x%p to 0x%p\n",
-+				newext->e_block, newext->e_start, newext->e_num,
-+				nearex, len, nearex + 1, nearex + 2);
-+		memmove(nearex + 1, nearex, len);
-+		path[depth].p_ext = nearex;
-+	}
-+
-+	eh->e_num++;
-+	nearex = path[depth].p_ext;
-+	nearex->e_block = newext->e_block;
-+	nearex->e_start = newext->e_start;
-+	nearex->e_num = newext->e_num;
-+
-+merge:
-+	/* try to merge extents to the right */
-+	while (nearex < EXT_LAST_EXTENT(eh)) {
-+		if (!ext3_can_extents_be_merged(tree, nearex, nearex + 1))
-+			break;
-+		/* merge with next extent! */
-+		nearex->e_num += nearex[1].e_num;
-+		if (nearex + 1 < EXT_LAST_EXTENT(eh)) {
-+			len = (EXT_LAST_EXTENT(eh) - nearex - 1)
-+					* sizeof(struct ext3_extent);
-+			memmove(nearex + 1, nearex + 2, len);
-+		}
-+		eh->e_num--;
-+		EXT_ASSERT(eh->e_num > 0);
-+	}
-+
-+	/* try to merge extents to the left */
-+
-+	/* time to correct all indexes above */
-+	err = ext3_ext_correct_indexes(handle, tree, path);
-+	if (err)
-+		goto cleanup;
-+
-+	err = ext3_ext_dirty(handle, tree, path + depth);
-+
-+cleanup:
-+	if (npath) {
-+		ext3_ext_drop_refs(npath);
-+		kfree(npath);
-+	}
-+	ext3_ext_tree_changed(tree);
-+	return err;
-+}
-+
-+int ext3_ext_walk_space(struct ext3_extents_tree *tree, unsigned long block,
-+			unsigned long num, ext_prepare_callback func)
-+{
-+	struct ext3_ext_path *path = NULL;
-+	struct ext3_extent *ex, cbex;
-+	unsigned long next, start = 0, end = 0;
-+	unsigned long last = block + num;
-+	int depth, exists, err = 0;
-+
-+	EXT_ASSERT(tree);
-+	EXT_ASSERT(func);
-+	EXT_ASSERT(tree->inode);
-+	EXT_ASSERT(tree->root);
-+
-+	while (block < last && block != 0xfffffffff) {
-+		num = last - block;
-+		/* find extent for this block */
-+		path = ext3_ext_find_extent(tree, block, path);
-+		if (IS_ERR(path)) {
-+			err = PTR_ERR(path);
-+			path = NULL;
-+			break;
-+		}
-+
-+		depth = EXT_DEPTH(tree);
-+		EXT_ASSERT(path[depth].p_hdr);
-+		ex = path[depth].p_ext;
-+		next = ext3_ext_next_allocated_block(path);
-+
-+		exists = 0;
-+		if (!ex) {
-+			/* there is no extent yet, so try to allocate
-+			 * all requested space */
-+			start = block;
-+			end = block + num;
-+		} else if (ex->e_block > block) {
-+			/* need to allocate space before found extent */
-+			start = block;
-+			end = ex->e_block;
-+			if (block + num < end)
-+				end = block + num;
-+		} else if (block >= ex->e_block + ex->e_num) {
-+			/* need to allocate space after found extent */
-+			start = block;
-+			end = block + num;
-+			if (end >= next)
-+				end = next;
-+		} else if (block >= ex->e_block) {
-+			/* 
-+			 * some part of requested space is covered
-+			 * by found extent
-+			 */
-+			start = block;
-+			end = ex->e_block + ex->e_num;
-+			if (block + num < end)
-+				end = block + num;
-+			exists = 1;
-+		} else {
-+			BUG();
-+		}
-+		EXT_ASSERT(end > start);
-+
-+		if (!exists) {
-+			cbex.e_block = start;
-+			cbex.e_num = end - start;
-+			cbex.e_start = 0;
-+		} else
-+			cbex = *ex;
-+
-+		EXT_ASSERT(path[depth].p_hdr);
-+		err = func(tree, path, &cbex, exists);
-+		ext3_ext_drop_refs(path);
-+
-+		if (err < 0)
-+			break;
-+		if (err == EXT_REPEAT)
-+			continue;
-+		else if (err == EXT_BREAK) {
-+			err = 0;
-+			break;
-+		}
-+
-+		if (EXT_DEPTH(tree) != depth) {
-+			/* depth was changed. we have to realloc path */
-+			kfree(path);
-+			path = NULL;
-+		}
-+
-+		block = cbex.e_block + cbex.e_num;
-+	}
-+
-+	if (path) {
-+		ext3_ext_drop_refs(path);
-+		kfree(path);
-+	}
-+
-+	return err;
-+}
-+
-+void ext3_ext_invalidate_cache(struct ext3_extents_tree *tree)
-+{
-+	if (tree->cex)
-+		tree->cex->e_num = 0;
-+}
-+
-+static inline void
-+ext3_ext_put_in_cache(struct ext3_extents_tree *tree, struct ext3_extent *ex)
-+{
-+	if (tree->cex) {
-+		EXT_ASSERT(ex);
-+		EXT_ASSERT(ex->e_num);
-+		tree->cex->e_block = ex->e_block;
-+		tree->cex->e_start = ex->e_start;
-+		tree->cex->e_num = ex->e_num;
-+	}
-+}
-+
-+/*
-+ * this routine calculate boundaries of the gap requested block fits into
-+ * and cache this gap
-+ */
-+static inline void
-+ext3_ext_put_gap_in_cache(struct ext3_extents_tree *tree,
-+				struct ext3_ext_path *path,
-+				unsigned long block)
-+{
-+	int depth = EXT_DEPTH(tree);
-+	struct ext3_extent *ex, gex;
-+
-+	if (!tree->cex)
-+		return;
-+
-+	ex = path[depth].p_ext;
-+	if (ex == NULL) {
-+		/* there is no extent yet, so gap is [0;-] */
-+		gex.e_block = 0;
-+		gex.e_num = 0xffffffff;
-+		ext_debug(tree, "cache gap(whole file):");
-+	} else if (block < ex->e_block) {
-+		gex.e_block = block;
-+		gex.e_num = ex->e_block - block;
-+		ext_debug(tree, "cache gap(before): %lu [%lu:%lu]",
-+				(unsigned long) block,
-+				(unsigned long) ex->e_block,
-+				(unsigned long) ex->e_num);
-+	} else if (block >= ex->e_block + ex->e_num) {
-+		gex.e_block = ex->e_block + ex->e_num;
-+		gex.e_num = ext3_ext_next_allocated_block(path);
-+		ext_debug(tree, "cache gap(after): [%lu:%lu] %lu",
-+				(unsigned long) ex->e_block,
-+				(unsigned long) ex->e_num,
-+				(unsigned long) block);
-+		EXT_ASSERT(gex.e_num > gex.e_block);
-+		gex.e_num = gex.e_num - gex.e_block;
-+	} else {
-+		BUG();
-+	}
-+
-+	ext_debug(tree, " -> %lu:%lu\n", (unsigned long) gex.e_block,
-+			(unsigned long) gex.e_num);
-+	gex.e_start = 0xffffffff;
-+	ext3_ext_put_in_cache(tree, &gex);
-+}
-+
-+static inline int
-+ext3_ext_in_cache(struct ext3_extents_tree *tree, unsigned long block,
-+			struct ext3_extent *ex)
-+{
-+	struct ext3_extent *cex = tree->cex;
-+
-+	/* is there cache storage at all? */
-+	if (!cex)
-+		return 0;
-+
-+	/* has cache valid data? */
-+	if (cex->e_num == 0)
-+		return 0;
-+
-+	if (block >= cex->e_block && block < cex->e_block + cex->e_num) {
-+		ex->e_block = cex->e_block;
-+		ex->e_start = cex->e_start;
-+		ex->e_num = cex->e_num;
-+		ext_debug(tree, "%lu cached by %lu:%lu:%lu\n",
-+				(unsigned long) block,
-+				(unsigned long) ex->e_block,
-+				(unsigned long) ex->e_num,
-+				(unsigned long) ex->e_start);
-+		return 1;
-+	}
-+
-+	/* not in cache */
-+	return 0;
-+}
-+
-+/*
-+ * routine removes index from the index block
-+ * it's used in truncate case only. thus all requests are for
-+ * last index in the block only
-+ */
-+int ext3_ext_rm_idx(handle_t *handle, struct ext3_extents_tree *tree,
-+			struct ext3_ext_path *path)
-+{
-+	struct buffer_head *bh;
-+	int err;
-+	
-+	/* free index block */
-+	path--;
-+	EXT_ASSERT(path->p_hdr->e_num);
-+	if ((err = ext3_ext_get_access(handle, tree, path)))
-+		return err;
-+	path->p_hdr->e_num--;
-+	if ((err = ext3_ext_dirty(handle, tree, path)))
-+		return err;
-+	ext_debug(tree, "index is empty, remove it, free block %d\n",
-+			path->p_idx->e_leaf);
-+	bh = sb_get_hash_table(tree->inode->i_sb, path->p_idx->e_leaf);
-+	ext3_forget(handle, 1, tree->inode, bh, path->p_idx->e_leaf);
-+	ext3_free_blocks(handle, tree->inode, path->p_idx->e_leaf, 1);
-+	return err;
-+}
-+
-+int ext3_ext_calc_credits_for_insert(struct ext3_extents_tree *tree,
-+					struct ext3_ext_path *path)
-+{
-+	int depth = EXT_DEPTH(tree);
-+	int needed;
-+
-+	if (path) {
-+		/* probably there is space in leaf? */
-+		if (path[depth].p_hdr->e_num < path[depth].p_hdr->e_max)
-+			return 1;
-+	}
-+	
-+	/*
-+	 * the worste case we're expecting is creation of the
-+	 * new root (growing in depth) with index splitting
-+	 * for splitting we have to consider depth + 1 because
-+	 * previous growing could increase it
-+	 */
-+	depth = depth + 1;
-+
-+	/* 
-+	 * growing in depth:
-+	 * block allocation + new root + old root
-+	 */
-+	needed = EXT3_ALLOC_NEEDED + 2;
-+
-+	/* index split. we may need:
-+	 *   allocate intermediate indexes and new leaf
-+	 *   change two blocks at each level, but root
-+	 *   modify root block (inode)
-+	 */
-+	needed += (depth * EXT3_ALLOC_NEEDED) + (2 * depth) + 1;
-+
-+	return needed;
-+}
-+
-+static int
-+ext3_ext_split_for_rm(handle_t *handle, struct ext3_extents_tree *tree,
-+			struct ext3_ext_path *path, unsigned long start,
-+			unsigned long end)
-+{
-+	struct ext3_extent *ex, tex;
-+	struct ext3_ext_path *npath;
-+	int depth, creds, err;
-+
-+	depth = EXT_DEPTH(tree);
-+	ex = path[depth].p_ext;
-+	EXT_ASSERT(ex);
-+	EXT_ASSERT(end < ex->e_block + ex->e_num - 1);
-+	EXT_ASSERT(ex->e_block < start);
-+
-+	/* calculate tail extent */
-+	tex.e_block = end + 1;
-+	EXT_ASSERT(tex.e_block < ex->e_block + ex->e_num);
-+	tex.e_num = ex->e_block + ex->e_num - tex.e_block;
-+
-+	creds = ext3_ext_calc_credits_for_insert(tree, path);
-+	handle = ext3_ext_journal_restart(handle, creds);
-+	if (IS_ERR(handle))
-+		return PTR_ERR(handle);
-+	
-+	/* calculate head extent. use primary extent */
-+	err = ext3_ext_get_access(handle, tree, path + depth);
-+	if (err)
-+		return err;
-+	ex->e_num = start - ex->e_block;
-+	err = ext3_ext_dirty(handle, tree, path + depth);
-+	if (err)
-+		return err;
-+
-+	/* FIXME: some callback to free underlying resource
-+	 * and correct e_start? */
-+	ext_debug(tree, "split extent: head %u:%u, tail %u:%u\n",
-+			ex->e_block, ex->e_num, tex.e_block, tex.e_num);
-+
-+	npath = ext3_ext_find_extent(tree, ex->e_block, NULL);
-+	if (IS_ERR(npath))
-+		return PTR_ERR(npath);
-+	depth = EXT_DEPTH(tree);
-+	EXT_ASSERT(npath[depth].p_ext->e_block == ex->e_block);
-+	EXT_ASSERT(npath[depth].p_ext->e_num == ex->e_num);
-+
-+	err = ext3_ext_insert_extent(handle, tree, npath, &tex);
-+	ext3_ext_drop_refs(npath);
-+	kfree(npath);
-+
-+	return err;
-+			
-+}
-+
-+static int
-+ext3_ext_rm_leaf(handle_t *handle, struct ext3_extents_tree *tree,
-+			struct ext3_ext_path *path, unsigned long start,
-+			unsigned long end)
-+{
-+	struct ext3_extent *ex, *fu = NULL, *lu, *le;
-+	int err = 0, correct_index = 0;
-+	int depth = EXT_DEPTH(tree), credits;
-+	struct ext3_extent_header *eh;
-+	unsigned a, b, block, num;
-+
-+	ext_debug(tree, "remove [%lu:%lu] in leaf\n", start, end);
-+	if (!path[depth].p_hdr)
-+		path[depth].p_hdr = EXT_BLOCK_HDR(path[depth].p_bh);
-+	eh = path[depth].p_hdr;
-+	EXT_ASSERT(eh);
-+	EXT_ASSERT(eh->e_num <= eh->e_max);
-+	EXT_ASSERT(eh->e_magic == EXT3_EXT_MAGIC);
-+	
-+	/* find where to start removing */
-+	le = ex = EXT_LAST_EXTENT(eh);
-+	while (ex != EXT_FIRST_EXTENT(eh)) {
-+		if (ex->e_block <= end)
-+			break;
-+		ex--;
-+	}
-+
-+	if (start > ex->e_block && end < ex->e_block + ex->e_num - 1) {
-+		/* removal of internal part of the extent requested
-+		 * tail and head must be placed in different extent
-+		 * so, we have to insert one more extent */
-+		path[depth].p_ext = ex;
-+		return ext3_ext_split_for_rm(handle, tree, path, start, end);
-+	}
-+	
-+	lu = ex;
-+	while (ex >= EXT_FIRST_EXTENT(eh) &&
-+			ex->e_block + ex->e_num > start) {
-+		ext_debug(tree, "remove ext %u:%u\n", ex->e_block, ex->e_num);
-+		path[depth].p_ext = ex;
-+	
-+		a = ex->e_block > start ? ex->e_block : start;
-+		b = ex->e_block + ex->e_num - 1 < end ?
-+			ex->e_block + ex->e_num - 1 : end;
-+		
-+		ext_debug(tree, "  border %u:%u\n", a, b);
-+
-+		if (a != ex->e_block && b != ex->e_block + ex->e_num - 1) {
-+			block = 0;
-+			num = 0;
-+			BUG();
-+		} else if (a != ex->e_block) {
-+			/* remove tail of the extent */
-+			block = ex->e_block;
-+			num = a - block;
-+		} else if (b != ex->e_block + ex->e_num - 1) {
-+			/* remove head of the extent */
-+			block = a;
-+			num = b - a;
-+		} else {
-+			/* remove whole extent: excelent! */
-+			block = ex->e_block; 
-+			num = 0;
-+			EXT_ASSERT(a == ex->e_block &&
-+					b == ex->e_block + ex->e_num - 1);
-+		}
-+
-+		if (ex == EXT_FIRST_EXTENT(eh))
-+			correct_index = 1;
-+
-+		credits = 1;
-+		if (correct_index)
-+			credits += (EXT_DEPTH(tree) * EXT3_ALLOC_NEEDED) + 1;
-+		if (tree->remove_extent_credits)
-+			credits += tree->remove_extent_credits(tree, ex, a, b);
-+		
-+		handle = ext3_ext_journal_restart(handle, credits);
-+		if (IS_ERR(handle)) {
-+			err = PTR_ERR(handle);
-+			goto out;
-+		}
-+
-+		err = ext3_ext_get_access(handle, tree, path + depth);
-+		if (err)
-+			goto out;
-+
-+		if (tree->remove_extent)
-+			err = tree->remove_extent(tree, ex, a, b);
-+		if (err)
-+			goto out;
-+
-+		if (num == 0) {
-+			/* this extent is removed entirely mark slot unused */
-+			ex->e_start = 0;
-+			eh->e_num--;
-+			fu = ex;
-+		}
-+
-+		ex->e_block = block;
-+		ex->e_num = num;
-+
-+		err = ext3_ext_dirty(handle, tree, path + depth);
-+		if (err)
-+			goto out;
-+
-+		ext_debug(tree, "new extent: %u:%u:%u\n",
-+				ex->e_block, ex->e_num, ex->e_start);
-+		ex--;
-+	}
-+
-+	if (fu) {
-+		/* reuse unused slots */
-+		while (lu < le) {
-+			if (lu->e_start) {
-+				*fu = *lu;
-+				lu->e_start = 0;
-+				fu++;
-+			}
-+			lu++;
-+		}
-+	}
-+
-+	if (correct_index && eh->e_num)
-+		err = ext3_ext_correct_indexes(handle, tree, path);
-+
-+	/* if this leaf is free, then we should
-+	 * remove it from index block above */
-+	if (err == 0 && eh->e_num == 0 && path[depth].p_bh != NULL)
-+		err = ext3_ext_rm_idx(handle, tree, path + depth);
-+
-+out:
-+	return err;
-+}
-+
-+
-+static struct ext3_extent_idx *
-+ext3_ext_last_covered(struct ext3_extent_header *hdr, unsigned long block)
-+{
-+	struct ext3_extent_idx *ix;
-+	
-+	ix = EXT_LAST_INDEX(hdr);
-+	while (ix != EXT_FIRST_INDEX(hdr)) {
-+		if (ix->e_block <= block)
-+			break;
-+		ix--;
-+	}
-+	return ix;
-+}
-+
-+/*
-+ * returns 1 if current index have to be freed (even partial)
-+ */
-+static int inline
-+ext3_ext_more_to_rm(struct ext3_ext_path *path)
-+{
-+	EXT_ASSERT(path->p_idx);
-+
-+	if (path->p_idx < EXT_FIRST_INDEX(path->p_hdr))
-+		return 0;
-+
-+	/*
-+	 * if truncate on deeper level happened it it wasn't partial
-+	 * so we have to consider current index for truncation
-+	 */
-+	if (path->p_hdr->e_num == path->p_block)
-+		return 0;
-+	return 1;
-+}
-+
-+int ext3_ext_remove_space(struct ext3_extents_tree *tree,
-+				unsigned long start, unsigned long end)
-+{
-+	struct inode *inode = tree->inode;
-+	struct super_block *sb = inode->i_sb;
-+	int depth = EXT_DEPTH(tree);
-+	struct ext3_ext_path *path;
-+	handle_t *handle;
-+	int i = 0, err = 0;
-+
-+	ext_debug(tree, "space to be removed: %lu:%lu\n", start, end);
-+
-+	/* probably first extent we're gonna free will be last in block */
-+	handle = ext3_journal_start(inode, depth + 1);
-+	if (IS_ERR(handle))
-+		return PTR_ERR(handle);
-+
-+	ext3_ext_invalidate_cache(tree);
-+
-+	/*
-+	 * we start scanning from right side freeing all the blocks
-+	 * after i_size and walking into the deep
-+	 */
-+	path = kmalloc(sizeof(struct ext3_ext_path) * (depth + 1), GFP_KERNEL);
-+	if (IS_ERR(path)) {
-+		ext3_error(sb, "ext3_ext_remove_space",
-+				"Can't allocate path array");
-+		ext3_journal_stop(handle, inode);
-+		return -ENOMEM;
-+	}
-+	memset(path, 0, sizeof(struct ext3_ext_path) * (depth + 1));
-+	path[i].p_hdr = EXT_ROOT_HDR(tree);
-+	
-+	while (i >= 0 && err == 0) {
-+		if (i == depth) {
-+			/* this is leaf block */
-+			err = ext3_ext_rm_leaf(handle, tree, path, start, end);
-+			/* root level have p_bh == NULL, brelse() eats this */
-+			brelse(path[i].p_bh);
-+			i--;
-+			continue;
-+		}
-+		
-+		/* this is index block */
-+		if (!path[i].p_hdr) {
-+			ext_debug(tree, "initialize header\n");
-+			path[i].p_hdr = EXT_BLOCK_HDR(path[i].p_bh);
-+		}
-+
-+		EXT_ASSERT(path[i].p_hdr->e_num <= path[i].p_hdr->e_max);
-+		EXT_ASSERT(path[i].p_hdr->e_magic == EXT3_EXT_MAGIC);
-+		
-+		if (!path[i].p_idx) {
-+			/* this level hasn't touched yet */
-+			path[i].p_idx =
-+				ext3_ext_last_covered(path[i].p_hdr, end);
-+			path[i].p_block = path[i].p_hdr->e_num + 1;
-+			ext_debug(tree, "init index ptr: hdr 0x%p, num %d\n",
-+					path[i].p_hdr, path[i].p_hdr->e_num);
-+		} else {
-+			/* we've already was here, see at next index */
-+			path[i].p_idx--;
-+		}
-+
-+		ext_debug(tree, "level %d - index, first 0x%p, cur 0x%p\n",
-+				i, EXT_FIRST_INDEX(path[i].p_hdr),
-+				path[i].p_idx);
-+		if (ext3_ext_more_to_rm(path + i)) {
-+			/* go to the next level */
-+			ext_debug(tree, "move to level %d (block %d)\n",
-+					i + 1, path[i].p_idx->e_leaf);
-+			memset(path + i + 1, 0, sizeof(*path));
-+			path[i+1].p_bh = sb_bread(sb, path[i].p_idx->e_leaf);
-+			if (!path[i+1].p_bh) {
-+				/* should we reset i_size? */
-+				err = -EIO;
-+				break;
-+			}
-+			/* put actual number of indexes to know is this
-+			 * number got changed at the next iteration */
-+			path[i].p_block = path[i].p_hdr->e_num;
-+			i++;
-+		} else {
-+			/* we finish processing this index, go up */
-+			if (path[i].p_hdr->e_num == 0 && i > 0) {
-+				/* index is empty, remove it
-+				 * handle must be already prepared by the
-+				 * truncate_leaf() */
-+				err = ext3_ext_rm_idx(handle, tree, path + i);
-+			}
-+			/* root level have p_bh == NULL, brelse() eats this */
-+			brelse(path[i].p_bh);
-+			i--;
-+			ext_debug(tree, "return to level %d\n", i);
-+		}
-+	}
-+
-+	/* TODO: flexible tree reduction should be here */
-+	if (path->p_hdr->e_num == 0) {
-+		/*
-+		 * truncate to zero freed all the tree
-+		 * so, we need to correct e_depth
-+		 */
-+		err = ext3_ext_get_access(handle, tree, path);
-+		if (err == 0) {
-+			EXT_ROOT_HDR(tree)->e_depth = 0;
-+			err = ext3_ext_dirty(handle, tree, path);
-+		}
-+	}
-+	ext3_ext_tree_changed(tree);
-+
-+	kfree(path);
-+	ext3_journal_stop(handle, inode);
-+
-+	return err;
-+}
-+
-+/*
-+ * called at mount time
-+ */
-+void ext3_ext_init(struct super_block *sb)
-+{
-+	/*
-+	 * possible initialization would be here
-+	 */
-+
-+	if (test_opt(sb, EXTENTS)) {
-+		printk("EXT3-fs: file extents enabled");
-+#ifdef AGRESSIVE_TEST
-+		printk(", agressive tests");
-+#endif
-+#ifdef CHECK_BINSEARCH
-+		printk(", check binsearch");
-+#endif
-+		printk("\n");
-+	}
-+}
-+
-+/*
-+ * called at umount time
-+ */
-+void ext3_ext_release(struct super_block *sb)
-+{
-+}
-+
-+/************************************************************************
-+ * VFS related routines
-+ ************************************************************************/
-+
-+static int ext3_get_inode_write_access(handle_t *handle, void *buffer)
-+{
-+	/* we use in-core data, not bh */
-+	return 0;
-+}
-+
-+static int ext3_mark_buffer_dirty(handle_t *handle, void *buffer)
-+{
-+	struct inode *inode = buffer;
-+	return ext3_mark_inode_dirty(handle, inode);
-+}
-+
-+static int ext3_ext_mergable(struct ext3_extent *ex1,
-+				struct ext3_extent *ex2)
-+{
-+	if (ex1->e_start + ex1->e_num == ex2->e_start)
-+		return 1;
-+	return 0;
-+}
-+
-+static int
-+ext3_remove_blocks_credits(struct ext3_extents_tree *tree,
-+				struct ext3_extent *ex,
-+				unsigned long from, unsigned long to)
-+{
-+	int needed;
-+	
-+	/* at present, extent can't cross block group */;
-+	needed = 3; /* bitmap + group desc + sb */
-+
-+#ifdef CONFIG_QUOTA
-+	needed += 2 * EXT3_SINGLEDATA_TRANS_BLOCKS;
-+#endif
-+	return needed;
-+}
-+
-+static int
-+ext3_remove_blocks(struct ext3_extents_tree *tree,
-+				struct ext3_extent *ex,
-+				unsigned long from, unsigned long to)
-+{
-+	int needed = ext3_remove_blocks_credits(tree, ex, from, to);
-+	handle_t *handle = ext3_journal_start(tree->inode, needed);
-+	struct buffer_head *bh;
-+	int i;
-+
-+	if (IS_ERR(handle))
-+		return PTR_ERR(handle);
-+	if (from >= ex->e_block && to == ex->e_block + ex->e_num - 1) {
-+		/* tail removal */
-+		unsigned long num, start;
-+		num = ex->e_block + ex->e_num - from;
-+		start = ex->e_start + ex->e_num - num;
-+		ext_debug(tree, "free last %lu blocks starting %lu\n",
-+				num, start);
-+		for (i = 0; i < num; i++) {
-+			bh = sb_get_hash_table(tree->inode->i_sb, start + i);
-+			ext3_forget(handle, 0, tree->inode, bh, start + i);
-+		}
-+		ext3_free_blocks(handle, tree->inode, start, num);
-+	} else if (from == ex->e_block && to <= ex->e_block + ex->e_num - 1) {
-+		printk("strange request: removal %lu-%lu from %u:%u\n",
-+			from, to, ex->e_block, ex->e_num);
-+	} else {
-+		printk("strange request: removal(2) %lu-%lu from %u:%u\n",
-+			from, to, ex->e_block, ex->e_num);
-+	}
-+	ext3_journal_stop(handle, tree->inode);
-+	return 0;
-+}
-+
-+int ext3_ext_find_goal(struct inode *inode, struct ext3_ext_path *path,
-+			unsigned long block)
-+{
-+	struct ext3_inode_info *ei = EXT3_I(inode);
-+	unsigned long bg_start;
-+	unsigned long colour;
-+	int depth;
-+	
-+	if (path) {
-+		struct ext3_extent *ex;
-+		depth = path->p_depth;
-+		
-+		/* try to predict block placement */
-+		if ((ex = path[depth].p_ext))
-+			return ex->e_start + (block - ex->e_block);
-+
-+		/* it looks index is empty
-+		 * try to find starting from index itself */
-+		if (path[depth].p_bh)
-+			return path[depth].p_bh->b_blocknr;
-+	}
-+
-+	/* OK. use inode's group */
-+	bg_start = (ei->i_block_group * EXT3_BLOCKS_PER_GROUP(inode->i_sb)) +
-+		le32_to_cpu(EXT3_SB(inode->i_sb)->s_es->s_first_data_block);
-+	colour = (current->pid % 16) *
-+			(EXT3_BLOCKS_PER_GROUP(inode->i_sb) / 16);
-+	return bg_start + colour + block;
-+}
-+
-+static int ext3_new_block_cb(handle_t *handle, struct ext3_extents_tree *tree,
-+				struct ext3_ext_path *path,
-+				struct ext3_extent *ex, int *err)
-+{
-+	struct inode *inode = tree->inode;
-+	int newblock, goal;
-+	
-+	EXT_ASSERT(path);
-+	EXT_ASSERT(ex);
-+	EXT_ASSERT(ex->e_start);
-+	EXT_ASSERT(ex->e_num);
-+	
-+	/* reuse block from the extent to order data/metadata */
-+	newblock = ex->e_start++;
-+	ex->e_num--;
-+	if (ex->e_num == 0) {
-+		ex->e_num = 1;
-+		/* allocate new block for the extent */
-+		goal = ext3_ext_find_goal(inode, path, ex->e_block);
-+		ex->e_start = ext3_new_block(handle, inode, goal, 0, 0, err);
-+		if (ex->e_start == 0) {
-+			/* error occured: restore old extent */
-+			ex->e_start = newblock;
-+			return 0;
-+		}
-+	}
-+	return newblock;
-+}
-+
-+void ext3_init_tree_desc(struct ext3_extents_tree *tree,
-+				struct inode *inode)
-+{
-+	tree->inode = inode;
-+	tree->root = (void *) EXT3_I(inode)->i_data;
-+	tree->get_write_access = ext3_get_inode_write_access;
-+	tree->mark_buffer_dirty = ext3_mark_buffer_dirty;
-+	tree->mergable = ext3_ext_mergable;
-+	tree->new_block = ext3_new_block_cb;
-+	tree->remove_extent = ext3_remove_blocks;
-+	tree->remove_extent_credits = ext3_remove_blocks_credits;
-+	tree->buffer = (void *) inode;
-+	tree->buffer_len = sizeof(EXT3_I(inode)->i_data);
-+	tree->cex = (struct ext3_extent *) &EXT3_I(inode)->i_cached_extent;
-+}
-+
-+#if EXT3_MULTIBLOCK_ALLOCATOR
-+static int
-+ext3_ext_new_extent_cb(struct ext3_extents_tree *tree,
-+			struct ext3_ext_path *path,
-+			struct ext3_extent *newex, int exist)
-+{
-+	struct inode *inode = tree->inode;
-+	struct buffer_head *bh;
-+	int count, err, goal;
-+	unsigned long pblock;
-+	unsigned long tgen;
-+	loff_t new_i_size;
-+	handle_t *handle;
-+	int i;
-+
-+	if (exist)
-+		return EXT_CONTINUE;
-+
-+	tgen = EXT_GENERATION(tree);
-+	count = ext3_ext_calc_credits_for_insert(tree, path);
-+	up_write(&EXT3_I(inode)->truncate_sem);
-+
-+	handle = ext3_journal_start(inode, count + EXT3_ALLOC_NEEDED + 1);
-+	if (IS_ERR(handle)) {
-+		down_write(&EXT3_I(inode)->truncate_sem);
-+		return PTR_ERR(handle);
-+	}
-+
-+	if (tgen != EXT_GENERATION(tree)) {
-+		/* the tree has changed. so path can be invalid at moment */
-+		ext3_journal_stop(handle, inode);
-+		down_write(&EXT3_I(inode)->truncate_sem);
-+		return EXT_REPEAT;
-+	}
-+
-+	down_write(&EXT3_I(inode)->truncate_sem);
-+	goal = ext3_ext_find_goal(inode, path, newex->e_block);
-+	count = newex->e_num;
-+	pblock = ext3_new_blocks(handle, inode, &count, goal, &err);
-+	if (!pblock)
-+		goto out;
-+	EXT_ASSERT(count <= newex->e_num);
-+
-+	/* insert new extent */
-+	newex->e_start = pblock;
-+	newex->e_num = count;
-+	err = ext3_ext_insert_extent(handle, tree, path, newex);
-+	if (err)
-+		goto out;
-+
-+	/* block have been allocated for data, so time to drop dirty
-+	 * in correspondend buffer_heads to prevent corruptions */
-+	for (i = 0; i < newex->e_num; i++) {
-+		bh = sb_get_hash_table(inode->i_sb, newex->e_start + i);
-+		if (bh) {
-+			mark_buffer_clean(bh);
-+			wait_on_buffer(bh);
-+			clear_bit(BH_Req, &bh->b_state);
-+			__brelse(bh);
-+		}
-+	}
-+
-+	/* correct on-disk inode size */
-+	if (newex->e_num > 0) {
-+		new_i_size = (loff_t) newex->e_block + newex->e_num;
-+		new_i_size = new_i_size << inode->i_blkbits;
-+		if (new_i_size > EXT3_I(inode)->i_disksize) {
-+			EXT3_I(inode)->i_disksize = new_i_size;
-+			err = ext3_mark_inode_dirty(handle, inode);
-+		}
-+	}
-+
-+out:
-+	ext3_journal_stop(handle, inode);
-+	return err;
-+}
-+
-+
-+int ext3_ext_allocate_nblocks(struct inode *inode, unsigned long block,
-+				unsigned long num)
-+{
-+	struct ext3_extents_tree tree;
-+	int err;
-+
-+	ext3_init_tree_desc(&tree, inode);
-+	ext_debug(&tree, "blocks %lu-%lu requested for inode %u\n",
-+			block, block + num,(unsigned) inode->i_ino);
-+	down_write(&EXT3_I(inode)->truncate_sem);
-+	err = ext3_ext_walk_space(&tree, block, num, ext3_ext_new_extent_cb);
-+	ext3_ext_invalidate_cache(&tree);
-+	up_write(&EXT3_I(inode)->truncate_sem);
-+
-+	return err;
-+}
-+#endif
-+
-+int ext3_ext_get_block(handle_t *handle, struct inode *inode,
-+			long iblock, struct buffer_head *bh_result, int create)
-+{
-+	struct ext3_ext_path *path = NULL;
-+	struct ext3_extent newex;
-+	struct ext3_extent *ex;
-+	int goal, newblock, err = 0, depth;
-+	struct ext3_extents_tree tree;
-+
-+	clear_bit(BH_New, &bh_result->b_state);
-+	ext3_init_tree_desc(&tree, inode);
-+	ext_debug(&tree, "block %d requested for inode %u\n",
-+			(int) iblock, (unsigned) inode->i_ino);
-+	down_write(&EXT3_I(inode)->truncate_sem);
-+
-+	/* check in cache */
-+	if (ext3_ext_in_cache(&tree, iblock, &newex)) {
-+		if (newex.e_start == 0xffffffff && !create) {
-+			/* block isn't allocated yet and
-+			 * user don't want to allocate it */
-+			goto out2;
-+		} else if (newex.e_start) {
-+			/* block is already allocated */
-+			newblock = iblock - newex.e_block + newex.e_start;
-+			goto out;
-+		}
-+	}
-+
-+	/* find extent for this block */
-+	path = ext3_ext_find_extent(&tree, iblock, NULL);
-+	if (IS_ERR(path)) {
-+		err = PTR_ERR(path);
-+		path = NULL;
-+		goto out2;
-+	}
-+
-+	depth = EXT_DEPTH(&tree);
-+
-+	/*
-+	 * consistent leaf must not be empty
-+	 * this situations is possible, though, _during_ tree modification
-+	 * this is why assert can't be put in ext3_ext_find_extent()
-+	 */
-+	EXT_ASSERT(path[depth].p_ext != NULL || depth == 0);
-+
-+	if ((ex = path[depth].p_ext)) {
-+		/* if found exent covers block, simple return it */
-+		if (iblock >= ex->e_block && iblock < ex->e_block + ex->e_num) {
-+			newblock = iblock - ex->e_block + ex->e_start;
-+			ext_debug(&tree, "%d fit into %d:%d -> %d\n",
-+					(int) iblock, ex->e_block, ex->e_num,
-+					newblock);
-+			ext3_ext_put_in_cache(&tree, ex);
-+			goto out;
-+		}
-+	}
-+
-+	/*
-+	 * requested block isn't allocated yet
-+	 * we couldn't try to create block if create flag is zero 
-+	 */
-+	if (!create) {
-+		/* put just found gap into cache to speedup subsequest reqs */
-+		ext3_ext_put_gap_in_cache(&tree, path, iblock);
-+		goto out2;
-+	}
-+
-+	/* allocate new block */
-+	goal = ext3_ext_find_goal(inode, path, iblock);
-+	newblock = ext3_new_block(handle, inode, goal, 0, 0, &err);
-+	if (!newblock)
-+		goto out2;
-+	ext_debug(&tree, "allocate new block: goal %d, found %d\n",
-+			goal, newblock);
-+
-+	/* try to insert new extent into found leaf and return */
-+	newex.e_block = iblock;
-+	newex.e_start = newblock;
-+	newex.e_num = 1;
-+	err = ext3_ext_insert_extent(handle, &tree, path, &newex);
-+	if (err)
-+		goto out2;
-+	
-+	if (inode->i_size > EXT3_I(inode)->i_disksize)
-+		EXT3_I(inode)->i_disksize = inode->i_size;
-+
-+	/* previous routine could use block we allocated */
-+	newblock = newex.e_start;
-+	set_bit(BH_New, &bh_result->b_state);
-+
-+	ext3_ext_put_in_cache(&tree, &newex);
-+out:
-+	ext3_ext_show_leaf(&tree, path);
-+	set_bit(BH_Mapped, &bh_result->b_state);
-+	bh_result->b_dev = inode->i_sb->s_dev;
-+	bh_result->b_blocknr = newblock;
-+out2:
-+	if (path) {
-+		ext3_ext_drop_refs(path);
-+		kfree(path);
-+	}
-+	up_write(&EXT3_I(inode)->truncate_sem);
-+
-+	return err;	
-+}
-+
-+void ext3_ext_truncate(struct inode * inode)
-+{
-+	struct address_space *mapping = inode->i_mapping;
-+	struct super_block *sb = inode->i_sb;
-+	struct ext3_extents_tree tree;
-+	unsigned long last_block;
-+	handle_t *handle;
-+	int err = 0;
-+
-+	ext3_init_tree_desc(&tree, inode);
-+
-+	/*
-+	 * probably first extent we're gonna free will be last in block
-+	 */
-+	err = ext3_writepage_trans_blocks(inode) + 3;
-+	handle = ext3_journal_start(inode, err);
-+	if (IS_ERR(handle))
-+		return;
-+
-+	ext3_block_truncate_page(handle, mapping, inode->i_size);
-+
-+	down_write(&EXT3_I(inode)->truncate_sem);
-+	ext3_ext_invalidate_cache(&tree);
-+
-+	/* 
-+	 * TODO: optimization is possible here
-+	 * probably we need not scaning at all,
-+	 * because page truncation is enough
-+	 */
-+	if (ext3_orphan_add(handle, inode))
-+		goto out_stop;
-+
-+	/* we have to know where to truncate from in crash case */
-+	EXT3_I(inode)->i_disksize = inode->i_size;
-+	ext3_mark_inode_dirty(handle, inode);
-+
-+	last_block = (inode->i_size + sb->s_blocksize - 1)
-+			>> EXT3_BLOCK_SIZE_BITS(sb);
-+	err = ext3_ext_remove_space(&tree, last_block, 0xffffffff);
-+	
-+	/* In a multi-transaction truncate, we only make the final
-+	 * transaction synchronous */
-+	if (IS_SYNC(inode))
-+		handle->h_sync = 1;
-+
-+out_stop:
-+	/*
-+	 * If this was a simple ftruncate(), and the file will remain alive
-+	 * then we need to clear up the orphan record which we created above.
-+	 * However, if this was a real unlink then we were called by
-+	 * ext3_delete_inode(), and we allow that function to clean up the
-+	 * orphan info for us.
-+	 */
-+	if (inode->i_nlink)
-+		ext3_orphan_del(handle, inode);
-+
-+	up_write(&EXT3_I(inode)->truncate_sem);
-+	ext3_journal_stop(handle, inode);
-+}
-+
-+/*
-+ * this routine calculate max number of blocks we could modify
-+ * in order to allocate new block for an inode
-+ */
-+int ext3_ext_writepage_trans_blocks(struct inode *inode, int num)
-+{
-+	struct ext3_extents_tree tree;
-+	int needed;
-+	
-+	ext3_init_tree_desc(&tree, inode);
-+	
-+	needed = ext3_ext_calc_credits_for_insert(&tree, NULL);
-+
-+	/* caller want to allocate num blocks */
-+	needed *= num;
-+	
-+#ifdef CONFIG_QUOTA
-+	/* 
-+	 * FIXME: real calculation should be here
-+	 * it depends on blockmap format of qouta file
-+	 */
-+	needed += 2 * EXT3_SINGLEDATA_TRANS_BLOCKS;
-+#endif
-+
-+	return needed;
-+}
-+
-+void ext3_extents_initialize_blockmap(handle_t *handle, struct inode *inode)
-+{
-+	struct ext3_extents_tree tree;
-+
-+	ext3_init_tree_desc(&tree, inode);
-+	ext3_extent_tree_init(handle, &tree);
-+}
-+
-+static int
-+ext3_ext_store_extent_cb(struct ext3_extents_tree *tree,
-+			struct ext3_ext_path *path,
-+			struct ext3_extent *newex, int exist)
-+{
-+	struct ext3_extent_buf *buf = (struct ext3_extent_buf *) tree->private;
-+
-+	if (!exist)
-+		return EXT_CONTINUE;
-+	if (buf->err < 0)
-+		return EXT_BREAK;
-+	if (buf->cur - buf->buffer + sizeof(*newex) > buf->buflen)
-+		return EXT_BREAK;
-+
-+	if (!copy_to_user(buf->cur, newex, sizeof(*newex))) {
-+		buf->err++;
-+		buf->cur += sizeof(*newex);
-+	} else {
-+		buf->err = -EFAULT;
-+		return EXT_BREAK;
-+	}
-+	return EXT_CONTINUE;
-+}
-+
-+static int
-+ext3_ext_collect_stats_cb(struct ext3_extents_tree *tree,
-+			struct ext3_ext_path *path,
-+			struct ext3_extent *ex, int exist)
-+{
-+	struct ext3_extent_tree_stats *buf =
-+		(struct ext3_extent_tree_stats *) tree->private;
-+	int depth;
-+
-+	if (!exist)
-+		return EXT_CONTINUE;
-+
-+	depth = EXT_DEPTH(tree);
-+	buf->extents_num++;
-+	if (path[depth].p_ext == EXT_FIRST_EXTENT(path[depth].p_hdr))
-+		buf->leaf_num++;
-+	return EXT_CONTINUE;
-+}
-+
-+int ext3_ext_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
-+		unsigned long arg)
-+{
-+	int err = 0;
-+
-+	if (!(EXT3_I(inode)->i_flags & EXT3_EXTENTS_FL))
-+		return -EINVAL;
-+
-+	if (cmd == EXT3_IOC_GET_EXTENTS) {
-+		struct ext3_extent_buf buf;
-+		struct ext3_extents_tree tree;
-+
-+		if (copy_from_user(&buf, (void *) arg, sizeof(buf)))
-+			return -EFAULT;
-+
-+		ext3_init_tree_desc(&tree, inode);
-+		buf.cur = buf.buffer;
-+		buf.err = 0;
-+		tree.private = &buf;
-+		down_write(&EXT3_I(inode)->truncate_sem);
-+		err = ext3_ext_walk_space(&tree, buf.start, 0xffffffff,
-+						ext3_ext_store_extent_cb);
-+		up_write(&EXT3_I(inode)->truncate_sem);
-+		if (err == 0)
-+			err = buf.err;
-+	} else if (cmd == EXT3_IOC_GET_TREE_STATS) {
-+		struct ext3_extent_tree_stats buf;
-+		struct ext3_extents_tree tree;
-+
-+		ext3_init_tree_desc(&tree, inode);
-+		down_write(&EXT3_I(inode)->truncate_sem);
-+		buf.depth = EXT_DEPTH(&tree);
-+		buf.extents_num = 0;
-+		buf.leaf_num = 0;
-+		tree.private = &buf;
-+		err = ext3_ext_walk_space(&tree, 0, 0xffffffff,
-+						ext3_ext_collect_stats_cb);
-+		up_write(&EXT3_I(inode)->truncate_sem);
-+		if (!err)
-+			err = copy_to_user((void *) arg, &buf, sizeof(buf));
-+	} else if (cmd == EXT3_IOC_GET_TREE_DEPTH) {
-+		struct ext3_extents_tree tree;
-+		ext3_init_tree_desc(&tree, inode);
-+		down_write(&EXT3_I(inode)->truncate_sem);
-+		err = EXT_DEPTH(&tree);
-+		up_write(&EXT3_I(inode)->truncate_sem);
-+	}
-+
-+	return err;
-+}
-+
-+EXPORT_SYMBOL(ext3_init_tree_desc);
-+EXPORT_SYMBOL(ext3_mark_inode_dirty);
-+EXPORT_SYMBOL(ext3_ext_invalidate_cache);
-+EXPORT_SYMBOL(ext3_ext_insert_extent);
-+EXPORT_SYMBOL(ext3_ext_walk_space);
-+EXPORT_SYMBOL(ext3_ext_find_goal);
-+EXPORT_SYMBOL(ext3_ext_calc_credits_for_insert);
-+
-Index: linux-2.4.24-mb34/fs/ext3/ialloc.c
-===================================================================
---- linux-2.4.24-mb34.orig/fs/ext3/ialloc.c	2004-05-05 13:47:40.000000000 -0700
-+++ linux-2.4.24-mb34/fs/ext3/ialloc.c	2004-05-05 13:51:27.000000000 -0700
-@@ -592,10 +592,14 @@
- 		iloc.bh = NULL;
- 		goto fail;
- 	}
--	err = ext3_mark_iloc_dirty(handle, inode, &iloc);
--	if (err) goto fail;
- 
-+ 	if (test_opt(sb, EXTENTS)) {
-+ 		EXT3_I(inode)->i_flags |= EXT3_EXTENTS_FL;
-+ 		ext3_extents_initialize_blockmap(handle, inode);
-+ 	}
- 
-+	err = ext3_mark_iloc_dirty(handle, inode, &iloc);
-+	if (err) goto fail;
- 	
- 	unlock_super (sb);
- 	if(DQUOT_ALLOC_INODE(inode)) {
-Index: linux-2.4.24-mb34/fs/ext3/inode.c
-===================================================================
---- linux-2.4.24-mb34.orig/fs/ext3/inode.c	2004-05-05 13:47:41.000000000 -0700
-+++ linux-2.4.24-mb34/fs/ext3/inode.c	2004-05-05 13:49:40.000000000 -0700
-@@ -848,6 +848,15 @@
- 	goto reread;
- }
- 
-+static inline int
-+ext3_get_block_wrap(handle_t *handle, struct inode *inode, long block,
-+		struct buffer_head *bh, int create)
-+{
-+	if (EXT3_I(inode)->i_flags & EXT3_EXTENTS_FL)
-+		return ext3_ext_get_block(handle, inode, block, bh, create);
-+	return ext3_get_block_handle(handle, inode, block, bh, create);
-+}
-+
- /*
-  * The BKL is not held on entry here.
-  */
-@@ -861,7 +870,7 @@
- 		handle = ext3_journal_current_handle();
- 		J_ASSERT(handle != 0);
- 	}
--	ret = ext3_get_block_handle(handle, inode, iblock, bh_result, create);
-+	ret = ext3_get_block_wrap(handle, inode, iblock, bh_result, create);
- 	return ret;
- }
- 
-@@ -879,7 +888,7 @@
- 	dummy.b_state = 0;
- 	dummy.b_blocknr = -1000;
- 	buffer_trace_init(&dummy.b_history);
--	*errp = ext3_get_block_handle(handle, inode, block, &dummy, create);
-+	*errp = ext3_get_block_wrap(handle, inode, block, &dummy, create);
- 	if (!*errp && buffer_mapped(&dummy)) {
- 		struct buffer_head *bh;
- 		bh = sb_getblk(inode->i_sb, dummy.b_blocknr);
-@@ -1403,7 +1412,7 @@
-  * This required during truncate. We need to physically zero the tail end
-  * of that block so it doesn't yield old data if the file is later grown.
-  */
--static int ext3_block_truncate_page(handle_t *handle,
-+int ext3_block_truncate_page(handle_t *handle,
- 		struct address_space *mapping, loff_t from)
- {
- 	unsigned long index = from >> PAGE_CACHE_SHIFT;
-@@ -1889,6 +1898,9 @@
- 
- 	ext3_discard_prealloc(inode);
- 
-+	if (EXT3_I(inode)->i_flags & EXT3_EXTENTS_FL)
-+		return ext3_ext_truncate(inode);
-+
- 	handle = start_transaction(inode);
- 	if (IS_ERR(handle))
- 		return;		/* AKPM: return what? */
-@@ -2537,6 +2549,9 @@
- 	int indirects = (EXT3_NDIR_BLOCKS % bpp) ? 5 : 3;
- 	int ret;
- 	
-+	if (EXT3_I(inode)->i_flags & EXT3_EXTENTS_FL)
-+		return ext3_ext_writepage_trans_blocks(inode, bpp);
-+
- 	if (ext3_should_journal_data(inode))
- 		ret = 3 * (bpp + indirects) + 2;
- 	else
-@@ -2973,7 +2988,7 @@
- 
- 	/* alloc blocks one by one */
- 	for (i = 0; i < nblocks; i++) {
--		ret = ext3_get_block_handle(handle, inode, blocks[i],
-+		ret = ext3_get_block_wrap(handle, inode, blocks[i],
- 						&bh_tmp, 1);
- 		if (ret)
- 			break;
-@@ -3049,7 +3064,7 @@
-                 if (blocks[i] != 0)
-                         continue;
- 
--                rc = ext3_get_block_handle(handle, inode, iblock, &bh, 1);
-+                rc = ext3_get_block_wrap(handle, inode, iblock, &bh, 1);
-                 if (rc) {
-                         printk(KERN_INFO "ext3_map_inode_page: error %d "
-                                "allocating block %ld\n", rc, iblock);
-Index: linux-2.4.24-mb34/fs/ext3/Makefile
-===================================================================
---- linux-2.4.24-mb34.orig/fs/ext3/Makefile	2004-05-05 13:47:40.000000000 -0700
-+++ linux-2.4.24-mb34/fs/ext3/Makefile	2004-05-05 13:49:40.000000000 -0700
-@@ -13,7 +13,9 @@
- 
- obj-y    := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o iopen.o \
- 		ioctl.o namei.o super.o symlink.o hash.o ext3-exports.o \
--		xattr_trusted.o
-+		xattr_trusted.o extents.o
-+export-objs += extents.o
-+
- obj-m    := $(O_TARGET)
- 
- export-objs += xattr.o
-Index: linux-2.4.24-mb34/fs/ext3/super.c
-===================================================================
---- linux-2.4.24-mb34.orig/fs/ext3/super.c	2004-05-05 13:47:40.000000000 -0700
-+++ linux-2.4.24-mb34/fs/ext3/super.c	2004-05-05 13:49:40.000000000 -0700
-@@ -530,6 +530,7 @@
- 	int i;
- 
- 	J_ASSERT(sbi->s_delete_inodes == 0);
-+	ext3_ext_release(sb);
- 	ext3_xattr_put_super(sb);
- 	journal_destroy(sbi->s_journal);
- 	if (!(sb->s_flags & MS_RDONLY)) {
-@@ -702,6 +703,10 @@
- 				return 0;
- 			}
- 		}
-+		else if (!strcmp (this_char, "extents"))
-+			set_opt (*mount_options, EXTENTS);
-+		else if (!strcmp (this_char, "extdebug"))
-+			set_opt (*mount_options, EXTDEBUG);
- 		else if (!strcmp (this_char, "grpid") ||
- 			 !strcmp (this_char, "bsdgroups"))
- 			set_opt (*mount_options, GRPID);
-@@ -1393,6 +1398,8 @@
- 		test_opt(sb,DATA_FLAGS) == EXT3_MOUNT_ORDERED_DATA ? "ordered":
- 		"writeback");
- 
-+	ext3_ext_init(sb);
-+
- 	return sb;
- 
- failed_mount3:
-Index: linux-2.4.24-mb34/fs/ext3/ioctl.c
-===================================================================
---- linux-2.4.24-mb34.orig/fs/ext3/ioctl.c	2004-05-05 13:47:38.000000000 -0700
-+++ linux-2.4.24-mb34/fs/ext3/ioctl.c	2004-05-05 13:49:40.000000000 -0700
-@@ -174,6 +174,10 @@
- 			return ret;
- 		}
- #endif
-+	case EXT3_IOC_GET_EXTENTS:
-+	case EXT3_IOC_GET_TREE_STATS:
-+	case EXT3_IOC_GET_TREE_DEPTH:
-+		return ext3_ext_ioctl(inode, filp, cmd, arg);
- 	default:
- 		return -ENOTTY;
- 	}
-Index: linux-2.4.24-mb34/include/linux/ext3_fs.h
-===================================================================
---- linux-2.4.24-mb34.orig/include/linux/ext3_fs.h	2004-05-05 13:47:40.000000000 -0700
-+++ linux-2.4.24-mb34/include/linux/ext3_fs.h	2004-05-05 13:49:40.000000000 -0700
-@@ -184,6 +184,7 @@
- #define EXT3_IMAGIC_FL			0x00002000 /* AFS directory */
- #define EXT3_JOURNAL_DATA_FL		0x00004000 /* file data should be journaled */
- #define EXT3_RESERVED_FL		0x80000000 /* reserved for ext3 lib */
-+#define EXT3_EXTENTS_FL			0x00080000 /* Inode uses extents */
- 
- #define EXT3_FL_USER_VISIBLE		0x00005FFF /* User visible flags */
- #define EXT3_FL_USER_MODIFIABLE		0x000000FF /* User modifiable flags */
-@@ -208,6 +209,9 @@
- #ifdef CONFIG_JBD_DEBUG
- #define EXT3_IOC_WAIT_FOR_READONLY	_IOR('f', 99, long)
- #endif
-+#define	EXT3_IOC_GET_EXTENTS		_IOR('f', 5, long)
-+#define	EXT3_IOC_GET_TREE_DEPTH		_IOR('f', 6, long)
-+#define	EXT3_IOC_GET_TREE_STATS		_IOR('f', 7, long)
- 
- /*
-  * Structure of an inode on the disk
-@@ -327,6 +331,8 @@
- #define EXT3_MOUNT_IOPEN		0x8000	/* Allow access via iopen */
- #define EXT3_MOUNT_IOPEN_NOPRIV		0x10000	/* Make iopen world-readable */
- #define EXT3_MOUNT_ASYNCDEL		0x20000 /* Delayed deletion */
-+#define EXT3_MOUNT_EXTENTS		0x100000/* Extents support */
-+#define EXT3_MOUNT_EXTDEBUG		0x200000/* Extents debug */
- 
- /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
- #ifndef _LINUX_EXT2_FS_H
-@@ -688,6 +694,7 @@
- extern unsigned long ext3_count_free (struct buffer_head *, unsigned);
- 
- /* inode.c */
-+extern int ext3_block_truncate_page(handle_t *, struct address_space *, loff_t);
- extern int ext3_forget(handle_t *, int, struct inode *, struct buffer_head *, int);
- extern struct buffer_head * ext3_getblk (handle_t *, struct inode *, long, int, int *);
- extern struct buffer_head * ext3_bread (handle_t *, struct inode *, int, int, int *);
-@@ -769,6 +776,14 @@
- extern struct inode_operations ext3_symlink_inode_operations;
- extern struct inode_operations ext3_fast_symlink_inode_operations;
- 
-+/* extents.c */
-+extern int ext3_ext_writepage_trans_blocks(struct inode *, int);
-+extern int ext3_ext_get_block(handle_t *, struct inode *, long,
-+				struct buffer_head *, int);
-+extern void ext3_ext_truncate(struct inode *);
-+extern void ext3_ext_init(struct super_block *);
-+extern void ext3_ext_release(struct super_block *);
-+extern void ext3_extents_initialize_blockmap(handle_t *, struct inode *);
- 
- #endif	/* __KERNEL__ */
- 
-Index: linux-2.4.24-mb34/include/linux/ext3_extents.h
-===================================================================
---- linux-2.4.24-mb34.orig/include/linux/ext3_extents.h	1969-12-31 16:00:00.000000000 -0800
-+++ linux-2.4.24-mb34/include/linux/ext3_extents.h	2004-05-05 14:27:50.000000000 -0700
-@@ -0,0 +1,219 @@
-+/*
-+ * Copyright (C) 2003 Alex Tomas <alex@clusterfs.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public Licens
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-
-+ */
-+
-+#ifndef _LINUX_EXT3_EXTENTS
-+#define _LINUX_EXT3_EXTENTS
-+
-+/*
-+ * with AGRESSIVE_TEST defined capacity of index/leaf blocks
-+ * become very little, so index split, in-depth growing and
-+ * other hard changes happens much more often
-+ * this is for debug purposes only
-+ */
-+#define AGRESSIVE_TEST_
-+
-+/*
-+ * if CHECK_BINSEARCH defined, then results of binary search
-+ * will be checked by linear search
-+ */
-+#define CHECK_BINSEARCH_
-+
-+/*
-+ * if EXT_DEBUG is defined you can use 'extdebug' mount option
-+ * to get lots of info what's going on
-+ */
-+#define EXT_DEBUG
-+#ifdef EXT_DEBUG
-+#define ext_debug(tree,fmt,a...) 			\
-+do {							\
-+	if (test_opt((tree)->inode->i_sb, EXTDEBUG))	\
-+		printk(fmt, ##a);			\
-+} while (0);
-+#else
-+#define ext_debug(tree,fmt,a...)
-+#endif
-+
-+/*
-+ * if EXT_STATS is defined then stats numbers are collected
-+ * these number will be displayed at umount time
-+ */
-+#define EXT_STATS_
-+
-+
-+#define EXT3_ALLOC_NEEDED	3	/* block bitmap + group desc. + sb */
-+
-+/*
-+ * ext3_inode has i_block array (total 60 bytes)
-+ * first 4 bytes are used to store:
-+ *  - tree depth (0 mean there is no tree yet. all extents in the inode)
-+ *  - number of alive extents in the inode
-+ */
-+
-+/*
-+ * this is extent on-disk structure
-+ * it's used at the bottom of the tree
-+ */
-+struct ext3_extent {
-+	__u32	e_block;	/* first logical block extent covers */
-+	__u32	e_start;	/* first physical block extents lives */
-+	__u32	e_num;		/* number of blocks covered by extent */
-+};
-+
-+/*
-+ * this is index on-disk structure
-+ * it's used at all the levels, but the bottom
-+ */
-+struct ext3_extent_idx {
-+	__u32	e_block;	/* index covers logical blocks from 'block' */
-+	__u32	e_leaf;		/* pointer to the physical block of the next *
-+				 * level. leaf or next index could bet here */
-+};
-+
-+/*
-+ * each block (leaves and indexes), even inode-stored has header
-+ */
-+struct ext3_extent_header {	
-+	__u16	e_magic;	/* probably will support different formats */	
-+	__u16	e_num;		/* number of valid entries */
-+	__u16	e_max;		/* capacity of store in entries */
-+	__u16	e_depth;	/* has tree real underlaying blocks? */
-+	__u32	e_generation;	/* generation of the tree */
-+};
-+
-+#define EXT3_EXT_MAGIC		0xf301
-+
-+/*
-+ * array of ext3_ext_path contains path to some extent
-+ * creation/lookup routines use it for traversal/splitting/etc
-+ * truncate uses it to simulate recursive walking
-+ */
-+struct ext3_ext_path {
-+	__u32				p_block;
-+	__u16				p_depth;
-+	struct ext3_extent		*p_ext;
-+	struct ext3_extent_idx		*p_idx;
-+	struct ext3_extent_header	*p_hdr;
-+	struct buffer_head		*p_bh;
-+};
-+
-+/*
-+ * structure for external API
-+ */
-+
-+
-+/*
-+ * ext3_extents_tree is used to pass initial information
-+ * to top-level extents API
-+ */
-+struct ext3_extents_tree {
-+	struct inode *inode;	/* inode which tree belongs to */
-+	void *root;		/* ptr to data top of tree resides at */
-+	void *buffer;		/* will be passed as arg to ^^ routines	*/
-+	int buffer_len;
-+	void *private;
-+	struct ext3_extent *cex;/* last found extent */
-+	int (*get_write_access)(handle_t *h, void *buffer);
-+	int (*mark_buffer_dirty)(handle_t *h, void *buffer);
-+	int (*mergable)(struct ext3_extent *ex1, struct ext3_extent *ex2);
-+	int (*remove_extent_credits)(struct ext3_extents_tree *,
-+					struct ext3_extent *, unsigned long,
-+					unsigned long);
-+	int (*remove_extent)(struct ext3_extents_tree *,
-+				struct ext3_extent *, unsigned long,
-+				unsigned long);
-+	int (*new_block)(handle_t *, struct ext3_extents_tree *,
-+				struct ext3_ext_path *, struct ext3_extent *,
-+				int *);
-+};
-+
-+/*
-+ * to be called by ext3_ext_walk_space()
-+ * negative retcode - error
-+ * positive retcode - signal for ext3_ext_walk_space(), see below
-+ * callback must return valid extent (passed or newly created)
-+ */
-+typedef int (*ext_prepare_callback)(struct ext3_extents_tree *,
-+					struct ext3_ext_path *,
-+					struct ext3_extent *, int);
-+
-+#define EXT_CONTINUE	0
-+#define EXT_BREAK	1
-+#define EXT_REPEAT	2
-+
-+
-+#define EXT_FIRST_EXTENT(__hdr__) \
-+	((struct ext3_extent *) (((char *) (__hdr__)) +		\
-+				 sizeof(struct ext3_extent_header)))
-+#define EXT_FIRST_INDEX(__hdr__) \
-+	((struct ext3_extent_idx *) (((char *) (__hdr__)) +	\
-+				     sizeof(struct ext3_extent_header)))
-+#define EXT_HAS_FREE_INDEX(__path__) \
-+	((__path__)->p_hdr->e_num < (__path__)->p_hdr->e_max)
-+#define EXT_LAST_EXTENT(__hdr__) \
-+	(EXT_FIRST_EXTENT((__hdr__)) + (__hdr__)->e_num - 1)
-+#define EXT_LAST_INDEX(__hdr__) \
-+	(EXT_FIRST_INDEX((__hdr__)) + (__hdr__)->e_num - 1)
-+#define EXT_MAX_EXTENT(__hdr__) \
-+	(EXT_FIRST_EXTENT((__hdr__)) + (__hdr__)->e_max - 1)
-+#define EXT_MAX_INDEX(__hdr__) \
-+	(EXT_FIRST_INDEX((__hdr__)) + (__hdr__)->e_max - 1)
-+
-+#define EXT_ROOT_HDR(tree) \
-+	((struct ext3_extent_header *) (tree)->root)
-+#define EXT_BLOCK_HDR(bh) \
-+	((struct ext3_extent_header *) (bh)->b_data)
-+#define EXT_DEPTH(_t_)	\
-+	(((struct ext3_extent_header *)((_t_)->root))->e_depth)
-+#define EXT_GENERATION(_t_)	\
-+	(((struct ext3_extent_header *)((_t_)->root))->e_generation)
-+
-+
-+#define EXT_ASSERT(__x__) if (!(__x__)) BUG();
-+
-+
-+/*
-+ * this structure is used to gather extents from the tree via ioctl
-+ */
-+struct ext3_extent_buf {
-+	unsigned long start;
-+	int buflen;
-+	void *buffer;
-+	void *cur;
-+	int err;
-+};
-+
-+/*
-+ * this structure is used to collect stats info about the tree
-+ */
-+struct ext3_extent_tree_stats {
-+	int depth;
-+	int extents_num;
-+	int leaf_num;
-+};
-+
-+extern int ext3_extent_tree_init(handle_t *, struct ext3_extents_tree *);
-+extern int ext3_ext_calc_credits_for_insert(struct ext3_extents_tree *, struct ext3_ext_path *);
-+extern int ext3_ext_insert_extent(handle_t *, struct ext3_extents_tree *, struct ext3_ext_path *, struct ext3_extent *);
-+extern int ext3_ext_walk_space(struct ext3_extents_tree *, unsigned long, unsigned long, ext_prepare_callback);
-+extern int ext3_ext_remove_space(struct ext3_extents_tree *, unsigned long, unsigned long);
-+extern struct ext3_ext_path * ext3_ext_find_extent(struct ext3_extents_tree *, int, struct ext3_ext_path *);
-+int ext3_ext_find_goal(struct inode *inode, struct ext3_ext_path *path,
-+			unsigned long block);
-+void ext3_init_tree_desc(struct ext3_extents_tree *tree, struct inode *inode);
-+void ext3_ext_invalidate_cache(struct ext3_extents_tree *tree);
-+
-+#endif /* _LINUX_EXT3_EXTENTS */
-Index: linux-2.4.24-mb34/include/linux/ext3_fs_i.h
-===================================================================
---- linux-2.4.24-mb34.orig/include/linux/ext3_fs_i.h	2004-05-05 13:47:40.000000000 -0700
-+++ linux-2.4.24-mb34/include/linux/ext3_fs_i.h	2004-05-05 13:53:43.000000000 -0700
-@@ -76,6 +76,8 @@
- 	 * by other means, so we have truncate_sem.
- 	 */
- 	struct rw_semaphore truncate_sem;
-+
-+	__u32 i_cached_extent[3];
- };
- 
- #endif	/* _LINUX_EXT3_FS_I */
diff --git a/lustre/kernel_patches/patches/ext3-htree-2.4.19-pre1.patch b/lustre/kernel_patches/patches/ext3-htree-2.4.19-pre1.patch
index 7865c63..711e1f2 100644
--- a/lustre/kernel_patches/patches/ext3-htree-2.4.19-pre1.patch
+++ b/lustre/kernel_patches/patches/ext3-htree-2.4.19-pre1.patch
@@ -1667,8 +1667,8 @@ Index: linux-2.4.19-pre1/fs/ext3/namei.c
 +	data1 = bh2->b_data;
 +
 +	/* The 0th block becomes the root, move the dirents out */
-+	de = (struct ext3_dir_entry_2 *)&root->dotdot;
-+	de = (struct ext3_dir_entry_2 *)((char *)de + le16_to_cpu(de->rec_len));
++	de = (struct ext3_dir_entry_2 *) &root->dotdot;
++	de = (struct ext3_dir_entry_2 *) ((char *)de + de->rec_len);
 +	len = ((char *) root) + blocksize - (char *) de;
 +	memcpy (data1, de, len);
 +	de = (struct ext3_dir_entry_2 *) data1;
diff --git a/lustre/kernel_patches/patches/ext3-htree-2.4.21-chaos.patch b/lustre/kernel_patches/patches/ext3-htree-2.4.21-chaos.patch
index 3a9719b..36d6b5e 100644
--- a/lustre/kernel_patches/patches/ext3-htree-2.4.21-chaos.patch
+++ b/lustre/kernel_patches/patches/ext3-htree-2.4.21-chaos.patch
@@ -1667,8 +1667,8 @@ Index: linux-2.4.21-chaos/fs/ext3/namei.c
 +	data1 = bh2->b_data;
 +
 +	/* The 0th block becomes the root, move the dirents out */
-+	de = (struct ext3_dir_entry_2 *)&root->dotdot;
-+	de = (struct ext3_dir_entry_2 *)((char *)de + le16_to_cpu(de->rec_len));
++	de = (struct ext3_dir_entry_2 *) &root->dotdot;
++	de = (struct ext3_dir_entry_2 *) ((char *)de + de->rec_len);
 +	len = ((char *) root) + blocksize - (char *) de;
 +	memcpy (data1, de, len);
 +	de = (struct ext3_dir_entry_2 *) data1;
diff --git a/lustre/kernel_patches/patches/ext3-htree-2.4.22-rh.patch b/lustre/kernel_patches/patches/ext3-htree-2.4.22-rh.patch
index 436bd34..3230853 100644
--- a/lustre/kernel_patches/patches/ext3-htree-2.4.22-rh.patch
+++ b/lustre/kernel_patches/patches/ext3-htree-2.4.22-rh.patch
@@ -1657,8 +1657,8 @@
 +	data1 = bh2->b_data;
 +
 +	/* The 0th block becomes the root, move the dirents out */
-+	de = (struct ext3_dir_entry_2 *)&root->dotdot;
-+	de = (struct ext3_dir_entry_2 *)((char *)de + le16_to_cpu(de->rec_len));
++	de = (struct ext3_dir_entry_2 *) &root->dotdot;
++	de = (struct ext3_dir_entry_2 *) ((char *)de + de->rec_len);
 +	len = ((char *) root) + blocksize - (char *) de;
 +	memcpy (data1, de, len);
 +	de = (struct ext3_dir_entry_2 *) data1;
diff --git a/lustre/kernel_patches/patches/ext3-htree-suse.patch b/lustre/kernel_patches/patches/ext3-htree-suse.patch
index a6e96f0..ea55ad1 100644
--- a/lustre/kernel_patches/patches/ext3-htree-suse.patch
+++ b/lustre/kernel_patches/patches/ext3-htree-suse.patch
@@ -1667,8 +1667,8 @@ Index: linux-2.4.21-suse/fs/ext3/namei.c
 +	data1 = bh2->b_data;
 +
 +	/* The 0th block becomes the root, move the dirents out */
-+	de = (struct ext3_dir_entry_2 *)&root->dotdot;
-+	de = (struct ext3_dir_entry_2 *)((char *)de + le16_to_cpu(de->rec_len));
++	de = (struct ext3_dir_entry_2 *) &root->dotdot;
++	de = (struct ext3_dir_entry_2 *) ((char *)de + de->rec_len);
 +	len = ((char *) root) + blocksize - (char *) de;
 +	memcpy (data1, de, len);
 +	de = (struct ext3_dir_entry_2 *) data1;
diff --git a/lustre/kernel_patches/patches/ext3-htree.patch b/lustre/kernel_patches/patches/ext3-htree.patch
index 903118b..1c1c1ad 100644
--- a/lustre/kernel_patches/patches/ext3-htree.patch
+++ b/lustre/kernel_patches/patches/ext3-htree.patch
@@ -1657,8 +1657,8 @@
 +	data1 = bh2->b_data;
 +
 +	/* The 0th block becomes the root, move the dirents out */
-+	de = (struct ext3_dir_entry_2 *)&root->dotdot;
-+	de = (struct ext3_dir_entry_2 *)((char *)de + le16_to_cpu(de->rec_len));
++	de = (struct ext3_dir_entry_2 *) &root->dotdot;
++	de = (struct ext3_dir_entry_2 *) ((char *)de + de->rec_len);
 +	len = ((char *) root) + blocksize - (char *) de;
 +	memcpy (data1, de, len);
 +	de = (struct ext3_dir_entry_2 *) data1;
diff --git a/lustre/kernel_patches/patches/ext3-include-fixes-2.6-suse.patch b/lustre/kernel_patches/patches/ext3-include-fixes-2.6-suse.patch
deleted file mode 100644
index 28e3587..0000000
--- a/lustre/kernel_patches/patches/ext3-include-fixes-2.6-suse.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: linux-stage/include/linux/ext3_fs.h
-===================================================================
---- linux-stage.orig/include/linux/ext3_fs.h	2004-04-02 16:43:37.000000000 -0500
-+++ linux-stage/include/linux/ext3_fs.h	2004-04-02 16:43:37.000000000 -0500
-@@ -331,12 +331,13 @@
- #define EXT3_MOUNT_IOPEN_NOPRIV	       0x20000  /* Make iopen world-readable */
- 
- /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
--#ifndef _LINUX_EXT2_FS_H
-+#ifndef clear_opt
- #define clear_opt(o, opt)		o &= ~EXT3_MOUNT_##opt
- #define set_opt(o, opt)			o |= EXT3_MOUNT_##opt
- #define test_opt(sb, opt)		(EXT3_SB(sb)->s_mount_opt & \
- 					 EXT3_MOUNT_##opt)
--#else
-+#endif
-+#ifndef EXT2_MOUNT_NOLOAD
- #define EXT2_MOUNT_NOLOAD		EXT3_MOUNT_NOLOAD
- #define EXT2_MOUNT_ABORT		EXT3_MOUNT_ABORT
- #define EXT2_MOUNT_DATA_FLAGS		EXT3_MOUNT_DATA_FLAGS
diff --git a/lustre/kernel_patches/patches/ext3-init-generation-2.6-suse.patch b/lustre/kernel_patches/patches/ext3-init-generation-2.6.0.patch
similarity index 100%
rename from lustre/kernel_patches/patches/ext3-init-generation-2.6-suse.patch
rename to lustre/kernel_patches/patches/ext3-init-generation-2.6.0.patch
diff --git a/lustre/kernel_patches/patches/ext3-map_inode_page-2.6-suse.patch b/lustre/kernel_patches/patches/ext3-map_inode_page-2.6-suse.patch
deleted file mode 100644
index 91063b3..0000000
--- a/lustre/kernel_patches/patches/ext3-map_inode_page-2.6-suse.patch
+++ /dev/null
@@ -1,81 +0,0 @@
- fs/ext3/inode.c |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
- fs/ext3/super.c |    3 +++
- 2 files changed, 55 insertions(+)
-
-Index: linux-2.6.0/fs/ext3/inode.c
-===================================================================
---- linux-2.6.0.orig/fs/ext3/inode.c	2003-12-31 00:33:49.000000000 +0300
-+++ linux-2.6.0/fs/ext3/inode.c	2003-12-31 01:14:17.000000000 +0300
-@@ -3136,3 +3136,58 @@
- 		ret = ret2;
- 	return ret;
- }
-+
-+int ext3_map_inode_page(struct inode *inode, struct page *page,
-+                        unsigned long *blocks, int *created, int create)
-+{
-+        unsigned int blocksize, blocks_per_page;
-+        unsigned long iblock;
-+        struct buffer_head dummy;
-+        void *handle;
-+        int i, rc = 0, failed = 0, needed_blocks;
-+
-+        blocksize = inode->i_sb->s_blocksize;
-+        blocks_per_page = PAGE_SIZE >> inode->i_sb->s_blocksize_bits;
-+        iblock = page->index * blocks_per_page;
-+
-+        for (i = 0; i < blocks_per_page; i++, iblock++) {
-+                blocks[i] = ext3_bmap(inode->i_mapping, iblock);
-+                if (blocks[i] == 0) {
-+                        failed++;
-+                        created[i] = -1;
-+                } else {
-+                        created[i] = 0;
-+                }
-+        }
-+
-+        if (failed == 0 || create == 0)
-+                return 0;
-+
-+        needed_blocks = ext3_writepage_trans_blocks(inode);
-+        handle = ext3_journal_start(inode, needed_blocks);
-+        if (IS_ERR(handle))
-+                return PTR_ERR(handle);
-+
-+        iblock = page->index * blocks_per_page;
-+        for (i = 0; i < blocks_per_page; i++, iblock++) {
-+                if (blocks[i] != 0)
-+                        continue;
-+
-+                rc = ext3_get_block_handle(handle, inode, iblock, &dummy, 1, 1);
-+                if (rc) {
-+                        printk(KERN_INFO "ext3_map_inode_page: error reading "
-+                               "block %ld\n", iblock);
-+                        goto out;
-+                }
-+                if (buffer_new(&dummy))
-+                        unmap_underlying_metadata(dummy.b_bdev,
-+							dummy.b_blocknr);
-+                blocks[i] = dummy.b_blocknr;
-+                created[i] = 1;
-+        }
-+
-+ out:
-+	ext3_journal_stop(handle);
-+        return rc;
-+}
-+
-Index: linux-2.6.0/fs/ext3/super.c
-===================================================================
---- linux-2.6.0.orig/fs/ext3/super.c	2003-12-31 00:33:49.000000000 +0300
-+++ linux-2.6.0/fs/ext3/super.c	2003-12-31 01:10:40.000000000 +0300
-@@ -2051,6 +2051,9 @@
- int ext3_prep_san_write(struct inode *inode, long *blocks,
-                         int nblocks, loff_t newsize);
- EXPORT_SYMBOL(ext3_prep_san_write);
-+int ext3_map_inode_page(struct inode *inode, struct page *page,
-+                        unsigned long *blocks, int *created, int create);
-+EXPORT_SYMBOL(ext3_map_inode_page);
- 
- MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others");
- MODULE_DESCRIPTION("Second Extended Filesystem with journaling extensions");
diff --git a/ldiskfs/kernel_patches/patches/ext3-map_inode_page-2.6-suse.patch b/lustre/kernel_patches/patches/ext3-map_inode_page-2.6.0.patch
similarity index 100%
rename from ldiskfs/kernel_patches/patches/ext3-map_inode_page-2.6-suse.patch
rename to lustre/kernel_patches/patches/ext3-map_inode_page-2.6.0.patch
diff --git a/lustre/kernel_patches/patches/ext3-mballoc-2.4.21-suse2.patch b/lustre/kernel_patches/patches/ext3-mballoc-2.4.21-suse2.patch
index d9196dd..3fb5fda 100644
--- a/lustre/kernel_patches/patches/ext3-mballoc-2.4.21-suse2.patch
+++ b/lustre/kernel_patches/patches/ext3-mballoc-2.4.21-suse2.patch
@@ -67,7 +67,7 @@ Index: linux-2.4.21-suse2/fs/ext3/balloc.c
 +		return 1;
 +	}
 +
-+	/* if found extent has length we need, return it right now */
++	/* if found extent has lenght we need, return it right now */
 +	if (as->target_len == len)
 +		goto nice;
 +
@@ -85,7 +85,7 @@ Index: linux-2.4.21-suse2/fs/ext3/balloc.c
 +
 +	/* 1) closeness to goal */
 +	
-+	/* 2) extent length */
++	/* 2) extent lenght */
 +	/* 3) number of tested extent (we check all found extents) */
 +	/* */
 +	return 0;
@@ -93,7 +93,7 @@ Index: linux-2.4.21-suse2/fs/ext3/balloc.c
 +
 +/*
 + * this routine tries to find upto *len free contig. blocks
-+ * return number of found block (+ length of extent in *len)
++ * return number of found block (+ lenght of extent in *len)
 + * or -1 if no free blocks at all
 + */
 +int ext3_find_free_extent(struct buffer_head *bh, int goal, int *len, int max)
diff --git a/lustre/kernel_patches/patches/ext3-mballoc-2.4.24.patch b/lustre/kernel_patches/patches/ext3-mballoc-2.4.24.patch
index 9aefd43..83d638b 100644
--- a/lustre/kernel_patches/patches/ext3-mballoc-2.4.24.patch
+++ b/lustre/kernel_patches/patches/ext3-mballoc-2.4.24.patch
@@ -67,7 +67,7 @@ Index: linux-2.4.24/fs/ext3/balloc.c
 +		return 1;
 +	}
 +
-+	/* if found extent has length we need, return it right now */
++	/* if found extent has lenght we need, return it right now */
 +	if (as->target_len == len)
 +		goto nice;
 +
@@ -85,7 +85,7 @@ Index: linux-2.4.24/fs/ext3/balloc.c
 +
 +	/* 1) closeness to goal */
 +	
-+	/* 2) extent length */
++	/* 2) extent lenght */
 +	/* 3) number of tested extent (we check all found extents) */
 +	/* */
 +	return 0;
@@ -93,7 +93,7 @@ Index: linux-2.4.24/fs/ext3/balloc.c
 +
 +/*
 + * this routine tries to find upto *len free contig. blocks
-+ * return number of found block (+ length of extent in *len)
++ * return number of found block (+ lenght of extent in *len)
 + * or -1 if no free blocks at all
 + */
 +int ext3_find_free_extent(struct buffer_head *bh, int goal, int *len, int max)
diff --git a/lustre/kernel_patches/patches/ext3-mds-num-2.4.24.patch b/lustre/kernel_patches/patches/ext3-mds-num-2.4.24.patch
new file mode 100644
index 0000000..35aa918
--- /dev/null
+++ b/lustre/kernel_patches/patches/ext3-mds-num-2.4.24.patch
@@ -0,0 +1,285 @@
+Index: linux-2.4.24/fs/ext3/namei.c
+===================================================================
+--- linux-2.4.24.orig/fs/ext3/namei.c	2004-03-01 19:42:04.000000000 +0300
++++ linux-2.4.24/fs/ext3/namei.c	2004-03-29 19:27:13.000000000 +0400
+@@ -1100,6 +1100,23 @@
+ 	inode = NULL;
+ 	if (bh) {
+ 		unsigned long ino = le32_to_cpu(de->inode);
++		unsigned type = de->file_type;
++		__u32 *mds;
++		mds = (__u32 *)((char *) de + EXT3_DIR_REC_LEN(de->name_len));
++                if ((type & 128) && EXT3_HAS_INCOMPAT_FEATURE(dir->i_sb,
++				EXT3_FEATURE_INCOMPAT_MDSNUM) &&
++				mds[0] != EXT3_SB(dir->i_sb)->s_mdsnum) {
++			struct ext3_super_block *es;
++			es = EXT3_SB(dir->i_sb)->s_es;
++			ext3_unlock_htree(dir, lock);
++			brelse (bh);
++			dentry->d_flags |= DCACHE_CROSS_REF;
++			dentry->d_generation = mds[1];
++			dentry->d_mdsnum = mds[0];
++			dentry->d_inum = ino;
++			d_add(dentry, NULL);
++			return NULL;
++		}
+ 		ext3_unlock_htree(dir, lock);
+ 		brelse (bh);
+ 		inode = iget(dir->i_sb, ino);
+@@ -1160,7 +1177,7 @@
+ 	while (count--) {
+ 		struct ext3_dir_entry_2 *de =
+ 			(struct ext3_dir_entry_2 *) (from + map->offs);
+-		rec_len = EXT3_DIR_REC_LEN(de->name_len);
++		rec_len = EXT3_DIR_REC_LEN_DE(de);
+ 		memcpy (to, de, rec_len);
+ 		((struct ext3_dir_entry_2 *) to)->rec_len = rec_len;
+ 		de->inode = 0;
+@@ -1181,7 +1198,7 @@
+ 		next = (struct ext3_dir_entry_2 *) ((char *) de +
+ 						    le16_to_cpu(de->rec_len));
+ 		if (de->inode && de->name_len) {
+-			rec_len = EXT3_DIR_REC_LEN(de->name_len);
++			rec_len = EXT3_DIR_REC_LEN_DE(de);
+ 			if (de > to)
+ 				memmove(to, de, rec_len);
+ 			to->rec_len = rec_len;
+@@ -1297,6 +1314,7 @@
+ 			     struct buffer_head * bh)
+ {
+ 	struct inode	*dir = dentry->d_parent->d_inode;
++	struct super_block *sb = dir->i_sb;
+ 	const char	*name = dentry->d_name.name;
+ 	int		namelen = dentry->d_name.len;
+ 	unsigned long	offset = 0;
+@@ -1305,6 +1323,10 @@
+ 	char		*top;
+ 	
+ 	reclen = EXT3_DIR_REC_LEN(namelen);
++        if (EXT3_HAS_INCOMPAT_FEATURE(sb, EXT3_FEATURE_INCOMPAT_MDSNUM)
++			&& (dentry->d_flags & DCACHE_CROSS_REF)
++			&& (dentry->d_mdsnum != EXT3_SB(sb)->s_mdsnum))
++		reclen += 8; /* we need space to store mds num */
+ 	if (!de) {
+ 		de = (struct ext3_dir_entry_2 *)bh->b_data;
+ 		top = bh->b_data + dir->i_sb->s_blocksize - reclen;
+@@ -1318,7 +1340,7 @@
+ 				brelse (bh);
+ 				return -EEXIST;
+ 			}
+-			nlen = EXT3_DIR_REC_LEN(de->name_len);
++			nlen = EXT3_DIR_REC_LEN_DE(de);
+ 			rlen = le16_to_cpu(de->rec_len);
+ 			if ((de->inode? rlen - nlen: rlen) >= reclen)
+ 				break;
+@@ -1337,7 +1359,7 @@
+ 	}
+ 	
+ 	/* By now the buffer is marked for journaling */
+-	nlen = EXT3_DIR_REC_LEN(de->name_len);
++	nlen = EXT3_DIR_REC_LEN_DE(de);
+ 	rlen = le16_to_cpu(de->rec_len);
+ 	if (de->inode) {
+ 		struct ext3_dir_entry_2 *de1 =
+@@ -1349,8 +1371,20 @@
+ 	de->file_type = EXT3_FT_UNKNOWN;
+ 	if (inode) {
+ 		de->inode = cpu_to_le32(inode->i_ino);
+-		ext3_set_de_type(dir->i_sb, de, inode->i_mode);
+-	} else
++		ext3_set_de_type(sb, de, inode->i_mode);
++	} else if (EXT3_HAS_INCOMPAT_FEATURE(sb, EXT3_FEATURE_INCOMPAT_MDSNUM)
++			&& (dentry->d_flags & DCACHE_CROSS_REF)) {
++		if (dentry->d_mdsnum != EXT3_SB(sb)->s_mdsnum) {
++			__u32 *mds;
++			mds = (__u32 *)((char *)de + EXT3_DIR_REC_LEN(namelen));
++			mds[0] = cpu_to_le32(dentry->d_mdsnum);
++			mds[1] = cpu_to_le32(dentry->d_generation);
++			de->inode = cpu_to_le32(dentry->d_inum);
++			de->file_type = 128;
++		} else {
++			de->inode = cpu_to_le32(dentry->d_inum);
++		}
++	} else 
+ 		de->inode = 0;
+ 	de->name_len = namelen;
+ 	memcpy (de->name, name, namelen);
+@@ -2662,6 +2696,77 @@
+ }
+ 
+ /*
++ * caller has to make sure directory is protected
++ */
++int ext3_add_dir_entry(struct dentry *dentry)
++{
++	struct inode *dir = dentry->d_parent->d_inode;
++	handle_t *handle;
++	int err;
++
++	handle = ext3_journal_start(dir, EXT3_DATA_TRANS_BLOCKS +
++					EXT3_INDEX_EXTRA_TRANS_BLOCKS);
++	if (IS_ERR(handle)) {
++		return PTR_ERR(handle);
++	}
++
++	if (IS_SYNC(dir))
++		handle->h_sync = 1;
++
++	err = ext3_add_entry(handle, dentry, NULL);
++	ext3_journal_stop(handle, dir);
++	return err;
++}
++
++/*
++ * caller has to make sure directory is protected
++ */
++int ext3_del_dir_entry(struct dentry *dentry)
++{
++	struct inode * inode;
++	struct inode * dir = dentry->d_parent->d_inode;
++	struct buffer_head * bh;
++	struct ext3_dir_entry_2 * de;
++	handle_t *handle;
++	void *lock;
++	int retval;
++
++	handle = ext3_journal_start(dir, EXT3_DELETE_TRANS_BLOCKS);
++	if (IS_ERR(handle)) {
++		return PTR_ERR(handle);
++	}
++
++	if (IS_SYNC(dir))
++		handle->h_sync = 1;
++
++	retval = -ENOENT;
++	bh = ext3_find_entry (dentry, &de, 1, &lock);
++	if (!bh)
++		goto end_unlink;
++
++	inode = dentry->d_inode;
++	if (inode)
++		DQUOT_INIT(inode);
++
++	retval = ext3_delete_entry(handle, dir, de, bh);
++	ext3_unlock_htree(dir, lock);
++	if (retval)
++		goto end_unlink;
++	dir->i_ctime = dir->i_mtime = CURRENT_TIME;
++	ext3_update_dx_flag(dir);
++	ext3_mark_inode_dirty(handle, dir);
++	if (inode) {
++		inode->i_ctime = dir->i_ctime;
++		ext3_mark_inode_dirty(handle, inode);
++	}
++	retval = 0;
++
++end_unlink:
++	ext3_journal_stop(handle, dir);
++	brelse (bh);
++	return retval;
++}
++/*
+  * directories can handle most operations...
+  */
+ struct inode_operations ext3_dir_inode_operations = {
+Index: linux-2.4.24/fs/ext3/dir.c
+===================================================================
+--- linux-2.4.24.orig/fs/ext3/dir.c	2004-03-01 19:20:49.000000000 +0300
++++ linux-2.4.24/fs/ext3/dir.c	2004-03-01 19:42:15.000000000 +0300
+@@ -42,6 +42,9 @@
+ 
+ static unsigned char get_dtype(struct super_block *sb, int filetype)
+ {
++	if (EXT3_HAS_INCOMPAT_FEATURE(sb, EXT3_FEATURE_INCOMPAT_MDSNUM))
++		return DT_UNKNOWN;
++
+ 	if (!EXT3_HAS_INCOMPAT_FEATURE(sb, EXT3_FEATURE_INCOMPAT_FILETYPE) ||
+ 	    (filetype >= EXT3_FT_MAX))
+ 		return DT_UNKNOWN;
+Index: linux-2.4.24/fs/ext3/ext3-exports.c
+===================================================================
+--- linux-2.4.24.orig/fs/ext3/ext3-exports.c	2004-03-01 19:20:50.000000000 +0300
++++ linux-2.4.24/fs/ext3/ext3-exports.c	2004-03-11 23:40:49.000000000 +0300
+@@ -26,3 +26,10 @@
+ EXPORT_SYMBOL(ext3_decode_error);
+ EXPORT_SYMBOL(__ext3_std_error);
+ 
++int ext3_add_dir_entry (struct dentry *dentry);
++EXPORT_SYMBOL(ext3_add_dir_entry);
++int ext3_del_dir_entry(struct dentry *dentry);
++EXPORT_SYMBOL(ext3_del_dir_entry);
++
++
++
+Index: linux-2.4.24/include/linux/ext3_fs.h
+===================================================================
+--- linux-2.4.24.orig/include/linux/ext3_fs.h	2004-03-01 19:42:04.000000000 +0300
++++ linux-2.4.24/include/linux/ext3_fs.h	2004-03-01 19:42:15.000000000 +0300
+@@ -431,7 +431,8 @@
+ 	__u8	s_def_hash_version;	/* Default hash version to use */
+ 	__u8	s_reserved_char_pad;
+ 	__u16	s_reserved_word_pad;
+-	__u32	s_reserved[192];	/* Padding to the end of the block */
++	__u32	s_mdsnum;
++	__u32	s_reserved[191];	/* Padding to the end of the block */
+ };
+ 
+ #ifdef __KERNEL__
+@@ -504,10 +505,12 @@
+ #define EXT3_FEATURE_INCOMPAT_FILETYPE		0x0002
+ #define EXT3_FEATURE_INCOMPAT_RECOVER		0x0004 /* Needs recovery */
+ #define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV	0x0008 /* Journal device */
++#define EXT3_FEATURE_INCOMPAT_MDSNUM		0x0010 /* direntry has mdsnum */
+ 
+ #define EXT3_FEATURE_COMPAT_SUPP	EXT2_FEATURE_COMPAT_EXT_ATTR
+ #define EXT3_FEATURE_INCOMPAT_SUPP	(EXT3_FEATURE_INCOMPAT_FILETYPE| \
+-					 EXT3_FEATURE_INCOMPAT_RECOVER)
++					 EXT3_FEATURE_INCOMPAT_RECOVER| \
++					 EXT3_FEATURE_INCOMPAT_MDSNUM)
+ #define EXT3_FEATURE_RO_COMPAT_SUPP	(EXT3_FEATURE_RO_COMPAT_SPARSE_SUPER| \
+ 					 EXT3_FEATURE_RO_COMPAT_LARGE_FILE| \
+ 					 EXT3_FEATURE_RO_COMPAT_BTREE_DIR)
+@@ -568,6 +571,9 @@
+ #define EXT3_DIR_ROUND			(EXT3_DIR_PAD - 1)
+ #define EXT3_DIR_REC_LEN(name_len)	(((name_len) + 8 + EXT3_DIR_ROUND) & \
+ 					 ~EXT3_DIR_ROUND)
++#define EXT3_DIR_REC_LEN_DE(de)	(EXT3_DIR_REC_LEN((de)->name_len) + \
++					(((de)->file_type & 128) ? 8 : 0))
++
+ /*
+  * Hash Tree Directory indexing
+  * (c) Daniel Phillips, 2001
+Index: linux-2.4.24/include/linux/ext3_fs_sb.h
+===================================================================
+--- linux-2.4.24.orig/include/linux/ext3_fs_sb.h	2004-03-01 19:20:49.000000000 +0300
++++ linux-2.4.24/include/linux/ext3_fs_sb.h	2004-03-01 19:42:21.000000000 +0300
+@@ -86,6 +86,7 @@
+ 	wait_queue_head_t s_delete_thread_queue;
+ 	wait_queue_head_t s_delete_waiter_queue;
+ #endif
++	u32 s_mdsnum;
+ };
+ 
+ #endif	/* _LINUX_EXT3_FS_SB */
+Index: linux-2.4.24/include/linux/dcache.h
+===================================================================
+--- linux-2.4.24.orig/include/linux/dcache.h	2004-03-01 19:20:49.000000000 +0300
++++ linux-2.4.24/include/linux/dcache.h	2004-03-01 19:42:15.000000000 +0300
+@@ -118,6 +118,9 @@
+ 	atomic_t d_count;
+ 	unsigned int d_flags;
+ 	struct inode  * d_inode;	/* Where the name belongs to - NULL is negative */
++	unsigned d_inum;		/* for cross-fs references (Lustre) */
++	unsigned d_mdsnum;		/* for cross-fs references (Lustre) */
++	unsigned d_generation;		/* for cross-fs references (Lustre) */
+ 	struct dentry * d_parent;	/* parent directory */
+ 	struct list_head d_hash;	/* lookup hash list */
+ 	struct list_head d_lru;		/* d_count = 0 LRU list */
+@@ -189,6 +192,7 @@
+ 					 */
+ #define DCACHE_REFERENCED	0x0008  /* Recently used, don't discard. */
+ #define DCACHE_LUSTRE_INVALID	0x0010  /* Lustre invalidated */
++#define DCACHE_CROSS_REF	0x0020	/* entry points to inode on another MDS */
+ 
+ extern spinlock_t dcache_lock;
+ 
diff --git a/lustre/kernel_patches/patches/ext3-orphan_lock-2.4.19-suse.patch b/lustre/kernel_patches/patches/ext3-orphan_lock-2.4.19-suse.patch
index 1e26b8c..3c6b5e5 100644
--- a/lustre/kernel_patches/patches/ext3-orphan_lock-2.4.19-suse.patch
+++ b/lustre/kernel_patches/patches/ext3-orphan_lock-2.4.19-suse.patch
@@ -1,7 +1,7 @@
-Index: linux-2.4.19/fs/ext3/namei.c
+Index: linux-2.4.19.SuSE/fs/ext3/namei.c
 ===================================================================
---- linux-2.4.19.orig/fs/ext3/namei.c	2004-04-23 22:36:03.000000000 -0400
-+++ linux-2.4.19/fs/ext3/namei.c	2004-04-23 22:37:37.000000000 -0400
+--- linux-2.4.19.SuSE.orig/fs/ext3/namei.c	Sun Nov 16 01:14:50 2003
++++ linux-2.4.19.SuSE/fs/ext3/namei.c	Sun Nov 16 01:18:04 2003
 @@ -1751,8 +1751,8 @@
  	struct super_block *sb = inode->i_sb;
  	struct ext3_iloc iloc;
@@ -25,7 +25,7 @@ Index: linux-2.4.19/fs/ext3/namei.c
 @@ -1813,20 +1813,19 @@
  {
  	struct list_head *prev;
-         struct ext3_inode_info *ei = EXT3_I(inode);
+ 	struct ext3_inode_info *ei = EXT3_I(inode);
 -	struct ext3_sb_info *sbi;
 +	struct ext3_sb_info *sbi = EXT3_SB(inode->i_sb);
  	unsigned long ino_next;
@@ -33,15 +33,15 @@ Index: linux-2.4.19/fs/ext3/namei.c
  	int err = 0;
  
 -	lock_super(inode->i_sb);
-+        down(&sbi->s_orphan_lock);
-         if (list_empty(&ei->i_orphan)) {
++	down(&sbi->s_orphan_lock);
+ 	if (list_empty(&ei->i_orphan)) {
 -		unlock_super(inode->i_sb);
-+                up(&sbi->s_orphan_lock);
++		up(&sbi->s_orphan_lock);
  		return 0;
  	}
  
  	ino_next = NEXT_ORPHAN(inode);
-         prev = ei->i_orphan.prev;
+ 	prev = ei->i_orphan.prev;
 -	sbi = EXT3_SB(inode->i_sb);
  
  	jbd_debug(4, "remove inode %lu from orphan list\n", inode->i_ino);
@@ -59,11 +59,11 @@ Index: linux-2.4.19/fs/ext3/namei.c
  	return err;
  
  out_brelse:
-Index: linux-2.4.19/fs/ext3/super.c
+Index: linux-2.4.19.SuSE/fs/ext3/super.c
 ===================================================================
---- linux-2.4.19.orig/fs/ext3/super.c	2004-04-23 22:30:41.000000000 -0400
-+++ linux-2.4.19/fs/ext3/super.c	2004-04-23 22:36:22.000000000 -0400
-@@ -1179,6 +1179,7 @@
+--- linux-2.4.19.SuSE.orig/fs/ext3/super.c	Sun Nov 16 00:40:59 2003
++++ linux-2.4.19.SuSE/fs/ext3/super.c	Sun Nov 16 01:18:04 2003
+@@ -1182,6 +1182,7 @@
  	 */
  	sb->s_op = &ext3_sops;
  	INIT_LIST_HEAD(&sbi->s_orphan); /* unlinked but open files */
@@ -71,10 +71,10 @@ Index: linux-2.4.19/fs/ext3/super.c
  
  	sb->s_root = 0;
  
-Index: linux-2.4.19/include/linux/ext3_fs_sb.h
+Index: linux-2.4.19.SuSE/include/linux/ext3_fs_sb.h
 ===================================================================
---- linux-2.4.19.orig/include/linux/ext3_fs_sb.h	2004-04-23 18:26:27.000000000 -0400
-+++ linux-2.4.19/include/linux/ext3_fs_sb.h	2004-04-23 22:36:22.000000000 -0400
+--- linux-2.4.19.SuSE.orig/include/linux/ext3_fs_sb.h	Sat Nov 15 23:58:28 2003
++++ linux-2.4.19.SuSE/include/linux/ext3_fs_sb.h	Sun Nov 16 01:18:41 2003
 @@ -69,6 +69,7 @@
  	struct inode * s_journal_inode;
  	struct journal_s * s_journal;
diff --git a/lustre/kernel_patches/patches/ext3-pdirops-2.4.24.patch b/lustre/kernel_patches/patches/ext3-pdirops-2.4.24.patch
new file mode 100644
index 0000000..dc1ea62
--- /dev/null
+++ b/lustre/kernel_patches/patches/ext3-pdirops-2.4.24.patch
@@ -0,0 +1,1248 @@
+ fs/ext3/ialloc.c          |    3 
+ fs/ext3/inode.c           |    3 
+ fs/ext3/namei.c           |  582 +++++++++++++++++++++++++++++++++++++---------
+ fs/ext3/super.c           |   14 +
+ include/linux/ext3_fs.h   |    1 
+ include/linux/ext3_fs_i.h |    6 
+ 6 files changed, 500 insertions(+), 109 deletions(-)
+
+Index: linux-2.4.24/fs/ext3/namei.c
+===================================================================
+--- linux-2.4.24.orig/fs/ext3/namei.c	2004-04-01 20:22:17.000000000 +0400
++++ linux-2.4.24/fs/ext3/namei.c	2004-04-01 20:24:48.000000000 +0400
+@@ -51,6 +51,9 @@
+ {
+ 	struct buffer_head *bh;
+ 
++	/* with parallel dir operations all appends
++	 * have to be serialized -bzzz */
++	down(&EXT3_I(inode)->i_append_sem);
+ 	*block = inode->i_size >> inode->i_sb->s_blocksize_bits;
+ 
+ 	if ((bh = ext3_bread(handle, inode, *block, 1, err))) {
+@@ -58,6 +61,8 @@
+ 		EXT3_I(inode)->i_disksize = inode->i_size;
+ 		ext3_journal_get_write_access(handle,bh);
+ 	}
++	up(&EXT3_I(inode)->i_append_sem);
++	
+ 	return bh;
+ }
+ 
+@@ -134,6 +139,8 @@
+ 	struct buffer_head *bh;
+ 	struct dx_entry *entries;
+ 	struct dx_entry *at;
++	unsigned long leaf;
++	unsigned int curidx;
+ };
+ 
+ struct dx_map_entry
+@@ -142,6 +149,30 @@
+ 	u32 offs;
+ };
+ 
++/* FIXME: this should be reworked using bb_spin_lock
++ * introduced in -mm tree
++ */
++#define BH_DXLock	25
++
++static inline void dx_lock_bh(struct buffer_head volatile *bh)
++{
++#ifdef CONFIG_SMP
++        while (test_and_set_bit(BH_DXLock, &bh->b_state)) {
++                while (test_bit(BH_DXLock, &bh->b_state))
++                        cpu_relax();
++        }
++#endif
++}
++
++static inline void dx_unlock_bh(struct buffer_head *bh)
++{
++#ifdef CONFIG_SMP
++        smp_mb__before_clear_bit();
++        clear_bit(BH_DXLock, &bh->b_state);
++#endif
++}
++
++
+ #ifdef CONFIG_EXT3_INDEX
+ static inline unsigned dx_get_block (struct dx_entry *entry);
+ static void dx_set_block (struct dx_entry *entry, unsigned value);
+@@ -153,7 +184,7 @@
+ static void dx_set_limit (struct dx_entry *entries, unsigned value);
+ static unsigned dx_root_limit (struct inode *dir, unsigned infosize);
+ static unsigned dx_node_limit (struct inode *dir);
+-static struct dx_frame *dx_probe(struct dentry *dentry,
++static struct dx_frame *dx_probe(struct qstr *name,
+ 				 struct inode *dir,
+ 				 struct dx_hash_info *hinfo,
+ 				 struct dx_frame *frame,
+@@ -165,15 +196,18 @@
+ static struct ext3_dir_entry_2 *dx_move_dirents (char *from, char *to,
+ 		struct dx_map_entry *offsets, int count);
+ static struct ext3_dir_entry_2* dx_pack_dirents (char *base, int size);
+-static void dx_insert_block (struct dx_frame *frame, u32 hash, u32 block);
++static void dx_insert_block (struct inode *, struct dx_frame *, u32, u32, u32);
+ static int ext3_htree_next_block(struct inode *dir, __u32 hash,
+ 				 struct dx_frame *frame,
+ 				 struct dx_frame *frames, int *err,
+ 				 __u32 *start_hash);
+ static struct buffer_head * ext3_dx_find_entry(struct dentry *dentry,
+-		       struct ext3_dir_entry_2 **res_dir, int *err);
++		       struct ext3_dir_entry_2 **res_dir, int *err,
++		       int rwlock, void **lock);
+ static int ext3_dx_add_entry(handle_t *handle, struct dentry *dentry,
+ 			     struct inode *inode);
++static inline void *ext3_lock_htree(struct inode *, unsigned long, int);
++static inline void ext3_unlock_htree(struct inode *, void *);
+ 
+ /*
+  * Future: use high four bits of block for coalesce-on-delete flags
+@@ -306,6 +340,94 @@
+ #endif /* DX_DEBUG */
+ 
+ /*
++ * dx_find_position
++ *
++ * search position of specified hash in index
++ *
++ */
++
++struct dx_entry * dx_find_position(struct dx_entry * entries, u32 hash)
++{
++	struct dx_entry *p, *q, *m;
++	int count;
++
++	count = dx_get_count(entries);
++	p = entries + 1;
++	q = entries + count - 1;
++	while (p <= q)
++	{
++		m = p + (q - p)/2;
++		if (dx_get_hash(m) > hash)
++			q = m - 1;
++		else
++			p = m + 1;
++	}
++	return p - 1;
++}
++
++/*
++ * returns 1 if path is unchanged
++ */
++int dx_check_path(struct dx_frame *frame, u32 hash)
++{
++	struct dx_entry *p;
++	int ret = 1;
++
++	dx_lock_bh(frame->bh);
++	p = dx_find_position(frame->entries, hash);
++	if (frame->leaf != dx_get_block(p))
++		ret = 0;
++	dx_unlock_bh(frame->bh);
++	
++	return ret;
++}
++
++/*
++ * 0 - changed
++ * 1 - hasn't changed
++ */
++static int
++dx_check_full_path(struct dx_frame *frames, struct dx_hash_info *hinfo)
++{
++	struct dx_entry *p;
++	struct dx_frame *frame = frames;
++	u32 leaf;
++
++	/* check first level */
++	dx_lock_bh(frame->bh);
++	p = dx_find_position(frame->entries, hinfo->hash);
++	leaf = dx_get_block(p);
++	dx_unlock_bh(frame->bh);
++	
++	if (leaf != frame->leaf) 
++		return 0;
++	
++	/* is there 2nd level? */
++	frame++;
++	if (frame->bh == NULL)
++		return 1;
++
++	/* check second level */
++	dx_lock_bh(frame->bh);
++
++	/* probably 1st level got changed, check it */
++	if (!dx_check_path(frames, hinfo->hash)) {
++		/* path changed */
++		dx_unlock_bh(frame->bh);
++		return 0;
++	}
++
++	p = dx_find_position(frame->entries, hinfo->hash);
++	leaf = dx_get_block(p);
++	dx_unlock_bh(frame->bh);
++	
++	if (leaf != frame->leaf)
++		return 0;
++
++	return 1;
++}
++
++/*
+  * Probe for a directory leaf block to search.
+  *
+  * dx_probe can return ERR_BAD_DX_DIR, which means there was a format
+@@ -315,19 +437,20 @@
+  * back to userspace.
+  */
+ static struct dx_frame *
+-dx_probe(struct dentry *dentry, struct inode *dir,
++dx_probe(struct qstr *name, struct inode *dir,
+ 	 struct dx_hash_info *hinfo, struct dx_frame *frame_in, int *err)
+ {
+-	unsigned count, indirect;
+-	struct dx_entry *at, *entries, *p, *q, *m;
++	unsigned indirect;
++	struct dx_entry *at, *entries;
+ 	struct dx_root *root;
+ 	struct buffer_head *bh;
+ 	struct dx_frame *frame = frame_in;
+ 	u32 hash;
++	unsigned int curidx;
+ 
+ 	frame->bh = NULL;
+-	if (dentry)
+-		dir = dentry->d_parent->d_inode;
++	frame[1].bh = NULL;
++
+ 	if (!(bh = ext3_bread (NULL,dir, 0, 0, err)))
+ 		goto fail;
+ 	root = (struct dx_root *) bh->b_data;
+@@ -343,8 +466,8 @@
+ 	}
+ 	hinfo->hash_version = root->info.hash_version;
+ 	hinfo->seed = dir->i_sb->u.ext3_sb.s_hash_seed;
+-	if (dentry)
+-		ext3fs_dirhash(dentry->d_name.name, dentry->d_name.len, hinfo);
++	if (name)
++		ext3fs_dirhash(name->name, name->len, hinfo);
+ 	hash = hinfo->hash;
+ 
+ 	if (root->info.unused_flags & 1) {
+@@ -356,7 +479,19 @@
+ 		goto fail;
+ 	}
+ 
++repeat:
++	curidx = 0;
++	entries = (struct dx_entry *) (((char *)&root->info) +
++				       root->info.info_length);
++	assert(dx_get_limit(entries) == dx_root_limit(dir,
++						      root->info.info_length));
++	dxtrace (printk("Look up %x", hash));
++	dx_lock_bh(bh);
++	/* indirect must be initialized under bh lock because
++	 * 2nd level creation procedure may change it and dx_probe()
++	 * will suggest htree is still single-level -bzzz */
+ 	if ((indirect = root->info.indirect_levels) > 1) {
++		dx_unlock_bh(bh);
+ 		ext3_warning(dir->i_sb, __FUNCTION__,
+ 			     "Unimplemented inode hash depth: %#06x",
+ 			     root->info.indirect_levels);
+@@ -364,56 +499,46 @@
+ 		*err = ERR_BAD_DX_DIR;
+ 		goto fail;
+ 	}
+-
+-	entries = (struct dx_entry *) (((char *)&root->info) +
+-				       root->info.info_length);
+-	assert(dx_get_limit(entries) == dx_root_limit(dir,
+-						      root->info.info_length));
+-	dxtrace (printk("Look up %x", hash));
++	
+ 	while (1)
+ 	{
+-		count = dx_get_count(entries);
+-		assert (count && count <= dx_get_limit(entries));
+-		p = entries + 1;
+-		q = entries + count - 1;
+-		while (p <= q)
+-		{
+-			m = p + (q - p)/2;
+-			dxtrace(printk("."));
+-			if (dx_get_hash(m) > hash)
+-				q = m - 1;
+-			else
+-				p = m + 1;
+-		}
+-
+-		if (0) // linear search cross check
+-		{
+-			unsigned n = count - 1;
+-			at = entries;
+-			while (n--)
+-			{
+-				dxtrace(printk(","));
+-				if (dx_get_hash(++at) > hash)
+-				{
+-					at--;
+-					break;
+-				}
+-			}
+-			assert (at == p - 1);
+-		}
+-
+-		at = p - 1;
+-		dxtrace(printk(" %x->%u\n", at == entries? 0: dx_get_hash(at), dx_get_block(at)));
++		at = dx_find_position(entries, hinfo->hash);
++		dxtrace(printk(" %x->%u\n",
++				at == entries? 0: dx_get_hash(at),
++				dx_get_block(at)));
+ 		frame->bh = bh;
+ 		frame->entries = entries;
+ 		frame->at = at;
+-		if (!indirect--) return frame;
+-		if (!(bh = ext3_bread (NULL,dir, dx_get_block(at), 0, err)))
++		frame->curidx = curidx;
++		frame->leaf = dx_get_block(at);
++		if (!indirect--) {
++			dx_unlock_bh(bh);
++			return frame;
++		}
++		
++		/* step into next htree level */
++		curidx = dx_get_block(at);
++		dx_unlock_bh(bh);
++		if (!(bh = ext3_bread (NULL,dir, frame->leaf, 0, err)))
+ 			goto fail2;
++		
++		dx_lock_bh(bh);
++		/* splitting may change root index block and move
++		 * hash we're looking for into another index block
++		 * so, we have to check this situation and repeat
++		 * from begining if path got changed -bzzz */
++		if (!dx_check_path(frame, hash)) {
++			dx_unlock_bh(bh);
++			bh = frame->bh;
++			indirect++;
++			goto repeat;
++		}
++		
+ 		at = entries = ((struct dx_node *) bh->b_data)->entries;
+ 		assert (dx_get_limit(entries) == dx_node_limit (dir));
+ 		frame++;
+ 	}
++	dx_unlock_bh(bh);
+ fail2:
+ 	while (frame >= frame_in) {
+ 		brelse(frame->bh);
+@@ -427,8 +552,7 @@
+ {
+ 	if (frames[0].bh == NULL)
+ 		return;
+-
+-	if (((struct dx_root *) frames[0].bh->b_data)->info.indirect_levels)
++	if (frames[1].bh != NULL)
+ 		brelse(frames[1].bh);
+ 	brelse(frames[0].bh);
+ }
+@@ -470,8 +594,10 @@
+ 	 * nodes need to be read.
+ 	 */
+ 	while (1) {
+-		if (++(p->at) < p->entries + dx_get_count(p->entries))
++		if (++(p->at) < p->entries + dx_get_count(p->entries)) {
++			p->leaf = dx_get_block(p->at);
+ 			break;
++		}
+ 		if (p == frames)
+ 			return 0;
+ 		num_frames++;
+@@ -497,13 +623,17 @@
+ 	 * block so no check is necessary
+ 	 */
+ 	while (num_frames--) {
+-		if (!(bh = ext3_bread(NULL, dir, dx_get_block(p->at),
+-				      0, err)))
++		u32 idx;
++		
++		idx = p->leaf = dx_get_block(p->at);
++		if (!(bh = ext3_bread(NULL, dir, idx, 0, err)))
+ 			return -1; /* Failure */
+ 		p++;
+ 		brelse (p->bh);
+ 		p->bh = bh;
+ 		p->at = p->entries = ((struct dx_node *) bh->b_data)->entries;
++		p->curidx = idx;
++		p->leaf = dx_get_block(p->at);
+ 	}
+ 	return 1;
+ }
+@@ -543,7 +673,7 @@
+ 	dir = dir_file->f_dentry->d_inode;
+ 	hinfo.hash = start_hash;
+ 	hinfo.minor_hash = 0;
+-	frame = dx_probe(0, dir_file->f_dentry->d_inode, &hinfo, frames, &err);
++	frame = dx_probe(NULL, dir_file->f_dentry->d_inode, &hinfo, frames, &err);
+ 	if (!frame)
+ 		return err;
+ 
+@@ -625,7 +755,8 @@
+ 			count++;
+ 		}
+ 		/* XXX: do we need to check rec_len == 0 case? -Chris */
+-		de = (struct ext3_dir_entry_2 *) ((char *) de + le16_to_cpu(de->rec_len));
++		de = (struct ext3_dir_entry_2 *)((char*)de +
++				le16_to_cpu(de->rec_len));
+ 	}
+ 	return count;
+ }
+@@ -658,7 +789,8 @@
+ 	} while(more);
+ }
+ 
+-static void dx_insert_block(struct dx_frame *frame, u32 hash, u32 block)
++static void dx_insert_block(struct inode *dir, struct dx_frame *frame,
++			u32 hash, u32 block, u32 idx)
+ {
+ 	struct dx_entry *entries = frame->entries;
+ 	struct dx_entry *old = frame->at, *new = old + 1;
+@@ -670,6 +802,7 @@
+ 	dx_set_hash(new, hash);
+ 	dx_set_block(new, block);
+ 	dx_set_count(entries, count + 1);
++	
+ }
+ #endif
+ 
+@@ -752,7 +885,8 @@
+ 
+ 	
+ static struct buffer_head * ext3_find_entry (struct dentry *dentry,
+-					struct ext3_dir_entry_2 ** res_dir)
++					struct ext3_dir_entry_2 ** res_dir,
++					int rwlock, void **lock)
+ {
+ 	struct super_block * sb;
+ 	struct buffer_head * bh_use[NAMEI_RA_SIZE];
+@@ -768,6 +902,7 @@
+ 	int namelen;
+ 	const u8 *name;
+ 	unsigned blocksize;
++	int do_not_use_dx = 0;
+ 
+ 	*res_dir = NULL;
+ 	sb = dir->i_sb;
+@@ -776,9 +911,10 @@
+ 	name = dentry->d_name.name;
+ 	if (namelen > EXT3_NAME_LEN)
+ 		return NULL;
++repeat:
+ #ifdef CONFIG_EXT3_INDEX
+ 	if (is_dx(dir)) {
+-		bh = ext3_dx_find_entry(dentry, res_dir, &err);
++		bh = ext3_dx_find_entry(dentry, res_dir, &err, rwlock, lock);
+ 		/*
+ 		 * On success, or if the error was file not found,
+ 		 * return.  Otherwise, fall back to doing a search the
+@@ -787,8 +923,14 @@
+ 		if (bh || (err != ERR_BAD_DX_DIR))
+ 			return bh;
+ 		dxtrace(printk("ext3_find_entry: dx failed, falling back\n"));
++		do_not_use_dx = 1;
+ 	}
+ #endif
++	*lock = ext3_lock_htree(dir, 0, rwlock);
++	if (is_dx(dir) && !do_not_use_dx) {
++		ext3_unlock_htree(dir, *lock);
++		goto repeat;
++	}
+ 	nblocks = dir->i_size >> EXT3_BLOCK_SIZE_BITS(sb);
+ 	start = EXT3_I(dir)->i_dir_start_lookup;
+ 	if (start >= nblocks)
+@@ -859,12 +1001,17 @@
+ 	/* Clean up the read-ahead blocks */
+ 	for (; ra_ptr < ra_max; ra_ptr++)
+ 		brelse (bh_use[ra_ptr]);
++	if (!ret) {
++		ext3_unlock_htree(dir, *lock);
++		*lock = NULL;
++	}
+ 	return ret;
+ }
+ 
+ #ifdef CONFIG_EXT3_INDEX
+ static struct buffer_head * ext3_dx_find_entry(struct dentry *dentry,
+-		       struct ext3_dir_entry_2 **res_dir, int *err)
++		       struct ext3_dir_entry_2 **res_dir, int *err,
++		       int rwlock, void **lock)
+ {
+ 	struct super_block * sb;
+ 	struct dx_hash_info	hinfo;
+@@ -879,11 +1026,22 @@
+ 	struct inode *dir = dentry->d_parent->d_inode;
+ 	
+ 	sb = dir->i_sb;
+-	if (!(frame = dx_probe (dentry, 0, &hinfo, frames, err)))
++repeat:
++	if (!(frame = dx_probe (&dentry->d_name, dir, &hinfo, frames, err)))
+ 		return NULL;
++	
++	*lock = ext3_lock_htree(dir, frame->leaf, rwlock);
++	/* while locking leaf we just found may get splitted
++	 * so, we need another leaf. check this */
++	if (!dx_check_full_path(frames, &hinfo)) {
++		ext3_unlock_htree(dir, *lock);
++		dx_release(frames);
++		goto repeat;
++	}
++
+ 	hash = hinfo.hash;
+ 	do {
+-		block = dx_get_block(frame->at);
++		block = frame->leaf;
+ 		if (!(bh = ext3_bread (NULL,dir, block, 0, err)))
+ 			goto errout;
+ 		de = (struct ext3_dir_entry_2 *) bh->b_data;
+@@ -917,6 +1075,8 @@
+ 	*err = -ENOENT;
+ errout:
+ 	dxtrace(printk("%s not found\n", name));
++	ext3_unlock_htree(dir, *lock);
++	*lock = NULL;
+ 	dx_release (frames);
+ 	return NULL;
+ }
+@@ -927,6 +1087,7 @@
+ 	struct inode * inode;
+ 	struct ext3_dir_entry_2 * de;
+ 	struct buffer_head * bh;
++	void *lock = NULL;
+ 
+ 	if (dentry->d_name.len > EXT3_NAME_LEN)
+ 		return ERR_PTR(-ENAMETOOLONG);
+@@ -934,10 +1095,11 @@
+ 	if (ext3_check_for_iopen(dir, dentry))
+ 		return NULL;
+ 
+-	bh = ext3_find_entry(dentry, &de);
++	bh = ext3_find_entry(dentry, &de, 0, &lock);
+ 	inode = NULL;
+ 	if (bh) {
+ 		unsigned long ino = le32_to_cpu(de->inode);
++		ext3_unlock_htree(dir, lock);
+ 		brelse (bh);
+ 		inode = iget(dir->i_sb, ino);
+ 
+@@ -974,7 +1136,8 @@
+ 	unsigned rec_len = 0;
+ 
+ 	while (count--) {
+-		struct ext3_dir_entry_2 *de = (struct ext3_dir_entry_2 *) (from + map->offs);
++		struct ext3_dir_entry_2 *de =
++			(struct ext3_dir_entry_2 *) (from + map->offs);
+ 		rec_len = EXT3_DIR_REC_LEN(de->name_len);
+ 		memcpy (to, de, rec_len);
+ 		((struct ext3_dir_entry_2 *) to)->rec_len = rec_len;
+@@ -987,7 +1150,8 @@
+ 
+ static struct ext3_dir_entry_2* dx_pack_dirents(char *base, int size)
+ {
+-	struct ext3_dir_entry_2 *next, *to, *prev, *de = (struct ext3_dir_entry_2 *) base;
++	struct ext3_dir_entry_2 *next, *to, *prev;
++	struct ext3_dir_entry_2 *de = (struct ext3_dir_entry_2 *) base;
+ 	unsigned rec_len = 0;
+ 
+ 	prev = to = de;
+@@ -1009,7 +1173,8 @@
+ 
+ static struct ext3_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,
+ 			struct buffer_head **bh,struct dx_frame *frame,
+-			struct dx_hash_info *hinfo, int *error)
++			struct dx_hash_info *hinfo, void **target,
++			int *error)
+ {
+ 	unsigned blocksize = dir->i_sb->s_blocksize;
+ 	unsigned count, continued;
+@@ -1056,23 +1221,30 @@
+ 	hash2 = map[split].hash;
+ 	continued = hash2 == map[split - 1].hash;
+ 	dxtrace(printk("Split block %i at %x, %i/%i\n",
+-		dx_get_block(frame->at), hash2, split, count-split));
+-
++		frame->leaf, hash2, split, count-split));
++	
+ 	/* Fancy dance to stay within two buffers */
+ 	de2 = dx_move_dirents(data1, data2, map + split, count - split);
+ 	de = dx_pack_dirents(data1,blocksize);
+ 	de->rec_len = cpu_to_le16(data1 + blocksize - (char *) de);
+ 	de2->rec_len = cpu_to_le16(data2 + blocksize - (char *) de2);
+-	dxtrace(dx_show_leaf (hinfo, (struct ext3_dir_entry_2 *) data1, blocksize, 1));
+-	dxtrace(dx_show_leaf (hinfo, (struct ext3_dir_entry_2 *) data2, blocksize, 1));
++	dxtrace(dx_show_leaf(hinfo,(struct ext3_dir_entry_2*) data1, blocksize, 1));
++	dxtrace(dx_show_leaf(hinfo,(struct ext3_dir_entry_2*) data2, blocksize, 1));
+ 
+ 	/* Which block gets the new entry? */
++	*target = NULL;
+ 	if (hinfo->hash >= hash2)
+ 	{
+ 		swap(*bh, bh2);
+ 		de = de2;
+-	}
+-	dx_insert_block (frame, hash2 + continued, newblock);
++
++		/* entry will be stored into new block
++		 * we have to lock it before add_dirent_to_buf */
++		*target = ext3_lock_htree(dir, newblock, 1);
++	}
++	dx_lock_bh(frame->bh);
++	dx_insert_block (dir, frame, hash2 + continued, newblock, frame->curidx);
++	dx_unlock_bh(frame->bh);
+ 	err = ext3_journal_dirty_metadata (handle, bh2);
+ 	if (err)
+ 		goto journal_error;
+@@ -1146,7 +1318,8 @@
+ 	nlen = EXT3_DIR_REC_LEN(de->name_len);
+ 	rlen = le16_to_cpu(de->rec_len);
+ 	if (de->inode) {
+-		struct ext3_dir_entry_2 *de1 = (struct ext3_dir_entry_2 *)((char *)de + nlen);
++		struct ext3_dir_entry_2 *de1 =
++			(struct ext3_dir_entry_2 *)((char *)de + nlen);
+ 		de1->rec_len = cpu_to_le16(rlen - nlen);
+ 		de->rec_len = cpu_to_le16(nlen);
+ 		de = de1;
+@@ -1204,7 +1377,8 @@
+ 	unsigned	blocksize;
+ 	struct dx_hash_info hinfo;
+ 	u32		block;
+-		
++	void		*lock, *new_lock;
++
+ 	blocksize =  dir->i_sb->s_blocksize;
+ 	dxtrace(printk("Creating index\n"));
+ 	retval = ext3_journal_get_write_access(handle, bh);
+@@ -1215,7 +1389,6 @@
+ 	}
+ 	root = (struct dx_root *) bh->b_data;
+ 		
+-	EXT3_I(dir)->i_flags |= EXT3_INDEX_FL;
+ 	bh2 = ext3_append (handle, dir, &block, &retval);
+ 	if (!(bh2)) {
+ 		brelse(bh);
+@@ -1223,6 +1396,8 @@
+ 	}
+ 	data1 = bh2->b_data;
+ 
++	lock = ext3_lock_htree(dir, block, 1);
++
+ 	/* The 0th block becomes the root, move the dirents out */
+ 	de = (struct ext3_dir_entry_2 *) &root->dotdot;
+ 	de = (struct ext3_dir_entry_2 *) ((char *)de + de->rec_len);
+@@ -1252,13 +1427,25 @@
+ 	frame->entries = entries;
+ 	frame->at = entries;
+ 	frame->bh = bh;
++	frame->curidx = 0;
++	frame->leaf = 0;
++	frame[1].bh = NULL;
+ 	bh = bh2;
+-	de = do_split(handle,dir, &bh, frame, &hinfo, &retval);
++	de = do_split(handle,dir, &bh, frame, &hinfo, &new_lock, &retval);
+ 	dx_release (frames);
+ 	if (!(de))
+-		return retval;
++		goto cleanup;
++
++	retval = add_dirent_to_buf(handle, dentry, inode, de, bh);
++cleanup:
++	if (new_lock)
++		ext3_unlock_htree(dir, new_lock);
++	/* we mark directory indexed in order to
++	 * avoid races while htree being created -bzzz */
++	EXT3_I(dir)->i_flags |= EXT3_INDEX_FL;
++	ext3_unlock_htree(dir, lock);
+ 
+-	return add_dirent_to_buf(handle, dentry, inode, de, bh);
++	return retval;
+ }
+ #endif
+ 
+@@ -1287,11 +1474,13 @@
+ 	unsigned blocksize;
+ 	unsigned nlen, rlen;
+ 	u32 block, blocks;
++	void *lock;
+ 
+ 	sb = dir->i_sb;
+ 	blocksize = sb->s_blocksize;
+ 	if (!dentry->d_name.len)
+ 		return -EINVAL;
++repeat:
+ #ifdef CONFIG_EXT3_INDEX
+ 	if (is_dx(dir)) {
+ 		retval = ext3_dx_add_entry(handle, dentry, inode);
+@@ -1302,36 +1491,53 @@
+ 		ext3_mark_inode_dirty(handle, dir);
+ 	}
+ #endif
++	lock = ext3_lock_htree(dir, 0, 1);
++	if (is_dx(dir)) {
++		/* we got lock for block 0
++		 * probably previous holder of the lock
++		 * created htree -bzzz */
++		ext3_unlock_htree(dir, lock);
++		goto repeat;
++	}
++	
+ 	blocks = dir->i_size >> sb->s_blocksize_bits;
+ 	for (block = 0, offset = 0; block < blocks; block++) {
+ 		bh = ext3_bread(handle, dir, block, 0, &retval);
+-		if(!bh)
++		if(!bh) {
++			ext3_unlock_htree(dir, lock);
+ 			return retval;
++		}
+ 		retval = add_dirent_to_buf(handle, dentry, inode, 0, bh);
+-		if (retval != -ENOSPC)
++		if (retval != -ENOSPC) {
++			ext3_unlock_htree(dir, lock);
+ 			return retval;
++		}
+ 
+ #ifdef CONFIG_EXT3_INDEX
+ 		if (blocks == 1 && !dx_fallback &&
+-		    EXT3_HAS_COMPAT_FEATURE(sb, EXT3_FEATURE_COMPAT_DIR_INDEX))
+-			return make_indexed_dir(handle, dentry, inode, bh);
++		    EXT3_HAS_COMPAT_FEATURE(sb, EXT3_FEATURE_COMPAT_DIR_INDEX)) {
++			retval = make_indexed_dir(handle, dentry, inode, bh);
++			ext3_unlock_htree(dir, lock);
++			return retval;
++		}
+ #endif
+ 		brelse(bh);
+ 	}
+ 	bh = ext3_append(handle, dir, &block, &retval);
+-	if (!bh)
++	if (!bh) {
++		ext3_unlock_htree(dir, lock);
+ 		return retval;
++	}
+ 	de = (struct ext3_dir_entry_2 *) bh->b_data;
+ 	de->inode = 0;
+ 	de->rec_len = cpu_to_le16(rlen = blocksize);
+ 	nlen = 0;
+-	return add_dirent_to_buf(handle, dentry, inode, de, bh);
++	retval = add_dirent_to_buf(handle, dentry, inode, de, bh);
++	ext3_unlock_htree(dir, lock);
++	return retval;
+ }
+ 
+ #ifdef CONFIG_EXT3_INDEX
+-/*
+- * Returns 0 for success, or a negative error value
+- */
+ static int ext3_dx_add_entry(handle_t *handle, struct dentry *dentry,
+ 			     struct inode *inode)
+ {
+@@ -1343,15 +1549,28 @@
+ 	struct super_block * sb = dir->i_sb;
+ 	struct ext3_dir_entry_2 *de;
+ 	int err;
+-
+-	frame = dx_probe(dentry, 0, &hinfo, frames, &err);
++	int curidx;
++	void *idx_lock, *leaf_lock, *newleaf_lock;
++	
++repeat:
++	frame = dx_probe(&dentry->d_name, dir, &hinfo, frames, &err);
+ 	if (!frame)
+ 		return err;
+-	entries = frame->entries;
+-	at = frame->at;
+ 
+-	if (!(bh = ext3_bread(handle,dir, dx_get_block(frame->at), 0, &err)))
++	/* we're going to chage leaf, so lock it first */
++	leaf_lock = ext3_lock_htree(dir, frame->leaf, 1);
++
++	/* while locking leaf we just found may get splitted
++	 * so we need to check this */
++	if (!dx_check_full_path(frames, &hinfo)) {
++		ext3_unlock_htree(dir, leaf_lock);
++		dx_release(frames);
++		goto repeat;
++	}
++	if (!(bh = ext3_bread(handle,dir, frame->leaf, 0, &err))) {
++		printk("can't ext3_bread(%d) = %d\n", (int) frame->leaf, err);
+ 		goto cleanup;
++	}
+ 
+ 	BUFFER_TRACE(bh, "get_write_access");
+ 	err = ext3_journal_get_write_access(handle, bh);
+@@ -1364,6 +1583,35 @@
+ 		goto cleanup;
+ 	}
+ 
++	/* our leaf has no enough space. hence, we have to
++	 * split it. so lock index for this leaf first */
++	curidx = frame->curidx;
++	idx_lock = ext3_lock_htree(dir, curidx, 1);
++
++	/* now check did path get changed? */
++	dx_release(frames);
++
++	frame = dx_probe(&dentry->d_name, dentry->d_parent->d_inode,
++			&hinfo, frames, &err);
++	if (!frame) {
++		/* FIXME: error handling here */
++		brelse(bh);
++		ext3_unlock_htree(dir, idx_lock);
++		return err;
++	}
++	
++	if (frame->curidx != curidx) {
++		/* path has been changed. we have to drop old lock
++		 * and repeat */
++		brelse(bh);
++		ext3_unlock_htree(dir, idx_lock);
++		ext3_unlock_htree(dir, leaf_lock);
++		dx_release(frames);
++		goto repeat;
++	}
++	entries = frame->entries;
++	at = frame->at;
++
+ 	/* Block full, should compress but for now just split */
+ 	dxtrace(printk("using %u of %u node entries\n",
+ 		       dx_get_count(entries), dx_get_limit(entries)));
+@@ -1375,7 +1623,8 @@
+ 		struct dx_entry *entries2;
+ 		struct dx_node *node2;
+ 		struct buffer_head *bh2;
+-
++		void *nb_lock;
++		
+ 		if (levels && (dx_get_count(frames->entries) ==
+ 			       dx_get_limit(frames->entries))) {
+ 			ext3_warning(sb, __FUNCTION__,
+@@ -1386,6 +1635,7 @@
+ 		bh2 = ext3_append (handle, dir, &newblock, &err);
+ 		if (!(bh2))
+ 			goto cleanup;
++		nb_lock = ext3_lock_htree(dir, newblock, 1);
+ 		node2 = (struct dx_node *)(bh2->b_data);
+ 		entries2 = node2->entries;
+ 		node2->fake.rec_len = cpu_to_le16(sb->s_blocksize);
+@@ -1397,27 +1647,73 @@
+ 		if (levels) {
+ 			unsigned icount1 = icount/2, icount2 = icount - icount1;
+ 			unsigned hash2 = dx_get_hash(entries + icount1);
++			void *ri_lock;
++
++			/* we have to protect root htree index against
++			 * another dx_add_entry() which would want to
++			 * split it too -bzzz */
++			ri_lock = ext3_lock_htree(dir, 0, 1);
++
++			/* as root index block blocked we must repeat
++			 * searching for current position of our 2nd index -bzzz */
++			dx_lock_bh(frame->bh);
++			frames->at = dx_find_position(frames->entries, hinfo.hash);
++			dx_unlock_bh(frame->bh);
++			
+ 			dxtrace(printk("Split index %i/%i\n", icount1, icount2));
+-				
+-			BUFFER_TRACE(frame->bh, "get_write_access"); /* index root */
++	
++			BUFFER_TRACE(frame->bh, "get_write_access");
+ 			err = ext3_journal_get_write_access(handle,
+ 							     frames[0].bh);
+ 			if (err)
+ 				goto journal_error;
+-				
++			
++			/* copy index into new one */
+ 			memcpy ((char *) entries2, (char *) (entries + icount1),
+ 				icount2 * sizeof(struct dx_entry));
+-			dx_set_count (entries, icount1);
+ 			dx_set_count (entries2, icount2);
+ 			dx_set_limit (entries2, dx_node_limit(dir));
+ 
+ 			/* Which index block gets the new entry? */
+ 			if (at - entries >= icount1) {
++				/* unlock index we won't use */
++				ext3_unlock_htree(dir, idx_lock);
++				idx_lock = nb_lock;
+ 				frame->at = at = at - entries - icount1 + entries2;
+-				frame->entries = entries = entries2;
++				frame->entries = entries2;
++				frame->curidx = curidx = newblock;
+ 				swap(frame->bh, bh2);
++			} else {
++				/* we'll use old index,so new one may be freed */
++				ext3_unlock_htree(dir, nb_lock);
+ 			}
+-			dx_insert_block (frames + 0, hash2, newblock);
++		
++			/* NOTE: very subtle piece of code
++			 * competing dx_probe() may find 2nd level index in root
++			 * index, then we insert new index here and set new count
++			 * in that 2nd level index. so, dx_probe() may see 2nd
++			 * level index w/o hash it looks for. the solution is
++			 * to check root index after we locked just founded 2nd
++			 * level index -bzzz */
++			dx_lock_bh(frames[0].bh);
++			dx_insert_block (dir, frames + 0, hash2, newblock, 0);
++			dx_unlock_bh(frames[0].bh);
++			
++			/* now old and new 2nd level index blocks contain
++			 * all pointers, so dx_probe() may find it in the both.
++			 * it's OK -bzzz */
++			
++			dx_lock_bh(frame->bh);
++			dx_set_count(entries, icount1);
++			dx_unlock_bh(frame->bh);
++
++			/* now old 2nd level index block points to first half
++			 * of leafs. it's importand that dx_probe() must
++			 * check root index block for changes under
++			 * dx_lock_bh(frame->bh) -bzzz */
++
++			ext3_unlock_htree(dir, ri_lock);
++		
+ 			dxtrace(dx_show_index ("node", frames[1].entries));
+ 			dxtrace(dx_show_index ("node",
+ 			       ((struct dx_node *) bh2->b_data)->entries));
+@@ -1426,38 +1722,61 @@
+ 				goto journal_error;
+ 			brelse (bh2);
+ 		} else {
++			unsigned long leaf = frame->leaf;
++
+ 			dxtrace(printk("Creating second level index...\n"));
+ 			memcpy((char *) entries2, (char *) entries,
+ 			       icount * sizeof(struct dx_entry));
+ 			dx_set_limit(entries2, dx_node_limit(dir));
+ 
+ 			/* Set up root */
++ 			dx_lock_bh(frames[0].bh);
+ 			dx_set_count(entries, 1);
+ 			dx_set_block(entries + 0, newblock);
+ 			((struct dx_root *) frames[0].bh->b_data)->info.indirect_levels = 1;
++			dx_unlock_bh(frames[0].bh);
+ 
+ 			/* Add new access path frame */
+ 			frame = frames + 1;
+ 			frame->at = at = at - entries + entries2;
+ 			frame->entries = entries = entries2;
+ 			frame->bh = bh2;
++			frame->curidx = newblock;
++			frame->leaf = leaf;
+ 			err = ext3_journal_get_write_access(handle,
+ 							     frame->bh);
+ 			if (err)
+ 				goto journal_error;
++
++			/* first level index was root. it's already initialized */
++			/* we my unlock it now */
++			ext3_unlock_htree(dir, idx_lock);
++
++			/* current index is just created 2nd level index */
++			curidx = newblock;
++			idx_lock = nb_lock;
+ 		}
+ 		ext3_journal_dirty_metadata(handle, frames[0].bh);
+ 	}
+-	de = do_split(handle, dir, &bh, frame, &hinfo, &err);
++	de = do_split(handle, dir, &bh, frame, &hinfo, &newleaf_lock, &err);
+ 	if (!de)
+ 		goto cleanup;
++
++	/* index splitted */
++	ext3_unlock_htree(dir, idx_lock);
++	
+ 	err = add_dirent_to_buf(handle, dentry, inode, de, bh);
++
++	if (newleaf_lock)
++		ext3_unlock_htree(dir, newleaf_lock);
++	
+ 	bh = 0;
+ 	goto cleanup;
+ 	
+ journal_error:
+ 	ext3_std_error(dir->i_sb, err);
+ cleanup:
++	ext3_unlock_htree(dir, leaf_lock);
+ 	if (bh)
+ 		brelse(bh);
+ 	dx_release(frames);
+@@ -1901,6 +2220,7 @@
+ 	struct buffer_head * bh;
+ 	struct ext3_dir_entry_2 * de;
+ 	handle_t *handle;
++	void *lock;
+ 
+ 	handle = ext3_journal_start(dir, EXT3_DELETE_TRANS_BLOCKS);
+ 	if (IS_ERR(handle)) {
+@@ -1908,7 +2228,7 @@
+ 	}
+ 
+ 	retval = -ENOENT;
+-	bh = ext3_find_entry (dentry, &de);
++	bh = ext3_find_entry (dentry, &de, 1, &lock);
+ 	if (!bh)
+ 		goto end_rmdir;
+ 
+@@ -1919,14 +2239,19 @@
+ 	DQUOT_INIT(inode);
+ 
+ 	retval = -EIO;
+-	if (le32_to_cpu(de->inode) != inode->i_ino)
++	if (le32_to_cpu(de->inode) != inode->i_ino) {
++		ext3_unlock_htree(dir, lock);
+ 		goto end_rmdir;
++	}
+ 
+ 	retval = -ENOTEMPTY;
+-	if (!empty_dir (inode))
++	if (!empty_dir (inode)) {
++		ext3_unlock_htree(dir, lock);
+ 		goto end_rmdir;
++	}
+ 
+ 	retval = ext3_delete_entry(handle, dir, de, bh);
++	ext3_unlock_htree(dir, lock);
+ 	if (retval)
+ 		goto end_rmdir;
+ 	if (inode->i_nlink != 2)
+@@ -1985,6 +2310,7 @@
+ 	struct buffer_head * bh;
+ 	struct ext3_dir_entry_2 * de;
+ 	handle_t *handle;
++	void *lock;
+ 
+ 	handle = ext3_journal_start(dir, EXT3_DELETE_TRANS_BLOCKS);
+ 	if (IS_ERR(handle)) {
+@@ -1995,7 +2321,7 @@
+ 		handle->h_sync = 1;
+ 
+ 	retval = -ENOENT;
+-	bh = ext3_find_entry (dentry, &de);
++	bh = ext3_find_entry (dentry, &de, 1, &lock);
+ 	if (!bh)
+ 		goto end_unlink;
+ 
+@@ -2003,8 +2329,10 @@
+ 	DQUOT_INIT(inode);
+ 
+ 	retval = -EIO;
+-	if (le32_to_cpu(de->inode) != inode->i_ino)
++	if (le32_to_cpu(de->inode) != inode->i_ino) {
++		ext3_unlock_htree(dir, lock);
+ 		goto end_unlink;
++	}
+ 	
+ 	if (!inode->i_nlink) {
+ 		ext3_warning (inode->i_sb, "ext3_unlink",
+@@ -2013,6 +2341,7 @@
+ 		inode->i_nlink = 1;
+ 	}
+ 	retval = ext3_delete_entry(handle, dir, de, bh);
++	ext3_unlock_htree(dir, lock);
+ 	if (retval)
+ 		goto end_unlink;
+ 	dir->i_ctime = dir->i_mtime = CURRENT_TIME;
+@@ -2151,6 +2480,7 @@
+ 	struct buffer_head * old_bh, * new_bh, * dir_bh;
+ 	struct ext3_dir_entry_2 * old_de, * new_de;
+ 	int retval;
++	void *lock1 = NULL, *lock2 = NULL, *lock3 = NULL;
+ 
+ 	old_bh = new_bh = dir_bh = NULL;
+ 
+@@ -2163,7 +2493,10 @@
+ 	if (IS_SYNC(old_dir) || IS_SYNC(new_dir))
+ 		handle->h_sync = 1;
+ 
+-	old_bh = ext3_find_entry (old_dentry, &old_de);
++	if (old_dentry->d_parent == new_dentry->d_parent)
++		down(&EXT3_I(old_dentry->d_parent->d_inode)->i_rename_sem);
++
++	old_bh = ext3_find_entry (old_dentry, &old_de, 1, &lock1 /* FIXME */);
+ 	/*
+ 	 *  Check for inode number is _not_ due to possible IO errors.
+ 	 *  We might rmdir the source, keep it as pwd of some process
+@@ -2176,7 +2509,7 @@
+ 		goto end_rename;
+ 
+ 	new_inode = new_dentry->d_inode;
+-	new_bh = ext3_find_entry (new_dentry, &new_de);
++	new_bh = ext3_find_entry (new_dentry, &new_de, 1, &lock2 /* FIXME */);
+ 	if (new_bh) {
+ 		if (!new_inode) {
+ 			brelse (new_bh);
+@@ -2239,7 +2572,7 @@
+ 		struct buffer_head *old_bh2;
+ 		struct ext3_dir_entry_2 *old_de2;
+ 		
+-		old_bh2 = ext3_find_entry(old_dentry, &old_de2);
++		old_bh2 = ext3_find_entry(old_dentry, &old_de2, 1, &lock3 /* FIXME */);
+ 		if (old_bh2) {
+ 			retval = ext3_delete_entry(handle, old_dir,
+ 						   old_de2, old_bh2);
+@@ -2282,6 +2615,14 @@
+ 	retval = 0;
+ 
+ end_rename:
++	if (lock1)
++		ext3_unlock_htree(old_dentry->d_parent->d_inode, lock1);
++	if (lock2)
++		ext3_unlock_htree(new_dentry->d_parent->d_inode, lock2);
++	if (lock3)
++		ext3_unlock_htree(old_dentry->d_parent->d_inode, lock3);
++	if (old_dentry->d_parent == new_dentry->d_parent)
++		up(&EXT3_I(old_dentry->d_parent->d_inode)->i_rename_sem);
+ 	brelse (dir_bh);
+ 	brelse (old_bh);
+ 	brelse (new_bh);
+@@ -2290,6 +2631,29 @@
+ }
+ 
+ /*
++ * this locking primitives are used to protect parts
++ * of dir's htree. protection unit is block: leaf or index
++ */
++static inline void *ext3_lock_htree(struct inode *dir,
++					unsigned long value, int rwlock)
++{
++	void *lock;
++	
++	if (!test_opt(dir->i_sb, PDIROPS))
++		return NULL;
++	lock = dynlock_lock(&EXT3_I(dir)->i_htree_lock, value, 1, GFP_KERNEL);
++	return lock;
++}
++
++static inline void ext3_unlock_htree(struct inode *dir,
++					void *lock)
++{
++	if (!test_opt(dir->i_sb, PDIROPS) || !lock)
++		return;
++	dynlock_unlock(&EXT3_I(dir)->i_htree_lock, lock);
++}
++
++/*
+  * directories can handle most operations...
+  */
+ struct inode_operations ext3_dir_inode_operations = {
+Index: linux-2.4.24/fs/ext3/super.c
+===================================================================
+--- linux-2.4.24.orig/fs/ext3/super.c	2004-04-01 20:22:17.000000000 +0400
++++ linux-2.4.24/fs/ext3/super.c	2004-04-01 20:24:48.000000000 +0400
+@@ -702,6 +702,8 @@
+ 				return 0;
+ 			}
+ 		}
++		else if (!strcmp (this_char, "pdirops"))
++			set_opt (sbi->s_mount_opt, PDIROPS);
+ 		else if (!strcmp (this_char, "grpid") ||
+ 			 !strcmp (this_char, "bsdgroups"))
+ 			set_opt (*mount_options, GRPID);
+@@ -728,6 +730,9 @@
+ 			if (want_numeric(value, "sb", sb_block))
+ 				return 0;
+ 		}
++		else if (!strcmp (this_char, "pdirops")) {
++			set_opt (sbi->s_mount_opt, PDIROPS);
++		}
+ #ifdef CONFIG_JBD_DEBUG
+ 		else if (!strcmp (this_char, "ro-after")) {
+ 			unsigned long v;
+@@ -891,6 +896,10 @@
+ 		ext3_check_inodes_bitmap (sb);
+ 	}
+ #endif
++#ifdef S_PDIROPS
++	if (test_opt (sb, PDIROPS))
++		sb->s_flags |= S_PDIROPS;
++#endif
+ 	setup_ro_after(sb);
+ 	return res;
+ }
+@@ -1393,6 +1402,11 @@
+ 		test_opt(sb,DATA_FLAGS) == EXT3_MOUNT_ORDERED_DATA ? "ordered":
+ 		"writeback");
+ 
++	if (test_opt(sb, PDIROPS)) {
++		printk (KERN_INFO "EXT3-fs: mounted filesystem with parallel dirops\n");
++		sb->s_flags |= S_PDIROPS;
++	}
++		
+ 	return sb;
+ 
+ failed_mount3:
+Index: linux-2.4.24/fs/ext3/inode.c
+===================================================================
+--- linux-2.4.24.orig/fs/ext3/inode.c	2004-04-01 20:22:18.000000000 +0400
++++ linux-2.4.24/fs/ext3/inode.c	2004-04-01 20:24:48.000000000 +0400
+@@ -2239,6 +2239,9 @@
+ 	} else if (S_ISDIR(inode->i_mode)) {
+ 		inode->i_op = &ext3_dir_inode_operations;
+ 		inode->i_fop = &ext3_dir_operations;
++		dynlock_init(&EXT3_I(inode)->i_htree_lock);
++		sema_init(&EXT3_I(inode)->i_rename_sem, 1);
++		sema_init(&EXT3_I(inode)->i_append_sem, 1);
+ 	} else if (S_ISLNK(inode->i_mode)) {
+ 		if (ext3_inode_is_fast_symlink(inode))
+ 			inode->i_op = &ext3_fast_symlink_inode_operations;
+Index: linux-2.4.24/fs/ext3/ialloc.c
+===================================================================
+--- linux-2.4.24.orig/fs/ext3/ialloc.c	2004-04-01 20:22:17.000000000 +0400
++++ linux-2.4.24/fs/ext3/ialloc.c	2004-04-01 20:24:48.000000000 +0400
+@@ -606,6 +606,9 @@
+ 		return ERR_PTR(-EDQUOT);
+ 	}
+ 	ext3_debug ("allocating inode %lu\n", inode->i_ino);
++	dynlock_init(&EXT3_I(inode)->i_htree_lock);
++	sema_init(&EXT3_I(inode)->i_rename_sem, 1);
++	sema_init(&EXT3_I(inode)->i_append_sem, 1);
+ 	return inode;
+ 
+ fail:
+Index: linux-2.4.24/include/linux/ext3_fs.h
+===================================================================
+--- linux-2.4.24.orig/include/linux/ext3_fs.h	2004-04-01 20:22:17.000000000 +0400
++++ linux-2.4.24/include/linux/ext3_fs.h	2004-04-01 20:24:48.000000000 +0400
+@@ -308,6 +308,7 @@
+ /*
+  * Mount flags
+  */
++#define EXT3_MOUNT_PDIROPS		0x800000/* Parallel dir operations */
+ #define EXT3_MOUNT_CHECK		0x0001	/* Do mount-time checks */
+ #define EXT3_MOUNT_GRPID		0x0004	/* Create files with directory's group */
+ #define EXT3_MOUNT_DEBUG		0x0008	/* Some debugging messages */
+Index: linux-2.4.24/include/linux/ext3_fs_i.h
+===================================================================
+--- linux-2.4.24.orig/include/linux/ext3_fs_i.h	2004-04-01 20:22:17.000000000 +0400
++++ linux-2.4.24/include/linux/ext3_fs_i.h	2004-04-01 20:24:48.000000000 +0400
+@@ -17,6 +17,7 @@
+ #define _LINUX_EXT3_FS_I
+ 
+ #include <linux/rwsem.h>
++#include <linux/dynlocks.h>
+ 
+ /*
+  * second extended file system inode data in memory
+@@ -76,6 +77,11 @@
+ 	 * by other means, so we have truncate_sem.
+ 	 */
+ 	struct rw_semaphore truncate_sem;
++
++	/* following fields for parallel directory operations -bzzz */
++	struct dynlock i_htree_lock;
++	struct semaphore i_append_sem;
++	struct semaphore i_rename_sem;
+ };
+ 
+ #endif	/* _LINUX_EXT3_FS_I */
diff --git a/ldiskfs/kernel_patches/patches/ext3-san-jdike-2.6-suse.patch b/lustre/kernel_patches/patches/ext3-san-jdike-2.5.73.patch
similarity index 100%
rename from ldiskfs/kernel_patches/patches/ext3-san-jdike-2.6-suse.patch
rename to lustre/kernel_patches/patches/ext3-san-jdike-2.5.73.patch
diff --git a/lustre/kernel_patches/patches/ext3-san-jdike-2.6-suse.patch b/lustre/kernel_patches/patches/ext3-san-jdike-2.6-suse.patch
deleted file mode 100644
index afda0bd..0000000
--- a/lustre/kernel_patches/patches/ext3-san-jdike-2.6-suse.patch
+++ /dev/null
@@ -1,106 +0,0 @@
- fs/ext3/inode.c |   81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- fs/ext3/super.c |    4 ++
- 2 files changed, 85 insertions(+)
-
---- linux-2.5.73/fs/ext3/inode.c~ext3-san-jdike-2.5.73	2003-06-22 12:32:58.000000000 -0600
-+++ linux-2.5.73-braam/fs/ext3/inode.c	2003-06-30 12:19:21.000000000 -0600
-@@ -2945,3 +2945,84 @@ int ext3_change_inode_journal_flag(struc
- 
- 	return err;
- }
-+
-+/* for each block: 1 ind + 1 dind + 1 tind
-+ * for each block: 3 bitmap blocks
-+ * for each block: 3 group descriptor blocks
-+ * i inode block
-+ * 1 superblock
-+ * 2 * EXT3_SINGLEDATA_TRANS_BLOCKS for the quote files
-+ * ((1+1+1) * 3 * nblocks) + 1 + 1 + 2 * EXT3_SINGLEDATA_TRANS_BLOCKS
-+ *
-+ * XXX assuming:
-+ * (1) fs logic block size == page size
-+ * (2) ext3 in writeback mode
-+ */
-+static inline int ext3_san_write_trans_blocks(int nblocks)
-+{
-+	int ret;
-+	
-+	ret = (1 + 1 + 1) * 3 * nblocks + 1 + 1;
-+
-+#ifdef CONFIG_QUOTA
-+	ret += 2 * EXT3_SINGLEDATA_TRANS_BLOCKS;
-+#endif
-+
-+	return ret;
-+}
-+
-+/* Alloc blocks for an inode, while don't create any buffer/page
-+ * for data I/O; set the inode size if file is extended.
-+ *
-+ * @inode:    target inode
-+ * @blocks:   array of logic block number
-+ * @nblocks:  how many blocks need be alloced
-+ * @newsize:  new filesize we should set
-+ *
-+ * return:    0 success, otherwise failed
-+ *            (*blocks) contains physical block number alloced
-+ *
-+ * XXX this assume the fs block size == page size
-+ */
-+int ext3_prep_san_write(struct inode *inode, long *blocks,
-+			int nblocks, loff_t newsize)
-+{
-+	handle_t *handle;
-+	struct buffer_head bh_tmp;
-+	int needed_blocks;
-+	int i, ret = 0, ret2;
-+
-+	needed_blocks = ext3_san_write_trans_blocks(nblocks);
-+
-+	lock_kernel();
-+	handle = ext3_journal_start(inode, needed_blocks);
-+	if (IS_ERR(handle)) {
-+		unlock_kernel();
-+		return PTR_ERR(handle);
-+	}
-+	unlock_kernel();
-+
-+	/* alloc blocks one by one */
-+	for (i = 0; i < nblocks; i++) {
-+		ret = ext3_get_block_handle(handle, inode, blocks[i],
-+						&bh_tmp, 1, 1);
-+		if (ret)
-+			break;
-+
-+		blocks[i] = bh_tmp.b_blocknr;
-+	}
-+
-+	/* set inode size if needed */
-+	if (!ret && (newsize > inode->i_size)) {
-+		inode->i_size = newsize;
-+		ext3_mark_inode_dirty(handle, inode);
-+	}
-+
-+	lock_kernel();
-+	ret2 = ext3_journal_stop(handle);
-+	unlock_kernel();
-+
-+	if (!ret)
-+		ret = ret2;
-+	return ret;
-+}
---- linux-2.5.73/fs/ext3/super.c~ext3-san-jdike-2.5.73	2003-06-22 12:33:16.000000000 -0600
-+++ linux-2.5.73-braam/fs/ext3/super.c	2003-06-30 12:16:36.000000000 -0600
-@@ -2080,6 +2080,10 @@ static void __exit exit_ext3_fs(void)
- 	exit_ext3_xattr();
- }
- 
-+int ext3_prep_san_write(struct inode *inode, long *blocks,
-+                        int nblocks, loff_t newsize);
-+EXPORT_SYMBOL(ext3_prep_san_write);
-+
- MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others");
- MODULE_DESCRIPTION("Second Extended Filesystem with journaling extensions");
- MODULE_LICENSE("GPL");
-
-_
diff --git a/lustre/kernel_patches/patches/ext3-trusted_ea-suse-2.4.19.patch b/lustre/kernel_patches/patches/ext3-trusted_ea-suse-2.4.19.patch
deleted file mode 100644
index 1c31052..0000000
--- a/lustre/kernel_patches/patches/ext3-trusted_ea-suse-2.4.19.patch
+++ /dev/null
@@ -1,179 +0,0 @@
- fs/ext3/xattr.c            |   12 +++++-
- fs/ext3/xattr_trusted.c    |   86 +++++++++++++++++++++++++++++++++++++++++++++
- include/linux/ext3_xattr.h |    6 +++
- 3 files changed, 102 insertions(+), 2 deletions(-)
-
-Index: linux-2.4.19/fs/ext3/xattr.c
-===================================================================
---- linux-2.4.19.orig/fs/ext3/xattr.c	2004-04-23 22:44:57.000000000 -0400
-+++ linux-2.4.19/fs/ext3/xattr.c	2004-04-23 22:45:20.000000000 -0400
-@@ -1785,18 +1785,25 @@
- int __init
- init_ext3_xattr(void)
- {
-+	int error;
-+
- 	ext3_xattr_cache = mb_cache_create("ext3_xattr", NULL,
- 		sizeof(struct mb_cache_entry) +
- 		sizeof(struct mb_cache_entry_index), 1, 61);
- 	if (!ext3_xattr_cache)
- 		return -ENOMEM;
- 
--	return 0;
-+	error = init_ext3_xattr_trusted();
-+	if (error)
-+		mb_cache_destroy(ext3_xattr_cache);
-+
-+	return error;
- }
- 
- void
- exit_ext3_xattr(void)
- {
-+	exit_ext3_xattr_trusted();
- 	if (ext3_xattr_cache)
- 		mb_cache_destroy(ext3_xattr_cache);
- 	ext3_xattr_cache = NULL;
-@@ -1807,12 +1814,13 @@
- int __init
- init_ext3_xattr(void)
- {
--	return 0;
-+	return init_ext3_xattr_trusted();
- }
- 
- void
- exit_ext3_xattr(void)
- {
-+	exit_ext3_xattr_trusted();
- }
- 
- #endif  /* CONFIG_EXT3_FS_XATTR_SHARING */
-Index: linux-2.4.19/fs/ext3/xattr_trusted.c
-===================================================================
---- linux-2.4.19.orig/fs/ext3/xattr_trusted.c	2003-01-30 05:24:37.000000000 -0500
-+++ linux-2.4.19/fs/ext3/xattr_trusted.c	2004-04-23 22:45:20.000000000 -0400
-@@ -0,0 +1,86 @@
-+/*
-+ * linux/fs/ext3/xattr_trusted.c
-+ * Handler for trusted extended attributes.
-+ *
-+ * Copyright (C) 2003 by Andreas Gruenbacher, <a.gruenbacher@computer.org>
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/string.h>
-+#include <linux/fs.h>
-+#include <linux/ext3_jbd.h>
-+#include <linux/ext3_fs.h>
-+#include <linux/ext3_xattr.h>
-+
-+#define XATTR_TRUSTED_PREFIX "trusted."
-+
-+static size_t
-+ext3_xattr_trusted_list(char *list, struct inode *inode,
-+			const char *name, int name_len)
-+{
-+	const int prefix_len = sizeof(XATTR_TRUSTED_PREFIX)-1;
-+
-+	if (!capable(CAP_SYS_ADMIN))
-+		return 0;
-+
-+	if (list) {
-+		memcpy(list, XATTR_TRUSTED_PREFIX, prefix_len);
-+		memcpy(list+prefix_len, name, name_len);
-+		list[prefix_len + name_len] = '\0';
-+	}
-+	return prefix_len + name_len + 1;
-+}
-+
-+static int
-+ext3_xattr_trusted_get(struct inode *inode, const char *name,
-+		       void *buffer, size_t size)
-+{
-+	if (strcmp(name, "") == 0)
-+		return -EINVAL;
-+	if (!capable(CAP_SYS_ADMIN))
-+		return -EPERM;
-+	return ext3_xattr_get(inode, EXT3_XATTR_INDEX_TRUSTED, name,
-+			      buffer, size);
-+}
-+
-+static int
-+ext3_xattr_trusted_set(struct inode *inode, const char *name,
-+		       const void *value, size_t size, int flags)
-+{
-+	handle_t *handle;
-+	int error;
-+
-+	if (strcmp(name, "") == 0)
-+		return -EINVAL;
-+	if (!capable(CAP_SYS_ADMIN))
-+		return -EPERM;
-+	handle = ext3_journal_start(inode, EXT3_XATTR_TRANS_BLOCKS);
-+	if (IS_ERR(handle))
-+		return PTR_ERR(handle);
-+	error = ext3_xattr_set(handle, inode, EXT3_XATTR_INDEX_TRUSTED, name,
-+			       value, size, flags);
-+	ext3_journal_stop(handle, inode);
-+
-+	return error;
-+}
-+
-+struct ext3_xattr_handler ext3_xattr_trusted_handler = {
-+	.prefix	= XATTR_TRUSTED_PREFIX,
-+	.list	= ext3_xattr_trusted_list,
-+	.get	= ext3_xattr_trusted_get,
-+	.set	= ext3_xattr_trusted_set,
-+};
-+
-+int __init
-+init_ext3_xattr_trusted(void)
-+{
-+	return ext3_xattr_register(EXT3_XATTR_INDEX_TRUSTED,
-+				   &ext3_xattr_trusted_handler);
-+}
-+
-+void
-+exit_ext3_xattr_trusted(void)
-+{
-+	ext3_xattr_unregister(EXT3_XATTR_INDEX_TRUSTED,
-+			      &ext3_xattr_trusted_handler);
-+}
-Index: linux-2.4.19/fs/ext3/Makefile
-===================================================================
---- linux-2.4.19.orig/fs/ext3/Makefile	2004-04-23 22:38:38.000000000 -0400
-+++ linux-2.4.19/fs/ext3/Makefile	2004-04-23 22:49:23.000000000 -0400
-@@ -12,7 +12,7 @@
- export-objs :=	super.o inode.o
- 
- obj-y    := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o iopen.o \
--		ioctl.o namei.o super.o symlink.o hash.o
-+		ioctl.o namei.o super.o symlink.o hash.o xattr_trusted.o
- obj-m    := $(O_TARGET)
- 
- obj-$(CONFIG_EXT3_FS_XATTR) += xattr.o
-Index: linux-2.4.19/include/linux/ext3_xattr.h
-===================================================================
---- linux-2.4.19.orig/include/linux/ext3_xattr.h	2004-04-23 17:53:54.000000000 -0400
-+++ linux-2.4.19/include/linux/ext3_xattr.h	2004-04-23 22:45:20.000000000 -0400
-@@ -21,6 +21,9 @@
- #define EXT3_XATTR_INDEX_USER			1
- #define EXT3_XATTR_INDEX_POSIX_ACL_ACCESS	2
- #define EXT3_XATTR_INDEX_POSIX_ACL_DEFAULT	3
-+#define EXT3_XATTR_INDEX_TRUSTED		4
-+#define EXT3_XATTR_INDEX_LUSTRE			5
-+#define EXT3_XATTR_INDEX_SECURITY		6
- 
- struct ext3_xattr_header {
- 	__u32	h_magic;	/* magic number for identification */
-@@ -84,6 +87,9 @@
- extern int init_ext3_xattr(void) __init;
- extern void exit_ext3_xattr(void);
- 
-+extern int init_ext3_xattr_trusted(void) __init;
-+extern void exit_ext3_xattr_trusted(void);
-+
- # else  /* CONFIG_EXT3_FS_XATTR */
- #  define ext3_setxattr		NULL
- #  define ext3_getxattr		NULL
diff --git a/lustre/kernel_patches/patches/ext3-use-after-free-suse.patch b/lustre/kernel_patches/patches/ext3-use-after-free-suse.patch
index 5a5dc5a..1dab6d8 100644
--- a/lustre/kernel_patches/patches/ext3-use-after-free-suse.patch
+++ b/lustre/kernel_patches/patches/ext3-use-after-free-suse.patch
@@ -1,11 +1,11 @@
  ./fs/ext3/namei.c |   11 +++++------
  1 files changed, 5 insertions(+), 6 deletions(-)
 
-Index: linux-2.4.19/fs/ext3/namei.c
+Index: linux-2.4.19.SuSE/./fs/ext3/namei.c
 ===================================================================
---- linux-2.4.19.orig/fs/ext3/namei.c	2004-04-23 22:30:41.000000000 -0400
-+++ linux-2.4.19/fs/ext3/namei.c	2004-04-23 22:36:03.000000000 -0400
-@@ -1522,8 +1522,11 @@
+--- linux-2.4.19.SuSE.orig/./fs/ext3/namei.c	Sun Nov 16 01:02:51 2003
++++ linux-2.4.19.SuSE/./fs/ext3/namei.c	Sun Nov 16 01:14:50 2003
+@@ -1523,8 +1523,11 @@
  {
  	int err = ext3_add_entry(handle, dentry, inode);
  	if (!err) {
@@ -19,7 +19,7 @@ Index: linux-2.4.19/fs/ext3/namei.c
  	}
  	ext3_dec_count(handle, inode);
  	iput(inode);
-@@ -1559,7 +1562,6 @@
+@@ -1560,7 +1563,6 @@
  		inode->i_op = &ext3_file_inode_operations;
  		inode->i_fop = &ext3_file_operations;
  		inode->i_mapping->a_ops = &ext3_aops;
@@ -27,7 +27,7 @@ Index: linux-2.4.19/fs/ext3/namei.c
  		err = ext3_add_nondir(handle, dentry, inode);
  	}
  	ext3_journal_stop(handle, dir);
-@@ -1589,7 +1591,6 @@
+@@ -1590,7 +1592,6 @@
  #ifdef CONFIG_EXT3_FS_XATTR
  		inode->i_op = &ext3_special_inode_operations;
  #endif
@@ -38,7 +38,7 @@ Index: linux-2.4.19/fs/ext3/namei.c
 @@ -2039,7 +2040,6 @@
  		inode->i_size = l-1;
  	}
-         EXT3_I(inode)->i_disksize = inode->i_size;
+ 	EXT3_I(inode)->i_disksize = inode->i_size;
 -	ext3_mark_inode_dirty(handle, inode);
  	err = ext3_add_nondir(handle, dentry, inode);
  out_stop:
diff --git a/ldiskfs/kernel_patches/patches/ext3-wantedi-2.6-suse.patch b/lustre/kernel_patches/patches/ext3-wantedi-2.6.3.patch
similarity index 91%
rename from ldiskfs/kernel_patches/patches/ext3-wantedi-2.6-suse.patch
rename to lustre/kernel_patches/patches/ext3-wantedi-2.6.3.patch
index a4867a5..3f20da7 100644
--- a/ldiskfs/kernel_patches/patches/ext3-wantedi-2.6-suse.patch
+++ b/lustre/kernel_patches/patches/ext3-wantedi-2.6.3.patch
@@ -154,6 +154,22 @@ Index: uml-2.6.3/fs/ext3/namei.c
  	err = PTR_ERR(inode);
  	if (IS_ERR(inode))
  		goto out_stop;
+Index: uml-2.6.3/include/linux/dcache.h
+===================================================================
+--- uml-2.6.3.orig/include/linux/dcache.h	2004-02-21 00:19:14.365988600 +0800
++++ uml-2.6.3/include/linux/dcache.h	2004-02-21 00:21:04.612228624 +0800
+@@ -25,6 +25,11 @@
+ 
+ #define IS_ROOT(x) ((x) == (x)->d_parent)
+ 
++struct dentry_params {
++	unsigned long   p_inum;
++	void            *p_ptr;
++};
++
+ /*
+  * "quick string" -- eases parameter passing, but more importantly
+  * saves "metadata" about the string (ie length and the hash).
 Index: uml-2.6.3/include/linux/ext3_fs.h
 ===================================================================
 --- uml-2.6.3.orig/include/linux/ext3_fs.h	2004-01-09 14:59:44.000000000 +0800
diff --git a/lustre/kernel_patches/patches/ext3-wantedi-2.6-suse.patch b/lustre/kernel_patches/patches/ext3-wantedi-2.6.patch
similarity index 72%
rename from lustre/kernel_patches/patches/ext3-wantedi-2.6-suse.patch
rename to lustre/kernel_patches/patches/ext3-wantedi-2.6.patch
index a4867a5..ce897f5 100644
--- a/lustre/kernel_patches/patches/ext3-wantedi-2.6-suse.patch
+++ b/lustre/kernel_patches/patches/ext3-wantedi-2.6.patch
@@ -5,11 +5,9 @@
  include/linux/ext3_fs.h |    5 ++++-
  5 files changed, 85 insertions(+), 6 deletions(-)
 
-Index: uml-2.6.3/fs/ext3/ialloc.c
-===================================================================
---- uml-2.6.3.orig/fs/ext3/ialloc.c	2004-02-20 15:00:48.000000000 +0800
-+++ uml-2.6.3/fs/ext3/ialloc.c	2004-02-21 00:24:45.202693776 +0800
-@@ -420,7 +420,8 @@
+--- linux-2.6.0-test5/fs/ext3/ialloc.c~ext3-wantedi-2.6	2003-06-24 18:05:25.000000000 +0400
++++ linux-2.6.0-test5-alexey/fs/ext3/ialloc.c	2003-09-28 13:40:23.000000000 +0400
+@@ -420,7 +420,8 @@ static int find_group_other(struct super
   * For other inodes, search forward from the parent directory's block
   * group to find a free inode.
   */
@@ -19,10 +17,10 @@ Index: uml-2.6.3/fs/ext3/ialloc.c
  {
  	struct super_block *sb;
  	struct buffer_head *bitmap_bh = NULL;
-@@ -448,6 +449,38 @@
+@@ -448,6 +449,38 @@ struct inode *ext3_new_inode(handle_t *h
  
+ 	es = EXT3_SB(sb)->s_es;
  	sbi = EXT3_SB(sb);
- 	es = sbi->s_es;
 +	if (goal) {
 +		group = (goal - 1) / EXT3_INODES_PER_GROUP(sb);
 +		ino = (goal - 1) % EXT3_INODES_PER_GROUP(sb);
@@ -58,11 +56,9 @@ Index: uml-2.6.3/fs/ext3/ialloc.c
  	if (S_ISDIR(mode)) {
  		if (test_opt (sb, OLDALLOC))
  			group = find_group_dir(sb, dir);
-Index: uml-2.6.3/fs/ext3/ioctl.c
-===================================================================
---- uml-2.6.3.orig/fs/ext3/ioctl.c	2004-01-09 14:59:26.000000000 +0800
-+++ uml-2.6.3/fs/ext3/ioctl.c	2004-02-21 00:21:04.541239416 +0800
-@@ -24,6 +24,31 @@
+--- linux-2.6.0-test5/fs/ext3/ioctl.c~ext3-wantedi-2.6	2003-06-24 18:05:25.000000000 +0400
++++ linux-2.6.0-test5-alexey/fs/ext3/ioctl.c	2003-09-28 13:45:54.000000000 +0400
+@@ -24,6 +24,31 @@ int ext3_ioctl (struct inode * inode, st
  	ext3_debug ("cmd = %u, arg = %lu\n", cmd, arg);
  
  	switch (cmd) {
@@ -94,11 +90,9 @@ Index: uml-2.6.3/fs/ext3/ioctl.c
  	case EXT3_IOC_GETFLAGS:
  		flags = ei->i_flags & EXT3_FL_USER_VISIBLE;
  		return put_user(flags, (int *) arg);
-Index: uml-2.6.3/fs/ext3/namei.c
-===================================================================
---- uml-2.6.3.orig/fs/ext3/namei.c	2004-02-20 15:01:27.000000000 +0800
-+++ uml-2.6.3/fs/ext3/namei.c	2004-02-21 00:21:04.611228776 +0800
-@@ -1617,6 +1617,19 @@
+--- linux-2.6.0-test5/fs/ext3/namei.c~ext3-wantedi-2.6	2003-09-19 18:01:48.000000000 +0400
++++ linux-2.6.0-test5-alexey/fs/ext3/namei.c	2003-09-28 13:40:23.000000000 +0400
+@@ -1617,6 +1617,19 @@ static int ext3_add_nondir(handle_t *han
  	return err;
  }
  
@@ -118,7 +112,7 @@ Index: uml-2.6.3/fs/ext3/namei.c
  /*
   * By the time this is called, we already have created
   * the directory cache entry for the new file, but it
-@@ -1640,7 +1653,7 @@
+@@ -1640,7 +1653,7 @@ static int ext3_create (struct inode * d
  	if (IS_DIRSYNC(dir))
  		handle->h_sync = 1;
  
@@ -127,7 +121,7 @@ Index: uml-2.6.3/fs/ext3/namei.c
  	err = PTR_ERR(inode);
  	if (!IS_ERR(inode)) {
  		inode->i_op = &ext3_file_inode_operations;
-@@ -1670,7 +1683,7 @@
+@@ -1670,7 +1683,7 @@ static int ext3_mknod (struct inode * di
  	if (IS_DIRSYNC(dir))
  		handle->h_sync = 1;
  
@@ -136,7 +130,7 @@ Index: uml-2.6.3/fs/ext3/namei.c
  	err = PTR_ERR(inode);
  	if (!IS_ERR(inode)) {
  		init_special_inode(inode, inode->i_mode, rdev);
-@@ -1702,7 +1715,7 @@
+@@ -1702,7 +1715,7 @@ static int ext3_mkdir(struct inode * dir
  	if (IS_DIRSYNC(dir))
  		handle->h_sync = 1;
  
@@ -145,7 +139,7 @@ Index: uml-2.6.3/fs/ext3/namei.c
  	err = PTR_ERR(inode);
  	if (IS_ERR(inode))
  		goto out_stop;
-@@ -2094,7 +2107,7 @@
+@@ -2094,7 +2107,7 @@ static int ext3_symlink (struct inode * 
  	if (IS_DIRSYNC(dir))
  		handle->h_sync = 1;
  
@@ -154,11 +148,23 @@ Index: uml-2.6.3/fs/ext3/namei.c
  	err = PTR_ERR(inode);
  	if (IS_ERR(inode))
  		goto out_stop;
-Index: uml-2.6.3/include/linux/ext3_fs.h
-===================================================================
---- uml-2.6.3.orig/include/linux/ext3_fs.h	2004-01-09 14:59:44.000000000 +0800
-+++ uml-2.6.3/include/linux/ext3_fs.h	2004-02-21 00:21:04.613228472 +0800
-@@ -203,6 +203,7 @@
+--- linux-2.6.0-test5/include/linux/dcache.h~ext3-wantedi-2.6	2003-09-28 13:40:22.000000000 +0400
++++ linux-2.6.0-test5-alexey/include/linux/dcache.h	2003-09-28 13:40:23.000000000 +0400
+@@ -25,6 +25,11 @@ struct vfsmount;
+ 
+ #define IS_ROOT(x) ((x) == (x)->d_parent)
+ 
++struct dentry_params {
++	unsigned long   p_inum;
++	void            *p_ptr;
++};
++
+ /*
+  * "quick string" -- eases parameter passing, but more importantly
+  * saves "metadata" about the string (ie length and the hash).
+--- linux-2.6.0-test5/include/linux/ext3_fs.h~ext3-wantedi-2.6	2003-09-19 18:01:10.000000000 +0400
++++ linux-2.6.0-test5-alexey/include/linux/ext3_fs.h	2003-09-28 13:40:23.000000000 +0400
+@@ -203,6 +203,7 @@ struct ext3_group_desc
  #define	EXT3_IOC_SETFLAGS		_IOW('f', 2, long)
  #define	EXT3_IOC_GETVERSION		_IOR('f', 3, long)
  #define	EXT3_IOC_SETVERSION		_IOW('f', 4, long)
@@ -166,7 +172,7 @@ Index: uml-2.6.3/include/linux/ext3_fs.h
  #define	EXT3_IOC_GETVERSION_OLD		_IOR('v', 1, long)
  #define	EXT3_IOC_SETVERSION_OLD		_IOW('v', 2, long)
  #ifdef CONFIG_JBD_DEBUG
-@@ -707,7 +708,8 @@
+@@ -707,7 +708,8 @@ extern int ext3fs_dirhash(const char *na
  			  dx_hash_info *hinfo);
  
  /* ialloc.c */
@@ -176,9 +182,11 @@ Index: uml-2.6.3/include/linux/ext3_fs.h
  extern void ext3_free_inode (handle_t *, struct inode *);
  extern struct inode * ext3_orphan_get (struct super_block *, unsigned long);
  extern unsigned long ext3_count_free_inodes (struct super_block *);
-@@ -792,4 +794,5 @@
+@@ -792,4 +794,5 @@ extern struct inode_operations ext3_fast
  
  #endif	/* __KERNEL__ */
  
 +#define EXT3_IOC_CREATE_INUM			_IOW('f', 5, long)
  #endif	/* _LINUX_EXT3_FS_H */
+
+_
diff --git a/lustre/kernel_patches/patches/ext3-wantedi-misc-2.6-suse.patch b/lustre/kernel_patches/patches/ext3-wantedi-misc-2.6-suse.patch
deleted file mode 100644
index 0f52cf6..0000000
--- a/lustre/kernel_patches/patches/ext3-wantedi-misc-2.6-suse.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: uml-2.6.3/include/linux/dcache.h
-===================================================================
---- uml-2.6.3.orig/include/linux/dcache.h	2004-02-21 00:19:14.365988600 +0800
-+++ uml-2.6.3/include/linux/dcache.h	2004-02-21 00:21:04.612228624 +0800
-@@ -25,6 +25,11 @@
- 
- #define IS_ROOT(x) ((x) == (x)->d_parent)
- 
-+struct dentry_params {
-+	unsigned long   p_inum;
-+	void            *p_ptr;
-+};
-+
- /*
-  * "quick string" -- eases parameter passing, but more importantly
-  * saves "metadata" about the string (ie length and the hash).
diff --git a/lustre/kernel_patches/patches/ext3-xattr-header-move-2.6.suse.patch b/lustre/kernel_patches/patches/ext3-xattr-header-move-2.6.suse.patch
deleted file mode 100644
index 7c2d97d..0000000
--- a/lustre/kernel_patches/patches/ext3-xattr-header-move-2.6.suse.patch
+++ /dev/null
@@ -1,506 +0,0 @@
-diff -rupN linux-2.6.4-51.0.orig/fs/ext3/acl.c linux-2.6.4-51.0/fs/ext3/acl.c
---- linux-2.6.4-51.0.orig/fs/ext3/acl.c	2004-04-05 19:41:59.000000000 +0300
-+++ linux-2.6.4-51.0/fs/ext3/acl.c	2004-04-07 11:06:33.000000000 +0300
-@@ -10,7 +10,7 @@
- #include <linux/fs.h>
- #include <linux/ext3_jbd.h>
- #include <linux/ext3_fs.h>
--#include "xattr.h"
-+#include <linux/ext3_xattr.h>
- #include "acl.h"
- 
- /*
-diff -rupN linux-2.6.4-51.0.orig/fs/ext3/file.c linux-2.6.4-51.0/fs/ext3/file.c
---- linux-2.6.4-51.0.orig/fs/ext3/file.c	2004-04-05 19:41:59.000000000 +0300
-+++ linux-2.6.4-51.0/fs/ext3/file.c	2004-04-07 11:06:39.000000000 +0300
-@@ -23,7 +23,7 @@
- #include <linux/jbd.h>
- #include <linux/ext3_fs.h>
- #include <linux/ext3_jbd.h>
--#include "xattr.h"
-+#include <linux/ext3_xattr.h>
- #include "acl.h"
- 
- /*
-diff -rupN linux-2.6.4-51.0.orig/fs/ext3/ialloc.c linux-2.6.4-51.0/fs/ext3/ialloc.c
---- linux-2.6.4-51.0.orig/fs/ext3/ialloc.c	2004-04-06 22:17:15.000000000 +0300
-+++ linux-2.6.4-51.0/fs/ext3/ialloc.c	2004-04-07 11:06:46.000000000 +0300
-@@ -26,7 +26,7 @@
- #include <asm/bitops.h>
- #include <asm/byteorder.h>
- 
--#include "xattr.h"
-+#include <linux/ext3_xattr.h>
- #include "acl.h"
- 
- /*
-diff -rupN linux-2.6.4-51.0.orig/fs/ext3/inode.c linux-2.6.4-51.0/fs/ext3/inode.c
---- linux-2.6.4-51.0.orig/fs/ext3/inode.c	2004-04-06 22:17:15.000000000 +0300
-+++ linux-2.6.4-51.0/fs/ext3/inode.c	2004-04-07 11:25:05.000000000 +0300
-@@ -36,7 +36,7 @@
- #include <linux/writeback.h>
- #include <linux/mpage.h>
- #include <linux/uio.h>
--#include "xattr.h"
-+#include <linux/ext3_xattr.h>
- #include "iopen.h"
- #include "acl.h"
- 
-@@ -2340,7 +2340,7 @@ static unsigned long ext3_get_inode_bloc
-  * performed.
-  */
- int ext3_get_inode_loc(struct inode *inode,
--				struct ext3_iloc *iloc, int in_mem)
-+		       struct ext3_iloc *iloc, int in_mem)
- {
- 	unsigned long block;
- 	struct buffer_head *bh;
-diff -rupN linux-2.6.4-51.0.orig/fs/ext3/namei.c linux-2.6.4-51.0/fs/ext3/namei.c
---- linux-2.6.4-51.0.orig/fs/ext3/namei.c	2004-04-06 22:17:15.000000000 +0300
-+++ linux-2.6.4-51.0/fs/ext3/namei.c	2004-04-07 11:06:57.000000000 +0300
-@@ -36,7 +36,7 @@
- #include <linux/quotaops.h>
- #include <linux/buffer_head.h>
- #include <linux/smp_lock.h>
--#include "xattr.h"
-+#include <linux/ext3_xattr.h>
- #include "iopen.h"
- #include "acl.h"
- 
-diff -rupN linux-2.6.4-51.0.orig/fs/ext3/super.c linux-2.6.4-51.0/fs/ext3/super.c
---- linux-2.6.4-51.0.orig/fs/ext3/super.c	2004-04-06 22:17:15.000000000 +0300
-+++ linux-2.6.4-51.0/fs/ext3/super.c	2004-04-07 11:07:05.000000000 +0300
-@@ -33,7 +33,7 @@
- #include <linux/vfs.h>
- #include <linux/random.h>
- #include <asm/uaccess.h>
--#include "xattr.h"
-+#include <linux/ext3_xattr.h>
- #include "acl.h"
- 
- static int ext3_load_journal(struct super_block *, struct ext3_super_block *);
-diff -rupN linux-2.6.4-51.0.orig/fs/ext3/symlink.c linux-2.6.4-51.0/fs/ext3/symlink.c
---- linux-2.6.4-51.0.orig/fs/ext3/symlink.c	2004-04-05 19:41:59.000000000 +0300
-+++ linux-2.6.4-51.0/fs/ext3/symlink.c	2004-04-07 11:07:16.000000000 +0300
-@@ -20,7 +20,7 @@
- #include <linux/fs.h>
- #include <linux/jbd.h>
- #include <linux/ext3_fs.h>
--#include "xattr.h"
-+#include <linux/ext3_xattr.h>
- 
- static int
- ext3_readlink(struct dentry *dentry, char __user *buffer, int buflen)
-diff -rupN linux-2.6.4-51.0.orig/fs/ext3/xattr.c linux-2.6.4-51.0/fs/ext3/xattr.c
---- linux-2.6.4-51.0.orig/fs/ext3/xattr.c	2004-04-06 22:17:15.000000000 +0300
-+++ linux-2.6.4-51.0/fs/ext3/xattr.c	2004-04-07 11:22:34.000000000 +0300
-@@ -59,7 +59,7 @@
- #include <linux/mbcache.h>
- #include <linux/quotaops.h>
- #include <linux/rwsem.h>
--#include "xattr.h"
-+#include <linux/ext3_xattr.h>
- #include "acl.h"
- 
- #define HDR(bh) ((struct ext3_xattr_header *)((bh)->b_data))
-@@ -348,7 +348,7 @@ cleanup:
-  */
- int
- ext3_xattr_ibody_get(struct inode *inode, int name_index, const char *name,
--	       void *buffer, size_t buffer_size)
-+	    	     void *buffer, size_t buffer_size)
- {
- 	int size, name_len = strlen(name), storage_size;
- 	struct ext3_xattr_entry *last;
-@@ -360,7 +360,7 @@ ext3_xattr_ibody_get(struct inode *inode
- 	if (EXT3_SB(inode->i_sb)->s_inode_size <= EXT3_GOOD_OLD_INODE_SIZE)
- 		return -ENOENT;
- 
--	ret = ext3_get_inode_loc(inode, &iloc);
-+	ret = ext3_get_inode_loc(inode, &iloc, 1);
- 	if (ret)
- 		return ret;
- 	raw_inode = ext3_raw_inode(&iloc);
-@@ -542,7 +542,7 @@ ext3_xattr_ibody_list(struct inode *inod
- 	if (EXT3_SB(inode->i_sb)->s_inode_size <= EXT3_GOOD_OLD_INODE_SIZE)
- 		return 0;
- 
--	ret = ext3_get_inode_loc(inode, &iloc);
-+	ret = ext3_get_inode_loc(inode, &iloc, 1);
- 	if (ret)
- 		return ret;
- 	raw_inode = ext3_raw_inode(&iloc);
-@@ -693,7 +693,7 @@ ext3_xattr_ibody_find(struct inode *inod
- 	if (EXT3_SB(inode->i_sb)->s_inode_size <= EXT3_GOOD_OLD_INODE_SIZE)
- 		return ret;
- 
--	err = ext3_get_inode_loc(inode, &iloc);
-+	err = ext3_get_inode_loc(inode, &iloc, 1);
- 	if (err)
- 		return -EIO;
- 	raw_inode = ext3_raw_inode(&iloc);
-@@ -824,7 +824,7 @@ ext3_xattr_ibody_set(handle_t *handle, s
- 	if (EXT3_SB(inode->i_sb)->s_inode_size <= EXT3_GOOD_OLD_INODE_SIZE)
- 		return -ENOSPC;
- 
--	err = ext3_get_inode_loc(inode, &iloc);
-+	err = ext3_get_inode_loc(inode, &iloc, 1);
- 	if (err)
- 		return err;
- 	raw_inode = ext3_raw_inode(&iloc);
-diff -rupN linux-2.6.4-51.0.orig/fs/ext3/xattr.h linux-2.6.4-51.0/fs/ext3/xattr.h
---- linux-2.6.4-51.0.orig/fs/ext3/xattr.h	2004-04-06 22:17:15.000000000 +0300
-+++ linux-2.6.4-51.0/fs/ext3/xattr.h	1970-01-01 03:00:00.000000000 +0300
-@@ -1,147 +0,0 @@
--/*
--  File: fs/ext3/xattr.h
--
--  On-disk format of extended attributes for the ext3 filesystem.
--
--  (C) 2001 Andreas Gruenbacher, <a.gruenbacher@computer.org>
--*/
--
--#include <linux/config.h>
--#include <linux/xattr.h>
--
--/* Magic value in attribute blocks */
--#define EXT3_XATTR_MAGIC		0xEA020000
--
--/* Maximum number of references to one attribute block */
--#define EXT3_XATTR_REFCOUNT_MAX		1024
--
--/* Name indexes */
--#define EXT3_XATTR_INDEX_MAX			10
--#define EXT3_XATTR_INDEX_USER			1
--#define EXT3_XATTR_INDEX_POSIX_ACL_ACCESS	2
--#define EXT3_XATTR_INDEX_POSIX_ACL_DEFAULT	3
--#define EXT3_XATTR_INDEX_TRUSTED		4
--#define	EXT3_XATTR_INDEX_LUSTRE			5
--#define EXT3_XATTR_INDEX_SECURITY	        6
--
--struct ext3_xattr_header {
--	__u32	h_magic;	/* magic number for identification */
--	__u32	h_refcount;	/* reference count */
--	__u32	h_blocks;	/* number of disk blocks used */
--	__u32	h_hash;		/* hash value of all attributes */
--	__u32	h_reserved[4];	/* zero right now */
--};
--
--struct ext3_xattr_entry {
--	__u8	e_name_len;	/* length of name */
--	__u8	e_name_index;	/* attribute name index */
--	__u16	e_value_offs;	/* offset in disk block of value */
--	__u32	e_value_block;	/* disk block attribute is stored on (n/i) */
--	__u32	e_value_size;	/* size of attribute value */
--	__u32	e_hash;		/* hash value of name and value */
--	char	e_name[0];	/* attribute name */
--};
--
--#define EXT3_XATTR_PAD_BITS		2
--#define EXT3_XATTR_PAD		(1<<EXT3_XATTR_PAD_BITS)
--#define EXT3_XATTR_ROUND		(EXT3_XATTR_PAD-1)
--#define EXT3_XATTR_LEN(name_len) \
--	(((name_len) + EXT3_XATTR_ROUND + \
--	sizeof(struct ext3_xattr_entry)) & ~EXT3_XATTR_ROUND)
--#define EXT3_XATTR_NEXT(entry) \
--	( (struct ext3_xattr_entry *)( \
--	  (char *)(entry) + EXT3_XATTR_LEN((entry)->e_name_len)) )
--#define EXT3_XATTR_SIZE(size) \
--	(((size) + EXT3_XATTR_ROUND) & ~EXT3_XATTR_ROUND)
--
--# ifdef CONFIG_EXT3_FS_XATTR
--
--struct ext3_xattr_handler {
--	char *prefix;
--	size_t (*list)(char *list, struct inode *inode, const char *name,
--		       int name_len);
--	int (*get)(struct inode *inode, const char *name, void *buffer,
--		   size_t size);
--	int (*set)(struct inode *inode, const char *name, const void *buffer,
--		   size_t size, int flags);
--};
--
--extern int ext3_xattr_register(int, struct ext3_xattr_handler *);
--extern void ext3_xattr_unregister(int, struct ext3_xattr_handler *);
--
--extern int ext3_setxattr(struct dentry *, const char *, const void *, size_t, int);
--extern ssize_t ext3_getxattr(struct dentry *, const char *, void *, size_t);
--extern ssize_t ext3_listxattr(struct dentry *, char *, size_t);
--extern int ext3_removexattr(struct dentry *, const char *);
--
--extern int ext3_xattr_get(struct inode *, int, const char *, void *, size_t);
--extern int ext3_xattr_list(struct inode *, char *, size_t);
--extern int ext3_xattr_set(struct inode *, int, const char *, const void *, size_t, int);
--extern int ext3_xattr_set_handle(handle_t *, struct inode *, int, const char *,const void *,size_t,int);
--extern int ext3_xattr_block_set(handle_t *, struct inode *, int, const char *,const void *,size_t,int);
--
--extern void ext3_xattr_delete_inode(handle_t *, struct inode *);
--extern void ext3_xattr_put_super(struct super_block *);
--
--extern int init_ext3_xattr(void);
--extern void exit_ext3_xattr(void);
--
--# else  /* CONFIG_EXT3_FS_XATTR */
--#  define ext3_setxattr		NULL
--#  define ext3_getxattr		NULL
--#  define ext3_listxattr	NULL
--#  define ext3_removexattr	NULL
--
--static inline int
--ext3_xattr_get(struct inode *inode, int name_index, const char *name,
--	       void *buffer, size_t size, int flags)
--{
--	return -EOPNOTSUPP;
--}
--
--static inline int
--ext3_xattr_list(struct inode *inode, void *buffer, size_t size)
--{
--	return -EOPNOTSUPP;
--}
--
--static inline int
--ext3_xattr_set(struct inode *inode, int name_index, const char *name,
--	       const void *value, size_t size, int flags)
--{
--	return -EOPNOTSUPP;
--}
--
--static inline int
--ext3_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index,
--	       const char *name, const void *value, size_t size, int flags)
--{
--	return -EOPNOTSUPP;
--}
--
--static inline void
--ext3_xattr_delete_inode(handle_t *handle, struct inode *inode)
--{
--}
--
--static inline void
--ext3_xattr_put_super(struct super_block *sb)
--{
--}
--
--static inline int
--init_ext3_xattr(void)
--{
--	return 0;
--}
--
--static inline void
--exit_ext3_xattr(void)
--{
--}
--
--# endif  /* CONFIG_EXT3_FS_XATTR */
--
--extern struct ext3_xattr_handler ext3_xattr_user_handler;
--extern struct ext3_xattr_handler ext3_xattr_trusted_handler;
--extern struct ext3_xattr_handler ext3_xattr_security_handler;
-diff -rupN linux-2.6.4-51.0.orig/fs/ext3/xattr_security.c linux-2.6.4-51.0/fs/ext3/xattr_security.c
---- linux-2.6.4-51.0.orig/fs/ext3/xattr_security.c	2004-04-05 19:41:59.000000000 +0300
-+++ linux-2.6.4-51.0/fs/ext3/xattr_security.c	2004-04-07 11:06:22.000000000 +0300
-@@ -9,7 +9,7 @@
- #include <linux/smp_lock.h>
- #include <linux/ext3_jbd.h>
- #include <linux/ext3_fs.h>
--#include "xattr.h"
-+#include <linux/ext3_xattr.h>
- 
- static size_t
- ext3_xattr_security_list(char *list, struct inode *inode,
-diff -rupN linux-2.6.4-51.0.orig/fs/ext3/xattr_trusted.c linux-2.6.4-51.0/fs/ext3/xattr_trusted.c
---- linux-2.6.4-51.0.orig/fs/ext3/xattr_trusted.c	2004-04-05 19:41:59.000000000 +0300
-+++ linux-2.6.4-51.0/fs/ext3/xattr_trusted.c	2004-04-07 11:07:41.000000000 +0300
-@@ -11,7 +11,7 @@
- #include <linux/smp_lock.h>
- #include <linux/ext3_jbd.h>
- #include <linux/ext3_fs.h>
--#include "xattr.h"
-+#include <linux/ext3_xattr.h>
- 
- #define XATTR_TRUSTED_PREFIX "trusted."
- 
-diff -rupN linux-2.6.4-51.0.orig/fs/ext3/xattr_user.c linux-2.6.4-51.0/fs/ext3/xattr_user.c
---- linux-2.6.4-51.0.orig/fs/ext3/xattr_user.c	2004-04-05 19:41:59.000000000 +0300
-+++ linux-2.6.4-51.0/fs/ext3/xattr_user.c	2004-04-07 11:07:47.000000000 +0300
-@@ -11,7 +11,7 @@
- #include <linux/smp_lock.h>
- #include <linux/ext3_jbd.h>
- #include <linux/ext3_fs.h>
--#include "xattr.h"
-+#include <linux/ext3_xattr.h>
- 
- #define XATTR_USER_PREFIX "user."
- 
-diff -rupN linux-2.6.4-51.0.orig/include/linux/ext3_fs.h linux-2.6.4-51.0/include/linux/ext3_fs.h
---- linux-2.6.4-51.0.orig/include/linux/ext3_fs.h	2004-04-06 22:17:15.000000000 +0300
-+++ linux-2.6.4-51.0/include/linux/ext3_fs.h	2004-04-07 11:13:26.000000000 +0300
-@@ -741,6 +741,9 @@ extern void ext3_truncate (struct inode 
- extern void ext3_set_inode_flags(struct inode *);
- extern void ext3_set_aops(struct inode *inode);
- 
-+extern int ext3_get_inode_loc(struct inode *inode,
-+		    	      struct ext3_iloc *iloc, int in_mem);
-+
- /* ioctl.c */
- extern int ext3_ioctl (struct inode *, struct file *, unsigned int,
- 		       unsigned long);
-diff -rupN linux-2.6.4-51.0.orig/include/linux/ext3_xattr.h linux-2.6.4-51.0/include/linux/ext3_xattr.h
---- linux-2.6.4-51.0.orig/include/linux/ext3_xattr.h	1970-01-01 03:00:00.000000000 +0300
-+++ linux-2.6.4-51.0/include/linux/ext3_xattr.h	2004-04-07 11:08:34.000000000 +0300
-@@ -0,0 +1,152 @@
-+/*
-+  File: linux/include/linux/ext3_xattr.h
-+
-+  On-disk format of extended attributes for the ext3 filesystem.
-+
-+  (C) 2001 Andreas Gruenbacher, <a.gruenbacher@computer.org>
-+*/
-+
-+#ifndef _LINUX_EXT3_XATTR_H
-+#define _LINUX_EXT3_XATTR_H
-+
-+#include <linux/config.h>
-+#include <linux/xattr.h>
-+
-+/* Magic value in attribute blocks */
-+#define EXT3_XATTR_MAGIC		0xEA020000
-+
-+/* Maximum number of references to one attribute block */
-+#define EXT3_XATTR_REFCOUNT_MAX		1024
-+
-+/* Name indexes */
-+#define EXT3_XATTR_INDEX_MAX			10
-+#define EXT3_XATTR_INDEX_USER			1
-+#define EXT3_XATTR_INDEX_POSIX_ACL_ACCESS	2
-+#define EXT3_XATTR_INDEX_POSIX_ACL_DEFAULT	3
-+#define EXT3_XATTR_INDEX_TRUSTED		4
-+#define	EXT3_XATTR_INDEX_LUSTRE			5
-+#define EXT3_XATTR_INDEX_SECURITY	        6
-+
-+struct ext3_xattr_header {
-+	__u32	h_magic;	/* magic number for identification */
-+	__u32	h_refcount;	/* reference count */
-+	__u32	h_blocks;	/* number of disk blocks used */
-+	__u32	h_hash;		/* hash value of all attributes */
-+	__u32	h_reserved[4];	/* zero right now */
-+};
-+
-+struct ext3_xattr_entry {
-+	__u8	e_name_len;	/* length of name */
-+	__u8	e_name_index;	/* attribute name index */
-+	__u16	e_value_offs;	/* offset in disk block of value */
-+	__u32	e_value_block;	/* disk block attribute is stored on (n/i) */
-+	__u32	e_value_size;	/* size of attribute value */
-+	__u32	e_hash;		/* hash value of name and value */
-+	char	e_name[0];	/* attribute name */
-+};
-+
-+#define EXT3_XATTR_PAD_BITS		2
-+#define EXT3_XATTR_PAD		(1<<EXT3_XATTR_PAD_BITS)
-+#define EXT3_XATTR_ROUND		(EXT3_XATTR_PAD-1)
-+#define EXT3_XATTR_LEN(name_len) \
-+	(((name_len) + EXT3_XATTR_ROUND + \
-+	sizeof(struct ext3_xattr_entry)) & ~EXT3_XATTR_ROUND)
-+#define EXT3_XATTR_NEXT(entry) \
-+	( (struct ext3_xattr_entry *)( \
-+	  (char *)(entry) + EXT3_XATTR_LEN((entry)->e_name_len)) )
-+#define EXT3_XATTR_SIZE(size) \
-+	(((size) + EXT3_XATTR_ROUND) & ~EXT3_XATTR_ROUND)
-+
-+# ifdef CONFIG_EXT3_FS_XATTR
-+
-+struct ext3_xattr_handler {
-+	char *prefix;
-+	size_t (*list)(char *list, struct inode *inode, const char *name,
-+		       int name_len);
-+	int (*get)(struct inode *inode, const char *name, void *buffer,
-+		   size_t size);
-+	int (*set)(struct inode *inode, const char *name, const void *buffer,
-+		   size_t size, int flags);
-+};
-+
-+extern int ext3_xattr_register(int, struct ext3_xattr_handler *);
-+extern void ext3_xattr_unregister(int, struct ext3_xattr_handler *);
-+
-+extern int ext3_setxattr(struct dentry *, const char *, const void *, size_t, int);
-+extern ssize_t ext3_getxattr(struct dentry *, const char *, void *, size_t);
-+extern ssize_t ext3_listxattr(struct dentry *, char *, size_t);
-+extern int ext3_removexattr(struct dentry *, const char *);
-+
-+extern int ext3_xattr_get(struct inode *, int, const char *, void *, size_t);
-+extern int ext3_xattr_list(struct inode *, char *, size_t);
-+extern int ext3_xattr_set(struct inode *, int, const char *, const void *, size_t, int);
-+extern int ext3_xattr_set_handle(handle_t *, struct inode *, int, const char *,const void *,size_t,int);
-+extern int ext3_xattr_block_set(handle_t *, struct inode *, int, const char *,const void *,size_t,int);
-+
-+extern void ext3_xattr_delete_inode(handle_t *, struct inode *);
-+extern void ext3_xattr_put_super(struct super_block *);
-+
-+extern int init_ext3_xattr(void);
-+extern void exit_ext3_xattr(void);
-+
-+# else  /* CONFIG_EXT3_FS_XATTR */
-+#  define ext3_setxattr		NULL
-+#  define ext3_getxattr		NULL
-+#  define ext3_listxattr	NULL
-+#  define ext3_removexattr	NULL
-+
-+static inline int
-+ext3_xattr_get(struct inode *inode, int name_index, const char *name,
-+	       void *buffer, size_t size, int flags)
-+{
-+	return -EOPNOTSUPP;
-+}
-+
-+static inline int
-+ext3_xattr_list(struct inode *inode, void *buffer, size_t size)
-+{
-+	return -EOPNOTSUPP;
-+}
-+
-+static inline int
-+ext3_xattr_set(struct inode *inode, int name_index, const char *name,
-+	       const void *value, size_t size, int flags)
-+{
-+	return -EOPNOTSUPP;
-+}
-+
-+static inline int
-+ext3_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index,
-+	       const char *name, const void *value, size_t size, int flags)
-+{
-+	return -EOPNOTSUPP;
-+}
-+
-+static inline void
-+ext3_xattr_delete_inode(handle_t *handle, struct inode *inode)
-+{
-+}
-+
-+static inline void
-+ext3_xattr_put_super(struct super_block *sb)
-+{
-+}
-+
-+static inline int
-+init_ext3_xattr(void)
-+{
-+	return 0;
-+}
-+
-+static inline void
-+exit_ext3_xattr(void)
-+{
-+}
-+
-+# endif  /* CONFIG_EXT3_FS_XATTR */
-+
-+extern struct ext3_xattr_handler ext3_xattr_user_handler;
-+extern struct ext3_xattr_handler ext3_xattr_trusted_handler;
-+extern struct ext3_xattr_handler ext3_xattr_security_handler;
-+
-+#endif
diff --git a/lustre/kernel_patches/patches/nfs-cifs-intent-2.6-suse.patch b/lustre/kernel_patches/patches/fs-intent-2.6.3-mm4.patch
similarity index 77%
rename from lustre/kernel_patches/patches/nfs-cifs-intent-2.6-suse.patch
rename to lustre/kernel_patches/patches/fs-intent-2.6.3-mm4.patch
index 023159c..a5c8725 100644
--- a/lustre/kernel_patches/patches/nfs-cifs-intent-2.6-suse.patch
+++ b/lustre/kernel_patches/patches/fs-intent-2.6.3-mm4.patch
@@ -2,11 +2,11 @@
 .new.........fs/nfs/dir.c
 .old..........pc/linux-2.6.3-nfs-intent-suse/fs/nfs/dir.c
 .new.........fs/nfs/dir.c
-Index: linux-2.6.4-51.0/fs/nfs/dir.c
+Index: linux-2.6.3-mm4/fs/nfs/dir.c
 ===================================================================
---- linux-2.6.4-51.0.orig/fs/nfs/dir.c	2004-04-05 17:09:16.000000000 -0400
-+++ linux-2.6.4-51.0/fs/nfs/dir.c	2004-04-05 17:09:23.000000000 -0400
-@@ -782,7 +782,7 @@
+--- linux-2.6.3-mm4.orig/fs/nfs/dir.c	2004-03-08 17:05:35.000000000 +0800
++++ linux-2.6.3-mm4/fs/nfs/dir.c	2004-03-08 17:38:58.000000000 +0800
+@@ -773,7 +773,7 @@
  	if (nd->flags & LOOKUP_DIRECTORY)
  		return 0;
  	/* Are we trying to write to a read only partition? */
@@ -15,7 +15,7 @@ Index: linux-2.6.4-51.0/fs/nfs/dir.c
  		return 0;
  	return 1;
  }
-@@ -803,7 +803,7 @@
+@@ -794,7 +794,7 @@
  	dentry->d_op = NFS_PROTO(dir)->dentry_ops;
  
  	/* Let vfs_create() deal with O_EXCL */
@@ -24,7 +24,7 @@ Index: linux-2.6.4-51.0/fs/nfs/dir.c
  		goto no_entry;
  
  	/* Open the file on the server */
-@@ -811,7 +811,7 @@
+@@ -802,7 +802,7 @@
  	/* Revalidate parent directory attribute cache */
  	nfs_revalidate_inode(NFS_SERVER(dir), dir);
  
@@ -33,7 +33,7 @@ Index: linux-2.6.4-51.0/fs/nfs/dir.c
  		nfs_begin_data_update(dir);
  		inode = nfs4_atomic_open(dir, dentry, nd);
  		nfs_end_data_update(dir);
-@@ -827,7 +827,7 @@
+@@ -818,7 +818,7 @@
  				break;
  			/* This turned out not to be a regular file */
  			case -ELOOP:
@@ -42,7 +42,7 @@ Index: linux-2.6.4-51.0/fs/nfs/dir.c
  					goto no_open;
  			/* case -EISDIR: */
  			/* case -EINVAL: */
-@@ -861,7 +861,7 @@
+@@ -852,7 +852,7 @@
  	dir = parent->d_inode;
  	if (!is_atomic_open(dir, nd))
  		goto no_open;
@@ -51,11 +51,11 @@ Index: linux-2.6.4-51.0/fs/nfs/dir.c
  	if (openflags & O_CREAT) {
  		/* If this is a negative dentry, just drop it */
  		if (!inode)
-Index: linux-2.6.4-51.0/fs/nfs/nfs4proc.c
+Index: linux-2.6.3-mm4/fs/nfs/nfs4proc.c
 ===================================================================
---- linux-2.6.4-51.0.orig/fs/nfs/nfs4proc.c	2004-04-05 12:41:59.000000000 -0400
-+++ linux-2.6.4-51.0/fs/nfs/nfs4proc.c	2004-04-05 17:09:23.000000000 -0400
-@@ -792,17 +792,17 @@
+--- linux-2.6.3-mm4.orig/fs/nfs/nfs4proc.c	2004-03-08 17:02:24.000000000 +0800
++++ linux-2.6.3-mm4/fs/nfs/nfs4proc.c	2004-03-08 17:37:59.000000000 +0800
+@@ -778,17 +778,17 @@
  	struct nfs4_state *state;
  
  	if (nd->flags & LOOKUP_CREATE) {
@@ -76,27 +76,23 @@ Index: linux-2.6.4-51.0/fs/nfs/nfs4proc.c
  	put_rpccred(cred);
  	if (IS_ERR(state))
  		return (struct inode *)state;
-Index: linux-2.6.4-51.0/fs/cifs/dir.c
+Index: linux-2.6.3-mm4/fs/cifs/dir.c
 ===================================================================
---- linux-2.6.4-51.0.orig/fs/cifs/dir.c	2004-04-05 12:41:59.000000000 -0400
-+++ linux-2.6.4-51.0/fs/cifs/dir.c	2004-04-05 17:13:47.000000000 -0400
-@@ -146,22 +146,22 @@
+--- linux-2.6.3-mm4.orig/fs/cifs/dir.c	2004-02-18 11:58:34.000000000 +0800
++++ linux-2.6.3-mm4/fs/cifs/dir.c	2004-03-08 17:37:59.000000000 +0800
+@@ -146,18 +146,18 @@
  	if(nd) { 
  		cFYI(1,("In create for inode %p dentry->inode %p nd flags = 0x%x for %s",inode, direntry->d_inode, nd->flags,full_path));
  
 -		if ((nd->intent.open.flags & O_ACCMODE) == O_RDONLY)
 +		if ((nd->intent.it_flags & O_ACCMODE) == O_RDONLY)
- 			desiredAccess = GENERIC_READ;
+                 	desiredAccess = GENERIC_READ;
 -		else if ((nd->intent.open.flags & O_ACCMODE) == O_WRONLY)
 +		else if ((nd->intent.it_flags & O_ACCMODE) == O_WRONLY)
  			desiredAccess = GENERIC_WRITE;
--		else if ((nd->intent.open.flags & O_ACCMODE) == O_RDWR) {
-+		else if ((nd->intent.it_flags & O_ACCMODE) == O_RDWR) {
- 			/* GENERIC_ALL is too much permission to request */
- 			/* can cause unnecessary access denied on create */
- 			/* desiredAccess = GENERIC_ALL; */
- 			desiredAccess = GENERIC_READ | GENERIC_WRITE;
- 		}
+-		else if ((nd->intent.open.flags & O_ACCMODE) == O_RDWR)
++		else if ((nd->intent.it_flags & O_ACCMODE) == O_RDWR)
+ 			desiredAccess = GENERIC_ALL;
  
 -		if((nd->intent.open.flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL))
 +		if((nd->intent.it_flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL))
@@ -109,7 +105,7 @@ Index: linux-2.6.4-51.0/fs/cifs/dir.c
  			disposition = FILE_OPEN_IF;
  		else {
  			cFYI(1,("Create flag not set in create function"));
-@@ -319,7 +319,7 @@
+@@ -314,7 +314,7 @@
  	      parent_dir_inode, direntry->d_name.name, direntry));
  
  	if(nd) {  /* BB removeme */
diff --git a/lustre/kernel_patches/patches/header-guards-2.6-suse.patch b/lustre/kernel_patches/patches/header-guards-2.6-suse.patch
deleted file mode 100644
index c0940cd..0000000
--- a/lustre/kernel_patches/patches/header-guards-2.6-suse.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: linux-2.6.4-30.1/include/linux/percpu_counter.h
-===================================================================
---- linux-2.6.4-30.1.orig/include/linux/percpu_counter.h	2004-03-26 03:33:43.000000000 -0500
-+++ linux-2.6.4-30.1/include/linux/percpu_counter.h	2004-04-02 02:09:30.000000000 -0500
-@@ -3,6 +3,8 @@
-  *
-  * WARNING: these things are HUGE.  4 kbytes per counter on 32-way P4.
-  */
-+#ifndef _LINUX_PERCPU_COUNTER_H
-+#define _LINUX_PERCPU_COUNTER_H
- 
- #include <linux/config.h>
- #include <linux/spinlock.h>
-@@ -101,3 +103,5 @@
- {
- 	percpu_counter_mod(fbc, -1);
- }
-+
-+#endif /* _LINUX_PERCPU_COUNTER_H */
-Index: linux-2.6.4-30.1/include/linux/blockgroup_lock.h
-===================================================================
---- linux-2.6.4-30.1.orig/include/linux/blockgroup_lock.h	2004-03-26 03:33:43.000000000 -0500
-+++ linux-2.6.4-30.1/include/linux/blockgroup_lock.h	2004-04-02 02:14:20.000000000 -0500
-@@ -3,6 +3,8 @@
-  *
-  * Simple hashed spinlocking.
-  */
-+#ifndef _LINUX_BLOCKGROUP_LOCK_H
-+#define _LINUX_BLOCKGROUP_LOCK_H
- 
- #include <linux/config.h>
- #include <linux/spinlock.h>
-@@ -55,4 +57,4 @@
- #define sb_bgl_lock(sb, block_group) \
- 	(&(sb)->s_blockgroup_lock.locks[(block_group) & (NR_BG_LOCKS-1)].lock)
- 
--
-+#endif
diff --git a/lustre/kernel_patches/patches/htree-ext3-2.4.18.patch b/lustre/kernel_patches/patches/htree-ext3-2.4.18.patch
index a8bce7c..2bfd0b9 100644
--- a/lustre/kernel_patches/patches/htree-ext3-2.4.18.patch
+++ b/lustre/kernel_patches/patches/htree-ext3-2.4.18.patch
@@ -1006,8 +1006,8 @@
 +		data1 = bh2->b_data;
 +
 +		/* The 0th block becomes the root, move the dirents out */
-+		de = (struct ext3_dir_entry_2 *)&root->dotdot;
-+		de = (struct ext3_dir_entry_2 *)((char *)de + le16_to_cpu(de->rec_len));
++		de = (struct ext3_dir_entry_2 *) &root->dotdot;
++		de = (struct ext3_dir_entry_2 *) ((char *)de + de->rec_len);
 +		len = ((char *) root) + sb->s_blocksize - (char *) de;
 +		memcpy (data1, de, len);
 +		de = (ext3_dirent *) data1;
diff --git a/lustre/kernel_patches/patches/invalidate_show-2.4.21-sles8sp3.patch b/lustre/kernel_patches/patches/invalidate_show-2.4.21-sles8sp3.patch
deleted file mode 100644
index 36e59d3..0000000
--- a/lustre/kernel_patches/patches/invalidate_show-2.4.21-sles8sp3.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
- fs/inode.c         |   21 ++++++++++++++-------
- fs/smbfs/inode.c   |    2 +-
- fs/super.c         |    4 ++--
- include/linux/fs.h |    2 +-
- 4 files changed, 18 insertions(+), 11 deletions(-)
-
-Index: linux-2.4.21/fs/inode.c
-===================================================================
---- linux-2.4.21.orig/fs/inode.c	2004-04-24 02:38:51.000000000 -0400
-+++ linux-2.4.21/fs/inode.c	2004-04-26 19:41:58.000000000 -0400
-@@ -651,7 +651,8 @@
- /*
-  * Invalidate all inodes for a device.
-  */
--static int invalidate_list(struct list_head *head, struct super_block * sb, struct list_head * dispose)
-+static int invalidate_list(struct list_head *head, struct super_block * sb,
-+			   struct list_head * dispose, int show)
- {
- 	struct list_head *next;
- 	int busy = 0, count = 0;
-@@ -676,6 +677,11 @@
- 			count++;
- 			continue;
- 		}
-+		if (show)
-+			printk(KERN_ERR
-+			       "inode busy: dev %s:%lu (%p) mode %o count %u\n",
-+			       kdevname(sb->s_dev), inode->i_ino, inode,
-+			       inode->i_mode, atomic_read(&inode->i_count));
- 		busy = 1;
- 	}
- 	/* only unused inodes may be cached with i_count zero */
-@@ -694,22 +700,23 @@
- /**
-  *	invalidate_inodes	- discard the inodes on a device
-  *	@sb: superblock
-+ *	@show: whether we should display any busy inodes found
-  *
-  *	Discard all of the inodes for a given superblock. If the discard
-  *	fails because there are busy inodes then a non zero value is returned.
-  *	If the discard is successful all the inodes have been discarded.
-  */
-  
--int invalidate_inodes(struct super_block * sb)
-+int invalidate_inodes(struct super_block * sb, int show)
- {
- 	int busy;
- 	LIST_HEAD(throw_away);
- 
- 	spin_lock(&inode_lock);
--	busy = invalidate_list(&inode_in_use, sb, &throw_away);
--	busy |= invalidate_list(&inode_unused, sb, &throw_away);
--	busy |= invalidate_list(&sb->s_dirty, sb, &throw_away);
--	busy |= invalidate_list(&sb->s_locked_inodes, sb, &throw_away);
-+	busy = invalidate_list(&inode_in_use, sb, &throw_away, show);
-+	busy |= invalidate_list(&inode_unused, sb, &throw_away, show);
-+	busy |= invalidate_list(&sb->s_dirty, sb, &throw_away, show);
-+	busy |= invalidate_list(&sb->s_locked_inodes, sb, &throw_away, show);
- 	spin_unlock(&inode_lock);
- 
- 	dispose_list(&throw_away);
-@@ -735,7 +742,7 @@
- 		 * hold).
- 		 */
- 		shrink_dcache_sb(sb);
--		res = invalidate_inodes(sb);
-+		res = invalidate_inodes(sb, 0);
- 		drop_super(sb);
- 	}
- 	invalidate_buffers(dev);
-Index: linux-2.4.21/fs/super.c
-===================================================================
---- linux-2.4.21.orig/fs/super.c	2004-04-24 02:38:51.000000000 -0400
-+++ linux-2.4.21/fs/super.c	2004-04-26 19:41:58.000000000 -0400
-@@ -932,7 +932,7 @@
- 	lock_super(sb);
- 	lock_kernel();
- 	sb->s_flags &= ~MS_ACTIVE;
--	invalidate_inodes(sb);	/* bad name - it should be evict_inodes() */
-+	invalidate_inodes(sb, 0);  /* bad name - it should be evict_inodes() */
- 	if (sop) {
- 		if (sop->write_super && sb->s_dirt)
- 			sop->write_super(sb);
-@@ -941,7 +941,7 @@
- 	}
- 
- 	/* Forget any remaining inodes */
--	if (invalidate_inodes(sb)) {
-+	if (invalidate_inodes(sb, 1)) {
- 		printk(KERN_ERR "VFS: Busy inodes after unmount. "
- 			"Self-destruct in 5 seconds.  Have a nice day...\n");
- 	}
-Index: linux-2.4.21/fs/smbfs/inode.c
-===================================================================
---- linux-2.4.21.orig/fs/smbfs/inode.c	2004-04-24 02:38:44.000000000 -0400
-+++ linux-2.4.21/fs/smbfs/inode.c	2004-04-26 19:41:58.000000000 -0400
-@@ -167,7 +167,7 @@
- {
- 	VERBOSE("\n");
- 	shrink_dcache_sb(SB_of(server));
--	invalidate_inodes(SB_of(server));
-+	invalidate_inodes(SB_of(server), 0);
- }
- 
- /*
-Index: linux-2.4.21/fs/ntfs/super.c
-===================================================================
---- linux-2.4.21.orig/fs/ntfs/super.c	2004-04-24 02:38:38.000000000 -0400
-+++ linux-2.4.21/fs/ntfs/super.c	2004-04-26 19:42:12.000000000 -0400
-@@ -1604,7 +1604,7 @@
- 	 * method again... FIXME: Do we need to do this twice now because of
- 	 * attribute inodes? I think not, so leave as is for now... (AIA)
- 	 */
--	if (invalidate_inodes(sb)) {
-+	if (invalidate_inodes(sb, 0)) {
- 		ntfs_error(sb, "Busy inodes left. This is most likely a NTFS "
- 				"driver bug.");
- 		/* Copied from fs/super.c. I just love this message. (-; */
-Index: linux-2.4.21/include/linux/fs.h
-===================================================================
---- linux-2.4.21.orig/include/linux/fs.h	2004-04-26 19:06:32.000000000 -0400
-+++ linux-2.4.21/include/linux/fs.h	2004-04-26 19:41:58.000000000 -0400
-@@ -1401,7 +1401,7 @@
- extern void set_buffer_flushtime(struct buffer_head *);
- extern void balance_dirty(void);
- extern int check_disk_change(kdev_t);
--extern int invalidate_inodes(struct super_block *);
-+extern int invalidate_inodes(struct super_block *, int);
- extern int invalidate_device(kdev_t, int);
- extern void invalidate_inode_pages(struct inode *);
- extern void invalidate_inode_pages2(struct address_space *);
diff --git a/lustre/kernel_patches/patches/invalidate_show-2.6.0.patch b/lustre/kernel_patches/patches/invalidate_show-2.6.0.patch
new file mode 100644
index 0000000..2c351ec
--- /dev/null
+++ b/lustre/kernel_patches/patches/invalidate_show-2.6.0.patch
@@ -0,0 +1,54 @@
+Index: linux-2.6.0/fs/inode.c
+===================================================================
+--- linux-2.6.0.orig/fs/inode.c	2004-01-04 15:21:49.000000000 +0300
++++ linux-2.6.0/fs/inode.c	2004-01-04 15:25:35.000000000 +0300
+@@ -351,7 +351,36 @@
+ }
+ 
+ EXPORT_SYMBOL(invalidate_inodes);
+- 
++
++void show_remaining_inodes(struct super_block *sb)
++{
++	struct list_head *head;
++	struct list_head *next;
++
++	down(&iprune_sem);
++	spin_lock(&inode_lock);
++	head = &sb->s_inodes;
++	next = head->next;
++	for (;;) {
++		struct list_head * tmp = next;
++		struct inode * inode;
++
++		next = next->next;
++		if (tmp == head)
++			break;
++		inode = list_entry(tmp, struct inode, i_sb_list);
++		if (atomic_read(&inode->i_count) == 0)
++			continue;
++		printk(KERN_ERR
++				"%u:%u %lu (%p) mode %o count %u\n",
++				MAJOR(sb->s_dev), MINOR(sb->s_dev),
++				inode->i_ino, inode,
++				inode->i_mode, atomic_read(&inode->i_count));
++	}
++	spin_unlock(&inode_lock);
++	up(&iprune_sem);
++}
++
+ int __invalidate_device(struct block_device *bdev, int do_sync)
+ {
+ 	struct super_block *sb;
+Index: linux-2.6.0/fs/super.c
+===================================================================
+--- linux-2.6.0.orig/fs/super.c	2004-01-04 15:26:13.000000000 +0300
++++ linux-2.6.0/fs/super.c	2004-01-04 15:26:36.000000000 +0300
+@@ -206,6 +206,7 @@
+ 		if (invalidate_inodes(sb)) {
+ 			printk("VFS: Busy inodes after unmount. "
+ 			   "Self-destruct in 5 seconds.  Have a nice day...\n");
++			show_remaining_inodes(sb);
+ 		}
+ 
+ 		unlock_kernel();
diff --git a/lustre/kernel_patches/patches/iopen-2.4.18-2.patch b/lustre/kernel_patches/patches/iopen-2.4.18-2.patch
index 4af67bc..8215730 100644
--- a/lustre/kernel_patches/patches/iopen-2.4.18-2.patch
+++ b/lustre/kernel_patches/patches/iopen-2.4.18-2.patch
@@ -8,11 +8,9 @@
  include/linux/ext3_fs.h            |    2 
  8 files changed, 318 insertions(+), 1 deletion(-)
 
-Index: linux-aed/Documentation/filesystems/ext2.txt
-===================================================================
---- linux-aed.orig/Documentation/filesystems/ext2.txt	Tue May  4 13:14:35 2004
-+++ linux-aed/Documentation/filesystems/ext2.txt	Tue May  4 19:17:12 2004
-@@ -35,6 +35,22 @@
+--- linux-2.4.18-p4smp/Documentation/filesystems/ext2.txt~iopen-2.4.18	2003-07-09 12:17:30.000000000 -0600
++++ linux-2.4.18-p4smp-braam/Documentation/filesystems/ext2.txt	2003-07-09 17:13:02.000000000 -0600
+@@ -35,6 +35,22 @@ resgid=n			The group ID which may use th
  
  sb=n				Use alternate superblock at this location.
  
@@ -35,23 +33,19 @@ Index: linux-aed/Documentation/filesystems/ext2.txt
  grpquota,noquota,quota,usrquota	Quota options are silently ignored by ext2.
  
  
-Index: linux-aed/fs/ext3/Makefile
-===================================================================
---- linux-aed.orig/fs/ext3/Makefile	Tue May  4 19:16:51 2004
-+++ linux-aed/fs/ext3/Makefile	Tue May  4 19:17:12 2004
-@@ -11,7 +11,7 @@
+--- linux-2.4.18-p4smp/fs/ext3/Makefile~iopen-2.4.18	2003-07-09 17:12:12.000000000 -0600
++++ linux-2.4.18-p4smp-braam/fs/ext3/Makefile	2003-07-09 17:13:15.000000000 -0600
+@@ -11,7 +11,7 @@ O_TARGET := ext3.o
  
- export-objs :=	ext3-exports.o
+ export-objs :=	super.o inode.o xattr.o ext3-exports.o
  
 -obj-y    := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
-+obj-y    := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o iopen.o \
++obj-y    := balloc.o iopen.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
  		ioctl.o namei.o super.o symlink.o xattr.o hash.o ext3-exports.o
  obj-m    := $(O_TARGET)
  
-Index: linux-aed/fs/ext3/inode.c
-===================================================================
---- linux-aed.orig/fs/ext3/inode.c	Tue May  4 19:17:09 2004
-+++ linux-aed/fs/ext3/inode.c	Tue May  4 19:17:12 2004
+--- linux-2.4.18-p4smp/fs/ext3/inode.c~iopen-2.4.18	2003-07-09 17:11:19.000000000 -0600
++++ linux-2.4.18-p4smp-braam/fs/ext3/inode.c	2003-07-09 17:13:02.000000000 -0600
 @@ -31,6 +31,7 @@
  #include <linux/highuid.h>
  #include <linux/quotaops.h>
@@ -60,7 +54,7 @@ Index: linux-aed/fs/ext3/inode.c
  
  /*
   * SEARCH_FROM_ZERO forces each block allocation to search from the start
-@@ -2277,6 +2278,9 @@
+@@ -2165,6 +2166,9 @@ void ext3_read_inode(struct inode * inod
  	struct buffer_head *bh;
  	int block;
  	
@@ -70,11 +64,9 @@ Index: linux-aed/fs/ext3/inode.c
  	if(ext3_get_inode_loc(inode, &iloc))
  		goto bad_inode;
  	bh = iloc.bh;
-Index: linux-aed/fs/ext3/iopen.c
-===================================================================
---- linux-aed.orig/fs/ext3/iopen.c	Tue May  4 13:14:35 2004
-+++ linux-aed/fs/ext3/iopen.c	Tue May  4 19:17:12 2004
-@@ -0,0 +1,282 @@
+--- /dev/null	2003-01-30 03:24:37.000000000 -0700
++++ linux-2.4.18-p4smp-braam/fs/ext3/iopen.c	2003-07-09 17:13:02.000000000 -0600
+@@ -0,0 +1,258 @@
 +/*
 + * linux/fs/ext3/iopen.c
 + *
@@ -211,24 +203,13 @@ Index: linux-aed/fs/ext3/iopen.c
 +
 +/* This function is spliced into ext3_lookup and does the move of a
 + * disconnected dentry (if it exists) to a connected dentry.
++ * Caller must hold dcache_lock.
 + */
-+struct dentry *iopen_connect_dentry(struct dentry *dentry, struct inode *inode,
-+				    int rehash)
++struct dentry *iopen_connect_dentry(struct dentry *de, struct inode *inode)
 +{
 +	struct dentry *tmp, *goal = NULL;
 +	struct list_head *lp;
 +
-+	/* verify this dentry is really new */
-+	assert(dentry->d_inode == NULL);
-+	assert(list_empty(&dentry->d_alias));		/* d_instantiate */
-+	if (rehash)
-+		assert(list_empty(&dentry->d_hash));	/* d_rehash */
-+	assert(list_empty(&dentry->d_subdirs));
-+
-+	spin_lock(&dcache_lock);
-+	if (!inode)
-+		goto do_rehash;
-+
 +	/* preferrably return a connected dentry */
 +	list_for_each(lp, &inode->i_dentry) {
 +		tmp = list_entry(lp, struct dentry, d_alias);
@@ -242,40 +223,27 @@ Index: linux-aed/fs/ext3/iopen.c
 +	}
 +
 +	if (!goal)
-+		goto do_instantiate;
++		return NULL;
 +
 +	/* Move the goal to the de hash queue - like d_move() */
 +	goal->d_flags &= ~DCACHE_NFSD_DISCONNECTED;
 +	list_del_init(&goal->d_hash);
 +
 +	list_del(&goal->d_child);
-+	list_del(&dentry->d_child);
++	list_del(&de->d_child);
 +
 +	/* Switch the parents and the names.. */
-+	switch_names(goal, dentry);
-+	do_switch(goal->d_parent, dentry->d_parent);
-+	do_switch(goal->d_name.len, dentry->d_name.len);
-+	do_switch(goal->d_name.hash, dentry->d_name.hash);
++	switch_names(goal, de);
++	do_switch(goal->d_parent, de->d_parent);
++	do_switch(goal->d_name.len, de->d_name.len);
++	do_switch(goal->d_name.hash, de->d_name.hash);
 +
 +	/* And add them back to the (new) parent lists */
 +	list_add(&goal->d_child, &goal->d_parent->d_subdirs);
-+	list_add(&dentry->d_child, &dentry->d_parent->d_subdirs);
++	list_add(&de->d_child, &de->d_parent->d_subdirs);
 +	__d_rehash(goal, 0);
-+	spin_unlock(&dcache_lock);
-+	iput(inode);
 +
 +	return goal;
-+
-+	/* d_add(), but don't drop dcache_lock before adding dentry to inode */
-+do_instantiate:
-+	list_add(&dentry->d_alias, &inode->i_dentry);	/* d_instantiate */
-+	dentry->d_inode = inode;
-+do_rehash:
-+	if (rehash)
-+		__d_rehash(dentry, 0);			/* d_rehash */
-+	spin_unlock(&dcache_lock);
-+
-+	return NULL;
 +}
 +
 +/*
@@ -357,10 +325,8 @@ Index: linux-aed/fs/ext3/iopen.c
 +
 +	return 1;
 +}
-Index: linux-aed/fs/ext3/iopen.h
-===================================================================
---- linux-aed.orig/fs/ext3/iopen.h	Tue May  4 13:14:35 2004
-+++ linux-aed/fs/ext3/iopen.h	Tue May  4 19:17:12 2004
+--- /dev/null	2003-01-30 03:24:37.000000000 -0700
++++ linux-2.4.18-p4smp-braam/fs/ext3/iopen.h	2003-07-09 17:13:02.000000000 -0600
 @@ -0,0 +1,15 @@
 +/*
 + * iopen.h
@@ -375,12 +341,10 @@ Index: linux-aed/fs/ext3/iopen.h
 +
 +extern int ext3_check_for_iopen(struct inode *dir, struct dentry *dentry);
 +extern int ext3_iopen_get_inode(struct inode *inode);
-+extern struct dentry *iopen_connect_dentry(struct dentry *dentry,
-+					   struct inode *inode, int rehash);
-Index: linux-aed/fs/ext3/namei.c
-===================================================================
---- linux-aed.orig/fs/ext3/namei.c	Tue May  4 19:17:05 2004
-+++ linux-aed/fs/ext3/namei.c	Tue May  4 19:17:12 2004
++extern struct dentry *iopen_connect_dentry(struct dentry *de,
++					   struct inode *inode);
+--- linux-2.4.18-p4smp/fs/ext3/namei.c~iopen-2.4.18	2003-07-09 13:32:38.000000000 -0600
++++ linux-2.4.18-p4smp-braam/fs/ext3/namei.c	2003-07-09 17:13:02.000000000 -0600
 @@ -34,6 +34,7 @@
  #include <linux/locks.h>
  #include <linux/quotaops.h>
@@ -389,7 +353,12 @@ Index: linux-aed/fs/ext3/namei.c
  
  /*
   * define how far ahead to read directories while searching them.
-@@ -713,6 +714,9 @@
+@@ -709,10 +710,14 @@ cleanup_and_exit:
+ 	struct inode * inode;
+ 	struct ext3_dir_entry_2 * de;
+ 	struct buffer_head * bh;
++	struct dentry *alternate = NULL;
+ 
  	if (dentry->d_name.len > EXT3_NAME_LEN)
  		return ERR_PTR(-ENAMETOOLONG);
  
@@ -399,67 +368,39 @@ Index: linux-aed/fs/ext3/namei.c
  	bh = ext3_find_entry(dentry, &de);
  	inode = NULL;
  	if (bh) {
-@@ -723,8 +727,8 @@
+@@ -723,7 +729,28 @@ static struct dentry *ext3_lookup(struct
  		if (!inode)
  			return ERR_PTR(-EACCES);
  	}
 -	d_add(dentry, inode);
--	return NULL;
 +
-+	return iopen_connect_dentry(dentry, inode, 1);
- }
- 
- #define S_SHIFT 12
-@@ -1588,10 +1592,6 @@
- 			      inode->i_nlink);
- 	inode->i_version = ++event;
- 	inode->i_nlink = 0;
--	/* There's no need to set i_disksize: the fact that i_nlink is
--	 * zero will ensure that the right thing happens during any
--	 * recovery. */
--	inode->i_size = 0;
- 	ext3_orphan_add(handle, inode);
- 	ext3_mark_inode_dirty(handle, inode);
- 	dir->i_nlink--;
-@@ -1711,6 +1711,23 @@
- 	goto out_stop;
- }
- 
-+/* Like ext3_add_nondir() except for call to iopen_connect_dentry */
-+static int ext3_add_link(handle_t *handle, struct dentry *dentry,
-+			 struct inode *inode)
-+{
-+	int err = ext3_add_entry(handle, dentry, inode);
-+	if (!err) {
-+		err = ext3_mark_inode_dirty(handle, inode);
-+		if (err == 0) {
-+			(void)iopen_connect_dentry(dentry, inode, 0);
-+			return 0;
-+		}
++	/* verify this dentry is really new */
++	assert(!dentry->d_inode);
++	assert(list_empty(&dentry->d_alias));		/* d_instantiate */
++	assert(list_empty(&dentry->d_hash));		/* d_rehash */
++	assert(list_empty(&dentry->d_subdirs));
++
++	spin_lock(&dcache_lock);
++	if (inode && (alternate = iopen_connect_dentry(dentry, inode))) {
++		spin_unlock(&dcache_lock);
++		iput(inode);
++		return alternate;
 +	}
-+	ext3_dec_count(handle, inode);
-+	iput(inode);
-+	return err;
-+}
 +
- static int ext3_link (struct dentry * old_dentry,
- 		struct inode * dir, struct dentry *dentry)
- {
-@@ -1736,7 +1753,8 @@
- 	ext3_inc_count(handle, inode);
- 	atomic_inc(&inode->i_count);
++	/* d_add(), but don't drop dcache_lock before adding dentry to inode */
++	if (inode)					/* d_instantiate */
++		list_add(&dentry->d_alias, &inode->i_dentry);
++	dentry->d_inode = inode;
++
++	__d_rehash(dentry, 0);				/* d_rehash */
++	spin_unlock(&dcache_lock);
++
+ 	return NULL;
+ }
  
--	err = ext3_add_nondir(handle, dentry, inode);
-+	err = ext3_add_link(handle, dentry, inode);
-+	ext3_orphan_del(handle, inode);
- 	ext3_mark_inode_dirty(handle, inode);
- 	ext3_journal_stop(handle, dir);
- 	return err;
-Index: linux-aed/fs/ext3/super.c
-===================================================================
---- linux-aed.orig/fs/ext3/super.c	Tue May  4 19:17:01 2004
-+++ linux-aed/fs/ext3/super.c	Tue May  4 19:17:12 2004
-@@ -834,6 +834,18 @@
+--- linux-2.4.18-p4smp/fs/ext3/super.c~iopen-2.4.18	2003-07-09 13:32:38.000000000 -0600
++++ linux-2.4.18-p4smp-braam/fs/ext3/super.c	2003-07-09 17:13:02.000000000 -0600
+@@ -831,6 +831,18 @@ static int parse_options (char * options
  		         || !strcmp (this_char, "quota")
  		         || !strcmp (this_char, "usrquota"))
  			/* Don't do anything ;-) */ ;
@@ -478,11 +419,9 @@ Index: linux-aed/fs/ext3/super.c
  		else if (!strcmp (this_char, "journal")) {
  			/* @@@ FIXME */
  			/* Eventually we will want to be able to create
-Index: linux-aed/include/linux/ext3_fs.h
-===================================================================
---- linux-aed.orig/include/linux/ext3_fs.h	Tue May  4 19:17:08 2004
-+++ linux-aed/include/linux/ext3_fs.h	Tue May  4 19:17:12 2004
-@@ -321,6 +321,8 @@
+--- linux-2.4.18-p4smp/include/linux/ext3_fs.h~iopen-2.4.18	2003-07-09 13:32:38.000000000 -0600
++++ linux-2.4.18-p4smp-braam/include/linux/ext3_fs.h	2003-07-09 17:13:02.000000000 -0600
+@@ -321,6 +321,8 @@ struct ext3_inode {
    #define EXT3_MOUNT_WRITEBACK_DATA	0x0C00	/* No data ordering */
  #define EXT3_MOUNT_UPDATE_JOURNAL	0x1000	/* Update the journal format */
  #define EXT3_MOUNT_NO_UID32		0x2000  /* Disable 32-bit UIDs */
@@ -491,3 +430,5 @@ Index: linux-aed/include/linux/ext3_fs.h
  #define EXT3_MOUNT_ASYNCDEL		0x20000	/* Delayed deletion */
  
  /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
+
+_
diff --git a/lustre/kernel_patches/patches/iopen-2.4.18.patch b/lustre/kernel_patches/patches/iopen-2.4.18.patch
index 7c56b03..202ebc6 100644
--- a/lustre/kernel_patches/patches/iopen-2.4.18.patch
+++ b/lustre/kernel_patches/patches/iopen-2.4.18.patch
@@ -8,11 +8,9 @@
  include/linux/ext3_fs.h            |    2 
  8 files changed, 318 insertions(+), 1 deletion(-)
 
-Index: linux-aed/Documentation/filesystems/ext2.txt
-===================================================================
---- linux-aed.orig/Documentation/filesystems/ext2.txt	Tue May  4 13:14:35 2004
-+++ linux-aed/Documentation/filesystems/ext2.txt	Tue May  4 19:17:12 2004
-@@ -35,6 +35,22 @@
+--- linux-2.4.18-p4smp/Documentation/filesystems/ext2.txt~iopen-2.4.18	2003-07-09 12:17:30.000000000 -0600
++++ linux-2.4.18-p4smp-braam/Documentation/filesystems/ext2.txt	2003-07-09 17:13:02.000000000 -0600
+@@ -35,6 +35,22 @@ resgid=n			The group ID which may use th
  
  sb=n				Use alternate superblock at this location.
  
@@ -35,23 +33,19 @@ Index: linux-aed/Documentation/filesystems/ext2.txt
  grpquota,noquota,quota,usrquota	Quota options are silently ignored by ext2.
  
  
-Index: linux-aed/fs/ext3/Makefile
-===================================================================
---- linux-aed.orig/fs/ext3/Makefile	Tue May  4 19:16:51 2004
-+++ linux-aed/fs/ext3/Makefile	Tue May  4 19:17:12 2004
-@@ -11,7 +11,7 @@
+--- linux-2.4.18-p4smp/fs/ext3/Makefile~iopen-2.4.18	2003-07-09 17:12:12.000000000 -0600
++++ linux-2.4.18-p4smp-braam/fs/ext3/Makefile	2003-07-09 17:13:15.000000000 -0600
+@@ -11,7 +11,7 @@ O_TARGET := ext3.o
  
- export-objs :=	ext3-exports.o
+ export-objs :=	super.o inode.o xattr.o ext3-exports.o
  
 -obj-y    := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
-+obj-y    := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o iopen.o \
++obj-y    := balloc.o iopen.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
  		ioctl.o namei.o super.o symlink.o xattr.o ext3-exports.o
  obj-m    := $(O_TARGET)
  
-Index: linux-aed/fs/ext3/inode.c
-===================================================================
---- linux-aed.orig/fs/ext3/inode.c	Tue May  4 19:17:09 2004
-+++ linux-aed/fs/ext3/inode.c	Tue May  4 19:17:12 2004
+--- linux-2.4.18-p4smp/fs/ext3/inode.c~iopen-2.4.18	2003-07-09 17:11:19.000000000 -0600
++++ linux-2.4.18-p4smp-braam/fs/ext3/inode.c	2003-07-09 17:13:02.000000000 -0600
 @@ -31,6 +31,7 @@
  #include <linux/highuid.h>
  #include <linux/quotaops.h>
@@ -60,7 +54,7 @@ Index: linux-aed/fs/ext3/inode.c
  
  /*
   * SEARCH_FROM_ZERO forces each block allocation to search from the start
-@@ -2277,6 +2278,9 @@
+@@ -2165,6 +2166,9 @@ void ext3_read_inode(struct inode * inod
  	struct buffer_head *bh;
  	int block;
  	
@@ -70,11 +64,9 @@ Index: linux-aed/fs/ext3/inode.c
  	if(ext3_get_inode_loc(inode, &iloc))
  		goto bad_inode;
  	bh = iloc.bh;
-Index: linux-aed/fs/ext3/iopen.c
-===================================================================
---- linux-aed.orig/fs/ext3/iopen.c	Tue May  4 13:14:35 2004
-+++ linux-aed/fs/ext3/iopen.c	Tue May  4 19:17:12 2004
-@@ -0,0 +1,282 @@
+--- /dev/null	2003-01-30 03:24:37.000000000 -0700
++++ linux-2.4.18-p4smp-braam/fs/ext3/iopen.c	2003-07-09 17:13:02.000000000 -0600
+@@ -0,0 +1,258 @@
 +/*
 + * linux/fs/ext3/iopen.c
 + *
@@ -211,24 +203,13 @@ Index: linux-aed/fs/ext3/iopen.c
 +
 +/* This function is spliced into ext3_lookup and does the move of a
 + * disconnected dentry (if it exists) to a connected dentry.
++ * Caller must hold dcache_lock.
 + */
-+struct dentry *iopen_connect_dentry(struct dentry *dentry, struct inode *inode,
-+				    int rehash)
++struct dentry *iopen_connect_dentry(struct dentry *de, struct inode *inode)
 +{
 +	struct dentry *tmp, *goal = NULL;
 +	struct list_head *lp;
 +
-+	/* verify this dentry is really new */
-+	assert(dentry->d_inode == NULL);
-+	assert(list_empty(&dentry->d_alias));		/* d_instantiate */
-+	if (rehash)
-+		assert(list_empty(&dentry->d_hash));	/* d_rehash */
-+	assert(list_empty(&dentry->d_subdirs));
-+
-+	spin_lock(&dcache_lock);
-+	if (!inode)
-+		goto do_rehash;
-+
 +	/* preferrably return a connected dentry */
 +	list_for_each(lp, &inode->i_dentry) {
 +		tmp = list_entry(lp, struct dentry, d_alias);
@@ -242,40 +223,27 @@ Index: linux-aed/fs/ext3/iopen.c
 +	}
 +
 +	if (!goal)
-+		goto do_instantiate;
++		return NULL;
 +
 +	/* Move the goal to the de hash queue - like d_move() */
 +	goal->d_flags &= ~DCACHE_NFSD_DISCONNECTED;
 +	list_del_init(&goal->d_hash);
 +
 +	list_del(&goal->d_child);
-+	list_del(&dentry->d_child);
++	list_del(&de->d_child);
 +
 +	/* Switch the parents and the names.. */
-+	switch_names(goal, dentry);
-+	do_switch(goal->d_parent, dentry->d_parent);
-+	do_switch(goal->d_name.len, dentry->d_name.len);
-+	do_switch(goal->d_name.hash, dentry->d_name.hash);
++	switch_names(goal, de);
++	do_switch(goal->d_parent, de->d_parent);
++	do_switch(goal->d_name.len, de->d_name.len);
++	do_switch(goal->d_name.hash, de->d_name.hash);
 +
 +	/* And add them back to the (new) parent lists */
 +	list_add(&goal->d_child, &goal->d_parent->d_subdirs);
-+	list_add(&dentry->d_child, &dentry->d_parent->d_subdirs);
++	list_add(&de->d_child, &de->d_parent->d_subdirs);
 +	__d_rehash(goal, 0);
-+	spin_unlock(&dcache_lock);
-+	iput(inode);
 +
 +	return goal;
-+
-+	/* d_add(), but don't drop dcache_lock before adding dentry to inode */
-+do_instantiate:
-+	list_add(&dentry->d_alias, &inode->i_dentry);	/* d_instantiate */
-+	dentry->d_inode = inode;
-+do_rehash:
-+	if (rehash)
-+		__d_rehash(dentry, 0);			/* d_rehash */
-+	spin_unlock(&dcache_lock);
-+
-+	return NULL;
 +}
 +
 +/*
@@ -357,10 +325,8 @@ Index: linux-aed/fs/ext3/iopen.c
 +
 +	return 1;
 +}
-Index: linux-aed/fs/ext3/iopen.h
-===================================================================
---- linux-aed.orig/fs/ext3/iopen.h	Tue May  4 13:14:35 2004
-+++ linux-aed/fs/ext3/iopen.h	Tue May  4 19:17:12 2004
+--- /dev/null	2003-01-30 03:24:37.000000000 -0700
++++ linux-2.4.18-p4smp-braam/fs/ext3/iopen.h	2003-07-09 17:13:02.000000000 -0600
 @@ -0,0 +1,15 @@
 +/*
 + * iopen.h
@@ -375,12 +341,10 @@ Index: linux-aed/fs/ext3/iopen.h
 +
 +extern int ext3_check_for_iopen(struct inode *dir, struct dentry *dentry);
 +extern int ext3_iopen_get_inode(struct inode *inode);
-+extern struct dentry *iopen_connect_dentry(struct dentry *dentry,
-+					   struct inode *inode, int rehash);
-Index: linux-aed/fs/ext3/namei.c
-===================================================================
---- linux-aed.orig/fs/ext3/namei.c	Tue May  4 19:17:05 2004
-+++ linux-aed/fs/ext3/namei.c	Tue May  4 19:17:12 2004
++extern struct dentry *iopen_connect_dentry(struct dentry *de,
++					   struct inode *inode);
+--- linux-2.4.18-p4smp/fs/ext3/namei.c~iopen-2.4.18	2003-07-09 13:32:38.000000000 -0600
++++ linux-2.4.18-p4smp-braam/fs/ext3/namei.c	2003-07-09 17:13:02.000000000 -0600
 @@ -34,6 +34,7 @@
  #include <linux/locks.h>
  #include <linux/quotaops.h>
@@ -389,7 +353,12 @@ Index: linux-aed/fs/ext3/namei.c
  
  /*
   * define how far ahead to read directories while searching them.
-@@ -713,6 +714,9 @@
+@@ -703,10 +704,14 @@ cleanup_and_exit:
+ 	struct inode * inode;
+ 	struct ext3_dir_entry_2 * de;
+ 	struct buffer_head * bh;
++	struct dentry *alternate = NULL;
+ 
  	if (dentry->d_name.len > EXT3_NAME_LEN)
  		return ERR_PTR(-ENAMETOOLONG);
  
@@ -399,67 +368,39 @@ Index: linux-aed/fs/ext3/namei.c
  	bh = ext3_find_entry(dentry, &de);
  	inode = NULL;
  	if (bh) {
-@@ -723,8 +727,8 @@
+@@ -723,7 +729,28 @@ static struct dentry *ext3_lookup(struct
  		if (!inode)
  			return ERR_PTR(-EACCES);
  	}
 -	d_add(dentry, inode);
--	return NULL;
 +
-+	return iopen_connect_dentry(dentry, inode, 1);
- }
- 
- #define S_SHIFT 12
-@@ -1588,10 +1592,6 @@
- 			      inode->i_nlink);
- 	inode->i_version = ++event;
- 	inode->i_nlink = 0;
--	/* There's no need to set i_disksize: the fact that i_nlink is
--	 * zero will ensure that the right thing happens during any
--	 * recovery. */
--	inode->i_size = 0;
- 	ext3_orphan_add(handle, inode);
- 	ext3_mark_inode_dirty(handle, inode);
- 	dir->i_nlink--;
-@@ -1711,6 +1711,23 @@
- 	goto out_stop;
- }
- 
-+/* Like ext3_add_nondir() except for call to iopen_connect_dentry */
-+static int ext3_add_link(handle_t *handle, struct dentry *dentry,
-+			 struct inode *inode)
-+{
-+	int err = ext3_add_entry(handle, dentry, inode);
-+	if (!err) {
-+		err = ext3_mark_inode_dirty(handle, inode);
-+		if (err == 0) {
-+			(void)iopen_connect_dentry(dentry, inode, 0);
-+			return 0;
-+		}
++	/* verify this dentry is really new */
++	assert(!dentry->d_inode);
++	assert(list_empty(&dentry->d_alias));		/* d_instantiate */
++	assert(list_empty(&dentry->d_hash));		/* d_rehash */
++	assert(list_empty(&dentry->d_subdirs));
++
++	spin_lock(&dcache_lock);
++	if (inode && (alternate = iopen_connect_dentry(dentry, inode))) {
++		spin_unlock(&dcache_lock);
++		iput(inode);
++		return alternate;
 +	}
-+	ext3_dec_count(handle, inode);
-+	iput(inode);
-+	return err;
-+}
 +
- static int ext3_link (struct dentry * old_dentry,
- 		struct inode * dir, struct dentry *dentry)
- {
-@@ -1736,7 +1753,8 @@
- 	ext3_inc_count(handle, inode);
- 	atomic_inc(&inode->i_count);
++	/* d_add(), but don't drop dcache_lock before adding dentry to inode */
++	if (inode)					/* d_instantiate */
++		list_add(&dentry->d_alias, &inode->i_dentry);
++	dentry->d_inode = inode;
++
++	__d_rehash(dentry, 0);				/* d_rehash */
++	spin_unlock(&dcache_lock);
++
+ 	return NULL;
+ }
  
--	err = ext3_add_nondir(handle, dentry, inode);
-+	err = ext3_add_link(handle, dentry, inode);
-+	ext3_orphan_del(handle, inode);
- 	ext3_mark_inode_dirty(handle, inode);
- 	ext3_journal_stop(handle, dir);
- 	return err;
-Index: linux-aed/fs/ext3/super.c
-===================================================================
---- linux-aed.orig/fs/ext3/super.c	Tue May  4 19:17:01 2004
-+++ linux-aed/fs/ext3/super.c	Tue May  4 19:17:12 2004
-@@ -834,6 +834,18 @@
+--- linux-2.4.18-p4smp/fs/ext3/super.c~iopen-2.4.18	2003-07-09 13:32:38.000000000 -0600
++++ linux-2.4.18-p4smp-braam/fs/ext3/super.c	2003-07-09 17:13:02.000000000 -0600
+@@ -831,6 +831,18 @@ static int parse_options (char * options
  		         || !strcmp (this_char, "quota")
  		         || !strcmp (this_char, "usrquota"))
  			/* Don't do anything ;-) */ ;
@@ -478,11 +419,9 @@ Index: linux-aed/fs/ext3/super.c
  		else if (!strcmp (this_char, "journal")) {
  			/* @@@ FIXME */
  			/* Eventually we will want to be able to create
-Index: linux-aed/include/linux/ext3_fs.h
-===================================================================
---- linux-aed.orig/include/linux/ext3_fs.h	Tue May  4 19:17:08 2004
-+++ linux-aed/include/linux/ext3_fs.h	Tue May  4 19:17:12 2004
-@@ -321,6 +321,8 @@
+--- linux-2.4.18-p4smp/include/linux/ext3_fs.h~iopen-2.4.18	2003-07-09 13:32:38.000000000 -0600
++++ linux-2.4.18-p4smp-braam/include/linux/ext3_fs.h	2003-07-09 17:13:02.000000000 -0600
+@@ -321,6 +321,8 @@ struct ext3_inode {
  #define EXT3_MOUNT_UPDATE_JOURNAL	0x1000	/* Update the journal format */
  #define EXT3_MOUNT_NO_UID32		0x2000  /* Disable 32-bit UIDs */
  #define EXT3_MOUNT_INDEX		0x4000  /* Enable directory index */
@@ -491,3 +430,5 @@ Index: linux-aed/include/linux/ext3_fs.h
  #define EXT3_MOUNT_ASYNCDEL		0x20000	/* Delayed deletion */
  
  /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
+
+_
diff --git a/lustre/kernel_patches/patches/iopen-2.4.19-suse.patch b/lustre/kernel_patches/patches/iopen-2.4.19-suse.patch
index 01c040c..ad213c9 100644
--- a/lustre/kernel_patches/patches/iopen-2.4.19-suse.patch
+++ b/lustre/kernel_patches/patches/iopen-2.4.19-suse.patch
@@ -8,10 +8,10 @@
  include/linux/ext3_fs.h            |    2 
  8 files changed, 318 insertions(+), 2 deletions(-)
 
-Index: linux-2.4.19/Documentation/filesystems/ext2.txt
+Index: linux-2.4.19.SuSE/Documentation/filesystems/ext2.txt
 ===================================================================
---- linux-2.4.19.orig/Documentation/filesystems/ext2.txt	2001-07-11 18:44:45.000000000 -0400
-+++ linux-2.4.19/Documentation/filesystems/ext2.txt	2004-04-23 22:37:48.000000000 -0400
+--- linux-2.4.19.SuSE.orig/Documentation/filesystems/ext2.txt	Wed Jul 11 15:44:45 2001
++++ linux-2.4.19.SuSE/Documentation/filesystems/ext2.txt	Sun Nov 16 01:27:31 2003
 @@ -35,6 +35,22 @@
  
  sb=n				Use alternate superblock at this location.
@@ -35,23 +35,23 @@ Index: linux-2.4.19/Documentation/filesystems/ext2.txt
  grpquota,noquota,quota,usrquota	Quota options are silently ignored by ext2.
  
  
-Index: linux-2.4.19/fs/ext3/Makefile
+Index: linux-2.4.19.SuSE/fs/ext3/Makefile
 ===================================================================
---- linux-2.4.19.orig/fs/ext3/Makefile	2004-04-23 18:26:27.000000000 -0400
-+++ linux-2.4.19/fs/ext3/Makefile	2004-04-23 22:38:38.000000000 -0400
+--- linux-2.4.19.SuSE.orig/fs/ext3/Makefile	Sun Nov 16 00:40:59 2003
++++ linux-2.4.19.SuSE/fs/ext3/Makefile	Sun Nov 16 01:27:31 2003
 @@ -11,7 +11,7 @@
  
- export-objs :=	super.o inode.o
+ export-objs := ext3-exports.o
  
 -obj-y    := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
 +obj-y    := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o iopen.o \
- 		ioctl.o namei.o super.o symlink.o hash.o
+ 		ioctl.o namei.o super.o symlink.o hash.o ext3-exports.o
  obj-m    := $(O_TARGET)
  
-Index: linux-2.4.19/fs/ext3/inode.c
+Index: linux-2.4.19.SuSE/fs/ext3/inode.c
 ===================================================================
---- linux-2.4.19.orig/fs/ext3/inode.c	2004-04-23 22:37:42.000000000 -0400
-+++ linux-2.4.19/fs/ext3/inode.c	2004-04-23 22:37:48.000000000 -0400
+--- linux-2.4.19.SuSE.orig/fs/ext3/inode.c	Sun Nov 16 01:26:04 2003
++++ linux-2.4.19.SuSE/fs/ext3/inode.c	Sun Nov 16 01:27:31 2003
 @@ -34,6 +34,7 @@
  #include <linux/highuid.h>
  #include <linux/quotaops.h>
@@ -70,10 +70,10 @@ Index: linux-2.4.19/fs/ext3/inode.c
  	if(ext3_get_inode_loc(inode, &iloc))
  		goto bad_inode;
  	bh = iloc.bh;
-Index: linux-2.4.19/fs/ext3/iopen.c
+Index: linux-2.4.19.SuSE/fs/ext3/iopen.c
 ===================================================================
---- linux-2.4.19.orig/fs/ext3/iopen.c	2003-01-30 05:24:37.000000000 -0500
-+++ linux-2.4.19/fs/ext3/iopen.c	2004-04-23 22:37:48.000000000 -0400
+--- linux-2.4.19.SuSE.orig/fs/ext3/iopen.c	Sun Nov 16 01:27:31 2003
++++ linux-2.4.19.SuSE/fs/ext3/iopen.c	Sun Nov 16 01:27:31 2003
 @@ -0,0 +1,258 @@
 +/*
 + * linux/fs/ext3/iopen.c
@@ -333,10 +333,10 @@ Index: linux-2.4.19/fs/ext3/iopen.c
 +
 +	return 1;
 +}
-Index: linux-2.4.19/fs/ext3/iopen.h
+Index: linux-2.4.19.SuSE/fs/ext3/iopen.h
 ===================================================================
---- linux-2.4.19.orig/fs/ext3/iopen.h	2003-01-30 05:24:37.000000000 -0500
-+++ linux-2.4.19/fs/ext3/iopen.h	2004-04-23 22:37:48.000000000 -0400
+--- linux-2.4.19.SuSE.orig/fs/ext3/iopen.h	Sun Nov 16 01:27:31 2003
++++ linux-2.4.19.SuSE/fs/ext3/iopen.h	Sun Nov 16 01:27:31 2003
 @@ -0,0 +1,15 @@
 +/*
 + * iopen.h
@@ -353,10 +353,10 @@ Index: linux-2.4.19/fs/ext3/iopen.h
 +extern int ext3_iopen_get_inode(struct inode *inode);
 +extern struct dentry *iopen_connect_dentry(struct dentry *de,
 +					   struct inode *inode);
-Index: linux-2.4.19/fs/ext3/namei.c
+Index: linux-2.4.19.SuSE/fs/ext3/namei.c
 ===================================================================
---- linux-2.4.19.orig/fs/ext3/namei.c	2004-04-23 22:37:42.000000000 -0400
-+++ linux-2.4.19/fs/ext3/namei.c	2004-04-23 22:37:48.000000000 -0400
+--- linux-2.4.19.SuSE.orig/fs/ext3/namei.c	Sun Nov 16 01:23:20 2003
++++ linux-2.4.19.SuSE/fs/ext3/namei.c	Sun Nov 16 01:27:31 2003
 @@ -36,7 +36,7 @@
  #include <linux/string.h>
  #include <linux/locks.h>
@@ -366,7 +366,7 @@ Index: linux-2.4.19/fs/ext3/namei.c
  
  /*
   * define how far ahead to read directories while searching them.
-@@ -928,10 +928,14 @@
+@@ -922,10 +922,14 @@
  	struct inode * inode;
  	struct ext3_dir_entry_2 * de;
  	struct buffer_head * bh;
@@ -381,7 +381,7 @@ Index: linux-2.4.19/fs/ext3/namei.c
  	bh = ext3_find_entry(dentry, &de);
  	inode = NULL;
  	if (bh) {
-@@ -943,7 +947,28 @@
+@@ -943,7 +948,28 @@
  			return ERR_PTR(-EACCES);
  		}
  	}
@@ -411,11 +411,11 @@ Index: linux-2.4.19/fs/ext3/namei.c
  	return NULL;
  }
  
-Index: linux-2.4.19/fs/ext3/super.c
+Index: linux-2.4.19.SuSE/fs/ext3/super.c
 ===================================================================
---- linux-2.4.19.orig/fs/ext3/super.c	2004-04-23 22:37:42.000000000 -0400
-+++ linux-2.4.19/fs/ext3/super.c	2004-04-23 22:37:48.000000000 -0400
-@@ -861,6 +861,18 @@
+--- linux-2.4.19.SuSE.orig/fs/ext3/super.c	Sun Nov 16 01:19:22 2003
++++ linux-2.4.19.SuSE/fs/ext3/super.c	Sun Nov 16 01:27:31 2003
+@@ -864,6 +864,18 @@
  		         || !strcmp (this_char, "quota")
  		         || !strcmp (this_char, "usrquota"))
  			/* Don't do anything ;-) */ ;
@@ -434,10 +434,10 @@ Index: linux-2.4.19/fs/ext3/super.c
  		else if (!strcmp (this_char, "journal")) {
  			/* @@@ FIXME */
  			/* Eventually we will want to be able to create
-Index: linux-2.4.19/include/linux/ext3_fs.h
+Index: linux-2.4.19.SuSE/include/linux/ext3_fs.h
 ===================================================================
---- linux-2.4.19.orig/include/linux/ext3_fs.h	2004-04-23 22:37:42.000000000 -0400
-+++ linux-2.4.19/include/linux/ext3_fs.h	2004-04-23 22:37:48.000000000 -0400
+--- linux-2.4.19.SuSE.orig/include/linux/ext3_fs.h	Sun Nov 16 01:25:42 2003
++++ linux-2.4.19.SuSE/include/linux/ext3_fs.h	Sun Nov 16 01:30:05 2003
 @@ -324,6 +324,8 @@
  #define EXT3_MOUNT_XATTR_USER		0x4000	/* Extended user attributes */
  #define EXT3_MOUNT_POSIX_ACL		0x8000	/* POSIX Access Control Lists */
diff --git a/lustre/kernel_patches/patches/iopen-2.4.21-sles8sp3.patch b/lustre/kernel_patches/patches/iopen-2.4.21-sles8sp3.patch
deleted file mode 100644
index 07e49b8..0000000
--- a/lustre/kernel_patches/patches/iopen-2.4.21-sles8sp3.patch
+++ /dev/null
@@ -1,494 +0,0 @@
- Documentation/filesystems/ext2.txt |   16 ++
- fs/ext3/Makefile                   |    2 
- fs/ext3/inode.c                    |    4 
- fs/ext3/iopen.c                    |  259 +++++++++++++++++++++++++++++++++++++
- fs/ext3/iopen.h                    |   13 +
- fs/ext3/namei.c                    |   13 +
- fs/ext3/super.c                    |   11 +
- include/linux/ext3_fs.h            |    2 
- 8 files changed, 318 insertions(+), 2 deletions(-)
-
-Index: kernel-2.4.212l35/Documentation/filesystems/ext2.txt
-===================================================================
---- kernel-2.4.212l35.orig/Documentation/filesystems/ext2.txt	2001-07-11 15:44:45.000000000 -0700
-+++ kernel-2.4.212l35/Documentation/filesystems/ext2.txt	2004-05-06 19:48:32.000000000 -0700
-@@ -35,6 +35,22 @@
- 
- sb=n				Use alternate superblock at this location.
- 
-+iopen				Makes an invisible pseudo-directory called
-+				__iopen__ available in the root directory
-+				of the filesystem.  Allows open-by-inode-
-+				number.  i.e., inode 3145 can be accessed
-+				via /mntpt/__iopen__/3145
-+
-+iopen_nopriv			This option makes the iopen directory be
-+				world-readable.  This may be safer since it
-+				allows daemons to run as an unprivileged user,
-+				however it significantly changes the security
-+				model of a Unix filesystem, since previously
-+				all files under a mode 700 directory were not
-+				generally avilable even if the
-+				permissions on the file itself is
-+				world-readable.
-+
- grpquota,noquota,quota,usrquota	Quota options are silently ignored by ext2.
- 
- 
-Index: kernel-2.4.212l35/fs/ext3/Makefile
-===================================================================
---- kernel-2.4.212l35.orig/fs/ext3/Makefile	2004-05-06 19:46:22.000000000 -0700
-+++ kernel-2.4.212l35/fs/ext3/Makefile	2004-05-06 19:48:32.000000000 -0700
-@@ -11,7 +11,7 @@
- 
- export-objs := ext3-exports.o
- 
--obj-y    := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
-+obj-y    := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o iopen.o \
- 		ioctl.o namei.o super.o symlink.o hash.o ext3-exports.o
- obj-m    := $(O_TARGET)
- 
-Index: kernel-2.4.212l35/fs/ext3/inode.c
-===================================================================
---- kernel-2.4.212l35.orig/fs/ext3/inode.c	2004-05-06 19:46:24.000000000 -0700
-+++ kernel-2.4.212l35/fs/ext3/inode.c	2004-05-06 19:48:32.000000000 -0700
-@@ -34,6 +34,7 @@
- #include <linux/highuid.h>
- #include <linux/quotaops.h>
- #include <linux/module.h>
-+#include "iopen.h"
- 
- /*
-  * SEARCH_FROM_ZERO forces each block allocation to search from the start
-@@ -2252,6 +2253,9 @@
- 	struct buffer_head *bh;
- 	int block;
- 	
-+	if (ext3_iopen_get_inode(inode))
-+		return;
-+
- 	if(ext3_get_inode_loc(inode, &iloc))
- 		goto bad_inode;
- 	bh = iloc.bh;
-Index: kernel-2.4.212l35/fs/ext3/iopen.c
-===================================================================
---- kernel-2.4.212l35.orig/fs/ext3/iopen.c	2003-03-27 11:16:05.000000000 -0800
-+++ kernel-2.4.212l35/fs/ext3/iopen.c	2004-05-06 19:48:41.000000000 -0700
-@@ -0,0 +1,282 @@
-+/*
-+ * linux/fs/ext3/iopen.c
-+ *
-+ * Special support for open by inode number
-+ *
-+ * Copyright (C) 2001 by Theodore Ts'o (tytso@alum.mit.edu).
-+ *
-+ * This file may be redistributed under the terms of the GNU General
-+ * Public License.
-+ *
-+ *
-+ * Invariants:
-+ *   - there is only ever a single DCACHE_NFSD_DISCONNECTED dentry alias
-+ *     for an inode at one time.
-+ *   - there are never both connected and DCACHE_NFSD_DISCONNECTED dentry
-+ *     aliases on an inode at the same time.
-+ *
-+ * If we have any connected dentry aliases for an inode, use one of those
-+ * in iopen_lookup().  Otherwise, we instantiate a single NFSD_DISCONNECTED
-+ * dentry for this inode, which thereafter will be found by the dcache
-+ * when looking up this inode number in __iopen__, so we don't return here
-+ * until it is gone.
-+ *
-+ * If we get an inode via a regular name lookup, then we "rename" the
-+ * NFSD_DISCONNECTED dentry to the proper name and parent.  This ensures
-+ * existing users of the disconnected dentry will continue to use the same
-+ * dentry as the connected users, and there will never be both kinds of
-+ * dentry aliases at one time.
-+ */
-+
-+#include <linux/sched.h>
-+#include <linux/fs.h>
-+#include <linux/locks.h>
-+#include <linux/ext3_jbd.h>
-+#include <linux/jbd.h>
-+#include <linux/ext3_fs.h>
-+#include <linux/smp_lock.h>
-+#include "iopen.h"
-+
-+#ifndef assert
-+#define assert(test) J_ASSERT(test)
-+#endif
-+
-+#define IOPEN_NAME_LEN	32
-+
-+/*
-+ * This implements looking up an inode by number.
-+ */
-+static struct dentry *iopen_lookup(struct inode *dir, struct dentry *dentry)
-+{
-+	struct inode *inode;
-+	unsigned long ino;
-+	struct list_head *lp;
-+	struct dentry *alternate;
-+	char buf[IOPEN_NAME_LEN];
-+
-+	if (dentry->d_name.len >= IOPEN_NAME_LEN)
-+		return ERR_PTR(-ENAMETOOLONG);
-+
-+	memcpy(buf, dentry->d_name.name, dentry->d_name.len);
-+	buf[dentry->d_name.len] = 0;
-+
-+	if (strcmp(buf, ".") == 0)
-+		ino = dir->i_ino;
-+	else if (strcmp(buf, "..") == 0)
-+		ino = EXT3_ROOT_INO;
-+	else
-+		ino = simple_strtoul(buf, 0, 0);
-+
-+	if ((ino != EXT3_ROOT_INO &&
-+	     //ino != EXT3_ACL_IDX_INO &&
-+	     //ino != EXT3_ACL_DATA_INO &&
-+	     ino < EXT3_FIRST_INO(dir->i_sb)) ||
-+	    ino > le32_to_cpu(dir->i_sb->u.ext3_sb.s_es->s_inodes_count))
-+		return ERR_PTR(-ENOENT);
-+
-+	inode = iget(dir->i_sb, ino);
-+	if (!inode)
-+		return ERR_PTR(-EACCES);
-+	if (is_bad_inode(inode)) {
-+		iput(inode);
-+		return ERR_PTR(-ENOENT);
-+	}
-+
-+	assert(list_empty(&dentry->d_alias));		/* d_instantiate */
-+	assert(list_empty(&dentry->d_hash));		/* d_rehash */
-+
-+	/* preferrably return a connected dentry */
-+	spin_lock(&dcache_lock);
-+	list_for_each(lp, &inode->i_dentry) {
-+		alternate = list_entry(lp, struct dentry, d_alias);
-+		assert(!(alternate->d_flags & DCACHE_NFSD_DISCONNECTED));
-+	}
-+
-+	if (!list_empty(&inode->i_dentry)) {
-+		alternate = list_entry(inode->i_dentry.next,
-+				       struct dentry, d_alias);
-+		dget_locked(alternate);
-+		alternate->d_vfs_flags |= DCACHE_REFERENCED;
-+		iput(inode);
-+		spin_unlock(&dcache_lock);
-+		return alternate;
-+	}
-+	dentry->d_flags |= DCACHE_NFSD_DISCONNECTED;
-+
-+	/* d_add(), but don't drop dcache_lock before adding dentry to inode */
-+	list_add(&dentry->d_alias, &inode->i_dentry);	/* d_instantiate */
-+	dentry->d_inode = inode;
-+
-+	__d_rehash(dentry, 0);				/* d_rehash */
-+	spin_unlock(&dcache_lock);
-+
-+	return NULL;
-+}
-+
-+#define do_switch(x,y) do { \
-+	__typeof__ (x) __tmp = x; \
-+	x = y; y = __tmp; } while (0)
-+
-+static inline void switch_names(struct dentry *dentry, struct dentry *target)
-+{
-+	const unsigned char *old_name, *new_name;
-+
-+	memcpy(dentry->d_iname, target->d_iname, DNAME_INLINE_LEN);
-+	old_name = target->d_name.name;
-+	new_name = dentry->d_name.name;
-+	if (old_name == target->d_iname)
-+		old_name = dentry->d_iname;
-+	if (new_name == dentry->d_iname)
-+		new_name = target->d_iname;
-+	target->d_name.name = new_name;
-+	dentry->d_name.name = old_name;
-+}
-+
-+/* This function is spliced into ext3_lookup and does the move of a
-+ * disconnected dentry (if it exists) to a connected dentry.
-+ */
-+struct dentry *iopen_connect_dentry(struct dentry *dentry, struct inode *inode,
-+				    int rehash)
-+{
-+	struct dentry *tmp, *goal = NULL;
-+	struct list_head *lp;
-+
-+	/* verify this dentry is really new */
-+	assert(dentry->d_inode == NULL);
-+	assert(list_empty(&dentry->d_alias));		/* d_instantiate */
-+	if (rehash)
-+		assert(list_empty(&dentry->d_hash));	/* d_rehash */
-+	assert(list_empty(&dentry->d_subdirs));
-+
-+	spin_lock(&dcache_lock);
-+	if (!inode)
-+		goto do_rehash;
-+
-+	/* preferrably return a connected dentry */
-+	list_for_each(lp, &inode->i_dentry) {
-+		tmp = list_entry(lp, struct dentry, d_alias);
-+		if (tmp->d_flags & DCACHE_NFSD_DISCONNECTED) {
-+			assert(tmp->d_alias.next == &inode->i_dentry);
-+			assert(tmp->d_alias.prev == &inode->i_dentry);
-+			goal = tmp;
-+			dget_locked(goal);
-+			break;
-+		}
-+	}
-+
-+	if (!goal)
-+		goto do_instantiate;
-+
-+	/* Move the goal to the de hash queue - like d_move() */
-+	goal->d_flags &= ~DCACHE_NFSD_DISCONNECTED;
-+	list_del_init(&goal->d_hash);
-+
-+	list_del(&goal->d_child);
-+	list_del(&dentry->d_child);
-+
-+	/* Switch the parents and the names.. */
-+	switch_names(goal, dentry);
-+	do_switch(goal->d_parent, dentry->d_parent);
-+	do_switch(goal->d_name.len, dentry->d_name.len);
-+	do_switch(goal->d_name.hash, dentry->d_name.hash);
-+
-+	/* And add them back to the (new) parent lists */
-+	list_add(&goal->d_child, &goal->d_parent->d_subdirs);
-+	list_add(&dentry->d_child, &dentry->d_parent->d_subdirs);
-+	__d_rehash(goal, 0);
-+	spin_unlock(&dcache_lock);
-+	iput(inode);
-+
-+	return goal;
-+
-+	/* d_add(), but don't drop dcache_lock before adding dentry to inode */
-+do_instantiate:
-+	list_add(&dentry->d_alias, &inode->i_dentry);	/* d_instantiate */
-+	dentry->d_inode = inode;
-+do_rehash:
-+	if (rehash)
-+		__d_rehash(dentry, 0);			/* d_rehash */
-+	spin_unlock(&dcache_lock);
-+
-+	return NULL;
-+}
-+
-+/*
-+ * These are the special structures for the iopen pseudo directory.
-+ */
-+
-+static struct inode_operations iopen_inode_operations = {
-+	lookup:		iopen_lookup,		/* BKL held */
-+};
-+
-+static struct file_operations iopen_file_operations = {
-+	read:		generic_read_dir,
-+};
-+
-+static int match_dentry(struct dentry *dentry, const char *name)
-+{
-+	int	len;
-+
-+	len = strlen(name);
-+	if (dentry->d_name.len != len)
-+		return 0;
-+	if (strncmp(dentry->d_name.name, name, len))
-+		return 0;
-+	return 1;
-+}
-+
-+/*
-+ * This function is spliced into ext3_lookup and returns 1 the file
-+ * name is __iopen__ and dentry has been filled in appropriately.
-+ */
-+int ext3_check_for_iopen(struct inode *dir, struct dentry *dentry)
-+{
-+	struct inode *inode;
-+
-+	if (dir->i_ino != EXT3_ROOT_INO ||
-+	    !test_opt(dir->i_sb, IOPEN) ||
-+	    !match_dentry(dentry, "__iopen__"))
-+		return 0;
-+
-+	inode = iget(dir->i_sb, EXT3_BAD_INO);
-+
-+	if (!inode)
-+		return 0;
-+	d_add(dentry, inode);
-+	return 1;
-+}
-+
-+/*
-+ * This function is spliced into read_inode; it returns 1 if inode
-+ * number is the one for /__iopen__, in which case the inode is filled
-+ * in appropriately.  Otherwise, this fuction returns 0.
-+ */
-+int ext3_iopen_get_inode(struct inode *inode)
-+{
-+	if (inode->i_ino != EXT3_BAD_INO)
-+		return 0;
-+
-+	inode->i_mode = S_IFDIR | S_IRUSR | S_IXUSR;
-+	if (test_opt(inode->i_sb, IOPEN_NOPRIV))
-+		inode->i_mode |= 0777;
-+	inode->i_uid = 0;
-+	inode->i_gid = 0;
-+	inode->i_nlink = 1;
-+	inode->i_size = 4096;
-+	inode->i_atime = CURRENT_TIME;
-+	inode->i_ctime = CURRENT_TIME;
-+	inode->i_mtime = CURRENT_TIME;
-+	inode->u.ext3_i.i_dtime = 0;
-+	inode->i_blksize = PAGE_SIZE;	/* This is the optimal IO size
-+					 * (for stat), not the fs block
-+					 * size */
-+	inode->i_blocks = 0;
-+	inode->i_version = 1;
-+	inode->i_generation = 0;
-+
-+	inode->i_op = &iopen_inode_operations;
-+	inode->i_fop = &iopen_file_operations;
-+	inode->i_mapping->a_ops = 0;
-+
-+	return 1;
-+}
-Index: kernel-2.4.212l35/fs/ext3/iopen.h
-===================================================================
---- kernel-2.4.212l35.orig/fs/ext3/iopen.h	2003-03-27 11:16:05.000000000 -0800
-+++ kernel-2.4.212l35/fs/ext3/iopen.h	2004-05-06 19:48:41.000000000 -0700
-@@ -0,0 +1,15 @@
-+/*
-+ * iopen.h
-+ *
-+ * Special support for opening files by inode number.
-+ *
-+ * Copyright (C) 2001 by Theodore Ts'o (tytso@alum.mit.edu).
-+ *
-+ * This file may be redistributed under the terms of the GNU General
-+ * Public License.
-+ */
-+
-+extern int ext3_check_for_iopen(struct inode *dir, struct dentry *dentry);
-+extern int ext3_iopen_get_inode(struct inode *inode);
-+extern struct dentry *iopen_connect_dentry(struct dentry *dentry,
-+					   struct inode *inode, int rehash);
-Index: kernel-2.4.212l35/fs/ext3/namei.c
-===================================================================
---- kernel-2.4.212l35.orig/fs/ext3/namei.c	2004-05-06 19:46:23.000000000 -0700
-+++ kernel-2.4.212l35/fs/ext3/namei.c	2004-05-06 19:51:48.000000000 -0700
-@@ -36,7 +36,7 @@
- #include <linux/string.h>
- #include <linux/locks.h>
- #include <linux/quotaops.h>
--
-+#include "iopen.h"
- 
- /*
-  * define how far ahead to read directories while searching them.
-@@ -932,6 +932,9 @@
- 	if (dentry->d_name.len > EXT3_NAME_LEN)
- 		return ERR_PTR(-ENAMETOOLONG);
- 
-+	if (ext3_check_for_iopen(dir, dentry))
-+		return NULL;
-+
- 	bh = ext3_find_entry(dentry, &de);
- 	inode = NULL;
- 	if (bh) {
-@@ -943,8 +946,8 @@
- 			return ERR_PTR(-EACCES);
- 		}
- 	}
--	d_add(dentry, inode);
--	return NULL;
-+
-+ 	return iopen_connect_dentry(dentry, inode, 1);
- }
- 
- #define S_SHIFT 12
-@@ -1936,10 +1940,6 @@
- 			      inode->i_nlink);
- 	inode->i_version = ++event;
- 	inode->i_nlink = 0;
--	/* There's no need to set i_disksize: the fact that i_nlink is
--	 * zero will ensure that the right thing happens during any
--	 * recovery. */
--	inode->i_size = 0;
- 	ext3_orphan_add(handle, inode);
- 	dir->i_nlink--;
- 	inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME;
-@@ -2058,6 +2058,23 @@
- 	return err;
- }
- 
-+/* Like ext3_add_nondir() except for call to iopen_connect_dentry */
-+static int ext3_add_link(handle_t *handle, struct dentry *dentry,
-+			 struct inode *inode)
-+{
-+	int err = ext3_add_entry(handle, dentry, inode);
-+	if (!err) {
-+		err = ext3_mark_inode_dirty(handle, inode);
-+		if (err == 0) {
-+			(void)iopen_connect_dentry(dentry, inode, 0);
-+			return 0;
-+		}
-+	}
-+	ext3_dec_count(handle, inode);
-+	iput(inode);
-+	return err;
-+}
-+
- static int ext3_link (struct dentry * old_dentry,
- 		struct inode * dir, struct dentry *dentry)
- {
-@@ -2085,7 +2102,8 @@
- 	ext3_inc_count(handle, inode);
- 	atomic_inc(&inode->i_count);
- 
--	err = ext3_add_nondir(handle, dentry, inode);
-+	err = ext3_add_link(handle, dentry, inode);
-+	ext3_orphan_del(handle, inode);
- 	ext3_journal_stop(handle, dir);
- 	return err;
- }
-Index: kernel-2.4.212l35/fs/ext3/super.c
-===================================================================
---- kernel-2.4.212l35.orig/fs/ext3/super.c	2004-05-06 19:46:23.000000000 -0700
-+++ kernel-2.4.212l35/fs/ext3/super.c	2004-05-06 19:48:32.000000000 -0700
-@@ -869,6 +869,18 @@
- 		         || !strcmp (this_char, "quota")
- 		         || !strcmp (this_char, "usrquota"))
- 			/* Don't do anything ;-) */ ;
-+		else if (!strcmp (this_char, "iopen")) {
-+			set_opt (sbi->s_mount_opt, IOPEN);
-+			clear_opt (sbi->s_mount_opt, IOPEN_NOPRIV);
-+		}
-+		else if (!strcmp (this_char, "noiopen")) {
-+			clear_opt (sbi->s_mount_opt, IOPEN);
-+			clear_opt (sbi->s_mount_opt, IOPEN_NOPRIV);
-+		}
-+		else if (!strcmp (this_char, "iopen_nopriv")) {
-+			set_opt (sbi->s_mount_opt, IOPEN);
-+			set_opt (sbi->s_mount_opt, IOPEN_NOPRIV);
-+		}
- 		else if (!strcmp (this_char, "journal")) {
- 			/* @@@ FIXME */
- 			/* Eventually we will want to be able to create
-Index: kernel-2.4.212l35/include/linux/ext3_fs.h
-===================================================================
---- kernel-2.4.212l35.orig/include/linux/ext3_fs.h	2004-05-06 19:46:24.000000000 -0700
-+++ kernel-2.4.212l35/include/linux/ext3_fs.h	2004-05-06 19:48:32.000000000 -0700
-@@ -324,6 +324,8 @@
- #define EXT3_MOUNT_XATTR_USER		0x4000	/* Extended user attributes */
- #define EXT3_MOUNT_POSIX_ACL		0x8000	/* POSIX Access Control Lists */
- #define EXT3_MOUNT_ASYNCDEL		0x20000 /* Delayed deletion */
-+#define EXT3_MOUNT_IOPEN		0x40000	/* Allow access via iopen */
-+#define EXT3_MOUNT_IOPEN_NOPRIV		0x80000	/* Make iopen world-readable */
- 
- /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
- #ifndef _LINUX_EXT2_FS_H
diff --git a/lustre/kernel_patches/patches/iopen-2.5.73.patch b/lustre/kernel_patches/patches/iopen-2.5.73.patch
new file mode 100644
index 0000000..408aa43
--- /dev/null
+++ b/lustre/kernel_patches/patches/iopen-2.5.73.patch
@@ -0,0 +1,403 @@
+ Documentation/filesystems/ext2.txt |   16 ++
+ fs/ext3/Makefile                   |    2 
+ fs/ext3/inode.c                    |    3 
+ fs/ext3/iopen.c                    |  239 +++++++++++++++++++++++++++++++++++++
+ fs/ext3/iopen.h                    |   15 ++
+ fs/ext3/namei.c                    |   13 ++
+ fs/ext3/super.c                    |   11 +
+ include/linux/ext3_fs.h            |    2 
+ 8 files changed, 300 insertions(+), 1 deletion(-)
+
+--- linux-2.6.0-test1/Documentation/filesystems/ext2.txt~iopen-2.5.73	2003-07-13 21:31:56.000000000 -0600
++++ linux-2.6.0-test1-braam/Documentation/filesystems/ext2.txt	2003-07-22 13:03:47.000000000 -0600
+@@ -35,6 +35,22 @@ resgid=n			The group ID which may use th
+ 
+ sb=n				Use alternate superblock at this location.
+ 
++iopen				Makes an invisible pseudo-directory called 
++				__iopen__ available in the root directory
++				of the filesystem.  Allows open-by-inode-
++				number.  i.e., inode 3145 can be accessed
++				via /mntpt/__iopen__/3145
++
++iopen_nopriv			This option makes the iopen directory be
++				world-readable.  This may be safer since it
++				allows daemons to run as an unprivileged user,
++				however it significantly changes the security
++				model of a Unix filesystem, since previously
++				all files under a mode 700 directory were not
++				generally avilable even if the
++				permissions on the file itself is
++				world-readable.
++
+ grpquota,noquota,quota,usrquota	Quota options are silently ignored by ext2.
+ 
+ 
+--- linux-2.6.0-test1/fs/ext3/Makefile~iopen-2.5.73	2003-07-13 21:30:37.000000000 -0600
++++ linux-2.6.0-test1-braam/fs/ext3/Makefile	2003-07-22 13:03:47.000000000 -0600
+@@ -5,7 +5,7 @@
+ obj-$(CONFIG_EXT3_FS) += ext3.o
+ 
+ ext3-objs    := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
+-		ioctl.o namei.o super.o symlink.o hash.o
++		iopen.o ioctl.o namei.o super.o symlink.o hash.o
+ 
+ ifeq ($(CONFIG_EXT3_FS_XATTR),y)
+ ext3-objs += xattr.o xattr_user.o xattr_trusted.o
+--- linux-2.6.0-test1/fs/ext3/inode.c~iopen-2.5.73	2003-07-22 13:03:47.000000000 -0600
++++ linux-2.6.0-test1-braam/fs/ext3/inode.c	2003-07-22 13:03:47.000000000 -0600
+@@ -37,6 +37,7 @@
+ #include <linux/mpage.h>
+ #include <linux/uio.h>
+ #include "xattr.h"
++#include "iopen.h"
+ #include "acl.h"
+ 
+ /*
+@@ -2478,6 +2479,8 @@ void ext3_read_inode(struct inode * inod
+ 	ei->i_acl = EXT3_ACL_NOT_CACHED;
+ 	ei->i_default_acl = EXT3_ACL_NOT_CACHED;
+ #endif
++	if (ext3_iopen_get_inode(inode))
++		return;
+ 	if (ext3_get_inode_loc(inode, &iloc, 0))
+ 		goto bad_inode;
+ 	bh = iloc.bh;
+--- /dev/null	2003-01-30 03:24:37.000000000 -0700
++++ linux-2.6.0-test1-braam/fs/ext3/iopen.c	2003-07-22 13:07:32.000000000 -0600
+@@ -0,0 +1,239 @@
++
++
++/*
++ * linux/fs/ext3/iopen.c
++ *
++ * Special support for open by inode number
++ *
++ * Copyright (C) 2001 by Theodore Ts'o (tytso@alum.mit.edu).
++ * 
++ * This file may be redistributed under the terms of the GNU General
++ * Public License.
++ */
++
++#include <linux/sched.h>
++#include <linux/fs.h>
++#include <linux/ext3_jbd.h>
++#include <linux/jbd.h>
++#include <linux/ext3_fs.h>
++#include <linux/smp_lock.h>
++#include "iopen.h"
++
++#ifndef assert
++#define assert(test) J_ASSERT(test)
++#endif
++
++#define IOPEN_NAME_LEN	32
++
++/*
++ * This implements looking up an inode by number.
++ */
++static struct dentry *iopen_lookup(struct inode * dir, struct dentry *dentry, struct nameidata *nd)
++{
++	struct inode * inode;
++	unsigned long ino;
++        struct list_head *lp;
++        struct dentry *alternate;
++	char buf[IOPEN_NAME_LEN];
++	
++	if (dentry->d_name.len >= IOPEN_NAME_LEN)
++		return ERR_PTR(-ENAMETOOLONG);
++
++	memcpy(buf, dentry->d_name.name, dentry->d_name.len);
++	buf[dentry->d_name.len] = 0;
++
++	if (strcmp(buf, ".") == 0)
++		ino = dir->i_ino;
++	else if (strcmp(buf, "..") == 0)
++		ino = EXT3_ROOT_INO;
++	else
++		ino = simple_strtoul(buf, 0, 0);
++
++	if ((ino != EXT3_ROOT_INO &&
++	     //ino != EXT3_ACL_IDX_INO &&
++	     //ino != EXT3_ACL_DATA_INO &&
++	     ino < EXT3_FIRST_INO(dir->i_sb)) ||
++	    ino > le32_to_cpu(EXT3_SB(dir->i_sb)->s_es->s_inodes_count))
++		return ERR_PTR(-ENOENT);
++
++	inode = iget(dir->i_sb, ino);
++	if (!inode)
++		return ERR_PTR(-EACCES);
++	if (is_bad_inode(inode)) {
++		iput(inode);
++		return ERR_PTR(-ENOENT);
++	}
++
++        /* preferrably return a connected dentry */
++        spin_lock(&dcache_lock);
++        list_for_each(lp, &inode->i_dentry) {
++                alternate = list_entry(lp, struct dentry, d_alias);
++                assert(!(alternate->d_flags & DCACHE_DISCONNECTED));
++        }
++
++        if (!list_empty(&inode->i_dentry)) {
++                alternate = list_entry(inode->i_dentry.next, 
++                                       struct dentry, d_alias);
++                dget_locked(alternate);
++                alternate->d_vfs_flags |= DCACHE_REFERENCED;
++                iput(inode);
++                spin_unlock(&dcache_lock);
++                return alternate;
++        }
++        dentry->d_flags |= DCACHE_DISCONNECTED;
++        spin_unlock(&dcache_lock);
++
++	d_add(dentry, inode);
++	return NULL;
++}
++
++#define do_switch(x,y) do { \
++	__typeof__ (x) __tmp = x; \
++	x = y; y = __tmp; } while (0)
++
++static inline void switch_names(struct dentry * dentry, struct dentry * target)
++{
++	const unsigned char *old_name, *new_name;
++
++	memcpy(dentry->d_iname, target->d_iname, DNAME_INLINE_LEN); 
++	old_name = target->d_name.name;
++	new_name = dentry->d_name.name;
++	if (old_name == target->d_iname)
++		old_name = dentry->d_iname;
++	if (new_name == dentry->d_iname)
++		new_name = target->d_iname;
++	target->d_name.name = new_name;
++	dentry->d_name.name = old_name;
++}
++
++
++struct dentry *iopen_connect_dentry(struct dentry *de, struct inode *inode)
++{
++        struct dentry *tmp, *goal = NULL;
++        struct list_head *lp;
++
++        /* preferrably return a connected dentry */
++        spin_lock(&dcache_lock);
++        /* verify this dentry is really new */
++        assert(!de->d_inode);
++        assert(list_empty(&de->d_subdirs));
++        assert(list_empty(&de->d_alias));
++
++
++        list_for_each(lp, &inode->i_dentry) {
++                tmp = list_entry(lp, struct dentry, d_alias);
++                if (tmp->d_flags & DCACHE_DISCONNECTED) {
++                        assert(tmp->d_alias.next == &inode->i_dentry);
++                        assert(tmp->d_alias.prev == &inode->i_dentry);
++                        goal = tmp;
++                        dget_locked(goal);
++                        break;
++                }
++        }
++
++        if (!goal) { 
++                spin_unlock(&dcache_lock);
++                return NULL; 
++        }
++
++        /* Move the goal to the de hash queue */
++        goal->d_flags &= ~DCACHE_DISCONNECTED;
++	hlist_add_before(&goal->d_hash, &de->d_hash);
++	hlist_del(&goal->d_hash);
++
++	list_del(&goal->d_child);
++	list_del(&de->d_child);
++
++	/* Switch the parents and the names.. */
++	switch_names(goal, de);
++	do_switch(goal->d_parent, de->d_parent);
++	do_switch(goal->d_name.len, de->d_name.len);
++	do_switch(goal->d_name.hash, de->d_name.hash);
++
++	/* And add them back to the (new) parent lists */
++	list_add(&goal->d_child, &goal->d_parent->d_subdirs);
++	list_add(&de->d_child, &de->d_parent->d_subdirs);
++
++        spin_unlock(&dcache_lock);
++        return goal;
++}
++
++/*
++ * These are the special structures for the iopen pseudo directory.
++ */
++
++static struct inode_operations iopen_inode_operations = {
++	lookup:		iopen_lookup,		/* BKL held */
++};
++
++static struct file_operations iopen_file_operations = {
++	read:		generic_read_dir,
++};
++
++static int match_dentry(struct dentry *dentry, const char *name)
++{
++	int	len;
++
++	len = strlen(name);
++	if (dentry->d_name.len != len)
++		return 0;
++	if (strncmp(dentry->d_name.name, name, len))
++		return 0;
++	return 1;
++}
++
++/*
++ * This function is spliced into ext3_lookup and returns 1 the file
++ * name is __iopen__ and dentry has been filled in appropriately.
++ */
++int ext3_check_for_iopen(struct inode * dir, struct dentry *dentry)
++{
++	struct inode * inode;
++
++	if (dir->i_ino != EXT3_ROOT_INO ||
++	    !test_opt(dir->i_sb, IOPEN) ||
++	    !match_dentry(dentry, "__iopen__"))
++		return 0;
++
++	inode = iget(dir->i_sb, EXT3_BAD_INO);
++
++	if (!inode) 
++		return 0;
++	d_add(dentry, inode);
++	return 1;
++}
++
++/*
++ * This function is spliced into read_inode; it returns 1 if inode
++ * number is the one for /__iopen__, in which case the inode is filled
++ * in appropriately.  Otherwise, this fuction returns 0.
++ */
++int ext3_iopen_get_inode(struct inode * inode)
++{
++	if (inode->i_ino != EXT3_BAD_INO)
++		return 0;
++
++	inode->i_mode = S_IFDIR | S_IRUSR | S_IXUSR;
++	if (test_opt(inode->i_sb, IOPEN_NOPRIV))
++		inode->i_mode |= 0777;
++	inode->i_uid = 0;
++	inode->i_gid = 0;
++	inode->i_nlink = 1;
++	inode->i_size = 4096;
++	inode->i_atime = CURRENT_TIME;
++	inode->i_ctime = CURRENT_TIME;
++	inode->i_mtime = CURRENT_TIME;
++	EXT3_I(inode)->i_dtime = 0;
++	inode->i_blksize = PAGE_SIZE;	/* This is the optimal IO size
++					 * (for stat), not the fs block
++					 * size */  
++	inode->i_blocks = 0;
++	inode->i_version = 1;
++	inode->i_generation = 0;
++
++	inode->i_op = &iopen_inode_operations;
++	inode->i_fop = &iopen_file_operations;
++	inode->i_mapping->a_ops = 0;
++
++	return 1;
++}
+--- /dev/null	2003-01-30 03:24:37.000000000 -0700
++++ linux-2.6.0-test1-braam/fs/ext3/iopen.h	2003-07-22 13:03:47.000000000 -0600
+@@ -0,0 +1,15 @@
++/*
++ * iopen.h
++ *
++ * Special support for opening files by inode number.
++ * 
++ * Copyright (C) 2001 by Theodore Ts'o (tytso@alum.mit.edu).
++ * 
++ * This file may be redistributed under the terms of the GNU General
++ * Public License.
++ */
++
++extern int ext3_check_for_iopen(struct inode * dir, struct dentry *dentry);
++extern int ext3_iopen_get_inode(struct inode * inode);
++
++
+--- linux-2.6.0-test1/fs/ext3/namei.c~iopen-2.5.73	2003-07-13 21:34:43.000000000 -0600
++++ linux-2.6.0-test1-braam/fs/ext3/namei.c	2003-07-22 13:03:47.000000000 -0600
+@@ -37,6 +37,7 @@
+ #include <linux/buffer_head.h>
+ #include <linux/smp_lock.h>
+ #include "xattr.h"
++#include "iopen.h"
+ #include "acl.h"
+ 
+ /*
+@@ -970,15 +971,21 @@ errout:
+ }
+ #endif
+ 
++struct dentry *iopen_connect_dentry(struct dentry *de, struct inode *inode);
++ 
+ static struct dentry *ext3_lookup(struct inode * dir, struct dentry *dentry, struct nameidata *nd)
+ {
+ 	struct inode * inode;
+ 	struct ext3_dir_entry_2 * de;
+ 	struct buffer_head * bh;
++  	struct dentry *alternate = NULL;
+ 
+ 	if (dentry->d_name.len > EXT3_NAME_LEN)
+ 		return ERR_PTR(-ENAMETOOLONG);
+ 
++ 	if (ext3_check_for_iopen(dir, dentry))
++ 		return NULL;
++
+ 	bh = ext3_find_entry(dentry, &de);
+ 	inode = NULL;
+ 	if (bh) {
+@@ -991,6 +998,12 @@ static struct dentry *ext3_lookup(struct
+ 	}
+ 	if (inode)
+ 		return d_splice_alias(inode, dentry);
++
++	if (inode && (alternate = iopen_connect_dentry(dentry, inode))) {
++		iput(inode);
++		return alternate;
++	}
++
+ 	d_add(dentry, inode);
+ 	return NULL;
+ }
+--- linux-2.6.0-test1/fs/ext3/super.c~iopen-2.5.73	2003-07-22 13:03:47.000000000 -0600
++++ linux-2.6.0-test1-braam/fs/ext3/super.c	2003-07-22 13:03:47.000000000 -0600
+@@ -755,6 +755,17 @@ static int parse_options (char * options
+ 		         || !strcmp (this_char, "quota")
+ 		         || !strcmp (this_char, "usrquota"))
+ 			/* Don't do anything ;-) */ ;
++		else if (!strcmp (this_char, "iopen")) {
++			set_opt (sbi->s_mount_opt, IOPEN);
++			clear_opt (sbi->s_mount_opt, IOPEN_NOPRIV);
++		} else if (!strcmp (this_char, "noiopen")) {
++			clear_opt (sbi->s_mount_opt, IOPEN);
++			clear_opt (sbi->s_mount_opt, IOPEN_NOPRIV);
++		}
++		else if (!strcmp (this_char, "iopen_nopriv")) {
++			set_opt (sbi->s_mount_opt, IOPEN);
++			set_opt (sbi->s_mount_opt, IOPEN_NOPRIV);
++		}
+ 		else if (!strcmp (this_char, "journal")) {
+ 			/* @@@ FIXME */
+ 			/* Eventually we will want to be able to create
+--- linux-2.6.0-test1/include/linux/ext3_fs.h~iopen-2.5.73	2003-07-22 11:04:35.000000000 -0600
++++ linux-2.6.0-test1-braam/include/linux/ext3_fs.h	2003-07-22 13:03:47.000000000 -0600
+@@ -324,6 +324,8 @@ struct ext3_inode {
+ #define EXT3_MOUNT_NO_UID32		0x2000  /* Disable 32-bit UIDs */
+ #define EXT3_MOUNT_XATTR_USER		0x4000	/* Extended user attributes */
+ #define EXT3_MOUNT_POSIX_ACL		0x8000	/* POSIX Access Control Lists */
++#define EXT3_MOUNT_IOPEN	       0x10000  /* Allow access via iopen */
++#define EXT3_MOUNT_IOPEN_NOPRIV	       0x20000  /* Make iopen world-readable */
+ 
+ /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
+ #ifndef _LINUX_EXT2_FS_H
+
+_
diff --git a/lustre/kernel_patches/patches/iopen-2.6-suse.patch b/lustre/kernel_patches/patches/iopen-2.6-suse.patch
deleted file mode 100644
index 2133355..0000000
--- a/lustre/kernel_patches/patches/iopen-2.6-suse.patch
+++ /dev/null
@@ -1,475 +0,0 @@
- fs/ext3/inode.c                    |    3 
- fs/ext3/iopen.c                    |  239 +++++++++++++++++++++++++++++++++++++
- fs/ext3/iopen.h                    |   15 ++
- fs/ext3/namei.c                    |   13 ++
- fs/ext3/super.c                    |   17 ++
- include/linux/ext3_fs.h            |    2 
- 7 files changed, 304 insertions(+), 1 deletion(-)
-
-Index: linux-stage/fs/ext3/Makefile
-===================================================================
---- linux-stage.orig/fs/ext3/Makefile	2004-05-07 16:00:16.000000000 -0400
-+++ linux-stage/fs/ext3/Makefile	2004-05-07 16:00:17.000000000 -0400
-@@ -4,7 +4,7 @@
- 
- obj-$(CONFIG_EXT3_FS) += ext3.o
- 
--ext3-y	:= balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
-+ext3-y	:= balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o iopen.o \
- 	   ioctl.o namei.o super.o symlink.o hash.o
- 
- ext3-$(CONFIG_EXT3_FS_XATTR)	 += xattr.o xattr_user.o xattr_trusted.o
-Index: linux-stage/fs/ext3/inode.c
-===================================================================
---- linux-stage.orig/fs/ext3/inode.c	2004-05-07 16:00:16.000000000 -0400
-+++ linux-stage/fs/ext3/inode.c	2004-05-07 17:21:59.000000000 -0400
-@@ -37,6 +37,7 @@
- #include <linux/mpage.h>
- #include <linux/uio.h>
- #include "xattr.h"
-+#include "iopen.h"
- #include "acl.h"
- 
- /*
-@@ -2472,6 +2473,9 @@
- 	ei->i_acl = EXT3_ACL_NOT_CACHED;
- 	ei->i_default_acl = EXT3_ACL_NOT_CACHED;
- #endif
-+	if (ext3_iopen_get_inode(inode))
-+		return;
-+
- 	if (ext3_get_inode_loc(inode, &iloc, 0))
- 		goto bad_inode;
- 	bh = iloc.bh;
-Index: linux-stage/fs/ext3/iopen.c
-===================================================================
---- linux-stage.orig/fs/ext3/iopen.c	2004-05-07 16:00:17.000000000 -0400
-+++ linux-stage/fs/ext3/iopen.c	2004-05-07 17:22:37.000000000 -0400
-@@ -0,0 +1,272 @@
-+/*
-+ * linux/fs/ext3/iopen.c
-+ *
-+ * Special support for open by inode number
-+ *
-+ * Copyright (C) 2001 by Theodore Ts'o (tytso@alum.mit.edu).
-+ *
-+ * This file may be redistributed under the terms of the GNU General
-+ * Public License.
-+ *
-+ *
-+ * Invariants:
-+ *   - there is only ever a single DCACHE_NFSD_DISCONNECTED dentry alias
-+ *     for an inode at one time.
-+ *   - there are never both connected and DCACHE_NFSD_DISCONNECTED dentry
-+ *     aliases on an inode at the same time.
-+ *
-+ * If we have any connected dentry aliases for an inode, use one of those
-+ * in iopen_lookup().  Otherwise, we instantiate a single NFSD_DISCONNECTED
-+ * dentry for this inode, which thereafter will be found by the dcache
-+ * when looking up this inode number in __iopen__, so we don't return here
-+ * until it is gone.
-+ *
-+ * If we get an inode via a regular name lookup, then we "rename" the
-+ * NFSD_DISCONNECTED dentry to the proper name and parent.  This ensures
-+ * existing users of the disconnected dentry will continue to use the same
-+ * dentry as the connected users, and there will never be both kinds of
-+ * dentry aliases at one time.
-+ */
-+
-+#include <linux/sched.h>
-+#include <linux/fs.h>
-+#include <linux/ext3_jbd.h>
-+#include <linux/jbd.h>
-+#include <linux/ext3_fs.h>
-+#include <linux/smp_lock.h>
-+#include <linux/dcache.h>
-+#include <linux/security.h>
-+#include "iopen.h"
-+
-+#ifndef assert
-+#define assert(test) J_ASSERT(test)
-+#endif
-+
-+#define IOPEN_NAME_LEN	32
-+
-+/*
-+ * This implements looking up an inode by number.
-+ */
-+static struct dentry *iopen_lookup(struct inode * dir, struct dentry *dentry,
-+				   struct nameidata *nd)
-+{
-+	struct inode *inode;
-+	unsigned long ino;
-+	struct list_head *lp;
-+	struct dentry *alternate;
-+	char buf[IOPEN_NAME_LEN];
-+
-+	if (dentry->d_name.len >= IOPEN_NAME_LEN)
-+		return ERR_PTR(-ENAMETOOLONG);
-+
-+	memcpy(buf, dentry->d_name.name, dentry->d_name.len);
-+	buf[dentry->d_name.len] = 0;
-+
-+	if (strcmp(buf, ".") == 0)
-+		ino = dir->i_ino;
-+	else if (strcmp(buf, "..") == 0)
-+		ino = EXT3_ROOT_INO;
-+	else
-+		ino = simple_strtoul(buf, 0, 0);
-+
-+	if ((ino != EXT3_ROOT_INO &&
-+	     //ino != EXT3_ACL_IDX_INO &&
-+	     //ino != EXT3_ACL_DATA_INO &&
-+	     ino < EXT3_FIRST_INO(dir->i_sb)) ||
-+	    ino > le32_to_cpu(EXT3_SB(dir->i_sb)->s_es->s_inodes_count))
-+		return ERR_PTR(-ENOENT);
-+
-+	inode = iget(dir->i_sb, ino);
-+	if (!inode)
-+		return ERR_PTR(-EACCES);
-+	if (is_bad_inode(inode)) {
-+		iput(inode);
-+		return ERR_PTR(-ENOENT);
-+	}
-+
-+	assert(list_empty(&dentry->d_alias));		/* d_instantiate */
-+	assert(d_unhashed(dentry));		/* d_rehash */
-+
-+	/* preferrably return a connected dentry */
-+	spin_lock(&dcache_lock);
-+	list_for_each(lp, &inode->i_dentry) {
-+		alternate = list_entry(lp, struct dentry, d_alias);
-+		assert(!(alternate->d_flags & DCACHE_DISCONNECTED));
-+	}
-+
-+	if (!list_empty(&inode->i_dentry)) {
-+		alternate = list_entry(inode->i_dentry.next,
-+				       struct dentry, d_alias);
-+		dget_locked(alternate);
-+		alternate->d_vfs_flags |= DCACHE_REFERENCED;
-+		iput(inode);
-+		spin_unlock(&dcache_lock);
-+		return alternate;
-+	}
-+	dentry->d_flags |= DCACHE_DISCONNECTED;
-+
-+	/* d_add(), but don't drop dcache_lock before adding dentry to inode */
-+	list_add(&dentry->d_alias, &inode->i_dentry);	/* d_instantiate */
-+	dentry->d_inode = inode;
-+
-+	__d_rehash(dentry, 0);				/* d_rehash */
-+	spin_unlock(&dcache_lock);
-+
-+	return NULL;
-+}
-+
-+#define do_switch(x,y) do { \
-+	__typeof__ (x) __tmp = x; \
-+	x = y; y = __tmp; } while (0)
-+
-+static inline void switch_names(struct dentry *dentry, struct dentry *target)
-+{
-+	const unsigned char *old_name, *new_name;
-+
-+	memcpy(dentry->d_iname, target->d_iname, DNAME_INLINE_LEN);
-+	old_name = target->d_name.name;
-+	new_name = dentry->d_name.name;
-+	if (old_name == target->d_iname)
-+		old_name = dentry->d_iname;
-+	if (new_name == dentry->d_iname)
-+		new_name = target->d_iname;
-+	target->d_name.name = new_name;
-+	dentry->d_name.name = old_name;
-+}
-+
-+/* This function is spliced into ext3_lookup and does the move of a
-+ * disconnected dentry (if it exists) to a connected dentry.
-+ */
-+struct dentry *iopen_connect_dentry(struct dentry *dentry, struct inode *inode,
-+				    int rehash)
-+{
-+	struct dentry *tmp, *goal = NULL;
-+	struct list_head *lp;
-+
-+	/* verify this dentry is really new */
-+	assert(dentry->d_inode == NULL);
-+	assert(list_empty(&dentry->d_alias));		/* d_instantiate */
-+	if (rehash)
-+		assert(d_unhashed(dentry));	/* d_rehash */
-+	assert(list_empty(&dentry->d_subdirs));
-+
-+	spin_lock(&dcache_lock);
-+	if (!inode)
-+		goto do_rehash;
-+
-+	/* preferrably return a connected dentry */
-+	list_for_each(lp, &inode->i_dentry) {
-+		tmp = list_entry(lp, struct dentry, d_alias);
-+		if (tmp->d_flags & DCACHE_DISCONNECTED) {
-+			assert(tmp->d_alias.next == &inode->i_dentry);
-+			assert(tmp->d_alias.prev == &inode->i_dentry);
-+			goal = tmp;
-+			dget_locked(goal);
-+			break;
-+		}
-+	}
-+
-+	if (!goal)
-+		goto do_instantiate;
-+
-+	/* Move the goal to the de hash queue */
-+	goal->d_flags &= ~ DCACHE_DISCONNECTED;
-+	security_d_instantiate(goal, inode);
-+	__d_rehash(dentry, 0);
-+	__d_move(goal, dentry);
-+	spin_unlock(&dcache_lock);
-+	iput(inode);
-+
-+	return goal;
-+
-+	/* d_add(), but don't drop dcache_lock before adding dentry to inode */
-+do_instantiate:
-+	list_add(&dentry->d_alias, &inode->i_dentry);	/* d_instantiate */
-+	dentry->d_inode = inode;
-+do_rehash:
-+	if (rehash)
-+		__d_rehash(dentry, 0);			/* d_rehash */
-+	spin_unlock(&dcache_lock);
-+
-+	return NULL;
-+}
-+
-+/*
-+ * These are the special structures for the iopen pseudo directory.
-+ */
-+
-+static struct inode_operations iopen_inode_operations = {
-+	lookup:		iopen_lookup,		/* BKL held */
-+};
-+
-+static struct file_operations iopen_file_operations = {
-+	read:		generic_read_dir,
-+};
-+
-+static int match_dentry(struct dentry *dentry, const char *name)
-+{
-+	int	len;
-+
-+	len = strlen(name);
-+	if (dentry->d_name.len != len)
-+		return 0;
-+	if (strncmp(dentry->d_name.name, name, len))
-+		return 0;
-+	return 1;
-+}
-+
-+/*
-+ * This function is spliced into ext3_lookup and returns 1 the file
-+ * name is __iopen__ and dentry has been filled in appropriately.
-+ */
-+int ext3_check_for_iopen(struct inode *dir, struct dentry *dentry)
-+{
-+	struct inode *inode;
-+
-+	if (dir->i_ino != EXT3_ROOT_INO ||
-+	    !test_opt(dir->i_sb, IOPEN) ||
-+	    !match_dentry(dentry, "__iopen__"))
-+		return 0;
-+
-+	inode = iget(dir->i_sb, EXT3_BAD_INO);
-+
-+	if (!inode)
-+		return 0;
-+	d_add(dentry, inode);
-+	return 1;
-+}
-+
-+/*
-+ * This function is spliced into read_inode; it returns 1 if inode
-+ * number is the one for /__iopen__, in which case the inode is filled
-+ * in appropriately.  Otherwise, this fuction returns 0.
-+ */
-+int ext3_iopen_get_inode(struct inode *inode)
-+{
-+	if (inode->i_ino != EXT3_BAD_INO)
-+		return 0;
-+
-+	inode->i_mode = S_IFDIR | S_IRUSR | S_IXUSR;
-+	if (test_opt(inode->i_sb, IOPEN_NOPRIV))
-+		inode->i_mode |= 0777;
-+	inode->i_uid = 0;
-+	inode->i_gid = 0;
-+	inode->i_nlink = 1;
-+	inode->i_size = 4096;
-+	inode->i_atime = CURRENT_TIME;
-+	inode->i_ctime = CURRENT_TIME;
-+	inode->i_mtime = CURRENT_TIME;
-+	EXT3_I(inode)->i_dtime = 0;
-+	inode->i_blksize = PAGE_SIZE;	/* This is the optimal IO size
-+					 * (for stat), not the fs block
-+					 * size */
-+	inode->i_blocks = 0;
-+	inode->i_version = 1;
-+	inode->i_generation = 0;
-+
-+	inode->i_op = &iopen_inode_operations;
-+	inode->i_fop = &iopen_file_operations;
-+	inode->i_mapping->a_ops = 0;
-+
-+	return 1;
-+}
-Index: linux-stage/fs/ext3/iopen.h
-===================================================================
---- linux-stage.orig/fs/ext3/iopen.h	2004-05-07 16:00:17.000000000 -0400
-+++ linux-stage/fs/ext3/iopen.h	2004-05-07 16:00:17.000000000 -0400
-@@ -0,0 +1,15 @@
-+/*
-+ * iopen.h
-+ *
-+ * Special support for opening files by inode number.
-+ *
-+ * Copyright (C) 2001 by Theodore Ts'o (tytso@alum.mit.edu).
-+ *
-+ * This file may be redistributed under the terms of the GNU General
-+ * Public License.
-+ */
-+
-+extern int ext3_check_for_iopen(struct inode *dir, struct dentry *dentry);
-+extern int ext3_iopen_get_inode(struct inode *inode);
-+extern struct dentry *iopen_connect_dentry(struct dentry *dentry,
-+					   struct inode *inode, int rehash);
-Index: linux-stage/fs/ext3/namei.c
-===================================================================
---- linux-stage.orig/fs/ext3/namei.c	2004-05-07 16:00:16.000000000 -0400
-+++ linux-stage/fs/ext3/namei.c	2004-05-07 16:00:17.000000000 -0400
-@@ -37,6 +37,7 @@
- #include <linux/buffer_head.h>
- #include <linux/smp_lock.h>
- #include "xattr.h"
-+#include "iopen.h"
- #include "acl.h"
- 
- /*
-@@ -979,6 +980,9 @@
- 	if (dentry->d_name.len > EXT3_NAME_LEN)
- 		return ERR_PTR(-ENAMETOOLONG);
- 
-+	if (ext3_check_for_iopen(dir, dentry))
-+		return NULL;
-+
- 	bh = ext3_find_entry(dentry, &de);
- 	inode = NULL;
- 	if (bh) {
-@@ -989,10 +993,8 @@
- 		if (!inode)
- 			return ERR_PTR(-EACCES);
- 	}
--	if (inode)
--		return d_splice_alias(inode, dentry);
--	d_add(dentry, inode);
--	return NULL;
-+
-+	return iopen_connect_dentry(dentry, inode, 1);
- }
- 
- 
-@@ -2019,10 +2021,6 @@
- 			      inode->i_nlink);
- 	inode->i_version++;
- 	inode->i_nlink = 0;
--	/* There's no need to set i_disksize: the fact that i_nlink is
--	 * zero will ensure that the right thing happens during any
--	 * recovery. */
--	inode->i_size = 0;
- 	ext3_orphan_add(handle, inode);
- 	inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME;
- 	ext3_mark_inode_dirty(handle, inode);
-@@ -2139,6 +2137,23 @@
- 	return err;
- }
- 
-+/* Like ext3_add_nondir() except for call to iopen_connect_dentry */
-+static int ext3_add_link(handle_t *handle, struct dentry *dentry,
-+			 struct inode *inode)
-+{
-+	int err = ext3_add_entry(handle, dentry, inode);
-+	if (!err) {
-+		err = ext3_mark_inode_dirty(handle, inode);
-+		if (err == 0) {
-+			(void)iopen_connect_dentry(dentry, inode, 0);
-+			return 0;
-+		}
-+	}
-+	ext3_dec_count(handle, inode);
-+	iput(inode);
-+	return err;
-+}
-+
- static int ext3_link (struct dentry * old_dentry,
- 		struct inode * dir, struct dentry *dentry)
- {
-@@ -2161,7 +2176,8 @@
- 	ext3_inc_count(handle, inode);
- 	atomic_inc(&inode->i_count);
- 
--	err = ext3_add_nondir(handle, dentry, inode);
-+	err = ext3_add_link(handle, dentry, inode);
-+	ext3_orphan_del(handle,inode);
- 	ext3_journal_stop(handle);
- 	return err;
- }
-Index: linux-stage/fs/ext3/super.c
-===================================================================
---- linux-stage.orig/fs/ext3/super.c	2004-05-07 16:00:16.000000000 -0400
-+++ linux-stage/fs/ext3/super.c	2004-05-07 17:21:59.000000000 -0400
-@@ -536,7 +536,7 @@
- 	Opt_user_xattr, Opt_nouser_xattr, Opt_acl, Opt_noacl, Opt_noload,
- 	Opt_commit, Opt_journal_update, Opt_journal_inum,
- 	Opt_abort, Opt_data_journal, Opt_data_ordered, Opt_data_writeback,
--	Opt_ignore, Opt_err,
-+	Opt_ignore, Opt_err, Opt_iopen, Opt_noiopen, Opt_iopen_nopriv,
- };
- 
- static match_table_t tokens = {
-@@ -575,6 +575,9 @@
- 	{Opt_ignore, "noquota"},
- 	{Opt_ignore, "quota"},
- 	{Opt_ignore, "usrquota"},
-+	{Opt_iopen,  "iopen"},
-+	{Opt_noiopen,  "noiopen"},
-+	{Opt_iopen_nopriv,  "iopen_nopriv"},
- 	{Opt_err, NULL}
- };
- 
-@@ -762,6 +765,18 @@
- 		case Opt_abort:
- 			set_opt(sbi->s_mount_opt, ABORT);
- 			break;
-+		case Opt_iopen:
-+			set_opt (sbi->s_mount_opt, IOPEN);
-+			clear_opt (sbi->s_mount_opt, IOPEN_NOPRIV);
-+			break;
-+		case Opt_noiopen:
-+			clear_opt (sbi->s_mount_opt, IOPEN);
-+			clear_opt (sbi->s_mount_opt, IOPEN_NOPRIV);
-+			break;
-+		case Opt_iopen_nopriv:
-+			set_opt (sbi->s_mount_opt, IOPEN);
-+			set_opt (sbi->s_mount_opt, IOPEN_NOPRIV);
-+			break;
- 		case Opt_ignore:
- 			break;
- 		default:
-Index: linux-stage/include/linux/ext3_fs.h
-===================================================================
---- linux-stage.orig/include/linux/ext3_fs.h	2004-05-07 16:00:16.000000000 -0400
-+++ linux-stage/include/linux/ext3_fs.h	2004-05-07 16:00:17.000000000 -0400
-@@ -325,6 +325,8 @@
- #define EXT3_MOUNT_NO_UID32		0x2000  /* Disable 32-bit UIDs */
- #define EXT3_MOUNT_XATTR_USER		0x4000	/* Extended user attributes */
- #define EXT3_MOUNT_POSIX_ACL		0x8000	/* POSIX Access Control Lists */
-+#define EXT3_MOUNT_IOPEN	       0x10000  /* Allow access via iopen */
-+#define EXT3_MOUNT_IOPEN_NOPRIV	       0x20000  /* Make iopen world-readable */
- 
- /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
- #ifndef _LINUX_EXT2_FS_H
diff --git a/lustre/kernel_patches/patches/iopen-2.6.0-test6.patch b/lustre/kernel_patches/patches/iopen-2.6.0-test6.patch
new file mode 100644
index 0000000..cfa1587
--- /dev/null
+++ b/lustre/kernel_patches/patches/iopen-2.6.0-test6.patch
@@ -0,0 +1,422 @@
+ Documentation/filesystems/ext2.txt |   16 ++
+ fs/ext3/inode.c                    |    3 
+ fs/ext3/iopen.c                    |  239 +++++++++++++++++++++++++++++++++++++
+ fs/ext3/iopen.h                    |   15 ++
+ fs/ext3/namei.c                    |   13 ++
+ fs/ext3/super.c                    |   17 ++
+ include/linux/ext3_fs.h            |    2 
+ 7 files changed, 304 insertions(+), 1 deletion(-)
+
+Index: linux-2.6.0/Documentation/filesystems/ext2.txt
+===================================================================
+--- linux-2.6.0.orig/Documentation/filesystems/ext2.txt	2002-11-11 06:28:06.000000000 +0300
++++ linux-2.6.0/Documentation/filesystems/ext2.txt	2004-01-07 17:12:07.000000000 +0300
+@@ -35,6 +35,22 @@
+ 
+ sb=n				Use alternate superblock at this location.
+ 
++iopen				Makes an invisible pseudo-directory called 
++				__iopen__ available in the root directory
++				of the filesystem.  Allows open-by-inode-
++				number.  i.e., inode 3145 can be accessed
++				via /mntpt/__iopen__/3145
++
++iopen_nopriv			This option makes the iopen directory be
++				world-readable.  This may be safer since it
++				allows daemons to run as an unprivileged user,
++				however it significantly changes the security
++				model of a Unix filesystem, since previously
++				all files under a mode 700 directory were not
++				generally avilable even if the
++				permissions on the file itself is
++				world-readable.
++
+ grpquota,noquota,quota,usrquota	Quota options are silently ignored by ext2.
+ 
+ 
+Index: linux-2.6.0/fs/ext3/inode.c
+===================================================================
+--- linux-2.6.0.orig/fs/ext3/inode.c	2004-01-04 15:27:40.000000000 +0300
++++ linux-2.6.0/fs/ext3/inode.c	2004-01-07 17:12:07.000000000 +0300
+@@ -37,6 +37,7 @@
+ #include <linux/mpage.h>
+ #include <linux/uio.h>
+ #include "xattr.h"
++#include "iopen.h"
+ #include "acl.h"
+ 
+ /*
+@@ -2472,6 +2473,8 @@
+ 	ei->i_acl = EXT3_ACL_NOT_CACHED;
+ 	ei->i_default_acl = EXT3_ACL_NOT_CACHED;
+ #endif
++	if (ext3_iopen_get_inode(inode))
++		return;
+ 	if (ext3_get_inode_loc(inode, &iloc, 0))
+ 		goto bad_inode;
+ 	bh = iloc.bh;
+Index: linux-2.6.0/fs/ext3/iopen.c
+===================================================================
+--- linux-2.6.0.orig/fs/ext3/iopen.c	2003-01-30 13:24:37.000000000 +0300
++++ linux-2.6.0/fs/ext3/iopen.c	2004-01-07 17:14:22.000000000 +0300
+@@ -0,0 +1,223 @@
++
++
++/*
++ * linux/fs/ext3/iopen.c
++ *
++ * Special support for open by inode number
++ *
++ * Copyright (C) 2001 by Theodore Ts'o (tytso@alum.mit.edu).
++ * 
++ * This file may be redistributed under the terms of the GNU General
++ * Public License.
++ */
++
++#include <linux/sched.h>
++#include <linux/fs.h>
++#include <linux/ext3_jbd.h>
++#include <linux/jbd.h>
++#include <linux/ext3_fs.h>
++#include <linux/smp_lock.h>
++#include "iopen.h"
++
++#ifndef assert
++#define assert(test) J_ASSERT(test)
++#endif
++
++#define IOPEN_NAME_LEN	32
++
++/*
++ * This implements looking up an inode by number.
++ */
++static struct dentry *iopen_lookup(struct inode * dir, struct dentry *dentry, struct nameidata *nd)
++{
++	struct inode * inode;
++	unsigned long ino;
++        struct list_head *lp;
++        struct dentry *alternate;
++	char buf[IOPEN_NAME_LEN];
++	
++	if (dentry->d_name.len >= IOPEN_NAME_LEN)
++		return ERR_PTR(-ENAMETOOLONG);
++
++	memcpy(buf, dentry->d_name.name, dentry->d_name.len);
++	buf[dentry->d_name.len] = 0;
++
++	if (strcmp(buf, ".") == 0)
++		ino = dir->i_ino;
++	else if (strcmp(buf, "..") == 0)
++		ino = EXT3_ROOT_INO;
++	else
++		ino = simple_strtoul(buf, 0, 0);
++
++	if ((ino != EXT3_ROOT_INO &&
++	     //ino != EXT3_ACL_IDX_INO &&
++	     //ino != EXT3_ACL_DATA_INO &&
++	     ino < EXT3_FIRST_INO(dir->i_sb)) ||
++	    ino > le32_to_cpu(EXT3_SB(dir->i_sb)->s_es->s_inodes_count))
++		return ERR_PTR(-ENOENT);
++
++	inode = iget(dir->i_sb, ino);
++	if (!inode)
++		return ERR_PTR(-EACCES);
++	if (is_bad_inode(inode)) {
++		iput(inode);
++		return ERR_PTR(-ENOENT);
++	}
++
++        /* preferrably return a connected dentry */
++        spin_lock(&dcache_lock);
++        list_for_each(lp, &inode->i_dentry) {
++                alternate = list_entry(lp, struct dentry, d_alias);
++                assert(!(alternate->d_flags & DCACHE_DISCONNECTED));
++        }
++
++        if (!list_empty(&inode->i_dentry)) {
++                alternate = list_entry(inode->i_dentry.next, 
++                                       struct dentry, d_alias);
++                dget_locked(alternate);
++                alternate->d_vfs_flags |= DCACHE_REFERENCED;
++                iput(inode);
++                spin_unlock(&dcache_lock);
++                return alternate;
++        }
++        dentry->d_flags |= DCACHE_DISCONNECTED;
++        spin_unlock(&dcache_lock);
++
++	d_add(dentry, inode);
++	return NULL;
++}
++
++#define do_switch(x,y) do { \
++	__typeof__ (x) __tmp = x; \
++	x = y; y = __tmp; } while (0)
++
++static inline void switch_names(struct dentry * dentry, struct dentry * target)
++{
++	const unsigned char *old_name, *new_name;
++
++	memcpy(dentry->d_iname, target->d_iname, DNAME_INLINE_LEN); 
++	old_name = target->d_name.name;
++	new_name = dentry->d_name.name;
++	if (old_name == target->d_iname)
++		old_name = dentry->d_iname;
++	if (new_name == dentry->d_iname)
++		new_name = target->d_iname;
++	target->d_name.name = new_name;
++	dentry->d_name.name = old_name;
++}
++
++
++struct dentry *iopen_connect_dentry(struct dentry *de, struct inode *inode)
++{
++        struct dentry *tmp, *goal = NULL;
++        struct list_head *lp;
++
++        /* preferrably return a connected dentry */
++        spin_lock(&dcache_lock);
++        /* verify this dentry is really new */
++        assert(!de->d_inode);
++        assert(list_empty(&de->d_subdirs));
++        assert(list_empty(&de->d_alias));
++
++
++        list_for_each(lp, &inode->i_dentry) {
++                tmp = list_entry(lp, struct dentry, d_alias);
++                if (tmp->d_flags & DCACHE_DISCONNECTED) {
++                        assert(tmp->d_alias.next == &inode->i_dentry);
++                        assert(tmp->d_alias.prev == &inode->i_dentry);
++                        goal = tmp;
++                        dget_locked(goal);
++                        break;
++                }
++        }
++        spin_unlock(&dcache_lock);
++
++        if (!goal)
++                return NULL; 
++
++        goal->d_flags &= ~DCACHE_DISCONNECTED;
++	d_rehash(de);
++	d_move(goal, de);
++
++        return goal;
++}
++
++/*
++ * These are the special structures for the iopen pseudo directory.
++ */
++
++static struct inode_operations iopen_inode_operations = {
++	lookup:		iopen_lookup,		/* BKL held */
++};
++
++static struct file_operations iopen_file_operations = {
++	read:		generic_read_dir,
++};
++
++static int match_dentry(struct dentry *dentry, const char *name)
++{
++	int	len;
++
++	len = strlen(name);
++	if (dentry->d_name.len != len)
++		return 0;
++	if (strncmp(dentry->d_name.name, name, len))
++		return 0;
++	return 1;
++}
++
++/*
++ * This function is spliced into ext3_lookup and returns 1 the file
++ * name is __iopen__ and dentry has been filled in appropriately.
++ */
++int ext3_check_for_iopen(struct inode * dir, struct dentry *dentry)
++{
++	struct inode * inode;
++
++	if (dir->i_ino != EXT3_ROOT_INO ||
++	    !test_opt(dir->i_sb, IOPEN) ||
++	    !match_dentry(dentry, "__iopen__"))
++		return 0;
++
++	inode = iget(dir->i_sb, EXT3_BAD_INO);
++
++	if (!inode) 
++		return 0;
++	d_add(dentry, inode);
++	return 1;
++}
++
++/*
++ * This function is spliced into read_inode; it returns 1 if inode
++ * number is the one for /__iopen__, in which case the inode is filled
++ * in appropriately.  Otherwise, this fuction returns 0.
++ */
++int ext3_iopen_get_inode(struct inode * inode)
++{
++	if (inode->i_ino != EXT3_BAD_INO)
++		return 0;
++
++	inode->i_mode = S_IFDIR | S_IRUSR | S_IXUSR;
++	if (test_opt(inode->i_sb, IOPEN_NOPRIV))
++		inode->i_mode |= 0777;
++	inode->i_uid = 0;
++	inode->i_gid = 0;
++	inode->i_nlink = 1;
++	inode->i_size = 4096;
++	inode->i_atime = CURRENT_TIME;
++	inode->i_ctime = CURRENT_TIME;
++	inode->i_mtime = CURRENT_TIME;
++	EXT3_I(inode)->i_dtime = 0;
++	inode->i_blksize = PAGE_SIZE;	/* This is the optimal IO size
++					 * (for stat), not the fs block
++					 * size */  
++	inode->i_blocks = 0;
++	inode->i_version = 1;
++	inode->i_generation = 0;
++
++	inode->i_op = &iopen_inode_operations;
++	inode->i_fop = &iopen_file_operations;
++	inode->i_mapping->a_ops = 0;
++
++	return 1;
++}
+Index: linux-2.6.0/fs/ext3/iopen.h
+===================================================================
+--- linux-2.6.0.orig/fs/ext3/iopen.h	2003-01-30 13:24:37.000000000 +0300
++++ linux-2.6.0/fs/ext3/iopen.h	2004-01-07 17:12:07.000000000 +0300
+@@ -0,0 +1,15 @@
++/*
++ * iopen.h
++ *
++ * Special support for opening files by inode number.
++ * 
++ * Copyright (C) 2001 by Theodore Ts'o (tytso@alum.mit.edu).
++ * 
++ * This file may be redistributed under the terms of the GNU General
++ * Public License.
++ */
++
++extern int ext3_check_for_iopen(struct inode * dir, struct dentry *dentry);
++extern int ext3_iopen_get_inode(struct inode * inode);
++
++
+Index: linux-2.6.0/fs/ext3/namei.c
+===================================================================
+--- linux-2.6.0.orig/fs/ext3/namei.c	2004-01-04 15:27:40.000000000 +0300
++++ linux-2.6.0/fs/ext3/namei.c	2004-01-07 17:12:45.000000000 +0300
+@@ -37,6 +37,7 @@
+ #include <linux/buffer_head.h>
+ #include <linux/smp_lock.h>
+ #include "xattr.h"
++#include "iopen.h"
+ #include "acl.h"
+ 
+ /*
+@@ -970,15 +971,21 @@
+ }
+ #endif
+ 
++struct dentry *iopen_connect_dentry(struct dentry *de, struct inode *inode);
++ 
+ static struct dentry *ext3_lookup(struct inode * dir, struct dentry *dentry, struct nameidata *nd)
+ {
+ 	struct inode * inode;
+ 	struct ext3_dir_entry_2 * de;
+ 	struct buffer_head * bh;
++  	struct dentry *alternate = NULL;
+ 
+ 	if (dentry->d_name.len > EXT3_NAME_LEN)
+ 		return ERR_PTR(-ENAMETOOLONG);
+ 
++ 	if (ext3_check_for_iopen(dir, dentry))
++ 		return NULL;
++
+ 	bh = ext3_find_entry(dentry, &de);
+ 	inode = NULL;
+ 	if (bh) {
+@@ -989,8 +996,14 @@
+ 		if (!inode)
+ 			return ERR_PTR(-EACCES);
+ 	}
++	if (inode && (alternate = iopen_connect_dentry(dentry, inode))) {
++		iput(inode);
++		return alternate;
++	}
++
+ 	if (inode)
+ 		return d_splice_alias(inode, dentry);
++
+ 	d_add(dentry, inode);
+ 	return NULL;
+ }
+Index: linux-2.6.0/fs/ext3/super.c
+===================================================================
+--- linux-2.6.0.orig/fs/ext3/super.c	2004-01-04 15:27:40.000000000 +0300
++++ linux-2.6.0/fs/ext3/super.c	2004-01-07 17:12:07.000000000 +0300
+@@ -535,7 +535,7 @@
+ 	Opt_user_xattr, Opt_nouser_xattr, Opt_acl, Opt_noacl, Opt_noload,
+ 	Opt_commit, Opt_journal_update, Opt_journal_inum,
+ 	Opt_abort, Opt_data_journal, Opt_data_ordered, Opt_data_writeback,
+-	Opt_ignore, Opt_err,
++	Opt_ignore, Opt_err, Opt_iopen, Opt_noiopen, Opt_iopen_nopriv,
+ };
+ 
+ static match_table_t tokens = {
+@@ -574,6 +574,9 @@
+ 	{Opt_ignore, "noquota"},
+ 	{Opt_ignore, "quota"},
+ 	{Opt_ignore, "usrquota"},
++	{Opt_iopen,  "iopen"},
++	{Opt_noiopen,  "noiopen"},
++	{Opt_iopen_nopriv,  "iopen_nopriv"},
+ 	{Opt_err, NULL}
+ };
+ 
+@@ -761,6 +764,18 @@
+ 		case Opt_abort:
+ 			set_opt(sbi->s_mount_opt, ABORT);
+ 			break;
++		case Opt_iopen:
++ 			set_opt (sbi->s_mount_opt, IOPEN);
++ 			clear_opt (sbi->s_mount_opt, IOPEN_NOPRIV);
++			break;
++		case Opt_noiopen:
++			clear_opt (sbi->s_mount_opt, IOPEN);
++ 			clear_opt (sbi->s_mount_opt, IOPEN_NOPRIV);
++			break;
++		case Opt_iopen_nopriv:
++ 			set_opt (sbi->s_mount_opt, IOPEN);
++ 			set_opt (sbi->s_mount_opt, IOPEN_NOPRIV);
++			break;
+ 		case Opt_ignore:
+ 			break;
+ 		default:
+Index: linux-2.6.0/fs/ext3/Makefile
+===================================================================
+--- linux-2.6.0.orig/fs/ext3/Makefile	2003-09-19 18:00:24.000000000 +0400
++++ linux-2.6.0/fs/ext3/Makefile	2004-01-07 17:12:07.000000000 +0300
+@@ -5,7 +5,7 @@
+ obj-$(CONFIG_EXT3_FS) += ext3.o
+ 
+ ext3-y	:= balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
+-	   ioctl.o namei.o super.o symlink.o hash.o
++	   ioctl.o namei.o super.o symlink.o hash.o iopen.o
+ 
+ ext3-$(CONFIG_EXT3_FS_XATTR)	 += xattr.o xattr_user.o xattr_trusted.o
+ ext3-$(CONFIG_EXT3_FS_POSIX_ACL) += acl.o
+Index: linux-2.6.0/include/linux/ext3_fs.h
+===================================================================
+--- linux-2.6.0.orig/include/linux/ext3_fs.h	2004-01-04 15:27:40.000000000 +0300
++++ linux-2.6.0/include/linux/ext3_fs.h	2004-01-07 17:12:07.000000000 +0300
+@@ -325,6 +325,8 @@
+ #define EXT3_MOUNT_NO_UID32		0x2000  /* Disable 32-bit UIDs */
+ #define EXT3_MOUNT_XATTR_USER		0x4000	/* Extended user attributes */
+ #define EXT3_MOUNT_POSIX_ACL		0x8000	/* POSIX Access Control Lists */
++#define EXT3_MOUNT_IOPEN	       0x10000  /* Allow access via iopen */
++#define EXT3_MOUNT_IOPEN_NOPRIV	       0x20000  /* Make iopen world-readable */
+ 
+ /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
+ #ifndef _LINUX_EXT2_FS_H
diff --git a/lustre/kernel_patches/patches/iopen-2.6.0.patch b/lustre/kernel_patches/patches/iopen-2.6.0.patch
new file mode 100644
index 0000000..af67758
--- /dev/null
+++ b/lustre/kernel_patches/patches/iopen-2.6.0.patch
@@ -0,0 +1,403 @@
+ Documentation/filesystems/ext2.txt |   16 ++
+ fs/ext3/Makefile                   |    2 
+ fs/ext3/inode.c                    |    3 
+ fs/ext3/iopen.c                    |  239 +++++++++++++++++++++++++++++++++++++
+ fs/ext3/iopen.h                    |   15 ++
+ fs/ext3/namei.c                    |   13 ++
+ fs/ext3/super.c                    |   11 +
+ include/linux/ext3_fs.h            |    2 
+ 8 files changed, 300 insertions(+), 1 deletion(-)
+
+--- linux-2.6.0-test1/Documentation/filesystems/ext2.txt~iopen-2.6.0	2002-11-11 06:28:06.000000000 +0300
++++ linux-2.6.0-test1-alexey/Documentation/filesystems/ext2.txt	2003-08-24 13:02:02.000000000 +0400
+@@ -35,6 +35,22 @@ resgid=n			The group ID which may use th
+ 
+ sb=n				Use alternate superblock at this location.
+ 
++iopen				Makes an invisible pseudo-directory called 
++				__iopen__ available in the root directory
++				of the filesystem.  Allows open-by-inode-
++				number.  i.e., inode 3145 can be accessed
++				via /mntpt/__iopen__/3145
++
++iopen_nopriv			This option makes the iopen directory be
++				world-readable.  This may be safer since it
++				allows daemons to run as an unprivileged user,
++				however it significantly changes the security
++				model of a Unix filesystem, since previously
++				all files under a mode 700 directory were not
++				generally avilable even if the
++				permissions on the file itself is
++				world-readable.
++
+ grpquota,noquota,quota,usrquota	Quota options are silently ignored by ext2.
+ 
+ 
+--- linux-2.6.0-test1/fs/ext3/inode.c~iopen-2.6.0	2003-08-24 13:00:36.000000000 +0400
++++ linux-2.6.0-test1-alexey/fs/ext3/inode.c	2003-08-24 13:02:02.000000000 +0400
+@@ -37,6 +37,7 @@
+ #include <linux/mpage.h>
+ #include <linux/uio.h>
+ #include "xattr.h"
++#include "iopen.h"
+ #include "acl.h"
+ 
+ /*
+@@ -2477,6 +2478,8 @@ void ext3_read_inode(struct inode * inod
+ 	ei->i_acl = EXT3_ACL_NOT_CACHED;
+ 	ei->i_default_acl = EXT3_ACL_NOT_CACHED;
+ #endif
++	if (ext3_iopen_get_inode(inode))
++		return;
+ 	if (ext3_get_inode_loc(inode, &iloc, 0))
+ 		goto bad_inode;
+ 	bh = iloc.bh;
+--- /dev/null	2003-01-30 13:24:37.000000000 +0300
++++ linux-2.6.0-test1-alexey/fs/ext3/iopen.c	2003-08-24 13:02:02.000000000 +0400
+@@ -0,0 +1,239 @@
++
++
++/*
++ * linux/fs/ext3/iopen.c
++ *
++ * Special support for open by inode number
++ *
++ * Copyright (C) 2001 by Theodore Ts'o (tytso@alum.mit.edu).
++ * 
++ * This file may be redistributed under the terms of the GNU General
++ * Public License.
++ */
++
++#include <linux/sched.h>
++#include <linux/fs.h>
++#include <linux/ext3_jbd.h>
++#include <linux/jbd.h>
++#include <linux/ext3_fs.h>
++#include <linux/smp_lock.h>
++#include "iopen.h"
++
++#ifndef assert
++#define assert(test) J_ASSERT(test)
++#endif
++
++#define IOPEN_NAME_LEN	32
++
++/*
++ * This implements looking up an inode by number.
++ */
++static struct dentry *iopen_lookup(struct inode * dir, struct dentry *dentry, struct nameidata *nd)
++{
++	struct inode * inode;
++	unsigned long ino;
++        struct list_head *lp;
++        struct dentry *alternate;
++	char buf[IOPEN_NAME_LEN];
++	
++	if (dentry->d_name.len >= IOPEN_NAME_LEN)
++		return ERR_PTR(-ENAMETOOLONG);
++
++	memcpy(buf, dentry->d_name.name, dentry->d_name.len);
++	buf[dentry->d_name.len] = 0;
++
++	if (strcmp(buf, ".") == 0)
++		ino = dir->i_ino;
++	else if (strcmp(buf, "..") == 0)
++		ino = EXT3_ROOT_INO;
++	else
++		ino = simple_strtoul(buf, 0, 0);
++
++	if ((ino != EXT3_ROOT_INO &&
++	     //ino != EXT3_ACL_IDX_INO &&
++	     //ino != EXT3_ACL_DATA_INO &&
++	     ino < EXT3_FIRST_INO(dir->i_sb)) ||
++	    ino > le32_to_cpu(EXT3_SB(dir->i_sb)->s_es->s_inodes_count))
++		return ERR_PTR(-ENOENT);
++
++	inode = iget(dir->i_sb, ino);
++	if (!inode)
++		return ERR_PTR(-EACCES);
++	if (is_bad_inode(inode)) {
++		iput(inode);
++		return ERR_PTR(-ENOENT);
++	}
++
++        /* preferrably return a connected dentry */
++        spin_lock(&dcache_lock);
++        list_for_each(lp, &inode->i_dentry) {
++                alternate = list_entry(lp, struct dentry, d_alias);
++                assert(!(alternate->d_flags & DCACHE_DISCONNECTED));
++        }
++
++        if (!list_empty(&inode->i_dentry)) {
++                alternate = list_entry(inode->i_dentry.next, 
++                                       struct dentry, d_alias);
++                dget_locked(alternate);
++                alternate->d_vfs_flags |= DCACHE_REFERENCED;
++                iput(inode);
++                spin_unlock(&dcache_lock);
++                return alternate;
++        }
++        dentry->d_flags |= DCACHE_DISCONNECTED;
++        spin_unlock(&dcache_lock);
++
++	d_add(dentry, inode);
++	return NULL;
++}
++
++#define do_switch(x,y) do { \
++	__typeof__ (x) __tmp = x; \
++	x = y; y = __tmp; } while (0)
++
++static inline void switch_names(struct dentry * dentry, struct dentry * target)
++{
++	const unsigned char *old_name, *new_name;
++
++	memcpy(dentry->d_iname, target->d_iname, DNAME_INLINE_LEN); 
++	old_name = target->d_name.name;
++	new_name = dentry->d_name.name;
++	if (old_name == target->d_iname)
++		old_name = dentry->d_iname;
++	if (new_name == dentry->d_iname)
++		new_name = target->d_iname;
++	target->d_name.name = new_name;
++	dentry->d_name.name = old_name;
++}
++
++
++struct dentry *iopen_connect_dentry(struct dentry *de, struct inode *inode)
++{
++        struct dentry *tmp, *goal = NULL;
++        struct list_head *lp;
++
++        /* preferrably return a connected dentry */
++        spin_lock(&dcache_lock);
++        /* verify this dentry is really new */
++        assert(!de->d_inode);
++        assert(list_empty(&de->d_subdirs));
++        assert(list_empty(&de->d_alias));
++
++
++        list_for_each(lp, &inode->i_dentry) {
++                tmp = list_entry(lp, struct dentry, d_alias);
++                if (tmp->d_flags & DCACHE_DISCONNECTED) {
++                        assert(tmp->d_alias.next == &inode->i_dentry);
++                        assert(tmp->d_alias.prev == &inode->i_dentry);
++                        goal = tmp;
++                        dget_locked(goal);
++                        break;
++                }
++        }
++
++        if (!goal) { 
++                spin_unlock(&dcache_lock);
++                return NULL; 
++        }
++
++        /* Move the goal to the de hash queue */
++        goal->d_flags &= ~DCACHE_DISCONNECTED;
++	hlist_add_before(&goal->d_hash, &de->d_hash);
++	hlist_del(&goal->d_hash);
++
++	list_del(&goal->d_child);
++	list_del(&de->d_child);
++
++	/* Switch the parents and the names.. */
++	switch_names(goal, de);
++	do_switch(goal->d_parent, de->d_parent);
++	do_switch(goal->d_name.len, de->d_name.len);
++	do_switch(goal->d_name.hash, de->d_name.hash);
++
++	/* And add them back to the (new) parent lists */
++	list_add(&goal->d_child, &goal->d_parent->d_subdirs);
++	list_add(&de->d_child, &de->d_parent->d_subdirs);
++
++        spin_unlock(&dcache_lock);
++        return goal;
++}
++
++/*
++ * These are the special structures for the iopen pseudo directory.
++ */
++
++static struct inode_operations iopen_inode_operations = {
++	lookup:		iopen_lookup,		/* BKL held */
++};
++
++static struct file_operations iopen_file_operations = {
++	read:		generic_read_dir,
++};
++
++static int match_dentry(struct dentry *dentry, const char *name)
++{
++	int	len;
++
++	len = strlen(name);
++	if (dentry->d_name.len != len)
++		return 0;
++	if (strncmp(dentry->d_name.name, name, len))
++		return 0;
++	return 1;
++}
++
++/*
++ * This function is spliced into ext3_lookup and returns 1 the file
++ * name is __iopen__ and dentry has been filled in appropriately.
++ */
++int ext3_check_for_iopen(struct inode * dir, struct dentry *dentry)
++{
++	struct inode * inode;
++
++	if (dir->i_ino != EXT3_ROOT_INO ||
++	    !test_opt(dir->i_sb, IOPEN) ||
++	    !match_dentry(dentry, "__iopen__"))
++		return 0;
++
++	inode = iget(dir->i_sb, EXT3_BAD_INO);
++
++	if (!inode) 
++		return 0;
++	d_add(dentry, inode);
++	return 1;
++}
++
++/*
++ * This function is spliced into read_inode; it returns 1 if inode
++ * number is the one for /__iopen__, in which case the inode is filled
++ * in appropriately.  Otherwise, this fuction returns 0.
++ */
++int ext3_iopen_get_inode(struct inode * inode)
++{
++	if (inode->i_ino != EXT3_BAD_INO)
++		return 0;
++
++	inode->i_mode = S_IFDIR | S_IRUSR | S_IXUSR;
++	if (test_opt(inode->i_sb, IOPEN_NOPRIV))
++		inode->i_mode |= 0777;
++	inode->i_uid = 0;
++	inode->i_gid = 0;
++	inode->i_nlink = 1;
++	inode->i_size = 4096;
++	inode->i_atime = CURRENT_TIME;
++	inode->i_ctime = CURRENT_TIME;
++	inode->i_mtime = CURRENT_TIME;
++	EXT3_I(inode)->i_dtime = 0;
++	inode->i_blksize = PAGE_SIZE;	/* This is the optimal IO size
++					 * (for stat), not the fs block
++					 * size */  
++	inode->i_blocks = 0;
++	inode->i_version = 1;
++	inode->i_generation = 0;
++
++	inode->i_op = &iopen_inode_operations;
++	inode->i_fop = &iopen_file_operations;
++	inode->i_mapping->a_ops = 0;
++
++	return 1;
++}
+--- /dev/null	2003-01-30 13:24:37.000000000 +0300
++++ linux-2.6.0-test1-alexey/fs/ext3/iopen.h	2003-08-24 13:02:02.000000000 +0400
+@@ -0,0 +1,15 @@
++/*
++ * iopen.h
++ *
++ * Special support for opening files by inode number.
++ * 
++ * Copyright (C) 2001 by Theodore Ts'o (tytso@alum.mit.edu).
++ * 
++ * This file may be redistributed under the terms of the GNU General
++ * Public License.
++ */
++
++extern int ext3_check_for_iopen(struct inode * dir, struct dentry *dentry);
++extern int ext3_iopen_get_inode(struct inode * inode);
++
++
+--- linux-2.6.0-test1/fs/ext3/Makefile~iopen-2.6.0	2003-08-24 12:58:32.000000000 +0400
++++ linux-2.6.0-test1-alexey/fs/ext3/Makefile	2003-08-24 13:02:40.000000000 +0400
+@@ -5,7 +5,7 @@
+ obj-$(CONFIG_EXT3_FS) += ext3.o
+ 
+ ext3-y	:= balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
+-	   ioctl.o namei.o super.o symlink.o hash.o
++	   iopen.o ioctl.o namei.o super.o symlink.o hash.o
+ 
+ ext3-$(CONFIG_EXT3_FS_XATTR)	 += xattr.o xattr_user.o xattr_trusted.o
+ ext3-$(CONFIG_EXT3_FS_POSIX_ACL) += acl.o
+--- linux-2.6.0-test1/fs/ext3/namei.c~iopen-2.6.0	2003-07-24 15:52:30.000000000 +0400
++++ linux-2.6.0-test1-alexey/fs/ext3/namei.c	2003-08-24 13:02:02.000000000 +0400
+@@ -37,6 +37,7 @@
+ #include <linux/buffer_head.h>
+ #include <linux/smp_lock.h>
+ #include "xattr.h"
++#include "iopen.h"
+ #include "acl.h"
+ 
+ /*
+@@ -970,15 +971,21 @@ errout:
+ }
+ #endif
+ 
++struct dentry *iopen_connect_dentry(struct dentry *de, struct inode *inode);
++ 
+ static struct dentry *ext3_lookup(struct inode * dir, struct dentry *dentry, struct nameidata *nd)
+ {
+ 	struct inode * inode;
+ 	struct ext3_dir_entry_2 * de;
+ 	struct buffer_head * bh;
++  	struct dentry *alternate = NULL;
+ 
+ 	if (dentry->d_name.len > EXT3_NAME_LEN)
+ 		return ERR_PTR(-ENAMETOOLONG);
+ 
++ 	if (ext3_check_for_iopen(dir, dentry))
++ 		return NULL;
++
+ 	bh = ext3_find_entry(dentry, &de);
+ 	inode = NULL;
+ 	if (bh) {
+@@ -991,6 +998,12 @@ static struct dentry *ext3_lookup(struct
+ 	}
+ 	if (inode)
+ 		return d_splice_alias(inode, dentry);
++
++	if (inode && (alternate = iopen_connect_dentry(dentry, inode))) {
++		iput(inode);
++		return alternate;
++	}
++
+ 	d_add(dentry, inode);
+ 	return NULL;
+ }
+--- linux-2.6.0-test1/fs/ext3/super.c~iopen-2.6.0	2003-08-24 13:00:36.000000000 +0400
++++ linux-2.6.0-test1-alexey/fs/ext3/super.c	2003-08-24 13:02:02.000000000 +0400
+@@ -755,6 +755,17 @@ static int parse_options (char * options
+ 		         || !strcmp (this_char, "quota")
+ 		         || !strcmp (this_char, "usrquota"))
+ 			/* Don't do anything ;-) */ ;
++		else if (!strcmp (this_char, "iopen")) {
++			set_opt (sbi->s_mount_opt, IOPEN);
++			clear_opt (sbi->s_mount_opt, IOPEN_NOPRIV);
++		} else if (!strcmp (this_char, "noiopen")) {
++			clear_opt (sbi->s_mount_opt, IOPEN);
++			clear_opt (sbi->s_mount_opt, IOPEN_NOPRIV);
++		}
++		else if (!strcmp (this_char, "iopen_nopriv")) {
++			set_opt (sbi->s_mount_opt, IOPEN);
++			set_opt (sbi->s_mount_opt, IOPEN_NOPRIV);
++		}
+ 		else if (!strcmp (this_char, "journal")) {
+ 			/* @@@ FIXME */
+ 			/* Eventually we will want to be able to create
+--- linux-2.6.0-test1/include/linux/ext3_fs.h~iopen-2.6.0	2003-08-24 12:58:57.000000000 +0400
++++ linux-2.6.0-test1-alexey/include/linux/ext3_fs.h	2003-08-24 13:02:02.000000000 +0400
+@@ -324,6 +324,8 @@ struct ext3_inode {
+ #define EXT3_MOUNT_NO_UID32		0x2000  /* Disable 32-bit UIDs */
+ #define EXT3_MOUNT_XATTR_USER		0x4000	/* Extended user attributes */
+ #define EXT3_MOUNT_POSIX_ACL		0x8000	/* POSIX Access Control Lists */
++#define EXT3_MOUNT_IOPEN	       0x10000  /* Allow access via iopen */
++#define EXT3_MOUNT_IOPEN_NOPRIV	       0x20000  /* Make iopen world-readable */
+ 
+ /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
+ #ifndef _LINUX_EXT2_FS_H
+
+_
diff --git a/lustre/kernel_patches/patches/iopen-2.6-vanilla.patch b/lustre/kernel_patches/patches/iopen-2.6.3-mm4.patch
similarity index 77%
rename from lustre/kernel_patches/patches/iopen-2.6-vanilla.patch
rename to lustre/kernel_patches/patches/iopen-2.6.3-mm4.patch
index 597cb89..5500320 100644
--- a/lustre/kernel_patches/patches/iopen-2.6-vanilla.patch
+++ b/lustre/kernel_patches/patches/iopen-2.6.3-mm4.patch
@@ -7,10 +7,37 @@
  include/linux/ext3_fs.h            |    2 
  7 files changed, 304 insertions(+), 1 deletion(-)
 
-Index: linux-2.6.4-51.1/fs/ext3/inode.c
+Index: linux-2.6.3-mm4/Documentation/filesystems/ext2.txt
 ===================================================================
---- linux-2.6.4-51.1.orig/fs/ext3/inode.c	2004-04-06 00:31:14.000000000 -0400
-+++ linux-2.6.4-51.1/fs/ext3/inode.c	2004-04-06 00:31:24.000000000 -0400
+--- linux-2.6.3-mm4.orig/Documentation/filesystems/ext2.txt	2004-01-09 14:59:18.000000000 +0800
++++ linux-2.6.3-mm4/Documentation/filesystems/ext2.txt	2004-03-08 14:58:44.431196112 +0800
+@@ -35,6 +35,22 @@
+ 
+ sb=n				Use alternate superblock at this location.
+ 
++iopen				Makes an invisible pseudo-directory called
++				__iopen__ available in the root directory
++				of the filesystem.  Allows open-by-inode-
++				number.  i.e., inode 3145 can be accessed
++				via /mntpt/__iopen__/3145
++
++iopen_nopriv			This option makes the iopen directory be
++				world-readable.  This may be safer since it
++				allows daemons to run as an unprivileged user,
++				however it significantly changes the security
++				model of a Unix filesystem, since previously
++				all files under a mode 700 directory were not
++				generally avilable even if the
++				permissions on the file itself is
++				world-readable.
++
+ grpquota,noquota,quota,usrquota	Quota options are silently ignored by ext2.
+ 
+ 
+Index: linux-2.6.3-mm4/fs/ext3/inode.c
+===================================================================
+--- linux-2.6.3-mm4.orig/fs/ext3/inode.c	2004-03-08 14:57:54.969715400 +0800
++++ linux-2.6.3-mm4/fs/ext3/inode.c	2004-03-08 14:58:44.504185016 +0800
 @@ -37,6 +37,7 @@
  #include <linux/mpage.h>
  #include <linux/uio.h>
@@ -28,13 +55,11 @@ Index: linux-2.6.4-51.1/fs/ext3/inode.c
  	if (ext3_get_inode_loc(inode, &iloc, 0))
  		goto bad_inode;
  	bh = iloc.bh;
-Index: linux-2.6.4-51.1/fs/ext3/iopen.c
+Index: linux-2.6.3-mm4/fs/ext3/iopen.c
 ===================================================================
---- linux-2.6.4-51.1.orig/fs/ext3/iopen.c	2004-04-06 00:31:24.000000000 -0400
-+++ linux-2.6.4-51.1/fs/ext3/iopen.c	2004-04-06 00:31:24.000000000 -0400
-@@ -0,0 +1,223 @@
-+
-+
+--- linux-2.6.3-mm4.orig/fs/ext3/iopen.c	2004-03-08 14:58:44.413198848 +0800
++++ linux-2.6.3-mm4/fs/ext3/iopen.c	2004-03-08 14:58:44.576174072 +0800
+@@ -0,0 +1,218 @@
 +/*
 + * linux/fs/ext3/iopen.c
 + *
@@ -63,7 +88,8 @@ Index: linux-2.6.4-51.1/fs/ext3/iopen.c
 +/*
 + * This implements looking up an inode by number.
 + */
-+static struct dentry *iopen_lookup(struct inode * dir, struct dentry *dentry, struct nameidata *nd)
++static struct dentry *iopen_lookup(struct inode *dir, struct dentry *dentry,
++				   struct nameidata *nd)
 +{
 +	struct inode * inode;
 +	unsigned long ino;
@@ -84,10 +110,7 @@ Index: linux-2.6.4-51.1/fs/ext3/iopen.c
 +	else
 +		ino = simple_strtoul(buf, 0, 0);
 +
-+	if ((ino != EXT3_ROOT_INO &&
-+	     //ino != EXT3_ACL_IDX_INO &&
-+	     //ino != EXT3_ACL_DATA_INO &&
-+	     ino < EXT3_FIRST_INO(dir->i_sb)) ||
++	if ((ino != EXT3_ROOT_INO && ino < EXT3_FIRST_INO(dir->i_sb)) ||
 +	    ino > le32_to_cpu(EXT3_SB(dir->i_sb)->s_es->s_inodes_count))
 +		return ERR_PTR(-ENOENT);
 +
@@ -154,7 +177,6 @@ Index: linux-2.6.4-51.1/fs/ext3/iopen.c
 +	assert(list_empty(&de->d_subdirs));
 +	assert(list_empty(&de->d_alias));
 +
-+
 +	list_for_each(lp, &inode->i_dentry) {
 +		tmp = list_entry(lp, struct dentry, d_alias);
 +		if (tmp->d_flags & DCACHE_DISCONNECTED) {
@@ -256,10 +278,10 @@ Index: linux-2.6.4-51.1/fs/ext3/iopen.c
 +
 +	return 1;
 +}
-Index: linux-2.6.4-51.1/fs/ext3/iopen.h
+Index: linux-2.6.3-mm4/fs/ext3/iopen.h
 ===================================================================
---- linux-2.6.4-51.1.orig/fs/ext3/iopen.h	2004-04-06 00:31:24.000000000 -0400
-+++ linux-2.6.4-51.1/fs/ext3/iopen.h	2004-04-06 00:31:24.000000000 -0400
+--- linux-2.6.3-mm4.orig/fs/ext3/iopen.h	2004-03-08 14:58:44.413198848 +0800
++++ linux-2.6.3-mm4/fs/ext3/iopen.h	2004-03-08 14:58:44.577173920 +0800
 @@ -0,0 +1,15 @@
 +/*
 + * iopen.h
@@ -276,10 +298,10 @@ Index: linux-2.6.4-51.1/fs/ext3/iopen.h
 +extern int ext3_iopen_get_inode(struct inode * inode);
 +
 +
-Index: linux-2.6.4-51.1/fs/ext3/namei.c
+Index: linux-2.6.3-mm4/fs/ext3/namei.c
 ===================================================================
---- linux-2.6.4-51.1.orig/fs/ext3/namei.c	2004-04-06 00:31:11.000000000 -0400
-+++ linux-2.6.4-51.1/fs/ext3/namei.c	2004-04-06 00:31:24.000000000 -0400
+--- linux-2.6.3-mm4.orig/fs/ext3/namei.c	2004-03-08 14:57:52.978018184 +0800
++++ linux-2.6.3-mm4/fs/ext3/namei.c	2004-03-08 14:58:44.648163128 +0800
 @@ -37,6 +37,7 @@
  #include <linux/buffer_head.h>
  #include <linux/smp_lock.h>
@@ -299,7 +321,7 @@ Index: linux-2.6.4-51.1/fs/ext3/namei.c
  	struct inode * inode;
  	struct ext3_dir_entry_2 * de;
  	struct buffer_head * bh;
-+  	struct dentry *alternate = NULL;
++	struct dentry *alternate = NULL;
  
  	if (dentry->d_name.len > EXT3_NAME_LEN)
  		return ERR_PTR(-ENAMETOOLONG);
@@ -325,11 +347,11 @@ Index: linux-2.6.4-51.1/fs/ext3/namei.c
  	d_add(dentry, inode);
  	return NULL;
  }
-Index: linux-2.6.4-51.1/fs/ext3/super.c
+Index: linux-2.6.3-mm4/fs/ext3/super.c
 ===================================================================
---- linux-2.6.4-51.1.orig/fs/ext3/super.c	2004-04-06 00:31:14.000000000 -0400
-+++ linux-2.6.4-51.1/fs/ext3/super.c	2004-04-06 00:31:24.000000000 -0400
-@@ -536,7 +536,7 @@
+--- linux-2.6.3-mm4.orig/fs/ext3/super.c	2004-03-08 14:57:55.049703240 +0800
++++ linux-2.6.3-mm4/fs/ext3/super.c	2004-03-08 15:03:18.310560120 +0800
+@@ -575,7 +575,7 @@
  	Opt_abort, Opt_data_journal, Opt_data_ordered, Opt_data_writeback,
  	Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
  	Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0,
@@ -338,7 +360,7 @@ Index: linux-2.6.4-51.1/fs/ext3/super.c
  };
  
  static match_table_t tokens = {
-@@ -575,6 +575,9 @@
+@@ -620,6 +620,9 @@
  	{Opt_ignore, "noquota"},
  	{Opt_ignore, "quota"},
  	{Opt_ignore, "usrquota"},
@@ -348,7 +370,7 @@ Index: linux-2.6.4-51.1/fs/ext3/super.c
  	{Opt_err, NULL}
  };
  
-@@ -762,6 +765,18 @@
+@@ -869,6 +872,18 @@
  		case Opt_abort:
  			set_opt(sbi->s_mount_opt, ABORT);
  			break;
@@ -367,23 +389,10 @@ Index: linux-2.6.4-51.1/fs/ext3/super.c
  		case Opt_ignore:
  			break;
  		default:
-Index: linux-2.6.4-51.1/include/linux/ext3_fs.h
-===================================================================
---- linux-2.6.4-51.1.orig/include/linux/ext3_fs.h	2004-04-06 00:31:11.000000000 -0400
-+++ linux-2.6.4-51.1/include/linux/ext3_fs.h	2004-04-06 00:31:24.000000000 -0400
-@@ -325,6 +325,8 @@
- #define EXT3_MOUNT_NO_UID32		0x2000  /* Disable 32-bit UIDs */
- #define EXT3_MOUNT_XATTR_USER		0x4000	/* Extended user attributes */
- #define EXT3_MOUNT_POSIX_ACL		0x8000	/* POSIX Access Control Lists */
-+#define EXT3_MOUNT_IOPEN	       0x10000  /* Allow access via iopen */
-+#define EXT3_MOUNT_IOPEN_NOPRIV	       0x20000  /* Make iopen world-readable */
- 
- /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
- #ifndef _LINUX_EXT2_FS_H
-Index: linux-2.6.4-51.1/fs/ext3/Makefile
+Index: linux-2.6.3-mm4/fs/ext3/Makefile
 ===================================================================
---- linux-2.6.4-51.1.orig/fs/ext3/Makefile	2004-04-06 00:27:21.000000000 -0400
-+++ linux-2.6.4-51.1/fs/ext3/Makefile	2004-04-06 00:31:42.000000000 -0400
+--- linux-2.6.3-mm4.orig/fs/ext3/Makefile	2004-01-09 14:59:08.000000000 +0800
++++ linux-2.6.3-mm4/fs/ext3/Makefile	2004-03-08 14:58:44.794140936 +0800
 @@ -5,7 +5,7 @@
  obj-$(CONFIG_EXT3_FS) += ext3.o
  
@@ -393,3 +402,16 @@ Index: linux-2.6.4-51.1/fs/ext3/Makefile
  
  ext3-$(CONFIG_EXT3_FS_XATTR)	 += xattr.o xattr_user.o xattr_trusted.o
  ext3-$(CONFIG_EXT3_FS_POSIX_ACL) += acl.o
+Index: linux-2.6.3-mm4/include/linux/ext3_fs.h
+===================================================================
+--- linux-2.6.3-mm4.orig/include/linux/ext3_fs.h	2004-03-08 14:57:53.057006176 +0800
++++ linux-2.6.3-mm4/include/linux/ext3_fs.h	2004-03-08 14:58:44.795140784 +0800
+@@ -325,6 +325,8 @@
+ #define EXT3_MOUNT_NO_UID32		0x2000  /* Disable 32-bit UIDs */
+ #define EXT3_MOUNT_XATTR_USER		0x4000	/* Extended user attributes */
+ #define EXT3_MOUNT_POSIX_ACL		0x8000	/* POSIX Access Control Lists */
++#define EXT3_MOUNT_IOPEN	       0x10000  /* Allow access via iopen */
++#define EXT3_MOUNT_IOPEN_NOPRIV	       0x20000  /* Make iopen world-readable */
+ 
+ /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */
+ #ifndef _LINUX_EXT2_FS_H
diff --git a/lustre/kernel_patches/patches/iopen-misc-2.6-suse.patch b/lustre/kernel_patches/patches/iopen-misc-2.6-suse.patch
deleted file mode 100644
index 2d70c7b..0000000
--- a/lustre/kernel_patches/patches/iopen-misc-2.6-suse.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Index: linux-2.6.4-51.0/Documentation/filesystems/ext2.txt
-===================================================================
---- linux-2.6.4-51.0.orig/Documentation/filesystems/ext2.txt	2004-05-06 22:21:26.000000000 -0400
-+++ linux-2.6.4-51.0/Documentation/filesystems/ext2.txt	2004-05-06 22:24:42.000000000 -0400
-@@ -35,6 +35,22 @@
- 
- sb=n				Use alternate superblock at this location.
- 
-+iopen				Makes an invisible pseudo-directory called 
-+				__iopen__ available in the root directory
-+				of the filesystem.  Allows open-by-inode-
-+				number.  i.e., inode 3145 can be accessed
-+				via /mntpt/__iopen__/3145
-+
-+iopen_nopriv			This option makes the iopen directory be
-+				world-readable.  This may be safer since it
-+				allows daemons to run as an unprivileged user,
-+				however it significantly changes the security
-+				model of a Unix filesystem, since previously
-+				all files under a mode 700 directory were not
-+				generally avilable even if the
-+				permissions on the file itself is
-+				world-readable.
-+
- grpquota,noquota,quota,usrquota	Quota options are silently ignored by ext2.
- 
- 
-Index: linux-2.6.4-51.0/fs/dcache.c
-===================================================================
---- linux-2.6.4-51.0.orig/fs/dcache.c	2004-05-06 22:24:42.000000000 -0400
-+++ linux-2.6.4-51.0/fs/dcache.c	2004-05-06 22:58:37.000000000 -0400
-@@ -1195,12 +1195,11 @@
-  * dcache entries should not be moved in this way.
-  */
- 
--void d_move(struct dentry * dentry, struct dentry * target)
-+void __d_move(struct dentry * dentry, struct dentry * target)
- {
- 	if (!dentry->d_inode)
- 		printk(KERN_WARNING "VFS: moving negative dcache entry\n");
- 
--	spin_lock(&dcache_lock);
- 	write_seqlock(&rename_lock);
- 	/*
- 	 * XXXX: do we really need to take target->d_lock?
-@@ -1253,6 +1252,14 @@
- 	spin_unlock(&target->d_lock);
- 	spin_unlock(&dentry->d_lock);
- 	write_sequnlock(&rename_lock);
-+}
-+
-+EXPORT_SYMBOL(__d_move);
-+
-+void d_move(struct dentry *dentry, struct dentry *target)
-+{
-+	spin_lock(&dcache_lock);
-+	__d_move(dentry, target);
- 	spin_unlock(&dcache_lock);
- }
- 
-Index: linux-2.6.4-51.0/include/linux/dcache.h
-===================================================================
---- linux-2.6.4-51.0.orig/include/linux/dcache.h	2004-05-06 22:24:42.000000000 -0400
-+++ linux-2.6.4-51.0/include/linux/dcache.h	2004-05-06 23:03:43.000000000 -0400
-@@ -234,6 +234,7 @@
-  * This adds the entry to the hash queues.
-  */
- extern void d_rehash(struct dentry *);
-+extern void __d_rehash(struct dentry *, int lock);
- 
- /**
-  * d_add - add dentry to hash queues
-@@ -252,6 +253,7 @@
- 
- /* used for rename() and baskets */
- extern void d_move(struct dentry *, struct dentry *);
-+extern void __d_move(struct dentry *, struct dentry *);
- 
- /* appendix may either be NULL or be used for transname suffixes */
- extern struct dentry * d_lookup(struct dentry *, struct qstr *);
diff --git a/lustre/kernel_patches/patches/kernel_text_address-2.4.21-sles8sp3.patch b/lustre/kernel_patches/patches/kernel_text_address-2.4.21-sles8sp3.patch
deleted file mode 100644
index 0541a48..0000000
--- a/lustre/kernel_patches/patches/kernel_text_address-2.4.21-sles8sp3.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-Index: linux-2.4.21/arch/um/kernel/Makefile
-===================================================================
---- linux-2.4.21.orig/arch/um/kernel/Makefile	2004-04-24 02:37:58.000000000 -0400
-+++ linux-2.4.21/arch/um/kernel/Makefile	2004-04-24 02:51:03.000000000 -0400
-@@ -37,7 +37,8 @@
- export-objs-$(CONFIG_GPROF) += gprof_syms.o
- export-objs-$(CONFIG_GCOV) += gmon_syms.o
- 
--export-objs = ksyms.o process_kern.o signal_kern.o user_syms.o $(export-objs-y)
-+export-objs = ksyms.o process_kern.o signal_kern.o user_syms.o sysrq.o \
-+	$(export-objs-y)
- 
- CFLAGS_user_syms.o = -D__AUTOCONF_INCLUDED__ $(DMODULES-y) $(DMODVERSIONS-y) \
- 	-I/usr/include -I../include
-Index: linux-2.4.21/arch/um/kernel/sysrq.c
-===================================================================
---- linux-2.4.21.orig/arch/um/kernel/sysrq.c	2004-04-24 02:37:58.000000000 -0400
-+++ linux-2.4.21/arch/um/kernel/sysrq.c	2004-04-24 02:51:03.000000000 -0400
-@@ -86,6 +86,37 @@
- 	show_trace((unsigned long *)esp);
- }
- 
-+#ifdef CONFIG_MODULES
-+extern struct module *module_list;
-+extern struct module kernel_module;
-+#endif
-+
-+int is_kernel_text_address(unsigned long addr)
-+{
-+	int retval = 0;
-+#ifdef CONFIG_MODULES
-+	struct module *mod;
-+#endif
-+	if (addr >= (unsigned long) &_stext &&
-+	    addr <= (unsigned long) &_etext)
-+		return 1;
-+
-+#ifdef CONFIG_MODULES
-+	for (mod = module_list; mod != &kernel_module; mod = mod->next) {
-+		/* mod_bound tests for addr being inside the vmalloc'ed
-+		 * module area. Of course it'd be better to test only
-+		 * for the .text subset... */
-+		if (mod_bound(addr, 0, mod)) {
-+			retval = 1;
-+			break;
-+		}
-+	}
-+#endif
-+	return retval;
-+}
-+
-+EXPORT_SYMBOL(is_kernel_text_address);
-+
- /*
-  * Overrides for Emacs so that we follow Linus's tabbing style.
-  * Emacs will notice this stuff at the end of the file and automatically
-Index: linux-2.4.21/arch/i386/kernel/Makefile
-===================================================================
---- linux-2.4.21.orig/arch/i386/kernel/Makefile	2004-04-24 02:39:05.000000000 -0400
-+++ linux-2.4.21/arch/i386/kernel/Makefile	2004-04-24 02:51:26.000000000 -0400
-@@ -20,7 +20,7 @@
- 
- O_TARGET := kernel.o
- 
--export-objs     := mca.o mtrr.o msr.o cpuid.o microcode.o i386_ksyms.o time.o traps.o dr_alloc.o
-+export-objs     := mca.o mtrr.o msr.o cpuid.o microcode.o i386_ksyms.o time.o traps.o dr_alloc.o traps.o
- 
- ifdef CONFIG_X86_SPEEDSTEP_ICH
- export-objs	+= speedstep-lib.o
-Index: linux-2.4.21/arch/i386/kernel/traps.c
-===================================================================
---- linux-2.4.21.orig/arch/i386/kernel/traps.c	2004-04-24 02:42:58.000000000 -0400
-+++ linux-2.4.21/arch/i386/kernel/traps.c	2004-04-24 02:51:03.000000000 -0400
-@@ -1339,3 +1339,41 @@
- 	cobalt_init();
- #endif
- }
-+
-+#ifdef CONFIG_MODULES
-+extern struct module *module_list;
-+extern struct module kernel_module;
-+#endif
-+                                                                                
-+int is_kernel_text_address(unsigned long addr)
-+{
-+       int retval = 0;
-+#ifdef CONFIG_MODULES
-+       struct module *mod;
-+#endif
-+       if (addr >= (unsigned long) &_stext &&
-+           addr <= (unsigned long) &_etext);
-+               return 1;
-+                                                                                
-+#ifdef CONFIG_MODULES
-+       for (mod = module_list; mod != &kernel_module; mod = mod->next) {
-+               /* mod_bound tests for addr being inside the vmalloc'ed
-+                * module area. Of course it'd be better to test only
-+                * for the .text subset... */
-+               if (mod_bound(addr, 0, mod)) {
-+                       retval = 1;
-+                       break;
-+               }
-+       }
-+#endif
-+                                                                                
-+       return retval;
-+}
-+
-+int lookup_symbol(unsigned long address, char *buf, int buflen)
-+{
-+	return -ENOSYS;
-+}
-+
-+EXPORT_SYMBOL_GPL(is_kernel_text_address);
-+EXPORT_SYMBOL_GPL(lookup_symbol);
diff --git a/lustre/kernel_patches/patches/kernel_text_address-2.6.0.patch b/lustre/kernel_patches/patches/kernel_text_address-2.6.0.patch
new file mode 100644
index 0000000..a2cbd64
--- /dev/null
+++ b/lustre/kernel_patches/patches/kernel_text_address-2.6.0.patch
@@ -0,0 +1,45 @@
+Index: linux-2.6.0/arch/i386/kernel/traps.c
+===================================================================
+--- linux-2.6.0.orig/arch/i386/kernel/traps.c	2003-12-31 01:59:49.000000000 +0300
++++ linux-2.6.0/arch/i386/kernel/traps.c	2003-12-31 16:05:53.000000000 +0300
+@@ -1032,3 +1032,40 @@
+ 
+ 	trap_init_hook();
+ }
++#ifdef CONFIG_MODULES
++extern struct module *module_list;
++extern struct module kernel_module;
++#endif
++
++int is_kernel_text_address(unsigned long addr)
++{
++       int retval = 0;
++#ifdef CONFIG_MODULES
++       struct module *mod;
++#endif
++       if (addr >= (unsigned long) &_stext &&
++           addr <= (unsigned long) &_etext);
++               return 1;
++
++#ifdef CONFIG_MODULES
++       for (mod = module_list; mod != &kernel_module; mod = mod->next) {
++               /* mod_bound tests for addr being inside the vmalloc'ed
++                * module area. Of course it'd be better to test only
++                * for the .text subset... */
++               if (mod_bound(addr, 0, mod)) {
++                       retval = 1;
++                       break;
++               }
++       }
++#endif
++
++       return retval;
++}
++
++int lookup_symbol(unsigned long address, char *buf, int buflen)
++{
++       return -ENOSYS;
++}
++
++EXPORT_SYMBOL_GPL(is_kernel_text_address);
++EXPORT_SYMBOL_GPL(lookup_symbol);
diff --git a/lustre/kernel_patches/patches/kernel_text_address-2.6.3.patch b/lustre/kernel_patches/patches/kernel_text_address-2.6.3.patch
new file mode 100644
index 0000000..c60c525
--- /dev/null
+++ b/lustre/kernel_patches/patches/kernel_text_address-2.6.3.patch
@@ -0,0 +1,26 @@
+Index: linux-2.6.3/arch/i386/kernel/traps.c
+===================================================================
+--- linux-2.6.3.orig/arch/i386/kernel/traps.c	2004-02-23 14:04:13.000000000 -0800
++++ linux-2.6.3/arch/i386/kernel/traps.c	2004-02-23 14:10:07.000000000 -0800
+@@ -890,3 +890,21 @@
+ 
+ 	trap_init_hook();
+ }
++
++int is_kernel_text_address(unsigned long addr)
++{
++	if (addr < (unsigned long) &_stext ||
++	    addr > (unsigned long) &_etext ||
++	    module_text_address(addr))
++		return 0;
++
++       return 1;
++}
++
++int lookup_symbol(unsigned long address, char *buf, int buflen)
++{
++       return -ENOSYS;
++}
++
++EXPORT_SYMBOL_GPL(is_kernel_text_address);
++EXPORT_SYMBOL_GPL(lookup_symbol);
diff --git a/lustre/kernel_patches/patches/kexec-2.6.0-full.patch b/lustre/kernel_patches/patches/kexec-2.6.0-full.patch
new file mode 100644
index 0000000..d8a1e09
--- /dev/null
+++ b/lustre/kernel_patches/patches/kexec-2.6.0-full.patch
@@ -0,0 +1,1406 @@
+ 0 files changed
+
+--- linux-2.6.0-test1/MAINTAINERS~kexec-2.6.0-full	2003-07-23 12:08:43.000000000 +0800
++++ linux-2.6.0-test1-root/MAINTAINERS	2003-07-23 12:08:54.000000000 +0800
+@@ -1095,6 +1095,17 @@ W:	http://nfs.sourceforge.net/
+ W:	http://www.cse.unsw.edu.au/~neilb/patches/linux-devel/
+ S:	Maintained
+ 
++KEXEC
++P:	Eric Biederman
++M:	ebiederm@xmission.com
++M:	ebiederman@lnxi.com
++W:	http://www.xmission.com/~ebiederm/files/kexec/
++P:	Andy Pfiffer
++M:	andyp@osdl.org
++W:	http://www.osdl.org/archive/andyp/bloom/Code/Linux/Kexec/
++L:	linux-kernel@vger.kernel.org
++S:	Maintained
++
+ LANMEDIA WAN CARD DRIVER
+ P:	Andrew Stanley-Jones
+ M:	asj@lanmedia.com
+--- linux-2.6.0-test1/arch/i386/Kconfig~kexec-2.6.0-full	2003-07-23 12:08:52.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/Kconfig	2003-07-23 12:08:54.000000000 +0800
+@@ -804,6 +804,23 @@ config BOOT_IOREMAP
+ 	depends on ((X86_SUMMIT || X86_GENERICARCH) && NUMA)
+ 	default y
+ 
++config KEXEC
++	bool "kexec system call (EXPERIMENTAL)"
++	depends on EXPERIMENTAL
++	help
++	  kexec is a system call that implements the ability to  shutdown your
++	  current kernel, and to start another kernel.  It is like a reboot
++	  but it is indepedent of the system firmware.   And like a reboot
++	  you can start any kernel with it not just Linux.  
++	
++	  The name comes from the similiarity to the exec system call. 
++	
++	  It is on an going process to be certain the hardware in a machine
++	  is properly shutdown, so do not be surprised if this code does not
++	  initially work for you.  It may help to enable device hotplugging
++	  support.  As of this writing the exact hardware interface is
++	  strongly in flux, so no good recommendation can be made.
++
+ endmenu
+ 
+ 
+--- linux-2.6.0-test1/arch/i386/defconfig~kexec-2.6.0-full	2003-07-14 11:35:57.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/defconfig	2003-07-23 12:08:54.000000000 +0800
+@@ -72,6 +72,7 @@ CONFIG_SMP=y
+ CONFIG_X86_LOCAL_APIC=y
+ CONFIG_X86_IO_APIC=y
+ CONFIG_NR_CPUS=32
++CONFIG_KEXEC=y
+ CONFIG_X86_MCE=y
+ # CONFIG_X86_MCE_NONFATAL is not set
+ CONFIG_X86_MCE_P4THERMAL=y
+--- linux-2.6.0-test1/arch/i386/kernel/Makefile~kexec-2.6.0-full	2003-07-23 12:08:31.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/kernel/Makefile	2003-07-23 12:08:54.000000000 +0800
+@@ -25,6 +25,7 @@ obj-$(CONFIG_X86_TRAMPOLINE)	+= trampoli
+ obj-$(CONFIG_X86_MPPARSE)	+= mpparse.o
+ obj-$(CONFIG_X86_LOCAL_APIC)	+= apic.o nmi.o
+ obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o
++obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o
+ obj-$(CONFIG_SOFTWARE_SUSPEND)	+= suspend.o suspend_asm.o
+ obj-$(CONFIG_X86_NUMAQ)		+= numaq.o
+ obj-$(CONFIG_X86_SUMMIT)	+= summit.o
+--- linux-2.6.0-test1/arch/i386/kernel/apic.c~kexec-2.6.0-full	2003-07-23 12:08:30.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/kernel/apic.c	2003-07-23 12:08:54.000000000 +0800
+@@ -26,6 +26,7 @@
+ #include <linux/mc146818rtc.h>
+ #include <linux/kernel_stat.h>
+ #include <linux/sysdev.h>
++#include <linux/reboot.h>
+ 
+ #include <asm/atomic.h>
+ #include <asm/smp.h>
+@@ -175,6 +176,39 @@ void disconnect_bsp_APIC(void)
+ 		outb(0x70, 0x22);
+ 		outb(0x00, 0x23);
+ 	}
++#ifdef 	CONFIG_KEXEC
++	else {
++		/* Go back to Virtual Wire compatibility mode */
++		unsigned long value;
++
++		/* For the spurious interrupt use vector F, and enable it */
++		value = apic_read(APIC_SPIV);
++		value &= ~APIC_VECTOR_MASK; 
++		value |= APIC_SPIV_APIC_ENABLED;
++		value |= 0xf;
++		apic_write_around(APIC_SPIV, value);
++
++		/* For LVT0 make it edge triggered, active high, external and enabled */
++		value = apic_read(APIC_LVT0);
++		value &= ~(APIC_MODE_MASK | APIC_SEND_PENDING | 
++			APIC_INPUT_POLARITY | APIC_LVT_REMOTE_IRR | 
++			APIC_LVT_LEVEL_TRIGGER | APIC_LVT_MASKED );
++		value |= APIC_LVT_REMOTE_IRR | APIC_SEND_PENDING;
++		value = SET_APIC_DELIVERY_MODE(value, APIC_MODE_EXINT);
++		apic_write_around(APIC_LVT0, value);
++		
++		/* For LVT1 make it edge triggered, active high, nmi and enabled */
++		value = apic_read(APIC_LVT1);
++		value &= ~(
++			APIC_MODE_MASK | APIC_SEND_PENDING | 
++			APIC_INPUT_POLARITY | APIC_LVT_REMOTE_IRR | 
++			APIC_LVT_LEVEL_TRIGGER | APIC_LVT_MASKED);
++		value |= APIC_LVT_REMOTE_IRR | APIC_SEND_PENDING;
++		value = SET_APIC_DELIVERY_MODE(value, APIC_MODE_NMI);
++		apic_write_around(APIC_LVT1, value);
++	}
++#endif	/* CONFIG_KEXEC */
++
+ }
+ 
+ void disable_local_APIC(void)
+@@ -1115,6 +1149,26 @@ asmlinkage void smp_error_interrupt(void
+ 	irq_exit();
+ }
+ 
++void stop_apics(void)
++{
++	/* By resetting the APIC's we disable the nmi watchdog */
++#if CONFIG_SMP
++	/*
++	 * Stop all CPUs and turn off local APICs and the IO-APIC, so
++	 * other OSs see a clean IRQ state.
++	 */
++	smp_send_stop();
++#else
++	disable_local_APIC();
++#endif
++#if defined(CONFIG_X86_IO_APIC)
++	if (smp_found_config) {
++		disable_IO_APIC();
++	}
++#endif
++	disconnect_bsp_APIC();
++}
++
+ /*
+  * This initializes the IO-APIC and APIC hardware if this is
+  * a UP kernel.
+--- linux-2.6.0-test1/arch/i386/kernel/dmi_scan.c~kexec-2.6.0-full	2003-07-14 11:32:44.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/kernel/dmi_scan.c	2003-07-23 12:08:54.000000000 +0800
+@@ -222,31 +222,6 @@ static __init int set_bios_reboot(struct
+ 	return 0;
+ }
+ 
+-/*
+- * Some machines require the "reboot=s"  commandline option, this quirk makes that automatic.
+- */
+-static __init int set_smp_reboot(struct dmi_blacklist *d)
+-{
+-#ifdef CONFIG_SMP
+-	extern int reboot_smp;
+-	if (reboot_smp == 0)
+-	{
+-		reboot_smp = 1;
+-		printk(KERN_INFO "%s series board detected. Selecting SMP-method for reboots.\n", d->ident);
+-	}
+-#endif
+-	return 0;
+-}
+-
+-/*
+- * Some machines require the "reboot=b,s"  commandline option, this quirk makes that automatic.
+- */
+-static __init int set_smp_bios_reboot(struct dmi_blacklist *d)
+-{
+-	set_smp_reboot(d);
+-	set_bios_reboot(d);
+-	return 0;
+-}
+ 
+ /*
+  * Some bioses have a broken protected mode poweroff and need to use realmode
+@@ -527,7 +502,7 @@ static __initdata struct dmi_blacklist d
+ 			MATCH(DMI_BIOS_VERSION, "4.60 PGMA"),
+ 			MATCH(DMI_BIOS_DATE, "134526184"), NO_MATCH
+ 			} },
+-	{ set_smp_bios_reboot, "Dell PowerEdge 1300", {	/* Handle problems with rebooting on Dell 1300's */
++	{ set_bios_reboot, "Dell PowerEdge 1300", {	/* Handle problems with rebooting on Dell 1300's */
+ 			MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
+ 			MATCH(DMI_PRODUCT_NAME, "PowerEdge 1300/"),
+ 			NO_MATCH, NO_MATCH
+--- linux-2.6.0-test1/arch/i386/kernel/entry.S~kexec-2.6.0-full	2003-07-23 12:08:30.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/kernel/entry.S	2003-07-23 12:08:54.000000000 +0800
+@@ -905,5 +905,6 @@ ENTRY(sys_call_table)
+ 	.long sys_tgkill	/* 270 */
+ 	.long sys_utimes
+ 	.long sys_mknod64
++        .long sys_kexec_load
+ 
+ nr_syscalls=(.-sys_call_table)/4
+--- linux-2.6.0-test1/arch/i386/kernel/i8259.c~kexec-2.6.0-full	2003-07-14 11:38:03.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/kernel/i8259.c	2003-07-23 12:08:54.000000000 +0800
+@@ -244,9 +244,21 @@ static int i8259A_resume(struct sys_devi
+ 	return 0;
+ }
+ 
++static int i8259A_shutdown(struct sys_device *dev)
++{
++	/* Put the i8259A into a quiescent state that
++	 * the kernel initialization code can get it
++	 * out of.
++	 */
++	outb(0xff, 0x21);	/* mask all of 8259A-1 */
++	outb(0xff, 0xA1);	/* mask all of 8259A-1 */
++	return 0;
++}
++
+ static struct sysdev_class i8259_sysdev_class = {
+ 	set_kset_name("i8259"),
+ 	.resume = i8259A_resume,
++	.shutdown = i8259A_shutdown,
+ };
+ 
+ static struct sys_device device_i8259A = {
+--- linux-2.6.0-test1/arch/i386/kernel/io_apic.c~kexec-2.6.0-full	2003-07-23 12:08:30.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/kernel/io_apic.c	2003-07-23 12:08:54.000000000 +0800
+@@ -1601,8 +1601,6 @@ void disable_IO_APIC(void)
+ 	 * Clear the IO-APIC before rebooting:
+ 	 */
+ 	clear_IO_APIC();
+-
+-	disconnect_bsp_APIC();
+ }
+ 
+ /*
+--- /dev/null	2002-08-31 07:31:37.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/kernel/machine_kexec.c	2003-07-23 12:08:54.000000000 +0800
+@@ -0,0 +1,116 @@
++#include <linux/config.h>
++#include <linux/mm.h>
++#include <linux/kexec.h>
++#include <linux/delay.h>
++#include <asm/pgtable.h>
++#include <asm/pgalloc.h>
++#include <asm/tlbflush.h>
++#include <asm/mmu_context.h>
++#include <asm/io.h>
++#include <asm/apic.h>
++
++
++/*
++ * machine_kexec
++ * =======================
++ */
++
++
++static void set_idt(void *newidt, __u16 limit)
++{
++	unsigned char curidt[6];
++
++	/* ia32 supports unaliged loads & stores */
++	(*(__u16 *)(curidt)) = limit;
++	(*(__u32 *)(curidt +2)) = (unsigned long)(newidt);
++
++	__asm__ __volatile__ (
++		"lidt %0\n" 
++		: "=m" (curidt)
++		);
++};
++
++
++static void set_gdt(void *newgdt, __u16 limit)
++{
++	unsigned char curgdt[6];
++
++	/* ia32 supports unaliged loads & stores */
++	(*(__u16 *)(curgdt)) = limit;
++	(*(__u32 *)(curgdt +2)) = (unsigned long)(newgdt);
++
++	__asm__ __volatile__ (
++		"lgdt %0\n" 
++		: "=m" (curgdt)
++		);
++};
++
++static void load_segments(void)
++{
++#define __STR(X) #X
++#define STR(X) __STR(X)
++
++	__asm__ __volatile__ (
++		"\tljmp $"STR(__KERNEL_CS)",$1f\n"
++		"\t1:\n"
++		"\tmovl $"STR(__KERNEL_DS)",%eax\n"
++		"\tmovl %eax,%ds\n"
++		"\tmovl %eax,%es\n"
++		"\tmovl %eax,%fs\n"
++		"\tmovl %eax,%gs\n"
++		"\tmovl %eax,%ss\n"
++		);
++#undef STR
++#undef __STR
++}
++
++typedef void (*relocate_new_kernel_t)(
++	unsigned long indirection_page, unsigned long reboot_code_buffer,
++	unsigned long start_address);
++
++const extern unsigned char relocate_new_kernel[];
++extern void relocate_new_kernel_end(void);
++const extern unsigned int relocate_new_kernel_size;
++extern void use_mm(struct mm_struct *mm);
++
++void machine_kexec(struct kimage *image)
++{
++	unsigned long indirection_page;
++	unsigned long reboot_code_buffer;
++	relocate_new_kernel_t rnk;
++
++	/* switch to an mm where the reboot_code_buffer is identity mapped */
++	use_mm(&init_mm);
++	stop_apics();
++
++	/* Interrupts aren't acceptable while we reboot */
++	local_irq_disable();
++	reboot_code_buffer = page_to_pfn(image->reboot_code_pages) << PAGE_SHIFT;
++	indirection_page = image->head & PAGE_MASK;
++
++	/* copy it out */
++	memcpy((void *)reboot_code_buffer, relocate_new_kernel, relocate_new_kernel_size);
++
++	/* The segment registers are funny things, they are
++	 * automatically loaded from a table, in memory wherever you
++	 * set them to a specific selector, but this table is never
++	 * accessed again you set the segment to a different selector.
++	 *
++	 * The more common model is are caches where the behide
++	 * the scenes work is done, but is also dropped at arbitrary
++	 * times.
++	 *
++	 * I take advantage of this here by force loading the
++	 * segments, before I zap the gdt with an invalid value.
++	 */
++	load_segments();
++	/* The gdt & idt are now invalid.
++	 * If you want to load them you must set up your own idt & gdt.
++	 */
++	set_gdt(phys_to_virt(0),0);
++	set_idt(phys_to_virt(0),0);
++
++	/* now call it */
++	rnk = (relocate_new_kernel_t) reboot_code_buffer;
++	(*rnk)(indirection_page, reboot_code_buffer, image->start);
++}
+--- linux-2.6.0-test1/arch/i386/kernel/reboot.c~kexec-2.6.0-full	2003-07-23 12:08:31.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/kernel/reboot.c	2003-07-23 12:08:54.000000000 +0800
+@@ -8,6 +8,7 @@
+ #include <linux/interrupt.h>
+ #include <linux/mc146818rtc.h>
+ #include <asm/uaccess.h>
++#include <asm/apic.h>
+ #include "mach_reboot.h"
+ 
+ /*
+@@ -20,8 +21,7 @@ static int reboot_mode;
+ int reboot_thru_bios;
+ 
+ #ifdef CONFIG_SMP
+-int reboot_smp = 0;
+-static int reboot_cpu = -1;
++int reboot_cpu = -1;	  /* specifies the internal linux cpu id, not the apicid */
+ /* shamelessly grabbed from lib/vsprintf.c for readability */
+ #define is_digit(c)	((c) >= '0' && (c) <= '9')
+ #endif
+@@ -43,7 +43,6 @@ static int __init reboot_setup(char *str
+ 			break;
+ #ifdef CONFIG_SMP
+ 		case 's': /* "smp" reboot by executing reset on BSP or other CPU*/
+-			reboot_smp = 1;
+ 			if (is_digit(*(str+1))) {
+ 				reboot_cpu = (int) (*(str+1) - '0');
+ 				if (is_digit(*(str+2))) 
+@@ -215,42 +214,7 @@ void machine_real_restart(unsigned char 
+ 
+ void machine_restart(char * __unused)
+ {
+-#ifdef CONFIG_SMP
+-	int cpuid;
+-	
+-	cpuid = GET_APIC_ID(apic_read(APIC_ID));
+-
+-	if (reboot_smp) {
+-
+-		/* check to see if reboot_cpu is valid 
+-		   if its not, default to the BSP */
+-		if ((reboot_cpu == -1) ||  
+-		      (reboot_cpu > (NR_CPUS -1))  || 
+-		      !cpu_isset(cpuid, phys_cpu_present_map))
+-			reboot_cpu = boot_cpu_physical_apicid;
+-
+-		reboot_smp = 0;  /* use this as a flag to only go through this once*/
+-		/* re-run this function on the other CPUs
+-		   it will fall though this section since we have 
+-		   cleared reboot_smp, and do the reboot if it is the
+-		   correct CPU, otherwise it halts. */
+-		if (reboot_cpu != cpuid)
+-			smp_call_function((void *)machine_restart , NULL, 1, 0);
+-	}
+-
+-	/* if reboot_cpu is still -1, then we want a tradional reboot, 
+-	   and if we are not running on the reboot_cpu,, halt */
+-	if ((reboot_cpu != -1) && (cpuid != reboot_cpu)) {
+-		for (;;)
+-		__asm__ __volatile__ ("hlt");
+-	}
+-	/*
+-	 * Stop all CPUs and turn off local APICs and the IO-APIC, so
+-	 * other OSs see a clean IRQ state.
+-	 */
+-	smp_send_stop();
+-	disable_IO_APIC();
+-#endif
++        stop_apics();
+ 
+ 	if(!reboot_thru_bios) {
+ 		/* rebooting needs to touch the page at absolute addr 0 */
+@@ -268,10 +232,12 @@ void machine_restart(char * __unused)
+ 
+ void machine_halt(void)
+ {
++	stop_apics();
+ }
+ 
+ void machine_power_off(void)
+ {
++	stop_apics();
+ 	if (pm_power_off)
+ 		pm_power_off();
+ }
+--- /dev/null	2002-08-31 07:31:37.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/kernel/relocate_kernel.S	2003-07-23 12:08:54.000000000 +0800
+@@ -0,0 +1,107 @@
++#include <linux/config.h>
++#include <linux/linkage.h>
++
++	/* Must be relocatable PIC code callable as a C function, that once
++	 * it starts can not use the previous processes stack.
++	 *
++	 */
++	.globl relocate_new_kernel
++relocate_new_kernel:
++	/* read the arguments and say goodbye to the stack */
++	movl  4(%esp), %ebx /* indirection_page */
++	movl  8(%esp), %ebp /* reboot_code_buffer */
++	movl  12(%esp), %edx /* start address */
++
++	/* zero out flags, and disable interrupts */
++	pushl $0
++	popfl
++
++	/* set a new stack at the bottom of our page... */
++	lea   4096(%ebp), %esp
++
++	/* store the parameters back on the stack */
++	pushl   %edx /* store the start address */
++
++	/* Set cr0 to a known state:
++	 * 31 0 == Paging disabled
++	 * 18 0 == Alignment check disabled
++	 * 16 0 == Write protect disabled
++	 * 3  0 == No task switch
++	 * 2  0 == Don't do FP software emulation.
++	 * 0  1 == Proctected mode enabled
++	 */
++	movl	%cr0, %eax
++	andl	$~((1<<31)|(1<<18)|(1<<16)|(1<<3)|(1<<2)), %eax
++	orl	$(1<<0), %eax
++	movl	%eax, %cr0
++	
++	/* Set cr4 to a known state:
++	 * Setting everything to zero seems safe.
++	 */
++	movl	%cr4, %eax
++	andl	$0, %eax
++	movl	%eax, %cr4
++	
++	jmp 1f
++1:	
++
++	/* Flush the TLB (needed?) */
++	xorl	%eax, %eax
++	movl	%eax, %cr3
++
++	/* Do the copies */
++	cld
++0:	/* top, read another word for the indirection page */
++	movl    %ebx, %ecx
++	movl	(%ebx), %ecx
++	addl	$4, %ebx
++	testl	$0x1,   %ecx  /* is it a destination page */
++	jz	1f
++	movl	%ecx,	%edi
++	andl	$0xfffff000, %edi
++	jmp     0b
++1:
++	testl	$0x2,	%ecx  /* is it an indirection page */
++	jz	1f
++	movl	%ecx,	%ebx
++	andl	$0xfffff000, %ebx
++	jmp     0b
++1:
++	testl   $0x4,   %ecx /* is it the done indicator */
++	jz      1f
++	jmp     2f
++1:
++	testl   $0x8,   %ecx /* is it the source indicator */
++	jz      0b	     /* Ignore it otherwise */
++	movl    %ecx,   %esi /* For every source page do a copy */
++	andl    $0xfffff000, %esi
++
++	movl    $1024, %ecx
++	rep ; movsl
++	jmp     0b
++
++2:
++
++	/* To be certain of avoiding problems with self modifying code
++	 * I need to execute a serializing instruction here.
++	 * So I flush the TLB, it's handy, and not processor dependent.
++	 */
++	xorl	%eax, %eax
++	movl	%eax, %cr3
++	
++	/* set all of the registers to known values */
++	/* leave %esp alone */
++	
++	xorl	%eax, %eax
++	xorl	%ebx, %ebx
++	xorl    %ecx, %ecx
++	xorl    %edx, %edx
++	xorl    %esi, %esi
++	xorl    %edi, %edi
++	xorl    %ebp, %ebp
++	ret
++relocate_new_kernel_end:
++
++	.globl relocate_new_kernel_size
++relocate_new_kernel_size:	
++	.long relocate_new_kernel_end - relocate_new_kernel
+--- linux-2.6.0-test1/arch/i386/kernel/smp.c~kexec-2.6.0-full	2003-07-23 12:08:52.000000000 +0800
++++ linux-2.6.0-test1-root/arch/i386/kernel/smp.c	2003-07-23 12:53:45.000000000 +0800
+@@ -587,6 +587,30 @@ void stop_this_cpu (void * dummy)
+ 
+ void smp_send_stop(void)
+ {
++ 	extern int reboot_cpu;
++	int reboot_cpu_id;
++	
++ 	/* The boot cpu is always logical cpu 0 */
++	reboot_cpu_id = 0;
++
++	/* See if there has been give a command line override .
++	 */
++	if ((reboot_cpu != -1) && !(reboot_cpu >= NR_CPUS) && 
++		test_bit(reboot_cpu, &cpu_online_map)) {
++		reboot_cpu_id = reboot_cpu;
++	}
++	 
++	/* Make certain the the cpu I'm rebooting on is online */
++	if (!test_bit(reboot_cpu_id, &cpu_online_map)) {
++		reboot_cpu_id = smp_processor_id();
++	}
++
++	/* Make certain I only run on the appropriate processor */
++	set_cpus_allowed(current, cpumask_of_cpu(reboot_cpu_id));
++
++	/* O.k. Now that I'm on the appropriate processor stop
++	 * all of the others.
++	 */
+ 	smp_call_function(stop_this_cpu, NULL, 1, 0);
+ 
+ 	local_irq_disable();
+--- linux-2.6.0-test1/include/asm-i386/apic.h~kexec-2.6.0-full	2003-07-14 11:38:53.000000000 +0800
++++ linux-2.6.0-test1-root/include/asm-i386/apic.h	2003-07-23 12:08:54.000000000 +0800
+@@ -97,6 +97,9 @@ extern unsigned int nmi_watchdog;
+ #define NMI_LOCAL_APIC	2
+ #define NMI_INVALID	3
+ 
++extern void stop_apics(void);
++#else
++static inline void stop_apics(void) { }
+ #endif /* CONFIG_X86_LOCAL_APIC */
+ 
+ #endif /* __ASM_APIC_H */
+--- linux-2.6.0-test1/include/asm-i386/apicdef.h~kexec-2.6.0-full	2003-07-14 11:34:40.000000000 +0800
++++ linux-2.6.0-test1-root/include/asm-i386/apicdef.h	2003-07-23 12:08:54.000000000 +0800
+@@ -86,6 +86,7 @@
+ #define			APIC_LVT_REMOTE_IRR		(1<<14)
+ #define			APIC_INPUT_POLARITY		(1<<13)
+ #define			APIC_SEND_PENDING		(1<<12)
++#define			APIC_MODE_MASK			0x700
+ #define			GET_APIC_DELIVERY_MODE(x)	(((x)>>8)&0x7)
+ #define			SET_APIC_DELIVERY_MODE(x,y)	(((x)&~0x700)|((y)<<8))
+ #define				APIC_MODE_FIXED		0x0
+--- /dev/null	2002-08-31 07:31:37.000000000 +0800
++++ linux-2.6.0-test1-root/include/asm-i386/kexec.h	2003-07-23 12:08:54.000000000 +0800
+@@ -0,0 +1,23 @@
++#ifndef _I386_KEXEC_H
++#define _I386_KEXEC_H
++
++#include <asm/fixmap.h>
++
++/*
++ * KEXEC_SOURCE_MEMORY_LIMIT maximum page get_free_page can return.
++ * I.e. Maximum page that is mapped directly into kernel memory,
++ * and kmap is not required.
++ *
++ * Someone correct me if FIXADDR_START - PAGEOFFSET is not the correct
++ * calculation for the amount of memory directly mappable into the
++ * kernel memory space.
++ */
++
++/* Maximum physical address we can use pages from */
++#define KEXEC_SOURCE_MEMORY_LIMIT (-1UL)
++/* Maximum address we can reach in physical address mode */
++#define KEXEC_DESTINATION_MEMORY_LIMIT (-1UL)
++
++#define KEXEC_REBOOT_CODE_SIZE	4096
++
++#endif /* _I386_KEXEC_H */
+--- linux-2.6.0-test1/include/asm-i386/unistd.h~kexec-2.6.0-full	2003-07-23 12:08:42.000000000 +0800
++++ linux-2.6.0-test1-root/include/asm-i386/unistd.h	2003-07-23 12:08:54.000000000 +0800
+@@ -278,8 +278,9 @@
+ #define __NR_tgkill		270
+ #define __NR_utimes		271
+ #define __NR_mknod64		272
+-
+-#define NR_syscalls 273
++#define __NR_sys_kexec_load	273
++  
++#define NR_syscalls 274
+ 
+ /* user-visible error numbers are in the range -1 - -124: see <asm-i386/errno.h> */
+ 
+--- /dev/null	2002-08-31 07:31:37.000000000 +0800
++++ linux-2.6.0-test1-root/include/linux/kexec.h	2003-07-23 12:08:54.000000000 +0800
+@@ -0,0 +1,54 @@
++#ifndef LINUX_KEXEC_H
++#define LINUX_KEXEC_H
++
++#if CONFIG_KEXEC
++#include <linux/types.h>
++#include <linux/list.h>
++#include <asm/kexec.h>
++
++/* 
++ * This structure is used to hold the arguments that are used when loading
++ * kernel binaries.
++ */
++
++typedef unsigned long kimage_entry_t;
++#define IND_DESTINATION  0x1
++#define IND_INDIRECTION  0x2
++#define IND_DONE         0x4
++#define IND_SOURCE       0x8
++
++#define KEXEC_SEGMENT_MAX 8
++struct kexec_segment {
++	void *buf;
++	size_t bufsz;
++	void *mem;
++	size_t memsz;
++};
++
++struct kimage {
++	kimage_entry_t head;
++	kimage_entry_t *entry;
++	kimage_entry_t *last_entry;
++
++	unsigned long destination;
++	unsigned long offset;
++
++	unsigned long start;
++	struct page *reboot_code_pages;
++
++	unsigned long nr_segments;
++	struct kexec_segment segment[KEXEC_SEGMENT_MAX+1];
++
++	struct list_head dest_pages;
++	struct list_head unuseable_pages;
++};
++
++
++/* kexec interface functions */
++extern void machine_kexec(struct kimage *image);
++extern asmlinkage long sys_kexec(unsigned long entry, long nr_segments, 
++	struct kexec_segment *segments);
++extern struct kimage *kexec_image;
++#endif
++#endif /* LINUX_KEXEC_H */
++
+--- linux-2.6.0-test1/include/linux/reboot.h~kexec-2.6.0-full	2003-07-14 11:39:35.000000000 +0800
++++ linux-2.6.0-test1-root/include/linux/reboot.h	2003-07-23 12:08:54.000000000 +0800
+@@ -22,6 +22,7 @@
+  * POWER_OFF   Stop OS and remove all power from system, if possible.
+  * RESTART2    Restart system using given command string.
+  * SW_SUSPEND  Suspend system using Software Suspend if compiled in
++ * KEXEC       Restart the system using a different kernel.
+  */
+ 
+ #define	LINUX_REBOOT_CMD_RESTART	0x01234567
+@@ -31,6 +32,7 @@
+ #define	LINUX_REBOOT_CMD_POWER_OFF	0x4321FEDC
+ #define	LINUX_REBOOT_CMD_RESTART2	0xA1B2C3D4
+ #define	LINUX_REBOOT_CMD_SW_SUSPEND	0xD000FCE2
++#define LINUX_REBOOT_CMD_KEXEC		0x45584543
+ 
+ 
+ #ifdef __KERNEL__
+--- linux-2.6.0-test1/kernel/Makefile~kexec-2.6.0-full	2003-07-23 12:08:43.000000000 +0800
++++ linux-2.6.0-test1-root/kernel/Makefile	2003-07-23 12:08:54.000000000 +0800
+@@ -19,6 +19,7 @@ obj-$(CONFIG_PM) += pm.o
+ obj-$(CONFIG_CPU_FREQ) += cpufreq.o
+ obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
+ obj-$(CONFIG_SOFTWARE_SUSPEND) += suspend.o
++obj-$(CONFIG_KEXEC) += kexec.o
+ obj-$(CONFIG_COMPAT) += compat.o
+ 
+ ifneq ($(CONFIG_IA64),y)
+--- /dev/null	2002-08-31 07:31:37.000000000 +0800
++++ linux-2.6.0-test1-root/kernel/kexec.c	2003-07-23 12:08:54.000000000 +0800
+@@ -0,0 +1,629 @@
++#include <linux/mm.h>
++#include <linux/file.h>
++#include <linux/slab.h>
++#include <linux/fs.h>
++#include <linux/version.h>
++#include <linux/compile.h>
++#include <linux/kexec.h>
++#include <linux/spinlock.h>
++#include <linux/list.h>
++#include <linux/highmem.h>
++#include <net/checksum.h>
++#include <asm/page.h>
++#include <asm/uaccess.h>
++#include <asm/io.h>
++#include <asm/system.h>
++
++/* When kexec transitions to the new kernel there is a one to one
++ * mapping between physical and virtual addresses.  On processors
++ * where you can disable the MMU this is trivial, and easy.  For
++ * others it is still a simple predictable page table to setup.
++ *
++ * In that environment kexec copies the new kernel to it's final
++ * resting place.  This means I can only support memory whose
++ * physical address can fit in an unsigned long.  In particular
++ * addresses where (pfn << PAGE_SHIFT) > ULONG_MAX cannot be handled.
++ * If the assembly stub has more restrictive requirements
++ * KEXEC_SOURCE_MEMORY_LIMIT and KEXEC_DEST_MEMORY_LIMIT can be
++ * defined more restrictively in <asm/kexec.h>.
++ *
++ * The code for the transition from the current kernel to the 
++ * the new kernel is placed in the reboot_code_buffer, whose size
++ * is given by KEXEC_REBOOT_CODE_SIZE.  In the best case only a single
++ * page of memory is necessary, but some architectures require more.
++ * Because this memory must be identity mapped in the transition from
++ * virtual to physical addresses it must live in the range
++ * 0 - TASK_SIZE, as only the user space mappings are arbitrarily
++ * modifyable.
++ *
++ * The assembly stub in the reboot code buffer is passed a linked list
++ * of descriptor pages detailing the source pages of the new kernel,
++ * and the destination addresses of those source pages.  As this data
++ * structure is not used in the context of the current OS, it must
++ * be self contained.
++ *
++ * The code has been made to work with highmem pages and will use a
++ * destination page in it's final resting place (if it happens 
++ * to allocate it).  The end product of this is that most of the
++ * physical address space, and most of ram can be used.
++ *
++ * Future directions include:
++ *  - allocating a page table with the reboot code buffer identity
++ *    mapped, to simplify machine_kexec and make kexec_on_panic, more
++ *    reliable.  
++ *  - allocating the pages for a page table for machines that cannot
++ *    disable their MMUs.  (Hammer, Alpha...)
++ */
++
++/* KIMAGE_NO_DEST is an impossible destination address..., for
++ * allocating pages whose destination address we do not care about.
++ */
++#define KIMAGE_NO_DEST (-1UL)
++
++static int kimage_is_destination_range(
++	struct kimage *image, unsigned long start, unsigned long end);
++static struct page *kimage_alloc_reboot_code_pages(struct kimage *image);
++static struct page *kimage_alloc_page(struct kimage *image, unsigned int gfp_mask, unsigned long dest);
++
++
++static int kimage_alloc(struct kimage **rimage, 
++	unsigned long nr_segments, struct kexec_segment *segments)
++{
++	int result;
++	struct kimage *image;
++	size_t segment_bytes;
++	struct page *reboot_pages;
++	unsigned long i;
++
++	/* Allocate a controlling structure */
++	result = -ENOMEM;
++	image = kmalloc(sizeof(*image), GFP_KERNEL);
++	if (!image) {
++		goto out;
++	}
++	memset(image, 0, sizeof(*image));
++	image->head = 0;
++	image->entry = &image->head;
++	image->last_entry = &image->head;
++
++	/* Initialize the list of destination pages */
++	INIT_LIST_HEAD(&image->dest_pages);
++
++	/* Initialize the list of unuseable pages */
++	INIT_LIST_HEAD(&image->unuseable_pages);
++
++	/* Read in the segments */
++	image->nr_segments = nr_segments;
++	segment_bytes = nr_segments * sizeof*segments;
++	result = copy_from_user(image->segment, segments, segment_bytes);
++	if (result) 
++		goto out;
++
++	/* Verify we have good destination addresses.  The caller is
++	 * responsible for making certain we don't attempt to load
++	 * the new image into invalid or reserved areas of RAM.  This
++	 * just verifies it is an address we can use. 
++	 */
++	result = -EADDRNOTAVAIL;
++	for(i = 0; i < nr_segments; i++) {
++		unsigned long mend;
++		mend = ((unsigned long)(image->segment[i].mem)) + 
++			image->segment[i].memsz;
++		if (mend >= KEXEC_DESTINATION_MEMORY_LIMIT)
++			goto out;
++	}
++
++	/* Find a location for the reboot code buffer, and add it
++	 * the vector of segments so that it's pages will also be
++	 * counted as destination pages.  
++	 */
++	result = -ENOMEM;
++	reboot_pages = kimage_alloc_reboot_code_pages(image);
++	if (!reboot_pages) {
++		printk(KERN_ERR "Could not allocate reboot_code_buffer\n");
++		goto out;
++	}
++	image->reboot_code_pages = reboot_pages;
++	image->segment[nr_segments].buf = 0;
++	image->segment[nr_segments].bufsz = 0;
++	image->segment[nr_segments].mem = (void *)(page_to_pfn(reboot_pages) << PAGE_SHIFT);
++	image->segment[nr_segments].memsz = KEXEC_REBOOT_CODE_SIZE;
++	image->nr_segments++;
++
++	result = 0;
++ out:
++	if (result == 0) {
++		*rimage = image;
++	} else {
++		kfree(image);
++	}
++	return result;
++}
++
++static int kimage_is_destination_range(
++	struct kimage *image, unsigned long start, unsigned long end)
++{
++	unsigned long i;
++	for(i = 0; i < image->nr_segments; i++) {
++		unsigned long mstart, mend;
++		mstart = (unsigned long)image->segment[i].mem;
++		mend   = mstart + image->segment[i].memsz;
++		if ((end > mstart) && (start < mend)) {
++			return 1;
++		}
++	}
++	return 0;
++}
++
++#ifdef CONFIG_MMU
++static int identity_map_pages(struct page *pages, int order)
++{
++	struct mm_struct *mm;
++	struct vm_area_struct *vma;
++	int error;
++	mm = &init_mm;
++	vma = 0;
++
++	down_write(&mm->mmap_sem);
++	error = -ENOMEM;
++	vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
++	if (!vma) {
++		goto out;
++	}
++
++	memset(vma, 0, sizeof(vma));
++	vma->vm_mm = mm;
++	vma->vm_start = page_to_pfn(pages) << PAGE_SHIFT;
++	vma->vm_end = vma->vm_start + (1 << (order + PAGE_SHIFT));
++	vma->vm_ops = 0;
++	vma->vm_flags = VM_SHARED \
++		| VM_READ | VM_WRITE | VM_EXEC \
++		| VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC \
++		| VM_DONTCOPY | VM_RESERVED;
++	vma->vm_page_prot = protection_map[vma->vm_flags & 0xf];
++	vma->vm_file = NULL;
++	vma->vm_private_data = NULL;
++	INIT_LIST_HEAD(&vma->shared);
++	insert_vm_struct(mm, vma);
++	
++	error = remap_page_range(vma, vma->vm_start, vma->vm_start,
++		vma->vm_end - vma->vm_start, vma->vm_page_prot);
++	if (error) {
++		goto out;
++	}
++
++	error = 0;
++ out:
++	if (error && vma) {
++		kmem_cache_free(vm_area_cachep, vma);
++		vma = 0;
++	}
++	up_write(&mm->mmap_sem);
++
++	return error;
++}
++#else
++#define identity_map_pages(pages, order) 0
++#endif
++
++struct page *kimage_alloc_reboot_code_pages(struct kimage *image)
++{
++	/* The reboot code buffer is special.  It is the only set of
++	 * pages that must be allocated in their final resting place,
++	 * and the only set of pages whose final resting place we can
++	 * pick. 
++	 *
++	 * At worst this runs in O(N) of the image size.
++	 */
++	struct list_head extra_pages, *pos, *next;
++	struct page *pages;
++	unsigned long addr;
++	int order, count;
++	order = get_order(KEXEC_REBOOT_CODE_SIZE);
++	count = 1 << order;
++	INIT_LIST_HEAD(&extra_pages);
++	do {
++		int i;
++		pages = alloc_pages(GFP_HIGHUSER, order);
++		if (!pages)
++			break;
++		for(i = 0; i < count; i++) {
++			SetPageReserved(pages +i);
++		}
++		addr = page_to_pfn(pages) << PAGE_SHIFT;
++		if ((page_to_pfn(pages) >= (TASK_SIZE >> PAGE_SHIFT)) ||
++			kimage_is_destination_range(image, addr, addr + KEXEC_REBOOT_CODE_SIZE)) {
++			list_add(&pages->list, &extra_pages);
++			pages = 0;
++		}
++	} while(!pages);
++	if (pages) {
++		int result;
++		result = identity_map_pages(pages, order);
++		if (result < 0) {
++			list_add(&pages->list, &extra_pages);
++			pages = 0;
++		}
++	}
++	/* If I could convert a multi page allocation into a buch of
++	 * single page allocations I could add these pages to
++	 * image->dest_pages.  For now it is simpler to just free the
++	 * pages again.
++	 */
++	list_for_each_safe(pos, next, &extra_pages) {
++		struct page *page;
++		int i;
++		page = list_entry(pos, struct page, list);
++		for(i = 0; i < count; i++) {
++			ClearPageReserved(pages +i);
++		}
++		list_del(&extra_pages);
++		__free_pages(page, order);
++	}
++	return pages;
++}
++
++static int kimage_add_entry(struct kimage *image, kimage_entry_t entry)
++{
++	if (image->offset != 0) {
++		image->entry++;
++	}
++	if (image->entry == image->last_entry) {
++		kimage_entry_t *ind_page;
++		struct page *page;
++		page = kimage_alloc_page(image, GFP_KERNEL, KIMAGE_NO_DEST);
++		if (!page) {
++			return -ENOMEM;
++		}
++		ind_page = page_address(page);
++		*image->entry = virt_to_phys(ind_page) | IND_INDIRECTION;
++		image->entry = ind_page;
++		image->last_entry = 
++			ind_page + ((PAGE_SIZE/sizeof(kimage_entry_t)) - 1);
++	}
++	*image->entry = entry;
++	image->entry++;
++	image->offset = 0;
++	return 0;
++}
++
++static int kimage_set_destination(
++	struct kimage *image, unsigned long destination) 
++{
++	int result;
++	destination &= PAGE_MASK;
++	result = kimage_add_entry(image, destination | IND_DESTINATION);
++	if (result == 0) {
++		image->destination = destination;
++	}
++	return result;
++}
++
++
++static int kimage_add_page(struct kimage *image, unsigned long page)
++{
++	int result;
++	page &= PAGE_MASK;
++	result = kimage_add_entry(image, page | IND_SOURCE);
++	if (result == 0) {
++		image->destination += PAGE_SIZE;
++	}
++	return result;
++}
++
++
++static void kimage_free_extra_pages(struct kimage *image)
++{
++	/* Walk through and free any extra destination pages I may have */
++	struct list_head *pos, *next;
++	list_for_each_safe(pos, next, &image->dest_pages) {
++		struct page *page;
++		page = list_entry(pos, struct page, list);
++		list_del(&page->list);
++		ClearPageReserved(page);
++		__free_page(page);
++	}
++	/* Walk through and free any unuseable pages I have cached */
++	list_for_each_safe(pos, next, &image->unuseable_pages) {
++		struct page *page;
++		page = list_entry(pos, struct page, list);
++		list_del(&page->list);
++		ClearPageReserved(page);
++		__free_page(page);
++	}
++
++}
++static int kimage_terminate(struct kimage *image)
++{
++	int result;
++	result = kimage_add_entry(image, IND_DONE);
++	if (result == 0) {
++		/* Point at the terminating element */
++		image->entry--;
++		kimage_free_extra_pages(image);
++	}
++	return result;
++}
++
++#define for_each_kimage_entry(image, ptr, entry) \
++	for (ptr = &image->head; (entry = *ptr) && !(entry & IND_DONE); \
++		ptr = (entry & IND_INDIRECTION)? \
++			phys_to_virt((entry & PAGE_MASK)): ptr +1)
++
++static void kimage_free(struct kimage *image)
++{
++	kimage_entry_t *ptr, entry;
++	kimage_entry_t ind = 0;
++	int i, count, order;
++	if (!image)
++		return;
++	kimage_free_extra_pages(image);
++	for_each_kimage_entry(image, ptr, entry) {
++		if (entry & IND_INDIRECTION) {
++			/* Free the previous indirection page */
++			if (ind & IND_INDIRECTION) {
++				free_page((unsigned long)phys_to_virt(ind & PAGE_MASK));
++			}
++			/* Save this indirection page until we are
++			 * done with it.
++			 */
++			ind = entry;
++		}
++		else if (entry & IND_SOURCE) {
++			free_page((unsigned long)phys_to_virt(entry & PAGE_MASK));
++		}
++	}
++	order = get_order(KEXEC_REBOOT_CODE_SIZE);
++	count = 1 << order;
++	do_munmap(&init_mm, 
++		page_to_pfn(image->reboot_code_pages) << PAGE_SHIFT, 
++		count << PAGE_SHIFT);
++	for(i = 0; i < count; i++) {
++		ClearPageReserved(image->reboot_code_pages + i);
++	}
++	__free_pages(image->reboot_code_pages, order);
++	kfree(image);
++}
++
++static kimage_entry_t *kimage_dst_used(struct kimage *image, unsigned long page)
++{
++	kimage_entry_t *ptr, entry;
++	unsigned long destination = 0;
++	for_each_kimage_entry(image, ptr, entry) {
++		if (entry & IND_DESTINATION) {
++			destination = entry & PAGE_MASK;
++		}
++		else if (entry & IND_SOURCE) {
++			if (page == destination) {
++				return ptr;
++			}
++			destination += PAGE_SIZE;
++		}
++	}
++	return 0;
++}
++
++static struct page *kimage_alloc_page(struct kimage *image, unsigned int gfp_mask, unsigned long destination)
++{
++	/* Here we implment safe guards to ensure that a source page
++	 * is not copied to it's destination page before the data on
++	 * the destination page is no longer useful.
++	 *
++	 * To do this we maintain the invariant that a source page is
++	 * either it's own destination page, or it is not a
++	 * destination page at all.  
++	 *
++	 * That is slightly stronger than required, but the proof
++	 * that no problems will not occur is trivial, and the
++	 * implemenation is simply to verify.
++	 *
++	 * When allocating all pages normally this algorithm will run
++	 * in O(N) time, but in the worst case it will run in O(N^2)
++	 * time.   If the runtime is a problem the data structures can
++	 * be fixed.
++	 */
++	struct page *page;
++	unsigned long addr;
++
++	/* Walk through the list of destination pages, and see if I
++	 * have a match.
++	 */
++	list_for_each_entry(page, &image->dest_pages, list) {
++		addr = page_to_pfn(page) << PAGE_SHIFT;
++		if (addr == destination) {
++			list_del(&page->list);
++			return page;
++		}
++	}
++	page = 0;
++	while(1) {
++		kimage_entry_t *old;
++		/* Allocate a page, if we run out of memory give up */
++		page = alloc_page(gfp_mask);
++		if (!page) {
++			return 0;
++		}
++		SetPageReserved(page);
++		/* If the page cannot be used file it away */
++		if (page_to_pfn(page) > (KEXEC_SOURCE_MEMORY_LIMIT >> PAGE_SHIFT)) {
++			list_add(&page->list, &image->unuseable_pages);
++			continue;
++		}
++		addr = page_to_pfn(page) << PAGE_SHIFT;
++
++		/* If it is the destination page we want use it */
++		if (addr == destination)
++			break;
++
++		/* If the page is not a destination page use it */
++		if (!kimage_is_destination_range(image, addr, addr + PAGE_SIZE))
++			break;
++
++		/* I know that the page is someones destination page.
++		 * See if there is already a source page for this
++		 * destination page.  And if so swap the source pages.
++		 */
++		old = kimage_dst_used(image, addr);
++		if (old) {
++			/* If so move it */
++			unsigned long old_addr;
++			struct page *old_page;
++			
++			old_addr = *old & PAGE_MASK;
++			old_page = pfn_to_page(old_addr >> PAGE_SHIFT);
++			copy_highpage(page, old_page);
++			*old = addr | (*old & ~PAGE_MASK);
++
++			/* The old page I have found cannot be a
++			 * destination page, so return it.
++			 */
++			addr = old_addr;
++			page = old_page;
++			break;
++		}
++		else {
++			/* Place the page on the destination list I
++			 * will use it later.
++			 */
++			list_add(&page->list, &image->dest_pages);
++		}
++	}
++	return page;
++}
++
++static int kimage_load_segment(struct kimage *image,
++	struct kexec_segment *segment)
++{	
++	unsigned long mstart;
++	int result;
++	unsigned long offset;
++	unsigned long offset_end;
++	unsigned char *buf;
++
++	result = 0;
++	buf = segment->buf;
++	mstart = (unsigned long)segment->mem;
++
++	offset_end = segment->memsz;
++
++	result = kimage_set_destination(image, mstart);
++	if (result < 0) {
++		goto out;
++	}
++	for(offset = 0;  offset < segment->memsz; offset += PAGE_SIZE) {
++		struct page *page;
++		char *ptr;
++		size_t size, leader;
++		page = kimage_alloc_page(image, GFP_HIGHUSER, mstart + offset);
++		if (page == 0) {
++			result  = -ENOMEM;
++			goto out;
++		}
++		result = kimage_add_page(image, page_to_pfn(page) << PAGE_SHIFT);
++		if (result < 0) {
++			goto out;
++		}
++		ptr = kmap(page);
++		if (segment->bufsz < offset) {
++			/* We are past the end zero the whole page */
++			memset(ptr, 0, PAGE_SIZE);
++			kunmap(page);
++			continue;
++		}
++		size = PAGE_SIZE;
++		leader = 0;
++		if ((offset == 0)) {
++			leader = mstart & ~PAGE_MASK;
++		}
++		if (leader) {
++			/* We are on the first page zero the unused portion */
++			memset(ptr, 0, leader);
++			size -= leader;
++			ptr += leader;
++		}
++		if (size > (segment->bufsz - offset)) {
++			size = segment->bufsz - offset;
++		}
++		if (size < (PAGE_SIZE - leader)) {
++			/* zero the trailing part of the page */
++			memset(ptr + size, 0, (PAGE_SIZE - leader) - size);
++		}
++		result = copy_from_user(ptr, buf + offset, size);
++		kunmap(page);
++		if (result) {
++			result = (result < 0)?result : -EIO;
++			goto out;
++		}
++	}
++ out:
++	return result;
++}
++
++/*
++ * Exec Kernel system call: for obvious reasons only root may call it.
++ * 
++ * This call breaks up into three pieces.  
++ * - A generic part which loads the new kernel from the current
++ *   address space, and very carefully places the data in the
++ *   allocated pages.
++ *
++ * - A generic part that interacts with the kernel and tells all of
++ *   the devices to shut down.  Preventing on-going dmas, and placing
++ *   the devices in a consistent state so a later kernel can
++ *   reinitialize them.
++ *
++ * - A machine specific part that includes the syscall number
++ *   and the copies the image to it's final destination.  And
++ *   jumps into the image at entry.
++ *
++ * kexec does not sync, or unmount filesystems so if you need
++ * that to happen you need to do that yourself.
++ */
++struct kimage *kexec_image = 0;
++
++asmlinkage long sys_kexec_load(unsigned long entry, unsigned long nr_segments, 
++	struct kexec_segment *segments, unsigned long flags)
++{
++	struct kimage *image;
++	int result;
++		
++	/* We only trust the superuser with rebooting the system. */
++	if (!capable(CAP_SYS_ADMIN))
++		return -EPERM;
++
++	/* In case we need just a little bit of special behavior for
++	 * reboot on panic 
++	 */
++	if (flags != 0)
++		return -EINVAL;
++
++	if (nr_segments > KEXEC_SEGMENT_MAX)
++		return -EINVAL;
++	image = 0;
++
++	result = 0;
++	if (nr_segments > 0) {
++		unsigned long i;
++		result = kimage_alloc(&image, nr_segments, segments);
++		if (result) {
++			goto out;
++		}
++		image->start = entry;
++		for(i = 0; i < nr_segments; i++) {
++			result = kimage_load_segment(image, &segments[i]);
++			if (result) {
++				goto out;
++			}
++		}
++		result = kimage_terminate(image);
++		if (result) {
++			goto out;
++		}
++	}
++
++	image = xchg(&kexec_image, image);
++
++ out:
++	kimage_free(image);
++	return result;
++}
+--- linux-2.6.0-test1/kernel/sys.c~kexec-2.6.0-full	2003-07-23 12:08:43.000000000 +0800
++++ linux-2.6.0-test1-root/kernel/sys.c	2003-07-23 12:08:54.000000000 +0800
+@@ -17,6 +17,7 @@
+ #include <linux/init.h>
+ #include <linux/highuid.h>
+ #include <linux/fs.h>
++#include <linux/kexec.h>
+ #include <linux/workqueue.h>
+ #include <linux/device.h>
+ #include <linux/times.h>
+@@ -208,6 +209,7 @@ cond_syscall(sys_acct)
+ cond_syscall(sys_lookup_dcookie)
+ cond_syscall(sys_swapon)
+ cond_syscall(sys_swapoff)
++cond_syscall(sys_kexec_load)
+ cond_syscall(sys_init_module)
+ cond_syscall(sys_delete_module)
+ cond_syscall(sys_socketpair)
+@@ -454,6 +456,27 @@ asmlinkage long sys_reboot(int magic1, i
+ 		machine_restart(buffer);
+ 		break;
+ 
++#ifdef CONFIG_KEXEC
++	case LINUX_REBOOT_CMD_KEXEC:
++	{
++		struct kimage *image;
++		if (arg) {
++			unlock_kernel();
++			return -EINVAL;
++		}
++		image = xchg(&kexec_image, 0);
++		if (!image) {
++			unlock_kernel();
++			return -EINVAL;
++		}
++		notifier_call_chain(&reboot_notifier_list, SYS_RESTART, NULL);
++		system_running = 0;
++		device_shutdown();
++		printk(KERN_EMERG "Starting new kernel\n");
++		machine_kexec(image);
++		break;
++	}
++#endif
+ #ifdef CONFIG_SOFTWARE_SUSPEND
+ 	case LINUX_REBOOT_CMD_SW_SUSPEND:
+ 		if (!software_suspend_enabled) {
+
+_
diff --git a/lustre/kernel_patches/patches/kexec-2.6.0-test6-full.patch b/lustre/kernel_patches/patches/kexec-2.6.0-test6-full.patch
new file mode 100644
index 0000000..ea09f12
--- /dev/null
+++ b/lustre/kernel_patches/patches/kexec-2.6.0-test6-full.patch
@@ -0,0 +1,1481 @@
+ 0 files changed
+
+Index: linux-2.6.0-test6/MAINTAINERS
+===================================================================
+--- linux-2.6.0-test6.orig/MAINTAINERS	2003-10-07 16:08:42.000000000 +0800
++++ linux-2.6.0-test6/MAINTAINERS	2003-10-07 16:09:00.000000000 +0800
+@@ -1174,6 +1174,17 @@
+ W:	http://www.cse.unsw.edu.au/~neilb/patches/linux-devel/
+ S:	Maintained
+ 
++KEXEC
++P:	Eric Biederman
++M:	ebiederm@xmission.com
++M:	ebiederman@lnxi.com
++W:	http://www.xmission.com/~ebiederm/files/kexec/
++P:	Andy Pfiffer
++M:	andyp@osdl.org
++W:	http://www.osdl.org/archive/andyp/bloom/Code/Linux/Kexec/
++L:	linux-kernel@vger.kernel.org
++S:	Maintained
++
+ LANMEDIA WAN CARD DRIVER
+ P:	Andrew Stanley-Jones
+ M:	asj@lanmedia.com
+Index: linux-2.6.0-test6/arch/i386/Kconfig
+===================================================================
+--- linux-2.6.0-test6.orig/arch/i386/Kconfig	2003-10-07 16:08:59.000000000 +0800
++++ linux-2.6.0-test6/arch/i386/Kconfig	2003-10-07 16:09:00.000000000 +0800
+@@ -845,6 +845,23 @@
+ # depends on (((X86_SUMMIT || X86_GENERICARCH) && NUMA)) || X86_GENERICARCH
+ 	default y
+ 
++config KEXEC
++	bool "kexec system call (EXPERIMENTAL)"
++	depends on EXPERIMENTAL
++	help
++	  kexec is a system call that implements the ability to  shutdown your
++	  current kernel, and to start another kernel.  It is like a reboot
++	  but it is indepedent of the system firmware.   And like a reboot
++	  you can start any kernel with it not just Linux.  
++	
++	  The name comes from the similiarity to the exec system call. 
++	
++	  It is on an going process to be certain the hardware in a machine
++	  is properly shutdown, so do not be surprised if this code does not
++	  initially work for you.  It may help to enable device hotplugging
++	  support.  As of this writing the exact hardware interface is
++	  strongly in flux, so no good recommendation can be made.
++
+ endmenu
+ 
+ 
+Index: linux-2.6.0-test6/arch/i386/defconfig
+===================================================================
+--- linux-2.6.0-test6.orig/arch/i386/defconfig	2003-10-07 15:47:25.000000000 +0800
++++ linux-2.6.0-test6/arch/i386/defconfig	2003-10-07 16:09:00.000000000 +0800
+@@ -82,6 +82,7 @@
+ # CONFIG_HUGETLB_PAGE is not set
+ CONFIG_SMP=y
+ CONFIG_NR_CPUS=8
++CONFIG_KEXEC=y
+ CONFIG_PREEMPT=y
+ CONFIG_X86_LOCAL_APIC=y
+ CONFIG_X86_IO_APIC=y
+Index: linux-2.6.0-test6/arch/i386/kernel/Makefile
+===================================================================
+--- linux-2.6.0-test6.orig/arch/i386/kernel/Makefile	2003-10-07 16:08:34.000000000 +0800
++++ linux-2.6.0-test6/arch/i386/kernel/Makefile	2003-10-07 16:09:00.000000000 +0800
+@@ -24,6 +24,7 @@
+ obj-$(CONFIG_X86_MPPARSE)	+= mpparse.o
+ obj-$(CONFIG_X86_LOCAL_APIC)	+= apic.o nmi.o
+ obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o
++obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o
+ obj-$(CONFIG_X86_NUMAQ)		+= numaq.o
+ obj-$(CONFIG_X86_SUMMIT)	+= summit.o
+ obj-$(CONFIG_EDD)             	+= edd.o
+Index: linux-2.6.0-test6/arch/i386/kernel/apic.c
+===================================================================
+--- linux-2.6.0-test6.orig/arch/i386/kernel/apic.c	2003-10-07 15:47:25.000000000 +0800
++++ linux-2.6.0-test6/arch/i386/kernel/apic.c	2003-10-07 16:09:01.000000000 +0800
+@@ -26,6 +26,7 @@
+ #include <linux/mc146818rtc.h>
+ #include <linux/kernel_stat.h>
+ #include <linux/sysdev.h>
++#include <linux/reboot.h>
+ 
+ #include <asm/atomic.h>
+ #include <asm/smp.h>
+@@ -183,6 +184,39 @@
+ 		outb(0x70, 0x22);
+ 		outb(0x00, 0x23);
+ 	}
++#ifdef 	CONFIG_KEXEC
++	else {
++		/* Go back to Virtual Wire compatibility mode */
++		unsigned long value;
++
++		/* For the spurious interrupt use vector F, and enable it */
++		value = apic_read(APIC_SPIV);
++		value &= ~APIC_VECTOR_MASK; 
++		value |= APIC_SPIV_APIC_ENABLED;
++		value |= 0xf;
++		apic_write_around(APIC_SPIV, value);
++
++		/* For LVT0 make it edge triggered, active high, external and enabled */
++		value = apic_read(APIC_LVT0);
++		value &= ~(APIC_MODE_MASK | APIC_SEND_PENDING | 
++			APIC_INPUT_POLARITY | APIC_LVT_REMOTE_IRR | 
++			APIC_LVT_LEVEL_TRIGGER | APIC_LVT_MASKED );
++		value |= APIC_LVT_REMOTE_IRR | APIC_SEND_PENDING;
++		value = SET_APIC_DELIVERY_MODE(value, APIC_MODE_EXINT);
++		apic_write_around(APIC_LVT0, value);
++		
++		/* For LVT1 make it edge triggered, active high, nmi and enabled */
++		value = apic_read(APIC_LVT1);
++		value &= ~(
++			APIC_MODE_MASK | APIC_SEND_PENDING | 
++			APIC_INPUT_POLARITY | APIC_LVT_REMOTE_IRR | 
++			APIC_LVT_LEVEL_TRIGGER | APIC_LVT_MASKED);
++		value |= APIC_LVT_REMOTE_IRR | APIC_SEND_PENDING;
++		value = SET_APIC_DELIVERY_MODE(value, APIC_MODE_NMI);
++		apic_write_around(APIC_LVT1, value);
++	}
++#endif	/* CONFIG_KEXEC */
++
+ }
+ 
+ void disable_local_APIC(void)
+@@ -1147,6 +1181,26 @@
+ 	irq_exit();
+ }
+ 
++void stop_apics(void)
++{
++	/* By resetting the APIC's we disable the nmi watchdog */
++#if CONFIG_SMP
++	/*
++	 * Stop all CPUs and turn off local APICs and the IO-APIC, so
++	 * other OSs see a clean IRQ state.
++	 */
++	smp_send_stop();
++#else
++	disable_local_APIC();
++#endif
++#if defined(CONFIG_X86_IO_APIC)
++	if (smp_found_config) {
++		disable_IO_APIC();
++	}
++#endif
++	disconnect_bsp_APIC();
++}
++
+ /*
+  * This initializes the IO-APIC and APIC hardware if this is
+  * a UP kernel.
+Index: linux-2.6.0-test6/arch/i386/kernel/dmi_scan.c
+===================================================================
+--- linux-2.6.0-test6.orig/arch/i386/kernel/dmi_scan.c	2003-10-07 16:08:34.000000000 +0800
++++ linux-2.6.0-test6/arch/i386/kernel/dmi_scan.c	2003-10-07 16:09:01.000000000 +0800
+@@ -222,31 +222,6 @@
+ 	return 0;
+ }
+ 
+-/*
+- * Some machines require the "reboot=s"  commandline option, this quirk makes that automatic.
+- */
+-static __init int set_smp_reboot(struct dmi_blacklist *d)
+-{
+-#ifdef CONFIG_SMP
+-	extern int reboot_smp;
+-	if (reboot_smp == 0)
+-	{
+-		reboot_smp = 1;
+-		printk(KERN_INFO "%s series board detected. Selecting SMP-method for reboots.\n", d->ident);
+-	}
+-#endif
+-	return 0;
+-}
+-
+-/*
+- * Some machines require the "reboot=b,s"  commandline option, this quirk makes that automatic.
+- */
+-static __init int set_smp_bios_reboot(struct dmi_blacklist *d)
+-{
+-	set_smp_reboot(d);
+-	set_bios_reboot(d);
+-	return 0;
+-}
+ 
+ /*
+  * Some bioses have a broken protected mode poweroff and need to use realmode
+@@ -581,7 +556,7 @@
+ 			MATCH(DMI_BIOS_VERSION, "4.60 PGMA"),
+ 			MATCH(DMI_BIOS_DATE, "134526184"), NO_MATCH
+ 			} },
+-	{ set_smp_bios_reboot, "Dell PowerEdge 1300", {	/* Handle problems with rebooting on Dell 1300's */
++	{ set_bios_reboot, "Dell PowerEdge 1300", {	/* Handle problems with rebooting on Dell 1300's */
+ 			MATCH(DMI_SYS_VENDOR, "Dell Computer Corporation"),
+ 			MATCH(DMI_PRODUCT_NAME, "PowerEdge 1300/"),
+ 			NO_MATCH, NO_MATCH
+Index: linux-2.6.0-test6/arch/i386/kernel/entry.S
+===================================================================
+--- linux-2.6.0-test6.orig/arch/i386/kernel/entry.S	2003-10-07 16:08:34.000000000 +0800
++++ linux-2.6.0-test6/arch/i386/kernel/entry.S	2003-10-07 16:09:01.000000000 +0800
+@@ -1046,6 +1046,7 @@
+ 	.long sys_utimes
+  	.long sys_fadvise64_64
+ 	.long sys_ni_syscall	/* sys_vserver */
++        .long sys_kexec_load
+ 
+ nr_syscalls=(.-sys_call_table)/4
+ 
+Index: linux-2.6.0-test6/arch/i386/kernel/i8259.c
+===================================================================
+--- linux-2.6.0-test6.orig/arch/i386/kernel/i8259.c	2003-10-07 16:08:34.000000000 +0800
++++ linux-2.6.0-test6/arch/i386/kernel/i8259.c	2003-10-07 16:09:01.000000000 +0800
+@@ -244,9 +244,21 @@
+ 	return 0;
+ }
+ 
++static int i8259A_shutdown(struct sys_device *dev)
++{
++	/* Put the i8259A into a quiescent state that
++	 * the kernel initialization code can get it
++	 * out of.
++	 */
++	outb(0xff, 0x21);	/* mask all of 8259A-1 */
++	outb(0xff, 0xA1);	/* mask all of 8259A-1 */
++	return 0;
++}
++
+ static struct sysdev_class i8259_sysdev_class = {
+ 	set_kset_name("i8259"),
+ 	.resume = i8259A_resume,
++	.shutdown = i8259A_shutdown,
+ };
+ 
+ static struct sys_device device_i8259A = {
+Index: linux-2.6.0-test6/arch/i386/kernel/io_apic.c
+===================================================================
+--- linux-2.6.0-test6.orig/arch/i386/kernel/io_apic.c	2003-10-07 16:08:34.000000000 +0800
++++ linux-2.6.0-test6/arch/i386/kernel/io_apic.c	2003-10-07 16:09:01.000000000 +0800
+@@ -1629,8 +1629,6 @@
+ 	 * Clear the IO-APIC before rebooting:
+ 	 */
+ 	clear_IO_APIC();
+-
+-	disconnect_bsp_APIC();
+ }
+ 
+ /*
+Index: linux-2.6.0-test6/arch/i386/kernel/machine_kexec.c
+===================================================================
+--- linux-2.6.0-test6.orig/arch/i386/kernel/machine_kexec.c	2003-10-07 16:09:00.000000000 +0800
++++ linux-2.6.0-test6/arch/i386/kernel/machine_kexec.c	2003-10-07 16:09:01.000000000 +0800
+@@ -0,0 +1,116 @@
++#include <linux/config.h>
++#include <linux/mm.h>
++#include <linux/kexec.h>
++#include <linux/delay.h>
++#include <asm/pgtable.h>
++#include <asm/pgalloc.h>
++#include <asm/tlbflush.h>
++#include <asm/mmu_context.h>
++#include <asm/io.h>
++#include <asm/apic.h>
++
++
++/*
++ * machine_kexec
++ * =======================
++ */
++
++
++static void set_idt(void *newidt, __u16 limit)
++{
++	unsigned char curidt[6];
++
++	/* ia32 supports unaliged loads & stores */
++	(*(__u16 *)(curidt)) = limit;
++	(*(__u32 *)(curidt +2)) = (unsigned long)(newidt);
++
++	__asm__ __volatile__ (
++		"lidt %0\n" 
++		: "=m" (curidt)
++		);
++};
++
++
++static void set_gdt(void *newgdt, __u16 limit)
++{
++	unsigned char curgdt[6];
++
++	/* ia32 supports unaliged loads & stores */
++	(*(__u16 *)(curgdt)) = limit;
++	(*(__u32 *)(curgdt +2)) = (unsigned long)(newgdt);
++
++	__asm__ __volatile__ (
++		"lgdt %0\n" 
++		: "=m" (curgdt)
++		);
++};
++
++static void load_segments(void)
++{
++#define __STR(X) #X
++#define STR(X) __STR(X)
++
++	__asm__ __volatile__ (
++		"\tljmp $"STR(__KERNEL_CS)",$1f\n"
++		"\t1:\n"
++		"\tmovl $"STR(__KERNEL_DS)",%eax\n"
++		"\tmovl %eax,%ds\n"
++		"\tmovl %eax,%es\n"
++		"\tmovl %eax,%fs\n"
++		"\tmovl %eax,%gs\n"
++		"\tmovl %eax,%ss\n"
++		);
++#undef STR
++#undef __STR
++}
++
++typedef void (*relocate_new_kernel_t)(
++	unsigned long indirection_page, unsigned long reboot_code_buffer,
++	unsigned long start_address);
++
++const extern unsigned char relocate_new_kernel[];
++extern void relocate_new_kernel_end(void);
++const extern unsigned int relocate_new_kernel_size;
++extern void use_mm(struct mm_struct *mm);
++
++void machine_kexec(struct kimage *image)
++{
++	unsigned long indirection_page;
++	unsigned long reboot_code_buffer;
++	relocate_new_kernel_t rnk;
++
++	/* switch to an mm where the reboot_code_buffer is identity mapped */
++	use_mm(&init_mm);
++	stop_apics();
++
++	/* Interrupts aren't acceptable while we reboot */
++	local_irq_disable();
++	reboot_code_buffer = page_to_pfn(image->reboot_code_pages) << PAGE_SHIFT;
++	indirection_page = image->head & PAGE_MASK;
++
++	/* copy it out */
++	memcpy((void *)reboot_code_buffer, relocate_new_kernel, relocate_new_kernel_size);
++
++	/* The segment registers are funny things, they are
++	 * automatically loaded from a table, in memory wherever you
++	 * set them to a specific selector, but this table is never
++	 * accessed again you set the segment to a different selector.
++	 *
++	 * The more common model is are caches where the behide
++	 * the scenes work is done, but is also dropped at arbitrary
++	 * times.
++	 *
++	 * I take advantage of this here by force loading the
++	 * segments, before I zap the gdt with an invalid value.
++	 */
++	load_segments();
++	/* The gdt & idt are now invalid.
++	 * If you want to load them you must set up your own idt & gdt.
++	 */
++	set_gdt(phys_to_virt(0),0);
++	set_idt(phys_to_virt(0),0);
++
++	/* now call it */
++	rnk = (relocate_new_kernel_t) reboot_code_buffer;
++	(*rnk)(indirection_page, reboot_code_buffer, image->start);
++}
+Index: linux-2.6.0-test6/arch/i386/kernel/reboot.c
+===================================================================
+--- linux-2.6.0-test6.orig/arch/i386/kernel/reboot.c	2003-10-07 16:08:34.000000000 +0800
++++ linux-2.6.0-test6/arch/i386/kernel/reboot.c	2003-10-07 16:09:01.000000000 +0800
+@@ -21,8 +21,7 @@
+ int reboot_thru_bios;
+ 
+ #ifdef CONFIG_SMP
+-int reboot_smp = 0;
+-static int reboot_cpu = -1;
++int reboot_cpu = -1;	  /* specifies the internal linux cpu id, not the apicid */
+ /* shamelessly grabbed from lib/vsprintf.c for readability */
+ #define is_digit(c)	((c) >= '0' && (c) <= '9')
+ #endif
+@@ -44,7 +43,6 @@
+ 			break;
+ #ifdef CONFIG_SMP
+ 		case 's': /* "smp" reboot by executing reset on BSP or other CPU*/
+-			reboot_smp = 1;
+ 			if (is_digit(*(str+1))) {
+ 				reboot_cpu = (int) (*(str+1) - '0');
+ 				if (is_digit(*(str+2))) 
+@@ -217,51 +215,7 @@
+ 
+ void machine_restart(char * __unused)
+ {
+-#ifdef CONFIG_SMP
+-	int cpuid;
+-	
+-	cpuid = GET_APIC_ID(apic_read(APIC_ID));
+-
+-	if (reboot_smp) {
+-
+-		/* check to see if reboot_cpu is valid 
+-		   if its not, default to the BSP */
+-		if ((reboot_cpu == -1) ||  
+-		      (reboot_cpu > (NR_CPUS -1))  || 
+-		      !physid_isset(cpuid, phys_cpu_present_map))
+-			reboot_cpu = boot_cpu_physical_apicid;
+-
+-		reboot_smp = 0;  /* use this as a flag to only go through this once*/
+-		/* re-run this function on the other CPUs
+-		   it will fall though this section since we have 
+-		   cleared reboot_smp, and do the reboot if it is the
+-		   correct CPU, otherwise it halts. */
+-		if (reboot_cpu != cpuid)
+-			smp_call_function((void *)machine_restart , NULL, 1, 0);
+-	}
+-
+-	/* if reboot_cpu is still -1, then we want a tradional reboot, 
+-	   and if we are not running on the reboot_cpu,, halt */
+-	if ((reboot_cpu != -1) && (cpuid != reboot_cpu)) {
+-		for (;;)
+-		__asm__ __volatile__ ("hlt");
+-	}
+-	/*
+-	 * Stop all CPUs and turn off local APICs and the IO-APIC, so
+-	 * other OSs see a clean IRQ state.
+-	 */
+-	smp_send_stop();
+-#elif defined(CONFIG_X86_LOCAL_APIC)
+-	if (cpu_has_apic) {
+-		local_irq_disable();
+-		disable_local_APIC();
+-		local_irq_enable();
+-	}
+-#endif
+-#ifdef CONFIG_X86_IO_APIC
+-	disable_IO_APIC();
+-#endif
+-
++        stop_apics();
+ 	if (!reboot_thru_bios) {
+ 		if (efi_enabled) {
+ 			efi.reset_system(EFI_RESET_COLD, EFI_SUCCESS, 0, 0);
+@@ -284,11 +238,13 @@
+ }
+ 
+ void machine_halt(void)
+-{
++{ 
++ 	stop_apics();
+ }
+ 
+ void machine_power_off(void)
+ {
++ 	stop_apics();
+ 	if (efi_enabled)
+ 		efi.reset_system(EFI_RESET_SHUTDOWN, EFI_SUCCESS, 0, 0);
+ 	if (pm_power_off)
+Index: linux-2.6.0-test6/arch/i386/kernel/relocate_kernel.S
+===================================================================
+--- linux-2.6.0-test6.orig/arch/i386/kernel/relocate_kernel.S	2003-10-07 16:09:00.000000000 +0800
++++ linux-2.6.0-test6/arch/i386/kernel/relocate_kernel.S	2003-10-07 16:09:01.000000000 +0800
+@@ -0,0 +1,107 @@
++#include <linux/config.h>
++#include <linux/linkage.h>
++
++	/* Must be relocatable PIC code callable as a C function, that once
++	 * it starts can not use the previous processes stack.
++	 *
++	 */
++	.globl relocate_new_kernel
++relocate_new_kernel:
++	/* read the arguments and say goodbye to the stack */
++	movl  4(%esp), %ebx /* indirection_page */
++	movl  8(%esp), %ebp /* reboot_code_buffer */
++	movl  12(%esp), %edx /* start address */
++
++	/* zero out flags, and disable interrupts */
++	pushl $0
++	popfl
++
++	/* set a new stack at the bottom of our page... */
++	lea   4096(%ebp), %esp
++
++	/* store the parameters back on the stack */
++	pushl   %edx /* store the start address */
++
++	/* Set cr0 to a known state:
++	 * 31 0 == Paging disabled
++	 * 18 0 == Alignment check disabled
++	 * 16 0 == Write protect disabled
++	 * 3  0 == No task switch
++	 * 2  0 == Don't do FP software emulation.
++	 * 0  1 == Proctected mode enabled
++	 */
++	movl	%cr0, %eax
++	andl	$~((1<<31)|(1<<18)|(1<<16)|(1<<3)|(1<<2)), %eax
++	orl	$(1<<0), %eax
++	movl	%eax, %cr0
++	
++	/* Set cr4 to a known state:
++	 * Setting everything to zero seems safe.
++	 */
++	movl	%cr4, %eax
++	andl	$0, %eax
++	movl	%eax, %cr4
++	
++	jmp 1f
++1:	
++
++	/* Flush the TLB (needed?) */
++	xorl	%eax, %eax
++	movl	%eax, %cr3
++
++	/* Do the copies */
++	cld
++0:	/* top, read another word for the indirection page */
++	movl    %ebx, %ecx
++	movl	(%ebx), %ecx
++	addl	$4, %ebx
++	testl	$0x1,   %ecx  /* is it a destination page */
++	jz	1f
++	movl	%ecx,	%edi
++	andl	$0xfffff000, %edi
++	jmp     0b
++1:
++	testl	$0x2,	%ecx  /* is it an indirection page */
++	jz	1f
++	movl	%ecx,	%ebx
++	andl	$0xfffff000, %ebx
++	jmp     0b
++1:
++	testl   $0x4,   %ecx /* is it the done indicator */
++	jz      1f
++	jmp     2f
++1:
++	testl   $0x8,   %ecx /* is it the source indicator */
++	jz      0b	     /* Ignore it otherwise */
++	movl    %ecx,   %esi /* For every source page do a copy */
++	andl    $0xfffff000, %esi
++
++	movl    $1024, %ecx
++	rep ; movsl
++	jmp     0b
++
++2:
++
++	/* To be certain of avoiding problems with self modifying code
++	 * I need to execute a serializing instruction here.
++	 * So I flush the TLB, it's handy, and not processor dependent.
++	 */
++	xorl	%eax, %eax
++	movl	%eax, %cr3
++	
++	/* set all of the registers to known values */
++	/* leave %esp alone */
++	
++	xorl	%eax, %eax
++	xorl	%ebx, %ebx
++	xorl    %ecx, %ecx
++	xorl    %edx, %edx
++	xorl    %esi, %esi
++	xorl    %edi, %edi
++	xorl    %ebp, %ebp
++	ret
++relocate_new_kernel_end:
++
++	.globl relocate_new_kernel_size
++relocate_new_kernel_size:	
++	.long relocate_new_kernel_end - relocate_new_kernel
+Index: linux-2.6.0-test6/arch/i386/kernel/smp.c
+===================================================================
+--- linux-2.6.0-test6.orig/arch/i386/kernel/smp.c	2003-10-07 16:08:59.000000000 +0800
++++ linux-2.6.0-test6/arch/i386/kernel/smp.c	2003-10-07 16:09:01.000000000 +0800
+@@ -577,6 +577,30 @@
+ 
+ void smp_send_stop(void)
+ {
++ 	extern int reboot_cpu;
++	int reboot_cpu_id;
++	
++ 	/* The boot cpu is always logical cpu 0 */
++	reboot_cpu_id = 0;
++
++	/* See if there has been give a command line override .
++	 */
++	if ((reboot_cpu != -1) && !(reboot_cpu >= NR_CPUS) && 
++		test_bit(reboot_cpu, &cpu_online_map)) {
++		reboot_cpu_id = reboot_cpu;
++	}
++	 
++	/* Make certain the the cpu I'm rebooting on is online */
++	if (!test_bit(reboot_cpu_id, &cpu_online_map)) {
++		reboot_cpu_id = smp_processor_id();
++	}
++
++	/* Make certain I only run on the appropriate processor */
++	set_cpus_allowed(current, cpumask_of_cpu(reboot_cpu_id));
++
++	/* O.k. Now that I'm on the appropriate processor stop
++	 * all of the others.
++	 */
+ 	smp_call_function(stop_this_cpu, NULL, 1, 0);
+ 
+ 	local_irq_disable();
+Index: linux-2.6.0-test6/include/asm-i386/apic.h
+===================================================================
+--- linux-2.6.0-test6.orig/include/asm-i386/apic.h	2003-10-07 15:47:25.000000000 +0800
++++ linux-2.6.0-test6/include/asm-i386/apic.h	2003-10-07 16:09:01.000000000 +0800
+@@ -99,6 +99,9 @@
+ #define NMI_LOCAL_APIC	2
+ #define NMI_INVALID	3
+ 
++extern void stop_apics(void);
++#else
++static inline void stop_apics(void) { }
+ #endif /* CONFIG_X86_LOCAL_APIC */
+ 
+ #endif /* __ASM_APIC_H */
+Index: linux-2.6.0-test6/include/asm-i386/apicdef.h
+===================================================================
+--- linux-2.6.0-test6.orig/include/asm-i386/apicdef.h	2003-10-07 15:47:25.000000000 +0800
++++ linux-2.6.0-test6/include/asm-i386/apicdef.h	2003-10-07 16:09:01.000000000 +0800
+@@ -86,6 +86,7 @@
+ #define			APIC_LVT_REMOTE_IRR		(1<<14)
+ #define			APIC_INPUT_POLARITY		(1<<13)
+ #define			APIC_SEND_PENDING		(1<<12)
++#define			APIC_MODE_MASK			0x700
+ #define			GET_APIC_DELIVERY_MODE(x)	(((x)>>8)&0x7)
+ #define			SET_APIC_DELIVERY_MODE(x,y)	(((x)&~0x700)|((y)<<8))
+ #define				APIC_MODE_FIXED		0x0
+Index: linux-2.6.0-test6/include/asm-i386/kexec.h
+===================================================================
+--- linux-2.6.0-test6.orig/include/asm-i386/kexec.h	2003-10-07 16:09:00.000000000 +0800
++++ linux-2.6.0-test6/include/asm-i386/kexec.h	2003-10-07 16:09:01.000000000 +0800
+@@ -0,0 +1,23 @@
++#ifndef _I386_KEXEC_H
++#define _I386_KEXEC_H
++
++#include <asm/fixmap.h>
++
++/*
++ * KEXEC_SOURCE_MEMORY_LIMIT maximum page get_free_page can return.
++ * I.e. Maximum page that is mapped directly into kernel memory,
++ * and kmap is not required.
++ *
++ * Someone correct me if FIXADDR_START - PAGEOFFSET is not the correct
++ * calculation for the amount of memory directly mappable into the
++ * kernel memory space.
++ */
++
++/* Maximum physical address we can use pages from */
++#define KEXEC_SOURCE_MEMORY_LIMIT (-1UL)
++/* Maximum address we can reach in physical address mode */
++#define KEXEC_DESTINATION_MEMORY_LIMIT (-1UL)
++
++#define KEXEC_REBOOT_CODE_SIZE	4096
++
++#endif /* _I386_KEXEC_H */
+Index: linux-2.6.0-test6/include/asm-i386/unistd.h
+===================================================================
+--- linux-2.6.0-test6.orig/include/asm-i386/unistd.h	2003-10-07 16:08:41.000000000 +0800
++++ linux-2.6.0-test6/include/asm-i386/unistd.h	2003-10-07 16:09:01.000000000 +0800
+@@ -279,8 +279,9 @@
+ #define __NR_utimes		271
+ #define __NR_fadvise64_64	272
+ #define __NR_vserver		273
+-
+-#define NR_syscalls 274
++#define __NR_sys_kexec_load	274
++    
++#define NR_syscalls 275
+ 
+ /* user-visible error numbers are in the range -1 - -124: see <asm-i386/errno.h> */
+ 
+Index: linux-2.6.0-test6/include/linux/kexec.h
+===================================================================
+--- linux-2.6.0-test6.orig/include/linux/kexec.h	2003-10-07 16:09:00.000000000 +0800
++++ linux-2.6.0-test6/include/linux/kexec.h	2003-10-07 16:09:01.000000000 +0800
+@@ -0,0 +1,54 @@
++#ifndef LINUX_KEXEC_H
++#define LINUX_KEXEC_H
++
++#if CONFIG_KEXEC
++#include <linux/types.h>
++#include <linux/list.h>
++#include <asm/kexec.h>
++
++/* 
++ * This structure is used to hold the arguments that are used when loading
++ * kernel binaries.
++ */
++
++typedef unsigned long kimage_entry_t;
++#define IND_DESTINATION  0x1
++#define IND_INDIRECTION  0x2
++#define IND_DONE         0x4
++#define IND_SOURCE       0x8
++
++#define KEXEC_SEGMENT_MAX 8
++struct kexec_segment {
++	void *buf;
++	size_t bufsz;
++	void *mem;
++	size_t memsz;
++};
++
++struct kimage {
++	kimage_entry_t head;
++	kimage_entry_t *entry;
++	kimage_entry_t *last_entry;
++
++	unsigned long destination;
++	unsigned long offset;
++
++	unsigned long start;
++	struct page *reboot_code_pages;
++
++	unsigned long nr_segments;
++	struct kexec_segment segment[KEXEC_SEGMENT_MAX+1];
++
++	struct list_head dest_pages;
++	struct list_head unuseable_pages;
++};
++
++
++/* kexec interface functions */
++extern void machine_kexec(struct kimage *image);
++extern asmlinkage long sys_kexec(unsigned long entry, long nr_segments, 
++	struct kexec_segment *segments);
++extern struct kimage *kexec_image;
++#endif
++#endif /* LINUX_KEXEC_H */
++
+Index: linux-2.6.0-test6/include/linux/reboot.h
+===================================================================
+--- linux-2.6.0-test6.orig/include/linux/reboot.h	2003-10-07 15:47:25.000000000 +0800
++++ linux-2.6.0-test6/include/linux/reboot.h	2003-10-07 16:09:01.000000000 +0800
+@@ -22,6 +22,7 @@
+  * POWER_OFF   Stop OS and remove all power from system, if possible.
+  * RESTART2    Restart system using given command string.
+  * SW_SUSPEND  Suspend system using software suspend if compiled in.
++ * KEXEC       Restart the system using a different kernel.
+  */
+ 
+ #define	LINUX_REBOOT_CMD_RESTART	0x01234567
+@@ -31,6 +32,7 @@
+ #define	LINUX_REBOOT_CMD_POWER_OFF	0x4321FEDC
+ #define	LINUX_REBOOT_CMD_RESTART2	0xA1B2C3D4
+ #define	LINUX_REBOOT_CMD_SW_SUSPEND	0xD000FCE2
++#define LINUX_REBOOT_CMD_KEXEC		0x45584543
+ 
+ 
+ #ifdef __KERNEL__
+Index: linux-2.6.0-test6/kernel/Makefile
+===================================================================
+--- linux-2.6.0-test6.orig/kernel/Makefile	2003-10-07 16:08:42.000000000 +0800
++++ linux-2.6.0-test6/kernel/Makefile	2003-10-07 16:09:01.000000000 +0800
+@@ -17,6 +17,7 @@
+ obj-$(CONFIG_KALLSYMS) += kallsyms.o
+ obj-$(CONFIG_PM) += power/
+ obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o
++obj-$(CONFIG_KEXEC) += kexec.o
+ obj-$(CONFIG_COMPAT) += compat.o
+ obj-$(CONFIG_IKCONFIG) += configs.o
+ obj-$(CONFIG_IKCONFIG_PROC) += configs.o
+Index: linux-2.6.0-test6/kernel/kexec.c
+===================================================================
+--- linux-2.6.0-test6.orig/kernel/kexec.c	2003-10-07 16:09:00.000000000 +0800
++++ linux-2.6.0-test6/kernel/kexec.c	2003-10-07 16:09:01.000000000 +0800
+@@ -0,0 +1,629 @@
++#include <linux/mm.h>
++#include <linux/file.h>
++#include <linux/slab.h>
++#include <linux/fs.h>
++#include <linux/version.h>
++#include <linux/compile.h>
++#include <linux/kexec.h>
++#include <linux/spinlock.h>
++#include <linux/list.h>
++#include <linux/highmem.h>
++#include <net/checksum.h>
++#include <asm/page.h>
++#include <asm/uaccess.h>
++#include <asm/io.h>
++#include <asm/system.h>
++
++/* When kexec transitions to the new kernel there is a one to one
++ * mapping between physical and virtual addresses.  On processors
++ * where you can disable the MMU this is trivial, and easy.  For
++ * others it is still a simple predictable page table to setup.
++ *
++ * In that environment kexec copies the new kernel to it's final
++ * resting place.  This means I can only support memory whose
++ * physical address can fit in an unsigned long.  In particular
++ * addresses where (pfn << PAGE_SHIFT) > ULONG_MAX cannot be handled.
++ * If the assembly stub has more restrictive requirements
++ * KEXEC_SOURCE_MEMORY_LIMIT and KEXEC_DEST_MEMORY_LIMIT can be
++ * defined more restrictively in <asm/kexec.h>.
++ *
++ * The code for the transition from the current kernel to the 
++ * the new kernel is placed in the reboot_code_buffer, whose size
++ * is given by KEXEC_REBOOT_CODE_SIZE.  In the best case only a single
++ * page of memory is necessary, but some architectures require more.
++ * Because this memory must be identity mapped in the transition from
++ * virtual to physical addresses it must live in the range
++ * 0 - TASK_SIZE, as only the user space mappings are arbitrarily
++ * modifyable.
++ *
++ * The assembly stub in the reboot code buffer is passed a linked list
++ * of descriptor pages detailing the source pages of the new kernel,
++ * and the destination addresses of those source pages.  As this data
++ * structure is not used in the context of the current OS, it must
++ * be self contained.
++ *
++ * The code has been made to work with highmem pages and will use a
++ * destination page in it's final resting place (if it happens 
++ * to allocate it).  The end product of this is that most of the
++ * physical address space, and most of ram can be used.
++ *
++ * Future directions include:
++ *  - allocating a page table with the reboot code buffer identity
++ *    mapped, to simplify machine_kexec and make kexec_on_panic, more
++ *    reliable.  
++ *  - allocating the pages for a page table for machines that cannot
++ *    disable their MMUs.  (Hammer, Alpha...)
++ */
++
++/* KIMAGE_NO_DEST is an impossible destination address..., for
++ * allocating pages whose destination address we do not care about.
++ */
++#define KIMAGE_NO_DEST (-1UL)
++
++static int kimage_is_destination_range(
++	struct kimage *image, unsigned long start, unsigned long end);
++static struct page *kimage_alloc_reboot_code_pages(struct kimage *image);
++static struct page *kimage_alloc_page(struct kimage *image, unsigned int gfp_mask, unsigned long dest);
++
++
++static int kimage_alloc(struct kimage **rimage, 
++	unsigned long nr_segments, struct kexec_segment *segments)
++{
++	int result;
++	struct kimage *image;
++	size_t segment_bytes;
++	struct page *reboot_pages;
++	unsigned long i;
++
++	/* Allocate a controlling structure */
++	result = -ENOMEM;
++	image = kmalloc(sizeof(*image), GFP_KERNEL);
++	if (!image) {
++		goto out;
++	}
++	memset(image, 0, sizeof(*image));
++	image->head = 0;
++	image->entry = &image->head;
++	image->last_entry = &image->head;
++
++	/* Initialize the list of destination pages */
++	INIT_LIST_HEAD(&image->dest_pages);
++
++	/* Initialize the list of unuseable pages */
++	INIT_LIST_HEAD(&image->unuseable_pages);
++
++	/* Read in the segments */
++	image->nr_segments = nr_segments;
++	segment_bytes = nr_segments * sizeof*segments;
++	result = copy_from_user(image->segment, segments, segment_bytes);
++	if (result) 
++		goto out;
++
++	/* Verify we have good destination addresses.  The caller is
++	 * responsible for making certain we don't attempt to load
++	 * the new image into invalid or reserved areas of RAM.  This
++	 * just verifies it is an address we can use. 
++	 */
++	result = -EADDRNOTAVAIL;
++	for(i = 0; i < nr_segments; i++) {
++		unsigned long mend;
++		mend = ((unsigned long)(image->segment[i].mem)) + 
++			image->segment[i].memsz;
++		if (mend >= KEXEC_DESTINATION_MEMORY_LIMIT)
++			goto out;
++	}
++
++	/* Find a location for the reboot code buffer, and add it
++	 * the vector of segments so that it's pages will also be
++	 * counted as destination pages.  
++	 */
++	result = -ENOMEM;
++	reboot_pages = kimage_alloc_reboot_code_pages(image);
++	if (!reboot_pages) {
++		printk(KERN_ERR "Could not allocate reboot_code_buffer\n");
++		goto out;
++	}
++	image->reboot_code_pages = reboot_pages;
++	image->segment[nr_segments].buf = 0;
++	image->segment[nr_segments].bufsz = 0;
++	image->segment[nr_segments].mem = (void *)(page_to_pfn(reboot_pages) << PAGE_SHIFT);
++	image->segment[nr_segments].memsz = KEXEC_REBOOT_CODE_SIZE;
++	image->nr_segments++;
++
++	result = 0;
++ out:
++	if (result == 0) {
++		*rimage = image;
++	} else {
++		kfree(image);
++	}
++	return result;
++}
++
++static int kimage_is_destination_range(
++	struct kimage *image, unsigned long start, unsigned long end)
++{
++	unsigned long i;
++	for(i = 0; i < image->nr_segments; i++) {
++		unsigned long mstart, mend;
++		mstart = (unsigned long)image->segment[i].mem;
++		mend   = mstart + image->segment[i].memsz;
++		if ((end > mstart) && (start < mend)) {
++			return 1;
++		}
++	}
++	return 0;
++}
++
++#ifdef CONFIG_MMU
++static int identity_map_pages(struct page *pages, int order)
++{
++	struct mm_struct *mm;
++	struct vm_area_struct *vma;
++	int error;
++	mm = &init_mm;
++	vma = 0;
++
++	down_write(&mm->mmap_sem);
++	error = -ENOMEM;
++	vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
++	if (!vma) {
++		goto out;
++	}
++
++	memset(vma, 0, sizeof(vma));
++	vma->vm_mm = mm;
++	vma->vm_start = page_to_pfn(pages) << PAGE_SHIFT;
++	vma->vm_end = vma->vm_start + (1 << (order + PAGE_SHIFT));
++	vma->vm_ops = 0;
++	vma->vm_flags = VM_SHARED \
++		| VM_READ | VM_WRITE | VM_EXEC \
++		| VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC \
++		| VM_DONTCOPY | VM_RESERVED;
++	vma->vm_page_prot = protection_map[vma->vm_flags & 0xf];
++	vma->vm_file = NULL;
++	vma->vm_private_data = NULL;
++	INIT_LIST_HEAD(&vma->shared);
++	insert_vm_struct(mm, vma);
++	
++	error = remap_page_range(vma, vma->vm_start, vma->vm_start,
++		vma->vm_end - vma->vm_start, vma->vm_page_prot);
++	if (error) {
++		goto out;
++	}
++
++	error = 0;
++ out:
++	if (error && vma) {
++		kmem_cache_free(vm_area_cachep, vma);
++		vma = 0;
++	}
++	up_write(&mm->mmap_sem);
++
++	return error;
++}
++#else
++#define identity_map_pages(pages, order) 0
++#endif
++
++struct page *kimage_alloc_reboot_code_pages(struct kimage *image)
++{
++	/* The reboot code buffer is special.  It is the only set of
++	 * pages that must be allocated in their final resting place,
++	 * and the only set of pages whose final resting place we can
++	 * pick. 
++	 *
++	 * At worst this runs in O(N) of the image size.
++	 */
++	struct list_head extra_pages, *pos, *next;
++	struct page *pages;
++	unsigned long addr;
++	int order, count;
++	order = get_order(KEXEC_REBOOT_CODE_SIZE);
++	count = 1 << order;
++	INIT_LIST_HEAD(&extra_pages);
++	do {
++		int i;
++		pages = alloc_pages(GFP_HIGHUSER, order);
++		if (!pages)
++			break;
++		for(i = 0; i < count; i++) {
++			SetPageReserved(pages +i);
++		}
++		addr = page_to_pfn(pages) << PAGE_SHIFT;
++		if ((page_to_pfn(pages) >= (TASK_SIZE >> PAGE_SHIFT)) ||
++			kimage_is_destination_range(image, addr, addr + KEXEC_REBOOT_CODE_SIZE)) {
++			list_add(&pages->list, &extra_pages);
++			pages = 0;
++		}
++	} while(!pages);
++	if (pages) {
++		int result;
++		result = identity_map_pages(pages, order);
++		if (result < 0) {
++			list_add(&pages->list, &extra_pages);
++			pages = 0;
++		}
++	}
++	/* If I could convert a multi page allocation into a buch of
++	 * single page allocations I could add these pages to
++	 * image->dest_pages.  For now it is simpler to just free the
++	 * pages again.
++	 */
++	list_for_each_safe(pos, next, &extra_pages) {
++		struct page *page;
++		int i;
++		page = list_entry(pos, struct page, list);
++		for(i = 0; i < count; i++) {
++			ClearPageReserved(pages +i);
++		}
++		list_del(&extra_pages);
++		__free_pages(page, order);
++	}
++	return pages;
++}
++
++static int kimage_add_entry(struct kimage *image, kimage_entry_t entry)
++{
++	if (image->offset != 0) {
++		image->entry++;
++	}
++	if (image->entry == image->last_entry) {
++		kimage_entry_t *ind_page;
++		struct page *page;
++		page = kimage_alloc_page(image, GFP_KERNEL, KIMAGE_NO_DEST);
++		if (!page) {
++			return -ENOMEM;
++		}
++		ind_page = page_address(page);
++		*image->entry = virt_to_phys(ind_page) | IND_INDIRECTION;
++		image->entry = ind_page;
++		image->last_entry = 
++			ind_page + ((PAGE_SIZE/sizeof(kimage_entry_t)) - 1);
++	}
++	*image->entry = entry;
++	image->entry++;
++	image->offset = 0;
++	return 0;
++}
++
++static int kimage_set_destination(
++	struct kimage *image, unsigned long destination) 
++{
++	int result;
++	destination &= PAGE_MASK;
++	result = kimage_add_entry(image, destination | IND_DESTINATION);
++	if (result == 0) {
++		image->destination = destination;
++	}
++	return result;
++}
++
++
++static int kimage_add_page(struct kimage *image, unsigned long page)
++{
++	int result;
++	page &= PAGE_MASK;
++	result = kimage_add_entry(image, page | IND_SOURCE);
++	if (result == 0) {
++		image->destination += PAGE_SIZE;
++	}
++	return result;
++}
++
++
++static void kimage_free_extra_pages(struct kimage *image)
++{
++	/* Walk through and free any extra destination pages I may have */
++	struct list_head *pos, *next;
++	list_for_each_safe(pos, next, &image->dest_pages) {
++		struct page *page;
++		page = list_entry(pos, struct page, list);
++		list_del(&page->list);
++		ClearPageReserved(page);
++		__free_page(page);
++	}
++	/* Walk through and free any unuseable pages I have cached */
++	list_for_each_safe(pos, next, &image->unuseable_pages) {
++		struct page *page;
++		page = list_entry(pos, struct page, list);
++		list_del(&page->list);
++		ClearPageReserved(page);
++		__free_page(page);
++	}
++
++}
++static int kimage_terminate(struct kimage *image)
++{
++	int result;
++	result = kimage_add_entry(image, IND_DONE);
++	if (result == 0) {
++		/* Point at the terminating element */
++		image->entry--;
++		kimage_free_extra_pages(image);
++	}
++	return result;
++}
++
++#define for_each_kimage_entry(image, ptr, entry) \
++	for (ptr = &image->head; (entry = *ptr) && !(entry & IND_DONE); \
++		ptr = (entry & IND_INDIRECTION)? \
++			phys_to_virt((entry & PAGE_MASK)): ptr +1)
++
++static void kimage_free(struct kimage *image)
++{
++	kimage_entry_t *ptr, entry;
++	kimage_entry_t ind = 0;
++	int i, count, order;
++	if (!image)
++		return;
++	kimage_free_extra_pages(image);
++	for_each_kimage_entry(image, ptr, entry) {
++		if (entry & IND_INDIRECTION) {
++			/* Free the previous indirection page */
++			if (ind & IND_INDIRECTION) {
++				free_page((unsigned long)phys_to_virt(ind & PAGE_MASK));
++			}
++			/* Save this indirection page until we are
++			 * done with it.
++			 */
++			ind = entry;
++		}
++		else if (entry & IND_SOURCE) {
++			free_page((unsigned long)phys_to_virt(entry & PAGE_MASK));
++		}
++	}
++	order = get_order(KEXEC_REBOOT_CODE_SIZE);
++	count = 1 << order;
++	do_munmap(&init_mm, 
++		page_to_pfn(image->reboot_code_pages) << PAGE_SHIFT, 
++		count << PAGE_SHIFT);
++	for(i = 0; i < count; i++) {
++		ClearPageReserved(image->reboot_code_pages + i);
++	}
++	__free_pages(image->reboot_code_pages, order);
++	kfree(image);
++}
++
++static kimage_entry_t *kimage_dst_used(struct kimage *image, unsigned long page)
++{
++	kimage_entry_t *ptr, entry;
++	unsigned long destination = 0;
++	for_each_kimage_entry(image, ptr, entry) {
++		if (entry & IND_DESTINATION) {
++			destination = entry & PAGE_MASK;
++		}
++		else if (entry & IND_SOURCE) {
++			if (page == destination) {
++				return ptr;
++			}
++			destination += PAGE_SIZE;
++		}
++	}
++	return 0;
++}
++
++static struct page *kimage_alloc_page(struct kimage *image, unsigned int gfp_mask, unsigned long destination)
++{
++	/* Here we implment safe guards to ensure that a source page
++	 * is not copied to it's destination page before the data on
++	 * the destination page is no longer useful.
++	 *
++	 * To do this we maintain the invariant that a source page is
++	 * either it's own destination page, or it is not a
++	 * destination page at all.  
++	 *
++	 * That is slightly stronger than required, but the proof
++	 * that no problems will not occur is trivial, and the
++	 * implemenation is simply to verify.
++	 *
++	 * When allocating all pages normally this algorithm will run
++	 * in O(N) time, but in the worst case it will run in O(N^2)
++	 * time.   If the runtime is a problem the data structures can
++	 * be fixed.
++	 */
++	struct page *page;
++	unsigned long addr;
++
++	/* Walk through the list of destination pages, and see if I
++	 * have a match.
++	 */
++	list_for_each_entry(page, &image->dest_pages, list) {
++		addr = page_to_pfn(page) << PAGE_SHIFT;
++		if (addr == destination) {
++			list_del(&page->list);
++			return page;
++		}
++	}
++	page = 0;
++	while(1) {
++		kimage_entry_t *old;
++		/* Allocate a page, if we run out of memory give up */
++		page = alloc_page(gfp_mask);
++		if (!page) {
++			return 0;
++		}
++		SetPageReserved(page);
++		/* If the page cannot be used file it away */
++		if (page_to_pfn(page) > (KEXEC_SOURCE_MEMORY_LIMIT >> PAGE_SHIFT)) {
++			list_add(&page->list, &image->unuseable_pages);
++			continue;
++		}
++		addr = page_to_pfn(page) << PAGE_SHIFT;
++
++		/* If it is the destination page we want use it */
++		if (addr == destination)
++			break;
++
++		/* If the page is not a destination page use it */
++		if (!kimage_is_destination_range(image, addr, addr + PAGE_SIZE))
++			break;
++
++		/* I know that the page is someones destination page.
++		 * See if there is already a source page for this
++		 * destination page.  And if so swap the source pages.
++		 */
++		old = kimage_dst_used(image, addr);
++		if (old) {
++			/* If so move it */
++			unsigned long old_addr;
++			struct page *old_page;
++			
++			old_addr = *old & PAGE_MASK;
++			old_page = pfn_to_page(old_addr >> PAGE_SHIFT);
++			copy_highpage(page, old_page);
++			*old = addr | (*old & ~PAGE_MASK);
++
++			/* The old page I have found cannot be a
++			 * destination page, so return it.
++			 */
++			addr = old_addr;
++			page = old_page;
++			break;
++		}
++		else {
++			/* Place the page on the destination list I
++			 * will use it later.
++			 */
++			list_add(&page->list, &image->dest_pages);
++		}
++	}
++	return page;
++}
++
++static int kimage_load_segment(struct kimage *image,
++	struct kexec_segment *segment)
++{	
++	unsigned long mstart;
++	int result;
++	unsigned long offset;
++	unsigned long offset_end;
++	unsigned char *buf;
++
++	result = 0;
++	buf = segment->buf;
++	mstart = (unsigned long)segment->mem;
++
++	offset_end = segment->memsz;
++
++	result = kimage_set_destination(image, mstart);
++	if (result < 0) {
++		goto out;
++	}
++	for(offset = 0;  offset < segment->memsz; offset += PAGE_SIZE) {
++		struct page *page;
++		char *ptr;
++		size_t size, leader;
++		page = kimage_alloc_page(image, GFP_HIGHUSER, mstart + offset);
++		if (page == 0) {
++			result  = -ENOMEM;
++			goto out;
++		}
++		result = kimage_add_page(image, page_to_pfn(page) << PAGE_SHIFT);
++		if (result < 0) {
++			goto out;
++		}
++		ptr = kmap(page);
++		if (segment->bufsz < offset) {
++			/* We are past the end zero the whole page */
++			memset(ptr, 0, PAGE_SIZE);
++			kunmap(page);
++			continue;
++		}
++		size = PAGE_SIZE;
++		leader = 0;
++		if ((offset == 0)) {
++			leader = mstart & ~PAGE_MASK;
++		}
++		if (leader) {
++			/* We are on the first page zero the unused portion */
++			memset(ptr, 0, leader);
++			size -= leader;
++			ptr += leader;
++		}
++		if (size > (segment->bufsz - offset)) {
++			size = segment->bufsz - offset;
++		}
++		if (size < (PAGE_SIZE - leader)) {
++			/* zero the trailing part of the page */
++			memset(ptr + size, 0, (PAGE_SIZE - leader) - size);
++		}
++		result = copy_from_user(ptr, buf + offset, size);
++		kunmap(page);
++		if (result) {
++			result = (result < 0)?result : -EIO;
++			goto out;
++		}
++	}
++ out:
++	return result;
++}
++
++/*
++ * Exec Kernel system call: for obvious reasons only root may call it.
++ * 
++ * This call breaks up into three pieces.  
++ * - A generic part which loads the new kernel from the current
++ *   address space, and very carefully places the data in the
++ *   allocated pages.
++ *
++ * - A generic part that interacts with the kernel and tells all of
++ *   the devices to shut down.  Preventing on-going dmas, and placing
++ *   the devices in a consistent state so a later kernel can
++ *   reinitialize them.
++ *
++ * - A machine specific part that includes the syscall number
++ *   and the copies the image to it's final destination.  And
++ *   jumps into the image at entry.
++ *
++ * kexec does not sync, or unmount filesystems so if you need
++ * that to happen you need to do that yourself.
++ */
++struct kimage *kexec_image = 0;
++
++asmlinkage long sys_kexec_load(unsigned long entry, unsigned long nr_segments, 
++	struct kexec_segment *segments, unsigned long flags)
++{
++	struct kimage *image;
++	int result;
++		
++	/* We only trust the superuser with rebooting the system. */
++	if (!capable(CAP_SYS_ADMIN))
++		return -EPERM;
++
++	/* In case we need just a little bit of special behavior for
++	 * reboot on panic 
++	 */
++	if (flags != 0)
++		return -EINVAL;
++
++	if (nr_segments > KEXEC_SEGMENT_MAX)
++		return -EINVAL;
++	image = 0;
++
++	result = 0;
++	if (nr_segments > 0) {
++		unsigned long i;
++		result = kimage_alloc(&image, nr_segments, segments);
++		if (result) {
++			goto out;
++		}
++		image->start = entry;
++		for(i = 0; i < nr_segments; i++) {
++			result = kimage_load_segment(image, &segments[i]);
++			if (result) {
++				goto out;
++			}
++		}
++		result = kimage_terminate(image);
++		if (result) {
++			goto out;
++		}
++	}
++
++	image = xchg(&kexec_image, image);
++
++ out:
++	kimage_free(image);
++	return result;
++}
+Index: linux-2.6.0-test6/kernel/sys.c
+===================================================================
+--- linux-2.6.0-test6.orig/kernel/sys.c	2003-10-07 16:08:42.000000000 +0800
++++ linux-2.6.0-test6/kernel/sys.c	2003-10-09 18:38:57.000000000 +0800
+@@ -17,6 +17,7 @@
+ #include <linux/init.h>
+ #include <linux/highuid.h>
+ #include <linux/fs.h>
++#include <linux/kexec.h>
+ #include <linux/workqueue.h>
+ #include <linux/device.h>
+ #include <linux/times.h>
+@@ -94,6 +95,7 @@
+ int notifier_chain_register(struct notifier_block **list, struct notifier_block *n)
+ {
+ 	write_lock(&notifier_lock);
++	printk(KERN_EMERG"add noitifier nb %p \n", n);
+ 	while(*list)
+ 	{
+ 		if(n->priority > (*list)->priority)
+@@ -156,6 +158,7 @@
+ 
+ 	while(nb)
+ 	{
++		printk("nb %p notifier_call %p \n", nb, nb->notifier_call);
+ 		ret=nb->notifier_call(nb,val,v);
+ 		if(ret&NOTIFY_STOP_MASK)
+ 		{
+@@ -208,6 +211,7 @@
+ cond_syscall(sys_lookup_dcookie)
+ cond_syscall(sys_swapon)
+ cond_syscall(sys_swapoff)
++cond_syscall(sys_kexec_load)
+ cond_syscall(sys_init_module)
+ cond_syscall(sys_delete_module)
+ cond_syscall(sys_socketpair)
+@@ -454,6 +458,27 @@
+ 		machine_restart(buffer);
+ 		break;
+ 
++#ifdef CONFIG_KEXEC
++	case LINUX_REBOOT_CMD_KEXEC:
++	{
++		struct kimage *image;
++		if (arg) {
++			unlock_kernel();
++			return -EINVAL;
++		}
++		image = xchg(&kexec_image, 0);
++		if (!image) {
++			unlock_kernel();
++			return -EINVAL;
++		}
++		notifier_call_chain(&reboot_notifier_list, SYS_RESTART, NULL);
++		system_running = 0;
++		device_shutdown();
++		printk(KERN_EMERG "Starting new kernel\n");
++		machine_kexec(image);
++		break;
++	}
++#endif
+ #ifdef CONFIG_SOFTWARE_SUSPEND
+ 	case LINUX_REBOOT_CMD_SW_SUSPEND:
+ 		if (!software_suspend_enabled) {
+Index: linux-2.6.0-test6/fs/aio.c
+===================================================================
+--- linux-2.6.0-test6.orig/fs/aio.c	2003-10-07 16:08:40.000000000 +0800
++++ linux-2.6.0-test6/fs/aio.c	2003-10-07 16:09:01.000000000 +0800
+@@ -560,7 +560,7 @@
+  * 	(Note: this routine is intended to be called only
+  * 	from a kernel thread context)
+  */
+-static void use_mm(struct mm_struct *mm)
++void use_mm(struct mm_struct *mm)
+ {
+ 	struct mm_struct *active_mm;
+ 	struct task_struct *tsk = current;
diff --git a/lustre/kernel_patches/patches/linux-2.4.19-pre1-xattr-0.8.54.patch b/lustre/kernel_patches/patches/linux-2.4.19-pre1-xattr-0.8.54.patch
index e694068..4107e70 100644
--- a/lustre/kernel_patches/patches/linux-2.4.19-pre1-xattr-0.8.54.patch
+++ b/lustre/kernel_patches/patches/linux-2.4.19-pre1-xattr-0.8.54.patch
@@ -156,7 +156,7 @@ Index: linux-2.4.19-pre1/arch/alpha/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -195,7 +195,7 @@ Index: linux-2.4.19-pre1/arch/arm/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -240,7 +240,7 @@ Index: linux-2.4.19-pre1/arch/i386/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -293,7 +293,7 @@ Index: linux-2.4.19-pre1/arch/ia64/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -346,7 +346,7 @@ Index: linux-2.4.19-pre1/arch/m68k/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -364,7 +364,7 @@ Index: linux-2.4.19-pre1/arch/mips/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -382,7 +382,7 @@ Index: linux-2.4.19-pre1/arch/mips64/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -396,11 +396,18 @@ Index: linux-2.4.19-pre1/arch/ppc/defconfig
 ===================================================================
 --- linux-2.4.19-pre1.orig/arch/ppc/defconfig	2004-01-14 01:10:36.000000000 +0300
 +++ linux-2.4.19-pre1/arch/ppc/defconfig	2004-01-14 01:11:49.000000000 +0300
-@@ -1,6 +1,13 @@
+@@ -1,6 +1,20 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
++# CONFIG_EXT3_FS_XATTR_SHARING is not set
++# CONFIG_EXT3_FS_XATTR_USER is not set
++# CONFIG_EXT2_FS_XATTR is not set
++# CONFIG_EXT2_FS_XATTR_SHARING is not set
++# CONFIG_EXT2_FS_XATTR_USER is not set
++# CONFIG_FS_MBCACHE is not set
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -418,7 +425,7 @@ Index: linux-2.4.19-pre1/arch/s390/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -462,7 +469,7 @@ Index: linux-2.4.19-pre1/arch/s390x/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -606,7 +613,7 @@ Index: linux-2.4.19-pre1/arch/sparc/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -645,7 +652,7 @@ Index: linux-2.4.19-pre1/arch/sparc64/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -1881,7 +1888,7 @@ Index: linux-2.4.19-pre1/fs/ext2/xattr.c
 +		} else if (old_bh && header == HDR(old_bh)) {
 +			/* Keep this block. */
 +			new_bh = old_bh;
-+			(void)ext2_xattr_cache_insert(new_bh);
++			ext2_xattr_cache_insert(new_bh);
 +		} else {
 +			/* We need to allocate a new block */
 +			int force = EXT2_I(inode)->i_file_acl != 0;
@@ -1900,7 +1907,7 @@ Index: linux-2.4.19-pre1/fs/ext2/xattr.c
 +			memcpy(new_bh->b_data, header, new_bh->b_size);
 +			mark_buffer_uptodate(new_bh, 1);
 +			unlock_buffer(new_bh);
-+			(void)ext2_xattr_cache_insert(new_bh);
++			ext2_xattr_cache_insert(new_bh);
 +			
 +			ext2_xattr_update_super_block(sb);
 +		}
@@ -3563,7 +3570,7 @@ Index: linux-2.4.19-pre1/fs/ext3/xattr.c
 +		} else if (old_bh && header == HDR(old_bh)) {
 +			/* Keep this block. */
 +			new_bh = old_bh;
-+			(void)ext3_xattr_cache_insert(new_bh);
++			ext3_xattr_cache_insert(new_bh);
 +		} else {
 +			/* We need to allocate a new block */
 +			int force = EXT3_I(inode)->i_file_acl != 0;
@@ -3588,7 +3595,7 @@ Index: linux-2.4.19-pre1/fs/ext3/xattr.c
 +			memcpy(new_bh->b_data, header, new_bh->b_size);
 +			mark_buffer_uptodate(new_bh, 1);
 +			unlock_buffer(new_bh);
-+			(void)ext3_xattr_cache_insert(new_bh);
++			ext3_xattr_cache_insert(new_bh);
 +			
 +			ext3_xattr_update_super_block(handle, sb);
 +		}
diff --git a/lustre/kernel_patches/patches/linux-2.4.19-xattr-0.8.54-suse.patch b/lustre/kernel_patches/patches/linux-2.4.19-xattr-0.8.54-suse.patch
index 79c48fb..26d3af9 100644
--- a/lustre/kernel_patches/patches/linux-2.4.19-xattr-0.8.54-suse.patch
+++ b/lustre/kernel_patches/patches/linux-2.4.19-xattr-0.8.54-suse.patch
@@ -2,10 +2,10 @@
  ext3/ext3-exports.c |   13 +++++++++++++
  2 files changed, 14 insertions(+), 2 deletions(-)
 
-Index: linux-2.4.19/fs/ext2/super.c
+Index: linux-2.4.19.SuSE/fs/ext2/super.c
 ===================================================================
---- linux-2.4.19.orig/fs/ext2/super.c	2004-04-23 17:53:55.000000000 -0400
-+++ linux-2.4.19/fs/ext2/super.c	2004-04-23 22:30:41.000000000 -0400
+--- linux-2.4.19.SuSE.orig/fs/ext2/super.c	Mon Jan 27 05:08:00 2003
++++ linux-2.4.19.SuSE/fs/ext2/super.c	Sun Nov 16 00:40:59 2003
 @@ -70,6 +70,7 @@
  {
  	va_list args;
@@ -14,11 +14,11 @@ Index: linux-2.4.19/fs/ext2/super.c
  	if (!(sb->s_flags & MS_RDONLY)) {
  		sb->u.ext2_sb.s_mount_state |= EXT2_ERROR_FS;
  		sb->u.ext2_sb.s_es->s_state =
-Index: linux-2.4.19/fs/ext3/super.c
+Index: linux-2.4.19.SuSE/fs/ext3/super.c
 ===================================================================
---- linux-2.4.19.orig/fs/ext3/super.c	2004-04-23 18:26:27.000000000 -0400
-+++ linux-2.4.19/fs/ext3/super.c	2004-04-23 22:30:41.000000000 -0400
-@@ -1827,8 +1827,6 @@
+--- linux-2.4.19.SuSE.orig/fs/ext3/super.c	Mon Jan 27 05:08:00 2003
++++ linux-2.4.19.SuSE/fs/ext3/super.c	Sun Nov 16 00:40:59 2003
+@@ -1822,8 +1828,6 @@
  	exit_ext3_xattr();
  }
  
@@ -27,10 +27,10 @@ Index: linux-2.4.19/fs/ext3/super.c
  
  MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others");
  MODULE_DESCRIPTION("Second Extended Filesystem with journaling extensions");
-Index: linux-2.4.19/fs/ext3/ext3-exports.c
+Index: linux-2.4.19.SuSE/fs/ext3/ext3-exports.c
 ===================================================================
---- linux-2.4.19.orig/fs/ext3/ext3-exports.c	2003-01-30 05:24:37.000000000 -0500
-+++ linux-2.4.19/fs/ext3/ext3-exports.c	2004-04-23 22:30:41.000000000 -0400
+--- linux-2.4.19.SuSE.orig/fs/ext3/ext3-exports.c	Sun Nov 16 00:40:58 2003
++++ linux-2.4.19.SuSE/fs/ext3/ext3-exports.c	Sun Nov 16 00:40:59 2003
 @@ -0,0 +1,13 @@
 +#include <linux/config.h>
 +#include <linux/module.h>
@@ -45,16 +45,3 @@ Index: linux-2.4.19/fs/ext3/ext3-exports.c
 +EXPORT_SYMBOL(ext3_xattr_get);
 +EXPORT_SYMBOL(ext3_xattr_list);
 +EXPORT_SYMBOL(ext3_xattr_set);
-Index: linux-2.4.19/fs/ext3/Makefile
-===================================================================
---- linux-2.4.19.orig/fs/ext3/Makefile	2004-04-23 18:26:27.000000000 -0400
-+++ linux-2.4.19/fs/ext3/Makefile	2004-04-23 23:05:20.000000000 -0400
-@@ -9,7 +9,7 @@
- 
- O_TARGET := ext3.o
- 
--export-objs :=	super.o inode.o
-+export-objs :=	ext3-exports.c
- 
- obj-y    := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \
- 		ioctl.o namei.o super.o symlink.o hash.o
diff --git a/lustre/kernel_patches/patches/linux-2.4.20-tmpfs-iopen.patch b/lustre/kernel_patches/patches/linux-2.4.20-tmpfs-iopen.patch
new file mode 100644
index 0000000..b3b75e3
--- /dev/null
+++ b/lustre/kernel_patches/patches/linux-2.4.20-tmpfs-iopen.patch
@@ -0,0 +1,1287 @@
+diff -rupN --exclude='ide*' linux-2.4.20.orig/include/linux/mm.h linux-2.4.20/include/linux/mm.h
+--- linux-2.4.20.orig/include/linux/mm.h	2004-02-10 11:43:10.000000000 +0200
++++ linux-2.4.20/include/linux/mm.h	2004-03-01 13:44:45.000000000 +0200
+@@ -468,7 +468,8 @@ extern void clear_page_tables(struct mm_
+ extern int fail_writepage(struct page *);
+ struct page * shmem_nopage(struct vm_area_struct * vma, unsigned long address, int unused);
+ struct file *shmem_file_setup(char * name, loff_t size);
+-int shmem_getpage(struct inode * inode, unsigned long idx, struct page **ptr);
++struct page *shmem_getpage_locked(struct inode *inode, unsigned long idx);
++struct page *shmem_getpage_unlocked(struct inode *inode, unsigned long idx);
+ extern void shmem_lock(struct file * file, int lock);
+ extern int shmem_zero_setup(struct vm_area_struct *);
+ 
+diff -rupN --exclude='ide*' linux-2.4.20.orig/include/linux/shmem_fs.h linux-2.4.20/include/linux/shmem_fs.h
+--- linux-2.4.20.orig/include/linux/shmem_fs.h	2004-02-10 18:39:17.000000000 +0200
++++ linux-2.4.20/include/linux/shmem_fs.h	2004-02-23 12:40:28.000000000 +0200
+@@ -7,6 +7,9 @@
+ 
+ #define SHMEM_NR_DIRECT 16
+ 
++#define SHMEM_MOUNT_IOPEN	  0x8000	/* Allow access via iopen */
++#define SHMEM_MOUNT_IOPEN_NOPRIV  0x10000	/* Make iopen world-readable */
++
+ /*
+  * A swap entry has to fit into a "unsigned long", as
+  * the entry is hidden in the "index" field of the
+@@ -38,6 +41,9 @@ struct shmem_inode_info {
+ };
+ 
+ struct shmem_sb_info {
++	struct dentry *iopen;
++	unsigned long options;
++	unsigned long root_ino;
+ 	unsigned long max_blocks;   /* How many blocks are allowed */
+ 	unsigned long free_blocks;  /* How many are left for allocation */
+ 	unsigned long max_inodes;   /* How many inodes are allowed */
+@@ -59,11 +65,9 @@ shmem_xattr_find(struct inode *inode, co
+ extern ssize_t
+ shmem_xattr_set(struct inode *inode, const char *name,
+ 		const void *value, u16 valuelen, int flags);
+-		
+ extern ssize_t
+ shmem_xattr_get(struct inode *inode, const char *name,
+ 		void *value, size_t valuelen);
+-		
+ extern int
+ shmem_xattr_delete(struct inode *inode, struct shmem_xattr *xattr);
+ 
+diff -rupN --exclude='ide*' linux-2.4.20.orig/mm/shmem.c linux-2.4.20/mm/shmem.c
+--- linux-2.4.20.orig/mm/shmem.c	2004-02-10 18:44:05.000000000 +0200
++++ linux-2.4.20/mm/shmem.c	2004-03-01 14:37:21.000000000 +0200
+@@ -36,29 +36,45 @@
+ #define TMPFS_MAGIC	0x01021994
+ 
+ #define ENTRIES_PER_PAGE (PAGE_CACHE_SIZE/sizeof(unsigned long))
++
+ #define BLOCKS_PER_PAGE  (PAGE_CACHE_SIZE/512)
+ 
+-#define SHMEM_MAX_INDEX  (SHMEM_NR_DIRECT + ENTRIES_PER_PAGE * (ENTRIES_PER_PAGE/2) * (ENTRIES_PER_PAGE+1))
++#define SHMEM_MAX_INDEX  (SHMEM_NR_DIRECT + ENTRIES_PER_PAGE * \
++			  (ENTRIES_PER_PAGE/2) * (ENTRIES_PER_PAGE+1))
++
+ #define SHMEM_MAX_BYTES  ((unsigned long long)SHMEM_MAX_INDEX << PAGE_CACHE_SHIFT)
+ #define VM_ACCT(size)    (((size) + PAGE_CACHE_SIZE - 1) >> PAGE_SHIFT)
+ 
+ /* Pretend that each entry is of this size in directory's i_size */
+-#define BOGO_DIRENT_SIZE 20
+-
++#define BOGO_DIRENT_SIZE (20)
+ #define SHMEM_SB(sb) (&sb->u.shmem_sb)
+ 
++#define SHMEM_IOPEN_INO 	2
++#define SHMEM_IOPEN_NAME_LEN	32
++
++#define ASSERT(cond)                                                    \
++do {									\
++	if (!(cond)) {							\
++		printk (KERN_EMERG					\
++			"Assertion failure in %s() at %s:%d: \"%s\"\n",	\
++			__FUNCTION__, __FILE__, __LINE__, # cond);	\
++		BUG();							\
++	}								\
++} while (0)
++
+ static struct super_operations shmem_ops;
++static struct vm_operations_struct shmem_vm_ops;
+ static struct address_space_operations shmem_aops;
+ static struct file_operations shmem_file_operations;
+ static struct inode_operations shmem_inode_operations;
+ static struct inode_operations shmem_dir_inode_operations;
+-static struct vm_operations_struct shmem_vm_ops;
+ 
+ LIST_HEAD (shmem_inodes);
+ static spinlock_t shmem_ilock = SPIN_LOCK_UNLOCKED;
+ atomic_t shmem_nrpages = ATOMIC_INIT(0); /* Not used right now */
+ 
+-static struct page *shmem_getpage_locked(struct shmem_inode_info *, struct inode *, unsigned long);
++struct page *shmem_getpage_locked(struct inode *inode, unsigned long idx);
++struct page *shmem_getpage_unlocked(struct inode *inode, unsigned long idx);
+ 
+ #ifdef CONFIG_TMPFS
+ static struct inode_operations shmem_symlink_inode_operations;
+@@ -327,7 +343,7 @@ shmem_getxattr(struct dentry *dentry, co
+  * inode attributes list.*/
+ static int
+ shmem_setxattr(struct dentry *dentry, const char *name,
+-               void *value, size_t valuelen, int flags)
++               const void *value, size_t valuelen, int flags)
+ {
+         int error;
+         struct inode *inode = dentry->d_inode;
+@@ -404,8 +420,8 @@ shmem_listxattr(struct dentry *dentry, c
+  * @inode: inode to recalc
+  * @swap:  additional swap pages freed externally
+  *
+- * We have to calculate the free blocks since the mm can drop pages
+- * behind our back
++ * We have to calculate the free blocks since the mm can drop pages behind our
++ * back
+  *
+  * But we know that normally
+  * inodes->i_blocks/BLOCKS_PER_PAGE == 
+@@ -441,24 +457,23 @@ static void shmem_recalc_inode(struct in
+  * @page:  optional page to add to the structure. Has to be preset to
+  *         all zeros
+  *
+- * If there is no space allocated yet it will return -ENOMEM when
+- * page == 0 else it will use the page for the needed block.
++ * If there is no space allocated yet it will return -ENOMEM when page == 0 else
++ * it will use the page for the needed block.
+  *
+  * returns -EFBIG if the index is too big.
+  *
+  *
+  * The swap vector is organized the following way:
+  *
+- * There are SHMEM_NR_DIRECT entries directly stored in the
+- * shmem_inode_info structure. So small files do not need an addional
+- * allocation.
+- *
+- * For pages with index > SHMEM_NR_DIRECT there is the pointer
+- * i_indirect which points to a page which holds in the first half
+- * doubly indirect blocks, in the second half triple indirect blocks:
++ * There are SHMEM_NR_DIRECT entries directly stored in the shmem_inode_info
++ * structure. So small files do not need an addional allocation.
++ *
++ * For pages with index > SHMEM_NR_DIRECT there is the pointer i_indirect which
++ * points to a page which holds in the first half doubly indirect blocks, in the
++ * second half triple indirect blocks:
+  *
+- * For an artificial ENTRIES_PER_PAGE = 4 this would lead to the
+- * following layout (for SHMEM_NR_DIRECT == 16):
++ * For an artificial ENTRIES_PER_PAGE = 4 this would lead to the following
++ * layout (for SHMEM_NR_DIRECT == 16):
+  *
+  * i_indirect -> dir --> 16-19
+  * 	      |	     +-> 20-23
+@@ -473,7 +488,9 @@ static void shmem_recalc_inode(struct in
+  * 	      	       +-> 48-51
+  * 	      	       +-> 52-55
+  */
+-static swp_entry_t * shmem_swp_entry (struct shmem_inode_info *info, unsigned long index, unsigned long page) 
++static swp_entry_t *
++shmem_swp_entry (struct shmem_inode_info *info, unsigned long index,
++		 unsigned long page) 
+ {
+ 	unsigned long offset;
+ 	void **dir;
+@@ -520,7 +537,8 @@ static swp_entry_t * shmem_swp_entry (st
+  * @info:	info structure for the inode
+  * @index:	index of the page to find
+  */
+-static inline swp_entry_t * shmem_alloc_entry (struct shmem_inode_info *info, unsigned long index)
++static inline swp_entry_t *
++shmem_alloc_entry(struct shmem_inode_info *info, unsigned long index)
+ {
+ 	unsigned long page = 0;
+ 	swp_entry_t * res;
+@@ -545,7 +563,8 @@ static inline swp_entry_t * shmem_alloc_
+  * @dir:   pointer to the directory
+  * @count: number of entries to scan
+  */
+-static int shmem_free_swp(swp_entry_t *dir, unsigned int count)
++static int
++shmem_free_swp(swp_entry_t *dir, unsigned int count)
+ {
+ 	swp_entry_t *ptr, entry;
+ 	int freed = 0;
+@@ -573,7 +592,9 @@ static int shmem_free_swp(swp_entry_t *d
+  */
+ 
+ static inline unsigned long 
+-shmem_truncate_direct(swp_entry_t *** dir, unsigned long start, unsigned long len) {
++shmem_truncate_direct(swp_entry_t ***dir, unsigned long start,
++		      unsigned long len)
++{
+ 	swp_entry_t **last, **ptr;
+ 	unsigned long off, freed = 0;
+  
+@@ -639,7 +660,8 @@ shmem_truncate_indirect(struct shmem_ino
+ 			BUG();
+ 
+ 		baseidx = max & ~(ENTRIES_PER_PAGE*ENTRIES_PER_PAGE-1);
+-		base = (swp_entry_t ***) info->i_indirect + ENTRIES_PER_PAGE/2 + baseidx/ENTRIES_PER_PAGE/ENTRIES_PER_PAGE ;
++		base = (swp_entry_t ***) info->i_indirect + ENTRIES_PER_PAGE/2 +
++			baseidx/ENTRIES_PER_PAGE/ENTRIES_PER_PAGE ;
+ 		len = max - baseidx + 1;
+ 		baseidx += ENTRIES_PER_PAGE*ENTRIES_PER_PAGE/2+SHMEM_NR_DIRECT;
+ 	}
+@@ -654,7 +676,8 @@ shmem_truncate_indirect(struct shmem_ino
+ 	return shmem_truncate_direct(base, start, len);
+ }
+ 
+-static void shmem_truncate (struct inode * inode)
++static void
++shmem_truncate(struct inode *inode)
+ {
+ 	unsigned long index;
+ 	unsigned long partial;
+@@ -668,16 +691,16 @@ static void shmem_truncate (struct inode
+ 	partial = inode->i_size & ~PAGE_CACHE_MASK;
+ 
+ 	if (partial) {
+-		swp_entry_t *entry = shmem_swp_entry(info, index-1, 0);
+ 		struct page *page;
+-		/*
+-		 * This check is racy: it's faintly possible that page
+-		 * was assigned to swap during truncate_inode_pages,
+-		 * and now assigned to file; but better than nothing.
++		swp_entry_t *entry = shmem_swp_entry(info, index - 1, 0);
++		
++		/* This check is racy: it's faintly possible that page was
++		 * assigned to swap during truncate_inode_pages, and now
++		 * assigned to file; but better than nothing.
+ 		 */
+ 		if (!IS_ERR(entry) && entry->val) {
+ 			spin_unlock(&info->lock);
+-			page = shmem_getpage_locked(info, inode, index-1);
++			page = shmem_getpage_locked(inode, index - 1);
+ 			if (!IS_ERR(page)) {
+ 				memclear_highpage_flush(page, partial,
+ 					PAGE_CACHE_SIZE - partial);
+@@ -697,8 +720,166 @@ static void shmem_truncate (struct inode
+ 	up(&info->sem);
+ }
+ 
+-static void shmem_delete_inode(struct inode * inode)
++static struct inode *
++shmem_find_inode(struct super_block *sb, long int ino)
++{
++	struct list_head *p;
++	struct inode *inode = NULL;
++	struct shmem_inode_info *info;
++
++	spin_lock (&shmem_ilock);
++	list_for_each(p, &shmem_inodes) {
++		info = list_entry(p, struct shmem_inode_info, list);
++		
++		if (info->inode->i_ino == ino && 
++		    info->inode->i_sb == sb) 
++		{
++			inode = info->inode;
++			break;
++		}
++	}
++	
++	spin_unlock (&shmem_ilock);
++	
++	if (inode)
++		igrab(inode);
++		
++	return inode;
++}
++
++#define switch_fields(x,y) do {   \
++	__typeof__ (x) __tmp = x; \
++	x = y; y = __tmp; } while (0)
++
++static inline void
++switch_names(struct dentry *dentry, struct dentry *target)
++{
++	const unsigned char *old_name, *new_name;
++
++	memcpy(dentry->d_iname, target->d_iname, 
++	       DNAME_INLINE_LEN);
++	
++	old_name = target->d_name.name;
++	new_name = dentry->d_name.name;
++	
++	if (old_name == target->d_iname)
++		old_name = dentry->d_iname;
++	
++	if (new_name == dentry->d_iname)
++		new_name = target->d_iname;
++	
++	target->d_name.name = new_name;
++	dentry->d_name.name = old_name;
++}
++
++static struct dentry *
++shmem_iopen_lookup(struct inode *dir, 
++		   struct dentry *dentry)
++{
++	struct inode *inode;
++	unsigned long ino;
++	struct list_head *lp;
++	struct dentry *alternate;
++	char buf[SHMEM_IOPEN_NAME_LEN];
++	struct shmem_sb_info *sbinfo = SHMEM_SB(dir->i_sb);
++
++	if (dentry->d_name.len >= SHMEM_IOPEN_NAME_LEN)
++		return ERR_PTR(-ENAMETOOLONG);
++
++	memcpy(buf, dentry->d_name.name, dentry->d_name.len);
++	buf[dentry->d_name.len] = 0;
++
++	if (strcmp(buf, ".") == 0)
++		ino = dir->i_ino;
++	else if (strcmp(buf, "..") == 0)
++		ino = sbinfo->root_ino;
++	else
++		ino = simple_strtoul(buf, 0, 0);
++
++	if (ino < sbinfo->root_ino)
++		return ERR_PTR(-ENOENT);
++
++	if (!(inode = shmem_find_inode(dir->i_sb, ino)))
++		return ERR_PTR(-ENOENT);
++
++	ASSERT(list_empty(&dentry->d_alias));
++	ASSERT(list_empty(&dentry->d_hash));
++
++	/* preferrably return a connected dentry */
++	spin_lock(&dcache_lock);
++	list_for_each(lp, &inode->i_dentry) {
++		alternate = list_entry(lp, struct dentry, d_alias);
++		ASSERT(!(alternate->d_flags & DCACHE_NFSD_DISCONNECTED));
++	}
++
++	if (!list_empty(&inode->i_dentry)) {
++		alternate = list_entry(inode->i_dentry.next,
++				       struct dentry, d_alias);
++		dget_locked(alternate);
++		alternate->d_vfs_flags |= DCACHE_REFERENCED;
++		iput(inode);
++		spin_unlock(&dcache_lock);
++		return alternate;
++	}
++	dentry->d_flags |= DCACHE_NFSD_DISCONNECTED;
++
++	/* d_add(), but don't drop dcache_lock before adding dentry to inode */
++	list_add(&dentry->d_alias, &inode->i_dentry);
++	dentry->d_inode = inode;
++
++	__d_rehash(dentry, 0);
++	spin_unlock(&dcache_lock);
++
++	return NULL;
++}
++
++struct dentry *
++shmem_iopen_unalias(struct dentry *dentry, struct inode *inode)
++{
++	struct dentry *tmp, *goal = NULL;
++	struct list_head *lp;
++
++	list_for_each(lp, &inode->i_dentry) {
++		tmp = list_entry(lp, struct dentry, d_alias);
++		if (tmp->d_flags & DCACHE_NFSD_DISCONNECTED) {
++			ASSERT(tmp->d_alias.next == &inode->i_dentry);
++			ASSERT(tmp->d_alias.prev == &inode->i_dentry);
++			goal = tmp;
++			dget_locked(goal);
++			break;
++		}
++	}
++
++	if (!goal)
++		return NULL;
++
++	goal->d_flags &= ~DCACHE_NFSD_DISCONNECTED;
++	list_del_init(&goal->d_hash);
++
++	list_del(&goal->d_child);
++	list_del(&dentry->d_child);
++
++	switch_names(goal, dentry);
++	switch_fields(goal->d_parent, dentry->d_parent);
++	switch_fields(goal->d_name.len, dentry->d_name.len);
++	switch_fields(goal->d_name.hash, dentry->d_name.hash);
++
++	list_add(&goal->d_child, &goal->d_parent->d_subdirs);
++	list_add(&dentry->d_child, &dentry->d_parent->d_subdirs);
++	__d_rehash(goal, 0);
++
++	return goal;
++}
++
++static struct inode_operations iopen_inode_operations = {
++	lookup:		shmem_iopen_lookup,
++};
++
++static void
++shmem_delete_inode(struct inode *inode)
+ {
++	struct dentry *dentry;
++	
+ #ifdef CONFIG_TMPFS_XATTR
+ 	struct list_head *tmp, *p;
+ 	struct shmem_xattr *xattr;
+@@ -706,16 +887,30 @@ static void shmem_delete_inode(struct in
+ #endif
+ 	struct shmem_sb_info *sbinfo = SHMEM_SB(inode->i_sb);
+ 
+-	if (inode->i_op->truncate == shmem_truncate) {
++	if (inode->i_ino != SHMEM_IOPEN_INO) {
++		/* eliminating iopen alias */
++		spin_lock(&dcache_lock);
++		if (!list_empty(&inode->i_dentry)) {
++			dentry = list_entry(inode->i_dentry.next,
++					    struct dentry, d_alias);
++			shmem_iopen_unalias(dentry, inode);
++		}
++		spin_unlock(&dcache_lock);
++
+ 		spin_lock (&shmem_ilock);
+ 		list_del (&SHMEM_I(inode)->list);
+ 		spin_unlock (&shmem_ilock);
+-		inode->i_size = 0;
+-		shmem_truncate (inode);
++	
++		if (inode->i_op->truncate == shmem_truncate) {
++			inode->i_size = 0;
++			shmem_truncate (inode);
++		}
++	
++		spin_lock (&sbinfo->stat_lock);
++		sbinfo->free_inodes++;
++		spin_unlock (&sbinfo->stat_lock);
+ 	}
+-	spin_lock (&sbinfo->stat_lock);
+-	sbinfo->free_inodes++;
+-	spin_unlock (&sbinfo->stat_lock);
++	
+ #ifdef CONFIG_TMPFS_XATTR
+         list_for_each_safe(p, tmp, &info->xattrs) {
+                 xattr = list_entry(p, struct shmem_xattr, list);
+@@ -725,7 +920,8 @@ static void shmem_delete_inode(struct in
+ 	clear_inode(inode);
+ }
+ 
+-static inline int shmem_find_swp(swp_entry_t entry, swp_entry_t *ptr, swp_entry_t *eptr)
++static inline int
++shmem_find_swp(swp_entry_t entry, swp_entry_t *ptr, swp_entry_t *eptr)
+ {
+ 	swp_entry_t *test;
+ 
+@@ -736,7 +932,9 @@ static inline int shmem_find_swp(swp_ent
+ 	return -1;
+ }
+ 
+-static int shmem_unuse_inode(struct shmem_inode_info *info, swp_entry_t entry, struct page *page)
++static int
++shmem_unuse_inode(struct shmem_inode_info *info, swp_entry_t entry,
++		  struct page *page)
+ {
+ 	swp_entry_t *ptr;
+ 	unsigned long idx;
+@@ -875,9 +1073,11 @@ getswap:
+  * still need to guard against racing with shm_writepage(), which might
+  * be trying to move the page to the swap cache as we run.
+  */
+-static struct page * shmem_getpage_locked(struct shmem_inode_info *info, struct inode * inode, unsigned long idx)
++struct page *
++shmem_getpage_locked(struct inode *inode, unsigned long idx)
+ {
+ 	struct address_space * mapping = inode->i_mapping;
++	struct shmem_inode_info *info = SHMEM_I(inode);
+ 	struct shmem_sb_info *sbinfo;
+ 	struct page * page;
+ 	swp_entry_t *entry;
+@@ -941,7 +1141,8 @@ repeat:
+ 		swap_free(*entry);
+ 		*entry = (swp_entry_t) {0};
+ 		delete_from_swap_cache(page);
+-		flags = page->flags & ~((1 << PG_uptodate) | (1 << PG_error) | (1 << PG_referenced) | (1 << PG_arch_1));
++		flags = page->flags & ~((1 << PG_uptodate) | (1 << PG_error) |
++					(1 << PG_referenced) | (1 << PG_arch_1));
+ 		page->flags = flags | (1 << PG_dirty);
+ 		add_to_page_cache_locked(page, mapping, idx);
+ 		info->swapped--;
+@@ -985,46 +1186,53 @@ wait_retry:
+ 	goto repeat;
+ }
+ 
+-int shmem_getpage(struct inode * inode, unsigned long idx, struct page **ptr)
++struct page *
++shmem_getpage_unlocked(struct inode *inode, unsigned long idx)
+ {
++	struct page *page;
+ 	struct shmem_inode_info *info = SHMEM_I(inode);
+-	int error;
+ 
+-	down (&info->sem);
+-	*ptr = ERR_PTR(-EFAULT);
+-	if (inode->i_size <= (loff_t) idx * PAGE_CACHE_SIZE)
++	down(&info->sem);
++	page = ERR_PTR(-EFAULT);
++	
++	if (inode->i_size <= (loff_t)idx * PAGE_CACHE_SIZE)
+ 		goto failed;
+ 
+-	*ptr = shmem_getpage_locked(info, inode, idx);
+-	if (IS_ERR (*ptr))
++	page = shmem_getpage_locked(inode, idx);
++	
++	if (IS_ERR(page))
+ 		goto failed;
+ 
+-	UnlockPage(*ptr);
+-	up (&info->sem);
+-	return 0;
++	UnlockPage(page);
++	up(&info->sem);
++	return page;
+ failed:
+-	up (&info->sem);
+-	error = PTR_ERR(*ptr);
+-	*ptr = NOPAGE_SIGBUS;
+-	if (error == -ENOMEM)
+-		*ptr = NOPAGE_OOM;
+-	return error;
++	up(&info->sem);
++
++	if (PTR_ERR(page) == -ENOMEM)
++		return NOPAGE_OOM;
++	
++	return page;
+ }
+ 
+-struct page * shmem_nopage(struct vm_area_struct * vma, unsigned long address, int unused)
++struct page *
++shmem_nopage(struct vm_area_struct *vma, 
++	     unsigned long address, int unused)
+ {
+-	struct page * page;
+ 	unsigned int idx;
++	struct page * page;
+ 	struct inode * inode = vma->vm_file->f_dentry->d_inode;
+ 
+-	idx = (address - vma->vm_start) >> PAGE_CACHE_SHIFT;
+-	idx += vma->vm_pgoff;
++	idx = ((address - vma->vm_start) >> PAGE_CACHE_SHIFT) +
++		vma->vm_pgoff;
+ 
+-	if (shmem_getpage(inode, idx, &page))
++	page = shmem_getpage_unlocked(inode, idx);
++	
++	if (IS_ERR(page))
+ 		return page;
+ 
+ 	flush_page_to_ram(page);
+-	return(page);
++	return page;
+ }
+ 
+ void shmem_lock(struct file * file, int lock)
+@@ -1037,7 +1245,8 @@ void shmem_lock(struct file * file, int 
+ 	up(&info->sem);
+ }
+ 
+-static int shmem_mmap(struct file * file, struct vm_area_struct * vma)
++static int
++shmem_mmap(struct file * file, struct vm_area_struct * vma)
+ {
+ 	struct vm_operations_struct * ops;
+ 	struct inode *inode = file->f_dentry->d_inode;
+@@ -1050,39 +1259,53 @@ static int shmem_mmap(struct file * file
+ 	return 0;
+ }
+ 
+-struct inode *shmem_get_inode(struct super_block *sb, int mode, int dev)
++static void
++shmem_fill_inode(struct inode *inode, int mode, int dev)
+ {
+-	struct inode * inode;
+ 	struct shmem_inode_info *info;
+-	struct shmem_sb_info *sbinfo = SHMEM_SB(sb);
++	
++	info = SHMEM_I(inode);
++	info->inode = inode;
++	spin_lock_init (&info->lock);
++	sema_init (&info->sem, 1);
+ 
+-	spin_lock (&sbinfo->stat_lock);
+-	if (!sbinfo->free_inodes) {
+-		spin_unlock (&sbinfo->stat_lock);
+-		return NULL;
+-	}
+-	sbinfo->free_inodes--;
+-	spin_unlock (&sbinfo->stat_lock);
++#ifdef CONFIG_TMPFS_XATTR
++	INIT_LIST_HEAD(&info->xattrs);
++	info->xtail = &info->xattrs;
++#endif
+ 
+-	inode = new_inode(sb);
+-	if (inode) {
++	inode->i_blocks = 0;
++	inode->i_rdev = NODEV;
++	inode->i_atime = CURRENT_TIME;
++	inode->i_ctime = CURRENT_TIME;
++	inode->i_mtime = CURRENT_TIME;
++	inode->i_blksize = PAGE_CACHE_SIZE;
++	
++	/* handling speciall iopen inode. */
++	if (inode->i_ino == SHMEM_IOPEN_INO) {
++		struct shmem_sb_info *sbinfo = SHMEM_SB(inode->i_sb);
++		
++		inode->i_mode = S_IFDIR | S_IRUSR | S_IXUSR;
++	
++		if (sbinfo->options & SHMEM_MOUNT_IOPEN_NOPRIV)
++			inode->i_mode |= 0777;
++		
++		inode->i_uid = 0;
++		inode->i_gid = 0;
++		inode->i_nlink = 1;
++		inode->i_size = 2 * BOGO_DIRENT_SIZE;
++		inode->i_version = 1;
++		inode->i_generation = 0;
++
++		inode->i_op = &iopen_inode_operations;
++		inode->i_fop = &dcache_dir_ops;
++		inode->i_mapping->a_ops = 0;
++	} else {
+ 		inode->i_mode = mode;
+ 		inode->i_uid = current->fsuid;
+ 		inode->i_gid = current->fsgid;
+-		inode->i_blksize = PAGE_CACHE_SIZE;
+-		inode->i_blocks = 0;
+-		inode->i_rdev = NODEV;
+ 		inode->i_mapping->a_ops = &shmem_aops;
+-		inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
+-		info = SHMEM_I(inode);
+-		info->inode = inode;
+-		spin_lock_init (&info->lock);
+-		sema_init (&info->sem, 1);
+ 
+-#ifdef CONFIG_TMPFS_XATTR
+-		INIT_LIST_HEAD(&info->xattrs);
+-		info->xtail = &info->xattrs;
+-#endif
+ 		switch (mode & S_IFMT) {
+ 		default:
+ 			init_special_inode(inode, mode, dev);
+@@ -1090,9 +1313,6 @@ struct inode *shmem_get_inode(struct sup
+ 		case S_IFREG:
+ 			inode->i_op = &shmem_inode_operations;
+ 			inode->i_fop = &shmem_file_operations;
+-			spin_lock (&shmem_ilock);
+-			list_add_tail(&info->list, &shmem_inodes);
+-			spin_unlock (&shmem_ilock);
+ 			break;
+ 		case S_IFDIR:
+ 			inode->i_nlink++;
+@@ -1104,12 +1324,59 @@ struct inode *shmem_get_inode(struct sup
+ 		case S_IFLNK:
+ 			break;
+ 		}
++		
++		spin_lock (&shmem_ilock);
++		list_add_tail(&info->list, &shmem_inodes);
++		spin_unlock (&shmem_ilock);
++	}
++}
++
++struct inode *
++shmem_get_inode(struct super_block *sb, 
++		int mode, int dev, int root)
++{
++	struct inode *inode;
++	struct shmem_sb_info *sbinfo = SHMEM_SB(sb);
++
++	spin_lock (&sbinfo->stat_lock);
++	if (!sbinfo->free_inodes) {
++		spin_unlock (&sbinfo->stat_lock);
++		return NULL;
++	}
++	sbinfo->free_inodes--;
++	spin_unlock (&sbinfo->stat_lock);
++
++	if ((inode = new_inode(sb))) {
++		shmem_fill_inode(inode, mode, dev);
++		if (root)
++			sbinfo->root_ino = inode->i_ino;
+ 	}
++	
+ 	return inode;
+ }
+ 
+-static int shmem_set_size(struct shmem_sb_info *info,
+-			  unsigned long max_blocks, unsigned long max_inodes)
++void shmem_read_inode(struct inode *inode)
++{
++	struct shmem_sb_info *sbinfo;
++
++	if (inode->i_ino != SHMEM_IOPEN_INO)
++		return;
++		
++	sbinfo = SHMEM_SB(inode->i_sb);
++	
++	spin_lock (&sbinfo->stat_lock);
++	if (!sbinfo->free_inodes) {
++		spin_unlock (&sbinfo->stat_lock);
++		return;
++	}
++	sbinfo->free_inodes--;
++	spin_unlock (&sbinfo->stat_lock);
++	shmem_fill_inode(inode, 0, 0);
++}
++
++static int
++shmem_set_size(struct shmem_sb_info *info, unsigned long max_blocks, 
++	       unsigned long max_inodes)
+ {
+ 	int error;
+ 	unsigned long blocks, inodes;
+@@ -1192,7 +1459,6 @@ shmem_file_write(struct file *file,const
+ 
+ 	while (count) {
+ 		unsigned long bytes, index, offset;
+-		char *kaddr;
+ 
+ 		/*
+ 		 * Try to find the page in the cache. If it isn't there,
+@@ -1201,9 +1467,9 @@ shmem_file_write(struct file *file,const
+ 		offset = (pos & (PAGE_CACHE_SIZE -1)); /* Within page */
+ 		index = pos >> PAGE_CACHE_SHIFT;
+ 		bytes = PAGE_CACHE_SIZE - offset;
+-		if (bytes > count) {
++
++		if (bytes > count)
+ 			bytes = count;
+-		}
+ 
+ 		/*
+ 		 * Bring in the user page that we will copy from _first_.
+@@ -1218,7 +1484,7 @@ shmem_file_write(struct file *file,const
+ 
+ 		info = SHMEM_I(inode);
+ 		down (&info->sem);
+-		page = shmem_getpage_locked(info, inode, index);
++		page = shmem_getpage_locked(inode, index);
+ 		up (&info->sem);
+ 
+ 		status = PTR_ERR(page);
+@@ -1226,17 +1492,19 @@ shmem_file_write(struct file *file,const
+ 			break;
+ 
+ 		/* We have exclusive IO access to the page.. */
+-		if (!PageLocked(page)) {
++		if (!PageLocked(page))
+ 			PAGE_BUG(page);
+-		}
+ 
+-		kaddr = kmap(page);
+-		status = copy_from_user(kaddr+offset, buf, bytes);
++		status = copy_from_user(kmap(page) + offset,
++					buf, bytes);
++		
+ 		kunmap(page);
++
+ 		if (status)
+ 			goto fail_write;
+ 
+ 		flush_dcache_page(page);
++		
+ 		if (bytes > 0) {
+ 			SetPageDirty(page);
+ 			written += bytes;
+@@ -1266,7 +1534,8 @@ fail_write:
+ 	goto unlock;
+ }
+ 
+-static void do_shmem_file_read(struct file * filp, loff_t *ppos, read_descriptor_t * desc)
++static void
++do_shmem_file_read(struct file * filp, loff_t *ppos, read_descriptor_t * desc)
+ {
+ 	struct inode *inode = filp->f_dentry->d_inode;
+ 	struct address_space *mapping = inode->i_mapping;
+@@ -1292,15 +1561,18 @@ static void do_shmem_file_read(struct fi
+ 
+ 		nr = nr - offset;
+ 
+-		if ((desc->error = shmem_getpage(inode, index, &page)))
++		page = shmem_getpage_unlocked(inode, index);
++
++		if (IS_ERR(page)) {
++			desc->error = PTR_ERR(page);
+ 			break;
++		}
+ 
+ 		if (mapping->i_mmap_shared != NULL)
+ 			flush_dcache_page(page);
+ 
+-		/*
+-		 * Ok, we have the page, and it's up-to-date, so
+-		 * now we can copy it to user space...
++		/* Ok, we have the page, and it's up-to-date, so now we can copy
++		 * it to user space...
+ 		 *
+ 		 * The actor routine returns how many bytes were actually used..
+ 		 * NOTE! This may not be the same as how much of a user buffer
+@@ -1309,6 +1581,8 @@ static void do_shmem_file_read(struct fi
+ 		 * pointers and the remaining count).
+ 		 */
+ 		nr = file_read_actor(desc, page, offset, nr);
++
++		/* updating counters */
+ 		offset += nr;
+ 		index += offset >> PAGE_CACHE_SHIFT;
+ 		offset &= ~PAGE_CACHE_MASK;
+@@ -1320,7 +1594,8 @@ static void do_shmem_file_read(struct fi
+ 	UPDATE_ATIME(inode);
+ }
+ 
+-static ssize_t shmem_file_read(struct file * filp, char * buf, size_t count, loff_t *ppos)
++static ssize_t
++shmem_file_read(struct file * filp, char * buf, size_t count, loff_t *ppos)
+ {
+ 	ssize_t retval;
+ 
+@@ -1345,7 +1620,8 @@ static ssize_t shmem_file_read(struct fi
+ 	return retval;
+ }
+ 
+-static int shmem_statfs(struct super_block *sb, struct statfs *buf)
++static int
++shmem_statfs(struct super_block *sb, struct statfs *buf)
+ {
+ 	struct shmem_sb_info *sbinfo = SHMEM_SB(sb);
+ 
+@@ -1361,22 +1637,62 @@ static int shmem_statfs(struct super_blo
+ 	return 0;
+ }
+ 
+-/*
+- * Lookup the data. This is trivial - if the dentry didn't already
+- * exist, we know it is negative.
+- */
+-static struct dentry * shmem_lookup(struct inode *dir, struct dentry *dentry)
++static int
++match_dentry(struct dentry *dentry, const char *name)
++{
++	int len = strlen(name);
++	
++	if (dentry->d_name.len != len)
++		return 0;
++		
++	if (strncmp(dentry->d_name.name, name, len))
++		return 0;
++		
++	return 1;
++}
++
++static int
++shmem_iopen_check(struct inode *dir, struct dentry *dentry)
++{
++	struct inode *inode;
++	struct shmem_sb_info *sbinfo = SHMEM_SB(dir->i_sb);
++
++	if (dir->i_ino != sbinfo->root_ino ||
++	    !(sbinfo->options & SHMEM_MOUNT_IOPEN) ||
++	    !match_dentry(dentry, "__iopen__"))
++	{
++		return 0;
++	}
++
++	if (!(inode = iget(dir->i_sb, SHMEM_IOPEN_INO)))
++		return 0;
++		
++	d_add(dentry, inode);
++	
++	spin_lock (&sbinfo->stat_lock);
++	sbinfo->iopen = dentry;
++	spin_unlock (&sbinfo->stat_lock);
++	
++	dget(dentry);
++	return 1;
++}
++
++static struct dentry *
++shmem_lookup(struct inode *dir, struct dentry *dentry)
+ {
+-	d_add(dentry, NULL);
++	if (!shmem_iopen_check(dir, dentry))
++		d_add(dentry, NULL);
++	
+ 	return NULL;
+ }
+ 
+ /*
+  * File creation. Allocate an inode, and we're done..
+  */
+-static int shmem_mknod(struct inode *dir, struct dentry *dentry, int mode, int dev)
++static int
++shmem_mknod(struct inode *dir, struct dentry *dentry, int mode, int dev)
+ {
+-	struct inode * inode = shmem_get_inode(dir->i_sb, mode, dev);
++	struct inode *inode = shmem_get_inode(dir->i_sb, mode, dev, 0);
+ 	int error = -ENOSPC;
+ 
+ 	if (inode) {
+@@ -1386,20 +1702,24 @@ static int shmem_mknod(struct inode *dir
+ 		dget(dentry); /* Extra count - pin the dentry in core */
+ 		error = 0;
+ 	}
++	
+ 	return error;
+ }
+ 
+-static int shmem_mkdir(struct inode * dir, struct dentry * dentry, int mode)
++static int
++shmem_mkdir(struct inode * dir, struct dentry * dentry, int mode)
+ {
+ 	int error;
+ 
+ 	if ((error = shmem_mknod(dir, dentry, mode | S_IFDIR, 0)))
+ 		return error;
++		
+ 	dir->i_nlink++;
+ 	return 0;
+ }
+ 
+-static int shmem_create(struct inode *dir, struct dentry *dentry, int mode)
++static int
++shmem_create(struct inode *dir, struct dentry *dentry, int mode)
+ {
+ 	return shmem_mknod(dir, dentry, mode | S_IFREG, 0);
+ }
+@@ -1407,7 +1727,8 @@ static int shmem_create(struct inode *di
+ /*
+  * Link a file..
+  */
+-static int shmem_link(struct dentry *old_dentry, struct inode * dir, struct dentry * dentry)
++static int
++shmem_link(struct dentry *old_dentry, struct inode * dir, struct dentry * dentry)
+ {
+ 	struct inode *inode = old_dentry->d_inode;
+ 
+@@ -1429,13 +1750,11 @@ static inline int shmem_positive(struct 
+ }
+ 
+ /*
+- * Check that a directory is empty (this works
+- * for regular files too, they'll just always be
+- * considered empty..).
++ * Check that a directory is empty (this works for regular files too, they'll
++ * just always be considered empty..).
+  *
+- * Note that an empty directory can still have
+- * children, they just all have to be negative..
+- */
++ * Note that an empty directory can still have children, they just all have to
++ * be negative.. */
+ static int shmem_empty(struct dentry *dentry)
+ {
+ 	struct list_head *list;
+@@ -1456,18 +1775,22 @@ static int shmem_empty(struct dentry *de
+ 	return 1;
+ }
+ 
+-static int shmem_unlink(struct inode * dir, struct dentry *dentry)
++static int
++shmem_unlink(struct inode *dir, struct dentry *dentry)
+ {
+ 	struct inode *inode = dentry->d_inode;
+ 
+ 	dir->i_size -= BOGO_DIRENT_SIZE;
+ 	inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME;
+ 	inode->i_nlink--;
+-	dput(dentry);	/* Undo the count from "create" - this does all the work */
++	
++	/* undo the count from "create" - this does all the work. */
++	dput(dentry);
+ 	return 0;
+ }
+ 
+-static int shmem_rmdir(struct inode * dir, struct dentry *dentry)
++static int
++shmem_rmdir(struct inode *dir, struct dentry *dentry)
+ {
+ 	if (!shmem_empty(dentry))
+ 		return -ENOTEMPTY;
+@@ -1477,12 +1800,13 @@ static int shmem_rmdir(struct inode * di
+ }
+ 
+ /*
+- * The VFS layer already does all the dentry stuff for rename,
+- * we just have to decrement the usage count for the target if
+- * it exists so that the VFS layer correctly free's it when it
+- * gets overwritten.
++ * The VFS layer already does all the dentry stuff for rename, we just have to
++ * decrement the usage count for the target if it exists so that the VFS layer
++ * correctly free's it when it gets overwritten.
+  */
+-static int shmem_rename(struct inode * old_dir, struct dentry *old_dentry, struct inode * new_dir,struct dentry *new_dentry)
++static int
++shmem_rename(struct inode *old_dir, struct dentry *old_dentry,
++	     struct inode *new_dir, struct dentry *new_dentry)
+ {
+ 	struct inode *inode = old_dentry->d_inode;
+ 	int they_are_dirs = S_ISDIR(inode->i_mode);
+@@ -1507,19 +1831,20 @@ static int shmem_rename(struct inode * o
+ 	return 0;
+ }
+ 
+-static int shmem_symlink(struct inode * dir, struct dentry *dentry, const char * symname)
++static int
++shmem_symlink(struct inode *dir, struct dentry *dentry,
++	      const char *symname)
+ {
+ 	int len;
+-	struct inode *inode;
+ 	struct page *page;
+-	char *kaddr;
+-	struct shmem_inode_info * info;
++	struct inode *inode;
++	struct shmem_inode_info *info;
+ 
+ 	len = strlen(symname) + 1;
+ 	if (len > PAGE_CACHE_SIZE)
+ 		return -ENAMETOOLONG;
+ 
+-	inode = shmem_get_inode(dir->i_sb, S_IFLNK|S_IRWXUGO, 0);
++	inode = shmem_get_inode(dir->i_sb, S_IFLNK|S_IRWXUGO, 0, 0);
+ 	if (!inode)
+ 		return -ENOSPC;
+ 
+@@ -1531,7 +1856,7 @@ static int shmem_symlink(struct inode * 
+ 		inode->i_op = &shmem_symlink_inline_operations;
+ 	} else {
+ 		down(&info->sem);
+-		page = shmem_getpage_locked(info, inode, 0);
++		page = shmem_getpage_locked(inode, 0);
+ 		if (IS_ERR(page)) {
+ 			up(&info->sem);
+ 			iput(inode);
+@@ -1541,8 +1866,7 @@ static int shmem_symlink(struct inode * 
+ 		spin_lock (&shmem_ilock);
+ 		list_add_tail(&info->list, &shmem_inodes);
+ 		spin_unlock (&shmem_ilock);
+-		kaddr = kmap(page);
+-		memcpy(kaddr, symname, len);
++		memcpy(kmap(page), symname, len);
+ 		kunmap(page);
+ 		SetPageDirty(page);
+ 		UnlockPage(page);
+@@ -1556,40 +1880,52 @@ static int shmem_symlink(struct inode * 
+ 	return 0;
+ }
+ 
+-static int shmem_readlink_inline(struct dentry *dentry, char *buffer, int buflen)
++static int
++shmem_readlink_inline(struct dentry *dentry, char *buffer, int buflen)
+ {
+-	return vfs_readlink(dentry,buffer,buflen, (const char *)SHMEM_I(dentry->d_inode));
++	return vfs_readlink(dentry,buffer, buflen,
++			    (const char *)SHMEM_I(dentry->d_inode));
+ }
+ 
+-static int shmem_follow_link_inline(struct dentry *dentry, struct nameidata *nd)
++static int
++shmem_follow_link_inline(struct dentry *dentry, struct nameidata *nd)
+ {
+ 	return vfs_follow_link(nd, (const char *)SHMEM_I(dentry->d_inode));
+ }
+ 
+-static int shmem_readlink(struct dentry *dentry, char *buffer, int buflen)
++static int
++shmem_readlink(struct dentry *dentry, char *buffer, int buflen)
+ {
+-	struct page * page;
+-	int res = shmem_getpage(dentry->d_inode, 0, &page);
++	int res;
++	struct page *page;
++
++	page = shmem_getpage_unlocked(dentry->d_inode, 0);
+ 
+-	if (res)
+-		return res;
++	if (IS_ERR(page))
++		return PTR_ERR(page);
+ 
+ 	res = vfs_readlink(dentry,buffer,buflen, kmap(page));
+ 	kunmap(page);
+ 	page_cache_release(page);
++	
+ 	return res;
+ }
+ 
+-static int shmem_follow_link(struct dentry *dentry, struct nameidata *nd)
++static int
++shmem_follow_link(struct dentry *dentry, struct nameidata *nd)
+ {
+ 	struct page * page;
+-	int res = shmem_getpage(dentry->d_inode, 0, &page);
+-	if (res)
+-		return res;
++	int res;
++
++	page = shmem_getpage_unlocked(dentry->d_inode, 0);
++
++	if (IS_ERR(page))
++		return PTR_ERR(page);
+ 
+ 	res = vfs_follow_link(nd, kmap(page));
+ 	kunmap(page);
+ 	page_cache_release(page);
++
+ 	return res;
+ }
+ 
+@@ -1610,7 +1946,10 @@ static struct inode_operations shmem_sym
+ #endif
+ };
+ 
+-static int shmem_parse_options(char *options, int *mode, uid_t *uid, gid_t *gid, unsigned long * blocks, unsigned long *inodes)
++static int
++shmem_parse_options(char *options, int *mode, uid_t *uid, gid_t *gid, 
++		    unsigned long *blocks, unsigned long *inodes, 
++		    unsigned long *opts)
+ {
+ 	char *this_char, *value, *rest;
+ 
+@@ -1620,11 +1959,6 @@ static int shmem_parse_options(char *opt
+ 	for ( ; this_char; this_char = strtok(NULL,",")) {
+ 		if ((value = strchr(this_char,'=')) != NULL) {
+ 			*value++ = 0;
+-		} else {
+-			printk(KERN_ERR 
+-			    "tmpfs: No value for mount option '%s'\n", 
+-			    this_char);
+-			return 1;
+ 		}
+ 
+ 		if (!strcmp(this_char,"size")) {
+@@ -1659,6 +1993,17 @@ static int shmem_parse_options(char *opt
+ 			*gid = simple_strtoul(value,&rest,0);
+ 			if (*rest)
+ 				goto bad_val;
++		} else if (!strcmp(this_char, "iopen")) {
++			*opts |= SHMEM_MOUNT_IOPEN;
++			*opts &= ~SHMEM_MOUNT_IOPEN_NOPRIV;
++		}
++		else if (!strcmp(this_char, "noiopen")) {
++			*opts &= ~SHMEM_MOUNT_IOPEN;
++			*opts &= ~SHMEM_MOUNT_IOPEN_NOPRIV;
++		}
++		else if (!strcmp (this_char, "iopen_nopriv")) {
++			*opts |= SHMEM_MOUNT_IOPEN;
++			*opts |= SHMEM_MOUNT_IOPEN_NOPRIV;
+ 		} else {
+ 			printk(KERN_ERR "tmpfs: Bad mount option %s\n",
+ 			       this_char);
+@@ -1674,14 +2019,19 @@ bad_val:
+ 
+ }
+ 
+-static int shmem_remount_fs (struct super_block *sb, int *flags, char *data)
++static int
++shmem_remount_fs(struct super_block *sb, int *flags, char *data)
+ {
+ 	struct shmem_sb_info *sbinfo = &sb->u.shmem_sb;
+ 	unsigned long max_blocks = sbinfo->max_blocks;
+ 	unsigned long max_inodes = sbinfo->max_inodes;
+ 
+-	if (shmem_parse_options (data, NULL, NULL, NULL, &max_blocks, &max_inodes))
++	if (shmem_parse_options (data, NULL, NULL, NULL, &max_blocks, 
++				 &max_inodes, &sbinfo->options))
++	{
+ 		return -EINVAL;
++	}
++		
+ 	return shmem_set_size(sbinfo, max_blocks, max_inodes);
+ }
+ 
+@@ -1691,7 +2041,8 @@ int shmem_sync_file(struct file * file, 
+ }
+ #endif
+ 
+-static struct super_block *shmem_read_super(struct super_block * sb, void * data, int silent)
++static struct super_block *
++shmem_read_super(struct super_block * sb, void * data, int silent)
+ {
+ 	struct inode * inode;
+ 	struct dentry * root;
+@@ -1710,11 +2061,15 @@ static struct super_block *shmem_read_su
+ 	blocks = inodes = si.totalram / 2;
+ 
+ #ifdef CONFIG_TMPFS
+-	if (shmem_parse_options (data, &mode, &uid, &gid, &blocks, &inodes))
++	if (shmem_parse_options (data, &mode, &uid, &gid, &blocks, 
++				 &inodes, &sbinfo->options))
++	{
+ 		return NULL;
++	}
+ #endif
+ 
+ 	spin_lock_init (&sbinfo->stat_lock);
++	sbinfo->iopen = NULL;
+ 	sbinfo->max_blocks = blocks;
+ 	sbinfo->free_blocks = blocks;
+ 	sbinfo->max_inodes = inodes;
+@@ -1724,7 +2079,7 @@ static struct super_block *shmem_read_su
+ 	sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
+ 	sb->s_magic = TMPFS_MAGIC;
+ 	sb->s_op = &shmem_ops;
+-	inode = shmem_get_inode(sb, S_IFDIR | mode, 0);
++	inode = shmem_get_inode(sb, S_IFDIR | mode, 0, 1);
+ 	if (!inode)
+ 		return NULL;
+ 
+@@ -1739,7 +2094,19 @@ static struct super_block *shmem_read_su
+ 	return sb;
+ }
+ 
++void shmem_put_super(struct super_block *sb)
++{
++	struct dentry *iopen;
++	struct shmem_sb_info *sbinfo = SHMEM_SB(sb);
+ 
++	spin_lock(&sbinfo->stat_lock);
++	iopen = sbinfo->iopen;
++	sbinfo->iopen = NULL;
++	spin_unlock(&sbinfo->stat_lock);
++
++	if (iopen)
++		dput(iopen);
++}
+ 
+ static struct address_space_operations shmem_aops = {
+ 	writepage:	shmem_writepage,
+@@ -1790,11 +2157,13 @@ static struct super_operations shmem_ops
+ 	remount_fs:	shmem_remount_fs,
+ #endif
+ 	delete_inode:	shmem_delete_inode,
+-	put_inode:	force_delete,	
++	read_inode:	shmem_read_inode,
++	put_inode:	force_delete,
++	put_super:	shmem_put_super,
+ };
+ 
+ static struct vm_operations_struct shmem_vm_ops = {
+-	nopage:	shmem_nopage,
++	nopage:		shmem_nopage,
+ };
+ 
+ #ifdef CONFIG_TMPFS
+@@ -1885,7 +2254,7 @@ struct file *shmem_file_setup(char * nam
+ 		goto put_dentry;
+ 
+ 	error = -ENOSPC;
+-	inode = shmem_get_inode(root->d_sb, S_IFREG | S_IRWXUGO, 0);
++	inode = shmem_get_inode(root->d_sb, S_IFREG | S_IRWXUGO, 0, 0);
+ 	if (!inode) 
+ 		goto close_file;
+ 
+@@ -1921,15 +2290,17 @@ int shmem_zero_setup(struct vm_area_stru
+ 
+ 	if (vma->vm_file)
+ 		fput (vma->vm_file);
++	
+ 	vma->vm_file = file;
+ 	vma->vm_ops = &shmem_vm_ops;
+ 	return 0;
+ }
+ 
+ EXPORT_SYMBOL(shmem_file_setup);
+-EXPORT_SYMBOL(shmem_getpage);
+ EXPORT_SYMBOL(shmem_xattr_find);
+ EXPORT_SYMBOL(shmem_xattr_set);
+ EXPORT_SYMBOL(shmem_xattr_get);
+ EXPORT_SYMBOL(shmem_xattr_delete);
+ EXPORT_SYMBOL(shmem_xattr_remove);
++EXPORT_SYMBOL(shmem_getpage_locked);
++EXPORT_SYMBOL(shmem_getpage_unlocked);
diff --git a/lustre/kernel_patches/patches/linux-2.4.20-tmpfs-xattr.patch b/lustre/kernel_patches/patches/linux-2.4.20-tmpfs-xattr.patch
new file mode 100644
index 0000000..a807ac7
--- /dev/null
+++ b/lustre/kernel_patches/patches/linux-2.4.20-tmpfs-xattr.patch
@@ -0,0 +1,543 @@
+diff -rupN --exclude='ide*' linux-2.4.20.orig/fs/Config.in linux-2.4.20/fs/Config.in
+--- linux-2.4.20.orig/fs/Config.in	2002-11-29 01:53:15.000000000 +0200
++++ linux-2.4.20/fs/Config.in	2004-02-08 21:37:47.000000000 +0200
+@@ -48,6 +48,9 @@ if [ "$CONFIG_JFFS2_FS" = "y" -o "$CONFI
+ fi
+ tristate 'Compressed ROM file system support' CONFIG_CRAMFS
+ bool 'Virtual memory file system support (former shm fs)' CONFIG_TMPFS
++if [ "$CONFIG_TMPFS" = "y" ]; then
++   bool '  tmpfs Extended Attributes' CONFIG_TMPFS_XATTR
++fi
+ define_bool CONFIG_RAMFS y
+ 
+ tristate 'ISO 9660 CDROM file system support' CONFIG_ISO9660_FS
+diff -rupN --exclude='ide*' linux-2.4.20.orig/include/linux/mm.h linux-2.4.20/include/linux/mm.h
+--- linux-2.4.20.orig/include/linux/mm.h	2002-08-03 03:39:45.000000000 +0300
++++ linux-2.4.20/include/linux/mm.h	2004-02-10 11:43:10.000000000 +0200
+@@ -468,6 +468,7 @@ extern void clear_page_tables(struct mm_
+ extern int fail_writepage(struct page *);
+ struct page * shmem_nopage(struct vm_area_struct * vma, unsigned long address, int unused);
+ struct file *shmem_file_setup(char * name, loff_t size);
++int shmem_getpage(struct inode * inode, unsigned long idx, struct page **ptr);
+ extern void shmem_lock(struct file * file, int lock);
+ extern int shmem_zero_setup(struct vm_area_struct *);
+ 
+diff -rupN --exclude='ide*' linux-2.4.20.orig/include/linux/shmem_fs.h linux-2.4.20/include/linux/shmem_fs.h
+--- linux-2.4.20.orig/include/linux/shmem_fs.h	2001-12-21 19:42:03.000000000 +0200
++++ linux-2.4.20/include/linux/shmem_fs.h	2004-02-10 18:39:17.000000000 +0200
+@@ -3,6 +3,8 @@
+ 
+ /* inode in-kernel data */
+ 
++#include <linux/config.h>
++
+ #define SHMEM_NR_DIRECT 16
+ 
+ /*
+@@ -28,6 +30,10 @@ struct shmem_inode_info {
+ 	unsigned long		swapped;
+ 	int			locked;     /* into memory */
+ 	struct list_head	list;
++#ifdef CONFIG_TMPFS_XATTR
++	struct list_head	xattrs;
++	struct list_head	*xtail;
++#endif
+ 	struct inode	       *inode;
+ };
+ 
+@@ -39,6 +45,32 @@ struct shmem_sb_info {
+ 	spinlock_t    stat_lock;
+ };
+ 
++#ifdef CONFIG_TMPFS_XATTR
++struct shmem_xattr {
++	u8 namelen;
++	u16 valuelen;
++	void *entity;
++	struct list_head list;
++};
++
++extern struct shmem_xattr *
++shmem_xattr_find(struct inode *inode, const char *name);
++
++extern ssize_t
++shmem_xattr_set(struct inode *inode, const char *name,
++		const void *value, u16 valuelen, int flags);
++		
++extern ssize_t
++shmem_xattr_get(struct inode *inode, const char *name,
++		void *value, size_t valuelen);
++		
++extern int
++shmem_xattr_delete(struct inode *inode, struct shmem_xattr *xattr);
++
++extern int
++shmem_xattr_remove(struct inode *inode, const char *name);
++#endif
++
+ #define SHMEM_I(inode)  (&inode->u.shmem_i)
+ 
+ #endif
+diff -rupN --exclude='ide*' linux-2.4.20.orig/mm/shmem.c linux-2.4.20/mm/shmem.c
+--- linux-2.4.20.orig/mm/shmem.c	2002-11-29 01:53:15.000000000 +0200
++++ linux-2.4.20/mm/shmem.c	2004-02-10 18:44:05.000000000 +0200
+@@ -27,6 +27,8 @@
+ #include <linux/string.h>
+ #include <linux/locks.h>
+ #include <linux/smp_lock.h>
++#include <linux/slab.h>
++#include <linux/xattr.h>
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -58,6 +60,344 @@ atomic_t shmem_nrpages = ATOMIC_INIT(0);
+ 
+ static struct page *shmem_getpage_locked(struct shmem_inode_info *, struct inode *, unsigned long);
+ 
++#ifdef CONFIG_TMPFS
++static struct inode_operations shmem_symlink_inode_operations;
++static struct inode_operations shmem_symlink_inline_operations;
++#endif
++
++#ifdef CONFIG_TMPFS_XATTR
++#define xattr_name(xattr)			\
++	((char *)xattr->entity)
++
++#define xattr_value(xattr)				\
++	((void *)xattr->entity + xattr->namelen + 1)
++
++/* allocates memory for new xattr with name length of @namelen and value size of
++ * @valuelen. */
++static struct shmem_xattr *
++shmem_xattr_alloc(u8 namelen, u16 valuelen)
++{
++	u16 size;
++        struct shmem_xattr *xattr;
++                                                                                      
++	size = namelen + 1 + valuelen;
++
++        if (!(xattr = kmalloc(sizeof(*xattr), GFP_KERNEL)))
++                return NULL;
++
++	if (!(xattr->entity = kmalloc(size, GFP_KERNEL))) {
++		kfree(xattr);
++		return NULL;
++	}
++                                                                                      
++        xattr->namelen = namelen;
++        xattr->valuelen = valuelen;
++        return xattr;
++}
++
++/* reallocs passed @xattr with new @value. */
++static int
++shmem_xattr_realloc(struct shmem_xattr *xattr, u16 valuelen)
++{
++        if (xattr->valuelen != valuelen) {
++		u16 new_size;
++                void *entity;
++
++		/* allocating new entity. */
++		new_size = xattr->namelen + 1 + valuelen;
++                                                                                      
++		if (!(entity = kmalloc(new_size, GFP_KERNEL)))
++                        return -ENOMEM;
++
++		/* copying old name to new entity.*/
++		memcpy(entity, xattr->entity, xattr->namelen);
++		*((char *)(entity + xattr->namelen)) = '\0';
++
++		/* finishing the change.*/
++                kfree(xattr->entity);
++		xattr->entity = entity;
++                xattr->valuelen = valuelen;
++        }
++
++        return 0;
++}
++
++/* assigns @name and @value to passed @xattr. */
++static int
++shmem_xattr_assign(struct shmem_xattr *xattr,
++		   const char *name, const void *value)
++{
++	if (name) {
++		if (xattr->namelen != strlen(name))
++			return -EINVAL;
++		
++		memcpy(xattr->entity, name, xattr->namelen);
++		*((char *)(xattr->entity + xattr->namelen)) = '\0';
++	}
++
++	if (value) {
++		memcpy(xattr_value(xattr),
++		       value, xattr->valuelen);
++	}
++
++        return 0;
++}
++
++/* frees passed @xattr. */
++static void
++shmem_xattr_free(struct shmem_xattr *xattr)
++{
++        kfree(xattr->entity);
++        kfree(xattr);
++}
++
++/* lookups passed @name inside @inode's xattr list. */
++struct shmem_xattr *
++shmem_xattr_find(struct inode *inode, const char *name)
++{
++	u8 namelen;
++        struct list_head *p;
++        struct shmem_xattr *xattr;
++        struct shmem_inode_info *info;
++
++        info = SHMEM_I(inode);
++	namelen = strlen(name);
++
++        list_for_each(p, &info->xattrs) {
++                xattr = list_entry(p, struct shmem_xattr, list);
++
++                if (xattr->namelen == namelen &&
++                    !memcmp(xattr->entity, name, namelen))
++                {
++                        return xattr;
++                }
++        }
++
++        return NULL;
++}
++
++/* allocates new xattr and fills it with passed value, name, etc. */
++ssize_t
++shmem_xattr_set(struct inode *inode, const char *name,
++		const void *value, u16 valuelen, int flags)
++{
++	ssize_t error;
++        struct shmem_xattr *xattr;
++	struct shmem_inode_info *info;
++
++        xattr = shmem_xattr_find(inode, name);
++
++        if (xattr) {
++                if (flags & XATTR_CREATE)
++                        return -EEXIST;
++
++                if ((error = shmem_xattr_realloc(xattr, valuelen)))
++                        return error;
++
++		if ((error = shmem_xattr_assign(xattr, NULL, value)))
++			return error;
++        } else {
++                info = SHMEM_I(inode);
++
++		if (flags & XATTR_REPLACE)
++                        return -ENODATA;
++
++		if (!(xattr = shmem_xattr_alloc(strlen(name), valuelen)))
++			return -ENOMEM;
++
++		if ((error = shmem_xattr_assign(xattr, name, value)))
++			return error;
++		
++                list_add(&xattr->list, info->xtail);
++		info->xtail = &xattr->list;
++        }
++	
++        return 0;
++}
++
++/* fills passed @value by attribute value found by @name. */
++ssize_t
++shmem_xattr_get(struct inode *inode, const char *name,
++		void *value, size_t valuelen)
++{
++        struct shmem_xattr *xattr;
++
++        if (!(xattr = shmem_xattr_find(inode, name)))
++                return -ENODATA;
++
++        /* handling value size guess request */
++        if (valuelen == 0 || value == NULL)
++                return xattr->valuelen;
++
++        if (xattr->valuelen > valuelen)
++                return -ERANGE;
++
++        memcpy(value, xattr_value(xattr),
++	       xattr->valuelen);
++	
++        return xattr->valuelen;
++}
++
++/* deletes passed @xattr from inode xattr list and frees it. */
++int
++shmem_xattr_delete(struct inode *inode, struct shmem_xattr *xattr)
++{
++	struct shmem_inode_info *info;
++
++	info = SHMEM_I(inode);
++	
++	if (&xattr->list == info->xtail)
++		info->xtail = xattr->list.prev;
++	
++	list_del(&xattr->list);
++	shmem_xattr_free(xattr);
++
++	return 0;
++}
++
++/* removes attribute found by passed @name. */
++int
++shmem_xattr_remove(struct inode *inode, const char *name)
++{
++        struct shmem_xattr *xattr;
++
++        if (!(xattr = shmem_xattr_find(inode, name)))
++                return -ENODATA;
++
++	return shmem_xattr_delete(inode, xattr);
++}
++
++static int
++shmem_xattr_can_read(struct inode *inode, const char *name)
++{
++	/* check for inlined symlinks. They store path inside inode info and
++	 * thus, cannot be used for access xattrs. */
++	if (S_ISLNK(inode->i_mode) &&
++	    inode->i_op == &shmem_symlink_inline_operations)
++	{
++                return -EPERM;
++	}
++	
++	return permission(inode, MAY_READ);
++}
++                                                                                      
++static int
++shmem_xattr_can_write(struct inode *inode, const char *name)
++{
++        if (IS_RDONLY(inode))
++                return -EROFS;
++                                                                                      
++        if (IS_IMMUTABLE(inode) || IS_APPEND(inode) ||
++	    S_ISLNK(inode->i_mode))
++	{
++                return -EPERM;
++	}
++                                                                                      
++        if ((!S_ISREG(inode->i_mode) && !S_ISDIR(inode->i_mode)) ||
++	    inode->i_mode & S_ISVTX)
++	{
++                return -EPERM;
++	}
++                                                                                      
++        return permission(inode, MAY_WRITE);
++}
++
++/* fills passed @value with data of attribute @name from @dentry->d_inode
++ * attribute list. */
++static ssize_t
++shmem_getxattr(struct dentry *dentry, const char *name,
++               void *value, size_t valuelen)
++{
++        int error;
++        struct inode *inode = dentry->d_inode;
++
++	if (name == NULL)
++		return -EINVAL;
++                                                                                      
++        if ((error = shmem_xattr_can_read(inode, name)))
++                return error;
++
++	return shmem_xattr_get(inode, name,
++			       value, valuelen);
++                                                                                      
++}
++
++/* updates attribute with @name inside @dentry->d_inode attributes list (if
++ * any), or creates new attribute with name @name and value @value and put it to
++ * inode attributes list.*/
++static int
++shmem_setxattr(struct dentry *dentry, const char *name,
++               void *value, size_t valuelen, int flags)
++{
++        int error;
++        struct inode *inode = dentry->d_inode;
++                                                                                      
++	if (name == NULL)
++		return -EINVAL;
++	
++        if ((error = shmem_xattr_can_write(inode, name)))
++                return error;
++                                                                                      
++        if (value == NULL) {
++                value = "";
++                valuelen = 0;
++        }
++                                                                                      
++        return shmem_xattr_set(inode, name, value,
++			       valuelen, flags);
++}
++
++/* removes attribute with passed @name from @dentry->d_inode attributes list. */
++static int
++shmem_removexattr(struct dentry *dentry, const char *name)
++{
++        int error;
++        struct inode *inode = dentry->d_inode;
++                                                                                      
++	if (name == NULL)
++		return -EINVAL;
++
++        if ((error = shmem_xattr_can_write(inode, name)))
++                return error;
++                                                                                      
++        return shmem_xattr_remove(inode, name);
++}
++
++/* fills passed @data with list of @dentry->d_inode attributes. Returns size of
++ * actuall data put to @data. */
++static ssize_t
++shmem_listxattr(struct dentry *dentry, char *data, size_t buf_size)
++{
++        ssize_t size = 0;
++        struct list_head *p;
++        struct shmem_xattr *xattr;
++        struct shmem_inode_info *info;
++        struct inode *inode = dentry->d_inode;
++
++        info = SHMEM_I(inode);
++
++        list_for_each(p, &info->xattrs) {
++                xattr = list_entry(p, struct shmem_xattr, list);
++                size += xattr->namelen + 1;
++        }
++
++        /* handling data size guess request. */
++        if (buf_size == 0 || data == NULL)
++                return size;
++
++        if (size > buf_size)
++                return -ERANGE;
++
++        list_for_each(p, &info->xattrs) {
++                xattr = list_entry(p, struct shmem_xattr, list);
++                memcpy(data, xattr->entity, xattr->namelen + 1);
++                data += xattr->namelen + 1;
++        }
++
++        return size;
++}
++#endif
++
+ /*
+  * shmem_recalc_inode - recalculate the size of an inode
+  *
+@@ -359,6 +699,11 @@ static void shmem_truncate (struct inode
+ 
+ static void shmem_delete_inode(struct inode * inode)
+ {
++#ifdef CONFIG_TMPFS_XATTR
++	struct list_head *tmp, *p;
++	struct shmem_xattr *xattr;
++	struct shmem_inode_info * info = SHMEM_I(inode);
++#endif
+ 	struct shmem_sb_info *sbinfo = SHMEM_SB(inode->i_sb);
+ 
+ 	if (inode->i_op->truncate == shmem_truncate) {
+@@ -371,6 +716,12 @@ static void shmem_delete_inode(struct in
+ 	spin_lock (&sbinfo->stat_lock);
+ 	sbinfo->free_inodes++;
+ 	spin_unlock (&sbinfo->stat_lock);
++#ifdef CONFIG_TMPFS_XATTR
++        list_for_each_safe(p, tmp, &info->xattrs) {
++                xattr = list_entry(p, struct shmem_xattr, list);
++		shmem_xattr_delete(inode, xattr);
++        }
++#endif
+ 	clear_inode(inode);
+ }
+ 
+@@ -634,7 +985,7 @@ wait_retry:
+ 	goto repeat;
+ }
+ 
+-static int shmem_getpage(struct inode * inode, unsigned long idx, struct page **ptr)
++int shmem_getpage(struct inode * inode, unsigned long idx, struct page **ptr)
+ {
+ 	struct shmem_inode_info *info = SHMEM_I(inode);
+ 	int error;
+@@ -727,6 +1078,11 @@ struct inode *shmem_get_inode(struct sup
+ 		info->inode = inode;
+ 		spin_lock_init (&info->lock);
+ 		sema_init (&info->sem, 1);
++
++#ifdef CONFIG_TMPFS_XATTR
++		INIT_LIST_HEAD(&info->xattrs);
++		info->xtail = &info->xattrs;
++#endif
+ 		switch (mode & S_IFMT) {
+ 		default:
+ 			init_special_inode(inode, mode, dev);
+@@ -777,10 +1133,6 @@ out:
+ }
+ 
+ #ifdef CONFIG_TMPFS
+-
+-static struct inode_operations shmem_symlink_inode_operations;
+-static struct inode_operations shmem_symlink_inline_operations;
+-
+ static ssize_t
+ shmem_file_write(struct file *file,const char *buf,size_t count,loff_t *ppos)
+ {
+@@ -1250,6 +1602,12 @@ static struct inode_operations shmem_sym
+ 	truncate:	shmem_truncate,
+ 	readlink:	shmem_readlink,
+ 	follow_link:	shmem_follow_link,
++#ifdef CONFIG_TMPFS_XATTR
++	setxattr:       shmem_setxattr,
++	getxattr:       shmem_getxattr,
++	listxattr:      shmem_listxattr,
++	removexattr:    shmem_removexattr,
++#endif
+ };
+ 
+ static int shmem_parse_options(char *options, int *mode, uid_t *uid, gid_t *gid, unsigned long * blocks, unsigned long *inodes)
+@@ -1398,6 +1756,12 @@ static struct file_operations shmem_file
+ 
+ static struct inode_operations shmem_inode_operations = {
+ 	truncate:	shmem_truncate,
++#ifdef CONFIG_TMPFS_XATTR
++	setxattr:       shmem_setxattr,
++	getxattr:       shmem_getxattr,
++	listxattr:      shmem_listxattr,
++	removexattr:    shmem_removexattr,
++#endif
+ };
+ 
+ static struct inode_operations shmem_dir_inode_operations = {
+@@ -1411,6 +1775,12 @@ static struct inode_operations shmem_dir
+ 	rmdir:		shmem_rmdir,
+ 	mknod:		shmem_mknod,
+ 	rename:		shmem_rename,
++#ifdef CONFIG_TMPFS_XATTR
++	setxattr:       shmem_setxattr,
++	getxattr:       shmem_getxattr,
++	listxattr:      shmem_listxattr,
++	removexattr:    shmem_removexattr,
++#endif
+ #endif
+ };
+ 
+@@ -1557,3 +1927,9 @@ int shmem_zero_setup(struct vm_area_stru
+ }
+ 
+ EXPORT_SYMBOL(shmem_file_setup);
++EXPORT_SYMBOL(shmem_getpage);
++EXPORT_SYMBOL(shmem_xattr_find);
++EXPORT_SYMBOL(shmem_xattr_set);
++EXPORT_SYMBOL(shmem_xattr_get);
++EXPORT_SYMBOL(shmem_xattr_delete);
++EXPORT_SYMBOL(shmem_xattr_remove);
diff --git a/lustre/kernel_patches/patches/linux-2.4.20-xattr-0.8.54-chaos.patch b/lustre/kernel_patches/patches/linux-2.4.20-xattr-0.8.54-chaos.patch
index 5bdfaff..8c4da0b 100644
--- a/lustre/kernel_patches/patches/linux-2.4.20-xattr-0.8.54-chaos.patch
+++ b/lustre/kernel_patches/patches/linux-2.4.20-xattr-0.8.54-chaos.patch
@@ -150,7 +150,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -187,7 +187,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -236,7 +236,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -252,7 +252,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -268,7 +268,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -284,7 +284,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -300,7 +300,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -312,11 +312,18 @@
  CONFIG_MIPS64=y
 --- kernel-2.4.20-6chaos_18_7/arch/ppc/defconfig~linux-2.4.20-xattr-0.8.54-chaos	2003-05-15 21:12:20.000000000 -0600
 +++ kernel-2.4.20-6chaos_18_7-braam/arch/ppc/defconfig	2003-07-12 15:34:44.000000000 -0600
-@@ -1,6 +1,13 @@
+@@ -1,6 +1,20 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
++# CONFIG_EXT3_FS_XATTR_SHARING is not set
++# CONFIG_EXT3_FS_XATTR_USER is not set
++# CONFIG_EXT2_FS_XATTR is not set
++# CONFIG_EXT2_FS_XATTR_SHARING is not set
++# CONFIG_EXT2_FS_XATTR_USER is not set
++# CONFIG_FS_MBCACHE is not set
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -350,7 +357,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -399,7 +406,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -546,7 +553,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -581,7 +588,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -1786,7 +1793,7 @@
 +		} else if (old_bh && header == HDR(old_bh)) {
 +			/* Keep this block. */
 +			new_bh = old_bh;
-+			(void)ext2_xattr_cache_insert(new_bh);
++			ext2_xattr_cache_insert(new_bh);
 +		} else {
 +			/* We need to allocate a new block */
 +			int force = EXT2_I(inode)->i_file_acl != 0;
@@ -1805,7 +1812,7 @@
 +			memcpy(new_bh->b_data, header, new_bh->b_size);
 +			mark_buffer_uptodate(new_bh, 1);
 +			unlock_buffer(new_bh);
-+			(void)ext2_xattr_cache_insert(new_bh);
++			ext2_xattr_cache_insert(new_bh);
 +			
 +			ext2_xattr_update_super_block(sb);
 +		}
@@ -3450,7 +3457,7 @@
 +		} else if (old_bh && header == HDR(old_bh)) {
 +			/* Keep this block. */
 +			new_bh = old_bh;
-+			(void)ext3_xattr_cache_insert(new_bh);
++			ext3_xattr_cache_insert(new_bh);
 +		} else {
 +			/* We need to allocate a new block */
 +			int force = EXT3_I(inode)->i_file_acl != 0;
@@ -3475,7 +3482,7 @@
 +			memcpy(new_bh->b_data, header, new_bh->b_size);
 +			mark_buffer_uptodate(new_bh, 1);
 +			unlock_buffer(new_bh);
-+			(void)ext3_xattr_cache_insert(new_bh);
++			ext3_xattr_cache_insert(new_bh);
 +			
 +			ext3_xattr_update_super_block(handle, sb);
 +		}
diff --git a/lustre/kernel_patches/patches/linux-2.4.20-xattr-0.8.54-hp.patch b/lustre/kernel_patches/patches/linux-2.4.20-xattr-0.8.54-hp.patch
index f1365d7..ad36c0f 100644
--- a/lustre/kernel_patches/patches/linux-2.4.20-xattr-0.8.54-hp.patch
+++ b/lustre/kernel_patches/patches/linux-2.4.20-xattr-0.8.54-hp.patch
@@ -125,7 +125,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -1294,7 +1294,7 @@
 +		} else if (old_bh && header == HDR(old_bh)) {
 +			/* Keep this block. */
 +			new_bh = old_bh;
-+			(void)ext2_xattr_cache_insert(new_bh);
++			ext2_xattr_cache_insert(new_bh);
 +		} else {
 +			/* We need to allocate a new block */
 +			int force = EXT2_I(inode)->i_file_acl != 0;
@@ -1313,7 +1313,7 @@
 +			memcpy(new_bh->b_data, header, new_bh->b_size);
 +			mark_buffer_uptodate(new_bh, 1);
 +			unlock_buffer(new_bh);
-+			(void)ext2_xattr_cache_insert(new_bh);
++			ext2_xattr_cache_insert(new_bh);
 +			
 +			ext2_xattr_update_super_block(sb);
 +		}
@@ -2957,7 +2957,7 @@
 +		} else if (old_bh && header == HDR(old_bh)) {
 +			/* Keep this block. */
 +			new_bh = old_bh;
-+			(void)ext3_xattr_cache_insert(new_bh);
++			ext3_xattr_cache_insert(new_bh);
 +		} else {
 +			/* We need to allocate a new block */
 +			int force = EXT3_I(inode)->i_file_acl != 0;
@@ -2982,7 +2982,7 @@
 +			memcpy(new_bh->b_data, header, new_bh->b_size);
 +			mark_buffer_uptodate(new_bh, 1);
 +			unlock_buffer(new_bh);
-+			(void)ext3_xattr_cache_insert(new_bh);
++			ext3_xattr_cache_insert(new_bh);
 +			
 +			ext3_xattr_update_super_block(handle, sb);
 +		}
diff --git a/lustre/kernel_patches/patches/linux-2.4.20-xattr-0.8.54.patch b/lustre/kernel_patches/patches/linux-2.4.20-xattr-0.8.54.patch
index f078ebe..152e89a 100644
--- a/lustre/kernel_patches/patches/linux-2.4.20-xattr-0.8.54.patch
+++ b/lustre/kernel_patches/patches/linux-2.4.20-xattr-0.8.54.patch
@@ -152,7 +152,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -189,7 +189,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -238,7 +238,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -254,7 +254,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -303,7 +303,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -319,7 +319,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -335,7 +335,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -347,11 +347,18 @@
  CONFIG_MIPS64=y
 --- linux-2.4.20/arch/ppc/defconfig~linux-2.4.20-xattr-0.8.54	2002-11-29 07:53:11.000000000 +0800
 +++ linux-2.4.20-root/arch/ppc/defconfig	2003-05-07 18:08:03.000000000 +0800
-@@ -1,6 +1,13 @@
+@@ -1,6 +1,20 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
++# CONFIG_EXT3_FS_XATTR_SHARING is not set
++# CONFIG_EXT3_FS_XATTR_USER is not set
++# CONFIG_EXT2_FS_XATTR is not set
++# CONFIG_EXT2_FS_XATTR_SHARING is not set
++# CONFIG_EXT2_FS_XATTR_USER is not set
++# CONFIG_FS_MBCACHE is not set
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -385,7 +392,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -434,7 +441,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -581,7 +588,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -616,7 +623,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -1821,7 +1828,7 @@
 +		} else if (old_bh && header == HDR(old_bh)) {
 +			/* Keep this block. */
 +			new_bh = old_bh;
-+			(void)ext2_xattr_cache_insert(new_bh);
++			ext2_xattr_cache_insert(new_bh);
 +		} else {
 +			/* We need to allocate a new block */
 +			int force = EXT2_I(inode)->i_file_acl != 0;
@@ -1840,7 +1847,7 @@
 +			memcpy(new_bh->b_data, header, new_bh->b_size);
 +			mark_buffer_uptodate(new_bh, 1);
 +			unlock_buffer(new_bh);
-+			(void)ext2_xattr_cache_insert(new_bh);
++			ext2_xattr_cache_insert(new_bh);
 +			
 +			ext2_xattr_update_super_block(sb);
 +		}
@@ -3485,7 +3492,7 @@
 +		} else if (old_bh && header == HDR(old_bh)) {
 +			/* Keep this block. */
 +			new_bh = old_bh;
-+			(void)ext3_xattr_cache_insert(new_bh);
++			ext3_xattr_cache_insert(new_bh);
 +		} else {
 +			/* We need to allocate a new block */
 +			int force = EXT3_I(inode)->i_file_acl != 0;
@@ -3510,7 +3517,7 @@
 +			memcpy(new_bh->b_data, header, new_bh->b_size);
 +			mark_buffer_uptodate(new_bh, 1);
 +			unlock_buffer(new_bh);
-+			(void)ext3_xattr_cache_insert(new_bh);
++			ext3_xattr_cache_insert(new_bh);
 +			
 +			ext3_xattr_update_super_block(handle, sb);
 +		}
diff --git a/lustre/kernel_patches/patches/linux-2.4.21-xattr-0.8.54-chaos.patch b/lustre/kernel_patches/patches/linux-2.4.21-xattr-0.8.54-chaos.patch
index 8e198f8..e18ac9d 100644
--- a/lustre/kernel_patches/patches/linux-2.4.21-xattr-0.8.54-chaos.patch
+++ b/lustre/kernel_patches/patches/linux-2.4.21-xattr-0.8.54-chaos.patch
@@ -1315,7 +1315,7 @@ Index: linux-2.4.21-chaos/fs/ext2/xattr.c
 +		} else if (old_bh && header == HDR(old_bh)) {
 +			/* Keep this block. */
 +			new_bh = old_bh;
-+			(void)ext2_xattr_cache_insert(new_bh);
++			ext2_xattr_cache_insert(new_bh);
 +		} else {
 +			/* We need to allocate a new block */
 +			int force = EXT2_I(inode)->i_file_acl != 0;
@@ -1334,7 +1334,7 @@ Index: linux-2.4.21-chaos/fs/ext2/xattr.c
 +			memcpy(new_bh->b_data, header, new_bh->b_size);
 +			mark_buffer_uptodate(new_bh, 1);
 +			unlock_buffer(new_bh);
-+			(void)ext2_xattr_cache_insert(new_bh);
++			ext2_xattr_cache_insert(new_bh);
 +			
 +			ext2_xattr_update_super_block(sb);
 +		}
diff --git a/lustre/kernel_patches/patches/linux-2.4.21-xattr-0.8.54-suse.patch b/lustre/kernel_patches/patches/linux-2.4.21-xattr-0.8.54-suse.patch
index da8c15c..9318fc1 100644
--- a/lustre/kernel_patches/patches/linux-2.4.21-xattr-0.8.54-suse.patch
+++ b/lustre/kernel_patches/patches/linux-2.4.21-xattr-0.8.54-suse.patch
@@ -152,7 +152,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -189,7 +189,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -238,7 +238,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -254,7 +254,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -270,7 +270,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -286,7 +286,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -302,7 +302,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -318,7 +318,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -367,7 +367,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -514,7 +514,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -1683,7 +1683,7 @@
 +		} else if (old_bh && header == HDR(old_bh)) {
 +			/* Keep this block. */
 +			new_bh = old_bh;
-+			(void)ext2_xattr_cache_insert(new_bh);
++			ext2_xattr_cache_insert(new_bh);
 +		} else {
 +			/* We need to allocate a new block */
 +			int force = EXT2_I(inode)->i_file_acl != 0;
@@ -1702,7 +1702,7 @@
 +			memcpy(new_bh->b_data, header, new_bh->b_size);
 +			mark_buffer_uptodate(new_bh, 1);
 +			unlock_buffer(new_bh);
-+			(void)ext2_xattr_cache_insert(new_bh);
++			ext2_xattr_cache_insert(new_bh);
 +			
 +			ext2_xattr_update_super_block(sb);
 +		}
@@ -3347,7 +3347,7 @@
 +		} else if (old_bh && header == HDR(old_bh)) {
 +			/* Keep this block. */
 +			new_bh = old_bh;
-+			(void)ext3_xattr_cache_insert(new_bh);
++			ext3_xattr_cache_insert(new_bh);
 +		} else {
 +			/* We need to allocate a new block */
 +			int force = EXT3_I(inode)->i_file_acl != 0;
@@ -3372,7 +3372,7 @@
 +			memcpy(new_bh->b_data, header, new_bh->b_size);
 +			mark_buffer_uptodate(new_bh, 1);
 +			unlock_buffer(new_bh);
-+			(void)ext3_xattr_cache_insert(new_bh);
++			ext3_xattr_cache_insert(new_bh);
 +			
 +			ext3_xattr_update_super_block(handle, sb);
 +		}
diff --git a/lustre/kernel_patches/patches/linux-2.4.22-xattr-0.8.54.patch b/lustre/kernel_patches/patches/linux-2.4.22-xattr-0.8.54.patch
index fd5f0c2..937aa40 100644
--- a/lustre/kernel_patches/patches/linux-2.4.22-xattr-0.8.54.patch
+++ b/lustre/kernel_patches/patches/linux-2.4.22-xattr-0.8.54.patch
@@ -156,7 +156,7 @@ Index: linux-2.4.22-vanilla/arch/alpha/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -197,7 +197,7 @@ Index: linux-2.4.22-vanilla/arch/arm/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -250,7 +250,7 @@ Index: linux-2.4.22-vanilla/arch/i386/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -268,7 +268,7 @@ Index: linux-2.4.22-vanilla/arch/ia64/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -286,7 +286,7 @@ Index: linux-2.4.22-vanilla/arch/m68k/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -304,7 +304,7 @@ Index: linux-2.4.22-vanilla/arch/mips/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -322,7 +322,7 @@ Index: linux-2.4.22-vanilla/arch/mips64/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -340,7 +340,7 @@ Index: linux-2.4.22-vanilla/arch/s390/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -393,7 +393,7 @@ Index: linux-2.4.22-vanilla/arch/s390x/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -549,7 +549,7 @@ Index: linux-2.4.22-vanilla/arch/sparc64/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -1738,7 +1738,7 @@ Index: linux-2.4.22-vanilla/fs/ext2/xattr.c
 +		} else if (old_bh && header == HDR(old_bh)) {
 +			/* Keep this block. */
 +			new_bh = old_bh;
-+			(void)ext2_xattr_cache_insert(new_bh);
++			ext2_xattr_cache_insert(new_bh);
 +		} else {
 +			/* We need to allocate a new block */
 +			int force = EXT2_I(inode)->i_file_acl != 0;
@@ -1757,7 +1757,7 @@ Index: linux-2.4.22-vanilla/fs/ext2/xattr.c
 +			memcpy(new_bh->b_data, header, new_bh->b_size);
 +			mark_buffer_uptodate(new_bh, 1);
 +			unlock_buffer(new_bh);
-+			(void)ext2_xattr_cache_insert(new_bh);
++			ext2_xattr_cache_insert(new_bh);
 +			
 +			ext2_xattr_update_super_block(sb);
 +		}
@@ -3426,7 +3426,7 @@ Index: linux-2.4.22-vanilla/fs/ext3/xattr.c
 +		} else if (old_bh && header == HDR(old_bh)) {
 +			/* Keep this block. */
 +			new_bh = old_bh;
-+			(void)ext3_xattr_cache_insert(new_bh);
++			ext3_xattr_cache_insert(new_bh);
 +		} else {
 +			/* We need to allocate a new block */
 +			int force = EXT3_I(inode)->i_file_acl != 0;
@@ -3451,7 +3451,7 @@ Index: linux-2.4.22-vanilla/fs/ext3/xattr.c
 +			memcpy(new_bh->b_data, header, new_bh->b_size);
 +			mark_buffer_uptodate(new_bh, 1);
 +			unlock_buffer(new_bh);
-+			(void)ext3_xattr_cache_insert(new_bh);
++			ext3_xattr_cache_insert(new_bh);
 +			
 +			ext3_xattr_update_super_block(handle, sb);
 +		}
diff --git a/lustre/kernel_patches/patches/linux-2.4.24-xattr-0.8.54.patch b/lustre/kernel_patches/patches/linux-2.4.24-xattr-0.8.54.patch
index 4cf5c2c..144ff3f 100644
--- a/lustre/kernel_patches/patches/linux-2.4.24-xattr-0.8.54.patch
+++ b/lustre/kernel_patches/patches/linux-2.4.24-xattr-0.8.54.patch
@@ -156,7 +156,7 @@ Index: linux-2.4.24-vanilla/arch/alpha/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -197,7 +197,7 @@ Index: linux-2.4.24-vanilla/arch/arm/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -250,7 +250,7 @@ Index: linux-2.4.24-vanilla/arch/i386/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -268,7 +268,7 @@ Index: linux-2.4.24-vanilla/arch/ia64/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -286,7 +286,7 @@ Index: linux-2.4.24-vanilla/arch/m68k/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -304,7 +304,7 @@ Index: linux-2.4.24-vanilla/arch/mips/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -322,7 +322,7 @@ Index: linux-2.4.24-vanilla/arch/mips64/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -340,7 +340,7 @@ Index: linux-2.4.24-vanilla/arch/s390/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -393,7 +393,7 @@ Index: linux-2.4.24-vanilla/arch/s390x/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -549,7 +549,7 @@ Index: linux-2.4.24-vanilla/arch/sparc64/defconfig
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -1738,7 +1738,7 @@ Index: linux-2.4.24-vanilla/fs/ext2/xattr.c
 +		} else if (old_bh && header == HDR(old_bh)) {
 +			/* Keep this block. */
 +			new_bh = old_bh;
-+			(void)ext2_xattr_cache_insert(new_bh);
++			ext2_xattr_cache_insert(new_bh);
 +		} else {
 +			/* We need to allocate a new block */
 +			int force = EXT2_I(inode)->i_file_acl != 0;
@@ -1757,7 +1757,7 @@ Index: linux-2.4.24-vanilla/fs/ext2/xattr.c
 +			memcpy(new_bh->b_data, header, new_bh->b_size);
 +			mark_buffer_uptodate(new_bh, 1);
 +			unlock_buffer(new_bh);
-+			(void)ext2_xattr_cache_insert(new_bh);
++			ext2_xattr_cache_insert(new_bh);
 +			
 +			ext2_xattr_update_super_block(sb);
 +		}
@@ -3426,7 +3426,7 @@ Index: linux-2.4.24-vanilla/fs/ext3/xattr.c
 +		} else if (old_bh && header == HDR(old_bh)) {
 +			/* Keep this block. */
 +			new_bh = old_bh;
-+			(void)ext3_xattr_cache_insert(new_bh);
++			ext3_xattr_cache_insert(new_bh);
 +		} else {
 +			/* We need to allocate a new block */
 +			int force = EXT3_I(inode)->i_file_acl != 0;
@@ -3451,7 +3451,7 @@ Index: linux-2.4.24-vanilla/fs/ext3/xattr.c
 +			memcpy(new_bh->b_data, header, new_bh->b_size);
 +			mark_buffer_uptodate(new_bh, 1);
 +			unlock_buffer(new_bh);
-+			(void)ext3_xattr_cache_insert(new_bh);
++			ext3_xattr_cache_insert(new_bh);
 +			
 +			ext3_xattr_update_super_block(handle, sb);
 +		}
diff --git a/lustre/kernel_patches/patches/linux-2.6.3-CITI_NFS4_ALL.patch b/lustre/kernel_patches/patches/linux-2.6.3-CITI_NFS4_ALL.patch
new file mode 100644
index 0000000..726957c
--- /dev/null
+++ b/lustre/kernel_patches/patches/linux-2.6.3-CITI_NFS4_ALL.patch
@@ -0,0 +1,14513 @@
+
+The complete series of citi nfsv4 patches in a single patch
+
+
+ Makefile                                |    2 
+ fs/Kconfig                              |   49 
+ fs/Makefile                             |    1 
+ fs/inode.c                              |    2 
+ fs/nfs/dir.c                            |  181 ++
+ fs/nfs/direct.c                         |    3 
+ fs/nfs/file.c                           |   23 
+ fs/nfs/inode.c                          |  586 +++++----
+ fs/nfs/nfs3proc.c                       |   43 
+ fs/nfs/nfs4proc.c                       |  988 +++++++---------
+ fs/nfs/nfs4xdr.c                        | 1931 ++++++++++++++++++++++++--------
+ fs/nfs/pagelist.c                       |    5 
+ fs/nfs/proc.c                           |   51 
+ fs/nfs/read.c                           |    2 
+ fs/nfs/unlink.c                         |    3 
+ fs/nfs/write.c                          |  207 +--
+ fs/nfs4acl/Makefile                     |    3 
+ fs/nfs4acl/acl.c                        |  921 +++++++++++++++
+ fs/nfs4acl/acl_syms.c                   |   51 
+ fs/nfsd/Makefile                        |    2 
+ fs/nfsd/nfs3xdr.c                       |    2 
+ fs/nfsd/nfs4idmap.c                     |  569 +++++++++
+ fs/nfsd/nfs4proc.c                      |  229 ++-
+ fs/nfsd/nfs4state.c                     |  440 +++++--
+ fs/nfsd/nfs4xdr.c                       |  495 +++++---
+ fs/nfsd/nfsctl.c                        |    7 
+ fs/nfsd/nfsproc.c                       |    1 
+ fs/nfsd/nfsxdr.c                        |    2 
+ fs/nfsd/stats.c                         |   67 -
+ fs/nfsd/vfs.c                           |  218 +++
+ include/linux/fs.h                      |    2 
+ include/linux/nfs.h                     |    2 
+ include/linux/nfs4.h                    |   80 +
+ include/linux/nfs4_acl.h                |   68 +
+ include/linux/nfs_fs.h                  |  138 +-
+ include/linux/nfs_page.h                |    2 
+ include/linux/nfs_xdr.h                 |  256 +---
+ include/linux/nfsd/nfsd.h               |   16 
+ include/linux/nfsd/nfsfh.h              |    8 
+ include/linux/nfsd/state.h              |   21 
+ include/linux/nfsd/xdr4.h               |   37 
+ include/linux/nfsd_idmap.h              |   54 
+ include/linux/sunrpc/auth_gss.h         |    2 
+ include/linux/sunrpc/cache.h            |   13 
+ include/linux/sunrpc/gss_api.h          |    3 
+ include/linux/sunrpc/stats.h            |   20 
+ include/linux/sunrpc/svc.h              |    1 
+ include/linux/sunrpc/svcauth.h          |    5 
+ include/linux/sunrpc/svcauth_gss.h      |   35 
+ include/linux/sunrpc/xdr.h              |    3 
+ include/linux/sunrpc/xprt.h             |   15 
+ net/sunrpc/Makefile                     |    2 
+ net/sunrpc/auth_gss/Makefile            |    2 
+ net/sunrpc/auth_gss/auth_gss.c          |  119 +
+ net/sunrpc/auth_gss/gss_krb5_crypto.c   |   18 
+ net/sunrpc/auth_gss/gss_krb5_mech.c     |   14 
+ net/sunrpc/auth_gss/gss_krb5_seal.c     |    9 
+ net/sunrpc/auth_gss/gss_krb5_seqnum.c   |    2 
+ net/sunrpc/auth_gss/gss_mech_switch.c   |   32 
+ net/sunrpc/auth_gss/gss_pseudoflavors.c |   21 
+ net/sunrpc/auth_gss/sunrpcgss_syms.c    |    2 
+ net/sunrpc/auth_gss/svcauth_gss.c       | 1018 ++++++++++++++++
+ net/sunrpc/cache.c                      |   13 
+ net/sunrpc/stats.c                      |  106 -
+ net/sunrpc/sunrpc_syms.c                |    5 
+ net/sunrpc/svc.c                        |    4 
+ net/sunrpc/svcauth.c                    |    5 
+ net/sunrpc/svcauth_unix.c               |   13 
+ net/sunrpc/xdr.c                        |    4 
+ net/sunrpc/xprt.c                       |  210 +--
+ include/linux/sunrpc/name_lookup.h      |   38 
+ 71 files changed, 7194 insertions(+), 2308 deletions(-)
+
+diff -puN Makefile~CITI_NFS4_ALL Makefile
+--- linux-2.6.3/Makefile~CITI_NFS4_ALL	2004-02-19 16:47:02.000000000 -0500
++++ linux-2.6.3-bfields/Makefile	2004-02-19 16:47:16.000000000 -0500
+@@ -1,7 +1,7 @@
+ VERSION = 2
+ PATCHLEVEL = 6
+ SUBLEVEL = 3
+-EXTRAVERSION =
++EXTRAVERSION = -CITI_NFS4_ALL-1
+ NAME=Feisty Dunnart
+ 
+ # *DOCUMENTATION*
+diff -puN fs/inode.c~CITI_NFS4_ALL fs/inode.c
+--- linux-2.6.3/fs/inode.c~CITI_NFS4_ALL	2004-02-19 16:47:03.000000000 -0500
++++ linux-2.6.3-bfields/fs/inode.c	2004-02-19 16:47:03.000000000 -0500
+@@ -1178,6 +1178,8 @@ void inode_update_time(struct inode *ino
+ 	struct timespec now;
+ 	int sync_it = 0;
+ 
++	if (IS_NOCMTIME(inode))
++		return;
+ 	if (IS_RDONLY(inode))
+ 		return;
+ 
+diff -puN fs/Kconfig~CITI_NFS4_ALL fs/Kconfig
+--- linux-2.6.3/fs/Kconfig~CITI_NFS4_ALL	2004-02-19 16:47:03.000000000 -0500
++++ linux-2.6.3-bfields/fs/Kconfig	2004-02-19 16:47:07.000000000 -0500
+@@ -288,7 +288,7 @@ config FS_POSIX_ACL
+ # 	Never use this symbol for ifdefs.
+ #
+ 	bool
+-	depends on EXT2_FS_POSIX_ACL || EXT3_FS_POSIX_ACL || JFS_POSIX_ACL
++	depends on EXT2_FS_POSIX_ACL || EXT3_FS_POSIX_ACL || JFS_POSIX_ACL || NFS_V4_ACL
+ 	default y
+ 
+ config XFS_FS
+@@ -1314,21 +1314,25 @@ config NFS_V3
+ 	  Say Y here if you want your NFS client to be able to speak the newer
+ 	  version 3 of the NFS protocol.
+ 
+-	  If unsure, say N.
++	  If unsure, say Y.
+ 
+ config NFS_V4
+ 	bool "Provide NFSv4 client support (EXPERIMENTAL)"
+ 	depends on NFS_FS && EXPERIMENTAL
++	select RPCSEC_GSS_KRB5
+ 	help
+ 	  Say Y here if you want your NFS client to be able to speak the newer
+-	  version 4 of the NFS protocol.  This feature is experimental, and
+-	  should only be used if you are interested in helping to test NFSv4.
++	  version 4 of the NFS protocol.
++
++	  Note: Requires auxiliary userspace daemons which may be found on
++		http://www.citi.umich.edu/projects/nfsv4/
+ 
+ 	  If unsure, say N.
+ 
+ config NFS_DIRECTIO
+ 	bool "Allow direct I/O on NFS files (EXPERIMENTAL)"
+ 	depends on NFS_FS && EXPERIMENTAL
++	select NFS_V4_ACL
+ 	help
+ 	  This option enables applications to perform uncached I/O on files
+ 	  in NFS file systems using the O_DIRECT open() flag.  When O_DIRECT
+@@ -1388,6 +1392,7 @@ config NFSD_V3
+ config NFSD_V4
+ 	bool "Provide NFSv4 server support (EXPERIMENTAL)"
+ 	depends on NFSD_V3 && EXPERIMENTAL
++	select NFS_V4_ACL
+ 	help
+ 	  If you would like to include the NFSv4 server as well as the NFSv2
+ 	  and NFSv3 servers, say Y here.  This feature is experimental, and
+@@ -1423,6 +1428,12 @@ config LOCKD_V4
+ 	depends on NFSD_V3 || NFS_V3
+ 	default y
+ 
++config NFS_V4_ACL
++	bool "Provide NFSv4 ACL support"
++	depends on NFSD_V4 || NFS_V4
++	help
++	  This allows you to use POSIX ACLs with NFSv4.
++
+ config EXPORTFS
+ 	tristate
+ 	default NFSD
+@@ -1431,28 +1442,24 @@ config SUNRPC
+ 	tristate
+ 
+ config SUNRPC_GSS
+-	tristate "Provide RPCSEC_GSS authentication (EXPERIMENTAL)"
++	tristate
++
++config RPCSEC_GSS_KRB5
++	tristate "Secure RPC: Kerberos V mechanism (EXPERIMENTAL)"
+ 	depends on SUNRPC && EXPERIMENTAL
+-	default SUNRPC if NFS_V4=y
++	select SUNRPC_GSS
++	select CRYPTO
++	select CRYPTO_MD5
++	select CRYPTO_DES
+ 	help
+-	  Provides cryptographic authentication for NFS rpc requests.  To
+-	  make this useful, you must also select at least one rpcsec_gss
+-	  mechanism.
+-	  Note: You should always select this option if you wish to use
++	  Provides for secure RPC calls by means of a gss-api
++	  mechanism based on Kerberos V5. This is required for
+ 	  NFSv4.
+ 
+-config RPCSEC_GSS_KRB5
+-	tristate "Kerberos V mechanism for RPCSEC_GSS (EXPERIMENTAL)"
+-	depends on SUNRPC_GSS && CRYPTO_DES && CRYPTO_MD5
+-	default SUNRPC_GSS if NFS_V4=y
+-	help
+-	  Provides a gss-api mechanism based on Kerberos V5 (this is
+-	  mandatory for RFC3010-compliant NFSv4 implementations).
+-	  Requires a userspace daemon;
+-		see http://www.citi.umich.edu/projects/nfsv4/.
++	  Note: Requires an auxiliary userspace daemon which may be found on
++		http://www.citi.umich.edu/projects/nfsv4/
+ 
+-	  Note: If you select this option, please ensure that you also
+-	  enable the MD5 and DES crypto ciphers.
++	  If unsure, say N.
+ 
+ config SMB_FS
+ 	tristate "SMB file system support (to mount Windows shares etc.)"
+diff -puN fs/nfs/dir.c~CITI_NFS4_ALL fs/nfs/dir.c
+--- linux-2.6.3/fs/nfs/dir.c~CITI_NFS4_ALL	2004-02-19 16:47:03.000000000 -0500
++++ linux-2.6.3-bfields/fs/nfs/dir.c	2004-02-19 16:47:07.000000000 -0500
+@@ -88,6 +88,10 @@ struct inode_operations nfs4_dir_inode_o
+ 	.permission	= nfs_permission,
+ 	.getattr	= nfs_getattr,
+ 	.setattr	= nfs_setattr,
++#ifdef CONFIG_NFS_V4_ACL
++	.getxattr	= nfs_getxattr,
++	.setxattr	= nfs_setxattr,
++#endif /* CONFIG_NFS_V4_ACL */
+ };
+ 
+ #endif /* CONFIG_NFS_V4 */
+@@ -139,11 +143,13 @@ int nfs_readdir_filler(nfs_readdir_descr
+ 	struct file	*file = desc->file;
+ 	struct inode	*inode = file->f_dentry->d_inode;
+ 	struct rpc_cred	*cred = nfs_file_cred(file);
++	unsigned long	timestamp;
+ 	int		error;
+ 
+ 	dfprintk(VFS, "NFS: nfs_readdir_filler() reading cookie %Lu into page %lu.\n", (long long)desc->entry->cookie, page->index);
+ 
+  again:
++	timestamp = jiffies;
+ 	error = NFS_PROTO(inode)->readdir(file->f_dentry, cred, desc->entry->cookie, page,
+ 					  NFS_SERVER(inode)->dtsize, desc->plus);
+ 	if (error < 0) {
+@@ -157,18 +163,21 @@ int nfs_readdir_filler(nfs_readdir_descr
+ 		goto error;
+ 	}
+ 	SetPageUptodate(page);
++	NFS_FLAGS(inode) |= NFS_INO_INVALID_ATIME;
+ 	/* Ensure consistent page alignment of the data.
+ 	 * Note: assumes we have exclusive access to this mapping either
+ 	 *	 throught inode->i_sem or some other mechanism.
+ 	 */
+-	if (page->index == 0)
++	if (page->index == 0) {
+ 		invalidate_inode_pages(inode->i_mapping);
++		NFS_I(inode)->readdir_timestamp = timestamp;
++	}
+ 	unlock_page(page);
+ 	return 0;
+  error:
+ 	SetPageError(page);
+ 	unlock_page(page);
+-	invalidate_inode_pages(inode->i_mapping);
++	nfs_zap_caches(inode);
+ 	desc->error = error;
+ 	return -EIO;
+ }
+@@ -381,6 +390,7 @@ int uncached_readdir(nfs_readdir_descrip
+ 						page,
+ 						NFS_SERVER(inode)->dtsize,
+ 						desc->plus);
++	NFS_FLAGS(inode) |= NFS_INO_INVALID_ATIME;
+ 	desc->page = page;
+ 	desc->ptr = kmap(page);		/* matching kunmap in nfs_do_filldir */
+ 	if (desc->error >= 0) {
+@@ -459,7 +469,15 @@ static int nfs_readdir(struct file *filp
+ 			}
+ 			res = 0;
+ 			break;
+-		} else if (res < 0)
++		}
++		if (res == -ETOOSMALL && desc->plus) {
++			NFS_FLAGS(inode) &= ~NFS_INO_ADVISE_RDPLUS;
++			nfs_zap_caches(inode);
++			desc->plus = 0;
++			desc->entry->eof = 0;
++			continue;
++		}
++		if (res < 0)
+ 			break;
+ 
+ 		res = nfs_do_filldir(desc, dirent, filldir);
+@@ -481,14 +499,19 @@ static int nfs_readdir(struct file *filp
+  * In the case it has, we assume that the dentries are untrustworthy
+  * and may need to be looked up again.
+  */
+-static inline
+-int nfs_check_verifier(struct inode *dir, struct dentry *dentry)
++static inline int nfs_check_verifier(struct inode *dir, struct dentry *dentry)
+ {
+ 	if (IS_ROOT(dentry))
+ 		return 1;
+-	if (nfs_revalidate_inode(NFS_SERVER(dir), dir))
++	if ((NFS_FLAGS(dir) & NFS_INO_INVALID_ATTR) != 0
++			|| nfs_attribute_timeout(dir))
+ 		return 0;
+-	return time_after(dentry->d_time, NFS_MTIME_UPDATE(dir));
++	return nfs_verify_change_attribute(dir, (unsigned long)dentry->d_fsdata);
++}
++
++static inline void nfs_set_verifier(struct dentry * dentry, unsigned long verf)
++{
++	dentry->d_fsdata = (void *)verf;
+ }
+ 
+ /*
+@@ -528,9 +551,7 @@ int nfs_neg_need_reval(struct inode *dir
+ 	/* Don't revalidate a negative dentry if we're creating a new file */
+ 	if ((ndflags & LOOKUP_CREATE) && !(ndflags & LOOKUP_CONTINUE))
+ 		return 0;
+-	if (!nfs_check_verifier(dir, dentry))
+-		return 1;
+-	return time_after(jiffies, dentry->d_time + NFS_ATTRTIMEO(dir));
++	return !nfs_check_verifier(dir, dentry);
+ }
+ 
+ /*
+@@ -552,6 +573,7 @@ static int nfs_lookup_revalidate(struct 
+ 	int error;
+ 	struct nfs_fh fhandle;
+ 	struct nfs_fattr fattr;
++	unsigned long verifier;
+ 	int isopen = 0;
+ 
+ 	parent = dget_parent(dentry);
+@@ -574,6 +596,9 @@ static int nfs_lookup_revalidate(struct 
+ 		goto out_bad;
+ 	}
+ 
++	/* Revalidate parent directory attribute cache */
++	nfs_revalidate_inode(NFS_SERVER(dir), dir);
++
+ 	/* Force a full look up iff the parent directory has changed */
+ 	if (nfs_check_verifier(dir, dentry)) {
+ 		if (nfs_lookup_verify_inode(inode, isopen))
+@@ -581,6 +606,12 @@ static int nfs_lookup_revalidate(struct 
+ 		goto out_valid;
+ 	}
+ 
++	/*
++	 * Note: we're not holding inode->i_sem and so may be racing with
++	 * operations that change the directory. We therefore save the
++	 * change attribute *before* we do the RPC call.
++	 */
++	verifier = nfs_save_change_attribute(dir);
+ 	error = nfs_cached_lookup(dir, dentry, &fhandle, &fattr);
+ 	if (!error) {
+ 		if (memcmp(NFS_FH(inode), &fhandle, sizeof(struct nfs_fh))!= 0)
+@@ -603,6 +634,7 @@ static int nfs_lookup_revalidate(struct 
+ 
+  out_valid_renew:
+ 	nfs_renew_times(dentry);
++	nfs_set_verifier(dentry, verifier);
+  out_valid:
+ 	unlock_kernel();
+ 	dput(parent);
+@@ -638,6 +670,11 @@ static int nfs_dentry_delete(struct dent
+ 		/* Unhash it, so that ->d_iput() would be called */
+ 		return 1;
+ 	}
++	if (!(dentry->d_sb->s_flags & MS_ACTIVE)) {
++		/* Unhash it, so that ancestors of killed async unlink
++		 * files will be cleaned up during umount */
++		return 1;
++	}
+ 	return 0;
+ 
+ }
+@@ -693,6 +730,8 @@ static struct dentry *nfs_lookup(struct 
+ 	dentry->d_op = NFS_PROTO(dir)->dentry_ops;
+ 
+ 	lock_kernel();
++	/* Revalidate parent directory attribute cache */
++	nfs_revalidate_inode(NFS_SERVER(dir), dir);
+ 
+ 	/* If we're doing an exclusive create, optimize away the lookup */
+ 	if (nfs_is_exclusive_create(dir, nd))
+@@ -715,6 +754,7 @@ no_entry:
+ 	error = 0;
+ 	d_add(dentry, inode);
+ 	nfs_renew_times(dentry);
++	nfs_set_verifier(dentry, nfs_save_change_attribute(dir));
+ out_unlock:
+ 	unlock_kernel();
+ out:
+@@ -768,7 +808,15 @@ static struct dentry *nfs_atomic_lookup(
+ 
+ 	/* Open the file on the server */
+ 	lock_kernel();
+-	inode = nfs4_atomic_open(dir, dentry, nd);
++	/* Revalidate parent directory attribute cache */
++	nfs_revalidate_inode(NFS_SERVER(dir), dir);
++
++	if (nd->intent.open.flags & O_CREAT) {
++		nfs_begin_data_update(dir);
++		inode = nfs4_atomic_open(dir, dentry, nd);
++		nfs_end_data_update(dir);
++	} else
++		inode = nfs4_atomic_open(dir, dentry, nd);
+ 	unlock_kernel();
+ 	if (IS_ERR(inode)) {
+ 		error = PTR_ERR(inode);
+@@ -790,6 +838,7 @@ static struct dentry *nfs_atomic_lookup(
+ no_entry:
+ 	d_add(dentry, inode);
+ 	nfs_renew_times(dentry);
++	nfs_set_verifier(dentry, nfs_save_change_attribute(dir));
+ out:
+ 	BUG_ON(error > 0);
+ 	return ERR_PTR(error);
+@@ -801,13 +850,16 @@ static int nfs_open_revalidate(struct de
+ {
+ 	struct dentry *parent = NULL;
+ 	struct inode *inode = dentry->d_inode;
++	struct inode *dir;
++	unsigned long verifier;
+ 	int openflags, ret = 0;
+ 
+ 	/* NFS only supports OPEN for regular files */
+ 	if (inode && !S_ISREG(inode->i_mode))
+ 		goto no_open;
+ 	parent = dget_parent(dentry);
+-	if (!is_atomic_open(parent->d_inode, nd))
++	dir = parent->d_inode;
++	if (!is_atomic_open(dir, nd))
+ 		goto no_open;
+ 	openflags = nd->intent.open.flags;
+ 	if (openflags & O_CREAT) {
+@@ -821,8 +873,16 @@ static int nfs_open_revalidate(struct de
+ 	/* We can't create new files, or truncate existing ones here */
+ 	openflags &= ~(O_CREAT|O_TRUNC);
+ 
++	/*
++	 * Note: we're not holding inode->i_sem and so may be racing with
++	 * operations that change the directory. We therefore save the
++	 * change attribute *before* we do the RPC call.
++	 */
+ 	lock_kernel();
+-	ret = nfs4_open_revalidate(parent->d_inode, dentry, openflags);
++	verifier = nfs_save_change_attribute(dir);
++	ret = nfs4_open_revalidate(dir, dentry, openflags);
++	if (!ret)
++		nfs_set_verifier(dentry, verifier);
+ 	unlock_kernel();
+ out:
+ 	dput(parent);
+@@ -869,15 +929,20 @@ int nfs_cached_lookup(struct inode *dir,
+ 	struct nfs_server *server;
+ 	struct nfs_entry entry;
+ 	struct page *page;
+-	unsigned long timestamp = NFS_MTIME_UPDATE(dir);
++	unsigned long timestamp;
+ 	int res;
+ 
+ 	if (!NFS_USE_READDIRPLUS(dir))
+ 		return -ENOENT;
+ 	server = NFS_SERVER(dir);
+-	if (server->flags & NFS_MOUNT_NOAC)
++	/* Don't use readdirplus unless the cache is stable */
++	if ((server->flags & NFS_MOUNT_NOAC) != 0
++			|| nfs_caches_unstable(dir)
++			|| nfs_attribute_timeout(dir))
+ 		return -ENOENT;
+-	nfs_revalidate_inode(server, dir);
++	if ((NFS_FLAGS(dir) & (NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA)) != 0)
++		return -ENOENT;
++	timestamp = NFS_I(dir)->readdir_timestamp;
+ 
+ 	entry.fh = fh;
+ 	entry.fattr = fattr;
+@@ -931,6 +996,7 @@ static int nfs_instantiate(struct dentry
+ 	if (inode) {
+ 		d_instantiate(dentry, inode);
+ 		nfs_renew_times(dentry);
++		nfs_set_verifier(dentry, nfs_save_change_attribute(dentry->d_parent->d_inode));
+ 		error = 0;
+ 	}
+ 	return error;
+@@ -969,11 +1035,13 @@ static int nfs_create(struct inode *dir,
+ 	 * does not pass the create flags.
+ 	 */
+ 	lock_kernel();
+-	nfs_zap_caches(dir);
++	nfs_begin_data_update(dir);
+ 	inode = NFS_PROTO(dir)->create(dir, &dentry->d_name, &attr, open_flags);
++	nfs_end_data_update(dir);
+ 	if (!IS_ERR(inode)) {
+ 		d_instantiate(dentry, inode);
+ 		nfs_renew_times(dentry);
++		nfs_set_verifier(dentry, nfs_save_change_attribute(dir));
+ 		error = 0;
+ 	} else {
+ 		error = PTR_ERR(inode);
+@@ -1004,9 +1072,10 @@ nfs_mknod(struct inode *dir, struct dent
+ 	attr.ia_valid = ATTR_MODE;
+ 
+ 	lock_kernel();
+-	nfs_zap_caches(dir);
++	nfs_begin_data_update(dir);
+ 	error = NFS_PROTO(dir)->mknod(dir, &dentry->d_name, &attr, rdev,
+ 					&fhandle, &fattr);
++	nfs_end_data_update(dir);
+ 	if (!error)
+ 		error = nfs_instantiate(dentry, &fhandle, &fattr);
+ 	else
+@@ -1041,9 +1110,10 @@ static int nfs_mkdir(struct inode *dir, 
+ 	 */
+ 	d_drop(dentry);
+ #endif
+-	nfs_zap_caches(dir);
++	nfs_begin_data_update(dir);
+ 	error = NFS_PROTO(dir)->mkdir(dir, &dentry->d_name, &attr, &fhandle,
+ 					&fattr);
++	nfs_end_data_update(dir);
+ 	if (!error)
+ 		error = nfs_instantiate(dentry, &fhandle, &fattr);
+ 	else
+@@ -1060,10 +1130,12 @@ static int nfs_rmdir(struct inode *dir, 
+ 		dir->i_ino, dentry->d_name.name);
+ 
+ 	lock_kernel();
+-	nfs_zap_caches(dir);
++	nfs_begin_data_update(dir);
+ 	error = NFS_PROTO(dir)->rmdir(dir, &dentry->d_name);
+-	if (!error)
++	/* Ensure the VFS deletes this inode */
++	if (error == 0 && dentry->d_inode != NULL)
+ 		dentry->d_inode->i_nlink = 0;
++	nfs_end_data_update(dir);
+ 	unlock_kernel();
+ 
+ 	return error;
+@@ -1119,12 +1191,21 @@ dentry->d_parent->d_name.name, dentry->d
+ 			goto out;
+ 	} while(sdentry->d_inode != NULL); /* need negative lookup */
+ 
+-	nfs_zap_caches(dir);
+ 	qsilly.name = silly;
+ 	qsilly.len  = strlen(silly);
+-	error = NFS_PROTO(dir)->rename(dir, &dentry->d_name, dir, &qsilly);
++	nfs_begin_data_update(dir);
++	if (dentry->d_inode) {
++		nfs_begin_data_update(dentry->d_inode);
++		error = NFS_PROTO(dir)->rename(dir, &dentry->d_name,
++				dir, &qsilly);
++		nfs_end_data_update(dentry->d_inode);
++	} else
++		error = NFS_PROTO(dir)->rename(dir, &dentry->d_name,
++				dir, &qsilly);
++	nfs_end_data_update(dir);
+ 	if (!error) {
+ 		nfs_renew_times(dentry);
++		nfs_set_verifier(dentry, nfs_save_change_attribute(dir));
+ 		d_move(dentry, sdentry);
+ 		error = nfs_async_unlink(dentry);
+  		/* If we return 0 we don't unlink */
+@@ -1156,14 +1237,17 @@ static int nfs_safe_remove(struct dentry
+ 		goto out;
+ 	}
+ 
+-	nfs_zap_caches(dir);
+-	if (inode)
+-		NFS_CACHEINV(inode);
+-	error = NFS_PROTO(dir)->remove(dir, &dentry->d_name);
+-	if (error < 0)
+-		goto out;
+-	if (inode)
+-		inode->i_nlink--;
++	nfs_begin_data_update(dir);
++	if (inode != NULL) {
++		nfs_begin_data_update(inode);
++		error = NFS_PROTO(dir)->remove(dir, &dentry->d_name);
++		/* The VFS may want to delete this inode */
++		if (error == 0)
++			inode->i_nlink--;
++		nfs_end_data_update(inode);
++	} else
++		error = NFS_PROTO(dir)->remove(dir, &dentry->d_name);
++	nfs_end_data_update(dir);
+ out:
+ 	return error;
+ }
+@@ -1198,9 +1282,10 @@ static int nfs_unlink(struct inode *dir,
+ 	spin_unlock(&dentry->d_lock);
+ 	spin_unlock(&dcache_lock);
+ 	error = nfs_safe_remove(dentry);
+-	if (!error)
++	if (!error) {
+ 		nfs_renew_times(dentry);
+-	else if (need_rehash)
++		nfs_set_verifier(dentry, nfs_save_change_attribute(dir));
++	} else if (need_rehash)
+ 		d_rehash(dentry);
+ 	unlock_kernel();
+ 	return error;
+@@ -1247,9 +1332,10 @@ dentry->d_parent->d_name.name, dentry->d
+ 	qsymname.len  = strlen(symname);
+ 
+ 	lock_kernel();
+-	nfs_zap_caches(dir);
++	nfs_begin_data_update(dir);
+ 	error = NFS_PROTO(dir)->symlink(dir, &dentry->d_name, &qsymname,
+ 					  &attr, &sym_fh, &sym_attr);
++	nfs_end_data_update(dir);
+ 	if (!error) {
+ 		error = nfs_instantiate(dentry, &sym_fh, &sym_attr);
+ 	} else {
+@@ -1281,9 +1367,12 @@ nfs_link(struct dentry *old_dentry, stru
+ 	 */
+ 	lock_kernel();
+ 	d_drop(dentry);
+-	nfs_zap_caches(dir);
+-	NFS_CACHEINV(inode);
++
++	nfs_begin_data_update(dir);
++	nfs_begin_data_update(inode);
+ 	error = NFS_PROTO(dir)->link(inode, dir, &dentry->d_name);
++	nfs_end_data_update(inode);
++	nfs_end_data_update(dir);
+ 	unlock_kernel();
+ 	return error;
+ }
+@@ -1388,16 +1477,23 @@ go_ahead:
+ 	if (new_inode)
+ 		d_delete(new_dentry);
+ 
+-	nfs_zap_caches(new_dir);
+-	nfs_zap_caches(old_dir);
++	nfs_begin_data_update(old_dir);
++	nfs_begin_data_update(new_dir);
++	nfs_begin_data_update(old_inode);
+ 	error = NFS_PROTO(old_dir)->rename(old_dir, &old_dentry->d_name,
+ 					   new_dir, &new_dentry->d_name);
++	nfs_end_data_update(old_inode);
++	nfs_end_data_update(new_dir);
++	nfs_end_data_update(old_dir);
+ out:
+ 	if (rehash)
+ 		d_rehash(rehash);
+-	if (!error && !S_ISDIR(old_inode->i_mode))
+-		d_move(old_dentry, new_dentry);
+-	nfs_renew_times(new_dentry);
++	if (!error) {
++		if (!S_ISDIR(old_inode->i_mode))
++			d_move(old_dentry, new_dentry);
++		nfs_renew_times(new_dentry);
++		nfs_set_verifier(new_dentry, nfs_save_change_attribute(new_dir));
++	}
+ 
+ 	/* new dentry created? */
+ 	if (dentry)
+@@ -1451,7 +1547,8 @@ nfs_permission(struct inode *inode, int 
+ 
+ 	cred = rpcauth_lookupcred(NFS_CLIENT(inode)->cl_auth, 0);
+ 	if (cache->cred == cred
+-	    && time_before(jiffies, cache->jiffies + NFS_ATTRTIMEO(inode))) {
++	    && time_before(jiffies, cache->jiffies + NFS_ATTRTIMEO(inode))
++	    && !(NFS_FLAGS(inode) & NFS_INO_INVALID_ATTR)) {
+ 		if (!(res = cache->err)) {
+ 			/* Is the mask a subset of an accepted mask? */
+ 			if ((cache->mask & mask) == mask)
+diff -puN fs/nfs/direct.c~CITI_NFS4_ALL fs/nfs/direct.c
+--- linux-2.6.3/fs/nfs/direct.c~CITI_NFS4_ALL	2004-02-19 16:47:03.000000000 -0500
++++ linux-2.6.3-bfields/fs/nfs/direct.c	2004-02-19 16:47:03.000000000 -0500
+@@ -269,6 +269,7 @@ nfs_direct_write_seg(struct inode *inode
+ 	if (IS_SYNC(inode) || NFS_PROTO(inode)->version == 2 || count <= wsize)
+ 		wdata.args.stable = NFS_FILE_SYNC;
+ 
++	nfs_begin_data_update(inode);
+ retry:
+ 	need_commit = 0;
+ 	tot_bytes = 0;
+@@ -334,6 +335,8 @@ retry:
+ 						VERF_SIZE) != 0)
+ 			goto sync_retry;
+ 	}
++	nfs_end_data_update(inode);
++	NFS_FLAGS(inode) |= NFS_INO_INVALID_DATA;
+ 
+ 	return tot_bytes;
+ 
+diff -puN fs/nfs/file.c~CITI_NFS4_ALL fs/nfs/file.c
+--- linux-2.6.3/fs/nfs/file.c~CITI_NFS4_ALL	2004-02-19 16:47:03.000000000 -0500
++++ linux-2.6.3-bfields/fs/nfs/file.c	2004-02-19 16:47:07.000000000 -0500
+@@ -63,6 +63,20 @@ struct inode_operations nfs_file_inode_o
+ 	.setattr	= nfs_setattr,
+ };
+ 
++#ifdef CONFIG_NFS_V4
++
++struct inode_operations nfs4_file_inode_operations = {
++	.permission	= nfs_permission,
++	.getattr	= nfs_getattr,
++	.setattr	= nfs_setattr,
++#ifdef CONFIG_NFS_V4_ACL
++	.getxattr       = nfs_getxattr,
++	.setxattr       = nfs_setxattr,
++#endif /* CONFIG_NFS_V4_ACL */
++};
++
++#endif /* CONFIG_NFS_V4 */
++
+ /* Hack for future NFS swap support */
+ #ifndef IS_SWAPFILE
+ # define IS_SWAPFILE(inode)	(0)
+@@ -104,11 +118,16 @@ nfs_file_flush(struct file *file)
+ 
+ 	dfprintk(VFS, "nfs: flush(%s/%ld)\n", inode->i_sb->s_id, inode->i_ino);
+ 
++	if ((file->f_mode & FMODE_WRITE) == 0)
++		return 0;
+ 	lock_kernel();
+-	status = nfs_wb_file(inode, file);
++	/* Ensure that data+attribute caches are up to date after close() */
++	status = nfs_wb_all(inode);
+ 	if (!status) {
+ 		status = file->f_error;
+ 		file->f_error = 0;
++		if (!status)
++			__nfs_revalidate_inode(NFS_SERVER(inode), inode);
+ 	}
+ 	unlock_kernel();
+ 	return status;
+@@ -179,7 +198,7 @@ nfs_fsync(struct file *file, struct dent
+ 	dfprintk(VFS, "nfs: fsync(%s/%ld)\n", inode->i_sb->s_id, inode->i_ino);
+ 
+ 	lock_kernel();
+-	status = nfs_wb_file(inode, file);
++	status = nfs_wb_all(inode);
+ 	if (!status) {
+ 		status = file->f_error;
+ 		file->f_error = 0;
+diff -puN fs/nfs/inode.c~CITI_NFS4_ALL fs/nfs/inode.c
+--- linux-2.6.3/fs/nfs/inode.c~CITI_NFS4_ALL	2004-02-19 16:47:03.000000000 -0500
++++ linux-2.6.3-bfields/fs/nfs/inode.c	2004-02-19 16:47:15.000000000 -0500
+@@ -53,8 +53,8 @@
+  */
+ #define NFS_MAX_READAHEAD	RPC_MAXREQS
+ 
+-void nfs_zap_caches(struct inode *);
+ static void nfs_invalidate_inode(struct inode *);
++static int nfs_update_inode(struct inode *, struct nfs_fattr *, unsigned long);
+ 
+ static struct inode *nfs_alloc_inode(struct super_block *sb);
+ static void nfs_destroy_inode(struct inode *);
+@@ -118,7 +118,7 @@ nfs_write_inode(struct inode *inode, int
+ {
+ 	int flags = sync ? FLUSH_WAIT : 0;
+ 
+-	nfs_commit_file(inode, NULL, 0, 0, flags);
++	nfs_commit_inode(inode, 0, 0, flags);
+ }
+ 
+ static void
+@@ -136,21 +136,24 @@ nfs_delete_inode(struct inode * inode)
+ 	clear_inode(inode);
+ }
+ 
+-/*
+- * For the moment, the only task for the NFS clear_inode method is to
+- * release the mmap credential
+- */
+ static void
+ nfs_clear_inode(struct inode *inode)
+ {
+ 	struct nfs_inode *nfsi = NFS_I(inode);
+ 	struct rpc_cred *cred = nfsi->mm_cred;
+ 
++#ifdef CONFIG_NFS_V4_ACL
++	if (nfsi->acl != NFS4_ACL_NOT_CACHED)
++		posix_acl_release(nfsi->acl);
++	if (nfsi->default_acl != NFS4_ACL_NOT_CACHED)
++		posix_acl_release(nfsi->default_acl);
++#endif /* CONFIG_NFS_V4_ACL */
+ 	if (cred)
+ 		put_rpccred(cred);
+ 	cred = nfsi->cache_access.cred;
+ 	if (cred)
+ 		put_rpccred(cred);
++	BUG_ON(atomic_read(&nfsi->data_updates) != 0);
+ }
+ 
+ void
+@@ -230,50 +233,23 @@ nfs_block_size(unsigned long bsize, unsi
+ /*
+  * Obtain the root inode of the file system.
+  */
+-static int
+-nfs_get_root(struct inode **rooti, rpc_authflavor_t authflavor, struct super_block *sb, struct nfs_fh *rootfh)
++static struct inode *
++nfs_get_root(struct super_block *sb, struct nfs_fh *rootfh, struct nfs_fsinfo *fsinfo)
+ {
+ 	struct nfs_server	*server = NFS_SB(sb);
+-	struct nfs_fattr	fattr = { };
++	struct inode *rooti;
+ 	int			error;
+ 
+-	error = server->rpc_ops->getroot(server, rootfh, &fattr);
+-	if (error == -EACCES && authflavor > RPC_AUTH_MAXFLAVOR) {
+-		/*
+-		 * Some authentication types (gss/krb5, most notably)
+-		 * are such that root won't be able to present a
+-		 * credential for GETATTR (ie, getroot()).
+-		 *
+-		 * We still want the mount to succeed.
+-		 * 
+-		 * So we fake the attr values and mark the inode as such.
+-		 * On the first succesful traversal, we fix everything.
+-		 * The auth type test isn't quite correct, but whatever.
+-		 */
+-		dfprintk(VFS, "NFS: faking root inode\n");
+-
+-		fattr.fileid = 1;
+-		fattr.nlink = 2;	/* minimum for a dir */
+-		fattr.type = NFDIR;
+-		fattr.mode = S_IFDIR|S_IRUGO|S_IXUGO;
+-		fattr.size = 4096;
+-		fattr.du.nfs3.used = 1;
+-		fattr.valid = NFS_ATTR_FATTR|NFS_ATTR_FATTR_V3;
+-	} else if (error < 0) {
++	error = server->rpc_ops->getroot(server, rootfh, fsinfo);
++	if (error < 0) {
+ 		printk(KERN_NOTICE "nfs_get_root: getattr error = %d\n", -error);
+-		*rooti = NULL;	/* superfluous ... but safe */
+-		return error;
++		return ERR_PTR(error);
+ 	}
+ 
+-	*rooti = nfs_fhget(sb, rootfh, &fattr);
+-	if (error == -EACCES && authflavor > RPC_AUTH_MAXFLAVOR) {
+-		if (*rooti) {
+-			NFS_FLAGS(*rooti) |= NFS_INO_FAKE_ROOT;
+-			NFS_CACHEINV((*rooti));
+-			error = 0;
+-		}
+-	}
+-	return error;
++	rooti = nfs_fhget(sb, rootfh, fsinfo->fattr);
++	if (!rooti)
++		return ERR_PTR(-ENOMEM);
++	return rooti;
+ }
+ 
+ /*
+@@ -283,7 +259,7 @@ static int
+ nfs_sb_init(struct super_block *sb, rpc_authflavor_t authflavor)
+ {
+ 	struct nfs_server	*server;
+-	struct inode		*root_inode = NULL;
++	struct inode		*root_inode;
+ 	struct nfs_fattr	fattr;
+ 	struct nfs_fsinfo	fsinfo = {
+ 					.fattr = &fattr,
+@@ -299,8 +275,9 @@ nfs_sb_init(struct super_block *sb, rpc_
+ 
+ 	sb->s_magic      = NFS_SUPER_MAGIC;
+ 
++	root_inode = nfs_get_root(sb, &server->fh, &fsinfo);
+ 	/* Did getting the root inode fail? */
+-	if (nfs_get_root(&root_inode, authflavor, sb, &server->fh) < 0)
++	if (IS_ERR(root_inode))
+ 		goto out_no_root;
+ 	sb->s_root = d_alloc_root(root_inode);
+ 	if (!sb->s_root)
+@@ -309,10 +286,6 @@ nfs_sb_init(struct super_block *sb, rpc_
+ 	sb->s_root->d_op = server->rpc_ops->dentry_ops;
+ 
+ 	/* Get some general file system info */
+-        if (server->rpc_ops->fsinfo(server, &server->fh, &fsinfo) < 0) {
+-		printk(KERN_NOTICE "NFS: cannot retrieve file system info.\n");
+-		goto out_no_root;
+-        }
+ 	if (server->namelen == 0 &&
+ 	    server->rpc_ops->pathconf(server, &server->fh, &pathinfo) >= 0)
+ 		server->namelen = pathinfo.max_namelen;
+@@ -368,13 +341,11 @@ nfs_sb_init(struct super_block *sb, rpc_
+ 	rpc_setbufsize(server->client, server->wsize + 100, server->rsize + 100);
+ 	return 0;
+ 	/* Yargs. It didn't work out. */
+-out_free_all:
+-	if (root_inode)
+-		iput(root_inode);
+-	return -EINVAL;
+ out_no_root:
+ 	printk("nfs_read_super: get root inode failed\n");
+-	goto out_free_all;
++	if (!IS_ERR(root_inode))
++		iput(root_inode);
++	return -EINVAL;
+ }
+ 
+ /*
+@@ -627,13 +598,17 @@ static int nfs_show_options(struct seq_f
+ void
+ nfs_zap_caches(struct inode *inode)
+ {
++	struct nfs_inode *nfsi = NFS_I(inode);
++	int mode = inode->i_mode;
++
+ 	NFS_ATTRTIMEO(inode) = NFS_MINATTRTIMEO(inode);
+ 	NFS_ATTRTIMEO_UPDATE(inode) = jiffies;
+ 
+-	invalidate_remote_inode(inode);
+-
+ 	memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_COOKIEVERF(inode)));
+-	NFS_CACHEINV(inode);
++	if (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode))
++		nfsi->flags |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA;
++	else
++		nfsi->flags |= NFS_INO_INVALID_ATTR;
+ }
+ 
+ /*
+@@ -673,9 +648,6 @@ nfs_find_actor(struct inode *inode, void
+ 		return 0;
+ 	if (is_bad_inode(inode))
+ 		return 0;
+-	/* Force an attribute cache update if inode->i_count == 0 */
+-	if (!atomic_read(&inode->i_count))
+-		NFS_CACHEINV(inode);
+ 	return 1;
+ }
+ 
+@@ -729,12 +701,12 @@ nfs_fhget(struct super_block *sb, struct
+ 		inode->i_ino = hash;
+ 
+ 		/* We can't support update_atime(), since the server will reset it */
+-		inode->i_flags |= S_NOATIME;
++		inode->i_flags |= S_NOATIME|S_NOCMTIME;
+ 		inode->i_mode = fattr->mode;
+ 		/* Why so? Because we want revalidate for devices/FIFOs, and
+ 		 * that's precisely what we have in nfs_file_inode_operations.
+ 		 */
+-		inode->i_op = &nfs_file_inode_operations;
++		inode->i_op = NFS_SB(sb)->rpc_ops->file_inode_ops;
+ 		if (S_ISREG(inode->i_mode)) {
+ 			inode->i_fop = &nfs_file_operations;
+ 			inode->i_data.a_ops = &nfs_file_aops;
+@@ -754,10 +726,6 @@ nfs_fhget(struct super_block *sb, struct
+ 		inode->i_atime = fattr->atime;
+ 		inode->i_mtime = fattr->mtime;
+ 		inode->i_ctime = fattr->ctime;
+-		nfsi->read_cache_ctime = fattr->ctime;
+-		nfsi->read_cache_mtime = fattr->mtime;
+-		nfsi->cache_mtime_jiffies = fattr->timestamp;
+-		nfsi->read_cache_isize = fattr->size;
+ 		if (fattr->valid & NFS_ATTR_FATTR_V4)
+ 			nfsi->change_attr = fattr->change_attr;
+ 		inode->i_size = nfs_size_to_loff_t(fattr->size);
+@@ -778,7 +746,6 @@ nfs_fhget(struct super_block *sb, struct
+ 		nfsi->attrtimeo_timestamp = jiffies;
+ 		memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf));
+ 		nfsi->cache_access.cred = NULL;
+-
+ 		unlock_new_inode(inode);
+ 	} else
+ 		nfs_refresh_inode(inode, fattr);
+@@ -804,70 +771,50 @@ nfs_setattr(struct dentry *dentry, struc
+ 	struct nfs_fattr fattr;
+ 	int error;
+ 
++	if (attr->ia_valid & ATTR_SIZE) {
++		if (!S_ISREG(inode->i_mode) || attr->ia_size == i_size_read(inode))
++			attr->ia_valid &= ~ATTR_SIZE;
++	}
++
+ 	/* Optimization: if the end result is no change, don't RPC */
+ 	attr->ia_valid &= NFS_VALID_ATTRS;
+ 	if (attr->ia_valid == 0)
+ 		return 0;
+ 
+ 	lock_kernel();
+-
+-	/*
+-	 * Make sure the inode is up-to-date.
+-	 */
+-	error = nfs_revalidate_inode(NFS_SERVER(inode),inode);
+-	if (error) {
+-#ifdef NFS_PARANOIA
+-printk("nfs_setattr: revalidate failed, error=%d\n", error);
+-#endif
+-		goto out;
+-	}
+-
+-	if (!S_ISREG(inode->i_mode)) {
+-		attr->ia_valid &= ~ATTR_SIZE;
+-		if (attr->ia_valid == 0)
+-			goto out;
+-	} else {
+-		filemap_fdatawrite(inode->i_mapping);
+-		error = nfs_wb_all(inode);
+-		filemap_fdatawait(inode->i_mapping);
+-		if (error)
+-			goto out;
+-		/* Optimize away unnecessary truncates */
+-		if ((attr->ia_valid & ATTR_SIZE) && i_size_read(inode) == attr->ia_size)
+-			attr->ia_valid &= ~ATTR_SIZE;
++	nfs_begin_data_update(inode);
++	/* Write all dirty data if we're changing file permissions or size */
++	if ((attr->ia_valid & (ATTR_MODE|ATTR_UID|ATTR_GID|ATTR_SIZE)) != 0) {
++		if (filemap_fdatawrite(inode->i_mapping) == 0)
++			filemap_fdatawait(inode->i_mapping);
++		nfs_wb_all(inode);
+ 	}
+-	if (!attr->ia_valid)
+-		goto out;
+-
+ 	error = NFS_PROTO(inode)->setattr(dentry, &fattr, attr);
+-	if (error)
+-		goto out;
+-	/*
+-	 * If we changed the size or mtime, update the inode
+-	 * now to avoid invalidating the page cache.
+-	 */
+-	if (attr->ia_valid & ATTR_SIZE) {
+-		if (attr->ia_size != fattr.size)
+-			printk("nfs_setattr: attr=%Ld, fattr=%Ld??\n",
+-			       (long long) attr->ia_size, (long long)fattr.size);
+-		vmtruncate(inode, attr->ia_size);
++	if (error == 0) {
++		nfs_refresh_inode(inode, &fattr);
++		if ((attr->ia_valid & ATTR_MODE) != 0) {
++			int mode;
++			mode = inode->i_mode & ~S_IALLUGO;
++			mode |= attr->ia_mode & S_IALLUGO;
++			inode->i_mode = mode;
++		}
++		if ((attr->ia_valid & ATTR_UID) != 0)
++			inode->i_uid = attr->ia_uid;
++		if ((attr->ia_valid & ATTR_GID) != 0)
++			inode->i_gid = attr->ia_gid;
++		if ((attr->ia_valid & ATTR_SIZE) != 0) {
++			i_size_write(inode, attr->ia_size);
++			vmtruncate(inode, attr->ia_size);
++		}
+ 	}
+-
+-	/*
+-	 * If we changed the size or mtime, update the inode
+-	 * now to avoid invalidating the page cache.
+-	 */
+-	if (!(fattr.valid & NFS_ATTR_WCC)) {
+-		struct nfs_inode *nfsi = NFS_I(inode);
+-		fattr.pre_size = nfsi->read_cache_isize;
+-		fattr.pre_mtime = nfsi->read_cache_mtime;
+-		fattr.pre_ctime = nfsi->read_cache_ctime;
+-		fattr.valid |= NFS_ATTR_WCC;
+-	}
+-	/* Force an attribute cache update */
+-	NFS_CACHEINV(inode);
+-	error = nfs_refresh_inode(inode, &fattr);
+-out:
++	if ((attr->ia_valid & (ATTR_MODE|ATTR_UID|ATTR_GID)) != 0) {
++		struct rpc_cred **cred = &NFS_I(inode)->cache_access.cred;
++		if (*cred) {
++			put_rpccred(*cred);
++			*cred = NULL;
++		}
++	}
++	nfs_end_data_update(inode);
+ 	unlock_kernel();
+ 	return error;
+ }
+@@ -895,7 +842,19 @@ nfs_wait_on_inode(struct inode *inode, i
+ int nfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
+ {
+ 	struct inode *inode = dentry->d_inode;
+-	int err = nfs_revalidate_inode(NFS_SERVER(inode), inode);
++	struct nfs_inode *nfsi = NFS_I(inode);
++	int need_atime = nfsi->flags & NFS_INO_INVALID_ATIME;
++	int err;
++
++	if (__IS_FLG(inode, MS_NOATIME))
++		need_atime = 0;
++	else if (__IS_FLG(inode, MS_NODIRATIME) && S_ISDIR(inode->i_mode))
++		need_atime = 0;
++	/* We may force a getattr if the user cares about atime */
++	if (need_atime)
++		err = __nfs_revalidate_inode(NFS_SERVER(inode), inode);
++	else
++		err = nfs_revalidate_inode(NFS_SERVER(inode), inode);
+ 	if (!err)
+ 		generic_fillattr(inode, stat);
+ 	return err;
+@@ -930,8 +889,10 @@ int nfs_open(struct inode *inode, struct
+ 	auth = NFS_CLIENT(inode)->cl_auth;
+ 	cred = rpcauth_lookupcred(auth, 0);
+ 	filp->private_data = cred;
+-	if (filp->f_mode & FMODE_WRITE)
++	if ((filp->f_mode & FMODE_WRITE) != 0) {
+ 		nfs_set_mmcred(inode, cred);
++		nfs_begin_data_update(inode);
++	}
+ 	return 0;
+ }
+ 
+@@ -940,6 +901,8 @@ int nfs_release(struct inode *inode, str
+ 	struct rpc_cred *cred;
+ 
+ 	lock_kernel();
++	if ((filp->f_mode & FMODE_WRITE) != 0)
++		nfs_end_data_update(inode);
+ 	cred = nfs_file_cred(filp);
+ 	if (cred)
+ 		put_rpccred(cred);
+@@ -956,6 +919,9 @@ __nfs_revalidate_inode(struct nfs_server
+ {
+ 	int		 status = -ESTALE;
+ 	struct nfs_fattr fattr;
++	struct nfs_inode *nfsi = NFS_I(inode);
++	unsigned long verifier;
++	unsigned int flags;
+ 
+ 	dfprintk(PAGECACHE, "NFS: revalidating (%s/%Ld)\n",
+ 		inode->i_sb->s_id, (long long)NFS_FILEID(inode));
+@@ -965,23 +931,22 @@ __nfs_revalidate_inode(struct nfs_server
+  		goto out_nowait;
+ 	if (NFS_STALE(inode) && inode != inode->i_sb->s_root->d_inode)
+  		goto out_nowait;
+-	if (NFS_FAKE_ROOT(inode)) {
+-		dfprintk(VFS, "NFS: not revalidating fake root\n");
+-		status = 0;
+-		goto out_nowait;
+-	}
+ 
+ 	while (NFS_REVALIDATING(inode)) {
+ 		status = nfs_wait_on_inode(inode, NFS_INO_REVALIDATING);
+ 		if (status < 0)
+ 			goto out_nowait;
+-		if (time_before(jiffies,NFS_READTIME(inode)+NFS_ATTRTIMEO(inode))) {
+-			status = NFS_STALE(inode) ? -ESTALE : 0;
+-			goto out_nowait;
+-		}
++		if (NFS_SERVER(inode)->flags & NFS_MOUNT_NOAC)
++			continue;
++		if (NFS_FLAGS(inode) & (NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ATIME))
++			continue;
++		status = NFS_STALE(inode) ? -ESTALE : 0;
++		goto out_nowait;
+ 	}
+ 	NFS_FLAGS(inode) |= NFS_INO_REVALIDATING;
+ 
++	/* Protect against RPC races by saving the change attribute */
++	verifier = nfs_save_change_attribute(inode);
+ 	status = NFS_PROTO(inode)->getattr(inode, &fattr);
+ 	if (status) {
+ 		dfprintk(PAGECACHE, "nfs_revalidate_inode: (%s/%Ld) getattr failed, error=%d\n",
+@@ -995,13 +960,36 @@ __nfs_revalidate_inode(struct nfs_server
+ 		goto out;
+ 	}
+ 
+-	status = nfs_refresh_inode(inode, &fattr);
++	status = nfs_update_inode(inode, &fattr, verifier);
+ 	if (status) {
+ 		dfprintk(PAGECACHE, "nfs_revalidate_inode: (%s/%Ld) refresh failed, error=%d\n",
+ 			 inode->i_sb->s_id,
+ 			 (long long)NFS_FILEID(inode), status);
+ 		goto out;
+ 	}
++	flags = nfsi->flags;
++	/*
++	 * We may need to keep the attributes marked as invalid if
++	 * we raced with nfs_end_attr_update().
++	 */
++	if (verifier == nfsi->cache_change_attribute)
++		nfsi->flags &= ~(NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ATIME);
++	/* Do the page cache invalidation */
++	if (flags & NFS_INO_INVALID_DATA) {
++		if (S_ISREG(inode->i_mode)) {
++			if (filemap_fdatawrite(inode->i_mapping) == 0)
++				filemap_fdatawait(inode->i_mapping);
++			nfs_wb_all(inode);
++		}
++		nfsi->flags &= ~NFS_INO_INVALID_DATA;
++		invalidate_inode_pages2(inode->i_mapping);
++		memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_COOKIEVERF(inode)));
++		dfprintk(PAGECACHE, "NFS: (%s/%Ld) data cache invalidated\n",
++				inode->i_sb->s_id,
++				(long long)NFS_FILEID(inode));
++		/* This ensures we revalidate dentries */
++		nfsi->cache_change_attribute++;
++	}
+ 	dfprintk(PAGECACHE, "NFS: (%s/%Ld) revalidation complete\n",
+ 		inode->i_sb->s_id,
+ 		(long long)NFS_FILEID(inode));
+@@ -1009,41 +997,104 @@ __nfs_revalidate_inode(struct nfs_server
+ 	NFS_FLAGS(inode) &= ~NFS_INO_STALE;
+ out:
+ 	NFS_FLAGS(inode) &= ~NFS_INO_REVALIDATING;
+-	wake_up(&NFS_I(inode)->nfs_i_wait);
++	wake_up(&nfsi->nfs_i_wait);
+  out_nowait:
+ 	unlock_kernel();
+ 	return status;
+ }
+ 
+-/*
+- * nfs_fattr_obsolete - Test if attribute data is newer than cached data
+- * @inode: inode
+- * @fattr: attributes to test
++/**
++ * nfs_begin_data_update
++ * @inode - pointer to inode
++ * Declare that a set of operations will update file data on the server
++ */
++void nfs_begin_data_update(struct inode *inode)
++{
++	atomic_inc(&NFS_I(inode)->data_updates);
++}
++
++/**
++ * nfs_end_data_update
++ * @inode - pointer to inode
++ * Declare end of the operations that will update file data
++ */
++void nfs_end_data_update(struct inode *inode)
++{
++	struct nfs_inode *nfsi = NFS_I(inode);
++
++	if (atomic_dec_and_test(&nfsi->data_updates)) {
++		nfsi->cache_change_attribute ++;
++		/* Mark the attribute cache for revalidation */
++		nfsi->flags |= NFS_INO_INVALID_ATTR;
++		/* Directories and symlinks: invalidate page cache too */
++		if (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode))
++			nfsi->flags |= NFS_INO_INVALID_DATA;
++	}
++}
++
++/**
++ * nfs_refresh_inode - verify consistency of the inode attribute cache
++ * @inode - pointer to inode
++ * @fattr - updated attributes
+  *
+- * Avoid stuffing the attribute cache with obsolete information.
+- * We always accept updates if the attribute cache timed out, or if
+- * fattr->ctime is newer than our cached value.
+- * If fattr->ctime matches the cached value, we still accept the update
+- * if it increases the file size.
++ * Verifies the attribute cache. If we have just changed the attributes,
++ * so that fattr carries weak cache consistency data, then it may
++ * also update the ctime/mtime/change_attribute.
+  */
+-static inline
+-int nfs_fattr_obsolete(struct inode *inode, struct nfs_fattr *fattr)
++int nfs_refresh_inode(struct inode *inode, struct nfs_fattr *fattr)
+ {
+ 	struct nfs_inode *nfsi = NFS_I(inode);
+-	long cdif;
++	loff_t cur_size, new_isize;
++	int data_unstable;
++
++	/* Are we in the process of updating data on the server? */
++	data_unstable = nfs_caches_unstable(inode);
++
++	if (fattr->valid & NFS_ATTR_FATTR_V4) {
++		if ((fattr->valid & NFS_ATTR_PRE_CHANGE) != 0
++				&& nfsi->change_attr == fattr->pre_change_attr)
++			nfsi->change_attr = fattr->change_attr;
++		if (!data_unstable && nfsi->change_attr != fattr->change_attr)
++			nfsi->flags |= NFS_INO_INVALID_ATTR;
++	}
++
++	if ((fattr->valid & NFS_ATTR_FATTR) == 0)
++		return 0;
++
++	/* Has the inode gone and changed behind our back? */
++	if (nfsi->fileid != fattr->fileid
++			|| (inode->i_mode & S_IFMT) != (fattr->mode & S_IFMT))
++		return -EIO;
+ 
+-	if (time_after(jiffies, nfsi->read_cache_jiffies + nfsi->attrtimeo))
+-		goto out_valid;
+-	cdif = fattr->ctime.tv_sec - nfsi->read_cache_ctime.tv_sec;
+-	if (cdif == 0)
+-		cdif = fattr->ctime.tv_nsec - nfsi->read_cache_ctime.tv_nsec;
+-	if (cdif > 0)
+-		goto out_valid;
+-	/* Ugh... */
+-	if (cdif == 0 && fattr->size > nfsi->read_cache_isize)
+-		goto out_valid;
+-	return -1;
+- out_valid:
++	cur_size = i_size_read(inode);
++ 	new_isize = nfs_size_to_loff_t(fattr->size);
++
++	/* If we have atomic WCC data, we may update some attributes */
++	if ((fattr->valid & NFS_ATTR_WCC) != 0) {
++		if (timespec_equal(&inode->i_ctime, &fattr->pre_ctime))
++			memcpy(&inode->i_ctime, &fattr->ctime, sizeof(inode->i_ctime));
++		if (timespec_equal(&inode->i_mtime, &fattr->pre_mtime))
++			memcpy(&inode->i_mtime, &fattr->mtime, sizeof(inode->i_mtime));
++	}
++
++	/* Verify a few of the more important attributes */
++	if (!data_unstable) {
++		if (!timespec_equal(&inode->i_mtime, &fattr->mtime)
++				|| cur_size != new_isize)
++			nfsi->flags |= NFS_INO_INVALID_ATTR;
++	} else if (S_ISREG(inode->i_mode) && new_isize > cur_size)
++			nfsi->flags |= NFS_INO_INVALID_ATTR;
++
++	/* Have any file permissions changed? */
++	if ((inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO)
++			|| inode->i_uid != fattr->uid
++			|| inode->i_gid != fattr->gid)
++		nfsi->flags |= NFS_INO_INVALID_ATTR;
++
++	if (!timespec_equal(&inode->i_atime, &fattr->atime))
++		nfsi->flags |= NFS_INO_INVALID_ATIME;
++
++	nfsi->read_cache_jiffies = fattr->timestamp;
+ 	return 0;
+ }
+ 
+@@ -1059,20 +1110,22 @@ int nfs_fattr_obsolete(struct inode *ino
+  *
+  * A very similar scenario holds for the dir cache.
+  */
+-int
+-__nfs_refresh_inode(struct inode *inode, struct nfs_fattr *fattr)
++static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr, unsigned long verifier)
+ {
+ 	struct nfs_inode *nfsi = NFS_I(inode);
+ 	__u64		new_size;
+ 	loff_t		new_isize;
+-	int		invalid = 0;
+-	int		mtime_update = 0;
++	unsigned int	invalid = 0;
+ 	loff_t		cur_isize;
++	int data_unstable;
+ 
+-	dfprintk(VFS, "NFS: refresh_inode(%s/%ld ct=%d info=0x%x)\n",
+-			inode->i_sb->s_id, inode->i_ino,
++	dfprintk(VFS, "NFS: %s(%s/%ld ct=%d info=0x%x)\n",
++			__FUNCTION__, inode->i_sb->s_id, inode->i_ino,
+ 			atomic_read(&inode->i_count), fattr->valid);
+ 
++	if ((fattr->valid & NFS_ATTR_FATTR) == 0)
++		return 0;
++
+ 	/* First successful call after mount, fill real data. */
+ 	if (NFS_FAKE_ROOT(inode)) {
+ 		dfprintk(VFS, "NFS: updating fake root\n");
+@@ -1081,43 +1134,49 @@ __nfs_refresh_inode(struct inode *inode,
+ 	}
+ 
+ 	if (nfsi->fileid != fattr->fileid) {
+-		printk(KERN_ERR "nfs_refresh_inode: inode number mismatch\n"
++		printk(KERN_ERR "%s: inode number mismatch\n"
+ 		       "expected (%s/0x%Lx), got (%s/0x%Lx)\n",
++		       __FUNCTION__,
+ 		       inode->i_sb->s_id, (long long)nfsi->fileid,
+ 		       inode->i_sb->s_id, (long long)fattr->fileid);
+ 		goto out_err;
+ 	}
+ 
+-	/* Throw out obsolete READDIRPLUS attributes */
+-	if (time_before(fattr->timestamp, NFS_READTIME(inode)))
+-		return 0;
+ 	/*
+ 	 * Make sure the inode's type hasn't changed.
+ 	 */
+ 	if ((inode->i_mode & S_IFMT) != (fattr->mode & S_IFMT))
+ 		goto out_changed;
+ 
+-	new_size = fattr->size;
+- 	new_isize = nfs_size_to_loff_t(fattr->size);
+-
+-	/* Avoid races */
+-	if (nfs_fattr_obsolete(inode, fattr))
+-		goto out_nochange;
+-
+ 	/*
+ 	 * Update the read time so we don't revalidate too often.
+ 	 */
+ 	nfsi->read_cache_jiffies = fattr->timestamp;
+ 
+-	/*
+-	 * Note: NFS_CACHE_ISIZE(inode) reflects the state of the cache.
+-	 *       NOT inode->i_size!!!
+-	 */
+-	if (nfsi->read_cache_isize != new_size) {
++	/* Are we racing with known updates of the metadata on the server? */
++	data_unstable = ! nfs_verify_change_attribute(inode, verifier);
++
++	/* Check if the file size agrees */
++	new_size = fattr->size;
++ 	new_isize = nfs_size_to_loff_t(fattr->size);
++	cur_isize = i_size_read(inode);
++	if (cur_isize != new_size) {
+ #ifdef NFS_DEBUG_VERBOSE
+ 		printk(KERN_DEBUG "NFS: isize change on %s/%ld\n", inode->i_sb->s_id, inode->i_ino);
+ #endif
+-		invalid = 1;
++		/*
++		 * If we have pending writebacks, things can get
++		 * messy.
++		 */
++		if (S_ISREG(inode->i_mode) && data_unstable) {
++			if (new_isize > cur_isize) {
++				i_size_write(inode, new_isize);
++				invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA;
++			}
++		} else {
++			i_size_write(inode, new_isize);
++			invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA;
++		}
+ 	}
+ 
+ 	/*
+@@ -1125,12 +1184,13 @@ __nfs_refresh_inode(struct inode *inode,
+ 	 *       can change this value in VFS without requiring a
+ 	 *	 cache revalidation.
+ 	 */
+-	if (!timespec_equal(&nfsi->read_cache_mtime, &fattr->mtime)) {
++	if (!timespec_equal(&inode->i_mtime, &fattr->mtime)) {
++		memcpy(&inode->i_mtime, &fattr->mtime, sizeof(inode->i_mtime));
+ #ifdef NFS_DEBUG_VERBOSE
+ 		printk(KERN_DEBUG "NFS: mtime change on %s/%ld\n", inode->i_sb->s_id, inode->i_ino);
+ #endif
+-		invalid = 1;
+-		mtime_update = 1;
++		if (!data_unstable)
++			invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA;
+ 	}
+ 
+ 	if ((fattr->valid & NFS_ATTR_FATTR_V4)
+@@ -1139,47 +1199,15 @@ __nfs_refresh_inode(struct inode *inode,
+ 		printk(KERN_DEBUG "NFS: change_attr change on %s/%ld\n",
+ 		       inode->i_sb->s_id, inode->i_ino);
+ #endif
+-		invalid = 1;
+-	}
+-
+-	/* Check Weak Cache Consistency data.
+-	 * If size and mtime match the pre-operation values, we can
+-	 * assume that any attribute changes were caused by our NFS
+-         * operation, so there's no need to invalidate the caches.
+-         */
+-	if ((fattr->valid & NFS_ATTR_PRE_CHANGE)
+-	    && nfsi->change_attr == fattr->pre_change_attr) {
+-		invalid = 0;
+-	}
+-	else if ((fattr->valid & NFS_ATTR_WCC)
+-	    && nfsi->read_cache_isize == fattr->pre_size
+-	    && timespec_equal(&nfsi->read_cache_mtime, &fattr->pre_mtime)) {
+-		invalid = 0;
+-	}
+-
+-	/*
+-	 * If we have pending writebacks, things can get
+-	 * messy.
+-	 */
+-	cur_isize = i_size_read(inode);
+-	if (nfs_have_writebacks(inode) && new_isize < cur_isize)
+-		new_isize = cur_isize;
+-
+-	nfsi->read_cache_ctime = fattr->ctime;
+-	inode->i_ctime = fattr->ctime;
+-	inode->i_atime = fattr->atime;
+-
+-	if (mtime_update) {
+-		if (invalid)
+-			nfsi->cache_mtime_jiffies = fattr->timestamp;
+-		nfsi->read_cache_mtime = fattr->mtime;
+-		inode->i_mtime = fattr->mtime;
++		nfsi->change_attr = fattr->change_attr;
++		if (!data_unstable)
++			invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA;
+ 	}
+ 
+-	nfsi->read_cache_isize = new_size;
+-	i_size_write(inode, new_isize);
++	memcpy(&inode->i_ctime, &fattr->ctime, sizeof(inode->i_ctime));
++	memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime));
+ 
+-	if (inode->i_mode != fattr->mode ||
++	if ((inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO) ||
+ 	    inode->i_uid != fattr->uid ||
+ 	    inode->i_gid != fattr->gid) {
+ 		struct rpc_cred **cred = &NFS_I(inode)->cache_access.cred;
+@@ -1187,15 +1215,17 @@ __nfs_refresh_inode(struct inode *inode,
+ 			put_rpccred(*cred);
+ 			*cred = NULL;
+ 		}
++		invalid |= NFS_INO_INVALID_ATTR;
+ 	}
+ 
+-	if (fattr->valid & NFS_ATTR_FATTR_V4)
+-		nfsi->change_attr = fattr->change_attr;
+-
+ 	inode->i_mode = fattr->mode;
+ 	inode->i_nlink = fattr->nlink;
+ 	inode->i_uid = fattr->uid;
+ 	inode->i_gid = fattr->gid;
++#ifdef CONFIG_NFS_V4_ACL
++	nfs4_izap_acl(inode, &nfsi->acl);
++	nfs4_izap_acl(inode, &nfsi->default_acl);
++#endif /* CONFIG_NFS_V4_ACL */
+ 
+ 	if (fattr->valid & (NFS_ATTR_FATTR_V3 | NFS_ATTR_FATTR_V4)) {
+ 		/*
+@@ -1207,31 +1237,30 @@ __nfs_refresh_inode(struct inode *inode,
+  		inode->i_blocks = fattr->du.nfs2.blocks;
+  		inode->i_blksize = fattr->du.nfs2.blocksize;
+  	}
+- 
+-	/* Update attrtimeo value */
+-	if (invalid) {
++
++	/* Update attrtimeo value if we're out of the unstable period */
++	if (invalid & NFS_INO_INVALID_ATTR) {
+ 		nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
+ 		nfsi->attrtimeo_timestamp = jiffies;
+-		invalidate_remote_inode(inode);
+-		memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_COOKIEVERF(inode)));
+ 	} else if (time_after(jiffies, nfsi->attrtimeo_timestamp+nfsi->attrtimeo)) {
+ 		if ((nfsi->attrtimeo <<= 1) > NFS_MAXATTRTIMEO(inode))
+ 			nfsi->attrtimeo = NFS_MAXATTRTIMEO(inode);
+ 		nfsi->attrtimeo_timestamp = jiffies;
+ 	}
++	/* Don't invalidate the data if we were to blame */
++	if (!(S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode)
++				|| S_ISLNK(inode->i_mode)))
++		invalid &= ~NFS_INO_INVALID_DATA;
++	nfsi->flags |= invalid;
+ 
+ 	return 0;
+- out_nochange:
+-	if (!timespec_equal(&fattr->atime, &inode->i_atime))
+-		inode->i_atime = fattr->atime;
+-	return 0;
+  out_changed:
+ 	/*
+ 	 * Big trouble! The inode has become a different object.
+ 	 */
+ #ifdef NFS_PARANOIA
+-	printk(KERN_DEBUG "nfs_refresh_inode: inode %ld mode changed, %07o to %07o\n",
+-	       inode->i_ino, inode->i_mode, fattr->mode);
++	printk(KERN_DEBUG "%s: inode %ld mode changed, %07o to %07o\n",
++			__FUNCTION__, inode->i_ino, inode->i_mode, fattr->mode);
+ #endif
+ 	/*
+ 	 * No need to worry about unhashing the dentry, as the
+@@ -1355,6 +1384,82 @@ static struct file_system_type nfs_fs_ty
+ 	.fs_flags	= FS_ODD_RENAME|FS_REVAL_DOT,
+ };
+ 
++#ifdef CONFIG_NFS_V4_ACL
++
++int
++nfs_setxattr(struct dentry *dentry, const char *key, const void *buf,
++    size_t buflen, int flags)
++{
++	struct posix_acl *acl;
++	int type, error;
++	struct inode *inode = dentry->d_inode;
++
++	if (strlen(key) == sizeof(XATTR_NAME_ACL_ACCESS) - 1 &&
++	    memcmp(key, XATTR_NAME_ACL_ACCESS,
++		sizeof(XATTR_NAME_ACL_ACCESS) - 1) == 0)
++		type = ACL_TYPE_ACCESS;
++	else if (strlen(key) == sizeof(XATTR_NAME_ACL_DEFAULT) - 1 &&
++	    memcmp(key, XATTR_NAME_ACL_DEFAULT,
++		sizeof(XATTR_NAME_ACL_ACCESS) - 1) == 0)
++		type = ACL_TYPE_DEFAULT;
++	else
++		return (-EINVAL);
++
++        if (!S_ISREG(inode->i_mode) &&
++            (!S_ISDIR(inode->i_mode) || inode->i_mode & S_ISVTX))
++                return (-EPERM);
++
++	if (type == ACL_TYPE_DEFAULT && !S_ISDIR(inode->i_mode))
++		return -EACCES;
++
++	acl = posix_acl_from_xattr(buf, buflen);
++	if (IS_ERR(acl))
++		return (PTR_ERR(acl));
++	if (acl == NULL)
++		return (-ENODATA);
++
++	error = posix_acl_valid(acl);
++	if (error)
++		goto out_free;
++
++	error = nfs4_proc_set_posix_acl(inode, type, acl);
++out_free:
++	posix_acl_release(acl);
++	return error;
++}
++
++ssize_t
++nfs_getxattr(struct dentry *dentry, const char *key, void *buf,
++    size_t buflen)
++{
++	int type = 0;
++	struct inode *inode = dentry->d_inode;
++	struct posix_acl *acl;
++	ssize_t	ret;
++
++	if (strlen(key) == sizeof(XATTR_NAME_ACL_ACCESS) - 1 &&
++	    memcmp(key, XATTR_NAME_ACL_ACCESS,
++		sizeof(XATTR_NAME_ACL_ACCESS) - 1) == 0)
++		type = ACL_TYPE_ACCESS;
++	else if (strlen(key) == sizeof(XATTR_NAME_ACL_DEFAULT) - 1 &&
++	    memcmp(key, XATTR_NAME_ACL_DEFAULT,
++		sizeof(XATTR_NAME_ACL_ACCESS) - 1) == 0)
++		type = ACL_TYPE_DEFAULT;
++	else
++		return (-EINVAL);
++
++	acl = nfs4_proc_get_posix_acl(inode, type);
++	if (IS_ERR(acl))
++		return (PTR_ERR(acl));
++
++	ret = posix_acl_to_xattr(acl, buf, buflen);
++
++	posix_acl_release(acl);
++	return ret;
++}
++
++#endif /* CONFIG_NFS_V4_ACL */
++
+ #ifdef CONFIG_NFS_V4
+ 
+ static void nfs4_clear_inode(struct inode *);
+@@ -1601,7 +1706,7 @@ static struct super_block *nfs4_get_sb(s
+ 
+ 	if (data->version != NFS4_MOUNT_VERSION) {
+ 		printk("nfs warning: mount version %s than kernel\n",
+-			data->version < NFS_MOUNT_VERSION ? "older" : "newer");
++			data->version < NFS4_MOUNT_VERSION ? "older" : "newer");
+ 	}
+ 
+ 	p = nfs_copy_user_string(NULL, &data->hostname, 256);
+@@ -1699,6 +1804,10 @@ static struct inode *nfs_alloc_inode(str
+ 		return NULL;
+ 	nfsi->flags = 0;
+ 	nfsi->mm_cred = NULL;
++#ifdef CONFIG_NFS_V4_ACL
++	nfsi->acl = NFS4_ACL_NOT_CACHED;
++	nfsi->default_acl = NFS4_ACL_NOT_CACHED;
++#endif /* CONFIG_NFS_V4_ACL */
+ 	nfs4_zero_state(nfsi);
+ 	return &nfsi->vfs_inode;
+ }
+@@ -1718,6 +1827,7 @@ static void init_once(void * foo, kmem_c
+ 		INIT_LIST_HEAD(&nfsi->dirty);
+ 		INIT_LIST_HEAD(&nfsi->commit);
+ 		INIT_RADIX_TREE(&nfsi->nfs_page_tree, GFP_ATOMIC);
++		atomic_set(&nfsi->data_updates, 0);
+ 		nfsi->ndirty = 0;
+ 		nfsi->ncommit = 0;
+ 		nfsi->npages = 0;
+diff -puN fs/nfs/nfs3proc.c~CITI_NFS4_ALL fs/nfs/nfs3proc.c
+--- linux-2.6.3/fs/nfs/nfs3proc.c~CITI_NFS4_ALL	2004-02-19 16:47:03.000000000 -0500
++++ linux-2.6.3-bfields/fs/nfs/nfs3proc.c	2004-02-19 16:47:07.000000000 -0500
+@@ -68,20 +68,6 @@ nfs3_async_handle_jukebox(struct rpc_tas
+ 	return 1;
+ }
+ 
+-static void
+-nfs3_write_refresh_inode(struct inode *inode, struct nfs_fattr *fattr)
+-{
+-	if (fattr->valid & NFS_ATTR_FATTR) {
+-		if (!(fattr->valid & NFS_ATTR_WCC)) {
+-			fattr->pre_size  = NFS_CACHE_ISIZE(inode);
+-			fattr->pre_mtime = NFS_CACHE_MTIME(inode);
+-			fattr->pre_ctime = NFS_CACHE_CTIME(inode);
+-			fattr->valid |= NFS_ATTR_WCC;
+-		}
+-		nfs_refresh_inode(inode, fattr);
+-	}
+-}
+-
+ static struct rpc_cred *
+ nfs_cred(struct inode *inode, struct file *filp)
+ {
+@@ -99,14 +85,18 @@ nfs_cred(struct inode *inode, struct fil
+  */
+ static int
+ nfs3_proc_get_root(struct nfs_server *server, struct nfs_fh *fhandle,
+-		   struct nfs_fattr *fattr)
++		   struct nfs_fsinfo *info)
+ {
+ 	int	status;
+ 
+-	dprintk("NFS call  getroot\n");
+-	fattr->valid = 0;
+-	status = rpc_call(server->client, NFS3PROC_GETATTR, fhandle, fattr, 0);
+-	dprintk("NFS reply getroot\n");
++	dprintk("%s: call  fsinfo\n", __FUNCTION__);
++	info->fattr->valid = 0;
++	status = rpc_call(server->client_sys, NFS3PROC_FSINFO, fhandle, info, 0);
++	dprintk("%s: reply fsinfo %d\n", __FUNCTION__, status);
++	if (!(info->fattr->valid & NFS_ATTR_FATTR)) {
++		status = rpc_call(server->client_sys, NFS3PROC_GETATTR, fhandle, info->fattr, 0);
++		dprintk("%s: reply getattr %d\n", __FUNCTION__, status);
++	}
+ 	return status;
+ }
+ 
+@@ -280,7 +270,7 @@ nfs3_proc_write(struct nfs_write_data *w
+ 	msg.rpc_cred = nfs_cred(inode, filp);
+ 	status = rpc_call_sync(NFS_CLIENT(inode), &msg, rpcflags);
+ 	if (status >= 0)
+-		nfs3_write_refresh_inode(inode, fattr);
++		nfs_refresh_inode(inode, fattr);
+ 	dprintk("NFS reply write: %d\n", status);
+ 	return status < 0? status : wdata->res.count;
+ }
+@@ -303,7 +293,7 @@ nfs3_proc_commit(struct nfs_write_data *
+ 	msg.rpc_cred = nfs_cred(inode, filp);
+ 	status = rpc_call_sync(NFS_CLIENT(inode), &msg, 0);
+ 	if (status >= 0)
+-		nfs3_write_refresh_inode(inode, fattr);
++		nfs_refresh_inode(inode, fattr);
+ 	dprintk("NFS reply commit: %d\n", status);
+ 	return status;
+ }
+@@ -777,12 +767,13 @@ nfs3_proc_read_setup(struct nfs_read_dat
+ static void
+ nfs3_write_done(struct rpc_task *task)
+ {
+-	struct nfs_write_data *data = (struct nfs_write_data *) task->tk_calldata;
++	struct nfs_write_data *data;
+ 
+ 	if (nfs3_async_handle_jukebox(task))
+ 		return;
++	data = (struct nfs_write_data *)task->tk_calldata;
+ 	if (task->tk_status >= 0)
+-		nfs3_write_refresh_inode(data->inode, data->res.fattr);
++		nfs_refresh_inode(data->inode, data->res.fattr);
+ 	nfs_writeback_done(task);
+ }
+ 
+@@ -835,12 +826,13 @@ nfs3_proc_write_setup(struct nfs_write_d
+ static void
+ nfs3_commit_done(struct rpc_task *task)
+ {
+-	struct nfs_write_data *data = (struct nfs_write_data *) task->tk_calldata;
++	struct nfs_write_data *data;
+ 
+ 	if (nfs3_async_handle_jukebox(task))
+ 		return;
++	data = (struct nfs_write_data *)task->tk_calldata;
+ 	if (task->tk_status >= 0)
+-		nfs3_write_refresh_inode(data->inode, data->res.fattr);
++		nfs_refresh_inode(data->inode, data->res.fattr);
+ 	nfs_commit_done(task);
+ }
+ 
+@@ -907,6 +899,7 @@ struct nfs_rpc_ops	nfs_v3_clientops = {
+ 	.version	= 3,			/* protocol version */
+ 	.dentry_ops	= &nfs_dentry_operations,
+ 	.dir_inode_ops	= &nfs_dir_inode_operations,
++	.file_inode_ops	= &nfs_file_inode_operations,
+ 	.getroot	= nfs3_proc_get_root,
+ 	.getattr	= nfs3_proc_getattr,
+ 	.setattr	= nfs3_proc_setattr,
+diff -puN fs/nfs/nfs4proc.c~CITI_NFS4_ALL fs/nfs/nfs4proc.c
+--- linux-2.6.3/fs/nfs/nfs4proc.c~CITI_NFS4_ALL	2004-02-19 16:47:03.000000000 -0500
++++ linux-2.6.3-bfields/fs/nfs/nfs4proc.c	2004-02-19 16:47:15.000000000 -0500
+@@ -46,112 +46,20 @@
+ #include <linux/nfs_page.h>
+ #include <linux/smp_lock.h>
+ #include <linux/namei.h>
++#include <linux/nfs4_acl.h>
++#include <linux/nfs_idmap.h>
+ 
+ #define NFSDBG_FACILITY		NFSDBG_PROC
+ 
+ #define NFS4_POLL_RETRY_TIME	(15*HZ)
+ 
+-#define GET_OP(cp,name)		&cp->ops[cp->req_nops].u.name
+-#define OPNUM(cp)		cp->ops[cp->req_nops].opnum
+-
++static int nfs4_proc_fsinfo(struct nfs_server *, struct nfs_fh *, struct nfs_fsinfo *);
+ static int nfs4_async_handle_error(struct rpc_task *, struct nfs_server *);
+ extern u32 *nfs4_decode_dirent(u32 *p, struct nfs_entry *entry, int plus);
+ extern struct rpc_procinfo nfs4_procedures[];
+ 
+ extern nfs4_stateid zero_stateid;
+ 
+-static void
+-nfs4_setup_compound(struct nfs4_compound *cp, struct nfs4_op *ops,
+-		    struct nfs_server *server, char *tag)
+-{
+-	memset(cp, 0, sizeof(*cp));
+-	cp->ops = ops;
+-	cp->server = server;
+-}
+-
+-static void
+-nfs4_setup_access(struct nfs4_compound *cp, u32 req_access, u32 *resp_supported, u32 *resp_access)
+-{
+-	struct nfs4_access *access = GET_OP(cp, access);
+-	
+-	access->ac_req_access = req_access;
+-	access->ac_resp_supported = resp_supported;
+-	access->ac_resp_access = resp_access;
+-	
+-	OPNUM(cp) = OP_ACCESS;
+-	cp->req_nops++;
+-}
+-
+-static void
+-nfs4_setup_create_dir(struct nfs4_compound *cp, struct qstr *name,
+-		      struct iattr *sattr, struct nfs4_change_info *info)
+-{
+-	struct nfs4_create *create = GET_OP(cp, create);
+-	
+-	create->cr_ftype = NF4DIR;
+-	create->cr_namelen = name->len;
+-	create->cr_name = name->name;
+-	create->cr_attrs = sattr;
+-	create->cr_cinfo = info;
+-	
+-	OPNUM(cp) = OP_CREATE;
+-	cp->req_nops++;
+-}
+-
+-static void
+-nfs4_setup_create_symlink(struct nfs4_compound *cp, struct qstr *name,
+-			  struct qstr *linktext, struct iattr *sattr,
+-			  struct nfs4_change_info *info)
+-{
+-	struct nfs4_create *create = GET_OP(cp, create);
+-
+-	create->cr_ftype = NF4LNK;
+-	create->cr_textlen = linktext->len;
+-	create->cr_text = linktext->name;
+-	create->cr_namelen = name->len;
+-	create->cr_name = name->name;
+-	create->cr_attrs = sattr;
+-	create->cr_cinfo = info;
+-
+-	OPNUM(cp) = OP_CREATE;
+-	cp->req_nops++;
+-}
+-
+-static void
+-nfs4_setup_create_special(struct nfs4_compound *cp, struct qstr *name,
+-			    dev_t dev, struct iattr *sattr,
+-			    struct nfs4_change_info *info)
+-{
+-	int mode = sattr->ia_mode;
+-	struct nfs4_create *create = GET_OP(cp, create);
+-
+-	BUG_ON(!(sattr->ia_valid & ATTR_MODE));
+-	BUG_ON(!S_ISFIFO(mode) && !S_ISBLK(mode) && !S_ISCHR(mode) && !S_ISSOCK(mode));
+-	
+-	if (S_ISFIFO(mode))
+-		create->cr_ftype = NF4FIFO;
+-	else if (S_ISBLK(mode)) {
+-		create->cr_ftype = NF4BLK;
+-		create->cr_specdata1 = MAJOR(dev);
+-		create->cr_specdata2 = MINOR(dev);
+-	}
+-	else if (S_ISCHR(mode)) {
+-		create->cr_ftype = NF4CHR;
+-		create->cr_specdata1 = MAJOR(dev);
+-		create->cr_specdata2 = MINOR(dev);
+-	}
+-	else
+-		create->cr_ftype = NF4SOCK;
+-	
+-	create->cr_namelen = name->len;
+-	create->cr_name = name->name;
+-	create->cr_attrs = sattr;
+-	create->cr_cinfo = info;
+-
+-	OPNUM(cp) = OP_CREATE;
+-	cp->req_nops++;
+-}
+-
+ /*
+  * This is our standard bitmap for GETATTR requests.
+  */
+@@ -181,126 +89,15 @@ u32 nfs4_statfs_bitmap[2] = {
+ 	| FATTR4_WORD1_SPACE_TOTAL
+ };
+ 
+-u32 nfs4_pathconf_bitmap[2] = {
+-	FATTR4_WORD0_MAXLINK
+-	| FATTR4_WORD0_MAXNAME,
+-	0
+-};
+-
+-static inline void
+-__nfs4_setup_getattr(struct nfs4_compound *cp, u32 *bitmap,
+-		     struct nfs_fattr *fattr,
+-		     struct nfs_fsstat *fsstat,
+-		     struct nfs_pathconf *pathconf)
+-{
+-        struct nfs4_getattr *getattr = GET_OP(cp, getattr);
+-
+-        getattr->gt_bmval = bitmap;
+-        getattr->gt_attrs = fattr;
+-	getattr->gt_fsstat = fsstat;
+-	getattr->gt_pathconf = pathconf;
+-
+-        OPNUM(cp) = OP_GETATTR;
+-        cp->req_nops++;
+-}
+-
+-static void
+-nfs4_setup_getattr(struct nfs4_compound *cp,
+-		struct nfs_fattr *fattr)
+-{
+-	__nfs4_setup_getattr(cp, nfs4_fattr_bitmap, fattr,
+-			NULL, NULL);
+-}
+-
+-static void
+-nfs4_setup_statfs(struct nfs4_compound *cp,
+-		struct nfs_fsstat *fsstat)
+-{
+-	__nfs4_setup_getattr(cp, nfs4_statfs_bitmap,
+-			NULL, fsstat, NULL);
+-}
+-
+-static void
+-nfs4_setup_pathconf(struct nfs4_compound *cp,
+-		struct nfs_pathconf *pathconf)
+-{
+-	__nfs4_setup_getattr(cp, nfs4_pathconf_bitmap,
+-			NULL, NULL, pathconf);
+-}
+-
+-static void
+-nfs4_setup_getfh(struct nfs4_compound *cp, struct nfs_fh *fhandle)
+-{
+-	struct nfs4_getfh *getfh = GET_OP(cp, getfh);
+-
+-	getfh->gf_fhandle = fhandle;
+-
+-	OPNUM(cp) = OP_GETFH;
+-	cp->req_nops++;
+-}
+-
+-static void
+-nfs4_setup_link(struct nfs4_compound *cp, struct qstr *name,
+-		struct nfs4_change_info *info)
+-{
+-	struct nfs4_link *link = GET_OP(cp, link);
+-
+-	link->ln_namelen = name->len;
+-	link->ln_name = name->name;
+-	link->ln_cinfo = info;
+-
+-	OPNUM(cp) = OP_LINK;
+-	cp->req_nops++;
+-}
+-
+ static void
+-nfs4_setup_lookup(struct nfs4_compound *cp, struct qstr *q)
+-{
+-	struct nfs4_lookup *lookup = GET_OP(cp, lookup);
+-
+-	lookup->lo_name = q;
+-
+-	OPNUM(cp) = OP_LOOKUP;
+-	cp->req_nops++;
+-}
+-
+-static void
+-nfs4_setup_putfh(struct nfs4_compound *cp, struct nfs_fh *fhandle)
+-{
+-	struct nfs4_putfh *putfh = GET_OP(cp, putfh);
+-
+-	putfh->pf_fhandle = fhandle;
+-
+-	OPNUM(cp) = OP_PUTFH;
+-	cp->req_nops++;
+-}
+-
+-static void
+-nfs4_setup_putrootfh(struct nfs4_compound *cp)
+-{
+-        OPNUM(cp) = OP_PUTROOTFH;
+-        cp->req_nops++;
+-}
+-
+-static void
+-nfs4_setup_readdir(struct nfs4_compound *cp, u64 cookie, u32 *verifier,
+-		     struct page **pages, unsigned int bufsize, struct dentry *dentry)
++nfs4_setup_readdir(u64 cookie, u32 *verifier, struct dentry *dentry, struct nfs4_readdir_arg *readdir)
+ {
+ 	u32 *start, *p;
+-	struct nfs4_readdir *readdir = GET_OP(cp, readdir);
+ 
+-	BUG_ON(bufsize < 80);
+-	readdir->rd_cookie = (cookie > 2) ? cookie : 0;
+-	memcpy(&readdir->rd_req_verifier, verifier, sizeof(readdir->rd_req_verifier));
+-	readdir->rd_count = bufsize;
+-	readdir->rd_bmval[0] = FATTR4_WORD0_FILEID;
+-	readdir->rd_bmval[1] = 0;
+-	readdir->rd_pages = pages;
+-	readdir->rd_pgbase = 0;
++	BUG_ON(readdir->count < 80);
++	readdir->cookie = (cookie > 2) ? cookie : 0;
++	memcpy(&readdir->req_verifier, verifier, sizeof(readdir->req_verifier));
+ 	
+-	OPNUM(cp) = OP_READDIR;
+-	cp->req_nops++;
+-
+ 	if (cookie >= 2)
+ 		return;
+ 	
+@@ -311,7 +108,7 @@ nfs4_setup_readdir(struct nfs4_compound 
+ 	 * when talking to the server, we always send cookie 0
+ 	 * instead of 1 or 2.
+ 	 */
+-	start = p = (u32 *)kmap_atomic(*pages, KM_USER0);
++	start = p = (u32 *)kmap_atomic(*readdir->pages, KM_USER0);
+ 	
+ 	if (cookie == 0) {
+ 		*p++ = xdr_one;                                  /* next */
+@@ -337,68 +134,12 @@ nfs4_setup_readdir(struct nfs4_compound 
+ 	*p++ = htonl(8);              /* attribute buffer length */
+ 	p = xdr_encode_hyper(p, NFS_FILEID(dentry->d_parent->d_inode));
+ 
+-	readdir->rd_pgbase = (char *)p - (char *)start;
+-	readdir->rd_count -= readdir->rd_pgbase;
++	readdir->pgbase = (char *)p - (char *)start;
++	readdir->count -= readdir->pgbase;
+ 	kunmap_atomic(start, KM_USER0);
+ }
+ 
+ static void
+-nfs4_setup_readlink(struct nfs4_compound *cp, int count, struct page **pages)
+-{
+-	struct nfs4_readlink *readlink = GET_OP(cp, readlink);
+-
+-	readlink->rl_count = count;
+-	readlink->rl_pages = pages;
+-
+-	OPNUM(cp) = OP_READLINK;
+-	cp->req_nops++;
+-}
+-
+-static void
+-nfs4_setup_remove(struct nfs4_compound *cp, struct qstr *name, struct nfs4_change_info *cinfo)
+-{
+-	struct nfs4_remove *remove = GET_OP(cp, remove);
+-
+-	remove->rm_namelen = name->len;
+-	remove->rm_name = name->name;
+-	remove->rm_cinfo = cinfo;
+-
+-	OPNUM(cp) = OP_REMOVE;
+-	cp->req_nops++;
+-}
+-
+-static void
+-nfs4_setup_rename(struct nfs4_compound *cp, struct qstr *old, struct qstr *new,
+-		  struct nfs4_change_info *old_cinfo, struct nfs4_change_info *new_cinfo)
+-{
+-	struct nfs4_rename *rename = GET_OP(cp, rename);
+-
+-	rename->rn_oldnamelen = old->len;
+-	rename->rn_oldname = old->name;
+-	rename->rn_newnamelen = new->len;
+-	rename->rn_newname = new->name;
+-	rename->rn_src_cinfo = old_cinfo;
+-	rename->rn_dst_cinfo = new_cinfo;
+-
+-	OPNUM(cp) = OP_RENAME;
+-	cp->req_nops++;
+-}
+-
+-static void
+-nfs4_setup_restorefh(struct nfs4_compound *cp)
+-{
+-        OPNUM(cp) = OP_RESTOREFH;
+-        cp->req_nops++;
+-}
+-
+-static void
+-nfs4_setup_savefh(struct nfs4_compound *cp)
+-{
+-        OPNUM(cp) = OP_SAVEFH;
+-        cp->req_nops++;
+-}
+-
+-static void
+ renew_lease(struct nfs_server *server, unsigned long timestamp)
+ {
+ 	struct nfs4_client *clp = server->nfs4_state;
+@@ -409,47 +150,6 @@ renew_lease(struct nfs_server *server, u
+ }
+ 
+ static inline void
+-process_lease(struct nfs4_compound *cp)
+-{
+-        /*
+-         * Generic lease processing: If this operation contains a
+-	 * lease-renewing operation, and it succeeded, update the RENEW time
+-	 * in the superblock.  Instead of the current time, we use the time
+-	 * when the request was sent out.  (All we know is that the lease was
+-	 * renewed sometime between then and now, and we have to assume the
+-	 * worst case.)
+-	 *
+-	 * Notes:
+-	 *   (1) renewd doesn't acquire the spinlock when messing with
+-	 *     server->last_renewal; this is OK since rpciod always runs
+-	 *     under the BKL.
+-	 *   (2) cp->timestamp was set at the end of XDR encode.
+-         */
+-	if (!cp->renew_index)
+-		return;
+-	if (!cp->toplevel_status || cp->resp_nops > cp->renew_index)
+-		renew_lease(cp->server, cp->timestamp);
+-}
+-
+-static int
+-nfs4_call_compound(struct nfs4_compound *cp, struct rpc_cred *cred, int flags)
+-{
+-	int status;
+-	struct rpc_message msg = {
+-		.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_COMPOUND],
+-		.rpc_argp = cp,
+-		.rpc_resp = cp,
+-		.rpc_cred = cred,
+-	};
+-
+-	status = rpc_call_sync(cp->server->client, &msg, flags);
+-	if (!status)
+-		process_lease(cp);
+-	
+-	return status;
+-}
+-
+-static inline void
+ process_cinfo(struct nfs4_change_info *info, struct nfs_fattr *fattr)
+ {
+ 	BUG_ON((fattr->valid & NFS_ATTR_FATTR) == 0);
+@@ -476,11 +176,6 @@ nfs4_open_reclaim(struct nfs4_state_owne
+ 		.valid = 0,
+ 	};
+ 	struct nfs4_change_info d_cinfo;
+-	struct nfs4_getattr     f_getattr = {
+-		.gt_bmval       = nfs4_fattr_bitmap,
+-		.gt_attrs       = &fattr,
+-	};
+-
+ 	struct nfs_open_reclaimargs o_arg = {
+ 		.fh = NFS_FH(inode),
+ 		.seqid = sp->so_seqid,
+@@ -488,11 +183,10 @@ nfs4_open_reclaim(struct nfs4_state_owne
+ 		.share_access = state->state,
+ 		.clientid = server->nfs4_state->cl_clientid,
+ 		.claim = NFS4_OPEN_CLAIM_PREVIOUS,
+-		.f_getattr = &f_getattr,
+ 	};
+ 	struct nfs_openres o_res = {
+-		.cinfo = &d_cinfo,
+-		.f_getattr = &f_getattr,
++		.cinfo  = &d_cinfo,
++		.f_attr = &fattr,
+ 		.server = server,	/* Grrr */
+ 	};
+ 	struct rpc_message msg = {
+@@ -528,28 +222,18 @@ nfs4_do_open(struct inode *dir, struct q
+ 	struct nfs_fattr        f_attr = {
+ 		.valid          = 0,
+ 	};
+-	struct nfs4_getattr     f_getattr = {
+-		.gt_bmval       = nfs4_fattr_bitmap,
+-		.gt_attrs       = &f_attr,
+-	};
+-	struct nfs4_getattr     d_getattr = {
+-		.gt_bmval       = nfs4_fattr_bitmap,
+-		.gt_attrs       = &d_attr,
+-	};
+ 	struct nfs_openargs o_arg = {
+ 		.fh             = NFS_FH(dir),
+ 		.share_access   = flags & (FMODE_READ|FMODE_WRITE),
+ 		.opentype       = (flags & O_CREAT) ? NFS4_OPEN_CREATE : NFS4_OPEN_NOCREATE,
+ 		.createmode     = (flags & O_EXCL) ? NFS4_CREATE_EXCLUSIVE : NFS4_CREATE_UNCHECKED,
+ 		.name           = name,
+-		.f_getattr      = &f_getattr,
+-		.d_getattr      = &d_getattr,
+ 		.server         = server,
+ 	};
+ 	struct nfs_openres o_res = {
+ 		.cinfo          = &d_cinfo,
+-		.f_getattr      = &f_getattr,
+-		.d_getattr      = &d_getattr,
++		.f_attr         = &f_attr,
++		.d_attr         = &d_attr,
+ 		.server         = server,
+ 	};
+ 	struct rpc_message msg = {
+@@ -665,18 +349,14 @@ nfs4_do_setattr(struct nfs_server *serve
+                 struct nfs_fh *fhandle, struct iattr *sattr,
+                 struct nfs4_state *state)
+ {
+-        struct nfs4_getattr     getattr = {
+-                .gt_bmval       = nfs4_fattr_bitmap,
+-                .gt_attrs       = fattr,
+-        };
+         struct nfs_setattrargs  arg = {
+                 .fh             = fhandle,
+                 .iap            = sattr,
+-                .attr           = &getattr,
++                .fattr          = fattr,
+ 		.server		= server,
+         };
+         struct nfs_setattrres  res = {
+-                .attr           = &getattr,
++                .fattr          = fattr,
+ 		.server		= server,
+         };
+         struct rpc_message msg = {
+@@ -822,27 +502,43 @@ nfs4_open_revalidate(struct inode *dir, 
+ 
+ static int
+ nfs4_proc_get_root(struct nfs_server *server, struct nfs_fh *fhandle,
+-		   struct nfs_fattr *fattr)
++		   struct nfs_fsinfo *info)
+ {
+-	struct nfs4_compound	compound;
+-	struct nfs4_op		ops[4];
++	struct nfs_fattr *	fattr = info->fattr;
+ 	unsigned char *		p;
+ 	struct qstr		q;
+ 	int			status;
++	struct nfs4_getroot_arg args = {
++		.fhandle = fhandle,
++		.name = &q,
++	};
++	struct nfs4_getroot_res res = {
++		.server = server,
++		.fattr = fattr,
++		.fhandle = fhandle,
++	};
++	struct rpc_message msg_head = {
++		.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_GETROOT_HEAD],
++		.rpc_argp = NULL,
++		.rpc_resp = &res,
++	};
++	struct rpc_message msg_path = {
++		.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_GETROOT_PATH],
++		.rpc_argp = &args,
++		.rpc_resp = &res,
++	};
+ 
+ 	/*
+ 	 * Now we do a separate LOOKUP for each component of the mount path.
+ 	 * The LOOKUPs are done separately so that we can conveniently
+ 	 * catch an ERR_WRONGSEC if it occurs along the way...
+ 	 */
+-	p = server->mnt_path;
+ 	fattr->valid = 0;
+-	nfs4_setup_compound(&compound, ops, server, "getrootfh");
+-	nfs4_setup_putrootfh(&compound);
+-	nfs4_setup_getattr(&compound, fattr);
+-	nfs4_setup_getfh(&compound, fhandle);
+-	if ((status = nfs4_call_compound(&compound, NULL, 0)))
++	status = rpc_call_sync(server->client, &msg_head, 0);
++	if (status)
+ 		goto out;
++
++	p = server->mnt_path;
+ 	for (;;) {
+ 		while (*p == '/')
+ 			p++;
+@@ -854,12 +550,7 @@ nfs4_proc_get_root(struct nfs_server *se
+ 		q.len = p - q.name;
+ 
+ 		fattr->valid = 0;
+-		nfs4_setup_compound(&compound, ops, server, "mount");
+-		nfs4_setup_putfh(&compound, fhandle);
+-		nfs4_setup_lookup(&compound, &q);
+-		nfs4_setup_getattr(&compound, fattr);
+-		nfs4_setup_getfh(&compound, fhandle);
+-		status = nfs4_call_compound(&compound, NULL, 0);
++		status = rpc_call_sync(server->client,&msg_path,0);
+ 		if (!status)
+ 			continue;
+ 		if (status == -ENOENT) {
+@@ -869,21 +560,27 @@ nfs4_proc_get_root(struct nfs_server *se
+ 		break;
+ 	}
+ out:
+-	return status;
++	if (status)
++		return status;
++	return nfs4_proc_fsinfo(server, fhandle, info);
+ }
+ 
+ static int
+ nfs4_proc_getattr(struct inode *inode, struct nfs_fattr *fattr)
+ {
+-	struct nfs4_compound compound;
+-	struct nfs4_op ops[2];
+-
++	struct nfs4_getattr_res res = {
++		.fattr = fattr,
++		.server = NFS_SERVER(inode),
++	};
++	struct rpc_message msg = {
++		.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_GETATTR],
++		.rpc_argp = NFS_FH(inode),
++		.rpc_resp = &res,
++	};
++	
+ 	fattr->valid = 0;
+ 
+-	nfs4_setup_compound(&compound, ops, NFS_SERVER(inode), "getattr");
+-	nfs4_setup_putfh(&compound, NFS_FH(inode));
+-	nfs4_setup_getattr(&compound, fattr);
+-	return nfs4_call_compound(&compound, NULL, 0);
++	return rpc_call_sync(NFS_CLIENT(inode), &msg, 0);
+ }
+ 
+ /* 
+@@ -945,26 +642,218 @@ out:
+ 	return status;
+ }
+ 
++#ifdef CONFIG_NFS_V4_ACL
++
++static inline int
++nfs_name_to_uid_wrapper(void *arg, const char *name, size_t len, __u32 *id)
++{
++	return nfs_map_name_to_uid((struct nfs4_client *)arg, name, len, id);
++}
++
++static inline int
++nfs_name_to_gid_wrapper(void *arg, const char *name, size_t len, __u32 *id)
++{
++	return nfs_map_group_to_gid((struct nfs4_client*)arg, name, len, id);
++}
++
++static inline int
++nfs_uid_to_name_wrapper(void *arg, __u32 id, char *name)
++{
++	return nfs_map_uid_to_name((struct nfs4_client *)arg, id, name);
++}
++
++static inline int
++nfs_gid_to_name_wrapper(void *arg, __u32 id, char *name)
++{
++	return nfs_map_gid_to_group((struct nfs4_client *)arg, id, name);
++}
++
++static struct nfs4_acl_idmapper nfs4_idmapper = {
++	.name2uid = nfs_name_to_uid_wrapper,
++	.name2gid = nfs_name_to_gid_wrapper,
++	.uid2name = nfs_uid_to_name_wrapper,
++	.gid2name = nfs_gid_to_name_wrapper,
++};
++
++/* From fs/ext2/acl.c: */
++
++static inline struct posix_acl *
++nfs4_iget_acl(struct inode *inode, struct posix_acl **i_acl)
++{
++	struct posix_acl *acl = NFS4_ACL_NOT_CACHED;
++
++	spin_lock(&inode->i_lock);
++	if (*i_acl != NFS4_ACL_NOT_CACHED)
++		acl = posix_acl_dup(*i_acl);
++	spin_unlock(&inode->i_lock);
++	return acl;
++}
++
++void
++nfs4_iset_acl(struct inode *inode, struct posix_acl **i_acl,
++		struct posix_acl *acl)
++{
++	spin_lock(&inode->i_lock);
++	if (*i_acl != NFS4_ACL_NOT_CACHED)
++		posix_acl_release(*i_acl);
++	*i_acl = posix_acl_dup(acl);
++	spin_unlock(&inode->i_lock);
++}
++
++void
++nfs4_izap_acl(struct inode *inode, struct posix_acl **i_acl)
++{
++	spin_lock(&inode->i_lock);
++	if (*i_acl != NFS4_ACL_NOT_CACHED)
++		posix_acl_release(*i_acl);
++	*i_acl = NFS4_ACL_NOT_CACHED;
++	spin_unlock(&inode->i_lock);
++}
++
++struct posix_acl *
++nfs4_proc_get_posix_acl(struct inode *inode, int type)
++{
++	struct nfs4_acl *acl = NULL;
++	int error;
++	struct posix_acl *pacl, *dpacl, *ret = NULL;
++	struct rpc_message msg = {
++		.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_GETACL],
++		.rpc_argp = NFS_FH(inode),
++		.rpc_resp = &acl,
++	};
++
++	lock_kernel();
++	error = nfs_revalidate_inode(NFS_SERVER(inode), inode);
++	if (error < 0) {
++		unlock_kernel();
++		return ERR_PTR(error);
++	}
++	if (type == ACL_TYPE_ACCESS)
++		ret = nfs4_iget_acl(inode, &NFS_I(inode)->acl);
++	else
++		ret = nfs4_iget_acl(inode, &NFS_I(inode)->default_acl);
++
++	if (ret != NFS4_ACL_NOT_CACHED) {
++		if (ret == NULL)
++			ret = ERR_PTR(-ENODATA);
++		unlock_kernel();
++		return ret;
++	}
++
++	error = rpc_call_sync(NFS_CLIENT(inode), &msg, 0);
++	unlock_kernel();
++
++	if (error < 0)
++		goto out_free;
++
++	error = -ENODATA;
++	if (acl == NULL)
++		goto out_free;
++
++	error = nfs4_acl_nfsv4_to_posix(&nfs4_idmapper, NFS_SERVER(inode)->nfs4_state, acl, &pacl, &dpacl);
++	if (error < 0)
++		goto out_free;
++
++	error = -ERANGE;
++	if (pacl && pacl->a_count > NFS_ACL_MAX_ENTRIES)
++		goto out_free;
++	if (dpacl && dpacl->a_count > NFS_ACL_MAX_ENTRIES)
++		goto out_free;
++
++	nfs4_iset_acl(inode, &NFS_I(inode)->acl, pacl);
++	nfs4_iset_acl(inode, &NFS_I(inode)->default_acl, dpacl);
++
++	ret = (type == ACL_TYPE_ACCESS) ? pacl : dpacl;
++	error = -ENODATA;
++	if (ret == NULL)
++		goto out_free;
++	error = 0;
++out_free:
++	if (error < 0)
++		ret = ERR_PTR(error);
++	nfs4_acl_free(acl);
++	return ret;
++}
++
++int
++nfs4_proc_set_posix_acl(struct inode *inode, int type, struct posix_acl *pacl)
++{
++	struct iattr ia;
++	struct nfs4_acl *acl;
++	struct nfs_fattr fattr;
++	int error;
++	struct nfs_setaclargs arg = {
++		.fh		= NFS_FH(inode),
++	};
++	struct rpc_message msg = {
++		.rpc_proc	= &nfs4_procedures[NFSPROC4_CLNT_SETACL],
++		.rpc_argp	= &arg,
++		.rpc_resp	= NULL,
++	};
++
++	ia.ia_valid = 0;
++        fattr.valid = 0;
++
++	if (pacl && pacl->a_count > NFS_ACL_MAX_ENTRIES)
++		return -ERANGE;
++
++	if (type == ACL_TYPE_ACCESS)
++		acl = nfs4_acl_posix_to_nfsv4(&nfs4_idmapper, NFS_SERVER(inode)->nfs4_state, pacl, NULL);
++	else
++		acl = nfs4_acl_posix_to_nfsv4(&nfs4_idmapper, NFS_SERVER(inode)->nfs4_state, NULL, pacl);
++	if (IS_ERR(acl))
++		return PTR_ERR(acl);
++	arg.acl = acl;
++
++	lock_kernel();
++	error = rpc_call_sync(NFS_SERVER(inode)->client, &msg, 0);
++	unlock_kernel();
++
++	nfs4_acl_free(acl);
++
++	if (error)
++		return error;
++
++	if (type == ACL_TYPE_ACCESS)
++		nfs4_iset_acl(inode, &NFS_I(inode)->acl, pacl);
++	else
++		nfs4_iset_acl(inode, &NFS_I(inode)->default_acl, pacl);
++
++	if (type == ACL_TYPE_ACCESS)
++		posix_acl_equiv_mode(pacl, &inode->i_mode);
++
++	return error;
++}
++
++#endif /* CONFIG_NFS_V4_ACL */
++
+ static int
+ nfs4_proc_lookup(struct inode *dir, struct qstr *name,
+ 		 struct nfs_fh *fhandle, struct nfs_fattr *fattr)
+ {
+-	struct nfs4_compound	compound;
+-	struct nfs4_op		ops[5];
+-	struct nfs_fattr	dir_attr;
+-	int			status;
+-
++	struct nfs_fattr       dir_attr;
++	int		       status;
++	struct nfs4_lookupargs args = {
++		.dir_fh   = NFS_FH(dir),
++		.name     = name,
++	};
++	struct nfs4_lookupres  res = {
++		.server   = NFS_SERVER(dir),
++		.dirattr  = &dir_attr,
++		.fattr    = fattr,
++		.fhandle  = fhandle,
++	};
++	struct rpc_message     msg = {
++		.rpc_proc  = &nfs4_procedures[NFSPROC4_CLNT_LOOKUP],
++		.rpc_argp  = &args,
++		.rpc_resp  = &res,
++	};
++	
+ 	dir_attr.valid = 0;
+ 	fattr->valid = 0;
+ 	
+ 	dprintk("NFS call  lookup %s\n", name->name);
+-	nfs4_setup_compound(&compound, ops, NFS_SERVER(dir), "lookup");
+-	nfs4_setup_putfh(&compound, NFS_FH(dir));
+-	nfs4_setup_getattr(&compound, &dir_attr);
+-	nfs4_setup_lookup(&compound, name);
+-	nfs4_setup_getattr(&compound, fattr);
+-	nfs4_setup_getfh(&compound, fhandle);
+-	status = nfs4_call_compound(&compound, NULL, 0);
++	status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0);
+ 	dprintk("NFS reply lookup: %d\n", status);
+ 
+ 	if (status >= 0)
+@@ -975,11 +864,24 @@ nfs4_proc_lookup(struct inode *dir, stru
+ static int
+ nfs4_proc_access(struct inode *inode, struct rpc_cred *cred, int mode)
+ {
+-	struct nfs4_compound	compound;
+-	struct nfs4_op		ops[3];
+ 	struct nfs_fattr	fattr;
+ 	u32			req_access = 0, resp_supported, resp_access;
+ 	int			status;
++	struct nfs4_accessargs args = {
++		.fhandle        = NFS_FH(inode),
++	};
++	struct nfs4_accessres res = {
++		.server         = NFS_SERVER(inode),
++		.fattr          = &fattr,
++		.resp_supported  = &resp_supported,
++		.resp_access    = &resp_access,
++	};
++	struct rpc_message msg = {
++		.rpc_proc       = &nfs4_procedures[NFSPROC4_CLNT_ACCESS],
++		.rpc_argp       = &args,
++		.rpc_resp       = &res,
++		.rpc_cred       = cred,
++	};
+ 
+ 	fattr.valid = 0;
+ 
+@@ -1000,12 +902,9 @@ nfs4_proc_access(struct inode *inode, st
+ 		if (mode & MAY_EXEC)
+ 			req_access |= NFS4_ACCESS_EXECUTE;
+ 	}
++	res.req_access = args.req_access = req_access;
+ 
+-	nfs4_setup_compound(&compound, ops, NFS_SERVER(inode), "access");
+-	nfs4_setup_putfh(&compound, NFS_FH(inode));
+-	nfs4_setup_getattr(&compound, &fattr);
+-	nfs4_setup_access(&compound, req_access, &resp_supported, &resp_access);
+-	status = nfs4_call_compound(&compound, cred, 0);
++	status = rpc_call_sync(NFS_CLIENT(inode), &msg, 0);
+ 	nfs_refresh_inode(inode, &fattr);
+ 
+ 	if (!status) {
+@@ -1046,13 +945,18 @@ nfs4_proc_access(struct inode *inode, st
+ static int
+ nfs4_proc_readlink(struct inode *inode, struct page *page)
+ {
+-	struct nfs4_compound	compound;
+-	struct nfs4_op		ops[2];
++	struct nfs4_readlink args = {
++		.fh       = NFS_FH(inode),
++		.count    = PAGE_CACHE_SIZE,
++		.pages    = &page,
++	};
++	struct rpc_message msg = {
++		.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_READLINK],
++		.rpc_argp = &args,
++		.rpc_resp = NULL,
++	};
+ 
+-	nfs4_setup_compound(&compound, ops, NFS_SERVER(inode), "readlink");
+-	nfs4_setup_putfh(&compound, NFS_FH(inode));
+-	nfs4_setup_readlink(&compound, PAGE_CACHE_SIZE, &page);
+-	return nfs4_call_compound(&compound, NULL, 0);
++	return rpc_call_sync(NFS_CLIENT(inode), &msg, 0);
+ }
+ 
+ static int
+@@ -1088,12 +992,8 @@ nfs4_proc_read(struct nfs_read_data *rda
+ 
+ 	fattr->valid = 0;
+ 	status = rpc_call_sync(server->client, &msg, flags);
+-	if (!status) {
++	if (!status)
+ 		renew_lease(server, timestamp);
+-		/* Check cache consistency */
+-		if (fattr->change_attr != NFS_CHANGE_ATTR(inode))
+-			nfs_zap_caches(inode);
+-	}
+ 	dprintk("NFS reply read: %d\n", status);
+ 	return status;
+ }
+@@ -1130,7 +1030,6 @@ nfs4_proc_write(struct nfs_write_data *w
+ 
+ 	fattr->valid = 0;
+ 	status = rpc_call_sync(server->client, &msg, rpcflags);
+-	NFS_CACHEINV(inode);
+ 	dprintk("NFS reply write: %d\n", status);
+ 	return status;
+ }
+@@ -1217,18 +1116,26 @@ nfs4_proc_create(struct inode *dir, stru
+ static int
+ nfs4_proc_remove(struct inode *dir, struct qstr *name)
+ {
+-	struct nfs4_compound	compound;
+-	struct nfs4_op		ops[3];
+ 	struct nfs4_change_info	dir_cinfo;
+ 	struct nfs_fattr	dir_attr;
+ 	int			status;
++	struct nfs4_remove_arg args = {
++		.fhandle = NFS_FH(dir),
++		.name = name,
++	};
++	struct nfs4_remove_res res = {
++		.server = NFS_SERVER(dir),
++		.dir_cinfo = &dir_cinfo,
++		.dir_attr = &dir_attr,
++	};
++	struct rpc_message msg = {
++		.rpc_proc	= &nfs4_procedures[NFSPROC4_CLNT_REMOVE],
++		.rpc_argp	= &args,
++		.rpc_resp	= &res,
++	};
+ 
+ 	dir_attr.valid = 0;
+-	nfs4_setup_compound(&compound, ops, NFS_SERVER(dir), "remove");
+-	nfs4_setup_putfh(&compound, NFS_FH(dir));
+-	nfs4_setup_remove(&compound, name, &dir_cinfo);
+-	nfs4_setup_getattr(&compound, &dir_attr);
+-	status = nfs4_call_compound(&compound, NULL, 0);
++	status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0);
+ 
+ 	if (!status) {
+ 		process_cinfo(&dir_cinfo, &dir_attr);
+@@ -1237,32 +1144,22 @@ nfs4_proc_remove(struct inode *dir, stru
+ 	return status;
+ }
+ 
+-struct unlink_desc {
+-	struct nfs4_compound	compound;
+-	struct nfs4_op		ops[3];
+-	struct nfs4_change_info	cinfo;
+-	struct nfs_fattr	attrs;
+-};
+-
+ static int
+ nfs4_proc_unlink_setup(struct rpc_message *msg, struct dentry *dir, struct qstr *name)
+ {
+-	struct unlink_desc *	up;
+-	struct nfs4_compound *	cp;
++	struct nfs4_unlink *up;
+ 
+-	up = (struct unlink_desc *) kmalloc(sizeof(*up), GFP_KERNEL);
++	up = (struct nfs4_unlink *) kmalloc(sizeof(*up), GFP_KERNEL);
+ 	if (!up)
+ 		return -ENOMEM;
+-	cp = &up->compound;
+ 	
+-	nfs4_setup_compound(cp, up->ops, NFS_SERVER(dir->d_inode), "unlink_setup");
+-	nfs4_setup_putfh(cp, NFS_FH(dir->d_inode));
+-	nfs4_setup_remove(cp, name, &up->cinfo);
+-	nfs4_setup_getattr(cp, &up->attrs);
+-	
+-	msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_COMPOUND];
+-	msg->rpc_argp = cp;
+-	msg->rpc_resp = cp;
++	up->server = NFS_SERVER(dir->d_inode);
++	up->fh     = NFS_FH(dir->d_inode);
++	up->name   = name;
++	
++	msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_UNLINK];
++	msg->rpc_argp = up;
++	msg->rpc_resp = up;
+ 	return 0;
+ }
+ 
+@@ -1270,11 +1167,10 @@ static int
+ nfs4_proc_unlink_done(struct dentry *dir, struct rpc_task *task)
+ {
+ 	struct rpc_message *msg = &task->tk_msg;
+-	struct unlink_desc *up;
++	struct nfs4_unlink *up;
+ 	
+ 	if (msg->rpc_argp) {
+-		up = (struct unlink_desc *) msg->rpc_argp;
+-		process_lease(&up->compound);
++		up = (struct nfs4_unlink *) msg->rpc_argp;
+ 		process_cinfo(&up->cinfo, &up->attrs);
+ 		nfs_refresh_inode(dir->d_inode, &up->attrs);
+ 		kfree(up);
+@@ -1287,24 +1183,32 @@ static int
+ nfs4_proc_rename(struct inode *old_dir, struct qstr *old_name,
+ 		 struct inode *new_dir, struct qstr *new_name)
+ {
+-	struct nfs4_compound	compound;
+-	struct nfs4_op		ops[7];
+ 	struct nfs4_change_info	old_cinfo, new_cinfo;
+ 	struct nfs_fattr	old_dir_attr, new_dir_attr;
+ 	int			status;
+-
++	struct nfs4_rename_arg arg = {
++		.old_dir = NFS_FH(old_dir),
++		.new_dir = NFS_FH(new_dir),
++		.old_name = old_name,
++		.new_name = new_name,
++	};
++	struct nfs4_rename_res res = {
++		.server = NFS_SERVER(old_dir),
++		.old_cinfo = &old_cinfo,
++		.new_cinfo = &new_cinfo,
++		.old_fattr = &old_dir_attr,
++		.new_fattr = &new_dir_attr,
++	};
++        struct rpc_message msg = {
++                .rpc_proc       = &nfs4_procedures[NFSPROC4_CLNT_RENAME],
++                .rpc_argp       = &arg,
++                .rpc_resp       = &res,
++        };
++	
+ 	old_dir_attr.valid = 0;
+ 	new_dir_attr.valid = 0;
+ 	
+-	nfs4_setup_compound(&compound, ops, NFS_SERVER(old_dir), "rename");
+-	nfs4_setup_putfh(&compound, NFS_FH(old_dir));
+-	nfs4_setup_savefh(&compound);
+-	nfs4_setup_putfh(&compound, NFS_FH(new_dir));
+-	nfs4_setup_rename(&compound, old_name, new_name, &old_cinfo, &new_cinfo);
+-	nfs4_setup_getattr(&compound, &new_dir_attr);
+-	nfs4_setup_restorefh(&compound);
+-	nfs4_setup_getattr(&compound, &old_dir_attr);
+-	status = nfs4_call_compound(&compound, NULL, 0);
++	status = rpc_call_sync(NFS_CLIENT(old_dir), &msg, 0);
+ 
+ 	if (!status) {
+ 		process_cinfo(&old_cinfo, &old_dir_attr);
+@@ -1318,24 +1222,30 @@ nfs4_proc_rename(struct inode *old_dir, 
+ static int
+ nfs4_proc_link(struct inode *inode, struct inode *dir, struct qstr *name)
+ {
+-	struct nfs4_compound	compound;
+-	struct nfs4_op		ops[7];
+ 	struct nfs4_change_info	dir_cinfo;
+ 	struct nfs_fattr	dir_attr, fattr;
+ 	int			status;
+-	
++	struct nfs4_link_arg arg = {
++		.fh     = NFS_FH(inode),
++		.dir_fh = NFS_FH(dir),
++		.name   = name,
++	};
++	struct nfs4_link_res res = {
++		.server    = NFS_SERVER(inode),
++		.fattr     = &fattr,
++		.dir_attr  = &dir_attr,
++		.dir_cinfo = &dir_cinfo,
++	};
++        struct rpc_message msg = {
++                .rpc_proc       = &nfs4_procedures[NFSPROC4_CLNT_LINK],
++                .rpc_argp       = &arg,
++                .rpc_resp       = &res,
++        };
++
+ 	dir_attr.valid = 0;
+ 	fattr.valid = 0;
+ 	
+-	nfs4_setup_compound(&compound, ops, NFS_SERVER(inode), "link");
+-	nfs4_setup_putfh(&compound, NFS_FH(inode));
+-	nfs4_setup_savefh(&compound);
+-	nfs4_setup_putfh(&compound, NFS_FH(dir));
+-	nfs4_setup_link(&compound, name, &dir_cinfo);
+-	nfs4_setup_getattr(&compound, &dir_attr);
+-	nfs4_setup_restorefh(&compound);
+-	nfs4_setup_getattr(&compound, &fattr);
+-	status = nfs4_call_compound(&compound, NULL, 0);
++	status = rpc_call_sync(NFS_CLIENT(inode), &msg, 0);
+ 
+ 	if (!status) {
+ 		process_cinfo(&dir_cinfo, &dir_attr);
+@@ -1350,24 +1260,34 @@ nfs4_proc_symlink(struct inode *dir, str
+ 		  struct iattr *sattr, struct nfs_fh *fhandle,
+ 		  struct nfs_fattr *fattr)
+ {
+-	struct nfs4_compound	compound;
+-	struct nfs4_op		ops[7];
+ 	struct nfs_fattr	dir_attr;
+ 	struct nfs4_change_info	dir_cinfo;
+ 	int			status;
++	struct nfs4_create_arg arg = {
++		.dir_fh = NFS_FH(dir),
++		.server = NFS_SERVER(dir),
++		.name = name,
++		.u.symlink = path,
++		.attrs = sattr,
++		.ftype = NF4LNK,
++	};
++	struct nfs4_create_res res = {
++		.server = NFS_SERVER(dir),
++		.fhandle = fhandle,
++		.fattr = fattr,
++		.dir_attr = &dir_attr,
++		.dir_cinfo = &dir_cinfo,
++	};
++        struct rpc_message msg = {
++                .rpc_proc       = &nfs4_procedures[NFSPROC4_CLNT_CREATE],
++                .rpc_argp       = &arg,
++                .rpc_resp       = &res,
++        };
+ 
+ 	dir_attr.valid = 0;
+ 	fattr->valid = 0;
+ 	
+-	nfs4_setup_compound(&compound, ops, NFS_SERVER(dir), "symlink");
+-	nfs4_setup_putfh(&compound, NFS_FH(dir));
+-	nfs4_setup_savefh(&compound);
+-	nfs4_setup_create_symlink(&compound, name, path, sattr, &dir_cinfo);
+-	nfs4_setup_getattr(&compound, fattr);
+-	nfs4_setup_getfh(&compound, fhandle);
+-	nfs4_setup_restorefh(&compound);
+-	nfs4_setup_getattr(&compound, &dir_attr);
+-	status = nfs4_call_compound(&compound, NULL, 0);
++	status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0);
+ 
+ 	if (!status) {
+ 		process_cinfo(&dir_cinfo, &dir_attr);
+@@ -1380,24 +1300,33 @@ static int
+ nfs4_proc_mkdir(struct inode *dir, struct qstr *name, struct iattr *sattr,
+ 		struct nfs_fh *fhandle, struct nfs_fattr *fattr)
+ {
+-	struct nfs4_compound	compound;
+-	struct nfs4_op		ops[7];
+ 	struct nfs_fattr	dir_attr;
+ 	struct nfs4_change_info	dir_cinfo;
+ 	int			status;
++	struct nfs4_create_arg arg = {
++		.dir_fh = NFS_FH(dir),
++		.server = NFS_SERVER(dir),
++		.name = name,
++		.attrs = sattr,
++		.ftype = NF4DIR,
++	};
++	struct nfs4_create_res res = {
++		.server = NFS_SERVER(dir),
++		.fhandle = fhandle,
++		.fattr = fattr,
++		.dir_attr = &dir_attr,
++		.dir_cinfo = &dir_cinfo,
++	};
++        struct rpc_message msg = {
++                .rpc_proc       = &nfs4_procedures[NFSPROC4_CLNT_CREATE],
++                .rpc_argp       = &arg,
++                .rpc_resp       = &res,
++        };
+ 
+ 	dir_attr.valid = 0;
+ 	fattr->valid = 0;
+ 	
+-	nfs4_setup_compound(&compound, ops, NFS_SERVER(dir), "mkdir");
+-	nfs4_setup_putfh(&compound, NFS_FH(dir));
+-	nfs4_setup_savefh(&compound);
+-	nfs4_setup_create_dir(&compound, name, sattr, &dir_cinfo);
+-	nfs4_setup_getattr(&compound, fattr);
+-	nfs4_setup_getfh(&compound, fhandle);
+-	nfs4_setup_restorefh(&compound);
+-	nfs4_setup_getattr(&compound, &dir_attr);
+-	status = nfs4_call_compound(&compound, NULL, 0);
++	status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0);
+ 
+ 	if (!status) {
+ 		process_cinfo(&dir_cinfo, &dir_attr);
+@@ -1411,17 +1340,25 @@ nfs4_proc_readdir(struct dentry *dentry,
+                   u64 cookie, struct page *page, unsigned int count, int plus)
+ {
+ 	struct inode		*dir = dentry->d_inode;
+-	struct nfs4_compound	compound;
+-	struct nfs4_op		ops[2];
+ 	int			status;
++	struct nfs4_readdir_arg args = {
++		.fh = NFS_FH(dir),
++		.pages = &page,
++		.pgbase = 0,
++		.count = count,
++	};
++	struct nfs4_readdir_res res;
++	struct rpc_message msg = {
++		.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_READDIR],
++		.rpc_argp = &args,
++		.rpc_resp = &res,
++		.rpc_cred = cred,
++	};
+ 
+ 	lock_kernel();
+-
+-	nfs4_setup_compound(&compound, ops, NFS_SERVER(dir), "readdir");
+-	nfs4_setup_putfh(&compound, NFS_FH(dir));
+-	nfs4_setup_readdir(&compound, cookie, NFS_COOKIEVERF(dir), &page, count, dentry);
+-	status = nfs4_call_compound(&compound, cred, 0);
+-
++	nfs4_setup_readdir(cookie, NFS_COOKIEVERF(dir), dentry, &args);
++	res.pgbase = args.pgbase;
++	status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0);
+ 	unlock_kernel();
+ 	return status;
+ }
+@@ -1430,24 +1367,50 @@ static int
+ nfs4_proc_mknod(struct inode *dir, struct qstr *name, struct iattr *sattr,
+ 		dev_t rdev, struct nfs_fh *fh, struct nfs_fattr *fattr)
+ {
+-	struct nfs4_compound	compound;
+-	struct nfs4_op		ops[7];
+ 	struct nfs_fattr	dir_attr;
+ 	struct nfs4_change_info	dir_cinfo;
+ 	int			status;
++	int                     mode = sattr->ia_mode;
++	struct nfs4_create_arg arg = {
++		.dir_fh = NFS_FH(dir),
++		.server = NFS_SERVER(dir),
++		.name = name,
++		.attrs = sattr,
++	};
++	struct nfs4_create_res res = {
++		.server = NFS_SERVER(dir),
++		.fhandle = fh,
++		.fattr = fattr,
++		.dir_attr = &dir_attr,
++		.dir_cinfo = &dir_cinfo,
++	};
++        struct rpc_message msg = {
++                .rpc_proc       = &nfs4_procedures[NFSPROC4_CLNT_CREATE],
++                .rpc_argp       = &arg,
++                .rpc_resp       = &res,
++        };
+ 
+ 	dir_attr.valid = 0;
+ 	fattr->valid = 0;
++
++	BUG_ON(!(sattr->ia_valid & ATTR_MODE));
++	BUG_ON(!S_ISFIFO(mode) && !S_ISBLK(mode) && !S_ISCHR(mode) && !S_ISSOCK(mode));
++	if (S_ISFIFO(mode))
++		arg.ftype = NF4FIFO;
++	else if (S_ISBLK(mode)) {
++		arg.ftype = NF4BLK;
++		arg.u.device.specdata1 = MAJOR(rdev);
++		arg.u.device.specdata2 = MINOR(rdev);
++	}
++	else if (S_ISCHR(mode)) {
++		arg.ftype = NF4CHR;
++		arg.u.device.specdata1 = MAJOR(rdev);
++		arg.u.device.specdata2 = MINOR(rdev);
++	}
++	else
++		arg.ftype = NF4SOCK;
+ 	
+-	nfs4_setup_compound(&compound, ops, NFS_SERVER(dir), "mknod");
+-	nfs4_setup_putfh(&compound, NFS_FH(dir));
+-	nfs4_setup_savefh(&compound);
+-	nfs4_setup_create_special(&compound, name, rdev,sattr, &dir_cinfo);
+-	nfs4_setup_getattr(&compound, fattr);
+-	nfs4_setup_getfh(&compound, fh);
+-	nfs4_setup_restorefh(&compound);
+-	nfs4_setup_getattr(&compound, &dir_attr);
+-	status = nfs4_call_compound(&compound, NULL, 0);
++	status = rpc_call_sync(NFS_CLIENT(dir), &msg, 0);
+ 
+ 	if (!status) {
+ 		process_cinfo(&dir_cinfo, &dir_attr);
+@@ -1460,14 +1423,13 @@ static int
+ nfs4_proc_statfs(struct nfs_server *server, struct nfs_fh *fhandle,
+ 		 struct nfs_fsstat *fsstat)
+ {
+-	struct nfs4_compound compound;
+-	struct nfs4_op ops[2];
++	struct rpc_message msg = {
++		.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_STATFS],
++		.rpc_argp = fhandle,
++		.rpc_resp = fsstat,
++	};
+ 
+-	memset(fsstat, 0, sizeof(*fsstat));
+-	nfs4_setup_compound(&compound, ops, server, "statfs");
+-	nfs4_setup_putfh(&compound, fhandle);
+-	nfs4_setup_statfs(&compound, fsstat);
+-	return nfs4_call_compound(&compound, NULL, 0);
++	return rpc_call_sync(server->client, &msg, 0);
+ }
+ 
+ static int
+@@ -1480,7 +1442,6 @@ nfs4_proc_fsinfo(struct nfs_server *serv
+ 		.rpc_resp = fsinfo,
+ 	};
+ 
+-	memset(fsinfo, 0, sizeof(*fsinfo));
+ 	return rpc_call_sync(server->client, &msg, 0);
+ }
+ 
+@@ -1488,14 +1449,13 @@ static int
+ nfs4_proc_pathconf(struct nfs_server *server, struct nfs_fh *fhandle,
+ 		   struct nfs_pathconf *pathconf)
+ {
+-	struct nfs4_compound compound;
+-	struct nfs4_op ops[2];
++	struct rpc_message msg = {
++		.rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_PATHCONF],
++		.rpc_argp = fhandle,
++		.rpc_resp = pathconf,
++	};
+ 
+-	memset(pathconf, 0, sizeof(*pathconf));
+-	nfs4_setup_compound(&compound, ops, server, "statfs");
+-	nfs4_setup_putfh(&compound, fhandle);
+-	nfs4_setup_pathconf(&compound, pathconf);
+-	return nfs4_call_compound(&compound, NULL, 0);
++	return rpc_call_sync(server->client, &msg, 0);
+ }
+ 
+ static void
+@@ -1517,7 +1477,6 @@ nfs4_read_done(struct rpc_task *task)
+ {
+ 	struct nfs_read_data *data = (struct nfs_read_data *) task->tk_calldata;
+ 	struct inode *inode = data->inode;
+-	struct nfs_fattr *fattr = data->res.fattr;
+ 
+ 	if (nfs4_async_handle_error(task, NFS_SERVER(inode)) == -EAGAIN) {
+ 		task->tk_action = nfs4_restart_read;
+@@ -1525,11 +1484,6 @@ nfs4_read_done(struct rpc_task *task)
+ 	}
+ 	if (task->tk_status > 0)
+ 		renew_lease(NFS_SERVER(inode), data->timestamp);
+-	/* Check cache consistency */
+-	if (fattr->change_attr != NFS_CHANGE_ATTR(inode))
+-		nfs_zap_caches(inode);
+-	if (fattr->bitmap[1] & FATTR4_WORD1_TIME_ACCESS)
+-		inode->i_atime = fattr->atime;
+ 	/* Call back common NFS readpage processing */
+ 	nfs_readpage_result(task);
+ }
+@@ -1577,21 +1531,6 @@ nfs4_proc_read_setup(struct nfs_read_dat
+ }
+ 
+ static void
+-nfs4_write_refresh_inode(struct inode *inode, struct nfs_fattr *fattr)
+-{
+-	/* Check cache consistency */
+-	if (fattr->pre_change_attr != NFS_CHANGE_ATTR(inode))
+-		nfs_zap_caches(inode);
+-	NFS_CHANGE_ATTR(inode) = fattr->change_attr;
+-	if (fattr->bitmap[1] & FATTR4_WORD1_SPACE_USED)
+-		inode->i_blocks = (fattr->du.nfs3.used + 511) >> 9;
+-	if (fattr->bitmap[1] & FATTR4_WORD1_TIME_METADATA)
+-		inode->i_ctime = fattr->ctime;
+-	if (fattr->bitmap[1] & FATTR4_WORD1_TIME_MODIFY)
+-		inode->i_mtime = fattr->mtime;
+-}
+-
+-static void
+ nfs4_restart_write(struct rpc_task *task)
+ {
+ 	struct nfs_write_data *data = (struct nfs_write_data *)task->tk_calldata;
+@@ -1617,7 +1556,6 @@ nfs4_write_done(struct rpc_task *task)
+ 	}
+ 	if (task->tk_status >= 0)
+ 		renew_lease(NFS_SERVER(inode), data->timestamp);
+-	nfs4_write_refresh_inode(inode, data->res.fattr);
+ 	/* Call back common NFS writeback processing */
+ 	nfs_writeback_done(task);
+ }
+@@ -1684,7 +1622,6 @@ nfs4_commit_done(struct rpc_task *task)
+ 		task->tk_action = nfs4_restart_write;
+ 		return;
+ 	}
+-	nfs4_write_refresh_inode(inode, data->res.fattr);
+ 	/* Call back common NFS writeback processing */
+ 	nfs_commit_done(task);
+ }
+@@ -1807,6 +1744,7 @@ nfs4_proc_file_open(struct inode *inode,
+ 	if (filp->f_mode & FMODE_WRITE) {
+ 		lock_kernel();
+ 		nfs_set_mmcred(inode, state->owner->so_cred);
++		nfs_begin_data_update(inode);
+ 		unlock_kernel();
+ 	}
+ 	filp->private_data = state;
+@@ -1823,6 +1761,11 @@ nfs4_proc_file_release(struct inode *ino
+ 
+ 	if (state)
+ 		nfs4_close_state(state, filp->f_mode);
++	if (filp->f_mode & FMODE_WRITE) {
++		lock_kernel();
++		nfs_end_data_update(inode);
++		unlock_kernel();
++	}
+ 	return 0;
+ }
+ 
+@@ -2294,6 +2237,7 @@ struct nfs_rpc_ops	nfs_v4_clientops = {
+ 	.version	= 4,			/* protocol version */
+ 	.dentry_ops	= &nfs4_dentry_operations,
+ 	.dir_inode_ops	= &nfs4_dir_inode_operations,
++	.file_inode_ops = &nfs4_file_inode_operations,
+ 	.getroot	= nfs4_proc_get_root,
+ 	.getattr	= nfs4_proc_getattr,
+ 	.setattr	= nfs4_proc_setattr,
+diff -puN fs/nfs/pagelist.c~CITI_NFS4_ALL fs/nfs/pagelist.c
+--- linux-2.6.3/fs/nfs/pagelist.c~CITI_NFS4_ALL	2004-02-19 16:47:03.000000000 -0500
++++ linux-2.6.3-bfields/fs/nfs/pagelist.c	2004-02-19 16:47:03.000000000 -0500
+@@ -246,7 +246,6 @@ nfs_coalesce_requests(struct list_head *
+  * nfs_scan_list - Scan a list for matching requests
+  * @head: One of the NFS inode request lists
+  * @dst: Destination list
+- * @file: if set, ensure we match requests from this file
+  * @idx_start: lower bound of page->index to scan
+  * @npages: idx_start + npages sets the upper bound to scan.
+  *
+@@ -258,7 +257,6 @@ nfs_coalesce_requests(struct list_head *
+  */
+ int
+ nfs_scan_list(struct list_head *head, struct list_head *dst,
+-	      struct file *file,
+ 	      unsigned long idx_start, unsigned int npages)
+ {
+ 	struct list_head	*pos, *tmp;
+@@ -276,9 +274,6 @@ nfs_scan_list(struct list_head *head, st
+ 
+ 		req = nfs_list_entry(pos);
+ 
+-		if (file && req->wb_file != file)
+-			continue;
+-
+ 		if (req->wb_index < idx_start)
+ 			continue;
+ 		if (req->wb_index > idx_end)
+diff -puN fs/nfs/proc.c~CITI_NFS4_ALL fs/nfs/proc.c
+--- linux-2.6.3/fs/nfs/proc.c~CITI_NFS4_ALL	2004-02-19 16:47:03.000000000 -0500
++++ linux-2.6.3-bfields/fs/nfs/proc.c	2004-02-19 16:47:07.000000000 -0500
+@@ -49,18 +49,6 @@
+ 
+ extern struct rpc_procinfo nfs_procedures[];
+ 
+-static void
+-nfs_write_refresh_inode(struct inode *inode, struct nfs_fattr *fattr)
+-{
+-	if (!(fattr->valid & NFS_ATTR_WCC)) {
+-		fattr->pre_size  = NFS_CACHE_ISIZE(inode);
+-		fattr->pre_mtime = NFS_CACHE_MTIME(inode);
+-		fattr->pre_ctime = NFS_CACHE_CTIME(inode);
+-		fattr->valid |= NFS_ATTR_WCC;
+-	}
+-	nfs_refresh_inode(inode, fattr);
+-}
+-
+ static struct rpc_cred *
+ nfs_cred(struct inode *inode, struct file *filp)
+ {
+@@ -78,15 +66,33 @@ nfs_cred(struct inode *inode, struct fil
+  */
+ static int
+ nfs_proc_get_root(struct nfs_server *server, struct nfs_fh *fhandle,
+-		  struct nfs_fattr *fattr)
++		  struct nfs_fsinfo *info)
+ {
+-	int		status;
++	struct nfs_fattr *fattr = info->fattr;
++	struct nfs2_fsstat fsinfo;
++	int status;
+ 
+-	dprintk("NFS call  getroot\n");
++	dprintk("%s: call getattr\n", __FUNCTION__);
+ 	fattr->valid = 0;
+-	status = rpc_call(server->client, NFSPROC_GETATTR, fhandle, fattr, 0);
+-	dprintk("NFS reply getroot\n");
+-	return status;
++	status = rpc_call(server->client_sys, NFSPROC_GETATTR, fhandle, fattr, 0);
++	dprintk("%s: reply getattr %d\n", __FUNCTION__, status);
++	if (status)
++		return status;
++	dprintk("%s: call statfs\n", __FUNCTION__);
++	status = rpc_call(server->client_sys, NFSPROC_STATFS, fhandle, &fsinfo, 0);
++	dprintk("%s: reply statfs %d\n", __FUNCTION__, status);
++	if (status)
++		return status;
++	info->rtmax  = NFS_MAXDATA;
++	info->rtpref = fsinfo.tsize;
++	info->rtmult = fsinfo.bsize;
++	info->wtmax  = NFS_MAXDATA;
++	info->wtpref = fsinfo.tsize;
++	info->wtmult = fsinfo.bsize;
++	info->dtpref = fsinfo.tsize;
++	info->maxfilesize = 0x7FFFFFFF;
++	info->lease_time = 0;
++	return 0;
+ }
+ 
+ /*
+@@ -205,7 +211,7 @@ nfs_proc_write(struct nfs_write_data *wd
+ 	msg.rpc_cred = nfs_cred(inode, filp);
+ 	status = rpc_call_sync(NFS_CLIENT(inode), &msg, flags);
+ 	if (status >= 0) {
+-		nfs_write_refresh_inode(inode, fattr);
++		nfs_refresh_inode(inode, fattr);
+ 		wdata->res.count = wdata->args.count;
+ 		wdata->verf.committed = NFS_FILE_SYNC;
+ 	}
+@@ -331,10 +337,8 @@ nfs_proc_unlink_done(struct dentry *dir,
+ {
+ 	struct rpc_message *msg = &task->tk_msg;
+ 	
+-	if (msg->rpc_argp) {
+-		NFS_CACHEINV(dir->d_inode);
++	if (msg->rpc_argp)
+ 		kfree(msg->rpc_argp);
+-	}
+ 	return 0;
+ }
+ 
+@@ -584,7 +588,7 @@ nfs_write_done(struct rpc_task *task)
+ 	struct nfs_write_data *data = (struct nfs_write_data *) task->tk_calldata;
+ 
+ 	if (task->tk_status >= 0)
+-		nfs_write_refresh_inode(data->inode, data->res.fattr);
++		nfs_refresh_inode(data->inode, data->res.fattr);
+ 	nfs_writeback_done(task);
+ }
+ 
+@@ -665,6 +669,7 @@ struct nfs_rpc_ops	nfs_v2_clientops = {
+ 	.version	= 2,		       /* protocol version */
+ 	.dentry_ops	= &nfs_dentry_operations,
+ 	.dir_inode_ops	= &nfs_dir_inode_operations,
++	.file_inode_ops	= &nfs_file_inode_operations,
+ 	.getroot	= nfs_proc_get_root,
+ 	.getattr	= nfs_proc_getattr,
+ 	.setattr	= nfs_proc_setattr,
+diff -puN fs/nfs/read.c~CITI_NFS4_ALL fs/nfs/read.c
+--- linux-2.6.3/fs/nfs/read.c~CITI_NFS4_ALL	2004-02-19 16:47:03.000000000 -0500
++++ linux-2.6.3-bfields/fs/nfs/read.c	2004-02-19 16:47:03.000000000 -0500
+@@ -124,6 +124,7 @@ nfs_readpage_sync(struct file *file, str
+ 		if (result < rdata.args.count)	/* NFSv2ism */
+ 			break;
+ 	} while (count);
++	NFS_FLAGS(inode) |= NFS_INO_INVALID_ATIME;
+ 
+ 	if (count)
+ 		memclear_highpage_flush(page, rdata.args.pgbase, count);
+@@ -266,6 +267,7 @@ nfs_readpage_result(struct rpc_task *tas
+ 	dprintk("NFS: %4d nfs_readpage_result, (status %d)\n",
+ 		task->tk_pid, task->tk_status);
+ 
++	NFS_FLAGS(data->inode) |= NFS_INO_INVALID_ATIME;
+ 	while (!list_empty(&data->pages)) {
+ 		struct nfs_page *req = nfs_list_entry(data->pages.next);
+ 		struct page *page = req->wb_page;
+diff -puN fs/nfs/unlink.c~CITI_NFS4_ALL fs/nfs/unlink.c
+--- linux-2.6.3/fs/nfs/unlink.c~CITI_NFS4_ALL	2004-02-19 16:47:03.000000000 -0500
++++ linux-2.6.3-bfields/fs/nfs/unlink.c	2004-02-19 16:47:03.000000000 -0500
+@@ -104,6 +104,7 @@ nfs_async_unlink_init(struct rpc_task *t
+ 	status = NFS_PROTO(dir->d_inode)->unlink_setup(&msg, dir, &data->name);
+ 	if (status < 0)
+ 		goto out_err;
++	nfs_begin_data_update(dir->d_inode);
+ 	rpc_call_setup(task, &msg, 0);
+ 	return;
+  out_err:
+@@ -126,7 +127,7 @@ nfs_async_unlink_done(struct rpc_task *t
+ 	if (!dir)
+ 		return;
+ 	dir_i = dir->d_inode;
+-	nfs_zap_caches(dir_i);
++	nfs_end_data_update(dir_i);
+ 	if (NFS_PROTO(dir_i)->unlink_done(dir, task))
+ 		return;
+ 	put_rpccred(data->cred);
+diff -puN fs/nfs/write.c~CITI_NFS4_ALL fs/nfs/write.c
+--- linux-2.6.3/fs/nfs/write.c~CITI_NFS4_ALL	2004-02-19 16:47:03.000000000 -0500
++++ linux-2.6.3-bfields/fs/nfs/write.c	2004-02-19 16:47:03.000000000 -0500
+@@ -74,7 +74,6 @@
+ static struct nfs_page * nfs_update_request(struct file*, struct inode *,
+ 					    struct page *,
+ 					    unsigned int, unsigned int);
+-static void	nfs_strategy(struct inode *inode);
+ 
+ static kmem_cache_t *nfs_wdata_cachep;
+ static mempool_t *nfs_wdata_mempool;
+@@ -124,6 +123,52 @@ void nfs_commit_release(struct rpc_task 
+ 	nfs_commit_free(wdata);
+ }
+ 
++/* Adjust the file length if we're writing beyond the end */
++static void nfs_grow_file(struct page *page, unsigned int offset, unsigned int count)
++{
++	struct inode *inode = page->mapping->host;
++	loff_t end, i_size = i_size_read(inode);
++	unsigned long end_index = (i_size - 1) >> PAGE_CACHE_SHIFT;
++
++	if (i_size > 0 && page->index < end_index)
++		return;
++	end = ((loff_t)page->index << PAGE_CACHE_SHIFT) + ((loff_t)offset+count);
++	if (i_size >= end)
++		return;
++	i_size_write(inode, end);
++}
++
++/* We can set the PG_uptodate flag if we see that a write request
++ * covers the full page.
++ */
++static void nfs_mark_uptodate(struct page *page, unsigned int base, unsigned int count)
++{
++	loff_t end_offs;
++
++	if (PageUptodate(page))
++		return;
++	if (base != 0)
++		return;
++	if (count == PAGE_CACHE_SIZE) {
++		SetPageUptodate(page);
++		return;
++	}
++
++	end_offs = i_size_read(page->mapping->host) - 1;
++	if (end_offs < 0)
++		return;
++	/* Is this the last page? */
++	if (page->index != (unsigned long)(end_offs >> PAGE_CACHE_SHIFT))
++		return;
++	/* This is the last page: set PG_uptodate if we cover the entire
++	 * extent of the data, then zero the rest of the page.
++	 */
++	if (count == (unsigned int)(end_offs & (PAGE_CACHE_SIZE - 1)) + 1) {
++		memclear_highpage_flush(page, count, PAGE_CACHE_SIZE - count);
++		SetPageUptodate(page);
++	}
++}
++
+ /*
+  * Write a page synchronously.
+  * Offset is the data offset within the page.
+@@ -157,6 +202,7 @@ nfs_writepage_sync(struct file *file, st
+ 		(long long)NFS_FILEID(inode),
+ 		count, (long long)(page_offset(page) + offset));
+ 
++	nfs_begin_data_update(inode);
+ 	do {
+ 		if (count < wsize && !swapfile)
+ 			wdata.args.count = count;
+@@ -177,14 +223,12 @@ nfs_writepage_sync(struct file *file, st
+ 	        wdata.args.pgbase += result;
+ 		written += result;
+ 		count -= result;
+-
+-		/*
+-		 * If we've extended the file, update the inode
+-		 * now so we don't invalidate the cache.
+-		 */
+-		if (wdata.args.offset > i_size_read(inode))
+-			i_size_write(inode, wdata.args.offset);
+ 	} while (count);
++	/* Update file length */
++	nfs_grow_file(page, offset, written);
++	/* Set the PG_uptodate flag? */
++	nfs_mark_uptodate(page, offset, written);
++	nfs_end_data_update(inode);
+ 
+ 	if (PageError(page))
+ 		ClearPageError(page);
+@@ -201,18 +245,19 @@ nfs_writepage_async(struct file *file, s
+ 		    unsigned int offset, unsigned int count)
+ {
+ 	struct nfs_page	*req;
+-	loff_t		end;
+ 	int		status;
+ 
++	nfs_begin_data_update(inode);
+ 	req = nfs_update_request(file, inode, page, offset, count);
+ 	status = (IS_ERR(req)) ? PTR_ERR(req) : 0;
+ 	if (status < 0)
+ 		goto out;
++	/* Update file length */
++	nfs_grow_file(page, offset, count);
++	/* Set the PG_uptodate flag? */
++	nfs_mark_uptodate(page, offset, count);
+ 	nfs_unlock_request(req);
+-	nfs_strategy(inode);
+-	end = ((loff_t)page->index<<PAGE_CACHE_SHIFT) + (loff_t)(offset + count);
+-	if (i_size_read(inode) < end)
+-		i_size_write(inode, end);
++	nfs_end_data_update(inode);
+ 
+  out:
+ 	return status;
+@@ -286,7 +331,7 @@ nfs_writepages(struct address_space *map
+ 	err = generic_writepages(mapping, wbc);
+ 	if (err)
+ 		goto out;
+-	err = nfs_flush_file(inode, NULL, 0, 0, 0);
++	err = nfs_flush_inode(inode, 0, 0, 0);
+ 	if (err < 0)
+ 		goto out;
+ 	if (wbc->sync_mode == WB_SYNC_HOLD)
+@@ -294,7 +339,7 @@ nfs_writepages(struct address_space *map
+ 	if (is_sync && wbc->sync_mode == WB_SYNC_ALL) {
+ 		err = nfs_wb_all(inode);
+ 	} else
+-		nfs_commit_file(inode, NULL, 0, 0, 0);
++		nfs_commit_inode(inode, 0, 0, 0);
+ out:
+ 	return err;
+ }
+@@ -312,8 +357,10 @@ nfs_inode_add_request(struct inode *inod
+ 	BUG_ON(error == -EEXIST);
+ 	if (error)
+ 		return error;
+-	if (!nfsi->npages)
++	if (!nfsi->npages) {
+ 		igrab(inode);
++		nfs_begin_data_update(inode);
++	}
+ 	nfsi->npages++;
+ 	req->wb_count++;
+ 	return 0;
+@@ -336,6 +383,7 @@ nfs_inode_remove_request(struct nfs_page
+ 	nfsi->npages--;
+ 	if (!nfsi->npages) {
+ 		spin_unlock(&nfs_wreq_lock);
++		nfs_end_data_update(inode);
+ 		iput(inode);
+ 	} else
+ 		spin_unlock(&nfs_wreq_lock);
+@@ -421,7 +469,7 @@ nfs_mark_request_commit(struct nfs_page 
+  * Interruptible by signals only if mounted with intr flag.
+  */
+ static int
+-nfs_wait_on_requests(struct inode *inode, struct file *file, unsigned long idx_start, unsigned int npages)
++nfs_wait_on_requests(struct inode *inode, unsigned long idx_start, unsigned int npages)
+ {
+ 	struct nfs_inode *nfsi = NFS_I(inode);
+ 	struct nfs_page *req;
+@@ -441,8 +489,6 @@ nfs_wait_on_requests(struct inode *inode
+ 			break;
+ 
+ 		next = req->wb_index + 1;
+-		if (file && req->wb_file != file)
+-			continue;
+ 		if (!NFS_WBACK_BUSY(req))
+ 			continue;
+ 
+@@ -453,7 +499,6 @@ nfs_wait_on_requests(struct inode *inode
+ 		if (error < 0)
+ 			return error;
+ 		spin_lock(&nfs_wreq_lock);
+-		next = idx_start;
+ 		res++;
+ 	}
+ 	spin_unlock(&nfs_wreq_lock);
+@@ -464,7 +509,6 @@ nfs_wait_on_requests(struct inode *inode
+  * nfs_scan_dirty - Scan an inode for dirty requests
+  * @inode: NFS inode to scan
+  * @dst: destination list
+- * @file: if set, ensure we match requests from this file
+  * @idx_start: lower bound of page->index to scan.
+  * @npages: idx_start + npages sets the upper bound to scan.
+  *
+@@ -472,11 +516,11 @@ nfs_wait_on_requests(struct inode *inode
+  * The requests are *not* checked to ensure that they form a contiguous set.
+  */
+ static int
+-nfs_scan_dirty(struct inode *inode, struct list_head *dst, struct file *file, unsigned long idx_start, unsigned int npages)
++nfs_scan_dirty(struct inode *inode, struct list_head *dst, unsigned long idx_start, unsigned int npages)
+ {
+ 	struct nfs_inode *nfsi = NFS_I(inode);
+ 	int	res;
+-	res = nfs_scan_list(&nfsi->dirty, dst, file, idx_start, npages);
++	res = nfs_scan_list(&nfsi->dirty, dst, idx_start, npages);
+ 	nfsi->ndirty -= res;
+ 	sub_page_state(nr_dirty,res);
+ 	if ((nfsi->ndirty == 0) != list_empty(&nfsi->dirty))
+@@ -489,7 +533,6 @@ nfs_scan_dirty(struct inode *inode, stru
+  * nfs_scan_commit - Scan an inode for commit requests
+  * @inode: NFS inode to scan
+  * @dst: destination list
+- * @file: if set, ensure we collect requests from this file only.
+  * @idx_start: lower bound of page->index to scan.
+  * @npages: idx_start + npages sets the upper bound to scan.
+  *
+@@ -497,11 +540,11 @@ nfs_scan_dirty(struct inode *inode, stru
+  * The requests are *not* checked to ensure that they form a contiguous set.
+  */
+ static int
+-nfs_scan_commit(struct inode *inode, struct list_head *dst, struct file *file, unsigned long idx_start, unsigned int npages)
++nfs_scan_commit(struct inode *inode, struct list_head *dst, unsigned long idx_start, unsigned int npages)
+ {
+ 	struct nfs_inode *nfsi = NFS_I(inode);
+ 	int	res;
+-	res = nfs_scan_list(&nfsi->commit, dst, file, idx_start, npages);
++	res = nfs_scan_list(&nfsi->commit, dst, idx_start, npages);
+ 	nfsi->ncommit -= res;
+ 	if ((nfsi->ncommit == 0) != list_empty(&nfsi->commit))
+ 		printk(KERN_ERR "NFS: desynchronized value of nfs_i.ncommit.\n");
+@@ -600,46 +643,6 @@ nfs_update_request(struct file* file, st
+ 	return req;
+ }
+ 
+-/*
+- * This is the strategy routine for NFS.
+- * It is called by nfs_updatepage whenever the user wrote up to the end
+- * of a page.
+- *
+- * We always try to submit a set of requests in parallel so that the
+- * server's write code can gather writes. This is mainly for the benefit
+- * of NFSv2.
+- *
+- * We never submit more requests than we think the remote can handle.
+- * For UDP sockets, we make sure we don't exceed the congestion window;
+- * for TCP, we limit the number of requests to 8.
+- *
+- * NFS_STRATEGY_PAGES gives the minimum number of requests for NFSv2 that
+- * should be sent out in one go. This is for the benefit of NFSv2 servers
+- * that perform write gathering.
+- *
+- * FIXME: Different servers may have different sweet spots.
+- * Record the average congestion window in server struct?
+- */
+-#define NFS_STRATEGY_PAGES      8
+-static void
+-nfs_strategy(struct inode *inode)
+-{
+-	unsigned int	dirty, wpages;
+-
+-	dirty  = NFS_I(inode)->ndirty;
+-	wpages = NFS_SERVER(inode)->wpages;
+-#if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
+-	if (NFS_PROTO(inode)->version == 2) {
+-		if (dirty >= NFS_STRATEGY_PAGES * wpages)
+-			nfs_flush_file(inode, NULL, 0, 0, 0);
+-	} else if (dirty >= wpages)
+-		nfs_flush_file(inode, NULL, 0, 0, 0);
+-#else
+-	if (dirty >= NFS_STRATEGY_PAGES * wpages)
+-		nfs_flush_file(inode, NULL, 0, 0, 0);
+-#endif
+-}
+-
+ int
+ nfs_flush_incompatible(struct file *file, struct page *page)
+ {
+@@ -675,7 +678,6 @@ nfs_updatepage(struct file *file, struct
+ 	struct dentry	*dentry = file->f_dentry;
+ 	struct inode	*inode = page->mapping->host;
+ 	struct nfs_page	*req;
+-	loff_t		end;
+ 	int		status = 0;
+ 
+ 	dprintk("NFS:      nfs_updatepage(%s/%s %d@%Ld)\n",
+@@ -696,6 +698,30 @@ nfs_updatepage(struct file *file, struct
+ 		return status;
+ 	}
+ 
++	nfs_begin_data_update(inode);
++
++
++	/* If we're not using byte range locks, and we know the page
++	 * is entirely in cache, it may be more efficient to avoid
++	 * fragmenting write requests.
++	 */
++	if (PageUptodate(page) && inode->i_flock == NULL) {
++		loff_t end_offs = i_size_read(inode) - 1;
++		unsigned long end_index = end_offs >> PAGE_CACHE_SHIFT;
++
++		count += offset;
++		offset = 0;
++		if (end_offs < 0) {
++			/* Do nothing */
++		} else if (page->index == end_index) {
++			unsigned int pglen;
++			pglen = (unsigned int)(end_offs & (PAGE_CACHE_SIZE-1)) + 1;
++			if (count < pglen)
++				count = pglen;
++		} else if (page->index < end_index)
++			count = PAGE_CACHE_SIZE;
++	}
++
+ 	/*
+ 	 * Try to find an NFS request corresponding to this page
+ 	 * and update it.
+@@ -714,21 +740,14 @@ nfs_updatepage(struct file *file, struct
+ 		goto done;
+ 
+ 	status = 0;
+-	end = ((loff_t)page->index<<PAGE_CACHE_SHIFT) + (loff_t)(offset + count);
+-	if (i_size_read(inode) < end)
+-		i_size_write(inode, end);
+-
+-	/* If we wrote past the end of the page.
+-	 * Call the strategy routine so it can send out a bunch
+-	 * of requests.
+-	 */
+-	if (req->wb_pgbase == 0 && req->wb_bytes == PAGE_CACHE_SIZE) {
+-		SetPageUptodate(page);
+-		nfs_unlock_request(req);
+-		nfs_strategy(inode);
+-	} else
+-		nfs_unlock_request(req);
++
++	/* Update file length */
++	nfs_grow_file(page, offset, count);
++	/* Set the PG_uptodate flag? */
++	nfs_mark_uptodate(page, req->wb_pgbase, req->wb_bytes);
++	nfs_unlock_request(req);
+ done:
++	nfs_end_data_update(inode);
+         dprintk("NFS:      nfs_updatepage returns %d (isize %Ld)\n",
+ 			status, (long long)i_size_read(inode));
+ 	if (status < 0)
+@@ -891,10 +910,7 @@ nfs_writeback_done(struct rpc_task *task
+ #endif
+ 
+ 	/*
+-	 * Update attributes as result of writeback.
+-	 * FIXME: There is an inherent race with invalidate_inode_pages and
+-	 *	  writebacks since the page->count is kept > 1 for as long
+-	 *	  as the page has a write request pending.
++	 * Process the nfs_page list
+ 	 */
+ 	while (!list_empty(&data->pages)) {
+ 		req = nfs_list_entry(data->pages.next);
+@@ -1061,7 +1077,7 @@ nfs_commit_done(struct rpc_task *task)
+ }
+ #endif
+ 
+-int nfs_flush_file(struct inode *inode, struct file *file, unsigned long idx_start,
++int nfs_flush_inode(struct inode *inode, unsigned long idx_start,
+ 		   unsigned int npages, int how)
+ {
+ 	LIST_HEAD(head);
+@@ -1069,7 +1085,7 @@ int nfs_flush_file(struct inode *inode, 
+ 				error = 0;
+ 
+ 	spin_lock(&nfs_wreq_lock);
+-	res = nfs_scan_dirty(inode, &head, file, idx_start, npages);
++	res = nfs_scan_dirty(inode, &head, idx_start, npages);
+ 	spin_unlock(&nfs_wreq_lock);
+ 	if (res)
+ 		error = nfs_flush_list(&head, NFS_SERVER(inode)->wpages, how);
+@@ -1079,7 +1095,7 @@ int nfs_flush_file(struct inode *inode, 
+ }
+ 
+ #if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
+-int nfs_commit_file(struct inode *inode, struct file *file, unsigned long idx_start,
++int nfs_commit_inode(struct inode *inode, unsigned long idx_start,
+ 		    unsigned int npages, int how)
+ {
+ 	LIST_HEAD(head);
+@@ -1087,9 +1103,9 @@ int nfs_commit_file(struct inode *inode,
+ 				error = 0;
+ 
+ 	spin_lock(&nfs_wreq_lock);
+-	res = nfs_scan_commit(inode, &head, file, idx_start, npages);
++	res = nfs_scan_commit(inode, &head, idx_start, npages);
+ 	if (res) {
+-		res += nfs_scan_commit(inode, &head, NULL, 0, 0);
++		res += nfs_scan_commit(inode, &head, 0, 0);
+ 		spin_unlock(&nfs_wreq_lock);
+ 		error = nfs_commit_list(&head, how);
+ 	} else
+@@ -1100,7 +1116,7 @@ int nfs_commit_file(struct inode *inode,
+ }
+ #endif
+ 
+-int nfs_sync_file(struct inode *inode, struct file *file, unsigned long idx_start,
++int nfs_sync_inode(struct inode *inode, unsigned long idx_start,
+ 		  unsigned int npages, int how)
+ {
+ 	int	error,
+@@ -1109,18 +1125,15 @@ int nfs_sync_file(struct inode *inode, s
+ 	wait = how & FLUSH_WAIT;
+ 	how &= ~FLUSH_WAIT;
+ 
+-	if (!inode && file)
+-		inode = file->f_dentry->d_inode;
+-
+ 	do {
+ 		error = 0;
+ 		if (wait)
+-			error = nfs_wait_on_requests(inode, file, idx_start, npages);
++			error = nfs_wait_on_requests(inode, idx_start, npages);
+ 		if (error == 0)
+-			error = nfs_flush_file(inode, file, idx_start, npages, how);
++			error = nfs_flush_inode(inode, idx_start, npages, how);
+ #if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
+ 		if (error == 0)
+-			error = nfs_commit_file(inode, file, idx_start, npages, how);
++			error = nfs_commit_inode(inode, idx_start, npages, how);
+ #endif
+ 	} while (error > 0);
+ 	return error;
+diff -puN include/linux/fs.h~CITI_NFS4_ALL include/linux/fs.h
+--- linux-2.6.3/include/linux/fs.h~CITI_NFS4_ALL	2004-02-19 16:47:03.000000000 -0500
++++ linux-2.6.3-bfields/include/linux/fs.h	2004-02-19 16:47:03.000000000 -0500
+@@ -137,6 +137,7 @@ extern int leases_enable, dir_notify_ena
+ #define S_DEAD		32	/* removed, but still open directory */
+ #define S_NOQUOTA	64	/* Inode is not counted to quota */
+ #define S_DIRSYNC	128	/* Directory modifications are synchronous */
++#define S_NOCMTIME	256	/* Do not update file c/mtime */
+ 
+ /*
+  * Note that nosuid etc flags are inode-specific: setting some file-system
+@@ -170,6 +171,7 @@ extern int leases_enable, dir_notify_ena
+ #define IS_ONE_SECOND(inode)	__IS_FLG(inode, MS_ONE_SECOND)
+ 
+ #define IS_DEADDIR(inode)	((inode)->i_flags & S_DEAD)
++#define IS_NOCMTIME(inode)	((inode)->i_flags & S_NOCMTIME)
+ 
+ /* the read-only stuff doesn't really belong here, but any other place is
+    probably as bad and I don't want to create yet another include file. */
+diff -puN include/linux/nfs_fs.h~CITI_NFS4_ALL include/linux/nfs_fs.h
+--- linux-2.6.3/include/linux/nfs_fs.h~CITI_NFS4_ALL	2004-02-19 16:47:03.000000000 -0500
++++ linux-2.6.3-bfields/include/linux/nfs_fs.h	2004-02-19 16:47:07.000000000 -0500
+@@ -23,6 +23,10 @@
+ #include <linux/sunrpc/auth.h>
+ #include <linux/sunrpc/clnt.h>
+ 
++#ifdef CONFIG_NFS_V4
++#include <linux/xattr_acl.h>
++#endif /* CONFIG_NFS_V4 */
++
+ #include <linux/nfs.h>
+ #include <linux/nfs2.h>
+ #include <linux/nfs3.h>
+@@ -99,7 +103,7 @@ struct nfs_inode {
+ 	/*
+ 	 * Various flags
+ 	 */
+-	unsigned short		flags;
++	unsigned int		flags;
+ 
+ 	/*
+ 	 * read_cache_jiffies is when we started read-caching this inode,
+@@ -118,19 +122,22 @@ struct nfs_inode {
+ 	 *
+ 	 *	mtime != read_cache_mtime
+ 	 */
++	unsigned long		readdir_timestamp;
+ 	unsigned long		read_cache_jiffies;
+-	struct timespec		read_cache_ctime;
+-	struct timespec		read_cache_mtime;
+-	__u64			read_cache_isize;
+ 	unsigned long		attrtimeo;
+ 	unsigned long		attrtimeo_timestamp;
+ 	__u64			change_attr;		/* v4 only */
+ 
++	/* "Generation counter" for the attribute cache. This is
++	 * bumped whenever we update the metadata on the
++	 * server.
++	 */
++	unsigned long		cache_change_attribute;
+ 	/*
+-	 * Timestamp that dates the change made to read_cache_mtime.
+-	 * This is of use for dentry revalidation
++	 * Counter indicating the number of outstanding requests that
++	 * will cause a file data update.
+ 	 */
+-	unsigned long		cache_mtime_jiffies;
++	atomic_t		data_updates;
+ 
+ 	struct nfs_access_cache	cache_access;
+ 
+@@ -160,7 +167,10 @@ struct nfs_inode {
+         /* NFSv4 state */
+ 	struct list_head	open_states;
+ #endif /* CONFIG_NFS_V4*/
+-
++#ifdef CONFIG_NFS_V4_ACL
++	struct posix_acl	*acl;
++	struct posix_acl	*default_acl;
++#endif /* CONFIG_NFS_V4_ACL */
+ 	struct inode		vfs_inode;
+ };
+ 
+@@ -170,7 +180,9 @@ struct nfs_inode {
+ #define NFS_INO_STALE		0x0001		/* possible stale inode */
+ #define NFS_INO_ADVISE_RDPLUS   0x0002          /* advise readdirplus */
+ #define NFS_INO_REVALIDATING	0x0004		/* revalidating attrs */
+-#define NFS_INO_FLUSH		0x0008		/* inode is due for flushing */
++#define NFS_INO_INVALID_ATTR	0x0008		/* cached attrs are invalid */
++#define NFS_INO_INVALID_DATA	0x0010		/* cached data is invalid */
++#define NFS_INO_INVALID_ATIME	0x0020		/* cached atime is invalid */
+ #define NFS_INO_FAKE_ROOT	0x0080		/* root inode placeholder */
+ 
+ static inline struct nfs_inode *NFS_I(struct inode *inode)
+@@ -186,15 +198,7 @@ static inline struct nfs_inode *NFS_I(st
+ #define NFS_ADDR(inode)			(RPC_PEERADDR(NFS_CLIENT(inode)))
+ #define NFS_COOKIEVERF(inode)		(NFS_I(inode)->cookieverf)
+ #define NFS_READTIME(inode)		(NFS_I(inode)->read_cache_jiffies)
+-#define NFS_MTIME_UPDATE(inode)		(NFS_I(inode)->cache_mtime_jiffies)
+-#define NFS_CACHE_CTIME(inode)		(NFS_I(inode)->read_cache_ctime)
+-#define NFS_CACHE_MTIME(inode)		(NFS_I(inode)->read_cache_mtime)
+-#define NFS_CACHE_ISIZE(inode)		(NFS_I(inode)->read_cache_isize)
+ #define NFS_CHANGE_ATTR(inode)		(NFS_I(inode)->change_attr)
+-#define NFS_CACHEINV(inode) \
+-do { \
+-	NFS_READTIME(inode) = jiffies - NFS_MAXATTRTIMEO(inode) - 1; \
+-} while (0)
+ #define NFS_ATTRTIMEO(inode)		(NFS_I(inode)->attrtimeo)
+ #define NFS_MINATTRTIMEO(inode) \
+ 	(S_ISDIR(inode->i_mode)? NFS_SERVER(inode)->acdirmin \
+@@ -211,6 +215,17 @@ do { \
+ 
+ #define NFS_FILEID(inode)		(NFS_I(inode)->fileid)
+ 
++static inline int nfs_caches_unstable(struct inode *inode)
++{
++	return atomic_read(&NFS_I(inode)->data_updates) != 0;
++}
++
++static inline void NFS_CACHEINV(struct inode *inode)
++{
++	if (!nfs_caches_unstable(inode))
++		NFS_FLAGS(inode) |= NFS_INO_INVALID_ATTR;
++}
++
+ static inline int nfs_server_capable(struct inode *inode, int cap)
+ {
+ 	return NFS_SERVER(inode)->caps & cap;
+@@ -227,13 +242,37 @@ loff_t page_offset(struct page *page)
+ 	return ((loff_t)page->index) << PAGE_CACHE_SHIFT;
+ }
+ 
++/**
++ * nfs_save_change_attribute - Returns the inode attribute change cookie
++ * @inode - pointer to inode
++ * The "change attribute" is updated every time we finish an operation
++ * that will result in a metadata change on the server.
++ */
++static inline long nfs_save_change_attribute(struct inode *inode)
++{
++	return NFS_I(inode)->cache_change_attribute;
++}
++
++/**
++ * nfs_verify_change_attribute - Detects NFS inode cache updates
++ * @inode - pointer to inode
++ * @chattr - previously saved change attribute
++ * Return "false" if metadata has been updated (or is in the process of
++ * being updated) since the change attribute was saved.
++ */
++static inline int nfs_verify_change_attribute(struct inode *inode, unsigned long chattr)
++{
++	return !nfs_caches_unstable(inode)
++		&& chattr == NFS_I(inode)->cache_change_attribute;
++}
++
+ /*
+  * linux/fs/nfs/inode.c
+  */
+ extern void nfs_zap_caches(struct inode *);
+ extern struct inode *nfs_fhget(struct super_block *, struct nfs_fh *,
+ 				struct nfs_fattr *);
+-extern int __nfs_refresh_inode(struct inode *, struct nfs_fattr *);
++extern int nfs_refresh_inode(struct inode *, struct nfs_fattr *);
+ extern int nfs_getattr(struct vfsmount *, struct dentry *, struct kstat *);
+ extern int nfs_permission(struct inode *, int, struct nameidata *);
+ extern void nfs_set_mmcred(struct inode *, struct rpc_cred *);
+@@ -241,6 +280,10 @@ extern int nfs_open(struct inode *, stru
+ extern int nfs_release(struct inode *, struct file *);
+ extern int __nfs_revalidate_inode(struct nfs_server *, struct inode *);
+ extern int nfs_setattr(struct dentry *, struct iattr *);
++extern void nfs_begin_attr_update(struct inode *);
++extern void nfs_end_attr_update(struct inode *);
++extern void nfs_begin_data_update(struct inode *);
++extern void nfs_end_data_update(struct inode *);
+ 
+ /*
+  * linux/fs/nfs/file.c
+@@ -309,11 +352,11 @@ extern void nfs_commit_done(struct rpc_t
+  * Try to write back everything synchronously (but check the
+  * return value!)
+  */
+-extern int  nfs_sync_file(struct inode *, struct file *, unsigned long, unsigned int, int);
+-extern int  nfs_flush_file(struct inode *, struct file *, unsigned long, unsigned int, int);
++extern int  nfs_sync_inode(struct inode *, unsigned long, unsigned int, int);
++extern int  nfs_flush_inode(struct inode *, unsigned long, unsigned int, int);
+ extern int  nfs_flush_list(struct list_head *, int, int);
+ #if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4)
+-extern int  nfs_commit_file(struct inode *, struct file *, unsigned long, unsigned int, int);
++extern int  nfs_commit_inode(struct inode *, unsigned long, unsigned int, int);
+ extern int  nfs_commit_list(struct list_head *, int);
+ #else
+ static inline int
+@@ -333,7 +376,7 @@ nfs_have_writebacks(struct inode *inode)
+ static inline int
+ nfs_wb_all(struct inode *inode)
+ {
+-	int error = nfs_sync_file(inode, 0, 0, 0, FLUSH_WAIT);
++	int error = nfs_sync_inode(inode, 0, 0, FLUSH_WAIT);
+ 	return (error < 0) ? error : 0;
+ }
+ 
+@@ -343,21 +386,11 @@ nfs_wb_all(struct inode *inode)
+ static inline int
+ nfs_wb_page(struct inode *inode, struct page* page)
+ {
+-	int error = nfs_sync_file(inode, 0, page->index, 1,
++	int error = nfs_sync_inode(inode, page->index, 1,
+ 						FLUSH_WAIT | FLUSH_STABLE);
+ 	return (error < 0) ? error : 0;
+ }
+ 
+-/*
+- * Write back all pending writes for one user.. 
+- */
+-static inline int
+-nfs_wb_file(struct inode *inode, struct file *file)
+-{
+-	int error = nfs_sync_file(inode, file, 0, 0, FLUSH_WAIT);
+-	return (error < 0) ? error : 0;
+-}
+-
+ /* Hack for future NFS swap support */
+ #ifndef IS_SWAPFILE
+ # define IS_SWAPFILE(inode)	(0)
+@@ -383,20 +416,27 @@ extern int  nfsroot_mount(struct sockadd
+ /*
+  * inline functions
+  */
+-static inline int
+-nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)
++
++static inline int nfs_attribute_timeout(struct inode *inode)
+ {
+-	if (time_before(jiffies, NFS_READTIME(inode)+NFS_ATTRTIMEO(inode)))
+-		return NFS_STALE(inode) ? -ESTALE : 0;
+-	return __nfs_revalidate_inode(server, inode);
++	struct nfs_inode *nfsi = NFS_I(inode);
++
++	return time_after(jiffies, nfsi->read_cache_jiffies+nfsi->attrtimeo);
+ }
+ 
+-static inline int
+-nfs_refresh_inode(struct inode *inode, struct nfs_fattr *fattr)
++/**
++ * nfs_revalidate_inode - Revalidate the inode attributes
++ * @server - pointer to nfs_server struct
++ * @inode - pointer to inode struct
++ *
++ * Updates inode attribute information by retrieving the data from the server.
++ */
++static inline int nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)
+ {
+-	if ((fattr->valid & NFS_ATTR_FATTR) == 0)
+-		return 0;
+-	return __nfs_refresh_inode(inode,fattr);
++	if (!(NFS_FLAGS(inode) & (NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA))
++			&& !nfs_attribute_timeout(inode))
++		return NFS_STALE(inode) ? -ESTALE : 0;
++	return __nfs_revalidate_inode(server, inode);
+ }
+ 
+ static inline loff_t
+@@ -590,6 +630,15 @@ struct nfs4_state {
+ 
+ extern struct dentry_operations nfs4_dentry_operations;
+ extern struct inode_operations nfs4_dir_inode_operations;
++extern struct inode_operations nfs4_file_inode_operations;
++
++#define NFS_ACL_MAX_ENTRIES	32
++
++/* inode.c */
++extern ssize_t nfs_getxattr(struct dentry *, const char *, void *, size_t);
++extern int nfs_setxattr(struct dentry *, const char *, const void *, size_t, int);
++
++#define NFS4_ACL_NOT_CACHED	((void *)-1)
+ 
+ /* nfs4proc.c */
+ extern int nfs4_proc_setclientid(struct nfs4_client *, u32, unsigned short);
+@@ -602,6 +651,9 @@ int nfs4_do_downgrade(struct inode *inod
+ extern int nfs4_wait_clnt_recover(struct rpc_clnt *, struct nfs4_client *);
+ extern struct inode *nfs4_atomic_open(struct inode *, struct dentry *, struct nameidata *);
+ extern int nfs4_open_revalidate(struct inode *, struct dentry *, int);
++struct posix_acl * nfs4_proc_get_posix_acl(struct inode *, int);
++extern int nfs4_proc_set_posix_acl(struct inode *, int, struct posix_acl *);
++void nfs4_izap_acl(struct inode *inode, struct posix_acl **i_acl);
+ 
+ /* nfs4renewd.c */
+ extern void nfs4_schedule_state_renewal(struct nfs4_client *);
+diff -puN include/linux/nfs_page.h~CITI_NFS4_ALL include/linux/nfs_page.h
+--- linux-2.6.3/include/linux/nfs_page.h~CITI_NFS4_ALL	2004-02-19 16:47:03.000000000 -0500
++++ linux-2.6.3-bfields/include/linux/nfs_page.h	2004-02-19 16:47:03.000000000 -0500
+@@ -53,7 +53,7 @@ extern	void nfs_release_request(struct n
+ extern	void nfs_list_add_request(struct nfs_page *, struct list_head *);
+ 
+ extern	int nfs_scan_list(struct list_head *, struct list_head *,
+-			  struct file *, unsigned long, unsigned int);
++			  unsigned long, unsigned int);
+ extern	int nfs_coalesce_requests(struct list_head *, struct list_head *,
+ 				  unsigned int);
+ extern  int nfs_wait_on_request(struct nfs_page *);
+diff -puN include/linux/nfs_xdr.h~CITI_NFS4_ALL include/linux/nfs_xdr.h
+--- linux-2.6.3/include/linux/nfs_xdr.h~CITI_NFS4_ALL	2004-02-19 16:47:03.000000000 -0500
++++ linux-2.6.3-bfields/include/linux/nfs_xdr.h	2004-02-19 16:47:15.000000000 -0500
+@@ -39,6 +39,9 @@ struct nfs_fattr {
+ 	__u64			change_attr;	/* NFSv4 change attribute */
+ 	__u64			pre_change_attr;/* pre-op NFSv4 change attribute */
+ 	unsigned long		timestamp;
++#ifdef CONFIG_NFS_V4
++	struct nfs4_acl        *acl;            /* NFSv4 ACL */
++#endif /* CONFIG_NFS_V4 */
+ };
+ 
+ #define NFS_ATTR_WCC		0x0001		/* pre-op WCC data    */
+@@ -103,8 +106,6 @@ struct nfs_openargs {
+ 		nfs4_verifier   verifier; /* EXCLUSIVE */
+ 	} u;
+ 	struct qstr *           name;
+-	struct nfs4_getattr *   f_getattr;
+-	struct nfs4_getattr *   d_getattr;
+ 	struct nfs_server *     server;	 /* Needed for ID mapping */
+ };
+ 
+@@ -113,8 +114,8 @@ struct nfs_openres {
+ 	struct nfs_fh           fh;
+ 	struct nfs4_change_info * cinfo;
+ 	__u32                   rflags;
+-	struct nfs4_getattr *   f_getattr;
+-	struct nfs4_getattr *   d_getattr;
++	struct nfs_fattr *      f_attr;
++	struct nfs_fattr *      d_attr;
+ 	struct nfs_server *     server;
+ };
+ 
+@@ -141,7 +142,6 @@ struct nfs_open_reclaimargs {
+ 	__u32			id;
+ 	__u32			share_access;
+ 	__u32			claim;
+-	struct nfs4_getattr *   f_getattr;
+ };
+ 
+ /*
+@@ -319,12 +319,22 @@ struct nfs_setattrargs {
+ 	struct nfs_fh *                 fh;
+ 	nfs4_stateid                    stateid;
+ 	struct iattr *                  iap;
+-	struct nfs4_getattr *           attr;
++	struct nfs_fattr *              fattr;
+ 	struct nfs_server *             server; /* Needed for name mapping */
++#ifdef CONFIG_NFS_V4
++	struct nfs4_acl *               acl;
++#endif /* CONFIG_NFS_V4 */
+ };
+ 
++#ifdef CONFIG_NFS_V4
++struct nfs_setaclargs {
++	struct nfs_fh *			fh;
++	struct nfs4_acl *		acl;
++};
++#endif /* CONFIG_NFS_V4 */
++
+ struct nfs_setattrres {
+-	struct nfs4_getattr *           attr;
++	struct nfs_fattr *              fattr;
+ 	struct nfs_server *             server;
+ };
+ 
+@@ -482,118 +492,127 @@ struct nfs4_change_info {
+ 	u64				after;
+ };
+ 
+-struct nfs4_access {
+-	u32				ac_req_access;     /* request */
+-	u32 *				ac_resp_supported; /* response */
+-	u32 *				ac_resp_access;    /* response */
++struct nfs4_accessargs {
++	struct nfs_fh *                 fhandle;
++	u32                             req_access;
+ };
+ 
+-struct nfs4_close {
+-	char *				cl_stateid;        /* request */
+-	u32				cl_seqid;          /* request */
++struct nfs4_accessres {
++	struct nfs_server *             server;
++	struct nfs_fattr *              fattr;
++	u32				req_access;
++	u32 *				resp_supported;
++	u32 *				resp_access;
+ };
+ 
+-struct nfs4_create {
+-	u32				cr_ftype;          /* request */
+-	union {                                            /* request */
+-		struct {
+-			u32		textlen;
+-			const char *	text;
+-		} symlink;   /* NF4LNK */
++struct nfs4_create_arg {
++	u32				ftype;
++	union {
++		struct qstr *           symlink;    /* NF4LNK */
+ 		struct {
+ 			u32		specdata1;
+ 			u32		specdata2;
+ 		} device;    /* NF4BLK, NF4CHR */
+ 	} u;
+-	u32				cr_namelen;        /* request */
+-	const char *			cr_name;           /* request */
+-	struct iattr *			cr_attrs;          /* request */
+-	struct nfs4_change_info	*	cr_cinfo;          /* response */
++	struct qstr *                   name;
++	struct nfs_server *             server;
++	struct iattr *			attrs;
++	struct nfs_fh *                 dir_fh;
+ };
+-#define cr_textlen			u.symlink.textlen
+-#define cr_text				u.symlink.text
+-#define cr_specdata1			u.device.specdata1
+-#define cr_specdata2			u.device.specdata2
+ 
+-struct nfs4_getattr {
+-        u32 *				gt_bmval;          /* request */
+-        struct nfs_fattr *		gt_attrs;          /* response */
+-	struct nfs_fsstat *		gt_fsstat;         /* response */
+-	struct nfs_pathconf *		gt_pathconf;       /* response */
++struct nfs4_create_res {
++	struct nfs_server *             server;
++	struct nfs_fh *                 fhandle;
++	struct nfs_fattr *              fattr;
++	struct nfs_fattr *              dir_attr;
++	struct nfs4_change_info *       dir_cinfo;
+ };
+ 
+-struct nfs4_getfh {
+-	struct nfs_fh *			gf_fhandle;       /* response */
++struct nfs4_getattr_res {
++	struct nfs_server *             server;
++	struct nfs_fattr *              fattr;
+ };
+ 
+-struct nfs4_link {
+-	u32				ln_namelen;       /* request */
+-	const char *			ln_name;          /* request */
+-	struct nfs4_change_info *	ln_cinfo;         /* response */
++struct nfs4_getroot_res {
++	struct nfs_server *             server;
++	struct nfs_fattr *              fattr;
++	struct nfs_fh *                 fhandle;
+ };
+ 
+-struct nfs4_lookup {
+-	struct qstr *			lo_name;          /* request */
++struct nfs4_getroot_arg {
++	struct nfs_fh *                 fhandle;
++	struct qstr *                   name;
+ };
+ 
+-struct nfs4_open {
+-	struct nfs4_client *		op_client_state;  /* request */
+-	u32				op_share_access;  /* request */
+-	u32				op_opentype;      /* request */
+-	u32				op_createmode;    /* request */
+-	union {                                           /* request */
+-		struct iattr *		attrs;    /* UNCHECKED, GUARDED */
+-		nfs4_verifier		verifier; /* EXCLUSIVE */
+-	} u;
+-	struct qstr *			op_name;          /* request */
+-	char *				op_stateid;       /* response */
+-	struct nfs4_change_info	*	op_cinfo;         /* response */
+-	u32 *				op_rflags;        /* response */
+-};
+-#define op_attrs     u.attrs
+-#define op_verifier  u.verifier
+-
+-struct nfs4_open_confirm {
+-	char *				oc_stateid;       /* request */
+-};
+-
+-struct nfs4_putfh {
+-	struct nfs_fh *			pf_fhandle;       /* request */
+-};
+-
+-struct nfs4_readdir {
+-	u64				rd_cookie;        /* request */
+-	nfs4_verifier			rd_req_verifier;  /* request */
+-	u32				rd_count;         /* request */
+-	u32				rd_bmval[2];      /* request */	
+-	nfs4_verifier			rd_resp_verifier; /* response */
+-	struct page **			rd_pages;   /* zero-copy data */
+-	unsigned int			rd_pgbase;  /* zero-copy data */
++struct nfs4_link_arg {
++	struct nfs_fh *                 fh;
++	struct nfs_fh *                 dir_fh;
++	struct qstr *                   name;
++};
++
++struct nfs4_link_res {
++	struct nfs_server *             server;
++	struct nfs_fattr *              fattr;
++	struct nfs_fattr *              dir_attr;
++	struct nfs4_change_info *       dir_cinfo;
++};
++
++struct nfs4_lookupargs {
++	struct nfs_fh *                 dir_fh;
++        struct qstr *                   name;
++};
++
++struct nfs4_lookupres {
++	struct nfs_server *             server;
++	struct nfs_fattr *              dirattr;
++	struct nfs_fattr *              fattr;
++	struct nfs_fh *                 fhandle;
++};
++
++struct nfs4_readdir_arg {
++	struct nfs_fh *                 fh;
++	u64				cookie;        /* request */
++	nfs4_verifier			req_verifier;  /* request */
++	u32				count;         /* request */
++	struct page **			pages;   /* zero-copy data */
++	unsigned int			pgbase;  /* zero-copy data */
++};
++
++struct nfs4_readdir_res {
++	nfs4_verifier                   resp_verifier;
++	unsigned int                    pgbase;
+ };
+ 
+ struct nfs4_readlink {
+-	u32				rl_count;   /* zero-copy data */
+-	struct page **			rl_pages;   /* zero-copy data */
++	struct nfs_fh *                 fh;
++	u32				count;   /* zero-copy data */
++	struct page **			pages;   /* zero-copy data */
+ };
+ 
+-struct nfs4_remove {
+-	u32				rm_namelen;       /* request */
+-	const char *			rm_name;          /* request */
+-	struct nfs4_change_info *	rm_cinfo;         /* response */
++struct nfs4_remove_arg {
++	struct nfs_fh *                 fhandle;
++	struct qstr *                   name;
+ };
+ 
+-struct nfs4_rename {
+-	u32				rn_oldnamelen;    /* request */
+-	const char *			rn_oldname;       /* request */
+-	u32				rn_newnamelen;    /* request */
+-	const char *			rn_newname;       /* request */
+-	struct nfs4_change_info	*	rn_src_cinfo;     /* response */
+-	struct nfs4_change_info *	rn_dst_cinfo;     /* response */
++struct nfs4_remove_res {
++	struct nfs_server *             server;
++	struct nfs4_change_info *	dir_cinfo;
++	struct nfs_fattr *              dir_attr;
+ };
+ 
+-struct nfs4_setattr {
+-	char *				st_stateid;       /* request */
+-	struct iattr *			st_iap;           /* request */
++struct nfs4_rename_arg {
++	struct nfs_fh *                 old_dir;
++        struct nfs_fh *                 new_dir;
++        struct qstr *                   old_name;
++        struct qstr *                   new_name;
++};
++
++struct nfs4_rename_res {
++        struct nfs_server *             server;
++	struct nfs4_change_info *       old_cinfo;
++	struct nfs4_change_info *       new_cinfo;
++        struct nfs_fattr *              old_fattr;
++	struct nfs_fattr *              new_fattr;
+ };
+ 
+ struct nfs4_setclientid {
+@@ -606,52 +625,12 @@ struct nfs4_setclientid {
+ 	struct nfs4_client *		sc_state;	  /* response */
+ };
+ 
+-struct nfs4_op {
+-	u32				opnum;
+-	union {
+-		struct nfs4_access	access;
+-		struct nfs4_close	close;
+-		struct nfs4_create	create;
+-		struct nfs4_getattr	getattr;
+-		struct nfs4_getfh	getfh;
+-		struct nfs4_link	link;
+-		struct nfs4_lookup	lookup;
+-		struct nfs4_open	open;
+-		struct nfs4_open_confirm open_confirm;
+-		struct nfs4_putfh	putfh;
+-		struct nfs4_readdir	readdir;
+-		struct nfs4_readlink	readlink;
+-		struct nfs4_remove	remove;
+-		struct nfs4_rename	rename;
+-		struct nfs4_client *	renew;
+-		struct nfs4_setattr	setattr;
+-	} u;
+-};
+-
+-struct nfs4_compound {
+-	unsigned int		flags;   /* defined below */
+-	struct nfs_server *	server;
+-
+-	/* RENEW information */
+-	int			renew_index;
+-	unsigned long		timestamp;
+-
+-	/* scratch variables for XDR encode/decode */
+-	int			nops;
+-	u32 *			p;
+-	u32 *			end;
+-
+-	/* the individual COMPOUND operations */
+-	struct nfs4_op		*ops;
+-
+-	/* request */
+-	int			req_nops;
+-	u32			taglen;
+-	char *			tag;
+-	
+-	/* response */
+-	int			resp_nops;
+-	int			toplevel_status;
++struct nfs4_unlink {
++	struct nfs_server *             server;
++	struct nfs_fh *                 fh;
++	struct qstr *                   name;
++	struct nfs4_change_info         cinfo;  /* NOT a pointer */
++	struct nfs_fattr                attrs;  /* NOT a pointer */
+ };
+ 
+ #endif /* CONFIG_NFS_V4 */
+@@ -698,9 +677,10 @@ struct nfs_rpc_ops {
+ 	int	version;		/* Protocol version */
+ 	struct dentry_operations *dentry_ops;
+ 	struct inode_operations *dir_inode_ops;
++	struct inode_operations *file_inode_ops;
+ 
+ 	int	(*getroot) (struct nfs_server *, struct nfs_fh *,
+-			    struct nfs_fattr *);
++			    struct nfs_fsinfo *);
+ 	int	(*getattr) (struct inode *, struct nfs_fattr *);
+ 	int	(*setattr) (struct dentry *, struct nfs_fattr *,
+ 			    struct iattr *);
+diff -puN include/linux/sunrpc/xprt.h~CITI_NFS4_ALL include/linux/sunrpc/xprt.h
+--- linux-2.6.3/include/linux/sunrpc/xprt.h~CITI_NFS4_ALL	2004-02-19 16:47:03.000000000 -0500
++++ linux-2.6.3-bfields/include/linux/sunrpc/xprt.h	2004-02-19 16:47:05.000000000 -0500
+@@ -95,14 +95,15 @@ struct rpc_rqst {
+ 	struct rpc_rqst *	rq_next;	/* free list */
+ 	int			rq_cong;	/* has incremented xprt->cong */
+ 	int			rq_received;	/* receive completed */
+-	u32			rq_seqno;	/* gss seq no. used on req. */
++#define GSS_SEQNO_CACHE		4
++	u32			rq_seqnos[GSS_SEQNO_CACHE];
++						/* gss seq no.s used on req. */
+ 
+ 	struct list_head	rq_list;
+ 
+ 	struct xdr_buf		rq_private_buf;		/* The receive buffer
+ 							 * used in the softirq.
+ 							 */
+-
+ 	/*
+ 	 * For authentication (e.g. auth_des)
+ 	 */
+@@ -155,6 +156,11 @@ struct rpc_xprt {
+ 				stream     : 1;	/* TCP */
+ 
+ 	/*
++	 * XID
++	 */
++	__u32			xid;		/* Next XID value to use */
++
++	/*
+ 	 * State of TCP reply receive stuff
+ 	 */
+ 	u32			tcp_recm,	/* Fragment header */
+@@ -164,6 +170,11 @@ struct rpc_xprt {
+ 	unsigned long		tcp_copied,	/* copied to request */
+ 				tcp_flags;
+ 	/*
++	 * Connection of sockets
++	 */
++	struct work_struct	sock_connect;
++	unsigned short		port;
++	/*
+ 	 * Disconnection of idle sockets
+ 	 */
+ 	struct work_struct	task_cleanup;
+diff -puN net/sunrpc/xprt.c~CITI_NFS4_ALL net/sunrpc/xprt.c
+--- linux-2.6.3/net/sunrpc/xprt.c~CITI_NFS4_ALL	2004-02-19 16:47:03.000000000 -0500
++++ linux-2.6.3-bfields/net/sunrpc/xprt.c	2004-02-19 16:47:05.000000000 -0500
+@@ -60,6 +60,7 @@
+ #include <linux/sunrpc/clnt.h>
+ #include <linux/file.h>
+ #include <linux/workqueue.h>
++#include <linux/random.h>
+ 
+ #include <net/sock.h>
+ #include <net/checksum.h>
+@@ -77,6 +78,7 @@
+ 
+ #define XPRT_MAX_BACKOFF	(8)
+ #define XPRT_IDLE_TIMEOUT	(5*60*HZ)
++#define XPRT_MAX_RESVPORT	(800)
+ 
+ /*
+  * Local functions
+@@ -87,7 +89,7 @@ static void	xprt_disconnect(struct rpc_x
+ static void	xprt_connect_status(struct rpc_task *task);
+ static struct rpc_xprt * xprt_setup(int proto, struct sockaddr_in *ap,
+ 						struct rpc_timeout *to);
+-static struct socket *xprt_create_socket(int, struct rpc_timeout *, int);
++static struct socket *xprt_create_socket(struct rpc_xprt *, int, int);
+ static void	xprt_bind_socket(struct rpc_xprt *, struct socket *);
+ static int      __xprt_get_cong(struct rpc_xprt *, struct rpc_task *);
+ 
+@@ -455,6 +457,68 @@ out_abort:
+ 	spin_unlock(&xprt->sock_lock);
+ }
+ 
++static void
++xprt_socket_connect(void *args)
++{
++	struct rpc_xprt *xprt = (struct rpc_xprt *)args;
++	struct socket *sock = xprt->sock;
++	int status = -EIO;
++
++	if (xprt->shutdown) {
++		rpc_wake_up_status(&xprt->pending, -EIO);
++		return;
++	}
++	if (!xprt->addr.sin_port)
++		goto out_err;
++
++	/*
++	 * Start by resetting any existing state
++	 */
++	xprt_close(xprt);
++	sock = xprt_create_socket(xprt, xprt->prot, xprt->resvport);
++	if (sock == NULL) {
++		/* couldn't create socket or bind to reserved port;
++		 * this is likely a permanent error, so cause an abort */
++		goto out_err;
++		return;
++	}
++	xprt_bind_socket(xprt, sock);
++	xprt_sock_setbufsize(xprt);
++
++	if (!xprt->stream)
++		goto out;
++
++	/*
++	 * Tell the socket layer to start connecting...
++	 */
++	status = sock->ops->connect(sock, (struct sockaddr *) &xprt->addr,
++			sizeof(xprt->addr), O_NONBLOCK);
++	dprintk("RPC: %p  connect status %d connected %d sock state %d\n",
++			xprt, -status, xprt_connected(xprt), sock->sk->sk_state);
++	if (status >= 0)
++		goto out;
++	switch (status) {
++		case -EINPROGRESS:
++		case -EALREADY:
++			break;
++		default:
++			goto out_err;
++	}
++out:
++	spin_lock_bh(&xprt->sock_lock);
++	if (xprt->snd_task)
++		rpc_wake_up_task(xprt->snd_task);
++	spin_unlock_bh(&xprt->sock_lock);
++	return;
++out_err:
++	spin_lock_bh(&xprt->sock_lock);
++	if (xprt->snd_task) {
++		xprt->snd_task->tk_status = status;
++		rpc_wake_up_task(xprt->snd_task);
++	}
++	spin_unlock_bh(&xprt->sock_lock);
++}
++
+ /*
+  * Attempt to connect a TCP socket.
+  *
+@@ -463,9 +527,6 @@ void
+ xprt_connect(struct rpc_task *task)
+ {
+ 	struct rpc_xprt	*xprt = task->tk_xprt;
+-	struct socket	*sock = xprt->sock;
+-	struct sock	*inet;
+-	int		status;
+ 
+ 	dprintk("RPC: %4d xprt_connect xprt %p %s connected\n", task->tk_pid,
+ 			xprt, (xprt_connected(xprt) ? "is" : "is not"));
+@@ -486,79 +547,9 @@ xprt_connect(struct rpc_task *task)
+ 	if (task->tk_rqstp)
+ 		task->tk_rqstp->rq_bytes_sent = 0;
+ 
+-	/*
+-	 * We're here because the xprt was marked disconnected.
+-	 * Start by resetting any existing state.
+-	 */
+-	xprt_close(xprt);
+-	if (!(sock = xprt_create_socket(xprt->prot, &xprt->timeout, xprt->resvport))) {
+-		/* couldn't create socket or bind to reserved port;
+-		 * this is likely a permanent error, so cause an abort */
+-		task->tk_status = -EIO;
+-		goto out_write;
+-	}
+-	xprt_bind_socket(xprt, sock);
+-	xprt_sock_setbufsize(xprt);
+-
+-	if (!xprt->stream)
+-		goto out_write;
+-
+-	inet = sock->sk;
+-
+-	/*
+-	 * Tell the socket layer to start connecting...
+-	 */
+-	status = sock->ops->connect(sock, (struct sockaddr *) &xprt->addr,
+-				sizeof(xprt->addr), O_NONBLOCK);
+-	dprintk("RPC: %4d  connect status %d connected %d sock state %d\n",
+-		task->tk_pid, -status, xprt_connected(xprt), inet->sk_state);
+-
+-	if (status >= 0)
+-		return;
+-
+-	switch (status) {
+-	case -EINPROGRESS:
+-	case -EALREADY:
+-		/* Protect against TCP socket state changes */
+-		lock_sock(inet);
+-		if (inet->sk_state != TCP_ESTABLISHED) {
+-			dprintk("RPC: %4d  waiting for connection\n",
+-					task->tk_pid);
+-			task->tk_timeout = RPC_CONNECT_TIMEOUT;
+-			/* if the socket is already closing, delay briefly */
+-			if ((1 << inet->sk_state) &
+-			    ~(TCPF_SYN_SENT | TCPF_SYN_RECV))
+-				task->tk_timeout = RPC_REESTABLISH_TIMEOUT;
+-			rpc_sleep_on(&xprt->pending, task, xprt_connect_status,
+-									NULL);
+-		}
+-		release_sock(inet);
+-		break;
+-	case -ECONNREFUSED:
+-	case -ECONNRESET:
+-	case -ENOTCONN:
+-		if (!RPC_IS_SOFT(task)) {
+-			rpc_delay(task, RPC_REESTABLISH_TIMEOUT);
+-			task->tk_status = -ENOTCONN;
+-			break;
+-		}
+-	default:
+-		/* Report myriad other possible returns.  If this file
+-		 * system is soft mounted, just error out, like Solaris.  */
+-		if (RPC_IS_SOFT(task)) {
+-			printk(KERN_WARNING
+-			"RPC: error %d connecting to server %s, exiting\n",
+-					-status, task->tk_client->cl_server);
+-			task->tk_status = -EIO;
+-			goto out_write;
+-		}
+-		printk(KERN_WARNING "RPC: error %d connecting to server %s\n",
+-				-status, task->tk_client->cl_server);
+-		/* This will prevent anybody else from reconnecting */
+-		rpc_delay(task, RPC_REESTABLISH_TIMEOUT);
+-		task->tk_status = status;
+-		break;
+-	}
++	task->tk_timeout = RPC_CONNECT_TIMEOUT;
++	rpc_sleep_on(&xprt->pending, task, xprt_connect_status, NULL);
++	schedule_work(&xprt->sock_connect);
+ 	return;
+  out_write:
+ 	xprt_release_write(xprt, task);
+@@ -583,6 +574,8 @@ xprt_connect_status(struct rpc_task *tas
+ 		task->tk_status = -EIO;
+ 
+ 	switch (task->tk_status) {
++	case -ECONNREFUSED:
++	case -ECONNRESET:
+ 	case -ENOTCONN:
+ 		rpc_delay(task, RPC_REESTABLISH_TIMEOUT);
+ 		return;
+@@ -1333,22 +1326,14 @@ do_xprt_reserve(struct rpc_task *task)
+ /*
+  * Allocate a 'unique' XID
+  */
+-static u32
+-xprt_alloc_xid(void)
++static inline u32 xprt_alloc_xid(struct rpc_xprt *xprt)
++{
++	return xprt->xid++;
++}
++
++static inline void xprt_init_xid(struct rpc_xprt *xprt)
+ {
+-	static spinlock_t xid_lock = SPIN_LOCK_UNLOCKED;
+-	static int need_init = 1;
+-	static u32 xid;
+-	u32 ret;
+-
+-	spin_lock(&xid_lock);
+-	if (unlikely(need_init)) {
+-		xid = get_seconds() << 12;
+-		need_init = 0;
+-	}
+-	ret = xid++;
+-	spin_unlock(&xid_lock);
+-	return ret;
++	get_random_bytes(&xprt->xid, sizeof(xprt->xid));
+ }
+ 
+ /*
+@@ -1362,7 +1347,8 @@ xprt_request_init(struct rpc_task *task,
+ 	req->rq_timeout = xprt->timeout;
+ 	req->rq_task	= task;
+ 	req->rq_xprt    = xprt;
+-	req->rq_xid     = xprt_alloc_xid();
++	req->rq_xid     = xprt_alloc_xid(xprt);
++	memset(req->rq_seqnos, 0, sizeof(req->rq_seqnos));
+ 	INIT_LIST_HEAD(&req->rq_list);
+ 	dprintk("RPC: %4d reserved req %p xid %08x\n", task->tk_pid,
+ 			req, req->rq_xid);
+@@ -1457,11 +1443,13 @@ xprt_setup(int proto, struct sockaddr_in
+ 	init_waitqueue_head(&xprt->cong_wait);
+ 
+ 	INIT_LIST_HEAD(&xprt->recv);
++	INIT_WORK(&xprt->sock_connect, xprt_socket_connect, xprt);
+ 	INIT_WORK(&xprt->task_cleanup, xprt_socket_autoclose, xprt);
+ 	init_timer(&xprt->timer);
+ 	xprt->timer.function = xprt_init_autodisconnect;
+ 	xprt->timer.data = (unsigned long) xprt;
+ 	xprt->last_used = jiffies;
++	xprt->port = XPRT_MAX_RESVPORT;
+ 
+ 	/* Set timeout parameters */
+ 	if (to) {
+@@ -1481,6 +1469,8 @@ xprt_setup(int proto, struct sockaddr_in
+ 	req->rq_next = NULL;
+ 	xprt->free = xprt->slot;
+ 
++	xprt_init_xid(xprt);
++
+ 	/* Check whether we want to use a reserved port */
+ 	xprt->resvport = capable(CAP_NET_BIND_SERVICE) ? 1 : 0;
+ 
+@@ -1493,30 +1483,28 @@ xprt_setup(int proto, struct sockaddr_in
+  * Bind to a reserved port
+  */
+ static inline int
+-xprt_bindresvport(struct socket *sock)
++xprt_bindresvport(struct rpc_xprt *xprt, struct socket *sock)
+ {
+-	struct sockaddr_in myaddr;
++	struct sockaddr_in myaddr = {
++		.sin_family = AF_INET,
++	};
+ 	int		err, port;
+-	kernel_cap_t saved_cap = current->cap_effective;
+ 
+-	/* Override capabilities.
+-	 * They were checked in xprt_create_proto i.e. at mount time
+-	 */
+-	cap_raise(current->cap_effective, CAP_NET_BIND_SERVICE);
+-
+-	memset(&myaddr, 0, sizeof(myaddr));
+-	myaddr.sin_family = AF_INET;
+-	port = 800;
++	/* Were we already bound to a given port? Try to reuse it */
++	port = xprt->port;
+ 	do {
+ 		myaddr.sin_port = htons(port);
+ 		err = sock->ops->bind(sock, (struct sockaddr *) &myaddr,
+ 						sizeof(myaddr));
+-	} while (err == -EADDRINUSE && --port > 0);
+-	current->cap_effective = saved_cap;
+-
+-	if (err < 0)
+-		printk("RPC: Can't bind to reserved port (%d).\n", -err);
++		if (err == 0) {
++			xprt->port = port;
++			return 0;
++		}
++		if (--port == 0)
++			port = XPRT_MAX_RESVPORT;
++	} while (err == -EADDRINUSE && port != xprt->port);
+ 
++	printk("RPC: Can't bind to reserved port (%d).\n", -err);
+ 	return err;
+ }
+ 
+@@ -1580,7 +1568,7 @@ xprt_sock_setbufsize(struct rpc_xprt *xp
+  * and connect stream sockets.
+  */
+ static struct socket *
+-xprt_create_socket(int proto, struct rpc_timeout *to, int resvport)
++xprt_create_socket(struct rpc_xprt *xprt, int proto, int resvport)
+ {
+ 	struct socket	*sock;
+ 	int		type, err;
+@@ -1596,7 +1584,7 @@ xprt_create_socket(int proto, struct rpc
+ 	}
+ 
+ 	/* If the caller has the capability, bind to a reserved port */
+-	if (resvport && xprt_bindresvport(sock) < 0) {
++	if (resvport && xprt_bindresvport(xprt, sock) < 0) {
+ 		printk("RPC: can't bind to reserved port.\n");
+ 		goto failed;
+ 	}
+diff -puN net/sunrpc/cache.c~CITI_NFS4_ALL net/sunrpc/cache.c
+--- linux-2.6.3/net/sunrpc/cache.c~CITI_NFS4_ALL	2004-02-19 16:47:03.000000000 -0500
++++ linux-2.6.3-bfields/net/sunrpc/cache.c	2004-02-19 16:47:03.000000000 -0500
+@@ -325,6 +325,7 @@ int cache_clean(void)
+ 	
+ 	if (current_detail && current_index < current_detail->hash_size) {
+ 		struct cache_head *ch, **cp;
++		struct cache_detail *d;
+ 		
+ 		write_lock(&current_detail->hash_lock);
+ 
+@@ -354,12 +355,14 @@ int cache_clean(void)
+ 			rv = 1;
+ 		}
+ 		write_unlock(&current_detail->hash_lock);
+-		if (ch)
+-			current_detail->cache_put(ch, current_detail);
+-		else
++		d = current_detail;
++		if (!ch)
+ 			current_index ++;
+-	}
+-	spin_unlock(&cache_list_lock);
++		spin_unlock(&cache_list_lock);
++		if (ch)
++			d->cache_put(ch, d);
++	} else
++		spin_unlock(&cache_list_lock);
+ 
+ 	return rv;
+ }
+diff -puN include/linux/sunrpc/cache.h~CITI_NFS4_ALL include/linux/sunrpc/cache.h
+--- linux-2.6.3/include/linux/sunrpc/cache.h~CITI_NFS4_ALL	2004-02-19 16:47:03.000000000 -0500
++++ linux-2.6.3-bfields/include/linux/sunrpc/cache.h	2004-02-19 16:47:03.000000000 -0500
+@@ -132,12 +132,14 @@ struct cache_deferred_req {
+  * If "set" == 0 :
+  *    If an entry is found, it is returned
+  *    If no entry is found, a new non-VALID entry is created.
+- * If "set" == 1 :
++ * If "set" == 1 and INPLACE == 0 :
+  *    If no entry is found a new one is inserted with data from "template"
+  *    If a non-CACHE_VALID entry is found, it is updated from template using UPDATE
+  *    If a CACHE_VALID entry is found, a new entry is swapped in with data
+  *       from "template"
+- * If set == 2, we UPDATE, but don't swap. i.e. update in place
++ * If set == 1, and INPLACE == 1 :
++ *    As above, except that if a CACHE_VALID entry is found, we UPDATE in place
++ *       instead of swapping in a new entry.
+  *
+  * If the passed handle has the CACHE_NEGATIVE flag set, then UPDATE is not
+  * run but insteead CACHE_NEGATIVE is set in any new item.
+@@ -164,8 +166,8 @@ RTN *FNAME ARGS										\
+ 	RTN *tmp, *new=NULL;								\
+ 	struct cache_head **hp, **head;							\
+ 	SETUP;										\
+- retry:											\
+ 	head = &(DETAIL)->hash_table[HASHFN];						\
++ retry:											\
+ 	if (set||new) write_lock(&(DETAIL)->hash_lock);					\
+ 	else read_lock(&(DETAIL)->hash_lock);						\
+ 	for(hp=head; *hp != NULL; hp = &tmp->MEMBER.next) {				\
+@@ -175,6 +177,8 @@ RTN *FNAME ARGS										\
+ 			if (set && !INPLACE && test_bit(CACHE_VALID, &tmp->MEMBER.flags) && !new) \
+ 				break;							\
+ 											\
++			if (new)							\
++				{INIT;}							\
+ 			cache_get(&tmp->MEMBER);					\
+ 			if (set) {							\
+ 				if (!INPLACE && test_bit(CACHE_VALID, &tmp->MEMBER.flags))\
+@@ -203,6 +207,7 @@ RTN *FNAME ARGS										\
+ 	}										\
+ 	/* Didn't find anything */							\
+ 	if (new) {									\
++		INIT;									\
+ 		new->MEMBER.next = *head;						\
+ 		*head = &new->MEMBER;							\
+ 		(DETAIL)->entries ++;							\
+@@ -224,8 +229,6 @@ RTN *FNAME ARGS										\
+ 	if (new) {									\
+ 		cache_init(&new->MEMBER);						\
+ 		cache_get(&new->MEMBER);						\
+-		INIT;									\
+-		tmp = new;								\
+ 		goto retry;								\
+ 	}										\
+ 	return NULL;									\
+diff -puN net/sunrpc/svcauth.c~CITI_NFS4_ALL net/sunrpc/svcauth.c
+--- linux-2.6.3/net/sunrpc/svcauth.c~CITI_NFS4_ALL	2004-02-19 16:47:03.000000000 -0500
++++ linux-2.6.3-bfields/net/sunrpc/svcauth.c	2004-02-19 16:47:04.000000000 -0500
+@@ -150,7 +150,10 @@ DefineCacheLookup(struct auth_domain,
+ 		  &auth_domain_cache,
+ 		  auth_domain_hash(item),
+ 		  auth_domain_match(tmp, item),
+-		  kfree(new); if(!set) return NULL;
++		  kfree(new); if(!set) {
++		  write_unlock(&auth_domain_cache.hash_lock);
++		  return NULL;
++		  }
+ 		  new=item; atomic_inc(&new->h.refcnt),
+ 		  /* no update */,
+ 		  0 /* no inplace updates */
+diff -puN net/sunrpc/svcauth_unix.c~CITI_NFS4_ALL net/sunrpc/svcauth_unix.c
+--- linux-2.6.3/net/sunrpc/svcauth_unix.c~CITI_NFS4_ALL	2004-02-19 16:47:03.000000000 -0500
++++ linux-2.6.3-bfields/net/sunrpc/svcauth_unix.c	2004-02-19 16:47:03.000000000 -0500
+@@ -119,7 +119,8 @@ static inline int ip_map_match(struct ip
+ }
+ static inline void ip_map_init(struct ip_map *new, struct ip_map *item)
+ {
+-	new->m_class = strdup(item->m_class);
++	new->m_class = item->m_class;
++	item->m_class = NULL;
+ 	new->m_addr.s_addr = item->m_addr.s_addr;
+ }
+ static inline void ip_map_update(struct ip_map *new, struct ip_map *item)
+@@ -191,7 +192,9 @@ static int ip_map_parse(struct cache_det
+ 	} else
+ 		dom = NULL;
+ 
+-	ipm.m_class = class;
++	ipm.m_class = strdup(class);
++	if (ipm.m_class == NULL)
++		return -ENOMEM;
+ 	ipm.m_addr.s_addr =
+ 		htonl((((((b1<<8)|b2)<<8)|b3)<<8)|b4);
+ 	ipm.h.flags = 0;
+@@ -207,6 +210,7 @@ static int ip_map_parse(struct cache_det
+ 		ip_map_put(&ipmp->h, &ip_map_cache);
+ 	if (dom)
+ 		auth_domain_put(dom);
++	if (ipm.m_class) kfree(ipm.m_class);
+ 	if (!ipmp)
+ 		return -ENOMEM;
+ 	cache_flush();
+@@ -266,7 +270,9 @@ int auth_unix_add_addr(struct in_addr ad
+ 	if (dom->flavour != RPC_AUTH_UNIX)
+ 		return -EINVAL;
+ 	udom = container_of(dom, struct unix_domain, h);
+-	ip.m_class = "nfsd";
++	ip.m_class = strdup("nfsd");
++	if (!ip.m_class)
++		return -ENOMEM;
+ 	ip.m_addr = addr;
+ 	ip.m_client = udom;
+ 	ip.m_add_change = udom->addr_changes+1;
+@@ -274,6 +280,7 @@ int auth_unix_add_addr(struct in_addr ad
+ 	ip.h.expiry_time = NEVER;
+ 	
+ 	ipmp = ip_map_lookup(&ip, 1);
++	if (ip.m_class) kfree(ip.m_class);
+ 	if (ipmp) {
+ 		ip_map_put(&ipmp->h, &ip_map_cache);
+ 		return 0;
+diff -puN fs/nfsd/stats.c~CITI_NFS4_ALL fs/nfsd/stats.c
+--- linux-2.6.3/fs/nfsd/stats.c~CITI_NFS4_ALL	2004-02-19 16:47:04.000000000 -0500
++++ linux-2.6.3-bfields/fs/nfsd/stats.c	2004-02-19 16:47:04.000000000 -0500
+@@ -26,6 +26,7 @@
+ #include <linux/kernel.h>
+ #include <linux/time.h>
+ #include <linux/proc_fs.h>
++#include <linux/seq_file.h>
+ #include <linux/stat.h>
+ #include <linux/module.h>
+ 
+@@ -39,14 +40,11 @@ struct svc_stat		nfsd_svcstats = {
+ 	.program	= &nfsd_program,
+ };
+ 
+-static int
+-nfsd_proc_read(char *buffer, char **start, off_t offset, int count,
+-				int *eof, void *data)
++static int nfsd_proc_show(struct seq_file *seq, void *v)
+ {
+-	int	len;
+-	int	i;
++	int i;
+ 
+-	len = sprintf(buffer, "rc %u %u %u\nfh %u %u %u %u %u\nio %u %u\n",
++	seq_printf(seq, "rc %u %u %u\nfh %u %u %u %u %u\nio %u %u\n",
+ 		      nfsdstats.rchits,
+ 		      nfsdstats.rcmisses,
+ 		      nfsdstats.rcnocache,
+@@ -58,57 +56,42 @@ nfsd_proc_read(char *buffer, char **star
+ 		      nfsdstats.io_read,
+ 		      nfsdstats.io_write);
+ 	/* thread usage: */
+-	len += sprintf(buffer+len, "th %u %u", nfsdstats.th_cnt, nfsdstats.th_fullcnt);
++	seq_printf(seq, "th %u %u", nfsdstats.th_cnt, nfsdstats.th_fullcnt);
+ 	for (i=0; i<10; i++) {
+ 		unsigned int jifs = nfsdstats.th_usage[i];
+ 		unsigned int sec = jifs / HZ, msec = (jifs % HZ)*1000/HZ;
+-		len += sprintf(buffer+len, " %u.%03u", sec, msec);
++		seq_printf(seq, " %u.%03u", sec, msec);
+ 	}
+ 
+ 	/* newline and ra-cache */
+-	len += sprintf(buffer+len, "\nra %u", nfsdstats.ra_size);
++	seq_printf(seq, "\nra %u", nfsdstats.ra_size);
+ 	for (i=0; i<11; i++)
+-		len += sprintf(buffer+len, " %u", nfsdstats.ra_depth[i]);
+-	len += sprintf(buffer+len, "\n");
++		seq_printf(seq, " %u", nfsdstats.ra_depth[i]);
++	seq_putc(seq, '\n');
+ 	
++	/* show my rpc info */
++	svc_seq_show(seq, &nfsd_svcstats);
+ 
+-	/* Assume we haven't hit EOF yet. Will be set by svc_proc_read. */
+-	*eof = 0;
+-
+-	/*
+-	 * Append generic nfsd RPC statistics if there's room for it.
+-	 */
+-	if (len <= offset) {
+-		len = svc_proc_read(buffer, start, offset - len, count,
+-				    eof, data);
+-		return len;
+-	}
+-
+-	if (len < count) {
+-		len += svc_proc_read(buffer + len, start, 0, count - len,
+-				     eof, data);
+-	}
+-
+-	if (offset >= len) {
+-		*start = buffer;
+-		return 0;
+-	}
++	return 0;
++}
+ 
+-	*start = buffer + offset;
+-	if ((len -= offset) > count)
+-		return count;
+-	return len;
++static int nfsd_proc_open(struct inode *inode, struct file *file)
++{
++	return single_open(file, nfsd_proc_show, NULL);
+ }
+ 
++static struct file_operations nfsd_proc_fops = {
++	.owner = THIS_MODULE,
++	.open = nfsd_proc_open,
++	.read  = seq_read,
++	.llseek = seq_lseek,
++	.release = single_release,
++};	
++
+ void
+ nfsd_stat_init(void)
+ {
+-	struct proc_dir_entry	*ent;
+-
+-	if ((ent = svc_proc_register(&nfsd_svcstats)) != 0) {
+-		ent->read_proc = nfsd_proc_read;
+-		ent->owner = THIS_MODULE;
+-	}
++	svc_proc_register(&nfsd_svcstats, &nfsd_proc_fops);
+ }
+ 
+ void
+diff -puN include/linux/sunrpc/stats.h~CITI_NFS4_ALL include/linux/sunrpc/stats.h
+--- linux-2.6.3/include/linux/sunrpc/stats.h~CITI_NFS4_ALL	2004-02-19 16:47:04.000000000 -0500
++++ linux-2.6.3-bfields/include/linux/sunrpc/stats.h	2004-02-19 16:47:04.000000000 -0500
+@@ -48,14 +48,13 @@ void			rpc_modcount(struct inode *, int)
+ #ifdef CONFIG_PROC_FS
+ struct proc_dir_entry *	rpc_proc_register(struct rpc_stat *);
+ void			rpc_proc_unregister(const char *);
+-int			rpc_proc_read(char *, char **, off_t, int,
+-					int *, void *);
+ void			rpc_proc_zero(struct rpc_program *);
+-struct proc_dir_entry *	svc_proc_register(struct svc_stat *);
++struct proc_dir_entry *	svc_proc_register(struct svc_stat *, 
++					  struct file_operations *);
+ void			svc_proc_unregister(const char *);
+-int			svc_proc_read(char *, char **, off_t, int,
+-					int *, void *);
+-void			svc_proc_zero(struct svc_program *);
++
++void			svc_seq_show(struct seq_file *, 
++				     const struct svc_stat *);
+ 
+ extern struct proc_dir_entry	*proc_net_rpc;
+ 
+@@ -63,13 +62,14 @@ extern struct proc_dir_entry	*proc_net_r
+ 
+ static inline struct proc_dir_entry *rpc_proc_register(struct rpc_stat *s) { return NULL; }
+ static inline void rpc_proc_unregister(const char *p) {}
+-static inline int rpc_proc_read(char *a, char **b, off_t c, int d, int *e, void *f) { return 0; }
+ static inline void rpc_proc_zero(struct rpc_program *p) {}
+ 
+-static inline struct proc_dir_entry *svc_proc_register(struct svc_stat *s) { return NULL; }
++static inline struct proc_dir_entry *svc_proc_register(struct svc_stat *s,
++						       struct file_operations *f) { return NULL; }
+ static inline void svc_proc_unregister(const char *p) {}
+-static inline int svc_proc_read(char *a, char **b, off_t c, int d, int *e, void *f) { return 0; }
+-static inline void svc_proc_zero(struct svc_program *p) {}
++
++static inline void svc_seq_show(struct seq_file *seq, 
++				const struct svc_stat *st) {}
+ 
+ #define proc_net_rpc NULL
+ 
+diff -puN net/sunrpc/stats.c~CITI_NFS4_ALL net/sunrpc/stats.c
+--- linux-2.6.3/net/sunrpc/stats.c~CITI_NFS4_ALL	2004-02-19 16:47:04.000000000 -0500
++++ linux-2.6.3-bfields/net/sunrpc/stats.c	2004-02-19 16:47:04.000000000 -0500
+@@ -18,6 +18,7 @@
+ #include <linux/kernel.h>
+ #include <linux/sched.h>
+ #include <linux/proc_fs.h>
++#include <linux/seq_file.h>
+ #include <linux/sunrpc/clnt.h>
+ #include <linux/sunrpc/svcsock.h>
+ 
+@@ -28,70 +29,66 @@ struct proc_dir_entry	*proc_net_rpc = NU
+ /*
+  * Get RPC client stats
+  */
+-int
+-rpc_proc_read(char *buffer, char **start, off_t offset, int count,
+-				int *eof, void *data)
+-{
+-	struct rpc_stat	*statp = (struct rpc_stat *) data;
+-	struct rpc_program *prog = statp->program;
+-	struct rpc_version *vers;
+-	int		len, i, j;
++static int rpc_proc_show(struct seq_file *seq, void *v) {
++	const struct rpc_stat	*statp = seq->private;
++	const struct rpc_program *prog = statp->program;
++	int		i, j;
+ 
+-	len = sprintf(buffer,
++	seq_printf(seq, 
+ 		"net %d %d %d %d\n",
+ 			statp->netcnt,
+ 			statp->netudpcnt,
+ 			statp->nettcpcnt,
+ 			statp->nettcpconn);
+-	len += sprintf(buffer + len,
++	seq_printf(seq, 
+ 		"rpc %d %d %d\n",
+ 			statp->rpccnt,
+ 			statp->rpcretrans,
+ 			statp->rpcauthrefresh);
+ 
+ 	for (i = 0; i < prog->nrvers; i++) {
+-		if (!(vers = prog->version[i]))
++		const struct rpc_version *vers = prog->version[i];
++		if (!vers)
+ 			continue;
+-		len += sprintf(buffer + len, "proc%d %d",
++		seq_printf(seq, "proc%d %d",
+ 					vers->number, vers->nrprocs);
+ 		for (j = 0; j < vers->nrprocs; j++)
+-			len += sprintf(buffer + len, " %d",
++			seq_printf(seq, " %d",
+ 					vers->procs[j].p_count);
+-		buffer[len++] = '\n';
++		seq_putc(seq, '\n');
+ 	}
++	return 0;
++}
+ 
+-	if (offset >= len) {
+-		*start = buffer;
+-		*eof = 1;
+-		return 0;
+-	}
+-	*start = buffer + offset;
+-	if ((len -= offset) > count)
+-		return count;
+-	*eof = 1;
+-	return len;
++static int rpc_proc_open(struct inode *inode, struct file *file)
++{
++	return single_open(file, rpc_proc_show, PDE(inode)->data);
+ }
+ 
++static struct file_operations rpc_proc_fops = {
++	.owner = THIS_MODULE,
++	.open = rpc_proc_open,
++	.read  = seq_read,
++	.llseek = seq_lseek,
++	.release = single_release,
++};	
++
+ /*
+  * Get RPC server stats
+  */
+-int
+-svc_proc_read(char *buffer, char **start, off_t offset, int count,
+-				int *eof, void *data)
+-{
+-	struct svc_stat *statp	= (struct svc_stat *) data;
+-	struct svc_program *prog = statp->program;
+-	struct svc_procedure *proc;
+-	struct svc_version *vers;
+-	int		len, i, j;
++void svc_seq_show(struct seq_file *seq, const struct svc_stat *statp) {
++	const struct svc_program *prog = statp->program;
++	const struct svc_procedure *proc;
++	const struct svc_version *vers;
++	int		i, j;
+ 
+-	len = sprintf(buffer,
++	seq_printf(seq, 
+ 		"net %d %d %d %d\n",
+ 			statp->netcnt,
+ 			statp->netudpcnt,
+ 			statp->nettcpcnt,
+ 			statp->nettcpconn);
+-	len += sprintf(buffer + len,
++	seq_printf(seq, 
+ 		"rpc %d %d %d %d %d\n",
+ 			statp->rpccnt,
+ 			statp->rpcbadfmt+statp->rpcbadauth+statp->rpcbadclnt,
+@@ -102,41 +99,36 @@ svc_proc_read(char *buffer, char **start
+ 	for (i = 0; i < prog->pg_nvers; i++) {
+ 		if (!(vers = prog->pg_vers[i]) || !(proc = vers->vs_proc))
+ 			continue;
+-		len += sprintf(buffer + len, "proc%d %d", i, vers->vs_nproc);
++		seq_printf(seq, "proc%d %d", i, vers->vs_nproc);
+ 		for (j = 0; j < vers->vs_nproc; j++, proc++)
+-			len += sprintf(buffer + len, " %d", proc->pc_count);
+-		buffer[len++] = '\n';
++			seq_printf(seq, " %d", proc->pc_count);
++		seq_putc(seq, '\n');
+ 	}
+-
+-	if (offset >= len) {
+-		*start = buffer;
+-		*eof = 1;
+-		return 0;
+-	}
+-	*start = buffer + offset;
+-	if ((len -= offset) > count)
+-		return count;
+-	*eof = 1;
+-	return len;
+ }
+ 
+ /*
+  * Register/unregister RPC proc files
+  */
+ static inline struct proc_dir_entry *
+-do_register(const char *name, void *data, int issvc)
++do_register(const char *name, void *data, struct file_operations *fops)
+ {
++	struct proc_dir_entry *ent;
++
+ 	rpc_proc_init();
+ 	dprintk("RPC: registering /proc/net/rpc/%s\n", name);
+-	return create_proc_read_entry(name, 0, proc_net_rpc, 
+-				      issvc? svc_proc_read : rpc_proc_read,
+-				      data);
++
++	ent = create_proc_entry(name, 0, proc_net_rpc);
++	if (ent) {
++		ent->proc_fops = fops;
++		ent->data = data;
++	}
++	return ent;
+ }
+ 
+ struct proc_dir_entry *
+ rpc_proc_register(struct rpc_stat *statp)
+ {
+-	return do_register(statp->program->name, statp, 0);
++	return do_register(statp->program->name, statp, &rpc_proc_fops);
+ }
+ 
+ void
+@@ -146,9 +138,9 @@ rpc_proc_unregister(const char *name)
+ }
+ 
+ struct proc_dir_entry *
+-svc_proc_register(struct svc_stat *statp)
++svc_proc_register(struct svc_stat *statp, struct file_operations *fops)
+ {
+-	return do_register(statp->program->pg_name, statp, 1);
++	return do_register(statp->program->pg_name, statp, fops);
+ }
+ 
+ void
+@@ -163,7 +155,7 @@ rpc_proc_init(void)
+ 	dprintk("RPC: registering /proc/net/rpc\n");
+ 	if (!proc_net_rpc) {
+ 		struct proc_dir_entry *ent;
+-		ent = proc_mkdir("net/rpc", 0);
++		ent = proc_mkdir("rpc", proc_net);
+ 		if (ent) {
+ 			ent->owner = THIS_MODULE;
+ 			proc_net_rpc = ent;
+diff -puN net/sunrpc/sunrpc_syms.c~CITI_NFS4_ALL net/sunrpc/sunrpc_syms.c
+--- linux-2.6.3/net/sunrpc/sunrpc_syms.c~CITI_NFS4_ALL	2004-02-19 16:47:04.000000000 -0500
++++ linux-2.6.3-bfields/net/sunrpc/sunrpc_syms.c	2004-02-19 16:47:04.000000000 -0500
+@@ -85,15 +85,16 @@ EXPORT_SYMBOL(svc_recv);
+ EXPORT_SYMBOL(svc_wake_up);
+ EXPORT_SYMBOL(svc_makesock);
+ EXPORT_SYMBOL(svc_reserve);
++EXPORT_SYMBOL(svc_auth_register);
++EXPORT_SYMBOL(auth_domain_lookup);
+ 
+ /* RPC statistics */
+ #ifdef CONFIG_PROC_FS
+ EXPORT_SYMBOL(rpc_proc_register);
+ EXPORT_SYMBOL(rpc_proc_unregister);
+-EXPORT_SYMBOL(rpc_proc_read);
+ EXPORT_SYMBOL(svc_proc_register);
+ EXPORT_SYMBOL(svc_proc_unregister);
+-EXPORT_SYMBOL(svc_proc_read);
++EXPORT_SYMBOL(svc_seq_show);
+ #endif
+ 
+ /* caching... */
+diff -puN net/sunrpc/auth_gss/gss_krb5_seal.c~CITI_NFS4_ALL net/sunrpc/auth_gss/gss_krb5_seal.c
+--- linux-2.6.3/net/sunrpc/auth_gss/gss_krb5_seal.c~CITI_NFS4_ALL	2004-02-19 16:47:04.000000000 -0500
++++ linux-2.6.3-bfields/net/sunrpc/auth_gss/gss_krb5_seal.c	2004-02-19 16:47:07.000000000 -0500
+@@ -101,12 +101,12 @@ krb5_make_token(struct krb5_ctx *ctx, in
+ 			checksum_type = CKSUMTYPE_RSA_MD5;
+ 			break;
+ 		default:
+-			dprintk("RPC: gss_krb5_seal: ctx->signalg %d not"
++			dprintk("RPC:      gss_krb5_seal: ctx->signalg %d not"
+ 				" supported\n", ctx->signalg);
+ 			goto out_err;
+ 	}
+ 	if (ctx->sealalg != SEAL_ALG_NONE && ctx->sealalg != SEAL_ALG_DES) {
+-		dprintk("RPC: gss_krb5_seal: ctx->sealalg %d not supported\n",
++		dprintk("RPC:      gss_krb5_seal: ctx->sealalg %d not supported\n",
+ 			ctx->sealalg);
+ 		goto out_err;
+ 	}
+@@ -151,7 +151,7 @@ krb5_make_token(struct krb5_ctx *ctx, in
+ 		       md5cksum.data + md5cksum.len - KRB5_CKSUM_LENGTH,
+ 		       KRB5_CKSUM_LENGTH);
+ 
+-		dprintk("make_seal_token: cksum data: \n");
++		dprintk("RPC:      make_seal_token: cksum data: \n");
+ 		print_hexl((u32 *) (krb5_hdr + 16), KRB5_CKSUM_LENGTH, 0);
+ 		break;
+ 	default:
+@@ -169,8 +169,5 @@ krb5_make_token(struct krb5_ctx *ctx, in
+ 	return ((ctx->endtime < now) ? GSS_S_CONTEXT_EXPIRED : GSS_S_COMPLETE);
+ out_err:
+ 	if (md5cksum.data) kfree(md5cksum.data);
+-	if (token->data) kfree(token->data);
+-	token->data = 0;
+-	token->len = 0;
+ 	return GSS_S_FAILURE;
+ }
+diff -puN include/linux/sunrpc/auth_gss.h~CITI_NFS4_ALL include/linux/sunrpc/auth_gss.h
+--- linux-2.6.3/include/linux/sunrpc/auth_gss.h~CITI_NFS4_ALL	2004-02-19 16:47:04.000000000 -0500
++++ linux-2.6.3-bfields/include/linux/sunrpc/auth_gss.h	2004-02-19 16:47:04.000000000 -0500
+@@ -62,8 +62,6 @@ struct rpc_gss_init_res {
+ 	struct xdr_netobj	gr_token;	/* token */
+ };
+ 
+-#define GSS_SEQ_WIN	5
+-
+ /* The gss_cl_ctx struct holds all the information the rpcsec_gss client
+  * code needs to know about a single security context.  In particular,
+  * gc_gss_ctx is the context handle that is used to do gss-api calls, while
+diff -puN include/linux/sunrpc/gss_api.h~CITI_NFS4_ALL include/linux/sunrpc/gss_api.h
+--- linux-2.6.3/include/linux/sunrpc/gss_api.h~CITI_NFS4_ALL	2004-02-19 16:47:04.000000000 -0500
++++ linux-2.6.3-bfields/include/linux/sunrpc/gss_api.h	2004-02-19 16:47:04.000000000 -0500
+@@ -120,6 +120,9 @@ int gss_mech_unregister_all(void);
+  * reference count. */
+ struct gss_api_mech * gss_mech_get_by_OID(struct xdr_netobj *);
+ 
++/* Similar, but get by name like "krb5", "spkm", etc., instead of OID. */
++struct gss_api_mech *gss_mech_get_by_name(char *);
++
+ /* Just increments the mechanism's reference count and returns its input: */
+ struct gss_api_mech * gss_mech_get(struct gss_api_mech *);
+ 
+diff -puN /dev/null include/linux/sunrpc/svcauth_gss.h
+--- /dev/null	2004-01-26 19:20:21.000000000 -0500
++++ linux-2.6.3-bfields/include/linux/sunrpc/svcauth_gss.h	2004-02-19 16:47:04.000000000 -0500
+@@ -0,0 +1,35 @@
++/*
++ * linux/include/linux/svcauth_gss.h
++ *
++ * Bruce Fields <bfields@umich.edu>
++ * Copyright (c) 2002 The Regents of the Unviersity of Michigan
++ *
++ * Id: linux-2.6.3-CITI_NFS4_ALL.patch,v 1.2.4.1 2004/03/17 23:55:23 adilger Exp $
++ *
++ */
++
++#ifndef _LINUX_SUNRPC_SVCAUTH_GSS_H
++#define _LINUX_SUNRPC_SVCAUTH_GSS_H
++
++#ifdef __KERNEL__
++#include <linux/sched.h>
++#include <linux/sunrpc/types.h>
++#include <linux/sunrpc/xdr.h>
++#include <linux/sunrpc/svcauth.h>
++#include <linux/sunrpc/svcsock.h>
++#include <linux/sunrpc/auth_gss.h>
++
++int gss_svc_init(void);
++int svcauth_gss_register_pseudoflavor(u32 pseudoflavor, char * name);
++
++
++struct gss_svc_data {
++	/* decoded gss client cred: */
++	struct rpc_gss_wire_cred	clcred;
++	/* pointer to the beginning of the procedure-specific results, which
++	 * may be encrypted/checksummed in svcauth_gss_release: */
++	u32				*body_start;
++};
++
++#endif /* __KERNEL__ */
++#endif /* _LINUX_SUNRPC_SVCAUTH_GSS_H */
+diff -puN include/linux/sunrpc/svcauth.h~CITI_NFS4_ALL include/linux/sunrpc/svcauth.h
+--- linux-2.6.3/include/linux/sunrpc/svcauth.h~CITI_NFS4_ALL	2004-02-19 16:47:04.000000000 -0500
++++ linux-2.6.3-bfields/include/linux/sunrpc/svcauth.h	2004-02-19 16:47:04.000000000 -0500
+@@ -65,6 +65,10 @@ struct auth_domain {
+  *      GARBAGE - rpc garbage_args error
+  *      SYSERR - rpc system_err error
+  *      DENIED - authp holds reason for denial.
++ *      COMPLETE - the reply is encoded already and ready to be sent; no
++ *		further processing is necessary.  (This is used for processing
++ *		null procedure calls which are used to set up encryption
++ *		contexts.)
+  *
+  *   accept is passed the proc number so that it can accept NULL rpc requests
+  *   even if it cannot authenticate the client (as is sometimes appropriate).
+@@ -97,6 +101,7 @@ extern struct auth_ops	*authtab[RPC_AUTH
+ #define	SVC_DROP	6
+ #define	SVC_DENIED	7
+ #define	SVC_PENDING	8
++#define	SVC_COMPLETE	9
+ 
+ 
+ extern int	svc_authenticate(struct svc_rqst *rqstp, u32 *authp);
+diff -puN include/linux/sunrpc/svc.h~CITI_NFS4_ALL include/linux/sunrpc/svc.h
+--- linux-2.6.3/include/linux/sunrpc/svc.h~CITI_NFS4_ALL	2004-02-19 16:47:04.000000000 -0500
++++ linux-2.6.3-bfields/include/linux/sunrpc/svc.h	2004-02-19 16:47:04.000000000 -0500
+@@ -135,6 +135,7 @@ struct svc_rqst {
+ 
+ 	void *			rq_argp;	/* decoded arguments */
+ 	void *			rq_resp;	/* xdr'd results */
++	void *			rq_auth_data;	/* flavor-specific data */
+ 
+ 	int			rq_reserved;	/* space on socket outq
+ 						 * reserved for this request
+diff -puN net/sunrpc/auth_gss/auth_gss.c~CITI_NFS4_ALL net/sunrpc/auth_gss/auth_gss.c
+--- linux-2.6.3/net/sunrpc/auth_gss/auth_gss.c~CITI_NFS4_ALL	2004-02-19 16:47:04.000000000 -0500
++++ linux-2.6.3-bfields/net/sunrpc/auth_gss/auth_gss.c	2004-02-19 16:47:07.000000000 -0500
+@@ -48,6 +48,7 @@
+ #include <linux/sunrpc/clnt.h>
+ #include <linux/sunrpc/auth.h>
+ #include <linux/sunrpc/auth_gss.h>
++#include <linux/sunrpc/svcauth_gss.h>
+ #include <linux/sunrpc/gss_err.h>
+ #include <linux/workqueue.h>
+ #include <linux/sunrpc/rpc_pipe_fs.h>
+@@ -279,7 +280,7 @@ err_free_ctx:
+ 	kfree(ctx);
+ err:
+ 	*gc = NULL;
+-	dprintk("RPC: gss_parse_init_downcall returning %d\n", err);
++	dprintk("RPC:      gss_parse_init_downcall returning %d\n", err);
+ 	return err;
+ }
+ 
+@@ -310,8 +311,10 @@ __gss_find_upcall(struct gss_auth *gss_a
+ 		if (pos->uid != uid)
+ 			continue;
+ 		atomic_inc(&pos->count);
++		dprintk("RPC:      gss_find_upcall found msg %p\n", pos);
+ 		return pos;
+ 	}
++	dprintk("RPC:      gss_find_upcall found nothing\n");
+ 	return NULL;
+ }
+ 
+@@ -349,6 +352,8 @@ gss_upcall(struct rpc_clnt *clnt, struct
+ 	uid_t uid = cred->cr_uid;
+ 	int res = 0;
+ 
++	dprintk("RPC: %4u gss_upcall for uid %u\n", task->tk_pid, uid);
++
+ retry:
+ 	spin_lock(&gss_auth->lock);
+ 	gss_msg = __gss_find_upcall(gss_auth, uid);
+@@ -357,8 +362,10 @@ retry:
+ 	if (gss_new == NULL) {
+ 		spin_unlock(&gss_auth->lock);
+ 		gss_new = kmalloc(sizeof(*gss_new), GFP_KERNEL);
+-		if (!gss_new)
++		if (!gss_new) {
++			dprintk("RPC: %4u gss_upcall -ENOMEM\n", task->tk_pid);
+ 			return -ENOMEM;
++		}
+ 		goto retry;
+ 	}
+ 	gss_msg = gss_new;
+@@ -388,10 +395,12 @@ retry:
+ 		spin_unlock(&gss_auth->lock);
+ 	}
+ 	gss_release_msg(gss_msg);
++	dprintk("RPC: %4u gss_upcall for uid %u result %d", task->tk_pid,
++			uid, res);
+ 	return res;
+ out_sleep:
+-	/* Sleep forever */
+-	task->tk_timeout = 0;
++	dprintk("RPC: %4u gss_upcall  sleeping\n", task->tk_pid);
++	task->tk_timeout = 0;		/* Sleep forever */
+ 	rpc_sleep_on(&gss_msg->waitq, task, NULL, NULL);
+ 	spin_unlock(&gss_auth->lock);
+ 	if (gss_new)
+@@ -476,12 +485,13 @@ gss_pipe_downcall(struct file *filp, con
+ 	} else
+ 		spin_unlock(&gss_auth->lock);
+ 	rpc_release_client(clnt);
++	dprintk("RPC:      gss_pipe_downcall returning length %u\n", mlen);
+ 	return mlen;
+ err:
+ 	if (ctx)
+ 		gss_destroy_ctx(ctx);
+ 	rpc_release_client(clnt);
+-	dprintk("RPC: gss_pipe_downcall returning %d\n", err);
++	dprintk("RPC:      gss_pipe_downcall returning %d\n", err);
+ 	return err;
+ }
+ 
+@@ -519,6 +529,8 @@ gss_pipe_destroy_msg(struct rpc_pipe_msg
+ 	static unsigned long ratelimit;
+ 
+ 	if (msg->errno < 0) {
++		dprintk("RPC:      gss_pipe_destroy_msg releasing msg %p\n",
++				gss_msg);
+ 		atomic_inc(&gss_msg->count);
+ 		gss_unhash_msg(gss_msg);
+ 		if (msg->errno == -ETIMEDOUT || msg->errno == -EPIPE) {
+@@ -543,7 +555,8 @@ gss_create(struct rpc_clnt *clnt, rpc_au
+ 	struct gss_auth *gss_auth;
+ 	struct rpc_auth * auth;
+ 
+-	dprintk("RPC: creating GSS authenticator for client %p\n",clnt);
++	dprintk("RPC:      creating GSS authenticator for client %p\n",clnt);
++
+ 	if (!(gss_auth = kmalloc(sizeof(*gss_auth), GFP_KERNEL)))
+ 		goto out_dec;
+ 	gss_auth->mech = gss_pseudoflavor_to_mech(flavor);
+@@ -581,7 +594,8 @@ static void
+ gss_destroy(struct rpc_auth *auth)
+ {
+ 	struct gss_auth *gss_auth;
+-	dprintk("RPC: destroying GSS authenticator %p flavor %d\n",
++
++	dprintk("RPC:      destroying GSS authenticator %p flavor %d\n",
+ 		auth, auth->au_flavor);
+ 
+ 	gss_auth = container_of(auth, struct gss_auth, rpc_auth);
+@@ -596,8 +610,7 @@ gss_destroy(struct rpc_auth *auth)
+ static void
+ gss_destroy_ctx(struct gss_cl_ctx *ctx)
+ {
+-
+-	dprintk("RPC: gss_destroy_ctx\n");
++	dprintk("RPC:      gss_destroy_ctx\n");
+ 
+ 	if (ctx->gc_gss_ctx)
+ 		gss_delete_sec_context(&ctx->gc_gss_ctx);
+@@ -616,7 +629,7 @@ gss_destroy_cred(struct rpc_cred *rc)
+ {
+ 	struct gss_cred *cred = (struct gss_cred *)rc;
+ 
+-	dprintk("RPC: gss_destroy_cred \n");
++	dprintk("RPC:      gss_destroy_cred \n");
+ 
+ 	if (cred->gc_ctx)
+ 		gss_put_ctx(cred->gc_ctx);
+@@ -628,7 +641,7 @@ gss_create_cred(struct rpc_auth *auth, s
+ {
+ 	struct gss_cred	*cred = NULL;
+ 
+-	dprintk("RPC: gss_create_cred for uid %d, flavor %d\n",
++	dprintk("RPC:      gss_create_cred for uid %d, flavor %d\n",
+ 		acred->uid, auth->au_flavor);
+ 
+ 	if (!(cred = kmalloc(sizeof(*cred), GFP_KERNEL)))
+@@ -648,7 +661,7 @@ gss_create_cred(struct rpc_auth *auth, s
+ 	return (struct rpc_cred *) cred;
+ 
+ out_err:
+-	dprintk("RPC: gss_create_cred failed\n");
++	dprintk("RPC:      gss_create_cred failed\n");
+ 	if (cred) gss_destroy_cred((struct rpc_cred *)cred);
+ 	return NULL;
+ }
+@@ -659,6 +672,15 @@ gss_match(struct auth_cred *acred, struc
+ 	return (rc->cr_uid == acred->uid);
+ }
+ 
++static void
++shift_seqnos(u32 *seqnos)
++{
++	int i;
++
++	for (i=1; i < GSS_SEQNO_CACHE; i++)
++		seqnos[i] = seqnos[i-1];
++}
++
+ /*
+ * Marshal credentials.
+ * Maybe we should keep a cached credential for performance reasons.
+@@ -678,24 +700,25 @@ gss_marshal(struct rpc_task *task, u32 *
+ 	struct xdr_buf	verf_buf;
+ 	u32		service;
+ 
+-	dprintk("RPC: gss_marshal\n");
++	dprintk("RPC: %4u gss_marshal\n", task->tk_pid);
+ 
+ 	*p++ = htonl(RPC_AUTH_GSS);
+ 	cred_len = p++;
+ 
+ 	service = gss_pseudoflavor_to_service(gss_cred->gc_flavor);
+ 	if (service == 0) {
+-		dprintk("Bad pseudoflavor %d in gss_marshal\n",
+-			gss_cred->gc_flavor);
++		dprintk("RPC: %4u Bad pseudoflavor %d in gss_marshal\n",
++			task->tk_pid, gss_cred->gc_flavor);
+ 		goto out_put_ctx;
+ 	}
++	shift_seqnos(req->rq_seqnos);
+ 	spin_lock(&ctx->gc_seq_lock);
+-	req->rq_seqno = ctx->gc_seq++;
++	req->rq_seqnos[0] = ctx->gc_seq++;
+ 	spin_unlock(&ctx->gc_seq_lock);
+ 
+ 	*p++ = htonl((u32) RPC_GSS_VERSION);
+ 	*p++ = htonl((u32) ctx->gc_proc);
+-	*p++ = htonl((u32) req->rq_seqno);
++	*p++ = htonl((u32) req->rq_seqnos[0]);
+ 	*p++ = htonl((u32) service);
+ 	p = xdr_encode_netobj(p, &ctx->gc_wire_ctx);
+ 	*cred_len = htonl((p - (cred_len + 1)) << 2);
+@@ -745,6 +768,32 @@ gss_refresh(struct rpc_task *task)
+ 	return 0;
+ }
+ 
++static int
++verify_checksum(struct gss_ctx *ctx, struct xdr_netobj *mic, u32 *seqnos)
++{
++	u32		seq, qop_state;
++	struct xdr_buf	verf_buf;
++	struct iovec	iov;
++	int		i;
++
++	for (i=0; i < GSS_SEQNO_CACHE; i++) {
++		if (i && !seqnos[i])
++			goto fail;
++		seq = htonl(seqnos[i]);
++		iov.iov_base = &seq;
++		iov.iov_len = sizeof(seq);
++		xdr_buf_from_iov(&iov, &verf_buf);
++		if (!gss_verify_mic(ctx, &verf_buf, mic, &qop_state))
++			goto success;
++	}
++fail:
++	return -1;
++success:
++	/* So unwrap knows which seqno we used: */
++	seqnos[0] = seqnos[i];
++	return 0;
++}
++
+ static u32 *
+ gss_validate(struct rpc_task *task, u32 *p)
+ {
+@@ -752,28 +801,21 @@ gss_validate(struct rpc_task *task, u32 
+ 	struct gss_cred	*gss_cred = container_of(cred, struct gss_cred,
+ 						gc_base);
+ 	struct gss_cl_ctx *ctx = gss_cred_get_ctx(cred);
+-	u32		seq, qop_state;
+-	struct iovec	iov;
+-	struct xdr_buf	verf_buf;
+ 	struct xdr_netobj mic;
+ 	u32		flav,len;
+ 	u32		service;
+ 
+-	dprintk("RPC: gss_validate\n");
++	dprintk("RPC: %4u gss_validate\n", task->tk_pid);
+ 
+ 	flav = ntohl(*p++);
+ 	if ((len = ntohl(*p++)) > RPC_MAX_AUTH_SIZE)
+                 goto out_bad;
+ 	if (flav != RPC_AUTH_GSS)
+ 		goto out_bad;
+-	seq = htonl(task->tk_rqstp->rq_seqno);
+-	iov.iov_base = &seq;
+-	iov.iov_len = sizeof(seq);
+-	xdr_buf_from_iov(&iov, &verf_buf);
++
+ 	mic.data = (u8 *)p;
+ 	mic.len = len;
+-
+-	if (gss_verify_mic(ctx->gc_gss_ctx, &verf_buf, &mic, &qop_state))
++	if (verify_checksum(ctx->gc_gss_ctx, &mic, task->tk_rqstp->rq_seqnos))
+                goto out_bad;
+        service = gss_pseudoflavor_to_service(gss_cred->gc_flavor);
+        switch (service) {
+@@ -789,9 +831,12 @@ gss_validate(struct rpc_task *task, u32 
+ 	       goto out_bad;
+        }
+ 	gss_put_ctx(ctx);
++	dprintk("RPC: %4u GSS gss_validate: gss_verify_mic succeeded.\n",
++			task->tk_pid);
+ 	return p + XDR_QUADLEN(len);
+ out_bad:
+ 	gss_put_ctx(ctx);
++	dprintk("RPC: %4u gss_validate failed.\n", task->tk_pid);
+ 	return NULL;
+ }
+ 
+@@ -814,7 +859,7 @@ gss_wrap_req(struct rpc_task *task,
+ 	u32		offset, *q;
+ 	struct iovec	*iov;
+ 
+-	dprintk("RPC: gss_wrap_body\n");
++	dprintk("RPC: %4u gss_wrap_req\n", task->tk_pid);
+ 	BUG_ON(!ctx);
+ 	if (ctx->gc_proc != RPC_GSS_PROC_DATA) {
+ 		/* The spec seems a little ambiguous here, but I think that not
+@@ -832,7 +877,7 @@ gss_wrap_req(struct rpc_task *task,
+ 
+ 			integ_len = p++;
+ 			offset = (u8 *)p - (u8 *)snd_buf->head[0].iov_base;
+-			*p++ = htonl(req->rq_seqno);
++			*p++ = htonl(req->rq_seqnos[0]);
+ 
+ 			status = encode(rqstp, p, obj);
+ 			if (status)
+@@ -871,7 +916,7 @@ gss_wrap_req(struct rpc_task *task,
+ 	status = 0;
+ out:
+ 	gss_put_ctx(ctx);
+-	dprintk("RPC: gss_wrap_req returning %d\n", status);
++	dprintk("RPC: %4u gss_wrap_req returning %d\n", task->tk_pid, status);
+ 	return status;
+ }
+ 
+@@ -909,7 +954,7 @@ gss_unwrap_resp(struct rpc_task *task,
+ 			mic_offset = integ_len + data_offset;
+ 			if (mic_offset > rcv_buf->len)
+ 				goto out;
+-			if (ntohl(*p++) != req->rq_seqno)
++			if (ntohl(*p++) != req->rq_seqnos[0])
+ 				goto out;
+ 
+ 			if (xdr_buf_subsegment(rcv_buf, &integ_buf, data_offset,
+@@ -932,7 +977,8 @@ out_decode:
+ 	status = decode(rqstp, p, obj);
+ out:
+ 	gss_put_ctx(ctx);
+-	dprintk("RPC: gss_unwrap_resp returning %d\n", status);
++	dprintk("RPC: %4u gss_unwrap_resp returning %d\n", task->tk_pid,
++			status);
+ 	return status;
+ }
+   
+@@ -972,6 +1018,15 @@ static int __init init_rpcsec_gss(void)
+ 	int err = 0;
+ 
+ 	err = rpcauth_register(&authgss_ops);
++	if (err)
++		goto out;
++	err = gss_svc_init();
++	if (err)
++		goto out_unregister;
++	return 0;
++out_unregister:
++	rpcauth_unregister(&authgss_ops);
++out:
+ 	return err;
+ }
+ 
+diff -puN net/sunrpc/auth_gss/gss_krb5_mech.c~CITI_NFS4_ALL net/sunrpc/auth_gss/gss_krb5_mech.c
+--- linux-2.6.3/net/sunrpc/auth_gss/gss_krb5_mech.c~CITI_NFS4_ALL	2004-02-19 16:47:04.000000000 -0500
++++ linux-2.6.3-bfields/net/sunrpc/auth_gss/gss_krb5_mech.c	2004-02-19 16:47:15.000000000 -0500
+@@ -39,6 +39,8 @@
+ #include <linux/types.h>
+ #include <linux/slab.h>
+ #include <linux/sunrpc/auth.h>
++#include <linux/in.h>
++#include <linux/sunrpc/svcauth_gss.h>
+ #include <linux/sunrpc/gss_krb5.h>
+ #include <linux/sunrpc/xdr.h>
+ #include <linux/crypto.h>
+@@ -98,7 +100,7 @@ get_key(char **p, char *end, struct cryp
+ 			alg_mode = CRYPTO_TFM_MODE_CBC;
+ 			break;
+ 		default:
+-			dprintk("RPC: get_key: unsupported algorithm %d\n", alg);
++			dprintk("RPC:      get_key: unsupported algorithm %d\n", alg);
+ 			goto out_err_free_key;
+ 	}
+ 	if (!(*res = crypto_alloc_tfm(alg_name, alg_mode)))
+@@ -153,7 +155,7 @@ gss_import_sec_context_kerberos(struct x
+ 		goto out_err_free_key2;
+ 
+ 	ctx_id->internal_ctx_id = ctx;
+-	dprintk("Succesfully imported new context.\n");
++	dprintk("RPC:      Succesfully imported new context.\n");
+ 	return 0;
+ 
+ out_err_free_key2:
+@@ -195,7 +197,7 @@ gss_verify_mic_kerberos(struct gss_ctx		
+ 	if (!maj_stat && qop_state)
+ 	    *qstate = qop_state;
+ 
+-	dprintk("RPC: gss_verify_mic_kerberos returning %d\n", maj_stat);
++	dprintk("RPC:      gss_verify_mic_kerberos returning %d\n", maj_stat);
+ 	return maj_stat;
+ }
+ 
+@@ -209,7 +211,7 @@ gss_get_mic_kerberos(struct gss_ctx	*ctx
+ 
+ 	err = krb5_make_token(kctx, qop, message, mic_token, KG_TOK_MIC_MSG);
+ 
+-	dprintk("RPC: gss_get_mic_kerberos returning %d\n",err);
++	dprintk("RPC:      gss_get_mic_kerberos returning %d\n",err);
+ 
+ 	return err;
+ }
+@@ -232,6 +234,10 @@ static int __init init_kerberos_module(v
+ 	gm = gss_mech_get_by_OID(&gss_mech_krb5_oid);
+ 	gss_register_triple(RPC_AUTH_GSS_KRB5 , gm, 0, RPC_GSS_SVC_NONE);
+ 	gss_register_triple(RPC_AUTH_GSS_KRB5I, gm, 0, RPC_GSS_SVC_INTEGRITY);
++	if (svcauth_gss_register_pseudoflavor(RPC_AUTH_GSS_KRB5, "krb5"))
++		printk("Failed to register %s with server!\n", "krb5");
++	if (svcauth_gss_register_pseudoflavor(RPC_AUTH_GSS_KRB5I, "krb5i"))
++		printk("Failed to register %s with server!\n", "krb5i");
+ 	gss_mech_put(gm);
+ 	return 0;
+ }
+diff -puN net/sunrpc/auth_gss/gss_mech_switch.c~CITI_NFS4_ALL net/sunrpc/auth_gss/gss_mech_switch.c
+--- linux-2.6.3/net/sunrpc/auth_gss/gss_mech_switch.c~CITI_NFS4_ALL	2004-02-19 16:47:04.000000000 -0500
++++ linux-2.6.3-bfields/net/sunrpc/auth_gss/gss_mech_switch.c	2004-02-19 16:47:07.000000000 -0500
+@@ -43,7 +43,6 @@
+ #include <linux/sunrpc/sched.h>
+ #include <linux/sunrpc/gss_api.h>
+ #include <linux/sunrpc/clnt.h>
+-#include <linux/sunrpc/name_lookup.h>
+ 
+ #ifdef RPC_DEBUG
+ # define RPCDBG_FACILITY        RPCDBG_AUTH
+@@ -82,7 +81,7 @@ gss_mech_register(struct xdr_netobj * me
+ 	spin_lock(&registered_mechs_lock);
+ 	list_add(&gm->gm_list, &registered_mechs);
+ 	spin_unlock(&registered_mechs_lock);
+-	dprintk("RPC: gss_mech_register: registered mechanism with oid:\n");
++	dprintk("RPC:      gss_mech_register: registered mechanism with oid:\n");
+ 	print_hexl((u32 *)mech_type->data, mech_type->len, 0);
+ 	return 0;
+ }
+@@ -94,11 +93,10 @@ do_gss_mech_unregister(struct gss_api_me
+ 
+ 	list_del(&gm->gm_list);
+ 
+-	dprintk("RPC: unregistered mechanism with oid:\n");
++	dprintk("RPC:      unregistered mechanism with oid:\n");
+ 	print_hexl((u32 *)gm->gm_oid.data, gm->gm_oid.len, 0);
+ 	if (!gss_mech_put(gm)) {
+-		dprintk("RPC: We just unregistered a gss_mechanism which"
+-				" someone is still using.\n");
++		dprintk("RPC:      We just unregistered a gss_mechanism which someone is still using.\n");
+ 		return -1;
+ 	} else {
+ 		return 0;
+@@ -146,7 +144,7 @@ gss_mech_get_by_OID(struct xdr_netobj *m
+ {
+ 	struct gss_api_mech 	*pos, *gm = NULL;
+ 
+-	dprintk("RPC: gss_mech_get_by_OID searching for mechanism with OID:\n");
++	dprintk("RPC:      gss_mech_get_by_OID searching for mechanism with OID:\n");
+ 	print_hexl((u32 *)mech_type->data, mech_type->len, 0);
+ 	spin_lock(&registered_mechs_lock);
+ 	list_for_each_entry(pos, &registered_mechs, gm_list) {
+@@ -158,10 +156,27 @@ gss_mech_get_by_OID(struct xdr_netobj *m
+ 		}
+ 	}
+ 	spin_unlock(&registered_mechs_lock);
+-	dprintk("RPC: gss_mech_get_by_OID %s it\n", gm ? "found" : "didn't find");
++	dprintk("RPC:      gss_mech_get_by_OID %s it\n", gm ? "found" : "didn't find");
+ 	return gm;
+ }
+ 
++struct gss_api_mech *
++gss_mech_get_by_name(char *name)
++{
++	struct gss_api_mech	*pos, *gm = NULL;
++
++	spin_lock(&registered_mechs_lock);
++	list_for_each_entry(pos, &registered_mechs, gm_list) {
++		if (0 == strcmp(name, pos->gm_ops->name)) {
++			gm = gss_mech_get(pos);
++			break;
++		}
++	}
++	spin_unlock(&registered_mechs_lock);
++	return gm;
++
++}
++
+ int
+ gss_mech_put(struct gss_api_mech * gm)
+ {
+@@ -228,7 +243,8 @@ gss_verify_mic(struct gss_ctx		*context_
+ u32
+ gss_delete_sec_context(struct gss_ctx	**context_handle)
+ {
+-	dprintk("gss_delete_sec_context deleting %p\n",*context_handle);
++	dprintk("RPC:      gss_delete_sec_context deleting %p\n",
++			*context_handle);
+ 
+ 	if (!*context_handle)
+ 		return(GSS_S_NO_CONTEXT);
+diff -puN net/sunrpc/auth_gss/Makefile~CITI_NFS4_ALL net/sunrpc/auth_gss/Makefile
+--- linux-2.6.3/net/sunrpc/auth_gss/Makefile~CITI_NFS4_ALL	2004-02-19 16:47:04.000000000 -0500
++++ linux-2.6.3-bfields/net/sunrpc/auth_gss/Makefile	2004-02-19 16:47:04.000000000 -0500
+@@ -5,7 +5,7 @@
+ obj-$(CONFIG_SUNRPC_GSS) += auth_rpcgss.o
+ 
+ auth_rpcgss-objs := auth_gss.o gss_pseudoflavors.o gss_generic_token.o \
+-	sunrpcgss_syms.o gss_mech_switch.o
++	sunrpcgss_syms.o gss_mech_switch.o svcauth_gss.o
+ 
+ obj-$(CONFIG_RPCSEC_GSS_KRB5) += rpcsec_gss_krb5.o
+ 
+diff -puN net/sunrpc/auth_gss/sunrpcgss_syms.c~CITI_NFS4_ALL net/sunrpc/auth_gss/sunrpcgss_syms.c
+--- linux-2.6.3/net/sunrpc/auth_gss/sunrpcgss_syms.c~CITI_NFS4_ALL	2004-02-19 16:47:04.000000000 -0500
++++ linux-2.6.3-bfields/net/sunrpc/auth_gss/sunrpcgss_syms.c	2004-02-19 16:47:04.000000000 -0500
+@@ -8,6 +8,7 @@
+ #include <linux/unistd.h>
+ 
+ #include <linux/sunrpc/auth_gss.h>
++#include <linux/sunrpc/svcauth_gss.h>
+ #include <linux/sunrpc/gss_asn1.h>
+ 
+ /* sec_triples: */
+@@ -17,6 +18,7 @@ EXPORT_SYMBOL(gss_cmp_triples);
+ EXPORT_SYMBOL(gss_pseudoflavor_to_mechOID);
+ EXPORT_SYMBOL(gss_pseudoflavor_supported);
+ EXPORT_SYMBOL(gss_pseudoflavor_to_service);
++EXPORT_SYMBOL(svcauth_gss_register_pseudoflavor);
+ 
+ /* registering gss mechanisms to the mech switching code: */
+ EXPORT_SYMBOL(gss_mech_register);
+diff -puN /dev/null net/sunrpc/auth_gss/svcauth_gss.c
+--- /dev/null	2004-01-26 19:20:21.000000000 -0500
++++ linux-2.6.3-bfields/net/sunrpc/auth_gss/svcauth_gss.c	2004-02-19 16:47:15.000000000 -0500
+@@ -0,0 +1,1018 @@
++/*
++ * Neil Brown <neilb@cse.unsw.edu.au>
++ * J. Bruce Fields <bfields@umich.edu>
++ * Andy Adamson <andros@umich.edu>
++ * Dug Song <dugsong@monkey.org>
++ * 
++ * RPCSEC_GSS server authentication.
++ * This implements RPCSEC_GSS as defined in rfc2203 (rpcsec_gss) and rfc2078
++ * (gssapi)
++ * 
++ * The RPCSEC_GSS involves three stages:
++ *  1/ context creation
++ *  2/ data exchange
++ *  3/ context destruction
++ *
++ * Context creation is handled largely by upcalls to user-space.
++ *  In particular, GSS_Accept_sec_context is handled by an upcall
++ * Data exchange is handled entirely within the kernel
++ *  In particular, GSS_GetMIC, GSS_VerifyMIC, GSS_Seal, GSS_Unseal are in-kernel.
++ * Context destruction is handled in-kernel
++ *  GSS_Delete_sec_context is in-kernel
++ *
++ * Context creation is initiated by a RPCSEC_GSS_INIT request arriving.
++ * The context handle and gss_token are used as a key into the rpcsec_init cache.
++ * The content of this cache includes some of the outputs of GSS_Accept_sec_context,
++ * being major_status, minor_status, context_handle, reply_token.
++ * These are sent back to the client.
++ * Sequence window management is handled by the kernel.  The window size if currently
++ * a compile time constant.
++ *
++ * When user-space is happy that a context is established, it places an entry
++ * in the rpcsec_context cache. The key for this cache is the context_handle.
++ * The content includes:
++ *   uid/gidlist - for determining access rights
++ *   mechanism type
++ *   mechanism specific information, such as a key
++ *
++ */
++
++#include <linux/types.h>
++#include <linux/module.h>
++#include <linux/pagemap.h>
++
++#include <linux/sunrpc/auth_gss.h>
++#include <linux/sunrpc/svcauth.h>
++#include <linux/sunrpc/gss_err.h>
++#include <linux/sunrpc/svcauth.h>
++#include <linux/sunrpc/svcauth_gss.h>
++#include <linux/sunrpc/cache.h>
++
++#ifdef RPC_DEBUG
++# define RPCDBG_FACILITY	RPCDBG_AUTH
++#endif
++
++/* The rpcsec_init cache is used for mapping RPCSEC_GSS_{,CONT_}INIT requests
++ * into replies.
++ *
++ * Key is context handle (\x if empty) and gss_token.
++ * Content is major_status minor_status (integers) context_handle, reply_token.
++ *
++ */
++
++static int netobj_equal(struct xdr_netobj *a, struct xdr_netobj *b)
++{
++	return a->len == b->len && 0 == memcmp(a->data, b->data, a->len);
++}
++
++#define	RSI_HASHBITS	6
++#define	RSI_HASHMAX	(1<<RSI_HASHBITS)
++#define	RSI_HASHMASK	(RSI_HASHMAX-1)
++
++struct rsi {
++	struct cache_head	h;
++	struct xdr_netobj	in_handle, in_token;
++	struct xdr_netobj	out_handle, out_token;
++	int			major_status, minor_status;
++};
++
++static struct cache_head *rsi_table[RSI_HASHMAX];
++static struct cache_detail rsi_cache;
++static struct rsi *rsi_lookup(struct rsi *item, int set);
++
++static void rsi_free(struct rsi *rsii)
++{
++	kfree(rsii->in_handle.data);
++	kfree(rsii->in_token.data);
++	kfree(rsii->out_handle.data);
++	kfree(rsii->out_token.data);
++}
++
++static void rsi_put(struct cache_head *item, struct cache_detail *cd)
++{
++	struct rsi *rsii = container_of(item, struct rsi, h);
++	if (cache_put(item, cd)) {
++		rsi_free(rsii);
++		kfree(rsii);
++	}
++}
++
++static inline int rsi_hash(struct rsi *item)
++{
++	return hash_mem(item->in_handle.data, item->in_handle.len, RSI_HASHBITS)
++	     ^ hash_mem(item->in_token.data, item->in_token.len, RSI_HASHBITS);
++}
++
++static inline int rsi_match(struct rsi *item, struct rsi *tmp)
++{
++	return netobj_equal(&item->in_handle, &tmp->in_handle)
++		&& netobj_equal(&item->in_token, &tmp->in_token);
++}
++
++static int dup_to_netobj(struct xdr_netobj *dst, char *src, int len)
++{
++	dst->len = len;
++	dst->data = (len ? kmalloc(len, GFP_KERNEL) : NULL);
++	if (dst->data)
++		memcpy(dst->data, src, len);
++	if (len && !dst->data)
++		return -ENOMEM;
++	return 0;
++}
++
++static inline int dup_netobj(struct xdr_netobj *dst, struct xdr_netobj *src)
++{
++	return dup_to_netobj(dst, src->data, src->len);
++}
++
++static inline void rsi_init(struct rsi *new, struct rsi *item)
++{
++	new->out_handle.data = NULL;
++	new->out_handle.len = 0;
++	new->out_token.data = NULL;
++	new->out_token.len = 0;
++	new->in_handle.len = item->in_handle.len;
++	new->in_handle.data = item->in_handle.data;
++	item->in_handle.len = 0;
++	item->in_handle.data = NULL;
++	new->in_token.len = item->in_token.len;
++	new->in_token.data = item->in_token.data;
++	item->in_token.len = 0;
++	item->in_token.data = NULL;
++	return;
++}
++
++static inline void rsi_update(struct rsi *new, struct rsi *item)
++{
++	BUG_ON(new->out_handle.data || new->out_token.data);
++	new->out_handle.len = item->out_handle.len;
++	item->out_handle.len = 0;
++	new->out_token.len = item->out_token.len;
++	item->out_token.len = 0;
++	new->out_handle.data = item->out_handle.data;
++	item->out_handle.data = NULL;
++	new->out_token.data = item->out_token.data;
++	item->out_token.data = NULL;
++
++	new->major_status = item->major_status;
++	new->minor_status = item->minor_status;
++}
++
++static void rsi_request(struct cache_detail *cd,
++                       struct cache_head *h,
++                       char **bpp, int *blen)
++{
++	struct rsi *rsii = container_of(h, struct rsi, h);
++
++	qword_addhex(bpp, blen, rsii->in_handle.data, rsii->in_handle.len);
++	qword_addhex(bpp, blen, rsii->in_token.data, rsii->in_token.len);
++	(*bpp)[-1] = '\n';
++}
++
++
++static int rsi_parse(struct cache_detail *cd,
++                    char *mesg, int mlen)
++{
++	/* context token expiry major minor context token */
++	char *buf = mesg;
++	char *ep;
++	int len;
++	struct rsi rsii, *rsip = NULL;
++	time_t expiry;
++	int status = -EINVAL;
++
++	memset(&rsii, 0, sizeof(rsii));
++	/* handle */
++	len = qword_get(&mesg, buf, mlen);
++	if (len < 0)
++		goto out;
++	status = -ENOMEM;
++	if (dup_to_netobj(&rsii.in_handle, buf, len))
++		goto out;
++
++	/* token */
++	len = qword_get(&mesg, buf, mlen);
++	status = -EINVAL;
++	if (len < 0)
++		goto out;;
++	status = -ENOMEM;
++	if (dup_to_netobj(&rsii.in_token, buf, len))
++		goto out;
++
++	rsii.h.flags = 0;
++	/* expiry */
++	expiry = get_expiry(&mesg);
++	status = -EINVAL;
++	if (expiry == 0)
++		goto out;
++
++	/* major/minor */
++	len = qword_get(&mesg, buf, mlen);
++	if (len < 0)
++		goto out;
++	if (len == 0) {
++		goto out;
++	} else {
++		rsii.major_status = simple_strtoul(buf, &ep, 10);
++		if (*ep)
++			goto out;
++		len = qword_get(&mesg, buf, mlen);
++		if (len <= 0)
++			goto out;
++		rsii.minor_status = simple_strtoul(buf, &ep, 10);
++		if (*ep)
++			goto out;
++
++		/* out_handle */
++		len = qword_get(&mesg, buf, mlen);
++		if (len < 0)
++			goto out;
++		status = -ENOMEM;
++		if (dup_to_netobj(&rsii.out_handle, buf, len))
++			goto out;
++
++		/* out_token */
++		len = qword_get(&mesg, buf, mlen);
++		status = -EINVAL;
++		if (len < 0)
++			goto out;
++		status = -ENOMEM;
++		if (dup_to_netobj(&rsii.out_token, buf, len))
++			goto out;
++	}
++	rsii.h.expiry_time = expiry;
++	rsip = rsi_lookup(&rsii, 1);
++	status = 0;
++out:
++	rsi_free(&rsii);
++	if (rsip)
++		rsi_put(&rsip->h, &rsi_cache);
++	return status;
++}
++
++static struct cache_detail rsi_cache = {
++	.hash_size	= RSI_HASHMAX,
++	.hash_table     = rsi_table,
++	.name           = "auth.rpcsec.init",
++	.cache_put      = rsi_put,
++	.cache_request  = rsi_request,
++	.cache_parse    = rsi_parse,
++};
++
++static DefineSimpleCacheLookup(rsi, 0)
++
++/*
++ * The rpcsec_context cache is used to store a context that is
++ * used in data exchange.
++ * The key is a context handle. The content is:
++ *  uid, gidlist, mechanism, service-set, mech-specific-data
++ */
++
++#define	RSC_HASHBITS	10
++#define	RSC_HASHMAX	(1<<RSC_HASHBITS)
++#define	RSC_HASHMASK	(RSC_HASHMAX-1)
++
++#define GSS_SEQ_WIN	128
++
++struct gss_svc_seq_data {
++	/* highest seq number seen so far: */
++	int			sd_max;
++	/* for i such that sd_max-GSS_SEQ_WIN < i <= sd_max, the i-th bit of
++	 * sd_win is nonzero iff sequence number i has been seen already: */
++	unsigned long		sd_win[GSS_SEQ_WIN/BITS_PER_LONG];
++	spinlock_t		sd_lock;
++};
++
++struct rsc {
++	struct cache_head	h;
++	struct xdr_netobj	handle;
++	struct svc_cred		cred;
++	struct gss_svc_seq_data	seqdata;
++	struct gss_ctx		*mechctx;
++};
++
++static struct cache_head *rsc_table[RSC_HASHMAX];
++static struct cache_detail rsc_cache;
++static struct rsc *rsc_lookup(struct rsc *item, int set);
++
++static void rsc_free(struct rsc *rsci)
++{
++	kfree(rsci->handle.data);
++	if (rsci->mechctx)
++		gss_delete_sec_context(&rsci->mechctx);
++}
++
++static void rsc_put(struct cache_head *item, struct cache_detail *cd)
++{
++	struct rsc *rsci = container_of(item, struct rsc, h);
++
++	if (cache_put(item, cd)) {
++		rsc_free(rsci);
++		kfree(rsci);
++	}
++}
++
++static inline int
++rsc_hash(struct rsc *rsci)
++{
++	return hash_mem(rsci->handle.data, rsci->handle.len, RSC_HASHBITS);
++}
++
++static inline int
++rsc_match(struct rsc *new, struct rsc *tmp)
++{
++	return netobj_equal(&new->handle, &tmp->handle);
++}
++
++static inline void
++rsc_init(struct rsc *new, struct rsc *tmp)
++{
++	new->mechctx = NULL;
++	new->handle.len = tmp->handle.len;
++	new->handle.data = tmp->handle.data;
++	tmp->handle.len = 0;
++	tmp->handle.data = NULL;
++}
++
++static inline void
++rsc_update(struct rsc *new, struct rsc *tmp)
++{
++	new->mechctx = tmp->mechctx;
++	tmp->mechctx = NULL;
++	memset(&new->seqdata, 0, sizeof(new->seqdata));
++	spin_lock_init(&new->seqdata.sd_lock);
++	new->cred = tmp->cred;
++}
++
++static int rsc_parse(struct cache_detail *cd,
++		     char *mesg, int mlen)
++{
++	/* contexthandle expiry [ uid gid N <n gids> mechname ...mechdata... ] */
++	char *buf = mesg;
++	int len, rv;
++	struct rsc rsci, *rscp = NULL;
++	time_t expiry;
++	int status = -EINVAL;
++
++	memset(&rsci, 0, sizeof(rsci));
++	/* context handle */
++	len = qword_get(&mesg, buf, mlen);
++	if (len < 0) goto out;
++	status = -ENOMEM;
++	if (dup_to_netobj(&rsci.handle, buf, len))
++		goto out;
++
++	rsci.h.flags = 0;
++	/* expiry */
++	expiry = get_expiry(&mesg);
++	status = -EINVAL;
++	if (expiry == 0)
++		goto out;
++
++	/* uid, or NEGATIVE */
++	rv = get_int(&mesg, &rsci.cred.cr_uid);
++	if (rv == -EINVAL)
++		goto out;
++	if (rv == -ENOENT)
++		set_bit(CACHE_NEGATIVE, &rsci.h.flags);
++	else {
++		int N, i;
++		struct gss_api_mech *gm;
++		struct xdr_netobj tmp_buf;
++
++		/* gid */
++		if (get_int(&mesg, &rsci.cred.cr_gid))
++			goto out;
++
++		/* number of additional gid's */
++		if (get_int(&mesg, &N))
++			goto out;
++		if (N > NGROUPS)
++			goto out;
++
++		/* gid's */
++		for (i=0; i<N; i++) {
++			if (get_int(&mesg, &rsci.cred.cr_groups[i]))
++				goto out;
++		}
++		if (N < NGROUPS)
++			rsci.cred.cr_groups[N] = NOGROUP;
++
++		/* mech name */
++		len = qword_get(&mesg, buf, mlen);
++		if (len < 0)
++			goto out;
++		gm = gss_mech_get_by_name(buf);
++		status = -EOPNOTSUPP;
++		if (!gm)
++			goto out;
++
++		status = -EINVAL;
++		/* mech-specific data: */
++		len = qword_get(&mesg, buf, mlen);
++		if (len < 0) {
++			gss_mech_put(gm);
++			goto out;
++		}
++		tmp_buf.len = len;
++		tmp_buf.data = buf;
++		if (gss_import_sec_context(&tmp_buf, gm, &rsci.mechctx)) {
++			gss_mech_put(gm);
++			goto out;
++		}
++		gss_mech_put(gm);
++	}
++	rsci.h.expiry_time = expiry;
++	rscp = rsc_lookup(&rsci, 1);
++	status = 0;
++out:
++	rsc_free(&rsci);
++	if (rscp)
++		rsc_put(&rscp->h, &rsc_cache);
++	return status;
++}
++
++static struct cache_detail rsc_cache = {
++	.hash_size	= RSC_HASHMAX,
++	.hash_table	= rsc_table,
++	.name		= "auth.rpcsec.context",
++	.cache_put	= rsc_put,
++	.cache_parse	= rsc_parse,
++};
++
++static DefineSimpleCacheLookup(rsc, 0);
++
++struct rsc *
++gss_svc_searchbyctx(struct xdr_netobj *handle)
++{
++	struct rsc rsci;
++	struct rsc *found;
++
++	rsci.handle = *handle;
++	found = rsc_lookup(&rsci, 0);
++	if (!found)
++		return NULL;
++	if (cache_check(&rsc_cache, &found->h, NULL))
++		return NULL;
++	return found;
++}
++
++/* Implements sequence number algorithm as specified in RFC 2203. */
++static int
++gss_check_seq_num(struct rsc *rsci, int seq_num)
++{
++	struct gss_svc_seq_data *sd = &rsci->seqdata;
++
++	spin_lock(&sd->sd_lock);
++	if (seq_num > sd->sd_max) {
++		if (seq_num >= sd->sd_max + GSS_SEQ_WIN) {
++			memset(sd->sd_win,0,sizeof(sd->sd_win));
++			sd->sd_max = seq_num;
++		} else while (sd->sd_max < seq_num) {
++			sd->sd_max++;
++			__clear_bit(sd->sd_max % GSS_SEQ_WIN, sd->sd_win);
++		}
++		__set_bit(seq_num % GSS_SEQ_WIN, sd->sd_win);
++		goto ok;
++	} else if (seq_num <= sd->sd_max - GSS_SEQ_WIN) {
++		goto drop;
++	}
++	/* sd_max - GSS_SEQ_WIN < seq_num <= sd_max */
++	if (__test_and_set_bit(seq_num % GSS_SEQ_WIN, sd->sd_win))
++		goto drop;
++ok:
++	spin_unlock(&sd->sd_lock);
++	return 1;
++drop:
++	spin_unlock(&sd->sd_lock);
++	return 0;
++}
++
++static inline u32 round_up_to_quad(u32 i)
++{
++	return (i + 3 ) & ~3;
++}
++
++static inline int
++svc_safe_getnetobj(struct iovec *argv, struct xdr_netobj *o)
++{
++	int l;
++
++	if (argv->iov_len < 4)
++		return -1;
++	o->len = ntohl(svc_getu32(argv));
++	l = round_up_to_quad(o->len);
++	if (argv->iov_len < l)
++		return -1;
++	o->data = argv->iov_base;
++	argv->iov_base += l;
++	argv->iov_len -= l;
++	return 0;
++}
++
++static inline int
++svc_safe_putnetobj(struct iovec *resv, struct xdr_netobj *o)
++{
++	u32 *p;
++
++	if (resv->iov_len + 4 > PAGE_SIZE)
++		return -1;
++	svc_putu32(resv, htonl(o->len));
++	p = resv->iov_base + resv->iov_len;
++	resv->iov_len += round_up_to_quad(o->len);
++	if (resv->iov_len > PAGE_SIZE)
++		return -1;
++	memcpy(p, o->data, o->len);
++	memset((u8 *)p + o->len, 0, round_up_to_quad(o->len) - o->len);
++	return 0;
++}
++
++/* Verify the checksum on the header and return SVC_OK on success.
++ * Otherwise, return SVC_DROP (in the case of a bad sequence number)
++ * or return SVC_DENIED and indicate error in authp.
++ */
++static int
++gss_verify_header(struct svc_rqst *rqstp, struct rsc *rsci,
++		  u32 *rpcstart, struct rpc_gss_wire_cred *gc, u32 *authp)
++{
++	struct gss_ctx		*ctx_id = rsci->mechctx;
++	struct xdr_buf		rpchdr;
++	struct xdr_netobj	checksum;
++	u32			flavor = 0;
++	struct iovec		*argv = &rqstp->rq_arg.head[0];
++	struct iovec		iov;
++
++	/* data to compute the checksum over: */
++	iov.iov_base = rpcstart;
++	iov.iov_len = (u8 *)argv->iov_base - (u8 *)rpcstart;
++	xdr_buf_from_iov(&iov, &rpchdr);
++
++	*authp = rpc_autherr_badverf;
++	if (argv->iov_len < 4)
++		return SVC_DENIED;
++	flavor = ntohl(svc_getu32(argv));
++	if (flavor != RPC_AUTH_GSS)
++		return SVC_DENIED;
++	if (svc_safe_getnetobj(argv, &checksum))
++		return SVC_DENIED;
++
++	if (rqstp->rq_deferred) /* skip verification of revisited request */
++		return SVC_OK;
++	if (gss_verify_mic(ctx_id, &rpchdr, &checksum, NULL)
++							!= GSS_S_COMPLETE) {
++		*authp = rpcsec_gsserr_credproblem;
++		return SVC_DENIED;
++	}
++
++	if (gc->gc_seq > MAXSEQ) {
++		dprintk("RPC:      svcauth_gss: discarding request with large sequence number %d\n",
++				gc->gc_seq);
++		*authp = rpcsec_gsserr_ctxproblem;
++		return SVC_DENIED;
++	}
++	if (!gss_check_seq_num(rsci, gc->gc_seq)) {
++		dprintk("RPC:      svcauth_gss: discarding request with old sequence number %d\n",
++				gc->gc_seq);
++		return SVC_DROP;
++	}
++	return SVC_OK;
++}
++
++static int
++gss_write_verf(struct svc_rqst *rqstp, struct gss_ctx *ctx_id, u32 seq)
++{
++	u32			xdr_seq;
++	u32			maj_stat;
++	struct xdr_buf		verf_data;
++	struct xdr_netobj	mic;
++	u32			*p;
++	struct iovec		iov;
++
++	svc_putu32(rqstp->rq_res.head, htonl(RPC_AUTH_GSS));
++	xdr_seq = htonl(seq);
++
++	iov.iov_base = &xdr_seq;
++	iov.iov_len = sizeof(xdr_seq);
++	xdr_buf_from_iov(&iov, &verf_data);
++	p = rqstp->rq_res.head->iov_base + rqstp->rq_res.head->iov_len;
++	mic.data = (u8 *)(p + 1);
++	maj_stat = gss_get_mic(ctx_id, 0, &verf_data, &mic);
++	if (maj_stat != GSS_S_COMPLETE)
++		return -1;
++	*p++ = htonl(mic.len);
++	memset((u8 *)p + mic.len, 0, round_up_to_quad(mic.len) - mic.len);
++	p += XDR_QUADLEN(mic.len);
++	if (!xdr_ressize_check(rqstp, p))
++		return -1;
++	return 0;
++}
++
++struct gss_domain {
++	struct auth_domain	h;
++	u32			pseudoflavor;
++};
++
++/* XXX this should be done in gss_pseudoflavors, and shouldn't be hardcoded: */
++static struct auth_domain *
++find_gss_auth_domain(struct gss_ctx *ctx, u32 svc)
++{
++	switch(gss_get_pseudoflavor(ctx, 0, svc)) {
++		case RPC_AUTH_GSS_KRB5:
++			return auth_domain_find("gss/krb5");
++		case RPC_AUTH_GSS_KRB5I:
++			return auth_domain_find("gss/krb5i");
++		case RPC_AUTH_GSS_KRB5P:
++			return auth_domain_find("gss/krb5p");
++	}
++	return NULL;
++}
++
++int
++svcauth_gss_register_pseudoflavor(u32 pseudoflavor, char * name)
++{
++	struct gss_domain	*new;
++	struct auth_domain	*test;
++	static char		*prefix = "gss/";
++	int			stat = -1;
++
++	new = kmalloc(sizeof(*new), GFP_KERNEL);
++	if (!new)
++		goto out;
++	cache_init(&new->h.h);
++	atomic_inc(&new->h.h.refcnt);
++	new->h.name = kmalloc(strlen(name) + strlen(prefix) + 1, GFP_KERNEL);
++	if (!new->h.name)
++		goto out_free_dom;
++	strcpy(new->h.name, prefix);
++	strcat(new->h.name, name);
++	new->h.flavour = RPC_AUTH_GSS;
++	new->pseudoflavor = pseudoflavor;
++	new->h.h.expiry_time = NEVER;
++	new->h.h.flags = 0;
++
++	test = auth_domain_lookup(&new->h, 1);
++	if (test == &new->h) {
++		BUG_ON(atomic_dec_and_test(&new->h.h.refcnt));
++	} else { /* XXX Duplicate registration? */
++		auth_domain_put(&new->h);
++		goto out;
++	}
++	return 0;
++
++out_free_dom:
++	kfree(new);
++out:
++	return stat;
++}
++
++/* It would be nice if this bit of code could be shared with the client.
++ * Obstacles:
++ *	The client shouldn't malloc(), would have to pass in own memory.
++ *	The server uses base of head iovec as read pointer, while the
++ *	client uses separate pointer. */
++static int
++unwrap_integ_data(struct xdr_buf *buf, u32 seq, struct gss_ctx *ctx)
++{
++	/* XXX audit u32/int uses, sign/overflow issues */
++	int stat = -EINVAL;
++	u32 integ_len, maj_stat;
++	struct xdr_netobj mic;
++	struct xdr_buf integ_buf;
++
++	integ_len = ntohl(svc_getu32(&buf->head[0]));
++	if (integ_len & 3)
++		goto out;
++	if (integ_len > buf->len)
++		goto out;
++	if (xdr_buf_subsegment(buf, &integ_buf, 0, integ_len))
++		goto out;
++	/* copy out mic... */
++	if (read_u32_from_xdr_buf(buf, integ_len, &mic.len))
++		goto out;
++	if (mic.len > 256) /* XXX: maximum mic length? */
++		goto out;
++	mic.data = kmalloc(mic.len, GFP_KERNEL);
++	if (read_bytes_from_xdr_buf(buf, integ_len + 4, mic.data, mic.len))
++		goto out;
++	maj_stat = gss_verify_mic(ctx, &integ_buf, &mic, NULL);
++	if (maj_stat != GSS_S_COMPLETE)
++		goto out;
++	if (ntohl(svc_getu32(&buf->head[0])) != seq)
++		goto out;
++	stat = 0;
++out:
++	return stat;
++}
++
++/*
++ * Accept an rpcsec packet.
++ * If context establishment, punt to user space
++ * If data exchange, verify/decrypt
++ * If context destruction, handle here
++ * In the context establishment and destruction case we encode
++ * response here and return SVC_COMPLETE.
++ */
++static int
++svcauth_gss_accept(struct svc_rqst *rqstp, u32 *authp)
++{
++	struct iovec	*argv = &rqstp->rq_arg.head[0];
++	struct iovec	*resv = &rqstp->rq_res.head[0];
++	u32		crlen;
++	struct xdr_netobj tmpobj;
++	struct gss_svc_data *svcdata = rqstp->rq_auth_data;
++	struct rpc_gss_wire_cred *gc;
++	struct rsc	*rsci = NULL;
++	struct rsi	*rsip, rsikey;
++	u32		*rpcstart;
++	u32		*reject_stat = resv->iov_base;
++	int		ret;
++
++	dprintk("RPC:      svcauth_gss: argv->iov_len = %d\n", argv->iov_len);
++
++	*authp = rpc_autherr_badcred;
++	if (!svcdata)
++		svcdata = kmalloc(sizeof(*svcdata), GFP_KERNEL);
++	if (!svcdata)
++		goto auth_err;
++	rqstp->rq_auth_data = svcdata;
++	gc = &svcdata->clcred;
++	
++	/* start of rpc packet is 7 u32's back from here:
++	 * xid direction rpcversion prog vers proc flavour
++	 */
++	rpcstart = argv->iov_base;
++	rpcstart -= 7;
++
++	/* credential is:
++	 *   version(==1), proc(0,1,2,3), seq, service (1,2,3), handle
++	 * at least 5 u32s, and is preceeded by length, so that makes 6.
++	 */
++
++	if (argv->iov_len < 5 * 4)
++		goto auth_err;
++	crlen = ntohl(svc_getu32(argv));
++	if (ntohl(svc_getu32(argv)) != RPC_GSS_VERSION)
++		goto auth_err;
++	gc->gc_proc = ntohl(svc_getu32(argv));
++	gc->gc_seq = ntohl(svc_getu32(argv));
++	gc->gc_svc = ntohl(svc_getu32(argv));
++	if (svc_safe_getnetobj(argv, &gc->gc_ctx))
++		goto auth_err;
++	if (crlen != round_up_to_quad(gc->gc_ctx.len) + 5 * 4)
++		goto auth_err;
++
++	if ((gc->gc_proc != RPC_GSS_PROC_DATA) && (rqstp->rq_proc != 0))
++		goto auth_err;
++
++	/*
++	 * We've successfully parsed the credential. Let's check out the
++	 * verifier.  An AUTH_NULL verifier is allowed (and required) for
++	 * INIT and CONTINUE_INIT requests. AUTH_RPCSEC_GSS is required for
++	 * PROC_DATA and PROC_DESTROY.
++	 *
++	 * AUTH_NULL verifier is 0 (AUTH_NULL), 0 (length).
++	 * AUTH_RPCSEC_GSS verifier is:
++	 *   6 (AUTH_RPCSEC_GSS), length, checksum.
++	 * checksum is calculated over rpcheader from xid up to here.
++	 */
++	*authp = rpc_autherr_badverf;
++	switch (gc->gc_proc) {
++	case RPC_GSS_PROC_INIT:
++	case RPC_GSS_PROC_CONTINUE_INIT:
++		if (argv->iov_len < 2 * 4)
++			goto auth_err;
++		if (ntohl(svc_getu32(argv)) != RPC_AUTH_NULL)
++			goto auth_err;
++		if (ntohl(svc_getu32(argv)) != 0)
++			goto auth_err;
++		break;
++	case RPC_GSS_PROC_DATA:
++	case RPC_GSS_PROC_DESTROY:
++		*authp = rpcsec_gsserr_credproblem;
++		rsci = gss_svc_searchbyctx(&gc->gc_ctx);
++		if (!rsci)
++			goto auth_err;
++		switch (gss_verify_header(rqstp, rsci, rpcstart, gc, authp)) {
++		case SVC_OK:
++			break;
++		case SVC_DENIED:
++			goto auth_err;
++		case SVC_DROP:
++			goto drop;
++		}
++		break;
++	default:
++		*authp = rpc_autherr_rejectedcred;
++		goto auth_err;
++	}
++
++	/* now act upon the command: */
++	switch (gc->gc_proc) {
++	case RPC_GSS_PROC_INIT:
++	case RPC_GSS_PROC_CONTINUE_INIT:
++		*authp = rpc_autherr_badcred;
++		if (gc->gc_proc == RPC_GSS_PROC_INIT && gc->gc_ctx.len != 0)
++			goto auth_err;
++		memset(&rsikey, 0, sizeof(rsikey));
++		if (dup_netobj(&rsikey.in_handle, &gc->gc_ctx))
++			goto drop;
++		*authp = rpc_autherr_badverf;
++		if (svc_safe_getnetobj(argv, &tmpobj)) {
++			kfree(rsikey.in_handle.data);
++			goto auth_err;
++		}
++		if (dup_netobj(&rsikey.in_token, &tmpobj)) {
++			kfree(rsikey.in_handle.data);
++			goto drop;
++		}
++
++		rsip = rsi_lookup(&rsikey, 0);
++		rsi_free(&rsikey);
++		if (!rsip) {
++			goto drop;
++		}
++		switch(cache_check(&rsi_cache, &rsip->h, &rqstp->rq_chandle)) {
++		case -EAGAIN:
++			goto drop;
++		case -ENOENT:
++			goto drop;
++		case 0:
++			rsci = gss_svc_searchbyctx(&rsip->out_handle);
++			if (!rsci) {
++				goto drop;
++			}
++			if (gss_write_verf(rqstp, rsci->mechctx, GSS_SEQ_WIN))
++				goto drop;
++			if (resv->iov_len + 4 > PAGE_SIZE)
++				goto drop;
++			svc_putu32(resv, rpc_success);
++			if (svc_safe_putnetobj(resv, &rsip->out_handle))
++				goto drop;
++			if (resv->iov_len + 3 * 4 > PAGE_SIZE)
++				goto drop;
++			svc_putu32(resv, htonl(rsip->major_status));
++			svc_putu32(resv, htonl(rsip->minor_status));
++			svc_putu32(resv, htonl(GSS_SEQ_WIN));
++			if (svc_safe_putnetobj(resv, &rsip->out_token))
++				goto drop;
++			rqstp->rq_client = NULL;
++		}
++		goto complete;
++	case RPC_GSS_PROC_DESTROY:
++		set_bit(CACHE_NEGATIVE, &rsci->h.flags);
++		if (resv->iov_len + 4 > PAGE_SIZE)
++			goto drop;
++		svc_putu32(resv, rpc_success);
++		goto complete;
++	case RPC_GSS_PROC_DATA:
++		rqstp->rq_client =
++			find_gss_auth_domain(rsci->mechctx, gc->gc_svc);
++		if (rqstp->rq_client == NULL)
++			goto auth_err;
++		*authp = rpcsec_gsserr_ctxproblem;
++		if (gss_write_verf(rqstp, rsci->mechctx, gc->gc_seq))
++			goto auth_err;
++
++		rqstp->rq_cred = rsci->cred;
++
++		*authp = rpc_autherr_badcred;
++		switch (gc->gc_svc) {
++		case RPC_GSS_SVC_NONE:
++			break;
++		case RPC_GSS_SVC_INTEGRITY:
++			if (unwrap_integ_data(&rqstp->rq_arg,
++					gc->gc_seq, rsci->mechctx))
++				goto auth_err;
++			/* placeholders for length and seq. number: */
++			svcdata->body_start = resv->iov_base + resv->iov_len;
++			svc_putu32(resv, 0);
++			svc_putu32(resv, 0);
++			break;
++		case RPC_GSS_SVC_PRIVACY:
++			/* currently unsupported */
++		default:
++			goto auth_err;
++		}
++		ret = SVC_OK;
++		goto out;
++	}
++auth_err:
++	/* Restore write pointer to original value: */
++	xdr_ressize_check(rqstp, reject_stat);
++	ret = SVC_DENIED;
++	goto out;
++complete:
++	ret = SVC_COMPLETE;
++	goto out;
++drop:
++	ret = SVC_DROP;
++out:
++	if (rsci)
++		rsc_put(&rsci->h, &rsc_cache);
++	return ret;
++}
++
++static int
++svcauth_gss_release(struct svc_rqst *rqstp)
++{
++	struct gss_svc_data *gsd = (struct gss_svc_data *)rqstp->rq_auth_data;
++	struct rpc_gss_wire_cred *gc = &gsd->clcred;
++	struct xdr_buf *resbuf = &rqstp->rq_res;
++	struct xdr_buf integ_buf;
++	struct xdr_netobj mic;
++	struct iovec *resv;
++	u32 *p;
++	int integ_offset, integ_len;
++	struct rsc *rsci;
++	int stat = -EINVAL;
++
++	/* normally not set till svc_send, but we need it here: */
++	resbuf->len = resbuf->head[0].iov_len
++		+ resbuf->page_len + resbuf->tail[0].iov_len;
++	switch (gc->gc_svc) {
++	case RPC_GSS_SVC_NONE:
++		break;
++	case RPC_GSS_SVC_INTEGRITY:
++		p = gsd->body_start;
++		/* move accept_stat to right place: */
++		memcpy(p, p + 2, 4);
++		p++;
++		integ_offset = (u8 *)(p + 1) - (u8 *)resbuf->head[0].iov_base;
++		integ_len = resbuf->len - integ_offset;
++		BUG_ON(integ_len % 4);
++		*p++ = htonl(integ_len);
++		*p++ = htonl(gc->gc_seq);
++		if (xdr_buf_subsegment(resbuf, &integ_buf, integ_offset,
++					integ_len))
++			goto out;
++		if (resbuf->page_len == 0) {
++			BUG_ON(resbuf->tail[0].iov_len);
++			/* Use head for everything */
++			resv = &resbuf->head[0];
++		} else if (resbuf->tail[0].iov_base == NULL) {
++			/* copied from nfsd4_encode_read */
++			svc_take_page(rqstp);
++			resbuf->tail[0].iov_base = page_address(rqstp
++					->rq_respages[rqstp->rq_resused-1]);
++			rqstp->rq_restailpage = rqstp->rq_resused-1;
++			resbuf->tail[0].iov_len = 0;
++			resv = &resbuf->tail[0];
++		} else {
++			resv = &resbuf->tail[0];
++		}
++		/* XXX bounds checking!: */
++		mic.data = (u8 *)resv->iov_base + resv->iov_len + 4;
++		rsci = gss_svc_searchbyctx(&gc->gc_ctx);
++		/* Better error return? Hold count on ctx through
++		 * processing instead of looking up again? */
++		if (!rsci)
++			goto out;
++		/* XXX Whoops, we might overflow here: */
++		if (gss_get_mic(rsci->mechctx, 0, &integ_buf, &mic))
++			goto out;
++		svc_putu32(resv, htonl(mic.len));
++		resv->iov_len += mic.len;
++		resbuf->len += mic.len; /* not strictly necessary */
++		/* XXX too late, alas: */
++		if (resbuf->len > PAGE_SIZE)
++			goto out;
++		break;
++	case RPC_GSS_SVC_PRIVACY:
++	default:
++		goto out;
++	}
++
++	stat = 0;
++out:
++	if (rqstp->rq_client)
++		auth_domain_put(rqstp->rq_client);
++	rqstp->rq_client = NULL;
++
++	return stat;
++}
++
++static void
++svcauth_gss_domain_release(struct auth_domain *dom)
++{
++	struct gss_domain *gd = container_of(dom, struct gss_domain, h);
++
++	kfree(dom->name);
++	kfree(gd);
++}
++
++struct auth_ops svcauthops_gss = {
++	.name		= "rpcsec_gss",
++	.flavour	= RPC_AUTH_GSS,
++	.accept		= svcauth_gss_accept,
++	.release	= svcauth_gss_release,
++	.domain_release = svcauth_gss_domain_release,
++};
++
++int
++gss_svc_init(void)
++{
++	cache_register(&rsc_cache);
++	cache_register(&rsi_cache);
++	svc_auth_register(RPC_AUTH_GSS, &svcauthops_gss);
++	return 0;
++}
+diff -puN net/sunrpc/svc.c~CITI_NFS4_ALL net/sunrpc/svc.c
+--- linux-2.6.3/net/sunrpc/svc.c~CITI_NFS4_ALL	2004-02-19 16:47:04.000000000 -0500
++++ linux-2.6.3-bfields/net/sunrpc/svc.c	2004-02-19 16:47:04.000000000 -0500
+@@ -200,6 +200,8 @@ svc_exit_thread(struct svc_rqst *rqstp)
+ 		kfree(rqstp->rq_resp);
+ 	if (rqstp->rq_argp)
+ 		kfree(rqstp->rq_argp);
++	if (rqstp->rq_auth_data)
++		kfree(rqstp->rq_auth_data);
+ 	kfree(rqstp);
+ 
+ 	/* Release the server */
+@@ -322,6 +324,8 @@ svc_process(struct svc_serv *serv, struc
+ 		goto err_bad_auth;
+ 	case SVC_DROP:
+ 		goto dropit;
++	case SVC_COMPLETE:
++		goto sendit;
+ 	}
+ 		
+ 	progp = serv->sv_program;
+diff -puN net/sunrpc/Makefile~CITI_NFS4_ALL net/sunrpc/Makefile
+--- linux-2.6.3/net/sunrpc/Makefile~CITI_NFS4_ALL	2004-02-19 16:47:05.000000000 -0500
++++ linux-2.6.3-bfields/net/sunrpc/Makefile	2004-02-19 16:47:05.000000000 -0500
+@@ -2,9 +2,9 @@
+ # Makefile for Linux kernel SUN RPC
+ #
+ 
+-obj-$(CONFIG_SUNRPC_GSS) += auth_gss/
+ 
+ obj-$(CONFIG_SUNRPC) += sunrpc.o
++obj-$(CONFIG_SUNRPC_GSS) += auth_gss/
+ 
+ sunrpc-y := clnt.o xprt.o sched.o \
+ 	    auth.o auth_null.o auth_unix.o \
+diff -puN fs/nfsd/nfs4proc.c~CITI_NFS4_ALL fs/nfsd/nfs4proc.c
+--- linux-2.6.3/fs/nfsd/nfs4proc.c~CITI_NFS4_ALL	2004-02-19 16:47:05.000000000 -0500
++++ linux-2.6.3-bfields/fs/nfsd/nfs4proc.c	2004-02-19 16:47:15.000000000 -0500
+@@ -52,15 +52,22 @@
+ #include <linux/nfs4.h>
+ #include <linux/nfsd/state.h>
+ #include <linux/nfsd/xdr4.h>
++#ifdef CONFIG_NFS_V4_ACL
++#include <linux/nfs4_acl.h>
++#endif
+ 
+ #define NFSDDBG_FACILITY		NFSDDBG_PROC
+ 
+-/* Note: The organization of the OPEN code seems a little strange; it
+- * has been superfluously split into three routines, one of which is named
+- * nfsd4_process_open2() even though there is no nfsd4_process_open1()!
+- * This is because the code has been organized in anticipation of a
+- * subsequent patch which will implement more of the NFSv4 state model.
+- */
++static inline void
++fh_dup2(struct svc_fh *dst, struct svc_fh *src)
++{
++	fh_put(dst);
++	dget(src->fh_dentry);
++	if (src->fh_export)
++		cache_get(&src->fh_export->h);
++	*dst = *src;
++}
++
+ static int
+ do_open_lookup(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open *open)
+ {
+@@ -89,12 +96,19 @@ do_open_lookup(struct svc_rqst *rqstp, s
+ 	if (!status) {
+ 		set_change_info(&open->op_cinfo, current_fh);
+ 		fh_dup2(current_fh, &resfh);
++		/* XXXJBF: keep a saved svc_fh struct instead?? */
++		open->op_stateowner->so_replay.rp_openfh_len =
++			resfh.fh_handle.fh_size;
++		memcpy(open->op_stateowner->so_replay.rp_openfh,
++				&resfh.fh_handle.fh_base,
++				resfh.fh_handle.fh_size);
+ 
+ 		accmode = MAY_NOP;
+ 		if (open->op_share_access & NFS4_SHARE_ACCESS_READ)
+ 			accmode = MAY_READ;
+ 		if (open->op_share_deny & NFS4_SHARE_ACCESS_WRITE)
+ 			accmode |= (MAY_WRITE | MAY_TRUNC);
++		accmode |= MAY_OWNER_OVERRIDE;
+ 		status = fh_verify(rqstp, current_fh, S_IFREG, accmode);
+ 	}
+ 
+@@ -102,19 +116,39 @@ do_open_lookup(struct svc_rqst *rqstp, s
+ 	return status;
+ }
+ 
++/*
++ * nfs4_unlock_state() called in encode
++ */
+ static inline int
+ nfsd4_open(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open *open)
+ {
+ 	int status;
+-	dprintk("NFSD: nfsd4_open filename %.*s\n",
+-		(int)open->op_fname.len, open->op_fname.data);
++	dprintk("NFSD: nfsd4_open filename %.*s op_stateowner %p\n",
++		(int)open->op_fname.len, open->op_fname.data,
++		open->op_stateowner);
+ 
+ 	/* This check required by spec. */
+ 	if (open->op_create && open->op_claim_type != NFS4_OPEN_CLAIM_NULL)
+ 		return nfserr_inval;
+ 
++	open->op_stateowner = NULL;
++	nfs4_lock_state();
++
+ 	/* check seqid for replay. set nfs4_owner */
+ 	status = nfsd4_process_open1(open);
++	if (status == NFSERR_REPLAY_ME) {
++		struct nfs4_replay *rp = &open->op_stateowner->so_replay;
++		fh_put(current_fh);
++		current_fh->fh_handle.fh_size = rp->rp_openfh_len;
++		memcpy(&current_fh->fh_handle.fh_base, rp->rp_openfh,
++				rp->rp_openfh_len);
++		status = fh_verify(rqstp, current_fh, 0, MAY_NOP);
++		if (status)
++			dprintk("nfsd4_open: replay failed"
++				" restoring previous filehandle\n");
++		else
++			status = NFSERR_REPLAY_ME;
++	}
+ 	if (status)
+ 		return status;
+ 	/*
+@@ -172,7 +206,7 @@ static inline int
+ nfsd4_restorefh(struct svc_fh *current_fh, struct svc_fh *save_fh)
+ {
+ 	if (!save_fh->fh_dentry)
+-		return nfserr_nofilehandle;
++		return nfserr_restorefh;
+ 
+ 	fh_dup2(current_fh, save_fh);
+ 	return nfs_ok;
+@@ -204,11 +238,16 @@ nfsd4_access(struct svc_rqst *rqstp, str
+ static inline int
+ nfsd4_commit(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_commit *commit)
+ {
++	int status;
++
+ 	u32 *p = (u32 *)commit->co_verf.data;
+ 	*p++ = nfssvc_boot.tv_sec;
+ 	*p++ = nfssvc_boot.tv_usec;
+ 
+-	return nfsd_commit(rqstp, current_fh, commit->co_offset, commit->co_count);
++	status = nfsd_commit(rqstp, current_fh, commit->co_offset, commit->co_count);
++	if (status == nfserr_symlink)
++		status = nfserr_inval;
++	return status;
+ }
+ 
+ static inline int
+@@ -221,6 +260,8 @@ nfsd4_create(struct svc_rqst *rqstp, str
+ 	fh_init(&resfh, NFS4_FHSIZE);
+ 
+ 	status = fh_verify(rqstp, current_fh, S_IFDIR, MAY_CREATE);
++	if (status == nfserr_symlink)
++		status = nfserr_notdir;
+ 	if (status)
+ 		return status;
+ 
+@@ -316,8 +357,10 @@ static inline int
+ nfsd4_link(struct svc_rqst *rqstp, struct svc_fh *current_fh,
+ 	   struct svc_fh *save_fh, struct nfsd4_link *link)
+ {
+-	int status;
++	int status = nfserr_nofilehandle;
+ 
++	if (!save_fh->fh_dentry)
++		return status;
+ 	status = nfsd_link(rqstp, current_fh, link->li_name, link->li_namelen, save_fh);
+ 	if (!status)
+ 		set_change_info(&link->li_cinfo, current_fh);
+@@ -327,14 +370,18 @@ nfsd4_link(struct svc_rqst *rqstp, struc
+ static inline int
+ nfsd4_lookupp(struct svc_rqst *rqstp, struct svc_fh *current_fh)
+ {
+-	/*
+-	 * XXX: We currently violate the spec in one small respect
+-	 * here.  If LOOKUPP is done at the root of the pseudofs,
+-	 * the spec requires us to return NFSERR_NOENT.  Personally,
+-	 * I think that leaving the filehandle unchanged is more
+-	 * logical, but this is an academic question anyway, since
+-	 * no clients actually use LOOKUPP.
+-	 */
++	struct svc_fh tmp_fh;
++	int ret;
++
++	fh_init(&tmp_fh, NFS4_FHSIZE);
++	if((ret = exp_pseudoroot(rqstp->rq_client, &tmp_fh,
++			      &rqstp->rq_chandle)) != 0)
++		return ret;
++	if (tmp_fh.fh_dentry == current_fh->fh_dentry) {
++		fh_put(&tmp_fh);
++		return nfserr_noent;
++	}
++	fh_put(&tmp_fh);
+ 	return nfsd_lookup(rqstp, current_fh, "..", 2, current_fh);
+ }
+ 
+@@ -345,6 +392,20 @@ nfsd4_lookup(struct svc_rqst *rqstp, str
+ }
+ 
+ static inline int
++access_bits_permit_read(unsigned long access_bmap)
++{
++	return test_bit(NFS4_SHARE_ACCESS_READ, &access_bmap) ||
++		test_bit(NFS4_SHARE_ACCESS_BOTH, &access_bmap);
++}
++
++static inline int
++access_bits_permit_write(unsigned long access_bmap)
++{
++	return test_bit(NFS4_SHARE_ACCESS_WRITE, &access_bmap) ||
++		test_bit(NFS4_SHARE_ACCESS_BOTH, &access_bmap);
++}
++
++static inline int
+ nfsd4_read(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_read *read)
+ {
+ 	struct nfs4_stateid *stp;
+@@ -382,7 +443,7 @@ nfsd4_read(struct svc_rqst *rqstp, struc
+ 		goto out;
+ 	}
+ 	status = nfserr_openmode;
+-	if (!(stp->st_share_access & NFS4_SHARE_ACCESS_READ)) {
++	if (!access_bits_permit_read(stp->st_access_bmap)) {
+ 		dprintk("NFSD: nfsd4_read: file not opened for read!\n");
+ 		goto out;
+ 	}
+@@ -397,6 +458,11 @@ out:
+ static inline int
+ nfsd4_readdir(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_readdir *readdir)
+ {
++	u64 cookie = readdir->rd_cookie;
++	static const nfs4_verifier zeroverf = {
++		.data[0] = 0,
++	};
++
+ 	/* no need to check permission - this will be done in nfsd_readdir() */
+ 
+ 	if (readdir->rd_bmval[1] & NFSD_WRITEONLY_ATTRS_WORD1)
+@@ -405,7 +471,8 @@ nfsd4_readdir(struct svc_rqst *rqstp, st
+ 	readdir->rd_bmval[0] &= NFSD_SUPPORTED_ATTRS_WORD0;
+ 	readdir->rd_bmval[1] &= NFSD_SUPPORTED_ATTRS_WORD1;
+ 
+-	if (readdir->rd_cookie > ~(u32)0)
++	if ((cookie > ~(u32)0) || (cookie == 1) || (cookie == 2) ||
++	    (cookie == 0 && memcmp(readdir->rd_verf.data, zeroverf.data, NFS4_VERIFIER_SIZE)))
+ 		return nfserr_bad_cookie;
+ 
+ 	readdir->rd_rqstp = rqstp;
+@@ -427,6 +494,8 @@ nfsd4_remove(struct svc_rqst *rqstp, str
+ 	int status;
+ 
+ 	status = nfsd_unlink(rqstp, current_fh, 0, remove->rm_name, remove->rm_namelen);
++	if (status == nfserr_symlink)
++		return nfserr_notdir;
+ 	if (!status) {
+ 		fh_unlock(current_fh);
+ 		set_change_info(&remove->rm_cinfo, current_fh);
+@@ -438,11 +507,25 @@ static inline int
+ nfsd4_rename(struct svc_rqst *rqstp, struct svc_fh *current_fh,
+ 	     struct svc_fh *save_fh, struct nfsd4_rename *rename)
+ {
+-	int status;
++	int status = nfserr_nofilehandle;
+ 
++	if (!save_fh->fh_dentry)
++		return status;
+ 	status = nfsd_rename(rqstp, save_fh, rename->rn_sname,
+ 			     rename->rn_snamelen, current_fh,
+ 			     rename->rn_tname, rename->rn_tnamelen);
++
++	/* the underlying filesystem returns different error's than required
++	 * by NFSv4. both save_fh and current_fh have been verified.. */
++	if (status == nfserr_isdir) 
++		status = nfserr_exist;
++	else if ((status == nfserr_notdir) && 
++                  (S_ISDIR(save_fh->fh_dentry->d_inode->i_mode) && 
++                   S_ISDIR(current_fh->fh_dentry->d_inode->i_mode)))
++		status = nfserr_exist;
++	else if (status == nfserr_symlink)
++		status = nfserr_notdir;
++
+ 	if (!status) {
+ 		set_change_info(&rename->rn_sinfo, current_fh);
+ 		set_change_info(&rename->rn_tinfo, save_fh);
+@@ -454,14 +537,18 @@ static inline int
+ nfsd4_setattr(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_setattr *setattr)
+ {
+ 	struct nfs4_stateid *stp;
+-	int status = nfs_ok;
++	int status = nfserr_nofilehandle;
++
++	if (!current_fh->fh_dentry)
++		goto out;
+ 
++	status = nfs_ok;
+ 	if (setattr->sa_iattr.ia_valid & ATTR_SIZE) {
+ 
+ 		status = nfserr_bad_stateid;
+ 		if (ZERO_STATEID(&setattr->sa_stateid) || ONE_STATEID(&setattr->sa_stateid)) {
+ 			dprintk("NFSD: nfsd4_setattr: magic stateid!\n");
+-			return status;
++			goto out;
+ 		}
+ 
+ 		nfs4_lock_state();
+@@ -469,17 +556,27 @@ nfsd4_setattr(struct svc_rqst *rqstp, st
+ 						&setattr->sa_stateid, 
+ 						CHECK_FH | RDWR_STATE, &stp))) {
+ 			dprintk("NFSD: nfsd4_setattr: couldn't process stateid!\n");
+-			goto out;
++			goto out_unlock;
+ 		}
+ 		status = nfserr_openmode;
+-		if (!(stp->st_share_access & NFS4_SHARE_ACCESS_WRITE)) {
++		if (!access_bits_permit_write(stp->st_access_bmap)) {
+ 			dprintk("NFSD: nfsd4_setattr: not opened for write!\n");
+-			goto out;
++			goto out_unlock;
+ 		}
+ 		nfs4_unlock_state();
+ 	}
+-	return (nfsd_setattr(rqstp, current_fh, &setattr->sa_iattr, 0, (time_t)0));
++#ifdef CONFIG_NFS_V4_ACL
++	status = nfs_ok;
++	if (setattr->sa_acl != NULL)
++		status = nfsd4_set_nfs4_acl(rqstp, current_fh, setattr->sa_acl);
++	if (status)
++		goto out;
++#endif /* CONFIG_NFS_V4_ACL */
++	status = nfsd_setattr(rqstp, current_fh, &setattr->sa_iattr,
++				0, (time_t)0);
+ out:
++	return status;
++out_unlock:
+ 	nfs4_unlock_state();
+ 	return status;
+ }
+@@ -513,7 +610,7 @@ nfsd4_write(struct svc_rqst *rqstp, stru
+ 	}
+ 
+ 	status = nfserr_openmode;
+-	if (!(stp->st_share_access & NFS4_SHARE_ACCESS_WRITE)) {
++	if (!access_bits_permit_write(stp->st_access_bmap)) {
+ 		dprintk("NFSD: nfsd4_write: file not open for write!\n");
+ 		goto out;
+ 	}
+@@ -526,9 +623,12 @@ zero_stateid:
+ 	*p++ = nfssvc_boot.tv_sec;
+ 	*p++ = nfssvc_boot.tv_usec;
+ 
+-	return (nfsd_write(rqstp, current_fh, write->wr_offset,
++	status =  nfsd_write(rqstp, current_fh, write->wr_offset,
+ 			  write->wr_vec, write->wr_vlen, write->wr_buflen,
+-			  &write->wr_how_written));
++			  &write->wr_how_written);
++	if (status == nfserr_symlink)
++		status = nfserr_inval;
++	return status;
+ out:
+ 	nfs4_unlock_state();
+ 	return status;
+@@ -552,8 +652,9 @@ nfsd4_verify(struct svc_rqst *rqstp, str
+ 
+ 	if ((verify->ve_bmval[0] & ~NFSD_SUPPORTED_ATTRS_WORD0)
+ 	    || (verify->ve_bmval[1] & ~NFSD_SUPPORTED_ATTRS_WORD1))
+-		return nfserr_notsupp;
+-	if (verify->ve_bmval[1] & NFSD_WRITEONLY_ATTRS_WORD1)
++		return nfserr_attrnotsupp;
++	if ((verify->ve_bmval[0] & FATTR4_WORD0_RDATTR_ERROR)
++	    || (verify->ve_bmval[1] & NFSD_WRITEONLY_ATTRS_WORD1))
+ 		return nfserr_inval;
+ 	if (verify->ve_attrlen & 3)
+ 		return nfserr_inval;
+@@ -568,7 +669,8 @@ nfsd4_verify(struct svc_rqst *rqstp, str
+ 
+ 	status = nfsd4_encode_fattr(current_fh, current_fh->fh_export,
+ 				    current_fh->fh_dentry, buf,
+-				    &count, verify->ve_bmval);
++				    &count, verify->ve_bmval,
++				    rqstp);
+ 
+ 	/* this means that nfsd4_encode_fattr() ran out of space */
+ 	if (status == nfserr_resource && count == 0)
+@@ -658,13 +760,32 @@ nfsd4_proc_compound(struct svc_rqst *rqs
+ 			goto encode_op;
+ 		}
+ 
++		/* All operations except RENEW, SETCLIENTID, RESTOREFH
++		* SETCLIENTID_CONFIRM, PUTFH and PUTROOTFH 
++		* require a valid current filehandle 
++		*
++		* SETATTR NOFILEHANDLE error handled in nfsd4_setattr
++		* due to required returned bitmap argument
++		*/ 
++		if ((!current_fh.fh_dentry) && 
++		   !((op->opnum == OP_PUTFH) || (op->opnum == OP_PUTROOTFH) ||
++		   (op->opnum == OP_SETCLIENTID) ||
++		   (op->opnum == OP_SETCLIENTID_CONFIRM) ||
++		   (op->opnum == OP_RENEW) || (op->opnum == OP_RESTOREFH) ||
++		   (op->opnum == OP_RELEASE_LOCKOWNER) || 
++		   (op->opnum == OP_SETATTR))) {
++			op->status = nfserr_nofilehandle;
++			goto encode_op;
++		}
+ 		switch (op->opnum) {
+ 		case OP_ACCESS:
+ 			op->status = nfsd4_access(rqstp, &current_fh, &op->u.access);
+ 			break;
+ 		case OP_CLOSE:
+ 			op->status = nfsd4_close(rqstp, &current_fh, &op->u.close);
+-			op->replay = &op->u.close.cl_stateowner->so_replay;
++			if (op->u.close.cl_stateowner)
++				op->replay = 
++					&op->u.close.cl_stateowner->so_replay;
+ 			break;
+ 		case OP_COMMIT:
+ 			op->status = nfsd4_commit(rqstp, &current_fh, &op->u.commit);
+@@ -683,12 +804,18 @@ nfsd4_proc_compound(struct svc_rqst *rqs
+ 			break;
+ 		case OP_LOCK:
+ 			op->status = nfsd4_lock(rqstp, &current_fh, &op->u.lock);
++			if (op->u.lock.lk_stateowner)
++				op->replay = 
++					&op->u.lock.lk_stateowner->so_replay;
+ 			break;
+ 		case OP_LOCKT:
+ 			op->status = nfsd4_lockt(rqstp, &current_fh, &op->u.lockt);
+ 			break;
+ 		case OP_LOCKU:
+ 			op->status = nfsd4_locku(rqstp, &current_fh, &op->u.locku);
++			if (op->u.locku.lu_stateowner)
++				op->replay = 
++					&op->u.locku.lu_stateowner->so_replay;
+ 			break;
+ 		case OP_LOOKUP:
+ 			op->status = nfsd4_lookup(rqstp, &current_fh, &op->u.lookup);
+@@ -703,15 +830,21 @@ nfsd4_proc_compound(struct svc_rqst *rqs
+ 			break;
+ 		case OP_OPEN:
+ 			op->status = nfsd4_open(rqstp, &current_fh, &op->u.open);
+-			op->replay = &op->u.open.op_stateowner->so_replay;
++			if (op->u.open.op_stateowner)
++				op->replay = 
++					&op->u.open.op_stateowner->so_replay;
+ 			break;
+ 		case OP_OPEN_CONFIRM:
+ 			op->status = nfsd4_open_confirm(rqstp, &current_fh, &op->u.open_confirm);
+-			op->replay = &op->u.open_confirm.oc_stateowner->so_replay;
++			if (op->u.open_confirm.oc_stateowner)
++				op->replay = 
++					&op->u.open_confirm.oc_stateowner->so_replay;
+ 			break;
+ 		case OP_OPEN_DOWNGRADE:
+ 			op->status = nfsd4_open_downgrade(rqstp, &current_fh, &op->u.open_downgrade);
+-			op->replay = &op->u.open_downgrade.od_stateowner->so_replay;
++			if (op->u.open_downgrade.od_stateowner)
++				op->replay = 
++					&op->u.open_downgrade.od_stateowner->so_replay;
+ 			break;
+ 		case OP_PUTFH:
+ 			op->status = nfsd4_putfh(rqstp, &current_fh, &op->u.putfh);
+@@ -760,6 +893,9 @@ nfsd4_proc_compound(struct svc_rqst *rqs
+ 		case OP_WRITE:
+ 			op->status = nfsd4_write(rqstp, &current_fh, &op->u.write);
+ 			break;
++		case OP_RELEASE_LOCKOWNER:
++			op->status = nfsd4_release_lockowner(rqstp, &op->u.release_lockowner);
++			break;
+ 		default:
+ 			BUG_ON(op->status == nfs_ok);
+ 			break;
+@@ -768,7 +904,7 @@ nfsd4_proc_compound(struct svc_rqst *rqs
+ encode_op:
+ 		if (op->status == NFSERR_REPLAY_ME) {
+ 			nfsd4_encode_replay(resp, op);
+-			status = op->status = NFS_OK;
++			status = op->status = op->replay->rp_status;
+ 		} else {
+ 			nfsd4_encode_operation(resp, op);
+ 			status = op->status;
+@@ -776,20 +912,7 @@ encode_op:
+ 	}
+ 
+ out:
+-	if (args->ops != args->iops) {
+-		kfree(args->ops);
+-		args->ops = args->iops;
+-	}
+-	if (args->tmpp) {
+-		kfree(args->tmpp);
+-		args->tmpp = NULL;
+-	}
+-	while (args->to_free) {
+-		struct tmpbuf *tb = args->to_free;
+-		args->to_free = tb->next;
+-		kfree(tb->buf);
+-		kfree(tb);
+-	}
++	nfsd4_release_compoundargs(args);
+ 	fh_put(&current_fh);
+ 	fh_put(&save_fh);
+ 	return status;
+diff -puN fs/nfsd/nfs4xdr.c~CITI_NFS4_ALL fs/nfsd/nfs4xdr.c
+--- linux-2.6.3/fs/nfsd/nfs4xdr.c~CITI_NFS4_ALL	2004-02-19 16:47:05.000000000 -0500
++++ linux-2.6.3-bfields/fs/nfsd/nfs4xdr.c	2004-02-19 16:47:15.000000000 -0500
+@@ -51,100 +51,103 @@
+ #include <linux/sunrpc/xdr.h>
+ #include <linux/sunrpc/svc.h>
+ #include <linux/sunrpc/clnt.h>
+-#include <linux/sunrpc/name_lookup.h>
+ #include <linux/nfsd/nfsd.h>
+ #include <linux/nfsd/state.h>
+ #include <linux/nfsd/xdr4.h>
++#include <linux/nfsd_idmap.h>
++#include <linux/nfs4.h>
++#include <linux/nfs4_acl.h>
+ 
+ #define NFSDDBG_FACILITY		NFSDDBG_XDR
+ 
+-/*
+- * From Peter Astrand <peter@cendio.se>: The following routines check
+- * whether a filename supplied by the client is valid.
+- */
+-static const char trailing_bytes_for_utf8[256] = {
+-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
++static const char utf8_byte_len[256] = {
++	1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
++	1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
++	1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
++	1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+ 	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+-	1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+-	2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
++	0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
++	3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, 4,4,4,4,4,4,4,4,5,5,5,5,6,6,0,0
+ };
+ 
+ static inline int
+-is_legal_iso_utf8_sequence(unsigned char *source, int length)
++is_legal_utf8_sequence(unsigned char *source, int length)
+ {
+-	unsigned char a;
+-	unsigned char *srcptr;
++	unsigned char *ptr;
++	unsigned char c;
+ 
+-	srcptr = source + length;
++	if (length==1) return 1;
+ 
+-	switch (length) {
+-		/* Everything else falls through when "1"... */
++	/* Check for overlong sequence, and check second byte */
++	c = *(source + 1);
++	switch (*source) {
++	case 0xE0: /* 3 bytes */
++		if ( c < 0xA0 ) return 0;
++		break;
++	case 0xF0: /* 4 bytes */
++		if ( c < 0x90 ) return 0;
++		break;
++	case 0xF8: /* 5 bytes */
++		if ( c < 0xC8 ) return 0;
++		break;
++	case 0xFC: /* 6 bytes */
++		if ( c < 0x84 ) return 0;
++		break;
+ 	default:
+-		/* Sequences with more than 6 bytes are invalid */
+-		return 0;
++		if ( (c & 0xC0) != 0x80) return 0;
++	}
+ 
+-		/*
+-		   Byte 3-6 must be 80..BF
+-		*/
+-	case 6:
+-		if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return 0;
+-	case 5:
+-		if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return 0;
+-	case 4:
+-		if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return 0;
+-	case 3:
+-		if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return 0;
+-
+-	case 2:
+-		a = *--srcptr;
+-
+-		/* Upper limit */
+-		if (a > 0xBF)
+-			/* 2nd byte may never be > 0xBF */
+-			return 0;
++	/* Check that trailing bytes look like 10xxxxxx */
++	for (ptr = source++ + length - 1; ptr>source; ptr--)
++		if ( ((*ptr) & 0xC0) != 0x80 ) return 0;
++	return 1;
++}
+ 
+-		/*
+-		   Lower limits checks, to detect non-shortest forms.
+-		   No fall-through in this inner switch.
+-		*/
+-		switch (*source) {
+-		case 0xE0: /* 3 bytes */
+-			if (a < 0xA0) return 0;
+-			break;
+-		case 0xF0: /* 4 bytes */
+-			if (a < 0x90) return 0;
+-			break;
+-		case 0xF8: /* 5 bytes */
+-			if (a < 0xC8) return 0;
+-			break;
+-		case 0xFC: /* 6 bytes */
+-			if (a < 0x84) return 0;
+-			break;
+-		default:
+-			/* In all cases, 2nd byte must be >= 0x80 (because leading
+-			   10...) */
+-			if (a < 0x80) return 0;
+-		}
++/* This does some screening on disallowed unicode characters.  It is NOT
++ * comprehensive.
++ */
++static int
++is_allowed_utf8_char(unsigned char *source, int length)
++{
++	/* We assume length and source point to a valid utf8 sequence */
++	unsigned char c;
+ 
+-	case 1:
+-		/* Invalid ranges */
+-		if (*source >= 0x80 && *source < 0xC2)
+-			/* Multibyte char with value < 0xC2, non-shortest */
+-			return 0;
+-		if (*source > 0xFD)
+-			/* Leading byte starting with 11111110 is illegal */
+-			return 0;
+-		if (!*source)
+-			return 0;
++	/* Disallow F0000 and up (in utf8, F3B08080) */
++	if (*source > 0xF3 ) return 0;
++	c = *(source + 1);
++	switch (*source) {
++	case 0xF3:
++		if (c >= 0xB0) return 0;
++		break;
++	/* Disallow D800-F8FF (in utf8, EDA080-EFA3BF */
++	case 0xED:
++		if (c >= 0xA0) return 0;
++		break;
++	case 0xEE:
++		return 0;
++		break;
++	case 0xEF:
++		if (c <= 0xA3) return 0;
++	/* Disallow FFF9-FFFF (EFBFB9-EFBFBF) */
++		if (c==0xBF)
++			/* Don't need to check <=0xBF, since valid utf8 */
++			if ( *(source+2) >= 0xB9) return 0;
++		break;
+ 	}
+-
+ 	return 1;
+ }
+ 
++/* This routine should really check to see that the proper stringprep
++ * mappings have been applied.  Instead, we do a simple screen of some
++ * of the more obvious illegal values by calling is_allowed_utf8_char.
++ * This will allow many illegal strings through, but if a client behaves,
++ * it will get full functionality.  The other option (apart from full
++ * stringprep checking) is to limit everything to an easily handled subset,
++ * such as 7-bit ascii.
++ *
++ * Note - currently calling routines ignore return value except as boolean.
++ */
+ static int
+ check_utf8(char *str, int len)
+ {
+@@ -155,11 +158,17 @@ check_utf8(char *str, int len)
+ 	sourceend = str + len;
+ 
+ 	while (chunk < sourceend) {
+-		chunklen = trailing_bytes_for_utf8[*chunk]+1;
++		chunklen = utf8_byte_len[*chunk];
++		if (!chunklen)
++			return nfserr_inval;
+ 		if (chunk + chunklen > sourceend)
+ 			return nfserr_inval;
+-		if (!is_legal_iso_utf8_sequence(chunk, chunklen))
++		if (!is_legal_utf8_sequence(chunk, chunklen))
++			return nfserr_inval;
++		if (!is_allowed_utf8_char(chunk, chunklen))
+ 			return nfserr_inval;
++		if ( (chunklen==1) && (!*chunk) )
++			return nfserr_inval; /* Disallow embedded nulls */
+ 		chunk += chunklen;
+ 	}
+ 
+@@ -280,27 +289,40 @@ u32 *read_buf(struct nfsd4_compoundargs 
+ 	return p;
+ }
+ 
+-char *savemem(struct nfsd4_compoundargs *argp, u32 *p, int nbytes)
++static int
++defer_free(struct nfsd4_compoundargs *argp,
++		void (*release)(const void *), void *p)
+ {
+ 	struct tmpbuf *tb;
++
++	tb = kmalloc(sizeof(*tb), GFP_KERNEL);
++	if (!tb)
++		return -ENOMEM;
++	tb->buf = p;
++	tb->release = release;
++	tb->next = argp->to_free;
++	argp->to_free = tb;
++	return 0;
++}
++
++char *savemem(struct nfsd4_compoundargs *argp, u32 *p, int nbytes)
++{
++	void *new = NULL;
+ 	if (p == argp->tmp) {
+-		p = kmalloc(nbytes, GFP_KERNEL);
+-		if (!p) return NULL;
++		new = kmalloc(nbytes, GFP_KERNEL);
++		if (!new) return NULL;
++		p = new;
+ 		memcpy(p, argp->tmp, nbytes);
+ 	} else {
+ 		if (p != argp->tmpp)
+ 			BUG();
+ 		argp->tmpp = NULL;
+ 	}
+-	tb = kmalloc(sizeof(*tb), GFP_KERNEL);
+-	if (!tb) {
+-		kfree(p);
++	if (defer_free(argp, kfree, p)) {
++		kfree(new);
+ 		return NULL;
+-	}
+-	tb->buf = p;
+-	tb->next = argp->to_free;
+-	argp->to_free = tb;
+-	return (char*)p;
++	} else
++		return (char *)p;
+ }
+ 
+ 
+@@ -328,7 +350,8 @@ nfsd4_decode_bitmap(struct nfsd4_compoun
+ }
+ 
+ static int
+-nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval, struct iattr *iattr)
++nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval, struct iattr *iattr,
++    struct nfs4_acl **acl)
+ {
+ 	int expected_len, len = 0;
+ 	u32 dummy32;
+@@ -344,7 +367,7 @@ nfsd4_decode_fattr(struct nfsd4_compound
+ 	 * read-only attributes return ERR_INVAL.
+ 	 */
+ 	if ((bmval[0] & ~NFSD_SUPPORTED_ATTRS_WORD0) || (bmval[1] & ~NFSD_SUPPORTED_ATTRS_WORD1))
+-		return nfserr_notsupp;
++		return nfserr_attrnotsupp;
+ 	if ((bmval[0] & ~NFSD_WRITEABLE_ATTRS_WORD0) || (bmval[1] & ~NFSD_WRITEABLE_ATTRS_WORD1))
+ 		return nfserr_inval;
+ 
+@@ -357,6 +380,39 @@ nfsd4_decode_fattr(struct nfsd4_compound
+ 		READ64(iattr->ia_size);
+ 		iattr->ia_valid |= ATTR_SIZE;
+ 	}
++#ifdef CONFIG_NFS_V4_ACL
++	if (bmval[0] & FATTR4_WORD0_ACL) {
++		int nace, i;
++		struct nfs4_ace ace;
++
++		READ_BUF(4); len += 4;
++		READ32(nace);
++
++		*acl = nfs4_acl_new();
++		if (*acl == NULL) {
++			status = -ENOMEM;
++			goto out_nfserr;
++		}
++		defer_free(argp, (void (*)(const void *))nfs4_acl_free, *acl);
++
++		for (i = 0; i < nace; i++) {
++			READ_BUF(16); len += 16;
++			READ32(ace.type);
++			READ32(ace.flag);
++			READ32(ace.access_mask);
++			READ32(ace.wholen);
++			READ_BUF(ace.wholen);
++			len += XDR_QUADLEN(ace.wholen) << 2;
++			if (nfs4_acl_add_ace(*acl, ace.type, ace.flag,
++				 ace.access_mask, (char *)p, ace.wholen) < 0) {
++				status = -ENOMEM;
++				goto out_nfserr;
++			}
++			p += XDR_QUADLEN(ace.wholen);
++		}
++	} else
++		*acl = NULL;
++#endif /* CONFIG_NFS_V4_ACL */
+ 	if (bmval[1] & FATTR4_WORD1_MODE) {
+ 		READ_BUF(4);
+ 		len += 4;
+@@ -373,7 +429,7 @@ nfsd4_decode_fattr(struct nfsd4_compound
+ 		READMEM(buf, dummy32);
+ 		if (check_utf8(buf, dummy32))
+ 			return nfserr_inval;
+-		if ((status = name_get_uid(buf, dummy32, &iattr->ia_uid)))
++		if ((status = nfsd_map_name_to_uid(argp->rqstp, buf, dummy32, &iattr->ia_uid)))
+ 			goto out_nfserr;
+ 		iattr->ia_valid |= ATTR_UID;
+ 	}
+@@ -386,7 +442,7 @@ nfsd4_decode_fattr(struct nfsd4_compound
+ 		READMEM(buf, dummy32);
+ 		if (check_utf8(buf, dummy32))
+ 			return nfserr_inval;
+-		if ((status = name_get_gid(buf, dummy32, &iattr->ia_gid)))
++		if ((status = nfsd_map_name_to_gid(argp->rqstp, buf, dummy32, &iattr->ia_gid)))
+ 			goto out_nfserr;
+ 		iattr->ia_valid |= ATTR_GID;
+ 	}
+@@ -482,6 +538,7 @@ nfsd4_decode_close(struct nfsd4_compound
+ {
+ 	DECODE_HEAD;
+ 
++	(int)close->cl_stateowner = -1;
+ 	READ_BUF(4 + sizeof(stateid_t));
+ 	READ32(close->cl_seqid);
+ 	READ32(close->cl_stateid.si_generation);
+@@ -540,7 +597,7 @@ nfsd4_decode_create(struct nfsd4_compoun
+ 	if ((status = check_filename(create->cr_name, create->cr_namelen, nfserr_inval)))
+ 		return status;
+ 
+-	if ((status = nfsd4_decode_fattr(argp, create->cr_bmval, &create->cr_iattr)))
++	if ((status = nfsd4_decode_fattr(argp, create->cr_bmval, &create->cr_iattr, &create->cr_acl)))
+ 		goto out;
+ 
+ 	DECODE_TAIL;
+@@ -572,6 +629,7 @@ nfsd4_decode_lock(struct nfsd4_compounda
+ {
+ 	DECODE_HEAD;
+ 
++	(int)lock->lk_stateowner = -1;
+ 	/*
+ 	* type, reclaim(boolean), offset, length, new_lock_owner(boolean)
+ 	*/
+@@ -629,6 +687,7 @@ nfsd4_decode_locku(struct nfsd4_compound
+ {
+ 	DECODE_HEAD;
+ 
++	(int)locku->lu_stateowner = -1;
+ 	READ_BUF(24 + sizeof(stateid_t));
+ 	READ32(locku->lu_type);
+ 	if ((locku->lu_type < NFS4_READ_LT) || (locku->lu_type > NFS4_WRITEW_LT))
+@@ -664,6 +723,7 @@ nfsd4_decode_open(struct nfsd4_compounda
+ 
+ 	memset(open->op_bmval, 0, sizeof(open->op_bmval));
+ 	open->op_iattr.ia_valid = 0;
++	(int)open->op_stateowner = -1;
+ 
+ 	/* seqid, share_access, share_deny, clientid, ownerlen */
+ 	READ_BUF(16 + sizeof(clientid_t));
+@@ -686,7 +746,7 @@ nfsd4_decode_open(struct nfsd4_compounda
+ 		switch (open->op_createmode) {
+ 		case NFS4_CREATE_UNCHECKED:
+ 		case NFS4_CREATE_GUARDED:
+-			if ((status = nfsd4_decode_fattr(argp, open->op_bmval, &open->op_iattr)))
++			if ((status = nfsd4_decode_fattr(argp, open->op_bmval, &open->op_iattr, &open->op_acl)))
+ 				goto out;
+ 			break;
+ 		case NFS4_CREATE_EXCLUSIVE:
+@@ -739,6 +799,7 @@ nfsd4_decode_open_confirm(struct nfsd4_c
+ {
+ 	DECODE_HEAD;
+ 		    
++	(int)open_conf->oc_stateowner = -1;
+ 	READ_BUF(4 + sizeof(stateid_t));
+ 	READ32(open_conf->oc_req_stateid.si_generation);
+ 	COPYMEM(&open_conf->oc_req_stateid.si_opaque, sizeof(stateid_opaque_t));
+@@ -752,6 +813,7 @@ nfsd4_decode_open_downgrade(struct nfsd4
+ {
+ 	DECODE_HEAD;
+ 		    
++	(int)open_down->od_stateowner = -1;
+ 	READ_BUF(4 + sizeof(stateid_t));
+ 	READ32(open_down->od_stateid.si_generation);
+ 	COPYMEM(&open_down->od_stateid.si_opaque, sizeof(stateid_opaque_t));
+@@ -861,7 +923,7 @@ nfsd4_decode_setattr(struct nfsd4_compou
+ 	READ_BUF(sizeof(stateid_t));
+ 	READ32(setattr->sa_stateid.si_generation);
+ 	COPYMEM(&setattr->sa_stateid.si_opaque, sizeof(stateid_opaque_t));
+-	if ((status = nfsd4_decode_fattr(argp, setattr->sa_bmval, &setattr->sa_iattr)))
++	if ((status = nfsd4_decode_fattr(argp, setattr->sa_bmval, &setattr->sa_iattr, &setattr->sa_acl)))
+ 		goto out;
+ 
+ 	DECODE_TAIL;
+@@ -928,7 +990,7 @@ nfsd4_decode_write(struct nfsd4_compound
+ 	int len;
+ 	DECODE_HEAD;
+ 
+-	READ_BUF(sizeof(stateid_t) + 16);
++	READ_BUF(sizeof(stateid_opaque_t) + 20);
+ 	READ32(write->wr_stateid.si_generation);
+ 	COPYMEM(&write->wr_stateid.si_opaque, sizeof(stateid_opaque_t));
+ 	READ64(write->wr_offset);
+@@ -972,6 +1034,20 @@ nfsd4_decode_write(struct nfsd4_compound
+ }
+ 
+ static int
++nfsd4_decode_release_lockowner(struct nfsd4_compoundargs *argp, struct nfsd4_release_lockowner *rlockowner)
++{
++	DECODE_HEAD;
++
++	READ_BUF(12);	
++	COPYMEM(&rlockowner->rl_clientid, sizeof(clientid_t));
++	READ32(rlockowner->rl_owner.len);
++	READ_BUF(rlockowner->rl_owner.len);
++	READMEM(rlockowner->rl_owner.data, rlockowner->rl_owner.len);
++	
++	DECODE_TAIL;
++}
++
++static int
+ nfsd4_decode_compound(struct nfsd4_compoundargs *argp)
+ {
+ 	DECODE_HEAD;
+@@ -1043,6 +1119,13 @@ nfsd4_decode_compound(struct nfsd4_compo
+ 		op->opnum = ntohl(*argp->p++);
+ 
+ 		switch (op->opnum) {
++		case 2: /* Reserved operation */
++			op->opnum = OP_ILLEGAL;
++			if (argp->minorversion == 0)
++				op->status = nfserr_op_illegal;
++			else 
++				op->status = nfserr_minor_vers_mismatch;
++			break;
+ 		case OP_ACCESS:
+ 			op->status = nfsd4_decode_access(argp, &op->u.access);
+ 			break;
+@@ -1136,14 +1219,12 @@ nfsd4_decode_compound(struct nfsd4_compo
+ 		case OP_WRITE:
+ 			op->status = nfsd4_decode_write(argp, &op->u.write);
+ 			break;
++		case OP_RELEASE_LOCKOWNER:
++			op->status = nfsd4_decode_release_lockowner(argp, &op->u.release_lockowner);
++			break;
+ 		default:
+-			/*
+-			 * According to spec, anything greater than OP_WRITE
+-			 * is treated as OP_WRITE+1 in the response.
+-			 */
+-			if (op->opnum > OP_WRITE)
+-			op->opnum = OP_WRITE + 1;
+-			op->status = nfserr_notsupp;
++			op->opnum = OP_ILLEGAL;
++			op->status = nfserr_op_illegal;
+ 			break;
+ 		}
+ 
+@@ -1183,10 +1264,10 @@ nfsd4_decode_compound(struct nfsd4_compo
+ } while (0)
+ #define WRITECINFO(c)		do {				\
+ 	*p++ = htonl(c.atomic);					\
+-	*p++ = htonl(c.before_size);				\
+-	*p++ = htonl(c.before_ctime);				\
+-	*p++ = htonl(c.after_size);				\
+-	*p++ = htonl(c.after_ctime);				\
++	*p++ = htonl(c.before_ctime_sec);				\
++	*p++ = htonl(c.before_ctime_nsec);				\
++	*p++ = htonl(c.after_ctime_sec);				\
++	*p++ = htonl(c.after_ctime_nsec);				\
+ } while (0)
+ 
+ #define RESERVE_SPACE(nbytes)	do {				\
+@@ -1209,10 +1290,13 @@ nfsd4_decode_compound(struct nfsd4_compo
+  * "seqid-mutating" NFSv4 operation.  This is
+  * where seqids are incremented, and the
+  * replay cache is filled.
++ * 
++ * if stateowner != -1 then called with nfs4_lock_state() held
+  */
+ 
+ #define ENCODE_SEQID_OP_TAIL(stateowner) do {			\
+-	if (seqid_mutating_err(nfserr) && stateowner) {		\
++	if (seqid_mutating_err(nfserr) && stateowner		\
++	    && ((int)stateowner != -1)) { 			\
+ 		if (stateowner->so_confirmed)			\
+ 			stateowner->so_seqid++;			\
+ 		stateowner->so_replay.rp_status = nfserr;   	\
+@@ -1220,7 +1304,8 @@ nfsd4_decode_compound(struct nfsd4_compo
+ 			  (((char *)(resp)->p - (char *)save)); \
+ 		memcpy(stateowner->so_replay.rp_buf, save,      \
+  			stateowner->so_replay.rp_buflen); 	\
+-	} } while(0)
++	} } while(0);						\
++	if ((int)stateowner != -1) nfs4_unlock_state();
+ 
+ 
+ static u32 nfs4_ftypes[16] = {
+@@ -1239,13 +1324,16 @@ static u32 nfs4_ftypes[16] = {
+  */
+ int
+ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,
+-		   struct dentry *dentry, u32 *buffer, int *countp, u32 *bmval)
++		struct dentry *dentry, u32 *buffer, int *countp, u32 *bmval,
++		struct svc_rqst *rqstp)
+ {
+ 	u32 bmval0 = bmval[0];
+ 	u32 bmval1 = bmval[1];
+ 	struct kstat stat;
+-	struct name_ent *owner = NULL;
+-	struct name_ent *group = NULL;
++	char owner[IDMAP_NAMESZ];
++	u32 ownerlen = 0;
++	char group[IDMAP_NAMESZ];
++	u32 grouplen = 0;
+ 	struct svc_fh tempfh;
+ 	struct kstatfs statfs;
+ 	int buflen = *countp << 2;
+@@ -1254,6 +1342,7 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s
+ 	u64 dummy64;
+ 	u32 *p = buffer;
+ 	int status;
++	struct nfs4_acl *acl = NULL;
+ 
+ 	BUG_ON(bmval1 & NFSD_WRITEONLY_ATTRS_WORD1);
+ 	BUG_ON(bmval0 & ~NFSD_SUPPORTED_ATTRS_WORD0);
+@@ -1277,15 +1366,30 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s
+ 		fhp = &tempfh;
+ 	}
+ 	if (bmval1 & FATTR4_WORD1_OWNER) {
+-		status = name_get_user(stat.uid, &owner);
+-		if (status)
++		int temp = nfsd_map_uid_to_name(rqstp, stat.uid, owner);
++		if (temp < 0) {
++			status = temp;
+ 			goto out_nfserr;
++		}
++		ownerlen = (unsigned) temp;
+ 	}
+ 	if (bmval1 & FATTR4_WORD1_OWNER_GROUP) {
+-		status = name_get_group(stat.gid, &group);
+-		if (status)
++		int temp = nfsd_map_gid_to_name(rqstp, stat.gid, group);
++		if (temp < 0) {
++			status = temp;
++			goto out_nfserr;
++		}
++		grouplen = (unsigned) temp;
++	}
++#ifdef CONFIG_NFS_V4_ACL
++	if (bmval0 & FATTR4_WORD0_ACL) {
++		status = nfsd4_get_nfs4_acl(rqstp, dentry, &acl);
++		if (status == -EOPNOTSUPP)
++			bmval0 &= ~FATTR4_WORD0_ACL;
++		else if (status < 0)
+ 			goto out_nfserr;
+ 	}
++#endif /* CONFIG_NFS_V4_ACL */
+ 
+ 	if ((buflen -= 16) < 0)
+ 		goto out_resource;
+@@ -1317,32 +1421,15 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s
+ 	}
+ 	if (bmval0 & FATTR4_WORD0_CHANGE) {
+ 		/*
+-		 * XXX: We currently use the inode ctime as the nfsv4 "changeid"
+-		 * attribute.  This violates the spec, which says
+-		 *
+-		 *    The server may return the object's time_modify attribute
+-		 *    for this attribute, but only if the file system object
+-		 *    can not be updated more frequently than the resolution
+-		 *    of time_modify.
+-		 *
+-		 * Since we only have 1-second ctime resolution, this is a pretty
+-		 * serious violation.  Indeed, 1-second ctime resolution is known
+-		 * to be a problem in practice in the NFSv3 world.
+-		 *
+-		 * The real solution to this problem is probably to work on
+-		 * adding high-resolution mtimes to the VFS layer.
+-		 *
+-		 * Note: Started using i_size for the high 32 bits of the changeid.
+-		 *
+-		 * Note 2: This _must_ be consistent with the scheme for writing
++		 * Note: This _must_ be consistent with the scheme for writing
+ 		 * change_info, so any changes made here must be reflected there
+ 		 * as well.  (See xdr4.h:set_change_info() and the WRITECINFO()
+ 		 * macro above.)
+ 		 */
+ 		if ((buflen -= 8) < 0)
+ 			goto out_resource;
+-		WRITE32(stat.size);
+-		WRITE32(stat.mtime.tv_sec); /* AK: nsec dropped? */
++		WRITE32(stat.ctime.tv_sec);
++		WRITE32(stat.ctime.tv_nsec); /* AK: nsec dropped? */
+ 	}
+ 	if (bmval0 & FATTR4_WORD0_SIZE) {
+ 		if ((buflen -= 8) < 0)
+@@ -1387,10 +1474,48 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s
+ 			goto out_resource;
+ 		WRITE32(0);
+ 	}
++#ifdef CONFIG_NFS_V4_ACL
++	if (bmval0 & FATTR4_WORD0_ACL) {
++		struct nfs4_ace *ace;
++		struct list_head *h;
++		int alen;
++
++		if (acl == NULL) {
++			if ((buflen -= 4) < 0)
++				goto out_resource;
++
++			WRITE32(0);
++			goto out_acl;
++		}
++
++		alen = acl->naces * 16 + 4;
++
++		list_for_each(h, &acl->ace_head) {
++			ace = list_entry(h, struct nfs4_ace, l_ace);
++			alen += XDR_QUADLEN(ace->wholen) << 2;
++		}
++
++		if ((buflen -= alen) < 0)
++			goto out_resource;
++
++		WRITE32(acl->naces);
++
++		list_for_each(h, &acl->ace_head) {
++			ace = list_entry(h, struct nfs4_ace, l_ace);
++
++			WRITE32(ace->type);
++			WRITE32(ace->flag);
++			WRITE32(ace->access_mask);
++			WRITE32(ace->wholen);
++			WRITEMEM(ace->who, ace->wholen);
++		}
++	}
++out_acl:
++#endif /* CONFIG_NFS_V4_ACL */
+ 	if (bmval0 & FATTR4_WORD0_ACLSUPPORT) {
+ 		if ((buflen -= 4) < 0)
+ 			goto out_resource;
+-		WRITE32(0);
++		WRITE32(1);
+ 	}
+ 	if (bmval0 & FATTR4_WORD0_CANSETTIME) {
+ 		if ((buflen -= 4) < 0)
+@@ -1485,20 +1610,18 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s
+ 		WRITE32(stat.nlink);
+ 	}
+ 	if (bmval1 & FATTR4_WORD1_OWNER) {
+-		int namelen  = strlen(owner->name);
+-		buflen -= (XDR_QUADLEN(namelen) << 2) + 4;
++		buflen -= (XDR_QUADLEN(ownerlen) << 2) + 4;
+ 		if (buflen < 0)
+ 			goto out_resource;
+-		WRITE32(namelen);
+-		WRITEMEM(owner->name, namelen);
++		WRITE32(ownerlen);
++		WRITEMEM(owner, ownerlen);
+ 	}
+ 	if (bmval1 & FATTR4_WORD1_OWNER_GROUP) {
+-		int namelen = strlen(group->name);
+-		buflen -= (XDR_QUADLEN(namelen) << 2) + 4;
++		buflen -= (XDR_QUADLEN(grouplen) << 2) + 4;
+ 		if (buflen < 0)
+ 			goto out_resource;
+-		WRITE32(namelen);
+-		WRITEMEM(group->name, namelen);
++		WRITE32(grouplen);
++		WRITEMEM(group, grouplen);
+ 	}
+ 	if (bmval1 & FATTR4_WORD1_RAWDEV) {
+ 		if ((buflen -= 8) < 0)
+@@ -1564,12 +1687,11 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s
+ 	status = nfs_ok;
+ 
+ out:
++#ifdef CONFIG_NFS_V4_ACL
++	nfs4_acl_free(acl);
++#endif
+ 	if (fhp == &tempfh)
+ 		fh_put(&tempfh);
+-	if (owner)
+-		name_put(owner);
+-	if (group)
+-		name_put(group);
+ 	return status;
+ out_nfserr:
+ 	status = nfserrno(status);
+@@ -1648,7 +1770,8 @@ nfsd4_encode_dirent(struct readdir_cd *c
+ 		}
+ 
+ 		nfserr = nfsd4_encode_fattr(NULL, exp,
+-				dentry, p, &buflen, cd->rd_bmval);
++				dentry, p, &buflen, cd->rd_bmval,
++				cd->rd_rqstp);
+ 		if (!nfserr) {
+ 			p += buflen;
+ 			goto out;
+@@ -1701,7 +1824,7 @@ out:
+ 	return 0;
+ 
+ nospc:
+-	cd->common.err = nfserr_readdir_nospc;
++	cd->common.err = nfserr_toosmall;
+ 	return -EINVAL;
+ }
+ 
+@@ -1771,7 +1894,8 @@ nfsd4_encode_getattr(struct nfsd4_compou
+ 
+ 	buflen = resp->end - resp->p - (COMPOUND_ERR_SLACK_SPACE >> 2);
+ 	nfserr = nfsd4_encode_fattr(fhp, fhp->fh_export, fhp->fh_dentry,
+-				    resp->p, &buflen, getattr->ga_bmval);
++				    resp->p, &buflen, getattr->ga_bmval,
++				    resp->rqstp);
+ 
+ 	if (!nfserr)
+ 		resp->p += buflen;
+@@ -1871,7 +1995,7 @@ nfsd4_encode_open(struct nfsd4_compoundr
+ 	ENCODE_SEQID_OP_HEAD;
+ 
+ 	if (nfserr)
+-		return;
++		goto out;
+ 
+ 	RESERVE_SPACE(36 + sizeof(stateid_t));
+ 	WRITE32(open->op_stateid.si_generation);
+@@ -1925,7 +2049,8 @@ nfsd4_encode_open(struct nfsd4_compoundr
+ 	default:
+ 		BUG();
+ 	}
+-
++	/* XXX save filehandle here */
++out:
+ 	ENCODE_SEQID_OP_TAIL(open->op_stateowner);
+ }
+ 
+@@ -1995,6 +2120,8 @@ nfsd4_encode_read(struct nfsd4_compoundr
+ 			   read->rd_offset,
+ 			   read->rd_iov, read->rd_vlen,
+ 			   &maxcount);
++	if (nfserr == nfserr_symlink)
++		nfserr = nfserr_inval;
+ 	if (nfserr)
+ 		return nfserr;
+ 	eof = (read->rd_offset + maxcount >= read->rd_fhp->fh_dentry->d_inode->i_size);
+@@ -2052,6 +2179,8 @@ nfsd4_encode_readlink(struct nfsd4_compo
+ 	 * assume that truncation occurred, and return NFS4ERR_RESOURCE.
+ 	 */
+ 	nfserr = nfsd_readlink(readlink->rl_rqstp, readlink->rl_fhp, page, &maxcount);
++	if (nfserr == nfserr_isdir)
++		return nfserr_inval;
+ 	if (nfserr)
+ 		return nfserr;
+ 
+@@ -2081,7 +2210,7 @@ nfsd4_encode_readdir(struct nfsd4_compou
+ {
+ 	int maxcount;
+ 	loff_t offset;
+-	u32 *page;
++	u32 *page, *savep;
+ 	ENCODE_HEAD;
+ 
+ 	if (nfserr)
+@@ -2090,6 +2219,7 @@ nfsd4_encode_readdir(struct nfsd4_compou
+ 		return nfserr_resource;
+ 
+ 	RESERVE_SPACE(8);  /* verifier */
++	savep = p;
+ 
+ 	/* XXX: Following NFSv3, we ignore the READDIR verifier for now. */
+ 	WRITE32(0);
+@@ -2107,8 +2237,10 @@ nfsd4_encode_readdir(struct nfsd4_compou
+ 	 * pointer and eof field.
+ 	 */
+ 	maxcount = (maxcount >> 2) - 4;
+-	if (maxcount < 0)
+-		return nfserr_readdir_nospc;
++	if (maxcount < 0) {
++		nfserr =  nfserr_toosmall;
++		goto err_no_verf;
++	}
+ 
+ 	svc_take_page(resp->rqstp);
+ 	page = page_address(resp->rqstp->rq_respages[resp->rqstp->rq_resused-1]);
+@@ -2122,11 +2254,13 @@ nfsd4_encode_readdir(struct nfsd4_compou
+ 			      &offset,
+ 			      &readdir->common, nfsd4_encode_dirent);
+ 	if (nfserr == nfs_ok &&
+-	    readdir->common.err == nfserr_readdir_nospc &&
++	    readdir->common.err == nfserr_toosmall &&
+ 	    readdir->buffer == page) 
+-		nfserr = nfserr_readdir_nospc;
++		nfserr = nfserr_toosmall;
++	if (nfserr == nfserr_symlink)
++		nfserr = nfserr_notdir;
+ 	if (nfserr)
+-		return nfserr;
++		goto err_no_verf;
+ 
+ 	if (readdir->offset)
+ 		xdr_encode_hyper(readdir->offset, offset);
+@@ -2146,6 +2280,10 @@ nfsd4_encode_readdir(struct nfsd4_compou
+ 	resp->end = resp->p + PAGE_SIZE/4;
+ 
+ 	return 0;
++err_no_verf:
++	p = savep;
++	ADJUST_ARGS();
++	return nfserr;
+ }
+ 
+ static void
+@@ -2237,7 +2375,7 @@ nfsd4_encode_operation(struct nfsd4_comp
+ 
+ 	RESERVE_SPACE(8);
+ 	WRITE32(op->opnum);
+-	statp = p++;                  /* to be backfilled at the end */
++	statp = p++;        /* to be backfilled at the end */
+ 	ADJUST_ARGS();
+ 
+ 	switch (op->opnum) {
+@@ -2324,6 +2462,8 @@ nfsd4_encode_operation(struct nfsd4_comp
+ 	case OP_WRITE:
+ 		nfsd4_encode_write(resp, op->status, &op->u.write);
+ 		break;
++	case OP_RELEASE_LOCKOWNER:
++		break;
+ 	default:
+ 		break;
+ 	}
+@@ -2340,6 +2480,8 @@ nfsd4_encode_operation(struct nfsd4_comp
+  * 
+  * XDR note: do not encode rp->rp_buflen: the buffer contains the
+  * previously sent already encoded operation.
++ *
++ * called with nfs4_lock_state() held
+  */
+ void
+ nfsd4_encode_replay(struct nfsd4_compoundres *resp, struct nfsd4_op *op)
+@@ -2351,12 +2493,13 @@ nfsd4_encode_replay(struct nfsd4_compoun
+ 
+ 	RESERVE_SPACE(8);
+ 	WRITE32(op->opnum);
+-	WRITE32(NFS_OK);
++	*p++ = rp->rp_status;  /* already xdr'ed */
+ 	ADJUST_ARGS();
+ 
+ 	RESERVE_SPACE(rp->rp_buflen);
+ 	WRITEMEM(rp->rp_buf, rp->rp_buflen);
+ 	ADJUST_ARGS();
++	nfs4_unlock_state();
+ }
+ 
+ /*
+@@ -2369,6 +2512,24 @@ nfs4svc_encode_voidres(struct svc_rqst *
+         return xdr_ressize_check(rqstp, p);
+ }
+ 
++void nfsd4_release_compoundargs(struct nfsd4_compoundargs *args)
++{
++	if (args->ops != args->iops) {
++		kfree(args->ops);
++		args->ops = args->iops;
++	}
++	if (args->tmpp) {
++		kfree(args->tmpp);
++		args->tmpp = NULL;
++	}
++	while (args->to_free) {
++		struct tmpbuf *tb = args->to_free;
++		args->to_free = tb->next;
++		tb->release(tb->buf);
++		kfree(tb);
++	}
++}
++
+ int
+ nfs4svc_decode_compoundargs(struct svc_rqst *rqstp, u32 *p, struct nfsd4_compoundargs *args)
+ {
+@@ -2381,23 +2542,11 @@ nfs4svc_decode_compoundargs(struct svc_r
+ 	args->tmpp = NULL;
+ 	args->to_free = NULL;
+ 	args->ops = args->iops;
++	args->rqstp = rqstp;
+ 
+ 	status = nfsd4_decode_compound(args);
+ 	if (status) {
+-		if (args->ops != args->iops) {
+-			kfree(args->ops);
+-			args->ops = args->iops;
+-		}
+-		if (args->tmpp) {
+-			kfree(args->tmpp);
+-			args->tmpp = NULL;
+-		}
+-		while (args->to_free) {
+-			struct tmpbuf *tb = args->to_free;
+-			args->to_free = tb->next;
+-			kfree(tb->buf);
+-			kfree(tb);
+-		}
++		nfsd4_release_compoundargs(args);
+ 	}
+ 	return !status;
+ }
+diff -puN include/linux/nfsd/state.h~CITI_NFS4_ALL include/linux/nfsd/state.h
+--- linux-2.6.3/include/linux/nfsd/state.h~CITI_NFS4_ALL	2004-02-19 16:47:05.000000000 -0500
++++ linux-2.6.3-bfields/include/linux/nfsd/state.h	2004-02-19 16:47:15.000000000 -0500
+@@ -113,6 +113,8 @@ struct nfs4_replay {
+ 	unsigned int		rp_buflen;
+ 	char			*rp_buf;
+ 	unsigned		intrp_allocated;
++	int			rp_openfh_len;
++	char			rp_openfh[NFS4_FHSIZE];
+ 	char			rp_ibuf[NFSD4_REPLAY_ISIZE];
+ };
+ 
+@@ -128,12 +130,20 @@ struct nfs4_replay {
+ *    so_perfilestate: heads the list of nfs4_stateid (either open or lock) 
+ *         and is used to ensure no dangling nfs4_stateid references when we 
+ *         release a stateowner.
++*    so_perlockowner: (open) nfs4_stateid->st_perlockowner entry - used when 
++*         close is called to reap associated byte-range locks
++*    so_close_lru: (open) stateowner is placed on this list instead of being
++*         reaped (when so_perfilestate is empty) to hold the last close replay.
++*         reaped by laundramat thread after lease period.
+ */
+ struct nfs4_stateowner {
+ 	struct list_head        so_idhash;   /* hash by so_id */
+ 	struct list_head        so_strhash;   /* hash by op_name */
+ 	struct list_head        so_perclient; /* nfs4_client->cl_perclient */
+ 	struct list_head        so_perfilestate; /* list: nfs4_stateid */
++	struct list_head        so_perlockowner; /* nfs4_stateid->st_perlockowner */
++	struct list_head	so_close_lru; /* tail queue */
++	time_t			so_time; /* time of placement on so_close_lru */
+ 	int			so_is_open_owner; /* 1=openowner,0=lockowner */
+ 	u32                     so_id;
+ 	struct nfs4_client *    so_client;
+@@ -164,21 +174,23 @@ struct nfs4_file {
+ * 	st_hash: stateid_hashtbl[] entry or lockstateid_hashtbl entry
+ * 	st_perfile: file_hashtbl[] entry.
+ * 	st_perfile_state: nfs4_stateowner->so_perfilestate
+-* 	st_share_access: used only for open stateid
+-* 	st_share_deny: used only for open stateid
++*       st_perlockowner: (open stateid) list of lock nfs4_stateowners
++* 	st_access_bmap: used only for open stateid
++* 	st_deny_bmap: used only for open stateid
+ */
+ 
+ struct nfs4_stateid {
+ 	struct list_head              st_hash; 
+ 	struct list_head              st_perfile;
+ 	struct list_head              st_perfilestate; 
++	struct list_head              st_perlockowner;
+ 	struct nfs4_stateowner      * st_stateowner;
+ 	struct nfs4_file            * st_file;
+ 	stateid_t                     st_stateid;
+ 	struct file                   st_vfs_file;
+ 	int                           st_vfs_set;
+-	unsigned int                  st_share_access;
+-	unsigned int                  st_share_deny;
++	unsigned long                 st_access_bmap;
++	unsigned long                 st_deny_bmap;
+ };
+ 
+ /* flags for preprocess_seqid_op() */
+@@ -187,6 +199,7 @@ struct nfs4_stateid {
+ #define OPEN_STATE              0x00000004
+ #define LOCK_STATE              0x00000008
+ #define RDWR_STATE              0x00000010
++#define CLOSE_STATE             0x00000020
+ 
+ #define seqid_mutating_err(err)                       \
+ 	(((err) != nfserr_stale_clientid) &&    \
+diff -puN fs/nfsd/Makefile~CITI_NFS4_ALL fs/nfsd/Makefile
+--- linux-2.6.3/fs/nfsd/Makefile~CITI_NFS4_ALL	2004-02-19 16:47:06.000000000 -0500
++++ linux-2.6.3-bfields/fs/nfsd/Makefile	2004-02-19 16:47:06.000000000 -0500
+@@ -7,5 +7,5 @@ obj-$(CONFIG_NFSD)	+= nfsd.o
+ nfsd-y 			:= nfssvc.o nfsctl.o nfsproc.o nfsfh.o vfs.o \
+ 			   export.o auth.o lockd.o nfscache.o nfsxdr.o stats.o
+ nfsd-$(CONFIG_NFSD_V3)	+= nfs3proc.o nfs3xdr.o
+-nfsd-$(CONFIG_NFSD_V4)	+= nfs4proc.o nfs4xdr.o nfs4state.o
++nfsd-$(CONFIG_NFSD_V4)	+= nfs4proc.o nfs4xdr.o nfs4state.o nfs4idmap.o
+ nfsd-objs		:= $(nfsd-y)
+diff -puN /dev/null fs/nfsd/nfs4idmap.c
+--- /dev/null	2004-01-26 19:20:21.000000000 -0500
++++ linux-2.6.3-bfields/fs/nfsd/nfs4idmap.c	2004-02-19 16:47:06.000000000 -0500
+@@ -0,0 +1,569 @@
++/*
++ *  fs/nfsd/nfs4idmap.c
++ *
++ *  Mapping of UID/GIDs to name and vice versa.
++ *
++ *  Copyright (c) 2002, 2003 The Regents of the University of
++ *  Michigan.  All rights reserved.
++ *
++ *  Marius Aamodt Eriksen <marius@umich.edu>
++ *
++ *  Redistribution and use in source and binary forms, with or without
++ *  modification, are permitted provided that the following conditions
++ *  are met:
++ *
++ *  1. Redistributions of source code must retain the above copyright
++ *     notice, this list of conditions and the following disclaimer.
++ *  2. Redistributions in binary form must reproduce the above copyright
++ *     notice, this list of conditions and the following disclaimer in the
++ *     documentation and/or other materials provided with the distribution.
++ *  3. Neither the name of the University nor the names of its
++ *     contributors may be used to endorse or promote products derived
++ *     from this software without specific prior written permission.
++ *
++ *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
++ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
++ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
++ *  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++ *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
++ *  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
++
++#include <linux/config.h>
++#include <linux/module.h>
++#include <linux/init.h>
++
++#include <linux/mm.h>
++#include <linux/utsname.h>
++#include <linux/errno.h>
++#include <linux/string.h>
++#include <linux/sunrpc/clnt.h>
++#include <linux/nfs.h>
++#include <linux/nfs4.h>
++#include <linux/nfs_fs.h>
++#include <linux/nfs_page.h>
++#include <linux/smp_lock.h>
++#include <linux/sunrpc/cache.h>
++#include <linux/nfsd_idmap.h>
++#include <linux/list.h>
++#include <linux/sched.h>
++#include <linux/time.h>
++#include <linux/seq_file.h>
++#include <linux/sunrpc/svcauth.h>
++
++/*
++ * Cache entry
++ */
++
++/*
++ * XXX we know that IDMAP_NAMESZ < PAGE_SIZE, but it's ugly to rely on
++ * that.
++ */
++
++#define IDMAP_TYPE_USER  0
++#define IDMAP_TYPE_GROUP 1
++
++struct ent {
++	struct cache_head h;
++	int               type;		       /* User / Group */
++	uid_t             id;
++	char              name[IDMAP_NAMESZ];
++	char              authname[IDMAP_NAMESZ];
++};
++
++#define DefineSimpleCacheLookupMap(STRUCT, FUNC)			\
++        DefineCacheLookup(struct STRUCT, h, FUNC##_lookup,		\
++        (struct STRUCT *item, int set), /*no setup */,			\
++	& FUNC##_cache, FUNC##_hash(item), FUNC##_match(item, tmp),	\
++	STRUCT##_init(new, item), STRUCT##_update(tmp, item), 0)
++
++/* Common entry handling */
++
++#define ENT_HASHBITS          8
++#define ENT_HASHMAX           (1 << ENT_HASHBITS)
++#define ENT_HASHMASK          (ENT_HASHMAX - 1)
++
++static inline void
++ent_init(struct ent *new, struct ent *itm)
++{
++	new->id = itm->id;
++	new->type = itm->type;
++
++	strlcpy(new->name, itm->name, sizeof(new->name));
++	strlcpy(new->authname, itm->authname, sizeof(new->name));
++}
++
++static inline void
++ent_update(struct ent *new, struct ent *itm)
++{
++	ent_init(new, itm);
++}
++
++void
++ent_put(struct cache_head *ch, struct cache_detail *cd)
++{
++	if (cache_put(ch, cd)) {
++		struct ent *map = container_of(ch, struct ent, h);
++		kfree(map);
++	}
++}
++
++/*
++ * ID -> Name cache
++ */
++
++static struct cache_head *idtoname_table[ENT_HASHMAX];
++
++static uint32_t
++idtoname_hash(struct ent *ent)
++{
++	uint32_t hash;
++
++	hash = hash_str(ent->authname, ENT_HASHBITS);
++	hash = hash_long(hash ^ ent->id, ENT_HASHBITS);
++
++	/* Flip LSB for user/group */
++	if (ent->type == IDMAP_TYPE_GROUP)
++		hash ^= 1;
++
++	return hash;
++}
++
++static void
++idtoname_request(struct cache_detail *cd, struct cache_head *ch, char **bpp,
++    int *blen)
++{
++ 	struct ent *ent = container_of(ch, struct ent, h);
++	char idstr[11];
++
++	qword_add(bpp, blen, ent->authname);
++	snprintf(idstr, sizeof(idstr), "%d", ent->id);
++	qword_add(bpp, blen, ent->type == IDMAP_TYPE_GROUP ? "group" : "user");
++	qword_add(bpp, blen, idstr);
++
++	(*bpp)[-1] = '\n';
++}
++
++static inline int
++idtoname_match(struct ent *a, struct ent *b)
++{
++	return (a->id == b->id && a->type == b->type &&
++	    strcmp(a->authname, b->authname) == 0);
++}
++
++static int
++idtoname_show(struct seq_file *m, struct cache_detail *cd, struct cache_head *h)
++{
++	struct ent *ent;
++
++	if (h == NULL) {
++		seq_puts(m, "#domain type id [name]\n");
++		return 0;
++	}
++	ent = container_of(h, struct ent, h);
++	seq_printf(m, "%s %s %d", ent->authname,
++			ent->type == IDMAP_TYPE_GROUP ? "group" : "user",
++			ent->id);
++	if (test_bit(CACHE_VALID, &h->flags))
++		seq_printf(m, " %s", ent->name);
++	seq_printf(m, "\n");
++	return 0;
++}
++
++static int         idtoname_parse(struct cache_detail *, char *, int);
++static struct ent *idtoname_lookup(struct ent *, int);
++
++struct cache_detail idtoname_cache = {
++	.hash_size	= ENT_HASHMAX,
++	.hash_table	= idtoname_table,
++	.name		= "nfs4.idtoname",
++	.cache_put	= ent_put,
++	.cache_request	= idtoname_request,
++	.cache_parse	= idtoname_parse,
++	.cache_show	= idtoname_show,
++};
++
++int
++idtoname_parse(struct cache_detail *cd, char *buf, int buflen)
++{
++	struct ent ent, *res;
++	char *buf1, *bp;
++	int error = -EINVAL;
++
++	if (buf[buflen - 1] != '\n')
++		return (-EINVAL);
++	buf[buflen - 1]= '\0';
++
++	buf1 = kmalloc(PAGE_SIZE, GFP_KERNEL);
++	if (buf1 == NULL)
++		return (-ENOMEM);
++
++	memset(&ent, 0, sizeof(ent));
++
++	/* Authentication name */
++	if (qword_get(&buf, buf1, PAGE_SIZE) <= 0)
++		goto out;
++	memcpy(ent.authname, buf1, sizeof(ent.authname));
++
++	/* Type */
++	if (qword_get(&buf, buf1, PAGE_SIZE) <= 0)
++		goto out;
++	ent.type = strcmp(buf1, "user") == 0 ?
++		IDMAP_TYPE_USER : IDMAP_TYPE_GROUP;
++
++	/* ID */
++	if (qword_get(&buf, buf1, PAGE_SIZE) <= 0)
++		goto out;
++	ent.id = simple_strtoul(buf1, &bp, 10);
++	if (bp == buf1)
++		goto out;
++
++	/* expiry */
++	ent.h.expiry_time = get_expiry(&buf);
++	if (ent.h.expiry_time == 0)
++		goto out;
++
++	/* Name */
++	error = qword_get(&buf, buf1, PAGE_SIZE);
++	if (error == -EINVAL)
++		goto out;
++	if (error == -ENOENT)
++		set_bit(CACHE_NEGATIVE, &ent.h.flags);
++	else {
++		if (error >= IDMAP_NAMESZ) {
++			error = -EINVAL;
++			goto out;
++		}
++		memcpy(ent.name, buf1, sizeof(ent.name));
++	}
++	error = -ENOMEM;
++	if ((res = idtoname_lookup(&ent, 1)) == NULL)
++		goto out;
++
++	ent_put(&res->h, &idtoname_cache);
++
++	error = 0;
++out:
++	kfree(buf1);
++
++	return error;
++}
++
++static DefineSimpleCacheLookupMap(ent, idtoname);
++
++/*
++ * Name -> ID cache
++ */
++
++static struct cache_head *nametoid_table[ENT_HASHMAX];
++
++static inline int
++nametoid_hash(struct ent *ent)
++{
++	return hash_str(ent->name, ENT_HASHBITS);
++}
++
++void
++nametoid_request(struct cache_detail *cd, struct cache_head *ch, char **bpp,
++    int *blen)
++{
++ 	struct ent *ent = container_of(ch, struct ent, h);
++
++	qword_add(bpp, blen, ent->authname);
++	qword_add(bpp, blen, ent->type == IDMAP_TYPE_GROUP ? "group" : "user");
++	qword_add(bpp, blen, ent->name);
++
++	(*bpp)[-1] = '\n';
++}
++
++static inline int
++nametoid_match(struct ent *a, struct ent *b)
++{
++	return (a->type == b->type && strcmp(a->name, b->name) == 0 &&
++	    strcmp(a->authname, b->authname) == 0);
++}
++
++static int
++nametoid_show(struct seq_file *m, struct cache_detail *cd, struct cache_head *h)
++{
++	struct ent *ent;
++
++	if (h == NULL) {
++		seq_puts(m, "#domain type name [id]\n");
++		return 0;
++	}
++	ent = container_of(h, struct ent, h);
++	seq_printf(m, "%s %s %s", ent->authname,
++			ent->type == IDMAP_TYPE_GROUP ? "group" : "user",
++			ent->name);
++	if (test_bit(CACHE_VALID, &h->flags))
++		seq_printf(m, " %d", ent->id);
++	seq_printf(m, "\n");
++	return 0;
++}
++
++static struct ent *nametoid_lookup(struct ent *, int);
++int                nametoid_parse(struct cache_detail *, char *, int);
++
++struct cache_detail nametoid_cache = {
++	.hash_size	= ENT_HASHMAX,
++	.hash_table	= nametoid_table,
++	.name		= "nfs4.nametoid",
++	.cache_put	= ent_put,
++	.cache_request	= nametoid_request,
++	.cache_parse	= nametoid_parse,
++	.cache_show	= nametoid_show,
++};
++
++int
++nametoid_parse(struct cache_detail *cd, char *buf, int buflen)
++{
++	struct ent ent, *res;
++	char *buf1;
++	int error = -EINVAL;
++
++	if (buf[buflen - 1] != '\n')
++		return (-EINVAL);
++	buf[buflen - 1]= '\0';
++
++	buf1 = kmalloc(PAGE_SIZE, GFP_KERNEL);
++	if (buf1 == NULL)
++		return (-ENOMEM);
++
++	memset(&ent, 0, sizeof(ent));
++
++	/* Authentication name */
++	if (qword_get(&buf, buf1, PAGE_SIZE) <= 0)
++		goto out;
++	memcpy(ent.authname, buf1, sizeof(ent.authname));
++
++	/* Type */
++	if (qword_get(&buf, buf1, PAGE_SIZE) <= 0)
++		goto out;
++	ent.type = strcmp(buf1, "user") == 0 ?
++		IDMAP_TYPE_USER : IDMAP_TYPE_GROUP;
++
++	/* Name */
++	error = qword_get(&buf, buf1, PAGE_SIZE);
++	if (error <= 0 || error >= IDMAP_NAMESZ)
++		goto out;
++	memcpy(ent.name, buf1, sizeof(ent.name));
++
++	/* expiry */
++	ent.h.expiry_time = get_expiry(&buf);
++	if (ent.h.expiry_time == 0)
++		goto out;
++
++	/* ID */
++	error = get_int(&buf, &ent.id);
++	if (error == -EINVAL)
++		goto out;
++	if (error == -ENOENT)
++		set_bit(CACHE_NEGATIVE, &ent.h.flags);
++
++	error = -ENOMEM;
++	if ((res = nametoid_lookup(&ent, 1)) == NULL)
++		goto out;
++
++	ent_put(&res->h, &nametoid_cache);
++	error = 0;
++out:
++	kfree(buf1);
++
++	return (error);
++}
++
++static DefineSimpleCacheLookupMap(ent, nametoid);
++
++/*
++ * Exported API
++ */
++
++void
++nfsd_idmap_init(void)
++{
++	cache_register(&idtoname_cache);
++	cache_register(&nametoid_cache);
++}
++
++void
++nfsd_idmap_shutdown(void)
++{
++	cache_unregister(&idtoname_cache);
++	cache_unregister(&nametoid_cache);
++}
++
++/*
++ * Deferred request handling
++ */
++
++struct idmap_defer_req {
++       struct cache_req		req;
++       struct cache_deferred_req deferred_req;
++       wait_queue_head_t	waitq;
++       atomic_t			count;
++};
++
++static void
++put_mdr(struct idmap_defer_req *mdr)
++{
++	if (atomic_dec_and_test(&mdr->count))
++		kfree(mdr);
++}
++
++static void
++idmap_revisit(struct cache_deferred_req *dreq, int toomany)
++{
++	struct idmap_defer_req *mdr =
++		container_of(dreq, struct idmap_defer_req, deferred_req);
++
++	wake_up(&mdr->waitq);
++	put_mdr(mdr);
++}
++
++static struct cache_deferred_req *
++idmap_defer(struct cache_req *req)
++{
++	struct idmap_defer_req *mdr =
++		container_of(req, struct idmap_defer_req, req);
++
++	mdr->deferred_req.revisit = idmap_revisit;
++	return (&mdr->deferred_req);
++}
++
++static int threads_waiting = 0;
++
++static inline int
++idmap_lookup_wait(struct idmap_defer_req *mdr, wait_queue_t waitq, struct
++		svc_rqst *rqstp) {
++	int ret = -ETIMEDOUT;
++
++	set_task_state(current, TASK_INTERRUPTIBLE);
++	lock_kernel();
++	/* XXX: Does it matter that threads_waiting isn't per-server? */
++	/* Note: BKL prevents races with nfsd_svc and other lookups */
++	if (2 * threads_waiting > rqstp->rq_server->sv_nrthreads)
++		goto out;
++	threads_waiting++;
++	schedule_timeout(10 * HZ);
++	threads_waiting--;
++	ret = 0;
++out:
++	unlock_kernel();
++	remove_wait_queue(&mdr->waitq, &waitq);
++	set_task_state(current, TASK_RUNNING);
++	put_mdr(mdr);
++	return ret;
++}
++
++static int
++idmap_lookup(struct svc_rqst *rqstp,
++		struct ent *(*lookup_fn)(struct ent *, int), struct ent *key,
++		struct cache_detail *detail, struct ent **item)
++{
++	struct idmap_defer_req *mdr;
++	DECLARE_WAITQUEUE(waitq, current);
++	int ret;
++
++	*item = lookup_fn(key, 0);
++	if (!*item)
++		return -ENOMEM;
++	mdr = kmalloc(sizeof(*mdr), GFP_KERNEL);
++	memset(mdr, 0, sizeof(*mdr));
++	init_waitqueue_head(&mdr->waitq);
++	add_wait_queue(&mdr->waitq, &waitq);
++	atomic_set(&mdr->count, 2);
++	mdr->req.defer = idmap_defer;
++	ret = cache_check(detail, &(*item)->h, &mdr->req);
++	if (ret == -EAGAIN) {
++		ret = idmap_lookup_wait(mdr, waitq, rqstp);
++		if (ret)
++			goto out;
++		/* Try again, but don't wait. */
++		*item = lookup_fn(key, 0);
++		ret = -ENOMEM;
++		if (!*item)
++			goto out;
++		ret = -ETIMEDOUT;
++		if (!test_bit(CACHE_VALID, &(*item)->h.flags)) {
++			ent_put(&(*item)->h, detail);
++			goto out;
++		}
++		ret = cache_check(detail, &(*item)->h, NULL);
++	}
++out:
++	return ret;
++}
++
++static int
++idmap_name_to_id(struct svc_rqst *rqstp, int type, const char *name, u32 namelen,
++		uid_t *id)
++{
++	struct ent *item, key = {
++		.type = type,
++	};
++	int ret;
++
++	if (namelen + 1 > sizeof(key.name))
++		return -EINVAL;
++	memcpy(key.name, name, namelen);
++	key.name[namelen] = '\0';
++	strlcpy(key.authname, rqstp->rq_client->name, sizeof(key.authname));
++	ret = idmap_lookup(rqstp, nametoid_lookup, &key, &nametoid_cache, &item);
++	if (ret)
++		return ret;
++	*id = item->id;
++	ent_put(&item->h, &nametoid_cache);
++	return 0;
++}
++
++static int
++idmap_id_to_name(struct svc_rqst *rqstp, int type, uid_t id, char *name)
++{
++	struct ent *item, key = {
++		.id = id,
++		.type = type,
++	};
++	int ret;
++
++	strlcpy(key.authname, rqstp->rq_client->name, sizeof(key.authname));
++	ret = idmap_lookup(rqstp, idtoname_lookup, &key, &idtoname_cache, &item);
++	if (ret)
++		return ret;
++	ret = strlen(item->name);
++	BUG_ON(ret > IDMAP_NAMESZ);
++	memcpy(name, item->name, ret);
++	ent_put(&item->h, &idtoname_cache);
++	return ret;
++}
++
++int
++nfsd_map_name_to_uid(struct svc_rqst *rqstp, const char *name, size_t namelen,
++		__u32 *id)
++{
++	return idmap_name_to_id(rqstp, IDMAP_TYPE_USER, name, namelen, id);
++}
++
++int
++nfsd_map_name_to_gid(struct svc_rqst *rqstp, const char *name, size_t namelen,
++		__u32 *id)
++{
++	return idmap_name_to_id(rqstp, IDMAP_TYPE_GROUP, name, namelen, id);
++}
++
++int
++nfsd_map_uid_to_name(struct svc_rqst *rqstp, __u32 id, char *name)
++{
++	return idmap_id_to_name(rqstp, IDMAP_TYPE_USER, id, name);
++}
++
++int
++nfsd_map_gid_to_name(struct svc_rqst *rqstp, __u32 id, char *name)
++{
++	return idmap_id_to_name(rqstp, IDMAP_TYPE_GROUP, id, name);
++}
+diff -puN fs/nfsd/nfsctl.c~CITI_NFS4_ALL fs/nfsd/nfsctl.c
+--- linux-2.6.3/fs/nfsd/nfsctl.c~CITI_NFS4_ALL	2004-02-19 16:47:06.000000000 -0500
++++ linux-2.6.3-bfields/fs/nfsd/nfsctl.c	2004-02-19 16:47:06.000000000 -0500
+@@ -24,6 +24,7 @@
+ #include <linux/init.h>
+ 
+ #include <linux/nfs.h>
++#include <linux/nfsd_idmap.h>
+ #include <linux/sunrpc/svc.h>
+ #include <linux/nfsd/nfsd.h>
+ #include <linux/nfsd/cache.h>
+@@ -436,6 +437,9 @@ static int __init init_nfsd(void)
+ 	nfsd_cache_init();	/* RPC reply cache */
+ 	nfsd_export_init();	/* Exports table */
+ 	nfsd_lockd_init();	/* lockd->nfsd callbacks */
++#ifdef CONFIG_NFSD_V4
++	nfsd_idmap_init();      /* Name to ID mapping */
++#endif /* CONFIG_NFSD_V4 */
+ 	if (proc_mkdir("fs/nfs", 0)) {
+ 		struct proc_dir_entry *entry;
+ 		entry = create_proc_entry("fs/nfs/exports", 0, NULL);
+@@ -462,6 +466,9 @@ static void __exit exit_nfsd(void)
+ 	remove_proc_entry("fs/nfs", NULL);
+ 	nfsd_stat_shutdown();
+ 	nfsd_lockd_shutdown();
++#ifdef CONFIG_NFSD_V4
++	nfsd_idmap_shutdown();
++#endif /* CONFIG_NFSD_V4 */
+ 	unregister_filesystem(&nfsd_fs_type);
+ }
+ 
+diff -puN fs/nfsd/nfsproc.c~CITI_NFS4_ALL fs/nfsd/nfsproc.c
+--- linux-2.6.3/fs/nfsd/nfsproc.c~CITI_NFS4_ALL	2004-02-19 16:47:06.000000000 -0500
++++ linux-2.6.3-bfields/fs/nfsd/nfsproc.c	2004-02-19 16:47:06.000000000 -0500
+@@ -585,6 +585,7 @@ nfserrno (int errno)
+ 		{ nfserr_dquot, -EDQUOT },
+ #endif
+ 		{ nfserr_stale, -ESTALE },
++		{ nfserr_jukebox, -ETIMEDOUT },
+ 		{ nfserr_dropit, -EAGAIN },
+ 		{ nfserr_dropit, -ENOMEM },
+ 		{ -1, -EIO }
+diff -puN /dev/null include/linux/nfsd_idmap.h
+--- /dev/null	2004-01-26 19:20:21.000000000 -0500
++++ linux-2.6.3-bfields/include/linux/nfsd_idmap.h	2004-02-19 16:47:06.000000000 -0500
+@@ -0,0 +1,54 @@
++/*
++ *  include/linux/nfsd_idmap.h
++ *
++ *  Mapping of UID to name and vice versa.
++ *
++ *  Copyright (c) 2002, 2003 The Regents of the University of
++ *  Michigan.  All rights reserved.
++> *
++ *  Marius Aamodt Eriksen <marius@umich.edu>
++ *
++ *  Redistribution and use in source and binary forms, with or without
++ *  modification, are permitted provided that the following conditions
++ *  are met:
++ *
++ *  1. Redistributions of source code must retain the above copyright
++ *     notice, this list of conditions and the following disclaimer.
++ *  2. Redistributions in binary form must reproduce the above copyright
++ *     notice, this list of conditions and the following disclaimer in the
++ *     documentation and/or other materials provided with the distribution.
++ *  3. Neither the name of the University nor the names of its
++ *     contributors may be used to endorse or promote products derived
++ *     from this software without specific prior written permission.
++ *
++ *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
++ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
++ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
++ *  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++ *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
++ *  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
++
++#ifndef LINUX_NFSD_IDMAP_H
++#define LINUX_NFSD_IDMAP_H
++
++#include <linux/in.h>
++#include <linux/sunrpc/svc.h>
++
++/* XXX from linux/nfs_idmap.h */
++#define IDMAP_NAMESZ 128
++
++void nfsd_idmap_init(void);
++void nfsd_idmap_shutdown(void);
++
++int nfsd_map_name_to_uid(struct svc_rqst *, const char *, size_t, __u32 *);
++int nfsd_map_name_to_gid(struct svc_rqst *, const char *, size_t, __u32 *);
++int nfsd_map_uid_to_name(struct svc_rqst *, __u32, char *);
++int nfsd_map_gid_to_name(struct svc_rqst *, __u32, char *);
++
++#endif /* LINUX_NFSD_IDMAP_H */
+diff -puN include/linux/nfsd/xdr4.h~CITI_NFS4_ALL include/linux/nfsd/xdr4.h
+--- linux-2.6.3/include/linux/nfsd/xdr4.h~CITI_NFS4_ALL	2004-02-19 16:47:06.000000000 -0500
++++ linux-2.6.3-bfields/include/linux/nfsd/xdr4.h	2004-02-19 16:47:10.000000000 -0500
+@@ -39,6 +39,8 @@
+ #ifndef _LINUX_NFSD_XDR4_H
+ #define _LINUX_NFSD_XDR4_H
+ 
++#include <linux/nfs4.h>
++
+ #define NFSD4_MAX_TAGLEN	128
+ #define XDR_LEN(n)                     (((n) + 3) & ~3)
+ 
+@@ -54,10 +56,10 @@ typedef struct {
+ 
+ struct nfsd4_change_info {
+ 	u32		atomic;
+-	u32		before_size;
+-	u32		before_ctime;
+-	u32		after_size;
+-	u32		after_ctime;
++	u32		before_ctime_sec;
++	u32		before_ctime_nsec;
++	u32		after_ctime_sec;
++	u32		after_ctime_nsec;
+ };
+ 
+ struct nfsd4_access {
+@@ -95,6 +97,7 @@ struct nfsd4_create {
+ 	u32		cr_bmval[2];        /* request */
+ 	struct iattr	cr_iattr;           /* request */
+ 	struct nfsd4_change_info  cr_cinfo; /* response */
++	struct nfs4_acl *cr_acl;
+ };
+ #define cr_linklen	u.link.namelen
+ #define cr_linkname	u.link.name
+@@ -216,7 +219,7 @@ struct nfsd4_open {
+ 	u32		op_rflags;          /* response */
+ 	int		op_truncate;        /* used during processing */
+ 	struct nfs4_stateowner *op_stateowner; /* used during processing */
+-
++	struct nfs4_acl *op_acl;
+ };
+ #define op_iattr	u.iattr
+ #define op_verf		u.verf
+@@ -263,6 +266,10 @@ struct nfsd4_readdir {
+ 	u32 *			offset;
+ };
+ 
++struct nfsd4_release_lockowner {
++	clientid_t        rl_clientid;
++	struct xdr_netobj rl_owner;
++};
+ struct nfsd4_readlink {
+ 	struct svc_rqst *rl_rqstp;          /* request */
+ 	struct svc_fh *	rl_fhp;             /* request */
+@@ -287,6 +294,7 @@ struct nfsd4_setattr {
+ 	stateid_t	sa_stateid;         /* request */
+ 	u32		sa_bmval[2];        /* request */
+ 	struct iattr	sa_iattr;           /* request */
++	struct nfs4_acl *sa_acl;
+ };
+ 
+ struct nfsd4_setclientid {
+@@ -359,6 +367,7 @@ struct nfsd4_op {
+ 		struct nfsd4_setclientid_confirm setclientid_confirm;
+ 		struct nfsd4_verify		verify;
+ 		struct nfsd4_write		write;
++		struct nfsd4_release_lockowner	release_lockowner;
+ 	} u;
+ 	struct nfs4_replay *			replay;
+ };
+@@ -373,9 +382,12 @@ struct nfsd4_compoundargs {
+ 	u32 *				tmpp;
+ 	struct tmpbuf {
+ 		struct tmpbuf *next;
++		void (*release)(const void *);
+ 		void *buf;
+ 	}				*to_free;
+-	
++
++	struct svc_rqst			*rqstp;
++
+ 	u32				taglen;
+ 	char *				tag;
+ 	u32				minorversion;
+@@ -404,10 +416,10 @@ set_change_info(struct nfsd4_change_info
+ {
+ 	BUG_ON(!fhp->fh_pre_saved || !fhp->fh_post_saved);
+ 	cinfo->atomic = 1;
+-	cinfo->before_size = fhp->fh_pre_size;
+-	cinfo->before_ctime = fhp->fh_pre_ctime.tv_sec;
+-	cinfo->after_size = fhp->fh_post_size;
+-	cinfo->after_ctime = fhp->fh_post_ctime.tv_sec;
++	cinfo->before_ctime_sec = fhp->fh_pre_ctime.tv_sec;
++	cinfo->before_ctime_nsec = fhp->fh_pre_ctime.tv_nsec;
++	cinfo->after_ctime_sec = fhp->fh_post_ctime.tv_sec;
++	cinfo->after_ctime_nsec = fhp->fh_post_ctime.tv_nsec;
+ }
+ 
+ int nfs4svc_encode_voidres(struct svc_rqst *, u32 *, void *);
+@@ -419,7 +431,7 @@ void nfsd4_encode_operation(struct nfsd4
+ void nfsd4_encode_replay(struct nfsd4_compoundres *resp, struct nfsd4_op *op);
+ int nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,
+ 		       struct dentry *dentry, u32 *buffer, int *countp, 
+-		       u32 *bmval);
++		       u32 *bmval, struct svc_rqst *);
+ extern int nfsd4_setclientid(struct svc_rqst *rqstp, 
+ 		struct nfsd4_setclientid *setclid);
+ extern int nfsd4_setclientid_confirm(struct svc_rqst *rqstp, 
+@@ -439,6 +451,9 @@ extern int nfsd4_lockt(struct svc_rqst *
+ 		struct nfsd4_lockt *lockt);
+ extern int nfsd4_locku(struct svc_rqst *rqstp, struct svc_fh *current_fh, 
+ 		struct nfsd4_locku *locku);
++extern int nfsd4_release_lockowner(struct svc_rqst *rqstp,
++		struct nfsd4_release_lockowner *rlockowner);
++extern void nfsd4_release_compoundargs(struct nfsd4_compoundargs *);
+ #endif
+ 
+ /*
+diff -puN -L include/linux/sunrpc/name_lookup.h include/linux/sunrpc/name_lookup.h~CITI_NFS4_ALL /dev/null
+--- linux-2.6.3/include/linux/sunrpc/name_lookup.h
++++ /dev/null	2004-01-26 19:20:21.000000000 -0500
+@@ -1,38 +0,0 @@
+-
+-/*
+- * map between user/group name and id for a given 'client' 
+- */
+-
+-struct name_ent {
+-	char name[20];
+-};
+-static inline int name_get_user(int uid, struct name_ent **namep)
+-{
+-	struct name_ent *n = kmalloc(sizeof(*n),GFP_KERNEL);
+-	if (n) sprintf(n->name, "%d",uid);
+-	*namep = n;
+-	return n ? 0 : -ENOMEM;
+-}
+-static inline int name_get_group(int uid, struct name_ent **namep)
+-{
+-	struct name_ent *n = kmalloc(sizeof(*n),GFP_KERNEL);
+-	if (n) sprintf(n->name, "%d",uid);
+-	*namep = n;
+-	return n ? 0 : -ENOMEM;
+-}
+-static inline int name_get_uid(char *name, int name_len, int *uidp)
+-{
+-	*uidp = simple_strtoul(name, NULL, 0);
+-	return 0;
+-}
+-
+-static inline int name_get_gid(char *name, int name_len, int *gidp)
+-{
+-	*gidp = simple_strtoul(name, NULL, 0);
+-	return 0;
+-}
+-
+-static inline void name_put(struct name_ent *ent) 
+-{
+-	kfree(ent);
+-}
+diff -puN fs/Makefile~CITI_NFS4_ALL fs/Makefile
+--- linux-2.6.3/fs/Makefile~CITI_NFS4_ALL	2004-02-19 16:47:06.000000000 -0500
++++ linux-2.6.3-bfields/fs/Makefile	2004-02-19 16:47:06.000000000 -0500
+@@ -68,6 +68,7 @@ obj-$(CONFIG_NFS_FS)		+= nfs/
+ obj-$(CONFIG_EXPORTFS)		+= exportfs/
+ obj-$(CONFIG_NFSD)		+= nfsd/
+ obj-$(CONFIG_LOCKD)		+= lockd/
++obj-$(CONFIG_NFS_V4_ACL)        += nfs4acl/
+ obj-$(CONFIG_NLS)		+= nls/
+ obj-$(CONFIG_SYSV_FS)		+= sysv/
+ obj-$(CONFIG_SMB_FS)		+= smbfs/
+diff -puN /dev/null fs/nfs4acl/acl.c
+--- /dev/null	2004-01-26 19:20:21.000000000 -0500
++++ linux-2.6.3-bfields/fs/nfs4acl/acl.c	2004-02-19 16:47:06.000000000 -0500
+@@ -0,0 +1,921 @@
++/*
++ *  fs/nfs4acl/acl.c
++ *
++ *  Common NFSv4 ACL handling code.
++ *
++ *  Copyright (c) 2002, 2003 The Regents of the University of Michigan.
++ *  All rights reserved.
++ *
++ *  Marius Aamodt Eriksen <marius@umich.edu>
++ *  Jeff Sedlak <jsedlak@umich.edu>
++ * 
++ *  Redistribution and use in source and binary forms, with or without
++ *  modification, are permitted provided that the following conditions
++ *  are met:
++ *
++ *  1. Redistributions of source code must retain the above copyright
++ *     notice, this list of conditions and the following disclaimer.
++ *  2. Redistributions in binary form must reproduce the above copyright
++ *     notice, this list of conditions and the following disclaimer in the
++ *     documentation and/or other materials provided with the distribution.
++ *  3. Neither the name of the University nor the names of its
++ *     contributors may be used to endorse or promote products derived
++ *     from this software without specific prior written permission.
++ *
++ *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
++ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
++ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
++ *  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++ *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
++ *  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
++
++#include <linux/string.h>
++#include <linux/slab.h>
++#include <linux/list.h>
++#include <linux/types.h>
++#include <linux/fs.h>
++#include <linux/nfs_fs.h>
++#include <linux/posix_acl.h>
++#include <linux/nfs4.h>
++#include <linux/nfs4_acl.h>
++
++#define NFS4_READ_MODE (NFS4_ACE_READ_DATA | NFS4_ACE_READ_NAMED_ATTRS)
++#define NFS4_WRITE_MODE (NFS4_ACE_WRITE_DATA | NFS4_ACE_WRITE_NAMED_ATTRS | NFS4_ACE_APPEND_DATA | NFS4_ACE_DELETE_CHILD)
++#define NFS4_EXECUTE_MODE NFS4_ACE_EXECUTE
++#define NFS4_ANYONE_MODE (NFS4_ACE_READ_ATTRIBUTES | NFS4_ACE_READ_ACL)
++#define NFS4_OWNER_MODE (NFS4_ACE_WRITE_ATTRIBUTES | NFS4_ACE_WRITE_ACL)
++
++#define MASK_EQUAL(mask1, mask2) \
++	( ((mask1) & NFS4_ACE_MASK_ALL) == ((mask2) & NFS4_ACE_MASK_ALL) )
++
++static u32
++mask_from_posix(unsigned short perm, int owner)
++{
++	int mask = NFS4_ANYONE_MODE;
++	if (owner)
++		mask |= NFS4_OWNER_MODE;
++	if (perm & ACL_READ)
++		mask |= NFS4_READ_MODE;
++	if (perm & ACL_WRITE)
++		mask |= NFS4_WRITE_MODE;
++	if (perm & ACL_EXECUTE)
++		mask |= NFS4_EXECUTE_MODE;
++	return mask;
++}
++
++static int
++mode_from_nfs4(u32 perm, unsigned short *mode, int owner)
++{
++	/* XXX we might also want to ignore DELETE_CHILD on non-directories */
++	/* XXX also add special interpretation to EXECUTE on directories */
++	u32 ignore = NFS4_ACE_SYNCHRONIZE;
++
++	*mode = 0;
++	if ((perm & NFS4_READ_MODE) == NFS4_READ_MODE)
++		*mode |= ACL_READ;
++	if ((perm & NFS4_WRITE_MODE) == NFS4_WRITE_MODE)
++		*mode |= ACL_WRITE;
++	if ((perm & NFS4_EXECUTE_MODE) == NFS4_EXECUTE_MODE)
++		*mode |= ACL_EXECUTE;
++	if (!MASK_EQUAL(ignore|perm, ignore|mask_from_posix(*mode, owner)))
++		return -EINVAL;
++	return 0;
++}
++
++struct ace_container {
++	struct nfs4_ace  *ace;
++	struct list_head  ace_l;
++};
++
++static short	ace2type(struct nfs4_ace *);
++static int	_posix_to_nfsv4_one(struct nfs4_acl_idmapper *, void *idarg, struct posix_acl *, struct nfs4_acl *, int);
++static struct posix_acl *_nfsv4_to_posix_one(struct nfs4_acl_idmapper *, void *idarg, struct nfs4_acl *);
++
++struct nfs4_acl *
++nfs4_acl_posix_to_nfsv4(struct nfs4_acl_idmapper *idmapper, void *idarg,
++		struct posix_acl *pacl, struct posix_acl *dpacl)
++{
++	struct nfs4_acl *acl;
++	int error = -EINVAL;
++
++	if ((pacl != NULL &&
++		(posix_acl_valid(pacl) < 0 || pacl->a_count == 0)) ||
++	    (dpacl != NULL &&
++		(posix_acl_valid(dpacl) < 0 || dpacl->a_count == 0)))
++		goto out_err;
++
++	acl = nfs4_acl_new();
++	if (acl == NULL) {
++		error = -ENOMEM;
++		goto out_err;
++	}
++
++	if (pacl != NULL) {
++		error = _posix_to_nfsv4_one(idmapper, idarg, pacl, acl, 0);
++		if (error < 0)
++			goto out_acl;
++	}
++
++	if (dpacl != NULL) {
++		error = _posix_to_nfsv4_one(idmapper, idarg, dpacl, acl,
++		    NFS4_ACE_FILE_INHERIT_ACE |
++		    NFS4_ACE_DIRECTORY_INHERIT_ACE |		    
++		    NFS4_ACE_INHERIT_ONLY_ACE);
++		if (error < 0)
++			goto out_acl;
++	}
++
++	return acl;
++
++out_acl:
++	nfs4_acl_free(acl);
++out_err:
++	acl = ERR_PTR(error);
++
++	return acl;
++}
++
++static int
++nfs4_acl_add_pair(struct nfs4_acl *acl, int eflag, u32 mask, char *owner,
++		      int owner_len)
++{
++	int error;
++
++	error = nfs4_acl_add_ace(acl, NFS4_ACE_ACCESS_ALLOWED_ACE_TYPE,
++				 eflag, mask, owner, owner_len);
++	if (error < 0)
++		return error;
++	error = nfs4_acl_add_ace(acl, NFS4_ACE_ACCESS_DENIED_ACE_TYPE,
++				eflag, ~mask, owner, owner_len);
++	return error;
++}
++
++/* We assume the acl has been verified with posix_acl_valid. */
++static int
++_posix_to_nfsv4_one(struct nfs4_acl_idmapper *idmapper, void *idarg,
++		struct posix_acl *pacl, struct nfs4_acl *acl, int eflag)
++{
++	struct posix_acl_entry *pa, *pe, *group_owner_entry;
++	int error = -EINVAL;
++	u32 mask, mask_mask; 
++	char xname[IDMAP_NAMESZ];
++	int xnamelen;
++
++	BUG_ON(pacl->a_count < 3);
++	pe = pacl->a_entries + pacl->a_count;
++	pa = pe - 2; /* if mask entry exists, it's second from the last. */
++	if (pa->e_tag == ACL_MASK)
++		mask_mask = ~mask_from_posix(pa->e_perm, 0);
++	else
++		mask_mask = 0;
++
++	pa = pacl->a_entries;
++	BUG_ON(pa->e_tag != ACL_USER_OBJ);
++	mask = mask_from_posix(pa->e_perm, 1);
++	error = nfs4_acl_add_pair(acl, eflag, mask, "OWNER@",
++				sizeof("OWNER@") - 1);
++	if (error < 0)
++		goto out;
++	pa++;
++
++	while (pa->e_tag == ACL_USER) {
++		mask = mask_from_posix(pa->e_perm, 0);
++		error = idmapper->uid2name(idarg, pa->e_id, xname);
++		if (error < 0)
++			goto out;
++		xnamelen = error;
++
++		error = nfs4_acl_add_ace(acl, NFS4_ACE_ACCESS_DENIED_ACE_TYPE,
++				eflag,  mask_mask, xname, xnamelen);
++		if (error < 0)
++			goto out;
++
++
++		error = nfs4_acl_add_pair(acl, eflag, mask, xname, xnamelen);
++		if (error < 0)
++			goto out;
++		pa++;
++	}
++
++	/* In the case of groups, we apply allow ACEs first, then deny ACEs,
++	 * since a user can be in more than one group.  */
++
++	/* allow ACEs */
++
++	if (pacl->a_count > 3) {
++		BUG_ON(pa->e_tag != ACL_GROUP_OBJ);
++		error = nfs4_acl_add_ace(acl, NFS4_ACE_ACCESS_DENIED_ACE_TYPE,
++				NFS4_ACE_IDENTIFIER_GROUP | eflag, mask_mask,
++				"GROUP@", sizeof("GROUP@") - 1);
++		if (error < 0)
++			goto out;
++	}
++	group_owner_entry = pa;
++	mask = mask_from_posix(pa->e_perm, 0);
++	error = nfs4_acl_add_ace(acl, NFS4_ACE_ACCESS_ALLOWED_ACE_TYPE,
++			NFS4_ACE_IDENTIFIER_GROUP | eflag, mask,
++			"GROUP@", sizeof("GROUP@") - 1);
++	if (error < 0)
++		goto out;
++	pa++;
++
++	while (pa->e_tag == ACL_GROUP) {
++		mask = mask_from_posix(pa->e_perm, 0);
++		error = idmapper->gid2name(idarg, pa->e_id, xname);
++		if (error < 0)
++			goto out;
++		xnamelen = error;
++
++		error = nfs4_acl_add_ace(acl, NFS4_ACE_ACCESS_DENIED_ACE_TYPE,
++				NFS4_ACE_IDENTIFIER_GROUP | eflag,
++				mask_mask, xname, xnamelen);
++		if (error < 0)
++			goto out;
++
++		error = nfs4_acl_add_ace(acl, NFS4_ACE_ACCESS_ALLOWED_ACE_TYPE,
++		    NFS4_ACE_IDENTIFIER_GROUP | eflag, mask, xname, xnamelen);
++		if (error < 0)
++			goto out;
++		pa++;
++	}
++
++	/* deny ACEs */
++
++	pa = group_owner_entry;
++	mask = mask_from_posix(pa->e_perm, 0);
++	error = nfs4_acl_add_ace(acl, NFS4_ACE_ACCESS_DENIED_ACE_TYPE,
++			NFS4_ACE_IDENTIFIER_GROUP | eflag,
++			~mask, "GROUP@", sizeof("GROUP@") - 1);
++	if (error < 0)
++		goto out;
++	pa++;
++	while (pa->e_tag == ACL_GROUP) {
++		mask = mask_from_posix(pa->e_perm, 0);
++		error = idmapper->gid2name(idarg, pa->e_id, xname);
++		if (error < 0)
++			goto out;
++		xnamelen = error;
++
++		error = nfs4_acl_add_ace(acl, NFS4_ACE_ACCESS_DENIED_ACE_TYPE,
++		    NFS4_ACE_IDENTIFIER_GROUP | eflag, ~mask, xname, xnamelen);
++		if (error < 0)
++			goto out;
++		pa++;
++	}
++
++	if (pa->e_tag == ACL_MASK)
++		pa++;
++	BUG_ON(pa->e_tag != ACL_OTHER);
++	mask = mask_from_posix(pa->e_perm, 0);
++	error = nfs4_acl_add_pair(acl, eflag, mask, "EVERYONE@",
++				sizeof("EVERYONE@") - 1);
++
++out:
++	return error;
++}
++
++static void
++sort_pacl_range(struct posix_acl *pacl, int start, int end) {
++	int sorted = 0, i;
++	struct posix_acl_entry tmp;
++
++	/* We just do a bubble sort; easy to do in place, and we're not
++	 * expecting acl's to be long enough to justify anything more. */
++	while (!sorted) {
++		sorted = 1;
++		for (i = start; i < end; i++) {
++			if (pacl->a_entries[i].e_id
++					> pacl->a_entries[i+1].e_id) {
++				sorted = 0;
++				tmp = pacl->a_entries[i];
++				pacl->a_entries[i] = pacl->a_entries[i+1];
++				pacl->a_entries[i+1] = tmp;
++			}
++		}
++	}
++}
++
++static void
++sort_pacl(struct posix_acl *pacl)
++{
++	/* posix_acl_valid requires that users and groups be in order
++	 * by uid/gid. */
++	int i, j;
++
++	if (pacl->a_count <= 4)
++		return; /* no users or groups */
++	i = 1;
++	while (pacl->a_entries[i].e_tag == ACL_USER)
++		i++;
++	sort_pacl_range(pacl, 1, i-1);
++
++	BUG_ON(pacl->a_entries[i].e_tag != ACL_GROUP_OBJ);
++	j = i++;
++	while (pacl->a_entries[j].e_tag == ACL_GROUP)
++		j++;
++	sort_pacl_range(pacl, i, j-1);
++	return;
++}
++
++static int
++write_pace(struct nfs4_ace *ace, struct posix_acl *pacl,
++		struct posix_acl_entry **pace, short tag,
++		struct nfs4_acl_idmapper *idmapper, void *idarg)
++{
++	struct posix_acl_entry *this = *pace;;
++
++	if (*pace == pacl->a_entries + pacl->a_count)
++		return -EINVAL; /* fell off the end */
++	(*pace)++;
++	this->e_tag = tag;
++	if (mode_from_nfs4(ace->access_mask, &this->e_perm,
++				tag == ACL_USER_OBJ))
++		return -EINVAL;
++	switch (tag) {
++	case ACL_USER:
++		return idmapper->name2uid(idarg, ace->who, ace->wholen,
++				&this->e_id);
++	case ACL_GROUP:
++		return idmapper->name2gid(idarg, ace->who, ace->wholen,
++				&this->e_id);
++	default:
++		this->e_id = ACL_UNDEFINED_ID;
++		return 0;
++	}
++}
++
++static struct nfs4_ace *
++get_next_v4_ace(struct list_head **p, struct list_head *head)
++{
++	struct nfs4_ace *ace;
++
++	*p = (*p)->next;
++	if (*p == head)
++		return NULL;
++	ace = list_entry(*p, struct nfs4_ace, l_ace);
++
++	return ace;
++}
++
++int
++nfs4_acl_nfsv4_to_posix(struct nfs4_acl_idmapper *idmapper, void *idarg,
++		struct nfs4_acl *acl, struct posix_acl **pacl,
++		struct posix_acl **dpacl)
++{
++	struct nfs4_acl *dacl;
++	int error = -ENOMEM;
++
++	*pacl = NULL;
++	*dpacl = NULL;
++
++	dacl = nfs4_acl_new();
++	if (dacl == NULL)
++		goto out;
++
++	error = nfs4_acl_split(acl, dacl);
++	if (error < 0)
++		goto out_acl;
++
++	if (pacl != NULL) {
++		if (acl->naces == 0) {
++			error = -ENODATA;
++			goto try_dpacl;
++		}
++
++		*pacl = _nfsv4_to_posix_one(idmapper, idarg, acl);
++		if (IS_ERR(*pacl)) {
++			error = PTR_ERR(*pacl);
++			*pacl = NULL;
++			goto out_acl;
++		}
++	}
++
++try_dpacl:
++	if (dpacl != NULL) {
++		if (dacl->naces == 0) {
++			if (pacl == NULL || *pacl == NULL)
++				error = -ENODATA;
++			goto out_acl;
++		}
++
++		error = 0;
++		*dpacl = _nfsv4_to_posix_one(idmapper, idarg, dacl);
++		if (IS_ERR(*dpacl)) {
++			error = PTR_ERR(*dpacl);
++			*dpacl = NULL;
++			goto out_acl;
++		}
++	}
++
++out_acl:
++	if (error && pacl) {
++		posix_acl_release(*pacl);
++		*pacl = NULL;
++	}
++	nfs4_acl_free(dacl);
++out:
++	return error;
++}
++
++static int
++complementary_ace_pair(struct nfs4_ace *allow, struct nfs4_ace *deny)
++{
++	return MASK_EQUAL(allow->access_mask, ~deny->access_mask) &&
++		allow->type == NFS4_ACE_ACCESS_ALLOWED_ACE_TYPE &&
++		deny->type == NFS4_ACE_ACCESS_DENIED_ACE_TYPE &&
++		allow->flag == deny->flag &&
++		allow->wholen == deny->wholen &&
++		memcmp(allow->who, deny->who, allow->wholen) == 0;
++}
++
++static inline int
++user_obj_from_v4(struct nfs4_acl *n4acl, struct list_head **p,
++		struct posix_acl *pacl, struct posix_acl_entry **pace,
++		struct nfs4_acl_idmapper *idmapper, void *idarg)
++{
++	int error = -EINVAL;
++	struct nfs4_ace *ace, *ace2;
++
++	ace = get_next_v4_ace(p, &n4acl->ace_head);
++	if (ace == NULL)
++		goto out;
++	if (ace2type(ace) != ACL_USER_OBJ)
++		goto out;
++	error = write_pace(ace, pacl, pace, ACL_USER_OBJ, idmapper, idarg);
++	if (error < 0)
++		goto out;
++	error = -EINVAL;
++	ace2 = get_next_v4_ace(p, &n4acl->ace_head);
++	if (ace2 == NULL)
++		goto out;
++	if (!complementary_ace_pair(ace, ace2))
++		goto out;
++	error = 0;
++out:
++	return error;
++}
++
++static inline int
++users_from_v4(struct nfs4_acl *n4acl, struct list_head **p,
++		struct nfs4_ace **mask_ace,
++		struct posix_acl *pacl, struct posix_acl_entry **pace,
++		struct nfs4_acl_idmapper *idmapper, void *idarg)
++{
++	int error = -EINVAL;
++	struct nfs4_ace *ace, *ace2;
++
++	ace = get_next_v4_ace(p, &n4acl->ace_head);
++	if (ace == NULL)
++		goto out;
++	while (ace2type(ace) == ACL_USER) {
++		if (ace->type != NFS4_ACE_ACCESS_DENIED_ACE_TYPE)
++			goto out;
++		if (*mask_ace &&
++			!MASK_EQUAL(ace->access_mask, (*mask_ace)->access_mask))
++			goto out;
++		*mask_ace = ace;
++		ace = get_next_v4_ace(p, &n4acl->ace_head);
++		if (ace == NULL)
++			goto out;
++		if (ace->type != NFS4_ACE_ACCESS_ALLOWED_ACE_TYPE)
++			goto out;
++		error = write_pace(ace, pacl, pace, ACL_USER, idmapper, idarg);
++		if (error < 0)
++			goto out;
++		error = -EINVAL;
++		ace2 = get_next_v4_ace(p, &n4acl->ace_head);
++		if (ace2 == NULL)
++			goto out;
++		if (!complementary_ace_pair(ace, ace2))
++			goto out;
++		if ((*mask_ace)->flag != ace2->flag ||
++			ace2->wholen != (*mask_ace)->wholen ||
++			memcmp(ace2->who, (*mask_ace)->who,
++				(*mask_ace)->wholen) != 0)
++			goto out;
++		ace = get_next_v4_ace(p, &n4acl->ace_head);
++		if (ace == NULL)
++			goto out;
++	}
++	error = 0;
++out:
++	return error;
++}
++
++static inline int
++group_obj_and_groups_from_v4(struct nfs4_acl *n4acl, struct list_head **p,
++		struct nfs4_ace **mask_ace,
++		struct posix_acl *pacl, struct posix_acl_entry **pace,
++		struct nfs4_acl_idmapper *idmapper, void *idarg)
++{
++	int error = -EINVAL;
++	struct nfs4_ace *ace, *ace2;
++	struct ace_container *ac;
++	struct list_head group_l;
++
++	INIT_LIST_HEAD(&group_l);
++	ace = list_entry(*p, struct nfs4_ace, l_ace);
++	
++	/* group owner (mask and allow aces) */
++
++	if (pacl->a_count != 3) {
++		/* then the group owner should be preceded by mask */
++		if (ace->type != NFS4_ACE_ACCESS_DENIED_ACE_TYPE)
++			goto out;
++		if (*mask_ace &&
++			!MASK_EQUAL(ace->access_mask, (*mask_ace)->access_mask))
++			goto out;
++		*mask_ace = ace;
++		ace = get_next_v4_ace(p, &n4acl->ace_head);
++		if (ace == NULL)
++			goto out;
++		
++		if ((*mask_ace)->flag != ace->flag ||
++			ace->wholen != (*mask_ace)->wholen ||
++			memcmp(ace->who, (*mask_ace)->who,
++				(*mask_ace)->wholen) != 0)
++			goto out;
++	}
++
++	if (ace2type(ace) != ACL_GROUP_OBJ)
++		goto out;
++	
++	ac = kmalloc(sizeof(*ac), GFP_KERNEL);
++	error = -ENOMEM;
++	if (ac == NULL)
++		goto out;
++	ac->ace = ace;
++	list_add_tail(&ac->ace_l, &group_l);
++
++	error = -EINVAL;
++	if (ace->type != NFS4_ACE_ACCESS_ALLOWED_ACE_TYPE)
++		goto out;
++
++	error = write_pace(ace, pacl, pace, ACL_GROUP_OBJ, idmapper, idarg);
++	if (error < 0)
++		goto out;
++
++	error = -EINVAL;
++	ace = get_next_v4_ace(p, &n4acl->ace_head);
++	if (ace == NULL)
++		goto out;
++
++	/* groups (mask and allow aces) */
++
++	while (ace2type(ace) == ACL_GROUP) {
++		if (*mask_ace == NULL)
++			goto out;
++
++		if (ace->type != NFS4_ACE_ACCESS_DENIED_ACE_TYPE ||
++			!MASK_EQUAL(ace->access_mask, (*mask_ace)->access_mask))
++			goto out;
++		*mask_ace = ace;
++
++		ace = get_next_v4_ace(p, &n4acl->ace_head);
++		if (ace == NULL)
++			goto out;
++		ac = kmalloc(sizeof(*ac), GFP_KERNEL);
++		error = -ENOMEM;
++		if (ac == NULL)
++			goto out;
++		error = -EINVAL;
++		if (ace->type != NFS4_ACE_ACCESS_ALLOWED_ACE_TYPE ||
++			ace->wholen != (*mask_ace)->wholen ||
++			memcmp(ace->who, (*mask_ace)->who, (*mask_ace)->wholen) != 0)
++			goto out;
++
++		ac->ace = ace;
++		list_add_tail(&ac->ace_l, &group_l);
++
++		error = write_pace(ace, pacl, pace, ACL_GROUP, idmapper, idarg);
++		if (error < 0)
++			goto out;
++		error = -EINVAL;
++		ace = get_next_v4_ace(p, &n4acl->ace_head);
++		if (ace == NULL)
++			goto out;
++	}
++
++	/* group owner (deny ace) */
++
++	if (ace2type(ace) != ACL_GROUP_OBJ)
++		goto out;
++	ac = list_entry(group_l.next, struct ace_container, ace_l);
++	ace2 = ac->ace;
++	if (!complementary_ace_pair(ace2, ace))
++		goto out;
++	list_del(group_l.next);
++	kfree(ac);
++
++	/* groups (deny aces) */
++
++	while (!list_empty(&group_l)) {
++		ace = get_next_v4_ace(p, &n4acl->ace_head);
++		if (ace == NULL)
++			goto out;
++		if (ace2type(ace) != ACL_GROUP)
++			goto out;
++		ac = list_entry(group_l.next, struct ace_container, ace_l);
++		ace2 = ac->ace;
++		if (!complementary_ace_pair(ace2, ace))
++			goto out;
++		list_del(group_l.next);
++		kfree(ac);
++	}
++
++	ace = get_next_v4_ace(p, &n4acl->ace_head);
++	if (ace == NULL)
++		goto out;
++	if (ace2type(ace) != ACL_OTHER)
++		goto out;
++	error = 0;
++out:
++	while (!list_empty(&group_l)) {
++		ac = list_entry(group_l.next, struct ace_container, ace_l);
++		list_del(group_l.next);
++		kfree(ac);
++	}
++	return error;
++}
++
++static inline int
++mask_from_v4(struct nfs4_acl *n4acl, struct list_head **p,
++		struct nfs4_ace **mask_ace,
++		struct posix_acl *pacl, struct posix_acl_entry **pace,
++		struct nfs4_acl_idmapper *idmapper, void *idarg)
++{
++	int error = -EINVAL;
++	struct nfs4_ace *ace;
++
++	ace = list_entry(*p, struct nfs4_ace, l_ace);
++	if (pacl->a_count != 3) {
++		if (*mask_ace == NULL)
++			goto out;
++		(*mask_ace)->access_mask = ~(*mask_ace)->access_mask;
++		write_pace(*mask_ace, pacl, pace, ACL_MASK, idmapper, idarg);
++	}
++	error = 0;
++out:
++	return error;
++}
++
++static inline int
++other_from_v4(struct nfs4_acl *n4acl, struct list_head **p,
++		struct posix_acl *pacl, struct posix_acl_entry **pace,
++		struct nfs4_acl_idmapper *idmapper, void *idarg)
++{
++	int error = -EINVAL;
++	struct nfs4_ace *ace, *ace2;
++
++	ace = list_entry(*p, struct nfs4_ace, l_ace);
++	if (ace->type != NFS4_ACE_ACCESS_ALLOWED_ACE_TYPE)
++		goto out;
++	error = write_pace(ace, pacl, pace, ACL_OTHER, idmapper, idarg);
++	if (error < 0)
++		goto out;
++	error = -EINVAL;
++	ace2 = get_next_v4_ace(p, &n4acl->ace_head);
++	if (ace2 == NULL)
++		goto out;
++	if (!complementary_ace_pair(ace, ace2))
++		goto out;
++	error = 0;
++out:
++	return error;
++}
++
++static int
++calculate_posix_ace_count(struct nfs4_acl *n4acl)
++{
++	if (n4acl->naces == 6) /* owner, owner group, and other only */
++		return 3;
++	else { /* Otherwise there must be a mask entry. */
++		/* Also, the remaining entries are for named users and
++		 * groups, and come in threes (mask, allow, deny): */
++		if ( (n4acl->naces - 7) % 3)
++			return -1;
++		return 4 + (n4acl->naces - 7)/3;
++	}
++}
++
++
++static struct posix_acl *
++_nfsv4_to_posix_one(struct nfs4_acl_idmapper *idmapper, void *idarg, struct nfs4_acl *n4acl)
++{
++	struct posix_acl *pacl;
++	int error = -EINVAL, nace = 0;
++	struct list_head *p;
++	struct nfs4_ace *mask_ace = NULL;
++	struct posix_acl_entry *pace;
++
++	nace = calculate_posix_ace_count(n4acl);
++
++	pacl = posix_acl_alloc(nace, GFP_KERNEL);
++	error = -ENOMEM;
++	if (pacl == NULL)
++		goto out_err;
++
++	pace = &pacl->a_entries[0];
++	p = &n4acl->ace_head;
++
++	error = user_obj_from_v4(n4acl, &p, pacl, &pace, idmapper, idarg);
++	if (error)
++		goto out_acl;
++
++	error = users_from_v4(n4acl, &p, &mask_ace, pacl, &pace, idmapper,
++			idarg);
++	if (error)
++		goto out_acl;
++
++	error = group_obj_and_groups_from_v4(n4acl, &p, &mask_ace, pacl, &pace,
++			idmapper, idarg);
++	if (error)
++		goto out_acl;
++
++	error = mask_from_v4(n4acl, &p, &mask_ace, pacl, &pace, idmapper, idarg);
++	if (error)
++		goto out_acl;
++	error = other_from_v4(n4acl, &p, pacl, &pace, idmapper, idarg);
++	if (error)
++		goto out_acl;
++
++	error = -EINVAL;
++	if (p->next != &n4acl->ace_head)
++		goto out_acl;
++	if (pace != pacl->a_entries + pacl->a_count)
++		goto out_acl;
++
++	sort_pacl(pacl);
++
++	return pacl;
++out_acl:
++	posix_acl_release(pacl);
++out_err:
++	pacl = ERR_PTR(error);
++	return pacl;
++}
++
++
++struct nfs4_acl *
++nfs4_acl_new(void)
++{
++	struct nfs4_acl *acl;
++
++	if ((acl = kmalloc(sizeof(*acl), GFP_KERNEL)) == NULL)
++		return NULL;
++
++	acl->naces = 0;
++	INIT_LIST_HEAD(&acl->ace_head);
++
++	return acl;
++}
++
++void
++nfs4_acl_free(struct nfs4_acl *acl)
++{
++	struct list_head *h;
++	struct nfs4_ace *ace;
++
++	if (!acl)
++		return;
++
++	while (!list_empty(&acl->ace_head)) {
++		h = acl->ace_head.next;
++		list_del(h);
++		ace = list_entry(h, struct nfs4_ace, l_ace);
++		if (ace->who != NULL)
++			kfree(ace->who);
++		kfree(ace);
++	}
++
++	kfree(acl);
++
++	return;
++}
++
++int
++nfs4_acl_add_ace(struct nfs4_acl *acl, u32 type, u32 flag, u32 access_mask,
++    char *who, u32 wholen)
++{
++	struct nfs4_ace *ace;
++
++	if ((ace = kmalloc(sizeof(*ace), GFP_KERNEL)) == NULL)
++		return -1;
++
++	ace->type = type;
++	ace->flag = flag;
++	ace->access_mask = access_mask;
++	if (wholen > 0) {
++		if ((ace->who = kmalloc(wholen, GFP_KERNEL)) == NULL)
++			goto fail;
++		memcpy(ace->who, who, wholen);
++	}
++	ace->wholen = wholen;
++
++	list_add_tail(&ace->l_ace, &acl->ace_head);
++
++	return ++acl->naces; /* XXXJBF: why? */
++
++fail:
++	kfree(ace);
++	return -1;
++}
++    
++
++int
++nfs4_acl_merge(struct nfs4_acl *fromacl, struct nfs4_acl *withacl)
++{
++	struct nfs4_ace *ace;
++	struct list_head *h;
++
++	if (fromacl == NULL || withacl == NULL)
++		return 0;
++
++	while (!list_empty(&fromacl->ace_head)) {
++		h = fromacl->ace_head.next;
++		list_del(h);
++		ace = list_entry(h, struct nfs4_ace, l_ace);
++		/* XXX */
++		ace->flag |= NFS4_ACE_FILE_INHERIT_ACE |
++		    NFS4_ACE_DIRECTORY_INHERIT_ACE | NFS4_ACE_INHERIT_ONLY_ACE;
++		list_add_tail(&ace->l_ace, &withacl->ace_head);
++		withacl->naces++;
++	}
++
++	return 0;
++}
++
++int
++nfs4_acl_split(struct nfs4_acl *acl, struct nfs4_acl *dacl)
++{
++	struct list_head *h, *n;
++	struct nfs4_ace *ace;
++	int error = 0;
++
++	list_for_each_safe(h, n, &acl->ace_head) {
++		ace = list_entry(h, struct nfs4_ace, l_ace);
++
++		if (!(ace->flag & NFS4_ACE_DIRECTORY_INHERIT_ACE &&
++			ace->flag & NFS4_ACE_FILE_INHERIT_ACE &&
++			ace->flag & NFS4_ACE_INHERIT_ONLY_ACE))
++			continue;
++
++		error = nfs4_acl_add_ace(dacl, ace->type, ace->flag,
++		    ace->access_mask, ace->who, ace->wholen) == -1;
++		if (error < 0)
++			goto out;
++
++		list_del(h);
++		if (ace->who != NULL)
++			kfree(ace->who);
++		kfree(ace);
++		acl->naces--;
++	}
++
++out:
++	return error;
++}
++
++static struct {
++	char *string;
++	int   stringlen;
++	short   type;
++} s2t_map[] = {
++	{
++		.string    = "OWNER@",
++		.stringlen = sizeof("OWNER@") - 1,
++		.type      = ACL_USER_OBJ
++	},
++	{
++		.string    = "GROUP@",
++		.stringlen = sizeof("GROUP@") - 1,
++		.type      = ACL_GROUP_OBJ
++	},
++	{
++		.string    = "EVERYONE@",
++		.stringlen = sizeof("EVERYONE@") - 1,
++		.type      = ACL_OTHER
++	},
++};
++
++static short
++ace2type(struct nfs4_ace *ace)
++{
++	int i;
++
++	if (ace->who == NULL || ace->wholen <= 0)
++		return (0);
++
++	for (i = 0; i < sizeof(s2t_map) / sizeof(*s2t_map); i++)
++		if (s2t_map[i].stringlen == ace->wholen &&
++		    strncmp(s2t_map[i].string, ace->who, ace->wholen) == 0)
++			return (s2t_map[i].type);
++
++	return (ace->flag & NFS4_ACE_IDENTIFIER_GROUP ? ACL_GROUP : ACL_USER);
++}
+diff -puN /dev/null fs/nfs4acl/acl_syms.c
+--- /dev/null	2004-01-26 19:20:21.000000000 -0500
++++ linux-2.6.3-bfields/fs/nfs4acl/acl_syms.c	2004-02-19 16:47:06.000000000 -0500
+@@ -0,0 +1,51 @@
++/*
++ *  fs/nfs4acl/acl_syms.c
++ *
++ *  Common NFSv4 ACL handling symbol exports.
++ *
++ *  Copyright (c) 2002 The Regents of the University of Michigan.
++ *  All rights reserved.
++ *
++ *  Marius Aamodt Eriksen <marius@umich.edu>
++ * 
++ *  Redistribution and use in source and binary forms, with or without
++ *  modification, are permitted provided that the following conditions
++ *  are met:
++ *
++ *  1. Redistributions of source code must retain the above copyright
++ *     notice, this list of conditions and the following disclaimer.
++ *  2. Redistributions in binary form must reproduce the above copyright
++ *     notice, this list of conditions and the following disclaimer in the
++ *     documentation and/or other materials provided with the distribution.
++ *  3. Neither the name of the University nor the names of its
++ *     contributors may be used to endorse or promote products derived
++ *     from this software without specific prior written permission.
++ *
++ *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
++ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
++ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
++ *  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++ *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
++ *  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
++
++
++#include <linux/config.h>
++#include <linux/module.h>
++
++#include <linux/types.h>
++#include <linux/fs.h>
++#include <linux/posix_acl.h>
++#include <linux/nfs4.h>
++#include <linux/nfs4_acl.h>
++
++EXPORT_SYMBOL(nfs4_acl_new);
++EXPORT_SYMBOL(nfs4_acl_free);
++EXPORT_SYMBOL(nfs4_acl_merge);
++EXPORT_SYMBOL(nfs4_acl_split);
++EXPORT_SYMBOL(nfs4_acl_add_ace);
+diff -puN /dev/null fs/nfs4acl/Makefile
+--- /dev/null	2004-01-26 19:20:21.000000000 -0500
++++ linux-2.6.3-bfields/fs/nfs4acl/Makefile	2004-02-19 16:47:06.000000000 -0500
+@@ -0,0 +1,3 @@
++obj-$(CONFIG_NFS_V4_ACL) += nfs4acl.o
++
++nfs4acl-objs := acl.o acl_syms.o
+diff -puN /dev/null include/linux/nfs4_acl.h
+--- /dev/null	2004-01-26 19:20:21.000000000 -0500
++++ linux-2.6.3-bfields/include/linux/nfs4_acl.h	2004-02-19 16:47:06.000000000 -0500
+@@ -0,0 +1,68 @@
++/*
++ *  include/linux/nfs4_acl.c
++ *
++ *  Common NFSv4 ACL handling definitions.
++ *
++ *  Copyright (c) 2002 The Regents of the University of Michigan.
++ *  All rights reserved.
++ *
++ *  Marius Aamodt Eriksen <marius@umich.edu>
++ * 
++ *  Redistribution and use in source and binary forms, with or without
++ *  modification, are permitted provided that the following conditions
++ *  are met:
++ *
++ *  1. Redistributions of source code must retain the above copyright
++ *     notice, this list of conditions and the following disclaimer.
++ *  2. Redistributions in binary form must reproduce the above copyright
++ *     notice, this list of conditions and the following disclaimer in the
++ *     documentation and/or other materials provided with the distribution.
++ *  3. Neither the name of the University nor the names of its
++ *     contributors may be used to endorse or promote products derived
++ *     from this software without specific prior written permission.
++ *
++ *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
++ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
++ *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
++ *  DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++ *  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
++ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
++ *  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
++ *  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
++ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
++
++#ifndef LINUX_NFS4_ACL_H
++#define LINUX_NFS4_ACL_H
++
++#include <linux/posix_acl.h>
++
++#define NFS4_ACL_TYPE_ACCESS  0
++#define NFS4_ACL_TYPE_DEFAULT 1
++
++/* XXX from include/linux/nfs_idmap.h: */
++#define IDMAP_NAMESZ	128
++
++struct nfs4_acl_idmapper {
++	int	(*name2uid)(void *, const char *, size_t len, __u32 *);
++	int	(*name2gid)(void *, const char *, size_t len, __u32 *);
++	int	(*uid2name)(void *, __u32, char *);
++	int	(*gid2name)(void *, __u32, char *);
++};
++
++struct nfs4_acl  *nfs4_acl_new(void);
++void		  nfs4_acl_free(struct nfs4_acl *);
++int               nfs4_acl_merge(struct nfs4_acl *, struct nfs4_acl *);
++int               nfs4_acl_split(struct nfs4_acl *, struct nfs4_acl *);
++int               nfs4_acl_add_ace(struct nfs4_acl *, u32, u32,
++                      u32, char *, u32);
++void              nfs4_acl_print(struct nfs4_acl *);
++struct nfs4_acl  *nfs4_acl_posix_to_nfsv4(struct nfs4_acl_idmapper *, void *,
++                      struct posix_acl *, struct posix_acl *);
++int               nfs4_acl_nfsv4_to_posix(struct nfs4_acl_idmapper *, void *,
++                      struct nfs4_acl *, struct posix_acl **,
++                      struct posix_acl **);
++
++#endif /* LINUX_NFS4_ACL_H */
+diff -puN include/linux/nfs4.h~CITI_NFS4_ALL include/linux/nfs4.h
+--- linux-2.6.3/include/linux/nfs4.h~CITI_NFS4_ALL	2004-02-19 16:47:06.000000000 -0500
++++ linux-2.6.3-bfields/include/linux/nfs4.h	2004-02-19 16:47:14.000000000 -0500
+@@ -37,14 +37,67 @@
+ #define NFS4_SHARE_ACCESS_BOTH	0x0003
+ #define NFS4_SHARE_DENY_READ	0x0001
+ #define NFS4_SHARE_DENY_WRITE	0x0002
++#define NFS4_SHARE_DENY_BOTH	0x0003
+ 
+ #define NFS4_SET_TO_SERVER_TIME	0
+ #define NFS4_SET_TO_CLIENT_TIME	1
+ 
+-#define NFS4_ACE_ACCESS_ALLOWED_ACE_TYPE 0
+-#define NFS4_ACE_ACCESS_DENIED_ACE_TYPE  1
+-#define NFS4_ACE_SYSTEM_AUDIT_ACE_TYPE   2
+-#define NFS4_ACE_SYSTEM_ALARM_ACE_TYPE   3
++#define ACL4_SUPPORT_ALLOW_ACL            0x00000001
++#define ACL4_SUPPORT_DENY_ACL             0x00000002
++#define ACL4_SUPPORT_AUDIT_ACL            0x00000004
++#define ACL4_SUPPORT_ALARM_ACL            0x00000008
++
++#define NFS4_ACE_ACCESS_ALLOWED_ACE_TYPE      0x00000000
++#define NFS4_ACE_ACCESS_DENIED_ACE_TYPE       0x00000001
++#define NFS4_ACE_SYSTEM_AUDIT_ACE_TYPE        0x00000002
++#define NFS4_ACE_SYSTEM_ALARM_ACE_TYPE        0x00000003
++
++#define NFS4_ACE_FILE_INHERIT_ACE             0x00000001
++#define NFS4_ACE_DIRECTORY_INHERIT_ACE        0x00000002
++#define NFS4_ACE_NO_PROPAGATE_INHERIT_ACE     0x00000004
++#define NFS4_ACE_INHERIT_ONLY_ACE             0x00000008
++#define NFS4_ACE_SUCCESSFUL_ACCESS_ACE_FLAG   0x00000010
++#define NFS4_ACE_FAILED_ACCESS_ACE_FLAG       0x00000020
++#define NFS4_ACE_IDENTIFIER_GROUP             0x00000040
++#define NFS4_ACE_OWNER                        0x00000080
++#define NFS4_ACE_GROUP                        0x00000100
++#define NFS4_ACE_EVERYONE                     0x00000200
++
++#define NFS4_ACE_READ_DATA                    0x00000001
++#define NFS4_ACE_LIST_DIRECTORY               0x00000001
++#define NFS4_ACE_WRITE_DATA                   0x00000002
++#define NFS4_ACE_ADD_FILE                     0x00000002
++#define NFS4_ACE_APPEND_DATA                  0x00000004
++#define NFS4_ACE_ADD_SUBDIRECTORY             0x00000004
++#define NFS4_ACE_READ_NAMED_ATTRS             0x00000008
++#define NFS4_ACE_WRITE_NAMED_ATTRS            0x00000010
++#define NFS4_ACE_EXECUTE                      0x00000020
++#define NFS4_ACE_DELETE_CHILD                 0x00000040
++#define NFS4_ACE_READ_ATTRIBUTES              0x00000080
++#define NFS4_ACE_WRITE_ATTRIBUTES             0x00000100
++#define NFS4_ACE_DELETE                       0x00010000
++#define NFS4_ACE_READ_ACL                     0x00020000
++#define NFS4_ACE_WRITE_ACL                    0x00040000
++#define NFS4_ACE_WRITE_OWNER                  0x00080000
++#define NFS4_ACE_SYNCHRONIZE                  0x00100000
++#define NFS4_ACE_GENERIC_READ                 0x00120081
++#define NFS4_ACE_GENERIC_WRITE                0x00160106
++#define NFS4_ACE_GENERIC_EXECUTE              0x001200A0
++#define NFS4_ACE_MASK_ALL                     0x001F01FF
++
++struct nfs4_ace {
++	u32               type;
++	u32               flag;
++	u32               access_mask;
++	char             *who;
++	u32               wholen;
++	struct list_head  l_ace;
++};
++
++struct nfs4_acl {
++	u32              naces;
++	struct list_head ace_head;
++};
+ 
+ typedef struct { char data[NFS4_VERIFIER_SIZE]; } nfs4_verifier;
+ typedef struct { char data[16]; } nfs4_stateid;
+@@ -86,6 +139,8 @@ enum nfs_opnum4 {
+ 	OP_SETCLIENTID_CONFIRM = 36,
+ 	OP_VERIFY = 37,
+ 	OP_WRITE = 38,
++	OP_RELEASE_LOCKOWNER = 39,
++	OP_ILLEGAL = 10044,
+ };
+ 
+ enum nfsstat4 {
+@@ -283,7 +338,6 @@ enum lock_type4 {
+ 
+ enum {
+ 	NFSPROC4_CLNT_NULL = 0,		/* Unused */
+-	NFSPROC4_CLNT_COMPOUND,		/* Soon to be unused */
+ 	NFSPROC4_CLNT_READ,
+ 	NFSPROC4_CLNT_WRITE,
+ 	NFSPROC4_CLNT_COMMIT,
+@@ -300,6 +354,22 @@ enum {
+ 	NFSPROC4_CLNT_LOCK,
+ 	NFSPROC4_CLNT_LOCKT,
+ 	NFSPROC4_CLNT_LOCKU,
++	NFSPROC4_CLNT_GETACL,
++	NFSPROC4_CLNT_SETACL,
++	NFSPROC4_CLNT_ACCESS,
++	NFSPROC4_CLNT_GETATTR,
++	NFSPROC4_CLNT_LOOKUP,
++	NFSPROC4_CLNT_GETROOT_HEAD,
++	NFSPROC4_CLNT_GETROOT_PATH,
++	NFSPROC4_CLNT_REMOVE,
++	NFSPROC4_CLNT_RENAME,
++	NFSPROC4_CLNT_LINK,
++	NFSPROC4_CLNT_CREATE,
++	NFSPROC4_CLNT_PATHCONF,
++	NFSPROC4_CLNT_STATFS,
++	NFSPROC4_CLNT_UNLINK,
++	NFSPROC4_CLNT_READLINK,
++	NFSPROC4_CLNT_READDIR,
+ };
+ 
+ #endif
+diff -puN fs/nfs/nfs4xdr.c~CITI_NFS4_ALL fs/nfs/nfs4xdr.c
+--- linux-2.6.3/fs/nfs/nfs4xdr.c~CITI_NFS4_ALL	2004-02-19 16:47:07.000000000 -0500
++++ linux-2.6.3-bfields/fs/nfs/nfs4xdr.c	2004-02-19 16:47:15.000000000 -0500
+@@ -51,6 +51,7 @@
+ #include <linux/nfs4.h>
+ #include <linux/nfs_fs.h>
+ #include <linux/nfs_idmap.h>
++#include <linux/nfs4_acl.h>
+ 
+ #define NFSDBG_FACILITY		NFSDBG_XDR
+ 
+@@ -81,11 +82,15 @@ static int nfs_stat_to_errno(int);
+ #define decode_putrootfh_maxsz	op_decode_hdr_maxsz
+ #define encode_getfh_maxsz      op_encode_hdr_maxsz
+ #define decode_getfh_maxsz      op_decode_hdr_maxsz + 1 + \
+-                                (NFS4_FHSIZE >> 2)
++                                ((3+NFS4_FHSIZE) >> 2)
+ #define encode_getattr_maxsz    op_encode_hdr_maxsz + 3
+-#define nfs4_fattr_bitmap_maxsz 26 + 2 * ((NFS4_MAXNAMLEN +1) >> 2)
++#define nfs4_name_maxsz         ( 1 + ((3+NFS4_MAXNAMLEN) >> 2) )
++#define nfs4_fattr_bitmap_maxsz 36 + 2 * nfs4_name_maxsz
+ #define decode_getattr_maxsz    op_decode_hdr_maxsz + 3 + \
+                                 nfs4_fattr_bitmap_maxsz
++#define encode_setattr_maxsz    op_decode_hdr_maxsz + 4 + \
++                                nfs4_fattr_bitmap_maxsz
++#define decode_setattr_maxsz    op_decode_hdr_maxsz + 3
+ #define encode_savefh_maxsz     op_encode_hdr_maxsz
+ #define decode_savefh_maxsz     op_decode_hdr_maxsz
+ #define encode_restorefh_maxsz  op_encode_hdr_maxsz
+@@ -115,6 +120,18 @@ static int nfs_stat_to_errno(int);
+ 				3 + (NFS4_VERIFIER_SIZE >> 2)
+ #define decode_setclientid_confirm_maxsz \
+ 				op_decode_hdr_maxsz
++#define encode_lookup_maxsz     op_encode_hdr_maxsz + \
++                                1 + ((3 + NFS_MAXFHSIZE) >> 2)
++#define encode_remove_maxsz     op_encode_hdr_maxsz + \
++                                nfs4_name_maxsz
++#define encode_rename_maxsz     op_encode_hdr_maxsz + \
++                                2 * nfs4_name_maxsz
++#define encode_link_maxsz       op_encode_hdr_maxsz + \
++                                nfs4_name_maxsz
++#define encode_create_maxsz     op_encode_hdr_maxsz + \
++                                2 + 2 * nfs4_name_maxsz + \
++                                nfs4_fattr_bitmap_maxsz
++#define decode_create_maxsz     op_decode_hdr_maxsz + 8
+ 
+ #define NFS4_enc_compound_sz	1024  /* XXX: large enough? */
+ #define NFS4_dec_compound_sz	1024  /* XXX: large enough? */
+@@ -126,6 +143,18 @@ static int nfs_stat_to_errno(int);
+ 				decode_putfh_maxsz + \
+ 				decode_read_getattr_maxsz + \
+ 				op_decode_hdr_maxsz + 2
++#define NFS4_enc_readlink_sz	compound_encode_hdr_maxsz + \
++				encode_putfh_maxsz + \
++				op_encode_hdr_maxsz
++#define NFS4_dec_readlink_sz	compound_decode_hdr_maxsz + \
++				decode_putfh_maxsz + \
++				op_decode_hdr_maxsz
++#define NFS4_enc_readdir_sz	compound_encode_hdr_maxsz + \
++				encode_putfh_maxsz + \
++				op_encode_hdr_maxsz + 9
++#define NFS4_dec_readdir_sz	compound_decode_hdr_maxsz + \
++				decode_putfh_maxsz + \
++				op_decode_hdr_maxsz + 2
+ #define NFS4_enc_write_sz	compound_encode_hdr_maxsz + \
+ 				encode_putfh_maxsz + \
+ 				encode_pre_write_getattr_maxsz + \
+@@ -255,8 +284,136 @@ static int nfs_stat_to_errno(int);
+ 				decode_putfh_maxsz + \
+ 				decode_getattr_maxsz + \
+ 				op_decode_hdr_maxsz + 4
+-
+-
++#define NFS4_enc_getacl_sz      compound_encode_hdr_maxsz + \
++				encode_putfh_maxsz + \
++				encode_getattr_maxsz
++#define username_maxsz		1 + ((IDMAP_NAMESZ + 3) >> 2)
++#define ace_maxsz		3 + username_maxsz
++#define acl_maxentries		(NFS_ACL_MAX_ENTRIES - 3) * 3 + 6
++#define acl_maxsz		1 + (acl_maxentries) * (ace_maxsz)
++#define NFS4_dec_getacl_sz      compound_decode_hdr_maxsz + \
++				decode_putfh_maxsz + \
++				op_decode_hdr_maxsz + 3 + 1 + acl_maxsz
++#define NFS4_enc_setacl_sz      compound_encode_hdr_maxsz + \
++				encode_putfh_maxsz + \
++				op_encode_hdr_maxsz + 4 + 1 + acl_maxsz
++#define NFS4_dec_setacl_sz      compound_decode_hdr_maxsz + \
++				decode_putfh_maxsz + \
++                                decode_setattr_maxsz
++#define NFS4_enc_access_sz      compound_encode_hdr_maxsz + \
++				encode_putfh_maxsz + \
++				encode_getattr_maxsz + \
++				op_encode_hdr_maxsz + 1
++#define NFS4_dec_access_sz      compound_decode_hdr_maxsz + \
++				decode_putfh_maxsz + \
++                                decode_getattr_maxsz + \
++                                op_decode_hdr_maxsz + 2
++#define NFS4_enc_getattr_sz     compound_encode_hdr_maxsz + \
++                                encode_putfh_maxsz + \
++                                encode_getattr_maxsz
++#define NFS4_dec_getattr_sz     compound_decode_hdr_maxsz + \
++                                decode_putfh_maxsz + \
++                                decode_getattr_maxsz
++#define NFS4_enc_lookup_sz      compound_encode_hdr_maxsz + \
++                                encode_putfh_maxsz + \
++                                encode_getattr_maxsz + \
++                                encode_lookup_maxsz + \
++                                encode_getattr_maxsz + \
++                                encode_getfh_maxsz
++#define NFS4_dec_lookup_sz      compound_decode_hdr_maxsz + \
++                                decode_putfh_maxsz + \
++                                decode_getattr_maxsz + \
++                                op_decode_hdr_maxsz + \
++                                decode_getattr_maxsz + \
++                                decode_getfh_maxsz
++#define NFS4_enc_getroot_head_sz      compound_encode_hdr_maxsz + \
++                                op_encode_hdr_maxsz + 1 + \
++                                encode_getattr_maxsz + \
++                                encode_getfh_maxsz
++#define NFS4_dec_getroot_head_sz      compound_decode_hdr_maxsz + \
++                                op_decode_hdr_maxsz + \
++                                decode_getattr_maxsz + \
++                                decode_getfh_maxsz
++#define NFS4_enc_getroot_path_sz      compound_encode_hdr_maxsz + \
++                                encode_putfh_maxsz + \
++                                encode_lookup_maxsz + \
++                                encode_getattr_maxsz + \
++                                encode_getfh_maxsz
++#define NFS4_dec_getroot_path_sz      compound_decode_hdr_maxsz + \
++                                decode_putfh_maxsz + \
++                                op_decode_hdr_maxsz + \
++                                decode_getattr_maxsz + \
++                                decode_getfh_maxsz
++#define NFS4_enc_remove_sz      compound_encode_hdr_maxsz + \
++                                encode_putfh_maxsz + \
++                                encode_remove_maxsz + \
++                                encode_getattr_maxsz
++#define NFS4_dec_remove_sz      compound_decode_hdr_maxsz + \
++                                decode_putfh_maxsz + \
++                                op_decode_hdr_maxsz + 5 + \
++                                decode_getattr_maxsz
++#define NFS4_enc_unlink_sz      NFS4_enc_remove_sz
++#define NFS4_dec_unlink_sz      NFS4_dec_remove_sz
++#define NFS4_enc_rename_sz      compound_encode_hdr_maxsz + \
++                                encode_putfh_maxsz + \
++                                encode_savefh_maxsz + \
++                                encode_putfh_maxsz + \
++                                encode_rename_maxsz + \
++                                encode_getattr_maxsz + \
++                                encode_restorefh_maxsz + \
++                                encode_getattr_maxsz
++#define NFS4_dec_rename_sz      compound_decode_hdr_maxsz + \
++                                decode_putfh_maxsz + \
++                                decode_savefh_maxsz + \
++                                decode_putfh_maxsz + \
++                                op_decode_hdr_maxsz + 5 + 5 + \
++                                decode_getattr_maxsz + \
++                                decode_restorefh_maxsz + \
++                                decode_getattr_maxsz
++#define NFS4_enc_link_sz        compound_encode_hdr_maxsz + \
++                                encode_putfh_maxsz + \
++                                encode_savefh_maxsz + \
++                                encode_putfh_maxsz + \
++                                encode_link_maxsz + \
++                                encode_getattr_maxsz + \
++                                encode_restorefh_maxsz + \
++                                encode_getattr_maxsz
++#define NFS4_dec_link_sz        compound_decode_hdr_maxsz + \
++                                decode_putfh_maxsz + \
++                                decode_savefh_maxsz + \
++                                decode_putfh_maxsz + \
++                                op_decode_hdr_maxsz + 5 + \
++                                decode_getattr_maxsz + \
++                                decode_restorefh_maxsz + \
++                                decode_getattr_maxsz
++#define NFS4_enc_create_sz      compound_encode_hdr_maxsz + \
++                                encode_putfh_maxsz + \
++                                encode_savefh_maxsz + \
++                                encode_create_maxsz + \
++                                encode_getattr_maxsz + \
++                                encode_getfh_maxsz + \
++                                encode_restorefh_maxsz + \
++                                encode_getattr_maxsz
++#define NFS4_dec_create_sz      compound_decode_hdr_maxsz + \
++                                decode_putfh_maxsz + \
++                                op_decode_hdr_maxsz + \
++                                decode_create_maxsz + \
++                                decode_getattr_maxsz + \
++                                decode_getfh_maxsz + \
++                                op_decode_hdr_maxsz + \
++                                decode_getattr_maxsz
++#define NFS4_enc_pathconf_sz    compound_encode_hdr_maxsz + \
++                                encode_putfh_maxsz + \
++                                encode_getattr_maxsz
++#define NFS4_dec_pathconf_sz    compound_decode_hdr_maxsz + \
++                                decode_putfh_maxsz + \
++                                op_decode_hdr_maxsz + 6
++#define NFS4_enc_statfs_sz      compound_encode_hdr_maxsz + \
++                                encode_putfh_maxsz + \
++                                encode_getattr_maxsz
++#define NFS4_dec_statfs_sz      compound_decode_hdr_maxsz + \
++                                decode_putfh_maxsz + \
++                                op_decode_hdr_maxsz + 12
+ 
+ static struct {
+ 	unsigned int	mode;
+@@ -333,8 +490,7 @@ encode_compound_hdr(struct xdr_stream *x
+ }
+ 
+ static int
+-encode_attrs(struct xdr_stream *xdr, struct iattr *iap,
+-    struct nfs_server *server)
++encode_attrs(struct xdr_stream *xdr, struct iattr *iap, struct nfs_server *server)
+ {
+ 	char owner_name[IDMAP_NAMESZ];
+ 	char owner_group[IDMAP_NAMESZ];
+@@ -352,7 +508,7 @@ encode_attrs(struct xdr_stream *xdr, str
+ 	 * In the worst-case, this would be
+ 	 *   12(bitmap) + 4(attrlen) + 8(size) + 4(mode) + 4(atime) + 4(mtime)
+ 	 *          = 36 bytes, plus any contribution from variable-length fields
+-	 *            such as owner/group/acl's.
++	 *            such as owner/group.
+ 	 */
+ 	len = 16;
+ 
+@@ -392,6 +548,7 @@ encode_attrs(struct xdr_stream *xdr, str
+ 		len += 16;
+ 	else if (iap->ia_valid & ATTR_MTIME)
+ 		len += 4;
++
+ 	RESERVE_SPACE(len);
+ 
+ 	/*
+@@ -462,13 +619,13 @@ encode_attrs(struct xdr_stream *xdr, str
+ }
+ 
+ static int
+-encode_access(struct xdr_stream *xdr, struct nfs4_access *access)
++encode_access(struct xdr_stream *xdr, u32 access)
+ {
+ 	uint32_t *p;
+ 
+ 	RESERVE_SPACE(8);
+ 	WRITE32(OP_ACCESS);
+-	WRITE32(access->ac_req_access);
++	WRITE32(access);
+ 	
+ 	return 0;
+ }
+@@ -500,37 +657,36 @@ encode_commit(struct xdr_stream *xdr, st
+ }
+ 
+ static int
+-encode_create(struct xdr_stream *xdr, struct nfs4_create *create,
+-    struct nfs_server *server)
++encode_create(struct xdr_stream *xdr, struct nfs4_create_arg *create)
+ {
+ 	uint32_t *p;
+ 	
+ 	RESERVE_SPACE(8);
+ 	WRITE32(OP_CREATE);
+-	WRITE32(create->cr_ftype);
++	WRITE32(create->ftype);
+ 
+-	switch (create->cr_ftype) {
++	switch (create->ftype) {
+ 	case NF4LNK:
+-		RESERVE_SPACE(4 + create->cr_textlen);
+-		WRITE32(create->cr_textlen);
+-		WRITEMEM(create->cr_text, create->cr_textlen);
++		RESERVE_SPACE(4 + create->u.symlink->len);
++		WRITE32(create->u.symlink->len);
++		WRITEMEM(create->u.symlink->name, create->u.symlink->len);
+ 		break;
+ 
+ 	case NF4BLK: case NF4CHR:
+ 		RESERVE_SPACE(8);
+-		WRITE32(create->cr_specdata1);
+-		WRITE32(create->cr_specdata2);
++		WRITE32(create->u.device.specdata1);
++		WRITE32(create->u.device.specdata2);
+ 		break;
+ 
+ 	default:
+ 		break;
+ 	}
+ 
+-	RESERVE_SPACE(4 + create->cr_namelen);
+-	WRITE32(create->cr_namelen);
+-	WRITEMEM(create->cr_name, create->cr_namelen);
++	RESERVE_SPACE(4 + create->name->len);
++	WRITE32(create->name->len);
++	WRITEMEM(create->name->name, create->name->len);
+ 
+-	return encode_attrs(xdr, create->cr_attrs, server);
++	return encode_attrs(xdr, create->attrs, create->server);
+ }
+ 
+ static int
+@@ -558,11 +714,14 @@ encode_getattr_two(struct xdr_stream *xd
+         return 0;
+ }
+ 
++extern u32 nfs4_fattr_bitmap[];
++extern u32 nfs4_statfs_bitmap[];
++
+ static inline int
+-encode_getattr(struct xdr_stream *xdr, struct nfs4_getattr *getattr)
++encode_getfattr(struct xdr_stream *xdr)
+ {
+-	return encode_getattr_two(xdr, getattr->gt_bmval[0],
+-					getattr->gt_bmval[1]);
++	return encode_getattr_two(xdr, nfs4_fattr_bitmap[0], 
++				       nfs4_fattr_bitmap[1]);
+ }
+ 
+ /*
+@@ -618,14 +777,14 @@ encode_getfh(struct xdr_stream *xdr)
+ }
+ 
+ static int
+-encode_link(struct xdr_stream *xdr, struct nfs4_link *link)
++encode_link(struct xdr_stream *xdr, struct qstr *name)
+ {
+ 	uint32_t *p;
+ 
+-	RESERVE_SPACE(8 + link->ln_namelen);
++	RESERVE_SPACE(8 + name->len);
+ 	WRITE32(OP_LINK);
+-	WRITE32(link->ln_namelen);
+-	WRITEMEM(link->ln_name, link->ln_namelen);
++	WRITE32(name->len);
++	WRITEMEM(name->name, name->len);
+ 	
+ 	return 0;
+ }
+@@ -705,15 +864,15 @@ encode_locku(struct xdr_stream *xdr, str
+ }
+ 
+ static int
+-encode_lookup(struct xdr_stream *xdr, struct nfs4_lookup *lookup)
++encode_lookup(struct xdr_stream *xdr, struct qstr *name)
+ {
+-	int len = lookup->lo_name->len;
++	int len = name->len;
+ 	uint32_t *p;
+ 
+ 	RESERVE_SPACE(8 + len);
+ 	WRITE32(OP_LOOKUP);
+ 	WRITE32(len);
+-	WRITEMEM(lookup->lo_name->name, len);
++	WRITEMEM(name->name, len);
+ 
+ 	return 0;
+ }
+@@ -883,7 +1042,7 @@ encode_read(struct xdr_stream *xdr, stru
+ }
+ 
+ static int
+-encode_readdir(struct xdr_stream *xdr, struct nfs4_readdir *readdir, struct rpc_rqst *req)
++encode_readdir(struct xdr_stream *xdr, struct nfs4_readdir_arg *readdir, struct rpc_rqst *req)
+ {
+ 	struct rpc_auth *auth = req->rq_task->tk_auth;
+ 	int replen;
+@@ -891,21 +1050,21 @@ encode_readdir(struct xdr_stream *xdr, s
+ 
+ 	RESERVE_SPACE(32+sizeof(nfs4_verifier));
+ 	WRITE32(OP_READDIR);
+-	WRITE64(readdir->rd_cookie);
+-	WRITEMEM(readdir->rd_req_verifier.data, sizeof(readdir->rd_req_verifier.data));
+-	WRITE32(readdir->rd_count >> 5);  /* meaningless "dircount" field */
+-	WRITE32(readdir->rd_count);
++	WRITE64(readdir->cookie);
++	WRITEMEM(readdir->req_verifier.data, sizeof(readdir->req_verifier.data));
++	WRITE32(readdir->count >> 5);  /* meaningless "dircount" field */
++	WRITE32(readdir->count);
+ 	WRITE32(2);
+-	WRITE32(readdir->rd_bmval[0]);
+-	WRITE32(readdir->rd_bmval[1]);
++	WRITE32(FATTR4_WORD0_FILEID);
++	WRITE32(0);
+ 
+ 	/* set up reply iovec
+ 	 *    toplevel_status + taglen + rescount + OP_PUTFH + status
+ 	 *      + OP_READDIR + status + verifer(2)  = 9
+ 	 */
+ 	replen = (RPC_REPHDRSIZE + auth->au_rslack + 9) << 2;
+-	xdr_inline_pages(&req->rq_rcv_buf, replen, readdir->rd_pages,
+-			 readdir->rd_pgbase, readdir->rd_count);
++	xdr_inline_pages(&req->rq_rcv_buf, replen, readdir->pages,
++			 readdir->pgbase, readdir->count);
+ 
+ 	return 0;
+ }
+@@ -925,37 +1084,37 @@ encode_readlink(struct xdr_stream *xdr, 
+ 	 *      + OP_READLINK + status  = 7
+ 	 */
+ 	replen = (RPC_REPHDRSIZE + auth->au_rslack + 7) << 2;
+-	xdr_inline_pages(&req->rq_rcv_buf, replen, readlink->rl_pages, 0, readlink->rl_count);
++	xdr_inline_pages(&req->rq_rcv_buf, replen, readlink->pages, 0, readlink->count);
+ 	
+ 	return 0;
+ }
+ 
+ static int
+-encode_remove(struct xdr_stream *xdr, struct nfs4_remove *remove)
++encode_remove(struct xdr_stream *xdr, struct qstr *name)
+ {
+ 	uint32_t *p;
+ 
+-	RESERVE_SPACE(8 + remove->rm_namelen);
++	RESERVE_SPACE(8 + name->len);
+ 	WRITE32(OP_REMOVE);
+-	WRITE32(remove->rm_namelen);
+-	WRITEMEM(remove->rm_name, remove->rm_namelen);
++	WRITE32(name->len);
++	WRITEMEM(name->name, name->len);
+ 
+ 	return 0;
+ }
+ 
+ static int
+-encode_rename(struct xdr_stream *xdr, struct nfs4_rename *rename)
++encode_rename(struct xdr_stream *xdr, struct qstr *oldname, struct qstr *newname)
+ {
+ 	uint32_t *p;
+ 
+-	RESERVE_SPACE(8 + rename->rn_oldnamelen);
++	RESERVE_SPACE(8 + oldname->len);
+ 	WRITE32(OP_RENAME);
+-	WRITE32(rename->rn_oldnamelen);
+-	WRITEMEM(rename->rn_oldname, rename->rn_oldnamelen);
++	WRITE32(oldname->len);
++	WRITEMEM(oldname->name, oldname->len);
+ 	
+-	RESERVE_SPACE(4 + rename->rn_newnamelen);
+-	WRITE32(rename->rn_newnamelen);
+-	WRITEMEM(rename->rn_newname, rename->rn_newnamelen);
++	RESERVE_SPACE(4 + newname->len);
++	WRITE32(newname->len);
++	WRITEMEM(newname->name, newname->len);
+ 
+ 	return 0;
+ }
+@@ -1011,6 +1170,39 @@ encode_setattr(struct xdr_stream *xdr, s
+         return 0;
+ }
+ 
++extern nfs4_stateid zero_stateid;
++
++#ifdef CONFIG_NFS_V4_ACL
++
++static int
++encode_setacl(struct xdr_stream *xdr, struct nfs_setaclargs *arg)
++{
++	uint32_t *p, *attrbuflen;
++	struct nfs4_ace *ace;
++	struct nfs4_acl *acl = arg->acl;
++
++	RESERVE_SPACE(4+sizeof(zero_stateid.data));
++	WRITE32(OP_SETATTR);
++	WRITEMEM(zero_stateid.data, sizeof(zero_stateid.data));
++	RESERVE_SPACE(4*4);
++	WRITE32(1);
++	WRITE32(FATTR4_WORD0_ACL);
++	attrbuflen = p++;
++	WRITE32(acl->naces);
++	list_for_each_entry(ace, &acl->ace_head, l_ace) {
++		RESERVE_SPACE(4*4 + (XDR_QUADLEN(ace->wholen) << 2));
++		WRITE32(ace->type);
++		WRITE32(ace->flag);
++		WRITE32(ace->access_mask & NFS4_ACE_MASK_ALL);
++		WRITE32(ace->wholen);
++		WRITEMEM(ace->who, ace->wholen);
++	}
++	*attrbuflen = htonl((char *)p - (char *)attrbuflen - 4);
++	return 0;
++}
++
++#endif /* CONFIG_NFS_V4_ACL */
++
+ static int
+ encode_setclientid(struct xdr_stream *xdr, struct nfs4_setclientid *setclientid)
+ {
+@@ -1068,312 +1260,566 @@ encode_write(struct xdr_stream *xdr, str
+ 
+ 	return 0;
+ }
+-
+-/* FIXME: this sucks */
+-static int
+-encode_compound(struct xdr_stream *xdr, struct nfs4_compound *cp, struct rpc_rqst *req)
+-{
+-	struct compound_hdr hdr = {
+-		.taglen = cp->taglen,
+-		.tag	= cp->tag,
+-		.nops	= cp->req_nops,
+-	};
+-	int i, status = 0;
+-
+-	encode_compound_hdr(xdr, &hdr);
+-
+-	for (i = 0; i < cp->req_nops; i++) {
+-		switch (cp->ops[i].opnum) {
+-		case OP_ACCESS:
+-			status = encode_access(xdr, &cp->ops[i].u.access);
+-			break;
+-		case OP_CREATE:
+-			status = encode_create(xdr, &cp->ops[i].u.create, cp->server);
+-			break;
+-		case OP_GETATTR:
+-			status = encode_getattr(xdr, &cp->ops[i].u.getattr);
+-			break;
+-		case OP_GETFH:
+-			status = encode_getfh(xdr);
+-			break;
+-		case OP_LINK:
+-			status = encode_link(xdr, &cp->ops[i].u.link);
+-			break;
+-		case OP_LOOKUP:
+-			status = encode_lookup(xdr, &cp->ops[i].u.lookup);
+-			break;
+-		case OP_PUTFH:
+-			status = encode_putfh(xdr, cp->ops[i].u.putfh.pf_fhandle);
+-			break;
+-		case OP_PUTROOTFH:
+-			status = encode_putrootfh(xdr);
+-			break;
+-		case OP_READDIR:
+-			status = encode_readdir(xdr, &cp->ops[i].u.readdir, req);
+-			break;
+-		case OP_READLINK:
+-			status = encode_readlink(xdr, &cp->ops[i].u.readlink, req);
+-			break;
+-		case OP_REMOVE:
+-			status = encode_remove(xdr, &cp->ops[i].u.remove);
+-			break;
+-		case OP_RENAME:
+-			status = encode_rename(xdr, &cp->ops[i].u.rename);
+-			break;
+-		case OP_RESTOREFH:
+-			status = encode_restorefh(xdr);
+-			break;
+-		case OP_SAVEFH:
+-			status = encode_savefh(xdr);
+-			break;
+-		default:
+-			BUG();
+-		}
+-		if (status)
+-			return status;
+-	}
+-	
+-	return 0;
+-}
+ /*
+  * END OF "GENERIC" ENCODE ROUTINES.
+  */
+ 
+-
+ /*
+- * Encode COMPOUND argument
++ * Encode ACCESS request
+  */
+ static int
+-nfs4_xdr_enc_compound(struct rpc_rqst *req, uint32_t *p, struct nfs4_compound *cp)
++nfs4_xdr_enc_access(struct rpc_rqst *req, uint32_t *p, struct nfs4_accessargs *args)
+ {
+ 	struct xdr_stream xdr;
++	struct compound_hdr hdr = {
++		.nops   = 3,
++	};
+ 	int status;
+-	
+-	xdr_init_encode(&xdr, &req->rq_snd_buf, p);
+-	status = encode_compound(&xdr, cp, req);
+-	cp->timestamp = jiffies;
+-	return status;
+-}
+-/*
+- * Encode a CLOSE request
+- */
+-static int
+-nfs4_xdr_enc_close(struct rpc_rqst *req, uint32_t *p, struct nfs_closeargs *args)
+-{
+-        struct xdr_stream xdr;
+-        struct compound_hdr hdr = {
+-                .nops   = 2,
+-        };
+-        int status;
+ 
+-        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
+-        encode_compound_hdr(&xdr, &hdr);
+-        status = encode_putfh(&xdr, args->fh);
+-        if(status)
+-                goto out;
+-        status = encode_close(&xdr, args);
++	xdr_init_encode(&xdr, &req->rq_snd_buf, p);
++	encode_compound_hdr(&xdr, &hdr);
++	status = encode_putfh(&xdr, args->fhandle);
++	if (status)
++		goto out;
++	status = encode_getfattr(&xdr);
++	if (status)
++		goto out;
++	status = encode_access(&xdr, args->req_access);
+ out:
+-        return status;
++	return status;
+ }
+ 
+ /*
+- * Encode an OPEN request
++ * Encode LOOKUP request
+  */
+ static int
+-nfs4_xdr_enc_open(struct rpc_rqst *req, uint32_t *p, struct nfs_openargs *args)
++nfs4_xdr_enc_lookup(struct rpc_rqst *req, uint32_t *p, struct nfs4_lookupargs *args)
+ {
+ 	struct xdr_stream xdr;
+ 	struct compound_hdr hdr = {
+-		.nops   = 7,
++		.nops   = 5,
+ 	};
+ 	int status;
+ 
+ 	xdr_init_encode(&xdr, &req->rq_snd_buf, p);
+ 	encode_compound_hdr(&xdr, &hdr);
+-	status = encode_putfh(&xdr, args->fh);
++	status = encode_putfh(&xdr, args->dir_fh);
+ 	if (status)
+ 		goto out;
+-	status = encode_savefh(&xdr);
++	status = encode_getfattr(&xdr);
+ 	if (status)
+ 		goto out;
+-	status = encode_open(&xdr, args);
++	status = encode_lookup(&xdr, args->name);
+ 	if (status)
+ 		goto out;
+-	status = encode_getattr(&xdr, args->f_getattr);
++	status = encode_getfattr(&xdr);
+ 	if (status)
+ 		goto out;
+ 	status = encode_getfh(&xdr);
+-	if (status)
+-		goto out;
+-	status = encode_restorefh(&xdr);
+-	if (status)
+-		goto out;
+-	status = encode_getattr(&xdr, args->d_getattr);
+ out:
+ 	return status;
+ }
+ 
+ /*
+- * Encode an OPEN_CONFIRM request
++ * Encode GETROOT_HEAD request
+  */
+ static int
+-nfs4_xdr_enc_open_confirm(struct rpc_rqst *req, uint32_t *p, struct nfs_open_confirmargs *args)
++nfs4_xdr_enc_getroot_head(struct rpc_rqst *req, uint32_t *p, void *args)
+ {
+ 	struct xdr_stream xdr;
+ 	struct compound_hdr hdr = {
+-		.nops   = 2,
++		.nops   = 3,
+ 	};
+ 	int status;
+ 
+ 	xdr_init_encode(&xdr, &req->rq_snd_buf, p);
+ 	encode_compound_hdr(&xdr, &hdr);
+-	status = encode_putfh(&xdr, args->fh);
+-	if(status)
++	status = encode_putrootfh(&xdr);
++	if (status)
+ 		goto out;
+-	status = encode_open_confirm(&xdr, args);
++	status = encode_getfattr(&xdr);
++	if (status)
++		goto out;
++	status = encode_getfh(&xdr);
+ out:
+ 	return status;
+ }
+ 
+ /*
+- * Encode an OPEN request
++ * Encode GETROOT_PATH request
+  */
+ static int
+-nfs4_xdr_enc_open_reclaim(struct rpc_rqst *req, uint32_t *p,
+-		struct nfs_open_reclaimargs *args)
++nfs4_xdr_enc_getroot_path(struct rpc_rqst *req, uint32_t *p, struct nfs4_getroot_arg *args)
+ {
+ 	struct xdr_stream xdr;
+ 	struct compound_hdr hdr = {
+-		.nops   = 3,
++		.nops   = 4,
+ 	};
+ 	int status;
+ 
+ 	xdr_init_encode(&xdr, &req->rq_snd_buf, p);
+ 	encode_compound_hdr(&xdr, &hdr);
+-	status = encode_putfh(&xdr, args->fh);
++	status = encode_putfh(&xdr, args->fhandle);
+ 	if (status)
+ 		goto out;
+-	status = encode_open_reclaim(&xdr, args);
++	status = encode_lookup(&xdr, args->name);
++	if (status)
++		goto out;
++	status = encode_getfattr(&xdr);
+ 	if (status)
+ 		goto out;
+-	status = encode_getattr(&xdr, args->f_getattr);
++	status = encode_getfh(&xdr);
+ out:
+ 	return status;
+ }
+ 
+ /*
+- * Encode an OPEN_DOWNGRADE request
++ * Encode REMOVE request
+  */
+ static int
+-nfs4_xdr_enc_open_downgrade(struct rpc_rqst *req, uint32_t *p, struct nfs_closeargs *args)
++nfs4_xdr_enc_remove(struct rpc_rqst *req, uint32_t *p, struct nfs4_remove_arg *args)
+ {
+ 	struct xdr_stream xdr;
+ 	struct compound_hdr hdr = {
+-		.nops	= 2,
++		.nops   = 3,
+ 	};
+ 	int status;
+ 
+ 	xdr_init_encode(&xdr, &req->rq_snd_buf, p);
+ 	encode_compound_hdr(&xdr, &hdr);
+-	status = encode_putfh(&xdr, args->fh);
++	status = encode_putfh(&xdr, args->fhandle);
+ 	if (status)
+ 		goto out;
+-	status = encode_open_downgrade(&xdr, args);
++	status = encode_remove(&xdr, args->name);
++	if (status)
++		goto out;
++	status = encode_getfattr(&xdr);
+ out:
+ 	return status;
+ }
+ 
+ /*
+- * Encode a LOCK request
++ * Encode UNLINK request
+  */
+ static int
+-nfs4_xdr_enc_lock(struct rpc_rqst *req, uint32_t *p, struct nfs_lockargs *args)
++nfs4_xdr_enc_unlink(struct rpc_rqst *req, uint32_t *p, struct nfs4_unlink *args)
+ {
+ 	struct xdr_stream xdr;
+ 	struct compound_hdr hdr = {
+-		.nops   = 2,
++		.nops   = 3,
+ 	};
+ 	int status;
+ 
+ 	xdr_init_encode(&xdr, &req->rq_snd_buf, p);
+ 	encode_compound_hdr(&xdr, &hdr);
+ 	status = encode_putfh(&xdr, args->fh);
+-	if(status)
++	if (status)
+ 		goto out;
+-	status = encode_lock(&xdr, args);
++	status = encode_remove(&xdr, args->name);
++	if (status)
++		goto out;
++	status = encode_getfattr(&xdr);
+ out:
+ 	return status;
+ }
+ 
+ /*
+- * Encode a LOCKT request
++ * Encode RENAME request
+  */
+ static int
+-nfs4_xdr_enc_lockt(struct rpc_rqst *req, uint32_t *p, struct nfs_lockargs *args)
++nfs4_xdr_enc_rename(struct rpc_rqst *req, uint32_t *p, struct nfs4_rename_arg *args)
+ {
+ 	struct xdr_stream xdr;
+ 	struct compound_hdr hdr = {
+-		.nops   = 2,
++		.nops   = 7,
+ 	};
+ 	int status;
+ 
+ 	xdr_init_encode(&xdr, &req->rq_snd_buf, p);
+ 	encode_compound_hdr(&xdr, &hdr);
+-	status = encode_putfh(&xdr, args->fh);
+-	if(status)
++	status = encode_putfh(&xdr, args->old_dir);
++	if (status)
+ 		goto out;
+-	status = encode_lockt(&xdr, args);
++	status = encode_savefh(&xdr);
++	if (status)
++		goto out;
++	status = encode_putfh(&xdr, args->new_dir);
++	if (status)
++		goto out;
++	status = encode_rename(&xdr, args->old_name, args->new_name);
++	if (status)
++		goto out;
++	status = encode_getfattr(&xdr);
++	if (status)
++		goto out;
++	status = encode_restorefh(&xdr);
++	if (status)
++		goto out;
++	status = encode_getfattr(&xdr);
+ out:
+ 	return status;
+ }
+ 
+ /*
+- * Encode a LOCKU request
++ * Encode LINK request
+  */
+ static int
+-nfs4_xdr_enc_locku(struct rpc_rqst *req, uint32_t *p, struct nfs_lockargs *args)
++nfs4_xdr_enc_link(struct rpc_rqst *req, uint32_t *p, struct nfs4_link_arg *args)
+ {
+ 	struct xdr_stream xdr;
+ 	struct compound_hdr hdr = {
+-		.nops   = 2,
++		.nops   = 7,
+ 	};
+ 	int status;
+ 
+ 	xdr_init_encode(&xdr, &req->rq_snd_buf, p);
+ 	encode_compound_hdr(&xdr, &hdr);
+ 	status = encode_putfh(&xdr, args->fh);
+-	if(status)
++	if (status)
+ 		goto out;
+-	status = encode_locku(&xdr, args);
++	status = encode_savefh(&xdr);
++	if (status)
++		goto out;
++	status = encode_putfh(&xdr, args->dir_fh);
++	if (status)
++		goto out;
++	status = encode_link(&xdr, args->name);
++	if (status)
++		goto out;
++	status = encode_getfattr(&xdr);
++	if (status)
++		goto out;
++	status = encode_restorefh(&xdr);
++	if (status)
++		goto out;
++	status = encode_getfattr(&xdr);
+ out:
+ 	return status;
+ }
+ 
+ /*
+- * Encode a READ request
++ * Encode CREATE request
+  */
+ static int
+-nfs4_xdr_enc_read(struct rpc_rqst *req, uint32_t *p, struct nfs_readargs *args)
++nfs4_xdr_enc_create(struct rpc_rqst *req, uint32_t *p, struct nfs4_create_arg *args)
+ {
+-	struct rpc_auth	*auth = req->rq_task->tk_auth;
+ 	struct xdr_stream xdr;
+ 	struct compound_hdr hdr = {
+-		.nops	= 3,
++		.nops   = 7,
+ 	};
+-	int replen, status;
++	int status;
+ 
+ 	xdr_init_encode(&xdr, &req->rq_snd_buf, p);
+ 	encode_compound_hdr(&xdr, &hdr);
+-	status = encode_putfh(&xdr, args->fh);
++	status = encode_putfh(&xdr, args->dir_fh);
+ 	if (status)
+ 		goto out;
+-	status = encode_read(&xdr, args);
++	status = encode_savefh(&xdr);
+ 	if (status)
+ 		goto out;
+-	status = encode_read_getattr(&xdr);
+-
+-	/* set up reply iovec
+-	 *    toplevel status + taglen=0 + rescount + OP_PUTFH + status
++	status = encode_create(&xdr, args);
++	if (status)
++		goto out;
++	status = encode_getfattr(&xdr);
++	if (status)
++		goto out;
++	status = encode_getfh(&xdr);
++	if (status)
++		goto out;
++	status = encode_restorefh(&xdr);
++	if (status)
++		goto out;
++	status = encode_getfattr(&xdr);
++out:
++	return status;
++}
++
++/*
++ * Encode GETATTR request
++ */
++static int
++nfs4_xdr_enc_getattr(struct rpc_rqst *req, uint32_t *p, struct nfs_fh *fh)
++{
++	struct xdr_stream xdr;
++	struct compound_hdr hdr = {
++		.nops   = 2,
++	};
++	int status;
++
++	xdr_init_encode(&xdr, &req->rq_snd_buf, p);
++	encode_compound_hdr(&xdr, &hdr);
++	status = encode_putfh(&xdr, fh);
++	if (status)
++		goto out;
++	status = encode_getfattr(&xdr);
++ out:
++	return status;
++}
++
++/*
++ * Encode a CLOSE request
++ */
++static int
++nfs4_xdr_enc_close(struct rpc_rqst *req, uint32_t *p, struct nfs_closeargs *args)
++{
++        struct xdr_stream xdr;
++        struct compound_hdr hdr = {
++                .nops   = 2,
++        };
++        int status;
++
++        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
++        encode_compound_hdr(&xdr, &hdr);
++        status = encode_putfh(&xdr, args->fh);
++        if(status)
++                goto out;
++        status = encode_close(&xdr, args);
++out:
++        return status;
++}
++
++/*
++ * Encode an OPEN request
++ */
++static int
++nfs4_xdr_enc_open(struct rpc_rqst *req, uint32_t *p, struct nfs_openargs *args)
++{
++	struct xdr_stream xdr;
++	struct compound_hdr hdr = {
++		.nops   = 7,
++	};
++	int status;
++
++	xdr_init_encode(&xdr, &req->rq_snd_buf, p);
++	encode_compound_hdr(&xdr, &hdr);
++	status = encode_putfh(&xdr, args->fh);
++	if (status)
++		goto out;
++	status = encode_savefh(&xdr);
++	if (status)
++		goto out;
++	status = encode_open(&xdr, args);
++	if (status)
++		goto out;
++	status = encode_getfattr(&xdr);
++	if (status)
++		goto out;
++	status = encode_getfh(&xdr);
++	if (status)
++		goto out;
++	status = encode_restorefh(&xdr);
++	if (status)
++		goto out;
++	status = encode_getfattr(&xdr);
++out:
++	return status;
++}
++
++/*
++ * Encode an OPEN_CONFIRM request
++ */
++static int
++nfs4_xdr_enc_open_confirm(struct rpc_rqst *req, uint32_t *p, struct nfs_open_confirmargs *args)
++{
++	struct xdr_stream xdr;
++	struct compound_hdr hdr = {
++		.nops   = 2,
++	};
++	int status;
++
++	xdr_init_encode(&xdr, &req->rq_snd_buf, p);
++	encode_compound_hdr(&xdr, &hdr);
++	status = encode_putfh(&xdr, args->fh);
++	if(status)
++		goto out;
++	status = encode_open_confirm(&xdr, args);
++out:
++	return status;
++}
++
++/*
++ * Encode an OPEN request
++ */
++static int
++nfs4_xdr_enc_open_reclaim(struct rpc_rqst *req, uint32_t *p,
++		struct nfs_open_reclaimargs *args)
++{
++	struct xdr_stream xdr;
++	struct compound_hdr hdr = {
++		.nops   = 3,
++	};
++	int status;
++
++	xdr_init_encode(&xdr, &req->rq_snd_buf, p);
++	encode_compound_hdr(&xdr, &hdr);
++	status = encode_putfh(&xdr, args->fh);
++	if (status)
++		goto out;
++	status = encode_open_reclaim(&xdr, args);
++	if (status)
++		goto out;
++	status = encode_getfattr(&xdr);
++out:
++	return status;
++}
++
++/*
++ * Encode an OPEN_DOWNGRADE request
++ */
++static int
++nfs4_xdr_enc_open_downgrade(struct rpc_rqst *req, uint32_t *p, struct nfs_closeargs *args)
++{
++	struct xdr_stream xdr;
++	struct compound_hdr hdr = {
++		.nops	= 2,
++	};
++	int status;
++
++	xdr_init_encode(&xdr, &req->rq_snd_buf, p);
++	encode_compound_hdr(&xdr, &hdr);
++	status = encode_putfh(&xdr, args->fh);
++	if (status)
++		goto out;
++	status = encode_open_downgrade(&xdr, args);
++out:
++	return status;
++}
++
++/*
++ * Encode a LOCK request
++ */
++static int
++nfs4_xdr_enc_lock(struct rpc_rqst *req, uint32_t *p, struct nfs_lockargs *args)
++{
++	struct xdr_stream xdr;
++	struct compound_hdr hdr = {
++		.nops   = 2,
++	};
++	int status;
++
++	xdr_init_encode(&xdr, &req->rq_snd_buf, p);
++	encode_compound_hdr(&xdr, &hdr);
++	status = encode_putfh(&xdr, args->fh);
++	if(status)
++		goto out;
++	status = encode_lock(&xdr, args);
++out:
++	return status;
++}
++
++/*
++ * Encode a LOCKT request
++ */
++static int
++nfs4_xdr_enc_lockt(struct rpc_rqst *req, uint32_t *p, struct nfs_lockargs *args)
++{
++	struct xdr_stream xdr;
++	struct compound_hdr hdr = {
++		.nops   = 2,
++	};
++	int status;
++
++	xdr_init_encode(&xdr, &req->rq_snd_buf, p);
++	encode_compound_hdr(&xdr, &hdr);
++	status = encode_putfh(&xdr, args->fh);
++	if(status)
++		goto out;
++	status = encode_lockt(&xdr, args);
++out:
++	return status;
++}
++
++/*
++ * Encode a LOCKU request
++ */
++static int
++nfs4_xdr_enc_locku(struct rpc_rqst *req, uint32_t *p, struct nfs_lockargs *args)
++{
++	struct xdr_stream xdr;
++	struct compound_hdr hdr = {
++		.nops   = 2,
++	};
++	int status;
++
++	xdr_init_encode(&xdr, &req->rq_snd_buf, p);
++	encode_compound_hdr(&xdr, &hdr);
++	status = encode_putfh(&xdr, args->fh);
++	if(status)
++		goto out;
++	status = encode_locku(&xdr, args);
++out:
++	return status;
++}
++
++/*
++ * Encode a READLINK request
++ */
++static int
++nfs4_xdr_enc_readlink(struct rpc_rqst *req, uint32_t *p, struct nfs4_readlink *args)
++{
++	struct xdr_stream xdr;
++	struct compound_hdr hdr = {
++		.nops   = 2,
++	};
++	int status;
++
++	xdr_init_encode(&xdr, &req->rq_snd_buf, p);
++	encode_compound_hdr(&xdr, &hdr);
++	status = encode_putfh(&xdr, args->fh);
++	if(status)
++		goto out;
++	status = encode_readlink(&xdr, args, req);
++out:
++	return status;
++}
++
++/*
++ * Encode a READDIR request
++ */
++static int
++nfs4_xdr_enc_readdir(struct rpc_rqst *req, uint32_t *p, struct nfs4_readdir_arg *args)
++{
++	struct xdr_stream xdr;
++	struct compound_hdr hdr = {
++		.nops   = 2,
++	};
++	int status;
++
++	xdr_init_encode(&xdr, &req->rq_snd_buf, p);
++	encode_compound_hdr(&xdr, &hdr);
++	status = encode_putfh(&xdr, args->fh);
++	if(status)
++		goto out;
++	status = encode_readdir(&xdr, args, req);
++out:
++	return status;
++}
++
++/*
++ * Encode a READ request
++ */
++static int
++nfs4_xdr_enc_read(struct rpc_rqst *req, uint32_t *p, struct nfs_readargs *args)
++{
++	struct rpc_auth	*auth = req->rq_task->tk_auth;
++	struct xdr_stream xdr;
++	struct compound_hdr hdr = {
++		.nops	= 3,
++	};
++	int replen, status;
++
++	xdr_init_encode(&xdr, &req->rq_snd_buf, p);
++	encode_compound_hdr(&xdr, &hdr);
++	status = encode_putfh(&xdr, args->fh);
++	if (status)
++		goto out;
++	status = encode_read(&xdr, args);
++	if (status)
++		goto out;
++	status = encode_read_getattr(&xdr);
++
++	/* set up reply iovec
++	 *    toplevel status + taglen=0 + rescount + OP_PUTFH + status
+ 	 *       + OP_READ + status + eof + datalen = 9
+ 	 */
+ 	replen = (RPC_REPHDRSIZE + auth->au_rslack +
+@@ -1405,12 +1851,62 @@ nfs4_xdr_enc_setattr(struct rpc_rqst *re
+         status = encode_setattr(&xdr, args, args->server);
+         if(status)
+                 goto out;
+-        status = encode_getattr(&xdr, args->attr);
++        status = encode_getfattr(&xdr);
++out:
++        return status;
++}
++
++#ifdef CONFIG_NFS_V4_ACL
++
++/*
++ * Encode an SETACL request
++ */
++static int
++nfs4_xdr_enc_setacl(struct rpc_rqst *req, uint32_t *p, struct nfs_setaclargs *args)
++
++{
++        struct xdr_stream xdr;
++        struct compound_hdr hdr = {
++                .nops   = 2,
++        };
++        int status;
++
++        xdr_init_encode(&xdr, &req->rq_snd_buf, p);
++        encode_compound_hdr(&xdr, &hdr);
++        status = encode_putfh(&xdr, args->fh);
++        if(status)
++                goto out;
++        status = encode_setacl(&xdr, args);
+ out:
+         return status;
+ }
+ 
+ /*
++ * Encode a GETACL request
++ */
++static int
++nfs4_xdr_enc_getacl(struct rpc_rqst *req, uint32_t *p,struct nfs_fh *fhandle)
++{
++	struct xdr_stream xdr;
++	struct compound_hdr hdr = {
++		.nops   = 2,
++	};
++	int status;
++
++	xdr_init_encode(&xdr, &req->rq_snd_buf, p);
++	encode_compound_hdr(&xdr, &hdr);
++	status = encode_putfh(&xdr, fhandle);
++	if (status)
++		goto out;
++	status = encode_getattr_two(&xdr, FATTR4_WORD0_ACL, 0);
++out:
++	return status;
++
++}
++
++#endif /* CONFIG_NFS_V4_ACL */
++
++/*
+  * Encode a WRITE request
+  */
+ static int
+@@ -1487,6 +1983,48 @@ nfs4_xdr_enc_fsinfo(struct rpc_rqst *req
+ }
+ 
+ /*
++ * a PATHCONF request
++ */
++static int
++nfs4_xdr_enc_pathconf(struct rpc_rqst *req, uint32_t *p, struct nfs_fh *fhandle)
++{
++	struct xdr_stream xdr;
++	struct compound_hdr hdr = {
++		.nops	= 2,
++	};
++	int status;
++
++	xdr_init_encode(&xdr, &req->rq_snd_buf, p);
++	encode_compound_hdr(&xdr, &hdr);
++	status = encode_putfh(&xdr, fhandle);
++	if (!status)
++		status = encode_getattr_one(&xdr,FATTR4_WORD0_MAXLINK | 
++					         FATTR4_WORD0_MAXNAME );
++	return status;
++}
++
++/*
++ * a STATFS request
++ */
++static int
++nfs4_xdr_enc_statfs(struct rpc_rqst *req, uint32_t *p, struct nfs_fh *fhandle)
++{
++	struct xdr_stream xdr;
++	struct compound_hdr hdr = {
++		.nops	= 2,
++	};
++	int status;
++
++	xdr_init_encode(&xdr, &req->rq_snd_buf, p);
++	encode_compound_hdr(&xdr, &hdr);
++	status = encode_putfh(&xdr, fhandle);
++	if (!status)
++		status = encode_getattr_two(&xdr,nfs4_statfs_bitmap[0],
++					         nfs4_statfs_bitmap[1]);
++	return status;
++}
++
++/*
+  * a RENEW request
+  */
+ static int
+@@ -1636,7 +2174,7 @@ decode_change_info(struct xdr_stream *xd
+ }
+ 
+ static int
+-decode_access(struct xdr_stream *xdr, struct nfs4_access *access)
++decode_access(struct xdr_stream *xdr, struct nfs4_accessres *access)
+ {
+ 	uint32_t *p;
+ 	uint32_t supp, acc;
+@@ -1648,12 +2186,12 @@ decode_access(struct xdr_stream *xdr, st
+ 	READ_BUF(8);
+ 	READ32(supp);
+ 	READ32(acc);
+-	if ((supp & ~access->ac_req_access) || (acc & ~supp)) {
++	if ((supp & ~access->req_access) || (acc & ~supp)) {
+ 		printk(KERN_NOTICE "NFS: server returned bad bits in access call!\n");
+ 		return -EIO;
+ 	}
+-	*access->ac_resp_supported = supp;
+-	*access->ac_resp_access = acc;
++	*access->resp_supported = supp;
++	*access->resp_access = acc;
+ 	return 0;
+ }
+ 
+@@ -1686,7 +2224,7 @@ decode_commit(struct xdr_stream *xdr, st
+ }
+ 
+ static int
+-decode_create(struct xdr_stream *xdr, struct nfs4_create *create)
++decode_create(struct xdr_stream *xdr, struct nfs4_change_info *cinfo)
+ {
+ 	uint32_t *p;
+ 	uint32_t bmlen;
+@@ -1695,7 +2233,7 @@ decode_create(struct xdr_stream *xdr, st
+ 	status = decode_op_hdr(xdr, OP_CREATE);
+ 	if (status)
+ 		return status;
+-	if ((status = decode_change_info(xdr, create->cr_cinfo)))
++	if ((status = decode_change_info(xdr, cinfo)))
+ 		return status;
+ 	READ_BUF(4);
+ 	READ32(bmlen);
+@@ -1703,17 +2241,144 @@ decode_create(struct xdr_stream *xdr, st
+ 	return 0;
+ }
+ 
+-extern uint32_t nfs4_fattr_bitmap[2];
+ extern uint32_t nfs4_fsstat_bitmap[2];
+-extern uint32_t nfs4_pathconf_bitmap[2];
+ 
+ static int
+-decode_getattr(struct xdr_stream *xdr, struct nfs4_getattr *getattr,
++decode_statfs(struct xdr_stream *xdr, struct nfs_fsstat *fsstat)
++{
++	uint32_t attrlen, bmlen,
++		 bmval0 = 0,
++		 bmval1 = 0,
++		 len = 0;
++	uint32_t *p;
++	int status;
++	
++	status = decode_op_hdr(xdr, OP_GETATTR);
++	if (status)
++		return status;
++        
++        READ_BUF(4);
++        READ32(bmlen);
++        if (bmlen > 2)
++                goto xdr_error;
++	
++        READ_BUF((bmlen << 2) + 4);
++        if (bmlen > 0)
++                READ32(bmval0);
++        if (bmlen > 1)
++                READ32(bmval1);
++        READ32(attrlen);
++
++	if ((bmval0 & ~nfs4_statfs_bitmap[0]) ||
++	    (bmval1 & ~nfs4_statfs_bitmap[1])) {
++		dprintk("read_attrs: server returned bad attributes!\n");
++		goto xdr_error;
++	}
++
++	if (bmval0 & FATTR4_WORD0_FILES_AVAIL) {
++		READ_BUF(8);
++		len += 8;
++		READ64(fsstat->afiles);
++		dprintk("read_attrs: files_avail=0x%Lx\n", (long long) fsstat->afiles);
++	}
++	if (bmval0 & FATTR4_WORD0_FILES_FREE) {
++		READ_BUF(8);
++		len += 8;
++		READ64(fsstat->ffiles);
++		dprintk("read_attrs: files_free=0x%Lx\n", (long long) fsstat->ffiles);
++	}
++	if (bmval0 & FATTR4_WORD0_FILES_TOTAL) {
++		READ_BUF(8);
++		len += 8;
++		READ64(fsstat->tfiles);
++		dprintk("read_attrs: files_tot=0x%Lx\n", (long long) fsstat->tfiles);
++	}
++	
++	if (bmval1 & FATTR4_WORD1_SPACE_AVAIL) {
++		READ_BUF(8);
++		len += 8;
++		READ64(fsstat->abytes);
++		dprintk("read_attrs: savail=0x%Lx\n", (long long) fsstat->abytes);
++	}
++	if (bmval1 & FATTR4_WORD1_SPACE_FREE) {
++		READ_BUF(8);
++		len += 8;
++		READ64(fsstat->fbytes);
++		dprintk("read_attrs: sfree=0x%Lx\n", (long long) fsstat->fbytes);
++	}
++	if (bmval1 & FATTR4_WORD1_SPACE_TOTAL) {
++		READ_BUF(8);
++		len += 8;
++		READ64(fsstat->tbytes);
++		dprintk("read_attrs: stotal=0x%Lx\n", (long long) fsstat->tbytes);
++	}
++	if (len != attrlen)
++		goto xdr_error;
++	
++	DECODE_TAIL;
++}
++
++static int
++decode_pathconf(struct xdr_stream *xdr, struct nfs_pathconf *pathconf)
++{
++	uint32_t bmlen,
++		 attrlen = 0, 
++		 bmval0 = 0,
++		 bmval1 = 0,
++		 len = 0;
++	uint32_t *p;
++	int status;
++	
++	status = decode_op_hdr(xdr, OP_GETATTR);
++	if (status)
++		return status;
++        
++        READ_BUF(4);
++        READ32(bmlen);
++        if ( (bmlen < 1) || (bmlen >2) )
++                goto xdr_error;
++        READ_BUF((bmlen << 2) + 4);
++	READ32(bmval0);
++	if (bmval0 & ~(FATTR4_WORD0_MAXLINK | FATTR4_WORD0_MAXNAME)) {
++		goto out_bad_bitmap;
++	}
++	if (bmlen == 2) {
++		READ32(bmval1);
++		if (bmval1 != 0)
++			goto out_bad_bitmap;
++	}
++
++        READ32(attrlen);
++	if (bmval0 & FATTR4_WORD0_MAXLINK) {
++		READ_BUF(4);
++		len += 4;
++		READ32(pathconf->max_link);
++		dprintk("read_attrs: maxlink=%d\n", pathconf->max_link);
++	}
++        if (bmval0 & FATTR4_WORD0_MAXNAME) {
++                READ_BUF(4);
++                len += 4;
++                READ32(pathconf->max_namelen);
++                dprintk("read_attrs: maxname=%d\n", pathconf->max_namelen);
++        }
++	
++        if (len != attrlen)
++                goto xdr_error;
++	return 0;
++
++out_bad_bitmap:
++	printk(KERN_NOTICE "%s: server returned bad attribute bitmap\n",__FUNCTION__);
++	return -EIO;
++
++xdr_error:
++	printk(KERN_NOTICE "xdr error! (%s:%d)\n", __FILE__, __LINE__);
++	return -EIO;
++}
++
++static int
++decode_getfattr(struct xdr_stream *xdr, struct nfs_fattr *nfp,
+     struct nfs_server *server)
+ {
+-	struct nfs_fattr *nfp = getattr->gt_attrs;
+-	struct nfs_fsstat *fsstat = getattr->gt_fsstat;
+-	struct nfs_pathconf *pathconf = getattr->gt_pathconf;
+ 	uint32_t attrlen, dummy32, bmlen,
+ 		 bmval0 = 0,
+ 		 bmval1 = 0,
+@@ -1739,25 +2404,25 @@ decode_getattr(struct xdr_stream *xdr, s
+                 READ32(bmval1);
+         READ32(attrlen);
+ 
+-	if ((bmval0 & ~getattr->gt_bmval[0]) ||
+-	    (bmval1 & ~getattr->gt_bmval[1])) {
++	if ((bmval0 & ~nfs4_fattr_bitmap[0]) ||
++	    (bmval1 & ~nfs4_fattr_bitmap[1])) {
+ 		dprintk("read_attrs: server returned bad attributes!\n");
+ 		goto xdr_error;
+ 	}
+-	if (nfp) {
+-		nfp->bitmap[0] = bmval0;
+-		nfp->bitmap[1] = bmval1;
+-	}
++
++	BUG_ON(!nfp);
++
++	nfp->bitmap[0] = bmval0;
++	nfp->bitmap[1] = bmval1;
+ 
+ 	/*
+ 	 * In case the server doesn't return some attributes,
+ 	 * we initialize them here to some nominal values..
+ 	 */
+-	if (nfp) {
+-		nfp->valid = NFS_ATTR_FATTR | NFS_ATTR_FATTR_V3 | NFS_ATTR_FATTR_V4;
+-		nfp->nlink = 1;
+-		nfp->timestamp = jiffies;
+-	}
++	nfp->valid = NFS_ATTR_FATTR | NFS_ATTR_FATTR_V3 | NFS_ATTR_FATTR_V4;
++	nfp->nlink = 1;
++	nfp->timestamp = jiffies;
++
+         if (bmval0 & FATTR4_WORD0_TYPE) {
+                 READ_BUF(4);
+                 len += 4;
+@@ -1797,37 +2462,6 @@ decode_getattr(struct xdr_stream *xdr, s
+                 READ64(nfp->fileid);
+                 dprintk("read_attrs: fileid=%Ld\n", (long long) nfp->fileid);
+         }
+-	if (bmval0 & FATTR4_WORD0_FILES_AVAIL) {
+-		READ_BUF(8);
+-		len += 8;
+-		READ64(fsstat->afiles);
+-		dprintk("read_attrs: files_avail=0x%Lx\n", (long long) fsstat->afiles);
+-	}
+-        if (bmval0 & FATTR4_WORD0_FILES_FREE) {
+-                READ_BUF(8);
+-                len += 8;
+-                READ64(fsstat->ffiles);
+-                dprintk("read_attrs: files_free=0x%Lx\n", (long long) fsstat->ffiles);
+-        }
+-        if (bmval0 & FATTR4_WORD0_FILES_TOTAL) {
+-                READ_BUF(8);
+-                len += 8;
+-                READ64(fsstat->tfiles);
+-                dprintk("read_attrs: files_tot=0x%Lx\n", (long long) fsstat->tfiles);
+-        }
+-	if (bmval0 & FATTR4_WORD0_MAXLINK) {
+-		READ_BUF(4);
+-		len += 4;
+-		READ32(pathconf->max_link);
+-		dprintk("read_attrs: maxlink=%d\n", pathconf->max_link);
+-	}
+-        if (bmval0 & FATTR4_WORD0_MAXNAME) {
+-                READ_BUF(4);
+-                len += 4;
+-                READ32(pathconf->max_namelen);
+-                dprintk("read_attrs: maxname=%d\n", pathconf->max_namelen);
+-        }
+-	
+         if (bmval1 & FATTR4_WORD1_MODE) {
+                 READ_BUF(4);
+                 len += 4;
+@@ -1851,9 +2485,11 @@ decode_getattr(struct xdr_stream *xdr, s
+ 		}
+ 		READ_BUF(dummy32);
+ 		len += (XDR_QUADLEN(dummy32) << 2);
+-		if ((status = nfs_map_name_to_uid(server->nfs4_state, (char *)p, dummy32,
+-						&nfp->uid)) < 0) {
+-			dprintk("read_attrs: name-to-uid mapping failed!\n");
++		status = nfs_map_name_to_uid(server->nfs4_state, (char *)p,
++				dummy32, &nfp->uid);
++		if (status) {
++			dprintk("read_attrs: nfs_map_name_to_uid failed!\n");
++			/* goto out; */
+ 			nfp->uid = -2;
+ 		}
+ 		dprintk("read_attrs: uid=%d\n", (int)nfp->uid);
+@@ -1868,10 +2504,12 @@ decode_getattr(struct xdr_stream *xdr, s
+ 		}
+ 		READ_BUF(dummy32);
+ 		len += (XDR_QUADLEN(dummy32) << 2);
+-		if ((status = nfs_map_group_to_gid(server->nfs4_state, (char *)p, dummy32,
+-						&nfp->gid)) < 0) {
+-			dprintk("read_attrs: group-to-gid mapping failed!\n");
++		status = nfs_map_group_to_gid(server->nfs4_state, (char *)p,
++				dummy32, &nfp->gid);
++		if (status) {
++			dprintk("read_attrs: gss_get_num failed!\n");
+ 			nfp->gid = -2;
++			/* goto out; */
+ 		}
+ 		dprintk("read_attrs: gid=%d\n", (int)nfp->gid);
+         }
+@@ -1882,28 +2520,10 @@ decode_getattr(struct xdr_stream *xdr, s
+ 		len += 8;
+ 		READ32(major);
+ 		READ32(minor);
+-		nfp->rdev = MKDEV(major, minor);
+-		if (MAJOR(nfp->rdev) != major || MINOR(nfp->rdev) != minor)
+-			nfp->rdev = 0;
+-		dprintk("read_attrs: rdev=%u:%u\n", major, minor);
+-        }
+-        if (bmval1 & FATTR4_WORD1_SPACE_AVAIL) {
+-                READ_BUF(8);
+-                len += 8;
+-                READ64(fsstat->abytes);
+-                dprintk("read_attrs: savail=0x%Lx\n", (long long) fsstat->abytes);
+-        }
+-	if (bmval1 & FATTR4_WORD1_SPACE_FREE) {
+-                READ_BUF(8);
+-                len += 8;
+-                READ64(fsstat->fbytes);
+-                dprintk("read_attrs: sfree=0x%Lx\n", (long long) fsstat->fbytes);
+-        }
+-        if (bmval1 & FATTR4_WORD1_SPACE_TOTAL) {
+-                READ_BUF(8);
+-                len += 8;
+-                READ64(fsstat->tbytes);
+-                dprintk("read_attrs: stotal=0x%Lx\n", (long long) fsstat->tbytes);
++		nfp->rdev = MKDEV(major, minor);
++		if (MAJOR(nfp->rdev) != major || MINOR(nfp->rdev) != minor)
++			nfp->rdev = 0;
++		dprintk("read_attrs: rdev=%u:%u\n", major, minor);
+         }
+         if (bmval1 & FATTR4_WORD1_SPACE_USED) {
+                 READ_BUF(8);
+@@ -1935,6 +2555,88 @@ decode_getattr(struct xdr_stream *xdr, s
+         DECODE_TAIL;
+ }
+ 
++#ifdef CONFIG_NFS_V4_ACL
++
++static int
++decode_getacl(struct xdr_stream *xdr, struct nfs4_acl **aclp)
++{
++	uint32_t attrlen, bmlen,
++		 bmval0 = 0,
++		 bmval1 = 0,
++		 len = 0;
++	uint32_t *p;
++	int status;
++	
++	status = decode_op_hdr(xdr, OP_GETATTR);
++	if (status)
++		return status;
++        
++        READ_BUF(4);
++        READ32(bmlen);
++        if (bmlen > 2)
++                goto xdr_error;
++	
++        READ_BUF((bmlen << 2) + 4);
++        if (bmlen > 0)
++                READ32(bmval0);
++        if (bmlen > 1)
++                READ32(bmval1);
++        READ32(attrlen);
++
++	if ((bmval0 & ~FATTR4_WORD0_ACL) || (bmval1)) {
++		dprintk("read_attrs: server returned bad attributes!\n");
++		goto xdr_error;
++	}
++	if (bmval0 & FATTR4_WORD0_ACL) {
++		struct nfs4_acl *acl;
++		struct nfs4_ace ace;
++		int i;
++		u_int nace;
++
++		if (aclp == NULL)
++			goto xdr_error; /* XXX MARIUS */
++
++		READ_BUF(4); len += 4;
++		READ32(nace);
++
++		if (nace == 0) {
++			*aclp = NULL;
++			goto out_acl;
++		}
++
++		acl = *aclp = nfs4_acl_new();
++		if (acl == NULL) {
++			status = -ENOMEM;
++			goto out;
++		}
++
++		for (i = 0; i < nace; i++) {
++			READ_BUF(16); len += 16;
++			READ32(ace.type);
++			READ32(ace.flag);
++			READ32(ace.access_mask);
++			ace.access_mask &= NFS4_ACE_MASK_ALL;
++			READ32(ace.wholen);
++			READ_BUF(ace.wholen);
++			len += XDR_QUADLEN(ace.wholen) << 2;
++			status = nfs4_acl_add_ace(acl, ace.type, ace.flag,
++			    ace.access_mask, (char *)p, ace.wholen);
++			if (status < 0)
++				goto out;
++			p += XDR_QUADLEN(ace.wholen);
++		}
++	} else if (aclp != NULL)
++		*aclp = NULL;
++out_acl:
++
++        if (len != attrlen)
++                goto xdr_error;
++	
++        DECODE_TAIL;
++}
++
++#endif /* CONFIG_NFS_V4_ACL */
++
+ static int
+ decode_change_attr(struct xdr_stream *xdr, uint64_t *change_attr)
+ {
+@@ -2067,6 +2769,77 @@ out_bad_bitmap:
+ 	return -EIO;
+ }
+ 
++static int
++decode_putfh(struct xdr_stream *xdr)
++{
++	return decode_op_hdr(xdr, OP_PUTFH);
++}
++
++static int
++decode_setattr(struct xdr_stream *xdr)
++{
++	uint32_t *p;
++	uint32_t bmlen;
++	int status;
++
++        
++	status = decode_op_hdr(xdr, OP_SETATTR);
++	if (status)
++		return status;
++	READ_BUF(4);
++	READ32(bmlen);
++	READ_BUF(bmlen << 2);
++	return 0;
++}
++
++#ifdef CONFIG_NFS_V4_ACL
++
++/*
++ * Decode SETACL response
++ */
++static int
++nfs4_xdr_dec_setacl(struct rpc_rqst *rqstp, uint32_t *p, void *res)
++{
++	struct xdr_stream xdr;
++	struct compound_hdr hdr;
++	int status;
++
++	xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
++	status = decode_compound_hdr(&xdr, &hdr);
++	if (status)
++		goto out;
++	status = decode_putfh(&xdr);
++	if (status)
++		goto out;
++	status = decode_setattr(&xdr);
++out:
++	return status;
++}
++
++/*
++ * Decode GETACL response
++ */
++static int
++nfs4_xdr_dec_getacl(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_acl **res)
++{
++	struct xdr_stream xdr;
++	struct compound_hdr hdr;
++	int status;
++	
++	xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
++	status = decode_compound_hdr(&xdr, &hdr);
++	if (status)
++		goto out;
++	status = decode_putfh(&xdr);
++	if (status)
++		goto out;
++	status = decode_getacl(&xdr, res);
++
++out:
++	return status;
++}
++
++#endif /* CONFIG_NFS_V4_ACL */
+ 
+ static int
+ decode_fsinfo(struct xdr_stream *xdr, struct nfs_fsinfo *fsinfo)
+@@ -2137,9 +2910,8 @@ out_bad_bitmap:
+ }
+ 
+ static int
+-decode_getfh(struct xdr_stream *xdr, struct nfs4_getfh *getfh)
++decode_getfh(struct xdr_stream *xdr, struct nfs_fh *fh)
+ {
+-	struct nfs_fh *fh = getfh->gf_fhandle;
+ 	uint32_t *p;
+ 	uint32_t len;
+ 	int status;
+@@ -2161,14 +2933,14 @@ decode_getfh(struct xdr_stream *xdr, str
+ }
+ 
+ static int
+-decode_link(struct xdr_stream *xdr, struct nfs4_link *link)
++decode_link(struct xdr_stream *xdr, struct nfs4_change_info *cinfo)
+ {
+ 	int status;
+ 	
+ 	status = decode_op_hdr(xdr, OP_LINK);
+ 	if (status)
+ 		return status;
+-	return decode_change_info(xdr, link->ln_cinfo);
++	return decode_change_info(xdr, cinfo);
+ }
+ 
+ /*
+@@ -2296,12 +3068,6 @@ decode_open_downgrade(struct xdr_stream 
+ }
+ 
+ static int
+-decode_putfh(struct xdr_stream *xdr)
+-{
+-	return decode_op_hdr(xdr, OP_PUTFH);
+-}
+-
+-static int
+ decode_putrootfh(struct xdr_stream *xdr)
+ {
+ 	return decode_op_hdr(xdr, OP_PUTROOTFH);
+@@ -2336,7 +3102,7 @@ decode_read(struct xdr_stream *xdr, stru
+ }
+ 
+ static int
+-decode_readdir(struct xdr_stream *xdr, struct rpc_rqst *req, struct nfs4_readdir *readdir)
++decode_readdir(struct xdr_stream *xdr, struct rpc_rqst *req, struct nfs4_readdir_res *readdir)
+ {
+ 	struct xdr_buf	*rcvbuf = &req->rq_rcv_buf;
+ 	struct page	*page = *rcvbuf->pages;
+@@ -2350,7 +3116,7 @@ decode_readdir(struct xdr_stream *xdr, s
+ 	if (status)
+ 		return status;
+ 	READ_BUF(8);
+-	COPYMEM(readdir->rd_resp_verifier.data, 8);
++	COPYMEM(readdir->resp_verifier.data, 8);
+ 
+ 	hdrlen = (char *) p - (char *) iov->iov_base;
+ 	recvd = req->rq_received - hdrlen;
+@@ -2358,9 +3124,9 @@ decode_readdir(struct xdr_stream *xdr, s
+ 		pglen = recvd;
+ 	xdr_read_pages(xdr, pglen);
+ 
+-	BUG_ON(pglen + readdir->rd_pgbase > PAGE_CACHE_SIZE);
++	BUG_ON(pglen + readdir->pgbase > PAGE_CACHE_SIZE);
+ 	kaddr = p = (uint32_t *) kmap_atomic(page, KM_USER0);
+-	end = (uint32_t *) ((char *)p + pglen + readdir->rd_pgbase);
++	end = (uint32_t *) ((char *)p + pglen + readdir->pgbase);
+ 	entry = p;
+ 	for (nr = 0; *p++; nr++) {
+ 		if (p + 3 > end)
+@@ -2421,7 +3187,7 @@ err_unmap:
+ }
+ 
+ static int
+-decode_readlink(struct xdr_stream *xdr, struct rpc_rqst *req, struct nfs4_readlink *readlink)
++decode_readlink(struct xdr_stream *xdr, struct rpc_rqst *req)
+ {
+ 	struct xdr_buf *rcvbuf = &req->rq_rcv_buf;
+ 	struct iovec *iov = rcvbuf->head;
+@@ -2469,30 +3235,30 @@ decode_restorefh(struct xdr_stream *xdr)
+ }
+ 
+ static int
+-decode_remove(struct xdr_stream *xdr, struct nfs4_remove *remove)
++decode_remove(struct xdr_stream *xdr, struct nfs4_change_info *cinfo)
+ {
+ 	int status;
+ 
+ 	status = decode_op_hdr(xdr, OP_REMOVE);
+ 	if (status)
+ 		goto out;
+-	status = decode_change_info(xdr, remove->rm_cinfo);
++	status = decode_change_info(xdr, cinfo);
+ out:
+ 	return status;
+ }
+ 
+ static int
+-decode_rename(struct xdr_stream *xdr, struct nfs4_rename *rename)
++decode_rename(struct xdr_stream *xdr, struct nfs4_change_info *old_cinfo,
++	      struct nfs4_change_info *new_cinfo)
+ {
+ 	int status;
+ 
+ 	status = decode_op_hdr(xdr, OP_RENAME);
+ 	if (status)
+ 		goto out;
+-	if ((status = decode_change_info(xdr, rename->rn_src_cinfo)))
+-		goto out;
+-	if ((status = decode_change_info(xdr, rename->rn_dst_cinfo)))
++	if ((status = decode_change_info(xdr, old_cinfo)))
+ 		goto out;
++	status = decode_change_info(xdr, new_cinfo);
+ out:
+ 	return status;
+ }
+@@ -2510,23 +3276,6 @@ decode_savefh(struct xdr_stream *xdr)
+ }
+ 
+ static int
+-decode_setattr(struct xdr_stream *xdr, struct nfs_setattrres *res)
+-{
+-	uint32_t *p;
+-	uint32_t bmlen;
+-	int status;
+-
+-        
+-	status = decode_op_hdr(xdr, OP_SETATTR);
+-	if (status)
+-		return status;
+-	READ_BUF(4);
+-	READ32(bmlen);
+-	READ_BUF(bmlen << 2);
+-	return 0;
+-}
+-
+-static int
+ decode_setclientid(struct xdr_stream *xdr, struct nfs4_client *clp)
+ {
+ 	uint32_t *p;
+@@ -2566,158 +3315,348 @@ decode_setclientid(struct xdr_stream *xd
+ }
+ 
+ static int
+-decode_setclientid_confirm(struct xdr_stream *xdr)
++decode_setclientid_confirm(struct xdr_stream *xdr)
++{
++	return decode_op_hdr(xdr, OP_SETCLIENTID_CONFIRM);
++}
++
++static int
++decode_write(struct xdr_stream *xdr, struct nfs_writeres *res)
++{
++	uint32_t *p;
++	int status;
++
++	status = decode_op_hdr(xdr, OP_WRITE);
++	if (status)
++		return status;
++
++	READ_BUF(16);
++	READ32(res->count);
++	READ32(res->verf->committed);
++	COPYMEM(res->verf->verifier, 8);
++	return 0;
++}
++
++/*
++ * Decode OPEN_DOWNGRADE response
++ */
++static int
++nfs4_xdr_dec_open_downgrade(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_closeres *res)
++{
++        struct xdr_stream xdr;
++        struct compound_hdr hdr;
++        int status;
++
++        xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
++        status = decode_compound_hdr(&xdr, &hdr);
++        if (status)
++                goto out;
++        status = decode_putfh(&xdr);
++        if (status)
++                goto out;
++        status = decode_open_downgrade(&xdr, res);
++out:
++        return status;
++}
++
++/*
++ * END OF "GENERIC" DECODE ROUTINES.
++ */
++
++/*
++ * Decode ACCESS response
++ */
++static int
++nfs4_xdr_dec_access(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_accessres *res)
++{
++	struct xdr_stream xdr;
++	struct compound_hdr hdr;
++	int status;
++	
++	xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
++	status = decode_compound_hdr(&xdr, &hdr);
++	if (status)
++		goto out;
++	status = decode_putfh(&xdr);
++	if (status)
++		goto out;
++	status = decode_getfattr(&xdr, res->fattr, res->server);
++	if (status)
++		goto out;
++	status = decode_access(&xdr, res);
++out:
++	return status;
++}
++
++/*
++ * Decode LOOKUP response
++ */
++static int
++nfs4_xdr_dec_lookup(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_lookupres *res)
++{
++	struct xdr_stream xdr;
++	struct compound_hdr hdr;
++	int status;
++	
++	xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
++	status = decode_compound_hdr(&xdr, &hdr);
++	if (status)
++		goto out;
++	status = decode_putfh(&xdr);
++	if (status)
++		goto out;
++	status = decode_getfattr(&xdr, res->dirattr, res->server);
++	if (status)
++		goto out;
++	status = decode_lookup(&xdr);
++	if (status)
++		goto out;
++	status = decode_getfattr(&xdr, res->fattr, res->server);
++	if (status)
++		goto out;
++	status = decode_getfh(&xdr, res->fhandle);
++out:
++	return status;
++}
++
++/*
++ * Decode GETROOT_HEAD response
++ */
++static int
++nfs4_xdr_dec_getroot_head(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_getroot_res *res)
++{
++	struct xdr_stream xdr;
++	struct compound_hdr hdr;
++	int status;
++	
++	xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
++	status = decode_compound_hdr(&xdr, &hdr);
++	if (status)
++		goto out;
++	status = decode_putrootfh(&xdr);
++	if (status)
++		goto out;
++	status = decode_getfattr(&xdr, res->fattr, res->server);
++	if (status)
++		goto out;
++	status = decode_getfh(&xdr, res->fhandle);
++out:
++	return status;
++}
++
++/*
++ * Decode GETROOT_PATH response
++ */
++static int
++nfs4_xdr_dec_getroot_path(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_getroot_res *res)
++{
++	struct xdr_stream xdr;
++	struct compound_hdr hdr;
++	int status;
++	
++	xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
++	status = decode_compound_hdr(&xdr, &hdr);
++	if (status)
++		goto out;
++	status = decode_putfh(&xdr);
++	if (status)
++		goto out;
++	status = decode_lookup(&xdr);
++	if (status)
++		goto out;
++	status = decode_getfattr(&xdr, res->fattr, res->server);
++	if (status)
++		goto out;
++	status = decode_getfh(&xdr, res->fhandle);
++out:
++	return status;
++}
++
++/*
++ * Decode REMOVE response
++ */
++static int
++nfs4_xdr_dec_remove(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_remove_res *res)
+ {
+-	return decode_op_hdr(xdr, OP_SETCLIENTID_CONFIRM);
++	struct xdr_stream xdr;
++	struct compound_hdr hdr;
++	int status;
++	
++	xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
++	status = decode_compound_hdr(&xdr, &hdr);
++	if (status)
++		goto out;
++	status = decode_putfh(&xdr);
++	if (status)
++		goto out;
++	status = decode_remove(&xdr, res->dir_cinfo);
++	if (status)
++		goto out;
++	status = decode_getfattr(&xdr, res->dir_attr, res->server);
++out:
++	return status;
+ }
+ 
++/*
++ * Decode UNLINK response
++ */
+ static int
+-decode_write(struct xdr_stream *xdr, struct nfs_writeres *res)
++nfs4_xdr_dec_unlink(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_unlink *res)
+ {
+-	uint32_t *p;
++	struct xdr_stream xdr;
++	struct compound_hdr hdr;
+ 	int status;
+-
+-	status = decode_op_hdr(xdr, OP_WRITE);
++	
++	xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
++	status = decode_compound_hdr(&xdr, &hdr);
+ 	if (status)
+-		return status;
+-
+-	READ_BUF(16);
+-	READ32(res->count);
+-	READ32(res->verf->committed);
+-	COPYMEM(res->verf->verifier, 8);
+-	return 0;
++		goto out;
++	status = decode_putfh(&xdr);
++	if (status)
++		goto out;
++	status = decode_remove(&xdr, &res->cinfo);
++	if (status)
++		goto out;
++	status = decode_getfattr(&xdr, &res->attrs, res->server);
++out:
++	return status;
+ }
+ 
+-/* FIXME: this sucks */
++/*
++ * Decode RENAME response
++ */
+ static int
+-decode_compound(struct xdr_stream *xdr, struct nfs4_compound *cp, struct rpc_rqst *req)
++nfs4_xdr_dec_rename(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_rename_res *res)
+ {
++	struct xdr_stream xdr;
+ 	struct compound_hdr hdr;
+-	struct nfs4_op *op;
+ 	int status;
+-
+-	status = decode_compound_hdr(xdr, &hdr);
++	
++	xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
++	status = decode_compound_hdr(&xdr, &hdr);
+ 	if (status)
+ 		goto out;
+-
+-	cp->toplevel_status = hdr.status;
+-
+-	/*
+-	 * We need this if our zero-copy I/O is going to work.  Rumor has
+-	 * it that the spec will soon mandate it...
+-	 */
+-	if (hdr.taglen != cp->taglen)
+-		dprintk("nfs4: non-conforming server returns tag length mismatch!\n");
+-
+-	cp->resp_nops = hdr.nops;
+-	if (hdr.nops > cp->req_nops) {
+-		dprintk("nfs4: resp_nops > req_nops!\n");
+-		goto xdr_error;
+-	}
+-
+-	op = &cp->ops[0];
+-	for (cp->nops = 0; cp->nops < cp->resp_nops; cp->nops++, op++) {
+-		switch (op->opnum) {
+-		case OP_ACCESS:
+-			status = decode_access(xdr, &op->u.access);
+-			break;
+-		case OP_CREATE:
+-			status = decode_create(xdr, &op->u.create);
+-			break;
+-		case OP_GETATTR:
+-			status = decode_getattr(xdr, &op->u.getattr, cp->server);
+-			break;
+-		case OP_GETFH:
+-			status = decode_getfh(xdr, &op->u.getfh);
+-			break;
+-		case OP_LINK:
+-			status = decode_link(xdr, &op->u.link);
+-			break;
+-		case OP_LOOKUP:
+-			status = decode_lookup(xdr);
+-			break;
+-		case OP_PUTFH:
+-			status = decode_putfh(xdr);
+-			break;
+-		case OP_PUTROOTFH:
+-			status = decode_putrootfh(xdr);
+-			break;
+-		case OP_READDIR:
+-			status = decode_readdir(xdr, req, &op->u.readdir);
+-			break;
+-		case OP_READLINK:
+-			status = decode_readlink(xdr, req, &op->u.readlink);
+-			break;
+-		case OP_RESTOREFH:
+-			status = decode_restorefh(xdr);
+-			break;
+-		case OP_REMOVE:
+-			status = decode_remove(xdr, &op->u.remove);
+-			break;
+-		case OP_RENAME:
+-			status = decode_rename(xdr, &op->u.rename);
+-			break;
+-		case OP_SAVEFH:
+-			status = decode_savefh(xdr);
+-			break;
+-		default:
+-			BUG();
+-			return -EIO;
+-		}
+-		if (status)
+-			break;
+-	}
+-
+-	DECODE_TAIL;
++	status = decode_putfh(&xdr);
++	if (status)
++		goto out;
++	status = decode_savefh(&xdr);
++	if (status)
++		goto out;
++	status = decode_putfh(&xdr);
++	if (status)
++		goto out;
++	status = decode_rename(&xdr, res->old_cinfo, res->new_cinfo);
++	if (status)
++		goto out;
++	status = decode_getfattr(&xdr, res->new_fattr, res->server);
++	if (status)
++		goto out;
++	status = decode_restorefh(&xdr);
++	if (status)
++		goto out;
++	status = decode_getfattr(&xdr, res->old_fattr, res->server);
++out:
++	return status;
+ }
+ 
+ /*
+- * Decode OPEN_DOWNGRADE response
++ * Decode LINK response
+  */
+ static int
+-nfs4_xdr_dec_open_downgrade(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_closeres *res)
++nfs4_xdr_dec_link(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_link_res *res)
+ {
+-        struct xdr_stream xdr;
+-        struct compound_hdr hdr;
+-        int status;
+-
+-        xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
+-        status = decode_compound_hdr(&xdr, &hdr);
+-        if (status)
+-                goto out;
+-        status = decode_putfh(&xdr);
+-        if (status)
+-                goto out;
+-        status = decode_open_downgrade(&xdr, res);
++	struct xdr_stream xdr;
++	struct compound_hdr hdr;
++	int status;
++	
++	xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
++	status = decode_compound_hdr(&xdr, &hdr);
++	if (status)
++		goto out;
++	status = decode_putfh(&xdr);
++	if (status)
++		goto out;
++	status = decode_savefh(&xdr);
++	if (status)
++		goto out;
++	status = decode_putfh(&xdr);
++	if (status)
++		goto out;
++	status = decode_link(&xdr, res->dir_cinfo);
++	if (status)
++		goto out;
++	status = decode_getfattr(&xdr, res->dir_attr, res->server);
++	if (status)
++		goto out;
++	status = decode_restorefh(&xdr);
++	if (status)
++		goto out;
++	status = decode_getfattr(&xdr, res->fattr, res->server);
+ out:
+-        return status;
++	return status;
+ }
+ 
+ /*
+- * END OF "GENERIC" DECODE ROUTINES.
++ * Decode CREATE response
+  */
++static int
++nfs4_xdr_dec_create(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_create_res *res)
++{
++	struct xdr_stream xdr;
++	struct compound_hdr hdr;
++	int status;
++	
++	xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
++	status = decode_compound_hdr(&xdr, &hdr);
++	if (status)
++		goto out;
++	status = decode_putfh(&xdr);
++	if (status)
++		goto out;
++	status = decode_savefh(&xdr);
++	if (status)
++		goto out;
++	status = decode_create(&xdr,res->dir_cinfo);
++	if (status)
++		goto out;
++	status = decode_getfattr(&xdr, res->fattr, res->server);
++	if (status)
++		goto out;
++	status = decode_getfh(&xdr, res->fhandle);
++	if (status)
++		goto out;
++	status = decode_restorefh(&xdr);
++	if (status)
++		goto out;
++	status = decode_getfattr(&xdr, res->dir_attr, res->server);
++out:
++	return status;
++}
+ 
+ /*
+- * Decode COMPOUND response
++ * Decode GETATTR response
+  */
+ static int
+-nfs4_xdr_dec_compound(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_compound *cp)
++nfs4_xdr_dec_getattr(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_getattr_res *res)
+ {
+ 	struct xdr_stream xdr;
++	struct compound_hdr hdr;
+ 	int status;
+ 	
+ 	xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
+-	if ((status = decode_compound(&xdr, cp, rqstp)))
++	status = decode_compound_hdr(&xdr, &hdr);
++	if (status)
+ 		goto out;
+-	
+-	status = 0;
+-	if (cp->toplevel_status)
+-		status = -nfs_stat_to_errno(cp->toplevel_status);
+-
++	status = decode_putfh(&xdr);
++	if (status)
++		goto out;
++	status = decode_getfattr(&xdr, res->fattr, res->server);
+ out:
+ 	return status;
++
+ }
+ 
++
+ /*
+  * Decode CLOSE response
+  */
+@@ -2748,9 +3687,6 @@ nfs4_xdr_dec_open(struct rpc_rqst *rqstp
+ {
+         struct xdr_stream xdr;
+         struct compound_hdr hdr;
+-	struct nfs4_getfh gfh	= {
+-		.gf_fhandle = &res->fh,
+-	};
+         int status;
+ 
+         xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
+@@ -2766,16 +3702,16 @@ nfs4_xdr_dec_open(struct rpc_rqst *rqstp
+         status = decode_open(&xdr, res);
+         if (status)
+                 goto out;
+-        status = decode_getattr(&xdr, res->f_getattr, res->server);
++        status = decode_getfattr(&xdr, res->f_attr, res->server);
+         if (status)
+                 goto out;
+-        status = decode_getfh(&xdr, &gfh);
++        status = decode_getfh(&xdr, &res->fh);
+         if (status)
+                 goto out;
+         status = decode_restorefh(&xdr);
+         if (status)
+                 goto out;
+-        status = decode_getattr(&xdr, res->d_getattr, res->server);
++        status = decode_getfattr(&xdr, res->d_attr, res->server);
+         if (status)
+                 goto out;
+ out:
+@@ -2824,7 +3760,7 @@ nfs4_xdr_dec_open_reclaim(struct rpc_rqs
+         status = decode_open(&xdr, res);
+         if (status)
+                 goto out;
+-        status = decode_getattr(&xdr, res->f_getattr, res->server);
++        status = decode_getfattr(&xdr, res->f_attr, res->server);
+ out:
+         return status;
+ }
+@@ -2846,10 +3782,10 @@ nfs4_xdr_dec_setattr(struct rpc_rqst *rq
+         status = decode_putfh(&xdr);
+         if (status)
+                 goto out;
+-        status = decode_setattr(&xdr, res);
++        status = decode_setattr(&xdr);
+         if (status)
+                 goto out;
+-        status = decode_getattr(&xdr, res->attr, res->server);
++        status = decode_getfattr(&xdr, res->fattr, res->server);
+ out:
+         return status;
+ }
+@@ -2921,6 +3857,50 @@ out:
+ }
+ 
+ /*
++ * Decode READLINK response
++ */
++static int
++nfs4_xdr_dec_readlink(struct rpc_rqst *rqstp, uint32_t *p, void *res)
++{
++	struct xdr_stream xdr;
++	struct compound_hdr hdr;
++	int status;
++
++	xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
++	status = decode_compound_hdr(&xdr, &hdr);
++	if (status)
++		goto out;
++	status = decode_putfh(&xdr);
++	if (status)
++		goto out;
++	status = decode_readlink(&xdr, rqstp);
++out:
++	return status;
++}
++
++/*
++ * Decode READDIR response
++ */
++static int
++nfs4_xdr_dec_readdir(struct rpc_rqst *rqstp, uint32_t *p, struct nfs4_readdir_res *res)
++{
++	struct xdr_stream xdr;
++	struct compound_hdr hdr;
++	int status;
++
++	xdr_init_decode(&xdr, &rqstp->rq_rcv_buf, p);
++	status = decode_compound_hdr(&xdr, &hdr);
++	if (status)
++		goto out;
++	status = decode_putfh(&xdr);
++	if (status)
++		goto out;
++	status = decode_readdir(&xdr, rqstp, res);
++out:
++	return status;
++}
++
++/*
+  * Decode Read response
+  */
+ static int
+@@ -3033,6 +4013,44 @@ nfs4_xdr_dec_fsinfo(struct rpc_rqst *req
+ }
+ 
+ /*
++ * PATHCONF request
++ */
++static int
++nfs4_xdr_dec_pathconf(struct rpc_rqst *req, uint32_t *p, struct nfs_pathconf *pathconf)
++{
++	struct xdr_stream xdr;
++	struct compound_hdr hdr;
++	int status;
++
++	xdr_init_decode(&xdr, &req->rq_rcv_buf, p);
++	status = decode_compound_hdr(&xdr, &hdr);
++	if (!status)
++		status = decode_putfh(&xdr);
++	if (!status)
++		status = decode_pathconf(&xdr, pathconf);
++	return status;
++}
++
++/*
++ * STATFS request
++ */
++static int
++nfs4_xdr_dec_statfs(struct rpc_rqst *req, uint32_t *p, struct nfs_fsstat *fsstat)
++{
++	struct xdr_stream xdr;
++	struct compound_hdr hdr;
++	int status;
++
++	xdr_init_decode(&xdr, &req->rq_rcv_buf, p);
++	status = decode_compound_hdr(&xdr, &hdr);
++	if (!status)
++		status = decode_putfh(&xdr);
++	if (!status)
++		status = decode_statfs(&xdr, fsstat);
++	return status;
++}
++
++/*
+  * Decode RENEW response
+  */
+ static int
+@@ -3201,7 +4219,6 @@ nfs_stat_to_errno(int stat)
+     }
+ 
+ struct rpc_procinfo	nfs4_procedures[] = {
+-  PROC(COMPOUND,	enc_compound,	dec_compound),
+   PROC(READ,		enc_read,	dec_read),
+   PROC(WRITE,		enc_write,	dec_write),
+   PROC(COMMIT,		enc_commit,	dec_commit),
+@@ -3218,6 +4235,24 @@ struct rpc_procinfo	nfs4_procedures[] = 
+   PROC(LOCK,            enc_lock,       dec_lock),
+   PROC(LOCKT,           enc_lockt,      dec_lockt),
+   PROC(LOCKU,           enc_locku,      dec_locku),
++#ifdef CONFIG_NFS_V4_ACL
++  PROC(GETACL,          enc_getacl,     dec_getacl),
++  PROC(SETACL,          enc_setacl,     dec_setacl),
++#endif /* CONFIG_NFS_V4_ACL */
++  PROC(ACCESS,		enc_access,	dec_access),
++  PROC(GETATTR,		enc_getattr,	dec_getattr),
++  PROC(LOOKUP,		enc_lookup,	dec_lookup),
++  PROC(GETROOT_HEAD,	enc_getroot_head,	dec_getroot_head),
++  PROC(GETROOT_PATH,	enc_getroot_path,	dec_getroot_path),
++  PROC(REMOVE,		enc_remove,	dec_remove),
++  PROC(RENAME,		enc_rename,	dec_rename),
++  PROC(LINK,		enc_link,	dec_link),
++  PROC(CREATE,		enc_create,	dec_create),
++  PROC(PATHCONF,	enc_pathconf,	dec_pathconf),
++  PROC(STATFS,		enc_statfs,	dec_statfs),
++  PROC(UNLINK,		enc_unlink,	dec_unlink),
++  PROC(READLINK,	enc_readlink,	dec_readlink),
++  PROC(READDIR,		enc_readdir,	dec_readdir),
+ };
+ 
+ struct rpc_version		nfs_version4 = {
+diff -puN fs/nfsd/vfs.c~CITI_NFS4_ALL fs/nfsd/vfs.c
+--- linux-2.6.3/fs/nfsd/vfs.c~CITI_NFS4_ALL	2004-02-19 16:47:07.000000000 -0500
++++ linux-2.6.3-bfields/fs/nfsd/vfs.c	2004-02-19 16:47:12.000000000 -0500
+@@ -44,6 +44,16 @@
+ #include <linux/nfsd/nfsfh.h>
+ #include <linux/quotaops.h>
+ #include <linux/dnotify.h>
++#ifdef CONFIG_NFSD_V4
++#include <linux/posix_acl.h>
++#include <linux/posix_acl_xattr.h>
++#include <linux/xattr_acl.h>
++#include <linux/xattr.h>
++#include <linux/nfs4.h>
++#include <linux/nfs4_acl.h>
++#include <linux/nfsd_idmap.h>
++#include <linux/security.h>
++#endif /* CONFIG_NFSD_V4 */
+ 
+ #include <asm/uaccess.h>
+ 
+@@ -341,6 +351,204 @@ out_nfserr:
+ 	goto out;
+ }
+ 
++#ifdef CONFIG_NFS_V4_ACL
++
++static int
++set_nfsv4_acl_one(struct dentry *dentry, struct posix_acl *pacl, char *key)
++{
++	int len;
++	size_t buflen;
++	char *buf = NULL;
++	int error = 0;
++	struct inode *inode = dentry->d_inode;
++
++	buflen = posix_acl_xattr_size(pacl->a_count);
++	buf = kmalloc(buflen, GFP_KERNEL);
++	error = -ENOMEM;
++	if (buf == NULL)
++		goto out;
++
++	len = posix_acl_to_xattr(pacl, buf, buflen);
++	if (len < 0) {
++		error = len;
++		goto out;
++	}
++
++	error = -EOPNOTSUPP;
++	if (inode->i_op && inode->i_op->setxattr) {
++		down(&inode->i_sem);
++		security_inode_setxattr(dentry, key, buf, len, 0);
++		error = inode->i_op->setxattr(dentry, key, buf, len, 0);
++		if (!error)
++			security_inode_post_setxattr(dentry, key, buf, len, 0);
++		up(&inode->i_sem);
++	}
++out:
++	kfree(buf);
++	return (error);
++}
++
++static inline int
++nfsd_name_to_uid_wrapper(void *arg, const char *name, size_t len, __u32 *id)
++{
++	        return nfsd_map_name_to_uid((struct svc_rqst *)arg, name, len, id);
++}
++
++static inline int
++nfsd_name_to_gid_wrapper(void *arg, const char *name, size_t len, __u32 *id)
++{
++	        return nfsd_map_name_to_gid((struct svc_rqst *)arg, name, len, id);
++}
++
++static inline int
++nfsd_uid_to_name_wrapper(void *arg, __u32 id, char *name)
++{
++	        return nfsd_map_uid_to_name((struct svc_rqst *)arg, id, name);
++}
++
++static inline int
++nfsd_gid_to_name_wrapper(void *arg, __u32 id, char *name)
++{
++	        return nfsd_map_gid_to_name((struct svc_rqst *)arg, id, name);
++}
++
++static struct nfs4_acl_idmapper nfsd_idmapper = {
++	.name2uid = nfsd_name_to_uid_wrapper,
++	.name2gid = nfsd_name_to_gid_wrapper,
++	.uid2name = nfsd_uid_to_name_wrapper,
++	.gid2name = nfsd_gid_to_name_wrapper,
++};
++
++
++int
++nfsd4_set_nfs4_acl(struct svc_rqst *rqstp, struct svc_fh *fhp,
++    struct nfs4_acl *acl)
++{
++	int error;
++	struct dentry *dentry;
++	struct inode *inode;
++	struct posix_acl *pacl = NULL, *dpacl = NULL;
++
++	/* Get inode */
++	error = fh_verify(rqstp, fhp, 0 /* S_IFREG */, MAY_SATTR);
++	if (error)
++		goto out;
++
++	dentry = fhp->fh_dentry;
++	inode = dentry->d_inode;
++
++	error = nfs4_acl_nfsv4_to_posix(&nfsd_idmapper, rqstp, acl, &pacl, &dpacl);
++	if (error < 0)
++		goto out_nfserr;
++
++	if (pacl) {
++		error = set_nfsv4_acl_one(dentry, pacl, XATTR_NAME_ACL_ACCESS);
++		if (error < 0)
++			goto out_nfserr;
++	}
++
++	if (dpacl) {
++		error = set_nfsv4_acl_one(dentry, dpacl, XATTR_NAME_ACL_DEFAULT);
++		if (error < 0)
++			goto out_nfserr;
++	}
++
++	error = nfs_ok;
++
++out:
++	posix_acl_release(pacl);
++	posix_acl_release(dpacl);
++	return (error);
++out_nfserr:
++	error = nfserrno(error);
++	goto out;
++}
++
++static struct posix_acl *
++_get_posix_acl(struct dentry *dentry, char *key)
++{
++	struct inode *inode = dentry->d_inode;
++	char *buf = NULL;
++	int buflen, error = 0;
++	struct posix_acl *pacl = NULL;
++
++	down(&inode->i_sem);
++
++	buflen = inode->i_op->getxattr(dentry, key, NULL, 0);
++	if (buflen <= 0) {
++		error = buflen < 0 ? buflen : -ENODATA;
++		goto out_sem;
++	}
++
++	buf = kmalloc(buflen, GFP_KERNEL);
++	if (buf == NULL) {
++		error = -ENOMEM;
++		goto out_sem;
++	}
++
++	error = -EOPNOTSUPP;
++	if (inode->i_op && inode->i_op->getxattr) {
++		error = security_inode_getxattr(dentry, key);
++		if (error)
++			goto out_sem;
++		error = inode->i_op->getxattr(dentry, key, buf, buflen);
++	}
++	if (error < 0)
++		goto out_sem;
++
++	error = 0;
++	up(&inode->i_sem);
++
++	pacl = posix_acl_from_xattr(buf, buflen);
++ out:
++	kfree(buf);
++	return pacl;
++ out_sem:
++	up(&inode->i_sem);
++	pacl = ERR_PTR(error);
++	goto out;
++}
++
++int
++nfsd4_get_nfs4_acl(struct svc_rqst *rqstp, struct dentry *dentry, struct nfs4_acl **acl)
++{
++	struct inode *inode = dentry->d_inode;
++	int error = 0;
++	struct posix_acl *pacl = NULL, *dpacl = NULL;
++
++	pacl = _get_posix_acl(dentry, XATTR_NAME_ACL_ACCESS);
++	if (IS_ERR(pacl) && PTR_ERR(pacl) == -ENODATA)
++		pacl = posix_acl_from_mode(inode->i_mode, GFP_KERNEL);
++	if (IS_ERR(pacl)) {
++		error = PTR_ERR(pacl);
++		pacl = NULL;
++		goto out;
++	}
++
++	if (S_ISDIR(inode->i_mode)) {
++		dpacl = _get_posix_acl(dentry, XATTR_NAME_ACL_DEFAULT);
++		if (IS_ERR(dpacl) && PTR_ERR(dpacl) == -ENODATA)
++			dpacl = NULL; 
++		else if (IS_ERR(dpacl)) {
++			error = PTR_ERR(dpacl);
++			dpacl = NULL;
++			goto out;
++		}
++	}
++
++	*acl = nfs4_acl_posix_to_nfsv4(&nfsd_idmapper, rqstp, pacl, dpacl);
++	if (IS_ERR(*acl)) {
++		error = PTR_ERR(*acl);
++		*acl = NULL;
++	}
++ out:
++	posix_acl_release(pacl);
++	posix_acl_release(dpacl);
++	return error;
++}
++
++#endif /* CONFIG_NFS_V4_ACL */
++
+ #ifdef CONFIG_NFSD_V3
+ /*
+  * Check server access rights to a file system object
+@@ -458,11 +666,15 @@ nfsd_open(struct svc_rqst *rqstp, struct
+ 	int		flags = O_RDONLY|O_LARGEFILE, err;
+ 
+ 	/*
+-	 * If we get here, then the client has already done an "open",
++	 * If we get here, then for regular files, 
++	 * the client has already done an "open",
+ 	 * and (hopefully) checked permission - so allow OWNER_OVERRIDE
+ 	 * in case a chmod has now revoked permission.
+ 	 */
+-	err = fh_verify(rqstp, fhp, type, access | MAY_OWNER_OVERRIDE);
++	if (type == S_IFDIR)
++		err = fh_verify(rqstp, fhp, type, access);
++	 else
++		err = fh_verify(rqstp, fhp, type, access | MAY_OWNER_OVERRIDE);
+ 	if (err)
+ 		goto out;
+ 
+@@ -1494,7 +1706,7 @@ nfsd_readdir(struct svc_rqst *rqstp, str
+ 		err = cdp->err;
+ 	*offsetp = file.f_pos;
+ 
+-	if (err == nfserr_eof || err == nfserr_readdir_nospc)
++	if (err == nfserr_eof || err == nfserr_toosmall)
+ 		err = nfs_ok; /* can still be found in ->err */
+ out_close:
+ 	nfsd_close(&file);
+diff -puN include/linux/nfsd/nfsd.h~CITI_NFS4_ALL include/linux/nfsd/nfsd.h
+--- linux-2.6.3/include/linux/nfsd/nfsd.h~CITI_NFS4_ALL	2004-02-19 16:47:07.000000000 -0500
++++ linux-2.6.3-bfields/include/linux/nfsd/nfsd.h	2004-02-19 16:47:11.000000000 -0500
+@@ -76,6 +76,11 @@ int		nfsd_lookup(struct svc_rqst *, stru
+ 				const char *, int, struct svc_fh *);
+ int		nfsd_setattr(struct svc_rqst *, struct svc_fh *,
+ 				struct iattr *, int, time_t);
++#ifdef CONFIG_NFSD_V4
++int             nfsd4_set_nfs4_acl(struct svc_rqst *, struct svc_fh *,
++                    struct nfs4_acl *);
++int             nfsd4_get_nfs4_acl(struct svc_rqst *, struct dentry *, struct nfs4_acl **);
++#endif /* CONFIG_NFSD_V4 */
+ int		nfsd_create(struct svc_rqst *, struct svc_fh *,
+ 				char *name, int len, struct iattr *attrs,
+ 				int type, dev_t rdev, struct svc_fh *res);
+@@ -190,9 +195,12 @@ void		nfsd_lockd_shutdown(void);
+ #define nfserr_bad_seqid	__constant_htonl(NFSERR_BAD_SEQID)
+ #define	nfserr_symlink		__constant_htonl(NFSERR_SYMLINK)
+ #define	nfserr_not_same		__constant_htonl(NFSERR_NOT_SAME)
+-#define	nfserr_readdir_nospc	__constant_htonl(NFSERR_READDIR_NOSPC)
++#define	nfserr_restorefh	__constant_htonl(NFSERR_RESTOREFH)
++#define	nfserr_attrnotsupp	__constant_htonl(NFSERR_ATTRNOTSUPP)
+ #define	nfserr_bad_xdr		__constant_htonl(NFSERR_BAD_XDR)
+ #define	nfserr_openmode		__constant_htonl(NFSERR_OPENMODE)
++#define	nfserr_locks_held	__constant_htonl(NFSERR_LOCKS_HELD)
++#define	nfserr_op_illegal	__constant_htonl(NFSERR_OP_ILLEGAL)
+ 
+ /* error codes for internal use */
+ /* if a request fails due to kmalloc failure, it gets dropped.
+@@ -247,7 +255,6 @@ static inline int is_fsid(struct svc_fh 
+ 
+ /*
+  * The following attributes are currently not supported by the NFSv4 server:
+- *    ACL           (will be supported in a forthcoming patch)
+  *    ARCHIVE       (deprecated anyway)
+  *    FS_LOCATIONS  (will be supported eventually)
+  *    HIDDEN        (unlikely to be supported any time soon)
+@@ -267,7 +274,7 @@ static inline int is_fsid(struct svc_fh 
+  | FATTR4_WORD0_FILEHANDLE      | FATTR4_WORD0_FILEID       | FATTR4_WORD0_FILES_AVAIL      \
+  | FATTR4_WORD0_FILES_FREE      | FATTR4_WORD0_FILES_TOTAL  | FATTR4_WORD0_HOMOGENEOUS      \
+  | FATTR4_WORD0_MAXFILESIZE     | FATTR4_WORD0_MAXLINK      | FATTR4_WORD0_MAXNAME          \
+- | FATTR4_WORD0_MAXREAD         | FATTR4_WORD0_MAXWRITE)
++ | FATTR4_WORD0_MAXREAD         | FATTR4_WORD0_MAXWRITE     | FATTR4_WORD0_ACL)
+ 
+ #define NFSD_SUPPORTED_ATTRS_WORD1                                                          \
+ (FATTR4_WORD1_MODE              | FATTR4_WORD1_NO_TRUNC     | FATTR4_WORD1_NUMLINKS         \
+@@ -282,7 +289,8 @@ static inline int is_fsid(struct svc_fh 
+ (FATTR4_WORD1_TIME_ACCESS_SET   | FATTR4_WORD1_TIME_MODIFY_SET)
+ 
+ /* These are the only attrs allowed in CREATE/OPEN/SETATTR. */
+-#define NFSD_WRITEABLE_ATTRS_WORD0                            FATTR4_WORD0_SIZE
++#define NFSD_WRITEABLE_ATTRS_WORD0                                                          \
++(FATTR4_WORD0_SIZE              | FATTR4_WORD0_ACL                                         )
+ #define NFSD_WRITEABLE_ATTRS_WORD1                                                          \
+ (FATTR4_WORD1_MODE              | FATTR4_WORD1_OWNER         | FATTR4_WORD1_OWNER_GROUP     \
+  | FATTR4_WORD1_TIME_ACCESS_SET | FATTR4_WORD1_TIME_METADATA | FATTR4_WORD1_TIME_MODIFY_SET)
+diff -puN net/sunrpc/auth_gss/gss_krb5_crypto.c~CITI_NFS4_ALL net/sunrpc/auth_gss/gss_krb5_crypto.c
+--- linux-2.6.3/net/sunrpc/auth_gss/gss_krb5_crypto.c~CITI_NFS4_ALL	2004-02-19 16:47:07.000000000 -0500
++++ linux-2.6.3-bfields/net/sunrpc/auth_gss/gss_krb5_crypto.c	2004-02-19 16:47:07.000000000 -0500
+@@ -58,14 +58,14 @@ krb5_encrypt(
+         struct scatterlist sg[1];
+ 	u8 local_iv[16] = {0};
+ 
+-	dprintk("RPC: krb5_encrypt: input data:\n");
++	dprintk("RPC:      krb5_encrypt: input data:\n");
+ 	print_hexl((u32 *)in, length, 0);
+ 
+ 	if (length % crypto_tfm_alg_blocksize(tfm) != 0)
+ 		goto out;
+ 
+ 	if (crypto_tfm_alg_ivsize(tfm) > 16) {
+-		dprintk("RPC: gss_k5encrypt: tfm iv size to large %d\n",
++		dprintk("RPC:      gss_k5encrypt: tfm iv size to large %d\n",
+ 		         crypto_tfm_alg_ivsize(tfm));
+ 		goto out;
+ 	}
+@@ -80,10 +80,10 @@ krb5_encrypt(
+ 
+ 	ret = crypto_cipher_encrypt_iv(tfm, sg, sg, length, local_iv);
+ 
+-	dprintk("RPC: krb5_encrypt: output data:\n");
++	dprintk("RPC:      krb5_encrypt: output data:\n");
+ 	print_hexl((u32 *)out, length, 0);
+ out:
+-	dprintk("krb5_encrypt returns %d\n",ret);
++	dprintk("RPC:      krb5_encrypt returns %d\n",ret);
+ 	return(ret);
+ }
+ 
+@@ -99,14 +99,14 @@ krb5_decrypt(
+ 	struct scatterlist sg[1];
+ 	u8 local_iv[16] = {0};
+ 
+-	dprintk("RPC: krb5_decrypt: input data:\n");
++	dprintk("RPC:      krb5_decrypt: input data:\n");
+ 	print_hexl((u32 *)in, length, 0);
+ 
+ 	if (length % crypto_tfm_alg_blocksize(tfm) != 0)
+ 		goto out;
+ 
+ 	if (crypto_tfm_alg_ivsize(tfm) > 16) {
+-		dprintk("RPC: gss_k5decrypt: tfm iv size to large %d\n",
++		dprintk("RPC:      gss_k5decrypt: tfm iv size to large %d\n",
+ 			crypto_tfm_alg_ivsize(tfm));
+ 		goto out;
+ 	}
+@@ -120,10 +120,10 @@ krb5_decrypt(
+ 
+ 	ret = crypto_cipher_decrypt_iv(tfm, sg, sg, length, local_iv);
+ 
+-	dprintk("RPC: krb5_decrypt: output_data:\n");
++	dprintk("RPC:      krb5_decrypt: output_data:\n");
+ 	print_hexl((u32 *)out, length, 0);
+ out:
+-	dprintk("gss_k5decrypt returns %d\n",ret);
++	dprintk("RPC:      gss_k5decrypt returns %d\n",ret);
+ 	return(ret);
+ }
+ 
+@@ -152,7 +152,7 @@ krb5_make_checksum(s32 cksumtype, char *
+ 			cksumname = "md5";
+ 			break;
+ 		default:
+-			dprintk("RPC: krb5_make_checksum:"
++			dprintk("RPC:      krb5_make_checksum:"
+ 				" unsupported checksum %d", cksumtype);
+ 			goto out;
+ 	}
+diff -puN net/sunrpc/auth_gss/gss_krb5_seqnum.c~CITI_NFS4_ALL net/sunrpc/auth_gss/gss_krb5_seqnum.c
+--- linux-2.6.3/net/sunrpc/auth_gss/gss_krb5_seqnum.c~CITI_NFS4_ALL	2004-02-19 16:47:07.000000000 -0500
++++ linux-2.6.3-bfields/net/sunrpc/auth_gss/gss_krb5_seqnum.c	2004-02-19 16:47:07.000000000 -0500
+@@ -70,7 +70,7 @@ krb5_get_seq_num(struct crypto_tfm *key,
+ 	s32 code;
+ 	unsigned char plain[8];
+ 
+-	dprintk("krb5_get_seq_num: \n");
++	dprintk("RPC:      krb5_get_seq_num:\n");
+ 
+ 	if ((code = krb5_decrypt(key, cksum, buf, plain, 8)))
+ 		return code;
+diff -puN net/sunrpc/auth_gss/gss_pseudoflavors.c~CITI_NFS4_ALL net/sunrpc/auth_gss/gss_pseudoflavors.c
+--- linux-2.6.3/net/sunrpc/auth_gss/gss_pseudoflavors.c~CITI_NFS4_ALL	2004-02-19 16:47:07.000000000 -0500
++++ linux-2.6.3-bfields/net/sunrpc/auth_gss/gss_pseudoflavors.c	2004-02-19 16:47:07.000000000 -0500
+@@ -82,12 +82,13 @@ gss_register_triple(u32 pseudoflavor, st
+ 
+ 	spin_lock(&registered_triples_lock);
+ 	if (do_lookup_triple_by_pseudoflavor(pseudoflavor)) {
+-		printk("Registered pseudoflavor %d again\n", pseudoflavor);
++		printk(KERN_WARNING "RPC: Registered pseudoflavor %d again\n",
++				pseudoflavor);
+ 		goto err_unlock;
+ 	}
+ 	list_add(&triple->triples, &registered_triples);
+ 	spin_unlock(&registered_triples_lock);
+-	dprintk("RPC: registered pseudoflavor %d\n", pseudoflavor);
++	dprintk("RPC:      registered pseudoflavor %d\n", pseudoflavor);
+ 
+ 	return 0;
+ 
+@@ -145,7 +146,7 @@ gss_cmp_triples(u32 oid_len, char *oid_d
+ 	oid.len = oid_len;
+ 	oid.data = oid_data;
+ 
+-	dprintk("RPC: gss_cmp_triples \n");
++	dprintk("RPC:      gss_cmp_triples\n");
+ 	print_sec_triple(&oid,qop,service);
+ 
+ 	spin_lock(&registered_triples_lock);
+@@ -158,7 +159,7 @@ gss_cmp_triples(u32 oid_len, char *oid_d
+ 		}
+ 	}
+ 	spin_unlock(&registered_triples_lock);
+-	dprintk("RPC: gss_cmp_triples return %d\n", pseudoflavor);
++	dprintk("RPC:      gss_cmp_triples return %d\n", pseudoflavor);
+ 	return pseudoflavor;
+ }
+ 
+@@ -193,8 +194,8 @@ gss_pseudoflavor_to_service(u32 pseudofl
+ 	triple = do_lookup_triple_by_pseudoflavor(pseudoflavor);
+ 	spin_unlock(&registered_triples_lock);
+ 	if (!triple) {
+-		dprintk("RPC: gss_pseudoflavor_to_service called with"
+-			" unsupported pseudoflavor %d\n", pseudoflavor);
++		dprintk("RPC:      gss_pseudoflavor_to_service called with unsupported pseudoflavor %d\n",
++				pseudoflavor);
+ 		return 0;
+ 	}
+ 	return triple->service;
+@@ -211,8 +212,8 @@ gss_pseudoflavor_to_mech(u32 pseudoflavo
+ 	if (triple)
+ 		mech = gss_mech_get(triple->mech);
+ 	else
+-		dprintk("RPC: gss_pseudoflavor_to_mech called with"
+-			" unsupported pseudoflavor %d\n", pseudoflavor);
++		dprintk("RPC:      gss_pseudoflavor_to_mech called with unsupported pseudoflavor %d\n",
++				pseudoflavor);
+ 	return mech;
+ }
+ 
+@@ -223,8 +224,8 @@ gss_pseudoflavor_to_mechOID(u32 pseudofl
+ 
+ 	mech = gss_pseudoflavor_to_mech(pseudoflavor);
+ 	if (!mech)  {
+-		dprintk("RPC: gss_pseudoflavor_to_mechOID called with"
+-			" unsupported pseudoflavor %d\n", pseudoflavor);
++		dprintk("RPC:      gss_pseudoflavor_to_mechOID called with unsupported pseudoflavor %d\n",
++				pseudoflavor);
+ 		        return -1;
+ 	}
+ 	oid->len = mech->gm_oid.len;
+diff -puN fs/nfsd/nfs4state.c~CITI_NFS4_ALL fs/nfsd/nfs4state.c
+--- linux-2.6.3/fs/nfsd/nfs4state.c~CITI_NFS4_ALL	2004-02-19 16:47:08.000000000 -0500
++++ linux-2.6.3-bfields/fs/nfsd/nfs4state.c	2004-02-19 16:47:15.000000000 -0500
+@@ -43,6 +43,7 @@
+ #include <linux/nfsd/cache.h>
+ #include <linux/mount.h>
+ #include <linux/workqueue.h>
++#include <linux/smp_lock.h>
+ #include <linux/nfs4.h>
+ #include <linux/nfsd/state.h>
+ #include <linux/nfsd/xdr4.h>
+@@ -135,12 +136,16 @@ static void release_file(struct nfs4_fil
+  *
+  * client_lru holds client queue ordered by nfs4_client.cl_time
+  * for lease renewal.
++ *
++ * close_lru holds (open) stateowner queue ordered by nfs4_stateowner.so_time
++ * for last close replay.
+  */
+ static struct list_head	conf_id_hashtbl[CLIENT_HASH_SIZE];
+ static struct list_head	conf_str_hashtbl[CLIENT_HASH_SIZE];
+ static struct list_head	unconf_str_hashtbl[CLIENT_HASH_SIZE];
+ static struct list_head	unconf_id_hashtbl[CLIENT_HASH_SIZE];
+ static struct list_head client_lru;
++static struct list_head close_lru;
+ 
+ static inline void
+ renew_client(struct nfs4_client *clp)
+@@ -269,8 +274,7 @@ cmp_clid(clientid_t * cl1, clientid_t * 
+ /* XXX what about NGROUP */
+ static int
+ cmp_creds(struct svc_cred *cr1, struct svc_cred *cr2){
+-	return((cr1->cr_uid == cr2->cr_uid) &&
+-	   	(cr1->cr_gid == cr2->cr_gid));
++	return(cr1->cr_uid == cr2->cr_uid);
+ 
+ }
+ 
+@@ -772,6 +776,9 @@ alloc_init_open_stateowner(unsigned int 
+ 	INIT_LIST_HEAD(&sop->so_strhash);
+ 	INIT_LIST_HEAD(&sop->so_perclient);
+ 	INIT_LIST_HEAD(&sop->so_perfilestate);
++	INIT_LIST_HEAD(&sop->so_perlockowner);  /* not used */
++	INIT_LIST_HEAD(&sop->so_close_lru);
++	sop->so_time = 0;
+ 	list_add(&sop->so_idhash, &ownerid_hashtbl[idhashval]);
+ 	list_add(&sop->so_strhash, &ownerstr_hashtbl[strhashval]);
+ 	list_add(&sop->so_perclient, &clp->cl_perclient);
+@@ -790,13 +797,29 @@ alloc_init_open_stateowner(unsigned int 
+ }
+ 
+ static void
++release_stateid_lockowner(struct nfs4_stateid *open_stp)
++{
++	struct nfs4_stateowner *lock_sop;	
++	
++	while (!list_empty(&open_stp->st_perlockowner)) {
++		lock_sop = list_entry(open_stp->st_perlockowner.next,
++				struct nfs4_stateowner, so_perlockowner);
++		/* list_del(&open_stp->st_perlockowner);  */
++		BUG_ON(lock_sop->so_is_open_owner);
++		release_stateowner(lock_sop);
++	}
++}
++
++static void
+ release_stateowner(struct nfs4_stateowner *sop)
+ {
+ 	struct nfs4_stateid *stp;
+ 
+-	list_del_init(&sop->so_idhash);
+-	list_del_init(&sop->so_strhash);
+-	list_del_init(&sop->so_perclient);
++	list_del(&sop->so_idhash);
++	list_del(&sop->so_strhash);
++	list_del(&sop->so_perclient);
++	list_del(&sop->so_perlockowner);
++	list_del(&sop->so_close_lru);
+ 	del_perclient++;
+ 	while (!list_empty(&sop->so_perfilestate)) {
+ 		stp = list_entry(sop->so_perfilestate.next, 
+@@ -815,6 +838,7 @@ init_stateid(struct nfs4_stateid *stp, s
+ 
+ 	INIT_LIST_HEAD(&stp->st_hash);
+ 	INIT_LIST_HEAD(&stp->st_perfilestate);
++	INIT_LIST_HEAD(&stp->st_perlockowner);
+ 	INIT_LIST_HEAD(&stp->st_perfile);
+ 	list_add(&stp->st_hash, &stateid_hashtbl[hashval]);
+ 	list_add(&stp->st_perfilestate, &sop->so_perfilestate);
+@@ -826,24 +850,30 @@ init_stateid(struct nfs4_stateid *stp, s
+ 	stp->st_stateid.si_stateownerid = sop->so_id;
+ 	stp->st_stateid.si_fileid = fp->fi_id;
+ 	stp->st_stateid.si_generation = 0;
+-	stp->st_share_access = open->op_share_access;
+-	stp->st_share_deny = open->op_share_deny;
++	stp->st_access_bmap = 0;
++	stp->st_deny_bmap = 0;
++	__set_bit(open->op_share_access, &stp->st_access_bmap);
++	__set_bit(open->op_share_deny, &stp->st_deny_bmap);
+ }
+ 
+ static void
+ release_stateid(struct nfs4_stateid *stp, int flags) {
+ 
+-	list_del_init(&stp->st_hash);
++	list_del(&stp->st_hash);
+ 	list_del_perfile++;
+-	list_del_init(&stp->st_perfile);
+-	list_del_init(&stp->st_perfilestate);
++	list_del(&stp->st_perfile);
++	list_del(&stp->st_perfilestate);
+ 	if((stp->st_vfs_set) && (flags & OPEN_STATE)) {
++		release_stateid_lockowner(stp);
+ 		nfsd_close(&stp->st_vfs_file);
+ 		vfsclose++;
+ 		dput(stp->st_vfs_file.f_dentry);
+ 		mntput(stp->st_vfs_file.f_vfsmnt);
++	} else if ((stp->st_vfs_set) && (flags & LOCK_STATE)) {
++		struct file *filp = &stp->st_vfs_file;
++
++		locks_remove_posix(filp, (fl_owner_t) stp->st_stateowner);
+ 	}
+-	/* should use a slab cache */
+ 	kfree(stp);
+ 	stp = NULL;
+ }
+@@ -852,12 +882,25 @@ static void
+ release_file(struct nfs4_file *fp)
+ {
+ 	free_file++;
+-	list_del_init(&fp->fi_hash);
++	list_del(&fp->fi_hash);
+ 	iput(fp->fi_inode);
+ 	kfree(fp);
+ }	
+ 
+ void
++move_to_close_lru(struct nfs4_stateowner *sop)
++{
++	dprintk("NFSD: move_to_close_lru nfs4_stateowner %p\n", sop);
++	/* remove stateowner from all other hash lists except perclient */
++	list_del_init(&sop->so_idhash);
++	list_del_init(&sop->so_strhash);
++	list_del_init(&sop->so_perlockowner);
++
++        list_add_tail(&sop->so_close_lru, &close_lru);
++        sop->so_time = get_seconds();
++}
++
++void
+ release_state_owner(struct nfs4_stateid *stp, struct nfs4_stateowner **sopp,
+ 		int flag)
+ {
+@@ -866,16 +909,13 @@ release_state_owner(struct nfs4_stateid 
+ 
+ 	dprintk("NFSD: release_state_owner\n");
+ 	release_stateid(stp, flag);
+-	/*
+-	 * release unused nfs4_stateowners.
+-	 * XXX will need to be placed  on an  open_stateid_lru list to be
++
++	/* place unused nfs4_stateowners on so_close_lru list to be
+ 	 * released by the laundromat service after the lease period
+ 	 * to enable us to handle CLOSE replay
+ 	 */
+-	if (sop->so_confirmed && list_empty(&sop->so_perfilestate)) {
+-		release_stateowner(sop);
+-		*sopp = NULL;
+-	}
++	if (sop->so_confirmed && list_empty(&sop->so_perfilestate))
++		move_to_close_lru(sop);
+ 	/* unused nfs4_file's are releseed. XXX slab cache? */
+ 	if (list_empty(&fp->fi_perfile)) {
+ 		release_file(fp);
+@@ -940,15 +980,46 @@ find_file(unsigned int hashval, struct i
+ 	return 0;
+ }
+ 
++#define TEST_ACCESS(x) ((x > 0 || x < 4)?1:0)
++#define TEST_DENY(x) ((x >= 0 || x < 5)?1:0)
++
++void
++set_access(unsigned int *access, unsigned long bmap) {
++	int i;
++
++	*access = 0;
++	for (i = 1; i < 4; i++) {
++		if(test_bit(i, &bmap))
++			*access |= i;
++	}
++}
++
++void
++set_deny(unsigned int *deny, unsigned long bmap) {
++	int i;
++
++	*deny = 0;
++	for (i = 0; i < 4; i++) {
++		if(test_bit(i, &bmap))
++			*deny |= i ;
++	}
++}
++
+ static int
+ test_share(struct nfs4_stateid *stp, struct nfsd4_open *open) {
+-	if ((stp->st_share_access & open->op_share_deny) ||
+-	    (stp->st_share_deny & open->op_share_access)) {
++	unsigned int access, deny;
++	
++	set_access(&access, stp->st_access_bmap);
++	set_deny(&deny, stp->st_deny_bmap);
++	if ((access & open->op_share_deny) || (deny & open->op_share_access)) 
+ 		return 0;
+-	}
+ 	return 1;
+ }
+ 
++/*
++ * Called to check deny when READ with all zero stateid or 
++ * WRITE with all zero or all one stateid
++ */ 
+ int
+ nfs4_share_conflict(struct svc_fh *current_fh, unsigned int deny_type)
+ {
+@@ -965,7 +1036,8 @@ nfs4_share_conflict(struct svc_fh *curre
+ 	/* Search for conflicting share reservations */
+ 		list_for_each_safe(pos, next, &fp->fi_perfile) {
+ 			stp = list_entry(pos, struct nfs4_stateid, st_perfile);
+-			if (stp->st_share_deny & deny_type)
++			if (test_bit(deny_type, &stp->st_deny_bmap) ||
++			    test_bit(NFS4_SHARE_DENY_BOTH, &stp->st_deny_bmap))
+ 				return nfserr_share_denied;
+ 		}
+ 	}
+@@ -1010,6 +1082,8 @@ nfs4_file_downgrade(struct file *filp, u
+  * 		notfound:
+  * 			verify clientid
+  * 			create new owner
++ *
++ * called with nfs4_lock_state() held.
+  */
+ int
+ nfsd4_process_open1(struct nfsd4_open *open)
+@@ -1028,7 +1102,6 @@ nfsd4_process_open1(struct nfsd4_open *o
+ 	if (STALE_CLIENTID(&open->op_clientid))
+ 		goto out;
+ 
+-	nfs4_lock_state();
+ 	strhashval = ownerstr_hashval(clientid->cl_id, open->op_owner);
+ 	if (find_openstateowner_str(strhashval, open, &sop)) {
+ 		open->op_stateowner = sop;
+@@ -1086,10 +1159,11 @@ instantiate_new_owner:
+ renew:
+ 	renew_client(sop->so_client);
+ out:
+-	nfs4_unlock_state();
+ 	return status;
+ }
+-
++/*
++ * called with nfs4_lock_state() held.
++ */
+ int
+ nfsd4_process_open2(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open *open)
+ {
+@@ -1108,7 +1182,10 @@ nfsd4_process_open2(struct svc_rqst *rqs
+ 
+ 	ino = current_fh->fh_dentry->d_inode;
+ 
+-	nfs4_lock_state();
++	status = nfserr_inval;
++	if (!TEST_ACCESS(open->op_share_access) || !TEST_DENY(open->op_share_deny))
++		goto out;
++	    
+ 	fi_hashval = file_hashval(ino);
+ 	if (find_file(fi_hashval, ino, &fp)) {
+ 		/* Search for conflicting share reservations */
+@@ -1119,6 +1196,9 @@ nfsd4_process_open2(struct svc_rqst *rqs
+ 				stp = stq;
+ 				continue;
+ 			}
++			/* ignore lock owners */
++			if (stq->st_stateowner->so_is_open_owner == 0) 
++				continue;
+ 			if (!test_share(stq,open))	
+ 				goto out;
+ 		}
+@@ -1137,7 +1217,7 @@ nfsd4_process_open2(struct svc_rqst *rqs
+ 						GFP_KERNEL)) == NULL)
+ 			goto out;
+ 
+-		if (open->op_share_access && NFS4_SHARE_ACCESS_WRITE)
++		if (open->op_share_access & NFS4_SHARE_ACCESS_WRITE)
+ 			flags = MAY_WRITE;
+ 		else
+ 			flags = MAY_READ;
+@@ -1156,15 +1236,18 @@ nfsd4_process_open2(struct svc_rqst *rqs
+ 		/* This is an upgrade of an existing OPEN. 
+ 		 * OR the incoming share with the existing 
+ 		 * nfs4_stateid share */
+-		int share_access = open->op_share_access;
++		unsigned int share_access;
+ 
+-		share_access &= ~(stp->st_share_access);
++		set_access(&share_access, stp->st_access_bmap);
++		share_access = ~share_access;
++		share_access &= open->op_share_access;
+ 
+ 		/* update the struct file */
+ 		if ((status = nfs4_file_upgrade(&stp->st_vfs_file, share_access)))
+ 			goto out;
+-		stp->st_share_access |= share_access;
+-		stp->st_share_deny |= open->op_share_deny;
++		/* remember the open */
++		set_bit(open->op_share_access, &stp->st_access_bmap);
++		set_bit(open->op_share_deny, &stp->st_deny_bmap);
+ 		/* bump the stateid */
+ 		update_stateid(&stp->st_stateid);
+ 	}
+@@ -1194,7 +1277,6 @@ out:
+ 	if (!open->op_stateowner->so_confirmed)
+ 		open->op_rflags |= NFS4_OPEN_RESULT_CONFIRM;
+ 
+-	nfs4_unlock_state();
+ 	return status;
+ out_free:
+ 	kfree(stp);
+@@ -1250,9 +1332,11 @@ time_t
+ nfs4_laundromat(void)
+ {
+ 	struct nfs4_client *clp;
++	struct nfs4_stateowner *sop;
+ 	struct list_head *pos, *next;
+ 	time_t cutoff = get_seconds() - NFSD_LEASE_TIME;
+-	time_t t, return_val = NFSD_LEASE_TIME;
++	time_t t, clientid_val = NFSD_LEASE_TIME;
++	time_t u, close_val = NFSD_LEASE_TIME;
+ 
+ 	nfs4_lock_state();
+ 
+@@ -1261,18 +1345,30 @@ nfs4_laundromat(void)
+ 		clp = list_entry(pos, struct nfs4_client, cl_lru);
+ 		if (time_after((unsigned long)clp->cl_time, (unsigned long)cutoff)) {
+ 			t = clp->cl_time - cutoff;
+-			if (return_val > t)
+-				return_val = t;
++			if (clientid_val > t)
++				clientid_val = t;
+ 			break;
+ 		}
+ 		dprintk("NFSD: purging unused client (clientid %08x)\n",
+ 			clp->cl_clientid.cl_id);
+ 		expire_client(clp);
+ 	}
+-	if (return_val < NFSD_LAUNDROMAT_MINTIMEOUT)
+-		return_val = NFSD_LAUNDROMAT_MINTIMEOUT;
++	list_for_each_safe(pos, next, &close_lru) {
++		sop = list_entry(pos, struct nfs4_stateowner, so_close_lru);
++		if (time_after((unsigned long)sop->so_time, (unsigned long)cutoff)) {
++			u = sop->so_time - cutoff;
++			if (close_val > u)
++				close_val = u;
++			break;
++		}
++		dprintk("NFSD: purging unused open stateowner (so_id %d)\n",
++			sop->so_id);
++		release_stateowner(sop);
++	}
++	if (clientid_val < NFSD_LAUNDROMAT_MINTIMEOUT)
++		clientid_val = NFSD_LAUNDROMAT_MINTIMEOUT;
+ 	nfs4_unlock_state();
+-	return return_val;
++	return clientid_val;
+ }
+ 
+ void
+@@ -1285,17 +1381,22 @@ laundromat_main(void *not_used)
+ 	schedule_delayed_work(&laundromat_work, t*HZ);
+ }
+ 
+-/* search ownerid_hashtbl[] for stateid owner (stateid->si_stateownerid) */
++/* search ownerid_hashtbl[] and close_lru for stateid owner 
++ * (stateid->si_stateownerid) 
++ */
+ struct nfs4_stateowner *
+-find_openstateowner_id(u32 st_id) {
++find_openstateowner_id(u32 st_id, int flags) {
+ 	struct list_head *pos, *next;
+ 	struct nfs4_stateowner *local = NULL;
+-	unsigned int hashval = ownerid_hashval(st_id);
+ 
+-	list_for_each_safe(pos, next, &ownerid_hashtbl[hashval]) {
+-		local = list_entry(pos, struct nfs4_stateowner, so_idhash);
+-		if(local->so_id == st_id)
+-			return local;
++	dprintk("NFSD: find_openstateowner_id %d\n", st_id);
++	if (flags & CLOSE_STATE) {
++		list_for_each_safe(pos, next, &close_lru) {
++			local = list_entry(pos, struct nfs4_stateowner, 
++			                    so_close_lru);
++			if(local->so_id == st_id)
++				return local;
++		}
+ 	}
+ 	return NULL;
+ }
+@@ -1303,7 +1404,8 @@ find_openstateowner_id(u32 st_id) {
+ static inline int
+ nfs4_check_fh(struct svc_fh *fhp, struct nfs4_stateid *stp)
+ {
+-	return (fhp->fh_dentry != stp->st_vfs_file.f_dentry);
++	return (stp->st_vfs_set == 0 ||
++		fhp->fh_dentry->d_inode->i_ino != stp->st_vfs_file.f_dentry->d_inode->i_ino);
+ }
+ 
+ static int
+@@ -1375,7 +1477,7 @@ out:
+  * Checks for sequence id mutating operations. 
+  */
+ int
+-nfs4_preprocess_seqid_op(struct svc_fh *current_fh, u32 seqid, stateid_t *stateid, int flags, struct nfs4_stateowner **sopp, struct nfs4_stateid **stpp)
++nfs4_preprocess_seqid_op(struct svc_fh *current_fh, u32 seqid, stateid_t *stateid, int flags, struct nfs4_stateowner **sopp, struct nfs4_stateid **stpp, clientid_t *lockclid)
+ {
+ 	int status;
+ 	struct nfs4_stateid *stp;
+@@ -1412,6 +1514,21 @@ nfs4_preprocess_seqid_op(struct svc_fh *
+ 
+ 	status = nfserr_bad_stateid;
+ 
++	/* for new lock stateowners, check that the lock->v.new.open_stateid
++	 * refers to an open stateowner, and that the lockclid 
++	 * (nfs4_lock->v.new.clientid) is the same as the 
++	 * open_stateid->st_stateowner->so_client->clientid
++	 */
++	if (lockclid) {
++		struct nfs4_stateowner *sop = stp->st_stateowner;	
++		struct nfs4_client *clp = sop->so_client;
++
++		if (!sop->so_is_open_owner)
++			goto out;
++		if (!cmp_clid(&clp->cl_clientid, lockclid))
++			goto out;
++	}
++
+ 	if ((flags & CHECK_FH) && nfs4_check_fh(current_fh, stp)) {
+ 		printk("NFSD: preprocess_seqid_op: fh-stateid mismatch!\n");
+ 		goto out;
+@@ -1463,24 +1580,30 @@ no_nfs4_stateid:
+ 	* starting by trying to look up the stateowner.
+ 	* If stateowner is not found - stateid is bad.
+ 	*/
+-	if (!(sop = find_openstateowner_id(stateid->si_stateownerid))) {
++	if (!(sop = find_openstateowner_id(stateid->si_stateownerid, flags))) {
+ 		printk("NFSD: preprocess_seqid_op: no stateowner or nfs4_stateid!\n");
+ 		status = nfserr_bad_stateid;
+ 		goto out;
+ 	}
++	*sopp = sop;
+ 
+ check_replay:
+ 	if (seqid == sop->so_seqid) {
+ 		printk("NFSD: preprocess_seqid_op: retransmission?\n");
+ 		/* indicate replay to calling function */
+ 		status = NFSERR_REPLAY_ME;
+-	} else 
++	} else  {
+ 		printk("NFSD: preprocess_seqid_op: bad seqid (expected %d, got %d\n", sop->so_seqid +1, seqid);
+ 
++		*sopp = NULL;
+ 		status = nfserr_bad_seqid;
++	}
+ 	goto out;
+ }
+ 
++/*
++ * nfs4_unlock_state(); called in encode
++ */
+ int
+ nfsd4_open_confirm(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open_confirm *oc)
+ {
+@@ -1491,13 +1614,17 @@ nfsd4_open_confirm(struct svc_rqst *rqst
+ 	dprintk("NFSD: nfsd4_open_confirm on file %.*s\n",
+ 			(int)current_fh->fh_dentry->d_name.len,
+ 			current_fh->fh_dentry->d_name.name);
++
++	if ((status = fh_verify(rqstp, current_fh, S_IFREG, 0))) 
++		goto out;
++
+ 	oc->oc_stateowner = NULL;
+ 	nfs4_lock_state();
+ 
+ 	if ((status = nfs4_preprocess_seqid_op(current_fh, oc->oc_seqid,
+ 					&oc->oc_req_stateid,
+ 					CHECK_FH | CONFIRM | OPEN_STATE,
+-					&oc->oc_stateowner, &stp)))
++					&oc->oc_stateowner, &stp, NULL)))
+ 		goto out; 
+ 
+ 	sop = oc->oc_stateowner;
+@@ -1512,49 +1639,89 @@ nfsd4_open_confirm(struct svc_rqst *rqst
+ 		         stp->st_stateid.si_generation);
+ 	status = nfs_ok;
+ out:
+-	nfs4_unlock_state();
+ 	return status;
+ }
++
++
++/* 
++ * unset all bits in union bitmap (bmap) that
++ * do not exist in share (from successful OPEN_DOWNGRADE)
++ */
++static void
++reset_union_bmap_access(unsigned long access, unsigned long *bmap)
++{
++	int i;
++	for (i = 1; i < 4; i++) {
++		if ((i & access) != i)
++			__clear_bit(i, bmap);
++	}
++}
++
++static void
++reset_union_bmap_deny(unsigned long deny, unsigned long *bmap)
++{
++	int i;
++	for (i = 0; i < 4; i++) {
++		if ((i & deny) != i)
++			__clear_bit(i, bmap);
++	}
++}
++
++/* 
++ * nfs4_unlock_state(); called in encode
++ */
++
+ int
+ nfsd4_open_downgrade(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open_downgrade *od)
+ {
+ 	int status;
+ 	struct nfs4_stateid *stp;
++	unsigned int share_access;
+ 
+ 	dprintk("NFSD: nfsd4_open_downgrade on file %.*s\n", 
+ 			(int)current_fh->fh_dentry->d_name.len,
+ 			current_fh->fh_dentry->d_name.name);
+ 
++	od->od_stateowner = NULL;
++	status = nfserr_inval;
++	if (!TEST_ACCESS(od->od_share_access) || !TEST_DENY(od->od_share_deny))
++		goto out;
++
+ 	nfs4_lock_state();
+ 	if ((status = nfs4_preprocess_seqid_op(current_fh, od->od_seqid, 
+ 					&od->od_stateid, 
+ 					CHECK_FH | OPEN_STATE, 
+-					&od->od_stateowner, &stp)))
++					&od->od_stateowner, &stp, NULL)))
+ 		goto out; 
+ 
+ 	status = nfserr_inval;
+-	if (od->od_share_access & ~stp->st_share_access) {
+-		dprintk("NFSD:access not a subset current=%08x, desired=%08x\n", 
+-			stp->st_share_access, od->od_share_access); 
++	if (!test_bit(od->od_share_access, &stp->st_access_bmap)) {
++		dprintk("NFSD:access not a subset current bitmap: 0x%lx, input access=%08x\n", 
++			stp->st_access_bmap, od->od_share_access); 
+ 		goto out;
+ 	}
+-	if (od->od_share_deny & ~stp->st_share_deny) {
+-		dprintk("NFSD:deny not a subset current=%08x, desired=%08x\n", 
+-			stp->st_share_deny, od->od_share_deny);
++	if (!test_bit(od->od_share_deny, &stp->st_deny_bmap)) {
++		dprintk("NFSD:deny not a subset current bitmap: 0x%lx, input deny=%08x\n", 
++			stp->st_deny_bmap, od->od_share_deny);
+ 		goto out;
+ 	}
++	set_access(&share_access, stp->st_access_bmap);
+ 	nfs4_file_downgrade(&stp->st_vfs_file, 
+-	stp->st_share_access & ~od->od_share_access);
+-	stp->st_share_access = od->od_share_access;
+-	stp->st_share_deny = od->od_share_deny;
++	                    share_access & ~od->od_share_access);
++
++	reset_union_bmap_access(od->od_share_access, &stp->st_access_bmap);
++	reset_union_bmap_deny(od->od_share_deny, &stp->st_deny_bmap);
++
+ 	update_stateid(&stp->st_stateid);
+ 	memcpy(&od->od_stateid, &stp->st_stateid, sizeof(stateid_t));
+ 	status = nfs_ok;
+ out:
+-	nfs4_unlock_state();
+ 	return status;
+ }
+ 
++/* 
++ * nfs4_unlock_state() called after encode
++ */
+ int
+ nfsd4_close(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_close *close)
+ {
+@@ -1565,11 +1732,13 @@ nfsd4_close(struct svc_rqst *rqstp, stru
+ 			(int)current_fh->fh_dentry->d_name.len,
+ 			current_fh->fh_dentry->d_name.name);
+ 
++	close->cl_stateowner = NULL;
+ 	nfs4_lock_state();
++	/* check close_lru for replay */
+ 	if ((status = nfs4_preprocess_seqid_op(current_fh, close->cl_seqid, 
+ 					&close->cl_stateid, 
+-					CHECK_FH | OPEN_STATE, 
+-					&close->cl_stateowner, &stp)))
++					CHECK_FH | OPEN_STATE | CLOSE_STATE, 
++					&close->cl_stateowner, &stp, NULL)))
+ 		goto out; 
+ 	/*
+ 	*  Return success, but first update the stateid.
+@@ -1581,7 +1750,6 @@ nfsd4_close(struct svc_rqst *rqstp, stru
+ 	/* release_state_owner() calls nfsd_close() if needed */
+ 	release_state_owner(stp, &close->cl_stateowner, OPEN_STATE);
+ out:
+-	nfs4_unlock_state();
+ 	return status;
+ }
+ 
+@@ -1717,7 +1885,7 @@ find_lockstateowner_str(unsigned int has
+  */
+ 
+ static struct nfs4_stateowner *
+-alloc_init_lock_stateowner(unsigned int strhashval, struct nfs4_client *clp, struct nfsd4_lock *lock) {
++alloc_init_lock_stateowner(unsigned int strhashval, struct nfs4_client *clp, struct nfs4_stateid *open_stp, struct nfsd4_lock *lock) {
+ 	struct nfs4_stateowner *sop;
+ 	struct nfs4_replay *rp;
+ 	unsigned int idhashval;
+@@ -1729,9 +1897,13 @@ alloc_init_lock_stateowner(unsigned int 
+ 	INIT_LIST_HEAD(&sop->so_strhash);
+ 	INIT_LIST_HEAD(&sop->so_perclient);
+ 	INIT_LIST_HEAD(&sop->so_perfilestate);
++	INIT_LIST_HEAD(&sop->so_perlockowner);
++	INIT_LIST_HEAD(&sop->so_close_lru); /* not used */
++	sop->so_time = 0;
+ 	list_add(&sop->so_idhash, &lock_ownerid_hashtbl[idhashval]);
+ 	list_add(&sop->so_strhash, &lock_ownerstr_hashtbl[strhashval]);
+ 	list_add(&sop->so_perclient, &clp->cl_perclient);
++	list_add(&sop->so_perlockowner, &open_stp->st_perlockowner);
+ 	add_perclient++;
+ 	sop->so_is_open_owner = 0;
+ 	sop->so_id = current_ownerid++;
+@@ -1755,10 +1927,10 @@ alloc_init_lock_stateid(struct nfs4_stat
+ 	if ((stp = kmalloc(sizeof(struct nfs4_stateid), 
+ 					GFP_KERNEL)) == NULL)
+ 		goto out;
+-
+ 	INIT_LIST_HEAD(&stp->st_hash);
+ 	INIT_LIST_HEAD(&stp->st_perfile);
+ 	INIT_LIST_HEAD(&stp->st_perfilestate);
++	INIT_LIST_HEAD(&stp->st_perlockowner); /* not used */
+ 	list_add(&stp->st_hash, &lockstateid_hashtbl[hashval]);
+ 	list_add(&stp->st_perfile, &fp->fi_perfile);
+ 	list_add_perfile++;
+@@ -1771,15 +1943,24 @@ alloc_init_lock_stateid(struct nfs4_stat
+ 	stp->st_stateid.si_generation = 0;
+ 	stp->st_vfs_file = open_stp->st_vfs_file;
+ 	stp->st_vfs_set = open_stp->st_vfs_set;
+-	stp->st_share_access = -1; 
+-	stp->st_share_deny = -1;
++	stp->st_access_bmap = open_stp->st_access_bmap;
++	stp->st_deny_bmap = open_stp->st_deny_bmap;
+ 
+ out:
+ 	return stp;
+ }
+ 
++int
++check_lock_length(u64 offset, u64 length)
++{
++	return ((length == 0)  || ((length != ~(u64)0) && 
++ 	     LOFF_OVERFLOW(offset, length)));
++}
++
+ /*
+  *  LOCK operation 
++ *  
++ * nfs4_unlock_state(); called in encode
+  */
+ int
+ nfsd4_lock(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_lock *lock)
+@@ -1795,6 +1976,9 @@ nfsd4_lock(struct svc_rqst *rqstp, struc
+ 	dprintk("NFSD: nfsd4_lock: start=%Ld length=%Ld\n",
+ 		lock->lk_offset, lock->lk_length);
+ 
++	if (check_lock_length(lock->lk_offset, lock->lk_length))
++		 return nfserr_inval;
++
+ 	lock->lk_stateowner = NULL;
+ 	nfs4_lock_state();
+ 
+@@ -1812,12 +1996,15 @@ nfsd4_lock(struct svc_rqst *rqstp, struc
+ 			printk("NFSD: nfsd4_lock: clientid is stale!\n");
+ 			goto out;
+ 		}
++		/* does the clientid in the lock owner own the open stateid? */
++
+ 		/* validate and update open stateid and open seqid */
+ 		status = nfs4_preprocess_seqid_op(current_fh, 
+ 				        lock->lk_new_open_seqid,
+ 		                        &lock->lk_new_open_stateid,
+ 		                        CHECK_FH | OPEN_STATE,
+-		                        &open_sop, &open_stp);
++		                        &open_sop, &open_stp,
++					&lock->v.new.clientid);
+ 		if (status)
+ 			goto out;
+ 		/* create lockowner and lock stateid */
+@@ -1836,8 +2023,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struc
+ 					&lock->v.new.clientid, &lock_sop))
+ 			goto out;
+ 		status = nfserr_resource;
+-		if (!(lock->lk_stateowner = alloc_init_lock_stateowner(strhashval, 
+-						open_sop->so_client, lock)))
++		if (!(lock->lk_stateowner = alloc_init_lock_stateowner(strhashval, open_sop->so_client, open_stp, lock)))
+ 			goto out;
+ 		if ((lock_stp = alloc_init_lock_stateid(lock->lk_stateowner, 
+ 						fp, open_stp)) == NULL)
+@@ -1850,7 +2036,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struc
+ 				       lock->lk_old_lock_seqid, 
+ 				       &lock->lk_old_lock_stateid, 
+ 				       CHECK_FH | LOCK_STATE, 
+-				       &lock->lk_stateowner, &lock_stp);
++				       &lock->lk_stateowner, &lock_stp, NULL);
+ 		if (status)
+ 			goto out;
+ 	}
+@@ -1938,7 +2124,6 @@ out_destroy_new_stateid:
+ 		release_state_owner(lock_stp, &lock->lk_stateowner, LOCK_STATE);
+ 	}
+ out:
+-	nfs4_unlock_state();
+ 	return status;
+ }
+ 
+@@ -1956,6 +2141,9 @@ nfsd4_lockt(struct svc_rqst *rqstp, stru
+ 	unsigned int strhashval;
+ 	int status;
+ 
++	if (check_lock_length(lockt->lt_offset, lockt->lt_length))
++		 return nfserr_inval;
++
+ 	lockt->lt_stateowner = NULL;
+ 	nfs4_lock_state();
+ 
+@@ -1967,6 +2155,8 @@ nfsd4_lockt(struct svc_rqst *rqstp, stru
+ 
+ 	if ((status = fh_verify(rqstp, current_fh, S_IFREG, 0))) {
+ 		printk("NFSD: nfsd4_lockt: fh_verify() failed!\n");
++		if (status == nfserr_symlink)
++			status = nfserr_inval;
+ 		goto out;
+ 	}
+ 
+@@ -1989,13 +2179,9 @@ nfsd4_lockt(struct svc_rqst *rqstp, stru
+ 	strhashval = lock_ownerstr_hashval(inode, 
+ 			lockt->lt_clientid.cl_id, lockt->lt_owner);
+ 
+-	if (find_lockstateowner_str(strhashval, &lockt->lt_owner, 
++	find_lockstateowner_str(strhashval, &lockt->lt_owner, 
+ 					&lockt->lt_clientid, 
+-					&lockt->lt_stateowner)) {
+-		printk("NFSD: nsfd4_lockt: lookup_lockowner() failed!\n");
+-		goto out;
+-	}
+-
++					&lockt->lt_stateowner);
+ 	sop = lockt->lt_stateowner;
+ 	if (sop) {
+ 		file_lock.fl_owner = (fl_owner_t) sop;
+@@ -2032,7 +2218,10 @@ out:
+ 	nfs4_unlock_state();
+ 	return status;
+ }
+-
++	
++/* 
++ * nfs4_unlock_state(); called in encode
++ */
+ int
+ nfsd4_locku(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_locku *locku)
+ {
+@@ -2043,13 +2232,18 @@ nfsd4_locku(struct svc_rqst *rqstp, stru
+ 						        
+ 	dprintk("NFSD: nfsd4_locku: start=%Ld length=%Ld\n",
+ 		locku->lu_offset, locku->lu_length);
++
++	if (check_lock_length(locku->lu_offset, locku->lu_length))
++		 return nfserr_inval;
++
++	locku->lu_stateowner = NULL;
+ 	nfs4_lock_state();
+ 									        
+ 	if ((status = nfs4_preprocess_seqid_op(current_fh, 
+ 					locku->lu_seqid, 
+ 					&locku->lu_stateid, 
+ 					CHECK_FH | LOCK_STATE, 
+-					&locku->lu_stateowner, &stp)))
++					&locku->lu_stateowner, &stp, NULL)))
+ 		goto out;
+ 
+ 	filp = &stp->st_vfs_file;
+@@ -2085,7 +2279,6 @@ nfsd4_locku(struct svc_rqst *rqstp, stru
+ 	memcpy(&locku->lu_stateid, &stp->st_stateid, sizeof(stateid_t));
+ 
+ out:
+-	nfs4_unlock_state();
+ 	return status;
+ 
+ out_nfserr:
+@@ -2093,6 +2286,84 @@ out_nfserr:
+ 	goto out;
+ }
+ 
++/*
++ * returns
++ * 	1: locks held by lockowner
++ * 	0: no locks held by lockowner
++ */	
++static int
++check_for_locks(struct file *filp, struct nfs4_stateowner *lowner)
++{
++	struct file_lock **flpp;
++	struct inode *inode = filp->f_dentry->d_inode;
++	int status = 0;
++
++	lock_kernel();
++	for (flpp = &inode->i_flock; *flpp != NULL; flpp = &(*flpp)->fl_next) {
++		if ((*flpp)->fl_owner == (fl_owner_t)lowner)
++			status = 1;
++			goto out;
++	}
++out:
++	unlock_kernel();
++	return status;
++}
++
++int
++nfsd4_release_lockowner(struct svc_rqst *rqstp, struct nfsd4_release_lockowner *rlockowner)
++{
++	clientid_t *clid = &rlockowner->rl_clientid;
++	struct list_head *pos, *next;
++	struct nfs4_stateowner *local = NULL;
++	struct xdr_netobj *owner = &rlockowner->rl_owner;
++	int status, i;
++
++	dprintk("nfsd4_release_lockowner clientid: (%08x/%08x):\n",
++		clid->cl_boot, clid->cl_id);
++
++	/* XXX check for lease expiration */
++
++	status = nfserr_stale_clientid;
++	if (STALE_CLIENTID(clid)) {
++		printk("NFSD: nfsd4_release_lockowner: clientid is stale!\n");
++		return status;
++	}
++
++	nfs4_lock_state();
++
++	/* find the lockowner */
++        status = nfs_ok;
++	for (i=0; i < LOCK_HASH_SIZE; i++) {
++		list_for_each_safe(pos, next, &lock_ownerstr_hashtbl[i]) {
++			local = list_entry(pos, struct nfs4_stateowner, 
++						so_strhash);
++			if(cmp_owner_str(local, owner, clid))
++				break;
++		}
++	}
++	if (local) {
++		struct nfs4_stateid *stp;
++
++		/* check for any locks held by any stateid associated with the 
++		 * (lock) stateowner */
++		status = nfserr_locks_held;
++		list_for_each_safe(pos, next, &local->so_perfilestate) {
++			stp = list_entry(pos, struct nfs4_stateid, 
++					                    st_perfilestate);
++			if(stp->st_vfs_set) {
++				if (check_for_locks(&stp->st_vfs_file, local))
++					goto out;
++			}
++		}
++		/* no locks held by (lock) stateowner */
++		status = nfs_ok;
++		release_stateowner(local);
++	}
++out:
++	nfs4_unlock_state();
++	return status;
++}
++
+ /* 
+  * Start and stop routines
+  */
+@@ -2128,6 +2399,7 @@ nfs4_state_init(void)
+ 	memset(&zerostateid, 0, sizeof(stateid_t));
+ 	memset(&onestateid, ~0, sizeof(stateid_t));
+ 
++	INIT_LIST_HEAD(&close_lru);
+ 	INIT_LIST_HEAD(&client_lru);
+ 	init_MUTEX(&client_sema);
+ 	boot_time = get_seconds();
+diff -puN fs/nfsd/nfs3xdr.c~CITI_NFS4_ALL fs/nfsd/nfs3xdr.c
+--- linux-2.6.3/fs/nfsd/nfs3xdr.c~CITI_NFS4_ALL	2004-02-19 16:47:08.000000000 -0500
++++ linux-2.6.3-bfields/fs/nfsd/nfs3xdr.c	2004-02-19 16:47:08.000000000 -0500
+@@ -796,7 +796,7 @@ encode_entry(struct readdir_cd *ccd, con
+ 	elen = slen + NFS3_ENTRY_BAGGAGE
+ 		+ (plus? NFS3_ENTRYPLUS_BAGGAGE : 0);
+ 	if (cd->buflen < elen) {
+-		cd->common.err = nfserr_readdir_nospc;
++		cd->common.err = nfserr_toosmall;
+ 		return -EINVAL;
+ 	}
+ 	*p++ = xdr_one;				 /* mark entry present */
+diff -puN fs/nfsd/nfsxdr.c~CITI_NFS4_ALL fs/nfsd/nfsxdr.c
+--- linux-2.6.3/fs/nfsd/nfsxdr.c~CITI_NFS4_ALL	2004-02-19 16:47:08.000000000 -0500
++++ linux-2.6.3-bfields/fs/nfsd/nfsxdr.c	2004-02-19 16:47:08.000000000 -0500
+@@ -484,7 +484,7 @@ nfssvc_encode_entry(struct readdir_cd *c
+ 
+ 	slen = XDR_QUADLEN(namlen);
+ 	if ((buflen = cd->buflen - slen - 4) < 0) {
+-		cd->common.err = nfserr_readdir_nospc;
++		cd->common.err = nfserr_toosmall;
+ 		return -EINVAL;
+ 	}
+ 	*p++ = xdr_one;				/* mark entry present */
+diff -puN include/linux/nfs.h~CITI_NFS4_ALL include/linux/nfs.h
+--- linux-2.6.3/include/linux/nfs.h~CITI_NFS4_ALL	2004-02-19 16:47:08.000000000 -0500
++++ linux-2.6.3-bfields/include/linux/nfs.h	2004-02-19 16:47:08.000000000 -0500
+@@ -92,7 +92,7 @@
+ 	NFSERR_NOT_SAME = 10027,	/*       v4 */
+ 	NFSERR_LOCK_RANGE = 10028,	/*       v4 */
+ 	NFSERR_SYMLINK = 10029,		/*       v4 */
+-	NFSERR_READDIR_NOSPC = 10030,	/*       v4 */
++	NFSERR_RESTOREFH = 10030,	/*       v4 */
+ 	NFSERR_LEASE_MOVED = 10031,	/*       v4 */
+ 	NFSERR_ATTRNOTSUPP = 10032,	/*       v4 */
+ 	NFSERR_NO_GRACE = 10033,	/*       v4 */
+diff -puN include/linux/nfsd/nfsfh.h~CITI_NFS4_ALL include/linux/nfsd/nfsfh.h
+--- linux-2.6.3/include/linux/nfsd/nfsfh.h~CITI_NFS4_ALL	2004-02-19 16:47:10.000000000 -0500
++++ linux-2.6.3-bfields/include/linux/nfsd/nfsfh.h	2004-02-19 16:47:10.000000000 -0500
+@@ -209,14 +209,6 @@ fh_copy(struct svc_fh *dst, struct svc_f
+ 	return dst;
+ }
+ 
+-static __inline__ void
+-fh_dup2(struct svc_fh *dst, struct svc_fh *src)
+-{
+-	fh_put(dst);
+-	dget(src->fh_dentry);
+-	*dst = *src;
+-}
+-
+ static __inline__ struct svc_fh *
+ fh_init(struct svc_fh *fhp, int maxsize)
+ {
+diff -puN include/linux/sunrpc/xdr.h~CITI_NFS4_ALL include/linux/sunrpc/xdr.h
+--- linux-2.6.3/include/linux/sunrpc/xdr.h~CITI_NFS4_ALL	2004-02-19 16:47:15.000000000 -0500
++++ linux-2.6.3-bfields/include/linux/sunrpc/xdr.h	2004-02-19 16:47:15.000000000 -0500
+@@ -225,6 +225,9 @@ xdr_reserve_space(struct xdr_stream *xdr
+ extern void xdr_write_pages(struct xdr_stream *xdr, struct page **pages,
+ 		unsigned int base, unsigned int len);
+ extern void xdr_read_pages(struct xdr_stream *xdr, unsigned int len);
++int read_bytes_from_xdr_buf(struct xdr_buf *buf, int base, void *obj, int len);
++int read_u32_from_xdr_buf(struct xdr_buf *buf, int base, u32 *obj);
++
+ 
+ /*
+  * Initialize an xdr_stream for decoding data.
+diff -puN net/sunrpc/xdr.c~CITI_NFS4_ALL net/sunrpc/xdr.c
+--- linux-2.6.3/net/sunrpc/xdr.c~CITI_NFS4_ALL	2004-02-19 16:47:15.000000000 -0500
++++ linux-2.6.3-bfields/net/sunrpc/xdr.c	2004-02-19 16:47:15.000000000 -0500
+@@ -799,7 +799,7 @@ xdr_buf_subsegment(struct xdr_buf *buf, 
+ }
+ 
+ /* obj is assumed to point to allocated memory of size at least len: */
+-static int
++int
+ read_bytes_from_xdr_buf(struct xdr_buf *buf, int base, void *obj, int len)
+ {
+ 	struct xdr_buf subbuf;
+@@ -824,7 +824,7 @@ out:
+ 	return status;
+ }
+ 
+-static int
++int
+ read_u32_from_xdr_buf(struct xdr_buf *buf, int base, u32 *obj)
+ {
+ 	u32	raw;
+
+_
diff --git a/lustre/kernel_patches/patches/linux-2.6.3-nfs-intent.patch b/lustre/kernel_patches/patches/linux-2.6.3-nfs-intent.patch
new file mode 100644
index 0000000..62a4f04
--- /dev/null
+++ b/lustre/kernel_patches/patches/linux-2.6.3-nfs-intent.patch
@@ -0,0 +1,76 @@
+Index: linux-2.6.3/fs/nfs/dir.c
+===================================================================
+--- linux-2.6.3.orig/fs/nfs/dir.c	2004-02-23 14:36:26.000000000 -0800
++++ linux-2.6.3/fs/nfs/dir.c	2004-02-23 14:46:49.000000000 -0800
+@@ -782,7 +782,7 @@
+ 	if (nd->flags & LOOKUP_DIRECTORY)
+ 		return 0;
+ 	/* Are we trying to write to a read only partition? */
+-	if (IS_RDONLY(dir) && (nd->intent.open.flags & (O_CREAT|O_TRUNC|FMODE_WRITE)))
++	if (IS_RDONLY(dir) && (nd->intent.it_flags & (O_CREAT|O_TRUNC|FMODE_WRITE)))
+ 		return 0;
+ 	return 1;
+ }
+@@ -803,7 +803,7 @@
+ 	dentry->d_op = NFS_PROTO(dir)->dentry_ops;
+ 
+ 	/* Let vfs_create() deal with O_EXCL */
+-	if (nd->intent.open.flags & O_EXCL)
++	if (nd->intent.it_flags & O_EXCL)
+ 		goto no_entry;
+ 
+ 	/* Open the file on the server */
+@@ -811,7 +811,7 @@
+ 	/* Revalidate parent directory attribute cache */
+ 	nfs_revalidate_inode(NFS_SERVER(dir), dir);
+ 
+-	if (nd->intent.open.flags & O_CREAT) {
++	if (nd->intent.it_flags & O_CREAT) {
+ 		nfs_begin_data_update(dir);
+ 		inode = nfs4_atomic_open(dir, dentry, nd);
+ 		nfs_end_data_update(dir);
+@@ -827,7 +827,7 @@
+ 				break;
+ 			/* This turned out not to be a regular file */
+ 			case -ELOOP:
+-				if (!(nd->intent.open.flags & O_NOFOLLOW))
++				if (!(nd->intent.it_flags & O_NOFOLLOW))
+ 					goto no_open;
+ 			/* case -EISDIR: */
+ 			/* case -EINVAL: */
+@@ -861,7 +861,7 @@
+ 	dir = parent->d_inode;
+ 	if (!is_atomic_open(dir, nd))
+ 		goto no_open;
+-	openflags = nd->intent.open.flags;
++	openflags = nd->intent.it_flags;
+ 	if (openflags & O_CREAT) {
+ 		/* If this is a negative dentry, just drop it */
+ 		if (!inode)
+.old..........pc/linux-2.6.3-nfs-intent/fs/nfs/nfs4proc.c
+.new.........fs/nfs/nfs4proc.c
+Index: linux-2.6.3/fs/nfs/nfs4proc.c
+===================================================================
+--- linux-2.6.3.orig/fs/nfs/nfs4proc.c	2004-02-23 14:36:26.000000000 -0800
++++ linux-2.6.3/fs/nfs/nfs4proc.c	2004-02-23 14:36:26.000000000 -0800
+@@ -458,17 +458,17 @@
+ 	struct nfs4_state *state;
+ 
+ 	if (nd->flags & LOOKUP_CREATE) {
+-		attr.ia_mode = nd->intent.open.create_mode;
++		attr.ia_mode = nd->intent.it_create_mode;
+ 		attr.ia_valid = ATTR_MODE;
+ 		if (!IS_POSIXACL(dir))
+ 			attr.ia_mode &= ~current->fs->umask;
+ 	} else {
+ 		attr.ia_valid = 0;
+-		BUG_ON(nd->intent.open.flags & O_CREAT);
++		BUG_ON(nd->intent.it_flags & O_CREAT);
+ 	}
+ 
+ 	cred = rpcauth_lookupcred(NFS_SERVER(dir)->client->cl_auth, 0);
+-	state = nfs4_do_open(dir, &dentry->d_name, nd->intent.open.flags, &attr, cred);
++	state = nfs4_do_open(dir, &dentry->d_name, nd->intent.it_flags, &attr, cred);
+ 	put_rpccred(cred);
+ 	if (IS_ERR(state))
+ 		return (struct inode *)state;
diff --git a/lustre/kernel_patches/patches/lkcd-cvs-2.6.0-test6.patch b/lustre/kernel_patches/patches/lkcd-cvs-2.6.0-test6.patch
new file mode 100644
index 0000000..d9f7145
--- /dev/null
+++ b/lustre/kernel_patches/patches/lkcd-cvs-2.6.0-test6.patch
@@ -0,0 +1,6496 @@
+ 0 files changed
+
+Index: linux-2.6.0-test5/drivers/dump/Makefile
+===================================================================
+--- linux-2.6.0-test5.orig/drivers/dump/Makefile	2003-09-26 14:26:34.000000000 +0800
++++ linux-2.6.0-test5/drivers/dump/Makefile	2003-09-26 14:26:34.000000000 +0800
+@@ -0,0 +1,14 @@
++#
++# Makefile for the dump device drivers.
++#
++
++dump-y					:= dump_setup.o dump_fmt.o dump_filters.o dump_scheme.o dump_execute.o
++dump-$(CONFIG_X86)			+= dump_i386.o
++dump-$(CONFIG_CRASH_DUMP_MEMDEV)	+= dump_memdev.o dump_overlay.o
++dump-objs				+= $(dump-y)
++
++obj-$(CONFIG_CRASH_DUMP)		+= dump.o
++obj-$(CONFIG_CRASH_DUMP_BLOCKDEV)	+= dump_blockdev.o
++obj-$(CONFIG_CRASH_DUMP_NETDEV)	+= dump_netdev.o
++obj-$(CONFIG_CRASH_DUMP_COMPRESS_RLE)	+= dump_rle.o
++obj-$(CONFIG_CRASH_DUMP_COMPRESS_GZIP)	+= dump_gzip.o
+Index: linux-2.6.0-test5/drivers/dump/dump_blockdev.c
+===================================================================
+--- linux-2.6.0-test5.orig/drivers/dump/dump_blockdev.c	2003-09-26 14:26:34.000000000 +0800
++++ linux-2.6.0-test5/drivers/dump/dump_blockdev.c	2003-09-26 14:29:10.000000000 +0800
+@@ -0,0 +1,461 @@
++/*
++ * Implements the dump driver interface for saving a dump to 
++ * a block device through the kernel's generic low level block i/o
++ * routines.
++ *
++ * Started: June 2002 - Mohamed Abbas <mohamed.abbas@intel.com>
++ * 	Moved original lkcd kiobuf dump i/o code from dump_base.c
++ * 	to use generic dump device interfaces
++ *
++ * Sept 2002 - Bharata B. Rao <bharata@in.ibm.com>
++ * 	Convert dump i/o to directly use bio instead of kiobuf for 2.5
++ *
++ * Oct 2002  - Suparna Bhattacharya <suparna@in.ibm.com>
++ * 	Rework to new dumpdev.h structures, implement open/close/
++ * 	silence, misc fixes (blocknr removal, bio_add_page usage)  
++ *
++ * Copyright (C) 1999 - 2002 Silicon Graphics, Inc. All rights reserved.
++ * Copyright (C) 2001 - 2002 Matt D. Robinson.  All rights reserved.
++ * Copyright (C) 2002 International Business Machines Corp. 
++ *
++ * This code is released under version 2 of the GNU GPL.
++ */
++
++#include <linux/types.h>
++#include <linux/proc_fs.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/blkdev.h>
++#include <linux/bio.h>
++#include <asm/hardirq.h>
++#include <linux/dump.h>
++#include "dump_methods.h"
++
++extern void *dump_page_buf;
++
++/* The end_io callback for dump i/o completion */
++static int
++dump_bio_end_io(struct bio *bio, unsigned int bytes_done, int error)
++{
++	struct dump_blockdev *dump_bdev;
++
++	if (bio->bi_size) {
++		/* some bytes still left to transfer */
++		return 1; /* not complete */
++	}
++
++	dump_bdev = (struct dump_blockdev *)bio->bi_private;
++	if (error) {
++		printk("IO error while writing the dump, aborting\n");
++	}
++
++	dump_bdev->err = error;
++
++	/* no wakeup needed, since caller polls for completion */
++	return 0;
++}
++
++/* Check if the dump bio is already mapped to the specified buffer */
++static int
++dump_block_map_valid(struct dump_blockdev *dev, struct page *page, 
++	int len) 
++{
++	struct bio *bio = dev->bio;
++	unsigned long bsize = 0;
++
++	if (!bio->bi_vcnt)
++		return 0; /* first time, not mapped */
++
++
++	if ((bio_page(bio) != page) || (len > bio->bi_vcnt << PAGE_SHIFT))
++		return 0; /* buffer not mapped */
++
++	bsize = bdev_hardsect_size(bio->bi_bdev);
++	if ((len & (PAGE_SIZE - 1)) || (len & bsize))
++		return 0; /* alignment checks needed */
++
++	/* quick check to decide if we need to redo bio_add_page */
++	if (bdev_get_queue(bio->bi_bdev)->merge_bvec_fn)
++		return 0; /* device may have other restrictions */
++
++	return 1; /* already mapped */
++}
++
++/* 
++ * Set up the dump bio for i/o from the specified buffer 
++ * Return value indicates whether the full buffer could be mapped or not
++ */
++static int
++dump_block_map(struct dump_blockdev *dev, void *buf, int len)
++{
++	struct page *page = virt_to_page(buf);
++	struct bio *bio = dev->bio;
++	unsigned long bsize = 0;
++
++	bio->bi_bdev = dev->bdev;
++	bio->bi_sector = (dev->start_offset + dev->ddev.curr_offset) >> 9;
++	bio->bi_idx = 0; /* reset index to the beginning */
++
++	if (dump_block_map_valid(dev, page, len)) {
++		/* already mapped and usable rightaway */
++		bio->bi_size = len; /* reset size to the whole bio */
++	} else {
++		/* need to map the bio */
++		bio->bi_size = 0;
++		bio->bi_vcnt = 0;
++		bsize = bdev_hardsect_size(bio->bi_bdev);
++
++		/* first a few sanity checks */
++		if (len < bsize) {
++			printk("map: len less than hardsect size \n");
++			return -EINVAL;
++		}
++
++		if ((unsigned long)buf & bsize) {
++			printk("map: not aligned \n");
++			return -EINVAL;
++		}
++
++		/* assume contig. page aligned low mem buffer( no vmalloc) */
++		if ((page_address(page) != buf) || (len & (PAGE_SIZE - 1))) {
++			printk("map: invalid buffer alignment!\n");
++			return -EINVAL; 
++		}
++		/* finally we can go ahead and map it */
++		while (bio->bi_size < len)
++			if (bio_add_page(bio, page++, PAGE_SIZE, 0) == 0) {
++				break;
++			}
++
++		bio->bi_end_io = dump_bio_end_io;
++		bio->bi_private = dev;
++	}
++
++	if (bio->bi_size != len) {
++		printk("map: bio size = %d not enough for len = %d!\n",
++			bio->bi_size, len);
++		return -E2BIG;
++	}
++	return 0;
++}
++
++static void
++dump_free_bio(struct bio *bio)
++{
++	if (bio)
++		kfree(bio->bi_io_vec);
++	kfree(bio);
++}
++
++/*
++ * Prepares the dump device so we can take a dump later. 
++ * The caller is expected to have filled up the kdev_id field in the 
++ * block dump dev structure.
++ *
++ * At dump time when dump_block_write() is invoked it will be too 
++ * late to recover, so as far as possible make sure obvious errors 
++ * get caught right here and reported back to the caller.
++ */
++static int
++dump_block_open(struct dump_dev *dev, unsigned long arg)
++{
++	struct dump_blockdev *dump_bdev = DUMP_BDEV(dev);
++	struct block_device *bdev;
++	int retval = 0;
++	struct bio_vec *bvec;
++
++	/* make sure this is a valid block device */
++	if (!arg) {
++		retval = -EINVAL;
++		goto err;
++	}
++
++	/* get a corresponding block_dev struct for this */
++	bdev = bdget((dev_t)arg);
++	if (!bdev) {
++		retval = -ENODEV;
++		goto err;
++	}
++
++	/* get the block device opened */
++	if ((retval = blkdev_get(bdev, O_RDWR | O_LARGEFILE, 0, BDEV_RAW))) {
++		goto err1;
++	}
++
++	if ((dump_bdev->bio = kmalloc(sizeof(struct bio), GFP_KERNEL)) 
++		== NULL) {
++		printk("Cannot allocate bio\n");
++		retval = -ENOMEM;
++		goto err2;
++	}
++
++	bio_init(dump_bdev->bio);
++
++	if ((bvec = kmalloc(sizeof(struct bio_vec) * 
++		(DUMP_BUFFER_SIZE >> PAGE_SHIFT), GFP_KERNEL)) == NULL) {
++		retval = -ENOMEM;
++		goto err3;
++	}
++
++	/* assign the new dump dev structure */
++	dump_bdev->kdev_id = new_decode_dev((dev_t)arg);
++	dump_bdev->bdev = bdev;
++
++	/* make a note of the limit */
++	dump_bdev->limit = bdev->bd_inode->i_size;
++	
++	/* now make sure we can map the dump buffer */
++	dump_bdev->bio->bi_io_vec = bvec;
++	dump_bdev->bio->bi_max_vecs = DUMP_BUFFER_SIZE >> PAGE_SHIFT;
++
++	retval = dump_block_map(dump_bdev, dump_config.dumper->dump_buf, 
++		DUMP_BUFFER_SIZE);
++		
++	if (retval) {
++		printk("open: dump_block_map failed, ret %d\n", retval);
++		goto err3;
++	}
++
++	printk("Block device (%d,%d) successfully configured for dumping\n",
++	       MAJOR(dump_bdev->kdev_id),
++	       MINOR(dump_bdev->kdev_id));
++
++
++	/* after opening the block device, return */
++	return retval;
++
++err3:	dump_free_bio(dump_bdev->bio);
++	dump_bdev->bio = NULL;
++err2:	if (bdev) blkdev_put(bdev, BDEV_RAW);
++		goto err;
++err1:	if (bdev) bdput(bdev);
++	dump_bdev->bdev = NULL;
++err:	return retval;
++}
++
++/*
++ * Close the dump device and release associated resources
++ * Invoked when unconfiguring the dump device.
++ */
++static int
++dump_block_release(struct dump_dev *dev)
++{
++	struct dump_blockdev *dump_bdev = DUMP_BDEV(dev);
++
++	/* release earlier bdev if present */
++	if (dump_bdev->bdev) {
++		blkdev_put(dump_bdev->bdev, BDEV_RAW);
++		dump_bdev->bdev = NULL;
++	}
++
++	dump_free_bio(dump_bdev->bio);
++	dump_bdev->bio = NULL;
++
++	return 0;
++}
++
++
++/*
++ * Prepare the dump device for use (silence any ongoing activity
++ * and quiesce state) when the system crashes.
++ */
++static int
++dump_block_silence(struct dump_dev *dev)
++{
++	struct dump_blockdev *dump_bdev = DUMP_BDEV(dev);
++	struct request_queue *q = bdev_get_queue(dump_bdev->bdev);
++	int ret;
++
++	/* If we can't get request queue lock, refuse to take the dump */
++	if (!spin_trylock(q->queue_lock))
++		return -EBUSY;
++
++	ret = elv_queue_empty(q);
++	spin_unlock(q->queue_lock);
++
++	/* For now we assume we have the device to ourselves */
++	/* Just a quick sanity check */
++	if (!ret) {
++		/* i/o in flight - safer to quit */
++		return -EBUSY;
++	}
++
++	/* 
++	 * Move to a softer level of silencing where no spin_lock_irqs 
++	 * are held on other cpus
++	 */
++	dump_silence_level = DUMP_SOFT_SPIN_CPUS;	
++
++	__dump_irq_enable();
++
++	printk("Dumping to block device (%d,%d) on CPU %d ...\n",
++	       MAJOR(dump_bdev->kdev_id), MINOR(dump_bdev->kdev_id),
++	       smp_processor_id());
++	
++	return 0;
++}
++
++/*
++ * Invoked when dumping is done. This is the time to put things back 
++ * (i.e. undo the effects of dump_block_silence) so the device is 
++ * available for normal use.
++ */
++static int
++dump_block_resume(struct dump_dev *dev)
++{
++	__dump_irq_restore();
++	return 0;
++}
++
++
++/*
++ * Seek to the specified offset in the dump device.
++ * Makes sure this is a valid offset, otherwise returns an error.
++ */
++static int
++dump_block_seek(struct dump_dev *dev, loff_t off)
++{
++	struct dump_blockdev *dump_bdev = DUMP_BDEV(dev);
++	loff_t offset = off + dump_bdev->start_offset;
++	
++	if (offset & ( PAGE_SIZE - 1)) {
++		printk("seek: non-page aligned\n");
++		return -EINVAL;
++	}
++
++	if (offset & (bdev_hardsect_size(dump_bdev->bdev) - 1)) {
++		printk("seek: not sector aligned \n");
++		return -EINVAL;
++	}
++
++	if (offset > dump_bdev->limit) {
++		printk("seek: not enough space left on device!\n");
++		return -ENOSPC; 
++	}
++	dev->curr_offset = off;
++	return 0;
++}
++
++/*
++ * Write out a buffer after checking the device limitations, 
++ * sector sizes, etc. Assumes the buffer is in directly mapped 
++ * kernel address space (not vmalloc'ed).
++ *
++ * Returns: number of bytes written or -ERRNO. 
++ */
++static int
++dump_block_write(struct dump_dev *dev, void *buf, 
++	unsigned long len)
++{
++	struct dump_blockdev *dump_bdev = DUMP_BDEV(dev);
++	loff_t offset = dev->curr_offset + dump_bdev->start_offset;
++	int retval = -ENOSPC;
++
++	if (offset >= dump_bdev->limit) {
++		printk("write: not enough space left on device!\n");
++		goto out;
++	}
++
++	/* don't write more blocks than our max limit */
++	if (offset + len > dump_bdev->limit) 
++		len = dump_bdev->limit - offset;
++
++
++	retval = dump_block_map(dump_bdev, buf, len);
++	if (retval){
++		printk("write: dump_block_map failed! err %d\n", retval);
++		goto out;
++	}
++
++	/*
++	 * Write out the data to disk.
++	 * Assumes the entire buffer mapped to a single bio, which we can
++	 * submit and wait for io completion. In the future, may consider
++	 * increasing the dump buffer size and submitting multiple bio s 
++	 * for better throughput.
++	 */
++	dump_bdev->err = -EAGAIN;
++	submit_bio(WRITE, dump_bdev->bio);
++
++	dump_bdev->ddev.curr_offset += len;
++	retval = len;
++ out:
++	return retval;
++}
++
++/*
++ * Name: dump_block_ready()
++ * Func: check if the last dump i/o is over and ready for next request
++ */
++static int
++dump_block_ready(struct dump_dev *dev, void *buf)
++{
++	struct dump_blockdev *dump_bdev = DUMP_BDEV(dev);
++	request_queue_t *q = bdev_get_queue(dump_bdev->bio->bi_bdev);
++
++	/* check for io completion */
++	if (dump_bdev->err == -EAGAIN) {
++		q->unplug_fn(q);
++		return -EAGAIN;
++	}
++
++	if (dump_bdev->err) {
++		printk("dump i/o err\n");
++		return dump_bdev->err;
++	}
++
++	return 0;
++}
++
++
++struct dump_dev_ops dump_blockdev_ops = {
++	.open 		= dump_block_open,
++	.release	= dump_block_release,
++	.silence	= dump_block_silence,
++	.resume 	= dump_block_resume,
++	.seek		= dump_block_seek,
++	.write		= dump_block_write,
++	/* .read not implemented */
++	.ready		= dump_block_ready
++};
++
++static struct dump_blockdev default_dump_blockdev = {
++	.ddev = {.type_name = "blockdev", .ops = &dump_blockdev_ops, 
++			.curr_offset = 0},
++	/* 
++	 * leave enough room for the longest swap header possibly written 
++	 * written by mkswap (likely the largest page size supported by
++	 * the arch
++	 */
++	.start_offset 	= DUMP_HEADER_OFFSET,
++	.err 		= 0
++	/* assume the rest of the fields are zeroed by default */
++};	
++	
++struct dump_blockdev *dump_blockdev = &default_dump_blockdev;
++
++static int __init
++dump_blockdev_init(void)
++{
++	if (dump_register_device(&dump_blockdev->ddev) < 0) {
++		printk("block device driver registration failed\n");
++		return -1;
++	}
++		
++	printk("block device driver for LKCD registered\n");
++	return 0;
++}
++
++static void __exit
++dump_blockdev_cleanup(void)
++{
++	dump_unregister_device(&dump_blockdev->ddev);
++	printk("block device driver for LKCD unregistered\n");
++}
++
++MODULE_AUTHOR("LKCD Development Team <lkcd-devel@lists.sourceforge.net>");
++MODULE_DESCRIPTION("Block Dump Driver for Linux Kernel Crash Dump (LKCD)");
++MODULE_LICENSE("GPL");
++
++module_init(dump_blockdev_init);
++module_exit(dump_blockdev_cleanup);
+Index: linux-2.6.0-test5/drivers/dump/dump_execute.c
+===================================================================
+--- linux-2.6.0-test5.orig/drivers/dump/dump_execute.c	2003-09-26 14:26:34.000000000 +0800
++++ linux-2.6.0-test5/drivers/dump/dump_execute.c	2003-09-26 14:26:34.000000000 +0800
+@@ -0,0 +1,126 @@
++/*
++ * The file has the common/generic dump execution code 
++ *
++ * Started: Oct 2002 -  Suparna Bhattacharya <suparna@in.ibm.com>
++ * 	Split and rewrote high level dump execute code to make use 
++ * 	of dump method interfaces.
++ *
++ * Derived from original code in dump_base.c created by 
++ * 	Matt Robinson <yakker@sourceforge.net>)
++ * 	
++ * Copyright (C) 1999 - 2002 Silicon Graphics, Inc. All rights reserved.
++ * Copyright (C) 2001 - 2002 Matt D. Robinson.  All rights reserved.
++ * Copyright (C) 2002 International Business Machines Corp. 
++ *
++ * Assumes dumper and dump config settings are in place
++ * (invokes corresponding dumper specific routines as applicable)
++ *
++ * This code is released under version 2 of the GNU GPL.
++ */
++#include <linux/kernel.h>
++#include <linux/notifier.h>
++#include <linux/dump.h>
++#include "dump_methods.h"
++
++struct notifier_block *dump_notifier_list; /* dump started/ended callback */
++
++/* Dump progress indicator */
++void 
++dump_speedo(int i)
++{
++	static const char twiddle[4] =  { '|', '\\', '-', '/' };
++	printk("%c\b", twiddle[i&3]);
++}
++
++/* Make the device ready and write out the header */
++int dump_begin(void)
++{
++	int err = 0;
++
++	/* dump_dev = dump_config.dumper->dev; */
++	dumper_reset();
++	if ((err = dump_dev_silence())) {
++		/* quiesce failed, can't risk continuing */
++		/* Todo/Future: switch to alternate dump scheme if possible */
++		printk("dump silence dev failed ! error %d\n", err);
++		return err;
++	}
++
++	pr_debug("Writing dump header\n");
++	if ((err = dump_update_header())) {
++		printk("dump update header failed ! error %d\n", err);
++		dump_dev_resume();
++		return err;
++	}
++
++	dump_config.dumper->curr_offset = DUMP_BUFFER_SIZE;
++
++	return 0;
++}
++
++/* 
++ * Write the dump terminator, a final header update and let go of 
++ * exclusive use of the device for dump.
++ */
++int dump_complete(void)
++{
++	int ret = 0;
++
++	if (dump_config.level != DUMP_LEVEL_HEADER) {
++		if ((ret = dump_update_end_marker())) {
++			printk("dump update end marker error %d\n", ret);
++		}
++		if ((ret = dump_update_header())) {
++			printk("dump update header error %d\n", ret);
++		}
++	}
++	ret = dump_dev_resume();
++
++	return ret;
++}
++
++/* Saves all dump data */
++int dump_execute_savedump(void)
++{
++	int ret = 0, err = 0;
++
++	if ((ret = dump_begin()))  {
++		return ret;
++	}
++
++	if (dump_config.level != DUMP_LEVEL_HEADER) { 
++		ret = dump_sequencer();
++	}
++	if ((err = dump_complete())) {
++		printk("Dump complete failed. Error %d\n", err);
++	}
++
++	return ret;
++}
++
++/* Does all the real work:  Capture and save state */
++int dump_generic_execute(const char *panic_str, const struct pt_regs *regs)
++{
++	int ret = 0;
++
++	if ((ret = dump_configure_header(panic_str, regs))) {
++		printk("dump config header failed ! error %d\n", ret);
++		return ret;	
++	}
++
++	/* tell interested parties that a dump is about to start */
++	notifier_call_chain(&dump_notifier_list, DUMP_BEGIN, 
++		&dump_config.dump_device);
++
++	if (dump_config.level != DUMP_LEVEL_NONE)
++		ret = dump_execute_savedump();
++
++	pr_debug("dumped %ld blocks of %d bytes each\n", 
++		dump_config.dumper->count, DUMP_BUFFER_SIZE);
++	
++	/* tell interested parties that a dump has completed */
++	notifier_call_chain(&dump_notifier_list, DUMP_END, 
++		&dump_config.dump_device);
++
++	return ret;
++}
+Index: linux-2.6.0-test5/drivers/dump/dump_filters.c
+===================================================================
+--- linux-2.6.0-test5.orig/drivers/dump/dump_filters.c	2003-09-26 14:26:34.000000000 +0800
++++ linux-2.6.0-test5/drivers/dump/dump_filters.c	2003-09-26 14:26:34.000000000 +0800
+@@ -0,0 +1,143 @@
++/*
++ * Default filters to select data to dump for various passes.
++ *
++ * Started: Oct 2002 -  Suparna Bhattacharya <suparna@in.ibm.com>
++ * 	Split and rewrote default dump selection logic to generic dump 
++ * 	method interfaces 
++ * Derived from a portion of dump_base.c created by 
++ * 	Matt Robinson <yakker@sourceforge.net>)
++ *
++ * Copyright (C) 1999 - 2002 Silicon Graphics, Inc. All rights reserved.
++ * Copyright (C) 2001 - 2002 Matt D. Robinson.  All rights reserved.
++ * Copyright (C) 2002 International Business Machines Corp. 
++ *
++ * Used during single-stage dumping and during stage 1 of the 2-stage scheme
++ * (Stage 2 of the 2-stage scheme uses the fully transparent filters
++ * i.e. passthru filters in dump_overlay.c)
++ *
++ * Future: Custom selective dump may involve a different set of filters.
++ *
++ * This code is released under version 2 of the GNU GPL.
++ */
++
++#include <linux/kernel.h>
++#include <linux/bootmem.h>
++#include <linux/mm.h>
++#include <linux/slab.h>
++#include <linux/dump.h>
++#include "dump_methods.h"
++
++
++/* Copied from mm/bootmem.c - FIXME */
++/* return the number of _pages_ that will be allocated for the boot bitmap */
++unsigned long dump_calc_bootmap_pages (void)
++{
++	unsigned long mapsize;
++	unsigned long pages = num_physpages;
++
++	mapsize = (pages+7)/8;
++	mapsize = (mapsize + ~PAGE_MASK) & PAGE_MASK;
++	mapsize >>= PAGE_SHIFT;
++
++	return mapsize;
++}
++
++
++#define DUMP_PFN_SAFETY_MARGIN	1024  /* 4 MB */
++/* temporary */
++extern unsigned long min_low_pfn;
++
++
++int dump_low_page(struct page *p)
++{
++	return page_to_pfn(p) < min_low_pfn + dump_calc_bootmap_pages() 
++			+ 1 + DUMP_PFN_SAFETY_MARGIN;
++}
++
++static inline int kernel_page(struct page *p)
++{
++	/* FIXME: Need to exclude hugetlb pages. Clue: reserved but inuse */
++	return PageReserved(p) || (!PageLRU(p) && PageInuse(p));
++}
++
++static inline int user_page(struct page *p)
++{
++	return PageInuse(p) && (!PageReserved(p) && PageLRU(p));
++}
++
++static inline int unreferenced_page(struct page *p)
++{
++	return !PageInuse(p) && !PageReserved(p);
++}
++
++
++/* loc marks the beginning of a range of pages */
++int dump_filter_kernpages(int pass, unsigned long loc, unsigned long sz)
++{
++	struct page *page = (struct page *)loc;
++	/* if any of the pages is a kernel page, select this set */	
++	while (sz) {
++		if (dump_low_page(page) || kernel_page(page))
++			return 1;
++		sz -= PAGE_SIZE;
++		page++;
++	}	
++	return 0;
++}
++
++
++/* loc marks the beginning of a range of pages */
++int dump_filter_userpages(int pass, unsigned long loc, unsigned long sz)
++{
++	struct page *page = (struct page *)loc;
++	int ret = 0;
++	/* select if the set has any user page, and no kernel pages  */	
++	while (sz) {
++		if (user_page(page) && !dump_low_page(page)) {
++			ret = 1;
++		} else if (kernel_page(page) || dump_low_page(page)) {
++			return 0;
++		}
++		page++;
++		sz -= PAGE_SIZE;
++	}	
++	return ret;
++}
++
++
++
++/* loc marks the beginning of a range of pages */
++int dump_filter_unusedpages(int pass, unsigned long loc, unsigned long sz)
++{
++	struct page *page = (struct page *)loc;
++
++	/* select if the set does not have any used pages  */	
++	while (sz) {
++		if (!unreferenced_page(page) || dump_low_page(page)) {
++			return 0;
++		}
++		page++;
++		sz -= PAGE_SIZE;
++	}	
++	return 1;
++}
++
++/* dummy: last (non-existent) pass */
++int dump_filter_none(int pass, unsigned long loc, unsigned long sz)
++{
++	return 0;
++}
++
++/* TBD: resolve level bitmask ? */
++struct dump_data_filter dump_filter_table[] = {
++	{ .name = "kern", .selector = dump_filter_kernpages, 
++		.level_mask = DUMP_MASK_KERN},
++	{ .name = "user", .selector = dump_filter_userpages, 
++		.level_mask = DUMP_MASK_USED},
++	{ .name = "unused", .selector = dump_filter_unusedpages, 
++		.level_mask = DUMP_MASK_UNUSED},
++	{ .name = "none", .selector = dump_filter_none, 
++		.level_mask = DUMP_MASK_REST},
++	{ .name = "", .selector = NULL, .level_mask = 0}
++};
++
+Index: linux-2.6.0-test5/drivers/dump/dump_fmt.c
+===================================================================
+--- linux-2.6.0-test5.orig/drivers/dump/dump_fmt.c	2003-09-26 14:26:34.000000000 +0800
++++ linux-2.6.0-test5/drivers/dump/dump_fmt.c	2003-09-26 14:26:34.000000000 +0800
+@@ -0,0 +1,399 @@
++/*
++ * Implements the routines which handle the format specific
++ * aspects of dump for the default dump format.
++ *
++ * Used in single stage dumping and stage 1 of soft-boot based dumping 
++ * Saves data in LKCD (lcrash) format 
++ *
++ * Previously a part of dump_base.c
++ *
++ * Started: Oct 2002 -  Suparna Bhattacharya <suparna@in.ibm.com>
++ *	Split off and reshuffled LKCD dump format code around generic
++ *	dump method interfaces.
++ *
++ * Derived from original code created by 
++ * 	Matt Robinson <yakker@sourceforge.net>)
++ *
++ * Contributions from SGI, IBM, HP, MCL, and others.
++ *
++ * Copyright (C) 1999 - 2002 Silicon Graphics, Inc. All rights reserved.
++ * Copyright (C) 2000 - 2002 TurboLinux, Inc.  All rights reserved.
++ * Copyright (C) 2001 - 2002 Matt D. Robinson.  All rights reserved.
++ * Copyright (C) 2002 International Business Machines Corp. 
++ *
++ * This code is released under version 2 of the GNU GPL.
++ */
++
++#include <linux/types.h>
++#include <linux/kernel.h>
++#include <linux/time.h>
++#include <linux/sched.h>
++#include <linux/ptrace.h>
++#include <linux/utsname.h>
++#include <asm/dump.h>
++#include <linux/dump.h>
++#include "dump_methods.h"
++
++/*
++ * SYSTEM DUMP LAYOUT
++ * 
++ * System dumps are currently the combination of a dump header and a set
++ * of data pages which contain the system memory.  The layout of the dump
++ * (for full dumps) is as follows:
++ *
++ *             +-----------------------------+
++ *             |     generic dump header     |
++ *             +-----------------------------+
++ *             |   architecture dump header  |
++ *             +-----------------------------+
++ *             |         page header         |
++ *             +-----------------------------+
++ *             |          page data          |
++ *             +-----------------------------+
++ *             |         page header         |
++ *             +-----------------------------+
++ *             |          page data          |
++ *             +-----------------------------+
++ *             |              |              |
++ *             |              |              |
++ *             |              |              |
++ *             |              |              |
++ *             |              V              |
++ *             +-----------------------------+
++ *             |        PAGE_END header      |
++ *             +-----------------------------+
++ *
++ * There are two dump headers, the first which is architecture
++ * independent, and the other which is architecture dependent.  This
++ * allows different architectures to dump different data structures
++ * which are specific to their chipset, CPU, etc.
++ *
++ * After the dump headers come a succession of dump page headers along
++ * with dump pages.  The page header contains information about the page
++ * size, any flags associated with the page (whether it's compressed or
++ * not), and the address of the page.  After the page header is the page
++ * data, which is either compressed (or not).  Each page of data is
++ * dumped in succession, until the final dump header (PAGE_END) is
++ * placed at the end of the dump, assuming the dump device isn't out
++ * of space.
++ *
++ * This mechanism allows for multiple compression types, different
++ * types of data structures, different page ordering, etc., etc., etc.
++ * It's a very straightforward mechanism for dumping system memory.
++ */
++
++struct __dump_header dump_header;  /* the primary dump header              */
++struct __dump_header_asm dump_header_asm; /* the arch-specific dump header */
++
++/*
++ *  Set up common header fields (mainly the arch indep section) 
++ *  Per-cpu state is handled by lcrash_save_context
++ *  Returns the size of the header in bytes.
++ */
++static int lcrash_init_dump_header(const char *panic_str)
++{
++	struct timeval dh_time;
++	struct sysinfo info;
++
++	/* make sure the dump header isn't TOO big */
++	if ((sizeof(struct __dump_header) +
++		sizeof(struct __dump_header_asm)) > DUMP_BUFFER_SIZE) {
++			printk("lcrash_init_header(): combined "
++				"headers larger than DUMP_BUFFER_SIZE!\n");
++			return -E2BIG;
++	}
++
++	/* initialize the dump headers to zero */
++	memset(&dump_header, 0, sizeof(dump_header));
++	memset(&dump_header_asm, 0, sizeof(dump_header_asm));
++
++	/* configure dump header values */
++	dump_header.dh_magic_number = DUMP_MAGIC_NUMBER;
++	dump_header.dh_version = DUMP_VERSION_NUMBER;
++	dump_header.dh_memory_start = PAGE_OFFSET;
++	dump_header.dh_memory_end = DUMP_MAGIC_NUMBER;
++	dump_header.dh_header_size = sizeof(struct __dump_header);
++	si_meminfo(&info);
++	dump_header.dh_memory_size = (u64)info.totalram;
++	dump_header.dh_page_size = PAGE_SIZE;
++	dump_header.dh_dump_level = dump_config.level;
++	dump_header.dh_current_task = (unsigned long) current;
++	dump_header.dh_dump_compress = dump_config.dumper->compress->
++		compress_type;
++	dump_header.dh_dump_flags = dump_config.flags;
++	dump_header.dh_dump_device = dump_config.dumper->dev->device_id; 
++	
++#if DUMP_DEBUG >= 6
++	dump_header.dh_num_bytes = 0;
++#endif
++	dump_header.dh_num_dump_pages = 0;
++	do_gettimeofday(&dh_time);
++	dump_header.dh_time.tv_sec = dh_time.tv_sec;
++	dump_header.dh_time.tv_usec = dh_time.tv_usec;
++
++	memcpy((void *)&(dump_header.dh_utsname_sysname), 
++		(const void *)&(system_utsname.sysname), __NEW_UTS_LEN + 1);
++	memcpy((void *)&(dump_header.dh_utsname_nodename), 
++		(const void *)&(system_utsname.nodename), __NEW_UTS_LEN + 1);
++	memcpy((void *)&(dump_header.dh_utsname_release), 
++		(const void *)&(system_utsname.release), __NEW_UTS_LEN + 1);
++	memcpy((void *)&(dump_header.dh_utsname_version), 
++		(const void *)&(system_utsname.version), __NEW_UTS_LEN + 1);
++	memcpy((void *)&(dump_header.dh_utsname_machine), 
++		(const void *)&(system_utsname.machine), __NEW_UTS_LEN + 1);
++	memcpy((void *)&(dump_header.dh_utsname_domainname), 
++		(const void *)&(system_utsname.domainname), __NEW_UTS_LEN + 1);
++
++	if (panic_str) {
++		memcpy((void *)&(dump_header.dh_panic_string),
++			(const void *)panic_str, DUMP_PANIC_LEN);
++	}
++
++        dump_header_asm.dha_magic_number = DUMP_ASM_MAGIC_NUMBER;
++        dump_header_asm.dha_version = DUMP_ASM_VERSION_NUMBER;
++        dump_header_asm.dha_header_size = sizeof(dump_header_asm);
++
++	dump_header_asm.dha_smp_num_cpus = num_online_cpus();
++	pr_debug("smp_num_cpus in header %d\n", 
++		dump_header_asm.dha_smp_num_cpus);
++
++	dump_header_asm.dha_dumping_cpu = smp_processor_id();
++	
++	return sizeof(dump_header) + sizeof(dump_header_asm);
++}
++
++
++int dump_lcrash_configure_header(const char *panic_str, 
++	const struct pt_regs *regs)
++{
++	int retval = 0;
++
++	dump_config.dumper->header_len = lcrash_init_dump_header(panic_str);
++
++	/* capture register states for all processors */
++	dump_save_this_cpu(regs);
++	__dump_save_other_cpus(); /* side effect:silence cpus */
++
++	/* configure architecture-specific dump header values */
++	if ((retval = __dump_configure_header(regs))) 
++		return retval;
++
++	dump_config.dumper->header_dirty++;
++	return 0;
++}
++
++/* save register and task context */
++void dump_lcrash_save_context(int cpu, const struct pt_regs *regs, 
++	struct task_struct *tsk)
++{
++	dump_header_asm.dha_smp_current_task[cpu] = (uint32_t) tsk;
++
++	__dump_save_regs(&dump_header_asm.dha_smp_regs[cpu], regs);
++
++	/* take a snapshot of the stack */
++	/* doing this enables us to tolerate slight drifts on this cpu */
++	if (dump_header_asm.dha_stack[cpu]) {
++		memcpy((void *)dump_header_asm.dha_stack[cpu],
++				tsk->thread_info, THREAD_SIZE);
++	}
++	dump_header_asm.dha_stack_ptr[cpu] = (uint32_t)(tsk->thread_info);
++}
++
++/* write out the header */
++int dump_write_header(void)
++{
++	int retval = 0, size;
++	void *buf = dump_config.dumper->dump_buf;
++
++	/* accounts for DUMP_HEADER_OFFSET if applicable */
++	if ((retval = dump_dev_seek(0))) {
++		printk("Unable to seek to dump header offset: %d\n", 
++			retval);
++		return retval;
++	}
++
++	memcpy(buf, (void *)&dump_header, sizeof(dump_header));
++	size = sizeof(dump_header);
++	memcpy(buf + size, (void *)&dump_header_asm, sizeof(dump_header_asm));
++	size += sizeof(dump_header_asm);
++	size = PAGE_ALIGN(size);
++	retval = dump_ll_write(buf , size);
++
++	if (retval < size) 
++		return (retval >= 0) ? ENOSPC : retval;
++
++	return 0;
++}
++
++int dump_generic_update_header(void)
++{
++	int err = 0;
++
++	if (dump_config.dumper->header_dirty) {
++		if ((err = dump_write_header())) {
++			printk("dump write header failed !err %d\n", err);
++		} else {
++			dump_config.dumper->header_dirty = 0;
++		}
++	}
++
++	return err;
++}
++
++static inline int is_curr_stack_page(struct page *page, unsigned long size)
++{
++	unsigned long thread_addr = (unsigned long)current_thread_info();
++	unsigned long addr = (unsigned long)page_address(page);
++
++	return !PageHighMem(page) && (addr < thread_addr + THREAD_SIZE)
++		&& (addr + size > thread_addr);
++}
++
++static inline int is_dump_page(struct page *page, unsigned long size)
++{
++	unsigned long addr = (unsigned long)page_address(page);
++	unsigned long dump_buf = (unsigned long)dump_config.dumper->dump_buf;
++
++	return !PageHighMem(page) && (addr < dump_buf + DUMP_BUFFER_SIZE)
++		&& (addr + size > dump_buf);
++}
++
++int dump_allow_compress(struct page *page, unsigned long size)
++{
++	/*
++	 * Don't compress the page if any part of it overlaps
++	 * with the current stack or dump buffer (since the contents
++	 * in these could be changing while compression is going on)
++	 */
++	return !is_curr_stack_page(page, size) && !is_dump_page(page, size);
++}
++
++void lcrash_init_pageheader(struct __dump_page *dp, struct page *page, 
++	unsigned long sz)
++{
++	memset(dp, sizeof(struct __dump_page), 0);
++	dp->dp_flags = 0; 
++	dp->dp_size = 0;
++	if (sz > 0)
++		dp->dp_address = page_to_pfn(page) << PAGE_SHIFT;
++
++#if DUMP_DEBUG > 6
++	dp->dp_page_index = dump_header.dh_num_dump_pages;
++	dp->dp_byte_offset = dump_header.dh_num_bytes + DUMP_BUFFER_SIZE
++		+ DUMP_HEADER_OFFSET; /* ?? */
++#endif /* DUMP_DEBUG */
++}
++
++int dump_lcrash_add_data(unsigned long loc, unsigned long len)
++{
++	struct page *page = (struct page *)loc;
++	void *addr, *buf = dump_config.dumper->curr_buf;
++	struct __dump_page *dp = (struct __dump_page *)buf; 
++	int bytes, size;
++
++	if (buf > dump_config.dumper->dump_buf + DUMP_BUFFER_SIZE)
++		return -ENOMEM;
++
++	lcrash_init_pageheader(dp, page, len);
++	buf += sizeof(struct __dump_page);
++
++	while (len) {
++		addr = kmap_atomic(page, KM_DUMP);
++		size = bytes = (len > PAGE_SIZE) ? PAGE_SIZE : len;	
++		/* check for compression */
++		if (dump_allow_compress(page, bytes)) {
++			size = dump_compress_data((char *)addr, bytes, (char *)buf);
++		}
++		/* set the compressed flag if the page did compress */
++		if (size && (size < bytes)) {
++			dp->dp_flags |= DUMP_DH_COMPRESSED;
++		} else {
++			/* compression failed -- default to raw mode */
++			dp->dp_flags |= DUMP_DH_RAW;
++			memcpy(buf, addr, bytes);
++			size = bytes;
++		}
++		/* memset(buf, 'A', size); temporary: testing only !! */
++		kunmap_atomic(addr, KM_DUMP);
++		dp->dp_size += size;
++		buf += size;
++		len -= bytes;
++		page++;
++	}
++
++	/* now update the header */
++#if DUMP_DEBUG > 6
++	dump_header.dh_num_bytes += dp->dp_size + sizeof(*dp);
++#endif
++	dump_header.dh_num_dump_pages++;
++	dump_config.dumper->header_dirty++;
++
++	dump_config.dumper->curr_buf = buf;	
++
++	return len;
++}
++
++int dump_lcrash_update_end_marker(void)
++{
++	struct __dump_page *dp = 
++		(struct __dump_page *)dump_config.dumper->curr_buf;
++	unsigned long left;
++	int ret = 0;
++		
++	lcrash_init_pageheader(dp, NULL, 0);
++	dp->dp_flags |= DUMP_DH_END; /* tbd: truncation test ? */
++	
++	/* now update the header */
++#if DUMP_DEBUG > 6
++	dump_header.dh_num_bytes += sizeof(*dp);
++#endif
++	dump_config.dumper->curr_buf += sizeof(*dp);
++	left = dump_config.dumper->curr_buf - dump_config.dumper->dump_buf;
++
++	printk("\n");
++
++	while (left) {
++		if ((ret = dump_dev_seek(dump_config.dumper->curr_offset))) {
++			printk("Seek failed at offset 0x%llx\n", 
++			dump_config.dumper->curr_offset);
++			return ret;
++		}
++
++		if (DUMP_BUFFER_SIZE > left) 
++			memset(dump_config.dumper->curr_buf, 'm', 
++				DUMP_BUFFER_SIZE - left);
++
++		if ((ret = dump_ll_write(dump_config.dumper->dump_buf, 
++			DUMP_BUFFER_SIZE)) < DUMP_BUFFER_SIZE) {
++			return (ret < 0) ? ret : -ENOSPC;
++		}
++
++		dump_config.dumper->curr_offset += DUMP_BUFFER_SIZE;
++	
++		if (left > DUMP_BUFFER_SIZE) {
++			left -= DUMP_BUFFER_SIZE;
++			memcpy(dump_config.dumper->dump_buf, 
++			dump_config.dumper->dump_buf + DUMP_BUFFER_SIZE, left);
++			dump_config.dumper->curr_buf -= DUMP_BUFFER_SIZE;
++		} else {
++			left = 0;
++		}
++	}
++	return 0;
++}
++
++
++/* Default Formatter (lcrash) */
++struct dump_fmt_ops dump_fmt_lcrash_ops = {
++	.configure_header	= dump_lcrash_configure_header,
++	.update_header		= dump_generic_update_header,
++	.save_context		= dump_lcrash_save_context,
++	.add_data		= dump_lcrash_add_data,
++	.update_end_marker	= dump_lcrash_update_end_marker
++};
++
++struct dump_fmt dump_fmt_lcrash = {
++	.name	= "lcrash",
++	.ops	= &dump_fmt_lcrash_ops
++};
++
+Index: linux-2.6.0-test5/drivers/dump/dump_gzip.c
+===================================================================
+--- linux-2.6.0-test5.orig/drivers/dump/dump_gzip.c	2003-09-26 14:26:34.000000000 +0800
++++ linux-2.6.0-test5/drivers/dump/dump_gzip.c	2003-09-26 14:26:34.000000000 +0800
+@@ -0,0 +1,118 @@
++/*
++ * GZIP Compression functions for kernel crash dumps.
++ *
++ * Created by: Matt Robinson (yakker@sourceforge.net)
++ * Copyright 2001 Matt D. Robinson.  All rights reserved.
++ *
++ * This code is released under version 2 of the GNU GPL.
++ */
++
++/* header files */
++#include <linux/config.h>
++#include <linux/module.h>
++#include <linux/sched.h>
++#include <linux/fs.h>
++#include <linux/file.h>
++#include <linux/init.h>
++#include <linux/slab.h>
++#include <linux/dump.h>
++#include <linux/zlib.h>
++#include <linux/vmalloc.h>
++
++static void *deflate_workspace;
++
++/*
++ * Name: dump_compress_gzip()
++ * Func: Compress a DUMP_PAGE_SIZE page using gzip-style algorithms (the.
++ *       deflate functions similar to what's used in PPP).
++ */
++static u16
++dump_compress_gzip(const u8 *old, u16 oldsize, u8 *new, u16 newsize)
++{
++	/* error code and dump stream */
++	int err;
++	z_stream dump_stream;
++	
++	dump_stream.workspace = deflate_workspace;
++	
++	if ((err = zlib_deflateInit(&dump_stream, Z_BEST_COMPRESSION)) != Z_OK) {
++		/* fall back to RLE compression */
++		printk("dump_compress_gzip(): zlib_deflateInit() "
++			"failed (%d)!\n", err);
++		return 0;
++	}
++
++	/* use old (page of memory) and size (DUMP_PAGE_SIZE) as in-streams */
++	dump_stream.next_in = (u8 *) old;
++	dump_stream.avail_in = oldsize;
++
++	/* out streams are new (dpcpage) and new size (DUMP_DPC_PAGE_SIZE) */
++	dump_stream.next_out = new;
++	dump_stream.avail_out = newsize;
++
++	/* deflate the page -- check for error */
++	err = zlib_deflate(&dump_stream, Z_FINISH);
++	if (err != Z_STREAM_END) {
++		/* zero is return code here */
++		(void)zlib_deflateEnd(&dump_stream);
++		printk("dump_compress_gzip(): zlib_deflate() failed (%d)!\n",
++			err);
++		return 0;
++	}
++
++	/* let's end the deflated compression stream */
++	if ((err = zlib_deflateEnd(&dump_stream)) != Z_OK) {
++		printk("dump_compress_gzip(): zlib_deflateEnd() "
++			"failed (%d)!\n", err);
++	}
++
++	/* return the compressed byte total (if it's smaller) */
++	if (dump_stream.total_out >= oldsize) {
++		return oldsize;
++	}
++	return dump_stream.total_out;
++}
++
++/* setup the gzip compression functionality */
++static struct __dump_compress dump_gzip_compression = {
++	.compress_type = DUMP_COMPRESS_GZIP,
++	.compress_func = dump_compress_gzip,
++	.compress_name = "GZIP",
++};
++
++/*
++ * Name: dump_compress_gzip_init()
++ * Func: Initialize gzip as a compression mechanism.
++ */
++static int __init
++dump_compress_gzip_init(void)
++{
++	deflate_workspace = vmalloc(zlib_deflate_workspacesize());
++	if (!deflate_workspace) {
++		printk("dump_compress_gzip_init(): Failed to "
++			"alloc %d bytes for deflate workspace\n",
++			zlib_deflate_workspacesize());
++		return -ENOMEM;
++	}
++	dump_register_compression(&dump_gzip_compression);
++	return 0;
++}
++
++/*
++ * Name: dump_compress_gzip_cleanup()
++ * Func: Remove gzip as a compression mechanism.
++ */
++static void __exit
++dump_compress_gzip_cleanup(void)
++{
++	vfree(deflate_workspace);
++	dump_unregister_compression(DUMP_COMPRESS_GZIP);
++}
++
++/* module initialization */
++module_init(dump_compress_gzip_init);
++module_exit(dump_compress_gzip_cleanup);
++
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("LKCD Development Team <lkcd-devel@lists.sourceforge.net>");
++MODULE_DESCRIPTION("Gzip compression module for crash dump driver");
+Index: linux-2.6.0-test5/drivers/dump/dump_i386.c
+===================================================================
+--- linux-2.6.0-test5.orig/drivers/dump/dump_i386.c	2003-09-26 14:26:34.000000000 +0800
++++ linux-2.6.0-test5/drivers/dump/dump_i386.c	2003-09-26 14:26:34.000000000 +0800
+@@ -0,0 +1,329 @@
++/*
++ * Architecture specific (i386) functions for Linux crash dumps.
++ *
++ * Created by: Matt Robinson (yakker@sgi.com)
++ *
++ * Copyright 1999 Silicon Graphics, Inc. All rights reserved.
++ *
++ * 2.3 kernel modifications by: Matt D. Robinson (yakker@turbolinux.com)
++ * Copyright 2000 TurboLinux, Inc.  All rights reserved.
++ * 
++ * This code is released under version 2 of the GNU GPL.
++ */
++
++/*
++ * The hooks for dumping the kernel virtual memory to disk are in this
++ * file.  Any time a modification is made to the virtual memory mechanism,
++ * these routines must be changed to use the new mechanisms.
++ */
++#include <linux/init.h>
++#include <linux/types.h>
++#include <linux/kernel.h>
++#include <linux/smp.h>
++#include <linux/fs.h>
++#include <linux/vmalloc.h>
++#include <linux/mm.h>
++#include <linux/dump.h>
++#include "dump_methods.h"
++#include <linux/irq.h>
++
++#include <asm/processor.h>
++#include <asm/e820.h>
++#include <asm/hardirq.h>
++#include <asm/nmi.h>
++
++static __s32 	     saved_irq_count;	/* saved preempt_count() flags */
++
++static int
++alloc_dha_stack(void)
++{
++	int i;
++	void *ptr;
++	
++	if (dump_header_asm.dha_stack[0])
++		return 0;
++
++	ptr = vmalloc(THREAD_SIZE * num_online_cpus());
++	if (!ptr) {
++		printk("vmalloc for dha_stacks failed\n");
++		return -ENOMEM;
++	}
++
++	for (i = 0; i < num_online_cpus(); i++) {
++		dump_header_asm.dha_stack[i] = (u32)((unsigned long)ptr +
++				(i * THREAD_SIZE));
++	}
++	return 0;
++}
++
++static int
++free_dha_stack(void) 
++{
++	if (dump_header_asm.dha_stack[0]) {
++		vfree((void *)dump_header_asm.dha_stack[0]);	
++		dump_header_asm.dha_stack[0] = 0;
++	}
++	return 0;
++}
++
++
++void 
++__dump_save_regs(struct pt_regs *dest_regs, const struct pt_regs *regs)
++{
++	*dest_regs = *regs;
++
++	/* In case of panic dumps, we collects regs on entry to panic.
++	 * so, we shouldn't 'fix' ssesp here again. But it is hard to
++	 * tell just looking at regs whether ssesp need fixing. We make
++	 * this decision by looking at xss in regs. If we have better
++	 * means to determine that ssesp are valid (by some flag which
++	 * tells that we are here due to panic dump), then we can use
++	 * that instead of this kludge.
++	 */
++	if (!user_mode(regs)) {
++		if ((0xffff & regs->xss) == __KERNEL_DS) 
++			/* already fixed up */
++			return;
++		dest_regs->esp = (unsigned long)&(regs->esp);
++		__asm__ __volatile__ ("movw %%ss, %%ax;"
++			:"=a"(dest_regs->xss));
++	}
++}
++
++
++#ifdef CONFIG_SMP
++extern cpumask_t irq_affinity[];
++extern irq_desc_t irq_desc[];
++extern void dump_send_ipi(void);
++
++static int dump_expect_ipi[NR_CPUS];
++static atomic_t waiting_for_dump_ipi;
++static cpumask_t saved_affinity[NR_IRQS];
++
++extern void stop_this_cpu(void *); /* exported by i386 kernel */
++
++static int
++dump_nmi_callback(struct pt_regs *regs, int cpu) 
++{
++	if (!dump_expect_ipi[cpu])
++		return 0;
++
++	dump_expect_ipi[cpu] = 0;
++	
++	dump_save_this_cpu(regs);
++	atomic_dec(&waiting_for_dump_ipi);
++
++ level_changed:
++	switch (dump_silence_level) {
++	case DUMP_HARD_SPIN_CPUS:	/* Spin until dump is complete */
++		while (dump_oncpu) {
++			barrier();    	/* paranoia */
++			if (dump_silence_level != DUMP_HARD_SPIN_CPUS)
++				goto level_changed;
++
++			cpu_relax();	/* kill time nicely */
++		}
++		break;
++
++	case DUMP_HALT_CPUS:		/* Execute halt */
++		stop_this_cpu(NULL);
++		break;
++		
++	case DUMP_SOFT_SPIN_CPUS:
++		/* Mark the task so it spins in schedule */
++		set_tsk_thread_flag(current, TIF_NEED_RESCHED);
++		break;
++	}
++
++	return 1;
++}
++
++/* save registers on other processors */
++void 
++__dump_save_other_cpus(void)
++{
++	int i, cpu = smp_processor_id();
++	int other_cpus = num_online_cpus()-1;
++	
++	if (other_cpus > 0) {
++		atomic_set(&waiting_for_dump_ipi, other_cpus);
++
++		for (i = 0; i < NR_CPUS; i++) {
++			dump_expect_ipi[i] = (i != cpu && cpu_online(i));
++		}
++
++		/* short circuit normal NMI handling temporarily */
++		set_nmi_callback(dump_nmi_callback);
++		wmb();
++
++		dump_send_ipi();
++		/* may be we dont need to wait for NMI to be processed. 
++		   just write out the header at the end of dumping, if
++		   this IPI is not processed until then, there probably
++		   is a problem and we just fail to capture state of 
++		   other cpus. */
++		while(atomic_read(&waiting_for_dump_ipi) > 0) {
++			cpu_relax();
++		}
++
++		unset_nmi_callback();
++	}
++}
++
++/*
++ * Routine to save the old irq affinities and change affinities of all irqs to
++ * the dumping cpu.
++ */
++static void 
++set_irq_affinity(void)
++{
++	int i;
++	int cpu = smp_processor_id();
++
++	memcpy(saved_affinity, irq_affinity, NR_IRQS * sizeof(cpumask_t));
++	for (i = 0; i < NR_IRQS; i++) {
++		if (irq_desc[i].handler == NULL)
++			continue;
++		irq_affinity[i] = cpumask_of_cpu(cpu);
++		if (irq_desc[i].handler->set_affinity != NULL)
++			irq_desc[i].handler->set_affinity(i, irq_affinity[i]);
++	}
++}
++
++/*
++ * Restore old irq affinities.
++ */
++static void 
++reset_irq_affinity(void)
++{
++	int i;
++
++	memcpy(irq_affinity, saved_affinity, NR_IRQS * sizeof(unsigned long));
++	for (i = 0; i < NR_IRQS; i++) {
++		if (irq_desc[i].handler == NULL)
++			continue;
++		if (irq_desc[i].handler->set_affinity != NULL)
++			irq_desc[i].handler->set_affinity(i, saved_affinity[i]);
++	}
++}
++
++#else /* !CONFIG_SMP */
++#define set_irq_affinity()	do { } while (0)
++#define reset_irq_affinity()	do { } while (0)
++#define save_other_cpu_states() do { } while (0)
++#endif /* !CONFIG_SMP */
++
++/* 
++ * Kludge - dump from interrupt context is unreliable (Fixme)
++ *
++ * We do this so that softirqs initiated for dump i/o 
++ * get processed and we don't hang while waiting for i/o
++ * to complete or in any irq synchronization attempt.
++ *
++ * This is not quite legal of course, as it has the side 
++ * effect of making all interrupts & softirqs triggered 
++ * while dump is in progress complete before currently 
++ * pending softirqs and the currently executing interrupt 
++ * code. 
++ */
++static inline void
++irq_bh_save(void)
++{
++	saved_irq_count = irq_count();
++	preempt_count() &= ~(HARDIRQ_MASK|SOFTIRQ_MASK);
++}
++
++static inline void
++irq_bh_restore(void)
++{
++	preempt_count() |= saved_irq_count;
++}
++
++/*
++ * Name: __dump_irq_enable
++ * Func: Reset system so interrupts are enabled.
++ *	 This is used for dump methods that require interrupts
++ *	 Eventually, all methods will have interrupts disabled
++ *	 and this code can be removed.
++ *
++ *     Change irq affinities
++ *     Re-enable interrupts
++ */
++void 
++__dump_irq_enable(void)
++{
++	set_irq_affinity();
++	irq_bh_save();
++	local_irq_enable();
++}
++
++/*
++ * Name: __dump_irq_restore
++ * Func: Resume the system state in an architecture-specific way.
++
++ */
++void 
++__dump_irq_restore(void)
++{
++	local_irq_disable();
++	reset_irq_affinity();
++	irq_bh_restore();
++}
++
++/*
++ * Name: __dump_configure_header()
++ * Func: Meant to fill in arch specific header fields except per-cpu state
++ * already captured via __dump_save_context for all CPUs.
++ */
++int
++__dump_configure_header(const struct pt_regs *regs)
++{
++	return (0);
++}
++
++/*
++ * Name: __dump_init()
++ * Func: Initialize the dumping routine process.
++ */
++void
++__dump_init(uint64_t local_memory_start)
++{
++	return;
++}
++
++/*
++ * Name: __dump_open()
++ * Func: Open the dump device (architecture specific).
++ */
++void
++__dump_open(void)
++{
++	alloc_dha_stack();
++}
++
++/*
++ * Name: __dump_cleanup()
++ * Func: Free any architecture specific data structures. This is called
++ *       when the dump module is being removed.
++ */
++void
++__dump_cleanup(void)
++{
++	free_dha_stack();
++}
++
++extern int pfn_is_ram(unsigned long);
++
++/*
++ * Name: __dump_page_valid()
++ * Func: Check if page is valid to dump.
++ */ 
++int 
++__dump_page_valid(unsigned long index)
++{
++	if (!pfn_valid(index))
++		return 0;
++
++	return pfn_is_ram(index);
++}
++
+Index: linux-2.6.0-test5/drivers/dump/dump_memdev.c
+===================================================================
+--- linux-2.6.0-test5.orig/drivers/dump/dump_memdev.c	2003-09-26 14:26:34.000000000 +0800
++++ linux-2.6.0-test5/drivers/dump/dump_memdev.c	2003-09-26 14:26:34.000000000 +0800
+@@ -0,0 +1,640 @@
++/*
++ * Implements the dump driver interface for saving a dump in available
++ * memory areas. The saved pages may be written out to persistent storage  
++ * after a soft reboot.
++ *
++ * Started: Oct 2002 -  Suparna Bhattacharya <suparna@in.ibm.com>
++ *
++ * Copyright (C) 2002 International Business Machines Corp. 
++ *
++ * This code is released under version 2 of the GNU GPL.
++ *
++ * The approach of tracking pages containing saved dump using map pages 
++ * allocated as needed has been derived from the Mission Critical Linux 
++ * mcore dump implementation. 
++ *
++ * Credits and a big thanks for letting the lkcd project make use of 
++ * the excellent piece of work and also helping with clarifications 
++ * and tips along the way are due to:
++ * 	Dave Winchell <winchell@mclx.com> (primary author of mcore)
++ * 	Jeff Moyer <moyer@mclx.com>
++ * 	Josh Huber <huber@mclx.com>
++ *
++ * For those familiar with the mcore code, the main differences worth
++ * noting here (besides the dump device abstraction) result from enabling 
++ * "high" memory pages (pages not permanently mapped in the kernel 
++ * address space) to be used for saving dump data (because of which a 
++ * simple virtual address based linked list cannot be used anymore for 
++ * managing free pages), an added level of indirection for faster 
++ * lookups during the post-boot stage, and the idea of pages being 
++ * made available as they get freed up while dump to memory progresses 
++ * rather than one time before starting the dump. The last point enables 
++ * a full memory snapshot to be saved starting with an initial set of 
++ * bootstrap pages given a good compression ratio. (See dump_overlay.c)
++ *
++ */
++
++/*
++ * -----------------MEMORY LAYOUT ------------------
++ * The memory space consists of a set of discontiguous pages, and
++ * discontiguous map pages as well, rooted in a chain of indirect
++ * map pages (also discontiguous). Except for the indirect maps 
++ * (which must be preallocated in advance), the rest of the pages 
++ * could be in high memory.
++ *
++ * root
++ *  |    ---------    --------        --------
++ *  -->  | .  . +|--->|  .  +|------->| . .  |       indirect 
++ *       --|--|---    ---|----        --|-|---	     maps
++ *         |  |          |     	        | |	
++ *    ------  ------   -------     ------ -------
++ *    | .  |  | .  |   | .  . |    | .  | |  . . |   maps 
++ *    --|---  --|---   --|--|--    --|--- ---|-|--
++ *     page    page    page page   page   page page  data
++ *                                                   pages
++ *
++ * Writes to the dump device happen sequentially in append mode.
++ * The main reason for the existence of the indirect map is
++ * to enable a quick way to lookup a specific logical offset in
++ * the saved data post-soft-boot, e.g. to writeout pages
++ * with more critical data first, even though such pages
++ * would have been compressed and copied last, being the lowest
++ * ranked candidates for reuse due to their criticality.
++ * (See dump_overlay.c)
++ */
++#include <linux/mm.h>
++#include <linux/highmem.h>
++#include <linux/bootmem.h>
++#include <linux/dump.h>
++#include "dump_methods.h"
++
++#define DUMP_MAP_SZ (PAGE_SIZE / sizeof(unsigned long)) /* direct map size */
++#define DUMP_IND_MAP_SZ	DUMP_MAP_SZ - 1  /* indirect map size */
++#define DUMP_NR_BOOTSTRAP	64  /* no of bootstrap pages */
++
++extern int dump_low_page(struct page *);
++
++/* check if the next entry crosses a page boundary */
++static inline int is_last_map_entry(unsigned long *map)
++{
++	unsigned long addr = (unsigned long)(map + 1);
++
++	return (!(addr & (PAGE_SIZE - 1)));
++}
++
++/* Todo: should have some validation checks */
++/* The last entry in the indirect map points to the next indirect map */
++/* Indirect maps are referred to directly by virtual address */
++static inline unsigned long *next_indirect_map(unsigned long *map)
++{
++	return (unsigned long *)map[DUMP_IND_MAP_SZ];
++}
++
++#ifdef CONFIG_CRASH_DUMP_SOFTBOOT
++/* Called during early bootup - fixme: make this __init */
++void dump_early_reserve_map(struct dump_memdev *dev)
++{
++	unsigned long *map1, *map2;
++	loff_t off = 0, last = dev->last_used_offset >> PAGE_SHIFT;
++	int i, j;
++	
++	printk("Reserve bootmap space holding previous dump of %lld pages\n",
++			last);
++	map1= (unsigned long *)dev->indirect_map_root;
++
++	while (map1 && (off < last)) {
++		reserve_bootmem(virt_to_phys((void *)map1), PAGE_SIZE);
++		for (i=0;  (i < DUMP_MAP_SZ - 1) && map1[i] && (off < last); 
++			i++, off += DUMP_MAP_SZ) {
++			pr_debug("indirect map[%d] = 0x%lx\n", i, map1[i]);
++			if (map1[i] >= max_low_pfn)
++				continue;
++			reserve_bootmem(map1[i] << PAGE_SHIFT, PAGE_SIZE);
++			map2 = pfn_to_kaddr(map1[i]);
++			for (j = 0 ; (j < DUMP_MAP_SZ) && map2[j] && 
++				(off + j < last); j++) {
++				pr_debug("\t map[%d][%d] = 0x%lx\n", i, j, 
++					map2[j]);
++				if (map2[j] < max_low_pfn) {
++					reserve_bootmem(map2[j] << PAGE_SHIFT,
++						PAGE_SIZE);
++				}
++			}
++		}
++		map1 = next_indirect_map(map1);
++	}
++	dev->nr_free = 0; /* these pages don't belong to this boot */
++}
++#endif
++
++/* mark dump pages so that they aren't used by this kernel */
++void dump_mark_map(struct dump_memdev *dev)
++{
++	unsigned long *map1, *map2;
++	loff_t off = 0, last = dev->last_used_offset >> PAGE_SHIFT;
++	struct page *page;
++	int i, j;
++	
++	printk("Dump: marking pages in use by previous dump\n");
++	map1= (unsigned long *)dev->indirect_map_root;
++
++	while (map1 && (off < last)) {
++		page = virt_to_page(map1);	
++		set_page_count(page, 1);
++		for (i=0;  (i < DUMP_MAP_SZ - 1) && map1[i] && (off < last); 
++			i++, off += DUMP_MAP_SZ) {
++			pr_debug("indirect map[%d] = 0x%lx\n", i, map1[i]);
++			page = pfn_to_page(map1[i]);
++			set_page_count(page, 1);
++			map2 = kmap_atomic(page, KM_DUMP);
++			for (j = 0 ; (j < DUMP_MAP_SZ) && map2[j] && 
++				(off + j < last); j++) {
++				pr_debug("\t map[%d][%d] = 0x%lx\n", i, j, 
++					map2[j]);
++				page = pfn_to_page(map2[j]);
++				set_page_count(page, 1);
++			}
++		}
++		map1 = next_indirect_map(map1);
++	}
++}
++	
++
++/* 
++ * Given a logical offset into the mem device lookup the 
++ * corresponding page 
++ * 	loc is specified in units of pages 
++ * Note: affects curr_map (even in the case where lookup fails)
++ */
++struct page *dump_mem_lookup(struct dump_memdev *dump_mdev, unsigned long loc)
++{
++	unsigned long *map;
++	unsigned long i, index = loc / DUMP_MAP_SZ;
++	struct page *page = NULL;
++	unsigned long curr_pfn, curr_map, *curr_map_ptr = NULL;
++
++	map = (unsigned long *)dump_mdev->indirect_map_root;
++	if (!map)
++		return NULL;
++
++	if (loc > dump_mdev->last_offset >> PAGE_SHIFT)
++		return NULL;
++
++	/* 
++	 * first locate the right indirect map 
++	 * in the chain of indirect maps 
++	 */
++	for (i = 0; i + DUMP_IND_MAP_SZ < index ; i += DUMP_IND_MAP_SZ) {
++		if (!(map = next_indirect_map(map)))
++			return NULL;
++	}
++	/* then the right direct map */
++	/* map entries are referred to by page index */
++	if ((curr_map = map[index - i])) {
++		page = pfn_to_page(curr_map);
++		/* update the current traversal index */
++		/* dump_mdev->curr_map = &map[index - i];*/
++		curr_map_ptr = &map[index - i];
++	}
++
++	if (page)
++		map = kmap_atomic(page, KM_DUMP);
++	else 
++		return NULL;
++
++	/* and finally the right entry therein */
++	/* data pages are referred to by page index */
++	i = index * DUMP_MAP_SZ;
++	if ((curr_pfn = map[loc - i])) {
++		page = pfn_to_page(curr_pfn);
++		dump_mdev->curr_map = curr_map_ptr;
++		dump_mdev->curr_map_offset = loc - i;
++		dump_mdev->ddev.curr_offset = loc << PAGE_SHIFT;
++	} else {
++		page = NULL;
++	}
++	kunmap_atomic(map, KM_DUMP);
++
++	return page;
++}
++			
++/* 
++ * Retrieves a pointer to the next page in the dump device 
++ * Used during the lookup pass post-soft-reboot 
++ */
++struct page *dump_mem_next_page(struct dump_memdev *dev)
++{
++	unsigned long i; 
++	unsigned long *map;	
++	struct page *page = NULL;
++
++	if (dev->ddev.curr_offset + PAGE_SIZE >= dev->last_offset) {
++		return NULL;
++	}
++
++	if ((i = (unsigned long)(++dev->curr_map_offset)) >= DUMP_MAP_SZ) {
++		/* move to next map */	
++		if (is_last_map_entry(++dev->curr_map)) {
++			/* move to the next indirect map page */
++			printk("dump_mem_next_page: go to next indirect map\n");
++			dev->curr_map = (unsigned long *)*dev->curr_map;
++			if (!dev->curr_map)
++				return NULL;
++		}
++		i = dev->curr_map_offset = 0;
++		pr_debug("dump_mem_next_page: next map 0x%lx, entry 0x%lx\n",
++				dev->curr_map, *dev->curr_map);
++
++	};
++	
++	if (*dev->curr_map) {
++		map = kmap_atomic(pfn_to_page(*dev->curr_map), KM_DUMP);
++		if (map[i])
++			page = pfn_to_page(map[i]);
++		kunmap_atomic(map, KM_DUMP);
++		dev->ddev.curr_offset += PAGE_SIZE;
++	};
++
++	return page;
++}
++
++/* Copied from dump_filters.c */
++static inline int kernel_page(struct page *p)
++{
++	/* FIXME: Need to exclude hugetlb pages. Clue: reserved but inuse */
++	return PageReserved(p) || (!PageLRU(p) && PageInuse(p));
++}
++
++static inline int user_page(struct page *p)
++{
++	return PageInuse(p) && (!PageReserved(p) && PageLRU(p));
++}
++
++int dump_reused_by_boot(struct page *page)
++{
++	/* Todo
++	 * Checks:
++	 * if PageReserved 
++	 * if < __end + bootmem_bootmap_pages for this boot + allowance 
++	 * if overwritten by initrd (how to check ?)
++	 * Also, add more checks in early boot code
++	 * e.g. bootmem bootmap alloc verify not overwriting dump, and if
++	 * so then realloc or move the dump pages out accordingly.
++	 */
++
++	/* Temporary proof of concept hack, avoid overwriting kern pages */
++
++	return (kernel_page(page) || dump_low_page(page) || user_page(page));
++}
++
++
++/* Uses the free page passed in to expand available space */
++int dump_mem_add_space(struct dump_memdev *dev, struct page *page)
++{
++	struct page *map_page;
++	unsigned long *map;	
++	unsigned long i; 
++
++	if (!dev->curr_map)
++		return -ENOMEM; /* must've exhausted indirect map */
++
++	if (!*dev->curr_map || dev->curr_map_offset >= DUMP_MAP_SZ) {
++		/* add map space */
++		*dev->curr_map = page_to_pfn(page);
++		dev->curr_map_offset = 0;
++		return 0;
++	}
++
++	/* add data space */
++	i = dev->curr_map_offset;
++	map_page = pfn_to_page(*dev->curr_map);
++	map = (unsigned long *)kmap_atomic(map_page, KM_DUMP);
++	map[i] = page_to_pfn(page);
++	kunmap_atomic(map, KM_DUMP);
++	dev->curr_map_offset = ++i;
++	dev->last_offset += PAGE_SIZE;
++	if (i >= DUMP_MAP_SZ) {
++		/* move to next map */
++		if (is_last_map_entry(++dev->curr_map)) {
++			/* move to the next indirect map page */
++			pr_debug("dump_mem_add_space: using next"
++			"indirect map\n");
++			dev->curr_map = (unsigned long *)*dev->curr_map;
++		}
++	}		
++	return 0;
++}
++
++
++/* Caution: making a dest page invalidates existing contents of the page */
++int dump_check_and_free_page(struct dump_memdev *dev, struct page *page)
++{
++	int err = 0;
++
++	/* 
++	 * the page can be used as a destination only if we are sure
++	 * it won't get overwritten by the soft-boot, and is not
++	 * critical for us right now.
++	 */
++	if (dump_reused_by_boot(page))
++		return 0;
++
++	if ((err = dump_mem_add_space(dev, page))) {
++		printk("Warning: Unable to extend memdev space. Err %d\n",
++		err);
++		return 0;
++	}
++
++	dev->nr_free++;
++	return 1;
++}
++
++
++/* Set up the initial maps and bootstrap space  */
++/* Must be called only after any previous dump is written out */
++int dump_mem_open(struct dump_dev *dev, unsigned long devid)
++{
++	struct dump_memdev *dump_mdev = DUMP_MDEV(dev);
++	unsigned long nr_maps, *map, *prev_map = &dump_mdev->indirect_map_root;
++	void *addr;
++	struct page *page;
++	unsigned long i = 0;
++	int err = 0;
++
++	/* Todo: sanity check for unwritten previous dump */
++
++	/* allocate pages for indirect map (non highmem area) */
++	nr_maps = num_physpages / DUMP_MAP_SZ; /* maps to cover entire mem */
++	for (i = 0; i < nr_maps; i += DUMP_IND_MAP_SZ) {
++		if (!(map = (unsigned long *)dump_alloc_mem(PAGE_SIZE))) {
++			printk("Unable to alloc indirect map %ld\n", 
++				i / DUMP_IND_MAP_SZ);
++			return -ENOMEM;
++		}
++		clear_page(map);
++		*prev_map = (unsigned long)map;
++		prev_map = &map[DUMP_IND_MAP_SZ];
++	};
++		
++	dump_mdev->curr_map = (unsigned long *)dump_mdev->indirect_map_root;
++	dump_mdev->curr_map_offset = 0;	
++
++	/* 
++	 * allocate a few bootstrap pages: at least 1 map and 1 data page
++	 * plus enough to save the dump header
++	 */
++	i = 0;
++	do {
++		if (!(addr = dump_alloc_mem(PAGE_SIZE))) {
++			printk("Unable to alloc bootstrap page %ld\n", i);
++			return -ENOMEM;
++		}
++
++		page = virt_to_page(addr);
++		if (dump_low_page(page)) {
++			dump_free_mem(addr);
++			continue;
++		}
++
++		if (dump_mem_add_space(dump_mdev, page)) {
++			printk("Warning: Unable to extend memdev "
++					"space. Err %d\n", err);
++			dump_free_mem(addr);
++			continue;
++		}
++		i++;
++	} while (i < DUMP_NR_BOOTSTRAP);
++
++	printk("dump memdev init: %ld maps, %ld bootstrap pgs, %ld free pgs\n",
++		nr_maps, i, dump_mdev->last_offset >> PAGE_SHIFT);
++	
++	dump_mdev->last_bs_offset = dump_mdev->last_offset;
++
++	return 0;
++}
++
++/* Releases all pre-alloc'd pages */
++int dump_mem_release(struct dump_dev *dev)
++{
++	struct dump_memdev *dump_mdev = DUMP_MDEV(dev);
++	struct page *page, *map_page;
++	unsigned long *map, *prev_map;
++	void *addr;
++	int i;
++
++	if (!dump_mdev->nr_free)
++		return 0;
++
++	pr_debug("dump_mem_release\n");
++	page = dump_mem_lookup(dump_mdev, 0);
++	for (i = 0; page && (i < DUMP_NR_BOOTSTRAP - 1); i++) {
++		if (PageHighMem(page))
++			break;
++		addr = page_address(page);
++		if (!addr) {
++			printk("page_address(%p) = NULL\n", page);
++			break;
++		}
++		pr_debug("Freeing page at 0x%lx\n", addr); 
++		dump_free_mem(addr);
++		if (dump_mdev->curr_map_offset >= DUMP_MAP_SZ - 1) {
++			map_page = pfn_to_page(*dump_mdev->curr_map);
++			if (PageHighMem(map_page))
++				break;
++			page = dump_mem_next_page(dump_mdev);
++			addr = page_address(map_page);
++			if (!addr) {
++				printk("page_address(%p) = NULL\n", 
++					map_page);
++				break;
++			}
++			pr_debug("Freeing map page at 0x%lx\n", addr);
++			dump_free_mem(addr);
++			i++;
++		} else {
++			page = dump_mem_next_page(dump_mdev);
++		}
++	}
++
++	/* now for the last used bootstrap page used as a map page */
++	if ((i < DUMP_NR_BOOTSTRAP) && (*dump_mdev->curr_map)) {
++		map_page = pfn_to_page(*dump_mdev->curr_map);
++		if ((map_page) && !PageHighMem(map_page)) {
++			addr = page_address(map_page);
++			if (!addr) {
++				printk("page_address(%p) = NULL\n", map_page);
++			} else {
++				pr_debug("Freeing map page at 0x%lx\n", addr);
++				dump_free_mem(addr);
++				i++;
++			}
++		}
++	}
++
++	printk("Freed %d bootstrap pages\n", i);
++
++	/* free the indirect maps */
++	map = (unsigned long *)dump_mdev->indirect_map_root;
++
++	i = 0;
++	while (map) {
++		prev_map = map;
++		map = next_indirect_map(map);
++		dump_free_mem(prev_map);
++		i++;
++	}
++
++	printk("Freed %d indirect map(s)\n", i);
++
++	/* Reset the indirect map */
++	dump_mdev->indirect_map_root = 0;
++	dump_mdev->curr_map = 0;
++
++	/* Reset the free list */
++	dump_mdev->nr_free = 0;
++
++	dump_mdev->last_offset = dump_mdev->ddev.curr_offset = 0;
++	dump_mdev->last_used_offset = 0;
++	dump_mdev->curr_map = NULL;
++	dump_mdev->curr_map_offset = 0;
++	return 0;
++}
++
++/*
++ * Long term:
++ * It is critical for this to be very strict. Cannot afford
++ * to have anything running and accessing memory while we overwrite 
++ * memory (potential risk of data corruption).
++ * If in doubt (e.g if a cpu is hung and not responding) just give
++ * up and refuse to proceed with this scheme.
++ *
++ * Note: I/O will only happen after soft-boot/switchover, so we can 
++ * safely disable interrupts and force stop other CPUs if this is
++ * going to be a disruptive dump, no matter what they
++ * are in the middle of.
++ */
++/* 
++ * ATM Most of this is already taken care of in the nmi handler 
++ * We may halt the cpus rightaway if we know this is going to be disruptive 
++ * For now, since we've limited ourselves to overwriting free pages we
++ * aren't doing much here. Eventually, we'd have to wait to make sure other
++ * cpus aren't using memory we could be overwriting
++ */
++int dump_mem_silence(struct dump_dev *dev)
++{
++	struct dump_memdev *dump_mdev = DUMP_MDEV(dev);
++
++	if (dump_mdev->last_offset > dump_mdev->last_bs_offset) {
++		/* prefer to run lkcd config & start with a clean slate */
++		return -EEXIST;
++	}
++	return 0;
++}
++
++extern int dump_overlay_resume(void);
++
++/* Trigger the next stage of dumping */
++int dump_mem_resume(struct dump_dev *dev)
++{
++	dump_overlay_resume(); 
++	return 0;
++}
++
++/* 
++ * Allocate mem dev pages as required and copy buffer contents into it.
++ * Fails if the no free pages are available
++ * Keeping it simple and limited for starters (can modify this over time)
++ *  Does not handle holes or a sparse layout
++ *  Data must be in multiples of PAGE_SIZE
++ */
++int dump_mem_write(struct dump_dev *dev, void *buf, unsigned long len)
++{
++	struct dump_memdev *dump_mdev = DUMP_MDEV(dev);
++	struct page *page;
++	unsigned long n = 0;
++	void *addr;
++	unsigned long *saved_curr_map, saved_map_offset;
++	int ret = 0;
++
++	pr_debug("dump_mem_write: offset 0x%llx, size %ld\n", 
++		dev->curr_offset, len);
++
++	if (dev->curr_offset + len > dump_mdev->last_offset)  {
++		printk("Out of space to write\n");
++		return -ENOSPC;
++	}
++	
++	if ((len & (PAGE_SIZE - 1)) || (dev->curr_offset & (PAGE_SIZE - 1)))
++		return -EINVAL; /* not aligned in units of page size */
++
++	saved_curr_map = dump_mdev->curr_map;
++	saved_map_offset = dump_mdev->curr_map_offset;
++	page = dump_mem_lookup(dump_mdev, dev->curr_offset >> PAGE_SHIFT);
++
++	for (n = len; (n > 0) && page; n -= PAGE_SIZE, buf += PAGE_SIZE ) {
++		addr = kmap_atomic(page, KM_DUMP);
++		/* memset(addr, 'x', PAGE_SIZE); */
++		memcpy(addr, buf, PAGE_SIZE);
++		kunmap_atomic(addr, KM_DUMP);
++		/* dev->curr_offset += PAGE_SIZE; */
++		page = dump_mem_next_page(dump_mdev);
++	}
++
++	dump_mdev->curr_map = saved_curr_map;
++	dump_mdev->curr_map_offset = saved_map_offset;
++
++	if (dump_mdev->last_used_offset < dev->curr_offset)
++		dump_mdev->last_used_offset = dev->curr_offset;
++
++	return (len - n) ? (len - n) : ret ;
++}
++
++/* dummy - always ready */
++int dump_mem_ready(struct dump_dev *dev, void *buf)
++{
++	return 0;
++}
++
++/* 
++ * Should check for availability of space to write upto the offset 
++ * affects only the curr_offset; last_offset untouched 
++ * Keep it simple: Only allow multiples of PAGE_SIZE for now 
++ */
++int dump_mem_seek(struct dump_dev *dev, loff_t offset)
++{
++	struct dump_memdev *dump_mdev = DUMP_MDEV(dev);
++
++	if (offset & (PAGE_SIZE - 1))
++		return -EINVAL; /* allow page size units only for now */
++	
++	/* Are we exceeding available space ? */
++	if (offset > dump_mdev->last_offset) {
++		printk("dump_mem_seek failed for offset 0x%llx\n",
++			offset);
++		return -ENOSPC;	
++	}
++
++	dump_mdev->ddev.curr_offset = offset;
++	return 0;
++}
++
++struct dump_dev_ops dump_memdev_ops = {
++	.open 		= dump_mem_open,
++	.release	= dump_mem_release,
++	.silence	= dump_mem_silence,
++	.resume 	= dump_mem_resume,
++	.seek		= dump_mem_seek,
++	.write		= dump_mem_write,
++	.read		= NULL, /* not implemented at the moment */
++	.ready		= dump_mem_ready
++};
++
++static struct dump_memdev default_dump_memdev = {
++	.ddev = {.type_name = "memdev", .ops = &dump_memdev_ops,
++        	 .device_id = 0x14}
++	/* assume the rest of the fields are zeroed by default */
++};	
++	
++/* may be overwritten if a previous dump exists */
++struct dump_memdev *dump_memdev = &default_dump_memdev;
++
+Index: linux-2.6.0-test5/drivers/dump/dump_netdev.c
+===================================================================
+--- linux-2.6.0-test5.orig/drivers/dump/dump_netdev.c	2003-09-26 14:26:34.000000000 +0800
++++ linux-2.6.0-test5/drivers/dump/dump_netdev.c	2003-09-26 14:26:34.000000000 +0800
+@@ -0,0 +1,880 @@
++/*
++ * Implements the dump driver interface for saving a dump via network
++ * interface. 
++ *
++ * Some of this code has been taken/adapted from Ingo Molnar's netconsole
++ * code. LKCD team expresses its thanks to Ingo.
++ *
++ * Started: June 2002 - Mohamed Abbas <mohamed.abbas@intel.com>
++ * 	Adapted netconsole code to implement LKCD dump over the network.
++ *
++ * Nov 2002 - Bharata B. Rao <bharata@in.ibm.com>
++ * 	Innumerable code cleanups, simplification and some fixes.
++ *	Netdump configuration done by ioctl instead of using module parameters.
++ *
++ * Copyright (C) 2001  Ingo Molnar <mingo@redhat.com>
++ * Copyright (C) 2002 International Business Machines Corp. 
++ *
++ *  This code is released under version 2 of the GNU GPL.
++ */
++
++#include <net/tcp.h>
++#include <net/udp.h>
++#include <linux/delay.h>
++#include <linux/random.h>
++#include <linux/reboot.h>
++#include <linux/module.h>
++#include <linux/dump.h>
++#include <linux/dump_netdev.h>
++
++#include <asm/unaligned.h>
++
++static int startup_handshake;
++static int page_counter;
++static struct net_device *dump_ndev;
++static struct in_device *dump_in_dev;
++static u16 source_port, target_port;
++static u32 source_ip, target_ip;
++static unsigned char daddr[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff} ;
++static spinlock_t dump_skb_lock = SPIN_LOCK_UNLOCKED;
++static int dump_nr_skbs;
++static struct sk_buff *dump_skb;
++static unsigned long flags_global;
++static int netdump_in_progress;
++static char device_name[IFNAMSIZ];
++
++/*
++ * security depends on the trusted path between the netconsole
++ * server and netconsole client, since none of the packets are
++ * encrypted. The random magic number protects the protocol
++ * against spoofing.
++ */
++static u64 dump_magic;
++
++#define MAX_UDP_CHUNK 1460
++#define MAX_PRINT_CHUNK (MAX_UDP_CHUNK-HEADER_LEN)
++
++/*
++ * We maintain a small pool of fully-sized skbs,
++ * to make sure the message gets out even in
++ * extreme OOM situations.
++ */
++#define DUMP_MAX_SKBS 32
++
++#define MAX_SKB_SIZE \
++		(MAX_UDP_CHUNK + sizeof(struct udphdr) + \
++				sizeof(struct iphdr) + sizeof(struct ethhdr))
++
++static void
++dump_refill_skbs(void)
++{
++	struct sk_buff *skb;
++	unsigned long flags;
++
++	spin_lock_irqsave(&dump_skb_lock, flags);
++	while (dump_nr_skbs < DUMP_MAX_SKBS) {
++		skb = alloc_skb(MAX_SKB_SIZE, GFP_ATOMIC);
++		if (!skb)
++			break;
++		if (dump_skb)
++			skb->next = dump_skb;
++		else
++			skb->next = NULL;
++		dump_skb = skb;
++		dump_nr_skbs++;
++	}
++	spin_unlock_irqrestore(&dump_skb_lock, flags);
++}
++
++static struct
++sk_buff * dump_get_skb(void)
++{
++	struct sk_buff *skb;
++	unsigned long flags;
++
++	spin_lock_irqsave(&dump_skb_lock, flags);
++	skb = dump_skb;
++	if (skb) {
++		dump_skb = skb->next;
++		skb->next = NULL;
++		dump_nr_skbs--;
++	}
++	spin_unlock_irqrestore(&dump_skb_lock, flags);
++        
++	return skb;
++}
++
++/*
++ * Zap completed output skbs.
++ */
++static void
++zap_completion_queue(void)
++{
++	int count;
++	unsigned long flags;
++	int cpu = smp_processor_id();
++	struct softnet_data *softnet_data;
++       	
++
++	softnet_data = &__get_cpu_var(softnet_data);
++	count=0;
++	if (softnet_data[cpu].completion_queue) {
++		struct sk_buff *clist;
++	
++		local_irq_save(flags);
++		clist = softnet_data[cpu].completion_queue;
++		softnet_data[cpu].completion_queue = NULL;
++		local_irq_restore(flags);
++
++		while (clist != NULL) {
++			struct sk_buff *skb = clist;
++			clist = clist->next;
++			__kfree_skb(skb);
++			count++;
++			if (count > 10000)
++				printk("Error in sk list\n");
++		}
++	}
++}
++
++static void
++dump_send_skb(struct net_device *dev, const char *msg, unsigned int msg_len,
++		reply_t *reply)
++{
++	int once = 1;
++	int total_len, eth_len, ip_len, udp_len, count = 0;
++	struct sk_buff *skb;
++	struct udphdr *udph;
++	struct iphdr *iph;
++	struct ethhdr *eth; 
++
++	udp_len = msg_len + HEADER_LEN + sizeof(*udph);
++	ip_len = eth_len = udp_len + sizeof(*iph);
++	total_len = eth_len + ETH_HLEN;
++
++repeat_loop:
++	zap_completion_queue();
++	if (dump_nr_skbs < DUMP_MAX_SKBS)
++		dump_refill_skbs();
++
++	skb = alloc_skb(total_len, GFP_ATOMIC);
++	if (!skb) {
++		skb = dump_get_skb();
++		if (!skb) {
++			count++;
++			if (once && (count == 1000000)) {
++				printk("possibly FATAL: out of netconsole "
++					"skbs!!! will keep retrying.\n");
++				once = 0;
++			}
++			dev->poll_controller(dev);
++			goto repeat_loop;
++		}
++	}
++
++	atomic_set(&skb->users, 1);
++	skb_reserve(skb, total_len - msg_len - HEADER_LEN);
++	skb->data[0] = NETCONSOLE_VERSION;
++
++	put_unaligned(htonl(reply->nr), (u32 *) (skb->data + 1));
++	put_unaligned(htonl(reply->code), (u32 *) (skb->data + 5));
++	put_unaligned(htonl(reply->info), (u32 *) (skb->data + 9));
++
++	memcpy(skb->data + HEADER_LEN, msg, msg_len);
++	skb->len += msg_len + HEADER_LEN;
++
++	udph = (struct udphdr *) skb_push(skb, sizeof(*udph));
++	udph->source = source_port;
++	udph->dest = target_port;
++	udph->len = htons(udp_len);
++	udph->check = 0;
++
++	iph = (struct iphdr *)skb_push(skb, sizeof(*iph));
++
++	iph->version  = 4;
++	iph->ihl      = 5;
++	iph->tos      = 0;
++	iph->tot_len  = htons(ip_len);
++	iph->id       = 0;
++	iph->frag_off = 0;
++	iph->ttl      = 64;
++	iph->protocol = IPPROTO_UDP;
++	iph->check    = 0;
++	iph->saddr    = source_ip;
++	iph->daddr    = target_ip;
++	iph->check    = ip_fast_csum((unsigned char *)iph, iph->ihl);
++
++	eth = (struct ethhdr *) skb_push(skb, ETH_HLEN);
++
++	eth->h_proto = htons(ETH_P_IP);
++	memcpy(eth->h_source, dev->dev_addr, dev->addr_len);
++	memcpy(eth->h_dest, daddr, dev->addr_len);
++
++	count=0;
++repeat_poll:
++	spin_lock(&dev->xmit_lock);
++	dev->xmit_lock_owner = smp_processor_id();
++
++	count++;
++
++
++	if (netif_queue_stopped(dev)) {
++		dev->xmit_lock_owner = -1;
++		spin_unlock(&dev->xmit_lock);
++
++		dev->poll_controller(dev);
++		zap_completion_queue();
++
++
++		goto repeat_poll;
++	}
++
++	dev->hard_start_xmit(skb, dev);
++
++	dev->xmit_lock_owner = -1;
++	spin_unlock(&dev->xmit_lock);
++}
++
++static unsigned short
++udp_check(struct udphdr *uh, int len, unsigned long saddr, unsigned long daddr,
++	       	unsigned long base)
++{
++	return csum_tcpudp_magic(saddr, daddr, len, IPPROTO_UDP, base);
++}
++
++static int
++udp_checksum_init(struct sk_buff *skb, struct udphdr *uh,
++			     unsigned short ulen, u32 saddr, u32 daddr)
++{
++	if (uh->check == 0) {
++		skb->ip_summed = CHECKSUM_UNNECESSARY;
++	} else if (skb->ip_summed == CHECKSUM_HW) {
++		skb->ip_summed = CHECKSUM_UNNECESSARY;
++		if (!udp_check(uh, ulen, saddr, daddr, skb->csum))
++			return 0;
++		skb->ip_summed = CHECKSUM_NONE;
++	}
++	if (skb->ip_summed != CHECKSUM_UNNECESSARY)
++		skb->csum = csum_tcpudp_nofold(saddr, daddr, ulen,
++				IPPROTO_UDP, 0);
++	/* Probably, we should checksum udp header (it should be in cache
++	 * in any case) and data in tiny packets (< rx copybreak).
++	 */
++	return 0;
++}
++
++static __inline__ int
++__udp_checksum_complete(struct sk_buff *skb)
++{
++	return (unsigned short)csum_fold(skb_checksum(skb, 0, skb->len,
++				skb->csum));
++}
++
++static __inline__
++int udp_checksum_complete(struct sk_buff *skb)
++{
++	return skb->ip_summed != CHECKSUM_UNNECESSARY &&
++		__udp_checksum_complete(skb);
++}
++
++int new_req = 0;
++static req_t req;
++
++static int
++dump_rx_hook(struct sk_buff *skb)
++{
++	int proto;
++	struct iphdr *iph;
++	struct udphdr *uh;
++	__u32 len, saddr, daddr, ulen;
++	req_t *__req;
++
++	/* 
++	 * First check if were are dumping or doing startup handshake, if
++	 * not quickly return.
++	 */
++	if (!netdump_in_progress)
++		return NET_RX_SUCCESS;
++
++	if (skb->dev->type != ARPHRD_ETHER)
++		goto out;
++
++	proto = ntohs(skb->mac.ethernet->h_proto);
++	if (proto != ETH_P_IP)
++		goto out;
++
++	if (skb->pkt_type == PACKET_OTHERHOST)
++		goto out;
++
++	if (skb_shared(skb))
++		goto out;
++
++	 /* IP header correctness testing: */
++	iph = (struct iphdr *)skb->data;
++	if (!pskb_may_pull(skb, sizeof(struct iphdr)))
++		goto out;
++
++	if (iph->ihl < 5 || iph->version != 4)
++		goto out;
++
++	if (!pskb_may_pull(skb, iph->ihl*4))
++		goto out;
++
++	if (ip_fast_csum((u8 *)iph, iph->ihl) != 0)
++		goto out;
++
++	len = ntohs(iph->tot_len);
++	if (skb->len < len || len < iph->ihl*4)
++		goto out;
++
++	saddr = iph->saddr;
++	daddr = iph->daddr;
++	if (iph->protocol != IPPROTO_UDP)
++		goto out;
++
++	if (source_ip != daddr)
++		goto out;
++
++	if (target_ip != saddr)
++		goto out;
++
++	len -= iph->ihl*4;
++	uh = (struct udphdr *)(((char *)iph) + iph->ihl*4);
++	ulen = ntohs(uh->len);
++
++	if (ulen != len || ulen < (sizeof(*uh) + sizeof(*__req)))
++		goto out;
++
++	if (udp_checksum_init(skb, uh, ulen, saddr, daddr) < 0)
++		goto out;
++
++	if (udp_checksum_complete(skb))
++		goto out;
++
++	if (source_port != uh->dest)
++		goto out;
++
++	if (target_port != uh->source)
++		goto out;
++
++	__req = (req_t *)(uh + 1);
++	if ((ntohl(__req->command) != COMM_GET_MAGIC) &&
++	    (ntohl(__req->command) != COMM_HELLO) &&
++	    (ntohl(__req->command) != COMM_START_WRITE_NETDUMP_ACK) &&
++	    (ntohl(__req->command) != COMM_START_NETDUMP_ACK) &&
++	    (memcmp(&__req->magic, &dump_magic, sizeof(dump_magic)) != 0))
++		goto out;
++
++	req.magic = ntohl(__req->magic);
++	req.command = ntohl(__req->command);
++	req.from = ntohl(__req->from);
++	req.to = ntohl(__req->to);
++	req.nr = ntohl(__req->nr);
++	new_req = 1;
++out:
++	return NET_RX_DROP;
++}
++
++static void
++dump_send_mem(struct net_device *dev, req_t *req, const char* buff, size_t len)
++{
++	int i;
++
++	int nr_chunks = len/1024;
++	reply_t reply;
++	
++	reply.nr = req->nr;
++	reply.info = 0;
++
++        if ( nr_chunks <= 0)
++		 nr_chunks = 1;
++	for (i = 0; i < nr_chunks; i++) {
++		unsigned int offset = i*1024;
++		reply.code = REPLY_MEM;
++		reply.info = offset;
++                dump_send_skb(dev, buff + offset, 1024, &reply);
++	}
++}
++static void dump_do_sysrq(int key)
++{
++        struct pt_regs regs;
++        
++	get_current_regs(&regs);
++	handle_sysrq(key, &regs, NULL, NULL);
++}
++
++/*
++ * This function waits for the client to acknowledge the receipt
++ * of the netdump startup reply, with the possibility of packets
++ * getting lost. We resend the startup packet if no ACK is received,
++ * after a 1 second delay.
++ *
++ * (The client can test the success of the handshake via the HELLO
++ * command, and send ACKs until we enter netdump mode.)
++ */
++static int
++dump_handshake(struct dump_dev *net_dev)
++{
++	char tmp[200];
++	reply_t reply;
++	int i, j;
++
++	if (startup_handshake) {
++		sprintf(tmp, "NETDUMP start, waiting for start-ACK.\n");
++		reply.code = REPLY_START_NETDUMP;
++		reply.nr = 0;
++		reply.info = 0;
++	} else {
++		sprintf(tmp, "NETDUMP start, waiting for start-ACK.\n");
++		reply.code = REPLY_START_WRITE_NETDUMP;
++		reply.nr = net_dev->curr_offset;
++		reply.info = net_dev->curr_offset;
++	}
++	
++	/* send 300 handshake packets before declaring failure */
++	for (i = 0; i < 300; i++) {
++		dump_send_skb(dump_ndev, tmp, strlen(tmp), &reply);
++
++		/* wait 1 sec */
++		for (j = 0; j < 10000; j++) {
++			udelay(100);
++			dump_ndev->poll_controller(dump_ndev);
++			zap_completion_queue();
++			if (new_req)
++				break;
++		}
++
++		/* 
++		 * if there is no new request, try sending the handshaking
++		 * packet again
++		 */
++		if (!new_req)
++			continue;
++
++		/* 
++		 * check if the new request is of the expected type,
++		 * if so, return, else try sending the handshaking
++		 * packet again
++		 */
++		if (startup_handshake) {
++			if (req.command == COMM_HELLO || req.command ==
++				COMM_START_NETDUMP_ACK) {
++				return 0;
++			} else {
++				new_req = 0;
++				continue;
++			}
++		} else {
++			if (req.command == COMM_SEND_MEM) {
++				return 0;
++			} else {
++				new_req = 0;
++				continue;
++			}
++		}
++	}
++	return -1;
++}
++
++static ssize_t
++do_netdump(struct dump_dev *net_dev, const char* buff, size_t len)
++{
++	reply_t reply;
++	char tmp[200];
++	ssize_t  ret = 0;
++	int repeatCounter, counter, total_loop;
++	
++	netdump_in_progress = 1;
++
++	if (dump_handshake(net_dev) < 0) {
++		printk("network dump failed due to handshake failure\n");
++		goto out;
++	}
++
++	/*
++	 * Ideally startup handshake should be done during dump configuration,
++	 * i.e., in dump_net_open(). This will be done when I figure out
++	 * the dependency between startup handshake, subsequent write and
++	 * various commands wrt to net-server.
++	 */
++	if (startup_handshake)
++		startup_handshake = 0;
++
++        counter = 0;
++	repeatCounter = 0;
++	total_loop = 0;
++	while (1) {
++                if (!new_req) {
++			dump_ndev->poll_controller(dump_ndev);
++			zap_completion_queue();
++		}
++		if (!new_req) {
++			repeatCounter++;
++
++			if (repeatCounter > 5) {
++				counter++;
++				if (counter > 10000) {
++					if (total_loop >= 100000) {
++						printk("Time OUT LEAVE NOW\n");
++						goto out;
++					} else {
++						total_loop++;
++						printk("Try number %d out of "
++							"10 before Time Out\n",
++							total_loop);
++					}
++				}
++				mdelay(1);
++				repeatCounter = 0;
++			}	
++			continue;
++		}
++		repeatCounter = 0;
++		counter = 0;
++		total_loop = 0;
++		new_req = 0;
++		switch (req.command) {
++		case COMM_NONE:
++			break;
++
++		case COMM_SEND_MEM:
++			dump_send_mem(dump_ndev, &req, buff, len);
++			break;
++
++		case COMM_EXIT:
++                case COMM_START_WRITE_NETDUMP_ACK:
++			ret = len;
++			goto out;
++
++		case COMM_HELLO:
++			sprintf(tmp, "Hello, this is netdump version "
++					"0.%02d\n", NETCONSOLE_VERSION);
++			reply.code = REPLY_HELLO;
++			reply.nr = req.nr;
++                        reply.info = net_dev->curr_offset;
++			dump_send_skb(dump_ndev, tmp, strlen(tmp), &reply);
++			break;
++
++		case COMM_GET_PAGE_SIZE:
++			sprintf(tmp, "PAGE_SIZE: %ld\n", PAGE_SIZE);
++			reply.code = REPLY_PAGE_SIZE;
++			reply.nr = req.nr;
++			reply.info = PAGE_SIZE;
++			dump_send_skb(dump_ndev, tmp, strlen(tmp), &reply);
++			break;
++
++		case COMM_GET_NR_PAGES:
++			reply.code = REPLY_NR_PAGES;
++			reply.nr = req.nr;
++			reply.info = num_physpages;
++                        reply.info = page_counter;
++			sprintf(tmp, "Number of pages: %ld\n", num_physpages);
++			dump_send_skb(dump_ndev, tmp, strlen(tmp), &reply);
++			break;
++
++		case COMM_GET_MAGIC:
++			reply.code = REPLY_MAGIC;
++			reply.nr = req.nr;
++			reply.info = NETCONSOLE_VERSION;
++			dump_send_skb(dump_ndev, (char *)&dump_magic,
++					sizeof(dump_magic), &reply);
++			break;
++                case COMM_SYSRQ:
++			dump_do_sysrq(req.from);
++			reply.code = REPLY_SYSRQ;
++			reply.nr = req.nr;
++			reply.info = req.from;
++			sprintf(tmp, "SYSRQ command %d \n", req.from);
++			dump_send_skb(dump_ndev, tmp, strlen(tmp), &reply);
++			break;
++		default:
++			reply.code = REPLY_ERROR;
++			reply.nr = req.nr;
++			reply.info = req.command;
++			sprintf(tmp, "Got unknown command code %d!\n",
++					req.command);
++			dump_send_skb(dump_ndev, tmp, strlen(tmp), &reply);
++			break;
++		}
++	}
++out:
++	netdump_in_progress = 0;
++	return ret;
++}
++
++static int
++dump_validate_config(void)
++{
++	source_ip = dump_in_dev->ifa_list->ifa_local;
++	if (!source_ip) {
++		printk("network device %s has no local address, "
++				"aborting.\n", device_name);
++		return -1;
++	}
++
++#define IP(x) ((unsigned char *)&source_ip)[x]
++	printk("Source %d.%d.%d.%d", IP(0), IP(1), IP(2), IP(3));
++#undef IP
++
++	if (!source_port) {
++		printk("source_port parameter not specified, aborting.\n");
++		return -1;
++	}
++	printk(":%i\n", source_port);
++	source_port = htons(source_port);
++
++	if (!target_ip) {
++		printk("target_ip parameter not specified, aborting.\n");
++		return -1;
++	}
++
++#define IP(x) ((unsigned char *)&target_ip)[x]
++	printk("Target %d.%d.%d.%d", IP(0), IP(1), IP(2), IP(3));
++#undef IP
++
++	if (!target_port) {
++		printk("target_port parameter not specified, aborting.\n");
++		return -1;
++	}
++	printk(":%i\n", target_port);
++	target_port = htons(target_port);
++
++	printk("Target Ethernet Address %02x:%02x:%02x:%02x:%02x:%02x",
++		daddr[0], daddr[1], daddr[2], daddr[3], daddr[4], daddr[5]);
++
++	if ((daddr[0] & daddr[1] & daddr[2] & daddr[3] & daddr[4] & 
++				daddr[5]) == 255)
++		printk("(Broadcast)");
++	printk("\n");
++	return 0;
++}
++
++/*
++ * Prepares the dump device so we can take a dump later. 
++ * Validates the netdump configuration parameters.
++ *
++ * TODO: Network connectivity check should be done here.
++ */
++static int
++dump_net_open(struct dump_dev *net_dev, unsigned long arg)
++{
++	int retval = 0;
++
++	/* get the interface name */
++	if (copy_from_user(device_name, (void *)arg, IFNAMSIZ))
++		return -EFAULT;
++
++	if (!(dump_ndev = dev_get_by_name(device_name))) {
++		printk("network device %s does not exist, aborting.\n",
++				device_name);
++		return -ENODEV;
++	}
++
++	if (!dump_ndev->poll_controller) {
++		printk("network device %s does not implement polling yet, "
++				"aborting.\n", device_name);
++		retval = -1; /* return proper error */
++		goto err1;
++	}
++
++	if (!(dump_in_dev = in_dev_get(dump_ndev))) {
++		printk("network device %s is not an IP protocol device, "
++				"aborting.\n", device_name);
++		retval = -EINVAL;
++		goto err1;
++	}
++
++	if ((retval = dump_validate_config()) < 0)
++		goto err2;
++
++	net_dev->curr_offset = 0;
++	printk("Network device %s successfully configured for dumping\n",
++			device_name);
++	return retval;
++err2:
++	in_dev_put(dump_in_dev);
++err1:
++	dev_put(dump_ndev);	
++	return retval;
++}
++
++/*
++ * Close the dump device and release associated resources
++ * Invoked when unconfiguring the dump device.
++ */
++static int
++dump_net_release(struct dump_dev *net_dev)
++{
++	if (dump_in_dev)
++		in_dev_put(dump_in_dev);
++	if (dump_ndev)
++		dev_put(dump_ndev);
++	return 0;
++}
++
++/*
++ * Prepare the dump device for use (silence any ongoing activity
++ * and quiesce state) when the system crashes.
++ */
++static int
++dump_net_silence(struct dump_dev *net_dev)
++{
++	local_irq_save(flags_global);
++	dump_ndev->rx_hook = dump_rx_hook;
++        startup_handshake = 1;
++	net_dev->curr_offset = 0;
++	printk("Dumping to network device %s on CPU %d ...\n", device_name,
++			smp_processor_id());
++	return 0;
++}
++
++/*
++ * Invoked when dumping is done. This is the time to put things back 
++ * (i.e. undo the effects of dump_block_silence) so the device is 
++ * available for normal use.
++ */
++static int
++dump_net_resume(struct dump_dev *net_dev)
++{
++	int indx;
++	reply_t reply;
++	char tmp[200];
++
++        if (!dump_ndev)
++		return (0);
++
++	sprintf(tmp, "NETDUMP end.\n");
++	for( indx = 0; indx < 6; indx++) {
++		reply.code = REPLY_END_NETDUMP;
++		reply.nr = 0;
++		reply.info = 0;
++		dump_send_skb(dump_ndev, tmp, strlen(tmp), &reply);
++	}
++	printk("NETDUMP END!\n");
++	local_irq_restore(flags_global);
++	dump_ndev->rx_hook = NULL;
++	startup_handshake = 0;
++	return 0;
++}
++
++/*
++ * Seek to the specified offset in the dump device.
++ * Makes sure this is a valid offset, otherwise returns an error.
++ */
++static  int
++dump_net_seek(struct dump_dev *net_dev, loff_t off)
++{
++	/*
++	 * For now using DUMP_HEADER_OFFSET as hard coded value,
++	 * See dump_block_seekin dump_blockdev.c to know how to
++	 * do this properly.
++	 */
++	net_dev->curr_offset = off + DUMP_HEADER_OFFSET;
++	return 0;
++}
++
++/*
++ *
++ */
++static int
++dump_net_write(struct dump_dev *net_dev, void *buf, unsigned long len)
++{
++	int cnt, i, off;
++	ssize_t ret;
++
++	cnt = len/ PAGE_SIZE;
++
++	for (i = 0; i < cnt; i++) {
++		off = i* PAGE_SIZE;
++		ret = do_netdump(net_dev, buf+off, PAGE_SIZE);
++		if (ret <= 0)
++			return -1;
++		net_dev->curr_offset = net_dev->curr_offset + PAGE_SIZE;
++	}
++	return len;
++}
++
++/*
++ * check if the last dump i/o is over and ready for next request
++ */
++static int
++dump_net_ready(struct dump_dev *net_dev, void *buf)
++{
++	return 0;
++}
++
++/*
++ * ioctl function used for configuring network dump
++ */
++static int
++dump_net_ioctl(struct dump_dev *net_dev, unsigned int cmd, unsigned long arg)
++{
++	switch (cmd) {
++	case DIOSTARGETIP:
++		target_ip = arg;
++		break;
++	case DIOSTARGETPORT:
++		target_port = (u16)arg;
++		break;
++	case DIOSSOURCEPORT:
++		source_port = (u16)arg;
++		break;
++	case DIOSETHADDR:
++		return copy_from_user(daddr, (void *)arg, 6);
++		break;
++	case DIOGTARGETIP:
++	case DIOGTARGETPORT:
++	case DIOGSOURCEPORT:
++	case DIOGETHADDR:
++		break;
++	default:
++		return -EINVAL;
++	}
++	return 0;
++}
++
++struct dump_dev_ops dump_netdev_ops = {
++	.open 		= dump_net_open,
++	.release	= dump_net_release,
++	.silence	= dump_net_silence,
++	.resume 	= dump_net_resume,
++	.seek		= dump_net_seek,
++	.write		= dump_net_write,
++	/* .read not implemented */
++	.ready		= dump_net_ready,
++	.ioctl		= dump_net_ioctl
++};
++
++static struct dump_dev default_dump_netdev = {
++	.type_name = "networkdev", 
++	.ops = &dump_netdev_ops, 
++	.curr_offset = 0
++};
++
++static int __init
++dump_netdev_init(void)
++{
++        default_dump_netdev.curr_offset = 0;
++
++	if (dump_register_device(&default_dump_netdev) < 0) {
++		printk("network dump device driver registration failed\n");
++		return -1;
++	}
++	printk("network device driver for LKCD registered\n");
++ 
++	get_random_bytes(&dump_magic, sizeof(dump_magic));
++	return 0;
++}
++
++static void __exit
++dump_netdev_cleanup(void)
++{
++	dump_unregister_device(&default_dump_netdev);
++}
++
++MODULE_AUTHOR("LKCD Development Team <lkcd-devel@lists.sourceforge.net>");
++MODULE_DESCRIPTION("Network Dump Driver for Linux Kernel Crash Dump (LKCD)");
++MODULE_LICENSE("GPL");
++
++module_init(dump_netdev_init);
++module_exit(dump_netdev_cleanup);
+Index: linux-2.6.0-test5/drivers/dump/dump_overlay.c
+===================================================================
+--- linux-2.6.0-test5.orig/drivers/dump/dump_overlay.c	2003-09-26 14:26:34.000000000 +0800
++++ linux-2.6.0-test5/drivers/dump/dump_overlay.c	2003-09-26 14:26:34.000000000 +0800
+@@ -0,0 +1,848 @@
++/*
++ * Two-stage soft-boot based dump scheme methods (memory overlay
++ * with post soft-boot writeout)
++ *
++ * Started: Oct 2002 -  Suparna Bhattacharya <suparna@in.ibm.com>
++ *
++ * This approach of saving the dump in memory and writing it 
++ * out after a softboot without clearing memory is derived from the 
++ * Mission Critical Linux dump implementation. Credits and a big
++ * thanks for letting the lkcd project make use of the excellent 
++ * piece of work and also for helping with clarifications and 
++ * tips along the way are due to:
++ * 	Dave Winchell <winchell@mclx.com> (primary author of mcore)
++ * 	and also to
++ * 	Jeff Moyer <moyer@mclx.com>
++ * 	Josh Huber <huber@mclx.com>
++ * 
++ * For those familiar with the mcore implementation, the key 
++ * differences/extensions here are in allowing entire memory to be 
++ * saved (in compressed form) through a careful ordering scheme 
++ * on both the way down as well on the way up after boot, the latter
++ * for supporting the LKCD notion of passes in which most critical 
++ * data is the first to be saved to the dump device. Also the post 
++ * boot writeout happens from within the kernel rather than driven 
++ * from userspace.
++ *
++ * The sequence is orchestrated through the abstraction of "dumpers",
++ * one for the first stage which then sets up the dumper for the next 
++ * stage, providing for a smooth and flexible reuse of the singlestage 
++ * dump scheme methods and a handle to pass dump device configuration 
++ * information across the soft boot. 
++ *
++ * Copyright (C) 2002 International Business Machines Corp. 
++ *
++ * This code is released under version 2 of the GNU GPL.
++ */
++
++/*
++ * Disruptive dumping using the second kernel soft-boot option
++ * for issuing dump i/o operates in 2 stages:
++ * 
++ * (1) - Saves the (compressed & formatted) dump in memory using a 
++ *       carefully ordered overlay scheme designed to capture the 
++ *       entire physical memory or selective portions depending on 
++ *       dump config settings, 
++ *     - Registers the stage 2 dumper and 
++ *     - Issues a soft reboot w/o clearing memory. 
++ *
++ *     The overlay scheme starts with a small bootstrap free area
++ *     and follows a reverse ordering of passes wherein it 
++ *     compresses and saves data starting with the least critical 
++ *     areas first, thus freeing up the corresponding pages to 
++ *     serve as destination for subsequent data to be saved, and
++ *     so on. With a good compression ratio, this makes it feasible
++ *     to capture an entire physical memory dump without significantly
++ *     reducing memory available during regular operation.
++ *
++ * (2) Post soft-reboot, runs through the saved memory dump and
++ *     writes it out to disk, this time around, taking care to
++ *     save the more critical data first (i.e. pages which figure 
++ *     in early passes for a regular dump). Finally issues a 
++ *     clean reboot.
++ *     
++ *     Since the data was saved in memory after selection/filtering
++ *     and formatted as per the chosen output dump format, at this 
++ *     stage the filter and format actions are just dummy (or
++ *     passthrough) actions, except for influence on ordering of
++ *     passes.
++ */
++
++#include <linux/types.h>
++#include <linux/kernel.h>
++#include <linux/highmem.h>
++#include <linux/bootmem.h>
++#include <linux/dump.h>
++#include "dump_methods.h"
++
++extern struct list_head dumper_list_head;
++extern struct dump_memdev *dump_memdev;
++extern struct dumper dumper_stage2;
++struct dump_config_block *dump_saved_config = NULL;
++extern struct dump_blockdev *dump_blockdev;
++static struct dump_memdev *saved_dump_memdev = NULL;
++static struct dumper *saved_dumper = NULL;
++
++/* For testing 
++extern void dump_display_map(struct dump_memdev *);
++*/
++
++struct dumper *dumper_by_name(char *name)
++{
++#ifdef LATER
++	struct dumper *dumper;
++	list_for_each_entry(dumper, &dumper_list_head, dumper_list)
++		if (!strncmp(dumper->name, name, 32))
++			return dumper;
++
++	/* not found */
++	return NULL; 
++#endif
++	/* Temporary proof of concept */
++	if (!strncmp(dumper_stage2.name, name, 32))
++		return &dumper_stage2;
++	else
++		return NULL;
++}
++
++#ifdef CONFIG_CRASH_DUMP_SOFTBOOT
++extern void dump_early_reserve_map(struct dump_memdev *);
++
++void crashdump_reserve(void)
++{
++	extern unsigned long crashdump_addr;
++
++	if (crashdump_addr == 0xdeadbeef) 
++		return;
++
++	/* reserve dump config and saved dump pages */
++	dump_saved_config = (struct dump_config_block *)crashdump_addr;
++	/* magic verification */
++	if (dump_saved_config->magic != DUMP_MAGIC_LIVE) {
++		printk("Invalid dump magic. Ignoring dump\n");
++		dump_saved_config = NULL;
++		return;
++	}
++			
++	printk("Dump may be available from previous boot\n");
++
++	reserve_bootmem(virt_to_phys((void *)crashdump_addr), 
++		PAGE_ALIGN(sizeof(struct dump_config_block)));
++	dump_early_reserve_map(&dump_saved_config->memdev);
++
++}
++#endif
++
++/* 
++ * Loads the dump configuration from a memory block saved across soft-boot
++ * The ops vectors need fixing up as the corresp. routines may have 
++ * relocated in the new soft-booted kernel.
++ */
++int dump_load_config(struct dump_config_block *config)
++{
++	struct dumper *dumper;
++	struct dump_data_filter *filter_table, *filter;
++	struct dump_dev *dev;
++	int i;
++
++	if (config->magic != DUMP_MAGIC_LIVE)
++		return -ENOENT; /* not a valid config */
++
++	/* initialize generic config data */
++	memcpy(&dump_config, &config->config, sizeof(dump_config));
++
++	/* initialize dumper state */
++	if (!(dumper = dumper_by_name(config->dumper.name)))  {
++		printk("dumper name mismatch\n");
++		return -ENOENT; /* dumper mismatch */
++	}
++	
++	/* verify and fixup schema */
++	if (strncmp(dumper->scheme->name, config->scheme.name, 32)) {
++		printk("dumper scheme mismatch\n");
++		return -ENOENT; /* mismatch */
++	}
++	config->scheme.ops = dumper->scheme->ops;
++	config->dumper.scheme = &config->scheme;
++	
++	/* verify and fixup filter operations */
++	filter_table = dumper->filter;
++	for (i = 0, filter = config->filter_table; 
++		((i < MAX_PASSES) && filter_table[i].selector); 
++		i++, filter++) {
++		if (strncmp(filter_table[i].name, filter->name, 32)) {
++			printk("dump filter mismatch\n");
++			return -ENOENT; /* filter name mismatch */
++		}
++		filter->selector = filter_table[i].selector;
++	}
++	config->dumper.filter = config->filter_table;
++
++	/* fixup format */
++	if (strncmp(dumper->fmt->name, config->fmt.name, 32)) {
++		printk("dump format mismatch\n");
++		return -ENOENT; /* mismatch */
++	}
++	config->fmt.ops = dumper->fmt->ops;
++	config->dumper.fmt = &config->fmt;
++
++	/* fixup target device */
++	dev = (struct dump_dev *)(&config->dev[0]);
++	if (dumper->dev == NULL) {
++		pr_debug("Vanilla dumper - assume default\n");
++		if (dump_dev == NULL)
++			return -ENODEV;
++		dumper->dev = dump_dev;
++	}
++
++	if (strncmp(dumper->dev->type_name, dev->type_name, 32)) { 
++		printk("dump dev type mismatch %s instead of %s\n",
++				dev->type_name, dumper->dev->type_name);
++		return -ENOENT; /* mismatch */
++	}
++	dev->ops = dumper->dev->ops; 
++	config->dumper.dev = dev;
++	
++	/* fixup memory device containing saved dump pages */
++	/* assume statically init'ed dump_memdev */
++	config->memdev.ddev.ops = dump_memdev->ddev.ops; 
++	/* switch to memdev from prev boot */
++	saved_dump_memdev = dump_memdev; /* remember current */
++	dump_memdev = &config->memdev;
++
++	/* Make this the current primary dumper */
++	dump_config.dumper = &config->dumper;
++
++	return 0;
++}
++
++/* Saves the dump configuration in a memory block for use across a soft-boot */
++int dump_save_config(struct dump_config_block *config)
++{
++	printk("saving dump config settings\n");
++
++	/* dump config settings */
++	memcpy(&config->config, &dump_config, sizeof(dump_config));
++
++	/* dumper state */
++	memcpy(&config->dumper, dump_config.dumper, sizeof(struct dumper));
++	memcpy(&config->scheme, dump_config.dumper->scheme, 
++		sizeof(struct dump_scheme));
++	memcpy(&config->fmt, dump_config.dumper->fmt, sizeof(struct dump_fmt));
++	memcpy(&config->dev[0], dump_config.dumper->dev, 
++		sizeof(struct dump_anydev));
++	memcpy(&config->filter_table, dump_config.dumper->filter, 
++		sizeof(struct dump_data_filter)*MAX_PASSES);
++
++	/* handle to saved mem pages */
++	memcpy(&config->memdev, dump_memdev, sizeof(struct dump_memdev));
++
++	config->magic = DUMP_MAGIC_LIVE;
++	
++	return 0;
++}
++
++int dump_init_stage2(struct dump_config_block *saved_config)
++{
++	int err = 0;
++
++	pr_debug("dump_init_stage2\n");
++	/* Check if dump from previous boot exists */
++	if (saved_config) {
++		printk("loading dumper from previous boot \n");
++		/* load and configure dumper from previous boot */
++		if ((err = dump_load_config(saved_config)))
++			return err;
++
++		if (!dump_oncpu) {
++			if ((err = dump_configure(dump_config.dump_device))) {
++				printk("Stage 2 dump configure failed\n");
++				return err;
++			}
++		}
++
++		dumper_reset();
++		dump_dev = dump_config.dumper->dev;
++		/* write out the dump */
++		err = dump_generic_execute(NULL, NULL);
++		
++		dump_saved_config = NULL;
++
++		if (!dump_oncpu) {
++			dump_unconfigure(); 
++		}
++		
++		return err;
++
++	} else {
++		/* no dump to write out */
++		printk("no dumper from previous boot \n");
++		return 0;
++	}
++}
++
++extern void dump_mem_markpages(struct dump_memdev *);
++
++int dump_switchover_stage(void)
++{
++	int ret = 0;
++
++	/* trigger stage 2 rightaway - in real life would be after soft-boot */
++	/* dump_saved_config would be a boot param */
++	saved_dump_memdev = dump_memdev;
++	saved_dumper = dump_config.dumper;
++	ret = dump_init_stage2(dump_saved_config);
++	dump_memdev = saved_dump_memdev;
++	dump_config.dumper = saved_dumper;
++	return ret;
++}
++
++int dump_activate_softboot(void) 
++{
++	int err = 0;
++
++	/* temporary - switchover to writeout previously saved dump */
++	err = dump_switchover_stage(); /* non-disruptive case */
++	if (dump_oncpu) 
++		dump_config.dumper = &dumper_stage1; /* set things back */
++
++	return err;
++
++	dump_silence_level = DUMP_HALT_CPUS;
++	/* wait till we become the only cpu */
++	/* maybe by checking for online cpus ? */
++
++	/* now call into kexec */
++
++	/* TBD/Fixme: 
++	 * should we call reboot notifiers ? inappropriate for panic ?  
++	 * what about device_shutdown() ? 
++	 * is explicit bus master disabling needed or can we do that
++	 * through driverfs ? 
++	 */
++	return 0;
++}
++
++/* --- DUMP SCHEME ROUTINES  --- */
++
++static inline int dump_buf_pending(struct dumper *dumper)
++{
++	return (dumper->curr_buf - dumper->dump_buf);
++}
++
++/* Invoked during stage 1 of soft-reboot based dumping */
++int dump_overlay_sequencer(void)
++{
++	struct dump_data_filter *filter = dump_config.dumper->filter;
++	struct dump_data_filter *filter2 = dumper_stage2.filter;
++	int pass = 0, err = 0, save = 0;
++	int (*action)(unsigned long, unsigned long);
++
++	/* Make sure gzip compression is being used */
++	if (dump_config.dumper->compress->compress_type != DUMP_COMPRESS_GZIP) {
++		printk(" Please set GZIP compression \n");
++		return -EINVAL;
++	}
++
++	/* start filling in dump data right after the header */
++	dump_config.dumper->curr_offset = 
++		PAGE_ALIGN(dump_config.dumper->header_len);
++
++	/* Locate the last pass */
++	for (;filter->selector; filter++, pass++);
++	
++	/* 
++	 * Start from the end backwards: overlay involves a reverse 
++	 * ordering of passes, since less critical pages are more
++	 * likely to be reusable as scratch space once we are through
++	 * with them. 
++	 */
++	for (--pass, --filter; pass >= 0; pass--, filter--)
++	{
++		/* Assumes passes are exclusive (even across dumpers) */
++		/* Requires care when coding the selection functions */
++		if ((save = filter->level_mask & dump_config.level))
++			action = dump_save_data;
++		else
++			action = dump_skip_data;
++
++		/* Remember the offset where this pass started */
++		/* The second stage dumper would use this */
++		if (dump_buf_pending(dump_config.dumper) & (PAGE_SIZE - 1)) {
++			pr_debug("Starting pass %d with pending data\n", pass);
++			pr_debug("filling dummy data to page-align it\n");
++			dump_config.dumper->curr_buf = (void *)PAGE_ALIGN(
++				(unsigned long)dump_config.dumper->curr_buf);
++		}
++		
++		filter2[pass].start = dump_config.dumper->curr_offset
++			+ dump_buf_pending(dump_config.dumper);
++
++		err = dump_iterator(pass, action, filter);
++
++		filter2[pass].end = dump_config.dumper->curr_offset
++			+ dump_buf_pending(dump_config.dumper);
++
++		if (err < 0) {
++			printk("dump_overlay_seq: failure %d in pass %d\n", 
++				err, pass);
++			break;
++		}	
++		printk("\n %d overlay pages %s of %d each in pass %d\n", 
++		err, save ? "saved" : "skipped", DUMP_PAGE_SIZE, pass);
++	}
++
++	return err;
++}
++
++/* from dump_memdev.c */
++extern struct page *dump_mem_lookup(struct dump_memdev *dev, unsigned long loc);
++extern struct page *dump_mem_next_page(struct dump_memdev *dev);
++
++static inline struct page *dump_get_saved_page(loff_t loc)
++{
++	return (dump_mem_lookup(dump_memdev, loc >> PAGE_SHIFT));
++}
++
++static inline struct page *dump_next_saved_page(void)
++{
++	return (dump_mem_next_page(dump_memdev));
++}
++
++/* 
++ * Iterates over list of saved dump pages. Invoked during second stage of 
++ * soft boot dumping
++ *
++ * Observation: If additional selection is desired at this stage then
++ * a different iterator could be written which would advance 
++ * to the next page header everytime instead of blindly picking up
++ * the data. In such a case loc would be interpreted differently. 
++ * At this moment however a blind pass seems sufficient, cleaner and
++ * faster.
++ */
++int dump_saved_data_iterator(int pass, int (*action)(unsigned long, 
++	unsigned long), struct dump_data_filter *filter)
++{
++	loff_t loc = filter->start;
++	struct page *page;
++	unsigned long count = 0;
++	int err = 0;
++	unsigned long sz;
++
++	printk("pass %d, start off 0x%llx end offset 0x%llx\n", pass,
++			filter->start, filter->end);
++
++	/* loc will get treated as logical offset into stage 1 */
++	page = dump_get_saved_page(loc);
++			
++	for (; loc < filter->end; loc += PAGE_SIZE) {
++		dump_config.dumper->curr_loc = loc;
++		if (!page) {
++			printk("no more saved data for pass %d\n", pass);
++			break;
++		}
++		sz = (loc + PAGE_SIZE > filter->end) ? filter->end - loc :
++			PAGE_SIZE;
++
++		if (page && filter->selector(pass, (unsigned long)page, 
++			PAGE_SIZE))  {
++			pr_debug("mem offset 0x%llx\n", loc);
++			if ((err = action((unsigned long)page, sz))) 
++				break;
++			else
++				count++;
++			/* clear the contents of page */
++			/* fixme: consider using KM_DUMP instead */
++			clear_highpage(page);
++			
++		}
++		page = dump_next_saved_page();
++	}
++
++	return err ? err : count;
++}
++
++static inline int dump_overlay_pages_done(struct page *page, int nr)
++{
++	int ret=0;
++
++	for (; nr ; page++, nr--) {
++		if (dump_check_and_free_page(dump_memdev, page))
++			ret++;
++	}
++	return ret;
++}
++
++int dump_overlay_save_data(unsigned long loc, unsigned long len)
++{
++	int err = 0;
++	struct page *page = (struct page *)loc;
++	static unsigned long cnt = 0;
++
++	if ((err = dump_generic_save_data(loc, len)))
++		return err;
++
++	if (dump_overlay_pages_done(page, len >> PAGE_SHIFT)) {
++		cnt++;
++		if (!(cnt & 0x7f))
++			pr_debug("released page 0x%lx\n", page_to_pfn(page));
++	}
++	
++	return err;
++}
++
++
++int dump_overlay_skip_data(unsigned long loc, unsigned long len)
++{
++	struct page *page = (struct page *)loc;
++
++	dump_overlay_pages_done(page, len >> PAGE_SHIFT);
++	return 0;
++}
++
++int dump_overlay_resume(void)
++{
++	int err = 0;
++
++	/* 
++	 * switch to stage 2 dumper, save dump_config_block
++	 * and then trigger a soft-boot
++	 */
++	dumper_stage2.header_len = dump_config.dumper->header_len;
++	dump_config.dumper = &dumper_stage2;
++	if ((err = dump_save_config(dump_saved_config)))
++		return err;
++
++	dump_dev = dump_config.dumper->dev;
++
++	return err;
++	err = dump_switchover_stage();  /* plugs into soft boot mechanism */
++	dump_config.dumper = &dumper_stage1; /* set things back */
++	return err;
++}
++
++int dump_overlay_configure(unsigned long devid)
++{
++	struct dump_dev *dev;
++	struct dump_config_block *saved_config = dump_saved_config;
++	int err = 0;
++
++	/* If there is a previously saved dump, write it out first */
++	if (saved_config) {
++		printk("Processing old dump pending writeout\n");
++		err = dump_switchover_stage();
++		if (err) {
++			printk("failed to writeout saved dump\n");
++			return err;
++		}
++		dump_free_mem(saved_config); /* testing only: not after boot */
++	}
++
++	dev = dumper_stage2.dev = dump_config.dumper->dev;
++	/* From here on the intermediate dump target is memory-only */
++	dump_dev = dump_config.dumper->dev = &dump_memdev->ddev;
++	if ((err = dump_generic_configure(0))) {
++		printk("dump generic configure failed: err %d\n", err);
++		return err;
++	}
++	/* temporary */
++	dumper_stage2.dump_buf = dump_config.dumper->dump_buf;
++
++	/* Sanity check on the actual target dump device */
++	if (!dev || (err = dev->ops->open(dev, devid))) {
++		return err;
++	}
++	/* TBD: should we release the target if this is soft-boot only ? */
++
++	/* alloc a dump config block area to save across reboot */
++	if (!(dump_saved_config = dump_alloc_mem(sizeof(struct 
++		dump_config_block)))) {
++		printk("dump config block alloc failed\n");
++		/* undo configure */
++		dump_generic_unconfigure();
++		return -ENOMEM;
++	}
++	dump_config.dump_addr = (unsigned long)dump_saved_config;
++	printk("Dump config block of size %d set up at 0x%lx\n", 
++		sizeof(*dump_saved_config), (unsigned long)dump_saved_config);
++	return 0;
++}
++
++int dump_overlay_unconfigure(void)
++{
++	struct dump_dev *dev = dumper_stage2.dev;
++	int err = 0;
++
++	pr_debug("dump_overlay_unconfigure\n");
++	/* Close the secondary device */
++	dev->ops->release(dev); 
++	pr_debug("released secondary device\n");
++
++	err = dump_generic_unconfigure();
++	pr_debug("Unconfigured generic portions\n");
++	dump_free_mem(dump_saved_config);
++	dump_saved_config = NULL;
++	pr_debug("Freed saved config block\n");
++	dump_dev = dump_config.dumper->dev = dumper_stage2.dev;
++
++	printk("Unconfigured overlay dumper\n");
++	return err;
++}
++
++int dump_staged_unconfigure(void)
++{
++	int err = 0;
++	struct dump_config_block *saved_config = dump_saved_config;
++	struct dump_dev *dev;
++
++	pr_debug("dump_staged_unconfigure\n");
++	err = dump_generic_unconfigure();
++
++	/* now check if there is a saved dump waiting to be written out */
++	if (saved_config) {
++		printk("Processing saved dump pending writeout\n");
++		if ((err = dump_switchover_stage())) {
++			printk("Error in commiting saved dump at 0x%lx\n", 
++				(unsigned long)saved_config);
++			printk("Old dump may hog memory\n");
++		} else {
++			dump_free_mem(saved_config);
++			pr_debug("Freed saved config block\n");
++		}
++		dump_saved_config = NULL;
++	} else {
++		dev = &dump_memdev->ddev;
++		dev->ops->release(dev);
++	}
++	printk("Unconfigured second stage dumper\n");
++
++	return 0;
++}
++
++/* ----- PASSTHRU FILTER ROUTINE --------- */
++
++/* transparent - passes everything through */
++int dump_passthru_filter(int pass, unsigned long loc, unsigned long sz)
++{
++	return 1;
++}
++
++/* ----- PASSTRU FORMAT ROUTINES ---- */
++
++
++int dump_passthru_configure_header(const char *panic_str, const struct pt_regs *regs)
++{
++	dump_config.dumper->header_dirty++;
++	return 0;
++}
++
++/* Copies bytes of data from page(s) to the specified buffer */
++int dump_copy_pages(void *buf, struct page *page, unsigned long sz)
++{
++	unsigned long len = 0, bytes;
++	void *addr;
++
++	while (len < sz) {
++		addr = kmap_atomic(page, KM_DUMP);
++		bytes = (sz > len + PAGE_SIZE) ? PAGE_SIZE : sz - len;	
++		memcpy(buf, addr, bytes); 
++		kunmap_atomic(addr, KM_DUMP);
++		buf += bytes;
++		len += bytes;
++		page++;
++	}
++	/* memset(dump_config.dumper->curr_buf, 0x57, len); temporary */
++
++	return sz - len;
++}
++
++int dump_passthru_update_header(void)
++{
++	long len = dump_config.dumper->header_len;
++	struct page *page;
++	void *buf = dump_config.dumper->dump_buf;
++	int err = 0;
++
++	if (!dump_config.dumper->header_dirty)
++		return 0;
++
++	pr_debug("Copying header of size %ld bytes from memory\n", len);
++	if (len > DUMP_BUFFER_SIZE) 
++		return -E2BIG;
++
++	page = dump_mem_lookup(dump_memdev, 0);
++	for (; (len > 0) && page; buf += PAGE_SIZE, len -= PAGE_SIZE) {
++		if ((err = dump_copy_pages(buf, page, PAGE_SIZE)))
++			return err;
++		page = dump_mem_next_page(dump_memdev);
++	}
++	if (len > 0) {
++		printk("Incomplete header saved in mem\n");
++		return -ENOENT;
++	}
++
++	if ((err = dump_dev_seek(0))) {
++		printk("Unable to seek to dump header offset\n");
++		return err;
++	}
++	err = dump_ll_write(dump_config.dumper->dump_buf, 
++		buf - dump_config.dumper->dump_buf);
++	if (err < dump_config.dumper->header_len)
++		return (err < 0) ? err : -ENOSPC;
++
++	dump_config.dumper->header_dirty = 0;
++	return 0;
++}
++
++static loff_t next_dph_offset = 0;
++
++static int dph_valid(struct __dump_page *dph)
++{
++	if ((dph->dp_address & (PAGE_SIZE - 1)) || (dph->dp_flags 
++	      > DUMP_DH_COMPRESSED) || (!dph->dp_flags) ||
++		(dph->dp_size > PAGE_SIZE)) {
++	printk("dp->address = 0x%llx, dp->size = 0x%x, dp->flag = 0x%x\n",
++		dph->dp_address, dph->dp_size, dph->dp_flags);
++		return 0;
++	}
++	return 1;
++}
++
++int dump_verify_lcrash_data(void *buf, unsigned long sz)
++{
++	struct __dump_page *dph;
++
++	/* sanity check for page headers */
++	while (next_dph_offset + sizeof(*dph) < sz) {
++		dph = (struct __dump_page *)(buf + next_dph_offset);
++		if (!dph_valid(dph)) {
++			printk("Invalid page hdr at offset 0x%llx\n",
++				next_dph_offset);
++			return -EINVAL;
++		}
++		next_dph_offset += dph->dp_size + sizeof(*dph);
++	}
++
++	next_dph_offset -= sz;	
++	return 0;
++}
++
++/* 
++ * TBD/Later: Consider avoiding the copy by using a scatter/gather 
++ * vector representation for the dump buffer
++ */
++int dump_passthru_add_data(unsigned long loc, unsigned long sz)
++{
++	struct page *page = (struct page *)loc;
++	void *buf = dump_config.dumper->curr_buf;
++	int err = 0;
++
++	if ((err = dump_copy_pages(buf, page, sz))) {
++		printk("dump_copy_pages failed");
++		return err;
++	}
++
++	if ((err = dump_verify_lcrash_data(buf, sz))) {
++		printk("dump_verify_lcrash_data failed\n");
++		printk("Invalid data for pfn 0x%lx\n", page_to_pfn(page));
++		printk("Page flags 0x%lx\n", page->flags);
++		printk("Page count 0x%x\n", atomic_read(&page->count));
++		return err;
++	}
++
++	dump_config.dumper->curr_buf = buf + sz;
++
++	return 0;
++}
++
++
++/* Stage 1 dumper: Saves compressed dump in memory and soft-boots system */
++
++/* Scheme to overlay saved data in memory for writeout after a soft-boot */
++struct dump_scheme_ops dump_scheme_overlay_ops = {
++	.configure	= dump_overlay_configure,
++	.unconfigure	= dump_overlay_unconfigure,
++	.sequencer	= dump_overlay_sequencer,
++	.iterator	= dump_page_iterator,
++	.save_data	= dump_overlay_save_data,
++	.skip_data	= dump_overlay_skip_data,
++	.write_buffer	= dump_generic_write_buffer
++};
++
++struct dump_scheme dump_scheme_overlay = {
++	.name		= "overlay",
++	.ops		= &dump_scheme_overlay_ops
++};
++
++
++/* Stage 1 must use a good compression scheme - default to gzip */
++extern struct __dump_compress dump_gzip_compression;
++
++struct dumper dumper_stage1 = {
++	.name		= "stage1",
++	.scheme		= &dump_scheme_overlay,
++	.fmt		= &dump_fmt_lcrash,
++	.compress 	= &dump_none_compression, /* needs to be gzip */
++	.filter		= dump_filter_table,
++	.dev		= NULL,
++};		
++
++/* Stage 2 dumper: Activated after softboot to write out saved dump to device */
++
++/* Formatter that transfers data as is (transparent) w/o further conversion */
++struct dump_fmt_ops dump_fmt_passthru_ops = {
++	.configure_header	= dump_passthru_configure_header,
++	.update_header		= dump_passthru_update_header,
++	.save_context		= NULL, /* unused */
++	.add_data		= dump_passthru_add_data,
++	.update_end_marker	= dump_lcrash_update_end_marker
++};
++
++struct dump_fmt dump_fmt_passthru = {
++	.name	= "passthru",
++	.ops	= &dump_fmt_passthru_ops
++};
++
++/* Filter that simply passes along any data within the range (transparent)*/
++/* Note: The start and end ranges in the table are filled in at run-time */
++
++extern int dump_filter_none(int pass, unsigned long loc, unsigned long sz);
++
++struct dump_data_filter dump_passthru_filtertable[MAX_PASSES] = {
++{.name = "passkern", .selector = dump_passthru_filter, 
++	.level_mask = DUMP_MASK_KERN },
++{.name = "passuser", .selector = dump_passthru_filter, 
++	.level_mask = DUMP_MASK_USED },
++{.name = "passunused", .selector = dump_passthru_filter, 
++	.level_mask = DUMP_MASK_UNUSED },
++{.name = "none", .selector = dump_filter_none, 
++	.level_mask = DUMP_MASK_REST }
++};
++
++
++/* Scheme to handle data staged / preserved across a soft-boot */
++struct dump_scheme_ops dump_scheme_staged_ops = {
++	.configure	= dump_generic_configure,
++	.unconfigure	= dump_staged_unconfigure,
++	.sequencer	= dump_generic_sequencer,
++	.iterator	= dump_saved_data_iterator,
++	.save_data	= dump_generic_save_data,
++	.skip_data	= dump_generic_skip_data,
++	.write_buffer	= dump_generic_write_buffer
++};
++
++struct dump_scheme dump_scheme_staged = {
++	.name		= "staged",
++	.ops		= &dump_scheme_staged_ops
++};
++
++/* The stage 2 dumper comprising all these */
++struct dumper dumper_stage2 = {
++	.name		= "stage2",
++	.scheme		= &dump_scheme_staged,
++	.fmt		= &dump_fmt_passthru,
++	.compress 	= &dump_none_compression,
++	.filter		= dump_passthru_filtertable,
++	.dev		= NULL,
++};		
++
+Index: linux-2.6.0-test5/drivers/dump/dump_rle.c
+===================================================================
+--- linux-2.6.0-test5.orig/drivers/dump/dump_rle.c	2003-09-26 14:26:34.000000000 +0800
++++ linux-2.6.0-test5/drivers/dump/dump_rle.c	2003-09-26 14:26:34.000000000 +0800
+@@ -0,0 +1,175 @@
++/*
++ * RLE Compression functions for kernel crash dumps.
++ *
++ * Created by: Matt Robinson (yakker@sourceforge.net)
++ * Copyright 2001 Matt D. Robinson.  All rights reserved.
++ *
++ * This code is released under version 2 of the GNU GPL.
++ */
++
++/* header files */
++#include <linux/config.h>
++#include <linux/module.h>
++#include <linux/sched.h>
++#include <linux/fs.h>
++#include <linux/file.h>
++#include <linux/init.h>
++#include <linux/dump.h>
++
++/*
++ * Name: dump_compress_rle()
++ * Func: Compress a DUMP_PAGE_SIZE (hardware) page down to something more
++ *       reasonable, if possible.  This is the same routine we use in IRIX.
++ */
++static u16
++dump_compress_rle(const u8 *old, u16 oldsize, u8 *new, u16 newsize)
++{
++	u16 ri, wi, count = 0;
++	u_char value = 0, cur_byte;
++
++	/*
++	 * If the block should happen to "compress" to larger than the
++	 * buffer size, allocate a larger one and change cur_buf_size.
++	 */
++
++	wi = ri = 0;
++
++	while (ri < oldsize) {
++		if (!ri) {
++			cur_byte = value = old[ri];
++			count = 0;
++		} else {
++			if (count == 255) {
++				if (wi + 3 > oldsize) {
++					return oldsize;
++				}
++				new[wi++] = 0;
++				new[wi++] = count;
++				new[wi++] = value;
++				value = cur_byte = old[ri];
++				count = 0;
++			} else { 
++				if ((cur_byte = old[ri]) == value) {
++					count++;
++				} else {
++					if (count > 1) {
++						if (wi + 3 > oldsize) {
++							return oldsize;
++						}
++						new[wi++] = 0;
++						new[wi++] = count;
++						new[wi++] = value;
++					} else if (count == 1) {
++						if (value == 0) {
++							if (wi + 3 > oldsize) {
++								return oldsize;
++							}
++							new[wi++] = 0;
++							new[wi++] = 1;
++							new[wi++] = 0;
++						} else {
++							if (wi + 2 > oldsize) {
++								return oldsize;
++							}
++							new[wi++] = value;
++							new[wi++] = value;
++						}
++					} else { /* count == 0 */
++						if (value == 0) {
++							if (wi + 2 > oldsize) {
++								return oldsize;
++							}
++							new[wi++] = value;
++							new[wi++] = value;
++						} else {
++							if (wi + 1 > oldsize) {
++								return oldsize;
++							}
++							new[wi++] = value;
++						}
++					} /* if count > 1 */
++
++					value = cur_byte;
++					count = 0;
++
++				} /* if byte == value */
++
++			} /* if count == 255 */
++
++		} /* if ri == 0 */
++		ri++;
++
++	}
++	if (count > 1) {
++		if (wi + 3 > oldsize) {
++			return oldsize;
++		}
++		new[wi++] = 0;
++		new[wi++] = count;
++		new[wi++] = value;
++	} else if (count == 1) {
++		if (value == 0) {
++			if (wi + 3 > oldsize)
++				return oldsize;
++			new[wi++] = 0;
++			new[wi++] = 1;
++			new[wi++] = 0;
++		} else {
++			if (wi + 2 > oldsize)
++				return oldsize;
++			new[wi++] = value;
++			new[wi++] = value;
++		}
++	} else { /* count == 0 */
++		if (value == 0) {
++			if (wi + 2 > oldsize)
++				return oldsize;
++			new[wi++] = value;
++			new[wi++] = value;
++		} else {
++			if (wi + 1 > oldsize)
++				return oldsize;
++			new[wi++] = value;
++		}
++	} /* if count > 1 */
++
++	value = cur_byte;
++	count = 0;
++	return wi;
++}
++
++/* setup the rle compression functionality */
++static struct __dump_compress dump_rle_compression = {
++	.compress_type = DUMP_COMPRESS_RLE,
++	.compress_func = dump_compress_rle,
++	.compress_name = "RLE",
++};
++
++/*
++ * Name: dump_compress_rle_init()
++ * Func: Initialize rle compression for dumping.
++ */
++static int __init
++dump_compress_rle_init(void)
++{
++	dump_register_compression(&dump_rle_compression);
++	return 0;
++}
++
++/*
++ * Name: dump_compress_rle_cleanup()
++ * Func: Remove rle compression for dumping.
++ */
++static void __exit
++dump_compress_rle_cleanup(void)
++{
++	dump_unregister_compression(DUMP_COMPRESS_RLE);
++}
++
++/* module initialization */
++module_init(dump_compress_rle_init);
++module_exit(dump_compress_rle_cleanup);
++
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("LKCD Development Team <lkcd-devel@lists.sourceforge.net>");
++MODULE_DESCRIPTION("RLE compression module for crash dump driver");
+Index: linux-2.6.0-test5/drivers/dump/dump_scheme.c
+===================================================================
+--- linux-2.6.0-test5.orig/drivers/dump/dump_scheme.c	2003-09-26 14:26:34.000000000 +0800
++++ linux-2.6.0-test5/drivers/dump/dump_scheme.c	2003-09-26 14:26:34.000000000 +0800
+@@ -0,0 +1,357 @@
++/* 
++ * Default single stage dump scheme methods
++ *
++ * Previously a part of dump_base.c
++ *
++ * Started: Oct 2002 -  Suparna Bhattacharya <suparna@in.ibm.com>
++ * 	Split and rewrote LKCD dump scheme to generic dump method 
++ * 	interfaces 
++ * Derived from original code created by
++ * 	Matt Robinson <yakker@sourceforge.net>)
++ *
++ * Contributions from SGI, IBM, HP, MCL, and others.
++ *
++ * Copyright (C) 1999 - 2002 Silicon Graphics, Inc. All rights reserved.
++ * Copyright (C) 2001 - 2002 Matt D. Robinson.  All rights reserved.
++ * Copyright (C) 2002 International Business Machines Corp. 
++ *
++ * This code is released under version 2 of the GNU GPL.
++ */
++
++/*
++ * Implements the default dump scheme, i.e. single-stage gathering and 
++ * saving of dump data directly to the target device, which operates in
++ * a push mode, where the dumping system decides what data it saves
++ * taking into account pre-specified dump config options.
++ *
++ * Aside: The 2-stage dump scheme, where there is a soft-reset between
++ * the gathering and saving phases, also reuses some of these
++ * default routines (see dump_overlay.c) 
++ */ 
++#include <linux/types.h>
++#include <linux/kernel.h>
++#include <linux/mm.h>
++#include <linux/slab.h>
++#include <linux/delay.h>
++#include <linux/reboot.h>
++#include <linux/nmi.h>
++#include <linux/dump.h>
++#include "dump_methods.h"
++
++extern int panic_timeout;  /* time before reboot */
++
++extern void dump_speedo(int);
++
++/* Default sequencer used during single stage dumping */
++/* Also invoked during stage 2 of soft-boot based dumping */
++int dump_generic_sequencer(void)
++{
++	struct dump_data_filter *filter = dump_config.dumper->filter;
++	int pass = 0, err = 0, save = 0;
++	int (*action)(unsigned long, unsigned long);
++
++	/* 
++	 * We want to save the more critical data areas first in 
++	 * case we run out of space, encounter i/o failures, or get
++	 * interrupted otherwise and have to give up midway
++	 * So, run through the passes in increasing order 
++	 */
++	for (;filter->selector; filter++, pass++)
++	{
++		/* Assumes passes are exclusive (even across dumpers) */
++		/* Requires care when coding the selection functions */
++		if ((save = filter->level_mask & dump_config.level))
++			action = dump_save_data;
++		else
++			action = dump_skip_data;
++
++		if ((err = dump_iterator(pass, action, filter)) < 0)
++			break;
++
++		printk("\n %d dump pages %s of %d each in pass %d\n", 
++		err, save ? "saved" : "skipped", DUMP_PAGE_SIZE, pass);
++
++	}
++
++	return (err < 0) ? err : 0;
++}
++
++static inline struct page *dump_get_page(loff_t loc)
++{
++	unsigned long page_index = loc >> PAGE_SHIFT;
++
++	/* todo: complete this  to account for ia64/discontig mem */
++	/* todo: and to check for validity, ram page, no i/o mem etc */
++	/* need to use pfn/physaddr equiv of kern_addr_valid */
++	if (__dump_page_valid(page_index))
++		return pfn_to_page(page_index);
++	else
++		return NULL;
++
++}
++
++/* Default iterator: for singlestage and stage 1 of soft-boot dumping */
++/* Iterates over range of physical memory pages in DUMP_PAGE_SIZE increments */
++int dump_page_iterator(int pass, int (*action)(unsigned long, unsigned long), 
++	struct dump_data_filter *filter)
++{
++	/* Todo : fix unit, type */
++	loff_t loc;
++	int count = 0, err = 0;
++	struct page *page;
++
++	/* Todo: Add membanks code */
++	/* TBD: Check if we need to address DUMP_PAGE_SIZE < PAGE_SIZE */	
++	
++	for (loc = filter->start; loc < filter->end; loc += DUMP_PAGE_SIZE) {
++		dump_config.dumper->curr_loc = loc;
++		page = dump_get_page(loc);
++		if (page && filter->selector(pass, (unsigned long) page, 
++		DUMP_PAGE_SIZE)) {
++			if ((err = action((unsigned long)page, DUMP_PAGE_SIZE)))
++			{
++				printk("dump_page_iterator: err %d for loc "
++				"0x%llx, in pass %d\n", err, loc, pass);
++				break;
++			} else
++				count++;
++		}
++	}
++
++	return err ? err : count;
++}
++
++/* 
++ * Base function that saves the selected block of data in the dump 
++ * Action taken when iterator decides that data needs to be saved 
++ */
++int dump_generic_save_data(unsigned long loc, unsigned long sz)
++{
++	void *buf;
++	void *dump_buf = dump_config.dumper->dump_buf;
++	int left, bytes, ret;
++
++	if ((ret = dump_add_data(loc, sz))) {
++		return ret;
++	}
++	buf = dump_config.dumper->curr_buf;
++
++	/* If we've filled up the buffer write it out */
++	if ((left = buf - dump_buf) >= DUMP_BUFFER_SIZE) {
++		bytes = dump_write_buffer(dump_buf, DUMP_BUFFER_SIZE);
++		if (bytes < DUMP_BUFFER_SIZE) {
++			printk("dump_write_buffer failed %d\n", bytes);
++			return bytes ? -ENOSPC : bytes;
++		}
++
++		left -= bytes;
++		
++		/* -- A few chores to do from time to time -- */
++		dump_config.dumper->count++;
++
++		if (!(dump_config.dumper->count & 0x3f)) {
++			/* Update the header every one in a while */
++			memset((void *)dump_buf, 'b', DUMP_BUFFER_SIZE);
++			if ((ret = dump_update_header()) < 0) {
++				/* issue warning */
++				return ret;
++			}
++			printk(".");
++
++			touch_nmi_watchdog();
++		} else if (!(dump_config.dumper->count & 0x7)) {
++			/* Show progress so the user knows we aren't hung */
++			dump_speedo(dump_config.dumper->count >> 3); 
++		}
++		/* Todo: Touch/Refresh watchdog */
++
++		/* --- Done with periodic chores -- */
++
++		/* 
++		 * extra bit of copying to simplify verification  
++		 * in the second kernel boot based scheme
++		 */
++		memcpy(dump_buf - DUMP_PAGE_SIZE, dump_buf + 
++			DUMP_BUFFER_SIZE - DUMP_PAGE_SIZE, DUMP_PAGE_SIZE);
++
++		/* now adjust the leftover bits back to the top of the page */
++		/* this case would not arise during stage 2 (passthru) */
++		memset(dump_buf, 'z', DUMP_BUFFER_SIZE);
++		if (left) {
++			memcpy(dump_buf, dump_buf + DUMP_BUFFER_SIZE, left);
++		}
++		buf -= DUMP_BUFFER_SIZE;
++		dump_config.dumper->curr_buf = buf;
++	}
++				
++	return 0;
++}
++
++int dump_generic_skip_data(unsigned long loc, unsigned long sz)
++{
++	/* dummy by default */
++	return 0;
++}
++
++/* 
++ * Common low level routine to write a buffer to current dump device 
++ * Expects checks for space etc to have been taken care of by the caller 
++ * Operates serially at the moment for simplicity. 
++ * TBD/Todo: Consider batching for improved throughput
++ */
++int dump_ll_write(void *buf, unsigned long len)
++{
++	long transferred = 0, last_transfer = 0;
++	int ret = 0;
++
++	/* make sure device is ready */
++	while ((ret = dump_dev_ready(NULL)) == -EAGAIN);
++	if  (ret < 0) {
++		printk("dump_dev_ready failed !err %d\n", ret);
++		return ret;
++	}
++
++	while (len) {
++		if ((last_transfer = dump_dev_write(buf, len)) <= 0)  {
++			ret = last_transfer;
++			printk("dump_dev_write failed !err %d\n", 
++			ret);
++			break;
++		}
++		/* wait till complete */
++		while ((ret = dump_dev_ready(buf)) == -EAGAIN)
++			cpu_relax();
++
++		if  (ret < 0) {
++			printk("i/o failed !err %d\n", ret);
++			break;
++		}
++
++		len -= last_transfer;
++		buf += last_transfer;
++		transferred += last_transfer;
++	}
++	return (ret < 0) ? ret : transferred;
++}
++
++/* default writeout routine for single dump device */
++/* writes out the dump data ensuring enough space is left for the end marker */
++int dump_generic_write_buffer(void *buf, unsigned long len)
++{
++	long written = 0;
++	int err = 0;
++
++	/* check for space */
++	if ((err = dump_dev_seek(dump_config.dumper->curr_offset + len + 
++			2*DUMP_BUFFER_SIZE)) < 0) {
++		printk("dump_write_buffer: insuff space after offset 0x%llx\n",
++			dump_config.dumper->curr_offset);
++		return err;
++	}
++	/* alignment check would happen as a side effect of this */
++	if ((err = dump_dev_seek(dump_config.dumper->curr_offset)) < 0)
++		return err; 
++
++	written = dump_ll_write(buf, len);
++
++	/* all or none */
++
++	if (written < len)
++		written = written ? -ENOSPC : written;
++	else
++		dump_config.dumper->curr_offset += len;
++
++	return written;
++}
++
++int dump_generic_configure(unsigned long devid)
++{
++	struct dump_dev *dev = dump_config.dumper->dev;
++	struct dump_data_filter *filter;
++	void *buf;
++	int ret = 0;
++
++	/* Allocate the dump buffer and initialize dumper state */
++	/* Assume that we get aligned addresses */
++	if (!(buf = dump_alloc_mem(DUMP_BUFFER_SIZE + 3 * DUMP_PAGE_SIZE)))
++		return -ENOMEM;
++
++	if ((unsigned long)buf & (PAGE_SIZE - 1)) {
++		/* sanity check for page aligned address */
++		dump_free_mem(buf);
++		return -ENOMEM; /* fixme: better error code */
++	}
++
++	/* Initialize the rest of the fields */
++	dump_config.dumper->dump_buf = buf + DUMP_PAGE_SIZE;
++	dumper_reset();
++
++	/* Open the dump device */
++	if (!dev)
++		return -ENODEV;
++
++	if ((ret = dev->ops->open(dev, devid))) {
++	       return ret;
++	}
++
++	/* Initialise the memory ranges in the dump filter */
++	for (filter = dump_config.dumper->filter ;filter->selector; filter++) {
++		if (!filter->start && !filter->end) {
++			filter->start = 0;
++			filter->end = num_physpages << PAGE_SHIFT;
++		}
++	}
++
++	return 0;
++}
++
++int dump_generic_unconfigure(void)
++{
++	struct dump_dev *dev = dump_config.dumper->dev;
++	void *buf = dump_config.dumper->dump_buf;
++	int ret = 0;
++
++	pr_debug("Generic unconfigure\n");
++	/* Close the dump device */
++	if (dev && (ret = dev->ops->release(dev)))
++		return ret;
++
++	printk("Closed dump device\n");
++	
++	if (buf)
++		dump_free_mem((buf - DUMP_PAGE_SIZE));
++
++	dump_config.dumper->curr_buf = dump_config.dumper->dump_buf = NULL;
++	pr_debug("Released dump buffer\n");
++
++	return 0;
++}
++
++
++/* Set up the default dump scheme */
++
++struct dump_scheme_ops dump_scheme_singlestage_ops = {
++	.configure	= dump_generic_configure,
++	.unconfigure	= dump_generic_unconfigure,
++	.sequencer	= dump_generic_sequencer,
++	.iterator	= dump_page_iterator,
++	.save_data	= dump_generic_save_data,
++	.skip_data	= dump_generic_skip_data,
++	.write_buffer	= dump_generic_write_buffer,
++};
++
++struct dump_scheme dump_scheme_singlestage = {
++	.name		= "single-stage",
++	.ops		= &dump_scheme_singlestage_ops
++};
++
++/* The single stage dumper comprising all these */
++struct dumper dumper_singlestage = {
++	.name		= "single-stage",
++	.scheme		= &dump_scheme_singlestage,
++	.fmt		= &dump_fmt_lcrash,
++	.compress 	= &dump_none_compression,
++	.filter		= dump_filter_table,
++	.dev		= NULL,
++};		
++
+Index: linux-2.6.0-test5/drivers/dump/dump_setup.c
+===================================================================
+--- linux-2.6.0-test5.orig/drivers/dump/dump_setup.c	2003-09-26 14:26:34.000000000 +0800
++++ linux-2.6.0-test5/drivers/dump/dump_setup.c	2003-09-26 14:26:34.000000000 +0800
+@@ -0,0 +1,803 @@
++/*
++ * Standard kernel function entry points for Linux crash dumps.
++ *
++ * Created by: Matt Robinson (yakker@sourceforge.net)
++ * Contributions from SGI, IBM, HP, MCL, and others.
++ *
++ * Copyright (C) 1999 - 2002 Silicon Graphics, Inc. All rights reserved.
++ * Copyright (C) 2000 - 2002 TurboLinux, Inc.  All rights reserved.
++ * Copyright (C) 2001 - 2002 Matt D. Robinson.  All rights reserved.
++ * Copyright (C) 2002 Free Software Foundation, Inc. All rights reserved.
++ *
++ * This code is released under version 2 of the GNU GPL.
++ */
++
++/*
++ * -----------------------------------------------------------------------
++ *
++ * DUMP HISTORY
++ *
++ * This dump code goes back to SGI's first attempts at dumping system
++ * memory on SGI systems running IRIX.  A few developers at SGI needed
++ * a way to take this system dump and analyze it, and created 'icrash',
++ * or IRIX Crash.  The mechanism (the dumps and 'icrash') were used
++ * by support people to generate crash reports when a system failure
++ * occurred.  This was vital for large system configurations that
++ * couldn't apply patch after patch after fix just to hope that the
++ * problems would go away.  So the system memory, along with the crash
++ * dump analyzer, allowed support people to quickly figure out what the
++ * problem was on the system with the crash dump.
++ *
++ * In comes Linux.  SGI started moving towards the open source community,
++ * and upon doing so, SGI wanted to take its support utilities into Linux
++ * with the hopes that they would end up the in kernel and user space to
++ * be used by SGI's customers buying SGI Linux systems.  One of the first
++ * few products to be open sourced by SGI was LKCD, or Linux Kernel Crash
++ * Dumps.  LKCD comprises of a patch to the kernel to enable system
++ * dumping, along with 'lcrash', or Linux Crash, to analyze the system
++ * memory dump.  A few additional system scripts and kernel modifications
++ * are also included to make the dump mechanism and dump data easier to
++ * process and use.
++ *
++ * As soon as LKCD was released into the open source community, a number
++ * of larger companies started to take advantage of it.  Today, there are
++ * many community members that contribute to LKCD, and it continues to
++ * flourish and grow as an open source project.
++ */
++
++/*
++ * DUMP TUNABLES
++ *
++ * This is the list of system tunables (via /proc) that are available
++ * for Linux systems.  All the read, write, etc., functions are listed
++ * here.  Currently, there are a few different tunables for dumps:
++ *
++ * dump_device (used to be dumpdev):
++ *     The device for dumping the memory pages out to.  This 
++ *     may be set to the primary swap partition for disruptive dumps,
++ *     and must be an unused partition for non-disruptive dumps.
++ *     Todo: In the case of network dumps, this may be interpreted 
++ *     as the IP address of the netdump server to connect to.
++ *
++ * dump_compress (used to be dump_compress_pages):
++ *     This is the flag which indicates which compression mechanism
++ *     to use.  This is a BITMASK, not an index (0,1,2,4,8,16,etc.).
++ *     This is the current set of values:
++ *
++ *     0: DUMP_COMPRESS_NONE -- Don't compress any pages.
++ *     1: DUMP_COMPRESS_RLE  -- This uses RLE compression.
++ *     2: DUMP_COMPRESS_GZIP -- This uses GZIP compression.
++ *
++ * dump_level:
++ *     The amount of effort the dump module should make to save
++ *     information for post crash analysis.  This value is now
++ *     a BITMASK value, not an index:
++ *
++ *     0:   Do nothing, no dumping. (DUMP_LEVEL_NONE)
++ *
++ *     1:   Print out the dump information to the dump header, and
++ *          write it out to the dump_device. (DUMP_LEVEL_HEADER)
++ *
++ *     2:   Write out the dump header and all kernel memory pages.
++ *          (DUMP_LEVEL_KERN)
++ *
++ *     4:   Write out the dump header and all kernel and user
++ *          memory pages.  (DUMP_LEVEL_USED)
++ *
++ *     8:   Write out the dump header and all conventional/cached 
++ *	    memory (RAM) pages in the system (kernel, user, free).  
++ *	    (DUMP_LEVEL_ALL_RAM)
++ *
++ *    16:   Write out everything, including non-conventional memory
++ *	    like firmware, proms, I/O registers, uncached memory.
++ *	    (DUMP_LEVEL_ALL)
++ *
++ *     The dump_level will default to 1.
++ *
++ * dump_flags:
++ *     These are the flags to use when talking about dumps.  There
++ *     are lots of possibilities.  This is a BITMASK value, not an index.
++ * 
++ * -----------------------------------------------------------------------
++ */
++
++#include <linux/kernel.h>
++#include <linux/delay.h>
++#include <linux/reboot.h>
++#include <linux/fs.h>
++#include <linux/dump.h>
++#include "dump_methods.h"
++#include <linux/proc_fs.h>
++#include <linux/module.h>
++#include <linux/utsname.h>
++#include <linux/highmem.h>
++#include <linux/major.h>
++#include <linux/sysrq.h>
++#include <linux/sysctl.h>
++#include <linux/nmi.h>
++
++#include <asm/hardirq.h>
++#include <asm/uaccess.h>
++
++/*
++ * -----------------------------------------------------------------------
++ *                         V A R I A B L E S
++ * -----------------------------------------------------------------------
++ */
++
++/* Dump tunables */
++struct dump_config dump_config = {
++	.level 		= 0,
++	.flags 		= 0,
++	.dump_device	= 0,
++	.dump_addr	= 0,
++	.dumper 	= NULL
++};
++
++
++/* Global variables used in dump.h */
++/* degree of system freeze when dumping */
++enum dump_silence_levels dump_silence_level = DUMP_HARD_SPIN_CPUS;	 
++
++/* Other global fields */
++extern struct __dump_header dump_header; 
++struct dump_dev *dump_dev = NULL;  /* Active dump device                   */
++static int dump_compress = 0;
++
++static u16 dump_compress_none(const u8 *old, u16 oldsize, u8 *new, u16 newsize);
++struct __dump_compress dump_none_compression = {
++	.compress_type	= DUMP_COMPRESS_NONE,
++	.compress_func	= dump_compress_none,
++	.compress_name  = "none",
++};
++
++/* our device operations and functions */
++static int dump_ioctl(struct inode *i, struct file *f,
++	unsigned int cmd, unsigned long arg);
++
++static struct file_operations dump_fops = {
++	.ioctl		=	dump_ioctl,
++};
++
++/* static variables							*/
++static int dump_okay = 0;		/* can we dump out to disk?	*/
++static spinlock_t dump_lock = SPIN_LOCK_UNLOCKED;
++
++/* used for dump compressors */
++static struct list_head dump_compress_list = LIST_HEAD_INIT(dump_compress_list);
++
++/* list of registered dump targets */
++static struct list_head dump_target_list = LIST_HEAD_INIT(dump_target_list);
++
++/* lkcd info structure -- this is used by lcrash for basic system data     */
++struct __lkcdinfo lkcdinfo = {
++	.ptrsz		= (sizeof(void *) * 8),
++#if defined(__LITTLE_ENDIAN) 
++	.byte_order	= __LITTLE_ENDIAN,
++#else
++	.byte_order	= __BIG_ENDIAN,
++#endif
++	.page_shift	= PAGE_SHIFT,
++	.page_size	= PAGE_SIZE,
++	.page_mask	= PAGE_MASK,
++	.page_offset	= PAGE_OFFSET,
++};
++
++/*
++ * -----------------------------------------------------------------------
++ *            / P R O C   T U N A B L E   F U N C T I O N S
++ * -----------------------------------------------------------------------
++ */
++
++static int proc_dump_device(ctl_table *ctl, int write, struct file *f,
++			    void *buffer, size_t *lenp);
++
++static int proc_doulonghex(ctl_table *ctl, int write, struct file *f,
++			    void *buffer, size_t *lenp);
++/*
++ * sysctl-tuning infrastructure.
++ */
++static ctl_table dump_table[] = {
++	{ .ctl_name = CTL_DUMP_LEVEL,
++	  .procname = DUMP_LEVEL_NAME, 
++	  .data = &dump_config.level, 	 
++	  .maxlen = sizeof(int),
++	  .mode = 0644,
++	  .proc_handler = proc_doulonghex, },
++
++	{ .ctl_name = CTL_DUMP_FLAGS,
++	  .procname = DUMP_FLAGS_NAME,
++	  .data = &dump_config.flags,	
++	  .maxlen = sizeof(int),
++	  .mode = 0644,
++	  .proc_handler = proc_doulonghex, },
++
++	{ .ctl_name = CTL_DUMP_COMPRESS,
++	  .procname = DUMP_COMPRESS_NAME,
++	  .data = &dump_compress, /* FIXME */
++	  .maxlen = sizeof(int),
++	  .mode = 0644,
++	  .proc_handler = proc_dointvec, },
++	  
++	{ .ctl_name = CTL_DUMP_DEVICE,
++	  .procname = DUMP_DEVICE_NAME,
++	  .mode = 0644,
++	  .data = &dump_config.dump_device, /* FIXME */
++	  .maxlen = sizeof(int),
++	  .proc_handler = proc_dump_device },
++
++#ifdef CONFIG_CRASH_DUMP_MEMDEV
++	{ .ctl_name = CTL_DUMP_ADDR,
++	  .procname = DUMP_ADDR_NAME,
++	  .mode = 0444,
++	  .data = &dump_config.dump_addr,
++	  .maxlen = sizeof(unsigned long),
++	  .proc_handler = proc_doulonghex },
++#endif
++
++	{ 0, }
++};
++
++static ctl_table dump_root[] = {
++	{ .ctl_name = KERN_DUMP,
++	  .procname = "dump",
++	  .mode = 0555, 
++	  .child = dump_table },
++	{ 0, }
++};
++
++static ctl_table kernel_root[] = {
++	{ .ctl_name = CTL_KERN,
++	  .procname = "kernel",
++	  .mode = 0555,
++	  .child = dump_root, },
++	{ 0, }
++};
++
++static struct ctl_table_header *sysctl_header;
++
++/*
++ * -----------------------------------------------------------------------
++ *              C O M P R E S S I O N   F U N C T I O N S
++ * -----------------------------------------------------------------------
++ */
++
++/*
++ * Name: dump_compress_none()
++ * Func: Don't do any compression, period.
++ */
++static u16
++dump_compress_none(const u8 *old, u16 oldsize, u8 *new, u16 newsize)
++{
++	/* just return the old size */
++	return oldsize;
++}
++
++
++/*
++ * Name: dump_execute()
++ * Func: Execute the dumping process.  This makes sure all the appropriate
++ *       fields are updated correctly, and calls dump_execute_memdump(),
++ *       which does the real work.
++ */
++void
++dump_execute(const char *panic_str, const struct pt_regs *regs)
++{
++	int state = -1;
++	unsigned long flags;
++
++	/* make sure we can dump */
++	if (!dump_okay) {
++		pr_info("LKCD not yet configured, can't take dump now\n");
++		return;
++	}
++
++	/* Exclude multiple dumps at the same time,
++	 * and disable interrupts,  some drivers may re-enable
++	 * interrupts in with silence()
++	 *
++	 * Try and acquire spin lock. If successful, leave preempt
++	 * and interrupts disabled.  See spin_lock_irqsave in spinlock.h
++	 */
++	local_irq_save(flags);
++	if (!spin_trylock(&dump_lock)) {
++		local_irq_restore(flags);
++		pr_info("LKCD dump already in progress\n");
++		return;
++	}
++
++	/* Bring system into the strictest level of quiescing for min drift 
++	 * dump drivers can soften this as required in dev->ops->silence() 
++	 */
++	dump_oncpu = smp_processor_id() + 1;
++	dump_silence_level = DUMP_HARD_SPIN_CPUS; 
++
++	state = dump_generic_execute(panic_str, regs);
++	
++	dump_oncpu = 0;
++	spin_unlock_irqrestore(&dump_lock, flags);
++
++	if (state < 0) {
++		printk("Dump Incomplete or failed!\n");
++	} else {
++		printk("Dump Complete; %d dump pages saved.\n", 
++		       dump_header.dh_num_dump_pages);
++	}
++}
++
++/*
++ * Name: dump_register_compression()
++ * Func: Register a dump compression mechanism.
++ */
++void
++dump_register_compression(struct __dump_compress *item)
++{
++	if (item)
++		list_add(&(item->list), &dump_compress_list);
++}
++
++/*
++ * Name: dump_unregister_compression()
++ * Func: Remove a dump compression mechanism, and re-assign the dump
++ *       compression pointer if necessary.
++ */
++void
++dump_unregister_compression(int compression_type)
++{
++	struct list_head *tmp;
++	struct __dump_compress *dc;
++
++	/* let's make sure our list is valid */
++	if (compression_type != DUMP_COMPRESS_NONE) {
++		list_for_each(tmp, &dump_compress_list) {
++			dc = list_entry(tmp, struct __dump_compress, list);
++			if (dc->compress_type == compression_type) {
++				list_del(&(dc->list));
++				break;
++			}
++		}
++	}
++}
++
++/*
++ * Name: dump_compress_init()
++ * Func: Initialize (or re-initialize) compression scheme.
++ */
++static int
++dump_compress_init(int compression_type)
++{
++	struct list_head *tmp;
++	struct __dump_compress *dc;
++
++	/* try to remove the compression item */
++	list_for_each(tmp, &dump_compress_list) {
++		dc = list_entry(tmp, struct __dump_compress, list);
++		if (dc->compress_type == compression_type) {
++			dump_config.dumper->compress = dc;
++			dump_compress = compression_type;
++ 			pr_debug("Dump Compress %s\n", dc->compress_name);
++			return 0;
++		}
++	}
++
++	/* 
++	 * nothing on the list -- return ENODATA to indicate an error 
++	 *
++	 * NB: 
++	 *	EAGAIN: reports "Resource temporarily unavailable" which
++	 *		isn't very enlightening.
++	 */
++	printk("compression_type:%d not found\n", compression_type);
++
++	return -ENODATA;
++}
++
++static int
++dumper_setup(unsigned long flags, unsigned long devid)
++{
++	int ret = 0;
++
++	/* unconfigure old dumper if it exists */
++	dump_okay = 0;
++	if (dump_config.dumper) {
++		pr_debug("Unconfiguring current dumper\n");
++		dump_unconfigure();
++	}
++	/* set up new dumper */
++	if (dump_config.flags & DUMP_FLAGS_SOFTBOOT) {
++		printk("Configuring softboot based dump \n");
++#ifdef CONFIG_CRASH_DUMP_MEMDEV
++		dump_config.dumper = &dumper_stage1; 
++#else
++		printk("Requires CONFIG_CRASHDUMP_MEMDEV. Can't proceed.\n");
++		return -1;
++#endif
++	} else {
++		dump_config.dumper = &dumper_singlestage;
++	}	
++	dump_config.dumper->dev = dump_dev;
++
++	ret = dump_configure(devid);
++	if (!ret) {
++		dump_okay = 1;
++		pr_debug("%s dumper set up for dev 0x%lx\n", 
++			dump_config.dumper->name, devid);
++ 		dump_config.dump_device = devid;
++	} else {
++		printk("%s dumper set up failed for dev 0x%lx\n", 
++		       dump_config.dumper->name, devid);
++ 		dump_config.dumper = NULL;
++	}
++	return ret;
++}
++
++static int
++dump_target_init(int target)
++{
++	char type[20];
++	struct list_head *tmp;
++	struct dump_dev *dev;
++	
++	switch (target) {
++		case DUMP_FLAGS_DISKDUMP:
++			strcpy(type, "blockdev"); break;
++		case DUMP_FLAGS_NETDUMP:
++			strcpy(type, "networkdev"); break;
++		default:
++			return -1;
++	}
++
++	/*
++	 * This is a bit stupid, generating strings from flag
++	 * and doing strcmp. This is done because 'struct dump_dev'
++	 * has string 'type_name' and not interger 'type'.
++	 */
++	list_for_each(tmp, &dump_target_list) {
++		dev = list_entry(tmp, struct dump_dev, list);
++		if (strcmp(type, dev->type_name) == 0) {
++			dump_dev = dev;
++			return 0;
++		}
++	}
++	return -1;
++}
++
++/*
++ * Name: dump_ioctl()
++ * Func: Allow all dump tunables through a standard ioctl() mechanism.
++ *       This is far better than before, where we'd go through /proc,
++ *       because now this will work for multiple OS and architectures.
++ */
++static int
++dump_ioctl(struct inode *i, struct file *f, unsigned int cmd, unsigned long arg)
++{
++	/* check capabilities */
++	if (!capable(CAP_SYS_ADMIN))
++		return -EPERM;
++
++	if (!dump_config.dumper && cmd == DIOSDUMPCOMPRESS)
++		/* dump device must be configured first */
++		return -ENODEV;
++
++	/*
++	 * This is the main mechanism for controlling get/set data
++	 * for various dump device parameters.  The real trick here
++	 * is setting the dump device (DIOSDUMPDEV).  That's what
++	 * triggers everything else.
++	 */
++	switch (cmd) {
++	case DIOSDUMPDEV:	/* set dump_device */
++		pr_debug("Configuring dump device\n"); 
++		if (!(f->f_flags & O_RDWR))
++			return -EPERM;
++
++		__dump_open();
++		return dumper_setup(dump_config.flags, arg);
++
++		
++	case DIOGDUMPDEV:	/* get dump_device */
++		return put_user((long)dump_config.dump_device, (long *)arg);
++
++	case DIOSDUMPLEVEL:	/* set dump_level */
++		if (!(f->f_flags & O_RDWR))
++			return -EPERM;
++
++		/* make sure we have a positive value */
++		if (arg < 0)
++			return -EINVAL;
++
++		/* Fixme: clean this up */
++		dump_config.level = 0;
++		switch ((int)arg) {
++			case DUMP_LEVEL_ALL:
++			case DUMP_LEVEL_ALL_RAM:
++				dump_config.level |= DUMP_MASK_UNUSED;
++			case DUMP_LEVEL_USED:
++				dump_config.level |= DUMP_MASK_USED;
++			case DUMP_LEVEL_KERN:
++				dump_config.level |= DUMP_MASK_KERN;
++			case DUMP_LEVEL_HEADER:
++				dump_config.level |= DUMP_MASK_HEADER;
++			case DUMP_LEVEL_NONE:
++				break;
++			default:
++				return (-EINVAL);
++			}
++		pr_debug("Dump Level 0x%lx\n", dump_config.level);
++		break;
++
++	case DIOGDUMPLEVEL:	/* get dump_level */
++		/* fixme: handle conversion */
++		return put_user((long)dump_config.level, (long *)arg);
++
++		
++	case DIOSDUMPFLAGS:	/* set dump_flags */
++		/* check flags */
++		if (!(f->f_flags & O_RDWR))
++			return -EPERM;
++
++		/* make sure we have a positive value */
++		if (arg < 0)
++			return -EINVAL;
++			
++		if (dump_target_init(arg & DUMP_FLAGS_TARGETMASK) < 0)
++			return -EINVAL; /* return proper error */
++
++		dump_config.flags = arg;
++		
++		pr_debug("Dump Flags 0x%lx\n", dump_config.flags);
++		break;
++		
++	case DIOGDUMPFLAGS:	/* get dump_flags */
++		return put_user((long)dump_config.flags, (long *)arg);
++
++	case DIOSDUMPCOMPRESS:	/* set the dump_compress status */
++		if (!(f->f_flags & O_RDWR))
++			return -EPERM;
++
++		return dump_compress_init((int)arg);
++
++	case DIOGDUMPCOMPRESS:	/* get the dump_compress status */
++		return put_user((long)(dump_config.dumper ? 
++			dump_config.dumper->compress->compress_type : 0), 
++			(long *)arg);
++			
++	default:
++		/* 
++		 * these are network dump specific ioctls, let the
++		 * module handle them.
++		 */
++		return dump_dev_ioctl(cmd, arg);
++	}
++	return 0;
++}
++
++/*
++ * Handle special cases for dump_device 
++ * changing dump device requires doing an opening the device
++ */
++static int 
++proc_dump_device(ctl_table *ctl, int write, struct file *f,
++		 void *buffer, size_t *lenp)
++{
++	int *valp = ctl->data;
++	int oval = *valp;
++	int ret = -EPERM;
++
++	/* same permission checks as ioctl */
++	if (capable(CAP_SYS_ADMIN)) {
++		ret = proc_doulonghex(ctl, write, f, buffer, lenp);
++		if (ret == 0 && write && *valp != oval) {
++			/* need to restore old value to close properly */
++			dump_config.dump_device = (dev_t) oval;
++			__dump_open();
++			ret = dumper_setup(dump_config.flags, (dev_t) *valp);
++		}
++	}
++
++	return ret;
++}
++
++/* All for the want of a proc_do_xxx routine which prints values in hex */
++static int 
++proc_doulonghex(ctl_table *ctl, int write, struct file *f,
++		 void *buffer, size_t *lenp)
++{
++#define TMPBUFLEN 20
++	unsigned long *i;
++	size_t len, left;
++	char buf[TMPBUFLEN];
++
++	if (!ctl->data || !ctl->maxlen || !*lenp || (f->f_pos)) {
++		*lenp = 0;
++		return 0;
++	}
++	
++	i = (unsigned long *) ctl->data;
++	left = *lenp;
++	
++	sprintf(buf, "0x%lx\n", (*i));
++	len = strlen(buf);
++	if (len > left)
++		len = left;
++	if(copy_to_user(buffer, buf, len))
++		return -EFAULT;
++	
++	left -= len;
++	*lenp -= left;
++	f->f_pos += *lenp;
++	return 0;
++}
++
++/*
++ * -----------------------------------------------------------------------
++ *                     I N I T   F U N C T I O N S
++ * -----------------------------------------------------------------------
++ */
++
++/*
++ * These register and unregister routines are exported for modules
++ * to register their dump drivers (like block, net etc)
++ */
++int
++dump_register_device(struct dump_dev *ddev)
++{
++	struct list_head *tmp;
++	struct dump_dev *dev;
++
++	list_for_each(tmp, &dump_target_list) {
++		dev = list_entry(tmp, struct dump_dev, list);
++		if (strcmp(ddev->type_name, dev->type_name) == 0) {
++			printk("Target type %s already registered\n",
++					dev->type_name);
++			return -1; /* return proper error */
++		}
++	}
++	list_add(&(ddev->list), &dump_target_list);
++	
++	return 0;
++}
++
++void
++dump_unregister_device(struct dump_dev *ddev)
++{
++	list_del(&(ddev->list));
++	if (ddev != dump_dev)
++		return;
++
++	dump_okay = 0;
++
++	if (dump_config.dumper)
++		dump_unconfigure();
++
++	dump_config.flags &= ~DUMP_FLAGS_TARGETMASK;
++	dump_okay = 0;
++	dump_dev = NULL;
++	dump_config.dumper = NULL;
++}
++
++static int panic_event(struct notifier_block *this, unsigned long event,
++		       void *ptr)
++{
++	struct pt_regs regs;
++
++	get_current_regs(&regs);
++	dump_execute((const char *)ptr, &regs);
++	return 0;
++}
++
++extern struct notifier_block *panic_notifier_list;
++static int panic_event(struct notifier_block *, unsigned long, void *);
++static struct notifier_block panic_block = {
++	.notifier_call = panic_event,
++};
++
++#ifdef CONFIG_MAGIC_SYSRQ
++/* Sysrq handler */
++static void sysrq_handle_crashdump(int key, struct pt_regs *pt_regs,
++		struct tty_struct *tty) {
++	dump_execute("sysrq", pt_regs);
++}
++
++static struct sysrq_key_op sysrq_crashdump_op = {
++	.handler	=	sysrq_handle_crashdump,
++	.help_msg	=	"Dump",
++	.action_msg	=	"Starting crash dump",
++};
++#endif
++
++static inline void
++dump_sysrq_register(void) 
++{
++#ifdef CONFIG_MAGIC_SYSRQ
++	__sysrq_lock_table();
++	__sysrq_put_key_op(DUMP_SYSRQ_KEY, &sysrq_crashdump_op);
++	__sysrq_unlock_table();
++#endif
++}
++
++static inline void
++dump_sysrq_unregister(void)
++{
++#ifdef CONFIG_MAGIC_SYSRQ
++	__sysrq_lock_table();
++	if (__sysrq_get_key_op(DUMP_SYSRQ_KEY) == &sysrq_crashdump_op)
++		__sysrq_put_key_op(DUMP_SYSRQ_KEY, NULL);
++	__sysrq_unlock_table();
++#endif
++}
++
++/*
++ * Name: dump_init()
++ * Func: Initialize the dump process.  This will set up any architecture
++ *       dependent code.  The big key is we need the memory offsets before
++ *       the page table is initialized, because the base memory offset
++ *       is changed after paging_init() is called.
++ */
++static int __init
++dump_init(void)
++{
++	struct sysinfo info;
++
++	/* try to create our dump device */
++	if (register_chrdev(CRASH_DUMP_MAJOR, "dump", &dump_fops)) {
++		printk("cannot register dump character device!\n");
++		return -EBUSY;
++	}
++
++	__dump_init((u64)PAGE_OFFSET);
++
++	/* set the dump_compression_list structure up */
++	dump_register_compression(&dump_none_compression);
++
++	/* grab the total memory size now (not if/when we crash) */
++	si_meminfo(&info);
++
++	/* set the memory size */
++	dump_header.dh_memory_size = (u64)info.totalram;
++
++	sysctl_header = register_sysctl_table(kernel_root, 0);
++	dump_sysrq_register();
++
++	notifier_chain_register(&panic_notifier_list, &panic_block);
++	dump_function_ptr = dump_execute;
++
++	pr_info("Crash dump driver initialized.\n");
++	return 0;
++}
++
++static void __exit
++dump_cleanup(void)
++{
++	dump_okay = 0;
++
++	if (dump_config.dumper)
++		dump_unconfigure();
++
++	/* arch-specific cleanup routine */
++	__dump_cleanup();
++
++	/* ignore errors while unregistering -- since can't do anything */
++	unregister_sysctl_table(sysctl_header);
++	unregister_chrdev(CRASH_DUMP_MAJOR, "dump");
++	dump_sysrq_unregister();
++	notifier_chain_unregister(&panic_notifier_list, &panic_block);
++	dump_function_ptr = NULL;
++}
++
++EXPORT_SYMBOL(dump_register_compression);
++EXPORT_SYMBOL(dump_unregister_compression);
++EXPORT_SYMBOL(dump_register_device);
++EXPORT_SYMBOL(dump_unregister_device);
++EXPORT_SYMBOL(dump_config);
++EXPORT_SYMBOL(dump_silence_level);
++
++EXPORT_SYMBOL(__dump_irq_enable);
++EXPORT_SYMBOL(__dump_irq_restore);
++
++MODULE_AUTHOR("Matt D. Robinson <yakker@sourceforge.net>");
++MODULE_DESCRIPTION("Linux Kernel Crash Dump (LKCD) driver");
++MODULE_LICENSE("GPL");
++
++module_init(dump_init);
++module_exit(dump_cleanup);
+Index: linux-2.6.0-test5/include/linux/dumpdev.h
+===================================================================
+--- linux-2.6.0-test5.orig/include/linux/dumpdev.h	2003-09-26 14:26:34.000000000 +0800
++++ linux-2.6.0-test5/include/linux/dumpdev.h	2003-09-26 14:27:08.000000000 +0800
+@@ -0,0 +1,161 @@
++/*
++ * Generic dump device interfaces for flexible system dump 
++ * (Enables variation of dump target types e.g disk, network, memory)
++ *
++ * These interfaces have evolved based on discussions on lkcd-devel. 
++ * Eventually the intent is to support primary and secondary or 
++ * alternate targets registered at the same time, with scope for 
++ * situation based failover or multiple dump devices used for parallel 
++ * dump i/o.
++ *
++ * Started: Oct 2002 - Suparna Bhattacharya (suparna@in.ibm.com)
++ *
++ * Copyright (C) 2001 - 2002 Matt D. Robinson.  All rights reserved.
++ * Copyright (C) 2002 International Business Machines Corp. 
++ *
++ * This code is released under version 2 of the GNU GPL.
++ */
++
++#ifndef _LINUX_DUMPDEV_H
++#define _LINUX_DUMPDEV_H
++
++#include <linux/kernel.h>
++#include <linux/wait.h>
++#include <linux/bio.h>
++
++/* Determined by the dump target (device) type */
++
++struct dump_dev;
++
++struct dump_dev_ops {
++	int (*open)(struct dump_dev *, unsigned long); /* configure */
++	int (*release)(struct dump_dev *); /* unconfigure */
++	int (*silence)(struct dump_dev *); /* when dump starts */
++	int (*resume)(struct dump_dev *); /* when dump is over */
++	int (*seek)(struct dump_dev *, loff_t);
++	/* trigger a write (async in nature typically) */
++	int (*write)(struct dump_dev *, void *, unsigned long);
++	/* not usually used during dump, but option available */
++	int (*read)(struct dump_dev *, void *, unsigned long);
++	/* use to poll for completion */
++	int (*ready)(struct dump_dev *, void *); 
++	int (*ioctl)(struct dump_dev *, unsigned int, unsigned long);
++};
++
++struct dump_dev {
++	char type_name[32]; /* block, net-poll etc */
++	unsigned long device_id; /* interpreted differently for various types */
++	struct dump_dev_ops *ops;
++	struct list_head list;
++	loff_t curr_offset;
++};
++
++/*
++ * dump_dev type variations: 
++ */
++
++/* block */
++struct dump_blockdev {
++	struct dump_dev ddev;
++	dev_t kdev_id;
++	struct block_device *bdev;
++	struct bio *bio;
++	loff_t start_offset;
++	loff_t limit;
++	int err;
++};
++
++static inline struct dump_blockdev *DUMP_BDEV(struct dump_dev *dev)
++{
++	return container_of(dev, struct dump_blockdev, ddev);
++}
++
++
++/* mem  - for internal use by soft-boot based dumper */
++struct dump_memdev {
++	struct dump_dev ddev;
++	unsigned long indirect_map_root;
++	unsigned long nr_free;
++	struct page *curr_page;
++	unsigned long *curr_map;
++	unsigned long curr_map_offset;
++	unsigned long last_offset;
++	unsigned long last_used_offset;
++	unsigned long last_bs_offset;
++};	
++
++static inline struct dump_memdev *DUMP_MDEV(struct dump_dev *dev)
++{
++	return container_of(dev, struct dump_memdev, ddev);
++}
++
++/* Todo/future - meant for raw dedicated interfaces e.g. mini-ide driver */
++struct dump_rdev {
++	struct dump_dev ddev;
++	char name[32];
++	int (*reset)(struct dump_rdev *, unsigned int, 
++		unsigned long);
++	/* ... to do ... */
++};
++
++/* just to get the size right when saving config across a soft-reboot */
++struct dump_anydev {
++	union {
++		struct dump_blockdev bddev;
++		/* .. add other types here .. */
++	};
++};
++
++
++
++/* Dump device / target operation wrappers */
++/* These assume that dump_dev is initiatized to dump_config.dumper->dev */
++
++extern struct dump_dev *dump_dev;
++
++static inline int dump_dev_open(unsigned long arg)
++{
++	return dump_dev->ops->open(dump_dev, arg);
++}
++
++static inline int dump_dev_release(void)
++{
++	return dump_dev->ops->release(dump_dev);
++}
++
++static inline int dump_dev_silence(void)
++{
++	return dump_dev->ops->silence(dump_dev);
++}
++
++static inline int dump_dev_resume(void)
++{
++	return dump_dev->ops->resume(dump_dev);
++}
++
++static inline int dump_dev_seek(loff_t offset)
++{
++	return dump_dev->ops->seek(dump_dev, offset);
++}
++
++static inline int dump_dev_write(void *buf, unsigned long len)
++{
++	return dump_dev->ops->write(dump_dev, buf, len);
++}
++
++static inline int dump_dev_ready(void *buf)
++{
++	return dump_dev->ops->ready(dump_dev, buf);
++}
++
++static inline int dump_dev_ioctl(unsigned int cmd, unsigned long arg)
++{
++	if (!dump_dev->ops->ioctl)
++		return -EINVAL;
++	return dump_dev->ops->ioctl(dump_dev, cmd, arg);
++}
++
++extern int dump_register_device(struct dump_dev *);
++extern void dump_unregister_device(struct dump_dev *);
++
++#endif /*  _LINUX_DUMPDEV_H */
+Index: linux-2.6.0-test5/include/linux/dump.h
+===================================================================
+--- linux-2.6.0-test5.orig/include/linux/dump.h	2003-09-26 14:26:34.000000000 +0800
++++ linux-2.6.0-test5/include/linux/dump.h	2003-09-26 14:26:34.000000000 +0800
+@@ -0,0 +1,376 @@
++/*
++ * Kernel header file for Linux crash dumps.
++ *
++ * Created by: Matt Robinson (yakker@sgi.com)
++ * Copyright 1999 - 2002 Silicon Graphics, Inc. All rights reserved.
++ *
++ * vmdump.h to dump.h by: Matt D. Robinson (yakker@sourceforge.net)
++ * Copyright 2001 - 2002 Matt D. Robinson.  All rights reserved.
++ * Copyright (C) 2002 Free Software Foundation, Inc. All rights reserved.
++ *
++ * Most of this is the same old stuff from vmdump.h, except now we're
++ * actually a stand-alone driver plugged into the block layer interface,
++ * with the exception that we now allow for compression modes externally
++ * loaded (e.g., someone can come up with their own).
++ *
++ * This code is released under version 2 of the GNU GPL.
++ */
++
++/* This header file includes all structure definitions for crash dumps. */
++#ifndef _DUMP_H
++#define _DUMP_H
++
++#if defined(CONFIG_CRASH_DUMP) || defined (CONFIG_CRASH_DUMP_MODULE)
++
++#include <linux/list.h>
++#include <linux/notifier.h>
++#include <linux/dumpdev.h>
++
++/* 
++ * Predefine default DUMP_PAGE constants, asm header may override.
++ *
++ * On ia64 discontinuous memory systems it's possible for the memory
++ * banks to stop at 2**12 page alignments, the smallest possible page
++ * size. But the system page size, PAGE_SIZE, is in fact larger.
++ */
++#define DUMP_PAGE_SHIFT 	PAGE_SHIFT
++#define DUMP_PAGE_MASK		PAGE_MASK
++#define DUMP_PAGE_ALIGN(addr)	PAGE_ALIGN(addr)
++#define DUMP_HEADER_OFFSET	PAGE_SIZE
++
++/* keep DUMP_PAGE_SIZE constant to 4K = 1<<12
++ * it may be different from PAGE_SIZE then.
++ */
++#define DUMP_PAGE_SIZE		4096
++
++/* 
++ * Predefined default memcpy() to use when copying memory to the dump buffer.
++ *
++ * On ia64 there is a heads up function that can be called to let the prom
++ * machine check monitor know that the current activity is risky and it should
++ * ignore the fault (nofault). In this case the ia64 header will redefine this
++ * macro to __dump_memcpy() and use it's arch specific version.
++ */
++#define DUMP_memcpy		memcpy
++
++/* necessary header files */
++#include <asm/dump.h>			/* for architecture-specific header */
++
++/* 
++ * Size of the buffer that's used to hold:
++ *
++ *	1. the dump header (padded to fill the complete buffer)
++ *	2. the possibly compressed page headers and data
++ */
++#define DUMP_BUFFER_SIZE	(64 * 1024)  /* size of dump buffer         */
++#define DUMP_HEADER_SIZE	DUMP_BUFFER_SIZE
++
++/* standard header definitions */
++#define DUMP_MAGIC_NUMBER	0xa8190173618f23edULL  /* dump magic number */
++#define DUMP_MAGIC_LIVE		0xa8190173618f23cdULL  /* live magic number */
++#define DUMP_VERSION_NUMBER	0x8	/* dump version number              */
++#define DUMP_PANIC_LEN		0x100	/* dump panic string length         */
++
++/* dump levels - type specific stuff added later -- add as necessary */
++#define DUMP_LEVEL_NONE		0x0	/* no dumping at all -- just bail   */
++#define DUMP_LEVEL_HEADER	0x1	/* kernel dump header only          */
++#define DUMP_LEVEL_KERN		0x2	/* dump header and kernel pages     */
++#define DUMP_LEVEL_USED		0x4	/* dump header, kernel/user pages   */
++#define DUMP_LEVEL_ALL_RAM	0x8	/* dump header, all RAM pages       */
++#define DUMP_LEVEL_ALL		0x10	/* dump all memory RAM and firmware */
++
++
++/* dump compression options -- add as necessary */
++#define DUMP_COMPRESS_NONE	0x0	/* don't compress this dump         */
++#define DUMP_COMPRESS_RLE	0x1	/* use RLE compression              */
++#define DUMP_COMPRESS_GZIP	0x2	/* use GZIP compression             */
++
++/* dump flags - any dump-type specific flags -- add as necessary */
++#define DUMP_FLAGS_NONE		0x0	/* no flags are set for this dump   */
++#define DUMP_FLAGS_SOFTBOOT	0x2	/* 2 stage soft-boot based dump	    */
++
++#define DUMP_FLAGS_TARGETMASK	0xf0000000 /* handle special case targets   */
++#define DUMP_FLAGS_DISKDUMP	0x80000000 /* dump to local disk 	    */
++#define DUMP_FLAGS_NETDUMP	0x40000000 /* dump over the network         */
++
++/* dump header flags -- add as necessary */
++#define DUMP_DH_FLAGS_NONE	0x0	/* no flags set (error condition!)  */
++#define DUMP_DH_RAW		0x1	/* raw page (no compression)        */
++#define DUMP_DH_COMPRESSED	0x2	/* page is compressed               */
++#define DUMP_DH_END		0x4	/* end marker on a full dump        */
++#define DUMP_DH_TRUNCATED	0x8	/* dump is incomplete               */
++#define DUMP_DH_TEST_PATTERN	0x10	/* dump page is a test pattern      */
++#define DUMP_DH_NOT_USED	0x20	/* 1st bit not used in flags        */
++
++/* names for various dump parameters in /proc/kernel */
++#define DUMP_ROOT_NAME		"sys/dump"
++#define DUMP_DEVICE_NAME	"device"
++#define DUMP_COMPRESS_NAME	"compress"
++#define DUMP_LEVEL_NAME		"level"
++#define DUMP_FLAGS_NAME		"flags"
++#define DUMP_ADDR_NAME		"addr"
++
++#define DUMP_SYSRQ_KEY		'd'	/* key to use for MAGIC_SYSRQ key   */
++
++/* CTL_DUMP names: */
++enum
++{
++	CTL_DUMP_DEVICE=1,
++	CTL_DUMP_COMPRESS=3,
++	CTL_DUMP_LEVEL=3,
++	CTL_DUMP_FLAGS=4,
++	CTL_DUMP_ADDR=5,
++	CTL_DUMP_TEST=6,
++};
++
++
++/* page size for gzip compression -- buffered slightly beyond hardware PAGE_SIZE used by DUMP */
++#define DUMP_DPC_PAGE_SIZE	(DUMP_PAGE_SIZE + 512)
++
++/* dump ioctl() control options */
++#define DIOSDUMPDEV		1	/* set the dump device              */
++#define DIOGDUMPDEV		2	/* get the dump device              */
++#define DIOSDUMPLEVEL		3	/* set the dump level               */
++#define DIOGDUMPLEVEL		4	/* get the dump level               */
++#define DIOSDUMPFLAGS		5	/* set the dump flag parameters     */
++#define DIOGDUMPFLAGS		6	/* get the dump flag parameters     */
++#define DIOSDUMPCOMPRESS	7	/* set the dump compress level      */
++#define DIOGDUMPCOMPRESS	8	/* get the dump compress level      */
++
++/* these ioctls are used only by netdump module */
++#define DIOSTARGETIP		9	/* set the target m/c's ip	    */
++#define DIOGTARGETIP		10	/* get the target m/c's ip	    */
++#define DIOSTARGETPORT		11	/* set the target m/c's port	    */
++#define DIOGTARGETPORT		12	/* get the target m/c's port	    */
++#define DIOSSOURCEPORT		13	/* set the source m/c's port	    */
++#define DIOGSOURCEPORT		14	/* get the source m/c's port	    */
++#define DIOSETHADDR		15	/* set ethernet address		    */
++#define DIOGETHADDR		16	/* get ethernet address		    */
++
++/*
++ * Structure: __dump_header
++ *  Function: This is the header dumped at the top of every valid crash
++ *            dump.  
++ */
++struct __dump_header {
++	/* the dump magic number -- unique to verify dump is valid */
++	u64	dh_magic_number;
++
++	/* the version number of this dump */
++	u32	dh_version;
++
++	/* the size of this header (in case we can't read it) */
++	u32	dh_header_size;
++
++	/* the level of this dump (just a header?) */
++	u32	dh_dump_level;
++
++	/* 
++	 * We assume dump_page_size to be 4K in every case.
++	 * Store here the configurable system page size (4K, 8K, 16K, etc.) 
++	 */
++	u32	dh_page_size;
++
++	/* the size of all physical memory */
++	u64	dh_memory_size;
++
++	/* the start of physical memory */
++	u64	dh_memory_start;
++
++	/* the end of physical memory */
++	u64	dh_memory_end;
++
++	/* the number of hardware/physical pages in this dump specifically */
++	u32	dh_num_dump_pages;
++
++	/* the panic string, if available */
++	char	dh_panic_string[DUMP_PANIC_LEN];
++
++	/* timeval depends on architecture, two long values */
++	struct {
++		u64 tv_sec;
++		u64 tv_usec;
++	} dh_time; /* the time of the system crash */
++
++	/* the NEW utsname (uname) information -- in character form */
++	/* we do this so we don't have to include utsname.h         */
++	/* plus it helps us be more architecture independent        */
++	/* now maybe one day soon they'll make the [65] a #define!  */
++	char	dh_utsname_sysname[65];
++	char	dh_utsname_nodename[65];
++	char	dh_utsname_release[65];
++	char	dh_utsname_version[65];
++	char	dh_utsname_machine[65];
++	char	dh_utsname_domainname[65];
++
++	/* the address of current task (OLD = void *, NEW = u64) */
++	u64	dh_current_task;
++
++	/* what type of compression we're using in this dump (if any) */
++	u32	dh_dump_compress;
++
++	/* any additional flags */
++	u32	dh_dump_flags;
++
++	/* any additional flags */
++	u32	dh_dump_device;
++} __attribute__((packed));
++
++/*
++ * Structure: __dump_page
++ *  Function: To act as the header associated to each physical page of
++ *            memory saved in the system crash dump.  This allows for
++ *            easy reassembly of each crash dump page.  The address bits
++ *            are split to make things easier for 64-bit/32-bit system
++ *            conversions.
++ *
++ * dp_byte_offset and dp_page_index are landmarks that are helpful when
++ * looking at a hex dump of /dev/vmdump,
++ */
++struct __dump_page {
++	/* the address of this dump page */
++	u64	dp_address;
++
++	/* the size of this dump page */
++	u32	dp_size;
++
++	/* flags (currently DUMP_COMPRESSED, DUMP_RAW or DUMP_END) */
++	u32	dp_flags;
++} __attribute__((packed));
++
++/*
++ * Structure: __lkcdinfo
++ * Function:  This structure contains information needed for the lkcdutils
++ *            package (particularly lcrash) to determine what information is
++ *            associated to this kernel, specifically.
++ */
++struct __lkcdinfo {
++	int	arch;
++	int	ptrsz;
++	int	byte_order;
++	int	linux_release;
++	int	page_shift;
++	int	page_size;
++	u64	page_mask;
++	u64	page_offset;
++	int	stack_offset;
++};
++
++#ifdef __KERNEL__
++
++/*
++ * Structure: __dump_compress
++ *  Function: This is what an individual compression mechanism can use
++ *            to plug in their own compression techniques.  It's always
++ *            best to build these as individual modules so that people
++ *            can put in whatever they want.
++ */
++struct __dump_compress {
++	/* the list_head structure for list storage */
++	struct list_head list;
++
++	/* the type of compression to use (DUMP_COMPRESS_XXX) */
++	int compress_type;
++	const char *compress_name;
++
++	/* the compression function to call */
++	u16 (*compress_func)(const u8 *, u16, u8 *, u16);
++};
++
++/* functions for dump compression registration */
++extern void dump_register_compression(struct __dump_compress *);
++extern void dump_unregister_compression(int);
++
++/*
++ * Structure dump_mbank[]:
++ *
++ * For CONFIG_DISCONTIGMEM systems this array specifies the
++ * memory banks/chunks that need to be dumped after a panic.
++ *
++ * For classic systems it specifies a single set of pages from
++ * 0 to max_mapnr.
++ */
++struct __dump_mbank {
++	u64 	start;
++	u64 	end;
++	int	type;
++	int	pad1;
++	long	pad2;
++};
++
++#define DUMP_MBANK_TYPE_CONVENTIONAL_MEMORY		1
++#define DUMP_MBANK_TYPE_OTHER				2
++
++#define MAXCHUNKS 256
++extern int dump_mbanks;
++extern struct __dump_mbank dump_mbank[MAXCHUNKS];
++
++/* notification event codes */
++#define DUMP_BEGIN		0x0001	/* dump beginning */
++#define DUMP_END		0x0002	/* dump ending */
++
++/* Scheduler soft spin control.
++ *
++ * 0 - no dump in progress
++ * 1 - cpu0 is dumping, ...
++ */
++extern unsigned long dump_oncpu;
++extern void dump_execute(const char *, const struct pt_regs *);
++
++/*
++ *	Notifier list for kernel code which wants to be called
++ *	at kernel dump. 
++ */
++extern struct notifier_block *dump_notifier_list;
++static inline int register_dump_notifier(struct notifier_block *nb)
++{
++	return notifier_chain_register(&dump_notifier_list, nb);
++}
++static inline int unregister_dump_notifier(struct notifier_block * nb)
++{
++	return notifier_chain_unregister(&dump_notifier_list, nb);
++}
++
++extern void (*dump_function_ptr)(const char *, const struct pt_regs *);
++static inline void dump(char * str, struct pt_regs * regs)
++{
++	if (dump_function_ptr)
++		dump_function_ptr(str, regs);
++}
++
++/*
++ * Common Arch Specific Functions should be declared here.
++ * This allows the C compiler to detect discrepancies.
++ */
++extern void	__dump_open(void);
++extern void	__dump_cleanup(void);
++extern void	__dump_init(u64);
++extern void	__dump_save_regs(struct pt_regs *, const struct pt_regs *);
++extern int	__dump_configure_header(const struct pt_regs *);
++extern void	__dump_irq_enable(void);
++extern void	__dump_irq_restore(void);
++extern int	__dump_page_valid(unsigned long index);
++#ifdef CONFIG_SMP
++extern void 	__dump_save_other_cpus(void);
++#else
++#define 	__dump_save_other_cpus()
++#endif
++
++/* to track all used (compound + zero order) pages */
++#define PageInuse(p)   (PageCompound(p) || page_count(p))
++
++#endif /* __KERNEL__ */
++
++#else	/* !CONFIG_CRASH_DUMP */
++
++/* If not configured then make code disappear! */
++#define register_dump_watchdog(x) 	do { } while(0)
++#define unregister_dump_watchdog(x) 	do { } while(0)
++#define register_dump_notifier(x)	do { } while(0)
++#define unregister_dump_notifier(x)	do { } while(0)
++#define dump_in_progress() 		0
++#define dump(x, y)			do { } while(0)
++
++#endif	/* !CONFIG_CRASH_DUMP */
++
++#endif /* _DUMP_H */
+Index: linux-2.6.0-test5/include/linux/dump_netdev.h
+===================================================================
+--- linux-2.6.0-test5.orig/include/linux/dump_netdev.h	2003-09-26 14:26:34.000000000 +0800
++++ linux-2.6.0-test5/include/linux/dump_netdev.h	2003-09-26 14:26:34.000000000 +0800
+@@ -0,0 +1,82 @@
++/*
++ *  linux/drivers/net/netconsole.h
++ *
++ *  Copyright (C) 2001  Ingo Molnar <mingo@redhat.com>
++ *
++ *  This file contains the implementation of an IRQ-safe, crash-safe
++ *  kernel console implementation that outputs kernel messages to the
++ *  network.
++ *
++ * Modification history:
++ *
++ * 2001-09-17    started by Ingo Molnar.
++ */
++
++/****************************************************************
++ *      This program is free software; you can redistribute it and/or modify
++ *      it under the terms of the GNU General Public License as published by
++ *      the Free Software Foundation; either version 2, or (at your option)
++ *      any later version.
++ *
++ *      This program is distributed in the hope that it will be useful,
++ *      but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *      GNU General Public License for more details.
++ *
++ *      You should have received a copy of the GNU General Public License
++ *      along with this program; if not, write to the Free Software
++ *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ *
++ ****************************************************************/
++
++#define NETCONSOLE_VERSION 0x03
++
++enum netdump_commands {
++	COMM_NONE = 0,
++	COMM_SEND_MEM = 1,
++	COMM_EXIT = 2,
++	COMM_REBOOT = 3,
++	COMM_HELLO = 4,
++	COMM_GET_NR_PAGES = 5,
++	COMM_GET_PAGE_SIZE = 6,
++	COMM_START_NETDUMP_ACK = 7,
++	COMM_GET_REGS = 8,
++	COMM_GET_MAGIC = 9,
++	COMM_START_WRITE_NETDUMP_ACK = 10,
++	COMM_SYSRQ = 11,
++};
++
++typedef struct netdump_req_s {
++	u64 magic;
++	u32 nr;
++	u32 command;
++	u32 from;
++	u32 to;
++} req_t;
++
++enum netdump_replies {
++	REPLY_NONE = 0,
++	REPLY_ERROR = 1,
++	REPLY_LOG = 2,
++	REPLY_MEM = 3,
++	REPLY_RESERVED = 4,
++	REPLY_HELLO = 5,
++	REPLY_NR_PAGES = 6,
++	REPLY_PAGE_SIZE = 7,
++	REPLY_START_NETDUMP = 8,
++	REPLY_END_NETDUMP = 9,
++	REPLY_REGS = 10,
++	REPLY_MAGIC = 11,
++	REPLY_START_WRITE_NETDUMP = 12,
++	REPLY_SYSRQ = 13,
++};
++
++typedef struct netdump_reply_s {
++	u32 nr;
++	u32 code;
++	u32 info;
++} reply_t;
++
++#define HEADER_LEN (1 + sizeof(reply_t))
++
++
+Index: linux-2.6.0-test5/include/asm-i386/dump.h
+===================================================================
+--- linux-2.6.0-test5.orig/include/asm-i386/dump.h	2003-09-26 14:26:34.000000000 +0800
++++ linux-2.6.0-test5/include/asm-i386/dump.h	2003-09-26 14:26:34.000000000 +0800
+@@ -0,0 +1,93 @@
++/*
++ * Kernel header file for Linux crash dumps.
++ *
++ * Created by: Matt Robinson (yakker@sgi.com)
++ *
++ * Copyright 1999 Silicon Graphics, Inc. All rights reserved.
++ *
++ * This code is released under version 2 of the GNU GPL.
++ */
++
++/* This header file holds the architecture specific crash dump header */
++#ifndef _ASM_DUMP_H
++#define _ASM_DUMP_H
++
++/* necessary header files */
++#include <asm/ptrace.h>
++#include <asm/page.h>
++#include <linux/threads.h>
++#include <linux/mm.h>
++
++/* definitions */
++#define DUMP_ASM_MAGIC_NUMBER	0xdeaddeadULL	/* magic number            */
++#define DUMP_ASM_VERSION_NUMBER	0x3	/* version number          */
++
++/* max number of cpus */
++#define DUMP_MAX_NUM_CPUS 32
++
++/*
++ * Structure: __dump_header_asm
++ *  Function: This is the header for architecture-specific stuff.  It
++ *            follows right after the dump header.
++ */
++struct __dump_header_asm {
++	/* the dump magic number -- unique to verify dump is valid */
++	u64		dha_magic_number;
++
++	/* the version number of this dump */
++	u32		dha_version;
++
++	/* the size of this header (in case we can't read it) */
++	u32		dha_header_size;
++
++	/* the esp for i386 systems */
++	u32		dha_esp;
++
++	/* the eip for i386 systems */
++	u32		dha_eip;
++
++	/* the dump registers */
++	struct pt_regs	dha_regs;
++
++	/* smp specific */
++	u32		dha_smp_num_cpus;
++	u32		dha_dumping_cpu;
++	struct pt_regs	dha_smp_regs[DUMP_MAX_NUM_CPUS];
++	u32		dha_smp_current_task[DUMP_MAX_NUM_CPUS];
++	u32		dha_stack[DUMP_MAX_NUM_CPUS];
++	u32		dha_stack_ptr[DUMP_MAX_NUM_CPUS];
++} __attribute__((packed));
++
++#ifdef __KERNEL__
++
++extern struct __dump_header_asm dump_header_asm;
++
++#ifdef CONFIG_SMP
++extern cpumask_t irq_affinity[];
++extern int (*dump_ipi_function_ptr)(struct pt_regs *);
++extern void dump_send_ipi(void);
++#else
++#define dump_send_ipi() do { } while(0)
++#endif
++
++static inline void get_current_regs(struct pt_regs *regs)
++{
++	__asm__ __volatile__("movl %%ebx,%0" : "=m"(regs->ebx));
++	__asm__ __volatile__("movl %%ecx,%0" : "=m"(regs->ecx));
++	__asm__ __volatile__("movl %%edx,%0" : "=m"(regs->edx));
++	__asm__ __volatile__("movl %%esi,%0" : "=m"(regs->esi));
++	__asm__ __volatile__("movl %%edi,%0" : "=m"(regs->edi));
++	__asm__ __volatile__("movl %%ebp,%0" : "=m"(regs->ebp));
++	__asm__ __volatile__("movl %%eax,%0" : "=m"(regs->eax));
++	__asm__ __volatile__("movl %%esp,%0" : "=m"(regs->esp));
++	__asm__ __volatile__("movw %%ss, %%ax;" :"=a"(regs->xss));
++	__asm__ __volatile__("movw %%cs, %%ax;" :"=a"(regs->xcs));
++	__asm__ __volatile__("movw %%ds, %%ax;" :"=a"(regs->xds));
++	__asm__ __volatile__("movw %%es, %%ax;" :"=a"(regs->xes));
++	__asm__ __volatile__("pushfl; popl %0" :"=m"(regs->eflags));
++	regs->eip = (unsigned long)current_text_addr();
++}
++
++#endif /* __KERNEL__ */
++
++#endif /* _ASM_DUMP_H */
+Index: linux-2.6.0-test5/init/kerntypes.c
+===================================================================
+--- linux-2.6.0-test5.orig/init/kerntypes.c	2003-09-26 14:26:34.000000000 +0800
++++ linux-2.6.0-test5/init/kerntypes.c	2003-09-26 14:26:34.000000000 +0800
+@@ -0,0 +1,31 @@
++/*
++ * kerntypes.c
++ *
++ * Copyright (C) 2000 Tom Morano (tjm@sgi.com) and
++ *                    Matt D. Robinson (yakker@alacritech.com)
++ *
++ * Dummy module that includes headers for all kernel types of interest. 
++ * The kernel type information is used by the lcrash utility when 
++ * analyzing system crash dumps or the live system. Using the type 
++ * information for the running system, rather than kernel header files,
++ * makes for a more flexible and robust analysis tool.
++ *
++ * This source code is released under version 2 of the GNU GPL.
++ */
++
++#include <linux/compile.h>
++#include <linux/module.h>
++#include <linux/mm.h>
++#include <linux/config.h>
++#include <linux/utsname.h>
++#include <linux/dump.h>
++
++#ifdef LINUX_COMPILE_VERSION_ID_TYPE
++/* Define version type for version validation of dump and kerntypes */
++LINUX_COMPILE_VERSION_ID_TYPE;
++#endif
++
++void
++kerntypes_dummy(void)
++{
++}
+Index: linux-2.6.0-test5/drivers/dump/dump_methods.h
+===================================================================
+--- linux-2.6.0-test5.orig/drivers/dump/dump_methods.h	2003-09-26 14:26:34.000000000 +0800
++++ linux-2.6.0-test5/drivers/dump/dump_methods.h	2003-09-26 14:26:34.000000000 +0800
+@@ -0,0 +1,348 @@
++/*
++ * Generic interfaces for flexible system dump 
++ *
++ * Started: Oct 2002 -  Suparna Bhattacharya (suparna@in.ibm.com)
++ *
++ * Copyright (C) 2002 International Business Machines Corp. 
++ *
++ * This code is released under version 2 of the GNU GPL.
++ */
++
++#ifndef _LINUX_DUMP_METHODS_H
++#define _LINUX_DUMP_METHODS_H
++
++/*
++ * Inspired by Matt Robinson's suggestion of introducing dump 
++ * methods as a way to enable different crash dump facilities to 
++ * coexist where each employs its own scheme or dumping policy.
++ *
++ * The code here creates a framework for flexible dump by defining 
++ * a set of methods and providing associated helpers that differentiate
++ * between the underlying mechanism (how to dump), overall scheme 
++ * (sequencing of stages and data dumped and associated quiescing), 
++ * output format (what the dump output looks like), target type 
++ * (where to save the dump; see dumpdev.h), and selection policy 
++ * (state/data to dump).
++ * 
++ * These sets of interfaces can be mixed and matched to build a 
++ * dumper suitable for a given situation, allowing for 
++ * flexibility as well appropriate degree of code reuse.
++ * For example all features and options of lkcd (including
++ * granular selective dumping in the near future) should be
++ * available even when say, the 2 stage soft-boot based mechanism 
++ * is used for taking disruptive dumps.
++ *
++ * Todo: Additionally modules or drivers may supply their own
++ * custom dumpers which extend dump with module specific
++ * information or hardware state, and can even tweak the
++ * mechanism when it comes to saving state relevant to
++ * them.
++ */
++
++#include <linux/sched.h>
++#include <linux/slab.h>
++#include <linux/highmem.h>
++#include <linux/dumpdev.h>
++
++#define MAX_PASSES 	6
++#define MAX_DEVS	4
++
++
++/* To customise selection of pages to be dumped in a given pass/group */
++struct dump_data_filter{
++	char name[32];
++	int (*selector)(int, unsigned long, unsigned long);
++	ulong level_mask; /* dump level(s) for which this filter applies */
++	loff_t start, end; /* location range applicable */
++};
++
++
++/* 
++ * Determined by the kind of dump mechanism and appropriate 
++ * overall scheme 
++ */ 
++struct dump_scheme_ops {
++	/* sets aside memory, inits data structures etc */
++	int (*configure)(unsigned long devid); 
++	/* releases  resources */
++	int (*unconfigure)(void); 
++
++	/* ordering of passes, invoking iterator */
++	int (*sequencer)(void); 
++        /* iterates over system data, selects and acts on data to dump */
++	int (*iterator)(int, int (*)(unsigned long, unsigned long), 
++		struct dump_data_filter *); 
++        /* action when data is selected for dump */
++	int (*save_data)(unsigned long, unsigned long); 
++        /* action when data is to be excluded from dump */
++	int (*skip_data)(unsigned long, unsigned long); 
++	/* policies for space, multiple dump devices etc */
++	int (*write_buffer)(void *, unsigned long); 
++};
++
++struct dump_scheme {
++	/* the name serves as an anchor to locate the scheme after reboot */
++	char name[32]; 
++	struct dump_scheme_ops *ops;
++	struct list_head list;
++};
++
++/* Quiescing/Silence levels (controls IPI callback behaviour) */
++extern enum dump_silence_levels {
++	DUMP_SOFT_SPIN_CPUS	= 1,
++	DUMP_HARD_SPIN_CPUS	= 2,
++	DUMP_HALT_CPUS		= 3,
++} dump_silence_level;
++
++/* determined by the dump (file) format */
++struct dump_fmt_ops {
++	/* build header */
++	int (*configure_header)(const char *, const struct pt_regs *); 
++	int (*update_header)(void); /* update header and write it out */
++	/* save curr context  */
++	void (*save_context)(int, const struct pt_regs *, 
++		struct task_struct *); 
++	/* typically called by the save_data action */
++	/* add formatted data to the dump buffer */
++	int (*add_data)(unsigned long, unsigned long); 
++	int (*update_end_marker)(void);
++};
++
++struct dump_fmt {
++	unsigned long magic; 
++	char name[32];  /* lcrash, crash, elf-core etc */
++	struct dump_fmt_ops *ops;
++	struct list_head list;
++};
++
++/* 
++ * Modules will be able add their own data capture schemes by 
++ * registering their own dumpers. Typically they would use the 
++ * primary dumper as a template and tune it with their routines.
++ * Still Todo.
++ */
++
++/* The combined dumper profile (mechanism, scheme, dev, fmt) */
++struct dumper {
++	char name[32]; /* singlestage, overlay (stg1), passthru(stg2), pull */
++	struct dump_scheme *scheme;
++	struct dump_fmt *fmt;
++	struct __dump_compress *compress;
++	struct dump_data_filter *filter;
++	struct dump_dev *dev; 
++	/* state valid only for active dumper(s) - per instance */
++	/* run time state/context */
++	int curr_pass;
++	unsigned long count;
++	loff_t curr_offset; /* current logical offset into dump device */
++	loff_t curr_loc; /* current memory location */
++	void *curr_buf; /* current position in the dump buffer */
++	void *dump_buf; /* starting addr of dump buffer */
++	int header_dirty; /* whether the header needs to be written out */
++	int header_len; 
++	struct list_head dumper_list; /* links to other dumpers */
++};	
++
++/* Starting point to get to the current configured state */
++struct dump_config {
++	ulong level;
++	ulong flags;
++	struct dumper *dumper;
++	unsigned long dump_device;
++	unsigned long dump_addr; /* relevant only for in-memory dumps */
++	struct list_head dump_dev_list;
++};	
++
++extern struct dump_config dump_config;
++
++/* Used to save the dump config across a reboot for 2-stage dumps: 
++ * 
++ * Note: The scheme, format, compression and device type should be 
++ * registered at bootup, for this config to be sharable across soft-boot. 
++ * The function addresses could have changed and become invalid, and
++ * need to be set up again.
++ */
++struct dump_config_block {
++	u64 magic; /* for a quick sanity check after reboot */
++	struct dump_memdev memdev; /* handle to dump stored in memory */
++	struct dump_config config;
++	struct dumper dumper;
++	struct dump_scheme scheme;
++	struct dump_fmt fmt;
++	struct __dump_compress compress;
++	struct dump_data_filter filter_table[MAX_PASSES];
++	struct dump_anydev dev[MAX_DEVS]; /* target dump device */
++};
++
++
++/* Wrappers that invoke the methods for the current (active) dumper */
++
++/* Scheme operations */
++
++static inline int dump_sequencer(void)
++{
++	return dump_config.dumper->scheme->ops->sequencer();
++}
++
++static inline int dump_iterator(int pass, int (*action)(unsigned long, 
++	unsigned long), struct dump_data_filter *filter)
++{
++	return dump_config.dumper->scheme->ops->iterator(pass, action, filter);
++}
++
++#define dump_save_data dump_config.dumper->scheme->ops->save_data
++#define dump_skip_data dump_config.dumper->scheme->ops->skip_data
++
++static inline int dump_write_buffer(void *buf, unsigned long len)
++{
++	return dump_config.dumper->scheme->ops->write_buffer(buf, len);
++}
++
++static inline int dump_configure(unsigned long devid)
++{
++	return dump_config.dumper->scheme->ops->configure(devid);
++}
++
++static inline int dump_unconfigure(void)
++{
++	return dump_config.dumper->scheme->ops->unconfigure();
++}
++
++/* Format operations */
++
++static inline int dump_configure_header(const char *panic_str, 
++	const struct pt_regs *regs)
++{
++	return dump_config.dumper->fmt->ops->configure_header(panic_str, regs);
++}
++
++static inline void dump_save_context(int cpu, const struct pt_regs *regs, 
++		struct task_struct *tsk)
++{
++	dump_config.dumper->fmt->ops->save_context(cpu, regs, tsk);
++}
++
++static inline int dump_save_this_cpu(const struct pt_regs *regs)
++{
++	int cpu = smp_processor_id();
++
++	dump_save_context(cpu, regs, current);
++	return 1;
++}
++
++static inline int dump_update_header(void)
++{
++	return dump_config.dumper->fmt->ops->update_header();
++}
++
++static inline int dump_update_end_marker(void)
++{
++	return dump_config.dumper->fmt->ops->update_end_marker();
++}
++
++static inline int dump_add_data(unsigned long loc, unsigned long sz)
++{
++	return dump_config.dumper->fmt->ops->add_data(loc, sz);
++}
++
++/* Compression operation */
++static inline int dump_compress_data(char *src, int slen, char *dst)
++{
++	return dump_config.dumper->compress->compress_func(src, slen, 
++		dst, DUMP_DPC_PAGE_SIZE);
++}
++
++
++/* Prototypes of some default implementations of dump methods */
++
++extern struct __dump_compress dump_none_compression;
++
++/* Default scheme methods (dump_scheme.c) */
++
++extern int dump_generic_sequencer(void);
++extern int dump_page_iterator(int pass, int (*action)(unsigned long, unsigned
++	long), struct dump_data_filter *filter);
++extern int dump_generic_save_data(unsigned long loc, unsigned long sz);
++extern int dump_generic_skip_data(unsigned long loc, unsigned long sz);
++extern int dump_generic_write_buffer(void *buf, unsigned long len);
++extern int dump_generic_configure(unsigned long);
++extern int dump_generic_unconfigure(void);
++
++/* Default scheme template */
++extern struct dump_scheme dump_scheme_singlestage;
++
++/* Default dump format methods */
++
++extern int dump_lcrash_configure_header(const char *panic_str, 
++	const struct pt_regs *regs);
++extern void dump_lcrash_save_context(int  cpu, const struct pt_regs *regs, 
++	struct task_struct *tsk);
++extern int dump_generic_update_header(void);
++extern int dump_lcrash_add_data(unsigned long loc, unsigned long sz);
++extern int dump_lcrash_update_end_marker(void);
++
++/* Default format (lcrash) template */
++extern struct dump_fmt dump_fmt_lcrash;
++
++/* Default dump selection filter table */
++
++/* 
++ * Entries listed in order of importance and correspond to passes
++ * The last entry (with a level_mask of zero) typically reflects data that 
++ * won't be dumped  -- this may for example be used to identify data 
++ * that will be skipped for certain so the corresponding memory areas can be 
++ * utilized as scratch space.
++ */   
++extern struct dump_data_filter dump_filter_table[];
++
++/* Some pre-defined dumpers */
++extern struct dumper dumper_singlestage;
++extern struct dumper dumper_stage1;
++extern struct dumper dumper_stage2;
++
++/* These are temporary */
++#define DUMP_MASK_HEADER	DUMP_LEVEL_HEADER
++#define DUMP_MASK_KERN		DUMP_LEVEL_KERN
++#define DUMP_MASK_USED		DUMP_LEVEL_USED
++#define DUMP_MASK_UNUSED	DUMP_LEVEL_ALL_RAM
++#define DUMP_MASK_REST		0 /* dummy for now */
++
++/* Helpers - move these to dump.h later ? */
++
++int dump_generic_execute(const char *panic_str, const struct pt_regs *regs);
++extern int dump_ll_write(void *buf, unsigned long len); 
++int dump_check_and_free_page(struct dump_memdev *dev, struct page *page);
++
++static inline void dumper_reset(void)
++{
++	dump_config.dumper->curr_buf = dump_config.dumper->dump_buf;
++	dump_config.dumper->curr_loc = 0;
++	dump_config.dumper->curr_offset = 0;
++	dump_config.dumper->count = 0;
++	dump_config.dumper->curr_pass = 0;
++}
++
++/* 
++ * May later be moulded to perform boot-time allocations so we can dump 
++ * earlier during bootup 
++ */
++static inline void *dump_alloc_mem(unsigned long size)
++{
++	return kmalloc(size, GFP_KERNEL);
++}
++
++static inline void dump_free_mem(void *buf)
++{
++	struct page *page;
++
++	/* ignore reserved pages (e.g. post soft boot stage) */
++	if (buf && (page = virt_to_page(buf))) {
++		if (PageReserved(page))
++			return;
++	}
++
++	kfree(buf);
++}
++
++
++#endif /*  _LINUX_DUMP_METHODS_H */
+Index: linux-2.6.0-test5/Makefile
+===================================================================
+--- linux-2.6.0-test5.orig/Makefile	2003-09-26 14:26:29.000000000 +0800
++++ linux-2.6.0-test5/Makefile	2003-09-26 14:26:34.000000000 +0800
+@@ -289,6 +289,10 @@
+ 
+ export MODVERDIR := .tmp_versions
+ 
++ifeq ($(CONFIG_CRASH_DUMP),)
++      CFLAGS += -g
++endif
++
+ # The temporary file to save gcc -MD generated dependencies must not
+ # contain a comma
+ comma := ,
diff --git a/lustre/kernel_patches/patches/lkcd-kernel-changes-2.6.0-test6.patch b/lustre/kernel_patches/patches/lkcd-kernel-changes-2.6.0-test6.patch
new file mode 100644
index 0000000..fa429d5
--- /dev/null
+++ b/lustre/kernel_patches/patches/lkcd-kernel-changes-2.6.0-test6.patch
@@ -0,0 +1,615 @@
+ 0 files changed
+
+Index: linux-2.6.0-test6/drivers/Makefile
+===================================================================
+--- linux-2.6.0-test6.orig/drivers/Makefile	2003-09-28 08:50:41.000000000 +0800
++++ linux-2.6.0-test6/drivers/Makefile	2003-10-09 20:57:41.884807280 +0800
+@@ -49,3 +49,4 @@
+ obj-$(CONFIG_MCA)		+= mca/
+ obj-$(CONFIG_EISA)		+= eisa/
+ obj-$(CONFIG_CPU_FREQ)		+= cpufreq/
++obj-$(CONFIG_CRASH_DUMP)	+= dump/
+Index: linux-2.6.0-test6/include/linux/sysctl.h
+===================================================================
+--- linux-2.6.0-test6.orig/include/linux/sysctl.h	2003-10-09 20:52:02.839350024 +0800
++++ linux-2.6.0-test6/include/linux/sysctl.h	2003-10-09 20:57:41.885807128 +0800
+@@ -127,6 +127,7 @@
+ 	KERN_PANIC_ON_OOPS=57,  /* int: whether we will panic on an oops */
+ 	KERN_HPPA_PWRSW=58,	/* int: hppa soft-power enable */
+ 	KERN_HPPA_UNALIGNED=59,	/* int: hppa unaligned-trap enable */
++	KERN_DUMP=60,           /* directory: dump parameters */
+ };
+ 
+ 
+Index: linux-2.6.0-test6/include/linux/major.h
+===================================================================
+--- linux-2.6.0-test6.orig/include/linux/major.h	2003-09-28 08:50:13.000000000 +0800
++++ linux-2.6.0-test6/include/linux/major.h	2003-10-09 20:57:41.885807128 +0800
+@@ -157,6 +157,8 @@
+ 
+ #define OSST_MAJOR		206	/* OnStream-SCx0 SCSI tape */
+ 
++#define CRASH_DUMP_MAJOR	221	/* crash dump interface */
++
+ #define IBM_TTY3270_MAJOR	227
+ #define IBM_FS3270_MAJOR	228
+ 
+Index: linux-2.6.0-test6/include/asm-i386/mach-default/irq_vectors.h
+===================================================================
+--- linux-2.6.0-test6.orig/include/asm-i386/mach-default/irq_vectors.h	2003-10-09 20:52:02.764361424 +0800
++++ linux-2.6.0-test6/include/asm-i386/mach-default/irq_vectors.h	2003-10-09 20:57:41.885807128 +0800
+@@ -48,6 +48,7 @@
+ #define INVALIDATE_TLB_VECTOR	0xfd
+ #define RESCHEDULE_VECTOR	0xfc
+ #define CALL_FUNCTION_VECTOR	0xfb
++#define DUMP_VECTOR		0xfa
+ 
+ #define THERMAL_APIC_VECTOR	0xf0
+ /*
+Index: linux-2.6.0-test6/include/asm-i386/kmap_types.h
+===================================================================
+--- linux-2.6.0-test6.orig/include/asm-i386/kmap_types.h	2003-10-09 20:52:02.764361424 +0800
++++ linux-2.6.0-test6/include/asm-i386/kmap_types.h	2003-10-09 20:57:41.886806976 +0800
+@@ -33,6 +33,7 @@
+ 	 * Add new entries in pairs:
+ 	 * the 4G/4G virtual stack must be 8K aligned on each cpu.
+ 	 */
+-	KM_TYPE_NR
++	KM_DUMP,
++	KM_TYPE_NR,
+ };
+ #endif
+Index: linux-2.6.0-test6/include/asm-i386/smp.h
+===================================================================
+--- linux-2.6.0-test6.orig/include/asm-i386/smp.h	2003-09-28 08:50:29.000000000 +0800
++++ linux-2.6.0-test6/include/asm-i386/smp.h	2003-10-09 20:57:41.886806976 +0800
+@@ -37,6 +37,7 @@
+ extern int cpu_sibling_map[];
+ 
+ extern void smp_flush_tlb(void);
++extern void dump_send_ipi(void);
+ extern void smp_message_irq(int cpl, void *dev_id, struct pt_regs *regs);
+ extern void smp_send_reschedule(int cpu);
+ extern void smp_invalidate_rcv(void);		/* Process an NMI */
+Index: linux-2.6.0-test6/arch/i386/kernel/i386_ksyms.c
+===================================================================
+--- linux-2.6.0-test6.orig/arch/i386/kernel/i386_ksyms.c	2003-10-09 20:56:19.104391816 +0800
++++ linux-2.6.0-test6/arch/i386/kernel/i386_ksyms.c	2003-10-09 20:58:33.601945080 +0800
+@@ -16,6 +16,7 @@
+ #include <linux/tty.h>
+ #include <linux/highmem.h>
+ #include <linux/time.h>
++#include <linux/nmi.h>
+ 
+ #include <asm/semaphore.h>
+ #include <asm/processor.h>
+@@ -34,6 +35,7 @@
+ #include <asm/nmi.h>
+ #include <asm/edd.h>
+ #include <asm/ist.h>
++#include <asm/e820.h>
+ #include <asm/netconsole.h>
+ extern void dump_thread(struct pt_regs *, struct user *);
+ extern spinlock_t rtc_lock;
+@@ -220,3 +222,20 @@
+ #if defined(CONFIG_X86_SPEEDSTEP_SMI) || defined(CONFIG_X86_SPEEDSTEP_SMI_MODULE)
+ EXPORT_SYMBOL(ist_info);
+ #endif
++
++#ifdef CONFIG_CRASH_DUMP_MODULE
++#ifdef CONFIG_SMP
++extern irq_desc_t irq_desc[NR_IRQS];
++extern unsigned long irq_affinity[NR_IRQS];
++extern void stop_this_cpu(void *);
++EXPORT_SYMBOL(irq_desc);
++EXPORT_SYMBOL(irq_affinity);
++EXPORT_SYMBOL(stop_this_cpu);
++EXPORT_SYMBOL(dump_send_ipi);
++#endif
++extern int pfn_is_ram(unsigned long);
++EXPORT_SYMBOL(pfn_is_ram);
++#ifdef ARCH_HAS_NMI_WATCHDOG
++EXPORT_SYMBOL(touch_nmi_watchdog);
++#endif
++#endif
+Index: linux-2.6.0-test6/arch/i386/kernel/nmi.c
+===================================================================
+--- linux-2.6.0-test6.orig/arch/i386/kernel/nmi.c	2003-10-09 20:52:02.026473600 +0800
++++ linux-2.6.0-test6/arch/i386/kernel/nmi.c	2003-10-09 20:57:41.887806824 +0800
+@@ -24,6 +24,7 @@
+ #include <linux/kernel_stat.h>
+ #include <linux/module.h>
+ #include <linux/nmi.h>
++#include <linux/dump.h>
+ #include <linux/sysdev.h>
+ 
+ #include <asm/smp.h>
+@@ -460,6 +461,7 @@
+ 			bust_spinlocks(1);
+ 			printk("NMI Watchdog detected LOCKUP on CPU%d, eip %08lx, registers:\n", cpu, regs->eip);
+ 			show_registers(regs);
++			dump("NMI Watchdog detected LOCKUP", regs);
+ 			printk("console shuts up ...\n");
+ 			console_silent();
+ 			spin_unlock(&nmi_print_lock);
+Index: linux-2.6.0-test6/arch/i386/kernel/setup.c
+===================================================================
+--- linux-2.6.0-test6.orig/arch/i386/kernel/setup.c	2003-10-09 20:52:02.028473296 +0800
++++ linux-2.6.0-test6/arch/i386/kernel/setup.c	2003-10-09 20:57:41.888806672 +0800
+@@ -471,6 +471,7 @@
+ 	print_memory_map(who);
+ } /* setup_memory_region */
+ 
++unsigned long crashdump_addr = 0xdeadbeef;
+ 
+ static void __init parse_cmdline_early (char ** cmdline_p)
+ {
+@@ -588,6 +589,9 @@
+ 		if (c == ' ' && !memcmp(from, "highmem=", 8))
+ 			highmem_pages = memparse(from+8, &from) >> PAGE_SHIFT;
+ 	
++		if (c == ' ' && !memcmp(from, "crashdump=", 10))
++			crashdump_addr = memparse(from+10, &from); 
++			
+ 		c = *(from++);
+ 		if (!c)
+ 			break;
+@@ -1030,6 +1034,8 @@
+ 
+ __setup("noreplacement", noreplacement_setup); 
+ 
++extern void crashdump_reserve(void);
++ 
+ /*
+  * Determine if we were loaded by an EFI loader.  If so, then we have also been
+  * passed the efi memmap, systab, etc., so we should use these data structures
+Index: linux-2.6.0-test6/arch/i386/kernel/smp.c
+===================================================================
+--- linux-2.6.0-test6.orig/arch/i386/kernel/smp.c	2003-10-09 20:52:02.031472840 +0800
++++ linux-2.6.0-test6/arch/i386/kernel/smp.c	2003-10-09 20:57:41.889806520 +0800
+@@ -19,6 +19,7 @@
+ #include <linux/mc146818rtc.h>
+ #include <linux/cache.h>
+ #include <linux/interrupt.h>
++#include <linux/dump.h>
+ 
+ #include <asm/mtrr.h>
+ #include <asm/pgalloc.h>
+@@ -144,6 +145,13 @@
+ 	 */
+ 	cfg = __prepare_ICR(shortcut, vector);
+ 
++	if (vector == DUMP_VECTOR) {
++		/*
++		 * Setup DUMP IPI to be delivered as an NMI
++		 */
++		cfg = (cfg&~APIC_VECTOR_MASK)|APIC_DM_NMI;
++	}
++
+ 	/*
+ 	 * Send the IPI. The write to APIC_ICR fires this off.
+ 	 */
+@@ -477,6 +485,11 @@
+ 	send_IPI_mask(cpumask_of_cpu(cpu), RESCHEDULE_VECTOR);
+ }
+ 
++void dump_send_ipi(void)
++{
++	send_IPI_allbutself(DUMP_VECTOR);
++}
++
+ /*
+  * Structure and data for smp_call_function(). This is designed to minimise
+  * static memory requirements. It also looks cleaner.
+@@ -545,7 +558,7 @@
+ 	return 0;
+ }
+ 
+-static void stop_this_cpu (void * dummy)
++void stop_this_cpu (void * dummy)
+ {
+ 	/*
+ 	 * Remove this CPU:
+@@ -606,4 +619,3 @@
+ 		atomic_inc(&call_data->finished);
+ 	}
+ }
+-
+Index: linux-2.6.0-test6/arch/i386/kernel/traps.c
+===================================================================
+--- linux-2.6.0-test6.orig/arch/i386/kernel/traps.c	2003-10-09 20:52:02.033472536 +0800
++++ linux-2.6.0-test6/arch/i386/kernel/traps.c	2003-10-09 20:57:41.889806520 +0800
+@@ -25,6 +25,7 @@
+ #include <linux/highmem.h>
+ #include <linux/kallsyms.h>
+ #include <linux/ptrace.h>
++#include <linux/dump.h>
+ 
+ #ifdef CONFIG_EISA
+ #include <linux/ioport.h>
+@@ -322,6 +323,7 @@
+ #endif
+  	CHK_REMOTE_DEBUG(0,SIGTRAP,err,regs,)
+ 	show_registers(regs);
++	dump((char *)str, regs);
+ 	bust_spinlocks(0);
+ 	spin_unlock_irq(&die_lock);
+ 	if (in_interrupt())
+Index: linux-2.6.0-test6/arch/i386/mm/init.c
+===================================================================
+--- linux-2.6.0-test6.orig/arch/i386/mm/init.c	2003-10-09 20:52:02.041471320 +0800
++++ linux-2.6.0-test6/arch/i386/mm/init.c	2003-10-09 20:57:41.890806368 +0800
+@@ -115,6 +115,12 @@
+ 		SetPageReserved(page);
+ }
+ 
++/* To enable modules to check if a page is in RAM */
++int pfn_is_ram(unsigned long pfn)
++{
++	return (page_is_ram(pfn));
++}
++
+ #ifdef CONFIG_HIGHMEM
+ 
+ #ifndef CONFIG_DISCONTIGMEM
+Index: linux-2.6.0-test6/arch/i386/boot/Makefile
+===================================================================
+--- linux-2.6.0-test6.orig/arch/i386/boot/Makefile	2003-09-28 08:50:16.000000000 +0800
++++ linux-2.6.0-test6/arch/i386/boot/Makefile	2003-10-09 20:57:41.890806368 +0800
+@@ -100,3 +100,4 @@
+ 
+ install: $(BOOTIMAGE)
+ 	sh $(srctree)/$(src)/install.sh $(KERNELRELEASE) $< System.map "$(INSTALL_PATH)"
++	if [ -f init/kerntypes.o ]; then cp init/kerntypes.o $(INSTALL_PATH)/Kerntypes; fi
+Index: linux-2.6.0-test6/arch/i386/Kconfig
+===================================================================
+--- linux-2.6.0-test6.orig/arch/i386/Kconfig	2003-10-09 20:52:01.999477704 +0800
++++ linux-2.6.0-test6/arch/i386/Kconfig	2003-10-09 20:57:41.891806216 +0800
+@@ -1239,6 +1239,56 @@
+ 
+ menu "Kernel hacking"
+ 
++config CRASH_DUMP
++	tristate "Crash dump support (EXPERIMENTAL)"
++	depends on EXPERIMENTAL
++	default n
++	---help---
++	  Say Y here to enable saving an image of system memory when a panic
++	  or other error occurs. Dumps can also be forced with the SysRq+d
++	  key if MAGIC_SYSRQ is enabled.
++
++config CRASH_DUMP_BLOCKDEV
++	tristate "Crash dump block device driver"
++	depends on CRASH_DUMP
++	help
++	  Say Y to allow saving crash dumps directly to a disk device.
++
++config CRASH_DUMP_NETDEV
++	tristate "Crash dump network device driver"
++	depends on CRASH_DUMP
++	help
++	  Say Y to allow saving crash dumps over a network device.
++
++config CRASH_DUMP_MEMDEV
++	bool "Crash dump staged memory driver"
++	depends on CRASH_DUMP
++	help
++	  Say Y to allow intermediate saving crash dumps in spare 
++	  memory pages which would then be written out to disk
++	  later.
++
++config CRASH_DUMP_SOFTBOOT
++	bool "Save crash dump across a soft reboot"
++	depends on CRASH_DUMP_MEMDEV
++	help
++	  Say Y to allow a crash dump to be preserved in memory
++	  pages across a soft reboot and written out to disk
++	  thereafter. For this to work, CRASH_DUMP must be 
++	  configured as part of the kernel (not as a module).
++
++config CRASH_DUMP_COMPRESS_RLE
++	tristate "Crash dump RLE compression"
++	depends on CRASH_DUMP
++	help
++	  Say Y to allow saving dumps with Run Length Encoding compression.
++
++config CRASH_DUMP_COMPRESS_GZIP
++	tristate "Crash dump GZIP compression"
++	depends on CRASH_DUMP
++	help
++	  Say Y to allow saving dumps with Gnu Zip compression.
++
+ config DEBUG_KERNEL
+ 	bool "Kernel debugging"
+ 	help
+Index: linux-2.6.0-test6/arch/s390/boot/Makefile
+===================================================================
+--- linux-2.6.0-test6.orig/arch/s390/boot/Makefile	2003-09-28 08:51:21.000000000 +0800
++++ linux-2.6.0-test6/arch/s390/boot/Makefile	2003-10-09 20:57:41.892806064 +0800
+@@ -15,4 +15,4 @@
+ 
+ install: $(CONFIGURE) $(obj)/image
+ 	sh -x $(obj)/install.sh $(KERNELRELEASE) $(obj)/image \
+-	      System.map Kerntypes "$(INSTALL_PATH)"
++	      System.map init/kerntypes.o "$(INSTALL_PATH)"
+Index: linux-2.6.0-test6/arch/s390/boot/install.sh
+===================================================================
+--- linux-2.6.0-test6.orig/arch/s390/boot/install.sh	2003-09-28 08:50:30.000000000 +0800
++++ linux-2.6.0-test6/arch/s390/boot/install.sh	2003-10-09 20:57:41.892806064 +0800
+@@ -16,7 +16,8 @@
+ #   $1 - kernel version
+ #   $2 - kernel image file
+ #   $3 - kernel map file
+-#   $4 - default install path (blank if root directory)
++#   $4 - kernel type file
++#   $5 - default install path (blank if root directory)
+ #
+ 
+ # User may have a custom install script
+@@ -26,13 +27,22 @@
+ 
+ # Default install - same as make zlilo
+ 
+-if [ -f $4/vmlinuz ]; then
+-	mv $4/vmlinuz $4/vmlinuz.old
++if [ -f $5/vmlinuz ]; then
++	mv $5/vmlinuz $5/vmlinuz.old
+ fi
+ 
+-if [ -f $4/System.map ]; then
+-	mv $4/System.map $4/System.old
++if [ -f $5/System.map ]; then
++	mv $5/System.map $5/System.old
+ fi
+ 
+-cat $2 > $4/vmlinuz
+-cp $3 $4/System.map
++if [ -f $5/Kerntypes ]; then
++	mv $5/Kerntypes $5/Kerntypes.old
++fi
++
++cat $2 > $5/vmlinuz
++cp $3 $5/System.map
++
++# copy the kernel type file if it exists
++if [ -f $4 ]; then
++	cp $4 $5/Kerntypes
++fi
+Index: linux-2.6.0-test6/scripts/mkcompile_h
+===================================================================
+--- linux-2.6.0-test6.orig/scripts/mkcompile_h	2003-09-28 08:51:28.000000000 +0800
++++ linux-2.6.0-test6/scripts/mkcompile_h	2003-10-09 20:57:41.892806064 +0800
+@@ -33,7 +33,7 @@
+ 
+ UTS_LEN=64
+ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
+-
++LINUX_COMPILE_VERSION_ID="__linux_compile_version_id__`hostname | tr -c '[0-9A-Za-z\n]' '__'`_`LANG=C date | tr -c '[0-9A-Za-z\n]' '_'`"
+ # Generate a temporary compile.h
+ 
+ ( echo /\* This file is auto generated, version $VERSION \*/
+@@ -55,6 +55,8 @@
+   fi
+ 
+   echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | tail -n 1`\"
++  echo \#define LINUX_COMPILE_VERSION_ID $LINUX_COMPILE_VERSION_ID
++  echo \#define LINUX_COMPILE_VERSION_ID_TYPE typedef char* "$LINUX_COMPILE_VERSION_ID""_t"
+ ) > .tmpcompile
+ 
+ # Only replace the real compile.h if the new one is different,
+Index: linux-2.6.0-test6/kernel/ksyms.c
+===================================================================
+--- linux-2.6.0-test6.orig/kernel/ksyms.c	2003-10-09 20:52:02.855347592 +0800
++++ linux-2.6.0-test6/kernel/ksyms.c	2003-10-09 20:57:41.893805912 +0800
+@@ -58,6 +58,8 @@
+ #include <linux/backing-dev.h>
+ #include <linux/percpu_counter.h>
+ #include <asm/checksum.h>
++#include <linux/dump.h>
++#include <linux/bootmem.h>
+ 
+ #if defined(CONFIG_PROC_FS)
+ #include <linux/proc_fs.h>
+@@ -378,3 +380,9 @@
+ EXPORT_SYMBOL(console_printk);
+ 
+ EXPORT_SYMBOL(current_kernel_time);
++
++#ifdef CONFIG_CRASH_DUMP_MODULE
++EXPORT_SYMBOL(min_low_pfn);
++EXPORT_SYMBOL(dump_oncpu);
++EXPORT_SYMBOL(dump_function_ptr);
++#endif
+Index: linux-2.6.0-test6/kernel/panic.c
+===================================================================
+--- linux-2.6.0-test6.orig/kernel/panic.c	2003-09-28 08:51:05.000000000 +0800
++++ linux-2.6.0-test6/kernel/panic.c	2003-10-09 20:57:41.893805912 +0800
+@@ -18,11 +18,16 @@
+ #include <linux/interrupt.h>
+ #include <linux/nmi.h>
+ 
++#ifdef CONFIG_KEXEC
++#include <linux/kexec.h>
++#endif
++
+ asmlinkage void sys_sync(void);	/* it's really int */
+ 
+ int panic_timeout;
+ int panic_on_oops;
+ int tainted;
++void (*dump_function_ptr)(const char *, const struct pt_regs *) = 0;
+ 
+ struct notifier_block *panic_notifier_list;
+ 
+@@ -55,6 +60,7 @@
+ 	va_start(args, fmt);
+ 	vsnprintf(buf, sizeof(buf), fmt, args);
+ 	va_end(args);
++
+ 	printk(KERN_EMERG "Kernel panic: %s\n",buf);
+ 	if (in_interrupt())
+ 		printk(KERN_EMERG "In interrupt handler - not syncing\n");
+@@ -78,6 +84,19 @@
+ 		 * We can't use the "normal" timers since we just panicked..
+ 	 	 */
+ 		printk(KERN_EMERG "Rebooting in %d seconds..",panic_timeout);
++#ifdef CONFIG_KEXEC
++		{
++ 			struct kimage *image;
++ 			image = xchg(&kexec_image, 0);
++ 			if (image) {
++ 				printk(KERN_EMERG "by starting a new kernel ..\n");
++ 				mdelay(panic_timeout*1000);
++ 				machine_kexec(image);
++ 			}
++		}
++#endif
++ 
++
+ 		for (i = 0; i < panic_timeout; i++) {
+ 			touch_nmi_watchdog();
+ 			mdelay(1000);
+Index: linux-2.6.0-test6/kernel/sched.c
+===================================================================
+--- linux-2.6.0-test6.orig/kernel/sched.c	2003-10-09 20:52:02.864346224 +0800
++++ linux-2.6.0-test6/kernel/sched.c	2003-10-09 20:57:41.895805608 +0800
+@@ -44,6 +44,9 @@
+ #define cpu_to_node_mask(cpu) (cpu_online_map)
+ #endif
+ 
++/* used to soft spin in sched while dump is in progress */
++int dump_oncpu;
++
+ /*
+  * Convert user-nice values [ -20 ... 0 ... 19 ]
+  * to static priority [ MAX_RT_PRIO..MAX_PRIO-1 ],
+@@ -1463,6 +1466,15 @@
+ 	unsigned long run_time;
+ 	int idx;
+ 
++ 	/*
++	 * If crash dump is in progress, this other cpu's
++	 * need to wait until it completes.
++	 * NB: this code is optimized away for kernels without
++	 * dumping enabled.
++	 */
++	if (unlikely(dump_oncpu))
++		goto dump_scheduling_disabled;
++
+ 	/*
+ 	 * Test if we are atomic.  Since do_exit() needs to call into
+ 	 * schedule() atomically, we ignore that path for now.
+@@ -1586,6 +1598,16 @@
+ 	preempt_enable_no_resched();
+ 	if (test_thread_flag(TIF_NEED_RESCHED))
+ 		goto need_resched;
++
++	return;
++
++ dump_scheduling_disabled:
++	/* allow scheduling only if this is the dumping cpu */
++	if (dump_oncpu != smp_processor_id()+1) {
++		while (dump_oncpu)
++			cpu_relax();
++	}
++	return;
+ }
+ 
+ EXPORT_SYMBOL(schedule);
+Index: linux-2.6.0-test6/lib/Kconfig
+===================================================================
+--- linux-2.6.0-test6.orig/lib/Kconfig	2003-09-28 08:50:29.000000000 +0800
++++ linux-2.6.0-test6/lib/Kconfig	2003-10-09 20:57:41.895805608 +0800
+@@ -16,10 +16,17 @@
+ # compression support is select'ed if needed
+ #
+ config ZLIB_INFLATE
+-	tristate
++  	tristate
++ 	default y if CRAMFS=y || PPP_DEFLATE=y || JFFS2_FS=y || ZISOFS_FS=y || BINFMT_ZFLAT=y || CRYPTO_DEFLATE=y || CRASH_DUMP_COMPRESS_GZIP=y
++ 	default m if CRAMFS=m || PPP_DEFLATE=m || JFFS2_FS=m || ZISOFS_FS=m || BINFMT_ZFLAT=m || CRYPTO_DEFLATE=m || CRASH_DUMP_COMPRESS_GZIP=m
+ 
+ config ZLIB_DEFLATE
+ 	tristate
+-
++  	default m if PPP_DEFLATE!=y && JFFS2_FS!=y && CRYPTO_DEFLATE!=y && \
++ 		(PPP_DEFLATE=m || JFFS2_FS=m || CRYPTO_DEFLATE=m \
++ 			|| CRASH_DUMP_COMPRESS_GZIP=m )
++ 	default y if PPP_DEFLATE=y || JFFS2_FS=y || CRYPTO_DEFLATE=y \
++ 		|| CRASH_DUMP_COMPRESS_GZIP=y
++ 
+ endmenu
+ 
+Index: linux-2.6.0-test6/mm/page_alloc.c
+===================================================================
+--- linux-2.6.0-test6.orig/mm/page_alloc.c	2003-10-09 20:52:02.881343640 +0800
++++ linux-2.6.0-test6/mm/page_alloc.c	2003-10-09 20:57:41.897805304 +0800
+@@ -89,7 +89,8 @@
+ 	page->mapping = NULL;
+ }
+ 
+-#ifndef CONFIG_HUGETLB_PAGE
++#if !defined(CONFIG_HUGETLB_PAGE) && !defined(CONFIG_CRASH_DUMP) \
++	&& !defined(CONFIG_CRASH_DUMP_MODULE)
+ #define prep_compound_page(page, order) do { } while (0)
+ #define destroy_compound_page(page, order) do { } while (0)
+ #else
+Index: linux-2.6.0-test6/init/Makefile
+===================================================================
+--- linux-2.6.0-test6.orig/init/Makefile	2003-09-28 08:50:17.000000000 +0800
++++ linux-2.6.0-test6/init/Makefile	2003-10-09 20:57:41.897805304 +0800
+@@ -9,6 +9,9 @@
+ mounts-$(CONFIG_BLK_DEV_INITRD)	+= do_mounts_initrd.o
+ mounts-$(CONFIG_BLK_DEV_MD)	+= do_mounts_md.o
+ 
++extra-$(CONFIG_CRASH_DUMP)	+= kerntypes.o
++CFLAGS_kerntypes.o		:= -gstabs
++
+ # files to be removed upon make clean
+ clean-files := ../include/linux/compile.h
+ 
+@@ -24,3 +27,4 @@
+ include/linux/compile.h: FORCE
+ 	@echo '  CHK     $@'
+ 	@sh $(srctree)/scripts/mkcompile_h $@ "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CC) $(CFLAGS)"
++
+Index: linux-2.6.0-test6/init/main.c
+===================================================================
+--- linux-2.6.0-test6.orig/init/main.c	2003-10-09 20:52:02.850348352 +0800
++++ linux-2.6.0-test6/init/main.c	2003-10-09 20:57:41.897805304 +0800
+@@ -97,6 +97,16 @@
+ int system_running = 0;
+ 
+ /*
++ * The kernel_magic value represents the address of _end, which allows
++ * namelist tools to "match" each other respectively.  That way a tool
++ * that looks at /dev/mem can verify that it is using the right System.map
++ * file -- if kernel_magic doesn't equal the namelist value of _end,
++ * something's wrong.
++ */
++extern unsigned long _end;
++unsigned long *kernel_magic = &_end;
++
++/*
+  * Boot command-line arguments
+  */
+ #define MAX_INIT_ARGS 8
+Index: linux-2.6.0-test6/init/version.c
+===================================================================
+--- linux-2.6.0-test6.orig/init/version.c	2003-09-28 08:50:20.000000000 +0800
++++ linux-2.6.0-test6/init/version.c	2003-10-09 20:57:41.898805152 +0800
+@@ -10,6 +10,7 @@
+ #include <linux/uts.h>
+ #include <linux/utsname.h>
+ #include <linux/version.h>
++#include <linux/stringify.h>
+ 
+ #define version(a) Version_ ## a
+ #define version_string(a) version(a)
+@@ -28,3 +29,6 @@
+ const char *linux_banner = 
+ 	"Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@"
+ 	LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION "\n";
++
++const char *LINUX_COMPILE_VERSION_ID = __stringify(LINUX_COMPILE_VERSION_ID);
++LINUX_COMPILE_VERSION_ID_TYPE;
diff --git a/lustre/kernel_patches/patches/lustre_version.patch b/lustre/kernel_patches/patches/lustre_version.patch
index 6d2b7e6..7ebb838 100644
--- a/lustre/kernel_patches/patches/lustre_version.patch
+++ b/lustre/kernel_patches/patches/lustre_version.patch
@@ -1,6 +1,5 @@
-Version 36: don't dput dentry after error (b=2350), zero page->private (3119)
-Version 35: pass intent to real_lookup after revalidate failure (b=3285)
-Version 34: fix ext3 iopen assertion failure (b=2517, b=2399)
+
+
 
  include/linux/lustre_version.h |    1 +
  1 files changed, 1 insertion(+)
@@ -8,6 +7,6 @@ Version 34: fix ext3 iopen assertion failure (b=2517, b=2399)
 --- /dev/null	Fri Aug 30 17:31:37 2002
 +++ linux-2.4.18-18.8.0-l12-braam/include/linux/lustre_version.h	Thu Feb 13 07:58:33 2003
 @@ -0,0 +1 @@
-+#define LUSTRE_KERNEL_VERSION 36
++#define LUSTRE_KERNEL_VERSION 34
 
 _
diff --git a/lustre/kernel_patches/patches/mkdep-revert-rh-2.4.patch b/lustre/kernel_patches/patches/mkdep-revert-rh-2.4.patch
deleted file mode 100644
index 5cc34b8..0000000
--- a/lustre/kernel_patches/patches/mkdep-revert-rh-2.4.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Index: linux-2.4.20-30.9/scripts/mkdep.c
-===================================================================
---- linux-2.4.20-30.9.orig/scripts/mkdep.c	2004-02-19 19:40:51.000000000 -0500
-+++ linux-2.4.20-30.9/scripts/mkdep.c	2004-04-28 17:24:54.000000000 -0400
-@@ -48,8 +48,6 @@
- char __depname[512] = "\n\t@touch ";
- #define depname (__depname+9)
- int hasdep;
--char cwd[PATH_MAX];
--int lcwd;
- 
- struct path_struct {
- 	int len;
-@@ -204,22 +202,8 @@
- 		memcpy(path->buffer+path->len, name, len);
- 		path->buffer[path->len+len] = '\0';
- 		if (access(path->buffer, F_OK) == 0) {
--			int l = lcwd + strlen(path->buffer);
--			char name2[l+2], *p;
--			if (path->buffer[0] == '/') {
--				memcpy(name2, path->buffer, l+1);
--			}
--			else {
--				memcpy(name2, cwd, lcwd);
--				name2[lcwd] = '/';
--				memcpy(name2+lcwd+1, path->buffer, path->len+len+1);
--			}
--			while ((p = strstr(name2, "/../"))) {
--				*p = '\0';
--				strcpy(strrchr(name2, '/'), p+3);
--			}
- 			do_depname();
--			printf(" \\\n   %s", name2);
-+			printf(" \\\n   %s", path->buffer);
- 			return;
- 		}
- 	}
-@@ -601,12 +585,6 @@
- 		return 1;
- 	}
- 
--	if (!getcwd(cwd, sizeof(cwd))) {
--		fprintf(stderr, "mkdep: getcwd() failed %m\n");
--		return 1;
--	}
--	lcwd = strlen(cwd);
--
- 	add_path(".");		/* for #include "..." */
- 
- 	while (++argv, --argc > 0) {
diff --git a/lustre/kernel_patches/patches/nfs-cifs-intent-2.6.3-suse.patch b/lustre/kernel_patches/patches/nfs-cifs-intent-2.6.3-suse.patch
new file mode 100644
index 0000000..1a3d7f4
--- /dev/null
+++ b/lustre/kernel_patches/patches/nfs-cifs-intent-2.6.3-suse.patch
@@ -0,0 +1,111 @@
+.old..........pc/linux-2.6.3-nfs-intent-suse/fs/nfs/dir.c
+.new.........fs/nfs/dir.c
+.old..........pc/linux-2.6.3-nfs-intent-suse/fs/nfs/dir.c
+.new.........fs/nfs/dir.c
+Index: linux-2.6.3-20/fs/nfs/dir.c
+===================================================================
+--- linux-2.6.3-20.orig/fs/nfs/dir.c	2004-03-08 14:23:40.000000000 -0800
++++ linux-2.6.3-20/fs/nfs/dir.c	2004-03-08 17:07:34.000000000 -0800
+@@ -751,7 +751,7 @@
+ 	if (nd->flags & LOOKUP_DIRECTORY)
+ 		return 0;
+ 	/* Are we trying to write to a read only partition? */
+-	if (IS_RDONLY(dir) && (nd->intent.open.flags & (O_CREAT|O_TRUNC|FMODE_WRITE)))
++	if (IS_RDONLY(dir) && (nd->intent.it_flags & (O_CREAT|O_TRUNC|FMODE_WRITE)))
+ 		return 0;
+ 	return 1;
+ }
+@@ -772,7 +772,7 @@
+ 	dentry->d_op = NFS_PROTO(dir)->dentry_ops;
+ 
+ 	/* Let vfs_create() deal with O_EXCL */
+-	if (nd->intent.open.flags & O_EXCL)
++	if (nd->intent.it_flags & O_EXCL)
+ 		goto no_entry;
+ 
+ 	/* Open the file on the server */
+@@ -788,7 +788,7 @@
+ 				break;
+ 			/* This turned out not to be a regular file */
+ 			case -ELOOP:
+-				if (!(nd->intent.open.flags & O_NOFOLLOW))
++				if (!(nd->intent.it_flags & O_NOFOLLOW))
+ 					goto no_open;
+ 			/* case -EISDIR: */
+ 			/* case -EINVAL: */
+@@ -818,7 +818,7 @@
+ 	parent = dget_parent(dentry);
+ 	if (!is_atomic_open(parent->d_inode, nd))
+ 		goto no_open;
+-	openflags = nd->intent.open.flags;
++	openflags = nd->intent.it_flags;
+ 	if (openflags & O_CREAT) {
+ 		/* If this is a negative dentry, just drop it */
+ 		if (!inode)
+.old..........pc/linux-2.6.3-nfs-intent-suse/fs/nfs/nfs4proc.c
+.new.........fs/nfs/nfs4proc.c
+Index: linux-2.6.3-20/fs/nfs/nfs4proc.c
+===================================================================
+--- linux-2.6.3-20.orig/fs/nfs/nfs4proc.c	2004-03-05 02:07:03.000000000 -0800
++++ linux-2.6.3-20/fs/nfs/nfs4proc.c	2004-03-08 17:07:34.000000000 -0800
+@@ -778,17 +778,17 @@
+ 	struct nfs4_state *state;
+ 
+ 	if (nd->flags & LOOKUP_CREATE) {
+-		attr.ia_mode = nd->intent.open.create_mode;
++		attr.ia_mode = nd->intent.it_create_mode;
+ 		attr.ia_valid = ATTR_MODE;
+ 		if (!IS_POSIXACL(dir))
+ 			attr.ia_mode &= ~current->fs->umask;
+ 	} else {
+ 		attr.ia_valid = 0;
+-		BUG_ON(nd->intent.open.flags & O_CREAT);
++		BUG_ON(nd->intent.it_flags & O_CREAT);
+ 	}
+ 
+ 	cred = rpcauth_lookupcred(NFS_SERVER(dir)->client->cl_auth, 0);
+-	state = nfs4_do_open(dir, &dentry->d_name, nd->intent.open.flags, &attr, cred);
++	state = nfs4_do_open(dir, &dentry->d_name, nd->intent.it_flags, &attr, cred);
+ 	put_rpccred(cred);
+ 	if (IS_ERR(state))
+ 		return (struct inode *)state;
+.old..........pc/linux-2.6.3-nfs-intent-suse/fs/cifs/dir.c
+.new.........fs/cifs/dir.c
+Index: linux-2.6.3-20/fs/cifs/dir.c
+===================================================================
+--- linux-2.6.3-20.orig/fs/cifs/dir.c	2004-03-05 02:07:03.000000000 -0800
++++ linux-2.6.3-20/fs/cifs/dir.c	2004-03-08 17:16:19.000000000 -0800
+@@ -146,18 +146,18 @@
+ 	if(nd) { 
+ 		cFYI(1,("In create for inode %p dentry->inode %p nd flags = 0x%x for %s",inode, direntry->d_inode, nd->flags,full_path));
+ 
+-		if ((nd->intent.open.flags & O_ACCMODE) == O_RDONLY)
++		if ((nd->intent.it_flags & O_ACCMODE) == O_RDONLY)
+                 	desiredAccess = GENERIC_READ;
+-		else if ((nd->intent.open.flags & O_ACCMODE) == O_WRONLY)
++		else if ((nd->intent.it_flags & O_ACCMODE) == O_WRONLY)
+ 			desiredAccess = GENERIC_WRITE;
+-		else if ((nd->intent.open.flags & O_ACCMODE) == O_RDWR)
++		else if ((nd->intent.it_flags & O_ACCMODE) == O_RDWR)
+ 			desiredAccess = GENERIC_ALL;
+ 
+-		if((nd->intent.open.flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL))
++		if((nd->intent.it_flags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL))
+ 			disposition = FILE_CREATE;
+-		else if((nd->intent.open.flags & (O_CREAT | O_TRUNC)) == (O_CREAT | O_TRUNC))
++		else if((nd->intent.it_flags & (O_CREAT | O_TRUNC)) == (O_CREAT | O_TRUNC))
+ 			disposition = FILE_OVERWRITE_IF;
+-		else if((nd->intent.open.flags & O_CREAT) == O_CREAT)
++		else if((nd->intent.it_flags & O_CREAT) == O_CREAT)
+ 			disposition = FILE_OPEN_IF;
+ 		else {
+ 			cFYI(1,("Create flag not set in create function"));
+@@ -314,7 +314,7 @@
+ 	      parent_dir_inode, direntry->d_name.name, direntry));
+ 
+ 	if(nd) {  /* BB removeme */
+-		cFYI(1,("In lookup nd flags 0x%x open intent flags 0x%x",nd->flags,nd->intent.open.flags));
++		cFYI(1,("In lookup nd flags 0x%x open intent flags 0x%x",nd->flags,nd->intent.it_flags));
+ 	} /* BB removeme BB */
+ 	/* BB Add check of incoming data - e.g. frame not longer than maximum SMB - let server check the namelen BB */
+ 
diff --git a/lustre/kernel_patches/patches/qla2xxx-v8.00.00b1-2.5.73.patch b/lustre/kernel_patches/patches/qla2xxx-v8.00.00b1-2.5.73.patch
new file mode 100644
index 0000000..88726a3
--- /dev/null
+++ b/lustre/kernel_patches/patches/qla2xxx-v8.00.00b1-2.5.73.patch
@@ -0,0 +1,58389 @@
+ drivers/scsi/Kconfig                |    2 
+ drivers/scsi/Makefile               |    1 
+ drivers/scsi/qla2xxx/Kconfig        |   37 
+ drivers/scsi/qla2xxx/Makefile       |   56 
+ drivers/scsi/qla2xxx/README.qla2x00 |  744 ++++
+ drivers/scsi/qla2xxx/exioct.h       |  947 +++++
+ drivers/scsi/qla2xxx/exioctln.h     |  255 +
+ drivers/scsi/qla2xxx/inioct.h       |  129 
+ drivers/scsi/qla2xxx/ql2100tp_fw.c  | 4866 ++++++++++++++++++++++++++
+ drivers/scsi/qla2xxx/ql2200ip_fw.c  | 5884 ++++++++++++++++++++++++++++++++
+ drivers/scsi/qla2xxx/ql2300tpx_fw.c | 6494 +++++++++++++++++++++++++++++++++++
+ drivers/scsi/qla2xxx/qla_cfg.c      | 2780 +++++++++++++++
+ drivers/scsi/qla2xxx/qla_cfg.h      |  181 
+ drivers/scsi/qla2xxx/qla_cfgln.c    |  726 +++
+ drivers/scsi/qla2xxx/qla_dbg.c      | 1000 +++++
+ drivers/scsi/qla2xxx/qla_dbg.h      |  138 
+ drivers/scsi/qla2xxx/qla_def.h      | 2484 +++++++++++++
+ drivers/scsi/qla2xxx/qla_fo.c       | 1681 +++++++++
+ drivers/scsi/qla2xxx/qla_fo.cfg     |   31 
+ drivers/scsi/qla2xxx/qla_fo.h       |   75 
+ drivers/scsi/qla2xxx/qla_gbl.h      |  395 ++
+ drivers/scsi/qla2xxx/qla_inioct.c   |  495 ++
+ drivers/scsi/qla2xxx/qla_init.c     | 5945 ++++++++++++++++++++++++++++++++
+ drivers/scsi/qla2xxx/qla_inline.h   |  375 ++
+ drivers/scsi/qla2xxx/qla_iocb.c     | 1276 ++++++
+ drivers/scsi/qla2xxx/qla_ip.c       | 1769 +++++++++
+ drivers/scsi/qla2xxx/qla_ip.h       |  420 ++
+ drivers/scsi/qla2xxx/qla_isr.c      | 1474 ++++++++
+ drivers/scsi/qla2xxx/qla_listops.h  |  397 ++
+ drivers/scsi/qla2xxx/qla_mbx.c      | 2884 +++++++++++++++
+ drivers/scsi/qla2xxx/qla_os.c       | 5879 ++++++++++++++++++++++++++++++++
+ drivers/scsi/qla2xxx/qla_os.h       |  156 
+ drivers/scsi/qla2xxx/qla_settings.h |   80 
+ drivers/scsi/qla2xxx/qla_sup.c      |  560 +++
+ drivers/scsi/qla2xxx/qla_vendor.c   |  193 +
+ drivers/scsi/qla2xxx/qla_version.h  |   31 
+ drivers/scsi/qla2xxx/qla_xioct.c    | 6589 ++++++++++++++++++++++++++++++++++++
+ drivers/scsi/qla2xxx/qlfo.h         |  413 ++
+ drivers/scsi/qla2xxx/qlfolimits.h   |   92 
+ drivers/scsi/qla2xxx/qlfoln.h       |   76 
+ drivers/scsi/qla2xxx/release.txt    |   22 
+ drivers/scsi/qla2xxx/revision.notes |  167 
+ 42 files changed, 58199 insertions(+)
+
+--- linux-2.5.73/drivers/scsi/Makefile~qla2xxx-v8.00.00b1-2.5.73	Sun Jun 22 11:33:08 2003
++++ linux-2.5.73-n9560/drivers/scsi/Makefile	Thu Jul  3 15:34:28 2003
+@@ -73,6 +73,7 @@ obj-$(CONFIG_SCSI_QLOGIC_FAS)	+= qlogicf
+ obj-$(CONFIG_SCSI_QLOGIC_ISP)	+= qlogicisp.o 
+ obj-$(CONFIG_SCSI_QLOGIC_FC)	+= qlogicfc.o 
+ obj-$(CONFIG_SCSI_QLOGIC_1280)	+= qla1280.o 
++obj-$(CONFIG_SCSI_QLA2XXX)      += qla2xxx/
+ obj-$(CONFIG_SCSI_PAS16)	+= pas16.o
+ obj-$(CONFIG_SCSI_SEAGATE)	+= seagate.o
+ obj-$(CONFIG_SCSI_FD_8xx)	+= seagate.o
+--- linux-2.5.73/drivers/scsi/Kconfig~qla2xxx-v8.00.00b1-2.5.73	Sun Jun 22 11:33:16 2003
++++ linux-2.5.73-n9560/drivers/scsi/Kconfig	Thu Jul  3 15:34:28 2003
+@@ -1283,6 +1283,8 @@ config SCSI_QLOGIC_1280
+ 	  The module will be called qla1280. If you want to compile it as
+ 	  a module, say M here and read <file:Documentation/modules.txt>.
+ 
++source "drivers/scsi/qla2xxx/Kconfig"
++
+ config SCSI_QLOGICPTI
+ 	tristate "PTI Qlogic, ISP Driver"
+ 	depends on SBUS && SCSI
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/Kconfig	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,37 @@
++config SCSI_QLA2XXX
++	bool "QLogic QLA2XXX FC-SCSI support (v8)"
++	---help---
++	help here...
++
++config SCSI_QLA2XXX_QLA21XX
++	tristate "QLogic QLA21xx FC-SCSI support (v8)"
++	depends on SCSI_QLA2XXX
++	---help---
++	help here...
++
++	If you want to compile the driver as a module ( = code which can be
++	inserted in and removed from the running kernel whenever you want),
++	say M here and read <file:Documentation/modules.txt>.  The module
++	will be called qla2100.
++
++config SCSI_QLA2XXX_QLA22XX
++	tristate "QLogic QLA22xx FC-SCSI support (v8)"
++	depends on SCSI_QLA2XXX
++	---help---
++	help here...
++
++	If you want to compile the driver as a module ( = code which can be
++	inserted in and removed from the running kernel whenever you want),
++	say M here and read <file:Documentation/modules.txt>.  The module
++	will be called qla2200.
++
++config SCSI_QLA2XXX_QLA23XX
++	tristate "QLogic QLA23xx FC-SCSI support (v8)"
++	depends on SCSI_QLA2XXX
++	---help---
++	help here...
++
++	If you want to compile the driver as a module ( = code which can be
++	inserted in and removed from the running kernel whenever you want),
++	say M here and read <file:Documentation/modules.txt>.  The module
++	will be called qla2300.
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/Makefile	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,56 @@
++# Kernel makefile for 8.x series QLogic Fibre Channel driver.
++#
++EXTRA_CFLAGS += -Idrivers/scsi -I$(obj) -DUNIQUE_FW_NAME
++
++ISPTYPES := qla2100 qla2200 qla2300
++ISPDIRS := $(foreach dir, $(ISPTYPES), $(addsuffix /, $(addprefix .,$(dir))))
++
++ISP2100_FW := ql2100tp_fw.o
++ISP2200_FW := ql2200ip_fw.o
++ISP2300_FW := ql2300tpx_fw.o #ql2322tpx_fw.o
++
++COMMON_SRCS := qla_os.c qla_init.c qla_mbx.c qla_iocb.c qla_isr.c qla_xioct.c qla_inioct.c \
++		qla_dbg.c qla_sup.c qla_fo.c qla_cfg.c qla_cfgln.c qla_vendor.c
++COMMON_OBJS := $(foreach file, $(COMMON_SRCS), $(patsubst %.c, %.o, $(file)))
++
++ISP2100_DIR_SRCS := $(foreach file, $(COMMON_SRCS), $(addprefix .qla2100/,$(file)))
++ISP2100_DIR_OBJS := $(foreach file, $(COMMON_OBJS), $(addprefix .qla2100/,$(file)))
++ISP2200_DIR_SRCS := $(foreach file, $(COMMON_SRCS), $(addprefix .qla2200/,$(file)))
++ISP2200_DIR_OBJS := $(foreach file, $(COMMON_OBJS), $(addprefix .qla2200/,$(file)))
++ISP2300_DIR_SRCS := $(foreach file, $(COMMON_SRCS), $(addprefix .qla2300/,$(file)))
++ISP2300_DIR_OBJS := $(foreach file, $(COMMON_OBJS), $(addprefix .qla2300/,$(file)))
++
++PREPALL := $(shell for dir in $(ISPDIRS) ; \
++	do \
++		if [ ! -d $(obj)/$${dir} ] ; then \
++			mkdir $(obj)/$${dir} ; \
++		fi ; \
++	 	for link in $(foreach file, $(COMMON_OBJS), $(patsubst %.o, %.c, $(file))) ; \
++	 	do \
++			if [ ! -h $(obj)/$${dir}$${link} ] ; then \
++				ln -sf ../$${link} $(obj)/$${dir}$${link} ; \
++			fi ; \
++	 	done \
++	done)
++
++obj-$(CONFIG_SCSI_QLA2XXX_QLA21XX) += qla2100.o
++obj-$(CONFIG_SCSI_QLA2XXX_QLA22XX) += qla2200.o
++obj-$(CONFIG_SCSI_QLA2XXX_QLA23XX) += qla2300.o
++
++$(obj)/qla2100.o: $(PREPALL)
++$(obj)/qla2100.o: ISPTYPE := qla21xx
++$(obj)/qla2100.o: EXTRA_CFLAGS += -D$(ISPTYPE)
++
++$(obj)/qla2200.o: $(PREPALL)
++$(obj)/qla2200.o: ISPTYPE := qla22xx
++$(obj)/qla2200.o: EXTRA_CFLAGS += -D$(ISPTYPE)
++
++$(obj)/qla2300.o: $(PREPALL)
++$(obj)/qla2300.o: ISPTYPE := qla23xx
++$(obj)/qla2300.o: EXTRA_CFLAGS += -D$(ISPTYPE) -DTPX -DEXTENDED_IDS 
++
++qla2100-objs := $(ISP2100_DIR_OBJS) $(ISP2100_FW) 
++qla2200-objs := $(ISP2200_DIR_OBJS) $(ISP2200_FW) 
++qla2300-objs := $(ISP2300_DIR_OBJS) $(ISP2300_FW) 
++
++clean-files := $(ISP2100_DIR_SRCS) $(ISP2200_DIR_SRCS) $(ISP2300_DIR_SRCS)
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/README.qla2x00	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,744 @@
++                 QLogic Fibre Channel Driver
++     for Red Hat Linux 7.2, 7.3, and Advanced Server 2.1
++             and Suse Linux 7.3, and Enterprise 7
++
++Products supported: QLA22XX, QLA23XX
++
++09/10/2002
++
++Contents
++--------
++
++1. OS Support
++
++2. Supported Features
++
++3. Release History
++
++4. Saving the Driver Source to Diskette
++
++5. Installing the Driver
++
++   5.1  Building the driver from the Source
++   5.1.1. Building a Uni-Processor (UP) version of the driver
++   5.1.2. Building a Symmetric Multi-Processor(SMP) version of the
++          Driver
++   5.2  Load the Driver Manually using INSMOD or MODPROBE
++   5.3  Making a RAMDISK Image to Load the Driver
++
++6. Driver Parameters
++
++   6.1  System Parameters
++   6.1.1  Multiple LUN Support
++   6.2  NVRAM Parameters
++   6.3  Driver Command Line Parameters
++
++7. Limitations
++
++8. Additional Notes
++
++   8.1 Proc Filesystem Support
++   8.2 Co-existence of QLogic 4.x and 6.x Linux Drivers
++   8.3 Failover Support 
++   8.3.1 How to enable the  Failover support in the Driver
++   8.3.2 Using SANsurfer with QLA2XXX Driver the First Time
++   8.3.3 Configuration Changes Made via SANsurfer
++   8.4 Persistent Binding	
++
++9. Diskette Content
++
++10. Contacting QLogic
++
++
++**********************************************************************
++
++
++1. OS Support 
++-------------
++
++This driver works with Red Hat Linux 7.2, 7.3, and Advanced Server 
++2.1 and Suse Linux 7.3 and Enterprise 7. Earlier or later versions 
++of Linux may be supported but were not tested at the time of this 
++release. Refer to the SUPPORTED_KERNEL_VERSION.txt file for a list
++of kernel versions tested with this release.
++
++
++**********************************************************************
++
++
++2. Supported Features
++---------------------
++
++* FCAL - direct attach loop
++* Point-to-point
++* Fabric support
++* Initiator mode only
++* Fault recovery on down loops
++* Persistent binding 
++* Extended LUN support up to 255 LUNs
++* FC tape support
++* IPFC support
++* Non Failover and Failover capability
++
++
++**********************************************************************
++
++
++3. Release History
++------------------
++
++Please refer to Release Notes (release.txt).
++
++
++**********************************************************************
++
++
++4. Saving the Driver Source to Diskette
++---------------------------------------
++
++1. Download the failover or non-failover qla2x00src-vx.yy-*.tgz file 
++   from QLogic's website.
++
++   * Failover compressed file has suffix "fo" while non failover 
++     does not.		
++
++2. If prompted "What would you like to do with this file?" choose 
++   "Save this file to disk."
++3. Insert a blank diskette and download to the diskette directly.
++
++
++**********************************************************************
++
++
++5. Installing the Driver 
++------------------------
++
++NOTE: Refer to the file BUILD_KERNEL.txt for instructions on how 
++      to build a custom kernel with the QLogic Driver embedded.
++
++5.1  Building a Driver from the Source Code 
++-------------------------------------------
++
++From the source code, you can build a qla2200.o or qla2300.o for
++your UP or SMP system, and load the driver manually or automatically
++using a RAMDISK image during system boot time.
++
++
++5.1.1 Building a Uni-Processor (UP) Version of the Driver
++---------------------------------------------------------
++
++1. Extract the kernel-headers and kernel-sources RPM files from the 
++   first RedHat CD:
++
++       # cd /mnt/cdrom/RedHat/RPMS
++       # rpm -iv kernel-headers*.rpm (not required for Red Hat 7.3)
++       # rpm -iv kernel-source*.rpm
++
++2. Using the diskette you created in Section 4, copy the
++   qla2x00src-vx.yy-*.tgz file to /qla2x00. Follow these steps from
++   the "/" (root) directory:
++
++       # mkdir qla2x00
++       # cd qla2x00
++       # mount /mnt/floppy
++       # cp /mnt/floppy/*.tgz . (the period at the end is required)
++       # tar -xvzf *.tgz
++       # cd qlogic
++       # ./drvsetup (this will extract the source files in to the 
++                     current directory)
++
++3. Build the Driver qla2200.o and qla2300.o from the source code by
++   typing:
++
++       # make all
++
++   For SuSE Distribution:
++	
++       # make all OSVER=linux
++
++4. To load the driver manually, see section 5.2. To make a RAMDISK
++   image to load the driver during system boot time, see section 5.3.
++
++
++5.1.2. Building a Symmetric Multi-Processor (SMP) Version of the Driver
++-----------------------------------------------------------------------
++
++1. Extract the kernel-headers and kernel-source RPM files from the 
++   first RedHat CD:
++
++       # cd /mnt/cdrom/RedHat/RPMS
++       # rpm -iv kernel-headers*.rpm (not required for Red Hat 7.3)
++       # rpm -iv kernel-source*.rpm
++
++2. Using the diskette you created in Section 4, copy the
++   qla2x00src-vx.yy-*.tgz file to /qla2x00. Follow these steps from
++   the "/" (root) directory:
++
++       # mkdir qla2x00
++       # cd qla2x00
++       # mount /mnt/floppy
++       # cp /mnt/floppy/*.tgz . (the period at the end is required)
++       # tar -xvzf *.tgz
++       # cd qlogic
++       # ./drvsetup (this will extract the source files in to the
++                     current directory)
++
++3. Build the Driver qla2200.o and qla2300.o from the source code by
++   typing:
++
++       # make all SMP=1
++
++   For SuSE Distribution:
++	
++       # make all SMP=1 OSVER=linux
++
++4. To load the driver manually, see section 5.2. To make a RAMDISK 
++   image to load the driver during system boot time, see section 5.3.
++
++
++5.2  Load the Driver Manually using INSMOD or MODPROBE
++------------------------------------------------------
++
++Before loading the driver manually, first build the driver binary from
++the driver source files as described in sections 5.1.1 and 5.1.2.
++
++- To load the driver directly from the local build directory, type
++  the following:
++
++       # insmod qla2200.o
++               or
++       # insmod qla2300.o        
++
++- To load the driver using modprobe:
++
++       1. Build the driver qla2200.o and qla2300.o from the source
++          code by typing:
++
++          # make all install
++
++	  For SuSE Distribution:
++	
++       	  # make all OSVER=linux install
++
++       2. To ensure that the older driver binary included in the
++          original distribution does not interfere with the updated
++          version, please rename the old driver binary as follows:
++
++          # cd /lib/modules/<kernel_version>/kernel/drivers/addon/qla2200
++          # mv qla2200.o qla2200_rh.o
++          # mv qla2300.o qla2300_rh.o
++
++       3. Type the following to load the Driver:
++
++          # modprobe qla2200
++                  or
++          # modprobe qla2300
++
++
++5.3  Making a RAMDISK Image to Load the Driver
++----------------------------------------------
++
++1. Build the Driver binary files (see 5.1.1 and 5.1.2).
++
++2. Copy the files to:
++
++     /lib/modules/<kernel version>/kernel/drivers/scsi/
++
++
++NOTE:  To ensure that the older Driver binary included in the original
++       distribution does not interfere with the updated version, 
++       please rename the old Driver binary as follows:
++
++       # cd /lib/modules/<kernel_version>/kernel/drivers/addon/qla2200
++       # mv qla2200.o qla2200_rh.o
++       # mv qla2300.o qla2300_rh.o
++
++3. Add the following line to /etc/modules.conf.
++
++       alias scsi_hostadapter0 qla2200
++              or
++       alias scsi_hostadapter0 qla2300
++
++NOTE: Must add one entry for each HBA in the system. For example,
++      If two QLA2200 hbas are installed add the following:
++
++      alias scsi_hostadapter0 qla2200
++      alias scsi_hostadapter1 qla2200
++
++4. Type the following command:
++
++         # mkinitrd -f <ramdisk image file name> <kernel version>
++
++NOTE: This step will overwrite the original ramdisk image file if 
++      executed within the /boot directory. Specify a unique ramdisk
++      image name to preserve the original ramdisk image.
++
++       - Copy the file to /boot.
++
++   For SuSE Distribution:
++
++       - Type the following command:
++
++         # /sbin/mk_initrd
++
++       NOTE: By default, the RAMDISK images created are:
++
++         /boot/initrd
++         /boot/initrd.suse
++
++5. Configure the boot loader with the new RAMDISK image.  
++
++   For LILO:
++
++	Add "initrd=/boot/<ramdisk file name>" in 
++	/etc/lilo.conf under one of the kernel entries 
++	to use the RAMDISK image.
++  
++	Run "lilo" and reboot system. Select the kernel 
++	with the new RAMDISK image to come up.
++
++   For GRUB:
++
++	Add "initrd=/boot/<RAMDISK file name>" in 
++	/etc/grub.conf under one of the kernel entries 
++	to use the RAMDISK image.
++
++**********************************************************************
++
++
++6. Driver Parameters
++--------------------
++
++The Driver parameters are divided into System Parameters and NVRAM 
++Parameters sections.
++
++
++6.1  System Parameters
++----------------------
++
++6.1.1  Multiple LUN Support
++--------------------------
++
++Support for multiple LUNs can be configured in one of three ways. 
++Currently, the maximum number of LUNs that can be scanned for each
++device is 128.
++
++The kernel must be configured to have multiple LUN support enabled
++in order for non-zero LUNs to be configured and accessible.  Use
++"make menuconfig" (as described in step 6, section 5.1) to build a
++kernel which has the option under SCSI Support enabled to probe all
++LUNs on SCSI devices.
++
++
++NOTE:  If you have multiple adapters, set max_scsi_luns to the
++       largest number of LUNs supported by any one of these adapters.
++
++- To configure multiple LUN support during boot time, type the 
++following at the boot prompt:
++
++boot: linux max_scsi_luns=128
++
++- If the SCSI Mid-Layer is compiled as a module, add the following
++line to the /etc/modules.conf file to scan for multiple LUNs at
++each boot:
++
++options scsi_mod max_scsi_luns=128
++
++- If the SCSI Mid-Layer is not compiled as a module, the boot loader
++can be configured to scan for multiple LUNs each time the system
++boots.
++
++For LILO, perform the following steps:
++
++a) Add the following line to each of the kernel images listed in the
++   /etc/lilo.conf file:
++
++append="max_scsi_luns=128"
++
++b) Run "lilo" and reboot the system.
++
++For GRUB, perform the following steps:
++
++a) Append the max_scsi_luns parameters to each of the kernel images 
++listed in the /etc/grub.conf file. For example:
++
++kernel /vmlinux-2.4.7-10 ro root=/dev/hda2 max_scsi_luns=128
++
++b) Reboot the system.
++
++
++6.2  NVRAM Parameters
++---------------------
++
++The NVRAM features described below are hard-coded in the Driver. The 
++changes made for the particular NVRAM feature in the Fast!Util do not
++take effect unless otherwise noted.
++
++None.
++
++
++6.3  Driver Command Line Parameters
++-----------------------------------
++
++'verbose' and 'quiet' are the available command line options.
++
++ verbose - Verbose detail debug information
++
++ quiet   - Driver does not display:
++              Waiting for LIP to complete....
++              scsi%d: Topology - %s, Host Loop address 0x%x
++              scsi(%d): LIP occurred
++              scsi(%d): LIP reset occurred
++
++ Usage examples:
++
++           # insmod qla2200.o options = verbose
++           # insmod qla2300.o options = verbose
++           # insmod qla2200.o ql2xopts = quiet
++           # insmod qla2300.o ql2xopts = quiet
++
++
++**********************************************************************
++
++
++7. Limitations
++--------------
++
++	N/A
++ 
++
++**********************************************************************
++
++
++8. Additional Notes
++---------------------
++
++
++8.1  Proc Filesystem Support
++-----------------------------
++
++The /proc filesystem for the QLA2200 and QLA2300 driver can be found
++in the /proc/scsi/qla2200/ and /proc/scsi/qla2300/ directories. These 
++directories contain a file for each QLogic Fibre Channel adapter
++in the system. Each file will present information about the adapter
++and transfer statistics for each discovered LUN.
++
++
++8.2  Co-existence of QLogic 4.x and 6.x Linux Drivers
++-----------------------------------------------------
++
++The 4.x driver provides support for QLA2100, QLA2200, and QLA23xx.
++The 6.x driver supports the QLA2200 and QLA23xx only. To make the
++drivers "co-exist", perform the following:
++
++  Option 1.  4.x support for QLA2100
++             6.x support for QLA2200 and QLA23xx
++
++	 o Remove QLA2200/QLA2300/QLA2312 support from the 4.x series
++           driver:
++
++	 - Edit the qla2x00.c file
++
++	 - Look for the following line:
++
++		{"QLA2300 ", QLA2300_DEVICE_ID,           MAX_BUSES,
++
++	   OR
++
++		{"QLA2312 ", QLA2312_DEVICE_ID,           MAX_BUSES,
++
++	 - Above the found line, add this line:
++
++	 	 #if 0
++
++	 - The resulting lines should read as:
++
++	 	 #if 0
++	 	 {"QLA2300 ", QLA2300_DEVICE_ID,           MAX_BUSES,
++
++	   OR
++
++	 	 #if 0
++	 	 {"QLA2312 ", QLA2312_DEVICE_ID,           MAX_BUSES,
++
++	 - Look for the following line:
++
++	 	 {"QLA2100 ", QLA2100_DEVICE_ID,           MAX_BUSES,
++
++	 - Above the found line, add this line:
++
++	 	 #endif
++
++	 - The resulting lines should read as:
++
++	 	 #endif
++	 	 {"QLA2100 ", QLA2100_DEVICE_ID,           MAX_BUSES,
++
++  Option 2.  4.x support for QLA2100 and QLA2200
++             6.x support for QLA23xx
++
++         o Remove QLA2300/QLA2312 support from the 4.x series driver:
++
++	 - Edit the qla2x00.c file
++
++	 - Look for the following line:
++
++		{"QLA2300 ", QLA2300_DEVICE_ID,           MAX_BUSES,
++
++	   OR
++
++		{"QLA2312 ", QLA2312_DEVICE_ID,           MAX_BUSES,
++
++	 - Above the found line, add this line:
++
++	 	 #if 0
++
++	 - The resulting lines should read as:
++
++	 	 #if 0
++	 	 {"QLA2300 ", QLA2300_DEVICE_ID,           MAX_BUSES,
++
++	   OR
++
++	 	 #if 0
++	 	 {"QLA2312 ", QLA2312_DEVICE_ID,           MAX_BUSES,
++
++	 - Look for the following line:
++
++	 	 {"QLA2200 ", QLA2200_DEVICE_ID,           MAX_BUSES,
++
++	 - Above the found line, add this line:
++
++	 	 #endif
++
++	 - The resulting lines should read as:
++
++	 	 #endif
++	 	 {"QLA2200 ", QLA2200_DEVICE_ID,           MAX_BUSES,
++
++
++8.3 Failover Support
++---------------------
++
++8.3.1 How to enable the  Failover support in the Driver
++-------------------------------------------------------
++
++Failover support can be enabled in the QLA2XXX driver by enabling the
++macro MPIO_SUPPORT in qla_settings.h file ie
++
++#define MPIO_SUPPORT                    1
++
++Note: The failover distribution package, qla2x00src-vx.yy.zz-fo.tgz, 
++has the above macro enabled by default.
++
++
++8.3.2 Using SANsurfer with QLA2XXX Driver the First Time
++________________________________________________________
++
++1. To work with SANsurfer, the driver should always be built
++   with MPIO_SUPPORT set to 1 in qla_settings.h.
++
++2. Add the following parameter in modules.conf file:
++
++   options qla2200 ConfigRequired=1 ql2xopts=
++             or
++   options qla2300 ConfigRequired=1 ql2xopts=
++
++3. Now you can load the driver and SANsurfer.
++
++
++8.3.3 Configuration Changes Made via SANsurfer
++--------------------------------------------
++
++1. LUN Masking
++
++   For the new LUN masking configuration to take effect, the
++   driver must be reloaded.  The following is an example of
++   the sequence of actions to take:
++
++   - Load the driver:
++
++     modprobe <driver>
++
++   - Load the qlremote agent.
++
++   - Start the GUI and connect it to the destination system.
++
++   - Make LUN masking changes.
++
++   - Disconnect the host from GUI and stop qlremote agent.
++
++   - Unload the driver:
++
++     modprobe -r <driver>
++
++   - Reload the driver:
++
++     modprobe <driver>
++
++   - Load qlremote agent again.
++
++   - Start the GUI and connect it to the destination system.
++
++   Now you should see the updated LUN masking configuration.
++
++Please note that when using modprobe to load the driver, the
++length of the option line specified in /etc/modules.conf file
++has a limit of 2K characters. Any longer option line will cause
++a string overflow error from modprobe.
++
++
++8.4 Persistent Binding
++______________________
++
++
++The Persistent Binding information consists of some adapter parameter
++entries along with some target entries. However, the Linux entries 
++have been shorten to save space on the command line. Currently, there
++is no limit on the size of the command line when using modprobe. But,
++if you embedded the driver in the kernel you are using lilo that has 
++a string size limitation.
++
++Persistent Binding  can be specified in two ways. Manually or using
++SANsurfer. We recommend using SANsurfer for ease of use. Reference 
++section 8.3.3 for additonal information about SANsurfer. The 
++following is the procedure to manually add persistent binding 
++commands: 
++
++The driver displays the current configuration when the displayConfig
++command line option is specified. The persistent binding 
++configuration is found in /var/log/messages file. It prints the 
++configuration information in the format required by the driver.
++The best way to extract configuration messages is to use grep and 
++direct the output to a file. You need to remove the Linux timestamp at
++the beginning of each message and combine them together on single line.
++For example
++        #insmod qla2200 displayConfig=1
++        #grep "scsi-qla" /var/log/messages > /tmp/info.cfg
++
++The format of the persistent binding commands is as follows: 
++
++Device descriptions
++
++scsi-qla<#>-adapter-port=<adapter port name value>;
++The designated by qla<#>, where the <#> is the adapter instance number.
++
++The parameter specifies the FC port name to be used for the adapter.
++where <adapter port name value> is the FC port name value in hexa-
++    decimal format.  If this entry is not specified in the conf file,
++    the default value is the adapter's port name as saved in the NVRAM.
++Example:
++scsi-qla00-adapter-port=210000e08b01158d\;
++
++host adapter instance 0 has a portname of 210000e08b01158d
++
++scsi-qla<#1>-tgt-<#2>-di-<#3>-node=<device FC name>;
++This parameter associates the specified <device FC name> with the
++SCSI target ID value specified by <#2> and a device id value specified
++by <#3>. where <device FC name> type is the FC node name of the 
++device, and <#2> is the SCSI target ID to be assigned to the device 
++and <#3> is the device unique id.
++Where
++   <#1>   Specifies the adapter instance number   
++   <#2>   Specifies the SCSI ID of Target
++   <#3>   Specifies the path/device id	
++
++scsi-qla<#1>-tgt-<#2>-di-<#3>-port=<device FC name>;
++This parameter associates the specified <device FC name> with the
++SCSI target ID value specified by <#2> and a device id value specified
++by <#3>. where <device FC name> type is the FC port 
++Where
++   <#1>   Specifies the adapter instance number   
++   <#2>   Specifies the SCSI ID of Target
++   <#3>   Specifies the path/device id	(always 0 for non-failover)
++
++name of the device, and <#2> is the SCSI target ID to be assigned to 
++the device and <#3> is the device unique id.
++
++scsi-qla<#1>-tgt-<#2>-di-<#3>-disabled=<256 bit mask>;
++This parameter associates the specified <256 bit mask> with the
++SCSI target ID value specified by <#2> and a device id value specified
++by <#3>. 
++
++Where
++   <#1>   Specifies the adapter instance number   
++   <#2>   Specifies the SCSI ID of Target
++   <#3>   Specifies the path/device id	
++
++<256 bit mask>
++msb                                                            lsb
++ 000000000000000000000000000000000000000000000000000000000000000F
++
++the mask above will make the first four luns, 3, 2, 1, and 0 of a 
++given Target disabled on that target/path.
++
++This mask specification is heavily type checked to be a sequence of
++64 hex digits.
++
++**********************************************************************
++
++
++9. Diskette Content 
++--------------------
++
++The qla2x00src-vx.yy.zz-*.tgz files can be extracted into the 
++following files:
++
++       listops.h
++       Makefile.kernel
++       Config.in
++       makefile
++       qla_settings.h
++       qla_debug.h
++       ql2100_fw.h
++       ql2200_fw.h
++       ql2300_fw.h
++       ql2200ip_fw.h
++       ql2300ip_fw.h
++       qla2100.c
++       qla2200.c
++       qla2300.c
++       qla2x00.c
++       qla2x00.h
++       qla2x00_ioctl.c
++       qla_vendor.c
++       qla_cfg.c
++       qla_cfgln.c
++       qla_fo.c
++       qla_fo.cfg 
++       qla_inioct.c
++       qla_ip.c
++       qla_mbx.c
++       qla_mbx.h
++       exioctln.h
++       exioct.h
++       inioct.h
++       qla_cfg.h
++       qla_fo.h
++       qla_gbl.h
++       qla_ip.h
++       qlfo.h
++       qlfolimits.h
++       qlfoln.h
++       qla_version.h
++       revision.notes - Revision history
++       release.txt - Release notes
++       README.qla2x00 - This file
++
++
++**********************************************************************
++
++
++10. Contacting QLogic 
++---------------------
++
++Please visit QLogic's website (www.qlogic.com). On this site you will
++find product information, our latest drivers, and links for technical
++assistance if needed.
++
++
++======================================================================
++
++
++    Copyright (c) 2003 QLogic Corporation. All rights reserved 
++    worldwide. 
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/exioct.h	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,947 @@
++/******************************************************************************
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ ******************************************************************************/
++
++/*
++ * File Name: exioct.h
++ *
++ * San/Device Management Ioctl Header
++ * File is created to adhere to Solaris requirement using 8-space tabs.
++ *
++ * !!!!! PLEASE DO NOT REMOVE THE TABS !!!!!
++ * !!!!! PLEASE NO SINGLE LINE COMMENTS: // !!!!!
++ * !!!!! PLEASE NO MORE THAN 80 CHARS PER LINE !!!!!
++ *
++ * Revision History:
++ *
++ * Rev. 0	March 1, 2000
++ * YPL	- Created.
++ *
++ * Rev. 1	March 2, 2000
++ * RLU	- Updated with latest definitions.  Added more comments.
++ *
++ * Rev. 2	May 16, 2000		    
++ * SP	- Updated definitions and changed structures (March 27, 2000)
++ * SP   - Addded structures 
++ *
++ * Rev. 3	June 1, 2000		     
++ * THL	- Made major changes to include all changes talked in our meeting.
++ *
++ * Rev. 4	June 5, 2000
++ * RLU	- Added new definitions/structures for SDM_GET_AEN and SDM_REG_AEN 
++ *	  functions.
++ *	- Major definition/structure name changes as discussed in meetings.
++ *	- Deleted duplicated command code and structure definitions.
++ *
++ * Rev. 4.1	June 14, 2000
++ * WTR  - Moved Solaris specific defines to exioctso.h. This makes it
++ *	  possible for application developers to include only exioct.h
++ *	  in their Solaris application development.
++ *
++ * Rev. 4.2	June 15, 2000
++ * THL  - Changed UINT16 and UINT32 back to WORD and DWORD for NT; otherwise,
++ *	  NT will get a compilation error for redefining UINT16 and UINT32.
++ *	  Added RISC_CODE/FLASH_RAM macros.
++ *
++ * Rev. 4.3	June 22, 2000
++ * THL  - Changed SDM_FC_ADDR according to External Ioctls document.
++ *	  Added SDM_DEF_TYPE macros.
++ *
++ * Rev. 4.4	June 22, 2000
++ * THL  - Moved NT specific defines to exioctnt.h.
++ *
++ * Rev. 4.5     August 15, 2000
++ * SP   - Rolled back some changes made by Todd R.
++ *	  Kept new status code SDM_STATUS_NO_MEMORY
++ *	  Port types fabric and tape device 
++ *
++ * Rev. 4.7     Sep 6, 2000
++ * YPL  - Replace SDM_ with EXT_, _ISP with _CHIP.
++ *	  Add vendor specific statuses, device update, config defines.
++ *
++ * Rev. 5.0     Sep 13, 2000
++ * YPL  - Update version to 5, remove max defines, make port type bit.
++ *	  Change HBA_PORT_PROPERTY to have bus/target/lun defined as UINT16
++ *
++ * Rev. 5.1     Sep 22, 2000
++ * THL  - Add destination address for specify scsi address or FC address.
++ *	  Remove "not support" comment and add more macros.
++ *
++ * Rev. 5.2     Sep 27, 2000
++ * THL  - Add new macros and structure for add and swap target device.
++ *	  Create new data structure for get port database.
++ * TLE  - Merge changes needed for FailOver
++ *
++ * Rev. 5.3     Sep 29, 2000
++ * THL  - Add access mode for NVRAM.
++ * 
++ * Rev. 5.4     Oct 03, 2000
++ * THL  - Add EXT_SC_GET_FC_STATISTICS.
++ *
++ * Rev. 5.5	Oct 18, 2000
++ * THL  - Remove duplicated EXT_DEF_ADDR_MODE_32 and EXT_DEF_ADDR_MODE_16.
++ *	  Reformat new data structures and defines.
++ *
++ * Rev. 5.6	Oct 19, 2000
++ * RLU	- Changed file name from ExIoct.h to exioct.h.
++ *	- Added definition of EXT_RNID_DATA for API implementation.
++ *	- Reformat some lines to conform to the format agreed
++ *	  upon in IOCTL meeting (and mentioned at beginning of
++ *	  this file).
++ *
++ * Rev. 5.7 Oct 25, 2000
++ * BN   - Added LUN bitmask structure and macros
++ *
++ * Rev. 5.8 Oct 25, 2000
++ * BN   - Added EXT_CC_DRIVER_PROP define
++ * 
++ * Rev. 5.9 Oct 26, 2000
++ * BN   - Sync with UnixApi project
++ * 
++ * Rev. 5.10 Oct 30, 2000
++ * BN   - Remove not needed #define for EXT_CC_DRIVER_PROP
++ *	- Add EXT_ to IS_LUN_BIT_SET, SET_LUN_BIT, CLR_LUN_BIT
++ * 
++ * Rev. 5.11 Nov 1, 2000
++ * BN   - Increased [1] of EXT_DEVICEDATA to [EXT_MAX_TARGET]
++ * TLE  - Decreased [EXT_MAX_TARGET] of EXT_DEVICEDATA to [1]
++ * 
++ * Rev. 5.12	Nov 7, 2000
++ * RLU	- Deleted EXT_DEF_MAX_LUNS define and changed all references
++ *	  to it to use EXT_MAX_LUN.
++ *	- Changed the revision numbers for the last 2 revisions down
++ *	  to use 5.x.
++ * 
++ * Rev. 5.13	Nov 14, 2000
++ * WTR	- Fixed pointer referencing problem in the LUN_BIT_MASK macros.
++ *	  Updated comment at bit mask definition.
++ *
++ * Rev. 5.14	Dec 6, 2000
++ * THL	- Added Local and LoopID to discovered port/target property.
++ * 
++ * Rev. 5.15	Dec 24, 2000
++ * YPL	- Enhance port connection modes and driver attrib
++ * 
++ * Rev. 5.16	Dec 27, 2000
++ * TLE  - Add BufferHandle member to _EXT_ASYNC_EVENT data structure for
++ *	  SCTP support
++ * 
++ * Rev. 5.17	Jan 10, 2001
++ * YPL  - Add edtov, ratov & fabric name in port property
++ * 
++ * Rev. 5.18	Feb 28, 2001
++ * YPL  - Remove SCTP fields and add fabric parameter flags in port property
++ * 
++ * Rev. 5.19	Mar 08, 2001
++ * YPL  - Remove SCTP fields from hba port prop
++ * 
++ * Rev. 5.20	June 11, 2001
++ * YPL  - Change to reserved fields and add fabric name field in port property
++ * 
++ * Rev. 5.21	June 29, 2001
++ * YPL  - Merge in changes decided long time ago (use _DEF_ for defines) &
++ *	  reserved some EXT_CC for legacy ioctls, plus add RNID dataformat
++ *	  values definition
++ * 
++ * Rev. 5.21    Sep 18, 2001
++ * SP   - Added New return status codes
++ *
++ * Rev.	5.22	Oct 23, 2001
++ * SP	- Change reserve fields to add fields to EXT_HBA_PORT
++ *	  Added port speeds and FC4Types fields  and related definitions
++ *
++ * Rev.	5.23	Dec 04, 2001
++ * RL	- Added port speed value definition.
++ *
++ * Rev. 5.24	Jan 20, 2002
++ * JJ	- Added PCI device function bits field in EXT_CHIP structure.
++ *
++ * Rev. 5.25	Feb 04, 2002
++ * JJ	- Added 16 bytes CDB support.  Also added SenseLength field
++ *	  in SCSI_PASSTHRU structure.
++ *
++ * Rev. 5.26	Feb 12, 2002
++ * AV	- Changed type size used in SCSI_PASSTHRU structure definitions
++ *	  to re-enable gcc's automatic structure padding for backward
++ *	  compatibility.
++ *
++ * Rev. 5.27	Mar 01, 2002
++ * RL	- Added new SC value for SCSI3 command passthru.
++ *
++ * Rev. 5.28	Dec 09, 2002
++ * Sync up with NT version of exioct.h:
++ * TLE	- Modify EXT_RNID_REQ data structure for IBM SendRNID workaround
++ * YPL	- Add firmware state (online diagnostics)
++ * YPL	- Add ELS PS
++ * YPL	- Add els event, # of els buffers & size
++ */
++
++#ifndef	_EXIOCT_H
++#define	_EXIOCT_H
++
++/*
++ * NOTE: the following version defines must be updated each time the
++ *	 changes made may affect the backward compatibility of the
++ *	 input/output relations of the SDM IOCTL functions.
++ */
++#define	EXT_VERSION					5
++
++
++/*
++ * OS independent General definitions
++ */
++#define	EXT_DEF_SIGNATURE_SIZE				8
++#define	EXT_DEF_WWN_NAME_SIZE				8
++#define	EXT_DEF_WWP_NAME_SIZE				8
++#define	EXT_DEF_SERIAL_NUM_SIZE				4
++#define	EXT_DEF_PORTID_SIZE				4
++#define	EXT_DEF_PORTID_SIZE_ACTUAL			3
++#define	EXT_DEF_MAX_STR_SIZE				128
++#define	EXT_DEF_SCSI_PASSTHRU_CDB_LENGTH		16
++
++#define	EXT_DEF_ADDR_MODE_32				1
++#define	EXT_DEF_ADDR_MODE_64				2
++
++/*
++ * ***********************************************************************
++ * X OS type definitions
++ * ***********************************************************************
++ */
++#ifdef _MSC_VER						/* NT */
++
++#pragma pack(1)
++#include "ExIoctNT.h"
++
++#elif defined(linux)					/* Linux */
++
++#include "exioctln.h"
++
++#elif defined(sun) || defined(__sun)			/* Solaris */
++
++#include "exioctso.h"
++
++#endif
++
++/*
++ * ***********************************************************************
++ * OS dependent General configuration defines
++ * ***********************************************************************
++ */
++#define	EXT_DEF_MAX_HBA                 EXT_DEF_MAX_HBA_OS
++#define	EXT_DEF_MAX_BUS                 EXT_DEF_MAX_BUS_OS
++#define	EXT_DEF_MAX_TARGET              EXT_DEF_MAX_TARGET_OS
++#define	EXT_DEF_MAX_LUN                 EXT_DEF_MAX_LUN_OS
++
++/*
++ * ***********************************************************************
++ * Common header struct definitions for San/Device Mgmt
++ * ***********************************************************************
++ */
++typedef struct {
++	UINT64    Signature;			/* 8 chars string */
++	UINT16    AddrMode;			/* 2 */
++	UINT16    Version;			/* 2 */
++	UINT16    SubCode;			/* 2 */
++	UINT16    Instance;			/* 2 */
++	UINT32    Status;			/* 4 */
++	UINT32    DetailStatus;			/* 4 */
++	UINT32    Reserved1;			/* 4 */
++	UINT32    RequestLen;			/* 4 */
++	UINT32    ResponseLen;			/* 4 */
++	UINT64    RequestAdr;			/* 8 */
++	UINT64    ResponseAdr;			/* 8 */
++	UINT16    HbaSelect;			/* 2 */
++	UINT16    VendorSpecificStatus[11];	/* 22 */
++	UINT64    VendorSpecificData;		/* 8 chars string */
++} EXT_IOCTL, *PEXT_IOCTL;			/* 84 / 0x54 */
++
++/*
++ * Addressing mode used by the user application
++ */
++#define	EXT_ADDR_MODE			EXT_ADDR_MODE_OS
++
++/*
++ * Status.  These macros are being used for setting Status field in
++ * EXT_IOCTL structure.
++ */
++#define	EXT_STATUS_OK				0
++#define	EXT_STATUS_ERR				1
++#define	EXT_STATUS_BUSY				2
++#define	EXT_STATUS_PENDING			3
++#define	EXT_STATUS_SUSPENDED			4
++#define	EXT_STATUS_RETRY_PENDING		5
++#define	EXT_STATUS_INVALID_PARAM		6
++#define	EXT_STATUS_DATA_OVERRUN			7
++#define	EXT_STATUS_DATA_UNDERRUN		8
++#define	EXT_STATUS_DEV_NOT_FOUND		9
++#define	EXT_STATUS_COPY_ERR			10
++#define	EXT_STATUS_MAILBOX			11
++#define	EXT_STATUS_UNSUPPORTED_SUBCODE		12
++#define	EXT_STATUS_UNSUPPORTED_VERSION		13
++#define	EXT_STATUS_MS_NO_RESPONSE		14
++#define	EXT_STATUS_SCSI_STATUS			15
++#define	EXT_STATUS_BUFFER_TOO_SMALL		16
++#define	EXT_STATUS_NO_MEMORY			17
++#define	EXT_STATUS_UNKNOWN			18
++#define	EXT_STATUS_UNKNOWN_DSTATUS		19
++#define	EXT_STATUS_INVALID_REQUEST		20
++
++#define EXT_STATUS_DEVICE_NOT_READY		21
++#define EXT_STATUS_DEVICE_OFFLINE		22
++#define EXT_STATUS_HBA_NOT_READY		23
++#define EXT_STATUS_HBA_QUEUE_FULL		24
++
++/*
++ * Detail Status contains the SCSI bus status codes.
++ */
++
++#define	EXT_DSTATUS_GOOD			0x00
++#define	EXT_DSTATUS_CHECK_CONDITION		0x02
++#define	EXT_DSTATUS_CONDITION_MET		0x04
++#define	EXT_DSTATUS_BUSY			0x08
++#define	EXT_DSTATUS_INTERMEDIATE		0x10
++#define	EXT_DSTATUS_INTERMEDIATE_COND_MET	0x14
++#define	EXT_DSTATUS_RESERVATION_CONFLICT	0x18
++#define	EXT_DSTATUS_COMMAND_TERMINATED		0x22
++#define	EXT_DSTATUS_QUEUE_FULL			0x28
++
++/*
++ * Detail Status contains the needed Response buffer space(bytes)
++ * when Status = EXT_STATUS_BUFFER_TOO_SMALL
++ */
++
++
++/*
++ * Detail Status contains one of the following codes
++ * when Status = EXT_STATUS_INVALID_PARAM or
++ *             = EXT_STATUS_DEV_NOT_FOUND
++ */
++#define EXT_DSTATUS_NOADNL_INFO			0x00
++#define EXT_DSTATUS_HBA_INST			0x01
++#define EXT_DSTATUS_TARGET			0x02
++#define EXT_DSTATUS_LUN				0x03
++#define EXT_DSTATUS_REQUEST_LEN			0x04
++#define EXT_DSTATUS_PATH_INDEX			0x05
++
++/*
++ * Currently supported DeviceControl / ioctl command codes
++ */
++#define	EXT_CC_QUERY			EXT_CC_QUERY_OS
++#define	EXT_CC_SEND_FCCT_PASSTHRU	EXT_CC_SEND_FCCT_PASSTHRU_OS
++#define	EXT_CC_REG_AEN			EXT_CC_REG_AEN_OS
++#define	EXT_CC_GET_AEN			EXT_CC_GET_AEN_OS
++#define	EXT_CC_SEND_ELS_RNID		EXT_CC_SEND_ELS_RNID_OS
++#define	EXT_CC_SEND_SCSI_PASSTHRU	EXT_CC_SCSI_PASSTHRU_OS
++#define	EXT_CC_SEND_ELS_PASSTHRU	EXT_CC_SEND_ELS_PASSTHRU_OS
++
++/*
++ * HBA port operations
++ */
++#define	EXT_CC_GET_DATA			EXT_CC_GET_DATA_OS
++#define	EXT_CC_SET_DATA			EXT_CC_SET_DATA_OS
++
++
++/* Reserved command codes. */
++#define	EXT_CC_RESERVED0A		EXT_CC_RESERVED0A_OS    
++#define	EXT_CC_RESERVED0B		EXT_CC_RESERVED0B_OS    
++#define	EXT_CC_RESERVED0C		EXT_CC_RESERVED0C_OS    
++#define	EXT_CC_RESERVED0D		EXT_CC_RESERVED0D_OS    
++#define	EXT_CC_RESERVED0E		EXT_CC_RESERVED0E_OS    
++#define	EXT_CC_RESERVED0F		EXT_CC_RESERVED0F_OS    
++#define	EXT_CC_RESERVED0G		EXT_CC_RESERVED0G_OS    
++#define	EXT_CC_RESERVED0H		EXT_CC_RESERVED0H_OS    
++#define	EXT_CC_RESERVED0I		EXT_CC_RESERVED0I_OS
++#define	EXT_CC_RESERVED0J		EXT_CC_RESERVED0J_OS
++#define	EXT_CC_RESERVED0Z		EXT_CC_RESERVED0Z_OS
++
++
++/*
++ * ***********************************************************************
++ * EXT_IOCTL SubCode definition.
++ * These macros are being used for setting SubCode field in EXT_IOCTL
++ * structure.
++ * ***********************************************************************
++ */
++
++/*
++ * Query.
++ * Uses with EXT_QUERY as the ioctl code.
++ */
++#define	EXT_SC_QUERY_HBA_NODE		1
++#define	EXT_SC_QUERY_HBA_PORT		2
++#define	EXT_SC_QUERY_DISC_PORT		3
++#define	EXT_SC_QUERY_DISC_TGT		4
++#define	EXT_SC_QUERY_DISC_LUN		5	/* Currently Not Supported */
++#define	EXT_SC_QUERY_DRIVER		6
++#define	EXT_SC_QUERY_FW			7
++#define	EXT_SC_QUERY_CHIP		8
++
++/*
++ * Sub codes for Get Data.
++ * Use in combination with EXT_GET_DATA as the ioctl code
++ */
++/* 1 - 99 Common */
++#define	EXT_SC_GET_SCSI_ADDR		1	/* Currently Not Supported */
++#define	EXT_SC_GET_ERR_DETECTIONS	2	/* Currently Not Supported */
++#define	EXT_SC_GET_STATISTICS		3
++#define	EXT_SC_GET_BUS_MODE		4	/* Currently Not Supported */
++#define	EXT_SC_GET_DR_DUMP_BUF		5	/* Currently Not Supported */
++#define	EXT_SC_GET_RISC_CODE		6	/* Currently Not Supported */
++#define	EXT_SC_GET_FLASH_RAM		7	/* for backward compatible */
++
++/* 100 - 199 FC_INTF_TYPE */
++#define	EXT_SC_GET_LINK_STATUS		101	/* Currently Not Supported */
++#define	EXT_SC_GET_LOOP_ID		102	/* Currently Not Supported */
++#define	EXT_SC_GET_LUN_BITMASK		103
++#define	EXT_SC_GET_PORT_DATABASE	104	/* Currently Not Supported */
++#define	EXT_SC_GET_PORT_DATABASE_MEM	105	/* Currently Not Supported */
++#define	EXT_SC_GET_PORT_SUMMARY		106
++#define	EXT_SC_GET_POSITION_MAP		107
++#define	EXT_SC_GET_RETRY_CNT		108	/* Currently Not Supported */
++#define	EXT_SC_GET_RNID			109	
++#define	EXT_SC_GET_RTIN			110	/* Currently Not Supported */
++#define	EXT_SC_GET_FC_LUN_BITMASK	111
++#define	EXT_SC_GET_FC_STATISTICS	112	/* for backward compatible */
++
++/* 200 - 299 SCSI_INTF_TYPE */
++#define	EXT_SC_GET_SEL_TIMEOUT		201	/* Currently Not Supported */
++
++
++/* 
++ * Sub codes for Set Data.
++ * Use in combination with EXT_SET_DATA as the ioctl code
++ */
++/* 1 - 99 Common */
++#define	EXT_SC_RST_STATISTICS		3
++#define	EXT_SC_RESERVED_BC7		7
++
++/* 100 - 199 FC_INTF_TYPE */
++#define	EXT_SC_SET_LUN_BITMASK		103
++#define	EXT_SC_SET_RNID			109	
++#define	EXT_SC_SET_FC_LUN_BITMASK	111
++#define	EXT_SC_RESERVED_BC112	112
++#define	EXT_SC_RESERVED_BC113	113
++
++/* 200 - 299 SCSI_INTF_TYPE */
++
++/* SCSI passthrough */
++#define	EXT_SC_SEND_SCSI_PASSTHRU	0
++#define	EXT_SC_SEND_FC_SCSI_PASSTHRU	1
++#define	EXT_SC_SCSI3_PASSTHRU		2
++
++/* Read */
++
++/* Write */
++
++/* Reset */
++
++/* Request struct */
++
++
++/*
++ * Response struct
++ */
++typedef struct _EXT_HBA_NODE {
++	UINT8     WWNN         [EXT_DEF_WWN_NAME_SIZE];	/* 8 */
++	UINT8     Manufacturer [EXT_DEF_MAX_STR_SIZE];	/* 128; "QLOGIC" */
++	UINT8     Model        [EXT_DEF_MAX_STR_SIZE];	/* 128; "QLA2200" */
++	UINT8     SerialNum    [EXT_DEF_SERIAL_NUM_SIZE];/* 4;  123  */
++	UINT8     DriverVersion[EXT_DEF_MAX_STR_SIZE];	/* 128; "7.4.3" */
++	UINT8     FWVersion    [EXT_DEF_MAX_STR_SIZE];	/* 128; "2.1.6" */
++
++	/* The following field is currently not supported */
++	UINT8     OptRomVersion[EXT_DEF_MAX_STR_SIZE];	/* 128; "1.44" */
++
++	UINT16    PortCount;				/* 2; 1 */
++	UINT16    InterfaceType;			/* 2; FC/SCSI */
++
++	/* The following two fields are not yet supported */
++	UINT32    DriverAttr;				/* 4 */
++	UINT32    FWAttr;				/* 4 */
++
++	UINT32    Reserved[8];				/* 32 */
++} EXT_HBA_NODE, *PEXT_HBA_NODE;				/* 696 */
++
++/* HBA node query interface type */
++#define	EXT_DEF_FC_INTF_TYPE			1
++#define	EXT_DEF_SCSI_INTF_TYPE			2
++
++typedef struct _EXT_HBA_PORT {
++	UINT8     WWPN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
++	UINT8     Id  [EXT_DEF_PORTID_SIZE];	/* 4; 3 bytes valid Port Id. */
++	UINT16    Type;				/* 2; Port Type */
++	UINT16    State;			/* 2; Port State */
++	UINT16    Mode;				/* 2 */
++	UINT16    DiscPortCount;		/* 2 */
++	UINT16    DiscPortNameType;		/* 2; USE_NODE_NAME or */
++						/* USE_PORT_NAME */
++	UINT16    DiscTargetCount;		/* 2 */
++	UINT16    Bus;				/* 2 */
++	UINT16    Target;			/* 2 */
++	UINT16    Lun;				/* 2 */
++						/* 2 */
++	UINT8     PortSupportedFC4Types;
++	UINT8     PortActiveFC4Types;
++	UINT8     FabricName[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
++
++						/* 2*/
++	UINT8     PortSupportedSpeed;
++	UINT8     PortSpeed;
++	UINT16    Unused;			/* 2 */
++	UINT32    Reserved[3];			/* 12 */
++} EXT_HBA_PORT, *PEXT_HBA_PORT;			/* 56 */
++
++/* port type */
++#define	EXT_DEF_INITIATOR_DEV		1
++#define	EXT_DEF_TARGET_DEV		2
++#define	EXT_DEF_TAPE_DEV		4
++#define	EXT_DEF_FABRIC_DEV		8
++
++
++/* HBA port state */
++#define	EXT_DEF_HBA_OK			0
++#define	EXT_DEF_HBA_SUSPENDED		1
++#define	EXT_DEF_HBA_LOOP_DOWN		2
++
++/* Connection mode */
++#define	EXT_DEF_UNKNOWN_MODE		0
++#define	EXT_DEF_P2P_MODE		1
++#define	EXT_DEF_LOOP_MODE		2
++#define	EXT_DEF_FL_MODE			3
++#define	EXT_DEF_N_MODE			4
++
++/* Valid name type for Disc. port/target */
++#define	EXT_DEF_USE_NODE_NAME		1
++#define	EXT_DEF_USE_PORT_NAME		2
++
++/* FC4 type values */
++#define EXT_DEF_FC4_TYPE_SCSI		0x1
++#define EXT_DEF_FC4_TYPE_IP		0x2
++#define EXT_DEF_FC4_TYPE_SCTP		0x4
++#define EXT_DEF_FC4_TYPE_VI		0x8
++
++/* Port Speed values */
++#define EXT_DEF_PORTSPEED_1GBIT		1
++#define EXT_DEF_PORTSPEED_2GBIT		2
++#define EXT_DEF_PORTSPEED_10GBIT	4
++
++typedef struct _EXT_DISC_PORT {
++	UINT8     WWNN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
++	UINT8     WWPN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
++	UINT8     Id  [EXT_DEF_PORTID_SIZE];
++					/* 4; last 3 bytes used. big endian */
++
++	/* The following fields currently are not supported */
++	UINT16    Type;				/* 2; Port Type */
++	UINT16    Status;			/* 2; Port Status */
++	UINT16    Bus;				/* 2; n/a for Solaris */
++
++	UINT16    TargetId;			/* 2 */
++	UINT8     Local;			/* 1; Local or Remote */
++	UINT8     ReservedByte[1];		/* 1 */
++	
++	UINT16    LoopID;			/* 2; Loop ID */
++	
++	UINT32    Reserved[7];			/* 28 */
++} EXT_DISC_PORT, *PEXT_DISC_PORT;		/* 60 */
++
++typedef struct _EXT_DISC_TARGET {
++	UINT8     WWNN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
++	UINT8     WWPN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
++	UINT8     Id  [EXT_DEF_PORTID_SIZE];
++					/* 4; last 3 bytes used. big endian */
++
++	/* The following fields currently are not supported */
++	UINT16    Type;				/* 2; Target Type */
++	UINT16    Status;			/* 2; Target Status*/
++	UINT16    Bus;				/* 2; n/a for Solaris */
++
++	UINT16    TargetId;			/* 2 */
++
++	/* The following field is currently not supported */
++	UINT16    LunCount;			/* 2; n/a for nt */
++
++	UINT8     Local;			/* 1; Local or Remote */
++	UINT8     ReservedByte[1];		/* 1 */
++	
++	UINT16    LoopID;			/* 2; Loop ID */
++	
++	UINT16    Reserved[13];			/* 26 */
++} EXT_DISC_TARGET, *PEXT_DISC_TARGET;		/* 60 */
++
++/* The following command is not supported */
++typedef struct _EXT_DISC_LUN {			/* n/a for nt */
++	UINT16    Id;				/* 2 */
++	UINT16    State;			/* 2 */
++	UINT16    IoCount;			/* 2 */
++	UINT16    Reserved[15];			/* 30 */
++} EXT_DISC_LUN, *PEXT_DISC_LUN;			/* 36 */
++
++
++/* SCSI address */
++typedef struct _EXT_SCSI_ADDR {
++	UINT16    Bus;				/* 2 */
++	UINT16    Target;			/* 2 */
++	UINT16    Lun;				/* 2 */
++	UINT16    Padding[5];			/* 10 */
++} EXT_SCSI_ADDR, *PEXT_SCSI_ADDR;		/* 16 */
++
++
++/* Fibre Channel address */
++typedef struct _EXT_FC_ADDR {
++	union {
++		UINT8    WWNN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
++		UINT8    WWPN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
++		UINT8    Id[EXT_DEF_PORTID_SIZE];	/* 4 */
++	} FcAddr;
++	UINT16    Type;					/* 2 */
++	UINT16    Padding[2];				/* 2 */
++} EXT_FC_ADDR, *PEXT_FC_ADDR;				/* 24 */
++
++#define	EXT_DEF_TYPE_WWNN                   1
++#define	EXT_DEF_TYPE_WWPN                   2
++#define	EXT_DEF_TYPE_PORTID                 3
++#define	EXT_DEF_TYPE_FABRIC                 4
++
++
++/* Destination address */
++typedef struct _EXT_DEST_ADDR {
++	union {
++		UINT8    WWNN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
++		UINT8    WWPN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
++		UINT8    Id[EXT_DEF_PORTID_SIZE];	/* 4 */
++		struct {
++			UINT16    Bus;			/* 2 */
++			UINT16    Target;		/* 2 */
++		} ScsiAddr;
++	} DestAddr;
++	UINT16    DestType;				/* 2 */
++	UINT16    Lun;					/* 2 */
++	UINT16    Padding[2];				/* 4 */
++} EXT_DEST_ADDR, *PEXT_DEST_ADDR;			/* 16 */
++
++
++#define	EXT_DEF_DESTTYPE_WWNN			1
++#define	EXT_DEF_DESTTYPE_WWPN			2
++#define	EXT_DEF_DESTTYPE_PORTID			3
++#define	EXT_DEF_DESTTYPE_FABRIC			4
++#define	EXT_DEF_DESTTYPE_SCSI			5
++
++/* Statistic */
++typedef struct _EXT_HBA_PORT_STAT {
++	UINT32    ControllerErrorCount;		/* 4 */
++	UINT32    DeviceErrorCount;		/* 4 */
++	UINT32    TotalIoCount;			/* 4 */
++	UINT32    TotalMBytes;			/* 4; MB of data processed */
++	UINT32    TotalLipResets;		/* 4; Total no. of LIP Reset */
++	UINT32    Reserved2;			/* 4 */
++	UINT32    TotalLinkFailures;		/* 4 */
++	UINT32    TotalLossOfSync;		/* 4 */
++	UINT32    TotalLossOfSignals;		/* 4 */
++	UINT32    PrimitiveSeqProtocolErrorCount;/* 4 */
++	UINT32    InvalidTransmissionWordCount;	/* 4 */
++	UINT32    InvalidCRCCount;		/* 4 */
++	UINT32    Reserved[16];			/* 64 */
++} EXT_HBA_PORT_STAT, *PEXT_HBA_PORT_STAT;	/* 112 */
++
++
++/* Driver property */
++typedef struct _EXT_DRIVER {
++	UINT8     Version[EXT_DEF_MAX_STR_SIZE];/* 128 */
++	UINT16    NumOfBus;			/* 2; Port Type */
++	UINT16    TargetsPerBus;		/* 2; Port Status */
++	UINT16    LunsPerTarget;		/* 2 */
++	UINT32    MaxTransferLen;		/* 4 */
++	UINT32    MaxDataSegments;		/* 4 */
++	UINT16    DmaBitAddresses;		/* 2 */
++	UINT16    IoMapType;			/* 2 */
++	UINT32    Attrib;			/* 4 */
++	UINT32    InternalFlags[4];		/* 16 */
++	UINT32    Reserved[8];			/* 32 */
++} EXT_DRIVER, *PEXT_DRIVER;			/* 198 */
++
++
++/* Firmware property */
++typedef struct _EXT_FW {
++	UINT8     Version[EXT_DEF_MAX_STR_SIZE];/* 128 */
++	UINT32    Attrib;			/* 4 */
++	UINT16    Reserved[33];			/* 66 */
++} EXT_FW, *PEXT_FW;				/* 198 */
++
++
++/* ISP/Chip property */
++typedef struct _EXT_CHIP {
++	UINT16    VendorId;			/* 2 */
++	UINT16    DeviceId;			/* 2 */
++	UINT16    SubVendorId;			/* 2 */
++	UINT16    SubSystemId;			/* 2 */
++	UINT16    PciBusNumber;			/* 2 */
++	UINT16    PciSlotNumber;		/* 2 */
++	UINT32    IoAddr;			/* 4 */
++	UINT32    IoAddrLen;			/* 4 */
++	UINT32    MemAddr;			/* 4 */
++	UINT32    MemAddrLen;			/* 4 */
++	UINT16    ChipType;			/* 2 */
++	UINT16    InterruptLevel;		/* 2 */
++	UINT16    OutMbx[8];			/* 16 */
++	UINT16    PciDevFunc;	                /* 2 */
++	UINT16    Reserved[15];			/* 30 */
++} EXT_CHIP, *PEXT_CHIP;				/* 80 */
++
++
++/* Request Buffer for RNID */
++typedef struct _EXT_RNID_REQ {
++	EXT_FC_ADDR Addr;			/* 14 */
++	UINT8     DataFormat;			/* 1 */
++	UINT8     Pad;				/* 1 */
++	UINT8     OptWWN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
++	UINT8     OptPortId[EXT_DEF_PORTID_SIZE];	/* 4 */
++	UINT32    Reserved[12];			/* 48 */
++	UINT8     Pad1[3];			/* 3 */
++} EXT_RNID_REQ, *PEXT_RNID_REQ;			/* 79 */
++
++#define EXT_DEF_RNID_DFORMAT_NONE		0
++#define EXT_DEF_RNID_DFORMAT_TOPO_DISC		0xDF
++
++/* Request Buffer for Set RNID */
++typedef struct _EXT_SET_RNID_REQ {
++	UINT8     IPVersion[2];
++	UINT8     UDPPortNumber[2];
++	UINT8     IPAddress[16];
++	UINT32    Reserved[16];
++} EXT_SET_RNID_REQ, *PEXT_SET_RNID_REQ;
++
++/* RNID definition and data struct */
++#define	SEND_RNID_RSP_SIZE  72
++
++typedef struct _RNID_DATA
++{
++	UINT8     WWN[16];			/* 16 */
++	UINT32    UnitType;			/* 4 */
++	UINT8     PortId[4];			/* 4 */
++	UINT32    NumOfAttachedNodes;		/* 4 */
++	UINT8     IPVersion[2];			/* 2 */
++	UINT8     UDPPortNumber[2];		/* 2 */
++	UINT8     IPAddress[16];		/* 16 */
++	UINT16    Reserved;			/* 2 */
++	UINT16    TopoDiscFlags;		/* 2 */
++} EXT_RNID_DATA, *PEXT_RNID_DATA;		/* 52 */
++
++
++/* SCSI pass-through */
++typedef struct _EXT_SCSI_PASSTHRU {
++	EXT_SCSI_ADDR   TargetAddr;
++	UINT8           Direction;
++	UINT8           CdbLength;
++	UINT8           Cdb[EXT_DEF_SCSI_PASSTHRU_CDB_LENGTH];
++        UINT32          Reserved[14];
++        UINT16          Reserved2;
++        UINT16          SenseLength;
++	UINT8           SenseData[256];
++} EXT_SCSI_PASSTHRU, *PEXT_SCSI_PASSTHRU;
++
++/* FC SCSI pass-through */
++typedef struct _EXT_FC_SCSI_PASSTHRU {
++	EXT_DEST_ADDR   FCScsiAddr;
++	UINT8           Direction;
++	UINT8           CdbLength;
++	UINT8           Cdb[EXT_DEF_SCSI_PASSTHRU_CDB_LENGTH];
++        UINT32          Reserved[14];
++        UINT16          Reserved2;
++        UINT16          SenseLength;
++	UINT8           SenseData[256];
++} EXT_FC_SCSI_PASSTHRU, *PEXT_FC_SCSI_PASSTHRU;
++
++/* SCSI pass-through direction */
++#define	EXT_DEF_SCSI_PASSTHRU_DATA_IN		1
++#define	EXT_DEF_SCSI_PASSTHRU_DATA_OUT		2
++
++
++/* EXT_REG_AEN Request struct */
++typedef struct _EXT_REG_AEN {
++	UINT32    Enable;	/* 4; non-0 to enable, 0 to disable. */
++	UINT32    Reserved;	/* 4 */
++} EXT_REG_AEN, *PEXT_REG_AEN;	/* 8 */
++
++/* EXT_GET_AEN Response struct */
++typedef struct _EXT_ASYNC_EVENT {
++	UINT32	AsyncEventCode;		/* 4 */
++	union {
++		struct {
++			UINT8   RSCNInfo[EXT_DEF_PORTID_SIZE_ACTUAL];/* 3, BE */
++			UINT8   AddrFormat;			/* 1 */
++			UINT32  Rsvd_1[2];			/* 8 */
++		} RSCN;
++
++		UINT32  Reserved[3];	/* 12 */
++	} Payload;
++} EXT_ASYNC_EVENT, *PEXT_ASYNC_EVENT;	/* 16 */
++
++
++/* Asynchronous Event Codes */
++#define	EXT_DEF_LIP_OCCURRED		0x8010
++#define	EXT_DEF_LINK_UP			0x8011
++#define	EXT_DEF_LINK_DOWN		0x8012
++#define	EXT_DEF_LIP_RESET		0x8013
++#define	EXT_DEF_RSCN			0x8015
++#define	EXT_DEF_DEVICE_UPDATE		0x8014
++#define	EXT_DEF_ELS          		0x8200
++
++/* Required # of entries in the queue buffer allocated. */
++#define	EXT_DEF_MAX_AEN_QUEUE		EXT_DEF_MAX_AEN_QUEUE_OS
++#define	EXT_DEF_MAX_ELS_BUFS		EXT_DEF_MAX_ELS_BUFS_OS
++#define	EXT_DEF_SIZE_ELS_BUF		EXT_DEF_SIZE_ELS_BUF_OS
++
++/* Device type to get for EXT_SC_GET_PORT_SUMMARY */
++#define	EXT_DEF_GET_KNOWN_DEVICE	0x1
++#define	EXT_DEF_GET_VISIBLE_DEVICE	0x2
++#define	EXT_DEF_GET_HIDDEN_DEVICE	0x4
++#define	EXT_DEF_GET_FABRIC_DEVICE	0x8
++#define	EXT_DEF_GET_LOOP_DEVICE		0x10
++
++/* Each entry in device database */
++typedef struct _EXT_DEVICEDATAENTRY
++{
++	UINT8		NodeWWN[8];	/* Node World Wide Name for device */
++	UINT8		PortWWN[8];	/* Port World Wide Name for device */
++	UINT8		PortID[3];	/* Current PortId for device */
++	UINT8		ControlFlags;	/* Control flag */
++	EXT_SCSI_ADDR	TargetAddress;	/* scsi address */
++	UINT32		DeviceFlags;	/* Flags for device */
++	UINT16		LoopID;		/* Loop ID */
++	UINT16		BaseLunNumber;  
++	UINT32		Reserved[32];
++} EXT_DEVICEDATAENTRY, *PEXT_DEVICEDATAENTRY;
++
++/* Device database information */
++typedef struct _EXT_DEVICEDATA
++{
++	UINT32	TotalDevices;          /* Set to total number of device. */
++	UINT32	ReturnListEntryCount;  /* Set to number of device entries */
++		                       /* returned in list. */
++
++	EXT_DEVICEDATAENTRY  EntryList[1]; /* Variable length */
++} EXT_DEVICEDATA, *PEXT_DEVICEDATA;
++
++
++/* Swap Target Device Data structure */
++typedef struct _EXT_SWAPTARGETDEVICE
++{
++	EXT_DEVICEDATAENTRY CurrentExistDevice;
++	EXT_DEVICEDATAENTRY NewDevice;
++} EXT_SWAPTARGETDEVICE, *PEXT_SWAPTARGETDEVICE;
++
++/* LUN BitMask structure definition, array of 8bit bytes,
++ * 1 bit per lun.  When bit == 1, the lun is masked.
++ * Most significant bit of mask[0] is lun 0.
++ * Least significant bit of mask[0] is lun 7.
++ */
++typedef struct _EXT_LUN_BIT_MASK {
++#if ((EXT_DEF_MAX_LUN & 0x7) == 0)
++	UINT8	mask[EXT_DEF_MAX_LUN >> 3];
++#else
++	UINT8	mask[(EXT_DEF_MAX_LUN + 8) >> 3 ];
++#endif
++} EXT_LUN_BIT_MASK, *PEXT_LUN_BIT_MASK;
++
++/*
++ * LUN mask bit manipulation macros
++ *
++ *   P = Pointer to an EXT_LUN_BIT_MASK union.
++ *   L = LUN number.
++ */
++#define EXT_IS_LUN_BIT_SET(P,L) \
++    (((P)->mask[L/8] & (0x80 >> (L%8)))?1:0)
++
++#define EXT_SET_LUN_BIT(P,L) \
++    ((P)->mask[L/8] |= (0x80 >> (L%8)))
++
++#define EXT_CLR_LUN_BIT(P,L) \
++    ((P)->mask[L/8] &= ~(0x80 >> (L%8)))
++
++#define	EXT_DEF_LUN_BITMASK_LIST_MIN_ENTRIES	1
++#define	EXT_DEF_LUN_BITMASK_LIST_MAX_ENTRIES	256
++
++#ifdef _WIN64
++#define	EXT_DEF_LUN_BITMASK_LIST_HEADER_SIZE	32
++#else
++#define	EXT_DEF_LUN_BITMASK_LIST_HEADER_SIZE \
++    offsetof(LUN_BITMASK_LIST_BUFFER, asBitmaskEntry)
++#endif
++
++#define	EXT_DEF_LUN_COUNT          2048
++#define	EXT_DEF_LUN_BITMASK_BYTES  (EXT_DEF_LUN_COUNT / 8)
++
++typedef struct _EXT_LUN_BITMASK_ENTRY
++{
++	UINT8	NodeName[EXT_DEF_WWN_NAME_SIZE];
++	UINT8	PortName[EXT_DEF_WWN_NAME_SIZE];
++
++	UINT32	Reserved2;
++	UINT32	Reserved3;
++	UINT32	Reserved4;
++	UINT32	Reserved5;     /* Pad to 32-byte header.*/
++
++	UINT8	Bitmask[EXT_DEF_LUN_BITMASK_BYTES];
++} EXT_LUN_BITMASK_ENTRY, *PEXT_LUN_BITMASK_ENTRY;
++
++/* Structure as it is stored in the config file.*/
++typedef struct _LUN_BITMASK_LIST
++{
++	UINT16	Version;       /* Should be LUN_BITMASK_REGISTRY_VERSION */
++	UINT16	EntryCount;    /* Count of variable entries following.*/
++	UINT32	Reserved1;
++	UINT32	Reserved2;
++	UINT32	Reserved3;
++	UINT32	Reserved4;
++	UINT32	Reserved5;
++	UINT32	Reserved6;
++	UINT32	Reserved7;     /* Pad to 32-byte header.*/
++
++	EXT_LUN_BITMASK_ENTRY BitmaskEntry[1]; /* Variable-length data.*/
++
++} EXT_LUN_BITMASK_LIST, *PEXT_LUN_BITMASK_LIST;
++
++
++#define	EXT_DEF_LUN_BITMASK_LIST_MIN_SIZE   \
++    (EXT_DEF_LUN_BITMASK_LIST_HEADER_SIZE + \
++    (sizeof(EXT_DEF_LUN_BITMASK_ENTRY) * EXT_DEF_LUN_BITMASK_LIST_MIN_ENTRIES))
++#define	EXT_DEF_LUN_BITMASK_LIST_MAX_SIZE   \
++    (EXT_DEF_LUN_BITMASK_LIST_HEADER_SIZE + \
++    (sizeof(EXT_DEF_LUN_BITMASK_ENTRY) * EXT_DEF_LUN_BITMASK_LIST_MAX_ENTRIES))
++
++/* Request Buffer for ELS PT*/
++#define EXT_DEF_WWPN_VALID  1
++#define EXT_DEF_WWNN_VALID  2
++#define EXT_DEF_PID_VALID   4
++typedef struct _EXT_ELS_PT_REQ {
++	UINT8     WWNN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
++	UINT8     WWPN[EXT_DEF_WWN_NAME_SIZE];	/* 8 */
++	UINT8     Id[EXT_DEF_PORTID_SIZE];  	/* 4 */
++	UINT16    ValidMask;			/* 2 */
++	UINT16    Lid;				/* 2 */
++	UINT16    Rxid;				/* 2 */
++	UINT16    AccRjt;			/* 2 */
++	UINT32    Reserved;			/* 4 */
++} EXT_ELS_PT_REQ, *PEXT_ELS_PT_REQ;		/* 32 */
++
++#ifdef _MSC_VER
++#pragma pack()
++#endif
++
++#endif /* _EXIOCT_H */
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/exioctln.h	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,255 @@
++/*****************************************************************************
++*                  QLOGIC LINUX SOFTWARE
++*
++* QLogic ISP2x00 device driver for Linux 2.5.x
++* Copyright (C) 2003 QLogic Corporation
++* (www.qlogic.com)
++*
++* This program is free software; you can redistribute it and/or modify it
++* under the terms of the GNU General Public License as published by the
++* Free Software Foundation; either version 2, or (at your option) any
++* later version.
++*
++* This program is distributed in the hope that it will be useful, but
++* WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++* General Public License for more details.
++****************************************************************************/
++
++/*
++ * File Name: exioctln.h
++
++   Rev 14    February 25, 2003	RL
++             - Added EXT_CC_DRIVER_SPECIFIC ioctl command to return
++	       some driver specific data that can be used by API library
++	       to determine how to maintain backward compatibility
++	       of certain features.
++
++   Rev 13    January 31, 2003	RL
++             - Changed the value of EXT_DEF_USE_HBASELECT to avoid
++               conflicting with older implementation of FO API lib.
++
++   Rev 12    January 20, 2003	RL
++             - Added EXT_DEF_USE_HBASELECT definition for use by
++               the SETINSTANCE command.
++ 
++   Rev 11    December 10, 2002	RL
++             - Added EXT_CC_SEND_ELS_PASSTHRU_OS definition.
++ 
++   Rev 10    October 26, 2001	RL
++             - Corrected MAX_HBA, MAX_TARGET and MAX_LUN values to 255.
++ 
++   Rev 9     July 26, 2001	RL
++             - Added definition of signed types.
++ 
++   Rev 8     July 05, 2001	RL
++             - Redefined ioctl command values.
++ 
++   Rev 7     Nov 06, 2000   BN
++             - Added EXT_DEF_MAX_AEN_QUEUE_OS define
++             - Added define for handle_hba_t
++ 
++   Rev 6     Oct 25, 2000   BN
++             - Added EXT_CC_DRIVER_PROP_OS define
++ 
++   Rev 5     Oct 25, 2000   BN
++             - Redo the copyright header and add AEN details
++ 
++   Rev 4     Oct 23, 2000   BN
++             - Added definition for BOOLEAN
++ 
++   Rev 3     Oct 23, 2000   BN
++             - Added definitions for EXT_ADDR_MODE_OS
++               and also include of <linux/ioctl.h>
++ 
++   Rev 2     Oct 18, 2000   BN
++             - Enable API Exention support
++ 
++   Rev 1     Original version Sep 7, 2000   BN
++ 
++*/
++
++
++#ifndef _EXIOCT_LN_H_
++#define _EXIOCT_LN_H_
++
++#include <linux/ioctl.h>
++
++#ifdef APILIB
++#include <stdint.h>
++#endif
++
++
++#define	INT8	int8_t
++#define	INT16	int16_t
++#define	INT32	int32_t
++#define	UINT8	uint8_t
++#define	UINT16	uint16_t
++#define	UINT32	uint32_t
++#define	UINT64	void *
++#define BOOLEAN uint8_t
++
++typedef struct  track_instance {
++	int   handle;
++} track_instance_t;
++
++
++#if BITS_PER_LONG <= 32
++#define EXT_ADDR_MODE_OS  EXT_DEF_ADDR_MODE_32
++#else
++#define EXT_ADDR_MODE_OS  EXT_DEF_ADDR_MODE_64
++#endif
++
++
++#define QLMULTIPATH_MAGIC 'y'
++
++#define _QLBUILD   /* for exioct.h to enable include of qinsdmgt.h */
++
++
++
++#define	EXT_DEF_MAX_HBA_OS		255	/* 0 - 0xFE */
++#define	EXT_DEF_MAX_BUS_OS		1
++#define	EXT_DEF_MAX_TARGET_OS		255	/* 0 - 0xFE */
++#define	EXT_DEF_MAX_LUN_OS		255	/* 0 - 0xFE */
++
++#define EXT_DEF_MAX_AEN_QUEUE_OS        64
++
++#define EXT_DEF_FC_HEADER_LEN		24
++#define EXT_DEF_ELS_RJT_LENGTH		0x08	/* 8  */
++#define EXT_DEF_ELS_RPS_ACC_LENGTH	0x40	/* 64 */
++#define EXT_DEF_ELS_RLS_ACC_LENGTH	0x1C	/* 28 */
++
++#define EXT_DEF_USE_HBASELECT		0x02	/* bit 1: HbaSelect field now
++						 * used to specify destination
++						 * HBA of each command.
++						 * SetInstance cmd is now
++						 * issued only once during
++						 * API initialization.
++						 */
++
++
++/*****************/
++/* Command codes */
++/*****************/
++
++/*************************************************************/
++/* These are regular/external command codes, starting from 0 */
++/*************************************************************/
++#define EXT_CC_QUERY_OS					/* QUERY */	\
++    _IOWR(QLMULTIPATH_MAGIC, 0x00, sizeof(EXT_IOCTL))
++#define EXT_CC_SEND_FCCT_PASSTHRU_OS			/* FCCT_PASSTHRU */ \
++    _IOWR(QLMULTIPATH_MAGIC, 0x01, sizeof(EXT_IOCTL))
++#define	EXT_CC_REG_AEN_OS				/* REG_AEN */	\
++    _IOWR(QLMULTIPATH_MAGIC, 0x02, sizeof(EXT_IOCTL))
++#define	EXT_CC_GET_AEN_OS				/* GET_AEN */	\
++    _IOWR(QLMULTIPATH_MAGIC, 0x03, sizeof(EXT_IOCTL))
++#define	EXT_CC_SEND_ELS_RNID_OS				/* SEND_ELS_RNID */ \
++    _IOWR(QLMULTIPATH_MAGIC, 0x04, sizeof(EXT_IOCTL))
++#define	EXT_CC_SCSI_PASSTHRU_OS				/* SCSI_PASSTHRU */ \
++    _IOWR(QLMULTIPATH_MAGIC, 0x05, sizeof(EXT_IOCTL))
++
++#define EXT_CC_GET_DATA_OS				/* GET_DATA */	\
++    _IOWR(QLMULTIPATH_MAGIC, 0x06, sizeof(EXT_IOCTL))
++#define EXT_CC_SET_DATA_OS				/* SET_DATA */	\
++    _IOWR(QLMULTIPATH_MAGIC, 0x07, sizeof(EXT_IOCTL))
++
++/*****************************************/
++/* following are internal command codes. */
++/*****************************************/
++#define EXT_CC_RESERVED0A_OS						\
++    _IOWR(QLMULTIPATH_MAGIC, 0x08, sizeof(EXT_IOCTL))
++#define EXT_CC_RESERVED0B_OS						\
++    _IOWR(QLMULTIPATH_MAGIC, 0x09, sizeof(EXT_IOCTL))
++
++#define EXT_CC_RESERVED0C_OS						\
++    _IOWR(QLMULTIPATH_MAGIC, 0x0a, sizeof(EXT_IOCTL))
++#define EXT_CC_RESERVED0D_OS						\
++    _IOWR(QLMULTIPATH_MAGIC, 0x0b, sizeof(EXT_IOCTL))
++
++#define EXT_CC_RESERVED0E_OS						\
++    _IOWR(QLMULTIPATH_MAGIC, 0x0c, sizeof(EXT_IOCTL))
++#define EXT_CC_RESERVED0F_OS						\
++    _IOWR(QLMULTIPATH_MAGIC, 0x0d, sizeof(EXT_IOCTL))
++
++#define EXT_CC_RESERVED0G_OS						\
++    _IOWR(QLMULTIPATH_MAGIC, 0x0e, sizeof(EXT_IOCTL))
++#define EXT_CC_RESERVED0H_OS						\
++    _IOWR(QLMULTIPATH_MAGIC, 0x0f, sizeof(EXT_IOCTL))
++
++#define EXT_CC_RESERVED0I_OS						\
++    _IOWR(QLMULTIPATH_MAGIC, 0x10, sizeof(EXT_IOCTL))
++#define EXT_CC_RESERVED0J_OS						\
++    _IOWR(QLMULTIPATH_MAGIC, 0x11, sizeof(EXT_IOCTL))
++
++#define EXT_CC_RESERVED0Z_OS						\
++    _IOWR(QLMULTIPATH_MAGIC, 0x21, sizeof(EXT_IOCTL))
++
++/********************************************************/
++/* These are additional regular/external command codes. */
++/********************************************************/
++#define EXT_CC_SEND_ELS_PASSTHRU_OS					\
++    _IOWR(QLMULTIPATH_MAGIC, 0x30, sizeof(EXT_IOCTL))
++
++
++/********************************************************/
++/* Failover ioctl command codes range from 0xc0 to 0xdf */
++/********************************************************/
++
++
++/*******************************************************************/
++/* These are Linux driver implementation specific commands. Values */
++/* start from highest possible value and in decreasing order.      */
++/*******************************************************************/
++
++#define EXT_CC_STARTIOCTL				/* STARTIOCTL */ \
++    _IOWR(QLMULTIPATH_MAGIC, 0xff, sizeof(EXT_IOCTL))
++#define EXT_CC_SETINSTANCE				/* SETINSTANCE */ \
++    _IOWR(QLMULTIPATH_MAGIC, 0xfe, sizeof(EXT_IOCTL))
++#define	EXT_CC_WWPN_TO_SCSIADDR				/* WWPN_TO_SCSIADDR */ \
++    _IOWR(QLMULTIPATH_MAGIC, 0xfd, sizeof(EXT_IOCTL))
++#define	EXT_CC_DRIVER_SPECIFIC				/* DRIVER_SPECIFIC */ \
++    _IOWR(QLMULTIPATH_MAGIC, 0xfc, sizeof(EXT_IOCTL))
++
++
++/*
++ * Response struct definition
++ */
++typedef struct _EXT_LN_DRV_VERSION {
++	UINT8	Major;
++	UINT8	Minor;
++	UINT8	Patch;
++	UINT8	Beta;
++	UINT8	Reserved[4];
++} EXT_LN_DRV_VERSION;				/* 8 */
++
++typedef struct _EXT_LN_DRIVER_DATA {
++	EXT_LN_DRV_VERSION  	DrvVer;		/* 8 */
++	UINT32    Reserved[14];			/* 56 */
++} EXT_LN_DRIVER_DATA, *PEXT_LN_DRIVER_DATA;	/* 64 */
++
++
++
++
++
++
++/*
++ * Overrides for Emacs so that we almost follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-indent-level: 2
++ * c-brace-imaginary-offset: 0
++ * c-brace-offset: -2
++ * c-argdecl-indent: 2
++ * c-label-offset: -2
++ * c-continued-statement-offset: 4
++ * c-continued-brace-offset: 0
++ * indent-tabs-mode: nil
++ * tab-width: 8
++ * End:
++ */
++
++#endif /* _EXIOCT_LN_H_ */
++
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/inioct.h	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,129 @@
++/******************************************************************************
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ ******************************************************************************/
++
++/*
++ * File Name: inioct.h
++ *
++ * San/Device Management Ioctl Header
++ * File is created to adhere to Solaris requirement using 8-space tabs.
++ *
++ * !!!!! PLEASE DO NOT REMOVE THE TABS !!!!!
++ * !!!!! PLEASE NO SINGLE LINE COMMENTS: // !!!!!
++ * !!!!! PLEASE NO MORE THAN 80 CHARS PER LINE !!!!!
++ *
++ *
++ * Revision History:
++ *
++ * Rev. 0	June 15, 2001
++ * YPL	- Created.
++ *
++ * Rev. 1	June 26, 2001
++ * YPL	- Change the loop back structure and delete cc that is not used.
++ *
++ * Rev. 2	June 29, 2001
++ * YPL	- Use new EXT_CC defines from exioct.h
++ *
++ * Rev. 3	July 12, 2001
++ * RL	- Added definitions for loopback mbx command completion codes.
++ *
++ * Rev. 4	July 12, 2001
++ * RL	- Added definitions for loopback mbx command completion codes.
++ *
++ * Rev. 5	October 9, 2002
++ * AV	- Added definition for Read Option ROM IOCTL.
++ *
++ */
++
++#ifndef	_INIOCT_H
++#define	_INIOCT_H
++
++/*
++ * ***********************************************************************
++ * X OS type definitions
++ * ***********************************************************************
++ */
++#ifdef _MSC_VER						/* NT */
++#pragma pack(1)
++#endif
++
++/*
++ * ***********************************************************************
++ * INT_IOCTL SubCode definition.
++ * These macros are being used for setting SubCode field in EXT_IOCTL
++ * structure.
++ * ***********************************************************************
++ */
++
++/*
++ * Currently supported DeviceControl / ioctl command codes
++ */
++#define	INT_CC_GET_PORT_STAT_FC		EXT_CC_RESERVED0A_OS
++#define	INT_CC_LOOPBACK			EXT_CC_RESERVED0B_OS
++#define	INT_CC_UPDATE_OPTION_ROM	EXT_CC_RESERVED0C_OS
++#define	INT_CC_ADD_TARGET_DEVICE	EXT_CC_RESERVED0D_OS
++#define	INT_CC_READ_NVRAM		EXT_CC_RESERVED0E_OS
++#define	INT_CC_UPDATE_NVRAM		EXT_CC_RESERVED0F_OS
++#define	INT_CC_SWAP_TARGET_DEVICE	EXT_CC_RESERVED0G_OS
++#define	INT_CC_READ_OPTION_ROM		EXT_CC_RESERVED0H_OS
++#define	INT_CC_LEGACY_LOOPBACK		EXT_CC_RESERVED0Z_OS
++
++
++
++/* NVRAM */
++#define	INT_SC_NVRAM_HARDWARE		0	/* Save */
++#define	INT_SC_NVRAM_DRIVER		1	/* Driver (Apply) */
++#define	INT_SC_NVRAM_ALL		2	/* NVRAM/Driver (Save+Apply) */
++
++/* Loopback */
++typedef struct _INT_LOOPBACK_REQ
++{
++        UINT16 Options;				/* 2   */
++        UINT32 TransferCount;			/* 4   */
++        UINT32 IterationCount;			/* 4   */
++        UINT64 BufferAddress;			/* 8  */
++        UINT32 BufferLength;			/* 4  */
++        UINT16 Reserved[9];			/* 18  */
++}
++INT_LOOPBACK_REQ, *PINT_LOOPBACK_REQ;		/* 408 */
++
++typedef struct _INT_LOOPBACK_RSP
++{
++        UINT64 BufferAddress;			/* 8  */
++        UINT32 BufferLength;			/* 4  */
++        UINT16 CompletionStatus;		/* 2   */
++        UINT16 CrcErrorCount;			/* 2   */
++        UINT16 DisparityErrorCount;		/* 2   */
++        UINT16 FrameLengthErrorCount;		/* 2   */
++        UINT32 IterationCountLastError;		/* 4   */
++        UINT16 Reserved[8];			/* 16  */
++}
++INT_LOOPBACK_RSP, *PINT_LOOPBACK_RSP;		/* 40  */
++
++/* definition for interpreting CompletionStatus values */
++#define	INT_DEF_LB_COMPLETE	0x4000
++#define	INT_DEF_LB_PARAM_ERR	0x4006
++#define	INT_DEF_LB_LOOP_DOWN	0x400b
++#define	INT_DEF_LB_CMD_ERROR	0x400c
++
++
++#ifdef _MSC_VER
++#pragma pack()
++#endif
++
++#endif /* _INIOCT_H */
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/ql2100tp_fw.c	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,4866 @@
++/******************************************************************************
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ *************************************************************************/
++
++/************************************************************************
++ *									*
++ * 	 --- ISP2100 Fabric Initiator/Target Firmware ---               *
++ *                   with expanded LUN addressing                       *
++ *                   and FcTape (FCP-2) support                         *
++ *									*
++ *									*
++ ************************************************************************/
++/*
++ *	Firmware Version 1.19.24 (14:02 Jul 16, 2002)
++ */
++
++#ifdef UNIQUE_FW_NAME
++unsigned short fw2100tp_version = 1*1024+19;
++#else
++unsigned short risc_code_version = 1*1024+19;
++#endif
++
++#ifdef UNIQUE_FW_NAME
++unsigned char fw2100tp_version_str[] = {1,19,24};
++#else
++unsigned char firmware_version[] = {1,19,24};
++#endif
++
++#ifdef UNIQUE_FW_NAME
++#define fw2100tp_VERSION_STRING "1.19.24"
++#else
++#define FW_VERSION_STRING "1.19.24"
++#endif
++
++#ifdef UNIQUE_FW_NAME
++unsigned short fw2100tp_addr01 = 0x1000 ;
++#else
++unsigned short risc_code_addr01 = 0x1000 ;
++#endif
++
++#ifdef UNIQUE_FW_NAME
++unsigned short fw2100tp_code01[] = { 
++#else
++unsigned short risc_code01[] = { 
++#endif
++	0x0078, 0x102d, 0x0000, 0x95f1, 0x0000, 0x0001, 0x0013, 0x0018,
++	0x0017, 0x2043, 0x4f50, 0x5952, 0x4947, 0x4854, 0x2032, 0x3030,
++	0x3120, 0x514c, 0x4f47, 0x4943, 0x2043, 0x4f52, 0x504f, 0x5241,
++	0x5449, 0x4f4e, 0x2049, 0x5350, 0x3231, 0x3030, 0x2046, 0x6972,
++	0x6d77, 0x6172, 0x6520, 0x2056, 0x6572, 0x7369, 0x6f6e, 0x2030,
++	0x312e, 0x3139, 0x2020, 0x2020, 0x2400, 0x2091, 0x2000, 0x20c1,
++	0x0021, 0x2039, 0xffff, 0x2019, 0xaaaa, 0x2760, 0x2069, 0x7fff,
++	0x20c1, 0x0020, 0x2c2c, 0x2d34, 0x2762, 0x236a, 0x2c24, 0x2d04,
++	0x266a, 0x2562, 0xa406, 0x00c0, 0x1052, 0x20c1, 0x0021, 0x2c2c,
++	0x2362, 0x2c04, 0x2562, 0xa306, 0x0040, 0x1052, 0x20c1, 0x0020,
++	0x2039, 0x8fff, 0x20a1, 0xad00, 0x2708, 0x810d, 0x810d, 0x810d,
++	0x810d, 0xa18c, 0x000f, 0x2001, 0x000a, 0xa112, 0xa00e, 0x21a8,
++	0x41a4, 0x3400, 0x8211, 0x00c0, 0x105f, 0x2708, 0x3400, 0xa102,
++	0x0040, 0x106f, 0x0048, 0x106f, 0x20a8, 0xa00e, 0x41a4, 0x20a1,
++	0xa5f1, 0x2009, 0x0000, 0x20a9, 0x070f, 0x41a4, 0x3400, 0x20c9,
++	0xaaff, 0x2059, 0x0000, 0x2b78, 0x7823, 0x0004, 0x2089, 0x25c7,
++	0x2051, 0xa600, 0x2a70, 0x7762, 0xa786, 0x8fff, 0x0040, 0x1092,
++	0x705f, 0xcd00, 0x705b, 0xccf1, 0x7067, 0x0200, 0x706b, 0x0200,
++	0x0078, 0x109a, 0x705b, 0xbd01, 0x7067, 0x0100, 0x706b, 0x0100,
++	0x705f, 0xbd00, 0x1078, 0x12df, 0x1078, 0x13ca, 0x1078, 0x1577,
++	0x1078, 0x1ce9, 0x1078, 0x42ec, 0x1078, 0x76bf, 0x1078, 0x1355,
++	0x1078, 0x2ac0, 0x1078, 0x4e93, 0x1078, 0x49a3, 0x1078, 0x594a,
++	0x1078, 0x2263, 0x1078, 0x5c43, 0x1078, 0x5485, 0x1078, 0x2162,
++	0x1078, 0x2240, 0x2091, 0x3009, 0x7823, 0x0000, 0x0090, 0x10cf,
++	0x7820, 0xa086, 0x0002, 0x00c0, 0x10cf, 0x7823, 0x4000, 0x0068,
++	0x10c7, 0x781b, 0x0001, 0x2091, 0x5000, 0x2091, 0x4080, 0x2a70,
++	0x7003, 0x0000, 0x2001, 0x017f, 0x2003, 0x0000, 0x2a70, 0x7000,
++	0xa08e, 0x0003, 0x00c0, 0x10ef, 0x1078, 0x365e, 0x1078, 0x2ae8,
++	0x1078, 0x4ee3, 0x1078, 0x4b66, 0x2009, 0x0100, 0x2104, 0xa082,
++	0x0002, 0x0048, 0x10f3, 0x1078, 0x5966, 0x0078, 0x10d6, 0x1079,
++	0x10f7, 0x0078, 0x10dc, 0x1078, 0x7197, 0x0078, 0x10eb, 0x1101,
++	0x1102, 0x11be, 0x10ff, 0x1246, 0x12dc, 0x12dd, 0x12de, 0x1078,
++	0x1332, 0x007c, 0x127e, 0x0f7e, 0x2091, 0x8000, 0x7000, 0xa086,
++	0x0001, 0x00c0, 0x1198, 0x1078, 0x3aec, 0x2079, 0x0100, 0x7844,
++	0xa005, 0x00c0, 0x1198, 0x2011, 0x41dc, 0x1078, 0x5a45, 0x1078,
++	0x1adf, 0x780f, 0x00ff, 0x7840, 0xa084, 0xfffb, 0x7842, 0x2011,
++	0x8010, 0x73c4, 0x1078, 0x361b, 0x2001, 0xffff, 0x1078, 0x5ae6,
++	0x723c, 0xc284, 0x723e, 0x2001, 0xa60c, 0x2014, 0xc2ac, 0x2202,
++	0x1078, 0x6f9f, 0x2011, 0x0004, 0x1078, 0x8d1b, 0x1078, 0x489e,
++	0x1078, 0x42d4, 0x0040, 0x1144, 0x7087, 0x0001, 0x70bf, 0x0000,
++	0x1078, 0x3c9e, 0x0078, 0x1198, 0x1078, 0x4967, 0x0040, 0x114d,
++	0x7a0c, 0xc2b4, 0x7a0e, 0x0078, 0x1159, 0x1078, 0x90a6, 0x70cc,
++	0xd09c, 0x00c0, 0x1159, 0x7098, 0xa005, 0x0040, 0x1159, 0x1078,
++	0x42b8, 0x70d7, 0x0000, 0x70d3, 0x0000, 0x72cc, 0x2079, 0xa652,
++	0x7804, 0xd0ac, 0x0040, 0x1165, 0xc295, 0x72ce, 0xa296, 0x0004,
++	0x0040, 0x1186, 0x2011, 0x0001, 0x1078, 0x8d1b, 0x7093, 0x0000,
++	0x7097, 0xffff, 0x7003, 0x0002, 0x0f7f, 0x1078, 0x2677, 0x2011,
++	0x0005, 0x1078, 0x70e0, 0x1078, 0x62d1, 0x0c7e, 0x2061, 0x0100,
++	0x60e3, 0x0008, 0x0c7f, 0x127f, 0x0078, 0x119a, 0x7093, 0x0000,
++	0x7097, 0xffff, 0x7003, 0x0002, 0x2011, 0x0005, 0x1078, 0x70e0,
++	0x1078, 0x62d1, 0x0c7e, 0x2061, 0x0100, 0x60e3, 0x0008, 0x0c7f,
++	0x0f7f, 0x127f, 0x007c, 0x0c7e, 0x20a9, 0x0082, 0x2009, 0x007e,
++	0x017e, 0x027e, 0x037e, 0x2110, 0x027e, 0x2019, 0x0029, 0x1078,
++	0x73d0, 0x027f, 0x1078, 0xa4f1, 0x037f, 0x027f, 0x017f, 0x1078,
++	0x298e, 0x8108, 0x00f0, 0x11a0, 0x0c7f, 0x706f, 0x0000, 0x7070,
++	0xa084, 0x00ff, 0x7072, 0x709b, 0x0000, 0x007c, 0x127e, 0x2091,
++	0x8000, 0x7000, 0xa086, 0x0002, 0x00c0, 0x1244, 0x7094, 0xa086,
++	0xffff, 0x0040, 0x11d1, 0x1078, 0x2677, 0x1078, 0x62d1, 0x0078,
++	0x1244, 0x70cc, 0xd09c, 0x0040, 0x11fd, 0xd084, 0x0040, 0x11fd,
++	0x0f7e, 0x2079, 0x0100, 0x790c, 0xc1b5, 0x790e, 0x0f7f, 0xd08c,
++	0x0040, 0x11fd, 0x70d0, 0xa086, 0xffff, 0x0040, 0x11f9, 0x1078,
++	0x27f7, 0x1078, 0x62d1, 0x70cc, 0xd094, 0x00c0, 0x1244, 0x2011,
++	0x0001, 0x2019, 0x0000, 0x1078, 0x282f, 0x1078, 0x62d1, 0x0078,
++	0x1244, 0x70d4, 0xa005, 0x00c0, 0x1244, 0x7090, 0xa005, 0x00c0,
++	0x1244, 0x1078, 0x4967, 0x00c0, 0x1244, 0x2001, 0xa653, 0x2004,
++	0xd0ac, 0x0040, 0x1227, 0x157e, 0x0c7e, 0x20a9, 0x007f, 0x2009,
++	0x0000, 0x017e, 0x1078, 0x45c4, 0x00c0, 0x121a, 0x6000, 0xd0ec,
++	0x00c0, 0x1222, 0x017f, 0x8108, 0x00f0, 0x1211, 0x0c7f, 0x157f,
++	0x0078, 0x1227, 0x017f, 0x0c7f, 0x157f, 0x0078, 0x1244, 0x7003,
++	0x0003, 0x7097, 0xffff, 0x2001, 0x0000, 0x1078, 0x24e8, 0x1078,
++	0x3699, 0x2001, 0xa8b2, 0x2004, 0xa086, 0x0005, 0x00c0, 0x123c,
++	0x2011, 0x0000, 0x1078, 0x70e0, 0x2011, 0x0000, 0x1078, 0x70ea,
++	0x1078, 0x62d1, 0x1078, 0x639b, 0x127f, 0x007c, 0x017e, 0x0f7e,
++	0x127e, 0x2091, 0x8000, 0x2079, 0x0100, 0x2009, 0x00f7, 0x1078,
++	0x42a1, 0x7940, 0xa18c, 0x0010, 0x7942, 0x7924, 0xd1b4, 0x0040,
++	0x125b, 0x7827, 0x0040, 0xd19c, 0x0040, 0x1260, 0x7827, 0x0008,
++	0x007e, 0x037e, 0x157e, 0xa006, 0x1078, 0x5ae6, 0x7900, 0xa18a,
++	0x0003, 0x0050, 0x1289, 0x7954, 0xd1ac, 0x00c0, 0x1289, 0x2009,
++	0x00f8, 0x1078, 0x42a1, 0x7843, 0x0090, 0x7843, 0x0010, 0x20a9,
++	0x09c4, 0x7820, 0xd09c, 0x00c0, 0x1281, 0x7824, 0xd0ac, 0x00c0,
++	0x12ca, 0x00f0, 0x1279, 0x2001, 0x0001, 0x1078, 0x24e8, 0x0078,
++	0x12d5, 0x7853, 0x0000, 0x782f, 0x0020, 0x20a9, 0x0050, 0x00e0,
++	0x128f, 0x2091, 0x6000, 0x00f0, 0x128f, 0x7853, 0x0400, 0x782f,
++	0x0000, 0x2009, 0x00f8, 0x1078, 0x42a1, 0x20a9, 0x000e, 0x0005,
++	0x00f0, 0x129f, 0x7853, 0x1400, 0x7843, 0x0090, 0x7843, 0x0010,
++	0x2019, 0x61a8, 0x7854, 0x0005, 0x0005, 0xd08c, 0x0040, 0x12b4,
++	0x7824, 0xd0ac, 0x00c0, 0x12ca, 0x8319, 0x00c0, 0x12aa, 0x2009,
++	0xa632, 0x2104, 0x8000, 0x200a, 0xa084, 0xfff0, 0x0040, 0x12c4,
++	0x200b, 0x0000, 0x1078, 0x2588, 0x2001, 0x0001, 0x1078, 0x24e8,
++	0x0078, 0x12d3, 0x2001, 0xa632, 0x2003, 0x0000, 0x7828, 0xc09d,
++	0x782a, 0x7827, 0x0048, 0x7853, 0x0400, 0x157f, 0x037f, 0x007f,
++	0x127f, 0x0f7f, 0x017f, 0x007c, 0x007c, 0x007c, 0x007c, 0x2a70,
++	0x2061, 0xa8ad, 0x2063, 0x0001, 0x6007, 0x0013, 0x600b, 0x0018,
++	0x600f, 0x0017, 0x2009, 0x0100, 0x2104, 0xa082, 0x0002, 0x0048,
++	0x12f5, 0x7053, 0xffff, 0x0078, 0x12f7, 0x7053, 0x0000, 0x7057,
++	0xffff, 0x706f, 0x0000, 0x7073, 0x0000, 0x1078, 0x90a6, 0x2061,
++	0xa88d, 0x6003, 0x0909, 0x6007, 0x0000, 0x600b, 0x8800, 0x600f,
++	0x0200, 0x6013, 0x00ff, 0x6017, 0x0003, 0x601b, 0x0000, 0x601f,
++	0x07d0, 0x2061, 0xa895, 0x6003, 0x8000, 0x6007, 0x0000, 0x600b,
++	0x0000, 0x600f, 0x0200, 0x6013, 0x00ff, 0x6017, 0x0000, 0x601b,
++	0x0001, 0x601f, 0x0000, 0x2061, 0xa8a5, 0x6003, 0x514c, 0x6007,
++	0x4f47, 0x600b, 0x4943, 0x600f, 0x2020, 0x2001, 0xa626, 0x2003,
++	0x0000, 0x007c, 0x2091, 0x8000, 0x0068, 0x1334, 0x007e, 0x017e,
++	0x2079, 0x0000, 0x7818, 0xd084, 0x00c0, 0x133a, 0x017f, 0x792e,
++	0x007f, 0x782a, 0x007f, 0x7826, 0x3900, 0x783a, 0x7823, 0x8002,
++	0x781b, 0x0001, 0x2091, 0x5000, 0x2091, 0x4080, 0x2079, 0xa600,
++	0x7803, 0x0005, 0x0078, 0x1352, 0x007c, 0x2071, 0xa600, 0x715c,
++	0x712e, 0x2021, 0x0001, 0xa190, 0x002d, 0xa298, 0x002d, 0x0048,
++	0x136b, 0x7060, 0xa302, 0x00c8, 0x136b, 0x220a, 0x2208, 0x2310,
++	0x8420, 0x0078, 0x135d, 0x200b, 0x0000, 0x74aa, 0x74ae, 0x007c,
++	0x0e7e, 0x127e, 0x2091, 0x8000, 0x2071, 0xa600, 0x70ac, 0xa0ea,
++	0x0010, 0x00c8, 0x137e, 0xa06e, 0x0078, 0x1388, 0x8001, 0x70ae,
++	0x702c, 0x2068, 0x2d04, 0x702e, 0x206b, 0x0000, 0x6807, 0x0000,
++	0x127f, 0x0e7f, 0x007c, 0x0e7e, 0x2071, 0xa600, 0x127e, 0x2091,
++	0x8000, 0x70ac, 0x8001, 0x00c8, 0x1398, 0xa06e, 0x0078, 0x13a1,
++	0x70ae, 0x702c, 0x2068, 0x2d04, 0x702e, 0x206b, 0x0000, 0x6807,
++	0x0000, 0x127f, 0x0e7f, 0x007c, 0x0e7e, 0x127e, 0x2091, 0x8000,
++	0x2071, 0xa600, 0x702c, 0x206a, 0x2d00, 0x702e, 0x70ac, 0x8000,
++	0x70ae, 0x127f, 0x0e7f, 0x007c, 0x8dff, 0x0040, 0x13c0, 0x6804,
++	0x6807, 0x0000, 0x007e, 0x1078, 0x13a4, 0x0d7f, 0x0078, 0x13b4,
++	0x007c, 0x0e7e, 0x2071, 0xa600, 0x70ac, 0xa08a, 0x0010, 0xa00d,
++	0x0e7f, 0x007c, 0x0e7e, 0x2071, 0xa8d6, 0x7007, 0x0000, 0x701b,
++	0x0000, 0x701f, 0x0000, 0x2071, 0x0000, 0x7010, 0xa085, 0x8004,
++	0x7012, 0x0e7f, 0x007c, 0x127e, 0x2091, 0x8000, 0x0e7e, 0x2270,
++	0x700b, 0x0000, 0x2071, 0xa8d6, 0x7018, 0xa088, 0xa8df, 0x220a,
++	0x8000, 0xa084, 0x0007, 0x701a, 0x7004, 0xa005, 0x00c0, 0x13f6,
++	0x0f7e, 0x2079, 0x0010, 0x1078, 0x1408, 0x0f7f, 0x0e7f, 0x127f,
++	0x007c, 0x0e7e, 0x2071, 0xa8d6, 0x7004, 0xa005, 0x00c0, 0x1406,
++	0x0f7e, 0x2079, 0x0010, 0x1078, 0x1408, 0x0f7f, 0x0e7f, 0x007c,
++	0x7000, 0x0079, 0x140b, 0x140f, 0x1479, 0x1496, 0x1496, 0x7018,
++	0x711c, 0xa106, 0x00c0, 0x1417, 0x7007, 0x0000, 0x007c, 0x0d7e,
++	0xa180, 0xa8df, 0x2004, 0x700a, 0x2068, 0x8108, 0xa18c, 0x0007,
++	0x711e, 0x7803, 0x0026, 0x6824, 0x7832, 0x6828, 0x7836, 0x682c,
++	0x783a, 0x6830, 0x783e, 0x6810, 0x700e, 0x680c, 0x7016, 0x6804,
++	0x0d7f, 0xd084, 0x0040, 0x1439, 0x7007, 0x0001, 0x1078, 0x143e,
++	0x007c, 0x7007, 0x0002, 0x1078, 0x1454, 0x007c, 0x017e, 0x027e,
++	0x710c, 0x2011, 0x0040, 0xa182, 0x0040, 0x00c8, 0x1449, 0x2110,
++	0xa006, 0x700e, 0x7212, 0x8203, 0x7822, 0x7803, 0x0020, 0x7803,
++	0x0041, 0x027f, 0x017f, 0x007c, 0x017e, 0x027e, 0x137e, 0x147e,
++	0x157e, 0x7014, 0x2098, 0x20a1, 0x0014, 0x7803, 0x0026, 0x710c,
++	0x2011, 0x0040, 0xa182, 0x0040, 0x00c8, 0x1468, 0x2110, 0xa006,
++	0x700e, 0x22a8, 0x53a6, 0x8203, 0x7822, 0x7803, 0x0020, 0x3300,
++	0x7016, 0x7803, 0x0001, 0x157f, 0x147f, 0x137f, 0x027f, 0x017f,
++	0x007c, 0x137e, 0x147e, 0x157e, 0x2099, 0xa6fa, 0x20a1, 0x0018,
++	0x20a9, 0x0008, 0x53a3, 0x7803, 0x0020, 0x127e, 0x2091, 0x8000,
++	0x7803, 0x0041, 0x7007, 0x0003, 0x7000, 0xc084, 0x7002, 0x700b,
++	0xa6f5, 0x127f, 0x157f, 0x147f, 0x137f, 0x007c, 0x137e, 0x147e,
++	0x157e, 0x2001, 0xa729, 0x209c, 0x20a1, 0x0014, 0x7803, 0x0026,
++	0x2001, 0xa72a, 0x20ac, 0x53a6, 0x2099, 0xa72b, 0x20a1, 0x0018,
++	0x20a9, 0x0008, 0x53a3, 0x7803, 0x0020, 0x127e, 0x2091, 0x8000,
++	0x7803, 0x0001, 0x7007, 0x0004, 0x7000, 0xc08c, 0x7002, 0x700b,
++	0xa726, 0x127f, 0x157f, 0x147f, 0x137f, 0x007c, 0x017e, 0x0e7e,
++	0x2071, 0xa8d6, 0x0f7e, 0x2079, 0x0010, 0x7904, 0x7803, 0x0002,
++	0xd1fc, 0x0040, 0x14d0, 0xa18c, 0x0700, 0x7004, 0x1079, 0x14d4,
++	0x0f7f, 0x0e7f, 0x017f, 0x007c, 0x1408, 0x14dc, 0x1509, 0x1531,
++	0x1564, 0x14da, 0x0078, 0x14da, 0xa18c, 0x0700, 0x00c0, 0x1502,
++	0x137e, 0x147e, 0x157e, 0x7014, 0x20a0, 0x2099, 0x0014, 0x7803,
++	0x0040, 0x7010, 0x20a8, 0x53a5, 0x3400, 0x7016, 0x157f, 0x147f,
++	0x137f, 0x700c, 0xa005, 0x0040, 0x151e, 0x1078, 0x143e, 0x007c,
++	0x7008, 0xa080, 0x0002, 0x2003, 0x0100, 0x7007, 0x0000, 0x1078,
++	0x1408, 0x007c, 0x7008, 0xa080, 0x0002, 0x2003, 0x0200, 0x0078,
++	0x14fd, 0xa18c, 0x0700, 0x00c0, 0x1514, 0x700c, 0xa005, 0x0040,
++	0x151e, 0x1078, 0x1454, 0x007c, 0x7008, 0xa080, 0x0002, 0x2003,
++	0x0200, 0x7007, 0x0000, 0x1078, 0x1408, 0x007c, 0x0d7e, 0x7008,
++	0x2068, 0x7830, 0x6826, 0x7834, 0x682a, 0x7838, 0x682e, 0x783c,
++	0x6832, 0x680b, 0x0100, 0x0d7f, 0x7007, 0x0000, 0x1078, 0x1408,
++	0x007c, 0xa18c, 0x0700, 0x00c0, 0x155e, 0x137e, 0x147e, 0x157e,
++	0x2001, 0xa6f8, 0x2004, 0xa080, 0x000d, 0x20a0, 0x2099, 0x0014,
++	0x7803, 0x0040, 0x20a9, 0x0020, 0x53a5, 0x2001, 0xa6fa, 0x2004,
++	0xd0bc, 0x0040, 0x1554, 0x2001, 0xa703, 0x2004, 0xa080, 0x000d,
++	0x20a0, 0x20a9, 0x0020, 0x53a5, 0x157f, 0x147f, 0x137f, 0x7007,
++	0x0000, 0x1078, 0x4f8c, 0x1078, 0x1408, 0x007c, 0x2011, 0x8003,
++	0x1078, 0x361b, 0x0078, 0x1562, 0xa18c, 0x0700, 0x00c0, 0x1571,
++	0x2001, 0xa728, 0x2003, 0x0100, 0x7007, 0x0000, 0x1078, 0x1408,
++	0x007c, 0x2011, 0x8004, 0x1078, 0x361b, 0x0078, 0x1575, 0x127e,
++	0x2091, 0x2100, 0x2079, 0x0030, 0x2071, 0xa8e7, 0x7803, 0x0004,
++	0x7003, 0x0000, 0x700f, 0xa8ed, 0x7013, 0xa8ed, 0x780f, 0x0076,
++	0x7803, 0x0004, 0x127f, 0x007c, 0x6934, 0xa184, 0x0007, 0x0079,
++	0x1591, 0x1599, 0x15df, 0x1599, 0x1599, 0x1599, 0x15c4, 0x15a8,
++	0x159d, 0xa085, 0x0001, 0x0078, 0x15f9, 0x684c, 0xd0bc, 0x0040,
++	0x1599, 0x6860, 0x682e, 0x685c, 0x682a, 0x6858, 0x0078, 0x15e7,
++	0xa18c, 0x00ff, 0xa186, 0x001e, 0x00c0, 0x1599, 0x684c, 0xd0bc,
++	0x0040, 0x1599, 0x6860, 0x682e, 0x685c, 0x682a, 0x6804, 0x681a,
++	0xa080, 0x000d, 0x2004, 0xa084, 0x000f, 0xa080, 0x206a, 0x2004,
++	0x6832, 0x6858, 0x0078, 0x15ef, 0xa18c, 0x00ff, 0xa186, 0x0015,
++	0x00c0, 0x1599, 0x684c, 0xd0ac, 0x0040, 0x1599, 0x6804, 0x681a,
++	0xa080, 0x000d, 0x2004, 0xa084, 0x000f, 0xa080, 0x206a, 0x2004,
++	0x6832, 0xa006, 0x682e, 0x682a, 0x6858, 0x0078, 0x15ef, 0x684c,
++	0xd0ac, 0x0040, 0x1599, 0xa006, 0x682e, 0x682a, 0x6858, 0xa18c,
++	0x000f, 0xa188, 0x206a, 0x210c, 0x6932, 0x2d08, 0x691a, 0x6826,
++	0x684c, 0xc0dd, 0x684e, 0xa006, 0x680a, 0x697c, 0x6912, 0x6980,
++	0x6916, 0x007c, 0x20e1, 0x0007, 0x20e1, 0x2000, 0x2001, 0x020a,
++	0x2004, 0x82ff, 0x0040, 0x161c, 0xa280, 0x0004, 0x0d7e, 0x206c,
++	0x684c, 0xd0dc, 0x00c0, 0x1618, 0x1078, 0x158c, 0x0040, 0x1618,
++	0x0d7f, 0xa280, 0x0000, 0x2003, 0x0002, 0xa016, 0x0078, 0x161c,
++	0x6808, 0x8000, 0x680a, 0x0d7f, 0x127e, 0x047e, 0x037e, 0x027e,
++	0x2091, 0x2100, 0x027f, 0x037f, 0x047f, 0x7000, 0xa005, 0x00c0,
++	0x1630, 0x7206, 0x2001, 0x1651, 0x007e, 0x2260, 0x0078, 0x17e0,
++	0x710c, 0x220a, 0x8108, 0x230a, 0x8108, 0x240a, 0x8108, 0xa182,
++	0xa908, 0x0048, 0x163d, 0x2009, 0xa8ed, 0x710e, 0x7010, 0xa102,
++	0xa082, 0x0009, 0x0040, 0x1648, 0xa080, 0x001b, 0x00c0, 0x164b,
++	0x2009, 0x0138, 0x200a, 0x7000, 0xa005, 0x00c0, 0x1651, 0x1078,
++	0x17c1, 0x127f, 0x007c, 0x127e, 0x027e, 0x037e, 0x0c7e, 0x007e,
++	0x2091, 0x2100, 0x007f, 0x047f, 0x037f, 0x027f, 0x0d7e, 0x0c7e,
++	0x2460, 0x6110, 0x2168, 0x6a62, 0x6b5e, 0xa005, 0x0040, 0x16dd,
++	0x6808, 0xa005, 0x0040, 0x174a, 0x7000, 0xa005, 0x00c0, 0x1672,
++	0x0078, 0x16d2, 0x700c, 0x7110, 0xa106, 0x00c0, 0x1753, 0x7004,
++	0xa406, 0x00c0, 0x16d2, 0x2001, 0x0005, 0x2004, 0xd08c, 0x0040,
++	0x168f, 0x047e, 0x1078, 0x1913, 0x047f, 0x2460, 0x6010, 0xa080,
++	0x0002, 0x2004, 0xa005, 0x0040, 0x174a, 0x0078, 0x166c, 0x2001,
++	0x0207, 0x2004, 0xd09c, 0x00c0, 0x167b, 0x7804, 0xa084, 0x6000,
++	0x0040, 0x16a0, 0xa086, 0x6000, 0x0040, 0x16a0, 0x0078, 0x167b,
++	0x7100, 0xa186, 0x0002, 0x00c0, 0x16c0, 0x0e7e, 0x2b68, 0x6818,
++	0x2060, 0x1078, 0x203f, 0x2804, 0xac70, 0x6034, 0xd09c, 0x00c0,
++	0x16b5, 0x7108, 0x720c, 0x0078, 0x16b7, 0x7110, 0x7214, 0x6810,
++	0xa100, 0x6812, 0x6814, 0xa201, 0x6816, 0x0e7f, 0x0078, 0x16c4,
++	0xa186, 0x0001, 0x00c0, 0x16cc, 0x7820, 0x6910, 0xa100, 0x6812,
++	0x7824, 0x6914, 0xa101, 0x6816, 0x7803, 0x0004, 0x7003, 0x0000,
++	0x7004, 0x2060, 0x6100, 0xa18e, 0x0004, 0x00c0, 0x1753, 0x2009,
++	0x0048, 0x1078, 0x775c, 0x0078, 0x1753, 0x6808, 0xa005, 0x0040,
++	0x174a, 0x7000, 0xa005, 0x00c0, 0x16e7, 0x0078, 0x174a, 0x700c,
++	0x7110, 0xa106, 0x00c0, 0x16f0, 0x7004, 0xa406, 0x00c0, 0x174a,
++	0x2001, 0x0005, 0x2004, 0xd08c, 0x0040, 0x1704, 0x047e, 0x1078,
++	0x1913, 0x047f, 0x2460, 0x6010, 0xa080, 0x0002, 0x2004, 0xa005,
++	0x0040, 0x174a, 0x0078, 0x16e1, 0x2001, 0x0207, 0x2004, 0xd09c,
++	0x00c0, 0x16f0, 0x2001, 0x0005, 0x2004, 0xd08c, 0x00c0, 0x16f6,
++	0x7804, 0xa084, 0x6000, 0x0040, 0x171b, 0xa086, 0x6000, 0x0040,
++	0x171b, 0x0078, 0x16f0, 0x7007, 0x0000, 0xa016, 0x2218, 0x7000,
++	0xa08e, 0x0001, 0x0040, 0x173c, 0xa08e, 0x0002, 0x00c0, 0x174a,
++	0x0c7e, 0x0e7e, 0x6818, 0x2060, 0x1078, 0x203f, 0x2804, 0xac70,
++	0x6034, 0xd09c, 0x00c0, 0x1738, 0x7308, 0x720c, 0x0078, 0x173a,
++	0x7310, 0x7214, 0x0e7f, 0x0c7f, 0x7820, 0xa318, 0x7824, 0xa211,
++	0x6810, 0xa300, 0x6812, 0x6814, 0xa201, 0x6816, 0x7803, 0x0004,
++	0x7003, 0x0000, 0x6100, 0xa18e, 0x0004, 0x00c0, 0x1753, 0x2009,
++	0x0048, 0x1078, 0x775c, 0x0c7f, 0x0d7f, 0x127f, 0x007c, 0x0f7e,
++	0x0e7e, 0x027e, 0x037e, 0x047e, 0x057e, 0x2071, 0xa8e7, 0x7000,
++	0xa086, 0x0000, 0x0040, 0x17ba, 0x7004, 0xac06, 0x00c0, 0x17ab,
++	0x2079, 0x0030, 0x7000, 0xa086, 0x0003, 0x0040, 0x17ab, 0x7804,
++	0xd0fc, 0x00c0, 0x17a7, 0x20e1, 0x6000, 0x2011, 0x0032, 0x2001,
++	0x0208, 0x200c, 0x2001, 0x0209, 0x2004, 0xa106, 0x00c0, 0x176f,
++	0x8211, 0x00c0, 0x1777, 0x7804, 0xd0fc, 0x00c0, 0x17a7, 0x1078,
++	0x1b22, 0x027e, 0x057e, 0x7803, 0x0004, 0x7804, 0xd0ac, 0x00c0,
++	0x178d, 0x7803, 0x0002, 0x7803, 0x0009, 0x7003, 0x0003, 0x7007,
++	0x0000, 0x057f, 0x027f, 0x2001, 0x015d, 0x2003, 0x0000, 0x2001,
++	0x0160, 0x2502, 0x2001, 0x0138, 0x2202, 0x0078, 0x17ab, 0x1078,
++	0x1913, 0x0078, 0x175f, 0x157e, 0x20a9, 0x0009, 0x2009, 0xa8ed,
++	0x2104, 0xac06, 0x00c0, 0x17b5, 0x200a, 0xa188, 0x0003, 0x00f0,
++	0x17b0, 0x157f, 0x057f, 0x047f, 0x037f, 0x027f, 0x0e7f, 0x0f7f,
++	0x007c, 0x700c, 0x7110, 0xa106, 0x00c0, 0x17c9, 0x7003, 0x0000,
++	0x007c, 0x2104, 0x7006, 0x2060, 0x8108, 0x211c, 0x8108, 0x2124,
++	0x8108, 0xa182, 0xa908, 0x0048, 0x17d7, 0x2009, 0xa8ed, 0x7112,
++	0x700c, 0xa106, 0x00c0, 0x17e0, 0x2001, 0x0138, 0x2003, 0x0008,
++	0x8cff, 0x00c0, 0x17e7, 0x1078, 0x1b4d, 0x0078, 0x1854, 0x6010,
++	0x2068, 0x2d58, 0x6828, 0xa406, 0x00c0, 0x17f2, 0x682c, 0xa306,
++	0x0040, 0x182f, 0x601c, 0xa086, 0x0008, 0x0040, 0x182f, 0x6024,
++	0xd0f4, 0x00c0, 0x181c, 0xd0d4, 0x0040, 0x1818, 0x6038, 0xa402,
++	0x6034, 0xa303, 0x0040, 0x1806, 0x00c8, 0x1818, 0x643a, 0x6336,
++	0x6c2a, 0x6b2e, 0x047e, 0x037e, 0x2400, 0x6c7c, 0xa402, 0x6812,
++	0x2300, 0x6b80, 0xa303, 0x6816, 0x037f, 0x047f, 0x0078, 0x181c,
++	0x1078, 0x9053, 0x0040, 0x17e3, 0x2001, 0xa674, 0x2004, 0xd0b4,
++	0x00c0, 0x182b, 0x6018, 0x2004, 0xd0bc, 0x00c0, 0x182b, 0x6817,
++	0x7fff, 0x6813, 0xffff, 0x1078, 0x208a, 0x00c0, 0x17e3, 0x0c7e,
++	0x7004, 0x2060, 0x6024, 0xc0d4, 0x6026, 0x0c7f, 0x684c, 0xd0f4,
++	0x0040, 0x1840, 0x6817, 0xffff, 0x6813, 0xffff, 0x0078, 0x17e3,
++	0x6824, 0x2050, 0x6818, 0x2060, 0x6830, 0x2040, 0x6034, 0xa0cc,
++	0x000f, 0x2009, 0x0011, 0x1078, 0x1855, 0x0040, 0x1853, 0x2009,
++	0x0001, 0x1078, 0x1855, 0x2d58, 0x007c, 0x8aff, 0x0040, 0x18ec,
++	0xa03e, 0x2730, 0x6850, 0xd0fc, 0x00c0, 0x1877, 0xd0f4, 0x00c0,
++	0x1887, 0x0d7e, 0x2804, 0xac68, 0x2900, 0x0079, 0x1867, 0x18ce,
++	0x188e, 0x188e, 0x18ce, 0x18ce, 0x18c6, 0x18ce, 0x188e, 0x18ce,
++	0x1894, 0x1894, 0x18ce, 0x18ce, 0x18ce, 0x18bd, 0x1894, 0xc0fc,
++	0x6852, 0x6b6c, 0x6a70, 0x6d1c, 0x6c20, 0x0d7e, 0xd99c, 0x0040,
++	0x18d1, 0x2804, 0xac68, 0x6f08, 0x6e0c, 0x0078, 0x18d1, 0xc0f4,
++	0x6852, 0x6b6c, 0x6a70, 0x0d7e, 0x0078, 0x18d8, 0x6b08, 0x6a0c,
++	0x6d00, 0x6c04, 0x0078, 0x18d1, 0x7b0c, 0xd3bc, 0x0040, 0x18b5,
++	0x7004, 0x0e7e, 0x2070, 0x701c, 0x0e7f, 0xa086, 0x0008, 0x00c0,
++	0x18b5, 0x7b08, 0xa39c, 0x0fff, 0x2d20, 0x0d7f, 0x0d7e, 0x6a14,
++	0x82ff, 0x00c0, 0x18b0, 0x6810, 0xa302, 0x0048, 0x18b0, 0x6b10,
++	0x2011, 0x0000, 0x2468, 0x0078, 0x18b7, 0x6b10, 0x6a14, 0x6d00,
++	0x6c04, 0x6f08, 0x6e0c, 0x0078, 0x18d1, 0x0d7f, 0x0d7e, 0x6834,
++	0xa084, 0x00ff, 0xa086, 0x001e, 0x00c0, 0x18ce, 0x0d7f, 0x1078,
++	0x2026, 0x00c0, 0x1855, 0xa00e, 0x0078, 0x18ec, 0x0d7f, 0x1078,
++	0x1332, 0x7b22, 0x7a26, 0x7d32, 0x7c36, 0x7f3a, 0x7e3e, 0x7902,
++	0x7000, 0x8000, 0x7002, 0x0d7f, 0x6828, 0xa300, 0x682a, 0x682c,
++	0xa201, 0x682e, 0x2300, 0x6b10, 0xa302, 0x6812, 0x2200, 0x6a14,
++	0xa203, 0x6816, 0x1078, 0x2026, 0x007c, 0x1078, 0x1332, 0x1078,
++	0x1c97, 0x7004, 0x2060, 0x0d7e, 0x6010, 0x2068, 0x7003, 0x0000,
++	0x1078, 0x1af4, 0x1078, 0x8d06, 0x0040, 0x190c, 0x6808, 0x8001,
++	0x680a, 0x697c, 0x6912, 0x6980, 0x6916, 0x682b, 0xffff, 0x682f,
++	0xffff, 0x6850, 0xc0bd, 0x6852, 0x0d7f, 0x1078, 0x8a01, 0x0078,
++	0x1adb, 0x1078, 0x1332, 0x127e, 0x2091, 0x2100, 0x007e, 0x017e,
++	0x2b68, 0x6818, 0x2060, 0x7904, 0x7803, 0x0002, 0xa184, 0x0700,
++	0x00c0, 0x18ef, 0xa184, 0x0003, 0xa086, 0x0003, 0x0040, 0x1911,
++	0x7000, 0x0079, 0x192b, 0x1933, 0x1935, 0x1a34, 0x1ab2, 0x1ac9,
++	0x1933, 0x1933, 0x1933, 0x1078, 0x1332, 0x8001, 0x7002, 0xa184,
++	0x0880, 0x00c0, 0x194a, 0x8aff, 0x0040, 0x19d4, 0x2009, 0x0001,
++	0x1078, 0x1855, 0x0040, 0x1adb, 0x2009, 0x0001, 0x1078, 0x1855,
++	0x0078, 0x1adb, 0x7803, 0x0004, 0x7003, 0x0000, 0xd1bc, 0x00c0,
++	0x19b2, 0x027e, 0x037e, 0x017e, 0x7808, 0xd0ec, 0x00c0, 0x1962,
++	0x7c20, 0x7d24, 0x7e30, 0x7f34, 0x7803, 0x0009, 0x7003, 0x0004,
++	0x0078, 0x1964, 0x1078, 0x1bd7, 0x017f, 0xd194, 0x0040, 0x196b,
++	0x8aff, 0x0040, 0x19a1, 0x6b28, 0x6a2c, 0x2400, 0x686e, 0xa31a,
++	0x2500, 0x6872, 0xa213, 0x6b2a, 0x6a2e, 0x0c7e, 0x7004, 0x2060,
++	0x6024, 0xd0f4, 0x00c0, 0x197e, 0x633a, 0x6236, 0x0c7f, 0x2400,
++	0x6910, 0xa100, 0x6812, 0x2500, 0x6914, 0xa101, 0x6816, 0x037f,
++	0x027f, 0x2600, 0x681e, 0x2700, 0x6822, 0x1078, 0x203f, 0x2a00,
++	0x6826, 0x2c00, 0x681a, 0x2800, 0x6832, 0x6850, 0xc0fd, 0x6852,
++	0x6808, 0x8001, 0x680a, 0x00c0, 0x19a7, 0x684c, 0xd0e4, 0x0040,
++	0x19a7, 0x7004, 0x2060, 0x2009, 0x0048, 0x1078, 0x775c, 0x7000,
++	0xa086, 0x0004, 0x0040, 0x1adb, 0x7003, 0x0000, 0x1078, 0x17c1,
++	0x0078, 0x1adb, 0x057e, 0x7d0c, 0xd5bc, 0x00c0, 0x19b9, 0x1078,
++	0xa57e, 0x057f, 0x1078, 0x1af4, 0x0f7e, 0x7004, 0x2078, 0x1078,
++	0x4963, 0x0040, 0x19c6, 0x7824, 0xc0f5, 0x7826, 0x0f7f, 0x682b,
++	0xffff, 0x682f, 0xffff, 0x6808, 0x8001, 0x680a, 0x697c, 0x6912,
++	0x6980, 0x6916, 0x0078, 0x1adb, 0x7004, 0x0c7e, 0x2060, 0x6024,
++	0x0c7f, 0xd0f4, 0x0040, 0x19e1, 0x6808, 0x8001, 0x680a, 0x0078,
++	0x19f5, 0x684c, 0xc0f5, 0x684e, 0x7814, 0xa005, 0x00c0, 0x19f9,
++	0x7003, 0x0000, 0x6808, 0x8001, 0x680a, 0x00c0, 0x19f5, 0x7004,
++	0x2060, 0x2009, 0x0048, 0x1078, 0x775c, 0x1078, 0x17c1, 0x0078,
++	0x1adb, 0x7814, 0x6910, 0xa102, 0x6812, 0x6914, 0xa183, 0x0000,
++	0x6816, 0x7814, 0x7908, 0xa18c, 0x0fff, 0xa192, 0x0841, 0x00c8,
++	0x18ef, 0xa188, 0x0007, 0x8114, 0x8214, 0x8214, 0xa10a, 0x8104,
++	0x8004, 0x8004, 0xa20a, 0x810b, 0x810b, 0x810b, 0x1078, 0x1b5e,
++	0x7803, 0x0004, 0x780f, 0xffff, 0x7803, 0x0001, 0x7804, 0xd0fc,
++	0x0040, 0x1a1e, 0x7803, 0x0002, 0x7803, 0x0004, 0x780f, 0x0076,
++	0x7004, 0x7007, 0x0000, 0x2060, 0x2009, 0x0048, 0x1078, 0x775c,
++	0x1078, 0x1b92, 0x0040, 0x19f5, 0x8001, 0x7002, 0xd194, 0x0040,
++	0x1a46, 0x7804, 0xd0fc, 0x00c0, 0x191b, 0x8aff, 0x0040, 0x1adb,
++	0x2009, 0x0001, 0x1078, 0x1855, 0x0078, 0x1adb, 0xa184, 0x0880,
++	0x00c0, 0x1a53, 0x8aff, 0x0040, 0x1adb, 0x2009, 0x0001, 0x1078,
++	0x1855, 0x0078, 0x1adb, 0x7803, 0x0004, 0x7003, 0x0000, 0xd1bc,
++	0x00c0, 0x1a93, 0x027e, 0x037e, 0x7808, 0xd0ec, 0x00c0, 0x1a66,
++	0x7803, 0x0009, 0x7003, 0x0004, 0x0078, 0x1a68, 0x1078, 0x1bd7,
++	0x6b28, 0x6a2c, 0x1078, 0x203f, 0x0d7e, 0x0f7e, 0x2d78, 0x2804,
++	0xac68, 0x6034, 0xd09c, 0x00c0, 0x1a83, 0x6808, 0x2008, 0xa31a,
++	0x680c, 0xa213, 0x7810, 0xa100, 0x7812, 0x690c, 0x7814, 0xa101,
++	0x7816, 0x0078, 0x1a8f, 0x6810, 0x2008, 0xa31a, 0x6814, 0xa213,
++	0x7810, 0xa100, 0x7812, 0x6914, 0x7814, 0xa101, 0x7816, 0x0f7f,
++	0x0d7f, 0x0078, 0x196d, 0x057e, 0x7d0c, 0x1078, 0xa57e, 0x057f,
++	0x1078, 0x1af4, 0x0f7e, 0x7004, 0x2078, 0x1078, 0x4963, 0x0040,
++	0x1aa4, 0x7824, 0xc0f5, 0x7826, 0x0f7f, 0x682b, 0xffff, 0x682f,
++	0xffff, 0x6808, 0x8001, 0x680a, 0x697c, 0x6912, 0x6980, 0x6916,
++	0x0078, 0x1adb, 0x7803, 0x0004, 0x7003, 0x0000, 0x7004, 0xa00d,
++	0x0040, 0x1ac5, 0x6808, 0x8001, 0x680a, 0x00c0, 0x1ac5, 0x7004,
++	0x2060, 0x2009, 0x0048, 0x1078, 0x775c, 0x1078, 0x17c1, 0x0078,
++	0x1adb, 0x7803, 0x0004, 0x7003, 0x0000, 0x7004, 0x2060, 0x6010,
++	0xa005, 0x0040, 0x1ac5, 0x2068, 0x6808, 0x8000, 0x680a, 0x6c28,
++	0x6b2c, 0x1078, 0x17e0, 0x017f, 0x007f, 0x127f, 0x007c, 0x127e,
++	0x2091, 0x2100, 0x7000, 0xa086, 0x0003, 0x00c0, 0x1af2, 0x700c,
++	0x7110, 0xa106, 0x0040, 0x1af2, 0x20e1, 0x9028, 0x700f, 0xa8ed,
++	0x7013, 0xa8ed, 0x127f, 0x007c, 0x0c7e, 0x1078, 0x1b22, 0x20e1,
++	0x9028, 0x700c, 0x7110, 0xa106, 0x0040, 0x1b19, 0x2104, 0xa005,
++	0x0040, 0x1b08, 0x2060, 0x6010, 0x2060, 0x6008, 0x8001, 0x600a,
++	0xa188, 0x0003, 0xa182, 0xa908, 0x0048, 0x1b10, 0x2009, 0xa8ed,
++	0x7112, 0x700c, 0xa106, 0x00c0, 0x1af9, 0x2011, 0x0008, 0x0078,
++	0x1af9, 0x2001, 0x015d, 0x2003, 0x0000, 0x2001, 0x0138, 0x2202,
++	0x0c7f, 0x007c, 0x2001, 0x0138, 0x2014, 0x2003, 0x0000, 0x2021,
++	0xb015, 0x2001, 0x0141, 0x201c, 0xd3dc, 0x00c0, 0x1b3f, 0x2001,
++	0x0109, 0x201c, 0xa39c, 0x0048, 0x00c0, 0x1b3f, 0x2001, 0x0111,
++	0x201c, 0x83ff, 0x00c0, 0x1b3f, 0x8421, 0x00c0, 0x1b29, 0x007c,
++	0x2011, 0x0201, 0x2009, 0x003c, 0x2204, 0xa005, 0x00c0, 0x1b4c,
++	0x8109, 0x00c0, 0x1b44, 0x007c, 0x007c, 0x1078, 0x1b40, 0x0040,
++	0x1b55, 0x780c, 0xd0a4, 0x0040, 0x1b5b, 0x1078, 0x1af4, 0xa085,
++	0x0001, 0x0078, 0x1b5d, 0x1078, 0x1b92, 0x007c, 0x0e7e, 0x2071,
++	0x0200, 0x7808, 0xa084, 0xf000, 0xa10d, 0x1078, 0x1b22, 0x2019,
++	0x5000, 0x8319, 0x0040, 0x1b7c, 0x2001, 0xa908, 0x2004, 0xa086,
++	0x0000, 0x0040, 0x1b7c, 0x2001, 0x0021, 0xd0fc, 0x0040, 0x1b69,
++	0x1078, 0x1eaa, 0x0078, 0x1b67, 0x20e1, 0x7000, 0x7324, 0x7420,
++	0x7028, 0x7028, 0x7426, 0x7037, 0x0001, 0x810f, 0x712e, 0x702f,
++	0x0100, 0x7037, 0x0008, 0x7326, 0x7422, 0x2001, 0x0138, 0x2202,
++	0x0e7f, 0x007c, 0x027e, 0x2001, 0x015d, 0x2001, 0x0000, 0x7908,
++	0xa18c, 0x0fff, 0xa182, 0x0ffd, 0x0048, 0x1ba0, 0x2009, 0x0000,
++	0xa190, 0x0007, 0xa294, 0x1ff8, 0x8214, 0x8214, 0x8214, 0x2001,
++	0x020a, 0x82ff, 0x0040, 0x1bb5, 0x20e1, 0x6000, 0x200c, 0x200c,
++	0x200c, 0x200c, 0x8211, 0x00c0, 0x1bae, 0x20e1, 0x7000, 0x200c,
++	0x200c, 0x7003, 0x0000, 0x20e1, 0x6000, 0x2001, 0x0208, 0x200c,
++	0x2001, 0x0209, 0x2004, 0xa106, 0x0040, 0x1bd4, 0x1078, 0x1b40,
++	0x0040, 0x1bd2, 0x7908, 0xd1ec, 0x00c0, 0x1bd4, 0x790c, 0xd1a4,
++	0x0040, 0x1b97, 0x1078, 0x1af4, 0xa006, 0x027f, 0x007c, 0x7c20,
++	0x7d24, 0x7e30, 0x7f34, 0x700c, 0x7110, 0xa106, 0x0040, 0x1c69,
++	0x7004, 0x017e, 0x210c, 0xa106, 0x017f, 0x0040, 0x1c69, 0x0d7e,
++	0x0c7e, 0x216c, 0x2d00, 0xa005, 0x0040, 0x1c67, 0x681c, 0xa086,
++	0x0008, 0x0040, 0x1c67, 0x6824, 0xd0d4, 0x00c0, 0x1c67, 0x6810,
++	0x2068, 0x6850, 0xd0fc, 0x0040, 0x1c29, 0x8108, 0x2104, 0x6b2c,
++	0xa306, 0x00c0, 0x1c67, 0x8108, 0x2104, 0x6a28, 0xa206, 0x00c0,
++	0x1c67, 0x6850, 0xc0fc, 0xc0f5, 0x6852, 0x686c, 0x7822, 0x6870,
++	0x7826, 0x681c, 0x7832, 0x6820, 0x7836, 0x6818, 0x2060, 0x6034,
++	0xd09c, 0x0040, 0x1c24, 0x6830, 0x2004, 0xac68, 0x6808, 0x783a,
++	0x680c, 0x783e, 0x0078, 0x1c65, 0xa006, 0x783a, 0x783e, 0x0078,
++	0x1c65, 0x8108, 0x2104, 0xa005, 0x00c0, 0x1c67, 0x6b2c, 0xa306,
++	0x00c0, 0x1c67, 0x8108, 0x2104, 0xa005, 0x00c0, 0x1c67, 0x6a28,
++	0xa206, 0x00c0, 0x1c67, 0x6850, 0xc0f5, 0x6852, 0x6830, 0x2004,
++	0x6918, 0xa160, 0xa180, 0x000d, 0x2004, 0xd09c, 0x00c0, 0x1c57,
++	0x6008, 0x7822, 0x686e, 0x600c, 0x7826, 0x6872, 0x6000, 0x7832,
++	0x6004, 0x7836, 0xa006, 0x783a, 0x783e, 0x0078, 0x1c65, 0x6010,
++	0x7822, 0x686e, 0x6014, 0x7826, 0x6872, 0x6000, 0x7832, 0x6004,
++	0x7836, 0x6008, 0x783a, 0x600c, 0x783e, 0x7803, 0x0011, 0x0c7f,
++	0x0d7f, 0x007c, 0x0f7e, 0x0e7e, 0x017e, 0x027e, 0x2071, 0xa8e7,
++	0x2079, 0x0030, 0x2011, 0x0050, 0x7000, 0xa086, 0x0000, 0x0040,
++	0x1c92, 0x8211, 0x0040, 0x1c90, 0x2001, 0x0005, 0x2004, 0xd08c,
++	0x0040, 0x1c79, 0x7904, 0xa18c, 0x0780, 0x017e, 0x1078, 0x1913,
++	0x017f, 0x81ff, 0x00c0, 0x1c90, 0x2011, 0x0050, 0x0078, 0x1c74,
++	0xa085, 0x0001, 0x027f, 0x017f, 0x0e7f, 0x0f7f, 0x007c, 0x7803,
++	0x0004, 0x2009, 0x0064, 0x7804, 0xd0ac, 0x0040, 0x1ce8, 0x8109,
++	0x00c0, 0x1c9b, 0x2009, 0x0100, 0x210c, 0xa18a, 0x0003, 0x1048,
++	0x1332, 0x1078, 0x1fca, 0x0e7e, 0x0f7e, 0x2071, 0xa8d6, 0x2079,
++	0x0010, 0x7004, 0xa086, 0x0000, 0x0040, 0x1ce0, 0x7800, 0x007e,
++	0x7820, 0x007e, 0x7830, 0x007e, 0x7834, 0x007e, 0x7838, 0x007e,
++	0x783c, 0x007e, 0x7803, 0x0004, 0x7823, 0x0000, 0x0005, 0x0005,
++	0x2079, 0x0030, 0x7804, 0xd0ac, 0x10c0, 0x1332, 0x2079, 0x0010,
++	0x007f, 0x783e, 0x007f, 0x783a, 0x007f, 0x7836, 0x007f, 0x7832,
++	0x007f, 0x7822, 0x007f, 0x7802, 0x0f7f, 0x0e7f, 0x0078, 0x1ce6,
++	0x0f7f, 0x0e7f, 0x7804, 0xd0ac, 0x10c0, 0x1332, 0x1078, 0x639b,
++	0x007c, 0x0e7e, 0x2071, 0xa908, 0x7003, 0x0000, 0x0e7f, 0x007c,
++	0x0d7e, 0xa280, 0x0004, 0x206c, 0x694c, 0xd1dc, 0x00c0, 0x1d6b,
++	0x6934, 0xa184, 0x0007, 0x0079, 0x1cfd, 0x1d05, 0x1d56, 0x1d05,
++	0x1d05, 0x1d05, 0x1d3b, 0x1d18, 0x1d07, 0x1078, 0x1332, 0x684c,
++	0xd0b4, 0x0040, 0x1e79, 0x6860, 0x682e, 0x6816, 0x685c, 0x682a,
++	0x6812, 0x687c, 0x680a, 0x6880, 0x680e, 0x6958, 0x0078, 0x1d5e,
++	0x6834, 0xa084, 0x00ff, 0xa086, 0x001e, 0x00c0, 0x1d05, 0x684c,
++	0xd0b4, 0x0040, 0x1e79, 0x6860, 0x682e, 0x6816, 0x685c, 0x682a,
++	0x6812, 0x687c, 0x680a, 0x6880, 0x680e, 0x6804, 0x681a, 0xa080,
++	0x000d, 0x2004, 0xa084, 0x000f, 0xa080, 0x206a, 0x2004, 0x6832,
++	0x6958, 0x0078, 0x1d67, 0xa18c, 0x00ff, 0xa186, 0x0015, 0x00c0,
++	0x1d6b, 0x684c, 0xd0b4, 0x0040, 0x1e79, 0x6804, 0x681a, 0xa080,
++	0x000d, 0x2004, 0xa084, 0x000f, 0xa080, 0x206a, 0x2004, 0x6832,
++	0x6958, 0xa006, 0x682e, 0x682a, 0x0078, 0x1d67, 0x684c, 0xd0b4,
++	0x0040, 0x18ed, 0x6958, 0xa006, 0x682e, 0x682a, 0x2d00, 0x681a,
++	0x6834, 0xa084, 0x000f, 0xa080, 0x206a, 0x2004, 0x6832, 0x6926,
++	0x684c, 0xc0dd, 0x684e, 0x0d7f, 0x007c, 0x0f7e, 0x2079, 0x0020,
++	0x7804, 0xd0fc, 0x10c0, 0x1eaa, 0x0e7e, 0x0d7e, 0x2071, 0xa908,
++	0x7000, 0xa005, 0x00c0, 0x1df0, 0x0c7e, 0x7206, 0xa280, 0x0004,
++	0x205c, 0x7004, 0x2068, 0x7803, 0x0004, 0x6818, 0x0d7e, 0x2068,
++	0x686c, 0x7812, 0x6890, 0x0f7e, 0x20e1, 0x9040, 0x2079, 0x0200,
++	0x781a, 0x2079, 0x0100, 0x8004, 0x78d6, 0x0f7f, 0x0d7f, 0x2b68,
++	0x6824, 0x2050, 0x6818, 0x2060, 0x6830, 0x2040, 0x6034, 0xa0cc,
++	0x000f, 0x6908, 0x2001, 0x04fd, 0x2004, 0xa086, 0x0007, 0x0040,
++	0x1db2, 0xa184, 0x0007, 0x0040, 0x1db2, 0x017e, 0x2009, 0x0008,
++	0xa102, 0x017f, 0xa108, 0x791a, 0x7116, 0x701e, 0x680c, 0xa081,
++	0x0000, 0x781e, 0x701a, 0xa006, 0x700e, 0x7012, 0x7004, 0x692c,
++	0x6814, 0xa106, 0x00c0, 0x1dc9, 0x6928, 0x6810, 0xa106, 0x0040,
++	0x1dd6, 0x037e, 0x047e, 0x6b14, 0x6c10, 0x1078, 0x208a, 0x047f,
++	0x037f, 0x0040, 0x1dd6, 0x0c7f, 0x0078, 0x1df0, 0x8aff, 0x00c0,
++	0x1dde, 0x0c7f, 0xa085, 0x0001, 0x0078, 0x1df0, 0x127e, 0x2091,
++	0x8000, 0x2079, 0x0020, 0x2009, 0x0001, 0x1078, 0x1df4, 0x0040,
++	0x1ded, 0x2009, 0x0001, 0x1078, 0x1df4, 0x127f, 0x0c7f, 0xa006,
++	0x0d7f, 0x0e7f, 0x0f7f, 0x007c, 0x077e, 0x067e, 0x057e, 0x047e,
++	0x037e, 0x027e, 0x8aff, 0x0040, 0x1e72, 0x700c, 0x7214, 0xa23a,
++	0x7010, 0x7218, 0xa203, 0x0048, 0x1e71, 0xa705, 0x0040, 0x1e71,
++	0xa03e, 0x2730, 0x6850, 0xd0fc, 0x00c0, 0x1e24, 0x0d7e, 0x2804,
++	0xac68, 0x2900, 0x0079, 0x1e14, 0x1e53, 0x1e34, 0x1e34, 0x1e53,
++	0x1e53, 0x1e4b, 0x1e53, 0x1e34, 0x1e53, 0x1e3a, 0x1e3a, 0x1e53,
++	0x1e53, 0x1e53, 0x1e42, 0x1e3a, 0xc0fc, 0x6852, 0x6b6c, 0x6a70,
++	0x6d1c, 0x6c20, 0xd99c, 0x0040, 0x1e57, 0x0d7e, 0x2804, 0xac68,
++	0x6f08, 0x6e0c, 0x0078, 0x1e56, 0x6b08, 0x6a0c, 0x6d00, 0x6c04,
++	0x0078, 0x1e56, 0x6b10, 0x6a14, 0x6d00, 0x6c04, 0x6f08, 0x6e0c,
++	0x0078, 0x1e56, 0x0d7f, 0x0d7e, 0x6834, 0xa084, 0x00ff, 0xa086,
++	0x001e, 0x00c0, 0x1e53, 0x0d7f, 0x1078, 0x2026, 0x00c0, 0x1dfa,
++	0xa00e, 0x0078, 0x1e72, 0x0d7f, 0x1078, 0x1332, 0x0d7f, 0x7b22,
++	0x7a26, 0x7d32, 0x7c36, 0x7f3a, 0x7e3e, 0x7902, 0x7000, 0x8000,
++	0x7002, 0x6828, 0xa300, 0x682a, 0x682c, 0xa201, 0x682e, 0x700c,
++	0xa300, 0x700e, 0x7010, 0xa201, 0x7012, 0x1078, 0x2026, 0x0078,
++	0x1e72, 0xa006, 0x027f, 0x037f, 0x047f, 0x057f, 0x067f, 0x077f,
++	0x007c, 0x1078, 0x1332, 0x027e, 0x2001, 0x0105, 0x2003, 0x0010,
++	0x20e1, 0x9040, 0x7803, 0x0004, 0x7003, 0x0000, 0x7004, 0x2060,
++	0x0d7e, 0x6010, 0x2068, 0x1078, 0x8d06, 0x0040, 0x1e92, 0x6850,
++	0xc0bd, 0x6852, 0x0d7f, 0x0c7e, 0x1078, 0x8a01, 0x0c7f, 0x2001,
++	0xa8c0, 0x2004, 0xac06, 0x00c0, 0x1ea7, 0x20e1, 0x9040, 0x1078,
++	0x738a, 0x2011, 0x0000, 0x1078, 0x70ea, 0x1078, 0x639b, 0x027f,
++	0x0078, 0x1f76, 0x127e, 0x2091, 0x2200, 0x007e, 0x017e, 0x0f7e,
++	0x0e7e, 0x0d7e, 0x0c7e, 0x2079, 0x0020, 0x2071, 0xa908, 0x2b68,
++	0x6818, 0x2060, 0x7904, 0x7803, 0x0002, 0xa184, 0x0700, 0x00c0,
++	0x1e7b, 0x7000, 0x0079, 0x1ec4, 0x1f76, 0x1ec8, 0x1f43, 0x1f74,
++	0x8001, 0x7002, 0xd19c, 0x00c0, 0x1edc, 0x8aff, 0x0040, 0x1efb,
++	0x2009, 0x0001, 0x1078, 0x1df4, 0x0040, 0x1f76, 0x2009, 0x0001,
++	0x1078, 0x1df4, 0x0078, 0x1f76, 0x7803, 0x0004, 0xd194, 0x0040,
++	0x1eec, 0x6850, 0xc0fc, 0x6852, 0x8aff, 0x00c0, 0x1ef1, 0x684c,
++	0xc0f5, 0x684e, 0x0078, 0x1ef1, 0x1078, 0x203f, 0x6850, 0xc0fd,
++	0x6852, 0x2a00, 0x6826, 0x2c00, 0x681a, 0x2800, 0x6832, 0x7003,
++	0x0000, 0x0078, 0x1f76, 0x711c, 0x81ff, 0x0040, 0x1f11, 0x7918,
++	0x7922, 0x7827, 0x0000, 0x7803, 0x0001, 0x7000, 0x8000, 0x7002,
++	0x700c, 0xa100, 0x700e, 0x7010, 0xa081, 0x0000, 0x7012, 0x0078,
++	0x1f76, 0x0f7e, 0x027e, 0x781c, 0x007e, 0x7818, 0x007e, 0x2079,
++	0x0100, 0x7a14, 0xa284, 0x0004, 0xa085, 0x0012, 0x7816, 0x037e,
++	0x2019, 0x1000, 0x8319, 0x1040, 0x1332, 0x7820, 0xd0bc, 0x00c0,
++	0x1f22, 0x037f, 0x79c8, 0x007f, 0xa102, 0x017f, 0x007e, 0x017e,
++	0x79c4, 0x007f, 0xa103, 0x78c6, 0x007f, 0x78ca, 0xa284, 0x0004,
++	0xa085, 0x0012, 0x7816, 0x027f, 0x0f7f, 0x7803, 0x0008, 0x7003,
++	0x0000, 0x0078, 0x1f76, 0x8001, 0x7002, 0xd194, 0x0040, 0x1f58,
++	0x7804, 0xd0fc, 0x00c0, 0x1eba, 0xd19c, 0x00c0, 0x1f72, 0x8aff,
++	0x0040, 0x1f76, 0x2009, 0x0001, 0x1078, 0x1df4, 0x0078, 0x1f76,
++	0x027e, 0x037e, 0x6b28, 0x6a2c, 0x1078, 0x203f, 0x0d7e, 0x2804,
++	0xac68, 0x6034, 0xd09c, 0x00c0, 0x1f6b, 0x6808, 0xa31a, 0x680c,
++	0xa213, 0x0078, 0x1f6f, 0x6810, 0xa31a, 0x6814, 0xa213, 0x0d7f,
++	0x0078, 0x1eec, 0x0078, 0x1eec, 0x1078, 0x1332, 0x0c7f, 0x0d7f,
++	0x0e7f, 0x0f7f, 0x017f, 0x007f, 0x127f, 0x007c, 0x0f7e, 0x0e7e,
++	0x2071, 0xa908, 0x7000, 0xa086, 0x0000, 0x0040, 0x1fc7, 0x2079,
++	0x0020, 0x017e, 0x2009, 0x0207, 0x210c, 0xd194, 0x0040, 0x1fa4,
++	0x2009, 0x020c, 0x210c, 0xa184, 0x0003, 0x0040, 0x1fa4, 0x1078,
++	0xa5d2, 0x2001, 0x0133, 0x2004, 0xa005, 0x1040, 0x1332, 0x20e1,
++	0x9040, 0x2001, 0x020c, 0x2102, 0x2009, 0x0206, 0x2104, 0x2009,
++	0x0203, 0x210c, 0xa106, 0x00c0, 0x1faf, 0x20e1, 0x9040, 0x7804,
++	0xd0fc, 0x0040, 0x1f8a, 0x1078, 0x1eaa, 0x7000, 0xa086, 0x0000,
++	0x00c0, 0x1f8a, 0x017f, 0x7803, 0x0004, 0x7804, 0xd0ac, 0x00c0,
++	0x1fbd, 0x20e1, 0x9040, 0x7803, 0x0002, 0x7003, 0x0000, 0x0e7f,
++	0x0f7f, 0x007c, 0x027e, 0x0c7e, 0x0d7e, 0x0e7e, 0x0f7e, 0x2071,
++	0xa908, 0x2079, 0x0020, 0x7000, 0xa086, 0x0000, 0x0040, 0x2003,
++	0x7004, 0x2060, 0x6010, 0x2068, 0x1078, 0x8d06, 0x0040, 0x1fed,
++	0x6850, 0xc0b5, 0x6852, 0x680c, 0x7a1c, 0xa206, 0x00c0, 0x1fed,
++	0x6808, 0x7a18, 0xa206, 0x0040, 0x2009, 0x2001, 0x0105, 0x2003,
++	0x0010, 0x20e1, 0x9040, 0x7803, 0x0004, 0x7003, 0x0000, 0x7004,
++	0x2060, 0x1078, 0x8a01, 0x20e1, 0x9040, 0x1078, 0x738a, 0x2011,
++	0x0000, 0x1078, 0x70ea, 0x0f7f, 0x0e7f, 0x0d7f, 0x0c7f, 0x027f,
++	0x007c, 0x6810, 0x6a14, 0xa205, 0x00c0, 0x1fed, 0x684c, 0xc0dc,
++	0x684e, 0x2c10, 0x1078, 0x1cf0, 0x2001, 0x0105, 0x2003, 0x0010,
++	0x20e1, 0x9040, 0x7803, 0x0004, 0x7003, 0x0000, 0x2069, 0xa8b1,
++	0x6833, 0x0000, 0x683f, 0x0000, 0x0078, 0x2003, 0x8840, 0x2804,
++	0xa005, 0x00c0, 0x203a, 0x6004, 0xa005, 0x0040, 0x203c, 0x681a,
++	0x2060, 0x6034, 0xa084, 0x000f, 0xa080, 0x206a, 0x2044, 0x88ff,
++	0x1040, 0x1332, 0x8a51, 0x007c, 0x2051, 0x0000, 0x007c, 0x8a50,
++	0x8841, 0x2804, 0xa005, 0x00c0, 0x2059, 0x2c00, 0xad06, 0x0040,
++	0x204e, 0x6000, 0xa005, 0x00c0, 0x204e, 0x2d00, 0x2060, 0x681a,
++	0x6034, 0xa084, 0x000f, 0xa080, 0x207a, 0x2044, 0x88ff, 0x1040,
++	0x1332, 0x007c, 0x0000, 0x0011, 0x0015, 0x0019, 0x001d, 0x0021,
++	0x0025, 0x0029, 0x0000, 0x000f, 0x0015, 0x001b, 0x0021, 0x0027,
++	0x0000, 0x0000, 0x0000, 0x205f, 0x205b, 0x0000, 0x0000, 0x2069,
++	0x0000, 0x205f, 0x0000, 0x2066, 0x2063, 0x0000, 0x0000, 0x0000,
++	0x2069, 0x2066, 0x0000, 0x2061, 0x2061, 0x0000, 0x0000, 0x2069,
++	0x0000, 0x2061, 0x0000, 0x2067, 0x2067, 0x0000, 0x0000, 0x0000,
++	0x2069, 0x2067, 0x0a7e, 0x097e, 0x087e, 0x6b2e, 0x6c2a, 0x6858,
++	0xa055, 0x0040, 0x212d, 0x2d60, 0x6034, 0xa0cc, 0x000f, 0xa9c0,
++	0x206a, 0xa986, 0x0007, 0x0040, 0x20a5, 0xa986, 0x000e, 0x0040,
++	0x20a5, 0xa986, 0x000f, 0x00c0, 0x20a9, 0x605c, 0xa422, 0x6060,
++	0xa31a, 0x2804, 0xa045, 0x00c0, 0x20b7, 0x0050, 0x20b1, 0x0078,
++	0x212d, 0x6004, 0xa065, 0x0040, 0x212d, 0x0078, 0x2094, 0x2804,
++	0xa005, 0x0040, 0x20d5, 0xac68, 0xd99c, 0x00c0, 0x20c5, 0x6808,
++	0xa422, 0x680c, 0xa31b, 0x0078, 0x20c9, 0x6810, 0xa422, 0x6814,
++	0xa31b, 0x0048, 0x20f4, 0x2300, 0xa405, 0x0040, 0x20db, 0x8a51,
++	0x0040, 0x212d, 0x8840, 0x0078, 0x20b7, 0x6004, 0xa065, 0x0040,
++	0x212d, 0x0078, 0x2094, 0x8a51, 0x0040, 0x212d, 0x8840, 0x2804,
++	0xa005, 0x00c0, 0x20ee, 0x6004, 0xa065, 0x0040, 0x212d, 0x6034,
++	0xa0cc, 0x000f, 0xa9c0, 0x206a, 0x2804, 0x2040, 0x2b68, 0x6850,
++	0xc0fc, 0x6852, 0x0078, 0x2121, 0x8422, 0x8420, 0x831a, 0xa399,
++	0x0000, 0x0d7e, 0x2b68, 0x6c6e, 0x6b72, 0x0d7f, 0xd99c, 0x00c0,
++	0x210f, 0x6908, 0x2400, 0xa122, 0x690c, 0x2300, 0xa11b, 0x1048,
++	0x1332, 0x6800, 0xa420, 0x6804, 0xa319, 0x0078, 0x211b, 0x6910,
++	0x2400, 0xa122, 0x6914, 0x2300, 0xa11b, 0x1048, 0x1332, 0x6800,
++	0xa420, 0x6804, 0xa319, 0x2b68, 0x6c1e, 0x6b22, 0x6850, 0xc0fd,
++	0x6852, 0x2c00, 0x681a, 0x2800, 0x6832, 0x2a00, 0x6826, 0x007f,
++	0x007f, 0x007f, 0xa006, 0x0078, 0x2132, 0x087f, 0x097f, 0x0a7f,
++	0xa085, 0x0001, 0x007c, 0x2001, 0x0005, 0x2004, 0xa084, 0x0007,
++	0x0079, 0x213a, 0x2142, 0x2143, 0x2146, 0x2149, 0x214e, 0x2151,
++	0x2156, 0x215b, 0x007c, 0x1078, 0x1eaa, 0x007c, 0x1078, 0x1913,
++	0x007c, 0x1078, 0x1913, 0x1078, 0x1eaa, 0x007c, 0x1078, 0x14be,
++	0x007c, 0x1078, 0x1eaa, 0x1078, 0x14be, 0x007c, 0x1078, 0x1913,
++	0x1078, 0x14be, 0x007c, 0x1078, 0x1913, 0x1078, 0x1eaa, 0x1078,
++	0x14be, 0x007c, 0x127e, 0x2091, 0x2300, 0x2079, 0x0200, 0x2071,
++	0xab80, 0x2069, 0xa600, 0x2009, 0x0004, 0x7912, 0x7817, 0x0004,
++	0x1078, 0x251f, 0x781b, 0x0002, 0x20e1, 0x8700, 0x127f, 0x007c,
++	0x127e, 0x2091, 0x2300, 0x781c, 0xa084, 0x0007, 0x0079, 0x2180,
++	0x21a4, 0x2188, 0x218c, 0x2190, 0x2196, 0x219a, 0x219e, 0x21a2,
++	0x1078, 0x548e, 0x0078, 0x21a4, 0x1078, 0x54da, 0x0078, 0x21a4,
++	0x1078, 0x548e, 0x1078, 0x54da, 0x0078, 0x21a4, 0x1078, 0x21a6,
++	0x0078, 0x21a4, 0x1078, 0x21a6, 0x0078, 0x21a4, 0x1078, 0x21a6,
++	0x0078, 0x21a4, 0x1078, 0x21a6, 0x127f, 0x007c, 0x007e, 0x017e,
++	0x027e, 0x1078, 0xa5d2, 0x7930, 0xa184, 0x0003, 0x0040, 0x21c9,
++	0x2001, 0xa8c0, 0x2004, 0xa005, 0x0040, 0x21c5, 0x2001, 0x0133,
++	0x2004, 0xa005, 0x1040, 0x1332, 0x0c7e, 0x2001, 0xa8c0, 0x2064,
++	0x1078, 0x8a01, 0x0c7f, 0x0078, 0x21f2, 0x20e1, 0x9040, 0x0078,
++	0x21f2, 0xa184, 0x0030, 0x0040, 0x21da, 0x6a00, 0xa286, 0x0003,
++	0x00c0, 0x21d4, 0x0078, 0x21d6, 0x1078, 0x4224, 0x20e1, 0x9010,
++	0x0078, 0x21f2, 0xa184, 0x00c0, 0x0040, 0x21ec, 0x0e7e, 0x037e,
++	0x047e, 0x057e, 0x2071, 0xa8e7, 0x1078, 0x1af4, 0x057f, 0x047f,
++	0x037f, 0x0e7f, 0x0078, 0x21f2, 0xa184, 0x0300, 0x0040, 0x21f2,
++	0x20e1, 0x9020, 0x7932, 0x027f, 0x017f, 0x007f, 0x007c, 0x017e,
++	0x0e7e, 0x0f7e, 0x2071, 0xa600, 0x7128, 0x2001, 0xa890, 0x2102,
++	0x2001, 0xa898, 0x2102, 0xa182, 0x0211, 0x00c8, 0x220b, 0x2009,
++	0x0008, 0x0078, 0x2235, 0xa182, 0x0259, 0x00c8, 0x2213, 0x2009,
++	0x0007, 0x0078, 0x2235, 0xa182, 0x02c1, 0x00c8, 0x221b, 0x2009,
++	0x0006, 0x0078, 0x2235, 0xa182, 0x0349, 0x00c8, 0x2223, 0x2009,
++	0x0005, 0x0078, 0x2235, 0xa182, 0x0421, 0x00c8, 0x222b, 0x2009,
++	0x0004, 0x0078, 0x2235, 0xa182, 0x0581, 0x00c8, 0x2233, 0x2009,
++	0x0003, 0x0078, 0x2235, 0x2009, 0x0002, 0x2079, 0x0200, 0x7912,
++	0x7817, 0x0004, 0x1078, 0x251f, 0x0f7f, 0x0e7f, 0x017f, 0x007c,
++	0x127e, 0x2091, 0x2200, 0x2061, 0x0100, 0x2071, 0xa600, 0x6024,
++	0x6026, 0x6053, 0x0030, 0x6033, 0x00ef, 0x60e7, 0x0000, 0x60eb,
++	0x00ef, 0x60e3, 0x0008, 0x604b, 0xf7f7, 0x6043, 0x0000, 0x602f,
++	0x0080, 0x602f, 0x0000, 0x6007, 0x0eaf, 0x600f, 0x00ff, 0x602b,
++	0x002f, 0x127f, 0x007c, 0x2001, 0xa630, 0x2003, 0x0000, 0x2001,
++	0xa62f, 0x2003, 0x0001, 0x007c, 0x127e, 0x2091, 0x2200, 0x007e,
++	0x017e, 0x027e, 0x6124, 0xa184, 0x002c, 0x00c0, 0x227b, 0xa184,
++	0x0007, 0x0079, 0x2281, 0xa195, 0x0004, 0xa284, 0x0007, 0x0079,
++	0x2281, 0x22ad, 0x2289, 0x228d, 0x2291, 0x2297, 0x229b, 0x22a1,
++	0x22a7, 0x1078, 0x5c56, 0x0078, 0x22ad, 0x1078, 0x5d45, 0x0078,
++	0x22ad, 0x1078, 0x5d45, 0x1078, 0x5c56, 0x0078, 0x22ad, 0x1078,
++	0x22b2, 0x0078, 0x22ad, 0x1078, 0x5c56, 0x1078, 0x22b2, 0x0078,
++	0x22ad, 0x1078, 0x5d45, 0x1078, 0x22b2, 0x0078, 0x22ad, 0x1078,
++	0x5d45, 0x1078, 0x5c56, 0x1078, 0x22b2, 0x027f, 0x017f, 0x007f,
++	0x127f, 0x007c, 0x6124, 0xd1ac, 0x0040, 0x23ac, 0x017e, 0x047e,
++	0x0c7e, 0x644c, 0xa486, 0xf0f0, 0x00c0, 0x22c5, 0x2061, 0x0100,
++	0x644a, 0x6043, 0x0090, 0x6043, 0x0010, 0x74c6, 0xa48c, 0xff00,
++	0x7034, 0xd084, 0x0040, 0x22dd, 0xa186, 0xf800, 0x00c0, 0x22dd,
++	0x703c, 0xd084, 0x00c0, 0x22dd, 0xc085, 0x703e, 0x037e, 0x2418,
++	0x2011, 0x8016, 0x1078, 0x361b, 0x037f, 0xa196, 0xff00, 0x0040,
++	0x231f, 0x6030, 0xa084, 0x00ff, 0x810f, 0xa116, 0x0040, 0x231f,
++	0x7130, 0xd184, 0x00c0, 0x231f, 0x2011, 0xa653, 0x2214, 0xd2ec,
++	0x0040, 0x22fa, 0xc18d, 0x7132, 0x2011, 0xa653, 0x2214, 0xd2ac,
++	0x00c0, 0x231f, 0x6240, 0xa294, 0x0010, 0x0040, 0x2306, 0x6248,
++	0xa294, 0xff00, 0xa296, 0xff00, 0x0040, 0x231f, 0x7030, 0xd08c,
++	0x0040, 0x2371, 0x7034, 0xd08c, 0x00c0, 0x2316, 0x2001, 0xa60c,
++	0x200c, 0xd1ac, 0x00c0, 0x2371, 0xc1ad, 0x2102, 0x037e, 0x73c4,
++	0x2011, 0x8013, 0x1078, 0x361b, 0x037f, 0x0078, 0x2371, 0x7034,
++	0xd08c, 0x00c0, 0x232b, 0x2001, 0xa60c, 0x200c, 0xd1ac, 0x00c0,
++	0x2371, 0xc1ad, 0x2102, 0x037e, 0x73c4, 0x2011, 0x8013, 0x1078,
++	0x361b, 0x037f, 0x7130, 0xc185, 0x7132, 0x2011, 0xa653, 0x220c,
++	0xd1a4, 0x0040, 0x2355, 0x017e, 0x2009, 0x0001, 0x2011, 0x0100,
++	0x1078, 0x5bf1, 0x2019, 0x000e, 0x1078, 0xa195, 0xa484, 0x00ff,
++	0xa080, 0x29c0, 0x200c, 0xa18c, 0xff00, 0x810f, 0x8127, 0xa006,
++	0x2009, 0x000e, 0x1078, 0xa21d, 0x017f, 0xd1ac, 0x00c0, 0x2362,
++	0x017e, 0x2009, 0x0000, 0x2019, 0x0004, 0x1078, 0x284f, 0x017f,
++	0x0078, 0x2371, 0x157e, 0x20a9, 0x007f, 0x2009, 0x0000, 0x1078,
++	0x45c4, 0x00c0, 0x236d, 0x1078, 0x42f8, 0x8108, 0x00f0, 0x2367,
++	0x157f, 0x0c7f, 0x047f, 0x0f7e, 0x2079, 0xa8c4, 0x783c, 0xa086,
++	0x0000, 0x0040, 0x2383, 0x6027, 0x0004, 0x783f, 0x0000, 0x2079,
++	0x0140, 0x7803, 0x0000, 0x0f7f, 0x2011, 0x0003, 0x1078, 0x70e0,
++	0x2011, 0x0002, 0x1078, 0x70ea, 0x1078, 0x6fc4, 0x037e, 0x2019,
++	0x0000, 0x1078, 0x7058, 0x037f, 0x60e3, 0x0000, 0x017f, 0x2001,
++	0xa600, 0x2014, 0xa296, 0x0004, 0x00c0, 0x23a4, 0xd19c, 0x00c0,
++	0x23ac, 0x6228, 0xc29d, 0x622a, 0x2003, 0x0001, 0x2001, 0xa622,
++	0x2003, 0x0000, 0x6027, 0x0020, 0xd194, 0x0040, 0x2490, 0x0f7e,
++	0x2079, 0xa8c4, 0x783c, 0xa086, 0x0001, 0x00c0, 0x23d0, 0x017e,
++	0x6027, 0x0004, 0x783f, 0x0000, 0x2079, 0x0140, 0x7803, 0x1000,
++	0x7803, 0x0000, 0x2079, 0xa8b1, 0x7807, 0x0000, 0x7833, 0x0000,
++	0x1078, 0x62d1, 0x1078, 0x639b, 0x017f, 0x0f7f, 0x0078, 0x2490,
++	0x0f7f, 0x017e, 0x3900, 0xa082, 0xa9e3, 0x00c8, 0x23db, 0x017e,
++	0x1078, 0x747a, 0x017f, 0x6220, 0xd2b4, 0x0040, 0x2446, 0x1078,
++	0x5acb, 0x1078, 0x6e0f, 0x6027, 0x0004, 0x0f7e, 0x2019, 0xa8ba,
++	0x2304, 0xa07d, 0x0040, 0x241c, 0x7804, 0xa086, 0x0032, 0x00c0,
++	0x241c, 0x0d7e, 0x0c7e, 0x0e7e, 0x2069, 0x0140, 0x618c, 0x6288,
++	0x7818, 0x608e, 0x7808, 0x608a, 0x6043, 0x0002, 0x2001, 0x0003,
++	0x8001, 0x00c0, 0x2400, 0x6043, 0x0000, 0x6803, 0x1000, 0x6803,
++	0x0000, 0x618e, 0x628a, 0x1078, 0x61cd, 0x1078, 0x62d1, 0x7810,
++	0x2070, 0x7037, 0x0103, 0x2f60, 0x1078, 0x772d, 0x0e7f, 0x0c7f,
++	0x0d7f, 0x0f7f, 0x017f, 0x007c, 0x0f7f, 0x0d7e, 0x2069, 0x0140,
++	0x6804, 0xa084, 0x4000, 0x0040, 0x2429, 0x6803, 0x1000, 0x6803,
++	0x0000, 0x0d7f, 0x0c7e, 0x2061, 0xa8b1, 0x6028, 0xa09a, 0x00c8,
++	0x00c8, 0x2439, 0x8000, 0x602a, 0x0c7f, 0x1078, 0x6e01, 0x0078,
++	0x248f, 0x2019, 0xa8ba, 0x2304, 0xa065, 0x0040, 0x2443, 0x2009,
++	0x0027, 0x1078, 0x775c, 0x0c7f, 0x0078, 0x248f, 0xd2bc, 0x0040,
++	0x248f, 0x1078, 0x5ad8, 0x6017, 0x0010, 0x6027, 0x0004, 0x0d7e,
++	0x2069, 0x0140, 0x6804, 0xa084, 0x4000, 0x0040, 0x245b, 0x6803,
++	0x1000, 0x6803, 0x0000, 0x0d7f, 0x0c7e, 0x2061, 0xa8b1, 0x6044,
++	0xa09a, 0x00c8, 0x00c8, 0x247e, 0x8000, 0x6046, 0x603c, 0x0c7f,
++	0xa005, 0x0040, 0x248f, 0x2009, 0x07d0, 0x1078, 0x5ad0, 0xa080,
++	0x0007, 0x2004, 0xa086, 0x0006, 0x00c0, 0x247a, 0x6017, 0x0012,
++	0x0078, 0x248f, 0x6017, 0x0016, 0x0078, 0x248f, 0x037e, 0x2019,
++	0x0001, 0x1078, 0x7058, 0x037f, 0x2019, 0xa8c0, 0x2304, 0xa065,
++	0x0040, 0x248e, 0x2009, 0x004f, 0x1078, 0x775c, 0x0c7f, 0x017f,
++	0xd19c, 0x0040, 0x24e4, 0x7034, 0xd0ac, 0x00c0, 0x24c1, 0x017e,
++	0x157e, 0x6027, 0x0008, 0x602f, 0x0020, 0x20a9, 0x000a, 0x00f0,
++	0x249f, 0x602f, 0x0000, 0x6150, 0xa185, 0x1400, 0x6052, 0x20a9,
++	0x0320, 0x00e0, 0x24a9, 0x2091, 0x6000, 0x6020, 0xd09c, 0x00c0,
++	0x24b8, 0x157f, 0x6152, 0x017f, 0x6027, 0x0008, 0x0078, 0x24e4,
++	0x1078, 0x2577, 0x00f0, 0x24a9, 0x157f, 0x6152, 0x017f, 0x6027,
++	0x0008, 0x017e, 0x6028, 0xc09c, 0x602a, 0x2011, 0x0003, 0x1078,
++	0x70e0, 0x2011, 0x0002, 0x1078, 0x70ea, 0x1078, 0x6fc4, 0x037e,
++	0x2019, 0x0000, 0x1078, 0x7058, 0x037f, 0x60e3, 0x0000, 0x1078,
++	0xa5ad, 0x1078, 0xa5cb, 0x2001, 0xa600, 0x2003, 0x0004, 0x6027,
++	0x0008, 0x1078, 0x1246, 0x017f, 0xa18c, 0xffd0, 0x6126, 0x007c,
++	0x007e, 0x017e, 0x027e, 0x0e7e, 0x0f7e, 0x127e, 0x2091, 0x8000,
++	0x2071, 0xa600, 0x71bc, 0x70be, 0xa116, 0x0040, 0x2518, 0x81ff,
++	0x0040, 0x2500, 0x2011, 0x8011, 0x1078, 0x361b, 0x0078, 0x2518,
++	0x2011, 0x8012, 0x1078, 0x361b, 0x2001, 0xa672, 0x2004, 0xd0fc,
++	0x00c0, 0x2518, 0x037e, 0x0c7e, 0x1078, 0x6f9f, 0x2061, 0x0100,
++	0x2019, 0x0028, 0x2009, 0x0000, 0x1078, 0x284f, 0x0c7f, 0x037f,
++	0x127f, 0x0f7f, 0x0e7f, 0x027f, 0x017f, 0x007f, 0x007c, 0x0c7e,
++	0x0f7e, 0x007e, 0x027e, 0x2061, 0x0100, 0xa190, 0x253b, 0x2204,
++	0x60f2, 0x2011, 0x2548, 0x6000, 0xa082, 0x0003, 0x00c8, 0x2534,
++	0x2001, 0x00ff, 0x0078, 0x2535, 0x2204, 0x60ee, 0x027f, 0x007f,
++	0x0f7f, 0x0c7f, 0x007c, 0x0840, 0x0840, 0x0840, 0x0580, 0x0420,
++	0x0348, 0x02c0, 0x0258, 0x0210, 0x01a8, 0x01a8, 0x01a8, 0x01a8,
++	0x0140, 0x00f8, 0x00d0, 0x00b0, 0x00a0, 0x2028, 0xa18c, 0x00ff,
++	0x2130, 0xa094, 0xff00, 0x00c0, 0x2558, 0x81ff, 0x0040, 0x255c,
++	0x1078, 0x5761, 0x0078, 0x2563, 0xa080, 0x29c0, 0x200c, 0xa18c,
++	0xff00, 0x810f, 0xa006, 0x007c, 0xa080, 0x29c0, 0x200c, 0xa18c,
++	0x00ff, 0x007c, 0x0c7e, 0x2061, 0xa600, 0x6030, 0x0040, 0x2573,
++	0xc09d, 0x0078, 0x2574, 0xc09c, 0x6032, 0x0c7f, 0x007c, 0x007e,
++	0x157e, 0x0f7e, 0x2079, 0x0100, 0x20a9, 0x000a, 0x7854, 0xd08c,
++	0x00c0, 0x2584, 0x00f0, 0x257e, 0x0f7f, 0x157f, 0x007f, 0x007c,
++	0x0c7e, 0x007e, 0x2061, 0x0100, 0x6030, 0x007e, 0x6048, 0x007e,
++	0x60e4, 0x007e, 0x60e8, 0x007e, 0x6050, 0x007e, 0x60f0, 0x007e,
++	0x60ec, 0x007e, 0x600c, 0x007e, 0x6004, 0x007e, 0x6028, 0x007e,
++	0x60e0, 0x007e, 0x602f, 0x0100, 0x602f, 0x0000, 0x0005, 0x0005,
++	0x0005, 0x0005, 0x602f, 0x0040, 0x602f, 0x0000, 0x007f, 0x60e2,
++	0x007f, 0x602a, 0x007f, 0x6006, 0x007f, 0x600e, 0x007f, 0x60ee,
++	0x007f, 0x60f2, 0x007f, 0x6052, 0x007f, 0x60ea, 0x007f, 0x60e6,
++	0x007f, 0x604a, 0x007f, 0x6032, 0x007f, 0x0c7f, 0x007c, 0x25e7,
++	0x25eb, 0x25ef, 0x25f5, 0x25fb, 0x2601, 0x2607, 0x260f, 0x2617,
++	0x261d, 0x2623, 0x262b, 0x2633, 0x263b, 0x2643, 0x264d, 0x2657,
++	0x2657, 0x2657, 0x2657, 0x2657, 0x2657, 0x2657, 0x2657, 0x2657,
++	0x2657, 0x2657, 0x2657, 0x2657, 0x2657, 0x2657, 0x2657, 0x107e,
++	0x007e, 0x0078, 0x2670, 0x107e, 0x007e, 0x0078, 0x2670, 0x107e,
++	0x007e, 0x1078, 0x226c, 0x0078, 0x2670, 0x107e, 0x007e, 0x1078,
++	0x226c, 0x0078, 0x2670, 0x107e, 0x007e, 0x1078, 0x2133, 0x0078,
++	0x2670, 0x107e, 0x007e, 0x1078, 0x2133, 0x0078, 0x2670, 0x107e,
++	0x007e, 0x1078, 0x226c, 0x1078, 0x2133, 0x0078, 0x2670, 0x107e,
++	0x007e, 0x1078, 0x226c, 0x1078, 0x2133, 0x0078, 0x2670, 0x107e,
++	0x007e, 0x1078, 0x2178, 0x0078, 0x2670, 0x107e, 0x007e, 0x1078,
++	0x2178, 0x0078, 0x2670, 0x107e, 0x007e, 0x1078, 0x226c, 0x1078,
++	0x2178, 0x0078, 0x2670, 0x107e, 0x007e, 0x1078, 0x226c, 0x1078,
++	0x2178, 0x0078, 0x2670, 0x107e, 0x007e, 0x1078, 0x2133, 0x1078,
++	0x2178, 0x0078, 0x2670, 0x107e, 0x007e, 0x1078, 0x2133, 0x1078,
++	0x2178, 0x0078, 0x2670, 0x107e, 0x007e, 0x1078, 0x226c, 0x1078,
++	0x2133, 0x1078, 0x2178, 0x0078, 0x2670, 0x107e, 0x007e, 0x1078,
++	0x226c, 0x1078, 0x2133, 0x1078, 0x2178, 0x0078, 0x2670, 0x0005,
++	0x0078, 0x2657, 0xb084, 0x003c, 0x8004, 0x8004, 0x0079, 0x2660,
++	0x2670, 0x25ed, 0x25f1, 0x25f7, 0x25fd, 0x2603, 0x2609, 0x2611,
++	0x2619, 0x261f, 0x2625, 0x262d, 0x2635, 0x263d, 0x2645, 0x264f,
++	0x0008, 0x265a, 0x007f, 0x107f, 0x2091, 0x8001, 0x007c, 0x0c7e,
++	0x027e, 0x047e, 0x2021, 0x0000, 0x1078, 0x4967, 0x00c0, 0x2772,
++	0x70cc, 0xd09c, 0x0040, 0x268e, 0xd084, 0x00c0, 0x268e, 0xd0bc,
++	0x00c0, 0x2772, 0x1078, 0x2776, 0x0078, 0x2772, 0xd0cc, 0x00c0,
++	0x2772, 0xd094, 0x0040, 0x2698, 0x7097, 0xffff, 0x0078, 0x2772,
++	0x2001, 0x010c, 0x203c, 0x7284, 0xd284, 0x0040, 0x2701, 0xd28c,
++	0x00c0, 0x2701, 0x037e, 0x7394, 0xa38e, 0xffff, 0x0040, 0x26ab,
++	0x83ff, 0x00c0, 0x26ad, 0x2019, 0x0001, 0x8314, 0xa2e0, 0xacc0,
++	0x2c04, 0xa38c, 0x0001, 0x0040, 0x26ba, 0xa084, 0xff00, 0x8007,
++	0x0078, 0x26bc, 0xa084, 0x00ff, 0xa70e, 0x0040, 0x26f6, 0xa08e,
++	0x0000, 0x0040, 0x26f6, 0xa08e, 0x00ff, 0x00c0, 0x26d3, 0x7230,
++	0xd284, 0x00c0, 0x26fc, 0x7284, 0xc28d, 0x7286, 0x7097, 0xffff,
++	0x037f, 0x0078, 0x2701, 0x2009, 0x0000, 0x1078, 0x254d, 0x1078,
++	0x455c, 0x00c0, 0x26f9, 0x6004, 0xa084, 0x00ff, 0xa086, 0x0006,
++	0x00c0, 0x26f0, 0x7030, 0xd08c, 0x0040, 0x26ea, 0x6000, 0xd0bc,
++	0x0040, 0x26f0, 0x1078, 0x278c, 0x0040, 0x26f9, 0x0078, 0x26f6,
++	0x1078, 0x28c4, 0x1078, 0x27b9, 0x0040, 0x26f9, 0x8318, 0x0078,
++	0x26ad, 0x7396, 0x0078, 0x26fe, 0x7097, 0xffff, 0x037f, 0x0078,
++	0x2772, 0xa780, 0x29c0, 0x203c, 0xa7bc, 0xff00, 0x873f, 0x2041,
++	0x007e, 0x7094, 0xa096, 0xffff, 0x00c0, 0x2713, 0x2009, 0x0000,
++	0x28a8, 0x0078, 0x271f, 0xa812, 0x0048, 0x271b, 0x2008, 0xa802,
++	0x20a8, 0x0078, 0x271f, 0x7097, 0xffff, 0x0078, 0x2772, 0x2700,
++	0x157e, 0x017e, 0xa106, 0x0040, 0x2766, 0xc484, 0x1078, 0x45c4,
++	0x0040, 0x2730, 0x1078, 0x455c, 0x00c0, 0x276f, 0x0078, 0x2731,
++	0xc485, 0x6004, 0xa084, 0x00ff, 0xa086, 0x0006, 0x00c0, 0x2740,
++	0x7030, 0xd08c, 0x0040, 0x275e, 0x6000, 0xd0bc, 0x00c0, 0x275e,
++	0x7284, 0xd28c, 0x0040, 0x2756, 0x6004, 0xa084, 0x00ff, 0xa082,
++	0x0006, 0x0048, 0x2766, 0xd484, 0x00c0, 0x2752, 0x1078, 0x457f,
++	0x0078, 0x2754, 0x1078, 0x298e, 0x0078, 0x2766, 0x1078, 0x28c4,
++	0x1078, 0x27b9, 0x0040, 0x276f, 0x0078, 0x2766, 0x1078, 0x2959,
++	0x0040, 0x2766, 0x1078, 0x278c, 0x0040, 0x276f, 0x017f, 0x8108,
++	0x157f, 0x00f0, 0x271f, 0x7097, 0xffff, 0x0078, 0x2772, 0x017f,
++	0x157f, 0x7196, 0x047f, 0x027f, 0x0c7f, 0x007c, 0x0c7e, 0x017e,
++	0x7097, 0x0001, 0x2009, 0x007e, 0x1078, 0x455c, 0x00c0, 0x2789,
++	0x1078, 0x28c4, 0x1078, 0x27b9, 0x0040, 0x2789, 0x70cc, 0xc0bd,
++	0x70ce, 0x017f, 0x0c7f, 0x007c, 0x017e, 0x077e, 0x0d7e, 0x0c7e,
++	0x2c68, 0x2001, 0xa657, 0x2004, 0xa084, 0x00ff, 0x6842, 0x1078,
++	0x76c7, 0x0040, 0x27b4, 0x2d00, 0x601a, 0x601f, 0x0001, 0x2001,
++	0x0000, 0x1078, 0x44ee, 0x2001, 0x0000, 0x1078, 0x4502, 0x127e,
++	0x2091, 0x8000, 0x7090, 0x8000, 0x7092, 0x127f, 0x2009, 0x0004,
++	0x1078, 0x775c, 0xa085, 0x0001, 0x0c7f, 0x0d7f, 0x077f, 0x017f,
++	0x007c, 0x017e, 0x077e, 0x0d7e, 0x0c7e, 0x2c68, 0x2001, 0xa657,
++	0x2004, 0xa084, 0x00ff, 0x6842, 0x1078, 0x9187, 0x0040, 0x27f2,
++	0x2d00, 0x601a, 0x6800, 0xc0c4, 0x6802, 0x68a0, 0xa086, 0x007e,
++	0x0040, 0x27db, 0x6804, 0xa084, 0x00ff, 0xa086, 0x0006, 0x00c0,
++	0x27db, 0x1078, 0x2880, 0x601f, 0x0001, 0x2001, 0x0000, 0x1078,
++	0x44ee, 0x2001, 0x0002, 0x1078, 0x4502, 0x127e, 0x2091, 0x8000,
++	0x7090, 0x8000, 0x7092, 0x127f, 0x2009, 0x0002, 0x1078, 0x775c,
++	0xa085, 0x0001, 0x0c7f, 0x0d7f, 0x077f, 0x017f, 0x007c, 0x0c7e,
++	0x027e, 0x2009, 0x0080, 0x1078, 0x455c, 0x00c0, 0x2805, 0x1078,
++	0x2808, 0x0040, 0x2805, 0x70d3, 0xffff, 0x027f, 0x0c7f, 0x007c,
++	0x017e, 0x077e, 0x0d7e, 0x0c7e, 0x2c68, 0x1078, 0x76c7, 0x0040,
++	0x282a, 0x2d00, 0x601a, 0x601f, 0x0001, 0x2001, 0x0000, 0x1078,
++	0x44ee, 0x2001, 0x0002, 0x1078, 0x4502, 0x127e, 0x2091, 0x8000,
++	0x70d4, 0x8000, 0x70d6, 0x127f, 0x2009, 0x0002, 0x1078, 0x775c,
++	0xa085, 0x0001, 0x0c7f, 0x0d7f, 0x077f, 0x017f, 0x007c, 0x0c7e,
++	0x0d7e, 0x127e, 0x2091, 0x8000, 0x2009, 0x007f, 0x1078, 0x455c,
++	0x00c0, 0x284b, 0x2c68, 0x1078, 0x76c7, 0x0040, 0x284b, 0x2d00,
++	0x601a, 0x6312, 0x601f, 0x0001, 0x620a, 0x2009, 0x0022, 0x1078,
++	0x775c, 0xa085, 0x0001, 0x127f, 0x0d7f, 0x0c7f, 0x007c, 0x0e7e,
++	0x0c7e, 0x067e, 0x037e, 0x027e, 0x1078, 0x5f0e, 0x1078, 0x5eae,
++	0x1078, 0x8068, 0x2130, 0x81ff, 0x0040, 0x2864, 0x20a9, 0x007e,
++	0x2009, 0x0000, 0x0078, 0x2868, 0x20a9, 0x007f, 0x2009, 0x0000,
++	0x017e, 0x1078, 0x45c4, 0x00c0, 0x2871, 0x1078, 0x47e9, 0x1078,
++	0x42f8, 0x017f, 0x8108, 0x00f0, 0x2868, 0x86ff, 0x00c0, 0x287a,
++	0x1078, 0x119b, 0x027f, 0x037f, 0x067f, 0x0c7f, 0x0e7f, 0x007c,
++	0x0e7e, 0x0c7e, 0x037e, 0x027e, 0x017e, 0x6218, 0x2270, 0x72a0,
++	0x027e, 0x2019, 0x0029, 0x1078, 0x5f01, 0x077e, 0x2039, 0x0000,
++	0x1078, 0x5e0a, 0x2c08, 0x1078, 0x9f8b, 0x077f, 0x017f, 0x2e60,
++	0x1078, 0x47e9, 0x6210, 0x6314, 0x1078, 0x42f8, 0x6212, 0x6316,
++	0x017f, 0x027f, 0x037f, 0x0c7f, 0x0e7f, 0x007c, 0x0e7e, 0x007e,
++	0x6018, 0xa080, 0x0028, 0x2004, 0xd0bc, 0x00c0, 0x28ba, 0x2071,
++	0xa600, 0x7090, 0xa005, 0x0040, 0x28b7, 0x8001, 0x7092, 0x007f,
++	0x0e7f, 0x007c, 0x2071, 0xa600, 0x70d4, 0xa005, 0x0040, 0x28b7,
++	0x8001, 0x70d6, 0x0078, 0x28b7, 0x6000, 0xc08c, 0x6002, 0x007c,
++	0x0f7e, 0x0e7e, 0x0c7e, 0x037e, 0x027e, 0x017e, 0x157e, 0x2178,
++	0x81ff, 0x00c0, 0x28d7, 0x20a9, 0x0001, 0x0078, 0x28f2, 0x2001,
++	0xa653, 0x2004, 0xd0c4, 0x0040, 0x28ee, 0xd0a4, 0x0040, 0x28ee,
++	0x047e, 0x6018, 0xa080, 0x0028, 0x2024, 0xa4a4, 0x00ff, 0x8427,
++	0xa006, 0x2009, 0x002d, 0x1078, 0xa21d, 0x047f, 0x20a9, 0x00ff,
++	0x2011, 0x0000, 0x027e, 0xa28e, 0x007e, 0x0040, 0x2936, 0xa28e,
++	0x007f, 0x0040, 0x2936, 0xa28e, 0x0080, 0x0040, 0x2936, 0xa288,
++	0xa735, 0x210c, 0x81ff, 0x0040, 0x2936, 0x8fff, 0x1040, 0x2942,
++	0x0c7e, 0x2160, 0x2001, 0x0001, 0x1078, 0x4972, 0x0c7f, 0x2019,
++	0x0029, 0x1078, 0x5f01, 0x077e, 0x2039, 0x0000, 0x1078, 0x5e0a,
++	0x0c7e, 0x027e, 0x2160, 0x6204, 0xa294, 0x00ff, 0xa286, 0x0006,
++	0x00c0, 0x2926, 0x6007, 0x0404, 0x0078, 0x292b, 0x2001, 0x0004,
++	0x8007, 0xa215, 0x6206, 0x027f, 0x0c7f, 0x017e, 0x2c08, 0x1078,
++	0x9f8b, 0x017f, 0x077f, 0x2160, 0x1078, 0x47e9, 0x027f, 0x8210,
++	0x00f0, 0x28f2, 0x157f, 0x017f, 0x027f, 0x037f, 0x0c7f, 0x0e7f,
++	0x0f7f, 0x007c, 0x047e, 0x027e, 0x017e, 0x2001, 0xa653, 0x2004,
++	0xd0c4, 0x0040, 0x2955, 0xd0a4, 0x0040, 0x2955, 0xa006, 0x2220,
++	0x8427, 0x2009, 0x0029, 0x1078, 0xa21d, 0x017f, 0x027f, 0x047f,
++	0x007c, 0x017e, 0x027e, 0x037e, 0x0c7e, 0x7284, 0x82ff, 0x0040,
++	0x2987, 0xa290, 0xa653, 0x2214, 0xd2ac, 0x00c0, 0x2987, 0x2100,
++	0x1078, 0x2564, 0x81ff, 0x0040, 0x2989, 0x2019, 0x0001, 0x8314,
++	0xa2e0, 0xacc0, 0x2c04, 0xd384, 0x0040, 0x297b, 0xa084, 0xff00,
++	0x8007, 0x0078, 0x297d, 0xa084, 0x00ff, 0xa116, 0x0040, 0x2989,
++	0xa096, 0x00ff, 0x0040, 0x2987, 0x8318, 0x0078, 0x296f, 0xa085,
++	0x0001, 0x0c7f, 0x037f, 0x027f, 0x017f, 0x007c, 0x017e, 0x0c7e,
++	0x127e, 0x2091, 0x8000, 0x017e, 0x027e, 0x037e, 0x2110, 0x027e,
++	0x2019, 0x0029, 0x1078, 0x73d0, 0x027f, 0x1078, 0xa4f1, 0x037f,
++	0x027f, 0x017f, 0xa180, 0xa735, 0x2004, 0xa065, 0x0040, 0x29b7,
++	0x017e, 0x0c7e, 0x1078, 0x9187, 0x017f, 0x1040, 0x1332, 0x611a,
++	0x1078, 0x2880, 0x1078, 0x772d, 0x017f, 0x1078, 0x457f, 0x127f,
++	0x0c7f, 0x017f, 0x007c, 0x2001, 0xa633, 0x2004, 0xd0cc, 0x007c,
++	0x7eef, 0x7de8, 0x7ce4, 0x80e2, 0x7be1, 0x80e0, 0x80dc, 0x80da,
++	0x7ad9, 0x80d6, 0x80d5, 0x80d4, 0x80d3, 0x80d2, 0x80d1, 0x79ce,
++	0x78cd, 0x80cc, 0x80cb, 0x80ca, 0x80c9, 0x80c7, 0x80c6, 0x77c5,
++	0x76c3, 0x80bc, 0x80ba, 0x75b9, 0x80b6, 0x74b5, 0x73b4, 0x72b3,
++	0x80b2, 0x80b1, 0x80ae, 0x71ad, 0x80ac, 0x70ab, 0x6faa, 0x6ea9,
++	0x80a7, 0x6da6, 0x6ca5, 0x6ba3, 0x6a9f, 0x699e, 0x689d, 0x809b,
++	0x8098, 0x6797, 0x6690, 0x658f, 0x6488, 0x6384, 0x6282, 0x8081,
++	0x8080, 0x617c, 0x607a, 0x8079, 0x5f76, 0x8075, 0x8074, 0x8073,
++	0x8072, 0x8071, 0x806e, 0x5e6d, 0x806c, 0x5d6b, 0x5c6a, 0x5b69,
++	0x8067, 0x5a66, 0x5965, 0x5863, 0x575c, 0x565a, 0x5559, 0x8056,
++	0x8055, 0x5454, 0x5353, 0x5252, 0x5151, 0x504e, 0x4f4d, 0x804c,
++	0x804b, 0x4e4a, 0x4d49, 0x8047, 0x4c46, 0x8045, 0x8043, 0x803c,
++	0x803a, 0x8039, 0x8036, 0x4b35, 0x8034, 0x4a33, 0x4932, 0x4831,
++	0x802e, 0x472d, 0x462c, 0x452b, 0x442a, 0x4329, 0x4227, 0x8026,
++	0x8025, 0x4123, 0x401f, 0x3f1e, 0x3e1d, 0x3d1b, 0x3c18, 0x8017,
++	0x8010, 0x3b0f, 0x3a08, 0x8004, 0x3902, 0x8001, 0x8000, 0x8000,
++	0x3800, 0x3700, 0x3600, 0x8000, 0x3500, 0x8000, 0x8000, 0x8000,
++	0x3400, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x3300,
++	0x3200, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x3100,
++	0x3000, 0x8000, 0x8000, 0x2f00, 0x8000, 0x2e00, 0x2d00, 0x2c00,
++	0x8000, 0x8000, 0x8000, 0x2b00, 0x8000, 0x2a00, 0x2900, 0x2800,
++	0x8000, 0x2700, 0x2600, 0x2500, 0x2400, 0x2300, 0x2200, 0x8000,
++	0x8000, 0x2100, 0x2000, 0x1f00, 0x1e00, 0x1d00, 0x1c00, 0x8000,
++	0x8000, 0x1b00, 0x1a00, 0x8000, 0x1900, 0x8000, 0x8000, 0x8000,
++	0x8000, 0x8000, 0x8000, 0x1800, 0x8000, 0x1700, 0x1600, 0x1500,
++	0x8000, 0x1400, 0x1300, 0x1200, 0x1100, 0x1000, 0x0f00, 0x8000,
++	0x8000, 0x0e00, 0x0d00, 0x0c00, 0x0b00, 0x0a00, 0x0900, 0x8000,
++	0x8000, 0x0800, 0x0700, 0x8000, 0x0600, 0x8000, 0x8000, 0x8000,
++	0x0500, 0x0400, 0x0300, 0x8000, 0x0200, 0x8000, 0x8000, 0x8000,
++	0x0100, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x0000,
++	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000,
++	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000,
++	0x2071, 0xa682, 0x7003, 0x0002, 0xa006, 0x7012, 0x7016, 0x703a,
++	0x703e, 0x7033, 0xa692, 0x7037, 0xa692, 0x7007, 0x0001, 0x2061,
++	0xa6d2, 0x6003, 0x0002, 0x007c, 0x0090, 0x2ae7, 0x0068, 0x2ae7,
++	0x2071, 0xa682, 0x2b78, 0x7818, 0xd084, 0x00c0, 0x2ae7, 0x2a60,
++	0x7820, 0xa08e, 0x0069, 0x00c0, 0x2bd7, 0x0079, 0x2b6b, 0x007c,
++	0x2071, 0xa682, 0x7004, 0x0079, 0x2aed, 0x2af1, 0x2af2, 0x2afc,
++	0x2b0e, 0x007c, 0x0090, 0x2afb, 0x0068, 0x2afb, 0x2b78, 0x7818,
++	0xd084, 0x0040, 0x2b1a, 0x007c, 0x2b78, 0x2061, 0xa6d2, 0x6008,
++	0xa08e, 0x0100, 0x0040, 0x2b09, 0xa086, 0x0200, 0x0040, 0x2bcf,
++	0x007c, 0x7014, 0x2068, 0x2a60, 0x7018, 0x007a, 0x7010, 0x2068,
++	0x6834, 0xa086, 0x0103, 0x0040, 0x2b16, 0x007c, 0x2a60, 0x2b78,
++	0x7018, 0x007a, 0x2a60, 0x7820, 0xa08a, 0x0040, 0x00c8, 0x2b23,
++	0x61bc, 0x0079, 0x2b2b, 0x2100, 0xa08a, 0x003f, 0x00c8, 0x2bcb,
++	0x61bc, 0x0079, 0x2b6b, 0x2bad, 0x2bdf, 0x2be7, 0x2beb, 0x2bf3,
++	0x2bf9, 0x2bfd, 0x2c09, 0x2c0d, 0x2c17, 0x2c1b, 0x2bcb, 0x2bcb,
++	0x2bcb, 0x2c1f, 0x2bcb, 0x2c2f, 0x2c46, 0x2c5d, 0x2cdd, 0x2ce2,
++	0x2d0f, 0x2d69, 0x2d7a, 0x2d98, 0x2dd9, 0x2de3, 0x2df0, 0x2e03,
++	0x2e22, 0x2e2b, 0x2e68, 0x2e6e, 0x2bcb, 0x2e8a, 0x2bcb, 0x2bcb,
++	0x2bcb, 0x2bcb, 0x2bcb, 0x2e91, 0x2e9b, 0x2bcb, 0x2bcb, 0x2bcb,
++	0x2bcb, 0x2bcb, 0x2bcb, 0x2bcb, 0x2bcb, 0x2ea3, 0x2bcb, 0x2bcb,
++	0x2bcb, 0x2bcb, 0x2bcb, 0x2eb5, 0x2ece, 0x2bcb, 0x2bcb, 0x2bcb,
++	0x2bcb, 0x2bcb, 0x2bcb, 0x2ee0, 0x2f37, 0x2f95, 0x2fa9, 0x2bcb,
++	0x2bcb, 0x2bcb, 0x398e, 0x2bcb, 0x2bcb, 0x2bcb, 0x2bcb, 0x2bcb,
++	0x2bcb, 0x2bcb, 0x2bcb, 0x2c17, 0x2c1b, 0x2fc0, 0x2bcb, 0x2fcd,
++	0x3a26, 0x3a83, 0x2bcb, 0x2bcb, 0x2bcb, 0x2bcb, 0x2bcb, 0x2bcb,
++	0x2bcb, 0x2bcb, 0x2bcb, 0x301a, 0x314f, 0x316b, 0x3177, 0x31da,
++	0x3233, 0x323e, 0x327d, 0x328c, 0x329b, 0x329e, 0x2fd1, 0x32c2,
++	0x331e, 0x332b, 0x343c, 0x356f, 0x3599, 0x36a6, 0x2bcb, 0x36b6,
++	0x36f0, 0x37bf, 0x2bcb, 0x2bcb, 0x2bcb, 0x2bcb, 0x3827, 0x3843,
++	0x38bd, 0x3977, 0x713c, 0x0078, 0x2bad, 0x2021, 0x4000, 0x1078,
++	0x35f5, 0x127e, 0x2091, 0x8000, 0x0068, 0x2bba, 0x7818, 0xd084,
++	0x0040, 0x2bbd, 0x127f, 0x0078, 0x2bb1, 0x7c22, 0x7926, 0x7a2a,
++	0x7b2e, 0x781b, 0x0001, 0x2091, 0x4080, 0x7007, 0x0001, 0x2091,
++	0x5000, 0x127f, 0x007c, 0x2021, 0x4001, 0x0078, 0x2baf, 0x2021,
++	0x4002, 0x0078, 0x2baf, 0x2021, 0x4003, 0x0078, 0x2baf, 0x2021,
++	0x4005, 0x0078, 0x2baf, 0x2021, 0x4006, 0x0078, 0x2baf, 0xa02e,
++	0x2520, 0x7b28, 0x7a2c, 0x7824, 0x7930, 0x0078, 0x3604, 0x7823,
++	0x0004, 0x7824, 0x007a, 0xa02e, 0x2520, 0x7b28, 0x7a2c, 0x7824,
++	0x7930, 0x0078, 0x3608, 0x7924, 0x7828, 0x2114, 0x200a, 0x0078,
++	0x2bad, 0x7924, 0x2114, 0x0078, 0x2bad, 0x2099, 0x0009, 0x20a1,
++	0x0009, 0x20a9, 0x0007, 0x53a3, 0x7924, 0x7a28, 0x7b2c, 0x0078,
++	0x2bad, 0x7824, 0x2060, 0x0078, 0x2c21, 0x2009, 0x0001, 0x2011,
++	0x0013, 0x2019, 0x0018, 0x783b, 0x0017, 0x0078, 0x2bad, 0x7d38,
++	0x7c3c, 0x0078, 0x2be1, 0x7d38, 0x7c3c, 0x0078, 0x2bed, 0x2061,
++	0x1000, 0x610c, 0xa006, 0x2c14, 0xa200, 0x8c60, 0x8109, 0x00c0,
++	0x2c23, 0x2010, 0xa005, 0x0040, 0x2bad, 0x0078, 0x2bd3, 0x2069,
++	0xa652, 0x7824, 0x7930, 0xa11a, 0x00c8, 0x2bdb, 0x8019, 0x0040,
++	0x2bdb, 0x684a, 0x6942, 0x782c, 0x6852, 0x7828, 0x6856, 0xa006,
++	0x685a, 0x685e, 0x1078, 0x4eae, 0x0078, 0x2bad, 0x2069, 0xa652,
++	0x7824, 0x7934, 0xa11a, 0x00c8, 0x2bdb, 0x8019, 0x0040, 0x2bdb,
++	0x684e, 0x6946, 0x782c, 0x6862, 0x7828, 0x6866, 0xa006, 0x686a,
++	0x686e, 0x1078, 0x4a3e, 0x0078, 0x2bad, 0xa02e, 0x2520, 0x81ff,
++	0x00c0, 0x2bd7, 0x7924, 0x7b28, 0x7a2c, 0x20a9, 0x0005, 0x20a1,
++	0xa689, 0x41a1, 0x1078, 0x35ba, 0x0040, 0x2bd7, 0x2009, 0x0020,
++	0x1078, 0x3604, 0x701b, 0x2c75, 0x007c, 0x6834, 0x2008, 0xa084,
++	0x00ff, 0xa096, 0x0011, 0x0040, 0x2c85, 0xa096, 0x0019, 0x0040,
++	0x2c85, 0xa096, 0x0015, 0x00c0, 0x2bd7, 0x810f, 0xa18c, 0x00ff,
++	0x0040, 0x2bd7, 0x710e, 0x700c, 0x8001, 0x0040, 0x2cb6, 0x700e,
++	0x1078, 0x35ba, 0x0040, 0x2bd7, 0x2009, 0x0020, 0x2061, 0xa6d2,
++	0x6224, 0x6328, 0x642c, 0x6530, 0xa290, 0x0040, 0xa399, 0x0000,
++	0xa4a1, 0x0000, 0xa5a9, 0x0000, 0x1078, 0x3604, 0x701b, 0x2ca9,
++	0x007c, 0x6834, 0xa084, 0x00ff, 0xa096, 0x0002, 0x0040, 0x2cb4,
++	0xa096, 0x000a, 0x00c0, 0x2bd7, 0x0078, 0x2c8b, 0x7010, 0x2068,
++	0x6838, 0xc0fd, 0x683a, 0x1078, 0x4431, 0x00c0, 0x2cc4, 0x7007,
++	0x0003, 0x701b, 0x2cc6, 0x007c, 0x1078, 0x4b51, 0x127e, 0x2091,
++	0x8000, 0x20a9, 0x0005, 0x2099, 0xa689, 0x530a, 0x2100, 0xa210,
++	0xa399, 0x0000, 0xa4a1, 0x0000, 0xa5a9, 0x0000, 0xad80, 0x000d,
++	0x2009, 0x0020, 0x127f, 0x0078, 0x3608, 0x61a4, 0x7824, 0x60a6,
++	0x0078, 0x2bad, 0x2091, 0x8000, 0x7823, 0x4000, 0x7827, 0x4953,
++	0x782b, 0x5020, 0x782f, 0x2020, 0x2009, 0x017f, 0x2104, 0x7832,
++	0x3f00, 0x7836, 0x2061, 0x0100, 0x6200, 0x2061, 0x0200, 0x603c,
++	0x8007, 0xa205, 0x783a, 0x2009, 0x04fd, 0x2104, 0x783e, 0x781b,
++	0x0001, 0x2091, 0x5000, 0x2091, 0x4080, 0x2071, 0x0010, 0x20c1,
++	0x00f0, 0xa08a, 0x0003, 0x00c8, 0x0427, 0x0078, 0x0423, 0x81ff,
++	0x00c0, 0x2bd7, 0x7924, 0x810f, 0xa18c, 0x00ff, 0x1078, 0x45c4,
++	0x00c0, 0x2bdb, 0x7e38, 0xa684, 0x3fff, 0xa082, 0x4000, 0x0048,
++	0x2d23, 0x0078, 0x2bdb, 0x7c28, 0x7d2c, 0x1078, 0x47a4, 0xd28c,
++	0x00c0, 0x2d2e, 0x1078, 0x4736, 0x0078, 0x2d30, 0x1078, 0x4772,
++	0x00c0, 0x2d5a, 0x2061, 0xad00, 0x127e, 0x2091, 0x8000, 0x6000,
++	0xa086, 0x0000, 0x0040, 0x2d48, 0x6010, 0xa06d, 0x0040, 0x2d48,
++	0x683c, 0xa406, 0x00c0, 0x2d48, 0x6840, 0xa506, 0x0040, 0x2d53,
++	0x127f, 0xace0, 0x0010, 0x2001, 0xa616, 0x2004, 0xac02, 0x00c8,
++	0x2bd7, 0x0078, 0x2d34, 0x1078, 0x8a01, 0x127f, 0x0040, 0x2bd7,
++	0x0078, 0x2bad, 0xa00e, 0x2001, 0x0005, 0x1078, 0x4b51, 0x127e,
++	0x2091, 0x8000, 0x1078, 0x8f85, 0x1078, 0x4a73, 0x127f, 0x0078,
++	0x2bad, 0x81ff, 0x00c0, 0x2bd7, 0x1078, 0x35d2, 0x0040, 0x2bdb,
++	0x1078, 0x4673, 0x0040, 0x2bd7, 0x1078, 0x47b2, 0x0040, 0x2bd7,
++	0x0078, 0x2bad, 0x81ff, 0x00c0, 0x2bd7, 0x1078, 0x35e4, 0x0040,
++	0x2bdb, 0x1078, 0x482f, 0x0040, 0x2bd7, 0x2019, 0x0005, 0x1078,
++	0x47d3, 0x0040, 0x2bd7, 0x7828, 0xa08a, 0x1000, 0x00c8, 0x2bdb,
++	0x8003, 0x800b, 0x810b, 0xa108, 0x1078, 0x5a52, 0x0078, 0x2bad,
++	0x127e, 0x2091, 0x8000, 0x81ff, 0x0040, 0x2da2, 0x2009, 0x0001,
++	0x0078, 0x2dd3, 0x2029, 0x00ff, 0x6450, 0x2400, 0xa506, 0x0040,
++	0x2dcd, 0x2508, 0x1078, 0x45c4, 0x00c0, 0x2dcd, 0x1078, 0x482f,
++	0x00c0, 0x2db8, 0x2009, 0x0002, 0x62ac, 0x2518, 0x0078, 0x2dd3,
++	0x2019, 0x0004, 0x1078, 0x47d3, 0x00c0, 0x2dc2, 0x2009, 0x0006,
++	0x0078, 0x2dd3, 0x7824, 0xa08a, 0x1000, 0x00c8, 0x2dd6, 0x8003,
++	0x800b, 0x810b, 0xa108, 0x1078, 0x5a52, 0x8529, 0x00c8, 0x2da5,
++	0x127f, 0x0078, 0x2bad, 0x127f, 0x0078, 0x2bd7, 0x127f, 0x0078,
++	0x2bdb, 0x1078, 0x35d2, 0x0040, 0x2bdb, 0x1078, 0x46e7, 0x1078,
++	0x47a4, 0x0078, 0x2bad, 0x81ff, 0x00c0, 0x2bd7, 0x1078, 0x35d2,
++	0x0040, 0x2bdb, 0x1078, 0x46d6, 0x1078, 0x47a4, 0x0078, 0x2bad,
++	0x81ff, 0x00c0, 0x2bd7, 0x1078, 0x35d2, 0x0040, 0x2bdb, 0x1078,
++	0x4775, 0x0040, 0x2bd7, 0x1078, 0x4484, 0x1078, 0x472f, 0x1078,
++	0x47a4, 0x0078, 0x2bad, 0x1078, 0x35d2, 0x0040, 0x2bdb, 0x1078,
++	0x4673, 0x0040, 0x2bd7, 0x62a0, 0x2019, 0x0005, 0x0c7e, 0x1078,
++	0x47e9, 0x0c7f, 0x1078, 0x5f01, 0x077e, 0x2039, 0x0000, 0x1078,
++	0x5e0a, 0x2009, 0x0000, 0x1078, 0x9f8b, 0x077f, 0x1078, 0x47a4,
++	0x0078, 0x2bad, 0x1078, 0x35d2, 0x0040, 0x2bdb, 0x1078, 0x47a4,
++	0x2208, 0x0078, 0x2bad, 0x157e, 0x0d7e, 0x0e7e, 0x2069, 0xa714,
++	0x6810, 0x6914, 0xa10a, 0x00c8, 0x2e37, 0x2009, 0x0000, 0x6816,
++	0x2011, 0x0000, 0x2019, 0x0000, 0x20a9, 0x00ff, 0x2069, 0xa735,
++	0x2d04, 0xa075, 0x0040, 0x2e4c, 0x704c, 0x1078, 0x2e56, 0xa210,
++	0x7080, 0x1078, 0x2e56, 0xa318, 0x8d68, 0x00f0, 0x2e40, 0x2300,
++	0xa218, 0x0e7f, 0x0d7f, 0x157f, 0x0078, 0x2bad, 0x0f7e, 0x017e,
++	0xa07d, 0x0040, 0x2e65, 0x2001, 0x0000, 0x8000, 0x2f0c, 0x81ff,
++	0x0040, 0x2e65, 0x2178, 0x0078, 0x2e5d, 0x017f, 0x0f7f, 0x007c,
++	0x2069, 0xa714, 0x6910, 0x62a8, 0x0078, 0x2bad, 0x81ff, 0x00c0,
++	0x2bd7, 0x6150, 0xa190, 0x29c0, 0x2214, 0xa294, 0x00ff, 0x6070,
++	0xa084, 0xff00, 0xa215, 0x636c, 0x67cc, 0xd79c, 0x0040, 0x2e84,
++	0x2031, 0x0001, 0x0078, 0x2e86, 0x2031, 0x0000, 0x7e3a, 0x7f3e,
++	0x0078, 0x2bad, 0x6140, 0x6244, 0x2019, 0xa8a2, 0x231c, 0x0078,
++	0x2bad, 0x127e, 0x2091, 0x8000, 0x6134, 0x6338, 0xa006, 0x2010,
++	0x127f, 0x0078, 0x2bad, 0x1078, 0x35e4, 0x0040, 0x2bdb, 0x6244,
++	0x6338, 0x0078, 0x2bad, 0x6140, 0x6244, 0x7824, 0x6042, 0x7b28,
++	0x6346, 0x2069, 0xa652, 0x831f, 0xa305, 0x6816, 0x782c, 0x2069,
++	0xa8a2, 0x2d1c, 0x206a, 0x0078, 0x2bad, 0x017e, 0x127e, 0x2091,
++	0x8000, 0x7824, 0x6036, 0xd094, 0x0040, 0x2ec8, 0x7828, 0xa085,
++	0x0001, 0x2009, 0xa8ab, 0x200a, 0x2001, 0xffff, 0x1078, 0x5ae6,
++	0x782c, 0x603a, 0x127f, 0x017f, 0x0078, 0x2bad, 0x1078, 0x35e4,
++	0x0040, 0x2bdb, 0x7828, 0xa00d, 0x0040, 0x2bdb, 0x782c, 0xa005,
++	0x0040, 0x2bdb, 0x6244, 0x6146, 0x6338, 0x603a, 0x0078, 0x2bad,
++	0x2001, 0xa600, 0x2004, 0xa086, 0x0003, 0x00c0, 0x2bd7, 0x0c7e,
++	0x2061, 0x0100, 0x7924, 0x810f, 0xa18c, 0x00ff, 0xa196, 0x00ff,
++	0x00c0, 0x2ef7, 0x6030, 0xa085, 0xff00, 0x0078, 0x2f06, 0xa182,
++	0x007f, 0x00c8, 0x2f30, 0xa188, 0x29c0, 0x210c, 0xa18c, 0x00ff,
++	0x6030, 0xa116, 0x0040, 0x2f30, 0x810f, 0xa105, 0x127e, 0x2091,
++	0x8000, 0x007e, 0x1078, 0x76c7, 0x007f, 0x0040, 0x2f2c, 0x601a,
++	0x600b, 0xbc09, 0x601f, 0x0001, 0x1078, 0x35ba, 0x0040, 0x2f33,
++	0x6837, 0x0000, 0x7007, 0x0003, 0x6833, 0x0000, 0x6838, 0xc0fd,
++	0x683a, 0x701b, 0x2f8e, 0x2d00, 0x6012, 0x2009, 0x0032, 0x1078,
++	0x775c, 0x127f, 0x0c7f, 0x007c, 0x127f, 0x0c7f, 0x0078, 0x2bd7,
++	0x0c7f, 0x0078, 0x2bdb, 0x1078, 0x772d, 0x0078, 0x2f2c, 0x2001,
++	0xa600, 0x2004, 0xa086, 0x0003, 0x00c0, 0x2bd7, 0x0c7e, 0x2061,
++	0x0100, 0x7924, 0x810f, 0xa18c, 0x00ff, 0xa196, 0x00ff, 0x00c0,
++	0x2f4e, 0x6030, 0xa085, 0xff00, 0x0078, 0x2f5d, 0xa182, 0x007f,
++	0x00c8, 0x2f87, 0xa188, 0x29c0, 0x210c, 0xa18c, 0x00ff, 0x6030,
++	0xa116, 0x0040, 0x2f87, 0x810f, 0xa105, 0x127e, 0x2091, 0x8000,
++	0x007e, 0x1078, 0x76c7, 0x007f, 0x0040, 0x2f83, 0x601a, 0x600b,
++	0xbc05, 0x601f, 0x0001, 0x1078, 0x35ba, 0x0040, 0x2f8a, 0x6837,
++	0x0000, 0x7007, 0x0003, 0x6833, 0x0000, 0x6838, 0xc0fd, 0x683a,
++	0x701b, 0x2f8e, 0x2d00, 0x6012, 0x2009, 0x0032, 0x1078, 0x775c,
++	0x127f, 0x0c7f, 0x007c, 0x127f, 0x0c7f, 0x0078, 0x2bd7, 0x0c7f,
++	0x0078, 0x2bdb, 0x1078, 0x772d, 0x0078, 0x2f83, 0x6830, 0xa086,
++	0x0100, 0x0040, 0x2bd7, 0x0078, 0x2bad, 0x2061, 0xa933, 0x127e,
++	0x2091, 0x8000, 0x6000, 0xd084, 0x0040, 0x2fa6, 0x6104, 0x6208,
++	0x2019, 0xa612, 0x231c, 0x127f, 0x0078, 0x2bad, 0x127f, 0x0078,
++	0x2bdb, 0x81ff, 0x00c0, 0x2bd7, 0x127e, 0x2091, 0x8000, 0x6248,
++	0x6064, 0xa202, 0x0048, 0x2fbd, 0xa085, 0x0001, 0x1078, 0x256a,
++	0x1078, 0x3c9e, 0x127f, 0x0078, 0x2bad, 0x127f, 0x0078, 0x2bdb,
++	0x127e, 0x2091, 0x8000, 0x20a9, 0x0012, 0x2001, 0xa640, 0x20a0,
++	0xa006, 0x40a4, 0x127f, 0x0078, 0x2bad, 0x7d38, 0x7c3c, 0x0078,
++	0x2c5f, 0x7824, 0xa09c, 0x00ff, 0xa39a, 0x0003, 0x00c8, 0x2bd7,
++	0x6250, 0xa084, 0xff00, 0x8007, 0xa206, 0x00c0, 0x2fe9, 0x2001,
++	0xa640, 0x2009, 0x000c, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x0078,
++	0x3608, 0x81ff, 0x00c0, 0x2bd7, 0x1078, 0x35e4, 0x0040, 0x2bdb,
++	0x6004, 0xa084, 0x00ff, 0xa086, 0x0006, 0x00c0, 0x2bd7, 0x0c7e,
++	0x1078, 0x35ba, 0x0c7f, 0x0040, 0x2bd7, 0x6837, 0x0000, 0x6838,
++	0xc0fd, 0x683a, 0x1078, 0x8e4a, 0x0040, 0x2bd7, 0x7007, 0x0003,
++	0x701b, 0x300b, 0x007c, 0x6830, 0xa086, 0x0100, 0x0040, 0x2bd7,
++	0xad80, 0x000e, 0x2009, 0x000c, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38,
++	0x0078, 0x3608, 0x1078, 0x35ba, 0x0040, 0x2bd7, 0x1078, 0x42dd,
++	0x2009, 0x001c, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x1078, 0x3604,
++	0x701b, 0x302b, 0x007c, 0xade8, 0x000d, 0x6800, 0xa005, 0x0040,
++	0x2bdb, 0x6804, 0xd0ac, 0x0040, 0x3038, 0xd0a4, 0x0040, 0x2bdb,
++	0xd094, 0x0040, 0x3043, 0x0c7e, 0x2061, 0x0100, 0x6104, 0xa18c,
++	0xffdf, 0x6106, 0x0c7f, 0xd08c, 0x0040, 0x304e, 0x0c7e, 0x2061,
++	0x0100, 0x6104, 0xa18d, 0x0010, 0x6106, 0x0c7f, 0x2009, 0x0100,
++	0x210c, 0xa18a, 0x0002, 0x0048, 0x3063, 0xd084, 0x0040, 0x3063,
++	0x6a28, 0xa28a, 0x007f, 0x00c8, 0x2bdb, 0xa288, 0x29c0, 0x210c,
++	0xa18c, 0x00ff, 0x6156, 0xd0dc, 0x0040, 0x306c, 0x6828, 0xa08a,
++	0x007f, 0x00c8, 0x2bdb, 0x6052, 0x6808, 0xa08a, 0x0100, 0x0048,
++	0x2bdb, 0xa08a, 0x0841, 0x00c8, 0x2bdb, 0xa084, 0x0007, 0x00c0,
++	0x2bdb, 0x680c, 0xa005, 0x0040, 0x2bdb, 0x6810, 0xa005, 0x0040,
++	0x2bdb, 0x6848, 0x6940, 0xa10a, 0x00c8, 0x2bdb, 0x8001, 0x0040,
++	0x2bdb, 0x684c, 0x6944, 0xa10a, 0x00c8, 0x2bdb, 0x8001, 0x0040,
++	0x2bdb, 0x6804, 0xd0fc, 0x0040, 0x30c2, 0x1078, 0x35ba, 0x0040,
++	0x2bd7, 0x2009, 0x0014, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0xa290,
++	0x0038, 0xa399, 0x0000, 0x1078, 0x3604, 0x701b, 0x30a8, 0x007c,
++	0xade8, 0x000d, 0x20a9, 0x0014, 0x2d98, 0x2069, 0xa66e, 0x2da0,
++	0x53a3, 0x7010, 0xa0e8, 0x000d, 0x2001, 0xa672, 0x200c, 0xd1e4,
++	0x0040, 0x30c2, 0x0c7e, 0x2061, 0x0100, 0x6004, 0xa085, 0x0b00,
++	0x6006, 0x0c7f, 0x20a9, 0x001c, 0x2d98, 0x2069, 0xa652, 0x2da0,
++	0x53a3, 0x6814, 0xa08c, 0x00ff, 0x6142, 0x8007, 0xa084, 0x00ff,
++	0x6046, 0x1078, 0x4eae, 0x1078, 0x49ce, 0x1078, 0x4a3e, 0x6000,
++	0xa086, 0x0000, 0x00c0, 0x314d, 0x6808, 0x602a, 0x1078, 0x21f7,
++	0x6818, 0x691c, 0x6a20, 0x6b24, 0x8007, 0x810f, 0x8217, 0x831f,
++	0x6016, 0x611a, 0x621e, 0x6322, 0x6c04, 0xd4f4, 0x0040, 0x30fa,
++	0x6830, 0x6934, 0x6a38, 0x6b3c, 0x8007, 0x810f, 0x8217, 0x831f,
++	0x0078, 0x30fc, 0xa084, 0xf0ff, 0x6006, 0x610a, 0x620e, 0x6312,
++	0x1078, 0x5b19, 0x6904, 0xd1fc, 0x0040, 0x312f, 0x0c7e, 0x2009,
++	0x0000, 0x20a9, 0x0001, 0x6b70, 0xd384, 0x0040, 0x312c, 0x0078,
++	0x3116, 0x839d, 0x00c8, 0x312c, 0x3508, 0x8109, 0x1078, 0x5480,
++	0x6878, 0x6016, 0x6874, 0x2008, 0xa084, 0xff00, 0x8007, 0x600a,
++	0xa184, 0x00ff, 0x6006, 0x8108, 0x00c0, 0x312a, 0x6003, 0x0003,
++	0x0078, 0x312c, 0x6003, 0x0001, 0x00f0, 0x3111, 0x0c7f, 0x0c7e,
++	0x2061, 0x0100, 0x602f, 0x0040, 0x602f, 0x0000, 0x0c7f, 0x1078,
++	0x3819, 0x0040, 0x313d, 0x1078, 0x256a, 0x60c0, 0xa005, 0x0040,
++	0x3149, 0x6003, 0x0001, 0x2091, 0x301d, 0x1078, 0x4224, 0x0078,
++	0x314d, 0x6003, 0x0004, 0x2091, 0x301d, 0x0078, 0x2bad, 0x6000,
++	0xa086, 0x0000, 0x0040, 0x2bd7, 0x2069, 0xa652, 0x7830, 0x6842,
++	0x7834, 0x6846, 0x6804, 0xd0fc, 0x0040, 0x3162, 0x2009, 0x0030,
++	0x0078, 0x3164, 0x2009, 0x001c, 0x2d00, 0x7a2c, 0x7b28, 0x7c3c,
++	0x7d38, 0x0078, 0x3608, 0xa006, 0x1078, 0x256a, 0x81ff, 0x00c0,
++	0x2bd7, 0x1078, 0x42dd, 0x1078, 0x4224, 0x0078, 0x2bad, 0x81ff,
++	0x00c0, 0x2bd7, 0x6184, 0x81ff, 0x0040, 0x3191, 0x703f, 0x0000,
++	0x2001, 0xacc0, 0x2009, 0x0040, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38,
++	0x127e, 0x2091, 0x8000, 0x1078, 0x3608, 0x701b, 0x2baa, 0x127f,
++	0x007c, 0x703f, 0x0001, 0x0d7e, 0x2069, 0xacc0, 0x20a9, 0x0040,
++	0x20a1, 0xacc0, 0x2019, 0xffff, 0x43a4, 0x6550, 0xa588, 0x29c0,
++	0x210c, 0xa18c, 0x00ff, 0x216a, 0xa00e, 0x2011, 0x0002, 0x2100,
++	0xa506, 0x0040, 0x31c3, 0x1078, 0x45c4, 0x00c0, 0x31c3, 0x6014,
++	0x821c, 0x0048, 0x31bb, 0xa398, 0xacc0, 0xa085, 0xff00, 0x8007,
++	0x201a, 0x0078, 0x31c2, 0xa398, 0xacc0, 0x2324, 0xa4a4, 0xff00,
++	0xa405, 0x201a, 0x8210, 0x8108, 0xa182, 0x0080, 0x00c8, 0x31ca,
++	0x0078, 0x31a7, 0x8201, 0x8007, 0x2d0c, 0xa105, 0x206a, 0x0d7f,
++	0x20a9, 0x0040, 0x20a1, 0xacc0, 0x2099, 0xacc0, 0x1078, 0x4281,
++	0x0078, 0x3180, 0x1078, 0x35e4, 0x0040, 0x2bdb, 0x0c7e, 0x1078,
++	0x35ba, 0x0c7f, 0x00c0, 0x31e8, 0x2009, 0x0002, 0x0078, 0x2bd7,
++	0x2001, 0xa653, 0x2004, 0xd0b4, 0x0040, 0x320f, 0x6000, 0xd08c,
++	0x00c0, 0x320f, 0x6004, 0xa084, 0x00ff, 0xa086, 0x0006, 0x00c0,
++	0x320f, 0x6837, 0x0000, 0x6838, 0xc0fd, 0x683a, 0x1078, 0x8e9e,
++	0x00c0, 0x3206, 0x2009, 0x0003, 0x0078, 0x2bd7, 0x7007, 0x0003,
++	0x701b, 0x320b, 0x007c, 0x1078, 0x35e4, 0x0040, 0x2bdb, 0x20a9,
++	0x002b, 0x2c98, 0xade8, 0x0002, 0x2da0, 0x53a3, 0x20a9, 0x0004,
++	0xac80, 0x0006, 0x2098, 0xad80, 0x0006, 0x20a0, 0x1078, 0x4281,
++	0x20a9, 0x0004, 0xac80, 0x000a, 0x2098, 0xad80, 0x000a, 0x20a0,
++	0x1078, 0x4281, 0x2d00, 0x2009, 0x002b, 0x7a2c, 0x7b28, 0x7c3c,
++	0x7d38, 0x0078, 0x3608, 0x81ff, 0x00c0, 0x2bd7, 0x1078, 0x35d2,
++	0x0040, 0x2bdb, 0x1078, 0x47bd, 0x0078, 0x2bad, 0x81ff, 0x00c0,
++	0x2bd7, 0x7828, 0xa08a, 0x1000, 0x00c8, 0x2bdb, 0x1078, 0x35e4,
++	0x0040, 0x2bdb, 0x1078, 0x482f, 0x0040, 0x2bd7, 0x2019, 0x0004,
++	0x1078, 0x47d3, 0x7924, 0x810f, 0x7a28, 0x1078, 0x3259, 0x0078,
++	0x2bad, 0xa186, 0x00ff, 0x0040, 0x3261, 0x1078, 0x3271, 0x0078,
++	0x3270, 0x2029, 0x007e, 0x2061, 0xa600, 0x6450, 0x2400, 0xa506,
++	0x0040, 0x326d, 0x2508, 0x1078, 0x3271, 0x8529, 0x00c8, 0x3266,
++	0x007c, 0x1078, 0x45c4, 0x00c0, 0x327c, 0x2200, 0x8003, 0x800b,
++	0x810b, 0xa108, 0x1078, 0x5a52, 0x007c, 0x81ff, 0x00c0, 0x2bd7,
++	0x1078, 0x35d2, 0x0040, 0x2bdb, 0x1078, 0x4673, 0x0040, 0x2bd7,
++	0x1078, 0x47c8, 0x0078, 0x2bad, 0x81ff, 0x00c0, 0x2bd7, 0x1078,
++	0x35d2, 0x0040, 0x2bdb, 0x1078, 0x4673, 0x0040, 0x2bd7, 0x1078,
++	0x47b2, 0x0078, 0x2bad, 0x6100, 0x0078, 0x2bad, 0x1078, 0x35e4,
++	0x0040, 0x2bdb, 0x2001, 0xa600, 0x2004, 0xa086, 0x0003, 0x00c0,
++	0x2bd7, 0x0d7e, 0xace8, 0x000a, 0x7924, 0xd184, 0x0040, 0x32b2,
++	0xace8, 0x0006, 0x680c, 0x8007, 0x783e, 0x6808, 0x8007, 0x783a,
++	0x6b04, 0x831f, 0x6a00, 0x8217, 0x0d7f, 0x6100, 0xa18c, 0x0200,
++	0x0078, 0x2bad, 0xa006, 0x1078, 0x256a, 0x7824, 0xa084, 0x00ff,
++	0xa086, 0x00ff, 0x0040, 0x32cf, 0x81ff, 0x00c0, 0x2bd7, 0x1078,
++	0x42dd, 0x7828, 0xa08a, 0x1000, 0x00c8, 0x2bdb, 0x7924, 0xa18c,
++	0xff00, 0x810f, 0xa186, 0x00ff, 0x0040, 0x32e5, 0xa182, 0x007f,
++	0x00c8, 0x2bdb, 0x2100, 0x1078, 0x2564, 0x027e, 0x0c7e, 0x127e,
++	0x2091, 0x8000, 0x2061, 0xa8c4, 0x601b, 0x0000, 0x601f, 0x0000,
++	0x2011, 0x0003, 0x1078, 0x70e0, 0x2011, 0x0002, 0x1078, 0x70ea,
++	0x1078, 0x6fc4, 0x037e, 0x2019, 0x0000, 0x1078, 0x7058, 0x037f,
++	0x2061, 0x0100, 0x6030, 0xa084, 0x00ff, 0x810f, 0xa105, 0x604a,
++	0x6043, 0x0090, 0x6043, 0x0010, 0x2009, 0x002d, 0x2011, 0x4259,
++	0x1078, 0x5add, 0x7924, 0xa18c, 0xff00, 0x810f, 0x7a28, 0x1078,
++	0x3259, 0x127f, 0x0c7f, 0x027f, 0x0078, 0x2bad, 0x7924, 0xa18c,
++	0xff00, 0x810f, 0x0c7e, 0x1078, 0x455c, 0x2c08, 0x0c7f, 0x00c0,
++	0x2bdb, 0x0078, 0x2bad, 0x81ff, 0x0040, 0x3332, 0x2009, 0x0001,
++	0x0078, 0x2bd7, 0x60cc, 0xd09c, 0x00c0, 0x333a, 0x2009, 0x0005,
++	0x0078, 0x2bd7, 0x1078, 0x35ba, 0x00c0, 0x3342, 0x2009, 0x0002,
++	0x0078, 0x2bd7, 0x7924, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x1078,
++	0x3604, 0x701b, 0x334c, 0x007c, 0x2009, 0x0080, 0x1078, 0x45c4,
++	0x00c0, 0x3359, 0x6004, 0xa084, 0x00ff, 0xa086, 0x0006, 0x0040,
++	0x335d, 0x2021, 0x400a, 0x0078, 0x2baf, 0x0d7e, 0xade8, 0x000d,
++	0x6900, 0x6a08, 0x6b0c, 0x6c10, 0x6d14, 0x6e18, 0x6820, 0xa0be,
++	0x0100, 0x0040, 0x33d0, 0xa0be, 0x0112, 0x0040, 0x33d0, 0xa0be,
++	0x0113, 0x0040, 0x33d0, 0xa0be, 0x0114, 0x0040, 0x33d0, 0xa0be,
++	0x0117, 0x0040, 0x33d0, 0xa0be, 0x011a, 0x0040, 0x33d0, 0xa0be,
++	0x0121, 0x0040, 0x33c6, 0xa0be, 0x0131, 0x0040, 0x33c6, 0xa0be,
++	0x0171, 0x0040, 0x33d0, 0xa0be, 0x0173, 0x0040, 0x33d0, 0xa0be,
++	0x01a1, 0x00c0, 0x3398, 0x6830, 0x8007, 0x6832, 0x0078, 0x33d6,
++	0xa0be, 0x0212, 0x0040, 0x33cc, 0xa0be, 0x0213, 0x0040, 0x33cc,
++	0xa0be, 0x0214, 0x0040, 0x33be, 0xa0be, 0x0217, 0x0040, 0x33b8,
++	0xa0be, 0x021a, 0x00c0, 0x33b1, 0x6838, 0x8007, 0x683a, 0x0078,
++	0x33d0, 0xa0be, 0x0300, 0x0040, 0x33d0, 0x0d7f, 0x0078, 0x2bdb,
++	0xad80, 0x0010, 0x20a9, 0x0007, 0x1078, 0x3418, 0xad80, 0x000e,
++	0x20a9, 0x0001, 0x1078, 0x3418, 0x0078, 0x33d0, 0xad80, 0x000c,
++	0x1078, 0x3426, 0x0078, 0x33d6, 0xad80, 0x000e, 0x1078, 0x3426,
++	0xad80, 0x000c, 0x20a9, 0x0001, 0x1078, 0x3418, 0x0c7e, 0x1078,
++	0x35ba, 0x0040, 0x3409, 0x6838, 0xc0fd, 0x683a, 0x6837, 0x0119,
++	0x6853, 0x0000, 0x684f, 0x0020, 0x685b, 0x0001, 0x810b, 0x697e,
++	0x6883, 0x0000, 0x6a86, 0x6b8a, 0x6c8e, 0x6d92, 0x6996, 0x689b,
++	0x0000, 0x0c7f, 0x0d7f, 0x6837, 0x0000, 0x6838, 0xc0fd, 0x683a,
++	0x6823, 0x0000, 0x6804, 0x2068, 0x1078, 0x8e66, 0x00c0, 0x3404,
++	0x2009, 0x0003, 0x0078, 0x2bd7, 0x7007, 0x0003, 0x701b, 0x340f,
++	0x007c, 0x0c7f, 0x0d7f, 0x2009, 0x0002, 0x0078, 0x2bd7, 0x6820,
++	0xa086, 0x8001, 0x00c0, 0x2bad, 0x2009, 0x0004, 0x0078, 0x2bd7,
++	0x017e, 0x2008, 0x2044, 0x8000, 0x204c, 0x8000, 0x290a, 0x8108,
++	0x280a, 0x8108, 0x00f0, 0x341a, 0x017f, 0x007c, 0x017e, 0x0a7e,
++	0x0b7e, 0x2008, 0x2044, 0x8000, 0x204c, 0x8000, 0x2054, 0x8000,
++	0x205c, 0x2b0a, 0x8108, 0x2a0a, 0x8108, 0x290a, 0x8108, 0x280a,
++	0x0b7f, 0x0a7f, 0x017f, 0x007c, 0x81ff, 0x0040, 0x3443, 0x2009,
++	0x0001, 0x0078, 0x2bd7, 0x60cc, 0xd09c, 0x00c0, 0x344b, 0x2009,
++	0x0005, 0x0078, 0x2bd7, 0x7924, 0x2140, 0xa18c, 0xff00, 0x810f,
++	0xa182, 0x0080, 0x0048, 0x2bdb, 0xa182, 0x00ff, 0x00c8, 0x2bdb,
++	0x7a2c, 0x7b28, 0x606c, 0xa306, 0x00c0, 0x3466, 0x6070, 0xa24e,
++	0x0040, 0x2bdb, 0xa9cc, 0xff00, 0x0040, 0x2bdb, 0x0c7e, 0x1078,
++	0x350f, 0x2c68, 0x0c7f, 0x0040, 0x349e, 0xa0c6, 0x4000, 0x00c0,
++	0x3484, 0x0c7e, 0x007e, 0x2d60, 0x2009, 0x0000, 0x1078, 0x489b,
++	0x00c0, 0x347b, 0xc185, 0x6000, 0xd0bc, 0x0040, 0x3480, 0xc18d,
++	0x007f, 0x0c7f, 0x0078, 0x349b, 0xa0c6, 0x4007, 0x00c0, 0x348b,
++	0x2408, 0x0078, 0x349b, 0xa0c6, 0x4008, 0x00c0, 0x3493, 0x2708,
++	0x2610, 0x0078, 0x349b, 0xa0c6, 0x4009, 0x00c0, 0x3499, 0x0078,
++	0x349b, 0x2001, 0x4006, 0x2020, 0x0078, 0x2baf, 0x2d00, 0x7022,
++	0x017e, 0x0b7e, 0x0c7e, 0x0e7e, 0x2c70, 0x1078, 0x76c7, 0x0040,
++	0x34e4, 0x2d00, 0x601a, 0x2001, 0xa657, 0x2004, 0xa084, 0x00ff,
++	0x6842, 0x2e58, 0x0e7f, 0x0e7e, 0x0c7e, 0x1078, 0x35ba, 0x0c7f,
++	0x2b70, 0x00c0, 0x34c5, 0x1078, 0x772d, 0x0e7f, 0x0c7f, 0x0b7f,
++	0x017f, 0x2009, 0x0002, 0x0078, 0x2bd7, 0x6837, 0x0000, 0x2d00,
++	0x6012, 0x6833, 0x0000, 0x6838, 0xc0fd, 0x683a, 0x127e, 0x2091,
++	0x8000, 0x1078, 0x2880, 0x127f, 0x601f, 0x0001, 0x2001, 0x0000,
++	0x1078, 0x44ee, 0x2001, 0x0002, 0x1078, 0x4502, 0x2009, 0x0002,
++	0x1078, 0x775c, 0xa085, 0x0001, 0x0e7f, 0x0c7f, 0x0b7f, 0x017f,
++	0x00c0, 0x34ee, 0x2009, 0x0003, 0x0078, 0x2bd7, 0x7007, 0x0003,
++	0x701b, 0x34f3, 0x007c, 0x6830, 0xa086, 0x0100, 0x7020, 0x2060,
++	0x00c0, 0x3501, 0x2009, 0x0004, 0x6204, 0xa294, 0x00ff, 0x0078,
++	0x2bd7, 0x2009, 0x0000, 0x1078, 0x489b, 0x00c0, 0x3508, 0xc185,
++	0x6000, 0xd0bc, 0x0040, 0x350d, 0xc18d, 0x0078, 0x2bad, 0x0e7e,
++	0x0d7e, 0x2029, 0x0000, 0x2021, 0x0080, 0x20a9, 0x007f, 0x2071,
++	0xa7b5, 0x2e04, 0xa005, 0x00c0, 0x3524, 0x2100, 0xa406, 0x00c0,
++	0x3555, 0x2428, 0x0078, 0x3555, 0x2068, 0x6f10, 0x2700, 0xa306,
++	0x00c0, 0x3546, 0x6e14, 0x2600, 0xa206, 0x00c0, 0x3546, 0x2400,
++	0xa106, 0x00c0, 0x3542, 0x2d60, 0xd884, 0x0040, 0x356a, 0x6004,
++	0xa084, 0x00ff, 0xa086, 0x0006, 0x00c0, 0x356a, 0x2001, 0x4000,
++	0x0078, 0x356b, 0x2001, 0x4007, 0x0078, 0x356b, 0x2400, 0xa106,
++	0x00c0, 0x3555, 0x6e14, 0x87ff, 0x00c0, 0x3551, 0x86ff, 0x0040,
++	0x3521, 0x2001, 0x4008, 0x0078, 0x356b, 0x8420, 0x8e70, 0x00f0,
++	0x3519, 0x85ff, 0x00c0, 0x3564, 0x2001, 0x4009, 0x0078, 0x356b,
++	0x2001, 0x0001, 0x0078, 0x356b, 0x1078, 0x455c, 0x00c0, 0x3560,
++	0x6312, 0x6216, 0xa006, 0xa005, 0x0d7f, 0x0e7f, 0x007c, 0x81ff,
++	0x00c0, 0x2bd7, 0x1078, 0x35ba, 0x0040, 0x2bd7, 0x6837, 0x0000,
++	0x6838, 0xc0fd, 0x683a, 0x7824, 0xa005, 0x0040, 0x2bdb, 0xa096,
++	0x00ff, 0x0040, 0x3587, 0xa092, 0x0004, 0x00c8, 0x2bdb, 0x2010,
++	0x2d18, 0x1078, 0x282f, 0x0040, 0x2bd7, 0x7007, 0x0003, 0x701b,
++	0x3592, 0x007c, 0x6830, 0xa086, 0x0100, 0x0040, 0x2bd7, 0x0078,
++	0x2bad, 0x7924, 0xa18c, 0xff00, 0x810f, 0xa182, 0x0080, 0x0048,
++	0x2bdb, 0xa182, 0x00ff, 0x00c8, 0x2bdb, 0x127e, 0x2091, 0x8000,
++	0x1078, 0x8d4b, 0x00c0, 0x35b7, 0xa190, 0xa735, 0x2204, 0xa065,
++	0x0040, 0x35b7, 0x1078, 0x42f8, 0x127f, 0x0078, 0x2bad, 0x127f,
++	0x0078, 0x2bd7, 0x1078, 0x138b, 0x0040, 0x35d1, 0xa006, 0x6802,
++	0x7010, 0xa005, 0x00c0, 0x35c9, 0x2d00, 0x7012, 0x7016, 0x0078,
++	0x35cf, 0x7014, 0x6802, 0x2060, 0x2d00, 0x6006, 0x7016, 0xad80,
++	0x000d, 0x007c, 0x7924, 0x810f, 0xa18c, 0x00ff, 0x1078, 0x45c4,
++	0x00c0, 0x35e1, 0x7e28, 0xa684, 0x3fff, 0xa082, 0x4000, 0x0048,
++	0x35e2, 0xa066, 0x8cff, 0x007c, 0x7e24, 0x860f, 0xa18c, 0x00ff,
++	0x1078, 0x45c4, 0x00c0, 0x35f2, 0xa6b4, 0x00ff, 0xa682, 0x4000,
++	0x0048, 0x35f3, 0xa066, 0x8cff, 0x007c, 0x017e, 0x7110, 0x81ff,
++	0x0040, 0x3600, 0x2168, 0x6904, 0x1078, 0x13a4, 0x0078, 0x35f7,
++	0x7112, 0x7116, 0x017f, 0x007c, 0x2031, 0x0001, 0x0078, 0x360a,
++	0x2031, 0x0000, 0x2061, 0xa6d2, 0x6606, 0x6112, 0x600e, 0x6226,
++	0x632a, 0x642e, 0x6532, 0x2c10, 0x1078, 0x13db, 0x7007, 0x0002,
++	0x701b, 0x2bad, 0x007c, 0x0f7e, 0x127e, 0x2091, 0x8000, 0x2079,
++	0x0000, 0x2001, 0xa690, 0x2004, 0xa005, 0x00c0, 0x3636, 0x0068,
++	0x3636, 0x7818, 0xd084, 0x00c0, 0x3636, 0x7a22, 0x7b26, 0x7c2a,
++	0x781b, 0x0001, 0x2091, 0x4080, 0x0078, 0x365b, 0x017e, 0x0c7e,
++	0x0e7e, 0x2071, 0xa682, 0x7138, 0xa182, 0x0008, 0x0048, 0x3644,
++	0x7030, 0x2060, 0x0078, 0x3655, 0x7030, 0xa0e0, 0x0008, 0xac82,
++	0xa6d2, 0x0048, 0x364d, 0x2061, 0xa692, 0x2c00, 0x7032, 0x81ff,
++	0x00c0, 0x3653, 0x7036, 0x8108, 0x713a, 0x2262, 0x6306, 0x640a,
++	0x0e7f, 0x0c7f, 0x017f, 0x127f, 0x0f7f, 0x007c, 0x0e7e, 0x2071,
++	0xa682, 0x7038, 0xa005, 0x0040, 0x3697, 0x127e, 0x2091, 0x8000,
++	0x0068, 0x3696, 0x0f7e, 0x2079, 0x0000, 0x7818, 0xd084, 0x00c0,
++	0x3695, 0x0c7e, 0x7034, 0x2060, 0x2c04, 0x7822, 0x6004, 0x7826,
++	0x6008, 0x782a, 0x781b, 0x0001, 0x2091, 0x4080, 0x7038, 0x8001,
++	0x703a, 0xa005, 0x00c0, 0x368b, 0x7033, 0xa692, 0x7037, 0xa692,
++	0x0c7f, 0x0078, 0x3695, 0xac80, 0x0008, 0xa0fa, 0xa6d2, 0x0048,
++	0x3693, 0x2001, 0xa692, 0x7036, 0x0c7f, 0x0f7f, 0x127f, 0x0e7f,
++	0x007c, 0x027e, 0x2001, 0xa653, 0x2004, 0xd0c4, 0x0040, 0x36a4,
++	0x2011, 0x8014, 0x1078, 0x361b, 0x027f, 0x007c, 0x81ff, 0x00c0,
++	0x2bd7, 0x127e, 0x2091, 0x8000, 0x6030, 0xc08d, 0xc085, 0xc0ac,
++	0x6032, 0x1078, 0x4224, 0x127f, 0x0078, 0x2bad, 0x81ff, 0x00c0,
++	0x2bd7, 0x6000, 0xa086, 0x0003, 0x00c0, 0x2bd7, 0x2001, 0xa653,
++	0x2004, 0xd0ac, 0x00c0, 0x2bd7, 0x1078, 0x35e4, 0x0040, 0x2bdb,
++	0x6004, 0xa084, 0x00ff, 0xa086, 0x0006, 0x00c0, 0x36d3, 0x7828,
++	0xa005, 0x0040, 0x2bad, 0x0c7e, 0x1078, 0x35ba, 0x0c7f, 0x0040,
++	0x2bd7, 0x6837, 0x0000, 0x6833, 0x0000, 0x6838, 0xc0fd, 0x683a,
++	0x1078, 0x8f12, 0x0040, 0x2bd7, 0x7007, 0x0003, 0x701b, 0x36e9,
++	0x007c, 0x6830, 0xa086, 0x0100, 0x0040, 0x2bd7, 0x0078, 0x2bad,
++	0x2001, 0xa600, 0x2004, 0xa086, 0x0003, 0x00c0, 0x2bd7, 0x7f24,
++	0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x1078, 0x35ba, 0x0040, 0x2bd7,
++	0x2009, 0x0000, 0x2031, 0x0000, 0x7023, 0x0000, 0x702f, 0x0000,
++	0xad80, 0x0005, 0x7026, 0x20a0, 0x1078, 0x45c4, 0x00c0, 0x376d,
++	0x6004, 0xa0c4, 0x00ff, 0xa8c6, 0x0006, 0x0040, 0x371d, 0xa0c4,
++	0xff00, 0xa8c6, 0x0600, 0x00c0, 0x376d, 0x2001, 0xa653, 0x2004,
++	0xd0ac, 0x00c0, 0x372a, 0x1078, 0x489b, 0x00c0, 0x372a, 0xd79c,
++	0x0040, 0x376d, 0xd794, 0x00c0, 0x3730, 0xd784, 0x0040, 0x373c,
++	0xac80, 0x0006, 0x2098, 0x3400, 0x20a9, 0x0004, 0x53a3, 0x1078,
++	0x3426, 0xd794, 0x0040, 0x3745, 0xac80, 0x000a, 0x2098, 0x3400,
++	0x20a9, 0x0004, 0x53a3, 0x1078, 0x3426, 0x21a2, 0xd794, 0x0040,
++	0x3765, 0xac80, 0x0000, 0x2098, 0x94a0, 0x20a9, 0x0002, 0x53a3,
++	0xac80, 0x0003, 0x20a6, 0x94a0, 0xac80, 0x0004, 0x2098, 0x3400,
++	0x20a9, 0x0002, 0x53a3, 0x1078, 0x3418, 0xac80, 0x0026, 0x2098,
++	0x20a9, 0x0002, 0x53a3, 0x0078, 0x3766, 0x94a0, 0xd794, 0x0040,
++	0x376b, 0xa6b0, 0x000b, 0xa6b0, 0x0005, 0x8108, 0xd78c, 0x0040,
++	0x3777, 0xa186, 0x0100, 0x0040, 0x3788, 0x0078, 0x377b, 0xa186,
++	0x007e, 0x0040, 0x3788, 0xd794, 0x0040, 0x3782, 0xa686, 0x0020,
++	0x0078, 0x3784, 0xa686, 0x0028, 0x0040, 0x3791, 0x0078, 0x370c,
++	0x86ff, 0x00c0, 0x378f, 0x7120, 0x810b, 0x0078, 0x2bad, 0x702f,
++	0x0001, 0x711e, 0x7020, 0xa600, 0x7022, 0x772a, 0x2061, 0xa6d2,
++	0x6007, 0x0000, 0x6612, 0x7024, 0x600e, 0x6226, 0x632a, 0x642e,
++	0x6532, 0x2c10, 0x1078, 0x13db, 0x7007, 0x0002, 0x701b, 0x37a9,
++	0x007c, 0x702c, 0xa005, 0x00c0, 0x37bb, 0x711c, 0x7024, 0x20a0,
++	0x7728, 0x2031, 0x0000, 0x2061, 0xa6d2, 0x6224, 0x6328, 0x642c,
++	0x6530, 0x0078, 0x370c, 0x7120, 0x810b, 0x0078, 0x2bad, 0x2029,
++	0x007e, 0x7924, 0x7a28, 0x7b2c, 0x7c38, 0xa184, 0xff00, 0x8007,
++	0xa0e2, 0x0020, 0x0048, 0x2bdb, 0xa502, 0x0048, 0x2bdb, 0xa184,
++	0x00ff, 0xa0e2, 0x0020, 0x0048, 0x2bdb, 0xa502, 0x0048, 0x2bdb,
++	0xa284, 0xff00, 0x8007, 0xa0e2, 0x0020, 0x0048, 0x2bdb, 0xa502,
++	0x0048, 0x2bdb, 0xa284, 0x00ff, 0xa0e2, 0x0020, 0x0048, 0x2bdb,
++	0xa502, 0x0048, 0x2bdb, 0xa384, 0xff00, 0x8007, 0xa0e2, 0x0020,
++	0x0048, 0x2bdb, 0xa502, 0x0048, 0x2bdb, 0xa384, 0x00ff, 0xa0e2,
++	0x0020, 0x0048, 0x2bdb, 0xa502, 0x0048, 0x2bdb, 0xa484, 0xff00,
++	0x8007, 0xa0e2, 0x0020, 0x0048, 0x2bdb, 0xa502, 0x0048, 0x2bdb,
++	0xa484, 0x00ff, 0xa0e2, 0x0020, 0x0048, 0x2bdb, 0xa502, 0x0048,
++	0x2bdb, 0x2061, 0xa8a5, 0x6102, 0x6206, 0x630a, 0x640e, 0x0078,
++	0x2bad, 0x007e, 0x2001, 0xa653, 0x2004, 0xd0cc, 0x007f, 0x007c,
++	0x007e, 0x2001, 0xa672, 0x2004, 0xd0bc, 0x007f, 0x007c, 0x6164,
++	0x7a24, 0x6300, 0x82ff, 0x00c0, 0x3830, 0x7926, 0x0078, 0x2bad,
++	0x83ff, 0x00c0, 0x2bdb, 0x2001, 0xfff0, 0xa200, 0x00c8, 0x2bdb,
++	0x2019, 0xffff, 0x6068, 0xa302, 0xa200, 0x0048, 0x2bdb, 0x7926,
++	0x6266, 0x0078, 0x2bad, 0x2001, 0xa600, 0x2004, 0xa086, 0x0003,
++	0x00c0, 0x2bd7, 0x7c28, 0x7d24, 0x7e38, 0x7f2c, 0x1078, 0x35ba,
++	0x0040, 0x2bd7, 0x2009, 0x0000, 0x2019, 0x0000, 0x7023, 0x0000,
++	0x702f, 0x0000, 0xad80, 0x0003, 0x7026, 0x20a0, 0xa1e0, 0xa735,
++	0x2c64, 0x8cff, 0x0040, 0x387d, 0x6004, 0xa084, 0x00ff, 0xa086,
++	0x0006, 0x0040, 0x3872, 0x6004, 0xa084, 0xff00, 0xa086, 0x0600,
++	0x00c0, 0x387d, 0x6014, 0x20a2, 0x94a0, 0x6010, 0x8007, 0xa105,
++	0x8007, 0x20a2, 0x94a0, 0xa398, 0x0002, 0x8108, 0xa182, 0x00ff,
++	0x0040, 0x3888, 0xa386, 0x002a, 0x0040, 0x3891, 0x0078, 0x385e,
++	0x83ff, 0x00c0, 0x388f, 0x7120, 0x810c, 0x0078, 0x2bad, 0x702f,
++	0x0001, 0x711e, 0x7020, 0xa300, 0x7022, 0x2061, 0xa6d2, 0x6007,
++	0x0000, 0x6312, 0x7024, 0x600e, 0x6426, 0x652a, 0x662e, 0x6732,
++	0x2c10, 0x1078, 0x13db, 0x7007, 0x0002, 0x701b, 0x38a8, 0x007c,
++	0x702c, 0xa005, 0x00c0, 0x38b9, 0x711c, 0x7024, 0x20a0, 0x2019,
++	0x0000, 0x2061, 0xa6d2, 0x6424, 0x6528, 0x662c, 0x6730, 0x0078,
++	0x385e, 0x7120, 0x810c, 0x0078, 0x2bad, 0x81ff, 0x00c0, 0x2bd7,
++	0x60cc, 0xd09c, 0x0040, 0x2bd7, 0x1078, 0x35ba, 0x0040, 0x2bd7,
++	0x7924, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x1078, 0x3604, 0x701b,
++	0x38d2, 0x007c, 0x0d7e, 0xade8, 0x000d, 0x6828, 0xa0be, 0x7000,
++	0x0040, 0x38e5, 0xa0be, 0x7100, 0x0040, 0x38e5, 0xa0be, 0x7200,
++	0x0040, 0x38e5, 0x0d7f, 0x0078, 0x2bdb, 0x6820, 0x6924, 0x1078,
++	0x254d, 0x00c0, 0x3910, 0x1078, 0x455c, 0x00c0, 0x3910, 0x7122,
++	0x6612, 0x6516, 0x6e18, 0x0c7e, 0x1078, 0x35ba, 0x0040, 0x3910,
++	0x1078, 0x35ba, 0x0040, 0x3910, 0x0c7f, 0x0d7f, 0x6837, 0x0000,
++	0x6838, 0xc0fd, 0x683a, 0x6823, 0x0000, 0x6804, 0x2068, 0x1078,
++	0x8e82, 0x0040, 0x2bd7, 0x7007, 0x0003, 0x701b, 0x3913, 0x007c,
++	0x0d7f, 0x0078, 0x2bd7, 0x7120, 0x1078, 0x298e, 0x6820, 0xa086,
++	0x8001, 0x0040, 0x2bd7, 0x2d00, 0x701e, 0x6804, 0xa080, 0x0002,
++	0x007e, 0x20a9, 0x002a, 0x2098, 0x20a0, 0x1078, 0x4281, 0x007f,
++	0xade8, 0x000d, 0x6a08, 0x6b0c, 0x6c10, 0x6d14, 0x2061, 0xa6d2,
++	0x6007, 0x0000, 0x6e00, 0x6f28, 0xa7c6, 0x7000, 0x00c0, 0x393a,
++	0x0078, 0x393e, 0xa7c6, 0x7100, 0x00c0, 0x3946, 0xa6c2, 0x0004,
++	0x0048, 0x2bdb, 0x2009, 0x0004, 0x0078, 0x3608, 0xa7c6, 0x7200,
++	0x00c0, 0x2bdb, 0xa6c2, 0x0054, 0x0048, 0x2bdb, 0x600e, 0x6013,
++	0x002a, 0x6226, 0x632a, 0x642e, 0x6532, 0x2c10, 0x1078, 0x13db,
++	0x7007, 0x0002, 0x701b, 0x395d, 0x007c, 0x701c, 0x2068, 0x6804,
++	0xa080, 0x0001, 0x2004, 0xa080, 0x0002, 0x007e, 0x20a9, 0x002a,
++	0x2098, 0x20a0, 0x1078, 0x4281, 0x007f, 0x2009, 0x002a, 0x2061,
++	0xa6d2, 0x6224, 0x6328, 0x642c, 0x6530, 0x0078, 0x3608, 0x81ff,
++	0x00c0, 0x2bd7, 0x792c, 0x2001, 0xa89d, 0x2102, 0x1078, 0x35d2,
++	0x0040, 0x2bdb, 0x1078, 0x4673, 0x0040, 0x2bd7, 0x127e, 0x2091,
++	0x8000, 0x1078, 0x47de, 0x127f, 0x0078, 0x2bad, 0x7824, 0xd08c,
++	0x00c0, 0x3995, 0xd084, 0x0040, 0x31da, 0x1078, 0x35e4, 0x0040,
++	0x2bdb, 0x0c7e, 0x1078, 0x35ba, 0x0c7f, 0x00c0, 0x39a3, 0x2009,
++	0x0002, 0x0078, 0x2bd7, 0x6004, 0xa084, 0x00ff, 0xa086, 0x0006,
++	0x0040, 0x39b0, 0xa08e, 0x0004, 0x0040, 0x39b0, 0xa08e, 0x0005,
++	0x00c0, 0x39dd, 0x7824, 0xd08c, 0x0040, 0x39bb, 0x6000, 0xc08c,
++	0x6002, 0x0078, 0x39c5, 0x2001, 0xa653, 0x2004, 0xd0b4, 0x0040,
++	0x320f, 0x6000, 0xd08c, 0x00c0, 0x320f, 0x6837, 0x0000, 0x6838,
++	0xc0fd, 0x683a, 0x1078, 0x8e9e, 0x00c0, 0x39d2, 0x2009, 0x0003,
++	0x0078, 0x2bd7, 0x7007, 0x0003, 0x701b, 0x39d7, 0x007c, 0x1078,
++	0x35e4, 0x0040, 0x2bdb, 0x0078, 0x320f, 0x2009, 0xa62f, 0x210c,
++	0x81ff, 0x0040, 0x39e7, 0x2009, 0x0001, 0x0078, 0x2bd7, 0x2001,
++	0xa600, 0x2004, 0xa086, 0x0003, 0x0040, 0x39f2, 0x2009, 0x0007,
++	0x0078, 0x2bd7, 0x2001, 0xa653, 0x2004, 0xd0ac, 0x0040, 0x39fc,
++	0x2009, 0x0008, 0x0078, 0x2bd7, 0x609c, 0xd0a4, 0x00c0, 0x3a03,
++	0xd0ac, 0x00c0, 0x320f, 0x6837, 0x0000, 0x6833, 0x0000, 0x6838,
++	0xc0fd, 0x683a, 0x1078, 0x8f12, 0x00c0, 0x3a12, 0x2009, 0x0003,
++	0x0078, 0x2bd7, 0x7007, 0x0003, 0x701b, 0x3a17, 0x007c, 0x6830,
++	0xa086, 0x0100, 0x00c0, 0x3a20, 0x2009, 0x0004, 0x0078, 0x2bd7,
++	0x1078, 0x35e4, 0x0040, 0x2bdb, 0x0078, 0x39b2, 0x81ff, 0x2009,
++	0x0001, 0x00c0, 0x2bd7, 0x6000, 0xa086, 0x0003, 0x2009, 0x0007,
++	0x00c0, 0x2bd7, 0x2001, 0xa653, 0x2004, 0xd0ac, 0x2009, 0x0008,
++	0x00c0, 0x2bd7, 0x1078, 0x35e4, 0x0040, 0x2bdb, 0x6004, 0xa084,
++	0x00ff, 0xa086, 0x0006, 0x2009, 0x0009, 0x00c0, 0x2bd7, 0x0c7e,
++	0x1078, 0x35ba, 0x0c7f, 0x2009, 0x0002, 0x0040, 0x2bd7, 0x6837,
++	0x0000, 0x6833, 0x0000, 0x6838, 0xc0fd, 0x683a, 0x7928, 0xa194,
++	0xff00, 0xa18c, 0x00ff, 0xa006, 0x82ff, 0x00c0, 0x3a65, 0xc0ed,
++	0x6952, 0x792c, 0x6956, 0x0078, 0x3a6e, 0xa28e, 0x0100, 0x00c0,
++	0x2bdb, 0xc0e5, 0x6853, 0x0000, 0x6857, 0x0000, 0x683e, 0x1078,
++	0x90bd, 0x2009, 0x0003, 0x0040, 0x2bd7, 0x7007, 0x0003, 0x701b,
++	0x3a7a, 0x007c, 0x6830, 0xa086, 0x0100, 0x2009, 0x0004, 0x0040,
++	0x2bd7, 0x0078, 0x2bad, 0x81ff, 0x2009, 0x0001, 0x00c0, 0x2bd7,
++	0x6000, 0xa086, 0x0003, 0x2009, 0x0007, 0x00c0, 0x2bd7, 0x1078,
++	0x35e4, 0x0040, 0x2bdb, 0x6004, 0xa084, 0x00ff, 0xa086, 0x0006,
++	0x2009, 0x0009, 0x00c0, 0x2bd7, 0x0c7e, 0x1078, 0x35ba, 0x0c7f,
++	0x2009, 0x0002, 0x0040, 0x2bd7, 0xad80, 0x000f, 0x2009, 0x0008,
++	0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x1078, 0x3604, 0x701b, 0x3ab1,
++	0x007c, 0x0d7e, 0xade8, 0x000f, 0x6800, 0xa086, 0x0500, 0x00c0,
++	0x3ac4, 0x6804, 0xa005, 0x00c0, 0x3ac4, 0x6808, 0xa084, 0xff00,
++	0x00c0, 0x3ac4, 0x0078, 0x3ac7, 0x0d7f, 0x00c0, 0x2bdb, 0x0d7f,
++	0x6837, 0x0000, 0x6833, 0x0000, 0x6838, 0xc0fd, 0x683a, 0x0c7e,
++	0x1078, 0x35e4, 0x00c0, 0x3ad7, 0x0c7f, 0x0078, 0x2bdb, 0x1078,
++	0x9119, 0x2009, 0x0003, 0x0c7f, 0x0040, 0x2bd7, 0x7007, 0x0003,
++	0x701b, 0x3ae3, 0x007c, 0x6830, 0xa086, 0x0100, 0x2009, 0x0004,
++	0x0040, 0x2bd7, 0x0078, 0x2bad, 0x127e, 0x0c7e, 0x0e7e, 0x2061,
++	0x0100, 0x2071, 0xa600, 0x6044, 0xd0a4, 0x00c0, 0x3b15, 0xd084,
++	0x0040, 0x3afe, 0x1078, 0x3c75, 0x0078, 0x3b11, 0xd08c, 0x0040,
++	0x3b05, 0x1078, 0x3b8c, 0x0078, 0x3b11, 0xd094, 0x0040, 0x3b0c,
++	0x1078, 0x3b60, 0x0078, 0x3b11, 0xd09c, 0x0040, 0x3b11, 0x1078,
++	0x3b1f, 0x0e7f, 0x0c7f, 0x127f, 0x007c, 0x017e, 0x6128, 0xd19c,
++	0x00c0, 0x3b1c, 0xc19d, 0x612a, 0x017f, 0x0078, 0x3b11, 0x624c,
++	0xa286, 0xf0f0, 0x00c0, 0x3b30, 0x6048, 0xa086, 0xf0f0, 0x0040,
++	0x3b30, 0x624a, 0x6043, 0x0090, 0x6043, 0x0010, 0x0078, 0x3b5f,
++	0xa294, 0xff00, 0xa296, 0xf700, 0x0040, 0x3b45, 0x7134, 0xd1a4,
++	0x00c0, 0x3b45, 0x6240, 0xa294, 0x0010, 0x0040, 0x3b45, 0x2009,
++	0x00f7, 0x1078, 0x42a1, 0x0078, 0x3b5f, 0x6043, 0x0040, 0x6043,
++	0x0000, 0x7077, 0x0000, 0x708f, 0x0001, 0x70b3, 0x0000, 0x70cf,
++	0x0000, 0x2009, 0xacc0, 0x200b, 0x0000, 0x7087, 0x0000, 0x707b,
++	0x000f, 0x2009, 0x000f, 0x2011, 0x41d5, 0x1078, 0x5add, 0x007c,
++	0x157e, 0x7078, 0xa005, 0x00c0, 0x3b8a, 0x2011, 0x41d5, 0x1078,
++	0x5a45, 0x6040, 0xa094, 0x0010, 0xa285, 0x0020, 0x6042, 0x20a9,
++	0x00c8, 0x6044, 0xd08c, 0x00c0, 0x3b83, 0x00f0, 0x3b71, 0x6242,
++	0x708b, 0x0000, 0x6040, 0xa094, 0x0010, 0xa285, 0x0080, 0x6042,
++	0x6242, 0x0078, 0x3b8a, 0x6242, 0x708b, 0x0000, 0x707f, 0x0000,
++	0x0078, 0x3b8a, 0x157f, 0x007c, 0x707c, 0xa08a, 0x0003, 0x00c8,
++	0x3b95, 0x1079, 0x3b98, 0x0078, 0x3b97, 0x1078, 0x1332, 0x007c,
++	0x3b9b, 0x3bea, 0x3c74, 0x0f7e, 0x707f, 0x0001, 0x20e1, 0xa000,
++	0x20e1, 0x8700, 0x1078, 0x21f7, 0x20e1, 0x9080, 0x20e1, 0x4000,
++	0x2079, 0xab00, 0x207b, 0x2200, 0x7807, 0x00ef, 0x780b, 0x0000,
++	0x780f, 0x00ef, 0x7813, 0x0138, 0x7817, 0x0000, 0x781b, 0x0000,
++	0x781f, 0x0000, 0x7823, 0xffff, 0x7827, 0xffff, 0x782b, 0x0000,
++	0x782f, 0x0000, 0x2079, 0xab0c, 0x207b, 0x1101, 0x7807, 0x0000,
++	0x2099, 0xa605, 0x20a1, 0xab0e, 0x20a9, 0x0004, 0x53a3, 0x2079,
++	0xab12, 0x207b, 0x0000, 0x7807, 0x0000, 0x2099, 0xab00, 0x20a1,
++	0x020b, 0x20a9, 0x0014, 0x53a6, 0x60c3, 0x000c, 0x600f, 0x0000,
++	0x1078, 0x420b, 0x0f7f, 0x7083, 0x0000, 0x6043, 0x0008, 0x6043,
++	0x0000, 0x007c, 0x0d7e, 0x7080, 0x7083, 0x0000, 0xa025, 0x0040,
++	0x3c5e, 0x6020, 0xd0b4, 0x00c0, 0x3c5c, 0x718c, 0x81ff, 0x0040,
++	0x3c4b, 0xa486, 0x000c, 0x00c0, 0x3c56, 0xa480, 0x0018, 0x8004,
++	0x20a8, 0x2011, 0xab80, 0x2019, 0xab00, 0x220c, 0x2304, 0xa106,
++	0x00c0, 0x3c22, 0x8210, 0x8318, 0x00f0, 0x3c05, 0x6043, 0x0004,
++	0x608b, 0xbc94, 0x608f, 0xf0f0, 0x6043, 0x0006, 0x707f, 0x0002,
++	0x708b, 0x0002, 0x2009, 0x07d0, 0x2011, 0x41dc, 0x1078, 0x5add,
++	0x0078, 0x3c5c, 0x2069, 0xab80, 0x6930, 0xa18e, 0x1101, 0x00c0,
++	0x3c56, 0x6834, 0xa005, 0x00c0, 0x3c56, 0x6900, 0xa18c, 0x00ff,
++	0x00c0, 0x3c36, 0x6804, 0xa005, 0x0040, 0x3c4b, 0x2011, 0xab8e,
++	0x2019, 0xa605, 0x20a9, 0x0004, 0x220c, 0x2304, 0xa102, 0x0048,
++	0x3c49, 0x00c0, 0x3c56, 0x8210, 0x8318, 0x00f0, 0x3c3c, 0x0078,
++	0x3c56, 0x708f, 0x0000, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x2099,
++	0xab80, 0x20a1, 0x020b, 0x20a9, 0x0014, 0x53a6, 0x6043, 0x0008,
++	0x6043, 0x0000, 0x0078, 0x3c5e, 0x0d7f, 0x007c, 0x6020, 0xd0b4,
++	0x00c0, 0x3c5c, 0x60c3, 0x000c, 0x2011, 0xa8bb, 0x2013, 0x0000,
++	0x7083, 0x0000, 0x20e1, 0x9080, 0x60a3, 0x0056, 0x60a7, 0x9575,
++	0x1078, 0x6e06, 0x0078, 0x3c5c, 0x007c, 0x7088, 0xa08a, 0x001d,
++	0x00c8, 0x3c7e, 0x1079, 0x3c81, 0x0078, 0x3c80, 0x1078, 0x1332,
++	0x007c, 0x3cab, 0x3cba, 0x3ce9, 0x3d02, 0x3d2e, 0x3d5a, 0x3d86,
++	0x3dbc, 0x3de8, 0x3e10, 0x3e53, 0x3e7d, 0x3e9f, 0x3eb5, 0x3edb,
++	0x3eee, 0x3ef7, 0x3f2b, 0x3f57, 0x3f83, 0x3faf, 0x3fe5, 0x4030,
++	0x405f, 0x4081, 0x40c3, 0x40e9, 0x4102, 0x4103, 0x0c7e, 0x2061,
++	0xa600, 0x6003, 0x0007, 0x2061, 0x0100, 0x6004, 0xa084, 0xfff9,
++	0x6006, 0x0c7f, 0x007c, 0x608b, 0xbc94, 0x608f, 0xf0f0, 0x6043,
++	0x0002, 0x708b, 0x0001, 0x2009, 0x07d0, 0x2011, 0x41dc, 0x1078,
++	0x5add, 0x007c, 0x0f7e, 0x7080, 0xa086, 0x0014, 0x00c0, 0x3ce7,
++	0x6043, 0x0000, 0x6020, 0xd0b4, 0x00c0, 0x3ce7, 0x2079, 0xab80,
++	0x7a30, 0xa296, 0x1102, 0x00c0, 0x3ce5, 0x7834, 0xa005, 0x00c0,
++	0x3ce5, 0x7a38, 0xd2fc, 0x0040, 0x3cdb, 0x70b0, 0xa005, 0x00c0,
++	0x3cdb, 0x70b3, 0x0001, 0x2011, 0x41dc, 0x1078, 0x5a45, 0x708b,
++	0x0010, 0x1078, 0x3ef7, 0x0078, 0x3ce7, 0x1078, 0x4224, 0x0f7f,
++	0x007c, 0x708b, 0x0003, 0x6043, 0x0004, 0x2011, 0x41dc, 0x1078,
++	0x5a45, 0x1078, 0x4289, 0x20a3, 0x1102, 0x20a3, 0x0000, 0x20a9,
++	0x000a, 0x20a3, 0x0000, 0x00f0, 0x3cf9, 0x60c3, 0x0014, 0x1078,
++	0x420b, 0x007c, 0x0f7e, 0x7080, 0xa005, 0x0040, 0x3d2c, 0x2011,
++	0x41dc, 0x1078, 0x5a45, 0xa086, 0x0014, 0x00c0, 0x3d2a, 0x2079,
++	0xab80, 0x7a30, 0xa296, 0x1102, 0x00c0, 0x3d2a, 0x7834, 0xa005,
++	0x00c0, 0x3d2a, 0x7a38, 0xd2fc, 0x0040, 0x3d24, 0x70b0, 0xa005,
++	0x00c0, 0x3d24, 0x70b3, 0x0001, 0x708b, 0x0004, 0x1078, 0x3d2e,
++	0x0078, 0x3d2c, 0x1078, 0x4224, 0x0f7f, 0x007c, 0x708b, 0x0005,
++	0x1078, 0x4289, 0x20a3, 0x1103, 0x20a3, 0x0000, 0x3430, 0x2011,
++	0xab8e, 0x1078, 0x42d4, 0x00c0, 0x3d4c, 0x7074, 0xa005, 0x00c0,
++	0x3d4c, 0x7150, 0xa186, 0xffff, 0x0040, 0x3d4c, 0x1078, 0x419d,
++	0x0040, 0x3d4c, 0x1078, 0x42b8, 0x20a9, 0x0008, 0x2298, 0x26a0,
++	0x53a6, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x0014, 0x1078,
++	0x420b, 0x007c, 0x0f7e, 0x7080, 0xa005, 0x0040, 0x3d84, 0x2011,
++	0x41dc, 0x1078, 0x5a45, 0xa086, 0x0014, 0x00c0, 0x3d82, 0x2079,
++	0xab80, 0x7a30, 0xa296, 0x1103, 0x00c0, 0x3d82, 0x7834, 0xa005,
++	0x00c0, 0x3d82, 0x7a38, 0xd2fc, 0x0040, 0x3d7c, 0x70b0, 0xa005,
++	0x00c0, 0x3d7c, 0x70b3, 0x0001, 0x708b, 0x0006, 0x1078, 0x3d86,
++	0x0078, 0x3d84, 0x1078, 0x4224, 0x0f7f, 0x007c, 0x708b, 0x0007,
++	0x1078, 0x4289, 0x20a3, 0x1104, 0x20a3, 0x0000, 0x3430, 0x2011,
++	0xab8e, 0x1078, 0x42d4, 0x00c0, 0x3dae, 0x7074, 0xa005, 0x00c0,
++	0x3dae, 0x7154, 0xa186, 0xffff, 0x0040, 0x3dae, 0xa180, 0x29c0,
++	0x200c, 0xa18c, 0xff00, 0x810f, 0x1078, 0x419d, 0x0040, 0x3dae,
++	0x1078, 0x3820, 0x0040, 0x3dae, 0x1078, 0x256a, 0x20a9, 0x0008,
++	0x2298, 0x26a0, 0x53a6, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3,
++	0x0014, 0x1078, 0x420b, 0x007c, 0x0f7e, 0x7080, 0xa005, 0x0040,
++	0x3de6, 0x2011, 0x41dc, 0x1078, 0x5a45, 0xa086, 0x0014, 0x00c0,
++	0x3de4, 0x2079, 0xab80, 0x7a30, 0xa296, 0x1104, 0x00c0, 0x3de4,
++	0x7834, 0xa005, 0x00c0, 0x3de4, 0x7a38, 0xd2fc, 0x0040, 0x3dde,
++	0x70b0, 0xa005, 0x00c0, 0x3dde, 0x70b3, 0x0001, 0x708b, 0x0008,
++	0x1078, 0x3de8, 0x0078, 0x3de6, 0x1078, 0x4224, 0x0f7f, 0x007c,
++	0x708b, 0x0009, 0x1078, 0x4289, 0x20a3, 0x1105, 0x20a3, 0x0100,
++	0x3430, 0x1078, 0x42d4, 0x00c0, 0x3e01, 0x7074, 0xa005, 0x00c0,
++	0x3e01, 0x1078, 0x4104, 0x00c0, 0x3e0b, 0xa085, 0x0001, 0x1078,
++	0x256a, 0x20a9, 0x0008, 0x2099, 0xab8e, 0x26a0, 0x53a6, 0x20a3,
++	0x0000, 0x20a3, 0x0000, 0x60c3, 0x0014, 0x1078, 0x420b, 0x007c,
++	0x0f7e, 0x7080, 0xa005, 0x0040, 0x3e51, 0x2011, 0x41dc, 0x1078,
++	0x5a45, 0xa086, 0x0014, 0x00c0, 0x3e4f, 0x2079, 0xab80, 0x7a30,
++	0xa296, 0x1105, 0x00c0, 0x3e4f, 0x7834, 0x2011, 0x0100, 0xa21e,
++	0x00c0, 0x3e3a, 0x7a38, 0xd2fc, 0x0040, 0x3e34, 0x70b0, 0xa005,
++	0x00c0, 0x3e34, 0x70b3, 0x0001, 0x708b, 0x000a, 0x1078, 0x3e53,
++	0x0078, 0x3e51, 0xa005, 0x00c0, 0x3e4f, 0x7a38, 0xd2fc, 0x0040,
++	0x3e47, 0x70b0, 0xa005, 0x00c0, 0x3e47, 0x70b3, 0x0001, 0x7087,
++	0x0000, 0x708b, 0x000e, 0x1078, 0x3edb, 0x0078, 0x3e51, 0x1078,
++	0x4224, 0x0f7f, 0x007c, 0x708b, 0x000b, 0x2011, 0xab0e, 0x22a0,
++	0x20a9, 0x0040, 0x2019, 0xffff, 0x43a4, 0x20a9, 0x0002, 0x2009,
++	0x0000, 0x41a4, 0x1078, 0x4289, 0x20a3, 0x1106, 0x20a3, 0x0000,
++	0x1078, 0x42d4, 0x0040, 0x3e70, 0x2013, 0x0000, 0x0078, 0x3e74,
++	0x6030, 0xa085, 0x0100, 0x2012, 0x2298, 0x20a9, 0x0042, 0x53a6,
++	0x60c3, 0x0084, 0x1078, 0x420b, 0x007c, 0x0f7e, 0x7080, 0xa005,
++	0x0040, 0x3e9d, 0x2011, 0x41dc, 0x1078, 0x5a45, 0xa086, 0x0084,
++	0x00c0, 0x3e9b, 0x2079, 0xab80, 0x7a30, 0xa296, 0x1106, 0x00c0,
++	0x3e9b, 0x7834, 0xa005, 0x00c0, 0x3e9b, 0x708b, 0x000c, 0x1078,
++	0x3e9f, 0x0078, 0x3e9d, 0x1078, 0x4224, 0x0f7f, 0x007c, 0x708b,
++	0x000d, 0x1078, 0x4289, 0x20a3, 0x1107, 0x20a3, 0x0000, 0x2099,
++	0xab8e, 0x20a9, 0x0040, 0x53a6, 0x20a3, 0x0000, 0x20a3, 0x0000,
++	0x60c3, 0x0084, 0x1078, 0x420b, 0x007c, 0x0f7e, 0x7080, 0xa005,
++	0x0040, 0x3ed9, 0x2011, 0x41dc, 0x1078, 0x5a45, 0xa086, 0x0084,
++	0x00c0, 0x3ed7, 0x2079, 0xab80, 0x7a30, 0xa296, 0x1107, 0x00c0,
++	0x3ed7, 0x7834, 0xa005, 0x00c0, 0x3ed7, 0x7087, 0x0001, 0x1078,
++	0x427b, 0x708b, 0x000e, 0x1078, 0x3edb, 0x0078, 0x3ed9, 0x1078,
++	0x4224, 0x0f7f, 0x007c, 0x708b, 0x000f, 0x7083, 0x0000, 0x608b,
++	0xbc85, 0x608f, 0xb5b5, 0x6043, 0x0005, 0x6043, 0x0004, 0x2009,
++	0x07d0, 0x2011, 0x41dc, 0x1078, 0x5a38, 0x007c, 0x7080, 0xa005,
++	0x0040, 0x3ef6, 0x2011, 0x41dc, 0x1078, 0x5a45, 0x007c, 0x708b,
++	0x0011, 0x1078, 0x42d4, 0x00c0, 0x3f14, 0x716c, 0x81ff, 0x0040,
++	0x3f14, 0x2009, 0x0000, 0x7070, 0xa084, 0x00ff, 0x1078, 0x254d,
++	0xa186, 0x007e, 0x0040, 0x3f14, 0xa186, 0x0080, 0x0040, 0x3f14,
++	0x2011, 0xab8e, 0x1078, 0x419d, 0x20e1, 0x9080, 0x20e1, 0x4000,
++	0x2099, 0xab80, 0x20a1, 0x020b, 0x7480, 0xa480, 0x0018, 0xa080,
++	0x0007, 0xa084, 0x03f8, 0x8004, 0x20a8, 0x53a6, 0x60c3, 0x0014,
++	0x1078, 0x420b, 0x007c, 0x0f7e, 0x7080, 0xa005, 0x0040, 0x3f55,
++	0x2011, 0x41dc, 0x1078, 0x5a45, 0xa086, 0x0014, 0x00c0, 0x3f53,
++	0x2079, 0xab80, 0x7a30, 0xa296, 0x1103, 0x00c0, 0x3f53, 0x7834,
++	0xa005, 0x00c0, 0x3f53, 0x7a38, 0xd2fc, 0x0040, 0x3f4d, 0x70b0,
++	0xa005, 0x00c0, 0x3f4d, 0x70b3, 0x0001, 0x708b, 0x0012, 0x1078,
++	0x3f57, 0x0078, 0x3f55, 0x1078, 0x4224, 0x0f7f, 0x007c, 0x708b,
++	0x0013, 0x1078, 0x4295, 0x20a3, 0x1103, 0x20a3, 0x0000, 0x3430,
++	0x2011, 0xab8e, 0x1078, 0x42d4, 0x00c0, 0x3f75, 0x7074, 0xa005,
++	0x00c0, 0x3f75, 0x7150, 0xa186, 0xffff, 0x0040, 0x3f75, 0x1078,
++	0x419d, 0x0040, 0x3f75, 0x1078, 0x42b8, 0x20a9, 0x0008, 0x2298,
++	0x26a0, 0x53a6, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x0014,
++	0x1078, 0x420b, 0x007c, 0x0f7e, 0x7080, 0xa005, 0x0040, 0x3fad,
++	0x2011, 0x41dc, 0x1078, 0x5a45, 0xa086, 0x0014, 0x00c0, 0x3fab,
++	0x2079, 0xab80, 0x7a30, 0xa296, 0x1104, 0x00c0, 0x3fab, 0x7834,
++	0xa005, 0x00c0, 0x3fab, 0x7a38, 0xd2fc, 0x0040, 0x3fa5, 0x70b0,
++	0xa005, 0x00c0, 0x3fa5, 0x70b3, 0x0001, 0x708b, 0x0014, 0x1078,
++	0x3faf, 0x0078, 0x3fad, 0x1078, 0x4224, 0x0f7f, 0x007c, 0x708b,
++	0x0015, 0x1078, 0x4295, 0x20a3, 0x1104, 0x20a3, 0x0000, 0x3430,
++	0x2011, 0xab8e, 0x1078, 0x42d4, 0x00c0, 0x3fd7, 0x7074, 0xa005,
++	0x00c0, 0x3fd7, 0x7154, 0xa186, 0xffff, 0x0040, 0x3fd7, 0xa180,
++	0x29c0, 0x200c, 0xa18c, 0xff00, 0x810f, 0x1078, 0x419d, 0x0040,
++	0x3fd7, 0x1078, 0x3820, 0x0040, 0x3fd7, 0x1078, 0x256a, 0x20a9,
++	0x0008, 0x2298, 0x26a0, 0x53a6, 0x20a3, 0x0000, 0x20a3, 0x0000,
++	0x60c3, 0x0014, 0x1078, 0x420b, 0x007c, 0x0f7e, 0x7080, 0xa005,
++	0x0040, 0x402e, 0x2011, 0x41dc, 0x1078, 0x5a45, 0xa086, 0x0014,
++	0x00c0, 0x402c, 0x2079, 0xab80, 0x7a30, 0xa296, 0x1105, 0x00c0,
++	0x402c, 0x7834, 0x2011, 0x0100, 0xa21e, 0x00c0, 0x400b, 0x7a38,
++	0xd2fc, 0x0040, 0x4009, 0x70b0, 0xa005, 0x00c0, 0x4009, 0x70b3,
++	0x0001, 0x0078, 0x401a, 0xa005, 0x00c0, 0x402c, 0x7a38, 0xd2fc,
++	0x0040, 0x4018, 0x70b0, 0xa005, 0x00c0, 0x4018, 0x70b3, 0x0001,
++	0x7087, 0x0000, 0x7a38, 0xd2f4, 0x0040, 0x4026, 0x2001, 0xa674,
++	0x2004, 0xd0a4, 0x00c0, 0x4026, 0x70cf, 0x0008, 0x708b, 0x0016,
++	0x1078, 0x4030, 0x0078, 0x402e, 0x1078, 0x4224, 0x0f7f, 0x007c,
++	0x20e1, 0x9080, 0x20e1, 0x4000, 0x2099, 0xab80, 0x20a1, 0x020b,
++	0x20a9, 0x000e, 0x53a6, 0x3430, 0x2011, 0xab8e, 0x708b, 0x0017,
++	0x1078, 0x42d4, 0x00c0, 0x4050, 0x7074, 0xa005, 0x00c0, 0x4050,
++	0x1078, 0x4104, 0x00c0, 0x405a, 0xa085, 0x0001, 0x1078, 0x256a,
++	0x20a9, 0x0008, 0x2099, 0xab8e, 0x26a0, 0x53a6, 0x20a3, 0x0000,
++	0x20a3, 0x0000, 0x60c3, 0x0014, 0x1078, 0x420b, 0x007c, 0x0f7e,
++	0x7080, 0xa005, 0x0040, 0x407f, 0x2011, 0x41dc, 0x1078, 0x5a45,
++	0xa086, 0x0084, 0x00c0, 0x407d, 0x2079, 0xab80, 0x7a30, 0xa296,
++	0x1106, 0x00c0, 0x407d, 0x7834, 0xa005, 0x00c0, 0x407d, 0x708b,
++	0x0018, 0x1078, 0x4081, 0x0078, 0x407f, 0x1078, 0x4224, 0x0f7f,
++	0x007c, 0x708b, 0x0019, 0x1078, 0x4295, 0x20a3, 0x1106, 0x20a3,
++	0x0000, 0x3430, 0x2099, 0xab8e, 0x2039, 0xab0e, 0x27a0, 0x20a9,
++	0x0040, 0x53a3, 0x1078, 0x42d4, 0x00c0, 0x40b5, 0x2728, 0x2514,
++	0x8207, 0xa084, 0x00ff, 0x8000, 0x2018, 0xa294, 0x00ff, 0x8007,
++	0xa205, 0x202a, 0x6030, 0x2310, 0x8214, 0xa2a0, 0xab0e, 0x2414,
++	0xa38c, 0x0001, 0x0040, 0x40b0, 0xa294, 0xff00, 0x0078, 0x40b3,
++	0xa294, 0x00ff, 0x8007, 0xa215, 0x2222, 0x2798, 0x26a0, 0x20a9,
++	0x0040, 0x53a6, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x0084,
++	0x1078, 0x420b, 0x007c, 0x0f7e, 0x7080, 0xa005, 0x0040, 0x40e7,
++	0x2011, 0x41dc, 0x1078, 0x5a45, 0xa086, 0x0084, 0x00c0, 0x40e5,
++	0x2079, 0xab80, 0x7a30, 0xa296, 0x1107, 0x00c0, 0x40e5, 0x7834,
++	0xa005, 0x00c0, 0x40e5, 0x7087, 0x0001, 0x1078, 0x427b, 0x708b,
++	0x001a, 0x1078, 0x40e9, 0x0078, 0x40e7, 0x1078, 0x4224, 0x0f7f,
++	0x007c, 0x708b, 0x001b, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x2099,
++	0xab80, 0x20a1, 0x020b, 0x7480, 0xa480, 0x0018, 0xa080, 0x0007,
++	0xa084, 0x03f8, 0x8004, 0x20a8, 0x53a6, 0x60c3, 0x0084, 0x1078,
++	0x420b, 0x007c, 0x007c, 0x007c, 0x087e, 0x097e, 0x2029, 0xa653,
++	0x252c, 0x20a9, 0x0008, 0x2041, 0xab0e, 0x28a0, 0x2099, 0xab8e,
++	0x53a3, 0x20a9, 0x0008, 0x2011, 0x0007, 0xd5d4, 0x0040, 0x411a,
++	0x2011, 0x0000, 0x2800, 0xa200, 0x200c, 0xa1a6, 0xffff, 0x00c0,
++	0x412c, 0xd5d4, 0x0040, 0x4127, 0x8210, 0x0078, 0x4128, 0x8211,
++	0x00f0, 0x411a, 0x0078, 0x4194, 0x82ff, 0x00c0, 0x413e, 0xd5d4,
++	0x0040, 0x4138, 0xa1a6, 0x3fff, 0x0040, 0x4124, 0x0078, 0x413c,
++	0xa1a6, 0x3fff, 0x0040, 0x4194, 0xa18d, 0xc000, 0x20a9, 0x0010,
++	0x2019, 0x0001, 0xd5d4, 0x0040, 0x4147, 0x2019, 0x0010, 0x2120,
++	0xd5d4, 0x0040, 0x414e, 0x8423, 0x0078, 0x414f, 0x8424, 0x00c8,
++	0x415c, 0xd5d4, 0x0040, 0x4157, 0x8319, 0x0078, 0x4158, 0x8318,
++	0x00f0, 0x4148, 0x0078, 0x4194, 0x23a8, 0x2021, 0x0001, 0x8426,
++	0x8425, 0x00f0, 0x4160, 0x2328, 0x8529, 0xa2be, 0x0007, 0x0040,
++	0x4174, 0x007e, 0x2039, 0x0007, 0x2200, 0xa73a, 0x007f, 0x27a8,
++	0xa5a8, 0x0010, 0x00f0, 0x4170, 0x7552, 0xa5c8, 0x29c0, 0x292c,
++	0xa5ac, 0x00ff, 0x6532, 0x60e7, 0x0000, 0x65ea, 0x706f, 0x0000,
++	0x7572, 0x2018, 0x2304, 0xa405, 0x201a, 0x7077, 0x0001, 0x26a0,
++	0x2898, 0x20a9, 0x0008, 0x53a6, 0x20a3, 0x0000, 0x20a3, 0x0000,
++	0xa085, 0x0001, 0x0078, 0x419a, 0xa006, 0x0078, 0x419a, 0xa006,
++	0x1078, 0x1332, 0x097f, 0x087f, 0x007c, 0x2118, 0x2021, 0x0000,
++	0x2001, 0x0007, 0xa39a, 0x0010, 0x0048, 0x41aa, 0x8420, 0x8001,
++	0x0078, 0x41a2, 0x2118, 0x84ff, 0x0040, 0x41b3, 0xa39a, 0x0010,
++	0x8421, 0x00c0, 0x41ae, 0x2021, 0x0001, 0x83ff, 0x0040, 0x41bc,
++	0x8423, 0x8319, 0x00c0, 0x41b8, 0xa238, 0x2704, 0xa42c, 0x00c0,
++	0x41d4, 0xa405, 0x203a, 0x7152, 0xa1a0, 0x29c0, 0x242c, 0xa5ac,
++	0x00ff, 0x6532, 0x60e7, 0x0000, 0x65ea, 0x706f, 0x0000, 0x7572,
++	0x7077, 0x0001, 0xa084, 0x0000, 0x007c, 0x0e7e, 0x2071, 0xa600,
++	0x707b, 0x0000, 0x0e7f, 0x007c, 0x0e7e, 0x0f7e, 0x2001, 0x0002,
++	0x1078, 0x5ae6, 0x2079, 0x0100, 0x2071, 0x0140, 0x1078, 0x6e0f,
++	0x7004, 0xa084, 0x4000, 0x0040, 0x41f1, 0x7003, 0x1000, 0x7003,
++	0x0000, 0x127e, 0x2091, 0x8000, 0x2071, 0xa622, 0x2073, 0x0000,
++	0x7840, 0x027e, 0x017e, 0x2009, 0x00f7, 0x1078, 0x42a1, 0x017f,
++	0xa094, 0x0010, 0xa285, 0x0080, 0x7842, 0x7a42, 0x027f, 0x127f,
++	0x0f7f, 0x0e7f, 0x007c, 0x127e, 0x2091, 0x8000, 0x2011, 0xa8bb,
++	0x2013, 0x0000, 0x7083, 0x0000, 0x127f, 0x20e1, 0x9080, 0x60a3,
++	0x0056, 0x60a7, 0x9575, 0x1078, 0x6e06, 0x2009, 0x07d0, 0x2011,
++	0x41dc, 0x1078, 0x5add, 0x007c, 0x017e, 0x027e, 0x0c7e, 0x127e,
++	0x2091, 0x8000, 0x2011, 0x0003, 0x1078, 0x70e0, 0x2011, 0x0002,
++	0x1078, 0x70ea, 0x1078, 0x6fc4, 0x037e, 0x2019, 0x0000, 0x1078,
++	0x7058, 0x037f, 0x2009, 0x00f7, 0x1078, 0x42a1, 0x2061, 0xa8c4,
++	0x601b, 0x0000, 0x601f, 0x0000, 0x2061, 0xa600, 0x6003, 0x0001,
++	0x2061, 0x0100, 0x6043, 0x0090, 0x6043, 0x0010, 0x2009, 0x002d,
++	0x2011, 0x4259, 0x1078, 0x5a38, 0x127f, 0x0c7f, 0x027f, 0x017f,
++	0x007c, 0x0e7e, 0x007e, 0x127e, 0x2091, 0x8000, 0x2001, 0x0001,
++	0x1078, 0x5ae6, 0x2071, 0x0100, 0x1078, 0x6e0f, 0x2071, 0x0140,
++	0x7004, 0xa084, 0x4000, 0x0040, 0x4271, 0x7003, 0x1000, 0x7003,
++	0x0000, 0x2001, 0x0001, 0x1078, 0x24e8, 0x1078, 0x4224, 0x127f,
++	0x007f, 0x0e7f, 0x007c, 0x20a9, 0x0040, 0x20a1, 0xacc0, 0x2099,
++	0xab8e, 0x3304, 0x8007, 0x20a2, 0x9398, 0x94a0, 0x00f0, 0x4281,
++	0x007c, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x2099, 0xab00, 0x20a1,
++	0x020b, 0x20a9, 0x000c, 0x53a6, 0x007c, 0x20e1, 0x9080, 0x20e1,
++	0x4000, 0x2099, 0xab80, 0x20a1, 0x020b, 0x20a9, 0x000c, 0x53a6,
++	0x007c, 0x0c7e, 0x007e, 0x2061, 0x0100, 0x810f, 0x2001, 0xa62f,
++	0x2004, 0xa005, 0x00c0, 0x42b2, 0x6030, 0xa084, 0x00ff, 0xa105,
++	0x0078, 0x42b4, 0xa185, 0x00f7, 0x604a, 0x007f, 0x0c7f, 0x007c,
++	0x017e, 0x047e, 0x2001, 0xa653, 0x2004, 0xd0a4, 0x0040, 0x42cb,
++	0xa006, 0x2020, 0x2009, 0x002a, 0x1078, 0xa21d, 0x2001, 0xa60c,
++	0x200c, 0xc195, 0x2102, 0x2019, 0x002a, 0x2009, 0x0000, 0x1078,
++	0x284f, 0x047f, 0x017f, 0x007c, 0x007e, 0x2001, 0xa60c, 0x2004,
++	0xd09c, 0x0040, 0x42db, 0x007f, 0x007c, 0x007e, 0x017e, 0x127e,
++	0x2091, 0x8000, 0x2001, 0x0101, 0x200c, 0xa18d, 0x0006, 0x2102,
++	0x127f, 0x017f, 0x007f, 0x007c, 0x157e, 0x20a9, 0x00ff, 0x2009,
++	0xa735, 0xa006, 0x200a, 0x8108, 0x00f0, 0x42f2, 0x157f, 0x007c,
++	0x0d7e, 0x037e, 0x157e, 0x137e, 0x147e, 0x2069, 0xa652, 0xa006,
++	0x6002, 0x6007, 0x0707, 0x600a, 0x600e, 0x6012, 0xa198, 0x29c0,
++	0x231c, 0xa39c, 0x00ff, 0x6316, 0x20a9, 0x0004, 0xac98, 0x0006,
++	0x23a0, 0x40a4, 0x20a9, 0x0004, 0xac98, 0x000a, 0x23a0, 0x40a4,
++	0x603e, 0x6042, 0x604e, 0x6052, 0x6056, 0x605a, 0x605e, 0x6062,
++	0x6066, 0x606a, 0x606e, 0x6072, 0x6076, 0x607a, 0x607e, 0x6082,
++	0x6086, 0x608a, 0x608e, 0x6092, 0x6096, 0x609a, 0x609e, 0x60ae,
++	0x61a2, 0x0d7e, 0x60a4, 0xa06d, 0x0040, 0x4338, 0x1078, 0x13a4,
++	0x60a7, 0x0000, 0x60a8, 0xa06d, 0x0040, 0x4340, 0x1078, 0x13a4,
++	0x60ab, 0x0000, 0x0d7f, 0xa006, 0x604a, 0x6810, 0x603a, 0x680c,
++	0x6046, 0x6814, 0xa084, 0x00ff, 0x6042, 0x147f, 0x137f, 0x157f,
++	0x037f, 0x0d7f, 0x007c, 0x127e, 0x2091, 0x8000, 0x6944, 0x6e48,
++	0xa684, 0x3fff, 0xa082, 0x4000, 0x00c8, 0x4424, 0xa18c, 0xff00,
++	0x810f, 0xa182, 0x00ff, 0x00c8, 0x442a, 0x2001, 0xa60c, 0x2004,
++	0xa084, 0x0003, 0x0040, 0x4385, 0x2001, 0xa60c, 0x2004, 0xd084,
++	0x00c0, 0x4405, 0xa188, 0xa735, 0x2104, 0xa065, 0x0040, 0x4405,
++	0x6004, 0xa084, 0x00ff, 0xa08e, 0x0006, 0x00c0, 0x4405, 0x6000,
++	0xd0c4, 0x0040, 0x4405, 0x0078, 0x4392, 0xa188, 0xa735, 0x2104,
++	0xa065, 0x0040, 0x43e9, 0x6004, 0xa084, 0x00ff, 0xa08e, 0x0006,
++	0x00c0, 0x43ef, 0x60a4, 0xa00d, 0x0040, 0x439a, 0x1078, 0x4817,
++	0x0040, 0x43e3, 0x60a8, 0xa00d, 0x0040, 0x43b4, 0x1078, 0x486a,
++	0x00c0, 0x43b4, 0x694c, 0xd1fc, 0x00c0, 0x43aa, 0x1078, 0x44df,
++	0x0078, 0x43de, 0x1078, 0x4484, 0x694c, 0xd1ec, 0x00c0, 0x43de,
++	0x1078, 0x46d6, 0x0078, 0x43de, 0x694c, 0xa184, 0xa000, 0x0040,
++	0x43ce, 0xd1ec, 0x0040, 0x43c7, 0xd1fc, 0x0040, 0x43c3, 0x1078,
++	0x46e7, 0x0078, 0x43ca, 0x1078, 0x46e7, 0x0078, 0x43ce, 0xd1fc,
++	0x0040, 0x43ce, 0x1078, 0x4484, 0x0078, 0x43de, 0x6050, 0xa00d,
++	0x0040, 0x43d9, 0x2d00, 0x200a, 0x6803, 0x0000, 0x6052, 0x0078,
++	0x43de, 0x2d00, 0x6052, 0x604e, 0x6803, 0x0000, 0x1078, 0x5da9,
++	0xa006, 0x127f, 0x007c, 0x2001, 0x0005, 0x2009, 0x0000, 0x0078,
++	0x442e, 0x2001, 0x0028, 0x2009, 0x0000, 0x0078, 0x442e, 0xa082,
++	0x0006, 0x00c8, 0x4405, 0x60a0, 0xd0bc, 0x00c0, 0x4401, 0x6100,
++	0xd1fc, 0x0040, 0x4392, 0x2001, 0x0029, 0x2009, 0x1000, 0x0078,
++	0x442e, 0x2001, 0x0028, 0x0078, 0x4420, 0x2009, 0xa60c, 0x210c,
++	0xd18c, 0x0040, 0x440f, 0x2001, 0x0004, 0x0078, 0x4420, 0xd184,
++	0x0040, 0x4416, 0x2001, 0x0004, 0x0078, 0x4420, 0x2001, 0x0029,
++	0x6100, 0xd1fc, 0x0040, 0x4420, 0x2009, 0x1000, 0x0078, 0x442e,
++	0x2009, 0x0000, 0x0078, 0x442e, 0x2001, 0x0029, 0x2009, 0x0000,
++	0x0078, 0x442e, 0x2001, 0x0029, 0x2009, 0x0000, 0xa005, 0x127f,
++	0x007c, 0x6944, 0x6e48, 0xa684, 0x3fff, 0xa082, 0x4000, 0x00c8,
++	0x447e, 0xa18c, 0xff00, 0x810f, 0xa182, 0x00ff, 0x00c8, 0x4464,
++	0xa188, 0xa735, 0x2104, 0xa065, 0x0040, 0x4464, 0x6004, 0xa084,
++	0x00ff, 0xa08e, 0x0006, 0x00c0, 0x446a, 0x684c, 0xd0ec, 0x0040,
++	0x4457, 0x1078, 0x46e7, 0x1078, 0x4484, 0x0078, 0x445f, 0x1078,
++	0x4484, 0x684c, 0xd0fc, 0x0040, 0x445f, 0x1078, 0x46d6, 0x1078,
++	0x472f, 0xa006, 0x0078, 0x4482, 0x2001, 0x0028, 0x2009, 0x0000,
++	0x0078, 0x4482, 0xa082, 0x0006, 0x00c8, 0x4478, 0x6100, 0xd1fc,
++	0x0040, 0x444d, 0x2001, 0x0029, 0x2009, 0x1000, 0x0078, 0x4482,
++	0x2001, 0x0029, 0x2009, 0x0000, 0x0078, 0x4482, 0x2001, 0x0029,
++	0x2009, 0x0000, 0xa005, 0x007c, 0x127e, 0x2091, 0x8000, 0x6050,
++	0xa00d, 0x0040, 0x4492, 0x2d00, 0x200a, 0x6803, 0x0000, 0x6052,
++	0x127f, 0x007c, 0x2d00, 0x6052, 0x604e, 0x6803, 0x0000, 0x0078,
++	0x4490, 0x127e, 0x2091, 0x8000, 0x604c, 0xa005, 0x0040, 0x44af,
++	0x0e7e, 0x2071, 0xa8b1, 0x7004, 0xa086, 0x0002, 0x0040, 0x44b6,
++	0x0e7f, 0x604c, 0x6802, 0x2d00, 0x604e, 0x127f, 0x007c, 0x2d00,
++	0x6052, 0x604e, 0x6803, 0x0000, 0x0078, 0x44ad, 0x701c, 0xac06,
++	0x00c0, 0x44a8, 0x604c, 0x2070, 0x7000, 0x6802, 0x2d00, 0x7002,
++	0x0e7f, 0x127f, 0x007c, 0x127e, 0x2091, 0x8000, 0x604c, 0xa06d,
++	0x0040, 0x44d1, 0x6800, 0xa005, 0x00c0, 0x44cf, 0x6052, 0x604e,
++	0xad05, 0x127f, 0x007c, 0x604c, 0xa06d, 0x0040, 0x44de, 0x6800,
++	0xa005, 0x00c0, 0x44dc, 0x6052, 0x604e, 0xad05, 0x007c, 0x6803,
++	0x0000, 0x6084, 0xa00d, 0x0040, 0x44e9, 0x2d00, 0x200a, 0x6086,
++	0x007c, 0x2d00, 0x6086, 0x6082, 0x0078, 0x44e8, 0x127e, 0x0c7e,
++	0x027e, 0x2091, 0x8000, 0x6218, 0x2260, 0x6200, 0xa005, 0x0040,
++	0x44fc, 0xc285, 0x0078, 0x44fd, 0xc284, 0x6202, 0x027f, 0x0c7f,
++	0x127f, 0x007c, 0x127e, 0x0c7e, 0x2091, 0x8000, 0x6218, 0x2260,
++	0x6204, 0x007e, 0xa086, 0x0006, 0x00c0, 0x4521, 0x609c, 0xd0ac,
++	0x0040, 0x4521, 0x2001, 0xa653, 0x2004, 0xd0a4, 0x0040, 0x4521,
++	0xa284, 0xff00, 0x8007, 0xa086, 0x0007, 0x00c0, 0x4521, 0x2011,
++	0x0600, 0x007f, 0xa294, 0xff00, 0xa215, 0x6206, 0x007e, 0xa086,
++	0x0006, 0x00c0, 0x4531, 0x6290, 0x82ff, 0x00c0, 0x4531, 0x1078,
++	0x1332, 0x007f, 0x0c7f, 0x127f, 0x007c, 0x127e, 0x0c7e, 0x2091,
++	0x8000, 0x6218, 0x2260, 0x6204, 0x007e, 0xa086, 0x0006, 0x00c0,
++	0x4553, 0x609c, 0xd0a4, 0x0040, 0x4553, 0x2001, 0xa653, 0x2004,
++	0xd0ac, 0x00c0, 0x4553, 0xa284, 0x00ff, 0xa086, 0x0007, 0x00c0,
++	0x4553, 0x2011, 0x0006, 0x007f, 0xa294, 0x00ff, 0x8007, 0xa215,
++	0x6206, 0x0c7f, 0x127f, 0x007c, 0x027e, 0xa182, 0x00ff, 0x0048,
++	0x4565, 0xa085, 0x0001, 0x0078, 0x457d, 0xa190, 0xa735, 0x2204,
++	0xa065, 0x00c0, 0x457c, 0x017e, 0x0d7e, 0x1078, 0x1370, 0x2d60,
++	0x0d7f, 0x017f, 0x0040, 0x4561, 0x2c00, 0x2012, 0x60a7, 0x0000,
++	0x60ab, 0x0000, 0x1078, 0x42f8, 0xa006, 0x027f, 0x007c, 0x127e,
++	0x2091, 0x8000, 0x027e, 0xa182, 0x00ff, 0x0048, 0x458b, 0xa085,
++	0x0001, 0x0078, 0x45c1, 0x0d7e, 0xa190, 0xa735, 0x2204, 0xa06d,
++	0x0040, 0x45bf, 0x2013, 0x0000, 0x0d7e, 0x0c7e, 0x2d60, 0x60a4,
++	0xa06d, 0x0040, 0x459d, 0x1078, 0x13a4, 0x60a8, 0xa06d, 0x0040,
++	0x45a3, 0x1078, 0x13a4, 0x0c7f, 0x0d7f, 0x0d7e, 0x0c7e, 0x68ac,
++	0x2060, 0x8cff, 0x0040, 0x45bb, 0x600c, 0x007e, 0x6010, 0x2068,
++	0x1078, 0x8d06, 0x0040, 0x45b6, 0x1078, 0x13b4, 0x1078, 0x772d,
++	0x0c7f, 0x0078, 0x45a9, 0x0c7f, 0x0d7f, 0x1078, 0x13a4, 0x0d7f,
++	0xa006, 0x027f, 0x127f, 0x007c, 0x017e, 0xa182, 0x00ff, 0x0048,
++	0x45cd, 0xa085, 0x0001, 0x0078, 0x45d4, 0xa188, 0xa735, 0x2104,
++	0xa065, 0x0040, 0x45c9, 0xa006, 0x017f, 0x007c, 0x0d7e, 0x157e,
++	0x137e, 0x147e, 0x600b, 0x0000, 0x600f, 0x0000, 0x6000, 0xc08c,
++	0x6002, 0x2069, 0xab8e, 0x6808, 0x605e, 0x6810, 0x6062, 0x6138,
++	0xa10a, 0x0048, 0x45ec, 0x603a, 0x6814, 0x6066, 0x2099, 0xab96,
++	0xac88, 0x000a, 0x21a0, 0x20a9, 0x0004, 0x53a3, 0x2099, 0xab9a,
++	0xac88, 0x0006, 0x21a0, 0x20a9, 0x0004, 0x53a3, 0x2069, 0xabae,
++	0x6808, 0x606a, 0x690c, 0x616e, 0x6810, 0x6072, 0x6818, 0x6076,
++	0x60a0, 0xa086, 0x007e, 0x00c0, 0x4611, 0x2069, 0xab8e, 0x690c,
++	0x616e, 0xa182, 0x0211, 0x00c8, 0x4619, 0x2009, 0x0008, 0x0078,
++	0x4643, 0xa182, 0x0259, 0x00c8, 0x4621, 0x2009, 0x0007, 0x0078,
++	0x4643, 0xa182, 0x02c1, 0x00c8, 0x4629, 0x2009, 0x0006, 0x0078,
++	0x4643, 0xa182, 0x0349, 0x00c8, 0x4631, 0x2009, 0x0005, 0x0078,
++	0x4643, 0xa182, 0x0421, 0x00c8, 0x4639, 0x2009, 0x0004, 0x0078,
++	0x4643, 0xa182, 0x0581, 0x00c8, 0x4641, 0x2009, 0x0003, 0x0078,
++	0x4643, 0x2009, 0x0002, 0x6192, 0x147f, 0x137f, 0x157f, 0x0d7f,
++	0x007c, 0x017e, 0x027e, 0x0e7e, 0x2071, 0xab8d, 0x2e04, 0x6896,
++	0x2071, 0xab8e, 0x7004, 0x689a, 0x701c, 0x689e, 0x6a00, 0x2009,
++	0xa672, 0x210c, 0xd0bc, 0x0040, 0x4663, 0xd1ec, 0x0040, 0x4663,
++	0xc2ad, 0x0078, 0x4664, 0xc2ac, 0xd0c4, 0x0040, 0x466d, 0xd1e4,
++	0x0040, 0x466d, 0xc2bd, 0x0078, 0x466e, 0xc2bc, 0x6a02, 0x0e7f,
++	0x027f, 0x017f, 0x007c, 0x0d7e, 0x127e, 0x2091, 0x8000, 0x60a4,
++	0xa06d, 0x0040, 0x4697, 0x6900, 0x81ff, 0x00c0, 0x46ab, 0x6a04,
++	0xa282, 0x0010, 0x00c8, 0x46b0, 0xad88, 0x0004, 0x20a9, 0x0010,
++	0x2104, 0xa086, 0xffff, 0x0040, 0x4692, 0x8108, 0x00f0, 0x4688,
++	0x1078, 0x1332, 0x260a, 0x8210, 0x6a06, 0x0078, 0x46ab, 0x1078,
++	0x138b, 0x0040, 0x46b0, 0x2d00, 0x60a6, 0x6803, 0x0000, 0xad88,
++	0x0004, 0x20a9, 0x0010, 0x200b, 0xffff, 0x8108, 0x00f0, 0x46a3,
++	0x6807, 0x0001, 0x6e12, 0xa085, 0x0001, 0x127f, 0x0d7f, 0x007c,
++	0xa006, 0x0078, 0x46ad, 0x127e, 0x2091, 0x8000, 0x0d7e, 0x60a4,
++	0xa00d, 0x0040, 0x46d3, 0x2168, 0x6800, 0xa005, 0x00c0, 0x46cf,
++	0x1078, 0x4817, 0x00c0, 0x46d3, 0x200b, 0xffff, 0x6804, 0xa08a,
++	0x0002, 0x0048, 0x46cf, 0x8001, 0x6806, 0x0078, 0x46d3, 0x1078,
++	0x13a4, 0x60a7, 0x0000, 0x0d7f, 0x127f, 0x007c, 0x127e, 0x2091,
++	0x8000, 0x1078, 0x487f, 0x0078, 0x46df, 0x1078, 0x4484, 0x1078,
++	0x4775, 0x00c0, 0x46dd, 0x1078, 0x472f, 0x127f, 0x007c, 0x0d7e,
++	0x127e, 0x2091, 0x8000, 0x60a8, 0xa06d, 0x0040, 0x470b, 0x6950,
++	0x81ff, 0x00c0, 0x471f, 0x6a54, 0xa282, 0x0010, 0x00c8, 0x472c,
++	0xad88, 0x0018, 0x20a9, 0x0010, 0x2104, 0xa086, 0xffff, 0x0040,
++	0x4706, 0x8108, 0x00f0, 0x46fc, 0x1078, 0x1332, 0x260a, 0x8210,
++	0x6a56, 0x0078, 0x471f, 0x1078, 0x138b, 0x0040, 0x472c, 0x2d00,
++	0x60aa, 0x6853, 0x0000, 0xad88, 0x0018, 0x20a9, 0x0010, 0x200b,
++	0xffff, 0x8108, 0x00f0, 0x4717, 0x6857, 0x0001, 0x6e62, 0x0078,
++	0x4723, 0x1078, 0x44df, 0x1078, 0x4739, 0x00c0, 0x4721, 0xa085,
++	0x0001, 0x127f, 0x0d7f, 0x007c, 0xa006, 0x0078, 0x4729, 0x127e,
++	0x2091, 0x8000, 0x1078, 0x5da9, 0x127f, 0x007c, 0xa01e, 0x0078,
++	0x473b, 0x2019, 0x0001, 0xa00e, 0x127e, 0x2091, 0x8000, 0x604c,
++	0x2068, 0x6000, 0xd0dc, 0x00c0, 0x4759, 0x8dff, 0x0040, 0x4770,
++	0x83ff, 0x0040, 0x4751, 0x6848, 0xa606, 0x0040, 0x475e, 0x0078,
++	0x4759, 0x683c, 0xa406, 0x00c0, 0x4759, 0x6840, 0xa506, 0x0040,
++	0x475e, 0x2d08, 0x6800, 0x2068, 0x0078, 0x4745, 0x1078, 0x7233,
++	0x6a00, 0x604c, 0xad06, 0x00c0, 0x4768, 0x624e, 0x0078, 0x476b,
++	0xa180, 0x0000, 0x2202, 0x82ff, 0x00c0, 0x4770, 0x6152, 0x8dff,
++	0x127f, 0x007c, 0xa01e, 0x0078, 0x4777, 0x2019, 0x0001, 0xa00e,
++	0x6080, 0x2068, 0x8dff, 0x0040, 0x47a3, 0x83ff, 0x0040, 0x4786,
++	0x6848, 0xa606, 0x0040, 0x4793, 0x0078, 0x478e, 0x683c, 0xa406,
++	0x00c0, 0x478e, 0x6840, 0xa506, 0x0040, 0x4793, 0x2d08, 0x6800,
++	0x2068, 0x0078, 0x477a, 0x6a00, 0x6080, 0xad06, 0x00c0, 0x479b,
++	0x6282, 0x0078, 0x479e, 0xa180, 0x0000, 0x2202, 0x82ff, 0x00c0,
++	0x47a3, 0x6186, 0x8dff, 0x007c, 0xa016, 0x1078, 0x4810, 0x00c0,
++	0x47ab, 0x2011, 0x0001, 0x1078, 0x4863, 0x00c0, 0x47b1, 0xa295,
++	0x0002, 0x007c, 0x1078, 0x489b, 0x0040, 0x47ba, 0x1078, 0x8dca,
++	0x0078, 0x47bc, 0xa085, 0x0001, 0x007c, 0x1078, 0x489b, 0x0040,
++	0x47c5, 0x1078, 0x8d62, 0x0078, 0x47c7, 0xa085, 0x0001, 0x007c,
++	0x1078, 0x489b, 0x0040, 0x47d0, 0x1078, 0x8dac, 0x0078, 0x47d2,
++	0xa085, 0x0001, 0x007c, 0x1078, 0x489b, 0x0040, 0x47db, 0x1078,
++	0x8d7e, 0x0078, 0x47dd, 0xa085, 0x0001, 0x007c, 0x1078, 0x489b,
++	0x0040, 0x47e6, 0x1078, 0x8de8, 0x0078, 0x47e8, 0xa085, 0x0001,
++	0x007c, 0x127e, 0x007e, 0x0d7e, 0x2091, 0x8000, 0x6080, 0xa06d,
++	0x0040, 0x4808, 0x6800, 0x007e, 0x6837, 0x0103, 0x6b4a, 0x6847,
++	0x0000, 0x1078, 0x8f7d, 0x007e, 0x6000, 0xd0fc, 0x0040, 0x4802,
++	0x1078, 0xa4ed, 0x007f, 0x1078, 0x4a73, 0x007f, 0x0078, 0x47ef,
++	0x6083, 0x0000, 0x6087, 0x0000, 0x0d7f, 0x007f, 0x127f, 0x007c,
++	0x60a4, 0xa00d, 0x00c0, 0x4817, 0xa085, 0x0001, 0x007c, 0x0e7e,
++	0x2170, 0x7000, 0xa005, 0x00c0, 0x482c, 0x20a9, 0x0010, 0xae88,
++	0x0004, 0x2104, 0xa606, 0x0040, 0x482c, 0x8108, 0x00f0, 0x4821,
++	0xa085, 0x0001, 0x0078, 0x482d, 0xa006, 0x0e7f, 0x007c, 0x0d7e,
++	0x127e, 0x2091, 0x8000, 0x60a4, 0xa06d, 0x00c0, 0x483d, 0x1078,
++	0x138b, 0x0040, 0x484f, 0x2d00, 0x60a6, 0x6803, 0x0001, 0x6807,
++	0x0000, 0xad88, 0x0004, 0x20a9, 0x0010, 0x200b, 0xffff, 0x8108,
++	0x00f0, 0x4845, 0xa085, 0x0001, 0x127f, 0x0d7f, 0x007c, 0xa006,
++	0x0078, 0x484c, 0x0d7e, 0x127e, 0x2091, 0x8000, 0x60a4, 0xa06d,
++	0x0040, 0x4860, 0x60a7, 0x0000, 0x1078, 0x13a4, 0xa085, 0x0001,
++	0x127f, 0x0d7f, 0x007c, 0x60a8, 0xa00d, 0x00c0, 0x486a, 0xa085,
++	0x0001, 0x007c, 0x0e7e, 0x2170, 0x7050, 0xa005, 0x00c0, 0x487d,
++	0x20a9, 0x0010, 0xae88, 0x0018, 0x2104, 0xa606, 0x0040, 0x487d,
++	0x8108, 0x00f0, 0x4874, 0xa085, 0x0001, 0x0e7f, 0x007c, 0x127e,
++	0x2091, 0x8000, 0x1078, 0x4863, 0x00c0, 0x4899, 0x200b, 0xffff,
++	0x0d7e, 0x60a8, 0x2068, 0x6854, 0xa08a, 0x0002, 0x0048, 0x4894,
++	0x8001, 0x6856, 0x0078, 0x4898, 0x1078, 0x13a4, 0x60ab, 0x0000,
++	0x0d7f, 0x127f, 0x007c, 0x609c, 0xd0a4, 0x007c, 0x0f7e, 0x71b0,
++	0x81ff, 0x00c0, 0x48b9, 0x71cc, 0xd19c, 0x0040, 0x48b9, 0x2001,
++	0x007e, 0xa080, 0xa735, 0x2004, 0xa07d, 0x0040, 0x48b9, 0x7804,
++	0xa084, 0x00ff, 0xa086, 0x0006, 0x00c0, 0x48b9, 0x7800, 0xc0ed,
++	0x7802, 0x2079, 0xa652, 0x7804, 0xd0a4, 0x0040, 0x48df, 0x157e,
++	0x0c7e, 0x20a9, 0x007f, 0x2009, 0x0000, 0x017e, 0x1078, 0x45c4,
++	0x00c0, 0x48d9, 0x6004, 0xa084, 0xff00, 0x8007, 0xa096, 0x0004,
++	0x0040, 0x48d6, 0xa086, 0x0006, 0x00c0, 0x48d9, 0x6000, 0xc0ed,
++	0x6002, 0x017f, 0x8108, 0x00f0, 0x48c5, 0x0c7f, 0x157f, 0x1078,
++	0x4967, 0x0040, 0x48e8, 0x2001, 0xa8a1, 0x200c, 0x0078, 0x48f0,
++	0x2079, 0xa652, 0x7804, 0xd0a4, 0x0040, 0x48f4, 0x2009, 0x07d0,
++	0x2011, 0x48f6, 0x1078, 0x5add, 0x0f7f, 0x007c, 0x2011, 0x48f6,
++	0x1078, 0x5a45, 0x1078, 0x4967, 0x0040, 0x491e, 0x2001, 0xa7b3,
++	0x2004, 0xa080, 0x0000, 0x200c, 0xc1ec, 0x2102, 0x2001, 0xa653,
++	0x2004, 0xd0a4, 0x0040, 0x4912, 0x2009, 0x07d0, 0x2011, 0x48f6,
++	0x1078, 0x5add, 0x0e7e, 0x2071, 0xa600, 0x706f, 0x0000, 0x7073,
++	0x0000, 0x1078, 0x2677, 0x0e7f, 0x0078, 0x4956, 0x157e, 0x0c7e,
++	0x20a9, 0x007f, 0x2009, 0x0000, 0x017e, 0x1078, 0x45c4, 0x00c0,
++	0x4950, 0x6000, 0xd0ec, 0x0040, 0x4950, 0x047e, 0x62a0, 0xa294,
++	0x00ff, 0x8227, 0xa006, 0x2009, 0x0029, 0x1078, 0xa21d, 0x6000,
++	0xc0e5, 0xc0ec, 0x6002, 0x6004, 0xa084, 0x00ff, 0xa085, 0x0700,
++	0x6006, 0x2019, 0x0029, 0x1078, 0x5f01, 0x077e, 0x2039, 0x0000,
++	0x1078, 0x5e0a, 0x2009, 0x0000, 0x1078, 0x9f8b, 0x077f, 0x047f,
++	0x017f, 0x8108, 0x00f0, 0x4924, 0x0c7f, 0x157f, 0x007c, 0x0c7e,
++	0x6018, 0x2060, 0x6000, 0xc0ec, 0x6002, 0x0c7f, 0x007c, 0x7818,
++	0x2004, 0xd0ac, 0x007c, 0x7818, 0x2004, 0xd0bc, 0x007c, 0x0f7e,
++	0x2001, 0xa7b3, 0x2004, 0xa07d, 0x0040, 0x4970, 0x7800, 0xd0ec,
++	0x0f7f, 0x007c, 0x127e, 0x027e, 0x2091, 0x8000, 0x007e, 0x62a0,
++	0xa290, 0xa735, 0x2204, 0xac06, 0x10c0, 0x1332, 0x007f, 0x6200,
++	0xa005, 0x0040, 0x4986, 0xc2fd, 0x0078, 0x4987, 0xc2fc, 0x6202,
++	0x027f, 0x127f, 0x007c, 0x2011, 0xa633, 0x2204, 0xd0cc, 0x0040,
++	0x4998, 0x2001, 0xa89f, 0x200c, 0x2011, 0x4999, 0x1078, 0x5add,
++	0x007c, 0x2011, 0x4999, 0x1078, 0x5a45, 0x2011, 0xa633, 0x2204,
++	0xc0cc, 0x2012, 0x007c, 0x2071, 0xa714, 0x7003, 0x0001, 0x7007,
++	0x0000, 0x7013, 0x0000, 0x7017, 0x0000, 0x701b, 0x0000, 0x701f,
++	0x0000, 0x700b, 0x0000, 0x704b, 0x0001, 0x704f, 0x0000, 0x705b,
++	0x0020, 0x705f, 0x0040, 0x707f, 0x0000, 0x2071, 0xa87d, 0x7003,
++	0xa714, 0x7007, 0x0000, 0x700b, 0x0000, 0x700f, 0xa85d, 0x7013,
++	0x0020, 0x7017, 0x0040, 0x7037, 0x0000, 0x007c, 0x017e, 0x0e7e,
++	0x2071, 0xa835, 0xa00e, 0x7186, 0x718a, 0x7097, 0x0001, 0x2001,
++	0xa653, 0x2004, 0xd0fc, 0x00c0, 0x49e8, 0x2001, 0xa653, 0x2004,
++	0xa00e, 0xd09c, 0x0040, 0x49e5, 0x8108, 0x7102, 0x0078, 0x4a3b,
++	0x2001, 0xa672, 0x200c, 0xa184, 0x000f, 0x2009, 0xa673, 0x210c,
++	0x0079, 0x49f2, 0x49dd, 0x4a13, 0x4a1b, 0x4a26, 0x4a2c, 0x49dd,
++	0x49dd, 0x49dd, 0x4a02, 0x49dd, 0x49dd, 0x49dd, 0x49dd, 0x49dd,
++	0x49dd, 0x49dd, 0x7003, 0x0004, 0x137e, 0x147e, 0x157e, 0x2099,
++	0xa676, 0x20a1, 0xa886, 0x20a9, 0x0004, 0x53a3, 0x157f, 0x147f,
++	0x137f, 0x0078, 0x4a3b, 0x708f, 0x0005, 0x7007, 0x0122, 0x2001,
++	0x0002, 0x0078, 0x4a21, 0x708f, 0x0002, 0x7007, 0x0121, 0x2001,
++	0x0003, 0x7002, 0x7097, 0x0001, 0x0078, 0x4a38, 0x7007, 0x0122,
++	0x2001, 0x0002, 0x0078, 0x4a30, 0x7007, 0x0121, 0x2001, 0x0003,
++	0x7002, 0xa006, 0x7096, 0x708e, 0xa184, 0xff00, 0x8007, 0x709a,
++	0xa184, 0x00ff, 0x7092, 0x0e7f, 0x017f, 0x007c, 0x0e7e, 0x2071,
++	0xa714, 0x684c, 0xa005, 0x00c0, 0x4a4c, 0x7028, 0xc085, 0x702a,
++	0xa085, 0x0001, 0x0078, 0x4a71, 0x6a60, 0x7236, 0x6b64, 0x733a,
++	0x6868, 0x703e, 0x7076, 0x686c, 0x7042, 0x707a, 0x684c, 0x702e,
++	0x6844, 0x7032, 0x2009, 0x000d, 0x200a, 0x700b, 0x0000, 0x8007,
++	0x8006, 0x8006, 0xa08c, 0x003f, 0xa084, 0xffc0, 0xa210, 0x2100,
++	0xa319, 0x726e, 0x7372, 0x7028, 0xc084, 0x702a, 0x7007, 0x0001,
++	0xa006, 0x0e7f, 0x007c, 0x0e7e, 0x027e, 0x6838, 0xd0fc, 0x00c0,
++	0x4ac9, 0x6804, 0xa00d, 0x0040, 0x4a8f, 0x0d7e, 0x2071, 0xa600,
++	0xa016, 0x702c, 0x2168, 0x6904, 0x206a, 0x8210, 0x2d00, 0x81ff,
++	0x00c0, 0x4a82, 0x702e, 0x70ac, 0xa200, 0x70ae, 0x0d7f, 0x2071,
++	0xa714, 0x701c, 0xa005, 0x00c0, 0x4adb, 0x0068, 0x4ad9, 0x2071,
++	0xa835, 0x7200, 0x82ff, 0x0040, 0x4ad9, 0x6934, 0xa186, 0x0103,
++	0x00c0, 0x4aec, 0x6948, 0x6844, 0xa105, 0x00c0, 0x4acc, 0x2009,
++	0x8020, 0x2200, 0x0079, 0x4aac, 0x4ad9, 0x4ab1, 0x4b09, 0x4b17,
++	0x4ad9, 0x2071, 0x0000, 0x7018, 0xd084, 0x00c0, 0x4ad9, 0x7122,
++	0x683c, 0x7026, 0x6840, 0x702a, 0x701b, 0x0001, 0x2091, 0x4080,
++	0x2071, 0xa600, 0x702c, 0x206a, 0x2d00, 0x702e, 0x70ac, 0x8000,
++	0x70ae, 0x027f, 0x0e7f, 0x007c, 0x6844, 0xa086, 0x0100, 0x00c0,
++	0x4ad9, 0x6868, 0xa005, 0x00c0, 0x4ad9, 0x2009, 0x8020, 0x0078,
++	0x4aa9, 0x2071, 0xa714, 0x2d08, 0x206b, 0x0000, 0x7010, 0x8000,
++	0x7012, 0x7018, 0xa06d, 0x711a, 0x0040, 0x4ae9, 0x6902, 0x0078,
++	0x4aea, 0x711e, 0x0078, 0x4ac9, 0xa18c, 0x00ff, 0xa186, 0x0017,
++	0x0040, 0x4afa, 0xa186, 0x001e, 0x0040, 0x4afa, 0xa18e, 0x001f,
++	0x00c0, 0x4ad9, 0x684c, 0xd0cc, 0x0040, 0x4ad9, 0x6850, 0xa084,
++	0x00ff, 0xa086, 0x0001, 0x00c0, 0x4ad9, 0x2009, 0x8021, 0x0078,
++	0x4aa9, 0x7084, 0x8008, 0xa092, 0x001e, 0x00c8, 0x4ad9, 0x7186,
++	0xae90, 0x0003, 0xa210, 0x683c, 0x2012, 0x0078, 0x4b27, 0x7084,
++	0x8008, 0xa092, 0x000f, 0x00c8, 0x4ad9, 0x7186, 0xae90, 0x0003,
++	0x8003, 0xa210, 0x683c, 0x2012, 0x8210, 0x6840, 0x2012, 0x7088,
++	0xa10a, 0x0048, 0x4ac0, 0x718c, 0x7084, 0xa10a, 0x0048, 0x4ac0,
++	0x2071, 0x0000, 0x7018, 0xd084, 0x00c0, 0x4ac0, 0x2071, 0xa835,
++	0x7000, 0xa086, 0x0002, 0x00c0, 0x4b47, 0x1078, 0x4dc3, 0x2071,
++	0x0000, 0x701b, 0x0001, 0x2091, 0x4080, 0x0078, 0x4ac0, 0x1078,
++	0x4dee, 0x2071, 0x0000, 0x701b, 0x0001, 0x2091, 0x4080, 0x0078,
++	0x4ac0, 0x007e, 0x684c, 0x007e, 0x6837, 0x0103, 0x20a9, 0x001c,
++	0xad80, 0x0011, 0x20a0, 0x2001, 0x0000, 0x40a4, 0x007f, 0xa084,
++	0x00ff, 0x684e, 0x007f, 0x684a, 0x6952, 0x007c, 0x2071, 0xa714,
++	0x7004, 0x0079, 0x4b6b, 0x4b75, 0x4b86, 0x4d94, 0x4d95, 0x4dbc,
++	0x4dc2, 0x4b76, 0x4d82, 0x4d23, 0x4da5, 0x007c, 0x127e, 0x2091,
++	0x8000, 0x0068, 0x4b85, 0x2009, 0x000d, 0x7030, 0x200a, 0x2091,
++	0x4080, 0x7007, 0x0001, 0x700b, 0x0000, 0x127f, 0x2069, 0xa8c4,
++	0x6844, 0xa005, 0x0050, 0x4bae, 0x00c0, 0x4bae, 0x127e, 0x2091,
++	0x8000, 0x2069, 0x0000, 0x6934, 0x2001, 0xa720, 0x2004, 0xa10a,
++	0x0040, 0x4ba9, 0x0068, 0x4bad, 0x2069, 0x0000, 0x6818, 0xd084,
++	0x00c0, 0x4bad, 0x2009, 0x8040, 0x6922, 0x681b, 0x0001, 0x2091,
++	0x4080, 0x2069, 0xa8c4, 0x6847, 0xffff, 0x127f, 0x2069, 0xa600,
++	0x6848, 0x6964, 0xa102, 0x2069, 0xa835, 0x688a, 0x6984, 0x701c,
++	0xa06d, 0x0040, 0x4bc0, 0x81ff, 0x0040, 0x4c08, 0x0078, 0x4bd6,
++	0x81ff, 0x0040, 0x4cda, 0x2071, 0xa835, 0x7184, 0x7088, 0xa10a,
++	0x00c8, 0x4bd6, 0x7190, 0x2071, 0xa8c4, 0x7040, 0xa005, 0x0040,
++	0x4bd6, 0x00d0, 0x4cda, 0x7142, 0x0078, 0x4cda, 0x2071, 0xa835,
++	0x718c, 0x127e, 0x2091, 0x8000, 0x7084, 0xa10a, 0x0048, 0x4cf7,
++	0x0068, 0x4c8c, 0x2071, 0x0000, 0x7018, 0xd084, 0x00c0, 0x4c8c,
++	0x2001, 0xffff, 0x2071, 0xa8c4, 0x7042, 0x2071, 0xa835, 0x7000,
++	0xa086, 0x0002, 0x00c0, 0x4bfe, 0x1078, 0x4dc3, 0x2071, 0x0000,
++	0x701b, 0x0001, 0x2091, 0x4080, 0x0078, 0x4c8c, 0x1078, 0x4dee,
++	0x2071, 0x0000, 0x701b, 0x0001, 0x2091, 0x4080, 0x0078, 0x4c8c,
++	0x2071, 0xa835, 0x7000, 0xa005, 0x0040, 0x4cb9, 0x6934, 0xa186,
++	0x0103, 0x00c0, 0x4c8f, 0x684c, 0xd0bc, 0x00c0, 0x4cb9, 0x6948,
++	0x6844, 0xa105, 0x00c0, 0x4cac, 0x2009, 0x8020, 0x2071, 0xa835,
++	0x7000, 0x0079, 0x4c23, 0x4cb9, 0x4c71, 0x4c49, 0x4c5b, 0x4c28,
++	0x137e, 0x147e, 0x157e, 0x2099, 0xa676, 0x20a1, 0xa886, 0x20a9,
++	0x0004, 0x53a3, 0x157f, 0x147f, 0x137f, 0x2071, 0xa87d, 0xad80,
++	0x000f, 0x700e, 0x7013, 0x0002, 0x7007, 0x0002, 0x700b, 0x0000,
++	0x2e10, 0x1078, 0x13db, 0x2071, 0xa714, 0x7007, 0x0009, 0x0078,
++	0x4cda, 0x7084, 0x8008, 0xa092, 0x001e, 0x00c8, 0x4cda, 0xae90,
++	0x0003, 0xa210, 0x683c, 0x2012, 0x7186, 0x2071, 0xa714, 0x1078,
++	0x4e4c, 0x0078, 0x4cda, 0x7084, 0x8008, 0xa092, 0x000f, 0x00c8,
++	0x4cda, 0xae90, 0x0003, 0x8003, 0xa210, 0x683c, 0x2012, 0x8210,
++	0x6840, 0x2012, 0x7186, 0x2071, 0xa714, 0x1078, 0x4e4c, 0x0078,
++	0x4cda, 0x127e, 0x2091, 0x8000, 0x0068, 0x4c8c, 0x2071, 0x0000,
++	0x7018, 0xd084, 0x00c0, 0x4c8c, 0x7122, 0x683c, 0x7026, 0x6840,
++	0x702a, 0x701b, 0x0001, 0x2091, 0x4080, 0x127f, 0x2071, 0xa714,
++	0x1078, 0x4e4c, 0x0078, 0x4cda, 0x127f, 0x0078, 0x4cda, 0xa18c,
++	0x00ff, 0xa186, 0x0017, 0x0040, 0x4c9d, 0xa186, 0x001e, 0x0040,
++	0x4c9d, 0xa18e, 0x001f, 0x00c0, 0x4cb9, 0x684c, 0xd0cc, 0x0040,
++	0x4cb9, 0x6850, 0xa084, 0x00ff, 0xa086, 0x0001, 0x00c0, 0x4cb9,
++	0x2009, 0x8021, 0x0078, 0x4c1e, 0x6844, 0xa086, 0x0100, 0x00c0,
++	0x4cb9, 0x6868, 0xa005, 0x00c0, 0x4cb9, 0x2009, 0x8020, 0x0078,
++	0x4c1e, 0x2071, 0xa714, 0x1078, 0x4e60, 0x0040, 0x4cda, 0x2071,
++	0xa714, 0x700f, 0x0001, 0x6934, 0xa184, 0x00ff, 0xa086, 0x0003,
++	0x00c0, 0x4cd1, 0x810f, 0xa18c, 0x00ff, 0x8101, 0x0040, 0x4cd1,
++	0x710e, 0x7007, 0x0003, 0x1078, 0x4e80, 0x7050, 0xa086, 0x0100,
++	0x0040, 0x4d95, 0x127e, 0x2091, 0x8000, 0x2071, 0xa714, 0x7008,
++	0xa086, 0x0001, 0x00c0, 0x4cf5, 0x0068, 0x4cf5, 0x2009, 0x000d,
++	0x7030, 0x200a, 0x2091, 0x4080, 0x700b, 0x0000, 0x7004, 0xa086,
++	0x0006, 0x00c0, 0x4cf5, 0x7007, 0x0001, 0x127f, 0x007c, 0x2071,
++	0xa714, 0x1078, 0x4e60, 0x0040, 0x4d20, 0x2071, 0xa835, 0x7084,
++	0x700a, 0x20a9, 0x0020, 0x2099, 0xa836, 0x20a1, 0xa85d, 0x53a3,
++	0x7087, 0x0000, 0x2071, 0xa714, 0x2069, 0xa87d, 0x706c, 0x6826,
++	0x7070, 0x682a, 0x7074, 0x682e, 0x7078, 0x6832, 0x2d10, 0x1078,
++	0x13db, 0x7007, 0x0008, 0x2001, 0xffff, 0x2071, 0xa8c4, 0x7042,
++	0x127f, 0x0078, 0x4cda, 0x2069, 0xa87d, 0x6808, 0xa08e, 0x0000,
++	0x0040, 0x4d81, 0xa08e, 0x0200, 0x0040, 0x4d7f, 0xa08e, 0x0100,
++	0x00c0, 0x4d81, 0x127e, 0x2091, 0x8000, 0x0068, 0x4d7c, 0x2069,
++	0x0000, 0x6818, 0xd084, 0x00c0, 0x4d7c, 0x702c, 0x7130, 0x8108,
++	0xa102, 0x0048, 0x4d4a, 0xa00e, 0x7034, 0x706e, 0x7038, 0x7072,
++	0x0078, 0x4d54, 0x706c, 0xa080, 0x0040, 0x706e, 0x00c8, 0x4d54,
++	0x7070, 0xa081, 0x0000, 0x7072, 0x7132, 0x6936, 0x700b, 0x0000,
++	0x2001, 0xa85a, 0x2004, 0xa005, 0x00c0, 0x4d73, 0x6934, 0x2069,
++	0xa835, 0x689c, 0x699e, 0x2069, 0xa8c4, 0xa102, 0x00c0, 0x4d6c,
++	0x6844, 0xa005, 0x00d0, 0x4d7a, 0x2001, 0xa85b, 0x200c, 0x810d,
++	0x6946, 0x0078, 0x4d7a, 0x2009, 0x8040, 0x6922, 0x681b, 0x0001,
++	0x2091, 0x4080, 0x7007, 0x0001, 0x127f, 0x0078, 0x4d81, 0x7007,
++	0x0005, 0x007c, 0x701c, 0xa06d, 0x0040, 0x4d93, 0x1078, 0x4e60,
++	0x0040, 0x4d93, 0x7007, 0x0003, 0x1078, 0x4e80, 0x7050, 0xa086,
++	0x0100, 0x0040, 0x4d95, 0x007c, 0x007c, 0x7050, 0xa09e, 0x0100,
++	0x00c0, 0x4d9e, 0x7007, 0x0004, 0x0078, 0x4dbc, 0xa086, 0x0200,
++	0x00c0, 0x4da4, 0x7007, 0x0005, 0x007c, 0x2001, 0xa87f, 0x2004,
++	0xa08e, 0x0100, 0x00c0, 0x4db1, 0x7007, 0x0001, 0x1078, 0x4e4c,
++	0x007c, 0xa08e, 0x0000, 0x0040, 0x4db0, 0xa08e, 0x0200, 0x00c0,
++	0x4db0, 0x7007, 0x0005, 0x007c, 0x1078, 0x4e16, 0x7006, 0x1078,
++	0x4e4c, 0x007c, 0x007c, 0x0e7e, 0x157e, 0x2071, 0xa835, 0x7184,
++	0x81ff, 0x0040, 0x4deb, 0xa006, 0x7086, 0xae80, 0x0003, 0x2071,
++	0x0000, 0x21a8, 0x2014, 0x7226, 0x8000, 0x0070, 0x4de8, 0x2014,
++	0x722a, 0x8000, 0x0070, 0x4de8, 0x2014, 0x722e, 0x8000, 0x0070,
++	0x4de8, 0x2014, 0x723a, 0x8000, 0x0070, 0x4de8, 0x2014, 0x723e,
++	0xa180, 0x8030, 0x7022, 0x157f, 0x0e7f, 0x007c, 0x0e7e, 0x157e,
++	0x2071, 0xa835, 0x7184, 0x81ff, 0x0040, 0x4e13, 0xa006, 0x7086,
++	0xae80, 0x0003, 0x2071, 0x0000, 0x21a8, 0x2014, 0x7226, 0x8000,
++	0x2014, 0x722a, 0x8000, 0x0070, 0x4e0c, 0x2014, 0x723a, 0x8000,
++	0x2014, 0x723e, 0x0078, 0x4e10, 0x2001, 0x8020, 0x0078, 0x4e12,
++	0x2001, 0x8042, 0x7022, 0x157f, 0x0e7f, 0x007c, 0x702c, 0x7130,
++	0x8108, 0xa102, 0x0048, 0x4e23, 0xa00e, 0x7034, 0x706e, 0x7038,
++	0x7072, 0x0078, 0x4e2d, 0x706c, 0xa080, 0x0040, 0x706e, 0x00c8,
++	0x4e2d, 0x7070, 0xa081, 0x0000, 0x7072, 0x7132, 0x700c, 0x8001,
++	0x700e, 0x00c0, 0x4e43, 0x127e, 0x2091, 0x8000, 0x0068, 0x4e46,
++	0x2001, 0x000d, 0x2102, 0x2091, 0x4080, 0x2001, 0x0001, 0x700b,
++	0x0000, 0x127f, 0x007c, 0x2001, 0x0007, 0x007c, 0x2001, 0x0006,
++	0x700b, 0x0001, 0x127f, 0x007c, 0x701c, 0xa06d, 0x0040, 0x4e5f,
++	0x127e, 0x2091, 0x8000, 0x7010, 0x8001, 0x7012, 0x2d04, 0x701e,
++	0xa005, 0x00c0, 0x4e5c, 0x701a, 0x127f, 0x1078, 0x13a4, 0x007c,
++	0x2019, 0x000d, 0x2304, 0x230c, 0xa10e, 0x0040, 0x4e6f, 0x2304,
++	0x230c, 0xa10e, 0x0040, 0x4e6f, 0xa006, 0x0078, 0x4e7f, 0x732c,
++	0x8319, 0x7130, 0xa102, 0x00c0, 0x4e79, 0x2300, 0xa005, 0x0078,
++	0x4e7f, 0x0048, 0x4e7e, 0xa302, 0x0078, 0x4e7f, 0x8002, 0x007c,
++	0x2d00, 0x7026, 0xa080, 0x000d, 0x7056, 0x7053, 0x0000, 0x127e,
++	0x2091, 0x8000, 0x2009, 0xa8d6, 0x2104, 0xc08d, 0x200a, 0x127f,
++	0x1078, 0x13f9, 0x007c, 0x2071, 0xa6e2, 0x7003, 0x0000, 0x7007,
++	0x0000, 0x700f, 0x0000, 0x702b, 0x0001, 0x704f, 0x0000, 0x7053,
++	0x0001, 0x705f, 0x0020, 0x7063, 0x0040, 0x7083, 0x0000, 0x708b,
++	0x0000, 0x708f, 0x0001, 0x70bf, 0x0000, 0x007c, 0x0e7e, 0x2071,
++	0xa6e2, 0x6848, 0xa005, 0x00c0, 0x4ebc, 0x7028, 0xc085, 0x702a,
++	0xa085, 0x0001, 0x0078, 0x4ee1, 0x6a50, 0x7236, 0x6b54, 0x733a,
++	0x6858, 0x703e, 0x707a, 0x685c, 0x7042, 0x707e, 0x6848, 0x702e,
++	0x6840, 0x7032, 0x2009, 0x000c, 0x200a, 0x8007, 0x8006, 0x8006,
++	0xa08c, 0x003f, 0xa084, 0xffc0, 0xa210, 0x2100, 0xa319, 0x7272,
++	0x7376, 0x7028, 0xc084, 0x702a, 0x7007, 0x0001, 0x700f, 0x0000,
++	0xa006, 0x0e7f, 0x007c, 0x2b78, 0x2071, 0xa6e2, 0x7004, 0x1079,
++	0x4f41, 0x700c, 0x0079, 0x4eec, 0x4ef1, 0x4ee6, 0x4ee6, 0x4ee6,
++	0x4ee6, 0x007c, 0x700c, 0x0079, 0x4ef5, 0x4efa, 0x4f3f, 0x4f3f,
++	0x4f40, 0x4f40, 0x7830, 0x7930, 0xa106, 0x0040, 0x4f04, 0x7830,
++	0x7930, 0xa106, 0x00c0, 0x4f2a, 0x7030, 0xa10a, 0x0040, 0x4f2a,
++	0x00c8, 0x4f0c, 0x712c, 0xa10a, 0xa18a, 0x0002, 0x00c8, 0x4f2b,
++	0x1078, 0x1370, 0x0040, 0x4f2a, 0x2d00, 0x705a, 0x7063, 0x0040,
++	0x2001, 0x0003, 0x7057, 0x0000, 0x127e, 0x007e, 0x2091, 0x8000,
++	0x2009, 0xa8d6, 0x2104, 0xc085, 0x200a, 0x007f, 0x700e, 0x127f,
++	0x1078, 0x13f9, 0x007c, 0x1078, 0x1370, 0x0040, 0x4f2a, 0x2d00,
++	0x705a, 0x1078, 0x1370, 0x00c0, 0x4f37, 0x0078, 0x4f16, 0x2d00,
++	0x7086, 0x7063, 0x0080, 0x2001, 0x0004, 0x0078, 0x4f1a, 0x007c,
++	0x007c, 0x4f52, 0x4f53, 0x4f8a, 0x4f8b, 0x4f3f, 0x4fc1, 0x4fc6,
++	0x4ffd, 0x4ffe, 0x5019, 0x501a, 0x501b, 0x501c, 0x501d, 0x501e,
++	0x509e, 0x50c8, 0x007c, 0x700c, 0x0079, 0x4f56, 0x4f5b, 0x4f5e,
++	0x4f6e, 0x4f89, 0x4f89, 0x1078, 0x4ef2, 0x007c, 0x127e, 0x8001,
++	0x700e, 0x7058, 0x007e, 0x1078, 0x5464, 0x0040, 0x4f6b, 0x2091,
++	0x8000, 0x1078, 0x4ef2, 0x0d7f, 0x0078, 0x4f77, 0x127e, 0x8001,
++	0x700e, 0x1078, 0x5464, 0x7058, 0x2068, 0x7084, 0x705a, 0x6803,
++	0x0000, 0x6807, 0x0000, 0x6834, 0xa084, 0x00ff, 0xa08a, 0x0020,
++	0x00c8, 0x4f86, 0x1079, 0x4fa1, 0x127f, 0x007c, 0x127f, 0x1078,
++	0x501f, 0x007c, 0x007c, 0x007c, 0x0e7e, 0x2071, 0xa6e2, 0x700c,
++	0x0079, 0x4f92, 0x4f97, 0x4f97, 0x4f97, 0x4f99, 0x4f9d, 0x0e7f,
++	0x007c, 0x700f, 0x0001, 0x0078, 0x4f9f, 0x700f, 0x0002, 0x0e7f,
++	0x007c, 0x501f, 0x501f, 0x503b, 0x501f, 0x5171, 0x501f, 0x501f,
++	0x501f, 0x501f, 0x501f, 0x503b, 0x51bb, 0x5208, 0x5261, 0x5277,
++	0x501f, 0x501f, 0x5057, 0x503b, 0x501f, 0x501f, 0x5078, 0x5338,
++	0x5356, 0x501f, 0x5057, 0x501f, 0x501f, 0x501f, 0x501f, 0x506d,
++	0x5356, 0x7020, 0x2068, 0x1078, 0x13a4, 0x007c, 0x700c, 0x0079,
++	0x4fc9, 0x4fce, 0x4fd1, 0x4fe1, 0x4ffc, 0x4ffc, 0x1078, 0x4ef2,
++	0x007c, 0x127e, 0x8001, 0x700e, 0x7058, 0x007e, 0x1078, 0x5464,
++	0x0040, 0x4fde, 0x2091, 0x8000, 0x1078, 0x4ef2, 0x0d7f, 0x0078,
++	0x4fea, 0x127e, 0x8001, 0x700e, 0x1078, 0x5464, 0x7058, 0x2068,
++	0x7084, 0x705a, 0x6803, 0x0000, 0x6807, 0x0000, 0x6834, 0xa084,
++	0x00ff, 0xa08a, 0x001a, 0x00c8, 0x4ff9, 0x1079, 0x4fff, 0x127f,
++	0x007c, 0x127f, 0x1078, 0x501f, 0x007c, 0x007c, 0x007c, 0x501f,
++	0x503b, 0x515b, 0x501f, 0x503b, 0x501f, 0x503b, 0x503b, 0x501f,
++	0x503b, 0x515b, 0x503b, 0x503b, 0x503b, 0x503b, 0x503b, 0x501f,
++	0x503b, 0x515b, 0x501f, 0x501f, 0x503b, 0x501f, 0x501f, 0x501f,
++	0x503b, 0x007c, 0x007c, 0x007c, 0x007c, 0x007c, 0x007c, 0x7007,
++	0x0001, 0x6838, 0xa084, 0x00ff, 0xc0d5, 0x683a, 0x127e, 0x2091,
++	0x8000, 0x1078, 0x4a73, 0x127f, 0x007c, 0x7007, 0x0001, 0x6838,
++	0xa084, 0x00ff, 0xc0e5, 0x683a, 0x127e, 0x2091, 0x8000, 0x1078,
++	0x4a73, 0x127f, 0x007c, 0x7007, 0x0001, 0x6838, 0xa084, 0x00ff,
++	0xc0ed, 0x683a, 0x127e, 0x2091, 0x8000, 0x1078, 0x4a73, 0x127f,
++	0x007c, 0x7007, 0x0001, 0x6838, 0xa084, 0x00ff, 0xc0dd, 0x683a,
++	0x127e, 0x2091, 0x8000, 0x1078, 0x4a73, 0x127f, 0x007c, 0x6834,
++	0x8007, 0xa084, 0x00ff, 0x0040, 0x502d, 0x8001, 0x00c0, 0x5064,
++	0x7007, 0x0001, 0x0078, 0x513a, 0x7007, 0x0006, 0x7012, 0x2d00,
++	0x7016, 0x701a, 0x704b, 0x513a, 0x007c, 0x684c, 0xa084, 0x00c0,
++	0xa086, 0x00c0, 0x00c0, 0x5078, 0x7007, 0x0001, 0x0078, 0x5373,
++	0x2d00, 0x7016, 0x701a, 0x20a9, 0x0004, 0xa080, 0x0024, 0x2098,
++	0x20a1, 0xa70d, 0x53a3, 0x6858, 0x7012, 0xa082, 0x0401, 0x00c8,
++	0x5049, 0x6884, 0xa08a, 0x0002, 0x00c8, 0x5049, 0x82ff, 0x00c0,
++	0x509a, 0x6888, 0x698c, 0xa105, 0x0040, 0x509a, 0x2001, 0x510a,
++	0x0078, 0x509d, 0xa280, 0x5100, 0x2004, 0x70c6, 0x7010, 0xa015,
++	0x0040, 0x50e8, 0x1078, 0x1370, 0x00c0, 0x50a9, 0x7007, 0x000f,
++	0x007c, 0x2d00, 0x7022, 0x70c4, 0x2060, 0x6000, 0x6836, 0x6004,
++	0xad00, 0x7096, 0x6008, 0xa20a, 0x00c8, 0x50b8, 0xa00e, 0x2200,
++	0x7112, 0x620c, 0x8003, 0x800b, 0xa296, 0x0004, 0x0040, 0x50c1,
++	0xa108, 0x719a, 0x810b, 0x719e, 0xae90, 0x0022, 0x1078, 0x13db,
++	0x7090, 0xa08e, 0x0100, 0x0040, 0x50dc, 0xa086, 0x0200, 0x0040,
++	0x50d4, 0x7007, 0x0010, 0x007c, 0x7020, 0x2068, 0x1078, 0x13a4,
++	0x7014, 0x2068, 0x0078, 0x5049, 0x7020, 0x2068, 0x7018, 0x6802,
++	0x6807, 0x0000, 0x2d08, 0x2068, 0x6906, 0x711a, 0x0078, 0x509e,
++	0x7014, 0x2068, 0x7007, 0x0001, 0x6884, 0xa005, 0x00c0, 0x50f7,
++	0x6888, 0x698c, 0xa105, 0x0040, 0x50f7, 0x1078, 0x510e, 0x6834,
++	0xa084, 0x00ff, 0xa086, 0x001e, 0x0040, 0x5373, 0x0078, 0x513a,
++	0x5102, 0x5106, 0x0002, 0x0011, 0x0007, 0x0004, 0x000a, 0x000f,
++	0x0005, 0x0006, 0x000a, 0x0011, 0x0005, 0x0004, 0x0f7e, 0x0e7e,
++	0x0c7e, 0x077e, 0x067e, 0x6f88, 0x6e8c, 0x6804, 0x2060, 0xacf0,
++	0x0021, 0xacf8, 0x0027, 0x2009, 0x0005, 0x700c, 0x7816, 0x7008,
++	0x7812, 0x7004, 0x7806, 0x7000, 0x7802, 0x7e0e, 0x7f0a, 0x8109,
++	0x0040, 0x5130, 0xaef2, 0x0004, 0xaffa, 0x0006, 0x0078, 0x511d,
++	0x6004, 0xa065, 0x00c0, 0x5117, 0x067f, 0x077f, 0x0c7f, 0x0e7f,
++	0x0f7f, 0x007c, 0x2009, 0xa62f, 0x210c, 0x81ff, 0x00c0, 0x5155,
++	0x6838, 0xa084, 0x00ff, 0x683a, 0x1078, 0x4353, 0x00c0, 0x5149,
++	0x007c, 0x1078, 0x4b51, 0x127e, 0x2091, 0x8000, 0x1078, 0x8f7d,
++	0x1078, 0x4a73, 0x127f, 0x0078, 0x5148, 0x2001, 0x0028, 0x2009,
++	0x0000, 0x0078, 0x5149, 0x7018, 0x6802, 0x2d08, 0x2068, 0x6906,
++	0x711a, 0x7010, 0x8001, 0x7012, 0x0040, 0x516a, 0x7007, 0x0006,
++	0x0078, 0x5170, 0x7014, 0x2068, 0x7007, 0x0001, 0x7048, 0x107a,
++	0x007c, 0x7007, 0x0001, 0x6944, 0x810f, 0xa18c, 0x00ff, 0x6848,
++	0xa084, 0x00ff, 0x20a9, 0x0001, 0xa096, 0x0001, 0x0040, 0x519a,
++	0x2009, 0x0000, 0x20a9, 0x00ff, 0xa096, 0x0002, 0x0040, 0x519a,
++	0xa005, 0x00c0, 0x51ad, 0x6944, 0x810f, 0xa18c, 0x00ff, 0x1078,
++	0x45c4, 0x00c0, 0x51ad, 0x067e, 0x6e50, 0x1078, 0x46b3, 0x067f,
++	0x0078, 0x51ad, 0x047e, 0x2011, 0xa60c, 0x2224, 0xc484, 0xc48c,
++	0x2412, 0x047f, 0x0c7e, 0x1078, 0x45c4, 0x00c0, 0x51a9, 0x1078,
++	0x4852, 0x8108, 0x00f0, 0x51a3, 0x0c7f, 0x684c, 0xd084, 0x00c0,
++	0x51b4, 0x1078, 0x13a4, 0x007c, 0x127e, 0x2091, 0x8000, 0x1078,
++	0x4a73, 0x127f, 0x007c, 0x127e, 0x2091, 0x8000, 0x7007, 0x0001,
++	0x2001, 0xa653, 0x2004, 0xd0a4, 0x0040, 0x51ff, 0x2061, 0xa933,
++	0x6100, 0xd184, 0x0040, 0x51df, 0x6858, 0xa084, 0x00ff, 0x00c0,
++	0x5202, 0x6000, 0xd084, 0x0040, 0x51ff, 0x6004, 0xa005, 0x00c0,
++	0x5205, 0x6003, 0x0000, 0x600b, 0x0000, 0x0078, 0x51fc, 0x2011,
++	0x0001, 0x6860, 0xa005, 0x00c0, 0x51e7, 0x2001, 0x001e, 0x8000,
++	0x6016, 0x6858, 0xa084, 0x00ff, 0x0040, 0x51ff, 0x6006, 0x6858,
++	0x8007, 0xa084, 0x00ff, 0x0040, 0x51ff, 0x600a, 0x6858, 0x8000,
++	0x00c0, 0x51fb, 0xc28d, 0x6202, 0x127f, 0x0078, 0x5453, 0x127f,
++	0x0078, 0x544b, 0x127f, 0x0078, 0x5443, 0x127f, 0x0078, 0x5447,
++	0x127e, 0x2091, 0x8000, 0x7007, 0x0001, 0x2001, 0xa653, 0x2004,
++	0xd0a4, 0x0040, 0x525e, 0x2061, 0xa933, 0x6000, 0xd084, 0x0040,
++	0x525e, 0x6204, 0x6308, 0xd08c, 0x00c0, 0x5250, 0x6c48, 0xa484,
++	0x0003, 0x0040, 0x5236, 0x6958, 0xa18c, 0x00ff, 0x8001, 0x00c0,
++	0x522f, 0x2100, 0xa210, 0x0048, 0x525b, 0x0078, 0x5236, 0x8001,
++	0x00c0, 0x525b, 0x2100, 0xa212, 0x0048, 0x525b, 0xa484, 0x000c,
++	0x0040, 0x5250, 0x6958, 0x810f, 0xa18c, 0x00ff, 0xa082, 0x0004,
++	0x00c0, 0x5248, 0x2100, 0xa318, 0x0048, 0x525b, 0x0078, 0x5250,
++	0xa082, 0x0004, 0x00c0, 0x525b, 0x2100, 0xa31a, 0x0048, 0x525b,
++	0x6860, 0xa005, 0x0040, 0x5256, 0x8000, 0x6016, 0x6206, 0x630a,
++	0x127f, 0x0078, 0x5453, 0x127f, 0x0078, 0x544f, 0x127f, 0x0078,
++	0x544b, 0x127e, 0x2091, 0x8000, 0x7007, 0x0001, 0x2061, 0xa933,
++	0x6300, 0xd38c, 0x00c0, 0x5271, 0x6308, 0x8318, 0x0048, 0x5274,
++	0x630a, 0x127f, 0x0078, 0x5461, 0x127f, 0x0078, 0x544f, 0x127e,
++	0x0c7e, 0x2091, 0x8000, 0x7007, 0x0001, 0x684c, 0xd0ac, 0x0040,
++	0x528b, 0x0c7e, 0x2061, 0xa933, 0x6000, 0xa084, 0xfcff, 0x6002,
++	0x0c7f, 0x0078, 0x52ba, 0x6858, 0xa005, 0x0040, 0x52d1, 0x685c,
++	0xa065, 0x0040, 0x52cd, 0x2001, 0xa62f, 0x2004, 0xa005, 0x0040,
++	0x529d, 0x1078, 0x8ec6, 0x0078, 0x52ab, 0x6013, 0x0400, 0x6037,
++	0x0000, 0x694c, 0xd1a4, 0x0040, 0x52a7, 0x6950, 0x6136, 0x2009,
++	0x0041, 0x1078, 0x775c, 0x6958, 0xa18c, 0xff00, 0xa186, 0x2000,
++	0x00c0, 0x52ba, 0x027e, 0x2009, 0x0000, 0x2011, 0xfdff, 0x1078,
++	0x5bf1, 0x027f, 0x684c, 0xd0c4, 0x0040, 0x52c9, 0x2061, 0xa933,
++	0x6000, 0xd08c, 0x00c0, 0x52c9, 0x6008, 0x8000, 0x0048, 0x52cd,
++	0x600a, 0x0c7f, 0x127f, 0x0078, 0x5453, 0x0c7f, 0x127f, 0x0078,
++	0x544b, 0x6954, 0xa186, 0x0045, 0x0040, 0x5306, 0xa186, 0x002a,
++	0x00c0, 0x52e1, 0x2001, 0xa60c, 0x200c, 0xc194, 0x2102, 0x0078,
++	0x52ba, 0xa186, 0x0020, 0x0040, 0x52fa, 0xa186, 0x0029, 0x0040,
++	0x52ed, 0xa186, 0x002d, 0x00c0, 0x52cd, 0x6944, 0xa18c, 0xff00,
++	0x810f, 0x1078, 0x45c4, 0x00c0, 0x52ba, 0x6000, 0xc0e4, 0x6002,
++	0x0078, 0x52ba, 0x685c, 0xa065, 0x0040, 0x52cd, 0x6007, 0x0024,
++	0x2001, 0xa8a3, 0x2004, 0x6016, 0x0078, 0x52ba, 0x685c, 0xa065,
++	0x0040, 0x52cd, 0x0e7e, 0x6860, 0xa075, 0x2001, 0xa62f, 0x2004,
++	0xa005, 0x0040, 0x531e, 0x1078, 0x8ec6, 0x8eff, 0x0040, 0x531b,
++	0x2e60, 0x1078, 0x8ec6, 0x0e7f, 0x0078, 0x52ba, 0x6024, 0xc0dc,
++	0xc0d5, 0x6026, 0x2e60, 0x6007, 0x003a, 0x6870, 0xa005, 0x0040,
++	0x532f, 0x6007, 0x003b, 0x6874, 0x602a, 0x6878, 0x6012, 0x6003,
++	0x0001, 0x1078, 0x5d8a, 0x1078, 0x62d1, 0x0e7f, 0x0078, 0x52ba,
++	0x2061, 0xa933, 0x6000, 0xd084, 0x0040, 0x5352, 0xd08c, 0x00c0,
++	0x5461, 0x2091, 0x8000, 0x6204, 0x8210, 0x0048, 0x534c, 0x6206,
++	0x2091, 0x8001, 0x0078, 0x5461, 0x2091, 0x8001, 0x6853, 0x0016,
++	0x0078, 0x545a, 0x6853, 0x0007, 0x0078, 0x545a, 0x6834, 0x8007,
++	0xa084, 0x00ff, 0x00c0, 0x5360, 0x1078, 0x502d, 0x0078, 0x5372,
++	0x2030, 0x8001, 0x00c0, 0x536a, 0x7007, 0x0001, 0x1078, 0x5373,
++	0x0078, 0x5372, 0x7007, 0x0006, 0x7012, 0x2d00, 0x7016, 0x701a,
++	0x704b, 0x5373, 0x007c, 0x0e7e, 0x127e, 0x2091, 0x8000, 0xa03e,
++	0x2009, 0xa62f, 0x210c, 0x81ff, 0x00c0, 0x53ff, 0x2009, 0xa60c,
++	0x210c, 0xd194, 0x00c0, 0x5431, 0x6848, 0x2070, 0xae82, 0xad00,
++	0x0048, 0x53ef, 0x2001, 0xa616, 0x2004, 0xae02, 0x00c8, 0x53ef,
++	0x2061, 0xa933, 0x6100, 0xa184, 0x0301, 0xa086, 0x0001, 0x00c0,
++	0x53d2, 0x711c, 0xa186, 0x0006, 0x00c0, 0x53da, 0x7018, 0xa005,
++	0x0040, 0x53ff, 0x2004, 0xd0e4, 0x00c0, 0x542b, 0x7024, 0xd0dc,
++	0x00c0, 0x5435, 0x6853, 0x0000, 0x6803, 0x0000, 0x2d08, 0x7010,
++	0xa005, 0x00c0, 0x53be, 0x7112, 0x684c, 0xd0f4, 0x00c0, 0x5439,
++	0x2e60, 0x1078, 0x5b27, 0x127f, 0x0e7f, 0x007c, 0x2068, 0x6800,
++	0xa005, 0x00c0, 0x53be, 0x6902, 0x2168, 0x684c, 0xd0f4, 0x00c0,
++	0x5439, 0x127f, 0x0e7f, 0x007c, 0x127f, 0x0e7f, 0x6853, 0x0006,
++	0x0078, 0x545a, 0xd184, 0x0040, 0x53cc, 0xd1c4, 0x00c0, 0x53f3,
++	0x0078, 0x53f7, 0x6944, 0xa18c, 0xff00, 0x810f, 0x1078, 0x45c4,
++	0x00c0, 0x542b, 0x6000, 0xd0e4, 0x00c0, 0x542b, 0x711c, 0xa186,
++	0x0007, 0x00c0, 0x53ef, 0x6853, 0x0002, 0x0078, 0x542d, 0x6853,
++	0x0008, 0x0078, 0x542d, 0x6853, 0x000e, 0x0078, 0x542d, 0x6853,
++	0x0017, 0x0078, 0x542d, 0x6853, 0x0035, 0x0078, 0x542d, 0x2001,
++	0xa672, 0x2004, 0xd0fc, 0x0040, 0x5427, 0x6848, 0x2070, 0xae82,
++	0xad00, 0x0048, 0x5427, 0x6058, 0xae02, 0x00c8, 0x5427, 0x711c,
++	0xa186, 0x0006, 0x00c0, 0x5427, 0x7018, 0xa005, 0x0040, 0x5427,
++	0x2004, 0xd0bc, 0x0040, 0x5427, 0x2039, 0x0001, 0x7000, 0xa086,
++	0x0007, 0x00c0, 0x537e, 0x7003, 0x0002, 0x0078, 0x537e, 0x6853,
++	0x0028, 0x0078, 0x542d, 0x6853, 0x0029, 0x127f, 0x0e7f, 0x0078,
++	0x545a, 0x6853, 0x002a, 0x0078, 0x542d, 0x6853, 0x0045, 0x0078,
++	0x542d, 0x2e60, 0x2019, 0x0002, 0x6017, 0x0014, 0x1078, 0x9dc7,
++	0x127f, 0x0e7f, 0x007c, 0x2009, 0x003e, 0x0078, 0x5455, 0x2009,
++	0x0004, 0x0078, 0x5455, 0x2009, 0x0006, 0x0078, 0x5455, 0x2009,
++	0x0016, 0x0078, 0x5455, 0x2009, 0x0001, 0x6854, 0xa084, 0xff00,
++	0xa105, 0x6856, 0x2091, 0x8000, 0x1078, 0x4a73, 0x2091, 0x8001,
++	0x007c, 0x1078, 0x13a4, 0x007c, 0x702c, 0x7130, 0x8108, 0xa102,
++	0x0048, 0x5471, 0xa00e, 0x7034, 0x7072, 0x7038, 0x7076, 0x0078,
++	0x547d, 0x7070, 0xa080, 0x0040, 0x7072, 0x00c8, 0x547d, 0x7074,
++	0xa081, 0x0000, 0x7076, 0xa085, 0x0001, 0x7932, 0x7132, 0x007c,
++	0x0d7e, 0x1078, 0x5b1e, 0x0d7f, 0x007c, 0x0d7e, 0x2011, 0x0004,
++	0x2204, 0xa085, 0x8002, 0x2012, 0x0d7f, 0x007c, 0x20e1, 0x0002,
++	0x3d08, 0x20e1, 0x2000, 0x3d00, 0xa084, 0x7000, 0x0040, 0x549c,
++	0xa086, 0x1000, 0x00c0, 0x54d3, 0x20e1, 0x0000, 0x3d00, 0xa094,
++	0xff00, 0x8217, 0xa084, 0xf000, 0xa086, 0x3000, 0x00c0, 0x54b7,
++	0xa184, 0xff00, 0x8007, 0xa086, 0x0008, 0x00c0, 0x54d3, 0x1078,
++	0x29bb, 0x00c0, 0x54d3, 0x1078, 0x56b2, 0x0078, 0x54ce, 0x20e1,
++	0x0004, 0x3d60, 0xd1bc, 0x00c0, 0x54be, 0x3e60, 0xac84, 0x000f,
++	0x00c0, 0x54d3, 0xac82, 0xad00, 0x0048, 0x54d3, 0x6858, 0xac02,
++	0x00c8, 0x54d3, 0x2009, 0x0047, 0x1078, 0x775c, 0x7a1c, 0xd284,
++	0x00c0, 0x548e, 0x007c, 0xa016, 0x1078, 0x15fa, 0x0078, 0x54ce,
++	0x0078, 0x54d3, 0x781c, 0xd08c, 0x0040, 0x5502, 0x157e, 0x137e,
++	0x147e, 0x20e1, 0x3000, 0x3d20, 0x3e28, 0xa584, 0x0076, 0x00c0,
++	0x5518, 0xa484, 0x7000, 0xa086, 0x1000, 0x00c0, 0x5507, 0x1078,
++	0x554e, 0x0040, 0x5518, 0x20e1, 0x3000, 0x7828, 0x7828, 0x1078,
++	0x556c, 0x147f, 0x137f, 0x157f, 0x2009, 0xa8b9, 0x2104, 0xa005,
++	0x00c0, 0x5503, 0x007c, 0x1078, 0x62d1, 0x0078, 0x5502, 0xa484,
++	0x7000, 0x00c0, 0x5518, 0x1078, 0x554e, 0x0040, 0x552c, 0x7000,
++	0xa084, 0xff00, 0xa086, 0x8100, 0x0040, 0x54f3, 0x0078, 0x552c,
++	0x1078, 0xa54f, 0xd5a4, 0x0040, 0x5528, 0x047e, 0x1078, 0x1b22,
++	0x047f, 0x20e1, 0x9010, 0x2001, 0x0138, 0x2202, 0x0078, 0x5530,
++	0x1078, 0x554e, 0x6883, 0x0000, 0x20e1, 0x3000, 0x7828, 0x7828,
++	0x1078, 0x5537, 0x147f, 0x137f, 0x157f, 0x0078, 0x5502, 0x2001,
++	0xa60e, 0x2004, 0xd08c, 0x0040, 0x554d, 0x2001, 0xa600, 0x2004,
++	0xa086, 0x0003, 0x00c0, 0x554d, 0x027e, 0x037e, 0x2011, 0x8048,
++	0x2518, 0x1078, 0x361b, 0x037f, 0x027f, 0x007c, 0xa484, 0x01ff,
++	0x6882, 0xa005, 0x0040, 0x5560, 0xa080, 0x001f, 0xa084, 0x03f8,
++	0x80ac, 0x20e1, 0x1000, 0x2ea0, 0x2099, 0x020a, 0x53a5, 0x007c,
++	0x20a9, 0x000c, 0x20e1, 0x1000, 0x2ea0, 0x2099, 0x020a, 0x53a5,
++	0xa085, 0x0001, 0x0078, 0x555f, 0x7000, 0xa084, 0xff00, 0xa08c,
++	0xf000, 0x8007, 0xa196, 0x0000, 0x00c0, 0x5579, 0x0078, 0x57ba,
++	0x007c, 0xa196, 0x2000, 0x00c0, 0x558a, 0x6900, 0xa18e, 0x0001,
++	0x00c0, 0x5586, 0x1078, 0x3aec, 0x0078, 0x5578, 0x1078, 0x5592,
++	0x0078, 0x5578, 0xa196, 0x8000, 0x00c0, 0x5578, 0x1078, 0x5871,
++	0x0078, 0x5578, 0x0c7e, 0x7110, 0xa18c, 0xff00, 0x810f, 0xa196,
++	0x0001, 0x0040, 0x559f, 0xa196, 0x0023, 0x00c0, 0x56aa, 0xa08e,
++	0x0023, 0x00c0, 0x55d4, 0x1078, 0x591d, 0x0040, 0x56aa, 0x7124,
++	0x610a, 0x7030, 0xa08e, 0x0200, 0x00c0, 0x55b8, 0x7034, 0xa005,
++	0x00c0, 0x56aa, 0x2009, 0x0015, 0x1078, 0x775c, 0x0078, 0x56aa,
++	0xa08e, 0x0214, 0x0040, 0x55c0, 0xa08e, 0x0210, 0x00c0, 0x55c6,
++	0x2009, 0x0015, 0x1078, 0x775c, 0x0078, 0x56aa, 0xa08e, 0x0100,
++	0x00c0, 0x56aa, 0x7034, 0xa005, 0x00c0, 0x56aa, 0x2009, 0x0016,
++	0x1078, 0x775c, 0x0078, 0x56aa, 0xa08e, 0x0022, 0x00c0, 0x56aa,
++	0x7030, 0xa08e, 0x0300, 0x00c0, 0x55e5, 0x7034, 0xa005, 0x00c0,
++	0x56aa, 0x2009, 0x0017, 0x0078, 0x5676, 0xa08e, 0x0500, 0x00c0,
++	0x55f1, 0x7034, 0xa005, 0x00c0, 0x56aa, 0x2009, 0x0018, 0x0078,
++	0x5676, 0xa08e, 0x2010, 0x00c0, 0x55f9, 0x2009, 0x0019, 0x0078,
++	0x5676, 0xa08e, 0x2110, 0x00c0, 0x5601, 0x2009, 0x001a, 0x0078,
++	0x5676, 0xa08e, 0x5200, 0x00c0, 0x560d, 0x7034, 0xa005, 0x00c0,
++	0x56aa, 0x2009, 0x001b, 0x0078, 0x5676, 0xa08e, 0x5000, 0x00c0,
++	0x5619, 0x7034, 0xa005, 0x00c0, 0x56aa, 0x2009, 0x001c, 0x0078,
++	0x5676, 0xa08e, 0x1300, 0x00c0, 0x5621, 0x2009, 0x0034, 0x0078,
++	0x5676, 0xa08e, 0x1200, 0x00c0, 0x562d, 0x7034, 0xa005, 0x00c0,
++	0x56aa, 0x2009, 0x0024, 0x0078, 0x5676, 0xa08c, 0xff00, 0xa18e,
++	0x2400, 0x00c0, 0x5637, 0x2009, 0x002d, 0x0078, 0x5676, 0xa08c,
++	0xff00, 0xa18e, 0x5300, 0x00c0, 0x5641, 0x2009, 0x002a, 0x0078,
++	0x5676, 0xa08e, 0x0f00, 0x00c0, 0x5649, 0x2009, 0x0020, 0x0078,
++	0x5676, 0xa08e, 0x5300, 0x00c0, 0x564f, 0x0078, 0x566c, 0xa08e,
++	0x6104, 0x00c0, 0x566c, 0x2011, 0xab8d, 0x8208, 0x2204, 0xa082,
++	0x0004, 0x20a8, 0x95ac, 0x95ac, 0x2011, 0x8015, 0x211c, 0x8108,
++	0x047e, 0x2124, 0x1078, 0x361b, 0x047f, 0x8108, 0x00f0, 0x565c,
++	0x2009, 0x0023, 0x0078, 0x5676, 0xa08e, 0x6000, 0x00c0, 0x5674,
++	0x2009, 0x003f, 0x0078, 0x5676, 0x2009, 0x001d, 0x017e, 0x2011,
++	0xab83, 0x2204, 0x8211, 0x220c, 0x1078, 0x254d, 0x00c0, 0x56ac,
++	0x1078, 0x455c, 0x00c0, 0x56ac, 0x6612, 0x6516, 0x86ff, 0x0040,
++	0x569c, 0x017f, 0x017e, 0xa186, 0x0017, 0x00c0, 0x569c, 0x686c,
++	0xa606, 0x00c0, 0x569c, 0x6870, 0xa506, 0xa084, 0xff00, 0x00c0,
++	0x569c, 0x6000, 0xc0f5, 0x6002, 0x0c7e, 0x1078, 0x76c7, 0x0040,
++	0x56af, 0x017f, 0x611a, 0x601f, 0x0004, 0x7120, 0x610a, 0x017f,
++	0x1078, 0x775c, 0x0c7f, 0x007c, 0x017f, 0x0078, 0x56aa, 0x0c7f,
++	0x0078, 0x56ac, 0x0c7e, 0x1078, 0x570f, 0x00c0, 0x570d, 0xa28e,
++	0x0033, 0x00c0, 0x56de, 0x1078, 0x591d, 0x0040, 0x570d, 0x7124,
++	0x610a, 0x7030, 0xa08e, 0x0200, 0x00c0, 0x56d0, 0x7034, 0xa005,
++	0x00c0, 0x570d, 0x2009, 0x0015, 0x1078, 0x775c, 0x0078, 0x570d,
++	0xa08e, 0x0100, 0x00c0, 0x570d, 0x7034, 0xa005, 0x00c0, 0x570d,
++	0x2009, 0x0016, 0x1078, 0x775c, 0x0078, 0x570d, 0xa28e, 0x0032,
++	0x00c0, 0x570d, 0x7030, 0xa08e, 0x1400, 0x00c0, 0x570d, 0x2009,
++	0x0038, 0x017e, 0x2011, 0xab83, 0x2204, 0x8211, 0x220c, 0x1078,
++	0x254d, 0x00c0, 0x570c, 0x1078, 0x455c, 0x00c0, 0x570c, 0x6612,
++	0x6516, 0x0c7e, 0x1078, 0x76c7, 0x0040, 0x570b, 0x017f, 0x611a,
++	0x601f, 0x0004, 0x7120, 0x610a, 0x017f, 0x1078, 0x775c, 0x1078,
++	0x62d1, 0x0078, 0x570d, 0x0c7f, 0x017f, 0x0c7f, 0x007c, 0x0f7e,
++	0x0d7e, 0x027e, 0x017e, 0x137e, 0x147e, 0x157e, 0x3c00, 0x007e,
++	0x2079, 0x0030, 0x2069, 0x0200, 0x1078, 0x1c6a, 0x00c0, 0x5750,
++	0x1078, 0x1b40, 0x0040, 0x575d, 0x7908, 0xa18c, 0x1fff, 0xa182,
++	0x0011, 0x00c8, 0x575a, 0x20a9, 0x000c, 0x20e1, 0x0000, 0x2ea0,
++	0x2099, 0x020a, 0x53a5, 0x20e1, 0x2000, 0x2001, 0x020a, 0x2004,
++	0x7a0c, 0x7808, 0xa080, 0x0007, 0xa084, 0x1ff8, 0xa08a, 0x0140,
++	0x10c8, 0x1332, 0x80ac, 0x20e1, 0x6000, 0x2099, 0x020a, 0x53a5,
++	0x20e1, 0x7000, 0x6828, 0x6828, 0x7803, 0x0004, 0xa294, 0x0070,
++	0x007f, 0x20e0, 0x157f, 0x147f, 0x137f, 0x017f, 0x027f, 0x0d7f,
++	0x0f7f, 0x007c, 0xa016, 0x1078, 0x15fa, 0xa085, 0x0001, 0x0078,
++	0x5750, 0x047e, 0x0e7e, 0x0d7e, 0x2028, 0x2130, 0xa696, 0x00ff,
++	0x00c0, 0x5782, 0xa596, 0xfffd, 0x00c0, 0x5772, 0x2009, 0x007f,
++	0x0078, 0x57b5, 0xa596, 0xfffe, 0x00c0, 0x577a, 0x2009, 0x007e,
++	0x0078, 0x57b5, 0xa596, 0xfffc, 0x00c0, 0x5782, 0x2009, 0x0080,
++	0x0078, 0x57b5, 0x2011, 0x0000, 0x2021, 0x0081, 0x20a9, 0x007e,
++	0x2071, 0xa7b6, 0x2e1c, 0x83ff, 0x00c0, 0x5794, 0x82ff, 0x00c0,
++	0x57a9, 0x2410, 0x0078, 0x57a9, 0x2368, 0x6f10, 0x007e, 0x2100,
++	0xa706, 0x007f, 0x6b14, 0x00c0, 0x57a3, 0xa346, 0x00c0, 0x57a3,
++	0x2408, 0x0078, 0x57b5, 0x87ff, 0x00c0, 0x57a9, 0x83ff, 0x0040,
++	0x578e, 0x8420, 0x8e70, 0x00f0, 0x578a, 0x82ff, 0x00c0, 0x57b4,
++	0xa085, 0x0001, 0x0078, 0x57b6, 0x2208, 0xa006, 0x0d7f, 0x0e7f,
++	0x047f, 0x007c, 0xa084, 0x0007, 0x0079, 0x57bf, 0x007c, 0x57c7,
++	0x57c7, 0x57c7, 0x5933, 0x57c7, 0x57c8, 0x57e1, 0x5858, 0x007c,
++	0x7110, 0xd1bc, 0x0040, 0x57e0, 0x7120, 0x2160, 0xac8c, 0x000f,
++	0x00c0, 0x57e0, 0xac8a, 0xad00, 0x0048, 0x57e0, 0x6858, 0xac02,
++	0x00c8, 0x57e0, 0x7124, 0x610a, 0x2009, 0x0046, 0x1078, 0x775c,
++	0x007c, 0x0c7e, 0xa484, 0x01ff, 0x0040, 0x5833, 0x7110, 0xd1bc,
++	0x00c0, 0x5833, 0x2011, 0xab83, 0x2204, 0x8211, 0x220c, 0x1078,
++	0x254d, 0x00c0, 0x5833, 0x1078, 0x455c, 0x00c0, 0x5833, 0x6612,
++	0x6516, 0x6000, 0xd0ec, 0x00c0, 0x5833, 0x6204, 0xa294, 0xff00,
++	0x8217, 0xa286, 0x0006, 0x00c0, 0x5818, 0x0c7e, 0x1078, 0x76c7,
++	0x017f, 0x0040, 0x5835, 0x611a, 0x601f, 0x0006, 0x7120, 0x610a,
++	0x7130, 0x6122, 0x2009, 0x0044, 0x1078, 0x775c, 0x0078, 0x5833,
++	0x0c7e, 0x1078, 0x76c7, 0x017f, 0x0040, 0x5833, 0x611a, 0x601f,
++	0x0004, 0x7120, 0x610a, 0xa286, 0x0004, 0x00c0, 0x582b, 0x6007,
++	0x0005, 0x0078, 0x582d, 0x6007, 0x0001, 0x6003, 0x0001, 0x1078,
++	0x5dd7, 0x1078, 0x62d1, 0x0c7f, 0x007c, 0x2001, 0xa60d, 0x2004,
++	0xd0ec, 0x0040, 0x583f, 0x2011, 0x8049, 0x1078, 0x361b, 0x0c7e,
++	0x1078, 0x9187, 0x017f, 0x0040, 0x5833, 0x611a, 0x601f, 0x0006,
++	0x7120, 0x610a, 0x7130, 0x6122, 0x6013, 0x0300, 0x6003, 0x0001,
++	0x6007, 0x0041, 0x1078, 0x5d8a, 0x1078, 0x62d1, 0x0078, 0x5833,
++	0x7110, 0xd1bc, 0x0040, 0x5870, 0x7020, 0x2060, 0xac84, 0x000f,
++	0x00c0, 0x5870, 0xac82, 0xad00, 0x0048, 0x5870, 0x6858, 0xac02,
++	0x00c8, 0x5870, 0x7124, 0x610a, 0x2009, 0x0045, 0x1078, 0x775c,
++	0x007c, 0x007e, 0x1078, 0x29bb, 0x007f, 0x00c0, 0x5887, 0x7110,
++	0xa18c, 0xff00, 0x810f, 0xa18e, 0x0000, 0x00c0, 0x5887, 0xa084,
++	0x000f, 0xa08a, 0x0006, 0x00c8, 0x5887, 0x1079, 0x5888, 0x007c,
++	0x588e, 0x588f, 0x588e, 0x588e, 0x58ff, 0x590e, 0x007c, 0x7110,
++	0xd1bc, 0x0040, 0x5897, 0x702c, 0xd084, 0x0040, 0x58fe, 0x700c,
++	0x7108, 0x1078, 0x254d, 0x00c0, 0x58fe, 0x1078, 0x455c, 0x00c0,
++	0x58fe, 0x6612, 0x6516, 0x6204, 0x7110, 0xd1bc, 0x0040, 0x58c9,
++	0xa28c, 0x00ff, 0xa186, 0x0004, 0x0040, 0x58b2, 0xa186, 0x0006,
++	0x00c0, 0x58ef, 0x0c7e, 0x1078, 0x591d, 0x0c7f, 0x0040, 0x58fe,
++	0x0c7e, 0x1078, 0x76c7, 0x017f, 0x0040, 0x58fe, 0x611a, 0x601f,
++	0x0002, 0x7120, 0x610a, 0x2009, 0x0088, 0x1078, 0x775c, 0x0078,
++	0x58fe, 0xa28c, 0x00ff, 0xa186, 0x0006, 0x0040, 0x58de, 0xa186,
++	0x0004, 0x0040, 0x58de, 0xa294, 0xff00, 0x8217, 0xa286, 0x0004,
++	0x0040, 0x58de, 0xa286, 0x0006, 0x00c0, 0x58ef, 0x0c7e, 0x1078,
++	0x76c7, 0x017f, 0x0040, 0x58fe, 0x611a, 0x601f, 0x0005, 0x7120,
++	0x610a, 0x2009, 0x0088, 0x1078, 0x775c, 0x0078, 0x58fe, 0x0c7e,
++	0x1078, 0x76c7, 0x017f, 0x0040, 0x58fe, 0x611a, 0x601f, 0x0004,
++	0x7120, 0x610a, 0x2009, 0x0001, 0x1078, 0x775c, 0x007c, 0x7110,
++	0xd1bc, 0x0040, 0x590d, 0x1078, 0x591d, 0x0040, 0x590d, 0x7124,
++	0x610a, 0x2009, 0x0089, 0x1078, 0x775c, 0x007c, 0x7110, 0xd1bc,
++	0x0040, 0x591c, 0x1078, 0x591d, 0x0040, 0x591c, 0x7124, 0x610a,
++	0x2009, 0x008a, 0x1078, 0x775c, 0x007c, 0x7020, 0x2060, 0xac84,
++	0x000f, 0x00c0, 0x5930, 0xac82, 0xad00, 0x0048, 0x5930, 0x2001,
++	0xa616, 0x2004, 0xac02, 0x00c8, 0x5930, 0xa085, 0x0001, 0x007c,
++	0xa006, 0x0078, 0x592f, 0x7110, 0xd1bc, 0x00c0, 0x5949, 0x7024,
++	0x2060, 0xac84, 0x000f, 0x00c0, 0x5949, 0xac82, 0xad00, 0x0048,
++	0x5949, 0x6858, 0xac02, 0x00c8, 0x5949, 0x2009, 0x0051, 0x1078,
++	0x775c, 0x007c, 0x2071, 0xa8c4, 0x7003, 0x0003, 0x700f, 0x0361,
++	0xa006, 0x701a, 0x7012, 0x7017, 0xad00, 0x7007, 0x0000, 0x7026,
++	0x702b, 0x6e1c, 0x7032, 0x7037, 0x6e70, 0x703b, 0x0002, 0x703f,
++	0x0000, 0x7043, 0xffff, 0x7047, 0xffff, 0x007c, 0x2071, 0xa8c4,
++	0x00e0, 0x5a32, 0x2091, 0x6000, 0x700c, 0x8001, 0x700e, 0x00c0,
++	0x59de, 0x700f, 0x0361, 0x7007, 0x0001, 0x127e, 0x2091, 0x8000,
++	0x7138, 0x8109, 0x713a, 0x00c0, 0x59dc, 0x703b, 0x0002, 0x2009,
++	0x0100, 0x2104, 0xa082, 0x0003, 0x00c8, 0x59dc, 0x703c, 0xa086,
++	0x0001, 0x00c0, 0x59b9, 0x0d7e, 0x2069, 0x0140, 0x6804, 0xa084,
++	0x4000, 0x0040, 0x5997, 0x6803, 0x1000, 0x0078, 0x599e, 0x6804,
++	0xa084, 0x1000, 0x0040, 0x599e, 0x6803, 0x0100, 0x6803, 0x0000,
++	0x703f, 0x0000, 0x2069, 0xa8b1, 0x6804, 0xa082, 0x0006, 0x00c0,
++	0x59ab, 0x6807, 0x0000, 0x6830, 0xa082, 0x0003, 0x00c0, 0x59b2,
++	0x6833, 0x0000, 0x1078, 0x62d1, 0x1078, 0x639b, 0x0d7f, 0x0078,
++	0x59dc, 0x0d7e, 0x2069, 0xa600, 0x6948, 0x6864, 0xa102, 0x00c8,
++	0x59db, 0x2069, 0xa8b1, 0x6804, 0xa086, 0x0000, 0x00c0, 0x59db,
++	0x6830, 0xa086, 0x0000, 0x00c0, 0x59db, 0x703f, 0x0001, 0x6807,
++	0x0006, 0x6833, 0x0003, 0x2069, 0x0100, 0x6830, 0x689e, 0x2069,
++	0x0140, 0x6803, 0x0600, 0x0d7f, 0x0078, 0x59e1, 0x127e, 0x2091,
++	0x8000, 0x7024, 0xa00d, 0x0040, 0x59f9, 0x7020, 0x8001, 0x7022,
++	0x00c0, 0x59f9, 0x7023, 0x0009, 0x8109, 0x7126, 0xa186, 0x03e8,
++	0x00c0, 0x59f4, 0x7028, 0x107a, 0x81ff, 0x00c0, 0x59f9, 0x7028,
++	0x107a, 0x7030, 0xa00d, 0x0040, 0x5a10, 0x702c, 0x8001, 0x702e,
++	0x00c0, 0x5a10, 0x702f, 0x0009, 0x8109, 0x7132, 0x0040, 0x5a0e,
++	0xa184, 0x007f, 0x1040, 0x6ea2, 0x0078, 0x5a10, 0x7034, 0x107a,
++	0x7040, 0xa005, 0x0040, 0x5a18, 0x0050, 0x5a18, 0x8001, 0x7042,
++	0x7044, 0xa005, 0x0040, 0x5a20, 0x0050, 0x5a20, 0x8001, 0x7046,
++	0x7018, 0xa00d, 0x0040, 0x5a31, 0x7008, 0x8001, 0x700a, 0x00c0,
++	0x5a31, 0x700b, 0x0009, 0x8109, 0x711a, 0x00c0, 0x5a31, 0x701c,
++	0x107a, 0x127f, 0x7004, 0x0079, 0x5a35, 0x5a5c, 0x5a5d, 0x5a79,
++	0x0e7e, 0x2071, 0xa8c4, 0x7018, 0xa005, 0x00c0, 0x5a43, 0x711a,
++	0x721e, 0x700b, 0x0009, 0x0e7f, 0x007c, 0x0e7e, 0x007e, 0x2071,
++	0xa8c4, 0x701c, 0xa206, 0x00c0, 0x5a4f, 0x701a, 0x701e, 0x007f,
++	0x0e7f, 0x007c, 0x0e7e, 0x2071, 0xa8c4, 0x6088, 0xa102, 0x0048,
++	0x5a5a, 0x618a, 0x0e7f, 0x007c, 0x007c, 0x7110, 0x1078, 0x45c4,
++	0x00c0, 0x5a6f, 0x6088, 0x8001, 0x0048, 0x5a6f, 0x608a, 0x00c0,
++	0x5a6f, 0x127e, 0x2091, 0x8000, 0x1078, 0x62d1, 0x127f, 0x8108,
++	0xa182, 0x00ff, 0x0048, 0x5a77, 0xa00e, 0x7007, 0x0002, 0x7112,
++	0x007c, 0x7014, 0x2060, 0x127e, 0x2091, 0x8000, 0x603c, 0xa005,
++	0x0040, 0x5a88, 0x8001, 0x603e, 0x00c0, 0x5a88, 0x1078, 0x8f9c,
++	0x6014, 0xa005, 0x0040, 0x5ab2, 0x8001, 0x6016, 0x00c0, 0x5ab2,
++	0x611c, 0xa186, 0x0003, 0x0040, 0x5a99, 0xa186, 0x0006, 0x00c0,
++	0x5ab0, 0x6010, 0x2068, 0x6854, 0xa08a, 0x199a, 0x0048, 0x5ab0,
++	0xa082, 0x1999, 0x6856, 0xa08a, 0x199a, 0x0048, 0x5aa9, 0x2001,
++	0x1999, 0x8003, 0x800b, 0x810b, 0xa108, 0x6116, 0x0078, 0x5ab2,
++	0x1078, 0x8abe, 0x127f, 0xac88, 0x0010, 0x7116, 0x2001, 0xcd00,
++	0xa102, 0x0048, 0x5abf, 0x7017, 0xad00, 0x7007, 0x0000, 0x007c,
++	0x0e7e, 0x2071, 0xa8c4, 0x7027, 0x07d0, 0x7023, 0x0009, 0x703b,
++	0x0002, 0x0e7f, 0x007c, 0x2001, 0xa8cd, 0x2003, 0x0000, 0x007c,
++	0x0e7e, 0x2071, 0xa8c4, 0x7132, 0x702f, 0x0009, 0x0e7f, 0x007c,
++	0x2011, 0xa8d0, 0x2013, 0x0000, 0x007c, 0x0e7e, 0x2071, 0xa8c4,
++	0x711a, 0x721e, 0x700b, 0x0009, 0x0e7f, 0x007c, 0x027e, 0x0e7e,
++	0x0f7e, 0x2079, 0xa600, 0x7a34, 0xd294, 0x0040, 0x5b15, 0x2071,
++	0xa8ac, 0x2e14, 0xa0fe, 0x0000, 0x0040, 0x5b02, 0xa0fe, 0x0001,
++	0x0040, 0x5b06, 0xa0fe, 0x0002, 0x00c0, 0x5b11, 0xa292, 0x0085,
++	0x0078, 0x5b08, 0xa292, 0x0005, 0x0078, 0x5b08, 0xa292, 0x0002,
++	0x2272, 0x0040, 0x5b0d, 0x00c8, 0x5b15, 0x2011, 0x8037, 0x1078,
++	0x361b, 0x2011, 0xa8ab, 0x2204, 0x2072, 0x0f7f, 0x0e7f, 0x027f,
++	0x007c, 0x0c7e, 0x2061, 0xa933, 0x0c7f, 0x007c, 0xa184, 0x000f,
++	0x8003, 0x8003, 0x8003, 0xa080, 0xa933, 0x2060, 0x007c, 0x6854,
++	0xa08a, 0x199a, 0x0048, 0x5b2e, 0x2001, 0x1999, 0xa005, 0x00c0,
++	0x5b3d, 0x0c7e, 0x2061, 0xa933, 0x6014, 0x0c7f, 0xa005, 0x00c0,
++	0x5b42, 0x2001, 0x001e, 0x0078, 0x5b42, 0xa08e, 0xffff, 0x00c0,
++	0x5b42, 0xa006, 0x8003, 0x800b, 0x810b, 0xa108, 0x6116, 0x684c,
++	0xa08c, 0x00c0, 0xa18e, 0x00c0, 0x0040, 0x5b9e, 0xd0b4, 0x00c0,
++	0x5b59, 0xd0bc, 0x00c0, 0x5b8b, 0x2009, 0x0006, 0x1078, 0x5bc3,
++	0x007c, 0xd0fc, 0x0040, 0x5b64, 0xa084, 0x0003, 0x0040, 0x5b64,
++	0xa086, 0x0003, 0x00c0, 0x5bbc, 0x6024, 0xd0d4, 0x0040, 0x5b6e,
++	0xc0d4, 0x6026, 0x6860, 0x602a, 0x685c, 0x602e, 0x2009, 0xa674,
++	0x2104, 0xd084, 0x0040, 0x5b83, 0x6118, 0xa188, 0x0027, 0x2104,
++	0xd08c, 0x00c0, 0x5b83, 0x87ff, 0x00c0, 0x5b82, 0x2009, 0x0042,
++	0x1078, 0x775c, 0x007c, 0x87ff, 0x00c0, 0x5b8a, 0x2009, 0x0043,
++	0x1078, 0x775c, 0x007c, 0xd0fc, 0x0040, 0x5b96, 0xa084, 0x0003,
++	0x0040, 0x5b96, 0xa086, 0x0003, 0x00c0, 0x5bbc, 0x87ff, 0x00c0,
++	0x5b9d, 0x2009, 0x0042, 0x1078, 0x775c, 0x007c, 0xd0fc, 0x0040,
++	0x5baf, 0xa084, 0x0003, 0xa08e, 0x0002, 0x0040, 0x5bb3, 0x87ff,
++	0x00c0, 0x5bae, 0x2009, 0x0041, 0x1078, 0x775c, 0x007c, 0x1078,
++	0x5bc1, 0x0078, 0x5bae, 0x87ff, 0x00c0, 0x5bae, 0x2009, 0x0043,
++	0x1078, 0x775c, 0x0078, 0x5bae, 0x2009, 0x0004, 0x1078, 0x5bc3,
++	0x007c, 0x2009, 0x0001, 0x0d7e, 0x6010, 0xa0ec, 0xf000, 0x0040,
++	0x5bef, 0x2068, 0x6952, 0x6800, 0x6012, 0xa186, 0x0001, 0x00c0,
++	0x5be5, 0x694c, 0xa18c, 0x8100, 0xa18e, 0x8100, 0x00c0, 0x5be5,
++	0x0c7e, 0x2061, 0xa933, 0x6200, 0xd28c, 0x00c0, 0x5be4, 0x6204,
++	0x8210, 0x0048, 0x5be4, 0x6206, 0x0c7f, 0x1078, 0x4a73, 0x6010,
++	0xa06d, 0x077e, 0x2039, 0x0000, 0x10c0, 0x5b27, 0x077f, 0x0d7f,
++	0x007c, 0x157e, 0x0c7e, 0x2061, 0xa933, 0x6000, 0x81ff, 0x0040,
++	0x5bfc, 0xa205, 0x0078, 0x5bfd, 0xa204, 0x6002, 0x0c7f, 0x157f,
++	0x007c, 0x6800, 0xd08c, 0x00c0, 0x5c0d, 0x6808, 0xa005, 0x0040,
++	0x5c0d, 0x8001, 0x680a, 0xa085, 0x0001, 0x007c, 0x20a9, 0x0010,
++	0xa006, 0x8004, 0x8086, 0x818e, 0x00c8, 0x5c17, 0xa200, 0x00f0,
++	0x5c12, 0x8086, 0x818e, 0x007c, 0x157e, 0x20a9, 0x0010, 0xa005,
++	0x0040, 0x5c3d, 0xa11a, 0x00c8, 0x5c3d, 0x8213, 0x818d, 0x0048,
++	0x5c30, 0xa11a, 0x00c8, 0x5c31, 0x00f0, 0x5c25, 0x0078, 0x5c35,
++	0xa11a, 0x2308, 0x8210, 0x00f0, 0x5c25, 0x007e, 0x3200, 0xa084,
++	0xf7ff, 0x2080, 0x007f, 0x157f, 0x007c, 0x007e, 0x3200, 0xa085,
++	0x0800, 0x0078, 0x5c39, 0x127e, 0x2091, 0x2200, 0x2079, 0xa8b1,
++	0x127f, 0x0d7e, 0x2069, 0xa8b1, 0x6803, 0x0005, 0x2069, 0x0004,
++	0x2d04, 0xa085, 0x8001, 0x206a, 0x0d7f, 0x007c, 0x0c7e, 0x6027,
++	0x0001, 0x7804, 0xa084, 0x0007, 0x0079, 0x5c5e, 0x5c68, 0x5c8d,
++	0x5ce8, 0x5c6e, 0x5c8d, 0x5c68, 0x5c66, 0x5c66, 0x1078, 0x1332,
++	0x1078, 0x5acb, 0x1078, 0x62d1, 0x0c7f, 0x007c, 0x62c0, 0x82ff,
++	0x00c0, 0x5c74, 0x0c7f, 0x007c, 0x2011, 0x41dc, 0x1078, 0x5a45,
++	0x7828, 0xa092, 0x00c8, 0x00c8, 0x5c83, 0x8000, 0x782a, 0x1078,
++	0x421b, 0x0078, 0x5c72, 0x1078, 0x41dc, 0x7807, 0x0003, 0x7827,
++	0x0000, 0x782b, 0x0000, 0x0078, 0x5c72, 0x1078, 0x5acb, 0x3c00,
++	0x007e, 0x2011, 0x0209, 0x20e1, 0x4000, 0x2214, 0x007f, 0x20e0,
++	0x82ff, 0x0040, 0x5cab, 0x62c0, 0x82ff, 0x00c0, 0x5cab, 0x782b,
++	0x0000, 0x7824, 0xa065, 0x1040, 0x1332, 0x2009, 0x0013, 0x1078,
++	0x775c, 0x0c7f, 0x007c, 0x3900, 0xa082, 0xa9e3, 0x00c8, 0x5cb2,
++	0x1078, 0x747a, 0x0c7e, 0x7824, 0xa065, 0x1040, 0x1332, 0x7804,
++	0xa086, 0x0004, 0x0040, 0x5d2d, 0x7828, 0xa092, 0x2710, 0x00c8,
++	0x5cc8, 0x8000, 0x782a, 0x0c7f, 0x1078, 0x6e01, 0x0078, 0x5ca9,
++	0x6104, 0xa186, 0x0003, 0x00c0, 0x5cdf, 0x0e7e, 0x2071, 0xa600,
++	0x70d8, 0x0e7f, 0xd08c, 0x0040, 0x5cdf, 0x0c7e, 0x0e7e, 0x2061,
++	0x0100, 0x2071, 0xa600, 0x1078, 0x4224, 0x0e7f, 0x0c7f, 0x1078,
++	0xa5c4, 0x2009, 0x0014, 0x1078, 0x775c, 0x0c7f, 0x0078, 0x5ca9,
++	0x2001, 0xa8cd, 0x2003, 0x0000, 0x62c0, 0x82ff, 0x00c0, 0x5cfc,
++	0x782b, 0x0000, 0x7824, 0xa065, 0x1040, 0x1332, 0x2009, 0x0013,
++	0x1078, 0x77b3, 0x0c7f, 0x007c, 0x0c7e, 0x0d7e, 0x3900, 0xa082,
++	0xa9e3, 0x00c8, 0x5d05, 0x1078, 0x747a, 0x7824, 0xa005, 0x1040,
++	0x1332, 0x781c, 0xa06d, 0x1040, 0x1332, 0x6800, 0xc0dc, 0x6802,
++	0x7924, 0x2160, 0x1078, 0x772d, 0x693c, 0x81ff, 0x1040, 0x1332,
++	0x8109, 0x693e, 0x6854, 0xa015, 0x0040, 0x5d21, 0x7a1e, 0x0078,
++	0x5d23, 0x7918, 0x791e, 0x7807, 0x0000, 0x7827, 0x0000, 0x0d7f,
++	0x0c7f, 0x1078, 0x62d1, 0x0078, 0x5cfa, 0x6104, 0xa186, 0x0002,
++	0x0040, 0x5d38, 0xa186, 0x0004, 0x0040, 0x5d38, 0x0078, 0x5cbc,
++	0x7808, 0xac06, 0x0040, 0x5cbc, 0x1078, 0x61cd, 0x1078, 0x5dd7,
++	0x0c7f, 0x1078, 0x62d1, 0x0078, 0x5ca9, 0x0c7e, 0x6027, 0x0002,
++	0x62c8, 0x82ff, 0x00c0, 0x5d61, 0x62c4, 0x82ff, 0x00c0, 0x5d61,
++	0x793c, 0xa1e5, 0x0000, 0x0040, 0x5d5b, 0x2009, 0x0049, 0x1078,
++	0x775c, 0x0c7f, 0x007c, 0x2011, 0xa8d0, 0x2013, 0x0000, 0x0078,
++	0x5d59, 0x3908, 0xa192, 0xa9e3, 0x00c8, 0x5d68, 0x1078, 0x747a,
++	0x6017, 0x0010, 0x793c, 0x81ff, 0x0040, 0x5d5b, 0x7944, 0xa192,
++	0x7530, 0x00c8, 0x5d85, 0x8108, 0x7946, 0x793c, 0xa188, 0x0007,
++	0x210c, 0xa18e, 0x0006, 0x00c0, 0x5d81, 0x6017, 0x0012, 0x0078,
++	0x5d59, 0x6017, 0x0016, 0x0078, 0x5d59, 0x7848, 0xc085, 0x784a,
++	0x0078, 0x5d59, 0x007e, 0x017e, 0x0c7e, 0x127e, 0x2091, 0x8000,
++	0x600f, 0x0000, 0x2c08, 0x2061, 0xa8b1, 0x6020, 0x8000, 0x6022,
++	0x6010, 0xa005, 0x0040, 0x5da5, 0xa080, 0x0003, 0x2102, 0x6112,
++	0x127f, 0x0c7f, 0x017f, 0x007f, 0x007c, 0x6116, 0x6112, 0x0078,
++	0x5da0, 0x0d7e, 0x2069, 0xa8b1, 0x6000, 0xd0d4, 0x0040, 0x5dbe,
++	0x6820, 0x8000, 0x6822, 0xa086, 0x0001, 0x00c0, 0x5db9, 0x2c00,
++	0x681e, 0x6804, 0xa084, 0x0007, 0x0079, 0x62d9, 0xc0d5, 0x6002,
++	0x6818, 0xa005, 0x0040, 0x5dd0, 0x6056, 0x605b, 0x0000, 0x007e,
++	0x2c00, 0x681a, 0x0d7f, 0x685a, 0x2069, 0xa8b1, 0x0078, 0x5db0,
++	0x6056, 0x605a, 0x2c00, 0x681a, 0x681e, 0x0078, 0x5db0, 0x007e,
++	0x017e, 0x0c7e, 0x127e, 0x2091, 0x8000, 0x600f, 0x0000, 0x2c08,
++	0x2061, 0xa8b1, 0x6020, 0x8000, 0x6022, 0x6008, 0xa005, 0x0040,
++	0x5df2, 0xa080, 0x0003, 0x2102, 0x610a, 0x127f, 0x0c7f, 0x017f,
++	0x007f, 0x007c, 0x610e, 0x610a, 0x0078, 0x5ded, 0x0c7e, 0x600f,
++	0x0000, 0x2c08, 0x2061, 0xa8b1, 0x6034, 0xa005, 0x0040, 0x5e06,
++	0xa080, 0x0003, 0x2102, 0x6136, 0x0c7f, 0x007c, 0x613a, 0x6136,
++	0x0078, 0x5e04, 0x0f7e, 0x0e7e, 0x0d7e, 0x0c7e, 0x067e, 0x057e,
++	0x037e, 0x027e, 0x017e, 0x007e, 0x127e, 0xa02e, 0x2071, 0xa8b1,
++	0x7638, 0x2660, 0x2678, 0x2091, 0x8000, 0x8cff, 0x0040, 0x5e8c,
++	0x6018, 0xa080, 0x0028, 0x2004, 0xa206, 0x00c0, 0x5e87, 0x87ff,
++	0x0040, 0x5e2e, 0x6020, 0xa106, 0x00c0, 0x5e87, 0x703c, 0xac06,
++	0x00c0, 0x5e44, 0x037e, 0x2019, 0x0001, 0x1078, 0x7058, 0x7033,
++	0x0000, 0x703f, 0x0000, 0x7043, 0x0000, 0x7047, 0x0000, 0x704b,
++	0x0000, 0x037f, 0x2029, 0x0001, 0x7038, 0xac36, 0x00c0, 0x5e4a,
++	0x660c, 0x763a, 0x7034, 0xac36, 0x00c0, 0x5e58, 0x2c00, 0xaf36,
++	0x0040, 0x5e56, 0x2f00, 0x7036, 0x0078, 0x5e58, 0x7037, 0x0000,
++	0x660c, 0x067e, 0x2c00, 0xaf06, 0x0040, 0x5e61, 0x7e0e, 0x0078,
++	0x5e62, 0x2678, 0x600f, 0x0000, 0x1078, 0x8d06, 0x0040, 0x5e82,
++	0x6010, 0x2068, 0x601c, 0xa086, 0x0003, 0x00c0, 0x5e9d, 0x6837,
++	0x0103, 0x6b4a, 0x6847, 0x0000, 0x017e, 0x037e, 0x077e, 0x1078,
++	0x8f7d, 0x1078, 0xa4e2, 0x1078, 0x4a73, 0x077f, 0x037f, 0x017f,
++	0x1078, 0x8eb9, 0x1078, 0x8ec6, 0x0c7f, 0x0078, 0x5e1d, 0x2c78,
++	0x600c, 0x2060, 0x0078, 0x5e1d, 0x85ff, 0x0040, 0x5e91, 0x1078,
++	0x639b, 0x127f, 0x007f, 0x017f, 0x027f, 0x037f, 0x057f, 0x067f,
++	0x0c7f, 0x0d7f, 0x0e7f, 0x0f7f, 0x007c, 0x601c, 0xa086, 0x0006,
++	0x00c0, 0x5e6f, 0x017e, 0x037e, 0x077e, 0x1078, 0xa4e2, 0x1078,
++	0xa1ca, 0x077f, 0x037f, 0x017f, 0x0078, 0x5e82, 0x007e, 0x067e,
++	0x0c7e, 0x0d7e, 0x0f7e, 0x2031, 0x0000, 0x127e, 0x2091, 0x8000,
++	0x2079, 0xa8b1, 0x7838, 0xa065, 0x0040, 0x5eef, 0x600c, 0x007e,
++	0x600f, 0x0000, 0x783c, 0xac06, 0x00c0, 0x5ed6, 0x037e, 0x2019,
++	0x0001, 0x1078, 0x7058, 0x7833, 0x0000, 0x783f, 0x0000, 0x7843,
++	0x0000, 0x7847, 0x0000, 0x784b, 0x0000, 0x037f, 0x1078, 0x8d06,
++	0x0040, 0x5eea, 0x6010, 0x2068, 0x601c, 0xa086, 0x0003, 0x00c0,
++	0x5ef8, 0x6837, 0x0103, 0x6b4a, 0x6847, 0x0000, 0x1078, 0x4a73,
++	0x1078, 0x8eb9, 0x1078, 0x8ec6, 0x007f, 0x0078, 0x5ebb, 0x7e3a,
++	0x7e36, 0x127f, 0x0f7f, 0x0d7f, 0x0c7f, 0x067f, 0x007f, 0x007c,
++	0x601c, 0xa086, 0x0006, 0x00c0, 0x5ee1, 0x1078, 0xa1ca, 0x0078,
++	0x5eea, 0x017e, 0x027e, 0x087e, 0x2041, 0x0000, 0x1078, 0x5f1b,
++	0x1078, 0x5fdb, 0x087f, 0x027f, 0x017f, 0x007c, 0x0f7e, 0x127e,
++	0x2079, 0xa8b1, 0x2091, 0x8000, 0x1078, 0x6076, 0x1078, 0x60ec,
++	0x127f, 0x0f7f, 0x007c, 0x0f7e, 0x0e7e, 0x0d7e, 0x0c7e, 0x067e,
++	0x017e, 0x007e, 0x127e, 0x2091, 0x8000, 0x2071, 0xa8b1, 0x7614,
++	0x2660, 0x2678, 0x8cff, 0x0040, 0x5fb5, 0x6018, 0xa080, 0x0028,
++	0x2004, 0xa206, 0x00c0, 0x5fb0, 0x88ff, 0x0040, 0x5f3b, 0x6020,
++	0xa106, 0x00c0, 0x5fb0, 0x7024, 0xac06, 0x00c0, 0x5f6b, 0x2069,
++	0x0100, 0x68c0, 0xa005, 0x0040, 0x5f66, 0x1078, 0x5acb, 0x1078,
++	0x6e0f, 0x68c3, 0x0000, 0x1078, 0x7378, 0x7027, 0x0000, 0x037e,
++	0x2069, 0x0140, 0x6b04, 0xa384, 0x1000, 0x0040, 0x5f5b, 0x6803,
++	0x0100, 0x6803, 0x0000, 0x2069, 0x0100, 0x6824, 0xd084, 0x0040,
++	0x5f63, 0x6827, 0x0001, 0x037f, 0x0078, 0x5f6b, 0x6003, 0x0009,
++	0x630a, 0x0078, 0x5fb0, 0x7014, 0xac36, 0x00c0, 0x5f71, 0x660c,
++	0x7616, 0x7010, 0xac36, 0x00c0, 0x5f7f, 0x2c00, 0xaf36, 0x0040,
++	0x5f7d, 0x2f00, 0x7012, 0x0078, 0x5f7f, 0x7013, 0x0000, 0x660c,
++	0x067e, 0x2c00, 0xaf06, 0x0040, 0x5f88, 0x7e0e, 0x0078, 0x5f89,
++	0x2678, 0x600f, 0x0000, 0x6010, 0x2068, 0x1078, 0x8d06, 0x0040,
++	0x5fa9, 0x601c, 0xa086, 0x0003, 0x00c0, 0x5fbe, 0x6837, 0x0103,
++	0x6b4a, 0x6847, 0x0000, 0x017e, 0x037e, 0x087e, 0x1078, 0x8f7d,
++	0x1078, 0xa4e2, 0x1078, 0x4a73, 0x087f, 0x037f, 0x017f, 0x1078,
++	0x8eb9, 0x1078, 0x8ec6, 0x1078, 0x7233, 0x0c7f, 0x0078, 0x5f2a,
++	0x2c78, 0x600c, 0x2060, 0x0078, 0x5f2a, 0x127f, 0x007f, 0x017f,
++	0x067f, 0x0c7f, 0x0d7f, 0x0e7f, 0x0f7f, 0x007c, 0x601c, 0xa086,
++	0x0006, 0x00c0, 0x5fcf, 0x017e, 0x037e, 0x087e, 0x1078, 0xa4e2,
++	0x1078, 0xa1ca, 0x087f, 0x037f, 0x017f, 0x0078, 0x5fa9, 0x601c,
++	0xa086, 0x0002, 0x00c0, 0x5fa9, 0x6004, 0xa086, 0x0085, 0x0040,
++	0x5f96, 0x0078, 0x5fa9, 0x0c7e, 0x007e, 0x127e, 0x2091, 0x8000,
++	0xa280, 0xa735, 0x2004, 0xa065, 0x0040, 0x6072, 0x0f7e, 0x0e7e,
++	0x0d7e, 0x067e, 0x2071, 0xa8b1, 0x6654, 0x7018, 0xac06, 0x00c0,
++	0x5ff2, 0x761a, 0x701c, 0xac06, 0x00c0, 0x5ffe, 0x86ff, 0x00c0,
++	0x5ffd, 0x7018, 0x701e, 0x0078, 0x5ffe, 0x761e, 0x6058, 0xa07d,
++	0x0040, 0x6003, 0x7e56, 0xa6ed, 0x0000, 0x0040, 0x6009, 0x2f00,
++	0x685a, 0x6057, 0x0000, 0x605b, 0x0000, 0x6000, 0xc0d4, 0xc0dc,
++	0x6002, 0x1078, 0x44d3, 0x0040, 0x606e, 0x7624, 0x86ff, 0x0040,
++	0x605c, 0xa680, 0x0004, 0x2004, 0xad06, 0x00c0, 0x605c, 0x0d7e,
++	0x2069, 0x0100, 0x68c0, 0xa005, 0x0040, 0x6053, 0x1078, 0x5acb,
++	0x1078, 0x6e0f, 0x68c3, 0x0000, 0x1078, 0x7378, 0x7027, 0x0000,
++	0x037e, 0x2069, 0x0140, 0x6b04, 0xa384, 0x1000, 0x0040, 0x603c,
++	0x6803, 0x0100, 0x6803, 0x0000, 0x2069, 0x0100, 0x6824, 0xd084,
++	0x0040, 0x6044, 0x6827, 0x0001, 0x037f, 0x0d7f, 0x0c7e, 0x603c,
++	0xa005, 0x0040, 0x604d, 0x8001, 0x603e, 0x2660, 0x1078, 0x8ec6,
++	0x0c7f, 0x0078, 0x605c, 0x0d7f, 0x0c7e, 0x2660, 0x6003, 0x0009,
++	0x630a, 0x0c7f, 0x0078, 0x6011, 0x8dff, 0x0040, 0x606a, 0x6837,
++	0x0103, 0x6b4a, 0x6847, 0x0000, 0x1078, 0x8f7d, 0x1078, 0xa4e2,
++	0x1078, 0x4a73, 0x1078, 0x7233, 0x0078, 0x6011, 0x067f, 0x0d7f,
++	0x0e7f, 0x0f7f, 0x127f, 0x007f, 0x0c7f, 0x007c, 0x007e, 0x067e,
++	0x0c7e, 0x0d7e, 0x2031, 0x0000, 0x7814, 0xa065, 0x0040, 0x60d0,
++	0x600c, 0x007e, 0x600f, 0x0000, 0x7824, 0xac06, 0x00c0, 0x60b5,
++	0x2069, 0x0100, 0x68c0, 0xa005, 0x0040, 0x60af, 0x1078, 0x5acb,
++	0x1078, 0x6e0f, 0x68c3, 0x0000, 0x1078, 0x7378, 0x7827, 0x0000,
++	0x037e, 0x2069, 0x0140, 0x6b04, 0xa384, 0x1000, 0x0040, 0x60a4,
++	0x6803, 0x0100, 0x6803, 0x0000, 0x2069, 0x0100, 0x6824, 0xd084,
++	0x0040, 0x60ac, 0x6827, 0x0001, 0x037f, 0x0078, 0x60b5, 0x6003,
++	0x0009, 0x630a, 0x2c30, 0x0078, 0x60cd, 0x6010, 0x2068, 0x1078,
++	0x8d06, 0x0040, 0x60c9, 0x601c, 0xa086, 0x0003, 0x00c0, 0x60d7,
++	0x6837, 0x0103, 0x6b4a, 0x6847, 0x0000, 0x1078, 0x4a73, 0x1078,
++	0x8eb9, 0x1078, 0x8ec6, 0x1078, 0x7233, 0x007f, 0x0078, 0x607d,
++	0x7e16, 0x7e12, 0x0d7f, 0x0c7f, 0x067f, 0x007f, 0x007c, 0x601c,
++	0xa086, 0x0006, 0x00c0, 0x60e0, 0x1078, 0xa1ca, 0x0078, 0x60c9,
++	0x601c, 0xa086, 0x0002, 0x00c0, 0x60c9, 0x6004, 0xa086, 0x0085,
++	0x0040, 0x60c0, 0x0078, 0x60c9, 0x007e, 0x067e, 0x0c7e, 0x0d7e,
++	0x7818, 0xa065, 0x0040, 0x615a, 0x6054, 0x007e, 0x6057, 0x0000,
++	0x605b, 0x0000, 0x6000, 0xc0d4, 0xc0dc, 0x6002, 0x1078, 0x44d3,
++	0x0040, 0x6157, 0x7e24, 0x86ff, 0x0040, 0x6149, 0xa680, 0x0004,
++	0x2004, 0xad06, 0x00c0, 0x6149, 0x0d7e, 0x2069, 0x0100, 0x68c0,
++	0xa005, 0x0040, 0x6140, 0x1078, 0x5acb, 0x1078, 0x6e0f, 0x68c3,
++	0x0000, 0x1078, 0x7378, 0x7827, 0x0000, 0x037e, 0x2069, 0x0140,
++	0x6b04, 0xa384, 0x1000, 0x0040, 0x6129, 0x6803, 0x0100, 0x6803,
++	0x0000, 0x2069, 0x0100, 0x6824, 0xd084, 0x0040, 0x6131, 0x6827,
++	0x0001, 0x037f, 0x0d7f, 0x0c7e, 0x603c, 0xa005, 0x0040, 0x613a,
++	0x8001, 0x603e, 0x2660, 0x1078, 0x8ec6, 0x0c7f, 0x0078, 0x6149,
++	0x0d7f, 0x0c7e, 0x2660, 0x6003, 0x0009, 0x630a, 0x0c7f, 0x0078,
++	0x60fe, 0x8dff, 0x0040, 0x6153, 0x6837, 0x0103, 0x6b4a, 0x6847,
++	0x0000, 0x1078, 0x4a73, 0x1078, 0x7233, 0x0078, 0x60fe, 0x007f,
++	0x0078, 0x60f1, 0x781e, 0x781a, 0x0d7f, 0x0c7f, 0x067f, 0x007f,
++	0x007c, 0x0e7e, 0x0d7e, 0x067e, 0x6000, 0xd0dc, 0x0040, 0x6181,
++	0x604c, 0xa06d, 0x0040, 0x6181, 0x6848, 0xa606, 0x00c0, 0x6181,
++	0x2071, 0xa8b1, 0x7024, 0xa035, 0x0040, 0x6181, 0xa080, 0x0004,
++	0x2004, 0xad06, 0x00c0, 0x6181, 0x6000, 0xc0dc, 0x6002, 0x1078,
++	0x6185, 0x067f, 0x0d7f, 0x0e7f, 0x007c, 0x0f7e, 0x2079, 0x0100,
++	0x78c0, 0xa005, 0x00c0, 0x6194, 0x0c7e, 0x2660, 0x6003, 0x0009,
++	0x630a, 0x0c7f, 0x0078, 0x61cb, 0x1078, 0x6e0f, 0x78c3, 0x0000,
++	0x1078, 0x7378, 0x7027, 0x0000, 0x037e, 0x2079, 0x0140, 0x7b04,
++	0xa384, 0x1000, 0x0040, 0x61a8, 0x7803, 0x0100, 0x7803, 0x0000,
++	0x2079, 0x0100, 0x7824, 0xd084, 0x0040, 0x61b0, 0x7827, 0x0001,
++	0x1078, 0x7378, 0x037f, 0x1078, 0x44d3, 0x0c7e, 0x603c, 0xa005,
++	0x0040, 0x61bc, 0x8001, 0x603e, 0x2660, 0x1078, 0x772d, 0x0c7f,
++	0x6837, 0x0103, 0x6b4a, 0x6847, 0x0000, 0x1078, 0x8f7d, 0x1078,
++	0x4a73, 0x1078, 0x7233, 0x0f7f, 0x007c, 0x0e7e, 0x0c7e, 0x2071,
++	0xa8b1, 0x7004, 0xa084, 0x0007, 0x0079, 0x61d6, 0x61e0, 0x61e3,
++	0x61fc, 0x6218, 0x6262, 0x61e0, 0x61e0, 0x61de, 0x1078, 0x1332,
++	0x0c7f, 0x0e7f, 0x007c, 0x7024, 0xa065, 0x0040, 0x61f1, 0x7020,
++	0x8001, 0x7022, 0x600c, 0xa015, 0x0040, 0x61f8, 0x7216, 0x600f,
++	0x0000, 0x7007, 0x0000, 0x7027, 0x0000, 0x0c7f, 0x0e7f, 0x007c,
++	0x7216, 0x7212, 0x0078, 0x61f1, 0x6018, 0x2060, 0x1078, 0x44d3,
++	0x6000, 0xc0dc, 0x6002, 0x7020, 0x8001, 0x7022, 0x0040, 0x620d,
++	0x6054, 0xa015, 0x0040, 0x6214, 0x721e, 0x7007, 0x0000, 0x7027,
++	0x0000, 0x0c7f, 0x0e7f, 0x007c, 0x7218, 0x721e, 0x0078, 0x620d,
++	0x7024, 0xa065, 0x0040, 0x625f, 0x700c, 0xac06, 0x00c0, 0x622f,
++	0x1078, 0x7233, 0x600c, 0xa015, 0x0040, 0x622b, 0x720e, 0x600f,
++	0x0000, 0x0078, 0x625d, 0x720e, 0x720a, 0x0078, 0x625d, 0x7014,
++	0xac06, 0x00c0, 0x6242, 0x1078, 0x7233, 0x600c, 0xa015, 0x0040,
++	0x623e, 0x7216, 0x600f, 0x0000, 0x0078, 0x625d, 0x7216, 0x7212,
++	0x0078, 0x625d, 0x601c, 0xa086, 0x0003, 0x00c0, 0x625d, 0x6018,
++	0x2060, 0x1078, 0x44d3, 0x6000, 0xc0dc, 0x6002, 0x1078, 0x7233,
++	0x701c, 0xa065, 0x0040, 0x625d, 0x6054, 0xa015, 0x0040, 0x625b,
++	0x721e, 0x0078, 0x625d, 0x7218, 0x721e, 0x7027, 0x0000, 0x0c7f,
++	0x0e7f, 0x007c, 0x7024, 0xa065, 0x0040, 0x626f, 0x1078, 0x7233,
++	0x600c, 0xa015, 0x0040, 0x6276, 0x720e, 0x600f, 0x0000, 0x1078,
++	0x7378, 0x7027, 0x0000, 0x0c7f, 0x0e7f, 0x007c, 0x720e, 0x720a,
++	0x0078, 0x626f, 0x0d7e, 0x2069, 0xa8b1, 0x6830, 0xa084, 0x0003,
++	0x0079, 0x6282, 0x6288, 0x628a, 0x62b4, 0x6288, 0x1078, 0x1332,
++	0x0d7f, 0x007c, 0x0c7e, 0x6840, 0xa086, 0x0001, 0x0040, 0x62aa,
++	0x683c, 0xa065, 0x0040, 0x629b, 0x600c, 0xa015, 0x0040, 0x62a6,
++	0x6a3a, 0x600f, 0x0000, 0x6833, 0x0000, 0x683f, 0x0000, 0x2011,
++	0xa8d0, 0x2013, 0x0000, 0x0c7f, 0x0d7f, 0x007c, 0x683a, 0x6836,
++	0x0078, 0x629b, 0x6843, 0x0000, 0x6838, 0xa065, 0x0040, 0x629b,
++	0x6003, 0x0003, 0x0078, 0x629b, 0x0c7e, 0x6843, 0x0000, 0x6847,
++	0x0000, 0x684b, 0x0000, 0x683c, 0xa065, 0x0040, 0x62ce, 0x600c,
++	0xa015, 0x0040, 0x62ca, 0x6a3a, 0x600f, 0x0000, 0x683f, 0x0000,
++	0x0078, 0x62ce, 0x683f, 0x0000, 0x683a, 0x6836, 0x0c7f, 0x0d7f,
++	0x007c, 0x0d7e, 0x2069, 0xa8b1, 0x6804, 0xa084, 0x0007, 0x0079,
++	0x62d9, 0x62e3, 0x638a, 0x638a, 0x638a, 0x638a, 0x638c, 0x638a,
++	0x62e1, 0x1078, 0x1332, 0x6820, 0xa005, 0x00c0, 0x62e9, 0x0d7f,
++	0x007c, 0x0c7e, 0x680c, 0xa065, 0x0040, 0x62f8, 0x6807, 0x0004,
++	0x6826, 0x682b, 0x0000, 0x1078, 0x63d4, 0x0c7f, 0x0d7f, 0x007c,
++	0x6814, 0xa065, 0x0040, 0x6306, 0x6807, 0x0001, 0x6826, 0x682b,
++	0x0000, 0x1078, 0x63d4, 0x0c7f, 0x0d7f, 0x007c, 0x0e7e, 0x037e,
++	0x6a1c, 0xa2f5, 0x0000, 0x0040, 0x6385, 0x704c, 0xa00d, 0x0040,
++	0x6315, 0x7088, 0xa005, 0x0040, 0x632d, 0x7054, 0xa075, 0x0040,
++	0x631e, 0xa20e, 0x0040, 0x6385, 0x0078, 0x6323, 0x6818, 0xa20e,
++	0x0040, 0x6385, 0x2070, 0x704c, 0xa00d, 0x0040, 0x6315, 0x7088,
++	0xa005, 0x00c0, 0x6315, 0x2e00, 0x681e, 0x733c, 0x7038, 0xa302,
++	0x00c8, 0x6315, 0x1078, 0x76fc, 0x0040, 0x6385, 0x8318, 0x733e,
++	0x6112, 0x2e10, 0x621a, 0xa180, 0x0014, 0x2004, 0xa084, 0x00ff,
++	0x6032, 0xa180, 0x0014, 0x2003, 0x0000, 0xa180, 0x0015, 0x2004,
++	0xa08a, 0x199a, 0x0048, 0x634e, 0x2001, 0x1999, 0x8003, 0x801b,
++	0x831b, 0xa318, 0x6316, 0x037f, 0x0f7e, 0x2c78, 0x71a0, 0xd1bc,
++	0x0040, 0x6367, 0x7100, 0xd1f4, 0x0040, 0x6363, 0x7114, 0xa18c,
++	0x00ff, 0x0078, 0x636c, 0x2009, 0x0000, 0x0078, 0x636c, 0xa1e0,
++	0x29c0, 0x2c0c, 0xa18c, 0x00ff, 0x2061, 0x0100, 0x619a, 0x1078,
++	0x6965, 0x7300, 0xc3dd, 0x7302, 0x6807, 0x0002, 0x2f18, 0x6b26,
++	0x682b, 0x0000, 0x781f, 0x0003, 0x7803, 0x0001, 0x7807, 0x0040,
++	0x0f7f, 0x0e7f, 0x0c7f, 0x0d7f, 0x007c, 0x037f, 0x0e7f, 0x0c7f,
++	0x0078, 0x6383, 0x0d7f, 0x007c, 0x0c7e, 0x680c, 0xa065, 0x0040,
++	0x6398, 0x6807, 0x0004, 0x6826, 0x682b, 0x0000, 0x1078, 0x63d4,
++	0x0c7f, 0x0d7f, 0x007c, 0x0f7e, 0x0d7e, 0x2069, 0xa8b1, 0x6830,
++	0xa086, 0x0000, 0x00c0, 0x63bb, 0x6838, 0xa07d, 0x0040, 0x63bb,
++	0x6833, 0x0001, 0x683e, 0x6847, 0x0000, 0x684b, 0x0000, 0x127e,
++	0x0f7e, 0x2091, 0x2200, 0x027f, 0x1078, 0x1d6d, 0x00c0, 0x63be,
++	0x127f, 0x1078, 0x6cb3, 0x0d7f, 0x0f7f, 0x007c, 0x127f, 0x6843,
++	0x0000, 0x7803, 0x0002, 0x780c, 0xa015, 0x0040, 0x63d0, 0x6a3a,
++	0x780f, 0x0000, 0x6833, 0x0000, 0x683f, 0x0000, 0x0078, 0x63bb,
++	0x683a, 0x6836, 0x0078, 0x63ca, 0x601c, 0xa084, 0x000f, 0x1079,
++	0x63da, 0x007c, 0x63e3, 0x63e8, 0x6809, 0x6922, 0x63e8, 0x6809,
++	0x6922, 0x63e3, 0x63e8, 0x1078, 0x61cd, 0x1078, 0x62d1, 0x007c,
++	0x157e, 0x137e, 0x147e, 0x0c7e, 0x0f7e, 0x6004, 0xa08a, 0x0044,
++	0x10c8, 0x1332, 0x6118, 0x2178, 0x79a0, 0xd1bc, 0x0040, 0x6405,
++	0x7900, 0xd1f4, 0x0040, 0x6401, 0x7914, 0xa18c, 0x00ff, 0x0078,
++	0x640a, 0x2009, 0x0000, 0x0078, 0x640a, 0xa1f8, 0x29c0, 0x2f0c,
++	0xa18c, 0x00ff, 0x2c78, 0x2061, 0x0100, 0x619a, 0xa08a, 0x0040,
++	0x00c8, 0x645c, 0x1079, 0x641a, 0x0f7f, 0x0c7f, 0x147f, 0x137f,
++	0x157f, 0x007c, 0x64c2, 0x650a, 0x6532, 0x65cd, 0x65fd, 0x6605,
++	0x662c, 0x663d, 0x664e, 0x6656, 0x666e, 0x6656, 0x66d9, 0x663d,
++	0x66fa, 0x6702, 0x664e, 0x6702, 0x6713, 0x645a, 0x645a, 0x645a,
++	0x645a, 0x645a, 0x645a, 0x645a, 0x645a, 0x645a, 0x645a, 0x645a,
++	0x6eef, 0x6f14, 0x6f29, 0x6f4c, 0x6f6d, 0x662c, 0x645a, 0x662c,
++	0x6656, 0x645a, 0x6532, 0x65cd, 0x645a, 0x749c, 0x6656, 0x645a,
++	0x74bc, 0x6656, 0x645a, 0x645a, 0x64bd, 0x646b, 0x645a, 0x74e1,
++	0x7558, 0x7640, 0x645a, 0x7651, 0x6626, 0x766d, 0x645a, 0x6f82,
++	0x645a, 0x645a, 0x1078, 0x1332, 0x2100, 0x1079, 0x6465, 0x0f7f,
++	0x0c7f, 0x147f, 0x137f, 0x157f, 0x007c, 0x6469, 0x6469, 0x6469,
++	0x649f, 0x1078, 0x1332, 0x0d7e, 0x20a1, 0x020b, 0x1078, 0x6731,
++	0x7810, 0x2068, 0x20a3, 0x2414, 0x20a3, 0x0018, 0x20a3, 0x0800,
++	0x683c, 0x20a2, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000,
++	0x20a3, 0x0000, 0x6850, 0x20a2, 0x6854, 0x20a2, 0x20a3, 0x0000,
++	0x20a3, 0x0000, 0x60c3, 0x0018, 0x1078, 0x6dfb, 0x0d7f, 0x007c,
++	0x0d7e, 0x7818, 0x2068, 0x68a0, 0xa082, 0x007e, 0x0048, 0x649c,
++	0xa085, 0x0001, 0x0d7f, 0x007c, 0xa006, 0x0078, 0x649a, 0x0d7e,
++	0x20a1, 0x020b, 0x1078, 0x6731, 0x20a3, 0x0500, 0x20a3, 0x0000,
++	0x7810, 0xa0e8, 0x000f, 0x6808, 0x20a2, 0x680c, 0x20a2, 0x6810,
++	0x20a2, 0x6814, 0x20a2, 0x6818, 0x20a2, 0x681c, 0x20a2, 0x60c3,
++	0x0010, 0x1078, 0x6dfb, 0x0d7f, 0x007c, 0x6030, 0x609a, 0x1078,
++	0x6dfb, 0x007c, 0x20a1, 0x020b, 0x1078, 0x6731, 0x20a3, 0x5200,
++	0x20a3, 0x0000, 0x0d7e, 0x2069, 0xa652, 0x6804, 0xd084, 0x0040,
++	0x64dc, 0x6828, 0x20a3, 0x0000, 0x017e, 0x1078, 0x2564, 0x21a2,
++	0x017f, 0x0d7f, 0x0078, 0x64e1, 0x0d7f, 0x20a3, 0x0000, 0x20a3,
++	0x0000, 0x20a9, 0x0004, 0x2099, 0xa605, 0x53a6, 0x20a9, 0x0004,
++	0x2099, 0xa601, 0x53a6, 0x7818, 0xa080, 0x0028, 0x2004, 0xa082,
++	0x007f, 0x0048, 0x64fb, 0x2001, 0xa61b, 0x20a6, 0x2001, 0xa61c,
++	0x20a6, 0x0078, 0x6501, 0x20a3, 0x0000, 0x6030, 0xa084, 0x00ff,
++	0x20a2, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x001c, 0x1078,
++	0x6dfb, 0x007c, 0x20a1, 0x020b, 0x1078, 0x6731, 0x20a3, 0x0500,
++	0x20a3, 0x0000, 0x7818, 0xa080, 0x0028, 0x2004, 0xa082, 0x007f,
++	0x0048, 0x6522, 0x2001, 0xa61b, 0x20a6, 0x2001, 0xa61c, 0x20a6,
++	0x0078, 0x6528, 0x20a3, 0x0000, 0x6030, 0xa084, 0x00ff, 0x20a2,
++	0x20a9, 0x0004, 0x2099, 0xa605, 0x53a6, 0x60c3, 0x0010, 0x1078,
++	0x6dfb, 0x007c, 0x20a1, 0x020b, 0x1078, 0x6731, 0x0c7e, 0x7818,
++	0x2060, 0x2001, 0x0000, 0x1078, 0x4972, 0x0c7f, 0x7818, 0xa080,
++	0x0028, 0x2004, 0xa086, 0x007e, 0x00c0, 0x654d, 0x20a3, 0x0400,
++	0x620c, 0xc2b4, 0x620e, 0x0078, 0x654f, 0x20a3, 0x0300, 0x20a3,
++	0x0000, 0x7818, 0xa080, 0x0028, 0x2004, 0xa086, 0x007e, 0x00c0,
++	0x659c, 0x2099, 0xa88d, 0x33a6, 0x9398, 0x33a6, 0x9398, 0x3304,
++	0xa084, 0x3fff, 0x20a2, 0x9398, 0x33a6, 0x20a3, 0x0000, 0x20a3,
++	0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a9, 0x0004, 0x2099,
++	0xa605, 0x53a6, 0x20a9, 0x0004, 0x2099, 0xa601, 0x53a6, 0x20a9,
++	0x0010, 0x20a3, 0x0000, 0x00f0, 0x6579, 0x2099, 0xa895, 0x3304,
++	0xc0dd, 0x20a2, 0x2001, 0xa672, 0x2004, 0xd0e4, 0x0040, 0x6594,
++	0x20a3, 0x0000, 0x20a3, 0x0000, 0x9398, 0x9398, 0x9398, 0x33a6,
++	0x20a9, 0x0004, 0x0078, 0x6596, 0x20a9, 0x0007, 0x20a3, 0x0000,
++	0x00f0, 0x6596, 0x0078, 0x65bc, 0x2099, 0xa88d, 0x20a9, 0x0008,
++	0x53a6, 0x20a9, 0x0004, 0x2099, 0xa605, 0x53a6, 0x20a9, 0x0004,
++	0x2099, 0xa601, 0x53a6, 0x20a9, 0x0008, 0x20a3, 0x0000, 0x00f0,
++	0x65ad, 0x20a9, 0x0008, 0x20a3, 0x0000, 0x00f0, 0x65b3, 0x2099,
++	0xa895, 0x20a9, 0x0008, 0x53a6, 0x20a9, 0x0008, 0x20a3, 0x0000,
++	0x00f0, 0x65be, 0x20a9, 0x000a, 0x20a3, 0x0000, 0x00f0, 0x65c4,
++	0x60c3, 0x0074, 0x1078, 0x6dfb, 0x007c, 0x20a1, 0x020b, 0x1078,
++	0x6731, 0x20a3, 0x2010, 0x20a3, 0x0014, 0x20a3, 0x0800, 0x20a3,
++	0x2000, 0xa006, 0x20a2, 0x20a2, 0x20a2, 0x20a2, 0x20a2, 0x0f7e,
++	0x2079, 0xa652, 0x7904, 0x0f7f, 0xd1ac, 0x00c0, 0x65e9, 0xa085,
++	0x0020, 0xd1a4, 0x0040, 0x65ee, 0xa085, 0x0010, 0xa085, 0x0002,
++	0x0d7e, 0x0078, 0x66b7, 0x20a2, 0x20a3, 0x0000, 0x20a3, 0x0000,
++	0x60c3, 0x0014, 0x1078, 0x6dfb, 0x007c, 0x20a1, 0x020b, 0x1078,
++	0x6731, 0x20a3, 0x5000, 0x0078, 0x654f, 0x20a1, 0x020b, 0x1078,
++	0x6731, 0x20a3, 0x2110, 0x20a3, 0x0014, 0x20a3, 0x0000, 0x20a3,
++	0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3,
++	0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3,
++	0x0000, 0x60c3, 0x0014, 0x1078, 0x6dfb, 0x007c, 0x20a1, 0x020b,
++	0x1078, 0x67b9, 0x0078, 0x6630, 0x20a1, 0x020b, 0x1078, 0x67c2,
++	0x20a3, 0x0200, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000,
++	0x60c3, 0x0004, 0x1078, 0x6dfb, 0x007c, 0x20a1, 0x020b, 0x1078,
++	0x67c2, 0x20a3, 0x0100, 0x20a3, 0x0000, 0x20a3, 0x0003, 0x20a3,
++	0x2a00, 0x60c3, 0x0008, 0x1078, 0x6dfb, 0x007c, 0x20a1, 0x020b,
++	0x1078, 0x67c2, 0x20a3, 0x0200, 0x0078, 0x654f, 0x20a1, 0x020b,
++	0x1078, 0x67c2, 0x20a3, 0x0100, 0x20a3, 0x0000, 0x7828, 0xa005,
++	0x0040, 0x6665, 0x20a2, 0x0078, 0x6667, 0x20a3, 0x0003, 0x7810,
++	0x20a2, 0x60c3, 0x0008, 0x1078, 0x6dfb, 0x007c, 0x0d7e, 0x20a1,
++	0x020b, 0x1078, 0x67c2, 0x20a3, 0x0210, 0x20a3, 0x0014, 0x20a3,
++	0x0800, 0x7818, 0x2068, 0x6894, 0xa086, 0x0014, 0x00c0, 0x6694,
++	0x6998, 0xa184, 0xc000, 0x00c0, 0x6690, 0xd1ec, 0x0040, 0x668c,
++	0x20a3, 0x2100, 0x0078, 0x6696, 0x20a3, 0x0100, 0x0078, 0x6696,
++	0x20a3, 0x0400, 0x0078, 0x6696, 0x20a3, 0x0700, 0xa006, 0x20a2,
++	0x20a2, 0x20a2, 0x20a2, 0x20a2, 0x0f7e, 0x2079, 0xa652, 0x7904,
++	0x0f7f, 0xd1ac, 0x00c0, 0x66a6, 0xa085, 0x0020, 0xd1a4, 0x0040,
++	0x66ab, 0xa085, 0x0010, 0x2009, 0xa674, 0x210c, 0xd184, 0x0040,
++	0x66b5, 0x699c, 0xd18c, 0x0040, 0x66b7, 0xa085, 0x0002, 0x027e,
++	0x2009, 0xa672, 0x210c, 0xd1e4, 0x0040, 0x66c5, 0xc0c5, 0xa094,
++	0x0030, 0xa296, 0x0010, 0x0040, 0x66cf, 0xd1ec, 0x0040, 0x66cf,
++	0xa094, 0x0030, 0xa296, 0x0010, 0x0040, 0x66cf, 0xc0bd, 0x027f,
++	0x20a2, 0x20a2, 0x20a2, 0x60c3, 0x0014, 0x1078, 0x6dfb, 0x0d7f,
++	0x007c, 0x20a1, 0x020b, 0x1078, 0x67c2, 0x20a3, 0x0210, 0x20a3,
++	0x0014, 0x20a3, 0x0000, 0x20a3, 0x0100, 0x20a3, 0x0000, 0x20a3,
++	0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3,
++	0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x0014, 0x1078,
++	0x6dfb, 0x007c, 0x20a1, 0x020b, 0x1078, 0x67c2, 0x20a3, 0x0200,
++	0x0078, 0x64c8, 0x20a1, 0x020b, 0x1078, 0x67c2, 0x20a3, 0x0100,
++	0x20a3, 0x0000, 0x20a3, 0x0003, 0x20a3, 0x2a00, 0x60c3, 0x0008,
++	0x1078, 0x6dfb, 0x007c, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x20a1,
++	0x020b, 0x1078, 0x67c2, 0x20a3, 0x0100, 0x20a3, 0x0000, 0x20a3,
++	0x000b, 0x20a3, 0x0000, 0x60c3, 0x0008, 0x1078, 0x6dfb, 0x007c,
++	0x027e, 0x037e, 0x047e, 0x2019, 0x3200, 0x2021, 0x0800, 0x0078,
++	0x6738, 0x027e, 0x037e, 0x047e, 0x2019, 0x2200, 0x2021, 0x0100,
++	0x20e1, 0x9080, 0x20e1, 0x4000, 0x7818, 0xa080, 0x0028, 0x2014,
++	0xa286, 0x007e, 0x00c0, 0x674b, 0xa385, 0x00ff, 0x20a2, 0x20a3,
++	0xfffe, 0x0078, 0x6780, 0xa286, 0x007f, 0x00c0, 0x6757, 0x0d7e,
++	0xa385, 0x00ff, 0x20a2, 0x20a3, 0xfffd, 0x0078, 0x676e, 0xd2bc,
++	0x0040, 0x6776, 0xa286, 0x0080, 0x0d7e, 0x00c0, 0x6766, 0xa385,
++	0x00ff, 0x20a2, 0x20a3, 0xfffc, 0x0078, 0x676e, 0xa2e8, 0xa735,
++	0x2d6c, 0x6810, 0xa305, 0x20a2, 0x6814, 0x20a2, 0x2069, 0xa61b,
++	0x2da6, 0x8d68, 0x2da6, 0x0d7f, 0x0078, 0x6784, 0x0d7e, 0xa2e8,
++	0xa735, 0x2d6c, 0x6810, 0xa305, 0x20a2, 0x6814, 0x20a2, 0x0d7f,
++	0x20a3, 0x0000, 0x6230, 0x22a2, 0xa485, 0x0029, 0x20a2, 0x047f,
++	0x037f, 0x20a3, 0x0000, 0x1078, 0x6dea, 0x22a2, 0x20a3, 0x0000,
++	0x2fa2, 0x20a3, 0xffff, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x027f,
++	0x007c, 0x027e, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x20a3, 0x02ff,
++	0x2011, 0xfffc, 0x22a2, 0x0d7e, 0x2069, 0xa61b, 0x2da6, 0x8d68,
++	0x2da6, 0x0d7f, 0x20a3, 0x2029, 0x20a3, 0x0000, 0x0078, 0x678b,
++	0x20a3, 0x0100, 0x20a3, 0x0000, 0x20a3, 0xfc02, 0x20a3, 0x0000,
++	0x007c, 0x027e, 0x037e, 0x047e, 0x2019, 0x3300, 0x2021, 0x0800,
++	0x0078, 0x67c9, 0x027e, 0x037e, 0x047e, 0x2019, 0x2300, 0x2021,
++	0x0100, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x7818, 0xa080, 0x0028,
++	0x2004, 0xa092, 0x007e, 0x0048, 0x67e6, 0x0d7e, 0xa0e8, 0xa735,
++	0x2d6c, 0x6810, 0xa305, 0x20a2, 0x6814, 0x20a2, 0x2069, 0xa61b,
++	0x2da6, 0x8d68, 0x2da6, 0x0d7f, 0x0078, 0x67f4, 0x0d7e, 0xa0e8,
++	0xa735, 0x2d6c, 0x6810, 0xa305, 0x20a2, 0x6814, 0x20a2, 0x0d7f,
++	0x20a3, 0x0000, 0x6230, 0x22a2, 0xa485, 0x0098, 0x20a2, 0x20a3,
++	0x0000, 0x047f, 0x037f, 0x1078, 0x6dea, 0x22a2, 0x20a3, 0x0000,
++	0x7a08, 0x22a2, 0x2fa2, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x027f,
++	0x007c, 0x0c7e, 0x0f7e, 0x6004, 0xa08a, 0x0085, 0x1048, 0x1332,
++	0xa08a, 0x008c, 0x10c8, 0x1332, 0x6118, 0x2178, 0x79a0, 0xd1bc,
++	0x0040, 0x6827, 0x7900, 0xd1f4, 0x0040, 0x6823, 0x7914, 0xa18c,
++	0x00ff, 0x0078, 0x682c, 0x2009, 0x0000, 0x0078, 0x682c, 0xa1f8,
++	0x29c0, 0x2f0c, 0xa18c, 0x00ff, 0x2c78, 0x2061, 0x0100, 0x619a,
++	0xa082, 0x0085, 0x1079, 0x6837, 0x0f7f, 0x0c7f, 0x007c, 0x6840,
++	0x684b, 0x6866, 0x683e, 0x683e, 0x683e, 0x6840, 0x1078, 0x1332,
++	0x147e, 0x20a1, 0x020b, 0x1078, 0x6879, 0x60c3, 0x0000, 0x1078,
++	0x6dfb, 0x147f, 0x007c, 0x147e, 0x20a1, 0x020b, 0x1078, 0x68ad,
++	0x20a3, 0x0000, 0x20a3, 0x0000, 0x7808, 0x20a2, 0x7810, 0x20a2,
++	0x20a3, 0x0000, 0x20a3, 0xffff, 0x20a3, 0x0000, 0x20a3, 0x0000,
++	0x60c3, 0x000c, 0x1078, 0x6dfb, 0x147f, 0x007c, 0x147e, 0x20a1,
++	0x020b, 0x1078, 0x68ee, 0x20a3, 0x0003, 0x20a3, 0x0300, 0x20a3,
++	0x0000, 0x20a3, 0x0000, 0x60c3, 0x0004, 0x1078, 0x6dfb, 0x147f,
++	0x007c, 0x027e, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x7818, 0xa080,
++	0x0028, 0x2004, 0xa092, 0x007e, 0x0048, 0x6898, 0x0d7e, 0xa0e8,
++	0xa735, 0x2d6c, 0x6810, 0xa085, 0x8100, 0x20a2, 0x6814, 0x20a2,
++	0x2069, 0xa61b, 0x2da6, 0x8d68, 0x2da6, 0x0d7f, 0x0078, 0x68a7,
++	0x0d7e, 0xa0e8, 0xa735, 0x2d6c, 0x6810, 0xa085, 0x8100, 0x20a2,
++	0x6814, 0x20a2, 0x0d7f, 0x20a3, 0x0000, 0x6230, 0x22a2, 0x20a3,
++	0x0009, 0x20a3, 0x0000, 0x0078, 0x678b, 0x027e, 0x20e1, 0x9080,
++	0x20e1, 0x4000, 0x7818, 0xa080, 0x0028, 0x2004, 0xa092, 0x007e,
++	0x0048, 0x68cc, 0x0d7e, 0xa0e8, 0xa735, 0x2d6c, 0x6810, 0xa085,
++	0x8400, 0x20a2, 0x6814, 0x20a2, 0x2069, 0xa61b, 0x2da6, 0x8d68,
++	0x2da6, 0x0d7f, 0x0078, 0x68db, 0x0d7e, 0xa0e8, 0xa735, 0x2d6c,
++	0x6810, 0xa085, 0x8400, 0x20a2, 0x6814, 0x20a2, 0x0d7f, 0x20a3,
++	0x0000, 0x6230, 0x22a2, 0x20a3, 0x0099, 0x20a3, 0x0000, 0x1078,
++	0x6dea, 0x22a2, 0x20a3, 0x0000, 0x7a08, 0x22a2, 0x7a10, 0x22a2,
++	0x20a3, 0x0000, 0x20a3, 0x0000, 0x027f, 0x007c, 0x027e, 0x20e1,
++	0x9080, 0x20e1, 0x4000, 0x7818, 0xa080, 0x0028, 0x2004, 0xa092,
++	0x007e, 0x0048, 0x690d, 0x0d7e, 0xa0e8, 0xa735, 0x2d6c, 0x6810,
++	0xa085, 0x8500, 0x20a2, 0x6814, 0x20a2, 0x2069, 0xa61b, 0x2da6,
++	0x8d68, 0x2da6, 0x0d7f, 0x0078, 0x691c, 0x0d7e, 0xa0e8, 0xa735,
++	0x2d6c, 0x6810, 0xa085, 0x8500, 0x20a2, 0x6814, 0x20a2, 0x0d7f,
++	0x20a3, 0x0000, 0x6230, 0x22a2, 0x20a3, 0x0099, 0x20a3, 0x0000,
++	0x0078, 0x68df, 0x0c7e, 0x0f7e, 0x2c78, 0x7804, 0xa08a, 0x0040,
++	0x1048, 0x1332, 0xa08a, 0x0053, 0x10c8, 0x1332, 0x7918, 0x2160,
++	0x61a0, 0xd1bc, 0x0040, 0x6941, 0x6100, 0xd1f4, 0x0040, 0x693d,
++	0x6114, 0xa18c, 0x00ff, 0x0078, 0x6946, 0x2009, 0x0000, 0x0078,
++	0x6946, 0xa1e0, 0x29c0, 0x2c0c, 0xa18c, 0x00ff, 0x2061, 0x0100,
++	0x619a, 0xa082, 0x0040, 0x1079, 0x6950, 0x0f7f, 0x0c7f, 0x007c,
++	0x6965, 0x6a73, 0x6a14, 0x6c27, 0x6963, 0x6963, 0x6963, 0x6963,
++	0x6963, 0x6963, 0x6963, 0x714c, 0x715d, 0x716e, 0x717f, 0x6963,
++	0x767e, 0x6963, 0x713b, 0x1078, 0x1332, 0x0d7e, 0x157e, 0x147e,
++	0x780b, 0xffff, 0x20a1, 0x020b, 0x1078, 0x69d0, 0x7910, 0x2168,
++	0x6948, 0x7922, 0x21a2, 0xa016, 0x22a2, 0x22a2, 0x22a2, 0x694c,
++	0xa184, 0x000f, 0x00c0, 0x6980, 0x2001, 0x0005, 0x0078, 0x698a,
++	0xd184, 0x0040, 0x6987, 0x2001, 0x0004, 0x0078, 0x698a, 0xa084,
++	0x0006, 0x8004, 0x017e, 0x2008, 0x7830, 0xa084, 0x00ff, 0x8007,
++	0xa105, 0x017f, 0x20a2, 0xd1ac, 0x0040, 0x699a, 0x20a3, 0x0002,
++	0x0078, 0x69a6, 0xd1b4, 0x0040, 0x69a1, 0x20a3, 0x0001, 0x0078,
++	0x69a6, 0x20a3, 0x0000, 0x2230, 0x0078, 0x69a8, 0x6a80, 0x6e7c,
++	0x20a9, 0x0008, 0xad80, 0x0017, 0x200c, 0x810f, 0x21a2, 0x8000,
++	0x00f0, 0x69ac, 0x22a2, 0x26a2, 0x60c3, 0x0020, 0x20e1, 0x9080,
++	0x6014, 0xa084, 0x0004, 0xa085, 0x0009, 0x6016, 0x2001, 0xa8cd,
++	0x2003, 0x07d0, 0x2001, 0xa8cc, 0x2003, 0x0009, 0x2001, 0xa8d2,
++	0x2003, 0x0002, 0x1078, 0x158c, 0x147f, 0x157f, 0x0d7f, 0x007c,
++	0x20e1, 0x9080, 0x20e1, 0x4000, 0x7a18, 0xa280, 0x0023, 0x2014,
++	0x8210, 0xa294, 0x00ff, 0x2202, 0x8217, 0x7818, 0xa080, 0x0028,
++	0x2004, 0xd0bc, 0x0040, 0x69f6, 0x0d7e, 0xa0e8, 0xa735, 0x2d6c,
++	0x6810, 0xa085, 0x0600, 0x20a2, 0x6814, 0x20a2, 0x2069, 0xa61b,
++	0x2da6, 0x8d68, 0x2da6, 0x0d7f, 0x0078, 0x6a05, 0x0d7e, 0xa0e8,
++	0xa735, 0x2d6c, 0x6810, 0xa085, 0x0600, 0x20a2, 0x6814, 0x20a2,
++	0x0d7f, 0x20a3, 0x0000, 0x6130, 0x21a2, 0x20a3, 0x0829, 0x20a3,
++	0x0000, 0x22a2, 0x20a3, 0x0000, 0x2fa2, 0x20a3, 0xffff, 0x20a3,
++	0x0000, 0x20a3, 0x0000, 0x007c, 0x0d7e, 0x157e, 0x137e, 0x147e,
++	0x20a1, 0x020b, 0x1078, 0x6a34, 0x7810, 0x2068, 0x6860, 0x20a2,
++	0x685c, 0x20a2, 0x6880, 0x20a2, 0x687c, 0x20a2, 0xa006, 0x20a2,
++	0x20a2, 0x20a2, 0x20a2, 0x60c3, 0x000c, 0x1078, 0x6dfb, 0x147f,
++	0x137f, 0x157f, 0x0d7f, 0x007c, 0x027e, 0x20e1, 0x9080, 0x20e1,
++	0x4000, 0x7818, 0xa080, 0x0028, 0x2004, 0xd0bc, 0x0040, 0x6a52,
++	0x0d7e, 0xa0e8, 0xa735, 0x2d6c, 0x6810, 0xa085, 0x0500, 0x20a2,
++	0x6814, 0x20a2, 0x2069, 0xa61b, 0x2da6, 0x8d68, 0x2da6, 0x0d7f,
++	0x0078, 0x6a61, 0x0d7e, 0xa0e8, 0xa735, 0x2d6c, 0x6810, 0xa085,
++	0x0500, 0x20a2, 0x6814, 0x20a2, 0x0d7f, 0x20a3, 0x0000, 0x6230,
++	0x22a2, 0x20a3, 0x0889, 0x20a3, 0x0000, 0x1078, 0x6dea, 0x22a2,
++	0x20a3, 0x0000, 0x7a08, 0x22a2, 0x2fa2, 0x20a3, 0x0000, 0x20a3,
++	0x0000, 0x027f, 0x007c, 0x0d7e, 0x157e, 0x137e, 0x147e, 0x7810,
++	0xa0ec, 0xf000, 0x0040, 0x6a8b, 0xa06d, 0x1078, 0x495f, 0x0040,
++	0x6a8b, 0x684c, 0xa084, 0x2020, 0xa086, 0x2020, 0x00c0, 0x6a8b,
++	0x7824, 0xc0cd, 0x7826, 0x20a1, 0x020b, 0x1078, 0x6be0, 0xa016,
++	0x22a2, 0x22a2, 0x22a2, 0x22a2, 0x22a2, 0x7810, 0xa084, 0xf000,
++	0x00c0, 0x6aa2, 0x7810, 0xa084, 0x0700, 0x8007, 0x1079, 0x6aaa,
++	0x0078, 0x6aa5, 0xa006, 0x1079, 0x6aaa, 0x147f, 0x137f, 0x157f,
++	0x0d7f, 0x007c, 0x6ab4, 0x6b4c, 0x6b57, 0x6b81, 0x6b95, 0x6bb1,
++	0x6bbc, 0x6ab2, 0x1078, 0x1332, 0x017e, 0x037e, 0x694c, 0xa18c,
++	0x0003, 0x0040, 0x6abf, 0xa186, 0x0003, 0x00c0, 0x6ace, 0x6b78,
++	0x7824, 0xd0cc, 0x0040, 0x6ac5, 0xc3e5, 0x23a2, 0x6868, 0x20a2,
++	0x6864, 0x20a2, 0x037f, 0x017f, 0x0078, 0x6b8c, 0xa186, 0x0001,
++	0x10c0, 0x1332, 0x6b78, 0x7824, 0xd0cc, 0x0040, 0x6ad8, 0xc3e5,
++	0x23a2, 0x6868, 0x20a2, 0x6864, 0x20a2, 0x22a2, 0x6874, 0x20a2,
++	0x22a2, 0x687c, 0x20a2, 0x2009, 0x0018, 0xa384, 0x0300, 0x0040,
++	0x6b46, 0xd3c4, 0x0040, 0x6aee, 0x687c, 0xa108, 0xd3cc, 0x0040,
++	0x6af3, 0x6874, 0xa108, 0x157e, 0x20a9, 0x000d, 0xad80, 0x0020,
++	0x201c, 0x831f, 0x23a2, 0x8000, 0x00f0, 0x6af8, 0x157f, 0x22a2,
++	0x22a2, 0x22a2, 0xa184, 0x0003, 0x0040, 0x6b46, 0x20a1, 0x020b,
++	0x20e1, 0x9080, 0x20e1, 0x4000, 0x007e, 0x7818, 0xa080, 0x0028,
++	0x2004, 0xd0bc, 0x0040, 0x6b26, 0x0d7e, 0xa0e8, 0xa735, 0x2d6c,
++	0x6810, 0xa085, 0x0700, 0x20a2, 0x6814, 0x20a2, 0x2069, 0xa61b,
++	0x2da6, 0x8d68, 0x2da6, 0x0d7f, 0x0078, 0x6b35, 0x0d7e, 0xa0e8,
++	0xa735, 0x2d6c, 0x6810, 0xa085, 0x0700, 0x20a2, 0x6814, 0x20a2,
++	0x0d7f, 0x20a3, 0x0000, 0x6230, 0x22a2, 0x007f, 0x7b24, 0xd3cc,
++	0x0040, 0x6b3e, 0x20a3, 0x0889, 0x0078, 0x6b40, 0x20a3, 0x0898,
++	0x20a2, 0x1078, 0x6dea, 0x22a2, 0x20a3, 0x0000, 0x61c2, 0x037f,
++	0x017f, 0x1078, 0x6dfb, 0x007c, 0x2011, 0x0008, 0x7824, 0xd0cc,
++	0x0040, 0x6b53, 0xc2e5, 0x22a2, 0xa016, 0x0078, 0x6b8a, 0x2011,
++	0x0302, 0x7824, 0xd0cc, 0x0040, 0x6b5e, 0xc2e5, 0x22a2, 0xa016,
++	0x22a2, 0x22a2, 0x22a2, 0x20a3, 0x0012, 0x22a2, 0x20a3, 0x0008,
++	0x22a2, 0x22a2, 0x22a2, 0x22a2, 0x20a3, 0x7000, 0x20a3, 0x0500,
++	0x22a2, 0x20a3, 0x000a, 0x22a2, 0x22a2, 0x20a3, 0x2500, 0x22a2,
++	0x22a2, 0x22a2, 0x22a2, 0x22a2, 0x60c3, 0x0032, 0x1078, 0x6dfb,
++	0x007c, 0x2011, 0x0028, 0x7824, 0xd0cc, 0x0040, 0x6b88, 0xc2e5,
++	0x22a2, 0xa016, 0x22a2, 0x22a2, 0x22a2, 0x22a2, 0x22a2, 0x22a2,
++	0x60c3, 0x0018, 0x1078, 0x6dfb, 0x007c, 0x2011, 0x0100, 0x7824,
++	0xd0cc, 0x0040, 0x6b9c, 0xc2e5, 0x22a2, 0xa016, 0x22a2, 0x22a2,
++	0x22a2, 0x22a2, 0x22a2, 0x20a3, 0x0008, 0x22a2, 0x7834, 0xa084,
++	0x00ff, 0x20a2, 0x22a2, 0x22a2, 0x60c3, 0x0020, 0x1078, 0x6dfb,
++	0x007c, 0x2011, 0x0008, 0x7824, 0xd0cc, 0x0040, 0x6bb8, 0xc2e5,
++	0x22a2, 0xa016, 0x0078, 0x6b8a, 0x037e, 0x7b10, 0xa384, 0xff00,
++	0x7812, 0xa384, 0x00ff, 0x8001, 0x00c0, 0x6bcf, 0x7824, 0xd0cc,
++	0x0040, 0x6bcb, 0xc2e5, 0x22a2, 0x037f, 0x0078, 0x6b8a, 0x047e,
++	0x2021, 0x0800, 0x007e, 0x7824, 0xd0cc, 0x007f, 0x0040, 0x6bd9,
++	0xc4e5, 0x24a2, 0x047f, 0x22a2, 0x20a2, 0x037f, 0x0078, 0x6b8c,
++	0x027e, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x7818, 0xa080, 0x0028,
++	0x2004, 0xd0bc, 0x0040, 0x6bfe, 0x0d7e, 0xa0e8, 0xa735, 0x2d6c,
++	0x6810, 0xa085, 0x0700, 0x20a2, 0x6814, 0x20a2, 0x2069, 0xa61b,
++	0x2da6, 0x8d68, 0x2da6, 0x0d7f, 0x0078, 0x6c0d, 0x0d7e, 0xa0e8,
++	0xa735, 0x2d6c, 0x6810, 0xa085, 0x0700, 0x20a2, 0x6814, 0x20a2,
++	0x0d7f, 0x20a3, 0x0000, 0x6230, 0x22a2, 0x7824, 0xd0cc, 0x0040,
++	0x6c15, 0x20a3, 0x0889, 0x0078, 0x6c17, 0x20a3, 0x0898, 0x20a3,
++	0x0000, 0x1078, 0x6dea, 0x22a2, 0x20a3, 0x0000, 0x7a08, 0x22a2,
++	0x2fa2, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x027f, 0x007c, 0x0d7e,
++	0x157e, 0x137e, 0x147e, 0x017e, 0x037e, 0x7810, 0xa084, 0x0700,
++	0x8007, 0x1079, 0x6c3a, 0x037f, 0x017f, 0x147f, 0x137f, 0x157f,
++	0x0d7f, 0x007c, 0x6c42, 0x6c42, 0x6c44, 0x6c42, 0x6c42, 0x6c42,
++	0x6c69, 0x6c42, 0x1078, 0x1332, 0x7910, 0xa18c, 0xf8ff, 0xa18d,
++	0x0600, 0x7912, 0x20a1, 0x020b, 0x2009, 0x0003, 0x1078, 0x6c73,
++	0x0d7e, 0x2069, 0xa652, 0x6804, 0xd0bc, 0x0040, 0x6c5e, 0x682c,
++	0xa084, 0x00ff, 0x8007, 0x20a2, 0x0078, 0x6c60, 0x20a3, 0x3f00,
++	0x0d7f, 0x22a2, 0x22a2, 0x22a2, 0x60c3, 0x0001, 0x1078, 0x6dfb,
++	0x007c, 0x20a1, 0x020b, 0x2009, 0x0003, 0x1078, 0x6c73, 0x20a3,
++	0x7f00, 0x0078, 0x6c61, 0x027e, 0x20e1, 0x9080, 0x20e1, 0x4000,
++	0x7818, 0xa080, 0x0028, 0x2004, 0xd0bc, 0x0040, 0x6c91, 0x0d7e,
++	0xa0e8, 0xa735, 0x2d6c, 0x6810, 0xa085, 0x0100, 0x20a2, 0x6814,
++	0x20a2, 0x2069, 0xa61b, 0x2da6, 0x8d68, 0x2da6, 0x0d7f, 0x0078,
++	0x6ca0, 0x0d7e, 0xa0e8, 0xa735, 0x2d6c, 0x6810, 0xa085, 0x0100,
++	0x20a2, 0x6814, 0x20a2, 0x0d7f, 0x20a3, 0x0000, 0x6230, 0x22a2,
++	0x20a3, 0x0888, 0xa18d, 0x0008, 0x21a2, 0x1078, 0x6dea, 0x22a2,
++	0x20a3, 0x0000, 0x7a08, 0x22a2, 0x2fa2, 0x20a3, 0x0000, 0x20a3,
++	0x0000, 0x027f, 0x007c, 0x0e7e, 0x0d7e, 0x0c7e, 0x057e, 0x047e,
++	0x037e, 0x2061, 0x0100, 0x2071, 0xa600, 0x6130, 0x7818, 0x2068,
++	0x68a0, 0x2028, 0xd0bc, 0x00c0, 0x6cca, 0x6910, 0x6a14, 0x6430,
++	0x0078, 0x6cce, 0x6910, 0x6a14, 0x736c, 0x7470, 0x781c, 0xa086,
++	0x0006, 0x0040, 0x6d2d, 0xd5bc, 0x0040, 0x6cde, 0xa185, 0x0100,
++	0x6062, 0x6266, 0x636a, 0x646e, 0x0078, 0x6ce5, 0xa185, 0x0100,
++	0x6062, 0x6266, 0x606b, 0x0000, 0x646e, 0x6073, 0x0809, 0x6077,
++	0x0008, 0x688c, 0x8000, 0xa084, 0x00ff, 0x688e, 0x8007, 0x607a,
++	0x607f, 0x0000, 0x2f00, 0x6082, 0x7808, 0x6086, 0x7810, 0x2070,
++	0x7014, 0x608a, 0x7010, 0x608e, 0x700c, 0x60c6, 0x7008, 0x60ca,
++	0x686c, 0x60ce, 0x60ab, 0x0036, 0x60af, 0x95d5, 0x60d7, 0x0000,
++	0xa582, 0x0080, 0x0048, 0x6d17, 0x6a00, 0xd2f4, 0x0040, 0x6d15,
++	0x6a14, 0xa294, 0x00ff, 0x0078, 0x6d17, 0x2011, 0x0000, 0x629e,
++	0x6017, 0x0016, 0x2009, 0x07d0, 0x60c4, 0xa084, 0xfff0, 0xa005,
++	0x0040, 0x6d24, 0x2009, 0x1b58, 0x1078, 0x5ad0, 0x037f, 0x047f,
++	0x057f, 0x0c7f, 0x0d7f, 0x0e7f, 0x007c, 0x7810, 0x2070, 0x704c,
++	0xa084, 0x0003, 0xa086, 0x0002, 0x0040, 0x6d85, 0xd5bc, 0x0040,
++	0x6d41, 0xa185, 0x0100, 0x6062, 0x6266, 0x636a, 0x646e, 0x0078,
++	0x6d48, 0xa185, 0x0100, 0x6062, 0x6266, 0x606b, 0x0000, 0x646e,
++	0x6073, 0x0880, 0x6077, 0x0008, 0x688c, 0x8000, 0xa084, 0x00ff,
++	0x688e, 0x8007, 0x607a, 0x607f, 0x0000, 0x2f00, 0x6086, 0x7808,
++	0x6082, 0x7060, 0x608a, 0x705c, 0x608e, 0x7080, 0x60c6, 0x707c,
++	0x60ca, 0x707c, 0x792c, 0xa108, 0x792e, 0x7080, 0x7928, 0xa109,
++	0x792a, 0x686c, 0x60ce, 0x60ab, 0x0036, 0x60af, 0x95d5, 0x60d7,
++	0x0000, 0xa582, 0x0080, 0x0048, 0x6d80, 0x6a00, 0xd2f4, 0x0040,
++	0x6d7e, 0x6a14, 0xa294, 0x00ff, 0x0078, 0x6d80, 0x2011, 0x0000,
++	0x629e, 0x6017, 0x0012, 0x0078, 0x6d1a, 0xd5bc, 0x0040, 0x6d90,
++	0xa185, 0x0700, 0x6062, 0x6266, 0x636a, 0x646e, 0x0078, 0x6d97,
++	0xa185, 0x0700, 0x6062, 0x6266, 0x606b, 0x0000, 0x646e, 0x1078,
++	0x495f, 0x0040, 0x6dad, 0x0d7e, 0x7810, 0xa06d, 0x684c, 0x0d7f,
++	0xa084, 0x2020, 0xa086, 0x2020, 0x00c0, 0x6dad, 0x7824, 0xc0cd,
++	0x7826, 0x6073, 0x0889, 0x0078, 0x6daf, 0x6073, 0x0898, 0x6077,
++	0x0000, 0x688c, 0x8000, 0xa084, 0x00ff, 0x688e, 0x8007, 0x607a,
++	0x607f, 0x0000, 0x2f00, 0x6086, 0x7808, 0x6082, 0x7014, 0x608a,
++	0x7010, 0x608e, 0x700c, 0x60c6, 0x7008, 0x60ca, 0x686c, 0x60ce,
++	0x60ab, 0x0036, 0x60af, 0x95d5, 0x60d7, 0x0000, 0xa582, 0x0080,
++	0x0048, 0x6ddd, 0x6a00, 0xd2f4, 0x0040, 0x6ddb, 0x6a14, 0xa294,
++	0x00ff, 0x0078, 0x6ddd, 0x2011, 0x0000, 0x629e, 0x7824, 0xd0cc,
++	0x0040, 0x6de6, 0x6017, 0x0016, 0x0078, 0x6d1a, 0x6017, 0x0012,
++	0x0078, 0x6d1a, 0x7a18, 0xa280, 0x0023, 0x2014, 0x8210, 0xa294,
++	0x00ff, 0x2202, 0x8217, 0x007c, 0x0d7e, 0x2069, 0xa8b1, 0x6843,
++	0x0001, 0x0d7f, 0x007c, 0x20e1, 0x9080, 0x60a3, 0x0056, 0x60a7,
++	0x9575, 0x1078, 0x6e06, 0x1078, 0x5ac0, 0x007c, 0x007e, 0x6014,
++	0xa084, 0x0004, 0xa085, 0x0009, 0x6016, 0x007f, 0x007c, 0x007e,
++	0x0c7e, 0x2061, 0x0100, 0x6014, 0xa084, 0x0004, 0xa085, 0x0008,
++	0x6016, 0x0c7f, 0x007f, 0x007c, 0x0c7e, 0x0d7e, 0x017e, 0x027e,
++	0x2061, 0x0100, 0x2069, 0x0140, 0x6904, 0xa194, 0x4000, 0x0040,
++	0x6e59, 0x1078, 0x6e0f, 0x6803, 0x1000, 0x6803, 0x0000, 0x0c7e,
++	0x2061, 0xa8b1, 0x6128, 0xa192, 0x00c8, 0x00c8, 0x6e44, 0x8108,
++	0x612a, 0x6124, 0x0c7f, 0x81ff, 0x0040, 0x6e54, 0x1078, 0x5ac0,
++	0x1078, 0x6e06, 0x0078, 0x6e54, 0x6124, 0xa1e5, 0x0000, 0x0040,
++	0x6e51, 0x1078, 0xa5c4, 0x1078, 0x5acb, 0x2009, 0x0014, 0x1078,
++	0x775c, 0x0c7f, 0x0078, 0x6e54, 0x027f, 0x017f, 0x0d7f, 0x0c7f,
++	0x007c, 0x2001, 0xa8cd, 0x2004, 0xa005, 0x00c0, 0x6e54, 0x0c7e,
++	0x2061, 0xa8b1, 0x6128, 0xa192, 0x0003, 0x00c8, 0x6e44, 0x8108,
++	0x612a, 0x0c7f, 0x1078, 0x5ac0, 0x1078, 0x4224, 0x0078, 0x6e54,
++	0x0c7e, 0x0d7e, 0x0e7e, 0x017e, 0x027e, 0x1078, 0x5ad8, 0x2071,
++	0xa8b1, 0x713c, 0x81ff, 0x0040, 0x6e9a, 0x2061, 0x0100, 0x2069,
++	0x0140, 0x6904, 0xa194, 0x4000, 0x0040, 0x6ea0, 0x6803, 0x1000,
++	0x6803, 0x0000, 0x037e, 0x2019, 0x0001, 0x1078, 0x7058, 0x037f,
++	0x713c, 0x2160, 0x1078, 0xa5c4, 0x2009, 0x004a, 0x1078, 0x775c,
++	0x0078, 0x6e9a, 0x027f, 0x017f, 0x0e7f, 0x0d7f, 0x0c7f, 0x007c,
++	0x0078, 0x6e8a, 0x0e7e, 0x2071, 0xa8b1, 0x7048, 0xd084, 0x0040,
++	0x6ebc, 0x713c, 0x81ff, 0x0040, 0x6ebc, 0x2071, 0x0100, 0xa188,
++	0x0007, 0x210c, 0xa18e, 0x0006, 0x00c0, 0x6eba, 0x7017, 0x0012,
++	0x0078, 0x6ebc, 0x7017, 0x0016, 0x0e7f, 0x007c, 0x0e7e, 0x0d7e,
++	0x0c7e, 0x067e, 0x057e, 0x047e, 0x007e, 0x127e, 0x2091, 0x8000,
++	0x6018, 0x2068, 0x6ca0, 0x2071, 0xa8b1, 0x7018, 0x2068, 0x8dff,
++	0x0040, 0x6ee6, 0x68a0, 0xa406, 0x0040, 0x6eda, 0x6854, 0x2068,
++	0x0078, 0x6ecf, 0x6010, 0x2060, 0x643c, 0x6540, 0x6648, 0x2d60,
++	0x1078, 0x4736, 0x0040, 0x6ee6, 0xa085, 0x0001, 0x127f, 0x007f,
++	0x047f, 0x057f, 0x067f, 0x0c7f, 0x0d7f, 0x0e7f, 0x007c, 0x20a1,
++	0x020b, 0x1078, 0x6731, 0x20a3, 0x1200, 0x20a3, 0x0000, 0x20a3,
++	0x0000, 0x781c, 0xa086, 0x0004, 0x00c0, 0x6f01, 0x6098, 0x0078,
++	0x6f02, 0x6030, 0x20a2, 0x7834, 0x20a2, 0x7838, 0x20a2, 0x20a9,
++	0x0010, 0xa006, 0x20a2, 0x00f0, 0x6f0a, 0x20a2, 0x20a2, 0x60c3,
++	0x002c, 0x1078, 0x6dfb, 0x007c, 0x157e, 0x147e, 0x20a1, 0x020b,
++	0x1078, 0x6731, 0x20a3, 0x0f00, 0x20a3, 0x0000, 0x20a3, 0x0000,
++	0x7808, 0x20a2, 0x60c3, 0x0008, 0x1078, 0x6dfb, 0x147f, 0x157f,
++	0x007c, 0x157e, 0x147e, 0x20a1, 0x020b, 0x1078, 0x67c2, 0x20a3,
++	0x0200, 0x20a3, 0x0000, 0x20a9, 0x0006, 0x2011, 0xa640, 0x2019,
++	0xa641, 0x23a6, 0x22a6, 0xa398, 0x0002, 0xa290, 0x0002, 0x00f0,
++	0x6f39, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x001c, 0x1078,
++	0x6dfb, 0x147f, 0x157f, 0x007c, 0x157e, 0x147e, 0x017e, 0x027e,
++	0x20a1, 0x020b, 0x1078, 0x6799, 0x1078, 0x67b0, 0x7810, 0xa080,
++	0x0000, 0x2004, 0xa080, 0x0015, 0x2098, 0x7808, 0xa088, 0x0002,
++	0x21a8, 0x53a6, 0xa080, 0x0004, 0x8003, 0x60c2, 0x1078, 0x6dfb,
++	0x027f, 0x017f, 0x147f, 0x157f, 0x007c, 0x157e, 0x147e, 0x20a1,
++	0x020b, 0x1078, 0x6731, 0x20a3, 0x6200, 0x20a3, 0x0000, 0x20a3,
++	0x0000, 0x7808, 0x20a2, 0x60c3, 0x0008, 0x1078, 0x6dfb, 0x147f,
++	0x157f, 0x007c, 0x157e, 0x147e, 0x017e, 0x027e, 0x20a1, 0x020b,
++	0x1078, 0x6731, 0x7810, 0xa080, 0x0000, 0x2004, 0xa080, 0x0017,
++	0x2098, 0x7808, 0xa088, 0x0002, 0x21a8, 0x53a6, 0x8003, 0x60c2,
++	0x1078, 0x6dfb, 0x027f, 0x017f, 0x147f, 0x157f, 0x007c, 0x0e7e,
++	0x0c7e, 0x007e, 0x127e, 0x2091, 0x8000, 0x2071, 0xa8b1, 0x700c,
++	0x2060, 0x8cff, 0x0040, 0x6fbb, 0x1078, 0x8f00, 0x00c0, 0x6fb2,
++	0x1078, 0x7c83, 0x600c, 0x007e, 0x1078, 0x772d, 0x1078, 0x7233,
++	0x0c7f, 0x0078, 0x6fa9, 0x700f, 0x0000, 0x700b, 0x0000, 0x127f,
++	0x007f, 0x0c7f, 0x0e7f, 0x007c, 0x127e, 0x157e, 0x0f7e, 0x0e7e,
++	0x0d7e, 0x0c7e, 0x027e, 0x017e, 0x007e, 0x2091, 0x8000, 0x2069,
++	0x0100, 0x2079, 0x0140, 0x2071, 0xa8b1, 0x7024, 0x2060, 0x8cff,
++	0x0040, 0x7014, 0x1078, 0x6e0f, 0x68c3, 0x0000, 0x1078, 0x5acb,
++	0x2009, 0x0013, 0x1078, 0x775c, 0x20a9, 0x01f4, 0x6824, 0xd094,
++	0x0040, 0x6ff7, 0x6827, 0x0004, 0x7804, 0xa084, 0x4000, 0x0040,
++	0x7009, 0x7803, 0x1000, 0x7803, 0x0000, 0x0078, 0x7009, 0xd084,
++	0x0040, 0x6ffe, 0x6827, 0x0001, 0x0078, 0x7000, 0x00f0, 0x6fe6,
++	0x7804, 0xa084, 0x1000, 0x0040, 0x7009, 0x7803, 0x0100, 0x7803,
++	0x0000, 0x6824, 0x007f, 0x017f, 0x027f, 0x0c7f, 0x0d7f, 0x0e7f,
++	0x0f7f, 0x157f, 0x127f, 0x007c, 0x2001, 0xa600, 0x2004, 0xa096,
++	0x0001, 0x0040, 0x704e, 0xa096, 0x0004, 0x0040, 0x704e, 0x1078,
++	0x5acb, 0x6817, 0x0008, 0x68c3, 0x0000, 0x2011, 0x41dc, 0x1078,
++	0x5a45, 0x20a9, 0x01f4, 0x6824, 0xd094, 0x0040, 0x703c, 0x6827,
++	0x0004, 0x7804, 0xa084, 0x4000, 0x0040, 0x704e, 0x7803, 0x1000,
++	0x7803, 0x0000, 0x0078, 0x704e, 0xd084, 0x0040, 0x7043, 0x6827,
++	0x0001, 0x0078, 0x7045, 0x00f0, 0x702b, 0x7804, 0xa084, 0x1000,
++	0x0040, 0x704e, 0x7803, 0x0100, 0x7803, 0x0000, 0x007f, 0x017f,
++	0x027f, 0x0c7f, 0x0d7f, 0x0e7f, 0x0f7f, 0x157f, 0x127f, 0x007c,
++	0x127e, 0x157e, 0x0f7e, 0x0e7e, 0x0d7e, 0x0c7e, 0x027e, 0x017e,
++	0x007e, 0x2091, 0x8000, 0x2069, 0x0100, 0x2079, 0x0140, 0x2071,
++	0xa8b1, 0x703c, 0x2060, 0x8cff, 0x0040, 0x70d6, 0x68af, 0x95f5,
++	0x6817, 0x0010, 0x2009, 0x00fa, 0x8109, 0x00c0, 0x7074, 0x68c7,
++	0x0000, 0x68cb, 0x0008, 0x1078, 0x5ad8, 0x1078, 0x1f7e, 0x047e,
++	0x057e, 0x2009, 0x017f, 0x212c, 0x200b, 0x00a5, 0x2021, 0x0169,
++	0x2404, 0xa084, 0x000f, 0xa086, 0x0004, 0x00c0, 0x70a5, 0x68c7,
++	0x0000, 0x68cb, 0x0008, 0x0e7e, 0x0f7e, 0x2079, 0x0020, 0x2071,
++	0xa908, 0x6814, 0xa084, 0x0004, 0xa085, 0x0012, 0x6816, 0x7803,
++	0x0008, 0x7003, 0x0000, 0x0f7f, 0x0e7f, 0x250a, 0x057f, 0x047f,
++	0xa39d, 0x0000, 0x00c0, 0x70b0, 0x2009, 0x0049, 0x1078, 0x775c,
++	0x20a9, 0x03e8, 0x6824, 0xd094, 0x0040, 0x70c3, 0x6827, 0x0004,
++	0x7804, 0xa084, 0x4000, 0x0040, 0x70d5, 0x7803, 0x1000, 0x7803,
++	0x0000, 0x0078, 0x70d5, 0xd08c, 0x0040, 0x70ca, 0x6827, 0x0002,
++	0x0078, 0x70cc, 0x00f0, 0x70b2, 0x7804, 0xa084, 0x1000, 0x0040,
++	0x70d5, 0x7803, 0x0100, 0x7803, 0x0000, 0x6824, 0x007f, 0x017f,
++	0x027f, 0x0c7f, 0x0d7f, 0x0e7f, 0x0f7f, 0x157f, 0x127f, 0x007c,
++	0x0d7e, 0x127e, 0x2091, 0x8000, 0x2069, 0xa8b1, 0x6a06, 0x127f,
++	0x0d7f, 0x007c, 0x0d7e, 0x127e, 0x2091, 0x8000, 0x2069, 0xa8b1,
++	0x6a32, 0x127f, 0x0d7f, 0x007c, 0x0f7e, 0x0e7e, 0x0c7e, 0x067e,
++	0x007e, 0x127e, 0x2071, 0xa8b1, 0x7614, 0x2660, 0x2678, 0x2091,
++	0x8000, 0x8cff, 0x0040, 0x7134, 0x601c, 0xa206, 0x00c0, 0x712f,
++	0x7014, 0xac36, 0x00c0, 0x710e, 0x660c, 0x7616, 0x7010, 0xac36,
++	0x00c0, 0x711c, 0x2c00, 0xaf36, 0x0040, 0x711a, 0x2f00, 0x7012,
++	0x0078, 0x711c, 0x7013, 0x0000, 0x660c, 0x067e, 0x2c00, 0xaf06,
++	0x0040, 0x7125, 0x7e0e, 0x0078, 0x7126, 0x2678, 0x600f, 0x0000,
++	0x1078, 0x8ec6, 0x1078, 0x7233, 0x0c7f, 0x0078, 0x7101, 0x2c78,
++	0x600c, 0x2060, 0x0078, 0x7101, 0x127f, 0x007f, 0x067f, 0x0c7f,
++	0x0e7f, 0x0f7f, 0x007c, 0x157e, 0x147e, 0x20a1, 0x020b, 0x1078,
++	0x69d0, 0x7810, 0x20a2, 0xa006, 0x20a2, 0x20a2, 0x20a2, 0x20a2,
++	0x20a3, 0x1000, 0x0078, 0x718e, 0x157e, 0x147e, 0x20a1, 0x020b,
++	0x1078, 0x69d0, 0x7810, 0x20a2, 0xa006, 0x20a2, 0x20a2, 0x20a2,
++	0x20a2, 0x20a3, 0x4000, 0x0078, 0x718e, 0x157e, 0x147e, 0x20a1,
++	0x020b, 0x1078, 0x69d0, 0x7810, 0x20a2, 0xa006, 0x20a2, 0x20a2,
++	0x20a2, 0x20a2, 0x20a3, 0x2000, 0x0078, 0x718e, 0x157e, 0x147e,
++	0x20a1, 0x020b, 0x1078, 0x69d0, 0x7810, 0x20a2, 0xa006, 0x20a2,
++	0x20a2, 0x20a2, 0x20a2, 0x20a3, 0x0400, 0x0078, 0x718e, 0x157e,
++	0x147e, 0x20a1, 0x020b, 0x1078, 0x69d0, 0x7810, 0x20a2, 0xa006,
++	0x20a2, 0x20a2, 0x20a2, 0x20a2, 0x20a3, 0x0200, 0x1078, 0x723e,
++	0x60c3, 0x0020, 0x1078, 0x6dfb, 0x147f, 0x157f, 0x007c, 0x127e,
++	0x0c7e, 0x2091, 0x8000, 0x2061, 0x0100, 0x6120, 0xd1b4, 0x00c0,
++	0x71a6, 0xd1bc, 0x00c0, 0x71f0, 0x0078, 0x7230, 0x2009, 0x017f,
++	0x200b, 0x00a1, 0x157e, 0x007e, 0x0d7e, 0x2069, 0x0140, 0x20a9,
++	0x001e, 0x2009, 0x0169, 0x6804, 0xa084, 0x4000, 0x0040, 0x71e7,
++	0x6020, 0xd0b4, 0x0040, 0x71e7, 0x6024, 0xd094, 0x00c0, 0x71e7,
++	0x2104, 0xa084, 0x000f, 0xa086, 0x0004, 0x00c0, 0x71e7, 0x00f0,
++	0x71b3, 0x027e, 0x6198, 0xa18c, 0x00ff, 0x8107, 0x6130, 0xa18c,
++	0x00ff, 0xa10d, 0x6088, 0x628c, 0x618e, 0x608b, 0xbc91, 0x6043,
++	0x0001, 0x6043, 0x0000, 0x608a, 0x628e, 0x6024, 0xd094, 0x00c0,
++	0x71e6, 0x6a04, 0xa294, 0x4000, 0x00c0, 0x71dd, 0x027f, 0x0d7f,
++	0x007f, 0x157f, 0x2009, 0x017f, 0x200b, 0x0000, 0x0078, 0x7230,
++	0x2009, 0x017f, 0x200b, 0x00a1, 0x157e, 0x007e, 0x0d7e, 0x2069,
++	0x0140, 0x20a9, 0x001e, 0x2009, 0x0169, 0x6804, 0xa084, 0x4000,
++	0x0040, 0x7229, 0x6020, 0xd0bc, 0x0040, 0x7229, 0x2104, 0xa084,
++	0x000f, 0xa086, 0x0004, 0x00c0, 0x7229, 0x00f0, 0x71fd, 0x027e,
++	0x6164, 0xa18c, 0x00ff, 0x8107, 0x6130, 0xa18c, 0x00ff, 0xa10d,
++	0x6088, 0x628c, 0x608b, 0xbc91, 0x618e, 0x6043, 0x0001, 0x6043,
++	0x0000, 0x608a, 0x628e, 0x6a04, 0xa294, 0x4000, 0x00c0, 0x7223,
++	0x027f, 0x0d7f, 0x007f, 0x157f, 0x2009, 0x017f, 0x200b, 0x0000,
++	0x0c7f, 0x127f, 0x007c, 0x0e7e, 0x2071, 0xa8b1, 0x7020, 0xa005,
++	0x0040, 0x723c, 0x8001, 0x7022, 0x0e7f, 0x007c, 0x20a9, 0x0008,
++	0x20a2, 0x00f0, 0x7240, 0x20a2, 0x20a2, 0x007c, 0x0f7e, 0x0e7e,
++	0x0d7e, 0x0c7e, 0x077e, 0x067e, 0x007e, 0x127e, 0x2091, 0x8000,
++	0x2071, 0xa8b1, 0x7614, 0x2660, 0x2678, 0x2039, 0x0001, 0x87ff,
++	0x0040, 0x72e2, 0x8cff, 0x0040, 0x72e2, 0x601c, 0xa086, 0x0006,
++	0x00c0, 0x72dd, 0x88ff, 0x0040, 0x726d, 0x2800, 0xac06, 0x00c0,
++	0x72dd, 0x2039, 0x0000, 0x0078, 0x7278, 0x6018, 0xa206, 0x00c0,
++	0x72dd, 0x85ff, 0x0040, 0x7278, 0x6020, 0xa106, 0x00c0, 0x72dd,
++	0x7024, 0xac06, 0x00c0, 0x72a8, 0x2069, 0x0100, 0x68c0, 0xa005,
++	0x0040, 0x72a3, 0x1078, 0x5acb, 0x6817, 0x0008, 0x68c3, 0x0000,
++	0x1078, 0x7378, 0x7027, 0x0000, 0x037e, 0x2069, 0x0140, 0x6b04,
++	0xa384, 0x1000, 0x0040, 0x7298, 0x6803, 0x0100, 0x6803, 0x0000,
++	0x2069, 0x0100, 0x6824, 0xd084, 0x0040, 0x72a0, 0x6827, 0x0001,
++	0x037f, 0x0078, 0x72a8, 0x6003, 0x0009, 0x630a, 0x0078, 0x72dd,
++	0x7014, 0xac36, 0x00c0, 0x72ae, 0x660c, 0x7616, 0x7010, 0xac36,
++	0x00c0, 0x72bc, 0x2c00, 0xaf36, 0x0040, 0x72ba, 0x2f00, 0x7012,
++	0x0078, 0x72bc, 0x7013, 0x0000, 0x660c, 0x067e, 0x2c00, 0xaf06,
++	0x0040, 0x72c5, 0x7e0e, 0x0078, 0x72c6, 0x2678, 0x89ff, 0x00c0,
++	0x72d5, 0x600f, 0x0000, 0x6010, 0x2068, 0x1078, 0x8d06, 0x0040,
++	0x72d3, 0x1078, 0xa1ca, 0x1078, 0x8ec6, 0x1078, 0x7233, 0x88ff,
++	0x00c0, 0x72ec, 0x0c7f, 0x0078, 0x7257, 0x2c78, 0x600c, 0x2060,
++	0x0078, 0x7257, 0xa006, 0x127f, 0x007f, 0x067f, 0x077f, 0x0c7f,
++	0x0d7f, 0x0e7f, 0x0f7f, 0x007c, 0x6017, 0x0000, 0x0c7f, 0xa8c5,
++	0x0001, 0x0078, 0x72e3, 0x0f7e, 0x0e7e, 0x0d7e, 0x0c7e, 0x067e,
++	0x027e, 0x007e, 0x127e, 0x2091, 0x8000, 0x2071, 0xa8b1, 0x7638,
++	0x2660, 0x2678, 0x8cff, 0x0040, 0x7367, 0x601c, 0xa086, 0x0006,
++	0x00c0, 0x7362, 0x87ff, 0x0040, 0x7313, 0x2700, 0xac06, 0x00c0,
++	0x7362, 0x0078, 0x731e, 0x6018, 0xa206, 0x00c0, 0x7362, 0x85ff,
++	0x0040, 0x731e, 0x6020, 0xa106, 0x00c0, 0x7362, 0x703c, 0xac06,
++	0x00c0, 0x7332, 0x037e, 0x2019, 0x0001, 0x1078, 0x7058, 0x7033,
++	0x0000, 0x703f, 0x0000, 0x7043, 0x0000, 0x7047, 0x0000, 0x704b,
++	0x0000, 0x037f, 0x7038, 0xac36, 0x00c0, 0x7338, 0x660c, 0x763a,
++	0x7034, 0xac36, 0x00c0, 0x7346, 0x2c00, 0xaf36, 0x0040, 0x7344,
++	0x2f00, 0x7036, 0x0078, 0x7346, 0x7037, 0x0000, 0x660c, 0x067e,
++	0x2c00, 0xaf06, 0x0040, 0x734f, 0x7e0e, 0x0078, 0x7350, 0x2678,
++	0x600f, 0x0000, 0x6010, 0x2068, 0x1078, 0x8d06, 0x0040, 0x735a,
++	0x1078, 0xa1ca, 0x1078, 0x8ec6, 0x87ff, 0x00c0, 0x7371, 0x0c7f,
++	0x0078, 0x7302, 0x2c78, 0x600c, 0x2060, 0x0078, 0x7302, 0xa006,
++	0x127f, 0x007f, 0x027f, 0x067f, 0x0c7f, 0x0d7f, 0x0e7f, 0x0f7f,
++	0x007c, 0x6017, 0x0000, 0x0c7f, 0xa7bd, 0x0001, 0x0078, 0x7368,
++	0x0e7e, 0x2071, 0xa8b1, 0x2001, 0xa600, 0x2004, 0xa086, 0x0002,
++	0x00c0, 0x7386, 0x7007, 0x0005, 0x0078, 0x7388, 0x7007, 0x0000,
++	0x0e7f, 0x007c, 0x0f7e, 0x0e7e, 0x0c7e, 0x067e, 0x027e, 0x007e,
++	0x127e, 0x2091, 0x8000, 0x2071, 0xa8b1, 0x2c10, 0x7638, 0x2660,
++	0x2678, 0x8cff, 0x0040, 0x73c8, 0x2200, 0xac06, 0x00c0, 0x73c3,
++	0x7038, 0xac36, 0x00c0, 0x73a6, 0x660c, 0x763a, 0x7034, 0xac36,
++	0x00c0, 0x73b4, 0x2c00, 0xaf36, 0x0040, 0x73b2, 0x2f00, 0x7036,
++	0x0078, 0x73b4, 0x7037, 0x0000, 0x660c, 0x2c00, 0xaf06, 0x0040,
++	0x73bc, 0x7e0e, 0x0078, 0x73bd, 0x2678, 0x600f, 0x0000, 0xa085,
++	0x0001, 0x0078, 0x73c8, 0x2c78, 0x600c, 0x2060, 0x0078, 0x7399,
++	0x127f, 0x007f, 0x027f, 0x067f, 0x0c7f, 0x0e7f, 0x0f7f, 0x007c,
++	0x0f7e, 0x0e7e, 0x0d7e, 0x0c7e, 0x067e, 0x007e, 0x127e, 0x2091,
++	0x8000, 0x2071, 0xa8b1, 0x760c, 0x2660, 0x2678, 0x8cff, 0x0040,
++	0x7469, 0x6018, 0xa080, 0x0028, 0x2004, 0xa206, 0x00c0, 0x7464,
++	0x7024, 0xac06, 0x00c0, 0x740f, 0x2069, 0x0100, 0x68c0, 0xa005,
++	0x0040, 0x743d, 0x1078, 0x6e0f, 0x68c3, 0x0000, 0x1078, 0x7378,
++	0x7027, 0x0000, 0x037e, 0x2069, 0x0140, 0x6b04, 0xa384, 0x1000,
++	0x0040, 0x7406, 0x6803, 0x0100, 0x6803, 0x0000, 0x2069, 0x0100,
++	0x6824, 0xd084, 0x0040, 0x740e, 0x6827, 0x0001, 0x037f, 0x700c,
++	0xac36, 0x00c0, 0x7415, 0x660c, 0x760e, 0x7008, 0xac36, 0x00c0,
++	0x7423, 0x2c00, 0xaf36, 0x0040, 0x7421, 0x2f00, 0x700a, 0x0078,
++	0x7423, 0x700b, 0x0000, 0x660c, 0x067e, 0x2c00, 0xaf06, 0x0040,
++	0x742c, 0x7e0e, 0x0078, 0x742d, 0x2678, 0x600f, 0x0000, 0x1078,
++	0x8eec, 0x00c0, 0x7441, 0x1078, 0x28a6, 0x1078, 0x8f00, 0x00c0,
++	0x745d, 0x1078, 0x7c83, 0x0078, 0x745d, 0x1078, 0x7378, 0x0078,
++	0x740f, 0x1078, 0x8f00, 0x00c0, 0x7449, 0x1078, 0x7c83, 0x0078,
++	0x745d, 0x6010, 0x2068, 0x1078, 0x8d06, 0x0040, 0x745d, 0x601c,
++	0xa086, 0x0003, 0x00c0, 0x7471, 0x6837, 0x0103, 0x6b4a, 0x6847,
++	0x0000, 0x1078, 0x4a73, 0x1078, 0x8eb9, 0x1078, 0x8ec6, 0x1078,
++	0x7233, 0x0c7f, 0x0078, 0x73de, 0x2c78, 0x600c, 0x2060, 0x0078,
++	0x73de, 0x127f, 0x007f, 0x067f, 0x0c7f, 0x0d7f, 0x0e7f, 0x0f7f,
++	0x007c, 0x601c, 0xa086, 0x0006, 0x00c0, 0x745d, 0x1078, 0xa1ca,
++	0x0078, 0x745d, 0x037e, 0x157e, 0x137e, 0x147e, 0x3908, 0xa006,
++	0xa190, 0x0020, 0x221c, 0xa39e, 0x2676, 0x00c0, 0x748b, 0x8210,
++	0x8000, 0x0078, 0x7482, 0xa005, 0x0040, 0x7497, 0x20a9, 0x0020,
++	0x2198, 0x8211, 0xa282, 0x0020, 0x20c8, 0x20a0, 0x53a3, 0x147f,
++	0x137f, 0x157f, 0x037f, 0x007c, 0x0d7e, 0x20a1, 0x020b, 0x1078,
++	0x67c2, 0x20a3, 0x0200, 0x20a3, 0x0014, 0x60c3, 0x0014, 0x20a3,
++	0x0000, 0x20a3, 0x0000, 0x2099, 0xa8a5, 0x20a9, 0x0004, 0x53a6,
++	0x20a3, 0x0004, 0x20a3, 0x7878, 0x20a3, 0x0000, 0x20a3, 0x0000,
++	0x1078, 0x6dfb, 0x0d7f, 0x007c, 0x20a1, 0x020b, 0x1078, 0x67c2,
++	0x20a3, 0x0214, 0x20a3, 0x0018, 0x20a3, 0x0800, 0x7810, 0xa084,
++	0xff00, 0x20a2, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000,
++	0x20a3, 0x0000, 0x7810, 0xa084, 0x00ff, 0x20a2, 0x7828, 0x20a2,
++	0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x0018, 0x1078, 0x6dfb,
++	0x007c, 0x0d7e, 0x017e, 0x2f68, 0x2009, 0x0035, 0x1078, 0x91bc,
++	0x00c0, 0x7551, 0x20a1, 0x020b, 0x1078, 0x6731, 0x20a3, 0x1300,
++	0x20a3, 0x0000, 0x7828, 0x2068, 0x681c, 0xa086, 0x0003, 0x0040,
++	0x752d, 0x7818, 0xa080, 0x0028, 0x2014, 0xa286, 0x007e, 0x00c0,
++	0x7507, 0x20a3, 0x00ff, 0x20a3, 0xfffe, 0x0078, 0x7542, 0xa286,
++	0x007f, 0x00c0, 0x7511, 0x20a3, 0x00ff, 0x20a3, 0xfffd, 0x0078,
++	0x7542, 0xd2bc, 0x0040, 0x7527, 0xa286, 0x0080, 0x00c0, 0x751e,
++	0x20a3, 0x00ff, 0x20a3, 0xfffc, 0x0078, 0x7542, 0xa2e8, 0xa735,
++	0x2d6c, 0x6810, 0x20a2, 0x6814, 0x20a2, 0x0078, 0x7542, 0x20a3,
++	0x0000, 0x6098, 0x20a2, 0x0078, 0x7542, 0x7818, 0xa080, 0x0028,
++	0x2004, 0xa082, 0x007e, 0x0048, 0x753e, 0x0d7e, 0x2069, 0xa61b,
++	0x2da6, 0x8d68, 0x2da6, 0x0d7f, 0x0078, 0x7542, 0x20a3, 0x0000,
++	0x6030, 0x20a2, 0x7834, 0x20a2, 0x7838, 0x20a2, 0x20a3, 0x0000,
++	0x20a3, 0x0000, 0x60c3, 0x000c, 0x1078, 0x6dfb, 0x017f, 0x0d7f,
++	0x007c, 0x7817, 0x0001, 0x7803, 0x0006, 0x017f, 0x0d7f, 0x007c,
++	0x0d7e, 0x027e, 0x7928, 0x2168, 0x691c, 0xa186, 0x0006, 0x0040,
++	0x757a, 0xa186, 0x0003, 0x0040, 0x75d5, 0xa186, 0x0005, 0x0040,
++	0x75b8, 0xa186, 0x0004, 0x0040, 0x75a8, 0xa186, 0x0008, 0x0040,
++	0x75c2, 0x7807, 0x0037, 0x7813, 0x1700, 0x1078, 0x7640, 0x027f,
++	0x0d7f, 0x007c, 0x1078, 0x75fd, 0x2009, 0x4000, 0x6800, 0x0079,
++	0x7581, 0x7594, 0x75a2, 0x7596, 0x75a2, 0x759d, 0x7594, 0x7594,
++	0x75a2, 0x75a2, 0x75a2, 0x75a2, 0x7594, 0x7594, 0x7594, 0x7594,
++	0x7594, 0x75a2, 0x7594, 0x75a2, 0x1078, 0x1332, 0x6824, 0xd0e4,
++	0x0040, 0x759d, 0xd0cc, 0x0040, 0x75a0, 0xa00e, 0x0078, 0x75a2,
++	0x2009, 0x2000, 0x6828, 0x20a2, 0x682c, 0x20a2, 0x0078, 0x75f3,
++	0x1078, 0x75fd, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x2009, 0x4000,
++	0x6a00, 0xa286, 0x0002, 0x00c0, 0x75b6, 0xa00e, 0x0078, 0x75f3,
++	0x1078, 0x75fd, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x2009, 0x4000,
++	0x0078, 0x75f3, 0x1078, 0x75fd, 0x20a3, 0x0000, 0x20a3, 0x0000,
++	0x2009, 0x4000, 0xa286, 0x0005, 0x0040, 0x75d2, 0xa286, 0x0002,
++	0x00c0, 0x75d3, 0xa00e, 0x0078, 0x75f3, 0x1078, 0x75fd, 0x6810,
++	0x2068, 0x697c, 0x6810, 0xa112, 0x6980, 0x6814, 0xa103, 0x20a2,
++	0x22a2, 0x7928, 0xa180, 0x0000, 0x2004, 0xa08e, 0x0002, 0x0040,
++	0x75f1, 0xa08e, 0x0004, 0x0040, 0x75f1, 0x2009, 0x4000, 0x0078,
++	0x75f3, 0x2009, 0x0000, 0x21a2, 0x20a3, 0x0000, 0x60c3, 0x0018,
++	0x1078, 0x6dfb, 0x027f, 0x0d7f, 0x007c, 0x037e, 0x047e, 0x057e,
++	0x067e, 0x20a1, 0x020b, 0x1078, 0x67c2, 0xa006, 0x20a3, 0x0200,
++	0x20a2, 0x7934, 0x21a2, 0x7938, 0x21a2, 0x7818, 0xa080, 0x0028,
++	0x2004, 0xa092, 0x007e, 0x0048, 0x7623, 0x0d7e, 0x2069, 0xa61b,
++	0x2d2c, 0x8d68, 0x2d34, 0xa0e8, 0xa735, 0x2d6c, 0x6b10, 0x6c14,
++	0x0d7f, 0x0078, 0x7629, 0x2019, 0x0000, 0x6498, 0x2029, 0x0000,
++	0x6630, 0x7828, 0xa080, 0x0007, 0x2004, 0xa086, 0x0003, 0x00c0,
++	0x7637, 0x25a2, 0x26a2, 0x23a2, 0x24a2, 0x0078, 0x763b, 0x23a2,
++	0x24a2, 0x25a2, 0x26a2, 0x067f, 0x057f, 0x047f, 0x037f, 0x007c,
++	0x20a1, 0x020b, 0x1078, 0x67c2, 0x20a3, 0x0100, 0x20a3, 0x0000,
++	0x20a3, 0x0009, 0x7810, 0x20a2, 0x60c3, 0x0008, 0x1078, 0x6dfb,
++	0x007c, 0x20a1, 0x020b, 0x1078, 0x6728, 0x20a3, 0x1400, 0x20a3,
++	0x0000, 0x7834, 0x20a2, 0x7838, 0x20a2, 0x7828, 0x20a2, 0x782c,
++	0x20a2, 0x7830, 0xa084, 0x00ff, 0x8007, 0x20a2, 0x20a3, 0x0000,
++	0x60c3, 0x0010, 0x1078, 0x6dfb, 0x007c, 0x20a1, 0x020b, 0x1078,
++	0x67b9, 0x20a3, 0x0100, 0x20a3, 0x0000, 0x7828, 0x20a2, 0x7810,
++	0x20a2, 0x60c3, 0x0008, 0x1078, 0x6dfb, 0x007c, 0x147e, 0x20a1,
++	0x020b, 0x1078, 0x7689, 0x60c3, 0x0000, 0x1078, 0x6dfb, 0x147f,
++	0x007c, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x7818, 0xa080, 0x0028,
++	0x2004, 0xd0bc, 0x0040, 0x76a6, 0x0d7e, 0xa0e8, 0xa735, 0x2d6c,
++	0x6810, 0xa085, 0x0300, 0x20a2, 0x6814, 0x20a2, 0x2069, 0xa61b,
++	0x2da6, 0x8d68, 0x2da6, 0x0d7f, 0x0078, 0x76ae, 0x20a3, 0x0300,
++	0x6298, 0x22a2, 0x20a3, 0x0000, 0x6230, 0x22a2, 0x20a3, 0x0819,
++	0x20a3, 0x0000, 0x1078, 0x6dea, 0x22a2, 0x20a3, 0x0000, 0x2fa2,
++	0x7a08, 0x22a2, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x007c, 0x2061,
++	0xad00, 0x2a70, 0x7064, 0x704a, 0x704f, 0xad00, 0x007c, 0x0e7e,
++	0x127e, 0x2071, 0xa600, 0x2091, 0x8000, 0x7548, 0xa582, 0x0010,
++	0x0048, 0x76f9, 0x704c, 0x2060, 0x6000, 0xa086, 0x0000, 0x0040,
++	0x76e5, 0xace0, 0x0010, 0x7058, 0xac02, 0x00c8, 0x76e1, 0x0078,
++	0x76d4, 0x2061, 0xad00, 0x0078, 0x76d4, 0x6003, 0x0008, 0x8529,
++	0x754a, 0xaca8, 0x0010, 0x7058, 0xa502, 0x00c8, 0x76f5, 0x754e,
++	0xa085, 0x0001, 0x127f, 0x0e7f, 0x007c, 0x704f, 0xad00, 0x0078,
++	0x76f0, 0xa006, 0x0078, 0x76f2, 0x0e7e, 0x2071, 0xa600, 0x7548,
++	0xa582, 0x0010, 0x0048, 0x772a, 0x704c, 0x2060, 0x6000, 0xa086,
++	0x0000, 0x0040, 0x7717, 0xace0, 0x0010, 0x7058, 0xac02, 0x00c8,
++	0x7713, 0x0078, 0x7706, 0x2061, 0xad00, 0x0078, 0x7706, 0x6003,
++	0x0008, 0x8529, 0x754a, 0xaca8, 0x0010, 0x7058, 0xa502, 0x00c8,
++	0x7726, 0x754e, 0xa085, 0x0001, 0x0e7f, 0x007c, 0x704f, 0xad00,
++	0x0078, 0x7722, 0xa006, 0x0078, 0x7724, 0xac82, 0xad00, 0x1048,
++	0x1332, 0x2001, 0xa616, 0x2004, 0xac02, 0x10c8, 0x1332, 0xa006,
++	0x6006, 0x600a, 0x600e, 0x6012, 0x6016, 0x601a, 0x601f, 0x0000,
++	0x6003, 0x0000, 0x6022, 0x6026, 0x602a, 0x602e, 0x6032, 0x6036,
++	0x603a, 0x603e, 0x2061, 0xa600, 0x6048, 0x8000, 0x604a, 0xa086,
++	0x0001, 0x0040, 0x7754, 0x007c, 0x127e, 0x2091, 0x8000, 0x1078,
++	0x62d1, 0x127f, 0x0078, 0x7753, 0x601c, 0xa084, 0x000f, 0x0079,
++	0x7761, 0x776a, 0x777b, 0x7797, 0x77b3, 0x920e, 0x922a, 0x9246,
++	0x776a, 0x777b, 0xa186, 0x0013, 0x00c0, 0x7773, 0x1078, 0x61cd,
++	0x1078, 0x62d1, 0x007c, 0xa18e, 0x0047, 0x00c0, 0x777a, 0xa016,
++	0x1078, 0x15fa, 0x007c, 0x067e, 0x6000, 0xa0b2, 0x0010, 0x10c8,
++	0x1332, 0x1079, 0x7785, 0x067f, 0x007c, 0x7795, 0x7b00, 0x7cb2,
++	0x7795, 0x7d36, 0x77cf, 0x7795, 0x7795, 0x7a92, 0x80f6, 0x7795,
++	0x7795, 0x7795, 0x7795, 0x7795, 0x7795, 0x1078, 0x1332, 0x067e,
++	0x6000, 0xa0b2, 0x0010, 0x10c8, 0x1332, 0x1079, 0x77a1, 0x067f,
++	0x007c, 0x77b1, 0x87c3, 0x77b1, 0x77b1, 0x77b1, 0x77b1, 0x77b1,
++	0x77b1, 0x8766, 0x8951, 0x77b1, 0x87f3, 0x8879, 0x87f3, 0x8879,
++	0x77b1, 0x1078, 0x1332, 0x067e, 0x6000, 0xa0b2, 0x0010, 0x10c8,
++	0x1332, 0x1079, 0x77bd, 0x067f, 0x007c, 0x77cd, 0x813d, 0x820e,
++	0x8368, 0x84e4, 0x77cd, 0x77cd, 0x77cd, 0x8116, 0x870e, 0x8712,
++	0x77cd, 0x77cd, 0x77cd, 0x77cd, 0x8742, 0x1078, 0x1332, 0xa1b6,
++	0x0015, 0x00c0, 0x77d7, 0x1078, 0x772d, 0x0078, 0x77dd, 0xa1b6,
++	0x0016, 0x10c0, 0x1332, 0x1078, 0x772d, 0x007c, 0x20a9, 0x000e,
++	0x2e98, 0x6010, 0x20a0, 0x53a3, 0x20a9, 0x0006, 0x3310, 0x3420,
++	0x9398, 0x94a0, 0x3318, 0x3428, 0x222e, 0x2326, 0xa290, 0x0002,
++	0xa5a8, 0x0002, 0xa398, 0x0002, 0xa4a0, 0x0002, 0x00f0, 0x77ec,
++	0x0e7e, 0x1078, 0x8d06, 0x0040, 0x7803, 0x6010, 0x2070, 0x7007,
++	0x0000, 0x7037, 0x0103, 0x0e7f, 0x1078, 0x772d, 0x007c, 0x0d7e,
++	0x037e, 0x7330, 0xa386, 0x0200, 0x00c0, 0x7814, 0x6018, 0x2068,
++	0x6813, 0x00ff, 0x6817, 0xfffd, 0x6010, 0xa005, 0x0040, 0x781e,
++	0x2068, 0x6807, 0x0000, 0x6837, 0x0103, 0x6b32, 0x1078, 0x772d,
++	0x037f, 0x0d7f, 0x007c, 0x017e, 0x20a9, 0x002a, 0xae80, 0x000c,
++	0x2098, 0x6010, 0xa080, 0x0002, 0x20a0, 0x53a3, 0x20a9, 0x002a,
++	0x6010, 0xa080, 0x0001, 0x2004, 0xa080, 0x0002, 0x20a0, 0x53a3,
++	0x0e7e, 0x6010, 0x2004, 0x2070, 0x7037, 0x0103, 0x0e7f, 0x1078,
++	0x772d, 0x017f, 0x007c, 0x0e7e, 0x0d7e, 0x603f, 0x0000, 0x2c68,
++	0x017e, 0x2009, 0x0035, 0x1078, 0x91bc, 0x017f, 0x00c0, 0x785f,
++	0x027e, 0x6228, 0x2268, 0x027f, 0x2071, 0xab8c, 0x6b1c, 0xa386,
++	0x0003, 0x0040, 0x7863, 0xa386, 0x0006, 0x0040, 0x7867, 0x1078,
++	0x772d, 0x0078, 0x7869, 0x1078, 0x786c, 0x0078, 0x7869, 0x1078,
++	0x7938, 0x0d7f, 0x0e7f, 0x007c, 0x0f7e, 0x6810, 0x2078, 0xa186,
++	0x0015, 0x0040, 0x791d, 0xa18e, 0x0016, 0x00c0, 0x7936, 0x700c,
++	0xa08c, 0xff00, 0xa186, 0x1700, 0x0040, 0x7882, 0xa186, 0x0300,
++	0x00c0, 0x78f8, 0x8fff, 0x00c0, 0x788c, 0x6800, 0xa086, 0x000f,
++	0x0040, 0x78db, 0x0078, 0x7934, 0x6808, 0xa086, 0xffff, 0x00c0,
++	0x7921, 0x784c, 0xa084, 0x0060, 0xa086, 0x0020, 0x00c0, 0x78a2,
++	0x797c, 0x7810, 0xa106, 0x00c0, 0x7921, 0x7980, 0x7814, 0xa106,
++	0x00c0, 0x7921, 0x1078, 0x8eb9, 0x6830, 0x7852, 0x784c, 0xc0dc,
++	0xc0f4, 0xc0d4, 0x784e, 0x027e, 0xa00e, 0x6a14, 0x2001, 0x000a,
++	0x1078, 0x5c1c, 0x7854, 0xa20a, 0x0048, 0x78b7, 0x8011, 0x7a56,
++	0x82ff, 0x027f, 0x00c0, 0x78c3, 0x0c7e, 0x2d60, 0x1078, 0x8ae0,
++	0x0c7f, 0x0078, 0x7934, 0x0c7e, 0x0d7e, 0x2f68, 0x6838, 0xd0fc,
++	0x00c0, 0x78ce, 0x1078, 0x4353, 0x0078, 0x78d0, 0x1078, 0x4431,
++	0x0d7f, 0x0c7f, 0x00c0, 0x7921, 0x0c7e, 0x2d60, 0x1078, 0x772d,
++	0x0c7f, 0x0078, 0x7934, 0x0c7e, 0x1078, 0x9187, 0x0040, 0x78f1,
++	0x6013, 0x0000, 0x6818, 0x601a, 0x601f, 0x0003, 0x6904, 0x0c7e,
++	0x2d60, 0x1078, 0x772d, 0x0c7f, 0x1078, 0x775c, 0x0c7f, 0x0078,
++	0x7934, 0x2001, 0xa8a4, 0x2004, 0x683e, 0x0c7f, 0x0078, 0x7934,
++	0x7008, 0xa086, 0x000b, 0x00c0, 0x7912, 0x6018, 0x200c, 0xc1bc,
++	0x2102, 0x0c7e, 0x2d60, 0x7853, 0x0003, 0x6007, 0x0085, 0x6003,
++	0x000b, 0x601f, 0x0002, 0x1078, 0x5d8a, 0x1078, 0x62d1, 0x0c7f,
++	0x0078, 0x7934, 0x700c, 0xa086, 0x2a00, 0x00c0, 0x7921, 0x2001,
++	0xa8a4, 0x2004, 0x683e, 0x0078, 0x7934, 0x1078, 0x7953, 0x0078,
++	0x7936, 0x8fff, 0x1040, 0x1332, 0x0c7e, 0x0d7e, 0x2d60, 0x2f68,
++	0x6837, 0x0103, 0x684b, 0x0003, 0x1078, 0x89cf, 0x1078, 0x8eb9,
++	0x1078, 0x8ec6, 0x0d7f, 0x0c7f, 0x1078, 0x772d, 0x0f7f, 0x007c,
++	0xa186, 0x0015, 0x00c0, 0x7942, 0x2001, 0xa8a4, 0x2004, 0x683e,
++	0x0078, 0x7950, 0xa18e, 0x0016, 0x00c0, 0x7952, 0x0c7e, 0x2d00,
++	0x2060, 0x1078, 0xa495, 0x1078, 0x5bc1, 0x1078, 0x772d, 0x0c7f,
++	0x1078, 0x772d, 0x007c, 0x027e, 0x037e, 0x047e, 0x7228, 0x7c80,
++	0x7b7c, 0xd2f4, 0x0040, 0x7962, 0x2001, 0xa8a4, 0x2004, 0x683e,
++	0x0078, 0x79c6, 0x0c7e, 0x2d60, 0x1078, 0x89f3, 0x0c7f, 0x6804,
++	0xa086, 0x0050, 0x00c0, 0x797a, 0x0c7e, 0x2d00, 0x2060, 0x6003,
++	0x0001, 0x6007, 0x0050, 0x1078, 0x5d8a, 0x1078, 0x62d1, 0x0c7f,
++	0x0078, 0x79c6, 0x6800, 0xa086, 0x000f, 0x0040, 0x799c, 0x8fff,
++	0x1040, 0x1332, 0x6824, 0xd0dc, 0x00c0, 0x799c, 0x6800, 0xa086,
++	0x0004, 0x00c0, 0x79a1, 0x784c, 0xd0ac, 0x0040, 0x79a1, 0x784c,
++	0xc0dc, 0xc0f4, 0x784e, 0x7850, 0xc0f4, 0xc0fc, 0x7852, 0x2001,
++	0x0001, 0x682e, 0x0078, 0x79c0, 0x2001, 0x0007, 0x682e, 0x0078,
++	0x79c0, 0x784c, 0xd0b4, 0x00c0, 0x79ae, 0xd0ac, 0x0040, 0x799c,
++	0x784c, 0xd0f4, 0x00c0, 0x799c, 0x0078, 0x798f, 0xd2ec, 0x00c0,
++	0x799c, 0x7024, 0xa306, 0x00c0, 0x79b9, 0x7020, 0xa406, 0x0040,
++	0x799c, 0x7020, 0x6836, 0x7024, 0x683a, 0x2001, 0x0005, 0x682e,
++	0x1078, 0x8ff0, 0x1078, 0x62d1, 0x0078, 0x79c8, 0x1078, 0x772d,
++	0x047f, 0x037f, 0x027f, 0x007c, 0x0e7e, 0x0d7e, 0x027e, 0x6034,
++	0x2068, 0x6a1c, 0xa286, 0x0007, 0x0040, 0x7a35, 0xa286, 0x0002,
++	0x0040, 0x7a35, 0xa286, 0x0000, 0x0040, 0x7a35, 0x6808, 0x6338,
++	0xa306, 0x00c0, 0x7a35, 0x2071, 0xab8c, 0xa186, 0x0015, 0x0040,
++	0x7a2f, 0xa18e, 0x0016, 0x00c0, 0x7a02, 0x6030, 0xa084, 0x00ff,
++	0xa086, 0x0001, 0x00c0, 0x7a02, 0x700c, 0xa086, 0x2a00, 0x00c0,
++	0x7a02, 0x6034, 0xa080, 0x0009, 0x200c, 0xc1dd, 0xc1f5, 0x2102,
++	0x0078, 0x7a2f, 0x0c7e, 0x6034, 0x2060, 0x6104, 0xa186, 0x004b,
++	0x0040, 0x7a22, 0xa186, 0x004c, 0x0040, 0x7a22, 0xa186, 0x004d,
++	0x0040, 0x7a22, 0xa186, 0x004e, 0x0040, 0x7a22, 0xa186, 0x0052,
++	0x0040, 0x7a22, 0x6010, 0x2068, 0x1078, 0x8d06, 0x1040, 0x1332,
++	0x6853, 0x0003, 0x6007, 0x0085, 0x6003, 0x000b, 0x601f, 0x0002,
++	0x1078, 0x5d8a, 0x1078, 0x62d1, 0x0c7f, 0x0078, 0x7a35, 0x6034,
++	0x2068, 0x2001, 0xa8a4, 0x2004, 0x683e, 0x1078, 0x772d, 0x027f,
++	0x0d7f, 0x0e7f, 0x007c, 0x0d7e, 0x20a9, 0x000e, 0x2e98, 0x6010,
++	0x20a0, 0x53a3, 0xa1b6, 0x0015, 0x00c0, 0x7a73, 0x6018, 0x2068,
++	0x157e, 0x037e, 0x027e, 0xae90, 0x000c, 0xa290, 0x0004, 0x20a9,
++	0x0004, 0xad98, 0x000a, 0x1078, 0x80de, 0x027f, 0x037f, 0x157f,
++	0x00c0, 0x7a76, 0x157e, 0x037e, 0x027e, 0xae90, 0x000c, 0xa290,
++	0x0008, 0x20a9, 0x0004, 0xad98, 0x0006, 0x1078, 0x80de, 0x027f,
++	0x037f, 0x157f, 0x00c0, 0x7a76, 0x7038, 0x680a, 0x703c, 0x680e,
++	0x6800, 0xc08d, 0x6802, 0x0d7f, 0x0078, 0x77f8, 0x1078, 0x2880,
++	0x0c7e, 0x1078, 0x76c7, 0x2f00, 0x601a, 0x6013, 0x0000, 0x601f,
++	0x0001, 0x6007, 0x0001, 0x6003, 0x0001, 0x2001, 0x0007, 0x1078,
++	0x4502, 0x1078, 0x4535, 0x1078, 0x5dd7, 0x1078, 0x62d1, 0x0c7f,
++	0x0078, 0x7a73, 0x2100, 0xa1b2, 0x0044, 0x10c8, 0x1332, 0xa1b2,
++	0x0040, 0x00c8, 0x7af7, 0x0079, 0x7a9d, 0x7aeb, 0x7adf, 0x7aeb,
++	0x7aeb, 0x7aeb, 0x7aeb, 0x7add, 0x7add, 0x7add, 0x7add, 0x7add,
++	0x7add, 0x7add, 0x7add, 0x7add, 0x7add, 0x7add, 0x7add, 0x7add,
++	0x7add, 0x7add, 0x7add, 0x7add, 0x7add, 0x7add, 0x7add, 0x7add,
++	0x7add, 0x7add, 0x7add, 0x7add, 0x7aeb, 0x7add, 0x7aeb, 0x7aeb,
++	0x7add, 0x7add, 0x7add, 0x7add, 0x7add, 0x7aeb, 0x7add, 0x7add,
++	0x7add, 0x7add, 0x7add, 0x7add, 0x7add, 0x7add, 0x7add, 0x7aeb,
++	0x7aeb, 0x7add, 0x7add, 0x7add, 0x7add, 0x7add, 0x7add, 0x7add,
++	0x7add, 0x7add, 0x7aeb, 0x7add, 0x7add, 0x1078, 0x1332, 0x6003,
++	0x0001, 0x6106, 0x1078, 0x5dd7, 0x127e, 0x2091, 0x8000, 0x1078,
++	0x62d1, 0x127f, 0x007c, 0x6003, 0x0001, 0x6106, 0x1078, 0x5dd7,
++	0x127e, 0x2091, 0x8000, 0x1078, 0x62d1, 0x127f, 0x007c, 0x2600,
++	0x0079, 0x7afa, 0x7afe, 0x7afe, 0x7afe, 0x7aeb, 0x1078, 0x1332,
++	0x6004, 0xa0b2, 0x0044, 0x10c8, 0x1332, 0xa1b6, 0x0013, 0x00c0,
++	0x7b10, 0xa0b2, 0x0040, 0x00c8, 0x7c79, 0x2008, 0x0079, 0x7bbf,
++	0xa1b6, 0x0027, 0x00c0, 0x7b7c, 0x1078, 0x61cd, 0x6004, 0x1078,
++	0x8eec, 0x0040, 0x7b2d, 0x1078, 0x8f00, 0x0040, 0x7b74, 0xa08e,
++	0x0021, 0x0040, 0x7b78, 0xa08e, 0x0022, 0x0040, 0x7b74, 0xa08e,
++	0x003d, 0x0040, 0x7b78, 0x0078, 0x7b6f, 0x1078, 0x28a6, 0x2001,
++	0x0007, 0x1078, 0x4502, 0x6018, 0xa080, 0x0028, 0x200c, 0x1078,
++	0x7c83, 0xa186, 0x007e, 0x00c0, 0x7b42, 0x2001, 0xa633, 0x2014,
++	0xc285, 0x2202, 0x017e, 0x027e, 0x037e, 0x2110, 0x027e, 0x2019,
++	0x0028, 0x1078, 0x73d0, 0x027f, 0x1078, 0xa4f1, 0x037f, 0x027f,
++	0x017f, 0x017e, 0x027e, 0x037e, 0x2110, 0x2019, 0x0028, 0x1078,
++	0x5f01, 0x077e, 0x2039, 0x0000, 0x1078, 0x5e0a, 0x0c7e, 0x6018,
++	0xa065, 0x0040, 0x7b65, 0x1078, 0x47e9, 0x0c7f, 0x2c08, 0x1078,
++	0x9f8b, 0x077f, 0x037f, 0x027f, 0x017f, 0x1078, 0x457f, 0x1078,
++	0x772d, 0x1078, 0x62d1, 0x007c, 0x1078, 0x7c83, 0x0078, 0x7b6f,
++	0x1078, 0x7ca6, 0x0078, 0x7b6f, 0xa186, 0x0014, 0x00c0, 0x7b73,
++	0x1078, 0x61cd, 0x1078, 0x2880, 0x1078, 0x8eec, 0x00c0, 0x7b9b,
++	0x1078, 0x28a6, 0x6018, 0xa080, 0x0028, 0x200c, 0x1078, 0x7c83,
++	0xa186, 0x007e, 0x00c0, 0x7b99, 0x2001, 0xa633, 0x200c, 0xc185,
++	0x2102, 0x0078, 0x7b6f, 0x1078, 0x8f00, 0x00c0, 0x7ba3, 0x1078,
++	0x7c83, 0x0078, 0x7b6f, 0x6004, 0xa08e, 0x0032, 0x00c0, 0x7bb4,
++	0x0e7e, 0x0f7e, 0x2071, 0xa682, 0x2079, 0x0000, 0x1078, 0x2bd7,
++	0x0f7f, 0x0e7f, 0x0078, 0x7b6f, 0x6004, 0xa08e, 0x0021, 0x0040,
++	0x7b9f, 0xa08e, 0x0022, 0x1040, 0x7c83, 0x0078, 0x7b6f, 0x7c01,
++	0x7c03, 0x7c07, 0x7c0b, 0x7c0f, 0x7c13, 0x7bff, 0x7bff, 0x7bff,
++	0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7bff,
++	0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7bff,
++	0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7c17, 0x7c29, 0x7bff,
++	0x7c2b, 0x7c29, 0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7c29,
++	0x7c29, 0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7bff, 0x7bff,
++	0x7bff, 0x7c5c, 0x7c29, 0x7bff, 0x7c23, 0x7bff, 0x7bff, 0x7bff,
++	0x7c25, 0x7bff, 0x7bff, 0x7bff, 0x7c29, 0x7bff, 0x7bff, 0x1078,
++	0x1332, 0x0078, 0x7c29, 0x2001, 0x000b, 0x0078, 0x7c36, 0x2001,
++	0x0003, 0x0078, 0x7c36, 0x2001, 0x0005, 0x0078, 0x7c36, 0x2001,
++	0x0001, 0x0078, 0x7c36, 0x2001, 0x0009, 0x0078, 0x7c36, 0x1078,
++	0x61cd, 0x6003, 0x0005, 0x2001, 0xa8a4, 0x2004, 0x603e, 0x1078,
++	0x62d1, 0x0078, 0x7c35, 0x0078, 0x7c29, 0x0078, 0x7c29, 0x1078,
++	0x4502, 0x0078, 0x7c6e, 0x1078, 0x61cd, 0x6003, 0x0004, 0x2001,
++	0xa8a2, 0x2004, 0x6016, 0x1078, 0x62d1, 0x007c, 0x1078, 0x4502,
++	0x1078, 0x61cd, 0x2001, 0xa8a4, 0x2004, 0x603e, 0x6003, 0x0002,
++	0x037e, 0x2019, 0xa65d, 0x2304, 0xa084, 0xff00, 0x00c0, 0x7c4d,
++	0x2019, 0xa8a2, 0x231c, 0x0078, 0x7c56, 0x8007, 0xa09a, 0x0004,
++	0x0048, 0x7c48, 0x8003, 0x801b, 0x831b, 0xa318, 0x6316, 0x037f,
++	0x1078, 0x62d1, 0x0078, 0x7c35, 0x0e7e, 0x0f7e, 0x2071, 0xa682,
++	0x2079, 0x0000, 0x1078, 0x2bd7, 0x0f7f, 0x0e7f, 0x1078, 0x61cd,
++	0x1078, 0x772d, 0x1078, 0x62d1, 0x0078, 0x7c35, 0x1078, 0x61cd,
++	0x6003, 0x0002, 0x2001, 0xa8a2, 0x2004, 0x6016, 0x1078, 0x62d1,
++	0x007c, 0x2600, 0x2008, 0x0079, 0x7c7d, 0x7c81, 0x7c81, 0x7c81,
++	0x7c6e, 0x1078, 0x1332, 0x0e7e, 0x1078, 0x8d06, 0x0040, 0x7c9f,
++	0x6010, 0x2070, 0x7038, 0xd0fc, 0x0040, 0x7c9f, 0x7007, 0x0000,
++	0x017e, 0x6004, 0xa08e, 0x0021, 0x0040, 0x7ca1, 0xa08e, 0x003d,
++	0x0040, 0x7ca1, 0x017f, 0x7037, 0x0103, 0x7033, 0x0100, 0x0e7f,
++	0x007c, 0x017f, 0x1078, 0x7ca6, 0x0078, 0x7c9f, 0x0e7e, 0xacf0,
++	0x0004, 0x2e74, 0x7000, 0x2070, 0x7037, 0x0103, 0x7023, 0x8001,
++	0x0e7f, 0x007c, 0x0d7e, 0x6618, 0x2668, 0x6804, 0xa084, 0x00ff,
++	0x0d7f, 0xa0b2, 0x000c, 0x10c8, 0x1332, 0x6604, 0xa6b6, 0x0043,
++	0x00c0, 0x7cc6, 0x1078, 0x9134, 0x0078, 0x7d25, 0x6604, 0xa6b6,
++	0x0033, 0x00c0, 0x7ccf, 0x1078, 0x90d8, 0x0078, 0x7d25, 0x6604,
++	0xa6b6, 0x0028, 0x00c0, 0x7cd8, 0x1078, 0x8f2f, 0x0078, 0x7d25,
++	0x6604, 0xa6b6, 0x0029, 0x00c0, 0x7ce1, 0x1078, 0x8f49, 0x0078,
++	0x7d25, 0x6604, 0xa6b6, 0x001f, 0x00c0, 0x7cea, 0x1078, 0x77de,
++	0x0078, 0x7d25, 0x6604, 0xa6b6, 0x0000, 0x00c0, 0x7cf3, 0x1078,
++	0x7a3b, 0x0078, 0x7d25, 0x6604, 0xa6b6, 0x0022, 0x00c0, 0x7cfc,
++	0x1078, 0x7807, 0x0078, 0x7d25, 0x6604, 0xa6b6, 0x0035, 0x00c0,
++	0x7d05, 0x1078, 0x7843, 0x0078, 0x7d25, 0x6604, 0xa6b6, 0x0039,
++	0x00c0, 0x7d0e, 0x1078, 0x79cc, 0x0078, 0x7d25, 0x6604, 0xa6b6,
++	0x003d, 0x00c0, 0x7d17, 0x1078, 0x7823, 0x0078, 0x7d25, 0xa1b6,
++	0x0015, 0x00c0, 0x7d1f, 0x1079, 0x7d2a, 0x0078, 0x7d25, 0xa1b6,
++	0x0016, 0x00c0, 0x7d26, 0x1079, 0x7e7f, 0x007c, 0x1078, 0x7773,
++	0x0078, 0x7d25, 0x7d4e, 0x7d51, 0x7d4e, 0x7d9c, 0x7d4e, 0x7e13,
++	0x7e8b, 0x7d4e, 0x7d4e, 0x7e57, 0x7d4e, 0x7e6d, 0xa1b6, 0x0048,
++	0x0040, 0x7d42, 0x20e1, 0x0005, 0x3d18, 0x3e20, 0x2c10, 0x1078,
++	0x15fa, 0x007c, 0x0e7e, 0xacf0, 0x0004, 0x2e74, 0x7000, 0x2070,
++	0x7037, 0x0103, 0x0e7f, 0x1078, 0x772d, 0x007c, 0x0005, 0x0005,
++	0x007c, 0x0e7e, 0x2071, 0xa600, 0x7080, 0xa086, 0x0074, 0x00c0,
++	0x7d85, 0x1078, 0x9f5f, 0x00c0, 0x7d77, 0x0d7e, 0x6018, 0x2068,
++	0x7030, 0xd08c, 0x0040, 0x7d6a, 0x6800, 0xd0bc, 0x0040, 0x7d6a,
++	0xc0c5, 0x6802, 0x1078, 0x7d89, 0x0d7f, 0x2001, 0x0006, 0x1078,
++	0x4502, 0x1078, 0x28a6, 0x1078, 0x772d, 0x0078, 0x7d87, 0x2001,
++	0x000a, 0x1078, 0x4502, 0x1078, 0x28a6, 0x6003, 0x0001, 0x6007,
++	0x0001, 0x1078, 0x5dd7, 0x0078, 0x7d87, 0x1078, 0x7dff, 0x0e7f,
++	0x007c, 0x6800, 0xd084, 0x0040, 0x7d9b, 0x2001, 0x0000, 0x1078,
++	0x44ee, 0x2069, 0xa652, 0x6804, 0xd0a4, 0x0040, 0x7d9b, 0x2001,
++	0x0006, 0x1078, 0x4535, 0x007c, 0x0d7e, 0x2011, 0xa620, 0x2204,
++	0xa086, 0x0074, 0x00c0, 0x7dfb, 0x6018, 0x2068, 0x6aa0, 0xa286,
++	0x007e, 0x00c0, 0x7daf, 0x1078, 0x7f9b, 0x0078, 0x7dfd, 0x1078,
++	0x7f91, 0x6018, 0x2068, 0xa080, 0x0028, 0x2014, 0xa286, 0x0080,
++	0x00c0, 0x7dd3, 0x6813, 0x00ff, 0x6817, 0xfffc, 0x6010, 0xa005,
++	0x0040, 0x7dc9, 0x2068, 0x6807, 0x0000, 0x6837, 0x0103, 0x6833,
++	0x0200, 0x2001, 0x0006, 0x1078, 0x4502, 0x1078, 0x28a6, 0x1078,
++	0x772d, 0x0078, 0x7dfd, 0x0e7e, 0x2071, 0xa633, 0x2e04, 0xd09c,
++	0x0040, 0x7dee, 0x2071, 0xab80, 0x7108, 0x720c, 0xa18c, 0x00ff,
++	0x00c0, 0x7de6, 0xa284, 0xff00, 0x0040, 0x7dee, 0x6018, 0x2070,
++	0x70a0, 0xd0bc, 0x00c0, 0x7dee, 0x7112, 0x7216, 0x0e7f, 0x2001,
++	0x0004, 0x1078, 0x4502, 0x6003, 0x0001, 0x6007, 0x0003, 0x1078,
++	0x5dd7, 0x0078, 0x7dfd, 0x1078, 0x7dff, 0x0d7f, 0x007c, 0x2001,
++	0x0007, 0x1078, 0x4502, 0x2001, 0xa600, 0x2004, 0xa086, 0x0003,
++	0x00c0, 0x7e0e, 0x2001, 0x0007, 0x1078, 0x4535, 0x1078, 0x28a6,
++	0x1078, 0x772d, 0x007c, 0x0e7e, 0x2071, 0xa600, 0x7080, 0xa086,
++	0x0014, 0x00c0, 0x7e51, 0x7000, 0xa086, 0x0003, 0x00c0, 0x7e26,
++	0x6010, 0xa005, 0x00c0, 0x7e26, 0x1078, 0x3699, 0x0d7e, 0x6018,
++	0x2068, 0x1078, 0x4649, 0x1078, 0x7d89, 0x0d7f, 0x1078, 0x8043,
++	0x00c0, 0x7e51, 0x0d7e, 0x6018, 0x2068, 0x6890, 0x0d7f, 0xa005,
++	0x0040, 0x7e51, 0x2001, 0x0006, 0x1078, 0x4502, 0x0e7e, 0x6010,
++	0xa005, 0x0040, 0x7e4a, 0x2070, 0x7007, 0x0000, 0x7037, 0x0103,
++	0x7033, 0x0200, 0x0e7f, 0x1078, 0x28a6, 0x1078, 0x772d, 0x0078,
++	0x7e55, 0x1078, 0x7c83, 0x1078, 0x7dff, 0x0e7f, 0x007c, 0x2011,
++	0xa620, 0x2204, 0xa086, 0x0014, 0x00c0, 0x7e6a, 0x2001, 0x0002,
++	0x1078, 0x4502, 0x6003, 0x0001, 0x6007, 0x0001, 0x1078, 0x5dd7,
++	0x0078, 0x7e6c, 0x1078, 0x7dff, 0x007c, 0x2011, 0xa620, 0x2204,
++	0xa086, 0x0004, 0x00c0, 0x7e7c, 0x2001, 0x0007, 0x1078, 0x4502,
++	0x1078, 0x772d, 0x0078, 0x7e7e, 0x1078, 0x7dff, 0x007c, 0x7d4e,
++	0x7e97, 0x7d4e, 0x7ed2, 0x7d4e, 0x7f44, 0x7e8b, 0x7d4e, 0x7d4e,
++	0x7f59, 0x7d4e, 0x7f6c, 0x6604, 0xa686, 0x0003, 0x0040, 0x7e13,
++	0xa6b6, 0x001e, 0x00c0, 0x7e96, 0x1078, 0x772d, 0x007c, 0x0d7e,
++	0x0c7e, 0x1078, 0x7f7f, 0x00c0, 0x7ead, 0x2001, 0x0000, 0x1078,
++	0x44ee, 0x2001, 0x0002, 0x1078, 0x4502, 0x6003, 0x0001, 0x6007,
++	0x0002, 0x1078, 0x5dd7, 0x0078, 0x7ecf, 0x2009, 0xab8e, 0x2104,
++	0xa086, 0x0009, 0x00c0, 0x7ec2, 0x6018, 0x2068, 0x6840, 0xa084,
++	0x00ff, 0xa005, 0x0040, 0x7ecd, 0x8001, 0x6842, 0x6017, 0x000a,
++	0x0078, 0x7ecf, 0x2009, 0xab8f, 0x2104, 0xa084, 0xff00, 0xa086,
++	0x1900, 0x00c0, 0x7ecd, 0x0078, 0x7ea1, 0x1078, 0x7dff, 0x0c7f,
++	0x0d7f, 0x007c, 0x1078, 0x7f8e, 0x00c0, 0x7ee6, 0x2001, 0x0000,
++	0x1078, 0x44ee, 0x2001, 0x0002, 0x1078, 0x4502, 0x6003, 0x0001,
++	0x6007, 0x0002, 0x1078, 0x5dd7, 0x0078, 0x7f12, 0x1078, 0x7c83,
++	0x2009, 0xab8e, 0x2134, 0xa6b4, 0x00ff, 0xa686, 0x0005, 0x0040,
++	0x7f13, 0xa686, 0x000b, 0x0040, 0x7f10, 0x2009, 0xab8f, 0x2104,
++	0xa084, 0xff00, 0x00c0, 0x7f00, 0xa686, 0x0009, 0x0040, 0x7f13,
++	0xa086, 0x1900, 0x00c0, 0x7f10, 0xa686, 0x0009, 0x0040, 0x7f13,
++	0x2001, 0x0004, 0x1078, 0x4502, 0x1078, 0x772d, 0x0078, 0x7f12,
++	0x1078, 0x7dff, 0x007c, 0x0d7e, 0x6010, 0x2068, 0x1078, 0x8d06,
++	0x0040, 0x7f21, 0x6838, 0xd0fc, 0x0040, 0x7f21, 0x0d7f, 0x0078,
++	0x7f10, 0x6018, 0x2068, 0x6840, 0xa084, 0x00ff, 0xa005, 0x0040,
++	0x7f32, 0x8001, 0x6842, 0x6017, 0x000a, 0x6007, 0x0016, 0x0d7f,
++	0x0078, 0x7f12, 0x68a0, 0xa086, 0x007e, 0x00c0, 0x7f3f, 0x0e7e,
++	0x2071, 0xa600, 0x1078, 0x42b8, 0x0e7f, 0x0078, 0x7f41, 0x1078,
++	0x2880, 0x0d7f, 0x0078, 0x7f10, 0x1078, 0x7f8e, 0x00c0, 0x7f54,
++	0x2001, 0x0004, 0x1078, 0x4502, 0x6003, 0x0001, 0x6007, 0x0003,
++	0x1078, 0x5dd7, 0x0078, 0x7f58, 0x1078, 0x7c83, 0x1078, 0x7dff,
++	0x007c, 0x1078, 0x7f8e, 0x00c0, 0x7f69, 0x2001, 0x0008, 0x1078,
++	0x4502, 0x6003, 0x0001, 0x6007, 0x0005, 0x1078, 0x5dd7, 0x0078,
++	0x7f6b, 0x1078, 0x7dff, 0x007c, 0x1078, 0x7f8e, 0x00c0, 0x7f7c,
++	0x2001, 0x000a, 0x1078, 0x4502, 0x6003, 0x0001, 0x6007, 0x0001,
++	0x1078, 0x5dd7, 0x0078, 0x7f7e, 0x1078, 0x7dff, 0x007c, 0x2009,
++	0xab8e, 0x2104, 0xa086, 0x0003, 0x00c0, 0x7f8d, 0x2009, 0xab8f,
++	0x2104, 0xa084, 0xff00, 0xa086, 0x2a00, 0x007c, 0xa085, 0x0001,
++	0x007c, 0x0c7e, 0x017e, 0xac88, 0x0006, 0x2164, 0x1078, 0x45d6,
++	0x017f, 0x0c7f, 0x007c, 0x0f7e, 0x0e7e, 0x0d7e, 0x037e, 0x017e,
++	0x6018, 0x2068, 0x2071, 0xa633, 0x2e04, 0xa085, 0x0003, 0x2072,
++	0x1078, 0x8014, 0x0040, 0x7fd9, 0x2009, 0xa633, 0x2104, 0xc0cd,
++	0x200a, 0x2001, 0xa653, 0x2004, 0xd0a4, 0x0040, 0x7fc2, 0xa006,
++	0x2020, 0x2009, 0x002a, 0x1078, 0xa21d, 0x2001, 0xa60c, 0x200c,
++	0xc195, 0x2102, 0x2019, 0x002a, 0x2009, 0x0001, 0x1078, 0x284f,
++	0x2071, 0xa600, 0x1078, 0x2677, 0x0c7e, 0x157e, 0x20a9, 0x0081,
++	0x2009, 0x007f, 0x1078, 0x298e, 0x8108, 0x00f0, 0x7fd2, 0x157f,
++	0x0c7f, 0x1078, 0x7f91, 0x6813, 0x00ff, 0x6817, 0xfffe, 0x2071,
++	0xab80, 0x2079, 0x0100, 0x2e04, 0xa084, 0x00ff, 0x2069, 0xa61b,
++	0x206a, 0x78e6, 0x007e, 0x8e70, 0x2e04, 0x2069, 0xa61c, 0x206a,
++	0x78ea, 0xa084, 0xff00, 0x017f, 0xa105, 0x2009, 0xa626, 0x200a,
++	0x2069, 0xab8e, 0x2071, 0xa89e, 0x6810, 0x2072, 0x6814, 0x7006,
++	0x6818, 0x700a, 0x681c, 0x700e, 0x1078, 0x906e, 0x2001, 0x0006,
++	0x1078, 0x4502, 0x1078, 0x28a6, 0x1078, 0x772d, 0x017f, 0x037f,
++	0x0d7f, 0x0e7f, 0x0f7f, 0x007c, 0x027e, 0x037e, 0x0e7e, 0x157e,
++	0x2019, 0xa626, 0x231c, 0x83ff, 0x0040, 0x803e, 0x2071, 0xab80,
++	0x2e14, 0xa294, 0x00ff, 0x7004, 0xa084, 0xff00, 0xa205, 0xa306,
++	0x00c0, 0x803e, 0x2011, 0xab96, 0xad98, 0x000a, 0x20a9, 0x0004,
++	0x1078, 0x80de, 0x00c0, 0x803e, 0x2011, 0xab9a, 0xad98, 0x0006,
++	0x20a9, 0x0004, 0x1078, 0x80de, 0x00c0, 0x803e, 0x157f, 0x0e7f,
++	0x037f, 0x027f, 0x007c, 0x0e7e, 0x2071, 0xab8c, 0x7004, 0xa086,
++	0x0014, 0x00c0, 0x8066, 0x7008, 0xa086, 0x0800, 0x00c0, 0x8066,
++	0x700c, 0xd0ec, 0x0040, 0x8064, 0xa084, 0x0f00, 0xa086, 0x0100,
++	0x00c0, 0x8064, 0x7024, 0xd0a4, 0x00c0, 0x8061, 0xd0ac, 0x0040,
++	0x8064, 0xa006, 0x0078, 0x8066, 0xa085, 0x0001, 0x0e7f, 0x007c,
++	0x0e7e, 0x0d7e, 0x0c7e, 0x077e, 0x057e, 0x047e, 0x027e, 0x007e,
++	0x127e, 0x2091, 0x8000, 0x2029, 0xa8ba, 0x252c, 0x2021, 0xa8c0,
++	0x2424, 0x2061, 0xad00, 0x2071, 0xa600, 0x7248, 0x7064, 0xa202,
++	0x00c8, 0x80cc, 0x1078, 0xa242, 0x0040, 0x80c4, 0x671c, 0xa786,
++	0x0001, 0x0040, 0x80c4, 0xa786, 0x0007, 0x0040, 0x80c4, 0x2500,
++	0xac06, 0x0040, 0x80c4, 0x2400, 0xac06, 0x0040, 0x80c4, 0x0c7e,
++	0x6000, 0xa086, 0x0004, 0x00c0, 0x809f, 0x1078, 0x1757, 0xa786,
++	0x0008, 0x00c0, 0x80ae, 0x1078, 0x8f00, 0x00c0, 0x80ae, 0x0c7f,
++	0x1078, 0x7c83, 0x1078, 0x8ec6, 0x0078, 0x80c4, 0x6010, 0x2068,
++	0x1078, 0x8d06, 0x0040, 0x80c1, 0xa786, 0x0003, 0x00c0, 0x80d6,
++	0x6837, 0x0103, 0x6b4a, 0x6847, 0x0000, 0x1078, 0x4a73, 0x1078,
++	0x8eb9, 0x1078, 0x8ec6, 0x0c7f, 0xace0, 0x0010, 0x7058, 0xac02,
++	0x00c8, 0x80cc, 0x0078, 0x807d, 0x127f, 0x007f, 0x027f, 0x047f,
++	0x057f, 0x077f, 0x0c7f, 0x0d7f, 0x0e7f, 0x007c, 0xa786, 0x0006,
++	0x00c0, 0x80b8, 0x1078, 0xa1ca, 0x0078, 0x80c1, 0x220c, 0x2304,
++	0xa106, 0x00c0, 0x80e9, 0x8210, 0x8318, 0x00f0, 0x80de, 0xa006,
++	0x007c, 0x2304, 0xa102, 0x0048, 0x80f1, 0x2001, 0x0001, 0x0078,
++	0x80f3, 0x2001, 0x0000, 0xa18d, 0x0001, 0x007c, 0x6004, 0xa08a,
++	0x0044, 0x10c8, 0x1332, 0x1078, 0x8eec, 0x0040, 0x8105, 0x1078,
++	0x8f00, 0x0040, 0x8112, 0x0078, 0x810b, 0x1078, 0x28a6, 0x1078,
++	0x8f00, 0x0040, 0x8112, 0x1078, 0x61cd, 0x1078, 0x772d, 0x1078,
++	0x62d1, 0x007c, 0x1078, 0x7c83, 0x0078, 0x810b, 0xa182, 0x0040,
++	0x0079, 0x811a, 0x812d, 0x812d, 0x812d, 0x812d, 0x812d, 0x812d,
++	0x812d, 0x812d, 0x812d, 0x812d, 0x812d, 0x812f, 0x812f, 0x812f,
++	0x812f, 0x812d, 0x812d, 0x812d, 0x812f, 0x1078, 0x1332, 0x600b,
++	0xffff, 0x6003, 0x0001, 0x6106, 0x1078, 0x5d8a, 0x127e, 0x2091,
++	0x8000, 0x1078, 0x62d1, 0x127f, 0x007c, 0xa186, 0x0013, 0x00c0,
++	0x8146, 0x6004, 0xa082, 0x0040, 0x0079, 0x81d1, 0xa186, 0x0027,
++	0x00c0, 0x8168, 0x1078, 0x61cd, 0x1078, 0x2880, 0x0d7e, 0x6110,
++	0x2168, 0x1078, 0x8d06, 0x0040, 0x8162, 0x6837, 0x0103, 0x684b,
++	0x0029, 0x6847, 0x0000, 0x694c, 0xc1c5, 0x694e, 0x1078, 0x4a73,
++	0x1078, 0x8eb9, 0x0d7f, 0x1078, 0x772d, 0x1078, 0x62d1, 0x007c,
++	0xa186, 0x0014, 0x00c0, 0x8171, 0x6004, 0xa082, 0x0040, 0x0079,
++	0x8199, 0xa186, 0x0046, 0x0040, 0x817d, 0xa186, 0x0045, 0x0040,
++	0x817d, 0xa186, 0x0047, 0x10c0, 0x1332, 0x2001, 0x0109, 0x2004,
++	0xd084, 0x0040, 0x8196, 0x127e, 0x2091, 0x2200, 0x007e, 0x017e,
++	0x027e, 0x1078, 0x5c56, 0x027f, 0x017f, 0x007f, 0x127f, 0x6000,
++	0xa086, 0x0002, 0x00c0, 0x8196, 0x0078, 0x820e, 0x1078, 0x7773,
++	0x007c, 0x81ae, 0x81ac, 0x81ac, 0x81ac, 0x81ac, 0x81ac, 0x81ac,
++	0x81ac, 0x81ac, 0x81ac, 0x81ac, 0x81ca, 0x81ca, 0x81ca, 0x81ca,
++	0x81ac, 0x81ca, 0x81ac, 0x81ca, 0x1078, 0x1332, 0x1078, 0x61cd,
++	0x0d7e, 0x6110, 0x2168, 0x1078, 0x8d06, 0x0040, 0x81c4, 0x6837,
++	0x0103, 0x684b, 0x0006, 0x6847, 0x0000, 0x6850, 0xc0ec, 0x6852,
++	0x1078, 0x4a73, 0x1078, 0x8eb9, 0x0d7f, 0x1078, 0x772d, 0x1078,
++	0x62d1, 0x007c, 0x1078, 0x61cd, 0x1078, 0x772d, 0x1078, 0x62d1,
++	0x007c, 0x81e6, 0x81e4, 0x81e4, 0x81e4, 0x81e4, 0x81e4, 0x81e4,
++	0x81e4, 0x81e4, 0x81e4, 0x81e4, 0x81f8, 0x81f8, 0x81f8, 0x81f8,
++	0x81e4, 0x8207, 0x81e4, 0x81f8, 0x1078, 0x1332, 0x1078, 0x61cd,
++	0x2001, 0xa8a4, 0x2004, 0x603e, 0x6003, 0x0002, 0x1078, 0x62d1,
++	0x6010, 0xa088, 0x0013, 0x2104, 0xa085, 0x0400, 0x200a, 0x007c,
++	0x1078, 0x61cd, 0x2001, 0xa8a2, 0x2004, 0x6016, 0x2001, 0xa8a4,
++	0x2004, 0x603e, 0x6003, 0x000f, 0x1078, 0x62d1, 0x007c, 0x1078,
++	0x61cd, 0x1078, 0x772d, 0x1078, 0x62d1, 0x007c, 0xa182, 0x0040,
++	0x0079, 0x8212, 0x8225, 0x8225, 0x8225, 0x8225, 0x8225, 0x8227,
++	0x8327, 0x8359, 0x8225, 0x8225, 0x8225, 0x8225, 0x8225, 0x8225,
++	0x8225, 0x8225, 0x8225, 0x8225, 0x8225, 0x1078, 0x1332, 0x0e7e,
++	0x0d7e, 0x603f, 0x0000, 0x2071, 0xab80, 0x7124, 0x610a, 0x2071,
++	0xab8c, 0x6110, 0x2168, 0x7614, 0xa6b4, 0x0fff, 0x86ff, 0x0040,
++	0x82e9, 0xa68c, 0x0c00, 0x0040, 0x825e, 0x0f7e, 0x2c78, 0x1078,
++	0x4963, 0x0f7f, 0x0040, 0x825a, 0x684c, 0xd0ac, 0x0040, 0x825a,
++	0x6024, 0xd0dc, 0x00c0, 0x825a, 0x6850, 0xd0bc, 0x00c0, 0x825a,
++	0x7318, 0x6814, 0xa306, 0x00c0, 0x8301, 0x731c, 0x6810, 0xa306,
++	0x00c0, 0x8301, 0x7318, 0x6b62, 0x731c, 0x6b5e, 0xa68c, 0x00ff,
++	0xa186, 0x0002, 0x0040, 0x8291, 0xa186, 0x0028, 0x00c0, 0x826e,
++	0x1078, 0x8eda, 0x684b, 0x001c, 0x0078, 0x8293, 0xd6dc, 0x0040,
++	0x828a, 0x684b, 0x0015, 0x684c, 0xd0ac, 0x0040, 0x8288, 0x6914,
++	0x6a10, 0x2100, 0xa205, 0x0040, 0x8288, 0x7018, 0xa106, 0x00c0,
++	0x8285, 0x701c, 0xa206, 0x0040, 0x8288, 0x6962, 0x6a5e, 0xc6dc,
++	0x0078, 0x8293, 0xd6d4, 0x0040, 0x8291, 0x684b, 0x0007, 0x0078,
++	0x8293, 0x684b, 0x0000, 0x6837, 0x0103, 0x6e46, 0xa01e, 0xd6c4,
++	0x0040, 0x82bc, 0xa686, 0x0100, 0x00c0, 0x82a7, 0x2001, 0xab99,
++	0x2004, 0xa005, 0x00c0, 0x82a7, 0xc6c4, 0x0078, 0x8236, 0x7328,
++	0x732c, 0x6b56, 0x83ff, 0x0040, 0x82bc, 0xa38a, 0x0009, 0x0048,
++	0x82b3, 0x2019, 0x0008, 0x037e, 0x2308, 0x2019, 0xab98, 0xad90,
++	0x0019, 0x1078, 0x89e2, 0x037f, 0xd6cc, 0x0040, 0x8317, 0x7124,
++	0x695a, 0x81ff, 0x0040, 0x8317, 0xa192, 0x0021, 0x00c8, 0x82d5,
++	0x2071, 0xab98, 0x831c, 0x2300, 0xae18, 0xad90, 0x001d, 0x1078,
++	0x89e2, 0x1078, 0x91f4, 0x0078, 0x8317, 0x6838, 0xd0fc, 0x0040,
++	0x82de, 0x2009, 0x0020, 0x695a, 0x0078, 0x82c8, 0x0f7e, 0x2d78,
++	0x1078, 0x897a, 0x0f7f, 0x1078, 0x91f4, 0x1078, 0x89cf, 0x0078,
++	0x8319, 0x0f7e, 0x2c78, 0x1078, 0x4963, 0x0f7f, 0x0040, 0x8307,
++	0x684c, 0xd0ac, 0x0040, 0x8307, 0x6024, 0xd0dc, 0x00c0, 0x8307,
++	0x6850, 0xd0bc, 0x00c0, 0x8307, 0x6810, 0x6914, 0xa105, 0x0040,
++	0x8307, 0x1078, 0x8fbf, 0x0d7f, 0x0e7f, 0x0078, 0x8326, 0x684b,
++	0x0000, 0x6837, 0x0103, 0x6e46, 0x684c, 0xd0ac, 0x0040, 0x8317,
++	0x6810, 0x6914, 0xa115, 0x0040, 0x8317, 0x1078, 0x84d5, 0x1078,
++	0x4a73, 0x6218, 0x2268, 0x6a3c, 0x8211, 0x6a3e, 0x1078, 0x8f89,
++	0x0d7f, 0x0e7f, 0x00c0, 0x8326, 0x1078, 0x772d, 0x007c, 0x0f7e,
++	0x6003, 0x0003, 0x2079, 0xab8c, 0x7c04, 0x7b00, 0x7e0c, 0x7d08,
++	0x6010, 0x2078, 0x784c, 0xd0ac, 0x0040, 0x833e, 0x6003, 0x0002,
++	0x0f7f, 0x007c, 0x2130, 0x2228, 0x0078, 0x834a, 0x2400, 0x797c,
++	0xa10a, 0x2300, 0x7a80, 0xa213, 0x2600, 0xa102, 0x2500, 0xa203,
++	0x0048, 0x833a, 0x7c12, 0x7b16, 0x7e0a, 0x7d0e, 0x0f7f, 0x603f,
++	0x0000, 0x2c10, 0x1078, 0x1cf0, 0x1078, 0x5df6, 0x1078, 0x639b,
++	0x007c, 0x2001, 0xa8a4, 0x2004, 0x603e, 0x6003, 0x0004, 0x6110,
++	0x20e1, 0x0005, 0x3d18, 0x3e20, 0x2c10, 0x1078, 0x15fa, 0x007c,
++	0xa182, 0x0040, 0x0079, 0x836c, 0x837f, 0x837f, 0x837f, 0x837f,
++	0x837f, 0x8381, 0x8424, 0x837f, 0x837f, 0x843a, 0x84ab, 0x837f,
++	0x837f, 0x837f, 0x837f, 0x84ba, 0x837f, 0x837f, 0x837f, 0x1078,
++	0x1332, 0x077e, 0x0f7e, 0x0e7e, 0x0d7e, 0x2071, 0xab8c, 0x6110,
++	0x2178, 0x7614, 0xa6b4, 0x0fff, 0x7e46, 0x7f4c, 0xc7e5, 0x7f4e,
++	0x6218, 0x2268, 0x6a3c, 0x8211, 0x6a3e, 0x86ff, 0x0040, 0x841f,
++	0xa694, 0xff00, 0xa284, 0x0c00, 0x0040, 0x83a2, 0x7018, 0x7862,
++	0x701c, 0x785e, 0xa284, 0x0300, 0x0040, 0x841f, 0x1078, 0x138b,
++	0x1040, 0x1332, 0x2d00, 0x784a, 0x7f4c, 0xc7cd, 0x7f4e, 0x6837,
++	0x0103, 0x7838, 0x683a, 0x783c, 0x683e, 0x7840, 0x6842, 0x6e46,
++	0xa68c, 0x0c00, 0x0040, 0x83c0, 0x7318, 0x6b62, 0x731c, 0x6b5e,
++	0xa68c, 0x00ff, 0xa186, 0x0002, 0x0040, 0x83dc, 0xa186, 0x0028,
++	0x00c0, 0x83ce, 0x684b, 0x001c, 0x0078, 0x83de, 0xd6dc, 0x0040,
++	0x83d5, 0x684b, 0x0015, 0x0078, 0x83de, 0xd6d4, 0x0040, 0x83dc,
++	0x684b, 0x0007, 0x0078, 0x83de, 0x684b, 0x0000, 0x6f4e, 0x7850,
++	0x6852, 0x7854, 0x6856, 0xa01e, 0xd6c4, 0x0040, 0x83fc, 0x7328,
++	0x732c, 0x6b56, 0x83ff, 0x0040, 0x83fc, 0xa38a, 0x0009, 0x0048,
++	0x83f3, 0x2019, 0x0008, 0x037e, 0x2308, 0x2019, 0xab98, 0xad90,
++	0x0019, 0x1078, 0x89e2, 0x037f, 0xd6cc, 0x0040, 0x841f, 0x7124,
++	0x695a, 0x81ff, 0x0040, 0x841f, 0xa192, 0x0021, 0x00c8, 0x8413,
++	0x2071, 0xab98, 0x831c, 0x2300, 0xae18, 0xad90, 0x001d, 0x1078,
++	0x89e2, 0x0078, 0x841f, 0x7838, 0xd0fc, 0x0040, 0x841c, 0x2009,
++	0x0020, 0x695a, 0x0078, 0x8408, 0x2d78, 0x1078, 0x897a, 0x0d7f,
++	0x0e7f, 0x0f7f, 0x077f, 0x007c, 0x0f7e, 0x6003, 0x0003, 0x2079,
++	0xab8c, 0x7c04, 0x7b00, 0x7e0c, 0x7d08, 0x6010, 0x2078, 0x7c12,
++	0x7b16, 0x7e0a, 0x7d0e, 0x0f7f, 0x2c10, 0x1078, 0x1cf0, 0x1078,
++	0x6df4, 0x007c, 0x0d7e, 0x0f7e, 0x2c78, 0x1078, 0x4963, 0x0f7f,
++	0x0040, 0x8446, 0x2001, 0xa8a4, 0x2004, 0x603e, 0x6003, 0x0002,
++	0x1078, 0x627a, 0x1078, 0x639b, 0x6110, 0x2168, 0x694c, 0xd1e4,
++	0x0040, 0x84a9, 0xd1cc, 0x0040, 0x8480, 0x6948, 0x6838, 0xd0fc,
++	0x0040, 0x8478, 0x017e, 0x684c, 0x007e, 0x6850, 0x007e, 0xad90,
++	0x000d, 0xa198, 0x000d, 0x2009, 0x0020, 0x157e, 0x21a8, 0x2304,
++	0x2012, 0x8318, 0x8210, 0x00f0, 0x8467, 0x157f, 0x007f, 0x6852,
++	0x007f, 0x684e, 0x017f, 0x2168, 0x1078, 0x13b4, 0x0078, 0x84a3,
++	0x017e, 0x1078, 0x13b4, 0x0d7f, 0x1078, 0x89cf, 0x0078, 0x84a3,
++	0x6837, 0x0103, 0x6944, 0xa184, 0x00ff, 0xa0b6, 0x0002, 0x0040,
++	0x849f, 0xa086, 0x0028, 0x00c0, 0x8491, 0x684b, 0x001c, 0x0078,
++	0x84a1, 0xd1dc, 0x0040, 0x8498, 0x684b, 0x0015, 0x0078, 0x84a1,
++	0xd1d4, 0x0040, 0x849f, 0x684b, 0x0007, 0x0078, 0x84a1, 0x684b,
++	0x0000, 0x1078, 0x4a73, 0x1078, 0x8f89, 0x00c0, 0x84a9, 0x1078,
++	0x772d, 0x0d7f, 0x007c, 0x2019, 0x0001, 0x1078, 0x7058, 0x6003,
++	0x0002, 0x2001, 0xa8a4, 0x2004, 0x603e, 0x1078, 0x627a, 0x1078,
++	0x639b, 0x007c, 0x1078, 0x627a, 0x1078, 0x2880, 0x0d7e, 0x6110,
++	0x2168, 0x1078, 0x8d06, 0x0040, 0x84cf, 0x6837, 0x0103, 0x684b,
++	0x0029, 0x6847, 0x0000, 0x1078, 0x4a73, 0x1078, 0x8eb9, 0x0d7f,
++	0x1078, 0x772d, 0x1078, 0x639b, 0x007c, 0x684b, 0x0015, 0xd1fc,
++	0x0040, 0x84e1, 0x684b, 0x0007, 0x8002, 0x8000, 0x810a, 0xa189,
++	0x0000, 0x6962, 0x685e, 0x007c, 0xa182, 0x0040, 0x0079, 0x84e8,
++	0x84fb, 0x84fb, 0x84fb, 0x84fb, 0x84fb, 0x84fd, 0x84fb, 0x85d0,
++	0x85dc, 0x84fb, 0x84fb, 0x84fb, 0x84fb, 0x84fb, 0x84fb, 0x84fb,
++	0x84fb, 0x84fb, 0x84fb, 0x1078, 0x1332, 0x077e, 0x0f7e, 0x0e7e,
++	0x0d7e, 0x2071, 0xab8c, 0x6110, 0x2178, 0x7614, 0xa6b4, 0x0fff,
++	0x0f7e, 0x2c78, 0x1078, 0x4963, 0x0f7f, 0x0040, 0x851b, 0xa684,
++	0x00ff, 0x00c0, 0x851b, 0x6024, 0xd0f4, 0x0040, 0x851b, 0x1078,
++	0x8fbf, 0x0078, 0x85cb, 0x7e46, 0x7f4c, 0xc7e5, 0x7f4e, 0x6218,
++	0x2268, 0x6a3c, 0x8211, 0x6a3e, 0x86ff, 0x0040, 0x85c0, 0xa694,
++	0xff00, 0xa284, 0x0c00, 0x0040, 0x8531, 0x7018, 0x7862, 0x701c,
++	0x785e, 0xa284, 0x0300, 0x0040, 0x85bd, 0xa686, 0x0100, 0x00c0,
++	0x8543, 0x2001, 0xab99, 0x2004, 0xa005, 0x00c0, 0x8543, 0xc6c4,
++	0x7e46, 0x0078, 0x8524, 0x1078, 0x138b, 0x1040, 0x1332, 0x2d00,
++	0x784a, 0x7f4c, 0xa7bd, 0x0200, 0x7f4e, 0x6837, 0x0103, 0x7838,
++	0x683a, 0x783c, 0x683e, 0x7840, 0x6842, 0x6e46, 0xa68c, 0x0c00,
++	0x0040, 0x855e, 0x7318, 0x6b62, 0x731c, 0x6b5e, 0xa68c, 0x00ff,
++	0xa186, 0x0002, 0x0040, 0x857a, 0xa186, 0x0028, 0x00c0, 0x856c,
++	0x684b, 0x001c, 0x0078, 0x857c, 0xd6dc, 0x0040, 0x8573, 0x684b,
++	0x0015, 0x0078, 0x857c, 0xd6d4, 0x0040, 0x857a, 0x684b, 0x0007,
++	0x0078, 0x857c, 0x684b, 0x0000, 0x6f4e, 0x7850, 0x6852, 0x7854,
++	0x6856, 0xa01e, 0xd6c4, 0x0040, 0x859a, 0x7328, 0x732c, 0x6b56,
++	0x83ff, 0x0040, 0x859a, 0xa38a, 0x0009, 0x0048, 0x8591, 0x2019,
++	0x0008, 0x037e, 0x2308, 0x2019, 0xab98, 0xad90, 0x0019, 0x1078,
++	0x89e2, 0x037f, 0xd6cc, 0x0040, 0x85bd, 0x7124, 0x695a, 0x81ff,
++	0x0040, 0x85bd, 0xa192, 0x0021, 0x00c8, 0x85b1, 0x2071, 0xab98,
++	0x831c, 0x2300, 0xae18, 0xad90, 0x001d, 0x1078, 0x89e2, 0x0078,
++	0x85bd, 0x7838, 0xd0fc, 0x0040, 0x85ba, 0x2009, 0x0020, 0x695a,
++	0x0078, 0x85a6, 0x2d78, 0x1078, 0x897a, 0xd6dc, 0x00c0, 0x85c3,
++	0xa006, 0x0078, 0x85c9, 0x2001, 0x0001, 0x2071, 0xab8c, 0x7218,
++	0x731c, 0x1078, 0x1653, 0x0d7f, 0x0e7f, 0x0f7f, 0x077f, 0x007c,
++	0x2001, 0xa8a4, 0x2004, 0x603e, 0x20e1, 0x0005, 0x3d18, 0x3e20,
++	0x2c10, 0x1078, 0x15fa, 0x007c, 0x2001, 0xa8a4, 0x2004, 0x603e,
++	0x0d7e, 0x6003, 0x0002, 0x6110, 0x2168, 0x694c, 0xd1e4, 0x0040,
++	0x870c, 0x603f, 0x0000, 0x0f7e, 0x2c78, 0x1078, 0x4963, 0x0f7f,
++	0x0040, 0x8622, 0x6814, 0x6910, 0xa115, 0x0040, 0x8622, 0x6a60,
++	0xa206, 0x00c0, 0x85ff, 0x685c, 0xa106, 0x0040, 0x8622, 0x684c,
++	0xc0e4, 0x684e, 0x6847, 0x0000, 0x6863, 0x0000, 0x685f, 0x0000,
++	0x6024, 0xd0f4, 0x00c0, 0x8617, 0x697c, 0x6810, 0xa102, 0x603a,
++	0x6980, 0x6814, 0xa103, 0x6036, 0x6024, 0xc0f5, 0x6026, 0x0d7e,
++	0x6018, 0x2068, 0x683c, 0x8000, 0x683e, 0x0d7f, 0x1078, 0x8fbf,
++	0x0078, 0x870c, 0x694c, 0xd1cc, 0x0040, 0x86d1, 0x6948, 0x6838,
++	0xd0fc, 0x0040, 0x8689, 0x017e, 0x684c, 0x007e, 0x6850, 0x007e,
++	0x0f7e, 0x2178, 0x7944, 0xa184, 0x00ff, 0xa0b6, 0x0002, 0x0040,
++	0x865c, 0xa086, 0x0028, 0x00c0, 0x8643, 0x684b, 0x001c, 0x784b,
++	0x001c, 0x0078, 0x8667, 0xd1dc, 0x0040, 0x8653, 0x684b, 0x0015,
++	0x784b, 0x0015, 0x1078, 0x916c, 0x0040, 0x8651, 0x7944, 0xc1dc,
++	0x7946, 0x0078, 0x8667, 0xd1d4, 0x0040, 0x865c, 0x684b, 0x0007,
++	0x784b, 0x0007, 0x0078, 0x8667, 0x684c, 0xd0ac, 0x0040, 0x8667,
++	0x6810, 0x6914, 0xa115, 0x0040, 0x8667, 0x1078, 0x84d5, 0x6848,
++	0x784a, 0x6860, 0x7862, 0x685c, 0x785e, 0xad90, 0x000d, 0xaf98,
++	0x000d, 0x2009, 0x0020, 0x157e, 0x21a8, 0x2304, 0x2012, 0x8318,
++	0x8210, 0x00f0, 0x8675, 0x157f, 0x0f7f, 0x007f, 0x6852, 0x007f,
++	0x684e, 0x1078, 0x91f4, 0x017f, 0x2168, 0x1078, 0x13b4, 0x0078,
++	0x8706, 0x017e, 0x0f7e, 0x2178, 0x7944, 0xa184, 0x00ff, 0xa0b6,
++	0x0002, 0x0040, 0x86b6, 0xa086, 0x0028, 0x00c0, 0x869d, 0x684b,
++	0x001c, 0x784b, 0x001c, 0x0078, 0x86c1, 0xd1dc, 0x0040, 0x86ad,
++	0x684b, 0x0015, 0x784b, 0x0015, 0x1078, 0x916c, 0x0040, 0x86ab,
++	0x7944, 0xc1dc, 0x7946, 0x0078, 0x86c1, 0xd1d4, 0x0040, 0x86b6,
++	0x684b, 0x0007, 0x784b, 0x0007, 0x0078, 0x86c1, 0x684c, 0xd0ac,
++	0x0040, 0x86c1, 0x6810, 0x6914, 0xa115, 0x0040, 0x86c1, 0x1078,
++	0x84d5, 0x6860, 0x7862, 0x685c, 0x785e, 0x684c, 0x784e, 0x0f7f,
++	0x1078, 0x13b4, 0x0d7f, 0x1078, 0x91f4, 0x1078, 0x89cf, 0x0078,
++	0x8706, 0x6837, 0x0103, 0x6944, 0xa184, 0x00ff, 0xa0b6, 0x0002,
++	0x0040, 0x86f7, 0xa086, 0x0028, 0x00c0, 0x86e2, 0x684b, 0x001c,
++	0x0078, 0x8704, 0xd1dc, 0x0040, 0x86f0, 0x684b, 0x0015, 0x1078,
++	0x916c, 0x0040, 0x86ee, 0x6944, 0xc1dc, 0x6946, 0x0078, 0x8704,
++	0xd1d4, 0x0040, 0x86f7, 0x684b, 0x0007, 0x0078, 0x8704, 0x684b,
++	0x0000, 0x684c, 0xd0ac, 0x0040, 0x8704, 0x6810, 0x6914, 0xa115,
++	0x0040, 0x8704, 0x1078, 0x84d5, 0x1078, 0x4a73, 0x1078, 0x8f89,
++	0x00c0, 0x870c, 0x1078, 0x772d, 0x0d7f, 0x007c, 0x1078, 0x61cd,
++	0x0078, 0x8714, 0x1078, 0x627a, 0x1078, 0x8d06, 0x0040, 0x8733,
++	0x0d7e, 0x6110, 0x2168, 0x6837, 0x0103, 0x2009, 0xa60c, 0x210c,
++	0xd18c, 0x00c0, 0x873e, 0xd184, 0x00c0, 0x873a, 0x6108, 0x694a,
++	0xa18e, 0x0029, 0x00c0, 0x872e, 0x1078, 0xa4e2, 0x6847, 0x0000,
++	0x1078, 0x4a73, 0x0d7f, 0x1078, 0x772d, 0x1078, 0x62d1, 0x1078,
++	0x639b, 0x007c, 0x684b, 0x0004, 0x0078, 0x872e, 0x684b, 0x0004,
++	0x0078, 0x872e, 0xa182, 0x0040, 0x0079, 0x8746, 0x8759, 0x8759,
++	0x8759, 0x8759, 0x8759, 0x875b, 0x8759, 0x875e, 0x8759, 0x8759,
++	0x8759, 0x8759, 0x8759, 0x8759, 0x8759, 0x8759, 0x8759, 0x8759,
++	0x8759, 0x1078, 0x1332, 0x1078, 0x772d, 0x007c, 0x007e, 0x027e,
++	0xa016, 0x1078, 0x15fa, 0x027f, 0x007f, 0x007c, 0xa182, 0x0085,
++	0x0079, 0x876a, 0x8773, 0x8771, 0x8771, 0x877f, 0x8771, 0x8771,
++	0x8771, 0x1078, 0x1332, 0x6003, 0x0001, 0x6106, 0x1078, 0x5d8a,
++	0x127e, 0x2091, 0x8000, 0x1078, 0x62d1, 0x127f, 0x007c, 0x027e,
++	0x057e, 0x0d7e, 0x0e7e, 0x2071, 0xab80, 0x7224, 0x6212, 0x7220,
++	0x1078, 0x8cf2, 0x0040, 0x87a4, 0x2268, 0x6800, 0xa086, 0x0000,
++	0x0040, 0x87a4, 0x6018, 0x6d18, 0xa52e, 0x00c0, 0x87a4, 0x0c7e,
++	0x2d60, 0x1078, 0x89f3, 0x0c7f, 0x0040, 0x87a4, 0x6803, 0x0002,
++	0x6007, 0x0086, 0x0078, 0x87a6, 0x6007, 0x0087, 0x6003, 0x0001,
++	0x1078, 0x5d8a, 0x1078, 0x62d1, 0x0f7e, 0x2278, 0x1078, 0x4963,
++	0x0f7f, 0x0040, 0x87be, 0x6824, 0xd0ec, 0x0040, 0x87be, 0x0c7e,
++	0x2260, 0x603f, 0x0000, 0x1078, 0x8fbf, 0x0c7f, 0x0e7f, 0x0d7f,
++	0x057f, 0x027f, 0x007c, 0xa186, 0x0013, 0x00c0, 0x87d4, 0x6004,
++	0xa08a, 0x0085, 0x1048, 0x1332, 0xa08a, 0x008c, 0x10c8, 0x1332,
++	0xa082, 0x0085, 0x0079, 0x87e3, 0xa186, 0x0027, 0x0040, 0x87dc,
++	0xa186, 0x0014, 0x10c0, 0x1332, 0x1078, 0x61cd, 0x1078, 0x8ec6,
++	0x1078, 0x62d1, 0x007c, 0x87ea, 0x87ec, 0x87ec, 0x87ea, 0x87ea,
++	0x87ea, 0x87ea, 0x1078, 0x1332, 0x1078, 0x61cd, 0x1078, 0x8ec6,
++	0x1078, 0x62d1, 0x007c, 0xa186, 0x0013, 0x00c0, 0x87fd, 0x6004,
++	0xa082, 0x0085, 0x2008, 0x0078, 0x8838, 0xa186, 0x0027, 0x00c0,
++	0x8820, 0x1078, 0x61cd, 0x1078, 0x2880, 0x0d7e, 0x6010, 0x2068,
++	0x1078, 0x8d06, 0x0040, 0x8816, 0x6837, 0x0103, 0x6847, 0x0000,
++	0x684b, 0x0029, 0x1078, 0x4a73, 0x1078, 0x8eb9, 0x0d7f, 0x1078,
++	0x772d, 0x1078, 0x62d1, 0x007c, 0x1078, 0x7773, 0x0078, 0x881b,
++	0xa186, 0x0014, 0x00c0, 0x881c, 0x1078, 0x61cd, 0x0d7e, 0x6010,
++	0x2068, 0x1078, 0x8d06, 0x0040, 0x8816, 0x6837, 0x0103, 0x6847,
++	0x0000, 0x684b, 0x0006, 0x6850, 0xc0ec, 0x6852, 0x0078, 0x8812,
++	0x0079, 0x883a, 0x8843, 0x8841, 0x8841, 0x8841, 0x8841, 0x8841,
++	0x885e, 0x1078, 0x1332, 0x1078, 0x61cd, 0x6030, 0xa08c, 0xff00,
++	0x810f, 0xa186, 0x0039, 0x0040, 0x8851, 0xa186, 0x0035, 0x00c0,
++	0x8855, 0x2001, 0xa8a2, 0x0078, 0x8857, 0x2001, 0xa8a3, 0x2004,
++	0x6016, 0x6003, 0x000c, 0x1078, 0x62d1, 0x007c, 0x1078, 0x61cd,
++	0x6030, 0xa08c, 0xff00, 0x810f, 0xa186, 0x0039, 0x0040, 0x886c,
++	0xa186, 0x0035, 0x00c0, 0x8870, 0x2001, 0xa8a2, 0x0078, 0x8872,
++	0x2001, 0xa8a3, 0x2004, 0x6016, 0x6003, 0x000e, 0x1078, 0x62d1,
++	0x007c, 0xa182, 0x008c, 0x00c8, 0x8883, 0xa182, 0x0085, 0x0048,
++	0x8883, 0x0079, 0x8886, 0x1078, 0x7773, 0x007c, 0x888d, 0x888d,
++	0x888d, 0x888d, 0x888f, 0x88ec, 0x888d, 0x1078, 0x1332, 0x0f7e,
++	0x2c78, 0x1078, 0x4963, 0x0f7f, 0x0040, 0x88a2, 0x6030, 0xa08c,
++	0xff00, 0x810f, 0xa186, 0x0039, 0x0040, 0x8903, 0xa186, 0x0035,
++	0x0040, 0x8903, 0x0d7e, 0x1078, 0x8d06, 0x00c0, 0x88ab, 0x1078,
++	0x8eb9, 0x0078, 0x88ce, 0x6010, 0x2068, 0x684c, 0xd0e4, 0x00c0,
++	0x88b3, 0x1078, 0x8eb9, 0x6837, 0x0103, 0x6850, 0xd0b4, 0x0040,
++	0x88bf, 0x684b, 0x0006, 0xc0ec, 0x6852, 0x0078, 0x88ca, 0xd0bc,
++	0x0040, 0x88c6, 0x684b, 0x0002, 0x0078, 0x88ca, 0x684b, 0x0005,
++	0x1078, 0x8f85, 0x6847, 0x0000, 0x1078, 0x4a73, 0x2c68, 0x1078,
++	0x76c7, 0x0040, 0x88e7, 0x6003, 0x0001, 0x6007, 0x001e, 0x2009,
++	0xab8e, 0x210c, 0x6136, 0x2009, 0xab8f, 0x210c, 0x613a, 0x6918,
++	0x611a, 0x6920, 0x6122, 0x601f, 0x0001, 0x1078, 0x5d8a, 0x2d60,
++	0x1078, 0x772d, 0x0d7f, 0x007c, 0x0f7e, 0x2c78, 0x1078, 0x4963,
++	0x0f7f, 0x0040, 0x8929, 0x6030, 0xa08c, 0xff00, 0x810f, 0xa186,
++	0x0035, 0x0040, 0x8903, 0xa186, 0x001e, 0x0040, 0x8903, 0xa186,
++	0x0039, 0x00c0, 0x8929, 0x0d7e, 0x2c68, 0x1078, 0x91bc, 0x00c0,
++	0x894d, 0x1078, 0x76c7, 0x0040, 0x8926, 0x6106, 0x6003, 0x0001,
++	0x601f, 0x0001, 0x6918, 0x611a, 0x6928, 0x612a, 0x692c, 0x612e,
++	0x6930, 0xa18c, 0x00ff, 0x6132, 0x6934, 0x6136, 0x6938, 0x613a,
++	0x6920, 0x6122, 0x1078, 0x5d8a, 0x1078, 0x62d1, 0x2d60, 0x0078,
++	0x894d, 0x0d7e, 0x6010, 0x2068, 0x1078, 0x8d06, 0x0040, 0x894d,
++	0x6837, 0x0103, 0x6850, 0xd0b4, 0x0040, 0x893c, 0xc0ec, 0x6852,
++	0x684b, 0x0006, 0x0078, 0x8947, 0xd0bc, 0x0040, 0x8943, 0x684b,
++	0x0002, 0x0078, 0x8947, 0x684b, 0x0005, 0x1078, 0x8f85, 0x6847,
++	0x0000, 0x1078, 0x4a73, 0x1078, 0x8eb9, 0x0d7f, 0x1078, 0x772d,
++	0x007c, 0x017e, 0x0d7e, 0x6010, 0x2068, 0x1078, 0x8d06, 0x0040,
++	0x8961, 0x6837, 0x0103, 0x684b, 0x0028, 0x6847, 0x0000, 0x1078,
++	0x4a73, 0x0d7f, 0x017f, 0xa186, 0x0013, 0x0040, 0x8973, 0xa186,
++	0x0014, 0x0040, 0x8973, 0xa186, 0x0027, 0x0040, 0x8973, 0x1078,
++	0x7773, 0x0078, 0x8979, 0x1078, 0x61cd, 0x1078, 0x8ec6, 0x1078,
++	0x62d1, 0x007c, 0x057e, 0x067e, 0x0d7e, 0x0f7e, 0x2029, 0x0001,
++	0xa182, 0x0101, 0x00c8, 0x8986, 0x0078, 0x8988, 0x2009, 0x0100,
++	0x2130, 0x2069, 0xab98, 0x831c, 0x2300, 0xad18, 0x2009, 0x0020,
++	0xaf90, 0x001d, 0x1078, 0x89e2, 0xa6b2, 0x0020, 0x7804, 0xa06d,
++	0x0040, 0x899c, 0x1078, 0x13b4, 0x1078, 0x138b, 0x0040, 0x89c6,
++	0x8528, 0x6837, 0x0110, 0x683b, 0x0000, 0x2d20, 0x7c06, 0xa68a,
++	0x003d, 0x00c8, 0x89b2, 0x2608, 0xad90, 0x000f, 0x1078, 0x89e2,
++	0x0078, 0x89c6, 0xa6b2, 0x003c, 0x2009, 0x003c, 0x2d78, 0xad90,
++	0x000f, 0x1078, 0x89e2, 0x0078, 0x899c, 0x0f7f, 0x852f, 0xa5ad,
++	0x0003, 0x7d36, 0xa5ac, 0x0000, 0x0078, 0x89cb, 0x0f7f, 0x852f,
++	0xa5ad, 0x0003, 0x7d36, 0x0d7f, 0x067f, 0x057f, 0x007c, 0x0f7e,
++	0x8dff, 0x0040, 0x89e0, 0x6804, 0xa07d, 0x0040, 0x89de, 0x6807,
++	0x0000, 0x1078, 0x4a73, 0x2f68, 0x0078, 0x89d3, 0x1078, 0x4a73,
++	0x0f7f, 0x007c, 0x157e, 0xa184, 0x0001, 0x0040, 0x89e8, 0x8108,
++	0x810c, 0x21a8, 0x2304, 0x8007, 0x2012, 0x8318, 0x8210, 0x00f0,
++	0x89ea, 0x157f, 0x007c, 0x067e, 0x127e, 0x2091, 0x8000, 0x2031,
++	0x0001, 0x601c, 0xa084, 0x000f, 0x1079, 0x8a0f, 0x127f, 0x067f,
++	0x007c, 0x127e, 0x2091, 0x8000, 0x067e, 0x2031, 0x0000, 0x601c,
++	0xa084, 0x000f, 0x1079, 0x8a0f, 0x067f, 0x127f, 0x007c, 0x8a29,
++	0x8a17, 0x8a24, 0x8a45, 0x8a17, 0x8a24, 0x8a45, 0x8a24, 0x1078,
++	0x1332, 0x037e, 0x2019, 0x0010, 0x1078, 0x9dc7, 0x601f, 0x0006,
++	0x6003, 0x0007, 0x037f, 0x007c, 0xa006, 0x007c, 0xa085, 0x0001,
++	0x007c, 0x0d7e, 0x86ff, 0x00c0, 0x8a40, 0x6010, 0x2068, 0x1078,
++	0x8d06, 0x0040, 0x8a42, 0xa00e, 0x2001, 0x0005, 0x1078, 0x4b51,
++	0x1078, 0x8f85, 0x1078, 0x4a73, 0x1078, 0x772d, 0xa085, 0x0001,
++	0x0d7f, 0x007c, 0xa006, 0x0078, 0x8a40, 0x6000, 0xa08a, 0x0010,
++	0x10c8, 0x1332, 0x1079, 0x8a4d, 0x007c, 0x8a5d, 0x8a82, 0x8a5f,
++	0x8aa5, 0x8a7e, 0x8a5d, 0x8a24, 0x8a29, 0x8a29, 0x8a24, 0x8a24,
++	0x8a24, 0x8a24, 0x8a24, 0x8a24, 0x8a24, 0x1078, 0x1332, 0x86ff,
++	0x00c0, 0x8a7b, 0x601c, 0xa086, 0x0006, 0x0040, 0x8a7b, 0x0d7e,
++	0x6010, 0x2068, 0x1078, 0x8d06, 0x0040, 0x8a70, 0x1078, 0x8f85,
++	0x0d7f, 0x6007, 0x0085, 0x6003, 0x000b, 0x601f, 0x0002, 0x1078,
++	0x5d8a, 0x1078, 0x62d1, 0xa085, 0x0001, 0x007c, 0x1078, 0x1757,
++	0x0078, 0x8a5f, 0x0e7e, 0x2071, 0xa8b1, 0x7024, 0xac06, 0x00c0,
++	0x8a8b, 0x1078, 0x6fc4, 0x601c, 0xa084, 0x000f, 0xa086, 0x0006,
++	0x00c0, 0x8a9d, 0x087e, 0x097e, 0x2049, 0x0001, 0x2c40, 0x1078,
++	0x7246, 0x097f, 0x087f, 0x0078, 0x8a9f, 0x1078, 0x6ebe, 0x0e7f,
++	0x00c0, 0x8a5f, 0x1078, 0x8a24, 0x007c, 0x037e, 0x0e7e, 0x2071,
++	0xa8b1, 0x703c, 0xac06, 0x00c0, 0x8ab5, 0x2019, 0x0000, 0x1078,
++	0x7058, 0x0e7f, 0x037f, 0x0078, 0x8a5f, 0x1078, 0x738a, 0x0e7f,
++	0x037f, 0x00c0, 0x8a5f, 0x1078, 0x8a24, 0x007c, 0x0c7e, 0x601c,
++	0xa084, 0x000f, 0x1079, 0x8ac6, 0x0c7f, 0x007c, 0x8ad5, 0x8b47,
++	0x8c7f, 0x8ae0, 0x8ec6, 0x8ad5, 0x9db8, 0x772d, 0x8b47, 0x1078,
++	0x8f00, 0x00c0, 0x8ad5, 0x1078, 0x7c83, 0x007c, 0x1078, 0x61cd,
++	0x1078, 0x62d1, 0x1078, 0x772d, 0x007c, 0x6017, 0x0001, 0x007c,
++	0x1078, 0x8d06, 0x0040, 0x8ae8, 0x6010, 0xa080, 0x0019, 0x2c02,
++	0x6000, 0xa08a, 0x0010, 0x10c8, 0x1332, 0x1079, 0x8af0, 0x007c,
++	0x8b00, 0x8b02, 0x8b24, 0x8b36, 0x8b43, 0x8b00, 0x8ad5, 0x8ad5,
++	0x8ad5, 0x8b36, 0x8b36, 0x8b00, 0x8b00, 0x8b00, 0x8b00, 0x8b40,
++	0x1078, 0x1332, 0x0e7e, 0x6010, 0x2070, 0x7050, 0xc0b5, 0x7052,
++	0x2071, 0xa8b1, 0x7024, 0xac06, 0x0040, 0x8b20, 0x1078, 0x6ebe,
++	0x6007, 0x0085, 0x6003, 0x000b, 0x601f, 0x0002, 0x2001, 0xa8a3,
++	0x2004, 0x6016, 0x1078, 0x5d8a, 0x1078, 0x62d1, 0x0e7f, 0x007c,
++	0x6017, 0x0001, 0x0078, 0x8b1e, 0x0d7e, 0x6010, 0x2068, 0x6850,
++	0xc0b5, 0x6852, 0x0d7f, 0x6007, 0x0085, 0x6003, 0x000b, 0x601f,
++	0x0002, 0x1078, 0x5d8a, 0x1078, 0x62d1, 0x007c, 0x0d7e, 0x6017,
++	0x0001, 0x6010, 0x2068, 0x6850, 0xc0b5, 0x6852, 0x0d7f, 0x007c,
++	0x1078, 0x772d, 0x007c, 0x1078, 0x1757, 0x0078, 0x8b24, 0x6000,
++	0xa08a, 0x0010, 0x10c8, 0x1332, 0x1079, 0x8b4f, 0x007c, 0x8b5f,
++	0x8add, 0x8b61, 0x8b5f, 0x8b61, 0x8b61, 0x8ad6, 0x8b5f, 0x8acf,
++	0x8acf, 0x8b5f, 0x8b5f, 0x8b5f, 0x8b5f, 0x8b5f, 0x8b5f, 0x1078,
++	0x1332, 0x0d7e, 0x6018, 0x2068, 0x6804, 0xa084, 0x00ff, 0x0d7f,
++	0xa08a, 0x000c, 0x10c8, 0x1332, 0x1079, 0x8b6f, 0x007c, 0x8b7b,
++	0x8c23, 0x8b7d, 0x8bbd, 0x8b7d, 0x8bbd, 0x8b7d, 0x8b8a, 0x8b7b,
++	0x8bbd, 0x8b7b, 0x8ba7, 0x1078, 0x1332, 0x6004, 0xa08e, 0x0016,
++	0x0040, 0x8bb8, 0xa08e, 0x0004, 0x0040, 0x8bb8, 0xa08e, 0x0002,
++	0x0040, 0x8bb8, 0x6004, 0x1078, 0x8f00, 0x0040, 0x8c3e, 0xa08e,
++	0x0021, 0x0040, 0x8c42, 0xa08e, 0x0022, 0x0040, 0x8c3e, 0xa08e,
++	0x003d, 0x0040, 0x8c42, 0xa08e, 0x0039, 0x0040, 0x8c46, 0xa08e,
++	0x0035, 0x0040, 0x8c46, 0xa08e, 0x001e, 0x0040, 0x8bba, 0xa08e,
++	0x0001, 0x00c0, 0x8bb6, 0x0d7e, 0x6018, 0x2068, 0x6804, 0xa084,
++	0x00ff, 0x0d7f, 0xa086, 0x0006, 0x0040, 0x8bb8, 0x1078, 0x2880,
++	0x1078, 0x7c83, 0x1078, 0x8ec6, 0x007c, 0x0c7e, 0x0d7e, 0x6104,
++	0xa186, 0x0016, 0x0040, 0x8c13, 0xa186, 0x0002, 0x00c0, 0x8be6,
++	0x6018, 0x2068, 0x68a0, 0xd0bc, 0x00c0, 0x8c6a, 0x6840, 0xa084,
++	0x00ff, 0xa005, 0x0040, 0x8be6, 0x8001, 0x6842, 0x6013, 0x0000,
++	0x601f, 0x0007, 0x6017, 0x0398, 0x1078, 0x76c7, 0x0040, 0x8be6,
++	0x2d00, 0x601a, 0x601f, 0x0001, 0x0078, 0x8c13, 0x0d7f, 0x0c7f,
++	0x6004, 0xa08e, 0x0002, 0x00c0, 0x8c04, 0x6018, 0xa080, 0x0028,
++	0x2004, 0xa086, 0x007e, 0x00c0, 0x8c04, 0x2009, 0xa633, 0x2104,
++	0xc085, 0x200a, 0x0e7e, 0x2071, 0xa600, 0x1078, 0x42b8, 0x0e7f,
++	0x1078, 0x7c83, 0x0078, 0x8c08, 0x1078, 0x7c83, 0x1078, 0x2880,
++	0x0e7e, 0x127e, 0x2091, 0x8000, 0x1078, 0x28a6, 0x127f, 0x0e7f,
++	0x1078, 0x8ec6, 0x007c, 0x2001, 0x0002, 0x1078, 0x4502, 0x6003,
++	0x0001, 0x6007, 0x0002, 0x1078, 0x5dd7, 0x1078, 0x62d1, 0x0d7f,
++	0x0c7f, 0x0078, 0x8c12, 0x0c7e, 0x0d7e, 0x6104, 0xa186, 0x0016,
++	0x0040, 0x8c13, 0x6018, 0x2068, 0x6840, 0xa084, 0x00ff, 0xa005,
++	0x0040, 0x8be6, 0x8001, 0x6842, 0x6003, 0x0001, 0x1078, 0x5dd7,
++	0x1078, 0x62d1, 0x0d7f, 0x0c7f, 0x0078, 0x8c12, 0x1078, 0x7c83,
++	0x0078, 0x8bba, 0x1078, 0x7ca6, 0x0078, 0x8bba, 0x0d7e, 0x2c68,
++	0x6104, 0x1078, 0x91bc, 0x0d7f, 0x0040, 0x8c52, 0x1078, 0x772d,
++	0x0078, 0x8c69, 0x6004, 0x8007, 0x6130, 0xa18c, 0x00ff, 0xa105,
++	0x6032, 0x6007, 0x0085, 0x6003, 0x000b, 0x601f, 0x0002, 0x6038,
++	0x600a, 0x2001, 0xa8a3, 0x2004, 0x6016, 0x1078, 0x5d8a, 0x1078,
++	0x62d1, 0x007c, 0x0d7f, 0x0c7f, 0x1078, 0x7c83, 0x1078, 0x2880,
++	0x0e7e, 0x127e, 0x2091, 0x8000, 0x1078, 0x28a6, 0x6013, 0x0000,
++	0x601f, 0x0007, 0x6017, 0x0398, 0x127f, 0x0e7f, 0x007c, 0x6000,
++	0xa08a, 0x0010, 0x10c8, 0x1332, 0x1079, 0x8c87, 0x007c, 0x8c97,
++	0x8c97, 0x8c97, 0x8c97, 0x8c97, 0x8c97, 0x8c97, 0x8c97, 0x8c97,
++	0x8ad5, 0x8c97, 0x8add, 0x8c99, 0x8add, 0x8ca7, 0x8c97, 0x1078,
++	0x1332, 0x6004, 0xa086, 0x008b, 0x0040, 0x8ca7, 0x6007, 0x008b,
++	0x6003, 0x000d, 0x1078, 0x5d8a, 0x1078, 0x62d1, 0x007c, 0x1078,
++	0x8eb9, 0x1078, 0x8d06, 0x0040, 0x8cdf, 0x1078, 0x2880, 0x0d7e,
++	0x1078, 0x8d06, 0x0040, 0x8cc1, 0x6010, 0x2068, 0x6837, 0x0103,
++	0x684b, 0x0006, 0x6847, 0x0000, 0x6850, 0xc0ed, 0x6852, 0x1078,
++	0x4a73, 0x2c68, 0x1078, 0x76c7, 0x0040, 0x8ccf, 0x6818, 0x601a,
++	0x0c7e, 0x2d60, 0x1078, 0x8ec6, 0x0c7f, 0x0078, 0x8cd0, 0x2d60,
++	0x0d7f, 0x6013, 0x0000, 0x601f, 0x0001, 0x6007, 0x0001, 0x6003,
++	0x0001, 0x1078, 0x5dd7, 0x1078, 0x62d1, 0x0078, 0x8cf1, 0x6030,
++	0xa08c, 0xff00, 0x810f, 0xa186, 0x0039, 0x0040, 0x8ceb, 0xa186,
++	0x0035, 0x00c0, 0x8cef, 0x1078, 0x2880, 0x0078, 0x8cc1, 0x1078,
++	0x8ec6, 0x007c, 0xa284, 0x000f, 0x00c0, 0x8d03, 0xa282, 0xad00,
++	0x0048, 0x8d03, 0x2001, 0xa616, 0x2004, 0xa202, 0x00c8, 0x8d03,
++	0xa085, 0x0001, 0x007c, 0xa006, 0x0078, 0x8d02, 0x027e, 0x0e7e,
++	0x2071, 0xa600, 0x6210, 0x705c, 0xa202, 0x0048, 0x8d18, 0x7060,
++	0xa202, 0x00c8, 0x8d18, 0xa085, 0x0001, 0x0e7f, 0x027f, 0x007c,
++	0xa006, 0x0078, 0x8d15, 0x0e7e, 0x0c7e, 0x037e, 0x007e, 0x127e,
++	0x2091, 0x8000, 0x2061, 0xad00, 0x2071, 0xa600, 0x7348, 0x7064,
++	0xa302, 0x00c8, 0x8d45, 0x601c, 0xa206, 0x00c0, 0x8d3d, 0x1078,
++	0x902b, 0x0040, 0x8d3d, 0x1078, 0x8f00, 0x00c0, 0x8d39, 0x1078,
++	0x7c83, 0x0c7e, 0x1078, 0x772d, 0x0c7f, 0xace0, 0x0010, 0x7058,
++	0xac02, 0x00c8, 0x8d45, 0x0078, 0x8d26, 0x127f, 0x007f, 0x037f,
++	0x0c7f, 0x0e7f, 0x007c, 0x0e7e, 0x0c7e, 0x017e, 0xa188, 0xa735,
++	0x210c, 0x81ff, 0x0040, 0x8d59, 0x2061, 0xa9b3, 0x611a, 0x1078,
++	0x2880, 0xa006, 0x0078, 0x8d5e, 0xa085, 0x0001, 0x017f, 0x0c7f,
++	0x0e7f, 0x007c, 0x0c7e, 0x057e, 0x127e, 0x2091, 0x8000, 0x0c7e,
++	0x1078, 0x76c7, 0x057f, 0x0040, 0x8d7b, 0x6612, 0x651a, 0x601f,
++	0x0003, 0x2009, 0x004b, 0x1078, 0x775c, 0xa085, 0x0001, 0x127f,
++	0x057f, 0x0c7f, 0x007c, 0xa006, 0x0078, 0x8d77, 0x0c7e, 0x057e,
++	0x127e, 0x2091, 0x8000, 0x62a0, 0x0c7e, 0x1078, 0x76c7, 0x057f,
++	0x0040, 0x8da9, 0x6013, 0x0000, 0x651a, 0x601f, 0x0003, 0x0c7e,
++	0x2560, 0x1078, 0x47e9, 0x0c7f, 0x1078, 0x5f01, 0x077e, 0x2039,
++	0x0000, 0x1078, 0x5e0a, 0x2c08, 0x1078, 0x9f8b, 0x077f, 0x2009,
++	0x004c, 0x1078, 0x775c, 0xa085, 0x0001, 0x127f, 0x057f, 0x0c7f,
++	0x007c, 0xa006, 0x0078, 0x8da5, 0x0f7e, 0x0c7e, 0x047e, 0x0c7e,
++	0x1078, 0x76c7, 0x2c78, 0x0c7f, 0x0040, 0x8dc6, 0x7e12, 0x2c00,
++	0x781a, 0x781f, 0x0003, 0x2021, 0x0005, 0x1078, 0x8e11, 0x2f60,
++	0x2009, 0x004d, 0x1078, 0x775c, 0xa085, 0x0001, 0x047f, 0x0c7f,
++	0x0f7f, 0x007c, 0x0f7e, 0x0c7e, 0x047e, 0x0c7e, 0x1078, 0x76c7,
++	0x2c78, 0x0c7f, 0x0040, 0x8de4, 0x7e12, 0x2c00, 0x781a, 0x781f,
++	0x0003, 0x2021, 0x0005, 0x1078, 0x8e11, 0x2f60, 0x2009, 0x004e,
++	0x1078, 0x775c, 0xa085, 0x0001, 0x047f, 0x0c7f, 0x0f7f, 0x007c,
++	0x0f7e, 0x0c7e, 0x047e, 0x0c7e, 0x1078, 0x76c7, 0x2c78, 0x0c7f,
++	0x0040, 0x8e0d, 0x7e12, 0x2c00, 0x781a, 0x781f, 0x0003, 0x2021,
++	0x0004, 0x1078, 0x8e11, 0x2001, 0xa89d, 0x2004, 0xd0fc, 0x0040,
++	0x8e06, 0x2f60, 0x1078, 0x772d, 0x0078, 0x8e0b, 0x2f60, 0x2009,
++	0x0052, 0x1078, 0x775c, 0xa085, 0x0001, 0x047f, 0x0c7f, 0x0f7f,
++	0x007c, 0x097e, 0x077e, 0x127e, 0x2091, 0x8000, 0x1078, 0x4775,
++	0x0040, 0x8e1e, 0x2001, 0x8e16, 0x0078, 0x8e24, 0x1078, 0x4739,
++	0x0040, 0x8e2d, 0x2001, 0x8e1e, 0x007e, 0xa00e, 0x2400, 0x1078,
++	0x4b51, 0x1078, 0x4a73, 0x007f, 0x007a, 0x2418, 0x1078, 0x6161,
++	0x62a0, 0x087e, 0x2041, 0x0001, 0x2039, 0x0001, 0x2608, 0x1078,
++	0x5f1b, 0x087f, 0x1078, 0x5e0a, 0x2f08, 0x2648, 0x1078, 0x9f8b,
++	0x613c, 0x81ff, 0x1040, 0x5fdb, 0x1078, 0x62d1, 0x127f, 0x077f,
++	0x097f, 0x007c, 0x0c7e, 0x127e, 0x2091, 0x8000, 0x0c7e, 0x1078,
++	0x76c7, 0x017f, 0x0040, 0x8e63, 0x660a, 0x611a, 0x601f, 0x0001,
++	0x2d00, 0x6012, 0x2009, 0x001f, 0x1078, 0x775c, 0xa085, 0x0001,
++	0x127f, 0x0c7f, 0x007c, 0xa006, 0x0078, 0x8e60, 0x0c7e, 0x127e,
++	0x2091, 0x8000, 0x0c7e, 0x1078, 0x76c7, 0x017f, 0x0040, 0x8e7f,
++	0x660a, 0x611a, 0x601f, 0x0008, 0x2d00, 0x6012, 0x2009, 0x0021,
++	0x1078, 0x775c, 0xa085, 0x0001, 0x127f, 0x0c7f, 0x007c, 0xa006,
++	0x0078, 0x8e7c, 0x0c7e, 0x127e, 0x2091, 0x8000, 0x0c7e, 0x1078,
++	0x76c7, 0x017f, 0x0040, 0x8e9b, 0x660a, 0x611a, 0x601f, 0x0001,
++	0x2d00, 0x6012, 0x2009, 0x003d, 0x1078, 0x775c, 0xa085, 0x0001,
++	0x127f, 0x0c7f, 0x007c, 0xa006, 0x0078, 0x8e98, 0x0c7e, 0x127e,
++	0x2091, 0x8000, 0x0c7e, 0x1078, 0x76c7, 0x017f, 0x0040, 0x8eb6,
++	0x611a, 0x601f, 0x0001, 0x2d00, 0x6012, 0x2009, 0x0000, 0x1078,
++	0x775c, 0xa085, 0x0001, 0x127f, 0x0c7f, 0x007c, 0xa006, 0x0078,
++	0x8eb3, 0x027e, 0x0d7e, 0x6218, 0x2268, 0x6a3c, 0x82ff, 0x0040,
++	0x8ec3, 0x8211, 0x6a3e, 0x0d7f, 0x027f, 0x007c, 0x007e, 0x6000,
++	0xa086, 0x0000, 0x0040, 0x8ed8, 0x6013, 0x0000, 0x601f, 0x0007,
++	0x2001, 0xa8a3, 0x2004, 0x6016, 0x1078, 0xa495, 0x603f, 0x0000,
++	0x007f, 0x007c, 0x067e, 0x0c7e, 0x0d7e, 0x2031, 0xa653, 0x2634,
++	0xd6e4, 0x0040, 0x8ee8, 0x6618, 0x2660, 0x6e48, 0x1078, 0x46e7,
++	0x0d7f, 0x0c7f, 0x067f, 0x007c, 0x007e, 0x017e, 0x6004, 0xa08e,
++	0x0002, 0x0040, 0x8efd, 0xa08e, 0x0003, 0x0040, 0x8efd, 0xa08e,
++	0x0004, 0x0040, 0x8efd, 0xa085, 0x0001, 0x017f, 0x007f, 0x007c,
++	0x007e, 0x0d7e, 0x6010, 0xa06d, 0x0040, 0x8f0d, 0x6838, 0xd0fc,
++	0x0040, 0x8f0d, 0xa006, 0x0078, 0x8f0f, 0xa085, 0x0001, 0x0d7f,
++	0x007f, 0x007c, 0x0c7e, 0x127e, 0x2091, 0x8000, 0x0c7e, 0x1078,
++	0x76c7, 0x017f, 0x0040, 0x8f2c, 0x611a, 0x601f, 0x0001, 0x2d00,
++	0x6012, 0x1078, 0x2880, 0x2009, 0x0028, 0x1078, 0x775c, 0xa085,
++	0x0001, 0x127f, 0x0c7f, 0x007c, 0xa006, 0x0078, 0x8f29, 0xa186,
++	0x0015, 0x00c0, 0x8f44, 0x2011, 0xa620, 0x2204, 0xa086, 0x0074,
++	0x00c0, 0x8f44, 0x1078, 0x7f91, 0x6003, 0x0001, 0x6007, 0x0029,
++	0x1078, 0x5dd7, 0x0078, 0x8f48, 0x1078, 0x7c83, 0x1078, 0x772d,
++	0x007c, 0xa186, 0x0016, 0x00c0, 0x8f53, 0x2001, 0x0004, 0x1078,
++	0x4502, 0x0078, 0x8f74, 0xa186, 0x0015, 0x00c0, 0x8f78, 0x2011,
++	0xa620, 0x2204, 0xa086, 0x0014, 0x00c0, 0x8f78, 0x0d7e, 0x6018,
++	0x2068, 0x1078, 0x4649, 0x0d7f, 0x1078, 0x8043, 0x00c0, 0x8f78,
++	0x0d7e, 0x6018, 0x2068, 0x6890, 0x0d7f, 0xa005, 0x0040, 0x8f78,
++	0x2001, 0x0006, 0x1078, 0x4502, 0x1078, 0x77f8, 0x0078, 0x8f7c,
++	0x1078, 0x7c83, 0x1078, 0x772d, 0x007c, 0x6848, 0xa086, 0x0005,
++	0x00c0, 0x8f84, 0x1078, 0x8f85, 0x007c, 0x6850, 0xc0ad, 0x6852,
++	0x007c, 0x0e7e, 0x2071, 0xab8c, 0x7014, 0xd0e4, 0x0040, 0x8f9a,
++	0x6013, 0x0000, 0x6003, 0x0001, 0x6007, 0x0050, 0x1078, 0x5d8a,
++	0x1078, 0x62d1, 0x0e7f, 0x007c, 0x0c7e, 0x0f7e, 0x2c78, 0x1078,
++	0x4963, 0x0f7f, 0x0040, 0x8fa9, 0x601c, 0xa084, 0x000f, 0x1079,
++	0x8fab, 0x0c7f, 0x007c, 0x8ad5, 0x8fb6, 0x8fb9, 0x8fbc, 0xa25d,
++	0xa279, 0xa27c, 0x8ad5, 0x8ad5, 0x1078, 0x1332, 0x0005, 0x0005,
++	0x007c, 0x0005, 0x0005, 0x007c, 0x1078, 0x8fbf, 0x007c, 0x0f7e,
++	0x2c78, 0x1078, 0x4963, 0x0040, 0x8fee, 0x1078, 0x76c7, 0x00c0,
++	0x8fcf, 0x2001, 0xa8a4, 0x2004, 0x783e, 0x0078, 0x8fee, 0x7818,
++	0x601a, 0x781c, 0xa086, 0x0003, 0x0040, 0x8fdc, 0x7808, 0x6036,
++	0x2f00, 0x603a, 0x0078, 0x8fe0, 0x7808, 0x603a, 0x2f00, 0x6036,
++	0x602a, 0x601f, 0x0001, 0x6007, 0x0035, 0x6003, 0x0001, 0x7920,
++	0x6122, 0x1078, 0x5d8a, 0x1078, 0x62d1, 0x2f60, 0x0f7f, 0x007c,
++	0x017e, 0x0f7e, 0x682c, 0x6032, 0xa08e, 0x0001, 0x0040, 0x9001,
++	0xa086, 0x0005, 0x0040, 0x9005, 0xa006, 0x602a, 0x602e, 0x0078,
++	0x9016, 0x6824, 0xc0f4, 0xc0d5, 0x6826, 0x6810, 0x2078, 0x787c,
++	0x6938, 0xa102, 0x7880, 0x6934, 0xa103, 0x00c8, 0x8ffc, 0x6834,
++	0x602a, 0x6838, 0xa084, 0xfffc, 0x683a, 0x602e, 0x2d00, 0x6036,
++	0x6808, 0x603a, 0x6918, 0x611a, 0x6920, 0x6122, 0x601f, 0x0001,
++	0x6007, 0x0039, 0x6003, 0x0001, 0x1078, 0x5d8a, 0x6803, 0x0002,
++	0x0f7f, 0x017f, 0x007c, 0x007e, 0x017e, 0x6004, 0xa08e, 0x0034,
++	0x0040, 0x9050, 0xa08e, 0x0035, 0x0040, 0x9050, 0xa08e, 0x0036,
++	0x0040, 0x9050, 0xa08e, 0x0037, 0x0040, 0x9050, 0xa08e, 0x0038,
++	0x0040, 0x9050, 0xa08e, 0x0039, 0x0040, 0x9050, 0xa08e, 0x003a,
++	0x0040, 0x9050, 0xa08e, 0x003b, 0x0040, 0x9050, 0xa085, 0x0001,
++	0x017f, 0x007f, 0x007c, 0x0f7e, 0x2c78, 0x1078, 0x4963, 0x00c0,
++	0x905d, 0xa085, 0x0001, 0x0078, 0x906c, 0x6024, 0xd0f4, 0x00c0,
++	0x906b, 0xc0f5, 0x6026, 0x6010, 0x2078, 0x7828, 0x603a, 0x782c,
++	0x6036, 0x1078, 0x1757, 0xa006, 0x0f7f, 0x007c, 0x007e, 0x017e,
++	0x027e, 0x037e, 0x0e7e, 0x2001, 0xa89e, 0x200c, 0x8000, 0x2014,
++	0x2001, 0x0032, 0x1078, 0x5c1c, 0x2001, 0xa8a2, 0x82ff, 0x00c0,
++	0x9083, 0x2011, 0x0014, 0x2202, 0x2001, 0xa8a0, 0x200c, 0x8000,
++	0x2014, 0x2071, 0xa88d, 0x711a, 0x721e, 0x2001, 0x0064, 0x1078,
++	0x5c1c, 0x2001, 0xa8a3, 0x82ff, 0x00c0, 0x9098, 0x2011, 0x0014,
++	0x2202, 0x2009, 0xa8a4, 0xa280, 0x000a, 0x200a, 0x1078, 0x498b,
++	0x0e7f, 0x037f, 0x027f, 0x017f, 0x007f, 0x007c, 0x007e, 0x0e7e,
++	0x2001, 0xa8a2, 0x2003, 0x0028, 0x2001, 0xa8a3, 0x2003, 0x0014,
++	0x2071, 0xa88d, 0x701b, 0x0000, 0x701f, 0x07d0, 0x2001, 0xa8a4,
++	0x2003, 0x001e, 0x0e7f, 0x007f, 0x007c, 0x0c7e, 0x127e, 0x2091,
++	0x8000, 0x0c7e, 0x1078, 0x76c7, 0x017f, 0x0040, 0x90d5, 0x611a,
++	0x601f, 0x0001, 0x2d00, 0x6012, 0x2009, 0x0033, 0x1078, 0x775c,
++	0xa085, 0x0001, 0x127f, 0x0c7f, 0x007c, 0xa006, 0x0078, 0x90d2,
++	0x0d7e, 0x0e7e, 0x0f7e, 0x2071, 0xa600, 0xa186, 0x0015, 0x00c0,
++	0x9107, 0x7080, 0xa086, 0x0018, 0x00c0, 0x9107, 0x6010, 0x2068,
++	0x6a3c, 0xd2e4, 0x00c0, 0x90fb, 0x2c78, 0x1078, 0x6490, 0x0040,
++	0x910f, 0x706c, 0x6a50, 0xa206, 0x00c0, 0x9103, 0x7070, 0x6a54,
++	0xa206, 0x00c0, 0x9103, 0x6218, 0xa290, 0x0028, 0x2214, 0x2009,
++	0x0000, 0x1078, 0x28c8, 0x1078, 0x77f8, 0x0078, 0x910b, 0x1078,
++	0x7c83, 0x1078, 0x772d, 0x0f7f, 0x0e7f, 0x0d7f, 0x007c, 0x7050,
++	0xa080, 0x29c0, 0x2004, 0x6a54, 0xa206, 0x0040, 0x90fb, 0x0078,
++	0x9103, 0x0c7e, 0x127e, 0x2091, 0x8000, 0x0c7e, 0x1078, 0x76c7,
++	0x017f, 0x0040, 0x9131, 0x611a, 0x601f, 0x0001, 0x2d00, 0x6012,
++	0x2009, 0x0043, 0x1078, 0x775c, 0xa085, 0x0001, 0x127f, 0x0c7f,
++	0x007c, 0xa006, 0x0078, 0x912e, 0x0d7e, 0x0e7e, 0x0f7e, 0x2071,
++	0xa600, 0xa186, 0x0015, 0x00c0, 0x915a, 0x7080, 0xa086, 0x0004,
++	0x00c0, 0x915a, 0x6010, 0xa0e8, 0x000f, 0x2c78, 0x1078, 0x6490,
++	0x0040, 0x9162, 0x706c, 0x6a08, 0xa206, 0x00c0, 0x9156, 0x7070,
++	0x6a0c, 0xa206, 0x00c0, 0x9156, 0x1078, 0x2880, 0x1078, 0x77f8,
++	0x0078, 0x915e, 0x1078, 0x7c83, 0x1078, 0x772d, 0x0f7f, 0x0e7f,
++	0x0d7f, 0x007c, 0x7050, 0xa080, 0x29c0, 0x2004, 0x6a0c, 0xa206,
++	0x0040, 0x9154, 0x0078, 0x9156, 0x017e, 0x027e, 0x684c, 0xd0ac,
++	0x0040, 0x9184, 0x6914, 0x6a10, 0x2100, 0xa205, 0x0040, 0x9184,
++	0x6860, 0xa106, 0x00c0, 0x9180, 0x685c, 0xa206, 0x0040, 0x9184,
++	0x6962, 0x6a5e, 0xa085, 0x0001, 0x027f, 0x017f, 0x007c, 0x0e7e,
++	0x127e, 0x2071, 0xa600, 0x2091, 0x8000, 0x7548, 0xa582, 0x0001,
++	0x0048, 0x91b9, 0x704c, 0x2060, 0x6000, 0xa086, 0x0000, 0x0040,
++	0x91a5, 0xace0, 0x0010, 0x7058, 0xac02, 0x00c8, 0x91a1, 0x0078,
++	0x9194, 0x2061, 0xad00, 0x0078, 0x9194, 0x6003, 0x0008, 0x8529,
++	0x754a, 0xaca8, 0x0010, 0x7058, 0xa502, 0x00c8, 0x91b5, 0x754e,
++	0xa085, 0x0001, 0x127f, 0x0e7f, 0x007c, 0x704f, 0xad00, 0x0078,
++	0x91b0, 0xa006, 0x0078, 0x91b2, 0x0c7e, 0x027e, 0x017e, 0xa186,
++	0x0035, 0x0040, 0x91c6, 0x6a34, 0x0078, 0x91c7, 0x6a28, 0x1078,
++	0x8cf2, 0x0040, 0x91f0, 0x2260, 0x611c, 0xa186, 0x0003, 0x0040,
++	0x91d5, 0xa186, 0x0006, 0x00c0, 0x91ec, 0x6834, 0xa206, 0x0040,
++	0x91e4, 0x6838, 0xa206, 0x00c0, 0x91ec, 0x6108, 0x6834, 0xa106,
++	0x00c0, 0x91ec, 0x0078, 0x91e9, 0x6008, 0x6938, 0xa106, 0x00c0,
++	0x91ec, 0x6018, 0x6918, 0xa106, 0x017f, 0x027f, 0x0c7f, 0x007c,
++	0xa085, 0x0001, 0x0078, 0x91ec, 0x6944, 0xd1cc, 0x0040, 0x920d,
++	0xa18c, 0x00ff, 0xa18e, 0x0002, 0x00c0, 0x920d, 0xad88, 0x001e,
++	0x210c, 0xa18c, 0x0f00, 0x810f, 0xa18e, 0x0001, 0x00c0, 0x920d,
++	0x6810, 0x6914, 0xa115, 0x10c0, 0x84d5, 0x007c, 0x067e, 0x6000,
++	0xa0b2, 0x0010, 0x10c8, 0x1332, 0x1079, 0x9218, 0x067f, 0x007c,
++	0x9228, 0x96df, 0x97fb, 0x9228, 0x9228, 0x9228, 0x9228, 0x9228,
++	0x9262, 0x988e, 0x9228, 0x9228, 0x9228, 0x9228, 0x9228, 0x9228,
++	0x1078, 0x1332, 0x067e, 0x6000, 0xa0b2, 0x0010, 0x10c8, 0x1332,
++	0x1079, 0x9234, 0x067f, 0x007c, 0x9244, 0x9d53, 0x9244, 0x9244,
++	0x9244, 0x9244, 0x9244, 0x9244, 0x9d11, 0x9da1, 0x9244, 0xa3b0,
++	0xa3e4, 0xa3b0, 0xa3e4, 0x9244, 0x1078, 0x1332, 0x067e, 0x6000,
++	0xa0b2, 0x0010, 0x10c8, 0x1332, 0x1079, 0x9250, 0x067f, 0x007c,
++	0x9260, 0x99eb, 0x9ac7, 0x9af5, 0x9b70, 0x9260, 0x9c76, 0x9c1e,
++	0x989a, 0x9ce5, 0x9cfb, 0x9260, 0x9260, 0x9260, 0x9260, 0x9260,
++	0x1078, 0x1332, 0xa1b2, 0x0044, 0x10c8, 0x1332, 0x2100, 0x0079,
++	0x9269, 0x92a9, 0x9498, 0x92a9, 0x92a9, 0x92a9, 0x94a0, 0x92a9,
++	0x92a9, 0x92a9, 0x92a9, 0x92a9, 0x92a9, 0x92a9, 0x92a9, 0x92a9,
++	0x92a9, 0x92a9, 0x92a9, 0x92a9, 0x92a9, 0x92a9, 0x92a9, 0x92a9,
++	0x92ab, 0x9311, 0x9320, 0x9377, 0x9396, 0x9415, 0x9485, 0x92a9,
++	0x92a9, 0x94a4, 0x92a9, 0x92a9, 0x94b7, 0x94c2, 0x92a9, 0x92a9,
++	0x92a9, 0x92a9, 0x92a9, 0x94fa, 0x92a9, 0x92a9, 0x9509, 0x92a9,
++	0x92a9, 0x92a9, 0x92a9, 0x92a9, 0x92a9, 0x9522, 0x92a9, 0x92a9,
++	0x92a9, 0x95af, 0x92a9, 0x92a9, 0x92a9, 0x92a9, 0x92a9, 0x92a9,
++	0x9629, 0x1078, 0x1332, 0x1078, 0x4967, 0x00c0, 0x92bb, 0x2001,
++	0xa633, 0x2004, 0xd0cc, 0x00c0, 0x92bb, 0xa084, 0x0009, 0xa086,
++	0x0008, 0x00c0, 0x92c3, 0x6007, 0x0009, 0x602b, 0x0009, 0x6013,
++	0x0000, 0x0078, 0x9493, 0x1078, 0x4957, 0x0e7e, 0x0c7e, 0x037e,
++	0x027e, 0x017e, 0x6218, 0x2270, 0x72a0, 0x027e, 0x2019, 0x0029,
++	0x1078, 0x5f01, 0x077e, 0x2039, 0x0000, 0x1078, 0x5e0a, 0x2c08,
++	0x1078, 0x9f8b, 0x077f, 0x017f, 0x2e60, 0x1078, 0x47e9, 0x017f,
++	0x027f, 0x037f, 0x0c7f, 0x0e7f, 0x6618, 0x0c7e, 0x2660, 0x1078,
++	0x45d6, 0x0c7f, 0xa6b0, 0x0001, 0x2634, 0xa684, 0x00ff, 0xa082,
++	0x0006, 0x0048, 0x9303, 0x1078, 0x9ebf, 0x00c0, 0x9371, 0x1078,
++	0x9e50, 0x00c0, 0x92ff, 0x6007, 0x0008, 0x0078, 0x9493, 0x6007,
++	0x0009, 0x0078, 0x9493, 0x1078, 0xa09f, 0x0040, 0x930d, 0x1078,
++	0x9ebf, 0x0040, 0x92f7, 0x0078, 0x9371, 0x6013, 0x1900, 0x0078,
++	0x92ff, 0x1078, 0x29bb, 0x00c0, 0x9664, 0x6106, 0x1078, 0x9e05,
++	0x6007, 0x0006, 0x0078, 0x9493, 0x6007, 0x0007, 0x0078, 0x9493,
++	0x1078, 0xa41c, 0x00c0, 0x9664, 0x1078, 0x29bb, 0x00c0, 0x9664,
++	0x0d7e, 0x6618, 0x2668, 0x6e04, 0xa684, 0x00ff, 0xa082, 0x0006,
++	0x00c8, 0x9336, 0x2001, 0x0001, 0x1078, 0x44ee, 0xa6b4, 0xff00,
++	0x8637, 0xa686, 0x0006, 0x0040, 0x9353, 0xa686, 0x0004, 0x0040,
++	0x9353, 0x6e04, 0xa6b4, 0x00ff, 0xa686, 0x0006, 0x0040, 0x9353,
++	0xa686, 0x0004, 0x0040, 0x9353, 0xa686, 0x0005, 0x0040, 0x9353,
++	0x0d7f, 0x0078, 0x9371, 0x1078, 0x9f25, 0x00c0, 0x936c, 0xa686,
++	0x0006, 0x00c0, 0x9365, 0x027e, 0x6218, 0xa290, 0x0028, 0x2214,
++	0x2009, 0x0000, 0x1078, 0x28c8, 0x027f, 0x1078, 0x4649, 0x6007,
++	0x000a, 0x0d7f, 0x0078, 0x9493, 0x6007, 0x000b, 0x0d7f, 0x0078,
++	0x9493, 0x1078, 0x2880, 0x6007, 0x0001, 0x0078, 0x9493, 0x1078,
++	0xa41c, 0x00c0, 0x9664, 0x1078, 0x29bb, 0x00c0, 0x9664, 0x6618,
++	0x0d7e, 0x2668, 0x6e04, 0x0d7f, 0xa686, 0x0707, 0x0040, 0x9371,
++	0x027e, 0x6218, 0xa290, 0x0028, 0x2214, 0x2009, 0x0000, 0x1078,
++	0x28c8, 0x027f, 0x6007, 0x000c, 0x0078, 0x9493, 0x1078, 0x4967,
++	0x00c0, 0x93a3, 0x2001, 0xa633, 0x2004, 0xa084, 0x0009, 0xa086,
++	0x0008, 0x00c0, 0x93ab, 0x6007, 0x0009, 0x602b, 0x0009, 0x6013,
++	0x0000, 0x0078, 0x9493, 0x1078, 0x4957, 0x6618, 0xa6b0, 0x0001,
++	0x2634, 0xa684, 0x00ff, 0xa082, 0x0006, 0x0048, 0x93ef, 0xa6b4,
++	0xff00, 0x8637, 0xa686, 0x0004, 0x0040, 0x93c2, 0xa686, 0x0006,
++	0x00c0, 0x9371, 0x1078, 0x9f34, 0x00c0, 0x93ca, 0x6007, 0x000e,
++	0x0078, 0x9493, 0x047e, 0x6418, 0xa4a0, 0x0028, 0x2424, 0xa4a4,
++	0x00ff, 0x8427, 0x047e, 0x1078, 0x2880, 0x047f, 0x017e, 0xa006,
++	0x2009, 0xa653, 0x210c, 0xd1a4, 0x0040, 0x93e9, 0x2009, 0x0029,
++	0x1078, 0xa21d, 0x6018, 0x0d7e, 0x2068, 0x6800, 0xc0e5, 0x6802,
++	0x0d7f, 0x017f, 0x047f, 0x6007, 0x0001, 0x0078, 0x9493, 0x2001,
++	0x0001, 0x1078, 0x44ee, 0x157e, 0x017e, 0x027e, 0x037e, 0x20a9,
++	0x0004, 0x2019, 0xa605, 0x2011, 0xab90, 0x1078, 0x80de, 0x037f,
++	0x027f, 0x017f, 0x157f, 0xa005, 0x0040, 0x940f, 0xa6b4, 0xff00,
++	0x8637, 0xa686, 0x0006, 0x0040, 0x93c2, 0x0078, 0x9371, 0x6013,
++	0x1900, 0x6007, 0x0009, 0x0078, 0x9493, 0x1078, 0x4967, 0x00c0,
++	0x9422, 0x2001, 0xa633, 0x2004, 0xa084, 0x0009, 0xa086, 0x0008,
++	0x00c0, 0x942a, 0x6007, 0x0009, 0x602b, 0x0009, 0x6013, 0x0000,
++	0x0078, 0x9493, 0x1078, 0x4957, 0x6618, 0xa6b0, 0x0001, 0x2634,
++	0xa684, 0x00ff, 0xa082, 0x0006, 0x0048, 0x9472, 0xa6b4, 0xff00,
++	0x8637, 0xa686, 0x0004, 0x0040, 0x9441, 0xa686, 0x0006, 0x00c0,
++	0x9371, 0x1078, 0x9f5f, 0x00c0, 0x944d, 0x1078, 0x9e50, 0x00c0,
++	0x944d, 0x6007, 0x0010, 0x0078, 0x9493, 0x047e, 0x6418, 0xa4a0,
++	0x0028, 0x2424, 0xa4a4, 0x00ff, 0x8427, 0x047e, 0x1078, 0x2880,
++	0x047f, 0x017e, 0xa006, 0x2009, 0xa653, 0x210c, 0xd1a4, 0x0040,
++	0x946c, 0x2009, 0x0029, 0x1078, 0xa21d, 0x6018, 0x0d7e, 0x2068,
++	0x6800, 0xc0e5, 0x6802, 0x0d7f, 0x017f, 0x047f, 0x6007, 0x0001,
++	0x0078, 0x9493, 0x1078, 0xa09f, 0x0040, 0x947f, 0xa6b4, 0xff00,
++	0x8637, 0xa686, 0x0006, 0x0040, 0x9441, 0x0078, 0x9371, 0x6013,
++	0x1900, 0x6007, 0x0009, 0x0078, 0x9493, 0x1078, 0x29bb, 0x00c0,
++	0x9664, 0x1078, 0xa41c, 0x00c0, 0x9664, 0x1078, 0x9667, 0x00c0,
++	0x9371, 0x6007, 0x0012, 0x6003, 0x0001, 0x1078, 0x5dd7, 0x007c,
++	0x6007, 0x0001, 0x6003, 0x0001, 0x1078, 0x5dd7, 0x0078, 0x9497,
++	0x6007, 0x0005, 0x0078, 0x949a, 0x1078, 0xa41c, 0x00c0, 0x9664,
++	0x1078, 0x29bb, 0x00c0, 0x9664, 0x1078, 0x9667, 0x00c0, 0x9371,
++	0x6007, 0x0020, 0x6003, 0x0001, 0x1078, 0x5dd7, 0x007c, 0x1078,
++	0x29bb, 0x00c0, 0x9664, 0x6007, 0x0023, 0x6003, 0x0001, 0x1078,
++	0x5dd7, 0x007c, 0x1078, 0xa41c, 0x00c0, 0x9664, 0x1078, 0x29bb,
++	0x00c0, 0x9664, 0x1078, 0x9667, 0x00c0, 0x9371, 0x017e, 0x027e,
++	0x2011, 0xab90, 0x2214, 0x2c08, 0xa006, 0x1078, 0xa1e6, 0x00c0,
++	0x94e9, 0x2160, 0x6007, 0x0026, 0x6013, 0x1700, 0x2011, 0xab89,
++	0x2214, 0xa296, 0xffff, 0x00c0, 0x94f3, 0x6007, 0x0025, 0x0078,
++	0x94f3, 0x6004, 0xa086, 0x0024, 0x00c0, 0x94f0, 0x1078, 0x772d,
++	0x2160, 0x6007, 0x0025, 0x6003, 0x0001, 0x1078, 0x5dd7, 0x027f,
++	0x017f, 0x007c, 0x1078, 0x29bb, 0x00c0, 0x9664, 0x6106, 0x1078,
++	0x9687, 0x6007, 0x002b, 0x0078, 0x9493, 0x6007, 0x002c, 0x0078,
++	0x9493, 0x1078, 0xa41c, 0x00c0, 0x9664, 0x1078, 0x29bb, 0x00c0,
++	0x9664, 0x1078, 0x9667, 0x00c0, 0x9371, 0x6106, 0x1078, 0x968c,
++	0x00c0, 0x951e, 0x6007, 0x002e, 0x0078, 0x9493, 0x6007, 0x002f,
++	0x0078, 0x9493, 0x1078, 0x29bb, 0x00c0, 0x9664, 0x0e7e, 0x0d7e,
++	0x0c7e, 0x6018, 0xa080, 0x0001, 0x200c, 0xa184, 0x00ff, 0xa086,
++	0x0006, 0x0040, 0x953f, 0xa184, 0xff00, 0x8007, 0xa086, 0x0006,
++	0x0040, 0x953f, 0x0c7f, 0x0d7f, 0x0e7f, 0x0078, 0x9498, 0x2001,
++	0xa672, 0x2004, 0xd0e4, 0x0040, 0x95ab, 0x2071, 0xab8c, 0x7010,
++	0x6036, 0x7014, 0x603a, 0x7108, 0x720c, 0x2001, 0xa653, 0x2004,
++	0xd0a4, 0x0040, 0x955d, 0x6018, 0x2068, 0x6810, 0xa106, 0x00c0,
++	0x955d, 0x6814, 0xa206, 0x0040, 0x9581, 0x2001, 0xa653, 0x2004,
++	0xd0ac, 0x00c0, 0x959f, 0x2069, 0xa600, 0x6870, 0xa206, 0x00c0,
++	0x959f, 0x686c, 0xa106, 0x00c0, 0x959f, 0x7210, 0x1078, 0x8cf2,
++	0x0040, 0x95a5, 0x1078, 0xa28e, 0x0040, 0x95a5, 0x622a, 0x6007,
++	0x0036, 0x6003, 0x0001, 0x1078, 0x5d8a, 0x0c7f, 0x0d7f, 0x0e7f,
++	0x007c, 0x7214, 0xa286, 0xffff, 0x0040, 0x9593, 0x1078, 0x8cf2,
++	0x0040, 0x95a5, 0xa280, 0x0002, 0x2004, 0x7110, 0xa106, 0x00c0,
++	0x95a5, 0x0078, 0x956e, 0x7210, 0x2c08, 0xa085, 0x0001, 0x1078,
++	0xa1e6, 0x2c10, 0x2160, 0x0040, 0x95a5, 0x0078, 0x956e, 0x6007,
++	0x0037, 0x6013, 0x1500, 0x0078, 0x9579, 0x6007, 0x0037, 0x6013,
++	0x1700, 0x0078, 0x9579, 0x6007, 0x0012, 0x0078, 0x9579, 0x1078,
++	0x29bb, 0x00c0, 0x9664, 0x6018, 0xa080, 0x0001, 0x2004, 0xa084,
++	0xff00, 0x8007, 0xa086, 0x0006, 0x00c0, 0x9498, 0x0e7e, 0x0d7e,
++	0x0c7e, 0x2001, 0xa672, 0x2004, 0xd0e4, 0x0040, 0x9621, 0x2069,
++	0xa600, 0x2071, 0xab8c, 0x7008, 0x6036, 0x720c, 0x623a, 0xa286,
++	0xffff, 0x00c0, 0x95de, 0x7208, 0x0c7e, 0x2c08, 0xa085, 0x0001,
++	0x1078, 0xa1e6, 0x2c10, 0x0c7f, 0x0040, 0x9615, 0x1078, 0x8cf2,
++	0x0040, 0x9615, 0x0c7e, 0x027e, 0x2260, 0x1078, 0x89f3, 0x027f,
++	0x0c7f, 0x7118, 0xa18c, 0xff00, 0x810f, 0xa186, 0x0001, 0x0040,
++	0x95ff, 0xa186, 0x0005, 0x0040, 0x95f9, 0xa186, 0x0007, 0x00c0,
++	0x9609, 0xa280, 0x0004, 0x2004, 0xa005, 0x0040, 0x9609, 0x057e,
++	0x7510, 0x7614, 0x1078, 0xa2a3, 0x057f, 0x0c7f, 0x0d7f, 0x0e7f,
++	0x007c, 0x6007, 0x003b, 0x602b, 0x0009, 0x6013, 0x2a00, 0x6003,
++	0x0001, 0x1078, 0x5d8a, 0x0078, 0x9605, 0x6007, 0x003b, 0x602b,
++	0x0009, 0x6013, 0x1700, 0x6003, 0x0001, 0x1078, 0x5d8a, 0x0078,
++	0x9605, 0x6007, 0x003b, 0x602b, 0x000b, 0x6013, 0x0000, 0x0078,
++	0x9579, 0x0e7e, 0x027e, 0x1078, 0x4967, 0x0040, 0x965e, 0x1078,
++	0x4957, 0x1078, 0xa4a9, 0x00c0, 0x965c, 0x2071, 0xa600, 0x70cc,
++	0xc085, 0x70ce, 0x0f7e, 0x2079, 0x0100, 0x7298, 0xa284, 0x00ff,
++	0x706e, 0x78e6, 0xa284, 0xff00, 0x7270, 0xa205, 0x7072, 0x78ea,
++	0x0f7f, 0x70d7, 0x0000, 0x2001, 0xa653, 0x2004, 0xd0a4, 0x0040,
++	0x9655, 0x2011, 0xa8ca, 0x2013, 0x07d0, 0xd0ac, 0x00c0, 0x965e,
++	0x1078, 0x2677, 0x0078, 0x965e, 0x1078, 0xa4d9, 0x027f, 0x0e7f,
++	0x1078, 0x772d, 0x0078, 0x9497, 0x1078, 0x772d, 0x007c, 0x0d7e,
++	0x067e, 0x6618, 0x2668, 0x6e04, 0xa6b4, 0xff00, 0x8637, 0xa686,
++	0x0006, 0x0040, 0x9684, 0xa686, 0x0004, 0x0040, 0x9684, 0x6e04,
++	0xa6b4, 0x00ff, 0xa686, 0x0006, 0x0040, 0x9684, 0xa686, 0x0004,
++	0x0040, 0x9684, 0xa085, 0x0001, 0x067f, 0x0d7f, 0x007c, 0x0d7e,
++	0x1078, 0x96bb, 0x0d7f, 0x007c, 0x0d7e, 0x1078, 0x96ca, 0x00c0,
++	0x96b4, 0x680c, 0xa08c, 0xff00, 0x6820, 0xa084, 0x00ff, 0xa115,
++	0x6212, 0x6824, 0x602a, 0xd1e4, 0x0040, 0x96a2, 0x2009, 0x0001,
++	0x0078, 0x96b0, 0xd1ec, 0x0040, 0x96b4, 0x6920, 0xa18c, 0x00ff,
++	0x6824, 0x1078, 0x254d, 0x00c0, 0x96b4, 0x2110, 0x2009, 0x0000,
++	0x1078, 0x28c8, 0x0078, 0x96b8, 0xa085, 0x0001, 0x0078, 0x96b9,
++	0xa006, 0x0d7f, 0x007c, 0x2069, 0xab8d, 0x6800, 0xa082, 0x0010,
++	0x00c8, 0x96c8, 0x6013, 0x0000, 0xa085, 0x0001, 0x0078, 0x96c9,
++	0xa006, 0x007c, 0x6013, 0x0000, 0x2069, 0xab8c, 0x6808, 0xa084,
++	0xff00, 0xa086, 0x0800, 0x00c0, 0x96de, 0x6800, 0xa084, 0x00ff,
++	0xa08e, 0x0014, 0x0040, 0x96de, 0xa08e, 0x0010, 0x007c, 0x6004,
++	0xa0b2, 0x0044, 0x10c8, 0x1332, 0xa1b6, 0x0013, 0x00c0, 0x96eb,
++	0x2008, 0x0079, 0x96fe, 0xa1b6, 0x0027, 0x0040, 0x96f3, 0xa1b6,
++	0x0014, 0x10c0, 0x1332, 0x2001, 0x0007, 0x1078, 0x4535, 0x1078,
++	0x61cd, 0x1078, 0x8ec6, 0x1078, 0x62d1, 0x007c, 0x973e, 0x9740,
++	0x973e, 0x973e, 0x973e, 0x9740, 0x974c, 0x97d6, 0x9799, 0x97d6,
++	0x97ad, 0x97d6, 0x974c, 0x97d6, 0x97ce, 0x97d6, 0x97ce, 0x97d6,
++	0x97d6, 0x973e, 0x973e, 0x973e, 0x973e, 0x973e, 0x973e, 0x973e,
++	0x973e, 0x973e, 0x973e, 0x973e, 0x9740, 0x973e, 0x97d6, 0x973e,
++	0x973e, 0x97d6, 0x973e, 0x97d6, 0x97d6, 0x973e, 0x973e, 0x973e,
++	0x973e, 0x97d6, 0x97d6, 0x973e, 0x97d6, 0x97d6, 0x973e, 0x973e,
++	0x973e, 0x973e, 0x973e, 0x9740, 0x97d6, 0x97d6, 0x973e, 0x973e,
++	0x97d6, 0x97d6, 0x973e, 0x973e, 0x973e, 0x973e, 0x1078, 0x1332,
++	0x1078, 0x61cd, 0x2001, 0xa8a2, 0x2004, 0x6016, 0x6003, 0x0002,
++	0x1078, 0x62d1, 0x0078, 0x97dc, 0x0f7e, 0x2079, 0xa652, 0x7804,
++	0x0f7f, 0xd0ac, 0x00c0, 0x97d6, 0x2001, 0x0000, 0x1078, 0x44ee,
++	0x6018, 0xa080, 0x0004, 0x2004, 0xa086, 0x00ff, 0x0040, 0x97d6,
++	0x0c7e, 0x6018, 0x2060, 0x6000, 0xd0f4, 0x00c0, 0x9770, 0x6010,
++	0xa005, 0x0040, 0x9770, 0x0c7f, 0x1078, 0x3699, 0x0078, 0x97d6,
++	0x0c7f, 0x2001, 0xa600, 0x2004, 0xa086, 0x0002, 0x00c0, 0x977f,
++	0x0f7e, 0x2079, 0xa600, 0x7890, 0x8000, 0x7892, 0x0f7f, 0x2001,
++	0x0002, 0x1078, 0x4502, 0x1078, 0x61cd, 0x601f, 0x0001, 0x6003,
++	0x0001, 0x6007, 0x0002, 0x1078, 0x5dd7, 0x1078, 0x62d1, 0x0c7e,
++	0x6118, 0x2160, 0x2009, 0x0001, 0x1078, 0x5a52, 0x0c7f, 0x0078,
++	0x97dc, 0x6618, 0x0d7e, 0x2668, 0x6e04, 0x0d7f, 0xa6b4, 0xff00,
++	0x8637, 0xa686, 0x0006, 0x0040, 0x97d6, 0xa686, 0x0004, 0x0040,
++	0x97d6, 0x2001, 0x0004, 0x0078, 0x97d4, 0x2001, 0xa600, 0x2004,
++	0xa086, 0x0003, 0x00c0, 0x97b6, 0x1078, 0x3699, 0x2001, 0x0006,
++	0x1078, 0x97dd, 0x6618, 0x0d7e, 0x2668, 0x6e04, 0x0d7f, 0xa6b4,
++	0xff00, 0x8637, 0xa686, 0x0006, 0x0040, 0x97d6, 0x2001, 0x0006,
++	0x0078, 0x97d4, 0x2001, 0x0004, 0x0078, 0x97d4, 0x2001, 0x0006,
++	0x1078, 0x97dd, 0x0078, 0x97d6, 0x1078, 0x4535, 0x1078, 0x61cd,
++	0x1078, 0x772d, 0x1078, 0x62d1, 0x007c, 0x017e, 0x0d7e, 0x6118,
++	0x2168, 0x6900, 0xd184, 0x0040, 0x97f8, 0x6104, 0xa18e, 0x000a,
++	0x00c0, 0x97f0, 0x699c, 0xd1a4, 0x00c0, 0x97f0, 0x2001, 0x0007,
++	0x1078, 0x4502, 0x2001, 0x0000, 0x1078, 0x44ee, 0x1078, 0x28a6,
++	0x0d7f, 0x017f, 0x007c, 0x0d7e, 0x6618, 0x2668, 0x6804, 0xa084,
++	0xff00, 0x8007, 0x0d7f, 0xa0b2, 0x000c, 0x10c8, 0x1332, 0xa1b6,
++	0x0015, 0x00c0, 0x980f, 0x1079, 0x9816, 0x0078, 0x9815, 0xa1b6,
++	0x0016, 0x10c0, 0x1332, 0x1079, 0x9822, 0x007c, 0x7d4e, 0x7d4e,
++	0x7d4e, 0x7d4e, 0x7d4e, 0x7d4e, 0x9877, 0x982e, 0x7d4e, 0x7d4e,
++	0x7d4e, 0x7d4e, 0x7d4e, 0x7d4e, 0x7d4e, 0x7d4e, 0x7d4e, 0x7d4e,
++	0x9877, 0x987f, 0x7d4e, 0x7d4e, 0x7d4e, 0x7d4e, 0x0f7e, 0x2079,
++	0xa652, 0x7804, 0xd0ac, 0x00c0, 0x9855, 0x6018, 0xa07d, 0x0040,
++	0x9855, 0x7800, 0xd0f4, 0x00c0, 0x9841, 0x7810, 0xa005, 0x00c0,
++	0x9855, 0x2001, 0x0000, 0x1078, 0x44ee, 0x2001, 0x0002, 0x1078,
++	0x4502, 0x601f, 0x0001, 0x6003, 0x0001, 0x6007, 0x0002, 0x1078,
++	0x5dd7, 0x1078, 0x62d1, 0x0078, 0x9875, 0x2011, 0xab83, 0x2204,
++	0x8211, 0x220c, 0x1078, 0x254d, 0x00c0, 0x9875, 0x0c7e, 0x1078,
++	0x45c4, 0x0040, 0x9868, 0x0c7f, 0x1078, 0x772d, 0x0078, 0x9875,
++	0x6010, 0x007e, 0x6014, 0x007e, 0x1078, 0x42f8, 0x007f, 0x6016,
++	0x007f, 0x6012, 0x0c7f, 0x1078, 0x772d, 0x0f7f, 0x007c, 0x6604,
++	0xa6b6, 0x001e, 0x00c0, 0x987e, 0x1078, 0x772d, 0x007c, 0x1078,
++	0x7f8e, 0x00c0, 0x988b, 0x6003, 0x0001, 0x6007, 0x0001, 0x1078,
++	0x5dd7, 0x0078, 0x988d, 0x1078, 0x772d, 0x007c, 0x6004, 0xa08a,
++	0x0044, 0x10c8, 0x1332, 0x1078, 0x61cd, 0x1078, 0x8ec6, 0x1078,
++	0x62d1, 0x007c, 0xa182, 0x0040, 0x0079, 0x989e, 0x98b1, 0x98b1,
++	0x98b1, 0x98b1, 0x98b3, 0x98b1, 0x98b1, 0x98b1, 0x98b1, 0x98b1,
++	0x98b1, 0x98b1, 0x98b1, 0x98b1, 0x98b1, 0x98b1, 0x98b1, 0x98b1,
++	0x98b1, 0x1078, 0x1332, 0x0d7e, 0x0e7e, 0x0f7e, 0x157e, 0x047e,
++	0x027e, 0x6218, 0xa280, 0x002b, 0x2004, 0xa005, 0x0040, 0x98c4,
++	0x2021, 0x0000, 0x1078, 0xa472, 0x6106, 0x2071, 0xab80, 0x7444,
++	0xa4a4, 0xff00, 0x0040, 0x991b, 0xa486, 0x2000, 0x00c0, 0x98d6,
++	0x2009, 0x0001, 0x2011, 0x0200, 0x1078, 0x5bf1, 0x1078, 0x138b,
++	0x1040, 0x1332, 0x6003, 0x0007, 0x2d00, 0x6837, 0x010d, 0x6803,
++	0x0000, 0x683b, 0x0000, 0x6c5a, 0x2c00, 0x685e, 0x6008, 0x68b2,
++	0x6018, 0x2078, 0x78a0, 0x8007, 0x7130, 0x694a, 0x017e, 0xa084,
++	0xff00, 0x6846, 0x684f, 0x0000, 0x6857, 0x0036, 0x1078, 0x4a73,
++	0x017f, 0xa486, 0x2000, 0x00c0, 0x9903, 0x2019, 0x0017, 0x1078,
++	0xa195, 0x0078, 0x997d, 0xa486, 0x0400, 0x00c0, 0x990d, 0x2019,
++	0x0002, 0x1078, 0xa146, 0x0078, 0x997d, 0xa486, 0x0200, 0x00c0,
++	0x9913, 0x1078, 0xa12b, 0xa486, 0x1000, 0x00c0, 0x9919, 0x1078,
++	0xa17a, 0x0078, 0x997d, 0x2069, 0xa933, 0x6a00, 0xd284, 0x0040,
++	0x99e7, 0xa284, 0x0300, 0x00c0, 0x99df, 0x6804, 0xa005, 0x0040,
++	0x99c5, 0x2d78, 0x6003, 0x0007, 0x1078, 0x1370, 0x0040, 0x9984,
++	0x7800, 0xd08c, 0x00c0, 0x9937, 0x7804, 0x8001, 0x7806, 0x6013,
++	0x0000, 0x6803, 0x0000, 0x6837, 0x0116, 0x683b, 0x0000, 0x6008,
++	0x68b2, 0x2c00, 0x684a, 0x6018, 0x2078, 0x78a0, 0x8007, 0x7130,
++	0x6986, 0x6846, 0x7928, 0x698a, 0x792c, 0x698e, 0x7930, 0x6992,
++	0x7934, 0x6996, 0x6853, 0x003d, 0x7244, 0xa294, 0x0003, 0xa286,
++	0x0002, 0x00c0, 0x995f, 0x684f, 0x0040, 0x0078, 0x9969, 0xa286,
++	0x0001, 0x00c0, 0x9967, 0x684f, 0x0080, 0x0078, 0x9969, 0x684f,
++	0x0000, 0x20a9, 0x000a, 0x2001, 0xab90, 0xad90, 0x0015, 0x200c,
++	0x810f, 0x2112, 0x8000, 0x8210, 0x00f0, 0x996f, 0x200c, 0x6982,
++	0x8000, 0x200c, 0x697e, 0x1078, 0x4a73, 0x027f, 0x047f, 0x157f,
++	0x0f7f, 0x0e7f, 0x0d7f, 0x007c, 0x2001, 0xa60e, 0x2004, 0xd084,
++	0x0040, 0x998e, 0x1078, 0x138b, 0x00c0, 0x9930, 0x6013, 0x0100,
++	0x6003, 0x0001, 0x6007, 0x0041, 0x1078, 0x5d8a, 0x1078, 0x62d1,
++	0x0078, 0x997d, 0x2069, 0xab92, 0x2d04, 0xa084, 0xff00, 0xa086,
++	0x1200, 0x00c0, 0x99b9, 0x2069, 0xab80, 0x686c, 0xa084, 0x00ff,
++	0x017e, 0x6110, 0xa18c, 0x0700, 0xa10d, 0x6112, 0x017f, 0x6003,
++	0x0001, 0x6007, 0x0043, 0x1078, 0x5d8a, 0x1078, 0x62d1, 0x0078,
++	0x997d, 0x6013, 0x0200, 0x6003, 0x0001, 0x6007, 0x0041, 0x1078,
++	0x5d8a, 0x1078, 0x62d1, 0x0078, 0x997d, 0x2001, 0xa60d, 0x2004,
++	0xd0ec, 0x0040, 0x99cf, 0x2011, 0x8049, 0x1078, 0x361b, 0x6013,
++	0x0300, 0x0078, 0x99d5, 0x6013, 0x0100, 0x6003, 0x0001, 0x6007,
++	0x0041, 0x1078, 0x5d8a, 0x1078, 0x62d1, 0x0078, 0x997d, 0x6013,
++	0x0500, 0x0078, 0x99d5, 0x6013, 0x0600, 0x0078, 0x999a, 0x6013,
++	0x0200, 0x0078, 0x999a, 0xa186, 0x0013, 0x00c0, 0x99fd, 0x6004,
++	0xa08a, 0x0040, 0x1048, 0x1332, 0xa08a, 0x0053, 0x10c8, 0x1332,
++	0xa082, 0x0040, 0x2008, 0x0079, 0x9a82, 0xa186, 0x0051, 0x0040,
++	0x9a0a, 0xa186, 0x0047, 0x00c0, 0x9a23, 0x6004, 0xa086, 0x0041,
++	0x0040, 0x9a31, 0x2001, 0x0109, 0x2004, 0xd084, 0x0040, 0x9a31,
++	0x127e, 0x2091, 0x2200, 0x007e, 0x017e, 0x027e, 0x1078, 0x5c56,
++	0x027f, 0x017f, 0x007f, 0x127f, 0x6000, 0xa086, 0x0002, 0x00c0,
++	0x9a31, 0x0078, 0x9ac7, 0xa186, 0x0027, 0x0040, 0x9a2b, 0xa186,
++	0x0014, 0x10c0, 0x1332, 0x6004, 0xa082, 0x0040, 0x2008, 0x0079,
++	0x9a34, 0x1078, 0x7773, 0x007c, 0x9a47, 0x9a49, 0x9a49, 0x9a71,
++	0x9a47, 0x9a47, 0x9a47, 0x9a47, 0x9a47, 0x9a47, 0x9a47, 0x9a47,
++	0x9a47, 0x9a47, 0x9a47, 0x9a47, 0x9a47, 0x9a47, 0x9a47, 0x1078,
++	0x1332, 0x1078, 0x61cd, 0x1078, 0x62d1, 0x037e, 0x0d7e, 0x6010,
++	0xa06d, 0x0040, 0x9a6e, 0xad84, 0xf000, 0x0040, 0x9a6e, 0x6003,
++	0x0002, 0x6018, 0x2004, 0xd0bc, 0x00c0, 0x9a6e, 0x2019, 0x0004,
++	0x1078, 0xa1ca, 0x6013, 0x0000, 0x6014, 0xa005, 0x00c0, 0x9a6c,
++	0x2001, 0xa8a3, 0x2004, 0x6016, 0x6003, 0x0007, 0x0d7f, 0x037f,
++	0x007c, 0x0d7e, 0x1078, 0x61cd, 0x1078, 0x62d1, 0x1078, 0x8d06,
++	0x0040, 0x9a7e, 0x6010, 0x2068, 0x1078, 0x13a4, 0x1078, 0x8ec6,
++	0x0d7f, 0x007c, 0x9a95, 0x9ab4, 0x9a9e, 0x9ac1, 0x9a95, 0x9a95,
++	0x9a95, 0x9a95, 0x9a95, 0x9a95, 0x9a95, 0x9a95, 0x9a95, 0x9a95,
++	0x9a95, 0x9a95, 0x9a95, 0x9a95, 0x9a95, 0x1078, 0x1332, 0x6010,
++	0xa088, 0x0013, 0x2104, 0xa085, 0x0400, 0x200a, 0x1078, 0x61cd,
++	0x6010, 0xa080, 0x0013, 0x2004, 0xd0b4, 0x0040, 0x9aaf, 0x6003,
++	0x0007, 0x2009, 0x0043, 0x1078, 0x775c, 0x0078, 0x9ab1, 0x6003,
++	0x0002, 0x1078, 0x62d1, 0x007c, 0x1078, 0x61cd, 0x1078, 0xa423,
++	0x00c0, 0x9abe, 0x1078, 0x5bc1, 0x1078, 0x772d, 0x1078, 0x62d1,
++	0x007c, 0x1078, 0x61cd, 0x2009, 0x0041, 0x0078, 0x9c1e, 0xa182,
++	0x0040, 0x0079, 0x9acb, 0x9ade, 0x9ae0, 0x9ade, 0x9ade, 0x9ade,
++	0x9ade, 0x9ade, 0x9ae1, 0x9ade, 0x9ade, 0x9ade, 0x9ade, 0x9ade,
++	0x9ade, 0x9ade, 0x9ade, 0x9ade, 0x9aec, 0x9ade, 0x1078, 0x1332,
++	0x007c, 0x6003, 0x0004, 0x6110, 0x20e1, 0x0005, 0x3d18, 0x3e20,
++	0x2c10, 0x1078, 0x15fa, 0x007c, 0x0d7e, 0x1078, 0x5bc1, 0x0d7f,
++	0x1078, 0xa495, 0x1078, 0x772d, 0x007c, 0xa182, 0x0040, 0x0079,
++	0x9af9, 0x9b0c, 0x9b0c, 0x9b0c, 0x9b0c, 0x9b0c, 0x9b0c, 0x9b0c,
++	0x9b0e, 0x9b0c, 0x9b11, 0x9b3c, 0x9b0c, 0x9b0c, 0x9b0c, 0x9b0c,
++	0x9b3c, 0x9b0c, 0x9b0c, 0x9b0c, 0x1078, 0x1332, 0x1078, 0x7773,
++	0x007c, 0x1078, 0x627a, 0x1078, 0x639b, 0x6010, 0x0d7e, 0x2068,
++	0x684c, 0xd0fc, 0x0040, 0x9b27, 0xa08c, 0x0003, 0xa18e, 0x0002,
++	0x0040, 0x9b2f, 0x2009, 0x0041, 0x0d7f, 0x0078, 0x9c1e, 0x6003,
++	0x0007, 0x6017, 0x0000, 0x1078, 0x5bc1, 0x0d7f, 0x007c, 0x1078,
++	0xa423, 0x0040, 0x9b35, 0x0d7f, 0x007c, 0x1078, 0x5bc1, 0x1078,
++	0x772d, 0x0d7f, 0x0078, 0x9b2e, 0x037e, 0x1078, 0x627a, 0x1078,
++	0x639b, 0x6010, 0x0d7e, 0x2068, 0x6018, 0x2004, 0xd0bc, 0x0040,
++	0x9b5c, 0x684c, 0xa084, 0x0003, 0xa086, 0x0002, 0x0040, 0x9b58,
++	0x687c, 0x632c, 0xa31a, 0x632e, 0x6880, 0x6328, 0xa31b, 0x632a,
++	0x6003, 0x0002, 0x0078, 0x9b6d, 0x2019, 0x0004, 0x1078, 0xa1ca,
++	0x6014, 0xa005, 0x00c0, 0x9b69, 0x2001, 0xa8a3, 0x2004, 0x8003,
++	0x6016, 0x6013, 0x0000, 0x6003, 0x0007, 0x0d7f, 0x037f, 0x007c,
++	0xa186, 0x0013, 0x00c0, 0x9b7e, 0x6004, 0xa086, 0x0042, 0x10c0,
++	0x1332, 0x1078, 0x61cd, 0x1078, 0x62d1, 0x007c, 0xa186, 0x0027,
++	0x0040, 0x9b86, 0xa186, 0x0014, 0x00c0, 0x9b96, 0x6004, 0xa086,
++	0x0042, 0x10c0, 0x1332, 0x2001, 0x0007, 0x1078, 0x4535, 0x1078,
++	0x61cd, 0x1078, 0x8ec6, 0x1078, 0x62d1, 0x007c, 0xa182, 0x0040,
++	0x0079, 0x9b9a, 0x9bad, 0x9bad, 0x9bad, 0x9bad, 0x9bad, 0x9bad,
++	0x9bad, 0x9baf, 0x9bbb, 0x9bad, 0x9bad, 0x9bad, 0x9bad, 0x9bad,
++	0x9bad, 0x9bad, 0x9bad, 0x9bad, 0x9bad, 0x1078, 0x1332, 0x037e,
++	0x047e, 0x20e1, 0x0005, 0x3d18, 0x3e20, 0x2c10, 0x1078, 0x15fa,
++	0x047f, 0x037f, 0x007c, 0x6010, 0x0d7e, 0x2068, 0x6810, 0x6a14,
++	0x6118, 0x210c, 0xd1bc, 0x0040, 0x9bda, 0x6124, 0xd1f4, 0x00c0,
++	0x9bda, 0x007e, 0x047e, 0x057e, 0x6c7c, 0xa422, 0x6d80, 0x2200,
++	0xa52b, 0x602c, 0xa420, 0x642e, 0x6028, 0xa529, 0x652a, 0x057f,
++	0x047f, 0x007f, 0xa20d, 0x00c0, 0x9bee, 0x684c, 0xd0fc, 0x0040,
++	0x9be6, 0x2009, 0x0041, 0x0d7f, 0x0078, 0x9c1e, 0x6003, 0x0007,
++	0x6017, 0x0000, 0x1078, 0x5bc1, 0x0d7f, 0x007c, 0x007e, 0x0f7e,
++	0x2c78, 0x1078, 0x4963, 0x0f7f, 0x007f, 0x0040, 0x9bfb, 0x6003,
++	0x0002, 0x0d7f, 0x007c, 0x2009, 0xa60d, 0x210c, 0xd19c, 0x0040,
++	0x9c05, 0x6003, 0x0007, 0x0078, 0x9c07, 0x6003, 0x0006, 0x1078,
++	0x9c0d, 0x1078, 0x5bc3, 0x0d7f, 0x007c, 0xd2fc, 0x0040, 0x9c19,
++	0x8002, 0x8000, 0x8212, 0xa291, 0x0000, 0x2009, 0x0009, 0x0078,
++	0x9c1b, 0x2009, 0x0015, 0x6a6a, 0x6866, 0x007c, 0xa182, 0x0040,
++	0x0048, 0x9c24, 0x0079, 0x9c31, 0xa186, 0x0013, 0x0040, 0x9c2c,
++	0xa186, 0x0014, 0x10c0, 0x1332, 0x6024, 0xd0dc, 0x1040, 0x1332,
++	0x007c, 0x9c44, 0x9c4b, 0x9c57, 0x9c63, 0x9c44, 0x9c44, 0x9c44,
++	0x9c72, 0x9c44, 0x9c46, 0x9c46, 0x9c44, 0x9c44, 0x9c44, 0x9c44,
++	0x9c44, 0x9c44, 0x9c44, 0x9c44, 0x1078, 0x1332, 0x6024, 0xd0dc,
++	0x1040, 0x1332, 0x007c, 0x6003, 0x0001, 0x6106, 0x1078, 0x5d8a,
++	0x127e, 0x2091, 0x8000, 0x1078, 0x62d1, 0x127f, 0x007c, 0x6003,
++	0x0001, 0x6106, 0x1078, 0x5d8a, 0x127e, 0x2091, 0x8000, 0x1078,
++	0x62d1, 0x127f, 0x007c, 0x6003, 0x0003, 0x6106, 0x2c10, 0x1078,
++	0x1cf0, 0x127e, 0x2091, 0x8000, 0x1078, 0x5df6, 0x1078, 0x639b,
++	0x127f, 0x007c, 0xa016, 0x1078, 0x15fa, 0x007c, 0x127e, 0x2091,
++	0x8000, 0x037e, 0x0d7e, 0xa182, 0x0040, 0x1079, 0x9c83, 0x0d7f,
++	0x037f, 0x127f, 0x007c, 0x9c93, 0x9c95, 0x9caa, 0x9cc9, 0x9c93,
++	0x9c93, 0x9c93, 0x9ce1, 0x9c93, 0x9c93, 0x9c93, 0x9c93, 0x9c93,
++	0x9c93, 0x9c93, 0x9c93, 0x1078, 0x1332, 0x6010, 0x2068, 0x684c,
++	0xd0fc, 0x0040, 0x9cbf, 0xa09c, 0x0003, 0xa39e, 0x0003, 0x0040,
++	0x9cbf, 0x6003, 0x0001, 0x6106, 0x1078, 0x5d8a, 0x1078, 0x62d1,
++	0x0078, 0x9ce4, 0x6010, 0x2068, 0x684c, 0xd0fc, 0x0040, 0x9cbf,
++	0xa09c, 0x0003, 0xa39e, 0x0003, 0x0040, 0x9cbf, 0x6003, 0x0001,
++	0x6106, 0x1078, 0x5d8a, 0x1078, 0x62d1, 0x0078, 0x9ce4, 0x6013,
++	0x0000, 0x6017, 0x0000, 0x2019, 0x0004, 0x1078, 0xa1ca, 0x0078,
++	0x9ce4, 0x6010, 0x2068, 0x684c, 0xd0fc, 0x0040, 0x9cbf, 0xa09c,
++	0x0003, 0xa39e, 0x0003, 0x0040, 0x9cbf, 0x6003, 0x0003, 0x6106,
++	0x2c10, 0x1078, 0x1cf0, 0x1078, 0x5df6, 0x1078, 0x639b, 0x0078,
++	0x9ce4, 0xa016, 0x1078, 0x15fa, 0x007c, 0x1078, 0x61cd, 0x6110,
++	0x81ff, 0x0040, 0x9cf6, 0x0d7e, 0x2168, 0x1078, 0xa4e2, 0x037e,
++	0x2019, 0x0029, 0x1078, 0xa1ca, 0x037f, 0x0d7f, 0x1078, 0x8ec6,
++	0x1078, 0x62d1, 0x007c, 0x1078, 0x627a, 0x6110, 0x81ff, 0x0040,
++	0x9d0c, 0x0d7e, 0x2168, 0x1078, 0xa4e2, 0x037e, 0x2019, 0x0029,
++	0x1078, 0xa1ca, 0x037f, 0x0d7f, 0x1078, 0x8ec6, 0x1078, 0x639b,
++	0x007c, 0xa182, 0x0085, 0x0079, 0x9d15, 0x9d1e, 0x9d1c, 0x9d1c,
++	0x9d2a, 0x9d1c, 0x9d1c, 0x9d1c, 0x1078, 0x1332, 0x6003, 0x000b,
++	0x6106, 0x1078, 0x5d8a, 0x127e, 0x2091, 0x8000, 0x1078, 0x62d1,
++	0x127f, 0x007c, 0x027e, 0x0e7e, 0x1078, 0xa41c, 0x0040, 0x9d34,
++	0x1078, 0x772d, 0x0078, 0x9d50, 0x2071, 0xab80, 0x7224, 0x6212,
++	0x7220, 0x1078, 0xa069, 0x0040, 0x9d41, 0x6007, 0x0086, 0x0078,
++	0x9d4a, 0x6007, 0x0087, 0x7224, 0xa296, 0xffff, 0x00c0, 0x9d4a,
++	0x6007, 0x0086, 0x6003, 0x0001, 0x1078, 0x5d8a, 0x1078, 0x62d1,
++	0x0e7f, 0x027f, 0x007c, 0xa186, 0x0013, 0x00c0, 0x9d64, 0x6004,
++	0xa08a, 0x0085, 0x1048, 0x1332, 0xa08a, 0x008c, 0x10c8, 0x1332,
++	0xa082, 0x0085, 0x0079, 0x9d7b, 0xa186, 0x0027, 0x0040, 0x9d70,
++	0xa186, 0x0014, 0x0040, 0x9d70, 0x1078, 0x7773, 0x0078, 0x9d7a,
++	0x2001, 0x0007, 0x1078, 0x4535, 0x1078, 0x61cd, 0x1078, 0x8ec6,
++	0x1078, 0x62d1, 0x007c, 0x9d82, 0x9d84, 0x9d84, 0x9d82, 0x9d82,
++	0x9d82, 0x9d82, 0x1078, 0x1332, 0x1078, 0x61cd, 0x1078, 0x8ec6,
++	0x1078, 0x62d1, 0x007c, 0xa182, 0x0085, 0x1048, 0x1332, 0xa182,
++	0x008c, 0x10c8, 0x1332, 0xa182, 0x0085, 0x0079, 0x9d97, 0x9d9e,
++	0x9d9e, 0x9d9e, 0x9da0, 0x9d9e, 0x9d9e, 0x9d9e, 0x1078, 0x1332,
++	0x007c, 0xa186, 0x0013, 0x0040, 0x9db1, 0xa186, 0x0014, 0x0040,
++	0x9db1, 0xa186, 0x0027, 0x0040, 0x9db1, 0x1078, 0x7773, 0x0078,
++	0x9db7, 0x1078, 0x61cd, 0x1078, 0x8ec6, 0x1078, 0x62d1, 0x007c,
++	0x037e, 0x1078, 0xa495, 0x603f, 0x0000, 0x2019, 0x000b, 0x1078,
++	0x9dc7, 0x601f, 0x0006, 0x6003, 0x0007, 0x037f, 0x007c, 0x127e,
++	0x037e, 0x2091, 0x8000, 0x087e, 0x2c40, 0x097e, 0x2049, 0x0000,
++	0x1078, 0x7246, 0x097f, 0x087f, 0x00c0, 0x9e02, 0x077e, 0x2c38,
++	0x1078, 0x72f3, 0x077f, 0x00c0, 0x9e02, 0x6000, 0xa086, 0x0000,
++	0x0040, 0x9e02, 0x601c, 0xa086, 0x0007, 0x0040, 0x9e02, 0x0d7e,
++	0x6000, 0xa086, 0x0004, 0x00c0, 0x9df3, 0x1078, 0xa495, 0x601f,
++	0x0007, 0x1078, 0x1757, 0x6010, 0x2068, 0x1078, 0x8d06, 0x0040,
++	0x9dfb, 0x1078, 0xa1ca, 0x0d7f, 0x6013, 0x0000, 0x1078, 0xa495,
++	0x601f, 0x0007, 0x037f, 0x127f, 0x007c, 0x0f7e, 0x0c7e, 0x037e,
++	0x157e, 0x2079, 0xab80, 0x7938, 0x783c, 0x1078, 0x254d, 0x00c0,
++	0x9e49, 0x017e, 0x0c7e, 0x1078, 0x45c4, 0x00c0, 0x9e49, 0x017f,
++	0x027f, 0x027e, 0x017e, 0x2019, 0x0029, 0x1078, 0x73d0, 0x1078,
++	0x5f01, 0x077e, 0x2039, 0x0000, 0x1078, 0x5e0a, 0x077f, 0x017f,
++	0x077e, 0x2039, 0x0000, 0x1078, 0x9f8b, 0x077f, 0x1078, 0x47e9,
++	0x027e, 0x6204, 0xa294, 0xff00, 0x8217, 0xa286, 0x0006, 0x0040,
++	0x9e3d, 0xa286, 0x0004, 0x00c0, 0x9e40, 0x62a0, 0x1078, 0x2942,
++	0x027f, 0x017f, 0x1078, 0x42f8, 0x6612, 0x6516, 0xa006, 0x0078,
++	0x9e4b, 0x0c7f, 0x017f, 0x157f, 0x037f, 0x0c7f, 0x0f7f, 0x007c,
++	0x0c7e, 0x0d7e, 0x0e7e, 0x017e, 0x2009, 0xa620, 0x2104, 0xa086,
++	0x0074, 0x00c0, 0x9eb3, 0x2069, 0xab8e, 0x690c, 0xa182, 0x0100,
++	0x0048, 0x9ea3, 0x6908, 0xa184, 0x8000, 0x0040, 0x9eaf, 0x6018,
++	0x2070, 0x7010, 0xa084, 0x00ff, 0x0040, 0x9e72, 0x7000, 0xd0f4,
++	0x0040, 0x9e76, 0xa184, 0x0800, 0x0040, 0x9eaf, 0x6910, 0xa18a,
++	0x0001, 0x0048, 0x9ea7, 0x6914, 0x2069, 0xabae, 0x6904, 0x81ff,
++	0x00c0, 0x9e9b, 0x690c, 0xa182, 0x0100, 0x0048, 0x9ea3, 0x6908,
++	0x81ff, 0x00c0, 0x9e9f, 0x6910, 0xa18a, 0x0001, 0x0048, 0x9ea7,
++	0x6918, 0xa18a, 0x0001, 0x0048, 0x9eaf, 0x0078, 0x9eb9, 0x6013,
++	0x0100, 0x0078, 0x9eb5, 0x6013, 0x0300, 0x0078, 0x9eb5, 0x6013,
++	0x0500, 0x0078, 0x9eb5, 0x6013, 0x0700, 0x0078, 0x9eb5, 0x6013,
++	0x0900, 0x0078, 0x9eb5, 0x6013, 0x0b00, 0x0078, 0x9eb5, 0x6013,
++	0x0f00, 0x0078, 0x9eb5, 0x6013, 0x2d00, 0xa085, 0x0001, 0x0078,
++	0x9eba, 0xa006, 0x017f, 0x0e7f, 0x0d7f, 0x0c7f, 0x007c, 0x0c7e,
++	0x0d7e, 0x027e, 0x037e, 0x157e, 0x6218, 0x2268, 0x6b04, 0xa394,
++	0x00ff, 0xa286, 0x0006, 0x0040, 0x9ee3, 0xa286, 0x0004, 0x0040,
++	0x9ee3, 0xa394, 0xff00, 0x8217, 0xa286, 0x0006, 0x0040, 0x9ee3,
++	0xa286, 0x0004, 0x0040, 0x9ee3, 0x0c7e, 0x2d60, 0x1078, 0x45d6,
++	0x0c7f, 0x0078, 0x9f1e, 0x2011, 0xab96, 0xad98, 0x000a, 0x20a9,
++	0x0004, 0x1078, 0x80de, 0x00c0, 0x9f1f, 0x2011, 0xab9a, 0xad98,
++	0x0006, 0x20a9, 0x0004, 0x1078, 0x80de, 0x00c0, 0x9f1f, 0x047e,
++	0x017e, 0x6aa0, 0xa294, 0x00ff, 0x8227, 0xa006, 0x2009, 0xa653,
++	0x210c, 0xd1a4, 0x0040, 0x9f0b, 0x2009, 0x0029, 0x1078, 0xa21d,
++	0x6800, 0xc0e5, 0x6802, 0x2019, 0x0029, 0x1078, 0x5f01, 0x077e,
++	0x2039, 0x0000, 0x1078, 0x5e0a, 0x2c08, 0x1078, 0x9f8b, 0x077f,
++	0x2001, 0x0007, 0x1078, 0x4535, 0x017f, 0x047f, 0xa006, 0x157f,
++	0x037f, 0x027f, 0x0d7f, 0x0c7f, 0x007c, 0x0d7e, 0x2069, 0xab8e,
++	0x6800, 0xa086, 0x0800, 0x0040, 0x9f31, 0x6013, 0x0000, 0x0078,
++	0x9f32, 0xa006, 0x0d7f, 0x007c, 0x0c7e, 0x0f7e, 0x017e, 0x027e,
++	0x037e, 0x157e, 0x2079, 0xab8c, 0x7930, 0x7834, 0x1078, 0x254d,
++	0x00c0, 0x9f58, 0x1078, 0x45c4, 0x00c0, 0x9f58, 0x2011, 0xab90,
++	0xac98, 0x000a, 0x20a9, 0x0004, 0x1078, 0x80de, 0x00c0, 0x9f58,
++	0x2011, 0xab94, 0xac98, 0x0006, 0x20a9, 0x0004, 0x1078, 0x80de,
++	0x157f, 0x037f, 0x027f, 0x017f, 0x0f7f, 0x0c7f, 0x007c, 0x0c7e,
++	0x007e, 0x017e, 0x027e, 0x037e, 0x157e, 0x2011, 0xab83, 0x2204,
++	0x8211, 0x220c, 0x1078, 0x254d, 0x00c0, 0x9f84, 0x1078, 0x45c4,
++	0x00c0, 0x9f84, 0x2011, 0xab96, 0xac98, 0x000a, 0x20a9, 0x0004,
++	0x1078, 0x80de, 0x00c0, 0x9f84, 0x2011, 0xab9a, 0xac98, 0x0006,
++	0x20a9, 0x0004, 0x1078, 0x80de, 0x157f, 0x037f, 0x027f, 0x017f,
++	0x007f, 0x0c7f, 0x007c, 0x0e7e, 0x0c7e, 0x087e, 0x077e, 0x067e,
++	0x057e, 0x047e, 0x027e, 0x127e, 0x2091, 0x8000, 0x2740, 0x2029,
++	0xa8ba, 0x252c, 0x2021, 0xa8c0, 0x2424, 0x2061, 0xad00, 0x2071,
++	0xa600, 0x7648, 0x7064, 0x81ff, 0x0040, 0x9fb2, 0x007e, 0xa186,
++	0xa9b3, 0x007f, 0x0040, 0x9fb2, 0x8001, 0xa602, 0x00c8, 0xa01c,
++	0x0078, 0x9fb5, 0xa606, 0x0040, 0xa01c, 0x2100, 0xac06, 0x0040,
++	0xa012, 0x1078, 0xa242, 0x0040, 0xa012, 0x671c, 0xa786, 0x0001,
++	0x0040, 0xa037, 0xa786, 0x0004, 0x0040, 0xa037, 0xa786, 0x0007,
++	0x0040, 0xa012, 0x2500, 0xac06, 0x0040, 0xa012, 0x2400, 0xac06,
++	0x0040, 0xa012, 0x1078, 0xa256, 0x00c0, 0xa012, 0x88ff, 0x0040,
++	0x9fdd, 0x6020, 0xa906, 0x00c0, 0xa012, 0x0d7e, 0x6000, 0xa086,
++	0x0004, 0x00c0, 0x9fe7, 0x017e, 0x1078, 0x1757, 0x017f, 0xa786,
++	0x0008, 0x00c0, 0x9ff6, 0x1078, 0x8f00, 0x00c0, 0x9ff6, 0x1078,
++	0x7c83, 0x0d7f, 0x1078, 0x8ec6, 0x0078, 0xa012, 0x6010, 0x2068,
++	0x1078, 0x8d06, 0x0040, 0xa00f, 0xa786, 0x0003, 0x00c0, 0xa026,
++	0x6837, 0x0103, 0x6b4a, 0x6847, 0x0000, 0x1078, 0xa4e2, 0x017e,
++	0x1078, 0x8f7d, 0x1078, 0x4a73, 0x017f, 0x1078, 0x8eb9, 0x0d7f,
++	0x1078, 0x8ec6, 0xace0, 0x0010, 0x2001, 0xa616, 0x2004, 0xac02,
++	0x00c8, 0xa01c, 0x0078, 0x9f9f, 0x127f, 0x027f, 0x047f, 0x057f,
++	0x067f, 0x077f, 0x087f, 0x0c7f, 0x0e7f, 0x007c, 0xa786, 0x0006,
++	0x00c0, 0xa000, 0xa386, 0x0005, 0x0040, 0xa034, 0x1078, 0xa4e2,
++	0x1078, 0xa1ca, 0x0078, 0xa00f, 0x0d7f, 0x0078, 0xa012, 0x1078,
++	0xa256, 0x00c0, 0xa012, 0x81ff, 0x0040, 0xa012, 0xa180, 0x0001,
++	0x2004, 0xa086, 0x0018, 0x0040, 0xa04c, 0xa180, 0x0001, 0x2004,
++	0xa086, 0x002d, 0x00c0, 0xa012, 0x6000, 0xa086, 0x0002, 0x00c0,
++	0xa012, 0x1078, 0x8eec, 0x0040, 0xa05d, 0x1078, 0x8f00, 0x00c0,
++	0xa012, 0x1078, 0x7c83, 0x0078, 0xa065, 0x1078, 0x28a6, 0x1078,
++	0x8f00, 0x00c0, 0xa065, 0x1078, 0x7c83, 0x1078, 0x8ec6, 0x0078,
++	0xa012, 0x0c7e, 0x0e7e, 0x017e, 0x2c08, 0x2170, 0xa006, 0x1078,
++	0xa1e6, 0x017f, 0x0040, 0xa079, 0x601c, 0xa084, 0x000f, 0x1079,
++	0xa07c, 0x0e7f, 0x0c7f, 0x007c, 0xa084, 0xa084, 0xa084, 0xa084,
++	0xa084, 0xa084, 0xa086, 0xa084, 0xa006, 0x007c, 0x047e, 0x017e,
++	0x7018, 0xa080, 0x0028, 0x2024, 0xa4a4, 0x00ff, 0x8427, 0x2c00,
++	0x2009, 0x0020, 0x1078, 0xa21d, 0x017f, 0x047f, 0x037e, 0x2019,
++	0x0002, 0x1078, 0x9dc7, 0x037f, 0xa085, 0x0001, 0x007c, 0x2001,
++	0x0001, 0x1078, 0x44ee, 0x157e, 0x017e, 0x027e, 0x037e, 0x20a9,
++	0x0004, 0x2019, 0xa605, 0x2011, 0xab96, 0x1078, 0x80de, 0x037f,
++	0x027f, 0x017f, 0x157f, 0xa005, 0x007c, 0x0f7e, 0x0e7e, 0x0c7e,
++	0x087e, 0x077e, 0x067e, 0x027e, 0x127e, 0x2091, 0x8000, 0x2740,
++	0x2061, 0xad00, 0x2079, 0x0001, 0x8fff, 0x0040, 0xa11d, 0x2071,
++	0xa600, 0x7648, 0x7064, 0x8001, 0xa602, 0x00c8, 0xa11d, 0x88ff,
++	0x0040, 0xa0d8, 0x2800, 0xac06, 0x00c0, 0xa113, 0x2079, 0x0000,
++	0x1078, 0xa242, 0x0040, 0xa113, 0x2400, 0xac06, 0x0040, 0xa113,
++	0x671c, 0xa786, 0x0006, 0x00c0, 0xa113, 0xa786, 0x0007, 0x0040,
++	0xa113, 0x88ff, 0x00c0, 0xa0f7, 0x6018, 0xa206, 0x00c0, 0xa113,
++	0x85ff, 0x0040, 0xa0f7, 0x6020, 0xa106, 0x00c0, 0xa113, 0x0d7e,
++	0x6000, 0xa086, 0x0004, 0x00c0, 0xa103, 0x1078, 0xa495, 0x601f,
++	0x0007, 0x1078, 0x1757, 0x6010, 0x2068, 0x1078, 0x8d06, 0x0040,
++	0xa10d, 0x047e, 0x1078, 0xa1ca, 0x047f, 0x0d7f, 0x1078, 0x8ec6,
++	0x88ff, 0x00c0, 0xa127, 0xace0, 0x0010, 0x2001, 0xa616, 0x2004,
++	0xac02, 0x00c8, 0xa11d, 0x0078, 0xa0c4, 0xa006, 0x127f, 0x027f,
++	0x067f, 0x077f, 0x087f, 0x0c7f, 0x0e7f, 0x0f7f, 0x007c, 0xa8c5,
++	0x0001, 0x0078, 0xa11e, 0x077e, 0x057e, 0x087e, 0x2041, 0x0000,
++	0x2029, 0x0001, 0x2c20, 0x2019, 0x0002, 0x6218, 0x097e, 0x2049,
++	0x0000, 0x1078, 0x7246, 0x097f, 0x087f, 0x2039, 0x0000, 0x1078,
++	0x72f3, 0x1078, 0xa0b5, 0x057f, 0x077f, 0x007c, 0x027e, 0x047e,
++	0x057e, 0x077e, 0x0c7e, 0x157e, 0x2c20, 0x2128, 0x20a9, 0x007f,
++	0x2009, 0x0000, 0x017e, 0x037e, 0x1078, 0x45c4, 0x00c0, 0xa16e,
++	0x2c10, 0x057e, 0x087e, 0x2041, 0x0000, 0x2508, 0x2029, 0x0001,
++	0x097e, 0x2049, 0x0000, 0x1078, 0x7246, 0x097f, 0x087f, 0x2039,
++	0x0000, 0x1078, 0x72f3, 0x1078, 0xa0b5, 0x057f, 0x037f, 0x017f,
++	0x8108, 0x00f0, 0xa152, 0x157f, 0x0c7f, 0x077f, 0x057f, 0x047f,
++	0x027f, 0x007c, 0x077e, 0x057e, 0x6218, 0x087e, 0x2041, 0x0000,
++	0x2029, 0x0001, 0x2019, 0x0048, 0x097e, 0x2049, 0x0000, 0x1078,
++	0x7246, 0x097f, 0x087f, 0x2039, 0x0000, 0x1078, 0x72f3, 0x2c20,
++	0x1078, 0xa0b5, 0x057f, 0x077f, 0x007c, 0x027e, 0x047e, 0x057e,
++	0x077e, 0x0c7e, 0x157e, 0x2c20, 0x20a9, 0x007f, 0x2009, 0x0000,
++	0x017e, 0x037e, 0x1078, 0x45c4, 0x00c0, 0xa1be, 0x2c10, 0x087e,
++	0x2041, 0x0000, 0x2828, 0x047e, 0x2021, 0x0001, 0x1078, 0xa472,
++	0x047f, 0x097e, 0x2049, 0x0000, 0x1078, 0x7246, 0x097f, 0x087f,
++	0x2039, 0x0000, 0x1078, 0x72f3, 0x1078, 0xa0b5, 0x037f, 0x017f,
++	0x8108, 0x00f0, 0xa1a0, 0x157f, 0x0c7f, 0x077f, 0x057f, 0x047f,
++	0x027f, 0x007c, 0x017e, 0x0f7e, 0xad82, 0xcd00, 0x0048, 0xa1e3,
++	0xad82, 0xffff, 0x00c8, 0xa1e3, 0x6800, 0xa07d, 0x0040, 0xa1e0,
++	0x6803, 0x0000, 0x6b52, 0x1078, 0x4a73, 0x2f68, 0x0078, 0xa1d4,
++	0x6b52, 0x1078, 0x4a73, 0x0f7f, 0x017f, 0x007c, 0x0e7e, 0x047e,
++	0x037e, 0x2061, 0xad00, 0xa005, 0x00c0, 0xa1f6, 0x2071, 0xa600,
++	0x7448, 0x7064, 0x8001, 0xa402, 0x00c8, 0xa218, 0x2100, 0xac06,
++	0x0040, 0xa20a, 0x6000, 0xa086, 0x0000, 0x0040, 0xa20a, 0x6008,
++	0xa206, 0x00c0, 0xa20a, 0x6018, 0xa1a0, 0x0006, 0x2424, 0xa406,
++	0x0040, 0xa214, 0xace0, 0x0010, 0x2001, 0xa616, 0x2004, 0xac02,
++	0x00c8, 0xa218, 0x0078, 0xa1f6, 0xa085, 0x0001, 0x0078, 0xa219,
++	0xa006, 0x037f, 0x047f, 0x0e7f, 0x007c, 0x0d7e, 0x007e, 0x1078,
++	0x138b, 0x007f, 0x1040, 0x1332, 0x6837, 0x010d, 0x685e, 0x027e,
++	0x2010, 0x1078, 0x8cf2, 0x2001, 0x0000, 0x0040, 0xa233, 0x2200,
++	0xa080, 0x0008, 0x2004, 0x027f, 0x684a, 0x6956, 0x6c46, 0x684f,
++	0x0000, 0xa006, 0x68b2, 0x6802, 0x683a, 0x685a, 0x1078, 0x4a73,
++	0x0d7f, 0x007c, 0x6700, 0xa786, 0x0000, 0x0040, 0xa255, 0xa786,
++	0x0001, 0x0040, 0xa255, 0xa786, 0x000a, 0x0040, 0xa255, 0xa786,
++	0x0009, 0x0040, 0xa255, 0xa085, 0x0001, 0x007c, 0x0e7e, 0x6018,
++	0x2070, 0x70a0, 0xa206, 0x0e7f, 0x007c, 0x017e, 0x6004, 0xa08e,
++	0x001e, 0x00c0, 0xa277, 0x8007, 0x6130, 0xa18c, 0x00ff, 0xa105,
++	0x6032, 0x6007, 0x0085, 0x6003, 0x000b, 0x601f, 0x0005, 0x2001,
++	0xa8a3, 0x2004, 0x6016, 0x1078, 0x5d8a, 0x1078, 0x62d1, 0x017f,
++	0x007c, 0x0005, 0x0005, 0x007c, 0x6024, 0xd0e4, 0x0040, 0xa28d,
++	0xd0cc, 0x0040, 0xa287, 0x1078, 0x8fbf, 0x0078, 0xa28d, 0x1078,
++	0xa495, 0x1078, 0x5bc1, 0x1078, 0x772d, 0x007c, 0xa280, 0x0007,
++	0x2004, 0xa084, 0x000f, 0x0079, 0xa295, 0xa29e, 0xa29e, 0xa29e,
++	0xa2a0, 0xa29e, 0xa2a0, 0xa2a0, 0xa29e, 0xa2a0, 0xa006, 0x007c,
++	0xa085, 0x0001, 0x007c, 0xa280, 0x0007, 0x2004, 0xa084, 0x000f,
++	0x0079, 0xa2aa, 0xa2b3, 0xa2b3, 0xa2b3, 0xa2b3, 0xa2b3, 0xa2b3,
++	0xa2be, 0xa2b3, 0xa2b3, 0x6007, 0x003b, 0x602b, 0x0009, 0x6013,
++	0x2a00, 0x6003, 0x0001, 0x1078, 0x5d8a, 0x007c, 0x0c7e, 0x2260,
++	0x1078, 0xa495, 0x603f, 0x0000, 0x6024, 0xc0f4, 0xc0cc, 0x6026,
++	0x0c7f, 0x0d7e, 0x2268, 0xa186, 0x0007, 0x00c0, 0xa31f, 0x6810,
++	0xa005, 0x0040, 0xa2dc, 0xa080, 0x0013, 0x2004, 0xd0fc, 0x00c0,
++	0xa2dc, 0x0d7f, 0x0078, 0xa2b3, 0x6007, 0x003a, 0x6003, 0x0001,
++	0x1078, 0x5d8a, 0x1078, 0x62d1, 0x0c7e, 0x2d60, 0x6100, 0xa186,
++	0x0002, 0x00c0, 0xa3ad, 0x6010, 0xa005, 0x00c0, 0xa2f6, 0x6000,
++	0xa086, 0x0007, 0x10c0, 0x1332, 0x0078, 0xa3ad, 0xa08c, 0xf000,
++	0x00c0, 0xa302, 0x0078, 0xa302, 0x2068, 0x6800, 0xa005, 0x00c0,
++	0xa2fc, 0x2d00, 0xa080, 0x0013, 0x2004, 0xa084, 0x0003, 0xa086,
++	0x0002, 0x00c0, 0xa31b, 0x6010, 0x2068, 0x684c, 0xc0dc, 0xc0f4,
++	0x684e, 0x6850, 0xc0f4, 0xc0fc, 0x6852, 0x2009, 0x0043, 0x1078,
++	0x9c1e, 0x0078, 0xa3ad, 0x2009, 0x0041, 0x0078, 0xa3a7, 0xa186,
++	0x0005, 0x00c0, 0xa366, 0x6810, 0xa080, 0x0013, 0x2004, 0xd0bc,
++	0x00c0, 0xa32d, 0x0d7f, 0x0078, 0xa2b3, 0xd0b4, 0x0040, 0xa335,
++	0xd0fc, 0x1040, 0x1332, 0x0078, 0xa2cf, 0x6007, 0x003a, 0x6003,
++	0x0001, 0x1078, 0x5d8a, 0x1078, 0x62d1, 0x0c7e, 0x2d60, 0x6100,
++	0xa186, 0x0002, 0x0040, 0xa348, 0xa186, 0x0004, 0x00c0, 0xa3ad,
++	0x2071, 0xa8e7, 0x7000, 0xa086, 0x0003, 0x00c0, 0xa355, 0x7004,
++	0xac06, 0x00c0, 0xa355, 0x7003, 0x0000, 0x6810, 0xa080, 0x0013,
++	0x200c, 0xc1f4, 0xc1dc, 0x2102, 0x8000, 0x200c, 0xc1f4, 0xc1fc,
++	0xc1bc, 0x2102, 0x2009, 0x0042, 0x0078, 0xa3a7, 0x037e, 0x0d7e,
++	0x0d7e, 0x1078, 0x138b, 0x037f, 0x1040, 0x1332, 0x6837, 0x010d,
++	0x6803, 0x0000, 0x683b, 0x0000, 0x685b, 0x0000, 0x6b5e, 0x6857,
++	0x0045, 0x2c00, 0x6862, 0x6034, 0x6872, 0x2360, 0x6024, 0xc0dd,
++	0x6026, 0x6018, 0xa080, 0x0028, 0x2004, 0xa084, 0x00ff, 0x8007,
++	0x6320, 0x6b4a, 0x6846, 0x684f, 0x0000, 0x6d6a, 0x6e66, 0x686f,
++	0x0001, 0x1078, 0x4a73, 0x2019, 0x0045, 0x6008, 0x2068, 0x1078,
++	0x9dc7, 0x2d00, 0x600a, 0x601f, 0x0006, 0x6003, 0x0007, 0x6017,
++	0x0000, 0x603f, 0x0000, 0x0d7f, 0x037f, 0x0078, 0xa3ae, 0x603f,
++	0x0000, 0x6003, 0x0007, 0x1078, 0x9c1e, 0x0c7f, 0x0d7f, 0x007c,
++	0xa186, 0x0013, 0x00c0, 0xa3ba, 0x6004, 0xa082, 0x0085, 0x2008,
++	0x0079, 0xa3d4, 0xa186, 0x0027, 0x00c0, 0xa3cd, 0x1078, 0x61cd,
++	0x037e, 0x0d7e, 0x6010, 0x2068, 0x2019, 0x0004, 0x1078, 0xa1ca,
++	0x0d7f, 0x037f, 0x1078, 0x62d1, 0x007c, 0xa186, 0x0014, 0x0040,
++	0xa3be, 0x1078, 0x7773, 0x007c, 0xa3dd, 0xa3db, 0xa3db, 0xa3db,
++	0xa3db, 0xa3db, 0xa3dd, 0x1078, 0x1332, 0x1078, 0x61cd, 0x6003,
++	0x000c, 0x1078, 0x62d1, 0x007c, 0xa182, 0x008c, 0x00c8, 0xa3ee,
++	0xa182, 0x0085, 0x0048, 0xa3ee, 0x0079, 0xa3f1, 0x1078, 0x7773,
++	0x007c, 0xa3f8, 0xa3f8, 0xa3f8, 0xa3f8, 0xa3fa, 0xa419, 0xa3f8,
++	0x1078, 0x1332, 0x0d7e, 0x2c68, 0x1078, 0x76c7, 0x0040, 0xa414,
++	0x6003, 0x0001, 0x6007, 0x001e, 0x2009, 0xab8e, 0x210c, 0x6136,
++	0x2009, 0xab8f, 0x210c, 0x613a, 0x600b, 0xffff, 0x6918, 0x611a,
++	0x601f, 0x0004, 0x1078, 0x5d8a, 0x2d60, 0x1078, 0x772d, 0x0d7f,
++	0x007c, 0x1078, 0x772d, 0x007c, 0x0e7e, 0x6018, 0x2070, 0x7000,
++	0xd0ec, 0x0e7f, 0x007c, 0x6010, 0xa08c, 0xf000, 0x0040, 0xa471,
++	0xa080, 0x0013, 0x200c, 0xd1ec, 0x0040, 0xa471, 0x2001, 0xa672,
++	0x2004, 0xd0ec, 0x0040, 0xa471, 0x6003, 0x0002, 0x6024, 0xc0e5,
++	0x6026, 0xd1ac, 0x0040, 0xa44f, 0x0f7e, 0x2c78, 0x1078, 0x495f,
++	0x0f7f, 0x0040, 0xa44f, 0x2001, 0xa8a4, 0x2004, 0x603e, 0x2009,
++	0xa672, 0x210c, 0xd1f4, 0x00c0, 0xa46f, 0x0078, 0xa461, 0x2009,
++	0xa672, 0x210c, 0xd1f4, 0x0040, 0xa45b, 0x6024, 0xc0e4, 0x6026,
++	0xa006, 0x0078, 0xa471, 0x2001, 0xa8a4, 0x200c, 0x8103, 0xa100,
++	0x603e, 0x6018, 0xa088, 0x002b, 0x2104, 0xa005, 0x0040, 0xa46c,
++	0xa088, 0x0003, 0x0078, 0xa464, 0x2c0a, 0x600f, 0x0000, 0xa085,
++	0x0001, 0x007c, 0x017e, 0x0c7e, 0x0e7e, 0x6120, 0xa2f0, 0x002b,
++	0x2e04, 0x2060, 0x8cff, 0x0040, 0xa491, 0x84ff, 0x00c0, 0xa484,
++	0x6020, 0xa106, 0x00c0, 0xa48c, 0x600c, 0x2072, 0x1078, 0x5bc1,
++	0x1078, 0x772d, 0x0078, 0xa48e, 0xacf0, 0x0003, 0x2e64, 0x0078,
++	0xa47a, 0x0e7f, 0x0c7f, 0x017f, 0x007c, 0x0d7e, 0x6018, 0xa0e8,
++	0x002b, 0x2d04, 0xa005, 0x0040, 0xa4a7, 0xac06, 0x0040, 0xa4a5,
++	0x2d04, 0xa0e8, 0x0003, 0x0078, 0xa499, 0x600c, 0x206a, 0x0d7f,
++	0x007c, 0x027e, 0x037e, 0x157e, 0x2011, 0xa626, 0x2204, 0xa084,
++	0x00ff, 0x2019, 0xab8e, 0x2334, 0xa636, 0x00c0, 0xa4d5, 0x8318,
++	0x2334, 0x2204, 0xa084, 0xff00, 0xa636, 0x00c0, 0xa4d5, 0x2011,
++	0xab90, 0x6018, 0xa098, 0x000a, 0x20a9, 0x0004, 0x1078, 0x80de,
++	0x00c0, 0xa4d5, 0x2011, 0xab94, 0x6018, 0xa098, 0x0006, 0x20a9,
++	0x0004, 0x1078, 0x80de, 0x00c0, 0xa4d5, 0x157f, 0x037f, 0x027f,
++	0x007c, 0x0e7e, 0x2071, 0xa600, 0x1078, 0x42b8, 0x1078, 0x2677,
++	0x0e7f, 0x007c, 0x0e7e, 0x6018, 0x2070, 0x7000, 0xd0fc, 0x0040,
++	0xa4eb, 0x1078, 0xa4ed, 0x0e7f, 0x007c, 0x6850, 0xc0e5, 0x6852,
++	0x007c, 0x0e7e, 0x0c7e, 0x077e, 0x067e, 0x057e, 0x047e, 0x027e,
++	0x017e, 0x127e, 0x2091, 0x8000, 0x2029, 0xa8ba, 0x252c, 0x2021,
++	0xa8c0, 0x2424, 0x2061, 0xad00, 0x2071, 0xa600, 0x7648, 0x7064,
++	0xa606, 0x0040, 0xa545, 0x671c, 0xa786, 0x0001, 0x0040, 0xa514,
++	0xa786, 0x0008, 0x00c0, 0xa53b, 0x2500, 0xac06, 0x0040, 0xa53b,
++	0x2400, 0xac06, 0x0040, 0xa53b, 0x1078, 0xa242, 0x0040, 0xa53b,
++	0x1078, 0xa256, 0x00c0, 0xa53b, 0x6000, 0xa086, 0x0004, 0x00c0,
++	0xa52d, 0x017e, 0x1078, 0x1757, 0x017f, 0x1078, 0x8eec, 0x00c0,
++	0xa533, 0x1078, 0x28a6, 0x1078, 0x8f00, 0x00c0, 0xa539, 0x1078,
++	0x7c83, 0x1078, 0x8ec6, 0xace0, 0x0010, 0x2001, 0xa616, 0x2004,
++	0xac02, 0x00c8, 0xa545, 0x0078, 0xa504, 0x127f, 0x017f, 0x027f,
++	0x047f, 0x057f, 0x067f, 0x077f, 0x0c7f, 0x0e7f, 0x007c, 0x127e,
++	0x007e, 0x0e7e, 0x017e, 0x2091, 0x8000, 0x2071, 0xa640, 0xd5a4,
++	0x0040, 0xa55d, 0x7034, 0x8000, 0x7036, 0xd5b4, 0x0040, 0xa563,
++	0x7030, 0x8000, 0x7032, 0xd5ac, 0x0040, 0xa579, 0x2500, 0xa084,
++	0x0007, 0xa08e, 0x0003, 0x0040, 0xa579, 0xa08e, 0x0004, 0x0040,
++	0xa579, 0xa08e, 0x0005, 0x0040, 0xa579, 0x2071, 0xa64a, 0x1078,
++	0xa5ba, 0x017f, 0x0e7f, 0x007f, 0x127f, 0x007c, 0x127e, 0x007e,
++	0x0e7e, 0x017e, 0x2091, 0x8000, 0x2071, 0xa640, 0xd5a4, 0x0040,
++	0xa58c, 0x7034, 0x8000, 0x7036, 0xd5b4, 0x0040, 0xa592, 0x7030,
++	0x8000, 0x7032, 0xd5ac, 0x0040, 0xa5a8, 0x2500, 0xa084, 0x0007,
++	0xa08e, 0x0003, 0x0040, 0xa5a8, 0xa08e, 0x0004, 0x0040, 0xa5a8,
++	0xa08e, 0x0005, 0x0040, 0xa5a8, 0x2071, 0xa64a, 0x1078, 0xa5ba,
++	0x017f, 0x0e7f, 0x007f, 0x127f, 0x007c, 0x127e, 0x007e, 0x0e7e,
++	0x2091, 0x8000, 0x2071, 0xa642, 0x1078, 0xa5ba, 0x0e7f, 0x007f,
++	0x127f, 0x007c, 0x2e04, 0x8000, 0x2072, 0x00c8, 0xa5c3, 0x8e70,
++	0x2e04, 0x8000, 0x2072, 0x007c, 0x0e7e, 0x2071, 0xa640, 0x1078,
++	0xa5ba, 0x0e7f, 0x007c, 0x0e7e, 0x2071, 0xa644, 0x1078, 0xa5ba,
++	0x0e7f, 0x007c, 0x127e, 0x007e, 0x0e7e, 0x2091, 0x8000, 0x2071,
++	0xa640, 0x7044, 0x8000, 0x7046, 0x0e7f, 0x007f, 0x127f, 0x007c,
++	0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080,
++	0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000, 0x8000,
++	0xa50c
++};
++#ifdef UNIQUE_FW_NAME
++unsigned short fw2100tp_length01 = 0x95f1;
++#else
++unsigned short risc_code_length01 = 0x95f1;
++#endif
++
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/ql2200ip_fw.c	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,5884 @@
++/******************************************************************************
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ *************************************************************************/
++
++/************************************************************************
++ *									*
++ * 	      -- ISP2200 Initiator/Target Firmware ---              	*
++ *      IP and SCSI, Fabric (Public Loop), Point-point, and      	*
++ *             expanded LUN addressing for FCTAPE       		*
++ *									*
++ ************************************************************************/
++
++/*
++ *	Firmware Version 2.02.05 (13:47 Apr 25, 2003)
++ */
++
++#ifdef UNIQUE_FW_NAME
++unsigned short fw2200ip_version = 2*1024+2;
++#else
++unsigned short risc_code_version = 2*1024+2;
++#endif
++
++#ifdef UNIQUE_FW_NAME
++unsigned char fw2200ip_version_str[] = {2,2,5};
++#else
++unsigned char firmware_version[] = {2,2,5};
++#endif
++
++#ifdef UNIQUE_FW_NAME
++#define fw2200ip_VERSION_STRING "2.02.05"
++#else
++#define FW_VERSION_STRING "2.02.05"
++#endif
++
++#ifdef UNIQUE_FW_NAME
++unsigned short fw2200ip_addr01 = 0x1000 ;
++#else
++unsigned short risc_code_addr01 = 0x1000 ;
++#endif
++
++#ifdef UNIQUE_FW_NAME
++unsigned short fw2200ip_code01[] = { 
++#else
++unsigned short risc_code01[] = { 
++#endif
++	0x0470, 0x0000, 0x0000, 0xb5c6, 0x0000, 0x0002, 0x0002, 0x0005,
++	0x0037, 0x2043, 0x4f50, 0x5952, 0x4947, 0x4854, 0x2032, 0x3030,
++	0x3120, 0x514c, 0x4f47, 0x4943, 0x2043, 0x4f52, 0x504f, 0x5241,
++	0x5449, 0x4f4e, 0x2049, 0x5350, 0x3232, 0x3030, 0x2046, 0x6972,
++	0x6d77, 0x6172, 0x6520, 0x2056, 0x6572, 0x7369, 0x6f6e, 0x2030,
++	0x322e, 0x3032, 0x2e30, 0x3520, 0x2020, 0x2020, 0x2400, 0x20c1,
++	0x0005, 0x2001, 0x017f, 0x2003, 0x0000, 0x20c9, 0xcbff, 0x2091,
++	0x2000, 0x2059, 0x0000, 0x2b78, 0x7823, 0x0004, 0x2089, 0x2b14,
++	0x2051, 0xc600, 0x2a70, 0x2029, 0xfe00, 0x2031, 0xffff, 0x2039,
++	0xfde9, 0x2021, 0x0200, 0x0804, 0x146c, 0x20a1, 0xc5c6, 0xa00e,
++	0x20a9, 0x083a, 0x41a4, 0x3400, 0x7562, 0x7666, 0x775e, 0x746a,
++	0x746e, 0x20a1, 0xce00, 0x7164, 0x810d, 0x810d, 0x810d, 0x810d,
++	0xa18c, 0x000f, 0x2001, 0x000c, 0xa112, 0xa00e, 0x21a8, 0x41a4,
++	0x3400, 0x8211, 0x1dd8, 0x7164, 0x3400, 0xa102, 0x0120, 0x0218,
++	0x20a8, 0xa00e, 0x41a4, 0x3800, 0xd08c, 0x01d8, 0x2009, 0xc600,
++	0x810d, 0x810d, 0x810d, 0x810d, 0xa18c, 0x000f, 0x2001, 0x0001,
++	0xa112, 0x20a1, 0x1000, 0xa00e, 0x21a8, 0x41a4, 0x8211, 0x1de0,
++	0x2009, 0xc600, 0x3400, 0xa102, 0x0120, 0x0218, 0x20a8, 0xa00e,
++	0x41a4, 0x080c, 0x1415, 0x080c, 0x163c, 0x080c, 0x17de, 0x080c,
++	0x2061, 0x080c, 0x4f3b, 0x080c, 0x9585, 0x080c, 0x15bf, 0x080c,
++	0x306e, 0x080c, 0x61dd, 0x080c, 0x5743, 0x080c, 0x7147, 0x080c,
++	0x6edf, 0x080c, 0x265b, 0x080c, 0x7860, 0x080c, 0x68c0, 0x080c,
++	0x2515, 0x080c, 0x2629, 0x2091, 0x3009, 0x7823, 0x0000, 0x1004,
++	0x10c7, 0x7820, 0xa086, 0x0002, 0x1150, 0x7823, 0x4000, 0x0e04,
++	0x10bf, 0x781b, 0x0001, 0x2091, 0x5000, 0x2091, 0x4080, 0x2a70,
++	0x7003, 0x0000, 0x2a70, 0x7000, 0xa08e, 0x0003, 0x1168, 0x080c,
++	0x40b9, 0x080c, 0x3095, 0x080c, 0x622b, 0x080c, 0x5943, 0x080c,
++	0x7184, 0x080c, 0x6f0a, 0x0c70, 0x000b, 0x0c88, 0x10e8, 0x10e9,
++	0x1214, 0x10e6, 0x12e1, 0x1412, 0x1413, 0x1414, 0x080c, 0x1519,
++	0x0005, 0x0126, 0x00f6, 0x2091, 0x8000, 0x7000, 0xa086, 0x0001,
++	0x1904, 0x11f1, 0x080c, 0x158c, 0x080c, 0x5f22, 0x0150, 0x080c,
++	0x5f48, 0x15c0, 0x2079, 0x0100, 0x7828, 0xa085, 0x1800, 0x782a,
++	0x0488, 0x080c, 0x5e5a, 0x7000, 0xa086, 0x0001, 0x1904, 0x11f1,
++	0x708c, 0xa086, 0x0028, 0x1904, 0x11f1, 0x2001, 0x0161, 0x2003,
++	0x0001, 0x2079, 0x0100, 0x7827, 0xffff, 0x7a28, 0xa295, 0x1e2f,
++	0x7a2a, 0x2011, 0x5df5, 0x080c, 0x6fad, 0x2011, 0x5de8, 0x080c,
++	0x7070, 0x2011, 0x5e37, 0x080c, 0x6fad, 0x2011, 0x4e18, 0x080c,
++	0x6fad, 0x2011, 0x8030, 0x2019, 0x0000, 0x708b, 0x0000, 0x080c,
++	0x1eae, 0x00e8, 0x080c, 0x47cb, 0x2079, 0x0100, 0x7844, 0xa005,
++	0x1904, 0x11f1, 0x2011, 0x4e18, 0x080c, 0x6fad, 0x2011, 0x5e37,
++	0x080c, 0x6fad, 0x080c, 0x1eae, 0x2001, 0xc8d4, 0x2004, 0x780e,
++	0x7840, 0xa084, 0xfffb, 0x7842, 0x2011, 0x8010, 0x73cc, 0x080c,
++	0x407d, 0x723c, 0xc284, 0x723e, 0x2001, 0xc60c, 0x200c, 0xc1ac,
++	0x2102, 0x080c, 0x8dca, 0x2011, 0x0004, 0x080c, 0xac97, 0x080c,
++	0x55e1, 0x080c, 0x5f22, 0x0158, 0x080c, 0x4f24, 0x0140, 0x708b,
++	0x0001, 0x70c7, 0x0000, 0x080c, 0x4968, 0x0804, 0x11f1, 0x080c,
++	0x570b, 0x0120, 0x7a0c, 0xc2b4, 0x7a0e, 0x0060, 0x7073, 0x0000,
++	0x080c, 0xb03f, 0x70d4, 0xd09c, 0x1128, 0x70a0, 0xa005, 0x0110,
++	0x080c, 0x4f02, 0x70df, 0x0000, 0x70db, 0x0000, 0x72d4, 0x080c,
++	0x5f22, 0x1178, 0x2011, 0x0000, 0x0016, 0x080c, 0x2a95, 0x2019,
++	0xc8d6, 0x211a, 0x001e, 0x7053, 0xffff, 0x7057, 0x00ef, 0x7077,
++	0x0000, 0x2079, 0xc652, 0x7804, 0xd0ac, 0x0108, 0xc295, 0x72d6,
++	0x080c, 0x5f22, 0x0118, 0xa296, 0x0004, 0x0548, 0x2011, 0x0001,
++	0x080c, 0xac97, 0x709b, 0x0000, 0x709f, 0xffff, 0x7003, 0x0002,
++	0x2079, 0x0100, 0x7827, 0x0003, 0x7828, 0xa085, 0x0003, 0x782a,
++	0x00fe, 0x080c, 0x2c62, 0x2011, 0x0005, 0x080c, 0x8f0e, 0x080c,
++	0x7e94, 0x080c, 0x5f22, 0x0148, 0x00c6, 0x2061, 0x0100, 0x0016,
++	0x080c, 0x2a95, 0x61e2, 0x001e, 0x00ce, 0x012e, 0x0420, 0x709b,
++	0x0000, 0x709f, 0xffff, 0x7003, 0x0002, 0x00f6, 0x2079, 0x0100,
++	0x7827, 0x0003, 0x7828, 0xa085, 0x0003, 0x782a, 0x00fe, 0x2011,
++	0x0005, 0x080c, 0x8f0e, 0x080c, 0x7e94, 0x080c, 0x5f22, 0x0148,
++	0x00c6, 0x2061, 0x0100, 0x0016, 0x080c, 0x2a95, 0x61e2, 0x001e,
++	0x00ce, 0x00fe, 0x012e, 0x0005, 0x00c6, 0x080c, 0x5f22, 0x1118,
++	0x20a9, 0x0100, 0x0010, 0x20a9, 0x0082, 0x080c, 0x5f22, 0x1118,
++	0x2009, 0x0000, 0x0010, 0x2009, 0x007e, 0x080c, 0x2f41, 0x8108,
++	0x1f04, 0x1205, 0x00ce, 0x7073, 0x0000, 0x7074, 0xa084, 0x00ff,
++	0x7076, 0x70a3, 0x0000, 0x0005, 0x0126, 0x2091, 0x8000, 0x7000,
++	0xa086, 0x0002, 0x1904, 0x12df, 0x709c, 0xa086, 0xffff, 0x0130,
++	0x080c, 0x2c62, 0x080c, 0x7e94, 0x0804, 0x12df, 0x70d4, 0xd0ac,
++	0x1110, 0xd09c, 0x0540, 0xd084, 0x0530, 0x0006, 0x0016, 0x2001,
++	0x0103, 0x2009, 0xc8d4, 0x210c, 0x2102, 0x001e, 0x000e, 0xd08c,
++	0x01d0, 0x70d8, 0xa086, 0xffff, 0x0190, 0x080c, 0x2dc1, 0x080c,
++	0x7e94, 0x70d4, 0xd094, 0x1904, 0x12df, 0x2011, 0x0001, 0x2019,
++	0x0000, 0x080c, 0x2df9, 0x080c, 0x7e94, 0x0804, 0x12df, 0x70dc,
++	0xa005, 0x1904, 0x12df, 0x7098, 0xa005, 0x1904, 0x12df, 0x70d4,
++	0xd0a4, 0x0118, 0xd0b4, 0x0904, 0x12df, 0x080c, 0x570b, 0x1904,
++	0x12df, 0x2001, 0xc653, 0x2004, 0xd0ac, 0x01c8, 0x0156, 0x00c6,
++	0x20a9, 0x007f, 0x2009, 0x0000, 0x0016, 0x080c, 0x533d, 0x1118,
++	0x6000, 0xd0ec, 0x1138, 0x001e, 0x8108, 0x1f04, 0x126c, 0x00ce,
++	0x015e, 0x0028, 0x001e, 0x00ce, 0x015e, 0x0804, 0x12df, 0x0006,
++	0x0016, 0x2001, 0x0103, 0x2009, 0xc8d4, 0x210c, 0x2102, 0x001e,
++	0x000e, 0x71a8, 0x81ff, 0x11b0, 0xa006, 0x2009, 0x0200, 0x20a9,
++	0x0002, 0x20a1, 0xc925, 0x40a1, 0x2009, 0x0700, 0x20a9, 0x0002,
++	0x20a1, 0xc915, 0x40a1, 0x7070, 0x8007, 0x7174, 0x810f, 0x20a9,
++	0x0002, 0x40a1, 0x20a1, 0xc919, 0x2009, 0x0000, 0x080c, 0x14ff,
++	0x2001, 0x0000, 0x810f, 0x20a9, 0x0002, 0x40a1, 0x7030, 0xc08c,
++	0x7032, 0x7003, 0x0003, 0x709f, 0xffff, 0x080c, 0x1585, 0xa006,
++	0x080c, 0x296d, 0x080c, 0x40ef, 0x00f6, 0x2079, 0x0100, 0x080c,
++	0x5f48, 0x0150, 0x080c, 0x5f22, 0x7828, 0x0118, 0xa084, 0xe1ff,
++	0x0010, 0xa084, 0xffdf, 0x782a, 0x00fe, 0x2001, 0xc928, 0x2004,
++	0xa086, 0x0005, 0x1120, 0x2011, 0x0000, 0x080c, 0x8f0e, 0x2011,
++	0x0000, 0x080c, 0x8f18, 0x080c, 0x7e94, 0x080c, 0x7f6e, 0x012e,
++	0x0005, 0x0016, 0x0046, 0x00f6, 0x0126, 0x2091, 0x8000, 0x2079,
++	0x0100, 0x2009, 0xc634, 0x2104, 0xa005, 0x1110, 0x080c, 0x2ac1,
++	0x2009, 0x00f7, 0x080c, 0x4eeb, 0x7940, 0xa18c, 0x0010, 0x7942,
++	0x7924, 0xd1b4, 0x0110, 0x7827, 0x0040, 0xd19c, 0x0110, 0x7827,
++	0x0008, 0x0006, 0x0036, 0x0156, 0x7954, 0xd1ac, 0x1904, 0x134f,
++	0x080c, 0x5f34, 0x0158, 0x080c, 0x5f48, 0x1128, 0x2001, 0xc8e5,
++	0x2003, 0x0000, 0x0070, 0x080c, 0x5f2a, 0x0dc0, 0x2001, 0xc8e5,
++	0x2003, 0xaaaa, 0x2001, 0xc8e6, 0x2003, 0x0001, 0x080c, 0x5e5a,
++	0x0058, 0x080c, 0x5f22, 0x0140, 0x2009, 0x00f8, 0x080c, 0x4eeb,
++	0x7843, 0x0090, 0x7843, 0x0010, 0x20a9, 0x09c4, 0x7820, 0xd09c,
++	0x1138, 0x080c, 0x5f22, 0x0138, 0x7824, 0xd0ac, 0x1904, 0x13f9,
++	0x1f04, 0x132e, 0x0070, 0x7824, 0x080c, 0x5f3e, 0x0118, 0xd0ac,
++	0x1904, 0x13f9, 0xa084, 0x1800, 0x0d98, 0x7003, 0x0001, 0x0804,
++	0x13f9, 0x2001, 0x0001, 0x080c, 0x296d, 0x0804, 0x1408, 0x7850,
++	0xa084, 0x0180, 0x7852, 0x782f, 0x0020, 0x20a9, 0x0046, 0x1d04,
++	0x1357, 0x080c, 0x7058, 0x1f04, 0x1357, 0x7850, 0xa084, 0x0180,
++	0xa085, 0x0400, 0x7852, 0x782f, 0x0000, 0x080c, 0x5f34, 0x0158,
++	0x080c, 0x5f48, 0x1128, 0x2001, 0xc8e5, 0x2003, 0x0000, 0x0070,
++	0x080c, 0x5f2a, 0x0dc0, 0x2001, 0xc8e5, 0x2003, 0xaaaa, 0x2001,
++	0xc8e6, 0x2003, 0x0001, 0x080c, 0x5e5a, 0x0020, 0x2009, 0x00f8,
++	0x080c, 0x4eeb, 0x20a9, 0x000e, 0xe000, 0x1f04, 0x1384, 0x7850,
++	0xa084, 0x0180, 0xa085, 0x1400, 0x7852, 0x080c, 0x5f22, 0x0120,
++	0x7843, 0x0090, 0x7843, 0x0010, 0x2021, 0xe678, 0x2019, 0xea60,
++	0x7820, 0xd09c, 0x1558, 0x080c, 0x5f22, 0x05d8, 0x7824, 0xd0ac,
++	0x1904, 0x13f9, 0x080c, 0x5f48, 0x1508, 0x0046, 0x2021, 0x0190,
++	0x8421, 0x1df0, 0x004e, 0x8421, 0x11c8, 0x7827, 0x0048, 0x20a9,
++	0x01f4, 0x1d04, 0x13b1, 0x080c, 0x7058, 0x1f04, 0x13b1, 0x7824,
++	0xa084, 0x0068, 0x15c8, 0x2001, 0xc8e5, 0x2003, 0xaaaa, 0x2001,
++	0xc8e6, 0x2003, 0x0001, 0x7003, 0x0001, 0x0498, 0x1d04, 0x13ca,
++	0x080c, 0x7058, 0x8319, 0x1960, 0x2009, 0xc634, 0x2104, 0x8000,
++	0x200a, 0xa084, 0xfff0, 0x0120, 0x200b, 0x0000, 0x080c, 0x2ac1,
++	0x00d8, 0x080c, 0x5f34, 0x1140, 0xa4a2, 0x0064, 0x1128, 0x080c,
++	0x5ef9, 0x7003, 0x0001, 0x00a8, 0x7827, 0x1800, 0xe000, 0xe000,
++	0x7824, 0x080c, 0x5f3e, 0x0110, 0xd0ac, 0x1158, 0xa084, 0x1800,
++	0x09a8, 0x7003, 0x0001, 0x0028, 0x2001, 0x0001, 0x080c, 0x296d,
++	0x0048, 0x2001, 0xc634, 0x2003, 0x0000, 0x7827, 0x0048, 0x7828,
++	0xc09d, 0x782a, 0x7850, 0xa084, 0x0180, 0xa085, 0x0400, 0x7852,
++	0x015e, 0x003e, 0x000e, 0x080c, 0x155c, 0x012e, 0x00fe, 0x004e,
++	0x001e, 0x0005, 0x0005, 0x0005, 0x0005, 0x2a70, 0x2061, 0xc908,
++	0x2063, 0x0002, 0x6007, 0x0002, 0x600b, 0x0005, 0x600f, 0x0037,
++	0x2001, 0xc8e5, 0x2003, 0x0000, 0x708b, 0x0000, 0x2009, 0x0100,
++	0x2104, 0xa082, 0x0002, 0x0218, 0x7053, 0xffff, 0x0010, 0x7053,
++	0x0000, 0x705b, 0xffff, 0x7073, 0x0000, 0x7077, 0x0000, 0x080c,
++	0xb03f, 0x2061, 0xc8d5, 0x6003, 0x0909, 0x6007, 0x0000, 0x600b,
++	0x8800, 0x600f, 0x0200, 0x6013, 0x00ff, 0x6017, 0x001f, 0x601b,
++	0x0000, 0x601f, 0x07d0, 0x2061, 0xc8dd, 0x6003, 0x8000, 0x6007,
++	0x0000, 0x600b, 0x0000, 0x600f, 0x0200, 0x6013, 0x00ff, 0x6017,
++	0x0000, 0x601b, 0x0001, 0x601f, 0x0000, 0x2061, 0xc900, 0x6003,
++	0x514c, 0x6007, 0x4f47, 0x600b, 0x4943, 0x600f, 0x2020, 0x2001,
++	0xc628, 0x2003, 0x0000, 0x0005, 0x04a0, 0x2011, 0x0000, 0x81ff,
++	0x0570, 0xa186, 0x0001, 0x1148, 0x2031, 0x8fff, 0x2039, 0xe601,
++	0x2021, 0x0100, 0x2029, 0xe600, 0x00e8, 0xa186, 0x0002, 0x1118,
++	0x2011, 0x0000, 0x00b8, 0xa186, 0x0005, 0x1118, 0x2011, 0x0001,
++	0x0088, 0xa186, 0x0009, 0x1118, 0x2011, 0x0002, 0x0058, 0xa186,
++	0x000a, 0x1118, 0x2011, 0x0002, 0x0028, 0xa186, 0x0055, 0x1110,
++	0x2011, 0x0003, 0x3800, 0xa084, 0xfffc, 0xa205, 0x20c0, 0x0804,
++	0x104d, 0xa00e, 0x2011, 0x0003, 0x2019, 0x14a8, 0x0804, 0x14f9,
++	0x2019, 0xaaaa, 0x2061, 0xffff, 0x2c14, 0x2362, 0xe000, 0xe000,
++	0x2c04, 0xa306, 0x2262, 0x1110, 0xc1b5, 0xc1a5, 0x2011, 0x0000,
++	0x2019, 0x14bb, 0x04f0, 0x2019, 0xaaaa, 0x2061, 0xffff, 0x2c14,
++	0x2362, 0xe000, 0xe000, 0x2c1c, 0x2061, 0x7fff, 0xe000, 0xe000,
++	0x2c04, 0x2061, 0xffff, 0x2262, 0xa306, 0x0110, 0xc18d, 0x0008,
++	0xc185, 0x2011, 0x0002, 0x2019, 0x14d6, 0x0418, 0x2061, 0xffff,
++	0x2019, 0xaaaa, 0x2c14, 0x2362, 0xe000, 0xe000, 0x2c04, 0x2262,
++	0xa306, 0x1180, 0x2c14, 0x2362, 0xe000, 0xe000, 0x2c1c, 0x2061,
++	0x7fff, 0x2c04, 0x2061, 0xffff, 0x2262, 0xa306, 0x1110, 0xc195,
++	0x0008, 0xc19d, 0x2011, 0x0001, 0x2019, 0x14f7, 0x0010, 0x0804,
++	0x146d, 0x3800, 0xa084, 0xfffc, 0xa205, 0x20c0, 0x0837, 0x2011,
++	0x0000, 0x080c, 0x533d, 0x1178, 0x6004, 0xa0c4, 0x00ff, 0xa8c6,
++	0x0006, 0x0128, 0xa0c4, 0xff00, 0xa8c6, 0x0600, 0x1120, 0xa186,
++	0x0080, 0x0108, 0x8210, 0x8108, 0xa186, 0x0100, 0x1d50, 0x2208,
++	0x0005, 0x2091, 0x8000, 0x0e04, 0x151b, 0x0006, 0x0016, 0x2079,
++	0x0000, 0x7818, 0xd084, 0x1de8, 0x001e, 0x792e, 0x000e, 0x782a,
++	0x000e, 0x7826, 0x3900, 0x783a, 0x7823, 0x8002, 0x781b, 0x0001,
++	0x2091, 0x5000, 0x0126, 0x0156, 0x0146, 0x20a9, 0x0010, 0x20a1,
++	0xca54, 0x2091, 0x2000, 0x40a1, 0x20a9, 0x0010, 0x2091, 0x2200,
++	0x40a1, 0x20a9, 0x0010, 0x2091, 0x2400, 0x40a1, 0x20a9, 0x0010,
++	0x2091, 0x2600, 0x40a1, 0x20a9, 0x0010, 0x2091, 0x2800, 0x40a1,
++	0x014e, 0x015e, 0x012e, 0x2079, 0xc600, 0x7803, 0x0005, 0x2091,
++	0x4080, 0x04c9, 0x0cf8, 0x0005, 0x0006, 0x080c, 0x15a7, 0x1518,
++	0x00f6, 0x2079, 0xc624, 0x2f04, 0x8000, 0x207a, 0xa082, 0x000f,
++	0x0258, 0xa006, 0x207a, 0x2079, 0xc626, 0x2f04, 0xa084, 0x0001,
++	0xa086, 0x0001, 0x207a, 0x0070, 0x2079, 0xc626, 0x2f7c, 0x8fff,
++	0x1128, 0x2001, 0x0c03, 0x2003, 0x0040, 0x0020, 0x2001, 0x0c03,
++	0x2003, 0x00c0, 0x00fe, 0x000e, 0x0005, 0x0409, 0x1120, 0x2001,
++	0x0c03, 0x2003, 0x0080, 0x0005, 0x00d1, 0x1120, 0x2001, 0x0c03,
++	0x2003, 0x0040, 0x0005, 0x0006, 0x0091, 0x1178, 0x2001, 0x0c03,
++	0x2003, 0x0040, 0x2009, 0x0fff, 0x00a1, 0x2001, 0x0c03, 0x2003,
++	0x0080, 0x2009, 0x0fff, 0x0069, 0x0c88, 0x000e, 0x0005, 0x00c6,
++	0x2061, 0x0c00, 0x2c04, 0xa084, 0x00ff, 0xa086, 0x00aa, 0x00ce,
++	0x0005, 0x0156, 0x0126, 0xa18c, 0x0fff, 0x21a8, 0x1d04, 0x15b6,
++	0x2091, 0x6000, 0x1f04, 0x15b6, 0x012e, 0x015e, 0x0005, 0x2071,
++	0xc600, 0x7160, 0x712e, 0x2021, 0x0001, 0xa190, 0x0030, 0xa298,
++	0x0030, 0x0240, 0x7064, 0xa302, 0x1228, 0x220a, 0x2208, 0x2310,
++	0x8420, 0x0ca8, 0x3800, 0xd08c, 0x0148, 0x7064, 0xa086, 0xc600,
++	0x0128, 0x7067, 0xc600, 0x2011, 0x1000, 0x0c48, 0x200b, 0x0000,
++	0x74b2, 0x74b6, 0x70eb, 0x0010, 0x0005, 0x00e6, 0x0126, 0x2091,
++	0x8000, 0x2071, 0xc600, 0x70b4, 0x0016, 0x2008, 0x70e8, 0xa16a,
++	0x2100, 0x001e, 0x0268, 0x8001, 0x70b6, 0x702c, 0x2068, 0x2d04,
++	0x702e, 0x206b, 0x0000, 0x6807, 0x0000, 0x012e, 0x00ee, 0x0005,
++	0xa06e, 0x0cd8, 0x00e6, 0x2071, 0xc600, 0x0126, 0x2091, 0x8000,
++	0x70b4, 0x8001, 0x0260, 0x70b6, 0x702c, 0x2068, 0x2d04, 0x702e,
++	0x206b, 0x0000, 0x6807, 0x0000, 0x012e, 0x00ee, 0x0005, 0xa06e,
++	0x0cd8, 0x00e6, 0x0126, 0x2091, 0x8000, 0x2071, 0xc600, 0x702c,
++	0x206a, 0x2d00, 0x702e, 0x70b4, 0x8000, 0x70b6, 0x012e, 0x00ee,
++	0x0005, 0x8dff, 0x0138, 0x6804, 0x6807, 0x0000, 0x0006, 0x0c49,
++	0x00de, 0x0cb8, 0x0005, 0x00e6, 0x2071, 0xc600, 0x70b4, 0xa08a,
++	0x0010, 0xa00d, 0x00ee, 0x0005, 0x00e6, 0x2071, 0xc959, 0x7007,
++	0x0000, 0x701b, 0x0000, 0x701f, 0x0000, 0x2071, 0x0000, 0x7010,
++	0xa085, 0x8004, 0x7012, 0x00ee, 0x0005, 0x0126, 0x2091, 0x8000,
++	0x00e6, 0x2270, 0x700b, 0x0000, 0x2071, 0xc959, 0x7018, 0xa088,
++	0xc962, 0x220a, 0x8000, 0xa084, 0x0007, 0x701a, 0x7004, 0xa005,
++	0x1128, 0x00f6, 0x2079, 0x0010, 0x0089, 0x00fe, 0x00ee, 0x012e,
++	0x0005, 0x00e6, 0x2071, 0xc959, 0x7004, 0xa005, 0x1128, 0x00f6,
++	0x2079, 0x0010, 0x0019, 0x00fe, 0x00ee, 0x0005, 0x7000, 0x0002,
++	0x1680, 0x16e4, 0x1701, 0x1701, 0x23e7, 0x16e4, 0x1701, 0x16e4,
++	0x7018, 0x711c, 0xa106, 0x1118, 0x7007, 0x0000, 0x0005, 0x00d6,
++	0xa180, 0xc962, 0x2004, 0x700a, 0x2068, 0x8108, 0xa18c, 0x0007,
++	0x711e, 0x7803, 0x0026, 0x6824, 0x7832, 0x6828, 0x7836, 0x682c,
++	0x783a, 0x6830, 0x783e, 0x6810, 0x700e, 0x680c, 0x7016, 0x6804,
++	0x00de, 0xd084, 0x0120, 0x7007, 0x0001, 0x0029, 0x0005, 0x7007,
++	0x0002, 0x00b1, 0x0005, 0x0016, 0x0026, 0x710c, 0x2011, 0x0040,
++	0xa182, 0x0040, 0x1210, 0x2110, 0xa006, 0x700e, 0x7212, 0x8203,
++	0x7822, 0x7803, 0x0020, 0x7803, 0x0041, 0x002e, 0x001e, 0x0005,
++	0x0016, 0x0026, 0x0136, 0x0146, 0x0156, 0x7014, 0x2098, 0x20a1,
++	0x0014, 0x7803, 0x0026, 0x710c, 0x2011, 0x0040, 0xa182, 0x0040,
++	0x1210, 0x2110, 0xa006, 0x700e, 0x22a8, 0x53a6, 0x8203, 0x7822,
++	0x7803, 0x0020, 0x3300, 0x7016, 0x7803, 0x0001, 0x015e, 0x014e,
++	0x013e, 0x002e, 0x001e, 0x0005, 0x0136, 0x0146, 0x0156, 0x2099,
++	0xc71a, 0x20a1, 0x0018, 0x20a9, 0x0008, 0x53a3, 0x7803, 0x0020,
++	0x0126, 0x2091, 0x8000, 0x7803, 0x0041, 0x7007, 0x0003, 0x7000,
++	0xc084, 0x7002, 0x700b, 0xc715, 0x012e, 0x015e, 0x014e, 0x013e,
++	0x0005, 0x0136, 0x0146, 0x0156, 0x2001, 0xc749, 0x209c, 0x20a1,
++	0x0014, 0x7803, 0x0026, 0x2001, 0xc74a, 0x20ac, 0x53a6, 0x2099,
++	0xc74b, 0x20a1, 0x0018, 0x20a9, 0x0008, 0x53a3, 0x7803, 0x0020,
++	0x0126, 0x2091, 0x8000, 0x7803, 0x0001, 0x7007, 0x0004, 0x7000,
++	0xc08c, 0x7002, 0x700b, 0xc746, 0x012e, 0x015e, 0x014e, 0x013e,
++	0x0005, 0x0016, 0x00e6, 0x2071, 0xc959, 0x00f6, 0x2079, 0x0010,
++	0x7904, 0x7803, 0x0002, 0xd1fc, 0x0120, 0xa18c, 0x0700, 0x7004,
++	0x0023, 0x00fe, 0x00ee, 0x001e, 0x0005, 0x1676, 0x1745, 0x1773,
++	0x179d, 0x17cd, 0x2404, 0x1744, 0x0cf8, 0xa18c, 0x0700, 0x1528,
++	0x0136, 0x0146, 0x0156, 0x7014, 0x20a0, 0x2099, 0x0014, 0x7803,
++	0x0040, 0x7010, 0x20a8, 0x53a5, 0x3400, 0x7016, 0x015e, 0x014e,
++	0x013e, 0x700c, 0xa005, 0x0570, 0x7830, 0x7832, 0x7834, 0x7836,
++	0x080c, 0x16ab, 0x0005, 0x7008, 0xa080, 0x0002, 0x2003, 0x0100,
++	0x7007, 0x0000, 0x080c, 0x1676, 0x0005, 0x7008, 0xa080, 0x0002,
++	0x2003, 0x0200, 0x0ca8, 0xa18c, 0x0700, 0x1150, 0x700c, 0xa005,
++	0x0188, 0x7830, 0x7832, 0x7834, 0x7836, 0x080c, 0x16c0, 0x0005,
++	0x7008, 0xa080, 0x0002, 0x2003, 0x0200, 0x7007, 0x0000, 0x080c,
++	0x1676, 0x0005, 0x00d6, 0x7008, 0x2068, 0x7830, 0x6826, 0x7834,
++	0x682a, 0x7838, 0x682e, 0x783c, 0x6832, 0x680b, 0x0100, 0x00de,
++	0x7007, 0x0000, 0x080c, 0x1676, 0x0005, 0xa18c, 0x0700, 0x1540,
++	0x0136, 0x0146, 0x0156, 0x2001, 0xc718, 0x2004, 0xa080, 0x000d,
++	0x20a0, 0x2099, 0x0014, 0x7803, 0x0040, 0x20a9, 0x0020, 0x53a5,
++	0x2001, 0xc71a, 0x2004, 0xd0bc, 0x0148, 0x2001, 0xc723, 0x2004,
++	0xa080, 0x000d, 0x20a0, 0x20a9, 0x0020, 0x53a5, 0x015e, 0x014e,
++	0x013e, 0x7007, 0x0000, 0x080c, 0x62c2, 0x080c, 0x1676, 0x0005,
++	0x2011, 0x8003, 0x080c, 0x407d, 0x0cf8, 0xa18c, 0x0700, 0x1148,
++	0x2001, 0xc748, 0x2003, 0x0100, 0x7007, 0x0000, 0x080c, 0x1676,
++	0x0005, 0x2011, 0x8004, 0x080c, 0x407d, 0x0cf8, 0x0126, 0x2091,
++	0x2200, 0x2079, 0x0030, 0x2071, 0xc96a, 0x7003, 0x0000, 0x700f,
++	0xc977, 0x7013, 0xc977, 0x780f, 0x00f6, 0x7803, 0x0004, 0x012e,
++	0x0005, 0x6934, 0xa184, 0x0007, 0x0002, 0x17fd, 0x183e, 0x17fd,
++	0x17fd, 0x1801, 0x1826, 0x180d, 0x1804, 0xa085, 0x0001, 0x0804,
++	0x1858, 0x080c, 0x7684, 0x05d0, 0x684c, 0xd0bc, 0x0db0, 0x6860,
++	0x682e, 0x685c, 0x682a, 0x6858, 0x04c8, 0xa18c, 0x00ff, 0xa186,
++	0x001e, 0x1d58, 0x684c, 0xd0bc, 0x0d40, 0x6860, 0x682e, 0x685c,
++	0x682a, 0x6804, 0x681a, 0xa080, 0x000d, 0x2004, 0xa084, 0x000f,
++	0xa080, 0x23c7, 0x2005, 0x6832, 0x6858, 0x0440, 0xa18c, 0x00ff,
++	0xa186, 0x0015, 0x1990, 0x684c, 0xd0ac, 0x0978, 0x6804, 0x681a,
++	0xa080, 0x000d, 0x2004, 0xa084, 0x000f, 0xa080, 0x23c7, 0x2005,
++	0x6832, 0xa006, 0x682e, 0x682a, 0x6858, 0x0080, 0x684c, 0xd0ac,
++	0x0904, 0x17fd, 0xa006, 0x682e, 0x682a, 0x6858, 0xa18c, 0x000f,
++	0xa188, 0x23c7, 0x210d, 0x6932, 0x2d08, 0x691a, 0x6826, 0x684c,
++	0xc0dd, 0x684e, 0xa006, 0x680a, 0x697c, 0x6912, 0x6980, 0x6916,
++	0x0005, 0x684c, 0xd0ac, 0x090c, 0x1519, 0x6833, 0x23c4, 0x2d08,
++	0x691a, 0x6858, 0x8001, 0x6826, 0x684c, 0xc0dd, 0x684e, 0xa006,
++	0x680a, 0x682e, 0x682a, 0x697c, 0x6912, 0x6980, 0x6916, 0x0005,
++	0x20e1, 0x0007, 0x20e1, 0x2000, 0x2001, 0x020a, 0x2004, 0x82ff,
++	0x01e8, 0xa280, 0x0004, 0x00d6, 0x206c, 0x684c, 0xd0dc, 0x1190,
++	0xa280, 0x0007, 0x2004, 0xa086, 0x000a, 0x1110, 0x0891, 0x0010,
++	0x080c, 0x17f1, 0x0138, 0x00de, 0xa280, 0x0000, 0x2003, 0x0002,
++	0xa016, 0x0020, 0x6808, 0x8000, 0x680a, 0x00de, 0x0126, 0x0046,
++	0x0036, 0x0026, 0x2091, 0x2200, 0x002e, 0x003e, 0x004e, 0x7000,
++	0xa005, 0x0178, 0x710c, 0x220a, 0x8108, 0x230a, 0x8108, 0x240a,
++	0x8108, 0xa182, 0xc992, 0x0210, 0x2009, 0xc977, 0x710e, 0x012e,
++	0x0005, 0x7206, 0x2001, 0x18af, 0x0006, 0x2260, 0x0804, 0x19d3,
++	0x0126, 0x0026, 0x0036, 0x00c6, 0x0006, 0x2091, 0x2200, 0x000e,
++	0x004e, 0x003e, 0x002e, 0x00d6, 0x00c6, 0x2460, 0x6110, 0x2168,
++	0x6a62, 0x6b5e, 0xa005, 0x0904, 0x1910, 0x6808, 0xa005, 0x0904,
++	0x1947, 0x7000, 0xa005, 0x1108, 0x0488, 0x700c, 0x7110, 0xa106,
++	0x1904, 0x194f, 0x7004, 0xa406, 0x1548, 0x2001, 0x0005, 0x2004,
++	0xd08c, 0x0168, 0x0046, 0x080c, 0x1b83, 0x004e, 0x2460, 0x6010,
++	0xa080, 0x0002, 0x2004, 0xa005, 0x0904, 0x1947, 0x0c10, 0x2001,
++	0x0207, 0x2004, 0xd09c, 0x1d48, 0x7804, 0xa084, 0x6000, 0x0120,
++	0xa086, 0x6000, 0x0108, 0x0c08, 0x7818, 0x6812, 0x781c, 0x6816,
++	0x7803, 0x0004, 0x7003, 0x0000, 0x7004, 0x2060, 0x6100, 0xa18e,
++	0x0004, 0x1904, 0x194f, 0x2009, 0x0048, 0x080c, 0x9613, 0x04f8,
++	0x6808, 0xa005, 0x05a0, 0x7000, 0xa005, 0x0588, 0x700c, 0x7110,
++	0xa106, 0x1118, 0x7004, 0xa406, 0x1550, 0x2001, 0x0005, 0x2004,
++	0xd08c, 0x0160, 0x0046, 0x080c, 0x1b83, 0x004e, 0x2460, 0x6010,
++	0xa080, 0x0002, 0x2004, 0xa005, 0x01d0, 0x0c28, 0x2001, 0x0207,
++	0x2004, 0xd09c, 0x1d50, 0x2001, 0x0005, 0x2004, 0xd08c, 0x1d50,
++	0x7804, 0xa084, 0x6000, 0x0118, 0xa086, 0x6000, 0x19f0, 0x7818,
++	0x6812, 0x781c, 0x6816, 0x7803, 0x0004, 0x7003, 0x0000, 0x6100,
++	0xa18e, 0x0004, 0x1120, 0x2009, 0x0048, 0x080c, 0x9613, 0x00ce,
++	0x00de, 0x012e, 0x0005, 0x00f6, 0x00e6, 0x0026, 0x0036, 0x0046,
++	0x0056, 0x2071, 0xc96a, 0x7000, 0xa086, 0x0000, 0x0904, 0x19b9,
++	0x7004, 0xac06, 0x1904, 0x19ab, 0x2079, 0x0030, 0x7000, 0xa086,
++	0x0003, 0x0904, 0x19ab, 0x7804, 0xd0fc, 0x15c8, 0x20e1, 0x6000,
++	0x2011, 0x0032, 0x2001, 0x0208, 0x200c, 0x2001, 0x0209, 0x2004,
++	0xa106, 0x1d88, 0x8211, 0x1db0, 0x7804, 0xd0fc, 0x1540, 0x080c,
++	0x1f2d, 0x0026, 0x0056, 0x7803, 0x0004, 0x7804, 0xd0ac, 0x1de8,
++	0x7803, 0x0002, 0x7803, 0x0009, 0x7003, 0x0003, 0x7007, 0x0000,
++	0x005e, 0x002e, 0x2001, 0x015d, 0x2003, 0x0000, 0x080c, 0x5f22,
++	0x1138, 0x0066, 0x2031, 0x0001, 0x080c, 0x5fa4, 0x006e, 0x0058,
++	0x2001, 0x0160, 0x2502, 0x2001, 0x0138, 0x2202, 0x0020, 0x080c,
++	0x1b83, 0x0804, 0x195b, 0x0156, 0x20a9, 0x0009, 0x2009, 0xc977,
++	0x2104, 0xac06, 0x1108, 0x200a, 0xa188, 0x0003, 0x1f04, 0x19b0,
++	0x015e, 0x005e, 0x004e, 0x003e, 0x002e, 0x00ee, 0x00fe, 0x0005,
++	0x700c, 0x7110, 0xa106, 0x0904, 0x1a5c, 0x2104, 0x7006, 0x2060,
++	0x8108, 0x211c, 0x8108, 0x2124, 0x8108, 0xa182, 0xc992, 0x0210,
++	0x2009, 0xc977, 0x7112, 0x8cff, 0x05e8, 0x6010, 0x2068, 0x2d58,
++	0x080c, 0x7824, 0x6828, 0xa406, 0x15e0, 0x682c, 0xa306, 0x15c8,
++	0x7004, 0x2060, 0x6020, 0xc0d4, 0x6022, 0x684c, 0xd0f4, 0x0128,
++	0x6817, 0xffff, 0x6813, 0xffff, 0x0428, 0x6850, 0xd0f4, 0x1130,
++	0x7803, 0x0004, 0x6810, 0x781a, 0x6814, 0x781e, 0x6824, 0x2050,
++	0x6818, 0x2060, 0x6830, 0x2040, 0x6034, 0xa0cc, 0x000f, 0x080c,
++	0x7684, 0x1128, 0x2009, 0x0011, 0x080c, 0x1a5f, 0x0048, 0x2009,
++	0x0011, 0x080c, 0x1a5f, 0x0120, 0x2009, 0x0001, 0x080c, 0x1a5f,
++	0x2d58, 0x0005, 0x7803, 0x0004, 0x080c, 0x1ea2, 0x0904, 0x19c0,
++	0x0cc0, 0x080c, 0x7684, 0x1128, 0x080c, 0x1953, 0x080c, 0x761a,
++	0x0c88, 0x6020, 0xd0f4, 0x11e0, 0xd0d4, 0x01b8, 0x6038, 0xa402,
++	0x6034, 0xa303, 0x0108, 0x1288, 0x643a, 0x6336, 0x6c2a, 0x6b2e,
++	0x0046, 0x0036, 0x2400, 0x6c7c, 0xa402, 0x6812, 0x2300, 0x6b80,
++	0xa303, 0x6816, 0x003e, 0x004e, 0x0018, 0x080c, 0xafd1, 0x0990,
++	0x601c, 0xa08e, 0x0008, 0x0904, 0x19e0, 0xa08e, 0x000a, 0x0904,
++	0x19e0, 0x2001, 0xc674, 0x2004, 0xd0b4, 0x1140, 0x6018, 0x2004,
++	0xd0bc, 0x1120, 0x6817, 0x7fff, 0x6813, 0xffff, 0x080c, 0x241b,
++	0x1904, 0x1a12, 0x0804, 0x19e0, 0x7003, 0x0000, 0x0005, 0x8aff,
++	0x0904, 0x1b5d, 0xa03e, 0x2730, 0xc9fc, 0x6850, 0xd0fc, 0x11b8,
++	0xd0f4, 0x1538, 0x00d6, 0x2805, 0xac68, 0x2900, 0x0002, 0x1acb,
++	0x1a98, 0x1a98, 0x1acb, 0x1ace, 0x1ac3, 0x1acb, 0x1a98, 0x1acb,
++	0x1aa9, 0x1aa9, 0x1acb, 0x1ace, 0x1acb, 0x1abb, 0x1aa9, 0x7803,
++	0x0004, 0xc0fc, 0x6852, 0x6b6c, 0x6a70, 0x6d1c, 0x6c20, 0x00d6,
++	0xd99c, 0x0904, 0x1b1e, 0x2805, 0xac68, 0x6f08, 0x6e0c, 0x0804,
++	0x1b1f, 0xc0f4, 0x6852, 0x6b6c, 0x6a70, 0x00d6, 0x0804, 0x1b2c,
++	0x2d10, 0x00de, 0x00d6, 0x6834, 0x2268, 0xa084, 0x00ff, 0xa096,
++	0x0024, 0x0904, 0x1afe, 0x6b08, 0x6a0c, 0x6d00, 0x6c04, 0x0804,
++	0x1b1e, 0x2d10, 0x00de, 0x00d6, 0x6834, 0x2268, 0xa084, 0x00ff,
++	0xa096, 0x002c, 0x0540, 0x6b10, 0x6a14, 0x6d00, 0x6c04, 0x6f08,
++	0x6e0c, 0x0804, 0x1b1f, 0x00de, 0x00d6, 0x6834, 0xa084, 0x00ff,
++	0xa086, 0x001e, 0x1140, 0x00de, 0x080c, 0x2389, 0x1904, 0x1a5f,
++	0xa00e, 0x0804, 0x1b5d, 0x00de, 0x080c, 0x1519, 0x2d10, 0x00de,
++	0x00d6, 0x6834, 0x2268, 0xa084, 0x00ff, 0xa096, 0x0024, 0x0530,
++	0xa096, 0x002c, 0x1d80, 0x6b10, 0xa3a6, 0xffff, 0x1130, 0x2d10,
++	0x00de, 0x00d6, 0x080c, 0x72fa, 0x2268, 0x2d10, 0x00de, 0x00d6,
++	0x7314, 0x685c, 0xa086, 0x0001, 0x1120, 0x6868, 0xa005, 0x0108,
++	0x2018, 0x2268, 0x2011, 0x0000, 0x6d00, 0x6c04, 0x6f08, 0x6e0c,
++	0x780f, 0x00f0, 0xe000, 0xe000, 0xe000, 0x0408, 0x6b08, 0xa3a6,
++	0xffff, 0x1130, 0x2d10, 0x00de, 0x00d6, 0x080c, 0x72fa, 0x2268,
++	0x2d10, 0x00de, 0x00d6, 0x7314, 0x685c, 0xa086, 0x0001, 0x1120,
++	0x6868, 0xa005, 0x0108, 0x2018, 0x2268, 0x2011, 0x0000, 0x6d00,
++	0x6c04, 0x780f, 0x00f0, 0xe000, 0xe000, 0xe000, 0xc9fd, 0x7b22,
++	0x7a26, 0x7d32, 0x7c36, 0x7f3a, 0x7e3e, 0x731a, 0x721e, 0x7522,
++	0x7426, 0x772a, 0x762e, 0x7902, 0x7100, 0x8108, 0x7102, 0x00de,
++	0x6828, 0xa300, 0x682a, 0x682c, 0xa201, 0x682e, 0x8109, 0x2d08,
++	0x1500, 0xd9fc, 0x0160, 0xc9fc, 0x080c, 0x2389, 0x01e8, 0x2805,
++	0xac68, 0x6800, 0xa506, 0x11c0, 0x6804, 0xa406, 0x00a8, 0xc9fc,
++	0x080c, 0x2389, 0x0188, 0x2805, 0xac68, 0x6800, 0xa506, 0x1160,
++	0x6804, 0xa406, 0x1148, 0x6808, 0xa706, 0x1130, 0x680c, 0xa606,
++	0x0018, 0xc9fc, 0x080c, 0x2389, 0x2168, 0x0005, 0x080c, 0x1519,
++	0x080c, 0x2014, 0x7004, 0x2060, 0x00d6, 0x6010, 0x2068, 0x7003,
++	0x0000, 0x080c, 0x1ec3, 0x080c, 0xac91, 0x0170, 0x6808, 0x8001,
++	0x680a, 0x697c, 0x6912, 0x6980, 0x6916, 0x682b, 0xffff, 0x682f,
++	0xffff, 0x6850, 0xc0bd, 0x6852, 0x00de, 0x080c, 0xa961, 0x0804,
++	0x1dec, 0x080c, 0x1519, 0x0126, 0x2091, 0x2200, 0x0006, 0x0016,
++	0x2b68, 0x6818, 0x2060, 0x7904, 0x7803, 0x0002, 0xa184, 0x0700,
++	0x1978, 0xa184, 0x0003, 0xa086, 0x0003, 0x0d58, 0x7000, 0x0002,
++	0x1ba0, 0x1ba6, 0x1cf5, 0x1dc1, 0x1ddb, 0x1ba0, 0x1ba0, 0x1ba0,
++	0x7804, 0xd09c, 0x1904, 0x1dec, 0x080c, 0x1519, 0x8001, 0x7002,
++	0xd1bc, 0x15c0, 0x080c, 0x7684, 0x1508, 0xd1dc, 0x1598, 0x6864,
++	0x8000, 0x6866, 0xd19c, 0x0140, 0x7004, 0x2060, 0x2009, 0x0102,
++	0x080c, 0x9613, 0x0804, 0x1cbc, 0x8aff, 0x0130, 0x2009, 0x0001,
++	0x080c, 0x1a5f, 0x0804, 0x1dec, 0x7004, 0x2060, 0x080c, 0x24e0,
++	0x080c, 0x761a, 0x7007, 0x0000, 0x0804, 0x1c45, 0xd19c, 0x1904,
++	0x1c79, 0xd1dc, 0x1178, 0x8aff, 0x0904, 0x1c79, 0x2009, 0x0001,
++	0x080c, 0x1a5f, 0x0904, 0x1dec, 0x2009, 0x0001, 0x080c, 0x1a5f,
++	0x0804, 0x1dec, 0x7803, 0x0004, 0x7003, 0x0000, 0xd1bc, 0x1904,
++	0x1c4b, 0x080c, 0x7684, 0x1130, 0xd19c, 0x0120, 0x6864, 0x8000,
++	0x6866, 0x0810, 0x0026, 0x0036, 0x7c20, 0x7d24, 0x7e30, 0x7f34,
++	0x7818, 0x6812, 0x781c, 0x6816, 0x2001, 0x0201, 0x2004, 0xa005,
++	0x0140, 0x7808, 0xd0ec, 0x1128, 0x7803, 0x0009, 0x7003, 0x0004,
++	0x0028, 0x080c, 0x7684, 0x0110, 0x080c, 0x1df0, 0x6b28, 0x6a2c,
++	0x2400, 0x686e, 0xa31a, 0x2500, 0x6872, 0xa213, 0x6b2a, 0x6a2e,
++	0x00c6, 0x7004, 0x2060, 0x6020, 0xd0f4, 0x1110, 0x633a, 0x6236,
++	0x00ce, 0x003e, 0x002e, 0x6e1e, 0x6f22, 0x2500, 0xa405, 0x0128,
++	0x080c, 0x239f, 0x6850, 0xc0fd, 0x6852, 0x2a00, 0x6826, 0x2c00,
++	0x681a, 0x2800, 0x6832, 0x6808, 0x8001, 0x680a, 0x1148, 0x684c,
++	0xd0e4, 0x0130, 0x7004, 0x2060, 0x2009, 0x0048, 0x080c, 0x9613,
++	0x7000, 0xa086, 0x0004, 0x0904, 0x1dec, 0x7003, 0x0000, 0x080c,
++	0x19c0, 0x0804, 0x1dec, 0x0056, 0x7d0c, 0xd5bc, 0x1110, 0x080c,
++	0xc55e, 0x005e, 0x080c, 0x1ec3, 0x7004, 0x2060, 0x601c, 0xa086,
++	0x0009, 0x1140, 0x2009, 0x0106, 0x080c, 0x9613, 0x7007, 0x0000,
++	0x0804, 0x1dec, 0x00f6, 0x7004, 0x2078, 0x080c, 0x56c3, 0x0118,
++	0x7820, 0xc0f5, 0x7822, 0x00fe, 0x682b, 0xffff, 0x682f, 0xffff,
++	0x6808, 0x8001, 0x680a, 0x697c, 0x791a, 0x6980, 0x791e, 0x0804,
++	0x1dec, 0x7004, 0x00c6, 0x2060, 0x6020, 0x00ce, 0xd0f4, 0x0120,
++	0x6808, 0x8001, 0x680a, 0x04c0, 0x7818, 0x6812, 0x7a1c, 0x6a16,
++	0xd19c, 0x0160, 0xa205, 0x0150, 0x7004, 0xa080, 0x0007, 0x2004,
++	0xa084, 0xfffd, 0xa086, 0x0008, 0x1904, 0x1be2, 0x684c, 0xc0f5,
++	0x684e, 0x7814, 0xa005, 0x1520, 0x7003, 0x0000, 0x6808, 0x8001,
++	0x680a, 0x01a0, 0x7004, 0x2060, 0x601c, 0xa086, 0x000a, 0x11a0,
++	0x0156, 0x20a9, 0x0009, 0x2009, 0xc977, 0x2104, 0xac06, 0x1108,
++	0x200a, 0xa188, 0x0003, 0x1f04, 0x1cad, 0x015e, 0x7004, 0x2060,
++	0x2009, 0x0048, 0x080c, 0x9613, 0x080c, 0x19c0, 0x0804, 0x1dec,
++	0x7818, 0x6812, 0x781c, 0x6816, 0x7814, 0x7908, 0xa18c, 0x0fff,
++	0xa192, 0x0841, 0x1a04, 0x1b60, 0xa188, 0x0007, 0x8114, 0x8214,
++	0x8214, 0xa10a, 0x8104, 0x8004, 0x8004, 0xa20a, 0x810b, 0x810b,
++	0x810b, 0x080c, 0x1f58, 0x7803, 0x0004, 0x780f, 0xffff, 0x7803,
++	0x0001, 0x7804, 0xd0fc, 0x0de8, 0x7803, 0x0002, 0x7803, 0x0004,
++	0x780f, 0x00f6, 0x7004, 0x7007, 0x0000, 0x2060, 0x2009, 0x0048,
++	0x080c, 0x9613, 0x080c, 0x1fae, 0x0838, 0x8001, 0x7002, 0xd194,
++	0x01b0, 0x7804, 0xd0fc, 0x1904, 0x1d91, 0xd09c, 0x0138, 0x7804,
++	0xd0fc, 0x1904, 0x1d91, 0xd09c, 0x1904, 0x1d95, 0x8aff, 0x0904,
++	0x1dec, 0x2009, 0x0001, 0x080c, 0x1a5f, 0x0804, 0x1dec, 0xa184,
++	0x0888, 0x1148, 0x8aff, 0x0904, 0x1dec, 0x2009, 0x0001, 0x080c,
++	0x1a5f, 0x0804, 0x1dec, 0x7818, 0x6812, 0x7a1c, 0x6a16, 0xa205,
++	0x0904, 0x1c96, 0x7803, 0x0004, 0x7003, 0x0000, 0xd1bc, 0x1904,
++	0x1d73, 0x6834, 0xa084, 0x00ff, 0xa086, 0x0029, 0x1118, 0xd19c,
++	0x1904, 0x1c96, 0x0026, 0x0036, 0x7c20, 0x7d24, 0x7e30, 0x7f34,
++	0x7818, 0x6812, 0x781c, 0x6816, 0x2001, 0x0201, 0x2004, 0xa005,
++	0x0140, 0x7808, 0xd0ec, 0x1128, 0x7803, 0x0009, 0x7003, 0x0004,
++	0x0020, 0x0016, 0x080c, 0x1df0, 0x001e, 0x6b28, 0x6a2c, 0x080c,
++	0x239f, 0x00d6, 0x2805, 0xac68, 0x6034, 0xd09c, 0x1128, 0x6808,
++	0xa31a, 0x680c, 0xa213, 0x0020, 0x6810, 0xa31a, 0x6814, 0xa213,
++	0x00de, 0xd194, 0x0904, 0x1c10, 0x2a00, 0x6826, 0x2c00, 0x681a,
++	0x2800, 0x6832, 0x6808, 0x8001, 0x680a, 0x6b2a, 0x6a2e, 0x003e,
++	0x002e, 0x0804, 0x1cbc, 0x0056, 0x7d0c, 0x080c, 0xc55e, 0x005e,
++	0x080c, 0x1ec3, 0x00f6, 0x7004, 0x2078, 0x080c, 0x56c3, 0x0118,
++	0x7820, 0xc0f5, 0x7822, 0x00fe, 0x682b, 0xffff, 0x682f, 0xffff,
++	0x6808, 0x8001, 0x680a, 0x697c, 0x791a, 0x6980, 0x791e, 0x0804,
++	0x1dec, 0x7804, 0xd09c, 0x0904, 0x1b8b, 0x7c20, 0x7824, 0xa405,
++	0x1904, 0x1b8b, 0x7818, 0x6812, 0x7c1c, 0x6c16, 0xa405, 0x1120,
++	0x7803, 0x0002, 0x0804, 0x1c96, 0x7520, 0x7424, 0x7728, 0x762c,
++	0x7018, 0xa528, 0x701c, 0xa421, 0xa7b9, 0x0000, 0xa6b1, 0x0000,
++	0x7830, 0xa506, 0x1150, 0x7834, 0xa406, 0x1138, 0x7838, 0xa706,
++	0x1120, 0x783c, 0xa606, 0x0904, 0x1b8b, 0x7803, 0x0002, 0x0804,
++	0x1d22, 0x7803, 0x0004, 0x7003, 0x0000, 0x7004, 0xa00d, 0x0180,
++	0x6808, 0x8001, 0x680a, 0x1160, 0x7004, 0x2060, 0x2009, 0x0048,
++	0x601c, 0xa086, 0x0009, 0x1110, 0x080c, 0x1519, 0x080c, 0x9613,
++	0x080c, 0x19c0, 0x0088, 0x7803, 0x0004, 0x7003, 0x0000, 0x7004,
++	0x2060, 0x6010, 0xa005, 0x0da0, 0x2068, 0x6808, 0x8000, 0x680a,
++	0x6c28, 0x6b2c, 0x080c, 0x19d3, 0x001e, 0x000e, 0x012e, 0x0005,
++	0x700c, 0x7110, 0xa106, 0x0904, 0x1e96, 0x7004, 0x0016, 0x210c,
++	0xa106, 0x001e, 0x0904, 0x1e96, 0x00d6, 0x00c6, 0x216c, 0x2d00,
++	0xa005, 0x0904, 0x1e94, 0x681c, 0xa086, 0x0008, 0x0904, 0x1e94,
++	0x6820, 0xd0d4, 0x1904, 0x1e94, 0x6810, 0x2068, 0x080c, 0x7684,
++	0x0904, 0x1e94, 0x6850, 0xd0fc, 0x05a8, 0x8108, 0x2104, 0x6b2c,
++	0xa306, 0x1904, 0x1e94, 0x8108, 0x2104, 0x6a28, 0xa206, 0x1904,
++	0x1e94, 0x6850, 0xc0fc, 0xc0f5, 0x6852, 0x686c, 0x7822, 0x701a,
++	0x6870, 0x7826, 0x701e, 0x681c, 0x7832, 0x7022, 0x6820, 0x7836,
++	0x7026, 0x6818, 0x2060, 0x6034, 0xd09c, 0x0168, 0x6830, 0x2005,
++	0x00d6, 0xac68, 0x6808, 0x783a, 0x702a, 0x680c, 0x783e, 0x702e,
++	0x00de, 0x0804, 0x1e8e, 0xa006, 0x783a, 0x783e, 0x702a, 0x702e,
++	0x0804, 0x1e8e, 0x8108, 0x2104, 0xa005, 0x1904, 0x1e94, 0x6b2c,
++	0xa306, 0x1904, 0x1e94, 0x8108, 0x2104, 0xa005, 0x15e8, 0x6a28,
++	0xa206, 0x15d0, 0x6850, 0xc0f5, 0x6852, 0x6830, 0x2005, 0x6918,
++	0xa160, 0xa180, 0x000d, 0x2004, 0xd09c, 0x11a0, 0x6008, 0x7822,
++	0x701a, 0x686e, 0x600c, 0x7826, 0x701e, 0x6872, 0x6000, 0x7832,
++	0x7022, 0x6004, 0x7836, 0x7026, 0xa006, 0x783a, 0x783e, 0x702a,
++	0x702e, 0x00a0, 0x6010, 0x7822, 0x701a, 0x686e, 0x6014, 0x7826,
++	0x701e, 0x6872, 0x6000, 0x7832, 0x7022, 0x6004, 0x7836, 0x7026,
++	0x6008, 0x783a, 0x702a, 0x600c, 0x783e, 0x702e, 0x6810, 0x781a,
++	0x6814, 0x781e, 0x7803, 0x0011, 0x00ce, 0x00de, 0x0005, 0x2011,
++	0x0201, 0x2009, 0x003c, 0x2204, 0xa005, 0x1118, 0x8109, 0x1dd8,
++	0x0005, 0x0005, 0x0ca1, 0x0118, 0x780c, 0xd0a4, 0x0120, 0x00d9,
++	0xa085, 0x0001, 0x0010, 0x080c, 0x1fae, 0x0005, 0x0126, 0x2091,
++	0x2200, 0x7000, 0xa086, 0x0003, 0x1160, 0x700c, 0x7110, 0xa106,
++	0x0140, 0x080c, 0x2b06, 0x20e1, 0x9028, 0x700f, 0xc977, 0x7013,
++	0xc977, 0x012e, 0x0005, 0x00c6, 0x080c, 0x5f22, 0x11b8, 0x2001,
++	0x0160, 0x2003, 0x0000, 0x2001, 0x0138, 0x2003, 0x0000, 0x2011,
++	0x00c8, 0xe000, 0xe000, 0x8211, 0x1de0, 0x0481, 0x0066, 0x2031,
++	0x0000, 0x080c, 0x5fa4, 0x006e, 0x00ce, 0x0005, 0x080c, 0x1f2d,
++	0x080c, 0x2b06, 0x20e1, 0x9028, 0x700c, 0x7110, 0xa106, 0x0190,
++	0x2104, 0xa005, 0x0130, 0x2060, 0x6010, 0x2060, 0x6008, 0x8001,
++	0x600a, 0xa188, 0x0003, 0xa182, 0xc992, 0x0210, 0x2009, 0xc977,
++	0x7112, 0x0c50, 0x2001, 0x015d, 0x2003, 0x0000, 0x2001, 0x0160,
++	0x2502, 0x2001, 0x0138, 0x2202, 0x00ce, 0x0005, 0x080c, 0x2b06,
++	0x20e1, 0x9028, 0x2001, 0x015d, 0x2003, 0x0000, 0x00e6, 0x00c6,
++	0x0016, 0x2071, 0xc96a, 0x700c, 0x7110, 0xa106, 0x0190, 0x2104,
++	0xa005, 0x0130, 0x2060, 0x6010, 0x2060, 0x6008, 0x8001, 0x600a,
++	0xa188, 0x0003, 0xa182, 0xc992, 0x0210, 0x2009, 0xc977, 0x7112,
++	0x0c50, 0x001e, 0x00ce, 0x00ee, 0x0005, 0x2001, 0x0138, 0x2014,
++	0x2003, 0x0000, 0x2001, 0x0160, 0x202c, 0x2003, 0x0000, 0x080c,
++	0x5f22, 0x1148, 0x2021, 0x0002, 0x1d04, 0x1f3c, 0x2091, 0x6000,
++	0x8421, 0x1dd0, 0x0005, 0x2021, 0xb015, 0x2001, 0x0141, 0x201c,
++	0xd3dc, 0x1168, 0x2001, 0x0109, 0x201c, 0xa39c, 0x0048, 0x1138,
++	0x2001, 0x0111, 0x201c, 0x83ff, 0x1110, 0x8421, 0x1d70, 0x0005,
++	0x00e6, 0x2071, 0x0200, 0x7808, 0xa084, 0xf000, 0xa10d, 0x0869,
++	0x2001, 0x0105, 0x2004, 0xa084, 0x0003, 0x1130, 0x2001, 0xc992,
++	0x2004, 0xa086, 0x0000, 0x0548, 0xa026, 0x2019, 0xf000, 0x8319,
++	0x1148, 0x2001, 0x012b, 0x2003, 0x95f5, 0x2001, 0x0129, 0x2003,
++	0x95f5, 0x00d8, 0x2001, 0x0105, 0x2004, 0xa084, 0x0003, 0x1130,
++	0x2001, 0xc992, 0x2004, 0xa086, 0x0000, 0x0178, 0x2001, 0x0132,
++	0x2004, 0xa436, 0x0110, 0x2020, 0x0c00, 0x2001, 0x0021, 0x2004,
++	0xd0fc, 0x09e8, 0x080c, 0x222c, 0x08c0, 0x20e1, 0x7000, 0x7324,
++	0x7420, 0x7028, 0x7028, 0x7426, 0x7037, 0x0001, 0x810f, 0x712e,
++	0x702f, 0x0100, 0x7037, 0x0008, 0x7326, 0x7422, 0x2001, 0x0160,
++	0x2502, 0x2001, 0x0138, 0x2202, 0x00ee, 0x0005, 0x0026, 0x2001,
++	0x015d, 0x2003, 0x0000, 0x7908, 0xa18c, 0x0fff, 0xa182, 0x0ffd,
++	0x0210, 0x2009, 0x0000, 0xa190, 0x0007, 0xa294, 0x1ff8, 0x8214,
++	0x8214, 0x8214, 0x2001, 0x020a, 0x82ff, 0x0140, 0x20e1, 0x6000,
++	0x200c, 0x200c, 0x200c, 0x200c, 0x8211, 0x1dd0, 0x20e1, 0x7000,
++	0x200c, 0x200c, 0x7003, 0x0000, 0x20e1, 0x6000, 0x2001, 0x0208,
++	0x200c, 0x2001, 0x0209, 0x2004, 0xa106, 0x0158, 0x080c, 0x1e97,
++	0x0130, 0x7908, 0xd1ec, 0x1128, 0x790c, 0xd1a4, 0x0960, 0x080c,
++	0x1ec3, 0xa006, 0x002e, 0x0005, 0x00f6, 0x00e6, 0x0016, 0x0026,
++	0x2071, 0xc96a, 0x2079, 0x0030, 0x2011, 0x0050, 0x7000, 0xa086,
++	0x0000, 0x01a8, 0x8211, 0x0188, 0x2001, 0x0005, 0x2004, 0xd08c,
++	0x0dc8, 0x7904, 0xa18c, 0x0780, 0x0016, 0x080c, 0x1b83, 0x001e,
++	0x81ff, 0x1118, 0x2011, 0x0050, 0x0c48, 0xa085, 0x0001, 0x002e,
++	0x001e, 0x00ee, 0x00fe, 0x0005, 0x7803, 0x0004, 0x2009, 0x0064,
++	0x7804, 0xd0ac, 0x0904, 0x2060, 0x8109, 0x1dd0, 0x2009, 0x0100,
++	0x210c, 0xa18a, 0x0003, 0x0a0c, 0x1519, 0x080c, 0x2333, 0x00e6,
++	0x00f6, 0x2071, 0xc959, 0x2079, 0x0010, 0x7004, 0xa086, 0x0000,
++	0x0538, 0x7800, 0x0006, 0x7820, 0x0006, 0x7830, 0x0006, 0x7834,
++	0x0006, 0x7838, 0x0006, 0x783c, 0x0006, 0x7803, 0x0004, 0xe000,
++	0xe000, 0x2079, 0x0030, 0x7804, 0xd0ac, 0x190c, 0x1519, 0x2079,
++	0x0010, 0x000e, 0x783e, 0x000e, 0x783a, 0x000e, 0x7836, 0x000e,
++	0x7832, 0x000e, 0x7822, 0x000e, 0x7802, 0x00fe, 0x00ee, 0x0030,
++	0x00fe, 0x00ee, 0x7804, 0xd0ac, 0x190c, 0x1519, 0x080c, 0x7f6e,
++	0x0005, 0x00e6, 0x2071, 0xc992, 0x7003, 0x0000, 0x00ee, 0x0005,
++	0x00d6, 0xa280, 0x0004, 0x206c, 0x694c, 0xd1dc, 0x1904, 0x20ed,
++	0x6934, 0xa184, 0x0007, 0x0002, 0x207c, 0x20d8, 0x207c, 0x207e,
++	0x207c, 0x20bf, 0x209e, 0x208d, 0x080c, 0x1519, 0x2100, 0xa084,
++	0x00ff, 0xa086, 0x0013, 0x0904, 0x20d8, 0x2100, 0xa084, 0x00ff,
++	0xa086, 0x001b, 0x0904, 0x20d8, 0x0c78, 0x684c, 0xd0b4, 0x0904,
++	0x21e9, 0x6860, 0x682e, 0x6816, 0x685c, 0x682a, 0x6812, 0x687c,
++	0x680a, 0x6880, 0x680e, 0x6958, 0x0804, 0x20e0, 0x6834, 0xa084,
++	0x00ff, 0xa086, 0x001e, 0x19c0, 0x684c, 0xd0b4, 0x0904, 0x21e9,
++	0x6860, 0x682e, 0x6816, 0x685c, 0x682a, 0x6812, 0x687c, 0x680a,
++	0x6880, 0x680e, 0x6804, 0x681a, 0xa080, 0x000d, 0x2004, 0xa084,
++	0x000f, 0xa080, 0x23c7, 0x2005, 0x6832, 0x6958, 0x0450, 0xa18c,
++	0x00ff, 0xa186, 0x0015, 0x1548, 0x684c, 0xd0b4, 0x0904, 0x21e9,
++	0x6804, 0x681a, 0xa080, 0x000d, 0x2004, 0xa084, 0x000f, 0xa080,
++	0x23c7, 0x2005, 0x6832, 0x6958, 0xa006, 0x682e, 0x682a, 0x0088,
++	0x684c, 0xd0b4, 0x0904, 0x1b5e, 0x6958, 0xa006, 0x682e, 0x682a,
++	0x2d00, 0x681a, 0x6834, 0xa084, 0x000f, 0xa080, 0x23c7, 0x2005,
++	0x6832, 0x6926, 0x684c, 0xc0dd, 0x684e, 0x00de, 0x0005, 0x00f6,
++	0x2079, 0x0020, 0x7804, 0xd0fc, 0x190c, 0x222c, 0x00e6, 0x00d6,
++	0x2071, 0xc992, 0x7000, 0xa005, 0x1904, 0x2155, 0x00c6, 0x7206,
++	0xa280, 0x0004, 0x205c, 0x7004, 0x2068, 0x7803, 0x0004, 0x6818,
++	0x00d6, 0x2068, 0x686c, 0x7812, 0x6890, 0x00f6, 0x20e1, 0x9040,
++	0x2079, 0x0200, 0x781a, 0x2079, 0x0100, 0x8004, 0x78d6, 0x00fe,
++	0x00de, 0x2b68, 0x6824, 0x2050, 0x6818, 0x2060, 0x6830, 0x2040,
++	0x6034, 0xa0cc, 0x000f, 0x6908, 0x791a, 0x7116, 0x680c, 0x781e,
++	0x701a, 0xa006, 0x700e, 0x7012, 0x7004, 0x692c, 0x6814, 0xa106,
++	0x1120, 0x6928, 0x6810, 0xa106, 0x0158, 0x0036, 0x0046, 0x6b14,
++	0x6c10, 0x080c, 0x241b, 0x004e, 0x003e, 0x0110, 0x00ce, 0x00a8,
++	0x8aff, 0x1120, 0x00ce, 0xa085, 0x0001, 0x0078, 0x0126, 0x2091,
++	0x8000, 0x2079, 0x0020, 0x2009, 0x0001, 0x0059, 0x0118, 0x2009,
++	0x0001, 0x0039, 0x012e, 0x00ce, 0xa006, 0x00de, 0x00ee, 0x00fe,
++	0x0005, 0x0076, 0x0066, 0x0056, 0x0046, 0x0036, 0x0026, 0x8aff,
++	0x0904, 0x21e2, 0x700c, 0x7214, 0xa23a, 0x7010, 0x7218, 0xa203,
++	0x0a04, 0x21e1, 0xa705, 0x0904, 0x21e1, 0xa03e, 0x2730, 0x6850,
++	0xd0fc, 0x11a8, 0x00d6, 0x2805, 0xac68, 0x2900, 0x0002, 0x21b0,
++	0x2195, 0x2195, 0x21b0, 0x21b0, 0x21a9, 0x21b0, 0x2195, 0x21b0,
++	0x219a, 0x219a, 0x21b0, 0x21b0, 0x21b0, 0x21a1, 0x219a, 0xc0fc,
++	0x6852, 0x6b6c, 0x6a70, 0x6d1c, 0x6c20, 0xd99c, 0x05c8, 0x00d6,
++	0x2805, 0xac68, 0x6f08, 0x6e0c, 0x0490, 0x6b08, 0x6a0c, 0x6d00,
++	0x6c04, 0x0468, 0x6b10, 0x6a14, 0x6d00, 0x6c04, 0x6f08, 0x6e0c,
++	0x0430, 0x00de, 0x00d6, 0x6834, 0xa084, 0x00ff, 0xa086, 0x001e,
++	0x1138, 0x00de, 0x080c, 0x2389, 0x1904, 0x215f, 0xa00e, 0x0490,
++	0x2d10, 0x00de, 0x00d6, 0x6834, 0xa084, 0x00ff, 0xa086, 0x0013,
++	0x2268, 0x09d8, 0x2d10, 0x00de, 0x00d6, 0x6834, 0xa084, 0x00ff,
++	0xa086, 0x001b, 0x2268, 0x09b0, 0x00de, 0x080c, 0x1519, 0x00de,
++	0x7b22, 0x7a26, 0x7d32, 0x7c36, 0x7f3a, 0x7e3e, 0x7902, 0x7000,
++	0x8000, 0x7002, 0x6828, 0xa300, 0x682a, 0x682c, 0xa201, 0x682e,
++	0x700c, 0xa300, 0x700e, 0x7010, 0xa201, 0x7012, 0x080c, 0x2389,
++	0x0008, 0xa006, 0x002e, 0x003e, 0x004e, 0x005e, 0x006e, 0x007e,
++	0x0005, 0x080c, 0x1519, 0x0026, 0x2001, 0x0105, 0x2003, 0x0010,
++	0x20e1, 0x9040, 0x7803, 0x0004, 0x7003, 0x0000, 0x7004, 0x2060,
++	0x00d6, 0x6010, 0x2068, 0x080c, 0xac91, 0x0118, 0x6850, 0xc0bd,
++	0x6852, 0x601c, 0xa086, 0x0006, 0x1180, 0x2061, 0x0100, 0x62c8,
++	0x2001, 0x00fa, 0x8001, 0x1df0, 0x60c8, 0xa206, 0x1dc0, 0x60c4,
++	0x686a, 0x60c8, 0x6866, 0x7004, 0x2060, 0x00de, 0x00c6, 0x080c,
++	0xa961, 0x00ce, 0x2001, 0xc936, 0x2004, 0xac06, 0x1150, 0x20e1,
++	0x9040, 0x080c, 0x90f6, 0x2011, 0x0000, 0x080c, 0x8f18, 0x080c,
++	0x7f6e, 0x002e, 0x0804, 0x22e6, 0x0126, 0x2091, 0x2400, 0x0006,
++	0x0016, 0x00f6, 0x00e6, 0x00d6, 0x00c6, 0x2079, 0x0020, 0x2071,
++	0xc992, 0x2b68, 0x6818, 0x2060, 0x7904, 0x7803, 0x0002, 0xa184,
++	0x0700, 0x1904, 0x21eb, 0x7000, 0x0002, 0x22e6, 0x2249, 0x22b9,
++	0x22e4, 0x8001, 0x7002, 0xd19c, 0x1170, 0x8aff, 0x05d0, 0x2009,
++	0x0001, 0x080c, 0x2159, 0x0904, 0x22e6, 0x2009, 0x0001, 0x080c,
++	0x2159, 0x0804, 0x22e6, 0x7803, 0x0004, 0xd194, 0x0148, 0x6850,
++	0xc0fc, 0x6852, 0x8aff, 0x11d8, 0x684c, 0xc0f5, 0x684e, 0x00b8,
++	0x0026, 0x0036, 0x6b28, 0x6a2c, 0x7820, 0x686e, 0xa31a, 0x7824,
++	0x6872, 0xa213, 0x7830, 0x681e, 0x7834, 0x6822, 0x6b2a, 0x6a2e,
++	0x003e, 0x002e, 0x080c, 0x239f, 0x6850, 0xc0fd, 0x6852, 0x2a00,
++	0x6826, 0x2c00, 0x681a, 0x2800, 0x6832, 0x7003, 0x0000, 0x0804,
++	0x22e6, 0x00f6, 0x0026, 0x781c, 0x0006, 0x7818, 0x0006, 0x2079,
++	0x0100, 0x7a14, 0xa284, 0x0184, 0xa085, 0x0012, 0x7816, 0x0036,
++	0x2019, 0x1000, 0x8319, 0x090c, 0x1519, 0x7820, 0xd0bc, 0x1dd0,
++	0x003e, 0x79c8, 0x000e, 0xa102, 0x001e, 0x0006, 0x0016, 0x79c4,
++	0x000e, 0xa103, 0x78c6, 0x000e, 0x78ca, 0xa284, 0x0184, 0xa085,
++	0x0012, 0x7816, 0x002e, 0x00fe, 0x7803, 0x0008, 0x7003, 0x0000,
++	0x0468, 0x8001, 0x7002, 0xd194, 0x0168, 0x7804, 0xd0fc, 0x1904,
++	0x223c, 0xd19c, 0x11f8, 0x8aff, 0x0508, 0x2009, 0x0001, 0x080c,
++	0x2159, 0x00e0, 0x0026, 0x0036, 0x6b28, 0x6a2c, 0x080c, 0x239f,
++	0x00d6, 0x2805, 0xac68, 0x6034, 0xd09c, 0x1128, 0x6808, 0xa31a,
++	0x680c, 0xa213, 0x0020, 0x6810, 0xa31a, 0x6814, 0xa213, 0x00de,
++	0x0804, 0x226c, 0x0804, 0x2268, 0x080c, 0x1519, 0x00ce, 0x00de,
++	0x00ee, 0x00fe, 0x001e, 0x000e, 0x012e, 0x0005, 0x00f6, 0x00e6,
++	0x2071, 0xc992, 0x7000, 0xa086, 0x0000, 0x05d0, 0x2079, 0x0020,
++	0x0016, 0x2009, 0x0207, 0x210c, 0xd194, 0x0198, 0x2009, 0x020c,
++	0x210c, 0xa184, 0x0003, 0x0168, 0x080c, 0xc5a7, 0x2001, 0x0133,
++	0x2004, 0xa005, 0x090c, 0x1519, 0x20e1, 0x9040, 0x2001, 0x020c,
++	0x2102, 0x2009, 0x0206, 0x2104, 0x2009, 0x0203, 0x210c, 0xa106,
++	0x1110, 0x20e1, 0x9040, 0x7804, 0xd0fc, 0x09d8, 0x080c, 0x222c,
++	0x7000, 0xa086, 0x0000, 0x19a8, 0x001e, 0x7803, 0x0004, 0x7804,
++	0xd0ac, 0x1de8, 0x20e1, 0x9040, 0x7803, 0x0002, 0x7003, 0x0000,
++	0x00ee, 0x00fe, 0x0005, 0x0026, 0x00c6, 0x00d6, 0x00e6, 0x00f6,
++	0x2071, 0xc992, 0x2079, 0x0020, 0x7000, 0xa086, 0x0000, 0x0540,
++	0x7004, 0x2060, 0x6010, 0x2068, 0x080c, 0xac91, 0x0158, 0x6850,
++	0xc0b5, 0x6852, 0x680c, 0x7a1c, 0xa206, 0x1120, 0x6808, 0x7a18,
++	0xa206, 0x01e0, 0x2001, 0x0105, 0x2003, 0x0010, 0x20e1, 0x9040,
++	0x7803, 0x0004, 0x7003, 0x0000, 0x7004, 0x2060, 0x080c, 0xa961,
++	0x20e1, 0x9040, 0x080c, 0x90f6, 0x2011, 0x0000, 0x080c, 0x8f18,
++	0x00fe, 0x00ee, 0x00de, 0x00ce, 0x002e, 0x0005, 0x6810, 0x6a14,
++	0xa205, 0x1d00, 0x684c, 0xc0dc, 0x684e, 0x2c10, 0x080c, 0x2068,
++	0x2001, 0x0105, 0x2003, 0x0010, 0x20e1, 0x9040, 0x7803, 0x0004,
++	0x7003, 0x0000, 0x2069, 0xc927, 0x6833, 0x0000, 0x683f, 0x0000,
++	0x08f8, 0x8840, 0x2805, 0xa005, 0x1170, 0x6004, 0xa005, 0x0168,
++	0x681a, 0x2060, 0x6034, 0xa084, 0x000f, 0xa080, 0x23c7, 0x2045,
++	0x88ff, 0x090c, 0x1519, 0x8a51, 0x0005, 0x2050, 0x0005, 0x8a50,
++	0x8841, 0x2805, 0xa005, 0x1190, 0x2c00, 0xad06, 0x0120, 0x6000,
++	0xa005, 0x1108, 0x2d00, 0x2060, 0x681a, 0x6034, 0xa084, 0x000f,
++	0xa080, 0x23d7, 0x2045, 0x88ff, 0x090c, 0x1519, 0x0005, 0x0000,
++	0x0011, 0x0015, 0x0019, 0x001d, 0x0021, 0x0025, 0x0029, 0x0000,
++	0x000f, 0x0015, 0x001b, 0x0021, 0x0027, 0x0000, 0x0000, 0x0000,
++	0x23bc, 0x23b8, 0x23bc, 0x23bc, 0x23c6, 0x0000, 0x23bc, 0x0000,
++	0x23c3, 0x23c0, 0x23c3, 0x23c3, 0x0000, 0x23c6, 0x23c3, 0x0000,
++	0x23be, 0x23be, 0x0000, 0x23be, 0x23c6, 0x0000, 0x23be, 0x0000,
++	0x23c4, 0x23c4, 0x0000, 0x23c4, 0x0000, 0x23c6, 0x23c4, 0x0136,
++	0x0146, 0x0156, 0x2099, 0xc765, 0x20a1, 0x0018, 0x20a9, 0x0008,
++	0x53a3, 0x7803, 0x0020, 0x0126, 0x2091, 0x8000, 0x7803, 0x0041,
++	0x7007, 0x0005, 0x7000, 0xc094, 0x7002, 0x700b, 0xc760, 0x012e,
++	0x015e, 0x014e, 0x013e, 0x0005, 0x2099, 0x0014, 0x7803, 0x0040,
++	0x2001, 0xc765, 0x2004, 0x2010, 0x080c, 0x72ad, 0x2009, 0xc699,
++	0x2104, 0xa084, 0xfffc, 0x200a, 0x080c, 0x721f, 0x7007, 0x0000,
++	0x080c, 0x1676, 0x0005, 0x00a6, 0x0096, 0x0086, 0x6b2e, 0x6c2a,
++	0x6858, 0xa055, 0x0904, 0x24ac, 0x2d60, 0x6034, 0xa0cc, 0x000f,
++	0xa9c0, 0x23c7, 0xa986, 0x0007, 0x0130, 0xa986, 0x000e, 0x0118,
++	0xa986, 0x000f, 0x1120, 0x605c, 0xa422, 0x6060, 0xa31b, 0x2805,
++	0xa045, 0x1140, 0x0310, 0x0804, 0x24ac, 0x6004, 0xa065, 0x0904,
++	0x24ac, 0x0c18, 0x2805, 0xa005, 0x01a8, 0xac68, 0xd99c, 0x1128,
++	0x6808, 0xa422, 0x680c, 0xa31b, 0x0020, 0x6810, 0xa422, 0x6814,
++	0xa31b, 0x0620, 0x2300, 0xa405, 0x0150, 0x8a51, 0x0904, 0x24ac,
++	0x8840, 0x0c40, 0x6004, 0xa065, 0x0904, 0x24ac, 0x0830, 0x8a51,
++	0x0904, 0x24ac, 0x8840, 0x2805, 0xa005, 0x1158, 0x6004, 0xa065,
++	0x0904, 0x24ac, 0x6034, 0xa0cc, 0x000f, 0xa9c0, 0x23c7, 0x2805,
++	0x2040, 0x2b68, 0x6850, 0xc0fc, 0x6852, 0x0458, 0x8422, 0x8420,
++	0x831a, 0xa399, 0x0000, 0x00d6, 0x2b68, 0x6c6e, 0x6b72, 0x00de,
++	0xd99c, 0x1168, 0x6908, 0x2400, 0xa122, 0x690c, 0x2300, 0xa11b,
++	0x0a0c, 0x1519, 0x6800, 0xa420, 0x6804, 0xa319, 0x0060, 0x6910,
++	0x2400, 0xa122, 0x6914, 0x2300, 0xa11b, 0x0a0c, 0x1519, 0x6800,
++	0xa420, 0x6804, 0xa319, 0x2b68, 0x6c1e, 0x6b22, 0x6850, 0xc0fd,
++	0x6852, 0x2c00, 0x681a, 0x2800, 0x6832, 0x2a00, 0x6826, 0x000e,
++	0x000e, 0x000e, 0xa006, 0x0028, 0x008e, 0x009e, 0x00ae, 0xa085,
++	0x0001, 0x0005, 0x2001, 0x0005, 0x2004, 0xa084, 0x0007, 0x0002,
++	0x24c0, 0x24c1, 0x24c4, 0x24c7, 0x24cc, 0x24cf, 0x24d4, 0x24d9,
++	0x0005, 0x080c, 0x222c, 0x0005, 0x080c, 0x1b83, 0x0005, 0x080c,
++	0x1b83, 0x080c, 0x222c, 0x0005, 0x080c, 0x1729, 0x0005, 0x080c,
++	0x222c, 0x080c, 0x1729, 0x0005, 0x080c, 0x1b83, 0x080c, 0x1729,
++	0x0005, 0x080c, 0x1b83, 0x080c, 0x222c, 0x080c, 0x1729, 0x0005,
++	0x0006, 0x0016, 0x0156, 0x20a9, 0x0009, 0x2009, 0xc977, 0x2104,
++	0xac06, 0x1108, 0x200a, 0xa188, 0x0003, 0x1f04, 0x24e7, 0x015e,
++	0x001e, 0x000e, 0x0005, 0x00e6, 0x00d6, 0x2071, 0xc96a, 0x700c,
++	0x7110, 0xa106, 0x01b8, 0x2104, 0xa005, 0x0138, 0xa080, 0x0004,
++	0x2004, 0x2068, 0x080c, 0x7684, 0x0158, 0xa188, 0x0003, 0xa182,
++	0xc992, 0x0210, 0x2009, 0xc977, 0x700c, 0xa106, 0x1d60, 0x0010,
++	0xa085, 0x0001, 0x00de, 0x00ee, 0x0005, 0x0126, 0x2091, 0x2600,
++	0x2079, 0x0200, 0x2071, 0xcc80, 0x2069, 0xc600, 0x080c, 0x260b,
++	0x080c, 0x25fb, 0x2009, 0x0004, 0x7912, 0x7817, 0x0004, 0x080c,
++	0x29a2, 0x781b, 0x0002, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x20a9,
++	0x0080, 0x782f, 0x0000, 0x1f04, 0x2531, 0x20e1, 0x9080, 0x783b,
++	0x001f, 0x20e1, 0x8700, 0x012e, 0x0005, 0x0126, 0x2091, 0x2600,
++	0x781c, 0xd0a4, 0x190c, 0x25f8, 0xa084, 0x0007, 0x0002, 0x2561,
++	0x254f, 0x2552, 0x2555, 0x255a, 0x255c, 0x255e, 0x2560, 0x080c,
++	0x68c9, 0x0078, 0x080c, 0x6916, 0x0060, 0x080c, 0x68c9, 0x080c,
++	0x6916, 0x0038, 0x0041, 0x0028, 0x0031, 0x0018, 0x0021, 0x0008,
++	0x0011, 0x012e, 0x0005, 0x0006, 0x0016, 0x0026, 0x080c, 0xc5a7,
++	0x7930, 0xa184, 0x0003, 0x01b0, 0x2001, 0xc936, 0x2004, 0xa005,
++	0x0170, 0x2001, 0x0133, 0x2004, 0xa005, 0x090c, 0x1519, 0x00c6,
++	0x2001, 0xc936, 0x2064, 0x080c, 0xa961, 0x00ce, 0x04b8, 0x20e1,
++	0x9040, 0x04a0, 0xa184, 0x0030, 0x01e0, 0x6a00, 0xa286, 0x0003,
++	0x1108, 0x00a0, 0x080c, 0x5f22, 0x1178, 0x2001, 0xc8e6, 0x2003,
++	0x0001, 0x2001, 0xc600, 0x2003, 0x0001, 0xa085, 0x0001, 0x080c,
++	0x5f66, 0x080c, 0x5e5a, 0x0010, 0x080c, 0x4e5b, 0x080c, 0x25fb,
++	0x00a8, 0xa184, 0x00c0, 0x0168, 0x00e6, 0x0036, 0x0046, 0x0056,
++	0x2071, 0xc96a, 0x080c, 0x1ec3, 0x005e, 0x004e, 0x003e, 0x00ee,
++	0x0028, 0xa184, 0x0300, 0x0110, 0x20e1, 0x9020, 0x7932, 0x002e,
++	0x001e, 0x000e, 0x0005, 0x0016, 0x00e6, 0x00f6, 0x2071, 0xc600,
++	0x7128, 0x2001, 0xc8d8, 0x2102, 0x2001, 0xc8e0, 0x2102, 0xa182,
++	0x0211, 0x1218, 0x2009, 0x0008, 0x0400, 0xa182, 0x0259, 0x1218,
++	0x2009, 0x0007, 0x00d0, 0xa182, 0x02c1, 0x1218, 0x2009, 0x0006,
++	0x00a0, 0xa182, 0x0349, 0x1218, 0x2009, 0x0005, 0x0070, 0xa182,
++	0x0421, 0x1218, 0x2009, 0x0004, 0x0040, 0xa182, 0x0581, 0x1218,
++	0x2009, 0x0003, 0x0010, 0x2009, 0x0002, 0x2079, 0x0200, 0x7912,
++	0x7817, 0x0004, 0x080c, 0x29a2, 0x00fe, 0x00ee, 0x001e, 0x0005,
++	0x7938, 0x080c, 0x1519, 0x00e6, 0x0026, 0x2071, 0x0200, 0x20e1,
++	0x1000, 0x7220, 0x7028, 0x7020, 0xa206, 0x0de0, 0x20e1, 0x9010,
++	0x002e, 0x00ee, 0x0005, 0x20e1, 0xa000, 0x7837, 0x0001, 0x782f,
++	0x0000, 0x782f, 0x0000, 0x782f, 0x0000, 0x782f, 0x0000, 0x7837,
++	0x0005, 0x20a9, 0x0210, 0x7830, 0xd0bc, 0x1110, 0x1f04, 0x261b,
++	0x7837, 0x0001, 0x7837, 0x0000, 0xe000, 0xe000, 0x20e1, 0xa000,
++	0x0005, 0x0126, 0x2091, 0x2800, 0x2061, 0x0100, 0x2071, 0xc600,
++	0x6024, 0x6026, 0x6053, 0x0030, 0x080c, 0x29e1, 0x6050, 0xa084,
++	0xfe7f, 0x6052, 0x2009, 0x00ef, 0x6132, 0x6136, 0x080c, 0x29f1,
++	0x60e7, 0x0000, 0x61ea, 0x60e3, 0x0008, 0x604b, 0xf7f7, 0x6043,
++	0x0000, 0x602f, 0x0080, 0x602f, 0x0000, 0x6007, 0x0e9f, 0x601b,
++	0x001e, 0x600f, 0x00ff, 0x2001, 0xc8d4, 0x2003, 0x00ff, 0x602b,
++	0x002f, 0x012e, 0x0005, 0x2001, 0xc632, 0x2003, 0x0000, 0x2001,
++	0xc631, 0x2003, 0x0001, 0x0005, 0x0126, 0x2091, 0x2800, 0x0006,
++	0x0016, 0x0026, 0x6124, 0x0066, 0x2031, 0xc635, 0x2634, 0xa6b4,
++	0x0028, 0x006e, 0x11c0, 0x6020, 0xd0bc, 0x01a8, 0xd1bc, 0x0198,
++	0x783c, 0xa005, 0x0180, 0x00e6, 0x0006, 0x2070, 0x701c, 0xa086,
++	0x0009, 0x000e, 0x00ee, 0x1138, 0x00e6, 0x783c, 0x2070, 0x7008,
++	0xd0fc, 0x00ee, 0x1130, 0xa184, 0x1e2c, 0x1118, 0xa184, 0x0007,
++	0x002a, 0xa195, 0x0004, 0xa284, 0x0007, 0x0002, 0x26b8, 0x269e,
++	0x26a1, 0x26a4, 0x26a9, 0x26ab, 0x26af, 0x26b3, 0x080c, 0x7873,
++	0x00b8, 0x080c, 0x794e, 0x00a0, 0x080c, 0x794e, 0x080c, 0x7873,
++	0x0078, 0x0099, 0x0068, 0x080c, 0x7873, 0x0079, 0x0048, 0x080c,
++	0x794e, 0x0059, 0x0028, 0x080c, 0x794e, 0x080c, 0x7873, 0x0029,
++	0x002e, 0x001e, 0x000e, 0x012e, 0x0005, 0x6124, 0x6028, 0xd09c,
++	0x0118, 0xd19c, 0x1904, 0x2910, 0x080c, 0x5f22, 0x0578, 0x7000,
++	0xa086, 0x0003, 0x0198, 0x6024, 0xa084, 0x1800, 0x0178, 0x080c,
++	0x5f48, 0x0118, 0x080c, 0x5f34, 0x1148, 0x6027, 0x0020, 0x6043,
++	0x0000, 0x2001, 0xc8e5, 0x2003, 0xaaaa, 0x0458, 0x080c, 0x5f48,
++	0x15d0, 0x6024, 0xa084, 0x1800, 0x1108, 0x04a8, 0x2001, 0xc8e5,
++	0x2003, 0xaaaa, 0x2001, 0xc8e6, 0x2003, 0x0001, 0x2001, 0xc600,
++	0x2003, 0x0001, 0x080c, 0x5e5a, 0x0804, 0x2910, 0xd1ac, 0x1518,
++	0x6024, 0xd0dc, 0x1170, 0xd0e4, 0x1188, 0xd0d4, 0x11a0, 0xd0cc,
++	0x0130, 0x708c, 0xa086, 0x0028, 0x1110, 0x080c, 0x60b1, 0x0804,
++	0x2910, 0x2001, 0xc8e6, 0x2003, 0x0000, 0x0048, 0x2001, 0xc8e6,
++	0x2003, 0x0002, 0x0020, 0x080c, 0x6024, 0x0804, 0x2910, 0x080c,
++	0x6156, 0x0804, 0x2910, 0x6220, 0xd1bc, 0x0568, 0xd2bc, 0x0558,
++	0x783c, 0xa005, 0x0540, 0x00e6, 0x2070, 0x7008, 0xd0fc, 0x00ee,
++	0x0510, 0x6028, 0xc0bc, 0x602a, 0x0026, 0x0036, 0x6288, 0x638c,
++	0x608b, 0xbc91, 0x608f, 0xffff, 0x6043, 0x0001, 0xe000, 0xe000,
++	0x6027, 0x0080, 0x6017, 0x0000, 0x6043, 0x0000, 0x628a, 0x638e,
++	0x003e, 0x002e, 0x0016, 0x2001, 0xc696, 0x200c, 0xc184, 0x2102,
++	0x001e, 0x0804, 0x2969, 0xd1ac, 0x0904, 0x284c, 0x0036, 0x6328,
++	0xc3bc, 0x632a, 0x003e, 0x080c, 0x5f22, 0x11d8, 0x6027, 0x0020,
++	0x0006, 0x0026, 0x0036, 0x080c, 0x5f3e, 0x1170, 0x2001, 0xc8e6,
++	0x2003, 0x0001, 0x2001, 0xc600, 0x2003, 0x0001, 0x080c, 0x5e5a,
++	0x003e, 0x002e, 0x000e, 0x0005, 0x003e, 0x002e, 0x000e, 0x080c,
++	0x5ef9, 0x0016, 0x0046, 0x00c6, 0x644c, 0xa486, 0xf0f0, 0x1138,
++	0x2061, 0x0100, 0x644a, 0x6043, 0x0090, 0x6043, 0x0010, 0x74ce,
++	0xa48c, 0xff00, 0x7034, 0xd084, 0x0178, 0xa186, 0xf800, 0x1160,
++	0x703c, 0xd084, 0x1148, 0xc085, 0x703e, 0x0036, 0x2418, 0x2011,
++	0x8016, 0x080c, 0x407d, 0x003e, 0xa196, 0xff00, 0x05b8, 0x7054,
++	0xa084, 0x00ff, 0x810f, 0xa116, 0x0588, 0x7130, 0xd184, 0x1570,
++	0x2011, 0xc653, 0x2214, 0xd2ec, 0x0138, 0xc18d, 0x7132, 0x2011,
++	0xc653, 0x2214, 0xd2ac, 0x1510, 0x6240, 0xa294, 0x0010, 0x0130,
++	0x6248, 0xa294, 0xff00, 0xa296, 0xff00, 0x01c0, 0x7030, 0xd08c,
++	0x0904, 0x2819, 0x7034, 0xd08c, 0x1140, 0x2001, 0xc60c, 0x200c,
++	0xd1ac, 0x1904, 0x2819, 0xc1ad, 0x2102, 0x0036, 0x73cc, 0x2011,
++	0x8013, 0x080c, 0x407d, 0x003e, 0x0804, 0x2819, 0x7034, 0xd08c,
++	0x1140, 0x2001, 0xc60c, 0x200c, 0xd1ac, 0x1904, 0x2819, 0xc1ad,
++	0x2102, 0x0036, 0x73cc, 0x2011, 0x8013, 0x080c, 0x407d, 0x003e,
++	0x7130, 0xc185, 0x7132, 0x2011, 0xc653, 0x220c, 0xd1a4, 0x01d0,
++	0x0016, 0x2009, 0x0001, 0x2011, 0x0100, 0x080c, 0x712e, 0x2019,
++	0x000e, 0x080c, 0xc10d, 0xa484, 0x00ff, 0xa080, 0x2f6e, 0x200d,
++	0xa18c, 0xff00, 0x810f, 0x8127, 0xa006, 0x2009, 0x000e, 0x080c,
++	0xc190, 0x001e, 0x0016, 0x2009, 0x0000, 0x2019, 0x0004, 0x080c,
++	0x2e19, 0x001e, 0x0070, 0x0156, 0x20a9, 0x007f, 0x2009, 0x0000,
++	0x080c, 0x533d, 0x1110, 0x080c, 0x4f47, 0x8108, 0x1f04, 0x2810,
++	0x015e, 0x00ce, 0x004e, 0x2011, 0x0003, 0x080c, 0x8f0e, 0x2011,
++	0x0002, 0x080c, 0x8f18, 0x080c, 0x8dee, 0x0036, 0x2019, 0x0000,
++	0x080c, 0x8e79, 0x003e, 0x60e3, 0x0000, 0x001e, 0x2001, 0xc600,
++	0x2014, 0xa296, 0x0004, 0x1128, 0xd19c, 0x11b0, 0x6228, 0xc29d,
++	0x622a, 0x2003, 0x0001, 0x2001, 0xc623, 0x2003, 0x0000, 0x6027,
++	0x0020, 0x080c, 0x5f48, 0x1140, 0x0016, 0x2009, 0x07d0, 0x2011,
++	0x5e37, 0x080c, 0x7036, 0x001e, 0xd194, 0x0904, 0x2910, 0x0016,
++	0x6220, 0xd2b4, 0x0904, 0x28b5, 0x080c, 0x7024, 0x080c, 0x8bf5,
++	0x6027, 0x0004, 0x00f6, 0x2019, 0xc930, 0x2304, 0xa07d, 0x0570,
++	0x7804, 0xa086, 0x0032, 0x1550, 0x00d6, 0x00c6, 0x00e6, 0x2069,
++	0x0140, 0x618c, 0x6288, 0x7818, 0x608e, 0x7808, 0x608a, 0x6043,
++	0x0002, 0x2001, 0x0003, 0x8001, 0x1df0, 0x6043, 0x0000, 0x6803,
++	0x1000, 0x6803, 0x0000, 0x618e, 0x628a, 0x080c, 0x7db1, 0x080c,
++	0x7e94, 0x7810, 0x2070, 0x7037, 0x0103, 0x2f60, 0x080c, 0x95e3,
++	0x00ee, 0x00ce, 0x00de, 0x00fe, 0x001e, 0x0005, 0x00fe, 0x00d6,
++	0x2069, 0x0140, 0x6804, 0xa084, 0x4000, 0x0120, 0x6803, 0x1000,
++	0x6803, 0x0000, 0x00de, 0x00c6, 0x2061, 0xc927, 0x6028, 0xa09a,
++	0x00c8, 0x1238, 0x8000, 0x602a, 0x00ce, 0x080c, 0x8be8, 0x0804,
++	0x290f, 0x2019, 0xc930, 0x2304, 0xa065, 0x0120, 0x2009, 0x0027,
++	0x080c, 0x9613, 0x00ce, 0x0804, 0x290f, 0xd2bc, 0x0904, 0x290f,
++	0x080c, 0x7031, 0x6014, 0xa084, 0x0184, 0xa085, 0x0010, 0x6016,
++	0x6027, 0x0004, 0x00d6, 0x2069, 0x0140, 0x6804, 0xa084, 0x4000,
++	0x0120, 0x6803, 0x1000, 0x6803, 0x0000, 0x00de, 0x00c6, 0x2061,
++	0xc927, 0x6044, 0xa09a, 0x00c8, 0x1620, 0x8000, 0x6046, 0x603c,
++	0x00ce, 0xa005, 0x05a0, 0x2009, 0x07d0, 0x080c, 0x7029, 0xa080,
++	0x0007, 0x2004, 0xa086, 0x0006, 0x1138, 0x6114, 0xa18c, 0x0184,
++	0xa18d, 0x0012, 0x6116, 0x0418, 0xa080, 0x0007, 0x2004, 0xa086,
++	0x0009, 0x0d98, 0x6114, 0xa18c, 0x0184, 0xa18d, 0x0016, 0x6116,
++	0x00b0, 0x0036, 0x2019, 0x0001, 0x080c, 0x8e79, 0x003e, 0x2019,
++	0xc936, 0x2304, 0xa065, 0x0150, 0x2009, 0x004f, 0x601c, 0xa086,
++	0x0009, 0x1110, 0x2009, 0x0105, 0x080c, 0x9613, 0x00ce, 0x001e,
++	0xd19c, 0x0904, 0x2969, 0x7034, 0xd0ac, 0x1560, 0x0016, 0x0156,
++	0x6027, 0x0008, 0x602f, 0x0020, 0x20a9, 0x0006, 0x1d04, 0x291e,
++	0x2091, 0x6000, 0x1f04, 0x291e, 0x602f, 0x0000, 0x6150, 0xa185,
++	0x1400, 0x6052, 0x20a9, 0x0366, 0x1d04, 0x292c, 0x2091, 0x6000,
++	0x6020, 0xd09c, 0x1130, 0x015e, 0x6152, 0x001e, 0x6027, 0x0008,
++	0x0480, 0x080c, 0x2ab1, 0x1f04, 0x292c, 0x015e, 0x6152, 0x001e,
++	0x6027, 0x0008, 0x0016, 0x6028, 0xc09c, 0x602a, 0x2011, 0x0003,
++	0x080c, 0x8f0e, 0x2011, 0x0002, 0x080c, 0x8f18, 0x080c, 0x8dee,
++	0x0036, 0x2019, 0x0000, 0x080c, 0x8e79, 0x003e, 0x60e3, 0x0000,
++	0x080c, 0xc586, 0x080c, 0xc5a1, 0xa085, 0x0001, 0x080c, 0x5f66,
++	0x2001, 0xc600, 0x2003, 0x0004, 0x6027, 0x0008, 0x080c, 0x12e1,
++	0x001e, 0xa18c, 0xffd0, 0x6126, 0x0005, 0x0006, 0x0016, 0x0026,
++	0x00e6, 0x00f6, 0x0126, 0x2091, 0x8000, 0x2071, 0xc600, 0x71c4,
++	0x70c6, 0xa116, 0x0500, 0x81ff, 0x0128, 0x2011, 0x8011, 0x080c,
++	0x407d, 0x00c8, 0x2011, 0x8012, 0x080c, 0x407d, 0x2001, 0xc672,
++	0x2004, 0xd0fc, 0x1180, 0x0036, 0x00c6, 0x080c, 0x2a3c, 0x080c,
++	0x8dca, 0x2061, 0x0100, 0x2019, 0x0028, 0x2009, 0x0000, 0x080c,
++	0x2e19, 0x00ce, 0x003e, 0x012e, 0x00fe, 0x00ee, 0x002e, 0x001e,
++	0x000e, 0x0005, 0x00c6, 0x00f6, 0x0006, 0x0026, 0x2061, 0x0100,
++	0xa190, 0x29b5, 0x2205, 0x60f2, 0x2011, 0x29c2, 0x2205, 0x60ee,
++	0x002e, 0x000e, 0x00fe, 0x00ce, 0x0005, 0x0840, 0x0840, 0x0840,
++	0x0580, 0x0420, 0x0348, 0x02c0, 0x0258, 0x0210, 0x01a8, 0x01a8,
++	0x01a8, 0x01a8, 0x0140, 0x00f8, 0x00d0, 0x00b0, 0x00a0, 0x2028,
++	0xa18c, 0x00ff, 0x2130, 0xa094, 0xff00, 0x1110, 0x81ff, 0x0118,
++	0x080c, 0x6be0, 0x0038, 0xa080, 0x2f6e, 0x200d, 0xa18c, 0xff00,
++	0x810f, 0xa006, 0x0005, 0xa080, 0x2f6e, 0x200d, 0xa18c, 0x00ff,
++	0x0005, 0x00d6, 0x2069, 0x0140, 0x2001, 0xc615, 0x2003, 0x00ef,
++	0x20a9, 0x0010, 0xa006, 0x6852, 0x6856, 0x1f04, 0x29ec, 0x00de,
++	0x0005, 0x0006, 0x00d6, 0x0026, 0x2069, 0x0140, 0x2001, 0xc615,
++	0x2102, 0x8114, 0x8214, 0x8214, 0x8214, 0x20a9, 0x0010, 0x6853,
++	0x0000, 0xa006, 0x82ff, 0x1128, 0xa184, 0x000f, 0xa080, 0xc5b5,
++	0x2005, 0x6856, 0x8211, 0x1f04, 0x2a01, 0x002e, 0x00de, 0x000e,
++	0x0005, 0x00c6, 0x2061, 0xc600, 0x6030, 0x0110, 0xc09d, 0x0008,
++	0xc09c, 0x6032, 0x00ce, 0x0005, 0x0156, 0x00d6, 0x0026, 0x0016,
++	0x0006, 0x2069, 0x0140, 0x6980, 0xa116, 0x0180, 0xa112, 0x1230,
++	0x8212, 0x8210, 0x22a8, 0x2001, 0x0402, 0x0018, 0x22a8, 0x2001,
++	0x0404, 0x680e, 0x1f04, 0x2a31, 0x680f, 0x0000, 0x000e, 0x001e,
++	0x002e, 0x00de, 0x015e, 0x0005, 0x2001, 0xc653, 0x2004, 0xd0c4,
++	0x0150, 0xd0a4, 0x0140, 0xa006, 0x0046, 0x2020, 0x2009, 0x002e,
++	0x080c, 0xc190, 0x004e, 0x0005, 0x00f6, 0x0016, 0x0026, 0x2079,
++	0x0140, 0x78c4, 0xd0dc, 0x0548, 0xa084, 0x0700, 0xa08e, 0x0300,
++	0x1520, 0x2011, 0x0000, 0x2009, 0x0002, 0x2300, 0xa080, 0x0020,
++	0x2018, 0x2300, 0x080c, 0x783f, 0x2011, 0x0030, 0x2200, 0x8007,
++	0xa085, 0x004c, 0x78c2, 0x2009, 0x0204, 0x210c, 0x2200, 0xa100,
++	0x2009, 0x0138, 0x200a, 0x080c, 0x5f22, 0x1118, 0x2009, 0xc8d6,
++	0x200a, 0x002e, 0x001e, 0x00fe, 0x0005, 0x78c3, 0x0000, 0x0cc8,
++	0x0126, 0x2091, 0x2800, 0x0006, 0x0016, 0x0026, 0x2001, 0x0170,
++	0x200c, 0x8000, 0x2014, 0xa184, 0x0003, 0x0110, 0x0804, 0x1b81,
++	0x002e, 0x001e, 0x000e, 0x012e, 0x0005, 0x0006, 0x2001, 0x0100,
++	0x2004, 0xa082, 0x0005, 0x000e, 0x0268, 0x2001, 0x0170, 0x200c,
++	0xa18c, 0x00ff, 0xa18e, 0x004c, 0x1128, 0x200c, 0xa18c, 0xff00,
++	0x810f, 0x0010, 0x2009, 0x0000, 0x2001, 0x0204, 0x2004, 0xa108,
++	0x0005, 0x0006, 0x0156, 0x00f6, 0x2079, 0x0100, 0x20a9, 0x000a,
++	0x7854, 0xd08c, 0x1110, 0x1f04, 0x2ab8, 0x00fe, 0x015e, 0x000e,
++	0x0005, 0x0016, 0x00c6, 0x0006, 0x2061, 0x0100, 0x6030, 0x0006,
++	0x6048, 0x0006, 0x60e4, 0x0006, 0x60e8, 0x0006, 0x6050, 0x0006,
++	0x60f0, 0x0006, 0x60ec, 0x0006, 0x600c, 0x0006, 0x6004, 0x0006,
++	0x6028, 0x0006, 0x60e0, 0x0006, 0x602f, 0x0100, 0x602f, 0x0000,
++	0xe000, 0xe000, 0xe000, 0xe000, 0x602f, 0x0040, 0x602f, 0x0000,
++	0x000e, 0x60e2, 0x000e, 0x602a, 0x000e, 0x6006, 0x000e, 0x600e,
++	0x000e, 0x60ee, 0x000e, 0x60f2, 0x000e, 0x6052, 0x000e, 0x60ea,
++	0x000e, 0x60e6, 0x000e, 0x604a, 0x000e, 0x6032, 0x6036, 0x2008,
++	0x080c, 0x29f1, 0x000e, 0x00ce, 0x001e, 0x0005, 0x2009, 0x0171,
++	0x2104, 0xd0dc, 0x0140, 0x2009, 0x0170, 0x2104, 0x200b, 0x0080,
++	0xe000, 0xe000, 0x200a, 0x0005, 0x2ba4, 0x2ba8, 0x2bac, 0x2bb2,
++	0x2bb8, 0x2bbe, 0x2bc4, 0x2bcc, 0x2bd4, 0x2bda, 0x2be0, 0x2be8,
++	0x2bf0, 0x2bf8, 0x2c00, 0x2c0a, 0x2c57, 0x2c57, 0x2c57, 0x2c57,
++	0x2c57, 0x2c57, 0x2c57, 0x2c57, 0x2c57, 0x2c57, 0x2c57, 0x2c57,
++	0x2c57, 0x2c57, 0x2c57, 0x2c57, 0x2c14, 0x2c14, 0x2c14, 0x2c14,
++	0x2c14, 0x2c14, 0x2c14, 0x2c14, 0x2c14, 0x2c14, 0x2c14, 0x2c14,
++	0x2c14, 0x2c14, 0x2c14, 0x2c14, 0x2c57, 0x2c57, 0x2c57, 0x2c57,
++	0x2c57, 0x2c57, 0x2c57, 0x2c57, 0x2c57, 0x2c57, 0x2c57, 0x2c57,
++	0x2c57, 0x2c57, 0x2c57, 0x2c57, 0x2c16, 0x2c16, 0x2c1c, 0x2c1c,
++	0x2c23, 0x2c23, 0x2c2a, 0x2c2a, 0x2c33, 0x2c33, 0x2c3a, 0x2c3a,
++	0x2c43, 0x2c43, 0x2c4c, 0x2c4c, 0x2c57, 0x2c57, 0x2c57, 0x2c57,
++	0x2c57, 0x2c57, 0x2c57, 0x2c57, 0x2c57, 0x2c57, 0x2c57, 0x2c57,
++	0x2c57, 0x2c57, 0x2c57, 0x2c57, 0x2c14, 0x2c14, 0x2c14, 0x2c14,
++	0x2c14, 0x2c14, 0x2c14, 0x2c14, 0x2c14, 0x2c14, 0x2c14, 0x2c14,
++	0x2c14, 0x2c14, 0x2c14, 0x2c14, 0x2c57, 0x2c57, 0x2c57, 0x2c57,
++	0x2c57, 0x2c57, 0x2c57, 0x2c57, 0x2c57, 0x2c57, 0x2c57, 0x2c57,
++	0x2c57, 0x2c57, 0x2c57, 0x2c57, 0x2c14, 0x2c14, 0x2c14, 0x2c14,
++	0x2c14, 0x2c14, 0x2c14, 0x2c14, 0x2c14, 0x2c14, 0x2c14, 0x2c14,
++	0x2c14, 0x2c14, 0x2c14, 0x2c14, 0x0106, 0x0006, 0x0804, 0x2c5f,
++	0x0106, 0x0006, 0x0804, 0x2c5f, 0x0106, 0x0006, 0x080c, 0x2664,
++	0x0804, 0x2c5f, 0x0106, 0x0006, 0x080c, 0x2664, 0x0804, 0x2c5f,
++	0x0106, 0x0006, 0x080c, 0x24b2, 0x0804, 0x2c5f, 0x0106, 0x0006,
++	0x080c, 0x24b2, 0x0804, 0x2c5f, 0x0106, 0x0006, 0x080c, 0x2664,
++	0x080c, 0x24b2, 0x0804, 0x2c5f, 0x0106, 0x0006, 0x080c, 0x2664,
++	0x080c, 0x24b2, 0x0804, 0x2c5f, 0x0106, 0x0006, 0x080c, 0x253d,
++	0x0804, 0x2c5f, 0x0106, 0x0006, 0x080c, 0x253d, 0x0804, 0x2c5f,
++	0x0106, 0x0006, 0x080c, 0x2664, 0x080c, 0x253d, 0x0804, 0x2c5f,
++	0x0106, 0x0006, 0x080c, 0x2664, 0x080c, 0x253d, 0x0804, 0x2c5f,
++	0x0106, 0x0006, 0x080c, 0x24b2, 0x080c, 0x253d, 0x0804, 0x2c5f,
++	0x0106, 0x0006, 0x080c, 0x24b2, 0x080c, 0x253d, 0x0804, 0x2c5f,
++	0x0106, 0x0006, 0x080c, 0x2664, 0x080c, 0x24b2, 0x080c, 0x253d,
++	0x0804, 0x2c5f, 0x0106, 0x0006, 0x080c, 0x2664, 0x080c, 0x24b2,
++	0x080c, 0x253d, 0x0804, 0x2c5f, 0xe000, 0x0cf0, 0x0106, 0x0006,
++	0x080c, 0x2a80, 0x0804, 0x2c5f, 0x0106, 0x0006, 0x080c, 0x2a80,
++	0x080c, 0x2664, 0x04e0, 0x0106, 0x0006, 0x080c, 0x2a80, 0x080c,
++	0x24b2, 0x04a8, 0x0106, 0x0006, 0x080c, 0x2a80, 0x080c, 0x2664,
++	0x080c, 0x24b2, 0x0460, 0x0106, 0x0006, 0x080c, 0x2a80, 0x080c,
++	0x253d, 0x0428, 0x0106, 0x0006, 0x080c, 0x2a80, 0x080c, 0x2664,
++	0x080c, 0x253d, 0x00e0, 0x0106, 0x0006, 0x080c, 0x2a80, 0x080c,
++	0x24b2, 0x080c, 0x253d, 0x0098, 0x0106, 0x0006, 0x080c, 0x2a80,
++	0x080c, 0x2664, 0x080c, 0x24b2, 0x080c, 0x253d, 0x0040, 0x20d1,
++	0x0000, 0x20d1, 0x0001, 0x20d1, 0x0000, 0x080c, 0x1519, 0x000e,
++	0x010e, 0x000d, 0x00c6, 0x0026, 0x0046, 0x2021, 0x0000, 0x080c,
++	0x570b, 0x1904, 0x2d3f, 0x72d4, 0x2001, 0xc8e5, 0x2004, 0xa005,
++	0x1110, 0xd29c, 0x0148, 0xd284, 0x1138, 0xd2bc, 0x1904, 0x2d3f,
++	0x080c, 0x2d43, 0x0804, 0x2d3f, 0xd2cc, 0x1904, 0x2d3f, 0x080c,
++	0x5f22, 0x1120, 0x709f, 0xffff, 0x0804, 0x2d3f, 0xd294, 0x0120,
++	0x709f, 0xffff, 0x0804, 0x2d3f, 0x2001, 0xc615, 0x203c, 0x7288,
++	0xd284, 0x0904, 0x2ce1, 0xd28c, 0x1904, 0x2ce1, 0x0036, 0x739c,
++	0xa38e, 0xffff, 0x1110, 0x2019, 0x0001, 0x8314, 0xa2e0, 0xcdc0,
++	0x2c04, 0xa38c, 0x0001, 0x0120, 0xa084, 0xff00, 0x8007, 0x0010,
++	0xa084, 0x00ff, 0xa70e, 0x0560, 0xa08e, 0x0000, 0x0548, 0xa08e,
++	0x00ff, 0x1150, 0x7230, 0xd284, 0x1538, 0x7288, 0xc28d, 0x728a,
++	0x709f, 0xffff, 0x003e, 0x0428, 0x2009, 0x0000, 0x080c, 0x29c7,
++	0x080c, 0x52e1, 0x11b8, 0x6004, 0xa084, 0x00ff, 0xa086, 0x0006,
++	0x1150, 0x7030, 0xd08c, 0x0118, 0x6000, 0xd0bc, 0x0120, 0x080c,
++	0x2d56, 0x0140, 0x0028, 0x080c, 0x2e87, 0x080c, 0x2d84, 0x0110,
++	0x8318, 0x0818, 0x739e, 0x0010, 0x709f, 0xffff, 0x003e, 0x0804,
++	0x2d3f, 0xa780, 0x2f6e, 0x203d, 0xa7bc, 0xff00, 0x873f, 0x2041,
++	0x007e, 0x709c, 0xa096, 0xffff, 0x1120, 0x2009, 0x0000, 0x28a8,
++	0x0050, 0xa812, 0x0220, 0x2008, 0xa802, 0x20a8, 0x0020, 0x709f,
++	0xffff, 0x0804, 0x2d3f, 0x2700, 0x0156, 0x0016, 0xa106, 0x05a0,
++	0xc484, 0x080c, 0x533d, 0x0120, 0x080c, 0x52e1, 0x15a8, 0x0008,
++	0xc485, 0x6004, 0xa084, 0x00ff, 0xa086, 0x0006, 0x1130, 0x7030,
++	0xd08c, 0x01e8, 0x6000, 0xd0bc, 0x11d0, 0x7288, 0xd28c, 0x0188,
++	0x6004, 0xa084, 0x00ff, 0xa082, 0x0006, 0x02b0, 0xd484, 0x1118,
++	0x080c, 0x5300, 0x0028, 0x080c, 0x2f14, 0x0170, 0x080c, 0x2f41,
++	0x0058, 0x080c, 0x2e87, 0x080c, 0x2d84, 0x0170, 0x0028, 0x080c,
++	0x2f14, 0x0110, 0x0419, 0x0140, 0x001e, 0x8108, 0x015e, 0x1f04,
++	0x2cfb, 0x709f, 0xffff, 0x0018, 0x001e, 0x015e, 0x719e, 0x004e,
++	0x002e, 0x00ce, 0x0005, 0x00c6, 0x0016, 0x709f, 0x0001, 0x2009,
++	0x007e, 0x080c, 0x52e1, 0x1138, 0x080c, 0x2e87, 0x04a9, 0x0118,
++	0x70d4, 0xc0bd, 0x70d6, 0x001e, 0x00ce, 0x0005, 0x0016, 0x0076,
++	0x00d6, 0x00c6, 0x2c68, 0x2001, 0xc657, 0x2004, 0xa084, 0x00ff,
++	0x6842, 0x080c, 0xaf0d, 0x01d8, 0x2d00, 0x601a, 0x080c, 0xb05e,
++	0x601f, 0x0001, 0x2001, 0x0000, 0x080c, 0x527f, 0x2001, 0x0000,
++	0x080c, 0x5291, 0x0126, 0x2091, 0x8000, 0x7098, 0x8000, 0x709a,
++	0x012e, 0x2009, 0x0004, 0x080c, 0x9613, 0xa085, 0x0001, 0x00ce,
++	0x00de, 0x007e, 0x001e, 0x0005, 0x0016, 0x0076, 0x00d6, 0x00c6,
++	0x2c68, 0x2001, 0xc657, 0x2004, 0xa084, 0x00ff, 0x6842, 0x080c,
++	0xaf0d, 0x0550, 0x2d00, 0x601a, 0x6800, 0xc0c4, 0x6802, 0x68a0,
++	0xa086, 0x007e, 0x0140, 0x6804, 0xa084, 0x00ff, 0xa086, 0x0006,
++	0x1110, 0x080c, 0x2e46, 0x080c, 0xb05e, 0x601f, 0x0001, 0x2001,
++	0x0000, 0x080c, 0x527f, 0x2001, 0x0002, 0x080c, 0x5291, 0x0126,
++	0x2091, 0x8000, 0x7098, 0x8000, 0x709a, 0x012e, 0x2009, 0x0002,
++	0x080c, 0x9613, 0xa085, 0x0001, 0x00ce, 0x00de, 0x007e, 0x001e,
++	0x0005, 0x00c6, 0x0026, 0x2009, 0x0080, 0x080c, 0x52e1, 0x1120,
++	0x0031, 0x0110, 0x70db, 0xffff, 0x002e, 0x00ce, 0x0005, 0x0016,
++	0x0076, 0x00d6, 0x00c6, 0x2c68, 0x080c, 0x958d, 0x01e8, 0x2d00,
++	0x601a, 0x080c, 0xb05e, 0x601f, 0x0001, 0x2001, 0x0000, 0x080c,
++	0x527f, 0x2001, 0x0002, 0x080c, 0x5291, 0x0126, 0x2091, 0x8000,
++	0x080c, 0x2e46, 0x70dc, 0x8000, 0x70de, 0x012e, 0x2009, 0x0002,
++	0x080c, 0x9613, 0xa085, 0x0001, 0x00ce, 0x00de, 0x007e, 0x001e,
++	0x0005, 0x00c6, 0x00d6, 0x0126, 0x2091, 0x8000, 0x2009, 0x007f,
++	0x080c, 0x52e1, 0x1190, 0x2c68, 0x080c, 0x958d, 0x0170, 0x2d00,
++	0x601a, 0x6312, 0x601f, 0x0001, 0x620a, 0x080c, 0xb05e, 0x2009,
++	0x0022, 0x080c, 0x9613, 0xa085, 0x0001, 0x012e, 0x00de, 0x00ce,
++	0x0005, 0x00e6, 0x00c6, 0x0066, 0x0036, 0x0026, 0x080c, 0x7b22,
++	0x080c, 0x7abb, 0x080c, 0xa090, 0x2130, 0x81ff, 0x0128, 0x20a9,
++	0x007e, 0x2009, 0x0000, 0x0020, 0x20a9, 0x007f, 0x2009, 0x0000,
++	0x0016, 0x080c, 0x533d, 0x1120, 0x080c, 0x553e, 0x080c, 0x4f47,
++	0x001e, 0x8108, 0x1f04, 0x2e30, 0x86ff, 0x1110, 0x080c, 0x11f4,
++	0x002e, 0x003e, 0x006e, 0x00ce, 0x00ee, 0x0005, 0x00e6, 0x00c6,
++	0x0036, 0x0026, 0x0016, 0x6218, 0x2270, 0x72a0, 0x0026, 0x2019,
++	0x0029, 0x080c, 0x7b16, 0x0076, 0x2039, 0x0000, 0x080c, 0x7a0e,
++	0x2c08, 0x080c, 0xbef7, 0x007e, 0x001e, 0x2e60, 0x080c, 0x553e,
++	0x6210, 0x6314, 0x080c, 0x4f47, 0x6212, 0x6316, 0x001e, 0x002e,
++	0x003e, 0x00ce, 0x00ee, 0x0005, 0x00e6, 0x0006, 0x6018, 0xa080,
++	0x0028, 0x2004, 0xa086, 0x0080, 0x0150, 0x2071, 0xc600, 0x7098,
++	0xa005, 0x0110, 0x8001, 0x709a, 0x000e, 0x00ee, 0x0005, 0x2071,
++	0xc600, 0x70dc, 0xa005, 0x0dc0, 0x8001, 0x70de, 0x0ca8, 0x6000,
++	0xc08c, 0x6002, 0x0005, 0x00f6, 0x00e6, 0x00c6, 0x0036, 0x0026,
++	0x0016, 0x0156, 0x2178, 0x81ff, 0x1118, 0x20a9, 0x0001, 0x0098,
++	0x2001, 0xc653, 0x2004, 0xd0c4, 0x0150, 0xd0a4, 0x0140, 0xa006,
++	0x0046, 0x2020, 0x2009, 0x002d, 0x080c, 0xc190, 0x004e, 0x20a9,
++	0x00ff, 0x2011, 0x0000, 0x0026, 0xa28e, 0x007e, 0x0904, 0x2ef3,
++	0xa28e, 0x007f, 0x0904, 0x2ef3, 0xa28e, 0x0080, 0x05e0, 0xa288,
++	0xc77b, 0x210c, 0x81ff, 0x05b8, 0x8fff, 0x1148, 0x2001, 0xc905,
++	0x0006, 0x2003, 0x0001, 0x04d9, 0x000e, 0x2003, 0x0000, 0x00c6,
++	0x2160, 0x2001, 0x0001, 0x080c, 0x5715, 0x00ce, 0x2019, 0x0029,
++	0x080c, 0x7b16, 0x0076, 0x2039, 0x0000, 0x080c, 0x7a0e, 0x00c6,
++	0x0026, 0x2160, 0x6204, 0xa294, 0x00ff, 0xa286, 0x0006, 0x1118,
++	0x6007, 0x0404, 0x0028, 0x2001, 0x0004, 0x8007, 0xa215, 0x6206,
++	0x002e, 0x00ce, 0x0016, 0x2c08, 0x080c, 0xbef7, 0x001e, 0x007e,
++	0x2160, 0x080c, 0x553e, 0x002e, 0x8210, 0x1f04, 0x2eab, 0x015e,
++	0x001e, 0x002e, 0x003e, 0x00ce, 0x00ee, 0x00fe, 0x0005, 0x0046,
++	0x0026, 0x0016, 0x2001, 0xc653, 0x2004, 0xd0c4, 0x0148, 0xd0a4,
++	0x0138, 0xa006, 0x2220, 0x8427, 0x2009, 0x0029, 0x080c, 0xc190,
++	0x001e, 0x002e, 0x004e, 0x0005, 0x0016, 0x0026, 0x0036, 0x00c6,
++	0x7288, 0x82ff, 0x01f8, 0x2011, 0xc653, 0x2214, 0xd2ac, 0x11d0,
++	0x2100, 0x080c, 0x29db, 0x81ff, 0x01b8, 0x2019, 0x0001, 0x8314,
++	0xa2e0, 0xcdc0, 0x2c04, 0xd384, 0x0120, 0xa084, 0xff00, 0x8007,
++	0x0010, 0xa084, 0x00ff, 0xa116, 0x0138, 0xa096, 0x00ff, 0x0110,
++	0x8318, 0x0c68, 0xa085, 0x0001, 0x00ce, 0x003e, 0x002e, 0x001e,
++	0x0005, 0x0016, 0x00c6, 0x0126, 0x2091, 0x8000, 0x0016, 0x0026,
++	0x0036, 0x2110, 0x0026, 0x2019, 0x0029, 0x080c, 0x9132, 0x002e,
++	0x080c, 0xc4e4, 0x003e, 0x002e, 0x001e, 0xa180, 0xc77b, 0x2004,
++	0xa065, 0x0158, 0x0016, 0x00c6, 0x2061, 0xca3c, 0x001e, 0x611a,
++	0x080c, 0x2e46, 0x001e, 0x080c, 0x5300, 0x012e, 0x00ce, 0x001e,
++	0x0005, 0x2001, 0xc635, 0x2004, 0xd0cc, 0x0005, 0x7eef, 0x7de8,
++	0x7ce4, 0x80e2, 0x7be1, 0x80e0, 0x80dc, 0x80da, 0x7ad9, 0x80d6,
++	0x80d5, 0x80d4, 0x80d3, 0x80d2, 0x80d1, 0x79ce, 0x78cd, 0x80cc,
++	0x80cb, 0x80ca, 0x80c9, 0x80c7, 0x80c6, 0x77c5, 0x76c3, 0x80bc,
++	0x80ba, 0x75b9, 0x80b6, 0x74b5, 0x73b4, 0x72b3, 0x80b2, 0x80b1,
++	0x80ae, 0x71ad, 0x80ac, 0x70ab, 0x6faa, 0x6ea9, 0x80a7, 0x6da6,
++	0x6ca5, 0x6ba3, 0x6a9f, 0x699e, 0x689d, 0x809b, 0x8098, 0x6797,
++	0x6690, 0x658f, 0x6488, 0x6384, 0x6282, 0x8081, 0x8080, 0x617c,
++	0x607a, 0x8079, 0x5f76, 0x8075, 0x8074, 0x8073, 0x8072, 0x8071,
++	0x806e, 0x5e6d, 0x806c, 0x5d6b, 0x5c6a, 0x5b69, 0x8067, 0x5a66,
++	0x5965, 0x5863, 0x575c, 0x565a, 0x5559, 0x8056, 0x8055, 0x5454,
++	0x5353, 0x5252, 0x5151, 0x504e, 0x4f4d, 0x804c, 0x804b, 0x4e4a,
++	0x4d49, 0x8047, 0x4c46, 0x8045, 0x8043, 0x803c, 0x803a, 0x8039,
++	0x8036, 0x4b35, 0x8034, 0x4a33, 0x4932, 0x4831, 0x802e, 0x472d,
++	0x462c, 0x452b, 0x442a, 0x4329, 0x4227, 0x8026, 0x8025, 0x4123,
++	0x401f, 0x3f1e, 0x3e1d, 0x3d1b, 0x3c18, 0x8017, 0x8010, 0x3b0f,
++	0x3a08, 0x8004, 0x3902, 0x8001, 0x8000, 0x8000, 0x3800, 0x3700,
++	0x3600, 0x8000, 0x3500, 0x8000, 0x8000, 0x8000, 0x3400, 0x8000,
++	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x3300, 0x3200, 0x8000,
++	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x3100, 0x3000, 0x8000,
++	0x8000, 0x2f00, 0x8000, 0x2e00, 0x2d00, 0x2c00, 0x8000, 0x8000,
++	0x8000, 0x2b00, 0x8000, 0x2a00, 0x2900, 0x2800, 0x8000, 0x2700,
++	0x2600, 0x2500, 0x2400, 0x2300, 0x2200, 0x8000, 0x8000, 0x2100,
++	0x2000, 0x1f00, 0x1e00, 0x1d00, 0x1c00, 0x8000, 0x8000, 0x1b00,
++	0x1a00, 0x8000, 0x1900, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000,
++	0x8000, 0x1800, 0x8000, 0x1700, 0x1600, 0x1500, 0x8000, 0x1400,
++	0x1300, 0x1200, 0x1100, 0x1000, 0x0f00, 0x8000, 0x8000, 0x0e00,
++	0x0d00, 0x0c00, 0x0b00, 0x0a00, 0x0900, 0x8000, 0x8000, 0x0800,
++	0x0700, 0x8000, 0x0600, 0x8000, 0x8000, 0x8000, 0x0500, 0x0400,
++	0x0300, 0x8000, 0x0200, 0x8000, 0x8000, 0x8000, 0x0100, 0x8000,
++	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x0000, 0x8000, 0x8000,
++	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000,
++	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x2071, 0xc6a2,
++	0x7003, 0x0002, 0xa006, 0x7012, 0x7016, 0x703a, 0x703e, 0x7033,
++	0xc6b2, 0x7037, 0xc6b2, 0x7007, 0x0001, 0x2061, 0xc6f2, 0x6003,
++	0x0002, 0x0005, 0x1004, 0x3094, 0x0e04, 0x3094, 0x2071, 0xc6a2,
++	0x2b78, 0x7818, 0xd084, 0x1140, 0x2a60, 0x7820, 0xa08e, 0x0069,
++	0x1904, 0x3179, 0x0804, 0x3112, 0x0005, 0x2071, 0xc6a2, 0x7004,
++	0x0002, 0x309d, 0x309e, 0x30a7, 0x30b8, 0x0005, 0x1004, 0x30a6,
++	0x0e04, 0x30a6, 0x2b78, 0x7818, 0xd084, 0x01e8, 0x0005, 0x2b78,
++	0x2061, 0xc6f2, 0x6008, 0xa08e, 0x0100, 0x0128, 0xa086, 0x0200,
++	0x0904, 0x3173, 0x0005, 0x7014, 0x2068, 0x2a60, 0x7018, 0x0807,
++	0x7010, 0x2068, 0x6834, 0xa086, 0x0103, 0x0108, 0x0005, 0x2a60,
++	0x2b78, 0x7018, 0x0807, 0x2a60, 0x7820, 0xa08a, 0x0040, 0x1210,
++	0x61c4, 0x0042, 0x2100, 0xa08a, 0x003f, 0x1a04, 0x3170, 0x61c4,
++	0x0804, 0x3112, 0x3154, 0x317f, 0x3187, 0x318b, 0x3193, 0x3199,
++	0x319d, 0x31a9, 0x31ac, 0x31b6, 0x31b9, 0x3170, 0x3170, 0x3170,
++	0x31bc, 0x3170, 0x31cb, 0x31e2, 0x31f9, 0x3273, 0x3278, 0x32a1,
++	0x32f2, 0x3303, 0x3322, 0x335a, 0x3364, 0x3371, 0x3384, 0x33a5,
++	0x33ae, 0x33e4, 0x33ea, 0x3170, 0x3413, 0x3170, 0x3170, 0x3170,
++	0x3170, 0x3170, 0x341a, 0x3424, 0x3170, 0x3170, 0x3170, 0x3170,
++	0x3170, 0x3170, 0x3170, 0x3170, 0x342c, 0x3170, 0x3170, 0x3170,
++	0x3170, 0x3170, 0x343e, 0x3448, 0x3170, 0x3170, 0x3170, 0x3170,
++	0x3170, 0x3170, 0x0002, 0x3472, 0x34c6, 0x3521, 0x353b, 0x3170,
++	0x356c, 0x399f, 0x456f, 0x3170, 0x3170, 0x3170, 0x3170, 0x3170,
++	0x3170, 0x3170, 0x3170, 0x31b6, 0x31b9, 0x39a1, 0x3170, 0x39ae,
++	0x4608, 0x4663, 0x46c7, 0x3170, 0x472a, 0x4754, 0x4773, 0x47a5,
++	0x3170, 0x3170, 0x3170, 0x39b2, 0x3b57, 0x3b71, 0x3b8f, 0x3bf0,
++	0x3c50, 0x3c5b, 0x3c93, 0x3ca2, 0x3cb1, 0x3cb4, 0x3cd7, 0x3d21,
++	0x3d97, 0x3da4, 0x3ea5, 0x3fd4, 0x3ffd, 0x40fb, 0x411d, 0x4129,
++	0x4162, 0x4232, 0x428c, 0x4352, 0x43a4, 0x4404, 0x4419, 0x4434,
++	0x44a6, 0x4558, 0x713c, 0x0000, 0x2021, 0x4000, 0x080c, 0x405a,
++	0x0126, 0x2091, 0x8000, 0x0e04, 0x3160, 0x7818, 0xd084, 0x0110,
++	0x012e, 0x0cb0, 0x7c22, 0x7926, 0x7a2a, 0x7b2e, 0x781b, 0x0001,
++	0x2091, 0x4080, 0x7007, 0x0001, 0x2091, 0x5000, 0x012e, 0x0005,
++	0x2021, 0x4001, 0x0c18, 0x2021, 0x4002, 0x0c00, 0x2021, 0x4003,
++	0x08e8, 0x2021, 0x4005, 0x08d0, 0x2021, 0x4006, 0x08b8, 0xa02e,
++	0x2520, 0x7b28, 0x7a2c, 0x7824, 0x7930, 0x0804, 0x4067, 0x7823,
++	0x0004, 0x7824, 0x0807, 0xa02e, 0x2520, 0x7b28, 0x7a2c, 0x7824,
++	0x7930, 0x0804, 0x406a, 0x7924, 0x7828, 0x2114, 0x200a, 0x0804,
++	0x3154, 0x7924, 0x2114, 0x0804, 0x3154, 0x2099, 0x0009, 0x20a1,
++	0x0009, 0x20a9, 0x0007, 0x53a3, 0x7924, 0x7a28, 0x7b2c, 0x0804,
++	0x3154, 0x7824, 0x2060, 0x0090, 0x2009, 0x0002, 0x2011, 0x0002,
++	0x2019, 0x0005, 0x783b, 0x0037, 0x0804, 0x3154, 0x7d38, 0x7c3c,
++	0x0840, 0x7d38, 0x7c3c, 0x0888, 0x2061, 0x1000, 0xe10c, 0xa006,
++	0x2c15, 0xa200, 0x8c60, 0x8109, 0x1dd8, 0x2010, 0xa005, 0x0904,
++	0x3154, 0x0804, 0x3176, 0x2069, 0xc652, 0x7824, 0x7930, 0xa11a,
++	0x1a04, 0x317c, 0x8019, 0x0904, 0x317c, 0x684a, 0x6942, 0x782c,
++	0x6852, 0x7828, 0x6856, 0xa006, 0x685a, 0x685e, 0x080c, 0x61f8,
++	0x0804, 0x3154, 0x2069, 0xc652, 0x7824, 0x7934, 0xa11a, 0x1a04,
++	0x317c, 0x8019, 0x0904, 0x317c, 0x684e, 0x6946, 0x782c, 0x6862,
++	0x7828, 0x6866, 0xa006, 0x686a, 0x686e, 0x080c, 0x57d7, 0x0804,
++	0x3154, 0xa02e, 0x2520, 0x81ff, 0x1904, 0x3179, 0x7924, 0x7b28,
++	0x7a2c, 0x20a9, 0x0005, 0x20a1, 0xc6a9, 0x41a1, 0x080c, 0x4026,
++	0x0904, 0x3179, 0x2009, 0x0020, 0x080c, 0x4067, 0x701b, 0x3211,
++	0x0005, 0x6834, 0x2008, 0xa084, 0x00ff, 0xa096, 0x0011, 0x0138,
++	0xa096, 0x0019, 0x0120, 0xa096, 0x0015, 0x1904, 0x3179, 0x810f,
++	0xa18c, 0x00ff, 0x0904, 0x3179, 0x710e, 0x700c, 0x8001, 0x0528,
++	0x700e, 0x080c, 0x4026, 0x0904, 0x3179, 0x2009, 0x0020, 0x2061,
++	0xc6f2, 0x6224, 0x6328, 0x642c, 0x6530, 0xa290, 0x0040, 0xa399,
++	0x0000, 0xa4a1, 0x0000, 0xa5a9, 0x0000, 0x080c, 0x4067, 0x701b,
++	0x3242, 0x0005, 0x6834, 0xa084, 0x00ff, 0xa096, 0x0002, 0x0120,
++	0xa096, 0x000a, 0x1904, 0x3179, 0x08c0, 0x7010, 0x2068, 0x6838,
++	0xc0fd, 0x683a, 0x080c, 0x51dd, 0x1128, 0x7007, 0x0003, 0x701b,
++	0x325c, 0x0005, 0x080c, 0x592e, 0x0126, 0x2091, 0x8000, 0x20a9,
++	0x0005, 0x2099, 0xc6a9, 0x530a, 0x2100, 0xa210, 0xa399, 0x0000,
++	0xa4a1, 0x0000, 0xa5a9, 0x0000, 0xad80, 0x000d, 0x2009, 0x0020,
++	0x012e, 0x0804, 0x406a, 0x61ac, 0x7824, 0x60ae, 0x0804, 0x3154,
++	0x2091, 0x8000, 0x7823, 0x4000, 0x7827, 0x4953, 0x782b, 0x5020,
++	0x782f, 0x2020, 0x2009, 0x017f, 0x2104, 0x7832, 0x3f00, 0x7836,
++	0x2061, 0x0100, 0x6200, 0x2061, 0x0200, 0x603c, 0x8007, 0xa205,
++	0x783a, 0x2009, 0x04fd, 0x2104, 0x783e, 0x781b, 0x0001, 0x2091,
++	0x5000, 0x2091, 0x4080, 0x2071, 0x0010, 0x20c1, 0x00f0, 0x0804,
++	0x0427, 0x81ff, 0x1904, 0x3179, 0x7924, 0x810f, 0xa18c, 0x00ff,
++	0x080c, 0x533d, 0x1904, 0x317c, 0x7e38, 0xa684, 0x3fff, 0xa082,
++	0x4000, 0x0210, 0x0804, 0x317c, 0x7c28, 0x7d2c, 0x080c, 0x5505,
++	0xd28c, 0x1118, 0x080c, 0x54ae, 0x0010, 0x080c, 0x54de, 0x1518,
++	0x2061, 0xce00, 0x0126, 0x2091, 0x8000, 0x6000, 0xa086, 0x0000,
++	0x0148, 0x6010, 0xa06d, 0x0130, 0x683c, 0xa406, 0x1118, 0x6840,
++	0xa506, 0x0150, 0x012e, 0xace0, 0x0018, 0x2001, 0xc617, 0x2004,
++	0xac02, 0x1a04, 0x3179, 0x0c30, 0x080c, 0xa961, 0x012e, 0x0904,
++	0x3179, 0x0804, 0x3154, 0xa00e, 0x2001, 0x0005, 0x080c, 0x592e,
++	0x0126, 0x2091, 0x8000, 0x080c, 0xaf09, 0x080c, 0x580a, 0x012e,
++	0x0804, 0x3154, 0x81ff, 0x1904, 0x3179, 0x080c, 0x403b, 0x0904,
++	0x317c, 0x080c, 0x5403, 0x0904, 0x3179, 0x080c, 0x5511, 0x0904,
++	0x3179, 0x0804, 0x3154, 0x81ff, 0x1904, 0x3179, 0x080c, 0x404b,
++	0x0904, 0x317c, 0x080c, 0x557d, 0x0904, 0x3179, 0x2019, 0x0005,
++	0x7924, 0x080c, 0x552c, 0x0904, 0x3179, 0x7828, 0xa08a, 0x1000,
++	0x1a04, 0x317c, 0x8003, 0x800b, 0x810b, 0xa108, 0x080c, 0x6fb9,
++	0x0804, 0x3154, 0x0126, 0x2091, 0x8000, 0x81ff, 0x0118, 0x2009,
++	0x0001, 0x0450, 0x2029, 0x00ff, 0x6450, 0x2400, 0xa506, 0x01f8,
++	0x2508, 0x080c, 0x533d, 0x11d8, 0x080c, 0x557d, 0x1128, 0x2009,
++	0x0002, 0x62b4, 0x2518, 0x00c0, 0x2019, 0x0004, 0xa00e, 0x080c,
++	0x552c, 0x1118, 0x2009, 0x0006, 0x0078, 0x7824, 0xa08a, 0x1000,
++	0x1270, 0x8003, 0x800b, 0x810b, 0xa108, 0x080c, 0x6fb9, 0x8529,
++	0x1ae0, 0x012e, 0x0804, 0x3154, 0x012e, 0x0804, 0x3179, 0x012e,
++	0x0804, 0x317c, 0x080c, 0x403b, 0x0904, 0x317c, 0x080c, 0x5469,
++	0x080c, 0x5505, 0x0804, 0x3154, 0x81ff, 0x1904, 0x3179, 0x080c,
++	0x403b, 0x0904, 0x317c, 0x080c, 0x545a, 0x080c, 0x5505, 0x0804,
++	0x3154, 0x81ff, 0x1904, 0x3179, 0x080c, 0x403b, 0x0904, 0x317c,
++	0x080c, 0x54e0, 0x0904, 0x3179, 0x080c, 0x5221, 0x080c, 0x54a7,
++	0x080c, 0x5505, 0x0804, 0x3154, 0x080c, 0x403b, 0x0904, 0x317c,
++	0x080c, 0x5403, 0x0904, 0x3179, 0x62a0, 0x2019, 0x0005, 0x00c6,
++	0x080c, 0x553e, 0x2061, 0x0000, 0x080c, 0x7b16, 0x0076, 0x2039,
++	0x0000, 0x080c, 0x7a0e, 0x2009, 0x0000, 0x080c, 0xbef7, 0x007e,
++	0x00ce, 0x080c, 0x5505, 0x0804, 0x3154, 0x080c, 0x403b, 0x0904,
++	0x317c, 0x080c, 0x5505, 0x2208, 0x0804, 0x3154, 0x0156, 0x00d6,
++	0x00e6, 0x2069, 0xc734, 0x6810, 0x6914, 0xa10a, 0x1210, 0x2009,
++	0x0000, 0x6816, 0x2011, 0x0000, 0x2019, 0x0000, 0x20a9, 0x007e,
++	0x2069, 0xc77b, 0x2d04, 0xa075, 0x0130, 0x704c, 0x0071, 0xa210,
++	0x7080, 0x0059, 0xa318, 0x8d68, 0x1f04, 0x33c2, 0x2300, 0xa218,
++	0x00ee, 0x00de, 0x015e, 0x0804, 0x3154, 0x00f6, 0x0016, 0xa07d,
++	0x0140, 0x2001, 0x0000, 0x8000, 0x2f0c, 0x81ff, 0x0110, 0x2178,
++	0x0cd0, 0x001e, 0x00fe, 0x0005, 0x2069, 0xc734, 0x6910, 0x62b0,
++	0x0804, 0x3154, 0x81ff, 0x1904, 0x3179, 0x6150, 0xa190, 0x2f6e,
++	0x2215, 0xa294, 0x00ff, 0x6370, 0x83ff, 0x0108, 0x6274, 0x67d4,
++	0xd79c, 0x0118, 0x2031, 0x0001, 0x0090, 0xd7ac, 0x0118, 0x2031,
++	0x0003, 0x0068, 0xd7a4, 0x0118, 0x2031, 0x0002, 0x0040, 0x080c,
++	0x5f22, 0x1118, 0x2031, 0x0004, 0x0010, 0x2031, 0x0000, 0x7e3a,
++	0x7f3e, 0x0804, 0x3154, 0x6140, 0x6244, 0x2019, 0xc8fd, 0x231c,
++	0x0804, 0x3154, 0x0126, 0x2091, 0x8000, 0x6134, 0xa006, 0x2010,
++	0x6338, 0x012e, 0x0804, 0x3154, 0x080c, 0x404b, 0x0904, 0x317c,
++	0x6244, 0x6338, 0x0804, 0x3154, 0x6140, 0x6244, 0x7824, 0x6042,
++	0x7b28, 0x6346, 0x2069, 0xc652, 0x831f, 0xa305, 0x6816, 0x782c,
++	0x2069, 0xc8fd, 0x2d1c, 0x206a, 0x0804, 0x3154, 0x0126, 0x2091,
++	0x8000, 0x7824, 0x6036, 0x782c, 0x603a, 0x012e, 0x0804, 0x3154,
++	0x7838, 0xa005, 0x01a8, 0x7828, 0xa025, 0x0904, 0x317c, 0x782c,
++	0xa02d, 0x0904, 0x317c, 0xa00e, 0x080c, 0x533d, 0x1120, 0x6244,
++	0x6338, 0x6446, 0x653a, 0xa186, 0x00ff, 0x0190, 0x8108, 0x0ca0,
++	0x080c, 0x404b, 0x0904, 0x317c, 0x7828, 0xa00d, 0x0904, 0x317c,
++	0x782c, 0xa005, 0x0904, 0x317c, 0x6244, 0x6146, 0x6338, 0x603a,
++	0x0804, 0x3154, 0x2001, 0xc600, 0x2004, 0xa086, 0x0003, 0x1904,
++	0x3179, 0x00c6, 0x2061, 0x0100, 0x7924, 0x810f, 0xa18c, 0x00ff,
++	0xa196, 0x00ff, 0x1130, 0x2001, 0xc615, 0x2004, 0xa085, 0xff00,
++	0x0078, 0xa182, 0x007f, 0x16a0, 0xa188, 0x2f6e, 0x210d, 0xa18c,
++	0x00ff, 0x2001, 0xc615, 0x2004, 0xa116, 0x0550, 0x810f, 0xa105,
++	0x0126, 0x2091, 0x8000, 0x0006, 0x080c, 0x958d, 0x000e, 0x01e0,
++	0x601a, 0x600b, 0xbc09, 0x601f, 0x0001, 0x080c, 0x4026, 0x01d8,
++	0x6837, 0x0000, 0x7007, 0x0003, 0x6833, 0x0000, 0x6838, 0xc0fd,
++	0x683a, 0x701b, 0x351a, 0x2d00, 0x6012, 0x2009, 0x0032, 0x080c,
++	0x9613, 0x012e, 0x00ce, 0x0005, 0x012e, 0x00ce, 0x0804, 0x3179,
++	0x00ce, 0x0804, 0x317c, 0x080c, 0x95e3, 0x0cb0, 0x2001, 0xc600,
++	0x2004, 0xa086, 0x0003, 0x1904, 0x3179, 0x00c6, 0x2061, 0x0100,
++	0x7924, 0x810f, 0xa18c, 0x00ff, 0xa196, 0x00ff, 0x1130, 0x2001,
++	0xc615, 0x2004, 0xa085, 0xff00, 0x0078, 0xa182, 0x007f, 0x16a0,
++	0xa188, 0x2f6e, 0x210d, 0xa18c, 0x00ff, 0x2001, 0xc615, 0x2004,
++	0xa116, 0x0550, 0x810f, 0xa105, 0x0126, 0x2091, 0x8000, 0x0006,
++	0x080c, 0x958d, 0x000e, 0x01e0, 0x601a, 0x600b, 0xbc05, 0x601f,
++	0x0001, 0x080c, 0x4026, 0x01d8, 0x6837, 0x0000, 0x7007, 0x0003,
++	0x6833, 0x0000, 0x6838, 0xc0fd, 0x683a, 0x701b, 0x351a, 0x2d00,
++	0x6012, 0x2009, 0x0032, 0x080c, 0x9613, 0x012e, 0x00ce, 0x0005,
++	0x012e, 0x00ce, 0x0804, 0x3179, 0x00ce, 0x0804, 0x317c, 0x080c,
++	0x95e3, 0x0cb0, 0x6830, 0xa086, 0x0100, 0x0904, 0x3179, 0x0804,
++	0x3154, 0x2061, 0xc9bc, 0x0126, 0x2091, 0x8000, 0x6000, 0xd084,
++	0x0178, 0x6104, 0x6208, 0x2a60, 0x6068, 0x783a, 0x60b4, 0x783e,
++	0x60b0, 0x2019, 0x0072, 0x201a, 0x6348, 0x012e, 0x0804, 0x3154,
++	0xa00e, 0x2110, 0x0c80, 0x81ff, 0x1904, 0x3179, 0x080c, 0x5f22,
++	0x0904, 0x3179, 0x0126, 0x2091, 0x8000, 0x6248, 0x6068, 0xa202,
++	0x0248, 0xa085, 0x0001, 0x080c, 0x2a11, 0x080c, 0x4968, 0x012e,
++	0x0804, 0x3154, 0x012e, 0x0804, 0x317c, 0x0006, 0x0016, 0x00c6,
++	0x00e6, 0x2001, 0xc906, 0x2070, 0x2061, 0xc652, 0x6008, 0x2072,
++	0x2009, 0x0000, 0x2011, 0x1000, 0x080c, 0x783f, 0x7206, 0x00ee,
++	0x00ce, 0x001e, 0x000e, 0x0005, 0x0126, 0x2091, 0x8000, 0x7824,
++	0xa084, 0x0007, 0x0002, 0x357e, 0x3587, 0x358e, 0x357b, 0x357b,
++	0x357b, 0x357b, 0x357b, 0x012e, 0x0804, 0x317c, 0x2009, 0x0114,
++	0x2104, 0xa085, 0x0800, 0x200a, 0x080c, 0x36f9, 0x0070, 0x2009,
++	0x010b, 0x200b, 0x0010, 0x080c, 0x36f9, 0x0038, 0x81ff, 0x0128,
++	0x012e, 0x2021, 0x400b, 0x0804, 0x3156, 0x0086, 0x0096, 0x00a6,
++	0x00b6, 0x00c6, 0x00d6, 0x00e6, 0x00f6, 0x080c, 0x3555, 0x2009,
++	0x0101, 0x210c, 0x0016, 0x2001, 0x0138, 0x200c, 0x2003, 0x0001,
++	0x0016, 0x2001, 0x007a, 0x2034, 0x2001, 0x007b, 0x202c, 0xa006,
++	0x2048, 0x2050, 0x2058, 0x080c, 0x3944, 0x080c, 0x38a8, 0xa03e,
++	0x2720, 0x00f6, 0x00e6, 0x00c6, 0x2d60, 0x2071, 0xc992, 0x2079,
++	0x0020, 0x00d6, 0x2069, 0x0000, 0x6824, 0xd0b4, 0x0140, 0x2001,
++	0x007d, 0x2004, 0x783e, 0x2001, 0x007c, 0x2004, 0x783a, 0x00de,
++	0x2011, 0x0001, 0x080c, 0x3854, 0x080c, 0x3854, 0x00ce, 0x00ee,
++	0x00fe, 0x080c, 0x379f, 0x080c, 0x387c, 0x080c, 0x37f9, 0x080c,
++	0x375e, 0x080c, 0x378f, 0x00f6, 0x2079, 0x0100, 0x7824, 0xd094,
++	0x0530, 0x7814, 0xa084, 0x0184, 0xa085, 0x0010, 0x7816, 0x2079,
++	0x0140, 0x080c, 0x36d7, 0x1110, 0x00fe, 0x0430, 0x7804, 0xd0dc,
++	0x0dc0, 0x2079, 0x0100, 0x7827, 0x0086, 0x7814, 0xa084, 0x0184,
++	0xa085, 0x0032, 0x7816, 0x080c, 0x36d7, 0x1110, 0x00fe, 0x00a0,
++	0x7824, 0xd0bc, 0x0dc0, 0x7827, 0x0080, 0xa026, 0x7c16, 0x7824,
++	0xd0ac, 0x0130, 0x8b58, 0x080c, 0x36e1, 0x00fe, 0x0804, 0x36a1,
++	0x00fe, 0x080c, 0x36d7, 0x1150, 0x8948, 0x2001, 0x007a, 0x2602,
++	0x2001, 0x007b, 0x2502, 0x080c, 0x36e1, 0x0088, 0x87ff, 0x0140,
++	0x2001, 0x0201, 0x2004, 0xa005, 0x1904, 0x35db, 0x8739, 0x0038,
++	0x2001, 0xc96a, 0x2004, 0xa086, 0x0000, 0x1904, 0x35db, 0x2001,
++	0x0033, 0x2003, 0x00f6, 0x8631, 0x1208, 0x8529, 0x2500, 0xa605,
++	0x0904, 0x36a1, 0x7824, 0xd0bc, 0x0128, 0x2900, 0xaa05, 0xab05,
++	0x1904, 0x36a1, 0x6033, 0x000d, 0x2001, 0x0030, 0x2003, 0x0004,
++	0x7824, 0xd0ac, 0x1148, 0x2001, 0xc96a, 0x2003, 0x0003, 0x2001,
++	0x0030, 0x2003, 0x0009, 0x0040, 0x6027, 0x0001, 0x2001, 0x0075,
++	0x2004, 0xa005, 0x0108, 0x6026, 0x2c00, 0x601a, 0x20e1, 0x9040,
++	0x2d00, 0x681a, 0x6833, 0x000d, 0x7824, 0xd0a4, 0x1180, 0x6827,
++	0x0000, 0x00c6, 0x20a9, 0x0004, 0x2061, 0x0020, 0x6003, 0x0008,
++	0x2001, 0x0203, 0x2004, 0x1f04, 0x3676, 0x00ce, 0x0040, 0x6827,
++	0x0001, 0x2001, 0x0074, 0x2004, 0xa005, 0x0108, 0x6826, 0x00f6,
++	0x00c6, 0x2079, 0x0100, 0x2061, 0x0020, 0x7827, 0x0002, 0x2001,
++	0x0072, 0x2004, 0xa084, 0xfff8, 0x601a, 0x0006, 0x2001, 0x0073,
++	0x2004, 0x601e, 0x78c6, 0x000e, 0x78ca, 0x00ce, 0x00fe, 0x0804,
++	0x35b9, 0x2061, 0x0100, 0x6027, 0x0002, 0x001e, 0x61e2, 0x001e,
++	0x6106, 0x7824, 0xa084, 0x0003, 0xa086, 0x0002, 0x0188, 0x20e1,
++	0x9028, 0x6050, 0xa084, 0xf7ef, 0x6052, 0x602f, 0x0000, 0x602c,
++	0xc0ac, 0x602e, 0x604b, 0xf7f7, 0x6043, 0x0090, 0x6043, 0x0010,
++	0x2908, 0x2a10, 0x2b18, 0x2b00, 0xaa05, 0xa905, 0x00fe, 0x00ee,
++	0x00de, 0x00ce, 0x00be, 0x00ae, 0x009e, 0x008e, 0x1118, 0x012e,
++	0x0804, 0x3154, 0x012e, 0x2021, 0x400c, 0x0804, 0x3156, 0xa085,
++	0x0001, 0x1d04, 0x36e0, 0x2091, 0x6000, 0x8420, 0xa486, 0x0064,
++	0x0005, 0x2001, 0x0105, 0x2003, 0x0010, 0x2001, 0x0030, 0x2003,
++	0x0004, 0x2001, 0x0020, 0x2003, 0x0004, 0x2001, 0xc96a, 0x2003,
++	0x0000, 0x2001, 0xc992, 0x2003, 0x0000, 0x20e1, 0xf000, 0xa026,
++	0x0005, 0x00f6, 0x2079, 0x0100, 0x2001, 0xc615, 0x200c, 0x7932,
++	0x7936, 0x080c, 0x29f1, 0x7850, 0xa084, 0x0980, 0xa085, 0x0030,
++	0x7852, 0x2019, 0x01f4, 0x8319, 0x1df0, 0xa084, 0x0980, 0x7852,
++	0x782c, 0xc0ad, 0x782e, 0x20a9, 0x0046, 0x1d04, 0x3715, 0x2091,
++	0x6000, 0x1f04, 0x3715, 0x7850, 0xa085, 0x0400, 0x7852, 0x2001,
++	0x0009, 0x2004, 0xa084, 0x0003, 0xa086, 0x0001, 0x1118, 0x782c,
++	0xc0ac, 0x782e, 0x784b, 0xf7f7, 0x7843, 0x0090, 0x7843, 0x0010,
++	0x20a9, 0x000e, 0xe000, 0x1f04, 0x3732, 0x7850, 0xa085, 0x1400,
++	0x7852, 0x2019, 0x61a8, 0x7854, 0xe000, 0xe000, 0xd08c, 0x1110,
++	0x8319, 0x1dc8, 0x7827, 0x0048, 0x7850, 0xa085, 0x0400, 0x7852,
++	0x7843, 0x0040, 0x2019, 0x01f4, 0xe000, 0xe000, 0x8319, 0x1de0,
++	0x2001, 0x0140, 0x2003, 0x0100, 0x7827, 0x0020, 0x7843, 0x0000,
++	0x2003, 0x0000, 0x7827, 0x0048, 0x00fe, 0x0005, 0x7824, 0xd0ac,
++	0x11c8, 0x00f6, 0x00e6, 0x2071, 0xc96a, 0x2079, 0x0030, 0x2001,
++	0x0201, 0x2004, 0xa005, 0x0160, 0x7000, 0xa086, 0x0000, 0x1140,
++	0x0051, 0xd0bc, 0x0108, 0x8738, 0x7003, 0x0003, 0x7803, 0x0019,
++	0x00ee, 0x00fe, 0x0005, 0x780c, 0xa08c, 0x0070, 0x0178, 0x2009,
++	0x007a, 0x260a, 0x2009, 0x007b, 0x250a, 0xd0b4, 0x0108, 0x8a50,
++	0xd0ac, 0x0108, 0x8948, 0xd0a4, 0x0108, 0x8b58, 0x0005, 0x00f6,
++	0x2079, 0x0200, 0x781c, 0xd084, 0x0140, 0x20e1, 0x0007, 0x20e1,
++	0x2000, 0x2001, 0x020a, 0x2004, 0x0ca8, 0x00fe, 0x0005, 0x00e6,
++	0x2071, 0x0100, 0x2001, 0xc907, 0x2004, 0x70e2, 0x2009, 0xc615,
++	0x210c, 0x716e, 0x7063, 0x0100, 0x7166, 0x719e, 0x706b, 0x0000,
++	0x7073, 0x0809, 0x7077, 0x0008, 0x7078, 0xa080, 0x0100, 0x707a,
++	0x7080, 0x8000, 0x7082, 0x7087, 0xaaaa, 0xa006, 0x708a, 0x708e,
++	0x707e, 0x70d6, 0x70ab, 0x0036, 0x70af, 0x95d5, 0x7027, 0x0080,
++	0x7014, 0xa084, 0x0184, 0xa085, 0x0032, 0x7016, 0x080c, 0x387c,
++	0x080c, 0x36d7, 0x1110, 0x8421, 0x0028, 0x7024, 0xd0bc, 0x0db0,
++	0x7027, 0x0080, 0x00f6, 0x00e6, 0x2071, 0xc96a, 0x2079, 0x0030,
++	0x00d6, 0x2069, 0x0000, 0x6824, 0xd0b4, 0x0120, 0x683c, 0x783e,
++	0x6838, 0x783a, 0x00de, 0x2011, 0x0011, 0x080c, 0x3854, 0x2011,
++	0x0001, 0x080c, 0x3854, 0x00ee, 0x00fe, 0x7017, 0x0000, 0x00ee,
++	0x0005, 0x00f6, 0x00e6, 0x2071, 0xc96a, 0x2079, 0x0030, 0x7904,
++	0xd1fc, 0x0904, 0x3851, 0x7803, 0x0002, 0xa026, 0xd19c, 0x1904,
++	0x384d, 0x7000, 0x0002, 0x3851, 0x380f, 0x3833, 0x384d, 0xd1bc,
++	0x1150, 0xd1dc, 0x1150, 0x8001, 0x7002, 0x2011, 0x0001, 0x04e1,
++	0x05c0, 0x04d1, 0x04b0, 0x780f, 0x0000, 0x7820, 0x7924, 0x7803,
++	0x0004, 0x7822, 0x7926, 0x2001, 0x0201, 0x200c, 0x81ff, 0x0de8,
++	0x080c, 0x377b, 0x2009, 0x0001, 0x7808, 0xd0ec, 0x0110, 0x2009,
++	0x0011, 0x7902, 0x00f0, 0x8001, 0x7002, 0xa184, 0x0880, 0x1138,
++	0x7804, 0xd0fc, 0x1940, 0x2011, 0x0001, 0x00b1, 0x0090, 0x6030,
++	0xa092, 0x0004, 0xa086, 0x0009, 0x1120, 0x6000, 0x601a, 0x2011,
++	0x0025, 0x6232, 0xd1dc, 0x1988, 0x0870, 0x7803, 0x0004, 0x7003,
++	0x0000, 0x00ee, 0x00fe, 0x0005, 0x6024, 0xa005, 0x0520, 0x8001,
++	0x6026, 0x6018, 0x6130, 0xa140, 0x2804, 0x7832, 0x8840, 0x2804,
++	0x7836, 0x8840, 0x2804, 0x7822, 0x8840, 0x2804, 0x7826, 0x8840,
++	0x7a02, 0x7000, 0x8000, 0x7002, 0x6018, 0xa802, 0xa08a, 0x0029,
++	0x1138, 0x6018, 0xa080, 0x0001, 0x2004, 0x601a, 0x2001, 0x000d,
++	0x6032, 0xa085, 0x0001, 0x0005, 0x00f6, 0x00e6, 0x00c6, 0x2071,
++	0xc992, 0x2079, 0x0020, 0x7904, 0xd1fc, 0x01f0, 0x7803, 0x0002,
++	0x2d60, 0xa026, 0x7000, 0x0002, 0x38a4, 0x388f, 0x389b, 0x8001,
++	0x7002, 0xd19c, 0x1188, 0x2011, 0x0001, 0x080c, 0x3854, 0x0160,
++	0x080c, 0x3854, 0x0048, 0x8001, 0x7002, 0x7804, 0xd0fc, 0x1d30,
++	0x2011, 0x0001, 0x080c, 0x3854, 0x00ce, 0x00ee, 0x00fe, 0x0005,
++	0x00f6, 0x00e6, 0x00c6, 0x2061, 0x0200, 0x2001, 0xc907, 0x2004,
++	0x601a, 0x2061, 0x0100, 0x2001, 0xc906, 0x2004, 0x60ce, 0x6004,
++	0xc0ac, 0xa085, 0x0200, 0x6006, 0x2001, 0x0074, 0x2004, 0xa005,
++	0x01f8, 0x2038, 0x2001, 0x0076, 0x2024, 0x2001, 0x0077, 0x201c,
++	0x080c, 0x4026, 0x6833, 0x000d, 0x6f26, 0x2d00, 0x681a, 0xa78a,
++	0x0007, 0x0220, 0x2138, 0x2009, 0x0007, 0x0010, 0x2708, 0xa03e,
++	0x6818, 0xa080, 0x000d, 0x04b1, 0x1d90, 0x2d00, 0x681a, 0x0088,
++	0x080c, 0x4026, 0x6833, 0x000d, 0x2070, 0x6827, 0x0001, 0x2d00,
++	0x681a, 0x2001, 0x0076, 0x2004, 0x2072, 0x2001, 0x0077, 0x2004,
++	0x7006, 0x2061, 0x0020, 0x2079, 0x0100, 0x2001, 0xc906, 0x2004,
++	0x6012, 0x20e1, 0x9040, 0x2001, 0x0072, 0x2004, 0xa084, 0xfff8,
++	0x700a, 0x601a, 0x0006, 0x2001, 0x0073, 0x2004, 0x700e, 0x601e,
++	0x78c6, 0x000e, 0x78ca, 0xa006, 0x603a, 0x603e, 0x00ce, 0x00ee,
++	0x00fe, 0x0005, 0x00e6, 0x2071, 0x0010, 0x20a0, 0x2099, 0x0014,
++	0x7003, 0x0026, 0x7432, 0x7336, 0xa006, 0x703a, 0x703e, 0x810b,
++	0x810b, 0x21a8, 0x810b, 0x7122, 0x7003, 0x0041, 0x7004, 0xd0fc,
++	0x0de8, 0x7003, 0x0002, 0x7003, 0x0040, 0x53a5, 0x7430, 0x7334,
++	0x87ff, 0x0180, 0x00c6, 0x00d6, 0x2d60, 0x00c6, 0x080c, 0x4026,
++	0x00ce, 0x6018, 0x2070, 0x2d00, 0x7006, 0x601a, 0x00de, 0x00ce,
++	0xa085, 0x0001, 0x00ee, 0x0005, 0x00e6, 0x2001, 0x0075, 0x2004,
++	0xa005, 0x0508, 0x2038, 0x2001, 0x0078, 0x2024, 0x2001, 0x0079,
++	0x201c, 0x080c, 0x4026, 0x2d60, 0x6833, 0x000d, 0x6f26, 0x2d00,
++	0x681a, 0xa78a, 0x0007, 0x0220, 0x2138, 0x2009, 0x0007, 0x0010,
++	0x2708, 0xa03e, 0x6818, 0xa080, 0x000d, 0x080c, 0x3912, 0x1d88,
++	0x2d00, 0x681a, 0x00e0, 0x080c, 0x4026, 0x2d60, 0x6033, 0x000d,
++	0x2070, 0x6027, 0x0001, 0x2c00, 0x601a, 0x2001, 0x0078, 0x2004,
++	0x2072, 0x2001, 0x0079, 0x2004, 0x7006, 0x2001, 0x0072, 0x2004,
++	0xa084, 0xfff8, 0x700a, 0x2001, 0x0073, 0x2004, 0x700e, 0x2001,
++	0x0030, 0x2003, 0x0004, 0x7824, 0xd0ac, 0x1178, 0x2001, 0x0101,
++	0x200c, 0xc1ed, 0x2102, 0x6027, 0x0000, 0x2001, 0xc96a, 0x2003,
++	0x0003, 0x2001, 0x0030, 0x2003, 0x0009, 0x00ee, 0x0005, 0x0804,
++	0x3154, 0x0126, 0x2091, 0x8000, 0x20a9, 0x0012, 0x2001, 0xc640,
++	0x20a0, 0xa006, 0x40a4, 0x012e, 0x0804, 0x3154, 0x7d38, 0x7c3c,
++	0x0804, 0x31fb, 0x080c, 0x4026, 0x0904, 0x3179, 0x080c, 0x5f22,
++	0x0110, 0x080c, 0x4f2c, 0x2009, 0x001c, 0x7a2c, 0x7b28, 0x7c3c,
++	0x7d38, 0x080c, 0x4067, 0x701b, 0x39c6, 0x0005, 0xade8, 0x000d,
++	0x6800, 0xa005, 0x0904, 0x317c, 0x6804, 0xd0ac, 0x0118, 0xd0a4,
++	0x0904, 0x317c, 0xd094, 0x00c6, 0x2061, 0x0100, 0x6104, 0x0138,
++	0x6200, 0xa292, 0x0005, 0x0218, 0xa18c, 0xffdf, 0x0010, 0xa18d,
++	0x0020, 0x6106, 0x00ce, 0xd08c, 0x00c6, 0x2061, 0x0100, 0x6104,
++	0x0118, 0xa18d, 0x0010, 0x0010, 0xa18c, 0xffef, 0x6106, 0x00ce,
++	0x2009, 0x0100, 0x210c, 0xa18a, 0x0002, 0x0268, 0xd084, 0x0158,
++	0x6a28, 0xa28a, 0x007f, 0x1a04, 0x317c, 0xa288, 0x2f6e, 0x210d,
++	0xa18c, 0x00ff, 0x615a, 0xd0dc, 0x0130, 0x6828, 0xa08a, 0x007f,
++	0x1a04, 0x317c, 0x6052, 0x6808, 0xa08a, 0x0100, 0x0a04, 0x317c,
++	0xa08a, 0x0841, 0x1a04, 0x317c, 0xa084, 0x0007, 0x1904, 0x317c,
++	0x680c, 0xa005, 0x0904, 0x317c, 0x6810, 0xa005, 0x0904, 0x317c,
++	0x6848, 0x6940, 0xa10a, 0x1a04, 0x317c, 0x8001, 0x0904, 0x317c,
++	0x684c, 0x6944, 0xa10a, 0x1a04, 0x317c, 0x8001, 0x0904, 0x317c,
++	0x6804, 0xd0fc, 0x0560, 0x080c, 0x4026, 0x0904, 0x3179, 0x2009,
++	0x0014, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0xa290, 0x0038, 0xa399,
++	0x0000, 0x080c, 0x4067, 0x701b, 0x3a46, 0x0005, 0xade8, 0x000d,
++	0x20a9, 0x0014, 0x2d98, 0x2069, 0xc66e, 0x2da0, 0x53a3, 0x7010,
++	0xa0e8, 0x000d, 0x2001, 0xc672, 0x200c, 0xd1e4, 0x0140, 0x00c6,
++	0x2061, 0x0100, 0x6004, 0xa085, 0x0b00, 0x6006, 0x00ce, 0x2009,
++	0xc8f8, 0x200b, 0x0000, 0x2001, 0xc674, 0x2004, 0xd0ac, 0x0158,
++	0x7824, 0x200a, 0x2009, 0x017f, 0x200a, 0x3200, 0xa084, 0x003f,
++	0xa085, 0x3020, 0x2090, 0x20a9, 0x001c, 0x2d98, 0x2069, 0xc652,
++	0x2da0, 0x53a3, 0x6814, 0xa08c, 0x00ff, 0x6142, 0x8007, 0xa084,
++	0x00ff, 0x6046, 0x080c, 0x61f8, 0x080c, 0x576e, 0x080c, 0x57d7,
++	0x6000, 0xa086, 0x0000, 0x1904, 0x3b41, 0x6808, 0x602a, 0x080c,
++	0x25bb, 0x0006, 0x2001, 0x0100, 0x2004, 0xa082, 0x0005, 0x000e,
++	0x0268, 0x2009, 0x0170, 0x200b, 0x0080, 0xe000, 0xe000, 0x200b,
++	0x0000, 0x0036, 0x6b08, 0x080c, 0x2a4c, 0x003e, 0x6818, 0x691c,
++	0x6a20, 0x6b24, 0x8007, 0x810f, 0x8217, 0x831f, 0x6016, 0x611a,
++	0x621e, 0x6322, 0x6c04, 0xd4f4, 0x0148, 0x6830, 0x6934, 0x6a38,
++	0x6b3c, 0x8007, 0x810f, 0x8217, 0x831f, 0x0010, 0xa084, 0xf0ff,
++	0x6006, 0x610a, 0x620e, 0x6312, 0x8007, 0x810f, 0x8217, 0x831f,
++	0x20a9, 0x0004, 0x20a1, 0xc90d, 0x40a1, 0x080c, 0x707c, 0x6904,
++	0xd1fc, 0x0520, 0x00c6, 0x2009, 0x0000, 0x20a9, 0x0001, 0x6b70,
++	0xd384, 0x01c8, 0x0020, 0x839d, 0x12b0, 0x3508, 0x8109, 0x080c,
++	0x67ed, 0x6878, 0x6016, 0x6874, 0x2008, 0xa084, 0xff00, 0x8007,
++	0x600a, 0xa184, 0x00ff, 0x6006, 0x8108, 0x1118, 0x6003, 0x0003,
++	0x0010, 0x6003, 0x0001, 0x1f04, 0x3adb, 0x00ce, 0x2069, 0xc652,
++	0x2001, 0xc8e5, 0x6a80, 0xa294, 0x0030, 0xa28e, 0x0000, 0x0170,
++	0xa28e, 0x0010, 0x0118, 0xa28e, 0x0020, 0x0140, 0x2003, 0xaaaa,
++	0x080c, 0x2a95, 0x2001, 0xc8d6, 0x2102, 0x0008, 0x2102, 0x00c6,
++	0x2061, 0x0100, 0x602f, 0x0040, 0x602f, 0x0000, 0x00ce, 0x080c,
++	0x5f22, 0x0128, 0x080c, 0x440b, 0x0110, 0x080c, 0x2a11, 0x60c8,
++	0xa005, 0x01d0, 0x6003, 0x0001, 0x2009, 0x3b27, 0x00e0, 0x080c,
++	0x5f22, 0x1178, 0x2011, 0x5df5, 0x080c, 0x6fad, 0x2011, 0x5de8,
++	0x080c, 0x7070, 0x2001, 0xc8e6, 0x2003, 0x0000, 0x080c, 0x5e5a,
++	0x0040, 0x080c, 0x4e5b, 0x0028, 0x6003, 0x0004, 0x2009, 0x3b41,
++	0x0010, 0x0804, 0x3154, 0x2001, 0x0100, 0x2004, 0xa082, 0x0005,
++	0x0258, 0x2001, 0x0170, 0x2004, 0xa084, 0x00ff, 0xa086, 0x004c,
++	0x1118, 0x2091, 0x309d, 0x0817, 0x2091, 0x301d, 0x0817, 0x6000,
++	0xa086, 0x0000, 0x0904, 0x3179, 0x2069, 0xc652, 0x7830, 0x6842,
++	0x7834, 0x6846, 0x6804, 0xd0fc, 0x0118, 0x2009, 0x0030, 0x0010,
++	0x2009, 0x001c, 0x2d00, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x0804,
++	0x406a, 0xa006, 0x080c, 0x2a11, 0x81ff, 0x1904, 0x3179, 0x080c,
++	0x5f22, 0x1178, 0x2001, 0xc8e6, 0x2003, 0x0001, 0x2001, 0xc600,
++	0x2003, 0x0001, 0xa085, 0x0001, 0x080c, 0x5f66, 0x080c, 0x5e5a,
++	0x0020, 0x080c, 0x4f2c, 0x080c, 0x4e5b, 0x0804, 0x3154, 0x81ff,
++	0x1904, 0x3179, 0x080c, 0x5f22, 0x1110, 0x0804, 0x3179, 0x6188,
++	0x81ff, 0x0198, 0x703f, 0x0000, 0x2001, 0xcdc0, 0x2009, 0x0040,
++	0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x0126, 0x2091, 0x8000, 0x080c,
++	0x406a, 0x701b, 0x3152, 0x012e, 0x0005, 0x703f, 0x0001, 0x00d6,
++	0x2069, 0xcdc0, 0x20a9, 0x0040, 0x20a1, 0xcdc0, 0x2019, 0xffff,
++	0x43a4, 0x6550, 0xa588, 0x2f6e, 0x210d, 0xa18c, 0x00ff, 0x216a,
++	0xa00e, 0x2011, 0x0002, 0x2100, 0xa506, 0x01a8, 0x080c, 0x533d,
++	0x1190, 0x6014, 0x821c, 0x0238, 0xa398, 0xcdc0, 0xa085, 0xff00,
++	0x8007, 0x201a, 0x0038, 0xa398, 0xcdc0, 0x2324, 0xa4a4, 0xff00,
++	0xa405, 0x201a, 0x8210, 0x8108, 0xa182, 0x0080, 0x1208, 0x0c18,
++	0x8201, 0x8007, 0x2d0c, 0xa105, 0x206a, 0x00de, 0x20a9, 0x0040,
++	0x20a1, 0xcdc0, 0x2099, 0xcdc0, 0x080c, 0x4ecb, 0x0804, 0x3b9c,
++	0x080c, 0x404b, 0x0904, 0x317c, 0x00c6, 0x080c, 0x4026, 0x00ce,
++	0x1120, 0x2009, 0x0002, 0x0804, 0x3179, 0x2001, 0xc653, 0x2004,
++	0xd0b4, 0x0550, 0x7824, 0xa084, 0xff00, 0xa08e, 0x7e00, 0x0520,
++	0xa08e, 0x7f00, 0x0508, 0xa08e, 0x8000, 0x01f0, 0x6000, 0xd08c,
++	0x11d8, 0x6004, 0xa084, 0x00ff, 0xa086, 0x0006, 0x11a8, 0x6837,
++	0x0000, 0x6838, 0xc0fd, 0x683a, 0x080c, 0xae11, 0x1120, 0x2009,
++	0x0003, 0x0804, 0x3179, 0x7007, 0x0003, 0x701b, 0x3c28, 0x0005,
++	0x080c, 0x404b, 0x0904, 0x317c, 0x20a9, 0x002b, 0x2c98, 0xade8,
++	0x0002, 0x2da0, 0x53a3, 0x20a9, 0x0004, 0xac80, 0x0006, 0x2098,
++	0xad80, 0x0006, 0x20a0, 0x080c, 0x4ecb, 0x20a9, 0x0004, 0xac80,
++	0x000a, 0x2098, 0xad80, 0x000a, 0x20a0, 0x080c, 0x4ecb, 0x2d00,
++	0x2009, 0x002b, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x0804, 0x406a,
++	0x81ff, 0x1904, 0x3179, 0x080c, 0x403b, 0x0904, 0x317c, 0x080c,
++	0x551a, 0x0804, 0x3154, 0x81ff, 0x1904, 0x3179, 0x7828, 0xa08a,
++	0x1000, 0x1a04, 0x317c, 0x080c, 0x404b, 0x0904, 0x317c, 0x080c,
++	0x557d, 0x0904, 0x3179, 0x2019, 0x0004, 0xa00e, 0x080c, 0x552c,
++	0x7924, 0x810f, 0x7a28, 0x0011, 0x0804, 0x3154, 0xa186, 0x00ff,
++	0x0110, 0x0071, 0x0060, 0x2029, 0x007e, 0x2061, 0xc600, 0x6450,
++	0x2400, 0xa506, 0x0110, 0x2508, 0x0019, 0x8529, 0x1ec8, 0x0005,
++	0x080c, 0x533d, 0x1138, 0x2200, 0x8003, 0x800b, 0x810b, 0xa108,
++	0x080c, 0x6fb9, 0x0005, 0x81ff, 0x1904, 0x3179, 0x080c, 0x403b,
++	0x0904, 0x317c, 0x080c, 0x5403, 0x0904, 0x3179, 0x080c, 0x5523,
++	0x0804, 0x3154, 0x81ff, 0x1904, 0x3179, 0x080c, 0x403b, 0x0904,
++	0x317c, 0x080c, 0x5403, 0x0904, 0x3179, 0x080c, 0x5511, 0x0804,
++	0x3154, 0x6100, 0x0804, 0x3154, 0x080c, 0x404b, 0x0904, 0x317c,
++	0x2001, 0xc600, 0x2004, 0xa086, 0x0003, 0x1904, 0x3179, 0x00d6,
++	0xace8, 0x000a, 0x7924, 0xd184, 0x0110, 0xace8, 0x0006, 0x680c,
++	0x8007, 0x783e, 0x6808, 0x8007, 0x783a, 0x6b04, 0x831f, 0x6a00,
++	0x8217, 0x00de, 0x6100, 0xa18c, 0x0200, 0x0804, 0x3154, 0x7824,
++	0xa09c, 0x00ff, 0xa39a, 0x0003, 0x1a04, 0x3179, 0x6250, 0xa294,
++	0x00ff, 0xa084, 0xff00, 0x8007, 0xa206, 0x1150, 0x2001, 0xc640,
++	0x2009, 0x000c, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x0804, 0x406a,
++	0x81ff, 0x1904, 0x3179, 0x080c, 0x404b, 0x0904, 0x317c, 0x6004,
++	0xa084, 0x00ff, 0xa086, 0x0006, 0x1904, 0x3179, 0x00c6, 0x080c,
++	0x4026, 0x00ce, 0x0904, 0x3179, 0x6837, 0x0000, 0x6838, 0xc0fd,
++	0x683a, 0x080c, 0xadbd, 0x0904, 0x3179, 0x7007, 0x0003, 0x701b,
++	0x3d12, 0x0005, 0x6830, 0xa086, 0x0100, 0x0904, 0x3179, 0xad80,
++	0x000e, 0x2009, 0x000c, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x0804,
++	0x406a, 0xa006, 0x080c, 0x2a11, 0x7824, 0xa084, 0x00ff, 0xa086,
++	0x00ff, 0x0118, 0x81ff, 0x1904, 0x3179, 0x080c, 0x5f22, 0x0110,
++	0x080c, 0x4f2c, 0x7828, 0xa08a, 0x1000, 0x1a04, 0x317c, 0x7924,
++	0xa18c, 0xff00, 0x810f, 0xa186, 0x00ff, 0x0138, 0xa182, 0x007f,
++	0x1a04, 0x317c, 0x2100, 0x080c, 0x29db, 0x0026, 0x00c6, 0x0126,
++	0x2091, 0x8000, 0x2061, 0xc93a, 0x601b, 0x0000, 0x601f, 0x0000,
++	0x080c, 0x5f22, 0x1178, 0x2001, 0xc8e6, 0x2003, 0x0001, 0x2001,
++	0xc600, 0x2003, 0x0001, 0xa085, 0x0001, 0x080c, 0x5f66, 0x080c,
++	0x5e5a, 0x0420, 0x2011, 0x0003, 0x080c, 0x8f0e, 0x2011, 0x0002,
++	0x080c, 0x8f18, 0x080c, 0x8dee, 0x0036, 0x2019, 0x0000, 0x080c,
++	0x8e79, 0x003e, 0x2061, 0x0100, 0x2001, 0xc615, 0x2004, 0xa084,
++	0x00ff, 0x810f, 0xa105, 0x604a, 0x6043, 0x0090, 0x6043, 0x0010,
++	0x2009, 0x002d, 0x2011, 0x4e90, 0x080c, 0x7036, 0x7924, 0xa18c,
++	0xff00, 0x810f, 0x080c, 0x5f22, 0x1110, 0x2009, 0x00ff, 0x7a28,
++	0x080c, 0x3c76, 0x012e, 0x00ce, 0x002e, 0x0804, 0x3154, 0x7924,
++	0xa18c, 0xff00, 0x810f, 0x00c6, 0x080c, 0x52e1, 0x2c08, 0x00ce,
++	0x1904, 0x317c, 0x0804, 0x3154, 0x81ff, 0x0120, 0x2009, 0x0001,
++	0x0804, 0x3179, 0x60d4, 0xd0ac, 0x1130, 0xd09c, 0x1120, 0x2009,
++	0x0005, 0x0804, 0x3179, 0x080c, 0x4026, 0x1120, 0x2009, 0x0002,
++	0x0804, 0x3179, 0x7924, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x080c,
++	0x4067, 0x701b, 0x3dc4, 0x0005, 0x2009, 0x0080, 0x080c, 0x533d,
++	0x1130, 0x6004, 0xa084, 0x00ff, 0xa086, 0x0006, 0x0120, 0x2021,
++	0x400a, 0x0804, 0x3156, 0x00d6, 0xade8, 0x000d, 0x6900, 0x6a08,
++	0x6b0c, 0x6c10, 0x6d14, 0x6e18, 0x6820, 0xa0be, 0x0100, 0x0904,
++	0x3e3b, 0xa0be, 0x0112, 0x0904, 0x3e3b, 0xa0be, 0x0113, 0x0904,
++	0x3e3b, 0xa0be, 0x0114, 0x0904, 0x3e3b, 0xa0be, 0x0117, 0x0904,
++	0x3e3b, 0xa0be, 0x011a, 0x0904, 0x3e3b, 0xa0be, 0x011c, 0x0904,
++	0x3e3b, 0xa0be, 0x0121, 0x05b0, 0xa0be, 0x0131, 0x0598, 0xa0be,
++	0x0171, 0x05c8, 0xa0be, 0x0173, 0x05b0, 0xa0be, 0x01a1, 0x1120,
++	0x6830, 0x8007, 0x6832, 0x04a8, 0xa0be, 0x0212, 0x0540, 0xa0be,
++	0x0213, 0x0528, 0xa0be, 0x0214, 0x01b0, 0xa0be, 0x0217, 0x0168,
++	0xa0be, 0x021a, 0x1120, 0x6838, 0x8007, 0x683a, 0x00e0, 0xa0be,
++	0x0300, 0x01c8, 0x00de, 0x0804, 0x317c, 0xad80, 0x0010, 0x20a9,
++	0x0007, 0x080c, 0x3e81, 0xad80, 0x000e, 0x20a9, 0x0001, 0x080c,
++	0x3e81, 0x0048, 0xad80, 0x000c, 0x080c, 0x3e8f, 0x0050, 0xad80,
++	0x000e, 0x080c, 0x3e8f, 0xad80, 0x000c, 0x20a9, 0x0001, 0x080c,
++	0x3e81, 0x00c6, 0x080c, 0x4026, 0x0568, 0x6838, 0xc0fd, 0x683a,
++	0x6837, 0x0119, 0x6853, 0x0000, 0x684f, 0x0020, 0x685b, 0x0001,
++	0x810b, 0x697e, 0x6883, 0x0000, 0x6a86, 0x6b8a, 0x6c8e, 0x6d92,
++	0x6996, 0x689b, 0x0000, 0x00ce, 0x00de, 0x6837, 0x0000, 0x6838,
++	0xc0fd, 0x683a, 0x6823, 0x0000, 0x6804, 0x2068, 0x080c, 0xadd9,
++	0x1120, 0x2009, 0x0003, 0x0804, 0x3179, 0x7007, 0x0003, 0x701b,
++	0x3e78, 0x0005, 0x00ce, 0x00de, 0x2009, 0x0002, 0x0804, 0x3179,
++	0x6820, 0xa086, 0x8001, 0x1904, 0x3154, 0x2009, 0x0004, 0x0804,
++	0x3179, 0x0016, 0x2008, 0x2044, 0x8000, 0x204c, 0x8000, 0x290a,
++	0x8108, 0x280a, 0x8108, 0x1f04, 0x3e83, 0x001e, 0x0005, 0x0016,
++	0x00a6, 0x00b6, 0x2008, 0x2044, 0x8000, 0x204c, 0x8000, 0x2054,
++	0x8000, 0x205c, 0x2b0a, 0x8108, 0x2a0a, 0x8108, 0x290a, 0x8108,
++	0x280a, 0x00be, 0x00ae, 0x001e, 0x0005, 0x81ff, 0x0120, 0x2009,
++	0x0001, 0x0804, 0x3179, 0x60d4, 0xd0ac, 0x1130, 0xd09c, 0x1120,
++	0x2009, 0x0005, 0x0804, 0x3179, 0x7924, 0x2140, 0xa18c, 0xff00,
++	0x810f, 0x60d4, 0xd0ac, 0x1120, 0xa182, 0x0080, 0x0a04, 0x317c,
++	0xa182, 0x00ff, 0x1a04, 0x317c, 0x7a2c, 0x7b28, 0x6070, 0xa306,
++	0x1140, 0x6074, 0xa24e, 0x0904, 0x317c, 0xa9cc, 0xff00, 0x0904,
++	0x317c, 0x00c6, 0x080c, 0x3f6e, 0x2c68, 0x00ce, 0x0538, 0xa0c6,
++	0x4000, 0x1180, 0x00c6, 0x0006, 0x2d60, 0x2009, 0x0000, 0x080c,
++	0x55de, 0x1108, 0xc185, 0x6000, 0xd0bc, 0x0108, 0xc18d, 0x000e,
++	0x00ce, 0x0088, 0xa0c6, 0x4007, 0x1110, 0x2408, 0x0060, 0xa0c6,
++	0x4008, 0x1118, 0x2708, 0x2610, 0x0030, 0xa0c6, 0x4009, 0x1108,
++	0x0010, 0x2001, 0x4006, 0x2020, 0x0804, 0x3156, 0x2d00, 0x7022,
++	0x0016, 0x00b6, 0x00c6, 0x00e6, 0x2c70, 0x080c, 0x958d, 0x05d8,
++	0x2d00, 0x601a, 0x080c, 0xb05e, 0x2e58, 0x00ee, 0x00e6, 0x00c6,
++	0x080c, 0x4026, 0x00ce, 0x2b70, 0x1150, 0x080c, 0x95e3, 0x00ee,
++	0x00ce, 0x00be, 0x001e, 0x2009, 0x0002, 0x0804, 0x3179, 0x6837,
++	0x0000, 0x683b, 0x0000, 0x2d00, 0x6012, 0x6833, 0x0000, 0x6838,
++	0xc0fd, 0xd88c, 0x0108, 0xc0f5, 0x683a, 0x0126, 0x2091, 0x8000,
++	0x080c, 0x2e46, 0x012e, 0x601f, 0x0001, 0x2001, 0x0000, 0x080c,
++	0x527f, 0x2001, 0x0002, 0x080c, 0x5291, 0x2009, 0x0002, 0x080c,
++	0x9613, 0xa085, 0x0001, 0x00ee, 0x00ce, 0x00be, 0x001e, 0x1120,
++	0x2009, 0x0003, 0x0804, 0x3179, 0x7007, 0x0003, 0x701b, 0x3f51,
++	0x0005, 0x6830, 0xa086, 0x0100, 0x7020, 0x2060, 0x1138, 0x2009,
++	0x0004, 0x6204, 0xa294, 0x00ff, 0x0804, 0x3179, 0x2009, 0x0000,
++	0x6838, 0xd0f4, 0x1904, 0x3154, 0x080c, 0x55de, 0x1108, 0xc185,
++	0x6000, 0xd0bc, 0x0108, 0xc18d, 0x0804, 0x3154, 0x00e6, 0x00d6,
++	0x2029, 0x0000, 0x2001, 0xc635, 0x2004, 0xd0ac, 0x0138, 0x2021,
++	0x0000, 0x20a9, 0x00ff, 0x2071, 0xc77b, 0x0030, 0x2021, 0x0080,
++	0x20a9, 0x007f, 0x2071, 0xc7fb, 0x2e04, 0xa005, 0x1130, 0x2100,
++	0xa406, 0x15a0, 0x2428, 0xc5fd, 0x0488, 0x2068, 0x6f10, 0x2700,
++	0xa306, 0x11e0, 0x6e14, 0x2600, 0xa206, 0x11c0, 0x2400, 0xa106,
++	0x1190, 0x2d60, 0xd884, 0x0598, 0x080c, 0x56ed, 0x1580, 0x2001,
++	0x4000, 0x0470, 0x6004, 0xa084, 0x00ff, 0xa086, 0x0006, 0x1538,
++	0x2001, 0x4000, 0x0428, 0x2001, 0x4007, 0x0410, 0x2400, 0xa106,
++	0x1168, 0x6e14, 0x87ff, 0x1138, 0x86ff, 0x09a0, 0x2001, 0xc635,
++	0x2004, 0xd0ac, 0x1978, 0x2001, 0x4008, 0x0090, 0x8420, 0x8e70,
++	0x1f04, 0x3f84, 0x85ff, 0x1130, 0x2001, 0x4009, 0x0048, 0x2001,
++	0x0001, 0x0030, 0x080c, 0x52e1, 0x1dd0, 0x6312, 0x6216, 0xa006,
++	0xa005, 0x00de, 0x00ee, 0x0005, 0x81ff, 0x1904, 0x3179, 0x080c,
++	0x4026, 0x0904, 0x3179, 0x6837, 0x0000, 0x6838, 0xc0fd, 0x683a,
++	0x7824, 0xa005, 0x0904, 0x317c, 0xa096, 0x00ff, 0x0120, 0xa092,
++	0x0004, 0x1a04, 0x317c, 0x2010, 0x2d18, 0x080c, 0x2df9, 0x0904,
++	0x3179, 0x7007, 0x0003, 0x701b, 0x3ff6, 0x0005, 0x6830, 0xa086,
++	0x0100, 0x0904, 0x3179, 0x0804, 0x3154, 0x7924, 0xa18c, 0xff00,
++	0x810f, 0x60d4, 0xd0ac, 0x1120, 0xa182, 0x0080, 0x0a04, 0x317c,
++	0xa182, 0x00ff, 0x1a04, 0x317c, 0x0126, 0x2091, 0x8000, 0x080c,
++	0xacc1, 0x1188, 0xa190, 0xc77b, 0x2204, 0xa065, 0x0160, 0x080c,
++	0x4f47, 0x2001, 0xc635, 0x2004, 0xd0ac, 0x0110, 0x6017, 0x0000,
++	0x012e, 0x0804, 0x3154, 0x012e, 0x0804, 0x3179, 0x080c, 0x1602,
++	0x0188, 0xa006, 0x6802, 0x7010, 0xa005, 0x1120, 0x2d00, 0x7012,
++	0x7016, 0x0030, 0x7014, 0x6802, 0x2060, 0x2d00, 0x6006, 0x7016,
++	0xad80, 0x000d, 0x0005, 0x7924, 0x810f, 0xa18c, 0x00ff, 0x080c,
++	0x533d, 0x1130, 0x7e28, 0xa684, 0x3fff, 0xa082, 0x4000, 0x0208,
++	0xa066, 0x8cff, 0x0005, 0x7e24, 0x860f, 0xa18c, 0x00ff, 0x080c,
++	0x533d, 0x1128, 0xa6b4, 0x00ff, 0xa682, 0x4000, 0x0208, 0xa066,
++	0x8cff, 0x0005, 0x0016, 0x7110, 0x81ff, 0x0128, 0x2168, 0x6904,
++	0x080c, 0x1619, 0x0cc8, 0x7112, 0x7116, 0x001e, 0x0005, 0x2031,
++	0x0001, 0x0010, 0x2031, 0x0000, 0x2061, 0xc6f2, 0x6606, 0x6112,
++	0x600e, 0x6226, 0x632a, 0x642e, 0x6532, 0x2c10, 0x080c, 0x164d,
++	0x7007, 0x0002, 0x701b, 0x3154, 0x0005, 0x00f6, 0x0126, 0x2091,
++	0x8000, 0x2079, 0x0000, 0x2001, 0xc6b0, 0x2004, 0xa005, 0x1168,
++	0x0e04, 0x4095, 0x7818, 0xd084, 0x1140, 0x7a22, 0x7b26, 0x7c2a,
++	0x781b, 0x0001, 0x2091, 0x4080, 0x0408, 0x0016, 0x00c6, 0x00e6,
++	0x2071, 0xc6a2, 0x7138, 0xa182, 0x0010, 0x0218, 0x7030, 0x2060,
++	0x0078, 0x7030, 0xa0e0, 0x0004, 0xac82, 0xc6f2, 0x0210, 0x2061,
++	0xc6b2, 0x2c00, 0x7032, 0x81ff, 0x1108, 0x7036, 0x8108, 0x713a,
++	0x2262, 0x6306, 0x640a, 0x00ee, 0x00ce, 0x001e, 0x012e, 0x00fe,
++	0x0005, 0x00e6, 0x2071, 0xc6a2, 0x7038, 0xa005, 0x0570, 0x0126,
++	0x2091, 0x8000, 0x0e04, 0x40ec, 0x00f6, 0x2079, 0x0000, 0x7818,
++	0xd084, 0x1508, 0x00c6, 0x7034, 0x2060, 0x2c04, 0x7822, 0x6004,
++	0x7826, 0x6008, 0x782a, 0x781b, 0x0001, 0x2091, 0x4080, 0x7038,
++	0x8001, 0x703a, 0xa005, 0x1130, 0x7033, 0xc6b2, 0x7037, 0xc6b2,
++	0x00ce, 0x0048, 0xac80, 0x0004, 0xa0fa, 0xc6f2, 0x0210, 0x2001,
++	0xc6b2, 0x7036, 0x00ce, 0x00fe, 0x012e, 0x00ee, 0x0005, 0x0026,
++	0x2001, 0xc653, 0x2004, 0xd0c4, 0x0120, 0x2011, 0x8014, 0x080c,
++	0x407d, 0x002e, 0x0005, 0x81ff, 0x1904, 0x3179, 0x0126, 0x2091,
++	0x8000, 0x6030, 0xc08d, 0xc085, 0xc0ac, 0x6032, 0x080c, 0x5f22,
++	0x1178, 0x2001, 0xc8e6, 0x2003, 0x0001, 0x2001, 0xc600, 0x2003,
++	0x0001, 0xa085, 0x0001, 0x080c, 0x5f66, 0x080c, 0x5e5a, 0x0010,
++	0x080c, 0x4e5b, 0x012e, 0x0804, 0x3154, 0x7824, 0x2008, 0xa18c,
++	0xfffd, 0x1128, 0x61e0, 0xa10d, 0x61e2, 0x0804, 0x3154, 0x0804,
++	0x317c, 0x81ff, 0x1904, 0x3179, 0x6000, 0xa086, 0x0003, 0x1904,
++	0x3179, 0x2001, 0xc653, 0x2004, 0xd0ac, 0x1904, 0x3179, 0x080c,
++	0x404b, 0x0904, 0x317c, 0x6004, 0xa084, 0x00ff, 0xa086, 0x0006,
++	0x1120, 0x7828, 0xa005, 0x0904, 0x3154, 0x00c6, 0x080c, 0x4026,
++	0x00ce, 0x0904, 0x3179, 0x6837, 0x0000, 0x6833, 0x0000, 0x6838,
++	0xc0fd, 0x683a, 0x080c, 0xaea2, 0x0904, 0x3179, 0x7007, 0x0003,
++	0x701b, 0x415b, 0x0005, 0x6830, 0xa086, 0x0100, 0x0904, 0x3179,
++	0x0804, 0x3154, 0x2001, 0xc600, 0x2004, 0xa086, 0x0003, 0x1904,
++	0x3179, 0x7f24, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x080c, 0x4026,
++	0x0904, 0x3179, 0x2009, 0x0000, 0x2031, 0x0000, 0x7023, 0x0000,
++	0x702f, 0x0000, 0xad80, 0x0005, 0x7026, 0x20a0, 0x080c, 0x533d,
++	0x1904, 0x41e1, 0x6004, 0xa0c4, 0x00ff, 0xa8c6, 0x0006, 0x0148,
++	0xa0c4, 0xff00, 0xa8c6, 0x0600, 0x0120, 0x080c, 0x56ed, 0x1904,
++	0x41e1, 0xd794, 0x1110, 0xd784, 0x0158, 0xac80, 0x0006, 0x2098,
++	0x3400, 0x20a9, 0x0004, 0x53a3, 0x080c, 0x3e8f, 0xd794, 0x0148,
++	0xac80, 0x000a, 0x2098, 0x3400, 0x20a9, 0x0004, 0x53a3, 0x080c,
++	0x3e8f, 0xa186, 0x007e, 0x0178, 0xa186, 0x0080, 0x0160, 0x6004,
++	0xa084, 0x00ff, 0xa0c2, 0x0006, 0x1210, 0xc1fd, 0x0020, 0x080c,
++	0x55de, 0x1108, 0xc1fd, 0x21a2, 0xc1fc, 0xd794, 0x01d8, 0xac80,
++	0x0000, 0x2098, 0x94a0, 0x20a9, 0x0002, 0x53a3, 0xac80, 0x0003,
++	0x20a6, 0x94a0, 0xac80, 0x0004, 0x2098, 0x3400, 0x20a9, 0x0002,
++	0x53a3, 0x080c, 0x3e81, 0xac80, 0x0026, 0x2098, 0x20a9, 0x0002,
++	0x53a3, 0x0008, 0x94a0, 0xd794, 0x0110, 0xa6b0, 0x000b, 0xa6b0,
++	0x0005, 0x8108, 0x2001, 0xc635, 0x2004, 0xd0ac, 0x0118, 0xa186,
++	0x0100, 0x0040, 0xd78c, 0x0120, 0xa186, 0x0100, 0x0170, 0x0018,
++	0xa186, 0x007e, 0x0150, 0xd794, 0x0118, 0xa686, 0x0020, 0x0010,
++	0xa686, 0x0028, 0x0150, 0x0804, 0x417e, 0x86ff, 0x1120, 0x7120,
++	0x810b, 0x0804, 0x3154, 0x702f, 0x0001, 0x711e, 0x7020, 0xa600,
++	0x7022, 0x772a, 0x2061, 0xc6f2, 0x6007, 0x0000, 0x6612, 0x7024,
++	0x600e, 0x6226, 0x632a, 0x642e, 0x6532, 0x2c10, 0x080c, 0x164d,
++	0x7007, 0x0002, 0x701b, 0x421d, 0x0005, 0x702c, 0xa005, 0x1170,
++	0x711c, 0x7024, 0x20a0, 0x7728, 0x2031, 0x0000, 0x2061, 0xc6f2,
++	0x6224, 0x6328, 0x642c, 0x6530, 0x0804, 0x417e, 0x7120, 0x810b,
++	0x0804, 0x3154, 0x2029, 0x007e, 0x7924, 0x7a28, 0x7b2c, 0x7c38,
++	0xa184, 0xff00, 0x8007, 0xa0e2, 0x0020, 0x0a04, 0x317c, 0xa502,
++	0x0a04, 0x317c, 0xa184, 0x00ff, 0xa0e2, 0x0020, 0x0a04, 0x317c,
++	0xa502, 0x0a04, 0x317c, 0xa284, 0xff00, 0x8007, 0xa0e2, 0x0020,
++	0x0a04, 0x317c, 0xa502, 0x0a04, 0x317c, 0xa284, 0x00ff, 0xa0e2,
++	0x0020, 0x0a04, 0x317c, 0xa502, 0x0a04, 0x317c, 0xa384, 0xff00,
++	0x8007, 0xa0e2, 0x0020, 0x0a04, 0x317c, 0xa502, 0x0a04, 0x317c,
++	0xa384, 0x00ff, 0xa0e2, 0x0020, 0x0a04, 0x317c, 0xa502, 0x0a04,
++	0x317c, 0xa484, 0xff00, 0x8007, 0xa0e2, 0x0020, 0x0a04, 0x317c,
++	0xa502, 0x0a04, 0x317c, 0xa484, 0x00ff, 0xa0e2, 0x0020, 0x0a04,
++	0x317c, 0xa502, 0x0a04, 0x317c, 0x2061, 0xc900, 0x6102, 0x6206,
++	0x630a, 0x640e, 0x0804, 0x3154, 0x080c, 0x4026, 0x0904, 0x3179,
++	0x2009, 0x0020, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x080c, 0x4067,
++	0x701b, 0x429b, 0x0005, 0x0126, 0xade8, 0x000d, 0x2001, 0x0138,
++	0x2003, 0x0000, 0x00e6, 0x2071, 0xc96a, 0x700c, 0x7110, 0xa106,
++	0x1de0, 0x00ee, 0x2091, 0x8000, 0x6800, 0xa005, 0x0904, 0x432f,
++	0x6804, 0x2008, 0xa18c, 0xffe0, 0x1904, 0x432f, 0x680c, 0xa005,
++	0x0904, 0x432f, 0xa082, 0xff01, 0x1a04, 0x432f, 0x6810, 0xa082,
++	0x005c, 0x0a04, 0x432f, 0x6824, 0x2008, 0xa082, 0x0008, 0x0a04,
++	0x432f, 0xa182, 0x0400, 0x1a04, 0x432f, 0x080c, 0x7394, 0x6820,
++	0x8000, 0x6822, 0x6944, 0x6820, 0xa102, 0x0a04, 0x432f, 0x6828,
++	0x6944, 0x810c, 0xa102, 0x0a04, 0x432f, 0x6840, 0xa082, 0x000f,
++	0x1a04, 0x432f, 0x00d6, 0x6848, 0xa005, 0x0148, 0x2008, 0x2069,
++	0xc600, 0x68e8, 0xa108, 0x68b0, 0xa102, 0x1208, 0x69ea, 0x00de,
++	0x20a9, 0x0020, 0x2d98, 0x2069, 0xc682, 0x2da0, 0x53a3, 0x00d6,
++	0x080c, 0x15e5, 0x2d00, 0x00de, 0x0904, 0x4346, 0x684e, 0x080c,
++	0x725b, 0x05d8, 0x080c, 0x7158, 0x080c, 0x5695, 0x0580, 0x00c6,
++	0x2061, 0x0100, 0x6104, 0xa18d, 0x8000, 0x6106, 0x610c, 0xa18d,
++	0x0300, 0xa18c, 0xffbf, 0x610e, 0x2001, 0xc8d4, 0x200c, 0xa18d,
++	0x0300, 0xa18c, 0xffbf, 0x2102, 0x6b10, 0x2061, 0xc96a, 0x6316,
++	0x00ce, 0x685f, 0x0000, 0x2001, 0xc696, 0x2003, 0x0000, 0x080c,
++	0x2a95, 0x2001, 0x0138, 0x2102, 0x012e, 0x0804, 0x3154, 0x080c,
++	0x2a95, 0x2001, 0x0138, 0x2102, 0x012e, 0x0804, 0x317c, 0x080c,
++	0x7475, 0x080c, 0x7484, 0x080c, 0x7147, 0x2001, 0xc695, 0x206c,
++	0x080c, 0x1619, 0x2001, 0xc695, 0x2003, 0x0000, 0x2001, 0xc63a,
++	0x2003, 0x0010, 0x080c, 0x2a95, 0x2001, 0x0138, 0x2102, 0x012e,
++	0x0804, 0x3179, 0x2001, 0xc756, 0x2004, 0xa086, 0x0000, 0x0904,
++	0x3179, 0x080c, 0x768f, 0x1904, 0x3179, 0x2001, 0xc8e5, 0x2004,
++	0xa086, 0xaaaa, 0x0138, 0x2001, 0xc635, 0x2004, 0xa084, 0x0028,
++	0x0904, 0x3170, 0x2001, 0xc600, 0x2004, 0xa086, 0x0003, 0x1904,
++	0x3179, 0x7924, 0x810c, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x080c,
++	0x4026, 0x0904, 0x3179, 0x080c, 0x4067, 0x701b, 0x4380, 0x0005,
++	0x080c, 0x958d, 0x0904, 0x3179, 0x2001, 0xc8d3, 0x2004, 0x601a,
++	0x0016, 0x0026, 0x2001, 0xc61c, 0x2004, 0x8007, 0x6934, 0xa105,
++	0x6836, 0x2001, 0xc61d, 0x2004, 0x8007, 0x683a, 0x002e, 0x001e,
++	0x2d00, 0x6012, 0x601f, 0x0001, 0x2009, 0x0040, 0x080c, 0x9613,
++	0x0804, 0x3154, 0x0804, 0x3179, 0x2001, 0xc756, 0x200c, 0xa18e,
++	0x0000, 0x0904, 0x4402, 0x2001, 0x0101, 0x200c, 0xa18c, 0x7fff,
++	0x2102, 0x2001, 0x0103, 0x200c, 0xa18c, 0xfeff, 0xa18c, 0xfdff,
++	0xa18d, 0x0040, 0x2102, 0x2001, 0xc8d4, 0x200c, 0xa18c, 0xfeff,
++	0xa18c, 0xfdff, 0xa18d, 0x0040, 0x2102, 0x2001, 0x0138, 0x2003,
++	0x0000, 0x0126, 0x2091, 0x8000, 0x080c, 0x24f3, 0x012e, 0x0128,
++	0x20a9, 0x006e, 0x1f04, 0x43d2, 0x0ca0, 0x2001, 0xc756, 0x2003,
++	0x0000, 0x080c, 0x2a95, 0x2001, 0x0138, 0x2102, 0x0126, 0x2091,
++	0x8000, 0x2001, 0xc695, 0x200c, 0x81ff, 0x0138, 0x2168, 0x080c,
++	0x1619, 0x2001, 0xc695, 0x2003, 0x0000, 0x2001, 0xc8d3, 0x200c,
++	0x81ff, 0x0138, 0x2168, 0x080c, 0x1619, 0x2001, 0xc8d3, 0x2003,
++	0x0000, 0x2001, 0xc63a, 0x2003, 0x0010, 0x080c, 0x7475, 0x080c,
++	0x7484, 0x012e, 0x0804, 0x3154, 0x7824, 0x00e6, 0x2071, 0xc682,
++	0x00ee, 0x0804, 0x3154, 0x0006, 0x2001, 0xc653, 0x2004, 0xd0cc,
++	0x000e, 0x0005, 0x0006, 0x2001, 0xc672, 0x2004, 0xd0bc, 0x000e,
++	0x0005, 0x6168, 0x7a24, 0x6300, 0x82ff, 0x1118, 0x7926, 0x0804,
++	0x3154, 0x83ff, 0x1904, 0x317c, 0x2001, 0xfff0, 0xa200, 0x1a04,
++	0x317c, 0x2019, 0xffff, 0x606c, 0xa302, 0xa200, 0x0a04, 0x317c,
++	0x7926, 0x626a, 0x0804, 0x3154, 0x2001, 0xc600, 0x2004, 0xa086,
++	0x0003, 0x1904, 0x3179, 0x7c28, 0x7d24, 0x7e38, 0x7f2c, 0x080c,
++	0x4026, 0x0904, 0x3179, 0x2009, 0x0000, 0x2019, 0x0000, 0x7023,
++	0x0000, 0x702f, 0x0000, 0xad80, 0x0003, 0x7026, 0x20a0, 0xa1e0,
++	0xc77b, 0x2c64, 0x8cff, 0x01b8, 0x6004, 0xa084, 0x00ff, 0xa086,
++	0x0006, 0x0130, 0x6004, 0xa084, 0xff00, 0xa086, 0x0600, 0x1158,
++	0x6014, 0x20a2, 0x94a0, 0x6010, 0x8007, 0xa105, 0x8007, 0x20a2,
++	0x94a0, 0xa398, 0x0002, 0x8108, 0xa182, 0x00ff, 0x0120, 0xa386,
++	0x002a, 0x0148, 0x08e0, 0x83ff, 0x1120, 0x7120, 0x810c, 0x0804,
++	0x3154, 0x702f, 0x0001, 0x711e, 0x7020, 0xa300, 0x7022, 0x2061,
++	0xc6f2, 0x6007, 0x0000, 0x6312, 0x7024, 0x600e, 0x6426, 0x652a,
++	0x662e, 0x6732, 0x2c10, 0x080c, 0x164d, 0x7007, 0x0002, 0x701b,
++	0x4492, 0x0005, 0x702c, 0xa005, 0x1168, 0x711c, 0x7024, 0x20a0,
++	0x2019, 0x0000, 0x2061, 0xc6f2, 0x6424, 0x6528, 0x662c, 0x6730,
++	0x0804, 0x444f, 0x7120, 0x810c, 0x0804, 0x3154, 0x81ff, 0x1904,
++	0x3179, 0x60d4, 0xd0ac, 0x1118, 0xd09c, 0x0904, 0x3179, 0x080c,
++	0x4026, 0x0904, 0x3179, 0x7924, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38,
++	0x080c, 0x4067, 0x701b, 0x44bd, 0x0005, 0x00d6, 0xade8, 0x000d,
++	0x6828, 0xa0be, 0x7000, 0x0148, 0xa0be, 0x7100, 0x0130, 0xa0be,
++	0x7200, 0x0118, 0x00de, 0x0804, 0x317c, 0x6820, 0x6924, 0x080c,
++	0x29c7, 0x1510, 0x080c, 0x52e1, 0x11f8, 0x7122, 0x6612, 0x6516,
++	0x6e18, 0x00c6, 0x080c, 0x4026, 0x01b8, 0x080c, 0x4026, 0x01a0,
++	0x00ce, 0x00de, 0x6837, 0x0000, 0x6838, 0xc0fd, 0x683a, 0x6823,
++	0x0000, 0x6804, 0x2068, 0x080c, 0xadf5, 0x0904, 0x3179, 0x7007,
++	0x0003, 0x701b, 0x44f7, 0x0005, 0x00de, 0x0804, 0x3179, 0x7120,
++	0x080c, 0x2f41, 0x6820, 0xa086, 0x8001, 0x0904, 0x3179, 0x2d00,
++	0x701e, 0x6804, 0xa080, 0x0002, 0x0006, 0x20a9, 0x002a, 0x2098,
++	0x20a0, 0x080c, 0x4ecb, 0x000e, 0xade8, 0x000d, 0x6a08, 0x6b0c,
++	0x6c10, 0x6d14, 0x2061, 0xc6f2, 0x6007, 0x0000, 0x6e00, 0x6f28,
++	0xa7c6, 0x7000, 0x1108, 0x0018, 0xa7c6, 0x7100, 0x1140, 0xa6c2,
++	0x0004, 0x0a04, 0x317c, 0x2009, 0x0004, 0x0804, 0x406a, 0xa7c6,
++	0x7200, 0x1904, 0x317c, 0xa6c2, 0x0054, 0x0a04, 0x317c, 0x600e,
++	0x6013, 0x002a, 0x6226, 0x632a, 0x642e, 0x6532, 0x2c10, 0x080c,
++	0x164d, 0x7007, 0x0002, 0x701b, 0x453e, 0x0005, 0x701c, 0x2068,
++	0x6804, 0xa080, 0x0001, 0x2004, 0xa080, 0x0002, 0x0006, 0x20a9,
++	0x002a, 0x2098, 0x20a0, 0x080c, 0x4ecb, 0x000e, 0x2009, 0x002a,
++	0x2061, 0xc6f2, 0x6224, 0x6328, 0x642c, 0x6530, 0x0804, 0x406a,
++	0x81ff, 0x1904, 0x3179, 0x792c, 0x2001, 0xc8e7, 0x2102, 0x080c,
++	0x403b, 0x0904, 0x317c, 0x080c, 0x5403, 0x0904, 0x3179, 0x0126,
++	0x2091, 0x8000, 0x080c, 0x5535, 0x012e, 0x0804, 0x3154, 0x7824,
++	0xd08c, 0x1118, 0xd084, 0x0904, 0x3bf0, 0x080c, 0x404b, 0x0904,
++	0x317c, 0x00c6, 0x080c, 0x4026, 0x00ce, 0x1120, 0x2009, 0x0002,
++	0x0804, 0x3179, 0x6004, 0xa084, 0x00ff, 0xa086, 0x0006, 0x0128,
++	0xa08e, 0x0004, 0x0110, 0xa08e, 0x0005, 0x15b8, 0x7824, 0xd08c,
++	0x0120, 0x6000, 0xc08c, 0x6002, 0x0030, 0x2001, 0xc653, 0x2004,
++	0xd0b4, 0x0904, 0x3c2c, 0x7824, 0xa084, 0xff00, 0xa08e, 0x7e00,
++	0x0904, 0x3c2c, 0xa08e, 0x7f00, 0x0904, 0x3c2c, 0xa08e, 0x8000,
++	0x0904, 0x3c2c, 0x6000, 0xd08c, 0x1904, 0x3c2c, 0x6837, 0x0000,
++	0x6838, 0xc0fd, 0x683a, 0x080c, 0xae11, 0x1120, 0x2009, 0x0003,
++	0x0804, 0x3179, 0x7007, 0x0003, 0x701b, 0x45bf, 0x0005, 0x080c,
++	0x404b, 0x0904, 0x317c, 0x0804, 0x3c2c, 0x2009, 0xc631, 0x210c,
++	0x81ff, 0x0120, 0x2009, 0x0001, 0x0804, 0x3179, 0x2001, 0xc600,
++	0x2004, 0xa086, 0x0003, 0x0120, 0x2009, 0x0007, 0x0804, 0x3179,
++	0x2001, 0xc653, 0x2004, 0xd0ac, 0x0120, 0x2009, 0x0008, 0x0804,
++	0x3179, 0x609c, 0xd0a4, 0x1118, 0xd0ac, 0x1904, 0x3c2c, 0x6837,
++	0x0000, 0x6833, 0x0000, 0x6838, 0xc0fd, 0x683a, 0x080c, 0xaea2,
++	0x1120, 0x2009, 0x0003, 0x0804, 0x3179, 0x7007, 0x0003, 0x701b,
++	0x45fa, 0x0005, 0x6830, 0xa086, 0x0100, 0x1120, 0x2009, 0x0004,
++	0x0804, 0x3179, 0x080c, 0x404b, 0x0904, 0x317c, 0x0804, 0x458e,
++	0x81ff, 0x2009, 0x0001, 0x1904, 0x3179, 0x6000, 0xa086, 0x0003,
++	0x2009, 0x0007, 0x1904, 0x3179, 0x2001, 0xc653, 0x2004, 0xd0ac,
++	0x2009, 0x0008, 0x1904, 0x3179, 0x080c, 0x404b, 0x0904, 0x317c,
++	0x6004, 0xa084, 0x00ff, 0xa086, 0x0006, 0x2009, 0x0009, 0x1904,
++	0x3179, 0x00c6, 0x080c, 0x4026, 0x00ce, 0x2009, 0x0002, 0x0904,
++	0x3179, 0x6837, 0x0000, 0x6833, 0x0000, 0x6838, 0xc0fd, 0x683a,
++	0x7928, 0xa194, 0xff00, 0xa18c, 0x00ff, 0xa006, 0x82ff, 0x1128,
++	0xc0ed, 0x6952, 0x792c, 0x6956, 0x0048, 0xa28e, 0x0100, 0x1904,
++	0x317c, 0xc0e5, 0x6853, 0x0000, 0x6857, 0x0000, 0x683e, 0x080c,
++	0xb05f, 0x2009, 0x0003, 0x0904, 0x3179, 0x7007, 0x0003, 0x701b,
++	0x465a, 0x0005, 0x6830, 0xa086, 0x0100, 0x2009, 0x0004, 0x0904,
++	0x3179, 0x0804, 0x3154, 0x81ff, 0x2009, 0x0001, 0x1904, 0x3179,
++	0x6000, 0xa086, 0x0003, 0x2009, 0x0007, 0x1904, 0x3179, 0x080c,
++	0x404b, 0x0904, 0x317c, 0x6004, 0xa084, 0x00ff, 0xa086, 0x0006,
++	0x2009, 0x0009, 0x1904, 0x3179, 0x00c6, 0x080c, 0x4026, 0x00ce,
++	0x2009, 0x0002, 0x0904, 0x3179, 0xad80, 0x000f, 0x2009, 0x0008,
++	0x7a2c, 0x7b28, 0x7c3c, 0x7d38, 0x080c, 0x4067, 0x701b, 0x4691,
++	0x0005, 0x00d6, 0xade8, 0x000f, 0x6800, 0xa086, 0x0500, 0x1140,
++	0x6804, 0xa005, 0x1128, 0x6808, 0xa084, 0xff00, 0x1108, 0x0018,
++	0x00de, 0x1904, 0x317c, 0x00de, 0x6837, 0x0000, 0x6833, 0x0000,
++	0x6838, 0xc0fd, 0x683a, 0x00c6, 0x080c, 0x404b, 0x1118, 0x00ce,
++	0x0804, 0x317c, 0x080c, 0xb0ae, 0x2009, 0x0003, 0x00ce, 0x0904,
++	0x3179, 0x7007, 0x0003, 0x701b, 0x46be, 0x0005, 0x6830, 0xa086,
++	0x0100, 0x2009, 0x0004, 0x0904, 0x3179, 0x0804, 0x3154, 0x81ff,
++	0x0120, 0x2009, 0x0001, 0x0804, 0x3179, 0x6000, 0xa086, 0x0003,
++	0x0120, 0x2009, 0x0007, 0x0804, 0x3179, 0x7e24, 0x860f, 0xa18c,
++	0x00ff, 0xa6b4, 0x00ff, 0x080c, 0x533d, 0x1904, 0x317c, 0xa186,
++	0x007f, 0x0150, 0x6004, 0xa084, 0x00ff, 0xa086, 0x0006, 0x0120,
++	0x2009, 0x0009, 0x0804, 0x3179, 0x00c6, 0x080c, 0x4026, 0x00ce,
++	0x1120, 0x2009, 0x0002, 0x0804, 0x3179, 0x6837, 0x0000, 0x6838,
++	0xc0fd, 0x683a, 0x2001, 0x0100, 0x8007, 0x680a, 0x080c, 0xae2c,
++	0x1120, 0x2009, 0x0003, 0x0804, 0x3179, 0x7007, 0x0003, 0x701b,
++	0x470a, 0x0005, 0x6808, 0x8007, 0xa086, 0x0100, 0x1120, 0x2009,
++	0x0004, 0x0804, 0x3179, 0x68b0, 0x6836, 0x6810, 0x8007, 0xa084,
++	0x00ff, 0x800c, 0x6814, 0x8007, 0xa084, 0x00ff, 0x8004, 0xa080,
++	0x0002, 0xa108, 0xad80, 0x0004, 0x7a2c, 0x7b28, 0x7c3c, 0x7d38,
++	0x0804, 0x406a, 0x080c, 0x4026, 0x1120, 0x2009, 0x0002, 0x0804,
++	0x3179, 0x7924, 0xa194, 0xff00, 0xa18c, 0x00ff, 0x8217, 0x82ff,
++	0x0110, 0x0804, 0x317c, 0x2009, 0x001a, 0x7a2c, 0x7b28, 0x7c3c,
++	0x7d38, 0x080c, 0x4067, 0x701b, 0x4746, 0x0005, 0x2001, 0xc62a,
++	0x2003, 0x0001, 0xad80, 0x000d, 0x2098, 0x20a9, 0x001a, 0x20a1,
++	0xc90d, 0x53a3, 0x0804, 0x3154, 0x080c, 0x4026, 0x1120, 0x2009,
++	0x0002, 0x0804, 0x3179, 0x7924, 0xa194, 0xff00, 0xa18c, 0x00ff,
++	0x8217, 0x82ff, 0x0110, 0x0804, 0x317c, 0x2099, 0xc90d, 0x20a0,
++	0x20a9, 0x001a, 0x53a3, 0x2009, 0x001a, 0x7a2c, 0x7b28, 0x7c3c,
++	0x7d38, 0x0804, 0x406a, 0x7824, 0xa08a, 0x1000, 0x1a04, 0x317c,
++	0x0126, 0x2091, 0x8000, 0x8003, 0x800b, 0x810b, 0xa108, 0x00c6,
++	0x2061, 0xc93a, 0x6142, 0x00ce, 0x012e, 0x0804, 0x3154, 0x00c6,
++	0x080c, 0x5f22, 0x1188, 0x2001, 0xc8e6, 0x2003, 0x0001, 0x2001,
++	0xc600, 0x2003, 0x0001, 0xa085, 0x0001, 0x080c, 0x5f66, 0x080c,
++	0x5e5a, 0x080c, 0x1519, 0x0038, 0x2061, 0xc600, 0x6030, 0xc09d,
++	0x6032, 0x080c, 0x4e5b, 0x00ce, 0x0005, 0x0126, 0x2091, 0x8000,
++	0x00c6, 0x2061, 0xc93a, 0x7924, 0x6152, 0x614e, 0x6057, 0x0000,
++	0x604b, 0x0009, 0x7838, 0x606a, 0x783c, 0x6066, 0x7828, 0x6062,
++	0x782c, 0x605e, 0x2061, 0xc8e8, 0x2001, 0xc94f, 0x600e, 0x6013,
++	0x0001, 0x6017, 0x0002, 0x6007, 0x0000, 0x6037, 0x0000, 0x00ce,
++	0x012e, 0x0804, 0x3154, 0x0126, 0x00c6, 0x00e6, 0x2061, 0x0100,
++	0x2071, 0xc600, 0x6044, 0xd0a4, 0x11b0, 0xd084, 0x0118, 0x080c,
++	0x4942, 0x0068, 0xd08c, 0x0118, 0x080c, 0x4863, 0x0040, 0xd094,
++	0x0118, 0x080c, 0x4834, 0x0018, 0xd09c, 0x0108, 0x0061, 0x00ee,
++	0x00ce, 0x012e, 0x0005, 0x0016, 0x6128, 0xd19c, 0x1110, 0xc19d,
++	0x612a, 0x001e, 0x0ca0, 0x624c, 0xa286, 0xf0f0, 0x1150, 0x6048,
++	0xa086, 0xf0f0, 0x0130, 0x624a, 0x6043, 0x0090, 0x6043, 0x0010,
++	0x0490, 0xa294, 0xff00, 0xa296, 0xf700, 0x0178, 0x7134, 0xd1a4,
++	0x1160, 0x6240, 0xa295, 0x0100, 0x6242, 0xa294, 0x0010, 0x0128,
++	0x2009, 0x00f7, 0x080c, 0x4eeb, 0x00f0, 0x6040, 0xa084, 0x0010,
++	0xa085, 0x0140, 0x6042, 0x6043, 0x0000, 0x707b, 0x0000, 0x7097,
++	0x0001, 0x70bb, 0x0000, 0x70d7, 0x0000, 0x2009, 0xcdc0, 0x200b,
++	0x0000, 0x708b, 0x0000, 0x707f, 0x000a, 0x2009, 0x000a, 0x2011,
++	0x4e11, 0x080c, 0x7036, 0x0005, 0x0156, 0x2001, 0xc674, 0x2004,
++	0xd08c, 0x0110, 0x7053, 0xffff, 0x707c, 0xa005, 0x1510, 0x2011,
++	0x4e11, 0x080c, 0x6fad, 0x6040, 0xa094, 0x0010, 0xa285, 0x0020,
++	0x6042, 0x20a9, 0x00c8, 0x6044, 0xd08c, 0x1168, 0x1f04, 0x484b,
++	0x6242, 0x708f, 0x0000, 0x6040, 0xa094, 0x0010, 0xa285, 0x0080,
++	0x6042, 0x6242, 0x0030, 0x6242, 0x708f, 0x0000, 0x7083, 0x0000,
++	0x0000, 0x015e, 0x0005, 0x7080, 0xa08a, 0x0003, 0x1210, 0x0023,
++	0x0010, 0x080c, 0x1519, 0x0005, 0x486f, 0x48bf, 0x4941, 0x00f6,
++	0x7083, 0x0001, 0x20e1, 0xa000, 0xe000, 0x20e1, 0x8700, 0x080c,
++	0x25bb, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x2079, 0xcc00, 0x207b,
++	0x2200, 0x7807, 0x00ef, 0x780b, 0x0000, 0x780f, 0x00ef, 0x7813,
++	0x0138, 0x7817, 0x0000, 0x781b, 0x0000, 0x781f, 0x0000, 0x7823,
++	0xffff, 0x7827, 0xffff, 0x782b, 0x0000, 0x782f, 0x0000, 0x2079,
++	0xcc0c, 0x207b, 0x1101, 0x7807, 0x0000, 0x2099, 0xc605, 0x20a1,
++	0xcc0e, 0x20a9, 0x0004, 0x53a3, 0x2079, 0xcc12, 0x207b, 0x0000,
++	0x7807, 0x0000, 0x2099, 0xcc00, 0x20a1, 0x020b, 0x20a9, 0x0014,
++	0x53a6, 0x60c3, 0x000c, 0x600f, 0x0000, 0x080c, 0x4e42, 0x00fe,
++	0x7087, 0x0000, 0x6043, 0x0008, 0x6043, 0x0000, 0x0005, 0x00d6,
++	0x7084, 0x7087, 0x0000, 0xa025, 0x0904, 0x4929, 0x6020, 0xd0b4,
++	0x1904, 0x4927, 0x7194, 0x81ff, 0x0904, 0x4917, 0xa486, 0x000c,
++	0x1904, 0x4922, 0xa480, 0x0018, 0x8004, 0x20a8, 0x2011, 0xcc80,
++	0x2019, 0xcc00, 0x220c, 0x2304, 0xa106, 0x11b8, 0x8210, 0x8318,
++	0x1f04, 0x48da, 0x6043, 0x0004, 0x608b, 0xbc94, 0x608f, 0xf0f0,
++	0x6043, 0x0006, 0x7083, 0x0002, 0x708f, 0x0002, 0x2009, 0x07d0,
++	0x2011, 0x4e18, 0x080c, 0x7036, 0x0490, 0x2069, 0xcc80, 0x6930,
++	0xa18e, 0x1101, 0x1538, 0x6834, 0xa005, 0x1520, 0x6900, 0xa18c,
++	0x00ff, 0x1118, 0x6804, 0xa005, 0x0190, 0x2011, 0xcc8e, 0x2019,
++	0xc605, 0x20a9, 0x0004, 0x220c, 0x2304, 0xa102, 0x0230, 0x1190,
++	0x8210, 0x8318, 0x1f04, 0x490b, 0x0068, 0x7097, 0x0000, 0x20e1,
++	0x9080, 0x20e1, 0x4000, 0x2099, 0xcc80, 0x20a1, 0x020b, 0x20a9,
++	0x0014, 0x53a6, 0x6043, 0x0008, 0x6043, 0x0000, 0x0010, 0x00de,
++	0x0005, 0x6040, 0xa085, 0x0100, 0x6042, 0x6020, 0xd0b4, 0x1db8,
++	0x60c3, 0x000c, 0x2011, 0xc931, 0x2013, 0x0000, 0x7087, 0x0000,
++	0x20e1, 0x9080, 0x60a3, 0x0056, 0x60a7, 0x9575, 0x080c, 0x8bec,
++	0x0c30, 0x0005, 0x708c, 0xa08a, 0x001d, 0x1210, 0x0023, 0x0010,
++	0x080c, 0x1519, 0x0005, 0x4975, 0x4984, 0x49ac, 0x49c5, 0x49e9,
++	0x4a11, 0x4a35, 0x4a66, 0x4a8a, 0x4ab2, 0x4ae9, 0x4b11, 0x4b2d,
++	0x4b43, 0x4b63, 0x4b76, 0x4b7e, 0x4bae, 0x4bd2, 0x4bfa, 0x4c1e,
++	0x4c4f, 0x4c8c, 0x4cbb, 0x4cd7, 0x4d16, 0x4d36, 0x4d4f, 0x4d50,
++	0x00c6, 0x2061, 0xc600, 0x6003, 0x0007, 0x2061, 0x0100, 0x6004,
++	0xa084, 0xfff9, 0x6006, 0x00ce, 0x0005, 0x608b, 0xbc94, 0x608f,
++	0xf0f0, 0x6043, 0x0002, 0x708f, 0x0001, 0x2009, 0x07d0, 0x2011,
++	0x4e18, 0x080c, 0x7036, 0x0005, 0x00f6, 0x7084, 0xa086, 0x0014,
++	0x1508, 0x6043, 0x0000, 0x6020, 0xd0b4, 0x11e0, 0x2079, 0xcc80,
++	0x7a30, 0xa296, 0x1102, 0x11a0, 0x7834, 0xa005, 0x1188, 0x7a38,
++	0xd2fc, 0x0128, 0x70b8, 0xa005, 0x1110, 0x70bb, 0x0001, 0x2011,
++	0x4e18, 0x080c, 0x6fad, 0x708f, 0x0010, 0x080c, 0x4b7e, 0x0010,
++	0x080c, 0x4e5b, 0x00fe, 0x0005, 0x708f, 0x0003, 0x6043, 0x0004,
++	0x2011, 0x4e18, 0x080c, 0x6fad, 0x080c, 0x4ed3, 0x20a3, 0x1102,
++	0x20a3, 0x0000, 0x20a9, 0x000a, 0x20a3, 0x0000, 0x1f04, 0x49bc,
++	0x60c3, 0x0014, 0x080c, 0x4e42, 0x0005, 0x00f6, 0x7084, 0xa005,
++	0x01f0, 0x2011, 0x4e18, 0x080c, 0x6fad, 0xa086, 0x0014, 0x11a8,
++	0x2079, 0xcc80, 0x7a30, 0xa296, 0x1102, 0x1178, 0x7834, 0xa005,
++	0x1160, 0x7a38, 0xd2fc, 0x0128, 0x70b8, 0xa005, 0x1110, 0x70bb,
++	0x0001, 0x708f, 0x0004, 0x0029, 0x0010, 0x080c, 0x4e5b, 0x00fe,
++	0x0005, 0x708f, 0x0005, 0x080c, 0x4ed3, 0x20a3, 0x1103, 0x20a3,
++	0x0000, 0x3430, 0x2011, 0xcc8e, 0x080c, 0x4f24, 0x1160, 0x7078,
++	0xa005, 0x1148, 0x7150, 0xa186, 0xffff, 0x0128, 0x080c, 0x4ddc,
++	0x0110, 0x080c, 0x4f02, 0x20a9, 0x0008, 0x2298, 0x26a0, 0x53a6,
++	0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x0014, 0x080c, 0x4e42,
++	0x0005, 0x00f6, 0x7084, 0xa005, 0x01f0, 0x2011, 0x4e18, 0x080c,
++	0x6fad, 0xa086, 0x0014, 0x11a8, 0x2079, 0xcc80, 0x7a30, 0xa296,
++	0x1103, 0x1178, 0x7834, 0xa005, 0x1160, 0x7a38, 0xd2fc, 0x0128,
++	0x70b8, 0xa005, 0x1110, 0x70bb, 0x0001, 0x708f, 0x0006, 0x0029,
++	0x0010, 0x080c, 0x4e5b, 0x00fe, 0x0005, 0x708f, 0x0007, 0x080c,
++	0x4ed3, 0x20a3, 0x1104, 0x20a3, 0x0000, 0x3430, 0x2011, 0xcc8e,
++	0x080c, 0x4f24, 0x11a8, 0x7078, 0xa005, 0x1190, 0x7158, 0xa186,
++	0xffff, 0x0170, 0xa180, 0x2f6e, 0x200d, 0xa18c, 0xff00, 0x810f,
++	0x080c, 0x4ddc, 0x0128, 0x080c, 0x4412, 0x0110, 0x080c, 0x2a11,
++	0x20a9, 0x0008, 0x2298, 0x26a0, 0x53a6, 0x20a3, 0x0000, 0x20a3,
++	0x0000, 0x60c3, 0x0014, 0x080c, 0x4e42, 0x0005, 0x00f6, 0x7084,
++	0xa005, 0x01f0, 0x2011, 0x4e18, 0x080c, 0x6fad, 0xa086, 0x0014,
++	0x11a8, 0x2079, 0xcc80, 0x7a30, 0xa296, 0x1104, 0x1178, 0x7834,
++	0xa005, 0x1160, 0x7a38, 0xd2fc, 0x0128, 0x70b8, 0xa005, 0x1110,
++	0x70bb, 0x0001, 0x708f, 0x0008, 0x0029, 0x0010, 0x080c, 0x4e5b,
++	0x00fe, 0x0005, 0x708f, 0x0009, 0x080c, 0x4ed3, 0x20a3, 0x1105,
++	0x20a3, 0x0100, 0x3430, 0x080c, 0x4f24, 0x1150, 0x7078, 0xa005,
++	0x1138, 0x080c, 0x4d51, 0x1170, 0xa085, 0x0001, 0x080c, 0x2a11,
++	0x20a9, 0x0008, 0x2099, 0xcc8e, 0x26a0, 0x53a6, 0x20a3, 0x0000,
++	0x20a3, 0x0000, 0x60c3, 0x0014, 0x080c, 0x4e42, 0x0010, 0x080c,
++	0x4968, 0x0005, 0x00f6, 0x7084, 0xa005, 0x0588, 0x2011, 0x4e18,
++	0x080c, 0x6fad, 0xa086, 0x0014, 0x1540, 0x2079, 0xcc80, 0x7a30,
++	0xa296, 0x1105, 0x1510, 0x7834, 0x2011, 0x0100, 0xa21e, 0x1160,
++	0x7a38, 0xd2fc, 0x0128, 0x70b8, 0xa005, 0x1110, 0x70bb, 0x0001,
++	0x708f, 0x000a, 0x00b1, 0x0098, 0xa005, 0x1178, 0x7a38, 0xd2fc,
++	0x0128, 0x70b8, 0xa005, 0x1110, 0x70bb, 0x0001, 0x708b, 0x0000,
++	0x708f, 0x000e, 0x080c, 0x4b63, 0x0010, 0x080c, 0x4e5b, 0x00fe,
++	0x0005, 0x708f, 0x000b, 0x2011, 0xcc0e, 0x22a0, 0x20a9, 0x0040,
++	0x2019, 0xffff, 0x43a4, 0x20a9, 0x0002, 0x2009, 0x0000, 0x41a4,
++	0x080c, 0x4ed3, 0x20a3, 0x1106, 0x20a3, 0x0000, 0x080c, 0x4f24,
++	0x0118, 0x2013, 0x0000, 0x0020, 0x7054, 0xa085, 0x0100, 0x2012,
++	0x2298, 0x20a9, 0x0042, 0x53a6, 0x60c3, 0x0084, 0x080c, 0x4e42,
++	0x0005, 0x00f6, 0x7084, 0xa005, 0x01b0, 0x2011, 0x4e18, 0x080c,
++	0x6fad, 0xa086, 0x0084, 0x1168, 0x2079, 0xcc80, 0x7a30, 0xa296,
++	0x1106, 0x1138, 0x7834, 0xa005, 0x1120, 0x708f, 0x000c, 0x0029,
++	0x0010, 0x080c, 0x4e5b, 0x00fe, 0x0005, 0x708f, 0x000d, 0x080c,
++	0x4ed3, 0x20a3, 0x1107, 0x20a3, 0x0000, 0x2099, 0xcc8e, 0x20a9,
++	0x0040, 0x53a6, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x0084,
++	0x080c, 0x4e42, 0x0005, 0x00f6, 0x7084, 0xa005, 0x01d0, 0x2011,
++	0x4e18, 0x080c, 0x6fad, 0xa086, 0x0084, 0x1188, 0x2079, 0xcc80,
++	0x7a30, 0xa296, 0x1107, 0x1158, 0x7834, 0xa005, 0x1140, 0x708b,
++	0x0001, 0x080c, 0x4ec5, 0x708f, 0x000e, 0x0029, 0x0010, 0x080c,
++	0x4e5b, 0x00fe, 0x0005, 0x708f, 0x000f, 0x7087, 0x0000, 0x608b,
++	0xbc85, 0x608f, 0xb5b5, 0x6043, 0x0005, 0x6043, 0x0004, 0x2009,
++	0x07d0, 0x2011, 0x4e18, 0x080c, 0x6fa1, 0x0005, 0x7084, 0xa005,
++	0x0120, 0x2011, 0x4e18, 0x080c, 0x6fad, 0x0005, 0x708f, 0x0011,
++	0x080c, 0x4f24, 0x11a0, 0x7170, 0x81ff, 0x0188, 0x2009, 0x0000,
++	0x7074, 0xa084, 0x00ff, 0x080c, 0x29c7, 0xa186, 0x007e, 0x0138,
++	0xa186, 0x0080, 0x0120, 0x2011, 0xcc8e, 0x080c, 0x4ddc, 0x20e1,
++	0x9080, 0x20e1, 0x4000, 0x2099, 0xcc80, 0x20a1, 0x020b, 0x7484,
++	0xa480, 0x0018, 0xa080, 0x0007, 0xa084, 0x03f8, 0x8004, 0x20a8,
++	0x53a6, 0x60c3, 0x0014, 0x080c, 0x4e42, 0x0005, 0x00f6, 0x7084,
++	0xa005, 0x01f0, 0x2011, 0x4e18, 0x080c, 0x6fad, 0xa086, 0x0014,
++	0x11a8, 0x2079, 0xcc80, 0x7a30, 0xa296, 0x1103, 0x1178, 0x7834,
++	0xa005, 0x1160, 0x7a38, 0xd2fc, 0x0128, 0x70b8, 0xa005, 0x1110,
++	0x70bb, 0x0001, 0x708f, 0x0012, 0x0029, 0x0010, 0x080c, 0x4e5b,
++	0x00fe, 0x0005, 0x708f, 0x0013, 0x080c, 0x4edf, 0x20a3, 0x1103,
++	0x20a3, 0x0000, 0x3430, 0x2011, 0xcc8e, 0x080c, 0x4f24, 0x1160,
++	0x7078, 0xa005, 0x1148, 0x7150, 0xa186, 0xffff, 0x0128, 0x080c,
++	0x4ddc, 0x0110, 0x080c, 0x4f02, 0x20a9, 0x0008, 0x2298, 0x26a0,
++	0x53a6, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x0014, 0x080c,
++	0x4e42, 0x0005, 0x00f6, 0x7084, 0xa005, 0x01f0, 0x2011, 0x4e18,
++	0x080c, 0x6fad, 0xa086, 0x0014, 0x11a8, 0x2079, 0xcc80, 0x7a30,
++	0xa296, 0x1104, 0x1178, 0x7834, 0xa005, 0x1160, 0x7a38, 0xd2fc,
++	0x0128, 0x70b8, 0xa005, 0x1110, 0x70bb, 0x0001, 0x708f, 0x0014,
++	0x0029, 0x0010, 0x080c, 0x4e5b, 0x00fe, 0x0005, 0x708f, 0x0015,
++	0x080c, 0x4edf, 0x20a3, 0x1104, 0x20a3, 0x0000, 0x3430, 0x2011,
++	0xcc8e, 0x080c, 0x4f24, 0x11a8, 0x7078, 0xa005, 0x1190, 0x7158,
++	0xa186, 0xffff, 0x0170, 0xa180, 0x2f6e, 0x200d, 0xa18c, 0xff00,
++	0x810f, 0x080c, 0x4ddc, 0x0128, 0x080c, 0x4412, 0x0110, 0x080c,
++	0x2a11, 0x20a9, 0x0008, 0x2298, 0x26a0, 0x53a6, 0x20a3, 0x0000,
++	0x20a3, 0x0000, 0x60c3, 0x0014, 0x080c, 0x4e42, 0x0005, 0x00f6,
++	0x7084, 0xa005, 0x05b8, 0x2011, 0x4e18, 0x080c, 0x6fad, 0xa086,
++	0x0014, 0x1570, 0x2079, 0xcc80, 0x7a30, 0xa296, 0x1105, 0x1540,
++	0x7834, 0x2011, 0x0100, 0xa21e, 0x1148, 0x7a38, 0xd2fc, 0x0128,
++	0x70b8, 0xa005, 0x1110, 0x70bb, 0x0001, 0x0060, 0xa005, 0x11c0,
++	0x7a38, 0xd2fc, 0x0128, 0x70b8, 0xa005, 0x1110, 0x70bb, 0x0001,
++	0x708b, 0x0000, 0x7a38, 0xd2f4, 0x0138, 0x2001, 0xc674, 0x2004,
++	0xd0a4, 0x1110, 0x70d7, 0x0008, 0x708f, 0x0016, 0x0029, 0x0010,
++	0x080c, 0x4e5b, 0x00fe, 0x0005, 0x20e1, 0x9080, 0x20e1, 0x4000,
++	0x2099, 0xcc80, 0x20a1, 0x020b, 0x20a9, 0x000e, 0x53a6, 0x3430,
++	0x2011, 0xcc8e, 0x708f, 0x0017, 0x080c, 0x4f24, 0x1150, 0x7078,
++	0xa005, 0x1138, 0x080c, 0x4d51, 0x1170, 0xa085, 0x0001, 0x080c,
++	0x2a11, 0x20a9, 0x0008, 0x2099, 0xcc8e, 0x26a0, 0x53a6, 0x20a3,
++	0x0000, 0x20a3, 0x0000, 0x60c3, 0x0014, 0x080c, 0x4e42, 0x0010,
++	0x080c, 0x4968, 0x0005, 0x00f6, 0x7084, 0xa005, 0x01b0, 0x2011,
++	0x4e18, 0x080c, 0x6fad, 0xa086, 0x0084, 0x1168, 0x2079, 0xcc80,
++	0x7a30, 0xa296, 0x1106, 0x1138, 0x7834, 0xa005, 0x1120, 0x708f,
++	0x0018, 0x0029, 0x0010, 0x080c, 0x4e5b, 0x00fe, 0x0005, 0x708f,
++	0x0019, 0x080c, 0x4edf, 0x20a3, 0x1106, 0x20a3, 0x0000, 0x3430,
++	0x2099, 0xcc8e, 0x2039, 0xcc0e, 0x27a0, 0x20a9, 0x0040, 0x53a3,
++	0x080c, 0x4f24, 0x11e8, 0x2728, 0x2514, 0x8207, 0xa084, 0x00ff,
++	0x8000, 0x2018, 0xa294, 0x00ff, 0x8007, 0xa205, 0x202a, 0x7054,
++	0x2310, 0x8214, 0xa2a0, 0xcc0e, 0x2414, 0xa38c, 0x0001, 0x0118,
++	0xa294, 0xff00, 0x0018, 0xa294, 0x00ff, 0x8007, 0xa215, 0x2222,
++	0x2798, 0x26a0, 0x20a9, 0x0040, 0x53a6, 0x20a3, 0x0000, 0x20a3,
++	0x0000, 0x60c3, 0x0084, 0x080c, 0x4e42, 0x0005, 0x00f6, 0x7084,
++	0xa005, 0x01d0, 0x2011, 0x4e18, 0x080c, 0x6fad, 0xa086, 0x0084,
++	0x1188, 0x2079, 0xcc80, 0x7a30, 0xa296, 0x1107, 0x1158, 0x7834,
++	0xa005, 0x1140, 0x708b, 0x0001, 0x080c, 0x4ec5, 0x708f, 0x001a,
++	0x0029, 0x0010, 0x080c, 0x4e5b, 0x00fe, 0x0005, 0x708f, 0x001b,
++	0x20e1, 0x9080, 0x20e1, 0x4000, 0x2099, 0xcc80, 0x20a1, 0x020b,
++	0x7484, 0xa480, 0x0018, 0xa080, 0x0007, 0xa084, 0x03f8, 0x8004,
++	0x20a8, 0x53a6, 0x60c3, 0x0084, 0x080c, 0x4e42, 0x0005, 0x0005,
++	0x0005, 0x0086, 0x0096, 0x2029, 0xc653, 0x252c, 0x20a9, 0x0008,
++	0x2041, 0xcc0e, 0x28a0, 0x2099, 0xcc8e, 0x53a3, 0x20a9, 0x0008,
++	0x2011, 0x0007, 0xd5d4, 0x0110, 0x2011, 0x0000, 0x2800, 0xa200,
++	0x200c, 0xa1a6, 0xffff, 0x1148, 0xd5d4, 0x0110, 0x8210, 0x0008,
++	0x8211, 0x1f04, 0x4d66, 0x0804, 0x4dd4, 0x82ff, 0x1160, 0xd5d4,
++	0x0120, 0xa1a6, 0x3fff, 0x0d90, 0x0020, 0xa1a6, 0x3fff, 0x0904,
++	0x4dd4, 0xa18d, 0xc000, 0x20a9, 0x0010, 0x2019, 0x0001, 0xd5d4,
++	0x0110, 0x2019, 0x0010, 0x2120, 0xd5d4, 0x0110, 0x8423, 0x0008,
++	0x8424, 0x1240, 0xd5d4, 0x0110, 0x8319, 0x0008, 0x8318, 0x1f04,
++	0x4d8c, 0x04d0, 0x23a8, 0x2021, 0x0001, 0x8426, 0x8425, 0x1f04,
++	0x4d9e, 0x2328, 0x8529, 0xa2be, 0x0007, 0x0158, 0x0006, 0x2039,
++	0x0007, 0x2200, 0xa73a, 0x000e, 0x27a8, 0xa5a8, 0x0010, 0x1f04,
++	0x4dad, 0x7552, 0xa5c8, 0x2f6e, 0x292d, 0xa5ac, 0x00ff, 0x7576,
++	0x6532, 0x6536, 0x0016, 0x2508, 0x080c, 0x29f1, 0x001e, 0x60e7,
++	0x0000, 0x65ea, 0x2018, 0x2304, 0xa405, 0x201a, 0x707b, 0x0001,
++	0x26a0, 0x2898, 0x20a9, 0x0008, 0x53a6, 0x20a3, 0x0000, 0x20a3,
++	0x0000, 0xa085, 0x0001, 0x0028, 0xa006, 0x0018, 0xa006, 0x080c,
++	0x1519, 0x009e, 0x008e, 0x0005, 0x2118, 0x2021, 0x0000, 0x2001,
++	0x0007, 0xa39a, 0x0010, 0x0218, 0x8420, 0x8001, 0x0cd0, 0x2118,
++	0x84ff, 0x0120, 0xa39a, 0x0010, 0x8421, 0x1de0, 0x2021, 0x0001,
++	0x83ff, 0x0118, 0x8423, 0x8319, 0x1de8, 0xa238, 0x2704, 0xa42c,
++	0x11b8, 0xa405, 0x203a, 0x7152, 0xa1a0, 0x2f6e, 0x242d, 0xa5ac,
++	0x00ff, 0x7576, 0x6532, 0x6536, 0x0016, 0x2508, 0x080c, 0x29f1,
++	0x001e, 0x60e7, 0x0000, 0x65ea, 0x707b, 0x0001, 0xa084, 0x0000,
++	0x0005, 0x00e6, 0x2071, 0xc600, 0x707f, 0x0000, 0x00ee, 0x0005,
++	0x00e6, 0x00f6, 0x2079, 0x0100, 0x2071, 0x0140, 0x080c, 0x8bf5,
++	0x7004, 0xa084, 0x4000, 0x0120, 0x7003, 0x1000, 0x7003, 0x0000,
++	0x0126, 0x2091, 0x8000, 0x2071, 0xc623, 0x2073, 0x0000, 0x7840,
++	0x0026, 0x0016, 0x2009, 0x00f7, 0x080c, 0x4eeb, 0x001e, 0xa094,
++	0x0010, 0xa285, 0x0080, 0x7842, 0x7a42, 0x002e, 0x012e, 0x00fe,
++	0x00ee, 0x0005, 0x0126, 0x2091, 0x8000, 0x2011, 0xc931, 0x2013,
++	0x0000, 0x7087, 0x0000, 0x012e, 0x20e1, 0x9080, 0x60a3, 0x0056,
++	0x60a7, 0x9575, 0x080c, 0x8bec, 0x2009, 0x07d0, 0x2011, 0x4e18,
++	0x080c, 0x7036, 0x0005, 0x0016, 0x0026, 0x00c6, 0x0126, 0x2091,
++	0x8000, 0x2011, 0x0003, 0x080c, 0x8f0e, 0x2011, 0x0002, 0x080c,
++	0x8f18, 0x080c, 0x8dee, 0x0036, 0x2019, 0x0000, 0x080c, 0x8e79,
++	0x003e, 0x2009, 0x00f7, 0x080c, 0x4eeb, 0x2061, 0xc93a, 0x601b,
++	0x0000, 0x601f, 0x0000, 0x2061, 0xc600, 0x6003, 0x0001, 0x2061,
++	0x0100, 0x6043, 0x0090, 0x6043, 0x0010, 0x2009, 0x002d, 0x2011,
++	0x4e90, 0x080c, 0x6fa1, 0x012e, 0x00ce, 0x002e, 0x001e, 0x0005,
++	0x00e6, 0x0006, 0x0126, 0x2091, 0x8000, 0x2071, 0x0100, 0x080c,
++	0x8bf5, 0x2071, 0x0140, 0x7004, 0xa084, 0x4000, 0x0120, 0x7003,
++	0x1000, 0x7003, 0x0000, 0x080c, 0x5f2a, 0x01a8, 0x080c, 0x5f48,
++	0x1190, 0x2001, 0xc8e5, 0x2003, 0xaaaa, 0x0016, 0x080c, 0x2a95,
++	0x2001, 0xc8d6, 0x2102, 0x001e, 0x2001, 0xc8e6, 0x2003, 0x0000,
++	0x080c, 0x5e5a, 0x0030, 0x2001, 0x0001, 0x080c, 0x296d, 0x080c,
++	0x4e5b, 0x012e, 0x000e, 0x00ee, 0x0005, 0x20a9, 0x0040, 0x20a1,
++	0xcdc0, 0x2099, 0xcc8e, 0x3304, 0x8007, 0x20a2, 0x9398, 0x94a0,
++	0x1f04, 0x4ecb, 0x0005, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x2099,
++	0xcc00, 0x20a1, 0x020b, 0x20a9, 0x000c, 0x53a6, 0x0005, 0x20e1,
++	0x9080, 0x20e1, 0x4000, 0x2099, 0xcc80, 0x20a1, 0x020b, 0x20a9,
++	0x000c, 0x53a6, 0x0005, 0x00c6, 0x0006, 0x2061, 0x0100, 0x810f,
++	0x2001, 0xc631, 0x2004, 0xa005, 0x1138, 0x2001, 0xc615, 0x2004,
++	0xa084, 0x00ff, 0xa105, 0x0010, 0xa185, 0x00f7, 0x604a, 0x000e,
++	0x00ce, 0x0005, 0x0016, 0x0046, 0x2001, 0xc653, 0x2004, 0xd0a4,
++	0x0158, 0xa006, 0x2020, 0x2009, 0x002a, 0x080c, 0xc190, 0x2001,
++	0xc60c, 0x200c, 0xc195, 0x2102, 0x2019, 0x002a, 0x2009, 0x0000,
++	0x080c, 0x2e19, 0x004e, 0x001e, 0x0005, 0x080c, 0x4e5b, 0x708f,
++	0x0000, 0x7087, 0x0000, 0x0005, 0x0006, 0x2001, 0xc60c, 0x2004,
++	0xd09c, 0x0100, 0x000e, 0x0005, 0x0006, 0x0016, 0x0126, 0x2091,
++	0x8000, 0x2001, 0x0101, 0x200c, 0xa18d, 0x0006, 0x2102, 0x012e,
++	0x001e, 0x000e, 0x0005, 0x0156, 0x20a9, 0x00ff, 0x2009, 0xc77b,
++	0xa006, 0x200a, 0x8108, 0x1f04, 0x4f41, 0x015e, 0x0005, 0x00d6,
++	0x0036, 0x0156, 0x0136, 0x0146, 0x2069, 0xc652, 0xa006, 0x6002,
++	0x6007, 0x0707, 0x600a, 0x600e, 0x6012, 0xa198, 0x2f6e, 0x231d,
++	0xa39c, 0x00ff, 0x6316, 0x20a9, 0x0004, 0xac98, 0x0006, 0x23a0,
++	0x40a4, 0x20a9, 0x0004, 0xac98, 0x000a, 0x23a0, 0x40a4, 0x603e,
++	0x6042, 0x604e, 0x6052, 0x6056, 0x605a, 0x605e, 0x6062, 0x6066,
++	0x606a, 0x606e, 0x6072, 0x6076, 0x607a, 0x607e, 0x6082, 0x6086,
++	0x608a, 0x608e, 0x6092, 0x6096, 0x609a, 0x609e, 0x60be, 0x61a2,
++	0x00d6, 0x60a4, 0xa06d, 0x0110, 0x080c, 0x1619, 0x60a7, 0x0000,
++	0x60a8, 0xa06d, 0x0110, 0x080c, 0x1619, 0x60ab, 0x0000, 0x00de,
++	0xa006, 0x604a, 0x6810, 0x603a, 0x680c, 0x6046, 0xa006, 0x60b2,
++	0x60ae, 0x60b6, 0x60bb, 0x0520, 0x6814, 0xa084, 0x00ff, 0x6042,
++	0x014e, 0x013e, 0x015e, 0x003e, 0x00de, 0x0005, 0x0126, 0x2091,
++	0x8000, 0x6944, 0x6e48, 0xa684, 0x3fff, 0xa082, 0x4000, 0x1a04,
++	0x505c, 0xa18c, 0xff00, 0x810f, 0xa182, 0x00ff, 0x1a04, 0x5061,
++	0x2001, 0xc60c, 0x2004, 0xa084, 0x0003, 0x01c0, 0x2001, 0xc60c,
++	0x2004, 0xd084, 0x1904, 0x5044, 0xa188, 0xc77b, 0x2104, 0xa065,
++	0x0904, 0x5044, 0x6004, 0xa084, 0x00ff, 0xa08e, 0x0006, 0x1904,
++	0x5044, 0x6000, 0xd0c4, 0x0904, 0x5044, 0x0068, 0xa188, 0xc77b,
++	0x2104, 0xa065, 0x0904, 0x5028, 0x6004, 0xa084, 0x00ff, 0xa08e,
++	0x0006, 0x1904, 0x502d, 0x60a4, 0xa00d, 0x0118, 0x080c, 0x5568,
++	0x05d0, 0x60a8, 0xa00d, 0x0188, 0x080c, 0x55b3, 0x1170, 0x694c,
++	0xd1fc, 0x1118, 0x080c, 0x5272, 0x0448, 0x080c, 0x5221, 0x694c,
++	0xd1ec, 0x1520, 0x080c, 0x545a, 0x0408, 0x694c, 0xa184, 0xa000,
++	0x0178, 0xd1ec, 0x0140, 0xd1fc, 0x0118, 0x080c, 0x5469, 0x0028,
++	0x080c, 0x5469, 0x0028, 0xd1fc, 0x0118, 0x080c, 0x5221, 0x0070,
++	0x6050, 0xa00d, 0x0130, 0x2d00, 0x200a, 0x6803, 0x0000, 0x6052,
++	0x0028, 0x2d00, 0x6052, 0x604e, 0x6803, 0x0000, 0x080c, 0x79b6,
++	0xa006, 0x012e, 0x0005, 0x2001, 0x0005, 0x2009, 0x0000, 0x04e8,
++	0x2001, 0x0028, 0x2009, 0x0000, 0x04c0, 0xa082, 0x0006, 0x12a0,
++	0x2001, 0xc635, 0x2004, 0xd0ac, 0x1160, 0x60a0, 0xd0bc, 0x1148,
++	0x6100, 0xd1fc, 0x0904, 0x4fe3, 0x2001, 0x0029, 0x2009, 0x1000,
++	0x0420, 0x2001, 0x0028, 0x00a8, 0x2009, 0xc60c, 0x210c, 0xd18c,
++	0x0118, 0x2001, 0x0004, 0x0068, 0xd184, 0x0118, 0x2001, 0x0004,
++	0x0040, 0x2001, 0x0029, 0x6100, 0xd1fc, 0x0118, 0x2009, 0x1000,
++	0x0060, 0x2009, 0x0000, 0x0048, 0x2001, 0x0029, 0x2009, 0x0000,
++	0x0020, 0x2001, 0x0029, 0x2009, 0x0000, 0xa005, 0x012e, 0x0005,
++	0x00e6, 0x0126, 0x2091, 0x8000, 0x6844, 0xa084, 0xff00, 0xa08e,
++	0xff00, 0x1120, 0x2001, 0xc8d3, 0x2064, 0x0080, 0x6844, 0x8007,
++	0xa084, 0x00ff, 0x2008, 0xa182, 0x00ff, 0x1698, 0xa188, 0xc77b,
++	0x2104, 0xa065, 0x01d8, 0x080c, 0x56ed, 0x11d8, 0x2c70, 0x080c,
++	0x958d, 0x0568, 0x2e00, 0x601a, 0x2d00, 0x6012, 0x601f, 0x0009,
++	0x600b, 0x0000, 0x6844, 0xa08e, 0xff00, 0x1110, 0x600b, 0x8000,
++	0x2009, 0x0100, 0x080c, 0x9613, 0xa006, 0x00b0, 0x2001, 0x0028,
++	0x0090, 0x2009, 0xc60c, 0x210c, 0xd18c, 0x0118, 0x2001, 0x0004,
++	0x0038, 0xd184, 0x0118, 0x2001, 0x0004, 0x0010, 0x2001, 0x0029,
++	0x0010, 0x2001, 0x0029, 0xa005, 0x012e, 0x00ee, 0x0005, 0x2001,
++	0x002c, 0x0cc8, 0x00e6, 0x0126, 0x2091, 0x8000, 0x6844, 0x8007,
++	0xa084, 0x00ff, 0x2008, 0xa182, 0x00ff, 0x1a04, 0x510d, 0xa188,
++	0xc77b, 0x2104, 0xa065, 0x01c0, 0x6004, 0xa084, 0x00ff, 0xa08e,
++	0x0006, 0x11a8, 0x2c70, 0x080c, 0x958d, 0x05e8, 0x2e00, 0x601a,
++	0x2d00, 0x6012, 0x600b, 0xffff, 0x601f, 0x000a, 0x2009, 0x0003,
++	0x080c, 0x9613, 0xa006, 0x0460, 0x2001, 0x0028, 0x0440, 0xa082,
++	0x0006, 0x1298, 0x2001, 0xc635, 0x2004, 0xd0ac, 0x1158, 0x60a0,
++	0xd0bc, 0x1140, 0x6100, 0xd1fc, 0x09e8, 0x2001, 0x0029, 0x2009,
++	0x1000, 0x00a8, 0x2001, 0x0028, 0x0090, 0x2009, 0xc60c, 0x210c,
++	0xd18c, 0x0118, 0x2001, 0x0004, 0x0050, 0xd184, 0x0118, 0x2001,
++	0x0004, 0x0028, 0x2001, 0x0029, 0x0010, 0x2001, 0x0029, 0xa005,
++	0x012e, 0x00ee, 0x0005, 0x2001, 0x002c, 0x0cc8, 0x00f6, 0x00e6,
++	0x0126, 0x2091, 0x8000, 0x2011, 0x0000, 0x2079, 0xc600, 0x6944,
++	0xa18c, 0xff00, 0x810f, 0xa182, 0x00ff, 0x1a04, 0x51d8, 0x080c,
++	0x533d, 0x11a0, 0x6004, 0xa084, 0x00ff, 0xa082, 0x0006, 0x1270,
++	0x6864, 0xa0c6, 0x006f, 0x0150, 0x2001, 0xc635, 0x2004, 0xd0ac,
++	0x1904, 0x51c1, 0x60a0, 0xd0bc, 0x1904, 0x51c1, 0x6864, 0xa0c6,
++	0x006f, 0x0118, 0x2008, 0x0804, 0x518a, 0x6968, 0x2140, 0xa18c,
++	0xff00, 0x810f, 0x78d4, 0xd0ac, 0x1118, 0xa182, 0x0080, 0x06d0,
++	0xa182, 0x00ff, 0x16b8, 0x6a70, 0x6b6c, 0x7870, 0xa306, 0x1160,
++	0x7874, 0xa24e, 0x1118, 0x2208, 0x2310, 0x0460, 0xa9cc, 0xff00,
++	0x1118, 0x2208, 0x2310, 0x0430, 0x080c, 0x3f6e, 0x2c70, 0x0550,
++	0x2009, 0x0000, 0x2011, 0x0000, 0xa0c6, 0x4000, 0x1160, 0x0006,
++	0x2e60, 0x080c, 0x55de, 0x1108, 0xc185, 0x7000, 0xd0bc, 0x0108,
++	0xc18d, 0x000e, 0x0088, 0xa0c6, 0x4007, 0x1110, 0x2408, 0x0060,
++	0xa0c6, 0x4008, 0x1118, 0x2708, 0x2610, 0x0030, 0xa0c6, 0x4009,
++	0x1108, 0x0010, 0x2001, 0x4006, 0x6866, 0x696a, 0x6a6e, 0x2001,
++	0x0030, 0x0450, 0x080c, 0x958d, 0x1138, 0x2001, 0x4005, 0x2009,
++	0x0003, 0x2011, 0x0000, 0x0c80, 0x2e00, 0x601a, 0x080c, 0xb05e,
++	0x2d00, 0x6012, 0x601f, 0x0001, 0x6838, 0xd88c, 0x0108, 0xc0f5,
++	0x683a, 0x0126, 0x2091, 0x8000, 0x080c, 0x2e46, 0x012e, 0x2001,
++	0x0000, 0x080c, 0x527f, 0x2001, 0x0002, 0x080c, 0x5291, 0x2009,
++	0x0002, 0x080c, 0x9613, 0xa006, 0xa005, 0x012e, 0x00ee, 0x00fe,
++	0x0005, 0x2001, 0x0028, 0x2009, 0x0000, 0x0cb0, 0x2009, 0xc60c,
++	0x210c, 0xd18c, 0x0118, 0x2001, 0x0004, 0x0038, 0xd184, 0x0118,
++	0x2001, 0x0004, 0x0010, 0x2001, 0x0029, 0x2009, 0x0000, 0x0c20,
++	0x2001, 0x0029, 0x2009, 0x0000, 0x08f8, 0x6944, 0x6e48, 0xa684,
++	0x3fff, 0xa082, 0x4000, 0x16b8, 0xa18c, 0xff00, 0x810f, 0xa182,
++	0x00ff, 0x12e0, 0xa188, 0xc77b, 0x2104, 0xa065, 0x01b8, 0x6004,
++	0xa084, 0x00ff, 0xa08e, 0x0006, 0x11b0, 0x684c, 0xd0ec, 0x0120,
++	0x080c, 0x5469, 0x0431, 0x0030, 0x0421, 0x684c, 0xd0fc, 0x0110,
++	0x080c, 0x545a, 0x080c, 0x54a7, 0xa006, 0x00c8, 0x2001, 0x0028,
++	0x2009, 0x0000, 0x00a0, 0xa082, 0x0006, 0x1240, 0x6100, 0xd1fc,
++	0x0d20, 0x2001, 0x0029, 0x2009, 0x1000, 0x0048, 0x2001, 0x0029,
++	0x2009, 0x0000, 0x0020, 0x2001, 0x0029, 0x2009, 0x0000, 0xa005,
++	0x0005, 0x0126, 0x2091, 0x8000, 0x6050, 0xa00d, 0x0138, 0x2d00,
++	0x200a, 0x6803, 0x0000, 0x6052, 0x012e, 0x0005, 0x2d00, 0x6052,
++	0x604e, 0x6803, 0x0000, 0x0cc0, 0x0126, 0x2091, 0x8000, 0x604c,
++	0xa005, 0x0170, 0x00e6, 0x2071, 0xc927, 0x7004, 0xa086, 0x0002,
++	0x0168, 0x00ee, 0x604c, 0x6802, 0x2d00, 0x604e, 0x012e, 0x0005,
++	0x2d00, 0x6052, 0x604e, 0x6803, 0x0000, 0x0cc0, 0x701c, 0xac06,
++	0x1d80, 0x604c, 0x2070, 0x7000, 0x6802, 0x2d00, 0x7002, 0x00ee,
++	0x012e, 0x0005, 0x0126, 0x2091, 0x8000, 0x604c, 0xa06d, 0x0130,
++	0x6800, 0xa005, 0x1108, 0x6052, 0x604e, 0xad05, 0x012e, 0x0005,
++	0x604c, 0xa06d, 0x0130, 0x6800, 0xa005, 0x1108, 0x6052, 0x604e,
++	0xad05, 0x0005, 0x6803, 0x0000, 0x6084, 0xa00d, 0x0120, 0x2d00,
++	0x200a, 0x6086, 0x0005, 0x2d00, 0x6086, 0x6082, 0x0cd8, 0x0126,
++	0x00c6, 0x0026, 0x2091, 0x8000, 0x6218, 0x2260, 0x6200, 0xa005,
++	0x0110, 0xc285, 0x0008, 0xc284, 0x6202, 0x002e, 0x00ce, 0x012e,
++	0x0005, 0x0126, 0x00c6, 0x2091, 0x8000, 0x6218, 0x2260, 0x6204,
++	0x0006, 0xa086, 0x0006, 0x1180, 0x609c, 0xd0ac, 0x0168, 0x2001,
++	0xc653, 0x2004, 0xd0a4, 0x0140, 0xa284, 0xff00, 0x8007, 0xa086,
++	0x0007, 0x1110, 0x2011, 0x0600, 0x000e, 0xa294, 0xff00, 0xa215,
++	0x6206, 0x0006, 0xa086, 0x0006, 0x1128, 0x6290, 0x82ff, 0x1110,
++	0x080c, 0x1519, 0x000e, 0x00ce, 0x012e, 0x0005, 0x0126, 0x00c6,
++	0x2091, 0x8000, 0x6218, 0x2260, 0x6204, 0x0006, 0xa086, 0x0006,
++	0x1178, 0x609c, 0xd0a4, 0x0160, 0x2001, 0xc653, 0x2004, 0xd0ac,
++	0x1138, 0xa284, 0x00ff, 0xa086, 0x0007, 0x1110, 0x2011, 0x0006,
++	0x000e, 0xa294, 0x00ff, 0x8007, 0xa215, 0x6206, 0x00ce, 0x012e,
++	0x0005, 0x0026, 0xa182, 0x00ff, 0x0218, 0xa085, 0x0001, 0x00b0,
++	0xa190, 0xc77b, 0x2204, 0xa065, 0x1180, 0x0016, 0x00d6, 0x080c,
++	0x15e5, 0x2d60, 0x00de, 0x001e, 0x0d80, 0x2c00, 0x2012, 0x60a7,
++	0x0000, 0x60ab, 0x0000, 0x080c, 0x4f47, 0xa006, 0x002e, 0x0005,
++	0x0126, 0x2091, 0x8000, 0x0026, 0xa182, 0x00ff, 0x0218, 0xa085,
++	0x0001, 0x0480, 0x00d6, 0xa190, 0xc77b, 0x2204, 0xa06d, 0x0540,
++	0x2013, 0x0000, 0x00d6, 0x00c6, 0x2d60, 0x60a4, 0xa06d, 0x0110,
++	0x080c, 0x1619, 0x60a8, 0xa06d, 0x0110, 0x080c, 0x1619, 0x00ce,
++	0x00de, 0x00d6, 0x00c6, 0x68bc, 0x2060, 0x8cff, 0x0168, 0x600c,
++	0x0006, 0x6010, 0x2068, 0x080c, 0xac91, 0x0110, 0x080c, 0x1629,
++	0x080c, 0x95e3, 0x00ce, 0x0c88, 0x00ce, 0x00de, 0x080c, 0x1619,
++	0x00de, 0xa006, 0x002e, 0x012e, 0x0005, 0x0016, 0xa182, 0x00ff,
++	0x0218, 0xa085, 0x0001, 0x0030, 0xa188, 0xc77b, 0x2104, 0xa065,
++	0x0dc0, 0xa006, 0x001e, 0x0005, 0x00d6, 0x0156, 0x0136, 0x0146,
++	0x600b, 0x0000, 0x600f, 0x0000, 0x6000, 0xc08c, 0x6002, 0x080c,
++	0x5f22, 0x1558, 0x60a0, 0xa086, 0x007e, 0x2069, 0xcc90, 0x0130,
++	0x2001, 0xc635, 0x2004, 0xd0ac, 0x1500, 0x0098, 0x2d04, 0xd0e4,
++	0x01e0, 0x00d6, 0x2069, 0xcc8e, 0x00c6, 0x2061, 0xc8f9, 0x6810,
++	0x2062, 0x6814, 0x6006, 0x6818, 0x600a, 0x681c, 0x600e, 0x00ce,
++	0x00de, 0x8d69, 0x2d04, 0x2069, 0x0140, 0xa005, 0x1110, 0x2001,
++	0x0001, 0x6886, 0x2069, 0xc600, 0x68a6, 0x2069, 0xcc8e, 0x6808,
++	0x605e, 0x6810, 0x6062, 0x6138, 0xa10a, 0x0208, 0x603a, 0x6814,
++	0x6066, 0x2099, 0xcc96, 0xac88, 0x000a, 0x21a0, 0x20a9, 0x0004,
++	0x53a3, 0x2099, 0xcc9a, 0xac88, 0x0006, 0x21a0, 0x20a9, 0x0004,
++	0x53a3, 0x2069, 0xccae, 0x6808, 0x606a, 0x690c, 0x616e, 0x6810,
++	0x6072, 0x6818, 0x6076, 0x60a0, 0xa086, 0x007e, 0x1120, 0x2069,
++	0xcc8e, 0x690c, 0x616e, 0xa182, 0x0211, 0x1218, 0x2009, 0x0008,
++	0x0400, 0xa182, 0x0259, 0x1218, 0x2009, 0x0007, 0x00d0, 0xa182,
++	0x02c1, 0x1218, 0x2009, 0x0006, 0x00a0, 0xa182, 0x0349, 0x1218,
++	0x2009, 0x0005, 0x0070, 0xa182, 0x0421, 0x1218, 0x2009, 0x0004,
++	0x0040, 0xa182, 0x0581, 0x1218, 0x2009, 0x0003, 0x0010, 0x2009,
++	0x0002, 0x6192, 0x014e, 0x013e, 0x015e, 0x00de, 0x0005, 0x0016,
++	0x0026, 0x00e6, 0x2071, 0xcc8d, 0x2e04, 0x6896, 0x2071, 0xcc8e,
++	0x7004, 0x689a, 0x701c, 0x689e, 0x6a00, 0x2009, 0xc672, 0x210c,
++	0xd0bc, 0x0120, 0xd1ec, 0x0110, 0xc2ad, 0x0008, 0xc2ac, 0xd0c4,
++	0x0120, 0xd1e4, 0x0110, 0xc2bd, 0x0008, 0xc2bc, 0x6a02, 0x00ee,
++	0x002e, 0x001e, 0x0005, 0x00d6, 0x0126, 0x2091, 0x8000, 0x60a4,
++	0xa06d, 0x01c0, 0x6900, 0x81ff, 0x1540, 0x6a04, 0xa282, 0x0010,
++	0x1648, 0xad88, 0x0004, 0x20a9, 0x0010, 0x2104, 0xa086, 0xffff,
++	0x0128, 0x8108, 0x1f04, 0x5415, 0x080c, 0x1519, 0x260a, 0x8210,
++	0x6a06, 0x0098, 0x080c, 0x1602, 0x01a8, 0x2d00, 0x60a6, 0x6803,
++	0x0000, 0xad88, 0x0004, 0x20a9, 0x0010, 0x200b, 0xffff, 0x8108,
++	0x1f04, 0x542d, 0x6807, 0x0001, 0x6e12, 0xa085, 0x0001, 0x012e,
++	0x00de, 0x0005, 0xa006, 0x0cd8, 0x0126, 0x2091, 0x8000, 0x00d6,
++	0x60a4, 0xa00d, 0x01a0, 0x2168, 0x6800, 0xa005, 0x1160, 0x080c,
++	0x5568, 0x1168, 0x200b, 0xffff, 0x6804, 0xa08a, 0x0002, 0x0218,
++	0x8001, 0x6806, 0x0020, 0x080c, 0x1619, 0x60a7, 0x0000, 0x00de,
++	0x012e, 0x0005, 0x0126, 0x2091, 0x8000, 0x080c, 0x55c6, 0x0010,
++	0x080c, 0x5221, 0x080c, 0x54e0, 0x1dd8, 0x080c, 0x54a7, 0x012e,
++	0x0005, 0x00d6, 0x0126, 0x2091, 0x8000, 0x60a8, 0xa06d, 0x01c0,
++	0x6950, 0x81ff, 0x1540, 0x6a54, 0xa282, 0x0010, 0x1670, 0xad88,
++	0x0018, 0x20a9, 0x0010, 0x2104, 0xa086, 0xffff, 0x0128, 0x8108,
++	0x1f04, 0x547b, 0x080c, 0x1519, 0x260a, 0x8210, 0x6a56, 0x0098,
++	0x080c, 0x1602, 0x01d0, 0x2d00, 0x60aa, 0x6853, 0x0000, 0xad88,
++	0x0018, 0x20a9, 0x0010, 0x200b, 0xffff, 0x8108, 0x1f04, 0x5493,
++	0x6857, 0x0001, 0x6e62, 0x0010, 0x080c, 0x5272, 0x0089, 0x1de0,
++	0xa085, 0x0001, 0x012e, 0x00de, 0x0005, 0xa006, 0x0cd8, 0x0126,
++	0x2091, 0x8000, 0x080c, 0x79b6, 0x012e, 0x0005, 0xa01e, 0x0010,
++	0x2019, 0x0001, 0xa00e, 0x0126, 0x2091, 0x8000, 0x604c, 0x2068,
++	0x6000, 0xd0dc, 0x1170, 0x8dff, 0x01f8, 0x83ff, 0x0120, 0x6848,
++	0xa606, 0x0158, 0x0030, 0x683c, 0xa406, 0x1118, 0x6840, 0xa506,
++	0x0120, 0x2d08, 0x6800, 0x2068, 0x0c70, 0x080c, 0x8fb7, 0x6a00,
++	0x604c, 0xad06, 0x1110, 0x624e, 0x0018, 0xa180, 0x0000, 0x2202,
++	0x82ff, 0x1110, 0x6152, 0x8dff, 0x012e, 0x0005, 0xa01e, 0x0010,
++	0x2019, 0x0001, 0xa00e, 0x6080, 0x2068, 0x8dff, 0x01e8, 0x83ff,
++	0x0120, 0x6848, 0xa606, 0x0158, 0x0030, 0x683c, 0xa406, 0x1118,
++	0x6840, 0xa506, 0x0120, 0x2d08, 0x6800, 0x2068, 0x0c70, 0x6a00,
++	0x6080, 0xad06, 0x1110, 0x6282, 0x0018, 0xa180, 0x0000, 0x2202,
++	0x82ff, 0x1110, 0x6186, 0x8dff, 0x0005, 0xa016, 0x080c, 0x5562,
++	0x1110, 0x2011, 0x0001, 0x080c, 0x55ad, 0x1110, 0xa295, 0x0002,
++	0x0005, 0x080c, 0x55de, 0x0118, 0x080c, 0xad46, 0x0010, 0xa085,
++	0x0001, 0x0005, 0x080c, 0x55de, 0x0118, 0x080c, 0xacd6, 0x0010,
++	0xa085, 0x0001, 0x0005, 0x080c, 0x55de, 0x0118, 0x080c, 0xad29,
++	0x0010, 0xa085, 0x0001, 0x0005, 0x080c, 0x55de, 0x0118, 0x080c,
++	0xacf2, 0x0010, 0xa085, 0x0001, 0x0005, 0x080c, 0x55de, 0x0118,
++	0x080c, 0xad62, 0x0010, 0xa085, 0x0001, 0x0005, 0x0126, 0x0006,
++	0x00d6, 0x2091, 0x8000, 0x6080, 0xa06d, 0x01a0, 0x6800, 0x0006,
++	0x6837, 0x0103, 0x6b4a, 0x6847, 0x0000, 0x080c, 0xaf03, 0x0006,
++	0x6000, 0xd0fc, 0x0110, 0x080c, 0xc4e0, 0x000e, 0x080c, 0x580a,
++	0x000e, 0x0c50, 0x6083, 0x0000, 0x6087, 0x0000, 0x00de, 0x000e,
++	0x012e, 0x0005, 0x60a4, 0xa00d, 0x1118, 0xa085, 0x0001, 0x0005,
++	0x00e6, 0x2170, 0x7000, 0xa005, 0x1168, 0x20a9, 0x0010, 0xae88,
++	0x0004, 0x2104, 0xa606, 0x0130, 0x8108, 0x1f04, 0x5571, 0xa085,
++	0x0001, 0x0008, 0xa006, 0x00ee, 0x0005, 0x00d6, 0x0126, 0x2091,
++	0x8000, 0x60a4, 0xa06d, 0x1128, 0x080c, 0x1602, 0x01a0, 0x2d00,
++	0x60a6, 0x6803, 0x0001, 0x6807, 0x0000, 0xad88, 0x0004, 0x20a9,
++	0x0010, 0x200b, 0xffff, 0x8108, 0x1f04, 0x5591, 0xa085, 0x0001,
++	0x012e, 0x00de, 0x0005, 0xa006, 0x0cd8, 0x00d6, 0x0126, 0x2091,
++	0x8000, 0x60a4, 0xa06d, 0x0130, 0x60a7, 0x0000, 0x080c, 0x1619,
++	0xa085, 0x0001, 0x012e, 0x00de, 0x0005, 0x60a8, 0xa00d, 0x1118,
++	0xa085, 0x0001, 0x0005, 0x00e6, 0x2170, 0x7050, 0xa005, 0x1160,
++	0x20a9, 0x0010, 0xae88, 0x0018, 0x2104, 0xa606, 0x0128, 0x8108,
++	0x1f04, 0x55bc, 0xa085, 0x0001, 0x00ee, 0x0005, 0x0126, 0x2091,
++	0x8000, 0x0c19, 0x1188, 0x200b, 0xffff, 0x00d6, 0x60a8, 0x2068,
++	0x6854, 0xa08a, 0x0002, 0x0218, 0x8001, 0x6856, 0x0020, 0x080c,
++	0x1619, 0x60ab, 0x0000, 0x00de, 0x012e, 0x0005, 0x609c, 0xd0a4,
++	0x0005, 0x00f6, 0x080c, 0x5f22, 0x01b0, 0x71b8, 0x81ff, 0x1198,
++	0x71d4, 0xd19c, 0x0180, 0x2001, 0x007e, 0xa080, 0xc77b, 0x2004,
++	0xa07d, 0x0148, 0x7804, 0xa084, 0x00ff, 0xa086, 0x0006, 0x1118,
++	0x7800, 0xc0ed, 0x7802, 0x2079, 0xc652, 0x7804, 0xd0a4, 0x01e8,
++	0x0156, 0x00c6, 0x20a9, 0x007f, 0x2009, 0x0000, 0x0016, 0x080c,
++	0x533d, 0x1168, 0x6004, 0xa084, 0xff00, 0x8007, 0xa096, 0x0004,
++	0x0118, 0xa086, 0x0006, 0x1118, 0x6000, 0xc0ed, 0x6002, 0x001e,
++	0x8108, 0x1f04, 0x5606, 0x00ce, 0x015e, 0x080c, 0x570b, 0x0120,
++	0x2001, 0xc8fc, 0x200c, 0x0038, 0x2079, 0xc652, 0x7804, 0xd0a4,
++	0x0130, 0x2009, 0x07d0, 0x2011, 0x5631, 0x080c, 0x7036, 0x00fe,
++	0x0005, 0x2011, 0x5631, 0x080c, 0x6fad, 0x080c, 0x570b, 0x01f0,
++	0x2001, 0xc7f9, 0x2004, 0xa080, 0x0000, 0x200c, 0xc1ec, 0x2102,
++	0x2001, 0xc653, 0x2004, 0xd0a4, 0x0130, 0x2009, 0x07d0, 0x2011,
++	0x5631, 0x080c, 0x7036, 0x00e6, 0x2071, 0xc600, 0x7073, 0x0000,
++	0x7077, 0x0000, 0x080c, 0x2c62, 0x00ee, 0x04b0, 0x0156, 0x00c6,
++	0x20a9, 0x007f, 0x2009, 0x0000, 0x0016, 0x080c, 0x533d, 0x1530,
++	0x6000, 0xd0ec, 0x0518, 0x0046, 0x62a0, 0xa294, 0x00ff, 0x8227,
++	0xa006, 0x2009, 0x0029, 0x080c, 0xc190, 0x6000, 0xc0e5, 0xc0ec,
++	0x6002, 0x6004, 0xa084, 0x00ff, 0xa085, 0x0700, 0x6006, 0x2019,
++	0x0029, 0x080c, 0x7b16, 0x0076, 0x2039, 0x0000, 0x080c, 0x7a0e,
++	0x2009, 0x0000, 0x080c, 0xbef7, 0x007e, 0x004e, 0x001e, 0x8108,
++	0x1f04, 0x565c, 0x00ce, 0x015e, 0x0005, 0x00c6, 0x6018, 0x2060,
++	0x6000, 0xc0ec, 0x6002, 0x00ce, 0x0005, 0x00c6, 0x00d6, 0x080c,
++	0x15e5, 0x2d60, 0x0508, 0x2009, 0x00ff, 0x60a7, 0x0000, 0x60ab,
++	0x0000, 0x080c, 0x4f47, 0x6007, 0x0006, 0x6013, 0x00ff, 0x6017,
++	0xffff, 0x606f, 0x0200, 0x606c, 0x6093, 0x0002, 0x60bb, 0x0520,
++	0x60a3, 0x00ff, 0x60b7, 0x0000, 0x60af, 0x0000, 0x2c08, 0x2001,
++	0xc8d3, 0x2102, 0xa085, 0x0001, 0x00de, 0x00ce, 0x0005, 0x7818,
++	0x2004, 0xd0ac, 0x0005, 0x7818, 0x2004, 0xd0bc, 0x0005, 0x0156,
++	0x00e6, 0x00d6, 0x00c6, 0x0026, 0x20a9, 0x00ff, 0x2009, 0x0000,
++	0x0016, 0x080c, 0x533d, 0x1178, 0x2c70, 0x70ac, 0xa005, 0x0158,
++	0x2060, 0x620c, 0x0026, 0x6010, 0x2068, 0x080c, 0x761a, 0x002e,
++	0x2260, 0x82ff, 0x1db0, 0x001e, 0x8108, 0x1f04, 0x56d0, 0x002e,
++	0x00ce, 0x00de, 0x00ee, 0x015e, 0x0005, 0x0006, 0x0016, 0x0026,
++	0x6004, 0xa08c, 0x00ff, 0xa196, 0x0006, 0x0188, 0xa196, 0x0004,
++	0x0170, 0xa196, 0x0005, 0x0158, 0xa08c, 0xff00, 0x810f, 0xa196,
++	0x0006, 0x0128, 0xa196, 0x0004, 0x0110, 0xa196, 0x0005, 0x002e,
++	0x001e, 0x000e, 0x0005, 0x00f6, 0x2001, 0xc7f9, 0x2004, 0xa07d,
++	0x0110, 0x7800, 0xd0ec, 0x00fe, 0x0005, 0x0126, 0x0026, 0x2091,
++	0x8000, 0x0006, 0x62a0, 0xa290, 0xc77b, 0x2204, 0xac06, 0x190c,
++	0x1519, 0x000e, 0x6200, 0xa005, 0x0110, 0xc2fd, 0x0008, 0xc2fc,
++	0x6202, 0x002e, 0x012e, 0x0005, 0x2011, 0xc635, 0x2204, 0xd0cc,
++	0x0138, 0x2001, 0xc8fa, 0x200c, 0x2011, 0x5739, 0x080c, 0x7036,
++	0x0005, 0x2011, 0x5739, 0x080c, 0x6fad, 0x2011, 0xc635, 0x2204,
++	0xc0cc, 0x2012, 0x0005, 0x2071, 0xc734, 0x7003, 0x0001, 0x7007,
++	0x0000, 0x7013, 0x0000, 0x7017, 0x0000, 0x701b, 0x0000, 0x701f,
++	0x0000, 0x700b, 0x0000, 0x704b, 0x0001, 0x704f, 0x0000, 0x705b,
++	0x0020, 0x705f, 0x0040, 0x707f, 0x0000, 0x2071, 0xc8c3, 0x7003,
++	0xc734, 0x7007, 0x0000, 0x700b, 0x0000, 0x700f, 0xc8a3, 0x7013,
++	0x0020, 0x7017, 0x0040, 0x7037, 0x0000, 0x0005, 0x0016, 0x00e6,
++	0x2071, 0xc87b, 0xa00e, 0x7186, 0x718a, 0x7097, 0x0001, 0x2001,
++	0xc653, 0x2004, 0xd0fc, 0x1150, 0x2001, 0xc653, 0x2004, 0xa00e,
++	0xd09c, 0x0108, 0x8108, 0x7102, 0x0804, 0x57d4, 0x2001, 0xc672,
++	0x200c, 0xa184, 0x000f, 0x2009, 0xc673, 0x210c, 0x0002, 0x577c,
++	0x57af, 0x57b6, 0x57c0, 0x57c5, 0x577c, 0x577c, 0x577c, 0x579f,
++	0x577c, 0x577c, 0x577c, 0x577c, 0x577c, 0x577c, 0x577c, 0x7003,
++	0x0004, 0x0136, 0x0146, 0x0156, 0x2099, 0xc676, 0x20a1, 0xc8cc,
++	0x20a9, 0x0004, 0x53a3, 0x015e, 0x014e, 0x013e, 0x0428, 0x708f,
++	0x0005, 0x7007, 0x0122, 0x2001, 0x0002, 0x0030, 0x708f, 0x0002,
++	0x7007, 0x0121, 0x2001, 0x0003, 0x7002, 0x7097, 0x0001, 0x0088,
++	0x7007, 0x0122, 0x2001, 0x0002, 0x0020, 0x7007, 0x0121, 0x2001,
++	0x0003, 0x7002, 0xa006, 0x7096, 0x708e, 0xa184, 0xff00, 0x8007,
++	0x709a, 0xa184, 0x00ff, 0x7092, 0x00ee, 0x001e, 0x0005, 0x00e6,
++	0x2071, 0xc734, 0x684c, 0xa005, 0x1130, 0x7028, 0xc085, 0x702a,
++	0xa085, 0x0001, 0x0428, 0x6a60, 0x7236, 0x6b64, 0x733a, 0x6868,
++	0x703e, 0x7076, 0x686c, 0x7042, 0x707a, 0x684c, 0x702e, 0x6844,
++	0x7032, 0x2009, 0x000d, 0x200a, 0x700b, 0x0000, 0x8007, 0x8006,
++	0x8006, 0xa08c, 0x003f, 0xa084, 0xffc0, 0xa210, 0x2100, 0xa319,
++	0x726e, 0x7372, 0x7028, 0xc084, 0x702a, 0x7007, 0x0001, 0xa006,
++	0x00ee, 0x0005, 0x0156, 0x00e6, 0x0026, 0x6838, 0xd0fc, 0x1904,
++	0x5863, 0x6804, 0xa00d, 0x0188, 0x00d6, 0x2071, 0xc600, 0xa016,
++	0x702c, 0x2168, 0x6904, 0x206a, 0x8210, 0x2d00, 0x81ff, 0x1dc8,
++	0x702e, 0x70b4, 0xa200, 0x70b6, 0x00de, 0x2071, 0xc734, 0x701c,
++	0xa005, 0x1904, 0x5873, 0x20a9, 0x0032, 0x0f04, 0x5871, 0x0e04,
++	0x582d, 0x2071, 0xc87b, 0x7200, 0x82ff, 0x05d8, 0x6934, 0xa186,
++	0x0103, 0x1904, 0x5881, 0x6948, 0x6844, 0xa105, 0x1540, 0x2009,
++	0x8020, 0x2200, 0x0002, 0x5871, 0x5848, 0x58e8, 0x58f5, 0x5871,
++	0x2071, 0x0000, 0x20a9, 0x0032, 0x0f04, 0x5871, 0x7018, 0xd084,
++	0x1dd8, 0x7122, 0x683c, 0x7026, 0x6840, 0x702a, 0x701b, 0x0001,
++	0x2091, 0x4080, 0x2071, 0xc600, 0x702c, 0x206a, 0x2d00, 0x702e,
++	0x70b4, 0x8000, 0x70b6, 0x002e, 0x00ee, 0x015e, 0x0005, 0x6844,
++	0xa086, 0x0100, 0x1130, 0x6868, 0xa005, 0x1118, 0x2009, 0x8020,
++	0x0880, 0x2071, 0xc734, 0x2d08, 0x206b, 0x0000, 0x7010, 0x8000,
++	0x7012, 0x7018, 0xa06d, 0x711a, 0x0110, 0x6902, 0x0008, 0x711e,
++	0x0c10, 0xa18c, 0x00ff, 0xa186, 0x0013, 0x01e0, 0xa186, 0x001b,
++	0x01c8, 0xa186, 0x0023, 0x01e8, 0xa186, 0x0017, 0x0130, 0xa186,
++	0x001e, 0x0118, 0xa18e, 0x001f, 0x19e0, 0x684c, 0xd0cc, 0x09c8,
++	0x6850, 0xa084, 0x00ff, 0xa086, 0x0001, 0x1998, 0x2009, 0x8021,
++	0x0804, 0x5841, 0x6848, 0xa005, 0x1960, 0x2009, 0x8022, 0x0804,
++	0x5841, 0x2071, 0x0000, 0x7018, 0xd084, 0x1918, 0x00e6, 0x2071,
++	0xc682, 0x7140, 0x00ee, 0x6838, 0xa102, 0x0a04, 0x5871, 0x684c,
++	0xa005, 0x1158, 0x00e6, 0x2071, 0xc682, 0x7004, 0x00ee, 0xd08c,
++	0x1904, 0x5871, 0x2001, 0x8024, 0x0040, 0x6848, 0xd084, 0x1118,
++	0x2001, 0x8023, 0x0010, 0x2001, 0x8027, 0x7022, 0x6840, 0x7026,
++	0x683c, 0x702a, 0x6850, 0x702e, 0x0026, 0x0036, 0x6b38, 0x2e10,
++	0xa290, 0x0072, 0x2d00, 0xa080, 0x0015, 0x200c, 0x2112, 0x8000,
++	0x200c, 0x8210, 0x8319, 0x1dd0, 0x003e, 0x002e, 0x0804, 0x5856,
++	0x7084, 0x8008, 0xa092, 0x001e, 0x1a04, 0x5871, 0x7186, 0xae90,
++	0x0003, 0xa210, 0x683c, 0x2012, 0x0080, 0x7084, 0x8008, 0xa092,
++	0x000f, 0x1a04, 0x5871, 0x7186, 0xae90, 0x0003, 0x8003, 0xa210,
++	0x683c, 0x2012, 0x8210, 0x6840, 0x2012, 0x7088, 0xa10a, 0x0a04,
++	0x585a, 0x718c, 0x7084, 0xa10a, 0x0a04, 0x585a, 0x2071, 0x0000,
++	0x7018, 0xd084, 0x1904, 0x585a, 0x2071, 0xc87b, 0x7000, 0xa086,
++	0x0002, 0x1150, 0x080c, 0x5b75, 0x2071, 0x0000, 0x701b, 0x0001,
++	0x2091, 0x4080, 0x0804, 0x585a, 0x080c, 0x5b9f, 0x2071, 0x0000,
++	0x701b, 0x0001, 0x2091, 0x4080, 0x0804, 0x585a, 0x0006, 0x684c,
++	0x0006, 0x6837, 0x0103, 0x20a9, 0x001c, 0xad80, 0x0011, 0x20a0,
++	0x2001, 0x0000, 0x40a4, 0x000e, 0xa084, 0x00ff, 0x684e, 0x000e,
++	0x684a, 0x6952, 0x0005, 0x2071, 0xc734, 0x7004, 0x0002, 0x5951,
++	0x5962, 0x5b60, 0x5b61, 0x5b6e, 0x5b74, 0x5952, 0x5b51, 0x5ae7,
++	0x5b3d, 0x0005, 0x0126, 0x2091, 0x8000, 0x0e04, 0x5961, 0x2009,
++	0x000d, 0x7030, 0x200a, 0x2091, 0x4080, 0x7007, 0x0001, 0x700b,
++	0x0000, 0x012e, 0x2069, 0xc93a, 0x683c, 0xa005, 0x03f8, 0x11f0,
++	0x0126, 0x2091, 0x8000, 0x2069, 0x0000, 0x6934, 0x2001, 0xc740,
++	0x2004, 0xa10a, 0x0170, 0x0e04, 0x5985, 0x2069, 0x0000, 0x6818,
++	0xd084, 0x1158, 0x2009, 0x8040, 0x6922, 0x681b, 0x0001, 0x2091,
++	0x4080, 0x2069, 0xc93a, 0x683f, 0xffff, 0x012e, 0x2069, 0xc600,
++	0x6848, 0x6968, 0xa102, 0x2069, 0xc87b, 0x688a, 0x6984, 0x701c,
++	0xa06d, 0x0120, 0x81ff, 0x0904, 0x59db, 0x00a0, 0x81ff, 0x0904,
++	0x5aa1, 0x2071, 0xc87b, 0x7184, 0x7088, 0xa10a, 0x1258, 0x7190,
++	0x2071, 0xc93a, 0x7038, 0xa005, 0x0128, 0x1b04, 0x5aa1, 0x713a,
++	0x0804, 0x5aa1, 0x2071, 0xc87b, 0x718c, 0x0126, 0x2091, 0x8000,
++	0x7084, 0xa10a, 0x0a04, 0x5abc, 0x0e04, 0x5a5d, 0x2071, 0x0000,
++	0x7018, 0xd084, 0x1904, 0x5a5d, 0x2001, 0xffff, 0x2071, 0xc93a,
++	0x703a, 0x2071, 0xc87b, 0x7000, 0xa086, 0x0002, 0x1150, 0x080c,
++	0x5b75, 0x2071, 0x0000, 0x701b, 0x0001, 0x2091, 0x4080, 0x0804,
++	0x5a5d, 0x080c, 0x5b9f, 0x2071, 0x0000, 0x701b, 0x0001, 0x2091,
++	0x4080, 0x0804, 0x5a5d, 0x2071, 0xc87b, 0x7000, 0xa005, 0x0904,
++	0x5a83, 0x6934, 0xa186, 0x0103, 0x1904, 0x5a60, 0x684c, 0xd0bc,
++	0x1904, 0x5a83, 0x6948, 0x6844, 0xa105, 0x1904, 0x5a78, 0x2009,
++	0x8020, 0x2071, 0xc87b, 0x7000, 0x0002, 0x5a83, 0x5a43, 0x5a1b,
++	0x5a2d, 0x59fa, 0x0136, 0x0146, 0x0156, 0x2099, 0xc676, 0x20a1,
++	0xc8cc, 0x20a9, 0x0004, 0x53a3, 0x015e, 0x014e, 0x013e, 0x2071,
++	0xc8c3, 0xad80, 0x000f, 0x700e, 0x7013, 0x0002, 0x7007, 0x0002,
++	0x700b, 0x0000, 0x2e10, 0x080c, 0x164d, 0x2071, 0xc734, 0x7007,
++	0x0009, 0x0804, 0x5aa1, 0x7084, 0x8008, 0xa092, 0x001e, 0x1a04,
++	0x5aa1, 0xae90, 0x0003, 0xa210, 0x683c, 0x2012, 0x7186, 0x2071,
++	0xc734, 0x080c, 0x5bf6, 0x0804, 0x5aa1, 0x7084, 0x8008, 0xa092,
++	0x000f, 0x1a04, 0x5aa1, 0xae90, 0x0003, 0x8003, 0xa210, 0x683c,
++	0x2012, 0x8210, 0x6840, 0x2012, 0x7186, 0x2071, 0xc734, 0x080c,
++	0x5bf6, 0x0804, 0x5aa1, 0x0126, 0x2091, 0x8000, 0x0e04, 0x5a5d,
++	0x2071, 0x0000, 0x7018, 0xd084, 0x1180, 0x7122, 0x683c, 0x7026,
++	0x6840, 0x702a, 0x701b, 0x0001, 0x2091, 0x4080, 0x012e, 0x2071,
++	0xc734, 0x080c, 0x5bf6, 0x0804, 0x5aa1, 0x012e, 0x0804, 0x5aa1,
++	0xa18c, 0x00ff, 0xa186, 0x0017, 0x0130, 0xa186, 0x001e, 0x0118,
++	0xa18e, 0x001f, 0x11c0, 0x684c, 0xd0cc, 0x01a8, 0x6850, 0xa084,
++	0x00ff, 0xa086, 0x0001, 0x1178, 0x2009, 0x8021, 0x0804, 0x59f1,
++	0x6844, 0xa086, 0x0100, 0x1138, 0x6868, 0xa005, 0x1120, 0x2009,
++	0x8020, 0x0804, 0x59f1, 0x2071, 0xc734, 0x080c, 0x5c08, 0x01c8,
++	0x2071, 0xc734, 0x700f, 0x0001, 0x6934, 0xa184, 0x00ff, 0xa086,
++	0x0003, 0x1130, 0x810f, 0xa18c, 0x00ff, 0x8101, 0x0108, 0x710e,
++	0x7007, 0x0003, 0x080c, 0x5c21, 0x7050, 0xa086, 0x0100, 0x0904,
++	0x5b61, 0x0126, 0x2091, 0x8000, 0x2071, 0xc734, 0x7008, 0xa086,
++	0x0001, 0x1180, 0x0e04, 0x5aba, 0x2009, 0x000d, 0x7030, 0x200a,
++	0x2091, 0x4080, 0x700b, 0x0000, 0x7004, 0xa086, 0x0006, 0x1110,
++	0x7007, 0x0001, 0x012e, 0x0005, 0x2071, 0xc734, 0x080c, 0x5c08,
++	0x0518, 0x2071, 0xc87b, 0x7084, 0x700a, 0x20a9, 0x0020, 0x2099,
++	0xc87c, 0x20a1, 0xc8a3, 0x53a3, 0x7087, 0x0000, 0x2071, 0xc734,
++	0x2069, 0xc8c3, 0x706c, 0x6826, 0x7070, 0x682a, 0x7074, 0x682e,
++	0x7078, 0x6832, 0x2d10, 0x080c, 0x164d, 0x7007, 0x0008, 0x2001,
++	0xffff, 0x2071, 0xc93a, 0x703a, 0x012e, 0x0804, 0x5aa1, 0x2069,
++	0xc8c3, 0x6808, 0xa08e, 0x0000, 0x0904, 0x5b3c, 0xa08e, 0x0200,
++	0x0904, 0x5b3a, 0xa08e, 0x0100, 0x1904, 0x5b3c, 0x0126, 0x2091,
++	0x8000, 0x0e04, 0x5b38, 0x2069, 0x0000, 0x6818, 0xd084, 0x15c0,
++	0x702c, 0x7130, 0x8108, 0xa102, 0x0230, 0xa00e, 0x7034, 0x706e,
++	0x7038, 0x7072, 0x0048, 0x706c, 0xa080, 0x0040, 0x706e, 0x1220,
++	0x7070, 0xa081, 0x0000, 0x7072, 0x7132, 0x6936, 0x700b, 0x0000,
++	0x2001, 0xc8a0, 0x2004, 0xa005, 0x1190, 0x6934, 0x2069, 0xc87b,
++	0x689c, 0x699e, 0x2069, 0xc93a, 0xa102, 0x1118, 0x683c, 0xa005,
++	0x1368, 0x2001, 0xc8a1, 0x200c, 0x810d, 0x693e, 0x0038, 0x2009,
++	0x8040, 0x6922, 0x681b, 0x0001, 0x2091, 0x4080, 0x7007, 0x0001,
++	0x012e, 0x0010, 0x7007, 0x0005, 0x0005, 0x2001, 0xc8c5, 0x2004,
++	0xa08e, 0x0100, 0x1128, 0x7007, 0x0001, 0x080c, 0x5bf6, 0x0005,
++	0xa08e, 0x0000, 0x0de0, 0xa08e, 0x0200, 0x1dc8, 0x7007, 0x0005,
++	0x0005, 0x701c, 0xa06d, 0x0158, 0x080c, 0x5c08, 0x0140, 0x7007,
++	0x0003, 0x080c, 0x5c21, 0x7050, 0xa086, 0x0100, 0x0110, 0x0005,
++	0x0005, 0x7050, 0xa09e, 0x0100, 0x1118, 0x7007, 0x0004, 0x0030,
++	0xa086, 0x0200, 0x1110, 0x7007, 0x0005, 0x0005, 0x080c, 0x5bc4,
++	0x7006, 0x080c, 0x5bf6, 0x0005, 0x0005, 0x00e6, 0x0156, 0x2071,
++	0xc87b, 0x7184, 0x81ff, 0x0500, 0xa006, 0x7086, 0xae80, 0x0003,
++	0x2071, 0x0000, 0x21a8, 0x2014, 0x7226, 0x8000, 0x0f04, 0x5b99,
++	0x2014, 0x722a, 0x8000, 0x0f04, 0x5b99, 0x2014, 0x722e, 0x8000,
++	0x0f04, 0x5b99, 0x2014, 0x723a, 0x8000, 0x0f04, 0x5b99, 0x2014,
++	0x723e, 0xa180, 0x8030, 0x7022, 0x015e, 0x00ee, 0x0005, 0x00e6,
++	0x0156, 0x2071, 0xc87b, 0x7184, 0x81ff, 0x01d8, 0xa006, 0x7086,
++	0xae80, 0x0003, 0x2071, 0x0000, 0x21a8, 0x2014, 0x7226, 0x8000,
++	0x2014, 0x722a, 0x8000, 0x0f04, 0x5bbb, 0x2014, 0x723a, 0x8000,
++	0x2014, 0x723e, 0x0018, 0x2001, 0x8020, 0x0010, 0x2001, 0x8042,
++	0x7022, 0x015e, 0x00ee, 0x0005, 0x702c, 0x7130, 0x8108, 0xa102,
++	0x0230, 0xa00e, 0x7034, 0x706e, 0x7038, 0x7072, 0x0048, 0x706c,
++	0xa080, 0x0040, 0x706e, 0x1220, 0x7070, 0xa081, 0x0000, 0x7072,
++	0x7132, 0x700c, 0x8001, 0x700e, 0x1180, 0x0126, 0x2091, 0x8000,
++	0x0e04, 0x5bf0, 0x2001, 0x000d, 0x2102, 0x2091, 0x4080, 0x2001,
++	0x0001, 0x700b, 0x0000, 0x012e, 0x0005, 0x2001, 0x0007, 0x0005,
++	0x2001, 0x0006, 0x700b, 0x0001, 0x012e, 0x0005, 0x701c, 0xa06d,
++	0x0170, 0x0126, 0x2091, 0x8000, 0x7010, 0x8001, 0x7012, 0x2d04,
++	0x701e, 0xa005, 0x1108, 0x701a, 0x012e, 0x080c, 0x1619, 0x0005,
++	0x2019, 0x000d, 0x2304, 0x230c, 0xa10e, 0x0130, 0x2304, 0x230c,
++	0xa10e, 0x0110, 0xa006, 0x0060, 0x732c, 0x8319, 0x7130, 0xa102,
++	0x1118, 0x2300, 0xa005, 0x0020, 0x0210, 0xa302, 0x0008, 0x8002,
++	0x0005, 0x2d00, 0x7026, 0xa080, 0x000d, 0x7056, 0x7053, 0x0000,
++	0x0126, 0x2091, 0x8000, 0x2009, 0xc959, 0x2104, 0xc08d, 0x200a,
++	0x012e, 0x080c, 0x1669, 0x0005, 0x708c, 0xa08a, 0x0029, 0x1220,
++	0xa082, 0x001d, 0x0033, 0x0010, 0x080c, 0x1519, 0x6027, 0x1e00,
++	0x0005, 0x5d2f, 0x5caa, 0x5cc2, 0x5cff, 0x5d20, 0x5d5a, 0x5d6c,
++	0x5cc2, 0x5d46, 0x5c4e, 0x5c7c, 0x5c4d, 0x0005, 0x00d6, 0x2069,
++	0x0200, 0x6804, 0xa005, 0x1180, 0x6808, 0xa005, 0x1518, 0x708f,
++	0x0028, 0x2069, 0xc90c, 0x2d04, 0x7002, 0x080c, 0x6024, 0x6028,
++	0xa085, 0x0600, 0x602a, 0x00b0, 0x708f, 0x0028, 0x2069, 0xc90c,
++	0x2d04, 0x7002, 0x6028, 0xa085, 0x0600, 0x602a, 0x00e6, 0x0036,
++	0x0046, 0x0056, 0x2071, 0xc96a, 0x080c, 0x1ec3, 0x005e, 0x004e,
++	0x003e, 0x00ee, 0x00de, 0x0005, 0x00d6, 0x2069, 0x0200, 0x6804,
++	0xa005, 0x1180, 0x6808, 0xa005, 0x1518, 0x708f, 0x0028, 0x2069,
++	0xc90c, 0x2d04, 0x7002, 0x080c, 0x60b1, 0x6028, 0xa085, 0x0600,
++	0x602a, 0x00b0, 0x708f, 0x0028, 0x2069, 0xc90c, 0x2d04, 0x7002,
++	0x6028, 0xa085, 0x0600, 0x602a, 0x00e6, 0x0036, 0x0046, 0x0056,
++	0x2071, 0xc96a, 0x080c, 0x1ec3, 0x005e, 0x004e, 0x003e, 0x00ee,
++	0x00de, 0x0005, 0x6803, 0x0090, 0x6124, 0xd1e4, 0x1190, 0x080c,
++	0x5dd7, 0xd1d4, 0x1160, 0xd1dc, 0x1138, 0xd1cc, 0x0150, 0x708f,
++	0x0020, 0x080c, 0x5dd7, 0x0028, 0x708f, 0x001d, 0x0010, 0x708f,
++	0x001f, 0x0005, 0x6803, 0x0088, 0x6124, 0xd1cc, 0x1590, 0xd1dc,
++	0x1568, 0xd1e4, 0x1540, 0xa184, 0x1e00, 0x1580, 0x60e3, 0x0001,
++	0x600c, 0xc0b4, 0x600e, 0x080c, 0x5f52, 0x080c, 0x25fb, 0x0156,
++	0x6803, 0x0100, 0x20a9, 0x0014, 0x6804, 0xd0dc, 0x1118, 0x1f04,
++	0x5cdc, 0x0048, 0x20a9, 0x0014, 0x6803, 0x0080, 0x6804, 0xd0d4,
++	0x1130, 0x1f04, 0x5ce6, 0x080c, 0x5f73, 0x015e, 0x0078, 0x015e,
++	0x708f, 0x0028, 0x0058, 0x708f, 0x001e, 0x0040, 0x708f, 0x001d,
++	0x0028, 0x708f, 0x0020, 0x0010, 0x708f, 0x001f, 0x0005, 0x60e3,
++	0x0001, 0x600c, 0xc0b4, 0x600e, 0x080c, 0x5f52, 0x080c, 0x25fb,
++	0x6803, 0x0080, 0x6124, 0xd1d4, 0x1180, 0xd1dc, 0x1158, 0xd1e4,
++	0x1130, 0xa184, 0x1e00, 0x1158, 0x708f, 0x0028, 0x0040, 0x708f,
++	0x001e, 0x0028, 0x708f, 0x001d, 0x0010, 0x708f, 0x001f, 0x0005,
++	0x6803, 0x00a0, 0x6124, 0xd1dc, 0x1138, 0xd1e4, 0x0138, 0x080c,
++	0x1f06, 0x708f, 0x001e, 0x0010, 0x708f, 0x001d, 0x0005, 0x080c,
++	0x5e49, 0x6124, 0xd1dc, 0x1188, 0x080c, 0x5dd7, 0x0016, 0x080c,
++	0x1f06, 0x001e, 0xd1d4, 0x1128, 0xd1e4, 0x0138, 0x708f, 0x001e,
++	0x0020, 0x708f, 0x001f, 0x080c, 0x5dd7, 0x0005, 0x6803, 0x00a0,
++	0x6124, 0xd1d4, 0x1160, 0xd1cc, 0x1150, 0xd1dc, 0x1128, 0xd1e4,
++	0x0140, 0x708f, 0x001e, 0x0028, 0x708f, 0x001d, 0x0010, 0x708f,
++	0x0021, 0x0005, 0x080c, 0x5e49, 0x6124, 0xd1d4, 0x1150, 0xd1dc,
++	0x1128, 0xd1e4, 0x0140, 0x708f, 0x001e, 0x0028, 0x708f, 0x001d,
++	0x0010, 0x708f, 0x001f, 0x0005, 0x6803, 0x0090, 0x6124, 0xd1d4,
++	0x1178, 0xd1cc, 0x1150, 0xd1dc, 0x1128, 0xd1e4, 0x0158, 0x708f,
++	0x001e, 0x0040, 0x708f, 0x001d, 0x0028, 0x708f, 0x0020, 0x0010,
++	0x708f, 0x001f, 0x0005, 0x0016, 0x00c6, 0x00d6, 0x00e6, 0x0126,
++	0x2061, 0x0100, 0x2069, 0x0140, 0x2071, 0xc600, 0x2091, 0x8000,
++	0x080c, 0x5f22, 0x11e8, 0x2001, 0xc60c, 0x200c, 0xd1b4, 0x01c0,
++	0xc1b4, 0x2102, 0x6027, 0x0200, 0xe000, 0xe000, 0x6024, 0xd0cc,
++	0x0158, 0x6803, 0x00a0, 0x2001, 0xc8e6, 0x2003, 0x0001, 0x2001,
++	0xc600, 0x2003, 0x0001, 0x0428, 0x6028, 0xc0cd, 0x602a, 0x0408,
++	0x080c, 0x5f3e, 0x0150, 0x080c, 0x5f34, 0x1138, 0x2001, 0x0001,
++	0x080c, 0x296d, 0x080c, 0x5ef9, 0x00a0, 0x080c, 0x5e46, 0x0178,
++	0x2001, 0x0001, 0x080c, 0x296d, 0x708c, 0xa086, 0x001e, 0x0120,
++	0x708c, 0xa086, 0x0022, 0x1118, 0x708f, 0x0025, 0x0010, 0x708f,
++	0x0021, 0x012e, 0x00ee, 0x00de, 0x00ce, 0x001e, 0x0005, 0x0026,
++	0x2011, 0x5de8, 0x080c, 0x7070, 0x002e, 0x0016, 0x0026, 0x2009,
++	0x0064, 0x2011, 0x5de8, 0x080c, 0x7067, 0x002e, 0x001e, 0x0005,
++	0x00e6, 0x00f6, 0x0016, 0x080c, 0x8bf5, 0x2071, 0xc600, 0x080c,
++	0x5d83, 0x001e, 0x00fe, 0x00ee, 0x0005, 0x0016, 0x0026, 0x0036,
++	0x00c6, 0x00d6, 0x00e6, 0x00f6, 0x0126, 0x080c, 0x8bf5, 0x2061,
++	0x0100, 0x2069, 0x0140, 0x2071, 0xc600, 0x2091, 0x8000, 0x6028,
++	0xc09c, 0x602a, 0x2011, 0x0003, 0x080c, 0x8f0e, 0x2011, 0x0002,
++	0x080c, 0x8f18, 0x080c, 0x8dee, 0x080c, 0x7024, 0x0036, 0x2019,
++	0x0000, 0x080c, 0x8e79, 0x003e, 0x60e3, 0x0000, 0x080c, 0xc586,
++	0x080c, 0xc5a1, 0x2001, 0xc600, 0x2003, 0x0004, 0x6027, 0x0008,
++	0x080c, 0x12e1, 0x2001, 0x0001, 0x080c, 0x296d, 0x012e, 0x00fe,
++	0x00ee, 0x00de, 0x00ce, 0x003e, 0x002e, 0x001e, 0x0005, 0x2001,
++	0xc600, 0x2004, 0xa086, 0x0004, 0x0140, 0x2001, 0xc8e5, 0x2003,
++	0xaaaa, 0x2001, 0xc8e6, 0x2003, 0x0000, 0x0005, 0x6020, 0xd09c,
++	0x0005, 0x6800, 0xa086, 0x00c0, 0x0160, 0x6803, 0x00c0, 0x0156,
++	0x20a9, 0x002d, 0x1d04, 0x5e52, 0x2091, 0x6000, 0x1f04, 0x5e52,
++	0x015e, 0x0005, 0x00c6, 0x00d6, 0x00e6, 0x2061, 0x0100, 0x2069,
++	0x0140, 0x2071, 0xc600, 0x2001, 0xc8e6, 0x200c, 0xa186, 0x0000,
++	0x0158, 0xa186, 0x0001, 0x0158, 0xa186, 0x0002, 0x0158, 0xa186,
++	0x0003, 0x0158, 0x0804, 0x5ee7, 0x708f, 0x0022, 0x0040, 0x708f,
++	0x0021, 0x0028, 0x708f, 0x0023, 0x0020, 0x708f, 0x0024, 0x6043,
++	0x0000, 0x60e3, 0x0000, 0x6887, 0x0001, 0x2001, 0x0001, 0x080c,
++	0x2a1c, 0x0026, 0x2011, 0x0003, 0x080c, 0x8f0e, 0x2011, 0x0002,
++	0x080c, 0x8f18, 0x080c, 0x8dee, 0x0036, 0x2019, 0x0000, 0x080c,
++	0x8e79, 0x003e, 0x002e, 0x7000, 0xa08e, 0x0004, 0x0118, 0x602b,
++	0x0028, 0x0010, 0x602b, 0x0020, 0x0156, 0x0126, 0x2091, 0x8000,
++	0x20a9, 0x0005, 0x6024, 0xd0ac, 0x0120, 0x012e, 0x015e, 0x0804,
++	0x5ef5, 0x6800, 0xa084, 0x00a0, 0xc0bd, 0x6802, 0x6904, 0xd1d4,
++	0x1130, 0x6803, 0x0100, 0x1f04, 0x5eaa, 0x080c, 0x5f73, 0x012e,
++	0x015e, 0x080c, 0x5f34, 0x01a8, 0x6044, 0xa005, 0x0168, 0x6050,
++	0x0006, 0xa085, 0x0020, 0x6052, 0x080c, 0x5f73, 0xa006, 0x8001,
++	0x1df0, 0x000e, 0x6052, 0x0028, 0x6804, 0xd0d4, 0x1110, 0x080c,
++	0x5f73, 0x0016, 0x0026, 0x2009, 0x00c8, 0x2011, 0x5df5, 0x080c,
++	0x7036, 0x002e, 0x001e, 0x2001, 0xc8e6, 0x2003, 0x0004, 0x080c,
++	0x5c34, 0x080c, 0x5f34, 0x0148, 0x6804, 0xd0d4, 0x1130, 0xd0dc,
++	0x1100, 0x2001, 0xc8e6, 0x2003, 0x0000, 0x00ee, 0x00de, 0x00ce,
++	0x0005, 0x00c6, 0x00d6, 0x00e6, 0x2061, 0x0100, 0x2069, 0x0140,
++	0x2071, 0xc600, 0x2001, 0xc8e5, 0x2003, 0x0000, 0x2001, 0xc8d6,
++	0x2003, 0x0000, 0x708f, 0x0000, 0x60e3, 0x0000, 0x6887, 0x0000,
++	0x2001, 0x0000, 0x080c, 0x2a1c, 0x6803, 0x0000, 0x6043, 0x0090,
++	0x6043, 0x0010, 0x6027, 0xffff, 0x602b, 0x182f, 0x00ee, 0x00de,
++	0x00ce, 0x0005, 0x0006, 0x2001, 0xc8e5, 0x2004, 0xa086, 0xaaaa,
++	0x000e, 0x0005, 0x0006, 0x2001, 0xc672, 0x2004, 0xa084, 0x0030,
++	0xa086, 0x0000, 0x000e, 0x0005, 0x0006, 0x2001, 0xc672, 0x2004,
++	0xa084, 0x0030, 0xa086, 0x0030, 0x000e, 0x0005, 0x0006, 0x2001,
++	0xc672, 0x2004, 0xa084, 0x0030, 0xa086, 0x0010, 0x000e, 0x0005,
++	0x0006, 0x2001, 0xc672, 0x2004, 0xa084, 0x0030, 0xa086, 0x0020,
++	0x000e, 0x0005, 0x2001, 0xc60c, 0x2004, 0xd0a4, 0x0170, 0x080c,
++	0x2a3c, 0x0036, 0x0016, 0x2009, 0x0000, 0x2019, 0x0028, 0x080c,
++	0x2e19, 0x001e, 0x003e, 0xa006, 0x0009, 0x0005, 0x00e6, 0x2071,
++	0xc60c, 0x2e04, 0x0118, 0xa085, 0x0010, 0x0010, 0xa084, 0xffef,
++	0x2072, 0x00ee, 0x0005, 0x6050, 0x0006, 0x60f0, 0x0006, 0x60ec,
++	0x0006, 0x600c, 0x0006, 0x6004, 0x0006, 0x6028, 0x0006, 0x602f,
++	0x0100, 0x602f, 0x0000, 0x602f, 0x0040, 0x602f, 0x0000, 0x000e,
++	0x602a, 0x000e, 0x6006, 0x000e, 0x600e, 0x000e, 0x60ee, 0x000e,
++	0x60f2, 0x60e3, 0x0000, 0x6887, 0x0001, 0x2001, 0x0001, 0x080c,
++	0x2a1c, 0x6800, 0xa084, 0x00a0, 0xc0bd, 0x6802, 0x6803, 0x00a0,
++	0x000e, 0x6052, 0x6050, 0x0005, 0x0156, 0x0016, 0x0026, 0x0036,
++	0x00c6, 0x00d6, 0x00e6, 0x2061, 0x0100, 0x2069, 0x0140, 0x2071,
++	0xc600, 0x6020, 0xa084, 0x0080, 0x0138, 0x2001, 0xc60c, 0x200c,
++	0xc1bd, 0x2102, 0x0804, 0x601c, 0x2001, 0xc60c, 0x200c, 0xc1bc,
++	0x2102, 0x6028, 0xa084, 0xe1ff, 0x602a, 0x6027, 0x0200, 0x6803,
++	0x0090, 0x20a9, 0x0384, 0x6024, 0xd0cc, 0x1508, 0x1d04, 0x5fcb,
++	0x2091, 0x6000, 0x1f04, 0x5fcb, 0x2011, 0x0003, 0x080c, 0x8f0e,
++	0x2011, 0x0002, 0x080c, 0x8f18, 0x080c, 0x8dee, 0x2019, 0x0000,
++	0x080c, 0x8e79, 0x6803, 0x00a0, 0x2001, 0xc8e6, 0x2003, 0x0001,
++	0x2001, 0xc600, 0x2003, 0x0001, 0xa085, 0x0001, 0x0468, 0x86ff,
++	0x1120, 0x080c, 0x1f06, 0x080c, 0x25fb, 0x60e3, 0x0000, 0x2001,
++	0xc8d6, 0x2004, 0x080c, 0x2a1c, 0x60e2, 0x6803, 0x0080, 0x20a9,
++	0x0384, 0x6027, 0x1e00, 0x2009, 0x1e00, 0xe000, 0x6024, 0xa10c,
++	0x0138, 0x1d04, 0x6001, 0x2091, 0x6000, 0x1f04, 0x6001, 0x0820,
++	0x6028, 0xa085, 0x1e00, 0x602a, 0x70a4, 0xa005, 0x1118, 0x6887,
++	0x0001, 0x0008, 0x6886, 0xa006, 0x00ee, 0x00de, 0x00ce, 0x003e,
++	0x002e, 0x001e, 0x015e, 0x0005, 0x0156, 0x0016, 0x0026, 0x0036,
++	0x00c6, 0x00d6, 0x00e6, 0x2061, 0x0100, 0x2071, 0xc600, 0x2069,
++	0x0140, 0x6020, 0xa084, 0x00c0, 0x0120, 0x6884, 0xa005, 0x1904,
++	0x6078, 0x6803, 0x0088, 0x60e3, 0x0000, 0x6887, 0x0000, 0x2001,
++	0x0000, 0x080c, 0x2a1c, 0x2069, 0x0200, 0x6804, 0xa005, 0x1118,
++	0x6808, 0xa005, 0x01c0, 0x6028, 0xa084, 0xfbff, 0x602a, 0x6027,
++	0x0400, 0x2069, 0xc90c, 0x7000, 0x206a, 0x708f, 0x0026, 0x7003,
++	0x0001, 0x20a9, 0x0002, 0x1d04, 0x605b, 0x2091, 0x6000, 0x1f04,
++	0x605b, 0x0804, 0x60a9, 0x2069, 0x0140, 0x20a9, 0x0384, 0x6027,
++	0x1e00, 0x2009, 0x1e00, 0xe000, 0x6024, 0xa10c, 0x0520, 0xa084,
++	0x1a00, 0x1508, 0x1d04, 0x6067, 0x2091, 0x6000, 0x1f04, 0x6067,
++	0x2011, 0x0003, 0x080c, 0x8f0e, 0x2011, 0x0002, 0x080c, 0x8f18,
++	0x080c, 0x8dee, 0x2019, 0x0000, 0x080c, 0x8e79, 0x6803, 0x00a0,
++	0x2001, 0xc8e6, 0x2003, 0x0001, 0x2001, 0xc600, 0x2003, 0x0001,
++	0xa085, 0x0001, 0x00b0, 0x080c, 0x25fb, 0x6803, 0x0080, 0x2069,
++	0x0140, 0x60e3, 0x0000, 0x70a4, 0xa005, 0x1118, 0x6887, 0x0001,
++	0x0008, 0x6886, 0x2001, 0xc8d6, 0x2004, 0x080c, 0x2a1c, 0x60e2,
++	0xa006, 0x00ee, 0x00de, 0x00ce, 0x003e, 0x002e, 0x001e, 0x015e,
++	0x0005, 0x0156, 0x0016, 0x0026, 0x0036, 0x00c6, 0x00d6, 0x00e6,
++	0x2061, 0x0100, 0x2071, 0xc600, 0x6020, 0xa084, 0x00c0, 0x01e0,
++	0x2011, 0x0003, 0x080c, 0x8f0e, 0x2011, 0x0002, 0x080c, 0x8f18,
++	0x080c, 0x8dee, 0x2019, 0x0000, 0x080c, 0x8e79, 0x2069, 0x0140,
++	0x6803, 0x00a0, 0x2001, 0xc8e6, 0x2003, 0x0001, 0x2001, 0xc600,
++	0x2003, 0x0001, 0x0804, 0x614e, 0x2001, 0xc60c, 0x200c, 0xd1b4,
++	0x1160, 0xc1b5, 0x2102, 0x080c, 0x5ddd, 0x2069, 0x0140, 0x080c,
++	0x25fb, 0x6803, 0x0080, 0x60e3, 0x0000, 0x2069, 0x0200, 0x6804,
++	0xa005, 0x1118, 0x6808, 0xa005, 0x01c0, 0x6028, 0xa084, 0xfdff,
++	0x602a, 0x6027, 0x0200, 0x2069, 0xc90c, 0x7000, 0x206a, 0x708f,
++	0x0027, 0x7003, 0x0001, 0x20a9, 0x0002, 0x1d04, 0x6105, 0x2091,
++	0x6000, 0x1f04, 0x6105, 0x0804, 0x614e, 0x6027, 0x1e00, 0x2009,
++	0x1e00, 0xe000, 0x6024, 0xa10c, 0x01c8, 0xa084, 0x1c00, 0x11b0,
++	0x1d04, 0x610d, 0x0006, 0x0016, 0x00c6, 0x00d6, 0x00e6, 0x080c,
++	0x6f0a, 0x00ee, 0x00de, 0x00ce, 0x001e, 0x000e, 0x00e6, 0x2071,
++	0xc93a, 0x7018, 0x00ee, 0xa005, 0x1d00, 0x0500, 0x0026, 0x2011,
++	0x5df5, 0x080c, 0x6fad, 0x2011, 0x5de8, 0x080c, 0x7070, 0x002e,
++	0x2069, 0x0140, 0x60e3, 0x0000, 0x70a4, 0xa005, 0x1118, 0x6887,
++	0x0001, 0x0008, 0x6886, 0x2001, 0xc8d6, 0x2004, 0x080c, 0x2a1c,
++	0x60e2, 0x2001, 0xc60c, 0x200c, 0xc1b4, 0x2102, 0x00ee, 0x00de,
++	0x00ce, 0x003e, 0x002e, 0x001e, 0x015e, 0x0005, 0x0156, 0x0016,
++	0x0026, 0x0036, 0x0046, 0x00c6, 0x00e6, 0x2061, 0x0100, 0x2071,
++	0xc600, 0x7130, 0xd184, 0x1180, 0x2011, 0xc653, 0x2214, 0xd2ec,
++	0x0138, 0xc18d, 0x7132, 0x2011, 0xc653, 0x2214, 0xd2ac, 0x1120,
++	0x7030, 0xd08c, 0x0904, 0x61bb, 0x7130, 0xc185, 0x7132, 0x2011,
++	0xc653, 0x220c, 0xd1a4, 0x0530, 0x0016, 0x2019, 0x000e, 0x080c,
++	0xc10d, 0x0156, 0x20a9, 0x007f, 0x2009, 0x0000, 0xa186, 0x007e,
++	0x01a0, 0xa186, 0x0080, 0x0188, 0x080c, 0x533d, 0x1170, 0x8127,
++	0xa006, 0x0016, 0x2009, 0x000e, 0x080c, 0xc190, 0x2009, 0x0001,
++	0x2011, 0x0100, 0x080c, 0x712e, 0x001e, 0x8108, 0x1f04, 0x6186,
++	0x015e, 0x001e, 0xd1ac, 0x1148, 0x0016, 0x2009, 0x0000, 0x2019,
++	0x0004, 0x080c, 0x2e19, 0x001e, 0x0070, 0x0156, 0x20a9, 0x007f,
++	0x2009, 0x0000, 0x080c, 0x533d, 0x1110, 0x080c, 0x4f47, 0x8108,
++	0x1f04, 0x61b2, 0x015e, 0x080c, 0x1f06, 0x2011, 0x0003, 0x080c,
++	0x8f0e, 0x2011, 0x0002, 0x080c, 0x8f18, 0x080c, 0x8dee, 0x0036,
++	0x2019, 0x0000, 0x080c, 0x8e79, 0x003e, 0x60e3, 0x0000, 0x2001,
++	0xc600, 0x2003, 0x0001, 0x080c, 0x5e5a, 0x00ee, 0x00ce, 0x004e,
++	0x003e, 0x002e, 0x001e, 0x015e, 0x0005, 0x2071, 0xc702, 0x7003,
++	0x0000, 0x7007, 0x0000, 0x700f, 0x0000, 0x702b, 0x0001, 0x704f,
++	0x0000, 0x7053, 0x0001, 0x705f, 0x0020, 0x7063, 0x0040, 0x7083,
++	0x0000, 0x708b, 0x0000, 0x708f, 0x0001, 0x70bf, 0x0000, 0x0005,
++	0x00e6, 0x2071, 0xc702, 0x6848, 0xa005, 0x1130, 0x7028, 0xc085,
++	0x702a, 0xa085, 0x0001, 0x0428, 0x6a50, 0x7236, 0x6b54, 0x733a,
++	0x6858, 0x703e, 0x707a, 0x685c, 0x7042, 0x707e, 0x6848, 0x702e,
++	0x6840, 0x7032, 0x2009, 0x000c, 0x200a, 0x8007, 0x8006, 0x8006,
++	0xa08c, 0x003f, 0xa084, 0xffc0, 0xa210, 0x2100, 0xa319, 0x7272,
++	0x7376, 0x7028, 0xc084, 0x702a, 0x7007, 0x0001, 0x700f, 0x0000,
++	0xa006, 0x00ee, 0x0005, 0x2b78, 0x2071, 0xc702, 0x7004, 0x0043,
++	0x700c, 0x0002, 0x6237, 0x622e, 0x622e, 0x622e, 0x622e, 0x0005,
++	0x628d, 0x628e, 0x62c0, 0x62c1, 0x628b, 0x630f, 0x6314, 0x6345,
++	0x6346, 0x6361, 0x6362, 0x6363, 0x6364, 0x6365, 0x6366, 0x6431,
++	0x6458, 0x700c, 0x0002, 0x6250, 0x628b, 0x628b, 0x628c, 0x628c,
++	0x7830, 0x7930, 0xa106, 0x0120, 0x7830, 0x7930, 0xa106, 0x1510,
++	0x7030, 0xa10a, 0x01f8, 0x1210, 0x712c, 0xa10a, 0xa18a, 0x0002,
++	0x12d0, 0x080c, 0x15e5, 0x01b0, 0x2d00, 0x705a, 0x7063, 0x0040,
++	0x2001, 0x0003, 0x7057, 0x0000, 0x0126, 0x0006, 0x2091, 0x8000,
++	0x2009, 0xc959, 0x2104, 0xc085, 0x200a, 0x000e, 0x700e, 0x012e,
++	0x080c, 0x1669, 0x0005, 0x080c, 0x15e5, 0x0de0, 0x2d00, 0x705a,
++	0x080c, 0x15e5, 0x1108, 0x0c10, 0x2d00, 0x7086, 0x7063, 0x0080,
++	0x2001, 0x0004, 0x08f8, 0x0005, 0x0005, 0x0005, 0x700c, 0x0002,
++	0x6295, 0x6298, 0x62a6, 0x62bf, 0x62bf, 0x080c, 0x6249, 0x0005,
++	0x0126, 0x8001, 0x700e, 0x7058, 0x0006, 0x080c, 0x67d4, 0x0120,
++	0x2091, 0x8000, 0x080c, 0x6249, 0x00de, 0x0048, 0x0126, 0x8001,
++	0x700e, 0x080c, 0x67d4, 0x7058, 0x2068, 0x7084, 0x705a, 0x6803,
++	0x0000, 0x6807, 0x0000, 0x6834, 0xa084, 0x00ff, 0xa08a, 0x003a,
++	0x1218, 0x00db, 0x012e, 0x0005, 0x012e, 0x080c, 0x6367, 0x0005,
++	0x0005, 0x0005, 0x00e6, 0x2071, 0xc702, 0x700c, 0x0002, 0x62cc,
++	0x62cc, 0x62cc, 0x62ce, 0x62d1, 0x00ee, 0x0005, 0x700f, 0x0001,
++	0x0010, 0x700f, 0x0002, 0x00ee, 0x0005, 0x6367, 0x6367, 0x6383,
++	0x6367, 0x653e, 0x6367, 0x6367, 0x6367, 0x6367, 0x6367, 0x6383,
++	0x6580, 0x65c3, 0x660c, 0x6620, 0x6367, 0x6367, 0x639f, 0x6383,
++	0x63b3, 0x6367, 0x640e, 0x66cc, 0x66e7, 0x6367, 0x639f, 0x6367,
++	0x63b3, 0x6367, 0x6367, 0x6404, 0x66e7, 0x6367, 0x6367, 0x6367,
++	0x6367, 0x6367, 0x6367, 0x6367, 0x6367, 0x6367, 0x63c8, 0x6367,
++	0x6367, 0x6367, 0x6367, 0x6367, 0x6367, 0x6367, 0x6367, 0x6367,
++	0x6866, 0x6367, 0x67f2, 0x6367, 0x67f2, 0x6367, 0x63dd, 0x7020,
++	0x2068, 0x080c, 0x1619, 0x0005, 0x700c, 0x0002, 0x631b, 0x631e,
++	0x632c, 0x6344, 0x6344, 0x080c, 0x6249, 0x0005, 0x0126, 0x8001,
++	0x700e, 0x7058, 0x0006, 0x080c, 0x67d4, 0x0120, 0x2091, 0x8000,
++	0x080c, 0x6249, 0x00de, 0x0048, 0x0126, 0x8001, 0x700e, 0x080c,
++	0x67d4, 0x7058, 0x2068, 0x7084, 0x705a, 0x6803, 0x0000, 0x6807,
++	0x0000, 0x6834, 0xa084, 0x00ff, 0xa08a, 0x001a, 0x1218, 0x003b,
++	0x012e, 0x0005, 0x012e, 0x0419, 0x0005, 0x0005, 0x0005, 0x6367,
++	0x6383, 0x652a, 0x6367, 0x6383, 0x6367, 0x6383, 0x6383, 0x6367,
++	0x6383, 0x652a, 0x6383, 0x6383, 0x6383, 0x6383, 0x6383, 0x6367,
++	0x6383, 0x652a, 0x6367, 0x6367, 0x6383, 0x6367, 0x6367, 0x6367,
++	0x6383, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x0005, 0x7007,
++	0x0001, 0x6838, 0xa084, 0x00ff, 0xc0d5, 0x683a, 0x0126, 0x2091,
++	0x8000, 0x080c, 0x580a, 0x012e, 0x0005, 0x7007, 0x0001, 0x6838,
++	0xa084, 0x00ff, 0xc0e5, 0x683a, 0x0126, 0x2091, 0x8000, 0x080c,
++	0x580a, 0x012e, 0x0005, 0x7007, 0x0001, 0x6838, 0xa084, 0x00ff,
++	0xc0ed, 0x683a, 0x0126, 0x2091, 0x8000, 0x080c, 0x580a, 0x012e,
++	0x0005, 0x7007, 0x0001, 0x6838, 0xa084, 0x00ff, 0xc0dd, 0x683a,
++	0x0126, 0x2091, 0x8000, 0x080c, 0x580a, 0x012e, 0x0005, 0x6834,
++	0x8007, 0xa084, 0x00ff, 0x0988, 0x8001, 0x1120, 0x7007, 0x0001,
++	0x0804, 0x64c1, 0x7007, 0x0006, 0x7012, 0x2d00, 0x7016, 0x701a,
++	0x704b, 0x64c1, 0x0005, 0x6834, 0x8007, 0xa084, 0x00ff, 0x0904,
++	0x6375, 0x8001, 0x1120, 0x7007, 0x0001, 0x0804, 0x64de, 0x7007,
++	0x0006, 0x7012, 0x2d00, 0x7016, 0x701a, 0x704b, 0x64de, 0x0005,
++	0x6834, 0x8007, 0xa084, 0x00ff, 0x0904, 0x6375, 0x8001, 0x1120,
++	0x7007, 0x0001, 0x0804, 0x6507, 0x7007, 0x0006, 0x7012, 0x2d00,
++	0x7016, 0x701a, 0x704b, 0x6507, 0x0005, 0x6834, 0x8007, 0xa084,
++	0x00ff, 0xa086, 0x0001, 0x1904, 0x6375, 0x7007, 0x0001, 0x2009,
++	0xc631, 0x210c, 0x81ff, 0x11a8, 0x6838, 0xa084, 0x00ff, 0x683a,
++	0x6853, 0x0000, 0x080c, 0x5116, 0x1108, 0x0005, 0x0126, 0x2091,
++	0x8000, 0x6837, 0x0139, 0x684a, 0x6952, 0x080c, 0x580a, 0x012e,
++	0x0ca0, 0x2001, 0x0028, 0x0c90, 0x684c, 0xa084, 0x00c0, 0xa086,
++	0x00c0, 0x1120, 0x7007, 0x0001, 0x0804, 0x66ff, 0x2d00, 0x7016,
++	0x701a, 0x20a9, 0x0004, 0xa080, 0x0024, 0x2098, 0x20a1, 0xc72d,
++	0x53a3, 0x6858, 0x7012, 0xa082, 0x0401, 0x1a04, 0x6391, 0x6a84,
++	0xa28a, 0x0002, 0x1a04, 0x6391, 0x82ff, 0x1138, 0x6888, 0x698c,
++	0xa105, 0x0118, 0x2001, 0x6494, 0x0018, 0xa280, 0x648a, 0x2005,
++	0x70c6, 0x7010, 0xa015, 0x0904, 0x6476, 0x080c, 0x15e5, 0x1118,
++	0x7007, 0x000f, 0x0005, 0x2d00, 0x7022, 0x70c4, 0x2060, 0x2c05,
++	0x6836, 0xe004, 0xad00, 0x7096, 0xe008, 0xa20a, 0x1210, 0xa00e,
++	0x2200, 0x7112, 0xe20c, 0x8003, 0x800b, 0xa296, 0x0004, 0x0108,
++	0xa108, 0x719a, 0x810b, 0x719e, 0xae90, 0x0022, 0x080c, 0x164d,
++	0x7090, 0xa08e, 0x0100, 0x0170, 0xa086, 0x0200, 0x0118, 0x7007,
++	0x0010, 0x0005, 0x7020, 0x2068, 0x080c, 0x1619, 0x7014, 0x2068,
++	0x0804, 0x6391, 0x7020, 0x2068, 0x7018, 0x6802, 0x6807, 0x0000,
++	0x2d08, 0x2068, 0x6906, 0x711a, 0x0804, 0x6431, 0x7014, 0x2068,
++	0x7007, 0x0001, 0x6884, 0xa005, 0x1128, 0x6888, 0x698c, 0xa105,
++	0x0108, 0x00b1, 0x6834, 0xa084, 0x00ff, 0xa086, 0x001e, 0x0904,
++	0x66ff, 0x04b8, 0x648c, 0x6490, 0x0002, 0x0011, 0x0007, 0x0004,
++	0x000a, 0x000f, 0x0005, 0x0006, 0x000a, 0x0011, 0x0005, 0x0004,
++	0x00f6, 0x00e6, 0x00c6, 0x0076, 0x0066, 0x6f88, 0x6e8c, 0x6804,
++	0x2060, 0xacf0, 0x0021, 0xacf8, 0x0027, 0x2009, 0x0005, 0x700c,
++	0x7816, 0x7008, 0x7812, 0x7004, 0x7806, 0x7000, 0x7802, 0x7e0e,
++	0x7f0a, 0x8109, 0x0128, 0xaef2, 0x0004, 0xaffa, 0x0006, 0x0c78,
++	0x6004, 0xa065, 0x1d30, 0x006e, 0x007e, 0x00ce, 0x00ee, 0x00fe,
++	0x0005, 0x2009, 0xc631, 0x210c, 0x81ff, 0x1198, 0x6838, 0xa084,
++	0x00ff, 0x683a, 0x080c, 0x4fa6, 0x1108, 0x0005, 0x080c, 0x592e,
++	0x0126, 0x2091, 0x8000, 0x080c, 0xaf03, 0x080c, 0x580a, 0x012e,
++	0x0ca0, 0x2001, 0x0028, 0x2009, 0x0000, 0x0c80, 0x2009, 0xc631,
++	0x210c, 0x81ff, 0x11d8, 0x6858, 0xa005, 0x01d8, 0x2001, 0xc756,
++	0x2004, 0xa086, 0x0000, 0x01c0, 0x6838, 0xa084, 0x00ff, 0x683a,
++	0x6853, 0x0000, 0x080c, 0x5068, 0x1108, 0x0005, 0x684a, 0x0126,
++	0x2091, 0x8000, 0x080c, 0x580a, 0x012e, 0x0cb8, 0x2001, 0x0028,
++	0x0ca8, 0x2001, 0x0000, 0x0c90, 0x2001, 0x002c, 0x0c78, 0x2009,
++	0xc631, 0x210c, 0x81ff, 0x11b0, 0x6858, 0xa005, 0x01c0, 0x6838,
++	0xa084, 0x00ff, 0x683a, 0x6853, 0x0000, 0x080c, 0x50ba, 0x1108,
++	0x0005, 0x0126, 0x2091, 0x8000, 0x684a, 0x6952, 0x080c, 0x580a,
++	0x012e, 0x0cb0, 0x2001, 0x0028, 0x2009, 0x0000, 0x0c90, 0x2001,
++	0x0000, 0x0c78, 0x7018, 0x6802, 0x2d08, 0x2068, 0x6906, 0x711a,
++	0x7010, 0x8001, 0x7012, 0x0118, 0x7007, 0x0006, 0x0030, 0x7014,
++	0x2068, 0x7007, 0x0001, 0x7048, 0x080f, 0x0005, 0x7007, 0x0001,
++	0x6944, 0x810f, 0xa18c, 0x00ff, 0x6848, 0xa084, 0x00ff, 0x20a9,
++	0x0001, 0xa096, 0x0001, 0x01b0, 0x2009, 0x0000, 0x20a9, 0x00ff,
++	0xa096, 0x0002, 0x0178, 0xa005, 0x11f0, 0x6944, 0x810f, 0xa18c,
++	0x00ff, 0x080c, 0x533d, 0x11b8, 0x0066, 0x6e50, 0x080c, 0x543c,
++	0x006e, 0x0088, 0x0046, 0x2011, 0xc60c, 0x2224, 0xc484, 0x2412,
++	0x004e, 0x00c6, 0x080c, 0x533d, 0x1110, 0x080c, 0x559d, 0x8108,
++	0x1f04, 0x656a, 0x00ce, 0x684c, 0xd084, 0x1118, 0x080c, 0x1619,
++	0x0005, 0x0126, 0x2091, 0x8000, 0x080c, 0x580a, 0x012e, 0x0005,
++	0x0126, 0x2091, 0x8000, 0x7007, 0x0001, 0x2001, 0xc653, 0x2004,
++	0xd0a4, 0x0580, 0x2061, 0xc9bc, 0x6100, 0xd184, 0x0178, 0x6858,
++	0xa084, 0x00ff, 0x1550, 0x6000, 0xd084, 0x0520, 0x6004, 0xa005,
++	0x1538, 0x6003, 0x0000, 0x600b, 0x0000, 0x00c8, 0x2011, 0x0001,
++	0x6860, 0xa005, 0x1110, 0x2001, 0x001e, 0x8000, 0x6016, 0x6858,
++	0xa084, 0x00ff, 0x0178, 0x6006, 0x6858, 0x8007, 0xa084, 0x00ff,
++	0x0148, 0x600a, 0x6858, 0x8000, 0x1108, 0xc28d, 0x6202, 0x012e,
++	0x0804, 0x67c3, 0x012e, 0x0804, 0x67bd, 0x012e, 0x0804, 0x67b7,
++	0x012e, 0x0804, 0x67ba, 0x0126, 0x2091, 0x8000, 0x7007, 0x0001,
++	0x2001, 0xc653, 0x2004, 0xd0a4, 0x05e0, 0x2061, 0xc9bc, 0x6000,
++	0xd084, 0x05b8, 0x6204, 0x6308, 0xd08c, 0x1530, 0x6c48, 0xa484,
++	0x0003, 0x0170, 0x6958, 0xa18c, 0x00ff, 0x8001, 0x1120, 0x2100,
++	0xa210, 0x0620, 0x0028, 0x8001, 0x1508, 0x2100, 0xa212, 0x02f0,
++	0xa484, 0x000c, 0x0188, 0x6958, 0x810f, 0xa18c, 0x00ff, 0xa082,
++	0x0004, 0x1120, 0x2100, 0xa318, 0x0288, 0x0030, 0xa082, 0x0004,
++	0x1168, 0x2100, 0xa31a, 0x0250, 0x6860, 0xa005, 0x0110, 0x8000,
++	0x6016, 0x6206, 0x630a, 0x012e, 0x0804, 0x67c3, 0x012e, 0x0804,
++	0x67c0, 0x012e, 0x0804, 0x67bd, 0x0126, 0x2091, 0x8000, 0x7007,
++	0x0001, 0x2061, 0xc9bc, 0x6300, 0xd38c, 0x1120, 0x6308, 0x8318,
++	0x0220, 0x630a, 0x012e, 0x0804, 0x67d1, 0x012e, 0x0804, 0x67c0,
++	0x0126, 0x00c6, 0x2091, 0x8000, 0x7007, 0x0001, 0x684c, 0xd0ac,
++	0x0148, 0x00c6, 0x2061, 0xc9bc, 0x6000, 0xa084, 0xfcff, 0x6002,
++	0x00ce, 0x0448, 0x6858, 0xa005, 0x05d0, 0x685c, 0xa065, 0x0598,
++	0x2001, 0xc631, 0x2004, 0xa005, 0x0118, 0x080c, 0xae54, 0x0068,
++	0x6013, 0x0400, 0x6057, 0x0000, 0x694c, 0xd1a4, 0x0110, 0x6950,
++	0x6156, 0x2009, 0x0041, 0x080c, 0x9613, 0x6958, 0xa18c, 0xff00,
++	0xa186, 0x2000, 0x1140, 0x0026, 0x2009, 0x0000, 0x2011, 0xfdff,
++	0x080c, 0x712e, 0x002e, 0x684c, 0xd0c4, 0x0148, 0x2061, 0xc9bc,
++	0x6000, 0xd08c, 0x1120, 0x6008, 0x8000, 0x0208, 0x600a, 0x00ce,
++	0x012e, 0x0804, 0x67c3, 0x00ce, 0x012e, 0x0804, 0x67bd, 0x6954,
++	0xa186, 0x002e, 0x0d40, 0xa186, 0x002d, 0x0d28, 0xa186, 0x0045,
++	0x0528, 0xa186, 0x002a, 0x1130, 0x2001, 0xc60c, 0x200c, 0xc194,
++	0x2102, 0x08c8, 0xa186, 0x0020, 0x0170, 0xa186, 0x0029, 0x1d18,
++	0x6944, 0xa18c, 0xff00, 0x810f, 0x080c, 0x533d, 0x1960, 0x6000,
++	0xc0e4, 0x6002, 0x0840, 0x685c, 0xa065, 0x09a8, 0x6007, 0x0024,
++	0x2001, 0xc8fd, 0x2004, 0x6016, 0x0804, 0x665b, 0x685c, 0xa065,
++	0x0950, 0x00e6, 0x6860, 0xa075, 0x2001, 0xc631, 0x2004, 0xa005,
++	0x0150, 0x080c, 0xae54, 0x8eff, 0x0118, 0x2e60, 0x080c, 0xae54,
++	0x00ee, 0x0804, 0x665b, 0x6020, 0xc0dc, 0xc0d5, 0x6022, 0x2e60,
++	0x6007, 0x003a, 0x6870, 0xa005, 0x0130, 0x6007, 0x003b, 0x6874,
++	0x602a, 0x6878, 0x6012, 0x6003, 0x0001, 0x080c, 0x7999, 0x080c,
++	0x7e94, 0x00ee, 0x0804, 0x665b, 0x2061, 0xc9bc, 0x6000, 0xd084,
++	0x0190, 0xd08c, 0x1904, 0x67d1, 0x0126, 0x2091, 0x8000, 0x6204,
++	0x8210, 0x0220, 0x6206, 0x012e, 0x0804, 0x67d1, 0x012e, 0x6853,
++	0x0016, 0x0804, 0x67ca, 0x6853, 0x0007, 0x0804, 0x67ca, 0x6834,
++	0x8007, 0xa084, 0x00ff, 0x1118, 0x080c, 0x6375, 0x0078, 0x2030,
++	0x8001, 0x1120, 0x7007, 0x0001, 0x0051, 0x0040, 0x7007, 0x0006,
++	0x7012, 0x2d00, 0x7016, 0x701a, 0x704b, 0x66ff, 0x0005, 0x00e6,
++	0x0126, 0x2091, 0x8000, 0xa03e, 0x2009, 0xc631, 0x210c, 0x81ff,
++	0x1904, 0x677d, 0x2009, 0xc60c, 0x210c, 0xd194, 0x1904, 0x67a7,
++	0x6848, 0x2070, 0xae82, 0xce00, 0x0a04, 0x6771, 0x2001, 0xc617,
++	0x2004, 0xae02, 0x1a04, 0x6771, 0x711c, 0xa186, 0x0006, 0x1904,
++	0x6760, 0x7018, 0xa005, 0x0904, 0x677d, 0x2004, 0xd0e4, 0x1904,
++	0x67a2, 0x2061, 0xc9bc, 0x6100, 0xa184, 0x0301, 0xa086, 0x0001,
++	0x1550, 0x7020, 0xd0dc, 0x1904, 0x67aa, 0x6853, 0x0000, 0x6803,
++	0x0000, 0x2d08, 0x7010, 0xa005, 0x1158, 0x7112, 0x684c, 0xd0f4,
++	0x1904, 0x67ad, 0x2e60, 0x080c, 0x708a, 0x012e, 0x00ee, 0x0005,
++	0x2068, 0x6800, 0xa005, 0x1de0, 0x6902, 0x2168, 0x684c, 0xd0f4,
++	0x1904, 0x67ad, 0x012e, 0x00ee, 0x0005, 0x012e, 0x00ee, 0x6853,
++	0x0006, 0x0804, 0x67ca, 0xd184, 0x0dc0, 0xd1c4, 0x11a8, 0x00b8,
++	0x6944, 0xa18c, 0xff00, 0x810f, 0x080c, 0x533d, 0x15d8, 0x6000,
++	0xd0e4, 0x15c0, 0x711c, 0xa186, 0x0007, 0x1118, 0x6853, 0x0002,
++	0x0498, 0x6853, 0x0008, 0x0480, 0x6853, 0x000e, 0x0468, 0x6853,
++	0x0017, 0x0450, 0x6853, 0x0035, 0x0438, 0x2001, 0xc672, 0x2004,
++	0xd0fc, 0x01e8, 0x6848, 0x2070, 0xae82, 0xce00, 0x02c0, 0x605c,
++	0xae02, 0x12a8, 0x711c, 0xa186, 0x0006, 0x1188, 0x7018, 0xa005,
++	0x0170, 0x2004, 0xd0bc, 0x0158, 0x2039, 0x0001, 0x7000, 0xa086,
++	0x0007, 0x1904, 0x670a, 0x7003, 0x0002, 0x0804, 0x670a, 0x6853,
++	0x0028, 0x0010, 0x6853, 0x0029, 0x012e, 0x00ee, 0x0418, 0x6853,
++	0x002a, 0x0cd0, 0x6853, 0x0045, 0x0cb8, 0x2e60, 0x2019, 0x0002,
++	0x6017, 0x0014, 0x080c, 0xbd55, 0x012e, 0x00ee, 0x0005, 0x2009,
++	0x003e, 0x0058, 0x2009, 0x0004, 0x0040, 0x2009, 0x0006, 0x0028,
++	0x2009, 0x0016, 0x0010, 0x2009, 0x0001, 0x6854, 0xa084, 0xff00,
++	0xa105, 0x6856, 0x0126, 0x2091, 0x8000, 0x080c, 0x580a, 0x012e,
++	0x0005, 0x080c, 0x1619, 0x0005, 0x702c, 0x7130, 0x8108, 0xa102,
++	0x0230, 0xa00e, 0x7034, 0x7072, 0x7038, 0x7076, 0x0058, 0x7070,
++	0xa080, 0x0040, 0x7072, 0x1230, 0x7074, 0xa081, 0x0000, 0x7076,
++	0xa085, 0x0001, 0x7932, 0x7132, 0x0005, 0x00d6, 0x080c, 0x7081,
++	0x00de, 0x0005, 0x2001, 0xc756, 0x2004, 0xa086, 0x0000, 0x0904,
++	0x684d, 0x080c, 0x768f, 0x0904, 0x6850, 0x6868, 0xa084, 0x0007,
++	0x0904, 0x6844, 0x080c, 0x958d, 0x0904, 0x6847, 0x2d00, 0x6012,
++	0x6834, 0xa084, 0x00ff, 0xa086, 0x0035, 0x1198, 0x2001, 0xc8e5,
++	0x2004, 0xa086, 0xaaaa, 0x0130, 0x2001, 0xc635, 0x2004, 0xa084,
++	0x0028, 0x05c8, 0x6008, 0xc0fd, 0x600a, 0x2001, 0xc8d3, 0x2004,
++	0x0098, 0x6870, 0xa084, 0x00ff, 0x696c, 0xa18c, 0xff00, 0xa105,
++	0x696c, 0xa18c, 0x00ff, 0x080c, 0x29c7, 0x11e0, 0x00c6, 0x080c,
++	0x533d, 0x2c00, 0x00ce, 0x11b0, 0x601a, 0x601f, 0x0001, 0x2009,
++	0x0040, 0x6834, 0xa084, 0x00ff, 0xa086, 0x0035, 0x0110, 0x2009,
++	0x0041, 0x080c, 0x9613, 0x0005, 0x684b, 0x0101, 0x0078, 0x684b,
++	0x002c, 0x0060, 0x684b, 0x0028, 0x0080, 0x684b, 0x0104, 0x0030,
++	0x684b, 0x0105, 0x0018, 0x684b, 0x0106, 0x0038, 0x0126, 0x2091,
++	0x8000, 0x080c, 0x580a, 0x012e, 0x0005, 0x0126, 0x2091, 0x8000,
++	0x080c, 0x580a, 0x012e, 0x080c, 0x95e3, 0x0005, 0x00d6, 0x00c6,
++	0x0036, 0x0026, 0x0016, 0x7007, 0x0001, 0x6a44, 0xa282, 0x0004,
++	0x1a04, 0x68b1, 0xd284, 0x0170, 0x6a4c, 0xa290, 0xc77b, 0x2204,
++	0xa065, 0x6004, 0x05e0, 0x8007, 0xa084, 0x00ff, 0xa084, 0x0006,
++	0x1108, 0x04a8, 0x2c10, 0x080c, 0x958d, 0x1118, 0x080c, 0xaf0d,
++	0x05a0, 0x621a, 0x6844, 0x0002, 0x6890, 0x6895, 0x6898, 0x689e,
++	0x2019, 0x0002, 0x080c, 0xc10d, 0x0060, 0x080c, 0xc0a4, 0x0048,
++	0x2019, 0x0002, 0x6950, 0x080c, 0xc0bf, 0x0018, 0x6950, 0x080c,
++	0xc0a4, 0x080c, 0x95e3, 0x6857, 0x0000, 0x0126, 0x2091, 0x8000,
++	0x080c, 0x580a, 0x012e, 0x001e, 0x002e, 0x003e, 0x00ce, 0x00de,
++	0x0005, 0x6857, 0x0006, 0x0c88, 0x6857, 0x0002, 0x0c70, 0x6857,
++	0x0005, 0x0c58, 0x6857, 0x0004, 0x0c40, 0x6857, 0x0007, 0x0c28,
++	0x00d6, 0x2011, 0x0004, 0x2204, 0xa085, 0x8002, 0x2012, 0x00de,
++	0x0005, 0x20e1, 0x0002, 0x3d08, 0x20e1, 0x2000, 0x3d00, 0xa084,
++	0x7000, 0x0118, 0xa086, 0x1000, 0x15e0, 0x20e1, 0x0000, 0x3d00,
++	0xa094, 0xff00, 0x8217, 0xa084, 0xf000, 0xa086, 0x3000, 0x1160,
++	0xa184, 0xff00, 0x8007, 0xa086, 0x0008, 0x1558, 0x080c, 0x2f69,
++	0x1540, 0x080c, 0x6b32, 0x0400, 0x20e1, 0x0004, 0x3d60, 0xd1bc,
++	0x1170, 0x2100, 0xa084, 0xff00, 0xa086, 0x0500, 0x1138, 0x0026,
++	0x2c10, 0x080c, 0x6d90, 0x002e, 0x01a0, 0x0070, 0x3e60, 0xac84,
++	0x0007, 0x1178, 0xac82, 0xce00, 0x0260, 0x685c, 0xac02, 0x1248,
++	0x2009, 0x0047, 0x080c, 0x9613, 0x7a1c, 0xd284, 0x1904, 0x68c9,
++	0x0005, 0xa016, 0x080c, 0x1870, 0x0cb8, 0x0cd8, 0x781c, 0xd08c,
++	0x0500, 0x0156, 0x0136, 0x0146, 0x20e1, 0x3000, 0x3d20, 0x3e28,
++	0xa584, 0x0076, 0x1538, 0xa484, 0x7000, 0xa086, 0x1000, 0x11a8,
++	0x080c, 0x6991, 0x01f8, 0x20e1, 0x3000, 0x7828, 0x7828, 0x080c,
++	0x69ad, 0x014e, 0x013e, 0x015e, 0x2009, 0xc92f, 0x2104, 0xa005,
++	0x1108, 0x0005, 0x080c, 0x7e94, 0x0ce0, 0xa484, 0x7000, 0x1548,
++	0x080c, 0x6991, 0x01d8, 0x7000, 0xa084, 0xff00, 0xa086, 0x8100,
++	0x0d10, 0x00a0, 0xd5a4, 0x0178, 0x0056, 0x0046, 0x080c, 0x1f2d,
++	0x080c, 0x25fb, 0x2001, 0x0160, 0x2502, 0x2001, 0x0138, 0x2202,
++	0x004e, 0x005e, 0x0048, 0x04a9, 0x6887, 0x0000, 0x080c, 0xc536,
++	0x20e1, 0x3000, 0x7828, 0x7828, 0x00b9, 0x014e, 0x013e, 0x015e,
++	0x0880, 0x0439, 0x1130, 0x7000, 0xa084, 0xff00, 0xa086, 0x8100,
++	0x1d68, 0x080c, 0xc536, 0x20e1, 0x3000, 0x7828, 0x7828, 0x0056,
++	0x080c, 0x6e1f, 0x005e, 0x0c40, 0x2001, 0xc60e, 0x2004, 0xd08c,
++	0x0178, 0x2001, 0xc600, 0x2004, 0xa086, 0x0003, 0x1148, 0x0026,
++	0x0036, 0x2011, 0x8048, 0x2518, 0x080c, 0x407d, 0x003e, 0x002e,
++	0x0005, 0xa484, 0x01ff, 0x6886, 0xa005, 0x0160, 0xa080, 0x001f,
++	0xa084, 0x03f8, 0x80ac, 0x20e1, 0x1000, 0x2ea0, 0x2099, 0x020a,
++	0x53a5, 0x0005, 0x20a9, 0x000c, 0x20e1, 0x1000, 0x2ea0, 0x2099,
++	0x020a, 0x53a5, 0xa085, 0x0001, 0x0ca0, 0x7000, 0xa084, 0xff00,
++	0xa08c, 0xf000, 0x8007, 0xa196, 0x0000, 0x1118, 0x0804, 0x6c37,
++	0x0005, 0xa196, 0x2000, 0x1148, 0x6900, 0xa18e, 0x0001, 0x1118,
++	0x080c, 0x47cb, 0x0ca8, 0x0039, 0x0c98, 0xa196, 0x8000, 0x1d80,
++	0x080c, 0x6ce3, 0x0c68, 0x00c6, 0x6a84, 0x82ff, 0x0904, 0x6b2c,
++	0x7110, 0xa18c, 0xff00, 0x810f, 0xa196, 0x0001, 0x0120, 0xa196,
++	0x0023, 0x1904, 0x6b2c, 0xa08e, 0x0023, 0x1570, 0x080c, 0x6d7e,
++	0x0904, 0x6b2c, 0x7124, 0x610a, 0x7030, 0xa08e, 0x0200, 0x1150,
++	0x7034, 0xa005, 0x1904, 0x6b2c, 0x2009, 0x0015, 0x080c, 0x9613,
++	0x0804, 0x6b2c, 0xa08e, 0x0214, 0x0118, 0xa08e, 0x0210, 0x1130,
++	0x2009, 0x0015, 0x080c, 0x9613, 0x0804, 0x6b2c, 0xa08e, 0x0100,
++	0x1904, 0x6b2c, 0x7034, 0xa005, 0x1904, 0x6b2c, 0x2009, 0x0016,
++	0x080c, 0x9613, 0x0804, 0x6b2c, 0xa08e, 0x0022, 0x1904, 0x6b2c,
++	0x7030, 0xa08e, 0x0300, 0x1580, 0x68d4, 0xd0a4, 0x0528, 0xc0b5,
++	0x68d6, 0x7100, 0xa18c, 0x00ff, 0x6972, 0x7004, 0x6876, 0x00f6,
++	0x2079, 0x0100, 0x79e6, 0x78ea, 0x0006, 0xa084, 0x00ff, 0x0016,
++	0x2008, 0x080c, 0x29f1, 0x7932, 0x7936, 0x001e, 0x000e, 0x00fe,
++	0x080c, 0x29c7, 0x6952, 0x703c, 0x00e6, 0x2071, 0x0140, 0x7086,
++	0x2071, 0xc600, 0x70a6, 0x00ee, 0x7034, 0xa005, 0x1904, 0x6b2c,
++	0x2009, 0x0017, 0x0804, 0x6af2, 0xa08e, 0x0400, 0x1158, 0x7034,
++	0xa005, 0x1904, 0x6b2c, 0x68d4, 0xc0a5, 0x68d6, 0x2009, 0x0030,
++	0x0804, 0x6af2, 0xa08e, 0x0500, 0x1140, 0x7034, 0xa005, 0x1904,
++	0x6b2c, 0x2009, 0x0018, 0x0804, 0x6af2, 0xa08e, 0x2010, 0x1120,
++	0x2009, 0x0019, 0x0804, 0x6af2, 0xa08e, 0x2110, 0x1120, 0x2009,
++	0x001a, 0x0804, 0x6af2, 0xa08e, 0x5200, 0x1140, 0x7034, 0xa005,
++	0x1904, 0x6b2c, 0x2009, 0x001b, 0x0804, 0x6af2, 0xa08e, 0x5000,
++	0x1140, 0x7034, 0xa005, 0x1904, 0x6b2c, 0x2009, 0x001c, 0x0804,
++	0x6af2, 0xa08e, 0x1300, 0x1120, 0x2009, 0x0034, 0x0804, 0x6af2,
++	0xa08e, 0x1200, 0x1140, 0x7034, 0xa005, 0x1904, 0x6b2c, 0x2009,
++	0x0024, 0x0804, 0x6af2, 0xa08c, 0xff00, 0xa18e, 0x2400, 0x1120,
++	0x2009, 0x002d, 0x0804, 0x6af2, 0xa08c, 0xff00, 0xa18e, 0x5300,
++	0x1120, 0x2009, 0x002a, 0x0804, 0x6af2, 0xa08e, 0x0f00, 0x1120,
++	0x2009, 0x0020, 0x0804, 0x6af2, 0xa08e, 0x5300, 0x1108, 0x00d8,
++	0xa08e, 0x6104, 0x11c0, 0x2011, 0xcc8d, 0x8208, 0x2204, 0xa082,
++	0x0004, 0x20a8, 0x95ac, 0x95ac, 0x2011, 0x8015, 0x211c, 0x8108,
++	0x0046, 0x2124, 0x080c, 0x407d, 0x004e, 0x8108, 0x1f04, 0x6abc,
++	0x2009, 0x0023, 0x0438, 0xa08e, 0x6000, 0x1118, 0x2009, 0x003f,
++	0x0408, 0xa08e, 0x5400, 0x1158, 0x080c, 0x6e79, 0x1904, 0x6b2c,
++	0x2009, 0x0046, 0x0016, 0x2001, 0xc8d3, 0x2064, 0x0498, 0xa08e,
++	0x5500, 0x1140, 0x080c, 0x6eac, 0x2009, 0x0041, 0x0158, 0x2009,
++	0x0042, 0x0040, 0xa08e, 0x7800, 0x1118, 0x2009, 0x0045, 0x0010,
++	0x2009, 0x001d, 0x0016, 0x2011, 0xcc83, 0x2204, 0x8211, 0x220c,
++	0x080c, 0x29c7, 0x1598, 0x080c, 0x52e1, 0x1580, 0x6612, 0x6516,
++	0x86ff, 0x01e8, 0x001e, 0x0016, 0xa186, 0x0017, 0x1158, 0x6870,
++	0xa606, 0x11a8, 0x6874, 0xa506, 0xa084, 0xff00, 0x1180, 0x6000,
++	0xc0f5, 0x6002, 0xa186, 0x0046, 0x1150, 0x6870, 0xa606, 0x1138,
++	0x6874, 0xa506, 0xa084, 0xff00, 0x1110, 0x001e, 0x0068, 0x00c6,
++	0x080c, 0x958d, 0x0168, 0x001e, 0x611a, 0x601f, 0x0004, 0x7120,
++	0x610a, 0x001e, 0x080c, 0x9613, 0x00ce, 0x0005, 0x001e, 0x0ce0,
++	0x00ce, 0x0ce0, 0x00c6, 0x0046, 0x080c, 0x6b86, 0x1904, 0x6b83,
++	0xa28e, 0x0033, 0x11e8, 0x080c, 0x6d7e, 0x0904, 0x6b83, 0x7124,
++	0x610a, 0x7030, 0xa08e, 0x0200, 0x1140, 0x7034, 0xa005, 0x15d8,
++	0x2009, 0x0015, 0x080c, 0x9613, 0x04b0, 0xa08e, 0x0100, 0x1598,
++	0x7034, 0xa005, 0x1580, 0x2009, 0x0016, 0x080c, 0x9613, 0x0458,
++	0xa28e, 0x0032, 0x1540, 0x7030, 0xa08e, 0x1400, 0x1520, 0x2009,
++	0x0038, 0x0016, 0x2011, 0xcc83, 0x2204, 0x8211, 0x220c, 0x080c,
++	0x29c7, 0x11c0, 0x080c, 0x52e1, 0x11a8, 0x6612, 0x6516, 0x00c6,
++	0x080c, 0x958d, 0x0170, 0x001e, 0x611a, 0x080c, 0xb05e, 0x601f,
++	0x0004, 0x7120, 0x610a, 0x001e, 0x080c, 0x9613, 0x080c, 0x7e94,
++	0x0010, 0x00ce, 0x001e, 0x004e, 0x00ce, 0x0005, 0x00f6, 0x00d6,
++	0x0026, 0x0016, 0x0136, 0x0146, 0x0156, 0x3c00, 0x0006, 0x2079,
++	0x0030, 0x2069, 0x0200, 0x080c, 0x1fec, 0x1590, 0x080c, 0x1e97,
++	0x05e0, 0x04f1, 0x1130, 0x7908, 0xa18c, 0x1fff, 0xa182, 0x0011,
++	0x1688, 0x20a9, 0x000c, 0x20e1, 0x0000, 0x2ea0, 0x2099, 0x020a,
++	0x53a5, 0x20e1, 0x2000, 0x2001, 0x020a, 0x2004, 0x7a0c, 0x7808,
++	0xa080, 0x0007, 0xa084, 0x1ff8, 0x0419, 0x1120, 0xa08a, 0x0140,
++	0x1a0c, 0x1519, 0x80ac, 0x20e1, 0x6000, 0x2099, 0x020a, 0x53a5,
++	0x20e1, 0x7000, 0x6828, 0x6828, 0x7803, 0x0004, 0xa294, 0x0070,
++	0x000e, 0x20e0, 0x015e, 0x014e, 0x013e, 0x001e, 0x002e, 0x00de,
++	0x00fe, 0x0005, 0xa016, 0x080c, 0x1870, 0xa085, 0x0001, 0x0c80,
++	0x0006, 0x2001, 0x0111, 0x2004, 0xa084, 0x0003, 0x000e, 0x0005,
++	0x0046, 0x00e6, 0x00d6, 0x2028, 0x2130, 0xa696, 0x00ff, 0x1198,
++	0xa596, 0xfffd, 0x1120, 0x2009, 0x007f, 0x0804, 0x6c32, 0xa596,
++	0xfffe, 0x1118, 0x2009, 0x007e, 0x04e8, 0xa596, 0xfffc, 0x1118,
++	0x2009, 0x0080, 0x04b8, 0x2011, 0x0000, 0x2019, 0xc635, 0x231c,
++	0xd3ac, 0x0138, 0x2021, 0x0000, 0x20a9, 0x00ff, 0x2071, 0xc77b,
++	0x0030, 0x2021, 0x0081, 0x20a9, 0x007e, 0x2071, 0xc7fc, 0x2e1c,
++	0x83ff, 0x1128, 0x82ff, 0x1198, 0x2410, 0xc2fd, 0x0080, 0x2368,
++	0x6f10, 0x0006, 0x2100, 0xa706, 0x000e, 0x6b14, 0x1120, 0xa346,
++	0x1110, 0x2408, 0x0078, 0x87ff, 0x1110, 0x83ff, 0x0d58, 0x8420,
++	0x8e70, 0x1f04, 0x6c0f, 0x82ff, 0x1118, 0xa085, 0x0001, 0x0018,
++	0xc2fc, 0x2208, 0xa006, 0x00de, 0x00ee, 0x004e, 0x0005, 0xa084,
++	0x0007, 0x000a, 0x0005, 0x6c43, 0x6c43, 0x6c43, 0x6e0c, 0x6c43,
++	0x6c44, 0x6c59, 0x6cce, 0x0005, 0x7110, 0xd1bc, 0x0188, 0x7120,
++	0x2160, 0xac8c, 0x0007, 0x1160, 0xac8a, 0xce00, 0x0248, 0x685c,
++	0xac02, 0x1230, 0x7124, 0x610a, 0x2009, 0x0046, 0x080c, 0x9613,
++	0x0005, 0x00c6, 0xa484, 0x01ff, 0x0904, 0x6cac, 0x7110, 0xd1bc,
++	0x1904, 0x6cac, 0x2011, 0xcc83, 0x2204, 0x8211, 0x220c, 0x080c,
++	0x29c7, 0x1904, 0x6cac, 0x080c, 0x52e1, 0x15f0, 0x6612, 0x6516,
++	0x6000, 0xd0ec, 0x15c8, 0x6204, 0xa294, 0xff00, 0x8217, 0xa286,
++	0x0006, 0x0148, 0x6204, 0xa294, 0x00ff, 0xa286, 0x0006, 0x11a0,
++	0xa295, 0x0600, 0x6206, 0x00c6, 0x080c, 0x958d, 0x001e, 0x0530,
++	0x611a, 0x601f, 0x0006, 0x7120, 0x610a, 0x7130, 0x6152, 0x2009,
++	0x0044, 0x080c, 0x9613, 0x00c0, 0x00c6, 0x080c, 0x958d, 0x001e,
++	0x0198, 0x611a, 0x601f, 0x0004, 0x7120, 0x610a, 0xa286, 0x0004,
++	0x1118, 0x6007, 0x0005, 0x0010, 0x6007, 0x0001, 0x6003, 0x0001,
++	0x080c, 0x79df, 0x080c, 0x7e94, 0x00ce, 0x0005, 0x2001, 0xc60d,
++	0x2004, 0xd0ec, 0x0120, 0x2011, 0x8049, 0x080c, 0x407d, 0x00c6,
++	0x080c, 0xaf0d, 0x001e, 0x0d80, 0x611a, 0x601f, 0x0006, 0x7120,
++	0x610a, 0x7130, 0x6152, 0x6013, 0x0300, 0x6003, 0x0001, 0x6007,
++	0x0041, 0x080c, 0x7999, 0x080c, 0x7e94, 0x08f0, 0x7110, 0xd1bc,
++	0x0188, 0x7020, 0x2060, 0xac84, 0x0007, 0x1160, 0xac82, 0xce00,
++	0x0248, 0x685c, 0xac02, 0x1230, 0x7124, 0x610a, 0x2009, 0x0045,
++	0x080c, 0x9613, 0x0005, 0x0006, 0x080c, 0x2f69, 0x000e, 0x1168,
++	0x7110, 0xa18c, 0xff00, 0x810f, 0xa18e, 0x0000, 0x1130, 0xa084,
++	0x000f, 0xa08a, 0x0006, 0x1208, 0x000b, 0x0005, 0x6cfc, 0x6cfd,
++	0x6cfc, 0x6cfc, 0x6d66, 0x6d72, 0x0005, 0x7110, 0xd1bc, 0x0120,
++	0x702c, 0xd084, 0x0904, 0x6d65, 0x700c, 0x7108, 0x080c, 0x29c7,
++	0x1904, 0x6d65, 0x080c, 0x52e1, 0x1904, 0x6d65, 0x6612, 0x6516,
++	0x6204, 0x7110, 0xd1bc, 0x01f8, 0xa28c, 0x00ff, 0xa186, 0x0004,
++	0x0118, 0xa186, 0x0006, 0x15c8, 0x00c6, 0x080c, 0x6d7e, 0x00ce,
++	0x0904, 0x6d65, 0x00c6, 0x080c, 0x958d, 0x001e, 0x05f0, 0x611a,
++	0x080c, 0xb05e, 0x601f, 0x0002, 0x7120, 0x610a, 0x2009, 0x0088,
++	0x080c, 0x9613, 0x0490, 0xa28c, 0x00ff, 0xa186, 0x0006, 0x0160,
++	0xa186, 0x0004, 0x0148, 0xa294, 0xff00, 0x8217, 0xa286, 0x0004,
++	0x0118, 0xa286, 0x0006, 0x1188, 0x00c6, 0x080c, 0x958d, 0x001e,
++	0x01e0, 0x611a, 0x080c, 0xb05e, 0x601f, 0x0005, 0x7120, 0x610a,
++	0x2009, 0x0088, 0x080c, 0x9613, 0x0080, 0x00c6, 0x080c, 0x958d,
++	0x001e, 0x0158, 0x611a, 0x080c, 0xb05e, 0x601f, 0x0004, 0x7120,
++	0x610a, 0x2009, 0x0001, 0x080c, 0x9613, 0x0005, 0x7110, 0xd1bc,
++	0x0140, 0x00a1, 0x0130, 0x7124, 0x610a, 0x2009, 0x0089, 0x080c,
++	0x9613, 0x0005, 0x7110, 0xd1bc, 0x0140, 0x0041, 0x0130, 0x7124,
++	0x610a, 0x2009, 0x008a, 0x080c, 0x9613, 0x0005, 0x7020, 0x2060,
++	0xac84, 0x0007, 0x1158, 0xac82, 0xce00, 0x0240, 0x2001, 0xc617,
++	0x2004, 0xac02, 0x1218, 0xa085, 0x0001, 0x0005, 0xa006, 0x0ce8,
++	0x00c6, 0x00d6, 0x00e6, 0x080c, 0x2f69, 0x1904, 0x6e07, 0x2001,
++	0xc756, 0x2004, 0xa086, 0x0000, 0x0904, 0x6e07, 0x20e1, 0x0000,
++	0x3d08, 0xa18c, 0x00ff, 0xa18e, 0x00ff, 0x1500, 0x3e00, 0xa086,
++	0xffff, 0x11e0, 0x2001, 0xc8d3, 0x2064, 0x2009, 0x00ff, 0x0006,
++	0x0016, 0x2001, 0xc61d, 0x2004, 0x20e1, 0x0001, 0x3e08, 0xa106,
++	0x1130, 0x2001, 0xc61c, 0x2004, 0x3d08, 0xa106, 0x0118, 0x001e,
++	0x000e, 0x00a8, 0x001e, 0x000e, 0x0804, 0x6e07, 0x20e1, 0x0001,
++	0x3d08, 0x3e00, 0x0156, 0x080c, 0x29c7, 0x015e, 0x15c0, 0x080c,
++	0x533d, 0x0128, 0x2001, 0xc8d3, 0x2064, 0x2009, 0x00ff, 0x2138,
++	0x873f, 0x2c00, 0x2070, 0x20e1, 0x0003, 0x3d18, 0x831f, 0xa39c,
++	0x00ff, 0x20e1, 0x2000, 0x3d00, 0xa084, 0x7000, 0xa086, 0x1000,
++	0x0120, 0x080c, 0x75ea, 0x11d8, 0x0080, 0x080c, 0x958d, 0x01b8,
++	0x20e1, 0x0002, 0x3e08, 0xd19c, 0x0118, 0x6124, 0xc19d, 0x6126,
++	0x2e00, 0x601a, 0x620a, 0x601f, 0x0009, 0x2009, 0x0101, 0x080c,
++	0x9613, 0xa085, 0x0001, 0x00ee, 0x00de, 0x00ce, 0x0005, 0xa006,
++	0x00ee, 0x00de, 0x00ce, 0x0005, 0x7110, 0xd1bc, 0x1178, 0x7024,
++	0x2060, 0xac84, 0x0007, 0x1150, 0xac82, 0xce00, 0x0238, 0x685c,
++	0xac02, 0x1220, 0x2009, 0x0051, 0x080c, 0x9613, 0x0005, 0x2031,
++	0x0105, 0x0069, 0x0005, 0x2031, 0x0206, 0x0049, 0x0005, 0x2031,
++	0x0207, 0x0029, 0x0005, 0x2031, 0x0213, 0x0009, 0x0005, 0x00c6,
++	0x00d6, 0x00f6, 0x7000, 0xa084, 0xf000, 0xa086, 0xc000, 0x05b0,
++	0x080c, 0x958d, 0x0598, 0x0066, 0x00c6, 0x0046, 0x2011, 0xcc83,
++	0x2204, 0x8211, 0x220c, 0x080c, 0x29c7, 0x1580, 0x080c, 0x52e1,
++	0x1568, 0x6612, 0x6516, 0x2c00, 0x004e, 0x00ce, 0x601a, 0x080c,
++	0xb05e, 0x080c, 0x1602, 0x01f0, 0x2d00, 0x6056, 0x6803, 0x0000,
++	0x6837, 0x0000, 0x6c3a, 0xadf8, 0x000f, 0x20a9, 0x000e, 0x2fa0,
++	0x2e98, 0x53a3, 0x006e, 0x6612, 0x6007, 0x003e, 0x601f, 0x0001,
++	0x6003, 0x0001, 0x080c, 0x79df, 0x080c, 0x7e94, 0x00fe, 0x00de,
++	0x00ce, 0x0005, 0x080c, 0x95e3, 0x006e, 0x0cc0, 0x004e, 0x00ce,
++	0x0cc8, 0x0156, 0x0046, 0x2e00, 0xa0a0, 0x000e, 0x2404, 0x2020,
++	0x8427, 0xa4a4, 0x0007, 0xd484, 0x0148, 0x20a9, 0x0003, 0x2019,
++	0xc606, 0x2011, 0xcc9b, 0x080c, 0xa103, 0x11d8, 0xd48c, 0x0148,
++	0x20a9, 0x0003, 0x2019, 0xc602, 0x2011, 0xcc9f, 0x080c, 0xa103,
++	0x1180, 0xd494, 0x0170, 0x080c, 0x7694, 0x0148, 0x20a9, 0x0008,
++	0x2019, 0xc69a, 0x2011, 0xccaa, 0x080c, 0xa118, 0x0010, 0xa085,
++	0x0001, 0x004e, 0x015e, 0x0005, 0x0156, 0x0046, 0x2e00, 0xa0a0,
++	0x000e, 0x2404, 0x2020, 0x8427, 0xa4a4, 0x0007, 0xd484, 0x0148,
++	0x20a9, 0x0003, 0x2019, 0xc606, 0x2011, 0xcc93, 0x080c, 0xa103,
++	0x11d8, 0xd48c, 0x0148, 0x20a9, 0x0003, 0x2019, 0xc602, 0x2011,
++	0xcc97, 0x080c, 0xa103, 0x1180, 0xd494, 0x0170, 0x080c, 0x7694,
++	0x0148, 0x20a9, 0x0008, 0x2019, 0xc69a, 0x2011, 0xcca2, 0x080c,
++	0xa118, 0x0010, 0xa085, 0x0001, 0x004e, 0x015e, 0x0005, 0x2071,
++	0xc93a, 0x7003, 0x0003, 0x700f, 0x0361, 0xa006, 0x701a, 0x7076,
++	0x7012, 0x7017, 0xce00, 0x7007, 0x0000, 0x7026, 0x702b, 0x8c0c,
++	0x7032, 0x7037, 0x8c6c, 0x703b, 0xffff, 0x703f, 0xffff, 0x7042,
++	0x7047, 0x4787, 0x704a, 0x705b, 0x703f, 0x2001, 0xc8e8, 0x2003,
++	0x0003, 0x2001, 0xc8ea, 0x2003, 0x0100, 0x3a00, 0xa084, 0x0005,
++	0x706e, 0x0005, 0x2071, 0xc93a, 0x1d04, 0x6f9c, 0x2091, 0x6000,
++	0x700c, 0x8001, 0x700e, 0x1518, 0x700f, 0x0361, 0x7007, 0x0001,
++	0x0126, 0x2091, 0x8000, 0x7040, 0xa00d, 0x0128, 0x8109, 0x7142,
++	0x1110, 0x7044, 0x080f, 0x00c6, 0x2061, 0xc600, 0x6034, 0x00ce,
++	0xd0cc, 0x0180, 0x3a00, 0xa084, 0x0005, 0x726c, 0xa216, 0x0150,
++	0x706e, 0x2011, 0x8043, 0x2018, 0x080c, 0x407d, 0x0018, 0x0126,
++	0x2091, 0x8000, 0x7024, 0xa00d, 0x0188, 0x7020, 0x8001, 0x7022,
++	0x1168, 0x7023, 0x0009, 0x8109, 0x7126, 0xa186, 0x03e8, 0x1110,
++	0x7028, 0x080f, 0x81ff, 0x1110, 0x7028, 0x080f, 0x7030, 0xa00d,
++	0x0180, 0x702c, 0x8001, 0x702e, 0x1160, 0x702f, 0x0009, 0x8109,
++	0x7132, 0x0128, 0xa184, 0x007f, 0x090c, 0x8cc8, 0x0010, 0x7034,
++	0x080f, 0x7038, 0xa005, 0x0118, 0x0310, 0x8001, 0x703a, 0x703c,
++	0xa005, 0x0118, 0x0310, 0x8001, 0x703e, 0x704c, 0xa00d, 0x0168,
++	0x7048, 0x8001, 0x704a, 0x1148, 0x704b, 0x0009, 0x8109, 0x714e,
++	0x1120, 0x7150, 0x714e, 0x7058, 0x080f, 0x7018, 0xa00d, 0x01d8,
++	0x0016, 0x7074, 0xa00d, 0x0158, 0x7070, 0x8001, 0x7072, 0x1138,
++	0x7073, 0x0009, 0x8109, 0x7176, 0x1110, 0x7078, 0x080f, 0x001e,
++	0x7008, 0x8001, 0x700a, 0x1138, 0x700b, 0x0009, 0x8109, 0x711a,
++	0x1110, 0x701c, 0x080f, 0x012e, 0x7004, 0x0002, 0x6fc2, 0x6fc3,
++	0x6fdb, 0x00e6, 0x2071, 0xc93a, 0x7018, 0xa005, 0x1120, 0x711a,
++	0x721e, 0x700b, 0x0009, 0x00ee, 0x0005, 0x00e6, 0x0006, 0x2071,
++	0xc93a, 0x701c, 0xa206, 0x1110, 0x701a, 0x701e, 0x000e, 0x00ee,
++	0x0005, 0x00e6, 0x2071, 0xc93a, 0x6088, 0xa102, 0x0208, 0x618a,
++	0x00ee, 0x0005, 0x0005, 0x7110, 0x080c, 0x533d, 0x1158, 0x6088,
++	0x8001, 0x0240, 0x608a, 0x1130, 0x0126, 0x2091, 0x8000, 0x080c,
++	0x7e94, 0x012e, 0x8108, 0xa182, 0x00ff, 0x0218, 0xa00e, 0x7007,
++	0x0002, 0x7112, 0x0005, 0x7014, 0x2060, 0x0126, 0x2091, 0x8000,
++	0x603c, 0xa005, 0x0128, 0x8001, 0x603e, 0x1110, 0x080c, 0xaf4c,
++	0x6014, 0xa005, 0x0518, 0x8001, 0x6016, 0x1500, 0x611c, 0xa186,
++	0x0003, 0x0130, 0xa186, 0x0006, 0x0118, 0xa186, 0x0009, 0x11a0,
++	0x6010, 0x2068, 0x6854, 0xa08a, 0x199a, 0x0270, 0xa082, 0x1999,
++	0x6856, 0xa08a, 0x199a, 0x0210, 0x2001, 0x1999, 0x8003, 0x800b,
++	0x810b, 0xa108, 0x6116, 0x0010, 0x080c, 0xaa1c, 0x012e, 0xac88,
++	0x0018, 0x7116, 0x2001, 0xfe00, 0xa102, 0x0220, 0x7017, 0xce00,
++	0x7007, 0x0000, 0x0005, 0x00e6, 0x2071, 0xc93a, 0x7027, 0x07d0,
++	0x7023, 0x0009, 0x00ee, 0x0005, 0x2001, 0xc943, 0x2003, 0x0000,
++	0x0005, 0x00e6, 0x2071, 0xc93a, 0x7132, 0x702f, 0x0009, 0x00ee,
++	0x0005, 0x2011, 0xc946, 0x2013, 0x0000, 0x0005, 0x00e6, 0x2071,
++	0xc93a, 0x711a, 0x721e, 0x700b, 0x0009, 0x00ee, 0x0005, 0x00c6,
++	0x0026, 0x7054, 0x8000, 0x7056, 0x2061, 0xc8e8, 0x6008, 0xa086,
++	0x0000, 0x0158, 0x7068, 0x6032, 0x7064, 0x602e, 0x7060, 0x602a,
++	0x705c, 0x6026, 0x2c10, 0x080c, 0x164d, 0x002e, 0x00ce, 0x0005,
++	0x0006, 0x0016, 0x00c6, 0x00d6, 0x00e6, 0x00f6, 0x080c, 0x6f0a,
++	0x00fe, 0x00ee, 0x00de, 0x00ce, 0x001e, 0x000e, 0x0005, 0x00e6,
++	0x2071, 0xc93a, 0x7176, 0x727a, 0x7073, 0x0009, 0x00ee, 0x0005,
++	0x00e6, 0x0006, 0x2071, 0xc93a, 0x7078, 0xa206, 0x1110, 0x7076,
++	0x707a, 0x000e, 0x00ee, 0x0005, 0x00c6, 0x2061, 0xc9bc, 0x00ce,
++	0x0005, 0xa184, 0x000f, 0x8003, 0x8003, 0x8003, 0xa080, 0xc9bc,
++	0x2060, 0x0005, 0x6854, 0xa08a, 0x199a, 0x0210, 0x2001, 0x1999,
++	0xa005, 0x1150, 0x00c6, 0x2061, 0xc9bc, 0x6014, 0x00ce, 0xa005,
++	0x1138, 0x2001, 0x001e, 0x0020, 0xa08e, 0xffff, 0x1108, 0xa006,
++	0x8003, 0x800b, 0x810b, 0xa108, 0x6116, 0x684c, 0xa08c, 0x00c0,
++	0xa18e, 0x00c0, 0x05e8, 0xd0b4, 0x1138, 0xd0bc, 0x1550, 0x2009,
++	0x0006, 0x080c, 0x7105, 0x0005, 0xd0fc, 0x0138, 0xa084, 0x0003,
++	0x0120, 0xa086, 0x0003, 0x1904, 0x70ff, 0x6020, 0xd0d4, 0x0130,
++	0xc0d4, 0x6022, 0x6860, 0x602a, 0x685c, 0x602e, 0x2009, 0xc674,
++	0x2104, 0xd084, 0x0138, 0x87ff, 0x1120, 0x2009, 0x0042, 0x080c,
++	0x9613, 0x0005, 0x87ff, 0x1120, 0x2009, 0x0043, 0x080c, 0x9613,
++	0x0005, 0xd0fc, 0x0130, 0xa084, 0x0003, 0x0118, 0xa086, 0x0003,
++	0x11f0, 0x87ff, 0x1120, 0x2009, 0x0042, 0x080c, 0x9613, 0x0005,
++	0xd0fc, 0x0160, 0xa084, 0x0003, 0xa08e, 0x0002, 0x0148, 0x87ff,
++	0x1120, 0x2009, 0x0041, 0x080c, 0x9613, 0x0005, 0x0061, 0x0ce8,
++	0x87ff, 0x1dd8, 0x2009, 0x0043, 0x080c, 0x9613, 0x0cb0, 0x2009,
++	0x0004, 0x0019, 0x0005, 0x2009, 0x0001, 0x00d6, 0x6010, 0xa0ec,
++	0xf000, 0x0510, 0x2068, 0x6952, 0x6800, 0x6012, 0xa186, 0x0001,
++	0x1188, 0x694c, 0xa18c, 0x8100, 0xa18e, 0x8100, 0x1158, 0x00c6,
++	0x2061, 0xc9bc, 0x6200, 0xd28c, 0x1120, 0x6204, 0x8210, 0x0208,
++	0x6206, 0x00ce, 0x080c, 0x580a, 0x6010, 0xa06d, 0x0076, 0x2039,
++	0x0000, 0x190c, 0x708a, 0x007e, 0x00de, 0x0005, 0x0156, 0x00c6,
++	0x2061, 0xc9bc, 0x6000, 0x81ff, 0x0110, 0xa205, 0x0008, 0xa204,
++	0x6002, 0x00ce, 0x015e, 0x0005, 0x6800, 0xd08c, 0x1138, 0x6808,
++	0xa005, 0x0120, 0x8001, 0x680a, 0xa085, 0x0001, 0x0005, 0x2071,
++	0xc755, 0x7003, 0x0006, 0x7007, 0x0000, 0x700f, 0x0000, 0x7013,
++	0x0001, 0x702f, 0x0006, 0x7033, 0x0001, 0x7063, 0x0000, 0x0005,
++	0x00e6, 0x2071, 0xc755, 0x6a2c, 0x721e, 0x6b30, 0x7322, 0x6834,
++	0x7026, 0x705a, 0x6838, 0x702a, 0x705e, 0x6824, 0x7016, 0x683c,
++	0x701a, 0x2009, 0x0070, 0x200a, 0xa005, 0x0150, 0x2009, 0x0000,
++	0xa188, 0x000c, 0x8001, 0x1de0, 0x2100, 0xa210, 0x1208, 0x8318,
++	0x7252, 0x7356, 0x7010, 0xc084, 0x7012, 0x7007, 0x0001, 0x700f,
++	0x0000, 0xa006, 0x00ee, 0x0005, 0x2b78, 0x2071, 0xc755, 0x7004,
++	0x004b, 0x700c, 0x0002, 0x718e, 0x7187, 0x7187, 0x0005, 0x7198,
++	0x71e9, 0x71ea, 0x71eb, 0x71ec, 0x71ff, 0x7200, 0x700c, 0x0cba,
++	0x2f00, 0xa080, 0x0070, 0x2004, 0x2f08, 0xa188, 0x0070, 0x210c,
++	0xa106, 0x0150, 0x2f00, 0xa080, 0x0070, 0x2004, 0x2f08, 0xa188,
++	0x0070, 0x210c, 0xa106, 0x15e0, 0x7018, 0xa10a, 0x1118, 0x080c,
++	0x722d, 0x04b0, 0x1210, 0x7114, 0xa10a, 0xa192, 0x000a, 0x0210,
++	0x2009, 0x000a, 0x00d6, 0x0016, 0x2001, 0xc682, 0xa080, 0x0011,
++	0x2014, 0x2001, 0xc76f, 0xa080, 0x0005, 0x2004, 0xa100, 0xa202,
++	0x001e, 0x00de, 0x0e20, 0x080c, 0x727c, 0x2200, 0xa102, 0x0208,
++	0x2208, 0x713a, 0x080c, 0x7377, 0x2100, 0x7042, 0x2001, 0x0002,
++	0x7037, 0x0000, 0x0126, 0x0006, 0x2091, 0x8000, 0x2009, 0xc959,
++	0x2104, 0xc095, 0x200a, 0x000e, 0x700e, 0x012e, 0x080c, 0x1669,
++	0x0005, 0x0005, 0x0005, 0x0005, 0x700c, 0x0002, 0x71f1, 0x71f4,
++	0x71fe, 0x080c, 0x7196, 0x0005, 0x0126, 0x8001, 0x700e, 0x7138,
++	0x0041, 0x2091, 0x8000, 0x080c, 0x7196, 0x012e, 0x0005, 0x0005,
++	0x0005, 0x7018, 0xa100, 0x7214, 0xa21a, 0x1130, 0x701c, 0x7052,
++	0x7020, 0x7056, 0xa006, 0x0068, 0x0006, 0x080c, 0x7377, 0x2100,
++	0x7250, 0xa210, 0x7252, 0x1220, 0x7054, 0xa081, 0x0000, 0x7056,
++	0x000e, 0x2f08, 0xa188, 0x0070, 0x200a, 0x701a, 0x0005, 0x00e6,
++	0x2071, 0xc755, 0x700c, 0x0002, 0x7227, 0x7227, 0x7229, 0x00ee,
++	0x0005, 0x700f, 0x0001, 0x00ee, 0x0005, 0x0126, 0x2091, 0x8000,
++	0x00d6, 0x00e6, 0x2071, 0xc76f, 0x702c, 0xa005, 0x0178, 0x2068,
++	0x6964, 0x080c, 0x727c, 0x2100, 0x2208, 0xa102, 0x0238, 0x6800,
++	0x702e, 0x080c, 0x75b9, 0x080c, 0x1629, 0x0c70, 0x00ee, 0x00de,
++	0x012e, 0x0005, 0x00e6, 0x2071, 0xc76f, 0x702c, 0x6802, 0x2d00,
++	0x702e, 0x6858, 0x7120, 0xa102, 0x0a0c, 0x1519, 0x7022, 0x685b,
++	0x0000, 0x00ee, 0x0005, 0x00d6, 0x00e6, 0x2071, 0xc76f, 0xa006,
++	0x7006, 0x700e, 0x701a, 0x701e, 0x7022, 0x7016, 0x702a, 0x7026,
++	0x702f, 0x0000, 0x080c, 0x742b, 0x0168, 0x080c, 0x745d, 0x2d00,
++	0x7002, 0x700a, 0x701a, 0x7013, 0x0001, 0x701f, 0x0007, 0x00ee,
++	0x00de, 0x0005, 0xa00e, 0x0cd8, 0x00e6, 0x00d6, 0x00c6, 0x2071,
++	0xc76f, 0x721c, 0x2100, 0xa202, 0x1618, 0x080c, 0x745d, 0x090c,
++	0x1519, 0x7018, 0xa005, 0x1160, 0x2d00, 0x7002, 0x700a, 0x701a,
++	0xa006, 0x7006, 0x700e, 0x6806, 0x6802, 0x7012, 0x701e, 0x0038,
++	0x2060, 0x6806, 0x2d00, 0x6002, 0x701a, 0x6803, 0x0000, 0x7010,
++	0x8000, 0x7012, 0x701c, 0xa080, 0x0007, 0x701e, 0x721c, 0x08d0,
++	0x721c, 0x00ce, 0x00de, 0x00ee, 0x0005, 0x0156, 0x0136, 0x0146,
++	0x00e6, 0x0126, 0x2091, 0x8000, 0x2071, 0xc76f, 0x7300, 0xa398,
++	0x0003, 0x7104, 0x080c, 0x7377, 0x810c, 0x2100, 0xa318, 0x8003,
++	0x2228, 0x2021, 0x0054, 0xa402, 0xa532, 0x0208, 0x2028, 0x2500,
++	0x8004, 0x20a8, 0x23a0, 0xe000, 0xe000, 0xe000, 0x53a5, 0x2508,
++	0x080c, 0x7380, 0x2130, 0x7014, 0xa600, 0x7016, 0x2600, 0x711c,
++	0xa102, 0x701e, 0x7004, 0xa600, 0x2008, 0xa082, 0x0007, 0x1180,
++	0x7000, 0x2004, 0xa005, 0x1140, 0x2009, 0x0001, 0x0026, 0x080c,
++	0x727c, 0x002e, 0x7000, 0x2004, 0x7002, 0x7007, 0x0000, 0x0008,
++	0x7106, 0x2500, 0xa212, 0x1910, 0x012e, 0x00ee, 0x014e, 0x013e,
++	0x015e, 0x0005, 0x0016, 0x0026, 0x00e6, 0x00d6, 0x080c, 0x7340,
++	0x15e0, 0x2170, 0x2805, 0xac68, 0x2900, 0x0002, 0x7316, 0x7316,
++	0x731a, 0x7316, 0x731a, 0x7316, 0x7316, 0x7316, 0x7316, 0x7316,
++	0x7323, 0x7316, 0x7323, 0x7316, 0x7316, 0x7316, 0x080c, 0x1519,
++	0xa005, 0x00f0, 0x7000, 0x6802, 0x7004, 0x6806, 0x7010, 0x680a,
++	0x680f, 0x0000, 0x0060, 0x7010, 0x6812, 0x6817, 0x0000, 0x7000,
++	0x6802, 0x7004, 0x6806, 0x7008, 0x680a, 0x700c, 0x680e, 0x00de,
++	0x685c, 0x8000, 0x685e, 0x6858, 0x8001, 0x685a, 0x00d6, 0xa006,
++	0x00de, 0x00ee, 0x002e, 0x001e, 0x0005, 0xa085, 0x0001, 0x0cc0,
++	0x00e6, 0x0036, 0x2071, 0xc76f, 0x7014, 0xa005, 0x0568, 0x8001,
++	0x7016, 0x7020, 0x8001, 0x7022, 0x7008, 0xa080, 0x0003, 0x710c,
++	0x2110, 0x0429, 0x810c, 0xa118, 0x8210, 0xa282, 0x0007, 0x11b0,
++	0x7008, 0x2004, 0xa005, 0x0178, 0x00d6, 0x0006, 0x7008, 0x2068,
++	0x080c, 0x746c, 0x000e, 0x2068, 0x6807, 0x0000, 0x700a, 0x00de,
++	0x7010, 0x8001, 0x7012, 0x700f, 0x0000, 0x0008, 0x720e, 0x2308,
++	0xa006, 0x003e, 0x00ee, 0x0005, 0xa085, 0x0001, 0x0cd0, 0x0006,
++	0x810b, 0x810b, 0x2100, 0x810b, 0xa100, 0x2008, 0x000e, 0x0005,
++	0x0006, 0x0026, 0x2100, 0xa005, 0x0160, 0xa092, 0x000c, 0x0248,
++	0x2009, 0x0000, 0x8108, 0xa082, 0x000c, 0x1de0, 0x002e, 0x000e,
++	0x0005, 0x2009, 0x0000, 0x0cd0, 0x2d00, 0xa0b8, 0x0008, 0x690c,
++	0x6810, 0x2019, 0x0001, 0x2031, 0x73c2, 0xa112, 0x0220, 0x0118,
++	0x8318, 0x2208, 0x0cd0, 0x6808, 0xa005, 0x0108, 0x8318, 0x233a,
++	0x6804, 0xd084, 0x2300, 0x2021, 0x0001, 0x1150, 0xa082, 0x0003,
++	0x0967, 0x0a67, 0x8420, 0xa082, 0x0007, 0x0967, 0x0a67, 0x0cd0,
++	0xa082, 0x0002, 0x0967, 0x0a67, 0x8420, 0xa082, 0x0005, 0x0967,
++	0x0a67, 0x0cd0, 0x6c1a, 0x2d00, 0xa0b8, 0x0007, 0x00e6, 0x2071,
++	0xc600, 0x7128, 0x6810, 0x2019, 0x0001, 0xa10a, 0x0118, 0x0210,
++	0x8318, 0x0cd8, 0x2031, 0x73d5, 0x0870, 0x6c16, 0x00ee, 0x0005,
++	0x00e6, 0x00c6, 0x0126, 0x2091, 0x8000, 0x2e00, 0x2060, 0x2071,
++	0xc76f, 0x2009, 0x0001, 0x0026, 0x080c, 0x727c, 0x002e, 0x7300,
++	0xa398, 0x0003, 0x7104, 0x080c, 0x7377, 0x810c, 0x2100, 0xa318,
++	0x6834, 0xa084, 0x00ff, 0xa086, 0x0024, 0x00d6, 0x2368, 0x1138,
++	0x6000, 0x6802, 0x6004, 0x6806, 0x6008, 0x6812, 0x0050, 0x6000,
++	0x6802, 0x6004, 0x6806, 0x6008, 0x680a, 0x600c, 0x680e, 0x6010,
++	0x6812, 0x00de, 0x7014, 0x8000, 0x7016, 0x711c, 0x8109, 0x711e,
++	0x7004, 0x8000, 0x2008, 0xa082, 0x0007, 0x1180, 0x7000, 0x2004,
++	0xa005, 0x1140, 0x2009, 0x0001, 0x0026, 0x080c, 0x727c, 0x002e,
++	0x7000, 0x2004, 0x7002, 0x7007, 0x0000, 0x0008, 0x7106, 0x012e,
++	0x00ce, 0x00ee, 0x0005, 0x00d6, 0x0046, 0x0126, 0x2091, 0x8000,
++	0x2001, 0xc682, 0xa080, 0x0011, 0x2004, 0x8003, 0x2020, 0x080c,
++	0x15e5, 0x01d0, 0x2d00, 0x7026, 0x6803, 0x0000, 0x6807, 0x0000,
++	0x080c, 0x15e5, 0x0188, 0x7024, 0x6802, 0x6807, 0x0000, 0x2d00,
++	0x7026, 0xa4a2, 0x0007, 0x0110, 0x0208, 0x0c90, 0xa085, 0x0001,
++	0x012e, 0x004e, 0x00de, 0x0005, 0x7024, 0xa005, 0x0dc8, 0x2068,
++	0x2024, 0x080c, 0x1619, 0x2400, 0x0cc0, 0x0126, 0x2091, 0x8000,
++	0x7024, 0x2068, 0xa005, 0x0130, 0x2004, 0x7026, 0x6803, 0x0000,
++	0x6807, 0x0000, 0x012e, 0x0005, 0x0126, 0x2091, 0x8000, 0x7024,
++	0x6802, 0x2d00, 0x7026, 0x012e, 0x0005, 0x00d6, 0x2001, 0xc778,
++	0x2004, 0xa005, 0x0138, 0x2068, 0x6800, 0x0006, 0x080c, 0x1619,
++	0x000e, 0x0cb8, 0x00de, 0x0005, 0x00d6, 0x00e6, 0x2071, 0xc76f,
++	0x7008, 0xa005, 0x0138, 0x2068, 0x6800, 0x0006, 0x080c, 0x1619,
++	0x000e, 0x0cb8, 0xa006, 0x7002, 0x700a, 0x7006, 0x700e, 0x701a,
++	0x701e, 0x7022, 0x702a, 0x7026, 0x702e, 0x00ee, 0x00de, 0x0005,
++	0x00f6, 0x00e6, 0x00d6, 0x00c6, 0x0086, 0x0046, 0x0056, 0x0026,
++	0x2031, 0x0000, 0x2001, 0xc756, 0x2004, 0xa005, 0x0904, 0x7532,
++	0x2071, 0xc682, 0x20e1, 0x0002, 0x3d08, 0xd19c, 0x0140, 0x2069,
++	0xc600, 0x6a28, 0x761c, 0x7114, 0x2041, 0x0000, 0x0028, 0x7118,
++	0x720c, 0x7620, 0x7008, 0x2040, 0x080c, 0x7627, 0x0904, 0x7532,
++	0x7004, 0xd084, 0x1128, 0x2021, 0x0024, 0x2029, 0x0002, 0x0020,
++	0x2021, 0x002c, 0x2029, 0x000a, 0x080c, 0x1602, 0x0904, 0x752a,
++	0x2d00, 0x2060, 0x6436, 0x0016, 0x20e1, 0x0001, 0x3d08, 0x3e00,
++	0xa18c, 0x00ff, 0x6142, 0x603e, 0x001e, 0x6746, 0x2700, 0xa086,
++	0xff00, 0x1118, 0x6063, 0x0000, 0x0010, 0x6063, 0x0003, 0xa006,
++	0x6002, 0x602a, 0x602e, 0x6006, 0x603a, 0x604a, 0x6052, 0x6057,
++	0x0005, 0x605e, 0x6066, 0x604e, 0x2800, 0x606a, 0x604c, 0xc0ad,
++	0x604e, 0x665a, 0x2c00, 0x2078, 0x0479, 0x607f, 0xffff, 0x6083,
++	0x0000, 0x8109, 0x0180, 0x080c, 0x1602, 0x01c0, 0x2d00, 0x7806,
++	0x2f00, 0x6802, 0x6d36, 0xa006, 0x2d00, 0x2520, 0x00e9, 0x2d00,
++	0x2078, 0x8109, 0x1d80, 0x2c00, 0xa005, 0x002e, 0x005e, 0x004e,
++	0x008e, 0x00ce, 0x00de, 0x00ee, 0x00fe, 0x0005, 0x2c00, 0x2068,
++	0x080c, 0x1629, 0x2600, 0x2071, 0xc76f, 0x7120, 0xa102, 0x0a0c,
++	0x1519, 0x7022, 0xa006, 0x0c48, 0x00d6, 0x00c6, 0x0136, 0x0146,
++	0x0156, 0x0016, 0x2068, 0x2400, 0xa084, 0x000f, 0xa080, 0x23c7,
++	0x2005, 0x2005, 0xad60, 0x2c00, 0x2d08, 0xa188, 0x0030, 0xa102,
++	0x20a8, 0x2c00, 0x20a0, 0x2001, 0xffff, 0x40a4, 0x001e, 0x015e,
++	0x014e, 0x013e, 0x00ce, 0x00de, 0x0005, 0x00c6, 0x00e6, 0x00f6,
++	0x6858, 0x2071, 0xc76f, 0x7120, 0xa102, 0x0a0c, 0x1519, 0x7022,
++	0x6960, 0x694e, 0x697c, 0x2009, 0xffff, 0x7818, 0xa102, 0xe000,
++	0x6852, 0x684b, 0x0000, 0x6868, 0xa005, 0x0118, 0x6848, 0xc085,
++	0x684a, 0x2d00, 0xa080, 0x0015, 0x2038, 0x2031, 0x0018, 0x6864,
++	0x2020, 0x683a, 0x685c, 0xa08a, 0x00ff, 0x1a0c, 0x1519, 0x2028,
++	0x2d00, 0x2060, 0x2078, 0x6934, 0xa18c, 0x000f, 0xa188, 0x23c7,
++	0x2145, 0x685c, 0x2050, 0xa005, 0x0530, 0x2805, 0xac70, 0x6834,
++	0xa084, 0x00ff, 0xa086, 0x0024, 0x1110, 0x7008, 0x0040, 0x6834,
++	0xa084, 0x00ff, 0xa086, 0x002c, 0x190c, 0x1519, 0x7010, 0x0006,
++	0x2400, 0xa005, 0x000e, 0x0168, 0x203a, 0x8738, 0x8631, 0x090c,
++	0x1519, 0x8421, 0x8529, 0x0138, 0x080c, 0x2389, 0x090c, 0x1519,
++	0x08e0, 0x080c, 0x73d8, 0x6837, 0x0023, 0x00fe, 0x00ee, 0x00ce,
++	0x0005, 0x00e6, 0x00c6, 0x00a6, 0x0086, 0x0056, 0x2d00, 0x2060,
++	0x6934, 0xa18c, 0x000f, 0xa188, 0x23c7, 0x2145, 0x685c, 0x2050,
++	0xa005, 0x01d0, 0x2028, 0x2805, 0xac70, 0x6834, 0xa084, 0x00ff,
++	0xa086, 0x0024, 0x1110, 0x7008, 0x0008, 0x7010, 0x0006, 0xa086,
++	0xffff, 0x000e, 0x0110, 0x080c, 0x73d8, 0x8529, 0x0128, 0x080c,
++	0x2389, 0x090c, 0x1519, 0x0c38, 0x005e, 0x008e, 0x00ae, 0x00ce,
++	0x00ee, 0x0005, 0x70ac, 0xa005, 0x0120, 0x2060, 0x6008, 0xa306,
++	0x0005, 0xa085, 0x0001, 0x0ce0, 0x70ac, 0x600e, 0x2c00, 0x70ae,
++	0x0005, 0x00f6, 0x00d6, 0x0036, 0x70ac, 0xa005, 0x01b8, 0x2068,
++	0x2079, 0x0000, 0x2c08, 0xa11e, 0x1118, 0x680c, 0x70ae, 0x0060,
++	0xa106, 0x0140, 0x2d00, 0x2078, 0x680c, 0xa005, 0x090c, 0x1519,
++	0x2068, 0x0cb0, 0x6b0c, 0x7b0e, 0x600f, 0x0000, 0x003e, 0x00de,
++	0x00fe, 0x0005, 0x00e6, 0x080c, 0x724a, 0x6018, 0x2070, 0xa006,
++	0x70b2, 0x70b6, 0x08b1, 0x080c, 0x95e3, 0x00ee, 0x0005, 0x00d6,
++	0x0026, 0x0016, 0x2061, 0xc76f, 0x6020, 0x6414, 0xa600, 0xa42a,
++	0x02f0, 0x6022, 0x2069, 0xc682, 0x6828, 0x6114, 0xa102, 0x1288,
++	0x685c, 0xd08c, 0x1130, 0xc08d, 0x685e, 0x2011, 0x8025, 0x080c,
++	0x407d, 0x2001, 0xc695, 0x2004, 0xa080, 0x0000, 0x200c, 0x8108,
++	0x2102, 0xa085, 0x0001, 0x001e, 0x002e, 0x00de, 0x0005, 0x2069,
++	0xc682, 0x6804, 0xd094, 0x0148, 0x685c, 0xd084, 0x1130, 0xc085,
++	0x685e, 0x2011, 0x8026, 0x080c, 0x407d, 0x2001, 0xc695, 0x2004,
++	0xa080, 0x0001, 0x200c, 0x8108, 0x2102, 0xa006, 0x2031, 0x0000,
++	0x0c10, 0x0006, 0x0016, 0x00c6, 0x6018, 0x2060, 0x6010, 0xa005,
++	0x0178, 0x2001, 0xc756, 0x2004, 0xa005, 0x0150, 0x2001, 0xc600,
++	0x2004, 0xa086, 0x0003, 0x1120, 0x2011, 0x8014, 0x080c, 0x407d,
++	0x00ce, 0x001e, 0x000e, 0x0005, 0x0016, 0x6834, 0xa08c, 0x00ff,
++	0xa186, 0x0024, 0x0110, 0xa186, 0x002c, 0x001e, 0x0005, 0x2001,
++	0xc683, 0x2004, 0xd09c, 0x0005, 0x2001, 0xc683, 0x2004, 0xd0a4,
++	0x0005, 0x0066, 0x6000, 0xa0b2, 0x0010, 0x1a0c, 0x1519, 0x0013,
++	0x006e, 0x0005, 0x76b2, 0x76b2, 0x76b2, 0x76b4, 0x770f, 0x76b2,
++	0x76b2, 0x76b2, 0x774d, 0x76b2, 0x77aa, 0x76b2, 0x76b2, 0x76b2,
++	0x76b2, 0x76b2, 0x080c, 0x1519, 0xa182, 0x0100, 0x0002, 0x76c6,
++	0x76c6, 0x76c6, 0x76c8, 0x76e1, 0x76fb, 0x76c6, 0x76c6, 0x76c6,
++	0x76c6, 0x76c6, 0x76c6, 0x76c6, 0x76c6, 0x76c6, 0x080c, 0x1519,
++	0x00d6, 0x080c, 0x7e47, 0x080c, 0x7f6e, 0x6110, 0x2168, 0x684b,
++	0x0000, 0x00d6, 0x6018, 0x2068, 0x6008, 0x68b6, 0x68bb, 0x0500,
++	0xa006, 0x68b2, 0x00de, 0x080c, 0x580a, 0x080c, 0x95e3, 0x00de,
++	0x0005, 0x080c, 0x7e47, 0x00f6, 0x00d6, 0x6110, 0x2178, 0x080c,
++	0xac91, 0x0150, 0x00e6, 0x6018, 0x2070, 0xa006, 0x70b2, 0x70b6,
++	0x00ee, 0x2f68, 0x080c, 0x580a, 0x00de, 0x00fe, 0x080c, 0x95e3,
++	0x080c, 0x7f6e, 0x0005, 0x080c, 0x7e47, 0x080c, 0x2e46, 0x00d6,
++	0x6110, 0x2168, 0x080c, 0xac91, 0x0120, 0x684b, 0x0029, 0x080c,
++	0x580a, 0x00de, 0x080c, 0x95e3, 0x080c, 0x7f6e, 0x0005, 0xa182,
++	0x0100, 0x0002, 0x7721, 0x7723, 0x772b, 0x7721, 0x7721, 0x7721,
++	0x7748, 0x7721, 0x7721, 0x7721, 0x7721, 0x7721, 0x7721, 0x7721,
++	0x7721, 0x080c, 0x1519, 0x20e1, 0x0005, 0x3d18, 0x3e20, 0x2c10,
++	0x080c, 0x1870, 0x0005, 0x00d6, 0x00e6, 0x2001, 0xc756, 0x2004,
++	0xa086, 0x0000, 0x6110, 0x1118, 0x080c, 0x1629, 0x0028, 0x2168,
++	0x080c, 0x7555, 0x080c, 0x580a, 0x6018, 0x2070, 0xa006, 0x70b2,
++	0x70b6, 0x080c, 0x75f9, 0x00ee, 0x00de, 0x080c, 0x95e3, 0x0005,
++	0x080c, 0x761a, 0x080c, 0x56c7, 0x0005, 0xa182, 0x0100, 0x0002,
++	0x7762, 0x7788, 0x7760, 0x7760, 0x7760, 0x7760, 0x7760, 0x7760,
++	0x7760, 0x7760, 0x7760, 0x7760, 0x7760, 0x7760, 0x7760, 0x7760,
++	0x080c, 0x1519, 0x00d6, 0x6003, 0x0003, 0x6106, 0x6010, 0x2068,
++	0x687c, 0x680a, 0x6880, 0x680e, 0x6813, 0x0000, 0x6817, 0x0000,
++	0x6854, 0xa092, 0x199a, 0x0210, 0x2001, 0x1999, 0x8003, 0x8013,
++	0x8213, 0xa210, 0x6216, 0x00de, 0x2c10, 0x080c, 0x2068, 0x080c,
++	0x79fc, 0x0126, 0x2091, 0x8000, 0x080c, 0x7f6e, 0x012e, 0x0005,
++	0x6003, 0x0004, 0x630a, 0x080c, 0x74a0, 0x0168, 0x6012, 0x600f,
++	0x0000, 0x080c, 0x75f4, 0x20e1, 0x0005, 0x3d18, 0x3e20, 0x2c10,
++	0x080c, 0x1870, 0x0005, 0x2011, 0x0000, 0x080c, 0x1870, 0x00e6,
++	0x6018, 0x2070, 0x70b3, 0x0000, 0x70b7, 0x0000, 0x00ee, 0x080c,
++	0x95e3, 0x0005, 0x00d6, 0x080c, 0x7e47, 0x080c, 0x7f6e, 0x6110,
++	0x2168, 0x684b, 0x0000, 0x00d6, 0x6018, 0x2068, 0x6008, 0x68b6,
++	0x68bb, 0x0500, 0xa006, 0x68b2, 0x00de, 0x080c, 0x580a, 0x080c,
++	0x95e3, 0x00de, 0x0005, 0x6000, 0xa08a, 0x0010, 0x1a0c, 0x1519,
++	0x000b, 0x0005, 0x77da, 0x77da, 0x77da, 0x77dc, 0x77f1, 0x77da,
++	0x77da, 0x77da, 0x77da, 0x77da, 0x77da, 0x77da, 0x77da, 0x77da,
++	0x77da, 0x77da, 0x080c, 0x1519, 0x080c, 0x90f6, 0x6110, 0x2168,
++	0x684b, 0x0006, 0x00d6, 0x6018, 0x2068, 0x6008, 0x68b6, 0x68bb,
++	0x0500, 0xa006, 0x68b2, 0x00de, 0x080c, 0x580a, 0x080c, 0x95e3,
++	0x0005, 0x080c, 0x761a, 0x0005, 0x6000, 0xa08a, 0x0010, 0x1a0c,
++	0x1519, 0x000b, 0x0005, 0x780b, 0x780b, 0x780b, 0x780d, 0x781d,
++	0x780b, 0x780b, 0x780b, 0x780b, 0x780b, 0x780b, 0x780b, 0x780b,
++	0x780b, 0x780b, 0x780b, 0x080c, 0x1519, 0x0036, 0x00e6, 0x2071,
++	0xc927, 0x703c, 0xac06, 0x1120, 0x2019, 0x0000, 0x080c, 0x8e79,
++	0x080c, 0x90f6, 0x00ee, 0x003e, 0x0005, 0x00d6, 0x6010, 0x2068,
++	0x080c, 0x761a, 0x00de, 0x0005, 0x080c, 0x7684, 0x1150, 0x6024,
++	0xd09c, 0x1138, 0x6810, 0x2009, 0xffff, 0xa102, 0x2020, 0x2019,
++	0x0000, 0x0005, 0x20a9, 0x0010, 0xa006, 0x8004, 0x8086, 0x818e,
++	0x1208, 0xa200, 0x1f04, 0x7836, 0x8086, 0x818e, 0x0005, 0x0156,
++	0x20a9, 0x0010, 0xa005, 0x01b8, 0xa11a, 0x12a8, 0x8213, 0x818d,
++	0x0228, 0xa11a, 0x1220, 0x1f04, 0x7846, 0x0028, 0xa11a, 0x2308,
++	0x8210, 0x1f04, 0x7846, 0x0006, 0x3200, 0xa084, 0xefff, 0x2080,
++	0x000e, 0x015e, 0x0005, 0x0006, 0x3200, 0xa085, 0x1000, 0x0cb8,
++	0x0126, 0x2091, 0x2800, 0x2079, 0xc927, 0x012e, 0x00d6, 0x2069,
++	0xc927, 0x6803, 0x0005, 0x2069, 0x0004, 0x2d04, 0xa085, 0x8001,
++	0x206a, 0x00de, 0x0005, 0x00c6, 0x6027, 0x0001, 0x7804, 0xa084,
++	0x0007, 0x0002, 0x7884, 0x78a5, 0x78f8, 0x788a, 0x78a5, 0x7884,
++	0x7882, 0x7882, 0x080c, 0x1519, 0x080c, 0x7024, 0x080c, 0x7e94,
++	0x00ce, 0x0005, 0x62c0, 0x82ff, 0x1110, 0x00ce, 0x0005, 0x2011,
++	0x4e18, 0x080c, 0x6fad, 0x7828, 0xa092, 0x00c8, 0x1228, 0x8000,
++	0x782a, 0x080c, 0x4e52, 0x0c88, 0x080c, 0x4e18, 0x7807, 0x0003,
++	0x7827, 0x0000, 0x782b, 0x0000, 0x0c40, 0x080c, 0x7024, 0x3c00,
++	0x0006, 0x2011, 0x0209, 0x20e1, 0x4000, 0x2214, 0x000e, 0x20e0,
++	0x82ff, 0x0178, 0x62c0, 0x82ff, 0x1160, 0x782b, 0x0000, 0x7824,
++	0xa065, 0x090c, 0x1519, 0x2009, 0x0013, 0x080c, 0x9613, 0x00ce,
++	0x0005, 0x3900, 0xa082, 0xca74, 0x1210, 0x080c, 0x91cb, 0x00c6,
++	0x7824, 0xa065, 0x090c, 0x1519, 0x7804, 0xa086, 0x0004, 0x0904,
++	0x7938, 0x7828, 0xa092, 0x2710, 0x1230, 0x8000, 0x782a, 0x00ce,
++	0x080c, 0x8be8, 0x0c20, 0x6104, 0xa186, 0x0003, 0x1188, 0x00e6,
++	0x2071, 0xc600, 0x70e0, 0x00ee, 0xd08c, 0x0150, 0x00c6, 0x00e6,
++	0x2061, 0x0100, 0x2071, 0xc600, 0x080c, 0x4e5b, 0x00ee, 0x00ce,
++	0x080c, 0xc59b, 0x2009, 0x0014, 0x080c, 0x9613, 0x00ce, 0x0838,
++	0x2001, 0xc943, 0x2003, 0x0000, 0x62c0, 0x82ff, 0x1160, 0x782b,
++	0x0000, 0x7824, 0xa065, 0x090c, 0x1519, 0x2009, 0x0013, 0x080c,
++	0x9667, 0x00ce, 0x0005, 0x00c6, 0x00d6, 0x3900, 0xa082, 0xca74,
++	0x1210, 0x080c, 0x91cb, 0x7824, 0xa005, 0x090c, 0x1519, 0x781c,
++	0xa06d, 0x090c, 0x1519, 0x6800, 0xc0dc, 0x6802, 0x7924, 0x2160,
++	0x080c, 0x95e3, 0x693c, 0x81ff, 0x090c, 0x1519, 0x8109, 0x693e,
++	0x6854, 0xa015, 0x0110, 0x7a1e, 0x0010, 0x7918, 0x791e, 0x7807,
++	0x0000, 0x7827, 0x0000, 0x00de, 0x00ce, 0x080c, 0x7e94, 0x0888,
++	0x6104, 0xa186, 0x0002, 0x0128, 0xa186, 0x0004, 0x0110, 0x0804,
++	0x78d1, 0x7808, 0xac06, 0x0904, 0x78d1, 0x080c, 0x7db1, 0x080c,
++	0x79df, 0x00ce, 0x080c, 0x7e94, 0x0804, 0x78bf, 0x00c6, 0x6027,
++	0x0002, 0x62c8, 0x60c4, 0xa205, 0x11a8, 0x793c, 0xa1e5, 0x0000,
++	0x0160, 0x2009, 0x0049, 0x601c, 0xa086, 0x0009, 0x1110, 0x2009,
++	0x0103, 0x080c, 0x9613, 0x00ce, 0x0005, 0x2011, 0xc946, 0x2013,
++	0x0000, 0x0cc8, 0x3908, 0xa192, 0xca74, 0x1210, 0x080c, 0x91cb,
++	0x793c, 0x81ff, 0x0d90, 0x7944, 0xa192, 0x7530, 0x12f0, 0x8108,
++	0x7946, 0x793c, 0xa188, 0x0007, 0x210c, 0xa18e, 0x0006, 0x1138,
++	0x6014, 0xa084, 0x0184, 0xa085, 0x0012, 0x6016, 0x08e0, 0x793c,
++	0xa188, 0x0007, 0x210c, 0xa18e, 0x0009, 0x0d90, 0x6014, 0xa084,
++	0x0184, 0xa085, 0x0016, 0x6016, 0x0870, 0x7848, 0xc085, 0x784a,
++	0x0850, 0x0006, 0x0016, 0x00c6, 0x0126, 0x2091, 0x8000, 0x600f,
++	0x0000, 0x2c08, 0x2061, 0xc927, 0x6020, 0x8000, 0x6022, 0x6010,
++	0xa005, 0x0148, 0xa080, 0x0003, 0x2102, 0x6112, 0x012e, 0x00ce,
++	0x001e, 0x000e, 0x0005, 0x6116, 0x6112, 0x0cc0, 0x00d6, 0x2069,
++	0xc927, 0x6000, 0xd0d4, 0x0168, 0x6820, 0x8000, 0x6822, 0xa086,
++	0x0001, 0x1110, 0x2c00, 0x681e, 0x6804, 0xa084, 0x0007, 0x0804,
++	0x7e9a, 0xc0d5, 0x6002, 0x6818, 0xa005, 0x0158, 0x6056, 0x605b,
++	0x0000, 0x0006, 0x2c00, 0x681a, 0x00de, 0x685a, 0x2069, 0xc927,
++	0x0c18, 0x6056, 0x605a, 0x2c00, 0x681a, 0x681e, 0x08e8, 0x0006,
++	0x0016, 0x00c6, 0x0126, 0x2091, 0x8000, 0x600f, 0x0000, 0x2c08,
++	0x2061, 0xc927, 0x6020, 0x8000, 0x6022, 0x6008, 0xa005, 0x0148,
++	0xa080, 0x0003, 0x2102, 0x610a, 0x012e, 0x00ce, 0x001e, 0x000e,
++	0x0005, 0x610e, 0x610a, 0x0cc0, 0x00c6, 0x600f, 0x0000, 0x2c08,
++	0x2061, 0xc927, 0x6034, 0xa005, 0x0130, 0xa080, 0x0003, 0x2102,
++	0x6136, 0x00ce, 0x0005, 0x613a, 0x6136, 0x0cd8, 0x00f6, 0x00e6,
++	0x00d6, 0x00c6, 0x0076, 0x0066, 0x0056, 0x0036, 0x0026, 0x0016,
++	0x0006, 0x0126, 0xa02e, 0x2071, 0xc927, 0x7638, 0x2660, 0x2678,
++	0x2091, 0x8000, 0x8cff, 0x0904, 0x7a87, 0x6018, 0xa080, 0x0028,
++	0x2004, 0xa206, 0x1904, 0x7a82, 0x87ff, 0x0120, 0x6050, 0xa106,
++	0x1904, 0x7a82, 0x703c, 0xac06, 0x1190, 0x0036, 0x2019, 0x0001,
++	0x080c, 0x8e79, 0x7033, 0x0000, 0x703f, 0x0000, 0x7043, 0x0000,
++	0x7047, 0x0000, 0x704b, 0x0000, 0x003e, 0x2029, 0x0001, 0x7038,
++	0xac36, 0x1110, 0x660c, 0x763a, 0x7034, 0xac36, 0x1140, 0x2c00,
++	0xaf36, 0x0118, 0x2f00, 0x7036, 0x0010, 0x7037, 0x0000, 0x660c,
++	0x0066, 0x2c00, 0xaf06, 0x0110, 0x7e0e, 0x0008, 0x2678, 0x600f,
++	0x0000, 0x080c, 0xac91, 0x01c8, 0x6010, 0x2068, 0x601c, 0xa086,
++	0x0003, 0x1580, 0x6837, 0x0103, 0x6b4a, 0x6847, 0x0000, 0x0016,
++	0x0036, 0x0076, 0x080c, 0xaf03, 0x080c, 0xc4d7, 0x080c, 0x580a,
++	0x007e, 0x003e, 0x001e, 0x080c, 0xae48, 0x080c, 0xae54, 0x00ce,
++	0x0804, 0x7a22, 0x2c78, 0x600c, 0x2060, 0x0804, 0x7a22, 0x85ff,
++	0x0120, 0x0036, 0x080c, 0x7f6e, 0x003e, 0x012e, 0x000e, 0x001e,
++	0x002e, 0x003e, 0x005e, 0x006e, 0x007e, 0x00ce, 0x00de, 0x00ee,
++	0x00fe, 0x0005, 0x601c, 0xa086, 0x0006, 0x0158, 0x601c, 0xa086,
++	0x0009, 0x1190, 0x684b, 0x0006, 0x080c, 0x580a, 0x080c, 0x95e3,
++	0x08b0, 0x0016, 0x0036, 0x0076, 0x080c, 0xc4d7, 0x080c, 0xc141,
++	0x007e, 0x003e, 0x001e, 0x0848, 0x601c, 0xa086, 0x000a, 0x0904,
++	0x7a6c, 0x0804, 0x7a6a, 0x0006, 0x0066, 0x00c6, 0x00d6, 0x00f6,
++	0x2031, 0x0000, 0x0126, 0x2091, 0x8000, 0x2079, 0xc927, 0x7838,
++	0xa065, 0x0568, 0x600c, 0x0006, 0x600f, 0x0000, 0x783c, 0xac06,
++	0x1180, 0x0036, 0x2019, 0x0001, 0x080c, 0x8e79, 0x7833, 0x0000,
++	0x783f, 0x0000, 0x7843, 0x0000, 0x7847, 0x0000, 0x784b, 0x0000,
++	0x003e, 0x080c, 0xac91, 0x0178, 0x6010, 0x2068, 0x601c, 0xa086,
++	0x0003, 0x11b0, 0x6837, 0x0103, 0x6b4a, 0x6847, 0x0000, 0x080c,
++	0x580a, 0x080c, 0xae48, 0x080c, 0xae54, 0x000e, 0x0888, 0x7e3a,
++	0x7e36, 0x012e, 0x00fe, 0x00de, 0x00ce, 0x006e, 0x000e, 0x0005,
++	0x601c, 0xa086, 0x0006, 0x0150, 0x601c, 0xa086, 0x0009, 0x1148,
++	0x6b4a, 0x080c, 0x580a, 0x080c, 0x95e3, 0x0c38, 0x080c, 0xc141,
++	0x0c10, 0x601c, 0xa086, 0x000a, 0x09b8, 0x08a0, 0x0016, 0x0026,
++	0x0086, 0x2041, 0x0000, 0x0099, 0x080c, 0x7be4, 0x008e, 0x002e,
++	0x001e, 0x0005, 0x00f6, 0x0126, 0x2079, 0xc927, 0x2091, 0x8000,
++	0x080c, 0x7c71, 0x080c, 0x7ce3, 0x012e, 0x00fe, 0x0005, 0x00f6,
++	0x00e6, 0x00d6, 0x00c6, 0x0066, 0x0016, 0x0006, 0x0126, 0x2091,
++	0x8000, 0x2071, 0xc927, 0x7614, 0x2660, 0x2678, 0x8cff, 0x0904,
++	0x7bba, 0x6018, 0xa080, 0x0028, 0x2004, 0xa206, 0x1904, 0x7bb5,
++	0x88ff, 0x0120, 0x6050, 0xa106, 0x1904, 0x7bb5, 0x7024, 0xac06,
++	0x1538, 0x2069, 0x0100, 0x68c0, 0xa005, 0x01f0, 0x080c, 0x7024,
++	0x080c, 0x8bf5, 0x68c3, 0x0000, 0x080c, 0x90e6, 0x7027, 0x0000,
++	0x0036, 0x2069, 0x0140, 0x6b04, 0xa384, 0x1000, 0x0120, 0x6803,
++	0x0100, 0x6803, 0x0000, 0x2069, 0x0100, 0x6824, 0xd084, 0x0110,
++	0x6827, 0x0001, 0x003e, 0x0020, 0x6003, 0x0009, 0x630a, 0x04e8,
++	0x7014, 0xac36, 0x1110, 0x660c, 0x7616, 0x7010, 0xac36, 0x1140,
++	0x2c00, 0xaf36, 0x0118, 0x2f00, 0x7012, 0x0010, 0x7013, 0x0000,
++	0x660c, 0x0066, 0x2c00, 0xaf06, 0x0110, 0x7e0e, 0x0008, 0x2678,
++	0x600f, 0x0000, 0x6010, 0x2068, 0x080c, 0xac91, 0x01b8, 0x601c,
++	0xa086, 0x0003, 0x1540, 0x6837, 0x0103, 0x6b4a, 0x6847, 0x0000,
++	0x0016, 0x0036, 0x0086, 0x080c, 0xaf03, 0x080c, 0xc4d7, 0x080c,
++	0x580a, 0x008e, 0x003e, 0x001e, 0x080c, 0xae48, 0x080c, 0xae54,
++	0x080c, 0x8fb7, 0x00ce, 0x0804, 0x7b3e, 0x2c78, 0x600c, 0x2060,
++	0x0804, 0x7b3e, 0x012e, 0x000e, 0x001e, 0x006e, 0x00ce, 0x00de,
++	0x00ee, 0x00fe, 0x0005, 0x601c, 0xa086, 0x0006, 0x1158, 0x0016,
++	0x0036, 0x0086, 0x080c, 0xc4d7, 0x080c, 0xc141, 0x008e, 0x003e,
++	0x001e, 0x08e0, 0x601c, 0xa086, 0x0002, 0x1128, 0x6004, 0xa086,
++	0x0085, 0x0908, 0x0898, 0x601c, 0xa086, 0x0005, 0x1978, 0x6004,
++	0xa086, 0x0085, 0x0d20, 0x0850, 0x00c6, 0x0006, 0x0126, 0x2091,
++	0x8000, 0xa280, 0xc77b, 0x2004, 0xa065, 0x0904, 0x7c6d, 0x00f6,
++	0x00e6, 0x00d6, 0x0066, 0x2071, 0xc927, 0x6654, 0x7018, 0xac06,
++	0x1108, 0x761a, 0x701c, 0xac06, 0x1130, 0x86ff, 0x1118, 0x7018,
++	0x701e, 0x0008, 0x761e, 0x6058, 0xa07d, 0x0108, 0x7e56, 0xa6ed,
++	0x0000, 0x0110, 0x2f00, 0x685a, 0x6057, 0x0000, 0x605b, 0x0000,
++	0x6000, 0xc0d4, 0xc0dc, 0x6002, 0x080c, 0x5268, 0x0904, 0x7c69,
++	0x7624, 0x86ff, 0x05e8, 0xa680, 0x0004, 0x2004, 0xad06, 0x15c0,
++	0x00d6, 0x2069, 0x0100, 0x68c0, 0xa005, 0x0548, 0x080c, 0x7024,
++	0x080c, 0x8bf5, 0x68c3, 0x0000, 0x080c, 0x90e6, 0x7027, 0x0000,
++	0x0036, 0x2069, 0x0140, 0x6b04, 0xa384, 0x1000, 0x0120, 0x6803,
++	0x0100, 0x6803, 0x0000, 0x2069, 0x0100, 0x6824, 0xd084, 0x0110,
++	0x6827, 0x0001, 0x003e, 0x00de, 0x00c6, 0x603c, 0xa005, 0x0110,
++	0x8001, 0x603e, 0x2660, 0x080c, 0xae54, 0x00ce, 0x0048, 0x00de,
++	0x00c6, 0x2660, 0x6003, 0x0009, 0x630a, 0x00ce, 0x0804, 0x7c14,
++	0x8dff, 0x0158, 0x6837, 0x0103, 0x6b4a, 0x6847, 0x0000, 0x080c,
++	0xaf03, 0x080c, 0xc4d7, 0x080c, 0x580a, 0x080c, 0x8fb7, 0x0804,
++	0x7c14, 0x006e, 0x00de, 0x00ee, 0x00fe, 0x012e, 0x000e, 0x00ce,
++	0x0005, 0x0006, 0x0066, 0x00c6, 0x00d6, 0x2031, 0x0000, 0x7814,
++	0xa065, 0x0904, 0x7cc3, 0x600c, 0x0006, 0x600f, 0x0000, 0x7824,
++	0xac06, 0x1540, 0x2069, 0x0100, 0x68c0, 0xa005, 0x01f0, 0x080c,
++	0x7024, 0x080c, 0x8bf5, 0x68c3, 0x0000, 0x080c, 0x90e6, 0x7827,
++	0x0000, 0x0036, 0x2069, 0x0140, 0x6b04, 0xa384, 0x1000, 0x0120,
++	0x6803, 0x0100, 0x6803, 0x0000, 0x2069, 0x0100, 0x6824, 0xd084,
++	0x0110, 0x6827, 0x0001, 0x003e, 0x0028, 0x6003, 0x0009, 0x630a,
++	0x2c30, 0x00b0, 0x6010, 0x2068, 0x080c, 0xac91, 0x0168, 0x601c,
++	0xa086, 0x0003, 0x11b8, 0x6837, 0x0103, 0x6b4a, 0x6847, 0x0000,
++	0x080c, 0x580a, 0x080c, 0xae48, 0x080c, 0xae54, 0x080c, 0x8fb7,
++	0x000e, 0x0804, 0x7c78, 0x7e16, 0x7e12, 0x00de, 0x00ce, 0x006e,
++	0x000e, 0x0005, 0x601c, 0xa086, 0x0006, 0x1118, 0x080c, 0xc141,
++	0x0c58, 0x601c, 0xa086, 0x0002, 0x1128, 0x6004, 0xa086, 0x0085,
++	0x09d0, 0x0c10, 0x601c, 0xa086, 0x0005, 0x19f0, 0x6004, 0xa086,
++	0x0085, 0x0d60, 0x08c8, 0x0006, 0x0066, 0x00c6, 0x00d6, 0x7818,
++	0xa065, 0x0904, 0x7d49, 0x6054, 0x0006, 0x6057, 0x0000, 0x605b,
++	0x0000, 0x6000, 0xc0d4, 0xc0dc, 0x6002, 0x080c, 0x5268, 0x0904,
++	0x7d46, 0x7e24, 0x86ff, 0x05e8, 0xa680, 0x0004, 0x2004, 0xad06,
++	0x15c0, 0x00d6, 0x2069, 0x0100, 0x68c0, 0xa005, 0x0548, 0x080c,
++	0x7024, 0x080c, 0x8bf5, 0x68c3, 0x0000, 0x080c, 0x90e6, 0x7827,
++	0x0000, 0x0036, 0x2069, 0x0140, 0x6b04, 0xa384, 0x1000, 0x0120,
++	0x6803, 0x0100, 0x6803, 0x0000, 0x2069, 0x0100, 0x6824, 0xd084,
++	0x0110, 0x6827, 0x0001, 0x003e, 0x00de, 0x00c6, 0x603c, 0xa005,
++	0x0110, 0x8001, 0x603e, 0x2660, 0x080c, 0xae54, 0x00ce, 0x0048,
++	0x00de, 0x00c6, 0x2660, 0x6003, 0x0009, 0x630a, 0x00ce, 0x0804,
++	0x7cf5, 0x8dff, 0x0138, 0x6837, 0x0103, 0x6b4a, 0x6847, 0x0000,
++	0x080c, 0x580a, 0x080c, 0x8fb7, 0x0804, 0x7cf5, 0x000e, 0x0804,
++	0x7ce8, 0x781e, 0x781a, 0x00de, 0x00ce, 0x006e, 0x000e, 0x0005,
++	0x00e6, 0x00d6, 0x0066, 0x6000, 0xd0dc, 0x01a0, 0x604c, 0xa06d,
++	0x0188, 0x6848, 0xa606, 0x1170, 0x2071, 0xc927, 0x7024, 0xa035,
++	0x0148, 0xa080, 0x0004, 0x2004, 0xad06, 0x1120, 0x6000, 0xc0dc,
++	0x6002, 0x0021, 0x006e, 0x00de, 0x00ee, 0x0005, 0x00f6, 0x2079,
++	0x0100, 0x78c0, 0xa005, 0x1138, 0x00c6, 0x2660, 0x6003, 0x0009,
++	0x630a, 0x00ce, 0x04a0, 0x080c, 0x8bf5, 0x78c3, 0x0000, 0x080c,
++	0x90e6, 0x7027, 0x0000, 0x0036, 0x2079, 0x0140, 0x7b04, 0xa384,
++	0x1000, 0x0120, 0x7803, 0x0100, 0x7803, 0x0000, 0x2079, 0x0100,
++	0x7824, 0xd084, 0x0110, 0x7827, 0x0001, 0x080c, 0x90e6, 0x003e,
++	0x080c, 0x5268, 0x00c6, 0x603c, 0xa005, 0x0110, 0x8001, 0x603e,
++	0x2660, 0x080c, 0x95e3, 0x00ce, 0x6837, 0x0103, 0x6b4a, 0x6847,
++	0x0000, 0x080c, 0xaf03, 0x080c, 0x580a, 0x080c, 0x8fb7, 0x00fe,
++	0x0005, 0x00e6, 0x00c6, 0x2071, 0xc927, 0x7004, 0xa084, 0x0007,
++	0x0002, 0x7dc3, 0x7dc6, 0x7ddc, 0x7df5, 0x7e32, 0x7dc3, 0x7dc1,
++	0x7dc1, 0x080c, 0x1519, 0x00ce, 0x00ee, 0x0005, 0x7024, 0xa065,
++	0x0148, 0x7020, 0x8001, 0x7022, 0x600c, 0xa015, 0x0150, 0x7216,
++	0x600f, 0x0000, 0x7007, 0x0000, 0x7027, 0x0000, 0x00ce, 0x00ee,
++	0x0005, 0x7216, 0x7212, 0x0cb0, 0x6018, 0x2060, 0x080c, 0x5268,
++	0x6000, 0xc0dc, 0x6002, 0x7020, 0x8001, 0x7022, 0x0120, 0x6054,
++	0xa015, 0x0140, 0x721e, 0x7007, 0x0000, 0x7027, 0x0000, 0x00ce,
++	0x00ee, 0x0005, 0x7218, 0x721e, 0x0cb0, 0x7024, 0xa065, 0x05b8,
++	0x700c, 0xac06, 0x1160, 0x080c, 0x8fb7, 0x600c, 0xa015, 0x0120,
++	0x720e, 0x600f, 0x0000, 0x0448, 0x720e, 0x720a, 0x0430, 0x7014,
++	0xac06, 0x1160, 0x080c, 0x8fb7, 0x600c, 0xa015, 0x0120, 0x7216,
++	0x600f, 0x0000, 0x00d0, 0x7216, 0x7212, 0x00b8, 0x601c, 0xa086,
++	0x0003, 0x1198, 0x6018, 0x2060, 0x080c, 0x5268, 0x6000, 0xc0dc,
++	0x6002, 0x080c, 0x8fb7, 0x701c, 0xa065, 0x0138, 0x6054, 0xa015,
++	0x0110, 0x721e, 0x0010, 0x7218, 0x721e, 0x7027, 0x0000, 0x00ce,
++	0x00ee, 0x0005, 0x7024, 0xa065, 0x0140, 0x080c, 0x8fb7, 0x600c,
++	0xa015, 0x0150, 0x720e, 0x600f, 0x0000, 0x080c, 0x90e6, 0x7027,
++	0x0000, 0x00ce, 0x00ee, 0x0005, 0x720e, 0x720a, 0x0cb0, 0x00d6,
++	0x2069, 0xc927, 0x6830, 0xa084, 0x0003, 0x0002, 0x7e54, 0x7e56,
++	0x7e7a, 0x7e52, 0x080c, 0x1519, 0x00de, 0x0005, 0x00c6, 0x6840,
++	0xa086, 0x0001, 0x01b8, 0x683c, 0xa065, 0x0130, 0x600c, 0xa015,
++	0x0170, 0x6a3a, 0x600f, 0x0000, 0x6833, 0x0000, 0x683f, 0x0000,
++	0x2011, 0xc946, 0x2013, 0x0000, 0x00ce, 0x00de, 0x0005, 0x683a,
++	0x6836, 0x0c90, 0x6843, 0x0000, 0x6838, 0xa065, 0x0d68, 0x6003,
++	0x0003, 0x0c50, 0x00c6, 0x6843, 0x0000, 0x6847, 0x0000, 0x684b,
++	0x0000, 0x683c, 0xa065, 0x0168, 0x600c, 0xa015, 0x0130, 0x6a3a,
++	0x600f, 0x0000, 0x683f, 0x0000, 0x0020, 0x683f, 0x0000, 0x683a,
++	0x6836, 0x00ce, 0x00de, 0x0005, 0x00d6, 0x2069, 0xc927, 0x6804,
++	0xa084, 0x0007, 0x0006, 0xa005, 0x11c8, 0x2001, 0xc635, 0x2004,
++	0xa084, 0x0028, 0x1198, 0x2001, 0xc8e5, 0x2004, 0xa086, 0xaaaa,
++	0x0168, 0x2001, 0xc696, 0x2004, 0xd08c, 0x1118, 0xd084, 0x1118,
++	0x0028, 0x080c, 0x7f6e, 0x000e, 0x00de, 0x0005, 0x000e, 0x0002,
++	0x7ec2, 0x7f5e, 0x7f5e, 0x7f5e, 0x7f5e, 0x7f60, 0x7ec0, 0x7ec0,
++	0x080c, 0x1519, 0x6820, 0xa005, 0x1110, 0x00de, 0x0005, 0x00c6,
++	0x680c, 0xa065, 0x0150, 0x6807, 0x0004, 0x6826, 0x682b, 0x0000,
++	0x080c, 0x7ff0, 0x00ce, 0x00de, 0x0005, 0x6814, 0xa065, 0x0150,
++	0x6807, 0x0001, 0x6826, 0x682b, 0x0000, 0x080c, 0x7ff0, 0x00ce,
++	0x00de, 0x0005, 0x00e6, 0x0036, 0x6a1c, 0xa2f5, 0x0000, 0x0904,
++	0x7f5a, 0x704c, 0xa00d, 0x0118, 0x7088, 0xa005, 0x01a0, 0x7054,
++	0xa075, 0x0120, 0xa20e, 0x0904, 0x7f5a, 0x0028, 0x6818, 0xa20e,
++	0x0904, 0x7f5a, 0x2070, 0x704c, 0xa00d, 0x0d88, 0x7088, 0xa005,
++	0x1d70, 0x2e00, 0x681e, 0x733c, 0x7038, 0xa302, 0x1e40, 0x080c,
++	0x95ba, 0x0904, 0x7f5a, 0x8318, 0x733e, 0x6112, 0x2e10, 0x621a,
++	0xa180, 0x0014, 0x2004, 0xa084, 0x00ff, 0x605a, 0xa180, 0x0014,
++	0x2003, 0x0000, 0xa180, 0x0015, 0x2004, 0xa08a, 0x199a, 0x0210,
++	0x2001, 0x1999, 0x8003, 0x801b, 0x831b, 0xa318, 0x6316, 0x003e,
++	0x00f6, 0x2c78, 0x71a0, 0x2001, 0xc635, 0x2004, 0xd0ac, 0x1110,
++	0xd1bc, 0x0150, 0x7100, 0xd1f4, 0x0120, 0x7114, 0xa18c, 0x00ff,
++	0x0040, 0x2009, 0x0000, 0x0028, 0xa1e0, 0x2f6e, 0x2c0d, 0xa18c,
++	0x00ff, 0x2061, 0x0100, 0x619a, 0x080c, 0x8620, 0x7300, 0xc3dd,
++	0x7302, 0x6807, 0x0002, 0x2f18, 0x6b26, 0x682b, 0x0000, 0x781f,
++	0x0003, 0x7803, 0x0001, 0x7807, 0x0040, 0x00fe, 0x00ee, 0x00ce,
++	0x00de, 0x0005, 0x003e, 0x00ee, 0x00ce, 0x0cd0, 0x00de, 0x0005,
++	0x00c6, 0x680c, 0xa065, 0x0138, 0x6807, 0x0004, 0x6826, 0x682b,
++	0x0000, 0x080c, 0x7ff0, 0x00ce, 0x00de, 0x0005, 0x00f6, 0x00d6,
++	0x2069, 0xc927, 0x6830, 0xa086, 0x0000, 0x1904, 0x7fcb, 0x2001,
++	0xc60c, 0x200c, 0xd1bc, 0x1904, 0x7fe6, 0x6838, 0xa07d, 0x0904,
++	0x7fcb, 0x2001, 0xc635, 0x2004, 0xa084, 0x0028, 0x11f8, 0x2001,
++	0xc8e5, 0x2004, 0xa086, 0xaaaa, 0x01c8, 0x781c, 0xa086, 0x0009,
++	0x11a8, 0x7808, 0xd0fc, 0x0190, 0x2001, 0xc928, 0x2004, 0xa005,
++	0x1138, 0x2001, 0xc696, 0x200c, 0xc185, 0xc18c, 0x2102, 0x0030,
++	0x2011, 0xc696, 0x2204, 0xc08d, 0x2012, 0x0428, 0x2f00, 0x6833,
++	0x0001, 0x683e, 0x6847, 0x0000, 0x684b, 0x0000, 0x0126, 0x00f6,
++	0x2091, 0x2400, 0x002e, 0x080c, 0x20ef, 0x11c0, 0x012e, 0xe000,
++	0xe000, 0xe000, 0x6a3c, 0x2278, 0x781c, 0xa086, 0x0009, 0x1148,
++	0x7808, 0xd0fc, 0x0118, 0x080c, 0x8969, 0x0028, 0x080c, 0x89e2,
++	0x0010, 0x080c, 0x8a66, 0x00de, 0x00fe, 0x0005, 0x012e, 0xe000,
++	0x6843, 0x0000, 0x781c, 0xa086, 0x0009, 0x0110, 0x7803, 0x0002,
++	0x780c, 0xa015, 0x0140, 0x6a3a, 0x780f, 0x0000, 0x6833, 0x0000,
++	0x683f, 0x0000, 0x0c40, 0x683a, 0x6836, 0x0cc0, 0xc1bc, 0x2102,
++	0x0066, 0x2031, 0x0001, 0x080c, 0x5fa4, 0x006e, 0x0804, 0x7f7d,
++	0x601c, 0xa084, 0x000f, 0x000b, 0x0005, 0x7ffe, 0x8003, 0x84c1,
++	0x85dd, 0x8003, 0x84c1, 0x85dd, 0x7ffe, 0x8003, 0x080c, 0x7db1,
++	0x080c, 0x7e94, 0x0005, 0x0156, 0x0136, 0x0146, 0x00c6, 0x00f6,
++	0x6004, 0xa08a, 0x0080, 0x1a0c, 0x1519, 0x6118, 0x2178, 0x79a0,
++	0x2011, 0xc635, 0x2214, 0xd2ac, 0x1110, 0xd1bc, 0x0150, 0x7900,
++	0xd1f4, 0x0120, 0x7914, 0xa18c, 0x00ff, 0x0040, 0x2009, 0x0000,
++	0x0028, 0xa1f8, 0x2f6e, 0x2f0d, 0xa18c, 0x00ff, 0x2c78, 0x2061,
++	0x0100, 0x619a, 0xa08a, 0x0040, 0x1a04, 0x8077, 0x0033, 0x00fe,
++	0x00ce, 0x014e, 0x013e, 0x015e, 0x0005, 0x8126, 0x8171, 0x819e,
++	0x826b, 0x8299, 0x82a1, 0x82c7, 0x82d8, 0x82e9, 0x82f1, 0x8307,
++	0x82f1, 0x8368, 0x82d8, 0x8389, 0x8391, 0x82e9, 0x8391, 0x83a2,
++	0x8075, 0x8075, 0x8075, 0x8075, 0x8075, 0x8075, 0x8075, 0x8075,
++	0x8075, 0x8075, 0x8075, 0x8d1a, 0x8d3f, 0x8d54, 0x8d77, 0x8d98,
++	0x82c7, 0x8075, 0x82c7, 0x82f1, 0x8075, 0x819e, 0x826b, 0x8075,
++	0x91e8, 0x82f1, 0x8075, 0x9208, 0x82f1, 0x8075, 0x82e9, 0x811f,
++	0x808a, 0x8075, 0x922d, 0x92a2, 0x9379, 0x8075, 0x938a, 0x82c2,
++	0x93a6, 0x8075, 0x8dad, 0x9401, 0x8075, 0x080c, 0x1519, 0x2100,
++	0x0033, 0x00fe, 0x00ce, 0x014e, 0x013e, 0x015e, 0x0005, 0x9458,
++	0x9507, 0x8088, 0x80be, 0x80dc, 0x80f2, 0x8088, 0x82c7, 0x8088,
++	0x080c, 0x1519, 0x00d6, 0x20a1, 0x020b, 0x080c, 0x83bf, 0x7810,
++	0x2068, 0x20a3, 0x2414, 0x20a3, 0x0018, 0x20a3, 0x0800, 0x683c,
++	0x20a2, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3,
++	0x0000, 0x6850, 0x20a2, 0x6854, 0x20a2, 0x20a3, 0x0000, 0x20a3,
++	0x0000, 0x60c3, 0x0018, 0x080c, 0x8be2, 0x00de, 0x0005, 0x00d6,
++	0x7818, 0x2068, 0x68a0, 0x2069, 0xc600, 0x6ad4, 0xd2ac, 0x1110,
++	0xd0bc, 0x0110, 0xa085, 0x0001, 0x00de, 0x0005, 0x00d6, 0x20a1,
++	0x020b, 0x080c, 0x83bf, 0x20a3, 0x0500, 0x20a3, 0x0000, 0x7810,
++	0xa0e8, 0x000f, 0x6808, 0x20a2, 0x680c, 0x20a2, 0x6810, 0x20a2,
++	0x6814, 0x20a2, 0x6818, 0x20a2, 0x681c, 0x20a2, 0x60c3, 0x0010,
++	0x080c, 0x8be2, 0x00de, 0x0005, 0x0156, 0x0146, 0x20a1, 0x020b,
++	0x080c, 0x83bf, 0x20a3, 0x7800, 0x20a3, 0x0000, 0x7808, 0x8007,
++	0x20a2, 0x20a3, 0x0000, 0x60c3, 0x0008, 0x080c, 0x8be2, 0x014e,
++	0x015e, 0x0005, 0x0156, 0x0146, 0x20a1, 0x020b, 0x080c, 0x845b,
++	0x20a3, 0x0200, 0x20a3, 0x0000, 0x20a3, 0xdf10, 0x20a3, 0x0034,
++	0x2099, 0xc605, 0x20a9, 0x0004, 0x53a6, 0x2099, 0xc601, 0x20a9,
++	0x0004, 0x53a6, 0x2099, 0xc90d, 0x20a9, 0x001a, 0x3304, 0x8007,
++	0x20a2, 0x9398, 0x1f04, 0x810e, 0x20a3, 0x0000, 0x20a3, 0x0000,
++	0x60c3, 0x004c, 0x080c, 0x8be2, 0x014e, 0x015e, 0x0005, 0x2001,
++	0xc615, 0x2004, 0x609a, 0x080c, 0x8be2, 0x0005, 0x20a1, 0x020b,
++	0x080c, 0x83bf, 0x20a3, 0x5200, 0x20a3, 0x0000, 0x00d6, 0x2069,
++	0xc652, 0x6804, 0xd084, 0x0150, 0x6828, 0x20a3, 0x0000, 0x0016,
++	0x080c, 0x29db, 0x21a2, 0x001e, 0x00de, 0x0028, 0x00de, 0x20a3,
++	0x0000, 0x20a3, 0x0000, 0x20a9, 0x0004, 0x2099, 0xc605, 0x53a6,
++	0x20a9, 0x0004, 0x2099, 0xc601, 0x53a6, 0x2001, 0xc635, 0x2004,
++	0xd0ac, 0x1138, 0x7818, 0xa080, 0x0028, 0x2004, 0xa082, 0x007f,
++	0x0238, 0x2001, 0xc61c, 0x20a6, 0x2001, 0xc61d, 0x20a6, 0x0040,
++	0x20a3, 0x0000, 0x2001, 0xc615, 0x2004, 0xa084, 0x00ff, 0x20a2,
++	0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x001c, 0x080c, 0x8be2,
++	0x0005, 0x20a1, 0x020b, 0x080c, 0x83bf, 0x20a3, 0x0500, 0x20a3,
++	0x0000, 0x2001, 0xc635, 0x2004, 0xd0ac, 0x1138, 0x7818, 0xa080,
++	0x0028, 0x2004, 0xa082, 0x007f, 0x0238, 0x2001, 0xc61c, 0x20a6,
++	0x2001, 0xc61d, 0x20a6, 0x0040, 0x20a3, 0x0000, 0x2001, 0xc615,
++	0x2004, 0xa084, 0x00ff, 0x20a2, 0x20a9, 0x0004, 0x2099, 0xc605,
++	0x53a6, 0x60c3, 0x0010, 0x080c, 0x8be2, 0x0005, 0x20a1, 0x020b,
++	0x080c, 0x83bf, 0x00c6, 0x7818, 0x2060, 0x2001, 0x0000, 0x080c,
++	0x5715, 0x00ce, 0x7818, 0xa080, 0x0028, 0x2004, 0xa086, 0x007e,
++	0x1130, 0x20a3, 0x0400, 0x620c, 0xc2b4, 0x620e, 0x0010, 0x20a3,
++	0x0300, 0x20a3, 0x0000, 0x7818, 0xa080, 0x0028, 0x2004, 0xa086,
++	0x007e, 0x1904, 0x822d, 0x2001, 0xc635, 0x2004, 0xd0a4, 0x01c8,
++	0x2099, 0xc8d5, 0x33a6, 0x9398, 0x20a3, 0x0000, 0x9398, 0x3304,
++	0xa084, 0x2000, 0x20a2, 0x9398, 0x33a6, 0x9398, 0x20a3, 0x0000,
++	0x9398, 0x2001, 0x2710, 0x20a2, 0x9398, 0x33a6, 0x9398, 0x33a6,
++	0x00d0, 0x2099, 0xc8d5, 0x33a6, 0x9398, 0x33a6, 0x9398, 0x3304,
++	0x080c, 0x5f22, 0x1118, 0xa084, 0x37ff, 0x0010, 0xa084, 0x3fff,
++	0x20a2, 0x9398, 0x33a6, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3,
++	0x0000, 0x20a3, 0x0000, 0x20a9, 0x0004, 0x2099, 0xc605, 0x53a6,
++	0x20a9, 0x0004, 0x2099, 0xc601, 0x53a6, 0x20a9, 0x0008, 0x20a3,
++	0x0000, 0x1f04, 0x8207, 0x20a9, 0x0008, 0x20a3, 0x0000, 0x1f04,
++	0x820d, 0x2099, 0xc8dd, 0x3304, 0xc0dd, 0x20a2, 0x2001, 0xc672,
++	0x2004, 0xd0e4, 0x0158, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x9398,
++	0x9398, 0x9398, 0x33a6, 0x20a9, 0x0004, 0x0010, 0x20a9, 0x0007,
++	0x20a3, 0x0000, 0x1f04, 0x8228, 0x0468, 0x2001, 0xc635, 0x2004,
++	0xd0a4, 0x0140, 0x2001, 0xc8d6, 0x2004, 0x60e3, 0x0000, 0x080c,
++	0x2a1c, 0x60e2, 0x2099, 0xc8d5, 0x20a9, 0x0008, 0x53a6, 0x20a9,
++	0x0004, 0x2099, 0xc605, 0x53a6, 0x20a9, 0x0004, 0x2099, 0xc601,
++	0x53a6, 0x20a9, 0x0008, 0x20a3, 0x0000, 0x1f04, 0x824b, 0x20a9,
++	0x0008, 0x20a3, 0x0000, 0x1f04, 0x8251, 0x2099, 0xc8dd, 0x20a9,
++	0x0008, 0x53a6, 0x20a9, 0x0008, 0x20a3, 0x0000, 0x1f04, 0x825c,
++	0x20a9, 0x000a, 0x20a3, 0x0000, 0x1f04, 0x8262, 0x60c3, 0x0074,
++	0x080c, 0x8be2, 0x0005, 0x20a1, 0x020b, 0x080c, 0x83bf, 0x20a3,
++	0x2010, 0x20a3, 0x0014, 0x20a3, 0x0800, 0x20a3, 0x2000, 0xa006,
++	0x20a2, 0x20a2, 0x20a2, 0x20a2, 0x20a2, 0x00f6, 0x2079, 0xc652,
++	0x7904, 0x00fe, 0xd1ac, 0x1110, 0xa085, 0x0020, 0xd1a4, 0x0110,
++	0xa085, 0x0010, 0xa085, 0x0002, 0x00d6, 0x0804, 0x834a, 0x20a2,
++	0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x0014, 0x080c, 0x8be2,
++	0x0005, 0x20a1, 0x020b, 0x080c, 0x83bf, 0x20a3, 0x5000, 0x0804,
++	0x81b9, 0x20a1, 0x020b, 0x080c, 0x83bf, 0x20a3, 0x2110, 0x20a3,
++	0x0014, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3,
++	0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3,
++	0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x0014, 0x080c,
++	0x8be2, 0x0005, 0x20a1, 0x020b, 0x080c, 0x8453, 0x0020, 0x20a1,
++	0x020b, 0x080c, 0x845b, 0x20a3, 0x0200, 0x20a3, 0x0000, 0x20a3,
++	0x0000, 0x20a3, 0x0000, 0x60c3, 0x0004, 0x080c, 0x8be2, 0x0005,
++	0x20a1, 0x020b, 0x080c, 0x845b, 0x20a3, 0x0100, 0x20a3, 0x0000,
++	0x20a3, 0x0003, 0x20a3, 0x2a00, 0x60c3, 0x0008, 0x080c, 0x8be2,
++	0x0005, 0x20a1, 0x020b, 0x080c, 0x845b, 0x20a3, 0x0200, 0x0804,
++	0x81b9, 0x20a1, 0x020b, 0x080c, 0x845b, 0x20a3, 0x0100, 0x20a3,
++	0x0000, 0x7828, 0xa005, 0x0110, 0x20a2, 0x0010, 0x20a3, 0x0003,
++	0x7810, 0x20a2, 0x60c3, 0x0008, 0x080c, 0x8be2, 0x0005, 0x00d6,
++	0x20a1, 0x020b, 0x080c, 0x845b, 0x20a3, 0x0210, 0x20a3, 0x0014,
++	0x20a3, 0x0800, 0x7818, 0x2068, 0x6894, 0xa086, 0x0014, 0x1198,
++	0x699c, 0xa184, 0x0030, 0x0190, 0x6998, 0xa184, 0xc000, 0x1140,
++	0xd1ec, 0x0118, 0x20a3, 0x2100, 0x0058, 0x20a3, 0x0100, 0x0040,
++	0x20a3, 0x0400, 0x0028, 0x20a3, 0x0700, 0x0010, 0x700f, 0x0800,
++	0xa006, 0x20a2, 0x20a2, 0x20a2, 0x20a2, 0x20a2, 0x00f6, 0x2079,
++	0xc652, 0x7904, 0x00fe, 0xd1ac, 0x1110, 0xa085, 0x0020, 0xd1a4,
++	0x0110, 0xa085, 0x0010, 0x2009, 0xc674, 0x210c, 0xd184, 0x1110,
++	0xa085, 0x0002, 0x0026, 0x2009, 0xc672, 0x210c, 0xd1e4, 0x0130,
++	0xc0c5, 0xa094, 0x0030, 0xa296, 0x0010, 0x0140, 0xd1ec, 0x0130,
++	0xa094, 0x0030, 0xa296, 0x0010, 0x0108, 0xc0bd, 0x002e, 0x20a2,
++	0x20a2, 0x20a2, 0x60c3, 0x0014, 0x080c, 0x8be2, 0x00de, 0x0005,
++	0x20a1, 0x020b, 0x080c, 0x845b, 0x20a3, 0x0210, 0x20a3, 0x0014,
++	0x20a3, 0x0000, 0x20a3, 0x0100, 0x20a3, 0x0000, 0x20a3, 0x0000,
++	0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000,
++	0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x0014, 0x080c, 0x8be2,
++	0x0005, 0x20a1, 0x020b, 0x080c, 0x845b, 0x20a3, 0x0200, 0x0804,
++	0x812c, 0x20a1, 0x020b, 0x080c, 0x845b, 0x20a3, 0x0100, 0x20a3,
++	0x0000, 0x20a3, 0x0003, 0x20a3, 0x2a00, 0x60c3, 0x0008, 0x080c,
++	0x8be2, 0x0005, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x20a1, 0x020b,
++	0x080c, 0x845b, 0x20a3, 0x0100, 0x20a3, 0x0000, 0x20a3, 0x000b,
++	0x20a3, 0x0000, 0x60c3, 0x0008, 0x080c, 0x8be2, 0x0005, 0x0026,
++	0x0036, 0x0046, 0x2019, 0x3200, 0x2021, 0x0800, 0x0038, 0x0026,
++	0x0036, 0x0046, 0x2019, 0x2200, 0x2021, 0x0100, 0x20e1, 0x9080,
++	0x20e1, 0x4000, 0x7818, 0xa080, 0x0028, 0x2014, 0xa286, 0x007e,
++	0x11a0, 0xa385, 0x00ff, 0x20a2, 0x20a3, 0xfffe, 0x20a3, 0x0000,
++	0x2011, 0xc615, 0x2214, 0x2001, 0xc8e5, 0x2004, 0xa005, 0x0118,
++	0x2011, 0xc61d, 0x2214, 0x22a2, 0x04d0, 0xa286, 0x007f, 0x1138,
++	0x00d6, 0xa385, 0x00ff, 0x20a2, 0x20a3, 0xfffd, 0x00c8, 0x2001,
++	0xc635, 0x2004, 0xd0ac, 0x1110, 0xd2bc, 0x01c8, 0xa286, 0x0080,
++	0x00d6, 0x1130, 0xa385, 0x00ff, 0x20a2, 0x20a3, 0xfffc, 0x0040,
++	0xa2e8, 0xc77b, 0x2d6c, 0x6810, 0xa305, 0x20a2, 0x6814, 0x20a2,
++	0x2069, 0xc61c, 0x2da6, 0x8d68, 0x2da6, 0x00de, 0x0080, 0x00d6,
++	0xa2e8, 0xc77b, 0x2d6c, 0x6810, 0xa305, 0x20a2, 0x6814, 0x20a2,
++	0x00de, 0x20a3, 0x0000, 0x2011, 0xc615, 0x2214, 0x22a2, 0xa485,
++	0x0029, 0x20a2, 0x004e, 0x003e, 0x20a3, 0x0000, 0x080c, 0x8bd1,
++	0x22a2, 0x20a3, 0x0000, 0x2fa2, 0x20a3, 0xffff, 0x20a3, 0x0000,
++	0x20a3, 0x0000, 0x002e, 0x0005, 0x0026, 0x20e1, 0x9080, 0x20e1,
++	0x4000, 0x20a3, 0x02ff, 0x2011, 0xfffc, 0x22a2, 0x00d6, 0x2069,
++	0xc61c, 0x2da6, 0x8d68, 0x2da6, 0x00de, 0x20a3, 0x2029, 0x20a3,
++	0x0000, 0x08e0, 0x20a3, 0x0100, 0x20a3, 0x0000, 0x20a3, 0xfc02,
++	0x20a3, 0x0000, 0x0005, 0x0026, 0x0036, 0x0046, 0x2019, 0x3300,
++	0x2021, 0x0800, 0x0038, 0x0026, 0x0036, 0x0046, 0x2019, 0x2300,
++	0x2021, 0x0100, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x7818, 0xa080,
++	0x0028, 0x2004, 0x2011, 0xc635, 0x2214, 0xd2ac, 0x1118, 0xa092,
++	0x007e, 0x02d8, 0x00d6, 0xa0e8, 0xc77b, 0x2d6c, 0x6810, 0xa305,
++	0x20a2, 0x6814, 0x20a2, 0x6810, 0xa005, 0x1140, 0x6814, 0xa005,
++	0x1128, 0x20a3, 0x00ff, 0x20a3, 0xfffe, 0x0028, 0x2069, 0xc61c,
++	0x2da6, 0x8d68, 0x2da6, 0x00de, 0x0080, 0x00d6, 0xa0e8, 0xc77b,
++	0x2d6c, 0x6810, 0xa305, 0x20a2, 0x6814, 0x20a2, 0x00de, 0x20a3,
++	0x0000, 0x2011, 0xc615, 0x2214, 0x22a2, 0xa485, 0x0098, 0x20a2,
++	0x20a3, 0x0000, 0x004e, 0x003e, 0x080c, 0x8bd1, 0x22a2, 0x20a3,
++	0x0000, 0x7a08, 0x22a2, 0x2fa2, 0x20a3, 0x0000, 0x20a3, 0x0000,
++	0x002e, 0x0005, 0x080c, 0x8bd1, 0x22a2, 0x20a3, 0x0000, 0x7a08,
++	0x22a2, 0x7810, 0x20a2, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x002e,
++	0x0005, 0x00c6, 0x00f6, 0x6004, 0xa08a, 0x0085, 0x0a0c, 0x1519,
++	0xa08a, 0x008c, 0x1a0c, 0x1519, 0x6118, 0x2178, 0x79a0, 0x2011,
++	0xc635, 0x2214, 0xd2ac, 0x1110, 0xd1bc, 0x0150, 0x7900, 0xd1f4,
++	0x0120, 0x7914, 0xa18c, 0x00ff, 0x0040, 0x2009, 0x0000, 0x0028,
++	0xa1f8, 0x2f6e, 0x2f0d, 0xa18c, 0x00ff, 0x2c78, 0x2061, 0x0100,
++	0x619a, 0xa082, 0x0085, 0x001b, 0x00fe, 0x00ce, 0x0005, 0x84f8,
++	0x8502, 0x851d, 0x84f6, 0x84f6, 0x84f6, 0x84f8, 0x080c, 0x1519,
++	0x0146, 0x20a1, 0x020b, 0x04a1, 0x60c3, 0x0000, 0x080c, 0x8be2,
++	0x014e, 0x0005, 0x0146, 0x20a1, 0x020b, 0x080c, 0x8569, 0x20a3,
++	0x0000, 0x20a3, 0x0000, 0x7808, 0x20a2, 0x7810, 0x20a2, 0x20a3,
++	0x0000, 0x20a3, 0xffff, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3,
++	0x000c, 0x080c, 0x8be2, 0x014e, 0x0005, 0x0146, 0x20a1, 0x020b,
++	0x080c, 0x85a3, 0x20a3, 0x0003, 0x20a3, 0x0300, 0x20a3, 0x0000,
++	0x20a3, 0x0000, 0x60c3, 0x0004, 0x080c, 0x8be2, 0x014e, 0x0005,
++	0x0026, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x7818, 0xa080, 0x0028,
++	0x2004, 0x2011, 0xc635, 0x2214, 0xd2ac, 0x1118, 0xa092, 0x007e,
++	0x0288, 0x00d6, 0xa0e8, 0xc77b, 0x2d6c, 0x6810, 0xa085, 0x8100,
++	0x20a2, 0x6814, 0x20a2, 0x2069, 0xc61c, 0x2da6, 0x8d68, 0x2da6,
++	0x00de, 0x0088, 0x00d6, 0xa0e8, 0xc77b, 0x2d6c, 0x6810, 0xa085,
++	0x8100, 0x20a2, 0x6814, 0x20a2, 0x00de, 0x20a3, 0x0000, 0x2011,
++	0xc615, 0x2214, 0x22a2, 0x20a3, 0x0009, 0x20a3, 0x0000, 0x0804,
++	0x8426, 0x0026, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x7818, 0xa080,
++	0x0028, 0x2004, 0x2011, 0xc635, 0x2214, 0xd2ac, 0x1118, 0xa092,
++	0x007e, 0x0288, 0x00d6, 0xa0e8, 0xc77b, 0x2d6c, 0x6810, 0xa085,
++	0x8400, 0x20a2, 0x6814, 0x20a2, 0x2069, 0xc61c, 0x2da6, 0x8d68,
++	0x2da6, 0x00de, 0x0088, 0x00d6, 0xa0e8, 0xc77b, 0x2d6c, 0x6810,
++	0xa085, 0x8400, 0x20a2, 0x6814, 0x20a2, 0x00de, 0x20a3, 0x0000,
++	0x2011, 0xc615, 0x2214, 0x22a2, 0x2001, 0x0099, 0x20a2, 0x20a3,
++	0x0000, 0x0804, 0x84b2, 0x0026, 0x20e1, 0x9080, 0x20e1, 0x4000,
++	0x7818, 0xa080, 0x0028, 0x2004, 0x2011, 0xc635, 0x2214, 0xd2ac,
++	0x1118, 0xa092, 0x007e, 0x0288, 0x00d6, 0xa0e8, 0xc77b, 0x2d6c,
++	0x6810, 0xa085, 0x8500, 0x20a2, 0x6814, 0x20a2, 0x2069, 0xc61c,
++	0x2da6, 0x8d68, 0x2da6, 0x00de, 0x0088, 0x00d6, 0xa0e8, 0xc77b,
++	0x2d6c, 0x6810, 0xa085, 0x8500, 0x20a2, 0x6814, 0x20a2, 0x00de,
++	0x20a3, 0x0000, 0x2011, 0xc615, 0x2214, 0x22a2, 0x2001, 0x0099,
++	0x20a2, 0x20a3, 0x0000, 0x0804, 0x84b2, 0x00c6, 0x00f6, 0x2c78,
++	0x7804, 0xa08a, 0x0040, 0x0a0c, 0x1519, 0xa08a, 0x0053, 0x1a0c,
++	0x1519, 0x7918, 0x2160, 0x61a0, 0x2011, 0xc635, 0x2214, 0xd2ac,
++	0x1110, 0xd1bc, 0x0150, 0x6100, 0xd1f4, 0x0120, 0x6114, 0xa18c,
++	0x00ff, 0x0040, 0x2009, 0x0000, 0x0028, 0xa1e0, 0x2f6e, 0x2c0d,
++	0xa18c, 0x00ff, 0x2061, 0x0100, 0x619a, 0xa082, 0x0040, 0x001b,
++	0x00fe, 0x00ce, 0x0005, 0x8620, 0x872c, 0x86c9, 0x88de, 0x861e,
++	0x861e, 0x861e, 0x861e, 0x861e, 0x861e, 0x861e, 0x8f70, 0x8f80,
++	0x8f90, 0x8fa0, 0x861e, 0x93b7, 0x861e, 0x8f5f, 0x080c, 0x1519,
++	0x00d6, 0x0156, 0x0146, 0x780b, 0xffff, 0x20a1, 0x020b, 0x080c,
++	0x8680, 0x7910, 0x2168, 0x6948, 0x7952, 0x21a2, 0xa016, 0x22a2,
++	0x22a2, 0x22a2, 0x694c, 0xa184, 0x000f, 0x1118, 0x2001, 0x0005,
++	0x0040, 0xd184, 0x0118, 0x2001, 0x0004, 0x0018, 0xa084, 0x0006,
++	0x8004, 0x0016, 0x2008, 0x7858, 0xa084, 0x00ff, 0x8007, 0xa105,
++	0x001e, 0x20a2, 0xd1ac, 0x0118, 0x20a3, 0x0002, 0x0048, 0xd1b4,
++	0x0118, 0x20a3, 0x0001, 0x0020, 0x20a3, 0x0000, 0x2230, 0x0010,
++	0x6a80, 0x6e7c, 0x20a9, 0x0008, 0x0136, 0xad88, 0x0017, 0x2198,
++	0x20a1, 0x021b, 0x53a6, 0x013e, 0x20a1, 0x020b, 0x22a2, 0x26a2,
++	0x60c3, 0x0020, 0x20e1, 0x9080, 0x6014, 0xa084, 0x0004, 0xa085,
++	0x0009, 0x6016, 0x2001, 0xc943, 0x2003, 0x07d0, 0x2001, 0xc942,
++	0x2003, 0x0009, 0x080c, 0x17f1, 0x014e, 0x015e, 0x00de, 0x0005,
++	0x20e1, 0x9080, 0x20e1, 0x4000, 0x7a18, 0xa280, 0x0023, 0x2014,
++	0x8210, 0xa294, 0x00ff, 0x2202, 0x8217, 0x7818, 0xa080, 0x0028,
++	0x2004, 0x2019, 0xc635, 0x231c, 0xd3ac, 0x1110, 0xd0bc, 0x0188,
++	0x00d6, 0xa0e8, 0xc77b, 0x2d6c, 0x6810, 0xa085, 0x0600, 0x20a2,
++	0x6814, 0x20a2, 0x2069, 0xc61c, 0x2da6, 0x8d68, 0x2da6, 0x00de,
++	0x0088, 0x00d6, 0xa0e8, 0xc77b, 0x2d6c, 0x6810, 0xa085, 0x0600,
++	0x20a2, 0x6814, 0x20a2, 0x00de, 0x20a3, 0x0000, 0x2009, 0xc615,
++	0x210c, 0x21a2, 0x20a3, 0x0829, 0x20a3, 0x0000, 0x22a2, 0x20a3,
++	0x0000, 0x2fa2, 0x20a3, 0xffff, 0x20a3, 0x0000, 0x20a3, 0x0000,
++	0x0005, 0x00d6, 0x0156, 0x0136, 0x0146, 0x20a1, 0x020b, 0x00c1,
++	0x7810, 0x2068, 0x6860, 0x20a2, 0x685c, 0x20a2, 0x6880, 0x20a2,
++	0x687c, 0x20a2, 0xa006, 0x20a2, 0x20a2, 0x20a2, 0x20a2, 0x60c3,
++	0x000c, 0x080c, 0x8be2, 0x014e, 0x013e, 0x015e, 0x00de, 0x0005,
++	0x0026, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x7818, 0xa080, 0x0028,
++	0x2004, 0x2011, 0xc635, 0x2214, 0xd2ac, 0x1110, 0xd0bc, 0x0188,
++	0x00d6, 0xa0e8, 0xc77b, 0x2d6c, 0x6810, 0xa085, 0x0500, 0x20a2,
++	0x6814, 0x20a2, 0x2069, 0xc61c, 0x2da6, 0x8d68, 0x2da6, 0x00de,
++	0x0088, 0x00d6, 0xa0e8, 0xc77b, 0x2d6c, 0x6810, 0xa085, 0x0500,
++	0x20a2, 0x6814, 0x20a2, 0x00de, 0x20a3, 0x0000, 0x2011, 0xc615,
++	0x2214, 0x22a2, 0x20a3, 0x0889, 0x20a3, 0x0000, 0x080c, 0x8bd1,
++	0x22a2, 0x20a3, 0x0000, 0x7a08, 0x22a2, 0x2fa2, 0x20a3, 0x0000,
++	0x20a3, 0x0000, 0x002e, 0x0005, 0x00d6, 0x0156, 0x0136, 0x0146,
++	0x7810, 0xa0ec, 0xf000, 0x0168, 0xa06d, 0x080c, 0x56bf, 0x0148,
++	0x684c, 0xa084, 0x2020, 0xa086, 0x2020, 0x1118, 0x7820, 0xc0cd,
++	0x7822, 0x20a1, 0x020b, 0x080c, 0x8894, 0xa016, 0x22a2, 0x22a2,
++	0x22a2, 0x22a2, 0x22a2, 0x7810, 0xa084, 0xf000, 0x1130, 0x7810,
++	0xa084, 0x0700, 0x8007, 0x0043, 0x0010, 0xa006, 0x002b, 0x014e,
++	0x013e, 0x015e, 0x00de, 0x0005, 0x8766, 0x87fb, 0x880b, 0x883d,
++	0x8850, 0x886b, 0x8874, 0x8764, 0x080c, 0x1519, 0x0016, 0x0036,
++	0x694c, 0xa18c, 0x0003, 0x0118, 0xa186, 0x0003, 0x1170, 0x6b78,
++	0x7820, 0xd0cc, 0x0108, 0xc3e5, 0x23a2, 0x6868, 0x20a2, 0x6864,
++	0x20a2, 0x003e, 0x001e, 0x0804, 0x8847, 0xa186, 0x0001, 0x190c,
++	0x1519, 0x6b78, 0x7820, 0xd0cc, 0x0108, 0xc3e5, 0x23a2, 0x6868,
++	0x20a2, 0x6864, 0x20a2, 0x22a2, 0x6874, 0x20a2, 0x22a2, 0x687c,
++	0x20a2, 0x2009, 0x0018, 0xa384, 0x0300, 0x0904, 0x87f5, 0xd3c4,
++	0x0110, 0x687c, 0xa108, 0xd3cc, 0x0110, 0x6874, 0xa108, 0x0156,
++	0x20a9, 0x000d, 0xad80, 0x0020, 0x201c, 0x831f, 0x23a2, 0x8000,
++	0x1f04, 0x87a4, 0x015e, 0x22a2, 0x22a2, 0x22a2, 0xa184, 0x0003,
++	0x0904, 0x87f5, 0x20a1, 0x020b, 0x20e1, 0x9080, 0x20e1, 0x4000,
++	0x0006, 0x7818, 0xa080, 0x0028, 0x2004, 0x2011, 0xc635, 0x2214,
++	0xd2ac, 0x1110, 0xd0bc, 0x0188, 0x00d6, 0xa0e8, 0xc77b, 0x2d6c,
++	0x6810, 0xa085, 0x0700, 0x20a2, 0x6814, 0x20a2, 0x2069, 0xc61c,
++	0x2da6, 0x8d68, 0x2da6, 0x00de, 0x0088, 0x00d6, 0xa0e8, 0xc77b,
++	0x2d6c, 0x6810, 0xa085, 0x0700, 0x20a2, 0x6814, 0x20a2, 0x00de,
++	0x20a3, 0x0000, 0x2011, 0xc615, 0x2214, 0x22a2, 0x000e, 0x7b20,
++	0xd3cc, 0x0118, 0x20a3, 0x0889, 0x0010, 0x20a3, 0x0898, 0x20a2,
++	0x080c, 0x8bd1, 0x22a2, 0x20a3, 0x0000, 0x61c2, 0x003e, 0x001e,
++	0x080c, 0x8be2, 0x0005, 0x2011, 0x0008, 0x2001, 0xc60d, 0x2004,
++	0xd0f4, 0x0110, 0x2011, 0x0028, 0x7820, 0xd0cc, 0x0108, 0xc2e5,
++	0x22a2, 0xa016, 0x04d0, 0x2011, 0x0302, 0x0016, 0x0036, 0x7828,
++	0x792c, 0xa11d, 0x0108, 0xc2dd, 0x7b20, 0xd3cc, 0x0108, 0xc2e5,
++	0x22a2, 0x20a2, 0x21a2, 0x003e, 0x001e, 0xa016, 0x22a2, 0x20a3,
++	0x0012, 0x22a2, 0x20a3, 0x0008, 0x22a2, 0x22a2, 0x22a2, 0x22a2,
++	0x20a3, 0x7000, 0x20a3, 0x0500, 0x22a2, 0x20a3, 0x000a, 0x22a2,
++	0x22a2, 0x20a3, 0x2500, 0x22a2, 0x22a2, 0x22a2, 0x22a2, 0x22a2,
++	0x60c3, 0x0032, 0x080c, 0x8be2, 0x0005, 0x2011, 0x0028, 0x7820,
++	0xd0cc, 0x0108, 0xc2e5, 0x22a2, 0xa016, 0x22a2, 0x22a2, 0x22a2,
++	0x22a2, 0x22a2, 0x22a2, 0x60c3, 0x0018, 0x080c, 0x8be2, 0x0005,
++	0x2011, 0x0100, 0x7820, 0xd0cc, 0x0108, 0xc2e5, 0x22a2, 0xa016,
++	0x22a2, 0x22a2, 0x22a2, 0x22a2, 0x22a2, 0x20a3, 0x0008, 0x22a2,
++	0x7854, 0xa084, 0x00ff, 0x20a2, 0x22a2, 0x22a2, 0x60c3, 0x0020,
++	0x080c, 0x8be2, 0x0005, 0x2011, 0x0008, 0x7820, 0xd0cc, 0x0108,
++	0xc2e5, 0x22a2, 0xa016, 0x0888, 0x0036, 0x7b10, 0xa384, 0xff00,
++	0x7812, 0xa384, 0x00ff, 0x8001, 0x1138, 0x7820, 0xd0cc, 0x0108,
++	0xc2e5, 0x22a2, 0x003e, 0x0808, 0x0046, 0x2021, 0x0800, 0x0006,
++	0x7820, 0xd0cc, 0x000e, 0x0108, 0xc4e5, 0x24a2, 0x004e, 0x22a2,
++	0x20a2, 0x003e, 0x0804, 0x8847, 0x0026, 0x20e1, 0x9080, 0x20e1,
++	0x4000, 0x7818, 0xa080, 0x0028, 0x2004, 0x2011, 0xc635, 0x2214,
++	0xd2ac, 0x1110, 0xd0bc, 0x0188, 0x00d6, 0xa0e8, 0xc77b, 0x2d6c,
++	0x6810, 0xa085, 0x0700, 0x20a2, 0x6814, 0x20a2, 0x2069, 0xc61c,
++	0x2da6, 0x8d68, 0x2da6, 0x00de, 0x0088, 0x00d6, 0xa0e8, 0xc77b,
++	0x2d6c, 0x6810, 0xa085, 0x0700, 0x20a2, 0x6814, 0x20a2, 0x00de,
++	0x20a3, 0x0000, 0x2011, 0xc615, 0x2214, 0x22a2, 0x7820, 0xd0cc,
++	0x0118, 0x20a3, 0x0889, 0x0010, 0x20a3, 0x0898, 0x20a3, 0x0000,
++	0x080c, 0x8bd1, 0x22a2, 0x20a3, 0x0000, 0x7a08, 0x22a2, 0x2fa2,
++	0x20a3, 0x0000, 0x20a3, 0x0000, 0x002e, 0x0005, 0x00d6, 0x0156,
++	0x0136, 0x0146, 0x0016, 0x0036, 0x7810, 0xa084, 0x0700, 0x8007,
++	0x003b, 0x003e, 0x001e, 0x014e, 0x013e, 0x015e, 0x00de, 0x0005,
++	0x88f8, 0x88f8, 0x88fa, 0x88f8, 0x88f8, 0x88f8, 0x891c, 0x88f8,
++	0x080c, 0x1519, 0x7910, 0xa18c, 0xf8ff, 0xa18d, 0x0600, 0x7912,
++	0x20a1, 0x020b, 0x2009, 0x0003, 0x00f9, 0x00d6, 0x2069, 0xc652,
++	0x6804, 0xd0bc, 0x0130, 0x682c, 0xa084, 0x00ff, 0x8007, 0x20a2,
++	0x0010, 0x20a3, 0x3f00, 0x00de, 0x22a2, 0x22a2, 0x22a2, 0x60c3,
++	0x0001, 0x080c, 0x8be2, 0x0005, 0x20a1, 0x020b, 0x2009, 0x0003,
++	0x0019, 0x20a3, 0x7f00, 0x0c80, 0x0026, 0x20e1, 0x9080, 0x20e1,
++	0x4000, 0x7818, 0xa080, 0x0028, 0x2004, 0x2011, 0xc635, 0x2214,
++	0xd2ac, 0x1110, 0xd0bc, 0x0188, 0x00d6, 0xa0e8, 0xc77b, 0x2d6c,
++	0x6810, 0xa085, 0x0100, 0x20a2, 0x6814, 0x20a2, 0x2069, 0xc61c,
++	0x2da6, 0x8d68, 0x2da6, 0x00de, 0x0088, 0x00d6, 0xa0e8, 0xc77b,
++	0x2d6c, 0x6810, 0xa085, 0x0100, 0x20a2, 0x6814, 0x20a2, 0x00de,
++	0x20a3, 0x0000, 0x2011, 0xc615, 0x2214, 0x22a2, 0x20a3, 0x0888,
++	0xa18d, 0x0008, 0x21a2, 0x080c, 0x8bd1, 0x22a2, 0x20a3, 0x0000,
++	0x7a08, 0x22a2, 0x2fa2, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x002e,
++	0x0005, 0x00e6, 0x00d6, 0x00c6, 0x0066, 0x0056, 0x0046, 0x0036,
++	0x2061, 0x0100, 0x2071, 0xc600, 0x2009, 0xc615, 0x210c, 0x7818,
++	0x2068, 0x2031, 0xc635, 0x2634, 0xa6b4, 0x0028, 0x0110, 0x7370,
++	0x7474, 0x2500, 0x2031, 0xc635, 0x2634, 0xa6b4, 0x0028, 0x0140,
++	0x2001, 0x04ff, 0x6062, 0x6067, 0xffff, 0x636a, 0x646e, 0x0050,
++	0x2001, 0x00ff, 0xa085, 0x0400, 0x6062, 0x6067, 0xffff, 0x606b,
++	0x0000, 0x616e, 0x68b8, 0x6073, 0x0530, 0x6077, 0x0008, 0x688c,
++	0x8000, 0xa084, 0x00ff, 0x688e, 0x8007, 0xa085, 0x0020, 0x607a,
++	0x68b4, 0x607f, 0x0000, 0x2d00, 0x6082, 0x6087, 0xffff, 0x7810,
++	0x2070, 0x7014, 0x608a, 0x7010, 0x608e, 0x700c, 0x60c6, 0x7008,
++	0x60ca, 0x686c, 0x60ce, 0x60ab, 0x0036, 0x60af, 0x95d5, 0x60d7,
++	0x0000, 0x2001, 0xc635, 0x2004, 0xa084, 0x0028, 0x0128, 0x609f,
++	0x0000, 0x2001, 0x0092, 0x0048, 0x6028, 0xc0bd, 0x602a, 0x609f,
++	0x00ff, 0x6027, 0xffff, 0x2001, 0x00b2, 0x6016, 0x2009, 0x07d0,
++	0x080c, 0x7029, 0x003e, 0x004e, 0x005e, 0x006e, 0x00ce, 0x00de,
++	0x00ee, 0x0005, 0x00e6, 0x00d6, 0x00c6, 0x0066, 0x0056, 0x0046,
++	0x0036, 0x2061, 0x0100, 0x2071, 0xc600, 0x2009, 0xc615, 0x210c,
++	0x7818, 0x2068, 0x68a0, 0x2028, 0x2031, 0xc635, 0x2634, 0xd6ac,
++	0x1160, 0xa582, 0x007e, 0x1248, 0x2500, 0xd0bc, 0x1130, 0xa080,
++	0x2f6e, 0x2015, 0xa294, 0x00ff, 0x0020, 0x6910, 0x6a14, 0x7370,
++	0x7474, 0x2001, 0xc635, 0x2004, 0xd0ac, 0x1128, 0xa582, 0x007e,
++	0x1210, 0xd5bc, 0x0138, 0xa185, 0x0400, 0x6062, 0x6266, 0x636a,
++	0x646e, 0x0030, 0x6063, 0x0400, 0x6266, 0x606b, 0x0000, 0x616e,
++	0x68b8, 0x6072, 0x6077, 0x0000, 0x6864, 0xd0a4, 0x0110, 0x6077,
++	0x0008, 0x688c, 0x8000, 0xa084, 0x00ff, 0x688e, 0x8007, 0xa085,
++	0x0020, 0x607a, 0x68b4, 0x607f, 0x0000, 0x2d00, 0x6082, 0x6087,
++	0xffff, 0x7810, 0x2070, 0x7014, 0x608a, 0x7010, 0x608e, 0x700c,
++	0x60c6, 0x7008, 0x60ca, 0x686c, 0x60ce, 0x60ab, 0x0036, 0x60af,
++	0x95d5, 0x60d7, 0x0000, 0xa582, 0x007e, 0x0210, 0x2011, 0x0000,
++	0x629e, 0x00f6, 0x2079, 0x0140, 0x7803, 0x0000, 0x00fe, 0x2009,
++	0x0092, 0x6116, 0x2009, 0x07d0, 0x080c, 0x7029, 0x003e, 0x004e,
++	0x005e, 0x006e, 0x00ce, 0x00de, 0x00ee, 0x0005, 0x00e6, 0x00d6,
++	0x00c6, 0x0056, 0x0046, 0x0036, 0x2061, 0x0100, 0x2071, 0xc600,
++	0x7154, 0x7818, 0x2068, 0x68a0, 0x2028, 0x76d4, 0xd6ac, 0x1130,
++	0xd0bc, 0x1120, 0x6910, 0x6a14, 0x7454, 0x0020, 0x6910, 0x6a14,
++	0x7370, 0x7474, 0x781c, 0xa0be, 0x0006, 0x0904, 0x8b1c, 0xa0be,
++	0x000a, 0x15e8, 0xa185, 0x0200, 0x6062, 0x6266, 0x636a, 0x646e,
++	0x6073, 0x2029, 0x6077, 0x0000, 0x688c, 0x8000, 0xa084, 0x00ff,
++	0x688e, 0x8007, 0x607a, 0x607f, 0x0000, 0x2f00, 0x6082, 0x7808,
++	0x6086, 0x7810, 0x2070, 0x7014, 0x608a, 0x7010, 0x608e, 0x700c,
++	0x60c6, 0x7008, 0x60ca, 0x686c, 0x60ce, 0x60af, 0x95d5, 0x60d7,
++	0x0000, 0x609f, 0x0000, 0x080c, 0x9452, 0x2009, 0x07d0, 0x60c4,
++	0xa084, 0xfff0, 0xa005, 0x0110, 0x2009, 0x1b58, 0x080c, 0x7029,
++	0x003e, 0x004e, 0x005e, 0x00ce, 0x00de, 0x00ee, 0x0005, 0x70d4,
++	0xd0ac, 0x1110, 0xd5bc, 0x0138, 0xa185, 0x0100, 0x6062, 0x6266,
++	0x636a, 0x646e, 0x0038, 0xa185, 0x0100, 0x6062, 0x6266, 0x606b,
++	0x0000, 0x646e, 0x6073, 0x0809, 0x6077, 0x0008, 0x688c, 0x8000,
++	0xa084, 0x00ff, 0x688e, 0x8007, 0x607a, 0x607f, 0x0000, 0x2f00,
++	0x6082, 0x7808, 0x6086, 0x7810, 0x2070, 0x7014, 0x608a, 0x7010,
++	0x608e, 0x700c, 0x60c6, 0x7008, 0x60ca, 0x686c, 0x60ce, 0x60af,
++	0x95d5, 0x60d7, 0x0000, 0xa582, 0x0080, 0x0248, 0x6a00, 0xd2f4,
++	0x0120, 0x6a14, 0xa294, 0x00ff, 0x0010, 0x2011, 0x0000, 0x629e,
++	0x080c, 0x9452, 0x2009, 0x07d0, 0x60c4, 0xa084, 0xfff0, 0xa005,
++	0x0110, 0x2009, 0x1b58, 0x080c, 0x7029, 0x003e, 0x004e, 0x005e,
++	0x00ce, 0x00de, 0x00ee, 0x0005, 0x7810, 0x2070, 0x704c, 0xa084,
++	0x0003, 0xa086, 0x0002, 0x0904, 0x8b72, 0x2001, 0xc635, 0x2004,
++	0xd0ac, 0x1110, 0xd5bc, 0x0138, 0xa185, 0x0100, 0x6062, 0x6266,
++	0x636a, 0x646e, 0x0038, 0xa185, 0x0100, 0x6062, 0x6266, 0x606b,
++	0x0000, 0x646e, 0x6073, 0x0880, 0x6077, 0x0008, 0x688c, 0x8000,
++	0xa084, 0x00ff, 0x688e, 0x8007, 0x607a, 0x7834, 0x607e, 0x2f00,
++	0x6086, 0x7808, 0x6082, 0x7060, 0x608a, 0x705c, 0x608e, 0x7080,
++	0x60c6, 0x707c, 0x60ca, 0x707c, 0x792c, 0xa108, 0x792e, 0x7080,
++	0x7928, 0xa109, 0x792a, 0x686c, 0x60ce, 0x60af, 0x95d5, 0x60d7,
++	0x0000, 0xa582, 0x0080, 0x0248, 0x6a00, 0xd2f4, 0x0120, 0x6a14,
++	0xa294, 0x00ff, 0x0010, 0x2011, 0x0000, 0x629e, 0x080c, 0x944f,
++	0x0804, 0x8b0a, 0x2001, 0xc635, 0x2004, 0xd0ac, 0x1110, 0xd5bc,
++	0x0138, 0xa185, 0x0700, 0x6062, 0x6266, 0x636a, 0x646e, 0x0038,
++	0xa185, 0x0700, 0x6062, 0x6266, 0x606b, 0x0000, 0x646e, 0x080c,
++	0x56bf, 0x0180, 0x00d6, 0x7810, 0xa06d, 0x684c, 0x00de, 0xa084,
++	0x2020, 0xa086, 0x2020, 0x1130, 0x7820, 0xc0cd, 0x7822, 0x6073,
++	0x0889, 0x0010, 0x6073, 0x0898, 0x6077, 0x0000, 0x688c, 0x8000,
++	0xa084, 0x00ff, 0x688e, 0x8007, 0x607a, 0x607f, 0x0000, 0x2f00,
++	0x6086, 0x7808, 0x6082, 0x7014, 0x608a, 0x7010, 0x608e, 0x700c,
++	0x60c6, 0x7008, 0x60ca, 0x686c, 0x60ce, 0x60af, 0x95d5, 0x60d7,
++	0x0000, 0xa582, 0x0080, 0x0248, 0x6a00, 0xd2f4, 0x0120, 0x6a14,
++	0xa294, 0x00ff, 0x0010, 0x2011, 0x0000, 0x629e, 0x7820, 0xd0cc,
++	0x0120, 0x080c, 0x9452, 0x0804, 0x8b0a, 0x080c, 0x944f, 0x0804,
++	0x8b0a, 0x7a18, 0xa280, 0x0023, 0x2014, 0x8210, 0xa294, 0x00ff,
++	0x2202, 0x8217, 0x0005, 0x00d6, 0x2069, 0xc927, 0x6843, 0x0001,
++	0x00de, 0x0005, 0x20e1, 0x9080, 0x60a3, 0x0056, 0x60a7, 0x9575,
++	0x0019, 0x080c, 0x701b, 0x0005, 0x0006, 0x6014, 0xa084, 0x0004,
++	0xa085, 0x0009, 0x6016, 0x000e, 0x0005, 0x0016, 0x00c6, 0x0006,
++	0x2061, 0x0100, 0x61a4, 0x60a7, 0x95f5, 0x6014, 0xa084, 0x0004,
++	0xa085, 0x0008, 0x6016, 0x000e, 0xe000, 0xe000, 0xe000, 0xe000,
++	0x61a6, 0x00ce, 0x001e, 0x0005, 0x00c6, 0x00d6, 0x0016, 0x0026,
++	0x2061, 0x0100, 0x2069, 0x0140, 0x080c, 0x5f22, 0x1198, 0x2001,
++	0xc943, 0x2004, 0xa005, 0x15b8, 0x0066, 0x2031, 0x0001, 0x080c,
++	0x5fa4, 0x006e, 0x1118, 0x080c, 0x701b, 0x0468, 0x00c6, 0x2061,
++	0xc927, 0x00d8, 0x6904, 0xa194, 0x4000, 0x0550, 0x0831, 0x6803,
++	0x1000, 0x6803, 0x0000, 0x00c6, 0x2061, 0xc927, 0x6128, 0xa192,
++	0x00c8, 0x1258, 0x8108, 0x612a, 0x6124, 0x00ce, 0x81ff, 0x0198,
++	0x080c, 0x701b, 0x080c, 0x8bec, 0x0070, 0x6124, 0xa1e5, 0x0000,
++	0x0140, 0x080c, 0xc59b, 0x080c, 0x7024, 0x2009, 0x0014, 0x080c,
++	0x9613, 0x00ce, 0x0000, 0x002e, 0x001e, 0x00de, 0x00ce, 0x0005,
++	0x2001, 0xc943, 0x2004, 0xa005, 0x1db0, 0x00c6, 0x2061, 0xc927,
++	0x6128, 0xa192, 0x0003, 0x1e08, 0x8108, 0x612a, 0x00ce, 0x080c,
++	0x701b, 0x080c, 0x4e5b, 0x0c38, 0x00c6, 0x00d6, 0x00e6, 0x0016,
++	0x0026, 0x080c, 0x7031, 0x2071, 0xc927, 0x713c, 0x81ff, 0x0904,
++	0x8cc1, 0x2061, 0x0100, 0x2069, 0x0140, 0x080c, 0x5f22, 0x1500,
++	0x0036, 0x2019, 0x0002, 0x080c, 0x8e79, 0x003e, 0x713c, 0x2160,
++	0x080c, 0xc59b, 0x2009, 0x004a, 0x621c, 0xa296, 0x0009, 0x1138,
++	0x6110, 0xa188, 0x0012, 0x200b, 0x0006, 0x2009, 0x0104, 0x080c,
++	0x9613, 0x0066, 0x2031, 0x0001, 0x080c, 0x5fa4, 0x006e, 0x0408,
++	0x6904, 0xa194, 0x4000, 0x0518, 0x6803, 0x1000, 0x6803, 0x0000,
++	0x0036, 0x2019, 0x0001, 0x080c, 0x8e79, 0x003e, 0x713c, 0x2160,
++	0x080c, 0xc59b, 0x2009, 0x004a, 0x621c, 0xa296, 0x0009, 0x1138,
++	0x6110, 0xa188, 0x0012, 0x200b, 0x0006, 0x2009, 0x0104, 0x080c,
++	0x9613, 0x002e, 0x001e, 0x00ee, 0x00de, 0x00ce, 0x0005, 0x0c00,
++	0x0026, 0x00e6, 0x2071, 0xc927, 0x7048, 0xd084, 0x01d8, 0x713c,
++	0x81ff, 0x01c0, 0x2071, 0x0100, 0xa188, 0x0007, 0x2114, 0xa28e,
++	0x0006, 0x1138, 0x7014, 0xa084, 0x0184, 0xa085, 0x0012, 0x7016,
++	0x0048, 0xa28e, 0x0009, 0x0db0, 0x7014, 0xa084, 0x0184, 0xa085,
++	0x0016, 0x7016, 0x00ee, 0x002e, 0x0005, 0x00e6, 0x00d6, 0x00c6,
++	0x0066, 0x0056, 0x0046, 0x0006, 0x0126, 0x2091, 0x8000, 0x6018,
++	0x2068, 0x6ca0, 0x2071, 0xc927, 0x7018, 0x2068, 0x8dff, 0x0188,
++	0x68a0, 0xa406, 0x0118, 0x6854, 0x2068, 0x0cc0, 0x6010, 0x2060,
++	0x643c, 0x6540, 0x6648, 0x2d60, 0x080c, 0x54ae, 0x0110, 0xa085,
++	0x0001, 0x012e, 0x000e, 0x004e, 0x005e, 0x006e, 0x00ce, 0x00de,
++	0x00ee, 0x0005, 0x20a1, 0x020b, 0x080c, 0x83bf, 0x20a3, 0x1200,
++	0x20a3, 0x0000, 0x20a3, 0x0000, 0x781c, 0xa086, 0x0004, 0x1110,
++	0x6098, 0x0018, 0x2001, 0xc615, 0x2004, 0x20a2, 0x7834, 0x20a2,
++	0x7838, 0x20a2, 0x20a9, 0x0010, 0xa006, 0x20a2, 0x1f04, 0x8d35,
++	0x20a2, 0x20a2, 0x60c3, 0x002c, 0x080c, 0x8be2, 0x0005, 0x0156,
++	0x0146, 0x20a1, 0x020b, 0x080c, 0x83bf, 0x20a3, 0x0f00, 0x20a3,
++	0x0000, 0x20a3, 0x0000, 0x7808, 0x20a2, 0x60c3, 0x0008, 0x080c,
++	0x8be2, 0x014e, 0x015e, 0x0005, 0x0156, 0x0146, 0x20a1, 0x020b,
++	0x080c, 0x845b, 0x20a3, 0x0200, 0x20a3, 0x0000, 0x20a9, 0x0006,
++	0x2011, 0xc640, 0x2019, 0xc641, 0x23a6, 0x22a6, 0xa398, 0x0002,
++	0xa290, 0x0002, 0x1f04, 0x8d64, 0x20a3, 0x0000, 0x20a3, 0x0000,
++	0x60c3, 0x001c, 0x080c, 0x8be2, 0x014e, 0x015e, 0x0005, 0x0156,
++	0x0146, 0x0016, 0x0026, 0x20a1, 0x020b, 0x080c, 0x8434, 0x080c,
++	0x844a, 0x7810, 0xa080, 0x0000, 0x2004, 0xa080, 0x0015, 0x2098,
++	0x7808, 0xa088, 0x0002, 0x21a8, 0x53a6, 0xa080, 0x0004, 0x8003,
++	0x60c2, 0x080c, 0x8be2, 0x002e, 0x001e, 0x014e, 0x015e, 0x0005,
++	0x0156, 0x0146, 0x20a1, 0x020b, 0x080c, 0x83bf, 0x20a3, 0x6200,
++	0x20a3, 0x0000, 0x20a3, 0x0000, 0x7808, 0x20a2, 0x60c3, 0x0008,
++	0x080c, 0x8be2, 0x014e, 0x015e, 0x0005, 0x0156, 0x0146, 0x0016,
++	0x0026, 0x20a1, 0x020b, 0x080c, 0x83bf, 0x7810, 0xa080, 0x0000,
++	0x2004, 0xa080, 0x0017, 0x2098, 0x7808, 0xa088, 0x0002, 0x21a8,
++	0x53a6, 0x8003, 0x60c2, 0x080c, 0x8be2, 0x002e, 0x001e, 0x014e,
++	0x015e, 0x0005, 0x00e6, 0x00c6, 0x0006, 0x0126, 0x2091, 0x8000,
++	0x2071, 0xc927, 0x700c, 0x2060, 0x8cff, 0x0178, 0x080c, 0xae8f,
++	0x1110, 0x080c, 0x9c09, 0x600c, 0x0006, 0x080c, 0xb056, 0x080c,
++	0x95e3, 0x080c, 0x8fb7, 0x00ce, 0x0c78, 0x700f, 0x0000, 0x700b,
++	0x0000, 0x012e, 0x000e, 0x00ce, 0x00ee, 0x0005, 0x0126, 0x0156,
++	0x00f6, 0x00e6, 0x00d6, 0x00c6, 0x0026, 0x0016, 0x0006, 0x2091,
++	0x8000, 0x2069, 0x0100, 0x2079, 0x0140, 0x2071, 0xc927, 0x7024,
++	0x2060, 0x8cff, 0x05a0, 0x080c, 0x8bf5, 0x68c3, 0x0000, 0x080c,
++	0x7024, 0x2009, 0x0013, 0x080c, 0x9613, 0x20a9, 0x01f4, 0x6824,
++	0xd094, 0x0158, 0x6827, 0x0004, 0x7804, 0xa084, 0x4000, 0x01a0,
++	0x7803, 0x1000, 0x7803, 0x0000, 0x0078, 0xd084, 0x0118, 0x6827,
++	0x0001, 0x0010, 0x1f04, 0x8e0f, 0x7804, 0xa084, 0x1000, 0x0120,
++	0x7803, 0x0100, 0x7803, 0x0000, 0x6824, 0x000e, 0x001e, 0x002e,
++	0x00ce, 0x00de, 0x00ee, 0x00fe, 0x015e, 0x012e, 0x0005, 0x2001,
++	0xc600, 0x2004, 0xa096, 0x0001, 0x0590, 0xa096, 0x0004, 0x0578,
++	0x080c, 0x7024, 0x6814, 0xa084, 0x0001, 0x0110, 0x68a7, 0x95f5,
++	0x6817, 0x0008, 0x68c3, 0x0000, 0x2011, 0x4e18, 0x080c, 0x6fad,
++	0x20a9, 0x01f4, 0x6824, 0xd094, 0x0158, 0x6827, 0x0004, 0x7804,
++	0xa084, 0x4000, 0x01a0, 0x7803, 0x1000, 0x7803, 0x0000, 0x0078,
++	0xd084, 0x0118, 0x6827, 0x0001, 0x0010, 0x1f04, 0x8e52, 0x7804,
++	0xa084, 0x1000, 0x0120, 0x7803, 0x0100, 0x7803, 0x0000, 0x000e,
++	0x001e, 0x002e, 0x00ce, 0x00de, 0x00ee, 0x00fe, 0x015e, 0x012e,
++	0x0005, 0x0126, 0x0156, 0x00f6, 0x00e6, 0x00d6, 0x00c6, 0x0026,
++	0x0016, 0x0006, 0x2091, 0x8000, 0x2069, 0x0100, 0x2079, 0x0140,
++	0x2071, 0xc927, 0x703c, 0x2060, 0x8cff, 0x0904, 0x8f04, 0xa386,
++	0x0002, 0x1128, 0x6814, 0xa084, 0x0002, 0x0904, 0x8f04, 0x68af,
++	0x95f5, 0x6817, 0x0010, 0x2009, 0x00fa, 0x8109, 0x1df0, 0x68c7,
++	0x0000, 0x68cb, 0x0008, 0x080c, 0x7031, 0x080c, 0x22ee, 0x0046,
++	0x2009, 0x017f, 0x200b, 0x00a5, 0x2021, 0x0169, 0x2404, 0xa084,
++	0x000f, 0xa086, 0x0004, 0x1500, 0x68af, 0x95f5, 0x68c7, 0x0000,
++	0x68cb, 0x0008, 0x00e6, 0x00f6, 0x2079, 0x0020, 0x2071, 0xc992,
++	0x6814, 0xa084, 0x0184, 0xa085, 0x0012, 0x6816, 0x7803, 0x0008,
++	0x7003, 0x0000, 0x00fe, 0x00ee, 0xa386, 0x0002, 0x1128, 0x7884,
++	0xa005, 0x1110, 0x7887, 0x0001, 0x2001, 0xc8f8, 0x2004, 0x200a,
++	0x004e, 0xa39d, 0x0000, 0x1140, 0x2009, 0x0049, 0x601c, 0xa086,
++	0x0009, 0x0110, 0x080c, 0x9613, 0x20a9, 0x03e8, 0x6824, 0xd094,
++	0x0158, 0x6827, 0x0004, 0x7804, 0xa084, 0x4000, 0x01a0, 0x7803,
++	0x1000, 0x7803, 0x0000, 0x0078, 0xd08c, 0x0118, 0x6827, 0x0002,
++	0x0010, 0x1f04, 0x8ee6, 0x7804, 0xa084, 0x1000, 0x0120, 0x7803,
++	0x0100, 0x7803, 0x0000, 0x6824, 0x000e, 0x001e, 0x002e, 0x00ce,
++	0x00de, 0x00ee, 0x00fe, 0x015e, 0x012e, 0x0005, 0x00d6, 0x0126,
++	0x2091, 0x8000, 0x2069, 0xc927, 0x6a06, 0x012e, 0x00de, 0x0005,
++	0x00d6, 0x0126, 0x2091, 0x8000, 0x2069, 0xc927, 0x6a32, 0x012e,
++	0x00de, 0x0005, 0x00f6, 0x00e6, 0x00c6, 0x0066, 0x0006, 0x0126,
++	0x2071, 0xc927, 0x7614, 0x2660, 0x2678, 0x2091, 0x8000, 0x8cff,
++	0x0538, 0x601c, 0xa206, 0x1500, 0x7014, 0xac36, 0x1110, 0x660c,
++	0x7616, 0x7010, 0xac36, 0x1140, 0x2c00, 0xaf36, 0x0118, 0x2f00,
++	0x7012, 0x0010, 0x7013, 0x0000, 0x660c, 0x0066, 0x2c00, 0xaf06,
++	0x0110, 0x7e0e, 0x0008, 0x2678, 0x600f, 0x0000, 0x080c, 0xae54,
++	0x080c, 0x8fb7, 0x00ce, 0x08d8, 0x2c78, 0x600c, 0x2060, 0x08b8,
++	0x012e, 0x000e, 0x006e, 0x00ce, 0x00ee, 0x00fe, 0x0005, 0x0156,
++	0x0146, 0x20a1, 0x020b, 0x080c, 0x8680, 0x7810, 0x20a2, 0xa006,
++	0x20a2, 0x20a2, 0x20a2, 0x20a2, 0x20a3, 0x1000, 0x0804, 0x8faf,
++	0x0156, 0x0146, 0x20a1, 0x020b, 0x080c, 0x8680, 0x7810, 0x20a2,
++	0xa006, 0x20a2, 0x20a2, 0x20a2, 0x20a2, 0x20a3, 0x4000, 0x0478,
++	0x0156, 0x0146, 0x20a1, 0x020b, 0x080c, 0x8680, 0x7810, 0x20a2,
++	0xa006, 0x20a2, 0x20a2, 0x20a2, 0x20a2, 0x20a3, 0x2000, 0x00f8,
++	0x0156, 0x0146, 0x20a1, 0x020b, 0x080c, 0x8680, 0x7810, 0x20a2,
++	0xa006, 0x20a2, 0x20a2, 0x20a2, 0x20a2, 0x20a3, 0x0400, 0x0078,
++	0x0156, 0x0146, 0x20a1, 0x020b, 0x080c, 0x8680, 0x7810, 0x20a2,
++	0xa006, 0x20a2, 0x20a2, 0x20a2, 0x20a2, 0x20a3, 0x0200, 0x0089,
++	0x60c3, 0x0020, 0x080c, 0x8be2, 0x014e, 0x015e, 0x0005, 0x00e6,
++	0x2071, 0xc927, 0x7020, 0xa005, 0x0110, 0x8001, 0x7022, 0x00ee,
++	0x0005, 0x20a9, 0x0008, 0x20a2, 0x1f04, 0x8fc3, 0x20a2, 0x20a2,
++	0x0005, 0x00f6, 0x00e6, 0x00d6, 0x00c6, 0x0076, 0x0066, 0x0006,
++	0x0126, 0x2091, 0x8000, 0x2071, 0xc927, 0x7614, 0x2660, 0x2678,
++	0x2039, 0x0001, 0x87ff, 0x0904, 0x905f, 0x8cff, 0x0904, 0x905f,
++	0x601c, 0xa086, 0x0006, 0x1904, 0x905a, 0x88ff, 0x0138, 0x2800,
++	0xac06, 0x1904, 0x905a, 0x2039, 0x0000, 0x0050, 0x6018, 0xa206,
++	0x1904, 0x905a, 0x85ff, 0x0120, 0x6050, 0xa106, 0x1904, 0x905a,
++	0x7024, 0xac06, 0x1598, 0x2069, 0x0100, 0x68c0, 0xa005, 0x1160,
++	0x6824, 0xd084, 0x0148, 0x6827, 0x0001, 0x080c, 0x7024, 0x080c,
++	0x90e6, 0x7027, 0x0000, 0x0410, 0x080c, 0x7024, 0x6820, 0xd0b4,
++	0x0110, 0x68a7, 0x95f5, 0x6817, 0x0008, 0x68c3, 0x0000, 0x080c,
++	0x90e6, 0x7027, 0x0000, 0x0036, 0x2069, 0x0140, 0x6b04, 0xa384,
++	0x1000, 0x0120, 0x6803, 0x0100, 0x6803, 0x0000, 0x2069, 0x0100,
++	0x6824, 0xd084, 0x0110, 0x6827, 0x0001, 0x003e, 0x7014, 0xac36,
++	0x1110, 0x660c, 0x7616, 0x7010, 0xac36, 0x1140, 0x2c00, 0xaf36,
++	0x0118, 0x2f00, 0x7012, 0x0010, 0x7013, 0x0000, 0x660c, 0x0066,
++	0x2c00, 0xaf06, 0x0110, 0x7e0e, 0x0008, 0x2678, 0x89ff, 0x1158,
++	0x600f, 0x0000, 0x6010, 0x2068, 0x080c, 0xac91, 0x0110, 0x080c,
++	0xc141, 0x080c, 0xae54, 0x080c, 0x8fb7, 0x88ff, 0x1190, 0x00ce,
++	0x0804, 0x8fda, 0x2c78, 0x600c, 0x2060, 0x0804, 0x8fda, 0xa006,
++	0x012e, 0x000e, 0x006e, 0x007e, 0x00ce, 0x00de, 0x00ee, 0x00fe,
++	0x0005, 0x6017, 0x0000, 0x00ce, 0xa8c5, 0x0001, 0x0c88, 0x00f6,
++	0x00e6, 0x00d6, 0x00c6, 0x0066, 0x0026, 0x0006, 0x0126, 0x2091,
++	0x8000, 0x2071, 0xc927, 0x7638, 0x2660, 0x2678, 0x8cff, 0x0904,
++	0x90d6, 0x601c, 0xa086, 0x0006, 0x1904, 0x90d1, 0x87ff, 0x0128,
++	0x2700, 0xac06, 0x1904, 0x90d1, 0x0048, 0x6018, 0xa206, 0x1904,
++	0x90d1, 0x85ff, 0x0118, 0x6050, 0xa106, 0x15d8, 0x703c, 0xac06,
++	0x1180, 0x0036, 0x2019, 0x0001, 0x080c, 0x8e79, 0x7033, 0x0000,
++	0x703f, 0x0000, 0x7043, 0x0000, 0x7047, 0x0000, 0x704b, 0x0000,
++	0x003e, 0x7038, 0xac36, 0x1110, 0x660c, 0x763a, 0x7034, 0xac36,
++	0x1140, 0x2c00, 0xaf36, 0x0118, 0x2f00, 0x7036, 0x0010, 0x7037,
++	0x0000, 0x660c, 0x0066, 0x2c00, 0xaf06, 0x0110, 0x7e0e, 0x0008,
++	0x2678, 0x600f, 0x0000, 0x6010, 0x2068, 0x080c, 0xac91, 0x0110,
++	0x080c, 0xc141, 0x080c, 0xae54, 0x87ff, 0x1190, 0x00ce, 0x0804,
++	0x907e, 0x2c78, 0x600c, 0x2060, 0x0804, 0x907e, 0xa006, 0x012e,
++	0x000e, 0x002e, 0x006e, 0x00ce, 0x00de, 0x00ee, 0x00fe, 0x0005,
++	0x6017, 0x0000, 0x00ce, 0xa7bd, 0x0001, 0x0c88, 0x00e6, 0x2071,
++	0xc927, 0x2001, 0xc600, 0x2004, 0xa086, 0x0002, 0x1118, 0x7007,
++	0x0005, 0x0010, 0x7007, 0x0000, 0x00ee, 0x0005, 0x00f6, 0x00e6,
++	0x00c6, 0x0066, 0x0026, 0x0006, 0x0126, 0x2091, 0x8000, 0x2071,
++	0xc927, 0x2c10, 0x7638, 0x2660, 0x2678, 0x8cff, 0x0518, 0x2200,
++	0xac06, 0x11e0, 0x7038, 0xac36, 0x1110, 0x660c, 0x763a, 0x7034,
++	0xac36, 0x1140, 0x2c00, 0xaf36, 0x0118, 0x2f00, 0x7036, 0x0010,
++	0x7037, 0x0000, 0x660c, 0x2c00, 0xaf06, 0x0110, 0x7e0e, 0x0008,
++	0x2678, 0x600f, 0x0000, 0xa085, 0x0001, 0x0020, 0x2c78, 0x600c,
++	0x2060, 0x08d8, 0x012e, 0x000e, 0x002e, 0x006e, 0x00ce, 0x00ee,
++	0x00fe, 0x0005, 0x00f6, 0x00e6, 0x00d6, 0x00c6, 0x0066, 0x0006,
++	0x0126, 0x2091, 0x8000, 0x2071, 0xc927, 0x760c, 0x2660, 0x2678,
++	0x8cff, 0x0904, 0x91bc, 0x6018, 0xa080, 0x0028, 0x2004, 0xa206,
++	0x1904, 0x91b7, 0x7024, 0xac06, 0x1508, 0x2069, 0x0100, 0x68c0,
++	0xa005, 0x0904, 0x9193, 0x080c, 0x8bf5, 0x68c3, 0x0000, 0x080c,
++	0x90e6, 0x7027, 0x0000, 0x0036, 0x2069, 0x0140, 0x6b04, 0xa384,
++	0x1000, 0x0120, 0x6803, 0x0100, 0x6803, 0x0000, 0x2069, 0x0100,
++	0x6824, 0xd084, 0x0110, 0x6827, 0x0001, 0x003e, 0x700c, 0xac36,
++	0x1110, 0x660c, 0x760e, 0x7008, 0xac36, 0x1140, 0x2c00, 0xaf36,
++	0x0118, 0x2f00, 0x700a, 0x0010, 0x700b, 0x0000, 0x660c, 0x0066,
++	0x2c00, 0xaf06, 0x0110, 0x7e0e, 0x0008, 0x2678, 0x600f, 0x0000,
++	0x080c, 0xae7e, 0x1158, 0x080c, 0x2e6c, 0x080c, 0xae8f, 0x11f0,
++	0x080c, 0x9c09, 0x00d8, 0x080c, 0x90e6, 0x08c0, 0x080c, 0xae8f,
++	0x1118, 0x080c, 0x9c09, 0x0090, 0x6010, 0x2068, 0x080c, 0xac91,
++	0x0168, 0x601c, 0xa086, 0x0003, 0x11f8, 0x6837, 0x0103, 0x6b4a,
++	0x6847, 0x0000, 0x080c, 0x580a, 0x080c, 0xae48, 0x080c, 0xb056,
++	0x080c, 0xae54, 0x080c, 0x8fb7, 0x00ce, 0x0804, 0x9140, 0x2c78,
++	0x600c, 0x2060, 0x0804, 0x9140, 0x012e, 0x000e, 0x006e, 0x00ce,
++	0x00de, 0x00ee, 0x00fe, 0x0005, 0x601c, 0xa086, 0x0006, 0x1d30,
++	0x080c, 0xc141, 0x0c18, 0x0036, 0x0156, 0x0136, 0x0146, 0x3908,
++	0xa006, 0xa190, 0x0020, 0x221c, 0xa39e, 0x2c61, 0x1118, 0x8210,
++	0x8000, 0x0cc8, 0xa005, 0x0138, 0x20a9, 0x0020, 0x2198, 0xa110,
++	0x22a0, 0x22c8, 0x53a3, 0x014e, 0x013e, 0x015e, 0x003e, 0x0005,
++	0x00d6, 0x20a1, 0x020b, 0x080c, 0x845b, 0x20a3, 0x0200, 0x20a3,
++	0x0014, 0x60c3, 0x0014, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x2099,
++	0xc900, 0x20a9, 0x0004, 0x53a6, 0x20a3, 0x0004, 0x20a3, 0x7878,
++	0x20a3, 0x0000, 0x20a3, 0x0000, 0x080c, 0x8be2, 0x00de, 0x0005,
++	0x20a1, 0x020b, 0x080c, 0x845b, 0x20a3, 0x0214, 0x20a3, 0x0018,
++	0x20a3, 0x0800, 0x7810, 0xa084, 0xff00, 0x20a2, 0x20a3, 0x0000,
++	0x20a3, 0x0000, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x7810, 0xa084,
++	0x00ff, 0x20a2, 0x7828, 0x20a2, 0x20a3, 0x0000, 0x20a3, 0x0000,
++	0x60c3, 0x0018, 0x080c, 0x8be2, 0x0005, 0x00d6, 0x0016, 0x2f68,
++	0x2009, 0x0035, 0x080c, 0xb141, 0x1904, 0x929b, 0x20a1, 0x020b,
++	0x080c, 0x83bf, 0x20a3, 0x1300, 0x20a3, 0x0000, 0x7828, 0x2068,
++	0x681c, 0xa086, 0x0003, 0x0580, 0x7818, 0xa080, 0x0028, 0x2014,
++	0x2001, 0xc635, 0x2004, 0xd0ac, 0x11d0, 0xa286, 0x007e, 0x1128,
++	0x20a3, 0x00ff, 0x20a3, 0xfffe, 0x04b8, 0xa286, 0x007f, 0x1128,
++	0x20a3, 0x00ff, 0x20a3, 0xfffd, 0x0478, 0xd2bc, 0x0180, 0xa286,
++	0x0080, 0x1128, 0x20a3, 0x00ff, 0x20a3, 0xfffc, 0x0428, 0xa2e8,
++	0xc77b, 0x2d6c, 0x6810, 0x20a2, 0x6814, 0x20a2, 0x00e8, 0x20a3,
++	0x0000, 0x6098, 0x20a2, 0x00c0, 0x2001, 0xc635, 0x2004, 0xd0ac,
++	0x1138, 0x7818, 0xa080, 0x0028, 0x2004, 0xa082, 0x007e, 0x0240,
++	0x00d6, 0x2069, 0xc61c, 0x2da6, 0x8d68, 0x2da6, 0x00de, 0x0020,
++	0x20a3, 0x0000, 0x6034, 0x20a2, 0x7834, 0x20a2, 0x7838, 0x20a2,
++	0x20a3, 0x0000, 0x20a3, 0x0000, 0x60c3, 0x000c, 0x080c, 0x8be2,
++	0x001e, 0x00de, 0x0005, 0x7817, 0x0001, 0x7803, 0x0006, 0x001e,
++	0x00de, 0x0005, 0x00d6, 0x0026, 0x7928, 0x2168, 0x691c, 0xa186,
++	0x0006, 0x01c0, 0xa186, 0x0003, 0x0904, 0x9311, 0xa186, 0x0005,
++	0x0904, 0x92fa, 0xa186, 0x0004, 0x05b8, 0xa186, 0x0008, 0x0904,
++	0x9302, 0x7807, 0x0037, 0x7813, 0x1700, 0x080c, 0x9379, 0x002e,
++	0x00de, 0x0005, 0x080c, 0x9335, 0x2009, 0x4000, 0x6800, 0x0002,
++	0x92db, 0x92e6, 0x92dd, 0x92e6, 0x92e2, 0x92db, 0x92db, 0x92e6,
++	0x92e6, 0x92e6, 0x92e6, 0x92db, 0x92db, 0x92db, 0x92db, 0x92db,
++	0x92e6, 0x92db, 0x92e6, 0x080c, 0x1519, 0x6820, 0xd0e4, 0x0110,
++	0xd0cc, 0x0110, 0xa00e, 0x0010, 0x2009, 0x2000, 0x6828, 0x20a2,
++	0x682c, 0x20a2, 0x0804, 0x932b, 0x080c, 0x9335, 0x20a3, 0x0000,
++	0x20a3, 0x0000, 0x2009, 0x4000, 0x6a00, 0xa286, 0x0002, 0x1108,
++	0xa00e, 0x0488, 0x04d1, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x2009,
++	0x4000, 0x0448, 0x0491, 0x20a3, 0x0000, 0x20a3, 0x0000, 0x2009,
++	0x4000, 0xa286, 0x0005, 0x0118, 0xa286, 0x0002, 0x1108, 0xa00e,
++	0x00d0, 0x0419, 0x6810, 0x2068, 0x697c, 0x6810, 0xa112, 0x6980,
++	0x6814, 0xa103, 0x20a2, 0x22a2, 0x7928, 0xa180, 0x0000, 0x2004,
++	0xa08e, 0x0002, 0x0130, 0xa08e, 0x0004, 0x0118, 0x2009, 0x4000,
++	0x0010, 0x2009, 0x0000, 0x21a2, 0x20a3, 0x0000, 0x60c3, 0x0018,
++	0x080c, 0x8be2, 0x002e, 0x00de, 0x0005, 0x0036, 0x0046, 0x0056,
++	0x0066, 0x20a1, 0x020b, 0x080c, 0x845b, 0xa006, 0x20a3, 0x0200,
++	0x20a2, 0x7934, 0x21a2, 0x7938, 0x21a2, 0x7818, 0xa080, 0x0028,
++	0x2004, 0x2011, 0xc635, 0x2214, 0xd2ac, 0x1118, 0xa092, 0x007e,
++	0x0268, 0x00d6, 0x2069, 0xc61c, 0x2d2c, 0x8d68, 0x2d34, 0xa0e8,
++	0xc77b, 0x2d6c, 0x6b10, 0x6c14, 0x00de, 0x0030, 0x2019, 0x0000,
++	0x6498, 0x2029, 0x0000, 0x6634, 0x7828, 0xa080, 0x0007, 0x2004,
++	0xa086, 0x0003, 0x1128, 0x25a2, 0x26a2, 0x23a2, 0x24a2, 0x0020,
++	0x23a2, 0x24a2, 0x25a2, 0x26a2, 0x006e, 0x005e, 0x004e, 0x003e,
++	0x0005, 0x20a1, 0x020b, 0x080c, 0x845b, 0x20a3, 0x0100, 0x20a3,
++	0x0000, 0x20a3, 0x0009, 0x7810, 0x20a2, 0x60c3, 0x0008, 0x080c,
++	0x8be2, 0x0005, 0x20a1, 0x020b, 0x080c, 0x83b7, 0x20a3, 0x1400,
++	0x20a3, 0x0000, 0x7834, 0x20a2, 0x7838, 0x20a2, 0x7828, 0x20a2,
++	0x782c, 0x20a2, 0x7830, 0xa084, 0x00ff, 0x8007, 0x20a2, 0x20a3,
++	0x0000, 0x60c3, 0x0010, 0x080c, 0x8be2, 0x0005, 0x20a1, 0x020b,
++	0x080c, 0x8453, 0x20a3, 0x0100, 0x20a3, 0x0000, 0x7828, 0x20a2,
++	0x7810, 0x20a2, 0x60c3, 0x0008, 0x080c, 0x8be2, 0x0005, 0x0146,
++	0x20a1, 0x020b, 0x0031, 0x60c3, 0x0000, 0x080c, 0x8be2, 0x014e,
++	0x0005, 0x20e1, 0x9080, 0x20e1, 0x4000, 0x7818, 0xa080, 0x0028,
++	0x2004, 0x2011, 0xc635, 0x2214, 0xd2ac, 0x1110, 0xd0bc, 0x0188,
++	0x00d6, 0xa0e8, 0xc77b, 0x2d6c, 0x6810, 0xa085, 0x0300, 0x20a2,
++	0x6814, 0x20a2, 0x2069, 0xc61c, 0x2da6, 0x8d68, 0x2da6, 0x00de,
++	0x0078, 0x00d6, 0xa0e8, 0xc77b, 0x2d6c, 0x6810, 0xa085, 0x0300,
++	0x20a2, 0x6814, 0x20a2, 0x00de, 0x20a3, 0x0000, 0x6234, 0x22a2,
++	0x20a3, 0x0819, 0x20a3, 0x0000, 0x080c, 0x8bd1, 0x22a2, 0x20a3,
++	0x0000, 0x2fa2, 0x7a08, 0x22a2, 0x20a3, 0x0000, 0x20a3, 0x0000,
++	0x0005, 0x20a1, 0x020b, 0x0079, 0x7910, 0x21a2, 0x20a3, 0x0000,
++	0x60c3, 0x0000, 0x20e1, 0x9080, 0x60a7, 0x9575, 0x080c, 0x8bec,
++	0x080c, 0x701b, 0x0005, 0x0156, 0x0136, 0x0036, 0x00d6, 0x00e6,
++	0x20e1, 0x9080, 0x20e1, 0x4000, 0x7854, 0x2068, 0xadf0, 0x000f,
++	0x7210, 0xa296, 0x00c0, 0xa294, 0xfffd, 0x7212, 0x7214, 0xa294,
++	0x0300, 0x7216, 0x7100, 0xa194, 0x00ff, 0x7308, 0xa384, 0x00ff,
++	0xa08d, 0xc200, 0x7102, 0xa384, 0xff00, 0xa215, 0x720a, 0x7004,
++	0x720c, 0x700e, 0x7206, 0x20a9, 0x000a, 0x2e98, 0x53a6, 0x60a3,
++	0x0035, 0x6a38, 0xa294, 0x7000, 0xa286, 0x3000, 0x0110, 0x60a3,
++	0x0037, 0x00ee, 0x00de, 0x003e, 0x013e, 0x015e, 0x0005, 0x2009,
++	0x0092, 0x0010, 0x2009, 0x0096, 0x60ab, 0x0036, 0x6116, 0x0005,
++	0x609b, 0x0000, 0x20a1, 0x020b, 0x20e1, 0x9080, 0x20e1, 0x4000,
++	0x20a3, 0x22ff, 0x20a3, 0xffff, 0x00d6, 0x2069, 0xc61c, 0x2da6,
++	0x8d68, 0x2da6, 0x00de, 0x20a3, 0x0138, 0x20a3, 0x0000, 0x0026,
++	0x080c, 0x8bd1, 0x22a2, 0x20a3, 0x0000, 0x2fa2, 0x20a3, 0xffff,
++	0x20a3, 0x0000, 0x20a3, 0x0000, 0x002e, 0x20a3, 0x5400, 0x20a3,
++	0x0000, 0x080c, 0x768f, 0x11b8, 0x0016, 0x7810, 0xa080, 0x000d,
++	0x20a9, 0x0014, 0x200c, 0x810f, 0x21a2, 0x8000, 0x1f04, 0x948a,
++	0x20a9, 0x0012, 0x2001, 0x0000, 0x20a3, 0x0000, 0x1f04, 0x9494,
++	0x001e, 0x0804, 0x9502, 0x7810, 0x0016, 0x00c6, 0x00d6, 0x7810,
++	0x2068, 0x2061, 0xc600, 0x6070, 0xa084, 0x00ff, 0x6968, 0x810f,
++	0xa18c, 0xff00, 0xa105, 0x20a2, 0x6074, 0x20a2, 0x6968, 0xa18c,
++	0xff00, 0x21a2, 0x20a3, 0x0000, 0x20a9, 0x0004, 0x2009, 0xc605,
++	0x2104, 0x20a2, 0x8108, 0x1f04, 0x94b8, 0x20a9, 0x0004, 0x2009,
++	0xc601, 0x2104, 0x20a2, 0x8108, 0x1f04, 0x94c1, 0x20a9, 0x0004,
++	0x2d08, 0xa188, 0x001d, 0x2104, 0x8007, 0x20a2, 0x8108, 0x1f04,
++	0x94cb, 0x20a9, 0x0004, 0x2d08, 0xa188, 0x0021, 0x2104, 0x8007,
++	0x20a2, 0x8108, 0x1f04, 0x94d6, 0x080c, 0x7694, 0x1138, 0x20a9,
++	0x0008, 0x20a3, 0x0000, 0x1f04, 0x94e1, 0x0050, 0x20a9, 0x0008,
++	0x2009, 0xc69a, 0x2104, 0x8007, 0x20a2, 0x8108, 0x1f04, 0x94ea,
++	0x20a9, 0x0008, 0x2d08, 0xa188, 0x0025, 0x2104, 0x8007, 0x20a2,
++	0x8108, 0x1f04, 0x94f5, 0x00de, 0x00ce, 0x001e, 0x20a3, 0x0000,
++	0x20a3, 0x0000, 0x60c3, 0x004c, 0x080c, 0x8be2, 0x0005, 0x20a1,
++	0x020b, 0x080c, 0x83bf, 0x20a3, 0x5500, 0x20a3, 0x0000, 0x7810,
++	0x0016, 0x00c6, 0x00d6, 0x7810, 0x2068, 0x686c, 0xa084, 0x00ff,
++	0x6968, 0x810f, 0xa18c, 0xff00, 0xa105, 0x20a2, 0x696c, 0xa18c,
++	0xff00, 0x6870, 0xa084, 0x00ff, 0xa105, 0x20a2, 0x6968, 0xa18c,
++	0xff00, 0x2061, 0xc600, 0x6070, 0xa084, 0x00ff, 0xa10d, 0x21a2,
++	0x6174, 0x21a2, 0x20a9, 0x0004, 0x2d08, 0xa188, 0x001d, 0x2104,
++	0x8007, 0x20a2, 0x8108, 0x1f04, 0x9537, 0x20a9, 0x0004, 0x2d08,
++	0xa188, 0x0021, 0x2104, 0x8007, 0x20a2, 0x8108, 0x1f04, 0x9542,
++	0x20a9, 0x0004, 0x2009, 0xc605, 0x2104, 0x20a2, 0x8108, 0x1f04,
++	0x954c, 0x20a9, 0x0004, 0x2009, 0xc601, 0x2104, 0x20a2, 0x8108,
++	0x1f04, 0x9555, 0x20a9, 0x0008, 0x2d08, 0xa188, 0x0025, 0x2104,
++	0x8007, 0x20a2, 0x8108, 0x1f04, 0x955f, 0x080c, 0x7694, 0x1138,
++	0x20a9, 0x0008, 0x20a3, 0x0000, 0x1f04, 0x956a, 0x0050, 0x20a9,
++	0x0008, 0x2009, 0xc69a, 0x2104, 0x8007, 0x20a2, 0x8108, 0x1f04,
++	0x9573, 0x00de, 0x00ce, 0x001e, 0x20a3, 0x0000, 0x20a3, 0x0000,
++	0x60c3, 0x004c, 0x080c, 0x8be2, 0x0005, 0x2061, 0xce00, 0x2a70,
++	0x7068, 0x704a, 0x704f, 0xce00, 0x0005, 0x00e6, 0x0126, 0x2071,
++	0xc600, 0x2091, 0x8000, 0x7548, 0xa582, 0x0010, 0x0608, 0x704c,
++	0x2060, 0x6000, 0xa086, 0x0000, 0x0148, 0xace0, 0x0018, 0x705c,
++	0xac02, 0x1208, 0x0cb0, 0x2061, 0xce00, 0x0c98, 0x6003, 0x0008,
++	0x8529, 0x754a, 0xaca8, 0x0018, 0x705c, 0xa502, 0x1230, 0x754e,
++	0xa085, 0x0001, 0x012e, 0x00ee, 0x0005, 0x704f, 0xce00, 0x0cc0,
++	0xa006, 0x0cc0, 0x00e6, 0x2071, 0xc600, 0x7548, 0xa582, 0x0010,
++	0x0600, 0x704c, 0x2060, 0x6000, 0xa086, 0x0000, 0x0148, 0xace0,
++	0x0018, 0x705c, 0xac02, 0x1208, 0x0cb0, 0x2061, 0xce00, 0x0c98,
++	0x6003, 0x0008, 0x8529, 0x754a, 0xaca8, 0x0018, 0x705c, 0xa502,
++	0x1228, 0x754e, 0xa085, 0x0001, 0x00ee, 0x0005, 0x704f, 0xce00,
++	0x0cc8, 0xa006, 0x0cc8, 0xac82, 0xce00, 0x0a0c, 0x1519, 0x2001,
++	0xc617, 0x2004, 0xac02, 0x1a0c, 0x1519, 0xa006, 0x6006, 0x600a,
++	0x600e, 0x6012, 0x6016, 0x601a, 0x601f, 0x0000, 0x6003, 0x0000,
++	0x6052, 0x6056, 0x6022, 0x6026, 0x602a, 0x602e, 0x6032, 0x6036,
++	0x603a, 0x603e, 0x6026, 0x2061, 0xc600, 0x6048, 0x8000, 0x604a,
++	0xa086, 0x0001, 0x0108, 0x0005, 0x0126, 0x2091, 0x8000, 0x080c,
++	0x7e94, 0x012e, 0x0cc0, 0x601c, 0xa084, 0x000f, 0x0002, 0x9622,
++	0x9631, 0x964c, 0x9667, 0xb189, 0xb1a4, 0xb1bf, 0x9622, 0x9631,
++	0x7699, 0x9682, 0xa186, 0x0013, 0x1128, 0x080c, 0x7db1, 0x080c,
++	0x7e94, 0x0005, 0xa18e, 0x0047, 0x1118, 0xa016, 0x080c, 0x1870,
++	0x0005, 0x0066, 0x6000, 0xa0b2, 0x0010, 0x1a0c, 0x1519, 0x0013,
++	0x006e, 0x0005, 0x964a, 0x9a78, 0x9c43, 0x964a, 0x9cc0, 0x9740,
++	0x964a, 0x964a, 0x9a0a, 0xa126, 0x964a, 0x964a, 0x964a, 0x964a,
++	0x964a, 0x964a, 0x080c, 0x1519, 0x0066, 0x6000, 0xa0b2, 0x0010,
++	0x1a0c, 0x1519, 0x0013, 0x006e, 0x0005, 0x9665, 0xa759, 0x9665,
++	0x9665, 0x9665, 0x9665, 0x9665, 0x9665, 0xa704, 0xa8c5, 0x9665,
++	0xa786, 0xa7fd, 0xa786, 0xa7fd, 0x9665, 0x080c, 0x1519, 0x0066,
++	0x6000, 0xa0b2, 0x0010, 0x1a0c, 0x1519, 0x0013, 0x006e, 0x0005,
++	0x9680, 0xa167, 0xa231, 0xa36c, 0xa4c8, 0x9680, 0x9680, 0x9680,
++	0xa141, 0xa6b4, 0xa6b7, 0x9680, 0x9680, 0x9680, 0x9680, 0xa6e1,
++	0x080c, 0x1519, 0x0066, 0x6000, 0xa0b2, 0x0010, 0x1a0c, 0x1519,
++	0x0013, 0x006e, 0x0005, 0x969b, 0x969b, 0x969b, 0x96c9, 0x9716,
++	0x969b, 0x969b, 0x969b, 0x969d, 0x969b, 0x969b, 0x969b, 0x969b,
++	0x969b, 0x969b, 0x969b, 0x080c, 0x1519, 0xa186, 0x0003, 0x190c,
++	0x1519, 0x00d6, 0x6003, 0x0003, 0x6106, 0x6010, 0x2068, 0x684f,
++	0x0040, 0x687c, 0x680a, 0x6880, 0x680e, 0x6813, 0x0000, 0x6817,
++	0x0000, 0x6854, 0xa092, 0x199a, 0x0210, 0x2001, 0x1999, 0x8003,
++	0x8013, 0x8213, 0xa210, 0x6216, 0x00de, 0x2c10, 0x080c, 0x2068,
++	0x080c, 0x79fc, 0x0126, 0x2091, 0x8000, 0x080c, 0x7f6e, 0x012e,
++	0x0005, 0xa182, 0x0047, 0x0002, 0x96d5, 0x96d5, 0x96d7, 0x96f0,
++	0x96d5, 0x96d5, 0x96d5, 0x96d5, 0x9702, 0x080c, 0x1519, 0x00d6,
++	0x0016, 0x080c, 0x7e47, 0x080c, 0x7f6e, 0x6003, 0x0004, 0x6110,
++	0x2168, 0x684f, 0x0020, 0x685c, 0x685a, 0x6874, 0x687e, 0x6878,
++	0x6882, 0x6897, 0x0000, 0x689b, 0x0000, 0x001e, 0x00de, 0x0005,
++	0x080c, 0x7e47, 0x00d6, 0x6110, 0x2168, 0x080c, 0xac91, 0x0120,
++	0x684b, 0x0006, 0x080c, 0x580a, 0x00de, 0x080c, 0x95e3, 0x080c,
++	0x7f6e, 0x0005, 0x080c, 0x7e47, 0x080c, 0x2e46, 0x00d6, 0x6110,
++	0x2168, 0x080c, 0xac91, 0x0120, 0x684b, 0x0029, 0x080c, 0x580a,
++	0x00de, 0x080c, 0x95e3, 0x080c, 0x7f6e, 0x0005, 0xa182, 0x0047,
++	0x0002, 0x9724, 0x9733, 0x9722, 0x9722, 0x9722, 0x9722, 0x9722,
++	0x9722, 0x9722, 0x080c, 0x1519, 0x00d6, 0x6010, 0x2068, 0x684c,
++	0xc0f4, 0x684e, 0x00de, 0x20e1, 0x0005, 0x3d18, 0x3e20, 0x2c10,
++	0x080c, 0x1870, 0x0005, 0x00d6, 0x6110, 0x2168, 0x684b, 0x0000,
++	0x6853, 0x0000, 0x080c, 0x580a, 0x00de, 0x080c, 0x95e3, 0x0005,
++	0xa1b6, 0x0015, 0x1118, 0x080c, 0x95e3, 0x0030, 0xa1b6, 0x0016,
++	0x190c, 0x1519, 0x080c, 0x95e3, 0x0005, 0x20a9, 0x000e, 0x2e98,
++	0x6010, 0x20a0, 0x53a3, 0x20a9, 0x0006, 0x3310, 0x3420, 0x9398,
++	0x94a0, 0x3318, 0x3428, 0x222e, 0x2326, 0xa290, 0x0002, 0xa5a8,
++	0x0002, 0xa398, 0x0002, 0xa4a0, 0x0002, 0x1f04, 0x975b, 0x00e6,
++	0x080c, 0xac91, 0x0130, 0x6010, 0x2070, 0x7007, 0x0000, 0x7037,
++	0x0103, 0x00ee, 0x080c, 0x95e3, 0x0005, 0x00d6, 0x0036, 0x7330,
++	0xa386, 0x0200, 0x1130, 0x6018, 0x2068, 0x6813, 0x00ff, 0x6817,
++	0xfffd, 0x6010, 0xa005, 0x0130, 0x2068, 0x6807, 0x0000, 0x6837,
++	0x0103, 0x6b32, 0x080c, 0x95e3, 0x003e, 0x00de, 0x0005, 0x0016,
++	0x20a9, 0x002a, 0xae80, 0x000c, 0x2098, 0x6010, 0xa080, 0x0002,
++	0x20a0, 0x53a3, 0x20a9, 0x002a, 0x6010, 0xa080, 0x0001, 0x2004,
++	0xa080, 0x0002, 0x20a0, 0x53a3, 0x00e6, 0x6010, 0x2004, 0x2070,
++	0x7037, 0x0103, 0x00ee, 0x080c, 0x95e3, 0x001e, 0x0005, 0x0016,
++	0x2009, 0x0000, 0x7030, 0xa086, 0x0100, 0x0140, 0x7038, 0xa084,
++	0x00ff, 0x800c, 0x703c, 0xa084, 0x00ff, 0x8004, 0xa080, 0x0004,
++	0xa108, 0x21a8, 0xae80, 0x000c, 0x2098, 0x6010, 0xa080, 0x0002,
++	0x20a0, 0x080c, 0x4ecb, 0x00e6, 0x080c, 0xac91, 0x0140, 0x6010,
++	0x2070, 0x7007, 0x0000, 0x7034, 0x70b2, 0x7037, 0x0103, 0x00ee,
++	0x080c, 0x95e3, 0x001e, 0x0005, 0x0016, 0x2009, 0x0000, 0x7030,
++	0xa086, 0x0200, 0x0110, 0x2009, 0x0001, 0x00d6, 0x6010, 0xa06d,
++	0x090c, 0x1519, 0x694a, 0x080c, 0x580a, 0x00de, 0x080c, 0x95e3,
++	0x001e, 0x0005, 0x00e6, 0x00d6, 0x603f, 0x0000, 0x2c68, 0x0016,
++	0x2009, 0x0035, 0x080c, 0xb141, 0x001e, 0x1168, 0x0026, 0x6228,
++	0x2268, 0x002e, 0x2071, 0xcc8c, 0x6b1c, 0xa386, 0x0003, 0x0130,
++	0xa386, 0x0006, 0x0128, 0x080c, 0x95e3, 0x0020, 0x0031, 0x0010,
++	0x080c, 0x98d3, 0x00de, 0x00ee, 0x0005, 0x00f6, 0x6810, 0x2078,
++	0xa186, 0x0015, 0x0904, 0x98ba, 0xa18e, 0x0016, 0x1904, 0x98d1,
++	0x700c, 0xa08c, 0xff00, 0xa186, 0x1700, 0x0120, 0xa186, 0x0300,
++	0x1904, 0x9899, 0x8fff, 0x1138, 0x6800, 0xa086, 0x000f, 0x0904,
++	0x987d, 0x0804, 0x98cf, 0x6808, 0xa086, 0xffff, 0x1904, 0x98bc,
++	0x784c, 0xa084, 0x0060, 0xa086, 0x0020, 0x1150, 0x797c, 0x7810,
++	0xa106, 0x1904, 0x98bc, 0x7980, 0x7814, 0xa106, 0x1904, 0x98bc,
++	0x080c, 0xae48, 0x6858, 0x7852, 0x784c, 0xc0dc, 0xc0f4, 0xc0d4,
++	0x784e, 0x0026, 0xa00e, 0x6a14, 0x2001, 0x000a, 0x080c, 0x783f,
++	0x7854, 0xa20a, 0x0208, 0x8011, 0x7a56, 0x82ff, 0x002e, 0x1138,
++	0x00c6, 0x2d60, 0x080c, 0xaa40, 0x00ce, 0x0804, 0x98cf, 0x00c6,
++	0x00d6, 0x2f68, 0x6838, 0xd0fc, 0x1118, 0x080c, 0x4fa6, 0x0010,
++	0x080c, 0x51dd, 0x00de, 0x00ce, 0x1904, 0x98bc, 0x00c6, 0x2d60,
++	0x080c, 0x95e3, 0x00ce, 0x0804, 0x98cf, 0x00c6, 0x080c, 0xaf0d,
++	0x0190, 0x6013, 0x0000, 0x6818, 0x601a, 0x080c, 0xb05e, 0x601f,
++	0x0003, 0x6904, 0x00c6, 0x2d60, 0x080c, 0x95e3, 0x00ce, 0x080c,
++	0x9613, 0x00ce, 0x04e0, 0x2001, 0xc8ff, 0x2004, 0x683e, 0x00ce,
++	0x04b0, 0x7008, 0xa086, 0x000b, 0x11a0, 0x6018, 0x200c, 0xc1bc,
++	0x2102, 0x00c6, 0x2d60, 0x7853, 0x0003, 0x6007, 0x0085, 0x6003,
++	0x000b, 0x601f, 0x0002, 0x080c, 0x7999, 0x080c, 0x7e94, 0x00ce,
++	0x00f0, 0x700c, 0xa086, 0x2a00, 0x1138, 0x2001, 0xc8ff, 0x2004,
++	0x683e, 0x00a8, 0x0481, 0x00a8, 0x8fff, 0x090c, 0x1519, 0x00c6,
++	0x00d6, 0x2d60, 0x2f68, 0x6837, 0x0103, 0x684b, 0x0003, 0x080c,
++	0xa934, 0x080c, 0xae48, 0x080c, 0xae54, 0x00de, 0x00ce, 0x080c,
++	0x95e3, 0x00fe, 0x0005, 0xa186, 0x0015, 0x1128, 0x2001, 0xc8ff,
++	0x2004, 0x683e, 0x0068, 0xa18e, 0x0016, 0x1160, 0x00c6, 0x2d00,
++	0x2060, 0x080c, 0xc3e2, 0x080c, 0x7103, 0x080c, 0x95e3, 0x00ce,
++	0x080c, 0x95e3, 0x0005, 0x0026, 0x0036, 0x0046, 0x7228, 0x7c80,
++	0x7b7c, 0xd2f4, 0x0130, 0x2001, 0xc8ff, 0x2004, 0x683e, 0x0804,
++	0x994d, 0x00c6, 0x2d60, 0x080c, 0xa954, 0x00ce, 0x6804, 0xa086,
++	0x0050, 0x1168, 0x00c6, 0x2d00, 0x2060, 0x6003, 0x0001, 0x6007,
++	0x0050, 0x080c, 0x7999, 0x080c, 0x7e94, 0x00ce, 0x04f0, 0x6800,
++	0xa086, 0x000f, 0x01c8, 0x8fff, 0x090c, 0x1519, 0x6820, 0xd0dc,
++	0x1198, 0x6800, 0xa086, 0x0004, 0x1198, 0x784c, 0xd0ac, 0x0180,
++	0x784c, 0xc0dc, 0xc0f4, 0x784e, 0x7850, 0xc0f4, 0xc0fc, 0x7852,
++	0x2001, 0x0001, 0x682e, 0x00e0, 0x2001, 0x0007, 0x682e, 0x00c0,
++	0x784c, 0xd0b4, 0x1130, 0xd0ac, 0x0db8, 0x784c, 0xd0f4, 0x1da0,
++	0x0c38, 0xd2ec, 0x1d88, 0x7024, 0xa306, 0x1118, 0x7020, 0xa406,
++	0x0d58, 0x7020, 0x6836, 0x7024, 0x683a, 0x2001, 0x0005, 0x682e,
++	0x080c, 0xaf9a, 0x080c, 0x7e94, 0x0010, 0x080c, 0x95e3, 0x004e,
++	0x003e, 0x002e, 0x0005, 0x00e6, 0x00d6, 0x0026, 0x6034, 0x2068,
++	0x6a1c, 0xa286, 0x0007, 0x0904, 0x99b1, 0xa286, 0x0002, 0x0904,
++	0x99b1, 0xa286, 0x0000, 0x0904, 0x99b1, 0x6808, 0x6338, 0xa306,
++	0x1904, 0x99b1, 0x2071, 0xcc8c, 0xa186, 0x0015, 0x05e0, 0xa18e,
++	0x0016, 0x1190, 0x6030, 0xa084, 0x00ff, 0xa086, 0x0001, 0x1160,
++	0x700c, 0xa086, 0x2a00, 0x1140, 0x6034, 0xa080, 0x0008, 0x200c,
++	0xc1dd, 0xc1f5, 0x2102, 0x0438, 0x00c6, 0x6034, 0x2060, 0x6104,
++	0xa186, 0x004b, 0x01a0, 0xa186, 0x004c, 0x0188, 0xa186, 0x004d,
++	0x0170, 0xa186, 0x004e, 0x0158, 0xa186, 0x0052, 0x0140, 0x6010,
++	0x2068, 0x080c, 0xac91, 0x090c, 0x1519, 0x6853, 0x0003, 0x6007,
++	0x0085, 0x6003, 0x000b, 0x601f, 0x0002, 0x080c, 0x7999, 0x080c,
++	0x7e94, 0x00ce, 0x0030, 0x6034, 0x2070, 0x2001, 0xc8ff, 0x2004,
++	0x703e, 0x080c, 0x95e3, 0x002e, 0x00de, 0x00ee, 0x0005, 0x00d6,
++	0x20a9, 0x000e, 0x2e98, 0x6010, 0x20a0, 0x53a3, 0xa1b6, 0x0015,
++	0x1558, 0x6018, 0x2068, 0x0156, 0x0036, 0x0026, 0xae90, 0x000c,
++	0xa290, 0x0004, 0x20a9, 0x0004, 0xad98, 0x000a, 0x080c, 0xa103,
++	0x002e, 0x003e, 0x015e, 0x11d8, 0x0156, 0x0036, 0x0026, 0xae90,
++	0x000c, 0xa290, 0x0008, 0x20a9, 0x0004, 0xad98, 0x0006, 0x080c,
++	0xa103, 0x002e, 0x003e, 0x015e, 0x1150, 0x7038, 0x680a, 0x703c,
++	0x680e, 0x6800, 0xc08d, 0x6802, 0x00de, 0x0804, 0x9767, 0x080c,
++	0x2e46, 0x00c6, 0x080c, 0x958d, 0x2f00, 0x601a, 0x6013, 0x0000,
++	0x601f, 0x0001, 0x6007, 0x0001, 0x6003, 0x0001, 0x2001, 0x0007,
++	0x080c, 0x5291, 0x080c, 0x52be, 0x080c, 0x79df, 0x080c, 0x7e94,
++	0x00ce, 0x0c10, 0x2100, 0xa1b2, 0x0080, 0x1a0c, 0x1519, 0xa1b2,
++	0x0040, 0x1a04, 0x9a6e, 0x0002, 0x9a62, 0x9a56, 0x9a62, 0x9a62,
++	0x9a62, 0x9a62, 0x9a54, 0x9a54, 0x9a54, 0x9a54, 0x9a54, 0x9a54,
++	0x9a54, 0x9a54, 0x9a54, 0x9a54, 0x9a54, 0x9a54, 0x9a54, 0x9a54,
++	0x9a54, 0x9a54, 0x9a54, 0x9a54, 0x9a54, 0x9a54, 0x9a54, 0x9a54,
++	0x9a54, 0x9a54, 0x9a54, 0x9a62, 0x9a54, 0x9a62, 0x9a62, 0x9a54,
++	0x9a54, 0x9a54, 0x9a54, 0x9a54, 0x9a62, 0x9a54, 0x9a54, 0x9a54,
++	0x9a54, 0x9a54, 0x9a54, 0x9a54, 0x9a54, 0x9a54, 0x9a62, 0x9a62,
++	0x9a54, 0x9a54, 0x9a54, 0x9a54, 0x9a54, 0x9a54, 0x9a54, 0x9a54,
++	0x9a54, 0x9a62, 0x9a54, 0x9a54, 0x080c, 0x1519, 0x6003, 0x0001,
++	0x6106, 0x080c, 0x79df, 0x0126, 0x2091, 0x8000, 0x080c, 0x7e94,
++	0x012e, 0x0005, 0x6003, 0x0001, 0x6106, 0x080c, 0x79df, 0x0126,
++	0x2091, 0x8000, 0x080c, 0x7e94, 0x012e, 0x0005, 0x2600, 0x0002,
++	0x9a62, 0x9a62, 0x9a76, 0x9a62, 0x9a62, 0x9a76, 0x080c, 0x1519,
++	0x6004, 0xa0b2, 0x0080, 0x1a0c, 0x1519, 0xa1b6, 0x0013, 0x0904,
++	0x9b28, 0xa1b6, 0x0027, 0x1904, 0x9aee, 0x080c, 0x7db1, 0x6004,
++	0x080c, 0xae7e, 0x0190, 0x080c, 0xae8f, 0x0904, 0x9ae8, 0xa08e,
++	0x0021, 0x0904, 0x9aeb, 0xa08e, 0x0022, 0x0904, 0x9ae8, 0xa08e,
++	0x003d, 0x0904, 0x9aeb, 0x0804, 0x9ae1, 0x080c, 0x2e6c, 0x2001,
++	0x0007, 0x080c, 0x5291, 0x6018, 0xa080, 0x0028, 0x200c, 0x080c,
++	0x9c09, 0xa186, 0x007e, 0x1148, 0x2001, 0xc635, 0x2014, 0xc285,
++	0x080c, 0x5f22, 0x1108, 0xc2ad, 0x2202, 0x0016, 0x0026, 0x0036,
++	0x2110, 0x0026, 0x2019, 0x0028, 0x080c, 0x9132, 0x002e, 0x080c,
++	0xc4e4, 0x003e, 0x002e, 0x001e, 0x0016, 0x0026, 0x0036, 0x2110,
++	0x2019, 0x0028, 0x080c, 0x7b16, 0x0076, 0x2039, 0x0000, 0x080c,
++	0x7a0e, 0x00c6, 0x6018, 0xa065, 0x0110, 0x080c, 0x553e, 0x00ce,
++	0x2c08, 0x080c, 0xbef7, 0x007e, 0x003e, 0x002e, 0x001e, 0x080c,
++	0x5300, 0x080c, 0xb056, 0x080c, 0x95e3, 0x080c, 0x7e94, 0x0005,
++	0x080c, 0x9c09, 0x0cb0, 0x080c, 0x9c37, 0x0c98, 0xa186, 0x0014,
++	0x1db0, 0x080c, 0x7db1, 0x080c, 0x2e46, 0x080c, 0xae7e, 0x1188,
++	0x080c, 0x2e6c, 0x6018, 0xa080, 0x0028, 0x200c, 0x080c, 0x9c09,
++	0xa186, 0x007e, 0x1128, 0x2001, 0xc635, 0x200c, 0xc185, 0x2102,
++	0x08c0, 0x080c, 0xae8f, 0x1118, 0x080c, 0x9c09, 0x0890, 0x6004,
++	0xa08e, 0x0032, 0x1158, 0x00e6, 0x00f6, 0x2071, 0xc6a2, 0x2079,
++	0x0000, 0x080c, 0x3179, 0x00fe, 0x00ee, 0x0818, 0x6004, 0xa08e,
++	0x0021, 0x0d50, 0xa08e, 0x0022, 0x090c, 0x9c09, 0x0804, 0x9ae1,
++	0xa0b2, 0x0040, 0x1a04, 0x9beb, 0x2008, 0x0002, 0x9b70, 0x9b71,
++	0x9b74, 0x9b77, 0x9b7a, 0x9b7d, 0x9b6e, 0x9b6e, 0x9b6e, 0x9b6e,
++	0x9b6e, 0x9b6e, 0x9b6e, 0x9b6e, 0x9b6e, 0x9b6e, 0x9b6e, 0x9b6e,
++	0x9b6e, 0x9b6e, 0x9b6e, 0x9b6e, 0x9b6e, 0x9b6e, 0x9b6e, 0x9b6e,
++	0x9b6e, 0x9b6e, 0x9b6e, 0x9b6e, 0x9b80, 0x9b8f, 0x9b6e, 0x9b91,
++	0x9b8f, 0x9b6e, 0x9b6e, 0x9b6e, 0x9b6e, 0x9b6e, 0x9b8f, 0x9b8f,
++	0x9b6e, 0x9b6e, 0x9b6e, 0x9b6e, 0x9b6e, 0x9b6e, 0x9b6e, 0x9b6e,
++	0x9bcb, 0x9b8f, 0x9b6e, 0x9b8b, 0x9b6e, 0x9b6e, 0x9b6e, 0x9b8c,
++	0x9b6e, 0x9b6e, 0x9b6e, 0x9b8f, 0x9bc2, 0x9b6e, 0x080c, 0x1519,
++	0x00f0, 0x2001, 0x000b, 0x0460, 0x2001, 0x0003, 0x0448, 0x2001,
++	0x0005, 0x0430, 0x2001, 0x0001, 0x0418, 0x2001, 0x0009, 0x0400,
++	0x080c, 0x7db1, 0x6003, 0x0005, 0x2001, 0xc8ff, 0x2004, 0x603e,
++	0x080c, 0x7e94, 0x00a0, 0x0018, 0x0010, 0x080c, 0x5291, 0x0804,
++	0x9bdc, 0x080c, 0x7db1, 0x2001, 0xc8fd, 0x2004, 0x6016, 0x2001,
++	0xc8ff, 0x2004, 0x603e, 0x6003, 0x0004, 0x080c, 0x7e94, 0x0005,
++	0x080c, 0x5291, 0x080c, 0x7db1, 0x6003, 0x0002, 0x2001, 0xc8ff,
++	0x2004, 0x603e, 0x0036, 0x2019, 0xc65d, 0x2304, 0xa084, 0xff00,
++	0x1120, 0x2001, 0xc8fd, 0x201c, 0x0040, 0x8007, 0xa09a, 0x0004,
++	0x0ec0, 0x8003, 0x801b, 0x831b, 0xa318, 0x6316, 0x003e, 0x080c,
++	0x7e94, 0x08e8, 0x080c, 0x7db1, 0x080c, 0xb056, 0x080c, 0x95e3,
++	0x080c, 0x7e94, 0x08a0, 0x00e6, 0x00f6, 0x2071, 0xc6a2, 0x2079,
++	0x0000, 0x080c, 0x3179, 0x00fe, 0x00ee, 0x080c, 0x7db1, 0x080c,
++	0x95e3, 0x080c, 0x7e94, 0x0818, 0x080c, 0x7db1, 0x2001, 0xc8ff,
++	0x2004, 0x603e, 0x6003, 0x0002, 0x2001, 0xc8fd, 0x2004, 0x6016,
++	0x080c, 0x7e94, 0x0005, 0x2600, 0x2008, 0x0002, 0x9bf6, 0x9bdc,
++	0x9bf4, 0x9bdc, 0x9bdc, 0x9bf4, 0x080c, 0x1519, 0x080c, 0x7db1,
++	0x00d6, 0x6010, 0x2068, 0x080c, 0x768f, 0x1118, 0x080c, 0x1619,
++	0x0010, 0x080c, 0x580a, 0x00de, 0x080c, 0x95e3, 0x080c, 0x7e94,
++	0x0005, 0x00e6, 0x0026, 0x0016, 0x080c, 0xac91, 0x0508, 0x6010,
++	0x2070, 0x7034, 0xa086, 0x0139, 0x1148, 0x2001, 0x0030, 0x2009,
++	0x0000, 0x2011, 0x4005, 0x080c, 0xb10d, 0x0090, 0x7038, 0xd0fc,
++	0x0178, 0x7007, 0x0000, 0x0016, 0x6004, 0xa08e, 0x0021, 0x0160,
++	0xa08e, 0x003d, 0x0148, 0x001e, 0x7037, 0x0103, 0x7033, 0x0100,
++	0x001e, 0x002e, 0x00ee, 0x0005, 0x001e, 0x0009, 0x0cc8, 0x00e6,
++	0xacf0, 0x0004, 0x2e74, 0x7000, 0x2070, 0x7037, 0x0103, 0x7023,
++	0x8001, 0x00ee, 0x0005, 0x00d6, 0x6618, 0x2668, 0x6804, 0xa084,
++	0x00ff, 0x00de, 0xa0b2, 0x000c, 0x1a0c, 0x1519, 0x6604, 0xa6b6,
++	0x0043, 0x1120, 0x080c, 0xb0c9, 0x0804, 0x9cb0, 0x6604, 0xa6b6,
++	0x0033, 0x1120, 0x080c, 0xb079, 0x0804, 0x9cb0, 0x6604, 0xa6b6,
++	0x0028, 0x1120, 0x080c, 0xaebf, 0x0804, 0x9cb0, 0x6604, 0xa6b6,
++	0x0029, 0x1120, 0x080c, 0xaed6, 0x0804, 0x9cb0, 0x6604, 0xa6b6,
++	0x001f, 0x1118, 0x080c, 0x974d, 0x04d8, 0x6604, 0xa6b6, 0x0000,
++	0x1118, 0x080c, 0x99b7, 0x04a0, 0x6604, 0xa6b6, 0x0022, 0x1118,
++	0x080c, 0x9775, 0x0468, 0x6604, 0xa6b6, 0x0035, 0x1118, 0x080c,
++	0x97f2, 0x0430, 0x6604, 0xa6b6, 0x0039, 0x1118, 0x080c, 0x9953,
++	0x00f8, 0x6604, 0xa6b6, 0x003d, 0x1118, 0x080c, 0x978f, 0x00c0,
++	0x6604, 0xa6b6, 0x0044, 0x1118, 0x080c, 0x97af, 0x0088, 0x6604,
++	0xa6b6, 0x0041, 0x1118, 0x080c, 0x97dc, 0x0050, 0xa1b6, 0x0015,
++	0x1110, 0x0053, 0x0028, 0xa1b6, 0x0016, 0x1118, 0x0804, 0x9e93,
++	0x0005, 0x080c, 0x962a, 0x0ce0, 0x9cda, 0x9cdd, 0x9cda, 0x9d21,
++	0x9cda, 0x9e1a, 0x9ea1, 0x9cda, 0x9cda, 0x9e6b, 0x9cda, 0x9e81,
++	0xa1b6, 0x0048, 0x0140, 0x20e1, 0x0005, 0x3d18, 0x3e20, 0x2c10,
++	0x080c, 0x1870, 0x0005, 0x00e6, 0xacf0, 0x0004, 0x2e74, 0x7000,
++	0x2070, 0x7037, 0x0103, 0x00ee, 0x080c, 0x95e3, 0x0005, 0x080c,
++	0x95e3, 0x0005, 0xe000, 0xe000, 0x0005, 0x00e6, 0x2071, 0xc600,
++	0x7084, 0xa086, 0x0074, 0x1530, 0x080c, 0xbece, 0x11b0, 0x00d6,
++	0x6018, 0x2068, 0x7030, 0xd08c, 0x0128, 0x6800, 0xd0bc, 0x0110,
++	0xc0c5, 0x6802, 0x00e9, 0x00de, 0x2001, 0x0006, 0x080c, 0x5291,
++	0x080c, 0x2e6c, 0x080c, 0x95e3, 0x0088, 0x2001, 0x000a, 0x080c,
++	0x5291, 0x080c, 0x2e6c, 0x6003, 0x0001, 0x6007, 0x0001, 0x080c,
++	0x79df, 0x0020, 0x2001, 0x0001, 0x080c, 0x9df5, 0x00ee, 0x0005,
++	0x6800, 0xd084, 0x0168, 0x2001, 0x0000, 0x080c, 0x527f, 0x2069,
++	0xc652, 0x6804, 0xd0a4, 0x0120, 0x2001, 0x0006, 0x080c, 0x52be,
++	0x0005, 0x00d6, 0x2011, 0xc621, 0x2204, 0xa086, 0x0074, 0x1904,
++	0x9df0, 0x6018, 0x2068, 0x6aa0, 0xa286, 0x007e, 0x1120, 0x080c,
++	0x9fc3, 0x0804, 0x9d8f, 0x080c, 0x9fb9, 0x6018, 0x2068, 0xa080,
++	0x0028, 0x2014, 0xa286, 0x0080, 0x11c0, 0x6813, 0x00ff, 0x6817,
++	0xfffc, 0x6010, 0xa005, 0x0138, 0x2068, 0x6807, 0x0000, 0x6837,
++	0x0103, 0x6833, 0x0200, 0x2001, 0x0006, 0x080c, 0x5291, 0x080c,
++	0x2e6c, 0x080c, 0x95e3, 0x0804, 0x9df3, 0x00e6, 0x2071, 0xc635,
++	0x2e04, 0xd09c, 0x0188, 0x2071, 0xcc80, 0x7108, 0x720c, 0xa18c,
++	0x00ff, 0x1118, 0xa284, 0xff00, 0x0138, 0x6018, 0x2070, 0x70a0,
++	0xd0bc, 0x1110, 0x7112, 0x7216, 0x00ee, 0x6010, 0xa005, 0x0198,
++	0x2068, 0x6838, 0xd0f4, 0x0178, 0x6834, 0xa084, 0x00ff, 0xa086,
++	0x0039, 0x1958, 0x2001, 0x0000, 0x2009, 0x0000, 0x2011, 0x4000,
++	0x080c, 0xb10d, 0x0840, 0x2001, 0x0004, 0x080c, 0x5291, 0x6003,
++	0x0001, 0x6007, 0x0003, 0x080c, 0x79df, 0x0804, 0x9df3, 0x685c,
++	0xd0e4, 0x01d8, 0x080c, 0xb009, 0x080c, 0x5f22, 0x0118, 0xd0dc,
++	0x1904, 0x9d4b, 0x2011, 0xc635, 0x2204, 0xc0ad, 0x2012, 0x2001,
++	0xc8d6, 0x2004, 0x00f6, 0x2079, 0x0100, 0x78e3, 0x0000, 0x080c,
++	0x2a1c, 0x78e2, 0x00fe, 0x0804, 0x9d4b, 0x080c, 0xb03f, 0x2011,
++	0xc635, 0x2204, 0xc0a5, 0x2012, 0x0006, 0x080c, 0xc023, 0x000e,
++	0x1904, 0x9d4b, 0xc0b5, 0x2012, 0x2001, 0x0006, 0x080c, 0x5291,
++	0x2001, 0x0000, 0x080c, 0x527f, 0x00c6, 0x2009, 0x00ef, 0x00f6,
++	0x2079, 0x0100, 0x79ea, 0x7932, 0x7936, 0x00fe, 0x080c, 0x29f1,
++	0x00f6, 0x2079, 0xc600, 0x7976, 0x2100, 0x2009, 0x0000, 0x080c,
++	0x29c7, 0x7952, 0x00fe, 0x8108, 0x080c, 0x52e1, 0x2c00, 0x00ce,
++	0x1904, 0x9d4b, 0x601a, 0x2001, 0x0002, 0x080c, 0x5291, 0x601f,
++	0x0001, 0x6003, 0x0001, 0x6007, 0x0002, 0x080c, 0x79df, 0x0018,
++	0x2001, 0x0001, 0x0011, 0x00de, 0x0005, 0x0066, 0x2030, 0xa005,
++	0x0170, 0x2001, 0x0007, 0x080c, 0x5291, 0x2001, 0xc600, 0x2004,
++	0xa086, 0x0003, 0x1120, 0x2001, 0x0007, 0x080c, 0x52be, 0x2600,
++	0xa005, 0x1150, 0x6010, 0xa080, 0x000e, 0x2004, 0xd0fc, 0x1120,
++	0x2011, 0x8014, 0x080c, 0x407d, 0x080c, 0x2e6c, 0x080c, 0x95e3,
++	0x006e, 0x0005, 0x00e6, 0x0026, 0x0016, 0x2071, 0xc600, 0x7084,
++	0xa086, 0x0014, 0x15f0, 0x7000, 0xa086, 0x0003, 0x1128, 0x6010,
++	0xa005, 0x1110, 0x080c, 0x40ef, 0x00d6, 0x6018, 0x2068, 0x080c,
++	0x53df, 0x080c, 0x9d10, 0x00de, 0x080c, 0xa072, 0x1550, 0x00d6,
++	0x6018, 0x2068, 0x6890, 0x00de, 0xa005, 0x0518, 0x2001, 0x0006,
++	0x080c, 0x5291, 0x00e6, 0x6010, 0xa075, 0x01a8, 0x7034, 0xa084,
++	0x00ff, 0xa086, 0x0039, 0x1148, 0x2001, 0x0000, 0x2009, 0x0000,
++	0x2011, 0x4000, 0x080c, 0xb10d, 0x0030, 0x7007, 0x0000, 0x7037,
++	0x0103, 0x7033, 0x0200, 0x00ee, 0x080c, 0x2e6c, 0x080c, 0x95e3,
++	0x0030, 0x080c, 0x9c09, 0x2001, 0x0000, 0x080c, 0x9df5, 0x001e,
++	0x002e, 0x00ee, 0x0005, 0x2011, 0xc621, 0x2204, 0xa086, 0x0014,
++	0x1158, 0x2001, 0x0002, 0x080c, 0x5291, 0x6003, 0x0001, 0x6007,
++	0x0001, 0x080c, 0x79df, 0x0020, 0x2001, 0x0001, 0x080c, 0x9df5,
++	0x0005, 0x2011, 0xc621, 0x2204, 0xa086, 0x0004, 0x1138, 0x2001,
++	0x0007, 0x080c, 0x5291, 0x080c, 0x95e3, 0x0020, 0x2001, 0x0001,
++	0x080c, 0x9df5, 0x0005, 0x000b, 0x0005, 0x9cda, 0x9eac, 0x9cda,
++	0x9ee2, 0x9cda, 0x9f6f, 0x9ea1, 0x9cd7, 0x9cda, 0x9f84, 0x9cda,
++	0x9f96, 0x6604, 0xa686, 0x0003, 0x0904, 0x9e1a, 0xa6b6, 0x001e,
++	0x1110, 0x080c, 0x95e3, 0x0005, 0x00d6, 0x00c6, 0x080c, 0x9fa8,
++	0x1178, 0x2001, 0x0000, 0x080c, 0x527f, 0x2001, 0x0002, 0x080c,
++	0x5291, 0x6003, 0x0001, 0x6007, 0x0002, 0x080c, 0x79df, 0x00f8,
++	0x2009, 0xcc8e, 0x2104, 0xa086, 0x0009, 0x1160, 0x6018, 0x2068,
++	0x6840, 0xa084, 0x00ff, 0xa005, 0x0170, 0x8001, 0x6842, 0x6017,
++	0x000a, 0x0068, 0x2009, 0xcc8f, 0x2104, 0xa084, 0xff00, 0xa086,
++	0x1900, 0x1108, 0x08d0, 0x2001, 0x0001, 0x080c, 0x9df5, 0x00ce,
++	0x00de, 0x0005, 0x0026, 0x2011, 0x0000, 0x080c, 0x9fb6, 0x00d6,
++	0x2069, 0xc8e5, 0x2d04, 0xa005, 0x0168, 0x6018, 0x2068, 0x68a0,
++	0xa086, 0x007e, 0x1138, 0x2069, 0xc61d, 0x2d04, 0x8000, 0x206a,
++	0x00de, 0x0010, 0x00de, 0x0078, 0x2001, 0x0000, 0x080c, 0x527f,
++	0x2001, 0x0002, 0x080c, 0x5291, 0x6003, 0x0001, 0x6007, 0x0002,
++	0x080c, 0x79df, 0x0490, 0x00d6, 0x6010, 0x2068, 0x080c, 0xac91,
++	0x00de, 0x0108, 0x6a34, 0x080c, 0x9c09, 0x2009, 0xcc8e, 0x2134,
++	0xa6b4, 0x00ff, 0xa686, 0x0005, 0x0510, 0xa686, 0x000b, 0x01c8,
++	0x2009, 0xcc8f, 0x2104, 0xa084, 0xff00, 0x1118, 0xa686, 0x0009,
++	0x01b0, 0xa086, 0x1900, 0x1168, 0xa686, 0x0009, 0x0180, 0x2001,
++	0x0004, 0x080c, 0x5291, 0x2001, 0x0028, 0x6016, 0x6007, 0x004b,
++	0x0020, 0x2001, 0x0001, 0x080c, 0x9df5, 0x002e, 0x0005, 0x00d6,
++	0xa286, 0x0139, 0x0160, 0x6010, 0x2068, 0x080c, 0xac91, 0x0148,
++	0x6834, 0xa086, 0x0139, 0x0118, 0x6838, 0xd0fc, 0x0110, 0x00de,
++	0x0c40, 0x6018, 0x2068, 0x6840, 0xa084, 0x00ff, 0xa005, 0x0140,
++	0x8001, 0x6842, 0x6017, 0x000a, 0x6007, 0x0016, 0x00de, 0x08e8,
++	0x68a0, 0xa086, 0x007e, 0x1138, 0x00e6, 0x2071, 0xc600, 0x080c,
++	0x4f02, 0x00ee, 0x0010, 0x080c, 0x2e46, 0x00de, 0x0850, 0x080c,
++	0x9fb6, 0x1158, 0x2001, 0x0004, 0x080c, 0x5291, 0x6003, 0x0001,
++	0x6007, 0x0003, 0x080c, 0x79df, 0x0030, 0x080c, 0x9c09, 0x2001,
++	0x0000, 0x080c, 0x9df5, 0x0005, 0x0489, 0x1158, 0x2001, 0x0008,
++	0x080c, 0x5291, 0x6003, 0x0001, 0x6007, 0x0005, 0x080c, 0x79df,
++	0x0020, 0x2001, 0x0001, 0x080c, 0x9df5, 0x0005, 0x00f9, 0x1158,
++	0x2001, 0x000a, 0x080c, 0x5291, 0x6003, 0x0001, 0x6007, 0x0001,
++	0x080c, 0x79df, 0x0020, 0x2001, 0x0001, 0x080c, 0x9df5, 0x0005,
++	0x2009, 0xcc8e, 0x2104, 0xa086, 0x0003, 0x1138, 0x2009, 0xcc8f,
++	0x2104, 0xa084, 0xff00, 0xa086, 0x2a00, 0x0005, 0xa085, 0x0001,
++	0x0005, 0x00c6, 0x0016, 0xac88, 0x0006, 0x2164, 0x080c, 0x534c,
++	0x001e, 0x00ce, 0x0005, 0x00f6, 0x00e6, 0x00d6, 0x0036, 0x0016,
++	0x6018, 0x2068, 0x2071, 0xc635, 0x2e04, 0xa085, 0x0003, 0x2072,
++	0x080c, 0xa047, 0x0560, 0x2009, 0xc635, 0x2104, 0xc0cd, 0x200a,
++	0x2001, 0xc653, 0x2004, 0xd0a4, 0x0158, 0xa006, 0x2020, 0x2009,
++	0x002a, 0x080c, 0xc190, 0x2001, 0xc60c, 0x200c, 0xc195, 0x2102,
++	0x2019, 0x002a, 0x2009, 0x0001, 0x080c, 0x2e19, 0x2071, 0xc600,
++	0x080c, 0x2c62, 0x00c6, 0x0156, 0x20a9, 0x0081, 0x2009, 0x007f,
++	0x080c, 0x2f41, 0x8108, 0x1f04, 0x9ff8, 0x015e, 0x00ce, 0x080c,
++	0x9fb9, 0x6813, 0x00ff, 0x6817, 0xfffe, 0x2071, 0xcc80, 0x2079,
++	0x0100, 0x2e04, 0xa084, 0x00ff, 0x2069, 0xc61c, 0x206a, 0x78e6,
++	0x0006, 0x8e70, 0x2e04, 0x2069, 0xc61d, 0x206a, 0x78ea, 0x7832,
++	0x7836, 0x2010, 0xa084, 0xff00, 0x001e, 0xa105, 0x2009, 0xc628,
++	0x200a, 0x2200, 0xa084, 0x00ff, 0x2008, 0x080c, 0x29f1, 0x080c,
++	0x5f22, 0x0170, 0x2069, 0xcc8e, 0x2071, 0xc8f9, 0x6810, 0x2072,
++	0x6814, 0x7006, 0x6818, 0x700a, 0x681c, 0x700e, 0x080c, 0xb009,
++	0x0040, 0x2001, 0x0006, 0x080c, 0x5291, 0x080c, 0x2e6c, 0x080c,
++	0x95e3, 0x001e, 0x003e, 0x00de, 0x00ee, 0x00fe, 0x0005, 0x0026,
++	0x0036, 0x00e6, 0x0156, 0x2019, 0xc628, 0x231c, 0x83ff, 0x01e8,
++	0x2071, 0xcc80, 0x2e14, 0xa294, 0x00ff, 0x7004, 0xa084, 0xff00,
++	0xa205, 0xa306, 0x1190, 0x2011, 0xcc96, 0xad98, 0x000a, 0x20a9,
++	0x0004, 0x080c, 0xa103, 0x1148, 0x2011, 0xcc9a, 0xad98, 0x0006,
++	0x20a9, 0x0004, 0x080c, 0xa103, 0x1100, 0x015e, 0x00ee, 0x003e,
++	0x002e, 0x0005, 0x00e6, 0x2071, 0xcc8c, 0x7004, 0xa086, 0x0014,
++	0x11a8, 0x7008, 0xa086, 0x0800, 0x1188, 0x700c, 0xd0ec, 0x0160,
++	0xa084, 0x0f00, 0xa086, 0x0100, 0x1138, 0x7024, 0xd0a4, 0x1110,
++	0xd0ac, 0x0110, 0xa006, 0x0010, 0xa085, 0x0001, 0x00ee, 0x0005,
++	0x00e6, 0x00d6, 0x00c6, 0x0076, 0x0056, 0x0046, 0x0026, 0x0006,
++	0x0126, 0x2091, 0x8000, 0x2029, 0xc930, 0x252c, 0x2021, 0xc936,
++	0x2424, 0x2061, 0xce00, 0x2071, 0xc600, 0x7248, 0x7068, 0xa202,
++	0x16f0, 0x080c, 0xc1b8, 0x05a0, 0x671c, 0xa786, 0x0001, 0x0580,
++	0xa786, 0x0007, 0x0568, 0x2500, 0xac06, 0x0550, 0x2400, 0xac06,
++	0x0538, 0x00c6, 0x6000, 0xa086, 0x0004, 0x1110, 0x080c, 0x1953,
++	0xa786, 0x0008, 0x1148, 0x080c, 0xae8f, 0x1130, 0x00ce, 0x080c,
++	0x9c09, 0x080c, 0xae54, 0x00a0, 0x6010, 0x2068, 0x080c, 0xac91,
++	0x0160, 0xa786, 0x0003, 0x11e8, 0x6837, 0x0103, 0x6b4a, 0x6847,
++	0x0000, 0x080c, 0x580a, 0x080c, 0xae48, 0x080c, 0xae54, 0x00ce,
++	0xace0, 0x0018, 0x705c, 0xac02, 0x1210, 0x0804, 0xa0a5, 0x012e,
++	0x000e, 0x002e, 0x004e, 0x005e, 0x007e, 0x00ce, 0x00de, 0x00ee,
++	0x0005, 0xa786, 0x0006, 0x1118, 0x080c, 0xc141, 0x0c30, 0xa786,
++	0x0009, 0x1128, 0x2009, 0x0106, 0x080c, 0x9613, 0x0c00, 0xa786,
++	0x000a, 0x09a0, 0x0888, 0x220c, 0x2304, 0xa106, 0x1130, 0x8210,
++	0x8318, 0x1f04, 0xa103, 0xa006, 0x0005, 0x2304, 0xa102, 0x0218,
++	0x2001, 0x0001, 0x0010, 0x2001, 0x0000, 0xa18d, 0x0001, 0x0005,
++	0x220c, 0x810f, 0x2304, 0xa106, 0x1130, 0x8210, 0x8318, 0x1f04,
++	0xa118, 0xa006, 0x0005, 0xa18d, 0x0001, 0x0005, 0x6004, 0xa08a,
++	0x0080, 0x1a0c, 0x1519, 0x080c, 0xae7e, 0x0120, 0x080c, 0xae8f,
++	0x0168, 0x0028, 0x080c, 0x2e6c, 0x080c, 0xae8f, 0x0138, 0x080c,
++	0x7db1, 0x080c, 0x95e3, 0x080c, 0x7e94, 0x0005, 0x080c, 0x9c09,
++	0x0cb0, 0xa182, 0x0040, 0x0002, 0xa157, 0xa157, 0xa157, 0xa157,
++	0xa157, 0xa157, 0xa157, 0xa157, 0xa157, 0xa157, 0xa157, 0xa159,
++	0xa159, 0xa159, 0xa159, 0xa157, 0xa157, 0xa157, 0xa159, 0x080c,
++	0x1519, 0x600b, 0xffff, 0x6003, 0x0001, 0x6106, 0x080c, 0x7999,
++	0x0126, 0x2091, 0x8000, 0x080c, 0x7e94, 0x012e, 0x0005, 0xa186,
++	0x0013, 0x1128, 0x6004, 0xa082, 0x0040, 0x0804, 0xa1f3, 0xa186,
++	0x0027, 0x11e8, 0x080c, 0x7db1, 0x080c, 0x2e46, 0x00d6, 0x6110,
++	0x2168, 0x080c, 0xac91, 0x0168, 0x6837, 0x0103, 0x684b, 0x0029,
++	0x6847, 0x0000, 0x694c, 0xc1c5, 0x694e, 0x080c, 0x580a, 0x080c,
++	0xae48, 0x00de, 0x080c, 0x95e3, 0x080c, 0x7e94, 0x0005, 0xa186,
++	0x0014, 0x1120, 0x6004, 0xa082, 0x0040, 0x0428, 0xa186, 0x0046,
++	0x0138, 0xa186, 0x0045, 0x0120, 0xa186, 0x0047, 0x190c, 0x1519,
++	0x2001, 0x0109, 0x2004, 0xd084, 0x0198, 0x0126, 0x2091, 0x2800,
++	0x0006, 0x0016, 0x0026, 0x080c, 0x7873, 0x002e, 0x001e, 0x000e,
++	0x012e, 0xe000, 0x6000, 0xa086, 0x0002, 0x1110, 0x0804, 0xa231,
++	0x080c, 0x962a, 0x0005, 0x0002, 0xa1d1, 0xa1cf, 0xa1cf, 0xa1cf,
++	0xa1cf, 0xa1cf, 0xa1cf, 0xa1cf, 0xa1cf, 0xa1cf, 0xa1cf, 0xa1ec,
++	0xa1ec, 0xa1ec, 0xa1ec, 0xa1cf, 0xa1ec, 0xa1cf, 0xa1ec, 0x080c,
++	0x1519, 0x080c, 0x7db1, 0x00d6, 0x6110, 0x2168, 0x080c, 0xac91,
++	0x0168, 0x6837, 0x0103, 0x684b, 0x0006, 0x6847, 0x0000, 0x6850,
++	0xc0ec, 0x6852, 0x080c, 0x580a, 0x080c, 0xae48, 0x00de, 0x080c,
++	0x95e3, 0x080c, 0x7e94, 0x0005, 0x080c, 0x7db1, 0x080c, 0x95e3,
++	0x080c, 0x7e94, 0x0005, 0x0002, 0xa209, 0xa207, 0xa207, 0xa207,
++	0xa207, 0xa207, 0xa207, 0xa207, 0xa207, 0xa207, 0xa207, 0xa21b,
++	0xa21b, 0xa21b, 0xa21b, 0xa207, 0xa22a, 0xa207, 0xa21b, 0x080c,
++	0x1519, 0x080c, 0x7db1, 0x2001, 0xc8ff, 0x2004, 0x603e, 0x6003,
++	0x0002, 0x080c, 0x7e94, 0x6010, 0xa088, 0x0013, 0x2104, 0xa085,
++	0x0400, 0x200a, 0x0005, 0x080c, 0x7db1, 0x2001, 0xc8fd, 0x2004,
++	0x6016, 0x2001, 0xc8ff, 0x2004, 0x603e, 0x6003, 0x000f, 0x080c,
++	0x7e94, 0x0005, 0x080c, 0x7db1, 0x080c, 0x95e3, 0x080c, 0x7e94,
++	0x0005, 0xa182, 0x0040, 0x0002, 0xa247, 0xa247, 0xa247, 0xa247,
++	0xa247, 0xa249, 0xa32e, 0xa35d, 0xa247, 0xa247, 0xa247, 0xa247,
++	0xa247, 0xa247, 0xa247, 0xa247, 0xa247, 0xa247, 0xa247, 0x080c,
++	0x1519, 0x00e6, 0x00d6, 0x603f, 0x0000, 0x2071, 0xcc80, 0x7124,
++	0x610a, 0x2071, 0xcc8c, 0x6110, 0x2168, 0x7614, 0xa6b4, 0x0fff,
++	0x86ff, 0x0904, 0xa2f7, 0xa68c, 0x0c00, 0x0518, 0x00f6, 0x2c78,
++	0x080c, 0x56c3, 0x00fe, 0x01c8, 0x684c, 0xd0ac, 0x01b0, 0x6020,
++	0xd0dc, 0x1198, 0x6850, 0xd0bc, 0x1180, 0x7318, 0x6814, 0xa306,
++	0x1904, 0xa30a, 0x731c, 0x6810, 0xa31e, 0x0138, 0xd6d4, 0x0904,
++	0xa30a, 0x6b14, 0xa305, 0x1904, 0xa30a, 0x7318, 0x6b62, 0x731c,
++	0x6b5e, 0xa68c, 0x00ff, 0xa186, 0x0002, 0x0518, 0xa186, 0x0028,
++	0x1128, 0x080c, 0xae6d, 0x684b, 0x001c, 0x00e8, 0xd6dc, 0x01a0,
++	0x684b, 0x0015, 0x684c, 0xd0ac, 0x0170, 0x6914, 0x6a10, 0x2100,
++	0xa205, 0x0148, 0x7018, 0xa106, 0x1118, 0x701c, 0xa206, 0x0118,
++	0x6962, 0x6a5e, 0xc6dc, 0x0038, 0xd6d4, 0x0118, 0x684b, 0x0007,
++	0x0010, 0x684b, 0x0000, 0x6837, 0x0103, 0x6e46, 0xa01e, 0xd6c4,
++	0x01f0, 0xa686, 0x0100, 0x1140, 0x2001, 0xcc99, 0x2004, 0xa005,
++	0x1118, 0xc6c4, 0x0804, 0xa258, 0x7328, 0x732c, 0x6b56, 0x83ff,
++	0x0170, 0xa38a, 0x0009, 0x0210, 0x2019, 0x0008, 0x0036, 0x2308,
++	0x2019, 0xcc98, 0xad90, 0x0019, 0x080c, 0xa944, 0x003e, 0xd6cc,
++	0x0904, 0xa31d, 0x7124, 0x695a, 0x81ff, 0x0904, 0xa31d, 0xa192,
++	0x0021, 0x1260, 0x2071, 0xcc98, 0x831c, 0x2300, 0xae18, 0xad90,
++	0x001d, 0x080c, 0xa944, 0x080c, 0xb16e, 0x04b8, 0x6838, 0xd0fc,
++	0x0120, 0x2009, 0x0020, 0x695a, 0x0c68, 0x00f6, 0x2d78, 0x080c,
++	0xa8e9, 0x00fe, 0x080c, 0xb16e, 0x080c, 0xa934, 0x0440, 0x00f6,
++	0x2c78, 0x080c, 0x56c3, 0x00fe, 0x0190, 0x684c, 0xd0ac, 0x0178,
++	0x6020, 0xd0dc, 0x1160, 0x6850, 0xd0bc, 0x1148, 0x6810, 0x6914,
++	0xa105, 0x0128, 0x080c, 0xaf6c, 0x00de, 0x00ee, 0x00f0, 0x684b,
++	0x0000, 0x6837, 0x0103, 0x6e46, 0x684c, 0xd0ac, 0x0130, 0x6810,
++	0x6914, 0xa115, 0x0110, 0x080c, 0xa4ba, 0x080c, 0x580a, 0x6218,
++	0x2268, 0x6a3c, 0x82ff, 0x0110, 0x8211, 0x6a3e, 0x080c, 0xaf3a,
++	0x00de, 0x00ee, 0x1110, 0x080c, 0x95e3, 0x0005, 0x00f6, 0x6003,
++	0x0003, 0x2079, 0xcc8c, 0x7c04, 0x7b00, 0x7e0c, 0x7d08, 0x6010,
++	0x2078, 0x784c, 0xd0ac, 0x0138, 0x6003, 0x0002, 0x00fe, 0x0005,
++	0x2130, 0x2228, 0x0058, 0x2400, 0x797c, 0xa10a, 0x2300, 0x7a80,
++	0xa213, 0x2600, 0xa102, 0x2500, 0xa203, 0x0e90, 0x7c12, 0x7b16,
++	0x7e0a, 0x7d0e, 0x00fe, 0x603f, 0x0000, 0x2c10, 0x080c, 0x2068,
++	0x080c, 0x79fc, 0x080c, 0x7f6e, 0x0005, 0x2001, 0xc8ff, 0x2004,
++	0x603e, 0x6003, 0x0004, 0x6110, 0x20e1, 0x0005, 0x3d18, 0x3e20,
++	0x2c10, 0x080c, 0x1870, 0x0005, 0xa182, 0x0040, 0x0002, 0xa382,
++	0xa382, 0xa382, 0xa382, 0xa382, 0xa384, 0xa417, 0xa382, 0xa382,
++	0xa42d, 0xa491, 0xa382, 0xa382, 0xa382, 0xa382, 0xa4a0, 0xa382,
++	0xa382, 0xa382, 0x080c, 0x1519, 0x0076, 0x00f6, 0x00e6, 0x00d6,
++	0x2071, 0xcc8c, 0x6110, 0x2178, 0x7614, 0xa6b4, 0x0fff, 0x7e46,
++	0x7f4c, 0xc7e5, 0x7f4e, 0x6218, 0x2268, 0x6a3c, 0x82ff, 0x0110,
++	0x8211, 0x6a3e, 0x86ff, 0x0904, 0xa412, 0xa694, 0xff00, 0xa284,
++	0x0c00, 0x0120, 0x7018, 0x7862, 0x701c, 0x785e, 0xa284, 0x0300,
++	0x0904, 0xa412, 0x080c, 0x1602, 0x090c, 0x1519, 0x2d00, 0x784a,
++	0x7f4c, 0xc7cd, 0x7f4e, 0x6837, 0x0103, 0x7838, 0x683a, 0x783c,
++	0x683e, 0x7840, 0x6842, 0x6e46, 0xa68c, 0x0c00, 0x0120, 0x7318,
++	0x6b62, 0x731c, 0x6b5e, 0xa68c, 0x00ff, 0xa186, 0x0002, 0x0180,
++	0xa186, 0x0028, 0x1118, 0x684b, 0x001c, 0x0060, 0xd6dc, 0x0118,
++	0x684b, 0x0015, 0x0038, 0xd6d4, 0x0118, 0x684b, 0x0007, 0x0010,
++	0x684b, 0x0000, 0x6f4e, 0x7850, 0x6852, 0x7854, 0x6856, 0xa01e,
++	0xd6c4, 0x0198, 0x7328, 0x732c, 0x6b56, 0x83ff, 0x0170, 0xa38a,
++	0x0009, 0x0210, 0x2019, 0x0008, 0x0036, 0x2308, 0x2019, 0xcc98,
++	0xad90, 0x0019, 0x080c, 0xa944, 0x003e, 0xd6cc, 0x01d8, 0x7124,
++	0x695a, 0x81ff, 0x01b8, 0xa192, 0x0021, 0x1250, 0x2071, 0xcc98,
++	0x831c, 0x2300, 0xae18, 0xad90, 0x001d, 0x080c, 0xa944, 0x0050,
++	0x7838, 0xd0fc, 0x0120, 0x2009, 0x0020, 0x695a, 0x0c78, 0x2d78,
++	0x080c, 0xa8e9, 0x00de, 0x00ee, 0x00fe, 0x007e, 0x0005, 0x00f6,
++	0x6003, 0x0003, 0x2079, 0xcc8c, 0x7c04, 0x7b00, 0x7e0c, 0x7d08,
++	0x6010, 0x2078, 0x7c12, 0x7b16, 0x7e0a, 0x7d0e, 0x00fe, 0x2c10,
++	0x080c, 0x2068, 0x080c, 0x8bdb, 0x0005, 0x00d6, 0x00f6, 0x2c78,
++	0x080c, 0x56c3, 0x00fe, 0x0120, 0x2001, 0xc8ff, 0x2004, 0x603e,
++	0x6003, 0x0002, 0x080c, 0x7e47, 0x080c, 0x7f6e, 0x6110, 0x2168,
++	0x694c, 0xd1e4, 0x0904, 0xa48f, 0xd1cc, 0x0540, 0x6948, 0x6838,
++	0xd0fc, 0x01e8, 0x0016, 0x684c, 0x0006, 0x6850, 0x0006, 0xad90,
++	0x000d, 0xa198, 0x000d, 0x2009, 0x0020, 0x0156, 0x21a8, 0x2304,
++	0x2012, 0x8318, 0x8210, 0x1f04, 0xa457, 0x015e, 0x000e, 0x6852,
++	0x000e, 0x684e, 0x001e, 0x2168, 0x080c, 0x1629, 0x0418, 0x0016,
++	0x080c, 0x1629, 0x00de, 0x080c, 0xa934, 0x00e0, 0x6837, 0x0103,
++	0x6944, 0xa184, 0x00ff, 0xa0b6, 0x0002, 0x0180, 0xa086, 0x0028,
++	0x1118, 0x684b, 0x001c, 0x0060, 0xd1dc, 0x0118, 0x684b, 0x0015,
++	0x0038, 0xd1d4, 0x0118, 0x684b, 0x0007, 0x0010, 0x684b, 0x0000,
++	0x080c, 0x580a, 0x080c, 0xaf3a, 0x1110, 0x080c, 0x95e3, 0x00de,
++	0x0005, 0x2019, 0x0001, 0x080c, 0x8e79, 0x6003, 0x0002, 0x2001,
++	0xc8ff, 0x2004, 0x603e, 0x080c, 0x7e47, 0x080c, 0x7f6e, 0x0005,
++	0x080c, 0x7e47, 0x080c, 0x2e46, 0x00d6, 0x6110, 0x2168, 0x080c,
++	0xac91, 0x0150, 0x6837, 0x0103, 0x684b, 0x0029, 0x6847, 0x0000,
++	0x080c, 0x580a, 0x080c, 0xae48, 0x00de, 0x080c, 0x95e3, 0x080c,
++	0x7f6e, 0x0005, 0x684b, 0x0015, 0xd1fc, 0x0138, 0x684b, 0x0007,
++	0x8002, 0x8000, 0x810a, 0xa189, 0x0000, 0x6962, 0x685e, 0x0005,
++	0xa182, 0x0040, 0x0002, 0xa4de, 0xa4de, 0xa4de, 0xa4de, 0xa4de,
++	0xa4e0, 0xa4de, 0xa59b, 0xa5a7, 0xa4de, 0xa4de, 0xa4de, 0xa4de,
++	0xa4de, 0xa4de, 0xa4de, 0xa4de, 0xa4de, 0xa4de, 0x080c, 0x1519,
++	0x0076, 0x00f6, 0x00e6, 0x00d6, 0x2071, 0xcc8c, 0x6110, 0x2178,
++	0x7614, 0xa6b4, 0x0fff, 0x00f6, 0x2c78, 0x080c, 0x56c3, 0x00fe,
++	0x0150, 0xa684, 0x00ff, 0x1138, 0x6020, 0xd0f4, 0x0120, 0x080c,
++	0xaf6c, 0x0804, 0xa596, 0x7e46, 0x7f4c, 0xc7e5, 0x7f4e, 0x6218,
++	0x2268, 0x6a3c, 0x82ff, 0x0110, 0x8211, 0x6a3e, 0x86ff, 0x0904,
++	0xa58c, 0xa694, 0xff00, 0xa284, 0x0c00, 0x0120, 0x7018, 0x7862,
++	0x701c, 0x785e, 0xa284, 0x0300, 0x0904, 0xa58a, 0xa686, 0x0100,
++	0x1140, 0x2001, 0xcc99, 0x2004, 0xa005, 0x1118, 0xc6c4, 0x7e46,
++	0x0c28, 0x080c, 0x1602, 0x090c, 0x1519, 0x2d00, 0x784a, 0x7f4c,
++	0xa7bd, 0x0200, 0x7f4e, 0x6837, 0x0103, 0x7838, 0x683a, 0x783c,
++	0x683e, 0x7840, 0x6842, 0x6e46, 0xa68c, 0x0c00, 0x0120, 0x7318,
++	0x6b62, 0x731c, 0x6b5e, 0xa68c, 0x00ff, 0xa186, 0x0002, 0x0180,
++	0xa186, 0x0028, 0x1118, 0x684b, 0x001c, 0x0060, 0xd6dc, 0x0118,
++	0x684b, 0x0015, 0x0038, 0xd6d4, 0x0118, 0x684b, 0x0007, 0x0010,
++	0x684b, 0x0000, 0x6f4e, 0x7850, 0x6852, 0x7854, 0x6856, 0xa01e,
++	0xd6c4, 0x0198, 0x7328, 0x732c, 0x6b56, 0x83ff, 0x0170, 0xa38a,
++	0x0009, 0x0210, 0x2019, 0x0008, 0x0036, 0x2308, 0x2019, 0xcc98,
++	0xad90, 0x0019, 0x080c, 0xa944, 0x003e, 0xd6cc, 0x01d8, 0x7124,
++	0x695a, 0x81ff, 0x01b8, 0xa192, 0x0021, 0x1250, 0x2071, 0xcc98,
++	0x831c, 0x2300, 0xae18, 0xad90, 0x001d, 0x080c, 0xa944, 0x0050,
++	0x7838, 0xd0fc, 0x0120, 0x2009, 0x0020, 0x695a, 0x0c78, 0x2d78,
++	0x080c, 0xa8e9, 0xd6dc, 0x1110, 0xa006, 0x0030, 0x2001, 0x0001,
++	0x2071, 0xcc8c, 0x7218, 0x731c, 0x080c, 0x18b8, 0x00de, 0x00ee,
++	0x00fe, 0x007e, 0x0005, 0x2001, 0xc8ff, 0x2004, 0x603e, 0x20e1,
++	0x0005, 0x3d18, 0x3e20, 0x2c10, 0x080c, 0x1870, 0x0005, 0x2001,
++	0xc8ff, 0x2004, 0x603e, 0x00d6, 0x6003, 0x0002, 0x6110, 0x2168,
++	0x694c, 0xd1e4, 0x0904, 0xa6b2, 0x603f, 0x0000, 0x00f6, 0x2c78,
++	0x080c, 0x56c3, 0x00fe, 0x0560, 0x6814, 0x6910, 0xa115, 0x0540,
++	0x6a60, 0xa206, 0x1118, 0x685c, 0xa106, 0x0510, 0x684c, 0xc0e4,
++	0x684e, 0x6847, 0x0000, 0x6863, 0x0000, 0x685f, 0x0000, 0x6020,
++	0xd0f4, 0x1158, 0x697c, 0x6810, 0xa102, 0x603a, 0x6980, 0x6814,
++	0xa103, 0x6036, 0x6020, 0xc0f5, 0x6022, 0x00d6, 0x6018, 0x2068,
++	0x683c, 0x8000, 0x683e, 0x00de, 0x080c, 0xaf6c, 0x0804, 0xa6b2,
++	0x694c, 0xd1cc, 0x0904, 0xa682, 0x6948, 0x6838, 0xd0fc, 0x0904,
++	0xa645, 0x0016, 0x684c, 0x0006, 0x6850, 0x0006, 0x00f6, 0x2178,
++	0x7944, 0xa184, 0x00ff, 0xa0b6, 0x0002, 0x01e0, 0xa086, 0x0028,
++	0x1128, 0x684b, 0x001c, 0x784b, 0x001c, 0x00e8, 0xd1dc, 0x0158,
++	0x684b, 0x0015, 0x784b, 0x0015, 0x080c, 0xb0f6, 0x0118, 0x7944,
++	0xc1dc, 0x7946, 0x0080, 0xd1d4, 0x0128, 0x684b, 0x0007, 0x784b,
++	0x0007, 0x0048, 0x684c, 0xd0ac, 0x0130, 0x6810, 0x6914, 0xa115,
++	0x0110, 0x080c, 0xa4ba, 0x6848, 0x784a, 0x6860, 0x7862, 0x685c,
++	0x785e, 0xad90, 0x000d, 0xaf98, 0x000d, 0x2009, 0x0020, 0x0156,
++	0x21a8, 0x2304, 0x2012, 0x8318, 0x8210, 0x1f04, 0xa631, 0x015e,
++	0x00fe, 0x000e, 0x6852, 0x000e, 0x684e, 0x080c, 0xb16e, 0x001e,
++	0x2168, 0x080c, 0x1629, 0x0804, 0xa6ad, 0x0016, 0x00f6, 0x2178,
++	0x7944, 0xa184, 0x00ff, 0xa0b6, 0x0002, 0x01e0, 0xa086, 0x0028,
++	0x1128, 0x684b, 0x001c, 0x784b, 0x001c, 0x00e8, 0xd1dc, 0x0158,
++	0x684b, 0x0015, 0x784b, 0x0015, 0x080c, 0xb0f6, 0x0118, 0x7944,
++	0xc1dc, 0x7946, 0x0080, 0xd1d4, 0x0128, 0x684b, 0x0007, 0x784b,
++	0x0007, 0x0048, 0x684c, 0xd0ac, 0x0130, 0x6810, 0x6914, 0xa115,
++	0x0110, 0x080c, 0xa4ba, 0x6860, 0x7862, 0x685c, 0x785e, 0x684c,
++	0x784e, 0x00fe, 0x080c, 0x1629, 0x00de, 0x080c, 0xb16e, 0x080c,
++	0xa934, 0x0458, 0x6837, 0x0103, 0x6944, 0xa184, 0x00ff, 0xa0b6,
++	0x0002, 0x01b0, 0xa086, 0x0028, 0x1118, 0x684b, 0x001c, 0x00d8,
++	0xd1dc, 0x0148, 0x684b, 0x0015, 0x080c, 0xb0f6, 0x0118, 0x6944,
++	0xc1dc, 0x6946, 0x0080, 0xd1d4, 0x0118, 0x684b, 0x0007, 0x0058,
++	0x684b, 0x0000, 0x684c, 0xd0ac, 0x0130, 0x6810, 0x6914, 0xa115,
++	0x0110, 0x080c, 0xa4ba, 0x080c, 0x580a, 0x080c, 0xaf3a, 0x1110,
++	0x080c, 0x95e3, 0x00de, 0x0005, 0x080c, 0x7db1, 0x0010, 0x080c,
++	0x7e47, 0x080c, 0xac91, 0x01c0, 0x00d6, 0x6110, 0x2168, 0x6837,
++	0x0103, 0x2009, 0xc60c, 0x210c, 0xd18c, 0x11c0, 0xd184, 0x1198,
++	0x6108, 0x694a, 0xa18e, 0x0029, 0x1110, 0x080c, 0xc4d7, 0x6847,
++	0x0000, 0x080c, 0x580a, 0x00de, 0x080c, 0x95e3, 0x080c, 0x7e94,
++	0x080c, 0x7f6e, 0x0005, 0x684b, 0x0004, 0x0c88, 0x684b, 0x0004,
++	0x0c70, 0xa182, 0x0040, 0x0002, 0xa6f7, 0xa6f7, 0xa6f7, 0xa6f7,
++	0xa6f7, 0xa6f9, 0xa6f7, 0xa6fc, 0xa6f7, 0xa6f7, 0xa6f7, 0xa6f7,
++	0xa6f7, 0xa6f7, 0xa6f7, 0xa6f7, 0xa6f7, 0xa6f7, 0xa6f7, 0x080c,
++	0x1519, 0x080c, 0x95e3, 0x0005, 0x0006, 0x0026, 0xa016, 0x080c,
++	0x1870, 0x002e, 0x000e, 0x0005, 0xa182, 0x0085, 0x0002, 0xa710,
++	0xa70e, 0xa70e, 0xa71c, 0xa70e, 0xa70e, 0xa70e, 0x080c, 0x1519,
++	0x6003, 0x0001, 0x6106, 0x080c, 0x7999, 0x0126, 0x2091, 0x8000,
++	0x080c, 0x7e94, 0x012e, 0x0005, 0x0026, 0x0056, 0x00d6, 0x00e6,
++	0x2071, 0xcc80, 0x7224, 0x6212, 0x7220, 0x080c, 0xac81, 0x01a0,
++	0x2268, 0x6800, 0xa086, 0x0000, 0x0178, 0x6018, 0x6d18, 0xa52e,
++	0x1158, 0x00c6, 0x2d60, 0x080c, 0xa954, 0x00ce, 0x0128, 0x6803,
++	0x0002, 0x6007, 0x0086, 0x0010, 0x6007, 0x0087, 0x6003, 0x0001,
++	0x080c, 0x7999, 0x080c, 0x7e94, 0x00f6, 0x2278, 0x080c, 0x56c3,
++	0x00fe, 0x0150, 0x6820, 0xd0ec, 0x0138, 0x00c6, 0x2260, 0x603f,
++	0x0000, 0x080c, 0xaf6c, 0x00ce, 0x00ee, 0x00de, 0x005e, 0x002e,
++	0x0005, 0xa186, 0x0013, 0x1160, 0x6004, 0xa08a, 0x0085, 0x0a0c,
++	0x1519, 0xa08a, 0x008c, 0x1a0c, 0x1519, 0xa082, 0x0085, 0x0072,
++	0xa186, 0x0027, 0x0120, 0xa186, 0x0014, 0x190c, 0x1519, 0x080c,
++	0x7db1, 0x080c, 0xae54, 0x080c, 0x7e94, 0x0005, 0xa77d, 0xa77f,
++	0xa77f, 0xa77d, 0xa77d, 0xa77d, 0xa77d, 0x080c, 0x1519, 0x080c,
++	0x7db1, 0x080c, 0xae54, 0x080c, 0x7e94, 0x0005, 0xa186, 0x0013,
++	0x1128, 0x6004, 0xa082, 0x0085, 0x2008, 0x04a8, 0xa186, 0x0027,
++	0x11e8, 0x080c, 0x7db1, 0x080c, 0x2e46, 0x00d6, 0x6010, 0x2068,
++	0x080c, 0xac91, 0x0150, 0x6837, 0x0103, 0x6847, 0x0000, 0x684b,
++	0x0029, 0x080c, 0x580a, 0x080c, 0xae48, 0x00de, 0x080c, 0x95e3,
++	0x080c, 0x7e94, 0x0005, 0x080c, 0x962a, 0x0ce0, 0xa186, 0x0014,
++	0x1dd0, 0x080c, 0x7db1, 0x00d6, 0x6010, 0x2068, 0x080c, 0xac91,
++	0x0d60, 0x6837, 0x0103, 0x6847, 0x0000, 0x684b, 0x0006, 0x6850,
++	0xc0ec, 0x6852, 0x08f0, 0x0002, 0xa7cd, 0xa7cb, 0xa7cb, 0xa7cb,
++	0xa7cb, 0xa7cb, 0xa7e5, 0x080c, 0x1519, 0x080c, 0x7db1, 0x6030,
++	0xa08c, 0xff00, 0x810f, 0xa186, 0x0039, 0x0118, 0xa186, 0x0035,
++	0x1118, 0x2001, 0xc8fd, 0x0010, 0x2001, 0xc8fe, 0x2004, 0x6016,
++	0x6003, 0x000c, 0x080c, 0x7e94, 0x0005, 0x080c, 0x7db1, 0x6030,
++	0xa08c, 0xff00, 0x810f, 0xa186, 0x0039, 0x0118, 0xa186, 0x0035,
++	0x1118, 0x2001, 0xc8fd, 0x0010, 0x2001, 0xc8fe, 0x2004, 0x6016,
++	0x6003, 0x000e, 0x080c, 0x7e94, 0x0005, 0xa182, 0x008c, 0x1220,
++	0xa182, 0x0085, 0x0208, 0x001a, 0x080c, 0x962a, 0x0005, 0xa80e,
++	0xa80e, 0xa80e, 0xa80e, 0xa810, 0xa869, 0xa80e, 0x080c, 0x1519,
++	0x00d6, 0x00f6, 0x2c78, 0x080c, 0x56c3, 0x00fe, 0x0168, 0x6030,
++	0xa08c, 0xff00, 0x810f, 0xa186, 0x0039, 0x0118, 0xa186, 0x0035,
++	0x1118, 0x00de, 0x0804, 0xa87c, 0x080c, 0xac91, 0x1118, 0x080c,
++	0xae48, 0x00f0, 0x6010, 0x2068, 0x684c, 0xd0e4, 0x1110, 0x080c,
++	0xae48, 0x6837, 0x0103, 0x6850, 0xd0b4, 0x0128, 0x684b, 0x0006,
++	0xc0ec, 0x6852, 0x0048, 0xd0bc, 0x0118, 0x684b, 0x0002, 0x0020,
++	0x684b, 0x0005, 0x080c, 0xaf09, 0x6847, 0x0000, 0x080c, 0x580a,
++	0x2c68, 0x080c, 0x958d, 0x01c0, 0x6003, 0x0001, 0x6007, 0x001e,
++	0x600b, 0xffff, 0x2009, 0xcc8e, 0x210c, 0x6136, 0x2009, 0xcc8f,
++	0x210c, 0x613a, 0x6918, 0x611a, 0x080c, 0xb05e, 0x6950, 0x6152,
++	0x601f, 0x0001, 0x080c, 0x7999, 0x2d60, 0x080c, 0x95e3, 0x00de,
++	0x0005, 0x00f6, 0x2c78, 0x080c, 0x56c3, 0x00fe, 0x0598, 0x6030,
++	0xa08c, 0xff00, 0x810f, 0xa186, 0x0035, 0x0130, 0xa186, 0x001e,
++	0x0118, 0xa186, 0x0039, 0x1530, 0x00d6, 0x2c68, 0x080c, 0xb141,
++	0x1904, 0xa8c1, 0x080c, 0x958d, 0x01d8, 0x6106, 0x6003, 0x0001,
++	0x601f, 0x0001, 0x6918, 0x611a, 0x6928, 0x612a, 0x692c, 0x612e,
++	0x6930, 0xa18c, 0x00ff, 0x6132, 0x6934, 0x6136, 0x6938, 0x613a,
++	0x6950, 0x6152, 0x080c, 0xb05e, 0x080c, 0x7999, 0x080c, 0x7e94,
++	0x2d60, 0x00f8, 0x00d6, 0x6010, 0x2068, 0x080c, 0xac91, 0x01c8,
++	0x6837, 0x0103, 0x6850, 0xd0b4, 0x0128, 0xc0ec, 0x6852, 0x684b,
++	0x0006, 0x0048, 0xd0bc, 0x0118, 0x684b, 0x0002, 0x0020, 0x684b,
++	0x0005, 0x080c, 0xaf09, 0x6847, 0x0000, 0x080c, 0x580a, 0x080c,
++	0xae48, 0x00de, 0x080c, 0x95e3, 0x0005, 0x0016, 0x00d6, 0x6010,
++	0x2068, 0x080c, 0xac91, 0x0140, 0x6837, 0x0103, 0x684b, 0x0028,
++	0x6847, 0x0000, 0x080c, 0x580a, 0x00de, 0x001e, 0xa186, 0x0013,
++	0x0148, 0xa186, 0x0014, 0x0130, 0xa186, 0x0027, 0x0118, 0x080c,
++	0x962a, 0x0030, 0x080c, 0x7db1, 0x080c, 0xae54, 0x080c, 0x7e94,
++	0x0005, 0x0056, 0x0066, 0x00d6, 0x00f6, 0x2029, 0x0001, 0xa182,
++	0x0101, 0x1208, 0x0010, 0x2009, 0x0100, 0x2130, 0x2069, 0xcc98,
++	0x831c, 0x2300, 0xad18, 0x2009, 0x0020, 0xaf90, 0x001d, 0x080c,
++	0xa944, 0xa6b2, 0x0020, 0x7804, 0xa06d, 0x0110, 0x080c, 0x1629,
++	0x080c, 0x1602, 0x0500, 0x8528, 0x6837, 0x0110, 0x683b, 0x0000,
++	0x2d20, 0x7c06, 0xa68a, 0x003d, 0x1228, 0x2608, 0xad90, 0x000f,
++	0x0459, 0x0088, 0xa6b2, 0x003c, 0x2009, 0x003c, 0x2d78, 0xad90,
++	0x000f, 0x0411, 0x0c28, 0x00fe, 0x852f, 0xa5ad, 0x0003, 0x7d36,
++	0xa5ac, 0x0000, 0x0028, 0x00fe, 0x852f, 0xa5ad, 0x0003, 0x7d36,
++	0x00de, 0x006e, 0x005e, 0x0005, 0x00f6, 0x8dff, 0x0158, 0x6804,
++	0xa07d, 0x0130, 0x6807, 0x0000, 0x080c, 0x580a, 0x2f68, 0x0cb8,
++	0x080c, 0x580a, 0x00fe, 0x0005, 0x0156, 0xa184, 0x0001, 0x0108,
++	0x8108, 0x810c, 0x21a8, 0x2304, 0x8007, 0x2012, 0x8318, 0x8210,
++	0x1f04, 0xa94b, 0x015e, 0x0005, 0x0066, 0x0126, 0x2091, 0x8000,
++	0x2031, 0x0001, 0x601c, 0xa084, 0x000f, 0x0083, 0x012e, 0x006e,
++	0x0005, 0x0126, 0x2091, 0x8000, 0x0066, 0x2031, 0x0000, 0x601c,
++	0xa084, 0x000f, 0x001b, 0x006e, 0x012e, 0x0005, 0xa98b, 0xa98b,
++	0xa986, 0xa9ad, 0xa979, 0xa986, 0xa9ad, 0xa986, 0xa979, 0x77f4,
++	0xa986, 0x080c, 0x1519, 0x0036, 0x2019, 0x0010, 0x080c, 0xbd55,
++	0x601f, 0x0006, 0x6003, 0x0007, 0x003e, 0x0005, 0xa006, 0x0005,
++	0xa085, 0x0001, 0x0005, 0x00d6, 0x86ff, 0x11d8, 0x6010, 0x2068,
++	0x080c, 0xac91, 0x01c0, 0x6834, 0xa086, 0x0139, 0x1128, 0x684b,
++	0x0005, 0x6853, 0x0000, 0x0028, 0xa00e, 0x2001, 0x0005, 0x080c,
++	0x592e, 0x080c, 0xaf09, 0x080c, 0x580a, 0x080c, 0x95e3, 0xa085,
++	0x0001, 0x00de, 0x0005, 0xa006, 0x0ce0, 0x6000, 0xa08a, 0x0010,
++	0x1a0c, 0x1519, 0x000b, 0x0005, 0xa9c4, 0xa9e5, 0xa9c6, 0xaa04,
++	0xa9e2, 0xa9c4, 0xa986, 0xa98b, 0xa98b, 0xa986, 0xa986, 0xa986,
++	0xa986, 0xa986, 0xa986, 0xa986, 0x080c, 0x1519, 0x86ff, 0x11b8,
++	0x601c, 0xa086, 0x0006, 0x0198, 0x00d6, 0x6010, 0x2068, 0x080c,
++	0xac91, 0x0110, 0x080c, 0xaf09, 0x00de, 0x6007, 0x0085, 0x6003,
++	0x000b, 0x601f, 0x0002, 0x080c, 0x7999, 0x080c, 0x7e94, 0xa085,
++	0x0001, 0x0005, 0x080c, 0x1953, 0x0c08, 0x00e6, 0x2071, 0xc927,
++	0x7024, 0xac06, 0x1110, 0x080c, 0x8dee, 0x601c, 0xa084, 0x000f,
++	0xa086, 0x0006, 0x1150, 0x0086, 0x0096, 0x2049, 0x0001, 0x2c40,
++	0x080c, 0x8fc9, 0x009e, 0x008e, 0x0010, 0x080c, 0x8ced, 0x00ee,
++	0x1928, 0x080c, 0xa986, 0x0005, 0x0036, 0x00e6, 0x2071, 0xc927,
++	0x703c, 0xac06, 0x1140, 0x2019, 0x0000, 0x080c, 0x8e79, 0x00ee,
++	0x003e, 0x0804, 0xa9c6, 0x080c, 0x90f6, 0x00ee, 0x003e, 0x1904,
++	0xa9c6, 0x080c, 0xa986, 0x0005, 0x00c6, 0x601c, 0xa084, 0x000f,
++	0x0013, 0x00ce, 0x0005, 0xaa35, 0xaaa2, 0xabf0, 0xaa40, 0xae54,
++	0xaa35, 0xbd47, 0xb185, 0xaaa2, 0x77c3, 0xac5b, 0x080c, 0x1519,
++	0x080c, 0xae8f, 0x1110, 0x080c, 0x9c09, 0x0005, 0x080c, 0x7db1,
++	0x080c, 0x7e94, 0x080c, 0x95e3, 0x0005, 0x6017, 0x0001, 0x0005,
++	0x080c, 0xac91, 0x0120, 0x6010, 0xa080, 0x0019, 0x2c02, 0x6000,
++	0xa08a, 0x0010, 0x1a0c, 0x1519, 0x000b, 0x0005, 0xaa5e, 0xaa60,
++	0xaa80, 0xaa92, 0xaa9f, 0xaa5e, 0xaa35, 0xaa35, 0xaa35, 0xaa92,
++	0xaa92, 0xaa5e, 0xaa5e, 0xaa5e, 0xaa5e, 0xaa9c, 0x080c, 0x1519,
++	0x00e6, 0x6010, 0x2070, 0x7050, 0xc0b5, 0x7052, 0x2071, 0xc927,
++	0x7024, 0xac06, 0x0190, 0x080c, 0x8ced, 0x6007, 0x0085, 0x6003,
++	0x000b, 0x601f, 0x0002, 0x2001, 0xc8fe, 0x2004, 0x6016, 0x080c,
++	0x7999, 0x080c, 0x7e94, 0x00ee, 0x0005, 0x6017, 0x0001, 0x0cd8,
++	0x00d6, 0x6010, 0x2068, 0x6850, 0xc0b5, 0x6852, 0x00de, 0x6007,
++	0x0085, 0x6003, 0x000b, 0x601f, 0x0002, 0x080c, 0x7999, 0x080c,
++	0x7e94, 0x0005, 0x00d6, 0x6017, 0x0001, 0x6010, 0x2068, 0x6850,
++	0xc0b5, 0x6852, 0x00de, 0x0005, 0x080c, 0x95e3, 0x0005, 0x080c,
++	0x1953, 0x08f0, 0x6000, 0xa08a, 0x0010, 0x1a0c, 0x1519, 0x000b,
++	0x0005, 0xaab9, 0xaa3d, 0xaabb, 0xaab9, 0xaabb, 0xaabb, 0xaa36,
++	0xaab9, 0xaa30, 0xaa30, 0xaab9, 0xaab9, 0xaab9, 0xaab9, 0xaab9,
++	0xaab9, 0x080c, 0x1519, 0x00d6, 0x6018, 0x2068, 0x6804, 0xa084,
++	0x00ff, 0x00de, 0xa08a, 0x000c, 0x1a0c, 0x1519, 0x000b, 0x0005,
++	0xaad4, 0xab96, 0xaad6, 0xab14, 0xaad6, 0xab14, 0xaad6, 0xaae4,
++	0xaad4, 0xab14, 0xaad4, 0xab00, 0x080c, 0x1519, 0x6004, 0xa08e,
++	0x0016, 0x05a8, 0xa08e, 0x0004, 0x0590, 0xa08e, 0x0002, 0x0578,
++	0xa08e, 0x004b, 0x0904, 0xab92, 0x6004, 0x080c, 0xae8f, 0x0904,
++	0xabaf, 0xa08e, 0x0021, 0x0904, 0xabb3, 0xa08e, 0x0022, 0x0904,
++	0xabaf, 0xa08e, 0x003d, 0x0904, 0xabb3, 0xa08e, 0x0039, 0x0904,
++	0xabb7, 0xa08e, 0x0035, 0x0904, 0xabb7, 0xa08e, 0x001e, 0x0188,
++	0xa08e, 0x0001, 0x1150, 0x00d6, 0x6018, 0x2068, 0x6804, 0xa084,
++	0x00ff, 0x00de, 0xa086, 0x0006, 0x0110, 0x080c, 0x2e46, 0x080c,
++	0x9c09, 0x080c, 0xae54, 0x0005, 0x00c6, 0x00d6, 0x6104, 0xa186,
++	0x0016, 0x0904, 0xab83, 0xa186, 0x0002, 0x15d8, 0x2001, 0xc635,
++	0x2004, 0xd08c, 0x1198, 0x080c, 0x5f22, 0x1180, 0x2001, 0xc8e6,
++	0x2003, 0x0001, 0x2001, 0xc600, 0x2003, 0x0001, 0xa085, 0x0001,
++	0x080c, 0x5f66, 0x080c, 0x5e5a, 0x0804, 0xabd9, 0x6018, 0x2068,
++	0x2001, 0xc635, 0x2004, 0xd0ac, 0x1904, 0xabd9, 0x68a0, 0xd0bc,
++	0x1904, 0xabd9, 0x6840, 0xa084, 0x00ff, 0xa005, 0x0190, 0x8001,
++	0x6842, 0x6013, 0x0000, 0x601f, 0x0007, 0x6017, 0x0398, 0x603f,
++	0x0000, 0x080c, 0x958d, 0x0128, 0x2d00, 0x601a, 0x601f, 0x0001,
++	0x0450, 0x00de, 0x00ce, 0x6004, 0xa08e, 0x0002, 0x11a8, 0x6018,
++	0xa080, 0x0028, 0x2004, 0xa086, 0x007e, 0x1170, 0x2009, 0xc635,
++	0x2104, 0xc085, 0x200a, 0x00e6, 0x2071, 0xc600, 0x080c, 0x4f02,
++	0x00ee, 0x080c, 0x9c09, 0x0020, 0x080c, 0x9c09, 0x080c, 0x2e46,
++	0x00e6, 0x0126, 0x2091, 0x8000, 0x080c, 0x2e6c, 0x012e, 0x00ee,
++	0x080c, 0xae54, 0x0005, 0x2001, 0x0002, 0x080c, 0x5291, 0x6003,
++	0x0001, 0x6007, 0x0002, 0x080c, 0x79df, 0x080c, 0x7e94, 0x00de,
++	0x00ce, 0x0c80, 0x080c, 0x2e6c, 0x0804, 0xab0f, 0x00c6, 0x00d6,
++	0x6104, 0xa186, 0x0016, 0x0d38, 0x6018, 0x2068, 0x6840, 0xa084,
++	0x00ff, 0xa005, 0x0904, 0xab59, 0x8001, 0x6842, 0x6003, 0x0001,
++	0x080c, 0x79df, 0x080c, 0x7e94, 0x00de, 0x00ce, 0x0898, 0x080c,
++	0x9c09, 0x0804, 0xab11, 0x080c, 0x9c37, 0x0804, 0xab11, 0x00d6,
++	0x2c68, 0x6104, 0x080c, 0xb141, 0x00de, 0x0118, 0x080c, 0x95e3,
++	0x00b8, 0x6004, 0x8007, 0x6130, 0xa18c, 0x00ff, 0xa105, 0x6032,
++	0x6007, 0x0085, 0x6003, 0x000b, 0x601f, 0x0002, 0x6038, 0x600a,
++	0x2001, 0xc8fe, 0x2004, 0x6016, 0x080c, 0x7999, 0x080c, 0x7e94,
++	0x0005, 0x00de, 0x00ce, 0x080c, 0x9c09, 0x080c, 0x2e46, 0x00e6,
++	0x0126, 0x2091, 0x8000, 0x080c, 0x2e6c, 0x6013, 0x0000, 0x601f,
++	0x0007, 0x6017, 0x0398, 0x603f, 0x0000, 0x012e, 0x00ee, 0x0005,
++	0x6000, 0xa08a, 0x0010, 0x1a0c, 0x1519, 0x000b, 0x0005, 0xac07,
++	0xac07, 0xac07, 0xac07, 0xac07, 0xac07, 0xac07, 0xac07, 0xac07,
++	0xaa35, 0xac07, 0xaa3d, 0xac09, 0xaa3d, 0xac16, 0xac07, 0x080c,
++	0x1519, 0x6004, 0xa086, 0x008b, 0x0148, 0x6007, 0x008b, 0x6003,
++	0x000d, 0x080c, 0x7999, 0x080c, 0x7e94, 0x0005, 0x080c, 0xae48,
++	0x080c, 0xac91, 0x0580, 0x080c, 0x2e46, 0x00d6, 0x080c, 0xac91,
++	0x0168, 0x6010, 0x2068, 0x6837, 0x0103, 0x684b, 0x0006, 0x6847,
++	0x0000, 0x6850, 0xc0ed, 0x6852, 0x080c, 0x580a, 0x2c68, 0x080c,
++	0x958d, 0x0150, 0x6818, 0x601a, 0x080c, 0xb05e, 0x00c6, 0x2d60,
++	0x080c, 0xae54, 0x00ce, 0x0008, 0x2d60, 0x00de, 0x6013, 0x0000,
++	0x601f, 0x0001, 0x6007, 0x0001, 0x6003, 0x0001, 0x080c, 0x79df,
++	0x080c, 0x7e94, 0x0078, 0x6030, 0xa08c, 0xff00, 0x810f, 0xa186,
++	0x0039, 0x0118, 0xa186, 0x0035, 0x1118, 0x080c, 0x2e46, 0x08b0,
++	0x080c, 0xae54, 0x0005, 0x6000, 0xa08a, 0x0010, 0x1a0c, 0x1519,
++	0x000b, 0x0005, 0xac72, 0xac72, 0xac72, 0xac74, 0xac74, 0xac72,
++	0xac72, 0xac72, 0xac72, 0xac72, 0xac72, 0xac72, 0xac72, 0xac72,
++	0xac72, 0xac72, 0x080c, 0x1519, 0x080c, 0x90f6, 0x190c, 0x1519,
++	0x6110, 0x2168, 0x684b, 0x0006, 0x080c, 0x580a, 0x080c, 0x95e3,
++	0x0005, 0xa284, 0x0007, 0x1158, 0xa282, 0xce00, 0x0240, 0x2001,
++	0xc617, 0x2004, 0xa202, 0x1218, 0xa085, 0x0001, 0x0005, 0xa006,
++	0x0ce8, 0x0026, 0x6210, 0xa294, 0xf000, 0x002e, 0x0005, 0x00e6,
++	0x00c6, 0x0036, 0x0006, 0x0126, 0x2091, 0x8000, 0x2061, 0xce00,
++	0x2071, 0xc600, 0x7348, 0x7068, 0xa302, 0x12a8, 0x601c, 0xa206,
++	0x1160, 0x080c, 0xafe9, 0x0148, 0x080c, 0xae8f, 0x1110, 0x080c,
++	0x9c09, 0x00c6, 0x080c, 0x95e3, 0x00ce, 0xace0, 0x0018, 0x705c,
++	0xac02, 0x1208, 0x0c38, 0x012e, 0x000e, 0x003e, 0x00ce, 0x00ee,
++	0x0005, 0x00e6, 0x00c6, 0x0016, 0xa188, 0xc77b, 0x210c, 0x81ff,
++	0x0128, 0x2061, 0xca3c, 0x611a, 0x080c, 0x2e46, 0xa006, 0x0010,
++	0xa085, 0x0001, 0x001e, 0x00ce, 0x00ee, 0x0005, 0x00c6, 0x0056,
++	0x0126, 0x2091, 0x8000, 0x00c6, 0x080c, 0x958d, 0x005e, 0x0180,
++	0x6612, 0x651a, 0x080c, 0xb05e, 0x601f, 0x0003, 0x2009, 0x004b,
++	0x080c, 0x9613, 0xa085, 0x0001, 0x012e, 0x005e, 0x00ce, 0x0005,
++	0xa006, 0x0cd0, 0x00c6, 0x0056, 0x0126, 0x2091, 0x8000, 0x62a0,
++	0x00c6, 0x080c, 0xaf0d, 0x005e, 0x0550, 0x6013, 0x0000, 0x651a,
++	0x080c, 0xb05e, 0x601f, 0x0003, 0x0016, 0x00c6, 0x2560, 0x080c,
++	0x553e, 0x00ce, 0x080c, 0x7b16, 0x0076, 0x2039, 0x0000, 0x080c,
++	0x7a0e, 0x2c08, 0x080c, 0xbef7, 0x007e, 0x001e, 0xd184, 0x0128,
++	0x080c, 0x95e3, 0xa085, 0x0001, 0x0030, 0x2009, 0x004c, 0x080c,
++	0x9613, 0xa085, 0x0001, 0x012e, 0x005e, 0x00ce, 0x0005, 0xa006,
++	0x0cd0, 0x00f6, 0x00c6, 0x0046, 0x00c6, 0x080c, 0x958d, 0x2c78,
++	0x00ce, 0x0180, 0x7e12, 0x2c00, 0x781a, 0x781f, 0x0003, 0x2021,
++	0x0005, 0x080c, 0xad87, 0x2f60, 0x2009, 0x004d, 0x080c, 0x9613,
++	0xa085, 0x0001, 0x004e, 0x00ce, 0x00fe, 0x0005, 0x00f6, 0x00c6,
++	0x0046, 0x00c6, 0x080c, 0x958d, 0x2c78, 0x00ce, 0x0178, 0x7e12,
++	0x2c00, 0x781a, 0x781f, 0x0003, 0x2021, 0x0005, 0x0481, 0x2f60,
++	0x2009, 0x004e, 0x080c, 0x9613, 0xa085, 0x0001, 0x004e, 0x00ce,
++	0x00fe, 0x0005, 0x00f6, 0x00c6, 0x0046, 0x00c6, 0x080c, 0x958d,
++	0x2c78, 0x00ce, 0x01c0, 0x7e12, 0x2c00, 0x781a, 0x781f, 0x0003,
++	0x2021, 0x0004, 0x00a1, 0x2001, 0xc8e7, 0x2004, 0xd0fc, 0x0120,
++	0x2f60, 0x080c, 0x95e3, 0x0028, 0x2f60, 0x2009, 0x0052, 0x080c,
++	0x9613, 0xa085, 0x0001, 0x004e, 0x00ce, 0x00fe, 0x0005, 0x0096,
++	0x0076, 0x0126, 0x2091, 0x8000, 0x080c, 0x54e0, 0x0118, 0x2001,
++	0xad8c, 0x0028, 0x080c, 0x54b0, 0x0158, 0x2001, 0xad92, 0x0006,
++	0xa00e, 0x2400, 0x080c, 0x592e, 0x080c, 0x580a, 0x000e, 0x0807,
++	0x2418, 0x080c, 0x7d50, 0x62a0, 0x0086, 0x2041, 0x0001, 0x2039,
++	0x0001, 0x2608, 0x080c, 0x7b2f, 0x008e, 0x080c, 0x7a0e, 0x2f08,
++	0x2648, 0x080c, 0xbef7, 0x613c, 0x81ff, 0x090c, 0x7be4, 0x080c,
++	0x7e94, 0x012e, 0x007e, 0x009e, 0x0005, 0x00c6, 0x0126, 0x2091,
++	0x8000, 0x00c6, 0x080c, 0x958d, 0x001e, 0x0188, 0x660a, 0x611a,
++	0x080c, 0xb05e, 0x601f, 0x0001, 0x2d00, 0x6012, 0x2009, 0x001f,
++	0x080c, 0x9613, 0xa085, 0x0001, 0x012e, 0x00ce, 0x0005, 0xa006,
++	0x0cd8, 0x00c6, 0x0126, 0x2091, 0x8000, 0x00c6, 0x080c, 0x958d,
++	0x001e, 0x0188, 0x660a, 0x611a, 0x080c, 0xb05e, 0x601f, 0x0008,
++	0x2d00, 0x6012, 0x2009, 0x0021, 0x080c, 0x9613, 0xa085, 0x0001,
++	0x012e, 0x00ce, 0x0005, 0xa006, 0x0cd8, 0x00c6, 0x0126, 0x2091,
++	0x8000, 0x00c6, 0x080c, 0x958d, 0x001e, 0x0188, 0x660a, 0x611a,
++	0x080c, 0xb05e, 0x601f, 0x0001, 0x2d00, 0x6012, 0x2009, 0x003d,
++	0x080c, 0x9613, 0xa085, 0x0001, 0x012e, 0x00ce, 0x0005, 0xa006,
++	0x0cd8, 0x00c6, 0x0126, 0x2091, 0x8000, 0x00c6, 0x080c, 0xaf0d,
++	0x001e, 0x0180, 0x611a, 0x080c, 0xb05e, 0x601f, 0x0001, 0x2d00,
++	0x6012, 0x2009, 0x0000, 0x080c, 0x9613, 0xa085, 0x0001, 0x012e,
++	0x00ce, 0x0005, 0xa006, 0x0cd8, 0x00c6, 0x0126, 0x2091, 0x8000,
++	0x00c6, 0x080c, 0x958d, 0x001e, 0x0188, 0x660a, 0x611a, 0x080c,
++	0xb05e, 0x601f, 0x0001, 0x2d00, 0x6012, 0x2009, 0x0044, 0x080c,
++	0x9613, 0xa085, 0x0001, 0x012e, 0x00ce, 0x0005, 0xa006, 0x0cd8,
++	0x0026, 0x00d6, 0x6218, 0x2268, 0x6a3c, 0x82ff, 0x0110, 0x8211,
++	0x6a3e, 0x00de, 0x002e, 0x0005, 0x0006, 0x6000, 0xa086, 0x0000,
++	0x0190, 0x6013, 0x0000, 0x601f, 0x0007, 0x2001, 0xc8fd, 0x2004,
++	0x0006, 0xa082, 0x0051, 0x000e, 0x0208, 0x8004, 0x6016, 0x080c,
++	0xc3e2, 0x603f, 0x0000, 0x000e, 0x0005, 0x0066, 0x00c6, 0x00d6,
++	0x2031, 0xc653, 0x2634, 0xd6e4, 0x0128, 0x6618, 0x2660, 0x6e48,
++	0x080c, 0x5469, 0x00de, 0x00ce, 0x006e, 0x0005, 0x0006, 0x0016,
++	0x6004, 0xa08e, 0x0002, 0x0140, 0xa08e, 0x0003, 0x0128, 0xa08e,
++	0x0004, 0x0110, 0xa085, 0x0001, 0x001e, 0x000e, 0x0005, 0x0006,
++	0x00d6, 0x6010, 0xa06d, 0x0148, 0x6834, 0xa086, 0x0139, 0x0138,
++	0x6838, 0xd0fc, 0x0110, 0xa006, 0x0010, 0xa085, 0x0001, 0x00de,
++	0x000e, 0x0005, 0x00c6, 0x0126, 0x2091, 0x8000, 0x00c6, 0x080c,
++	0x958d, 0x001e, 0x0190, 0x611a, 0x080c, 0xb05e, 0x601f, 0x0001,
++	0x2d00, 0x6012, 0x080c, 0x2e46, 0x2009, 0x0028, 0x080c, 0x9613,
++	0xa085, 0x0001, 0x012e, 0x00ce, 0x0005, 0xa006, 0x0cd8, 0xa186,
++	0x0015, 0x1178, 0x2011, 0xc621, 0x2204, 0xa086, 0x0074, 0x1148,
++	0x080c, 0x9fb9, 0x6003, 0x0001, 0x6007, 0x0029, 0x080c, 0x79df,
++	0x0020, 0x080c, 0x9c09, 0x080c, 0x95e3, 0x0005, 0xa186, 0x0016,
++	0x1128, 0x2001, 0x0004, 0x080c, 0x5291, 0x00e8, 0xa186, 0x0015,
++	0x11e8, 0x2011, 0xc621, 0x2204, 0xa086, 0x0014, 0x11b8, 0x00d6,
++	0x6018, 0x2068, 0x080c, 0x53df, 0x00de, 0x080c, 0xa072, 0x1170,
++	0x00d6, 0x6018, 0x2068, 0x6890, 0x00de, 0xa005, 0x0138, 0x2001,
++	0x0006, 0x080c, 0x5291, 0x080c, 0x9767, 0x0020, 0x080c, 0x9c09,
++	0x080c, 0x95e3, 0x0005, 0x6848, 0xa086, 0x0005, 0x1108, 0x0009,
++	0x0005, 0x6850, 0xc0ad, 0x6852, 0x0005, 0x00e6, 0x0126, 0x2071,
++	0xc600, 0x2091, 0x8000, 0x7548, 0xa582, 0x0001, 0x0608, 0x704c,
++	0x2060, 0x6000, 0xa086, 0x0000, 0x0148, 0xace0, 0x0018, 0x705c,
++	0xac02, 0x1208, 0x0cb0, 0x2061, 0xce00, 0x0c98, 0x6003, 0x0008,
++	0x8529, 0x754a, 0xaca8, 0x0018, 0x705c, 0xa502, 0x1230, 0x754e,
++	0xa085, 0x0001, 0x012e, 0x00ee, 0x0005, 0x704f, 0xce00, 0x0cc0,
++	0xa006, 0x0cc0, 0x00e6, 0x2071, 0xcc8c, 0x7014, 0xd0e4, 0x0150,
++	0x6013, 0x0000, 0x6003, 0x0001, 0x6007, 0x0050, 0x080c, 0x7999,
++	0x080c, 0x7e94, 0x00ee, 0x0005, 0x00c6, 0x00f6, 0x2c78, 0x080c,
++	0x56c3, 0x00fe, 0x0120, 0x601c, 0xa084, 0x000f, 0x0013, 0x00ce,
++	0x0005, 0xaa35, 0xaf64, 0xaf67, 0xaf6a, 0xc1cf, 0xc1ea, 0xc1ed,
++	0xaa35, 0xaa35, 0x080c, 0x1519, 0xe000, 0xe000, 0x0005, 0xe000,
++	0xe000, 0x0005, 0x0009, 0x0005, 0x00f6, 0x2c78, 0x080c, 0x56c3,
++	0x0538, 0x080c, 0x958d, 0x1128, 0x2001, 0xc8ff, 0x2004, 0x783e,
++	0x00f8, 0x7818, 0x601a, 0x080c, 0xb05e, 0x781c, 0xa086, 0x0003,
++	0x0128, 0x7808, 0x6036, 0x2f00, 0x603a, 0x0020, 0x7808, 0x603a,
++	0x2f00, 0x6036, 0x602a, 0x601f, 0x0001, 0x6007, 0x0035, 0x6003,
++	0x0001, 0x7950, 0x6152, 0x080c, 0x7999, 0x080c, 0x7e94, 0x2f60,
++	0x00fe, 0x0005, 0x0016, 0x00f6, 0x682c, 0x6032, 0xa08e, 0x0001,
++	0x0138, 0xa086, 0x0005, 0x0140, 0xa006, 0x602a, 0x602e, 0x00a0,
++	0x6820, 0xc0f4, 0xc0d5, 0x6822, 0x6810, 0x2078, 0x787c, 0x6938,
++	0xa102, 0x7880, 0x6934, 0xa103, 0x1e78, 0x6834, 0x602a, 0x6838,
++	0xa084, 0xfffc, 0x683a, 0x602e, 0x2d00, 0x6036, 0x6808, 0x603a,
++	0x6918, 0x611a, 0x6950, 0x6152, 0x601f, 0x0001, 0x6007, 0x0039,
++	0x6003, 0x0001, 0x080c, 0x7999, 0x6803, 0x0002, 0x00fe, 0x001e,
++	0x0005, 0x00f6, 0x2c78, 0x080c, 0x56c3, 0x1118, 0xa085, 0x0001,
++	0x0070, 0x6020, 0xd0f4, 0x1150, 0xc0f5, 0x6022, 0x6010, 0x2078,
++	0x7828, 0x603a, 0x782c, 0x6036, 0x080c, 0x1953, 0xa006, 0x00fe,
++	0x0005, 0x0006, 0x0016, 0x6004, 0xa08e, 0x0034, 0x01b8, 0xa08e,
++	0x0035, 0x01a0, 0xa08e, 0x0036, 0x0188, 0xa08e, 0x0037, 0x0170,
++	0xa08e, 0x0038, 0x0158, 0xa08e, 0x0039, 0x0140, 0xa08e, 0x003a,
++	0x0128, 0xa08e, 0x003b, 0x0110, 0xa085, 0x0001, 0x001e, 0x000e,
++	0x0005, 0x0006, 0x0016, 0x0026, 0x0036, 0x00e6, 0x2001, 0xc8f9,
++	0x200c, 0x8000, 0x2014, 0x2001, 0x0032, 0x080c, 0x783f, 0x2001,
++	0xc8fd, 0x82ff, 0x1110, 0x2011, 0x0014, 0x2202, 0x2001, 0xc8fb,
++	0x200c, 0x8000, 0x2014, 0x2071, 0xc8d5, 0x711a, 0x721e, 0x2001,
++	0x0064, 0x080c, 0x783f, 0x2001, 0xc8fe, 0x82ff, 0x1110, 0x2011,
++	0x0014, 0x2202, 0x2009, 0xc8ff, 0xa280, 0x000a, 0x200a, 0x080c,
++	0x572c, 0x00ee, 0x003e, 0x002e, 0x001e, 0x000e, 0x0005, 0x0006,
++	0x00e6, 0x2001, 0xc8fd, 0x2003, 0x0028, 0x2001, 0xc8fe, 0x2003,
++	0x0014, 0x2071, 0xc8d5, 0x701b, 0x0000, 0x701f, 0x07d0, 0x2001,
++	0xc8ff, 0x2003, 0x001e, 0x00ee, 0x000e, 0x0005, 0x00d6, 0x6054,
++	0xa06d, 0x0110, 0x080c, 0x1619, 0x00de, 0x0005, 0x0005, 0x00c6,
++	0x0126, 0x2091, 0x8000, 0x00c6, 0x080c, 0x958d, 0x001e, 0x0178,
++	0x611a, 0x0ca1, 0x601f, 0x0001, 0x2d00, 0x6012, 0x2009, 0x0033,
++	0x080c, 0x9613, 0xa085, 0x0001, 0x012e, 0x00ce, 0x0005, 0xa006,
++	0x0cd8, 0x00d6, 0x00e6, 0x00f6, 0x2071, 0xc600, 0xa186, 0x0015,
++	0x1500, 0x7084, 0xa086, 0x0018, 0x11e0, 0x6010, 0x2068, 0x6a3c,
++	0xd2e4, 0x1160, 0x2c78, 0x080c, 0x80af, 0x01d8, 0x7070, 0x6a50,
++	0xa206, 0x1160, 0x7074, 0x6a54, 0xa206, 0x1140, 0x6218, 0xa290,
++	0x0028, 0x2214, 0x2009, 0x0000, 0x080c, 0x2e8b, 0x080c, 0x9767,
++	0x0020, 0x080c, 0x9c09, 0x080c, 0x95e3, 0x00fe, 0x00ee, 0x00de,
++	0x0005, 0x7054, 0x6a54, 0xa206, 0x0d48, 0x0c80, 0x00c6, 0x0126,
++	0x2091, 0x8000, 0x00c6, 0x080c, 0x958d, 0x001e, 0x0180, 0x611a,
++	0x080c, 0xb05e, 0x601f, 0x0001, 0x2d00, 0x6012, 0x2009, 0x0043,
++	0x080c, 0x9613, 0xa085, 0x0001, 0x012e, 0x00ce, 0x0005, 0xa006,
++	0x0cd8, 0x00d6, 0x00e6, 0x00f6, 0x2071, 0xc600, 0xa186, 0x0015,
++	0x11c0, 0x7084, 0xa086, 0x0004, 0x11a0, 0x6010, 0xa0e8, 0x000f,
++	0x2c78, 0x080c, 0x80af, 0x01a8, 0x7070, 0x6a08, 0xa206, 0x1130,
++	0x7074, 0x6a0c, 0xa206, 0x1110, 0x080c, 0x2e46, 0x080c, 0x9767,
++	0x0020, 0x080c, 0x9c09, 0x080c, 0x95e3, 0x00fe, 0x00ee, 0x00de,
++	0x0005, 0x7054, 0x6a0c, 0xa206, 0x0d78, 0x0c80, 0x0016, 0x0026,
++	0x684c, 0xd0ac, 0x0178, 0x6914, 0x6a10, 0x2100, 0xa205, 0x0150,
++	0x6860, 0xa106, 0x1118, 0x685c, 0xa206, 0x0120, 0x6962, 0x6a5e,
++	0xa085, 0x0001, 0x002e, 0x001e, 0x0005, 0x00d6, 0x0036, 0x6310,
++	0x2368, 0x684a, 0x6952, 0xa29e, 0x4000, 0x11a0, 0x00c6, 0x6318,
++	0x2360, 0x2009, 0x0000, 0x6838, 0xd0f4, 0x1140, 0x080c, 0x55de,
++	0x1108, 0xc185, 0x6000, 0xd0bc, 0x0108, 0xc18d, 0x6a66, 0x696a,
++	0x00ce, 0x0080, 0x6a66, 0x3918, 0xa398, 0x0006, 0x231c, 0x686b,
++	0x0004, 0x6b72, 0x00c6, 0x6318, 0x2360, 0x6004, 0xa084, 0x00ff,
++	0x686e, 0x00ce, 0x080c, 0x580a, 0x6013, 0x0000, 0x003e, 0x00de,
++	0x0005, 0x00c6, 0x0026, 0x0016, 0xa186, 0x0035, 0x0110, 0x6a34,
++	0x0008, 0x6a28, 0x080c, 0xac81, 0x01f0, 0x2260, 0x611c, 0xa186,
++	0x0003, 0x0118, 0xa186, 0x0006, 0x1190, 0x6834, 0xa206, 0x0140,
++	0x6838, 0xa206, 0x1160, 0x6108, 0x6834, 0xa106, 0x1140, 0x0020,
++	0x6008, 0x6938, 0xa106, 0x1118, 0x6018, 0x6918, 0xa106, 0x001e,
++	0x002e, 0x00ce, 0x0005, 0xa085, 0x0001, 0x0cc8, 0x6944, 0xd1cc,
++	0x0198, 0xa18c, 0x00ff, 0xa18e, 0x0002, 0x1170, 0xad88, 0x001e,
++	0x210c, 0xa18c, 0x0f00, 0x810f, 0xa18e, 0x0001, 0x1128, 0x6810,
++	0x6914, 0xa115, 0x190c, 0xa4ba, 0x0005, 0x080c, 0x95e3, 0x0804,
++	0x7e94, 0x0066, 0x6000, 0xa0b2, 0x0010, 0x1a0c, 0x1519, 0x0013,
++	0x006e, 0x0005, 0xb1a2, 0xb6b9, 0xb7e1, 0xb1a2, 0xb1a2, 0xb1a2,
++	0xb1a2, 0xb1a2, 0xb1da, 0xb865, 0xb1a2, 0xb1a2, 0xb1a2, 0xb1a2,
++	0xb1a2, 0xb1a2, 0x080c, 0x1519, 0x0066, 0x6000, 0xa0b2, 0x0010,
++	0x1a0c, 0x1519, 0x0013, 0x006e, 0x0005, 0xb1bd, 0xbcec, 0xb1bd,
++	0xb1bd, 0xb1bd, 0xb1bd, 0xb1bd, 0xb1bd, 0xbcae, 0xbd34, 0xb1bd,
++	0xc314, 0xc344, 0xc314, 0xc344, 0xb1bd, 0x080c, 0x1519, 0x0066,
++	0x6000, 0xa0b2, 0x0010, 0x1a0c, 0x1519, 0x0013, 0x006e, 0x0005,
++	0xb1d8, 0xb9b5, 0xba82, 0xbaaf, 0xbb33, 0xb1d8, 0xbc20, 0xbbcb,
++	0xb871, 0xbc84, 0xbc99, 0xb1d8, 0xb1d8, 0xb1d8, 0xb1d8, 0xb1d8,
++	0x080c, 0x1519, 0xa1b2, 0x0080, 0x1a0c, 0x1519, 0x2100, 0xa1b2,
++	0x0040, 0x1a04, 0xb5f1, 0x0002, 0xb224, 0xb3ef, 0xb224, 0xb224,
++	0xb224, 0xb3f6, 0xb224, 0xb224, 0xb224, 0xb224, 0xb224, 0xb224,
++	0xb224, 0xb224, 0xb224, 0xb224, 0xb224, 0xb224, 0xb224, 0xb224,
++	0xb224, 0xb224, 0xb224, 0xb226, 0xb284, 0xb293, 0xb2e1, 0xb2ff,
++	0xb37d, 0xb3dc, 0xb224, 0xb224, 0xb3f9, 0xb224, 0xb224, 0xb40c,
++	0xb417, 0xb224, 0xb224, 0xb224, 0xb224, 0xb224, 0xb4a2, 0xb224,
++	0xb224, 0xb4b5, 0xb224, 0xb224, 0xb46d, 0xb224, 0xb224, 0xb224,
++	0xb4cd, 0xb224, 0xb224, 0xb224, 0xb547, 0xb224, 0xb224, 0xb224,
++	0xb224, 0xb224, 0xb224, 0xb5b8, 0x080c, 0x1519, 0x080c, 0x570b,
++	0x1150, 0x2001, 0xc635, 0x2004, 0xd0cc, 0x1128, 0xa084, 0x0009,
++	0xa086, 0x0008, 0x1140, 0x6007, 0x0009, 0x602b, 0x0009, 0x6013,
++	0x0000, 0x0804, 0xb3ea, 0x080c, 0x568d, 0x00e6, 0x00c6, 0x0036,
++	0x0026, 0x0016, 0x6218, 0x2270, 0x72a0, 0x0026, 0x2019, 0x0029,
++	0x080c, 0x7b16, 0x0076, 0x2039, 0x0000, 0x080c, 0x7a0e, 0x2c08,
++	0x080c, 0xbef7, 0x007e, 0x001e, 0x2e60, 0x080c, 0x553e, 0x001e,
++	0x002e, 0x003e, 0x00ce, 0x00ee, 0x6618, 0x00c6, 0x2660, 0x080c,
++	0x534c, 0x00ce, 0xa6b0, 0x0001, 0x2634, 0xa684, 0x00ff, 0xa082,
++	0x0006, 0x0278, 0x080c, 0xbe3b, 0x1904, 0xb2db, 0x080c, 0xbddb,
++	0x1120, 0x6007, 0x0008, 0x0804, 0xb3ea, 0x6007, 0x0009, 0x0804,
++	0xb3ea, 0x080c, 0xc023, 0x0128, 0x080c, 0xbe3b, 0x0d78, 0x0804,
++	0xb2db, 0x6013, 0x1900, 0x0c88, 0x080c, 0x2f69, 0x1904, 0xb5ee,
++	0x6106, 0x080c, 0xbd95, 0x6007, 0x0006, 0x0804, 0xb3ea, 0x6007,
++	0x0007, 0x0804, 0xb3ea, 0x080c, 0xc378, 0x1904, 0xb5ee, 0x080c,
++	0x2f69, 0x1904, 0xb5ee, 0x00d6, 0x6618, 0x2668, 0x6e04, 0xa684,
++	0x00ff, 0xa082, 0x0006, 0x1220, 0x2001, 0x0001, 0x080c, 0x527f,
++	0xa6b4, 0xff00, 0x8637, 0xa686, 0x0006, 0x0188, 0xa686, 0x0004,
++	0x0170, 0x6e04, 0xa6b4, 0x00ff, 0xa686, 0x0006, 0x0140, 0xa686,
++	0x0004, 0x0128, 0xa686, 0x0005, 0x0110, 0x00de, 0x00e0, 0x080c,
++	0xbe99, 0x11a0, 0xa686, 0x0006, 0x1150, 0x0026, 0x6218, 0xa290,
++	0x0028, 0x2214, 0x2009, 0x0000, 0x080c, 0x2e8b, 0x002e, 0x080c,
++	0x53df, 0x6007, 0x000a, 0x00de, 0x0804, 0xb3ea, 0x6007, 0x000b,
++	0x00de, 0x0804, 0xb3ea, 0x080c, 0x2e46, 0x6007, 0x0001, 0x0804,
++	0xb3ea, 0x080c, 0xc378, 0x1904, 0xb5ee, 0x080c, 0x2f69, 0x1904,
++	0xb5ee, 0x6618, 0x00d6, 0x2668, 0x6e04, 0x00de, 0xa686, 0x0707,
++	0x0d50, 0x0026, 0x6218, 0xa290, 0x0028, 0x2214, 0x2009, 0x0000,
++	0x080c, 0x2e8b, 0x002e, 0x6007, 0x000c, 0x0804, 0xb3ea, 0x080c,
++	0x570b, 0x1140, 0x2001, 0xc635, 0x2004, 0xa084, 0x0009, 0xa086,
++	0x0008, 0x1110, 0x0804, 0xb233, 0x080c, 0x568d, 0x6618, 0xa6b0,
++	0x0001, 0x2634, 0xa684, 0x00ff, 0xa082, 0x0006, 0x06e8, 0x1138,
++	0x0026, 0x2001, 0x0006, 0x080c, 0x52be, 0x002e, 0x0050, 0xa6b4,
++	0xff00, 0x8637, 0xa686, 0x0004, 0x0120, 0xa686, 0x0006, 0x1904,
++	0xb2db, 0x080c, 0xbea6, 0x1120, 0x6007, 0x000e, 0x0804, 0xb3ea,
++	0x0046, 0x6418, 0xa4a0, 0x0028, 0x2424, 0xa4a4, 0x00ff, 0x8427,
++	0x0046, 0x080c, 0x2e46, 0x004e, 0x0016, 0xa006, 0x2009, 0xc653,
++	0x210c, 0xd1a4, 0x0158, 0x2009, 0x0029, 0x080c, 0xc190, 0x6018,
++	0x00d6, 0x2068, 0x6800, 0xc0e5, 0x6802, 0x00de, 0x001e, 0x004e,
++	0x6007, 0x0001, 0x0804, 0xb3ea, 0x2001, 0x0001, 0x080c, 0x527f,
++	0x0156, 0x0016, 0x0026, 0x0036, 0x20a9, 0x0004, 0x2019, 0xc605,
++	0x2011, 0xcc90, 0x080c, 0xa103, 0x003e, 0x002e, 0x001e, 0x015e,
++	0xa005, 0x0168, 0xa6b4, 0xff00, 0x8637, 0xa682, 0x0004, 0x0a04,
++	0xb2db, 0xa682, 0x0007, 0x0a04, 0xb329, 0x0804, 0xb2db, 0x6013,
++	0x1900, 0x6007, 0x0009, 0x0804, 0xb3ea, 0x080c, 0x570b, 0x1140,
++	0x2001, 0xc635, 0x2004, 0xa084, 0x0009, 0xa086, 0x0008, 0x1110,
++	0x0804, 0xb233, 0x080c, 0x568d, 0x6618, 0xa6b0, 0x0001, 0x2634,
++	0xa684, 0x00ff, 0xa082, 0x0006, 0x06b8, 0xa6b4, 0xff00, 0x8637,
++	0xa686, 0x0004, 0x0120, 0xa686, 0x0006, 0x1904, 0xb2db, 0x080c,
++	0xbece, 0x1138, 0x080c, 0xbddb, 0x1120, 0x6007, 0x0010, 0x0804,
++	0xb3ea, 0x0046, 0x6418, 0xa4a0, 0x0028, 0x2424, 0xa4a4, 0x00ff,
++	0x8427, 0x0046, 0x080c, 0x2e46, 0x004e, 0x0016, 0xa006, 0x2009,
++	0xc653, 0x210c, 0xd1a4, 0x0158, 0x2009, 0x0029, 0x080c, 0xc190,
++	0x6018, 0x00d6, 0x2068, 0x6800, 0xc0e5, 0x6802, 0x00de, 0x001e,
++	0x004e, 0x6007, 0x0001, 0x00f0, 0x080c, 0xc023, 0x0140, 0xa6b4,
++	0xff00, 0x8637, 0xa686, 0x0006, 0x0950, 0x0804, 0xb2db, 0x6013,
++	0x1900, 0x6007, 0x0009, 0x0070, 0x080c, 0x2f69, 0x1904, 0xb5ee,
++	0x080c, 0xc378, 0x1904, 0xb5ee, 0x080c, 0xb652, 0x1904, 0xb2db,
++	0x6007, 0x0012, 0x6003, 0x0001, 0x080c, 0x79df, 0x0005, 0x6007,
++	0x0001, 0x6003, 0x0001, 0x080c, 0x79df, 0x0cc0, 0x6007, 0x0005,
++	0x0cc0, 0x080c, 0xc378, 0x1904, 0xb5ee, 0x080c, 0x2f69, 0x1904,
++	0xb5ee, 0x080c, 0xb652, 0x1904, 0xb2db, 0x6007, 0x0020, 0x6003,
++	0x0001, 0x080c, 0x79df, 0x0005, 0x080c, 0x2f69, 0x1904, 0xb5ee,
++	0x6007, 0x0023, 0x6003, 0x0001, 0x080c, 0x79df, 0x0005, 0x080c,
++	0xc378, 0x1904, 0xb5ee, 0x080c, 0x2f69, 0x1904, 0xb5ee, 0x080c,
++	0xb652, 0x1904, 0xb2db, 0x0016, 0x0026, 0x2011, 0xcc91, 0x2214,
++	0xa286, 0xffff, 0x0190, 0x2c08, 0x080c, 0xac81, 0x01e0, 0x2260,
++	0x2011, 0xcc90, 0x2214, 0x6008, 0xa206, 0x11a8, 0x6018, 0xa190,
++	0x0006, 0x2214, 0xa206, 0x01e8, 0x0070, 0x2011, 0xcc90, 0x2214,
++	0x2c08, 0xa006, 0x080c, 0xc162, 0x11a0, 0x2011, 0xcc91, 0x2214,
++	0xa286, 0xffff, 0x01c0, 0x2160, 0x6007, 0x0026, 0x6013, 0x1700,
++	0x2011, 0xcc89, 0x2214, 0xa296, 0xffff, 0x1180, 0x6007, 0x0025,
++	0x0068, 0x601c, 0xa086, 0x0007, 0x1d70, 0x6004, 0xa086, 0x0024,
++	0x1110, 0x080c, 0x95e3, 0x2160, 0x6007, 0x0025, 0x6003, 0x0001,
++	0x080c, 0x79df, 0x002e, 0x001e, 0x0005, 0x2001, 0x0001, 0x080c,
++	0x527f, 0x0156, 0x0016, 0x0026, 0x0036, 0x20a9, 0x0004, 0x2019,
++	0xc605, 0x2011, 0xcc96, 0x080c, 0xa103, 0x003e, 0x002e, 0x001e,
++	0x015e, 0x0120, 0x6007, 0x0031, 0x0804, 0xb3ea, 0x080c, 0x9df5,
++	0x080c, 0x5f22, 0x11b0, 0x0006, 0x0026, 0x0036, 0x080c, 0x5f3e,
++	0x1158, 0x2001, 0xc8e6, 0x2003, 0x0001, 0x2001, 0xc600, 0x2003,
++	0x0001, 0x080c, 0x5e5a, 0x0010, 0x080c, 0x5ef9, 0x003e, 0x002e,
++	0x000e, 0x0005, 0x080c, 0x2f69, 0x1904, 0xb5ee, 0x080c, 0xb652,
++	0x1904, 0xb2db, 0x6106, 0x080c, 0xb66e, 0x6007, 0x002b, 0x0804,
++	0xb3ea, 0x6007, 0x002c, 0x0804, 0xb3ea, 0x080c, 0xc378, 0x1904,
++	0xb5ee, 0x080c, 0x2f69, 0x1904, 0xb5ee, 0x080c, 0xb652, 0x1904,
++	0xb2db, 0x6106, 0x080c, 0xb672, 0x1120, 0x6007, 0x002e, 0x0804,
++	0xb3ea, 0x6007, 0x002f, 0x0804, 0xb3ea, 0x080c, 0x2f69, 0x1904,
++	0xb5ee, 0x00e6, 0x00d6, 0x00c6, 0x6018, 0xa080, 0x0001, 0x200c,
++	0xa184, 0x00ff, 0xa086, 0x0006, 0x0158, 0xa184, 0xff00, 0x8007,
++	0xa086, 0x0006, 0x0128, 0x00ce, 0x00de, 0x00ee, 0x0804, 0xb3ef,
++	0x2001, 0xc672, 0x2004, 0xd0e4, 0x0904, 0xb544, 0x2071, 0xcc8c,
++	0x7010, 0x6036, 0x7014, 0x603a, 0x7108, 0x720c, 0x2001, 0xc653,
++	0x2004, 0xd0a4, 0x0140, 0x6018, 0x2068, 0x6810, 0xa106, 0x1118,
++	0x6814, 0xa206, 0x01f8, 0x2001, 0xc653, 0x2004, 0xd0ac, 0x1590,
++	0x2069, 0xc600, 0x6874, 0xa206, 0x1568, 0x6870, 0xa106, 0x1550,
++	0x7210, 0x080c, 0xac81, 0x0558, 0x080c, 0xc1fc, 0x0540, 0x622a,
++	0x6007, 0x0036, 0x6003, 0x0001, 0x080c, 0x7999, 0x00ce, 0x00de,
++	0x00ee, 0x0005, 0x7214, 0xa286, 0xffff, 0x0150, 0x080c, 0xac81,
++	0x01b0, 0xa280, 0x0002, 0x2004, 0x7110, 0xa106, 0x1180, 0x0c08,
++	0x7210, 0x2c08, 0xa085, 0x0001, 0x080c, 0xc162, 0x2c10, 0x2160,
++	0x0130, 0x08b8, 0x6007, 0x0037, 0x6013, 0x1500, 0x08d8, 0x6007,
++	0x0037, 0x6013, 0x1700, 0x08b0, 0x6007, 0x0012, 0x0898, 0x080c,
++	0x2f69, 0x1904, 0xb5ee, 0x6018, 0xa080, 0x0001, 0x2004, 0xa084,
++	0xff00, 0x8007, 0xa086, 0x0006, 0x1904, 0xb3ef, 0x00e6, 0x00d6,
++	0x00c6, 0x2001, 0xc672, 0x2004, 0xd0e4, 0x0904, 0xb5b0, 0x2069,
++	0xc600, 0x2071, 0xcc8c, 0x7008, 0x6036, 0x720c, 0x623a, 0xa286,
++	0xffff, 0x1150, 0x7208, 0x00c6, 0x2c08, 0xa085, 0x0001, 0x080c,
++	0xc162, 0x2c10, 0x00ce, 0x0588, 0x080c, 0xac81, 0x0570, 0x00c6,
++	0x0026, 0x2260, 0x080c, 0xa954, 0x002e, 0x00ce, 0x7118, 0xa18c,
++	0xff00, 0x810f, 0xa186, 0x0001, 0x0158, 0xa186, 0x0005, 0x0118,
++	0xa186, 0x0007, 0x1178, 0xa280, 0x0004, 0x2004, 0xa005, 0x0150,
++	0x0056, 0x7510, 0x7614, 0x080c, 0xc213, 0x005e, 0x00ce, 0x00de,
++	0x00ee, 0x0005, 0x6007, 0x003b, 0x602b, 0x0009, 0x6013, 0x2a00,
++	0x6003, 0x0001, 0x080c, 0x7999, 0x0c88, 0x6007, 0x003b, 0x602b,
++	0x0009, 0x6013, 0x1700, 0x6003, 0x0001, 0x080c, 0x7999, 0x0c30,
++	0x6007, 0x003b, 0x602b, 0x000b, 0x6013, 0x0000, 0x0804, 0xb51a,
++	0x00e6, 0x0026, 0x080c, 0x570b, 0x0558, 0x080c, 0x568d, 0x080c,
++	0xc3f3, 0x1520, 0x2071, 0xc600, 0x70d4, 0xc085, 0x70d6, 0x00f6,
++	0x2079, 0x0100, 0x72a0, 0xa284, 0x00ff, 0x7072, 0x78e6, 0xa284,
++	0xff00, 0x7274, 0xa205, 0x7076, 0x78ea, 0x00fe, 0x70df, 0x0000,
++	0x2001, 0xc653, 0x2004, 0xd0a4, 0x0120, 0x2011, 0xc940, 0x2013,
++	0x07d0, 0xd0ac, 0x1128, 0x080c, 0x2c62, 0x0010, 0x080c, 0xc41f,
++	0x002e, 0x00ee, 0x080c, 0x95e3, 0x0804, 0xb3ee, 0x080c, 0x95e3,
++	0x0005, 0x2600, 0x0002, 0xb5fc, 0xb630, 0xb641, 0xb5fc, 0xb5fc,
++	0xb5fe, 0xb617, 0xb5fc, 0xb5fc, 0x080c, 0x1519, 0x080c, 0xc378,
++	0x1d68, 0x080c, 0x2f69, 0x1d50, 0x080c, 0xb652, 0x1138, 0x6007,
++	0x0045, 0x6003, 0x0001, 0x080c, 0x79df, 0x0005, 0x080c, 0x2e46,
++	0x6007, 0x0001, 0x6003, 0x0001, 0x080c, 0x79df, 0x0005, 0x080c,
++	0x2f69, 0x19a0, 0x080c, 0x768f, 0x1160, 0x2e00, 0xa080, 0x0010,
++	0x2004, 0x8007, 0xd084, 0x0110, 0x080c, 0xc428, 0x080c, 0x95e3,
++	0x0005, 0x2009, 0x0046, 0x080c, 0xc44e, 0x080c, 0x95e3, 0x0005,
++	0x080c, 0x2f69, 0x1904, 0xb5ee, 0x2009, 0x0041, 0x080c, 0xc44e,
++	0x6007, 0x0047, 0x6003, 0x0001, 0x080c, 0x79df, 0x080c, 0x7e94,
++	0x0005, 0x080c, 0x2f69, 0x1904, 0xb5ee, 0x2009, 0x0042, 0x080c,
++	0xc44e, 0x6007, 0x0047, 0x6003, 0x0001, 0x080c, 0x79df, 0x080c,
++	0x7e94, 0x0005, 0x00d6, 0x0066, 0x6618, 0x2668, 0x6e04, 0xa6b4,
++	0xff00, 0x8637, 0xa686, 0x0006, 0x0170, 0xa686, 0x0004, 0x0158,
++	0x6e04, 0xa6b4, 0x00ff, 0xa686, 0x0006, 0x0128, 0xa686, 0x0004,
++	0x0110, 0xa085, 0x0001, 0x006e, 0x00de, 0x0005, 0x00d6, 0x0449,
++	0x00de, 0x0005, 0x00d6, 0x0491, 0x11f0, 0x680c, 0xa08c, 0xff00,
++	0x6820, 0xa084, 0x00ff, 0xa115, 0x6212, 0x6824, 0x602a, 0xd1e4,
++	0x0118, 0x2009, 0x0001, 0x0060, 0xd1ec, 0x0168, 0x6920, 0xa18c,
++	0x00ff, 0x6824, 0x080c, 0x29c7, 0x1130, 0x2110, 0x2009, 0x0000,
++	0x080c, 0x2e8b, 0x0018, 0xa085, 0x0001, 0x0008, 0xa006, 0x00de,
++	0x0005, 0x2069, 0xcc8d, 0x6800, 0xa082, 0x0010, 0x1228, 0x6013,
++	0x0000, 0xa085, 0x0001, 0x0008, 0xa006, 0x0005, 0x6013, 0x0000,
++	0x2069, 0xcc8c, 0x6808, 0xa084, 0xff00, 0xa086, 0x0800, 0x1140,
++	0x6800, 0xa084, 0x00ff, 0xa08e, 0x0014, 0x0110, 0xa08e, 0x0010,
++	0x0005, 0x6004, 0xa0b2, 0x0080, 0x1a0c, 0x1519, 0xa1b6, 0x0013,
++	0x1130, 0x2008, 0xa1b2, 0x0040, 0x1a04, 0xb7bb, 0x0092, 0xa1b6,
++	0x0027, 0x0120, 0xa1b6, 0x0014, 0x190c, 0x1519, 0x2001, 0x0007,
++	0x080c, 0x52be, 0x080c, 0x7db1, 0x080c, 0xae54, 0x080c, 0x7e94,
++	0x0005, 0xb719, 0xb71b, 0xb719, 0xb719, 0xb719, 0xb71b, 0xb72d,
++	0xb7b4, 0xb77d, 0xb7b4, 0xb790, 0xb7b4, 0xb72d, 0xb7b4, 0xb7ac,
++	0xb7b4, 0xb7ac, 0xb7b4, 0xb7b4, 0xb719, 0xb719, 0xb719, 0xb719,
++	0xb719, 0xb719, 0xb719, 0xb719, 0xb719, 0xb719, 0xb719, 0xb71b,
++	0xb719, 0xb7b4, 0xb719, 0xb719, 0xb7b4, 0xb719, 0xb7b1, 0xb7b4,
++	0xb719, 0xb719, 0xb719, 0xb719, 0xb7b4, 0xb7b4, 0xb719, 0xb7b4,
++	0xb7b4, 0xb719, 0xb727, 0xb719, 0xb719, 0xb719, 0xb719, 0xb7b0,
++	0xb7b4, 0xb719, 0xb719, 0xb7b4, 0xb7b4, 0xb719, 0xb719, 0xb719,
++	0xb719, 0x080c, 0x1519, 0x080c, 0x7db1, 0x2001, 0xc8fd, 0x2004,
++	0x6016, 0x6003, 0x0002, 0x080c, 0x7e94, 0x0804, 0xb7ba, 0x2001,
++	0x0000, 0x080c, 0x527f, 0x0804, 0xb7b4, 0x00f6, 0x2079, 0xc652,
++	0x7804, 0x00fe, 0xd0ac, 0x1904, 0xb7b4, 0x2001, 0x0000, 0x080c,
++	0x527f, 0x6018, 0xa080, 0x0004, 0x2004, 0xa086, 0x00ff, 0x1140,
++	0x00f6, 0x2079, 0xc600, 0x7898, 0x8000, 0x789a, 0x00fe, 0x00e0,
++	0x00c6, 0x6018, 0x2060, 0x6000, 0xd0f4, 0x1140, 0x6010, 0xa005,
++	0x0128, 0x00ce, 0x080c, 0x40ef, 0x0804, 0xb7b4, 0x00ce, 0x2001,
++	0xc600, 0x2004, 0xa086, 0x0002, 0x1138, 0x00f6, 0x2079, 0xc600,
++	0x7898, 0x8000, 0x789a, 0x00fe, 0x2001, 0x0002, 0x080c, 0x5291,
++	0x080c, 0x7db1, 0x601f, 0x0001, 0x6003, 0x0001, 0x6007, 0x0002,
++	0x080c, 0x79df, 0x080c, 0x7e94, 0x00c6, 0x6118, 0x2160, 0x2009,
++	0x0001, 0x080c, 0x6fb9, 0x00ce, 0x04e8, 0x6618, 0x00d6, 0x2668,
++	0x6e04, 0x00de, 0xa6b4, 0xff00, 0x8637, 0xa686, 0x0006, 0x0560,
++	0xa686, 0x0004, 0x0548, 0x080c, 0x7669, 0x2001, 0x0004, 0x0410,
++	0x2001, 0xc600, 0x2004, 0xa086, 0x0003, 0x1110, 0x080c, 0x40ef,
++	0x2001, 0x0006, 0x04a1, 0x6618, 0x00d6, 0x2668, 0x6e04, 0x00de,
++	0xa6b4, 0xff00, 0x8637, 0xa686, 0x0006, 0x0170, 0x2001, 0x0006,
++	0x0048, 0x2001, 0x0004, 0x0030, 0x2001, 0x0006, 0x0401, 0x0020,
++	0x0018, 0x0010, 0x080c, 0x52be, 0x080c, 0x7db1, 0x080c, 0x95e3,
++	0x080c, 0x7e94, 0x0005, 0x2600, 0x0002, 0xb7c6, 0xb7c6, 0xb7c6,
++	0xb7c6, 0xb7c6, 0xb7c8, 0xb7c6, 0xb7c8, 0xb7c6, 0x080c, 0x1519,
++	0x080c, 0x7db1, 0x080c, 0x95e3, 0x080c, 0x7e94, 0x0005, 0x0016,
++	0x00d6, 0x6118, 0x2168, 0x6900, 0xd184, 0x0140, 0x080c, 0x5291,
++	0x2001, 0x0000, 0x080c, 0x527f, 0x080c, 0x2e6c, 0x00de, 0x001e,
++	0x0005, 0x00d6, 0x6618, 0x2668, 0x6804, 0xa084, 0xff00, 0x8007,
++	0x00de, 0xa0b2, 0x000c, 0x1a0c, 0x1519, 0xa1b6, 0x0015, 0x1110,
++	0x003b, 0x0028, 0xa1b6, 0x0016, 0x190c, 0x1519, 0x006b, 0x0005,
++	0x9cda, 0x9cda, 0x9cda, 0x9cda, 0x9cda, 0x9cda, 0xb851, 0xb810,
++	0x9cda, 0x9cda, 0x9cda, 0x9cda, 0x9cda, 0x9cda, 0x9cda, 0x9cda,
++	0x9cda, 0x9cda, 0xb851, 0xb858, 0x9cda, 0x9cda, 0x9cda, 0x9cda,
++	0x00f6, 0x2079, 0xc652, 0x7804, 0xd0ac, 0x11e0, 0x6018, 0xa07d,
++	0x01c8, 0x7800, 0xd0f4, 0x1118, 0x7810, 0xa005, 0x1198, 0x2001,
++	0x0000, 0x080c, 0x527f, 0x2001, 0x0002, 0x080c, 0x5291, 0x601f,
++	0x0001, 0x6003, 0x0001, 0x6007, 0x0002, 0x080c, 0x79df, 0x080c,
++	0x7e94, 0x00e8, 0x2011, 0xcc83, 0x2204, 0x8211, 0x220c, 0x080c,
++	0x29c7, 0x11a8, 0x00c6, 0x080c, 0x533d, 0x0120, 0x00ce, 0x080c,
++	0x95e3, 0x0068, 0x6010, 0x0006, 0x6014, 0x0006, 0x080c, 0x4f47,
++	0x000e, 0x6016, 0x000e, 0x6012, 0x00ce, 0x080c, 0x95e3, 0x00fe,
++	0x0005, 0x6604, 0xa6b6, 0x001e, 0x1110, 0x080c, 0x95e3, 0x0005,
++	0x080c, 0x9fb6, 0x1138, 0x6003, 0x0001, 0x6007, 0x0001, 0x080c,
++	0x79df, 0x0010, 0x080c, 0x95e3, 0x0005, 0x6004, 0xa08a, 0x0080,
++	0x1a0c, 0x1519, 0x080c, 0x7db1, 0x080c, 0xae54, 0x080c, 0x7e94,
++	0x0005, 0xa182, 0x0040, 0x0002, 0xb887, 0xb887, 0xb887, 0xb887,
++	0xb889, 0xb887, 0xb887, 0xb887, 0xb887, 0xb887, 0xb887, 0xb887,
++	0xb887, 0xb887, 0xb887, 0xb887, 0xb887, 0xb887, 0xb887, 0x080c,
++	0x1519, 0x00d6, 0x00e6, 0x00f6, 0x0156, 0x0046, 0x0026, 0x6218,
++	0xa280, 0x002f, 0x2004, 0xa005, 0x0120, 0x2021, 0x0000, 0x080c,
++	0xc3c4, 0x6106, 0x2071, 0xcc80, 0x7444, 0xa4a4, 0xff00, 0x0904,
++	0xb8ed, 0xa486, 0x2000, 0x1130, 0x2009, 0x0001, 0x2011, 0x0200,
++	0x080c, 0x712e, 0x080c, 0x1602, 0x090c, 0x1519, 0x6003, 0x0007,
++	0x2d00, 0x6837, 0x010d, 0x6803, 0x0000, 0x683b, 0x0000, 0x6c5a,
++	0x2c00, 0x685e, 0x6008, 0x68b2, 0x6018, 0x2078, 0x78a0, 0x8007,
++	0x7130, 0x694a, 0x0016, 0xa084, 0xff00, 0x6846, 0x684f, 0x0000,
++	0x6853, 0x0000, 0x6857, 0x0036, 0x080c, 0x580a, 0x001e, 0xa486,
++	0x2000, 0x1130, 0x2019, 0x0017, 0x080c, 0xc10d, 0x0804, 0xb94a,
++	0xa486, 0x0400, 0x1130, 0x2019, 0x0002, 0x080c, 0xc0bf, 0x0804,
++	0xb94a, 0xa486, 0x0200, 0x1110, 0x080c, 0xc0a4, 0xa486, 0x1000,
++	0x1110, 0x080c, 0xc0f2, 0x0804, 0xb94a, 0x2069, 0xc9bc, 0x6a00,
++	0xd284, 0x0904, 0xb9b1, 0xa284, 0x0300, 0x1904, 0xb9aa, 0x6804,
++	0xa005, 0x0904, 0xb992, 0x2d78, 0x6003, 0x0007, 0x080c, 0x15e5,
++	0x0904, 0xb951, 0x7800, 0xd08c, 0x1118, 0x7804, 0x8001, 0x7806,
++	0x6013, 0x0000, 0x6803, 0x0000, 0x6837, 0x0116, 0x683b, 0x0000,
++	0x6008, 0x68b2, 0x2c00, 0x684a, 0x6018, 0x2078, 0x78a0, 0x8007,
++	0x7130, 0x6986, 0x6846, 0x7928, 0x698a, 0x792c, 0x698e, 0x7930,
++	0x6992, 0x7934, 0x6996, 0x6853, 0x003d, 0x7244, 0xa294, 0x0003,
++	0xa286, 0x0002, 0x1118, 0x684f, 0x0040, 0x0040, 0xa286, 0x0001,
++	0x1118, 0x684f, 0x0080, 0x0010, 0x684f, 0x0000, 0x20a9, 0x000a,
++	0x2001, 0xcc90, 0xad90, 0x0015, 0x200c, 0x810f, 0x2112, 0x8000,
++	0x8210, 0x1f04, 0xb93c, 0x200c, 0x6982, 0x8000, 0x200c, 0x697e,
++	0x080c, 0x580a, 0x002e, 0x004e, 0x015e, 0x00fe, 0x00ee, 0x00de,
++	0x0005, 0x2001, 0xc60e, 0x2004, 0xd084, 0x0120, 0x080c, 0x1602,
++	0x1904, 0xb902, 0x6013, 0x0100, 0x6003, 0x0001, 0x6007, 0x0041,
++	0x080c, 0x7999, 0x080c, 0x7e94, 0x0c28, 0x2069, 0xcc92, 0x2d04,
++	0xa084, 0xff00, 0xa086, 0x1200, 0x11a8, 0x2069, 0xcc80, 0x686c,
++	0xa084, 0x00ff, 0x0016, 0x6110, 0xa18c, 0x0700, 0xa10d, 0x6112,
++	0x001e, 0x6003, 0x0001, 0x6007, 0x0043, 0x080c, 0x7999, 0x080c,
++	0x7e94, 0x0840, 0x6868, 0x602a, 0x686c, 0x602e, 0x6013, 0x0200,
++	0x6003, 0x0001, 0x6007, 0x0041, 0x080c, 0x7999, 0x080c, 0x7e94,
++	0x0804, 0xb94a, 0x2001, 0xc60d, 0x2004, 0xd0ec, 0x0120, 0x2011,
++	0x8049, 0x080c, 0x407d, 0x6013, 0x0300, 0x0010, 0x6013, 0x0100,
++	0x6003, 0x0001, 0x6007, 0x0041, 0x080c, 0x7999, 0x080c, 0x7e94,
++	0x0804, 0xb94a, 0x6013, 0x0500, 0x0c98, 0x6013, 0x0600, 0x0804,
++	0xb965, 0x6013, 0x0200, 0x0804, 0xb965, 0xa186, 0x0013, 0x1170,
++	0x6004, 0xa08a, 0x0040, 0x0a0c, 0x1519, 0xa08a, 0x0053, 0x1a0c,
++	0x1519, 0xa082, 0x0040, 0x2008, 0x0804, 0xba3f, 0xa186, 0x0051,
++	0x0138, 0xa186, 0x0047, 0x11d8, 0x6004, 0xa086, 0x0041, 0x0518,
++	0x2001, 0x0109, 0x2004, 0xd084, 0x01f0, 0x0126, 0x2091, 0x2800,
++	0x0006, 0x0016, 0x0026, 0x080c, 0x7873, 0x002e, 0x001e, 0x000e,
++	0x012e, 0x6000, 0xa086, 0x0002, 0x1170, 0x0804, 0xba82, 0xa186,
++	0x0027, 0x0120, 0xa186, 0x0014, 0x190c, 0x1519, 0x6004, 0xa082,
++	0x0040, 0x2008, 0x001a, 0x080c, 0x962a, 0x0005, 0xba09, 0xba0b,
++	0xba0b, 0xba2f, 0xba09, 0xba09, 0xba09, 0xba09, 0xba09, 0xba09,
++	0xba09, 0xba09, 0xba09, 0xba09, 0xba09, 0xba09, 0xba09, 0xba09,
++	0xba09, 0x080c, 0x1519, 0x080c, 0x7db1, 0x080c, 0x7e94, 0x0036,
++	0x00d6, 0x6010, 0xa06d, 0x01c0, 0xad84, 0xf000, 0x01a8, 0x6003,
++	0x0002, 0x6018, 0x2004, 0xd0bc, 0x1178, 0x2019, 0x0004, 0x080c,
++	0xc141, 0x6013, 0x0000, 0x6014, 0xa005, 0x1120, 0x2001, 0xc8fe,
++	0x2004, 0x6016, 0x6003, 0x0007, 0x00de, 0x003e, 0x0005, 0x00d6,
++	0x080c, 0x7db1, 0x080c, 0x7e94, 0x080c, 0xac91, 0x0120, 0x6010,
++	0x2068, 0x080c, 0x1619, 0x080c, 0xae54, 0x00de, 0x0005, 0x0002,
++	0xba53, 0xba70, 0xba5c, 0xba7c, 0xba53, 0xba53, 0xba53, 0xba53,
++	0xba53, 0xba53, 0xba53, 0xba53, 0xba53, 0xba53, 0xba53, 0xba53,
++	0xba53, 0xba53, 0xba53, 0x080c, 0x1519, 0x6010, 0xa088, 0x0013,
++	0x2104, 0xa085, 0x0400, 0x200a, 0x080c, 0x7db1, 0x6010, 0xa080,
++	0x0013, 0x2004, 0xd0b4, 0x0138, 0x6003, 0x0007, 0x2009, 0x0043,
++	0x080c, 0x9613, 0x0010, 0x6003, 0x0002, 0x080c, 0x7e94, 0x0005,
++	0x080c, 0x7db1, 0x080c, 0xc37f, 0x1120, 0x080c, 0x7103, 0x080c,
++	0x95e3, 0x080c, 0x7e94, 0x0005, 0x080c, 0x7db1, 0x2009, 0x0041,
++	0x0804, 0xbbcb, 0xa182, 0x0040, 0x0002, 0xba98, 0xba9a, 0xba98,
++	0xba98, 0xba98, 0xba98, 0xba98, 0xba9b, 0xba98, 0xba98, 0xba98,
++	0xba98, 0xba98, 0xba98, 0xba98, 0xba98, 0xba98, 0xbaa6, 0xba98,
++	0x080c, 0x1519, 0x0005, 0x6003, 0x0004, 0x6110, 0x20e1, 0x0005,
++	0x3d18, 0x3e20, 0x2c10, 0x080c, 0x1870, 0x0005, 0x00d6, 0x080c,
++	0x7103, 0x00de, 0x080c, 0xc3e2, 0x080c, 0x95e3, 0x0005, 0xa182,
++	0x0040, 0x0002, 0xbac5, 0xbac5, 0xbac5, 0xbac5, 0xbac5, 0xbac5,
++	0xbac5, 0xbac7, 0xbac5, 0xbaca, 0xbb03, 0xbac5, 0xbac5, 0xbac5,
++	0xbac5, 0xbb03, 0xbac5, 0xbac5, 0xbac5, 0x080c, 0x1519, 0x080c,
++	0x962a, 0x0005, 0x2001, 0xc672, 0x2004, 0xd0e4, 0x0158, 0x2001,
++	0x0100, 0x2004, 0xa082, 0x0005, 0x0228, 0x2001, 0x011f, 0x2004,
++	0x6036, 0x0010, 0x6037, 0x0000, 0x080c, 0x7e47, 0x080c, 0x7f6e,
++	0x6010, 0x00d6, 0x2068, 0x684c, 0xd0fc, 0x0150, 0xa08c, 0x0003,
++	0xa18e, 0x0002, 0x0168, 0x2009, 0x0041, 0x00de, 0x0804, 0xbbcb,
++	0x6003, 0x0007, 0x6017, 0x0000, 0x080c, 0x7103, 0x00de, 0x0005,
++	0x080c, 0xc37f, 0x0110, 0x00de, 0x0005, 0x080c, 0x7103, 0x080c,
++	0x95e3, 0x00de, 0x0ca0, 0x0036, 0x080c, 0x7e47, 0x080c, 0x7f6e,
++	0x6010, 0x00d6, 0x2068, 0x6018, 0x2004, 0xd0bc, 0x0188, 0x684c,
++	0xa084, 0x0003, 0xa086, 0x0002, 0x0140, 0x687c, 0x632c, 0xa31a,
++	0x632e, 0x6880, 0x6328, 0xa31b, 0x632a, 0x6003, 0x0002, 0x0080,
++	0x2019, 0x0004, 0x080c, 0xc141, 0x6014, 0xa005, 0x1128, 0x2001,
++	0xc8fe, 0x2004, 0x8003, 0x6016, 0x6013, 0x0000, 0x6003, 0x0007,
++	0x00de, 0x003e, 0x0005, 0xa186, 0x0013, 0x1150, 0x6004, 0xa086,
++	0x0042, 0x190c, 0x1519, 0x080c, 0x7db1, 0x080c, 0x7e94, 0x0005,
++	0xa186, 0x0027, 0x0118, 0xa186, 0x0014, 0x1180, 0x6004, 0xa086,
++	0x0042, 0x190c, 0x1519, 0x2001, 0x0007, 0x080c, 0x52be, 0x080c,
++	0x7db1, 0x080c, 0xae54, 0x080c, 0x7e94, 0x0005, 0xa182, 0x0040,
++	0x0002, 0xbb6c, 0xbb6c, 0xbb6c, 0xbb6c, 0xbb6c, 0xbb6c, 0xbb6c,
++	0xbb6e, 0xbb7a, 0xbb6c, 0xbb6c, 0xbb6c, 0xbb6c, 0xbb6c, 0xbb6c,
++	0xbb6c, 0xbb6c, 0xbb6c, 0xbb6c, 0x080c, 0x1519, 0x0036, 0x0046,
++	0x20e1, 0x0005, 0x3d18, 0x3e20, 0x2c10, 0x080c, 0x1870, 0x004e,
++	0x003e, 0x0005, 0x6010, 0x00d6, 0x2068, 0x6810, 0x6a14, 0x0006,
++	0x0046, 0x0056, 0x6c7c, 0xa422, 0x6d80, 0x2200, 0xa52b, 0x602c,
++	0xa420, 0x642e, 0x6028, 0xa529, 0x652a, 0x005e, 0x004e, 0x000e,
++	0xa20d, 0x1178, 0x684c, 0xd0fc, 0x0120, 0x2009, 0x0041, 0x00de,
++	0x0490, 0x6003, 0x0007, 0x6017, 0x0000, 0x080c, 0x7103, 0x00de,
++	0x0005, 0x0006, 0x00f6, 0x2c78, 0x080c, 0x56c3, 0x00fe, 0x000e,
++	0x0120, 0x6003, 0x0002, 0x00de, 0x0005, 0x2009, 0xc60d, 0x210c,
++	0xd19c, 0x0118, 0x6003, 0x0007, 0x0010, 0x6003, 0x0006, 0x0021,
++	0x080c, 0x7105, 0x00de, 0x0005, 0xd2fc, 0x0140, 0x8002, 0x8000,
++	0x8212, 0xa291, 0x0000, 0x2009, 0x0009, 0x0010, 0x2009, 0x0015,
++	0x6a6a, 0x6866, 0x0005, 0xa182, 0x0040, 0x0208, 0x0062, 0xa186,
++	0x0013, 0x0120, 0xa186, 0x0014, 0x190c, 0x1519, 0x6020, 0xd0dc,
++	0x090c, 0x1519, 0x0005, 0xbbee, 0xbbf5, 0xbc01, 0xbc0d, 0xbbee,
++	0xbbee, 0xbbee, 0xbc1c, 0xbbee, 0xbbf0, 0xbbf0, 0xbbee, 0xbbee,
++	0xbbee, 0xbbee, 0xbbf0, 0xbbee, 0xbbf0, 0xbbee, 0x080c, 0x1519,
++	0x6020, 0xd0dc, 0x090c, 0x1519, 0x0005, 0x6003, 0x0001, 0x6106,
++	0x080c, 0x7999, 0x0126, 0x2091, 0x8000, 0x080c, 0x7e94, 0x012e,
++	0x0005, 0x6003, 0x0001, 0x6106, 0x080c, 0x7999, 0x0126, 0x2091,
++	0x8000, 0x080c, 0x7e94, 0x012e, 0x0005, 0x6003, 0x0003, 0x6106,
++	0x2c10, 0x080c, 0x2068, 0x0126, 0x2091, 0x8000, 0x080c, 0x79fc,
++	0x080c, 0x7f6e, 0x012e, 0x0005, 0xa016, 0x080c, 0x1870, 0x0005,
++	0x0126, 0x2091, 0x8000, 0x0036, 0x00d6, 0xa182, 0x0040, 0x0023,
++	0x00de, 0x003e, 0x012e, 0x0005, 0xbc3c, 0xbc3e, 0xbc50, 0xbc6b,
++	0xbc3c, 0xbc3c, 0xbc3c, 0xbc80, 0xbc3c, 0xbc3c, 0xbc3c, 0xbc3c,
++	0xbc3c, 0xbc3c, 0xbc3c, 0xbc3c, 0x080c, 0x1519, 0x6010, 0x2068,
++	0x684c, 0xd0fc, 0x01f8, 0xa09c, 0x0003, 0xa39e, 0x0003, 0x01d0,
++	0x6003, 0x0001, 0x6106, 0x080c, 0x7999, 0x080c, 0x7e94, 0x0498,
++	0x6010, 0x2068, 0x684c, 0xd0fc, 0x0168, 0xa09c, 0x0003, 0xa39e,
++	0x0003, 0x0140, 0x6003, 0x0001, 0x6106, 0x080c, 0x7999, 0x080c,
++	0x7e94, 0x0408, 0x6013, 0x0000, 0x6017, 0x0000, 0x2019, 0x0004,
++	0x080c, 0xc141, 0x00c0, 0x6010, 0x2068, 0x684c, 0xd0fc, 0x0d90,
++	0xa09c, 0x0003, 0xa39e, 0x0003, 0x0d68, 0x6003, 0x0003, 0x6106,
++	0x2c10, 0x080c, 0x2068, 0x080c, 0x79fc, 0x080c, 0x7f6e, 0x0018,
++	0xa016, 0x080c, 0x1870, 0x0005, 0x080c, 0x7db1, 0x6110, 0x81ff,
++	0x0158, 0x00d6, 0x2168, 0x080c, 0xc4d7, 0x0036, 0x2019, 0x0029,
++	0x080c, 0xc141, 0x003e, 0x00de, 0x080c, 0xae54, 0x080c, 0x7e94,
++	0x0005, 0x080c, 0x7e47, 0x6110, 0x81ff, 0x0158, 0x00d6, 0x2168,
++	0x080c, 0xc4d7, 0x0036, 0x2019, 0x0029, 0x080c, 0xc141, 0x003e,
++	0x00de, 0x080c, 0xae54, 0x080c, 0x7f6e, 0x0005, 0xa182, 0x0085,
++	0x0002, 0xbcba, 0xbcb8, 0xbcb8, 0xbcc6, 0xbcb8, 0xbcb8, 0xbcb8,
++	0x080c, 0x1519, 0x6003, 0x000b, 0x6106, 0x080c, 0x7999, 0x0126,
++	0x2091, 0x8000, 0x080c, 0x7e94, 0x012e, 0x0005, 0x0026, 0x00e6,
++	0x080c, 0xc378, 0x0118, 0x080c, 0x95e3, 0x00d8, 0x2071, 0xcc80,
++	0x7224, 0x6212, 0x7220, 0x080c, 0xbfef, 0x0118, 0x6007, 0x0086,
++	0x0040, 0x6007, 0x0087, 0x7224, 0xa296, 0xffff, 0x1110, 0x6007,
++	0x0086, 0x6003, 0x0001, 0x080c, 0x7999, 0x080c, 0x7e94, 0x080c,
++	0x7f6e, 0x00ee, 0x002e, 0x0005, 0xa186, 0x0013, 0x1160, 0x6004,
++	0xa08a, 0x0085, 0x0a0c, 0x1519, 0xa08a, 0x008c, 0x1a0c, 0x1519,
++	0xa082, 0x0085, 0x00a2, 0xa186, 0x0027, 0x0130, 0xa186, 0x0014,
++	0x0118, 0x080c, 0x962a, 0x0050, 0x2001, 0x0007, 0x080c, 0x52be,
++	0x080c, 0x7db1, 0x080c, 0xae54, 0x080c, 0x7e94, 0x0005, 0xbd16,
++	0xbd18, 0xbd18, 0xbd16, 0xbd16, 0xbd16, 0xbd16, 0x080c, 0x1519,
++	0x080c, 0x7db1, 0x080c, 0xae54, 0x080c, 0x7e94, 0x0005, 0xa182,
++	0x0085, 0x0a0c, 0x1519, 0xa182, 0x008c, 0x1a0c, 0x1519, 0xa182,
++	0x0085, 0x0002, 0xbd31, 0xbd31, 0xbd31, 0xbd33, 0xbd31, 0xbd31,
++	0xbd31, 0x080c, 0x1519, 0x0005, 0xa186, 0x0013, 0x0148, 0xa186,
++	0x0014, 0x0130, 0xa186, 0x0027, 0x0118, 0x080c, 0x962a, 0x0030,
++	0x080c, 0x7db1, 0x080c, 0xae54, 0x080c, 0x7e94, 0x0005, 0x0036,
++	0x080c, 0xc3e2, 0x603f, 0x0000, 0x2019, 0x000b, 0x0031, 0x601f,
++	0x0006, 0x6003, 0x0007, 0x003e, 0x0005, 0x0126, 0x0036, 0x2091,
++	0x8000, 0x0086, 0x2c40, 0x0096, 0x2049, 0x0000, 0x080c, 0x8fc9,
++	0x009e, 0x008e, 0x1578, 0x0076, 0x2c38, 0x080c, 0x906f, 0x007e,
++	0x1548, 0x6000, 0xa086, 0x0000, 0x0528, 0x601c, 0xa086, 0x0007,
++	0x0508, 0x00d6, 0x6000, 0xa086, 0x0004, 0x1150, 0x080c, 0xc3e2,
++	0x601f, 0x0007, 0x2001, 0xc8fd, 0x2004, 0x6016, 0x080c, 0x1953,
++	0x6010, 0x2068, 0x080c, 0xac91, 0x0110, 0x080c, 0xc141, 0x00de,
++	0x6013, 0x0000, 0x080c, 0xc3e2, 0x601f, 0x0007, 0x2001, 0xc8fd,
++	0x2004, 0x6016, 0x003e, 0x012e, 0x0005, 0x00f6, 0x00c6, 0x0036,
++	0x0156, 0x2079, 0xcc80, 0x7938, 0x783c, 0x080c, 0x29c7, 0x15b0,
++	0x0016, 0x00c6, 0x080c, 0x533d, 0x1578, 0x001e, 0x002e, 0x0026,
++	0x0016, 0x2019, 0x0029, 0x080c, 0x9132, 0x080c, 0x7b16, 0x0076,
++	0x2039, 0x0000, 0x080c, 0x7a0e, 0x007e, 0x001e, 0x0076, 0x2039,
++	0x0000, 0x080c, 0xbef7, 0x007e, 0x080c, 0x553e, 0x0026, 0x6204,
++	0xa294, 0xff00, 0x8217, 0xa286, 0x0006, 0x0118, 0xa286, 0x0004,
++	0x1118, 0x62a0, 0x080c, 0x2eff, 0x002e, 0x001e, 0x080c, 0x4f47,
++	0x6612, 0x6516, 0xa006, 0x0010, 0x00ce, 0x001e, 0x015e, 0x003e,
++	0x00ce, 0x00fe, 0x0005, 0x00c6, 0x00d6, 0x00e6, 0x0016, 0x2009,
++	0xc621, 0x2104, 0xa086, 0x0074, 0x1904, 0xbe30, 0x2069, 0xcc8e,
++	0x690c, 0xa182, 0x0100, 0x06c0, 0x6908, 0xa184, 0x8000, 0x05e8,
++	0x2001, 0xc8e5, 0x2004, 0xa005, 0x1160, 0x6018, 0x2070, 0x7010,
++	0xa084, 0x00ff, 0x0118, 0x7000, 0xd0f4, 0x0118, 0xa184, 0x0800,
++	0x0560, 0x6910, 0xa18a, 0x0001, 0x0610, 0x6914, 0x2069, 0xccae,
++	0x6904, 0x81ff, 0x1198, 0x690c, 0xa182, 0x0100, 0x02a8, 0x6908,
++	0x81ff, 0x1178, 0x6910, 0xa18a, 0x0001, 0x0288, 0x6918, 0xa18a,
++	0x0001, 0x0298, 0x00d0, 0x6013, 0x0100, 0x00a0, 0x6013, 0x0300,
++	0x0088, 0x6013, 0x0500, 0x0070, 0x6013, 0x0700, 0x0058, 0x6013,
++	0x0900, 0x0040, 0x6013, 0x0b00, 0x0028, 0x6013, 0x0f00, 0x0010,
++	0x6013, 0x2d00, 0xa085, 0x0001, 0x0008, 0xa006, 0x001e, 0x00ee,
++	0x00de, 0x00ce, 0x0005, 0x00c6, 0x00d6, 0x0026, 0x0036, 0x0156,
++	0x6218, 0x2268, 0x6b04, 0xa394, 0x00ff, 0xa286, 0x0006, 0x0190,
++	0xa286, 0x0004, 0x0178, 0xa394, 0xff00, 0x8217, 0xa286, 0x0006,
++	0x0148, 0xa286, 0x0004, 0x0130, 0x00c6, 0x2d60, 0x080c, 0x534c,
++	0x00ce, 0x04c0, 0x2011, 0xcc96, 0xad98, 0x000a, 0x20a9, 0x0004,
++	0x080c, 0xa103, 0x1580, 0x2011, 0xcc9a, 0xad98, 0x0006, 0x20a9,
++	0x0004, 0x080c, 0xa103, 0x1538, 0x0046, 0x0016, 0x6aa0, 0xa294,
++	0x00ff, 0x8227, 0xa006, 0x2009, 0xc653, 0x210c, 0xd1a4, 0x0138,
++	0x2009, 0x0029, 0x080c, 0xc190, 0x6800, 0xc0e5, 0x6802, 0x2019,
++	0x0029, 0x080c, 0x7b16, 0x0076, 0x2039, 0x0000, 0x080c, 0x7a0e,
++	0x2c08, 0x080c, 0xbef7, 0x007e, 0x2001, 0x0007, 0x080c, 0x52be,
++	0x001e, 0x004e, 0xa006, 0x015e, 0x003e, 0x002e, 0x00de, 0x00ce,
++	0x0005, 0x00d6, 0x2069, 0xcc8e, 0x6800, 0xa086, 0x0800, 0x0118,
++	0x6013, 0x0000, 0x0008, 0xa006, 0x00de, 0x0005, 0x00c6, 0x00f6,
++	0x0016, 0x0026, 0x0036, 0x0156, 0x2079, 0xcc8c, 0x7930, 0x7834,
++	0x080c, 0x29c7, 0x11a0, 0x080c, 0x533d, 0x1188, 0x2011, 0xcc90,
++	0xac98, 0x000a, 0x20a9, 0x0004, 0x080c, 0xa103, 0x1140, 0x2011,
++	0xcc94, 0xac98, 0x0006, 0x20a9, 0x0004, 0x080c, 0xa103, 0x015e,
++	0x003e, 0x002e, 0x001e, 0x00fe, 0x00ce, 0x0005, 0x00c6, 0x0006,
++	0x0016, 0x0026, 0x0036, 0x0156, 0x2011, 0xcc83, 0x2204, 0x8211,
++	0x220c, 0x080c, 0x29c7, 0x11a0, 0x080c, 0x533d, 0x1188, 0x2011,
++	0xcc96, 0xac98, 0x000a, 0x20a9, 0x0004, 0x080c, 0xa103, 0x1140,
++	0x2011, 0xcc9a, 0xac98, 0x0006, 0x20a9, 0x0004, 0x080c, 0xa103,
++	0x015e, 0x003e, 0x002e, 0x001e, 0x000e, 0x00ce, 0x0005, 0x00e6,
++	0x00c6, 0x0086, 0x0076, 0x0066, 0x0056, 0x0046, 0x0026, 0x0126,
++	0x2091, 0x8000, 0x2740, 0x2029, 0xc930, 0x252c, 0x2021, 0xc936,
++	0x2424, 0x2061, 0xce00, 0x2071, 0xc600, 0x7648, 0x7068, 0x81ff,
++	0x0150, 0x0006, 0xa186, 0xca3c, 0x000e, 0x0128, 0x8001, 0xa602,
++	0x1a04, 0xbf78, 0x0018, 0xa606, 0x0904, 0xbf78, 0x2100, 0xac06,
++	0x0904, 0xbf6f, 0x080c, 0xc1b8, 0x0904, 0xbf6f, 0x671c, 0xa786,
++	0x0001, 0x0904, 0xbfc1, 0xa786, 0x0004, 0x0904, 0xbfc1, 0xa786,
++	0x0007, 0x05e8, 0x2500, 0xac06, 0x05d0, 0x2400, 0xac06, 0x05b8,
++	0x080c, 0xc1c8, 0x15a0, 0x88ff, 0x0118, 0x6050, 0xa906, 0x1578,
++	0x00d6, 0x6000, 0xa086, 0x0004, 0x1120, 0x0016, 0x080c, 0x1953,
++	0x001e, 0xa786, 0x0008, 0x1148, 0x080c, 0xae8f, 0x1130, 0x080c,
++	0x9c09, 0x00de, 0x080c, 0xae54, 0x00d0, 0x6010, 0x2068, 0x080c,
++	0xac91, 0x0190, 0xa786, 0x0003, 0x1528, 0x6837, 0x0103, 0x6b4a,
++	0x6847, 0x0000, 0x080c, 0xc4d7, 0x0016, 0x080c, 0xaf03, 0x080c,
++	0x580a, 0x001e, 0x080c, 0xae48, 0x00de, 0x080c, 0xae54, 0xace0,
++	0x0018, 0x2001, 0xc617, 0x2004, 0xac02, 0x1210, 0x0804, 0xbf0b,
++	0x012e, 0x002e, 0x004e, 0x005e, 0x006e, 0x007e, 0x008e, 0x00ce,
++	0x00ee, 0x0005, 0xa786, 0x0006, 0x1150, 0xa386, 0x0005, 0x0128,
++	0x080c, 0xc4d7, 0x080c, 0xc141, 0x08f8, 0x00de, 0x0c00, 0xa786,
++	0x0009, 0x1548, 0x6000, 0xa086, 0x0004, 0x1128, 0x00c6, 0x080c,
++	0x761a, 0x00ce, 0x00e8, 0x6000, 0xa086, 0x0003, 0x11c8, 0x080c,
++	0x7e47, 0x00e6, 0x00d6, 0x6110, 0x2168, 0x080c, 0xac91, 0x0140,
++	0x6018, 0x2070, 0x70b3, 0x0000, 0x70b7, 0x0000, 0x080c, 0x580a,
++	0x00de, 0x00ee, 0x00c6, 0x080c, 0x95e3, 0x00ce, 0x080c, 0x7f6e,
++	0x00de, 0x0804, 0xbf6f, 0xa786, 0x000a, 0x0904, 0xbf5f, 0x0804,
++	0xbf5d, 0x080c, 0xc1c8, 0x1904, 0xbf6f, 0x81ff, 0x0904, 0xbf6f,
++	0xa180, 0x0001, 0x2004, 0xa086, 0x0018, 0x0138, 0xa180, 0x0001,
++	0x2004, 0xa086, 0x002d, 0x1904, 0xbf6f, 0x6000, 0xa086, 0x0002,
++	0x1904, 0xbf6f, 0x080c, 0xae7e, 0x0138, 0x080c, 0xae8f, 0x1904,
++	0xbf6f, 0x080c, 0x9c09, 0x0038, 0x080c, 0x2e6c, 0x080c, 0xae8f,
++	0x1110, 0x080c, 0x9c09, 0x080c, 0xae54, 0x0804, 0xbf6f, 0x00c6,
++	0x00e6, 0x0016, 0x2c08, 0x2170, 0xa006, 0x080c, 0xc162, 0x001e,
++	0x0120, 0x601c, 0xa084, 0x000f, 0x001b, 0x00ee, 0x00ce, 0x0005,
++	0xc008, 0xc008, 0xc008, 0xc008, 0xc008, 0xc008, 0xc00a, 0xc008,
++	0xa006, 0x0005, 0x0046, 0x0016, 0x7018, 0xa080, 0x0028, 0x2024,
++	0xa4a4, 0x00ff, 0x8427, 0x2c00, 0x2009, 0x0020, 0x080c, 0xc190,
++	0x001e, 0x004e, 0x0036, 0x2019, 0x0002, 0x080c, 0xbd55, 0x003e,
++	0xa085, 0x0001, 0x0005, 0x2001, 0x0001, 0x080c, 0x527f, 0x0156,
++	0x0016, 0x0026, 0x0036, 0x20a9, 0x0004, 0x2019, 0xc605, 0x2011,
++	0xcc96, 0x080c, 0xa103, 0x003e, 0x002e, 0x001e, 0x015e, 0xa005,
++	0x0005, 0x00f6, 0x00e6, 0x00c6, 0x0086, 0x0076, 0x0066, 0x0026,
++	0x0126, 0x2091, 0x8000, 0x2740, 0x2061, 0xce00, 0x2079, 0x0001,
++	0x8fff, 0x0904, 0xc097, 0x2071, 0xc600, 0x7648, 0x7068, 0x8001,
++	0xa602, 0x1a04, 0xc097, 0x88ff, 0x0128, 0x2800, 0xac06, 0x15b0,
++	0x2079, 0x0000, 0x080c, 0xc1b8, 0x0588, 0x2400, 0xac06, 0x0570,
++	0x671c, 0xa786, 0x0006, 0x1550, 0xa786, 0x0007, 0x0538, 0x88ff,
++	0x1140, 0x6018, 0xa206, 0x1510, 0x85ff, 0x0118, 0x6050, 0xa106,
++	0x11e8, 0x00d6, 0x6000, 0xa086, 0x0004, 0x1150, 0x080c, 0xc3e2,
++	0x601f, 0x0007, 0x2001, 0xc8fd, 0x2004, 0x6016, 0x080c, 0x1953,
++	0x6010, 0x2068, 0x080c, 0xac91, 0x0120, 0x0046, 0x080c, 0xc141,
++	0x004e, 0x00de, 0x080c, 0xae54, 0x88ff, 0x1198, 0xace0, 0x0018,
++	0x2001, 0xc617, 0x2004, 0xac02, 0x1210, 0x0804, 0xc048, 0xa006,
++	0x012e, 0x002e, 0x006e, 0x007e, 0x008e, 0x00ce, 0x00ee, 0x00fe,
++	0x0005, 0xa8c5, 0x0001, 0x0ca0, 0x0076, 0x0056, 0x0086, 0x2041,
++	0x0000, 0x2029, 0x0001, 0x2c20, 0x2019, 0x0002, 0x6218, 0x0096,
++	0x2049, 0x0000, 0x080c, 0x8fc9, 0x009e, 0x008e, 0x2039, 0x0000,
++	0x080c, 0x906f, 0x080c, 0xc039, 0x005e, 0x007e, 0x0005, 0x0026,
++	0x0046, 0x0056, 0x0076, 0x00c6, 0x0156, 0x2c20, 0x2128, 0x20a9,
++	0x007f, 0x2009, 0x0000, 0x0016, 0x0036, 0x080c, 0x533d, 0x11b0,
++	0x2c10, 0x0056, 0x0086, 0x2041, 0x0000, 0x2508, 0x2029, 0x0001,
++	0x0096, 0x2049, 0x0000, 0x080c, 0x8fc9, 0x009e, 0x008e, 0x2039,
++	0x0000, 0x080c, 0x906f, 0x080c, 0xc039, 0x005e, 0x003e, 0x001e,
++	0x8108, 0x1f04, 0xc0cb, 0x015e, 0x00ce, 0x007e, 0x005e, 0x004e,
++	0x002e, 0x0005, 0x0076, 0x0056, 0x6218, 0x0086, 0x2041, 0x0000,
++	0x2029, 0x0001, 0x2019, 0x0048, 0x0096, 0x2049, 0x0000, 0x080c,
++	0x8fc9, 0x009e, 0x008e, 0x2039, 0x0000, 0x080c, 0x906f, 0x2c20,
++	0x080c, 0xc039, 0x005e, 0x007e, 0x0005, 0x0026, 0x0046, 0x0056,
++	0x0076, 0x00c6, 0x0156, 0x2c20, 0x20a9, 0x007f, 0x2009, 0x0000,
++	0x0016, 0x0036, 0x080c, 0x533d, 0x11c0, 0x2c10, 0x0086, 0x2041,
++	0x0000, 0x2828, 0x0046, 0x2021, 0x0001, 0x080c, 0xc3c4, 0x004e,
++	0x0096, 0x2049, 0x0000, 0x080c, 0x8fc9, 0x009e, 0x008e, 0x2039,
++	0x0000, 0x080c, 0x906f, 0x080c, 0xc039, 0x003e, 0x001e, 0x8108,
++	0x1f04, 0xc118, 0x015e, 0x00ce, 0x007e, 0x005e, 0x004e, 0x002e,
++	0x0005, 0x0016, 0x00f6, 0x3800, 0xd08c, 0x0130, 0xad82, 0x1000,
++	0x02b0, 0xad82, 0xc600, 0x0230, 0xad82, 0xfe00, 0x0280, 0xad82,
++	0xffff, 0x1268, 0x6800, 0xa07d, 0x0138, 0x6803, 0x0000, 0x6b52,
++	0x080c, 0x580a, 0x2f68, 0x0cb0, 0x6b52, 0x080c, 0x580a, 0x00fe,
++	0x001e, 0x0005, 0x00e6, 0x0046, 0x0036, 0x2061, 0xce00, 0xa005,
++	0x1138, 0x2071, 0xc600, 0x7448, 0x7068, 0x8001, 0xa402, 0x12d8,
++	0x2100, 0xac06, 0x0168, 0x6000, 0xa086, 0x0000, 0x0148, 0x6008,
++	0xa206, 0x1130, 0x6018, 0xa1a0, 0x0006, 0x2424, 0xa406, 0x0140,
++	0xace0, 0x0018, 0x2001, 0xc617, 0x2004, 0xac02, 0x1220, 0x0c40,
++	0xa085, 0x0001, 0x0008, 0xa006, 0x003e, 0x004e, 0x00ee, 0x0005,
++	0x00d6, 0x0006, 0x080c, 0x1602, 0x000e, 0x090c, 0x1519, 0x6837,
++	0x010d, 0x685e, 0x0026, 0x2010, 0x080c, 0xac81, 0x2001, 0x0000,
++	0x0120, 0x2200, 0xa080, 0x0014, 0x2004, 0x002e, 0x684a, 0x6956,
++	0x6c46, 0x684f, 0x0000, 0x2001, 0xc905, 0x2004, 0x6852, 0xa006,
++	0x68b2, 0x6802, 0x683a, 0x685a, 0x080c, 0x580a, 0x00de, 0x0005,
++	0x6700, 0xa786, 0x0000, 0x0158, 0xa786, 0x0001, 0x0140, 0xa786,
++	0x000a, 0x0128, 0xa786, 0x0009, 0x0110, 0xa085, 0x0001, 0x0005,
++	0x00e6, 0x6018, 0x2070, 0x70a0, 0xa206, 0x00ee, 0x0005, 0x0016,
++	0x6004, 0xa08e, 0x001e, 0x11a0, 0x8007, 0x6130, 0xa18c, 0x00ff,
++	0xa105, 0x6032, 0x6007, 0x0085, 0x6003, 0x000b, 0x601f, 0x0005,
++	0x2001, 0xc8fe, 0x2004, 0x6016, 0x080c, 0x7999, 0x080c, 0x7e94,
++	0x001e, 0x0005, 0xe000, 0xe000, 0x0005, 0x6020, 0xd0e4, 0x0158,
++	0xd0cc, 0x0118, 0x080c, 0xaf6c, 0x0030, 0x080c, 0xc3e2, 0x080c,
++	0x7103, 0x080c, 0x95e3, 0x0005, 0xa280, 0x0007, 0x2004, 0xa084,
++	0x000f, 0x0002, 0xc20b, 0xc20b, 0xc20b, 0xc210, 0xc20b, 0xc20d,
++	0xc20d, 0xc20b, 0xc20d, 0xa006, 0x0005, 0x00c6, 0x2260, 0x00ce,
++	0xa085, 0x0001, 0x0005, 0xa280, 0x0007, 0x2004, 0xa084, 0x000f,
++	0x0002, 0xc222, 0xc222, 0xc222, 0xc222, 0xc222, 0xc222, 0xc22d,
++	0xc222, 0xc222, 0x6007, 0x003b, 0x602b, 0x0009, 0x6013, 0x2a00,
++	0x6003, 0x0001, 0x080c, 0x7999, 0x0005, 0x00c6, 0x2260, 0x080c,
++	0xc3e2, 0x603f, 0x0000, 0x6020, 0xc0f4, 0xc0cc, 0x6022, 0x6037,
++	0x0000, 0x00ce, 0x00d6, 0x2268, 0xa186, 0x0007, 0x1904, 0xc288,
++	0x6810, 0xa005, 0x0138, 0xa080, 0x0013, 0x2004, 0xd0fc, 0x1110,
++	0x00de, 0x08c0, 0x6007, 0x003a, 0x6003, 0x0001, 0x080c, 0x7999,
++	0x080c, 0x7e94, 0x00c6, 0x2d60, 0x6100, 0xa186, 0x0002, 0x1904,
++	0xc311, 0x6010, 0xa005, 0x1138, 0x6000, 0xa086, 0x0007, 0x190c,
++	0x1519, 0x0804, 0xc311, 0xa08c, 0xf000, 0x1130, 0x0028, 0x2068,
++	0x6800, 0xa005, 0x1de0, 0x2d00, 0xa080, 0x0013, 0x2004, 0xa084,
++	0x0003, 0xa086, 0x0002, 0x1180, 0x6010, 0x2068, 0x684c, 0xc0dc,
++	0xc0f4, 0x684e, 0x6850, 0xc0f4, 0xc0fc, 0x6852, 0x2009, 0x0043,
++	0x080c, 0xbbcb, 0x0804, 0xc311, 0x2009, 0x0041, 0x0804, 0xc30b,
++	0xa186, 0x0005, 0x15f0, 0x6810, 0xa080, 0x0013, 0x2004, 0xd0bc,
++	0x1118, 0x00de, 0x0804, 0xc222, 0xd0b4, 0x0128, 0xd0fc, 0x090c,
++	0x1519, 0x0804, 0xc240, 0x6007, 0x003a, 0x6003, 0x0001, 0x080c,
++	0x7999, 0x080c, 0x7e94, 0x00c6, 0x2d60, 0x6100, 0xa186, 0x0002,
++	0x0120, 0xa186, 0x0004, 0x1904, 0xc311, 0x2071, 0xc96a, 0x7000,
++	0xa086, 0x0003, 0x1128, 0x7004, 0xac06, 0x1110, 0x7003, 0x0000,
++	0x6810, 0xa080, 0x0013, 0x200c, 0xc1f4, 0xc1dc, 0x2102, 0x8000,
++	0x200c, 0xc1f4, 0xc1fc, 0xc1bc, 0x2102, 0x2009, 0x0042, 0x0804,
++	0xc30b, 0x0036, 0x00d6, 0x00d6, 0x080c, 0x1602, 0x003e, 0x090c,
++	0x1519, 0x6837, 0x010d, 0x6803, 0x0000, 0x683b, 0x0000, 0x685b,
++	0x0000, 0x6b5e, 0x6857, 0x0045, 0x2c00, 0x6862, 0x6034, 0x6872,
++	0x2360, 0x6020, 0xc0dd, 0x6022, 0x6018, 0xa080, 0x0028, 0x2004,
++	0xa084, 0x00ff, 0x8007, 0x6350, 0x6b4a, 0x6846, 0x684f, 0x0000,
++	0x6853, 0x0000, 0x6d6a, 0x6e66, 0x686f, 0x0001, 0x080c, 0x580a,
++	0x2019, 0x0045, 0x6008, 0x2068, 0x080c, 0xbd55, 0x2d00, 0x600a,
++	0x601f, 0x0006, 0x6003, 0x0007, 0x6017, 0x0000, 0x603f, 0x0000,
++	0x00de, 0x003e, 0x0038, 0x603f, 0x0000, 0x6003, 0x0007, 0x080c,
++	0xbbcb, 0x00ce, 0x00de, 0x0005, 0xa186, 0x0013, 0x1128, 0x6004,
++	0xa082, 0x0085, 0x2008, 0x00c2, 0xa186, 0x0027, 0x1178, 0x080c,
++	0x7db1, 0x0036, 0x00d6, 0x6010, 0x2068, 0x2019, 0x0004, 0x080c,
++	0xc141, 0x00de, 0x003e, 0x080c, 0x7e94, 0x0005, 0xa186, 0x0014,
++	0x0d70, 0x080c, 0x962a, 0x0005, 0xc33d, 0xc33b, 0xc33b, 0xc33b,
++	0xc33b, 0xc33b, 0xc33d, 0x080c, 0x1519, 0x080c, 0x7db1, 0x6003,
++	0x000c, 0x080c, 0x7e94, 0x0005, 0xa182, 0x008c, 0x1220, 0xa182,
++	0x0085, 0x0208, 0x001a, 0x080c, 0x962a, 0x0005, 0xc355, 0xc355,
++	0xc355, 0xc355, 0xc357, 0xc375, 0xc355, 0x080c, 0x1519, 0x00d6,
++	0x2c68, 0x080c, 0x958d, 0x01a0, 0x6003, 0x0001, 0x6007, 0x001e,
++	0x2009, 0xcc8e, 0x210c, 0x6136, 0x2009, 0xcc8f, 0x210c, 0x613a,
++	0x600b, 0xffff, 0x6918, 0x611a, 0x601f, 0x0004, 0x080c, 0x7999,
++	0x2d60, 0x080c, 0x95e3, 0x00de, 0x0005, 0x080c, 0x95e3, 0x0005,
++	0x00e6, 0x6018, 0x2070, 0x7000, 0xd0ec, 0x00ee, 0x0005, 0x6010,
++	0xa08c, 0xf000, 0x0904, 0xc3c3, 0xa080, 0x0013, 0x200c, 0xd1ec,
++	0x05d0, 0x2001, 0xc672, 0x2004, 0xd0ec, 0x05a8, 0x6003, 0x0002,
++	0x6020, 0xc0e5, 0x6022, 0xd1ac, 0x0180, 0x00f6, 0x2c78, 0x080c,
++	0x56bf, 0x00fe, 0x0150, 0x2001, 0xc8ff, 0x2004, 0x603e, 0x2009,
++	0xc672, 0x210c, 0xd1f4, 0x11e8, 0x0080, 0x2009, 0xc672, 0x210c,
++	0xd1f4, 0x0128, 0x6020, 0xc0e4, 0x6022, 0xa006, 0x00a0, 0x2001,
++	0xc8ff, 0x200c, 0x8103, 0xa100, 0x603e, 0x6018, 0xa088, 0x002f,
++	0x2104, 0xa005, 0x0118, 0xa088, 0x0003, 0x0cd0, 0x2c0a, 0x600f,
++	0x0000, 0xa085, 0x0001, 0x0005, 0x0016, 0x00c6, 0x00e6, 0x6150,
++	0xa2f0, 0x002f, 0x2e04, 0x2060, 0x8cff, 0x0180, 0x84ff, 0x1118,
++	0x6050, 0xa106, 0x1138, 0x600c, 0x2072, 0x080c, 0x7103, 0x080c,
++	0x95e3, 0x0010, 0xacf0, 0x0003, 0x2e64, 0x0c70, 0x00ee, 0x00ce,
++	0x001e, 0x0005, 0x00d6, 0x6018, 0xa0e8, 0x002f, 0x2d04, 0xa005,
++	0x0140, 0xac06, 0x0120, 0x2d04, 0xa0e8, 0x0003, 0x0cb8, 0x600c,
++	0x206a, 0x00de, 0x0005, 0x0026, 0x0036, 0x0156, 0x2011, 0xc628,
++	0x2204, 0xa084, 0x00ff, 0x2019, 0xcc8e, 0x2334, 0xa636, 0x11d8,
++	0x8318, 0x2334, 0x2204, 0xa084, 0xff00, 0xa636, 0x11a0, 0x2011,
++	0xcc90, 0x6018, 0xa098, 0x000a, 0x20a9, 0x0004, 0x080c, 0xa103,
++	0x1150, 0x2011, 0xcc94, 0x6018, 0xa098, 0x0006, 0x20a9, 0x0004,
++	0x080c, 0xa103, 0x1100, 0x015e, 0x003e, 0x002e, 0x0005, 0x00e6,
++	0x2071, 0xc600, 0x080c, 0x4f02, 0x080c, 0x2c62, 0x00ee, 0x0005,
++	0x00d6, 0x080c, 0x15e5, 0x0500, 0x2d10, 0xa290, 0x000d, 0x2013,
++	0x0134, 0x8210, 0x2013, 0x0000, 0x8210, 0x703c, 0x2012, 0x8210,
++	0x7038, 0x2012, 0x8210, 0x2218, 0x7048, 0x2012, 0x8210, 0x704c,
++	0x2012, 0x8210, 0x7050, 0x2012, 0x8210, 0x7054, 0x2012, 0x2300,
++	0x080c, 0x3e8f, 0x080c, 0x580a, 0x00de, 0x0005, 0x00d6, 0x0026,
++	0x080c, 0x1602, 0x090c, 0x1519, 0xad90, 0x000e, 0x20a9, 0x000c,
++	0x22a0, 0xa016, 0x42a4, 0xa186, 0x0046, 0x1118, 0x6837, 0x0136,
++	0x0038, 0x6837, 0x0138, 0xa186, 0x0041, 0x0110, 0x684b, 0x0001,
++	0x7038, 0xa084, 0xff00, 0x7240, 0xa294, 0xff00, 0x8007, 0xa215,
++	0x6a6a, 0xa186, 0x0046, 0x1168, 0x7038, 0xa084, 0x00ff, 0x723c,
++	0xa294, 0xff00, 0xa215, 0x6a6e, 0x723c, 0xa294, 0x00ff, 0x6a72,
++	0x0060, 0x7040, 0xa084, 0x00ff, 0x7244, 0xa294, 0xff00, 0xa215,
++	0x6a6e, 0x7244, 0xa294, 0x00ff, 0x6a72, 0xa186, 0x0046, 0x1118,
++	0xae90, 0x0012, 0x0010, 0xae90, 0x001a, 0x2204, 0x8007, 0x6876,
++	0x8210, 0x2204, 0x8007, 0x687a, 0x8210, 0x2204, 0x8007, 0x687e,
++	0x8210, 0x2204, 0x8007, 0x6882, 0x8210, 0xa186, 0x0046, 0x1118,
++	0xae90, 0x0016, 0x0010, 0xae90, 0x001e, 0x2204, 0x8007, 0x6886,
++	0x8210, 0x2204, 0x8007, 0x688a, 0x8210, 0x2204, 0x8007, 0x688e,
++	0x8210, 0x2204, 0x8007, 0x6892, 0x8210, 0xa186, 0x0046, 0x1118,
++	0xae90, 0x0022, 0x0010, 0xae90, 0x002a, 0x00d6, 0xade8, 0x0025,
++	0x20a9, 0x0008, 0x2204, 0x8007, 0x206a, 0x8210, 0x8d68, 0x1f04,
++	0xc4ca, 0x00de, 0x002e, 0x080c, 0x580a, 0x00de, 0x0005, 0x00e6,
++	0x6018, 0x2070, 0x7000, 0xd0fc, 0x0108, 0x0011, 0x00ee, 0x0005,
++	0x6850, 0xc0e5, 0x6852, 0x0005, 0x00e6, 0x00c6, 0x0076, 0x0066,
++	0x0056, 0x0046, 0x0026, 0x0016, 0x0126, 0x2091, 0x8000, 0x2029,
++	0xc930, 0x252c, 0x2021, 0xc936, 0x2424, 0x2061, 0xce00, 0x2071,
++	0xc600, 0x7648, 0x7068, 0xa606, 0x0578, 0x671c, 0xa786, 0x0001,
++	0x0118, 0xa786, 0x0008, 0x1500, 0x2500, 0xac06, 0x01e8, 0x2400,
++	0xac06, 0x01d0, 0x080c, 0xc1b8, 0x01b8, 0x080c, 0xc1c8, 0x11a0,
++	0x6000, 0xa086, 0x0004, 0x1120, 0x0016, 0x080c, 0x1953, 0x001e,
++	0x080c, 0xae7e, 0x1110, 0x080c, 0x2e6c, 0x080c, 0xae8f, 0x1110,
++	0x080c, 0x9c09, 0x080c, 0xae54, 0xace0, 0x0018, 0x2001, 0xc617,
++	0x2004, 0xac02, 0x1208, 0x0858, 0x012e, 0x001e, 0x002e, 0x004e,
++	0x005e, 0x006e, 0x007e, 0x00ce, 0x00ee, 0x0005, 0x0126, 0x0006,
++	0x00e6, 0x0016, 0x2091, 0x8000, 0x2071, 0xc640, 0xd5a4, 0x0118,
++	0x7034, 0x8000, 0x7036, 0xd5b4, 0x0118, 0x7030, 0x8000, 0x7032,
++	0xd5ac, 0x0178, 0x2500, 0xa084, 0x0007, 0xa08e, 0x0003, 0x0148,
++	0xa08e, 0x0004, 0x0130, 0xa08e, 0x0005, 0x0118, 0x2071, 0xc64a,
++	0x04c9, 0x001e, 0x00ee, 0x000e, 0x012e, 0x0005, 0x0126, 0x0006,
++	0x00e6, 0x0016, 0x2091, 0x8000, 0x2071, 0xc640, 0xd5a4, 0x0118,
++	0x7034, 0x8000, 0x7036, 0xd5b4, 0x0118, 0x7030, 0x8000, 0x7032,
++	0xd5ac, 0x0178, 0x2500, 0xa084, 0x0007, 0xa08e, 0x0003, 0x0148,
++	0xa08e, 0x0004, 0x0130, 0xa08e, 0x0005, 0x0118, 0x2071, 0xc64a,
++	0x0089, 0x001e, 0x00ee, 0x000e, 0x012e, 0x0005, 0x0126, 0x0006,
++	0x00e6, 0x2091, 0x8000, 0x2071, 0xc642, 0x0021, 0x00ee, 0x000e,
++	0x012e, 0x0005, 0x2e04, 0x8000, 0x2072, 0x1220, 0x8e70, 0x2e04,
++	0x8000, 0x2072, 0x0005, 0x00e6, 0x2071, 0xc640, 0x0c99, 0x00ee,
++	0x0005, 0x00e6, 0x2071, 0xc644, 0x0c69, 0x00ee, 0x0005, 0x0126,
++	0x0006, 0x00e6, 0x2091, 0x8000, 0x2071, 0xc640, 0x7044, 0x8000,
++	0x7046, 0x00ee, 0x000e, 0x012e, 0x0005, 0x0001, 0x0002, 0x0004,
++	0x0008, 0x0010, 0x0020, 0x0040, 0x0080, 0x0100, 0x0200, 0x0400,
++	0x0800, 0x1000, 0x2000, 0x4000, 0x8000, 0xb0c4
++};
++#ifdef UNIQUE_FW_NAME
++unsigned short fw2200ip_length01 = 0xb5c6;
++#else
++unsigned short risc_code_length01 = 0xb5c6;
++#endif
++
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/ql2300tpx_fw.c	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,6494 @@
++/**************************************************************************
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ *************************************************************************/
++/*
++ *	Firmware Version 3.02.10 (14:20 Apr 17, 2003)
++ */
++
++#ifdef UNIQUE_FW_NAME
++unsigned short fw2300tpx_version = 3*1024+2;
++#else
++unsigned short risc_code_version = 3*1024+2;
++#endif
++
++#ifdef UNIQUE_FW_NAME
++unsigned char fw2300tpx_version_str[] = {3, 2,10};
++#else
++unsigned char firmware_version[] = {3, 2,10};
++#endif
++
++#ifdef UNIQUE_FW_NAME
++#define fw2300tpx_VERSION_STRING "3.02.10"
++#else
++#define FW_VERSION_STRING "3.02.10"
++#endif
++
++#ifdef UNIQUE_FW_NAME
++unsigned short fw2300tpx_addr01 = 0x0800 ;
++#else
++unsigned short risc_code_addr01 = 0x0800 ;
++#endif
++
++#ifdef UNIQUE_FW_NAME
++unsigned short fw2300tpx_code01[] = { 
++#else
++unsigned short risc_code01[] = { 
++#endif
++	0x0470, 0x0000, 0x0000, 0xc920, 0x0000, 0x0003, 0x0002, 0x000a,
++	0x0117, 0x2043, 0x4f50, 0x5952, 0x4947, 0x4854, 0x2032, 0x3030,
++	0x3120, 0x514c, 0x4f47, 0x4943, 0x2043, 0x4f52, 0x504f, 0x5241,
++	0x5449, 0x4f4e, 0x2049, 0x5350, 0x3233, 0x3030, 0x2046, 0x6972,
++	0x6d77, 0x6172, 0x6520, 0x2056, 0x6572, 0x7369, 0x6f6e, 0x2030,
++	0x332e, 0x3032, 0x2e31, 0x3020, 0x2020, 0x2020, 0x2400, 0x20a9,
++	0x000f, 0x2001, 0x0000, 0x400f, 0x2091, 0x2200, 0x20a9, 0x000f,
++	0x2001, 0x0000, 0x400f, 0x2091, 0x2400, 0x20a9, 0x000f, 0x2001,
++	0x0000, 0x400f, 0x2091, 0x2600, 0x20a9, 0x000f, 0x2001, 0x0000,
++	0x400f, 0x2091, 0x2800, 0x20a9, 0x000f, 0x2001, 0x0000, 0x400f,
++	0x2091, 0x2a00, 0x20a9, 0x000f, 0x2001, 0x0000, 0x400f, 0x2091,
++	0x2c00, 0x20a9, 0x000f, 0x2001, 0x0000, 0x400f, 0x2091, 0x2e00,
++	0x20a9, 0x000f, 0x2001, 0x0000, 0x400f, 0x2091, 0x2000, 0x2001,
++	0x0000, 0x20c1, 0x0004, 0x2001, 0x017f, 0x2003, 0x0000, 0x20c9,
++	0x1bff, 0x2059, 0x0000, 0x2b78, 0x7883, 0x0004, 0x2089, 0x28b1,
++	0x2051, 0x1800, 0x2a70, 0x20e1, 0x0001, 0x20e9, 0x0001, 0x2029,
++	0x4d00, 0x2031, 0xffff, 0x2039, 0x4cd0, 0x2021, 0x0200, 0x20e9,
++	0x0001, 0x20a1, 0x0000, 0x20a9, 0x0800, 0x900e, 0x4104, 0x20e9,
++	0x0001, 0x20a1, 0x1000, 0x900e, 0x2001, 0x0cc0, 0x9084, 0x0fff,
++	0x20a8, 0x4104, 0x2001, 0x0000, 0x9086, 0x0000, 0x0120, 0x21a8,
++	0x4104, 0x8001, 0x1de0, 0x7566, 0x766a, 0x7762, 0x746e, 0x7472,
++	0x00e6, 0x2071, 0x1a8a, 0x2472, 0x00ee, 0x20a1, 0x1cd0, 0x7168,
++	0x810d, 0x810d, 0x810d, 0x810d, 0x918c, 0x000f, 0x2001, 0x0001,
++	0x9112, 0x900e, 0x21a8, 0x4104, 0x8211, 0x1de0, 0x7168, 0x3400,
++	0x8001, 0x9102, 0x0120, 0x0218, 0x20a8, 0x900e, 0x4104, 0x2009,
++	0x1800, 0x810d, 0x810d, 0x810d, 0x810d, 0x810d, 0x918c, 0x001f,
++	0x2001, 0x0001, 0x9112, 0x20e9, 0x0001, 0x20a1, 0x0800, 0x900e,
++	0x20a9, 0x0800, 0x4104, 0x8211, 0x1dd8, 0x080c, 0x0ec6, 0x080c,
++	0x56e7, 0x080c, 0x94ea, 0x080c, 0x107b, 0x080c, 0x1245, 0x080c,
++	0x18ae, 0x080c, 0x0d1d, 0x080c, 0x1000, 0x080c, 0x2f6e, 0x080c,
++	0x6b54, 0x080c, 0x5f51, 0x080c, 0x774d, 0x080c, 0x20b6, 0x080c,
++	0x7a7b, 0x080c, 0x7190, 0x080c, 0x1ef3, 0x080c, 0x2027, 0x080c,
++	0x20ab, 0x2091, 0x3009, 0x7883, 0x0000, 0x1004, 0x091d, 0x7880,
++	0x9086, 0x0002, 0x1190, 0x7883, 0x4000, 0x7837, 0x4000, 0x7833,
++	0x0010, 0x0e04, 0x0911, 0x2091, 0x5000, 0x2091, 0x4080, 0x2001,
++	0x0089, 0x2004, 0xd084, 0x190c, 0x113e, 0x2071, 0x1800, 0x7003,
++	0x0000, 0x2071, 0x1800, 0x7000, 0x908e, 0x0003, 0x1168, 0x080c,
++	0x44bf, 0x080c, 0x2f92, 0x080c, 0x6bc5, 0x080c, 0x63e8, 0x080c,
++	0x7778, 0x080c, 0x2849, 0x0c68, 0x000b, 0x0c88, 0x0940, 0x0941,
++	0x0ab2, 0x093e, 0x0b69, 0x0d14, 0x0d14, 0x0d14, 0x080c, 0x0d84,
++	0x0005, 0x0126, 0x00f6, 0x2091, 0x8000, 0x7000, 0x9086, 0x0001,
++	0x1904, 0x0a90, 0x080c, 0x0e2c, 0x080c, 0x6877, 0x0150, 0x080c,
++	0x689a, 0x1580, 0x2079, 0x0100, 0x7828, 0x9085, 0x1800, 0x782a,
++	0x0448, 0x080c, 0x67be, 0x7000, 0x9086, 0x0001, 0x1904, 0x0a90,
++	0x7090, 0x9086, 0x0028, 0x1904, 0x0a90, 0x2001, 0x0161, 0x2003,
++	0x0001, 0x2079, 0x0100, 0x7827, 0xffff, 0x7a28, 0x9295, 0x5e2f,
++	0x7a2a, 0x2011, 0x6739, 0x080c, 0x781a, 0x2011, 0x672c, 0x080c,
++	0x78e7, 0x2011, 0x554d, 0x080c, 0x781a, 0x2011, 0x8030, 0x901e,
++	0x738e, 0x0460, 0x080c, 0x4e04, 0x2079, 0x0100, 0x7844, 0x9005,
++	0x1904, 0x0a90, 0x2011, 0x554d, 0x080c, 0x781a, 0x2001, 0x0265,
++	0x2001, 0x0205, 0x2003, 0x0000, 0x7840, 0x9084, 0xfffb, 0x7842,
++	0x2001, 0x1973, 0x2004, 0x9005, 0x1140, 0x00c6, 0x2061, 0x0100,
++	0x080c, 0x568f, 0x00ce, 0x0804, 0x0a90, 0x780f, 0x006b, 0x7a28,
++	0x9295, 0x5e2f, 0x7a2a, 0x2011, 0x8010, 0x73d4, 0x2001, 0x1974,
++	0x2003, 0x0001, 0x080c, 0x2718, 0x080c, 0x447f, 0x7240, 0xc284,
++	0x7242, 0x2001, 0x180c, 0x200c, 0xc1ac, 0xc1cc, 0x2102, 0x080c,
++	0x8d36, 0x2011, 0x0004, 0x080c, 0xb0b9, 0x080c, 0x5e30, 0x080c,
++	0x6877, 0x1120, 0x080c, 0x275c, 0x02e0, 0x0400, 0x080c, 0x5696,
++	0x0140, 0x708f, 0x0001, 0x70cf, 0x0000, 0x080c, 0x4fc7, 0x0804,
++	0x0a90, 0x080c, 0x4dea, 0xd094, 0x0188, 0x2011, 0x180c, 0x2204,
++	0xc0cd, 0x2012, 0x080c, 0x4dee, 0xd0d4, 0x1118, 0x080c, 0x275c,
++	0x1270, 0x2011, 0x180c, 0x2204, 0xc0bc, 0x00a8, 0x080c, 0x4dee,
++	0xd0d4, 0x1db8, 0x2011, 0x180c, 0x2204, 0xc0bd, 0x0060, 0x2011,
++	0x180c, 0x2204, 0xc0bd, 0x2012, 0x080c, 0x5f25, 0x1128, 0xd0a4,
++	0x0118, 0x2204, 0xc0fd, 0x2012, 0x080c, 0x5eeb, 0x0120, 0x7a0c,
++	0xc2b4, 0x7a0e, 0x00a8, 0x7077, 0x0000, 0x080c, 0x6877, 0x1130,
++	0x70a8, 0x9005, 0x1168, 0x080c, 0xb4bd, 0x0050, 0x080c, 0xb4bd,
++	0x70d8, 0xd09c, 0x1128, 0x70a8, 0x9005, 0x0110, 0x080c, 0x5677,
++	0x70e3, 0x0000, 0x70df, 0x0000, 0x709f, 0x0000, 0x72d8, 0x080c,
++	0x6877, 0x1170, 0x9016, 0x0016, 0x080c, 0x2515, 0x2019, 0x193c,
++	0x211a, 0x001e, 0x7057, 0xffff, 0x705b, 0x00ef, 0x707b, 0x0000,
++	0x2079, 0x1852, 0x7804, 0xd0ac, 0x0108, 0xc295, 0x72da, 0x080c,
++	0x6877, 0x0118, 0x9296, 0x0004, 0x0548, 0x2011, 0x0001, 0x080c,
++	0xb0b9, 0x70a3, 0x0000, 0x70a7, 0xffff, 0x7003, 0x0002, 0x2079,
++	0x0100, 0x7827, 0x0003, 0x7828, 0x9085, 0x0003, 0x782a, 0x00fe,
++	0x080c, 0x2b1e, 0x2011, 0x0005, 0x080c, 0x8e99, 0x080c, 0x8125,
++	0x080c, 0x6877, 0x0148, 0x00c6, 0x2061, 0x0100, 0x0016, 0x080c,
++	0x2515, 0x61e2, 0x001e, 0x00ce, 0x012e, 0x0420, 0x70a3, 0x0000,
++	0x70a7, 0xffff, 0x7003, 0x0002, 0x00f6, 0x2079, 0x0100, 0x7827,
++	0x0003, 0x7828, 0x9085, 0x0003, 0x782a, 0x00fe, 0x2011, 0x0005,
++	0x080c, 0x8e99, 0x080c, 0x8125, 0x080c, 0x6877, 0x0148, 0x00c6,
++	0x2061, 0x0100, 0x0016, 0x080c, 0x2515, 0x61e2, 0x001e, 0x00ce,
++	0x00fe, 0x012e, 0x0005, 0x00c6, 0x080c, 0x6877, 0x1118, 0x20a9,
++	0x0800, 0x0010, 0x20a9, 0x0782, 0x080c, 0x6877, 0x1110, 0x900e,
++	0x0010, 0x2009, 0x007e, 0x080c, 0x2e11, 0x8108, 0x1f04, 0x0aa3,
++	0x7077, 0x0000, 0x7078, 0x9084, 0x00ff, 0x707a, 0x70ab, 0x0000,
++	0x00ce, 0x0005, 0x00b6, 0x0126, 0x2091, 0x8000, 0x7000, 0x9086,
++	0x0002, 0x1904, 0x0b66, 0x70a4, 0x9086, 0xffff, 0x0130, 0x080c,
++	0x2b1e, 0x080c, 0x8125, 0x0804, 0x0b66, 0x70d8, 0xd0ac, 0x1110,
++	0xd09c, 0x0540, 0xd084, 0x0530, 0x0006, 0x2001, 0x0103, 0x2003,
++	0x002b, 0x000e, 0xd08c, 0x01f0, 0x70dc, 0x9086, 0xffff, 0x01b0,
++	0x080c, 0x2c86, 0x080c, 0x8125, 0x70d8, 0xd094, 0x1904, 0x0b66,
++	0x2011, 0x0001, 0x080c, 0xb759, 0x0110, 0x2011, 0x0003, 0x901e,
++	0x080c, 0x2cc0, 0x080c, 0x8125, 0x0804, 0x0b66, 0x70e0, 0x9005,
++	0x1904, 0x0b66, 0x70a0, 0x9005, 0x1904, 0x0b66, 0x70d8, 0xd0a4,
++	0x0118, 0xd0b4, 0x0904, 0x0b66, 0x080c, 0x5eeb, 0x1904, 0x0b66,
++	0x080c, 0x5f3e, 0x1904, 0x0b66, 0x080c, 0x5f25, 0x01c0, 0x0156,
++	0x00c6, 0x20a9, 0x007f, 0x900e, 0x0016, 0x080c, 0x5c0d, 0x1118,
++	0xb800, 0xd0ec, 0x1138, 0x001e, 0x8108, 0x1f04, 0x0b0c, 0x00ce,
++	0x015e, 0x0028, 0x001e, 0x00ce, 0x015e, 0x0804, 0x0b66, 0x0006,
++	0x2001, 0x0103, 0x2003, 0x006b, 0x000e, 0x2011, 0x1980, 0x080c,
++	0x0f36, 0x2011, 0x199a, 0x080c, 0x0f36, 0x7030, 0xc08c, 0x7032,
++	0x7003, 0x0003, 0x70a7, 0xffff, 0x080c, 0x0e0e, 0x9006, 0x080c,
++	0x23a6, 0x0036, 0x0046, 0x2019, 0xffff, 0x2021, 0x0006, 0x080c,
++	0x44f9, 0x004e, 0x003e, 0x00f6, 0x2079, 0x0100, 0x080c, 0x689a,
++	0x0150, 0x080c, 0x6877, 0x7828, 0x0118, 0x9084, 0xe1ff, 0x0010,
++	0x9084, 0xffdf, 0x782a, 0x00fe, 0x2001, 0x19b5, 0x2004, 0x9086,
++	0x0005, 0x1120, 0x2011, 0x0000, 0x080c, 0x8e99, 0x2011, 0x0000,
++	0x080c, 0x8ea3, 0x080c, 0x8125, 0x080c, 0x820b, 0x012e, 0x00be,
++	0x0005, 0x0016, 0x0046, 0x00f6, 0x0126, 0x2091, 0x8000, 0x2079,
++	0x0100, 0x7904, 0x918c, 0xfffd, 0x7906, 0x2009, 0x00f7, 0x080c,
++	0x5660, 0x7940, 0x918c, 0x0010, 0x7942, 0x7924, 0xd1b4, 0x0110,
++	0x7827, 0x0040, 0xd19c, 0x0110, 0x7827, 0x0008, 0x0006, 0x0036,
++	0x0156, 0x7954, 0xd1ac, 0x1904, 0x0bf6, 0x2001, 0x1974, 0x2004,
++	0x9005, 0x1518, 0x080c, 0x27d7, 0x1148, 0x2001, 0x0001, 0x080c,
++	0x2747, 0x2001, 0x0001, 0x080c, 0x272a, 0x00b8, 0x080c, 0x27df,
++	0x1138, 0x9006, 0x080c, 0x2747, 0x9006, 0x080c, 0x272a, 0x0068,
++	0x080c, 0x27e7, 0x1d50, 0x2001, 0x1965, 0x2004, 0xd0fc, 0x0108,
++	0x0020, 0x080c, 0x2541, 0x0804, 0x0cd6, 0x080c, 0x6888, 0x0148,
++	0x080c, 0x689a, 0x1118, 0x080c, 0x6b4f, 0x0050, 0x080c, 0x687f,
++	0x0dd0, 0x080c, 0x6b4a, 0x080c, 0x6b40, 0x080c, 0x67be, 0x0058,
++	0x080c, 0x6877, 0x0140, 0x2009, 0x00f8, 0x080c, 0x5660, 0x7843,
++	0x0090, 0x7843, 0x0010, 0x20a9, 0x09c4, 0x7820, 0xd09c, 0x1138,
++	0x080c, 0x6877, 0x0138, 0x7824, 0xd0ac, 0x1904, 0x0cdb, 0x1f04,
++	0x0bd5, 0x0070, 0x7824, 0x080c, 0x6891, 0x0118, 0xd0ac, 0x1904,
++	0x0cdb, 0x9084, 0x1800, 0x0d98, 0x7003, 0x0001, 0x0804, 0x0cdb,
++	0x2001, 0x0001, 0x080c, 0x23a6, 0x0804, 0x0cee, 0x2001, 0x1974,
++	0x2004, 0x9005, 0x1518, 0x080c, 0x27d7, 0x1148, 0x2001, 0x0001,
++	0x080c, 0x2747, 0x2001, 0x0001, 0x080c, 0x272a, 0x00b8, 0x080c,
++	0x27df, 0x1138, 0x9006, 0x080c, 0x2747, 0x9006, 0x080c, 0x272a,
++	0x0068, 0x080c, 0x27e7, 0x1d50, 0x2001, 0x1965, 0x2004, 0xd0fc,
++	0x0108, 0x0020, 0x080c, 0x2541, 0x0804, 0x0cd6, 0x7850, 0x9085,
++	0x0040, 0x7852, 0x7938, 0x7850, 0x9084, 0xfbcf, 0x7852, 0x080c,
++	0x27ef, 0x9085, 0x2000, 0x7852, 0x793a, 0x20a9, 0x0046, 0x1d04,
++	0x0c2f, 0x080c, 0x78c7, 0x1f04, 0x0c2f, 0x7850, 0x9085, 0x0400,
++	0x9084, 0xdfbf, 0x7852, 0x793a, 0x080c, 0x6888, 0x0148, 0x080c,
++	0x689a, 0x1118, 0x080c, 0x6b4f, 0x0050, 0x080c, 0x687f, 0x0dd0,
++	0x080c, 0x6b4a, 0x080c, 0x6b40, 0x080c, 0x67be, 0x0020, 0x2009,
++	0x00f8, 0x080c, 0x5660, 0x20a9, 0x0028, 0xa001, 0x1f04, 0x0c55,
++	0x7850, 0x9085, 0x1400, 0x7852, 0x080c, 0x6877, 0x0120, 0x7843,
++	0x0090, 0x7843, 0x0010, 0x2021, 0xe678, 0x2019, 0xea60, 0x080c,
++	0x0d15, 0x7820, 0xd09c, 0x1588, 0x080c, 0x6877, 0x0904, 0x0cbb,
++	0x7824, 0xd0ac, 0x1904, 0x0cdb, 0x080c, 0x689a, 0x1530, 0x0046,
++	0x2021, 0x0320, 0x8421, 0x1df0, 0x004e, 0x7827, 0x1800, 0x080c,
++	0x27ef, 0x7824, 0x9084, 0x1800, 0x1168, 0x9484, 0x0fff, 0x1140,
++	0x2001, 0x180f, 0x2004, 0x9084, 0x9000, 0x0110, 0x080c, 0x0cfc,
++	0x8421, 0x1158, 0x1d04, 0x0c96, 0x080c, 0x78c7, 0x080c, 0x6b4a,
++	0x080c, 0x6b40, 0x7003, 0x0001, 0x04f0, 0x8319, 0x1940, 0x1d04,
++	0x0ca3, 0x080c, 0x78c7, 0x2009, 0x1968, 0x2104, 0x9005, 0x0118,
++	0x8001, 0x200a, 0x1178, 0x200b, 0x000a, 0x7827, 0x0048, 0x20a9,
++	0x0002, 0x080c, 0x27d0, 0x7924, 0x080c, 0x27ef, 0xd19c, 0x0110,
++	0x080c, 0x2718, 0x00d8, 0x080c, 0x6888, 0x1140, 0x94a2, 0x03e8,
++	0x1128, 0x080c, 0x6853, 0x7003, 0x0001, 0x00a8, 0x7827, 0x1800,
++	0x080c, 0x27ef, 0x7824, 0x080c, 0x6891, 0x0110, 0xd0ac, 0x1158,
++	0x9084, 0x1800, 0x0950, 0x7003, 0x0001, 0x0028, 0x2001, 0x0001,
++	0x080c, 0x23a6, 0x0078, 0x2009, 0x180c, 0x210c, 0xd19c, 0x1120,
++	0x7904, 0x918d, 0x0002, 0x7906, 0x7827, 0x0048, 0x7828, 0x9085,
++	0x0028, 0x782a, 0x7850, 0x9085, 0x0400, 0x7852, 0x2001, 0x1974,
++	0x2003, 0x0000, 0x9006, 0x78f2, 0x015e, 0x003e, 0x000e, 0x012e,
++	0x00fe, 0x004e, 0x001e, 0x0005, 0x0006, 0x0016, 0x0036, 0x0046,
++	0x00b6, 0x00c6, 0x00d6, 0x00e6, 0x00f6, 0x0156, 0x080c, 0x2f92,
++	0x0061, 0x015e, 0x00fe, 0x00ee, 0x00de, 0x00ce, 0x00be, 0x004e,
++	0x003e, 0x001e, 0x000e, 0x0005, 0x0005, 0x080c, 0xb759, 0x0120,
++	0x1d04, 0x0d1c, 0x080c, 0x78c7, 0x0005, 0x2a70, 0x2061, 0x1978,
++	0x2063, 0x0003, 0x6007, 0x0002, 0x600b, 0x000a, 0x600f, 0x0117,
++	0x2001, 0x194b, 0x900e, 0x2102, 0x718e, 0x2001, 0x0100, 0x2004,
++	0x9082, 0x0002, 0x0218, 0x7057, 0xffff, 0x0008, 0x7156, 0x705f,
++	0xffff, 0x7176, 0x717a, 0x080c, 0xb4bd, 0x70ef, 0x00c0, 0x2061,
++	0x193b, 0x6003, 0x0909, 0x6106, 0x600b, 0x8800, 0x600f, 0x0200,
++	0x6013, 0x00ff, 0x6017, 0x000f, 0x611a, 0x601f, 0x07d0, 0x2061,
++	0x1943, 0x6003, 0x8000, 0x6106, 0x610a, 0x600f, 0x0200, 0x6013,
++	0x00ff, 0x6116, 0x601b, 0x0001, 0x611e, 0x2061, 0x1956, 0x6003,
++	0x514c, 0x6007, 0x4f47, 0x600b, 0x4943, 0x600f, 0x2020, 0x2001,
++	0x182a, 0x2102, 0x0005, 0x9016, 0x080c, 0x5c0d, 0x1178, 0xb804,
++	0x90c4, 0x00ff, 0x98c6, 0x0006, 0x0128, 0x90c4, 0xff00, 0x98c6,
++	0x0600, 0x1120, 0x9186, 0x0080, 0x0108, 0x8210, 0x8108, 0x9186,
++	0x0800, 0x1d50, 0x2208, 0x0005, 0x2091, 0x8000, 0x0e04, 0x0d86,
++	0x0006, 0x0016, 0x2001, 0x8002, 0x0006, 0x2079, 0x0000, 0x000e,
++	0x7882, 0x7836, 0x001e, 0x798e, 0x000e, 0x788a, 0x000e, 0x7886,
++	0x3900, 0x789a, 0x7833, 0x0012, 0x2091, 0x5000, 0x0156, 0x00d6,
++	0x0036, 0x0026, 0x2079, 0x0300, 0x2069, 0x1a65, 0x7a18, 0x226a,
++	0x8d68, 0x7a1c, 0x226a, 0x782c, 0x2019, 0x1a72, 0x201a, 0x2019,
++	0x1a75, 0x9016, 0x7808, 0xd09c, 0x0168, 0x7820, 0x201a, 0x8210,
++	0x8318, 0x9386, 0x1a8a, 0x0108, 0x0ca8, 0x7808, 0xd09c, 0x0110,
++	0x2011, 0xdead, 0x2019, 0x1a73, 0x782c, 0x201a, 0x8318, 0x221a,
++	0x7803, 0x0000, 0x2069, 0x1a45, 0x901e, 0x20a9, 0x0020, 0x7b26,
++	0x7a28, 0x226a, 0x8d68, 0x8318, 0x1f04, 0x0dcf, 0x002e, 0x003e,
++	0x00de, 0x015e, 0x2079, 0x1800, 0x7803, 0x0005, 0x2091, 0x4080,
++	0x2001, 0x0089, 0x2004, 0xd084, 0x0180, 0x2001, 0x19e7, 0x2004,
++	0x9005, 0x0128, 0x2001, 0x008b, 0x2004, 0xd0fc, 0x0dd8, 0x2001,
++	0x008a, 0x2003, 0x0002, 0x2003, 0x1001, 0x080c, 0x4df9, 0x1108,
++	0x0011, 0x0cd8, 0x0005, 0x0026, 0x0126, 0x2011, 0x0080, 0x080c,
++	0x0e8d, 0x20a9, 0x0900, 0x080c, 0x0eae, 0x2011, 0x0040, 0x080c,
++	0x0e8d, 0x20a9, 0x0900, 0x080c, 0x0eae, 0x0c78, 0x0026, 0x080c,
++	0x0e9a, 0x1118, 0x2011, 0x0040, 0x0098, 0x2011, 0x010e, 0x2214,
++	0x9294, 0x0007, 0x9296, 0x0007, 0x0118, 0x2011, 0xa880, 0x0010,
++	0x2011, 0x6840, 0xd0e4, 0x70f3, 0x0000, 0x1128, 0x70f3, 0x0fa0,
++	0x080c, 0x0e9f, 0x002e, 0x0005, 0x0026, 0x080c, 0x0e9a, 0x0128,
++	0xd0a4, 0x1138, 0x2011, 0xcdd5, 0x0010, 0x2011, 0x0080, 0x080c,
++	0x0e9f, 0x002e, 0x0005, 0x0026, 0x70f3, 0x0000, 0x080c, 0x0e9a,
++	0x1148, 0x080c, 0x27e7, 0x1118, 0x2011, 0x8484, 0x0058, 0x2011,
++	0x8282, 0x0040, 0x080c, 0x27e7, 0x1118, 0x2011, 0xcdc5, 0x0010,
++	0x2011, 0xcac2, 0x080c, 0x0e9f, 0x002e, 0x0005, 0x00e6, 0x0006,
++	0x2071, 0x1800, 0xd0b4, 0x70ec, 0x1148, 0xc0e4, 0x0080, 0x70ee,
++	0x0026, 0x9094, 0x00c0, 0x0449, 0x002e, 0x0048, 0x0006, 0x3b00,
++	0x9084, 0xff3f, 0x20d8, 0x000e, 0x70f3, 0x0000, 0xc0e5, 0x0079,
++	0x000e, 0x00ee, 0x0005, 0x00e6, 0x2071, 0x1800, 0xd0e4, 0x70ec,
++	0x1110, 0xc0dc, 0x0008, 0xc0dd, 0x0011, 0x00ee, 0x0005, 0x70ee,
++	0x7000, 0x9084, 0x0007, 0x000b, 0x0005, 0x0e55, 0x0e2c, 0x0e2c,
++	0x0e0e, 0x0e3b, 0x0e2c, 0x0e2c, 0x0e3b, 0x0016, 0x3b08, 0x3a00,
++	0x9104, 0x918d, 0x00c0, 0x21d8, 0x9084, 0xff3f, 0x9205, 0x20d0,
++	0x001e, 0x0005, 0x2001, 0x183b, 0x2004, 0xd0dc, 0x0005, 0x9e86,
++	0x1800, 0x190c, 0x0d84, 0x70ec, 0xd0e4, 0x0108, 0xc2e5, 0x72ee,
++	0xd0e4, 0x1118, 0x9294, 0x00c0, 0x0c01, 0x0005, 0x1d04, 0x0eae,
++	0x2091, 0x6000, 0x1f04, 0x0eae, 0x0005, 0x890e, 0x810e, 0x810f,
++	0x9194, 0x003f, 0x918c, 0xffc0, 0x0005, 0x0006, 0x2200, 0x914d,
++	0x894f, 0x894d, 0x894d, 0x000e, 0x000e, 0x0005, 0x01d6, 0x0146,
++	0x0036, 0x0096, 0x2061, 0x1882, 0x600b, 0x0000, 0x600f, 0x0000,
++	0x6003, 0x0000, 0x6007, 0x0000, 0x2009, 0xffc0, 0x2105, 0x0006,
++	0x2001, 0xaaaa, 0x200f, 0x2019, 0x5555, 0x9016, 0x2049, 0x0bff,
++	0xab02, 0xa001, 0xa001, 0xa800, 0x9306, 0x1138, 0x2105, 0x9306,
++	0x0120, 0x8210, 0x99c8, 0x0400, 0x0c98, 0x000e, 0x200f, 0x2001,
++	0x1892, 0x928a, 0x000e, 0x1638, 0x928a, 0x0006, 0x2011, 0x0006,
++	0x1210, 0x2011, 0x0000, 0x2202, 0x9006, 0x2008, 0x82ff, 0x01b0,
++	0x8200, 0x600a, 0x600f, 0xffff, 0x6003, 0x0002, 0x6007, 0x0000,
++	0x0026, 0x2019, 0x0010, 0x9280, 0x0001, 0x20e8, 0x21a0, 0x21a8,
++	0x4104, 0x8319, 0x1de0, 0x8211, 0x1da0, 0x002e, 0x009e, 0x003e,
++	0x014e, 0x01de, 0x0005, 0x2011, 0x000e, 0x08e8, 0x0016, 0x0026,
++	0x0096, 0x3348, 0x080c, 0x0eb5, 0x2100, 0x9300, 0x2098, 0x22e0,
++	0x009e, 0x002e, 0x001e, 0x0036, 0x3518, 0x20a9, 0x0001, 0x4002,
++	0x8007, 0x4004, 0x8319, 0x1dd8, 0x003e, 0x0005, 0x20e9, 0x0001,
++	0x71b0, 0x81ff, 0x11c0, 0x9006, 0x2009, 0x0200, 0x20a9, 0x0002,
++	0x9298, 0x0018, 0x23a0, 0x4001, 0x2009, 0x0700, 0x20a9, 0x0002,
++	0x9298, 0x0008, 0x23a0, 0x4001, 0x7074, 0x8007, 0x7178, 0x810f,
++	0x20a9, 0x0002, 0x4001, 0x9298, 0x000c, 0x23a0, 0x900e, 0x080c,
++	0x0d6b, 0x2001, 0x0000, 0x810f, 0x20a9, 0x0002, 0x4001, 0x0005,
++	0x89ff, 0x0140, 0xa804, 0xa807, 0x0000, 0x0006, 0x080c, 0x0fe0,
++	0x009e, 0x0cb0, 0x0005, 0x00e6, 0x2071, 0x1800, 0x080c, 0x1057,
++	0x090c, 0x0d84, 0x00ee, 0x0005, 0x0086, 0x00e6, 0x0006, 0x0026,
++	0x0036, 0x0126, 0x2091, 0x8000, 0x00c9, 0x2071, 0x1800, 0x73bc,
++	0x702c, 0x9016, 0x9045, 0x0158, 0x8210, 0x9906, 0x090c, 0x0d84,
++	0x2300, 0x9202, 0x0120, 0x1a0c, 0x0d84, 0xa000, 0x0c98, 0x012e,
++	0x003e, 0x002e, 0x000e, 0x00ee, 0x008e, 0x0005, 0x0086, 0x00e6,
++	0x0006, 0x0126, 0x2091, 0x8000, 0x2071, 0x1904, 0x7010, 0x9005,
++	0x0140, 0x7018, 0x9045, 0x0128, 0x9906, 0x090c, 0x0d84, 0xa000,
++	0x0cc8, 0x012e, 0x000e, 0x00ee, 0x008e, 0x0005, 0x00e6, 0x2071,
++	0x1800, 0x0126, 0x2091, 0x8000, 0x70bc, 0x8001, 0x0270, 0x70be,
++	0x702c, 0x2048, 0x9085, 0x0001, 0xa800, 0x702e, 0xa803, 0x0000,
++	0xa807, 0x0000, 0x012e, 0x00ee, 0x0005, 0x904e, 0x0cd8, 0x00e6,
++	0x0126, 0x2091, 0x8000, 0x2071, 0x1800, 0x70bc, 0x90ca, 0x0040,
++	0x0268, 0x8001, 0x70be, 0x702c, 0x2048, 0xa800, 0x702e, 0xa803,
++	0x0000, 0xa807, 0x0000, 0x012e, 0x00ee, 0x0005, 0x904e, 0x0cd8,
++	0x00e6, 0x0126, 0x2091, 0x8000, 0x0016, 0x890e, 0x810e, 0x810f,
++	0x9184, 0x003f, 0xa862, 0x9184, 0xffc0, 0xa85e, 0x001e, 0x0020,
++	0x00e6, 0x0126, 0x2091, 0x8000, 0x2071, 0x1800, 0x702c, 0xa802,
++	0x2900, 0x702e, 0x70bc, 0x8000, 0x70be, 0x012e, 0x00ee, 0x0005,
++	0x2071, 0x1800, 0x9026, 0x2009, 0x0000, 0x2049, 0x0400, 0x2900,
++	0x702e, 0x8940, 0x2800, 0xa802, 0xa95e, 0xa863, 0x0001, 0x8420,
++	0x9886, 0x0440, 0x0120, 0x2848, 0x9188, 0x0040, 0x0c90, 0x2071,
++	0x1882, 0x7000, 0x9005, 0x11a0, 0x2001, 0x0534, 0xa802, 0x2048,
++	0x2009, 0x4d00, 0x8940, 0x2800, 0xa802, 0xa95e, 0xa863, 0x0001,
++	0x8420, 0x9886, 0x0800, 0x0120, 0x2848, 0x9188, 0x0040, 0x0c90,
++	0x2071, 0x1882, 0x7104, 0x7200, 0x82ff, 0x01d0, 0x7308, 0x8318,
++	0x831f, 0x831b, 0x831b, 0x7312, 0x8319, 0x2001, 0x0800, 0xa802,
++	0x2048, 0x8900, 0xa802, 0x2040, 0xa95e, 0xaa62, 0x8420, 0x2300,
++	0x9906, 0x0130, 0x2848, 0x9188, 0x0040, 0x9291, 0x0000, 0x0c88,
++	0xa803, 0x0000, 0x2071, 0x1800, 0x74ba, 0x74be, 0x0005, 0x00e6,
++	0x0016, 0x9984, 0xfc00, 0x01e8, 0x908c, 0xf800, 0x1168, 0x9982,
++	0x0400, 0x02b8, 0x9982, 0x0440, 0x0278, 0x9982, 0x0534, 0x0288,
++	0x9982, 0x0800, 0x1270, 0x0040, 0x9982, 0x0800, 0x0250, 0x2071,
++	0x1882, 0x7010, 0x9902, 0x1228, 0x9085, 0x0001, 0x001e, 0x00ee,
++	0x0005, 0x9006, 0x0cd8, 0x00e6, 0x2071, 0x19e6, 0x7007, 0x0000,
++	0x9006, 0x701e, 0x7022, 0x7002, 0x2071, 0x0000, 0x7010, 0x9085,
++	0x8004, 0x7012, 0x00ee, 0x0005, 0x0126, 0x2091, 0x8000, 0x00e6,
++	0xa06f, 0x0000, 0x2071, 0x19e6, 0x701c, 0x9088, 0x19f0, 0x280a,
++	0x8000, 0x9084, 0x003f, 0x701e, 0x7120, 0x9106, 0x090c, 0x0d84,
++	0x7004, 0x9005, 0x1128, 0x00f6, 0x2079, 0x0080, 0x00a9, 0x00fe,
++	0x00ee, 0x012e, 0x0005, 0x0126, 0x2091, 0x8000, 0x00e6, 0x2071,
++	0x19e6, 0x7004, 0x9005, 0x1128, 0x00f6, 0x2079, 0x0080, 0x0021,
++	0x00fe, 0x00ee, 0x012e, 0x0005, 0x7004, 0x9086, 0x0000, 0x1110,
++	0x7007, 0x0006, 0x7000, 0x0002, 0x10ce, 0x10cc, 0x10cc, 0x10cc,
++	0x1234, 0x1234, 0x1234, 0x1234, 0x080c, 0x0d84, 0x701c, 0x7120,
++	0x9106, 0x1148, 0x792c, 0x9184, 0x0001, 0x1120, 0xd1fc, 0x1110,
++	0x7007, 0x0000, 0x0005, 0x0096, 0x9180, 0x19f0, 0x2004, 0x700a,
++	0x2048, 0x8108, 0x918c, 0x003f, 0x7122, 0x782b, 0x0026, 0xa88c,
++	0x7802, 0xa890, 0x7806, 0xa894, 0x780a, 0xa898, 0x780e, 0xa878,
++	0x700e, 0xa870, 0x7016, 0xa874, 0x701a, 0xa868, 0x009e, 0xd084,
++	0x0120, 0x7007, 0x0001, 0x0029, 0x0005, 0x7007, 0x0002, 0x00b1,
++	0x0005, 0x0016, 0x0026, 0x710c, 0x2011, 0x0040, 0x9182, 0x0040,
++	0x1210, 0x2110, 0x9006, 0x700e, 0x7212, 0x8203, 0x7812, 0x782b,
++	0x0020, 0x782b, 0x0041, 0x002e, 0x001e, 0x0005, 0x0016, 0x0026,
++	0x0136, 0x0146, 0x0156, 0x7014, 0x20e0, 0x7018, 0x2098, 0x20e9,
++	0x0000, 0x20a1, 0x0088, 0x782b, 0x0026, 0x710c, 0x2011, 0x0040,
++	0x9182, 0x0040, 0x1210, 0x2110, 0x9006, 0x700e, 0x22a8, 0x4006,
++	0x8203, 0x7812, 0x782b, 0x0020, 0x3300, 0x701a, 0x782b, 0x0001,
++	0x015e, 0x014e, 0x013e, 0x002e, 0x001e, 0x0005, 0x2009, 0x19e6,
++	0x2104, 0xc095, 0x200a, 0x080c, 0x10ab, 0x0005, 0x0016, 0x00e6,
++	0x2071, 0x19e6, 0x00f6, 0x2079, 0x0080, 0x792c, 0x782b, 0x0002,
++	0xd1fc, 0x0120, 0x918c, 0x0700, 0x7004, 0x0023, 0x00fe, 0x00ee,
++	0x001e, 0x0005, 0x10bc, 0x1161, 0x1195, 0x0d84, 0x0d84, 0x1240,
++	0x0d84, 0x918c, 0x0700, 0x1550, 0x0136, 0x0146, 0x0156, 0x7014,
++	0x20e8, 0x7018, 0x20a0, 0x20e1, 0x0000, 0x2099, 0x0088, 0x782b,
++	0x0040, 0x7010, 0x20a8, 0x4005, 0x3400, 0x701a, 0x015e, 0x014e,
++	0x013e, 0x700c, 0x9005, 0x0578, 0x7800, 0x7802, 0x7804, 0x7806,
++	0x080c, 0x1101, 0x0005, 0x7008, 0x0096, 0x2048, 0xa86f, 0x0100,
++	0x009e, 0x7007, 0x0000, 0x080c, 0x10bc, 0x0005, 0x7008, 0x0096,
++	0x2048, 0xa86f, 0x0200, 0x009e, 0x0ca0, 0x918c, 0x0700, 0x1150,
++	0x700c, 0x9005, 0x0180, 0x7800, 0x7802, 0x7804, 0x7806, 0x080c,
++	0x1116, 0x0005, 0x7008, 0x0096, 0x2048, 0xa86f, 0x0200, 0x009e,
++	0x7007, 0x0000, 0x0080, 0x0096, 0x7008, 0x2048, 0x7800, 0xa88e,
++	0x7804, 0xa892, 0x7808, 0xa896, 0x780c, 0xa89a, 0xa86f, 0x0100,
++	0x009e, 0x7007, 0x0000, 0x0096, 0x00d6, 0x7008, 0x2048, 0x2001,
++	0x18ad, 0x2004, 0x9906, 0x1128, 0xa89c, 0x080f, 0x00de, 0x009e,
++	0x00a0, 0x00de, 0x009e, 0x0096, 0x00d6, 0x7008, 0x2048, 0x0081,
++	0x0150, 0xa89c, 0x0086, 0x2940, 0x080f, 0x008e, 0x00de, 0x009e,
++	0x080c, 0x10ab, 0x0005, 0x00de, 0x009e, 0x080c, 0x10ab, 0x0005,
++	0xa8a8, 0xd08c, 0x0005, 0x0096, 0xa0a0, 0x904d, 0x090c, 0x0d84,
++	0xa06c, 0x908e, 0x0100, 0x0130, 0xa87b, 0x0030, 0xa883, 0x0000,
++	0xa897, 0x4002, 0x080c, 0x619c, 0xa09f, 0x0000, 0xa0a3, 0x0000,
++	0x2848, 0x080c, 0x0fe0, 0x009e, 0x0005, 0x00a6, 0xa0a0, 0x904d,
++	0x090c, 0x0d84, 0xa06c, 0x908e, 0x0100, 0x0128, 0xa87b, 0x0001,
++	0xa883, 0x0000, 0x00c0, 0xa80c, 0x2050, 0xb004, 0x9005, 0x0198,
++	0xa80e, 0x2050, 0x8006, 0x8006, 0x8007, 0x908c, 0x003f, 0x9084,
++	0xffc0, 0x9080, 0x0002, 0xa076, 0xa172, 0xb000, 0xa07a, 0x2810,
++	0x080c, 0x108c, 0x0078, 0xa97c, 0xa894, 0x0016, 0x0006, 0x080c,
++	0x619c, 0x000e, 0x001e, 0xd1f4, 0x0128, 0x00c6, 0x2060, 0x080c,
++	0x9554, 0x00ce, 0x00ae, 0x0005, 0x0126, 0x2091, 0x8000, 0x782b,
++	0x1001, 0x7007, 0x0005, 0x7000, 0xc094, 0x7002, 0x012e, 0x0005,
++	0x7007, 0x0000, 0x080c, 0x10bc, 0x0005, 0x0126, 0x2091, 0x2200,
++	0x2079, 0x0300, 0x2071, 0x1a30, 0x7003, 0x0000, 0x78bf, 0x00f6,
++	0x00c1, 0x7803, 0x0003, 0x780f, 0x0000, 0x20a9, 0x01ec, 0x2061,
++	0xcd39, 0x2c0d, 0x7912, 0xe104, 0x9ce0, 0x0002, 0x7916, 0x1f04,
++	0x1259, 0x7807, 0x0001, 0x7803, 0x0000, 0x7803, 0x0001, 0x012e,
++	0x0005, 0x00c6, 0x7803, 0x0000, 0x7808, 0xd09c, 0x0110, 0x7820,
++	0x0cd8, 0x2001, 0x1a31, 0x2003, 0x0000, 0x78ab, 0x0004, 0x78ac,
++	0xd0ac, 0x1de8, 0x78ab, 0x0002, 0x7807, 0x0001, 0x7827, 0x0030,
++	0x782b, 0x0400, 0x7827, 0x0031, 0x782b, 0x1a45, 0x781f, 0xff00,
++	0x781b, 0xff00, 0x2001, 0x0200, 0x2004, 0xd0dc, 0x0110, 0x781f,
++	0x0303, 0x2061, 0x1a45, 0x602f, 0x1cd0, 0x2001, 0x1818, 0x2004,
++	0x9082, 0x1cd0, 0x6032, 0x603b, 0x1cdd, 0x00ce, 0x0005, 0x0126,
++	0x2091, 0x2200, 0x7808, 0xd09c, 0x0158, 0x7820, 0x908c, 0xf000,
++	0x1588, 0x908a, 0x0021, 0x1a0c, 0x0d84, 0x0043, 0x012e, 0x0005,
++	0x9084, 0x0070, 0x190c, 0x0d84, 0x012e, 0x0005, 0x12d8, 0x12d8,
++	0x12e1, 0x12e6, 0x12ea, 0x12ef, 0x1317, 0x131b, 0x1329, 0x132d,
++	0x12d8, 0x13b6, 0x13ba, 0x141a, 0x12d8, 0x12d8, 0x12d8, 0x12d8,
++	0x12d8, 0x12d8, 0x12d8, 0x12d8, 0x12d8, 0x12d8, 0x12d8, 0x12d8,
++	0x12d8, 0x12f1, 0x12d8, 0x12d8, 0x12d8, 0x12d8, 0x12d8, 0x12d8,
++	0x080c, 0x0d84, 0x2009, 0x0048, 0x2060, 0x080c, 0x95ce, 0x012e,
++	0x0005, 0x7004, 0xc085, 0xc0b5, 0x7006, 0x0005, 0x7004, 0xc085,
++	0x7006, 0x0005, 0x080c, 0x1421, 0x080c, 0x14c5, 0x0005, 0x080c,
++	0x0d84, 0x080c, 0x1421, 0x2060, 0x6014, 0x0096, 0x2048, 0xa83b,
++	0xffff, 0x009e, 0x2009, 0x0048, 0x080c, 0x95ce, 0x2001, 0x015d,
++	0x2003, 0x0000, 0x2009, 0x03e8, 0x8109, 0x0160, 0x2001, 0x0201,
++	0x2004, 0x9005, 0x0dc8, 0x2001, 0x0218, 0x2004, 0xd0ec, 0x1110,
++	0x080c, 0x1426, 0x2001, 0x0307, 0x2003, 0x8000, 0x0005, 0x7004,
++	0xc095, 0x7006, 0x0005, 0x080c, 0x1421, 0x2060, 0x6014, 0x0096,
++	0x2048, 0xa83b, 0xffff, 0x009e, 0x2009, 0x0048, 0x080c, 0x95ce,
++	0x0005, 0x080c, 0x1421, 0x080c, 0x0d84, 0x080c, 0x1421, 0x080c,
++	0x13a1, 0x7827, 0x0018, 0x79ac, 0xd1dc, 0x0540, 0x7827, 0x0015,
++	0x7828, 0x782b, 0x0000, 0x9065, 0x0138, 0x2001, 0x020d, 0x2003,
++	0x0050, 0x2003, 0x0020, 0x0400, 0x7004, 0x9005, 0x1180, 0x78ab,
++	0x0004, 0x7827, 0x0018, 0x782b, 0x0000, 0xd1bc, 0x090c, 0x0d84,
++	0x2001, 0x020d, 0x2003, 0x0050, 0x2003, 0x0020, 0x0478, 0x78ab,
++	0x0004, 0x7803, 0x0001, 0x080c, 0x13ba, 0x0005, 0x7828, 0x782b,
++	0x0000, 0x9065, 0x090c, 0x0d84, 0x6014, 0x2048, 0x78ab, 0x0004,
++	0x918c, 0x0700, 0x0198, 0x080c, 0x724d, 0x080c, 0x1827, 0x080c,
++	0xb0ad, 0x0158, 0xa9ac, 0xa936, 0xa9b0, 0xa93a, 0xa83f, 0xffff,
++	0xa843, 0xffff, 0xa880, 0xc0bd, 0xa882, 0x0005, 0x6010, 0x00b6,
++	0x2058, 0xb800, 0x00be, 0xd0bc, 0x190c, 0xb456, 0x2029, 0x00c8,
++	0x8529, 0x0128, 0x2001, 0x0201, 0x2004, 0x9005, 0x0dc8, 0x7dbc,
++	0x080c, 0xcce2, 0xd5a4, 0x1118, 0x080c, 0x1426, 0x0005, 0x080c,
++	0x724d, 0x080c, 0x1827, 0x0005, 0x781f, 0x0300, 0x7803, 0x0001,
++	0x0005, 0x0016, 0x0066, 0x0076, 0x00f6, 0x2079, 0x0300, 0x7908,
++	0x918c, 0x0007, 0x9186, 0x0003, 0x0120, 0x2001, 0x0016, 0x080c,
++	0x1492, 0x00fe, 0x007e, 0x006e, 0x001e, 0x0005, 0x7004, 0xc09d,
++	0x7006, 0x0005, 0x7104, 0x9184, 0x0004, 0x190c, 0x0d84, 0xd184,
++	0x1189, 0xd19c, 0x0158, 0xc19c, 0x7106, 0x2001, 0x020d, 0x2003,
++	0x0050, 0x2003, 0x0020, 0x080c, 0x1426, 0x0005, 0x81ff, 0x190c,
++	0x0d84, 0x0005, 0xc184, 0xd1b4, 0xc1b4, 0x7106, 0x0016, 0x00e6,
++	0x15c8, 0x2071, 0x0200, 0x080c, 0x14b9, 0x6014, 0x9005, 0x0590,
++	0x0096, 0x2048, 0xa864, 0x009e, 0x9084, 0x00ff, 0x908e, 0x0029,
++	0x0148, 0x908e, 0x0048, 0x1530, 0x00f6, 0x2c78, 0x080c, 0x150d,
++	0x00fe, 0x00a8, 0x00f6, 0x2c78, 0x080c, 0x163f, 0x00fe, 0x2009,
++	0x01f4, 0x8109, 0x0160, 0x2001, 0x0201, 0x2004, 0x9005, 0x0dc8,
++	0x2001, 0x0218, 0x2004, 0xd0ec, 0x1110, 0x0401, 0x0040, 0x2001,
++	0x020d, 0x2003, 0x0020, 0x080c, 0x1269, 0x7803, 0x0001, 0x00ee,
++	0x001e, 0x0005, 0x2001, 0x020d, 0x2003, 0x0050, 0x2003, 0x0020,
++	0x0069, 0x0ca8, 0x0031, 0x2060, 0x2009, 0x0053, 0x080c, 0x95ce,
++	0x0005, 0x7808, 0xd09c, 0x0de8, 0x7820, 0x0005, 0x080c, 0x13a1,
++	0x00d6, 0x2069, 0x0200, 0x2009, 0x01f4, 0x8109, 0x0508, 0x6804,
++	0x9005, 0x0dd8, 0x2001, 0x015d, 0x2003, 0x0000, 0x79bc, 0xd1a4,
++	0x1520, 0x79b8, 0x918c, 0x0fff, 0x0178, 0x9182, 0x0841, 0x1260,
++	0x9188, 0x0007, 0x918c, 0x0ff8, 0x810c, 0x810c, 0x810c, 0x04e1,
++	0x6827, 0x0001, 0x8109, 0x1dd8, 0x04b9, 0x6827, 0x0002, 0x04a1,
++	0x6804, 0x9005, 0x1130, 0x682c, 0xd0e4, 0x11e0, 0x6804, 0x9005,
++	0x0de8, 0x79b8, 0xd1ec, 0x1130, 0x08c8, 0x080c, 0x724d, 0x080c,
++	0x1827, 0x0070, 0x7827, 0x0015, 0x782b, 0x0000, 0x2001, 0x020d,
++	0x2003, 0x0020, 0x2001, 0x0307, 0x2003, 0x0300, 0x7803, 0x0001,
++	0x00de, 0x0005, 0x682c, 0x9084, 0x5400, 0x9086, 0x5400, 0x0d50,
++	0x7827, 0x0015, 0x782b, 0x0000, 0x7803, 0x0001, 0x6800, 0x9085,
++	0x1800, 0x6802, 0x00de, 0x0005, 0x6824, 0x9084, 0x0003, 0x1de0,
++	0x0005, 0x2001, 0x0030, 0x2c08, 0x621c, 0x0021, 0x7830, 0x9086,
++	0x0041, 0x0005, 0x00f6, 0x2079, 0x0300, 0x0006, 0x7808, 0xd09c,
++	0x0140, 0x0016, 0x0026, 0x00c6, 0x080c, 0x129f, 0x00ce, 0x002e,
++	0x001e, 0x000e, 0x0006, 0x7832, 0x7936, 0x7a3a, 0x781b, 0x8080,
++	0x2009, 0xff00, 0x8109, 0x0130, 0x7818, 0xd0bc, 0x1dd8, 0x000e,
++	0x00fe, 0x0005, 0x000e, 0x792c, 0x3900, 0x8000, 0x2004, 0x080c,
++	0x0d84, 0x7037, 0x0001, 0x7150, 0x7037, 0x0002, 0x7050, 0x2060,
++	0xd1bc, 0x1110, 0x7054, 0x2060, 0x0005, 0x00e6, 0x0016, 0x2071,
++	0x0200, 0x0c79, 0x7358, 0x745c, 0x6014, 0x905d, 0x0598, 0x2b48,
++	0x6010, 0x00b6, 0x2058, 0xb800, 0x00be, 0xd0bc, 0x190c, 0xb431,
++	0xab42, 0xac3e, 0x2001, 0x1874, 0x2004, 0xd0b4, 0x1170, 0x601c,
++	0xd0e4, 0x1158, 0x6010, 0x00b6, 0x2058, 0xb800, 0x00be, 0xd0bc,
++	0x1120, 0xa83b, 0x7fff, 0xa837, 0xffff, 0x080c, 0x1cfd, 0x1190,
++	0x080c, 0x168e, 0x2a00, 0xa816, 0x0130, 0x2800, 0xa80e, 0x2c05,
++	0xa80a, 0x2c00, 0xa812, 0x7037, 0x0020, 0x781f, 0x0300, 0x001e,
++	0x00ee, 0x0005, 0x7037, 0x0050, 0x7037, 0x0020, 0x001e, 0x00ee,
++	0x080c, 0x1426, 0x0005, 0x080c, 0x0d84, 0x2ff0, 0x0126, 0x2091,
++	0x2200, 0x3e60, 0x6014, 0x2048, 0x2940, 0x903e, 0x2730, 0xa864,
++	0x2068, 0xa81a, 0x9d84, 0x000f, 0x9088, 0x1cdd, 0x2165, 0x0002,
++	0x1537, 0x1584, 0x1537, 0x1537, 0x1537, 0x1566, 0x1537, 0x153b,
++	0x1530, 0x157b, 0x1537, 0x1537, 0x1537, 0x1537, 0x154f, 0x1545,
++	0xa964, 0x918c, 0x00ff, 0x918e, 0x0048, 0x0904, 0x157b, 0x9085,
++	0x0001, 0x0804, 0x1637, 0xa87c, 0xd0bc, 0x0dc8, 0xa890, 0xa842,
++	0xa88c, 0xa83e, 0xa888, 0x0804, 0x158b, 0xa87c, 0xd0bc, 0x0d78,
++	0xa890, 0xa842, 0xa88c, 0xa83e, 0xa888, 0x0804, 0x15da, 0xa87c,
++	0xd0bc, 0x0d28, 0xa890, 0xa842, 0xa88c, 0xa83e, 0xa804, 0x9045,
++	0x090c, 0x0d84, 0xa164, 0xa91a, 0x91ec, 0x000f, 0x9d80, 0x1cdd,
++	0x2065, 0xa888, 0xd19c, 0x1904, 0x15da, 0x0428, 0xa87c, 0xd0ac,
++	0x0970, 0xa804, 0x9045, 0x090c, 0x0d84, 0xa164, 0xa91a, 0x91ec,
++	0x000f, 0x9d80, 0x1cdd, 0x2065, 0x9006, 0xa842, 0xa83e, 0xd19c,
++	0x1904, 0x15da, 0x0080, 0xa87c, 0xd0ac, 0x0904, 0x1537, 0x9006,
++	0xa842, 0xa83e, 0x0804, 0x15da, 0xa87c, 0xd0ac, 0x0904, 0x1537,
++	0x9006, 0xa842, 0xa83e, 0x2c05, 0x908a, 0x0036, 0x1a0c, 0x0d84,
++	0x9082, 0x001b, 0x0002, 0x15ae, 0x15ae, 0x15b0, 0x15ae, 0x15ae,
++	0x15ae, 0x15b6, 0x15ae, 0x15ae, 0x15ae, 0x15bc, 0x15ae, 0x15ae,
++	0x15ae, 0x15c2, 0x15ae, 0x15ae, 0x15ae, 0x15c8, 0x15ae, 0x15ae,
++	0x15ae, 0x15ce, 0x15ae, 0x15ae, 0x15ae, 0x15d4, 0x080c, 0x0d84,
++	0xa574, 0xa478, 0xa37c, 0xa280, 0x0804, 0x161f, 0xa584, 0xa488,
++	0xa38c, 0xa290, 0x0804, 0x161f, 0xa594, 0xa498, 0xa39c, 0xa2a0,
++	0x0804, 0x161f, 0xa5a4, 0xa4a8, 0xa3ac, 0xa2b0, 0x0804, 0x161f,
++	0xa5b4, 0xa4b8, 0xa3bc, 0xa2c0, 0x0804, 0x161f, 0xa5c4, 0xa4c8,
++	0xa3cc, 0xa2d0, 0x0804, 0x161f, 0xa5d4, 0xa4d8, 0xa3dc, 0xa2e0,
++	0x0804, 0x161f, 0x2c05, 0x908a, 0x0034, 0x1a0c, 0x0d84, 0x9082,
++	0x001b, 0x0002, 0x15fd, 0x15fb, 0x15fb, 0x15fb, 0x15fb, 0x15fb,
++	0x1604, 0x15fb, 0x15fb, 0x15fb, 0x15fb, 0x15fb, 0x160b, 0x15fb,
++	0x15fb, 0x15fb, 0x15fb, 0x15fb, 0x1612, 0x15fb, 0x15fb, 0x15fb,
++	0x15fb, 0x15fb, 0x1619, 0x080c, 0x0d84, 0xa56c, 0xa470, 0xa774,
++	0xa678, 0xa37c, 0xa280, 0x00d8, 0xa584, 0xa488, 0xa78c, 0xa690,
++	0xa394, 0xa298, 0x00a0, 0xa59c, 0xa4a0, 0xa7a4, 0xa6a8, 0xa3ac,
++	0xa2b0, 0x0068, 0xa5b4, 0xa4b8, 0xa7bc, 0xa6c0, 0xa3c4, 0xa2c8,
++	0x0030, 0xa5cc, 0xa4d0, 0xa7d4, 0xa6d8, 0xa3dc, 0xa2e0, 0xab2e,
++	0xaa32, 0xad1e, 0xac22, 0xaf26, 0xae2a, 0xa988, 0x8c60, 0x2c1d,
++	0xa8ac, 0xaab0, 0xa836, 0xaa3a, 0x8109, 0xa916, 0x1150, 0x3e60,
++	0x601c, 0xc085, 0x601e, 0xa87c, 0xc0dd, 0xa87e, 0x9006, 0x012e,
++	0x0005, 0x2800, 0xa80e, 0xab0a, 0x2c00, 0xa812, 0x0c80, 0x2ff0,
++	0x0126, 0x2091, 0x2200, 0x3e60, 0x6014, 0x2048, 0x2940, 0xa80e,
++	0x2061, 0x1cd8, 0xa80b, 0x1cd8, 0x2c05, 0xa812, 0xa964, 0xa91a,
++	0xa87c, 0xd0ac, 0x090c, 0x0d84, 0x9006, 0xa842, 0xa83e, 0x2c05,
++	0x908a, 0x0034, 0x1a0c, 0x0d84, 0xadcc, 0xacd0, 0xafd4, 0xaed8,
++	0xabdc, 0xaae0, 0xab2e, 0xaa32, 0xad1e, 0xac22, 0xaf26, 0xae2a,
++	0xa8ac, 0xaab0, 0xa836, 0xaa3a, 0xa988, 0x918a, 0x0002, 0xa916,
++	0x1150, 0x3e60, 0x601c, 0xc085, 0x601e, 0xa87c, 0xc0dd, 0xa87e,
++	0x9006, 0x012e, 0x0005, 0xa804, 0x9045, 0x090c, 0x0d84, 0xa80e,
++	0xa064, 0xa81a, 0x9084, 0x000f, 0x9080, 0x1cdd, 0x2015, 0x82ff,
++	0x090c, 0x0d84, 0xaa0a, 0x2205, 0xa812, 0x0c18, 0x903e, 0x2730,
++	0xa880, 0xd0fc, 0x1190, 0x2d00, 0x0002, 0x1783, 0x16e5, 0x16e5,
++	0x1783, 0x1783, 0x177d, 0x1783, 0x16e5, 0x1783, 0x1734, 0x1734,
++	0x1783, 0x1783, 0x1783, 0x177a, 0x1734, 0xc0fc, 0xa882, 0xab2c,
++	0xaa30, 0xad1c, 0xac20, 0xdd9c, 0x0904, 0x1785, 0x2c05, 0x908a,
++	0x0034, 0x1a0c, 0x0d84, 0x9082, 0x001b, 0x0002, 0x16d1, 0x16cf,
++	0x16cf, 0x16cf, 0x16cf, 0x16cf, 0x16d5, 0x16cf, 0x16cf, 0x16cf,
++	0x16cf, 0x16cf, 0x16d9, 0x16cf, 0x16cf, 0x16cf, 0x16cf, 0x16cf,
++	0x16dd, 0x16cf, 0x16cf, 0x16cf, 0x16cf, 0x16cf, 0x16e1, 0x080c,
++	0x0d84, 0xa774, 0xa678, 0x0804, 0x1785, 0xa78c, 0xa690, 0x0804,
++	0x1785, 0xa7a4, 0xa6a8, 0x0804, 0x1785, 0xa7bc, 0xa6c0, 0x0804,
++	0x1785, 0xa7d4, 0xa6d8, 0x0804, 0x1785, 0x2c05, 0x908a, 0x0036,
++	0x1a0c, 0x0d84, 0x9082, 0x001b, 0x0002, 0x1708, 0x1708, 0x170a,
++	0x1708, 0x1708, 0x1708, 0x1710, 0x1708, 0x1708, 0x1708, 0x1716,
++	0x1708, 0x1708, 0x1708, 0x171c, 0x1708, 0x1708, 0x1708, 0x1722,
++	0x1708, 0x1708, 0x1708, 0x1728, 0x1708, 0x1708, 0x1708, 0x172e,
++	0x080c, 0x0d84, 0xa574, 0xa478, 0xa37c, 0xa280, 0x0804, 0x1785,
++	0xa584, 0xa488, 0xa38c, 0xa290, 0x0804, 0x1785, 0xa594, 0xa498,
++	0xa39c, 0xa2a0, 0x0804, 0x1785, 0xa5a4, 0xa4a8, 0xa3ac, 0xa2b0,
++	0x0804, 0x1785, 0xa5b4, 0xa4b8, 0xa3bc, 0xa2c0, 0x0804, 0x1785,
++	0xa5c4, 0xa4c8, 0xa3cc, 0xa2d0, 0x0804, 0x1785, 0xa5d4, 0xa4d8,
++	0xa3dc, 0xa2e0, 0x0804, 0x1785, 0x2c05, 0x908a, 0x0034, 0x1a0c,
++	0x0d84, 0x9082, 0x001b, 0x0002, 0x1757, 0x1755, 0x1755, 0x1755,
++	0x1755, 0x1755, 0x175e, 0x1755, 0x1755, 0x1755, 0x1755, 0x1755,
++	0x1765, 0x1755, 0x1755, 0x1755, 0x1755, 0x1755, 0x176c, 0x1755,
++	0x1755, 0x1755, 0x1755, 0x1755, 0x1773, 0x080c, 0x0d84, 0xa56c,
++	0xa470, 0xa774, 0xa678, 0xa37c, 0xa280, 0x0438, 0xa584, 0xa488,
++	0xa78c, 0xa690, 0xa394, 0xa298, 0x0400, 0xa59c, 0xa4a0, 0xa7a4,
++	0xa6a8, 0xa3ac, 0xa2b0, 0x00c8, 0xa5b4, 0xa4b8, 0xa7bc, 0xa6c0,
++	0xa3c4, 0xa2c8, 0x0090, 0xa5cc, 0xa4d0, 0xa7d4, 0xa6d8, 0xa3dc,
++	0xa2e0, 0x0058, 0x9d86, 0x000e, 0x1130, 0x080c, 0x1c9b, 0x1904,
++	0x168e, 0x900e, 0x0050, 0x080c, 0x0d84, 0xab2e, 0xaa32, 0xad1e,
++	0xac22, 0xaf26, 0xae2a, 0x080c, 0x1c9b, 0x0005, 0x6014, 0x2048,
++	0x6118, 0x810c, 0x810c, 0x810c, 0x81ff, 0x1118, 0xa887, 0x0001,
++	0x0008, 0xa986, 0x601b, 0x0002, 0xa974, 0xd1dc, 0x1108, 0x0005,
++	0xa934, 0xa88c, 0x9106, 0x1158, 0xa938, 0xa890, 0x9106, 0x1138,
++	0x601c, 0xc084, 0x601e, 0x2009, 0x0048, 0x0804, 0x95ce, 0x0005,
++	0x0126, 0x00c6, 0x2091, 0x2200, 0x00ce, 0x7908, 0x918c, 0x0007,
++	0x9186, 0x0000, 0x0904, 0x181c, 0x9186, 0x0003, 0x0904, 0x181c,
++	0x6020, 0x6023, 0x0000, 0x0006, 0x2031, 0x0190, 0x00c6, 0x7808,
++	0xd09c, 0x190c, 0x129f, 0x00ce, 0x2001, 0x0038, 0x2c08, 0x621c,
++	0x080c, 0x1492, 0x7930, 0x9186, 0x0040, 0x0904, 0x1818, 0x9186,
++	0x0042, 0x190c, 0x0d84, 0x2001, 0x001e, 0x8001, 0x1df0, 0x8631,
++	0x1d28, 0x080c, 0x1876, 0x0026, 0x0056, 0x2001, 0x00d2, 0x8001,
++	0x1df0, 0x2031, 0x2000, 0x8631, 0x1148, 0x080c, 0x724d, 0x04b9,
++	0x601c, 0xc084, 0x601e, 0x005e, 0x002e, 0x0410, 0x2001, 0x020b,
++	0x2004, 0xd0e4, 0x0d80, 0x2001, 0x015d, 0x2003, 0x0000, 0x78ab,
++	0x0004, 0x2001, 0x0200, 0x200c, 0x918d, 0x1800, 0x2102, 0x080c,
++	0x1269, 0x601c, 0xc084, 0x601e, 0x7803, 0x0000, 0x7803, 0x0001,
++	0x005e, 0x002e, 0x2001, 0x0160, 0x2502, 0x2001, 0x0138, 0x2202,
++	0x000e, 0x6022, 0x012e, 0x0005, 0x601c, 0xc084, 0x601e, 0x7827,
++	0x0015, 0x7828, 0x9c06, 0x1db0, 0x782b, 0x0000, 0x0c98, 0x00f6,
++	0x2079, 0x0300, 0x7803, 0x0000, 0x78ab, 0x0004, 0x00fe, 0x080c,
++	0x6877, 0x11b0, 0x2001, 0x0138, 0x2003, 0x0000, 0x2001, 0x0160,
++	0x2003, 0x0000, 0x2011, 0x012c, 0xa001, 0xa001, 0x8211, 0x1de0,
++	0x0081, 0x0066, 0x2031, 0x0000, 0x080c, 0x691e, 0x006e, 0x0005,
++	0x0469, 0x0039, 0x2001, 0x0160, 0x2502, 0x2001, 0x0138, 0x2202,
++	0x0005, 0x00e6, 0x2071, 0x0200, 0x080c, 0x27fb, 0x2009, 0x003c,
++	0x080c, 0x2014, 0x2001, 0x015d, 0x2003, 0x0000, 0x7000, 0x9084,
++	0x003c, 0x1de0, 0x70a0, 0x70a2, 0x7098, 0x709a, 0x709c, 0x709e,
++	0x2001, 0x020d, 0x2003, 0x0020, 0x00f6, 0x2079, 0x0300, 0x080c,
++	0x1269, 0x7803, 0x0001, 0x00fe, 0x00ee, 0x0005, 0x2001, 0x0138,
++	0x2014, 0x2003, 0x0000, 0x2001, 0x0160, 0x202c, 0x2003, 0x0000,
++	0x080c, 0x6877, 0x1108, 0x0005, 0x2021, 0x0260, 0x2001, 0x0141,
++	0x201c, 0xd3dc, 0x1168, 0x2001, 0x0109, 0x201c, 0x939c, 0x0048,
++	0x1160, 0x2001, 0x0111, 0x201c, 0x83ff, 0x1110, 0x8421, 0x1d70,
++	0x2001, 0x015d, 0x2003, 0x0000, 0x0005, 0x0046, 0x2021, 0x0019,
++	0x2003, 0x0048, 0xa001, 0xa001, 0x201c, 0x939c, 0x0048, 0x0120,
++	0x8421, 0x1db0, 0x004e, 0x0c60, 0x004e, 0x0c40, 0x0126, 0x2091,
++	0x2400, 0x2071, 0x1a33, 0x2079, 0x0090, 0x012e, 0x0005, 0x9280,
++	0x0005, 0x2004, 0x2048, 0xa97c, 0xd1dc, 0x1904, 0x1932, 0xa964,
++	0x9184, 0x0007, 0x0002, 0x18cb, 0x191d, 0x18d2, 0x18d2, 0x18d2,
++	0x1905, 0x18e5, 0x18d4, 0x2100, 0x9084, 0x00ff, 0x9086, 0x0048,
++	0x0904, 0x191d, 0x080c, 0x0d84, 0xa87c, 0xd0b4, 0x0904, 0x1ae4,
++	0xa890, 0xa842, 0xa83a, 0xa88c, 0xa83e, 0xa836, 0xa8ac, 0xa846,
++	0xa8b0, 0xa84a, 0xa988, 0x0804, 0x1925, 0xa864, 0x9084, 0x00ff,
++	0x9086, 0x001e, 0x1d38, 0xa87c, 0xd0b4, 0x0904, 0x1ae4, 0xa890,
++	0xa842, 0xa83a, 0xa88c, 0xa83e, 0xa836, 0xa8ac, 0xa846, 0xa8b0,
++	0xa84a, 0xa804, 0xa85a, 0x2040, 0xa064, 0x9084, 0x000f, 0x9080,
++	0x1cdd, 0x2005, 0xa812, 0xa988, 0x0448, 0x918c, 0x00ff, 0x9186,
++	0x0015, 0x1540, 0xa87c, 0xd0b4, 0x0904, 0x1ae4, 0xa804, 0xa85a,
++	0x2040, 0xa064, 0x9084, 0x000f, 0x9080, 0x1cdd, 0x2005, 0xa812,
++	0xa988, 0x9006, 0xa842, 0xa83e, 0x0088, 0xa87c, 0xd0b4, 0x0904,
++	0x1ae4, 0xa988, 0x9006, 0xa842, 0xa83e, 0x2900, 0xa85a, 0xa864,
++	0x9084, 0x000f, 0x9080, 0x1cdd, 0x2005, 0xa812, 0xa916, 0xa87c,
++	0xc0dd, 0xa87e, 0x0005, 0x00f6, 0x2079, 0x0090, 0x782c, 0xd0fc,
++	0x190c, 0x1b25, 0x00e6, 0x2071, 0x1a33, 0x7000, 0x9005, 0x1904,
++	0x198c, 0x7206, 0x9280, 0x0005, 0x204c, 0x9280, 0x0004, 0x2004,
++	0x782b, 0x0004, 0x00f6, 0x2079, 0x0200, 0x7803, 0x0040, 0x00fe,
++	0x00b6, 0x2058, 0xb86c, 0x7836, 0xb890, 0x00be, 0x00f6, 0x2079,
++	0x0200, 0x7803, 0x0040, 0xa001, 0xa001, 0xa001, 0xa001, 0xa001,
++	0xa001, 0x781a, 0x2079, 0x0100, 0x8004, 0x78d6, 0x00fe, 0xa814,
++	0x2050, 0xa858, 0x2040, 0xa810, 0x2060, 0xa064, 0x90ec, 0x000f,
++	0xa944, 0x791a, 0x7116, 0xa848, 0x781e, 0x701a, 0x9006, 0x700e,
++	0x7012, 0x7004, 0xa940, 0xa838, 0x9106, 0x1188, 0xa93c, 0xa834,
++	0x9106, 0x1168, 0x8aff, 0x01a8, 0x0126, 0x2091, 0x8000, 0x00a1,
++	0x0108, 0x0091, 0x012e, 0x9006, 0x00ee, 0x00fe, 0x0005, 0x0036,
++	0x0046, 0xab38, 0xac34, 0x080c, 0x1cfd, 0x004e, 0x003e, 0x0d50,
++	0x0c98, 0x9085, 0x0001, 0x0c80, 0x0076, 0x0066, 0x0056, 0x0046,
++	0x0036, 0x0026, 0x8aff, 0x0904, 0x1add, 0x700c, 0x7214, 0x923a,
++	0x7010, 0x7218, 0x9203, 0x0a04, 0x1adc, 0x9705, 0x0904, 0x1adc,
++	0x903e, 0x2730, 0xa880, 0xd0fc, 0x1190, 0x2d00, 0x0002, 0x1ac0,
++	0x1a07, 0x1a07, 0x1ac0, 0x1ac0, 0x1aa3, 0x1ac0, 0x1a07, 0x1aa9,
++	0x1a56, 0x1a56, 0x1ac0, 0x1ac0, 0x1ac0, 0x1a9d, 0x1a56, 0xc0fc,
++	0xa882, 0xab2c, 0xaa30, 0xad1c, 0xac20, 0xdd9c, 0x0904, 0x1ac2,
++	0x2c05, 0x908a, 0x0034, 0x1a0c, 0x0d84, 0x9082, 0x001b, 0x0002,
++	0x19f3, 0x19f1, 0x19f1, 0x19f1, 0x19f1, 0x19f1, 0x19f7, 0x19f1,
++	0x19f1, 0x19f1, 0x19f1, 0x19f1, 0x19fb, 0x19f1, 0x19f1, 0x19f1,
++	0x19f1, 0x19f1, 0x19ff, 0x19f1, 0x19f1, 0x19f1, 0x19f1, 0x19f1,
++	0x1a03, 0x080c, 0x0d84, 0xa774, 0xa678, 0x0804, 0x1ac2, 0xa78c,
++	0xa690, 0x0804, 0x1ac2, 0xa7a4, 0xa6a8, 0x0804, 0x1ac2, 0xa7bc,
++	0xa6c0, 0x0804, 0x1ac2, 0xa7d4, 0xa6d8, 0x0804, 0x1ac2, 0x2c05,
++	0x908a, 0x0036, 0x1a0c, 0x0d84, 0x9082, 0x001b, 0x0002, 0x1a2a,
++	0x1a2a, 0x1a2c, 0x1a2a, 0x1a2a, 0x1a2a, 0x1a32, 0x1a2a, 0x1a2a,
++	0x1a2a, 0x1a38, 0x1a2a, 0x1a2a, 0x1a2a, 0x1a3e, 0x1a2a, 0x1a2a,
++	0x1a2a, 0x1a44, 0x1a2a, 0x1a2a, 0x1a2a, 0x1a4a, 0x1a2a, 0x1a2a,
++	0x1a2a, 0x1a50, 0x080c, 0x0d84, 0xa574, 0xa478, 0xa37c, 0xa280,
++	0x0804, 0x1ac2, 0xa584, 0xa488, 0xa38c, 0xa290, 0x0804, 0x1ac2,
++	0xa594, 0xa498, 0xa39c, 0xa2a0, 0x0804, 0x1ac2, 0xa5a4, 0xa4a8,
++	0xa3ac, 0xa2b0, 0x0804, 0x1ac2, 0xa5b4, 0xa4b8, 0xa3bc, 0xa2c0,
++	0x0804, 0x1ac2, 0xa5c4, 0xa4c8, 0xa3cc, 0xa2d0, 0x0804, 0x1ac2,
++	0xa5d4, 0xa4d8, 0xa3dc, 0xa2e0, 0x0804, 0x1ac2, 0x2c05, 0x908a,
++	0x0034, 0x1a0c, 0x0d84, 0x9082, 0x001b, 0x0002, 0x1a79, 0x1a77,
++	0x1a77, 0x1a77, 0x1a77, 0x1a77, 0x1a81, 0x1a77, 0x1a77, 0x1a77,
++	0x1a77, 0x1a77, 0x1a88, 0x1a77, 0x1a77, 0x1a77, 0x1a77, 0x1a77,
++	0x1a8f, 0x1a77, 0x1a77, 0x1a77, 0x1a77, 0x1a77, 0x1a96, 0x080c,
++	0x0d84, 0xa56c, 0xa470, 0xa774, 0xa678, 0xa37c, 0xa280, 0x0804,
++	0x1ac2, 0xa584, 0xa488, 0xa78c, 0xa690, 0xa394, 0xa298, 0x04d0,
++	0xa59c, 0xa4a0, 0xa7a4, 0xa6a8, 0xa3ac, 0xa2b0, 0x0498, 0xa5b4,
++	0xa4b8, 0xa7bc, 0xa6c0, 0xa3c4, 0xa2c8, 0x0460, 0xa5cc, 0xa4d0,
++	0xa7d4, 0xa6d8, 0xa3dc, 0xa2e0, 0x0428, 0xa864, 0x9084, 0x00ff,
++	0x9086, 0x001e, 0x11e8, 0x080c, 0x1c9b, 0x1904, 0x19a2, 0x900e,
++	0x04a0, 0xa864, 0x9084, 0x00ff, 0x9086, 0x0048, 0x190c, 0x0d84,
++	0x00c6, 0x7004, 0x2060, 0x6004, 0x9086, 0x0043, 0x00ce, 0x0904,
++	0x1a56, 0xab9c, 0x9016, 0xad8c, 0xac90, 0xaf94, 0xae98, 0x0010,
++	0x080c, 0x0d84, 0x7b12, 0x7a16, 0x7d02, 0x7c06, 0x7f0a, 0x7e0e,
++	0x782b, 0x0001, 0x7000, 0x8000, 0x7002, 0xa83c, 0x9300, 0xa83e,
++	0xa840, 0x9201, 0xa842, 0x700c, 0x9300, 0x700e, 0x7010, 0x9201,
++	0x7012, 0x080c, 0x1c9b, 0x0008, 0x9006, 0x002e, 0x003e, 0x004e,
++	0x005e, 0x006e, 0x007e, 0x0005, 0x080c, 0x0d84, 0x0026, 0x2001,
++	0x0105, 0x2003, 0x0010, 0x782b, 0x0004, 0x7003, 0x0000, 0x7004,
++	0x2060, 0x6014, 0x2048, 0x080c, 0xb0ad, 0x0118, 0xa880, 0xc0bd,
++	0xa882, 0x6020, 0x9086, 0x0006, 0x1180, 0x2061, 0x0100, 0x62c8,
++	0x2001, 0x00fa, 0x8001, 0x1df0, 0x60c8, 0x9206, 0x1dc0, 0x60c4,
++	0xa89a, 0x60c8, 0xa896, 0x7004, 0x2060, 0x00c6, 0x080c, 0xad1e,
++	0x00ce, 0x2001, 0x19c3, 0x2004, 0x9c06, 0x1160, 0x2009, 0x0040,
++	0x080c, 0x2014, 0x080c, 0x901f, 0x2011, 0x0000, 0x080c, 0x8ea3,
++	0x080c, 0x820b, 0x002e, 0x0804, 0x1c4d, 0x0126, 0x2091, 0x2400,
++	0xa858, 0x2040, 0x792c, 0x782b, 0x0002, 0x9184, 0x0700, 0x1904,
++	0x1ae6, 0x7000, 0x0002, 0x1c4d, 0x1b37, 0x1ba0, 0x1c4b, 0x8001,
++	0x7002, 0xd19c, 0x1150, 0x8aff, 0x0590, 0x080c, 0x199c, 0x0904,
++	0x1c4d, 0x080c, 0x199c, 0x0804, 0x1c4d, 0x782b, 0x0004, 0xd194,
++	0x0148, 0xa880, 0xc0fc, 0xa882, 0x8aff, 0x11b8, 0xa87c, 0xc0f5,
++	0xa87e, 0x0098, 0xab3c, 0xaa40, 0x7810, 0xa82e, 0x931a, 0x7814,
++	0xa832, 0x9213, 0x7800, 0xa81e, 0x7804, 0xa822, 0xab3e, 0xaa42,
++	0x080c, 0x1cb3, 0xa880, 0xc0fd, 0xa882, 0x2a00, 0xa816, 0x2800,
++	0xa85a, 0x2c00, 0xa812, 0x7003, 0x0000, 0x0804, 0x1c4d, 0x00f6,
++	0x0026, 0x781c, 0x0006, 0x7818, 0x0006, 0x2079, 0x0100, 0x7a14,
++	0x9284, 0x1984, 0x9085, 0x0012, 0x7816, 0x0036, 0x2019, 0x1000,
++	0x8319, 0x090c, 0x0d84, 0x7820, 0xd0bc, 0x1dd0, 0x003e, 0x79c8,
++	0x000e, 0x9102, 0x001e, 0x0006, 0x0016, 0x79c4, 0x000e, 0x9103,
++	0x78c6, 0x000e, 0x78ca, 0x9284, 0x1984, 0x9085, 0x0012, 0x7816,
++	0x002e, 0x00fe, 0x782b, 0x0008, 0x7003, 0x0000, 0x0804, 0x1c4d,
++	0x8001, 0x7002, 0xd194, 0x0170, 0x782c, 0xd0fc, 0x1904, 0x1b2a,
++	0xd19c, 0x1904, 0x1c49, 0x8aff, 0x0904, 0x1c4d, 0x080c, 0x199c,
++	0x0804, 0x1c4d, 0xab3c, 0xaa40, 0x080c, 0x1cb3, 0xdd9c, 0x1904,
++	0x1c08, 0x2c05, 0x908a, 0x0036, 0x1a0c, 0x0d84, 0x9082, 0x001b,
++	0x0002, 0x1bdc, 0x1bdc, 0x1bde, 0x1bdc, 0x1bdc, 0x1bdc, 0x1be4,
++	0x1bdc, 0x1bdc, 0x1bdc, 0x1bea, 0x1bdc, 0x1bdc, 0x1bdc, 0x1bf0,
++	0x1bdc, 0x1bdc, 0x1bdc, 0x1bf6, 0x1bdc, 0x1bdc, 0x1bdc, 0x1bfc,
++	0x1bdc, 0x1bdc, 0x1bdc, 0x1c02, 0x080c, 0x0d84, 0xa07c, 0x931a,
++	0xa080, 0x9213, 0x0804, 0x1b54, 0xa08c, 0x931a, 0xa090, 0x9213,
++	0x0804, 0x1b54, 0xa09c, 0x931a, 0xa0a0, 0x9213, 0x0804, 0x1b54,
++	0xa0ac, 0x931a, 0xa0b0, 0x9213, 0x0804, 0x1b54, 0xa0bc, 0x931a,
++	0xa0c0, 0x9213, 0x0804, 0x1b54, 0xa0cc, 0x931a, 0xa0d0, 0x9213,
++	0x0804, 0x1b54, 0xa0dc, 0x931a, 0xa0e0, 0x9213, 0x0804, 0x1b54,
++	0x2c05, 0x908a, 0x0034, 0x1a0c, 0x0d84, 0x9082, 0x001b, 0x0002,
++	0x1c2b, 0x1c29, 0x1c29, 0x1c29, 0x1c29, 0x1c29, 0x1c31, 0x1c29,
++	0x1c29, 0x1c29, 0x1c29, 0x1c29, 0x1c37, 0x1c29, 0x1c29, 0x1c29,
++	0x1c29, 0x1c29, 0x1c3d, 0x1c29, 0x1c29, 0x1c29, 0x1c29, 0x1c29,
++	0x1c43, 0x080c, 0x0d84, 0xa07c, 0x931a, 0xa080, 0x9213, 0x0804,
++	0x1b54, 0xa094, 0x931a, 0xa098, 0x9213, 0x0804, 0x1b54, 0xa0ac,
++	0x931a, 0xa0b0, 0x9213, 0x0804, 0x1b54, 0xa0c4, 0x931a, 0xa0c8,
++	0x9213, 0x0804, 0x1b54, 0xa0dc, 0x931a, 0xa0e0, 0x9213, 0x0804,
++	0x1b54, 0x0804, 0x1b52, 0x080c, 0x0d84, 0x012e, 0x0005, 0x00f6,
++	0x00e6, 0x2071, 0x1a33, 0x7000, 0x9086, 0x0000, 0x0904, 0x1c98,
++	0x2079, 0x0090, 0x2009, 0x0207, 0x210c, 0xd194, 0x01b8, 0x2009,
++	0x020c, 0x210c, 0x9184, 0x0003, 0x0188, 0x080c, 0xcd2b, 0x2001,
++	0x0133, 0x2004, 0x9005, 0x090c, 0x0d84, 0x0016, 0x2009, 0x0040,
++	0x080c, 0x2014, 0x001e, 0x2001, 0x020c, 0x2102, 0x2009, 0x0206,
++	0x2104, 0x2009, 0x0203, 0x210c, 0x9106, 0x1120, 0x2009, 0x0040,
++	0x080c, 0x2014, 0x782c, 0xd0fc, 0x09a8, 0x080c, 0x1b25, 0x7000,
++	0x9086, 0x0000, 0x1978, 0x782b, 0x0004, 0x782c, 0xd0ac, 0x1de8,
++	0x2009, 0x0040, 0x080c, 0x2014, 0x782b, 0x0002, 0x7003, 0x0000,
++	0x00ee, 0x00fe, 0x0005, 0x8c60, 0x2c05, 0x9005, 0x0110, 0x8a51,
++	0x0005, 0xa004, 0x9005, 0x0168, 0xa85a, 0x2040, 0xa064, 0x9084,
++	0x000f, 0x9080, 0x1cdd, 0x2065, 0x8cff, 0x090c, 0x0d84, 0x8a51,
++	0x0005, 0x2050, 0x0005, 0x8a50, 0x8c61, 0x2c05, 0x9005, 0x1190,
++	0x2800, 0x9906, 0x0120, 0xa000, 0x9005, 0x1108, 0x2900, 0x2040,
++	0xa85a, 0xa064, 0x9084, 0x000f, 0x9080, 0x1ced, 0x2065, 0x8cff,
++	0x090c, 0x0d84, 0x0005, 0x0000, 0x001d, 0x0021, 0x0025, 0x0029,
++	0x002d, 0x0031, 0x0035, 0x0000, 0x001b, 0x0021, 0x0027, 0x002d,
++	0x0033, 0x0000, 0x0000, 0x0023, 0x0000, 0x0000, 0x1cd0, 0x1ccc,
++	0x0000, 0x0000, 0x1cda, 0x0000, 0x1cd0, 0x1cd7, 0x1cd7, 0x1cd4,
++	0x0000, 0x0000, 0x0000, 0x1cda, 0x1cd7, 0x0000, 0x1cd2, 0x1cd2,
++	0x0000, 0x0000, 0x1cda, 0x0000, 0x1cd2, 0x1cd8, 0x1cd8, 0x1cd8,
++	0x0000, 0x0000, 0x0000, 0x1cda, 0x1cd8, 0x00c6, 0x00d6, 0x0086,
++	0xab42, 0xac3e, 0xa888, 0x9055, 0x0904, 0x1ed4, 0x2940, 0xa064,
++	0x90ec, 0x000f, 0x9de0, 0x1cdd, 0x9d86, 0x0007, 0x0130, 0x9d86,
++	0x000e, 0x0118, 0x9d86, 0x000f, 0x1120, 0xa08c, 0x9422, 0xa090,
++	0x931b, 0x2c05, 0x9065, 0x1140, 0x0310, 0x0804, 0x1ed4, 0xa004,
++	0x9045, 0x0904, 0x1ed4, 0x0c18, 0x2c05, 0x9005, 0x0904, 0x1dbc,
++	0xdd9c, 0x1904, 0x1d78, 0x908a, 0x0036, 0x1a0c, 0x0d84, 0x9082,
++	0x001b, 0x0002, 0x1d4d, 0x1d4d, 0x1d4f, 0x1d4d, 0x1d4d, 0x1d4d,
++	0x1d55, 0x1d4d, 0x1d4d, 0x1d4d, 0x1d5b, 0x1d4d, 0x1d4d, 0x1d4d,
++	0x1d61, 0x1d4d, 0x1d4d, 0x1d4d, 0x1d67, 0x1d4d, 0x1d4d, 0x1d4d,
++	0x1d6d, 0x1d4d, 0x1d4d, 0x1d4d, 0x1d73, 0x080c, 0x0d84, 0xa07c,
++	0x9422, 0xa080, 0x931b, 0x0804, 0x1db2, 0xa08c, 0x9422, 0xa090,
++	0x931b, 0x0804, 0x1db2, 0xa09c, 0x9422, 0xa0a0, 0x931b, 0x0804,
++	0x1db2, 0xa0ac, 0x9422, 0xa0b0, 0x931b, 0x0804, 0x1db2, 0xa0bc,
++	0x9422, 0xa0c0, 0x931b, 0x0804, 0x1db2, 0xa0cc, 0x9422, 0xa0d0,
++	0x931b, 0x0804, 0x1db2, 0xa0dc, 0x9422, 0xa0e0, 0x931b, 0x04d0,
++	0x908a, 0x0034, 0x1a0c, 0x0d84, 0x9082, 0x001b, 0x0002, 0x1d9a,
++	0x1d98, 0x1d98, 0x1d98, 0x1d98, 0x1d98, 0x1d9f, 0x1d98, 0x1d98,
++	0x1d98, 0x1d98, 0x1d98, 0x1da4, 0x1d98, 0x1d98, 0x1d98, 0x1d98,
++	0x1d98, 0x1da9, 0x1d98, 0x1d98, 0x1d98, 0x1d98, 0x1d98, 0x1dae,
++	0x080c, 0x0d84, 0xa07c, 0x9422, 0xa080, 0x931b, 0x0098, 0xa094,
++	0x9422, 0xa098, 0x931b, 0x0070, 0xa0ac, 0x9422, 0xa0b0, 0x931b,
++	0x0048, 0xa0c4, 0x9422, 0xa0c8, 0x931b, 0x0020, 0xa0dc, 0x9422,
++	0xa0e0, 0x931b, 0x0630, 0x2300, 0x9405, 0x0160, 0x8a51, 0x0904,
++	0x1ed4, 0x8c60, 0x0804, 0x1d24, 0xa004, 0x9045, 0x0904, 0x1ed4,
++	0x0804, 0x1d07, 0x8a51, 0x0904, 0x1ed4, 0x8c60, 0x2c05, 0x9005,
++	0x1158, 0xa004, 0x9045, 0x0904, 0x1ed4, 0xa064, 0x90ec, 0x000f,
++	0x9de0, 0x1cdd, 0x2c05, 0x2060, 0xa880, 0xc0fc, 0xa882, 0x0804,
++	0x1ec9, 0x2c05, 0x8422, 0x8420, 0x831a, 0x9399, 0x0000, 0xac2e,
++	0xab32, 0xdd9c, 0x1904, 0x1e66, 0x9082, 0x001b, 0x0002, 0x1e02,
++	0x1e02, 0x1e04, 0x1e02, 0x1e02, 0x1e02, 0x1e12, 0x1e02, 0x1e02,
++	0x1e02, 0x1e20, 0x1e02, 0x1e02, 0x1e02, 0x1e2e, 0x1e02, 0x1e02,
++	0x1e02, 0x1e3c, 0x1e02, 0x1e02, 0x1e02, 0x1e4a, 0x1e02, 0x1e02,
++	0x1e02, 0x1e58, 0x080c, 0x0d84, 0xa17c, 0x2400, 0x9122, 0xa180,
++	0x2300, 0x911b, 0x0a0c, 0x0d84, 0xa074, 0x9420, 0xa078, 0x9319,
++	0x0804, 0x1ec4, 0xa18c, 0x2400, 0x9122, 0xa190, 0x2300, 0x911b,
++	0x0a0c, 0x0d84, 0xa084, 0x9420, 0xa088, 0x9319, 0x0804, 0x1ec4,
++	0xa19c, 0x2400, 0x9122, 0xa1a0, 0x2300, 0x911b, 0x0a0c, 0x0d84,
++	0xa094, 0x9420, 0xa098, 0x9319, 0x0804, 0x1ec4, 0xa1ac, 0x2400,
++	0x9122, 0xa1b0, 0x2300, 0x911b, 0x0a0c, 0x0d84, 0xa0a4, 0x9420,
++	0xa0a8, 0x9319, 0x0804, 0x1ec4, 0xa1bc, 0x2400, 0x9122, 0xa1c0,
++	0x2300, 0x911b, 0x0a0c, 0x0d84, 0xa0b4, 0x9420, 0xa0b8, 0x9319,
++	0x0804, 0x1ec4, 0xa1cc, 0x2400, 0x9122, 0xa1d0, 0x2300, 0x911b,
++	0x0a0c, 0x0d84, 0xa0c4, 0x9420, 0xa0c8, 0x9319, 0x0804, 0x1ec4,
++	0xa1dc, 0x2400, 0x9122, 0xa1e0, 0x2300, 0x911b, 0x0a0c, 0x0d84,
++	0xa0d4, 0x9420, 0xa0d8, 0x9319, 0x0804, 0x1ec4, 0x9082, 0x001b,
++	0x0002, 0x1e84, 0x1e82, 0x1e82, 0x1e82, 0x1e82, 0x1e82, 0x1e91,
++	0x1e82, 0x1e82, 0x1e82, 0x1e82, 0x1e82, 0x1e9e, 0x1e82, 0x1e82,
++	0x1e82, 0x1e82, 0x1e82, 0x1eab, 0x1e82, 0x1e82, 0x1e82, 0x1e82,
++	0x1e82, 0x1eb8, 0x080c, 0x0d84, 0xa17c, 0x2400, 0x9122, 0xa180,
++	0x2300, 0x911b, 0x0a0c, 0x0d84, 0xa06c, 0x9420, 0xa070, 0x9319,
++	0x0498, 0xa194, 0x2400, 0x9122, 0xa198, 0x2300, 0x911b, 0x0a0c,
++	0x0d84, 0xa084, 0x9420, 0xa088, 0x9319, 0x0430, 0xa1ac, 0x2400,
++	0x9122, 0xa1b0, 0x2300, 0x911b, 0x0a0c, 0x0d84, 0xa09c, 0x9420,
++	0xa0a0, 0x9319, 0x00c8, 0xa1c4, 0x2400, 0x9122, 0xa1c8, 0x2300,
++	0x911b, 0x0a0c, 0x0d84, 0xa0b4, 0x9420, 0xa0b8, 0x9319, 0x0060,
++	0xa1dc, 0x2400, 0x9122, 0xa1e0, 0x2300, 0x911b, 0x0a0c, 0x0d84,
++	0xa0cc, 0x9420, 0xa0d0, 0x9319, 0xac1e, 0xab22, 0xa880, 0xc0fd,
++	0xa882, 0x2800, 0xa85a, 0x2c00, 0xa812, 0x2a00, 0xa816, 0x000e,
++	0x000e, 0x000e, 0x9006, 0x0028, 0x008e, 0x00de, 0x00ce, 0x9085,
++	0x0001, 0x0005, 0x2001, 0x0005, 0x2004, 0x9084, 0x0007, 0x0002,
++	0x1ef2, 0x1b25, 0x1ef2, 0x1ee8, 0x1eeb, 0x1eee, 0x1eeb, 0x1eee,
++	0x080c, 0x1b25, 0x0005, 0x080c, 0x1146, 0x0005, 0x080c, 0x1b25,
++	0x080c, 0x1146, 0x0005, 0x0126, 0x2091, 0x2600, 0x2079, 0x0200,
++	0x2071, 0x0260, 0x2069, 0x1800, 0x7817, 0x0000, 0x789b, 0x0814,
++	0x78a3, 0x0406, 0x789f, 0x0410, 0x2009, 0x013b, 0x200b, 0x0400,
++	0x781b, 0x0002, 0x783b, 0x001f, 0x7837, 0x0020, 0x7803, 0x1600,
++	0x012e, 0x0005, 0x2091, 0x2600, 0x781c, 0xd0a4, 0x190c, 0x2011,
++	0x7900, 0xd1dc, 0x1118, 0x9084, 0x0006, 0x001a, 0x9084, 0x000e,
++	0x0002, 0x1f39, 0x1f31, 0x71ab, 0x1f31, 0x1f33, 0x1f33, 0x1f33,
++	0x1f33, 0x7191, 0x1f31, 0x1f35, 0x1f31, 0x1f33, 0x1f31, 0x1f33,
++	0x1f31, 0x080c, 0x0d84, 0x0031, 0x0020, 0x080c, 0x7191, 0x080c,
++	0x71ab, 0x0005, 0x0006, 0x0016, 0x0026, 0x080c, 0xcd2b, 0x7930,
++	0x9184, 0x0003, 0x01c0, 0x2001, 0x19c3, 0x2004, 0x9005, 0x0170,
++	0x2001, 0x0133, 0x2004, 0x9005, 0x090c, 0x0d84, 0x00c6, 0x2001,
++	0x19c3, 0x2064, 0x080c, 0xad1e, 0x00ce, 0x00f8, 0x2009, 0x0040,
++	0x080c, 0x2014, 0x00d0, 0x9184, 0x0014, 0x01a0, 0x6a00, 0x9286,
++	0x0003, 0x0160, 0x080c, 0x6877, 0x1138, 0x080c, 0x6b40, 0x080c,
++	0x56d9, 0x080c, 0x67be, 0x0010, 0x080c, 0x55a0, 0x080c, 0x7243,
++	0x0041, 0x0018, 0x9184, 0x9540, 0x1dc8, 0x002e, 0x001e, 0x000e,
++	0x0005, 0x00e6, 0x0036, 0x0046, 0x0056, 0x2071, 0x1a30, 0x080c,
++	0x1827, 0x005e, 0x004e, 0x003e, 0x00ee, 0x0005, 0x0126, 0x2091,
++	0x2e00, 0x2071, 0x1800, 0x7128, 0x2001, 0x193e, 0x2102, 0x2001,
++	0x1946, 0x2102, 0x2001, 0x013b, 0x2102, 0x2079, 0x0200, 0x2001,
++	0x0201, 0x789e, 0x78a3, 0x0200, 0x9198, 0x0007, 0x831c, 0x831c,
++	0x831c, 0x9398, 0x0005, 0x2320, 0x9182, 0x0204, 0x1230, 0x2011,
++	0x0008, 0x8423, 0x8423, 0x8423, 0x0488, 0x9182, 0x024c, 0x1240,
++	0x2011, 0x0007, 0x8403, 0x8003, 0x9400, 0x9400, 0x9420, 0x0430,
++	0x9182, 0x02bc, 0x1238, 0x2011, 0x0006, 0x8403, 0x8003, 0x9400,
++	0x9420, 0x00e0, 0x9182, 0x034c, 0x1230, 0x2011, 0x0005, 0x8403,
++	0x8003, 0x9420, 0x0098, 0x9182, 0x042c, 0x1228, 0x2011, 0x0004,
++	0x8423, 0x8423, 0x0058, 0x9182, 0x059c, 0x1228, 0x2011, 0x0003,
++	0x8403, 0x9420, 0x0018, 0x2011, 0x0002, 0x8423, 0x9482, 0x0228,
++	0x8002, 0x8020, 0x8301, 0x9402, 0x0110, 0x0208, 0x8321, 0x8217,
++	0x8203, 0x9405, 0x789a, 0x012e, 0x0005, 0x0006, 0x00d6, 0x2069,
++	0x0200, 0x6814, 0x9084, 0xffc0, 0x910d, 0x6916, 0x00de, 0x000e,
++	0x0005, 0x00d6, 0x2069, 0x0200, 0x9005, 0x6810, 0x0110, 0xc0a5,
++	0x0008, 0xc0a4, 0x6812, 0x00de, 0x0005, 0x0006, 0x00d6, 0x2069,
++	0x0200, 0x6810, 0x9084, 0xfff8, 0x910d, 0x6912, 0x00de, 0x000e,
++	0x0005, 0x7938, 0x080c, 0x0d84, 0x00f6, 0x2079, 0x0200, 0x7902,
++	0xa001, 0xa001, 0xa001, 0xa001, 0xa001, 0xa001, 0x7902, 0xa001,
++	0xa001, 0xa001, 0xa001, 0xa001, 0xa001, 0x00fe, 0x0005, 0x0126,
++	0x2091, 0x2800, 0x2061, 0x0100, 0x2071, 0x1800, 0x2009, 0x0000,
++	0x080c, 0x27f5, 0x080c, 0x2718, 0x6054, 0x8004, 0x8004, 0x8004,
++	0x8004, 0x9084, 0x000c, 0x6150, 0x918c, 0xfff3, 0x9105, 0x6052,
++	0x6050, 0x9084, 0xfbff, 0x9085, 0x2000, 0x6052, 0x2009, 0x196a,
++	0x2011, 0x196b, 0x6358, 0x939c, 0x38f0, 0x2320, 0x080c, 0x275c,
++	0x1238, 0x939d, 0x4003, 0x94a5, 0x8603, 0x230a, 0x2412, 0x0030,
++	0x939d, 0x0203, 0x94a5, 0x8603, 0x230a, 0x2412, 0x9006, 0x080c,
++	0x2747, 0x9006, 0x080c, 0x272a, 0x20a9, 0x0012, 0x1d04, 0x2066,
++	0x2091, 0x6000, 0x1f04, 0x2066, 0x602f, 0x0100, 0x602f, 0x0000,
++	0x6050, 0x9085, 0x0400, 0x9084, 0xdfff, 0x6052, 0x6024, 0x6026,
++	0x080c, 0x2436, 0x2009, 0x00ef, 0x6132, 0x6136, 0x080c, 0x2446,
++	0x60e7, 0x0000, 0x61ea, 0x60e3, 0x0008, 0x604b, 0xf7f7, 0x6043,
++	0x0000, 0x602f, 0x0080, 0x602f, 0x0000, 0x6007, 0x049f, 0x60bb,
++	0x0000, 0x20a9, 0x0018, 0x60bf, 0x0000, 0x1f04, 0x2093, 0x60bb,
++	0x0000, 0x60bf, 0x0108, 0x60bf, 0x0012, 0x60bf, 0x0320, 0x60bf,
++	0x0018, 0x601b, 0x00f0, 0x601f, 0x001e, 0x600f, 0x006b, 0x602b,
++	0x402f, 0x012e, 0x0005, 0x00f6, 0x2079, 0x0140, 0x78c3, 0x0080,
++	0x78c3, 0x0083, 0x78c3, 0x0000, 0x00fe, 0x0005, 0x2001, 0x1834,
++	0x2003, 0x0000, 0x2001, 0x1833, 0x2003, 0x0001, 0x0005, 0x0126,
++	0x2091, 0x2800, 0x0006, 0x0016, 0x0026, 0x6124, 0x9184, 0x5e2c,
++	0x1118, 0x9184, 0x0007, 0x002a, 0x9195, 0x0004, 0x9284, 0x0007,
++	0x0002, 0x20f3, 0x20d9, 0x20dc, 0x20df, 0x20e4, 0x20e6, 0x20ea,
++	0x20ee, 0x080c, 0x7ab7, 0x00b8, 0x080c, 0x7b8a, 0x00a0, 0x080c,
++	0x7b8a, 0x080c, 0x7ab7, 0x0078, 0x0099, 0x0068, 0x080c, 0x7ab7,
++	0x0079, 0x0048, 0x080c, 0x7b8a, 0x0059, 0x0028, 0x080c, 0x7b8a,
++	0x080c, 0x7ab7, 0x0029, 0x002e, 0x001e, 0x000e, 0x012e, 0x0005,
++	0x00a6, 0x6124, 0x6028, 0xd09c, 0x0118, 0xd19c, 0x1904, 0x232f,
++	0xd1f4, 0x0110, 0x080c, 0x0d84, 0x080c, 0x6877, 0x05a0, 0x7000,
++	0x9086, 0x0003, 0x01f0, 0x6024, 0x9084, 0x1800, 0x01d0, 0x080c,
++	0x689a, 0x0118, 0x080c, 0x6888, 0x11a0, 0x6027, 0x0020, 0x6043,
++	0x0000, 0x709c, 0x9005, 0x1150, 0x709f, 0x0001, 0x00d6, 0x2069,
++	0x0140, 0x080c, 0x68d0, 0x00de, 0x1904, 0x2332, 0x080c, 0x6b4a,
++	0x0428, 0x080c, 0x689a, 0x1590, 0x6024, 0x9084, 0x1800, 0x1108,
++	0x0468, 0x080c, 0x6b4a, 0x080c, 0x6b40, 0x080c, 0x56d9, 0x080c,
++	0x67be, 0x0804, 0x232f, 0xd1ac, 0x1508, 0x6024, 0xd0dc, 0x1170,
++	0xd0e4, 0x1178, 0xd0d4, 0x1190, 0xd0cc, 0x0130, 0x7090, 0x9086,
++	0x0028, 0x1110, 0x080c, 0x6a2d, 0x0804, 0x232f, 0x080c, 0x6b45,
++	0x0048, 0x2001, 0x194c, 0x2003, 0x0002, 0x0020, 0x080c, 0x69a3,
++	0x0804, 0x232f, 0x080c, 0x6ac8, 0x0804, 0x232f, 0xd1ac, 0x0904,
++	0x224f, 0x080c, 0x6877, 0x11c0, 0x6027, 0x0020, 0x0006, 0x0026,
++	0x0036, 0x080c, 0x6891, 0x1158, 0x080c, 0x6b40, 0x080c, 0x56d9,
++	0x080c, 0x67be, 0x003e, 0x002e, 0x000e, 0x00ae, 0x0005, 0x003e,
++	0x002e, 0x000e, 0x080c, 0x6853, 0x0016, 0x0046, 0x00c6, 0x644c,
++	0x9486, 0xf0f0, 0x1138, 0x2061, 0x0100, 0x644a, 0x6043, 0x0090,
++	0x6043, 0x0010, 0x74d6, 0x948c, 0xff00, 0x7034, 0xd084, 0x0178,
++	0x9186, 0xf800, 0x1160, 0x7040, 0xd084, 0x1148, 0xc085, 0x7042,
++	0x0036, 0x2418, 0x2011, 0x8016, 0x080c, 0x447f, 0x003e, 0x080c,
++	0xb752, 0x1904, 0x222c, 0x9196, 0xff00, 0x05a8, 0x7058, 0x9084,
++	0x00ff, 0x810f, 0x81ff, 0x0110, 0x9116, 0x0568, 0x7130, 0xd184,
++	0x1550, 0x080c, 0x2e69, 0x0128, 0xc18d, 0x7132, 0x080c, 0x5f25,
++	0x1510, 0x6240, 0x9294, 0x0010, 0x0130, 0x6248, 0x9294, 0xff00,
++	0x9296, 0xff00, 0x01c0, 0x7030, 0xd08c, 0x0904, 0x222c, 0x7034,
++	0xd08c, 0x1140, 0x2001, 0x180c, 0x200c, 0xd1ac, 0x1904, 0x222c,
++	0xc1ad, 0x2102, 0x0036, 0x73d4, 0x2011, 0x8013, 0x080c, 0x447f,
++	0x003e, 0x0804, 0x222c, 0x7034, 0xd08c, 0x1140, 0x2001, 0x180c,
++	0x200c, 0xd1ac, 0x1904, 0x222c, 0xc1ad, 0x2102, 0x0036, 0x73d4,
++	0x2011, 0x8013, 0x080c, 0x447f, 0x003e, 0x7130, 0xc185, 0x7132,
++	0x2011, 0x1853, 0x220c, 0xd1a4, 0x01f0, 0x0016, 0x2009, 0x0001,
++	0x2011, 0x0100, 0x080c, 0x7a0a, 0x2019, 0x000e, 0x00c6, 0x2061,
++	0x0000, 0x080c, 0xc941, 0x00ce, 0x9484, 0x00ff, 0x9080, 0x2e6e,
++	0x200d, 0x918c, 0xff00, 0x810f, 0x2120, 0x9006, 0x2009, 0x000e,
++	0x080c, 0xc9c5, 0x001e, 0xd1ac, 0x1140, 0x0016, 0x900e, 0x2019,
++	0x0004, 0x080c, 0x2ce5, 0x001e, 0x0078, 0x0156, 0x00b6, 0x20a9,
++	0x007f, 0x900e, 0x080c, 0x5c0d, 0x1110, 0x080c, 0x56f3, 0x8108,
++	0x1f04, 0x2222, 0x00be, 0x015e, 0x00ce, 0x004e, 0x080c, 0x94da,
++	0x60e3, 0x0000, 0x001e, 0x2001, 0x1800, 0x2014, 0x9296, 0x0004,
++	0x1170, 0xd19c, 0x11a0, 0x2011, 0x180c, 0x2214, 0xd29c, 0x1120,
++	0x6204, 0x9295, 0x0002, 0x6206, 0x6228, 0xc29d, 0x622a, 0x2003,
++	0x0001, 0x2001, 0x1824, 0x2003, 0x0000, 0x6027, 0x0020, 0xd194,
++	0x0904, 0x232f, 0x0016, 0x6220, 0xd2b4, 0x0904, 0x22db, 0x080c,
++	0x7893, 0x080c, 0x8b50, 0x6027, 0x0004, 0x00f6, 0x2019, 0x19bd,
++	0x2304, 0x907d, 0x0904, 0x22ac, 0x7804, 0x9086, 0x0032, 0x1904,
++	0x22ac, 0x00d6, 0x00c6, 0x00e6, 0x0096, 0x2069, 0x0140, 0x7814,
++	0x685e, 0x7808, 0x685a, 0x6043, 0x0002, 0x2001, 0x0003, 0x8001,
++	0x1df0, 0x6043, 0x0000, 0x2001, 0x003c, 0x8001, 0x1df0, 0x2001,
++	0x1000, 0x080c, 0x28a5, 0x9006, 0x080c, 0x28a5, 0x2001, 0x001e,
++	0x8001, 0x0240, 0x20a9, 0x0009, 0x080c, 0x27d0, 0x6904, 0xd1dc,
++	0x1140, 0x0cb0, 0x2001, 0x0100, 0x080c, 0x28a5, 0x9006, 0x080c,
++	0x28a5, 0x080c, 0x8026, 0x080c, 0x8125, 0x7814, 0x2048, 0xa867,
++	0x0103, 0x2f60, 0x080c, 0x9554, 0x009e, 0x00ee, 0x00ce, 0x00de,
++	0x00fe, 0x001e, 0x00ae, 0x0005, 0x00fe, 0x00d6, 0x2069, 0x0140,
++	0x6804, 0x9084, 0x4000, 0x0138, 0x2001, 0x1000, 0x080c, 0x28a5,
++	0x9006, 0x080c, 0x28a5, 0x00de, 0x00c6, 0x2061, 0x19b4, 0x6028,
++	0x909a, 0x00c8, 0x1238, 0x8000, 0x602a, 0x00ce, 0x080c, 0x8b2c,
++	0x0804, 0x232e, 0x2061, 0x0100, 0x62c0, 0x080c, 0x9367, 0x2019,
++	0x19bd, 0x2304, 0x9065, 0x0120, 0x2009, 0x0027, 0x080c, 0x95ce,
++	0x00ce, 0x0804, 0x232e, 0xd2bc, 0x05f0, 0x080c, 0x78a0, 0x6014,
++	0x9084, 0x1984, 0x9085, 0x0010, 0x6016, 0x6027, 0x0004, 0x00d6,
++	0x2069, 0x0140, 0x6804, 0x9084, 0x4000, 0x0138, 0x2001, 0x1000,
++	0x080c, 0x28a5, 0x9006, 0x080c, 0x28a5, 0x00de, 0x00c6, 0x2061,
++	0x19b4, 0x6044, 0x909a, 0x00c8, 0x1608, 0x8000, 0x6046, 0x603c,
++	0x00ce, 0x9005, 0x0558, 0x2009, 0x07d0, 0x080c, 0x7898, 0x9080,
++	0x0008, 0x2004, 0x9086, 0x0006, 0x1138, 0x6114, 0x918c, 0x1984,
++	0x918d, 0x0012, 0x6116, 0x00d0, 0x6114, 0x918c, 0x1984, 0x918d,
++	0x0016, 0x6116, 0x0098, 0x6027, 0x0004, 0x0080, 0x0036, 0x2019,
++	0x0001, 0x080c, 0x8dfe, 0x003e, 0x2019, 0x19c3, 0x2304, 0x9065,
++	0x0120, 0x2009, 0x004f, 0x080c, 0x95ce, 0x00ce, 0x001e, 0xd19c,
++	0x0904, 0x23a1, 0x7034, 0xd0ac, 0x1904, 0x2376, 0x0016, 0x0156,
++	0x6027, 0x0008, 0x6050, 0x9085, 0x0040, 0x6052, 0x6050, 0x9084,
++	0xfbcf, 0x6052, 0x080c, 0x27ef, 0x9085, 0x2000, 0x6052, 0x20a9,
++	0x0012, 0x1d04, 0x2349, 0x080c, 0x78c7, 0x1f04, 0x2349, 0x6050,
++	0x9085, 0x0400, 0x9084, 0xdfbf, 0x6052, 0x20a9, 0x0028, 0xa001,
++	0x1f04, 0x2357, 0x6150, 0x9185, 0x1400, 0x6052, 0x20a9, 0x0366,
++	0x1d04, 0x2360, 0x080c, 0x78c7, 0x6020, 0xd09c, 0x1130, 0x015e,
++	0x6152, 0x001e, 0x6027, 0x0008, 0x04a0, 0x080c, 0x27b7, 0x1f04,
++	0x2360, 0x015e, 0x6152, 0x001e, 0x6027, 0x0008, 0x0016, 0x6028,
++	0xc09c, 0x602a, 0x080c, 0x94da, 0x60e3, 0x0000, 0x080c, 0xcd0a,
++	0x080c, 0xcd25, 0x080c, 0x4dee, 0xd0fc, 0x1138, 0x080c, 0xb752,
++	0x1120, 0x9085, 0x0001, 0x080c, 0x68c0, 0x9006, 0x080c, 0x28a5,
++	0x2009, 0x0002, 0x080c, 0x27f5, 0x00e6, 0x2071, 0x1800, 0x7003,
++	0x0004, 0x080c, 0x0e3b, 0x00ee, 0x6027, 0x0008, 0x080c, 0x0b69,
++	0x001e, 0x918c, 0xffd0, 0x6126, 0x00ae, 0x0005, 0x0006, 0x0016,
++	0x0026, 0x0036, 0x00e6, 0x00f6, 0x0126, 0x2091, 0x8000, 0x2071,
++	0x1800, 0x71cc, 0x70ce, 0x9116, 0x0904, 0x23f5, 0x81ff, 0x01a0,
++	0x2009, 0x0000, 0x080c, 0x27f5, 0x2011, 0x8011, 0x2019, 0x010e,
++	0x231c, 0x939e, 0x0007, 0x1118, 0x2019, 0x0001, 0x0010, 0x2019,
++	0x0000, 0x080c, 0x447f, 0x0448, 0x2001, 0x1975, 0x200c, 0x81ff,
++	0x1140, 0x2001, 0x0109, 0x2004, 0xd0b4, 0x0118, 0x2019, 0x0003,
++	0x0008, 0x2118, 0x2011, 0x8012, 0x080c, 0x447f, 0x080c, 0x0e3b,
++	0x080c, 0x4dee, 0xd0fc, 0x1188, 0x080c, 0xb752, 0x1170, 0x00c6,
++	0x080c, 0x2491, 0x080c, 0x8d36, 0x2061, 0x0100, 0x2019, 0x0028,
++	0x2009, 0x0002, 0x080c, 0x2ce5, 0x00ce, 0x012e, 0x00fe, 0x00ee,
++	0x003e, 0x002e, 0x001e, 0x000e, 0x0005, 0x2028, 0x918c, 0x00ff,
++	0x2130, 0x9094, 0xff00, 0x11f0, 0x2011, 0x1836, 0x2214, 0xd2ac,
++	0x11c8, 0x81ff, 0x01e8, 0x2011, 0x181d, 0x2204, 0x9106, 0x1190,
++	0x2011, 0x181e, 0x2214, 0x9294, 0xff00, 0x9584, 0xff00, 0x9206,
++	0x1148, 0x2011, 0x181e, 0x2214, 0x9294, 0x00ff, 0x9584, 0x00ff,
++	0x9206, 0x1120, 0x2500, 0x080c, 0x745f, 0x0048, 0x9584, 0x00ff,
++	0x9080, 0x2e6e, 0x200d, 0x918c, 0xff00, 0x810f, 0x9006, 0x0005,
++	0x9080, 0x2e6e, 0x200d, 0x918c, 0x00ff, 0x0005, 0x00d6, 0x2069,
++	0x0140, 0x2001, 0x1816, 0x2003, 0x00ef, 0x20a9, 0x0010, 0x9006,
++	0x6852, 0x6856, 0x1f04, 0x2441, 0x00de, 0x0005, 0x0006, 0x00d6,
++	0x0026, 0x2069, 0x0140, 0x2001, 0x1816, 0x2102, 0x8114, 0x8214,
++	0x8214, 0x8214, 0x20a9, 0x0010, 0x6853, 0x0000, 0x9006, 0x82ff,
++	0x1128, 0x9184, 0x000f, 0x9080, 0xd10f, 0x2005, 0x6856, 0x8211,
++	0x1f04, 0x2456, 0x002e, 0x00de, 0x000e, 0x0005, 0x00c6, 0x2061,
++	0x1800, 0x6030, 0x0110, 0xc09d, 0x0008, 0xc09c, 0x6032, 0x00ce,
++	0x0005, 0x0156, 0x00d6, 0x0026, 0x0016, 0x0006, 0x2069, 0x0140,
++	0x6980, 0x9116, 0x0180, 0x9112, 0x1230, 0x8212, 0x8210, 0x22a8,
++	0x2001, 0x0402, 0x0018, 0x22a8, 0x2001, 0x0404, 0x680e, 0x1f04,
++	0x2486, 0x680f, 0x0000, 0x000e, 0x001e, 0x002e, 0x00de, 0x015e,
++	0x0005, 0x080c, 0x4dea, 0xd0c4, 0x0150, 0xd0a4, 0x0140, 0x9006,
++	0x0046, 0x2020, 0x2009, 0x002e, 0x080c, 0xc9c5, 0x004e, 0x0005,
++	0x00f6, 0x0016, 0x0026, 0x2079, 0x0140, 0x78c4, 0xd0dc, 0x0904,
++	0x24fd, 0x080c, 0x275c, 0x0660, 0x9084, 0x0700, 0x908e, 0x0600,
++	0x1120, 0x2011, 0x4000, 0x900e, 0x0458, 0x908e, 0x0500, 0x1120,
++	0x2011, 0x8000, 0x900e, 0x0420, 0x908e, 0x0400, 0x1120, 0x9016,
++	0x2009, 0x0001, 0x00e8, 0x908e, 0x0300, 0x1120, 0x9016, 0x2009,
++	0x0002, 0x00b0, 0x908e, 0x0200, 0x1120, 0x9016, 0x2009, 0x0004,
++	0x0078, 0x908e, 0x0100, 0x1548, 0x9016, 0x2009, 0x0008, 0x0040,
++	0x9084, 0x0700, 0x908e, 0x0300, 0x1500, 0x2011, 0x0030, 0x0058,
++	0x2300, 0x9080, 0x0020, 0x2018, 0x080c, 0x7a4b, 0x928c, 0xff00,
++	0x0110, 0x2011, 0x00ff, 0x2200, 0x8007, 0x9085, 0x004c, 0x78c2,
++	0x2009, 0x0138, 0x220a, 0x080c, 0x6877, 0x1118, 0x2009, 0x193c,
++	0x220a, 0x002e, 0x001e, 0x00fe, 0x0005, 0x78c3, 0x0000, 0x0cc8,
++	0x0126, 0x2091, 0x2800, 0x0006, 0x0016, 0x0026, 0x2001, 0x0170,
++	0x200c, 0x8000, 0x2014, 0x9184, 0x0003, 0x0110, 0x080c, 0x0d84,
++	0x002e, 0x001e, 0x000e, 0x012e, 0x0005, 0x2001, 0x0171, 0x2004,
++	0xd0dc, 0x0168, 0x2001, 0x0170, 0x200c, 0x918c, 0x00ff, 0x918e,
++	0x004c, 0x1128, 0x200c, 0x918c, 0xff00, 0x810f, 0x0005, 0x900e,
++	0x2001, 0x0227, 0x2004, 0x8007, 0x9084, 0x00ff, 0x8004, 0x9108,
++	0x2001, 0x0226, 0x2004, 0x8007, 0x9084, 0x00ff, 0x8004, 0x9108,
++	0x0005, 0x0018, 0x000c, 0x0018, 0x0020, 0x1000, 0x0800, 0x1000,
++	0x1800, 0x0156, 0x0006, 0x0016, 0x0026, 0x00e6, 0x2001, 0x195d,
++	0x2004, 0x908a, 0x0007, 0x1a0c, 0x0d84, 0x0033, 0x00ee, 0x002e,
++	0x001e, 0x000e, 0x015e, 0x0005, 0x255b, 0x2579, 0x259d, 0x259f,
++	0x25c8, 0x25ca, 0x25cc, 0x2001, 0x0001, 0x080c, 0x23a6, 0x080c,
++	0x27b2, 0x2001, 0x195f, 0x2003, 0x0000, 0x7828, 0x9084, 0xe1d7,
++	0x782a, 0x9006, 0x20a9, 0x0009, 0x080c, 0x2770, 0x2001, 0x195d,
++	0x2003, 0x0006, 0x2009, 0x001e, 0x2011, 0x25cd, 0x080c, 0x78a5,
++	0x0005, 0x2009, 0x1962, 0x200b, 0x0000, 0x2001, 0x1967, 0x2003,
++	0x0036, 0x2001, 0x1966, 0x2003, 0x002a, 0x2001, 0x195f, 0x2003,
++	0x0001, 0x9006, 0x080c, 0x272a, 0x2001, 0xffff, 0x20a9, 0x0009,
++	0x080c, 0x2770, 0x2001, 0x195d, 0x2003, 0x0006, 0x2009, 0x001e,
++	0x2011, 0x25cd, 0x080c, 0x78a5, 0x0005, 0x080c, 0x0d84, 0x2001,
++	0x1967, 0x2003, 0x0036, 0x2001, 0x195f, 0x2003, 0x0003, 0x7a38,
++	0x9294, 0x0005, 0x9296, 0x0004, 0x0110, 0x9006, 0x0010, 0x2001,
++	0x0001, 0x080c, 0x272a, 0x2001, 0x1963, 0x2003, 0x0000, 0x2001,
++	0xffff, 0x20a9, 0x0009, 0x080c, 0x2770, 0x2001, 0x195d, 0x2003,
++	0x0006, 0x2009, 0x001e, 0x2011, 0x25cd, 0x080c, 0x78a5, 0x0005,
++	0x080c, 0x0d84, 0x080c, 0x0d84, 0x0005, 0x0006, 0x0016, 0x0026,
++	0x00e6, 0x00f6, 0x0156, 0x0126, 0x2091, 0x8000, 0x2079, 0x0100,
++	0x2001, 0x195f, 0x2004, 0x908a, 0x0007, 0x1a0c, 0x0d84, 0x0043,
++	0x012e, 0x015e, 0x00fe, 0x00ee, 0x002e, 0x001e, 0x000e, 0x0005,
++	0x25ef, 0x260f, 0x264f, 0x267f, 0x26a3, 0x26b3, 0x26b5, 0x080c,
++	0x2764, 0x11b0, 0x7850, 0x9084, 0xefff, 0x7852, 0x2009, 0x1965,
++	0x2104, 0x7a38, 0x9294, 0x0005, 0x9296, 0x0004, 0x0110, 0xc08d,
++	0x0008, 0xc085, 0x200a, 0x2001, 0x195d, 0x2003, 0x0001, 0x0030,
++	0x080c, 0x26d9, 0x2001, 0xffff, 0x080c, 0x256a, 0x0005, 0x080c,
++	0x26b7, 0x05e0, 0x2009, 0x1966, 0x2104, 0x8001, 0x200a, 0x080c,
++	0x2764, 0x1178, 0x7850, 0x9084, 0xefff, 0x7852, 0x7a38, 0x9294,
++	0x0005, 0x9296, 0x0005, 0x0518, 0x2009, 0x1965, 0x2104, 0xc085,
++	0x200a, 0x2009, 0x1962, 0x2104, 0x8000, 0x200a, 0x9086, 0x0005,
++	0x0118, 0x080c, 0x26bf, 0x00c0, 0x200b, 0x0000, 0x7a38, 0x9294,
++	0x0006, 0x9296, 0x0004, 0x0110, 0x9006, 0x0010, 0x2001, 0x0001,
++	0x080c, 0x2747, 0x2001, 0x195f, 0x2003, 0x0002, 0x0028, 0x2001,
++	0x195d, 0x2003, 0x0003, 0x0010, 0x080c, 0x258c, 0x0005, 0x080c,
++	0x26b7, 0x0560, 0x2009, 0x1966, 0x2104, 0x8001, 0x200a, 0x080c,
++	0x2764, 0x1168, 0x7850, 0x9084, 0xefff, 0x7852, 0x2001, 0x195d,
++	0x2003, 0x0003, 0x2001, 0x195e, 0x2003, 0x0000, 0x00b8, 0x2009,
++	0x1966, 0x2104, 0x9005, 0x1118, 0x080c, 0x26fc, 0x0010, 0x080c,
++	0x26cc, 0x080c, 0x26bf, 0x2009, 0x1962, 0x200b, 0x0000, 0x2001,
++	0x195f, 0x2003, 0x0001, 0x080c, 0x258c, 0x0000, 0x0005, 0x04b9,
++	0x0508, 0x080c, 0x2764, 0x11b8, 0x7850, 0x9084, 0xefff, 0x7852,
++	0x2009, 0x1963, 0x2104, 0x8000, 0x200a, 0x9086, 0x0007, 0x0108,
++	0x0078, 0x2001, 0x1968, 0x2003, 0x000a, 0x2009, 0x1965, 0x2104,
++	0xc0fd, 0x200a, 0x0038, 0x0419, 0x2001, 0x195f, 0x2003, 0x0004,
++	0x080c, 0x25b7, 0x0005, 0x0099, 0x0168, 0x080c, 0x2764, 0x1138,
++	0x7850, 0x9084, 0xefff, 0x7852, 0x080c, 0x25a3, 0x0018, 0x0079,
++	0x080c, 0x25b7, 0x0005, 0x080c, 0x0d84, 0x080c, 0x0d84, 0x2009,
++	0x1967, 0x2104, 0x8001, 0x200a, 0x090c, 0x2718, 0x0005, 0x7a38,
++	0x9294, 0x0005, 0x9296, 0x0005, 0x0110, 0x9006, 0x0010, 0x2001,
++	0x0001, 0x080c, 0x2747, 0x0005, 0x7a38, 0x9294, 0x0006, 0x9296,
++	0x0006, 0x0110, 0x9006, 0x0010, 0x2001, 0x0001, 0x080c, 0x272a,
++	0x0005, 0x2009, 0x1962, 0x2104, 0x8000, 0x200a, 0x9086, 0x0005,
++	0x0108, 0x0068, 0x200b, 0x0000, 0x7a38, 0x9294, 0x0006, 0x9296,
++	0x0006, 0x0110, 0x9006, 0x0010, 0x2001, 0x0001, 0x04d9, 0x7a38,
++	0x9294, 0x0005, 0x9296, 0x0005, 0x0110, 0x9006, 0x0010, 0x2001,
++	0x0001, 0x080c, 0x2747, 0x0005, 0x0086, 0x2001, 0x1965, 0x2004,
++	0x9084, 0x7fff, 0x090c, 0x0d84, 0x2009, 0x1964, 0x2144, 0x8846,
++	0x280a, 0x9844, 0x0dd8, 0xd08c, 0x1120, 0xd084, 0x1120, 0x080c,
++	0x0d84, 0x9006, 0x0010, 0x2001, 0x0001, 0x00a1, 0x008e, 0x0005,
++	0x0006, 0x0156, 0x2001, 0x195d, 0x20a9, 0x0009, 0x2003, 0x0000,
++	0x8000, 0x1f04, 0x271e, 0x2001, 0x1964, 0x2003, 0x8000, 0x015e,
++	0x000e, 0x0005, 0x00f6, 0x2079, 0x0100, 0x9085, 0x0000, 0x0158,
++	0x7838, 0x9084, 0xfff9, 0x9085, 0x0004, 0x783a, 0x2009, 0x196a,
++	0x210c, 0x795a, 0x0050, 0x7838, 0x9084, 0xfffb, 0x9085, 0x0006,
++	0x783a, 0x2009, 0x196b, 0x210c, 0x795a, 0x00fe, 0x0005, 0x00f6,
++	0x2079, 0x0100, 0x9085, 0x0000, 0x0138, 0x7838, 0x9084, 0xfffa,
++	0x9085, 0x0004, 0x783a, 0x0030, 0x7838, 0x9084, 0xfffb, 0x9085,
++	0x0005, 0x783a, 0x00fe, 0x0005, 0x0006, 0x2001, 0x0100, 0x2004,
++	0x9082, 0x0007, 0x000e, 0x0005, 0x0156, 0x20a9, 0x0064, 0x7820,
++	0x080c, 0x27ef, 0xd09c, 0x1110, 0x1f04, 0x2767, 0x015e, 0x0005,
++	0x0126, 0x0016, 0x0006, 0x2091, 0x8000, 0x7850, 0x9085, 0x0040,
++	0x7852, 0x7850, 0x9084, 0xfbcf, 0x7852, 0x080c, 0x27ef, 0x9085,
++	0x2000, 0x7852, 0x000e, 0x2008, 0x9186, 0x0000, 0x1118, 0x783b,
++	0x0007, 0x0090, 0x9186, 0x0001, 0x1118, 0x783b, 0x0006, 0x0060,
++	0x9186, 0x0002, 0x1118, 0x783b, 0x0005, 0x0030, 0x9186, 0x0003,
++	0x1118, 0x783b, 0x0004, 0x0000, 0x0006, 0x1d04, 0x279d, 0x080c,
++	0x78c7, 0x1f04, 0x279d, 0x7850, 0x9085, 0x0400, 0x9084, 0xdfbf,
++	0x7852, 0x080c, 0x27ef, 0x9085, 0x1000, 0x7852, 0x000e, 0x001e,
++	0x012e, 0x0005, 0x7850, 0x9084, 0xffcf, 0x7852, 0x0005, 0x0006,
++	0x0156, 0x00f6, 0x2079, 0x0100, 0x20a9, 0x000a, 0x7854, 0xd0ac,
++	0x1130, 0x7820, 0xd0e4, 0x1140, 0x1f04, 0x27c1, 0x0028, 0x7854,
++	0xd08c, 0x1110, 0x1f04, 0x27c7, 0x00fe, 0x015e, 0x000e, 0x0005,
++	0x1d04, 0x27d0, 0x080c, 0x78c7, 0x1f04, 0x27d0, 0x0005, 0x0006,
++	0x2001, 0x1969, 0x2004, 0x9086, 0x0000, 0x000e, 0x0005, 0x0006,
++	0x2001, 0x1969, 0x2004, 0x9086, 0x0001, 0x000e, 0x0005, 0x0006,
++	0x2001, 0x1969, 0x2004, 0x9086, 0x0002, 0x000e, 0x0005, 0xa001,
++	0xa001, 0xa001, 0xa001, 0xa001, 0x0005, 0x0006, 0x2001, 0x1975,
++	0x2102, 0x000e, 0x0005, 0x2009, 0x0171, 0x2104, 0xd0dc, 0x0140,
++	0x2009, 0x0170, 0x2104, 0x200b, 0x0080, 0xa001, 0xa001, 0x200a,
++	0x0005, 0x0036, 0x0046, 0x2001, 0x0141, 0x200c, 0x918c, 0xff00,
++	0x9186, 0x2000, 0x0118, 0x9186, 0x0100, 0x1580, 0x2009, 0x017f,
++	0x200b, 0x00a2, 0x2019, 0x0160, 0x2324, 0x2011, 0x0003, 0x2009,
++	0x0169, 0x2104, 0xa001, 0x210c, 0x910e, 0x1dc8, 0x9084, 0x0007,
++	0x9086, 0x0003, 0x11b8, 0x2304, 0x9402, 0x02a0, 0x1d68, 0x8211,
++	0x1d70, 0x84ff, 0x0170, 0x2001, 0x0141, 0x200c, 0x918c, 0xff00,
++	0x9186, 0x0100, 0x0130, 0x2009, 0x180c, 0x2104, 0xc0dd, 0x200a,
++	0x0008, 0x0419, 0x2001, 0x017f, 0x2003, 0x0000, 0x004e, 0x003e,
++	0x0005, 0x2001, 0x180c, 0x2004, 0xd0dc, 0x01b0, 0x2001, 0x0160,
++	0x2004, 0x9005, 0x0140, 0x2001, 0x0141, 0x2004, 0x9084, 0xff00,
++	0x9086, 0x0100, 0x1148, 0x0126, 0x2091, 0x8000, 0x0016, 0x0026,
++	0x0021, 0x002e, 0x001e, 0x012e, 0x0005, 0x00c6, 0x2061, 0x0100,
++	0x6014, 0x0006, 0x2001, 0x0161, 0x2003, 0x0000, 0x6017, 0x0018,
++	0xa001, 0xa001, 0x602f, 0x0008, 0x6104, 0x918e, 0x0010, 0x6106,
++	0x918e, 0x0010, 0x6106, 0x6017, 0x0040, 0x2001, 0x1000, 0x0429,
++	0x9006, 0x0419, 0x001e, 0x9184, 0x0003, 0x01c0, 0x0036, 0x2019,
++	0x0141, 0x2304, 0x9084, 0xff00, 0x9086, 0x0800, 0x1dd0, 0x919c,
++	0xffe4, 0x9184, 0x0001, 0x0118, 0x9385, 0x0009, 0x6016, 0x9184,
++	0x0002, 0x0118, 0x9385, 0x0012, 0x6016, 0x003e, 0x2001, 0x180c,
++	0x200c, 0xc1dc, 0x2102, 0x00ce, 0x0005, 0x0016, 0x0026, 0x2009,
++	0x0140, 0x2114, 0x9294, 0x0001, 0x9215, 0x220a, 0x002e, 0x001e,
++	0x0005, 0x2b1d, 0x2b1d, 0x2941, 0x2941, 0x294d, 0x294d, 0x2959,
++	0x2959, 0x2967, 0x2967, 0x2973, 0x2973, 0x2981, 0x2981, 0x298f,
++	0x298f, 0x29a1, 0x29a1, 0x29ad, 0x29ad, 0x29bb, 0x29bb, 0x29d9,
++	0x29d9, 0x29f9, 0x29f9, 0x29c9, 0x29c9, 0x29e9, 0x29e9, 0x2a07,
++	0x2a07, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f,
++	0x299f, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f,
++	0x299f, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f,
++	0x299f, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f,
++	0x299f, 0x2a19, 0x2a19, 0x2a25, 0x2a25, 0x2a33, 0x2a33, 0x2a41,
++	0x2a41, 0x2a51, 0x2a51, 0x2a5f, 0x2a5f, 0x2a6f, 0x2a6f, 0x2a7f,
++	0x2a7f, 0x2a91, 0x2a91, 0x2a9f, 0x2a9f, 0x2aaf, 0x2aaf, 0x2ad1,
++	0x2ad1, 0x2af3, 0x2af3, 0x2abf, 0x2abf, 0x2ae2, 0x2ae2, 0x2b02,
++	0x2b02, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f,
++	0x299f, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f,
++	0x299f, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f,
++	0x299f, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f,
++	0x299f, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f,
++	0x299f, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f, 0x299f,
++	0x299f, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146,
++	0x0156, 0x080c, 0x20bf, 0x0804, 0x2b15, 0x0106, 0x0006, 0x0126,
++	0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c, 0x1eda, 0x0804,
++	0x2b15, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146,
++	0x0156, 0x080c, 0x1eda, 0x080c, 0x20bf, 0x0804, 0x2b15, 0x0106,
++	0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c,
++	0x1f12, 0x0804, 0x2b15, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6,
++	0x0136, 0x0146, 0x0156, 0x080c, 0x20bf, 0x080c, 0x1f12, 0x0804,
++	0x2b15, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146,
++	0x0156, 0x080c, 0x1eda, 0x080c, 0x1f12, 0x0804, 0x2b15, 0x0106,
++	0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c,
++	0x1eda, 0x080c, 0x20bf, 0x080c, 0x1f12, 0x0804, 0x2b15, 0xa001,
++	0x0cf0, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146,
++	0x0156, 0x080c, 0x129f, 0x0804, 0x2b15, 0x0106, 0x0006, 0x0126,
++	0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c, 0x20bf, 0x080c,
++	0x129f, 0x0804, 0x2b15, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6,
++	0x0136, 0x0146, 0x0156, 0x080c, 0x1eda, 0x080c, 0x129f, 0x0804,
++	0x2b15, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146,
++	0x0156, 0x080c, 0x20bf, 0x080c, 0x129f, 0x080c, 0x1f12, 0x0804,
++	0x2b15, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146,
++	0x0156, 0x080c, 0x1eda, 0x080c, 0x20bf, 0x080c, 0x129f, 0x0804,
++	0x2b15, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146,
++	0x0156, 0x080c, 0x1eda, 0x080c, 0x129f, 0x080c, 0x1f12, 0x0804,
++	0x2b15, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146,
++	0x0156, 0x080c, 0x129f, 0x080c, 0x1f12, 0x0804, 0x2b15, 0x0106,
++	0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c,
++	0x1eda, 0x080c, 0x20bf, 0x080c, 0x129f, 0x080c, 0x1f12, 0x0804,
++	0x2b15, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146,
++	0x0156, 0x080c, 0x2500, 0x0804, 0x2b15, 0x0106, 0x0006, 0x0126,
++	0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c, 0x2500, 0x080c,
++	0x20bf, 0x0804, 0x2b15, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6,
++	0x0136, 0x0146, 0x0156, 0x080c, 0x2500, 0x080c, 0x1eda, 0x0804,
++	0x2b15, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146,
++	0x0156, 0x080c, 0x2500, 0x080c, 0x1eda, 0x080c, 0x20bf, 0x0804,
++	0x2b15, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146,
++	0x0156, 0x080c, 0x2500, 0x080c, 0x1f12, 0x0804, 0x2b15, 0x0106,
++	0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c,
++	0x2500, 0x080c, 0x20bf, 0x080c, 0x1f12, 0x0804, 0x2b15, 0x0106,
++	0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c,
++	0x2500, 0x080c, 0x1eda, 0x080c, 0x1f12, 0x0804, 0x2b15, 0x0106,
++	0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c,
++	0x2500, 0x080c, 0x1eda, 0x080c, 0x20bf, 0x080c, 0x1f12, 0x0804,
++	0x2b15, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146,
++	0x0156, 0x080c, 0x2500, 0x080c, 0x129f, 0x0804, 0x2b15, 0x0106,
++	0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c,
++	0x2500, 0x080c, 0x20bf, 0x080c, 0x129f, 0x0804, 0x2b15, 0x0106,
++	0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c,
++	0x2500, 0x080c, 0x1eda, 0x080c, 0x129f, 0x0804, 0x2b15, 0x0106,
++	0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x0156, 0x080c,
++	0x2500, 0x080c, 0x20bf, 0x080c, 0x129f, 0x080c, 0x1f12, 0x0804,
++	0x2b15, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136, 0x0146,
++	0x0156, 0x080c, 0x2500, 0x080c, 0x1eda, 0x080c, 0x20bf, 0x080c,
++	0x129f, 0x0498, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136,
++	0x0146, 0x0156, 0x080c, 0x2500, 0x080c, 0x1eda, 0x080c, 0x129f,
++	0x080c, 0x1f12, 0x0410, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6,
++	0x0136, 0x0146, 0x0156, 0x080c, 0x2500, 0x080c, 0x129f, 0x080c,
++	0x1f12, 0x0098, 0x0106, 0x0006, 0x0126, 0x01c6, 0x01d6, 0x0136,
++	0x0146, 0x0156, 0x080c, 0x2500, 0x080c, 0x1eda, 0x080c, 0x20bf,
++	0x080c, 0x129f, 0x080c, 0x1f12, 0x0000, 0x015e, 0x014e, 0x013e,
++	0x01de, 0x01ce, 0x012e, 0x000e, 0x010e, 0x000d, 0x00b6, 0x00c6,
++	0x0026, 0x0046, 0x9026, 0x080c, 0x5eeb, 0x1904, 0x2c03, 0x72d8,
++	0x2001, 0x194b, 0x2004, 0x9005, 0x1110, 0xd29c, 0x0148, 0xd284,
++	0x1138, 0xd2bc, 0x1904, 0x2c03, 0x080c, 0x2c08, 0x0804, 0x2c03,
++	0xd2cc, 0x1904, 0x2c03, 0x080c, 0x6877, 0x1120, 0x70a7, 0xffff,
++	0x0804, 0x2c03, 0xd294, 0x0120, 0x70a7, 0xffff, 0x0804, 0x2c03,
++	0x080c, 0x2e64, 0x0140, 0x080c, 0xb759, 0x1904, 0x2ba4, 0x70a7,
++	0xffff, 0x0804, 0x2c03, 0x2001, 0x1816, 0x203c, 0x728c, 0xd284,
++	0x0904, 0x2ba4, 0xd28c, 0x1904, 0x2ba4, 0x0036, 0x73a4, 0x938e,
++	0xffff, 0x1110, 0x2019, 0x0001, 0x8314, 0x92e0, 0x1c80, 0x2c04,
++	0x938c, 0x0001, 0x0120, 0x9084, 0xff00, 0x8007, 0x0010, 0x9084,
++	0x00ff, 0x970e, 0x0540, 0x908e, 0x0000, 0x0528, 0x908e, 0x00ff,
++	0x1150, 0x7230, 0xd284, 0x1518, 0x728c, 0xc28d, 0x728e, 0x70a7,
++	0xffff, 0x003e, 0x0408, 0x900e, 0x080c, 0x23fd, 0x080c, 0x5bb0,
++	0x11a0, 0x080c, 0x5f2d, 0x1150, 0x7030, 0xd08c, 0x0118, 0xb800,
++	0xd0bc, 0x0120, 0x080c, 0x2c1f, 0x0140, 0x0028, 0x080c, 0x2d5b,
++	0x080c, 0x2c4b, 0x0110, 0x8318, 0x0838, 0x73a6, 0x0010, 0x70a7,
++	0xffff, 0x003e, 0x0804, 0x2c03, 0x9780, 0x2e6e, 0x203d, 0x97bc,
++	0xff00, 0x873f, 0x2041, 0x007e, 0x70a4, 0x9096, 0xffff, 0x1118,
++	0x900e, 0x28a8, 0x0050, 0x9812, 0x0220, 0x2008, 0x9802, 0x20a8,
++	0x0020, 0x70a7, 0xffff, 0x0804, 0x2c03, 0x2700, 0x0156, 0x0016,
++	0x9106, 0x05b0, 0xc484, 0x080c, 0x5c0d, 0x0138, 0x080c, 0xb759,
++	0x1578, 0x080c, 0x5bb0, 0x15a0, 0x0008, 0xc485, 0x080c, 0x5f2d,
++	0x1130, 0x7030, 0xd08c, 0x01f8, 0xb800, 0xd0bc, 0x11e0, 0x728c,
++	0xd28c, 0x0180, 0x080c, 0x5f2d, 0x9082, 0x0006, 0x02c8, 0xd484,
++	0x1118, 0x080c, 0x5bd1, 0x0028, 0x080c, 0x2de6, 0x0188, 0x080c,
++	0x2e11, 0x0070, 0x080c, 0x2d5b, 0x080c, 0xb759, 0x1148, 0x080c,
++	0x2c4b, 0x0170, 0x0028, 0x080c, 0x2de6, 0x0110, 0x0441, 0x0140,
++	0x001e, 0x8108, 0x015e, 0x1f04, 0x2bbd, 0x70a7, 0xffff, 0x0018,
++	0x001e, 0x015e, 0x71a6, 0x004e, 0x002e, 0x00ce, 0x00be, 0x0005,
++	0x00c6, 0x0016, 0x70a7, 0x0001, 0x2009, 0x007e, 0x080c, 0x5bb0,
++	0x1158, 0xb813, 0x00ff, 0xb817, 0xfffe, 0x080c, 0x2d5b, 0x0499,
++	0x0118, 0x70d8, 0xc0bd, 0x70da, 0x001e, 0x00ce, 0x0005, 0x0016,
++	0x0076, 0x00d6, 0x00c6, 0x2001, 0x1857, 0x2004, 0x9084, 0x00ff,
++	0xb842, 0x080c, 0x95a1, 0x01d0, 0x2b00, 0x6012, 0x080c, 0xb4e6,
++	0x6023, 0x0001, 0x9006, 0x080c, 0x5b4d, 0x2001, 0x0000, 0x080c,
++	0x5b61, 0x0126, 0x2091, 0x8000, 0x70a0, 0x8000, 0x70a2, 0x012e,
++	0x2009, 0x0004, 0x080c, 0x95ce, 0x9085, 0x0001, 0x00ce, 0x00de,
++	0x007e, 0x001e, 0x0005, 0x0016, 0x0076, 0x00d6, 0x00c6, 0x2001,
++	0x1857, 0x2004, 0x9084, 0x00ff, 0xb842, 0x080c, 0x95a1, 0x0548,
++	0x2b00, 0x6012, 0xb800, 0xc0c4, 0xb802, 0xb8a0, 0x9086, 0x007e,
++	0x0140, 0xb804, 0x9084, 0x00ff, 0x9086, 0x0006, 0x1110, 0x080c,
++	0x2d1a, 0x080c, 0xb4e6, 0x6023, 0x0001, 0x9006, 0x080c, 0x5b4d,
++	0x2001, 0x0002, 0x080c, 0x5b61, 0x0126, 0x2091, 0x8000, 0x70a0,
++	0x8000, 0x70a2, 0x012e, 0x2009, 0x0002, 0x080c, 0x95ce, 0x9085,
++	0x0001, 0x00ce, 0x00de, 0x007e, 0x001e, 0x0005, 0x00b6, 0x00c6,
++	0x0026, 0x2009, 0x0080, 0x080c, 0x5bb0, 0x1140, 0xb813, 0x00ff,
++	0xb817, 0xfffc, 0x0039, 0x0110, 0x70df, 0xffff, 0x002e, 0x00ce,
++	0x00be, 0x0005, 0x0016, 0x0076, 0x00d6, 0x00c6, 0x080c, 0x94fe,
++	0x01d0, 0x2b00, 0x6012, 0x080c, 0xb4e6, 0x6023, 0x0001, 0x9006,
++	0x080c, 0x5b4d, 0x2001, 0x0002, 0x080c, 0x5b61, 0x0126, 0x2091,
++	0x8000, 0x70e0, 0x8000, 0x70e2, 0x012e, 0x2009, 0x0002, 0x080c,
++	0x95ce, 0x9085, 0x0001, 0x00ce, 0x00de, 0x007e, 0x001e, 0x0005,
++	0x00c6, 0x00d6, 0x0126, 0x2091, 0x8000, 0x2009, 0x007f, 0x080c,
++	0x5bb0, 0x11b8, 0xb813, 0x00ff, 0xb817, 0xfffd, 0xb8bf, 0x0004,
++	0x080c, 0x94fe, 0x0170, 0x2b00, 0x6012, 0x6316, 0x6023, 0x0001,
++	0x620a, 0x080c, 0xb4e6, 0x2009, 0x0022, 0x080c, 0x95ce, 0x9085,
++	0x0001, 0x012e, 0x00de, 0x00ce, 0x0005, 0x00e6, 0x00c6, 0x0066,
++	0x0036, 0x0026, 0x00b6, 0x21f0, 0x080c, 0x7d60, 0x080c, 0x7cef,
++	0x080c, 0x93ac, 0x080c, 0xa3ab, 0x3e08, 0x2130, 0x81ff, 0x0120,
++	0x20a9, 0x007e, 0x900e, 0x0018, 0x20a9, 0x007f, 0x900e, 0x0016,
++	0x080c, 0x5c0d, 0x1140, 0x9686, 0x0002, 0x1118, 0xb800, 0xd0bc,
++	0x1110, 0x080c, 0x56f3, 0x001e, 0x8108, 0x1f04, 0x2cff, 0x86ff,
++	0x1110, 0x080c, 0x2e3e, 0x00be, 0x002e, 0x003e, 0x006e, 0x00ce,
++	0x00ee, 0x0005, 0x00e6, 0x00c6, 0x0036, 0x0026, 0x0016, 0x00b6,
++	0x6210, 0x2258, 0xbaa0, 0x0026, 0x2019, 0x0029, 0x080c, 0x7d55,
++	0x0076, 0x2039, 0x0000, 0x080c, 0x7c4d, 0x2c08, 0x080c, 0xc73e,
++	0x007e, 0x001e, 0xba10, 0xbb14, 0x080c, 0x56f3, 0xba12, 0xbb16,
++	0x00be, 0x001e, 0x002e, 0x003e, 0x00ce, 0x00ee, 0x0005, 0x00e6,
++	0x0006, 0x00b6, 0x6010, 0x2058, 0xb8a0, 0x00be, 0x9086, 0x0080,
++	0x0150, 0x2071, 0x1800, 0x70a0, 0x9005, 0x0110, 0x8001, 0x70a2,
++	0x000e, 0x00ee, 0x0005, 0x2071, 0x1800, 0x70e0, 0x9005, 0x0dc0,
++	0x8001, 0x70e2, 0x0ca8, 0xb800, 0xc08c, 0xb802, 0x0005, 0x00f6,
++	0x00e6, 0x00c6, 0x0036, 0x0026, 0x0016, 0x0156, 0x2178, 0x81ff,
++	0x1118, 0x20a9, 0x0001, 0x0088, 0x080c, 0x4dea, 0xd0c4, 0x0150,
++	0xd0a4, 0x0140, 0x9006, 0x0046, 0x2020, 0x2009, 0x002d, 0x080c,
++	0xc9c5, 0x004e, 0x20a9, 0x0800, 0x9016, 0x0026, 0x928e, 0x007e,
++	0x0904, 0x2dc7, 0x928e, 0x007f, 0x0904, 0x2dc7, 0x928e, 0x0080,
++	0x05f0, 0x9288, 0x1000, 0x210c, 0x81ff, 0x05c8, 0x8fff, 0x1148,
++	0x2001, 0x195b, 0x0006, 0x2003, 0x0001, 0x04e9, 0x000e, 0x2003,
++	0x0000, 0x00b6, 0x00c6, 0x2158, 0x2001, 0x0001, 0x080c, 0x5ef7,
++	0x00ce, 0x00be, 0x2019, 0x0029, 0x080c, 0x7d55, 0x0076, 0x2039,
++	0x0000, 0x080c, 0x7c4d, 0x00b6, 0x00c6, 0x0026, 0x2158, 0xba04,
++	0x9294, 0x00ff, 0x9286, 0x0006, 0x1118, 0xb807, 0x0404, 0x0028,
++	0x2001, 0x0004, 0x8007, 0x9215, 0xba06, 0x002e, 0x00ce, 0x00be,
++	0x0016, 0x2c08, 0x080c, 0xc73e, 0x001e, 0x007e, 0x2160, 0x002e,
++	0x8210, 0x1f04, 0x2d7d, 0x015e, 0x001e, 0x002e, 0x003e, 0x00ce,
++	0x00ee, 0x00fe, 0x0005, 0x0046, 0x0026, 0x0016, 0x080c, 0x4dea,
++	0xd0c4, 0x0140, 0xd0a4, 0x0130, 0x9006, 0x2220, 0x2009, 0x0029,
++	0x080c, 0xc9c5, 0x001e, 0x002e, 0x004e, 0x0005, 0x0016, 0x0026,
++	0x0036, 0x00c6, 0x728c, 0x82ff, 0x01e8, 0x080c, 0x5f25, 0x11d0,
++	0x2100, 0x080c, 0x2430, 0x81ff, 0x01b8, 0x2019, 0x0001, 0x8314,
++	0x92e0, 0x1c80, 0x2c04, 0xd384, 0x0120, 0x9084, 0xff00, 0x8007,
++	0x0010, 0x9084, 0x00ff, 0x9116, 0x0138, 0x9096, 0x00ff, 0x0110,
++	0x8318, 0x0c68, 0x9085, 0x0001, 0x00ce, 0x003e, 0x002e, 0x001e,
++	0x0005, 0x0016, 0x00c6, 0x0126, 0x2091, 0x8000, 0x0036, 0x2019,
++	0x0029, 0x00a9, 0x003e, 0x9180, 0x1000, 0x2004, 0x9065, 0x0158,
++	0x0016, 0x00c6, 0x2061, 0x1a72, 0x001e, 0x6112, 0x080c, 0x2d1a,
++	0x001e, 0x080c, 0x5bd1, 0x012e, 0x00ce, 0x001e, 0x0005, 0x0016,
++	0x0026, 0x2110, 0x080c, 0x905b, 0x080c, 0xcc7a, 0x002e, 0x001e,
++	0x0005, 0x2001, 0x1836, 0x2004, 0xd0cc, 0x0005, 0x00c6, 0x080c,
++	0x6877, 0x1118, 0x20a9, 0x0800, 0x0010, 0x20a9, 0x0782, 0x080c,
++	0x6877, 0x1110, 0x900e, 0x0010, 0x2009, 0x007e, 0x9180, 0x1000,
++	0x2004, 0x9065, 0x0110, 0x080c, 0x5bd1, 0x8108, 0x1f04, 0x2e4e,
++	0x2061, 0x1800, 0x6077, 0x0000, 0x6078, 0x9084, 0x00ff, 0x607a,
++	0x60ab, 0x0000, 0x00ce, 0x0005, 0x2001, 0x1874, 0x2004, 0xd0bc,
++	0x0005, 0x2011, 0x1853, 0x2214, 0xd2ec, 0x0005, 0x7eef, 0x7de8,
++	0x7ce4, 0x80e2, 0x7be1, 0x80e0, 0x80dc, 0x80da, 0x7ad9, 0x80d6,
++	0x80d5, 0x80d4, 0x80d3, 0x80d2, 0x80d1, 0x79ce, 0x78cd, 0x80cc,
++	0x80cb, 0x80ca, 0x80c9, 0x80c7, 0x80c6, 0x77c5, 0x76c3, 0x80bc,
++	0x80ba, 0x75b9, 0x80b6, 0x74b5, 0x73b4, 0x72b3, 0x80b2, 0x80b1,
++	0x80ae, 0x71ad, 0x80ac, 0x70ab, 0x6faa, 0x6ea9, 0x80a7, 0x6da6,
++	0x6ca5, 0x6ba3, 0x6a9f, 0x699e, 0x689d, 0x809b, 0x8098, 0x6797,
++	0x6690, 0x658f, 0x6488, 0x6384, 0x6282, 0x8081, 0x8080, 0x617c,
++	0x607a, 0x8079, 0x5f76, 0x8075, 0x8074, 0x8073, 0x8072, 0x8071,
++	0x806e, 0x5e6d, 0x806c, 0x5d6b, 0x5c6a, 0x5b69, 0x8067, 0x5a66,
++	0x5965, 0x5863, 0x575c, 0x565a, 0x5559, 0x8056, 0x8055, 0x5454,
++	0x5353, 0x5252, 0x5151, 0x504e, 0x4f4d, 0x804c, 0x804b, 0x4e4a,
++	0x4d49, 0x8047, 0x4c46, 0x8045, 0x8043, 0x803c, 0x803a, 0x8039,
++	0x8036, 0x4b35, 0x8034, 0x4a33, 0x4932, 0x4831, 0x802e, 0x472d,
++	0x462c, 0x452b, 0x442a, 0x4329, 0x4227, 0x8026, 0x8025, 0x4123,
++	0x401f, 0x3f1e, 0x3e1d, 0x3d1b, 0x3c18, 0x8017, 0x8010, 0x3b0f,
++	0x3a08, 0x8004, 0x3902, 0x8001, 0x8000, 0x8000, 0x3800, 0x3700,
++	0x3600, 0x8000, 0x3500, 0x8000, 0x8000, 0x8000, 0x3400, 0x8000,
++	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x3300, 0x3200, 0x8000,
++	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x3100, 0x3000, 0x8000,
++	0x8000, 0x2f00, 0x8000, 0x2e00, 0x2d00, 0x2c00, 0x8000, 0x8000,
++	0x8000, 0x2b00, 0x8000, 0x2a00, 0x2900, 0x2800, 0x8000, 0x2700,
++	0x2600, 0x2500, 0x2400, 0x2300, 0x2200, 0x8000, 0x8000, 0x2100,
++	0x2000, 0x1f00, 0x1e00, 0x1d00, 0x1c00, 0x8000, 0x8000, 0x1b00,
++	0x1a00, 0x8000, 0x1900, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000,
++	0x8000, 0x1800, 0x8000, 0x1700, 0x1600, 0x1500, 0x8000, 0x1400,
++	0x1300, 0x1200, 0x1100, 0x1000, 0x0f00, 0x8000, 0x8000, 0x0e00,
++	0x0d00, 0x0c00, 0x0b00, 0x0a00, 0x0900, 0x8000, 0x8000, 0x0800,
++	0x0700, 0x8000, 0x0600, 0x8000, 0x8000, 0x8000, 0x0500, 0x0400,
++	0x0300, 0x8000, 0x0200, 0x8000, 0x8000, 0x8000, 0x0100, 0x8000,
++	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x0000, 0x8000, 0x8000,
++	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000,
++	0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x8000, 0x2071, 0x1893,
++	0x7003, 0x0002, 0x9006, 0x7012, 0x7016, 0x7046, 0x704a, 0x7037,
++	0x18ae, 0x703b, 0x18ae, 0x7007, 0x0001, 0x080c, 0x0fc7, 0x090c,
++	0x0d84, 0x2900, 0x7066, 0xa867, 0x0002, 0xa8ab, 0xdcb0, 0x080c,
++	0x0fc7, 0x090c, 0x0d84, 0x2900, 0x706a, 0xa867, 0x0002, 0xa8ab,
++	0xdcb0, 0x0005, 0x2071, 0x1893, 0x7004, 0x0002, 0x2f9a, 0x2f9b,
++	0x2fa3, 0x2fb7, 0x0005, 0x1004, 0x2fa2, 0x0e04, 0x2fa2, 0x2079,
++	0x0000, 0x0458, 0x0005, 0x2079, 0x0000, 0x2061, 0x18ac, 0x2c4c,
++	0xa86c, 0x908e, 0x0100, 0x0128, 0x9086, 0x0200, 0x0904, 0x3089,
++	0x0005, 0x7014, 0x2048, 0x2061, 0x1800, 0x7018, 0x0807, 0x7010,
++	0x2048, 0xa864, 0x9094, 0x00ff, 0x9296, 0x0029, 0x1120, 0xaa78,
++	0xd2fc, 0x0128, 0x0005, 0x9086, 0x0103, 0x0108, 0x0005, 0x2079,
++	0x0000, 0x2061, 0x1800, 0x7018, 0x0807, 0x2061, 0x1800, 0x7880,
++	0x908a, 0x0040, 0x1210, 0x61cc, 0x0042, 0x2100, 0x908a, 0x003f,
++	0x1a04, 0x3086, 0x61cc, 0x0804, 0x301d, 0x305f, 0x3095, 0x309f,
++	0x30a3, 0x30ad, 0x30b3, 0x30b7, 0x30c7, 0x30ca, 0x30d4, 0x30d9,
++	0x30de, 0x30e9, 0x30f4, 0x3103, 0x3112, 0x3120, 0x3137, 0x3152,
++	0x31f2, 0x31f7, 0x3235, 0x32dd, 0x32ee, 0x3311, 0x3086, 0x3086,
++	0x3086, 0x3349, 0x3367, 0x3370, 0x339f, 0x33a5, 0x3086, 0x33dd,
++	0x3086, 0x3086, 0x3086, 0x3086, 0x3086, 0x33e8, 0x33f1, 0x33f9,
++	0x3086, 0x3086, 0x3086, 0x3086, 0x3086, 0x3086, 0x3086, 0x33fb,
++	0x3086, 0x3086, 0x3086, 0x3086, 0x3086, 0x3418, 0x3475, 0x3086,
++	0x3086, 0x3086, 0x3086, 0x3086, 0x3086, 0x0002, 0x349f, 0x34a2,
++	0x3502, 0x351b, 0x354b, 0x37ed, 0x3086, 0x49c6, 0x3086, 0x3086,
++	0x3086, 0x3086, 0x3086, 0x3086, 0x3086, 0x3086, 0x30d4, 0x30d9,
++	0x3cbf, 0x3086, 0x3cd6, 0x4a55, 0x4aa5, 0x4ba8, 0x3086, 0x4c0a,
++	0x4c46, 0x4c77, 0x4d79, 0x4ca4, 0x4cfb, 0x3086, 0x3cda, 0x3ea6,
++	0x3ebc, 0x3ed8, 0x3f3d, 0x3fb1, 0x3fd1, 0x403b, 0x404c, 0x405d,
++	0x4060, 0x4085, 0x40f9, 0x415b, 0x4163, 0x428b, 0x43b4, 0x43dd,
++	0x4504, 0x4522, 0x452e, 0x45d0, 0x46a0, 0x3086, 0x3086, 0x3086,
++	0x3086, 0x4706, 0x4721, 0x48ac, 0x4982, 0x7148, 0x0000, 0x2021,
++	0x4000, 0x080c, 0x445b, 0x0126, 0x2091, 0x8000, 0x0e04, 0x3069,
++	0x0010, 0x012e, 0x0cc0, 0x7c36, 0x9486, 0x4000, 0x0118, 0x7833,
++	0x0011, 0x0010, 0x7833, 0x0010, 0x7c82, 0x7986, 0x7a8a, 0x7b8e,
++	0x2091, 0x4080, 0x2001, 0x0089, 0x2004, 0xd084, 0x190c, 0x113e,
++	0x7007, 0x0001, 0x2091, 0x5000, 0x012e, 0x0005, 0x2021, 0x4001,
++	0x08c0, 0x2021, 0x4002, 0x08a8, 0x2021, 0x4003, 0x0890, 0x2021,
++	0x4005, 0x0878, 0x2021, 0x4006, 0x0860, 0x2039, 0x0001, 0x902e,
++	0x2520, 0x7b88, 0x7a8c, 0x7884, 0x7990, 0x0804, 0x4468, 0x7883,
++	0x0004, 0x7884, 0x0807, 0x2039, 0x0001, 0x902e, 0x2520, 0x7b88,
++	0x7a8c, 0x7884, 0x7990, 0x0804, 0x446b, 0x7984, 0x7888, 0x2114,
++	0x200a, 0x0804, 0x305f, 0x7984, 0x2114, 0x0804, 0x305f, 0x20e1,
++	0x0000, 0x2099, 0x0021, 0x20e9, 0x0000, 0x20a1, 0x0021, 0x20a9,
++	0x001f, 0x4003, 0x7984, 0x7a88, 0x7b8c, 0x0804, 0x305f, 0x7884,
++	0x2060, 0x04d8, 0x2009, 0x0003, 0x2011, 0x0002, 0x2019, 0x000a,
++	0x789b, 0x0117, 0x0804, 0x305f, 0x2039, 0x0001, 0x7d98, 0x7c9c,
++	0x0800, 0x2039, 0x0001, 0x7d98, 0x7c9c, 0x0848, 0x79a0, 0x9182,
++	0x0040, 0x0210, 0x0804, 0x3092, 0x2138, 0x7d98, 0x7c9c, 0x0804,
++	0x3099, 0x79a0, 0x9182, 0x0040, 0x0210, 0x0804, 0x3092, 0x2138,
++	0x7d98, 0x7c9c, 0x0804, 0x30a7, 0x79a0, 0x9182, 0x0040, 0x0210,
++	0x0804, 0x3092, 0x21e8, 0x7984, 0x7888, 0x20a9, 0x0001, 0x21a0,
++	0x4004, 0x0804, 0x305f, 0x2061, 0x0800, 0xe10c, 0x9006, 0x2c15,
++	0x9200, 0x8c60, 0x8109, 0x1dd8, 0x2010, 0x9005, 0x0904, 0x305f,
++	0x0804, 0x308c, 0x79a0, 0x9182, 0x0040, 0x0210, 0x0804, 0x3092,
++	0x21e0, 0x20a9, 0x0001, 0x7984, 0x2198, 0x4012, 0x0804, 0x305f,
++	0x2069, 0x1852, 0x7884, 0x7990, 0x911a, 0x1a04, 0x3092, 0x8019,
++	0x0904, 0x3092, 0x684a, 0x6942, 0x788c, 0x6852, 0x7888, 0x6856,
++	0x9006, 0x685a, 0x685e, 0x080c, 0x6b71, 0x0804, 0x305f, 0x2069,
++	0x1852, 0x7884, 0x7994, 0x911a, 0x1a04, 0x3092, 0x8019, 0x0904,
++	0x3092, 0x684e, 0x6946, 0x788c, 0x6862, 0x7888, 0x6866, 0x9006,
++	0x686a, 0x686e, 0x0126, 0x2091, 0x8000, 0x080c, 0x5f97, 0x012e,
++	0x0804, 0x305f, 0x902e, 0x2520, 0x81ff, 0x1904, 0x308f, 0x7984,
++	0x7b88, 0x7a8c, 0x20a9, 0x0005, 0x20e9, 0x0001, 0x20a1, 0x189a,
++	0x4101, 0x080c, 0x441f, 0x0904, 0x308f, 0x2009, 0x0020, 0xa85c,
++	0x9080, 0x0019, 0xaf60, 0x080c, 0x4468, 0x701b, 0x3170, 0x0005,
++	0xa864, 0x2008, 0x9084, 0x00ff, 0x9096, 0x0011, 0x0168, 0x9096,
++	0x0019, 0x0150, 0x9096, 0x0015, 0x0138, 0x9096, 0x0048, 0x0120,
++	0x9096, 0x0029, 0x1904, 0x308f, 0x810f, 0x918c, 0x00ff, 0x0904,
++	0x308f, 0x710e, 0x700c, 0x8001, 0x0548, 0x700e, 0x080c, 0x441f,
++	0x0904, 0x308f, 0x2009, 0x0020, 0x7064, 0x2040, 0xa28c, 0xa390,
++	0xa494, 0xa598, 0x9290, 0x0040, 0x9399, 0x0000, 0x94a1, 0x0000,
++	0x95a9, 0x0000, 0xa85c, 0x9080, 0x0019, 0xaf60, 0x080c, 0x4468,
++	0x701b, 0x31ab, 0x0005, 0xa864, 0x9084, 0x00ff, 0x9096, 0x0002,
++	0x0120, 0x9096, 0x000a, 0x1904, 0x308f, 0x08a0, 0x7010, 0x2048,
++	0xa868, 0xc0fd, 0xa86a, 0xa864, 0x9084, 0x00ff, 0x9096, 0x0029,
++	0x1160, 0xc2fd, 0xaa7a, 0x080c, 0x57e4, 0x0150, 0x0126, 0x2091,
++	0x8000, 0xa87a, 0xa982, 0x012e, 0x0050, 0x080c, 0x5ac6, 0x1128,
++	0x7007, 0x0003, 0x701b, 0x31d7, 0x0005, 0x080c, 0x63d1, 0x0126,
++	0x2091, 0x8000, 0x20a9, 0x0005, 0x20e1, 0x0001, 0x2099, 0x189a,
++	0x400a, 0x2100, 0x9210, 0x9399, 0x0000, 0x94a1, 0x0000, 0x95a9,
++	0x0000, 0xa85c, 0x9080, 0x0019, 0x2009, 0x0020, 0x012e, 0xaf60,
++	0x0804, 0x446b, 0x61b4, 0x7884, 0x60b6, 0x0804, 0x305f, 0x2091,
++	0x8000, 0x7837, 0x4000, 0x7833, 0x0010, 0x7883, 0x4000, 0x7887,
++	0x4953, 0x788b, 0x5020, 0x788f, 0x2020, 0x2009, 0x017f, 0x2104,
++	0x7892, 0x3f00, 0x7896, 0x2061, 0x0100, 0x6200, 0x2061, 0x0200,
++	0x603c, 0x8007, 0x9205, 0x789a, 0x2009, 0x04fd, 0x2104, 0x789e,
++	0x2091, 0x5000, 0x2091, 0x4080, 0x2001, 0x0089, 0x2004, 0xd084,
++	0x0180, 0x2001, 0x19e7, 0x2004, 0x9005, 0x0128, 0x2001, 0x008b,
++	0x2004, 0xd0fc, 0x0dd8, 0x2001, 0x008a, 0x2003, 0x0002, 0x2003,
++	0x1001, 0x2071, 0x0080, 0x0804, 0x0427, 0x81ff, 0x1904, 0x308f,
++	0x7984, 0x080c, 0x5c0d, 0x1904, 0x3092, 0x7e98, 0x9684, 0x3fff,
++	0x9082, 0x4000, 0x0210, 0x0804, 0x3092, 0x7c88, 0x7d8c, 0x080c,
++	0x5d70, 0x080c, 0x5d3f, 0x0000, 0x1518, 0x2061, 0x1cd0, 0x0126,
++	0x2091, 0x8000, 0x6000, 0x9086, 0x0000, 0x0148, 0x6014, 0x904d,
++	0x0130, 0xa86c, 0x9406, 0x1118, 0xa870, 0x9506, 0x0150, 0x012e,
++	0x9ce0, 0x0018, 0x2001, 0x1818, 0x2004, 0x9c02, 0x1a04, 0x308f,
++	0x0c30, 0x080c, 0xad1e, 0x012e, 0x0904, 0x308f, 0x0804, 0x305f,
++	0x900e, 0x2001, 0x0005, 0x080c, 0x63d1, 0x0126, 0x2091, 0x8000,
++	0x080c, 0xb37a, 0x080c, 0x61a9, 0x012e, 0x0804, 0x305f, 0x00a6,
++	0x2950, 0xb198, 0x080c, 0x5c0d, 0x1904, 0x32ca, 0xb6a4, 0x9684,
++	0x3fff, 0x9082, 0x4000, 0x0208, 0x04e8, 0xb49c, 0xb5a0, 0x080c,
++	0x5d70, 0x080c, 0x5d3f, 0x1520, 0x2061, 0x1cd0, 0x0126, 0x2091,
++	0x8000, 0x6000, 0x9086, 0x0000, 0x0148, 0x6014, 0x904d, 0x0130,
++	0xa86c, 0x9406, 0x1118, 0xa870, 0x9506, 0x0158, 0x012e, 0x9ce0,
++	0x0018, 0x2001, 0x1818, 0x2004, 0x9c02, 0x2009, 0x000d, 0x12b0,
++	0x0c28, 0x080c, 0xad1e, 0x012e, 0x2009, 0x0003, 0x0178, 0x00e0,
++	0x900e, 0x2001, 0x0005, 0x080c, 0x63d1, 0x0126, 0x2091, 0x8000,
++	0x080c, 0xb37a, 0x080c, 0x61a9, 0x012e, 0x0070, 0xb097, 0x4005,
++	0xb19a, 0x0010, 0xb097, 0x4006, 0x900e, 0x9085, 0x0001, 0x2001,
++	0x0030, 0x2a48, 0x00ae, 0x0005, 0xb097, 0x4000, 0x9006, 0x918d,
++	0x0001, 0x2008, 0x2a48, 0x00ae, 0x0005, 0x81ff, 0x1904, 0x308f,
++	0x080c, 0x4436, 0x0904, 0x3092, 0x080c, 0x5cd4, 0x0904, 0x308f,
++	0x080c, 0x5d76, 0x0904, 0x308f, 0x0804, 0x3fc8, 0x81ff, 0x1904,
++	0x308f, 0x080c, 0x4452, 0x0904, 0x3092, 0x080c, 0x5e04, 0x0904,
++	0x308f, 0x2019, 0x0005, 0x79a8, 0x080c, 0x5d91, 0x0904, 0x308f,
++	0x7888, 0x908a, 0x1000, 0x1a04, 0x3092, 0x8003, 0x800b, 0x810b,
++	0x9108, 0x080c, 0x7826, 0x7984, 0xd184, 0x1904, 0x305f, 0x0804,
++	0x3fc8, 0x0126, 0x2091, 0x8000, 0x81ff, 0x0118, 0x2009, 0x0001,
++	0x0450, 0x2029, 0x07ff, 0x6454, 0x2400, 0x9506, 0x01f8, 0x2508,
++	0x080c, 0x5c0d, 0x11d8, 0x080c, 0x5e04, 0x1128, 0x2009, 0x0002,
++	0x62bc, 0x2518, 0x00c0, 0x2019, 0x0004, 0x900e, 0x080c, 0x5d91,
++	0x1118, 0x2009, 0x0006, 0x0078, 0x7884, 0x908a, 0x1000, 0x1270,
++	0x8003, 0x800b, 0x810b, 0x9108, 0x080c, 0x7826, 0x8529, 0x1ae0,
++	0x012e, 0x0804, 0x305f, 0x012e, 0x0804, 0x308f, 0x012e, 0x0804,
++	0x3092, 0x080c, 0x4436, 0x0904, 0x3092, 0x080c, 0x5cd4, 0x0904,
++	0x308f, 0xbaa0, 0x2019, 0x0005, 0x00c6, 0x2061, 0x0000, 0x080c,
++	0x7d55, 0x0076, 0x2039, 0x0000, 0x080c, 0x7c4d, 0x900e, 0x080c,
++	0xc73e, 0x007e, 0x00ce, 0x080c, 0x5d70, 0x0804, 0x305f, 0x080c,
++	0x4436, 0x0904, 0x3092, 0x080c, 0x5d70, 0x2208, 0x0804, 0x305f,
++	0x0156, 0x00d6, 0x00e6, 0x2069, 0x1904, 0x6810, 0x6914, 0x910a,
++	0x1208, 0x900e, 0x6816, 0x9016, 0x901e, 0x20a9, 0x007e, 0x2069,
++	0x1000, 0x2d04, 0x905d, 0x0118, 0xb84c, 0x0059, 0x9210, 0x8d68,
++	0x1f04, 0x3381, 0x2300, 0x9218, 0x00ee, 0x00de, 0x015e, 0x0804,
++	0x305f, 0x00f6, 0x0016, 0x907d, 0x0138, 0x9006, 0x8000, 0x2f0c,
++	0x81ff, 0x0110, 0x2178, 0x0cd0, 0x001e, 0x00fe, 0x0005, 0x2069,
++	0x1904, 0x6910, 0x62b8, 0x0804, 0x305f, 0x81ff, 0x1904, 0x308f,
++	0x6154, 0x9190, 0x2e6e, 0x2215, 0x9294, 0x00ff, 0x6374, 0x83ff,
++	0x0108, 0x6278, 0x67d8, 0x97c4, 0x000a, 0x98c6, 0x000a, 0x1118,
++	0x2031, 0x0001, 0x00f0, 0x97c4, 0x0022, 0x98c6, 0x0022, 0x1118,
++	0x2031, 0x0003, 0x00b0, 0x97c4, 0x0012, 0x98c6, 0x0012, 0x1118,
++	0x2031, 0x0002, 0x0070, 0x080c, 0x6877, 0x1118, 0x2031, 0x0004,
++	0x0040, 0xd79c, 0x0120, 0x2009, 0x0005, 0x0804, 0x308f, 0x2031,
++	0x0000, 0x7e9a, 0x7f9e, 0x0804, 0x305f, 0x6144, 0x6248, 0x2019,
++	0x1953, 0x231c, 0x2001, 0x1954, 0x2004, 0x789a, 0x0804, 0x305f,
++	0x0126, 0x2091, 0x8000, 0x6134, 0x6238, 0x633c, 0x012e, 0x0804,
++	0x305f, 0x080c, 0x4452, 0x0904, 0x3092, 0xba44, 0xbb38, 0x0804,
++	0x305f, 0x080c, 0x0d84, 0x6144, 0x6248, 0x7884, 0x6046, 0x7b88,
++	0x634a, 0x2069, 0x1852, 0x831f, 0x9305, 0x6816, 0x788c, 0x2069,
++	0x1953, 0x2d1c, 0x206a, 0x7e98, 0x9682, 0x0014, 0x1210, 0x2031,
++	0x07d0, 0x2069, 0x1954, 0x2d04, 0x266a, 0x789a, 0x0804, 0x305f,
++	0x0126, 0x2091, 0x8000, 0x6134, 0x7884, 0x6036, 0x910e, 0xd1b4,
++	0x190c, 0x0e56, 0xd0c4, 0x01a8, 0x00d6, 0x78a8, 0x2009, 0x196a,
++	0x200a, 0x78ac, 0x2011, 0x196b, 0x2012, 0x2069, 0x0100, 0x6838,
++	0x9086, 0x0007, 0x1118, 0x2214, 0x6a5a, 0x0010, 0x210c, 0x695a,
++	0x00de, 0x7884, 0x7888, 0x603a, 0x2011, 0x0114, 0x220c, 0x7888,
++	0xd08c, 0x0118, 0x918d, 0x0080, 0x0010, 0x918c, 0xff7f, 0x2112,
++	0x613c, 0x788c, 0x603e, 0x910e, 0xd1e4, 0x190c, 0x0e73, 0x603c,
++	0xd0cc, 0x0120, 0x78b0, 0x2011, 0x0114, 0x2012, 0x012e, 0x0804,
++	0x305f, 0x00f6, 0x2079, 0x1800, 0x7a34, 0xa898, 0x9084, 0xfebf,
++	0x9215, 0xa89c, 0x9084, 0xfebf, 0x8002, 0x9214, 0x79ec, 0x7834,
++	0x9084, 0x0140, 0x9215, 0x7a36, 0xa897, 0x4000, 0x900e, 0x9085,
++	0x0001, 0x2001, 0x0000, 0x00fe, 0x0005, 0x7898, 0x9005, 0x01a8,
++	0x7888, 0x9025, 0x0904, 0x3092, 0x788c, 0x902d, 0x0904, 0x3092,
++	0x900e, 0x080c, 0x5c0d, 0x1120, 0xba44, 0xbb38, 0xbc46, 0xbd3a,
++	0x9186, 0x07ff, 0x0190, 0x8108, 0x0ca0, 0x080c, 0x4452, 0x0904,
++	0x3092, 0x7888, 0x900d, 0x0904, 0x3092, 0x788c, 0x9005, 0x0904,
++	0x3092, 0xba44, 0xb946, 0xbb38, 0xb83a, 0x0804, 0x305f, 0x2011,
++	0xbc09, 0x0010, 0x2011, 0xbc05, 0x080c, 0x4dfe, 0x1904, 0x308f,
++	0x00c6, 0x2061, 0x0100, 0x7984, 0x9186, 0x00ff, 0x1130, 0x2001,
++	0x1816, 0x2004, 0x9085, 0xff00, 0x0088, 0x9182, 0x007f, 0x16e8,
++	0x9188, 0x2e6e, 0x210d, 0x918c, 0x00ff, 0x2001, 0x1816, 0x2004,
++	0x0026, 0x9116, 0x002e, 0x0588, 0x810f, 0x9105, 0x0126, 0x2091,
++	0x8000, 0x0006, 0x080c, 0x94fe, 0x000e, 0x0518, 0x6016, 0x600b,
++	0xbc05, 0x7984, 0x00b6, 0x080c, 0x5bb0, 0x2b08, 0x00be, 0x1500,
++	0x6112, 0x6023, 0x0001, 0x080c, 0x441f, 0x01d0, 0x9006, 0xa866,
++	0x7007, 0x0003, 0xa832, 0xa868, 0xc0fd, 0xa86a, 0x701b, 0x34fb,
++	0x2900, 0x6016, 0x2009, 0x0032, 0x080c, 0x95ce, 0x012e, 0x00ce,
++	0x0005, 0x012e, 0x00ce, 0x0804, 0x308f, 0x00ce, 0x0804, 0x3092,
++	0x080c, 0x9554, 0x0cb0, 0xa830, 0x9086, 0x0100, 0x0904, 0x308f,
++	0x0804, 0x305f, 0x2061, 0x1a3d, 0x0126, 0x2091, 0x8000, 0x6000,
++	0xd084, 0x0170, 0x6104, 0x6208, 0x2061, 0x1800, 0x634c, 0x606c,
++	0x789a, 0x60bc, 0x789e, 0x60b8, 0x78aa, 0x012e, 0x0804, 0x305f,
++	0x900e, 0x2110, 0x0c88, 0x81ff, 0x1904, 0x308f, 0x080c, 0x6877,
++	0x0904, 0x308f, 0x0126, 0x2091, 0x8000, 0x624c, 0x606c, 0x9202,
++	0x0248, 0x9085, 0x0001, 0x080c, 0x2466, 0x080c, 0x4fc7, 0x012e,
++	0x0804, 0x305f, 0x012e, 0x0804, 0x3092, 0x0006, 0x0016, 0x00c6,
++	0x00e6, 0x2001, 0x1976, 0x2070, 0x2061, 0x1852, 0x6008, 0x2072,
++	0x900e, 0x2011, 0x1400, 0x080c, 0x7a4b, 0x7206, 0x00ee, 0x00ce,
++	0x001e, 0x000e, 0x0005, 0x0126, 0x2091, 0x8000, 0x81ff, 0x0128,
++	0x012e, 0x2021, 0x400b, 0x0804, 0x3061, 0x7884, 0xd0fc, 0x0148,
++	0x2001, 0x002a, 0x2004, 0x9082, 0x00e1, 0x02a8, 0x012e, 0x0804,
++	0x3092, 0x2001, 0x002a, 0x2004, 0x2069, 0x1852, 0x6908, 0x9102,
++	0x1218, 0x012e, 0x0804, 0x3092, 0x614c, 0x606c, 0x9106, 0x0118,
++	0x012e, 0x0804, 0x308f, 0x080c, 0x94d3, 0x0dd0, 0x7884, 0xd0fc,
++	0x0904, 0x35ca, 0x00c6, 0x080c, 0x441f, 0x00ce, 0x0d88, 0xa867,
++	0x0000, 0x7884, 0xa80a, 0x7898, 0xa80e, 0x789c, 0xa812, 0x2001,
++	0x002e, 0x2004, 0xa81a, 0x2001, 0x002f, 0x2004, 0xa81e, 0x2001,
++	0x0030, 0x2004, 0xa822, 0x2001, 0x0031, 0x2004, 0xa826, 0x2001,
++	0x0034, 0x2004, 0xa82a, 0x2001, 0x0035, 0x2004, 0xa82e, 0x2001,
++	0x002a, 0x2004, 0x9080, 0x0003, 0x9084, 0x00fc, 0x8004, 0xa816,
++	0x080c, 0x3750, 0x0928, 0x7010, 0x2048, 0xad2c, 0xac28, 0xab1c,
++	0xaa18, 0xa930, 0xa808, 0xd0b4, 0x1120, 0x2029, 0x0000, 0x2021,
++	0x0000, 0x8906, 0x8006, 0x8007, 0x90bc, 0x003f, 0x9084, 0xffc0,
++	0x9080, 0x001b, 0x080c, 0x4468, 0x701b, 0x368d, 0x701f, 0x0001,
++	0x012e, 0x0005, 0x0046, 0x0086, 0x0096, 0x00a6, 0x00b6, 0x00c6,
++	0x00d6, 0x00e6, 0x00f6, 0x080c, 0x3535, 0x2001, 0x196c, 0x2003,
++	0x0000, 0x2021, 0x000a, 0x2061, 0x0100, 0x6104, 0x0016, 0x60bb,
++	0x0000, 0x60bf, 0x32e1, 0x60bf, 0x0012, 0x080c, 0x37bf, 0x080c,
++	0x377e, 0x00f6, 0x00e6, 0x0086, 0x2940, 0x2071, 0x1a33, 0x2079,
++	0x0090, 0x00d6, 0x2069, 0x0000, 0x6884, 0xd0b4, 0x0140, 0x2001,
++	0x0035, 0x2004, 0x780e, 0x2001, 0x0034, 0x2004, 0x780a, 0x00de,
++	0x2011, 0x0001, 0x080c, 0x3b2b, 0x008e, 0x00ee, 0x00fe, 0x080c,
++	0x3a61, 0x080c, 0x396a, 0x05b8, 0x2001, 0x020b, 0x2004, 0x9084,
++	0x0140, 0x1db8, 0x080c, 0x3b7f, 0x00f6, 0x2079, 0x0300, 0x78bc,
++	0x00fe, 0x908c, 0x0070, 0x1560, 0x2071, 0x0200, 0x7037, 0x0000,
++	0x7050, 0x9084, 0xff00, 0x9086, 0x3200, 0x1510, 0x7037, 0x0001,
++	0x7050, 0x9084, 0xff00, 0x9086, 0xe100, 0x11d0, 0x7037, 0x0000,
++	0x7054, 0x7037, 0x0000, 0x715c, 0x9106, 0x1190, 0x2001, 0x181e,
++	0x2004, 0x9106, 0x1168, 0x00c6, 0x2061, 0x0100, 0x6024, 0x9084,
++	0x1e00, 0x00ce, 0x0138, 0x080c, 0x3974, 0x080c, 0x3779, 0x0058,
++	0x080c, 0x3779, 0x080c, 0x3ac3, 0x080c, 0x3a57, 0x2001, 0x020b,
++	0x2004, 0xd0e4, 0x0dd8, 0x2001, 0x032a, 0x2003, 0x0004, 0x2061,
++	0x0100, 0x6027, 0x0002, 0x001e, 0x6106, 0x2011, 0x020d, 0x2013,
++	0x0020, 0x60bb, 0x0000, 0x60bf, 0x0108, 0x60bf, 0x0012, 0x2001,
++	0x0004, 0x200c, 0x918c, 0xfffd, 0x2102, 0x080c, 0x1245, 0x2009,
++	0x0028, 0x080c, 0x2014, 0x2001, 0x0227, 0x200c, 0x2102, 0x00fe,
++	0x00ee, 0x00de, 0x00ce, 0x00be, 0x00ae, 0x009e, 0x008e, 0x004e,
++	0x2001, 0x196c, 0x2004, 0x9005, 0x1118, 0x012e, 0x0804, 0x305f,
++	0x012e, 0x2021, 0x400c, 0x0804, 0x3061, 0x0016, 0x0026, 0x0036,
++	0x0046, 0x0056, 0x0076, 0x0086, 0x0096, 0x00d6, 0x0156, 0x7010,
++	0x2048, 0x701c, 0x20a8, 0x8000, 0x701e, 0xa804, 0x9005, 0x0904,
++	0x36e9, 0x2048, 0x1f04, 0x369d, 0x7064, 0x2040, 0xa28c, 0xa390,
++	0xa494, 0xa598, 0xa930, 0xa808, 0xd0b4, 0x1120, 0x2029, 0x0000,
++	0x2021, 0x0000, 0x0096, 0x7010, 0x2048, 0xa864, 0x009e, 0x9086,
++	0x0103, 0x0170, 0x8906, 0x8006, 0x8007, 0x90bc, 0x003f, 0x9084,
++	0xffc0, 0x9080, 0x001b, 0x080c, 0x4468, 0x701b, 0x368d, 0x00b0,
++	0x8906, 0x8006, 0x8007, 0x90bc, 0x003f, 0x9084, 0xffc0, 0x9080,
++	0x001b, 0x21a8, 0x27e0, 0x2098, 0x27e8, 0x20a0, 0x0006, 0x080c,
++	0x0f2b, 0x000e, 0x080c, 0x446b, 0x701b, 0x368d, 0x015e, 0x00de,
++	0x009e, 0x008e, 0x007e, 0x005e, 0x004e, 0x003e, 0x002e, 0x001e,
++	0x0005, 0x7010, 0x2048, 0xa864, 0x9086, 0x0103, 0x1118, 0x701b,
++	0x374e, 0x0450, 0x7010, 0x2048, 0xa868, 0xc0fd, 0xa86a, 0x2009,
++	0x007f, 0x080c, 0x5bb0, 0x0110, 0x9006, 0x0030, 0xb813, 0x00ff,
++	0xb817, 0xfffd, 0x080c, 0xb535, 0x015e, 0x00de, 0x009e, 0x008e,
++	0x007e, 0x005e, 0x004e, 0x003e, 0x002e, 0x001e, 0x0904, 0x308f,
++	0x0016, 0x0026, 0x0036, 0x0046, 0x0056, 0x0076, 0x0086, 0x0096,
++	0x00d6, 0x0156, 0x701b, 0x3720, 0x7007, 0x0003, 0x0804, 0x36de,
++	0x0076, 0xa830, 0x9086, 0x0100, 0x2021, 0x400c, 0x0904, 0x3061,
++	0xad10, 0xac0c, 0xab24, 0xaa20, 0xa930, 0xa808, 0xd0b4, 0x1120,
++	0x2029, 0x0000, 0x2021, 0x0000, 0x8906, 0x8006, 0x8007, 0x90bc,
++	0x003f, 0x9084, 0xffc0, 0x9080, 0x001b, 0x21a8, 0x27e0, 0x2098,
++	0x27e8, 0x20a0, 0x0006, 0x080c, 0x0f2b, 0x000e, 0x080c, 0x446b,
++	0x007e, 0x701b, 0x368d, 0x701f, 0x0001, 0x0005, 0x0804, 0x305f,
++	0x0156, 0x00c6, 0xa814, 0x908a, 0x001e, 0x0218, 0xa833, 0x001e,
++	0x0010, 0xa832, 0x0078, 0x81ff, 0x0168, 0x0016, 0x080c, 0x441f,
++	0x001e, 0x0130, 0xa800, 0x2040, 0xa008, 0xa80a, 0x2100, 0x0c58,
++	0x9006, 0x0010, 0x9085, 0x0001, 0x00ce, 0x015e, 0x0005, 0x0006,
++	0x00f6, 0x2079, 0x0000, 0x7880, 0x9086, 0x0044, 0x00fe, 0x000e,
++	0x0005, 0x2001, 0x196c, 0x2003, 0x0001, 0x0005, 0x00f6, 0x00e6,
++	0x00c6, 0x2061, 0x0200, 0x2001, 0x1977, 0x2004, 0x601a, 0x2061,
++	0x0100, 0x2001, 0x1976, 0x2004, 0x60ce, 0x6104, 0xc1ac, 0x6106,
++	0x080c, 0x441f, 0xa813, 0x0019, 0xa817, 0x0001, 0x2900, 0xa85a,
++	0x2001, 0x002e, 0x2004, 0xa866, 0x2001, 0x002f, 0x2004, 0xa86a,
++	0x2061, 0x0090, 0x2079, 0x0100, 0x2001, 0x1976, 0x2004, 0x6036,
++	0x2009, 0x0040, 0x080c, 0x2014, 0x2001, 0x002a, 0x2004, 0x9084,
++	0xfff8, 0xa86e, 0x601a, 0xa873, 0x0000, 0x601f, 0x0000, 0x78ca,
++	0x9006, 0x600a, 0x600e, 0x00ce, 0x00ee, 0x00fe, 0x0005, 0x00e6,
++	0x080c, 0x441f, 0x2940, 0xa013, 0x0019, 0xa017, 0x0001, 0x2800,
++	0xa05a, 0x2001, 0x0030, 0x2004, 0xa866, 0x2001, 0x0031, 0x2004,
++	0xa86a, 0x2001, 0x002a, 0x2004, 0x9084, 0xfff8, 0xa86e, 0xa873,
++	0x0000, 0x2001, 0x032a, 0x2003, 0x0004, 0x2001, 0x0300, 0x2003,
++	0x0000, 0x2001, 0x020d, 0x2003, 0x0000, 0x2001, 0x0004, 0x200c,
++	0x918d, 0x0002, 0x2102, 0x00ee, 0x0005, 0x0126, 0x2091, 0x8000,
++	0x81ff, 0x0148, 0x080c, 0x27e7, 0x1130, 0x9006, 0x080c, 0x2747,
++	0x9006, 0x080c, 0x272a, 0x7884, 0x9084, 0x0007, 0x0002, 0x380a,
++	0x3813, 0x381c, 0x3807, 0x3807, 0x3807, 0x3807, 0x3807, 0x012e,
++	0x0804, 0x3092, 0x2009, 0x0114, 0x2104, 0x9085, 0x0800, 0x200a,
++	0x080c, 0x39ba, 0x00c0, 0x2009, 0x0114, 0x2104, 0x9085, 0x4000,
++	0x200a, 0x080c, 0x39ba, 0x0078, 0x080c, 0x6877, 0x1128, 0x012e,
++	0x2009, 0x0016, 0x0804, 0x308f, 0x81ff, 0x0128, 0x012e, 0x2021,
++	0x400b, 0x0804, 0x3061, 0x0086, 0x0096, 0x00a6, 0x00b6, 0x00c6,
++	0x00d6, 0x00e6, 0x00f6, 0x080c, 0x3535, 0x2009, 0x0101, 0x210c,
++	0x0016, 0x7ec8, 0x7dcc, 0x9006, 0x2068, 0x2060, 0x2058, 0x080c,
++	0x3c52, 0x080c, 0x3bab, 0x903e, 0x2720, 0x00f6, 0x00e6, 0x0086,
++	0x2940, 0x2071, 0x1a33, 0x2079, 0x0090, 0x00d6, 0x2069, 0x0000,
++	0x6884, 0xd0b4, 0x0120, 0x68d4, 0x780e, 0x68d0, 0x780a, 0x00de,
++	0x2011, 0x0001, 0x080c, 0x3b2b, 0x080c, 0x27ef, 0x080c, 0x27ef,
++	0x080c, 0x27ef, 0x080c, 0x27ef, 0x080c, 0x3b2b, 0x008e, 0x00ee,
++	0x00fe, 0x080c, 0x3a61, 0x2001, 0x020b, 0x2004, 0x9084, 0x0140,
++	0x1dd0, 0x00f6, 0x2079, 0x0000, 0x7884, 0x00fe, 0xd0bc, 0x0178,
++	0x2001, 0x0201, 0x200c, 0x81ff, 0x0150, 0x080c, 0x3a3f, 0x2d00,
++	0x9c05, 0x9b05, 0x0120, 0x080c, 0x3974, 0x0804, 0x3921, 0x080c,
++	0x3b7f, 0x080c, 0x3ac3, 0x080c, 0x3a22, 0x080c, 0x3a57, 0x00f6,
++	0x2079, 0x0100, 0x7824, 0xd0ac, 0x0130, 0x8b58, 0x080c, 0x3974,
++	0x00fe, 0x0804, 0x3921, 0x00fe, 0x080c, 0x396a, 0x1150, 0x8d68,
++	0x2001, 0x0032, 0x2602, 0x2001, 0x0033, 0x2502, 0x080c, 0x3974,
++	0x0080, 0x87ff, 0x0138, 0x2001, 0x0201, 0x2004, 0x9005, 0x1908,
++	0x8739, 0x0038, 0x2001, 0x1a30, 0x2004, 0x9086, 0x0000, 0x1904,
++	0x3871, 0x2001, 0x032f, 0x2003, 0x00f6, 0x8631, 0x1208, 0x8529,
++	0x2500, 0x9605, 0x0904, 0x3921, 0x7884, 0xd0bc, 0x0128, 0x2d00,
++	0x9c05, 0x9b05, 0x1904, 0x3921, 0xa013, 0x0019, 0x2001, 0x032a,
++	0x2003, 0x0004, 0x7884, 0xd0ac, 0x1148, 0x2001, 0x1a30, 0x2003,
++	0x0003, 0x2001, 0x032a, 0x2003, 0x0009, 0x0030, 0xa017, 0x0001,
++	0x78b4, 0x9005, 0x0108, 0xa016, 0x2800, 0xa05a, 0x2009, 0x0040,
++	0x080c, 0x2014, 0x2900, 0xa85a, 0xa813, 0x0019, 0x7884, 0xd0a4,
++	0x1180, 0xa817, 0x0000, 0x00c6, 0x20a9, 0x0004, 0x2061, 0x0090,
++	0x602b, 0x0008, 0x2001, 0x0203, 0x2004, 0x1f04, 0x38f8, 0x00ce,
++	0x0030, 0xa817, 0x0001, 0x78b0, 0x9005, 0x0108, 0xa816, 0x00f6,
++	0x00c6, 0x2079, 0x0100, 0x2061, 0x0090, 0x7827, 0x0002, 0x2001,
++	0x002a, 0x2004, 0x9084, 0xfff8, 0x601a, 0x0006, 0x2001, 0x002b,
++	0x2004, 0x601e, 0x78c6, 0x000e, 0x78ca, 0x00ce, 0x00fe, 0x0804,
++	0x3845, 0x001e, 0x00c6, 0x2001, 0x032a, 0x2003, 0x0004, 0x2061,
++	0x0100, 0x6027, 0x0002, 0x6106, 0x2011, 0x020d, 0x2013, 0x0020,
++	0x2001, 0x0004, 0x200c, 0x918c, 0xfffd, 0x2102, 0x080c, 0x1245,
++	0x7884, 0x9084, 0x0003, 0x9086, 0x0002, 0x01a0, 0x2009, 0x0028,
++	0x080c, 0x2014, 0x2001, 0x0227, 0x200c, 0x2102, 0x6050, 0x9084,
++	0xb7ef, 0x6052, 0x602f, 0x0000, 0x604b, 0xf7f7, 0x6043, 0x0090,
++	0x6043, 0x0010, 0x00ce, 0x2d08, 0x2c10, 0x2b18, 0x2b00, 0x9c05,
++	0x9d05, 0x00fe, 0x00ee, 0x00de, 0x00ce, 0x00be, 0x00ae, 0x009e,
++	0x008e, 0x1118, 0x012e, 0x0804, 0x305f, 0x012e, 0x2021, 0x400c,
++	0x0804, 0x3061, 0x9085, 0x0001, 0x1d04, 0x3973, 0x2091, 0x6000,
++	0x8420, 0x9486, 0x0064, 0x0005, 0x2001, 0x0105, 0x2003, 0x0010,
++	0x2001, 0x032a, 0x2003, 0x0004, 0x2001, 0x1a30, 0x2003, 0x0000,
++	0x0051, 0x2009, 0x0048, 0x080c, 0x2014, 0x2001, 0x0227, 0x2024,
++	0x2402, 0x9026, 0x0005, 0x00f6, 0x00e6, 0x2071, 0x1a33, 0x7000,
++	0x9086, 0x0000, 0x0520, 0x2079, 0x0090, 0x2009, 0x0206, 0x2104,
++	0x2009, 0x0203, 0x210c, 0x9106, 0x1120, 0x2009, 0x0040, 0x080c,
++	0x2014, 0x782c, 0xd0fc, 0x0d88, 0x080c, 0x3b7f, 0x7000, 0x9086,
++	0x0000, 0x1d58, 0x782b, 0x0004, 0x782c, 0xd0ac, 0x1de8, 0x2009,
++	0x0040, 0x080c, 0x2014, 0x782b, 0x0002, 0x7003, 0x0000, 0x00ee,
++	0x00fe, 0x0005, 0x00f6, 0x2079, 0x0100, 0x2001, 0x1816, 0x200c,
++	0x7932, 0x7936, 0x080c, 0x2446, 0x7850, 0x9084, 0xfbff, 0x9085,
++	0x0030, 0x7852, 0x2019, 0x01f4, 0x8319, 0x1df0, 0x9084, 0xffcf,
++	0x9085, 0x2000, 0x7852, 0x20a9, 0x0046, 0x1d04, 0x39d5, 0x2091,
++	0x6000, 0x1f04, 0x39d5, 0x7850, 0x9085, 0x0400, 0x9084, 0xdfff,
++	0x7852, 0x2001, 0x0021, 0x2004, 0x9084, 0x0003, 0x9086, 0x0001,
++	0x1120, 0x7850, 0x9084, 0xdfff, 0x7852, 0x784b, 0xf7f7, 0x7843,
++	0x0090, 0x7843, 0x0010, 0x20a9, 0x0028, 0xa001, 0x1f04, 0x39f5,
++	0x7850, 0x9085, 0x1400, 0x7852, 0x2019, 0x61a8, 0x7854, 0xa001,
++	0xa001, 0xd08c, 0x1110, 0x8319, 0x1dc8, 0x7827, 0x0048, 0x7850,
++	0x9085, 0x0400, 0x7852, 0x7843, 0x0040, 0x2019, 0x01f4, 0xa001,
++	0xa001, 0x8319, 0x1de0, 0x2001, 0x0100, 0x080c, 0x28a5, 0x7827,
++	0x0020, 0x7843, 0x0000, 0x9006, 0x080c, 0x28a5, 0x7827, 0x0048,
++	0x00fe, 0x0005, 0x7884, 0xd0ac, 0x11c8, 0x00f6, 0x00e6, 0x2071,
++	0x1a30, 0x2079, 0x0320, 0x2001, 0x0201, 0x2004, 0x9005, 0x0160,
++	0x7000, 0x9086, 0x0000, 0x1140, 0x0051, 0xd0bc, 0x0108, 0x8738,
++	0x7003, 0x0003, 0x782b, 0x0019, 0x00ee, 0x00fe, 0x0005, 0x00f6,
++	0x2079, 0x0300, 0x78bc, 0x00fe, 0x908c, 0x0070, 0x0178, 0x2009,
++	0x0032, 0x260a, 0x2009, 0x0033, 0x250a, 0xd0b4, 0x0108, 0x8c60,
++	0xd0ac, 0x0108, 0x8d68, 0xd0a4, 0x0108, 0x8b58, 0x0005, 0x00f6,
++	0x2079, 0x0200, 0x781c, 0xd084, 0x0110, 0x7837, 0x0050, 0x00fe,
++	0x0005, 0x00e6, 0x2071, 0x0100, 0x2001, 0x1977, 0x2004, 0x70e2,
++	0x080c, 0x376f, 0x1188, 0x2001, 0x181e, 0x2004, 0x2009, 0x181d,
++	0x210c, 0x918c, 0x00ff, 0x706e, 0x716a, 0x7066, 0x918d, 0x3200,
++	0x7162, 0x7073, 0xe109, 0x0080, 0x702c, 0x9085, 0x0002, 0x702e,
++	0x2009, 0x1816, 0x210c, 0x716e, 0x7063, 0x0100, 0x7166, 0x719e,
++	0x706b, 0x0000, 0x7073, 0x0809, 0x7077, 0x0008, 0x7078, 0x9080,
++	0x0100, 0x707a, 0x7080, 0x8000, 0x7082, 0x7087, 0xaaaa, 0x9006,
++	0x708a, 0x708e, 0x707e, 0x70d6, 0x70ab, 0x0036, 0x70af, 0x95d5,
++	0x7014, 0x9084, 0x1984, 0x9085, 0x0012, 0x7016, 0x080c, 0x3b7f,
++	0x00f6, 0x2071, 0x1a30, 0x2079, 0x0320, 0x00d6, 0x2069, 0x0000,
++	0x6884, 0xd0b4, 0x0120, 0x689c, 0x780e, 0x6898, 0x780a, 0x00de,
++	0x2011, 0x0011, 0x080c, 0x3b2b, 0x2011, 0x0001, 0x080c, 0x3b2b,
++	0x00fe, 0x00ee, 0x0005, 0x00f6, 0x00e6, 0x2071, 0x1a30, 0x2079,
++	0x0320, 0x792c, 0xd1fc, 0x0904, 0x3b28, 0x782b, 0x0002, 0x9026,
++	0xd19c, 0x1904, 0x3b24, 0x7000, 0x0002, 0x3b28, 0x3ad9, 0x3b09,
++	0x3b24, 0xd1bc, 0x1170, 0xd1dc, 0x1190, 0x8001, 0x7002, 0x2011,
++	0x0001, 0x080c, 0x3b2b, 0x0904, 0x3b28, 0x080c, 0x3b2b, 0x0804,
++	0x3b28, 0x00f6, 0x2079, 0x0300, 0x78bf, 0x0000, 0x00fe, 0x7810,
++	0x7914, 0x782b, 0x0004, 0x7812, 0x7916, 0x2001, 0x0201, 0x200c,
++	0x81ff, 0x0de8, 0x080c, 0x3a3f, 0x2009, 0x0001, 0x00f6, 0x2079,
++	0x0300, 0x78b8, 0x00fe, 0xd0ec, 0x0110, 0x2009, 0x0011, 0x792a,
++	0x00f8, 0x8001, 0x7002, 0x9184, 0x0880, 0x1140, 0x782c, 0xd0fc,
++	0x1904, 0x3acd, 0x2011, 0x0001, 0x00b1, 0x0090, 0xa010, 0x9092,
++	0x0004, 0x9086, 0x0015, 0x1120, 0xa000, 0xa05a, 0x2011, 0x0031,
++	0xa212, 0xd1dc, 0x1960, 0x0828, 0x782b, 0x0004, 0x7003, 0x0000,
++	0x00ee, 0x00fe, 0x0005, 0xa014, 0x9005, 0x0540, 0x8001, 0x0036,
++	0x0096, 0xa016, 0xa058, 0x2048, 0xa010, 0x2009, 0x0025, 0x911a,
++	0x831c, 0x831c, 0x938a, 0x0004, 0x1a0c, 0x0d84, 0x9398, 0x3b57,
++	0x231d, 0x083f, 0x9080, 0x0004, 0x7a2a, 0x7100, 0x8108, 0x7102,
++	0x009e, 0x003e, 0x908a, 0x0029, 0x1130, 0xa058, 0x2048, 0xa804,
++	0xa05a, 0x2001, 0x0019, 0xa012, 0x9085, 0x0001, 0x0005, 0x3b76,
++	0x3b6d, 0x3b64, 0x3b5b, 0xa964, 0x7902, 0xa968, 0x7906, 0xa96c,
++	0x7912, 0xa970, 0x7916, 0x0005, 0xa974, 0x7902, 0xa978, 0x7906,
++	0xa97c, 0x7912, 0xa980, 0x7916, 0x0005, 0xa984, 0x7902, 0xa988,
++	0x7906, 0xa98c, 0x7912, 0xa990, 0x7916, 0x0005, 0xa994, 0x7902,
++	0xa998, 0x7906, 0xa99c, 0x7912, 0xa9a0, 0x7916, 0x0005, 0x00f6,
++	0x00e6, 0x0086, 0x2071, 0x1a33, 0x2079, 0x0090, 0x792c, 0xd1fc,
++	0x01f0, 0x782b, 0x0002, 0x2940, 0x9026, 0x7000, 0x0002, 0x3ba7,
++	0x3b92, 0x3b9e, 0x8001, 0x7002, 0xd19c, 0x1188, 0x2011, 0x0001,
++	0x080c, 0x3b2b, 0x0160, 0x080c, 0x3b2b, 0x0048, 0x8001, 0x7002,
++	0x782c, 0xd0fc, 0x1d30, 0x2011, 0x0001, 0x080c, 0x3b2b, 0x008e,
++	0x00ee, 0x00fe, 0x0005, 0x00f6, 0x00e6, 0x00c6, 0x0086, 0x2061,
++	0x0200, 0x2001, 0x1977, 0x2004, 0x601a, 0x2061, 0x0100, 0x2001,
++	0x1976, 0x2004, 0x60ce, 0x6104, 0xc1ac, 0x6106, 0x2001, 0x002c,
++	0x2004, 0x9005, 0x0518, 0x2038, 0x2001, 0x002e, 0x2024, 0x2001,
++	0x002f, 0x201c, 0x080c, 0x441f, 0xa813, 0x0019, 0xaf16, 0x2900,
++	0xa85a, 0x978a, 0x0007, 0x0220, 0x2138, 0x2009, 0x0007, 0x0010,
++	0x2708, 0x903e, 0x0096, 0xa858, 0x2048, 0xa85c, 0x9080, 0x0019,
++	0x009e, 0x04c1, 0x1d70, 0x2900, 0xa85a, 0x0080, 0x080c, 0x441f,
++	0xa813, 0x0019, 0xa817, 0x0001, 0x2900, 0xa85a, 0x2001, 0x002e,
++	0x2004, 0xa866, 0x2001, 0x002f, 0x2004, 0xa86a, 0x2061, 0x0090,
++	0x2079, 0x0100, 0x2001, 0x1976, 0x2004, 0x6036, 0x2009, 0x0040,
++	0x080c, 0x2014, 0x2001, 0x002a, 0x2004, 0x9084, 0xfff8, 0xa86e,
++	0x601a, 0x0006, 0x2001, 0x002b, 0x2004, 0xa872, 0x601e, 0x78c6,
++	0x000e, 0x78ca, 0x9006, 0x600a, 0x600e, 0x008e, 0x00ce, 0x00ee,
++	0x00fe, 0x0005, 0x00e6, 0x2071, 0x0080, 0xaa60, 0x22e8, 0x20a0,
++	0x20e1, 0x0000, 0x2099, 0x0088, 0x702b, 0x0026, 0x7402, 0x7306,
++	0x9006, 0x700a, 0x700e, 0x810b, 0x810b, 0x21a8, 0x810b, 0x7112,
++	0x702b, 0x0041, 0x702c, 0xd0fc, 0x0de8, 0x702b, 0x0002, 0x702b,
++	0x0040, 0x4005, 0x7400, 0x7304, 0x87ff, 0x0190, 0x0086, 0x0096,
++	0x2940, 0x0086, 0x080c, 0x441f, 0x008e, 0xa058, 0x00a6, 0x2050,
++	0x2900, 0xb006, 0xa05a, 0x00ae, 0x009e, 0x008e, 0x9085, 0x0001,
++	0x00ee, 0x0005, 0x00e6, 0x2001, 0x002d, 0x2004, 0x9005, 0x0528,
++	0x2038, 0x2001, 0x0030, 0x2024, 0x2001, 0x0031, 0x201c, 0x080c,
++	0x441f, 0x2940, 0xa813, 0x0019, 0xaf16, 0x2900, 0xa85a, 0x978a,
++	0x0007, 0x0220, 0x2138, 0x2009, 0x0007, 0x0010, 0x2708, 0x903e,
++	0x0096, 0xa858, 0x2048, 0xa85c, 0x9080, 0x0019, 0x009e, 0x080c,
++	0x3c1a, 0x1d68, 0x2900, 0xa85a, 0x00d8, 0x080c, 0x441f, 0x2940,
++	0xa013, 0x0019, 0xa017, 0x0001, 0x2800, 0xa05a, 0x2001, 0x0030,
++	0x2004, 0xa066, 0x2001, 0x0031, 0x2004, 0xa06a, 0x2001, 0x002a,
++	0x2004, 0x9084, 0xfff8, 0xa06e, 0x2001, 0x002b, 0x2004, 0xa072,
++	0x2001, 0x032a, 0x2003, 0x0004, 0x7884, 0xd0ac, 0x1180, 0x2001,
++	0x0101, 0x200c, 0x918d, 0x0200, 0x2102, 0xa017, 0x0000, 0x2001,
++	0x1a30, 0x2003, 0x0003, 0x2001, 0x032a, 0x2003, 0x0009, 0x2001,
++	0x0300, 0x2003, 0x0000, 0x2001, 0x020d, 0x2003, 0x0000, 0x2001,
++	0x0004, 0x200c, 0x918d, 0x0002, 0x2102, 0x00ee, 0x0005, 0x0126,
++	0x2091, 0x8000, 0x20a9, 0x0012, 0x2001, 0x1840, 0x20e9, 0x0001,
++	0x20a0, 0x9006, 0x4004, 0x2009, 0x013c, 0x200a, 0x012e, 0x7880,
++	0x9086, 0x0052, 0x0108, 0x0005, 0x0804, 0x305f, 0x7d98, 0x7c9c,
++	0x0804, 0x3154, 0x080c, 0x6877, 0x0110, 0x080c, 0x569e, 0x2069,
++	0x1852, 0x2d00, 0x2009, 0x0030, 0x7a8c, 0x7b88, 0x7c9c, 0x7d98,
++	0x2039, 0x0001, 0x080c, 0x4468, 0x701b, 0x3cef, 0x0005, 0x080c,
++	0x4df9, 0x1130, 0x3b00, 0x3a08, 0xc194, 0xc095, 0x20d8, 0x21d0,
++	0x2069, 0x1852, 0x6800, 0x9005, 0x0904, 0x3092, 0x6804, 0xd0ac,
++	0x0118, 0xd0a4, 0x0904, 0x3092, 0xd094, 0x00c6, 0x2061, 0x0100,
++	0x6104, 0x0138, 0x6200, 0x9292, 0x0005, 0x0218, 0x918c, 0xffdf,
++	0x0010, 0x918d, 0x0020, 0x6106, 0x00ce, 0xd08c, 0x00c6, 0x2061,
++	0x0100, 0x6104, 0x0118, 0x918d, 0x0010, 0x0010, 0x918c, 0xffef,
++	0x6106, 0x00ce, 0xd084, 0x0158, 0x6a28, 0x928a, 0x007f, 0x1a04,
++	0x3092, 0x9288, 0x2e6e, 0x210d, 0x918c, 0x00ff, 0x615e, 0xd0dc,
++	0x0130, 0x6828, 0x908a, 0x007f, 0x1a04, 0x3092, 0x6056, 0x6888,
++	0x9084, 0x0030, 0x8004, 0x8004, 0x8004, 0x8004, 0x0006, 0x2009,
++	0x197e, 0x9080, 0x2539, 0x2005, 0x200a, 0x000e, 0x2009, 0x197f,
++	0x9080, 0x253d, 0x2005, 0x200a, 0x6808, 0x908a, 0x0100, 0x0a04,
++	0x3092, 0x908a, 0x0841, 0x1a04, 0x3092, 0x9084, 0x0007, 0x1904,
++	0x3092, 0x680c, 0x9005, 0x0904, 0x3092, 0x6810, 0x9005, 0x0904,
++	0x3092, 0x6848, 0x6940, 0x910a, 0x1a04, 0x3092, 0x8001, 0x0904,
++	0x3092, 0x684c, 0x6944, 0x910a, 0x1a04, 0x3092, 0x8001, 0x0904,
++	0x3092, 0x6980, 0xd1e4, 0x0140, 0x00c6, 0x2061, 0x0100, 0x6004,
++	0x9085, 0x0100, 0x6006, 0x00ce, 0x2009, 0x194e, 0x200b, 0x0000,
++	0x2001, 0x1874, 0x2004, 0xd0c4, 0x0140, 0x7884, 0x200a, 0x2009,
++	0x017f, 0x200a, 0x3b00, 0xc085, 0x20d8, 0x6814, 0x908c, 0x00ff,
++	0x6146, 0x8007, 0x9084, 0x00ff, 0x604a, 0x080c, 0x6b71, 0x080c,
++	0x5f63, 0x080c, 0x5f97, 0x6808, 0x602a, 0x080c, 0x1f86, 0x2009,
++	0x0170, 0x200b, 0x0080, 0xa001, 0xa001, 0x200b, 0x0000, 0x0036,
++	0x6b08, 0x080c, 0x24a0, 0x003e, 0x6000, 0x9086, 0x0000, 0x1904,
++	0x3e96, 0x6818, 0x691c, 0x6a20, 0x6b24, 0x8007, 0x810f, 0x8217,
++	0x831f, 0x6016, 0x611a, 0x621e, 0x6322, 0x6c04, 0xd4f4, 0x0148,
++	0x6830, 0x6934, 0x6a38, 0x6b3c, 0x8007, 0x810f, 0x8217, 0x831f,
++	0x0010, 0x9084, 0xf0ff, 0x6006, 0x610a, 0x620e, 0x6312, 0x8007,
++	0x810f, 0x8217, 0x831f, 0x20a9, 0x0004, 0x20a1, 0x1980, 0x20e9,
++	0x0001, 0x4001, 0x20a9, 0x0004, 0x20a1, 0x199a, 0x20e9, 0x0001,
++	0x4001, 0x080c, 0x791c, 0x00c6, 0x900e, 0x20a9, 0x0001, 0x6b70,
++	0xd384, 0x0510, 0x0068, 0x2009, 0x0100, 0x210c, 0x918e, 0x0008,
++	0x1110, 0x839d, 0x0010, 0x83f5, 0x3e18, 0x12b0, 0x3508, 0x8109,
++	0x080c, 0x70f4, 0x6878, 0x6016, 0x6874, 0x2008, 0x9084, 0xff00,
++	0x8007, 0x600a, 0x9184, 0x00ff, 0x6006, 0x8108, 0x1118, 0x6003,
++	0x0003, 0x0010, 0x6003, 0x0001, 0x1f04, 0x3deb, 0x00ce, 0x00c6,
++	0x2061, 0x1969, 0x6a88, 0x9284, 0xc000, 0x2010, 0x9286, 0x0000,
++	0x1158, 0x2063, 0x0000, 0x2001, 0x0001, 0x080c, 0x2747, 0x2001,
++	0x0001, 0x080c, 0x272a, 0x0088, 0x9286, 0x4000, 0x1148, 0x2063,
++	0x0001, 0x9006, 0x080c, 0x2747, 0x9006, 0x080c, 0x272a, 0x0028,
++	0x9286, 0x8000, 0x1d30, 0x2063, 0x0002, 0x00ce, 0x00e6, 0x2c70,
++	0x080c, 0x0e3b, 0x00ee, 0x6888, 0xd0ec, 0x0130, 0x2011, 0x0114,
++	0x2204, 0x9085, 0x0100, 0x2012, 0x6a80, 0x9284, 0x0030, 0x9086,
++	0x0030, 0x1128, 0x9294, 0xffcf, 0x9295, 0x0020, 0x6a82, 0x2001,
++	0x194b, 0x6a80, 0x9294, 0x0030, 0x928e, 0x0000, 0x0170, 0x928e,
++	0x0010, 0x0118, 0x928e, 0x0020, 0x0140, 0x2003, 0xaaaa, 0x080c,
++	0x2515, 0x2001, 0x193c, 0x2102, 0x0008, 0x2102, 0x00c6, 0x2061,
++	0x0100, 0x602f, 0x0040, 0x602f, 0x0000, 0x00ce, 0x080c, 0x6877,
++	0x0128, 0x080c, 0x46fa, 0x0110, 0x080c, 0x2466, 0x60d0, 0x9005,
++	0x01c0, 0x6003, 0x0001, 0x2009, 0x3e7e, 0x00d0, 0x080c, 0x6877,
++	0x1168, 0x2011, 0x6739, 0x080c, 0x781a, 0x2011, 0x672c, 0x080c,
++	0x78e7, 0x080c, 0x6b45, 0x080c, 0x67be, 0x0040, 0x080c, 0x55a0,
++	0x0028, 0x6003, 0x0004, 0x2009, 0x3e96, 0x0010, 0x0804, 0x305f,
++	0x2001, 0x0170, 0x2004, 0x9084, 0x00ff, 0x9086, 0x004c, 0x1118,
++	0x2091, 0x30bd, 0x0817, 0x2091, 0x303d, 0x0817, 0x6000, 0x9086,
++	0x0000, 0x0904, 0x308f, 0x2069, 0x1852, 0x7890, 0x6842, 0x7894,
++	0x6846, 0x2d00, 0x2009, 0x0030, 0x7a8c, 0x7b88, 0x7c9c, 0x7d98,
++	0x2039, 0x0001, 0x0804, 0x446b, 0x9006, 0x080c, 0x2466, 0x81ff,
++	0x1904, 0x308f, 0x080c, 0x6877, 0x1168, 0x080c, 0x6b40, 0x080c,
++	0x56d9, 0x080c, 0x2e69, 0x0118, 0x6130, 0xc18d, 0x6132, 0x080c,
++	0x67be, 0x0020, 0x080c, 0x569e, 0x080c, 0x55a0, 0x0804, 0x305f,
++	0x81ff, 0x1904, 0x308f, 0x080c, 0x6877, 0x1110, 0x0804, 0x308f,
++	0x618c, 0x81ff, 0x01a8, 0x704b, 0x0000, 0x2001, 0x1c80, 0x2009,
++	0x0040, 0x7a8c, 0x7b88, 0x7c9c, 0x7d98, 0x0126, 0x2091, 0x8000,
++	0x2039, 0x0001, 0x080c, 0x446b, 0x701b, 0x305d, 0x012e, 0x0005,
++	0x704b, 0x0001, 0x00d6, 0x2069, 0x1c80, 0x20a9, 0x0040, 0x20e9,
++	0x0001, 0x20a1, 0x1c80, 0x2019, 0xffff, 0x4304, 0x6554, 0x9588,
++	0x2e6e, 0x210d, 0x918c, 0x00ff, 0x216a, 0x900e, 0x2011, 0x0002,
++	0x2100, 0x9506, 0x01a8, 0x080c, 0x5c0d, 0x1190, 0xb814, 0x821c,
++	0x0238, 0x9398, 0x1c80, 0x9085, 0xff00, 0x8007, 0x201a, 0x0038,
++	0x9398, 0x1c80, 0x2324, 0x94a4, 0xff00, 0x9405, 0x201a, 0x8210,
++	0x8108, 0x9182, 0x0080, 0x1208, 0x0c18, 0x8201, 0x8007, 0x2d0c,
++	0x9105, 0x206a, 0x00de, 0x20a9, 0x0040, 0x20a1, 0x1c80, 0x2099,
++	0x1c80, 0x080c, 0x5634, 0x0804, 0x3ee5, 0x080c, 0x4452, 0x0904,
++	0x3092, 0x080c, 0x441f, 0x1120, 0x2009, 0x0002, 0x0804, 0x308f,
++	0x080c, 0x4dea, 0xd0b4, 0x0558, 0x7884, 0x908e, 0x007e, 0x0538,
++	0x908e, 0x007f, 0x0520, 0x908e, 0x0080, 0x0508, 0x080c, 0x2e64,
++	0x1148, 0xb800, 0xd08c, 0x11d8, 0xb804, 0x9084, 0x00ff, 0x9086,
++	0x0006, 0x11a8, 0xa867, 0x0000, 0xa868, 0xc0fd, 0xa86a, 0x080c,
++	0xb258, 0x1120, 0x2009, 0x0003, 0x0804, 0x308f, 0x7007, 0x0003,
++	0x701b, 0x3f73, 0x0005, 0x080c, 0x4452, 0x0904, 0x3092, 0x20a9,
++	0x002b, 0xb8b4, 0x20e0, 0xb8b8, 0x2098, 0xa860, 0x20e8, 0xa85c,
++	0x9080, 0x0002, 0x20a0, 0x4003, 0x20a9, 0x0008, 0x9080, 0x0006,
++	0x20a0, 0xb8b4, 0x20e0, 0xb8b8, 0x9080, 0x0006, 0x2098, 0x080c,
++	0x0f2b, 0x0070, 0x20a9, 0x0004, 0xa85c, 0x9080, 0x000a, 0x20a0,
++	0xb8b4, 0x20e0, 0xb8b8, 0x9080, 0x000a, 0x2098, 0x080c, 0x0f2b,
++	0x8906, 0x8006, 0x8007, 0x90bc, 0x003f, 0x9084, 0xffc0, 0x9080,
++	0x0002, 0x2009, 0x002b, 0x7a8c, 0x7b88, 0x7c9c, 0x7d98, 0x0804,
++	0x446b, 0x81ff, 0x1904, 0x308f, 0x080c, 0x4436, 0x0904, 0x3092,
++	0x080c, 0x5d7f, 0x0904, 0x308f, 0x0058, 0xa878, 0x9005, 0x0120,
++	0x2009, 0x0004, 0x0804, 0x308f, 0xa974, 0xaa94, 0x0804, 0x305f,
++	0x080c, 0x4df2, 0x0904, 0x305f, 0x701b, 0x3fbd, 0x7007, 0x0003,
++	0x0005, 0x81ff, 0x1904, 0x308f, 0x7888, 0x908a, 0x1000, 0x1a04,
++	0x3092, 0x080c, 0x4452, 0x0904, 0x3092, 0x080c, 0x5e04, 0x0904,
++	0x308f, 0x2019, 0x0004, 0x900e, 0x080c, 0x5d91, 0x0904, 0x308f,
++	0x7984, 0x7a88, 0x0499, 0x08e0, 0xa89c, 0x908a, 0x1000, 0x12c8,
++	0x080c, 0x4450, 0x01b0, 0x080c, 0x5e04, 0x2009, 0x0002, 0x0168,
++	0x2009, 0x0002, 0x2019, 0x0004, 0x080c, 0x5d91, 0x2009, 0x0003,
++	0x0120, 0xa998, 0xaa9c, 0x00d1, 0x0060, 0xa897, 0x4005, 0xa99a,
++	0x0010, 0xa897, 0x4006, 0x900e, 0x9085, 0x0001, 0x2001, 0x0030,
++	0x0005, 0xa897, 0x4000, 0x080c, 0x4df2, 0x0110, 0x9006, 0x0018,
++	0x900e, 0x9085, 0x0001, 0x2001, 0x0000, 0x0005, 0x9186, 0x00ff,
++	0x0110, 0x0071, 0x0060, 0x2029, 0x007e, 0x2061, 0x1800, 0x6454,
++	0x2400, 0x9506, 0x0110, 0x2508, 0x0019, 0x8529, 0x1ec8, 0x0005,
++	0x080c, 0x5c0d, 0x1138, 0x2200, 0x8003, 0x800b, 0x810b, 0x9108,
++	0x080c, 0x7826, 0x0005, 0x81ff, 0x1904, 0x308f, 0x080c, 0x4436,
++	0x0904, 0x3092, 0x080c, 0x5cd4, 0x0904, 0x308f, 0x080c, 0x5d88,
++	0x0904, 0x308f, 0x0804, 0x3fc8, 0x81ff, 0x1904, 0x308f, 0x080c,
++	0x4436, 0x0904, 0x3092, 0x080c, 0x5cd4, 0x0904, 0x308f, 0x080c,
++	0x5d76, 0x0904, 0x308f, 0x0804, 0x3fc8, 0x6100, 0x0804, 0x305f,
++	0x080c, 0x4452, 0x0904, 0x3092, 0x080c, 0x4dfe, 0x1904, 0x308f,
++	0x79a8, 0xd184, 0x1158, 0xb834, 0x8007, 0x789e, 0xb830, 0x8007,
++	0x789a, 0xbb2c, 0x831f, 0xba28, 0x8217, 0x0050, 0xb824, 0x8007,
++	0x789e, 0xb820, 0x8007, 0x789a, 0xbb1c, 0x831f, 0xba18, 0x8217,
++	0xb900, 0x918c, 0x0200, 0x0804, 0x305f, 0x78a8, 0x909c, 0x0003,
++	0xd0b4, 0x1150, 0x939a, 0x0003, 0x1a04, 0x308f, 0x6254, 0x9294,
++	0x00ff, 0x7884, 0x9206, 0x1560, 0x2031, 0x1848, 0x2009, 0x013c,
++	0x2136, 0x2001, 0x1840, 0x2009, 0x000c, 0x7a8c, 0x7b88, 0x7c9c,
++	0x7d98, 0x2039, 0x0001, 0x0006, 0x78a8, 0x9084, 0x0080, 0x1118,
++	0x000e, 0x0804, 0x446b, 0x000e, 0x2031, 0x0000, 0x2061, 0x18ac,
++	0x2c44, 0xa66a, 0xa17a, 0xa772, 0xa076, 0xa28e, 0xa392, 0xa496,
++	0xa59a, 0x080c, 0x108c, 0x7007, 0x0002, 0x701b, 0x40df, 0x0005,
++	0x81ff, 0x1904, 0x308f, 0x080c, 0x4452, 0x0904, 0x3092, 0x080c,
++	0x5f2d, 0x1904, 0x308f, 0x00c6, 0x080c, 0x441f, 0x00ce, 0x0904,
++	0x308f, 0xa867, 0x0000, 0xa868, 0xc0fd, 0xa86a, 0x080c, 0xb1fe,
++	0x0904, 0x308f, 0x7007, 0x0003, 0x701b, 0x40e3, 0x0005, 0x080c,
++	0x3cbf, 0x0804, 0x305f, 0xa830, 0x9086, 0x0100, 0x0904, 0x308f,
++	0x8906, 0x8006, 0x8007, 0x90bc, 0x003f, 0x9084, 0xffc0, 0x9080,
++	0x001b, 0x2009, 0x000c, 0x7a8c, 0x7b88, 0x7c9c, 0x7d98, 0x0804,
++	0x446b, 0x9006, 0x080c, 0x2466, 0x78a8, 0x9084, 0x00ff, 0x9086,
++	0x00ff, 0x0118, 0x81ff, 0x1904, 0x308f, 0x080c, 0x6877, 0x0110,
++	0x080c, 0x569e, 0x7888, 0x908a, 0x1000, 0x1a04, 0x3092, 0x7984,
++	0x9186, 0x00ff, 0x0138, 0x9182, 0x007f, 0x1a04, 0x3092, 0x2100,
++	0x080c, 0x2430, 0x0026, 0x00c6, 0x0126, 0x2091, 0x8000, 0x2061,
++	0x19c7, 0x601b, 0x0000, 0x601f, 0x0000, 0x080c, 0x6877, 0x1158,
++	0x080c, 0x6b40, 0x080c, 0x56d9, 0x9085, 0x0001, 0x080c, 0x68c0,
++	0x080c, 0x67be, 0x00d0, 0x080c, 0x94da, 0x2061, 0x0100, 0x2001,
++	0x1816, 0x2004, 0x9084, 0x00ff, 0x810f, 0x9105, 0x604a, 0x6043,
++	0x0090, 0x6043, 0x0010, 0x2009, 0x1966, 0x200b, 0x0000, 0x2009,
++	0x002d, 0x2011, 0x55ca, 0x080c, 0x78a5, 0x7984, 0x080c, 0x6877,
++	0x1110, 0x2009, 0x00ff, 0x7a88, 0x080c, 0x401e, 0x012e, 0x00ce,
++	0x002e, 0x0804, 0x305f, 0x7984, 0x080c, 0x5bb0, 0x2b08, 0x1904,
++	0x3092, 0x0804, 0x305f, 0x81ff, 0x0120, 0x2009, 0x0001, 0x0804,
++	0x308f, 0x60d8, 0xd0ac, 0x1130, 0xd09c, 0x1120, 0x2009, 0x0005,
++	0x0804, 0x308f, 0x080c, 0x441f, 0x1120, 0x2009, 0x0002, 0x0804,
++	0x308f, 0x7984, 0x7a8c, 0x7b88, 0x7c9c, 0x7d98, 0xa85c, 0x9080,
++	0x0019, 0x7026, 0xaf60, 0x7732, 0x080c, 0x4468, 0x701b, 0x4189,
++	0x0005, 0x2009, 0x0080, 0x080c, 0x5c0d, 0x1118, 0x080c, 0x5f2d,
++	0x0120, 0x2021, 0x400a, 0x0804, 0x3061, 0x00d6, 0x0096, 0xa964,
++	0xaa6c, 0xab70, 0xac74, 0xad78, 0xae7c, 0xa884, 0x90be, 0x0100,
++	0x0904, 0x4222, 0x90be, 0x0112, 0x0904, 0x4222, 0x90be, 0x0113,
++	0x0904, 0x4222, 0x90be, 0x0114, 0x0904, 0x4222, 0x90be, 0x0117,
++	0x0904, 0x4222, 0x90be, 0x011a, 0x0904, 0x4222, 0x90be, 0x011c,
++	0x0904, 0x4222, 0x90be, 0x0121, 0x0904, 0x4209, 0x90be, 0x0131,
++	0x0904, 0x4209, 0x90be, 0x0171, 0x0904, 0x4222, 0x90be, 0x0173,
++	0x0904, 0x4222, 0x90be, 0x01a1, 0x1128, 0xa894, 0x8007, 0xa896,
++	0x0804, 0x422d, 0x90be, 0x0212, 0x0904, 0x4216, 0x90be, 0x0213,
++	0x05e8, 0x90be, 0x0214, 0x0500, 0x90be, 0x0217, 0x0188, 0x90be,
++	0x021a, 0x1120, 0xa89c, 0x8007, 0xa89e, 0x04e0, 0x90be, 0x021f,
++	0x05c8, 0x90be, 0x0300, 0x05b0, 0x009e, 0x00de, 0x0804, 0x3092,
++	0x7024, 0x9080, 0x0010, 0x2098, 0x20a0, 0x7030, 0x20e0, 0x20e8,
++	0x20a9, 0x0007, 0x080c, 0x426b, 0x7024, 0x9080, 0x000e, 0x2098,
++	0x20a0, 0x7030, 0x20e0, 0x20e8, 0x20a9, 0x0001, 0x080c, 0x426b,
++	0x00c8, 0x7024, 0x9080, 0x000c, 0x2098, 0x20a0, 0x7030, 0x20e0,
++	0x20e8, 0x20a9, 0x0001, 0x080c, 0x4278, 0x00b8, 0x7024, 0x9080,
++	0x000e, 0x2098, 0x20a0, 0x7030, 0x20e0, 0x20e8, 0x20a9, 0x0001,
++	0x080c, 0x4278, 0x7024, 0x9080, 0x000c, 0x2098, 0x20a0, 0x7030,
++	0x20e0, 0x20e8, 0x20a9, 0x0001, 0x04f1, 0x00c6, 0x080c, 0x441f,
++	0x0550, 0xa868, 0xc0fd, 0xa86a, 0xa867, 0x0119, 0x9006, 0xa882,
++	0xa87f, 0x0020, 0xa88b, 0x0001, 0x810b, 0xa9ae, 0xa8b2, 0xaab6,
++	0xabba, 0xacbe, 0xadc2, 0xa9c6, 0xa8ca, 0x00ce, 0x009e, 0x00de,
++	0xa866, 0xa822, 0xa868, 0xc0fd, 0xa86a, 0xa804, 0x2048, 0x080c,
++	0xb219, 0x1120, 0x2009, 0x0003, 0x0804, 0x308f, 0x7007, 0x0003,
++	0x701b, 0x4262, 0x0005, 0x00ce, 0x009e, 0x00de, 0x2009, 0x0002,
++	0x0804, 0x308f, 0xa820, 0x9086, 0x8001, 0x1904, 0x305f, 0x2009,
++	0x0004, 0x0804, 0x308f, 0x0016, 0x0026, 0x3510, 0x20a9, 0x0002,
++	0x4002, 0x4104, 0x4004, 0x8211, 0x1dc8, 0x002e, 0x001e, 0x0005,
++	0x0016, 0x0026, 0x0036, 0x0046, 0x3520, 0x20a9, 0x0004, 0x4002,
++	0x4304, 0x4204, 0x4104, 0x4004, 0x8421, 0x1db8, 0x004e, 0x003e,
++	0x002e, 0x001e, 0x0005, 0x81ff, 0x0120, 0x2009, 0x0001, 0x0804,
++	0x308f, 0x60d8, 0xd0ac, 0x1130, 0xd09c, 0x1120, 0x2009, 0x0005,
++	0x0804, 0x308f, 0x7984, 0x78a8, 0x2040, 0x080c, 0x94d3, 0x1120,
++	0x9182, 0x007f, 0x0a04, 0x3092, 0x9186, 0x00ff, 0x0904, 0x3092,
++	0x9182, 0x0800, 0x1a04, 0x3092, 0x7a8c, 0x7b88, 0x6074, 0x9306,
++	0x1140, 0x6078, 0x924e, 0x0904, 0x3092, 0x99cc, 0xff00, 0x0904,
++	0x3092, 0x080c, 0x435a, 0x0538, 0x90c6, 0x4000, 0x1170, 0x00c6,
++	0x0006, 0x900e, 0x080c, 0x5e2d, 0x1108, 0xc185, 0xb800, 0xd0bc,
++	0x0108, 0xc18d, 0x000e, 0x00ce, 0x0098, 0x90c6, 0x4007, 0x1110,
++	0x2408, 0x0070, 0x90c6, 0x4008, 0x1118, 0x2708, 0x2610, 0x0040,
++	0x90c6, 0x4009, 0x1108, 0x0020, 0x2001, 0x4005, 0x2009, 0x000a,
++	0x2020, 0x0804, 0x3061, 0x2b00, 0x7022, 0x0016, 0x00b6, 0x00c6,
++	0x00e6, 0x2c70, 0x080c, 0x95a1, 0x0904, 0x4330, 0x2b00, 0x6012,
++	0x080c, 0xb4e6, 0x2e58, 0x00ee, 0x00e6, 0x00c6, 0x080c, 0x441f,
++	0x00ce, 0x2b70, 0x1150, 0x080c, 0x9554, 0x00ee, 0x00ce, 0x00be,
++	0x001e, 0x2009, 0x0002, 0x0804, 0x308f, 0x900e, 0xa966, 0xa96a,
++	0x2900, 0x6016, 0xa932, 0xa868, 0xc0fd, 0xd88c, 0x0108, 0xc0f5,
++	0xa86a, 0x0126, 0x2091, 0x8000, 0x080c, 0x2d1a, 0x012e, 0x6023,
++	0x0001, 0x9006, 0x080c, 0x5b4d, 0x2001, 0x0002, 0x080c, 0x5b61,
++	0x2009, 0x0002, 0x080c, 0x95ce, 0x78a8, 0xd094, 0x0138, 0x00ee,
++	0x7020, 0x00e6, 0x2058, 0xb8bc, 0xc08d, 0xb8be, 0x9085, 0x0001,
++	0x00ee, 0x00ce, 0x00be, 0x001e, 0x1120, 0x2009, 0x0003, 0x0804,
++	0x308f, 0x7007, 0x0003, 0x701b, 0x433e, 0x0005, 0xa830, 0x9086,
++	0x0100, 0x7020, 0x2058, 0x1138, 0x2009, 0x0004, 0xba04, 0x9294,
++	0x00ff, 0x0804, 0x4d49, 0x900e, 0xa868, 0xd0f4, 0x1904, 0x305f,
++	0x080c, 0x5e2d, 0x1108, 0xc185, 0xb800, 0xd0bc, 0x0108, 0xc18d,
++	0x0804, 0x305f, 0x00e6, 0x00d6, 0x2029, 0x0000, 0x080c, 0x94d3,
++	0x0138, 0x2021, 0x0000, 0x20a9, 0x0800, 0x2071, 0x1000, 0x0030,
++	0x2021, 0x0080, 0x20a9, 0x0780, 0x2071, 0x1080, 0x2e04, 0x9005,
++	0x1130, 0x2100, 0x9406, 0x1550, 0x2428, 0xc5fd, 0x0438, 0x2058,
++	0xbf10, 0x2700, 0x9306, 0x11a0, 0xbe14, 0x2600, 0x9206, 0x1180,
++	0x2400, 0x9106, 0x1150, 0xd884, 0x0550, 0xd894, 0x1540, 0x080c,
++	0x5f2d, 0x1528, 0x2001, 0x4000, 0x0418, 0x2001, 0x4007, 0x0400,
++	0x2400, 0x9106, 0x1158, 0xbe14, 0x87ff, 0x1128, 0x86ff, 0x09e0,
++	0x080c, 0x94d3, 0x19c8, 0x2001, 0x4008, 0x0090, 0x8420, 0x8e70,
++	0x1f04, 0x436e, 0x85ff, 0x1130, 0x2001, 0x4009, 0x0048, 0x2001,
++	0x0001, 0x0030, 0x080c, 0x5bb0, 0x1dd0, 0xbb12, 0xba16, 0x9006,
++	0x9005, 0x00de, 0x00ee, 0x0005, 0x81ff, 0x1904, 0x308f, 0x080c,
++	0x441f, 0x0904, 0x308f, 0xa867, 0x0000, 0xa868, 0xc0fd, 0xa86a,
++	0x7884, 0x9005, 0x0904, 0x3092, 0x9096, 0x00ff, 0x0120, 0x9092,
++	0x0004, 0x1a04, 0x3092, 0x2010, 0x2918, 0x080c, 0x2cc0, 0x0904,
++	0x308f, 0x7007, 0x0003, 0x701b, 0x43d6, 0x0005, 0xa830, 0x9086,
++	0x0100, 0x0904, 0x308f, 0x0804, 0x305f, 0x7984, 0x080c, 0x94d3,
++	0x1120, 0x9182, 0x0080, 0x0a04, 0x3092, 0x9186, 0x00ff, 0x0904,
++	0x3092, 0x9182, 0x0800, 0x1a04, 0x3092, 0x2001, 0x9000, 0x080c,
++	0x4da2, 0x1904, 0x308f, 0x0804, 0x305f, 0xa998, 0x080c, 0x94d3,
++	0x1118, 0x9182, 0x0080, 0x0280, 0x9186, 0x00ff, 0x0168, 0x9182,
++	0x0800, 0x1250, 0x2001, 0x9000, 0x080c, 0x4da2, 0x11a8, 0x0060,
++	0xa897, 0x4005, 0xa99a, 0x0010, 0xa897, 0x4006, 0x900e, 0x9085,
++	0x0001, 0x2001, 0x0030, 0x0005, 0xa897, 0x4000, 0x900e, 0x9085,
++	0x0001, 0x2001, 0x0000, 0x0005, 0x2009, 0x000a, 0x0c48, 0x080c,
++	0x0fae, 0x0198, 0x9006, 0xa802, 0x7010, 0x9005, 0x1120, 0x2900,
++	0x7012, 0x7016, 0x0040, 0x7014, 0xa802, 0x0086, 0x2040, 0x2900,
++	0xa006, 0x7016, 0x008e, 0x9085, 0x0001, 0x0005, 0x7984, 0x080c,
++	0x5c0d, 0x1130, 0x7e88, 0x9684, 0x3fff, 0x9082, 0x4000, 0x0208,
++	0x905e, 0x8bff, 0x0005, 0xa998, 0x080c, 0x5c0d, 0x1130, 0xae9c,
++	0x9684, 0x3fff, 0x9082, 0x4000, 0x0208, 0x905e, 0x8bff, 0x0005,
++	0xae98, 0x0008, 0x7e84, 0x2608, 0x080c, 0x5c0d, 0x1108, 0x0008,
++	0x905e, 0x8bff, 0x0005, 0x0016, 0x7110, 0x81ff, 0x0128, 0x2148,
++	0xa904, 0x080c, 0x0fe0, 0x0cc8, 0x7112, 0x7116, 0x001e, 0x0005,
++	0x2031, 0x0001, 0x0010, 0x2031, 0x0000, 0x2061, 0x18ac, 0x2c44,
++	0xa66a, 0xa17a, 0xa772, 0xa076, 0xa28e, 0xa392, 0xa496, 0xa59a,
++	0x080c, 0x108c, 0x7007, 0x0002, 0x701b, 0x305f, 0x0005, 0x00f6,
++	0x0126, 0x2091, 0x8000, 0x2079, 0x0000, 0x2001, 0x18a4, 0x2004,
++	0x9005, 0x1188, 0x0e04, 0x449b, 0x7a36, 0x7833, 0x0012, 0x7a82,
++	0x7b86, 0x7c8a, 0x2091, 0x4080, 0x2001, 0x0089, 0x2004, 0xd084,
++	0x190c, 0x113e, 0x0408, 0x0016, 0x00c6, 0x00e6, 0x2071, 0x1893,
++	0x7144, 0x9182, 0x0010, 0x0218, 0x7034, 0x2060, 0x0078, 0x7034,
++	0x90e0, 0x0004, 0x9c82, 0x18ee, 0x0210, 0x2061, 0x18ae, 0x2c00,
++	0x7036, 0x81ff, 0x1108, 0x703a, 0x8108, 0x7146, 0x2262, 0x6306,
++	0x640a, 0x00ee, 0x00ce, 0x001e, 0x012e, 0x00fe, 0x0005, 0x00e6,
++	0x2071, 0x1893, 0x7044, 0x9005, 0x0590, 0x0126, 0x2091, 0x8000,
++	0x0e04, 0x44f6, 0x00f6, 0x2079, 0x0000, 0x00c6, 0x7038, 0x2060,
++	0x2c04, 0x7836, 0x7833, 0x0012, 0x7882, 0x6004, 0x7886, 0x6008,
++	0x788a, 0x2091, 0x4080, 0x2001, 0x0089, 0x2004, 0xd084, 0x190c,
++	0x113e, 0x7044, 0x8001, 0x7046, 0x9005, 0x1130, 0x7037, 0x18ae,
++	0x703b, 0x18ae, 0x00ce, 0x0048, 0x9c80, 0x0004, 0x90fa, 0x18ee,
++	0x0210, 0x2001, 0x18ae, 0x703a, 0x00ce, 0x00fe, 0x012e, 0x00ee,
++	0x0005, 0x0026, 0x080c, 0x4dea, 0xd0c4, 0x0120, 0x2011, 0x8014,
++	0x080c, 0x447f, 0x002e, 0x0005, 0x81ff, 0x1904, 0x308f, 0x0126,
++	0x2091, 0x8000, 0x6030, 0xc08d, 0xc085, 0xc0ac, 0x6032, 0x080c,
++	0x6877, 0x1158, 0x080c, 0x6b40, 0x080c, 0x56d9, 0x9085, 0x0001,
++	0x080c, 0x68c0, 0x080c, 0x67be, 0x0010, 0x080c, 0x55a0, 0x012e,
++	0x0804, 0x305f, 0x7884, 0x2008, 0x918c, 0xfffd, 0x1128, 0x61e4,
++	0x910d, 0x61e6, 0x0804, 0x305f, 0x0804, 0x3092, 0x81ff, 0x1904,
++	0x308f, 0x080c, 0x4dfe, 0x1904, 0x308f, 0x080c, 0x5f25, 0x1904,
++	0x308f, 0x080c, 0x2e64, 0x0128, 0x7984, 0x080c, 0x5bb0, 0x1904,
++	0x3092, 0x080c, 0x4452, 0x0904, 0x3092, 0x2b00, 0x7022, 0x080c,
++	0x5f2d, 0x7888, 0x1170, 0x9084, 0x0005, 0x1158, 0x900e, 0x080c,
++	0x5e2d, 0x1108, 0xc185, 0xb800, 0xd0bc, 0x0108, 0xc18d, 0x0804,
++	0x305f, 0x080c, 0x441f, 0x0904, 0x308f, 0x9006, 0xa866, 0xa832,
++	0xa868, 0xc0fd, 0xa86a, 0x080c, 0xb2a8, 0x0904, 0x308f, 0x7888,
++	0xd094, 0x0118, 0xb8bc, 0xc08d, 0xb8be, 0x7007, 0x0003, 0x701b,
++	0x45bd, 0x0005, 0x2061, 0x1800, 0x080c, 0x4dfe, 0x2009, 0x0007,
++	0x1570, 0x080c, 0x5f25, 0x2009, 0x0008, 0x1548, 0x080c, 0x2e64,
++	0x0120, 0xa998, 0x080c, 0x5bb0, 0x1530, 0x080c, 0x4450, 0x0518,
++	0x080c, 0x5f2d, 0xa89c, 0x1168, 0x9084, 0x0005, 0x1150, 0x900e,
++	0x080c, 0x5e2d, 0x1108, 0xc185, 0xb800, 0xd0bc, 0x0108, 0xc18d,
++	0x00d0, 0xa868, 0xc0fc, 0xa86a, 0x080c, 0xb2a8, 0x11e0, 0xa89c,
++	0xd094, 0x0118, 0xb8bc, 0xc08d, 0xb8be, 0x2009, 0x0003, 0xa897,
++	0x4005, 0xa99a, 0x0010, 0xa897, 0x4006, 0x900e, 0x9085, 0x0001,
++	0x2001, 0x0030, 0x0005, 0xa897, 0x4000, 0xa99a, 0x9006, 0x918d,
++	0x0001, 0x2008, 0x0005, 0x9006, 0x0005, 0xa830, 0x9086, 0x0100,
++	0x7020, 0x2058, 0x1110, 0x0804, 0x4d49, 0x900e, 0x080c, 0x5e2d,
++	0x1108, 0xc185, 0xb800, 0xd0bc, 0x0108, 0xc18d, 0x0804, 0x305f,
++	0x080c, 0x4dfe, 0x1904, 0x308f, 0x7f84, 0x7a8c, 0x7b88, 0x7c9c,
++	0x7d98, 0x080c, 0x441f, 0x0904, 0x308f, 0x900e, 0x2130, 0x7122,
++	0x712e, 0xa860, 0x20e8, 0x7032, 0xa85c, 0x9080, 0x0005, 0x7026,
++	0x20a0, 0x080c, 0x5c0d, 0x1904, 0x464d, 0x080c, 0x5f2d, 0x0120,
++	0x080c, 0x5f35, 0x1904, 0x464d, 0x080c, 0x5f25, 0x1130, 0x080c,
++	0x5e2d, 0x1118, 0xd79c, 0x0904, 0x464d, 0xd794, 0x1110, 0xd784,
++	0x01a8, 0xb8b4, 0x20e0, 0xb8b8, 0x9080, 0x0006, 0x2098, 0x3400,
++	0xd794, 0x0160, 0x20a9, 0x0008, 0x4003, 0x2098, 0x20a0, 0x3d00,
++	0x20e0, 0x20a9, 0x0002, 0x080c, 0x4278, 0x0048, 0x20a9, 0x0004,
++	0x4003, 0x2098, 0x20a0, 0x3d00, 0x20e0, 0x080c, 0x4278, 0x4104,
++	0xd794, 0x0528, 0xb8b4, 0x20e0, 0xb8b8, 0x2060, 0x9c80, 0x0000,
++	0x2098, 0x20a9, 0x0002, 0x4003, 0x9c80, 0x0003, 0x2098, 0x20a9,
++	0x0001, 0x4005, 0x9c80, 0x0004, 0x2098, 0x3400, 0x20a9, 0x0002,
++	0x4003, 0x2098, 0x20a0, 0x3d00, 0x20e0, 0x080c, 0x426b, 0x9c80,
++	0x0026, 0x2098, 0xb8b4, 0x20e0, 0x20a9, 0x0002, 0x4003, 0xd794,
++	0x0110, 0x96b0, 0x000b, 0x96b0, 0x0005, 0x8108, 0x080c, 0x94d3,
++	0x0118, 0x9186, 0x0800, 0x0040, 0xd78c, 0x0120, 0x9186, 0x0800,
++	0x0170, 0x0018, 0x9186, 0x007e, 0x0150, 0xd794, 0x0118, 0x9686,
++	0x0020, 0x0010, 0x9686, 0x0028, 0x0150, 0x0804, 0x45e9, 0x86ff,
++	0x1120, 0x7120, 0x810b, 0x0804, 0x305f, 0x702f, 0x0001, 0x711e,
++	0x7020, 0x9600, 0x7022, 0x772a, 0x2061, 0x18ac, 0x2c44, 0xa06b,
++	0x0000, 0xa67a, 0x7030, 0xa072, 0x7024, 0xa076, 0xa28e, 0xa392,
++	0xa496, 0xa59a, 0x080c, 0x108c, 0x7007, 0x0002, 0x701b, 0x4689,
++	0x0005, 0x702c, 0x9005, 0x1180, 0x711c, 0x7024, 0x20a0, 0x7728,
++	0x9036, 0x7030, 0x20e8, 0x2061, 0x18ac, 0x2c44, 0xa28c, 0xa390,
++	0xa494, 0xa598, 0x0804, 0x45e9, 0x7120, 0x810b, 0x0804, 0x305f,
++	0x2029, 0x007e, 0x7984, 0x7a88, 0x7b8c, 0x7c98, 0x9184, 0xff00,
++	0x8007, 0x90e2, 0x0020, 0x0a04, 0x3092, 0x9502, 0x0a04, 0x3092,
++	0x9184, 0x00ff, 0x90e2, 0x0020, 0x0a04, 0x3092, 0x9502, 0x0a04,
++	0x3092, 0x9284, 0xff00, 0x8007, 0x90e2, 0x0020, 0x0a04, 0x3092,
++	0x9502, 0x0a04, 0x3092, 0x9284, 0x00ff, 0x90e2, 0x0020, 0x0a04,
++	0x3092, 0x9502, 0x0a04, 0x3092, 0x9384, 0xff00, 0x8007, 0x90e2,
++	0x0020, 0x0a04, 0x3092, 0x9502, 0x0a04, 0x3092, 0x9384, 0x00ff,
++	0x90e2, 0x0020, 0x0a04, 0x3092, 0x9502, 0x0a04, 0x3092, 0x9484,
++	0xff00, 0x8007, 0x90e2, 0x0020, 0x0a04, 0x3092, 0x9502, 0x0a04,
++	0x3092, 0x9484, 0x00ff, 0x90e2, 0x0020, 0x0a04, 0x3092, 0x9502,
++	0x0a04, 0x3092, 0x2061, 0x1956, 0x6102, 0x6206, 0x630a, 0x640e,
++	0x0804, 0x305f, 0x0006, 0x080c, 0x4dea, 0xd0cc, 0x000e, 0x0005,
++	0x0006, 0x080c, 0x4dee, 0xd0bc, 0x000e, 0x0005, 0x616c, 0x7a84,
++	0x6300, 0x82ff, 0x1118, 0x7986, 0x0804, 0x305f, 0x83ff, 0x1904,
++	0x3092, 0x2001, 0xfff0, 0x9200, 0x1a04, 0x3092, 0x2019, 0xffff,
++	0x6070, 0x9302, 0x9200, 0x0a04, 0x3092, 0x7986, 0x626e, 0x0804,
++	0x305f, 0x080c, 0x4dfe, 0x1904, 0x308f, 0x7c88, 0x7d84, 0x7e98,
++	0x7f8c, 0x080c, 0x441f, 0x0904, 0x308f, 0x900e, 0x901e, 0x7322,
++	0x732e, 0xa860, 0x20e8, 0x7032, 0xa85c, 0x9080, 0x0003, 0x7026,
++	0x20a0, 0x91d8, 0x1000, 0x2b5c, 0x8bff, 0x0178, 0x080c, 0x5f2d,
++	0x0118, 0x080c, 0x5f35, 0x1148, 0x20a9, 0x0001, 0xb814, 0x4004,
++	0xb810, 0x4004, 0x4104, 0x9398, 0x0003, 0x8108, 0x9182, 0x0800,
++	0x0120, 0x9386, 0x003c, 0x0170, 0x0c20, 0x83ff, 0x1148, 0x7220,
++	0x900e, 0x2001, 0x0003, 0x080c, 0x7a4b, 0x2208, 0x0804, 0x305f,
++	0x702f, 0x0001, 0x711e, 0x7020, 0x9300, 0x7022, 0x2061, 0x18ac,
++	0x2c44, 0xa06b, 0x0000, 0xa37a, 0x7024, 0xa076, 0x7030, 0xa072,
++	0xa48e, 0xa592, 0xa696, 0xa79a, 0x080c, 0x108c, 0x7007, 0x0002,
++	0x701b, 0x477b, 0x0005, 0x702c, 0x9005, 0x1178, 0x711c, 0x7024,
++	0x20a0, 0x901e, 0x7030, 0x20e8, 0x2061, 0x18ac, 0x2c44, 0xa48c,
++	0xa590, 0xa694, 0xa798, 0x0804, 0x4739, 0x7220, 0x900e, 0x2001,
++	0x0003, 0x080c, 0x7a4b, 0x2208, 0x0804, 0x305f, 0x00f6, 0x00e6,
++	0x080c, 0x4dfe, 0x2009, 0x0007, 0x1904, 0x480e, 0x2071, 0x1893,
++	0x7458, 0x84ff, 0x2009, 0x000e, 0x1904, 0x480e, 0xac9c, 0xad98,
++	0xaea4, 0xafa0, 0x0096, 0x080c, 0x0fc7, 0x2009, 0x0002, 0x0904,
++	0x480e, 0x2900, 0x705a, 0x900e, 0x901e, 0x7352, 0x735e, 0xa860,
++	0x7062, 0xa85c, 0x9080, 0x0003, 0x7056, 0x20a0, 0x91d8, 0x1000,
++	0x2b5c, 0x8bff, 0x0178, 0x080c, 0x5f2d, 0x0118, 0x080c, 0x5f35,
++	0x1148, 0xb814, 0x20a9, 0x0001, 0x4004, 0xb810, 0x4004, 0x4104,
++	0x9398, 0x0003, 0x8108, 0x9182, 0x0800, 0x0120, 0x9386, 0x003c,
++	0x01e8, 0x0c20, 0x83ff, 0x11c0, 0x7250, 0x900e, 0x2001, 0x0003,
++	0x080c, 0x7a4b, 0x2208, 0x009e, 0xa897, 0x4000, 0xa99a, 0x7158,
++	0x81ff, 0x090c, 0x0d84, 0x2148, 0x080c, 0x0fe0, 0x9006, 0x705a,
++	0x918d, 0x0001, 0x2008, 0x0418, 0x705f, 0x0001, 0x714e, 0x7050,
++	0x9300, 0x7052, 0x2061, 0x18ad, 0x2c44, 0xa37a, 0x7054, 0xa076,
++	0x7060, 0xa072, 0xa48e, 0xa592, 0xa696, 0xa79a, 0xa09f, 0x481a,
++	0x000e, 0xa0a2, 0x080c, 0x108c, 0x9006, 0x0048, 0x009e, 0xa897,
++	0x4005, 0xa99a, 0x900e, 0x9085, 0x0001, 0x2001, 0x0030, 0x00ee,
++	0x00fe, 0x0005, 0x00f6, 0xa0a0, 0x904d, 0x090c, 0x0d84, 0x00e6,
++	0x2071, 0x1893, 0xa06c, 0x908e, 0x0100, 0x0138, 0xa87b, 0x0030,
++	0xa883, 0x0000, 0xa897, 0x4002, 0x00d8, 0x705c, 0x9005, 0x1158,
++	0x714c, 0x7054, 0x20a0, 0x901e, 0x7060, 0x20e8, 0xa48c, 0xa590,
++	0xa694, 0xa798, 0x0428, 0xa87b, 0x0000, 0xa883, 0x0000, 0xa897,
++	0x4000, 0x7250, 0x900e, 0x2001, 0x0003, 0x080c, 0x7a4b, 0xaa9a,
++	0x7158, 0x81ff, 0x090c, 0x0d84, 0x2148, 0x080c, 0x0fe0, 0x705b,
++	0x0000, 0xa0a0, 0x2048, 0x0126, 0x2091, 0x8000, 0x080c, 0x61a9,
++	0x012e, 0xa09f, 0x0000, 0xa0a3, 0x0000, 0x00ee, 0x00fe, 0x0005,
++	0x91d8, 0x1000, 0x2b5c, 0x8bff, 0x0178, 0x080c, 0x5f2d, 0x0118,
++	0x080c, 0x5f35, 0x1148, 0xb814, 0x20a9, 0x0001, 0x4004, 0xb810,
++	0x4004, 0x4104, 0x9398, 0x0003, 0x8108, 0x9182, 0x0800, 0x0120,
++	0x9386, 0x003c, 0x0518, 0x0c20, 0x83ff, 0x11f0, 0x7150, 0x810c,
++	0xa99a, 0xa897, 0x4000, 0x7158, 0x81ff, 0x090c, 0x0d84, 0x2148,
++	0x080c, 0x0fe0, 0x9006, 0x705a, 0x918d, 0x0001, 0x2008, 0xa0a0,
++	0x2048, 0x0126, 0x2091, 0x8000, 0x080c, 0x61a9, 0x012e, 0xa09f,
++	0x0000, 0xa0a3, 0x0000, 0x0070, 0x705f, 0x0001, 0x714e, 0x7050,
++	0x9300, 0x7052, 0xa37a, 0xa48e, 0xa592, 0xa696, 0xa79a, 0x080c,
++	0x108c, 0x9006, 0x00ee, 0x0005, 0x81ff, 0x1904, 0x308f, 0x60d8,
++	0xd0ac, 0x1118, 0xd09c, 0x0904, 0x308f, 0x080c, 0x441f, 0x0904,
++	0x308f, 0x7984, 0x7a8c, 0x7b88, 0x7c9c, 0x7d98, 0xa85c, 0x9080,
++	0x0019, 0xaf60, 0x080c, 0x4468, 0x701b, 0x48c7, 0x0005, 0x0096,
++	0xa88c, 0x90be, 0x7000, 0x0148, 0x90be, 0x7100, 0x0130, 0x90be,
++	0x7200, 0x0118, 0x009e, 0x0804, 0x3092, 0xa884, 0xa988, 0x080c,
++	0x23fd, 0x1500, 0x080c, 0x5bb0, 0x11e8, 0x7122, 0xbe12, 0xbd16,
++	0xae7c, 0x080c, 0x441f, 0x01b0, 0x080c, 0x441f, 0x0198, 0x009e,
++	0xa867, 0x0000, 0xa868, 0xc0fd, 0xa86a, 0xa887, 0x0000, 0xa804,
++	0x2048, 0x080c, 0xb239, 0x0904, 0x308f, 0x7007, 0x0003, 0x701b,
++	0x48fd, 0x0005, 0x009e, 0x0804, 0x308f, 0x7120, 0x080c, 0x2e11,
++	0xa884, 0x9086, 0x8001, 0x0904, 0x308f, 0x2900, 0x701e, 0xa804,
++	0x2040, 0x0086, 0xa05c, 0x9080, 0x0002, 0x2098, 0x20a0, 0xa060,
++	0x20e0, 0x20e8, 0x20a9, 0x002a, 0x080c, 0x0f2b, 0xaa6c, 0xab70,
++	0xac74, 0xad78, 0x2061, 0x18ac, 0x2c44, 0xa06b, 0x0000, 0xae64,
++	0xaf8c, 0x97c6, 0x7000, 0x1108, 0x0018, 0x97c6, 0x7100, 0x1190,
++	0x96c2, 0x0004, 0x0a04, 0x3092, 0x2009, 0x0004, 0x009e, 0x8906,
++	0x8006, 0x8007, 0x90bc, 0x003f, 0x9084, 0xffc0, 0x9080, 0x0002,
++	0x0804, 0x446b, 0x97c6, 0x7200, 0x1904, 0x3092, 0x96c2, 0x0054,
++	0x0a04, 0x3092, 0x009e, 0x2061, 0x18ac, 0x2c44, 0x8906, 0x8006,
++	0x8007, 0x90bc, 0x003f, 0x9084, 0xffc0, 0x9080, 0x0002, 0xa076,
++	0xa772, 0xa07b, 0x002a, 0xa28e, 0xa392, 0xa496, 0xa59a, 0x080c,
++	0x108c, 0x7007, 0x0002, 0x701b, 0x495e, 0x0005, 0x701c, 0x2048,
++	0xa804, 0x2048, 0xa804, 0x2048, 0x8906, 0x8006, 0x8007, 0x90bc,
++	0x003f, 0x9084, 0xffc0, 0x9080, 0x0002, 0x2098, 0x20a0, 0x27e0,
++	0x27e8, 0x20a9, 0x002a, 0x080c, 0x0f2b, 0x2100, 0x2238, 0x2061,
++	0x18ac, 0x2c44, 0xa28c, 0xa390, 0xa494, 0xa598, 0x2009, 0x002a,
++	0x0804, 0x446b, 0x81ff, 0x1904, 0x308f, 0x798c, 0x2001, 0x194d,
++	0x2102, 0x080c, 0x4436, 0x0904, 0x3092, 0x080c, 0x5cd4, 0x0904,
++	0x308f, 0x0126, 0x2091, 0x8000, 0x080c, 0x5d9a, 0x012e, 0x0904,
++	0x308f, 0x0804, 0x3fc8, 0xa9a0, 0x2001, 0x194d, 0xc18d, 0x2102,
++	0x080c, 0x4443, 0x0170, 0x080c, 0x5cd4, 0x2009, 0x0002, 0x0128,
++	0x080c, 0x5d9a, 0x1170, 0x2009, 0x0003, 0xa897, 0x4005, 0xa99a,
++	0x0010, 0xa897, 0x4006, 0x900e, 0x9085, 0x0001, 0x2001, 0x0030,
++	0x0005, 0xa897, 0x4000, 0x080c, 0x4df2, 0x0110, 0x9006, 0x0018,
++	0x900e, 0x9085, 0x0001, 0x2001, 0x0000, 0x0005, 0x78a8, 0xd08c,
++	0x1118, 0xd084, 0x0904, 0x3f3d, 0x080c, 0x4452, 0x0904, 0x3092,
++	0x080c, 0x441f, 0x1120, 0x2009, 0x0002, 0x0804, 0x308f, 0x080c,
++	0x5f2d, 0x0130, 0x908e, 0x0004, 0x0118, 0x908e, 0x0005, 0x15a0,
++	0x78a8, 0xd08c, 0x0120, 0xb800, 0xc08c, 0xb802, 0x0028, 0x080c,
++	0x4dea, 0xd0b4, 0x0904, 0x3f77, 0x7884, 0x908e, 0x007e, 0x0904,
++	0x3f77, 0x908e, 0x007f, 0x0904, 0x3f77, 0x908e, 0x0080, 0x0904,
++	0x3f77, 0xb800, 0xd08c, 0x1904, 0x3f77, 0xa867, 0x0000, 0xa868,
++	0xc0fd, 0xa86a, 0x080c, 0xb258, 0x1120, 0x2009, 0x0003, 0x0804,
++	0x308f, 0x7007, 0x0003, 0x701b, 0x4a0e, 0x0005, 0x080c, 0x4452,
++	0x0904, 0x3092, 0x0804, 0x3f77, 0x080c, 0x2e64, 0x0108, 0x0005,
++	0x2009, 0x1833, 0x210c, 0x81ff, 0x0120, 0x2009, 0x0001, 0x0804,
++	0x308f, 0x080c, 0x4dfe, 0x0120, 0x2009, 0x0007, 0x0804, 0x308f,
++	0x080c, 0x5f25, 0x0120, 0x2009, 0x0008, 0x0804, 0x308f, 0xb89c,
++	0xd0a4, 0x1118, 0xd0ac, 0x1904, 0x3f77, 0x9006, 0xa866, 0xa832,
++	0xa868, 0xc0fd, 0xa86a, 0x080c, 0xb2a8, 0x1120, 0x2009, 0x0003,
++	0x0804, 0x308f, 0x7007, 0x0003, 0x701b, 0x4a47, 0x0005, 0xa830,
++	0x9086, 0x0100, 0x1120, 0x2009, 0x0004, 0x0804, 0x4d49, 0x080c,
++	0x4452, 0x0904, 0x3092, 0x0804, 0x49e0, 0x81ff, 0x2009, 0x0001,
++	0x1904, 0x308f, 0x080c, 0x4dfe, 0x2009, 0x0007, 0x1904, 0x308f,
++	0x080c, 0x5f25, 0x2009, 0x0008, 0x1904, 0x308f, 0x080c, 0x4452,
++	0x0904, 0x3092, 0x080c, 0x5f2d, 0x2009, 0x0009, 0x1904, 0x308f,
++	0x080c, 0x441f, 0x2009, 0x0002, 0x0904, 0x308f, 0x9006, 0xa866,
++	0xa832, 0xa868, 0xc0fd, 0xa86a, 0x7988, 0x9194, 0xff00, 0x918c,
++	0x00ff, 0x9006, 0x82ff, 0x1128, 0xc0ed, 0xa952, 0x798c, 0xa956,
++	0x0038, 0x928e, 0x0100, 0x1904, 0x3092, 0xc0e5, 0xa952, 0xa956,
++	0xa83e, 0x080c, 0xb4e7, 0x2009, 0x0003, 0x0904, 0x308f, 0x7007,
++	0x0003, 0x701b, 0x4a9c, 0x0005, 0xa830, 0x9086, 0x0100, 0x2009,
++	0x0004, 0x0904, 0x308f, 0x0804, 0x305f, 0x7aa8, 0x9284, 0xc000,
++	0x0148, 0xd2ec, 0x01a0, 0x080c, 0x4dfe, 0x1188, 0x2009, 0x0014,
++	0x0804, 0x308f, 0xd2dc, 0x1568, 0x81ff, 0x2009, 0x0001, 0x1904,
++	0x308f, 0x080c, 0x4dfe, 0x2009, 0x0007, 0x1904, 0x308f, 0xd2f4,
++	0x0130, 0x9284, 0x5000, 0x080c, 0x4dc5, 0x0804, 0x305f, 0xd2fc,
++	0x0158, 0x080c, 0x4452, 0x0904, 0x3092, 0x7984, 0x9284, 0x9000,
++	0x080c, 0x4da2, 0x0804, 0x305f, 0x080c, 0x4452, 0x0904, 0x3092,
++	0xb804, 0x9084, 0x00ff, 0x9086, 0x0006, 0x2009, 0x0009, 0x1904,
++	0x4b85, 0x080c, 0x441f, 0x2009, 0x0002, 0x0904, 0x4b85, 0xa85c,
++	0x9080, 0x001b, 0xaf60, 0x2009, 0x0008, 0x7a8c, 0x7b88, 0x7c9c,
++	0x7d98, 0x080c, 0x4468, 0x701b, 0x4af6, 0x0005, 0xa86c, 0x9086,
++	0x0500, 0x1138, 0xa870, 0x9005, 0x1120, 0xa874, 0x9084, 0xff00,
++	0x0110, 0x1904, 0x3092, 0xa866, 0xa832, 0xa868, 0xc0fd, 0xa86a,
++	0x080c, 0x4452, 0x1110, 0x0804, 0x3092, 0x2009, 0x0043, 0x080c,
++	0xb54f, 0x2009, 0x0003, 0x0904, 0x4b85, 0x7007, 0x0003, 0x701b,
++	0x4b1a, 0x0005, 0xa830, 0x9086, 0x0100, 0x2009, 0x0004, 0x0904,
++	0x4b85, 0x7984, 0x7aa8, 0x9284, 0x1000, 0x080c, 0x4da2, 0x0804,
++	0x305f, 0x00c6, 0xaab0, 0x9284, 0xc000, 0x0140, 0xd2ec, 0x0168,
++	0x080c, 0x4dfe, 0x1150, 0x2009, 0x0014, 0x04f0, 0x2061, 0x1800,
++	0x080c, 0x4dfe, 0x2009, 0x0007, 0x15b8, 0xd2f4, 0x0128, 0x9284,
++	0x5000, 0x080c, 0x4dc5, 0x0050, 0xd2fc, 0x0178, 0x080c, 0x4450,
++	0x0588, 0xa998, 0x9284, 0x9000, 0x080c, 0x4da2, 0xa87b, 0x0000,
++	0xa883, 0x0000, 0xa897, 0x4000, 0x0438, 0x080c, 0x4450, 0x0510,
++	0x080c, 0x5f2d, 0x2009, 0x0009, 0x11b8, 0xa8c4, 0x9086, 0x0500,
++	0x11c8, 0xa8c8, 0x9005, 0x11b0, 0xa8cc, 0x9084, 0xff00, 0x1190,
++	0x080c, 0x4450, 0x1108, 0x0070, 0x2009, 0x004b, 0x080c, 0xb54f,
++	0x2009, 0x0003, 0x0108, 0x0078, 0x0429, 0x19c0, 0xa897, 0x4005,
++	0xa99a, 0x0010, 0xa897, 0x4006, 0x900e, 0x9085, 0x0001, 0x2001,
++	0x0030, 0x00ce, 0x0005, 0x9006, 0x0ce0, 0x7aa8, 0xd2dc, 0x0904,
++	0x308f, 0x0016, 0x7984, 0x9284, 0x1000, 0xc0fd, 0x080c, 0x4da2,
++	0x001e, 0x1904, 0x308f, 0x0804, 0x305f, 0x00f6, 0x2d78, 0x0011,
++	0x00fe, 0x0005, 0xaab0, 0xd2dc, 0x0150, 0x0016, 0xa998, 0x9284,
++	0x1000, 0xc0fd, 0x080c, 0x4da2, 0x001e, 0x9085, 0x0001, 0x0005,
++	0x81ff, 0x0120, 0x2009, 0x0001, 0x0804, 0x308f, 0x080c, 0x4dfe,
++	0x0120, 0x2009, 0x0007, 0x0804, 0x308f, 0x7984, 0x7ea8, 0x96b4,
++	0x00ff, 0x080c, 0x5c0d, 0x1904, 0x3092, 0x9186, 0x007f, 0x0138,
++	0x080c, 0x5f2d, 0x0120, 0x2009, 0x0009, 0x0804, 0x308f, 0x080c,
++	0x441f, 0x1120, 0x2009, 0x0002, 0x0804, 0x308f, 0xa867, 0x0000,
++	0xa868, 0xc0fd, 0xa86a, 0x2001, 0x0100, 0x8007, 0xa80a, 0x080c,
++	0xb272, 0x1120, 0x2009, 0x0003, 0x0804, 0x308f, 0x7007, 0x0003,
++	0x701b, 0x4be3, 0x0005, 0xa808, 0x8007, 0x9086, 0x0100, 0x1120,
++	0x2009, 0x0004, 0x0804, 0x308f, 0xa8e0, 0xa866, 0xa810, 0x8007,
++	0x9084, 0x00ff, 0x800c, 0xa814, 0x8007, 0x9084, 0x00ff, 0x8004,
++	0x9080, 0x0002, 0x9108, 0x8906, 0x8006, 0x8007, 0x90bc, 0x003f,
++	0x9084, 0xffc0, 0x9080, 0x0004, 0x7a8c, 0x7b88, 0x7c9c, 0x7d98,
++	0x0804, 0x446b, 0x080c, 0x441f, 0x1120, 0x2009, 0x0002, 0x0804,
++	0x308f, 0x7984, 0x9194, 0xff00, 0x918c, 0x00ff, 0x8217, 0x82ff,
++	0x1118, 0x701f, 0x1980, 0x0040, 0x92c6, 0x0001, 0x1118, 0x701f,
++	0x199a, 0x0010, 0x0804, 0x3092, 0x2009, 0x001a, 0x7a8c, 0x7b88,
++	0x7c9c, 0x7d98, 0xa85c, 0x9080, 0x0019, 0xaf60, 0x080c, 0x4468,
++	0x701b, 0x4c33, 0x0005, 0x2001, 0x182c, 0x2003, 0x0001, 0xa85c,
++	0x9080, 0x0019, 0x2098, 0xa860, 0x20e0, 0x20a9, 0x001a, 0x701c,
++	0x20a0, 0x20e9, 0x0001, 0x4003, 0x0804, 0x305f, 0x080c, 0x441f,
++	0x1120, 0x2009, 0x0002, 0x0804, 0x308f, 0x7984, 0x9194, 0xff00,
++	0x918c, 0x00ff, 0x8217, 0x82ff, 0x1118, 0x2099, 0x1980, 0x0040,
++	0x92c6, 0x0001, 0x1118, 0x2099, 0x199a, 0x0010, 0x0804, 0x3092,
++	0xa85c, 0x9080, 0x0019, 0x20a0, 0xa860, 0x20e8, 0x20a9, 0x001a,
++	0x20e1, 0x0001, 0x4003, 0x2009, 0x001a, 0x7a8c, 0x7b88, 0x7c9c,
++	0x7d98, 0xa85c, 0x9080, 0x0019, 0xaf60, 0x0804, 0x446b, 0x7884,
++	0x908a, 0x1000, 0x1a04, 0x3092, 0x0126, 0x2091, 0x8000, 0x8003,
++	0x800b, 0x810b, 0x9108, 0x00c6, 0x2061, 0x19c7, 0x6146, 0x00ce,
++	0x012e, 0x0804, 0x305f, 0x00c6, 0x080c, 0x6877, 0x1160, 0x080c,
++	0x6b40, 0x080c, 0x56d9, 0x9085, 0x0001, 0x080c, 0x68c0, 0x080c,
++	0x67be, 0x080c, 0x0d84, 0x2061, 0x1800, 0x6030, 0xc09d, 0x6032,
++	0x080c, 0x55a0, 0x00ce, 0x0005, 0x00c6, 0x2001, 0x1800, 0x2004,
++	0x908e, 0x0000, 0x0904, 0x308f, 0x7884, 0x9005, 0x0188, 0x7888,
++	0x2061, 0x1969, 0x2c0c, 0x2062, 0x080c, 0x27d7, 0x01a0, 0x080c,
++	0x27df, 0x0188, 0x080c, 0x27e7, 0x0170, 0x2162, 0x0804, 0x3092,
++	0x2061, 0x0100, 0x6038, 0x9086, 0x0007, 0x1118, 0x2009, 0x0001,
++	0x0010, 0x2009, 0x0000, 0x7884, 0x9086, 0x0002, 0x1548, 0x2061,
++	0x0100, 0x6028, 0xc09c, 0x602a, 0x0026, 0x2011, 0x0003, 0x080c,
++	0x8e99, 0x2011, 0x0002, 0x080c, 0x8ea3, 0x002e, 0x080c, 0x8d59,
++	0x0036, 0x901e, 0x080c, 0x8dfe, 0x003e, 0x60e3, 0x0000, 0x080c,
++	0xcd0a, 0x080c, 0xcd25, 0x9085, 0x0001, 0x080c, 0x68c0, 0x9006,
++	0x080c, 0x28a5, 0x2001, 0x1800, 0x2003, 0x0004, 0x6027, 0x0008,
++	0x00ce, 0x0804, 0x305f, 0x81ff, 0x0120, 0x2009, 0x0001, 0x0804,
++	0x308f, 0x080c, 0x4dfe, 0x0120, 0x2009, 0x0007, 0x0804, 0x308f,
++	0x7984, 0x7ea8, 0x96b4, 0x00ff, 0x080c, 0x5c0d, 0x1904, 0x3092,
++	0x9186, 0x007f, 0x0138, 0x080c, 0x5f2d, 0x0120, 0x2009, 0x0009,
++	0x0804, 0x308f, 0x080c, 0x441f, 0x1120, 0x2009, 0x0002, 0x0804,
++	0x308f, 0xa867, 0x0000, 0xa868, 0xc0fd, 0xa86a, 0x080c, 0xb275,
++	0x1120, 0x2009, 0x0003, 0x0804, 0x308f, 0x7007, 0x0003, 0x701b,
++	0x4d32, 0x0005, 0xa830, 0x9086, 0x0100, 0x1120, 0x2009, 0x0004,
++	0x0804, 0x308f, 0xa8e0, 0xa866, 0xa834, 0x8007, 0x800c, 0xa85c,
++	0x9080, 0x000c, 0x7a8c, 0x7b88, 0x7c9c, 0x7d98, 0xaf60, 0x0804,
++	0x446b, 0xa898, 0x9086, 0x000d, 0x1904, 0x308f, 0x2021, 0x4005,
++	0x0126, 0x2091, 0x8000, 0x0e04, 0x4d56, 0x0010, 0x012e, 0x0cc0,
++	0x7c36, 0x9486, 0x4000, 0x0118, 0x7833, 0x0011, 0x0010, 0x7833,
++	0x0010, 0x7883, 0x4005, 0xa998, 0x7986, 0xa9a4, 0x799a, 0xa9a8,
++	0x799e, 0x080c, 0x445b, 0x2091, 0x4080, 0x2001, 0x0089, 0x2004,
++	0xd084, 0x190c, 0x113e, 0x7007, 0x0001, 0x2091, 0x5000, 0x012e,
++	0x0005, 0x0126, 0x2091, 0x8000, 0x00c6, 0x2061, 0x19c7, 0x7984,
++	0x6156, 0x6152, 0x605b, 0x0000, 0x604f, 0x0009, 0x7898, 0x606e,
++	0x789c, 0x606a, 0x7888, 0x6066, 0x788c, 0x6062, 0x2001, 0x19d5,
++	0x2044, 0x2001, 0x19dd, 0xa076, 0xa060, 0xa072, 0xa07b, 0x0001,
++	0xa07f, 0x0002, 0xa06b, 0x0000, 0xa09f, 0x0000, 0x00ce, 0x012e,
++	0x0804, 0x305f, 0x0126, 0x2091, 0x8000, 0x00b6, 0x00c6, 0x90e4,
++	0xc000, 0x0128, 0x0006, 0x080c, 0xb0e3, 0x000e, 0x1198, 0xd0e4,
++	0x0160, 0x9180, 0x1000, 0x2004, 0x905d, 0x0160, 0x080c, 0x56f3,
++	0x080c, 0x94d3, 0x0110, 0xb817, 0x0000, 0x9006, 0x00ce, 0x00be,
++	0x012e, 0x0005, 0x9085, 0x0001, 0x0cc8, 0x0126, 0x2091, 0x8000,
++	0x0156, 0x2010, 0x900e, 0x20a9, 0x0800, 0x0016, 0x9180, 0x1000,
++	0x2004, 0x9005, 0x0180, 0x9186, 0x007e, 0x0168, 0x9186, 0x007f,
++	0x0150, 0x9186, 0x0080, 0x0138, 0x9186, 0x00ff, 0x0120, 0x0026,
++	0x2200, 0x0801, 0x002e, 0x001e, 0x8108, 0x1f04, 0x4dcd, 0x015e,
++	0x012e, 0x0005, 0x2001, 0x1853, 0x2004, 0x0005, 0x2001, 0x1872,
++	0x2004, 0x0005, 0x0006, 0x2001, 0x180f, 0x2004, 0xd0d4, 0x000e,
++	0x0005, 0x2001, 0x180d, 0x2004, 0xd0b4, 0x0005, 0x2001, 0x1800,
++	0x2004, 0x9086, 0x0003, 0x0005, 0x0126, 0x0156, 0x0136, 0x0146,
++	0x01c6, 0x01d6, 0x00c6, 0x00d6, 0x00e6, 0x00f6, 0x2061, 0x0100,
++	0x2069, 0x0200, 0x2071, 0x1800, 0x6044, 0xd0a4, 0x11e8, 0xd084,
++	0x0118, 0x080c, 0x4fa3, 0x0068, 0xd08c, 0x0118, 0x080c, 0x4eb6,
++	0x0040, 0xd094, 0x0118, 0x080c, 0x4e86, 0x0018, 0xd09c, 0x0108,
++	0x0099, 0x00fe, 0x00ee, 0x00de, 0x00ce, 0x01de, 0x01ce, 0x014e,
++	0x013e, 0x015e, 0x012e, 0x0005, 0x0016, 0x6128, 0xd19c, 0x1110,
++	0xc19d, 0x612a, 0x001e, 0x0c68, 0x0006, 0x7090, 0x9005, 0x000e,
++	0x0120, 0x7093, 0x0000, 0x708b, 0x0000, 0x624c, 0x9286, 0xf0f0,
++	0x1150, 0x6048, 0x9086, 0xf0f0, 0x0130, 0x624a, 0x6043, 0x0090,
++	0x6043, 0x0010, 0x0490, 0x9294, 0xff00, 0x9296, 0xf700, 0x0178,
++	0x7134, 0xd1a4, 0x1160, 0x6240, 0x9295, 0x0100, 0x6242, 0x9294,
++	0x0010, 0x0128, 0x2009, 0x00f7, 0x080c, 0x5660, 0x00f0, 0x6040,
++	0x9084, 0x0010, 0x9085, 0x0140, 0x6042, 0x6043, 0x0000, 0x707f,
++	0x0000, 0x709b, 0x0001, 0x70c3, 0x0000, 0x70db, 0x0000, 0x2009,
++	0x1c80, 0x200b, 0x0000, 0x708f, 0x0000, 0x7083, 0x000f, 0x2009,
++	0x000f, 0x2011, 0x5546, 0x080c, 0x78a5, 0x0005, 0x2001, 0x1874,
++	0x2004, 0xd08c, 0x0110, 0x7057, 0xffff, 0x7080, 0x9005, 0x1528,
++	0x2011, 0x5546, 0x080c, 0x781a, 0x6040, 0x9094, 0x0010, 0x9285,
++	0x0020, 0x6042, 0x20a9, 0x00c8, 0x6044, 0xd08c, 0x1168, 0x1f04,
++	0x4e9c, 0x6242, 0x7093, 0x0000, 0x6040, 0x9094, 0x0010, 0x9285,
++	0x0080, 0x6042, 0x6242, 0x0048, 0x6242, 0x7093, 0x0000, 0x7087,
++	0x0000, 0x9006, 0x080c, 0x56de, 0x0000, 0x0005, 0x7084, 0x908a,
++	0x0003, 0x1a0c, 0x0d84, 0x000b, 0x0005, 0x4ec0, 0x4f07, 0x4fa2,
++	0x00f6, 0x7087, 0x0001, 0x6803, 0x00fc, 0x20a9, 0x0004, 0x6800,
++	0x9084, 0x00fc, 0x0120, 0x1f04, 0x4ec7, 0x080c, 0x0d84, 0x68a0,
++	0x68a2, 0x689c, 0x689e, 0x6898, 0x689a, 0xa001, 0x6803, 0x1600,
++	0x6837, 0x0020, 0x080c, 0x56ba, 0x2079, 0x1c00, 0x7833, 0x1101,
++	0x7837, 0x0000, 0x20e1, 0x0001, 0x2099, 0x1805, 0x20e9, 0x0001,
++	0x20a1, 0x1c0e, 0x20a9, 0x0004, 0x4003, 0x080c, 0x9363, 0x20e1,
++	0x0001, 0x2099, 0x1c00, 0x20e9, 0x0000, 0x20a1, 0x0240, 0x20a9,
++	0x0014, 0x4003, 0x60c3, 0x000c, 0x600f, 0x0000, 0x080c, 0x557c,
++	0x00fe, 0x9006, 0x708a, 0x6043, 0x0008, 0x6042, 0x0005, 0x00f6,
++	0x7088, 0x708b, 0x0000, 0x9025, 0x0904, 0x4f7f, 0x6020, 0xd0b4,
++	0x1904, 0x4f7d, 0x7198, 0x81ff, 0x0904, 0x4f6b, 0x9486, 0x000c,
++	0x1904, 0x4f78, 0x9480, 0x0018, 0x8004, 0x20a8, 0x080c, 0x56b3,
++	0x2011, 0x0260, 0x2019, 0x1c00, 0x220c, 0x2304, 0x9106, 0x11e8,
++	0x8210, 0x8318, 0x1f04, 0x4f24, 0x6043, 0x0004, 0x2061, 0x0140,
++	0x605b, 0xbc94, 0x605f, 0xf0f0, 0x2061, 0x0100, 0x6043, 0x0006,
++	0x7087, 0x0002, 0x7093, 0x0002, 0x2009, 0x07d0, 0x2011, 0x554d,
++	0x080c, 0x78a5, 0x080c, 0x56ba, 0x04c0, 0x080c, 0x56b3, 0x2079,
++	0x0260, 0x7930, 0x918e, 0x1101, 0x1558, 0x7834, 0x9005, 0x1540,
++	0x7900, 0x918c, 0x00ff, 0x1118, 0x7804, 0x9005, 0x0190, 0x080c,
++	0x56b3, 0x2011, 0x026e, 0x2019, 0x1805, 0x20a9, 0x0004, 0x220c,
++	0x2304, 0x9102, 0x0230, 0x11a0, 0x8210, 0x8318, 0x1f04, 0x4f5f,
++	0x0078, 0x709b, 0x0000, 0x080c, 0x56b3, 0x20e1, 0x0000, 0x2099,
++	0x0260, 0x20e9, 0x0001, 0x20a1, 0x1c00, 0x20a9, 0x0014, 0x4003,
++	0x6043, 0x0008, 0x6043, 0x0000, 0x0010, 0x00fe, 0x0005, 0x6040,
++	0x9085, 0x0100, 0x6042, 0x6020, 0xd0b4, 0x1db8, 0x080c, 0x9363,
++	0x20e1, 0x0001, 0x2099, 0x1c00, 0x20e9, 0x0000, 0x20a1, 0x0240,
++	0x20a9, 0x0014, 0x4003, 0x60c3, 0x000c, 0x2011, 0x19be, 0x2013,
++	0x0000, 0x708b, 0x0000, 0x60a3, 0x0056, 0x60a7, 0x9575, 0x080c,
++	0x8b47, 0x08d8, 0x0005, 0x7090, 0x908a, 0x001d, 0x1a0c, 0x0d84,
++	0x000b, 0x0005, 0x4fd4, 0x4fe7, 0x5010, 0x5030, 0x5056, 0x5085,
++	0x50ab, 0x50e3, 0x5109, 0x5137, 0x5172, 0x51aa, 0x51c8, 0x51f3,
++	0x5215, 0x5230, 0x523a, 0x526e, 0x5294, 0x52c3, 0x52e9, 0x5321,
++	0x5365, 0x53a2, 0x53c3, 0x541c, 0x543e, 0x546c, 0x546c, 0x00c6,
++	0x2061, 0x1800, 0x6003, 0x0007, 0x2061, 0x0100, 0x6004, 0x9084,
++	0xfff9, 0x6006, 0x00ce, 0x0005, 0x2061, 0x0140, 0x605b, 0xbc94,
++	0x605f, 0xf0f0, 0x2061, 0x0100, 0x6043, 0x0002, 0x7093, 0x0001,
++	0x2009, 0x07d0, 0x2011, 0x554d, 0x080c, 0x78a5, 0x0005, 0x00f6,
++	0x7088, 0x9086, 0x0014, 0x1510, 0x6042, 0x6020, 0xd0b4, 0x11f0,
++	0x080c, 0x56b3, 0x2079, 0x0260, 0x7a30, 0x9296, 0x1102, 0x11a0,
++	0x7834, 0x9005, 0x1188, 0x7a38, 0xd2fc, 0x0128, 0x70c0, 0x9005,
++	0x1110, 0x70c3, 0x0001, 0x2011, 0x554d, 0x080c, 0x781a, 0x7093,
++	0x0010, 0x080c, 0x523a, 0x0010, 0x708b, 0x0000, 0x00fe, 0x0005,
++	0x00f6, 0x7093, 0x0003, 0x6043, 0x0004, 0x2011, 0x554d, 0x080c,
++	0x781a, 0x080c, 0x5642, 0x2079, 0x0240, 0x7833, 0x1102, 0x7837,
++	0x0000, 0x20a9, 0x0008, 0x9f88, 0x000e, 0x200b, 0x0000, 0x8108,
++	0x1f04, 0x5025, 0x60c3, 0x0014, 0x080c, 0x557c, 0x00fe, 0x0005,
++	0x00f6, 0x7088, 0x9005, 0x0500, 0x2011, 0x554d, 0x080c, 0x781a,
++	0x9086, 0x0014, 0x11b8, 0x080c, 0x56b3, 0x2079, 0x0260, 0x7a30,
++	0x9296, 0x1102, 0x1178, 0x7834, 0x9005, 0x1160, 0x7a38, 0xd2fc,
++	0x0128, 0x70c0, 0x9005, 0x1110, 0x70c3, 0x0001, 0x7093, 0x0004,
++	0x0029, 0x0010, 0x080c, 0x568f, 0x00fe, 0x0005, 0x00f6, 0x7093,
++	0x0005, 0x080c, 0x5642, 0x2079, 0x0240, 0x7833, 0x1103, 0x7837,
++	0x0000, 0x080c, 0x56b3, 0x080c, 0x5696, 0x1170, 0x707c, 0x9005,
++	0x1158, 0x7154, 0x9186, 0xffff, 0x0138, 0x2011, 0x0008, 0x080c,
++	0x54fa, 0x0168, 0x080c, 0x5677, 0x20a9, 0x0008, 0x20e1, 0x0000,
++	0x2099, 0x026e, 0x20e9, 0x0000, 0x20a1, 0x024e, 0x4003, 0x60c3,
++	0x0014, 0x080c, 0x557c, 0x00fe, 0x0005, 0x00f6, 0x7088, 0x9005,
++	0x0500, 0x2011, 0x554d, 0x080c, 0x781a, 0x9086, 0x0014, 0x11b8,
++	0x080c, 0x56b3, 0x2079, 0x0260, 0x7a30, 0x9296, 0x1103, 0x1178,
++	0x7834, 0x9005, 0x1160, 0x7a38, 0xd2fc, 0x0128, 0x70c0, 0x9005,
++	0x1110, 0x70c3, 0x0001, 0x7093, 0x0006, 0x0029, 0x0010, 0x080c,
++	0x568f, 0x00fe, 0x0005, 0x00f6, 0x7093, 0x0007, 0x080c, 0x5642,
++	0x2079, 0x0240, 0x7833, 0x1104, 0x7837, 0x0000, 0x080c, 0x56b3,
++	0x080c, 0x5696, 0x11b8, 0x707c, 0x9005, 0x11a0, 0x715c, 0x9186,
++	0xffff, 0x0180, 0x9180, 0x2e6e, 0x200d, 0x918c, 0xff00, 0x810f,
++	0x2011, 0x0008, 0x080c, 0x54fa, 0x0180, 0x080c, 0x4700, 0x0110,
++	0x080c, 0x2466, 0x20a9, 0x0008, 0x20e1, 0x0000, 0x2099, 0x026e,
++	0x20e9, 0x0000, 0x20a1, 0x024e, 0x4003, 0x60c3, 0x0014, 0x080c,
++	0x557c, 0x00fe, 0x0005, 0x00f6, 0x7088, 0x9005, 0x0500, 0x2011,
++	0x554d, 0x080c, 0x781a, 0x9086, 0x0014, 0x11b8, 0x080c, 0x56b3,
++	0x2079, 0x0260, 0x7a30, 0x9296, 0x1104, 0x1178, 0x7834, 0x9005,
++	0x1160, 0x7a38, 0xd2fc, 0x0128, 0x70c0, 0x9005, 0x1110, 0x70c3,
++	0x0001, 0x7093, 0x0008, 0x0029, 0x0010, 0x080c, 0x568f, 0x00fe,
++	0x0005, 0x00f6, 0x7093, 0x0009, 0x080c, 0x5642, 0x2079, 0x0240,
++	0x7833, 0x1105, 0x7837, 0x0100, 0x080c, 0x5696, 0x1150, 0x707c,
++	0x9005, 0x1138, 0x080c, 0x546d, 0x1188, 0x9085, 0x0001, 0x080c,
++	0x2466, 0x20a9, 0x0008, 0x080c, 0x56b3, 0x20e1, 0x0000, 0x2099,
++	0x026e, 0x20e9, 0x0000, 0x20a1, 0x024e, 0x4003, 0x60c3, 0x0014,
++	0x080c, 0x557c, 0x0010, 0x080c, 0x4fc7, 0x00fe, 0x0005, 0x00f6,
++	0x7088, 0x9005, 0x05a8, 0x2011, 0x554d, 0x080c, 0x781a, 0x9086,
++	0x0014, 0x1560, 0x080c, 0x56b3, 0x2079, 0x0260, 0x7a30, 0x9296,
++	0x1105, 0x1520, 0x7834, 0x9084, 0x0100, 0x2011, 0x0100, 0x921e,
++	0x1160, 0x7a38, 0xd2fc, 0x0128, 0x70c0, 0x9005, 0x1110, 0x70c3,
++	0x0001, 0x7093, 0x000a, 0x00b1, 0x0098, 0x9005, 0x1178, 0x7a38,
++	0xd2fc, 0x0128, 0x70c0, 0x9005, 0x1110, 0x70c3, 0x0001, 0x708f,
++	0x0000, 0x7093, 0x000e, 0x080c, 0x5215, 0x0010, 0x080c, 0x568f,
++	0x00fe, 0x0005, 0x00f6, 0x7093, 0x000b, 0x2011, 0x1c0e, 0x20e9,
++	0x0001, 0x22a0, 0x20a9, 0x0040, 0x2019, 0xffff, 0x4304, 0x080c,
++	0x5642, 0x2079, 0x0240, 0x7833, 0x1106, 0x7837, 0x0000, 0x080c,
++	0x5696, 0x0118, 0x2013, 0x0000, 0x0020, 0x7058, 0x9085, 0x0100,
++	0x2012, 0x20a9, 0x0040, 0x2009, 0x024e, 0x2011, 0x1c0e, 0x220e,
++	0x8210, 0x8108, 0x9186, 0x0260, 0x1128, 0x6810, 0x8000, 0x6812,
++	0x2009, 0x0240, 0x1f04, 0x5197, 0x60c3, 0x0084, 0x080c, 0x557c,
++	0x00fe, 0x0005, 0x00f6, 0x7088, 0x9005, 0x01c0, 0x2011, 0x554d,
++	0x080c, 0x781a, 0x9086, 0x0084, 0x1178, 0x080c, 0x56b3, 0x2079,
++	0x0260, 0x7a30, 0x9296, 0x1106, 0x1138, 0x7834, 0x9005, 0x1120,
++	0x7093, 0x000c, 0x0029, 0x0010, 0x080c, 0x568f, 0x00fe, 0x0005,
++	0x00f6, 0x7093, 0x000d, 0x080c, 0x5642, 0x2079, 0x0240, 0x7833,
++	0x1107, 0x7837, 0x0000, 0x080c, 0x56b3, 0x20a9, 0x0040, 0x2011,
++	0x026e, 0x2009, 0x024e, 0x220e, 0x8210, 0x8108, 0x9186, 0x0260,
++	0x1150, 0x6810, 0x8000, 0x6812, 0x2009, 0x0240, 0x6814, 0x8000,
++	0x6816, 0x2011, 0x0260, 0x1f04, 0x51db, 0x60c3, 0x0084, 0x080c,
++	0x557c, 0x00fe, 0x0005, 0x00f6, 0x7088, 0x9005, 0x01e0, 0x2011,
++	0x554d, 0x080c, 0x781a, 0x9086, 0x0084, 0x1198, 0x080c, 0x56b3,
++	0x2079, 0x0260, 0x7a30, 0x9296, 0x1107, 0x1158, 0x7834, 0x9005,
++	0x1140, 0x708f, 0x0001, 0x080c, 0x5614, 0x7093, 0x000e, 0x0029,
++	0x0010, 0x080c, 0x568f, 0x00fe, 0x0005, 0x918d, 0x0001, 0x080c,
++	0x56de, 0x7093, 0x000f, 0x708b, 0x0000, 0x2061, 0x0140, 0x605b,
++	0xbc85, 0x605f, 0xb5b5, 0x2061, 0x0100, 0x6043, 0x0005, 0x6043,
++	0x0004, 0x2009, 0x07d0, 0x2011, 0x554d, 0x080c, 0x780e, 0x0005,
++	0x7088, 0x9005, 0x0130, 0x2011, 0x554d, 0x080c, 0x781a, 0x7093,
++	0x0000, 0x0005, 0x7093, 0x0011, 0x080c, 0x9363, 0x080c, 0x56b3,
++	0x20e1, 0x0000, 0x2099, 0x0260, 0x20e9, 0x0000, 0x20a1, 0x0240,
++	0x7488, 0x9480, 0x0018, 0x9080, 0x0007, 0x9084, 0x03f8, 0x8004,
++	0x20a8, 0x4003, 0x080c, 0x5696, 0x11a0, 0x7174, 0x81ff, 0x0188,
++	0x900e, 0x7078, 0x9084, 0x00ff, 0x0160, 0x080c, 0x23fd, 0x9186,
++	0x007e, 0x0138, 0x9186, 0x0080, 0x0120, 0x2011, 0x0008, 0x080c,
++	0x54fa, 0x60c3, 0x0014, 0x080c, 0x557c, 0x0005, 0x00f6, 0x7088,
++	0x9005, 0x0500, 0x2011, 0x554d, 0x080c, 0x781a, 0x9086, 0x0014,
++	0x11b8, 0x080c, 0x56b3, 0x2079, 0x0260, 0x7a30, 0x9296, 0x1103,
++	0x1178, 0x7834, 0x9005, 0x1160, 0x7a38, 0xd2fc, 0x0128, 0x70c0,
++	0x9005, 0x1110, 0x70c3, 0x0001, 0x7093, 0x0012, 0x0029, 0x0010,
++	0x708b, 0x0000, 0x00fe, 0x0005, 0x00f6, 0x7093, 0x0013, 0x080c,
++	0x5650, 0x2079, 0x0240, 0x7833, 0x1103, 0x7837, 0x0000, 0x080c,
++	0x56b3, 0x080c, 0x5696, 0x1170, 0x707c, 0x9005, 0x1158, 0x7154,
++	0x9186, 0xffff, 0x0138, 0x2011, 0x0008, 0x080c, 0x54fa, 0x0168,
++	0x080c, 0x5677, 0x20a9, 0x0008, 0x20e1, 0x0000, 0x2099, 0x026e,
++	0x20e9, 0x0000, 0x20a1, 0x024e, 0x4003, 0x60c3, 0x0014, 0x080c,
++	0x557c, 0x00fe, 0x0005, 0x00f6, 0x7088, 0x9005, 0x0500, 0x2011,
++	0x554d, 0x080c, 0x781a, 0x9086, 0x0014, 0x11b8, 0x080c, 0x56b3,
++	0x2079, 0x0260, 0x7a30, 0x9296, 0x1104, 0x1178, 0x7834, 0x9005,
++	0x1160, 0x7a38, 0xd2fc, 0x0128, 0x70c0, 0x9005, 0x1110, 0x70c3,
++	0x0001, 0x7093, 0x0014, 0x0029, 0x0010, 0x708b, 0x0000, 0x00fe,
++	0x0005, 0x00f6, 0x7093, 0x0015, 0x080c, 0x5650, 0x2079, 0x0240,
++	0x7833, 0x1104, 0x7837, 0x0000, 0x080c, 0x56b3, 0x080c, 0x5696,
++	0x11b8, 0x707c, 0x9005, 0x11a0, 0x715c, 0x9186, 0xffff, 0x0180,
++	0x9180, 0x2e6e, 0x200d, 0x918c, 0xff00, 0x810f, 0x2011, 0x0008,
++	0x080c, 0x54fa, 0x0180, 0x080c, 0x4700, 0x0110, 0x080c, 0x2466,
++	0x20a9, 0x0008, 0x20e1, 0x0000, 0x2099, 0x026e, 0x20e9, 0x0000,
++	0x20a1, 0x024e, 0x4003, 0x60c3, 0x0014, 0x080c, 0x557c, 0x00fe,
++	0x0005, 0x00f6, 0x7088, 0x9005, 0x05f0, 0x2011, 0x554d, 0x080c,
++	0x781a, 0x9086, 0x0014, 0x15a8, 0x080c, 0x56b3, 0x2079, 0x0260,
++	0x7a30, 0x9296, 0x1105, 0x1568, 0x7834, 0x9084, 0x0100, 0x2011,
++	0x0100, 0x921e, 0x1168, 0x9085, 0x0001, 0x080c, 0x56de, 0x7a38,
++	0xd2fc, 0x0128, 0x70c0, 0x9005, 0x1110, 0x70c3, 0x0001, 0x0080,
++	0x9005, 0x11b8, 0x7a38, 0xd2fc, 0x0128, 0x70c0, 0x9005, 0x1110,
++	0x70c3, 0x0001, 0x9085, 0x0001, 0x080c, 0x56de, 0x708f, 0x0000,
++	0x7a38, 0xd2f4, 0x0110, 0x70db, 0x0008, 0x7093, 0x0016, 0x0029,
++	0x0010, 0x708b, 0x0000, 0x00fe, 0x0005, 0x080c, 0x9363, 0x080c,
++	0x56b3, 0x20e1, 0x0000, 0x2099, 0x0260, 0x20e9, 0x0000, 0x20a1,
++	0x0240, 0x20a9, 0x000e, 0x4003, 0x2011, 0x026d, 0x2204, 0x9084,
++	0x0100, 0x2011, 0x024d, 0x2012, 0x2011, 0x026e, 0x7093, 0x0017,
++	0x080c, 0x5696, 0x1150, 0x707c, 0x9005, 0x1138, 0x080c, 0x546d,
++	0x1188, 0x9085, 0x0001, 0x080c, 0x2466, 0x20a9, 0x0008, 0x080c,
++	0x56b3, 0x20e1, 0x0000, 0x2099, 0x026e, 0x20e9, 0x0000, 0x20a1,
++	0x024e, 0x4003, 0x60c3, 0x0014, 0x080c, 0x557c, 0x0010, 0x080c,
++	0x4fc7, 0x0005, 0x00f6, 0x7088, 0x9005, 0x01d8, 0x2011, 0x554d,
++	0x080c, 0x781a, 0x9086, 0x0084, 0x1190, 0x080c, 0x56b3, 0x2079,
++	0x0260, 0x7a30, 0x9296, 0x1106, 0x1150, 0x7834, 0x9005, 0x1138,
++	0x9006, 0x080c, 0x56de, 0x7093, 0x0018, 0x0029, 0x0010, 0x708b,
++	0x0000, 0x00fe, 0x0005, 0x00f6, 0x7093, 0x0019, 0x080c, 0x5650,
++	0x2079, 0x0240, 0x7833, 0x1106, 0x7837, 0x0000, 0x080c, 0x56b3,
++	0x2009, 0x026e, 0x2039, 0x1c0e, 0x20a9, 0x0040, 0x213e, 0x8738,
++	0x8108, 0x9186, 0x0280, 0x1128, 0x6814, 0x8000, 0x6816, 0x2009,
++	0x0260, 0x1f04, 0x53d6, 0x2039, 0x1c0e, 0x080c, 0x5696, 0x11e8,
++	0x2728, 0x2514, 0x8207, 0x9084, 0x00ff, 0x8000, 0x2018, 0x9294,
++	0x00ff, 0x8007, 0x9205, 0x202a, 0x7058, 0x2310, 0x8214, 0x92a0,
++	0x1c0e, 0x2414, 0x938c, 0x0001, 0x0118, 0x9294, 0xff00, 0x0018,
++	0x9294, 0x00ff, 0x8007, 0x9215, 0x2222, 0x20a9, 0x0040, 0x2009,
++	0x024e, 0x270e, 0x8738, 0x8108, 0x9186, 0x0260, 0x1128, 0x6810,
++	0x8000, 0x6812, 0x2009, 0x0240, 0x1f04, 0x5409, 0x60c3, 0x0084,
++	0x080c, 0x557c, 0x00fe, 0x0005, 0x00f6, 0x7088, 0x9005, 0x01e0,
++	0x2011, 0x554d, 0x080c, 0x781a, 0x9086, 0x0084, 0x1198, 0x080c,
++	0x56b3, 0x2079, 0x0260, 0x7a30, 0x9296, 0x1107, 0x1158, 0x7834,
++	0x9005, 0x1140, 0x708f, 0x0001, 0x080c, 0x5614, 0x7093, 0x001a,
++	0x0029, 0x0010, 0x708b, 0x0000, 0x00fe, 0x0005, 0x9085, 0x0001,
++	0x080c, 0x56de, 0x7093, 0x001b, 0x080c, 0x9363, 0x080c, 0x56b3,
++	0x2011, 0x0260, 0x2009, 0x0240, 0x7488, 0x9480, 0x0018, 0x9080,
++	0x0007, 0x9084, 0x03f8, 0x8004, 0x20a8, 0x220e, 0x8210, 0x8108,
++	0x9186, 0x0260, 0x1150, 0x6810, 0x8000, 0x6812, 0x2009, 0x0240,
++	0x6814, 0x8000, 0x6816, 0x2011, 0x0260, 0x1f04, 0x5455, 0x60c3,
++	0x0084, 0x080c, 0x557c, 0x0005, 0x0005, 0x0086, 0x0096, 0x2029,
++	0x1853, 0x252c, 0x20a9, 0x0008, 0x2041, 0x1c0e, 0x20e9, 0x0001,
++	0x28a0, 0x080c, 0x56b3, 0x20e1, 0x0000, 0x2099, 0x026e, 0x4003,
++	0x20a9, 0x0008, 0x2011, 0x0007, 0xd5d4, 0x0108, 0x9016, 0x2800,
++	0x9200, 0x200c, 0x91a6, 0xffff, 0x1148, 0xd5d4, 0x0110, 0x8210,
++	0x0008, 0x8211, 0x1f04, 0x5487, 0x0804, 0x54f6, 0x82ff, 0x1160,
++	0xd5d4, 0x0120, 0x91a6, 0x3fff, 0x0d90, 0x0020, 0x91a6, 0x3fff,
++	0x0904, 0x54f6, 0x918d, 0xc000, 0x20a9, 0x0010, 0x2019, 0x0001,
++	0xd5d4, 0x0110, 0x2019, 0x0010, 0x2120, 0xd5d4, 0x0110, 0x8423,
++	0x0008, 0x8424, 0x1240, 0xd5d4, 0x0110, 0x8319, 0x0008, 0x8318,
++	0x1f04, 0x54ad, 0x04d8, 0x23a8, 0x2021, 0x0001, 0x8426, 0x8425,
++	0x1f04, 0x54bf, 0x2328, 0x8529, 0x92be, 0x0007, 0x0158, 0x0006,
++	0x2039, 0x0007, 0x2200, 0x973a, 0x000e, 0x27a8, 0x95a8, 0x0010,
++	0x1f04, 0x54ce, 0x7556, 0x95c8, 0x2e6e, 0x292d, 0x95ac, 0x00ff,
++	0x757a, 0x6532, 0x6536, 0x0016, 0x2508, 0x080c, 0x2446, 0x001e,
++	0x60e7, 0x0000, 0x65ea, 0x2018, 0x2304, 0x9405, 0x201a, 0x707f,
++	0x0001, 0x20e9, 0x0000, 0x20a1, 0x024e, 0x20e1, 0x0001, 0x2898,
++	0x20a9, 0x0008, 0x4003, 0x9085, 0x0001, 0x0008, 0x9006, 0x009e,
++	0x008e, 0x0005, 0x0156, 0x01c6, 0x01d6, 0x0136, 0x0146, 0x22a8,
++	0x20e1, 0x0000, 0x2099, 0x026e, 0x20e9, 0x0000, 0x2011, 0x024e,
++	0x22a0, 0x4003, 0x014e, 0x013e, 0x01de, 0x01ce, 0x015e, 0x2118,
++	0x9026, 0x2001, 0x0007, 0x939a, 0x0010, 0x0218, 0x8420, 0x8001,
++	0x0cd0, 0x2118, 0x84ff, 0x0120, 0x939a, 0x0010, 0x8421, 0x1de0,
++	0x2021, 0x0001, 0x83ff, 0x0118, 0x8423, 0x8319, 0x1de8, 0x9238,
++	0x2029, 0x026e, 0x9528, 0x2504, 0x942c, 0x11b8, 0x9405, 0x203a,
++	0x7156, 0x91a0, 0x2e6e, 0x242d, 0x95ac, 0x00ff, 0x757a, 0x6532,
++	0x6536, 0x0016, 0x2508, 0x080c, 0x2446, 0x001e, 0x60e7, 0x0000,
++	0x65ea, 0x707f, 0x0001, 0x9084, 0x0000, 0x0005, 0x00e6, 0x2071,
++	0x1800, 0x7083, 0x0000, 0x00ee, 0x0005, 0x00e6, 0x00f6, 0x2079,
++	0x0100, 0x2071, 0x0140, 0x080c, 0x5603, 0x080c, 0x8b50, 0x7004,
++	0x9084, 0x4000, 0x0138, 0x2001, 0x1000, 0x080c, 0x28a5, 0x9006,
++	0x080c, 0x28a5, 0x0126, 0x2091, 0x8000, 0x2071, 0x1824, 0x2073,
++	0x0000, 0x7840, 0x0026, 0x0016, 0x2009, 0x00f7, 0x080c, 0x5660,
++	0x001e, 0x9094, 0x0010, 0x9285, 0x0080, 0x7842, 0x7a42, 0x002e,
++	0x012e, 0x00fe, 0x00ee, 0x0005, 0x0126, 0x2091, 0x8000, 0x2011,
++	0x19be, 0x2013, 0x0000, 0x708b, 0x0000, 0x012e, 0x60a3, 0x0056,
++	0x60a7, 0x9575, 0x080c, 0x8b47, 0x6144, 0xd184, 0x0120, 0x7190,
++	0x918d, 0x2000, 0x0018, 0x7184, 0x918d, 0x1000, 0x2011, 0x1966,
++	0x2112, 0x2009, 0x07d0, 0x2011, 0x554d, 0x080c, 0x78a5, 0x0005,
++	0x0016, 0x0026, 0x00c6, 0x0126, 0x2091, 0x8000, 0x080c, 0x94da,
++	0x2009, 0x00f7, 0x080c, 0x5660, 0x2061, 0x19c7, 0x900e, 0x611a,
++	0x611e, 0x2061, 0x1800, 0x6003, 0x0001, 0x2061, 0x0100, 0x6043,
++	0x0090, 0x6043, 0x0010, 0x2009, 0x1966, 0x200b, 0x0000, 0x2009,
++	0x002d, 0x2011, 0x55ca, 0x080c, 0x780e, 0x012e, 0x00ce, 0x002e,
++	0x001e, 0x0005, 0x00e6, 0x0006, 0x0126, 0x2091, 0x8000, 0x0499,
++	0x2071, 0x0100, 0x080c, 0x8b50, 0x2071, 0x0140, 0x7004, 0x9084,
++	0x4000, 0x0138, 0x2001, 0x1000, 0x080c, 0x28a5, 0x9006, 0x080c,
++	0x28a5, 0x080c, 0x687f, 0x0188, 0x080c, 0x689a, 0x1170, 0x080c,
++	0x6b4a, 0x0016, 0x080c, 0x2515, 0x2001, 0x193c, 0x2102, 0x001e,
++	0x080c, 0x6b45, 0x080c, 0x67be, 0x0050, 0x2009, 0x0001, 0x080c,
++	0x27f5, 0x2001, 0x0001, 0x080c, 0x23a6, 0x080c, 0x55a0, 0x012e,
++	0x000e, 0x00ee, 0x0005, 0x2001, 0x180d, 0x2004, 0xd0bc, 0x0158,
++	0x0026, 0x0036, 0x2011, 0x8017, 0x2001, 0x1966, 0x201c, 0x080c,
++	0x447f, 0x003e, 0x002e, 0x0005, 0x20a9, 0x0012, 0x20e9, 0x0001,
++	0x20a1, 0x1c80, 0x080c, 0x56b3, 0x20e9, 0x0000, 0x2099, 0x026e,
++	0x0099, 0x20a9, 0x0020, 0x080c, 0x56ad, 0x2099, 0x0260, 0x20a1,
++	0x1c92, 0x0051, 0x20a9, 0x000e, 0x080c, 0x56b0, 0x2099, 0x0260,
++	0x20a1, 0x1cb2, 0x0009, 0x0005, 0x0016, 0x0026, 0x3410, 0x3308,
++	0x2104, 0x8007, 0x2012, 0x8108, 0x8210, 0x1f04, 0x5638, 0x002e,
++	0x001e, 0x0005, 0x080c, 0x9363, 0x20e1, 0x0001, 0x2099, 0x1c00,
++	0x20e9, 0x0000, 0x20a1, 0x0240, 0x20a9, 0x000c, 0x4003, 0x0005,
++	0x080c, 0x9363, 0x080c, 0x56b3, 0x20e1, 0x0000, 0x2099, 0x0260,
++	0x20e9, 0x0000, 0x20a1, 0x0240, 0x20a9, 0x000c, 0x4003, 0x0005,
++	0x00c6, 0x0006, 0x2061, 0x0100, 0x810f, 0x2001, 0x1833, 0x2004,
++	0x9005, 0x1138, 0x2001, 0x1816, 0x2004, 0x9084, 0x00ff, 0x9105,
++	0x0010, 0x9185, 0x00f7, 0x604a, 0x000e, 0x00ce, 0x0005, 0x0016,
++	0x0046, 0x080c, 0x5f29, 0x0158, 0x9006, 0x2020, 0x2009, 0x002a,
++	0x080c, 0xc9c5, 0x2001, 0x180c, 0x200c, 0xc195, 0x2102, 0x2019,
++	0x002a, 0x900e, 0x080c, 0x2ce5, 0x004e, 0x001e, 0x0005, 0x080c,
++	0x55a0, 0x7093, 0x0000, 0x708b, 0x0000, 0x0005, 0x0006, 0x2001,
++	0x180c, 0x2004, 0xd09c, 0x0100, 0x000e, 0x0005, 0x0006, 0x0016,
++	0x0126, 0x2091, 0x8000, 0x2001, 0x0101, 0x200c, 0x918d, 0x0006,
++	0x2102, 0x012e, 0x001e, 0x000e, 0x0005, 0x2009, 0x0001, 0x0020,
++	0x2009, 0x0002, 0x0008, 0x900e, 0x6814, 0x9084, 0xffc0, 0x910d,
++	0x6916, 0x0005, 0x00f6, 0x0156, 0x0146, 0x01d6, 0x9006, 0x20a9,
++	0x0080, 0x20e9, 0x0001, 0x20a1, 0x1c00, 0x4004, 0x2079, 0x1c00,
++	0x7803, 0x2200, 0x7807, 0x00ef, 0x780f, 0x00ef, 0x7813, 0x0138,
++	0x7823, 0xffff, 0x7827, 0xffff, 0x01de, 0x014e, 0x015e, 0x00fe,
++	0x0005, 0x2001, 0x1800, 0x2003, 0x0001, 0x0005, 0x2001, 0x1973,
++	0x0118, 0x2003, 0x0001, 0x0010, 0x2003, 0x0000, 0x0005, 0x0156,
++	0x20a9, 0x0800, 0x2009, 0x1000, 0x9006, 0x200a, 0x8108, 0x1f04,
++	0x56ed, 0x015e, 0x0005, 0x00d6, 0x0036, 0x0156, 0x0136, 0x0146,
++	0x2069, 0x1852, 0x9006, 0xb802, 0xb8be, 0xb807, 0x0707, 0xb80a,
++	0xb80e, 0xb812, 0x9198, 0x2e6e, 0x231d, 0x939c, 0x00ff, 0xbb16,
++	0x0016, 0x0026, 0xb8b2, 0x080c, 0x94d3, 0x1120, 0x9192, 0x007e,
++	0x1208, 0xbbb2, 0x20a9, 0x0004, 0xb8b4, 0x20e8, 0xb9b8, 0x9198,
++	0x0006, 0x9006, 0x23a0, 0x4004, 0x20a9, 0x0004, 0x9198, 0x000a,
++	0x23a0, 0x4004, 0x002e, 0x001e, 0xb83e, 0xb842, 0xb84e, 0xb852,
++	0xb856, 0xb85a, 0xb85e, 0xb862, 0xb866, 0xb86a, 0xb86f, 0x0100,
++	0xb872, 0xb876, 0xb87a, 0xb88a, 0xb88e, 0xb893, 0x0008, 0xb896,
++	0xb89a, 0xb89e, 0xb8ae, 0xb9a2, 0x0096, 0xb8a4, 0x904d, 0x0110,
++	0x080c, 0x0fe0, 0xb8a7, 0x0000, 0x009e, 0x9006, 0xb84a, 0x6810,
++	0xb83a, 0x680c, 0xb846, 0x6814, 0x9084, 0x00ff, 0xb842, 0x014e,
++	0x013e, 0x015e, 0x003e, 0x00de, 0x0005, 0x0126, 0x2091, 0x8000,
++	0xa974, 0xae78, 0x9684, 0x3fff, 0x9082, 0x4000, 0x1a04, 0x57c2,
++	0x9182, 0x0800, 0x1a04, 0x57c6, 0x2001, 0x180c, 0x2004, 0x9084,
++	0x0003, 0x1904, 0x57cc, 0x9188, 0x1000, 0x2104, 0x905d, 0x0518,
++	0xb804, 0x9084, 0x00ff, 0x908e, 0x0006, 0x1508, 0xb8a4, 0x900d,
++	0x1904, 0x57de, 0xb850, 0x900d, 0x1148, 0xa802, 0x2900, 0xb852,
++	0xb84e, 0x080c, 0x7be8, 0x9006, 0x012e, 0x0005, 0x00a6, 0x2150,
++	0x2900, 0xb002, 0xa803, 0x0000, 0x00ae, 0xb852, 0x0c90, 0x2001,
++	0x0005, 0x900e, 0x04b0, 0x2001, 0x0028, 0x900e, 0x0490, 0x9082,
++	0x0006, 0x1288, 0x080c, 0x94d3, 0x1158, 0xb8a0, 0xd0bc, 0x1140,
++	0xb900, 0xd1fc, 0x0998, 0x2001, 0x0029, 0x2009, 0x1000, 0x0408,
++	0x2001, 0x0028, 0x00a8, 0x2009, 0x180c, 0x210c, 0xd18c, 0x0118,
++	0x2001, 0x0004, 0x0068, 0xd184, 0x0118, 0x2001, 0x0004, 0x0040,
++	0x2001, 0x0029, 0xb900, 0xd1fc, 0x0118, 0x2009, 0x1000, 0x0048,
++	0x900e, 0x0038, 0x2001, 0x0029, 0x900e, 0x0018, 0x2001, 0x0029,
++	0x900e, 0x9005, 0x012e, 0x0005, 0x2001, 0x180c, 0x2004, 0xd084,
++	0x19d0, 0x9188, 0x1000, 0x2104, 0x905d, 0x09a8, 0x080c, 0x5f2d,
++	0x1990, 0xb800, 0xd0c4, 0x0978, 0x0804, 0x5776, 0x080c, 0x5da9,
++	0x0904, 0x578f, 0x0804, 0x577a, 0x00b6, 0x00e6, 0x0126, 0x2091,
++	0x8000, 0xa974, 0x9182, 0x0800, 0x1a04, 0x583f, 0x9188, 0x1000,
++	0x2104, 0x905d, 0x0528, 0xb8a0, 0x9086, 0x007f, 0x0130, 0x080c,
++	0x5f35, 0x0118, 0x080c, 0x5f2d, 0x11f0, 0xa87c, 0xd0fc, 0x0138,
++	0xa894, 0x9005, 0x0120, 0x2060, 0x2900, 0x6016, 0x0058, 0x080c,
++	0x94fe, 0x05e0, 0x2b00, 0x6012, 0x2900, 0x6016, 0x600b, 0xffff,
++	0x6023, 0x000a, 0x2009, 0x0003, 0x080c, 0x95ce, 0x9006, 0x0450,
++	0x2001, 0x0028, 0x0430, 0x9082, 0x0006, 0x1288, 0x080c, 0x94d3,
++	0x1158, 0xb8a0, 0xd0bc, 0x1140, 0xb900, 0xd1fc, 0x09b0, 0x2001,
++	0x0029, 0x2009, 0x1000, 0x00a8, 0x2001, 0x0028, 0x0090, 0x2009,
++	0x180c, 0x210c, 0xd18c, 0x0118, 0x2001, 0x0004, 0x0050, 0xd184,
++	0x0118, 0x2001, 0x0004, 0x0028, 0x2001, 0x0029, 0x0010, 0x2001,
++	0x0029, 0x9005, 0x012e, 0x00ee, 0x00be, 0x0005, 0x2001, 0x002c,
++	0x0cc0, 0x00f6, 0x00b6, 0x0126, 0x2091, 0x8000, 0xa8e0, 0x9005,
++	0x1550, 0xa8dc, 0x9082, 0x0101, 0x1630, 0xa8c8, 0x9005, 0x1518,
++	0xa8c4, 0x9082, 0x0101, 0x12f8, 0xa974, 0x2079, 0x1800, 0x9182,
++	0x0800, 0x12e8, 0x7830, 0x9084, 0x0003, 0x1130, 0xaa98, 0xab94,
++	0xa878, 0x9084, 0x0007, 0x00ea, 0x7930, 0xd18c, 0x0118, 0x2001,
++	0x0004, 0x0038, 0xd184, 0x0118, 0x2001, 0x0004, 0x0010, 0x2001,
++	0x0029, 0x900e, 0x0038, 0x2001, 0x002c, 0x900e, 0x0018, 0x2001,
++	0x0029, 0x900e, 0x9006, 0x0008, 0x9005, 0x012e, 0x00be, 0x00fe,
++	0x0005, 0x58d5, 0x5891, 0x58a7, 0x58d5, 0x58d5, 0x58d5, 0x58d5,
++	0x58d5, 0x2100, 0x9082, 0x007e, 0x1270, 0x080c, 0x5bb0, 0x0140,
++	0xb810, 0x9306, 0x1904, 0x58dd, 0xb814, 0x9206, 0x15f0, 0x0028,
++	0xbb12, 0xba16, 0x0010, 0x080c, 0x435a, 0x0150, 0x04b0, 0x080c,
++	0x5c0d, 0x1598, 0xb810, 0x9306, 0x1580, 0xb814, 0x9206, 0x1568,
++	0x080c, 0x94fe, 0x0530, 0x2b00, 0x6012, 0x080c, 0xb4e6, 0x2900,
++	0x6016, 0x600b, 0xffff, 0x6023, 0x000a, 0xa878, 0x9086, 0x0001,
++	0x1170, 0x080c, 0x2d1a, 0x9006, 0x080c, 0x5b4d, 0x2001, 0x0002,
++	0x080c, 0x5b61, 0x2001, 0x0200, 0xb86e, 0xb893, 0x0002, 0x2009,
++	0x0003, 0x080c, 0x95ce, 0x9006, 0x0068, 0x2001, 0x0001, 0x900e,
++	0x0038, 0x2001, 0x002c, 0x900e, 0x0018, 0x2001, 0x0028, 0x900e,
++	0x9005, 0x0000, 0x012e, 0x00be, 0x00fe, 0x0005, 0x00b6, 0x00f6,
++	0x00e6, 0x0126, 0x2091, 0x8000, 0xa894, 0x90c6, 0x0015, 0x0904,
++	0x5aa6, 0x90c6, 0x0056, 0x0904, 0x5aaa, 0x90c6, 0x0066, 0x0904,
++	0x5aae, 0x90c6, 0x0071, 0x0904, 0x5ab2, 0x90c6, 0x0074, 0x0904,
++	0x5ab6, 0x90c6, 0x007c, 0x0904, 0x5aba, 0x90c6, 0x007e, 0x0904,
++	0x5abe, 0x90c6, 0x0037, 0x0904, 0x5ac2, 0x9016, 0x2079, 0x1800,
++	0xa974, 0x9186, 0x00ff, 0x0904, 0x5aa1, 0x9182, 0x0800, 0x1a04,
++	0x5aa1, 0x080c, 0x5c0d, 0x1190, 0xb804, 0x9084, 0x00ff, 0x9082,
++	0x0006, 0x1260, 0xa894, 0x90c6, 0x006f, 0x0140, 0x080c, 0x94d3,
++	0x1904, 0x5a8a, 0xb8a0, 0xd0bc, 0x1904, 0x5a8a, 0xa894, 0x90c6,
++	0x006f, 0x0158, 0x90c6, 0x005e, 0x0904, 0x59e6, 0x90c6, 0x0064,
++	0x0904, 0x5a12, 0x2008, 0x0804, 0x59a8, 0xa998, 0xa8b0, 0x2040,
++	0x080c, 0x94d3, 0x1120, 0x9182, 0x007f, 0x0a04, 0x59a8, 0x9186,
++	0x00ff, 0x0904, 0x59a8, 0x9182, 0x0800, 0x1a04, 0x59a8, 0xaaa0,
++	0xab9c, 0x7874, 0x9306, 0x1188, 0x7878, 0x0096, 0x924e, 0x1128,
++	0x2208, 0x2310, 0x009e, 0x0804, 0x59a8, 0x99cc, 0xff00, 0x009e,
++	0x1120, 0x2208, 0x2310, 0x0804, 0x59a8, 0x080c, 0x435a, 0x0904,
++	0x59b2, 0x900e, 0x9016, 0x90c6, 0x4000, 0x1558, 0x0006, 0x080c,
++	0x5e2d, 0x1108, 0xc185, 0xb800, 0xd0bc, 0x0108, 0xc18d, 0x20a9,
++	0x0004, 0xa860, 0x20e8, 0xa85c, 0x9080, 0x0031, 0x20a0, 0xb8b4,
++	0x20e0, 0xb8b8, 0x9080, 0x0006, 0x2098, 0x080c, 0x0f2b, 0x20a9,
++	0x0004, 0xa860, 0x20e8, 0xa85c, 0x9080, 0x0035, 0x20a0, 0xb8b4,
++	0x20e0, 0xb8b8, 0x9080, 0x000a, 0x2098, 0x080c, 0x0f2b, 0x000e,
++	0x0098, 0x90c6, 0x4007, 0x1110, 0x2408, 0x0070, 0x90c6, 0x4008,
++	0x1118, 0x2708, 0x2610, 0x0040, 0x90c6, 0x4009, 0x1108, 0x0020,
++	0x2001, 0x4005, 0x2009, 0x000a, 0xa896, 0xa99a, 0xaa9e, 0x2001,
++	0x0030, 0x0470, 0x080c, 0x94fe, 0x1130, 0x2001, 0x4005, 0x2009,
++	0x0003, 0x9016, 0x0c88, 0x2b00, 0x6012, 0x080c, 0xb4e6, 0x2900,
++	0x6016, 0x6023, 0x0001, 0xa868, 0xd88c, 0x0108, 0xc0f5, 0xa86a,
++	0x0126, 0x2091, 0x8000, 0x080c, 0x2d1a, 0x012e, 0x9006, 0x080c,
++	0x5b4d, 0x2001, 0x0002, 0x080c, 0x5b61, 0x2009, 0x0002, 0x080c,
++	0x95ce, 0xa8b0, 0xd094, 0x0118, 0xb8bc, 0xc08d, 0xb8be, 0x9006,
++	0x9005, 0x012e, 0x00ee, 0x00fe, 0x00be, 0x0005, 0x080c, 0x4dfe,
++	0x0118, 0x2009, 0x0007, 0x0410, 0xa998, 0xaeb0, 0x080c, 0x5c0d,
++	0x0120, 0x2009, 0x000a, 0x0804, 0x59a8, 0x9186, 0x007f, 0x0130,
++	0x080c, 0x5f2d, 0x0118, 0x2009, 0x0009, 0x0080, 0x0096, 0x080c,
++	0x0fae, 0x1120, 0x009e, 0x2009, 0x0002, 0x0040, 0x2900, 0x009e,
++	0xa806, 0x080c, 0xb275, 0x1998, 0x2009, 0x0003, 0x2001, 0x4005,
++	0x0804, 0x59ac, 0xa998, 0xaeb0, 0x080c, 0x5c0d, 0x0120, 0x2009,
++	0x000a, 0x0804, 0x59a8, 0x0096, 0x080c, 0x0fae, 0x1128, 0x009e,
++	0x2009, 0x0002, 0x0804, 0x5a69, 0x2900, 0x009e, 0xa806, 0x0096,
++	0x2048, 0x20a9, 0x002b, 0xb8b4, 0x20e0, 0xb8b8, 0x2098, 0xa860,
++	0x20e8, 0xa85c, 0x9080, 0x0002, 0x20a0, 0x4003, 0x20a9, 0x0008,
++	0x9080, 0x0006, 0x20a0, 0xbbb8, 0x9398, 0x0006, 0x2398, 0x080c,
++	0x0f2b, 0x009e, 0xa87b, 0x0000, 0xa883, 0x0000, 0xa897, 0x4000,
++	0xd684, 0x1168, 0x080c, 0x4dea, 0xd0b4, 0x1118, 0xa89b, 0x000b,
++	0x00e0, 0xb800, 0xd08c, 0x0118, 0xa89b, 0x000c, 0x00b0, 0x080c,
++	0x5f2d, 0x0118, 0xa89b, 0x0009, 0x0080, 0x080c, 0x4dfe, 0x0118,
++	0xa89b, 0x0007, 0x0050, 0x080c, 0xb258, 0x1904, 0x59df, 0x2009,
++	0x0003, 0x2001, 0x4005, 0x0804, 0x59ac, 0xa87b, 0x0030, 0xa897,
++	0x4005, 0xa804, 0x8006, 0x8006, 0x8007, 0x90bc, 0x003f, 0x9084,
++	0xffc0, 0x2009, 0x002b, 0xaaa0, 0xab9c, 0xaca8, 0xada4, 0x2031,
++	0x0000, 0x2041, 0x11e3, 0x080c, 0x9a1f, 0x1904, 0x59df, 0x2009,
++	0x0002, 0x08f8, 0x2001, 0x0028, 0x900e, 0x0804, 0x59e0, 0x2009,
++	0x180c, 0x210c, 0xd18c, 0x0118, 0x2001, 0x0004, 0x0038, 0xd184,
++	0x0118, 0x2001, 0x0004, 0x0010, 0x2001, 0x0029, 0x900e, 0x0804,
++	0x59e0, 0x2001, 0x0029, 0x900e, 0x0804, 0x59e0, 0x080c, 0x327f,
++	0x0804, 0x59e1, 0x080c, 0x4b29, 0x0804, 0x59e1, 0x080c, 0x3fec,
++	0x0804, 0x59e1, 0x080c, 0x43f5, 0x0804, 0x59e1, 0x080c, 0x4572,
++	0x0804, 0x59e1, 0x080c, 0x4796, 0x0804, 0x59e1, 0x080c, 0x499b,
++	0x0804, 0x59e1, 0x080c, 0x3459, 0x0804, 0x59e1, 0x00b6, 0xa974,
++	0xae78, 0x9684, 0x3fff, 0x9082, 0x4000, 0x1618, 0x9182, 0x0800,
++	0x1268, 0x9188, 0x1000, 0x2104, 0x905d, 0x0140, 0x080c, 0x5f2d,
++	0x1148, 0x00e9, 0x080c, 0x5d38, 0x9006, 0x00b0, 0x2001, 0x0028,
++	0x900e, 0x0090, 0x9082, 0x0006, 0x1240, 0xb900, 0xd1fc, 0x0d88,
++	0x2001, 0x0029, 0x2009, 0x1000, 0x0038, 0x2001, 0x0029, 0x900e,
++	0x0018, 0x2001, 0x0029, 0x900e, 0x9005, 0x00be, 0x0005, 0x0126,
++	0x2091, 0x8000, 0xb850, 0x900d, 0x0150, 0x2900, 0x0096, 0x2148,
++	0xa802, 0x009e, 0xa803, 0x0000, 0xb852, 0x012e, 0x0005, 0x2900,
++	0xb852, 0xb84e, 0xa803, 0x0000, 0x0cc0, 0x0126, 0x2091, 0x8000,
++	0xb84c, 0x9005, 0x0170, 0x00e6, 0x2071, 0x19b4, 0x7004, 0x9086,
++	0x0002, 0x0168, 0x00ee, 0xb84c, 0xa802, 0x2900, 0xb84e, 0x012e,
++	0x0005, 0x2900, 0xb852, 0xb84e, 0xa803, 0x0000, 0x0cc0, 0x701c,
++	0x9b06, 0x1d80, 0xb84c, 0x00a6, 0x2050, 0xb000, 0xa802, 0x2900,
++	0xb002, 0x00ae, 0x00ee, 0x012e, 0x0005, 0x0126, 0x2091, 0x8000,
++	0xb84c, 0x904d, 0x0130, 0xa800, 0x9005, 0x1108, 0xb852, 0xb84e,
++	0x9905, 0x012e, 0x0005, 0xb84c, 0x904d, 0x0130, 0xa800, 0x9005,
++	0x1108, 0xb852, 0xb84e, 0x9905, 0x0005, 0x00b6, 0x0126, 0x00c6,
++	0x0026, 0x2091, 0x8000, 0x6210, 0x2258, 0xba00, 0x9005, 0x0110,
++	0xc285, 0x0008, 0xc284, 0xba02, 0x002e, 0x00ce, 0x012e, 0x00be,
++	0x0005, 0x00b6, 0x0126, 0x00c6, 0x2091, 0x8000, 0x6210, 0x2258,
++	0xba04, 0x0006, 0x9086, 0x0006, 0x1170, 0xb89c, 0xd0ac, 0x0158,
++	0x080c, 0x5f29, 0x0140, 0x9284, 0xff00, 0x8007, 0x9086, 0x0007,
++	0x1110, 0x2011, 0x0600, 0x000e, 0x9294, 0xff00, 0x9215, 0xba06,
++	0x0006, 0x9086, 0x0006, 0x1120, 0xba90, 0x82ff, 0x090c, 0x0d84,
++	0x000e, 0x00ce, 0x012e, 0x00be, 0x0005, 0x00b6, 0x0126, 0x00c6,
++	0x2091, 0x8000, 0x6210, 0x2258, 0xba04, 0x0006, 0x9086, 0x0006,
++	0x1168, 0xb89c, 0xd0a4, 0x0150, 0x080c, 0x5f25, 0x1138, 0x9284,
++	0x00ff, 0x9086, 0x0007, 0x1110, 0x2011, 0x0006, 0x000e, 0x9294,
++	0x00ff, 0x8007, 0x9215, 0xba06, 0x00ce, 0x012e, 0x00be, 0x0005,
++	0x00d6, 0x0026, 0x9182, 0x0800, 0x0218, 0x9085, 0x0001, 0x00b0,
++	0x9190, 0x1000, 0x2204, 0x905d, 0x1180, 0x0096, 0x080c, 0x0fae,
++	0x2958, 0x009e, 0x0d90, 0x2b00, 0x2012, 0xb85c, 0xb8ba, 0xb860,
++	0xb8b6, 0x9006, 0xb8a6, 0x080c, 0x56f3, 0x9006, 0x002e, 0x00de,
++	0x0005, 0x00b6, 0x0096, 0x0126, 0x2091, 0x8000, 0x0026, 0x9182,
++	0x0800, 0x0218, 0x9085, 0x0001, 0x0458, 0x00d6, 0x9190, 0x1000,
++	0x2204, 0x905d, 0x0518, 0x2013, 0x0000, 0xb8a4, 0x904d, 0x0110,
++	0x080c, 0x0fe0, 0x00d6, 0x00c6, 0xb8ac, 0x2060, 0x8cff, 0x0168,
++	0x600c, 0x0006, 0x6014, 0x2048, 0x080c, 0xb0ad, 0x0110, 0x080c,
++	0x0f60, 0x080c, 0x9554, 0x00ce, 0x0c88, 0x00ce, 0x00de, 0x2b48,
++	0xb8b8, 0xb85e, 0xb8b4, 0xb862, 0x080c, 0x0ff0, 0x00de, 0x9006,
++	0x002e, 0x012e, 0x009e, 0x00be, 0x0005, 0x0016, 0x9182, 0x0800,
++	0x0218, 0x9085, 0x0001, 0x0030, 0x9188, 0x1000, 0x2104, 0x905d,
++	0x0dc0, 0x9006, 0x001e, 0x0005, 0x00d6, 0x0156, 0x0136, 0x0146,
++	0x9006, 0xb80a, 0xb80e, 0xb800, 0xc08c, 0xb802, 0x080c, 0x6877,
++	0x1510, 0xb8a0, 0x9086, 0x007e, 0x0120, 0x080c, 0x94d3, 0x11d8,
++	0x0078, 0x7040, 0xd0e4, 0x01b8, 0x00c6, 0x2061, 0x194f, 0x7048,
++	0x2062, 0x704c, 0x6006, 0x7050, 0x600a, 0x7054, 0x600e, 0x00ce,
++	0x703c, 0x2069, 0x0140, 0x9005, 0x1110, 0x2001, 0x0001, 0x6886,
++	0x2069, 0x1800, 0x68ae, 0x7040, 0xb85e, 0x7048, 0xb862, 0x704c,
++	0xb866, 0x20e1, 0x0000, 0x2099, 0x0276, 0xb8b4, 0x20e8, 0xb8b8,
++	0x9088, 0x000a, 0x21a0, 0x20a9, 0x0004, 0x4003, 0x2099, 0x027a,
++	0x9088, 0x0006, 0x21a0, 0x20a9, 0x0004, 0x4003, 0x2069, 0x0200,
++	0x6817, 0x0001, 0x7040, 0xb86a, 0x7144, 0xb96e, 0x7048, 0xb872,
++	0x7050, 0xb876, 0x2069, 0x0200, 0x6817, 0x0000, 0xb8a0, 0x9086,
++	0x007e, 0x1110, 0x7144, 0xb96e, 0x9182, 0x0211, 0x1218, 0x2009,
++	0x0008, 0x0400, 0x9182, 0x0259, 0x1218, 0x2009, 0x0007, 0x00d0,
++	0x9182, 0x02c1, 0x1218, 0x2009, 0x0006, 0x00a0, 0x9182, 0x0349,
++	0x1218, 0x2009, 0x0005, 0x0070, 0x9182, 0x0421, 0x1218, 0x2009,
++	0x0004, 0x0040, 0x9182, 0x0581, 0x1218, 0x2009, 0x0003, 0x0010,
++	0x2009, 0x0002, 0xb992, 0x014e, 0x013e, 0x015e, 0x00de, 0x0005,
++	0x0016, 0x0026, 0x00e6, 0x2071, 0x0260, 0x7034, 0xb896, 0x703c,
++	0xb89a, 0x7054, 0xb89e, 0x0036, 0xbbbc, 0xc384, 0xba00, 0x2009,
++	0x1872, 0x210c, 0xd0bc, 0x0120, 0xd1ec, 0x0110, 0xc2ad, 0x0008,
++	0xc2ac, 0xd0c4, 0x0148, 0xd1e4, 0x0138, 0xc2bd, 0xd0cc, 0x0128,
++	0xd38c, 0x1108, 0xc385, 0x0008, 0xc2bc, 0xba02, 0xbbbe, 0x003e,
++	0x00ee, 0x002e, 0x001e, 0x0005, 0x0096, 0x0126, 0x2091, 0x8000,
++	0xb8a4, 0x904d, 0x0578, 0xa900, 0x81ff, 0x15c0, 0xaa04, 0x9282,
++	0x0010, 0x16c8, 0x0136, 0x0146, 0x01c6, 0x01d6, 0x8906, 0x8006,
++	0x8007, 0x908c, 0x003f, 0x21e0, 0x9084, 0xffc0, 0x9080, 0x0004,
++	0x2098, 0x2009, 0x0010, 0x20a9, 0x0001, 0x4002, 0x9086, 0xffff,
++	0x0120, 0x8109, 0x1dd0, 0x080c, 0x0d84, 0x3c00, 0x20e8, 0x3300,
++	0x8001, 0x20a0, 0x4604, 0x8210, 0xaa06, 0x01de, 0x01ce, 0x014e,
++	0x013e, 0x0060, 0x080c, 0x0fae, 0x0170, 0x2900, 0xb8a6, 0xa803,
++	0x0000, 0x080c, 0x5dc9, 0xa807, 0x0001, 0xae12, 0x9085, 0x0001,
++	0x012e, 0x009e, 0x0005, 0x9006, 0x0cd8, 0x0126, 0x2091, 0x8000,
++	0x0096, 0xb8a4, 0x904d, 0x0188, 0xa800, 0x9005, 0x1150, 0x080c,
++	0x5dd8, 0x1158, 0xa804, 0x908a, 0x0002, 0x0218, 0x8001, 0xa806,
++	0x0020, 0x080c, 0x0fe0, 0xb8a7, 0x0000, 0x009e, 0x012e, 0x0005,
++	0x0126, 0x2091, 0x8000, 0x080c, 0x7be8, 0x012e, 0x0005, 0x901e,
++	0x0010, 0x2019, 0x0001, 0x900e, 0x0126, 0x2091, 0x8000, 0xb84c,
++	0x2048, 0xb800, 0xd0dc, 0x1170, 0x89ff, 0x0500, 0x83ff, 0x0120,
++	0xa878, 0x9606, 0x0158, 0x0030, 0xa86c, 0x9406, 0x1118, 0xa870,
++	0x9506, 0x0120, 0x2908, 0xa800, 0x2048, 0x0c70, 0x080c, 0x8eec,
++	0xaa00, 0xb84c, 0x9906, 0x1110, 0xba4e, 0x0020, 0x00a6, 0x2150,
++	0xb202, 0x00ae, 0x82ff, 0x1110, 0xb952, 0x89ff, 0x012e, 0x0005,
++	0x9016, 0x0489, 0x1110, 0x2011, 0x0001, 0x0005, 0x080c, 0x5e2d,
++	0x0118, 0x080c, 0xb15e, 0x0010, 0x9085, 0x0001, 0x0005, 0x080c,
++	0x5e2d, 0x0118, 0x080c, 0xb0f8, 0x0010, 0x9085, 0x0001, 0x0005,
++	0x080c, 0x5e2d, 0x0118, 0x080c, 0xb15b, 0x0010, 0x9085, 0x0001,
++	0x0005, 0x080c, 0x5e2d, 0x0118, 0x080c, 0xb11c, 0x0010, 0x9085,
++	0x0001, 0x0005, 0x080c, 0x5e2d, 0x0118, 0x080c, 0xb188, 0x0010,
++	0x9085, 0x0001, 0x0005, 0xb8a4, 0x900d, 0x1118, 0x9085, 0x0001,
++	0x0005, 0x0136, 0x01c6, 0xa800, 0x9005, 0x11b8, 0x890e, 0x810e,
++	0x810f, 0x9184, 0x003f, 0x20e0, 0x9184, 0xffc0, 0x9080, 0x0004,
++	0x2098, 0x20a9, 0x0001, 0x2009, 0x0010, 0x4002, 0x9606, 0x0128,
++	0x8109, 0x1dd8, 0x9085, 0x0001, 0x0008, 0x9006, 0x01ce, 0x013e,
++	0x0005, 0x0146, 0x01d6, 0xa860, 0x20e8, 0xa85c, 0x9080, 0x0004,
++	0x20a0, 0x20a9, 0x0010, 0x2009, 0xffff, 0x4104, 0x01de, 0x014e,
++	0x0136, 0x01c6, 0xa800, 0x9005, 0x11b8, 0x890e, 0x810e, 0x810f,
++	0x9184, 0x003f, 0x20e0, 0x9184, 0xffc0, 0x9080, 0x0004, 0x2098,
++	0x20a9, 0x0001, 0x2009, 0x0010, 0x4002, 0x9606, 0x0128, 0x8109,
++	0x1dd8, 0x9085, 0x0001, 0x0068, 0x0146, 0x01d6, 0x3300, 0x8001,
++	0x20a0, 0x3c00, 0x20e8, 0x2001, 0xffff, 0x4004, 0x01de, 0x014e,
++	0x9006, 0x01ce, 0x013e, 0x0005, 0x0096, 0x0126, 0x2091, 0x8000,
++	0xb8a4, 0x904d, 0x1128, 0x080c, 0x0fae, 0x0168, 0x2900, 0xb8a6,
++	0x080c, 0x5dc9, 0xa803, 0x0001, 0xa807, 0x0000, 0x9085, 0x0001,
++	0x012e, 0x009e, 0x0005, 0x9006, 0x0cd8, 0x0096, 0x0126, 0x2091,
++	0x8000, 0xb8a4, 0x904d, 0x0130, 0xb8a7, 0x0000, 0x080c, 0x0fe0,
++	0x9085, 0x0001, 0x012e, 0x009e, 0x0005, 0xb89c, 0xd0a4, 0x0005,
++	0x00b6, 0x00f6, 0x080c, 0x6877, 0x01b0, 0x71c0, 0x81ff, 0x1198,
++	0x71d8, 0xd19c, 0x0180, 0x2001, 0x007e, 0x9080, 0x1000, 0x2004,
++	0x905d, 0x0148, 0xb804, 0x9084, 0x00ff, 0x9086, 0x0006, 0x1118,
++	0xb800, 0xc0ed, 0xb802, 0x2079, 0x1852, 0x7804, 0xd0a4, 0x01d0,
++	0x0156, 0x20a9, 0x007f, 0x900e, 0x0016, 0x080c, 0x5c0d, 0x1168,
++	0xb804, 0x9084, 0xff00, 0x8007, 0x9096, 0x0004, 0x0118, 0x9086,
++	0x0006, 0x1118, 0xb800, 0xc0ed, 0xb802, 0x001e, 0x8108, 0x1f04,
++	0x5e54, 0x015e, 0x080c, 0x5eeb, 0x0120, 0x2001, 0x1952, 0x200c,
++	0x0038, 0x2079, 0x1852, 0x7804, 0xd0a4, 0x0130, 0x2009, 0x07d0,
++	0x2011, 0x5e7f, 0x080c, 0x78a5, 0x00fe, 0x00be, 0x0005, 0x00b6,
++	0x2011, 0x5e7f, 0x080c, 0x781a, 0x080c, 0x5eeb, 0x01d8, 0x2001,
++	0x107e, 0x2004, 0x2058, 0xb900, 0xc1ec, 0xb902, 0x080c, 0x5f29,
++	0x0130, 0x2009, 0x07d0, 0x2011, 0x5e7f, 0x080c, 0x78a5, 0x00e6,
++	0x2071, 0x1800, 0x9006, 0x7076, 0x7058, 0x707a, 0x080c, 0x2b1e,
++	0x00ee, 0x0488, 0x0156, 0x00c6, 0x20a9, 0x007f, 0x900e, 0x0016,
++	0x080c, 0x5c0d, 0x1510, 0xb800, 0xd0ec, 0x01f8, 0x0046, 0xbaa0,
++	0x2220, 0x9006, 0x2009, 0x0029, 0x080c, 0xc9c5, 0xb800, 0xc0e5,
++	0xc0ec, 0xb802, 0xb804, 0x9084, 0x00ff, 0x9085, 0x0700, 0xb806,
++	0x2019, 0x0029, 0x080c, 0x7d55, 0x0076, 0x903e, 0x080c, 0x7c4d,
++	0x900e, 0x080c, 0xc73e, 0x007e, 0x004e, 0x001e, 0x8108, 0x1f04,
++	0x5ea7, 0x00ce, 0x015e, 0x00be, 0x0005, 0x00b6, 0x6010, 0x2058,
++	0xb800, 0xc0ec, 0xb802, 0x00be, 0x0005, 0x7810, 0x00b6, 0x2058,
++	0xb800, 0x00be, 0xd0ac, 0x0005, 0x7810, 0x00b6, 0x2058, 0xb800,
++	0x00be, 0xd0bc, 0x0005, 0x00b6, 0x00f6, 0x2001, 0x107e, 0x2004,
++	0x905d, 0x0110, 0xb800, 0xd0ec, 0x00fe, 0x00be, 0x0005, 0x0126,
++	0x0026, 0x2091, 0x8000, 0x0006, 0xbaa0, 0x9290, 0x1000, 0x2204,
++	0x9b06, 0x190c, 0x0d84, 0x000e, 0xba00, 0x9005, 0x0110, 0xc2fd,
++	0x0008, 0xc2fc, 0xba02, 0x002e, 0x012e, 0x0005, 0x2011, 0x1836,
++	0x2204, 0xd0cc, 0x0138, 0x2001, 0x1950, 0x200c, 0x2011, 0x5f1b,
++	0x080c, 0x78a5, 0x0005, 0x2011, 0x5f1b, 0x080c, 0x781a, 0x2011,
++	0x1836, 0x2204, 0xc0cc, 0x2012, 0x0005, 0x080c, 0x4dea, 0xd0ac,
++	0x0005, 0x080c, 0x4dea, 0xd0a4, 0x0005, 0x0016, 0xb904, 0x9184,
++	0x00ff, 0x908e, 0x0006, 0x001e, 0x0005, 0x0016, 0xb904, 0x9184,
++	0xff00, 0x8007, 0x908e, 0x0006, 0x001e, 0x0005, 0x00b6, 0x00f6,
++	0x080c, 0xb759, 0x0158, 0x70d8, 0x9084, 0x0028, 0x0138, 0x2001,
++	0x107f, 0x2004, 0x905d, 0x0110, 0xb8bc, 0xd094, 0x00fe, 0x00be,
++	0x0005, 0x2071, 0x1904, 0x7003, 0x0001, 0x7007, 0x0000, 0x9006,
++	0x7012, 0x7016, 0x701a, 0x701e, 0x700a, 0x7046, 0x2001, 0x1917,
++	0x2003, 0x0000, 0x0005, 0x0016, 0x00e6, 0x2071, 0x1918, 0x900e,
++	0x710a, 0x080c, 0x4dea, 0xd0fc, 0x1140, 0x080c, 0x4dea, 0x900e,
++	0xd09c, 0x0108, 0x8108, 0x7102, 0x00f8, 0x2001, 0x1872, 0x200c,
++	0x9184, 0x0007, 0x0002, 0x5f6d, 0x5f6d, 0x5f6d, 0x5f6d, 0x5f6d,
++	0x5f83, 0x5f91, 0x5f6d, 0x7003, 0x0003, 0x2009, 0x1873, 0x210c,
++	0x9184, 0xff00, 0x8007, 0x9005, 0x1110, 0x2001, 0x0002, 0x7006,
++	0x0018, 0x7003, 0x0005, 0x0c88, 0x00ee, 0x001e, 0x0005, 0x00e6,
++	0x2071, 0x0050, 0x684c, 0x9005, 0x1150, 0x00e6, 0x2071, 0x1904,
++	0x7028, 0xc085, 0x702a, 0x00ee, 0x9085, 0x0001, 0x0488, 0x6844,
++	0x9005, 0x0158, 0x080c, 0x6bb2, 0x6a60, 0x9200, 0x7002, 0x6864,
++	0x9101, 0x7006, 0x9006, 0x7012, 0x7016, 0x6860, 0x7002, 0x6864,
++	0x7006, 0x6868, 0x700a, 0x686c, 0x700e, 0x6844, 0x9005, 0x1110,
++	0x7012, 0x7016, 0x684c, 0x701a, 0x701c, 0x9085, 0x0040, 0x701e,
++	0x7037, 0x0019, 0x702b, 0x0001, 0x00e6, 0x2071, 0x1904, 0x7028,
++	0xc084, 0x702a, 0x7007, 0x0001, 0x700b, 0x0000, 0x00ee, 0x9006,
++	0x00ee, 0x0005, 0xa868, 0xd0fc, 0x11c8, 0x00e6, 0x0026, 0x2001,
++	0x1918, 0x2004, 0x9005, 0x0904, 0x61ae, 0xa87c, 0xd0bc, 0x1904,
++	0x61ae, 0xa978, 0xa874, 0x9105, 0x1904, 0x61ae, 0x2001, 0x1918,
++	0x2004, 0x0002, 0x61ae, 0x6017, 0x6051, 0x6051, 0x0005, 0xa868,
++	0xd0fc, 0x11e0, 0x00e6, 0x0026, 0x2009, 0x1918, 0x210c, 0x81ff,
++	0x0904, 0x61ae, 0xa87c, 0xd0cc, 0x0904, 0x61ae, 0xa880, 0x9084,
++	0x00ff, 0x9086, 0x0001, 0x1904, 0x61ae, 0x9186, 0x0003, 0x0904,
++	0x6051, 0xa84f, 0x8021, 0xa853, 0x0017, 0x0028, 0x0005, 0xa84f,
++	0x8020, 0xa853, 0x0016, 0x2071, 0x1904, 0x701c, 0x9005, 0x1904,
++	0x6360, 0x0e04, 0x63a9, 0x2071, 0x0000, 0xa84c, 0x7082, 0xa850,
++	0x7032, 0xa86c, 0x7086, 0x7036, 0xa870, 0x708a, 0x2091, 0x4080,
++	0x2001, 0x0089, 0x2004, 0xd084, 0x190c, 0x113e, 0x2071, 0x1800,
++	0x2011, 0x0001, 0xa804, 0x900d, 0x702c, 0x1148, 0xa802, 0x2900,
++	0x702e, 0x70bc, 0x9200, 0x70be, 0x002e, 0x00ee, 0x0005, 0x0096,
++	0x2148, 0xa904, 0xa802, 0x8210, 0x2900, 0x81ff, 0x1dc8, 0x009e,
++	0x0c68, 0xa84f, 0x0000, 0x00f6, 0x2079, 0x0050, 0x2071, 0x1904,
++	0xa803, 0x0000, 0x7010, 0x9005, 0x1904, 0x6136, 0x782c, 0x908c,
++	0x0780, 0x190c, 0x64ce, 0x8004, 0x8004, 0x8004, 0x9084, 0x0003,
++	0x0002, 0x606f, 0x6136, 0x6092, 0x60d5, 0x080c, 0x0d84, 0x2071,
++	0x1800, 0x2900, 0x7822, 0xa804, 0x900d, 0x1170, 0x2071, 0x19c7,
++	0x7040, 0x9005, 0x1328, 0x2001, 0x1919, 0x2004, 0x8005, 0x7042,
++	0x00fe, 0x002e, 0x00ee, 0x0005, 0x9016, 0x702c, 0x2148, 0xa904,
++	0xa802, 0x8210, 0x2900, 0x81ff, 0x1dc8, 0x702e, 0x70bc, 0x9200,
++	0x70be, 0x0c20, 0x2071, 0x1800, 0x2900, 0x7822, 0xa804, 0x900d,
++	0x1570, 0x7824, 0x00e6, 0x2071, 0x0040, 0x712c, 0xd19c, 0x1148,
++	0x2009, 0x182f, 0x210c, 0x918a, 0x0040, 0x0218, 0x7022, 0x00ee,
++	0x0048, 0x00ee, 0x2048, 0x702c, 0xa802, 0x2900, 0x702e, 0x70bc,
++	0x8000, 0x70be, 0x782c, 0x9094, 0x0780, 0x190c, 0x64ce, 0xd0a4,
++	0x1d00, 0x2071, 0x19c7, 0x7040, 0x9005, 0x1328, 0x2001, 0x1919,
++	0x2004, 0x8005, 0x7042, 0x00fe, 0x002e, 0x00ee, 0x0005, 0x9016,
++	0x702c, 0x2148, 0xa904, 0xa802, 0x8210, 0x2900, 0x81ff, 0x1dc8,
++	0x702e, 0x70bc, 0x9200, 0x70be, 0x0820, 0x0096, 0x00e6, 0x7824,
++	0x2048, 0x2071, 0x1800, 0x702c, 0xa802, 0x2900, 0x702e, 0x70bc,
++	0x8000, 0x70be, 0x782c, 0x9094, 0x0780, 0x190c, 0x64ce, 0xd0a4,
++	0x1d70, 0x00ee, 0x782c, 0x9094, 0x0780, 0x190c, 0x64ce, 0xd09c,
++	0x11a0, 0x009e, 0x2900, 0x7822, 0xa804, 0x900d, 0x1560, 0x2071,
++	0x19c7, 0x7040, 0x9005, 0x1328, 0x2001, 0x1919, 0x2004, 0x8005,
++	0x7042, 0x00fe, 0x002e, 0x00ee, 0x0005, 0x009e, 0x2908, 0x7010,
++	0x8000, 0x7012, 0x7018, 0x904d, 0x711a, 0x0110, 0xa902, 0x0008,
++	0x711e, 0x2148, 0xa804, 0x900d, 0x1170, 0x2071, 0x19c7, 0x7040,
++	0x9005, 0x1328, 0x2001, 0x1919, 0x2004, 0x8005, 0x7042, 0x00fe,
++	0x002e, 0x00ee, 0x0005, 0x2071, 0x1800, 0x9016, 0x702c, 0x2148,
++	0xa904, 0xa802, 0x8210, 0x2900, 0x81ff, 0x1dc8, 0x702e, 0x70bc,
++	0x9200, 0x70be, 0x00fe, 0x002e, 0x00ee, 0x0005, 0x2908, 0x7010,
++	0x8000, 0x7012, 0x7018, 0x904d, 0x711a, 0x0110, 0xa902, 0x0008,
++	0x711e, 0x2148, 0xa804, 0x900d, 0x1904, 0x6189, 0x782c, 0x9094,
++	0x0780, 0x190c, 0x64ce, 0xd09c, 0x1198, 0x701c, 0x904d, 0x0180,
++	0x7010, 0x8001, 0x7012, 0x1108, 0x701a, 0xa800, 0x701e, 0x2900,
++	0x7822, 0x782c, 0x9094, 0x0780, 0x190c, 0x64ce, 0xd09c, 0x0d68,
++	0x782c, 0x9094, 0x0780, 0x190c, 0x64ce, 0xd0a4, 0x01a0, 0x00e6,
++	0x7824, 0x2048, 0x2071, 0x1800, 0x702c, 0xa802, 0x2900, 0x702e,
++	0x70bc, 0x8000, 0x70be, 0x782c, 0x9094, 0x0780, 0x190c, 0x64ce,
++	0xd0a4, 0x1d70, 0x00ee, 0x2071, 0x19c7, 0x7040, 0x9005, 0x1328,
++	0x2001, 0x1919, 0x2004, 0x8005, 0x7042, 0x00fe, 0x002e, 0x00ee,
++	0x0005, 0x00e6, 0x2071, 0x1800, 0x9016, 0x702c, 0x2148, 0xa904,
++	0xa802, 0x8210, 0x2900, 0x81ff, 0x1dc8, 0x702e, 0x70bc, 0x9200,
++	0x70be, 0x00ee, 0x0804, 0x6146, 0xa868, 0xd0fc, 0x1904, 0x61ea,
++	0x0096, 0xa804, 0xa807, 0x0000, 0x904d, 0x190c, 0x0f60, 0x009e,
++	0x0018, 0xa868, 0xd0fc, 0x15f0, 0x00e6, 0x0026, 0xa84f, 0x0000,
++	0x00f6, 0x2079, 0x0050, 0x2071, 0x1800, 0x70f0, 0x8001, 0x01d0,
++	0x1678, 0x2071, 0x1904, 0xa803, 0x0000, 0x7010, 0x9005, 0x1904,
++	0x62de, 0x782c, 0x908c, 0x0780, 0x190c, 0x64ce, 0x8004, 0x8004,
++	0x8004, 0x9084, 0x0003, 0x0002, 0x61eb, 0x62de, 0x6204, 0x6271,
++	0x080c, 0x0d84, 0x70f3, 0x0fa0, 0x71ec, 0x8107, 0x9106, 0x9094,
++	0x00c0, 0x9184, 0xff3f, 0x9205, 0x70ee, 0x3b08, 0x3a00, 0x9104,
++	0x918d, 0x00c0, 0x21d8, 0x9084, 0xff3f, 0x9205, 0x20d0, 0x0888,
++	0x70f2, 0x0878, 0x0005, 0x2071, 0x1800, 0x2900, 0x7822, 0xa804,
++	0x900d, 0x1120, 0x00fe, 0x002e, 0x00ee, 0x0005, 0x9016, 0x702c,
++	0x2148, 0xa904, 0xa802, 0x8210, 0x2900, 0x81ff, 0x1dc8, 0x702e,
++	0x70bc, 0x9200, 0x70be, 0x0c70, 0x2071, 0x1800, 0x2900, 0x7822,
++	0xa804, 0x900d, 0x1904, 0x6262, 0x7830, 0x8007, 0x9084, 0x001f,
++	0x9082, 0x0005, 0x1220, 0x00fe, 0x002e, 0x00ee, 0x0005, 0x7824,
++	0x00e6, 0x2071, 0x0040, 0x712c, 0xd19c, 0x1148, 0x2009, 0x182f,
++	0x210c, 0x918a, 0x0040, 0x0218, 0x7022, 0x00ee, 0x0048, 0x00ee,
++	0x2048, 0x702c, 0xa802, 0x2900, 0x702e, 0x70bc, 0x8000, 0x70be,
++	0x782c, 0x9094, 0x0780, 0x190c, 0x64ce, 0xd0a4, 0x1d00, 0x0e04,
++	0x6259, 0x7838, 0x7938, 0x910e, 0x1de0, 0x00d6, 0x2069, 0x0000,
++	0x6836, 0x6833, 0x0013, 0x00de, 0x2001, 0x1915, 0x200c, 0xc184,
++	0x2102, 0x2091, 0x4080, 0x2001, 0x0089, 0x2004, 0xd084, 0x190c,
++	0x113e, 0x2009, 0x1917, 0x200b, 0x0000, 0x00fe, 0x002e, 0x00ee,
++	0x0005, 0x2001, 0x1915, 0x200c, 0xc185, 0x2102, 0x00fe, 0x002e,
++	0x00ee, 0x0005, 0x9016, 0x702c, 0x2148, 0xa904, 0xa802, 0x8210,
++	0x2900, 0x81ff, 0x1dc8, 0x702e, 0x70bc, 0x9200, 0x70be, 0x0804,
++	0x6217, 0x0096, 0x00e6, 0x7824, 0x2048, 0x2071, 0x1800, 0x702c,
++	0xa802, 0x2900, 0x702e, 0x70bc, 0x8000, 0x70be, 0x782c, 0x9094,
++	0x0780, 0x190c, 0x64ce, 0xd0a4, 0x1d70, 0x00ee, 0x0e04, 0x62b3,
++	0x7838, 0x7938, 0x910e, 0x1de0, 0x00d6, 0x2069, 0x0000, 0x6836,
++	0x6833, 0x0013, 0x00de, 0x7044, 0xc084, 0x7046, 0x2091, 0x4080,
++	0x2001, 0x0089, 0x2004, 0xd084, 0x190c, 0x113e, 0x2009, 0x1917,
++	0x200b, 0x0000, 0x782c, 0x9094, 0x0780, 0x190c, 0x64ce, 0xd09c,
++	0x1170, 0x009e, 0x2900, 0x7822, 0xa804, 0x900d, 0x11e0, 0x00fe,
++	0x002e, 0x00ee, 0x0005, 0x7044, 0xc085, 0x7046, 0x0c58, 0x009e,
++	0x2908, 0x7010, 0x8000, 0x7012, 0x7018, 0x904d, 0x711a, 0x0110,
++	0xa902, 0x0008, 0x711e, 0x2148, 0xa804, 0x900d, 0x1120, 0x00fe,
++	0x002e, 0x00ee, 0x0005, 0x2071, 0x1800, 0x9016, 0x702c, 0x2148,
++	0xa904, 0xa802, 0x8210, 0x2900, 0x81ff, 0x1dc8, 0x702e, 0x70bc,
++	0x9200, 0x70be, 0x00fe, 0x002e, 0x00ee, 0x0005, 0x2908, 0x7010,
++	0x8000, 0x7012, 0x7018, 0x904d, 0x711a, 0x0110, 0xa902, 0x0008,
++	0x711e, 0x2148, 0xa804, 0x900d, 0x1904, 0x634d, 0x782c, 0x9094,
++	0x0780, 0x190c, 0x64ce, 0xd09c, 0x11b0, 0x701c, 0x904d, 0x0198,
++	0xa84c, 0x9005, 0x1180, 0x7010, 0x8001, 0x7012, 0x1108, 0x701a,
++	0xa800, 0x701e, 0x2900, 0x7822, 0x782c, 0x9094, 0x0780, 0x190c,
++	0x64ce, 0xd09c, 0x0d50, 0x782c, 0x9094, 0x0780, 0x190c, 0x64ce,
++	0xd0a4, 0x05b8, 0x00e6, 0x7824, 0x2048, 0x2071, 0x1800, 0x702c,
++	0xa802, 0x2900, 0x702e, 0x70bc, 0x8000, 0x70be, 0x782c, 0x9094,
++	0x0780, 0x190c, 0x64ce, 0xd0a4, 0x1d70, 0x00ee, 0x0e04, 0x6346,
++	0x7838, 0x7938, 0x910e, 0x1de0, 0x00d6, 0x2069, 0x0000, 0x6836,
++	0x6833, 0x0013, 0x00de, 0x7044, 0xc084, 0x7046, 0x2091, 0x4080,
++	0x2001, 0x0089, 0x2004, 0xd084, 0x190c, 0x113e, 0x2009, 0x1917,
++	0x200b, 0x0000, 0x00fe, 0x002e, 0x00ee, 0x0005, 0x7044, 0xc085,
++	0x7046, 0x00fe, 0x002e, 0x00ee, 0x0005, 0x00e6, 0x2071, 0x1800,
++	0x9016, 0x702c, 0x2148, 0xa904, 0xa802, 0x8210, 0x2900, 0x81ff,
++	0x1dc8, 0x702e, 0x70bc, 0x9200, 0x70be, 0x00ee, 0x0804, 0x62ee,
++	0x2071, 0x1904, 0xa803, 0x0000, 0x2908, 0x7010, 0x8000, 0x7012,
++	0x7018, 0x904d, 0x711a, 0x0110, 0xa902, 0x0008, 0x711e, 0x2148,
++	0xa804, 0x900d, 0x1128, 0x1e04, 0x6389, 0x002e, 0x00ee, 0x0005,
++	0x2071, 0x1800, 0x9016, 0x702c, 0x2148, 0xa904, 0xa802, 0x8210,
++	0x2900, 0x81ff, 0x1dc8, 0x702e, 0x70bc, 0x9200, 0x70be, 0x0e04,
++	0x6375, 0x2071, 0x1904, 0x701c, 0x2048, 0xa84c, 0x900d, 0x0d28,
++	0x2071, 0x0000, 0x7182, 0xa850, 0x7032, 0xa86c, 0x7086, 0x7036,
++	0xa870, 0x708a, 0x2091, 0x4080, 0x2001, 0x0089, 0x2004, 0xd084,
++	0x190c, 0x113e, 0x2071, 0x1904, 0x080c, 0x64ba, 0x002e, 0x00ee,
++	0x0005, 0x2071, 0x1904, 0xa803, 0x0000, 0x2908, 0x7010, 0x8000,
++	0x7012, 0x7018, 0x904d, 0x711a, 0x0110, 0xa902, 0x0008, 0x711e,
++	0x2148, 0xa804, 0x900d, 0x1118, 0x002e, 0x00ee, 0x0005, 0x2071,
++	0x1800, 0x9016, 0x702c, 0x2148, 0xa904, 0xa802, 0x8210, 0x2900,
++	0x81ff, 0x1dc8, 0x702e, 0x70bc, 0x9200, 0x70be, 0x002e, 0x00ee,
++	0x0005, 0x0006, 0xa87c, 0x0006, 0xa867, 0x0103, 0x20a9, 0x001c,
++	0xa860, 0x20e8, 0xa85c, 0x9080, 0x001d, 0x20a0, 0x9006, 0x4004,
++	0x000e, 0x9084, 0x00ff, 0xa87e, 0x000e, 0xa87a, 0xa982, 0x0005,
++	0x2071, 0x1904, 0x7004, 0x0002, 0x63f2, 0x63f3, 0x64b9, 0x63f3,
++	0x0d84, 0x64b9, 0x0005, 0x2001, 0x1918, 0x2004, 0x0002, 0x63fd,
++	0x63fd, 0x6452, 0x6453, 0x63fd, 0x6453, 0x0126, 0x2091, 0x8000,
++	0x1e0c, 0x64d9, 0x701c, 0x904d, 0x01e0, 0xa84c, 0x9005, 0x01d8,
++	0x0e04, 0x6421, 0xa94c, 0x2071, 0x0000, 0x7182, 0xa850, 0x7032,
++	0xa86c, 0x7086, 0x7036, 0xa870, 0x708a, 0x2091, 0x4080, 0x2001,
++	0x0089, 0x2004, 0xd084, 0x190c, 0x113e, 0x2071, 0x1904, 0x080c,
++	0x64ba, 0x012e, 0x0470, 0x2001, 0x005b, 0x2004, 0x9094, 0x0780,
++	0x190c, 0x64ce, 0xd09c, 0x2071, 0x1904, 0x1510, 0x2071, 0x1904,
++	0x700f, 0x0001, 0xa964, 0x9184, 0x00ff, 0x9086, 0x0003, 0x1130,
++	0x810f, 0x918c, 0x00ff, 0x8101, 0x0108, 0x710e, 0x2900, 0x00d6,
++	0x2069, 0x0050, 0x6822, 0x00de, 0x2071, 0x1904, 0x701c, 0x2048,
++	0x7010, 0x8001, 0x7012, 0xa800, 0x701e, 0x9005, 0x1108, 0x701a,
++	0x012e, 0x0005, 0x0005, 0x00d6, 0x2008, 0x2069, 0x19c7, 0x6840,
++	0x9005, 0x0760, 0x0158, 0x9186, 0x0003, 0x0540, 0x2001, 0x1813,
++	0x2004, 0x2009, 0x1a8a, 0x210c, 0x9102, 0x1500, 0x0126, 0x2091,
++	0x8000, 0x2069, 0x0050, 0x693c, 0x6838, 0x9106, 0x0190, 0x0e04,
++	0x6485, 0x2069, 0x0000, 0x6837, 0x8040, 0x6833, 0x0012, 0x6883,
++	0x8040, 0x2091, 0x4080, 0x2001, 0x0089, 0x2004, 0xd084, 0x190c,
++	0x113e, 0x2069, 0x19c7, 0x6843, 0xffff, 0x012e, 0x00de, 0x0126,
++	0x2091, 0x8000, 0x1e0c, 0x654b, 0x701c, 0x904d, 0x0540, 0x2001,
++	0x005b, 0x2004, 0x9094, 0x0780, 0x15c9, 0xd09c, 0x1500, 0x2071,
++	0x1904, 0x700f, 0x0001, 0xa964, 0x9184, 0x00ff, 0x9086, 0x0003,
++	0x1130, 0x810f, 0x918c, 0x00ff, 0x8101, 0x0108, 0x710e, 0x2900,
++	0x00d6, 0x2069, 0x0050, 0x6822, 0x00de, 0x701c, 0x2048, 0x7010,
++	0x8001, 0x7012, 0xa800, 0x701e, 0x9005, 0x1108, 0x701a, 0x012e,
++	0x0005, 0x0005, 0x0126, 0x2091, 0x8000, 0x701c, 0x904d, 0x0160,
++	0x7010, 0x8001, 0x7012, 0xa800, 0x701e, 0x9005, 0x1108, 0x701a,
++	0x012e, 0x080c, 0x0fe0, 0x0005, 0x012e, 0x0005, 0x2091, 0x8000,
++	0x0e04, 0x64d0, 0x0006, 0x0016, 0x2001, 0x8004, 0x0006, 0x0804,
++	0x0d8d, 0x0096, 0x00f6, 0x2079, 0x0050, 0x7044, 0xd084, 0x01e0,
++	0xc084, 0x7046, 0x7838, 0x7938, 0x910e, 0x1de0, 0x00d6, 0x2069,
++	0x0000, 0x6836, 0x6833, 0x0013, 0x00de, 0x2091, 0x4080, 0x2001,
++	0x0089, 0x2004, 0xd084, 0x190c, 0x113e, 0x2009, 0x1917, 0x200b,
++	0x0000, 0x00fe, 0x009e, 0x0005, 0x782c, 0x9094, 0x0780, 0x1971,
++	0xd0a4, 0x0db8, 0x2001, 0x1918, 0x2004, 0x2009, 0x1917, 0x2104,
++	0x8000, 0x200a, 0x9082, 0x000f, 0x0e60, 0x00e6, 0x2071, 0x1800,
++	0x7824, 0x00e6, 0x2071, 0x0040, 0x712c, 0xd19c, 0x1148, 0x2009,
++	0x182f, 0x210c, 0x918a, 0x0040, 0x0218, 0x7022, 0x00ee, 0x0048,
++	0x00ee, 0x2048, 0x702c, 0xa802, 0x2900, 0x702e, 0x70bc, 0x8000,
++	0x70be, 0x782c, 0x9094, 0x0780, 0x190c, 0x64ce, 0xd0a4, 0x1d00,
++	0x7838, 0x7938, 0x910e, 0x1de0, 0x00d6, 0x2069, 0x0000, 0x6836,
++	0x6833, 0x0013, 0x00de, 0x2091, 0x4080, 0x2001, 0x0089, 0x2004,
++	0xd084, 0x190c, 0x113e, 0x2009, 0x1917, 0x200b, 0x0000, 0x00ee,
++	0x00fe, 0x009e, 0x0005, 0x00f6, 0x2079, 0x0050, 0x7044, 0xd084,
++	0x01b8, 0xc084, 0x7046, 0x7838, 0x7938, 0x910e, 0x1de0, 0x00d6,
++	0x2069, 0x0000, 0x6836, 0x6833, 0x0013, 0x00de, 0x2091, 0x4080,
++	0x2001, 0x0089, 0x2004, 0xd084, 0x190c, 0x113e, 0x00fe, 0x0005,
++	0x782c, 0x9094, 0x0780, 0x190c, 0x64ce, 0xd0a4, 0x0db8, 0x00e6,
++	0x2071, 0x1800, 0x7824, 0x2048, 0x702c, 0xa802, 0x2900, 0x702e,
++	0x70bc, 0x8000, 0x70be, 0x782c, 0x9094, 0x0780, 0x190c, 0x64ce,
++	0xd0a4, 0x1d80, 0x00d6, 0x2069, 0x0050, 0x693c, 0x2069, 0x1918,
++	0x6808, 0x690a, 0x2069, 0x19c7, 0x9102, 0x1118, 0x6840, 0x9005,
++	0x1328, 0x2001, 0x1919, 0x200c, 0x810d, 0x6942, 0x00de, 0x00ee,
++	0x00fe, 0x0005, 0x7090, 0x908a, 0x0029, 0x1a0c, 0x0d84, 0x9082,
++	0x001d, 0x001b, 0x6027, 0x1e00, 0x0005, 0x666d, 0x65f7, 0x6613,
++	0x663b, 0x665c, 0x669c, 0x66ae, 0x6613, 0x6684, 0x65b2, 0x65e0,
++	0x65b1, 0x0005, 0x00d6, 0x2069, 0x0200, 0x6804, 0x9005, 0x1180,
++	0x6808, 0x9005, 0x1518, 0x7093, 0x0028, 0x2069, 0x195c, 0x2d04,
++	0x7002, 0x080c, 0x69a3, 0x6028, 0x9085, 0x0600, 0x602a, 0x00b0,
++	0x7093, 0x0028, 0x2069, 0x195c, 0x2d04, 0x7002, 0x6028, 0x9085,
++	0x0600, 0x602a, 0x00e6, 0x0036, 0x0046, 0x0056, 0x2071, 0x1a30,
++	0x080c, 0x1827, 0x005e, 0x004e, 0x003e, 0x00ee, 0x00de, 0x0005,
++	0x00d6, 0x2069, 0x0200, 0x6804, 0x9005, 0x1178, 0x6808, 0x9005,
++	0x1160, 0x7093, 0x0028, 0x2069, 0x195c, 0x2d04, 0x7002, 0x080c,
++	0x6a2d, 0x6028, 0x9085, 0x0600, 0x602a, 0x00de, 0x0005, 0x0006,
++	0x2001, 0x0090, 0x080c, 0x28a5, 0x000e, 0x6124, 0xd1e4, 0x1190,
++	0x080c, 0x671b, 0xd1d4, 0x1160, 0xd1dc, 0x1138, 0xd1cc, 0x0150,
++	0x7093, 0x0020, 0x080c, 0x671b, 0x0028, 0x7093, 0x001d, 0x0010,
++	0x7093, 0x001f, 0x0005, 0x2001, 0x0088, 0x080c, 0x28a5, 0x6124,
++	0xd1cc, 0x11d8, 0xd1dc, 0x11b0, 0xd1e4, 0x1188, 0x9184, 0x1e00,
++	0x11c8, 0x60e3, 0x0001, 0x600c, 0xc0b4, 0x600e, 0x080c, 0x68a3,
++	0x2001, 0x0080, 0x080c, 0x28a5, 0x7093, 0x0028, 0x0058, 0x7093,
++	0x001e, 0x0040, 0x7093, 0x001d, 0x0028, 0x7093, 0x0020, 0x0010,
++	0x7093, 0x001f, 0x0005, 0x60e3, 0x0001, 0x600c, 0xc0b4, 0x600e,
++	0x080c, 0x68a3, 0x2001, 0x0080, 0x080c, 0x28a5, 0x6124, 0xd1d4,
++	0x1180, 0xd1dc, 0x1158, 0xd1e4, 0x1130, 0x9184, 0x1e00, 0x1158,
++	0x7093, 0x0028, 0x0040, 0x7093, 0x001e, 0x0028, 0x7093, 0x001d,
++	0x0010, 0x7093, 0x001f, 0x0005, 0x2001, 0x00a0, 0x080c, 0x28a5,
++	0x6124, 0xd1dc, 0x1138, 0xd1e4, 0x0138, 0x080c, 0x1851, 0x7093,
++	0x001e, 0x0010, 0x7093, 0x001d, 0x0005, 0x080c, 0x6794, 0x6124,
++	0xd1dc, 0x1188, 0x080c, 0x671b, 0x0016, 0x080c, 0x1851, 0x001e,
++	0xd1d4, 0x1128, 0xd1e4, 0x0138, 0x7093, 0x001e, 0x0020, 0x7093,
++	0x001f, 0x080c, 0x671b, 0x0005, 0x0006, 0x2001, 0x00a0, 0x080c,
++	0x28a5, 0x000e, 0x6124, 0xd1d4, 0x1160, 0xd1cc, 0x1150, 0xd1dc,
++	0x1128, 0xd1e4, 0x0140, 0x7093, 0x001e, 0x0028, 0x7093, 0x001d,
++	0x0010, 0x7093, 0x0021, 0x0005, 0x080c, 0x6794, 0x6124, 0xd1d4,
++	0x1150, 0xd1dc, 0x1128, 0xd1e4, 0x0140, 0x7093, 0x001e, 0x0028,
++	0x7093, 0x001d, 0x0010, 0x7093, 0x001f, 0x0005, 0x0006, 0x2001,
++	0x0090, 0x080c, 0x28a5, 0x000e, 0x6124, 0xd1d4, 0x1178, 0xd1cc,
++	0x1150, 0xd1dc, 0x1128, 0xd1e4, 0x0158, 0x7093, 0x001e, 0x0040,
++	0x7093, 0x001d, 0x0028, 0x7093, 0x0020, 0x0010, 0x7093, 0x001f,
++	0x0005, 0x0016, 0x00c6, 0x00d6, 0x00e6, 0x0126, 0x2061, 0x0100,
++	0x2069, 0x0140, 0x2071, 0x1800, 0x2091, 0x8000, 0x080c, 0x6877,
++	0x11d8, 0x2001, 0x180c, 0x200c, 0xd1b4, 0x01b0, 0xc1b4, 0x2102,
++	0x6027, 0x0200, 0x080c, 0x27ef, 0x6024, 0xd0cc, 0x0148, 0x2001,
++	0x00a0, 0x080c, 0x28a5, 0x080c, 0x6b40, 0x080c, 0x56d9, 0x0428,
++	0x6028, 0xc0cd, 0x602a, 0x0408, 0x080c, 0x6891, 0x0150, 0x080c,
++	0x6888, 0x1138, 0x2001, 0x0001, 0x080c, 0x23a6, 0x080c, 0x6853,
++	0x00a0, 0x080c, 0x6791, 0x0178, 0x2001, 0x0001, 0x080c, 0x23a6,
++	0x7090, 0x9086, 0x001e, 0x0120, 0x7090, 0x9086, 0x0022, 0x1118,
++	0x7093, 0x0025, 0x0010, 0x7093, 0x0021, 0x012e, 0x00ee, 0x00de,
++	0x00ce, 0x001e, 0x0005, 0x0026, 0x2011, 0x672c, 0x080c, 0x78e7,
++	0x002e, 0x0016, 0x0026, 0x2009, 0x0064, 0x2011, 0x672c, 0x080c,
++	0x78de, 0x002e, 0x001e, 0x0005, 0x00e6, 0x00f6, 0x0016, 0x080c,
++	0x8b50, 0x2071, 0x1800, 0x080c, 0x66c9, 0x001e, 0x00fe, 0x00ee,
++	0x0005, 0x0016, 0x0026, 0x0036, 0x00c6, 0x00d6, 0x00e6, 0x00f6,
++	0x0126, 0x080c, 0x8b50, 0x2061, 0x0100, 0x2069, 0x0140, 0x2071,
++	0x1800, 0x2091, 0x8000, 0x6028, 0xc09c, 0x602a, 0x2011, 0x0003,
++	0x080c, 0x8e99, 0x2011, 0x0002, 0x080c, 0x8ea3, 0x080c, 0x8d59,
++	0x080c, 0x7893, 0x0036, 0x901e, 0x080c, 0x8dfe, 0x003e, 0x60e3,
++	0x0000, 0x080c, 0xcd0a, 0x080c, 0xcd25, 0x2009, 0x0004, 0x080c,
++	0x27f5, 0x080c, 0x2718, 0x2001, 0x1800, 0x2003, 0x0004, 0x6027,
++	0x0008, 0x080c, 0x0b69, 0x2001, 0x0001, 0x080c, 0x23a6, 0x012e,
++	0x00fe, 0x00ee, 0x00de, 0x00ce, 0x003e, 0x002e, 0x001e, 0x0005,
++	0x0026, 0x00e6, 0x2011, 0x6739, 0x2071, 0x19c7, 0x701c, 0x9206,
++	0x1118, 0x7018, 0x9005, 0x0110, 0x9085, 0x0001, 0x00ee, 0x002e,
++	0x0005, 0x6020, 0xd09c, 0x0005, 0x6800, 0x9084, 0xfffe, 0x9086,
++	0x00c0, 0x01b8, 0x2001, 0x00c0, 0x080c, 0x28a5, 0x0156, 0x20a9,
++	0x002d, 0x1d04, 0x67a1, 0x2091, 0x6000, 0x1f04, 0x67a1, 0x015e,
++	0x00d6, 0x2069, 0x1800, 0x6894, 0x8001, 0x0220, 0x0118, 0x6896,
++	0x00de, 0x0005, 0x6897, 0x0014, 0x68ec, 0xd0dc, 0x0dc8, 0x6800,
++	0x9086, 0x0001, 0x1da8, 0x080c, 0x78f3, 0x0c90, 0x00c6, 0x00d6,
++	0x00e6, 0x2061, 0x0100, 0x2069, 0x0140, 0x2071, 0x1800, 0x2001,
++	0x194c, 0x200c, 0x9186, 0x0000, 0x0158, 0x9186, 0x0001, 0x0158,
++	0x9186, 0x0002, 0x0158, 0x9186, 0x0003, 0x0158, 0x0804, 0x6843,
++	0x7093, 0x0022, 0x0040, 0x7093, 0x0021, 0x0028, 0x7093, 0x0023,
++	0x0010, 0x7093, 0x0024, 0x60e3, 0x0000, 0x6887, 0x0001, 0x2001,
++	0x0001, 0x080c, 0x2471, 0x0026, 0x080c, 0x94da, 0x002e, 0x7000,
++	0x908e, 0x0004, 0x0118, 0x602b, 0x0028, 0x0010, 0x602b, 0x0020,
++	0x0156, 0x0126, 0x2091, 0x8000, 0x20a9, 0x0005, 0x6024, 0xd0ac,
++	0x0120, 0x012e, 0x015e, 0x0804, 0x684f, 0x6800, 0x9084, 0x00a1,
++	0xc0bd, 0x6802, 0x080c, 0x27ef, 0x6904, 0xd1d4, 0x1140, 0x2001,
++	0x0100, 0x080c, 0x28a5, 0x1f04, 0x67fe, 0x080c, 0x68d0, 0x012e,
++	0x015e, 0x080c, 0x6888, 0x01a8, 0x6044, 0x9005, 0x0168, 0x6050,
++	0x0006, 0x9085, 0x0020, 0x6052, 0x080c, 0x68d0, 0x9006, 0x8001,
++	0x1df0, 0x000e, 0x6052, 0x0028, 0x6804, 0xd0d4, 0x1110, 0x080c,
++	0x68d0, 0x0016, 0x0026, 0x7000, 0x908e, 0x0004, 0x0130, 0x2009,
++	0x00c8, 0x2011, 0x6739, 0x080c, 0x78a5, 0x002e, 0x001e, 0x2001,
++	0x194c, 0x2003, 0x0004, 0x080c, 0x659a, 0x080c, 0x6888, 0x0138,
++	0x6804, 0xd0d4, 0x1120, 0xd0dc, 0x1100, 0x080c, 0x6b45, 0x00ee,
++	0x00de, 0x00ce, 0x0005, 0x00c6, 0x00d6, 0x00e6, 0x2061, 0x0100,
++	0x2069, 0x0140, 0x2071, 0x1800, 0x080c, 0x6b4f, 0x2001, 0x193c,
++	0x2003, 0x0000, 0x9006, 0x7092, 0x60e2, 0x6886, 0x080c, 0x2471,
++	0x9006, 0x080c, 0x28a5, 0x6043, 0x0090, 0x6043, 0x0010, 0x6027,
++	0xffff, 0x602b, 0x182f, 0x00ee, 0x00de, 0x00ce, 0x0005, 0x0006,
++	0x2001, 0x194b, 0x2004, 0x9086, 0xaaaa, 0x000e, 0x0005, 0x0006,
++	0x080c, 0x4dee, 0x9084, 0x0030, 0x9086, 0x0000, 0x000e, 0x0005,
++	0x0006, 0x080c, 0x4dee, 0x9084, 0x0030, 0x9086, 0x0030, 0x000e,
++	0x0005, 0x0006, 0x080c, 0x4dee, 0x9084, 0x0030, 0x9086, 0x0010,
++	0x000e, 0x0005, 0x0006, 0x080c, 0x4dee, 0x9084, 0x0030, 0x9086,
++	0x0020, 0x000e, 0x0005, 0x0036, 0x0016, 0x2001, 0x180c, 0x2004,
++	0x908c, 0x0013, 0x0190, 0x9084, 0x0011, 0x0120, 0x080c, 0x2491,
++	0x900e, 0x0028, 0x080c, 0x5f25, 0x1dc8, 0x2009, 0x0002, 0x2019,
++	0x0028, 0x080c, 0x2ce5, 0x9006, 0x0019, 0x001e, 0x003e, 0x0005,
++	0x00e6, 0x2071, 0x180c, 0x2e04, 0x0130, 0x080c, 0xb752, 0x1128,
++	0x9085, 0x0010, 0x0010, 0x9084, 0xffef, 0x2072, 0x00ee, 0x0005,
++	0x6050, 0x0006, 0x60ec, 0x0006, 0x600c, 0x0006, 0x6004, 0x0006,
++	0x6028, 0x0006, 0x0016, 0x6138, 0x6050, 0x9084, 0xfbff, 0x9085,
++	0x2000, 0x6052, 0x613a, 0x20a9, 0x0012, 0x1d04, 0x68e5, 0x2091,
++	0x6000, 0x1f04, 0x68e5, 0x602f, 0x0100, 0x602f, 0x0000, 0x6050,
++	0x9085, 0x0400, 0x9084, 0xdfff, 0x6052, 0x613a, 0x001e, 0x602f,
++	0x0040, 0x602f, 0x0000, 0x000e, 0x602a, 0x000e, 0x6006, 0x000e,
++	0x600e, 0x000e, 0x60ee, 0x60e3, 0x0000, 0x6887, 0x0001, 0x2001,
++	0x0001, 0x080c, 0x2471, 0x2001, 0x00a0, 0x080c, 0x28a5, 0x000e,
++	0x6052, 0x6058, 0x0006, 0xc0e5, 0x605a, 0x00f6, 0x2079, 0x0100,
++	0x080c, 0x2764, 0x00fe, 0x000e, 0x605a, 0x0005, 0x0156, 0x0016,
++	0x0026, 0x0036, 0x00c6, 0x00d6, 0x00e6, 0x2061, 0x0100, 0x2069,
++	0x0140, 0x2071, 0x1800, 0x6020, 0x9084, 0x0080, 0x0138, 0x2001,
++	0x180c, 0x200c, 0xc1c5, 0x2102, 0x0804, 0x6996, 0x2001, 0x180c,
++	0x200c, 0xc1c4, 0x2102, 0x6028, 0x9084, 0xe1ff, 0x602a, 0x6027,
++	0x0200, 0x2001, 0x0090, 0x080c, 0x28a5, 0x20a9, 0x0366, 0x6024,
++	0xd0cc, 0x11f0, 0x1d04, 0x6947, 0x2091, 0x6000, 0x1f04, 0x6947,
++	0x2011, 0x0003, 0x080c, 0x8e99, 0x2011, 0x0002, 0x080c, 0x8ea3,
++	0x080c, 0x8d59, 0x901e, 0x080c, 0x8dfe, 0x2001, 0x00a0, 0x080c,
++	0x28a5, 0x080c, 0x6b40, 0x080c, 0x56d9, 0x9085, 0x0001, 0x0470,
++	0x86ff, 0x1110, 0x080c, 0x1851, 0x60e3, 0x0000, 0x2001, 0x193c,
++	0x2004, 0x080c, 0x2471, 0x60e2, 0x2001, 0x0080, 0x080c, 0x28a5,
++	0x20a9, 0x0366, 0x6027, 0x1e00, 0x2009, 0x1e00, 0x080c, 0x27ef,
++	0x6024, 0x910c, 0x0138, 0x1d04, 0x697a, 0x2091, 0x6000, 0x1f04,
++	0x697a, 0x0830, 0x6028, 0x9085, 0x1e00, 0x602a, 0x70ac, 0x9005,
++	0x1118, 0x6887, 0x0001, 0x0008, 0x6886, 0x9006, 0x080c, 0xb759,
++	0x0110, 0x080c, 0x0cfc, 0x00ee, 0x00de, 0x00ce, 0x003e, 0x002e,
++	0x001e, 0x015e, 0x0005, 0x0156, 0x0016, 0x0026, 0x0036, 0x00c6,
++	0x00d6, 0x00e6, 0x2061, 0x0100, 0x2071, 0x1800, 0x2069, 0x0140,
++	0x6020, 0x9084, 0x00c0, 0x0120, 0x6884, 0x9005, 0x1904, 0x69f7,
++	0x2001, 0x0088, 0x080c, 0x28a5, 0x9006, 0x60e2, 0x6886, 0x080c,
++	0x2471, 0x2069, 0x0200, 0x6804, 0x9005, 0x1118, 0x6808, 0x9005,
++	0x01c0, 0x6028, 0x9084, 0xfbff, 0x602a, 0x6027, 0x0400, 0x2069,
++	0x195c, 0x7000, 0x206a, 0x7093, 0x0026, 0x7003, 0x0001, 0x20a9,
++	0x0002, 0x1d04, 0x69d9, 0x2091, 0x6000, 0x1f04, 0x69d9, 0x0804,
++	0x6a25, 0x2069, 0x0140, 0x20a9, 0x0384, 0x6027, 0x1e00, 0x2009,
++	0x1e00, 0x080c, 0x27ef, 0x6024, 0x910c, 0x0508, 0x9084, 0x1a00,
++	0x11f0, 0x1d04, 0x69e5, 0x2091, 0x6000, 0x1f04, 0x69e5, 0x2011,
++	0x0003, 0x080c, 0x8e99, 0x2011, 0x0002, 0x080c, 0x8ea3, 0x080c,
++	0x8d59, 0x901e, 0x080c, 0x8dfe, 0x2001, 0x00a0, 0x080c, 0x28a5,
++	0x080c, 0x6b40, 0x080c, 0x56d9, 0x9085, 0x0001, 0x00b0, 0x2001,
++	0x0080, 0x080c, 0x28a5, 0x2069, 0x0140, 0x60e3, 0x0000, 0x70ac,
++	0x9005, 0x1118, 0x6887, 0x0001, 0x0008, 0x6886, 0x2001, 0x193c,
++	0x2004, 0x080c, 0x2471, 0x60e2, 0x9006, 0x00ee, 0x00de, 0x00ce,
++	0x003e, 0x002e, 0x001e, 0x015e, 0x0005, 0x0156, 0x0016, 0x0026,
++	0x0036, 0x00c6, 0x00d6, 0x00e6, 0x2061, 0x0100, 0x2071, 0x1800,
++	0x6020, 0x9084, 0x00c0, 0x01c8, 0x2011, 0x0003, 0x080c, 0x8e99,
++	0x2011, 0x0002, 0x080c, 0x8ea3, 0x080c, 0x8d59, 0x901e, 0x080c,
++	0x8dfe, 0x2069, 0x0140, 0x2001, 0x00a0, 0x080c, 0x28a5, 0x080c,
++	0x6b40, 0x080c, 0x56d9, 0x0804, 0x6ac0, 0x2001, 0x180c, 0x200c,
++	0xd1b4, 0x1160, 0xc1b5, 0x2102, 0x080c, 0x6721, 0x2069, 0x0140,
++	0x2001, 0x0080, 0x080c, 0x28a5, 0x60e3, 0x0000, 0x2069, 0x0200,
++	0x6804, 0x9005, 0x1118, 0x6808, 0x9005, 0x0180, 0x6028, 0x9084,
++	0xfdff, 0x602a, 0x6027, 0x0200, 0x2069, 0x195c, 0x7000, 0x206a,
++	0x7093, 0x0027, 0x7003, 0x0001, 0x0804, 0x6ac0, 0x6027, 0x1e00,
++	0x2009, 0x1e00, 0x080c, 0x27ef, 0x6024, 0x910c, 0x01c8, 0x9084,
++	0x1c00, 0x11b0, 0x1d04, 0x6a7e, 0x0006, 0x0016, 0x00c6, 0x00d6,
++	0x00e6, 0x080c, 0x7778, 0x00ee, 0x00de, 0x00ce, 0x001e, 0x000e,
++	0x00e6, 0x2071, 0x19c7, 0x7018, 0x00ee, 0x9005, 0x19f8, 0x0500,
++	0x0026, 0x2011, 0x6739, 0x080c, 0x781a, 0x2011, 0x672c, 0x080c,
++	0x78e7, 0x002e, 0x2069, 0x0140, 0x60e3, 0x0000, 0x70ac, 0x9005,
++	0x1118, 0x6887, 0x0001, 0x0008, 0x6886, 0x2001, 0x193c, 0x2004,
++	0x080c, 0x2471, 0x60e2, 0x2001, 0x180c, 0x200c, 0xc1b4, 0x2102,
++	0x00ee, 0x00de, 0x00ce, 0x003e, 0x002e, 0x001e, 0x015e, 0x0005,
++	0x0156, 0x0016, 0x0026, 0x0036, 0x0046, 0x00c6, 0x00e6, 0x2061,
++	0x0100, 0x2071, 0x1800, 0x080c, 0xb752, 0x1904, 0x6b2e, 0x7130,
++	0xd184, 0x1170, 0x080c, 0x2e69, 0x0138, 0xc18d, 0x7132, 0x2011,
++	0x1853, 0x2214, 0xd2ac, 0x1120, 0x7030, 0xd08c, 0x0904, 0x6b2e,
++	0x2011, 0x1853, 0x220c, 0xd1a4, 0x0538, 0x0016, 0x2019, 0x000e,
++	0x080c, 0xc941, 0x0156, 0x00b6, 0x20a9, 0x007f, 0x900e, 0x9186,
++	0x007e, 0x01a0, 0x9186, 0x0080, 0x0188, 0x080c, 0x5c0d, 0x1170,
++	0x2120, 0x9006, 0x0016, 0x2009, 0x000e, 0x080c, 0xc9c5, 0x2009,
++	0x0001, 0x2011, 0x0100, 0x080c, 0x7a0a, 0x001e, 0x8108, 0x1f04,
++	0x6af7, 0x00be, 0x015e, 0x001e, 0xd1ac, 0x1148, 0x0016, 0x2009,
++	0x0002, 0x2019, 0x0004, 0x080c, 0x2ce5, 0x001e, 0x0078, 0x0156,
++	0x00b6, 0x20a9, 0x007f, 0x900e, 0x080c, 0x5c0d, 0x1110, 0x080c,
++	0x56f3, 0x8108, 0x1f04, 0x6b24, 0x00be, 0x015e, 0x080c, 0x1851,
++	0x080c, 0x94da, 0x60e3, 0x0000, 0x080c, 0x56d9, 0x080c, 0x67be,
++	0x00ee, 0x00ce, 0x004e, 0x003e, 0x002e, 0x001e, 0x015e, 0x0005,
++	0x2001, 0x194c, 0x2003, 0x0001, 0x0005, 0x2001, 0x194c, 0x2003,
++	0x0000, 0x0005, 0x2001, 0x194b, 0x2003, 0xaaaa, 0x0005, 0x2001,
++	0x194b, 0x2003, 0x0000, 0x0005, 0x2071, 0x18ee, 0x7003, 0x0000,
++	0x7007, 0x0000, 0x080c, 0x0fc7, 0x090c, 0x0d84, 0xa8ab, 0xdcb0,
++	0x2900, 0x704e, 0x080c, 0x0fc7, 0x090c, 0x0d84, 0xa8ab, 0xdcb0,
++	0x2900, 0x7052, 0xa867, 0x0000, 0xa86b, 0x0001, 0xa89f, 0x0000,
++	0x0005, 0x00e6, 0x2071, 0x0040, 0x6848, 0x9005, 0x1118, 0x9085,
++	0x0001, 0x04b0, 0x6840, 0x9005, 0x0150, 0x04a1, 0x6a50, 0x9200,
++	0x7002, 0x6854, 0x9101, 0x7006, 0x9006, 0x7012, 0x7016, 0x6850,
++	0x7002, 0x6854, 0x7006, 0x6858, 0x700a, 0x685c, 0x700e, 0x6840,
++	0x9005, 0x1110, 0x7012, 0x7016, 0x6848, 0x701a, 0x701c, 0x9085,
++	0x0040, 0x701e, 0x2001, 0x0019, 0x7036, 0x702b, 0x0001, 0x2001,
++	0x0004, 0x200c, 0x918c, 0xfff7, 0x918d, 0x8000, 0x2102, 0x00d6,
++	0x2069, 0x18ee, 0x6807, 0x0001, 0x00de, 0x080c, 0x70f9, 0x9006,
++	0x00ee, 0x0005, 0x900e, 0x0156, 0x20a9, 0x0006, 0x8003, 0x2011,
++	0x0100, 0x2214, 0x9296, 0x0008, 0x1110, 0x818d, 0x0010, 0x81f5,
++	0x3e08, 0x1f04, 0x6bb6, 0x015e, 0x0005, 0x2079, 0x0040, 0x2071,
++	0x18ee, 0x7004, 0x0002, 0x6bd5, 0x6bd6, 0x6c0b, 0x6c66, 0x6d61,
++	0x6bd3, 0x6bd3, 0x6d8b, 0x080c, 0x0d84, 0x0005, 0x2079, 0x0040,
++	0x782c, 0x908c, 0x0780, 0x190c, 0x7185, 0xd0a4, 0x01f0, 0x7824,
++	0x2048, 0x9006, 0xa802, 0xa806, 0xa864, 0x9084, 0x00ff, 0x908a,
++	0x0040, 0x12c0, 0x04db, 0x2001, 0x1800, 0x200c, 0x9186, 0x0003,
++	0x1160, 0x7104, 0x9186, 0x0004, 0x0140, 0x9186, 0x0007, 0x0128,
++	0x9186, 0x0003, 0x19e8, 0x080c, 0x6c66, 0x782c, 0xd09c, 0x090c,
++	0x70f9, 0x0005, 0x9082, 0x005a, 0x1218, 0x2100, 0x002b, 0x0c18,
++	0x080c, 0x6c9c, 0x0c90, 0x0005, 0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c,
++	0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c, 0x6cbe, 0x6c9c, 0x6c9c, 0x6c9c,
++	0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c,
++	0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c,
++	0x6ca8, 0x6c9c, 0x6e60, 0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c,
++	0x6ca8, 0x6ea1, 0x6ee2, 0x6f29, 0x6f3d, 0x6c9c, 0x6c9c, 0x6cbe,
++	0x6ca8, 0x6c9c, 0x6c9c, 0x6d35, 0x6fe8, 0x7003, 0x6c9c, 0x6cbe,
++	0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c, 0x6d2b, 0x7003, 0x6c9c, 0x6c9c,
++	0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c, 0x6cd2,
++	0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c,
++	0x6c9c, 0x7129, 0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c, 0x6ce6,
++	0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c, 0x6c9c, 0x2079, 0x0040,
++	0x7004, 0x9086, 0x0003, 0x1198, 0x782c, 0x080c, 0x7122, 0xd0a4,
++	0x0170, 0x7824, 0x2048, 0x9006, 0xa802, 0xa806, 0xa864, 0x9084,
++	0x00ff, 0x908a, 0x001a, 0x1210, 0x002b, 0x0c50, 0x00e9, 0x080c,
++	0x70f9, 0x0005, 0x6c9c, 0x6ca8, 0x6e4c, 0x6c9c, 0x6ca8, 0x6c9c,
++	0x6ca8, 0x6ca8, 0x6c9c, 0x6ca8, 0x6e4c, 0x6ca8, 0x6ca8, 0x6ca8,
++	0x6ca8, 0x6ca8, 0x6c9c, 0x6ca8, 0x6e4c, 0x6c9c, 0x6c9c, 0x6ca8,
++	0x6c9c, 0x6c9c, 0x6c9c, 0x6ca8, 0x00e6, 0x2071, 0x18ee, 0x2009,
++	0x0400, 0x0071, 0x00ee, 0x0005, 0x2009, 0x1000, 0x0049, 0x0005,
++	0x2009, 0x2000, 0x0029, 0x0005, 0x2009, 0x0800, 0x0009, 0x0005,
++	0x7007, 0x0001, 0xa868, 0x9084, 0x00ff, 0x9105, 0xa86a, 0x0126,
++	0x2091, 0x8000, 0x080c, 0x61a9, 0x012e, 0x0005, 0xa864, 0x8007,
++	0x9084, 0x00ff, 0x0d08, 0x8001, 0x1120, 0x7007, 0x0001, 0x0804,
++	0x6e0a, 0x7007, 0x0003, 0x7012, 0x2900, 0x7016, 0x701a, 0x704b,
++	0x6e0a, 0x0005, 0xa864, 0x8007, 0x9084, 0x00ff, 0x0968, 0x8001,
++	0x1120, 0x7007, 0x0001, 0x0804, 0x6e25, 0x7007, 0x0003, 0x7012,
++	0x2900, 0x7016, 0x701a, 0x704b, 0x6e25, 0x0005, 0xa864, 0x8007,
++	0x9084, 0x00ff, 0x9086, 0x0001, 0x1904, 0x6ca4, 0x7007, 0x0001,
++	0x2009, 0x1833, 0x210c, 0x81ff, 0x11a8, 0xa868, 0x9084, 0x00ff,
++	0xa86a, 0xa883, 0x0000, 0x080c, 0x58e6, 0x1108, 0x0005, 0x0126,
++	0x2091, 0x8000, 0xa867, 0x0139, 0xa87a, 0xa982, 0x080c, 0x61a9,
++	0x012e, 0x0ca0, 0xa994, 0x9186, 0x0071, 0x0d38, 0x9186, 0x0064,
++	0x0d20, 0x9186, 0x007c, 0x0d08, 0x9186, 0x0028, 0x09f0, 0x9186,
++	0x0038, 0x09d8, 0x9186, 0x0078, 0x09c0, 0x9186, 0x005f, 0x09a8,
++	0x9186, 0x0056, 0x0990, 0xa897, 0x4005, 0xa89b, 0x0001, 0x2001,
++	0x0030, 0x900e, 0x08a0, 0xa87c, 0x9084, 0x00c0, 0x9086, 0x00c0,
++	0x1120, 0x7007, 0x0001, 0x0804, 0x701a, 0x2900, 0x7016, 0x701a,
++	0x20a9, 0x0004, 0xa860, 0x20e0, 0xa85c, 0x9080, 0x0030, 0x2098,
++	0x7050, 0x2040, 0xa060, 0x20e8, 0xa05c, 0x9080, 0x0023, 0x20a0,
++	0x4003, 0xa888, 0x7012, 0x9082, 0x0401, 0x1a04, 0x6cac, 0xaab4,
++	0x928a, 0x0002, 0x1a04, 0x6cac, 0x82ff, 0x1138, 0xa8b8, 0xa9bc,
++	0x9105, 0x0118, 0x2001, 0x6dc8, 0x0018, 0x9280, 0x6dbe, 0x2005,
++	0x7056, 0x7010, 0x9015, 0x0904, 0x6da9, 0x080c, 0x0fc7, 0x1118,
++	0x7007, 0x0004, 0x0005, 0x2900, 0x7022, 0x7054, 0x2060, 0xe000,
++	0xa866, 0xe004, 0x7050, 0x2040, 0xa95c, 0x9100, 0xa076, 0xa860,
++	0xa072, 0xe008, 0x920a, 0x1210, 0x900e, 0x2200, 0x7112, 0xe20c,
++	0x8003, 0x800b, 0x9296, 0x0004, 0x0108, 0x9108, 0xa17a, 0x810b,
++	0xa17e, 0x080c, 0x108c, 0xa06c, 0x908e, 0x0100, 0x0170, 0x9086,
++	0x0200, 0x0118, 0x7007, 0x0007, 0x0005, 0x7020, 0x2048, 0x080c,
++	0x0fe0, 0x7014, 0x2048, 0x0804, 0x6cac, 0x7020, 0x2048, 0x7018,
++	0xa802, 0xa807, 0x0000, 0x2908, 0x2048, 0xa906, 0x711a, 0x0804,
++	0x6d61, 0x7014, 0x2048, 0x7007, 0x0001, 0xa8b4, 0x9005, 0x1128,
++	0xa8b8, 0xa9bc, 0x9105, 0x0108, 0x00b9, 0xa864, 0x9084, 0x00ff,
++	0x9086, 0x001e, 0x0904, 0x701a, 0x0804, 0x6e0a, 0x6dc0, 0x6dc4,
++	0x0002, 0x001d, 0x0007, 0x0004, 0x000a, 0x001b, 0x0005, 0x0006,
++	0x000a, 0x001d, 0x0005, 0x0004, 0x0076, 0x0066, 0xafb8, 0xaebc,
++	0xa804, 0x2050, 0xb0c0, 0xb0e2, 0xb0bc, 0xb0de, 0xb0b8, 0xb0d2,
++	0xb0b4, 0xb0ce, 0xb6da, 0xb7d6, 0xb0b0, 0xb0ca, 0xb0ac, 0xb0c6,
++	0xb0a8, 0xb0ba, 0xb0a4, 0xb0b6, 0xb6c2, 0xb7be, 0xb0a0, 0xb0b2,
++	0xb09c, 0xb0ae, 0xb098, 0xb0a2, 0xb094, 0xb09e, 0xb6aa, 0xb7a6,
++	0xb090, 0xb09a, 0xb08c, 0xb096, 0xb088, 0xb08a, 0xb084, 0xb086,
++	0xb692, 0xb78e, 0xb080, 0xb082, 0xb07c, 0xb07e, 0xb078, 0xb072,
++	0xb074, 0xb06e, 0xb67a, 0xb776, 0xb004, 0x9055, 0x1958, 0x006e,
++	0x007e, 0x0005, 0x2009, 0x1833, 0x210c, 0x81ff, 0x1178, 0x080c,
++	0x5755, 0x1108, 0x0005, 0x080c, 0x63d1, 0x0126, 0x2091, 0x8000,
++	0x080c, 0xb374, 0x080c, 0x61a9, 0x012e, 0x0ca0, 0x080c, 0xb752,
++	0x1d70, 0x2001, 0x0028, 0x900e, 0x0c70, 0x2009, 0x1833, 0x210c,
++	0x81ff, 0x11d8, 0xa888, 0x9005, 0x01e0, 0xa883, 0x0000, 0xa87c,
++	0xd0f4, 0x0120, 0x080c, 0x5849, 0x1138, 0x0005, 0x9006, 0xa87a,
++	0x080c, 0x57e4, 0x1108, 0x0005, 0x0126, 0x2091, 0x8000, 0xa87a,
++	0xa982, 0x080c, 0x61a9, 0x012e, 0x0cb0, 0x2001, 0x0028, 0x900e,
++	0x0c98, 0x2001, 0x0000, 0x0c80, 0x7018, 0xa802, 0x2908, 0x2048,
++	0xa906, 0x711a, 0x7010, 0x8001, 0x7012, 0x0118, 0x7007, 0x0003,
++	0x0030, 0x7014, 0x2048, 0x7007, 0x0001, 0x7048, 0x080f, 0x0005,
++	0x00b6, 0x7007, 0x0001, 0xa974, 0xa878, 0x9084, 0x00ff, 0x9096,
++	0x0004, 0x0540, 0x20a9, 0x0001, 0x9096, 0x0001, 0x0190, 0x900e,
++	0x20a9, 0x0800, 0x9096, 0x0002, 0x0160, 0x9005, 0x11d8, 0xa974,
++	0x080c, 0x5c0d, 0x11b8, 0x0066, 0xae80, 0x080c, 0x5d1d, 0x006e,
++	0x0088, 0x0046, 0x2011, 0x180c, 0x2224, 0xc484, 0x2412, 0x004e,
++	0x00c6, 0x080c, 0x5c0d, 0x1110, 0x080c, 0x5e1d, 0x8108, 0x1f04,
++	0x6e89, 0x00ce, 0xa87c, 0xd084, 0x1120, 0x080c, 0x0fe0, 0x00be,
++	0x0005, 0x0126, 0x2091, 0x8000, 0x080c, 0x61a9, 0x012e, 0x00be,
++	0x0005, 0x0126, 0x2091, 0x8000, 0x7007, 0x0001, 0x080c, 0x5f29,
++	0x0580, 0x2061, 0x1a3d, 0x6100, 0xd184, 0x0178, 0xa888, 0x9084,
++	0x00ff, 0x1550, 0x6000, 0xd084, 0x0520, 0x6004, 0x9005, 0x1538,
++	0x6003, 0x0000, 0x600b, 0x0000, 0x00c8, 0x2011, 0x0001, 0xa890,
++	0x9005, 0x1110, 0x2001, 0x001e, 0x8000, 0x6016, 0xa888, 0x9084,
++	0x00ff, 0x0178, 0x6006, 0xa888, 0x8007, 0x9084, 0x00ff, 0x0148,
++	0x600a, 0xa888, 0x8000, 0x1108, 0xc28d, 0x6202, 0x012e, 0x0804,
++	0x70e3, 0x012e, 0x0804, 0x70dd, 0x012e, 0x0804, 0x70d7, 0x012e,
++	0x0804, 0x70da, 0x0126, 0x2091, 0x8000, 0x7007, 0x0001, 0x080c,
++	0x5f29, 0x05e0, 0x2061, 0x1a3d, 0x6000, 0xd084, 0x05b8, 0x6204,
++	0x6308, 0xd08c, 0x1530, 0xac78, 0x9484, 0x0003, 0x0170, 0xa988,
++	0x918c, 0x00ff, 0x8001, 0x1120, 0x2100, 0x9210, 0x0620, 0x0028,
++	0x8001, 0x1508, 0x2100, 0x9212, 0x02f0, 0x9484, 0x000c, 0x0188,
++	0xa988, 0x810f, 0x918c, 0x00ff, 0x9082, 0x0004, 0x1120, 0x2100,
++	0x9318, 0x0288, 0x0030, 0x9082, 0x0004, 0x1168, 0x2100, 0x931a,
++	0x0250, 0xa890, 0x9005, 0x0110, 0x8000, 0x6016, 0x6206, 0x630a,
++	0x012e, 0x0804, 0x70e3, 0x012e, 0x0804, 0x70e0, 0x012e, 0x0804,
++	0x70dd, 0x0126, 0x2091, 0x8000, 0x7007, 0x0001, 0x2061, 0x1a3d,
++	0x6300, 0xd38c, 0x1120, 0x6308, 0x8318, 0x0220, 0x630a, 0x012e,
++	0x0804, 0x70f1, 0x012e, 0x0804, 0x70e0, 0x00b6, 0x0126, 0x00c6,
++	0x2091, 0x8000, 0x7007, 0x0001, 0xa87c, 0xd0ac, 0x0148, 0x00c6,
++	0x2061, 0x1a3d, 0x6000, 0x9084, 0xfcff, 0x6002, 0x00ce, 0x0440,
++	0xa888, 0x9005, 0x05d8, 0xa88c, 0x9065, 0x0598, 0x2001, 0x1833,
++	0x2004, 0x9005, 0x0118, 0x080c, 0x9584, 0x0068, 0x6017, 0xf400,
++	0x605b, 0x0000, 0xa97c, 0xd1a4, 0x0110, 0xa980, 0x615a, 0x2009,
++	0x0041, 0x080c, 0x95ce, 0xa988, 0x918c, 0xff00, 0x9186, 0x2000,
++	0x1138, 0x0026, 0x900e, 0x2011, 0xfdff, 0x080c, 0x7a0a, 0x002e,
++	0xa87c, 0xd0c4, 0x0148, 0x2061, 0x1a3d, 0x6000, 0xd08c, 0x1120,
++	0x6008, 0x8000, 0x0208, 0x600a, 0x00ce, 0x012e, 0x00be, 0x0804,
++	0x70e3, 0x00ce, 0x012e, 0x00be, 0x0804, 0x70dd, 0xa984, 0x9186,
++	0x002e, 0x0d30, 0x9186, 0x002d, 0x0d18, 0x9186, 0x0045, 0x0510,
++	0x9186, 0x002a, 0x1130, 0x2001, 0x180c, 0x200c, 0xc194, 0x2102,
++	0x08b8, 0x9186, 0x0020, 0x0158, 0x9186, 0x0029, 0x1d10, 0xa974,
++	0x080c, 0x5c0d, 0x1968, 0xb800, 0xc0e4, 0xb802, 0x0848, 0xa88c,
++	0x9065, 0x09b8, 0x6007, 0x0024, 0x2001, 0x1953, 0x2004, 0x601a,
++	0x0804, 0x6f78, 0xa88c, 0x9065, 0x0960, 0x00e6, 0xa890, 0x9075,
++	0x2001, 0x1833, 0x2004, 0x9005, 0x0150, 0x080c, 0x9584, 0x8eff,
++	0x0118, 0x2e60, 0x080c, 0x9584, 0x00ee, 0x0804, 0x6f78, 0x6024,
++	0xc0dc, 0xc0d5, 0x6026, 0x2e60, 0x6007, 0x003a, 0xa8a0, 0x9005,
++	0x0130, 0x6007, 0x003b, 0xa8a4, 0x602e, 0xa8a8, 0x6016, 0x6003,
++	0x0001, 0x080c, 0x7bcb, 0x080c, 0x8125, 0x00ee, 0x0804, 0x6f78,
++	0x2061, 0x1a3d, 0x6000, 0xd084, 0x0190, 0xd08c, 0x1904, 0x70f1,
++	0x0126, 0x2091, 0x8000, 0x6204, 0x8210, 0x0220, 0x6206, 0x012e,
++	0x0804, 0x70f1, 0x012e, 0xa883, 0x0016, 0x0804, 0x70ea, 0xa883,
++	0x0007, 0x0804, 0x70ea, 0xa864, 0x8007, 0x9084, 0x00ff, 0x0130,
++	0x8001, 0x1138, 0x7007, 0x0001, 0x0069, 0x0005, 0x080c, 0x6ca4,
++	0x0040, 0x7007, 0x0003, 0x7012, 0x2900, 0x7016, 0x701a, 0x704b,
++	0x701a, 0x0005, 0x00b6, 0x00e6, 0x0126, 0x2091, 0x8000, 0x903e,
++	0x2061, 0x1800, 0x61cc, 0x81ff, 0x1904, 0x709c, 0x6130, 0xd194,
++	0x1904, 0x70c6, 0xa878, 0x2070, 0x9e82, 0x1cd0, 0x0a04, 0x7090,
++	0x6060, 0x9e02, 0x1a04, 0x7090, 0x7120, 0x9186, 0x0006, 0x1904,
++	0x7082, 0x7010, 0x905d, 0x0904, 0x709c, 0xb800, 0xd0e4, 0x1904,
++	0x70c0, 0x2061, 0x1a3d, 0x6100, 0x9184, 0x0301, 0x9086, 0x0001,
++	0x15a0, 0x7024, 0xd0dc, 0x1904, 0x70c9, 0xa883, 0x0000, 0xa803,
++	0x0000, 0x2908, 0x7014, 0x9005, 0x1198, 0x7116, 0xa87c, 0xd0f4,
++	0x1904, 0x70cc, 0x080c, 0x4dea, 0xd09c, 0x1118, 0xa87c, 0xc0cc,
++	0xa87e, 0x2e60, 0x080c, 0x792a, 0x012e, 0x00ee, 0x00be, 0x0005,
++	0x2048, 0xa800, 0x9005, 0x1de0, 0xa902, 0x2148, 0xa87c, 0xd0f4,
++	0x1904, 0x70cc, 0x012e, 0x00ee, 0x00be, 0x0005, 0x012e, 0x00ee,
++	0xa883, 0x0006, 0x00be, 0x0804, 0x70ea, 0xd184, 0x0db8, 0xd1c4,
++	0x1190, 0x00a0, 0xa974, 0x080c, 0x5c0d, 0x15d0, 0xb800, 0xd0e4,
++	0x15b8, 0x7120, 0x9186, 0x0007, 0x1118, 0xa883, 0x0002, 0x0490,
++	0xa883, 0x0008, 0x0478, 0xa883, 0x000e, 0x0460, 0xa883, 0x0017,
++	0x0448, 0xa883, 0x0035, 0x0430, 0x080c, 0x4dee, 0xd0fc, 0x01e8,
++	0xa878, 0x2070, 0x9e82, 0x1cd0, 0x02c0, 0x6060, 0x9e02, 0x12a8,
++	0x7120, 0x9186, 0x0006, 0x1188, 0x7010, 0x905d, 0x0170, 0xb800,
++	0xd0bc, 0x0158, 0x2039, 0x0001, 0x7000, 0x9086, 0x0007, 0x1904,
++	0x7026, 0x7003, 0x0002, 0x0804, 0x7026, 0xa883, 0x0028, 0x0010,
++	0xa883, 0x0029, 0x012e, 0x00ee, 0x00be, 0x0420, 0xa883, 0x002a,
++	0x0cc8, 0xa883, 0x0045, 0x0cb0, 0x2e60, 0x2019, 0x0002, 0x601b,
++	0x0014, 0x080c, 0xc58e, 0x012e, 0x00ee, 0x00be, 0x0005, 0x2009,
++	0x003e, 0x0058, 0x2009, 0x0004, 0x0040, 0x2009, 0x0006, 0x0028,
++	0x2009, 0x0016, 0x0010, 0x2009, 0x0001, 0xa884, 0x9084, 0xff00,
++	0x9105, 0xa886, 0x0126, 0x2091, 0x8000, 0x080c, 0x61a9, 0x012e,
++	0x0005, 0x080c, 0x0fe0, 0x0005, 0x00d6, 0x080c, 0x7921, 0x00de,
++	0x0005, 0x00d6, 0x00e6, 0x0126, 0x2091, 0x8000, 0x2071, 0x0040,
++	0x702c, 0xd084, 0x01d8, 0x908c, 0x0780, 0x190c, 0x7185, 0xd09c,
++	0x11a8, 0x2071, 0x1800, 0x70bc, 0x90ea, 0x0040, 0x0278, 0x8001,
++	0x70be, 0x702c, 0x2048, 0xa800, 0x702e, 0x9006, 0xa802, 0xa806,
++	0x2071, 0x0040, 0x2900, 0x7022, 0x702c, 0x0c28, 0x012e, 0x00ee,
++	0x00de, 0x0005, 0x0006, 0x9084, 0x0780, 0x190c, 0x7185, 0x000e,
++	0x0005, 0x00d6, 0x00c6, 0x0036, 0x0026, 0x0016, 0x00b6, 0x7007,
++	0x0001, 0xaa74, 0x9282, 0x0004, 0x1a04, 0x7176, 0xa97c, 0x9188,
++	0x1000, 0x2104, 0x905d, 0xb804, 0xd284, 0x0140, 0x05e8, 0x8007,
++	0x9084, 0x00ff, 0x9084, 0x0006, 0x1108, 0x04b0, 0x2b10, 0x080c,
++	0x94fe, 0x1118, 0x080c, 0x95a1, 0x05a8, 0x6212, 0xa874, 0x0002,
++	0x7154, 0x7159, 0x715c, 0x7162, 0x2019, 0x0002, 0x080c, 0xc941,
++	0x0060, 0x080c, 0xc8dd, 0x0048, 0x2019, 0x0002, 0xa980, 0x080c,
++	0xc8f8, 0x0018, 0xa980, 0x080c, 0xc8dd, 0x080c, 0x9554, 0xa887,
++	0x0000, 0x0126, 0x2091, 0x8000, 0x080c, 0x61a9, 0x012e, 0x00be,
++	0x001e, 0x002e, 0x003e, 0x00ce, 0x00de, 0x0005, 0xa887, 0x0006,
++	0x0c80, 0xa887, 0x0002, 0x0c68, 0xa887, 0x0005, 0x0c50, 0xa887,
++	0x0004, 0x0c38, 0xa887, 0x0007, 0x0c20, 0x2091, 0x8000, 0x0e04,
++	0x7187, 0x0006, 0x0016, 0x2001, 0x8003, 0x0006, 0x0804, 0x0d8d,
++	0x0005, 0x00f6, 0x2079, 0x0300, 0x2001, 0x0200, 0x200c, 0xc1e5,
++	0xc1dc, 0x2102, 0x2009, 0x0218, 0x210c, 0xd1ec, 0x1120, 0x080c,
++	0x1426, 0x00fe, 0x0005, 0x2001, 0x020d, 0x2003, 0x0020, 0x781f,
++	0x0300, 0x00fe, 0x0005, 0x781c, 0xd08c, 0x05e8, 0x7d44, 0x7c40,
++	0x9584, 0x00f6, 0x1508, 0x9484, 0x7000, 0x0138, 0x908a, 0x2000,
++	0x1258, 0x9584, 0x0700, 0x8007, 0x04a8, 0x7000, 0x9084, 0xff00,
++	0x9086, 0x8100, 0x0db0, 0x00b0, 0x9484, 0x0fff, 0x1130, 0x7000,
++	0x9084, 0xff00, 0x9086, 0x8100, 0x11c0, 0x080c, 0xcce2, 0x080c,
++	0x7692, 0x7817, 0x0140, 0x00a8, 0x9584, 0x0076, 0x1118, 0x080c,
++	0x76f0, 0x19c8, 0xd5a4, 0x0148, 0x0046, 0x0056, 0x080c, 0x724d,
++	0x080c, 0x1f79, 0x005e, 0x004e, 0x0020, 0x080c, 0xcce2, 0x7817,
++	0x0140, 0x080c, 0x722e, 0x2001, 0x19bd, 0x2004, 0x9005, 0x090c,
++	0x8125, 0x0005, 0x0002, 0x7204, 0x74c3, 0x71fb, 0x71fb, 0x71fb,
++	0x71fb, 0x71fb, 0x71fb, 0x7817, 0x0140, 0x2001, 0x19bd, 0x2004,
++	0x9005, 0x090c, 0x8125, 0x0005, 0x7000, 0x908c, 0xff00, 0x9194,
++	0xf000, 0x810f, 0x9484, 0x0fff, 0x688a, 0x9286, 0x2000, 0x1150,
++	0x6800, 0x9086, 0x0001, 0x1118, 0x080c, 0x4e04, 0x0070, 0x080c,
++	0x726d, 0x0058, 0x9286, 0x3000, 0x1118, 0x080c, 0x73fe, 0x0028,
++	0x9286, 0x8000, 0x1110, 0x080c, 0x75c8, 0x7817, 0x0140, 0x2001,
++	0x19bd, 0x2004, 0x9005, 0x090c, 0x8125, 0x0005, 0x2001, 0x180f,
++	0x2004, 0xd08c, 0x0178, 0x2001, 0x1800, 0x2004, 0x9086, 0x0003,
++	0x1148, 0x0026, 0x0036, 0x2011, 0x8048, 0x2518, 0x080c, 0x447f,
++	0x003e, 0x002e, 0x0005, 0x0036, 0x0046, 0x0056, 0x00f6, 0x2079,
++	0x0200, 0x2019, 0xfffe, 0x7c30, 0x0050, 0x0036, 0x0046, 0x0056,
++	0x00f6, 0x2079, 0x0200, 0x7d44, 0x7c40, 0x2019, 0xffff, 0x2001,
++	0x180f, 0x2004, 0xd08c, 0x0160, 0x2001, 0x1800, 0x2004, 0x9086,
++	0x0003, 0x1130, 0x0026, 0x2011, 0x8048, 0x080c, 0x447f, 0x002e,
++	0x00fe, 0x005e, 0x004e, 0x003e, 0x0005, 0x00b6, 0x00c6, 0x7010,
++	0x9084, 0xff00, 0x8007, 0x9096, 0x0001, 0x0120, 0x9096, 0x0023,
++	0x1904, 0x73cf, 0x9186, 0x0023, 0x1550, 0x080c, 0x7657, 0x0904,
++	0x73cf, 0x7124, 0x610a, 0x7030, 0x908e, 0x0200, 0x1130, 0x2009,
++	0x0015, 0x080c, 0x95ce, 0x0804, 0x73cf, 0x908e, 0x0214, 0x0118,
++	0x908e, 0x0210, 0x1130, 0x2009, 0x0015, 0x080c, 0x95ce, 0x0804,
++	0x73cf, 0x908e, 0x0100, 0x1904, 0x73cf, 0x7034, 0x9005, 0x1904,
++	0x73cf, 0x2009, 0x0016, 0x080c, 0x95ce, 0x0804, 0x73cf, 0x9186,
++	0x0022, 0x1904, 0x73cf, 0x7030, 0x908e, 0x0300, 0x1580, 0x68d8,
++	0xd0a4, 0x0528, 0xc0b5, 0x68da, 0x7100, 0x918c, 0x00ff, 0x6976,
++	0x7004, 0x687a, 0x00f6, 0x2079, 0x0100, 0x79e6, 0x78ea, 0x0006,
++	0x9084, 0x00ff, 0x0016, 0x2008, 0x080c, 0x2446, 0x7932, 0x7936,
++	0x001e, 0x000e, 0x00fe, 0x080c, 0x23fd, 0x6956, 0x703c, 0x00e6,
++	0x2071, 0x0140, 0x7086, 0x2071, 0x1800, 0x70ae, 0x00ee, 0x7034,
++	0x9005, 0x1904, 0x73cf, 0x2009, 0x0017, 0x0804, 0x739c, 0x908e,
++	0x0400, 0x1190, 0x7034, 0x9005, 0x1904, 0x73cf, 0x080c, 0x6877,
++	0x0120, 0x2009, 0x001d, 0x0804, 0x739c, 0x68d8, 0xc0a5, 0x68da,
++	0x2009, 0x0030, 0x0804, 0x739c, 0x908e, 0x0500, 0x1140, 0x7034,
++	0x9005, 0x1904, 0x73cf, 0x2009, 0x0018, 0x0804, 0x739c, 0x908e,
++	0x2010, 0x1120, 0x2009, 0x0019, 0x0804, 0x739c, 0x908e, 0x2110,
++	0x1120, 0x2009, 0x001a, 0x0804, 0x739c, 0x908e, 0x5200, 0x1140,
++	0x7034, 0x9005, 0x1904, 0x73cf, 0x2009, 0x001b, 0x0804, 0x739c,
++	0x908e, 0x5000, 0x1140, 0x7034, 0x9005, 0x1904, 0x73cf, 0x2009,
++	0x001c, 0x0804, 0x739c, 0x908e, 0x1300, 0x1120, 0x2009, 0x0034,
++	0x0804, 0x739c, 0x908e, 0x1200, 0x1140, 0x7034, 0x9005, 0x1904,
++	0x73cf, 0x2009, 0x0024, 0x0804, 0x739c, 0x908c, 0xff00, 0x918e,
++	0x2400, 0x1120, 0x2009, 0x002d, 0x0804, 0x739c, 0x908c, 0xff00,
++	0x918e, 0x5300, 0x1120, 0x2009, 0x002a, 0x0804, 0x739c, 0x908e,
++	0x0f00, 0x1120, 0x2009, 0x0020, 0x0804, 0x739c, 0x908e, 0x5300,
++	0x1108, 0x00d8, 0x908e, 0x6104, 0x11c0, 0x2011, 0x026d, 0x8208,
++	0x2204, 0x9082, 0x0004, 0x8004, 0x8004, 0x20a8, 0x2011, 0x8015,
++	0x211c, 0x8108, 0x0046, 0x2124, 0x080c, 0x447f, 0x004e, 0x8108,
++	0x1f04, 0x735e, 0x2009, 0x0023, 0x0478, 0x908e, 0x6000, 0x1118,
++	0x2009, 0x003f, 0x0448, 0x908e, 0x7800, 0x1118, 0x2009, 0x0045,
++	0x0418, 0x908e, 0x1000, 0x1118, 0x2009, 0x004e, 0x00e8, 0x908e,
++	0x6300, 0x1118, 0x2009, 0x004a, 0x00b8, 0x908c, 0xff00, 0x918e,
++	0x5600, 0x1118, 0x2009, 0x004f, 0x0078, 0x908c, 0xff00, 0x918e,
++	0x5700, 0x1118, 0x2009, 0x0050, 0x0038, 0x2009, 0x001d, 0x6834,
++	0xd0d4, 0x0110, 0x2009, 0x004c, 0x0016, 0x2011, 0x0263, 0x2204,
++	0x8211, 0x220c, 0x080c, 0x23fd, 0x1568, 0x080c, 0x5bb0, 0x1550,
++	0xbe12, 0xbd16, 0x001e, 0x0016, 0xb8b0, 0x9005, 0x1168, 0x9186,
++	0x0046, 0x1150, 0x6874, 0x9606, 0x1138, 0x6878, 0x9506, 0x9084,
++	0xff00, 0x1110, 0x001e, 0x0098, 0x080c, 0x94fe, 0x01a8, 0x2b08,
++	0x6112, 0x6023, 0x0004, 0x7120, 0x610a, 0x001e, 0x9186, 0x004c,
++	0x1110, 0x6023, 0x000a, 0x0016, 0x001e, 0x080c, 0x95ce, 0x00ce,
++	0x00be, 0x0005, 0x001e, 0x0cd8, 0x2001, 0x180d, 0x2004, 0xd0ec,
++	0x0120, 0x2011, 0x8049, 0x080c, 0x447f, 0x080c, 0x95a1, 0x0d90,
++	0x2b08, 0x6112, 0x6023, 0x0004, 0x7120, 0x610a, 0x001e, 0x0016,
++	0x9186, 0x0017, 0x0118, 0x9186, 0x0030, 0x1128, 0x6007, 0x0009,
++	0x6017, 0x2900, 0x0020, 0x6007, 0x0051, 0x6017, 0x0000, 0x602f,
++	0x0009, 0x6003, 0x0001, 0x080c, 0x7c1d, 0x08a0, 0x080c, 0x2e39,
++	0x1140, 0x7010, 0x9084, 0xff00, 0x8007, 0x908e, 0x0008, 0x1108,
++	0x0009, 0x0005, 0x00b6, 0x00c6, 0x0046, 0x7000, 0x908c, 0xff00,
++	0x810f, 0x9186, 0x0033, 0x11e8, 0x080c, 0x7657, 0x0904, 0x745b,
++	0x7124, 0x610a, 0x7030, 0x908e, 0x0200, 0x1140, 0x7034, 0x9005,
++	0x15d0, 0x2009, 0x0015, 0x080c, 0x95ce, 0x04a8, 0x908e, 0x0100,
++	0x1590, 0x7034, 0x9005, 0x1578, 0x2009, 0x0016, 0x080c, 0x95ce,
++	0x0450, 0x9186, 0x0032, 0x1538, 0x7030, 0x908e, 0x1400, 0x1518,
++	0x2009, 0x0038, 0x0016, 0x2011, 0x0263, 0x2204, 0x8211, 0x220c,
++	0x080c, 0x23fd, 0x11b8, 0x080c, 0x5bb0, 0x11a0, 0xbe12, 0xbd16,
++	0x080c, 0x94fe, 0x0178, 0x2b08, 0x6112, 0x080c, 0xb4e6, 0x6023,
++	0x0004, 0x7120, 0x610a, 0x001e, 0x080c, 0x95ce, 0x080c, 0x8125,
++	0x0010, 0x00ce, 0x001e, 0x004e, 0x00ce, 0x00be, 0x0005, 0x00b6,
++	0x0046, 0x00e6, 0x00d6, 0x2028, 0x2130, 0x9696, 0x00ff, 0x11b8,
++	0x9592, 0xfffc, 0x02a0, 0x9596, 0xfffd, 0x1120, 0x2009, 0x007f,
++	0x0804, 0x74bd, 0x9596, 0xfffe, 0x1120, 0x2009, 0x007e, 0x0804,
++	0x74bd, 0x9596, 0xfffc, 0x1118, 0x2009, 0x0080, 0x04f0, 0x2011,
++	0x0000, 0x2019, 0x1836, 0x231c, 0xd3ac, 0x0130, 0x9026, 0x20a9,
++	0x0800, 0x2071, 0x1000, 0x0030, 0x2021, 0x0081, 0x20a9, 0x077f,
++	0x2071, 0x1081, 0x2e1c, 0x93dd, 0x0000, 0x1140, 0x82ff, 0x11d0,
++	0x9496, 0x00ff, 0x01b8, 0x2410, 0xc2fd, 0x00a0, 0xbf10, 0x2600,
++	0x9706, 0xb814, 0x1120, 0x9546, 0x1110, 0x2408, 0x00b0, 0x9745,
++	0x1148, 0x94c6, 0x007e, 0x0130, 0x94c6, 0x007f, 0x0118, 0x94c6,
++	0x0080, 0x1d20, 0x8420, 0x8e70, 0x1f04, 0x7492, 0x82ff, 0x1118,
++	0x9085, 0x0001, 0x0018, 0xc2fc, 0x2208, 0x9006, 0x00de, 0x00ee,
++	0x004e, 0x00be, 0x0005, 0x7000, 0x908c, 0xff00, 0x810f, 0x9184,
++	0x000f, 0x0002, 0x74da, 0x74da, 0x74da, 0x7669, 0x74da, 0x74e3,
++	0x750e, 0x759d, 0x74da, 0x74da, 0x74da, 0x74da, 0x74da, 0x74da,
++	0x74da, 0x74da, 0x7817, 0x0140, 0x2001, 0x19bd, 0x2004, 0x9005,
++	0x090c, 0x8125, 0x0005, 0x00b6, 0x7110, 0xd1bc, 0x01e8, 0x7120,
++	0x2160, 0x9c8c, 0x0007, 0x11c0, 0x9c8a, 0x1cd0, 0x02a8, 0x6860,
++	0x9c02, 0x1290, 0x7008, 0x9084, 0x00ff, 0x6110, 0x2158, 0xb910,
++	0x9106, 0x1150, 0x700c, 0xb914, 0x9106, 0x1130, 0x7124, 0x610a,
++	0x2009, 0x0046, 0x080c, 0x95ce, 0x7817, 0x0140, 0x2001, 0x19bd,
++	0x2004, 0x9005, 0x090c, 0x8125, 0x00be, 0x0005, 0x00b6, 0x00c6,
++	0x9484, 0x0fff, 0x0904, 0x7573, 0x7110, 0xd1bc, 0x1904, 0x7573,
++	0x7108, 0x700c, 0x2028, 0x918c, 0x00ff, 0x2130, 0x9094, 0xff00,
++	0x15b8, 0x81ff, 0x15a8, 0x9080, 0x2e6e, 0x200d, 0x918c, 0xff00,
++	0x810f, 0x2001, 0x0080, 0x9106, 0x0904, 0x7573, 0x080c, 0x5bb0,
++	0x1904, 0x7573, 0xbe12, 0xbd16, 0xb800, 0xd0ec, 0x15e0, 0xba04,
++	0x9294, 0xff00, 0x9286, 0x0600, 0x11a0, 0x080c, 0x94fe, 0x05f0,
++	0x2b08, 0x7028, 0x604a, 0x702c, 0x6046, 0x6112, 0x6023, 0x0006,
++	0x7120, 0x610a, 0x7130, 0x6156, 0x2009, 0x0044, 0x080c, 0xbfdb,
++	0x0410, 0x080c, 0x5f2d, 0x2010, 0x1138, 0xb807, 0x0606, 0x0c28,
++	0x190c, 0x745f, 0x11c0, 0x0890, 0x080c, 0x94fe, 0x2b08, 0x0198,
++	0x6112, 0x6023, 0x0004, 0x7120, 0x610a, 0x9286, 0x0004, 0x1118,
++	0x6007, 0x0005, 0x0010, 0x6007, 0x0001, 0x6003, 0x0001, 0x080c,
++	0x7c1d, 0x080c, 0x8125, 0x7817, 0x0140, 0x2001, 0x19bd, 0x2004,
++	0x9005, 0x090c, 0x8125, 0x00ce, 0x00be, 0x0005, 0x2001, 0x180d,
++	0x2004, 0xd0ec, 0x0120, 0x2011, 0x8049, 0x080c, 0x447f, 0x080c,
++	0x95a1, 0x0d48, 0x2b08, 0x6112, 0x6023, 0x0006, 0x7120, 0x610a,
++	0x7130, 0x6156, 0x6017, 0xf300, 0x6003, 0x0001, 0x6007, 0x0041,
++	0x080c, 0x7bcb, 0x080c, 0x8125, 0x08b0, 0x00b6, 0x7110, 0xd1bc,
++	0x01e8, 0x7020, 0x2060, 0x9c84, 0x0007, 0x11c0, 0x9c82, 0x1cd0,
++	0x02a8, 0x6860, 0x9c02, 0x1290, 0x7008, 0x9084, 0x00ff, 0x6110,
++	0x2158, 0xb910, 0x9106, 0x1150, 0x700c, 0xb914, 0x9106, 0x1130,
++	0x7124, 0x610a, 0x2009, 0x0045, 0x080c, 0x95ce, 0x7817, 0x0140,
++	0x2001, 0x19bd, 0x2004, 0x9005, 0x090c, 0x8125, 0x00be, 0x0005,
++	0x080c, 0x2e39, 0x1168, 0x7010, 0x9084, 0xff00, 0x8007, 0x9086,
++	0x0000, 0x1130, 0x9184, 0x000f, 0x908a, 0x0006, 0x1208, 0x000b,
++	0x0005, 0x75df, 0x75e0, 0x75df, 0x75df, 0x763f, 0x764b, 0x0005,
++	0x00b6, 0x7110, 0xd1bc, 0x0120, 0x702c, 0xd084, 0x0904, 0x763d,
++	0x700c, 0x7108, 0x080c, 0x23fd, 0x1904, 0x763d, 0x080c, 0x5bb0,
++	0x1904, 0x763d, 0xbe12, 0xbd16, 0x7110, 0xd1bc, 0x01d8, 0x080c,
++	0x5f2d, 0x0118, 0x9086, 0x0004, 0x1588, 0x00c6, 0x080c, 0x7657,
++	0x00ce, 0x05d8, 0x080c, 0x94fe, 0x2b08, 0x05b8, 0x6112, 0x080c,
++	0xb4e6, 0x6023, 0x0002, 0x7120, 0x610a, 0x2009, 0x0088, 0x080c,
++	0x95ce, 0x0458, 0x080c, 0x5f2d, 0x0148, 0x9086, 0x0004, 0x0130,
++	0x080c, 0x5f35, 0x0118, 0x9086, 0x0004, 0x1180, 0x080c, 0x94fe,
++	0x2b08, 0x01d8, 0x6112, 0x080c, 0xb4e6, 0x6023, 0x0005, 0x7120,
++	0x610a, 0x2009, 0x0088, 0x080c, 0x95ce, 0x0078, 0x080c, 0x94fe,
++	0x2b08, 0x0158, 0x6112, 0x080c, 0xb4e6, 0x6023, 0x0004, 0x7120,
++	0x610a, 0x2009, 0x0001, 0x080c, 0x95ce, 0x00be, 0x0005, 0x7110,
++	0xd1bc, 0x0140, 0x00a1, 0x0130, 0x7124, 0x610a, 0x2009, 0x0089,
++	0x080c, 0x95ce, 0x0005, 0x7110, 0xd1bc, 0x0140, 0x0041, 0x0130,
++	0x7124, 0x610a, 0x2009, 0x008a, 0x080c, 0x95ce, 0x0005, 0x7020,
++	0x2060, 0x9c84, 0x0007, 0x1158, 0x9c82, 0x1cd0, 0x0240, 0x2001,
++	0x1818, 0x2004, 0x9c02, 0x1218, 0x9085, 0x0001, 0x0005, 0x9006,
++	0x0ce8, 0x00b6, 0x7110, 0xd1bc, 0x11d8, 0x7024, 0x2060, 0x9c84,
++	0x0007, 0x11b0, 0x9c82, 0x1cd0, 0x0298, 0x6860, 0x9c02, 0x1280,
++	0x7008, 0x9084, 0x00ff, 0x6110, 0x2158, 0xb910, 0x9106, 0x1140,
++	0x700c, 0xb914, 0x9106, 0x1120, 0x2009, 0x0051, 0x080c, 0x95ce,
++	0x7817, 0x0140, 0x2001, 0x19bd, 0x2004, 0x9005, 0x090c, 0x8125,
++	0x00be, 0x0005, 0x2031, 0x0105, 0x0069, 0x0005, 0x2031, 0x0206,
++	0x0049, 0x0005, 0x2031, 0x0207, 0x0029, 0x0005, 0x2031, 0x0213,
++	0x0009, 0x0005, 0x00c6, 0x0096, 0x00f6, 0x7000, 0x9084, 0xf000,
++	0x9086, 0xc000, 0x05d0, 0x080c, 0x94fe, 0x05b8, 0x0066, 0x00c6,
++	0x0046, 0x2011, 0x0263, 0x2204, 0x8211, 0x220c, 0x080c, 0x23fd,
++	0x15a0, 0x080c, 0x5bb0, 0x1588, 0xbe12, 0xbd16, 0x2b00, 0x004e,
++	0x00ce, 0x6012, 0x080c, 0xb4e6, 0x080c, 0x0fae, 0x0510, 0x2900,
++	0x605a, 0x9006, 0xa802, 0xa866, 0xac6a, 0xa85c, 0x90f8, 0x001b,
++	0x20a9, 0x000e, 0xa860, 0x20e8, 0x20e1, 0x0000, 0x2fa0, 0x2e98,
++	0x4003, 0x006e, 0x6616, 0x6007, 0x003e, 0x6023, 0x0001, 0x6003,
++	0x0001, 0x080c, 0x7c1d, 0x080c, 0x8125, 0x00fe, 0x009e, 0x00ce,
++	0x0005, 0x080c, 0x9554, 0x006e, 0x0cc0, 0x004e, 0x00ce, 0x0cc8,
++	0x00c6, 0x7000, 0x908c, 0xff00, 0x9184, 0xf000, 0x810f, 0x9086,
++	0x2000, 0x1904, 0x7747, 0x9186, 0x0022, 0x15f0, 0x2001, 0x0111,
++	0x2004, 0x9005, 0x1904, 0x7749, 0x7030, 0x908e, 0x0400, 0x0904,
++	0x7749, 0x908e, 0x6000, 0x05e8, 0x908e, 0x5400, 0x05d0, 0x908e,
++	0x0300, 0x11d8, 0x2009, 0x1836, 0x210c, 0xd18c, 0x1590, 0xd1a4,
++	0x1580, 0x080c, 0x5eeb, 0x0558, 0x68a8, 0x9084, 0x00ff, 0x7100,
++	0x918c, 0x00ff, 0x9106, 0x1518, 0x6878, 0x69a8, 0x918c, 0xff00,
++	0x9105, 0x7104, 0x9106, 0x11d8, 0x00e0, 0x2009, 0x0103, 0x210c,
++	0xd1b4, 0x11a8, 0x908e, 0x5200, 0x09e8, 0x908e, 0x0500, 0x09d0,
++	0x908e, 0x5000, 0x09b8, 0x0058, 0x9186, 0x0023, 0x1140, 0x080c,
++	0x7657, 0x0128, 0x6004, 0x9086, 0x0002, 0x0118, 0x0000, 0x9006,
++	0x0010, 0x9085, 0x0001, 0x00ce, 0x0005, 0x2071, 0x19c7, 0x7003,
++	0x0003, 0x700f, 0x0361, 0x9006, 0x701a, 0x7076, 0x7012, 0x7017,
++	0x1cd0, 0x7007, 0x0000, 0x7026, 0x702b, 0x8b66, 0x7032, 0x7037,
++	0x8bc9, 0x703f, 0xffff, 0x7043, 0xffff, 0x7046, 0x704b, 0x4c8b,
++	0x704e, 0x705f, 0x78ae, 0x080c, 0x0fc7, 0x090c, 0x0d84, 0x2900,
++	0x703a, 0xa867, 0x0003, 0xa86f, 0x0100, 0xa8ab, 0xdcb0, 0x0005,
++	0x2071, 0x19c7, 0x1d04, 0x7809, 0x2091, 0x6000, 0x700c, 0x8001,
++	0x700e, 0x1510, 0x2001, 0x1874, 0x2004, 0xd0c4, 0x0158, 0x3a00,
++	0xd08c, 0x1140, 0x20d1, 0x0000, 0x20d1, 0x0001, 0x20d1, 0x0000,
++	0x080c, 0x0d84, 0x700f, 0x0361, 0x7007, 0x0001, 0x0126, 0x2091,
++	0x8000, 0x080c, 0x78f3, 0x7044, 0x900d, 0x0148, 0x8109, 0x7146,
++	0x1130, 0x7048, 0x080f, 0x0018, 0x0126, 0x2091, 0x8000, 0x7024,
++	0x900d, 0x0188, 0x7020, 0x8001, 0x7022, 0x1168, 0x7023, 0x0009,
++	0x8109, 0x7126, 0x9186, 0x03e8, 0x1110, 0x7028, 0x080f, 0x81ff,
++	0x1110, 0x7028, 0x080f, 0x7030, 0x900d, 0x0180, 0x702c, 0x8001,
++	0x702e, 0x1160, 0x702f, 0x0009, 0x8109, 0x7132, 0x0128, 0x9184,
++	0x007f, 0x090c, 0x8c48, 0x0010, 0x7034, 0x080f, 0x703c, 0x9005,
++	0x0118, 0x0310, 0x8001, 0x703e, 0x7040, 0x9005, 0x0118, 0x0310,
++	0x8001, 0x7042, 0x7050, 0x900d, 0x0168, 0x704c, 0x8001, 0x704e,
++	0x1148, 0x704f, 0x0009, 0x8109, 0x7152, 0x1120, 0x7154, 0x7152,
++	0x705c, 0x080f, 0x7018, 0x900d, 0x01d8, 0x0016, 0x7074, 0x900d,
++	0x0158, 0x7070, 0x8001, 0x7072, 0x1138, 0x7073, 0x0009, 0x8109,
++	0x7176, 0x1110, 0x7078, 0x080f, 0x001e, 0x7008, 0x8001, 0x700a,
++	0x1138, 0x700b, 0x0009, 0x8109, 0x711a, 0x1110, 0x701c, 0x080f,
++	0x012e, 0x7004, 0x0002, 0x782f, 0x7830, 0x784a, 0x00e6, 0x2071,
++	0x19c7, 0x7018, 0x9005, 0x1120, 0x711a, 0x721e, 0x700b, 0x0009,
++	0x00ee, 0x0005, 0x00e6, 0x0006, 0x2071, 0x19c7, 0x701c, 0x9206,
++	0x1110, 0x701a, 0x701e, 0x000e, 0x00ee, 0x0005, 0x00e6, 0x2071,
++	0x19c7, 0xb888, 0x9102, 0x0208, 0xb98a, 0x00ee, 0x0005, 0x0005,
++	0x00b6, 0x7110, 0x080c, 0x5c0d, 0x1158, 0xb888, 0x8001, 0x0240,
++	0xb88a, 0x1130, 0x0126, 0x2091, 0x8000, 0x080c, 0x8125, 0x012e,
++	0x8108, 0x9182, 0x0800, 0x0218, 0x900e, 0x7007, 0x0002, 0x7112,
++	0x00be, 0x0005, 0x7014, 0x2060, 0x0126, 0x2091, 0x8000, 0x6040,
++	0x9005, 0x0128, 0x8001, 0x6042, 0x1110, 0x080c, 0xb38b, 0x6018,
++	0x9005, 0x0510, 0x8001, 0x601a, 0x11f8, 0x6120, 0x9186, 0x0003,
++	0x0118, 0x9186, 0x0006, 0x11b0, 0x6014, 0x2048, 0xa884, 0x908a,
++	0x199a, 0x0280, 0x9082, 0x1999, 0xa886, 0x908a, 0x199a, 0x0210,
++	0x2001, 0x1999, 0x8003, 0x800b, 0x810b, 0x9108, 0x611a, 0xa87c,
++	0xd0e4, 0x0110, 0x080c, 0xaddd, 0x012e, 0x9c88, 0x0018, 0x7116,
++	0x2001, 0x1818, 0x2004, 0x9102, 0x0220, 0x7017, 0x1cd0, 0x7007,
++	0x0000, 0x0005, 0x00e6, 0x2071, 0x19c7, 0x7027, 0x07d0, 0x7023,
++	0x0009, 0x00ee, 0x0005, 0x2001, 0x19d0, 0x2003, 0x0000, 0x0005,
++	0x00e6, 0x2071, 0x19c7, 0x7132, 0x702f, 0x0009, 0x00ee, 0x0005,
++	0x2011, 0x19d3, 0x2013, 0x0000, 0x0005, 0x00e6, 0x2071, 0x19c7,
++	0x711a, 0x721e, 0x700b, 0x0009, 0x00ee, 0x0005, 0x0086, 0x0026,
++	0x7058, 0x8000, 0x705a, 0x2001, 0x19d5, 0x2044, 0xa06c, 0x9086,
++	0x0000, 0x0150, 0x706c, 0xa09a, 0x7068, 0xa096, 0x7064, 0xa092,
++	0x7060, 0xa08e, 0x080c, 0x108c, 0x002e, 0x008e, 0x0005, 0x0006,
++	0x0016, 0x0096, 0x00a6, 0x00b6, 0x00c6, 0x00d6, 0x00e6, 0x00f6,
++	0x0156, 0x080c, 0x7778, 0x015e, 0x00fe, 0x00ee, 0x00de, 0x00ce,
++	0x00be, 0x00ae, 0x009e, 0x001e, 0x000e, 0x0005, 0x00e6, 0x2071,
++	0x19c7, 0x7176, 0x727a, 0x7073, 0x0009, 0x00ee, 0x0005, 0x00e6,
++	0x0006, 0x2071, 0x19c7, 0x7078, 0x9206, 0x1110, 0x7076, 0x707a,
++	0x000e, 0x00ee, 0x0005, 0x2069, 0x1800, 0x69ec, 0xd1e4, 0x1518,
++	0x0026, 0xd1ec, 0x0140, 0x684c, 0x9082, 0x0200, 0x0288, 0x8117,
++	0x9294, 0x00c0, 0x0088, 0x9184, 0x0007, 0x01a0, 0x8109, 0x9184,
++	0x0007, 0x0110, 0x69ee, 0x0070, 0x8107, 0x9084, 0x0007, 0x910d,
++	0x8107, 0x9106, 0x9094, 0x00c0, 0x9184, 0xff3f, 0x9205, 0x68ee,
++	0x080c, 0x0e8d, 0x002e, 0x0005, 0x00c6, 0x2061, 0x1a3d, 0x00ce,
++	0x0005, 0x9184, 0x000f, 0x8003, 0x8003, 0x8003, 0x9080, 0x1a3d,
++	0x2060, 0x0005, 0xa884, 0x908a, 0x199a, 0x1638, 0x9005, 0x1150,
++	0x00c6, 0x2061, 0x1a3d, 0x6014, 0x00ce, 0x9005, 0x1130, 0x2001,
++	0x001e, 0x0018, 0x908e, 0xffff, 0x01b0, 0x8003, 0x800b, 0x810b,
++	0x9108, 0x611a, 0xa87c, 0x908c, 0x00c0, 0x918e, 0x00c0, 0x0904,
++	0x79b4, 0xd0b4, 0x1168, 0xd0bc, 0x1904, 0x798d, 0x2009, 0x0006,
++	0x080c, 0x79e1, 0x0005, 0x900e, 0x0c60, 0x2001, 0x1999, 0x08b0,
++	0xd0fc, 0x0160, 0x908c, 0x0003, 0x0120, 0x918e, 0x0003, 0x1904,
++	0x79db, 0x908c, 0x2020, 0x918e, 0x2020, 0x01a8, 0x6024, 0xd0d4,
++	0x11e8, 0x2009, 0x1874, 0x2104, 0xd084, 0x1138, 0x87ff, 0x1120,
++	0x2009, 0x0043, 0x0804, 0x95ce, 0x0005, 0x87ff, 0x1de8, 0x2009,
++	0x0042, 0x0804, 0x95ce, 0x6110, 0x00b6, 0x2158, 0xb900, 0x00be,
++	0xd1ac, 0x0d20, 0x6024, 0xc0cd, 0x6026, 0x0c00, 0xc0d4, 0x6026,
++	0xa890, 0x602e, 0xa88c, 0x6032, 0x08e0, 0xd0fc, 0x0160, 0x908c,
++	0x0003, 0x0120, 0x918e, 0x0003, 0x1904, 0x79db, 0x908c, 0x2020,
++	0x918e, 0x2020, 0x0170, 0x0076, 0x00f6, 0x2c78, 0x080c, 0x150d,
++	0x00fe, 0x007e, 0x87ff, 0x1120, 0x2009, 0x0042, 0x080c, 0x95ce,
++	0x0005, 0x6110, 0x00b6, 0x2158, 0xb900, 0x00be, 0xd1ac, 0x0d58,
++	0x6124, 0xc1cd, 0x6126, 0x0c38, 0xd0fc, 0x0188, 0x908c, 0x2020,
++	0x918e, 0x2020, 0x01a8, 0x9084, 0x0003, 0x908e, 0x0002, 0x0148,
++	0x87ff, 0x1120, 0x2009, 0x0041, 0x080c, 0x95ce, 0x0005, 0x00b9,
++	0x0ce8, 0x87ff, 0x1dd8, 0x2009, 0x0043, 0x080c, 0x95ce, 0x0cb0,
++	0x6110, 0x00b6, 0x2158, 0xb900, 0x00be, 0xd1ac, 0x0d20, 0x6124,
++	0xc1cd, 0x6126, 0x0c00, 0x2009, 0x0004, 0x0019, 0x0005, 0x2009,
++	0x0001, 0x0096, 0x080c, 0xb0ad, 0x0518, 0x6014, 0x2048, 0xa982,
++	0xa800, 0x6016, 0x9186, 0x0001, 0x1188, 0xa97c, 0x918c, 0x8100,
++	0x918e, 0x8100, 0x1158, 0x00c6, 0x2061, 0x1a3d, 0x6200, 0xd28c,
++	0x1120, 0x6204, 0x8210, 0x0208, 0x6206, 0x00ce, 0x080c, 0x5ff7,
++	0x6014, 0x904d, 0x0076, 0x2039, 0x0000, 0x190c, 0x792a, 0x007e,
++	0x009e, 0x0005, 0x0156, 0x00c6, 0x2061, 0x1a3d, 0x6000, 0x81ff,
++	0x0110, 0x9205, 0x0008, 0x9204, 0x6002, 0x00ce, 0x015e, 0x0005,
++	0x6800, 0xd08c, 0x1138, 0x6808, 0x9005, 0x0120, 0x8001, 0x680a,
++	0x9085, 0x0001, 0x0005, 0x0126, 0x2091, 0x8000, 0x0036, 0x0046,
++	0x20a9, 0x0010, 0x9006, 0x8004, 0x2019, 0x0100, 0x231c, 0x93a6,
++	0x0008, 0x1118, 0x8086, 0x818e, 0x0020, 0x80f6, 0x3e00, 0x81f6,
++	0x3e08, 0x1208, 0x9200, 0x1f04, 0x7a2c, 0x93a6, 0x0008, 0x1118,
++	0x8086, 0x818e, 0x0020, 0x80f6, 0x3e00, 0x81f6, 0x3e08, 0x004e,
++	0x003e, 0x012e, 0x0005, 0x0126, 0x2091, 0x8000, 0x0076, 0x0156,
++	0x20a9, 0x0010, 0x9005, 0x0510, 0x911a, 0x1600, 0x8213, 0x2039,
++	0x0100, 0x273c, 0x97be, 0x0008, 0x1110, 0x818d, 0x0010, 0x81f5,
++	0x3e08, 0x0228, 0x911a, 0x1220, 0x1f04, 0x7a56, 0x0028, 0x911a,
++	0x2308, 0x8210, 0x1f04, 0x7a56, 0x0006, 0x3200, 0x9084, 0xefff,
++	0x2080, 0x000e, 0x015e, 0x007e, 0x012e, 0x0005, 0x0006, 0x3200,
++	0x9085, 0x1000, 0x0ca8, 0x0126, 0x2091, 0x2800, 0x2079, 0x19b4,
++	0x012e, 0x00d6, 0x2069, 0x19b4, 0x6803, 0x0005, 0x0156, 0x0146,
++	0x01d6, 0x20e9, 0x0000, 0x2069, 0x0200, 0x080c, 0x9363, 0x0401,
++	0x080c, 0x934e, 0x00e9, 0x080c, 0x9351, 0x00d1, 0x080c, 0x9354,
++	0x00b9, 0x080c, 0x9357, 0x00a1, 0x080c, 0x935a, 0x0089, 0x080c,
++	0x935d, 0x0071, 0x080c, 0x9360, 0x0059, 0x01de, 0x014e, 0x015e,
++	0x2069, 0x0004, 0x2d04, 0x9085, 0x8001, 0x206a, 0x00de, 0x0005,
++	0x20a9, 0x0020, 0x20a1, 0x0240, 0x9006, 0x4004, 0x0005, 0x00c6,
++	0x6027, 0x0001, 0x7804, 0x9084, 0x0007, 0x0002, 0x7ac8, 0x7aec,
++	0x7b36, 0x7ace, 0x7aec, 0x7ac8, 0x7ac6, 0x7ac6, 0x080c, 0x0d84,
++	0x080c, 0x7893, 0x080c, 0x8125, 0x00ce, 0x0005, 0x62c0, 0x82ff,
++	0x1110, 0x00ce, 0x0005, 0x2011, 0x554d, 0x080c, 0x781a, 0x7828,
++	0x9092, 0x00c8, 0x1228, 0x8000, 0x782a, 0x080c, 0x558a, 0x0c88,
++	0x62c0, 0x080c, 0x9367, 0x080c, 0x554d, 0x7807, 0x0003, 0x7827,
++	0x0000, 0x782b, 0x0000, 0x0c28, 0x080c, 0x7893, 0x6220, 0xd2a4,
++	0x0178, 0x62c0, 0x82ff, 0x1160, 0x782b, 0x0000, 0x7824, 0x9065,
++	0x090c, 0x0d84, 0x2009, 0x0013, 0x080c, 0x95ce, 0x00ce, 0x0005,
++	0x00c6, 0x7824, 0x9065, 0x090c, 0x0d84, 0x7804, 0x9086, 0x0004,
++	0x0904, 0x7b74, 0x7828, 0x9092, 0xc350, 0x1230, 0x8000, 0x782a,
++	0x00ce, 0x080c, 0x8b2c, 0x0c50, 0x2011, 0x0130, 0x2214, 0x080c,
++	0x9367, 0x6104, 0x9186, 0x0003, 0x1188, 0x00e6, 0x2071, 0x1800,
++	0x70e4, 0x00ee, 0xd08c, 0x0150, 0x00c6, 0x00e6, 0x2061, 0x0100,
++	0x2071, 0x1800, 0x080c, 0x55a0, 0x00ee, 0x00ce, 0x080c, 0xcd1f,
++	0x2009, 0x0014, 0x080c, 0x95ce, 0x00ce, 0x0840, 0x2001, 0x19d0,
++	0x2003, 0x0000, 0x62c0, 0x82ff, 0x1160, 0x782b, 0x0000, 0x7824,
++	0x9065, 0x090c, 0x0d84, 0x2009, 0x0013, 0x080c, 0x9620, 0x00ce,
++	0x0005, 0x00b6, 0x00c6, 0x00d6, 0x7824, 0x9005, 0x090c, 0x0d84,
++	0x781c, 0x905d, 0x090c, 0x0d84, 0x080c, 0x9367, 0xb800, 0xc0dc,
++	0xb802, 0x7924, 0x2160, 0x080c, 0x9554, 0xb93c, 0x81ff, 0x090c,
++	0x0d84, 0x8109, 0xb93e, 0xb854, 0x9015, 0x0110, 0x7a1e, 0x0010,
++	0x7918, 0x791e, 0x7807, 0x0000, 0x7827, 0x0000, 0x00de, 0x00ce,
++	0x00be, 0x080c, 0x8125, 0x0898, 0x6104, 0x9186, 0x0002, 0x0128,
++	0x9186, 0x0004, 0x0110, 0x0804, 0x7b0a, 0x7808, 0x9c06, 0x0904,
++	0x7b0a, 0x080c, 0x8026, 0x080c, 0x7c1d, 0x00ce, 0x080c, 0x8125,
++	0x0804, 0x7afe, 0x00c6, 0x6024, 0x6027, 0x0002, 0xd0f4, 0x1580,
++	0x62c8, 0x60c4, 0x9205, 0x1170, 0x783c, 0x9065, 0x0130, 0x2009,
++	0x0049, 0x080c, 0x95ce, 0x00ce, 0x0005, 0x2011, 0x19d3, 0x2013,
++	0x0000, 0x0cc8, 0x793c, 0x81ff, 0x0dc0, 0x7944, 0x9192, 0x7530,
++	0x12f0, 0x8108, 0x7946, 0x793c, 0x9188, 0x0008, 0x210c, 0x918e,
++	0x0006, 0x1138, 0x6014, 0x9084, 0x1984, 0x9085, 0x0012, 0x6016,
++	0x0c10, 0x6014, 0x9084, 0x1984, 0x9085, 0x0016, 0x6016, 0x08d8,
++	0x793c, 0x2160, 0x2009, 0x004a, 0x080c, 0x95ce, 0x08a0, 0x7848,
++	0xc085, 0x784a, 0x0880, 0x0006, 0x0016, 0x00c6, 0x0126, 0x2091,
++	0x8000, 0x600f, 0x0000, 0x2c08, 0x2061, 0x19b4, 0x6020, 0x8000,
++	0x6022, 0x6010, 0x9005, 0x0148, 0x9080, 0x0003, 0x2102, 0x6112,
++	0x012e, 0x00ce, 0x001e, 0x000e, 0x0005, 0x6116, 0x6112, 0x0cc0,
++	0x00d6, 0x2069, 0x19b4, 0xb800, 0xd0d4, 0x01b8, 0x6820, 0x8000,
++	0x6822, 0x9086, 0x0001, 0x1110, 0x2b00, 0x681e, 0x2001, 0x180c,
++	0x2004, 0xd0fc, 0x0118, 0x00de, 0x0804, 0x8125, 0x6804, 0x9084,
++	0x0007, 0x0804, 0x813c, 0x00de, 0x0005, 0xc0d5, 0xb802, 0x6818,
++	0x9005, 0x0168, 0xb856, 0xb85b, 0x0000, 0x0086, 0x0006, 0x2b00,
++	0x681a, 0x008e, 0xa05a, 0x008e, 0x2069, 0x19b4, 0x08b8, 0xb856,
++	0xb85a, 0x2b00, 0x681a, 0x681e, 0x0888, 0x0006, 0x0016, 0x00c6,
++	0x0126, 0x2091, 0x8000, 0x600f, 0x0000, 0x2c08, 0x2061, 0x19b4,
++	0x6020, 0x8000, 0x6022, 0x6008, 0x9005, 0x0148, 0x9080, 0x0003,
++	0x2102, 0x610a, 0x012e, 0x00ce, 0x001e, 0x000e, 0x0005, 0x610e,
++	0x610a, 0x0cc0, 0x00c6, 0x600f, 0x0000, 0x2c08, 0x2061, 0x19b4,
++	0x6034, 0x9005, 0x0130, 0x9080, 0x0003, 0x2102, 0x6136, 0x00ce,
++	0x0005, 0x613a, 0x6136, 0x00ce, 0x0005, 0x00f6, 0x00e6, 0x00d6,
++	0x00c6, 0x00b6, 0x0096, 0x0076, 0x0066, 0x0056, 0x0036, 0x0026,
++	0x0016, 0x0006, 0x0126, 0x902e, 0x2071, 0x19b4, 0x7638, 0x2660,
++	0x2678, 0x2091, 0x8000, 0x8cff, 0x0904, 0x7cc4, 0x6010, 0x2058,
++	0xb8a0, 0x9206, 0x1904, 0x7cbf, 0x87ff, 0x0120, 0x6054, 0x9106,
++	0x1904, 0x7cbf, 0x703c, 0x9c06, 0x1178, 0x0036, 0x2019, 0x0001,
++	0x080c, 0x8dfe, 0x7033, 0x0000, 0x9006, 0x703e, 0x7042, 0x7046,
++	0x704a, 0x003e, 0x2029, 0x0001, 0x7038, 0x9c36, 0x1110, 0x660c,
++	0x763a, 0x7034, 0x9c36, 0x1140, 0x2c00, 0x9f36, 0x0118, 0x2f00,
++	0x7036, 0x0010, 0x7037, 0x0000, 0x660c, 0x0066, 0x2c00, 0x9f06,
++	0x0110, 0x7e0e, 0x0008, 0x2678, 0x600f, 0x0000, 0x080c, 0xb0ad,
++	0x01c8, 0x6014, 0x2048, 0x6020, 0x9086, 0x0003, 0x1590, 0xa867,
++	0x0103, 0xab7a, 0xa877, 0x0000, 0x0016, 0x0036, 0x0076, 0x080c,
++	0xb374, 0x080c, 0xcc6b, 0x080c, 0x61a9, 0x007e, 0x003e, 0x001e,
++	0x080c, 0xb278, 0x080c, 0x9584, 0x00ce, 0x0804, 0x7c63, 0x2c78,
++	0x600c, 0x2060, 0x0804, 0x7c63, 0x85ff, 0x0120, 0x0036, 0x080c,
++	0x820b, 0x003e, 0x012e, 0x000e, 0x001e, 0x002e, 0x003e, 0x005e,
++	0x006e, 0x007e, 0x009e, 0x00be, 0x00ce, 0x00de, 0x00ee, 0x00fe,
++	0x0005, 0x6020, 0x9086, 0x0006, 0x1158, 0x0016, 0x0036, 0x0076,
++	0x080c, 0xcc6b, 0x080c, 0xc970, 0x007e, 0x003e, 0x001e, 0x0890,
++	0x6020, 0x9086, 0x000a, 0x0904, 0x7ca9, 0x0804, 0x7ca7, 0x0006,
++	0x0066, 0x0096, 0x00c6, 0x00d6, 0x00f6, 0x9036, 0x0126, 0x2091,
++	0x8000, 0x2079, 0x19b4, 0x7838, 0x9065, 0x0904, 0x7d3f, 0x600c,
++	0x0006, 0x600f, 0x0000, 0x783c, 0x9c06, 0x1168, 0x0036, 0x2019,
++	0x0001, 0x080c, 0x8dfe, 0x7833, 0x0000, 0x901e, 0x7b3e, 0x7b42,
++	0x7b46, 0x7b4a, 0x003e, 0x080c, 0xb0ad, 0x0520, 0x6014, 0x2048,
++	0x6020, 0x9086, 0x0003, 0x1568, 0x3e08, 0x918e, 0x0002, 0x1188,
++	0x6010, 0x9005, 0x0170, 0x00b6, 0x2058, 0xb800, 0x00be, 0xd0bc,
++	0x0140, 0x6040, 0x9005, 0x1180, 0x2001, 0x1955, 0x2004, 0x6042,
++	0x0058, 0xa867, 0x0103, 0xab7a, 0xa877, 0x0000, 0x080c, 0x61a9,
++	0x080c, 0xb278, 0x080c, 0x9584, 0x000e, 0x0804, 0x7cfc, 0x7e3a,
++	0x7e36, 0x012e, 0x00fe, 0x00de, 0x00ce, 0x009e, 0x006e, 0x000e,
++	0x0005, 0x6020, 0x9086, 0x0006, 0x1118, 0x080c, 0xc970, 0x0c50,
++	0x6020, 0x9086, 0x000a, 0x09f8, 0x08e0, 0x0016, 0x0026, 0x0086,
++	0x9046, 0x0099, 0x080c, 0x7e2b, 0x008e, 0x002e, 0x001e, 0x0005,
++	0x00f6, 0x0126, 0x2079, 0x19b4, 0x2091, 0x8000, 0x080c, 0x7ec2,
++	0x080c, 0x7f3a, 0x012e, 0x00fe, 0x0005, 0x00b6, 0x0096, 0x00f6,
++	0x00e6, 0x00d6, 0x00c6, 0x0066, 0x0016, 0x0006, 0x0126, 0x2091,
++	0x8000, 0x2071, 0x19b4, 0x7614, 0x2660, 0x2678, 0x8cff, 0x0904,
++	0x7dfc, 0x6010, 0x2058, 0xb8a0, 0x9206, 0x1904, 0x7df7, 0x88ff,
++	0x0120, 0x6054, 0x9106, 0x1904, 0x7df7, 0x7024, 0x9c06, 0x1550,
++	0x2069, 0x0100, 0x68c0, 0x9005, 0x0508, 0x080c, 0x7893, 0x080c,
++	0x8b50, 0x68c3, 0x0000, 0x080c, 0x900f, 0x7027, 0x0000, 0x0036,
++	0x2069, 0x0140, 0x6b04, 0x9384, 0x1000, 0x0138, 0x2001, 0x0100,
++	0x080c, 0x28a5, 0x9006, 0x080c, 0x28a5, 0x2069, 0x0100, 0x6824,
++	0xd084, 0x0110, 0x6827, 0x0001, 0x003e, 0x0020, 0x6003, 0x0009,
++	0x630a, 0x04e8, 0x7014, 0x9c36, 0x1110, 0x660c, 0x7616, 0x7010,
++	0x9c36, 0x1140, 0x2c00, 0x9f36, 0x0118, 0x2f00, 0x7012, 0x0010,
++	0x7013, 0x0000, 0x660c, 0x0066, 0x2c00, 0x9f06, 0x0110, 0x7e0e,
++	0x0008, 0x2678, 0x600f, 0x0000, 0x6014, 0x2048, 0x080c, 0xb0ad,
++	0x01b8, 0x6020, 0x9086, 0x0003, 0x1550, 0xa867, 0x0103, 0xab7a,
++	0xa877, 0x0000, 0x0016, 0x0036, 0x0086, 0x080c, 0xb374, 0x080c,
++	0xcc6b, 0x080c, 0x61a9, 0x008e, 0x003e, 0x001e, 0x080c, 0xb278,
++	0x080c, 0x9584, 0x080c, 0x8eec, 0x00ce, 0x0804, 0x7d7e, 0x2c78,
++	0x600c, 0x2060, 0x0804, 0x7d7e, 0x012e, 0x000e, 0x001e, 0x006e,
++	0x00ce, 0x00de, 0x00ee, 0x00fe, 0x009e, 0x00be, 0x0005, 0x6020,
++	0x9086, 0x0006, 0x1158, 0x0016, 0x0036, 0x0086, 0x080c, 0xcc6b,
++	0x080c, 0xc970, 0x008e, 0x003e, 0x001e, 0x08d0, 0x080c, 0x9e99,
++	0x6020, 0x9086, 0x0002, 0x1130, 0x6004, 0x9086, 0x0085, 0x0904,
++	0x7ddd, 0x0870, 0x6020, 0x9086, 0x0005, 0x1950, 0x6004, 0x9086,
++	0x0085, 0x0d08, 0x0828, 0x00b6, 0x00a6, 0x0096, 0x00c6, 0x0006,
++	0x0126, 0x2091, 0x8000, 0x9280, 0x1000, 0x2004, 0x905d, 0x0904,
++	0x7ebb, 0x00f6, 0x00e6, 0x00d6, 0x0066, 0x2071, 0x19b4, 0xbe54,
++	0x7018, 0x9b06, 0x1108, 0x761a, 0x701c, 0x9b06, 0x1130, 0x86ff,
++	0x1118, 0x7018, 0x701e, 0x0008, 0x761e, 0xb858, 0x904d, 0x0108,
++	0xae56, 0x96d5, 0x0000, 0x0110, 0x2900, 0xb05a, 0xb857, 0x0000,
++	0xb85b, 0x0000, 0xb800, 0xc0d4, 0xc0dc, 0xb802, 0x080c, 0x5b43,
++	0x0904, 0x7eb7, 0x7624, 0x86ff, 0x0904, 0x7ea6, 0x9680, 0x0005,
++	0x2004, 0x9906, 0x15d8, 0x00d6, 0x2069, 0x0100, 0x68c0, 0x9005,
++	0x0560, 0x080c, 0x7893, 0x080c, 0x8b50, 0x68c3, 0x0000, 0x080c,
++	0x900f, 0x7027, 0x0000, 0x0036, 0x2069, 0x0140, 0x6b04, 0x9384,
++	0x1000, 0x0138, 0x2001, 0x0100, 0x080c, 0x28a5, 0x9006, 0x080c,
++	0x28a5, 0x2069, 0x0100, 0x6824, 0xd084, 0x0110, 0x6827, 0x0001,
++	0x003e, 0x00de, 0x00c6, 0xb83c, 0x9005, 0x0110, 0x8001, 0xb83e,
++	0x2660, 0x080c, 0x9584, 0x00ce, 0x0048, 0x00de, 0x00c6, 0x2660,
++	0x6003, 0x0009, 0x630a, 0x00ce, 0x0804, 0x7e5e, 0x89ff, 0x0158,
++	0xa867, 0x0103, 0xab7a, 0xa877, 0x0000, 0x080c, 0xb374, 0x080c,
++	0xcc6b, 0x080c, 0x61a9, 0x080c, 0x8eec, 0x0804, 0x7e5e, 0x006e,
++	0x00de, 0x00ee, 0x00fe, 0x012e, 0x000e, 0x00ce, 0x009e, 0x00ae,
++	0x00be, 0x0005, 0x0096, 0x0006, 0x0066, 0x00c6, 0x00d6, 0x9036,
++	0x7814, 0x9065, 0x0904, 0x7f17, 0x600c, 0x0006, 0x600f, 0x0000,
++	0x7824, 0x9c06, 0x1558, 0x2069, 0x0100, 0x68c0, 0x9005, 0x0508,
++	0x080c, 0x7893, 0x080c, 0x8b50, 0x68c3, 0x0000, 0x080c, 0x900f,
++	0x7827, 0x0000, 0x0036, 0x2069, 0x0140, 0x6b04, 0x9384, 0x1000,
++	0x0138, 0x2001, 0x0100, 0x080c, 0x28a5, 0x9006, 0x080c, 0x28a5,
++	0x2069, 0x0100, 0x6824, 0xd084, 0x0110, 0x6827, 0x0001, 0x003e,
++	0x0028, 0x6003, 0x0009, 0x630a, 0x2c30, 0x00b0, 0x6014, 0x2048,
++	0x080c, 0xb0ab, 0x0168, 0x6020, 0x9086, 0x0003, 0x11c0, 0xa867,
++	0x0103, 0xab7a, 0xa877, 0x0000, 0x080c, 0x61a9, 0x080c, 0xb278,
++	0x080c, 0x9584, 0x080c, 0x8eec, 0x000e, 0x0804, 0x7ec9, 0x7e16,
++	0x7e12, 0x00de, 0x00ce, 0x006e, 0x000e, 0x009e, 0x0005, 0x6020,
++	0x9086, 0x0006, 0x1118, 0x080c, 0xc970, 0x0c50, 0x080c, 0x9e99,
++	0x6020, 0x9086, 0x0002, 0x1128, 0x6004, 0x9086, 0x0085, 0x09b8,
++	0x08f8, 0x6020, 0x9086, 0x0005, 0x19d8, 0x6004, 0x9086, 0x0085,
++	0x0d50, 0x08b0, 0x0006, 0x0066, 0x0096, 0x00b6, 0x00c6, 0x00d6,
++	0x7818, 0x905d, 0x0904, 0x7fb7, 0xb854, 0x0006, 0x9006, 0xb856,
++	0xb85a, 0xb800, 0xc0d4, 0xc0dc, 0xb802, 0x080c, 0x5b43, 0x0904,
++	0x7fb4, 0x7e24, 0x86ff, 0x0904, 0x7fa7, 0x9680, 0x0005, 0x2004,
++	0x9906, 0x1904, 0x7fa7, 0x00d6, 0x2069, 0x0100, 0x68c0, 0x9005,
++	0x05e8, 0x080c, 0x7893, 0x080c, 0x8b50, 0x68c3, 0x0000, 0x080c,
++	0x900f, 0x7827, 0x0000, 0x0036, 0x2069, 0x0140, 0x6b04, 0x9384,
++	0x1000, 0x0138, 0x2001, 0x0100, 0x080c, 0x28a5, 0x9006, 0x080c,
++	0x28a5, 0x2069, 0x0100, 0x6824, 0xd084, 0x0110, 0x6827, 0x0001,
++	0x003e, 0x00de, 0x00c6, 0x3e08, 0x918e, 0x0002, 0x1168, 0xb800,
++	0xd0bc, 0x0150, 0x9680, 0x0010, 0x200c, 0x81ff, 0x1508, 0x2009,
++	0x1955, 0x210c, 0x2102, 0x00e0, 0xb83c, 0x9005, 0x0110, 0x8001,
++	0xb83e, 0x2660, 0x080c, 0x9584, 0x00ce, 0x0048, 0x00de, 0x00c6,
++	0x2660, 0x6003, 0x0009, 0x630a, 0x00ce, 0x0804, 0x7f4d, 0x89ff,
++	0x0138, 0xa867, 0x0103, 0xab7a, 0xa877, 0x0000, 0x080c, 0x61a9,
++	0x080c, 0x8eec, 0x0804, 0x7f4d, 0x000e, 0x0804, 0x7f41, 0x781e,
++	0x781a, 0x00de, 0x00ce, 0x00be, 0x009e, 0x006e, 0x000e, 0x0005,
++	0x00e6, 0x00d6, 0x0096, 0x0066, 0xb800, 0xd0dc, 0x01a0, 0xb84c,
++	0x904d, 0x0188, 0xa878, 0x9606, 0x1170, 0x2071, 0x19b4, 0x7024,
++	0x9035, 0x0148, 0x9080, 0x0005, 0x2004, 0x9906, 0x1120, 0xb800,
++	0xc0dc, 0xb802, 0x0029, 0x006e, 0x009e, 0x00de, 0x00ee, 0x0005,
++	0x00f6, 0x2079, 0x0100, 0x78c0, 0x9005, 0x1138, 0x00c6, 0x2660,
++	0x6003, 0x0009, 0x630a, 0x00ce, 0x04b8, 0x080c, 0x8b50, 0x78c3,
++	0x0000, 0x080c, 0x900f, 0x7027, 0x0000, 0x0036, 0x2079, 0x0140,
++	0x7b04, 0x9384, 0x1000, 0x0138, 0x2001, 0x0100, 0x080c, 0x28a5,
++	0x9006, 0x080c, 0x28a5, 0x2079, 0x0100, 0x7824, 0xd084, 0x0110,
++	0x7827, 0x0001, 0x080c, 0x900f, 0x003e, 0x080c, 0x5b43, 0x00c6,
++	0xb83c, 0x9005, 0x0110, 0x8001, 0xb83e, 0x2660, 0x080c, 0x9554,
++	0x00ce, 0xa867, 0x0103, 0xab7a, 0xa877, 0x0000, 0x080c, 0xb374,
++	0x080c, 0x61a9, 0x080c, 0x8eec, 0x00fe, 0x0005, 0x00b6, 0x00e6,
++	0x00c6, 0x2001, 0x180c, 0x2014, 0xc2e4, 0x2202, 0x2071, 0x19b4,
++	0x7004, 0x9084, 0x0007, 0x0002, 0x803e, 0x8042, 0x8059, 0x8082,
++	0x80c0, 0x803e, 0x8059, 0x803c, 0x080c, 0x0d84, 0x00ce, 0x00ee,
++	0x00be, 0x0005, 0x7024, 0x9065, 0x0148, 0x7020, 0x8001, 0x7022,
++	0x600c, 0x9015, 0x0158, 0x7216, 0x600f, 0x0000, 0x7007, 0x0000,
++	0x7027, 0x0000, 0x00ce, 0x00ee, 0x00be, 0x0005, 0x7216, 0x7212,
++	0x0ca8, 0x6010, 0x2058, 0x080c, 0x5b43, 0xb800, 0xc0dc, 0xb802,
++	0x7007, 0x0000, 0x7027, 0x0000, 0x7020, 0x8001, 0x7022, 0x1148,
++	0x2001, 0x180c, 0x2014, 0xd2ec, 0x1180, 0x00ce, 0x00ee, 0x00be,
++	0x0005, 0xb854, 0x9015, 0x0120, 0x721e, 0x080c, 0x8125, 0x0ca8,
++	0x7218, 0x721e, 0x080c, 0x8125, 0x0c80, 0xc2ec, 0x2202, 0x080c,
++	0x820b, 0x0c58, 0x7024, 0x9065, 0x05b8, 0x700c, 0x9c06, 0x1160,
++	0x080c, 0x8eec, 0x600c, 0x9015, 0x0120, 0x720e, 0x600f, 0x0000,
++	0x0448, 0x720e, 0x720a, 0x0430, 0x7014, 0x9c06, 0x1160, 0x080c,
++	0x8eec, 0x600c, 0x9015, 0x0120, 0x7216, 0x600f, 0x0000, 0x00d0,
++	0x7216, 0x7212, 0x00b8, 0x6020, 0x9086, 0x0003, 0x1198, 0x6010,
++	0x2058, 0x080c, 0x5b43, 0xb800, 0xc0dc, 0xb802, 0x080c, 0x8eec,
++	0x701c, 0x9065, 0x0138, 0xb854, 0x9015, 0x0110, 0x721e, 0x0010,
++	0x7218, 0x721e, 0x7027, 0x0000, 0x00ce, 0x00ee, 0x00be, 0x0005,
++	0x7024, 0x9065, 0x0140, 0x080c, 0x8eec, 0x600c, 0x9015, 0x0158,
++	0x720e, 0x600f, 0x0000, 0x080c, 0x900f, 0x7027, 0x0000, 0x00ce,
++	0x00ee, 0x00be, 0x0005, 0x720e, 0x720a, 0x0ca8, 0x00d6, 0x2069,
++	0x19b4, 0x6830, 0x9084, 0x0003, 0x0002, 0x80e3, 0x80e5, 0x8109,
++	0x80e1, 0x080c, 0x0d84, 0x00de, 0x0005, 0x00c6, 0x6840, 0x9086,
++	0x0001, 0x01b8, 0x683c, 0x9065, 0x0130, 0x600c, 0x9015, 0x0170,
++	0x6a3a, 0x600f, 0x0000, 0x6833, 0x0000, 0x683f, 0x0000, 0x2011,
++	0x19d3, 0x2013, 0x0000, 0x00ce, 0x00de, 0x0005, 0x683a, 0x6836,
++	0x0c90, 0x6843, 0x0000, 0x6838, 0x9065, 0x0d68, 0x6003, 0x0003,
++	0x0c50, 0x00c6, 0x9006, 0x6842, 0x6846, 0x684a, 0x683c, 0x9065,
++	0x0160, 0x600c, 0x9015, 0x0130, 0x6a3a, 0x600f, 0x0000, 0x683f,
++	0x0000, 0x0018, 0x683e, 0x683a, 0x6836, 0x00ce, 0x00de, 0x0005,
++	0xc1e5, 0x2001, 0x180c, 0x2102, 0x0005, 0x2001, 0x180c, 0x200c,
++	0xd1ec, 0x0138, 0xc1ec, 0x2102, 0x080c, 0x820b, 0x2001, 0x180c,
++	0x200c, 0x9184, 0x0600, 0x9086, 0x0600, 0x0d50, 0x00d6, 0x2069,
++	0x19b4, 0x6804, 0x9084, 0x0007, 0x0002, 0x8147, 0x81ea, 0x81ea,
++	0x81ea, 0x81ea, 0x81ec, 0x81ea, 0x8145, 0x080c, 0x0d84, 0x6820,
++	0x9005, 0x1110, 0x00de, 0x0005, 0x00c6, 0x680c, 0x9065, 0x0150,
++	0x6807, 0x0004, 0x6826, 0x682b, 0x0000, 0x080c, 0x8256, 0x00ce,
++	0x00de, 0x0005, 0x6814, 0x9065, 0x0150, 0x6807, 0x0001, 0x6826,
++	0x682b, 0x0000, 0x080c, 0x8256, 0x00ce, 0x00de, 0x0005, 0x00b6,
++	0x00e6, 0x6a1c, 0x92dd, 0x0000, 0x0904, 0x81d6, 0xb84c, 0x900d,
++	0x0118, 0xb888, 0x9005, 0x01a0, 0xb854, 0x905d, 0x0120, 0x920e,
++	0x0904, 0x81d6, 0x0028, 0x6818, 0x920e, 0x0904, 0x81d6, 0x2058,
++	0xb84c, 0x900d, 0x0d88, 0xb888, 0x9005, 0x1d70, 0x2b00, 0x681e,
++	0xbb3c, 0xb838, 0x9302, 0x1e40, 0x080c, 0x952b, 0x0904, 0x81d6,
++	0x8318, 0xbb3e, 0x6116, 0x2b10, 0x6212, 0x0096, 0x2148, 0xa880,
++	0x9084, 0x00ff, 0x605e, 0xa883, 0x0000, 0xa884, 0x009e, 0x908a,
++	0x199a, 0x0210, 0x2001, 0x1999, 0x8003, 0x801b, 0x831b, 0x9318,
++	0x631a, 0x6114, 0x0096, 0x2148, 0xa964, 0x009e, 0x918c, 0x00ff,
++	0x918e, 0x0048, 0x0538, 0x00f6, 0x2c78, 0x2061, 0x0100, 0xbab0,
++	0x629a, 0x2069, 0x0200, 0x2071, 0x0240, 0x080c, 0x8786, 0x2069,
++	0x19b4, 0xbb00, 0xc3dd, 0xbb02, 0x6807, 0x0002, 0x2f18, 0x6b26,
++	0x682b, 0x0000, 0x7823, 0x0003, 0x7803, 0x0001, 0x7807, 0x0040,
++	0x00fe, 0x00ee, 0x00be, 0x00ce, 0x00de, 0x0005, 0x00ee, 0x00be,
++	0x00ce, 0x0cd0, 0xbb00, 0xc3dd, 0xbb02, 0x6807, 0x0006, 0x2f18,
++	0x6b26, 0x682b, 0x0000, 0x080c, 0x9387, 0x00ee, 0x00be, 0x00ce,
++	0x00de, 0x0005, 0x00de, 0x0005, 0x00c6, 0x680c, 0x9065, 0x0138,
++	0x6807, 0x0004, 0x6826, 0x682b, 0x0000, 0x080c, 0x8256, 0x00ce,
++	0x00de, 0x0005, 0x2001, 0x180c, 0x2014, 0xc2ed, 0x2202, 0x00de,
++	0x00fe, 0x0005, 0x2001, 0x180c, 0x2014, 0xd2e4, 0x0120, 0xc2e4,
++	0x2202, 0x080c, 0x8136, 0x00f6, 0x00d6, 0x2069, 0x19b4, 0x6830,
++	0x9086, 0x0000, 0x11f0, 0x2001, 0x180c, 0x200c, 0xd1c4, 0x11e0,
++	0x6838, 0x907d, 0x01b0, 0x6a04, 0x9296, 0x0000, 0x1588, 0x6833,
++	0x0001, 0x683e, 0x6847, 0x0000, 0x684b, 0x0000, 0x0126, 0x00f6,
++	0x2091, 0x2400, 0x002e, 0x080c, 0x1933, 0x1178, 0x012e, 0x080c,
++	0x899e, 0x00de, 0x00fe, 0x0005, 0xc1c4, 0x2102, 0x0066, 0x2031,
++	0x0001, 0x080c, 0x691e, 0x006e, 0x08d8, 0x012e, 0x6843, 0x0000,
++	0x7803, 0x0002, 0x780c, 0x9015, 0x0140, 0x6a3a, 0x780f, 0x0000,
++	0x6833, 0x0000, 0x683f, 0x0000, 0x0c20, 0x683a, 0x6836, 0x0cc0,
++	0x6a04, 0x9296, 0x0006, 0x0958, 0x0804, 0x81fa, 0x6020, 0x9084,
++	0x000f, 0x000b, 0x0005, 0x826a, 0x826f, 0x86ca, 0x874f, 0x826f,
++	0x86ca, 0x874f, 0x826a, 0x826f, 0x826a, 0x826a, 0x826a, 0x826a,
++	0x826a, 0x826a, 0x080c, 0x8026, 0x080c, 0x8125, 0x0005, 0x00b6,
++	0x0156, 0x0136, 0x0146, 0x01c6, 0x01d6, 0x00c6, 0x00d6, 0x00e6,
++	0x00f6, 0x2069, 0x0200, 0x2071, 0x0240, 0x6004, 0x908a, 0x0053,
++	0x1a0c, 0x0d84, 0x6110, 0x2158, 0xb9b0, 0x2c78, 0x2061, 0x0100,
++	0x619a, 0x908a, 0x0040, 0x1a04, 0x82db, 0x005b, 0x00fe, 0x00ee,
++	0x00de, 0x00ce, 0x01de, 0x01ce, 0x014e, 0x013e, 0x015e, 0x00be,
++	0x0005, 0x8451, 0x848c, 0x84b5, 0x8559, 0x857b, 0x8581, 0x858e,
++	0x8596, 0x85a2, 0x85a8, 0x85b9, 0x85a8, 0x8611, 0x8596, 0x861d,
++	0x8623, 0x85a2, 0x8623, 0x862f, 0x82d9, 0x82d9, 0x82d9, 0x82d9,
++	0x82d9, 0x82d9, 0x82d9, 0x82d9, 0x82d9, 0x82d9, 0x82d9, 0x8c9a,
++	0x8cb0, 0x8cba, 0x8cda, 0x8d0c, 0x858e, 0x82d9, 0x858e, 0x85a8,
++	0x82d9, 0x84b5, 0x8559, 0x82d9, 0x90fc, 0x85a8, 0x82d9, 0x9118,
++	0x85a8, 0x82d9, 0x85a2, 0x844b, 0x82fc, 0x82d9, 0x912e, 0x919a,
++	0x9271, 0x82d9, 0x927e, 0x858b, 0x92a9, 0x82d9, 0x8d16, 0x92d6,
++	0x82d9, 0x080c, 0x0d84, 0x2100, 0x005b, 0x00fe, 0x00ee, 0x00de,
++	0x00ce, 0x01de, 0x01ce, 0x014e, 0x013e, 0x015e, 0x00be, 0x0005,
++	0x82fa, 0x82fa, 0x82fa, 0x8322, 0x83ce, 0x83d9, 0x82fa, 0x82fa,
++	0x82fa, 0x8420, 0x842c, 0x833d, 0x82fa, 0x8358, 0x838c, 0x9447,
++	0x948c, 0x85a8, 0x080c, 0x0d84, 0x00d6, 0x0096, 0x080c, 0x8642,
++	0x7003, 0x2414, 0x7007, 0x0018, 0x700b, 0x0800, 0x7814, 0x2048,
++	0xa83c, 0x700e, 0xa850, 0x7022, 0xa854, 0x7026, 0x60c3, 0x0018,
++	0x080c, 0x8b24, 0x009e, 0x00de, 0x0005, 0x7810, 0x00b6, 0x2058,
++	0xb8a0, 0x00be, 0x080c, 0x94d3, 0x1110, 0xd0bc, 0x0110, 0x9085,
++	0x0001, 0x0005, 0x00d6, 0x0096, 0x080c, 0x8642, 0x7003, 0x0500,
++	0x7814, 0x2048, 0xa874, 0x700a, 0xa878, 0x700e, 0xa87c, 0x7012,
++	0xa880, 0x7016, 0xa884, 0x701a, 0xa888, 0x701e, 0x60c3, 0x0010,
++	0x080c, 0x8b24, 0x009e, 0x00de, 0x0005, 0x00d6, 0x0096, 0x080c,
++	0x8642, 0x7003, 0x0500, 0x7814, 0x2048, 0xa8cc, 0x700a, 0xa8d0,
++	0x700e, 0xa8d4, 0x7012, 0xa8d8, 0x7016, 0xa8dc, 0x701a, 0xa8e0,
++	0x701e, 0x60c3, 0x0010, 0x080c, 0x8b24, 0x009e, 0x00de, 0x0005,
++	0x00d6, 0x0096, 0x0126, 0x2091, 0x8000, 0x080c, 0x8642, 0x20e9,
++	0x0000, 0x2001, 0x1970, 0x2003, 0x0000, 0x7814, 0x2048, 0xa814,
++	0x8003, 0x60c2, 0xa830, 0x20a8, 0xa860, 0x20e0, 0xa85c, 0x9080,
++	0x001b, 0x2098, 0x2001, 0x1970, 0x0016, 0x200c, 0x2001, 0x0001,
++	0x080c, 0x1ff9, 0x080c, 0xbd44, 0x9006, 0x080c, 0x1ff9, 0x001e,
++	0xa804, 0x9005, 0x0110, 0x2048, 0x0c28, 0x04d9, 0x080c, 0x8b24,
++	0x012e, 0x009e, 0x00de, 0x0005, 0x00d6, 0x0096, 0x0126, 0x2091,
++	0x8000, 0x080c, 0x868d, 0x20e9, 0x0000, 0x2001, 0x1970, 0x2003,
++	0x0000, 0x7814, 0x2048, 0xa86f, 0x0200, 0xa873, 0x0000, 0xa814,
++	0x8003, 0x60c2, 0xa830, 0x20a8, 0xa860, 0x20e0, 0xa85c, 0x9080,
++	0x001b, 0x2098, 0x2001, 0x1970, 0x0016, 0x200c, 0x080c, 0xbd44,
++	0x001e, 0xa804, 0x9005, 0x0110, 0x2048, 0x0c60, 0x0051, 0x7814,
++	0x2048, 0x080c, 0x0f60, 0x080c, 0x8b24, 0x012e, 0x009e, 0x00de,
++	0x0005, 0x60c0, 0x8004, 0x9084, 0x0003, 0x9005, 0x0130, 0x9082,
++	0x0004, 0x20a3, 0x0000, 0x8000, 0x1de0, 0x0005, 0x080c, 0x8642,
++	0x7003, 0x7800, 0x7808, 0x8007, 0x700a, 0x60c3, 0x0008, 0x0804,
++	0x8b24, 0x00d6, 0x00e6, 0x080c, 0x868d, 0x7814, 0x9084, 0xff00,
++	0x2073, 0x0200, 0x8e70, 0x8e70, 0x9095, 0x0010, 0x2272, 0x8e70,
++	0x2073, 0x0034, 0x8e70, 0x2069, 0x1805, 0x20a9, 0x0004, 0x2d76,
++	0x8d68, 0x8e70, 0x1f04, 0x83ef, 0x2069, 0x1801, 0x20a9, 0x0004,
++	0x2d76, 0x8d68, 0x8e70, 0x1f04, 0x83f8, 0x2069, 0x1980, 0x9086,
++	0xdf00, 0x0110, 0x2069, 0x199a, 0x20a9, 0x001a, 0x9e86, 0x0260,
++	0x1148, 0x00c6, 0x2061, 0x0200, 0x6010, 0x8000, 0x6012, 0x00ce,
++	0x2071, 0x0240, 0x2d04, 0x8007, 0x2072, 0x8d68, 0x8e70, 0x1f04,
++	0x8406, 0x60c3, 0x004c, 0x080c, 0x8b24, 0x00ee, 0x00de, 0x0005,
++	0x080c, 0x8642, 0x7003, 0x6300, 0x7007, 0x0028, 0x7808, 0x700e,
++	0x60c3, 0x0008, 0x0804, 0x8b24, 0x00d6, 0x0026, 0x0016, 0x080c,
++	0x868d, 0x7003, 0x0200, 0x7814, 0x700e, 0x00e6, 0x9ef0, 0x0004,
++	0x2009, 0x0001, 0x2011, 0x000c, 0x2073, 0x0800, 0x8e70, 0x2073,
++	0x0000, 0x00ee, 0x7206, 0x710a, 0x62c2, 0x080c, 0x8b24, 0x001e,
++	0x002e, 0x00de, 0x0005, 0x2001, 0x1816, 0x2004, 0x609a, 0x0804,
++	0x8b24, 0x080c, 0x8642, 0x7003, 0x5200, 0x2069, 0x1852, 0x6804,
++	0xd084, 0x0130, 0x6828, 0x0016, 0x080c, 0x2430, 0x710e, 0x001e,
++	0x20a9, 0x0004, 0x20e1, 0x0001, 0x2099, 0x1805, 0x20e9, 0x0000,
++	0x20a1, 0x0250, 0x4003, 0x20a9, 0x0004, 0x2099, 0x1801, 0x20a1,
++	0x0254, 0x4003, 0x080c, 0x94d3, 0x1120, 0xb8a0, 0x9082, 0x007f,
++	0x0248, 0x2001, 0x181d, 0x2004, 0x7032, 0x2001, 0x181e, 0x2004,
++	0x7036, 0x0030, 0x2001, 0x1816, 0x2004, 0x9084, 0x00ff, 0x7036,
++	0x60c3, 0x001c, 0x0804, 0x8b24, 0x080c, 0x8642, 0x7003, 0x0500,
++	0x080c, 0x94d3, 0x1120, 0xb8a0, 0x9082, 0x007f, 0x0248, 0x2001,
++	0x181d, 0x2004, 0x700a, 0x2001, 0x181e, 0x2004, 0x700e, 0x0030,
++	0x2001, 0x1816, 0x2004, 0x9084, 0x00ff, 0x700e, 0x20a9, 0x0004,
++	0x20e1, 0x0001, 0x2099, 0x1805, 0x20e9, 0x0000, 0x20a1, 0x0250,
++	0x4003, 0x60c3, 0x0010, 0x0804, 0x8b24, 0x080c, 0x8642, 0x9006,
++	0x080c, 0x5ef7, 0xb8a0, 0x9086, 0x007e, 0x1130, 0x7003, 0x0400,
++	0x620c, 0xc2b4, 0x620e, 0x0058, 0x7814, 0x0096, 0x904d, 0x0120,
++	0x9006, 0xa89a, 0xa8a6, 0xa8aa, 0x009e, 0x7003, 0x0300, 0xb8a0,
++	0x9086, 0x007e, 0x1904, 0x8520, 0x00d6, 0x2069, 0x193b, 0x2001,
++	0x1836, 0x2004, 0xd0a4, 0x0178, 0x6800, 0x700a, 0x6808, 0x9084,
++	0x2000, 0x7012, 0x680c, 0x7016, 0x701f, 0x2710, 0x6818, 0x7022,
++	0x681c, 0x7026, 0x0080, 0x6800, 0x700a, 0x6804, 0x700e, 0x6808,
++	0x080c, 0x6877, 0x1118, 0x9084, 0x37ff, 0x0010, 0x9084, 0x3fff,
++	0x7012, 0x680c, 0x7016, 0x00de, 0x20a9, 0x0004, 0x20e1, 0x0001,
++	0x2099, 0x1805, 0x20e9, 0x0000, 0x20a1, 0x0256, 0x4003, 0x20a9,
++	0x0004, 0x2099, 0x1801, 0x20a1, 0x025a, 0x4003, 0x00d6, 0x080c,
++	0x934e, 0x2069, 0x1943, 0x2071, 0x024e, 0x6800, 0xc0dd, 0x7002,
++	0x080c, 0x4dee, 0xd0e4, 0x0110, 0x680c, 0x700e, 0x00de, 0x04a8,
++	0x2001, 0x1836, 0x2004, 0xd0a4, 0x0170, 0x0016, 0x2001, 0x193c,
++	0x200c, 0x60e0, 0x9106, 0x0130, 0x2100, 0x60e3, 0x0000, 0x080c,
++	0x2471, 0x61e2, 0x001e, 0x20e1, 0x0001, 0x2099, 0x193b, 0x20e9,
++	0x0000, 0x20a1, 0x024e, 0x20a9, 0x0008, 0x4003, 0x20a9, 0x0004,
++	0x2099, 0x1805, 0x20a1, 0x0256, 0x4003, 0x20a9, 0x0004, 0x2099,
++	0x1801, 0x20a1, 0x025a, 0x4003, 0x080c, 0x934e, 0x20a1, 0x024e,
++	0x20a9, 0x0008, 0x2099, 0x1943, 0x4003, 0x60c3, 0x0074, 0x0804,
++	0x8b24, 0x080c, 0x8642, 0x7003, 0x2010, 0x7007, 0x0014, 0x700b,
++	0x0800, 0x700f, 0x2000, 0x9006, 0x00f6, 0x2079, 0x1852, 0x7904,
++	0x00fe, 0xd1ac, 0x1110, 0x9085, 0x0020, 0xd1a4, 0x0110, 0x9085,
++	0x0010, 0x9085, 0x0002, 0x00d6, 0x0804, 0x85f2, 0x7026, 0x60c3,
++	0x0014, 0x0804, 0x8b24, 0x080c, 0x8642, 0x7003, 0x5000, 0x0804,
++	0x84cf, 0x080c, 0x8642, 0x7003, 0x2110, 0x7007, 0x0014, 0x60c3,
++	0x0014, 0x0804, 0x8b24, 0x080c, 0x8684, 0x0010, 0x080c, 0x868d,
++	0x7003, 0x0200, 0x60c3, 0x0004, 0x0804, 0x8b24, 0x080c, 0x868d,
++	0x7003, 0x0100, 0x700b, 0x0003, 0x700f, 0x2a00, 0x60c3, 0x0008,
++	0x0804, 0x8b24, 0x080c, 0x868d, 0x7003, 0x0200, 0x0804, 0x84cf,
++	0x080c, 0x868d, 0x7003, 0x0100, 0x782c, 0x9005, 0x0110, 0x700a,
++	0x0010, 0x700b, 0x0003, 0x7814, 0x700e, 0x60c3, 0x0008, 0x0804,
++	0x8b24, 0x00d6, 0x080c, 0x868d, 0x7003, 0x0210, 0x7007, 0x0014,
++	0x700b, 0x0800, 0xb894, 0x9086, 0x0014, 0x1198, 0xb99c, 0x9184,
++	0x0030, 0x0190, 0xb998, 0x9184, 0xc000, 0x1140, 0xd1ec, 0x0118,
++	0x700f, 0x2100, 0x0058, 0x700f, 0x0100, 0x0040, 0x700f, 0x0400,
++	0x0028, 0x700f, 0x0700, 0x0010, 0x700f, 0x0800, 0x00f6, 0x2079,
++	0x1852, 0x7904, 0x00fe, 0xd1ac, 0x1110, 0x9085, 0x0020, 0xd1a4,
++	0x0110, 0x9085, 0x0010, 0x2009, 0x1874, 0x210c, 0xd184, 0x1110,
++	0x9085, 0x0002, 0x0026, 0x2009, 0x1872, 0x210c, 0xd1e4, 0x0150,
++	0xc0c5, 0xbabc, 0xd28c, 0x1108, 0xc0cd, 0x9094, 0x0030, 0x9296,
++	0x0010, 0x0140, 0xd1ec, 0x0130, 0x9094, 0x0030, 0x9296, 0x0010,
++	0x0108, 0xc0bd, 0x002e, 0x7026, 0x60c3, 0x0014, 0x00de, 0x0804,
++	0x8b24, 0x080c, 0x868d, 0x7003, 0x0210, 0x7007, 0x0014, 0x700f,
++	0x0100, 0x60c3, 0x0014, 0x0804, 0x8b24, 0x080c, 0x868d, 0x7003,
++	0x0200, 0x0804, 0x8455, 0x080c, 0x868d, 0x7003, 0x0100, 0x700b,
++	0x0003, 0x700f, 0x2a00, 0x60c3, 0x0008, 0x0804, 0x8b24, 0x080c,
++	0x868d, 0x7003, 0x0100, 0x700b, 0x000b, 0x60c3, 0x0008, 0x0804,
++	0x8b24, 0x0026, 0x00d6, 0x0036, 0x0046, 0x2019, 0x3200, 0x2021,
++	0x0800, 0x0040, 0x0026, 0x00d6, 0x0036, 0x0046, 0x2019, 0x2200,
++	0x2021, 0x0100, 0x080c, 0x9363, 0xb810, 0x9305, 0x7002, 0xb814,
++	0x7006, 0x2069, 0x1800, 0x6874, 0x700a, 0x6878, 0x700e, 0x9485,
++	0x0029, 0x7012, 0x004e, 0x003e, 0x00de, 0x080c, 0x8b12, 0x721a,
++	0x9f95, 0x0000, 0x7222, 0x7027, 0xffff, 0x2071, 0x024c, 0x002e,
++	0x0005, 0x0026, 0x080c, 0x9363, 0x7003, 0x02ff, 0x7007, 0xfffc,
++	0x00d6, 0x2069, 0x1800, 0x6874, 0x700a, 0x6878, 0x700e, 0x00de,
++	0x7013, 0x2029, 0x0c10, 0x7003, 0x0100, 0x7007, 0x0000, 0x700b,
++	0xfc02, 0x700f, 0x0000, 0x0005, 0x0026, 0x00d6, 0x0036, 0x0046,
++	0x2019, 0x3300, 0x2021, 0x0800, 0x0040, 0x0026, 0x00d6, 0x0036,
++	0x0046, 0x2019, 0x2300, 0x2021, 0x0100, 0x080c, 0x9363, 0xb810,
++	0x9305, 0x7002, 0xb814, 0x7006, 0x2069, 0x1800, 0xb810, 0x9005,
++	0x1140, 0xb814, 0x9005, 0x1128, 0x700b, 0x00ff, 0x700f, 0xfffe,
++	0x0020, 0x6874, 0x700a, 0x6878, 0x700e, 0x0000, 0x9485, 0x0098,
++	0x7012, 0x004e, 0x003e, 0x00de, 0x080c, 0x8b12, 0x721a, 0x7a08,
++	0x7222, 0x2f10, 0x7226, 0x2071, 0x024c, 0x002e, 0x0005, 0x080c,
++	0x8b12, 0x721a, 0x7a08, 0x7222, 0x7814, 0x7026, 0x2071, 0x024c,
++	0x002e, 0x0005, 0x00b6, 0x00c6, 0x00d6, 0x00e6, 0x00f6, 0x2069,
++	0x0200, 0x2071, 0x0240, 0x6004, 0x908a, 0x0085, 0x0a0c, 0x0d84,
++	0x908a, 0x0092, 0x1a0c, 0x0d84, 0x6110, 0x2158, 0xb9b0, 0x2c78,
++	0x2061, 0x0100, 0x619a, 0x9082, 0x0085, 0x0033, 0x00fe, 0x00ee,
++	0x00de, 0x00ce, 0x00be, 0x0005, 0x86fb, 0x8700, 0x870b, 0x86f9,
++	0x86f9, 0x86f9, 0x86fb, 0x86f9, 0x86f9, 0x86f9, 0x86f9, 0x86f9,
++	0x86f9, 0x080c, 0x0d84, 0x00c1, 0x60c3, 0x0000, 0x0804, 0x8b24,
++	0x0431, 0x7808, 0x700a, 0x7814, 0x700e, 0x7017, 0xffff, 0x60c3,
++	0x000c, 0x0804, 0x8b24, 0x0479, 0x7003, 0x0003, 0x7007, 0x0300,
++	0x60c3, 0x0004, 0x0804, 0x8b24, 0x0026, 0x080c, 0x9363, 0xb810,
++	0x9085, 0x8100, 0x7002, 0xb814, 0x7006, 0x2069, 0x1800, 0x6874,
++	0x700a, 0x6878, 0x700e, 0x7013, 0x0009, 0x0804, 0x865d, 0x0026,
++	0x080c, 0x9363, 0xb810, 0x9085, 0x8400, 0x7002, 0xb814, 0x7006,
++	0x2069, 0x1800, 0x6874, 0x700a, 0x6878, 0x700e, 0x2001, 0x0099,
++	0x7012, 0x0804, 0x86bf, 0x0026, 0x080c, 0x9363, 0xb810, 0x9085,
++	0x8500, 0x7002, 0xb814, 0x7006, 0x2069, 0x1800, 0x6874, 0x700a,
++	0x6878, 0x700e, 0x2001, 0x0099, 0x7012, 0x0804, 0x86bf, 0x00b6,
++	0x00c6, 0x00d6, 0x00e6, 0x00f6, 0x2c78, 0x2069, 0x0200, 0x2071,
++	0x0240, 0x7804, 0x908a, 0x0040, 0x0a0c, 0x0d84, 0x908a, 0x0054,
++	0x1a0c, 0x0d84, 0x7910, 0x2158, 0xb9b0, 0x2061, 0x0100, 0x619a,
++	0x9082, 0x0040, 0x0033, 0x00fe, 0x00ee, 0x00de, 0x00ce, 0x00be,
++	0x0005, 0x8786, 0x882d, 0x8800, 0x894f, 0x8784, 0x8784, 0x8784,
++	0x8784, 0x8784, 0x8784, 0x8784, 0x8eb9, 0x8ec5, 0x8ed1, 0x8edd,
++	0x8784, 0x92b5, 0x8784, 0x8ead, 0x080c, 0x0d84, 0x0096, 0x780b,
++	0xffff, 0x080c, 0x87dc, 0x7914, 0x2148, 0xa978, 0x7956, 0x7132,
++	0xa97c, 0x9184, 0x000f, 0x1118, 0x2001, 0x0005, 0x0040, 0xd184,
++	0x0118, 0x2001, 0x0004, 0x0018, 0x9084, 0x0006, 0x8004, 0x2010,
++	0x785c, 0x9084, 0x00ff, 0x8007, 0x9205, 0x7042, 0xd1ac, 0x0128,
++	0x7047, 0x0002, 0x080c, 0x150d, 0x0050, 0xd1b4, 0x0118, 0x7047,
++	0x0001, 0x0028, 0x7047, 0x0000, 0x9016, 0x2230, 0x0010, 0xaab0,
++	0xaeac, 0x726a, 0x766e, 0x20a9, 0x0008, 0x20e9, 0x0000, 0xa860,
++	0x20e0, 0xa85c, 0x9080, 0x0023, 0x2098, 0x20a1, 0x0252, 0x2069,
++	0x0200, 0x6813, 0x0018, 0x4003, 0x6813, 0x0008, 0x60c3, 0x0020,
++	0x6017, 0x0009, 0x2001, 0x19d0, 0x2003, 0x07d0, 0x2001, 0x19cf,
++	0x2003, 0x0009, 0x009e, 0x0005, 0x6813, 0x0008, 0xba8c, 0x8210,
++	0xb8bc, 0xd084, 0x0128, 0x7a46, 0x7b14, 0x7b4a, 0x722e, 0x732a,
++	0x9294, 0x00ff, 0xba8e, 0x8217, 0x721a, 0xba10, 0x9295, 0x0600,
++	0x7202, 0xba14, 0x7206, 0x2069, 0x1800, 0x6a74, 0x720a, 0x6a78,
++	0x720e, 0x7013, 0x0829, 0x2f10, 0x7222, 0x7027, 0xffff, 0x0005,
++	0x00d6, 0x0096, 0x0081, 0x7814, 0x2048, 0xa890, 0x7002, 0xa88c,
++	0x7006, 0xa8b0, 0x700a, 0xa8ac, 0x700e, 0x60c3, 0x000c, 0x009e,
++	0x00de, 0x0804, 0x8b24, 0x6813, 0x0008, 0xb810, 0x9085, 0x0500,
++	0x7002, 0xb814, 0x7006, 0x2069, 0x1800, 0x6874, 0x700a, 0x6878,
++	0x700e, 0x7013, 0x0889, 0x080c, 0x8b12, 0x721a, 0x7a08, 0x7222,
++	0x2f10, 0x7226, 0x2071, 0x024c, 0x0005, 0x00d6, 0x0096, 0x080c,
++	0x892d, 0x7814, 0x2048, 0x080c, 0xb0ab, 0x1130, 0x7814, 0x9084,
++	0x0700, 0x8007, 0x0033, 0x0010, 0x9006, 0x001b, 0x009e, 0x00de,
++	0x0005, 0x884b, 0x88b4, 0x88c4, 0x88ea, 0x88f6, 0x8907, 0x890f,
++	0x8849, 0x080c, 0x0d84, 0x0016, 0x0036, 0xa97c, 0x918c, 0x0003,
++	0x0118, 0x9186, 0x0003, 0x1198, 0xaba8, 0x7824, 0xd0cc, 0x1168,
++	0x7316, 0xa898, 0x701a, 0xa894, 0x701e, 0x003e, 0x001e, 0x2001,
++	0x197e, 0x2004, 0x60c2, 0x0804, 0x8b24, 0xc3e5, 0x0c88, 0x9186,
++	0x0001, 0x190c, 0x0d84, 0xaba8, 0x7824, 0xd0cc, 0x1904, 0x88b1,
++	0x7316, 0xa898, 0x701a, 0xa894, 0x701e, 0xa8a4, 0x7026, 0xa8ac,
++	0x702e, 0x2009, 0x0018, 0x9384, 0x0300, 0x0570, 0xd3c4, 0x0110,
++	0xa8ac, 0x9108, 0xd3cc, 0x0110, 0xa8a4, 0x9108, 0x6810, 0x9085,
++	0x0010, 0x6812, 0x2011, 0x0258, 0x20e9, 0x0000, 0x22a0, 0x0156,
++	0x20a9, 0x0008, 0xa860, 0x20e0, 0xa85c, 0x9080, 0x002c, 0x2098,
++	0x4003, 0x6810, 0x8000, 0x6812, 0x2011, 0x0240, 0x22a0, 0x20a9,
++	0x0005, 0x4003, 0x6810, 0xc084, 0x6812, 0x015e, 0x9184, 0x0003,
++	0x0118, 0x2019, 0x0245, 0x201a, 0x61c2, 0x003e, 0x001e, 0x0804,
++	0x8b24, 0xc3e5, 0x0804, 0x8870, 0x2011, 0x0008, 0x2001, 0x180e,
++	0x2004, 0xd0a4, 0x0110, 0x2011, 0x0028, 0x7824, 0xd0cc, 0x1110,
++	0x7216, 0x0470, 0x0ce8, 0xc2e5, 0x2011, 0x0302, 0x0016, 0x782c,
++	0x701a, 0x7930, 0x711e, 0x9105, 0x0108, 0xc2dd, 0x001e, 0x7824,
++	0xd0cc, 0x0108, 0xc2e5, 0x7216, 0x7027, 0x0012, 0x702f, 0x0008,
++	0x7043, 0x7000, 0x7047, 0x0500, 0x704f, 0x000a, 0x2069, 0x0200,
++	0x6813, 0x0009, 0x2071, 0x0240, 0x700b, 0x2500, 0x60c3, 0x0032,
++	0x0804, 0x8b24, 0x2011, 0x0028, 0x7824, 0xd0cc, 0x1128, 0x7216,
++	0x60c3, 0x0018, 0x0804, 0x8b24, 0x0cd0, 0xc2e5, 0x2011, 0x0100,
++	0x7824, 0xd0cc, 0x0108, 0xc2e5, 0x7216, 0x702f, 0x0008, 0x7858,
++	0x9084, 0x00ff, 0x7036, 0x60c3, 0x0020, 0x0804, 0x8b24, 0x2011,
++	0x0008, 0x7824, 0xd0cc, 0x0108, 0xc2e5, 0x7216, 0x0c08, 0x0036,
++	0x7b14, 0x9384, 0xff00, 0x7816, 0x9384, 0x00ff, 0x8001, 0x1138,
++	0x7824, 0xd0cc, 0x0108, 0xc2e5, 0x7216, 0x003e, 0x0888, 0x0046,
++	0x2021, 0x0800, 0x0006, 0x7824, 0xd0cc, 0x000e, 0x0108, 0xc4e5,
++	0x7416, 0x004e, 0x701e, 0x003e, 0x0818, 0x00d6, 0x6813, 0x0008,
++	0xb810, 0x9085, 0x0700, 0x7002, 0xb814, 0x7006, 0x2069, 0x1800,
++	0x6874, 0x700a, 0x6878, 0x700e, 0x7824, 0xd0cc, 0x1168, 0x7013,
++	0x0898, 0x080c, 0x8b12, 0x721a, 0x7a08, 0x7222, 0x2f10, 0x7226,
++	0x2071, 0x024c, 0x00de, 0x0005, 0x7013, 0x0889, 0x0c90, 0x0016,
++	0x7814, 0x9084, 0x0700, 0x8007, 0x0013, 0x001e, 0x0005, 0x895f,
++	0x895f, 0x8961, 0x895f, 0x895f, 0x895f, 0x897b, 0x895f, 0x080c,
++	0x0d84, 0x7914, 0x918c, 0x08ff, 0x918d, 0xf600, 0x7916, 0x2009,
++	0x0003, 0x00b9, 0x2069, 0x1852, 0x6804, 0xd0bc, 0x0130, 0x682c,
++	0x9084, 0x00ff, 0x8007, 0x7032, 0x0010, 0x7033, 0x3f00, 0x60c3,
++	0x0001, 0x0804, 0x8b24, 0x2009, 0x0003, 0x0019, 0x7033, 0x7f00,
++	0x0cb0, 0x0016, 0x080c, 0x9363, 0x001e, 0xb810, 0x9085, 0x0100,
++	0x7002, 0xb814, 0x7006, 0x2069, 0x1800, 0x6a74, 0x720a, 0x6a78,
++	0x720e, 0x7013, 0x0888, 0x918d, 0x0008, 0x7116, 0x080c, 0x8b12,
++	0x721a, 0x7a08, 0x7222, 0x2f10, 0x7226, 0x0005, 0x00b6, 0x0096,
++	0x00e6, 0x00d6, 0x00c6, 0x0056, 0x0046, 0x0036, 0x2061, 0x0100,
++	0x2071, 0x1800, 0x7158, 0x7810, 0x2058, 0xb8a0, 0x2028, 0xb910,
++	0xba14, 0x7374, 0x7478, 0x7820, 0x90be, 0x0006, 0x0904, 0x8a81,
++	0x90be, 0x000a, 0x1904, 0x8a3d, 0x609f, 0x0000, 0x7814, 0x2048,
++	0xa87c, 0xd0fc, 0x05c8, 0xaf90, 0x9784, 0xff00, 0x9105, 0x6062,
++	0x873f, 0x9784, 0xff00, 0x0006, 0x7814, 0x2048, 0xa878, 0x9005,
++	0x000e, 0x1160, 0xaf94, 0x87ff, 0x0510, 0x2039, 0x0098, 0x9705,
++	0x6072, 0x7808, 0x6082, 0x2f00, 0x6086, 0x0038, 0x9185, 0x2200,
++	0x6062, 0x6073, 0x0129, 0x6077, 0x0000, 0x609f, 0x0000, 0x2001,
++	0x1836, 0x2004, 0xd0ac, 0x11a8, 0xd09c, 0x0130, 0x7814, 0x2048,
++	0xa874, 0x9082, 0x0080, 0x1268, 0xb814, 0x609e, 0x0050, 0x2039,
++	0x0029, 0x9705, 0x6072, 0x0c48, 0x9185, 0x0200, 0x6062, 0x6073,
++	0x2029, 0xa87c, 0xd0fc, 0x0118, 0xaf94, 0x87ff, 0x1120, 0x2f00,
++	0x6082, 0x7808, 0x6086, 0x6266, 0x636a, 0x646e, 0x6077, 0x0000,
++	0xb88c, 0x8000, 0x9084, 0x00ff, 0xb88e, 0x8007, 0x607a, 0x607f,
++	0x0000, 0xa838, 0x608a, 0xa834, 0x608e, 0xa848, 0x60c6, 0xa844,
++	0x60ca, 0xb86c, 0x60ce, 0x60af, 0x95d5, 0x60d7, 0x0000, 0x080c,
++	0x9348, 0x2009, 0x07d0, 0x60c4, 0x9084, 0xfff0, 0x9005, 0x0110,
++	0x2009, 0x1b58, 0x080c, 0x7898, 0x003e, 0x004e, 0x005e, 0x00ce,
++	0x00de, 0x00ee, 0x009e, 0x00be, 0x0005, 0x7804, 0x9086, 0x0040,
++	0x0904, 0x8abd, 0x9185, 0x0100, 0x6062, 0x6266, 0x636a, 0x646e,
++	0x6073, 0x0809, 0x6077, 0x0008, 0x60af, 0x95d5, 0x60d7, 0x0000,
++	0xb88c, 0x8000, 0x9084, 0x00ff, 0xb88e, 0x8007, 0x607a, 0x607f,
++	0x0000, 0x2f00, 0x6082, 0x7808, 0x6086, 0x7814, 0x2048, 0xa838,
++	0x608a, 0xa834, 0x608e, 0xa848, 0x60c6, 0xa844, 0x60ca, 0xb86c,
++	0x60ce, 0xbab0, 0x629e, 0x080c, 0x9348, 0x2009, 0x07d0, 0x60c4,
++	0x9084, 0xfff0, 0x9005, 0x0110, 0x2009, 0x1b58, 0x080c, 0x7898,
++	0x003e, 0x004e, 0x005e, 0x00ce, 0x00de, 0x00ee, 0x009e, 0x00be,
++	0x0005, 0x7814, 0x2048, 0xa87c, 0x9084, 0x0003, 0x9086, 0x0002,
++	0x0904, 0x8ad9, 0x9185, 0x0100, 0x6062, 0x6266, 0x636a, 0x646e,
++	0x6073, 0x0880, 0x6077, 0x0008, 0xb88c, 0x8000, 0x9084, 0x00ff,
++	0xb88e, 0x8007, 0x607a, 0x7838, 0x607e, 0x2f00, 0x6086, 0x7808,
++	0x6082, 0xa890, 0x608a, 0xa88c, 0x608e, 0xa8b0, 0x60c6, 0xa8ac,
++	0x60ca, 0xa8ac, 0x7930, 0x9108, 0x7932, 0xa8b0, 0x792c, 0x9109,
++	0x792e, 0xb86c, 0x60ce, 0x60af, 0x95d5, 0x60d7, 0x0000, 0xbab0,
++	0x629e, 0x080c, 0x9325, 0x0804, 0x8a6d, 0xb8bc, 0xd084, 0x0148,
++	0xb88c, 0x7814, 0x2048, 0xb88c, 0x7846, 0xa836, 0x2900, 0xa83a,
++	0xb04a, 0x9185, 0x0600, 0x6062, 0x6266, 0x636a, 0x646e, 0x6073,
++	0x0829, 0x6077, 0x0000, 0x60af, 0x9575, 0x60d7, 0x0000, 0x0804,
++	0x8a50, 0x9185, 0x0700, 0x6062, 0x6266, 0x636a, 0x646e, 0x7824,
++	0xd0cc, 0x7826, 0x0118, 0x6073, 0x0889, 0x0010, 0x6073, 0x0898,
++	0x6077, 0x0000, 0xb88c, 0x8000, 0x9084, 0x00ff, 0xb88e, 0x8007,
++	0x607a, 0x607f, 0x0000, 0x2f00, 0x6086, 0x7808, 0x6082, 0xa838,
++	0x608a, 0xa834, 0x608e, 0xa848, 0x60c6, 0xa844, 0x60ca, 0xb86c,
++	0x60ce, 0x60af, 0x95d5, 0x60d7, 0x0000, 0xbab0, 0x629e, 0x7824,
++	0xd0cc, 0x0120, 0x080c, 0x9348, 0x0804, 0x8a6d, 0x080c, 0x9325,
++	0x0804, 0x8a6d, 0x7a10, 0x00b6, 0x2258, 0xba8c, 0x8210, 0x9294,
++	0x00ff, 0xba8e, 0x00be, 0x8217, 0x0005, 0x00d6, 0x2069, 0x19b4,
++	0x6843, 0x0001, 0x00de, 0x0005, 0x60a3, 0x0056, 0x60a7, 0x9575,
++	0x00f1, 0x080c, 0x788a, 0x0005, 0x0016, 0x2001, 0x180c, 0x200c,
++	0x9184, 0x0600, 0x9086, 0x0600, 0x0128, 0x0089, 0x080c, 0x788a,
++	0x001e, 0x0005, 0xc1e5, 0x2001, 0x180c, 0x2102, 0x2001, 0x19b5,
++	0x2003, 0x0000, 0x2001, 0x19bd, 0x2003, 0x0000, 0x0c88, 0x0006,
++	0x6014, 0x9084, 0x1804, 0x9085, 0x0009, 0x6016, 0x000e, 0x0005,
++	0x0016, 0x00c6, 0x0006, 0x2061, 0x0100, 0x61a4, 0x60a7, 0x95f5,
++	0x6014, 0x9084, 0x1804, 0x9085, 0x0008, 0x6016, 0x000e, 0xa001,
++	0xa001, 0xa001, 0x61a6, 0x00ce, 0x001e, 0x0005, 0x00c6, 0x00d6,
++	0x0016, 0x0026, 0x2061, 0x0100, 0x2069, 0x0140, 0x080c, 0x6877,
++	0x1198, 0x2001, 0x19d0, 0x2004, 0x9005, 0x15d0, 0x0066, 0x2031,
++	0x0001, 0x080c, 0x691e, 0x006e, 0x1118, 0x080c, 0x788a, 0x0480,
++	0x00c6, 0x2061, 0x19b4, 0x00f0, 0x6904, 0x9194, 0x4000, 0x0568,
++	0x0839, 0x2001, 0x1000, 0x080c, 0x28a5, 0x9006, 0x080c, 0x28a5,
++	0x00c6, 0x2061, 0x19b4, 0x6128, 0x9192, 0x00c8, 0x1258, 0x8108,
++	0x612a, 0x6124, 0x00ce, 0x81ff, 0x0198, 0x080c, 0x788a, 0x080c,
++	0x8b47, 0x0070, 0x6124, 0x91e5, 0x0000, 0x0140, 0x080c, 0xcd1f,
++	0x080c, 0x7893, 0x2009, 0x0014, 0x080c, 0x95ce, 0x00ce, 0x0000,
++	0x002e, 0x001e, 0x00de, 0x00ce, 0x0005, 0x2001, 0x19d0, 0x2004,
++	0x9005, 0x1db0, 0x00c6, 0x2061, 0x19b4, 0x6128, 0x9192, 0x0003,
++	0x1e08, 0x8108, 0x612a, 0x00ce, 0x080c, 0x788a, 0x080c, 0x55a0,
++	0x0c38, 0x0096, 0x00c6, 0x00d6, 0x00e6, 0x0016, 0x0026, 0x080c,
++	0x78a0, 0x2071, 0x19b4, 0x713c, 0x81ff, 0x0904, 0x8c3c, 0x2061,
++	0x0100, 0x2069, 0x0140, 0x080c, 0x6877, 0x11b0, 0x0036, 0x2019,
++	0x0002, 0x080c, 0x8dfe, 0x003e, 0x713c, 0x2160, 0x080c, 0xcd1f,
++	0x2009, 0x004a, 0x080c, 0x95ce, 0x0066, 0x2031, 0x0001, 0x080c,
++	0x691e, 0x006e, 0x0804, 0x8c3c, 0x6904, 0xd1f4, 0x0904, 0x8c43,
++	0x2001, 0x1000, 0x080c, 0x28a5, 0x9006, 0x080c, 0x28a5, 0x00c6,
++	0x703c, 0x9065, 0x090c, 0x0d84, 0x6020, 0x00ce, 0x9086, 0x0006,
++	0x1528, 0x61c8, 0x60c4, 0x9105, 0x1508, 0x2009, 0x180c, 0x2104,
++	0xd0d4, 0x01e0, 0x6214, 0x9294, 0x1800, 0x1128, 0x6224, 0x9294,
++	0x0002, 0x1510, 0x0030, 0xc0d4, 0x200a, 0xd0cc, 0x0110, 0x080c,
++	0x2809, 0x6014, 0x9084, 0xe7fd, 0x9085, 0x0010, 0x6016, 0x703c,
++	0x2060, 0x2009, 0x0049, 0x080c, 0x95ce, 0x0070, 0x0036, 0x2019,
++	0x0001, 0x080c, 0x8dfe, 0x003e, 0x713c, 0x2160, 0x080c, 0xcd1f,
++	0x2009, 0x004a, 0x080c, 0x95ce, 0x002e, 0x001e, 0x00ee, 0x00de,
++	0x00ce, 0x009e, 0x0005, 0xd1ec, 0x1904, 0x8bf8, 0x0804, 0x8bff,
++	0x0026, 0x00e6, 0x2071, 0x19b4, 0x7048, 0xd084, 0x01c0, 0x713c,
++	0x81ff, 0x01a8, 0x2071, 0x0100, 0x9188, 0x0008, 0x2114, 0x928e,
++	0x0006, 0x1138, 0x7014, 0x9084, 0x1984, 0x9085, 0x0012, 0x7016,
++	0x0030, 0x7014, 0x9084, 0x1984, 0x9085, 0x0016, 0x7016, 0x00ee,
++	0x002e, 0x0005, 0x00b6, 0x00e6, 0x00d6, 0x00c6, 0x0066, 0x0056,
++	0x0046, 0x0006, 0x0126, 0x2091, 0x8000, 0x6010, 0x2058, 0xbca0,
++	0x2071, 0x19b4, 0x7018, 0x2058, 0x8bff, 0x0190, 0xb8a0, 0x9406,
++	0x0118, 0xb854, 0x2058, 0x0cc0, 0x6014, 0x0096, 0x2048, 0xac6c,
++	0xad70, 0xae78, 0x009e, 0x080c, 0x5d3f, 0x0110, 0x9085, 0x0001,
++	0x012e, 0x000e, 0x004e, 0x005e, 0x006e, 0x00ce, 0x00de, 0x00ee,
++	0x00be, 0x0005, 0x080c, 0x8642, 0x7003, 0x1200, 0x7820, 0x9086,
++	0x0004, 0x1110, 0x6098, 0x0018, 0x2001, 0x1816, 0x2004, 0x700e,
++	0x7838, 0x7012, 0x783c, 0x7016, 0x60c3, 0x002c, 0x0804, 0x8b24,
++	0x080c, 0x8642, 0x7003, 0x0f00, 0x7808, 0x700e, 0x60c3, 0x0008,
++	0x0804, 0x8b24, 0x0156, 0x080c, 0x868d, 0x7003, 0x0200, 0x2011,
++	0x1848, 0x63f0, 0x2312, 0x20a9, 0x0006, 0x2011, 0x1840, 0x2019,
++	0x1841, 0x9ef0, 0x0002, 0x2376, 0x8e70, 0x2276, 0x8e70, 0x9398,
++	0x0002, 0x9290, 0x0002, 0x1f04, 0x8ccb, 0x60c3, 0x001c, 0x015e,
++	0x0804, 0x8b24, 0x0016, 0x0026, 0x080c, 0x8669, 0x080c, 0x867b,
++	0x9e80, 0x0004, 0x20e9, 0x0000, 0x20a0, 0x7814, 0x0096, 0x2048,
++	0xa800, 0x2048, 0xa860, 0x20e0, 0xa85c, 0x9080, 0x0021, 0x2098,
++	0x009e, 0x7808, 0x9088, 0x0002, 0x21a8, 0x9192, 0x0010, 0x1250,
++	0x4003, 0x9080, 0x0004, 0x8003, 0x60c2, 0x080c, 0x8b24, 0x002e,
++	0x001e, 0x0005, 0x20a9, 0x0010, 0x4003, 0x080c, 0x934e, 0x20a1,
++	0x0240, 0x22a8, 0x4003, 0x0c68, 0x080c, 0x8642, 0x7003, 0x6200,
++	0x7808, 0x700e, 0x60c3, 0x0008, 0x0804, 0x8b24, 0x0016, 0x0026,
++	0x080c, 0x8642, 0x20e9, 0x0000, 0x20a1, 0x024c, 0x7814, 0x0096,
++	0x2048, 0xa800, 0x2048, 0xa860, 0x20e0, 0xa85c, 0x9080, 0x0021,
++	0x2098, 0x009e, 0x7808, 0x9088, 0x0002, 0x21a8, 0x4003, 0x8003,
++	0x60c2, 0x080c, 0x8b24, 0x002e, 0x001e, 0x0005, 0x00e6, 0x00c6,
++	0x0006, 0x0126, 0x2091, 0x8000, 0x2071, 0x19b4, 0x700c, 0x2060,
++	0x8cff, 0x0178, 0x080c, 0xb295, 0x1110, 0x080c, 0x9e99, 0x600c,
++	0x0006, 0x080c, 0xb4de, 0x080c, 0x9554, 0x080c, 0x8eec, 0x00ce,
++	0x0c78, 0x2c00, 0x700e, 0x700a, 0x012e, 0x000e, 0x00ce, 0x00ee,
++	0x0005, 0x0126, 0x0156, 0x00f6, 0x00e6, 0x00d6, 0x00c6, 0x0026,
++	0x0016, 0x0006, 0x2091, 0x8000, 0x2001, 0x180c, 0x200c, 0x918c,
++	0xe7ff, 0x2102, 0x2069, 0x0100, 0x2079, 0x0140, 0x2071, 0x19b4,
++	0x7024, 0x2060, 0x8cff, 0x0904, 0x8db6, 0x080c, 0x8b50, 0x6ac0,
++	0x68c3, 0x0000, 0x080c, 0x7893, 0x00c6, 0x2061, 0x0100, 0x080c,
++	0x9367, 0x00ce, 0x2009, 0x0013, 0x080c, 0x95ce, 0x20a9, 0x01f4,
++	0x6824, 0xd094, 0x0170, 0x6827, 0x0004, 0x7804, 0x9084, 0x4000,
++	0x01d0, 0x2001, 0x1000, 0x080c, 0x28a5, 0x9006, 0x080c, 0x28a5,
++	0x0090, 0xd084, 0x0118, 0x6827, 0x0001, 0x0010, 0x1f04, 0x8d88,
++	0x7804, 0x9084, 0x1000, 0x0138, 0x2001, 0x0100, 0x080c, 0x28a5,
++	0x9006, 0x080c, 0x28a5, 0x6824, 0x000e, 0x001e, 0x002e, 0x00ce,
++	0x00de, 0x00ee, 0x00fe, 0x015e, 0x012e, 0x0005, 0x2001, 0x1800,
++	0x2004, 0x9096, 0x0001, 0x05c0, 0x9096, 0x0004, 0x05a8, 0x080c,
++	0x7893, 0x6814, 0x9084, 0x0001, 0x0110, 0x68a7, 0x95f5, 0x6817,
++	0x0008, 0x68c3, 0x0000, 0x2011, 0x554d, 0x080c, 0x781a, 0x20a9,
++	0x01f4, 0x6824, 0xd094, 0x0170, 0x6827, 0x0004, 0x7804, 0x9084,
++	0x4000, 0x01d0, 0x2001, 0x1000, 0x080c, 0x28a5, 0x9006, 0x080c,
++	0x28a5, 0x0090, 0xd084, 0x0118, 0x6827, 0x0001, 0x0010, 0x1f04,
++	0x8dd1, 0x7804, 0x9084, 0x1000, 0x0138, 0x2001, 0x0100, 0x080c,
++	0x28a5, 0x9006, 0x080c, 0x28a5, 0x000e, 0x001e, 0x002e, 0x00ce,
++	0x00de, 0x00ee, 0x00fe, 0x015e, 0x012e, 0x0005, 0x0126, 0x0156,
++	0x00f6, 0x00e6, 0x00d6, 0x00c6, 0x0026, 0x0016, 0x0006, 0x2091,
++	0x8000, 0x2001, 0x180c, 0x200c, 0x918c, 0xdbff, 0x2102, 0x2069,
++	0x0100, 0x2079, 0x0140, 0x2071, 0x19b4, 0x703c, 0x2060, 0x8cff,
++	0x0904, 0x8e8f, 0x9386, 0x0002, 0x1128, 0x6814, 0x9084, 0x0002,
++	0x0904, 0x8e8f, 0x68af, 0x95f5, 0x6817, 0x0010, 0x2009, 0x00fa,
++	0x8109, 0x1df0, 0x69c6, 0x68cb, 0x0008, 0x080c, 0x78a0, 0x080c,
++	0x1c4f, 0x0046, 0x2009, 0x017f, 0x200b, 0x00a5, 0x2021, 0x0169,
++	0x2404, 0x9084, 0x000f, 0x9086, 0x0004, 0x11f8, 0x68af, 0x95f5,
++	0x68c6, 0x68cb, 0x0008, 0x00e6, 0x00f6, 0x2079, 0x0090, 0x2071,
++	0x1a33, 0x6814, 0x9084, 0x1984, 0x9085, 0x0012, 0x6816, 0x782b,
++	0x0008, 0x7003, 0x0000, 0x00fe, 0x00ee, 0x9386, 0x0002, 0x1128,
++	0x7884, 0x9005, 0x1110, 0x7887, 0x0001, 0x2001, 0x194e, 0x2004,
++	0x200a, 0x004e, 0x939d, 0x0000, 0x1120, 0x2009, 0x0049, 0x080c,
++	0x95ce, 0x20a9, 0x03e8, 0x6824, 0xd094, 0x0170, 0x6827, 0x0004,
++	0x7804, 0x9084, 0x4000, 0x01d0, 0x2001, 0x1000, 0x080c, 0x28a5,
++	0x9006, 0x080c, 0x28a5, 0x0090, 0xd08c, 0x0118, 0x6827, 0x0002,
++	0x0010, 0x1f04, 0x8e6b, 0x7804, 0x9084, 0x1000, 0x0138, 0x2001,
++	0x0100, 0x080c, 0x28a5, 0x9006, 0x080c, 0x28a5, 0x6824, 0x000e,
++	0x001e, 0x002e, 0x00ce, 0x00de, 0x00ee, 0x00fe, 0x015e, 0x012e,
++	0x0005, 0x00d6, 0x0126, 0x2091, 0x8000, 0x2069, 0x19b4, 0x6a06,
++	0x012e, 0x00de, 0x0005, 0x00d6, 0x0126, 0x2091, 0x8000, 0x2069,
++	0x19b4, 0x6a32, 0x012e, 0x00de, 0x0005, 0x080c, 0x87dc, 0x7814,
++	0x080c, 0x4df2, 0x0108, 0x782c, 0x7032, 0x7042, 0x7047, 0x1000,
++	0x0478, 0x080c, 0x87dc, 0x7814, 0x080c, 0x4df2, 0x0108, 0x782c,
++	0x7032, 0x7042, 0x7047, 0x4000, 0x0418, 0x080c, 0x87dc, 0x7814,
++	0x080c, 0x4df2, 0x0108, 0x782c, 0x7032, 0x7042, 0x7047, 0x2000,
++	0x00b8, 0x080c, 0x87dc, 0x7814, 0x080c, 0x4df2, 0x0108, 0x782c,
++	0x7032, 0x7042, 0x7047, 0x0400, 0x0058, 0x080c, 0x87dc, 0x7814,
++	0x080c, 0x4df2, 0x0108, 0x782c, 0x7032, 0x7042, 0x7047, 0x0200,
++	0x60c3, 0x0020, 0x0804, 0x8b24, 0x00e6, 0x2071, 0x19b4, 0x7020,
++	0x9005, 0x0110, 0x8001, 0x7022, 0x00ee, 0x0005, 0x00f6, 0x00e6,
++	0x00d6, 0x00c6, 0x0076, 0x0066, 0x0006, 0x0126, 0x2091, 0x8000,
++	0x2071, 0x19b4, 0x7614, 0x2660, 0x2678, 0x2039, 0x0001, 0x87ff,
++	0x0904, 0x8f8a, 0x8cff, 0x0904, 0x8f8a, 0x6020, 0x9086, 0x0006,
++	0x1904, 0x8f85, 0x88ff, 0x0138, 0x2800, 0x9c06, 0x1904, 0x8f85,
++	0x2039, 0x0000, 0x0050, 0x6010, 0x9b06, 0x1904, 0x8f85, 0x85ff,
++	0x0120, 0x6054, 0x9106, 0x1904, 0x8f85, 0x7024, 0x9c06, 0x1578,
++	0x2069, 0x0100, 0x68c0, 0x9005, 0x0530, 0x080c, 0x7893, 0x6820,
++	0xd0b4, 0x0110, 0x68a7, 0x95f5, 0x6817, 0x0008, 0x68c3, 0x0000,
++	0x080c, 0x900f, 0x7027, 0x0000, 0x0036, 0x2069, 0x0140, 0x6b04,
++	0x9384, 0x1000, 0x0138, 0x2001, 0x0100, 0x080c, 0x28a5, 0x9006,
++	0x080c, 0x28a5, 0x2069, 0x0100, 0x6824, 0xd084, 0x0110, 0x6827,
++	0x0001, 0x003e, 0x0020, 0x6003, 0x0009, 0x630a, 0x0470, 0x7014,
++	0x9c36, 0x1110, 0x660c, 0x7616, 0x7010, 0x9c36, 0x1140, 0x2c00,
++	0x9f36, 0x0118, 0x2f00, 0x7012, 0x0010, 0x7013, 0x0000, 0x660c,
++	0x0066, 0x2c00, 0x9f06, 0x0110, 0x7e0e, 0x0008, 0x2678, 0x89ff,
++	0x1168, 0x600f, 0x0000, 0x6014, 0x0096, 0x2048, 0x080c, 0xb0ab,
++	0x0110, 0x080c, 0xc970, 0x009e, 0x080c, 0x9584, 0x080c, 0x8eec,
++	0x88ff, 0x1190, 0x00ce, 0x0804, 0x8f07, 0x2c78, 0x600c, 0x2060,
++	0x0804, 0x8f07, 0x9006, 0x012e, 0x000e, 0x006e, 0x007e, 0x00ce,
++	0x00de, 0x00ee, 0x00fe, 0x0005, 0x601b, 0x0000, 0x00ce, 0x98c5,
++	0x0001, 0x0c88, 0x00f6, 0x00e6, 0x00d6, 0x0096, 0x00c6, 0x0066,
++	0x0026, 0x0006, 0x0126, 0x2091, 0x8000, 0x2071, 0x19b4, 0x7638,
++	0x2660, 0x2678, 0x8cff, 0x0904, 0x8ffe, 0x6020, 0x9086, 0x0006,
++	0x1904, 0x8ff9, 0x87ff, 0x0128, 0x2700, 0x9c06, 0x1904, 0x8ff9,
++	0x0040, 0x6010, 0x9b06, 0x15e8, 0x85ff, 0x0118, 0x6054, 0x9106,
++	0x15c0, 0x703c, 0x9c06, 0x1168, 0x0036, 0x2019, 0x0001, 0x080c,
++	0x8dfe, 0x7033, 0x0000, 0x9006, 0x703e, 0x7042, 0x7046, 0x704a,
++	0x003e, 0x7038, 0x9c36, 0x1110, 0x660c, 0x763a, 0x7034, 0x9c36,
++	0x1140, 0x2c00, 0x9f36, 0x0118, 0x2f00, 0x7036, 0x0010, 0x7037,
++	0x0000, 0x660c, 0x0066, 0x2c00, 0x9f06, 0x0110, 0x7e0e, 0x0008,
++	0x2678, 0x600f, 0x0000, 0x6014, 0x2048, 0x080c, 0xb0ab, 0x0110,
++	0x080c, 0xc970, 0x080c, 0x9584, 0x87ff, 0x1198, 0x00ce, 0x0804,
++	0x8faa, 0x2c78, 0x600c, 0x2060, 0x0804, 0x8faa, 0x9006, 0x012e,
++	0x000e, 0x002e, 0x006e, 0x00ce, 0x009e, 0x00de, 0x00ee, 0x00fe,
++	0x0005, 0x601b, 0x0000, 0x00ce, 0x97bd, 0x0001, 0x0c80, 0x00e6,
++	0x2071, 0x19b4, 0x2001, 0x1800, 0x2004, 0x9086, 0x0002, 0x1118,
++	0x7007, 0x0005, 0x0010, 0x7007, 0x0000, 0x00ee, 0x0005, 0x00f6,
++	0x00e6, 0x00c6, 0x0066, 0x0026, 0x0006, 0x0126, 0x2091, 0x8000,
++	0x2071, 0x19b4, 0x2c10, 0x7638, 0x2660, 0x2678, 0x8cff, 0x0518,
++	0x2200, 0x9c06, 0x11e0, 0x7038, 0x9c36, 0x1110, 0x660c, 0x763a,
++	0x7034, 0x9c36, 0x1140, 0x2c00, 0x9f36, 0x0118, 0x2f00, 0x7036,
++	0x0010, 0x7037, 0x0000, 0x660c, 0x2c00, 0x9f06, 0x0110, 0x7e0e,
++	0x0008, 0x2678, 0x600f, 0x0000, 0x9085, 0x0001, 0x0020, 0x2c78,
++	0x600c, 0x2060, 0x08d8, 0x012e, 0x000e, 0x002e, 0x006e, 0x00ce,
++	0x00ee, 0x00fe, 0x0005, 0x0096, 0x00f6, 0x00e6, 0x00d6, 0x00c6,
++	0x0066, 0x0026, 0x0006, 0x0126, 0x2091, 0x8000, 0x2071, 0x19b4,
++	0x760c, 0x2660, 0x2678, 0x8cff, 0x0904, 0x90eb, 0x6010, 0x00b6,
++	0x2058, 0xb8a0, 0x00be, 0x9206, 0x1904, 0x90e6, 0x7024, 0x9c06,
++	0x1520, 0x2069, 0x0100, 0x68c0, 0x9005, 0x0904, 0x90c2, 0x080c,
++	0x8b50, 0x68c3, 0x0000, 0x080c, 0x900f, 0x7027, 0x0000, 0x0036,
++	0x2069, 0x0140, 0x6b04, 0x9384, 0x1000, 0x0138, 0x2001, 0x0100,
++	0x080c, 0x28a5, 0x9006, 0x080c, 0x28a5, 0x2069, 0x0100, 0x6824,
++	0xd084, 0x0110, 0x6827, 0x0001, 0x003e, 0x700c, 0x9c36, 0x1110,
++	0x660c, 0x760e, 0x7008, 0x9c36, 0x1140, 0x2c00, 0x9f36, 0x0118,
++	0x2f00, 0x700a, 0x0010, 0x700b, 0x0000, 0x660c, 0x0066, 0x2c00,
++	0x9f06, 0x0110, 0x7e0e, 0x0008, 0x2678, 0x600f, 0x0000, 0x080c,
++	0xb284, 0x1158, 0x080c, 0x2d3f, 0x080c, 0xb295, 0x11f0, 0x080c,
++	0x9e99, 0x00d8, 0x080c, 0x900f, 0x08c0, 0x080c, 0xb295, 0x1118,
++	0x080c, 0x9e99, 0x0090, 0x6014, 0x2048, 0x080c, 0xb0ab, 0x0168,
++	0x6020, 0x9086, 0x0003, 0x1508, 0xa867, 0x0103, 0xab7a, 0xa877,
++	0x0000, 0x080c, 0x61a9, 0x080c, 0xb278, 0x080c, 0xb4de, 0x080c,
++	0x9584, 0x080c, 0x8eec, 0x00ce, 0x0804, 0x906b, 0x2c78, 0x600c,
++	0x2060, 0x0804, 0x906b, 0x012e, 0x000e, 0x002e, 0x006e, 0x00ce,
++	0x00de, 0x00ee, 0x00fe, 0x009e, 0x0005, 0x6020, 0x9086, 0x0006,
++	0x1d20, 0x080c, 0xc970, 0x0c08, 0x00d6, 0x080c, 0x868d, 0x7003,
++	0x0200, 0x7007, 0x0014, 0x60c3, 0x0014, 0x20e1, 0x0001, 0x2099,
++	0x1956, 0x20e9, 0x0000, 0x20a1, 0x0250, 0x20a9, 0x0004, 0x4003,
++	0x7023, 0x0004, 0x7027, 0x7878, 0x080c, 0x8b24, 0x00de, 0x0005,
++	0x080c, 0x868d, 0x7003, 0x0214, 0x7007, 0x0018, 0x700b, 0x0800,
++	0x7814, 0x9084, 0xff00, 0x700e, 0x7814, 0x9084, 0x00ff, 0x7022,
++	0x782c, 0x7026, 0x60c3, 0x0018, 0x0804, 0x8b24, 0x00b6, 0x00d6,
++	0x0016, 0x00d6, 0x2f68, 0x2009, 0x0035, 0x080c, 0xb6d9, 0x00de,
++	0x1904, 0x9192, 0x080c, 0x8642, 0x7003, 0x1300, 0x782c, 0x080c,
++	0x9294, 0x2068, 0x6820, 0x9086, 0x0003, 0x0558, 0x7810, 0x2058,
++	0xbaa0, 0x080c, 0x94d3, 0x11d0, 0x9286, 0x007e, 0x1128, 0x700b,
++	0x00ff, 0x700f, 0xfffe, 0x0490, 0x9286, 0x007f, 0x1128, 0x700b,
++	0x00ff, 0x700f, 0xfffd, 0x0450, 0xd2bc, 0x0180, 0x9286, 0x0080,
++	0x1128, 0x700b, 0x00ff, 0x700f, 0xfffc, 0x0400, 0x92d8, 0x1000,
++	0x2b5c, 0xb810, 0x700a, 0xb814, 0x700e, 0x00c0, 0x6098, 0x700e,
++	0x00a8, 0x080c, 0x94d3, 0x1130, 0x7810, 0x2058, 0xb8a0, 0x9082,
++	0x007e, 0x0250, 0x00d6, 0x2069, 0x181d, 0x2d04, 0x700a, 0x8d68,
++	0x2d04, 0x700e, 0x00de, 0x0010, 0x6034, 0x700e, 0x7838, 0x7012,
++	0x783c, 0x7016, 0x60c3, 0x000c, 0x001e, 0x00de, 0x080c, 0x8b24,
++	0x00be, 0x0005, 0x781b, 0x0001, 0x7803, 0x0006, 0x001e, 0x00de,
++	0x00be, 0x0005, 0x792c, 0x9180, 0x0008, 0x200c, 0x9186, 0x0006,
++	0x01c0, 0x9186, 0x0003, 0x0904, 0x920c, 0x9186, 0x0005, 0x0904,
++	0x91f5, 0x9186, 0x0004, 0x05d8, 0x9186, 0x0008, 0x0904, 0x91fd,
++	0x7807, 0x0037, 0x782f, 0x0003, 0x7817, 0x1700, 0x080c, 0x9271,
++	0x0005, 0x080c, 0x9232, 0x00d6, 0x0026, 0x792c, 0x2168, 0x2009,
++	0x4000, 0x6800, 0x0002, 0x91d6, 0x91e1, 0x91d8, 0x91e1, 0x91dd,
++	0x91d6, 0x91d6, 0x91e1, 0x91e1, 0x91e1, 0x91e1, 0x91d6, 0x91d6,
++	0x91d6, 0x91d6, 0x91d6, 0x91e1, 0x91d6, 0x91e1, 0x080c, 0x0d84,
++	0x6824, 0xd0e4, 0x0110, 0xd0cc, 0x0110, 0x900e, 0x0010, 0x2009,
++	0x2000, 0x682c, 0x7022, 0x6830, 0x7026, 0x0804, 0x922b, 0x080c,
++	0x9232, 0x00d6, 0x0026, 0x792c, 0x2168, 0x2009, 0x4000, 0x6a00,
++	0x9286, 0x0002, 0x1108, 0x900e, 0x04b0, 0x04e1, 0x00d6, 0x0026,
++	0x792c, 0x2168, 0x2009, 0x4000, 0x0470, 0x04a1, 0x00d6, 0x0026,
++	0x792c, 0x2168, 0x2009, 0x4000, 0x9286, 0x0005, 0x0118, 0x9286,
++	0x0002, 0x1108, 0x900e, 0x00f8, 0x0429, 0x00d6, 0x0026, 0x792c,
++	0x2168, 0x6814, 0x0096, 0x2048, 0xa9ac, 0xa834, 0x9112, 0xa9b0,
++	0xa838, 0x009e, 0x9103, 0x7022, 0x7226, 0x792c, 0x9180, 0x0000,
++	0x2004, 0x908e, 0x0002, 0x0130, 0x908e, 0x0004, 0x0118, 0x2009,
++	0x4000, 0x0008, 0x900e, 0x712a, 0x60c3, 0x0018, 0x002e, 0x00de,
++	0x0804, 0x8b24, 0x00b6, 0x0036, 0x0046, 0x0056, 0x0066, 0x080c,
++	0x868d, 0x9006, 0x7003, 0x0200, 0x7938, 0x710a, 0x793c, 0x710e,
++	0x7810, 0x2058, 0xb8a0, 0x080c, 0x94d3, 0x1118, 0x9092, 0x007e,
++	0x0268, 0x00d6, 0x2069, 0x181d, 0x2d2c, 0x8d68, 0x2d34, 0x90d8,
++	0x1000, 0x2b5c, 0xbb10, 0xbc14, 0x00de, 0x0028, 0x901e, 0x6498,
++	0x2029, 0x0000, 0x6634, 0x782c, 0x9080, 0x0008, 0x2004, 0x9086,
++	0x0003, 0x1128, 0x7512, 0x7616, 0x731a, 0x741e, 0x0020, 0x7312,
++	0x7416, 0x751a, 0x761e, 0x006e, 0x005e, 0x004e, 0x003e, 0x00be,
++	0x0005, 0x080c, 0x868d, 0x7003, 0x0100, 0x782c, 0x700a, 0x7814,
++	0x700e, 0x700e, 0x60c3, 0x0008, 0x0804, 0x8b24, 0x080c, 0x8639,
++	0x7003, 0x1400, 0x7838, 0x700a, 0x0079, 0x783c, 0x700e, 0x782c,
++	0x7012, 0x7830, 0x7016, 0x7834, 0x9084, 0x00ff, 0x8007, 0x701a,
++	0x60c3, 0x0010, 0x0804, 0x8b24, 0x00e6, 0x2071, 0x0240, 0x0006,
++	0x00f6, 0x2078, 0x7810, 0x00b6, 0x2058, 0xb8bc, 0xd084, 0x0120,
++	0x7848, 0x702a, 0x7844, 0x702e, 0x00be, 0x00fe, 0x000e, 0x00ee,
++	0x0005, 0x080c, 0x8684, 0x7003, 0x0100, 0x782c, 0x700a, 0x7814,
++	0x700e, 0x60c3, 0x0008, 0x0804, 0x8b24, 0x0021, 0x60c3, 0x0000,
++	0x0804, 0x8b24, 0x00d6, 0x080c, 0x9363, 0xb810, 0x9085, 0x0300,
++	0x7002, 0xb814, 0x7006, 0x2069, 0x1800, 0x6874, 0x700a, 0x6878,
++	0x700e, 0x7013, 0x0819, 0x080c, 0x8b12, 0x721a, 0x2f10, 0x7222,
++	0x7a08, 0x7226, 0x2071, 0x024c, 0x00de, 0x0005, 0x0059, 0x7914,
++	0x712a, 0x60c3, 0x0000, 0x60a7, 0x9575, 0x080c, 0x8b47, 0x080c,
++	0x788a, 0x0005, 0x0036, 0x0096, 0x00d6, 0x00e6, 0x7858, 0x2048,
++	0xaa7c, 0x9296, 0x00c0, 0x9294, 0xfffd, 0xaa7e, 0xaa80, 0x9294,
++	0x0300, 0xaa82, 0xa96c, 0x9194, 0x00ff, 0xab74, 0x9384, 0x00ff,
++	0x908d, 0xc200, 0xa96e, 0x9384, 0xff00, 0x9215, 0xaa76, 0xa870,
++	0xaa78, 0xa87a, 0xaa72, 0x00d6, 0x2069, 0x0200, 0x080c, 0x9363,
++	0x00de, 0x20e9, 0x0000, 0x20a1, 0x0240, 0x20a9, 0x000a, 0xa860,
++	0x20e0, 0xa85c, 0x9080, 0x001b, 0x2098, 0x4003, 0x60a3, 0x0035,
++	0xaa68, 0x9294, 0x7000, 0x9286, 0x3000, 0x0110, 0x60a3, 0x0037,
++	0x00ee, 0x00de, 0x009e, 0x003e, 0x0005, 0x900e, 0x7814, 0x0096,
++	0x2048, 0xa87c, 0xd0fc, 0x01c0, 0x9084, 0x0003, 0x11a8, 0x2001,
++	0x180c, 0x2004, 0xd0bc, 0x0180, 0x7824, 0xd0cc, 0x1168, 0xd0c4,
++	0x1158, 0xa8a8, 0x9005, 0x1140, 0x2001, 0x180c, 0x200c, 0xc1d5,
++	0x2102, 0x2009, 0x197f, 0x210c, 0x009e, 0x918d, 0x0092, 0x0010,
++	0x2009, 0x0096, 0x60ab, 0x0036, 0x6116, 0x0005, 0x2009, 0x0009,
++	0x00a0, 0x2009, 0x000a, 0x0088, 0x2009, 0x000b, 0x0070, 0x2009,
++	0x000c, 0x0058, 0x2009, 0x000d, 0x0040, 0x2009, 0x000e, 0x0028,
++	0x2009, 0x000f, 0x0010, 0x2009, 0x0008, 0x6912, 0x0005, 0x00d6,
++	0x9290, 0x0018, 0x8214, 0x20e9, 0x0000, 0x2069, 0x0200, 0x6813,
++	0x0000, 0x22a8, 0x9284, 0x00e0, 0x0128, 0x20a9, 0x0020, 0x9292,
++	0x0020, 0x0008, 0x9016, 0x20a1, 0x0240, 0x9006, 0x4004, 0x82ff,
++	0x0120, 0x6810, 0x8000, 0x6812, 0x0c60, 0x00de, 0x0005, 0x00d6,
++	0x0096, 0x6014, 0x2048, 0x9006, 0xa836, 0xa83a, 0xa99c, 0xa946,
++	0xa84a, 0x6023, 0x0003, 0x6007, 0x0040, 0x6003, 0x0003, 0x600b,
++	0xffff, 0xa817, 0x0001, 0xa842, 0xa83e, 0x2900, 0xa85a, 0xa813,
++	0x1cdb, 0x080c, 0x7c3a, 0x0126, 0x2091, 0x8000, 0x080c, 0x820b,
++	0x012e, 0x009e, 0x00de, 0x0005, 0x00f6, 0x00e6, 0x00d6, 0x00c6,
++	0x00a6, 0x0096, 0x0066, 0x0126, 0x2091, 0x8000, 0x2071, 0x19b4,
++	0x760c, 0x2660, 0x2678, 0x8cff, 0x0904, 0x9433, 0x7024, 0x9c06,
++	0x1520, 0x2069, 0x0100, 0x68c0, 0x9005, 0x0904, 0x940a, 0x080c,
++	0x8b50, 0x68c3, 0x0000, 0x080c, 0x900f, 0x7027, 0x0000, 0x0036,
++	0x2069, 0x0140, 0x6b04, 0x9384, 0x1000, 0x0138, 0x2001, 0x0100,
++	0x080c, 0x28a5, 0x9006, 0x080c, 0x28a5, 0x2069, 0x0100, 0x6824,
++	0xd084, 0x0110, 0x6827, 0x0001, 0x003e, 0x700c, 0x9c36, 0x1110,
++	0x660c, 0x760e, 0x7008, 0x9c36, 0x1140, 0x2c00, 0x9f36, 0x0118,
++	0x2f00, 0x700a, 0x0010, 0x700b, 0x0000, 0x660c, 0x0066, 0x2c00,
++	0x9f06, 0x0110, 0x7e0e, 0x0008, 0x2678, 0x600f, 0x0000, 0x080c,
++	0xb284, 0x1158, 0x080c, 0x2d3f, 0x080c, 0xb295, 0x11f0, 0x080c,
++	0x9e99, 0x00d8, 0x080c, 0x900f, 0x08c0, 0x080c, 0xb295, 0x1118,
++	0x080c, 0x9e99, 0x0090, 0x6014, 0x2048, 0x080c, 0xb0ab, 0x0168,
++	0x6020, 0x9086, 0x0003, 0x1520, 0xa867, 0x0103, 0xab7a, 0xa877,
++	0x0000, 0x080c, 0x61a9, 0x080c, 0xb278, 0x080c, 0xb4de, 0x080c,
++	0x9584, 0x080c, 0x8eec, 0x00ce, 0x0804, 0x93bb, 0x2c78, 0x600c,
++	0x2060, 0x0804, 0x93bb, 0x700f, 0x0000, 0x700b, 0x0000, 0x012e,
++	0x006e, 0x009e, 0x00ae, 0x00ce, 0x00de, 0x00ee, 0x00fe, 0x0005,
++	0x6020, 0x9086, 0x0006, 0x1d08, 0x080c, 0xc970, 0x08f0, 0x00d6,
++	0x0156, 0x080c, 0x868d, 0x7a14, 0x82ff, 0x0138, 0x7003, 0x0100,
++	0x700b, 0x0003, 0x60c3, 0x0008, 0x0490, 0x7003, 0x0200, 0x7007,
++	0x0000, 0x2069, 0x1800, 0x901e, 0x6800, 0x9086, 0x0004, 0x1110,
++	0xc38d, 0x0060, 0x080c, 0x6877, 0x1110, 0xc3ad, 0x0008, 0xc3a5,
++	0x6ad8, 0xd29c, 0x1110, 0xd2ac, 0x0108, 0xc39d, 0x730e, 0x2011,
++	0x1848, 0x63f0, 0x2312, 0x20a9, 0x0006, 0x2011, 0x1840, 0x2019,
++	0x1841, 0x2071, 0x0250, 0x2376, 0x8e70, 0x2276, 0x8e70, 0x9398,
++	0x0002, 0x9290, 0x0002, 0x1f04, 0x947b, 0x60c3, 0x0040, 0x080c,
++	0x8b24, 0x015e, 0x00de, 0x0005, 0x0156, 0x080c, 0x868d, 0x7a14,
++	0x82ff, 0x0168, 0x9286, 0xffff, 0x0118, 0x9282, 0x000e, 0x1238,
++	0x7003, 0x0100, 0x700b, 0x0003, 0x60c3, 0x0008, 0x0488, 0x7003,
++	0x0200, 0x7007, 0x001c, 0x700f, 0x0001, 0x2011, 0x198a, 0x2204,
++	0x8007, 0x701a, 0x8210, 0x2204, 0x8007, 0x701e, 0x0421, 0x1120,
++	0xb8a0, 0x9082, 0x007f, 0x0248, 0x2001, 0x181d, 0x2004, 0x7022,
++	0x2001, 0x181e, 0x2004, 0x7026, 0x0030, 0x2001, 0x1816, 0x2004,
++	0x9084, 0x00ff, 0x7026, 0x20a9, 0x0004, 0x20e1, 0x0001, 0x2099,
++	0x1805, 0x20e9, 0x0000, 0x20a1, 0x0256, 0x4003, 0x60c3, 0x001c,
++	0x015e, 0x0804, 0x8b24, 0x0006, 0x2001, 0x1836, 0x2004, 0xd0ac,
++	0x000e, 0x0005, 0x2011, 0x0003, 0x080c, 0x8e99, 0x2011, 0x0002,
++	0x080c, 0x8ea3, 0x080c, 0x8d59, 0x0036, 0x901e, 0x080c, 0x8dfe,
++	0x003e, 0x0005, 0x2071, 0x1882, 0x7000, 0x9005, 0x0140, 0x2001,
++	0x0976, 0x2071, 0x1800, 0x706e, 0x7072, 0x7063, 0xffe0, 0x2071,
++	0x1800, 0x706c, 0x704e, 0x7053, 0x1cd0, 0x0005, 0x00e6, 0x0126,
++	0x2071, 0x1800, 0x2091, 0x8000, 0x754c, 0x9582, 0x0010, 0x0608,
++	0x7050, 0x2060, 0x6000, 0x9086, 0x0000, 0x0148, 0x9ce0, 0x0018,
++	0x7060, 0x9c02, 0x1208, 0x0cb0, 0x2061, 0x1cd0, 0x0c98, 0x6003,
++	0x0008, 0x8529, 0x754e, 0x9ca8, 0x0018, 0x7060, 0x9502, 0x1230,
++	0x7552, 0x9085, 0x0001, 0x012e, 0x00ee, 0x0005, 0x7053, 0x1cd0,
++	0x0cc0, 0x9006, 0x0cc0, 0x00e6, 0x2071, 0x1800, 0x754c, 0x9582,
++	0x0010, 0x0600, 0x7050, 0x2060, 0x6000, 0x9086, 0x0000, 0x0148,
++	0x9ce0, 0x0018, 0x7060, 0x9c02, 0x1208, 0x0cb0, 0x2061, 0x1cd0,
++	0x0c98, 0x6003, 0x0008, 0x8529, 0x754e, 0x9ca8, 0x0018, 0x7060,
++	0x9502, 0x1228, 0x7552, 0x9085, 0x0001, 0x00ee, 0x0005, 0x7053,
++	0x1cd0, 0x0cc8, 0x9006, 0x0cc8, 0x9c82, 0x1cd0, 0x0a0c, 0x0d84,
++	0x2001, 0x1818, 0x2004, 0x9c02, 0x1a0c, 0x0d84, 0x9006, 0x6006,
++	0x600a, 0x600e, 0x6016, 0x601a, 0x6012, 0x6023, 0x0000, 0x6003,
++	0x0000, 0x601e, 0x6056, 0x605a, 0x6026, 0x602a, 0x602e, 0x6032,
++	0x6036, 0x603a, 0x603e, 0x6042, 0x2061, 0x1800, 0x604c, 0x8000,
++	0x604e, 0x9086, 0x0001, 0x0108, 0x0005, 0x0126, 0x2091, 0x8000,
++	0x080c, 0x8125, 0x012e, 0x0cc0, 0x0006, 0x6000, 0x9086, 0x0000,
++	0x01b0, 0x601c, 0xd084, 0x190c, 0x17b0, 0x6017, 0x0000, 0x6023,
++	0x0007, 0x2001, 0x1953, 0x2004, 0x0006, 0x9082, 0x0051, 0x000e,
++	0x0208, 0x8004, 0x601a, 0x080c, 0xcc1f, 0x6043, 0x0000, 0x000e,
++	0x0005, 0x00e6, 0x0126, 0x2071, 0x1800, 0x2091, 0x8000, 0x754c,
++	0x9582, 0x0001, 0x0608, 0x7050, 0x2060, 0x6000, 0x9086, 0x0000,
++	0x0148, 0x9ce0, 0x0018, 0x7060, 0x9c02, 0x1208, 0x0cb0, 0x2061,
++	0x1cd0, 0x0c98, 0x6003, 0x0008, 0x8529, 0x754e, 0x9ca8, 0x0018,
++	0x7060, 0x9502, 0x1230, 0x7552, 0x9085, 0x0001, 0x012e, 0x00ee,
++	0x0005, 0x7053, 0x1cd0, 0x0cc0, 0x9006, 0x0cc0, 0x6020, 0x9084,
++	0x000f, 0x0002, 0x95e1, 0x95ea, 0x9605, 0x9620, 0xb77d, 0xb79a,
++	0xb7b5, 0x95e1, 0x95ea, 0x95e1, 0x963c, 0x95e1, 0x95e1, 0x95e1,
++	0x95e1, 0x9186, 0x0013, 0x1128, 0x080c, 0x8026, 0x080c, 0x8125,
++	0x0005, 0x0005, 0x0066, 0x6000, 0x90b2, 0x0016, 0x1a0c, 0x0d84,
++	0x0013, 0x006e, 0x0005, 0x9603, 0x9d1f, 0x9ee0, 0x9603, 0x9f6e,
++	0x98e8, 0x9603, 0x9603, 0x9ca1, 0xa463, 0x9603, 0x9603, 0x9603,
++	0x9603, 0x9603, 0x9603, 0x080c, 0x0d84, 0x0066, 0x6000, 0x90b2,
++	0x0016, 0x1a0c, 0x0d84, 0x0013, 0x006e, 0x0005, 0x961e, 0xaaef,
++	0x961e, 0x961e, 0x961e, 0x961e, 0x961e, 0x961e, 0xaa94, 0xac61,
++	0x961e, 0xab21, 0xaba0, 0xab21, 0xaba0, 0x961e, 0x080c, 0x0d84,
++	0x6000, 0x9082, 0x0016, 0x1a0c, 0x0d84, 0x6000, 0x0002, 0x963a,
++	0xa4a5, 0xa574, 0xa69f, 0xa838, 0x963a, 0x963a, 0x963a, 0xa47e,
++	0xaa2b, 0xaa2e, 0x963a, 0x963a, 0x963a, 0x963a, 0xaa57, 0x963a,
++	0x963a, 0x963a, 0x080c, 0x0d84, 0x0066, 0x6000, 0x90b2, 0x0016,
++	0x1a0c, 0x0d84, 0x0013, 0x006e, 0x0005, 0x9655, 0x9655, 0x9694,
++	0x972f, 0x979c, 0x9655, 0x9655, 0x9655, 0x9657, 0x9655, 0x9655,
++	0x9655, 0x9655, 0x9655, 0x9655, 0x9655, 0x080c, 0x0d84, 0x9186,
++	0x004c, 0x0588, 0x9186, 0x0003, 0x190c, 0x0d84, 0x0096, 0x601c,
++	0xc0ed, 0x601e, 0x6003, 0x0003, 0x6106, 0x6014, 0x2048, 0xa87c,
++	0x9084, 0x8000, 0xc0b5, 0xa87e, 0xa8ac, 0xa846, 0xa8b0, 0xa84a,
++	0x9006, 0xa836, 0xa83a, 0xa884, 0x9092, 0x199a, 0x0210, 0x2001,
++	0x1999, 0x8003, 0x8013, 0x8213, 0x9210, 0x621a, 0x009e, 0x2c10,
++	0x080c, 0x18b7, 0x080c, 0x7c3a, 0x0126, 0x2091, 0x8000, 0x080c,
++	0x820b, 0x012e, 0x0005, 0x6010, 0x00b6, 0x2058, 0xbca0, 0x00be,
++	0x2c00, 0x080c, 0x97be, 0x0005, 0x00d6, 0x0096, 0x00f6, 0x2079,
++	0x1800, 0x7a88, 0x9290, 0x0018, 0x6014, 0x2048, 0xac78, 0x0046,
++	0xa8e0, 0x9005, 0x1140, 0xa8dc, 0x921a, 0x0140, 0x0220, 0xa87b,
++	0x0007, 0x2010, 0x0028, 0xa87b, 0x0015, 0x0010, 0xa87b, 0x0000,
++	0x8214, 0xa883, 0x0000, 0xaa02, 0x0006, 0x0016, 0x0026, 0x00c6,
++	0x00d6, 0x00e6, 0x00f6, 0x2400, 0x9005, 0x1108, 0x009a, 0x2100,
++	0x9086, 0x0015, 0x1118, 0x2001, 0x0001, 0x0038, 0x2100, 0x9086,
++	0x0016, 0x0118, 0x2001, 0x0001, 0x002a, 0x94a4, 0x0007, 0x8423,
++	0x9405, 0x0002, 0x96f7, 0x96f7, 0x96f2, 0x96f5, 0x96f7, 0x96ef,
++	0x96e2, 0x96e2, 0x96e2, 0x96e2, 0x96e2, 0x96e2, 0x96e2, 0x96e2,
++	0x96e2, 0x96e2, 0x00fe, 0x00ee, 0x00de, 0x00ce, 0x002e, 0x001e,
++	0x000e, 0x004e, 0x00fe, 0x009e, 0x00de, 0x080c, 0x0d84, 0x080c,
++	0xa0f1, 0x0028, 0x080c, 0xa1cf, 0x0010, 0x080c, 0xa2bc, 0x00fe,
++	0x00ee, 0x00de, 0x00ce, 0x002e, 0x001e, 0x2c00, 0xa896, 0x000e,
++	0x080c, 0x987c, 0x0530, 0xa804, 0xa80e, 0x00a6, 0x2050, 0xb100,
++	0x00ae, 0x8006, 0x8006, 0x8007, 0x97bc, 0x003f, 0x9084, 0xffc0,
++	0x9080, 0x0002, 0xaacc, 0xabd0, 0xacd4, 0xadd8, 0x2031, 0x0000,
++	0x2041, 0x11fd, 0x080c, 0x9a1f, 0x0160, 0x000e, 0x9005, 0x0120,
++	0x00fe, 0x009e, 0x00de, 0x0005, 0x00fe, 0x009e, 0x00de, 0x0804,
++	0x9554, 0x2001, 0x002c, 0x900e, 0x080c, 0x98db, 0x0c70, 0x9182,
++	0x0047, 0x0002, 0x973b, 0x973b, 0x973d, 0x9772, 0x973b, 0x973b,
++	0x973b, 0x973b, 0x9785, 0x080c, 0x0d84, 0x00d6, 0x0016, 0x0096,
++	0x080c, 0x80d6, 0x080c, 0x820b, 0x6003, 0x0004, 0x6114, 0x2148,
++	0xa87c, 0xd0fc, 0x01b8, 0xa878, 0x9005, 0x1158, 0xa894, 0x9005,
++	0x0140, 0x2001, 0x0000, 0x900e, 0x080c, 0x98db, 0x080c, 0x9554,
++	0x00a8, 0x6003, 0x0002, 0xa8a4, 0xa9a8, 0x9105, 0x1178, 0xa8ae,
++	0xa8b2, 0x0c78, 0xa87f, 0x0020, 0xa88c, 0xa88a, 0xa8a4, 0xa8ae,
++	0xa8a8, 0xa8b2, 0xa8c7, 0x0000, 0xa8cb, 0x0000, 0x009e, 0x001e,
++	0x00de, 0x0005, 0x080c, 0x80d6, 0x00d6, 0x0096, 0x6114, 0x2148,
++	0x080c, 0xb0ad, 0x0120, 0xa87b, 0x0006, 0x080c, 0x61a9, 0x009e,
++	0x00de, 0x080c, 0x9554, 0x0804, 0x820b, 0x080c, 0x80d6, 0x080c,
++	0x2d1a, 0x080c, 0xb76c, 0x00d6, 0x0096, 0x6114, 0x2148, 0x080c,
++	0xb0ad, 0x0120, 0xa87b, 0x0029, 0x080c, 0x61a9, 0x009e, 0x00de,
++	0x080c, 0x9554, 0x0804, 0x820b, 0x9182, 0x0047, 0x0002, 0x97ac,
++	0x97ae, 0x97ac, 0x97ac, 0x97ac, 0x97ac, 0x97ac, 0x97ac, 0x97ac,
++	0x97ac, 0x97ac, 0x97ac, 0x97ae, 0x080c, 0x0d84, 0x00d6, 0x0096,
++	0x080c, 0x1489, 0x6114, 0x2148, 0xa87b, 0x0000, 0xa883, 0x0000,
++	0x080c, 0x61a9, 0x009e, 0x00de, 0x0804, 0x9554, 0x0026, 0x0036,
++	0x0056, 0x0066, 0x0096, 0x00a6, 0x00f6, 0x0006, 0x080c, 0x0fae,
++	0x000e, 0x090c, 0x0d84, 0xa960, 0x21e8, 0xa95c, 0x9188, 0x0019,
++	0x21a0, 0x900e, 0x20a9, 0x0020, 0x4104, 0xa87a, 0x2079, 0x1800,
++	0x7988, 0x9188, 0x0018, 0x918c, 0x0fff, 0xa972, 0xac76, 0x2950,
++	0x00a6, 0x2001, 0x0205, 0x2003, 0x0000, 0x901e, 0x2029, 0x0001,
++	0x9182, 0x0034, 0x1228, 0x2011, 0x001f, 0x080c, 0xace6, 0x04c0,
++	0x2130, 0x2009, 0x0034, 0x2011, 0x001f, 0x080c, 0xace6, 0x96b2,
++	0x0034, 0xb004, 0x904d, 0x0110, 0x080c, 0x0f60, 0x080c, 0x0fae,
++	0x01d0, 0x8528, 0xa867, 0x0110, 0xa86b, 0x0000, 0x2920, 0xb406,
++	0x968a, 0x003d, 0x1230, 0x2608, 0x2011, 0x001b, 0x080c, 0xace6,
++	0x00b8, 0x96b2, 0x003c, 0x2009, 0x003c, 0x2950, 0x2011, 0x001b,
++	0x080c, 0xace6, 0x0c18, 0x2001, 0x0205, 0x2003, 0x0000, 0x00ae,
++	0x852f, 0x95ad, 0x0050, 0xb566, 0xb070, 0xc0fd, 0xb072, 0x0048,
++	0x2001, 0x0205, 0x2003, 0x0000, 0x00ae, 0x852f, 0x95ad, 0x0050,
++	0xb566, 0x2a48, 0xa804, 0xa807, 0x0000, 0x0006, 0x080c, 0x61a9,
++	0x000e, 0x2048, 0x9005, 0x1db0, 0x00fe, 0x00ae, 0x009e, 0x006e,
++	0x005e, 0x003e, 0x002e, 0x0005, 0x00d6, 0x00f6, 0x0096, 0x0006,
++	0x080c, 0x0fae, 0x000e, 0x090c, 0x0d84, 0xa960, 0x21e8, 0xa95c,
++	0x9188, 0x0019, 0x21a0, 0x900e, 0x20a9, 0x0020, 0x4104, 0xaa66,
++	0xa87a, 0x2079, 0x1800, 0x7988, 0x810c, 0x9188, 0x000c, 0x9182,
++	0x001a, 0x0210, 0x2009, 0x001a, 0x21a8, 0x810b, 0xa972, 0xac76,
++	0x2e98, 0xa85c, 0x9080, 0x001f, 0x20a0, 0x2001, 0x0205, 0x200c,
++	0x918d, 0x0080, 0x2102, 0x4003, 0x2003, 0x0000, 0x080c, 0x61a9,
++	0x009e, 0x00fe, 0x00de, 0x0005, 0x0016, 0x00d6, 0x00f6, 0x0096,
++	0x0016, 0x2001, 0x0205, 0x200c, 0x918d, 0x0080, 0x2102, 0x001e,
++	0x2079, 0x0200, 0x2e98, 0x2021, 0x003e, 0x901e, 0x9282, 0x0020,
++	0x0218, 0x2011, 0x0020, 0x2018, 0x9486, 0x003e, 0x1170, 0x0096,
++	0x080c, 0x0fae, 0x2900, 0x009e, 0x05b8, 0xa806, 0x2048, 0xa860,
++	0x20e8, 0xa85c, 0x9080, 0x0002, 0x20a0, 0x3300, 0x908e, 0x0260,
++	0x0140, 0x2009, 0x0280, 0x9102, 0x920a, 0x0218, 0x2010, 0x2100,
++	0x9318, 0x2200, 0x9402, 0x1220, 0x2410, 0x9006, 0x9398, 0x0002,
++	0x2020, 0x22a8, 0xa800, 0x9200, 0xa802, 0x20e1, 0x0000, 0x4003,
++	0x83ff, 0x0180, 0x3300, 0x9086, 0x0280, 0x1130, 0x7814, 0x8000,
++	0x9085, 0x0080, 0x7816, 0x2e98, 0x2310, 0x84ff, 0x0904, 0x988b,
++	0x0804, 0x988d, 0x9085, 0x0001, 0x7817, 0x0000, 0x009e, 0x00fe,
++	0x00de, 0x001e, 0x0005, 0x00d6, 0x0036, 0x0096, 0x6314, 0x2348,
++	0xa87a, 0xa982, 0x080c, 0x619c, 0x009e, 0x003e, 0x00de, 0x0005,
++	0x91b6, 0x0015, 0x1118, 0x080c, 0x9554, 0x0030, 0x91b6, 0x0016,
++	0x190c, 0x0d84, 0x080c, 0x9554, 0x0005, 0x20a9, 0x000e, 0x20e1,
++	0x0000, 0x2e98, 0x6014, 0x0096, 0x2048, 0xa860, 0x20e8, 0xa85c,
++	0x20a0, 0x009e, 0x4003, 0x0136, 0x9080, 0x001b, 0x2011, 0x0006,
++	0x20a9, 0x0001, 0x3418, 0x8318, 0x23a0, 0x4003, 0x3318, 0x8318,
++	0x2398, 0x8211, 0x1db8, 0x2011, 0x0006, 0x013e, 0x20a0, 0x3318,
++	0x8318, 0x2398, 0x4003, 0x3418, 0x8318, 0x23a0, 0x8211, 0x1db8,
++	0x0096, 0x080c, 0xb0ad, 0x0130, 0x6014, 0x2048, 0xa807, 0x0000,
++	0xa867, 0x0103, 0x009e, 0x0804, 0x9554, 0x0096, 0x00d6, 0x0036,
++	0x7330, 0x9386, 0x0200, 0x11a8, 0x6010, 0x00b6, 0x2058, 0xb8bf,
++	0x0000, 0x00be, 0x6014, 0x9005, 0x0130, 0x2048, 0xa807, 0x0000,
++	0xa867, 0x0103, 0xab32, 0x080c, 0x9554, 0x003e, 0x00de, 0x009e,
++	0x0005, 0x0011, 0x1d48, 0x0cc8, 0x0006, 0x0016, 0x080c, 0xb759,
++	0x0188, 0x6014, 0x9005, 0x1170, 0x600b, 0x0003, 0x601b, 0x0000,
++	0x6043, 0x0000, 0x2009, 0x0022, 0x080c, 0x9cf7, 0x9006, 0x001e,
++	0x000e, 0x0005, 0x9085, 0x0001, 0x0cd0, 0x0096, 0x0016, 0x20a9,
++	0x0014, 0x9e80, 0x000c, 0x20e1, 0x0000, 0x2098, 0x6014, 0x2048,
++	0xa860, 0x20e8, 0xa85c, 0x9080, 0x0002, 0x20a0, 0x4003, 0x2001,
++	0x0205, 0x2003, 0x0001, 0x2099, 0x0260, 0x20a9, 0x0016, 0x4003,
++	0x20a9, 0x000a, 0xa804, 0x2048, 0xa860, 0x20e8, 0xa85c, 0x9080,
++	0x0002, 0x20a0, 0x4003, 0x2001, 0x0205, 0x2003, 0x0002, 0x2099,
++	0x0260, 0x20a9, 0x0020, 0x4003, 0x2003, 0x0000, 0x6014, 0x2048,
++	0xa800, 0x2048, 0xa867, 0x0103, 0x080c, 0x9554, 0x001e, 0x009e,
++	0x0005, 0x0096, 0x0016, 0x900e, 0x7030, 0x9086, 0x0100, 0x0140,
++	0x7038, 0x9084, 0x00ff, 0x800c, 0x703c, 0x9084, 0x00ff, 0x8004,
++	0x9080, 0x0004, 0x9108, 0x810b, 0x2011, 0x0002, 0x2019, 0x000c,
++	0x6014, 0x2048, 0x080c, 0xace6, 0x080c, 0xb0ad, 0x0140, 0x6014,
++	0x2048, 0xa807, 0x0000, 0xa864, 0xa8e2, 0xa867, 0x0103, 0x080c,
++	0x9554, 0x001e, 0x009e, 0x0005, 0x0016, 0x0096, 0x7030, 0x9086,
++	0x0100, 0x1118, 0x2009, 0x0004, 0x0010, 0x7034, 0x800c, 0x810b,
++	0x2011, 0x000c, 0x2019, 0x000c, 0x6014, 0x2048, 0xa804, 0x0096,
++	0x9005, 0x0108, 0x2048, 0x080c, 0xace6, 0x009e, 0x080c, 0xb0ad,
++	0x0148, 0xa804, 0x9005, 0x1158, 0xa807, 0x0000, 0xa864, 0xa8e2,
++	0xa867, 0x0103, 0x080c, 0x9554, 0x009e, 0x001e, 0x0005, 0x0086,
++	0x2040, 0xa030, 0x8007, 0x9086, 0x0100, 0x1118, 0x080c, 0x9e99,
++	0x00e0, 0xa034, 0x8007, 0x800c, 0x8806, 0x8006, 0x8007, 0x90bc,
++	0x003f, 0x9084, 0xffc0, 0x9080, 0x000c, 0xa87b, 0x0000, 0xa883,
++	0x0000, 0xa897, 0x4000, 0xaaa0, 0xab9c, 0xaca8, 0xada4, 0x2031,
++	0x0000, 0x2041, 0x11e3, 0x0019, 0x0d08, 0x008e, 0x0898, 0x0096,
++	0x0006, 0x080c, 0x0fae, 0x000e, 0x01b0, 0xa8ab, 0x0dcb, 0xa876,
++	0x000e, 0xa8a2, 0x0006, 0xae6a, 0x2800, 0xa89e, 0xa97a, 0xaf72,
++	0xaa8e, 0xab92, 0xac96, 0xad9a, 0x0086, 0x2940, 0x080c, 0x108c,
++	0x008e, 0x9085, 0x0001, 0x009e, 0x0005, 0x00e6, 0x00d6, 0x0026,
++	0x7008, 0x9084, 0x00ff, 0x6210, 0x00b6, 0x2258, 0xba10, 0x00be,
++	0x9206, 0x1520, 0x700c, 0x6210, 0x00b6, 0x2258, 0xba14, 0x00be,
++	0x9206, 0x11e0, 0x6043, 0x0000, 0x2c68, 0x0016, 0x2009, 0x0035,
++	0x080c, 0xb6d9, 0x001e, 0x1158, 0x622c, 0x2268, 0x2071, 0x026c,
++	0x6b20, 0x9386, 0x0003, 0x0130, 0x9386, 0x0006, 0x0128, 0x080c,
++	0x9554, 0x0020, 0x0039, 0x0010, 0x080c, 0x9b31, 0x002e, 0x00de,
++	0x00ee, 0x0005, 0x0096, 0x6814, 0x2048, 0x9186, 0x0015, 0x0904,
++	0x9b19, 0x918e, 0x0016, 0x1904, 0x9b2f, 0x700c, 0x908c, 0xff00,
++	0x9186, 0x1700, 0x0120, 0x9186, 0x0300, 0x1904, 0x9af3, 0x89ff,
++	0x1138, 0x6800, 0x9086, 0x000f, 0x0904, 0x9ad6, 0x0804, 0x9b2d,
++	0x6808, 0x9086, 0xffff, 0x1904, 0x9b1b, 0xa87c, 0x9084, 0x0060,
++	0x9086, 0x0020, 0x1128, 0xa83c, 0xa940, 0x9105, 0x1904, 0x9b1b,
++	0x6824, 0xd0b4, 0x1904, 0x9b1b, 0x080c, 0xb278, 0x685c, 0xa882,
++	0xa87c, 0xc0dc, 0xc0f4, 0xc0d4, 0xa87e, 0x0026, 0x900e, 0x6a18,
++	0x2001, 0x000a, 0x080c, 0x7a4b, 0xa884, 0x920a, 0x0208, 0x8011,
++	0xaa86, 0x82ff, 0x002e, 0x1138, 0x00c6, 0x2d60, 0x080c, 0xae04,
++	0x00ce, 0x0804, 0x9b2d, 0x00c6, 0xa868, 0xd0fc, 0x1118, 0x080c,
++	0x5755, 0x0010, 0x080c, 0x5ac6, 0x00ce, 0x1904, 0x9b1b, 0x00c6,
++	0x2d60, 0x080c, 0x9554, 0x00ce, 0x0804, 0x9b2d, 0x00c6, 0x080c,
++	0x95a1, 0x0198, 0x6017, 0x0000, 0x6810, 0x6012, 0x080c, 0xb4e6,
++	0x6023, 0x0003, 0x6904, 0x00c6, 0x2d60, 0x080c, 0x9554, 0x00ce,
++	0x080c, 0x95ce, 0x00ce, 0x0804, 0x9b2d, 0x2001, 0x1955, 0x2004,
++	0x6842, 0x00ce, 0x04d0, 0x7008, 0x9086, 0x000b, 0x11c8, 0x6010,
++	0x00b6, 0x2058, 0xb900, 0xc1bc, 0xb902, 0x00be, 0x00c6, 0x2d60,
++	0xa883, 0x0003, 0x080c, 0xb71f, 0x6007, 0x0085, 0x6003, 0x000b,
++	0x6023, 0x0002, 0x080c, 0x7bcb, 0x080c, 0x8125, 0x00ce, 0x00e8,
++	0x700c, 0x9086, 0x2a00, 0x1138, 0x2001, 0x1955, 0x2004, 0x6842,
++	0x00a0, 0x0479, 0x00a0, 0x89ff, 0x090c, 0x0d84, 0x00c6, 0x00d6,
++	0x2d60, 0xa867, 0x0103, 0xa87b, 0x0003, 0x080c, 0xacd6, 0x080c,
++	0xb278, 0x080c, 0x9584, 0x00de, 0x00ce, 0x080c, 0x9554, 0x009e,
++	0x0005, 0x9186, 0x0015, 0x1128, 0x2001, 0x1955, 0x2004, 0x6842,
++	0x0068, 0x918e, 0x0016, 0x1160, 0x00c6, 0x2d00, 0x2060, 0x080c,
++	0xcc1f, 0x080c, 0x79df, 0x080c, 0x9554, 0x00ce, 0x080c, 0x9554,
++	0x0005, 0x0026, 0x0036, 0x0046, 0x7228, 0xacb0, 0xabac, 0xd2f4,
++	0x0130, 0x2001, 0x1955, 0x2004, 0x6842, 0x0804, 0x9ba9, 0x00c6,
++	0x2d60, 0x080c, 0xad11, 0x00ce, 0x6804, 0x9086, 0x0050, 0x1168,
++	0x00c6, 0x2d00, 0x2060, 0x6003, 0x0001, 0x6007, 0x0050, 0x080c,
++	0x7bcb, 0x080c, 0x8125, 0x00ce, 0x04e0, 0x6800, 0x9086, 0x000f,
++	0x01b0, 0x89ff, 0x090c, 0x0d84, 0x6800, 0x9086, 0x0004, 0x1198,
++	0xa87c, 0xd0ac, 0x0180, 0xa843, 0x0fff, 0xa83f, 0x0fff, 0xa880,
++	0xc0f4, 0xc0fc, 0xa882, 0x2001, 0x0001, 0x6832, 0x00e8, 0x2001,
++	0x0007, 0x6832, 0x00c8, 0xa87c, 0xd0b4, 0x1138, 0xd0ac, 0x0db8,
++	0xa838, 0xa934, 0x9105, 0x0d98, 0x0c30, 0xd2ec, 0x1d80, 0x7024,
++	0x9306, 0x1118, 0x7020, 0x9406, 0x0d50, 0x7020, 0x683e, 0x7024,
++	0x683a, 0x2001, 0x0005, 0x6832, 0x080c, 0xb3e0, 0x080c, 0x8125,
++	0x0010, 0x080c, 0x9554, 0x004e, 0x003e, 0x002e, 0x0005, 0x00e6,
++	0x00d6, 0x0026, 0x7008, 0x9084, 0x00ff, 0x6210, 0x00b6, 0x2258,
++	0xba10, 0x00be, 0x9206, 0x1904, 0x9c11, 0x700c, 0x6210, 0x00b6,
++	0x2258, 0xba14, 0x00be, 0x9206, 0x1904, 0x9c11, 0x6038, 0x2068,
++	0x6a20, 0x9286, 0x0007, 0x0904, 0x9c11, 0x9286, 0x0002, 0x0904,
++	0x9c11, 0x9286, 0x0000, 0x05e8, 0x6808, 0x633c, 0x9306, 0x15c8,
++	0x2071, 0x026c, 0x9186, 0x0015, 0x0570, 0x918e, 0x0016, 0x1100,
++	0x00c6, 0x6038, 0x2060, 0x6104, 0x9186, 0x004b, 0x01c0, 0x9186,
++	0x004c, 0x01a8, 0x9186, 0x004d, 0x0190, 0x9186, 0x004e, 0x0178,
++	0x9186, 0x0052, 0x0160, 0x6014, 0x0096, 0x2048, 0x080c, 0xb0ad,
++	0x090c, 0x0d84, 0xa883, 0x0003, 0x009e, 0x080c, 0xb71f, 0x6007,
++	0x0085, 0x6003, 0x000b, 0x6023, 0x0002, 0x080c, 0x7bcb, 0x080c,
++	0x8125, 0x00ce, 0x0030, 0x6038, 0x2070, 0x2001, 0x1955, 0x2004,
++	0x7042, 0x080c, 0x9554, 0x002e, 0x00de, 0x00ee, 0x0005, 0x00b6,
++	0x0096, 0x00f6, 0x6014, 0x2048, 0x6010, 0x2058, 0x91b6, 0x0015,
++	0x0130, 0xba08, 0xbb0c, 0xbc00, 0xc48c, 0xbc02, 0x0460, 0x0096,
++	0x0156, 0x0036, 0x0026, 0x2b48, 0x9e90, 0x0010, 0x2019, 0x000a,
++	0x20a9, 0x0004, 0x080c, 0xa439, 0x002e, 0x003e, 0x015e, 0x009e,
++	0x1904, 0x9c80, 0x0096, 0x0156, 0x0036, 0x0026, 0x2b48, 0x9e90,
++	0x0014, 0x2019, 0x0006, 0x20a9, 0x0004, 0x080c, 0xa439, 0x002e,
++	0x003e, 0x015e, 0x009e, 0x15a0, 0x7238, 0xba0a, 0x733c, 0xbb0e,
++	0xbc00, 0xc48d, 0xbc02, 0xa804, 0x9005, 0x1128, 0x00fe, 0x009e,
++	0x00be, 0x0804, 0x9920, 0x0096, 0x2048, 0xaa12, 0xab16, 0xac0a,
++	0x009e, 0x8006, 0x8006, 0x8007, 0x90bc, 0x003f, 0x9084, 0xffc0,
++	0x9080, 0x0002, 0x2009, 0x002b, 0xaaa0, 0xab9c, 0xaca8, 0xada4,
++	0x2031, 0x0000, 0x2041, 0x11e3, 0x080c, 0x9a1f, 0x0130, 0x00fe,
++	0x009e, 0x080c, 0x9554, 0x00be, 0x0005, 0x080c, 0x9e99, 0x0cb8,
++	0x2b78, 0x00f6, 0x080c, 0x2d1a, 0x080c, 0xb76c, 0x00fe, 0x00c6,
++	0x080c, 0x94fe, 0x2f00, 0x6012, 0x6017, 0x0000, 0x6023, 0x0001,
++	0x6007, 0x0001, 0x6003, 0x0001, 0x2001, 0x0007, 0x080c, 0x5b61,
++	0x080c, 0x5b8d, 0x080c, 0x7c1d, 0x080c, 0x8125, 0x00ce, 0x0804,
++	0x9c53, 0x2100, 0x91b2, 0x0053, 0x1a0c, 0x0d84, 0x91b2, 0x0040,
++	0x1a04, 0x9d09, 0x0002, 0x9cf7, 0x9cf7, 0x9ced, 0x9cf7, 0x9cf7,
++	0x9cf7, 0x9ceb, 0x9ceb, 0x9ceb, 0x9ceb, 0x9ceb, 0x9ceb, 0x9ceb,
++	0x9ceb, 0x9ceb, 0x9ceb, 0x9ceb, 0x9ceb, 0x9ceb, 0x9ceb, 0x9ceb,
++	0x9ceb, 0x9ceb, 0x9ceb, 0x9ceb, 0x9ceb, 0x9ceb, 0x9ceb, 0x9ceb,
++	0x9ceb, 0x9ceb, 0x9cf7, 0x9ceb, 0x9cf7, 0x9cf7, 0x9ceb, 0x9ceb,
++	0x9ceb, 0x9ceb, 0x9ceb, 0x9ced, 0x9ceb, 0x9ceb, 0x9ceb, 0x9ceb,
++	0x9ceb, 0x9ceb, 0x9ceb, 0x9ceb, 0x9ceb, 0x9cf7, 0x9cf7, 0x9ceb,
++	0x9ceb, 0x9ceb, 0x9ceb, 0x9ceb, 0x9ceb, 0x9ceb, 0x9ceb, 0x9ceb,
++	0x9cf7, 0x9ceb, 0x9ceb, 0x080c, 0x0d84, 0x0066, 0x00b6, 0x6610,
++	0x2658, 0xb8bc, 0xc08c, 0xb8be, 0x00be, 0x006e, 0x0000, 0x6003,
++	0x0001, 0x6106, 0x9186, 0x0032, 0x0118, 0x080c, 0x7c1d, 0x0010,
++	0x080c, 0x7bcb, 0x0126, 0x2091, 0x8000, 0x080c, 0x8125, 0x012e,
++	0x0005, 0x2600, 0x0002, 0x9d1d, 0x9d1d, 0x9d1d, 0x9cf7, 0x9cf7,
++	0x9d1d, 0x9d1d, 0x9d1d, 0x9d1d, 0x9cf7, 0x9d1d, 0x9cf7, 0x9d1d,
++	0x9cf7, 0x9d1d, 0x9d1d, 0x9d1d, 0x9d1d, 0x080c, 0x0d84, 0x6004,
++	0x90b2, 0x0053, 0x1a0c, 0x0d84, 0x91b6, 0x0013, 0x0904, 0x9dd4,
++	0x91b6, 0x0027, 0x1904, 0x9d8f, 0x080c, 0x8026, 0x6004, 0x080c,
++	0xb284, 0x01a8, 0x080c, 0xb295, 0x01a0, 0x908e, 0x0021, 0x0904,
++	0x9d8c, 0x908e, 0x0022, 0x1130, 0x080c, 0x994c, 0x0904, 0x9d88,
++	0x0804, 0x9d89, 0x908e, 0x003d, 0x0904, 0x9d8c, 0x04d8, 0x080c,
++	0x2d3f, 0x2001, 0x0007, 0x080c, 0x5b61, 0x6010, 0x00b6, 0x2058,
++	0xb9a0, 0x00be, 0x080c, 0x9e99, 0x9186, 0x007e, 0x1148, 0x2001,
++	0x1836, 0x2014, 0xc285, 0x080c, 0x6877, 0x1108, 0xc2ad, 0x2202,
++	0x0036, 0x2019, 0x0028, 0x080c, 0x2e2f, 0x003e, 0x0016, 0x0026,
++	0x0036, 0x2110, 0x2019, 0x0028, 0x080c, 0x7d55, 0x0076, 0x903e,
++	0x080c, 0x7c4d, 0x6010, 0x00b6, 0x905d, 0x0100, 0x00be, 0x2c08,
++	0x080c, 0xc73e, 0x007e, 0x003e, 0x002e, 0x001e, 0x080c, 0xb76c,
++	0x080c, 0x5bd1, 0x080c, 0xb4de, 0x080c, 0x9554, 0x080c, 0x8125,
++	0x0005, 0x080c, 0x9e99, 0x0cb0, 0x080c, 0x9ed5, 0x0c98, 0x9186,
++	0x0014, 0x1db0, 0x080c, 0x8026, 0x6004, 0x908e, 0x0022, 0x1118,
++	0x080c, 0x994c, 0x0d68, 0x080c, 0x2d1a, 0x080c, 0xb76c, 0x080c,
++	0xb284, 0x1190, 0x080c, 0x2d3f, 0x6010, 0x00b6, 0x2058, 0xb9a0,
++	0x00be, 0x080c, 0x9e99, 0x9186, 0x007e, 0x1128, 0x2001, 0x1836,
++	0x200c, 0xc185, 0x2102, 0x0870, 0x080c, 0xb295, 0x1118, 0x080c,
++	0x9e99, 0x0840, 0x6004, 0x908e, 0x0032, 0x1160, 0x00e6, 0x00f6,
++	0x2071, 0x1893, 0x2079, 0x0000, 0x080c, 0x308f, 0x00fe, 0x00ee,
++	0x0804, 0x9d82, 0x6004, 0x908e, 0x0021, 0x0d48, 0x908e, 0x0022,
++	0x090c, 0x9e99, 0x0804, 0x9d82, 0x90b2, 0x0040, 0x1a04, 0x9e82,
++	0x2008, 0x0002, 0x9e1c, 0x9e1d, 0x9e20, 0x9e23, 0x9e26, 0x9e29,
++	0x9e1a, 0x9e1a, 0x9e1a, 0x9e1a, 0x9e1a, 0x9e1a, 0x9e1a, 0x9e1a,
++	0x9e1a, 0x9e1a, 0x9e1a, 0x9e1a, 0x9e1a, 0x9e1a, 0x9e1a, 0x9e1a,
++	0x9e1a, 0x9e1a, 0x9e1a, 0x9e1a, 0x9e1a, 0x9e1a, 0x9e1a, 0x9e1a,
++	0x9e2c, 0x9e37, 0x9e1a, 0x9e39, 0x9e37, 0x9e1a, 0x9e1a, 0x9e1a,
++	0x9e1a, 0x9e1a, 0x9e37, 0x9e37, 0x9e1a, 0x9e1a, 0x9e1a, 0x9e1a,
++	0x9e1a, 0x9e1a, 0x9e1a, 0x9e1a, 0x9e69, 0x9e37, 0x9e1a, 0x9e33,
++	0x9e1a, 0x9e1a, 0x9e1a, 0x9e34, 0x9e1a, 0x9e1a, 0x9e1a, 0x9e37,
++	0x9e60, 0x9e1a, 0x080c, 0x0d84, 0x00d0, 0x2001, 0x000b, 0x0410,
++	0x2001, 0x0003, 0x00f8, 0x2001, 0x0005, 0x00e0, 0x2001, 0x0001,
++	0x00c8, 0x2001, 0x0009, 0x00b0, 0x080c, 0x8026, 0x6003, 0x0005,
++	0x080c, 0x8125, 0x0070, 0x0018, 0x0010, 0x080c, 0x5b61, 0x0804,
++	0x9e7a, 0x080c, 0x8026, 0x080c, 0xb76f, 0x6003, 0x0004, 0x080c,
++	0x8125, 0x0005, 0x080c, 0x5b61, 0x080c, 0x8026, 0x6003, 0x0002,
++	0x0036, 0x2019, 0x185d, 0x2304, 0x9084, 0xff00, 0x1120, 0x2001,
++	0x1953, 0x201c, 0x0040, 0x8007, 0x909a, 0x0004, 0x0ec0, 0x8003,
++	0x801b, 0x831b, 0x9318, 0x631a, 0x003e, 0x080c, 0x8125, 0x0c08,
++	0x080c, 0x8026, 0x080c, 0xb4de, 0x080c, 0x9554, 0x080c, 0x8125,
++	0x08c0, 0x00e6, 0x00f6, 0x2071, 0x1893, 0x2079, 0x0000, 0x080c,
++	0x308f, 0x00fe, 0x00ee, 0x080c, 0x8026, 0x080c, 0x9554, 0x080c,
++	0x8125, 0x0838, 0x080c, 0x8026, 0x6003, 0x0002, 0x080c, 0xb76f,
++	0x0804, 0x8125, 0x2600, 0x2008, 0x0002, 0x9e97, 0x9e97, 0x9e97,
++	0x9e7a, 0x9e7a, 0x9e97, 0x9e97, 0x9e97, 0x9e97, 0x9e7a, 0x9e97,
++	0x9e7a, 0x9e97, 0x9e7a, 0x9e97, 0x9e97, 0x9e97, 0x9e97, 0x080c,
++	0x0d84, 0x00e6, 0x0096, 0x0026, 0x0016, 0x080c, 0xb0ad, 0x0568,
++	0x6014, 0x2048, 0xa864, 0x9086, 0x0139, 0x11a8, 0xa894, 0x9086,
++	0x0056, 0x1148, 0x080c, 0x4b95, 0x0130, 0x2001, 0x0000, 0x900e,
++	0x2011, 0x4000, 0x0028, 0x2001, 0x0030, 0x900e, 0x2011, 0x4005,
++	0x080c, 0xb644, 0x0090, 0xa868, 0xd0fc, 0x0178, 0xa807, 0x0000,
++	0x0016, 0x6004, 0x908e, 0x0021, 0x0168, 0x908e, 0x003d, 0x0150,
++	0x001e, 0xa867, 0x0103, 0xa833, 0x0100, 0x001e, 0x002e, 0x009e,
++	0x00ee, 0x0005, 0x001e, 0x0009, 0x0cc0, 0x0096, 0x6014, 0x2048,
++	0xa800, 0x2048, 0xa867, 0x0103, 0xa823, 0x8001, 0x009e, 0x0005,
++	0x00b6, 0x6610, 0x2658, 0xb804, 0x9084, 0x00ff, 0x90b2, 0x000c,
++	0x1a0c, 0x0d84, 0x6604, 0x96b6, 0x004d, 0x1120, 0x080c, 0xb56a,
++	0x0804, 0x9f5d, 0x6604, 0x96b6, 0x0043, 0x1120, 0x080c, 0xb5b3,
++	0x0804, 0x9f5d, 0x6604, 0x96b6, 0x004b, 0x1120, 0x080c, 0xb5df,
++	0x0804, 0x9f5d, 0x6604, 0x96b6, 0x0033, 0x1120, 0x080c, 0xb500,
++	0x0804, 0x9f5d, 0x6604, 0x96b6, 0x0028, 0x1120, 0x080c, 0xb2c4,
++	0x0804, 0x9f5d, 0x6604, 0x96b6, 0x0029, 0x1120, 0x080c, 0xb305,
++	0x0804, 0x9f5d, 0x6604, 0x96b6, 0x001f, 0x1118, 0x080c, 0x98f5,
++	0x04e0, 0x6604, 0x96b6, 0x0000, 0x1118, 0x080c, 0x9c17, 0x04a8,
++	0x6604, 0x96b6, 0x0022, 0x1118, 0x080c, 0x992d, 0x0470, 0x6604,
++	0x96b6, 0x0035, 0x1118, 0x080c, 0x9a3d, 0x0438, 0x6604, 0x96b6,
++	0x0039, 0x1118, 0x080c, 0x9baf, 0x0400, 0x6604, 0x96b6, 0x003d,
++	0x1118, 0x080c, 0x9965, 0x00c8, 0x6604, 0x96b6, 0x0044, 0x1118,
++	0x080c, 0x99a1, 0x0090, 0x6604, 0x96b6, 0x0049, 0x1118, 0x080c,
++	0x99cc, 0x0058, 0x91b6, 0x0015, 0x1110, 0x0063, 0x0030, 0x91b6,
++	0x0016, 0x1128, 0x00be, 0x0804, 0xa178, 0x00be, 0x0005, 0x080c,
++	0x95e9, 0x0cd8, 0x9f7a, 0x9f7d, 0x9f7a, 0x9fc2, 0x9f7a, 0xa0f1,
++	0xa185, 0x9f7a, 0x9f7a, 0xa152, 0x9f7a, 0xa166, 0x0096, 0x080c,
++	0x1489, 0x6014, 0x2048, 0xa800, 0x2048, 0xa867, 0x0103, 0x009e,
++	0x0804, 0x9554, 0xa001, 0xa001, 0x0005, 0x00e6, 0x2071, 0x1800,
++	0x7088, 0x9086, 0x0074, 0x1540, 0x080c, 0xc70f, 0x11b0, 0x6010,
++	0x00b6, 0x2058, 0x7030, 0xd08c, 0x0128, 0xb800, 0xd0bc, 0x0110,
++	0xc0c5, 0xb802, 0x00e9, 0x00be, 0x2001, 0x0006, 0x080c, 0x5b61,
++	0x080c, 0x2d3f, 0x080c, 0x9554, 0x0088, 0x2001, 0x000a, 0x080c,
++	0x5b61, 0x080c, 0x2d3f, 0x6003, 0x0001, 0x6007, 0x0001, 0x080c,
++	0x7c1d, 0x080c, 0x8125, 0x0010, 0x080c, 0xa0dc, 0x00ee, 0x0005,
++	0x00d6, 0xb800, 0xd084, 0x0160, 0x9006, 0x080c, 0x5b4d, 0x2069,
++	0x1852, 0x6804, 0xd0a4, 0x0120, 0x2001, 0x0006, 0x080c, 0x5b8d,
++	0x00de, 0x0005, 0x00b6, 0x0096, 0x00d6, 0x2011, 0x1822, 0x2204,
++	0x9086, 0x0074, 0x1904, 0xa0c0, 0x6010, 0x2058, 0xbaa0, 0x9286,
++	0x007e, 0x1120, 0x080c, 0xa2c7, 0x0804, 0xa025, 0x080c, 0xa2bc,
++	0x6010, 0x2058, 0xbaa0, 0x9286, 0x0080, 0x1510, 0x6014, 0x9005,
++	0x01a8, 0x2048, 0xa864, 0x9084, 0x00ff, 0x9086, 0x0039, 0x1140,
++	0x2001, 0x0000, 0x900e, 0x2011, 0x4000, 0x080c, 0xb644, 0x0030,
++	0xa807, 0x0000, 0xa867, 0x0103, 0xa833, 0x0200, 0x2001, 0x0006,
++	0x080c, 0x5b61, 0x080c, 0x2d3f, 0x080c, 0x9554, 0x0804, 0xa0c1,
++	0x080c, 0xa0c5, 0x6014, 0x9005, 0x0190, 0x2048, 0xa868, 0xd0f4,
++	0x0170, 0xa864, 0x9084, 0x00ff, 0x9086, 0x0039, 0x1d08, 0x2001,
++	0x0000, 0x900e, 0x2011, 0x4000, 0x080c, 0xb644, 0x08f8, 0x2001,
++	0x0004, 0x080c, 0x5b61, 0x6003, 0x0001, 0x6007, 0x0003, 0x080c,
++	0x7c1d, 0x080c, 0x8125, 0x0804, 0xa0c1, 0xb85c, 0xd0e4, 0x01d0,
++	0x080c, 0xb480, 0x080c, 0x6877, 0x0110, 0xd0dc, 0x1938, 0x2011,
++	0x1836, 0x2204, 0xc0ad, 0x2012, 0x2001, 0x193c, 0x2004, 0x00f6,
++	0x2079, 0x0100, 0x78e3, 0x0000, 0x080c, 0x2471, 0x78e2, 0x00fe,
++	0x0804, 0x9ff6, 0x080c, 0xb4bd, 0x2011, 0x1836, 0x2204, 0xc0a5,
++	0x2012, 0x0006, 0x080c, 0xc860, 0x000e, 0x1904, 0x9ff6, 0xc0b5,
++	0x2012, 0x2001, 0x0006, 0x080c, 0x5b61, 0x9006, 0x080c, 0x5b4d,
++	0x00c6, 0x2001, 0x180e, 0x2004, 0xd09c, 0x0520, 0x00f6, 0x2079,
++	0x0100, 0x00e6, 0x2071, 0x1800, 0x700c, 0x9084, 0x00ff, 0x78e6,
++	0x7076, 0x7010, 0x78ea, 0x707a, 0x908c, 0x00ff, 0x00ee, 0x780c,
++	0xc0b5, 0x780e, 0x00fe, 0x080c, 0x2446, 0x00f6, 0x2100, 0x900e,
++	0x080c, 0x23fd, 0x7956, 0x00fe, 0x9186, 0x0081, 0x01d8, 0x2009,
++	0x0081, 0x00c8, 0x2009, 0x00ef, 0x00f6, 0x2079, 0x0100, 0x79ea,
++	0x7932, 0x7936, 0x780c, 0xc0b5, 0x780e, 0x00fe, 0x080c, 0x2446,
++	0x00f6, 0x2079, 0x1800, 0x797a, 0x2100, 0x900e, 0x080c, 0x23fd,
++	0x7956, 0x00fe, 0x8108, 0x080c, 0x5bb0, 0x2b00, 0x00ce, 0x1904,
++	0x9ff6, 0x6012, 0x2009, 0x180e, 0x210c, 0xd19c, 0x0150, 0x2009,
++	0x027c, 0x210c, 0x918c, 0x00ff, 0xb912, 0x2009, 0x027d, 0x210c,
++	0xb916, 0x2001, 0x0002, 0x080c, 0x5b61, 0x6023, 0x0001, 0x6003,
++	0x0001, 0x6007, 0x0002, 0x080c, 0x7c1d, 0x080c, 0x8125, 0x0008,
++	0x00d9, 0x00de, 0x009e, 0x00be, 0x0005, 0x00e6, 0x080c, 0xccd1,
++	0x0188, 0x2071, 0x0260, 0x7108, 0x720c, 0x918c, 0x00ff, 0x1118,
++	0x9284, 0xff00, 0x0138, 0x6010, 0x2058, 0xb8a0, 0xd0bc, 0x1110,
++	0xb912, 0xba16, 0x00ee, 0x0005, 0x2030, 0x2001, 0x0007, 0x080c,
++	0x5b61, 0x080c, 0x4dfe, 0x1120, 0x2001, 0x0007, 0x080c, 0x5b8d,
++	0x080c, 0x2d3f, 0x6020, 0x9086, 0x000a, 0x1108, 0x0005, 0x0804,
++	0x9554, 0x00b6, 0x00e6, 0x0026, 0x0016, 0x2071, 0x1800, 0x7088,
++	0x9086, 0x0014, 0x1904, 0xa149, 0x080c, 0x4dfe, 0x1170, 0x6014,
++	0x9005, 0x1158, 0x0036, 0x0046, 0x6010, 0x2058, 0xbba0, 0x2021,
++	0x0006, 0x080c, 0x44f9, 0x004e, 0x003e, 0x00d6, 0x6010, 0x2058,
++	0x080c, 0x5ca8, 0x080c, 0x9fb0, 0x00de, 0x080c, 0xa38d, 0x1588,
++	0x6010, 0x2058, 0xb890, 0x9005, 0x0560, 0x2001, 0x0006, 0x080c,
++	0x5b61, 0x0096, 0x6014, 0x904d, 0x01d0, 0xa864, 0x9084, 0x00ff,
++	0x9086, 0x0039, 0x1140, 0x2001, 0x0000, 0x900e, 0x2011, 0x4000,
++	0x080c, 0xb644, 0x0060, 0xa864, 0x9084, 0x00ff, 0x9086, 0x0029,
++	0x0130, 0xa807, 0x0000, 0xa867, 0x0103, 0xa833, 0x0200, 0x009e,
++	0x080c, 0x2d3f, 0x6020, 0x9086, 0x000a, 0x0138, 0x080c, 0x9554,
++	0x0020, 0x080c, 0x9e99, 0x080c, 0xa0dc, 0x001e, 0x002e, 0x00ee,
++	0x00be, 0x0005, 0x2011, 0x1822, 0x2204, 0x9086, 0x0014, 0x1160,
++	0x2001, 0x0002, 0x080c, 0x5b61, 0x6003, 0x0001, 0x6007, 0x0001,
++	0x080c, 0x7c1d, 0x0804, 0x8125, 0x0804, 0xa0dc, 0x2030, 0x2011,
++	0x1822, 0x2204, 0x9086, 0x0004, 0x1148, 0x96b6, 0x000b, 0x1120,
++	0x2001, 0x0007, 0x080c, 0x5b61, 0x0804, 0x9554, 0x0804, 0xa0dc,
++	0x0002, 0x9f7a, 0xa190, 0x9f7a, 0xa1cf, 0x9f7a, 0xa278, 0xa185,
++	0x9f7a, 0x9f7a, 0xa28b, 0x9f7a, 0xa29b, 0x6604, 0x9686, 0x0003,
++	0x0904, 0xa0f1, 0x96b6, 0x001e, 0x1110, 0x080c, 0x9554, 0x0005,
++	0x00b6, 0x00d6, 0x00c6, 0x080c, 0xa2ab, 0x11a0, 0x9006, 0x080c,
++	0x5b4d, 0x080c, 0x2d1a, 0x080c, 0xb76c, 0x2001, 0x0002, 0x080c,
++	0x5b61, 0x6003, 0x0001, 0x6007, 0x0002, 0x080c, 0x7c1d, 0x080c,
++	0x8125, 0x0408, 0x2009, 0x026e, 0x2104, 0x9086, 0x0009, 0x1160,
++	0x6010, 0x2058, 0xb840, 0x9084, 0x00ff, 0x9005, 0x0170, 0x8001,
++	0xb842, 0x601b, 0x000a, 0x0078, 0x2009, 0x026f, 0x2104, 0x9084,
++	0xff00, 0x9086, 0x1900, 0x1108, 0x08a0, 0x080c, 0x2d1a, 0x080c,
++	0xb76c, 0x080c, 0xa0dc, 0x00ce, 0x00de, 0x00be, 0x0005, 0x0096,
++	0x00b6, 0x0026, 0x9016, 0x080c, 0xa2b9, 0x00d6, 0x2069, 0x194b,
++	0x2d04, 0x9005, 0x0168, 0x6010, 0x2058, 0xb8a0, 0x9086, 0x007e,
++	0x1138, 0x2069, 0x181e, 0x2d04, 0x8000, 0x206a, 0x00de, 0x0010,
++	0x00de, 0x0088, 0x9006, 0x080c, 0x5b4d, 0x2001, 0x0002, 0x080c,
++	0x5b61, 0x6003, 0x0001, 0x6007, 0x0002, 0x080c, 0x7c1d, 0x080c,
++	0x8125, 0x0804, 0xa248, 0x080c, 0xb0ad, 0x01a0, 0x6014, 0x2048,
++	0xa864, 0x2010, 0x9086, 0x0139, 0x1128, 0x2001, 0x0002, 0x080c,
++	0xb69a, 0x00b0, 0x6014, 0x2048, 0xa864, 0xd0fc, 0x0118, 0x2001,
++	0x0001, 0x0ca8, 0x2001, 0x180d, 0x2004, 0xd0dc, 0x0148, 0x6010,
++	0x2058, 0xb840, 0x9084, 0x00ff, 0x9005, 0x1110, 0x9006, 0x0c38,
++	0x080c, 0x9e99, 0x2009, 0x026e, 0x2134, 0x96b4, 0x00ff, 0x9686,
++	0x0005, 0x0510, 0x9686, 0x000b, 0x01c8, 0x2009, 0x026f, 0x2104,
++	0x9084, 0xff00, 0x1118, 0x9686, 0x0009, 0x01b0, 0x9086, 0x1900,
++	0x1168, 0x9686, 0x0009, 0x0180, 0x2001, 0x0004, 0x080c, 0x5b61,
++	0x2001, 0x0028, 0x601a, 0x6007, 0x0052, 0x0010, 0x080c, 0xa0dc,
++	0x002e, 0x00be, 0x009e, 0x0005, 0x9286, 0x0139, 0x0160, 0x6014,
++	0x2048, 0x080c, 0xb0ad, 0x0140, 0xa864, 0x9086, 0x0139, 0x0118,
++	0xa868, 0xd0fc, 0x0108, 0x0c50, 0x6010, 0x2058, 0xb840, 0x9084,
++	0x00ff, 0x9005, 0x0138, 0x8001, 0xb842, 0x601b, 0x000a, 0x6007,
++	0x0016, 0x08f0, 0xb8a0, 0x9086, 0x007e, 0x1138, 0x00e6, 0x2071,
++	0x1800, 0x080c, 0x5677, 0x00ee, 0x0010, 0x080c, 0x2d1a, 0x0870,
++	0x080c, 0xa2b9, 0x1160, 0x2001, 0x0004, 0x080c, 0x5b61, 0x6003,
++	0x0001, 0x6007, 0x0003, 0x080c, 0x7c1d, 0x0804, 0x8125, 0x080c,
++	0x9e99, 0x0804, 0xa0dc, 0x0469, 0x1160, 0x2001, 0x0008, 0x080c,
++	0x5b61, 0x6003, 0x0001, 0x6007, 0x0005, 0x080c, 0x7c1d, 0x0804,
++	0x8125, 0x0804, 0xa0dc, 0x00e9, 0x1160, 0x2001, 0x000a, 0x080c,
++	0x5b61, 0x6003, 0x0001, 0x6007, 0x0001, 0x080c, 0x7c1d, 0x0804,
++	0x8125, 0x0804, 0xa0dc, 0x2009, 0x026e, 0x2104, 0x9086, 0x0003,
++	0x1138, 0x2009, 0x026f, 0x2104, 0x9084, 0xff00, 0x9086, 0x2a00,
++	0x0005, 0x9085, 0x0001, 0x0005, 0x00b6, 0x00c6, 0x0016, 0x6110,
++	0x2158, 0x080c, 0x5c1c, 0x001e, 0x00ce, 0x00be, 0x0005, 0x00b6,
++	0x00f6, 0x00e6, 0x00d6, 0x0036, 0x0016, 0x6010, 0x2058, 0x2009,
++	0x1836, 0x2104, 0x9085, 0x0003, 0x200a, 0x080c, 0xa35f, 0x0560,
++	0x2009, 0x1836, 0x2104, 0xc0cd, 0x200a, 0x080c, 0x5f29, 0x0158,
++	0x9006, 0x2020, 0x2009, 0x002a, 0x080c, 0xc9c5, 0x2001, 0x180c,
++	0x200c, 0xc195, 0x2102, 0x2019, 0x002a, 0x2009, 0x0001, 0x080c,
++	0x2ce5, 0x00e6, 0x2071, 0x1800, 0x080c, 0x2b1e, 0x00ee, 0x00c6,
++	0x0156, 0x20a9, 0x0781, 0x2009, 0x007f, 0x080c, 0x2e11, 0x8108,
++	0x1f04, 0xa2fd, 0x015e, 0x00ce, 0x080c, 0xa2bc, 0x2071, 0x0260,
++	0x2079, 0x0200, 0x7817, 0x0001, 0x2001, 0x1836, 0x200c, 0xc1c5,
++	0x7018, 0xd0fc, 0x0110, 0xd0dc, 0x0118, 0x7038, 0xd0dc, 0x1108,
++	0xc1c4, 0x7817, 0x0000, 0x2001, 0x1836, 0x2102, 0x2079, 0x0100,
++	0x2e04, 0x9084, 0x00ff, 0x2069, 0x181d, 0x206a, 0x78e6, 0x0006,
++	0x8e70, 0x2e04, 0x2069, 0x181e, 0x206a, 0x78ea, 0x7832, 0x7836,
++	0x2010, 0x9084, 0xff00, 0x001e, 0x9105, 0x2009, 0x182a, 0x200a,
++	0x2200, 0x9084, 0x00ff, 0x2008, 0x080c, 0x2446, 0x080c, 0x6877,
++	0x0170, 0x2071, 0x0260, 0x2069, 0x194f, 0x7048, 0x206a, 0x704c,
++	0x6806, 0x7050, 0x680a, 0x7054, 0x680e, 0x080c, 0xb480, 0x0040,
++	0x2001, 0x0006, 0x080c, 0x5b61, 0x080c, 0x2d3f, 0x080c, 0x9554,
++	0x001e, 0x003e, 0x00de, 0x00ee, 0x00fe, 0x00be, 0x0005, 0x0096,
++	0x0026, 0x0036, 0x00e6, 0x0156, 0x2019, 0x182a, 0x231c, 0x83ff,
++	0x01f0, 0x2071, 0x0260, 0x7200, 0x9294, 0x00ff, 0x7004, 0x9084,
++	0xff00, 0x9205, 0x9306, 0x1198, 0x2011, 0x0276, 0x20a9, 0x0004,
++	0x2b48, 0x2019, 0x000a, 0x080c, 0xa439, 0x1148, 0x2011, 0x027a,
++	0x20a9, 0x0004, 0x2019, 0x0006, 0x080c, 0xa439, 0x1100, 0x015e,
++	0x00ee, 0x003e, 0x002e, 0x009e, 0x0005, 0x00e6, 0x2071, 0x0260,
++	0x7034, 0x9086, 0x0014, 0x11a8, 0x7038, 0x9086, 0x0800, 0x1188,
++	0x703c, 0xd0ec, 0x0160, 0x9084, 0x0f00, 0x9086, 0x0100, 0x1138,
++	0x7054, 0xd0a4, 0x1110, 0xd0ac, 0x0110, 0x9006, 0x0010, 0x9085,
++	0x0001, 0x00ee, 0x0005, 0x00e6, 0x0096, 0x00c6, 0x0076, 0x0056,
++	0x0046, 0x0026, 0x0006, 0x0126, 0x2091, 0x8000, 0x2029, 0x19bd,
++	0x252c, 0x2021, 0x19c3, 0x2424, 0x2061, 0x1cd0, 0x2071, 0x1800,
++	0x724c, 0x706c, 0x9202, 0x1a04, 0xa411, 0x080c, 0xc9f1, 0x0904,
++	0xa40a, 0x6720, 0x9786, 0x0007, 0x05e8, 0x2500, 0x9c06, 0x05d0,
++	0x2400, 0x9c06, 0x05b8, 0x3e08, 0x9186, 0x0002, 0x1148, 0x6010,
++	0x9005, 0x0130, 0x00b6, 0x2058, 0xb800, 0x00be, 0xd0bc, 0x1550,
++	0x00c6, 0x6000, 0x9086, 0x0004, 0x1110, 0x080c, 0x17b0, 0x9786,
++	0x0008, 0x1148, 0x080c, 0xb295, 0x1130, 0x00ce, 0x080c, 0x9e99,
++	0x080c, 0x9584, 0x00b8, 0x6014, 0x2048, 0x080c, 0xb0ad, 0x0178,
++	0x9786, 0x0003, 0x1500, 0x080c, 0xc810, 0x0110, 0xa867, 0x0103,
++	0xab7a, 0xa877, 0x0000, 0x080c, 0x619c, 0x080c, 0xb278, 0x080c,
++	0x9584, 0x00ce, 0x9ce0, 0x0018, 0x7060, 0x9c02, 0x1210, 0x0804,
++	0xa3c0, 0x012e, 0x000e, 0x002e, 0x004e, 0x005e, 0x007e, 0x00ce,
++	0x009e, 0x00ee, 0x0005, 0x9786, 0x0006, 0x1118, 0x080c, 0xc970,
++	0x0c30, 0x9786, 0x000a, 0x09e0, 0x08b0, 0x220c, 0x2304, 0x9106,
++	0x1130, 0x8210, 0x8318, 0x1f04, 0xa425, 0x9006, 0x0005, 0x2304,
++	0x9102, 0x0218, 0x2001, 0x0001, 0x0008, 0x9006, 0x918d, 0x0001,
++	0x0005, 0x0136, 0x01c6, 0x0016, 0x8906, 0x8006, 0x8007, 0x908c,
++	0x003f, 0x21e0, 0x9084, 0xffc0, 0x9300, 0x2098, 0x3518, 0x20a9,
++	0x0001, 0x220c, 0x4002, 0x910e, 0x1140, 0x8210, 0x8319, 0x1dc8,
++	0x9006, 0x001e, 0x01ce, 0x013e, 0x0005, 0x220c, 0x9102, 0x0218,
++	0x2001, 0x0001, 0x0010, 0x2001, 0x0000, 0x918d, 0x0001, 0x001e,
++	0x01ce, 0x013e, 0x0005, 0x6004, 0x908a, 0x0053, 0x1a0c, 0x0d84,
++	0x080c, 0xb284, 0x0120, 0x080c, 0xb295, 0x0168, 0x0028, 0x080c,
++	0x2d3f, 0x080c, 0xb295, 0x0138, 0x080c, 0x8026, 0x080c, 0x9554,
++	0x080c, 0x8125, 0x0005, 0x080c, 0x9e99, 0x0cb0, 0x9182, 0x0040,
++	0x0002, 0xa495, 0xa495, 0xa495, 0xa495, 0xa495, 0xa495, 0xa495,
++	0xa495, 0xa495, 0xa495, 0xa495, 0xa497, 0xa497, 0xa497, 0xa497,
++	0xa495, 0xa495, 0xa495, 0xa497, 0xa495, 0x080c, 0x0d84, 0x600b,
++	0xffff, 0x6003, 0x0001, 0x6106, 0x080c, 0x7bcb, 0x0126, 0x2091,
++	0x8000, 0x080c, 0x8125, 0x012e, 0x0005, 0x9186, 0x0013, 0x1128,
++	0x6004, 0x9082, 0x0040, 0x0804, 0xa536, 0x9186, 0x0027, 0x11f0,
++	0x080c, 0x8026, 0x080c, 0x2d1a, 0x080c, 0xb76c, 0x0096, 0x6114,
++	0x2148, 0x080c, 0xb0ad, 0x0168, 0xa867, 0x0103, 0xa87b, 0x0029,
++	0xa877, 0x0000, 0xa97c, 0xc1c5, 0xa97e, 0x080c, 0x61a9, 0x080c,
++	0xb278, 0x009e, 0x080c, 0x9554, 0x0804, 0x8125, 0x9186, 0x0014,
++	0x1120, 0x6004, 0x9082, 0x0040, 0x0440, 0x9186, 0x0046, 0x0150,
++	0x9186, 0x0045, 0x0138, 0x9186, 0x0053, 0x0120, 0x9186, 0x0048,
++	0x190c, 0x0d84, 0x2001, 0x0109, 0x2004, 0xd084, 0x01a8, 0x0126,
++	0x2091, 0x2800, 0x0006, 0x0016, 0x0026, 0x0036, 0x080c, 0x7ab7,
++	0x003e, 0x002e, 0x001e, 0x000e, 0x012e, 0xa001, 0x6000, 0x9086,
++	0x0002, 0x1110, 0x0804, 0xa574, 0x0005, 0x0002, 0xa514, 0xa512,
++	0xa512, 0xa512, 0xa512, 0xa512, 0xa512, 0xa512, 0xa512, 0xa512,
++	0xa512, 0xa52f, 0xa52f, 0xa52f, 0xa52f, 0xa512, 0xa52f, 0xa512,
++	0xa52f, 0xa512, 0x080c, 0x0d84, 0x080c, 0x8026, 0x0096, 0x6114,
++	0x2148, 0x080c, 0xb0ad, 0x0168, 0xa867, 0x0103, 0xa87b, 0x0006,
++	0xa877, 0x0000, 0xa880, 0xc0ec, 0xa882, 0x080c, 0x61a9, 0x080c,
++	0xb278, 0x009e, 0x080c, 0x9554, 0x080c, 0x8125, 0x0005, 0x080c,
++	0x8026, 0x080c, 0x9554, 0x080c, 0x8125, 0x0005, 0x0002, 0xa54d,
++	0xa54b, 0xa54b, 0xa54b, 0xa54b, 0xa54b, 0xa54b, 0xa54b, 0xa54b,
++	0xa54b, 0xa54b, 0xa564, 0xa564, 0xa564, 0xa564, 0xa54b, 0xa56e,
++	0xa54b, 0xa564, 0xa54b, 0x080c, 0x0d84, 0x0096, 0x080c, 0x8026,
++	0x6014, 0x2048, 0x2001, 0x1955, 0x2004, 0x6042, 0xa97c, 0xd1ac,
++	0x0140, 0x6003, 0x0004, 0xa87c, 0x9085, 0x0400, 0xa87e, 0x009e,
++	0x0005, 0x6003, 0x0002, 0x0cb8, 0x080c, 0x8026, 0x080c, 0xb76f,
++	0x080c, 0xb774, 0x6003, 0x000f, 0x0804, 0x8125, 0x080c, 0x8026,
++	0x080c, 0x9554, 0x0804, 0x8125, 0x9182, 0x0040, 0x0002, 0xa58b,
++	0xa58b, 0xa58b, 0xa58b, 0xa58b, 0xa58d, 0xa66a, 0xa58b, 0xa58b,
++	0xa58b, 0xa58b, 0xa58b, 0xa58b, 0xa58b, 0xa58b, 0xa58b, 0xa58b,
++	0xa58b, 0xa58b, 0xa69e, 0x080c, 0x0d84, 0x00b6, 0x0096, 0x6114,
++	0x2148, 0x7644, 0x96b4, 0x0fff, 0x86ff, 0x1528, 0x6010, 0x2058,
++	0xb800, 0xd0bc, 0x1904, 0xa659, 0xa87b, 0x0000, 0xa867, 0x0103,
++	0xae76, 0xa87c, 0xd0ac, 0x0128, 0xa834, 0xa938, 0x9115, 0x190c,
++	0xa82a, 0x080c, 0x5fda, 0x6210, 0x2258, 0xba3c, 0x82ff, 0x0110,
++	0x8211, 0xba3e, 0x7044, 0xd0e4, 0x1904, 0xa63d, 0x080c, 0x9554,
++	0x009e, 0x00be, 0x0005, 0x968c, 0x0c00, 0x0150, 0x6010, 0x2058,
++	0xb800, 0xd0bc, 0x1904, 0xa641, 0x7348, 0xab92, 0x734c, 0xab8e,
++	0x968c, 0x00ff, 0x9186, 0x0002, 0x0508, 0x9186, 0x0028, 0x1118,
++	0xa87b, 0x001c, 0x00e8, 0xd6dc, 0x01a0, 0xa87b, 0x0015, 0xa87c,
++	0xd0ac, 0x0170, 0xa938, 0xaa34, 0x2100, 0x9205, 0x0148, 0x7048,
++	0x9106, 0x1118, 0x704c, 0x9206, 0x0118, 0xa992, 0xaa8e, 0xc6dc,
++	0x0038, 0xd6d4, 0x0118, 0xa87b, 0x0007, 0x0010, 0xa87b, 0x0000,
++	0xa867, 0x0103, 0xae76, 0x901e, 0xd6c4, 0x01d8, 0x9686, 0x0100,
++	0x1130, 0x7064, 0x9005, 0x1118, 0xc6c4, 0x0804, 0xa594, 0x735c,
++	0xab86, 0x83ff, 0x0170, 0x938a, 0x0009, 0x0210, 0x2019, 0x0008,
++	0x0036, 0x2308, 0x2019, 0x0018, 0x2011, 0x0025, 0x080c, 0xace6,
++	0x003e, 0xd6cc, 0x0904, 0xa5a9, 0x7154, 0xa98a, 0x81ff, 0x0904,
++	0xa5a9, 0x9192, 0x0021, 0x1278, 0x8304, 0x9098, 0x0018, 0x2011,
++	0x0029, 0x080c, 0xace6, 0x2011, 0x0205, 0x2013, 0x0000, 0x080c,
++	0xb706, 0x0804, 0xa5a9, 0xa868, 0xd0fc, 0x0120, 0x2009, 0x0020,
++	0xa98a, 0x0c50, 0x00a6, 0x2950, 0x080c, 0xac85, 0x00ae, 0x080c,
++	0xb706, 0x080c, 0xacd6, 0x0804, 0xa5ab, 0x080c, 0xb37e, 0x0804,
++	0xa5b8, 0xa87c, 0xd0ac, 0x0904, 0xa5c4, 0xa880, 0xd0bc, 0x1904,
++	0xa5c4, 0x7348, 0xa838, 0x9306, 0x11c8, 0x734c, 0xa834, 0x931e,
++	0x0904, 0xa5c4, 0xd6d4, 0x0190, 0xab38, 0x9305, 0x0904, 0xa5c4,
++	0x0068, 0xa87c, 0xd0ac, 0x0904, 0xa59c, 0xa838, 0xa934, 0x9105,
++	0x0904, 0xa59c, 0xa880, 0xd0bc, 0x1904, 0xa59c, 0x080c, 0xb3ae,
++	0x0804, 0xa5b8, 0x0096, 0x00f6, 0x6003, 0x0003, 0x6007, 0x0043,
++	0x2079, 0x026c, 0x7c04, 0x7b00, 0x7e0c, 0x7d08, 0x6014, 0x2048,
++	0xa87c, 0xd0ac, 0x0140, 0x6003, 0x0002, 0x00fe, 0x009e, 0x0005,
++	0x2130, 0x2228, 0x0058, 0x2400, 0xa9ac, 0x910a, 0x2300, 0xaab0,
++	0x9213, 0x2600, 0x9102, 0x2500, 0x9203, 0x0e90, 0xac36, 0xab3a,
++	0xae46, 0xad4a, 0x00fe, 0x6043, 0x0000, 0x2c10, 0x080c, 0x18b7,
++	0x080c, 0x7c3a, 0x080c, 0x820b, 0x009e, 0x0005, 0x0005, 0x9182,
++	0x0040, 0x0002, 0xa6b6, 0xa6b6, 0xa6b6, 0xa6b6, 0xa6b6, 0xa6b8,
++	0xa74e, 0xa6b6, 0xa6b6, 0xa765, 0xa7f1, 0xa6b6, 0xa6b6, 0xa6b6,
++	0xa6b6, 0xa806, 0xa6b6, 0xa6b6, 0xa6b6, 0xa6b6, 0x080c, 0x0d84,
++	0x0076, 0x00a6, 0x00e6, 0x0096, 0x2071, 0x0260, 0x6114, 0x2150,
++	0x7644, 0xb676, 0x96b4, 0x0fff, 0xb77c, 0xc7e5, 0xb77e, 0x6210,
++	0x00b6, 0x2258, 0xba3c, 0x82ff, 0x0110, 0x8211, 0xba3e, 0x00be,
++	0x86ff, 0x0904, 0xa749, 0x9694, 0xff00, 0x9284, 0x0c00, 0x0120,
++	0x7048, 0xb092, 0x704c, 0xb08e, 0x9284, 0x0300, 0x0904, 0xa749,
++	0x080c, 0x0fae, 0x090c, 0x0d84, 0x2900, 0xb07a, 0xb77c, 0xc7cd,
++	0xb77e, 0xa867, 0x0103, 0xb068, 0xa86a, 0xb06c, 0xa86e, 0xb070,
++	0xa872, 0xae76, 0x968c, 0x0c00, 0x0120, 0x7348, 0xab92, 0x734c,
++	0xab8e, 0x968c, 0x00ff, 0x9186, 0x0002, 0x0180, 0x9186, 0x0028,
++	0x1118, 0xa87b, 0x001c, 0x0060, 0xd6dc, 0x0118, 0xa87b, 0x0015,
++	0x0038, 0xd6d4, 0x0118, 0xa87b, 0x0007, 0x0010, 0xa87b, 0x0000,
++	0xaf7e, 0xb080, 0xa882, 0xb084, 0xa886, 0x901e, 0xd6c4, 0x0190,
++	0x735c, 0xab86, 0x83ff, 0x0170, 0x938a, 0x0009, 0x0210, 0x2019,
++	0x0008, 0x0036, 0x2308, 0x2019, 0x0018, 0x2011, 0x0025, 0x080c,
++	0xace6, 0x003e, 0xd6cc, 0x01e8, 0x7154, 0xa98a, 0x81ff, 0x01c8,
++	0x9192, 0x0021, 0x1260, 0x8304, 0x9098, 0x0018, 0x2011, 0x0029,
++	0x080c, 0xace6, 0x2011, 0x0205, 0x2013, 0x0000, 0x0050, 0xb068,
++	0xd0fc, 0x0120, 0x2009, 0x0020, 0xa98a, 0x0c68, 0x2950, 0x080c,
++	0xac85, 0x009e, 0x00ee, 0x00ae, 0x007e, 0x0005, 0x00f6, 0x00a6,
++	0x6003, 0x0003, 0x2079, 0x026c, 0x7c04, 0x7b00, 0x7e0c, 0x7d08,
++	0x6014, 0x2050, 0xb436, 0xb33a, 0xb646, 0xb54a, 0x00ae, 0x00fe,
++	0x2c10, 0x080c, 0x18b7, 0x0804, 0x8b1d, 0x6003, 0x0002, 0x6004,
++	0x9086, 0x0040, 0x11c8, 0x0096, 0x6014, 0x2048, 0xa87c, 0xd0ac,
++	0x0160, 0x601c, 0xd084, 0x1130, 0x00f6, 0x2c00, 0x2078, 0x080c,
++	0x150d, 0x00fe, 0x6003, 0x0004, 0x0010, 0x6003, 0x0002, 0x009e,
++	0x080c, 0x8026, 0x080c, 0x8125, 0x0096, 0x2001, 0x1955, 0x2004,
++	0x6042, 0x080c, 0x80d6, 0x080c, 0x820b, 0x6114, 0x2148, 0xa97c,
++	0xd1e4, 0x0904, 0xa7ec, 0xd1cc, 0x05a8, 0xa978, 0xa868, 0xd0fc,
++	0x0538, 0x0016, 0xa87c, 0x0006, 0xa880, 0x0006, 0xa860, 0x20e8,
++	0xa85c, 0x9080, 0x0019, 0x20a0, 0x810e, 0x810e, 0x810f, 0x9184,
++	0x003f, 0x20e0, 0x9184, 0xffc0, 0x9080, 0x0019, 0x2098, 0x0156,
++	0x20a9, 0x0020, 0x4003, 0x015e, 0x000e, 0xa882, 0x000e, 0xa87e,
++	0x001e, 0xa874, 0x0006, 0x2148, 0x080c, 0x0f60, 0x001e, 0x0440,
++	0x0016, 0x080c, 0x0f60, 0x009e, 0xa974, 0x0016, 0x080c, 0xacd6,
++	0x001e, 0x00f0, 0xa867, 0x0103, 0xa974, 0x9184, 0x00ff, 0x90b6,
++	0x0002, 0x0180, 0x9086, 0x0028, 0x1118, 0xa87b, 0x001c, 0x0060,
++	0xd1dc, 0x0118, 0xa87b, 0x0015, 0x0038, 0xd1d4, 0x0118, 0xa87b,
++	0x0007, 0x0010, 0xa87b, 0x0000, 0x0016, 0x080c, 0x5fda, 0x001e,
++	0xd1e4, 0x1120, 0x080c, 0x9554, 0x009e, 0x0005, 0x080c, 0xb37e,
++	0x0cd8, 0x6004, 0x9086, 0x0040, 0x1120, 0x080c, 0x8026, 0x080c,
++	0x8125, 0x2019, 0x0001, 0x080c, 0x8dfe, 0x6003, 0x0002, 0x080c,
++	0xb774, 0x080c, 0x80d6, 0x080c, 0x820b, 0x0005, 0x6004, 0x9086,
++	0x0040, 0x1120, 0x080c, 0x8026, 0x080c, 0x8125, 0x080c, 0x80d6,
++	0x080c, 0x2d1a, 0x080c, 0xb76c, 0x0096, 0x6114, 0x2148, 0x080c,
++	0xb0ad, 0x0150, 0xa867, 0x0103, 0xa87b, 0x0029, 0xa877, 0x0000,
++	0x080c, 0x61a9, 0x080c, 0xb278, 0x009e, 0x080c, 0x9554, 0x080c,
++	0x820b, 0x0005, 0xa87b, 0x0015, 0xd1fc, 0x0138, 0xa87b, 0x0007,
++	0x8002, 0x8000, 0x810a, 0x9189, 0x0000, 0xa992, 0xa88e, 0x0005,
++	0x9182, 0x0040, 0x0002, 0xa84f, 0xa84f, 0xa84f, 0xa84f, 0xa84f,
++	0xa851, 0xa84f, 0xa84f, 0xa8f4, 0xa84f, 0xa84f, 0xa84f, 0xa84f,
++	0xa84f, 0xa84f, 0xa84f, 0xa84f, 0xa84f, 0xa84f, 0xaa22, 0x080c,
++	0x0d84, 0x0076, 0x00a6, 0x00e6, 0x0096, 0x2071, 0x0260, 0x6114,
++	0x2150, 0x7644, 0xb676, 0x96b4, 0x0fff, 0xb77c, 0xc7e5, 0xb77e,
++	0x6210, 0x00b6, 0x2258, 0xba3c, 0x82ff, 0x0110, 0x8211, 0xba3e,
++	0x00be, 0x86ff, 0x0904, 0xa8ed, 0x9694, 0xff00, 0x9284, 0x0c00,
++	0x0120, 0x7048, 0xb092, 0x704c, 0xb08e, 0x9284, 0x0300, 0x0904,
++	0xa8ed, 0x9686, 0x0100, 0x1130, 0x7064, 0x9005, 0x1118, 0xc6c4,
++	0xb676, 0x0c38, 0x080c, 0x0fae, 0x090c, 0x0d84, 0x2900, 0xb07a,
++	0xb77c, 0x97bd, 0x0200, 0xb77e, 0xa867, 0x0103, 0xb068, 0xa86a,
++	0xb06c, 0xa86e, 0xb070, 0xa872, 0x7044, 0x9084, 0xf000, 0x9635,
++	0xae76, 0x968c, 0x0c00, 0x0120, 0x7348, 0xab92, 0x734c, 0xab8e,
++	0x968c, 0x00ff, 0x9186, 0x0002, 0x0180, 0x9186, 0x0028, 0x1118,
++	0xa87b, 0x001c, 0x0060, 0xd6dc, 0x0118, 0xa87b, 0x0015, 0x0038,
++	0xd6d4, 0x0118, 0xa87b, 0x0007, 0x0010, 0xa87b, 0x0000, 0xaf7e,
++	0xb080, 0xa882, 0xb084, 0xa886, 0x901e, 0xd6c4, 0x0190, 0x735c,
++	0xab86, 0x83ff, 0x0170, 0x938a, 0x0009, 0x0210, 0x2019, 0x0008,
++	0x0036, 0x2308, 0x2019, 0x0018, 0x2011, 0x0025, 0x080c, 0xace6,
++	0x003e, 0xd6cc, 0x01d0, 0x7154, 0xa98a, 0x81ff, 0x01b0, 0x9192,
++	0x0021, 0x1260, 0x8304, 0x9098, 0x0018, 0x2011, 0x0029, 0x080c,
++	0xace6, 0x2011, 0x0205, 0x2013, 0x0000, 0x0038, 0xb068, 0xd0fc,
++	0x0120, 0x2009, 0x0020, 0xa98a, 0x0c68, 0x080c, 0x178e, 0x009e,
++	0x00ee, 0x00ae, 0x007e, 0x0005, 0x2001, 0x1955, 0x2004, 0x6042,
++	0x0096, 0x6114, 0x2148, 0xa83c, 0xa940, 0x9105, 0x1118, 0xa87c,
++	0xc0dc, 0xa87e, 0x6003, 0x0002, 0xa97c, 0xd1e4, 0x0904, 0xaa1d,
++	0x6043, 0x0000, 0x6010, 0x00b6, 0x2058, 0xb800, 0x00be, 0xd0bc,
++	0x11f8, 0xd1cc, 0x0904, 0xa9ec, 0xa978, 0xa868, 0xd0fc, 0x0904,
++	0xa9ad, 0x0016, 0xa87c, 0x0006, 0xa880, 0x0006, 0x00a6, 0x2150,
++	0xb174, 0x9184, 0x00ff, 0x90b6, 0x0002, 0x0904, 0xa97b, 0x9086,
++	0x0028, 0x15e8, 0xa87b, 0x001c, 0xb07b, 0x001c, 0x0804, 0xa983,
++	0x6024, 0xd0f4, 0x11d0, 0xa838, 0xaa34, 0x9205, 0x09d0, 0xa838,
++	0xaa90, 0x9206, 0x1120, 0xa88c, 0xaa34, 0x9206, 0x0990, 0x6024,
++	0xd0d4, 0x1148, 0xa9ac, 0xa834, 0x9102, 0x603a, 0xa9b0, 0xa838,
++	0x9103, 0x603e, 0x6024, 0xc0f5, 0x6026, 0x6010, 0x00b6, 0x2058,
++	0xb83c, 0x8000, 0xb83e, 0x00be, 0x9006, 0xa876, 0xa892, 0xa88e,
++	0xa87c, 0xc0e4, 0xa87e, 0xd0cc, 0x0130, 0x0096, 0xa878, 0x2048,
++	0x080c, 0x0f60, 0x009e, 0x080c, 0xb3ae, 0x0804, 0xaa1d, 0xd1dc,
++	0x0158, 0xa87b, 0x0015, 0xb07b, 0x0015, 0x080c, 0xb62d, 0x0118,
++	0xb174, 0xc1dc, 0xb176, 0x0078, 0xd1d4, 0x0128, 0xa87b, 0x0007,
++	0xb07b, 0x0007, 0x0040, 0xa87c, 0xd0ac, 0x0128, 0xa834, 0xa938,
++	0x9115, 0x190c, 0xa82a, 0xa87c, 0xb07e, 0xa890, 0xb092, 0xa88c,
++	0xb08e, 0xa860, 0x20e8, 0xa85c, 0x9080, 0x0019, 0x20a0, 0x20a9,
++	0x0020, 0x8a06, 0x8006, 0x8007, 0x9094, 0x003f, 0x22e0, 0x9084,
++	0xffc0, 0x9080, 0x0019, 0x2098, 0x4003, 0x00ae, 0x000e, 0xa882,
++	0x000e, 0xa87e, 0x080c, 0xb706, 0x001e, 0xa874, 0x0006, 0x2148,
++	0x080c, 0x0f60, 0x001e, 0x0804, 0xaa19, 0x0016, 0x00a6, 0x2150,
++	0xb174, 0x9184, 0x00ff, 0x90b6, 0x0002, 0x01e0, 0x9086, 0x0028,
++	0x1128, 0xa87b, 0x001c, 0xb07b, 0x001c, 0x00e0, 0xd1dc, 0x0158,
++	0xa87b, 0x0015, 0xb07b, 0x0015, 0x080c, 0xb62d, 0x0118, 0xb174,
++	0xc1dc, 0xb176, 0x0078, 0xd1d4, 0x0128, 0xa87b, 0x0007, 0xb07b,
++	0x0007, 0x0040, 0xa87c, 0xd0ac, 0x0128, 0xa834, 0xa938, 0x9115,
++	0x190c, 0xa82a, 0xa890, 0xb092, 0xa88c, 0xb08e, 0xa87c, 0xb07e,
++	0x00ae, 0x080c, 0x0f60, 0x009e, 0x080c, 0xb706, 0xa974, 0x0016,
++	0x080c, 0xacd6, 0x001e, 0x0468, 0xa867, 0x0103, 0xa974, 0x9184,
++	0x00ff, 0x90b6, 0x0002, 0x01b0, 0x9086, 0x0028, 0x1118, 0xa87b,
++	0x001c, 0x00d0, 0xd1dc, 0x0148, 0xa87b, 0x0015, 0x080c, 0xb62d,
++	0x0118, 0xa974, 0xc1dc, 0xa976, 0x0078, 0xd1d4, 0x0118, 0xa87b,
++	0x0007, 0x0050, 0xa87b, 0x0000, 0xa87c, 0xd0ac, 0x0128, 0xa834,
++	0xa938, 0x9115, 0x190c, 0xa82a, 0xa974, 0x0016, 0x080c, 0x5fda,
++	0x001e, 0xd1e4, 0x1120, 0x080c, 0x9554, 0x009e, 0x0005, 0x080c,
++	0xb37e, 0x0cd8, 0x6114, 0x0096, 0x2148, 0xa97c, 0xd1e4, 0x190c,
++	0x179c, 0x009e, 0x0005, 0x080c, 0x8026, 0x0010, 0x080c, 0x80d6,
++	0x080c, 0xb0ad, 0x01c0, 0x0096, 0x6114, 0x2148, 0xa867, 0x0103,
++	0x2009, 0x180c, 0x210c, 0xd18c, 0x11b8, 0xd184, 0x1190, 0x6108,
++	0xa97a, 0x918e, 0x0029, 0x1110, 0x080c, 0xcc6b, 0xa877, 0x0000,
++	0x080c, 0x61a9, 0x009e, 0x080c, 0x9554, 0x080c, 0x8125, 0x0804,
++	0x820b, 0xa87b, 0x0004, 0x0c90, 0xa87b, 0x0004, 0x0c78, 0x9182,
++	0x0040, 0x0002, 0xaa6e, 0xaa6e, 0xaa6e, 0xaa6e, 0xaa6e, 0xaa70,
++	0xaa6e, 0xaa6e, 0xaa6e, 0xaa6e, 0xaa6e, 0xaa6e, 0xaa6e, 0xaa6e,
++	0xaa6e, 0xaa6e, 0xaa6e, 0xaa6e, 0xaa6e, 0xaa6e, 0x080c, 0x0d84,
++	0x080c, 0x4df2, 0x01f8, 0x6014, 0x7144, 0x918c, 0x0fff, 0x9016,
++	0xd1c4, 0x0118, 0x7264, 0x9294, 0x00ff, 0x0096, 0x904d, 0x0188,
++	0xa87b, 0x0000, 0xa864, 0x9086, 0x0139, 0x0128, 0xa867, 0x0103,
++	0xa976, 0xaa96, 0x0030, 0xa897, 0x4000, 0xa99a, 0xaa9e, 0x080c,
++	0x61a9, 0x009e, 0x0804, 0x9554, 0x9182, 0x0085, 0x0002, 0xaaa6,
++	0xaaa4, 0xaaa4, 0xaab2, 0xaaa4, 0xaaa4, 0xaaa4, 0xaaa4, 0xaaa4,
++	0xaaa4, 0xaaa4, 0xaaa4, 0xaaa4, 0x080c, 0x0d84, 0x6003, 0x0001,
++	0x6106, 0x080c, 0x7bcb, 0x0126, 0x2091, 0x8000, 0x080c, 0x8125,
++	0x012e, 0x0005, 0x0026, 0x0056, 0x00d6, 0x00e6, 0x2071, 0x0260,
++	0x7224, 0x6216, 0x7220, 0x080c, 0xb09b, 0x01a0, 0x2268, 0x6800,
++	0x9086, 0x0000, 0x0178, 0x6010, 0x6d10, 0x952e, 0x1158, 0x00c6,
++	0x2d60, 0x080c, 0xad11, 0x00ce, 0x0128, 0x6803, 0x0002, 0x6007,
++	0x0086, 0x0010, 0x6007, 0x0087, 0x6003, 0x0001, 0x080c, 0x7bcb,
++	0x080c, 0x8125, 0x9280, 0x0004, 0x00b6, 0x2058, 0xb800, 0x00be,
++	0xd0bc, 0x0140, 0x6824, 0xd0ec, 0x0128, 0x00c6, 0x2260, 0x080c,
++	0xb3ae, 0x00ce, 0x00ee, 0x00de, 0x005e, 0x002e, 0x0005, 0x9186,
++	0x0013, 0x1160, 0x6004, 0x908a, 0x0085, 0x0a0c, 0x0d84, 0x908a,
++	0x0092, 0x1a0c, 0x0d84, 0x9082, 0x0085, 0x006a, 0x9186, 0x0027,
++	0x0120, 0x9186, 0x0014, 0x190c, 0x0d84, 0x080c, 0x8026, 0x080c,
++	0x9584, 0x0804, 0x8125, 0xab18, 0xab1a, 0xab1a, 0xab18, 0xab18,
++	0xab18, 0xab18, 0xab18, 0xab18, 0xab18, 0xab18, 0xab18, 0xab18,
++	0x080c, 0x0d84, 0x080c, 0x8026, 0x080c, 0x9584, 0x080c, 0x8125,
++	0x0005, 0x9186, 0x0013, 0x1128, 0x6004, 0x9082, 0x0085, 0x2008,
++	0x04b8, 0x9186, 0x0027, 0x11f8, 0x080c, 0x8026, 0x080c, 0x2d1a,
++	0x080c, 0xb76c, 0x0096, 0x6014, 0x2048, 0x080c, 0xb0ad, 0x0150,
++	0xa867, 0x0103, 0xa877, 0x0000, 0xa87b, 0x0029, 0x080c, 0x61a9,
++	0x080c, 0xb278, 0x009e, 0x080c, 0x9554, 0x080c, 0x8125, 0x0005,
++	0x080c, 0x95e9, 0x0ce0, 0x9186, 0x0014, 0x1dd0, 0x080c, 0x8026,
++	0x0096, 0x6014, 0x2048, 0x080c, 0xb0ad, 0x0d60, 0xa867, 0x0103,
++	0xa877, 0x0000, 0xa87b, 0x0006, 0xa880, 0xc0ec, 0xa882, 0x08f0,
++	0x0002, 0xab70, 0xab6e, 0xab6e, 0xab6e, 0xab6e, 0xab6e, 0xab88,
++	0xab6e, 0xab6e, 0xab6e, 0xab6e, 0xab6e, 0xab6e, 0x080c, 0x0d84,
++	0x080c, 0x8026, 0x6034, 0x908c, 0xff00, 0x810f, 0x9186, 0x0039,
++	0x0118, 0x9186, 0x0035, 0x1118, 0x2001, 0x1953, 0x0010, 0x2001,
++	0x1954, 0x2004, 0x601a, 0x6003, 0x000c, 0x080c, 0x8125, 0x0005,
++	0x080c, 0x8026, 0x6034, 0x908c, 0xff00, 0x810f, 0x9186, 0x0039,
++	0x0118, 0x9186, 0x0035, 0x1118, 0x2001, 0x1953, 0x0010, 0x2001,
++	0x1954, 0x2004, 0x601a, 0x6003, 0x000e, 0x080c, 0x8125, 0x0005,
++	0x9182, 0x0092, 0x1220, 0x9182, 0x0085, 0x0208, 0x0012, 0x0804,
++	0x95e9, 0xabb6, 0xabb6, 0xabb6, 0xabb6, 0xabb8, 0xac05, 0xabb6,
++	0xabb6, 0xabb6, 0xabb6, 0xabb6, 0xabb6, 0xabb6, 0x080c, 0x0d84,
++	0x0096, 0x6010, 0x00b6, 0x2058, 0xb800, 0x00be, 0xd0bc, 0x0168,
++	0x6034, 0x908c, 0xff00, 0x810f, 0x9186, 0x0039, 0x0118, 0x9186,
++	0x0035, 0x1118, 0x009e, 0x0804, 0xac19, 0x080c, 0xb0ad, 0x1118,
++	0x080c, 0xb278, 0x0068, 0x6014, 0x2048, 0xa87c, 0xd0e4, 0x1110,
++	0x080c, 0xb278, 0xa867, 0x0103, 0x080c, 0xb739, 0x080c, 0x61a9,
++	0x00d6, 0x2c68, 0x080c, 0x94fe, 0x01d0, 0x6003, 0x0001, 0x6007,
++	0x001e, 0x600b, 0xffff, 0x2009, 0x026e, 0x210c, 0x613a, 0x2009,
++	0x026f, 0x210c, 0x613e, 0x6910, 0x6112, 0x080c, 0xb4e6, 0x6954,
++	0x6156, 0x6023, 0x0001, 0x080c, 0x7bcb, 0x080c, 0x8125, 0x2d60,
++	0x00de, 0x080c, 0x9554, 0x009e, 0x0005, 0x6010, 0x00b6, 0x2058,
++	0xb800, 0x00be, 0xd0bc, 0x0598, 0x6034, 0x908c, 0xff00, 0x810f,
++	0x9186, 0x0035, 0x0130, 0x9186, 0x001e, 0x0118, 0x9186, 0x0039,
++	0x1530, 0x00d6, 0x2c68, 0x080c, 0xb6d9, 0x1904, 0xac5e, 0x080c,
++	0x94fe, 0x01d8, 0x6106, 0x6003, 0x0001, 0x6023, 0x0001, 0x6910,
++	0x6112, 0x692c, 0x612e, 0x6930, 0x6132, 0x6934, 0x918c, 0x00ff,
++	0x6136, 0x6938, 0x613a, 0x693c, 0x613e, 0x6954, 0x6156, 0x080c,
++	0xb4e6, 0x080c, 0x7bcb, 0x080c, 0x8125, 0x2d60, 0x00f8, 0x0096,
++	0x6014, 0x2048, 0x080c, 0xb0ad, 0x01c8, 0xa867, 0x0103, 0xa880,
++	0xd0b4, 0x0128, 0xc0ec, 0xa882, 0xa87b, 0x0006, 0x0048, 0xd0bc,
++	0x0118, 0xa87b, 0x0002, 0x0020, 0xa87b, 0x0005, 0x080c, 0xb37a,
++	0xa877, 0x0000, 0x080c, 0x61a9, 0x080c, 0xb278, 0x009e, 0x0804,
++	0x9554, 0x0016, 0x0096, 0x6014, 0x2048, 0x080c, 0xb0ad, 0x0140,
++	0xa867, 0x0103, 0xa87b, 0x0028, 0xa877, 0x0000, 0x080c, 0x61a9,
++	0x009e, 0x001e, 0x9186, 0x0013, 0x0148, 0x9186, 0x0014, 0x0130,
++	0x9186, 0x0027, 0x0118, 0x080c, 0x95e9, 0x0030, 0x080c, 0x8026,
++	0x080c, 0x9584, 0x080c, 0x8125, 0x0005, 0x0056, 0x0066, 0x0096,
++	0x00a6, 0x2029, 0x0001, 0x9182, 0x0101, 0x1208, 0x0010, 0x2009,
++	0x0100, 0x2130, 0x8304, 0x9098, 0x0018, 0x2009, 0x0020, 0x2011,
++	0x0029, 0x080c, 0xace6, 0x96b2, 0x0020, 0xb004, 0x904d, 0x0110,
++	0x080c, 0x0f60, 0x080c, 0x0fae, 0x0520, 0x8528, 0xa867, 0x0110,
++	0xa86b, 0x0000, 0x2920, 0xb406, 0x968a, 0x003d, 0x1228, 0x2608,
++	0x2011, 0x001b, 0x0499, 0x00a8, 0x96b2, 0x003c, 0x2009, 0x003c,
++	0x2950, 0x2011, 0x001b, 0x0451, 0x0c28, 0x2001, 0x0205, 0x2003,
++	0x0000, 0x00ae, 0x852f, 0x95ad, 0x0003, 0xb566, 0x95ac, 0x0000,
++	0x0048, 0x2001, 0x0205, 0x2003, 0x0000, 0x00ae, 0x852f, 0x95ad,
++	0x0003, 0xb566, 0x009e, 0x006e, 0x005e, 0x0005, 0x00a6, 0x89ff,
++	0x0158, 0xa804, 0x9055, 0x0130, 0xa807, 0x0000, 0x080c, 0x61a9,
++	0x2a48, 0x0cb8, 0x080c, 0x61a9, 0x00ae, 0x0005, 0x00f6, 0x2079,
++	0x0200, 0x7814, 0x9085, 0x0080, 0x7816, 0xd184, 0x0108, 0x8108,
++	0x810c, 0x20a9, 0x0001, 0xa860, 0x20e8, 0xa85c, 0x9200, 0x20a0,
++	0x20e1, 0x0000, 0x2300, 0x9e00, 0x2098, 0x4003, 0x8318, 0x9386,
++	0x0020, 0x1148, 0x2018, 0x2300, 0x9e00, 0x2098, 0x7814, 0x8000,
++	0x9085, 0x0080, 0x7816, 0x8109, 0x1d80, 0x7817, 0x0000, 0x00fe,
++	0x0005, 0x0066, 0x0126, 0x2091, 0x8000, 0x2031, 0x0001, 0x6020,
++	0x9084, 0x000f, 0x0083, 0x012e, 0x006e, 0x0005, 0x0126, 0x2091,
++	0x8000, 0x0066, 0x2031, 0x0000, 0x6020, 0x9084, 0x000f, 0x001b,
++	0x006e, 0x012e, 0x0005, 0xad4c, 0xad4c, 0xad47, 0xad6e, 0xad3a,
++	0xad47, 0xad6e, 0xad47, 0xad3a, 0xad3a, 0xad47, 0xad47, 0xad47,
++	0xad3a, 0xad3a, 0x080c, 0x0d84, 0x0036, 0x2019, 0x0010, 0x080c,
++	0xc58e, 0x6023, 0x0006, 0x6003, 0x0007, 0x003e, 0x0005, 0x9006,
++	0x0005, 0x9085, 0x0001, 0x0005, 0x0096, 0x86ff, 0x11d8, 0x6014,
++	0x2048, 0x080c, 0xb0ad, 0x01c0, 0xa864, 0x9086, 0x0139, 0x1128,
++	0xa87b, 0x0005, 0xa883, 0x0000, 0x0028, 0x900e, 0x2001, 0x0005,
++	0x080c, 0x63d1, 0x080c, 0xb37a, 0x080c, 0x61a9, 0x080c, 0x9584,
++	0x9085, 0x0001, 0x009e, 0x0005, 0x9006, 0x0ce0, 0x6000, 0x908a,
++	0x0016, 0x1a0c, 0x0d84, 0x0002, 0xad84, 0xada9, 0xad86, 0xadc7,
++	0xada4, 0xad84, 0xad47, 0xad4c, 0xad4c, 0xad47, 0xad47, 0xad47,
++	0xad47, 0xad47, 0xad47, 0xad47, 0x080c, 0x0d84, 0x86ff, 0x11c8,
++	0x6020, 0x9086, 0x0006, 0x01a8, 0x0096, 0x6014, 0x2048, 0x080c,
++	0xb0ad, 0x0110, 0x080c, 0xb37a, 0x009e, 0x080c, 0xb71b, 0x6007,
++	0x0085, 0x6003, 0x000b, 0x6023, 0x0002, 0x080c, 0x7bcb, 0x080c,
++	0x8125, 0x9085, 0x0001, 0x0005, 0x0066, 0x080c, 0x17b0, 0x006e,
++	0x08e8, 0x00e6, 0x2071, 0x19b4, 0x7024, 0x9c06, 0x1110, 0x080c,
++	0x8d59, 0x6020, 0x9084, 0x000f, 0x9086, 0x0006, 0x1150, 0x0086,
++	0x0096, 0x2049, 0x0001, 0x2c40, 0x080c, 0x8ef6, 0x009e, 0x008e,
++	0x0010, 0x080c, 0x8c6a, 0x00ee, 0x1908, 0x0804, 0xad47, 0x0036,
++	0x00e6, 0x2071, 0x19b4, 0x703c, 0x9c06, 0x1138, 0x901e, 0x080c,
++	0x8dfe, 0x00ee, 0x003e, 0x0804, 0xad86, 0x080c, 0x901f, 0x00ee,
++	0x003e, 0x1904, 0xad86, 0x0804, 0xad47, 0x00c6, 0x6020, 0x9084,
++	0x000f, 0x0013, 0x00ce, 0x0005, 0xadfa, 0xaea2, 0xaff8, 0xae04,
++	0x9584, 0xadfa, 0xc580, 0xb779, 0xaea2, 0xadf3, 0xb077, 0xadf3,
++	0xadf3, 0xadf3, 0xadf3, 0x080c, 0x0d84, 0x080c, 0xb295, 0x1110,
++	0x080c, 0x9e99, 0x0005, 0x080c, 0x8026, 0x080c, 0x8125, 0x0804,
++	0x9554, 0x601b, 0x0001, 0x0005, 0x080c, 0xb0ad, 0x0130, 0x6014,
++	0x0096, 0x2048, 0x2c00, 0xa896, 0x009e, 0x6000, 0x908a, 0x0016,
++	0x1a0c, 0x0d84, 0x0002, 0xae23, 0xae25, 0xae49, 0xae5d, 0xae81,
++	0xae23, 0xadfa, 0xadfa, 0xadfa, 0xae5d, 0xae5d, 0xae23, 0xae23,
++	0xae23, 0xae23, 0xae67, 0x080c, 0x0d84, 0x00e6, 0x6014, 0x0096,
++	0x2048, 0xa880, 0xc0b5, 0xa882, 0x009e, 0x2071, 0x19b4, 0x7024,
++	0x9c06, 0x01a0, 0x080c, 0x8c6a, 0x080c, 0xb71b, 0x6007, 0x0085,
++	0x6003, 0x000b, 0x6023, 0x0002, 0x2001, 0x1954, 0x2004, 0x601a,
++	0x080c, 0x7bcb, 0x080c, 0x8125, 0x00ee, 0x0005, 0x601b, 0x0001,
++	0x0cd8, 0x0096, 0x6014, 0x2048, 0xa880, 0xc0b5, 0xa882, 0x009e,
++	0x080c, 0xb71b, 0x6007, 0x0085, 0x6003, 0x000b, 0x6023, 0x0002,
++	0x080c, 0x7bcb, 0x080c, 0x8125, 0x0005, 0x0096, 0x601b, 0x0001,
++	0x6014, 0x2048, 0xa880, 0xc0b5, 0xa882, 0x009e, 0x0005, 0x080c,
++	0x4df2, 0x01a8, 0x6014, 0x0096, 0x904d, 0x0180, 0xa864, 0xa867,
++	0x0103, 0xa87b, 0x0006, 0x9086, 0x0139, 0x1140, 0xa867, 0x0139,
++	0xa897, 0x4005, 0xa89b, 0x0004, 0x080c, 0x61a9, 0x009e, 0x0804,
++	0x9554, 0x6014, 0x0096, 0x904d, 0x01c0, 0xa97c, 0xd1e4, 0x01a8,
++	0xa884, 0x009e, 0x8003, 0x800b, 0x810b, 0x9108, 0x611a, 0x2001,
++	0x0037, 0x2c08, 0x080c, 0x1492, 0x6000, 0x9086, 0x0004, 0x1120,
++	0x2009, 0x0048, 0x080c, 0x95ce, 0x0005, 0x009e, 0x080c, 0x17b0,
++	0x0804, 0xae49, 0x6000, 0x908a, 0x0016, 0x1a0c, 0x0d84, 0x000b,
++	0x0005, 0xaeb9, 0xae01, 0xaebb, 0xaeb9, 0xaebb, 0xaebb, 0xadfb,
++	0xaeb9, 0xadf5, 0xadf5, 0xaeb9, 0xaeb9, 0xaeb9, 0xaeb9, 0xaeb9,
++	0xaeb9, 0x080c, 0x0d84, 0x6010, 0x00b6, 0x2058, 0xb804, 0x9084,
++	0x00ff, 0x00be, 0x908a, 0x000c, 0x1a0c, 0x0d84, 0x00b6, 0x0013,
++	0x00be, 0x0005, 0xaed6, 0xaf92, 0xaed8, 0xaf13, 0xaed8, 0xaf13,
++	0xaed8, 0xaee6, 0xaed6, 0xaf13, 0xaed6, 0xaf02, 0x080c, 0x0d84,
++	0x6004, 0x908e, 0x0016, 0x0598, 0x908e, 0x0004, 0x0580, 0x908e,
++	0x0002, 0x0568, 0x908e, 0x0052, 0x0904, 0xaf8e, 0x6004, 0x080c,
++	0xb295, 0x0904, 0xafab, 0x908e, 0x0021, 0x0904, 0xafaf, 0x908e,
++	0x0022, 0x0904, 0xaff3, 0x908e, 0x003d, 0x0904, 0xafaf, 0x908e,
++	0x0039, 0x0904, 0xafb3, 0x908e, 0x0035, 0x0904, 0xafb3, 0x908e,
++	0x001e, 0x0178, 0x908e, 0x0001, 0x1140, 0x6010, 0x2058, 0xb804,
++	0x9084, 0x00ff, 0x9086, 0x0006, 0x0110, 0x080c, 0x2d1a, 0x080c,
++	0x9e99, 0x0804, 0x9584, 0x00c6, 0x00d6, 0x6104, 0x9186, 0x0016,
++	0x0904, 0xaf7f, 0x9186, 0x0002, 0x15b8, 0x2001, 0x1836, 0x2004,
++	0xd08c, 0x1178, 0x080c, 0x6877, 0x1160, 0x2001, 0x194c, 0x2003,
++	0x0001, 0x2001, 0x1800, 0x2003, 0x0001, 0x080c, 0x67be, 0x0804,
++	0xafdc, 0x6010, 0x2058, 0x2001, 0x1836, 0x2004, 0xd0ac, 0x1904,
++	0xafdc, 0xb8a0, 0xd0bc, 0x1904, 0xafdc, 0xb840, 0x9084, 0x00ff,
++	0x9005, 0x0190, 0x8001, 0xb842, 0x6017, 0x0000, 0x6023, 0x0007,
++	0x601b, 0x0398, 0x6043, 0x0000, 0x080c, 0x94fe, 0x0128, 0x2b00,
++	0x6012, 0x6023, 0x0001, 0x0458, 0x00de, 0x00ce, 0x6004, 0x908e,
++	0x0002, 0x11a0, 0x6010, 0x2058, 0xb8a0, 0x9086, 0x007e, 0x1170,
++	0x2009, 0x1836, 0x2104, 0xc085, 0x200a, 0x00e6, 0x2071, 0x1800,
++	0x080c, 0x5677, 0x00ee, 0x080c, 0x9e99, 0x0030, 0x080c, 0x9e99,
++	0x080c, 0x2d1a, 0x080c, 0xb76c, 0x00e6, 0x0126, 0x2091, 0x8000,
++	0x080c, 0x2d3f, 0x012e, 0x00ee, 0x080c, 0x9584, 0x0005, 0x2001,
++	0x0002, 0x080c, 0x5b61, 0x6003, 0x0001, 0x6007, 0x0002, 0x080c,
++	0x7c1d, 0x080c, 0x8125, 0x00de, 0x00ce, 0x0c80, 0x080c, 0x2d3f,
++	0x0804, 0xaf0f, 0x00c6, 0x00d6, 0x6104, 0x9186, 0x0016, 0x0d38,
++	0x6010, 0x2058, 0xb840, 0x9084, 0x00ff, 0x9005, 0x0904, 0xaf54,
++	0x8001, 0xb842, 0x6003, 0x0001, 0x080c, 0x7c1d, 0x080c, 0x8125,
++	0x00de, 0x00ce, 0x0898, 0x080c, 0x9e99, 0x0804, 0xaf11, 0x080c,
++	0x9ed5, 0x0804, 0xaf11, 0x00d6, 0x2c68, 0x6104, 0x080c, 0xb6d9,
++	0x00de, 0x0118, 0x080c, 0x9554, 0x00f0, 0x6004, 0x8007, 0x6134,
++	0x918c, 0x00ff, 0x9105, 0x6036, 0x6007, 0x0085, 0x6003, 0x000b,
++	0x6023, 0x0002, 0x603c, 0x600a, 0x2001, 0x1954, 0x2004, 0x601a,
++	0x602c, 0x2c08, 0x2060, 0x6024, 0xc0b5, 0x6026, 0x2160, 0x080c,
++	0x7bcb, 0x080c, 0x8125, 0x0005, 0x00de, 0x00ce, 0x080c, 0x9e99,
++	0x080c, 0x2d1a, 0x00e6, 0x0126, 0x2091, 0x8000, 0x080c, 0x2d3f,
++	0x6017, 0x0000, 0x6023, 0x0007, 0x601b, 0x0398, 0x6043, 0x0000,
++	0x012e, 0x00ee, 0x0005, 0x080c, 0x994c, 0x1904, 0xafab, 0x0005,
++	0x6000, 0x908a, 0x0016, 0x1a0c, 0x0d84, 0x0096, 0x00d6, 0x001b,
++	0x00de, 0x009e, 0x0005, 0xb013, 0xb013, 0xb013, 0xb013, 0xb013,
++	0xb013, 0xb013, 0xb013, 0xb013, 0xadfa, 0xb013, 0xae01, 0xb015,
++	0xae01, 0xb022, 0xb013, 0x080c, 0x0d84, 0x6004, 0x9086, 0x008b,
++	0x0148, 0x6007, 0x008b, 0x6003, 0x000d, 0x080c, 0x7bcb, 0x080c,
++	0x8125, 0x0005, 0x080c, 0xb74d, 0x0118, 0x080c, 0xb75e, 0x0010,
++	0x080c, 0xb76c, 0x080c, 0xb278, 0x080c, 0xb0ad, 0x0570, 0x080c,
++	0x2d1a, 0x080c, 0xb0ad, 0x0168, 0x6014, 0x2048, 0xa867, 0x0103,
++	0xa87b, 0x0006, 0xa877, 0x0000, 0xa880, 0xc0ed, 0xa882, 0x080c,
++	0x61a9, 0x2c68, 0x080c, 0x94fe, 0x0150, 0x6810, 0x6012, 0x080c,
++	0xb4e6, 0x00c6, 0x2d60, 0x080c, 0x9584, 0x00ce, 0x0008, 0x2d60,
++	0x6017, 0x0000, 0x6023, 0x0001, 0x6007, 0x0001, 0x6003, 0x0001,
++	0x080c, 0x7c1d, 0x080c, 0x8125, 0x00c8, 0x080c, 0xb74d, 0x0138,
++	0x6034, 0x9086, 0x4000, 0x1118, 0x080c, 0x2d1a, 0x08d0, 0x6034,
++	0x908c, 0xff00, 0x810f, 0x9186, 0x0039, 0x0118, 0x9186, 0x0035,
++	0x1118, 0x080c, 0x2d1a, 0x0868, 0x080c, 0x9584, 0x0005, 0x6000,
++	0x908a, 0x0016, 0x1a0c, 0x0d84, 0x0002, 0xb08d, 0xb08d, 0xb08f,
++	0xb08f, 0xb08f, 0xb08d, 0xb08d, 0xb08d, 0xb08d, 0xb08d, 0xb08d,
++	0xb08d, 0xb08d, 0xb08d, 0xb08d, 0xb08d, 0x080c, 0x0d84, 0x080c,
++	0x901f, 0x6114, 0x0096, 0x2148, 0xa87b, 0x0006, 0x080c, 0x61a9,
++	0x009e, 0x0804, 0x9554, 0x9284, 0x0007, 0x1158, 0x9282, 0x1cd0,
++	0x0240, 0x2001, 0x1818, 0x2004, 0x9202, 0x1218, 0x9085, 0x0001,
++	0x0005, 0x9006, 0x0ce8, 0x0096, 0x0018, 0x0096, 0x6014, 0x2048,
++	0x9984, 0xf000, 0x9086, 0xf000, 0x0110, 0x080c, 0x1057, 0x009e,
++	0x0005, 0x00e6, 0x00c6, 0x0036, 0x0006, 0x0126, 0x2091, 0x8000,
++	0x2061, 0x1cd0, 0x2071, 0x1800, 0x734c, 0x706c, 0x9302, 0x12a8,
++	0x6020, 0x9206, 0x1160, 0x080c, 0xb460, 0x0148, 0x080c, 0xb295,
++	0x1110, 0x080c, 0x9e99, 0x00c6, 0x080c, 0x9554, 0x00ce, 0x9ce0,
++	0x0018, 0x7060, 0x9c02, 0x1208, 0x0c38, 0x012e, 0x000e, 0x003e,
++	0x00ce, 0x00ee, 0x0005, 0x00e6, 0x00c6, 0x0016, 0x9188, 0x1000,
++	0x210c, 0x81ff, 0x0128, 0x2061, 0x1a72, 0x6112, 0x080c, 0x2d1a,
++	0x9006, 0x0010, 0x9085, 0x0001, 0x001e, 0x00ce, 0x00ee, 0x0005,
++	0x00c6, 0x0126, 0x2091, 0x8000, 0x080c, 0x94fe, 0x01d8, 0x080c,
++	0x4df2, 0x0110, 0x662e, 0x0008, 0x6616, 0x2b00, 0x6012, 0x080c,
++	0x4df2, 0x0118, 0x080c, 0xb1bc, 0x0168, 0x080c, 0xb4e6, 0x6023,
++	0x0003, 0x2009, 0x004b, 0x080c, 0x95ce, 0x9085, 0x0001, 0x012e,
++	0x00ce, 0x0005, 0x9006, 0x0cd8, 0x00c6, 0x0126, 0x2091, 0x8000,
++	0xbaa0, 0x080c, 0x95a1, 0x0590, 0x080c, 0x4df2, 0x0118, 0x602f,
++	0x0000, 0x0010, 0x6017, 0x0000, 0x2b00, 0x6012, 0x080c, 0xb4e6,
++	0x6023, 0x0003, 0x0016, 0x080c, 0x7d55, 0x0076, 0x903e, 0x080c,
++	0x7c4d, 0x2c08, 0x080c, 0xc73e, 0x007e, 0x001e, 0xd184, 0x0128,
++	0x080c, 0x9554, 0x9085, 0x0001, 0x0070, 0x080c, 0x4df2, 0x0128,
++	0xd18c, 0x1170, 0x080c, 0xb1bc, 0x0148, 0x2009, 0x004c, 0x080c,
++	0x95ce, 0x9085, 0x0001, 0x012e, 0x00ce, 0x0005, 0x9006, 0x0cd8,
++	0x2900, 0x6016, 0x0c90, 0x2009, 0x004d, 0x0010, 0x2009, 0x004e,
++	0x00f6, 0x00c6, 0x0046, 0x0016, 0x080c, 0x94fe, 0x2c78, 0x01d8,
++	0x080c, 0x4df2, 0x0110, 0x7e2e, 0x0008, 0x7e16, 0x2b00, 0x7812,
++	0x7823, 0x0003, 0x2021, 0x0005, 0x080c, 0xb1ce, 0x2f60, 0x080c,
++	0x4df2, 0x0118, 0x080c, 0xb1bc, 0x0130, 0x001e, 0x0016, 0x080c,
++	0x95ce, 0x9085, 0x0001, 0x001e, 0x004e, 0x00ce, 0x00fe, 0x0005,
++	0x00f6, 0x00c6, 0x0046, 0x080c, 0x94fe, 0x2c78, 0x0530, 0x080c,
++	0x4df2, 0x0110, 0x7e2e, 0x0008, 0x7e16, 0x2b00, 0x7812, 0x7823,
++	0x0003, 0x0096, 0x2021, 0x0004, 0x0489, 0x009e, 0x2001, 0x194d,
++	0x200c, 0xd1fc, 0x0120, 0x2f60, 0x080c, 0x9554, 0x0060, 0x2f60,
++	0x080c, 0x4df2, 0x0120, 0xd18c, 0x1160, 0x0071, 0x0130, 0x2009,
++	0x0052, 0x080c, 0x95ce, 0x9085, 0x0001, 0x004e, 0x00ce, 0x00fe,
++	0x0005, 0x2900, 0x7816, 0x0c98, 0x00c6, 0x080c, 0x441f, 0x00ce,
++	0x1120, 0x080c, 0x9554, 0x9006, 0x0005, 0xa867, 0x0000, 0xa86b,
++	0x8000, 0x2900, 0x6016, 0x9085, 0x0001, 0x0005, 0x0096, 0x0076,
++	0x0126, 0x2091, 0x8000, 0x080c, 0x5d41, 0x0158, 0x2001, 0xb1d3,
++	0x0006, 0x900e, 0x2400, 0x080c, 0x63d1, 0x080c, 0x61a9, 0x000e,
++	0x0807, 0x2418, 0x080c, 0x7fc0, 0xbaa0, 0x0086, 0x2041, 0x0001,
++	0x2039, 0x0001, 0x2608, 0x080c, 0x7d6d, 0x008e, 0x080c, 0x7c4d,
++	0x2f08, 0x2648, 0x080c, 0xc73e, 0xb93c, 0x81ff, 0x090c, 0x7e2b,
++	0x080c, 0x8125, 0x012e, 0x007e, 0x009e, 0x0005, 0x00c6, 0x0126,
++	0x2091, 0x8000, 0x080c, 0x94fe, 0x0190, 0x660a, 0x2b08, 0x6112,
++	0x080c, 0xb4e6, 0x6023, 0x0001, 0x2900, 0x6016, 0x2009, 0x001f,
++	0x080c, 0x95ce, 0x9085, 0x0001, 0x012e, 0x00ce, 0x0005, 0x9006,
++	0x0cd8, 0x00c6, 0x0126, 0x2091, 0x8000, 0x080c, 0x95a1, 0x01b8,
++	0x660a, 0x2b08, 0x6112, 0x080c, 0xb4e6, 0x6023, 0x0008, 0x2900,
++	0x6016, 0x00f6, 0x2c78, 0x080c, 0x150d, 0x00fe, 0x2009, 0x0021,
++	0x080c, 0x95ce, 0x9085, 0x0001, 0x012e, 0x00ce, 0x0005, 0x9006,
++	0x0cd8, 0x2009, 0x003d, 0x00c6, 0x0126, 0x0016, 0x2091, 0x8000,
++	0x080c, 0x94fe, 0x0198, 0x660a, 0x2b08, 0x6112, 0x080c, 0xb4e6,
++	0x6023, 0x0001, 0x2900, 0x6016, 0x001e, 0x0016, 0x080c, 0x95ce,
++	0x9085, 0x0001, 0x001e, 0x012e, 0x00ce, 0x0005, 0x9006, 0x0cd0,
++	0x00c6, 0x0126, 0x2091, 0x8000, 0x080c, 0x95a1, 0x0188, 0x2b08,
++	0x6112, 0x080c, 0xb4e6, 0x6023, 0x0001, 0x2900, 0x6016, 0x2009,
++	0x0000, 0x080c, 0x95ce, 0x9085, 0x0001, 0x012e, 0x00ce, 0x0005,
++	0x9006, 0x0cd8, 0x2009, 0x0044, 0x0830, 0x2009, 0x0049, 0x0818,
++	0x0026, 0x00b6, 0x6210, 0x2258, 0xba3c, 0x82ff, 0x0110, 0x8211,
++	0xba3e, 0x00be, 0x002e, 0x0005, 0x0006, 0x0016, 0x6004, 0x908e,
++	0x0002, 0x0140, 0x908e, 0x0003, 0x0128, 0x908e, 0x0004, 0x0110,
++	0x9085, 0x0001, 0x001e, 0x000e, 0x0005, 0x0006, 0x0096, 0x6014,
++	0x904d, 0x0148, 0xa864, 0x9086, 0x0139, 0x0138, 0xa868, 0xd0fc,
++	0x0110, 0x9006, 0x0010, 0x9085, 0x0001, 0x009e, 0x000e, 0x0005,
++	0x00c6, 0x0126, 0x2091, 0x8000, 0x080c, 0x94fe, 0x0198, 0x2b08,
++	0x6112, 0x080c, 0xb4e6, 0x6023, 0x0001, 0x2900, 0x6016, 0x080c,
++	0x2d1a, 0x2009, 0x0028, 0x080c, 0x95ce, 0x9085, 0x0001, 0x012e,
++	0x00ce, 0x0005, 0x9006, 0x0cd8, 0x9186, 0x0015, 0x11a8, 0x2011,
++	0x1822, 0x2204, 0x9086, 0x0074, 0x1178, 0x00b6, 0x080c, 0xa0c5,
++	0x00be, 0x080c, 0xa2bc, 0x6003, 0x0001, 0x6007, 0x0029, 0x080c,
++	0x7c1d, 0x080c, 0x8125, 0x0078, 0x6014, 0x0096, 0x2048, 0xa868,
++	0x009e, 0xd0fc, 0x0148, 0x2001, 0x0001, 0x080c, 0xb69a, 0x080c,
++	0x9e99, 0x080c, 0x9554, 0x0005, 0x0096, 0x6014, 0x904d, 0x090c,
++	0x0d84, 0xa87b, 0x0030, 0xa883, 0x0000, 0xa897, 0x4005, 0xa89b,
++	0x0004, 0xa867, 0x0139, 0x0126, 0x2091, 0x8000, 0x080c, 0x61a9,
++	0x012e, 0x009e, 0x080c, 0x9554, 0x0c30, 0x0096, 0x9186, 0x0016,
++	0x1128, 0x2001, 0x0004, 0x080c, 0x5b61, 0x00e8, 0x9186, 0x0015,
++	0x1510, 0x2011, 0x1822, 0x2204, 0x9086, 0x0014, 0x11e0, 0x6010,
++	0x00b6, 0x2058, 0x080c, 0x5ca8, 0x00be, 0x080c, 0xa38d, 0x1198,
++	0x6010, 0x00b6, 0x2058, 0xb890, 0x00be, 0x9005, 0x0160, 0x2001,
++	0x0006, 0x080c, 0x5b61, 0x6014, 0x2048, 0xa868, 0xd0fc, 0x0170,
++	0x080c, 0x9920, 0x0048, 0x6014, 0x2048, 0xa868, 0xd0fc, 0x0528,
++	0x080c, 0x9e99, 0x080c, 0x9554, 0x009e, 0x0005, 0x6014, 0x6310,
++	0x2358, 0x904d, 0x090c, 0x0d84, 0xa87b, 0x0000, 0xa883, 0x0000,
++	0xa897, 0x4000, 0x900e, 0x080c, 0x5e2d, 0x1108, 0xc185, 0xb800,
++	0xd0bc, 0x0108, 0xc18d, 0xa99a, 0x0126, 0x2091, 0x8000, 0x080c,
++	0x61a9, 0x012e, 0x080c, 0x9554, 0x08f8, 0x6014, 0x904d, 0x090c,
++	0x0d84, 0xa87b, 0x0030, 0xa883, 0x0000, 0xa897, 0x4005, 0xa89b,
++	0x0004, 0xa867, 0x0139, 0x0126, 0x2091, 0x8000, 0x080c, 0x61a9,
++	0x012e, 0x080c, 0x9554, 0x0840, 0xa878, 0x9086, 0x0005, 0x1108,
++	0x0009, 0x0005, 0xa880, 0xc0ad, 0xa882, 0x0005, 0x6043, 0x0000,
++	0x6017, 0x0000, 0x6003, 0x0001, 0x6007, 0x0050, 0x080c, 0x7bcb,
++	0x080c, 0x8125, 0x0005, 0x00c6, 0x6010, 0x00b6, 0x2058, 0xb800,
++	0x00be, 0xd0bc, 0x0120, 0x6020, 0x9084, 0x000f, 0x0013, 0x00ce,
++	0x0005, 0xadfa, 0xb3aa, 0xb3aa, 0xb3ad, 0xca0f, 0xca2a, 0xca2d,
++	0xadfa, 0xadfa, 0xadfa, 0xadfa, 0xadfa, 0xadfa, 0xadfa, 0xadfa,
++	0x080c, 0x0d84, 0xa001, 0xa001, 0x0005, 0x0000, 0x6010, 0x00b6,
++	0x2058, 0xb800, 0x00be, 0xd0bc, 0x0550, 0x00f6, 0x2c78, 0x080c,
++	0x94fe, 0x1128, 0x2001, 0x1955, 0x2004, 0x7842, 0x00f8, 0x7810,
++	0x6012, 0x080c, 0xb4e6, 0x7820, 0x9086, 0x0003, 0x0128, 0x7808,
++	0x603a, 0x2f00, 0x603e, 0x0020, 0x7808, 0x603e, 0x2f00, 0x603a,
++	0x602e, 0x6023, 0x0001, 0x6007, 0x0035, 0x6003, 0x0001, 0x7954,
++	0x6156, 0x080c, 0x7bcb, 0x080c, 0x8125, 0x2f60, 0x00fe, 0x0005,
++	0x0016, 0x0096, 0x6814, 0x2048, 0xa87c, 0xd0e4, 0x0170, 0xc0e4,
++	0xa87e, 0xa877, 0x0000, 0xa893, 0x0000, 0xa88f, 0x0000, 0xd0cc,
++	0x0120, 0xa878, 0x2048, 0x080c, 0x0f60, 0x6830, 0x6036, 0x908e,
++	0x0001, 0x0148, 0x6803, 0x0002, 0x9086, 0x0005, 0x0168, 0x9006,
++	0x602e, 0x6032, 0x00c8, 0x681c, 0xc085, 0x681e, 0x6803, 0x0004,
++	0x6824, 0xc0f4, 0xc0d5, 0x6826, 0x6814, 0x2048, 0xa8ac, 0x6938,
++	0x9102, 0xa8b0, 0x693c, 0x9103, 0x1e50, 0x683c, 0x602e, 0x6838,
++	0x9084, 0xfffc, 0x683a, 0x6032, 0x2d00, 0x603a, 0x6808, 0x603e,
++	0x6910, 0x6112, 0x6954, 0x6156, 0x6023, 0x0001, 0x6007, 0x0039,
++	0x6003, 0x0001, 0x080c, 0x7bcb, 0x080c, 0x8125, 0x009e, 0x001e,
++	0x0005, 0x6024, 0xd0d4, 0x0510, 0xd0f4, 0x11f8, 0x6038, 0x940a,
++	0x603c, 0x9303, 0x0230, 0x9105, 0x0120, 0x6024, 0xc0d4, 0xc0f5,
++	0x0098, 0x643a, 0x633e, 0xac3e, 0xab42, 0x0046, 0x0036, 0x2400,
++	0xacac, 0x9402, 0xa836, 0x2300, 0xabb0, 0x9303, 0xa83a, 0x003e,
++	0x004e, 0x6024, 0xc0d4, 0x0000, 0x6026, 0x0005, 0xd0f4, 0x1138,
++	0xa83c, 0x603a, 0xa840, 0x603e, 0x6024, 0xc0f5, 0x6026, 0x0005,
++	0x0006, 0x0016, 0x6004, 0x908e, 0x0034, 0x01b8, 0x908e, 0x0035,
++	0x01a0, 0x908e, 0x0036, 0x0188, 0x908e, 0x0037, 0x0170, 0x908e,
++	0x0038, 0x0158, 0x908e, 0x0039, 0x0140, 0x908e, 0x003a, 0x0128,
++	0x908e, 0x003b, 0x0110, 0x9085, 0x0001, 0x001e, 0x000e, 0x0005,
++	0x0006, 0x0016, 0x0026, 0x0036, 0x00e6, 0x2001, 0x194f, 0x200c,
++	0x8000, 0x2014, 0x2001, 0x0032, 0x080c, 0x7a4b, 0x2001, 0x1953,
++	0x82ff, 0x1110, 0x2011, 0x0014, 0x2202, 0x2001, 0x1951, 0x200c,
++	0x8000, 0x2014, 0x2071, 0x193b, 0x711a, 0x721e, 0x2001, 0x0064,
++	0x080c, 0x7a4b, 0x2001, 0x1954, 0x82ff, 0x1110, 0x2011, 0x0014,
++	0x2202, 0x2001, 0x1955, 0x9288, 0x000a, 0x2102, 0x2001, 0x1a54,
++	0x2102, 0x2001, 0x0032, 0x080c, 0x1492, 0x080c, 0x5f0e, 0x00ee,
++	0x003e, 0x002e, 0x001e, 0x000e, 0x0005, 0x0006, 0x0016, 0x00e6,
++	0x2001, 0x1953, 0x2003, 0x0028, 0x2001, 0x1954, 0x2003, 0x0014,
++	0x2071, 0x193b, 0x701b, 0x0000, 0x701f, 0x07d0, 0x2001, 0x1955,
++	0x2009, 0x001e, 0x2102, 0x2001, 0x1a54, 0x2102, 0x2001, 0x0032,
++	0x080c, 0x1492, 0x00ee, 0x001e, 0x000e, 0x0005, 0x0096, 0x6058,
++	0x904d, 0x0110, 0x080c, 0x0fe0, 0x009e, 0x0005, 0x0005, 0x00c6,
++	0x0126, 0x2091, 0x8000, 0x080c, 0x94fe, 0x0180, 0x2b08, 0x6112,
++	0x0ca9, 0x6023, 0x0001, 0x2900, 0x6016, 0x2009, 0x0033, 0x080c,
++	0x95ce, 0x9085, 0x0001, 0x012e, 0x00ce, 0x0005, 0x9006, 0x0cd8,
++	0x0096, 0x00e6, 0x00f6, 0x2071, 0x1800, 0x9186, 0x0015, 0x1500,
++	0x7088, 0x9086, 0x0018, 0x11e0, 0x6014, 0x2048, 0xaa3c, 0xd2e4,
++	0x1160, 0x2c78, 0x080c, 0x8315, 0x01d8, 0x7074, 0xaa50, 0x9206,
++	0x1160, 0x7078, 0xaa54, 0x9206, 0x1140, 0x6210, 0x00b6, 0x2258,
++	0xbaa0, 0x00be, 0x900e, 0x080c, 0x2d5f, 0x080c, 0x9920, 0x0020,
++	0x080c, 0x9e99, 0x080c, 0x9554, 0x00fe, 0x00ee, 0x009e, 0x0005,
++	0x7058, 0xaa54, 0x9206, 0x0d48, 0x0c80, 0x00c6, 0x0126, 0x2091,
++	0x8000, 0x080c, 0x94fe, 0x0188, 0x2b08, 0x6112, 0x080c, 0xb4e6,
++	0x6023, 0x0001, 0x2900, 0x6016, 0x2009, 0x004d, 0x080c, 0x95ce,
++	0x9085, 0x0001, 0x012e, 0x00ce, 0x0005, 0x9006, 0x0cd8, 0x00c6,
++	0x0126, 0x2091, 0x8000, 0x0016, 0x080c, 0x94fe, 0x0180, 0x2b08,
++	0x6112, 0x080c, 0xb4e6, 0x6023, 0x0001, 0x2900, 0x6016, 0x001e,
++	0x080c, 0x95ce, 0x9085, 0x0001, 0x012e, 0x00ce, 0x0005, 0x001e,
++	0x9006, 0x0cd0, 0x0016, 0x0026, 0x0036, 0x0046, 0x0056, 0x0066,
++	0x0096, 0x00e6, 0x00f6, 0x2071, 0x1800, 0x9186, 0x0015, 0x1568,
++	0x7188, 0x6014, 0x2048, 0xa814, 0x8003, 0x9106, 0x1530, 0x20e1,
++	0x0000, 0x2001, 0x196d, 0x2003, 0x0000, 0x6014, 0x2048, 0xa830,
++	0x20a8, 0x8906, 0x8006, 0x8007, 0x9094, 0x003f, 0x22e8, 0x9084,
++	0xffc0, 0x9080, 0x001b, 0x20a0, 0x2001, 0x196d, 0x0016, 0x200c,
++	0x080c, 0xbcf8, 0x001e, 0xa804, 0x9005, 0x0110, 0x2048, 0x0c38,
++	0x6014, 0x2048, 0xa867, 0x0103, 0x0010, 0x080c, 0x9e99, 0x080c,
++	0x9554, 0x00fe, 0x00ee, 0x009e, 0x006e, 0x005e, 0x004e, 0x003e,
++	0x002e, 0x001e, 0x0005, 0x0096, 0x00e6, 0x00f6, 0x2071, 0x1800,
++	0x9186, 0x0015, 0x11b8, 0x7088, 0x9086, 0x0004, 0x1198, 0x6014,
++	0x2048, 0x2c78, 0x080c, 0x8315, 0x01a8, 0x7074, 0xaa74, 0x9206,
++	0x1130, 0x7078, 0xaa78, 0x9206, 0x1110, 0x080c, 0x2d1a, 0x080c,
++	0x9920, 0x0020, 0x080c, 0x9e99, 0x080c, 0x9554, 0x00fe, 0x00ee,
++	0x009e, 0x0005, 0x7058, 0xaa78, 0x9206, 0x0d78, 0x0c80, 0x0096,
++	0x00e6, 0x00f6, 0x2071, 0x1800, 0x9186, 0x0015, 0x1538, 0x7088,
++	0x9086, 0x0004, 0x1518, 0x6014, 0x2048, 0x2c78, 0x080c, 0x8315,
++	0x05b8, 0x7074, 0xaacc, 0x9206, 0x1180, 0x7078, 0xaad0, 0x9206,
++	0x1160, 0x080c, 0x2d1a, 0x0016, 0xa998, 0xaab0, 0x9284, 0x1000,
++	0xc0fd, 0x080c, 0x4da2, 0x001e, 0x0010, 0x080c, 0x4b95, 0xa87b,
++	0x0000, 0xa883, 0x0000, 0xa897, 0x4000, 0x0060, 0x080c, 0x4b95,
++	0x6014, 0x2048, 0xa87b, 0x0030, 0xa883, 0x0000, 0xa897, 0x4005,
++	0xa89b, 0x0004, 0x0126, 0x2091, 0x8000, 0xa867, 0x0139, 0x080c,
++	0x61a9, 0x012e, 0x080c, 0x9554, 0x00fe, 0x00ee, 0x009e, 0x0005,
++	0x7058, 0xaad0, 0x9206, 0x0968, 0x08c0, 0x0016, 0x0026, 0xa87c,
++	0xd0ac, 0x0178, 0xa938, 0xaa34, 0x2100, 0x9205, 0x0150, 0xa890,
++	0x9106, 0x1118, 0xa88c, 0x9206, 0x0120, 0xa992, 0xaa8e, 0x9085,
++	0x0001, 0x002e, 0x001e, 0x0005, 0x00b6, 0x00d6, 0x0036, 0x0096,
++	0x6314, 0x2348, 0xa87a, 0xa982, 0x929e, 0x4000, 0x1580, 0x6310,
++	0x00c6, 0x2358, 0x2009, 0x0000, 0xa868, 0xd0f4, 0x1140, 0x080c,
++	0x5e2d, 0x1108, 0xc185, 0xb800, 0xd0bc, 0x0108, 0xc18d, 0xaa96,
++	0xa99a, 0x20a9, 0x0004, 0xa860, 0x20e8, 0xa85c, 0x9080, 0x0031,
++	0x20a0, 0xb8b4, 0x20e0, 0xb8b8, 0x9080, 0x0006, 0x2098, 0x080c,
++	0x0f2b, 0x20a9, 0x0004, 0xa85c, 0x9080, 0x0035, 0x20a0, 0xb8b8,
++	0x9080, 0x000a, 0x2098, 0x080c, 0x0f2b, 0x00ce, 0x0090, 0xaa96,
++	0x3918, 0x9398, 0x0007, 0x231c, 0x6004, 0x9086, 0x0016, 0x0110,
++	0xa89b, 0x0004, 0xaba2, 0x6310, 0x2358, 0xb804, 0x9084, 0x00ff,
++	0xa89e, 0x080c, 0x619c, 0x6017, 0x0000, 0x009e, 0x003e, 0x00de,
++	0x00be, 0x0005, 0x0026, 0x0036, 0x0046, 0x00b6, 0x0096, 0x00f6,
++	0x6214, 0x2248, 0x6210, 0x2258, 0x2079, 0x0260, 0x9096, 0x0000,
++	0x11a0, 0xb814, 0x9084, 0x00ff, 0x900e, 0x080c, 0x23fd, 0x2118,
++	0x831f, 0x939c, 0xff00, 0x7838, 0x9084, 0x00ff, 0x931d, 0x7c3c,
++	0x2011, 0x8018, 0x080c, 0x447f, 0x00a8, 0x9096, 0x0001, 0x1148,
++	0x89ff, 0x0180, 0xa89b, 0x000d, 0x7838, 0xa8a6, 0x783c, 0xa8aa,
++	0x0048, 0x9096, 0x0002, 0x1130, 0xa89b, 0x000d, 0x7838, 0xa8a6,
++	0x783c, 0xa8aa, 0x00fe, 0x009e, 0x00be, 0x004e, 0x003e, 0x002e,
++	0x0005, 0x00c6, 0x0026, 0x0016, 0x9186, 0x0035, 0x0110, 0x6a38,
++	0x0008, 0x6a2c, 0x080c, 0xb09b, 0x01f0, 0x2260, 0x6120, 0x9186,
++	0x0003, 0x0118, 0x9186, 0x0006, 0x1190, 0x6838, 0x9206, 0x0140,
++	0x683c, 0x9206, 0x1160, 0x6108, 0x6838, 0x9106, 0x1140, 0x0020,
++	0x6008, 0x693c, 0x9106, 0x1118, 0x6010, 0x6910, 0x9106, 0x001e,
++	0x002e, 0x00ce, 0x0005, 0x9085, 0x0001, 0x0cc8, 0xa974, 0xd1cc,
++	0x0188, 0x918c, 0x00ff, 0x918e, 0x0002, 0x1160, 0xa9a8, 0x918c,
++	0x0f00, 0x810f, 0x918e, 0x0001, 0x1128, 0xa834, 0xa938, 0x9115,
++	0x190c, 0xa82a, 0x0005, 0x0036, 0x2019, 0x0001, 0x0010, 0x0036,
++	0x901e, 0x0459, 0x01a0, 0x080c, 0xb0ad, 0x0188, 0x6037, 0x4000,
++	0x6014, 0x6017, 0x0000, 0x0096, 0x2048, 0xa87c, 0xa867, 0x0103,
++	0xa877, 0x0000, 0x83ff, 0x1129, 0x080c, 0x61a9, 0x009e, 0x003e,
++	0x0005, 0xa880, 0xd0b4, 0x0128, 0xa87b, 0x0006, 0xc0ec, 0xa882,
++	0x0048, 0xd0bc, 0x0118, 0xa87b, 0x0002, 0x0020, 0xa87b, 0x0005,
++	0x080c, 0xb37a, 0xa877, 0x0000, 0x0005, 0x2001, 0x180f, 0x2004,
++	0xd0ec, 0x0005, 0x0006, 0x2001, 0x180f, 0x2004, 0xd0f4, 0x000e,
++	0x0005, 0x2001, 0x180f, 0x2004, 0xd0e4, 0x0005, 0x0036, 0x0046,
++	0x6010, 0x00b6, 0x2058, 0xbba0, 0x00be, 0x2021, 0x0007, 0x080c,
++	0x44f9, 0x004e, 0x003e, 0x0005, 0x0c61, 0x1d81, 0x0005, 0x2001,
++	0x1953, 0x2004, 0x601a, 0x0005, 0x2001, 0x1955, 0x2004, 0x6042,
++	0x0005, 0x080c, 0x9554, 0x0804, 0x8125, 0x00b6, 0x0066, 0x6000,
++	0x90b2, 0x0016, 0x1a0c, 0x0d84, 0x001b, 0x006e, 0x00be, 0x0005,
++	0xb798, 0xbdf9, 0xbf54, 0xb798, 0xb798, 0xb798, 0xb798, 0xb798,
++	0xb7cf, 0xbfcf, 0xb798, 0xb798, 0xb798, 0xb798, 0xb798, 0xb798,
++	0x080c, 0x0d84, 0x0066, 0x6000, 0x90b2, 0x0016, 0x1a0c, 0x0d84,
++	0x0013, 0x006e, 0x0005, 0xb7b3, 0xc519, 0xb7b3, 0xb7b3, 0xb7b3,
++	0xb7b3, 0xb7b3, 0xb7b3, 0xc4c8, 0xc56d, 0xb7b3, 0xcb4c, 0xcb82,
++	0xcb4c, 0xcb82, 0xb7b3, 0x080c, 0x0d84, 0x6000, 0x9082, 0x0016,
++	0x1a0c, 0x0d84, 0x6000, 0x000a, 0x0005, 0xb7cd, 0xc1ad, 0xc29d,
++	0xc2bf, 0xc366, 0xb7cd, 0xc43f, 0xc3ee, 0xbfdb, 0xc49e, 0xc4b3,
++	0xb7cd, 0xb7cd, 0xb7cd, 0xb7cd, 0xb7cd, 0x080c, 0x0d84, 0x91b2,
++	0x0053, 0x1a0c, 0x0d84, 0x2100, 0x91b2, 0x0040, 0x1a04, 0xbbfa,
++	0x0002, 0xb819, 0xb9eb, 0xb819, 0xb819, 0xb819, 0xb9f4, 0xb819,
++	0xb819, 0xb819, 0xb819, 0xb819, 0xb819, 0xb819, 0xb819, 0xb819,
++	0xb819, 0xb819, 0xb819, 0xb819, 0xb819, 0xb819, 0xb819, 0xb819,
++	0xb81b, 0xb871, 0xb880, 0xb8e1, 0xb908, 0xb97f, 0xb9d6, 0xb819,
++	0xb819, 0xb9f7, 0xb819, 0xb819, 0xba0c, 0xba19, 0xb819, 0xb819,
++	0xb819, 0xb819, 0xb819, 0xba9c, 0xb819, 0xb819, 0xbab0, 0xb819,
++	0xb819, 0xba6b, 0xb819, 0xb819, 0xb819, 0xbac8, 0xb819, 0xb819,
++	0xb819, 0xbb45, 0xb819, 0xb819, 0xb819, 0xb819, 0xb819, 0xb819,
++	0xbbc2, 0x080c, 0x0d84, 0x080c, 0x5eeb, 0x1150, 0x2001, 0x1836,
++	0x2004, 0xd0cc, 0x1128, 0x9084, 0x0009, 0x9086, 0x0008, 0x1140,
++	0x6007, 0x0009, 0x602f, 0x0009, 0x6017, 0x0000, 0x0804, 0xb9e4,
++	0x080c, 0x5ed5, 0x00e6, 0x00c6, 0x0036, 0x0026, 0x0016, 0x6210,
++	0x2258, 0xbaa0, 0x0026, 0x2019, 0x0029, 0x080c, 0x7d55, 0x0076,
++	0x903e, 0x080c, 0x7c4d, 0x2c08, 0x080c, 0xc73e, 0x007e, 0x001e,
++	0x001e, 0x002e, 0x003e, 0x00ce, 0x00ee, 0x6610, 0x2658, 0x080c,
++	0x5c1c, 0xbe04, 0x9684, 0x00ff, 0x9082, 0x0006, 0x0278, 0x080c,
++	0xc675, 0x1904, 0xb8db, 0x080c, 0xc611, 0x1120, 0x6007, 0x0008,
++	0x0804, 0xb9e4, 0x6007, 0x0009, 0x0804, 0xb9e4, 0x080c, 0xc860,
++	0x0128, 0x080c, 0xc675, 0x0d78, 0x0804, 0xb8db, 0x6017, 0x1900,
++	0x0c88, 0x080c, 0x2e39, 0x1904, 0xbbf7, 0x6106, 0x080c, 0xc5c8,
++	0x6007, 0x0006, 0x0804, 0xb9e4, 0x6007, 0x0007, 0x0804, 0xb9e4,
++	0x080c, 0xcbbe, 0x1904, 0xbbf7, 0x080c, 0x2e39, 0x1904, 0xbbf7,
++	0x00d6, 0x6610, 0x2658, 0xbe04, 0x9684, 0x00ff, 0x9082, 0x0006,
++	0x1220, 0x2001, 0x0001, 0x080c, 0x5b4d, 0x96b4, 0xff00, 0x8637,
++	0x9686, 0x0006, 0x0188, 0x9686, 0x0004, 0x0170, 0xbe04, 0x96b4,
++	0x00ff, 0x9686, 0x0006, 0x0140, 0x9686, 0x0004, 0x0128, 0x9686,
++	0x0005, 0x0110, 0x00de, 0x0478, 0x00e6, 0x2071, 0x0260, 0x7034,
++	0x90b4, 0x0003, 0x1138, 0x90b2, 0x0014, 0x0220, 0x7030, 0x9084,
++	0x0003, 0x0130, 0x00ee, 0x6017, 0x0000, 0x602f, 0x0007, 0x00b0,
++	0x00ee, 0x080c, 0xc6d4, 0x1190, 0x9686, 0x0006, 0x1140, 0x0026,
++	0x6210, 0x2258, 0xbaa0, 0x900e, 0x080c, 0x2d5f, 0x002e, 0x080c,
++	0x5ca8, 0x6007, 0x000a, 0x00de, 0x0804, 0xb9e4, 0x6007, 0x000b,
++	0x00de, 0x0804, 0xb9e4, 0x080c, 0x2d1a, 0x6007, 0x0001, 0x0804,
++	0xb9e4, 0x080c, 0xcbbe, 0x1904, 0xbbf7, 0x080c, 0x2e39, 0x1904,
++	0xbbf7, 0x2071, 0x0260, 0x7034, 0x90b4, 0x0003, 0x1958, 0x90b2,
++	0x0014, 0x0a40, 0x7030, 0x9084, 0x0003, 0x1920, 0x6610, 0x2658,
++	0xbe04, 0x9686, 0x0707, 0x09f8, 0x0026, 0x6210, 0x2258, 0xbaa0,
++	0x900e, 0x080c, 0x2d5f, 0x002e, 0x6007, 0x000c, 0x0804, 0xb9e4,
++	0x080c, 0x5eeb, 0x1140, 0x2001, 0x1836, 0x2004, 0x9084, 0x0009,
++	0x9086, 0x0008, 0x1110, 0x0804, 0xb828, 0x080c, 0x5ed5, 0x6610,
++	0x2658, 0xbe04, 0x9684, 0x00ff, 0x9082, 0x0006, 0x06b8, 0x1138,
++	0x0026, 0x2001, 0x0006, 0x080c, 0x5b8d, 0x002e, 0x0050, 0x96b4,
++	0xff00, 0x8637, 0x9686, 0x0004, 0x0120, 0x9686, 0x0006, 0x1904,
++	0xb8db, 0x080c, 0xc6e1, 0x1120, 0x6007, 0x000e, 0x0804, 0xb9e4,
++	0x0046, 0x6410, 0x2458, 0xbca0, 0x0046, 0x080c, 0x2d1a, 0x004e,
++	0x0016, 0x9006, 0x2009, 0x1853, 0x210c, 0xd1a4, 0x0148, 0x2009,
++	0x0029, 0x080c, 0xc9c5, 0x6010, 0x2058, 0xb800, 0xc0e5, 0xb802,
++	0x001e, 0x004e, 0x6007, 0x0001, 0x0804, 0xb9e4, 0x2001, 0x0001,
++	0x080c, 0x5b4d, 0x0156, 0x0016, 0x0026, 0x0036, 0x20a9, 0x0004,
++	0x2019, 0x1805, 0x2011, 0x0270, 0x080c, 0xa425, 0x003e, 0x002e,
++	0x001e, 0x015e, 0x9005, 0x0168, 0x96b4, 0xff00, 0x8637, 0x9682,
++	0x0004, 0x0a04, 0xb8db, 0x9682, 0x0007, 0x0a04, 0xb931, 0x0804,
++	0xb8db, 0x6017, 0x1900, 0x6007, 0x0009, 0x0804, 0xb9e4, 0x080c,
++	0x5eeb, 0x1140, 0x2001, 0x1836, 0x2004, 0x9084, 0x0009, 0x9086,
++	0x0008, 0x1110, 0x0804, 0xb828, 0x080c, 0x5ed5, 0x6610, 0x2658,
++	0xbe04, 0x9684, 0x00ff, 0x9082, 0x0006, 0x0680, 0x96b4, 0xff00,
++	0x8637, 0x9686, 0x0004, 0x0120, 0x9686, 0x0006, 0x1904, 0xb8db,
++	0x080c, 0xc70f, 0x1130, 0x080c, 0xc611, 0x1118, 0x6007, 0x0010,
++	0x04d8, 0x0046, 0x6410, 0x2458, 0xbca0, 0x0046, 0x080c, 0x2d1a,
++	0x004e, 0x0016, 0x9006, 0x2009, 0x1853, 0x210c, 0xd1a4, 0x0148,
++	0x2009, 0x0029, 0x080c, 0xc9c5, 0x6010, 0x2058, 0xb800, 0xc0e5,
++	0xb802, 0x001e, 0x004e, 0x6007, 0x0001, 0x00f0, 0x080c, 0xc860,
++	0x0140, 0x96b4, 0xff00, 0x8637, 0x9686, 0x0006, 0x0988, 0x0804,
++	0xb8db, 0x6017, 0x1900, 0x6007, 0x0009, 0x0070, 0x080c, 0x2e39,
++	0x1904, 0xbbf7, 0x080c, 0xcbbe, 0x1904, 0xbbf7, 0x080c, 0xbd93,
++	0x1904, 0xb8db, 0x6007, 0x0012, 0x6003, 0x0001, 0x080c, 0x7c1d,
++	0x080c, 0x8125, 0x0005, 0x6007, 0x0001, 0x6003, 0x0001, 0x080c,
++	0x7c1d, 0x080c, 0x8125, 0x0cb0, 0x6007, 0x0005, 0x0c68, 0x080c,
++	0xcbbe, 0x1904, 0xbbf7, 0x080c, 0x2e39, 0x1904, 0xbbf7, 0x080c,
++	0xbd93, 0x1904, 0xb8db, 0x6007, 0x0020, 0x6003, 0x0001, 0x080c,
++	0x7c1d, 0x080c, 0x8125, 0x0005, 0x080c, 0x2e39, 0x1904, 0xbbf7,
++	0x6007, 0x0023, 0x6003, 0x0001, 0x080c, 0x7c1d, 0x080c, 0x8125,
++	0x0005, 0x080c, 0xcbbe, 0x1904, 0xbbf7, 0x080c, 0x2e39, 0x1904,
++	0xbbf7, 0x080c, 0xbd93, 0x1904, 0xb8db, 0x0016, 0x0026, 0x00e6,
++	0x2071, 0x0260, 0x7244, 0x9286, 0xffff, 0x0180, 0x2c08, 0x080c,
++	0xb09b, 0x01b0, 0x2260, 0x7240, 0x6008, 0x9206, 0x1188, 0x6010,
++	0x9190, 0x0004, 0x2214, 0x9206, 0x01b8, 0x0050, 0x7240, 0x2c08,
++	0x9006, 0x080c, 0xc997, 0x1180, 0x7244, 0x9286, 0xffff, 0x01b0,
++	0x2160, 0x6007, 0x0026, 0x6017, 0x1700, 0x7214, 0x9296, 0xffff,
++	0x1180, 0x6007, 0x0025, 0x0068, 0x6020, 0x9086, 0x0007, 0x1d80,
++	0x6004, 0x9086, 0x0024, 0x1110, 0x080c, 0x9554, 0x2160, 0x6007,
++	0x0025, 0x6003, 0x0001, 0x080c, 0x7c1d, 0x080c, 0x8125, 0x00ee,
++	0x002e, 0x001e, 0x0005, 0x2001, 0x0001, 0x080c, 0x5b4d, 0x0156,
++	0x0016, 0x0026, 0x0036, 0x20a9, 0x0004, 0x2019, 0x1805, 0x2011,
++	0x0276, 0x080c, 0xa425, 0x003e, 0x002e, 0x001e, 0x015e, 0x0120,
++	0x6007, 0x0031, 0x0804, 0xb9e4, 0x080c, 0xa0dc, 0x080c, 0x6877,
++	0x1190, 0x0006, 0x0026, 0x0036, 0x080c, 0x6891, 0x1138, 0x080c,
++	0x6b40, 0x080c, 0x56d9, 0x080c, 0x67be, 0x0010, 0x080c, 0x6853,
++	0x003e, 0x002e, 0x000e, 0x0005, 0x080c, 0x2e39, 0x1904, 0xbbf7,
++	0x080c, 0xbd93, 0x1904, 0xb8db, 0x6106, 0x080c, 0xbdaf, 0x1120,
++	0x6007, 0x002b, 0x0804, 0xb9e4, 0x6007, 0x002c, 0x0804, 0xb9e4,
++	0x080c, 0xcbbe, 0x1904, 0xbbf7, 0x080c, 0x2e39, 0x1904, 0xbbf7,
++	0x080c, 0xbd93, 0x1904, 0xb8db, 0x6106, 0x080c, 0xbdb3, 0x1120,
++	0x6007, 0x002e, 0x0804, 0xb9e4, 0x6007, 0x002f, 0x0804, 0xb9e4,
++	0x080c, 0x2e39, 0x1904, 0xbbf7, 0x00e6, 0x00d6, 0x00c6, 0x6010,
++	0x2058, 0xb804, 0x9184, 0x00ff, 0x9086, 0x0006, 0x0158, 0x9184,
++	0xff00, 0x8007, 0x9086, 0x0006, 0x0128, 0x00ce, 0x00de, 0x00ee,
++	0x0804, 0xb9eb, 0x080c, 0x4dee, 0xd0e4, 0x0904, 0xbb42, 0x2071,
++	0x026c, 0x7010, 0x603a, 0x7014, 0x603e, 0x7108, 0x720c, 0x080c,
++	0x5f29, 0x0140, 0x6010, 0x2058, 0xb810, 0x9106, 0x1118, 0xb814,
++	0x9206, 0x0510, 0x080c, 0x5f25, 0x15b8, 0x2069, 0x1800, 0x6878,
++	0x9206, 0x1590, 0x6874, 0x9106, 0x1578, 0x7210, 0x080c, 0xb09b,
++	0x0590, 0x080c, 0xbc80, 0x0578, 0x080c, 0xca3c, 0x0560, 0x622e,
++	0x6007, 0x0036, 0x6003, 0x0001, 0x080c, 0x7bcb, 0x080c, 0x8125,
++	0x00ce, 0x00de, 0x00ee, 0x0005, 0x7214, 0x9286, 0xffff, 0x0150,
++	0x080c, 0xb09b, 0x01c0, 0x9280, 0x0002, 0x2004, 0x7110, 0x9106,
++	0x1190, 0x08e0, 0x7210, 0x2c08, 0x9085, 0x0001, 0x080c, 0xc997,
++	0x2c10, 0x2160, 0x0140, 0x0890, 0x6007, 0x0037, 0x602f, 0x0009,
++	0x6017, 0x1500, 0x08b8, 0x6007, 0x0037, 0x602f, 0x0003, 0x6017,
++	0x1700, 0x0880, 0x6007, 0x0012, 0x0868, 0x080c, 0x2e39, 0x1904,
++	0xbbf7, 0x6010, 0x2058, 0xb804, 0x9084, 0xff00, 0x8007, 0x9086,
++	0x0006, 0x1904, 0xb9eb, 0x00e6, 0x00d6, 0x00c6, 0x080c, 0x4dee,
++	0xd0e4, 0x0904, 0xbbba, 0x2069, 0x1800, 0x2071, 0x026c, 0x7008,
++	0x603a, 0x720c, 0x623e, 0x9286, 0xffff, 0x1150, 0x7208, 0x00c6,
++	0x2c08, 0x9085, 0x0001, 0x080c, 0xc997, 0x2c10, 0x00ce, 0x05e8,
++	0x080c, 0xb09b, 0x05d0, 0x7108, 0x9280, 0x0002, 0x2004, 0x9106,
++	0x15a0, 0x00c6, 0x0026, 0x2260, 0x080c, 0xad11, 0x002e, 0x00ce,
++	0x7118, 0x918c, 0xff00, 0x810f, 0x9186, 0x0001, 0x0178, 0x9186,
++	0x0005, 0x0118, 0x9186, 0x0007, 0x1198, 0x9280, 0x0005, 0x2004,
++	0x9005, 0x0170, 0x080c, 0xbc80, 0x0904, 0xbb3b, 0x0056, 0x7510,
++	0x7614, 0x080c, 0xca55, 0x005e, 0x00ce, 0x00de, 0x00ee, 0x0005,
++	0x6007, 0x003b, 0x602f, 0x0009, 0x6017, 0x2a00, 0x6003, 0x0001,
++	0x080c, 0x7bcb, 0x080c, 0x8125, 0x0c78, 0x6007, 0x003b, 0x602f,
++	0x0003, 0x6017, 0x0300, 0x6003, 0x0001, 0x080c, 0x7bcb, 0x080c,
++	0x8125, 0x0c10, 0x6007, 0x003b, 0x602f, 0x000b, 0x6017, 0x0000,
++	0x0804, 0xbb12, 0x00e6, 0x0026, 0x080c, 0x5eeb, 0x0550, 0x080c,
++	0x5ed5, 0x080c, 0xcc30, 0x1518, 0x2071, 0x1800, 0x70d8, 0x9085,
++	0x0003, 0x70da, 0x00f6, 0x2079, 0x0100, 0x72a8, 0x9284, 0x00ff,
++	0x7076, 0x78e6, 0x9284, 0xff00, 0x7278, 0x9205, 0x707a, 0x78ea,
++	0x00fe, 0x70e3, 0x0000, 0x080c, 0x5f29, 0x0120, 0x2011, 0x19cd,
++	0x2013, 0x07d0, 0xd0ac, 0x1128, 0x080c, 0x2b1e, 0x0010, 0x080c,
++	0xcc62, 0x002e, 0x00ee, 0x080c, 0x9554, 0x0804, 0xb9ea, 0x080c,
++	0x9554, 0x0005, 0x2600, 0x0002, 0xbc0e, 0xbc0e, 0xbc0e, 0xbc0e,
++	0xbc0e, 0xbc10, 0xbc0e, 0xbc0e, 0xbc0e, 0xbc0e, 0xbc2b, 0xbc0e,
++	0xbc0e, 0xbc0e, 0xbc3d, 0xbc4a, 0xbc7b, 0xbc0e, 0x080c, 0x0d84,
++	0x080c, 0xcbbe, 0x1d20, 0x080c, 0x2e39, 0x1d08, 0x080c, 0xbd93,
++	0x1148, 0x7038, 0x6016, 0x6007, 0x0045, 0x6003, 0x0001, 0x080c,
++	0x7c1d, 0x0005, 0x080c, 0x2d1a, 0x6007, 0x0001, 0x6003, 0x0001,
++	0x080c, 0x7c1d, 0x0005, 0x080c, 0xcbbe, 0x1948, 0x080c, 0x2e39,
++	0x1930, 0x080c, 0xbd93, 0x1d70, 0x703c, 0x6016, 0x6007, 0x004a,
++	0x6003, 0x0001, 0x080c, 0x7c1d, 0x0005, 0x080c, 0xbc9b, 0x0904,
++	0xbbf7, 0x6007, 0x004e, 0x6003, 0x0001, 0x080c, 0x7c1d, 0x080c,
++	0x8125, 0x0005, 0x6007, 0x004f, 0x6017, 0x0000, 0x7134, 0x918c,
++	0x00ff, 0x81ff, 0x0508, 0x9186, 0x0001, 0x1160, 0x7140, 0x2001,
++	0x198a, 0x2004, 0x9106, 0x11b0, 0x7144, 0x2001, 0x198b, 0x2004,
++	0x9106, 0x0190, 0x9186, 0x0002, 0x1168, 0x2011, 0x0276, 0x20a9,
++	0x0004, 0x6010, 0x0096, 0x2048, 0x2019, 0x000a, 0x080c, 0xa439,
++	0x009e, 0x0110, 0x6017, 0x0001, 0x6003, 0x0001, 0x080c, 0x7c1d,
++	0x080c, 0x8125, 0x0005, 0x6007, 0x0050, 0x703c, 0x6016, 0x0ca0,
++	0x00e6, 0x2071, 0x0260, 0x00b6, 0x00c6, 0x2260, 0x6010, 0x2058,
++	0xb8bc, 0xd084, 0x0150, 0x7128, 0x6048, 0x9106, 0x1120, 0x712c,
++	0x6044, 0x9106, 0x0110, 0x9006, 0x0010, 0x9085, 0x0001, 0x00ce,
++	0x00be, 0x00ee, 0x0005, 0x0016, 0x0096, 0x0086, 0x00e6, 0x01c6,
++	0x01d6, 0x0126, 0x2091, 0x8000, 0x2071, 0x1800, 0x7088, 0x908a,
++	0x00f9, 0x16e8, 0x20e1, 0x0000, 0x2001, 0x196d, 0x2003, 0x0000,
++	0x080c, 0x0fc7, 0x05a0, 0x2900, 0x6016, 0x7088, 0x8004, 0xa816,
++	0x908a, 0x001e, 0x02d0, 0xa833, 0x001e, 0x20a9, 0x001e, 0xa860,
++	0x20e8, 0xa85c, 0x9080, 0x001b, 0x20a0, 0x2001, 0x196d, 0x0016,
++	0x200c, 0x0471, 0x001e, 0x2940, 0x080c, 0x0fc7, 0x01c0, 0x2900,
++	0xa006, 0x2100, 0x81ff, 0x0180, 0x0c18, 0xa832, 0x20a8, 0xa860,
++	0x20e8, 0xa85c, 0x9080, 0x001b, 0x20a0, 0x2001, 0x196d, 0x0016,
++	0x200c, 0x00b1, 0x001e, 0x0000, 0x9085, 0x0001, 0x0048, 0x2071,
++	0x1800, 0x708b, 0x0000, 0x6014, 0x2048, 0x080c, 0x0f60, 0x9006,
++	0x012e, 0x01de, 0x01ce, 0x00ee, 0x008e, 0x009e, 0x001e, 0x0005,
++	0x0006, 0x0016, 0x0026, 0x0036, 0x00c6, 0x918c, 0xffff, 0x11a8,
++	0x080c, 0x1fed, 0x2099, 0x026c, 0x2001, 0x0014, 0x3518, 0x9312,
++	0x1218, 0x23a8, 0x4003, 0x00f8, 0x20a8, 0x4003, 0x22a8, 0x8108,
++	0x080c, 0x1fed, 0x2099, 0x0260, 0x0ca8, 0x080c, 0x1fed, 0x2061,
++	0x196d, 0x6004, 0x2098, 0x6008, 0x3518, 0x9312, 0x1218, 0x23a8,
++	0x4003, 0x0048, 0x20a8, 0x4003, 0x22a8, 0x8108, 0x080c, 0x1fed,
++	0x2099, 0x0260, 0x0ca8, 0x2061, 0x196d, 0x2019, 0x0280, 0x3300,
++	0x931e, 0x0110, 0x6006, 0x0020, 0x2001, 0x0260, 0x6006, 0x8108,
++	0x2162, 0x9292, 0x0021, 0x9296, 0xffff, 0x620a, 0x00ce, 0x003e,
++	0x002e, 0x001e, 0x000e, 0x0005, 0x0006, 0x0016, 0x0026, 0x0036,
++	0x00c6, 0x81ff, 0x11b8, 0x080c, 0x2005, 0x20a1, 0x024c, 0x2001,
++	0x0014, 0x3518, 0x9312, 0x1218, 0x23a8, 0x4003, 0x0418, 0x20a8,
++	0x4003, 0x82ff, 0x01f8, 0x22a8, 0x8108, 0x080c, 0x2005, 0x20a1,
++	0x0240, 0x0c98, 0x080c, 0x2005, 0x2061, 0x1970, 0x6004, 0x20a0,
++	0x6008, 0x3518, 0x9312, 0x1218, 0x23a8, 0x4003, 0x0058, 0x20a8,
++	0x4003, 0x82ff, 0x0138, 0x22a8, 0x8108, 0x080c, 0x2005, 0x20a1,
++	0x0240, 0x0c98, 0x2061, 0x1970, 0x2019, 0x0260, 0x3400, 0x931e,
++	0x0110, 0x6006, 0x0020, 0x2001, 0x0240, 0x6006, 0x8108, 0x2162,
++	0x9292, 0x0021, 0x9296, 0xffff, 0x620a, 0x00ce, 0x003e, 0x002e,
++	0x001e, 0x000e, 0x0005, 0x00b6, 0x0066, 0x6610, 0x2658, 0xbe04,
++	0x96b4, 0xff00, 0x8637, 0x9686, 0x0006, 0x0170, 0x9686, 0x0004,
++	0x0158, 0xbe04, 0x96b4, 0x00ff, 0x9686, 0x0006, 0x0128, 0x9686,
++	0x0004, 0x0110, 0x9085, 0x0001, 0x006e, 0x00be, 0x0005, 0x00d6,
++	0x0441, 0x00de, 0x0005, 0x00d6, 0x0489, 0x11e8, 0x680c, 0x908c,
++	0xff00, 0x6820, 0x9084, 0x00ff, 0x9115, 0x6216, 0x6824, 0x602e,
++	0xd1e4, 0x0118, 0x2009, 0x0001, 0x0058, 0xd1ec, 0x0160, 0x6920,
++	0x918c, 0x00ff, 0x6824, 0x080c, 0x23fd, 0x1128, 0x2110, 0x900e,
++	0x080c, 0x2d5f, 0x0018, 0x9085, 0x0001, 0x0008, 0x9006, 0x00de,
++	0x0005, 0x2069, 0x026d, 0x6800, 0x9082, 0x0010, 0x1228, 0x6017,
++	0x0000, 0x9085, 0x0001, 0x0008, 0x9006, 0x0005, 0x6017, 0x0000,
++	0x2069, 0x026c, 0x6808, 0x9084, 0xff00, 0x9086, 0x0800, 0x1140,
++	0x6800, 0x9084, 0x00ff, 0x908e, 0x0014, 0x0110, 0x908e, 0x0010,
++	0x0005, 0x6004, 0x90b2, 0x0053, 0x1a0c, 0x0d84, 0x91b6, 0x0013,
++	0x1130, 0x2008, 0x91b2, 0x0040, 0x1a04, 0xbf24, 0x0092, 0x91b6,
++	0x0027, 0x0120, 0x91b6, 0x0014, 0x190c, 0x0d84, 0x2001, 0x0007,
++	0x080c, 0x5b8d, 0x080c, 0x8026, 0x080c, 0x9584, 0x080c, 0x8125,
++	0x0005, 0xbe59, 0xbe5b, 0xbe59, 0xbe59, 0xbe59, 0xbe5b, 0xbe6a,
++	0xbf1d, 0xbebc, 0xbf1d, 0xbece, 0xbf1d, 0xbe6a, 0xbf1d, 0xbf15,
++	0xbf1d, 0xbf15, 0xbf1d, 0xbf1d, 0xbe59, 0xbe59, 0xbe59, 0xbe59,
++	0xbe59, 0xbe59, 0xbe59, 0xbe59, 0xbe59, 0xbe59, 0xbe59, 0xbe5b,
++	0xbe59, 0xbf1d, 0xbe59, 0xbe59, 0xbf1d, 0xbe59, 0xbf1a, 0xbf1d,
++	0xbe59, 0xbe59, 0xbe59, 0xbe59, 0xbf1d, 0xbf1d, 0xbe59, 0xbf1d,
++	0xbf1d, 0xbe59, 0xbe65, 0xbe59, 0xbe59, 0xbe59, 0xbe59, 0xbf19,
++	0xbf1d, 0xbe59, 0xbe59, 0xbf1d, 0xbf1d, 0xbe59, 0xbe59, 0xbe59,
++	0xbe59, 0x080c, 0x0d84, 0x080c, 0x8026, 0x080c, 0xb76f, 0x6003,
++	0x0002, 0x080c, 0x8125, 0x0804, 0xbf23, 0x9006, 0x080c, 0x5b4d,
++	0x0804, 0xbf1d, 0x080c, 0x5f25, 0x1904, 0xbf1d, 0x9006, 0x080c,
++	0x5b4d, 0x6010, 0x2058, 0xb810, 0x9086, 0x00ff, 0x1140, 0x00f6,
++	0x2079, 0x1800, 0x78a0, 0x8000, 0x78a2, 0x00fe, 0x0428, 0x6010,
++	0x2058, 0xb8b0, 0x9005, 0x1178, 0x080c, 0xb759, 0x1904, 0xbf1d,
++	0x0036, 0x0046, 0xbba0, 0x2021, 0x0007, 0x080c, 0x44f9, 0x004e,
++	0x003e, 0x0804, 0xbf1d, 0x080c, 0x2e64, 0x1904, 0xbf1d, 0x2001,
++	0x1800, 0x2004, 0x9086, 0x0002, 0x1138, 0x00f6, 0x2079, 0x1800,
++	0x78a0, 0x8000, 0x78a2, 0x00fe, 0x2001, 0x0002, 0x080c, 0x5b61,
++	0x080c, 0x8026, 0x6023, 0x0001, 0x6003, 0x0001, 0x6007, 0x0002,
++	0x080c, 0x7c1d, 0x080c, 0x8125, 0x6110, 0x2158, 0x2009, 0x0001,
++	0x080c, 0x7826, 0x0804, 0xbf23, 0x6610, 0x2658, 0xbe04, 0x96b4,
++	0xff00, 0x8637, 0x9686, 0x0006, 0x0904, 0xbf1d, 0x9686, 0x0004,
++	0x0904, 0xbf1d, 0x2001, 0x0004, 0x0804, 0xbf1b, 0x2001, 0x1800,
++	0x2004, 0x9086, 0x0003, 0x1158, 0x0036, 0x0046, 0x6010, 0x2058,
++	0xbba0, 0x2021, 0x0006, 0x080c, 0x44f9, 0x004e, 0x003e, 0x2001,
++	0x0006, 0x080c, 0xbf41, 0x6610, 0x2658, 0xbe04, 0x0066, 0x96b4,
++	0xff00, 0x8637, 0x9686, 0x0006, 0x006e, 0x0168, 0x2001, 0x0006,
++	0x080c, 0x5b8d, 0x9284, 0x00ff, 0x908e, 0x0007, 0x1120, 0x2001,
++	0x0006, 0x080c, 0x5b61, 0x080c, 0x5f25, 0x11f8, 0x2001, 0x1836,
++	0x2004, 0xd0a4, 0x01d0, 0xbe04, 0x96b4, 0x00ff, 0x9686, 0x0006,
++	0x01a0, 0x00f6, 0x2079, 0x1800, 0x78a0, 0x8000, 0x78a2, 0x00fe,
++	0x0804, 0xbea4, 0x2001, 0x0004, 0x0030, 0x2001, 0x0006, 0x0449,
++	0x0020, 0x0018, 0x0010, 0x080c, 0x5b8d, 0x080c, 0x8026, 0x080c,
++	0x9554, 0x080c, 0x8125, 0x0005, 0x2600, 0x0002, 0xbf38, 0xbf38,
++	0xbf38, 0xbf38, 0xbf38, 0xbf3a, 0xbf38, 0xbf38, 0xbf38, 0xbf38,
++	0xbf3a, 0xbf38, 0xbf38, 0xbf38, 0xbf3a, 0xbf3a, 0xbf3a, 0xbf3a,
++	0x080c, 0x0d84, 0x080c, 0x8026, 0x080c, 0x9554, 0x080c, 0x8125,
++	0x0005, 0x0016, 0x00b6, 0x00d6, 0x6110, 0x2158, 0xb900, 0xd184,
++	0x0138, 0x080c, 0x5b61, 0x9006, 0x080c, 0x5b4d, 0x080c, 0x2d3f,
++	0x00de, 0x00be, 0x001e, 0x0005, 0x6610, 0x2658, 0xb804, 0x9084,
++	0xff00, 0x8007, 0x90b2, 0x000c, 0x1a0c, 0x0d84, 0x91b6, 0x0015,
++	0x1110, 0x003b, 0x0028, 0x91b6, 0x0016, 0x190c, 0x0d84, 0x006b,
++	0x0005, 0x9f7a, 0x9f7a, 0x9f7a, 0x9f7a, 0x9f7a, 0x9f7a, 0xbfb9,
++	0xbf81, 0x9f7a, 0x9f7a, 0x9f7a, 0x9f7a, 0x9f7a, 0x9f7a, 0x9f7a,
++	0x9f7a, 0x9f7a, 0x9f7a, 0xbfb9, 0xbfc0, 0x9f7a, 0x9f7a, 0x9f7a,
++	0x9f7a, 0x00f6, 0x080c, 0x5f25, 0x11c0, 0x6010, 0x905d, 0x01a8,
++	0xb8b0, 0x9005, 0x0190, 0x9006, 0x080c, 0x5b4d, 0x2001, 0x0002,
++	0x080c, 0x5b61, 0x6023, 0x0001, 0x6003, 0x0001, 0x6007, 0x0002,
++	0x080c, 0x7c1d, 0x080c, 0x8125, 0x00d0, 0x2011, 0x0263, 0x2204,
++	0x8211, 0x220c, 0x080c, 0x23fd, 0x1190, 0x080c, 0x5c0d, 0x0118,
++	0x080c, 0x9554, 0x0060, 0xb810, 0x0006, 0xb814, 0x0006, 0x080c,
++	0x56f3, 0x000e, 0xb816, 0x000e, 0xb812, 0x080c, 0x9554, 0x00fe,
++	0x0005, 0x6604, 0x96b6, 0x001e, 0x1110, 0x080c, 0x9554, 0x0005,
++	0x080c, 0xa2b9, 0x1148, 0x6003, 0x0001, 0x6007, 0x0001, 0x080c,
++	0x7c1d, 0x080c, 0x8125, 0x0010, 0x080c, 0x9554, 0x0005, 0x6004,
++	0x908a, 0x0053, 0x1a0c, 0x0d84, 0x080c, 0x8026, 0x080c, 0x9584,
++	0x080c, 0x8125, 0x0005, 0x9182, 0x0040, 0x0002, 0xbff1, 0xbff1,
++	0xbff1, 0xbff1, 0xbff3, 0xbff1, 0xbff1, 0xbff1, 0xbff1, 0xbff1,
++	0xbff1, 0xbff1, 0xbff1, 0xbff1, 0xbff1, 0xbff1, 0xbff1, 0xbff1,
++	0xbff1, 0x080c, 0x0d84, 0x0096, 0x00b6, 0x00d6, 0x00e6, 0x00f6,
++	0x0046, 0x0026, 0x6210, 0x2258, 0xb8ac, 0x9005, 0x11a8, 0x6106,
++	0x2071, 0x0260, 0x7444, 0x94a4, 0xff00, 0x0904, 0xc05a, 0x080c,
++	0xcccc, 0x1170, 0x9486, 0x2000, 0x1158, 0x2009, 0x0001, 0x2011,
++	0x0200, 0x080c, 0x7a0a, 0x0020, 0x9026, 0x080c, 0xcc03, 0x0c38,
++	0x080c, 0x0fae, 0x090c, 0x0d84, 0x6003, 0x0007, 0xa867, 0x010d,
++	0x9006, 0xa802, 0xa86a, 0xac8a, 0x2c00, 0xa88e, 0x6008, 0xa8e2,
++	0x6010, 0x2058, 0xb8a0, 0x7130, 0xa97a, 0x0016, 0xa876, 0xa87f,
++	0x0000, 0xa883, 0x0000, 0xa887, 0x0036, 0x080c, 0x61a9, 0x001e,
++	0x080c, 0xcccc, 0x1904, 0xc0ba, 0x9486, 0x2000, 0x1130, 0x2019,
++	0x0017, 0x080c, 0xc941, 0x0804, 0xc0ba, 0x9486, 0x0400, 0x1130,
++	0x2019, 0x0002, 0x080c, 0xc8f8, 0x0804, 0xc0ba, 0x9486, 0x0200,
++	0x1110, 0x080c, 0xc8dd, 0x9486, 0x1000, 0x1110, 0x080c, 0xc926,
++	0x0804, 0xc0ba, 0x2069, 0x1a3d, 0x6a00, 0xd284, 0x0904, 0xc124,
++	0x9284, 0x0300, 0x1904, 0xc11d, 0x6804, 0x9005, 0x0904, 0xc105,
++	0x2d78, 0x6003, 0x0007, 0x080c, 0x0fc7, 0x0904, 0xc0c6, 0x7800,
++	0xd08c, 0x1118, 0x7804, 0x8001, 0x7806, 0x6017, 0x0000, 0x2001,
++	0x180e, 0x2004, 0xd084, 0x1904, 0xc128, 0x9006, 0xa802, 0xa867,
++	0x0116, 0xa86a, 0x6008, 0xa8e2, 0x2c00, 0xa87a, 0x6010, 0x2058,
++	0xb8a0, 0x7130, 0xa9b6, 0xa876, 0xb928, 0xa9ba, 0xb92c, 0xa9be,
++	0xb930, 0xa9c2, 0xb934, 0xa9c6, 0xa883, 0x003d, 0x7044, 0x9084,
++	0x0003, 0x9080, 0xc0c2, 0x2005, 0xa87e, 0x20a9, 0x000a, 0x2001,
++	0x0270, 0xaa5c, 0x9290, 0x0021, 0x2009, 0x0205, 0x200b, 0x0080,
++	0x20e1, 0x0000, 0xab60, 0x23e8, 0x2098, 0x22a0, 0x4003, 0x200b,
++	0x0000, 0x2001, 0x027a, 0x200c, 0xa9b2, 0x8000, 0x200c, 0xa9ae,
++	0x080c, 0x61a9, 0x002e, 0x004e, 0x00fe, 0x00ee, 0x00de, 0x00be,
++	0x009e, 0x0005, 0x0000, 0x0080, 0x0040, 0x0000, 0x2001, 0x180f,
++	0x2004, 0xd084, 0x0120, 0x080c, 0x0fae, 0x1904, 0xc06f, 0x6017,
++	0xf100, 0x6003, 0x0001, 0x6007, 0x0041, 0x080c, 0x7bcb, 0x080c,
++	0x8125, 0x0c00, 0x2069, 0x0260, 0x6848, 0x9084, 0xff00, 0x9086,
++	0x1200, 0x1198, 0x686c, 0x9084, 0x00ff, 0x0016, 0x6114, 0x918c,
++	0xf700, 0x910d, 0x6116, 0x001e, 0x6003, 0x0001, 0x6007, 0x0043,
++	0x080c, 0x7bcb, 0x080c, 0x8125, 0x0828, 0x6868, 0x602e, 0x686c,
++	0x6032, 0x6017, 0xf200, 0x6003, 0x0001, 0x6007, 0x0041, 0x080c,
++	0x7bcb, 0x080c, 0x8125, 0x0804, 0xc0ba, 0x2001, 0x180d, 0x2004,
++	0xd0ec, 0x0120, 0x2011, 0x8049, 0x080c, 0x447f, 0x6017, 0xf300,
++	0x0010, 0x6017, 0xf100, 0x6003, 0x0001, 0x6007, 0x0041, 0x080c,
++	0x7bcb, 0x080c, 0x8125, 0x0804, 0xc0ba, 0x6017, 0xf500, 0x0c98,
++	0x6017, 0xf600, 0x0804, 0xc0da, 0x6017, 0xf200, 0x0804, 0xc0da,
++	0xa867, 0x0146, 0xa86b, 0x0000, 0x6008, 0xa886, 0x2c00, 0xa87a,
++	0x7044, 0x9084, 0x0003, 0x9080, 0xc0c2, 0x2005, 0xa87e, 0x2928,
++	0x6010, 0x2058, 0xb8a0, 0xa876, 0xb828, 0xa88a, 0xb82c, 0xa88e,
++	0xb830, 0xa892, 0xb834, 0xa896, 0xa883, 0x003d, 0x2009, 0x0205,
++	0x2104, 0x9085, 0x0080, 0x200a, 0x20e1, 0x0000, 0x2011, 0x0210,
++	0x2214, 0x9294, 0x0fff, 0xaaa2, 0x9282, 0x0111, 0x1a0c, 0x0d84,
++	0x8210, 0x821c, 0x2001, 0x026c, 0x2098, 0xa860, 0x20e8, 0xa85c,
++	0x9080, 0x0029, 0x20a0, 0x2011, 0xc1a4, 0x2041, 0x0001, 0x223d,
++	0x9784, 0x00ff, 0x9322, 0x1208, 0x2300, 0x20a8, 0x4003, 0x931a,
++	0x0530, 0x8210, 0xd7fc, 0x1130, 0x8d68, 0x2d0a, 0x2001, 0x0260,
++	0x2098, 0x0c68, 0x2950, 0x080c, 0x0fc7, 0x0170, 0x2900, 0xb002,
++	0xa867, 0x0147, 0xa86b, 0x0000, 0xa860, 0x20e8, 0xa85c, 0x9080,
++	0x001b, 0x20a0, 0x8840, 0x08d8, 0x2548, 0xa800, 0x902d, 0x0118,
++	0x080c, 0x0fe0, 0x0cc8, 0x080c, 0x0fe0, 0x0804, 0xc0c6, 0x2548,
++	0x8847, 0x9885, 0x0046, 0xa866, 0x2009, 0x0205, 0x200b, 0x0000,
++	0x080c, 0xc970, 0x0804, 0xc0ba, 0x8010, 0x0004, 0x801a, 0x0006,
++	0x8018, 0x0008, 0x8016, 0x000a, 0x8014, 0x9186, 0x0013, 0x1160,
++	0x6004, 0x908a, 0x0054, 0x1a0c, 0x0d84, 0x9082, 0x0040, 0x0a0c,
++	0x0d84, 0x2008, 0x0804, 0xc255, 0x9186, 0x0051, 0x0108, 0x00c0,
++	0x2001, 0x0109, 0x2004, 0xd084, 0x0904, 0xc206, 0x0126, 0x2091,
++	0x2800, 0x0006, 0x0016, 0x0026, 0x080c, 0x7ab7, 0x002e, 0x001e,
++	0x000e, 0x012e, 0x6000, 0x9086, 0x0002, 0x1580, 0x0804, 0xc29d,
++	0x9186, 0x0027, 0x0530, 0x9186, 0x0048, 0x0128, 0x9186, 0x0014,
++	0x0500, 0x190c, 0x0d84, 0x2001, 0x0109, 0x2004, 0xd084, 0x01f0,
++	0x00c6, 0x0126, 0x2091, 0x2800, 0x00c6, 0x2061, 0x0100, 0x0006,
++	0x0016, 0x0026, 0x080c, 0x7ab7, 0x002e, 0x001e, 0x000e, 0x00ce,
++	0x012e, 0x00ce, 0x6000, 0x9086, 0x0004, 0x190c, 0x0d84, 0x0804,
++	0xc366, 0x6004, 0x9082, 0x0040, 0x2008, 0x001a, 0x080c, 0x95e9,
++	0x0005, 0xc21c, 0xc21e, 0xc21e, 0xc245, 0xc21c, 0xc21c, 0xc21c,
++	0xc21c, 0xc21c, 0xc21c, 0xc21c, 0xc21c, 0xc21c, 0xc21c, 0xc21c,
++	0xc21c, 0xc21c, 0xc21c, 0xc21c, 0x080c, 0x0d84, 0x080c, 0x8026,
++	0x080c, 0x8125, 0x0036, 0x0096, 0x6014, 0x904d, 0x01d8, 0x080c,
++	0xb0ad, 0x01c0, 0x6003, 0x0002, 0x6010, 0x00b6, 0x2058, 0xb800,
++	0x00be, 0xd0bc, 0x1178, 0x2019, 0x0004, 0x080c, 0xc970, 0x6017,
++	0x0000, 0x6018, 0x9005, 0x1120, 0x2001, 0x1954, 0x2004, 0x601a,
++	0x6003, 0x0007, 0x009e, 0x003e, 0x0005, 0x0096, 0x080c, 0x8026,
++	0x080c, 0x8125, 0x080c, 0xb0ad, 0x0120, 0x6014, 0x2048, 0x080c,
++	0x0fe0, 0x080c, 0x9584, 0x009e, 0x0005, 0x0002, 0xc269, 0xc280,
++	0xc26b, 0xc297, 0xc269, 0xc269, 0xc269, 0xc269, 0xc269, 0xc269,
++	0xc269, 0xc269, 0xc269, 0xc269, 0xc269, 0xc269, 0xc269, 0xc269,
++	0xc269, 0x080c, 0x0d84, 0x0096, 0x080c, 0x8026, 0x6014, 0x2048,
++	0xa87c, 0xd0b4, 0x0138, 0x6003, 0x0007, 0x2009, 0x0043, 0x080c,
++	0x95ce, 0x0010, 0x6003, 0x0004, 0x080c, 0x8125, 0x009e, 0x0005,
++	0x080c, 0x8026, 0x080c, 0xb0ad, 0x0138, 0x6114, 0x0096, 0x2148,
++	0xa97c, 0x009e, 0xd1ec, 0x1138, 0x080c, 0x79df, 0x080c, 0x9554,
++	0x080c, 0x8125, 0x0005, 0x080c, 0xcbc7, 0x0db0, 0x0cc8, 0x080c,
++	0x8026, 0x2009, 0x0041, 0x0804, 0xc3ee, 0x9182, 0x0040, 0x0002,
++	0xc2b3, 0xc2b5, 0xc2b3, 0xc2b3, 0xc2b3, 0xc2b3, 0xc2b3, 0xc2b3,
++	0xc2b3, 0xc2b3, 0xc2b3, 0xc2b3, 0xc2b3, 0xc2b3, 0xc2b3, 0xc2b3,
++	0xc2b3, 0xc2b6, 0xc2b3, 0x080c, 0x0d84, 0x0005, 0x00d6, 0x080c,
++	0x79df, 0x00de, 0x080c, 0xcc1f, 0x080c, 0x9554, 0x0005, 0x9182,
++	0x0040, 0x0002, 0xc2d5, 0xc2d5, 0xc2d5, 0xc2d5, 0xc2d5, 0xc2d5,
++	0xc2d5, 0xc2d5, 0xc2d5, 0xc2d7, 0xc32e, 0xc2d5, 0xc2d5, 0xc2d5,
++	0xc2d5, 0xc32e, 0xc2d5, 0xc2d5, 0xc2d5, 0x080c, 0x0d84, 0x2001,
++	0x0105, 0x2004, 0x9084, 0x1800, 0x1904, 0xc32e, 0x2001, 0x1872,
++	0x2004, 0xd0e4, 0x1528, 0x603b, 0x0000, 0x080c, 0x80d6, 0x6014,
++	0x0096, 0x2048, 0xa87c, 0xd0fc, 0x0188, 0x908c, 0x0003, 0x918e,
++	0x0002, 0x0508, 0x2001, 0x180c, 0x2004, 0xd0d4, 0x11e0, 0x080c,
++	0x8202, 0x2009, 0x0041, 0x009e, 0x0804, 0xc3ee, 0x080c, 0x8202,
++	0x6003, 0x0007, 0x601b, 0x0000, 0x080c, 0x79df, 0x009e, 0x0005,
++	0x2001, 0x0100, 0x2004, 0x9082, 0x0005, 0x0aa8, 0x2001, 0x011f,
++	0x2004, 0x603a, 0x0890, 0x2001, 0x180c, 0x200c, 0xc1d4, 0x2102,
++	0xd1cc, 0x0110, 0x080c, 0x2809, 0x080c, 0x8202, 0x6014, 0x2048,
++	0xa97c, 0xd1ec, 0x1130, 0x080c, 0x79df, 0x080c, 0x9554, 0x009e,
++	0x0005, 0x080c, 0xcbc7, 0x0db8, 0x009e, 0x0005, 0x2001, 0x180c,
++	0x200c, 0xc1d4, 0x2102, 0x0036, 0x080c, 0x80d6, 0x080c, 0x8202,
++	0x6014, 0x0096, 0x2048, 0x6010, 0x00b6, 0x2058, 0xb800, 0x00be,
++	0xd0bc, 0x0188, 0xa87c, 0x9084, 0x0003, 0x9086, 0x0002, 0x0140,
++	0xa8ac, 0x6330, 0x931a, 0x6332, 0xa8b0, 0x632c, 0x931b, 0x632e,
++	0x6003, 0x0002, 0x0080, 0x2019, 0x0004, 0x080c, 0xc970, 0x6018,
++	0x9005, 0x1128, 0x2001, 0x1954, 0x2004, 0x8003, 0x601a, 0x6017,
++	0x0000, 0x6003, 0x0007, 0x009e, 0x003e, 0x0005, 0x9182, 0x0040,
++	0x0002, 0xc37d, 0xc37d, 0xc37d, 0xc37d, 0xc37d, 0xc37d, 0xc37d,
++	0xc37d, 0xc37f, 0xc37d, 0xc37d, 0xc37d, 0xc37d, 0xc37d, 0xc37d,
++	0xc37d, 0xc37d, 0xc37d, 0xc37d, 0xc3ca, 0x080c, 0x0d84, 0x6014,
++	0x0096, 0x2048, 0xa834, 0xaa38, 0x6110, 0x00b6, 0x2058, 0xb900,
++	0x00be, 0xd1bc, 0x1190, 0x920d, 0x1518, 0xa87c, 0xd0fc, 0x0128,
++	0x2009, 0x0041, 0x00de, 0x0804, 0xc3ee, 0x6003, 0x0007, 0x601b,
++	0x0000, 0x080c, 0x79df, 0x009e, 0x0005, 0x6124, 0xd1f4, 0x1d58,
++	0x0006, 0x0046, 0xacac, 0x9422, 0xa9b0, 0x2200, 0x910b, 0x6030,
++	0x9420, 0x6432, 0x602c, 0x9109, 0x612e, 0x004e, 0x000e, 0x08d8,
++	0x6110, 0x00b6, 0x2158, 0xb900, 0x00be, 0xd1bc, 0x1178, 0x2009,
++	0x180d, 0x210c, 0xd19c, 0x0118, 0x6003, 0x0007, 0x0010, 0x6003,
++	0x0006, 0x00e9, 0x080c, 0x79e1, 0x009e, 0x0005, 0x6003, 0x0002,
++	0x009e, 0x0005, 0x6024, 0xd0f4, 0x0128, 0x080c, 0x1489, 0x1904,
++	0xc37f, 0x0005, 0x6014, 0x0096, 0x2048, 0xa834, 0xa938, 0x009e,
++	0x9105, 0x1120, 0x080c, 0x1489, 0x1904, 0xc37f, 0x0005, 0xd2fc,
++	0x0140, 0x8002, 0x8000, 0x8212, 0x9291, 0x0000, 0x2009, 0x0009,
++	0x0010, 0x2009, 0x0015, 0xaa9a, 0xa896, 0x0005, 0x9182, 0x0040,
++	0x0208, 0x0062, 0x9186, 0x0013, 0x0120, 0x9186, 0x0014, 0x190c,
++	0x0d84, 0x6024, 0xd0dc, 0x090c, 0x0d84, 0x0005, 0xc411, 0xc418,
++	0xc424, 0xc430, 0xc411, 0xc411, 0xc411, 0xc411, 0xc411, 0xc413,
++	0xc413, 0xc411, 0xc411, 0xc411, 0xc411, 0xc413, 0xc411, 0xc413,
++	0xc411, 0x080c, 0x0d84, 0x6024, 0xd0dc, 0x090c, 0x0d84, 0x0005,
++	0x6003, 0x0001, 0x6106, 0x080c, 0x7bcb, 0x0126, 0x2091, 0x8000,
++	0x080c, 0x8125, 0x012e, 0x0005, 0x6003, 0x0001, 0x6106, 0x080c,
++	0x7bcb, 0x0126, 0x2091, 0x8000, 0x080c, 0x8125, 0x012e, 0x0005,
++	0x6003, 0x0003, 0x6106, 0x2c10, 0x080c, 0x18b7, 0x0126, 0x2091,
++	0x8000, 0x080c, 0x7c3a, 0x080c, 0x820b, 0x012e, 0x0005, 0x0126,
++	0x2091, 0x8000, 0x0036, 0x0096, 0x9182, 0x0040, 0x0023, 0x009e,
++	0x003e, 0x012e, 0x0005, 0xc45b, 0xc45d, 0xc46f, 0xc489, 0xc45b,
++	0xc45b, 0xc45b, 0xc45b, 0xc45b, 0xc45b, 0xc45b, 0xc45b, 0xc45b,
++	0xc45b, 0xc45b, 0xc45b, 0x080c, 0x0d84, 0x6014, 0x2048, 0xa87c,
++	0xd0fc, 0x01f8, 0x909c, 0x0003, 0x939e, 0x0003, 0x01d0, 0x6003,
++	0x0001, 0x6106, 0x080c, 0x7bcb, 0x080c, 0x8125, 0x0470, 0x6014,
++	0x2048, 0xa87c, 0xd0fc, 0x0168, 0x909c, 0x0003, 0x939e, 0x0003,
++	0x0140, 0x6003, 0x0001, 0x6106, 0x080c, 0x7bcb, 0x080c, 0x8125,
++	0x00e0, 0x901e, 0x6316, 0x631a, 0x2019, 0x0004, 0x080c, 0xc970,
++	0x00a0, 0x6014, 0x2048, 0xa87c, 0xd0fc, 0x0d98, 0x909c, 0x0003,
++	0x939e, 0x0003, 0x0d70, 0x6003, 0x0003, 0x6106, 0x2c10, 0x080c,
++	0x18b7, 0x080c, 0x7c3a, 0x080c, 0x820b, 0x0005, 0x080c, 0x8026,
++	0x6114, 0x81ff, 0x0158, 0x0096, 0x2148, 0x080c, 0xcc6b, 0x0036,
++	0x2019, 0x0029, 0x080c, 0xc970, 0x003e, 0x009e, 0x080c, 0x9584,
++	0x080c, 0x8125, 0x0005, 0x080c, 0x80d6, 0x6114, 0x81ff, 0x0158,
++	0x0096, 0x2148, 0x080c, 0xcc6b, 0x0036, 0x2019, 0x0029, 0x080c,
++	0xc970, 0x003e, 0x009e, 0x080c, 0x9584, 0x080c, 0x820b, 0x0005,
++	0x9182, 0x0085, 0x0002, 0xc4da, 0xc4d8, 0xc4d8, 0xc4e6, 0xc4d8,
++	0xc4d8, 0xc4d8, 0xc4d8, 0xc4d8, 0xc4d8, 0xc4d8, 0xc4d8, 0xc4d8,
++	0x080c, 0x0d84, 0x6003, 0x000b, 0x6106, 0x080c, 0x7bcb, 0x0126,
++	0x2091, 0x8000, 0x080c, 0x8125, 0x012e, 0x0005, 0x0026, 0x00e6,
++	0x080c, 0xcbbe, 0x0118, 0x080c, 0x9554, 0x0440, 0x2071, 0x0260,
++	0x7224, 0x6216, 0x2001, 0x180d, 0x2004, 0xd0e4, 0x0150, 0x6010,
++	0x00b6, 0x2058, 0xbca0, 0x00be, 0x2c00, 0x2011, 0x014e, 0x080c,
++	0x9844, 0x7220, 0x080c, 0xc816, 0x0118, 0x6007, 0x0086, 0x0040,
++	0x6007, 0x0087, 0x7224, 0x9296, 0xffff, 0x1110, 0x6007, 0x0086,
++	0x6003, 0x0001, 0x080c, 0x7bcb, 0x080c, 0x8125, 0x00ee, 0x002e,
++	0x0005, 0x9186, 0x0013, 0x1160, 0x6004, 0x908a, 0x0085, 0x0a0c,
++	0x0d84, 0x908a, 0x0092, 0x1a0c, 0x0d84, 0x9082, 0x0085, 0x00a2,
++	0x9186, 0x0027, 0x0130, 0x9186, 0x0014, 0x0118, 0x080c, 0x95e9,
++	0x0050, 0x2001, 0x0007, 0x080c, 0x5b8d, 0x080c, 0x8026, 0x080c,
++	0x9584, 0x080c, 0x8125, 0x0005, 0xc549, 0xc54b, 0xc54b, 0xc549,
++	0xc549, 0xc549, 0xc549, 0xc549, 0xc549, 0xc549, 0xc549, 0xc549,
++	0xc549, 0x080c, 0x0d84, 0x080c, 0x8026, 0x080c, 0x9584, 0x080c,
++	0x8125, 0x0005, 0x9182, 0x0085, 0x0a0c, 0x0d84, 0x9182, 0x0092,
++	0x1a0c, 0x0d84, 0x9182, 0x0085, 0x0002, 0xc56a, 0xc56a, 0xc56a,
++	0xc56c, 0xc56a, 0xc56a, 0xc56a, 0xc56a, 0xc56a, 0xc56a, 0xc56a,
++	0xc56a, 0xc56a, 0x080c, 0x0d84, 0x0005, 0x9186, 0x0013, 0x0148,
++	0x9186, 0x0014, 0x0130, 0x9186, 0x0027, 0x0118, 0x080c, 0x95e9,
++	0x0030, 0x080c, 0x8026, 0x080c, 0x9584, 0x080c, 0x8125, 0x0005,
++	0x0036, 0x080c, 0xcc1f, 0x6043, 0x0000, 0x2019, 0x000b, 0x0031,
++	0x6023, 0x0006, 0x6003, 0x0007, 0x003e, 0x0005, 0x0126, 0x0036,
++	0x2091, 0x8000, 0x0086, 0x2c40, 0x0096, 0x904e, 0x080c, 0x8ef6,
++	0x009e, 0x008e, 0x1550, 0x0076, 0x2c38, 0x080c, 0x8f9a, 0x007e,
++	0x1520, 0x6000, 0x9086, 0x0000, 0x0500, 0x6020, 0x9086, 0x0007,
++	0x01e0, 0x0096, 0x601c, 0xd084, 0x0140, 0x080c, 0xcc1f, 0x080c,
++	0xb76f, 0x080c, 0x17b0, 0x6023, 0x0007, 0x6014, 0x2048, 0x080c,
++	0xb0ad, 0x0110, 0x080c, 0xc970, 0x009e, 0x6017, 0x0000, 0x080c,
++	0xcc1f, 0x6023, 0x0007, 0x080c, 0xb76f, 0x003e, 0x012e, 0x0005,
++	0x00f6, 0x00c6, 0x00b6, 0x0036, 0x0156, 0x2079, 0x0260, 0x7938,
++	0x783c, 0x080c, 0x23fd, 0x15b8, 0x0016, 0x00c6, 0x080c, 0x5c0d,
++	0x1580, 0x001e, 0x00c6, 0x2160, 0x080c, 0xb76c, 0x00ce, 0x002e,
++	0x0026, 0x0016, 0x2019, 0x0029, 0x080c, 0x905b, 0x080c, 0x7d55,
++	0x0076, 0x903e, 0x080c, 0x7c4d, 0x007e, 0x001e, 0x0076, 0x903e,
++	0x080c, 0xc73e, 0x007e, 0x0026, 0xba04, 0x9294, 0xff00, 0x8217,
++	0x9286, 0x0006, 0x0118, 0x9286, 0x0004, 0x1118, 0xbaa0, 0x080c,
++	0x2dd3, 0x002e, 0x001e, 0x080c, 0x56f3, 0xbe12, 0xbd16, 0x9006,
++	0x0010, 0x00ce, 0x001e, 0x015e, 0x003e, 0x00be, 0x00ce, 0x00fe,
++	0x0005, 0x00c6, 0x00d6, 0x00b6, 0x0016, 0x2009, 0x1822, 0x2104,
++	0x9086, 0x0074, 0x1904, 0xc66a, 0x2069, 0x0260, 0x6944, 0x9182,
++	0x0100, 0x06e0, 0x6940, 0x9184, 0x8000, 0x0904, 0xc667, 0x2001,
++	0x194b, 0x2004, 0x9005, 0x1140, 0x6010, 0x2058, 0xb8b0, 0x9005,
++	0x0118, 0x9184, 0x0800, 0x0598, 0x6948, 0x918a, 0x0001, 0x0648,
++	0x080c, 0xccd1, 0x0118, 0x6978, 0xd1fc, 0x11b8, 0x2009, 0x0205,
++	0x200b, 0x0001, 0x693c, 0x81ff, 0x1198, 0x6944, 0x9182, 0x0100,
++	0x02a8, 0x6940, 0x81ff, 0x1178, 0x6948, 0x918a, 0x0001, 0x0288,
++	0x6950, 0x918a, 0x0001, 0x0298, 0x00d0, 0x6017, 0x0100, 0x00a0,
++	0x6017, 0x0300, 0x0088, 0x6017, 0x0500, 0x0070, 0x6017, 0x0700,
++	0x0058, 0x6017, 0x0900, 0x0040, 0x6017, 0x0b00, 0x0028, 0x6017,
++	0x0f00, 0x0010, 0x6017, 0x2d00, 0x9085, 0x0001, 0x0008, 0x9006,
++	0x001e, 0x00be, 0x00de, 0x00ce, 0x0005, 0x00c6, 0x00b6, 0x0026,
++	0x0036, 0x0156, 0x6210, 0x2258, 0xbb04, 0x9394, 0x00ff, 0x9286,
++	0x0006, 0x0178, 0x9286, 0x0004, 0x0160, 0x9394, 0xff00, 0x8217,
++	0x9286, 0x0006, 0x0130, 0x9286, 0x0004, 0x0118, 0x080c, 0x5c1c,
++	0x04e0, 0x2011, 0x0276, 0x20a9, 0x0004, 0x0096, 0x2b48, 0x2019,
++	0x000a, 0x080c, 0xa439, 0x009e, 0x1588, 0x2011, 0x027a, 0x20a9,
++	0x0004, 0x0096, 0x2b48, 0x2019, 0x0006, 0x080c, 0xa439, 0x009e,
++	0x1528, 0x0046, 0x0016, 0xbaa0, 0x2220, 0x9006, 0x2009, 0x1853,
++	0x210c, 0xd1a4, 0x0138, 0x2009, 0x0029, 0x080c, 0xc9c5, 0xb800,
++	0xc0e5, 0xb802, 0x2019, 0x0029, 0x080c, 0x7d55, 0x0076, 0x2039,
++	0x0000, 0x080c, 0x7c4d, 0x2c08, 0x080c, 0xc73e, 0x007e, 0x2001,
++	0x0007, 0x080c, 0x5b8d, 0x001e, 0x004e, 0x9006, 0x015e, 0x003e,
++	0x002e, 0x00be, 0x00ce, 0x0005, 0x00d6, 0x2069, 0x026e, 0x6800,
++	0x9086, 0x0800, 0x0118, 0x6017, 0x0000, 0x0008, 0x9006, 0x00de,
++	0x0005, 0x00b6, 0x00f6, 0x0016, 0x0026, 0x0036, 0x0156, 0x2079,
++	0x026c, 0x7930, 0x7834, 0x080c, 0x23fd, 0x11d0, 0x080c, 0x5c0d,
++	0x11b8, 0x2011, 0x0270, 0x20a9, 0x0004, 0x0096, 0x2b48, 0x2019,
++	0x000a, 0x080c, 0xa439, 0x009e, 0x1158, 0x2011, 0x0274, 0x20a9,
++	0x0004, 0x0096, 0x2b48, 0x2019, 0x0006, 0x080c, 0xa439, 0x009e,
++	0x015e, 0x003e, 0x002e, 0x001e, 0x00fe, 0x00be, 0x0005, 0x00b6,
++	0x0006, 0x0016, 0x0026, 0x0036, 0x0156, 0x2011, 0x0263, 0x2204,
++	0x8211, 0x220c, 0x080c, 0x23fd, 0x11d0, 0x080c, 0x5c0d, 0x11b8,
++	0x2011, 0x0276, 0x20a9, 0x0004, 0x0096, 0x2b48, 0x2019, 0x000a,
++	0x080c, 0xa439, 0x009e, 0x1158, 0x2011, 0x027a, 0x20a9, 0x0004,
++	0x0096, 0x2b48, 0x2019, 0x0006, 0x080c, 0xa439, 0x009e, 0x015e,
++	0x003e, 0x002e, 0x001e, 0x000e, 0x00be, 0x0005, 0x00e6, 0x00c6,
++	0x0086, 0x0076, 0x0066, 0x0056, 0x0046, 0x0026, 0x0126, 0x2091,
++	0x8000, 0x2740, 0x2029, 0x19bd, 0x252c, 0x2021, 0x19c3, 0x2424,
++	0x2061, 0x1cd0, 0x2071, 0x1800, 0x764c, 0x706c, 0x81ff, 0x0150,
++	0x0006, 0x9186, 0x1a72, 0x000e, 0x0128, 0x8001, 0x9602, 0x1a04,
++	0xc7cf, 0x0018, 0x9606, 0x0904, 0xc7cf, 0x2100, 0x9c06, 0x0904,
++	0xc7c6, 0x080c, 0xca01, 0x1904, 0xc7c6, 0x080c, 0xccd8, 0x0904,
++	0xc7c6, 0x080c, 0xc9f1, 0x0904, 0xc7c6, 0x6720, 0x9786, 0x0001,
++	0x1148, 0x080c, 0x2e64, 0x0904, 0xc7ea, 0x6004, 0x9086, 0x0000,
++	0x1904, 0xc7ea, 0x9786, 0x0004, 0x0904, 0xc7ea, 0x9786, 0x0007,
++	0x05e8, 0x2500, 0x9c06, 0x05d0, 0x2400, 0x9c06, 0x05b8, 0x88ff,
++	0x0118, 0x6054, 0x9906, 0x1590, 0x0096, 0x6000, 0x9086, 0x0004,
++	0x1120, 0x0016, 0x080c, 0x17b0, 0x001e, 0x9786, 0x0008, 0x1148,
++	0x080c, 0xb295, 0x1130, 0x080c, 0x9e99, 0x009e, 0x080c, 0x9584,
++	0x00e8, 0x6014, 0x2048, 0x080c, 0xb0ad, 0x01a8, 0x9786, 0x0003,
++	0x1540, 0x080c, 0xc810, 0x0110, 0xa867, 0x0103, 0xab7a, 0xa877,
++	0x0000, 0x080c, 0xcc6b, 0x0016, 0x080c, 0xb374, 0x080c, 0x619c,
++	0x001e, 0x080c, 0xb278, 0x009e, 0x080c, 0x9584, 0x9ce0, 0x0018,
++	0x2001, 0x1818, 0x2004, 0x9c02, 0x1210, 0x0804, 0xc752, 0x012e,
++	0x002e, 0x004e, 0x005e, 0x006e, 0x007e, 0x008e, 0x00ce, 0x00ee,
++	0x0005, 0x9786, 0x0006, 0x1150, 0x9386, 0x0005, 0x0128, 0x080c,
++	0xcc6b, 0x080c, 0xc970, 0x08f8, 0x009e, 0x0c00, 0x9786, 0x000a,
++	0x0968, 0x0838, 0x81ff, 0x09d0, 0x9180, 0x0001, 0x2004, 0x9086,
++	0x0018, 0x0130, 0x9180, 0x0001, 0x2004, 0x9086, 0x002d, 0x1970,
++	0x6000, 0x9086, 0x0002, 0x1950, 0x080c, 0xb284, 0x0130, 0x080c,
++	0xb295, 0x1920, 0x080c, 0x9e99, 0x0038, 0x080c, 0x2d3f, 0x080c,
++	0xb295, 0x1110, 0x080c, 0x9e99, 0x080c, 0x9584, 0x0804, 0xc7c6,
++	0xa864, 0x9084, 0x00ff, 0x9086, 0x0039, 0x0005, 0x00c6, 0x00e6,
++	0x0016, 0x2c08, 0x2170, 0x9006, 0x080c, 0xc997, 0x001e, 0x0120,
++	0x6020, 0x9084, 0x000f, 0x001b, 0x00ee, 0x00ce, 0x0005, 0xc835,
++	0xc835, 0xc835, 0xc835, 0xc835, 0xc835, 0xc837, 0xc835, 0xc835,
++	0xc835, 0xc835, 0x9584, 0x9584, 0xc835, 0x9006, 0x0005, 0x0036,
++	0x0046, 0x0016, 0x7010, 0x00b6, 0x2058, 0xbca0, 0x00be, 0x2c00,
++	0x2009, 0x0020, 0x080c, 0xc9c5, 0x001e, 0x004e, 0x2019, 0x0002,
++	0x080c, 0xc58e, 0x003e, 0x9085, 0x0001, 0x0005, 0x0096, 0x080c,
++	0xb0ad, 0x0140, 0x6014, 0x904d, 0x080c, 0xad1e, 0x687b, 0x0005,
++	0x080c, 0x61a9, 0x009e, 0x080c, 0x9584, 0x9085, 0x0001, 0x0005,
++	0x2001, 0x0001, 0x080c, 0x5b4d, 0x0156, 0x0016, 0x0026, 0x0036,
++	0x20a9, 0x0004, 0x2019, 0x1805, 0x2011, 0x0276, 0x080c, 0xa425,
++	0x003e, 0x002e, 0x001e, 0x015e, 0x9005, 0x0005, 0x00f6, 0x00e6,
++	0x00c6, 0x0086, 0x0076, 0x0066, 0x00b6, 0x0126, 0x2091, 0x8000,
++	0x2740, 0x2061, 0x1cd0, 0x2079, 0x0001, 0x8fff, 0x0904, 0xc8d0,
++	0x2071, 0x1800, 0x764c, 0x706c, 0x8001, 0x9602, 0x1a04, 0xc8d0,
++	0x88ff, 0x0120, 0x2800, 0x9c06, 0x1590, 0x2078, 0x080c, 0xc9f1,
++	0x0570, 0x2400, 0x9c06, 0x0558, 0x6720, 0x9786, 0x0006, 0x1538,
++	0x9786, 0x0007, 0x0520, 0x88ff, 0x1140, 0x6010, 0x9b06, 0x11f8,
++	0x85ff, 0x0118, 0x6054, 0x9106, 0x11d0, 0x0096, 0x601c, 0xd084,
++	0x0140, 0x080c, 0xcc1f, 0x080c, 0xb76f, 0x080c, 0x17b0, 0x6023,
++	0x0007, 0x6014, 0x2048, 0x080c, 0xb0ad, 0x0120, 0x0046, 0x080c,
++	0xc970, 0x004e, 0x009e, 0x080c, 0x9584, 0x88ff, 0x1198, 0x9ce0,
++	0x0018, 0x2001, 0x1818, 0x2004, 0x9c02, 0x1210, 0x0804, 0xc885,
++	0x9006, 0x012e, 0x00be, 0x006e, 0x007e, 0x008e, 0x00ce, 0x00ee,
++	0x00fe, 0x0005, 0x98c5, 0x0001, 0x0ca0, 0x00b6, 0x0076, 0x0056,
++	0x0086, 0x9046, 0x2029, 0x0001, 0x2c20, 0x2019, 0x0002, 0x6210,
++	0x2258, 0x0096, 0x904e, 0x080c, 0x8ef6, 0x009e, 0x008e, 0x903e,
++	0x080c, 0x8f9a, 0x080c, 0xc876, 0x005e, 0x007e, 0x00be, 0x0005,
++	0x00b6, 0x0046, 0x0056, 0x0076, 0x00c6, 0x0156, 0x2c20, 0x2128,
++	0x20a9, 0x007f, 0x900e, 0x0016, 0x0036, 0x080c, 0x5c0d, 0x1190,
++	0x0056, 0x0086, 0x9046, 0x2508, 0x2029, 0x0001, 0x0096, 0x904e,
++	0x080c, 0x8ef6, 0x009e, 0x008e, 0x903e, 0x080c, 0x8f9a, 0x080c,
++	0xc876, 0x005e, 0x003e, 0x001e, 0x8108, 0x1f04, 0xc903, 0x015e,
++	0x00ce, 0x007e, 0x005e, 0x004e, 0x00be, 0x0005, 0x00b6, 0x0076,
++	0x0056, 0x6210, 0x2258, 0x0086, 0x9046, 0x2029, 0x0001, 0x2019,
++	0x0048, 0x0096, 0x904e, 0x080c, 0x8ef6, 0x009e, 0x008e, 0x903e,
++	0x080c, 0x8f9a, 0x2c20, 0x080c, 0xc876, 0x005e, 0x007e, 0x00be,
++	0x0005, 0x00b6, 0x0046, 0x0056, 0x0076, 0x00c6, 0x0156, 0x2c20,
++	0x20a9, 0x007f, 0x900e, 0x0016, 0x0036, 0x080c, 0x5c0d, 0x11a0,
++	0x0086, 0x9046, 0x2828, 0x0046, 0x2021, 0x0001, 0x080c, 0xcc03,
++	0x004e, 0x0096, 0x904e, 0x080c, 0x8ef6, 0x009e, 0x008e, 0x903e,
++	0x080c, 0x8f9a, 0x080c, 0xc876, 0x003e, 0x001e, 0x8108, 0x1f04,
++	0xc94b, 0x015e, 0x00ce, 0x007e, 0x005e, 0x004e, 0x00be, 0x0005,
++	0x0016, 0x00f6, 0x080c, 0xb0ab, 0x0198, 0xa864, 0x9084, 0x00ff,
++	0x9086, 0x0046, 0x0180, 0xa800, 0x907d, 0x0138, 0xa803, 0x0000,
++	0xab82, 0x080c, 0x61a9, 0x2f48, 0x0cb0, 0xab82, 0x080c, 0x61a9,
++	0x00fe, 0x001e, 0x0005, 0xa800, 0x907d, 0x0130, 0xa803, 0x0000,
++	0x080c, 0x61a9, 0x2f48, 0x0cb8, 0x080c, 0x61a9, 0x0c88, 0x00e6,
++	0x0046, 0x0036, 0x2061, 0x1cd0, 0x9005, 0x1138, 0x2071, 0x1800,
++	0x744c, 0x706c, 0x8001, 0x9402, 0x12d8, 0x2100, 0x9c06, 0x0168,
++	0x6000, 0x9086, 0x0000, 0x0148, 0x6008, 0x9206, 0x1130, 0x6010,
++	0x91a0, 0x0004, 0x2424, 0x9406, 0x0140, 0x9ce0, 0x0018, 0x2001,
++	0x1818, 0x2004, 0x9c02, 0x1220, 0x0c40, 0x9085, 0x0001, 0x0008,
++	0x9006, 0x003e, 0x004e, 0x00ee, 0x0005, 0x0096, 0x0006, 0x080c,
++	0x0fae, 0x000e, 0x090c, 0x0d84, 0xa867, 0x010d, 0xa88e, 0x0026,
++	0x2010, 0x080c, 0xb09b, 0x2001, 0x0000, 0x0120, 0x2200, 0x9080,
++	0x0015, 0x2004, 0x002e, 0xa87a, 0xa986, 0xac76, 0xa87f, 0x0000,
++	0x2001, 0x195b, 0x2004, 0xa882, 0x9006, 0xa8e2, 0xa802, 0xa86a,
++	0xa88a, 0x0126, 0x2091, 0x8000, 0x080c, 0x61a9, 0x012e, 0x009e,
++	0x0005, 0x6700, 0x9786, 0x0000, 0x0158, 0x9786, 0x0001, 0x0140,
++	0x9786, 0x000a, 0x0128, 0x9786, 0x0009, 0x0110, 0x9085, 0x0001,
++	0x0005, 0x00e6, 0x6010, 0x9075, 0x0138, 0x00b6, 0x2058, 0xb8a0,
++	0x00be, 0x9206, 0x00ee, 0x0005, 0x9085, 0x0001, 0x0cd8, 0x0016,
++	0x6004, 0x908e, 0x001e, 0x11a0, 0x8007, 0x6134, 0x918c, 0x00ff,
++	0x9105, 0x6036, 0x6007, 0x0085, 0x6003, 0x000b, 0x6023, 0x0005,
++	0x2001, 0x1954, 0x2004, 0x601a, 0x080c, 0x7bcb, 0x080c, 0x8125,
++	0x001e, 0x0005, 0xa001, 0xa001, 0x0005, 0x6024, 0xd0e4, 0x0158,
++	0xd0cc, 0x0118, 0x080c, 0xb3ae, 0x0030, 0x080c, 0xcc1f, 0x080c,
++	0x79df, 0x080c, 0x9554, 0x0005, 0x9280, 0x0008, 0x2004, 0x9084,
++	0x000f, 0x0002, 0xca50, 0xca50, 0xca50, 0xca52, 0xca50, 0xca52,
++	0xca52, 0xca50, 0xca52, 0xca50, 0xca50, 0xca50, 0xca50, 0xca50,
++	0x9006, 0x0005, 0x9085, 0x0001, 0x0005, 0x9280, 0x0008, 0x2004,
++	0x9084, 0x000f, 0x0002, 0xca69, 0xca69, 0xca69, 0xca69, 0xca69,
++	0xca69, 0xca76, 0xca69, 0xca69, 0xca69, 0xca69, 0xca69, 0xca69,
++	0xca69, 0x6007, 0x003b, 0x602f, 0x0009, 0x6017, 0x2a00, 0x6003,
++	0x0001, 0x080c, 0x7bcb, 0x080c, 0x8125, 0x0005, 0x0096, 0x00c6,
++	0x2260, 0x080c, 0xcc1f, 0x6043, 0x0000, 0x6024, 0xc0f4, 0xc0e4,
++	0x6026, 0x603b, 0x0000, 0x00ce, 0x00d6, 0x2268, 0x9186, 0x0007,
++	0x1904, 0xcad0, 0x6814, 0x9005, 0x0138, 0x2048, 0xa87c, 0xd0fc,
++	0x1118, 0x00de, 0x009e, 0x08a8, 0x6007, 0x003a, 0x6003, 0x0001,
++	0x080c, 0x7bcb, 0x080c, 0x8125, 0x00c6, 0x2d60, 0x6100, 0x9186,
++	0x0002, 0x1904, 0xcb48, 0x6014, 0x9005, 0x1138, 0x6000, 0x9086,
++	0x0007, 0x190c, 0x0d84, 0x0804, 0xcb48, 0x2048, 0x080c, 0xb0ad,
++	0x1130, 0x0028, 0x2048, 0xa800, 0x9005, 0x1de0, 0x2900, 0x2048,
++	0xa87c, 0x9084, 0x0003, 0x9086, 0x0002, 0x1170, 0xa87c, 0xc0dc,
++	0xc0f4, 0xa87e, 0xa880, 0xc0f4, 0xc0fc, 0xa882, 0x2009, 0x0043,
++	0x080c, 0xc3ee, 0x0804, 0xcb48, 0x2009, 0x0041, 0x0804, 0xcb42,
++	0x9186, 0x0005, 0x15a8, 0x6814, 0x2048, 0xa87c, 0xd0bc, 0x1120,
++	0x00de, 0x009e, 0x0804, 0xca69, 0xd0b4, 0x0128, 0xd0fc, 0x090c,
++	0x0d84, 0x0804, 0xca8a, 0x6007, 0x003a, 0x6003, 0x0001, 0x080c,
++	0x7bcb, 0x080c, 0x8125, 0x00c6, 0x2d60, 0x6100, 0x9186, 0x0002,
++	0x0120, 0x9186, 0x0004, 0x1904, 0xcb48, 0x6814, 0x2048, 0xa97c,
++	0xc1f4, 0xc1dc, 0xa97e, 0xa980, 0xc1f4, 0xc1fc, 0xc1bc, 0xa982,
++	0x00f6, 0x2c78, 0x080c, 0x150d, 0x00fe, 0x2009, 0x0042, 0x04d0,
++	0x0036, 0x080c, 0x0fae, 0x090c, 0x0d84, 0xa867, 0x010d, 0x9006,
++	0xa802, 0xa86a, 0xa88a, 0x2d18, 0xab8e, 0xa887, 0x0045, 0x2c00,
++	0xa892, 0x6038, 0xa8a2, 0x2360, 0x6024, 0xc0dd, 0x6026, 0x6010,
++	0x00b6, 0x2058, 0xb8a0, 0x00be, 0x2004, 0x6354, 0xab7a, 0xa876,
++	0x9006, 0xa87e, 0xa882, 0xad9a, 0xae96, 0xa89f, 0x0001, 0x080c,
++	0x61a9, 0x2019, 0x0045, 0x6008, 0x2068, 0x080c, 0xc58e, 0x2d00,
++	0x600a, 0x6023, 0x0006, 0x6003, 0x0007, 0x901e, 0x631a, 0x6342,
++	0x003e, 0x0038, 0x6043, 0x0000, 0x6003, 0x0007, 0x080c, 0xc3ee,
++	0x00ce, 0x00de, 0x009e, 0x0005, 0x9186, 0x0013, 0x1128, 0x6004,
++	0x9082, 0x0085, 0x2008, 0x00c2, 0x9186, 0x0027, 0x1178, 0x080c,
++	0x8026, 0x0036, 0x0096, 0x6014, 0x2048, 0x2019, 0x0004, 0x080c,
++	0xc970, 0x009e, 0x003e, 0x080c, 0x8125, 0x0005, 0x9186, 0x0014,
++	0x0d70, 0x080c, 0x95e9, 0x0005, 0xcb7b, 0xcb79, 0xcb79, 0xcb79,
++	0xcb79, 0xcb79, 0xcb7b, 0xcb79, 0xcb79, 0xcb79, 0xcb79, 0xcb79,
++	0xcb79, 0x080c, 0x0d84, 0x080c, 0x8026, 0x6003, 0x000c, 0x080c,
++	0x8125, 0x0005, 0x9182, 0x0092, 0x1220, 0x9182, 0x0085, 0x0208,
++	0x001a, 0x080c, 0x95e9, 0x0005, 0xcb99, 0xcb99, 0xcb99, 0xcb99,
++	0xcb9b, 0xcbbb, 0xcb99, 0xcb99, 0xcb99, 0xcb99, 0xcb99, 0xcb99,
++	0xcb99, 0x080c, 0x0d84, 0x00d6, 0x2c68, 0x080c, 0x94fe, 0x01b0,
++	0x6003, 0x0001, 0x6007, 0x001e, 0x2009, 0x026e, 0x210c, 0x613a,
++	0x2009, 0x026f, 0x210c, 0x613e, 0x600b, 0xffff, 0x6910, 0x6112,
++	0x6023, 0x0004, 0x080c, 0x7bcb, 0x080c, 0x8125, 0x2d60, 0x080c,
++	0x9554, 0x00de, 0x0005, 0x080c, 0x9554, 0x0005, 0x00e6, 0x6010,
++	0x00b6, 0x2058, 0xb800, 0x00be, 0xd0ec, 0x00ee, 0x0005, 0x2009,
++	0x1872, 0x210c, 0xd1ec, 0x05b0, 0x6003, 0x0002, 0x6024, 0xc0e5,
++	0x6026, 0xd0cc, 0x0150, 0x2001, 0x1955, 0x2004, 0x6042, 0x2009,
++	0x1872, 0x210c, 0xd1f4, 0x1520, 0x00a0, 0x2009, 0x1872, 0x210c,
++	0xd1f4, 0x0128, 0x6024, 0xc0e4, 0x6026, 0x9006, 0x00d8, 0x2001,
++	0x1955, 0x200c, 0x2001, 0x1953, 0x2004, 0x9100, 0x9080, 0x000a,
++	0x6042, 0x6010, 0x00b6, 0x2058, 0xb8ac, 0x00be, 0x0008, 0x2104,
++	0x9005, 0x0118, 0x9088, 0x0003, 0x0cd0, 0x2c0a, 0x600f, 0x0000,
++	0x9085, 0x0001, 0x0005, 0x0016, 0x00c6, 0x00e6, 0x6154, 0xb8ac,
++	0x2060, 0x8cff, 0x0180, 0x84ff, 0x1118, 0x6054, 0x9106, 0x1138,
++	0x600c, 0x2072, 0x080c, 0x79df, 0x080c, 0x9554, 0x0010, 0x9cf0,
++	0x0003, 0x2e64, 0x0c70, 0x00ee, 0x00ce, 0x001e, 0x0005, 0x00d6,
++	0x00b6, 0x6010, 0x2058, 0xb8ac, 0x2068, 0x9005, 0x0130, 0x9c06,
++	0x0110, 0x680c, 0x0cd0, 0x600c, 0x680e, 0x00be, 0x00de, 0x0005,
++	0x0026, 0x0036, 0x0156, 0x2011, 0x182a, 0x2204, 0x9084, 0x00ff,
++	0x2019, 0x026e, 0x2334, 0x9636, 0x1508, 0x8318, 0x2334, 0x2204,
++	0x9084, 0xff00, 0x9636, 0x11d0, 0x2011, 0x0270, 0x20a9, 0x0004,
++	0x6010, 0x0096, 0x2048, 0x2019, 0x000a, 0x080c, 0xa439, 0x009e,
++	0x1168, 0x2011, 0x0274, 0x20a9, 0x0004, 0x6010, 0x0096, 0x2048,
++	0x2019, 0x0006, 0x080c, 0xa439, 0x009e, 0x1100, 0x015e, 0x003e,
++	0x002e, 0x0005, 0x00e6, 0x2071, 0x1800, 0x080c, 0x5677, 0x080c,
++	0x2b1e, 0x00ee, 0x0005, 0x00e6, 0x6010, 0x00b6, 0x2058, 0xb800,
++	0x00be, 0xd0fc, 0x0108, 0x0011, 0x00ee, 0x0005, 0xa880, 0xc0e5,
++	0xa882, 0x0005, 0x00e6, 0x00c6, 0x0076, 0x0066, 0x0056, 0x0046,
++	0x0026, 0x0016, 0x0126, 0x2091, 0x8000, 0x2029, 0x19bd, 0x252c,
++	0x2021, 0x19c3, 0x2424, 0x2061, 0x1cd0, 0x2071, 0x1800, 0x764c,
++	0x706c, 0x9606, 0x0578, 0x6720, 0x9786, 0x0001, 0x0118, 0x9786,
++	0x0008, 0x1500, 0x2500, 0x9c06, 0x01e8, 0x2400, 0x9c06, 0x01d0,
++	0x080c, 0xc9f1, 0x01b8, 0x080c, 0xca01, 0x11a0, 0x6000, 0x9086,
++	0x0004, 0x1120, 0x0016, 0x080c, 0x17b0, 0x001e, 0x080c, 0xb284,
++	0x1110, 0x080c, 0x2d3f, 0x080c, 0xb295, 0x1110, 0x080c, 0x9e99,
++	0x080c, 0x9584, 0x9ce0, 0x0018, 0x2001, 0x1818, 0x2004, 0x9c02,
++	0x1208, 0x0858, 0x012e, 0x001e, 0x002e, 0x004e, 0x005e, 0x006e,
++	0x007e, 0x00ce, 0x00ee, 0x0005, 0x2001, 0x180f, 0x2004, 0xd0dc,
++	0x0005, 0x0006, 0x2001, 0x1836, 0x2004, 0xd09c, 0x000e, 0x0005,
++	0x6004, 0x9086, 0x0001, 0x1128, 0x080c, 0x905b, 0x080c, 0x9584,
++	0x9006, 0x0005, 0x0126, 0x0006, 0x00e6, 0x0016, 0x2091, 0x8000,
++	0x2071, 0x1840, 0xd5a4, 0x0118, 0x7034, 0x8000, 0x7036, 0xd5b4,
++	0x0118, 0x7030, 0x8000, 0x7032, 0xd5ac, 0x0178, 0x2500, 0x9084,
++	0x0007, 0x908e, 0x0003, 0x0148, 0x908e, 0x0004, 0x0130, 0x908e,
++	0x0005, 0x0118, 0x2071, 0x184a, 0x0089, 0x001e, 0x00ee, 0x000e,
++	0x012e, 0x0005, 0x0126, 0x0006, 0x00e6, 0x2091, 0x8000, 0x2071,
++	0x1842, 0x0021, 0x00ee, 0x000e, 0x012e, 0x0005, 0x2e04, 0x8000,
++	0x2072, 0x1220, 0x8e70, 0x2e04, 0x8000, 0x2072, 0x0005, 0x00e6,
++	0x2071, 0x1840, 0x0c99, 0x00ee, 0x0005, 0x00e6, 0x2071, 0x1844,
++	0x0c69, 0x00ee, 0x0005, 0x0126, 0x0006, 0x00e6, 0x2091, 0x8000,
++	0x2071, 0x1840, 0x7044, 0x8000, 0x7046, 0x00ee, 0x000e, 0x012e,
++	0x0005, 0x0002, 0x0003, 0x03d6, 0x0000, 0x8064, 0x0008, 0x0010,
++	0x0000, 0x8066, 0x0000, 0x0101, 0x0008, 0x4406, 0x000b, 0x8060,
++	0x0000, 0x0400, 0x0000, 0x580c, 0x0003, 0x7934, 0x000b, 0x5090,
++	0x000b, 0x4c09, 0x0003, 0xbac0, 0x0009, 0x0082, 0x0008, 0x0c09,
++	0x000b, 0x15fe, 0x0008, 0x3409, 0x0003, 0x808c, 0x0008, 0x0001,
++	0x0000, 0x0000, 0x0007, 0x4047, 0x000a, 0x808c, 0x0008, 0x0002,
++	0x0000, 0x081b, 0x0003, 0x4022, 0x0000, 0x001c, 0x0003, 0x4122,
++	0x0008, 0x4447, 0x0002, 0x0de7, 0x0003, 0x0bfe, 0x0008, 0x11a0,
++	0x0001, 0x11c9, 0x000b, 0x0ca0, 0x0001, 0x11c9, 0x000b, 0x9180,
++	0x0001, 0x0004, 0x0000, 0x8060, 0x0000, 0x0400, 0x0000, 0x7f62,
++	0x0008, 0x8066, 0x0000, 0x0009, 0x0008, 0x442a, 0x0003, 0x808c,
++	0x0008, 0x0000, 0x0008, 0x0060, 0x0008, 0x8062, 0x0008, 0x0004,
++	0x0000, 0x8066, 0x0000, 0x0411, 0x0000, 0x4432, 0x0003, 0x03fe,
++	0x0000, 0x43e0, 0x0001, 0x0dc6, 0x0003, 0xc2c0, 0x0009, 0x00ff,
++	0x0008, 0x02e0, 0x0001, 0x0dc6, 0x0003, 0x9180, 0x0001, 0x0005,
++	0x0008, 0x8060, 0x0000, 0x0400, 0x0000, 0x7f62, 0x0008, 0x8066,
++	0x0000, 0x0019, 0x0000, 0x4441, 0x000b, 0x0240, 0x0002, 0x09c3,
++	0x000b, 0x00fe, 0x0000, 0x31c6, 0x0003, 0x112a, 0x0000, 0x002e,
++	0x0008, 0x022c, 0x0008, 0x3a44, 0x0002, 0x0c09, 0x000b, 0x808c,
++	0x0008, 0x0002, 0x0000, 0x1760, 0x0008, 0x8062, 0x0008, 0x000f,
++	0x0008, 0x8066, 0x0000, 0x0011, 0x0008, 0x4452, 0x0003, 0x01fe,
++	0x0008, 0x42e0, 0x0009, 0x0db9, 0x000b, 0x00fe, 0x0000, 0x43e0,
++	0x0001, 0x0db9, 0x000b, 0x1734, 0x0000, 0x1530, 0x0000, 0x1632,
++	0x0008, 0x0d2a, 0x0008, 0x9880, 0x0001, 0x0010, 0x0000, 0x8060,
++	0x0000, 0x0400, 0x0000, 0x7f62, 0x0008, 0x8066, 0x0000, 0x1e0a,
++	0x0008, 0x4464, 0x0003, 0x808a, 0x0008, 0x0003, 0x0008, 0x1a60,
++	0x0000, 0x8062, 0x0008, 0x0002, 0x0000, 0x586a, 0x0003, 0x8066,
++	0x0000, 0x3679, 0x0000, 0x446d, 0x0003, 0x586e, 0x000b, 0x8054,
++	0x0008, 0x0011, 0x0008, 0x8074, 0x0000, 0x1010, 0x0008, 0x1efe,
++	0x0000, 0x3009, 0x000b, 0x0077, 0x0004, 0x0009, 0x000b, 0x1c60,
++	0x0000, 0x1b62, 0x0000, 0x8066, 0x0000, 0x0231, 0x0008, 0x447b,
++	0x000b, 0x587c, 0x000b, 0x0140, 0x0008, 0x0242, 0x0000, 0x1f43,
++	0x0002, 0x0c86, 0x0003, 0x0d44, 0x0000, 0x0d46, 0x0008, 0x0348,
++	0x0008, 0x044a, 0x0008, 0x008a, 0x0003, 0x0344, 0x0008, 0x0446,
++	0x0008, 0x0548, 0x0008, 0x064a, 0x0000, 0x588a, 0x000b, 0x8054,
++	0x0008, 0x0001, 0x0000, 0x8074, 0x0000, 0x2020, 0x0008, 0x4000,
++	0x000f, 0x3a40, 0x000a, 0x0c0c, 0x000b, 0x2b24, 0x0008, 0x2b24,
++	0x0008, 0x5894, 0x000b, 0x8054, 0x0008, 0x0002, 0x0000, 0x1242,
++	0x0002, 0x08d8, 0x0003, 0x3a45, 0x000a, 0x08c9, 0x0003, 0x1e10,
++	0x000a, 0x7f3c, 0x0000, 0x08c6, 0x0003, 0x1d00, 0x0002, 0x7f3a,
++	0x0000, 0x0d60, 0x0000, 0x7f62, 0x0008, 0x8066, 0x0000, 0x0009,
++	0x0008, 0x44a4, 0x0003, 0x00fe, 0x0000, 0x34c3, 0x0003, 0x1c60,
++	0x0000, 0x8062, 0x0008, 0x0001, 0x0000, 0x8066, 0x0000, 0x0009,
++	0x0008, 0x44ac, 0x000b, 0x00fe, 0x0000, 0x31a2, 0x000b, 0x0038,
++	0x0000, 0x0060, 0x0008, 0x8062, 0x0008, 0x0019, 0x0000, 0x8066,
++	0x0000, 0x0009, 0x0008, 0x44b5, 0x0003, 0x80c0, 0x0009, 0x00ff,
++	0x0008, 0x7f3e, 0x0008, 0x0d60, 0x0000, 0x0efe, 0x0008, 0x1f80,
++	0x0001, 0x7f62, 0x0008, 0x8066, 0x0000, 0x0009, 0x0008, 0x44bf,
++	0x0003, 0x003a, 0x0008, 0x1dfe, 0x0000, 0x00a0, 0x000b, 0x0036,
++	0x0008, 0x0077, 0x0004, 0x00d8, 0x000b, 0x8074, 0x0000, 0x2000,
++	0x0000, 0x00d8, 0x000b, 0x3a44, 0x0002, 0x09cc, 0x000b, 0x8074,
++	0x0000, 0x1000, 0x0000, 0x2d0e, 0x0000, 0x2d0e, 0x0000, 0x35a2,
++	0x0003, 0x26fe, 0x0008, 0x26fe, 0x0008, 0x2700, 0x0008, 0x2700,
++	0x0008, 0x00d0, 0x0009, 0x0ce6, 0x0003, 0x8074, 0x0000, 0x4040,
++	0x0008, 0x58d8, 0x0003, 0x5090, 0x000b, 0x3a46, 0x000a, 0x0ce6,
++	0x0003, 0x3a47, 0x0002, 0x08e3, 0x000b, 0x8054, 0x0008, 0x0004,
++	0x0000, 0x8074, 0x0000, 0x8000, 0x0000, 0x0127, 0x0003, 0x92c0,
++	0x0009, 0x0f88, 0x0008, 0x0809, 0x0003, 0x1a60, 0x0000, 0x8062,
++	0x0008, 0x0002, 0x0000, 0x8066, 0x0000, 0x362a, 0x0000, 0x44eb,
++	0x000b, 0x2000, 0x0000, 0x2000, 0x0000, 0x2102, 0x0000, 0x2102,
++	0x0000, 0x2204, 0x0000, 0x2204, 0x0000, 0x2306, 0x0000, 0x2306,
++	0x0000, 0x2408, 0x0000, 0x2408, 0x0000, 0x250a, 0x0000, 0x250a,
++	0x0000, 0x260c, 0x0000, 0x260c, 0x0000, 0x270e, 0x0000, 0x270e,
++	0x0000, 0x2810, 0x0000, 0x2810, 0x0000, 0x2912, 0x0000, 0x2912,
++	0x0000, 0x1a60, 0x0000, 0x8062, 0x0008, 0x0007, 0x0000, 0x8066,
++	0x0000, 0x0052, 0x0000, 0x4505, 0x0003, 0x92c0, 0x0009, 0x0780,
++	0x0008, 0x0db3, 0x000b, 0x124b, 0x0002, 0x090e, 0x0003, 0x2e4d,
++	0x0002, 0x2e4d, 0x0002, 0x09a2, 0x0003, 0x3a46, 0x000a, 0x0d1b,
++	0x0003, 0x5910, 0x0003, 0x8054, 0x0008, 0x0004, 0x0000, 0x1243,
++	0x000a, 0x0925, 0x0003, 0x8010, 0x0008, 0x000d, 0x0000, 0x0193,
++	0x000c, 0x1810, 0x0000, 0x0193, 0x000c, 0x0125, 0x000b, 0x194d,
++	0x000a, 0x091f, 0x0003, 0x1243, 0x000a, 0x09a9, 0x000b, 0x591f,
++	0x0003, 0x8054, 0x0008, 0x0004, 0x0000, 0x0188, 0x000c, 0x1810,
++	0x0000, 0x0193, 0x000c, 0x8074, 0x0000, 0xf000, 0x0008, 0x3a42,
++	0x0002, 0x0d2d, 0x0003, 0x15fe, 0x0008, 0x344b, 0x0003, 0x0d30,
++	0x0000, 0x0009, 0x000b, 0x0d30, 0x0000, 0x8074, 0x0000, 0x0501,
++	0x0000, 0x8010, 0x0008, 0x000c, 0x0008, 0x0193, 0x000c, 0x0009,
++	0x000b, 0xbbe0, 0x0009, 0x0030, 0x0008, 0x0d44, 0x0003, 0x18fe,
++	0x0000, 0x3ce0, 0x0009, 0x0941, 0x000b, 0x15fe, 0x0008, 0x3ce0,
++	0x0009, 0x0941, 0x000b, 0x0183, 0x0004, 0x8076, 0x0008, 0x0040,
++	0x0000, 0x0180, 0x000b, 0x8076, 0x0008, 0x0041, 0x0008, 0x0180,
++	0x000b, 0xbbe0, 0x0009, 0x0032, 0x0000, 0x0d49, 0x000b, 0x3c1e,
++	0x0008, 0x0180, 0x000b, 0xbbe0, 0x0009, 0x0037, 0x0000, 0x0d65,
++	0x0003, 0x18fe, 0x0000, 0x3ce0, 0x0009, 0x0d41, 0x0003, 0x1a60,
++	0x0000, 0x8062, 0x0008, 0x000d, 0x0000, 0x2604, 0x0008, 0x2604,
++	0x0008, 0x2706, 0x0008, 0x2706, 0x0008, 0x2808, 0x0000, 0x2808,
++	0x0000, 0x290a, 0x0000, 0x290a, 0x0000, 0x8066, 0x0000, 0x0422,
++	0x0000, 0x455c, 0x0003, 0x0188, 0x000c, 0x8054, 0x0008, 0x0004,
++	0x0000, 0x8074, 0x0000, 0xf000, 0x0008, 0x8072, 0x0000, 0x8000,
++	0x0000, 0x0127, 0x0003, 0xbbe0, 0x0009, 0x0038, 0x0000, 0x0d77,
++	0x0003, 0x18fe, 0x0000, 0x3ce0, 0x0009, 0x0974, 0x000b, 0x15fe,
++	0x0008, 0x3ce0, 0x0009, 0x0d3d, 0x000b, 0x0183, 0x0004, 0x8076,
++	0x0008, 0x0040, 0x0000, 0x8072, 0x0000, 0x8000, 0x0000, 0x01c3,
++	0x0003, 0x8076, 0x0008, 0x0042, 0x0008, 0x0180, 0x000b, 0xbbe0,
++	0x0009, 0x0016, 0x0000, 0x0d80, 0x000b, 0x3a44, 0x0002, 0x0c0b,
++	0x0003, 0x8072, 0x0000, 0x8000, 0x0000, 0x8000, 0x000f, 0x0009,
++	0x000b, 0x8072, 0x0000, 0x8000, 0x0000, 0x0009, 0x000b, 0x3d30,
++	0x000a, 0x7f00, 0x0000, 0xbc80, 0x0001, 0x0007, 0x0000, 0x018c,
++	0x000b, 0x1930, 0x000a, 0x7f00, 0x0000, 0x9880, 0x0001, 0x0007,
++	0x0000, 0x8060, 0x0000, 0x0400, 0x0000, 0x7f62, 0x0008, 0x8066,
++	0x0000, 0x000a, 0x0008, 0x4591, 0x000b, 0x4000, 0x000f, 0x2193,
++	0x000b, 0x0870, 0x0008, 0x4000, 0x000f, 0xbac0, 0x0009, 0x0090,
++	0x0008, 0x099c, 0x000b, 0x8074, 0x0000, 0x0706, 0x0000, 0x019e,
++	0x000b, 0x8074, 0x0000, 0x0703, 0x0000, 0x4000, 0x000f, 0x8010,
++	0x0008, 0x0008, 0x0000, 0x01d1, 0x0003, 0x0188, 0x000c, 0x8010,
++	0x0008, 0x0007, 0x0000, 0x0193, 0x000c, 0x1810, 0x0000, 0x0193,
++	0x000c, 0x01db, 0x0003, 0x0188, 0x000c, 0x8010, 0x0008, 0x001b,
++	0x0008, 0x0193, 0x000c, 0x1810, 0x0000, 0x0193, 0x000c, 0x8074,
++	0x0000, 0xf080, 0x0000, 0x0d30, 0x0000, 0x0009, 0x000b, 0x8010,
++	0x0008, 0x0009, 0x0008, 0x01d1, 0x0003, 0x8010, 0x0008, 0x0005,
++	0x0008, 0x01d1, 0x0003, 0x808c, 0x0008, 0x0001, 0x0000, 0x8010,
++	0x0008, 0x0004, 0x0000, 0x4143, 0x000a, 0x0859, 0x0003, 0x3a44,
++	0x0002, 0x0c09, 0x000b, 0x0d2a, 0x0008, 0x01d1, 0x0003, 0x8010,
++	0x0008, 0x0003, 0x0008, 0x01d3, 0x000b, 0x8010, 0x0008, 0x000b,
++	0x0000, 0x01d3, 0x000b, 0x8010, 0x0008, 0x0002, 0x0000, 0x01d3,
++	0x000b, 0x3a47, 0x0002, 0x0cd8, 0x000b, 0x8010, 0x0008, 0x0006,
++	0x0008, 0x01d3, 0x000b, 0x8074, 0x0000, 0xf000, 0x0008, 0x0193,
++	0x000c, 0x0196, 0x000c, 0x3a40, 0x000a, 0x0809, 0x0003, 0x8010,
++	0x0008, 0x000c, 0x0008, 0x0193, 0x000c, 0x0009, 0x000b, 0x8074,
++	0x0000, 0xf080, 0x0000, 0x0d30, 0x0000, 0x2e4d, 0x0002, 0x2e4d,
++	0x0002, 0x09e4, 0x000b, 0x8054, 0x0008, 0x0019, 0x0000, 0x0009,
++	0x000b, 0x8054, 0x0008, 0x0009, 0x0008, 0x0009, 0x000b, 0x3a44,
++	0x0002, 0x0c09, 0x000b, 0x01c6, 0x0003, 0xc993, 0xf609, 0x0001,
++	0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080, 0x0100,
++	0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000, 0x8000, 0xd29e
++};
++#ifdef UNIQUE_FW_NAME
++unsigned short fw2300tpx_length01 = 0xc920;
++#else
++unsigned short risc_code_length01 = 0xc920;
++#endif
++
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qla_cfg.c	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,2780 @@
++/******************************************************************************
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ ******************************************************************************/
++
++/*
++ * QLogic ISP2x00 Multi-path LUN Support Driver
++ *
++ */
++
++#include "qla_os.h"
++#include "qla_def.h"
++
++#include "qlfo.h"
++
++/*
++ *  Local Function Prototypes.
++ */
++
++static uint32_t qla2x00_add_portname_to_mp_dev(mp_device_t *, uint8_t *);
++
++static mp_device_t * qla2x00_allocate_mp_dev(uint8_t *, uint8_t *);
++static mp_path_t * qla2x00_allocate_path(mp_host_t *, uint16_t, fc_port_t *,
++    uint16_t);
++static mp_path_list_t * qla2x00_allocate_path_list(void);
++
++static mp_host_t * qla2x00_find_host_by_name(uint8_t *);
++
++static mp_device_t * qla2x00_find_or_allocate_mp_dev (mp_host_t *, uint16_t,
++    fc_port_t *);
++static mp_path_t * qla2x00_find_or_allocate_path(mp_host_t *, mp_device_t *,
++    uint16_t, fc_port_t *);
++
++static uint32_t qla2x00_cfg_register_failover_lun(mp_device_t *,srb_t *,
++    fc_lun_t *);
++static uint32_t qla2x00_send_failover_notify(mp_device_t *, uint8_t,
++    mp_path_t *, mp_path_t *);
++static mp_path_t * qla2x00_select_next_path(mp_host_t *, mp_device_t *,
++    uint8_t);
++
++static uint8_t qla2x00_update_mp_host(mp_host_t  *);
++static uint32_t qla2x00_update_mp_tree (void);
++
++static fc_lun_t *qla2x00_find_matching_lun(uint8_t , mp_path_t *);
++static mp_path_t *qla2x00_find_path_by_id(mp_device_t *, uint8_t);
++static mp_device_t *qla2x00_find_mp_dev_by_id(mp_host_t *, uint8_t);
++static mp_device_t *qla2x00_find_mp_dev_by_name(mp_host_t *, uint8_t *);
++
++static mp_path_t *qla2x00_get_visible_path(mp_device_t *dp);
++static void qla2x00_map_os_targets(mp_host_t *);
++static void qla2x00_map_os_luns(mp_host_t *, mp_device_t *, uint16_t);
++static uint8_t qla2x00_map_a_oslun(mp_host_t *, mp_device_t *, uint16_t, uint16_t);
++
++static uint8_t qla2x00_is_ww_name_zero(uint8_t *);
++static void qla2x00_add_path(mp_path_list_t *, mp_path_t *);
++static void qla2x00_failback_single_lun(mp_device_t *, uint8_t, uint8_t);
++static void qla2x00_failback_luns(mp_host_t *);
++static void qla2x00_setup_new_path(mp_device_t *, mp_path_t *);
++
++/*
++ * Global data items
++ */
++mp_host_t  *mp_hosts_base = NULL;
++uint8_t   mp_config_required = FALSE;
++static int    mp_num_hosts = 0;
++static uint8_t   mp_initialized = FALSE;
++
++
++/*
++ * ENTRY ROUTINES
++ */
++
++/*
++ * qla2x00_cfg_init
++ *      Initialize configuration structures to handle an instance of
++ *      an HBA, QLA2x000 card.
++ *
++ * Input:
++ *      ha = adapter state pointer.
++ *
++ * Returns:
++ *      qla2x00 local function return status code.
++ *
++ * Context:
++ *      Kernel context.
++ */
++int
++qla2x00_cfg_init(scsi_qla_host_t *ha)
++{
++	int	rval;
++
++	ENTER("qla2x00_cfg_init");
++	set_bit(CFG_ACTIVE, &ha->cfg_flags);
++	if (!mp_initialized) {
++		/* First HBA, initialize the failover global properties */
++		qla2x00_fo_init_params(ha);
++
++		/* If the user specified a device configuration then
++		 * it is use as the configuration. Otherwise, we wait
++		 * for path discovery.
++		 */
++		if ( mp_config_required )
++			qla2x00_cfg_build_path_tree(ha);
++	}
++	rval = qla2x00_cfg_path_discovery(ha);
++	clear_bit(CFG_ACTIVE, &ha->cfg_flags);
++	LEAVE("qla2x00_cfg_init");
++	return rval;
++}
++
++/*
++ * qla2x00_cfg_path_discovery
++ *      Discover the path configuration from the device configuration
++ *      for the specified host adapter and build the path search tree.
++ *      This function is called after the lower level driver has
++ *      completed its port and lun discovery.
++ *
++ * Input:
++ *      ha = adapter state pointer.
++ *
++ * Returns:
++ *      qla2x00 local function return status code.
++ *
++ * Context:
++ *      Kernel context.
++ */
++int
++qla2x00_cfg_path_discovery(scsi_qla_host_t *ha)
++{
++	int		rval = QLA2X00_SUCCESS;
++	mp_host_t	*host;
++	uint8_t		*name;
++
++	ENTER("qla2x00_cfg_path_discovery");
++
++	name = 	&ha->init_cb->node_name[0];
++
++	set_bit(CFG_ACTIVE, &ha->cfg_flags);
++	/* Initialize the path tree for this adapter */
++	host = qla2x00_find_host_by_name(name);
++	if ( mp_config_required ) {
++		if (host == NULL ) {
++			DEBUG4(printk("cfg_path_discovery: host not found, "
++				"node name = "
++				"%02x%02x%02x%02x%02x%02x%02x%02x\n",
++				name[0], name[1], name[2], name[3],
++				name[4], name[5], name[6], name[7]);)
++			rval = QLA2X00_FUNCTION_FAILED;
++		} else if (ha->instance != host->instance) {
++			DEBUG4(printk("cfg_path_discovery: host instance "
++				"don't match - instance=%ld.\n",
++				ha->instance);)
++			rval = QLA2X00_FUNCTION_FAILED;
++		}
++	} else if ( host == NULL ) {
++		/* New host adapter so allocate it */
++		if ( (host = qla2x00_alloc_host(ha)) == NULL ) {
++			printk(KERN_INFO
++				"qla2x00(%d): Couldn't allocate "
++				"host - ha = %p.\n",
++				(int)ha->instance, ha);
++			rval = QLA2X00_FUNCTION_FAILED;
++		}
++	}
++
++	/* Fill in information about host */
++	if (host != NULL ) {
++		host->flags |= MP_HOST_FLAG_NEEDS_UPDATE;
++		host->flags |= MP_HOST_FLAG_LUN_FO_ENABLED;
++		host->fcports = &ha->fcports;
++
++		/* Check if multipath is enabled */
++		if (!qla2x00_update_mp_host(host)) {
++			rval = QLA2X00_FUNCTION_FAILED;
++		}
++		host->flags &= ~MP_HOST_FLAG_LUN_FO_ENABLED;
++	}
++
++	if (rval != QLA2X00_SUCCESS) {
++		/* EMPTY */
++		DEBUG4(printk("qla2x00_path_discovery: Exiting FAILED\n");)
++	} else {
++		LEAVE("qla2x00_cfg_path_discovery");
++	}
++	clear_bit(CFG_ACTIVE, &ha->cfg_flags);
++
++	return rval;
++}
++
++/*
++ * qla2x00_cfg_event_notifiy
++ *      Callback for host driver to notify us of configuration changes.
++ *
++ * Input:
++ *      ha = adapter state pointer.
++ *      i_type = event type
++ *
++ * Returns:
++ *
++ * Context:
++ *      Kernel context.
++ */
++int
++qla2x00_cfg_event_notify(scsi_qla_host_t *ha, uint32_t i_type)
++{
++	mp_host_t	*host;			/* host adapter pointer */
++
++	ENTER("qla2x00_cfg_event_notify");
++
++	set_bit(CFG_ACTIVE, &ha->cfg_flags);
++	switch (i_type) {
++		case MP_NOTIFY_RESET_DETECTED:
++			DEBUG(printk("scsi%ld: MP_NOTIFY_RESET_DETECTED "
++					"- no action\n",
++					ha->host_no);)
++				break;
++		case MP_NOTIFY_PWR_LOSS:
++			DEBUG(printk("scsi%ld: MP_NOTIFY_PWR_LOSS - "
++					"update tree\n",
++					ha->host_no);)
++			/*
++			 * Update our path tree in case we are
++			 * losing the adapter
++			 */
++			qla2x00_update_mp_tree();
++			/* Free our resources for adapter */
++			break;
++		case MP_NOTIFY_LOOP_UP:
++			DEBUG(printk("scsi%ld: MP_NOTIFY_LOOP_UP - "
++					"update host tree\n",
++					ha->host_no);)
++			/* Adapter is back up with new configuration */
++			if ((host = qla2x00_cfg_find_host(ha)) != NULL) {
++				host->flags |= MP_HOST_FLAG_NEEDS_UPDATE;
++				host->fcports = &ha->fcports;
++				qla2x00_update_mp_tree();
++			}
++			break;
++		case MP_NOTIFY_LOOP_DOWN:
++		case MP_NOTIFY_BUS_RESET:
++			DEBUG(printk("scsi%ld: MP_NOTIFY_OTHERS - "
++					"no action\n",
++					ha->host_no);)
++			break;
++		default:
++			break;
++
++	}
++	clear_bit(CFG_ACTIVE, &ha->cfg_flags);
++
++	LEAVE("qla2x00_cfg_event_notify");
++
++	return QLA2X00_SUCCESS;
++}
++
++/*
++ * qla2x00_cfg_failover
++ *      A problem has been detected with the current path for this
++ *      lun.  Select the next available path as the current path
++ *      for this device.
++ *
++ * Inputs:
++ *      ha = pointer to host adapter
++ *      fp - pointer to failed fc_lun (failback lun)
++ *      tgt - pointer to target
++ *
++ * Returns:
++ *      pointer to new fc_lun_t, or NULL if failover fails.
++ */
++fc_lun_t *
++qla2x00_cfg_failover(scsi_qla_host_t *ha, fc_lun_t *fp,
++    os_tgt_t *tgt, srb_t *sp)
++{
++	mp_host_t	*host;			/* host adapter pointer */
++	mp_device_t	*dp;			/* virtual device pointer */
++	mp_path_t	*new_path;		/* new path pointer */
++	fc_lun_t	*new_fp = NULL;
++
++	ENTER("qla2x00_cfg_failover");
++	set_bit(CFG_ACTIVE, &ha->cfg_flags);
++	if ((host = qla2x00_cfg_find_host(ha)) != NULL) {
++		if ((dp = qla2x00_find_mp_dev_by_name(
++					host, tgt->node_name)) != NULL ) {
++
++			DEBUG3(printk("qla2x00_cfg_failover: dp = %p\n", dp);)
++			/*
++			 * Point at the next path in the path list if there is
++			 * one, and if it hasn't already been failed over by
++			 * another I/O. If there is only one path continuer
++			 * to point at it.
++			 */
++			new_path = qla2x00_select_next_path(host, dp, fp->lun);
++			DEBUG3(printk("cfg_failover: new path @ %p\n",
++						new_path);)
++			new_fp = qla2x00_find_matching_lun(fp->lun, new_path);
++			DEBUG3(printk("cfg_failover: new fp lun @ %p\n",
++						new_fp);)
++
++			qla2x00_cfg_register_failover_lun(dp, sp, new_fp);
++		} else {
++			printk(KERN_INFO
++				"qla2x00(%d): Couldn't find device "
++				"to failover\n",
++				host->instance);
++		}
++	}
++	clear_bit(CFG_ACTIVE, &ha->cfg_flags);
++
++	LEAVE("qla2x00_cfg_failover");
++
++	return new_fp;
++}
++
++/*
++ * IOCTL support
++ */
++#define CFG_IOCTL
++#if defined(CFG_IOCTL)
++/*
++ * qla2x00_cfg_get_paths
++ *      Get list of paths EXT_FO_GET_PATHS.
++ *
++ * Input:
++ *      ha = pointer to adapter
++ *      bp = pointer to buffer
++ *      cmd = Pointer to kernel copy of EXT_IOCTL.
++ *
++ * Return;
++ *      0 on success or errno.
++ *	driver ioctl errors are returned via cmd->Status.
++ *
++ * Context:
++ *      Kernel context.
++ */
++int
++qla2x00_cfg_get_paths(EXT_IOCTL *cmd, FO_GET_PATHS *bp, int mode)
++{
++	FO_PATHS_INFO	*paths,	*u_paths;
++	FO_PATH_ENTRY	*entry;
++	EXT_DEST_ADDR   *sap = &bp->HbaAddr;
++	mp_host_t	*host = NULL;	/* host adapter pointer */
++	mp_device_t	*dp;		/* virtual device pointer */
++	mp_path_t	*path;		/* path pointer */
++	mp_path_list_t	*path_list;	/* path list pointer */
++	int	cnt;
++	int	rval = 0;
++	scsi_qla_host_t *ha;
++
++	DEBUG9(printk("%s: entered.\n", __func__);)
++
++	u_paths = (FO_PATHS_INFO *) cmd->ResponseAdr;
++	ha = qla2x00_get_hba((int)bp->HbaInstance);
++
++	if (!ha) {
++		DEBUG2_9_10(printk("%s: no ha matching inst %d.\n",
++		    __func__, bp->HbaInstance);)
++
++		cmd->Status = EXT_STATUS_DEV_NOT_FOUND;
++		return (rval);
++	}
++
++	if (ha->flags.failover_enabled)
++		if ((host = qla2x00_cfg_find_host(ha)) == NULL) {
++			cmd->Status = EXT_STATUS_DEV_NOT_FOUND;
++			cmd->DetailStatus = EXT_DSTATUS_HBA_INST;
++			DEBUG4(printk("%s: cannot find target (%ld)\n",
++			    __func__, ha->instance);)
++			DEBUG9_10(printk("%s: cannot find host inst(%ld).\n",
++			    __func__, ha->instance);)
++
++			return rval;
++		}
++
++	paths = (FO_PATHS_INFO *)qla2x00_kmem_zalloc(
++	    sizeof(FO_PATHS_INFO), GFP_ATOMIC, 20);
++	if (paths == NULL) {
++		DEBUG4(printk("%s: failed to allocate memory of size (%d)\n",
++		    __func__, (int)sizeof(FO_PATHS_INFO));)
++		DEBUG9_10(printk("%s: failed allocate memory size(%d).\n",
++		    __func__, (int)sizeof(FO_PATHS_INFO));)
++
++		cmd->Status = EXT_STATUS_NO_MEMORY;
++
++		return -ENOMEM;
++	}
++
++	if (!ha->flags.failover_enabled) {
++		/* non-fo case. There's only one path. */
++
++		mp_path_list_t	*ptmp_plist;
++#define STD_MAX_PATH_CNT	1
++#define STD_VISIBLE_INDEX	0
++		int		found;
++		struct list_head *fcpl;
++		fc_port_t	*fcport;
++
++		DEBUG9(printk("%s: non-fo case.\n", __func__);)
++
++		if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&ptmp_plist,
++		    sizeof(mp_path_list_t))) {
++			/* not enough memory */
++			DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++			    "lun_mask requested=%d.\n",
++			    __func__, ha->host_no, ha->instance,
++			    sizeof(mp_path_list_t));)
++			cmd->Status = EXT_STATUS_NO_MEMORY;
++
++			return -ENOMEM;
++		}
++
++		found = 0;
++		fcport = NULL;
++		list_for_each(fcpl, &ha->fcports) {
++			fcport = list_entry(fcpl, fc_port_t, list);
++
++			if (memcmp(fcport->node_name, sap->DestAddr.WWNN,
++			    EXT_DEF_WWN_NAME_SIZE) == 0) {
++				found++;
++				break;
++			}
++		}
++
++		if (found) {
++			DEBUG9(printk("%s: found fcport:"
++			    "(%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x)\n.",
++			    __func__,
++			    sap->DestAddr.WWNN[0],
++			    sap->DestAddr.WWNN[1],
++			    sap->DestAddr.WWNN[2],
++			    sap->DestAddr.WWNN[3],
++			    sap->DestAddr.WWNN[4],
++			    sap->DestAddr.WWNN[5],
++			    sap->DestAddr.WWNN[6],
++			    sap->DestAddr.WWNN[7]);)
++
++			paths->HbaInstance         = bp->HbaInstance;
++			paths->PathCount           = STD_MAX_PATH_CNT;
++			paths->VisiblePathIndex    = STD_VISIBLE_INDEX;
++
++			/* Copy current path, which is the first one (0). */
++			memcpy(paths->CurrentPathIndex, ptmp_plist->current_path,
++			    sizeof(paths->CurrentPathIndex));
++
++			entry = &(paths->PathEntry[STD_VISIBLE_INDEX]);
++
++			entry->Visible     = TRUE;
++			entry->HbaInstance = bp->HbaInstance;
++
++			memcpy(entry->PortName, fcport->port_name,
++			    EXT_DEF_WWP_NAME_SIZE);
++
++			rval = verify_area(VERIFY_WRITE, (void *)u_paths,
++			    cmd->ResponseLen);
++			if (rval) {
++				/* error */
++				DEBUG9_10(printk("%s: u_paths %p verify write"
++				    " error. paths->PathCount=%d.\n",
++				    __func__, u_paths, paths->PathCount);)
++			}
++
++			/* Copy data to user */
++			if (rval == 0)
++			 	rval = copy_to_user(&u_paths->PathCount,
++			 	    &paths->PathCount, 4);
++			if (rval == 0)
++				rval = copy_to_user(&u_paths->CurrentPathIndex,
++				    &paths->CurrentPathIndex,
++				    sizeof(paths->CurrentPathIndex));
++			if (rval == 0)
++				rval = copy_to_user(&u_paths->PathEntry,
++				    &paths->PathEntry,
++				    sizeof(paths->PathEntry));
++
++			if (rval) { /* if any of the above failed */
++				DEBUG9_10(printk("%s: data copy failed.\n",
++				    __func__);)
++
++				cmd->Status = EXT_STATUS_COPY_ERR;
++			}
++		} else {
++			cmd->Status = EXT_STATUS_DEV_NOT_FOUND;
++			cmd->DetailStatus = EXT_DSTATUS_TARGET;
++
++			DEBUG10(printk("%s: cannot find fcport "
++			    "(%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x)\n.",
++			    __func__,
++			    sap->DestAddr.WWNN[0],
++			    sap->DestAddr.WWNN[1],
++			    sap->DestAddr.WWNN[2],
++			    sap->DestAddr.WWNN[3],
++			    sap->DestAddr.WWNN[4],
++			    sap->DestAddr.WWNN[5],
++			    sap->DestAddr.WWNN[6],
++			    sap->DestAddr.WWNN[7]);)
++			DEBUG4(printk("%s: cannot find fcport "
++			    "(%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x)\n.",
++			    __func__,
++			    sap->DestAddr.WWNN[0],
++			    sap->DestAddr.WWNN[1],
++			    sap->DestAddr.WWNN[2],
++			    sap->DestAddr.WWNN[3],
++			    sap->DestAddr.WWNN[4],
++			    sap->DestAddr.WWNN[5],
++			    sap->DestAddr.WWNN[6],
++			    sap->DestAddr.WWNN[7]);)
++		}
++
++		qla2x00_free_ioctl_scrap_mem(ha);
++		/* end of non-fo case. */
++
++	} else if (sap->DestType != EXT_DEF_DESTTYPE_WWNN) {
++		/* Scan for mp_dev by nodename *ONLY* */
++
++		cmd->Status = EXT_STATUS_INVALID_PARAM;
++		cmd->DetailStatus = EXT_DSTATUS_TARGET;
++
++		DEBUG4(printk("%s: target can be accessed by NodeName only.",
++		    __func__);)
++		DEBUG10(printk("%s: target can be accessed by NodeName only. "
++		    "got type %d.\n",
++		    __func__, sap->DestType);)
++
++	} else if ((dp = qla2x00_find_mp_dev_by_name(host,
++	    sap->DestAddr.WWNN)) != NULL) {
++		DEBUG9(printk("%s: Found mp_dev:"
++		    "(%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x)\n.",
++		    __func__,
++		    sap->DestAddr.WWNN[0],
++		    sap->DestAddr.WWNN[1],
++		    sap->DestAddr.WWNN[2],
++		    sap->DestAddr.WWNN[3],
++		    sap->DestAddr.WWNN[4],
++		    sap->DestAddr.WWNN[5],
++		    sap->DestAddr.WWNN[6],
++		    sap->DestAddr.WWNN[7]);)
++
++		path_list = dp->path_list;
++
++		paths->HbaInstance = bp->HbaInstance;
++		paths->PathCount           = path_list->path_cnt;
++		paths->VisiblePathIndex    = path_list->visible;
++
++		/* copy current paths */
++		memcpy(paths->CurrentPathIndex,
++		    path_list->current_path,
++		    sizeof(paths->CurrentPathIndex));
++
++		path = path_list->last;
++		for (cnt = 0; cnt < path_list->path_cnt; cnt++) {
++			entry = &(paths->PathEntry[path->id]);
++
++			entry->Visible    = (path->id == path_list->visible);
++			entry->HbaInstance = path->host->instance;
++
++			memcpy(entry->PortName,
++			    path->portname,
++			    EXT_DEF_WWP_NAME_SIZE);
++
++			path = path->next;
++		}
++
++		rval = verify_area(VERIFY_WRITE, (void *)u_paths,
++		    cmd->ResponseLen);
++		if (rval) {
++			/* error */
++			DEBUG9_10(printk("%s: u_paths %p verify write"
++			    " error. paths->PathCount=%d.\n",
++			    __func__, u_paths, paths->PathCount);)
++		}
++
++		/* copy data to user */
++		if (rval == 0)
++			rval = copy_to_user(&u_paths->PathCount,
++			    &paths->PathCount, 4);
++		if (rval == 0)
++			rval = copy_to_user(&u_paths->CurrentPathIndex,
++			    &paths->CurrentPathIndex,
++			    sizeof(paths->CurrentPathIndex));
++		if (rval == 0)
++			rval = copy_to_user(&u_paths->PathEntry,
++			    &paths->PathEntry,
++			    sizeof(paths->PathEntry));
++
++		if (rval != 0) {  /* if any of the above failed */
++			DEBUG9_10(printk("%s: u_paths %p copy"
++			    " error. paths->PathCount=%d.\n",
++			    __func__, u_paths, paths->PathCount);)
++			cmd->Status = EXT_STATUS_COPY_ERR;
++		}
++
++	} else {
++
++		cmd->Status = EXT_STATUS_DEV_NOT_FOUND;
++		cmd->DetailStatus = EXT_DSTATUS_TARGET;
++
++		DEBUG4(printk("%s: cannot find device "
++		    "(%02x-%02x-%02x-%02x-%02x-%02x-%02x-%02x)\n.",
++		    __func__,
++		    sap->DestAddr.WWNN[0],
++		    sap->DestAddr.WWNN[1],
++		    sap->DestAddr.WWNN[2],
++		    sap->DestAddr.WWNN[3],
++		    sap->DestAddr.WWNN[4],
++		    sap->DestAddr.WWNN[5],
++		    sap->DestAddr.WWNN[6],
++		    sap->DestAddr.WWNN[7]);)
++	}
++
++	KMEM_FREE(paths, sizeof(FO_PATHS_INFO));
++
++	DEBUG9(printk("%s: exiting. rval=%d.\n", __func__, rval);)
++
++	return rval;
++
++} /* qla2x00_cfg_get_paths */
++
++/*
++ * qla2x00_cfg_set_current_path
++ *      Set the current failover path EXT_FO_GET_PATHS IOCTL call.
++ *
++ * Input:
++ *      ha = pointer to adapter
++ *      bp = pointer to buffer
++ *      cmd = Pointer to kernel copy of EXT_IOCTL.
++ *
++ * Return;
++ *      0 on success or errno.
++ *
++ * Context:
++ *      Kernel context.
++ */
++int
++qla2x00_cfg_set_current_path(EXT_IOCTL *cmd, FO_SET_CURRENT_PATH *bp, int mode )
++{
++	uint8_t         orig_id, new_id;
++	mp_host_t       *host, *new_host;
++	mp_device_t     *dp;
++	mp_path_list_t  *path_list;
++	EXT_DEST_ADDR   *sap = &bp->HbaAddr;
++	uint32_t        rval = 0;
++	scsi_qla_host_t *ha;
++	mp_path_t       *new_path, *old_path;
++
++	DEBUG9(printk("%s: entered.\n", __func__);)
++
++	/* First find the adapter with the instance number. */
++	ha = qla2x00_get_hba((int)bp->HbaInstance);
++	if (!ha) {
++		DEBUG2_9_10(printk("%s: no ha matching inst %d.\n",
++		    __func__, bp->HbaInstance);)
++
++		cmd->Status = EXT_STATUS_DEV_NOT_FOUND;
++		return (rval);
++	}
++
++	if (!ha->flags.failover_enabled)
++		/* non-failover mode. nothing to be done. */
++		return 0;
++
++	if ((host = qla2x00_cfg_find_host(ha)) == NULL) {
++		cmd->Status = EXT_STATUS_DEV_NOT_FOUND;
++		cmd->DetailStatus = EXT_DSTATUS_HBA_INST;
++		DEBUG4(printk("%s: cannot find adapter.\n",
++		    __func__);)
++		return (rval);
++	}
++
++	set_bit(CFG_ACTIVE, &ha->cfg_flags);
++	sap = &bp->HbaAddr;
++	/* Scan for mp_dev by nodename *ONLY* */
++	if (sap->DestType != EXT_DEF_DESTTYPE_WWNN) {
++		cmd->Status = EXT_STATUS_DEV_NOT_FOUND;
++		cmd->DetailStatus = EXT_DSTATUS_TARGET;
++		DEBUG4(printk("%s: target can be accessed by NodeName only.",
++		    __func__);)
++		DEBUG9_10(printk("%s: target can be accessed by NodeName only.",
++		    __func__);)
++	} else if ((dp = qla2x00_find_mp_dev_by_name(
++	    host, sap->DestAddr.WWNN)) != NULL) {
++
++		path_list = dp->path_list;
++
++		if (bp->NewCurrentPathIndex < MAX_PATHS_PER_DEVICE &&
++		    sap->Lun < MAX_LUNS &&
++		    bp->NewCurrentPathIndex < path_list->path_cnt) {
++
++			orig_id = path_list->current_path[sap->Lun];
++
++			DEBUG(printk("%s: dev no  %d, lun %d, "
++			    "newindex %d, oldindex %d "
++			    "nn=%02x%02x%02x%02x%02x%02x%02x%02x\n",
++			    __func__, dp->dev_id, sap->Lun,
++			    bp->NewCurrentPathIndex, orig_id,
++			    host->nodename[0], host->nodename[1],
++			    host->nodename[2], host->nodename[3],
++			    host->nodename[4], host->nodename[5],
++			    host->nodename[6], host->nodename[7]);)
++
++			if (bp->NewCurrentPathIndex != orig_id) {
++				/* Acquire the update spinlock. */
++
++				/* Set the new current path. */
++				new_id = path_list-> current_path[sap->Lun] =
++				    bp->NewCurrentPathIndex;
++
++				/* Release the update spinlock. */
++				old_path = qla2x00_find_path_by_id(
++				    dp, orig_id);
++				new_path = qla2x00_find_path_by_id(dp, new_id);
++				new_host = new_path->host;
++
++				/* remap the lun */
++				qla2x00_map_a_oslun(new_host, dp,
++				    dp->dev_id, sap->Lun);
++
++				qla2x00_send_failover_notify(dp,
++				    sap->Lun, old_path, new_path);
++			} else {
++				/* EMPTY */
++				DEBUG4(printk("%s: path index not changed.\n",
++				    __func__);)
++			}
++		} else {
++			cmd->Status = EXT_STATUS_INVALID_PARAM;
++			cmd->DetailStatus = EXT_DSTATUS_PATH_INDEX;
++			DEBUG4(printk("%s: invalid index for device.\n",
++			    __func__);)
++			DEBUG9_10(printk("%s: invalid index for device.\n",
++			    __func__);)
++		}
++	} else {
++		cmd->Status = EXT_STATUS_DEV_NOT_FOUND;
++		cmd->DetailStatus = EXT_DSTATUS_TARGET;
++		DEBUG4(printk("%s: cannot find device.\n",
++		    __func__);)
++		DEBUG9_10(printk("%s: cannot find device.\n",
++		    __func__);)
++	}
++	clear_bit(CFG_ACTIVE, &ha->cfg_flags);
++
++	DEBUG9(printk("%s: exiting. rval = %d.\n", __func__, rval);)
++
++	return rval;
++}
++#endif
++
++/*
++ * MP SUPPORT ROUTINES
++ */
++
++/*
++ * qla2x00_add_mp_host
++ *	Add the specified host the host list.
++ *
++ * Input:
++ *	node_name = pointer to node name
++ *
++ * Returns:
++ *
++ * Context:
++ *	Kernel context.
++ */
++mp_host_t *
++qla2x00_add_mp_host(uint8_t *node_name)
++{
++	mp_host_t   *host, *temp;
++
++	host = (mp_host_t *) KMEM_ZALLOC(sizeof(mp_host_t), 1);
++	if (host != NULL) {
++		memcpy(host->nodename, node_name, WWN_SIZE);
++		host->next = NULL;
++		/* add to list */
++		if (mp_hosts_base == NULL) {
++			mp_hosts_base = host;
++		} else {
++			temp = mp_hosts_base;
++			while (temp->next != NULL)
++				temp = temp->next;
++			temp->next = host;
++		}
++		mp_num_hosts++;
++	}
++	return host;
++}
++
++/*
++ * qla2x00_alloc_host
++ *      Allocate and initialize an mp host structure.
++ *
++ * Input:
++ *      ha = pointer to base driver's adapter structure.
++ *
++ * Returns:
++ *      Pointer to host structure or null on error.
++ *
++ * Context:
++ *      Kernel context.
++ */
++mp_host_t   *
++qla2x00_alloc_host(scsi_qla_host_t *ha)
++{
++	mp_host_t	*host, *temp;
++	uint8_t		*name, *portname;
++
++	name = 	&ha->init_cb->node_name[0];
++	portname = &ha->init_cb->port_name[0];
++
++	ENTER("qla2x00_alloc_host");
++
++	host = (mp_host_t *) KMEM_ZALLOC(sizeof(mp_host_t), 2);
++
++	if (host != NULL) {
++		host->ha = ha;
++		memcpy(host->nodename, name, WWN_SIZE);
++		memcpy(host->portname, portname, WWN_SIZE);
++		host->next = NULL;
++		host->flags = MP_HOST_FLAG_NEEDS_UPDATE;
++		host->instance = ha->instance;
++		/* host->MaxLunsPerTarget = qla_fo_params.MaxLunsPerTarget; */
++
++		if (qla2x00_fo_enabled(host->ha, host->instance)) {
++			host->flags |= MP_HOST_FLAG_FO_ENABLED;
++			DEBUG4(printk("%s: Failover enabled.\n",
++			    __func__);)
++		} else {
++			/* EMPTY */
++			DEBUG4(printk("%s: Failover disabled.\n",
++			    __func__);)
++		}
++		/* add to list */
++		if (mp_hosts_base == NULL) {
++			mp_hosts_base = host;
++		} else {
++			temp = mp_hosts_base;
++			while (temp->next != NULL)
++				temp = temp->next;
++			temp->next = host;
++		}
++		mp_num_hosts++;
++
++		DEBUG4(printk("%s: Alloc host @ %p\n", __func__, host);)
++	} else {
++		/* EMPTY */
++		DEBUG4(printk("%s: Failed\n", __func__);)
++	}
++
++	return host;
++}
++
++/*
++ * qla2x00_add_portname_to_mp_dev
++ *      Add the specific port name to the list of port names for a
++ *      multi-path device.
++ *
++ * Input:
++ *      dp = pointer ti virtual device
++ *      portname = Port name to add to device
++ *
++ * Returns:
++ *      qla2x00 local function return status code.
++ *
++ * Context:
++ *      Kernel context.
++ */
++static uint32_t
++qla2x00_add_portname_to_mp_dev(mp_device_t *dp, uint8_t *portname)
++{
++	uint8_t		index;
++	uint32_t	rval = QLA2X00_SUCCESS;
++
++	ENTER("qla2x00_add_portname_to_mp_dev");
++
++	/* Look for an empty slot and add the specified portname.   */
++	for (index = 0; index < MAX_NUMBER_PATHS; index++) {
++		if (qla2x00_is_ww_name_zero(&dp->portnames[index][0])) {
++			DEBUG4(printk("%s: adding portname to dp = "
++			    "%p at index = %d\n",
++			    __func__, dp, index);)
++			memcpy(&dp->portnames[index][0], portname, WWN_SIZE);
++			break;
++		}
++	}
++	if (index == MAX_NUMBER_PATHS) {
++		rval = QLA2X00_FUNCTION_FAILED;
++		DEBUG4(printk("%s: Fail no room\n", __func__);)
++	} else {
++		/* EMPTY */
++		DEBUG4(printk("%s: Exit OK\n", __func__);)
++	}
++
++	LEAVE("qla2x00_add_portname_to_mp_dev");
++
++	return rval;
++}
++
++
++/*
++ *  qla2x00_allocate_mp_dev
++ *      Allocate an fc_mp_dev, clear the memory, and log a system
++ *      error if the allocation fails. After fc_mp_dev is allocated
++ *
++ *  Inputs:
++ *      nodename  = pointer to nodename of new device
++ *      portname  = pointer to portname of new device
++ *
++ *  Returns:
++ *      Pointer to new mp_device_t, or NULL if the allocation fails.
++ *
++ * Context:
++ *      Kernel context.
++ */
++static mp_device_t *
++qla2x00_allocate_mp_dev(uint8_t  *nodename, uint8_t *portname)
++{
++	mp_device_t   *dp;            /* Virtual device pointer */
++
++	ENTER("qla2x00_allocate_mp_dev");
++
++	dp = (mp_device_t *)KMEM_ZALLOC(sizeof(mp_device_t), 3);
++
++	if (dp != NULL) {
++		DEBUG3(printk("%s: mp_device_t allocated at %p\n",
++		    __func__, dp);)
++
++		/*
++		 * Copy node name into the mp_device_t.
++		 */
++		if (nodename)
++			memcpy(dp->nodename, nodename, WWN_SIZE);
++
++		/*
++		 * Since this is the first port, it goes at
++		 * index zero.
++		 */
++		if (portname)
++			memcpy(&dp->portnames[0][0], portname, PORT_NAME_SIZE);
++
++		/* Allocate an PATH_LIST for the fc_mp_dev. */
++		if ((dp->path_list = qla2x00_allocate_path_list()) == NULL) {
++			DEBUG4(printk("%s: allocate path_list Failed.\n",
++			    __func__);)
++			KMEM_FREE(dp, sizeof(mp_device_t));
++			dp = NULL;
++		} else {
++			DEBUG4(printk("%s: mp_path_list_t allocated at %p\n",
++			    __func__, dp->path_list);)
++			/* EMPTY */
++			DEBUG4(printk("qla2x00_allocate_mp_dev: Exit Okay\n");)
++		}
++	} else {
++		/* EMPTY */
++		DEBUG4(printk("%s: Allocate failed.\n", __func__);)
++	}
++
++	LEAVE("qla2x00_allocate_mp_dev");
++
++	return dp;
++}
++
++/*
++ *  qla2x00_allocate_path
++ *      Allocate a PATH.
++ *
++ *  Inputs:
++ *     host   Host adapter for the device.
++ *     path_id  path number
++ *     port   port for device.
++ *      dev_id  device number
++ *
++ *  Returns:
++ *      Pointer to new PATH, or NULL if the allocation failed.
++ *
++ * Context:
++ *      Kernel context.
++ */
++static mp_path_t *
++qla2x00_allocate_path(mp_host_t *host, uint16_t path_id,
++    fc_port_t *port, uint16_t dev_id)
++{
++	mp_path_t	*path;
++	uint16_t	lun;
++
++	ENTER("qla2x00_allocate_path");
++
++	path = (mp_path_t *) KMEM_ZALLOC(sizeof(mp_path_t), 4);
++	if (path != NULL) {
++		DEBUG3(printk("%s: mp_path_t allocated at %p\n",
++		    __func__, path); )
++
++		/* Copy the supplied information into the MP_PATH.  */
++		path->host = host;
++		if (!(port->flags & FC_CONFIG) ||
++			port->loop_id != FC_NO_LOOP_ID) {
++
++			path->port = port;
++		}
++		path->id   = path_id;
++		port->cur_path = path->id;
++		path->mp_byte  = port->mp_byte;
++		path->next  = NULL;
++		memcpy(path->portname, port->port_name, WWN_SIZE);
++		for (lun = 0; lun < MAX_LUNS; lun++) {
++			path->lun_data.data[lun] |= LUN_DATA_ENABLED;
++		}
++	} else {
++		/* EMPTY */
++		DEBUG4(printk("%s: Failed\n", __func__);)
++	}
++
++	return path;
++}
++
++
++/*
++ *  qla2x00_allocate_path_list
++ *      Allocate a PATH_LIST
++ *
++ *  Input:
++ * 		None
++ *
++ *  Returns:
++ *      Pointer to new PATH_LIST, or NULL if the allocation fails.
++ *
++ * Context:
++ *      Kernel context.
++ */
++static mp_path_list_t *
++qla2x00_allocate_path_list( void )
++{
++	mp_path_list_t	*path_list;
++	uint16_t		i;
++	uint8_t			l;
++
++	path_list = (mp_path_list_t *) KMEM_ZALLOC(sizeof(mp_path_list_t), 5);
++
++	if (path_list != NULL) {
++		DEBUG4(printk("%s: allocated at %p\n",
++		    __func__, path_list);)
++
++		path_list->visible = PATH_INDEX_INVALID;
++		/* Initialized current path */
++		for (i = 0; i < MAX_LUNS_PER_DEVICE; i++) {
++			l = (uint8_t)(i & 0xFF);
++			path_list->current_path[l] = PATH_INDEX_INVALID;
++		}
++		path_list->last = NULL;
++
++	} else {
++		/* EMPTY */
++		DEBUG4(printk("%s: Alloc pool failed for MP_PATH_LIST.\n",
++		    __func__);)
++	}
++
++	return path_list;
++}
++
++/*
++ *  qla2x00_cfg_find_host
++ *      Look through the existing multipath tree, and find
++ *      a host adapter to match the specified ha.
++ *
++ *  Input:
++ *      ha = pointer to host adapter
++ *
++ *  Return:
++ *      Pointer to new host, or NULL if no match found.
++ *
++ * Context:
++ *      Kernel context.
++ */
++mp_host_t *
++qla2x00_cfg_find_host(scsi_qla_host_t *ha)
++{
++	mp_host_t     *host = NULL;	/* Host found and null if not */
++	mp_host_t     *tmp_host;
++
++	ENTER("qla2x00_cfg_find_host");
++
++	for (tmp_host = mp_hosts_base; (tmp_host); tmp_host = tmp_host->next) {
++		if (tmp_host->ha == ha) {
++			host = tmp_host;
++			DEBUG3(printk("%s: Found host =%p, instance %d\n",
++			    __func__, host, host->instance);)
++			break;
++		}
++	}
++
++	LEAVE("qla2x00_cfg_find_host");
++
++	return host;
++}
++
++/*
++ *  qla2x00_find_host_by_name
++ *      Look through the existing multipath tree, and find
++ *      a host adapter to match the specified name.
++ *
++ *  Input:
++ *      name = node name to match.
++ *
++ *  Return:
++ *      Pointer to new host, or NULL if no match found.
++ *
++ * Context:
++ *      Kernel context.
++ */
++mp_host_t *
++qla2x00_find_host_by_name(uint8_t   *name)
++{
++	mp_host_t     *host;		/* Host found and null if not */
++
++	for (host = mp_hosts_base; (host); host = host->next) {
++		if (memcmp(host->nodename, name, WWN_SIZE) == 0)
++			break;
++	}
++	return host;
++}
++
++
++/*
++ *  qla2x00_find_or_allocate_mp_dev
++ *      Look through the existing multipath control tree, and find
++ *      an mp_device_t with the supplied world-wide node name.  If
++ *      one cannot be found, allocate one.
++ *
++ *  Input:
++ *      host      Adapter to add device to.
++ *      dev_id    Index of device on adapter.
++ *      port      port database information.
++ *
++ *  Returns:
++ *      Pointer to new mp_device_t, or NULL if the allocation fails.
++ *
++ *  Side Effects:
++ *      If the MP HOST does not already point to the mp_device_t,
++ *      a pointer is added at the proper port offset.
++ *
++ * Context:
++ *      Kernel context.
++ */
++static mp_device_t *
++qla2x00_find_or_allocate_mp_dev(mp_host_t *host, uint16_t dev_id,
++    fc_port_t *port)
++{
++	mp_device_t	*dp = NULL;  /* pointer to multi-path device   */
++	uint8_t		node_found;  /* Found matching node name. */
++	uint8_t		port_found;  /* Found matching port name. */
++	uint8_t		names_valid; /* Node name and port name are not zero */ 
++	mp_host_t	*temp_host;  /* pointer to temporary host */
++
++	uint16_t	j;
++	mp_device_t	*temp_dp;
++
++	ENTER("qla2x00_find_or_allocate_mp_dev");
++
++	DEBUG3(printk("%s: host =%p, port =%p, id = %d\n",
++	    __func__, host, port, dev_id);)
++
++	temp_dp = qla2x00_find_mp_dev_by_id(host,dev_id);
++
++	DEBUG3(printk("%s: temp dp =%p\n", __func__, temp_dp);)
++	/* if Device already known at this port. */
++	if (temp_dp != NULL) {
++		node_found = qla2x00_is_nodename_equal(temp_dp->nodename,
++					port->node_name);
++		port_found = qla2x00_is_portname_in_device(temp_dp,
++					port->port_name);
++
++		if (node_found && port_found) {
++			DEBUG3(printk("%s: port exists in device %p\n",
++			    __func__, temp_dp);)
++			dp = temp_dp;
++
++			/*
++			 * Copy the LUN configuration data
++			 * into the mp_device_t.
++			 */
++		}
++	}
++
++
++	/* Sanity check the port information  */
++	names_valid = (!qla2x00_is_ww_name_zero(port->node_name) &&
++			!qla2x00_is_ww_name_zero(port->port_name));
++
++	/*
++	 * If the optimized check failed, loop through each known
++	 * device on each known adapter looking for the node name.
++	 */
++	if (dp == NULL && names_valid) {
++		DEBUG3(printk("%s: Searching each adapter for the device...\n",
++		    __func__);)
++
++		for (temp_host = mp_hosts_base; (temp_host);
++		    temp_host = temp_host->next) {
++
++			/* Loop through each potential device on adapter. */
++			for (j = 0; j < MAX_MP_DEVICES; j++) {
++				temp_dp = temp_host->mp_devs[j];
++
++				if (temp_dp == NULL)
++					continue;
++
++				node_found = qla2x00_is_nodename_equal(
++						temp_dp->nodename,
++						port->node_name);
++				port_found = qla2x00_is_portname_in_device(
++						temp_dp,
++						port->port_name);
++
++				if (node_found || port_found) {
++					DEBUG3(printk("%s: Matching device "
++					    "found at %p @ %d\n",
++					    __func__, temp_dp, j);)
++					/*
++					 * If the node name matches but
++					 * the port name was not found,
++					 * add the port name to the list
++					 * of port names.
++					 */
++					if (!port_found) {
++						qla2x00_add_portname_to_mp_dev(
++								temp_dp,
++								port->port_name);
++					}
++
++					/*
++					 * Set the flag that we have
++					 * found the device.
++					 */
++					dp = temp_dp;
++					host->mp_devs[j] = dp;
++					dp->use_cnt++;
++
++					/* Fixme(dg)
++					 * Copy the LUN info into
++					 * the mp_device_t
++					 */
++					break;
++				}
++			}
++
++			/* Break outer loop if inner loop succeeded. */
++			if (dp != NULL)
++				break;
++		}
++
++	}
++
++	/* If we couldn't find one, allocate one. */
++	if (dp == NULL &&
++		((port->flags & FC_CONFIG) || !mp_config_required ) ) {
++
++		dp = qla2x00_allocate_mp_dev(port->node_name, port->port_name);
++		host->mp_devs[dev_id] = dp;
++		dp->dev_id = dev_id;
++		dp->use_cnt++;
++	}
++
++	LEAVE("qla2x00_allocate_mp_dev");
++
++	return dp;
++}
++
++
++/*
++ *  qla2x00_find_or_allocate_path
++ *      Look through the path list for the supplied device, and either
++ *      find the supplied adapter (path) for the adapter, or create
++ *      a new one and add it to the path list.
++ *
++ *  Input:
++ *      host      Adapter (path) for the device.
++ *      dp       Device and path list for the device.
++ *      dev_id    Index of device on adapter.
++ *      port     Device data from port database.
++ *
++ *  Returns:
++ *      Pointer to new PATH, or NULL if the allocation fails.
++ *
++ *  Side Effects:
++ *      1. If the PATH_LIST does not already point to the PATH,
++ *         a new PATH is added to the PATH_LIST.
++ *      2. If the new path is found to be a second visible path, it is
++ *         marked as hidden, and the device database is updated to be
++ *         hidden as well, to keep the miniport synchronized.
++ *
++ * Context:
++ *      Kernel context.
++ */
++/* ARGSUSED */
++static mp_path_t *
++qla2x00_find_or_allocate_path(mp_host_t *host, mp_device_t *dp,
++    uint16_t dev_id, fc_port_t *port)
++{
++	mp_path_list_t	*path_list = dp->path_list;
++	mp_path_t		*path;
++	uint8_t			id;
++
++
++	ENTER("qla2x00_find_or_allocate_path");
++
++	DEBUG4(printk("%s: host =%p, port =%p, dp=%p, dev id = %d\n",
++	    __func__, host, port, dp, dev_id);)
++	/*
++	 * Loop through each known path in the path list.  Look for
++	 * a PATH that matches both the adapter and the port name.
++	 */
++	path = qla2x00_find_path_by_name(host, path_list, port->port_name);
++
++
++	if (path != NULL ) {
++		DEBUG3(printk("%s: Found an existing "
++		    "path -  host =%p, port =%p, path id = %d\n",
++		    __func__, host, path->port, path->id);)
++		DEBUG3(printk("%s: Luns for path_id %d, instance %d\n",
++		    __func__, path->id, host->instance);)
++		DEBUG3(qla2x00_dump_buffer(
++		    (char *)&path->lun_data.data[0], 64);)
++
++		/* If we found an existing path, look for any changes to it. */
++		if (path->port == NULL) {
++			DEBUG3(printk("%s: update path %p, path id= %d, "
++			    "mp_byte=0x%x port=%p\n",
++			    __func__, path, path->id,
++			    path->mp_byte, path->port);)
++			path->port = port;
++			port->mp_byte = path->mp_byte;
++		} else {
++			if ((path->mp_byte & MP_MASK_HIDDEN) &&
++				!(port->mp_byte & MP_MASK_HIDDEN)) {
++
++				DEBUG3(printk("%s: Adapter(%p) "
++				    "Device (%p) Path (%d) "
++				    "has become visible.\n",
++				    __func__, host, dp, path->id);)
++
++				path->mp_byte &= ~MP_MASK_HIDDEN;
++			}
++
++			if (!(path->mp_byte & MP_MASK_HIDDEN) &&
++					(port->mp_byte & MP_MASK_HIDDEN)) {
++
++				DEBUG3(printk("%s: Adapter(%p) "
++				    "Device (%p) Path (%d) "
++				    "has become hidden.\n",
++				    __func__, host, dp, path->id);)
++
++				path->mp_byte |= MP_MASK_HIDDEN;
++			}
++		}
++
++	} else {
++		/*
++		 * If we couldn't find an existing path, and there is still
++		 * room to add one, allocate one and put it in the list.
++		 */
++		if (path_list->path_cnt < MAX_PATHS_PER_DEVICE &&
++			path_list->path_cnt < qla_fo_params.MaxPathsPerDevice) {
++
++			id = path_list->path_cnt;
++
++			/* Update port with bitmask info */
++			path = qla2x00_allocate_path(host, id, port, dev_id);
++			DEBUG3(printk("%s: new path %p, path id= %d, "
++			    "mp_byte=0x%x port=%p\n",
++			    __func__, path, id,
++			    path->mp_byte, path->port);)
++			qla2x00_add_path(path_list, path);
++
++			/* Reconcile the new path against the existing ones. */
++			qla2x00_setup_new_path(dp, path);
++		} else {
++			/* EMPTY */
++			DEBUG4(printk("%s: Err exit, no space to add path.\n",
++			    __func__);)
++		}
++
++	}
++
++	LEAVE("qla2x00_find_or_allocate_path");
++
++	return path;
++}
++
++static uint32_t
++qla2x00_cfg_register_failover_lun(mp_device_t *dp, srb_t *sp, fc_lun_t *new_lp)
++{
++	uint32_t	status = QLA2X00_SUCCESS;
++	os_tgt_t	*tq;
++	os_lun_t	*lq;
++	fc_lun_t 	*old_lp;
++
++	DEBUG2(printk("%s: NEW fclun = %p, sp = %p\n",
++	    __func__, new_lp, sp);)
++
++	/*
++	 * Fix lun descriptors to point to new fclun which is a new fcport.
++	 */
++	if (new_lp == NULL) {
++		DEBUG2(printk("%s: Failed new lun %p\n",
++		    __func__, new_lp);)
++		return QLA2X00_FUNCTION_FAILED;
++	}
++
++	tq = sp->tgt_queue;
++	lq = sp->lun_queue;
++	if (tq == NULL) {
++		DEBUG2(printk("%s: Failed to get old tq %p\n",
++		    __func__, tq);)
++		return QLA2X00_FUNCTION_FAILED;
++	}
++	if (lq == NULL) {
++		DEBUG2(printk("%s: Failed to get old lq %p\n",
++		    __func__, lq);)
++		return QLA2X00_FUNCTION_FAILED;
++	}
++	old_lp = lq->fclun;
++	lq->fclun = new_lp;
++
++	/* Log the failover to console */
++	printk(KERN_INFO
++		"qla2x00: FAILOVER device %d from "
++		"%02x%02x%02x%02x%02x%02x%02x%02x -> "
++		"%02x%02x%02x%02x%02x%02x%02x%02x - "
++		"LUN %02x, reason=0x%x\n",
++		dp->dev_id,
++		old_lp->fcport->port_name[0], old_lp->fcport->port_name[1],
++		old_lp->fcport->port_name[2], old_lp->fcport->port_name[3],
++		old_lp->fcport->port_name[4], old_lp->fcport->port_name[5],
++		old_lp->fcport->port_name[6], old_lp->fcport->port_name[7],
++		new_lp->fcport->port_name[0], new_lp->fcport->port_name[1],
++		new_lp->fcport->port_name[2], new_lp->fcport->port_name[3],
++		new_lp->fcport->port_name[4], new_lp->fcport->port_name[5],
++		new_lp->fcport->port_name[6], new_lp->fcport->port_name[7],
++		new_lp->lun, sp->err_id);
++	printk(KERN_INFO
++		"qla2x00: FROM HBA %d to HBA %d\n",
++		(int)old_lp->fcport->ha->instance,
++		(int)new_lp->fcport->ha->instance);
++
++	DEBUG3(printk("%s: NEW fclun = %p , port =%p, "
++	    "loop_id =0x%x, instance %ld\n",
++	    __func__,
++	    new_lp, new_lp->fcport,
++	    new_lp->fcport->loop_id,
++	    new_lp->fcport->ha->instance);)
++
++	return status;
++}
++
++
++/*
++ * qla2x00_send_failover_notify
++ *      A failover operation has just been done from an old path
++ *      index to a new index.  Call lower level driver
++ *      to perform the failover notification.
++ *
++ * Inputs:
++ *      device           Device being failed over.
++ *      lun                LUN being failed over.
++ *      newpath           path that was failed over too.
++ *      oldpath           path that was failed over from.
++ *
++ * Return:
++ *      Local function status code.
++ *
++ * Context:
++ *      Kernel context.
++ */
++/* ARGSUSED */
++static uint32_t
++qla2x00_send_failover_notify(mp_device_t *dp,
++    uint8_t lun, mp_path_t *newpath, mp_path_t *oldpath)
++{
++	fc_lun_t	*old_lp, *new_lp;
++	uint32_t	status = QLA2X00_SUCCESS;
++
++	ENTER("qla2x00_send_failover_notify");
++
++	old_lp = qla2x00_find_matching_lun(lun, oldpath);
++	new_lp = qla2x00_find_matching_lun(lun, newpath);
++
++	/*
++	 * If the target is the same target, but a new HBA has been selected,
++	 * send a third party logout if required.
++	 */
++	if ((qla_fo_params.FailoverNotifyType &
++			 FO_NOTIFY_TYPE_LOGOUT_OR_LUN_RESET ||
++			qla_fo_params.FailoverNotifyType &
++			 FO_NOTIFY_TYPE_LOGOUT_OR_CDB) &&
++			qla2x00_is_portname_equal(
++				oldpath->portname, newpath->portname)) {
++
++		status =  qla2x00_send_fo_notification(old_lp, new_lp);
++		if (status == QLA2X00_SUCCESS) {
++			/* EMPTY */
++			DEBUG4(printk("%s: Logout succeded\n",
++			    __func__);)
++		} else {
++			/* EMPTY */
++			DEBUG4(printk("%s: Logout Failed\n",
++			    __func__);)
++		}
++	} else if ((qla_fo_params.FailoverNotifyType &
++			 FO_NOTIFY_TYPE_LUN_RESET) ||
++			(qla_fo_params.FailoverNotifyType &
++			 FO_NOTIFY_TYPE_LOGOUT_OR_LUN_RESET)) {
++
++		/*
++		 * If desired, send a LUN reset as the
++		 * failover notification type.
++		 */
++		if (newpath->lun_data.data[lun] & LUN_DATA_ENABLED) {
++			status = qla2x00_send_fo_notification(old_lp, new_lp);
++			if (status == QLA2X00_SUCCESS) {
++				/* EMPTY */
++				DEBUG4(printk("%s: LUN reset succeeded.\n",
++				    __func__);)
++			} else {
++				/* EMPTY */
++				DEBUG4(printk("%s: Failed reset LUN.\n",
++				    __func__);)
++			}
++		}
++
++	} else if (qla_fo_params.FailoverNotifyType == FO_NOTIFY_TYPE_CDB ||
++			qla_fo_params.FailoverNotifyType ==
++			 FO_NOTIFY_TYPE_LOGOUT_OR_CDB) {
++
++		if (newpath->lun_data.data[lun] & LUN_DATA_ENABLED) {
++			status = qla2x00_send_fo_notification(old_lp, new_lp);
++			if (status == QLA2X00_SUCCESS) {
++				/* EMPTY */
++				DEBUG4(printk("%s: Send CDB succeeded.\n",
++				    __func__);)
++			} else {
++				/* EMPTY */
++				DEBUG4(printk("%s: Send CDB Error "
++				    "lun=(%d).\n", __func__, lun);)
++			}
++		}
++	} else {
++		/* EMPTY */
++		DEBUG4(printk("%s: failover disabled or no notify routine "
++		    "defined.\n", __func__);)
++	}
++
++	return status;
++}
++
++/*
++ *  qla2x00_select_next_path
++ *      A problem has been detected with the current path for this
++ *      device.  Try to select the next available path as the current
++ *      path for this device.  If there are no more paths, the same
++ *      path will still be selected.
++ *
++ *  Inputs:
++ *      dp           pointer of device structure.
++ *      lun                LUN to failover.
++ *
++ *  Return Value:
++ *      	new path or same path
++ *
++ * Context:
++ *      Kernel context.
++ */
++static mp_path_t *
++qla2x00_select_next_path(mp_host_t *host, mp_device_t *dp, uint8_t lun)
++{
++	mp_path_t	*path = NULL;
++	mp_path_list_t	*path_list;
++	mp_path_t	*orig_path;
++	int		id;
++	uint32_t	status;
++	mp_host_t *new_host;
++
++	ENTER("qla2x00_select_next_path:");
++
++	path_list = dp->path_list;
++	if (path_list == NULL)
++		return NULL;
++
++	/* Get current path */
++	id = path_list->current_path[lun];
++
++	/* Get path for current path id  */
++	if ((orig_path = qla2x00_find_path_by_id(dp, id)) != NULL) {
++
++		/* select next path */
++		path = orig_path->next;
++		new_host = path->host;
++
++		/* FIXME may need to check for HBA being reset */
++		DEBUG3(printk("%s: orig path = %p new path = %p " 
++		    "curr idx = %d, new idx = %d\n",
++		    __func__, orig_path, path, orig_path->id, path->id);)
++		DEBUG3(printk("  FAILOVER: device nodename: "
++		    "%02x%02x%02x%02x%02x%02x%02x%02x\n",
++		    dp->nodename[0], dp->nodename[1],
++		    dp->nodename[2], dp->nodename[3],
++		    dp->nodename[4], dp->nodename[5],
++		    dp->nodename[6], dp->nodename[7]);)
++		DEBUG3(printk(" Original  - host nodename: "
++		    "%02x%02x%02x%02x%02x%02x%02x%02x\n",
++		    orig_path->host->nodename[0],
++		    orig_path->host->nodename[1],
++		    orig_path->host->nodename[2],
++		    orig_path->host->nodename[3],
++		    orig_path->host->nodename[4],
++		    orig_path->host->nodename[5],
++		    orig_path->host->nodename[6],
++		    orig_path->host->nodename[7]);)
++		DEBUG3(printk("   portname: "
++		    "%02x%02x%02x%02x%02x%02x%02x%02x\n",
++		    orig_path->port->port_name[0],
++		    orig_path->port->port_name[1],
++		    orig_path->port->port_name[2],
++		    orig_path->port->port_name[3],
++		    orig_path->port->port_name[4],
++		    orig_path->port->port_name[5],
++		    orig_path->port->port_name[6],
++		    orig_path->port->port_name[7]);)
++		DEBUG3(printk(" New  - host nodename: "
++		    "%02x%02x%02x%02x%02x%02x%02x%02x\n",
++		    new_host->nodename[0], new_host->nodename[1],
++		    new_host->nodename[2], new_host->nodename[3],
++		    new_host->nodename[4], new_host->nodename[5],
++		    new_host->nodename[6], new_host->nodename[7]);)
++		DEBUG3(printk("   portname: "
++		    "%02x%02x%02x%02x%02x%02x%02x%02x\n",
++		    path->port->port_name[0],
++		    path->port->port_name[1],
++		    path->port->port_name[2],
++		    path->port->port_name[3],
++		    path->port->port_name[4],
++		    path->port->port_name[5],
++		    path->port->port_name[6],
++		    path->port->port_name[7]);)
++
++		path_list->current_path[lun] = path->id;
++
++		/* If we selected a new path, do failover notification. */
++		if (path != orig_path) {
++			status = qla2x00_send_failover_notify(
++					dp, lun, path, orig_path);
++
++			/*
++			 * Currently we ignore the returned status from
++			 * the notify. however, if failover notify fails
++			 */
++		}
++	}
++
++	LEAVE("qla2x00_select_next_path:");
++
++	return  path ;
++}
++
++
++
++/*
++ *  qla2x00_update_mp_host
++ *      Update the multipath control information from the port
++ *      database for that adapter.
++ *
++ *  Input:
++ *      host      Adapter to update. Devices that are new are
++ *                      known to be attached to this adapter.
++ *
++ *  Returns:
++ *      TRUE if updated successfully; FALSE if error.
++ *
++ */
++static uint8_t
++qla2x00_update_mp_host(mp_host_t  *host)
++{
++	uint8_t		success = TRUE;
++	uint16_t	dev_id;
++	struct list_head	*fcpl;
++	fc_port_t 	*fcport;
++	scsi_qla_host_t *ha = host->ha;
++
++	ENTER("qla2x00_update_mp_host");
++
++	/*
++	 * We make sure each port is attached to some virtual device.
++	 */
++	dev_id = 0;
++	fcport = NULL;
++	list_for_each(fcpl, &ha->fcports) {
++		fcport = list_entry(fcpl, fc_port_t, list);
++
++		success |= qla2x00_update_mp_device(host, fcport, dev_id);
++
++		dev_id++;
++	}
++	if (success) {
++		DEBUG2(printk("%s: Exit OK\n", __func__);)
++		qla2x00_map_os_targets(host);
++	} else {
++		/* EMPTY */
++		DEBUG2(printk("%s: Exit FAILED\n", __func__);)
++	}
++
++	LEAVE("qla2x00_update_mp_host");
++
++	return success;
++}
++
++/*
++ *  qla2x00_update_mp_device
++ *      Update the multipath control information from the port
++ *      database for that adapter.
++ *
++ *  Inputs:
++ *		host   Host adapter structure
++ *      port   Device to add to the path tree.
++ *		dev_id  Device id
++ *
++ *  Synchronization:
++ *      The Adapter Lock should have already been acquired
++ *      before calling this routine.
++ *
++ *  Return
++ *      TRUE if updated successfully; FALSE if error.
++ *
++ */
++uint8_t
++qla2x00_update_mp_device(mp_host_t *host, fc_port_t *port, uint16_t dev_id)
++{
++	uint8_t		success = TRUE;
++	mp_device_t *dp;
++	mp_path_t  *path;
++
++	ENTER("qla2x00_update_mp_device");
++
++	DEBUG3(printk("%s: host =%p, port =%p, id = %d\n",
++	    __func__, host, port, dev_id);)
++
++	if (!qla2x00_is_ww_name_zero(port->port_name)) {
++
++		/*
++		 * Search for a device with a matching node name,
++		 * or create one.
++		 */
++		dp = qla2x00_find_or_allocate_mp_dev(host, dev_id, port);
++
++		/*
++		 * We either have found or created a path list. Find this
++		 * host's path in the path list or allocate a new one
++		 * and add it to the list.
++		 */
++		if (dp == NULL) {
++			DEBUG4(printk("%s: Device NOT found or created at.\n",
++			    __func__);)
++			return FALSE;
++		}
++
++		/*
++		 * Find the path in the current path list, or allocate
++		 * a new one and put it in the list if it doesn't exist.
++		 * Note that we do NOT set bSuccess to FALSE in the case
++		 * of failure here.  We must tolerate the situation where
++		 * the customer has more paths to a device than he can
++		 * get into a PATH_LIST.
++		 */
++
++		path = qla2x00_find_or_allocate_path(host, dp, dev_id, port);
++		if (path == NULL) {
++			DEBUG4(printk("%s:Path NOT found or created.\n",
++			    __func__);)
++			return FALSE;
++		}
++
++		/* Set the PATH flag to match the device flag
++		 * of whether this device needs a relogin.  If any
++		 * device needs relogin, set the relogin countdown.
++		 */
++		if (port->flags & FC_CONFIG)
++			path->config = TRUE;
++
++		if (atomic_read(&port->state) != FC_ONLINE) {
++			path->relogin = TRUE;
++			if (host->relogin_countdown == 0)
++				host->relogin_countdown = 30;
++		} else {
++			path->relogin = FALSE;
++		}
++
++	} else {
++		/* EMPTY */
++		DEBUG4(printk("%s: Failed portname empty.\n",
++		    __func__);)
++	}
++
++	LEAVE("qla2x00_update_mp_device");
++
++	return success;
++}
++
++/*
++ * qla2x00_update_mp_tree
++ *      Get port information from each adapter, and build or rebuild
++ *      the multipath control tree from this data.  This is called
++ *      from init and during port database notification.
++ *
++ * Input:
++ *      None
++ *
++ * Return:
++ *      Local function return code.
++ *
++ */
++static uint32_t
++qla2x00_update_mp_tree(void)
++{
++	mp_host_t	*host;
++	uint32_t	rval = QLA2X00_SUCCESS;
++
++	ENTER("qla2x00_update_mp_tree:");
++
++	/* Loop through each adapter and see what needs updating. */
++	for (host = mp_hosts_base; (host) ; host = host->next) {
++
++		DEBUG4(printk("%s: hba(%d) flags (%x)\n",
++		    __func__, host->instance, host->flags);)
++		/* Clear the countdown; it may be reset in the update. */
++		host->relogin_countdown = 0;
++
++		/* Override the NEEDS_UPDATE flag if disabled. */
++		if (host->flags & MP_HOST_FLAG_DISABLE ||
++		    list_empty(host->fcports))
++			host->flags &= ~MP_HOST_FLAG_NEEDS_UPDATE;
++
++		if (host->flags & MP_HOST_FLAG_NEEDS_UPDATE) {
++
++			/*
++			 * Perform the actual updates.  If this succeeds, clear
++			 * the flag that an update is needed, and failback all
++			 * devices that are visible on this path to use this
++			 * path.  If the update fails, leave set the flag that
++			 * an update is needed, and it will be picked back up
++			 * during the next timer routine.
++			 */
++			if (qla2x00_update_mp_host(host)) {
++				host->flags &= ~MP_HOST_FLAG_NEEDS_UPDATE;
++
++				qla2x00_failback_luns(host);
++			} else
++				rval = QLA2X00_FUNCTION_FAILED;
++
++		}
++
++	}
++
++	if (rval != QLA2X00_SUCCESS) {
++		/* EMPTY */
++		DEBUG4(printk("%s: Exit FAILED.\n", __func__);)
++
++	} else {
++		/* EMPTY */
++		DEBUG4(printk("%s: Exit OK.\n", __func__);)
++	}
++	return rval;
++}
++
++
++
++/*
++ * qla2x00_find_matching_lun
++ *      Find the lun in the path that matches the
++ *  specified lun number.
++ *
++ * Input:
++ *      lun  = lun number
++ *      newpath = path to search for lun
++ *
++ * Returns:
++ *      NULL or pointer to lun
++ *
++ * Context:
++ *      Kernel context.
++ * (dg)
++ */
++static fc_lun_t  *
++qla2x00_find_matching_lun(uint8_t lun, mp_path_t *newpath)
++{
++	fc_lun_t *lp = NULL;	/* lun ptr */
++	struct list_head	*fcll;
++	fc_lun_t *nlp;			/* Next lun ptr */
++	fc_port_t *fcport;		/* port ptr */
++
++	if ((fcport = newpath->port) != NULL) {
++		list_for_each(fcll, &fcport->fcluns) {
++			nlp = list_entry(fcll, fc_lun_t, list);
++
++			if (lun == nlp->lun) {
++				lp = nlp;
++				break;
++			}
++		}
++	}
++	return lp;
++}
++
++/*
++ * qla2x00_find_path_by_name
++ *      Find the path specified portname from the pathlist
++ *
++ * Input:
++ *      host = host adapter pointer.
++ * 	pathlist =  multi-path path list
++ *      portname  	portname to search for
++ *
++ * Returns:
++ * pointer to the path or NULL
++ *
++ * Context:
++ *      Kernel context.
++ */
++mp_path_t *
++qla2x00_find_path_by_name(mp_host_t *host, mp_path_list_t *plp,
++    uint8_t *portname)
++{
++	mp_path_t  *path = NULL;		/* match if not NULL */
++	mp_path_t  *tmp_path;
++	int cnt;
++
++	if ((tmp_path = plp->last) != NULL) {
++		for (cnt = 0; cnt < plp->path_cnt; cnt++) {
++			if (tmp_path->host == host &&
++				qla2x00_is_portname_equal(
++					tmp_path->portname, portname)) {
++
++				path = tmp_path;
++				break;
++			}
++			tmp_path = tmp_path->next;
++		}
++	}
++	return path ;
++}
++
++/*
++ * qla2x00_find_path_by_id
++ *      Find the path for the specified path id.
++ *
++ * Input:
++ * 	dp 		multi-path device
++ * 	id 		path id
++ *
++ * Returns:
++ *      pointer to the path or NULL
++ *
++ * Context:
++ *      Kernel context.
++ */
++static mp_path_t *
++qla2x00_find_path_by_id(mp_device_t *dp, uint8_t id)
++{
++	mp_path_t  *path = NULL;
++	mp_path_t  *tmp_path;
++	mp_path_list_t		*path_list;
++	int cnt;
++
++	path_list = dp->path_list;
++	tmp_path = path_list->last;
++	for (cnt = 0; (tmp_path) && cnt < path_list->path_cnt; cnt++) {
++		if (tmp_path->id == id) {
++			path = tmp_path;
++			break;
++		}
++		tmp_path = tmp_path->next;
++	}
++	return path ;
++}
++
++/*
++ * qla2x00_find_mp_dev_by_id
++ *      Find the mp_dev for the specified target id.
++ *
++ * Input:
++ *      host = host adapter pointer.
++ *      tgt  = Target id
++ *
++ * Returns:
++ *
++ * Context:
++ *      Kernel context.
++ */
++static mp_device_t  *
++qla2x00_find_mp_dev_by_id(mp_host_t *host, uint8_t id )
++{
++	if (id < MAX_MP_DEVICES)
++		return host->mp_devs[id];
++	else
++		return NULL;
++}
++
++/*
++ * qla2x00_find_mp_dev_by_name
++ *      Find the mp_dev for the specified target name.
++ *
++ * Input:
++ *      host = host adapter pointer.
++ *      name  = Target name
++ *
++ * Returns:
++ *
++ * Context:
++ *      Kernel context.
++ */
++static mp_device_t  *
++qla2x00_find_mp_dev_by_name(mp_host_t *host, uint8_t *name )
++{
++	int id;
++	mp_device_t *dp;
++
++	ENTER("qla2x00_find_mp_dev_by_name");
++
++	for (id= 0; id < MAX_MP_DEVICES; id++) {
++		if ((dp = host->mp_devs[id] ) == NULL)
++			continue;
++
++		if (qla2x00_is_nodename_equal(dp->nodename, name)) {
++			DEBUG3(printk("%s: Found matching device @ index %d:\n",
++			    __func__, id);)
++			return dp;
++		}
++	}
++
++	LEAVE("qla2x00_find_mp_dev_by_name");
++
++	return NULL;
++}
++
++/*
++ * qla2x00_get_visible_path
++ * Find the the visible path for the specified device.
++ *
++ * Input:
++ *      dp = device pointer
++ *
++ * Returns:
++ *      NULL or path
++ *
++ * Context:
++ *      Kernel context.
++ */
++static mp_path_t *
++qla2x00_get_visible_path(mp_device_t *dp)
++{
++	uint16_t	id;
++	mp_path_list_t	*path_list;
++	mp_path_t	*path;
++
++	path_list = dp->path_list;
++	/* if we don't have a visible path skip it */
++	if ((id = path_list->visible) == PATH_INDEX_INVALID) {
++		return NULL;
++	}
++
++	if ((path = qla2x00_find_path_by_id(dp,id))== NULL)
++		return NULL;
++
++	return path ;
++}
++
++/*
++ * qla2x00_map_os_targets
++ * Allocate the luns and setup the OS target.
++ *
++ * Input:
++ *      host = host adapter pointer.
++ *
++ * Returns:
++ *      None
++ *
++ * Context:
++ *      Kernel context.
++ */
++static void
++qla2x00_map_os_targets(mp_host_t *host)
++{
++	scsi_qla_host_t *ha = host->ha;
++	mp_path_t	*path;
++	mp_device_t 	*dp;
++	os_tgt_t	*tgt;
++	int		t;
++
++	ENTER("qla2x00_map_os_targets ");
++
++	for (t = 0; t < MAX_TARGETS; t++ ) {
++		dp = host->mp_devs[t];
++		if (dp != NULL) {
++			DEBUG3(printk("%s: (%d) found a dp=%p, "
++			    "host=%p, ha=%p\n",
++			    __func__, t, dp, host,ha);)
++
++			if ((path = qla2x00_get_visible_path(dp)) == NULL) {
++				printk(KERN_INFO
++				    "qla_cfg(%d): No visible path "
++				    "for target %d, dp = %p\n",
++				    host->instance, t, dp);
++				continue;
++			}
++
++			/* if not the visible path skip it */
++			if (path->host == host) {
++				if (TGT_Q(ha, t) == NULL) {
++					tgt = qla2x00_tgt_alloc(ha, t);
++					memcpy(tgt->node_name,
++							dp->nodename,
++							WWN_SIZE);
++					tgt->vis_port = path->port;
++				}
++				DEBUG3(printk("%s(%ld): host=%d, "
++				    "device= %p has VISIBLE "
++				    "path=%p, path id=%d\n",
++				    __func__, ha->host_no,
++				    host->instance,
++				    dp, path, path->id);)
++			} else {
++			/* EMPTY */
++				DEBUG3(printk("%s(%ld): host=%d, "
++				    "device= %p has HIDDEN "
++				    "path=%p, path id=%d\n",
++				    __func__, ha->host_no,
++				    host->instance, dp, path,path->id);)
++			}
++			qla2x00_map_os_luns(host, dp, t);
++		} else {
++			if ((tgt= TGT_Q(ha,t)) != NULL) {
++				qla2x00_tgt_free(ha,t);
++			}
++		}
++	}
++
++	LEAVE("qla2x00_map_os_targets ");
++}
++
++/*
++ * qla2x00_map_os_luns
++ *      Allocate the luns for the OS target.
++ *
++ * Input:
++ *      dp = pointer to device
++ *      t  = OS target number.
++ *
++ * Returns:
++ *      None
++ *
++ * Context:
++ *	Kernel context.
++ */
++static void
++qla2x00_map_os_luns(mp_host_t *host, mp_device_t *dp, uint16_t t)
++{
++	uint16_t lun;
++	int	i;
++
++	for (lun = 0; lun < MAX_LUNS; lun++ ) {
++		if ( qla2x00_map_a_oslun(host, dp, t, lun) &&
++			(host->flags & MP_HOST_FLAG_LUN_FO_ENABLED) ){
++			/* find a path for us to use */
++			for ( i = 0; i < dp->path_list->path_cnt; i++ ){
++				qla2x00_select_next_path(host, dp, lun);
++				if( !qla2x00_map_a_oslun(host, dp, t, lun))
++					break;
++			}
++		}
++	}
++}
++
++/*
++ * qla2x00_map_a_osluns
++ *      Map the OS lun to the current path
++ *
++ * Input:
++ *      host = pointer to host
++ *      dp = pointer to device
++ *      lun  = OS lun number.
++ *
++ * Returns:
++ *      None
++ *
++ * Context:
++ *	Kernel context.
++ */
++
++static uint8_t
++qla2x00_map_a_oslun(mp_host_t *host, mp_device_t *dp, uint16_t t, uint16_t lun)
++{
++	fc_port_t	*fcport;
++	fc_lun_t	*fclun;
++	os_lun_t	*lq;
++	uint16_t	id;
++	mp_path_t	*path, *vis_path;
++	mp_host_t 	*vis_host;
++	uint8_t		status = FALSE;
++
++	if ((id = dp->path_list->current_path[lun]) != PATH_INDEX_INVALID) {
++		path = qla2x00_find_path_by_id(dp,id);
++		if (path) {
++			fcport = path->port;
++			if (fcport) {
++				/* dg 04/26/02 */
++			 	fcport->cur_path = id;
++				fclun = qla2x00_find_matching_lun(lun,path);
++
++				/* Always map all luns if they are enabled */
++				if (fclun &&
++					(path->lun_data.data[lun] &
++					 LUN_DATA_ENABLED) ) {
++
++					/*
++					 * Mapped lun on the visible path
++					 */
++					if ((vis_path =
++					    qla2x00_get_visible_path(dp)) ==
++					    NULL ) {
++
++						printk(KERN_INFO
++						    "qla2x00(%d): No visible "
++						    "path for target %d, "
++						    "dp = %p\n",
++						    host->instance,
++						    t, dp);
++
++						return FALSE;
++					}
++
++					vis_host = vis_path->host;
++
++					/* ra 11/30/01 */
++					/*
++					 * Always alloc LUN 0 so kernel
++					 * will scan past LUN 0.
++					 */
++					if (lun != 0 &&
++					    (EXT_IS_LUN_BIT_SET(
++						&(fcport->lun_mask), lun))) {
++
++						/* mask this LUN */
++						return FALSE;
++					}
++
++					if ((lq = qla2x00_lun_alloc(
++							vis_host->ha,
++							t, lun)) != NULL) {
++
++						lq->fclun = fclun;
++					}
++				}
++			}
++			else
++				status = TRUE;
++		}
++	}
++	return status;
++}
++
++/*
++ * qla2x00_is_ww_name_zero
++ *
++ * Input:
++ *      ww_name = Pointer to WW name to check
++ *
++ * Returns:
++ *      TRUE if name is 0 else FALSE
++ *
++ * Context:
++ *      Kernel context.
++ */
++static uint8_t
++qla2x00_is_ww_name_zero(uint8_t *nn)
++{
++	int cnt;
++
++	/* Check for zero node name */
++	for (cnt = 0; cnt < WWN_SIZE ; cnt++, nn++) {
++		if (*nn != 0)
++			break;
++	}
++	/* if zero return TRUE */
++	if (cnt == WWN_SIZE)
++		return TRUE;
++	else
++		return FALSE;
++}
++
++/*
++ * qla2x00_add_path
++ * Add a path to the pathlist
++ *
++ * Input:
++ * pathlist -- path list of paths
++ * path -- path to be added to list
++ *
++ * Returns:
++ *      None
++ *
++ * Context:
++ *      Kernel context.
++ */
++static void
++qla2x00_add_path( mp_path_list_t *pathlist, mp_path_t *path )
++{
++	mp_path_t *last = pathlist->last;
++
++	ENTER("qla2x00_add_path");
++
++	DEBUG3(printk("%s: pathlist =%p, path =%p, cnt = %d\n",
++	    __func__, pathlist, path, pathlist->path_cnt);)
++	if (last == NULL) {
++		last = path;
++	} else {
++		path->next = last->next;
++	}
++
++	last->next = path;
++	pathlist->last = path;
++	pathlist->path_cnt++;
++
++	LEAVE("qla2x00_add_path");
++}
++
++
++/*
++ * qla2x00_is_portname_in_device
++ *	Search for the specified "portname" in the device list.
++ *
++ * Input:
++ *	dp = device pointer
++ *	portname = portname to searched for in device
++ *
++ * Returns:
++ *      qla2x00 local function return status code.
++ *
++ * Context:
++ *      Kernel context.
++ */
++uint8_t
++qla2x00_is_portname_in_device(mp_device_t *dp, uint8_t *portname)
++{
++	int idx;
++
++	for (idx = 0; idx < MAX_PATHS_PER_DEVICE; idx++) {
++		if (memcmp(&dp->portnames[idx][0], portname, WWN_SIZE) == 0)
++			return TRUE;
++	}
++	return FALSE;
++}
++
++
++/*
++ *  qla2x00_set_lun_data_from_bitmask
++ *      Set or clear the LUN_DATA_ENABLED bits in the LUN_DATA from
++ *      a LUN bitmask provided from the miniport driver.
++ *
++ *  Inputs:
++ *      lun_data = Extended LUN_DATA buffer to set.
++ *      lun_mask = Pointer to lun bit mask union.
++ *
++ *  Return Value: none.
++ */
++void
++qla2x00_set_lun_data_from_bitmask(mp_lun_data_t *lun_data,
++    lun_bit_mask_t *lun_mask)
++{
++	int16_t	lun;
++
++	ENTER("qla2x00_set_lun_data_from_bitmask");
++
++	for (lun = 0; lun < MAX_LUNS; lun++) {
++		/* our bit mask is inverted */
++		if (!(EXT_IS_LUN_BIT_SET(lun_mask,lun)))
++			lun_data->data[lun] |= LUN_DATA_ENABLED;
++		else
++			lun_data->data[lun] &= ~LUN_DATA_ENABLED;
++
++		DEBUG5(printk("%s: lun data[%d] = 0x%x\n",
++		    __func__, lun, lun_data->data[lun]);)
++	}
++
++	LEAVE("qla2x00_set_lun_data_from_bitmask");
++
++	return;
++}
++
++static void
++qla2x00_failback_single_lun(mp_device_t *dp, uint8_t lun, uint8_t new)
++{
++	mp_path_list_t   *pathlist;
++	mp_path_t        *new_path, *old_path;
++	uint8_t 	old;
++	mp_host_t  *host;
++	os_lun_t *lq;
++	mp_path_t	*vis_path;
++	mp_host_t 	*vis_host;
++
++	/* Failback and update statistics. */
++	if ((pathlist = dp->path_list) == NULL)
++		return;
++
++	old = pathlist->current_path[lun];
++	pathlist->current_path[lun] = new;
++
++	if ((new_path = qla2x00_find_path_by_id(dp, new)) == NULL)
++		return;
++	if ((old_path = qla2x00_find_path_by_id(dp, old)) == NULL)
++		return;
++
++	/* An fclun should exist for the failbacked lun */
++	if (qla2x00_find_matching_lun(lun, new_path) == NULL)
++		return;
++	if (qla2x00_find_matching_lun(lun, old_path) == NULL)
++		return;
++
++	/* Log to console and to event log. */
++	printk(KERN_INFO
++		"qla2x00: FAILBACK device %d -> "
++		"%02x%02x%02x%02x%02x%02x%02x%02x LUN %02x\n",
++		dp->dev_id,
++		dp->nodename[0], dp->nodename[1],
++		dp->nodename[2], dp->nodename[3],
++		dp->nodename[4], dp->nodename[5],
++		dp->nodename[6], dp->nodename[7],
++		lun);
++
++	printk(KERN_INFO
++		"qla2x00: FROM HBA %d to HBA %d \n",
++		old_path->host->instance,
++		new_path->host->instance);
++
++
++	/* Send a failover notification. */
++#if 0
++	qla2x00_send_failover_notify(dp, lun, new_path, old_path);
++#endif
++
++	host = 	new_path->host;
++
++	/* remap the lun */
++	qla2x00_map_a_oslun(host, dp, dp->dev_id, lun);
++
++	/* 7/16
++	 * Reset counts on the visible path
++	 */
++	if ((vis_path = qla2x00_get_visible_path(dp)) == NULL) {
++		printk(KERN_INFO
++			"qla2x00(%d): No visible path for "
++			"target %d, dp = %p\n",
++			host->instance,
++			dp->dev_id, dp);
++		return;
++	}
++
++	vis_host = vis_path->host;
++	if ((lq = qla2x00_lun_alloc(vis_host->ha, dp->dev_id, lun)) != NULL) {
++		qla2x00_delay_lun(vis_host->ha, lq, recoveryTime);
++		qla2x00_flush_failover_q(vis_host->ha, lq);
++		qla2x00_reset_lun_fo_counts(vis_host->ha, lq);
++	}
++}
++
++/*
++*  qla2x00_failback_luns
++*      This routine looks through the devices on an adapter, and
++*      for each device that has this adapter as the visible path,
++*      it forces that path to be the current path.  This allows us
++*      to keep some semblance of static load balancing even after
++*      an adapter goes away and comes back.
++*
++*  Arguments:
++*      host          Adapter that has just come back online.
++*
++*  Return:
++*	None.
++*/
++static void
++qla2x00_failback_luns( mp_host_t  *host)
++{
++	uint16_t          dev_no;
++	uint8_t           l;
++	uint16_t          lun;
++	int i;
++	mp_device_t      *dp;
++	mp_path_list_t   *path_list;
++	mp_path_t        *path;
++	fc_lun_t	*new_fp;
++
++	ENTER("qla2x00_failback_luns");
++
++	for (dev_no = 0; dev_no < MAX_MP_DEVICES; dev_no++) {
++		dp = host->mp_devs[dev_no];
++
++		if (dp == NULL)
++			continue;
++
++		path_list = dp->path_list;
++		for (path = path_list->last, i= 0;
++			i < path_list->path_cnt;
++			i++, path = path->next) {
++
++			if (path->host != host )
++				continue;
++
++			if (path->port == NULL)
++				continue;
++
++			if (atomic_read(&path->port->state) == FC_DEVICE_DEAD)
++				continue;
++
++			/* 
++			 * Failback all the paths for this host,
++			 * the luns could be preferred across all paths 
++			 */
++			DEBUG2(printk("%s(%d): Lun Data for device %p, "
++			    "id=%d, path id=%d\n",
++			    __func__, host->instance, dp, dp->dev_id,
++			    path->id);)
++			DEBUG4(qla2x00_dump_buffer(
++			    (char *)&path->lun_data.data[0], 64);)
++			DEBUG4(printk("%s(%d): Perferrred Path data:\n",
++			    __func__, host->instance);)
++			DEBUG4(qla2x00_dump_buffer(
++			    (char *)&path_list->current_path[0], 64);)
++
++			for (lun = 0; lun < MAX_LUNS_PER_DEVICE; lun++) {
++				l = (uint8_t)(lun & 0xFF);
++
++				/*
++				 * if this is the preferred lun and not
++				 * the current path then failback lun.
++				 */
++				DEBUG4(printk("%s: target=%d, cur path id =%d, "
++				    "lun data[%d] = %d)\n",
++				    __func__, dp->dev_id, path->id,
++				    lun, path->lun_data.data[lun]);)
++
++				if ((path->lun_data.data[l] &
++						LUN_DATA_PREFERRED_PATH) &&
++					/* !path->relogin && */
++					path_list->current_path[l] !=
++						path->id) {
++					/* No point in failing back a
++					   disconnected lun */
++					new_fp = qla2x00_find_matching_lun(
++							l, path);
++
++					if (new_fp == NULL)
++						continue;
++					if (new_fp->flags & FC_DISCON_LUN)
++						continue;
++
++					qla2x00_failback_single_lun(
++							dp, l, path->id);
++				}
++			}
++		}
++
++	}
++
++	LEAVE("qla2x00_failback_luns");
++
++	return;
++}
++
++/*
++ *  qla2x00_setup_new_path
++ *      Checks the path against the existing paths to see if there
++ *      are any incompatibilities.  It then checks and sets up the
++ *      current path indices.
++ *
++ *  Inputs:
++ *      dp   =  pointer to device
++ *      path = new path
++ *
++ *  Returns:
++ *      None
++ */
++static void
++qla2x00_setup_new_path( mp_device_t *dp, mp_path_t *path)
++{
++	mp_path_list_t  *path_list = dp->path_list;
++	mp_path_t       *tmp_path, *first_path;
++	mp_host_t       *first_host;
++	mp_host_t       *tmp_host;
++
++	uint16_t	lun;
++	uint8_t		l;
++	int		i;
++
++	ENTER("qla2x00_setup_new_path");
++
++	/* If this is a visible path, and there is not already a
++	 * visible path, save it as the visible path.  If there
++	 * is already a visible path, log an error and make this
++	 * path invisible.
++	 */
++	if (!(path->mp_byte & (MP_MASK_HIDDEN | MP_MASK_UNCONFIGURED))) {
++
++		/* No known visible path */
++		if (path_list->visible == PATH_INDEX_INVALID) {
++			DEBUG3(printk("%s: No know visible path - make this "
++			    "path visible\n",
++			    __func__);)
++				
++			path_list->visible = path->id;
++			path->mp_byte &= ~MP_MASK_HIDDEN;
++		} else {
++			DEBUG3(printk("%s: Second visible path found- make "
++			    "this one hidden\n",
++			    __func__);)
++
++			path->mp_byte |= MP_MASK_HIDDEN;
++		}
++	}
++
++	/*
++	 * If this is not the first path added, and the setting for
++	 * MaxLunsPerTarget does not match that of the first path
++	 * then disable qla_cfg for all adapters.
++	 */
++	first_path = qla2x00_find_path_by_id(dp, 0);
++
++	if (first_path != NULL) {
++		first_host = first_path->host;
++		if ((path->id != 0) &&
++			(first_host->MaxLunsPerTarget !=
++			 path->host->MaxLunsPerTarget)) {
++
++			for (tmp_path = path_list->last, i = 0;
++				(tmp_path) && i <= path->id; i++) {
++
++				tmp_host = tmp_path->host;
++				if (!(tmp_host->flags &
++						MP_HOST_FLAG_DISABLE)) {
++
++					DEBUG4(printk("%s: 2nd visible "
++					    "path (%p)\n",
++					    __func__, tmp_host);)
++
++					tmp_host->flags |= MP_HOST_FLAG_DISABLE;
++				}
++			}
++		}
++	}
++
++	/*
++	 * For each LUN, evaluate whether the new path that is added
++	 * is better than the existing path.  If it is, make it the
++	 * current path for the LUN.
++	 */
++	for (lun = 0; lun < MAX_LUNS_PER_DEVICE; lun++) {
++		l = (uint8_t)(lun & 0xFF);
++
++		/* If this is the first path added, it is the only
++		 * available path, so make it the current path.
++		 */
++
++		DEBUG4(printk("%s: lun_data 0x%x, LUN %d\n",
++		    __func__, path->lun_data.data[l], lun);)
++
++		if (first_path == path) {
++			path_list->current_path[l] = 0;
++			path->lun_data.data[l] |=  LUN_DATA_PREFERRED_PATH;
++		} else if (path->lun_data.data[l] & LUN_DATA_PREFERRED_PATH) {
++			/*
++			 * If this is not the first path added, if this is
++			 * the preferred path, make it the current path.
++			 */
++			path_list->current_path[l] = path->id;
++		}
++	}
++
++	LEAVE("qla2x00_setup_new_path");
++
++	return;
++}
++
++/*
++ * qla2x00_cfg_mem_free
++ *     Free all configuration structures.
++ *
++ * Input:
++ *      ha = adapter state pointer.
++ *
++ * Context:
++ *      Kernel context.
++ */
++void
++qla2x00_cfg_mem_free(scsi_qla_host_t *ha)
++{
++	mp_device_t *dp;
++	mp_path_list_t  *path_list;
++	mp_path_t       *tmp_path, *path;
++	mp_host_t       *host, *temp;
++	int	id, cnt;
++
++	if ((host = qla2x00_cfg_find_host(ha)) != NULL) {
++		if( mp_num_hosts == 0 )
++			return;
++
++		for (id= 0; id < MAX_MP_DEVICES; id++) {
++			if ((dp = host->mp_devs[id]) == NULL)
++				continue;
++			if ((path_list = dp->path_list) == NULL)
++				continue;
++			if ((tmp_path = path_list->last) == NULL)
++				continue;
++			for (cnt = 0; cnt < path_list->path_cnt; cnt++) {
++				path = tmp_path;
++				tmp_path = tmp_path->next;
++				DEBUG(printk(KERN_INFO
++						"host%d - Removing path[%d] "
++						"= %p\n",
++						host->instance,
++						cnt, path);)
++				KMEM_FREE(path,sizeof(mp_path_t));
++			}
++			KMEM_FREE(path_list, sizeof(mp_path_list_t));
++			host->mp_devs[id] = NULL;
++			/* remove dp from other hosts */
++			for (temp = mp_hosts_base; (temp); temp = temp->next) {
++				if (temp->mp_devs[id] == dp) {
++					DEBUG(printk(KERN_INFO
++						"host%d - Removing host[%d] = "
++						"%p\n",
++						host->instance,
++						temp->instance,temp);)
++					temp->mp_devs[id] = NULL;
++				}
++			}
++			KMEM_FREE(dp, sizeof(mp_device_t));
++		}
++
++		/* remove this host from host list */
++		temp = mp_hosts_base;
++		if (temp != NULL) {
++			/* Remove from top of queue */
++			if (temp == host) {
++				mp_hosts_base = host->next;
++			} else {
++				/*
++				 * Remove from middle of queue
++				 * or bottom of queue
++				 */
++				for (temp = mp_hosts_base;
++						temp != NULL;
++						temp = temp->next) {
++
++					if (temp->next == host) {
++						temp->next = host->next;
++						break;
++					}
++				}
++			}
++		}
++		KMEM_FREE(host, sizeof(mp_host_t));
++		mp_num_hosts--;
++	}
++}
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qla_cfg.h	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,181 @@
++/******************************************************************************
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ ******************************************************************************/
++
++/*
++ * QLogic ISP2x00 Multi-path LUN Support
++ * Multi-path include file.
++ */
++
++#if !defined(_QLA_CFG_H)
++#define	_QLA_CFG_H
++
++#if defined(__cplusplus)
++extern "C"
++{
++#endif
++
++/*
++ * Failover definitions
++ */
++#define FAILOVER_TYPE_COUNT		4
++#define MP_NOTIFY_RESET_DETECTED	1
++#define MP_NOTIFY_PWR_LOSS		2
++#define MP_NOTIFY_LOOP_UP		3
++#define MP_NOTIFY_LOOP_DOWN		4
++#define MP_NOTIFY_BUS_RESET		5
++#define FAILOVER_TYPE_ERROR_RETRY	1
++#define MAX_NUMBER_PATHS		FO_MAX_PATHS
++#define PORT_NAME_SIZE			WWN_SIZE
++#define FAILOVER_NOTIFY_STATUS_ERROR	QLA2X00_SUCCESS
++#define FAILOVER_NOTIFY_STATUS_SUCCESS  QLA2X00_SUCCESS
++#define FAILOVER_NOTIFY_CDB_LENGTH_MAX	FO_NOTIFY_CDB_LENGTH_MAX
++#define MAX_TARGETS_PER_DEVICE		SDM_DEF_MAX_TARGETS_PER_DEVICE
++
++/*
++ * Limits definitions.
++ */
++#define MAX_LUNS_PER_DEVICE	MAX_LUNS	/* Maximum # of luns */
++#define MAX_MP_DEVICES		MAX_TARGETS	/* Maximum # of virtual devs */
++#define MAX_PATHS_PER_DEVICE	8		/* Maximum # of paths */
++#if !defined(MAX_LUNS)
++#define	MAX_LUNS		256
++#endif
++#define MAX_HOSTS		MAX_HOST_COUNT
++
++/* Async notification types */
++#define NOTIFY_EVENT_LINK_DOWN      1		/* Link went down */
++#define NOTIFY_EVENT_LINK_UP        2		/* Link is back up */
++#define NOTIFY_EVENT_RESET_DETECTED 3		/* Reset detected */
++
++/* MACROS */
++#define qla2x00_is_portname_equal(N1,N2) \
++	((memcmp((N1),(N2),WWN_SIZE)==0?TRUE:FALSE))
++#define qla2x00_is_nodename_equal(N1,N2) \
++	((memcmp((N1),(N2),WWN_SIZE)==0?TRUE:FALSE))
++#if 0
++#define qla2x00_allocate_path_list() \
++    ((mp_path_list_t *)KMEM_ZALLOC(sizeof(mp_path_list_t)))
++#endif
++
++/*
++ * Per-multipath driver parameters
++ */
++typedef struct _mp_lun_data {
++	uint8_t 	data[MAX_LUNS];
++#define LUN_DATA_ENABLED		BIT_7
++#define LUN_DATA_PREFERRED_PATH		BIT_6
++}
++mp_lun_data_t;
++
++
++#define PATH_INDEX_INVALID		0xff
++
++/*
++ * Per-device collection of all paths.
++ */
++typedef struct _mp_path_list {
++	struct _mp_path *last;		/* ptrs to end of circular list of paths */
++	uint8_t		path_cnt;	/* number of paths */
++	uint8_t		visible;	/* visible path */
++	uint16_t	reserved1;	/* Memory alignment */
++	uint32_t	reserved2;	/* Memory alignment */
++	uint8_t		current_path[ MAX_LUNS_PER_DEVICE ]; /* current path for a given lun */
++	uint16_t	failover_cnt[ FAILOVER_TYPE_COUNT ];
++}
++mp_path_list_t;
++
++/*
++ * Definitions for failover notify SRBs.  These SRBs contain failover notify
++ * CDBs to notify a target that a failover has occurred.
++ *
++ */
++typedef struct _failover_notify_srb {
++	srb_t		*srb;
++	uint16_t	status;
++	uint16_t	reserved;
++}
++failover_notify_srb_t;
++
++/*
++ * Per-device multipath control data.
++ */
++typedef struct _mp_device {
++	mp_path_list_t	*path_list;		/* Path list for device.  */
++	int				dev_id;
++	int			use_cnt;	/* number of users */
++	uint8_t         nodename[WWN_SIZE];	/* World-wide node name. */
++	/* World-wide port names. */
++	uint8_t         portnames[MAX_PATHS_PER_DEVICE][WWN_SIZE];
++}
++mp_device_t;
++
++/*
++ * Per-adapter multipath Host
++ */
++typedef struct _mp_host {
++	struct _mp_host	*next;	/* ptr to next host adapter in list */
++	scsi_qla_host_t	*ha;	/* ptr to lower-level driver adapter struct */
++	int		instance;	/* OS instance number */
++	struct list_head *fcports;	/* Port chain for this adapter */
++	mp_device_t	*mp_devs[MAX_MP_DEVICES]; /* Multipath devices */
++
++	uint32_t	flags;
++#define MP_HOST_FLAG_NEEDS_UPDATE  BIT_0  /* Need to update device data. */
++#define MP_HOST_FLAG_FO_ENABLED	   BIT_1  /* Failover enabled for this host */
++#define MP_HOST_FLAG_DISABLE	   BIT_2  /* Bypass qla_cfg. */
++#define MP_HOST_FLAG_LUN_FO_ENABLED   BIT_3  /* lun Failover enabled */
++
++	uint8_t		nodename[WWN_SIZE];
++	uint8_t		portname[WWN_SIZE];
++	uint16_t	MaxLunsPerTarget;
++
++	uint16_t	relogin_countdown;
++}
++mp_host_t;
++
++/*
++ * Describes path a single.
++ */
++typedef struct _mp_path {
++	struct _mp_path  *next;			/* next path in list  */
++	struct _mp_host *host;			/* Pointer to adapter */
++	fc_port_t	*port;			/* FC port info  */
++	uint16_t       id;			/* Path id (index) */
++	uint8_t        mp_byte;			/* Multipath control byte */
++#define MP_MASK_HIDDEN	0x80
++#define MP_MASK_UNCONFIGURED	0x40
++#define MP_MASK_PRIORITY	0x07
++
++	uint8_t        relogin;			/* Need to relogin to port */
++	uint8_t        config;			/* User configured path	*/
++	uint8_t        reserved[3];
++	mp_lun_data_t	lun_data;		/* Lun data information */
++	uint8_t        portname[WWN_SIZE];	/* Port name of this target. */
++}
++mp_path_t;
++
++/*
++ * Failover notification requests from host driver.
++ */
++typedef struct failover_notify_entry {
++	struct scsi_address		*os_addr;
++}
++failover_notify_t;
++
++#endif /* _QLA_CFG_H */
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qla_cfgln.c	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,726 @@
++/******************************************************************************
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ ******************************************************************************/
++
++/*
++ * QLogic ISP2x00 Multi-path LUN Support Driver 
++ * Solaris specific functions
++ *
++ */
++
++#include "qla_os.h"
++#include "qla_def.h"
++
++#include "qlfo.h"
++
++#define MAX_SEARCH_STR_SIZE	512
++
++/*
++ * qla2x00_set_lun_data_from_config
++ * Set lun_data byte from the configuration parameters.
++ *
++ * Input:
++ * host -- pointer to host adapter structure.
++ * port -- pointer to port
++ * tgt  -- target number
++ * dev_no  -- device number
++ */
++void
++qla2x00_set_lun_data_from_config(mp_host_t *host, fc_port_t *port,
++    uint16_t tgt, uint16_t dev_no)
++{
++	char		*propbuf;  /* As big as largest search string */
++	int		rval;
++	int16_t		lun, l;
++	scsi_qla_host_t *ha = host->ha;
++	mp_device_t	*dp;
++	lun_bit_mask_t	*plun_mask;
++	lun_bit_mask_t  *mask_ptr;
++	mp_path_list_t	*pathlist;
++#if 0
++	uint8_t		control_byte;
++#endif
++
++	mp_path_t *path;
++
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&propbuf,
++	    MAX_SEARCH_STR_SIZE)) {
++		/* not enough memory */
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "propbuf requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    MAX_SEARCH_STR_SIZE);)
++		return;
++	}
++
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&plun_mask,
++	    sizeof(lun_bit_mask_t))) {
++		/* not enough memory */
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "lun_mask requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(lun_bit_mask_t));)
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return;
++	}
++	mask_ptr = plun_mask;
++
++	dp = host->mp_devs[tgt];
++	if (dp == NULL) {
++		printk("qla2x00_set_lun_data_from_config: Target %d "
++		    "not found for hba %d\n",tgt, host->instance);
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return;
++	}
++	if ( (pathlist = dp->path_list) == NULL ) {
++		printk("qla2x00_set_lun_data_from_config: path list "
++		    "not found for target %d\n", tgt);
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return;
++	}
++
++	if ((path = qla2x00_find_path_by_name(host, pathlist,
++	    port->port_name)) == NULL ) {
++		printk("qla2x00_set_lun_data_from_config: No path found "
++		    "for target %d\n", tgt);
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return;
++	}
++
++	/* clear port information */
++	path->port = NULL;
++
++#if 0
++	/* 02/06/01 - move to build path tree */
++	/*
++	 * Get "target-N-device-N-control" if property is present then all
++	 * luns are visible.
++	 */
++	sprintf(propbuf, "scsi-qla%d-tgt-%d-di-%d-control",
++			host->instance, tgt, dev_no);
++	DEBUG3(printk("build_tree: %s\n",propbuf);)
++	rval = qla2x00_get_prop_xstr(ha, propbuf,
++			(uint8_t *)(&control_byte), sizeof(control_byte));
++	if (rval != -1) {
++		if (!((control_byte & MP_MASK_HIDDEN) ||
++			(control_byte & MP_MASK_UNCONFIGURED))) {
++			pathlist->visible = path->id;
++			DEBUG(printk("qla2x00_set_lun_data_from_config: "
++					"found visible path id %d hba %d\n",
++					path->id, host->instance);)
++		} else {
++			pathlist->visible = PATH_INDEX_INVALID; /* 01/30 */
++			DEBUG(printk("qla2x00_set_lun_data_from_config: "
++					"found hidden path id %d hba %d\n",
++					path->id, host->instance);)
++		}
++		path->mp_byte = control_byte;
++		DEBUG(printk("qla2x00_set_lun_data_from_config: "
++				"control byte 0x%x for path id %d hba %d\n",
++				path->mp_byte, path->id, host->instance);)
++	}
++#endif
++
++	/* Get "target-N-device-N-preferred" as a 256 bit lun_mask*/
++	sprintf(propbuf, "scsi-qla%ld-tgt-%d-di-%d-preferred",
++	    ha->instance, tgt, dev_no);
++	DEBUG2(printk("build_tree: %s\n",propbuf);)
++
++	rval = qla2x00_get_prop_xstr(ha, propbuf,
++	    (uint8_t *)(plun_mask), sizeof(lun_bit_mask_t));
++
++	if (rval == -1) {
++		/* EMPTY */
++		DEBUG2(printk("qla2x00_set_lun_data_from_config: "
++		    "NO Preferred mask  - ret %d\n", rval);)
++	} else {
++		if (rval != sizeof(lun_bit_mask_t)) {
++			/* EMPTY */
++			printk("qla2x00_set_lun_data_from_config: "
++			    "Preferred mask len %d is incorrect.\n", rval);
++		}
++
++		DEBUG3(printk("qla2x00_set_lun_data_from_config: "
++		    "Preferred mask read:\n");)
++		DEBUG3(qla2x00_dump_buffer((char *)plun_mask,
++		    sizeof(lun_bit_mask_t));)
++
++		for (lun = MAX_LUNS-1, l =0; lun >= 0; lun--, l++ ) {
++			if (EXT_IS_LUN_BIT_SET(mask_ptr, lun)) {
++				path->lun_data.data[l] |=
++				    LUN_DATA_PREFERRED_PATH;
++				pathlist->current_path[l] = path->id;
++			} else {
++				path->lun_data.data[l] &=
++				    ~LUN_DATA_PREFERRED_PATH;
++			}
++		}
++
++	}
++
++	/* Get "target-N-device-N-lun-disable" as a 256 bit lun_mask*/
++	sprintf(propbuf, "scsi-qla%ld-tgt-%d-di-%d-lun-disabled",
++	    ha->instance, tgt, dev_no);
++	DEBUG3(printk("build_tree: %s\n",propbuf);)
++
++	rval = qla2x00_get_prop_xstr(ha, propbuf,
++	    (uint8_t *)plun_mask, sizeof(lun_bit_mask_t));
++	if (rval == -1) {
++		/* default: all luns enabled */
++		for (lun = 0; lun < MAX_LUNS; lun++) {
++			path->lun_data.data[lun] |= LUN_DATA_ENABLED;
++		}
++	} else {
++		if (rval != sizeof(lun_bit_mask_t)) {
++			printk("qla2x00_set_lun_data_from_config: Enable "
++			    "mask has wrong size %d != %d\n",
++			    rval, (int)sizeof(lun_bit_mask_t));
++		} else {
++			for (lun = MAX_LUNS-1, l =0; lun >= 0; lun--, l++) {
++				/* our bit mask is inverted */
++				if (!EXT_IS_LUN_BIT_SET(mask_ptr,lun))
++					path->lun_data.data[l] |=
++					    LUN_DATA_ENABLED;
++				else
++					path->lun_data.data[l] &=
++					    ~LUN_DATA_ENABLED;
++			}
++		}
++	}
++
++	DEBUG3(printk("qla2x00_set_lun_data_from_config: Luns data for "
++	    "device %p, instance %d, path id=%d\n",
++	    dp,host->instance,path->id);)
++	DEBUG3(qla2x00_dump_buffer((char *)&path->lun_data.data[0], 64);)
++
++	qla2x00_free_ioctl_scrap_mem(ha);
++	LEAVE("qla2x00_set_lun_data_from_config");
++}
++
++
++
++/*
++ * qla2x00_cfg_build_path_tree
++ *	Find all path properties and build a path tree. The
++ *  resulting tree has no actual port assigned to it
++ *  until the port discovery is done by the lower level.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *
++ * Context:
++ *	Kernel context.
++ */
++void
++qla2x00_cfg_build_path_tree(scsi_qla_host_t *ha)
++{
++	char		*propbuf;
++	uint8_t		node_name[WWN_SIZE];
++	uint8_t		port_name[WWN_SIZE];
++	fc_port_t	*port;
++	uint16_t	dev_no = 0, tgt_no;
++	int		instance, rval;
++	mp_host_t	*host = NULL;
++	uint8_t		*name;
++	int		done;
++	uint8_t         control_byte;
++
++
++	ENTER("qla2x00_cfg_build_path_tree");
++
++	printk(KERN_INFO
++	    "qla02%d: ConfigRequired is set. \n", (int)ha->instance);
++	DEBUG(printk("qla2x00_cfg_build_path_tree: hba =%d",
++	    (int)ha->instance);)
++
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&propbuf,
++	    MAX_SEARCH_STR_SIZE)) {
++		/* not enough memory */
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "propbuf requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    MAX_SEARCH_STR_SIZE);)
++		return;
++	}
++
++	/* Look for adapter nodename in properties */
++	sprintf(propbuf, "scsi-qla%ld-adapter-port", ha->instance);
++	DEBUG(printk("build_tree: %s\n",propbuf);)
++
++	rval = qla2x00_get_prop_xstr(ha, propbuf, port_name, WWN_SIZE);
++	if (rval != WWN_SIZE) {
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return;
++	}
++
++	/* Does nodename match the host adapter nodename? */
++	name = 	&ha->init_cb->port_name[0];
++	if (!qla2x00_is_nodename_equal(name, port_name)) {
++		printk(KERN_INFO
++		    "scsi(%d): Adapter nodenames don't match - ha = %p.\n",
++		    (int)ha->instance,ha);
++		DEBUG(printk("qla(%d): Adapter nodenames don't match - "
++		    "ha = %p.\n",
++		    (int)ha->instance,ha);)
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return;
++	}
++
++	instance = ha->instance;
++	if ((host = qla2x00_alloc_host(ha)) == NULL) {
++		printk(KERN_INFO
++		    "scsi(%d): Couldn't allocate host - ha = %p.\n",
++		    (int)instance,ha);
++	} else {
++		/* create a dummy port */
++		port = (fc_port_t *)KMEM_ZALLOC(sizeof (fc_port_t),9);
++		if (port == NULL) {
++			printk(KERN_INFO
++			    "scsi(%d): Couldn't allocate port.\n",
++			    (int)instance);
++			DEBUG(printk("qla(%d): Couldn't allocate port.\n",
++			    (int)host->instance);)
++			/* remove host */
++			qla2x00_free_ioctl_scrap_mem(ha);
++			return;
++		}
++
++		done = 0;
++
++		/* For each target on the host bus adapter */
++		for (tgt_no = 0; tgt_no < MAX_MP_DEVICES &&
++		    !done; tgt_no++) {
++
++			/* get all paths for this target */
++			for (dev_no = 0; dev_no < MAX_PATHS_PER_DEVICE &&
++			    !done ; dev_no++) {
++
++				/*
++				 * O(N*M) scan, should ideally check if there
++				 * are any tgt entries present, if not, then
++				 * continue.
++				 *
++				 *   sprintf(propbuf,
++				 * 		"scsi-qla%d-tgt-%d-",
++				 *		instance, tgt_no);
++				 *   if (strstr(ha->cmdline, propbuf) == NULL)
++				 *	continue;
++				 *
++				 */
++				memset(port, 0, sizeof (fc_port_t));
++
++				/*
++				 * Get "target-N-device-N-node" is a 16-chars
++				 * number
++				 */
++				sprintf(propbuf, "scsi-qla%d-tgt-%d-di-%d-node",
++				    instance, tgt_no, dev_no);
++				DEBUG(printk("build_tree: %s\n",propbuf);)
++
++				rval = qla2x00_get_prop_xstr(ha, propbuf,
++				    node_name, WWN_SIZE);
++				if (rval != WWN_SIZE)
++					continue;
++
++				memcpy(port->node_name, node_name, WWN_SIZE);
++
++				/*
++				 * Get "target-N-device-N-port" is a 16-chars
++				 * number
++				 */
++				sprintf(propbuf, "scsi-qla%d-tgt-%d-di-%d-port",
++				    instance,  tgt_no, dev_no);
++				DEBUG(printk("build_tree: %s\n",propbuf);)
++
++				rval = qla2x00_get_prop_xstr(ha, propbuf,
++				    port_name, WWN_SIZE);
++				if (rval != WWN_SIZE)
++					continue;
++
++				memcpy(port->node_name, node_name, WWN_SIZE);
++				memcpy(port->port_name, port_name, WWN_SIZE);
++				port->flags |= FC_CONFIG;
++
++				/*
++				 * Get "target-N-device-N-control" if property 
++				 * is present then all luns are visible.
++				 */
++				sprintf(propbuf,
++				    "scsi-qla%d-tgt-%d-di-%d-control",
++				    instance, tgt_no, dev_no);
++				DEBUG3(printk("build_tree: %s\n",propbuf);)
++
++				rval = qla2x00_get_prop_xstr(ha, propbuf,
++				    (uint8_t *)(&control_byte),
++				    sizeof(control_byte));
++				if (rval == -1) {
++					/* error getting string. go to next. */
++					continue;
++				}
++
++				DEBUG(printk("build_tree: control byte 0x%x\n",
++				    control_byte);)
++
++				port->mp_byte = control_byte;
++				DEBUG(printk("build_tree: update_mp_device "
++				    "host=%p, port=%p, tgt_no=%d\n",
++				    host, port, tgt_no);)
++
++				qla2x00_update_mp_device(host, port, tgt_no);
++				qla2x00_set_lun_data_from_config(host,
++				    port, tgt_no, dev_no);
++			}
++		}
++		KMEM_FREE(port, sizeof (fc_port_t));
++	}
++
++	qla2x00_free_ioctl_scrap_mem(ha);
++
++	LEAVE("qla2x00_cfg_build_path_tree");
++	DEBUG(printk("Leaving: qla2x00_cfg_build_path_tree\n");)
++}
++
++/*
++ * qla2x00_cfg_display_devices
++ *      This routine will the node names of the different devices found
++ *      after port inquiry.
++ *
++ * Input:
++ *
++ * Returns:
++ *      None.
++ */
++void qla2x00_cfg_display_devices(void)
++{
++	mp_host_t     *host;
++	int     id;
++	mp_device_t	*dp;
++	mp_path_t  *path;
++	mp_path_list_t	*path_list;
++	int cnt, i, dev_no;
++	int instance;
++	lun_bit_mask_t	lun_mask;
++	int	mask_set;
++	uint8_t	l;
++
++	printk("qla2x00_cfg_display_devices\n");
++	for (host = mp_hosts_base; (host); host = host->next) {
++
++		instance = (int) host->instance;
++		/* Display the node name for adapter */
++		printk(KERN_INFO
++			"scsi-qla%d-adapter-port="
++			"%02x%02x%02x%02x%02x%02x%02x%02x\\;\n",
++			instance,
++			host->portname[0],
++			host->portname[1],
++			host->portname[2],
++			host->portname[3],
++			host->portname[4],
++			host->portname[5],
++			host->portname[6],
++			host->portname[7]);
++
++		for (id = 0; id < MAX_MP_DEVICES; id++) {
++			if( (dp = host->mp_devs[id] ) == NULL )
++				continue;
++
++			path_list = dp->path_list;
++
++
++			if( (path = path_list->last) != NULL ) {
++				/* Print out device port names */
++				path = path->next; /* first path */
++				for (dev_no = 0,  cnt = 0;
++					cnt < path_list->path_cnt;
++					path = path->next, cnt++) {
++
++					/* skip others if not our host */
++					if (host != path->host)
++						continue;
++					printk(KERN_INFO
++						"scsi-qla%d-tgt-%d-di-%d-node="
++						"%02x%02x%02x%02x"
++						"%02x%02x%02x%02x\\;\n",
++						instance, id, path->id,
++						dp->nodename[0],
++						dp->nodename[1],
++						dp->nodename[2],
++						dp->nodename[3],
++						dp->nodename[4],
++						dp->nodename[5],
++						dp->nodename[6],
++						dp->nodename[7]);
++
++					/* port_name */
++					printk(KERN_INFO
++						"scsi-qla%d-tgt-%d-di-%d-port="
++						"%02x%02x%02x%02x"
++						"%02x%02x%02x%02x\\;\n",
++						instance, id, path->id,
++						path->portname[0],
++						path->portname[1],
++						path->portname[2],
++						path->portname[3],
++						path->portname[4],
++						path->portname[5],
++						path->portname[6],
++						path->portname[7]);
++
++					/* control byte */
++					printk(KERN_INFO
++						"scsi-qla%d-tgt-%d-di-%d-"
++						"control=%02x\\;\n",
++						instance, id, path->id,
++						path->mp_byte);
++
++					/*
++					 * Build preferred bit mask for this
++					 * path */
++					memset(&lun_mask, 0, sizeof(lun_mask));
++					mask_set = 0;
++					for (i = 0; i < MAX_LUNS; i++) {
++						l = (uint8_t)(i & 0xFF);
++						if (path_list->current_path[l] == path->id ) {
++							EXT_SET_LUN_BIT((&lun_mask),l);
++							mask_set++;
++						}
++					}
++					if (mask_set) {
++						printk(KERN_INFO
++							"scsi-qla%d-tgt-%d-di-%d-preferred=%08x%08x%08x%08x%08x%08x%08x%08x\\;\n",
++							instance,  id, path->id,
++							*((uint32_t *) &lun_mask.mask[28]),
++							*((uint32_t *) &lun_mask.mask[24]),
++							*((uint32_t *) &lun_mask.mask[20]),
++							*((uint32_t *) &lun_mask.mask[16]),
++							*((uint32_t *) &lun_mask.mask[12]),
++							*((uint32_t *) &lun_mask.mask[8]),
++							*((uint32_t *) &lun_mask.mask[4]),
++							*((uint32_t *) &lun_mask.mask[0]) );
++					}
++					/*
++					 * Build disable bit mask for this path
++					 */
++					mask_set = 0;
++					for (i = 0; i < MAX_LUNS; i++) {
++						l = (uint8_t)(i & 0xFF);
++						if (!(path->lun_data.data[l] &
++							LUN_DATA_ENABLED) ) {
++
++							mask_set++;
++						}
++					}
++					if (mask_set) {
++						printk(KERN_INFO
++							"scsi-qla%d-tgt-%d-di-%d-lun-disable=%08x%08x%08x%08x%08x%08x%08x%08x\\;\n",
++							instance,  id, path->id,
++							*((uint32_t *) &lun_mask.mask[28]),
++							*((uint32_t *) &lun_mask.mask[24]),
++							*((uint32_t *) &lun_mask.mask[20]),
++							*((uint32_t *) &lun_mask.mask[16]),
++							*((uint32_t *) &lun_mask.mask[12]),
++							*((uint32_t *) &lun_mask.mask[8]),
++							*((uint32_t *) &lun_mask.mask[4]),
++							*((uint32_t *) &lun_mask.mask[0]) );
++					}
++					dev_no++;
++				}
++
++			}
++		}
++	}
++}
++
++#if 0
++int qla2x00_cfg_build_range( mp_path_t *path, uint8_t *buf, int siz, uint8_t mask )
++{
++        int 	i;
++        int	max, min;
++        int	colonflg = FALSE;
++        int	len = 0;
++
++        max = -1;
++        min = 0;
++        for (i = 0; i < MAX_LUNS; i++) {
++                if( (path->lun_data.data[i] & mask) ) {
++                        max = i;
++                } else {
++                        if( colonflg && max >= min ) {
++                                len += sprintf(&buf[len],":");
++                                if( len > siz)
++                                        return len;
++                                colonflg = FALSE;
++                        }
++                        if (max > min ) {
++                                len += sprintf(&buf[len],"%02x-%02x",min,max);
++                                if( len > siz)
++                                        return len;
++                                colonflg = TRUE;
++                        } else if ( max == min ) {
++                                len += sprintf(&buf[len],"%02x",max);
++                                if( len > siz)
++                                        return len;
++                                colonflg = TRUE;
++                        }
++                        min = i + 1;
++                        max = i;
++                }
++        }
++        DEBUG4(printk("build_range: return len =%d\n",len);)
++        return(len);
++}
++#endif
++
++#if 0
++/*
++ * qla2x00_cfg_proc_display_devices
++ *      This routine will the node names of the different devices found
++ *      after port inquiry.
++ *
++ * Input:
++ *
++ * Returns:
++ *      None.
++ */
++int qla2x00_cfg_proc_display_devices(scsi_qla_host_t *ha)
++{
++        mp_host_t     *host;
++        int     id;
++        mp_device_t	*dp;
++        mp_path_t  *path;
++        mp_path_list_t	*path_list;
++        int cnt, i;
++        int instance;
++        lun_bit_mask_t	lun_mask;
++        int	mask_set;
++        uint8_t	l;
++        fc_port_t 	*port;
++        int len = 0;
++
++        for (host = mp_hosts_base; (host); host = host->next) {
++
++                if( host->ha != ha )
++                        continue;
++
++                instance = (int) host->instance;
++
++                /* Display the node name for adapter */
++                len += sprintf(PROC_BUF,
++                                "scsi-qla%d-adapter-node="
++				"%02x%02x%02x%02x%02x%02x%02x%02x;\n",
++                                instance,
++                                host->nodename[0],
++                                host->nodename[1],
++                                host->nodename[2],
++                                host->nodename[3],
++                                host->nodename[4],
++                                host->nodename[5],
++                                host->nodename[6],
++                                host->nodename[7]);
++
++
++                for (id = 0; id < MAX_MP_DEVICES; id++) {
++                        if( (dp = host->mp_devs[id] ) == NULL )
++                                continue;
++
++                        path_list = dp->path_list;
++
++                        if( (path = path_list->last) != NULL ) {
++                                /* Print out device port names */
++                                path = path->next; /* first path */
++                                for (cnt = 0; cnt < path_list->path_cnt; path = path->next, cnt++) {
++                                        /* skip others if not our host */
++                                        if (host != path->host)
++                                                continue;
++                                        len += sprintf(PROC_BUF,
++                                                       "scsi-qla%d-target-%d-path-%d-node=%02x%02x%02x%02x%02x%02x%02x%02x;\n",
++                                                       instance,  id, path->id,
++                                                       dp->nodename[0],
++                                                       dp->nodename[1],
++                                                       dp->nodename[2],
++                                                       dp->nodename[3],
++                                                       dp->nodename[4],
++                                                       dp->nodename[5],
++                                                       dp->nodename[6],
++                                                       dp->nodename[7]);
++
++                                        /* port_name */
++                                        len += sprintf(PROC_BUF,
++                                                       "scsi-qla%d-target-%d-path-%d-port=%02x%02x%02x%02x%02x%02x%02x%02x;\n",
++                                                       instance,  id, path->id,
++                                                       path->portname[0],
++                                                       path->portname[1],
++                                                       path->portname[2],
++                                                       path->portname[3],
++                                                       path->portname[4],
++                                                       path->portname[5],
++                                                       path->portname[6],
++                                                       path->portname[7]);
++
++                                        if( path_list->visible == path->id ) {
++                                                len += sprintf(PROC_BUF, "scsi-qla%d-target-%d-path-%d-visible=%02x;\n",
++                                                               instance,  id, path->id, path->id);
++                                        }
++
++                                        len +=sprintf(PROC_BUF, "scsi-qla%d-target-%d-path-%d-control=%02x;\n",
++                                                      instance,  id, path->id, path->mp_byte);
++
++                                        /* Build preferred bit mask for this path */
++                                        memset(&lun_mask, 0, sizeof(lun_mask));
++                                        mask_set = 0;
++                                        for (i = 0; i < MAX_LUNS_PER_DEVICE; i++) {
++                                                l = (uint8_t)(i & 0xFF);
++                                                if( path_list->current_path[l] == path->id ) {
++                                                        EXT_SET_LUN_BIT((&lun_mask),l);
++                                                        mask_set++;
++                                                }
++                                        }
++                                        if( mask_set && EXT_DEF_MAX_LUNS <= 256 ) {
++                                                len += sprintf(PROC_BUF,
++                                                               "scsi-qla%d-target-%d-path-%d-preferred=%08x%08x%08x%08x%08x%08x%08x%08x;\n",
++                                                               instance,  id, path->id,
++                                                               *((uint32_t *) &lun_mask.mask[0]),
++                                                               *((uint32_t *) &lun_mask.mask[4]),
++                                                               *((uint32_t *) &lun_mask.mask[8]),
++                                                               *((uint32_t *) &lun_mask.mask[12]),
++                                                               *((uint32_t *) &lun_mask.mask[16]),
++                                                               *((uint32_t *) &lun_mask.mask[20]),
++                                                               *((uint32_t *) &lun_mask.mask[24]),
++                                                               *((uint32_t *) &lun_mask.mask[28]) );
++                                        }
++
++                                        len += sprintf(PROC_BUF,
++                                                       "scsi-qla%d-target-%d-path-%d-lun-enable=%08x%08x%08x%08x%08x%08x%08x%08x;\n",
++                                                       instance,  id, path->id,
++                                                       *((uint32_t *) &path->lun_data.data[0]),
++                                                       *((uint32_t *) &path->lun_data.data[4]),
++                                                       *((uint32_t *) &path->lun_data.data[8]),
++                                                       *((uint32_t *) &path->lun_data.data[12]),
++                                                       *((uint32_t *) &path->lun_data.data[16]),
++                                                       *((uint32_t *) &path->lun_data.data[20]),
++                                                       *((uint32_t *) &path->lun_data.data[24]),
++                                                       *((uint32_t *) &path->lun_data.data[28]) );
++
++                                } /* for */
++                        }
++                }
++        }
++        return( len );
++}
++#endif
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qla_dbg.c	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,1000 @@
++/*
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ */
++#include "qla_os.h"
++
++#include "qla_def.h"
++
++
++#if defined(ISP2300)
++/**
++ * qla2x00_fw_dump() - Dumps binary data from the 2300 firmware.
++ * @ha: SCSI driver HA context
++ * @hardware_locked: Called with the hardware_lock
++ */
++void
++qla2x00_dump_isp(scsi_qla_host_t *ha, int hardware_locked)
++{
++	int		rval;
++	uint32_t	i;
++	uint32_t	cnt, timer;
++	uint32_t	risc_address;
++	uint16_t	risc_code_size;
++	uint16_t	mb0, mb2;
++
++	uint16_t	data, stat;
++	device_reg_t	*reg;
++	uint16_t	*dmp_reg;
++	unsigned long	flags;
++
++
++	reg = ha->iobase;
++	flags = 0;
++
++	if (!hardware_locked)
++		spin_lock_irqsave(&ha->hardware_lock, flags);
++
++	printk("\n\n[==>BEG]\n");
++
++	printk("HCCR Register:\n");
++	printk("%04x\n\n", RD_REG_WORD(&reg->hccr));
++
++	WRT_REG_WORD(&reg->hccr, HCCR_PAUSE_RISC); 
++	SYS_DELAY(100);
++
++	printk("PBIU Registers:\n");
++	dmp_reg = (uint16_t *)(reg + 0);
++	for (i = 0; i < 8; i++) 
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++
++	printk("\n\n");
++
++	printk("ReqQ-RspQ-Risc2Host Status registers:\n");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0x10);
++	for (i = 0; i < 8; i++) 
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++
++	printk("\n\n");
++
++	printk("Mailbox Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0x40);
++	for (i = 0; i < 32; i++) {
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	WRT_REG_WORD(&reg->ctrl_status, 0x40);
++	printk("Auto Request Response DMA Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
++	for (i = 0; i < 32; i++) {
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	WRT_REG_WORD(&reg->ctrl_status, 0x50); 
++	printk("DMA Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
++	for (i = 0; i < 48; i++) {
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	WRT_REG_WORD(&reg->ctrl_status, 0x00); 
++	printk("RISC Hardware Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0xA0);
++	for (i = 0; i < 16; i++) {
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	WRT_REG_WORD(&reg->pcr, 0x2000); 
++	printk("RISC GP0 Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
++	for (i = 0; i < 16; i++) {
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	WRT_REG_WORD(&reg->pcr, 0x2200); 
++	printk("RISC GP1 Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
++	for (i = 0; i < 16; i++) {
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	WRT_REG_WORD(&reg->pcr, 0x2400); 
++	printk("RISC GP2 Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
++	for (i = 0; i < 16; i++) {
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	WRT_REG_WORD(&reg->pcr, 0x2600); 
++	printk("RISC GP3 Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
++	for (i = 0; i < 16; i++) {
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	WRT_REG_WORD(&reg->pcr, 0x2800); 
++	printk("RISC GP4 Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
++	for (i = 0; i < 16; i++) {
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	WRT_REG_WORD(&reg->pcr, 0x2A00); 
++	printk("RISC GP5 Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
++	for (i = 0; i < 16; i++) {
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	WRT_REG_WORD(&reg->pcr, 0x2C00); 
++	printk("RISC GP6 Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
++	for (i = 0; i < 16; i++) {
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	WRT_REG_WORD(&reg->pcr, 0x2E00); 
++	printk("RISC GP7 Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
++	for (i = 0; i < 16; i++) {
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	WRT_REG_WORD(&reg->ctrl_status, 0x10); 
++	printk("Frame Buffer Hardware Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
++	for (i = 0; i < 64; i++) {
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	WRT_REG_WORD(&reg->ctrl_status, 0x20); 
++	printk("FPM B0 Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
++	for (i = 0; i < 64; i++) {
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	WRT_REG_WORD(&reg->ctrl_status, 0x30); 
++	printk("FPM B1 Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
++	for (i = 0; i < 64; i++) {
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	WRT_REG_WORD(&reg->ctrl_status, CSR_ISP_SOFT_RESET);
++
++	data = RD_REG_WORD(&reg->ctrl_status);
++	for (i = 6000000; i && data & CSR_ISP_SOFT_RESET; i--) {
++		SYS_DELAY(5);
++		data = RD_REG_WORD(&reg->ctrl_status);
++	}
++	if (ha->pdev->device == QLA2312_DEVICE_ID ||
++	    ha->pdev->device == QLA2322_DEVICE_ID) {
++		SYS_DELAY(10);
++	} else {
++		data = RD_REG_WORD(&reg->mailbox0);
++		for (i = 6000000; i && data == MBS_BUSY; i--) {
++			SYS_DELAY(5);
++			data = RD_REG_WORD(&reg->mailbox0);
++		}
++	}
++
++	rval = QLA2X00_SUCCESS;
++	mb0 = mb2 = 0;
++	printk("Code RAM Dump:");
++	risc_address      = 0x800;
++	risc_code_size    = 0xffff - 0x800 + 1;
++	WRT_REG_WORD(&reg->mailbox0, MBC_READ_RAM_WORD);
++	clear_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
++	for (cnt = 0; cnt < risc_code_size && rval == QLA2X00_SUCCESS; cnt++) {
++		if ((cnt % 8) == 0)
++			printk("\n%04x: ", cnt + 0x0800);
++		WRT_REG_WORD(&reg->mailbox1, (uint16_t)risc_address++);
++		WRT_REG_WORD(&reg->hccr, HCCR_SET_HOST_INT);
++
++		for (timer = 6000000; timer != 0; timer--) {
++			/* Check for pending interrupts. */
++			if ((stat = RD_REG_WORD(&reg->host_status_lo)) & HSR_INT) {
++				stat &= 0xff;
++
++				if (stat == 0x1 || stat == 0x2) {
++					set_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
++
++					mb0 = RD_REG_WORD(&reg->mailbox0);
++					mb2 = RD_REG_WORD(&reg->mailbox2);
++
++					/* Release mailbox registers. */
++					WRT_REG_WORD(&reg->semaphore, 0);
++					WRT_REG_WORD(&reg->hccr, HCCR_CLR_RISC_INT);
++					break;
++				} else if (stat == 0x10 || stat == 0x11) {
++					set_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
++
++					mb0 = RD_REG_WORD(&reg->mailbox0);
++					mb2 = RD_REG_WORD(&reg->mailbox2);
++
++					WRT_REG_WORD(&reg->hccr, HCCR_CLR_RISC_INT);
++					break;
++				}
++
++				/* clear this intr; it wasn't a mailbox intr */
++				WRT_REG_WORD(&reg->hccr, HCCR_CLR_RISC_INT);
++			}
++
++			mdelay(5);
++		}
++
++		if (test_and_clear_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags)) {
++			rval = mb0 & MBS_MASK;
++			printk("%04x ", mb2);
++		} else {
++			rval = QLA2X00_FUNCTION_FAILED;
++		}
++	}
++
++	printk("\n\n");
++
++	mb0 = mb2 = 0;
++	printk("Stack RAM Dump:");
++	risc_address      = 0x10000;
++	risc_code_size    = 0x107ff - 0x10000 + 1;
++	WRT_REG_WORD(&reg->mailbox0, 0xf /* MBC_READ_RAM_EXTENDED */);
++	clear_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
++
++	for (cnt = 0; cnt < risc_code_size && rval == QLA2X00_SUCCESS; cnt++) {
++		if ((cnt % 8) == 0)
++			printk("\n%05x: ", cnt + 0x10000);
++		WRT_REG_WORD(&reg->mailbox1, LSW(risc_address));
++		WRT_REG_WORD(&reg->mailbox8, MSW(risc_address++));
++		WRT_REG_WORD(&reg->hccr, HCCR_SET_HOST_INT);
++
++		for (timer = 6000000; timer != 0; timer--) {
++			/* Check for pending interrupts. */
++			if ((stat = RD_REG_WORD(&reg->host_status_lo)) & HSR_INT) {
++				stat &= 0xff;
++
++				if (stat == 0x1 || stat == 0x2) {
++					set_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
++
++					mb0 = RD_REG_WORD(&reg->mailbox0);
++					mb2 = RD_REG_WORD(&reg->mailbox2);
++
++					/* Release mailbox registers. */
++					WRT_REG_WORD(&reg->semaphore, 0);
++					WRT_REG_WORD(&reg->hccr, HCCR_CLR_RISC_INT);
++					break;
++				} else if (stat == 0x10 || stat == 0x11) {
++					set_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
++
++					mb0 = RD_REG_WORD(&reg->mailbox0);
++					mb2 = RD_REG_WORD(&reg->mailbox2);
++
++					WRT_REG_WORD(&reg->hccr, HCCR_CLR_RISC_INT);
++					break;
++				}
++
++				/* clear this intr; it wasn't a mailbox intr */
++				WRT_REG_WORD(&reg->hccr, HCCR_CLR_RISC_INT);
++			}
++
++			mdelay(5);
++		}
++
++		if (test_and_clear_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags)) {
++			rval = mb0 & MBS_MASK;
++			printk("%04x ", mb2);
++		} else {
++			rval = QLA2X00_FUNCTION_FAILED;
++		}
++	}
++
++	printk("\n\n");
++
++	mb0 = mb2 = 0;
++	printk("Data RAM Dump:");
++	risc_address      = 0x10800;
++	risc_code_size    = 0x1ffff - 0x10800 + 1;
++	WRT_REG_WORD(&reg->mailbox0, 0xf /* MBC_READ_RAM_EXTENDED */);
++	clear_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
++
++	for (cnt = 0; cnt < risc_code_size && rval == QLA2X00_SUCCESS; cnt++) {
++		if ((cnt % 8) == 0)
++			printk("\n%05x: ", cnt + 0x10800);
++		WRT_REG_WORD(&reg->mailbox1, LSW(risc_address));
++		WRT_REG_WORD(&reg->mailbox8, MSW(risc_address++));
++		WRT_REG_WORD(&reg->hccr, HCCR_SET_HOST_INT);
++
++		for (timer = 6000000; timer != 0; timer--) {
++			/* Check for pending interrupts. */
++			if ((stat = RD_REG_WORD(&reg->host_status_lo)) & HSR_INT) {
++				stat &= 0xff;
++
++				if (stat == 0x1 || stat == 0x2) {
++					set_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
++
++					mb0 = RD_REG_WORD(&reg->mailbox0);
++					mb2 = RD_REG_WORD(&reg->mailbox2);
++
++					/* Release mailbox registers. */
++					WRT_REG_WORD(&reg->semaphore, 0);
++					WRT_REG_WORD(&reg->hccr, HCCR_CLR_RISC_INT);
++					break;
++				} else if (stat == 0x10 || stat == 0x11) {
++					set_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
++
++					mb0 = RD_REG_WORD(&reg->mailbox0);
++					mb2 = RD_REG_WORD(&reg->mailbox2);
++
++					WRT_REG_WORD(&reg->hccr, HCCR_CLR_RISC_INT);
++					break;
++				}
++
++				/* clear this intr; it wasn't a mailbox intr */
++				WRT_REG_WORD(&reg->hccr, HCCR_CLR_RISC_INT);
++			}
++
++			mdelay(5);
++		}
++
++		if (test_and_clear_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags)) {
++			rval = mb0 & MBS_MASK;
++			printk("%04x ", mb2);
++		} else {
++			rval = QLA2X00_FUNCTION_FAILED;
++		}
++	}
++
++	printk("\n[<==END] ISP DEBUG DUMP\n");
++
++	if (!hardware_locked)
++		spin_unlock_irqrestore(&ha->hardware_lock, flags);
++}
++
++#elif defined(ISP2200)
++
++/**
++ * qla2x00_fw_dump() - Dumps binary data from the 2200 firmware.
++ * @ha: SCSI driver HA context
++ * @hardware_locked: Called with the hardware_lock
++ */
++void
++qla2x00_dump_isp(scsi_qla_host_t *ha, int hardware_locked)
++{
++	int		rval;
++	uint32_t	i;
++	uint32_t	cnt, timer;
++	uint32_t	risc_address;
++	uint16_t	risc_code_size;
++	uint16_t	mb0, mb2;
++
++	uint16_t	data, stat;
++	device_reg_t	*reg;
++	uint16_t	*dmp_reg;
++	unsigned long	flags;
++
++
++	reg = ha->iobase;
++	flags = 0;
++
++	if (!hardware_locked)
++		spin_lock_irqsave(&ha->hardware_lock, flags);
++
++	printk("\n\n[==>BEG]\n");
++
++	printk("HCCR Register:\n");
++	printk("%04x\n\n", RD_REG_WORD(&reg->hccr));
++
++	/* Pause RISC. */
++	WRT_REG_WORD(&reg->hccr, HCCR_PAUSE_RISC); 
++	for (cnt = 30000; cnt; cnt--) {
++		if ((RD_REG_WORD(&reg->hccr) & HCCR_RISC_PAUSE) != 0)
++			break;
++		SYS_DELAY(10);
++	}
++	if (!cnt)
++		goto done;
++
++	printk("PBIU Registers:\n");
++	dmp_reg = (uint16_t *)(reg + 0);
++	for (i = 0; i < 8; i++) 
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++
++	printk("\n\n");
++
++	printk("Mailbox Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0x10);
++	for (i = 0; i < 32; i++) {
++		if (i == 8)
++			dmp_reg = (uint16_t *)((uint8_t *)reg + 0xe0);
++
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	printk("DMA Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0x20);
++	for (i = 0; i < 48; i++) {
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	WRT_REG_WORD(&reg->ctrl_status, 0x00); 
++	printk("RISC Hardware Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0xA0);
++	for (i = 0; i < 16; i++) {
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	WRT_REG_WORD(&reg->pcr, 0x2000); 
++	printk("RISC GP0 Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
++	for (i = 0; i < 16; i++) {
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	WRT_REG_WORD(&reg->pcr, 0x2100); 
++	printk("RISC GP1 Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
++	for (i = 0; i < 16; i++) {
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	WRT_REG_WORD(&reg->pcr, 0x2200); 
++	printk("RISC GP2 Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
++	for (i = 0; i < 16; i++) {
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	WRT_REG_WORD(&reg->pcr, 0x2300); 
++	printk("RISC GP3 Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
++	for (i = 0; i < 16; i++) {
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	WRT_REG_WORD(&reg->pcr, 0x2400); 
++	printk("RISC GP4 Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
++	for (i = 0; i < 16; i++) {
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	WRT_REG_WORD(&reg->pcr, 0x2500); 
++	printk("RISC GP5 Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
++	for (i = 0; i < 16; i++) {
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	WRT_REG_WORD(&reg->pcr, 0x2600); 
++	printk("RISC GP6 Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
++	for (i = 0; i < 16; i++) {
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	WRT_REG_WORD(&reg->pcr, 0x2700); 
++	printk("RISC GP7 Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
++	for (i = 0; i < 16; i++) {
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	WRT_REG_WORD(&reg->ctrl_status, 0x10); 
++	printk("Frame Buffer Hardware Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
++	for (i = 0; i < 16; i++) {
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	WRT_REG_WORD(&reg->ctrl_status, 0x20); 
++	printk("FPM B0 Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
++	for (i = 0; i < 64; i++) {
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	WRT_REG_WORD(&reg->ctrl_status, 0x30); 
++	printk("FPM B1 Registers:");
++	dmp_reg = (uint16_t *)((uint8_t *)reg + 0x80);
++	for (i = 0; i < 64; i++) {
++		if ((i % 8) == 0)
++			printk("\n");
++		printk("%04x ", RD_REG_WORD(dmp_reg++));
++	}
++
++	printk("\n\n");
++
++	WRT_REG_WORD(&reg->ctrl_status, CSR_ISP_SOFT_RESET);
++
++	data = RD_REG_WORD(&reg->ctrl_status);
++	for (i = 6000000; i && data & CSR_ISP_SOFT_RESET; i--) {
++		SYS_DELAY(5);
++		data = RD_REG_WORD(&reg->ctrl_status);
++	}
++	data = RD_REG_WORD(&reg->mailbox0);
++	for (i = 6000000; i && data == MBS_BUSY; i--) {
++		SYS_DELAY(5);
++		data = RD_REG_WORD(&reg->mailbox0);
++	}
++
++	/* Pause RISC. */
++	WRT_REG_WORD(&reg->hccr, HCCR_PAUSE_RISC); 
++	for (cnt = 30000; cnt; cnt--) {
++		if ((RD_REG_WORD(&reg->hccr) & HCCR_RISC_PAUSE) != 0)
++			break;
++		SYS_DELAY(10);
++	}
++	if (!cnt)
++		goto done;
++
++	rval = QLA2X00_SUCCESS;
++	mb0 = mb2 = 0;
++	printk("RISC SRAM:");
++	risc_address      = 0x1000;
++	risc_code_size    = 0xffff - 0x1000 + 1;
++	WRT_REG_WORD(&reg->mailbox0, MBC_READ_RAM_WORD);
++	clear_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
++	for (cnt = 0; cnt < risc_code_size && rval == QLA2X00_SUCCESS; cnt++) {
++		if ((cnt % 8) == 0)
++			printk("\n%04x: ", cnt + 0x1000);
++		WRT_REG_WORD(&reg->mailbox1, (uint16_t)risc_address++);
++		WRT_REG_WORD(&reg->hccr, HCCR_SET_HOST_INT);
++
++		for (timer = 6000000; timer != 0; timer--) {
++			/* Check for pending interrupts. */
++			if ((stat = RD_REG_WORD(&reg->host_status_lo)) & HSR_INT) {
++				stat &= 0xff;
++
++				if (stat == 0x1 || stat == 0x2) {
++					set_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
++
++					mb0 = RD_REG_WORD(&reg->mailbox0);
++					mb2 = RD_REG_WORD(&reg->mailbox2);
++
++					/* Release mailbox registers. */
++					WRT_REG_WORD(&reg->semaphore, 0);
++					WRT_REG_WORD(&reg->hccr, HCCR_CLR_RISC_INT);
++					break;
++				} else if (stat == 0x10 || stat == 0x11) {
++					set_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
++
++					mb0 = RD_REG_WORD(&reg->mailbox0);
++					mb2 = RD_REG_WORD(&reg->mailbox2);
++
++					WRT_REG_WORD(&reg->hccr, HCCR_CLR_RISC_INT);
++					break;
++				}
++
++				/* clear this intr; it wasn't a mailbox intr */
++				WRT_REG_WORD(&reg->hccr, HCCR_CLR_RISC_INT);
++			}
++
++			mdelay(5);
++		}
++
++		if (test_and_clear_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags)) {
++			rval = mb0 & MBS_MASK;
++			printk("%04x ", mb2);
++		} else {
++			rval = QLA2X00_FUNCTION_FAILED;
++		}
++	}
++
++	printk("\n[<==END] ISP DEBUG DUMP\n");
++
++done:
++	if (!hardware_locked)
++		spin_unlock_irqrestore(&ha->hardware_lock, flags);
++}
++#else /* if defined(ISP2100) */
++
++/**
++ * qla2x00_fw_dump() - Dumps binary data from the 2100 firmware.
++ * @ha: SCSI driver HA context
++ * @hardware_locked: Called with the hardware_lock
++ *
++ * NOTE: On the ISP2100, this function will not be implemented.
++ */
++void
++qla2x00_dump_isp(scsi_qla_host_t *ha, int hardware_locked)
++{
++	/* NO-OP */
++	printk("\n\n[==>BEG]\n");
++	printk("\n[<==END] ISP DEBUG DUMP\n");
++}
++
++#endif /* if defined(ISP2300) */
++
++//FIXME
++
++/****************************************************************************/
++/*                         Driver Debug Functions.                          */
++/****************************************************************************/
++
++void 
++qla2x00_dump_regs(struct Scsi_Host *host) 
++{
++	/* Assumes non-memory mapped I/O */
++	printk("Mailbox registers:\n");
++	printk("scsi(%d): mbox 0 0x%04x \n",
++	    host->host_no, inw(host->io_port + 0x10));
++	printk("scsi(%d): mbox 1 0x%04x \n",
++	    host->host_no, inw(host->io_port + 0x12));
++	printk("scsi(%d): mbox 2 0x%04x \n",
++	    host->host_no, inw(host->io_port + 0x14));
++	printk("scsi(%d): mbox 3 0x%04x \n",
++	    host->host_no, inw(host->io_port + 0x16));
++	printk("scsi(%d): mbox 4 0x%04x \n",
++	    host->host_no, inw(host->io_port + 0x18));
++	printk("scsi(%d): mbox 5 0x%04x \n",
++	    host->host_no, inw(host->io_port + 0x1a));
++}
++
++
++void
++qla2x00_dump_buffer(uint8_t * b, uint32_t size) 
++{
++	uint32_t cnt;
++	uint8_t c;
++
++	printk(" 0   1   2   3   4   5   6   7   8   9   "
++	    "Ah  Bh  Ch  Dh  Eh  Fh\n");
++	printk("-----------------------------------------"
++	    "----------------------\n");
++
++	for (cnt = 0; cnt < size;) {
++		c = *b++;
++		printk("%02x",(uint32_t) c);
++		cnt++;
++		if (!(cnt % 16))
++			printk("\n");
++		else
++			printk("  ");
++	}
++	if (cnt % 16)
++		printk("\n");
++}
++
++/**************************************************************************
++ *   qla2x00_print_scsi_cmd
++ *	 Dumps out info about the scsi cmd and srb.
++ *   Input	 
++ *	 cmd : Scsi_Cmnd
++ **************************************************************************/
++void
++qla2x00_print_scsi_cmd(Scsi_Cmnd * cmd) 
++{
++	struct scsi_qla_host *ha;
++	struct Scsi_Host *host;
++	srb_t *sp;
++	struct os_lun *lq;
++	fc_port_t *fcport;
++
++	int i;
++
++	host = cmd->device->host;
++	ha = (struct scsi_qla_host *) host->hostdata;
++
++	sp = (srb_t *) CMD_SP(cmd);
++	printk("SCSI Command @= 0x%p, Handle=0x%08lx\n", 
++			cmd, (u_long) CMD_HANDLE(cmd));
++	printk("  chan=%d, target = 0x%02x, lun = 0x%02x, cmd_len = 0x%02x\n",
++			SCSI_BUS_32(cmd), SCSI_TCN_32(cmd), SCSI_LUN_32(cmd),
++			cmd->cmd_len);
++	printk(" CDB = ");
++	for (i = 0; i < cmd->cmd_len; i++) {
++		printk("0x%02x ", cmd->cmnd[i]);
++	}
++	printk("\n  seg_cnt =%d, retries=%d, serial_number_at_timeout=0x%lx\n",
++			cmd->use_sg,
++			cmd->retries, cmd->serial_number_at_timeout);
++	printk("  request buffer=0x%p, request buffer len=0x%x\n", 
++			cmd->request_buffer,
++			cmd->request_bufflen);
++	printk("  tag=%d, flags=0x%x, transfersize=0x%x \n", 
++			cmd->tag, cmd->flags, cmd->transfersize);
++	printk("  serial_number=%d, SP=%p\n", (int) cmd->serial_number,sp); 
++	printk("  data direction=%d\n", cmd->sc_data_direction);
++	if (sp) {
++		printk("  sp flags=0x%x\n", sp->flags);
++		printk("  r_start=0x%lx, u_start=0x%lx, "
++				"f_start=0x%lx, state=%d\n", 
++				sp->r_start, sp->u_start,
++				sp->f_start, sp->state);
++
++		lq = sp->lun_queue;
++		fcport = lq->fclun->fcport;
++		printk(" e_start= 0x%lx, ext_history= %d, "
++				"fo retry=%d, loopid =%x, port path=%d\n", 
++				sp->e_start, sp->ext_history,
++				sp->fo_retry_cnt,
++				fcport->loop_id, 
++				fcport->cur_path);
++	}
++}
++
++/*
++ * qla2x00_print_q_info
++ * 	 Prints queue info
++ * Input
++ *      q: lun queue	 
++ */ 
++void 
++qla2x00_print_q_info(struct os_lun *q) 
++{
++	printk("Queue info: flags=0x%lx\n", q->q_flag);
++}
++
++#if defined(QL_DEBUG_ROUTINES)
++/*
++ * qla2x00_formatted_dump_buffer
++ *       Prints string plus buffer.
++ *
++ * Input:
++ *       string  = Null terminated string (no newline at end).
++ *       buffer  = buffer address.
++ *       wd_size = word size 8, 16, 32 or 64 bits
++ *       count   = number of words.
++ */
++void
++qla2x00_formatted_dump_buffer(char *string, uint8_t * buffer, 
++				uint8_t wd_size, uint32_t count) 
++{
++	uint32_t cnt;
++	uint16_t *buf16;
++	uint32_t *buf32;
++
++	if (strcmp(string, "") != 0)
++		printk("%s\n",string);
++
++	switch (wd_size) {
++		case 8:
++			printk(" 0    1    2    3    4    5    6    7    "
++				"8    9    Ah   Bh   Ch   Dh   Eh   Fh\n");
++			printk("-----------------------------------------"
++				"-------------------------------------\n");
++
++			for (cnt = 1; cnt <= count; cnt++, buffer++) {
++				printk("%02x",*buffer);
++				if (cnt % 16 == 0)
++					printk("\n");
++				else
++					printk("  ");
++			}
++			if (cnt % 16 != 0)
++				printk("\n");
++			break;
++		case 16:
++			printk("   0      2      4      6      8      Ah "
++				"	Ch     Eh\n");
++			printk("-----------------------------------------"
++				"-------------\n");
++
++			buf16 = (uint16_t *) buffer;
++			for (cnt = 1; cnt <= count; cnt++, buf16++) {
++				printk("%4x",*buf16);
++
++				if (cnt % 8 == 0)
++					printk("\n");
++				else if (*buf16 < 10)
++					printk("   ");
++				else
++					printk("  ");
++			}
++			if (cnt % 8 != 0)
++				printk("\n");
++			break;
++		case 32:
++			printk("       0          4          8          Ch\n");
++			printk("------------------------------------------\n");
++
++			buf32 = (uint32_t *) buffer;
++			for (cnt = 1; cnt <= count; cnt++, buf32++) {
++				printk("%8x", *buf32);
++
++				if (cnt % 4 == 0)
++					printk("\n");
++				else if (*buf32 < 10)
++					printk("   ");
++				else
++					printk("  ");
++			}
++			if (cnt % 4 != 0)
++				printk("\n");
++			break;
++		default:
++			break;
++	}
++}
++
++#endif
++
++
++#if STOP_ON_ERROR
++/**************************************************************************
++*   qla2x00_panic
++*
++**************************************************************************/
++static void 
++qla2x00_panic(char *cp, struct Scsi_Host *host) 
++{
++	struct scsi_qla_host *ha;
++	long *fp;
++
++	ha = (struct scsi_qla_host *) host->hostdata;
++	DEBUG2(ql2x_debug_print = 1;);
++	printk("qla2100 - PANIC:  %s\n", cp);
++	printk("Current time=0x%lx\n", jiffies);
++	printk("Number of pending commands =0x%lx\n", ha->actthreads);
++	printk("Number of queued commands =0x%lx\n", ha->qthreads);
++	printk("Number of free entries = (%d)\n", ha->req_q_cnt);
++	printk("Request Queue @ 0x%lx, Response Queue @ 0x%lx\n",
++			       ha->request_dma, ha->response_dma);
++	printk("Request In Ptr %d\n", ha->req_ring_index);
++	fp = (long *) &ha->flags;
++	printk("HA flags =0x%lx\n", *fp);
++	qla2x00_dump_requests(ha);
++	qla2x00_dump_regs(host);
++	cli();
++	for (;;) {
++		udelay(2);
++		barrier();
++		/* cpu_relax();*/
++	}
++	sti();
++}
++
++#endif
++
++/**************************************************************************
++*   qla2x00_dump_requests
++*
++**************************************************************************/
++void
++qla2x00_dump_requests(scsi_qla_host_t *ha) 
++{
++
++	Scsi_Cmnd       *cp;
++	srb_t           *sp;
++	int i;
++
++	printk("Outstanding Commands on controller:\n");
++
++	for (i = 1; i < MAX_OUTSTANDING_COMMANDS; i++) {
++		if ((sp = ha->outstanding_cmds[i]) == NULL)
++			continue;
++		if ((cp = sp->cmd) == NULL)
++			continue;
++
++		printk("(%d): Pid=%d, sp flags=0x%lx, cmd=0x%p\n", 
++			i, 
++			(int)sp->cmd->serial_number, 
++			(long)sp->flags,CMD_SP(sp->cmd));
++	}
++}
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qla_dbg.h	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,138 @@
++/******************************************************************************
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ ******************************************************************************/
++
++#undef ENTER_TRACE
++/*
++* Macros use for debugging the driver.
++*/
++#if defined(ENTER_TRACE)
++#define ENTER(x)	do { printk("qla2100 : Entering %s()\n", x); } while (0)
++#define LEAVE(x)	do { printk("qla2100 : Leaving %s()\n", x);  } while (0)
++#define ENTER_INTR(x)	do { printk("qla2100 : Entering %s()\n", x); } while (0)
++#define LEAVE_INTR(x)	do { printk("qla2100 : Leaving %s()\n", x);  } while (0)
++#else
++#define ENTER(x)	do {} while (0)
++#define LEAVE(x)	do {} while (0)
++#define ENTER_INTR(x) 	do {} while (0)
++#define LEAVE_INTR(x)   do {} while (0)
++#endif
++
++#if  DEBUG_QLA2100
++#define DEBUG(x)	do {x;} while (0);
++#else
++#define DEBUG(x)	do {} while (0);
++#endif
++
++#if defined(QL_DEBUG_LEVEL_1)
++#define DEBUG1(x)	do {x;} while (0);
++#else
++#define DEBUG1(x)	do {} while (0);
++#endif
++
++#if defined(QL_DEBUG_LEVEL_2)
++#define DEBUG2(x)       do {x;} while (0);
++#define DEBUG2_3(x)     do {x;} while (0);
++#define DEBUG2_3_11(x)  do {x;} while (0);
++#define DEBUG2_9_10(x)    do {x;} while (0);
++#define DEBUG2_11(x)    do {x;} while (0);
++#else
++#define DEBUG2(x)	do {} while (0);
++#endif
++
++#if defined(QL_DEBUG_LEVEL_3)
++#define DEBUG3(x)	do {x;} while (0);
++#define DEBUG2_3(x)	do {x;} while (0);
++#define DEBUG2_3_11(x)	do {x;} while (0);
++#define DEBUG3_11(x)	do {x;} while (0);
++#else
++#define DEBUG3(x)	do {} while (0);
++  #if !defined(QL_DEBUG_LEVEL_2)
++  #define DEBUG2_3(x)	do {} while (0);
++  #endif
++#endif
++
++#if defined(QL_DEBUG_LEVEL_4)
++#define DEBUG4(x)	do {x;} while (0);
++#else
++#define DEBUG4(x)	do {} while (0);
++#endif
++
++#if defined(QL_DEBUG_LEVEL_5)
++#define DEBUG5(x)          do {x;} while (0);
++#else
++#define DEBUG5(x)	do {} while (0);
++#endif
++
++#if defined(QL_DEBUG_LEVEL_7)
++#define DEBUG7(x)          do {x;} while (0);
++#else
++#define DEBUG7(x)	   do {} while (0);
++#endif
++
++#if defined(QL_DEBUG_LEVEL_9)
++#define DEBUG9(x)       do {x;} while (0);
++#define DEBUG9_10(x)    do {x;} while (0);
++#define DEBUG2_9_10(x)	do {x;} while (0);
++#else
++#define DEBUG9(x)	do {} while (0);
++#endif
++
++#if defined(QL_DEBUG_LEVEL_10)
++#define DEBUG10(x)      do {x;} while (0);
++#define DEBUG2_9_10(x)	do {x;} while (0);
++#define DEBUG9_10(x)	do {x;} while (0);
++#else
++#define DEBUG10(x)	do {} while (0);
++  #if !defined(DEBUG2_9_10)
++  #define DEBUG2_9_10(x)	do {} while (0);
++  #endif
++  #if !defined(DEBUG9_10)
++  #define DEBUG9_10(x)	do {} while (0);
++  #endif
++#endif
++
++#if defined(QL_DEBUG_LEVEL_11)
++#define DEBUG11(x)      do{x;} while(0);
++#if !defined(DEBUG2_11)
++#define DEBUG2_11(x)    do{x;} while(0);
++#endif
++#if !defined(DEBUG2_3_11)
++#define DEBUG2_3_11(x)  do{x;} while(0);
++#endif
++#if !defined(DEBUG3_11)
++#define DEBUG3_11(x)    do{x;} while(0);
++#endif
++#else
++#define DEBUG11(x)	do{} while(0);
++  #if !defined(QL_DEBUG_LEVEL_2)
++  #define DEBUG2_11(x)	do{} while(0);
++    #if !defined(QL_DEBUG_LEVEL_3)
++    #define DEBUG2_3_11(x) do{} while(0);
++    #endif
++  #endif
++  #if !defined(QL_DEBUG_LEVEL_3)
++  #define DEBUG3_11(x)	do{} while(0);
++  #endif
++#endif
++
++#if defined(QL_DEBUG_LEVEL_12)
++#define DEBUG12(x)      do {x;} while (0);
++#else
++#define DEBUG12(x)	do {} while (0);
++#endif
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qla_def.h	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,2484 @@
++/********************************************************************************
++*                  QLOGIC LINUX SOFTWARE
++*
++* QLogic ISP2x00 device driver for Linux 2.5.x
++* Copyright (C) 2003 Qlogic Corporation
++* (www.qlogic.com)
++*
++* This program is free software; you can redistribute it and/or modify it
++* under the terms of the GNU General Public License as published by the
++* Free Software Foundation; either version 2, or (at your option) any
++* later version.
++*
++* This program is distributed in the hope that it will be useful, but
++* WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++* General Public License for more details.
++**
++******************************************************************************/
++
++#ifndef __QLA_DEF_H
++#define __QLA_DEF_H
++
++#if defined(qla23xx)
++	#define MAILBOX_REGISTER_COUNT	32
++	#define ISP_NAME		"23xx"
++	#define DRIVER_NAME		"qla2300"
++	#define ISP2300
++	#undef ISP2322
++#elif defined(qla22xx)
++	#define MAILBOX_REGISTER_COUNT	32
++	#define ISP_NAME		"22xx"
++	#define DRIVER_NAME		"qla2200"
++	#define ISP2200
++#else /* qla21xx */
++	#define MAILBOX_REGISTER_COUNT	8
++	#define ISP_NAME		"21xx"
++	#define DRIVER_NAME		"qla2100"
++	#define ISP2100
++#endif
++
++/*****************************************/
++/*   ISP Boards supported by this driver */
++/*****************************************/
++#define QLA2X00_VENDOR_ID	0x1077
++
++#define QLA2100_DEVICE_ID	0x2100
++
++#define QLA2200_DEVICE_ID	0x2200
++#define QLA2200A_RISC_ROM_VER	4
++
++#define QLA2300_DEVICE_ID	0x2300
++#define QLA2312_DEVICE_ID	0x2312
++#define QLA2322_DEVICE_ID	0x2322
++#define FPM_2300		6
++#define FPM_2310		7
++
++#include "qla_settings.h"
++#include "exioct.h"
++#include "inioct.h"
++
++/* 
++ * Data bit definitions
++ */
++#define BIT_0	0x1
++#define BIT_1	0x2
++#define BIT_2	0x4
++#define BIT_3	0x8
++#define BIT_4	0x10
++#define BIT_5	0x20
++#define BIT_6	0x40
++#define BIT_7	0x80
++#define BIT_8	0x100
++#define BIT_9	0x200
++#define BIT_10	0x400
++#define BIT_11	0x800
++#define BIT_12	0x1000
++#define BIT_13	0x2000
++#define BIT_14	0x4000
++#define BIT_15	0x8000
++#define BIT_16	0x10000
++#define BIT_17	0x20000
++#define BIT_18	0x40000
++#define BIT_19	0x80000
++#define BIT_20	0x100000
++#define BIT_21	0x200000
++#define BIT_22	0x400000
++#define BIT_23	0x800000
++#define BIT_24	0x1000000
++#define BIT_25	0x2000000
++#define BIT_26	0x4000000
++#define BIT_27	0x8000000
++#define BIT_28	0x10000000
++#define BIT_29	0x20000000
++#define BIT_30	0x40000000
++#define BIT_31	0x80000000
++
++#define LSB(x)	((uint8_t)(x))
++#define MSB(x)	((uint8_t)((uint16_t)(x) >> 8))
++
++#define LSW(x)	((uint16_t)(x))
++#define MSW(x)	((uint16_t)((uint32_t)(x) >> 16))
++
++#define LSD(x)	((uint32_t)((uint64_t)(x)))
++#define MSD(x)	((uint32_t)((uint64_t)(x) >> 32))
++
++
++/*
++ * I/O register
++*/
++/* #define MEMORY_MAPPED_IO  */    /* Enable memory mapped I/O */
++#undef MEMORY_MAPPED_IO            /* Disable memory mapped I/O */
++
++#if defined(MEMORY_MAPPED_IO)
++#define RD_REG_BYTE(addr)		readb(addr)
++#define RD_REG_WORD(addr)		readw(addr)
++#define RD_REG_DWORD(addr)		readl(addr)
++#define WRT_REG_BYTE(addr, data)	writeb(data,addr)
++#define WRT_REG_WORD(addr, data)	writew(data,addr)
++#define WRT_REG_DWORD(addr, data)	writel(data,addr)
++#else   /* MEMORY_MAPPED_IO */
++#define RD_REG_BYTE(addr)		(inb((unsigned long)addr))
++#define RD_REG_WORD(addr)		(inw((unsigned long)addr))
++#define RD_REG_DWORD(addr)		(inl((unsigned long)addr))
++#define WRT_REG_BYTE(addr, data)	(outb(data,(unsigned long)addr))
++#define WRT_REG_WORD(addr, data)	(outw(data,(unsigned long)addr))
++#define WRT_REG_DWORD(addr, data)	(outl(data,(unsigned long)addr))
++#endif  /* MEMORY_MAPPED_IO */
++
++/*
++ * Fibre Channel device definitions.
++ */
++#define WWN_SIZE		8	/* Size of WWPN, WWN & WWNN */
++#define MAX_FIBRE_DEVICES	256
++#define MAX_FIBRE_LUNS  	256
++#define	MAX_RSCN_COUNT		10
++#define	MAX_HOST_COUNT		16
++
++/*
++ * Host adapter default definitions.
++ */
++#define MAX_BUSES		1  /* We only have one bus today */
++#define MAX_TARGETS_2100	MAX_FIBRE_DEVICES
++#define MAX_TARGETS_2200	MAX_FIBRE_DEVICES
++#define MAX_TARGETS		MAX_FIBRE_DEVICES
++#define MIN_LUNS		8
++#define MAX_LUNS		MAX_FIBRE_LUNS
++#define MAX_CMDS_PER_LUN	255 
++#define MAX_SRBS		4096
++                                    
++/*
++ * Fibre Channel device definitions.
++ */
++#define LAST_LOCAL_LOOP_ID	0x7d
++#define SNS_FL_PORT		0x7e
++#define FABRIC_CONTROLLER	0x7f
++#define SIMPLE_NAME_SERVER	0x80
++#define SNS_FIRST_LOOP_ID	0x81
++#define LAST_SNS_LOOP_ID	0xfe
++#define MANAGEMENT_SERVER	0xfe
++#define BROADCAST		0xff
++#define SNS_ACCEPT		0x0280	/* 8002 swapped */
++#define SNS_REJECT		0x0180	/* 8001 swapped */
++
++/* Loop ID's used as database flags, must be higher than any valid Loop ID */
++#define PORT_UNUSED		0x100	/* Port never been used. */
++#define PORT_AVAILABLE		0x101	/* Device does not exist on port. */
++#define PORT_NEED_MAP		0x102       
++#define PORT_LOST_ID		0x200       
++#define PORT_LOGIN_NEEDED	0x400       
++
++/*
++ * Timeout timer counts in seconds
++ */
++#define QLA2100_WDG_TIME_QUANTUM	5	/* In seconds */
++#define PORT_RETRY_TIME			2
++#define LOOP_DOWN_TIMEOUT		60
++#define LOOP_DOWN_TIME			120	/* 240 */
++#define	LOOP_DOWN_RESET			(LOOP_DOWN_TIME - 30)
++
++/* Maximum outstanding commands in ISP queues (1-65535) */
++#define MAX_OUTSTANDING_COMMANDS	1024
++
++/* ISP request and response entry counts (37-65535) */
++#define REQUEST_ENTRY_CNT		1024	/* Number of request entries. */
++#if defined(ISP2100) || defined(ISP2200)
++#define RESPONSE_ENTRY_CNT		64	/* Number of response entries.*/
++#else
++#define RESPONSE_ENTRY_CNT		512	/* Number of response entries.*/
++#endif
++
++/* Number of segments 1 - 65535 */
++#define SG_SEGMENTS     32             /* Cmd entry + 6 continuations */
++
++/*
++ * SCSI Request Block 
++ */
++typedef struct srb {
++	struct list_head   list;
++
++	Scsi_Cmnd  *cmd;		/* Linux SCSI command pkt */
++	struct scsi_qla_host *ha;	/* ha this SP is queued on */
++
++	uint8_t     dir;		/* direction of transfer */
++	uint8_t     unused1;
++
++	uint16_t    flags;		/* Status flags - defined below */
++
++	uint16_t     state;
++#define SRB_FREE_STATE          0	/* Request returned back */
++#define SRB_PENDING_STATE       1	/* Request being queued in LUN Q */
++#define SRB_ACTIVE_STATE        2	/* Request in Active Array */
++#define SRB_DONE_STATE          3	/* Request Queued in Done Queue */
++#define SRB_RETRY_STATE         4	/* Request in Retry Queue */
++#define SRB_SUSPENDED_STATE     5	/* Request in suspended state */
++#define SRB_NO_QUEUE_STATE      6	/* Request is in between states */
++#define SRB_ACTIVE_TIMEOUT_STATE 7	/* Request in Active Array but timed out */
++#define SRB_FAILOVER_STATE 	8	/* Request in Failover Queue */
++#define SRB_SCSI_RETRY_STATE    9	/* Request in Scsi Retry Queue */
++
++	uint8_t     used;		/* used by allocation code */
++	uint8_t     ref_num;		/* reference SRB number */	
++	uint16_t    magic;		/* qlogic magic number */
++#define SRB_MAGIC       0x10CB
++
++	u_long      host_no;		/* Host number of allocating host */
++	struct      timer_list   timer;	/* used to timeout command */
++	dma_addr_t	 saved_dma_handle;	/* for unmap of single transfers */
++
++	atomic_t	 ref_count;	/* reference count for this structure */			
++
++	/* Target/LUN queue pointers. */
++	struct os_tgt	*tgt_queue;	/* ptr to visible ha's target */
++	struct os_lun	*lun_queue;	/* ptr to visible ha's lun */
++	struct fc_lun	*fclun;		/* FC LUN context pointer. */
++
++	/* Raw completion info for use by failover ? */
++	uint8_t	fo_retry_cnt;	/* Retry count this request */
++	uint8_t	err_id;		/* error id */
++	uint8_t	cmd_length;	/* command length */
++	uint8_t	unused3;
++
++	int      delay;        /* delay in seconds */
++	int      ext_history;	/*  */
++
++	u_long      e_start;	/* jiffies at start of extend timeout */
++	u_long      r_start;	/* jiffies at start of request */
++	u_long      u_start;	/* jiffies when sent to F/W    */
++	u_long      f_start;	/* ra 10/29/01*/
++				/*jiffies when put in failover queue*/
++
++	uint32_t    resid;	/* Residual transfer length */
++	uint16_t    sense_len;	/* Sense data length */
++	uint32_t    request_sense_length;
++	void        *request_sense_ptr;
++
++#if defined(IOCB_THROLLE_USAGE)
++	uint32_t 	 iocb_cnt;
++#endif
++} srb_t;
++
++/*
++ * SRB flag definitions
++ */
++#define SRB_TIMEOUT		BIT_0	/* Command timed out */
++#define SRB_DMA_VALID		BIT_1	/* Command sent to ISP */
++#define SRB_WATCHDOG		BIT_2	/* Command on watchdog list */
++#define SRB_ABORT_PENDING	BIT_3	/* Command abort sent to device */
++
++#define SRB_ABORTED		BIT_4	/* Command aborted command already */
++#define SRB_RETRY		BIT_5	/* Command needs retrying */
++#define SRB_GOT_SENSE		BIT_6	/* Command has sense data */
++#define SRB_FAILOVER		BIT_7	/* Command in failover state */
++
++#define SRB_BUSY		BIT_8	/* Command is in busy retry state */
++#define SRB_FO_CANCEL		BIT_9	/* Command don't need to do failover */
++#define	SRB_IOCTL		BIT_10	/* IOCTL command. */
++#define	SRB_ISP_STARTED		BIT_11	/* Command sent to ISP. */
++
++#define	SRB_ISP_COMPLETED	BIT_12	/* ISP finished with command */
++
++
++/*
++ *  ISP PCI Configuration Register Set
++ */
++typedef volatile struct {
++    uint16_t vendor_id;                 /* 0x0 */
++    uint16_t device_id;                 /* 0x2 */
++    uint16_t command;                   /* 0x4 */
++    uint16_t status;                    /* 0x6 */
++    uint8_t revision_id;                /* 0x8 */
++    uint8_t programming_interface;      /* 0x9 */
++    uint8_t sub_class;                  /* 0xa */
++    uint8_t base_class;                 /* 0xb */
++    uint8_t cache_line;                 /* 0xc */
++    uint8_t latency_timer;              /* 0xd */
++    uint8_t header_type;                /* 0xe */
++    uint8_t bist;                       /* 0xf */
++    uint32_t base_port;                 /* 0x10 */
++    uint32_t mem_base_addr;             /* 0x14 */
++    uint32_t base_addr[4];              /* 0x18-0x24 */
++    uint32_t reserved_1[2];             /* 0x28-0x2c */
++    uint16_t expansion_rom;             /* 0x30 */
++    uint32_t reserved_2[2];             /* 0x34-0x38 */
++    uint8_t interrupt_line;             /* 0x3c */
++    uint8_t interrupt_pin;              /* 0x3d */
++    uint8_t min_grant;                  /* 0x3e */
++    uint8_t max_latency;                /* 0x3f */
++} config_reg_t __attribute__((packed));
++
++
++/*
++ * ISP I/O Register Set structure definitions.
++ */
++typedef volatile struct {
++	volatile uint16_t flash_address; /* Flash BIOS address */
++	volatile uint16_t flash_data;	/* Flash BIOS data */
++	uint16_t unused_1[1];		/* Gap */
++	volatile uint16_t ctrl_status;	/* Control/Status */
++#define CSR_FLASH_64K_BANK	BIT_3	/* Flash upper 64K bank select */ 
++#define CSR_FLASH_ENABLE	BIT_1	/* Flash BIOS Read/Write enable */
++#define CSR_ISP_SOFT_RESET	BIT_0	/* ISP soft reset */
++
++	volatile uint16_t ictrl;	/* Interrupt control */
++#define ICR_EN_INT		BIT_15	/* ISP enable interrupts. */
++#define ICR_EN_RISC		BIT_3	/* ISP enable RISC interrupts. */
++
++	volatile uint16_t istatus;	/* Interrupt status */
++#define ISR_RISC_INT		BIT_3	/* RISC interrupt */
++
++	volatile uint16_t semaphore;	/* Semaphore */
++	volatile uint16_t nvram;	/* NVRAM register. */
++#define NVR_DESELECT		0
++#define NVR_CLOCK		BIT_0
++#define NVR_SELECT		BIT_1
++#define NVR_DATA_OUT		BIT_2
++#define NVR_DATA_IN		BIT_3
++#define NVR_BUSY		BIT_15
++
++#if defined(ISP2100) || defined(ISP2200)
++	volatile uint16_t mailbox0;
++	volatile uint16_t mailbox1;
++	volatile uint16_t mailbox2;
++	volatile uint16_t mailbox3;
++	volatile uint16_t mailbox4;
++#define	ISP_REQ_Q_IN(reg)	(&(reg)->mailbox4)
++#define	ISP_REQ_Q_OUT(reg)	(&(reg)->mailbox4)
++	volatile uint16_t mailbox5;
++#define	ISP_RSP_Q_IN(reg)	(&(reg)->mailbox5)
++#define	ISP_RSP_Q_OUT(reg)	(&(reg)->mailbox5)
++	volatile uint16_t mailbox6;
++	volatile uint16_t mailbox7;
++	uint16_t unused_2[0x3b];	/* Gap */
++#else /* defined(ISP2300) */
++	volatile uint16_t req_q_in;	/* Request Queue In-Pointer */
++#define	ISP_REQ_Q_IN(reg)	(&(reg)->req_q_in)
++	volatile uint16_t req_q_out;	/* Request Queue Out-Pointer */
++#define	ISP_REQ_Q_OUT(reg)	(&(reg)->req_q_out)
++	volatile uint16_t rsp_q_in;	/* Response Queue In-Pointer */
++#define	ISP_RSP_Q_IN(reg)	(&(reg)->rsp_q_in)
++	volatile uint16_t rsp_q_out;	/* Response Queue Out-Pointer */
++#define	ISP_RSP_Q_OUT(reg)	(&(reg)->rsp_q_out)
++
++	volatile uint16_t host_status_lo; /* RISC to Host Status Low */
++#define HSR_INT			BIT_15	/* RISC int */
++#define HSR_RISC_PAUSED		BIT_8	/* RISC Paused */
++	volatile uint16_t host_status_hi; /* RISC to Host Status High */
++#define HSR_ROM_MB_CMD_COMP	0x01	/* ROM mailbox cmd complete */
++#define HSR_ROM_MB_CMD_ERROR	0x02	/*ROM mailbox cmd unsuccessful*/
++#define HSR_MB_CMD_COMP		0x10	/* Mailbox cmd complete */
++#define HSR_MB_CMD_ERROR	0x11	/* Mailbox cmd unsuccessful */
++#define HSR_ASYNC_EVENT		0x12	/* Asynchronous event */
++#define HSR_RESPONSE_QUEUE_UP	0x13	/* Response Queue update */
++#define HSR_RIO_ONE		0x15	/* RIO one 16 bit handle */
++#define HSR_FAST_SCSI_COMP	0x16	/* Fast Post SCSI complete */
++
++	volatile uint16_t host_semaphore; /* Host to Host Semaphore */
++	uint16_t unused_3[0x11];	/* Gap */
++	volatile uint16_t mailbox0;
++	volatile uint16_t mailbox1;
++	volatile uint16_t mailbox2;
++	volatile uint16_t mailbox3;
++	volatile uint16_t mailbox4;
++	volatile uint16_t mailbox5;
++	volatile uint16_t mailbox6;
++	volatile uint16_t mailbox7;
++	volatile uint16_t mailbox8;
++	volatile uint16_t mailbox9;
++	volatile uint16_t mailbox10;
++	volatile uint16_t mailbox11;
++	volatile uint16_t mailbox12;
++	volatile uint16_t mailbox13;
++	volatile uint16_t mailbox14;
++	volatile uint16_t mailbox15;
++	volatile uint16_t mailbox16;
++	volatile uint16_t mailbox17;
++	volatile uint16_t mailbox18;
++	volatile uint16_t mailbox19;
++	volatile uint16_t mailbox20;
++	volatile uint16_t mailbox21;
++	volatile uint16_t mailbox22;
++	volatile uint16_t mailbox23;
++	volatile uint16_t mailbox24;
++	volatile uint16_t mailbox25;
++	volatile uint16_t mailbox26;
++	volatile uint16_t mailbox27;
++	volatile uint16_t mailbox28;
++	volatile uint16_t mailbox29;
++	volatile uint16_t mailbox30;
++	volatile uint16_t mailbox31;
++	volatile uint16_t fb_cmd;
++	uint16_t unused_4[0xa];		/* Gap */
++#endif /* defined(ISP2100) || defined(ISP2200) */
++	volatile uint16_t fpm_diag_config;
++	uint16_t unused_5[0x6];		/* Gap */
++	volatile uint16_t pcr;		/* Processor Control Register. */
++	uint16_t unused_6[0x5];		/* Gap */
++	volatile uint16_t mctr;		/* Memory Configuration and Timing. */
++	uint16_t unused_7[0x3];		/* Gap */
++#if defined(ISP2100) || defined(ISP2200)
++	volatile uint16_t fb_cmd;
++#else /* defined(ISP2300) */
++	uint16_t unused_11;
++#endif /* defined(ISP2100) || defined(ISP2200) */
++	uint16_t unused_8[0x3];		/* Gap */
++	volatile uint16_t hccr;		/* Host command & control register. */
++#define HCCR_HOST_INT		BIT_7	/* Host interrupt bit */
++#define HCCR_RISC_PAUSE		BIT_5	/* Pause mode bit */
++					/* HCCR commands */
++#define HCCR_RESET_RISC		0x1000	/* Reset RISC */
++#define HCCR_PAUSE_RISC		0x2000	/* Pause RISC */
++#define HCCR_RELEASE_RISC	0x3000	/* Release RISC from reset. */
++#define HCCR_SET_HOST_INT	0x5000	/* Set host interrupt */
++#define HCCR_CLR_HOST_INT	0x6000	/* Clear HOST interrupt */
++#define HCCR_CLR_RISC_INT	0x7000	/* Clear RISC interrupt */
++#define	HCCR_DISABLE_PARITY_PAUSE 0x4001 /* Disable parity error RISC pause. */
++#define HCCR_ENABLE_PARITY	0xA000	/* Enable PARITY interrupt */
++
++	uint16_t unused_9[5];		/* Gap */
++	volatile uint16_t gpiod;	/* GPIO Data register. */
++	volatile uint16_t gpioe;	/* GPIO Enable register. */
++#if defined(ISP2200)
++	uint16_t unused_10[8];		/* Gap */
++	volatile uint16_t mailbox8;
++	volatile uint16_t mailbox9;
++	volatile uint16_t mailbox10;
++	volatile uint16_t mailbox11;
++	volatile uint16_t mailbox12;
++	volatile uint16_t mailbox13;
++	volatile uint16_t mailbox14;
++	volatile uint16_t mailbox15;
++	volatile uint16_t mailbox16;
++	volatile uint16_t mailbox17;
++	volatile uint16_t mailbox18;
++	volatile uint16_t mailbox19;
++	volatile uint16_t mailbox20;
++	volatile uint16_t mailbox21;
++	volatile uint16_t mailbox22;
++	volatile uint16_t mailbox23;	/* Also probe reg. */
++#endif /* defined(ISP2200) */
++} device_reg_t;
++
++typedef struct {
++	uint32_t	out_mb;		/* outbound from driver */
++	uint32_t	in_mb;			/* Incoming from RISC */
++	uint16_t	mb[MAILBOX_REGISTER_COUNT];
++	long		buf_size;
++	void		*bufp;
++	uint32_t	tov;
++	uint8_t		flags;
++#define MBX_DMA_IN	BIT_0
++#define	MBX_DMA_OUT	BIT_1
++#define IOCTL_CMD	BIT_2
++} mbx_cmd_t;
++
++#define	MBX_TOV_SECONDS	30
++
++/*
++ *  ISP product identification definitions in mailboxes after reset.
++ */
++#define PROD_ID_1		0x4953
++#define PROD_ID_2		0x0000
++#define PROD_ID_2a		0x5020
++#define PROD_ID_3		0x2020
++#define PROD_ID_4		0x1
++#define PROD_ID_4a		0x2
++
++/*
++ * ISP mailbox Self-Test status codes
++ */
++#define MBS_FRM_ALIVE		0	/* Firmware Alive. */
++#define MBS_CHKSUM_ERR		1	/* Checksum Error. */
++#define MBS_BUSY		4	/* Busy. */
++
++/*
++ * ISP mailbox command complete status codes
++ */
++#define MBS_CMD_CMP		0x4000	/* Command Complete. */
++#define MBS_INV_CMD		0x4001	/* Invalid Command. */
++#define MBS_HOST_INF_ERR	0x4002	/* Host Interface Error. */
++#define MBS_TEST_FAILED		0x4003	/* Test Failed. */
++#define MBS_CMD_ERR		0x4005	/* Command Error. */
++#define MBS_CMD_PARAM_ERR	0x4006	/* Command Parameter Error. */
++#define MBS_FATAL_ERROR		0xF000	/* Command Fatal Error. */
++//TODO consolidate these definitions
++#define MBS_FIRMWARE_ALIVE	0x0000 
++#define MBS_COMMAND_COMPLETE	0x4000 
++#define MBS_INVALID_COMMAND	0x4001 
++
++/* QLogic subroutine status definitions */
++#define QL_STATUS_SUCCESS		0
++#define QL_STATUS_ERROR			1
++#define QL_STATUS_FATAL_ERROR		2
++#define QL_STATUS_RESOURCE_ERROR	3
++#define QL_STATUS_LOOP_ID_IN_USE	4
++#define QL_STATUS_NO_DATA		5
++#define QL_STATUS_TIMEOUT		6
++/*
++ * ISP mailbox asynchronous event status codes
++ */
++#define MBA_ASYNC_EVENT		0x8000	/* Asynchronous event. */
++#define MBA_RESET		0x8001	/* Reset Detected. */
++#define MBA_SYSTEM_ERR		0x8002	/* System Error. */
++#define MBA_REQ_TRANSFER_ERR	0x8003	/* Request Transfer Error. */
++#define MBA_RSP_TRANSFER_ERR	0x8004	/* Response Transfer Error. */
++#define MBA_WAKEUP_THRES	0x8005	/* Request Queue Wake-up. */
++#define MBA_LIP_OCCURRED	0x8010	/* Loop Initialization Procedure */
++                                      	/* occurred. */
++#define MBA_LOOP_UP		0x8011	/* FC Loop UP. */
++#define MBA_LOOP_DOWN		0x8012	/* FC Loop Down. */
++#define MBA_LIP_RESET		0x8013	/* LIP reset occurred. */
++#define MBA_PORT_UPDATE		0x8014	/* Port Database update. */
++#define MBA_SCR_UPDATE		0x8015	/* State Change Registration. */
++#define MBA_RSCN_UPDATE		MBA_SCR_UPDATE
++#define MBA_SCSI_COMPLETION	0x8020  /* SCSI Command Complete. */
++#define MBA_CTIO_COMPLETION	0x8021  /* CTIO Complete. */
++#if !defined(ISP2100)
++#define MBA_LINK_MODE_UP	0x8030  /* FC Link Mode UP. */
++#define MBA_UPDATE_CONFIG	0x8036  /* FC Update Configuration. */
++#endif
++
++/*
++ * ISP mailbox commands
++ */
++#define MBC_LOAD_RAM              1     /* Load RAM. */
++#define MBC_EXECUTE_FIRMWARE      2     /* Execute firmware. */
++#define MBC_WRITE_RAM_WORD        4     /* Write RAM word. */
++#define MBC_READ_RAM_WORD         5     /* Read RAM word. */
++#define MBC_MAILBOX_REGISTER_TEST 6     /* Wrap incoming mailboxes */
++#define MBC_VERIFY_CHECKSUM       7     /* Verify checksum. */
++#define MBC_ABOUT_FIRMWARE        8     /* Get firmware revision. */
++#define MBC_LOAD_RAM_A64          9     /* Load RAM by 64-bit address. */
++#define MBC_DUMP_RAM              0xA   /* READ BACK FW */
++#define MBC_LOAD_RAM_EXTENDED     0xB   /* Load Extended RAM */
++#define MBC_DUMP_SRAM             0xC   /* Dump SRAM    */
++#define MBC_WRITE_RAM_WORD_EXTENDED	0xD     /* Write RAM word extended */
++#define MBC_IOCB_EXECUTE          0x12  /* Execute an IOCB command */
++#define MBC_ABORT_COMMAND         0x15  /* Abort IOCB command. */
++#define MBC_ABORT_DEVICE          0x16  /* Abort device (ID/LUN). */
++#define MBC_ABORT_TARGET          0x17  /* Abort target (ID). */
++#define MBC_TARGET_RESET_ALL      0x18  /* Reset all local targets. */
++#define MBC_GET_ADAPTER_LOOP_ID   0x20  /* Get loop id of ISP2100. */
++#define MBC_GET_RETRY_COUNT       0x22  /* GET RATOV & retry count */
++#define MBC_GET_FIRMWARE_OPTIONS  0x28  /* Get firmware options. */
++#define MBC_SET_RETRY_COUNT       0x32  /* SET RATOV & retry count. */
++#define MBC_SET_FIRMWARE_OPTIONS  0x38  /* Set firmware options. */
++#define MBC_GET_RESOURCE_COUNTS   0x42  /* GET Resource counts */
++#define MBC_DIAGNOSTIC_LOOP_BACK  0x45  /* Perform LoopBack diagnostic */
++#define MBC_ENHANCED_GET_PORT_DATABASE     0x47  /* Get port database. */
++#define MBC_IOCB_EXECUTE_A64	  0x54  /* Execute an IOCB command (64bit) */
++#define	MBC_SEND_RNID_ELS         0x57	/* Send RNID ELS request */
++#define	MBC_SET_RNID_PARAMS       0x59	/* Set RNID parameters */
++#define	MBC_GET_RNID_PARAMS       0x5a	/* Get RNID parameters */
++#define MBC_INITIALIZE_FIRMWARE   0x60  /* Initialize firmware */
++#define MBC_INITIATE_LIP          0x62  /* Initiate Loop Initialization */
++                                        /* Procedure */
++#define MBC_GET_FCAL_MAP	0x63  /* Get FC/AL position map */
++#define MBC_GET_PORT_DATABASE     0x64  /* Get port database. */
++#define MBC_TARGET_RESET	  0x66  /* Target reset. */
++#define MBC_GET_FIRMWARE_STATE    0x69  /* Get firmware state. */
++#define MBC_GET_PORT_NAME         0x6a  /* Get port name. */
++#define MBC_GET_LINK_STATUS       0x6b  /* Get link status. */
++#define MBC_LIP_RESET             0x6c  /* LIP reset. */
++#define MBC_SEND_SNS_COMMAND      0x6e  /* Send Simple Name Server command. */
++#define MBC_LOGIN_FABRIC_PORT     0x6f  /* Login fabric port. */
++#define MBC_LOGOUT_FABRIC_PORT    0x71  /* Logout fabric port. */
++#define MBC_LIP_FULL_LOGIN        0x72  /* Full login LIP. */
++#define	MBC_LOGIN_LOOP_PORT       0x74	/* Login Loop Port. */
++#define MBC_GET_PORT_LIST         0x75  /* Get port list. */
++#define	MBC_INITIALIZE_RECEIVE_QUEUE	0x77	/* Initialize receive queue */
++#define	MBC_SEND_FARP_REQ_COMMAND	0x78	/* FARP request. */
++#define	MBC_SEND_FARP_REPLY_COMMAND	0x79	/* FARP reply. */
++#define	MBC_PORT_LOOP_NAME_LIST		0x7C	/* Get port/node name list. */
++#define	MBC_SEND_LFA_COMMAND		0x7D	/* Send Loop Fabric Address */
++#define	MBC_LUN_RESET			0x7E	/* Send LUN reset */
++
++/* Firmware return data sizes */
++#define FCAL_MAP_SIZE	128
++
++/* Mailbox bit definitions for out_mb and in_mb */
++#define	MBX_31		BIT_31
++#define	MBX_30		BIT_30
++#define	MBX_29		BIT_29
++#define	MBX_28		BIT_28
++#define	MBX_27		BIT_27
++#define	MBX_26		BIT_26
++#define	MBX_25		BIT_25
++#define	MBX_24		BIT_24
++#define	MBX_23		BIT_23
++#define	MBX_22		BIT_22
++#define	MBX_21		BIT_21
++#define	MBX_20		BIT_20
++#define	MBX_19		BIT_19
++#define	MBX_18		BIT_18
++#define	MBX_17		BIT_17
++#define	MBX_16		BIT_16
++#define	MBX_15		BIT_15
++#define	MBX_14		BIT_14
++#define	MBX_13		BIT_13
++#define	MBX_12		BIT_12
++#define	MBX_11		BIT_11
++#define	MBX_10		BIT_10
++#define	MBX_9		BIT_9
++#define	MBX_8		BIT_8
++#define	MBX_7		BIT_7
++#define	MBX_6		BIT_6
++#define	MBX_5		BIT_5
++#define	MBX_4		BIT_4
++#define	MBX_3		BIT_3
++#define	MBX_2		BIT_2
++#define	MBX_1		BIT_1
++#define	MBX_0		BIT_0
++
++/*
++ * Firmware state codes from get firmware state mailbox command
++ */
++#define FSTATE_CONFIG_WAIT      0
++#define FSTATE_WAIT_AL_PA       1
++#define FSTATE_WAIT_LOGIN       2
++#define FSTATE_READY            3
++#define FSTATE_LOSS_OF_SYNC     4
++#define FSTATE_ERROR            5
++#define FSTATE_REINIT           6
++#define FSTATE_NON_PART         7
++
++#define FSTATE_CONFIG_CORRECT      0
++#define FSTATE_P2P_RCV_LIP         1
++#define FSTATE_P2P_CHOOSE_LOOP     2
++#define FSTATE_P2P_RCV_UNIDEN_LIP  3
++#define FSTATE_FATAL_ERROR         4
++#define FSTATE_LOOP_BACK_CONN      5
++
++/*
++ * Port Database structure definition
++ * Little endian except where noted.
++ */
++#define	PORT_DATABASE_SIZE	128	/* bytes */
++typedef struct {
++	uint8_t options;
++	uint8_t control;
++	uint8_t master_state;
++	uint8_t slave_state;
++#define	PD_STATE_DISCOVERY			0
++#define	PD_STATE_WAIT_DISCOVERY_ACK		1
++#define	PD_STATE_PORT_LOGIN			2
++#define	PD_STATE_WAIT_PORT_LOGIN_ACK		3
++#define	PD_STATE_PROCESS_LOGIN			4
++#define	PD_STATE_WAIT_PROCESS_LOGIN_ACK		5
++#define	PD_STATE_PORT_LOGGED_IN			6
++#define	PD_STATE_PORT_UNAVAILABLE		7
++#define	PD_STATE_PROCESS_LOGOUT			8
++#define	PD_STATE_WAIT_PROCESS_LOGOUT_ACK	9
++#define	PD_STATE_PORT_LOGOUT			10
++#define	PD_STATE_WAIT_PORT_LOGOUT_ACK		11
++	uint8_t reserved[2];
++	uint8_t hard_address;
++	uint8_t reserved_1;
++	uint8_t port_id[4];
++	uint8_t node_name[8];			/* Big endian. */
++	uint8_t port_name[8];			/* Big endian. */
++	uint16_t execution_throttle;
++	uint16_t execution_count;
++	uint8_t reset_count;
++	uint8_t reserved_2;
++	uint16_t resource_allocation;
++	uint16_t current_allocation;
++	uint16_t queue_head;
++	uint16_t queue_tail;
++	uint16_t transmit_execution_list_next;
++	uint16_t transmit_execution_list_previous;
++	uint16_t common_features;
++	uint16_t total_concurrent_sequences;
++	uint16_t RO_by_information_category;
++	uint8_t recipient;
++	uint8_t initiator;
++	uint16_t receive_data_size;
++	uint16_t concurrent_sequences;
++	uint16_t open_sequences_per_exchange;
++	uint16_t lun_abort_flags;
++	uint16_t lun_stop_flags;
++	uint16_t stop_queue_head;
++	uint16_t stop_queue_tail;
++	uint16_t port_retry_timer;
++	uint16_t next_sequence_id;
++	uint16_t frame_count;
++	uint16_t PRLI_payload_length;
++	uint8_t prli_svc_param_word_0[2];	/* Big endian */
++						/* Bits 15-0 of word 0 */
++	uint8_t prli_svc_param_word_3[2];	/* Big endian */
++						/* Bits 15-0 of word 3 */
++	uint16_t loop_id;
++	uint16_t extended_lun_info_list_pointer;
++	uint16_t extended_lun_stop_list_pointer;
++} port_database_t;
++
++/*
++ * ISP Initialization Control Block.
++ */
++
++#define SO_DATA_RATE_1GB	0
++#define SO_DATA_RATE_2GB	1
++#define SO_DATA_RATE_AUTO	2
++
++/*
++ * ISP Initialization Control Block.
++ * Little endian except where noted.
++ */
++#define	ICB_VERSION 1
++typedef struct {
++	uint8_t  version;
++	uint8_t  reserved_1;
++
++	/*
++	 * LSB BIT 0  = Enable Hard Loop Id
++	 * LSB BIT 1  = Enable Fairness
++	 * LSB BIT 2  = Enable Full-Duplex
++	 * LSB BIT 3  = Enable Fast Posting
++	 * LSB BIT 4  = Enable Target Mode
++	 * LSB BIT 5  = Disable Initiator Mode
++	 * LSB BIT 6  = Enable ADISC
++	 * LSB BIT 7  = Enable Target Inquiry Data
++	 *
++	 * MSB BIT 0  = Enable PDBC Notify
++	 * MSB BIT 1  = Non Participating LIP
++	 * MSB BIT 2  = Descending Loop ID Search
++	 * MSB BIT 3  = Acquire Loop ID in LIPA
++	 * MSB BIT 4  = Stop PortQ on Full Status
++	 * MSB BIT 5  = Full Login after LIP
++	 * MSB BIT 6  = Node Name Option
++	 * MSB BIT 7  = Ext IFWCB enable bit
++	 */
++	uint8_t  firmware_options[2];
++
++	uint16_t frame_payload_size;
++	uint16_t max_iocb_allocation;
++	uint16_t execution_throttle;
++	uint8_t  retry_count;
++	uint8_t	 retry_delay;			/* unused */
++	uint8_t	 port_name[WWN_SIZE];		/* Big endian. */
++	uint16_t hard_address;
++	uint8_t	 inquiry_data;
++	uint8_t	 login_timeout;
++	uint8_t	 node_name[WWN_SIZE];		/* Big endian. */
++
++	uint16_t request_q_outpointer;
++	uint16_t response_q_inpointer;
++	uint16_t request_q_length;
++	uint16_t response_q_length;
++	uint32_t request_q_address[2];
++	uint32_t response_q_address[2];
++
++	uint16_t lun_enables;
++	uint8_t  command_resource_count;
++	uint8_t  immediate_notify_resource_count;
++	uint16_t timeout;
++	uint8_t  reserved_2[2];
++
++	/*
++	 * LSB BIT 0 = Timer Operation mode bit 0
++	 * LSB BIT 1 = Timer Operation mode bit 1
++	 * LSB BIT 2 = Timer Operation mode bit 2
++	 * LSB BIT 3 = Timer Operation mode bit 3
++	 * LSB BIT 4 = Init Config Mode bit 0
++	 * LSB BIT 5 = Init Config Mode bit 1
++	 * LSB BIT 6 = Init Config Mode bit 2
++	 * LSB BIT 7 = Enable Non part on LIHA failure
++	 *
++	 * MSB BIT 0 = Enable class 2
++	 * MSB BIT 1 = Enable ACK0
++	 * MSB BIT 2 =
++	 * MSB BIT 3 =
++	 * MSB BIT 4 = FC Tape Enable
++	 * MSB BIT 5 = Enable FC Confirm
++	 * MSB BIT 6 = Enable command queuing in target mode
++	 * MSB BIT 7 = No Logo On Link Down
++	 */
++	uint8_t	 add_firmware_options[2];
++
++	uint8_t	 response_accumulation_timer;
++	uint8_t	 interrupt_delay_timer;
++
++	/*
++	 * LSB BIT 0 = Enable Read xfr_rdy
++	 * LSB BIT 1 = Soft ID only
++	 * LSB BIT 2 =
++	 * LSB BIT 3 =
++	 * LSB BIT 4 = FCP RSP Payload [0]
++	 * LSB BIT 5 = FCP RSP Payload [1] / Sbus enable - 2200
++	 * LSB BIT 6 = Enable Out-of-Order frame handling
++	 * LSB BIT 7 = Disable Automatic PLOGI on Local Loop
++	 *
++	 * MSB BIT 0 = Sbus enable - 2300
++	 * MSB BIT 1 =
++	 * MSB BIT 2 =
++	 * MSB BIT 3 =
++	 * MSB BIT 4 =
++	 * MSB BIT 5 = enable 50 ohm termination
++	 * MSB BIT 6 = Data Rate (2300 only)
++	 * MSB BIT 7 = Data Rate (2300 only)
++	 */
++	uint8_t	 special_options[2];
++
++	uint8_t  reserved_3[26];
++} init_cb_t;
++
++/*
++ * ISP Get/Set Target Parameters mailbox command control flags.
++ */
++
++/*
++ * Get Link Status mailbox command return buffer.
++ */
++typedef struct {
++	uint32_t	link_fail_cnt;
++	uint32_t	loss_sync_cnt;
++	uint32_t	loss_sig_cnt;
++	uint32_t	prim_seq_err_cnt;
++	uint32_t	inval_xmit_word_cnt;
++	uint32_t	inval_crc_cnt;
++} link_stat_t;
++
++/*
++ * NVRAM Command values.
++ */
++#define NV_START_BIT            BIT_2
++#define NV_WRITE_OP             (BIT_26+BIT_24)
++#define NV_READ_OP              (BIT_26+BIT_25)
++#define NV_ERASE_OP             (BIT_26+BIT_25+BIT_24)
++#define NV_MASK_OP              (BIT_26+BIT_25+BIT_24)
++#define NV_DELAY_COUNT          10
++
++/*
++ * QLogic ISP2100, ISP2200 and ISP2300 NVRAM structure definition.
++ */
++typedef struct {
++	/*
++	 * NVRAM header
++	 */
++	uint8_t	id[4];
++	uint8_t	nvram_version;
++	uint8_t	reserved_0;
++
++	/*
++	 * NVRAM RISC parameter block
++	 */
++	uint8_t	parameter_block_version;
++	uint8_t	reserved_1;
++
++	/*
++	 * LSB BIT 0  = Enable Hard Loop Id
++	 * LSB BIT 1  = Enable Fairness
++	 * LSB BIT 2  = Enable Full-Duplex
++	 * LSB BIT 3  = Enable Fast Posting
++	 * LSB BIT 4  = Enable Target Mode
++	 * LSB BIT 5  = Disable Initiator Mode
++	 * LSB BIT 6  = Enable ADISC
++	 * LSB BIT 7  = Enable Target Inquiry Data
++	 *
++	 * MSB BIT 0  = Enable PDBC Notify
++	 * MSB BIT 1  = Non Participating LIP
++	 * MSB BIT 2  = Descending Loop ID Search
++	 * MSB BIT 3  = Acquire Loop ID in LIPA
++	 * MSB BIT 4  = Stop PortQ on Full Status
++	 * MSB BIT 5  = Full Login after LIP
++	 * MSB BIT 6  = Node Name Option
++	 * MSB BIT 7  = Ext IFWCB enable bit
++	 */
++	uint8_t	 firmware_options[2];
++
++	uint16_t frame_payload_size;
++	uint16_t max_iocb_allocation;
++	uint16_t execution_throttle;
++	uint8_t	 retry_count;
++	uint8_t	 retry_delay;			/* unused */
++	uint8_t	 port_name[WWN_SIZE];		/* Big endian. */
++	uint16_t hard_address;
++	uint8_t	 inquiry_data;
++	uint8_t	 login_timeout;
++	uint8_t	 node_name[WWN_SIZE];		/* Big endian. */
++
++	/*
++	 * LSB BIT 0 = Timer Operation mode bit 0
++	 * LSB BIT 1 = Timer Operation mode bit 1
++	 * LSB BIT 2 = Timer Operation mode bit 2
++	 * LSB BIT 3 = Timer Operation mode bit 3
++	 * LSB BIT 4 = Init Config Mode bit 0
++	 * LSB BIT 5 = Init Config Mode bit 1
++	 * LSB BIT 6 = Init Config Mode bit 2
++	 * LSB BIT 7 = Enable Non part on LIHA failure
++	 *
++	 * MSB BIT 0 = Enable class 2
++	 * MSB BIT 1 = Enable ACK0
++	 * MSB BIT 2 =
++	 * MSB BIT 3 =
++	 * MSB BIT 4 = FC Tape Enable
++	 * MSB BIT 5 = Enable FC Confirm
++	 * MSB BIT 6 = Enable command queuing in target mode
++	 * MSB BIT 7 = No Logo On Link Down
++	 */
++	uint8_t	 add_firmware_options[2];
++
++	uint8_t	 response_accumulation_timer;
++	uint8_t	 interrupt_delay_timer;
++
++	/*
++	 * LSB BIT 0 = Enable Read xfr_rdy
++	 * LSB BIT 1 = Soft ID only
++	 * LSB BIT 2 =
++	 * LSB BIT 3 =
++	 * LSB BIT 4 = FCP RSP Payload [0]
++	 * LSB BIT 5 = FCP RSP Payload [1] / Sbus enable - 2200
++	 * LSB BIT 6 = Enable Out-of-Order frame handling
++	 * LSB BIT 7 = Disable Automatic PLOGI on Local Loop
++	 *
++	 * MSB BIT 0 = Sbus enable - 2300
++	 * MSB BIT 1 =
++	 * MSB BIT 2 =
++	 * MSB BIT 3 =
++	 * MSB BIT 4 =
++	 * MSB BIT 5 = enable 50 ohm termination
++	 * MSB BIT 6 = Data Rate (2300 only)
++	 * MSB BIT 7 = Data Rate (2300 only)
++	 */
++	uint8_t	 special_options[2];
++
++	/* Reserved for expanded RISC parameter block */
++	uint8_t reserved_2[24];
++
++	/*
++	 * LSB BIT 0 = Output Swing 1G bit 0
++	 * LSB BIT 1 = Output Swing 1G bit 1
++	 * LSB BIT 2 = Output Swing 1G bit 2
++	 * LSB BIT 3 = Output Emphasis 1G bit 0
++	 * LSB BIT 4 = Output Emphasis 1G bit 1
++	 * LSB BIT 5 = Output Swing 2G bit 0
++	 * LSB BIT 6 = Output Swing 2G bit 1
++	 * LSB BIT 7 = Output Swing 2G bit 2
++	 *            
++	 * MSB BIT 0 = Output Emphasis 2G bit 0
++	 * MSB BIT 1 = Output Emphasis 2G bit 1
++	 * MSB BIT 2 = Output Enable
++	 * MSB BIT 3 =
++	 * MSB BIT 4 =
++	 * MSB BIT 5 =
++	 * MSB BIT 6 =
++	 * MSB BIT 7 =
++	 */
++	uint8_t seriallink_options[2];
++
++	/*
++	 * NVRAM host parameter block
++	 *
++	 * LSB BIT 0 = Enable spinup delay
++	 * LSB BIT 1 = Disable BIOS
++	 * LSB BIT 2 = Enable Memory Map BIOS
++	 * LSB BIT 3 = Enable Selectable Boot
++	 * LSB BIT 4 = Disable RISC code load
++	 * LSB BIT 5 = Set cache line size 1
++	 * LSB BIT 6 = PCI Parity Disable
++	 * LSB BIT 7 = Enable extended logging
++	 *
++	 * MSB BIT 0 = Enable 64bit addressing
++	 * MSB BIT 1 = Enable lip reset
++	 * MSB BIT 2 = Enable lip full login
++	 * MSB BIT 3 = Enable target reset
++	 * MSB BIT 4 = Enable database storage
++	 * MSB BIT 5 = Enable cache flush read
++	 * MSB BIT 6 = Enable database load
++	 * MSB BIT 7 = Enable alternate WWN
++	 */
++	uint8_t host_p[2];
++
++	uint8_t boot_node_name[WWN_SIZE];
++	uint8_t boot_lun_number;
++	uint8_t reset_delay;
++	uint8_t port_down_retry_count;
++	uint8_t boot_id_number;
++	uint16_t max_luns_per_target;
++	uint8_t fcode_boot_port_name[WWN_SIZE];
++	uint8_t alternate_port_name[WWN_SIZE];
++	uint8_t alternate_node_name[WWN_SIZE];
++
++	/*
++	 * BIT 0 = Boot Zoning
++	 * BIT 1 = Alt-Boot Enable
++	 * BIT 2 = Report SCSI Path
++	 * BIT 3 = unused
++	 * BIT 4 = unused
++	 * BIT 5 = unused
++	 * BIT 6 = unused
++	 * BIT 7 = unused
++	 */
++	uint8_t efi_parameters;
++
++	uint8_t link_down_timeout;
++
++	uint8_t adapter_id_0[4];
++	uint8_t adapter_id_1[4];
++	uint8_t adapter_id_2[4];
++	uint8_t adapter_id_3[4];
++
++	uint8_t alt1_boot_node_name[WWN_SIZE];
++	uint16_t alt1_boot_lun_number;
++	uint8_t alt2_boot_node_name[WWN_SIZE];
++	uint16_t alt2_boot_lun_number;
++	uint8_t alt3_boot_node_name[WWN_SIZE];
++	uint16_t alt3_boot_lun_number;
++	uint8_t alt4_boot_node_name[WWN_SIZE];
++	uint16_t alt4_boot_lun_number;
++	uint8_t alt5_boot_node_name[WWN_SIZE];
++	uint16_t alt5_boot_lun_number;
++	uint8_t alt6_boot_node_name[WWN_SIZE];
++	uint16_t alt6_boot_lun_number;
++	uint8_t alt7_boot_node_name[WWN_SIZE];
++	uint16_t alt7_boot_lun_number;
++
++	uint8_t reserved_3[2];
++
++	uint8_t oem_id;
++	uint8_t oem_specific[31];
++
++	/*
++	 * NVRAM Adapter Features offset 232-239
++	 *
++	 * LSB BIT 0 = External GBIC
++	 * LSB BIT 1 = Risc RAM parity
++	 * LSB BIT 2 = Buffer Plus Module
++	 * LSB BIT 3 = Multi Chip Adapter
++	 * LSB BIT 4 = Internal connector
++	 * LSB BIT 5 =
++	 * LSB BIT 6 =
++	 * LSB BIT 7 =
++	 *
++	 * MSB BIT 0 =
++	 * MSB BIT 1 =
++	 * MSB BIT 2 =
++	 * MSB BIT 3 =
++	 * MSB BIT 4 =
++	 * MSB BIT 5 =
++	 * MSB BIT 6 =
++	 * MSB BIT 7 =
++	 */
++	uint8_t	adapter_features[2];
++
++	uint8_t reserved_4[16];
++
++	/* Subsystem vendor ID for ISP2200 */
++	uint16_t subsystem_vendor_id_2200;
++
++	/* Subsystem device ID for ISP2200 */
++	uint16_t subsystem_device_id_2200;
++
++	uint8_t	 reserved_5;
++	uint8_t	 checksum;
++} nvram_t;
++
++
++/*
++ * ISP queue - command entry structure definition.
++ */
++#define MAX_CMDSZ   16			/* SCSI maximum CDB size. */
++typedef struct {
++	uint8_t		entry_type;	/* Entry type. */
++#define COMMAND_TYPE	0x11		/* Command entry */
++	uint8_t		entry_count;	/* Entry count. */
++	uint8_t		sys_define;	/* System defined. */
++	uint8_t		entry_status;	/* Entry Status. */
++	uint32_t	handle;		/* System handle. */
++#if defined(EXTENDED_IDS)
++	uint16_t	target;		/* SCSI ID */
++#else
++	uint8_t		reserved;
++	uint8_t		target;		/* SCSI ID */
++#endif
++	uint16_t	lun;		/* SCSI LUN */
++	uint16_t	control_flags;	/* Control flags. */
++#define CF_HEAD_TAG	BIT_1
++#define CF_ORDERED_TAG	BIT_2
++#define CF_SIMPLE_TAG	BIT_3
++#define CF_READ		BIT_5
++#define CF_WRITE	BIT_6
++	uint16_t	reserved_1;
++	uint16_t	timeout;	/* Command timeout. */
++	uint16_t	dseg_count;	/* Data segment count. */
++	uint8_t		scsi_cdb[MAX_CMDSZ]; 	/* SCSI command words. */
++	uint32_t	byte_count;	/* Total byte count. */
++	uint32_t	dseg_0_address;	/* Data segment 0 address. */
++	uint32_t	dseg_0_length;	/* Data segment 0 length. */
++	uint32_t	dseg_1_address;	/* Data segment 1 address. */
++	uint32_t	dseg_1_length;	/* Data segment 1 length. */
++	uint32_t	dseg_2_address;	/* Data segment 2 address. */
++	uint32_t	dseg_2_length;	/* Data segment 2 length. */
++} cmd_entry_t;
++
++/*
++ * ISP queue - 64-Bit addressing, command entry structure definition.
++ */
++#define COMMAND_A64_TYPE	0x19	/* Command A64 entry */
++typedef struct {
++	uint8_t		entry_type;	/* Entry type. */
++	uint8_t		entry_count;	/* Entry count. */
++	uint8_t		sys_define;	/* System defined. */
++	uint8_t		entry_status;	/* Entry Status. */
++	uint32_t	handle;		/* System handle. */
++#if defined(EXTENDED_IDS)
++	uint16_t	target;		/* SCSI ID */
++#else
++	uint8_t		reserved;
++	uint8_t		target;		/* SCSI ID */
++#endif
++	uint16_t	lun;		/* SCSI LUN */
++	uint16_t	control_flags;	/* Control flags. */
++	uint16_t	reserved_1;
++	uint16_t	timeout;	/* Command timeout. */
++	uint16_t	dseg_count;	/* Data segment count. */
++	uint8_t		scsi_cdb[MAX_CMDSZ];	/* SCSI command words. */
++	uint32_t	byte_count;	/* Total byte count. */
++	uint32_t	dseg_0_address[2];	/* Data segment 0 address. */
++	uint32_t	dseg_0_length;		/* Data segment 0 length. */
++	uint32_t	dseg_1_address[2];	/* Data segment 1 address. */
++	uint32_t	dseg_1_length;		/* Data segment 1 length. */
++} cmd_a64_entry_t, request_t;
++
++/*
++ * ISP queue - continuation entry structure definition.
++ */
++#define CONTINUE_TYPE		0x02	/* Continuation entry. */
++typedef struct {
++	uint8_t		entry_type;	/* Entry type. */
++	uint8_t		entry_count;	/* Entry count. */
++	uint8_t		sys_define;	/* System defined. */
++	uint8_t		entry_status;	/* Entry Status. */
++	uint32_t	reserved;
++	uint32_t	dseg_0_address;	/* Data segment 0 address. */
++	uint32_t	dseg_0_length;	/* Data segment 0 length. */
++	uint32_t	dseg_1_address;	/* Data segment 1 address. */
++	uint32_t	dseg_1_length;	/* Data segment 1 length. */
++	uint32_t	dseg_2_address;	/* Data segment 2 address. */
++	uint32_t	dseg_2_length;	/* Data segment 2 length. */
++	uint32_t	dseg_3_address;	/* Data segment 3 address. */
++	uint32_t	dseg_3_length;	/* Data segment 3 length. */
++	uint32_t	dseg_4_address;	/* Data segment 4 address. */
++	uint32_t	dseg_4_length;	/* Data segment 4 length. */
++	uint32_t	dseg_5_address;	/* Data segment 5 address. */
++	uint32_t	dseg_5_length;	/* Data segment 5 length. */
++	uint32_t	dseg_6_address;	/* Data segment 6 address. */
++	uint32_t	dseg_6_length;	/* Data segment 6 length. */
++} cont_entry_t;
++
++/*
++ * ISP queue - 64-Bit addressing, continuation entry structure definition.
++ */
++#define CONTINUE_A64_TYPE	0x0A	/* Continuation A64 entry. */
++typedef struct {
++	uint8_t		entry_type;	/* Entry type. */
++	uint8_t		entry_count;	/* Entry count. */
++	uint8_t		sys_define;	/* System defined. */
++	uint8_t		entry_status;	/* Entry Status. */
++	uint32_t	dseg_0_address[2]; /* Data segment 0 address. */
++	uint32_t	dseg_0_length;	/* Data segment 0 length. */
++	uint32_t	dseg_1_address[2]; /* Data segment 1 address. */
++	uint32_t	dseg_1_length;	/* Data segment 1 length. */
++	uint32_t	dseg_2_address[2]; /* Data segment 2 address. */
++	uint32_t	dseg_2_length;	/* Data segment 2 length. */
++	uint32_t	dseg_3_address[2]; /* Data segment 3 address. */
++	uint32_t	dseg_3_length;	/* Data segment 3 length. */
++	uint32_t	dseg_4_address[2]; /* Data segment 4 address. */
++	uint32_t	dseg_4_length;	/* Data segment 4 length. */
++} cont_a64_entry_t;
++
++/*
++ * ISP queue - status entry structure definition.
++ */
++#define STATUS_TYPE		0x03	/* Status entry. */
++#define STS_SENSE_BUF_LEN	32
++typedef struct {
++	uint8_t		entry_type;	/* Entry type. */
++	uint8_t		entry_count;	/* Entry count. */
++	uint8_t		sys_define;	/* System defined. */
++	uint8_t		entry_status;	/* Entry Status. */
++#define RF_INV_E_ORDER	BIT_5		/* Invalid entry order. */
++#define RF_INV_E_COUNT	BIT_4		/* Invalid entry count. */
++#define RF_INV_E_PARAM	BIT_3		/* Invalid entry parameter. */
++#define RF_INV_E_TYPE	BIT_2		/* Invalid entry type. */
++#define RF_BUSY		BIT_1		/* Busy */
++	uint32_t	handle;		/* System handle. */
++	uint16_t	scsi_status;	/* SCSI status. */
++	uint16_t	comp_status;	/* Completion status. */
++	uint16_t	state_flags;	/* State flags. */
++	uint16_t	status_flags;	/* Status flags. */
++#define IOCBSTAT_SF_LOGO BIT_13		/* Logo after 2 abts w/no */
++					/* response (2 sec) */
++	uint16_t	rsp_info_len;	/* Response Info Length. */
++	uint16_t	req_sense_length; /* Request sense data length. */
++	uint32_t	residual_length;  /* Residual transfer length. */
++	uint8_t		rsp_info[8];	/* FCP response information. */
++					/* Request sense data. */
++	uint8_t		req_sense_data[STS_SENSE_BUF_LEN];
++} sts_entry_t, response_t;
++
++/*
++ * ISP queue - marker entry structure definition.
++ */
++#define MARKER_TYPE	0x04		/* Marker entry. */
++typedef struct {
++	uint8_t		entry_type;	/* Entry type. */
++	uint8_t		entry_count;	/* Entry count. */
++	uint8_t		sys_define;	/* System defined. */
++	uint8_t		entry_status;	/* Entry Status. */
++	uint32_t	sys_define_2;	/* System defined. */
++#if defined(EXTENDED_IDS)
++	uint16_t	target;		/* SCSI ID */
++#else
++	uint8_t		reserved;
++	uint8_t		target;		/* SCSI ID */
++#endif
++	uint8_t		modifier;	/* Modifier (7-0). */
++#define MK_SYNC_ID_LUN	0		/* Synchronize ID/LUN */
++#define MK_SYNC_ID	1		/* Synchronize ID */
++#define MK_SYNC_ALL	2		/* Synchronize all ID/LUN */
++#define MK_SYNC_LIP	3		/* Synchronize all ID/LUN, */
++					/* clear port changed, */
++					/* use sequence number. */
++	uint8_t		reserved_1;
++	uint16_t	sequence_number; /* Sequence number of event */
++	uint16_t	lun;		/* SCSI LUN */
++	uint8_t		reserved_2[48];
++} mrk_entry_t;
++
++/*
++ * ISP queue - Status Contination entry structure definition.
++ */
++#define STATUS_CONT_TYPE	0x10	/* Status contination entry */
++#define EXT_STS_SENSE_BUF_LEN	60
++typedef struct {
++	uint8_t		entry_type;	/* Entry type. */
++	uint8_t		entry_count;	/* Entry count. */
++	uint8_t		reserved;
++	uint8_t		entry_status;	/* Entry Status. */
++					/* Extended sense data. */
++	uint8_t		req_sense_data[EXT_STS_SENSE_BUF_LEN];   
++} sts_cont_entry_t;
++
++/*
++ * ISP queue - Management Server entry structure definition.
++ */
++#define MS_IOCB_TYPE		0x29	/* Management Server IOCB entry */
++typedef struct {
++	uint8_t		entry_type;	/* Entry type. */
++	uint8_t		entry_count;	/* Entry count. */
++	uint8_t		sys_define;	/* System defined. */
++	uint8_t		entry_status;	/* Entry Status. */
++	uint32_t	handle1;	/* System handle. */
++#if defined(EXTENDED_IDS)
++	uint16_t	loop_id;
++#else
++	uint8_t		reserved;
++	uint8_t		loop_id;
++#endif
++	uint16_t	status;
++	uint16_t	control_flags;	/* Control flags. */
++	uint16_t	reserved2;
++	uint16_t	timeout;
++	uint16_t	cmd_dsd_count;
++	uint16_t	total_dsd_count;
++	uint8_t		type;
++	uint8_t		r_ctl;
++	uint16_t	rx_id;
++	uint16_t	reserved3;
++	uint32_t	handle2;
++	uint32_t	rsp_bytecount;
++	uint32_t	req_bytecount;
++	uint32_t	dseg_req_address[2]; /* Data segment 0 address. */
++	uint32_t	dseg_req_length;     /* Data segment 0 length. */
++	uint32_t	dseg_rsp_address[2]; /* Data segment 1 address. */
++	uint32_t	dseg_rsp_length;     /* Data segment 1 length. */
++} ms_iocb_entry_t;
++
++
++/*
++ * ISP queue - Mailbox Command entry structure definition.
++ */
++#define ET_MAILBOX_COMMAND	0x39
++struct mbx_entry {
++	uint8_t		entry_type;
++
++	uint8_t		entry_count;
++	uint8_t		sys_define1;
++	/* Use sys_define1 for source type */
++#define SOURCE_SCSI	0x00
++#define SOURCE_IP	0x01
++#define SOURCE_VI	0x02
++#define SOURCE_SCTP	0x03
++#define SOURCE_MP	0x04
++#define SOURCE_MPIOCTL	0x05
++
++	uint8_t		entry_status;
++
++	uint32_t	handle;
++#if defined(EXTENDED_IDS)
++	uint16_t	loop_id;
++#else
++	uint8_t		reserved_1;
++	uint8_t		loop_id;
++#endif
++
++	uint16_t	status;
++	uint16_t	state_flags;
++	uint16_t	status_flags;
++	uint16_t	sys_define2[4];
++	uint16_t	mb0;
++	/* Mailbox command completion status */
++#define MBS_PORT_ID_IN_USE		0x4007
++#define MBS_LOOP_ID_IN_USE		0x4008
++#define MBS_ALL_LOOP_IDS_IN_USE		0x4009
++#define MBS_NAME_SERVER_NOT_LOGGED_IN	0x400A
++
++	uint16_t	mb1;
++	/* Fabric login mailbox command option bits */
++#define MBC_NO_PLOGI_IF_LOGGED_IN	0x01
++#define MBC_NO_PROCESS_LOGIN		0x02
++
++	uint16_t	mb2;
++	uint16_t	mb3;
++	uint16_t	mb6;
++	uint16_t	mb7;
++#if defined(EXTENDED_IDS)
++	uint16_t	mb9;
++	uint16_t	mb10;
++	uint32_t	reserved_2[6];
++#else
++	uint32_t	reserved_2[7];
++#endif
++};
++
++/*
++ * ISP request and response queue entry sizes
++ */
++#define RESPONSE_ENTRY_SIZE	(sizeof(response_t))
++#define REQUEST_ENTRY_SIZE	(sizeof(request_t))
++
++/*
++ * ISP status entry - completion status definitions.
++ */
++#define CS_COMPLETE		0x0	/* No errors */
++#define CS_INCOMPLETE		0x1	/* Incomplete transfer of cmd. */
++#define CS_DMA			0x2	/* A DMA direction error. */
++#define CS_TRANSPORT		0x3	/* Transport error. */
++#define CS_RESET		0x4	/* SCSI bus reset occurred */
++#define CS_ABORTED		0x5	/* System aborted command. */
++#define CS_TIMEOUT		0x6	/* Timeout error. */
++#define CS_DATA_OVERRUN		0x7	/* Data overrun. */
++#define CS_DATA_UNDERRUN	0x15	/* Data Underrun. */
++#define CS_ABORT_MSG		0xE	/* Target rejected abort msg. */
++#define CS_DEV_RESET_MSG	0x12	/* Target rejected dev rst msg. */
++#define CS_PORT_UNAVAILABLE	0x28	/* Port unavailable (selection timeout) */
++#define CS_PORT_LOGGED_OUT	0x29	/* Port Logged Out */
++#define CS_PORT_CONFIG_CHG	0x2A	/* Port Configuration Changed */
++#define CS_PORT_BUSY		0x2B	/* Port Busy */
++#define CS_BAD_PAYLOAD		0x80	/* Driver defined */
++#define CS_UNKNOWN		0x81	/* Driver defined */
++#define CS_RETRY		0x82	/* Driver defined */
++#define CS_QUEUE_FULL		0x1c	/* Target queue full*/
++
++/*
++ * ISP status entry - SCSI status byte bit definitions.
++ */
++#define SS_MASK			0xfff /* Mask off reserved bits BIT_12-BIT_15*/
++#define SS_RESIDUAL_UNDER	BIT_11
++#define SS_RESIDUAL_OVER	BIT_10
++#define SS_SENSE_LEN_VALID	BIT_9
++#if defined(ISP2100)
++#define SS_RESIDUAL_LEN_VALID	BIT_8
++#else
++#define SS_RESPONSE_INFO_LEN_VALID	BIT_8
++#endif
++
++#define SS_RESERVE_CONFLICT	(BIT_4 | BIT_3)
++#define SS_BUSY_CONDITION	BIT_3
++#define SS_CONDITION_MET	BIT_2
++#define SS_CHECK_CONDITION	BIT_1
++
++/*
++ * 24 bit port ID type definition.
++ */
++typedef union {
++	uint32_t	b24 : 24;
++
++	struct {
++		uint8_t	d_id[3];
++		uint8_t	rsvd_1;
++	} r;
++
++	struct {
++		uint8_t	al_pa;
++		uint8_t	area;
++		uint8_t	domain;
++		uint8_t	rsvd_1;
++	} b;
++} port_id_t;
++
++/*
++ * Switch info gathering structure.
++ */
++typedef struct {
++	port_id_t	d_id;
++	uint8_t		node_name[WWN_SIZE];
++	uint8_t		port_name[WWN_SIZE];
++	uint32_t	type;
++#define SW_TYPE_SCSI	BIT_0
++#define SW_TYPE_IP	BIT_1
++} sw_info_t;
++
++//TODO This should be removed (simplified fcport list)
++typedef struct
++{
++    port_id_t d_id;
++    uint8_t   name[WWN_SIZE];
++    uint8_t   wwn[WWN_SIZE];          /* port name */
++    uint16_t  loop_id;
++    uint16_t   flag;
++  /* flags bits defined as follows */
++#define DEV_PUBLIC          BIT_0
++#define DEV_LUNMASK_SET     BIT_1  /* some LUNs masked for this device */
++#define	DEV_TAPE_DEVICE		BIT_2
++#define	DEV_RELOGIN	        BIT_3
++#define	DEV_PORT_DOWN	    BIT_4
++#define	DEV_CONFIGURED    	BIT_5
++#define	DEV_ABSENCE    		BIT_6
++#define	DEV_RETURN    		BIT_7
++#define	DEV_INITIATOR  		BIT_8
++#define	DEV_FLAG_VSA  		BIT_9
++	int			port_login_retry_count;
++    uint8_t  port_timer;
++}fcdev_t;
++
++/* New device name list struct; used in configure_fabric. */
++struct new_dev {
++    port_id_t  d_id;
++    uint8_t    name[WWN_SIZE];
++    uint8_t    wwn[WWN_SIZE];          /* port name */
++};
++#define LOGOUT_PERFORMED  0x01
++
++
++/*
++ * Inquiry command structure.
++ */
++#define INQ_SCSI_OPCODE		0x12
++#define	INQ_DATA_SIZE		36
++
++/*
++ * Inquiry mailbox IOCB packet definition.
++ */
++typedef struct {
++	union {
++		cmd_a64_entry_t	cmd;
++		sts_entry_t	rsp;
++	} p;
++	uint8_t		inq[INQ_DATA_SIZE];
++} inq_cmd_rsp_t;
++
++/*
++ * Report LUN command structure.
++ */
++#define RPT_LUN_SCSI_OPCODE	0xA0
++#define CHAR_TO_SHORT(a, b)	(uint16_t)((uint8_t)b << 8 | (uint8_t)a)
++
++typedef struct {
++	uint32_t	len;
++	uint32_t	rsrv;
++} rpt_hdr_t;
++
++typedef struct {
++	struct {
++		uint8_t	b : 6;
++		uint8_t	address_method : 2;
++	} msb;
++	uint8_t		lsb;
++	uint8_t		unused[6];
++} rpt_lun_t;
++
++typedef struct {
++	rpt_hdr_t	hdr;
++	rpt_lun_t	lst[MAX_LUNS];
++} rpt_lun_lst_t;
++
++/*
++ * Report Lun mailbox IOCB packet definition.
++ */
++typedef struct {
++	union {
++		cmd_a64_entry_t cmd;
++		sts_entry_t rsp;
++	} p;
++	rpt_lun_lst_t list;
++} rpt_lun_cmd_rsp_t;
++
++//TODO Continue formatting
++/*
++ * SCSI Target Queue structure
++ */
++typedef struct os_tgt {
++	struct os_lun		*olun[MAX_LUNS]; /* LUN context pointer. */
++	uint8_t			port_down_retry_count;
++	struct scsi_qla_host	*ha;
++    	uint32_t		down_timer;
++
++	/* Persistent binding information */
++	port_id_t		d_id;
++	uint8_t			node_name[WWN_SIZE];
++	uint8_t			port_name[WWN_SIZE];
++	struct fc_port		*vis_port;
++
++	uint8_t			flags;
++#define	TGT_BUSY		BIT_0		/* Reached hi-water mark */
++#define	TGT_TAGGED_QUEUE	BIT_1		/* Tagged queuing. */
++} os_tgt_t;
++
++/*
++ * SCSI LUN Queue structure
++ */
++typedef struct os_lun {
++	struct fc_lun	*fclun;		/* FC LUN context pointer. */
++    	spinlock_t      q_lock;       /* Lun Lock */
++
++	u_long		io_cnt;     /* total xfer count since boot */
++	u_long		out_cnt;    /* total outstanding IO count */
++	u_long		w_cnt;      /* total writes */
++	u_long		r_cnt;      /* total reads */
++	u_long		avg_time;      /*  */
++
++	unsigned long	q_flag;
++#define	LUN_MPIO_BUSY		2	/* Lun is changing paths  */
++#define	LUN_SCSI_SCAN_DONE	BIT_3	/* indicates the scsi scan is done */
++#define	LUN_EXEC_DELAYED	7	/* Lun execution is delayed */
++
++	u_long		q_timeout;           /* total command timeouts */
++	atomic_t	q_timer;  /* suspend timer */
++	uint32_t	q_count;	/* current count */
++	uint32_t	q_max;		/* maxmum count lun can be suspended */
++	uint8_t		q_state;	/* lun State */
++#define	LUN_STATE_READY	1	/* indicates the lun is ready for i/o */
++#define	LUN_STATE_RUN	2	/* indicates the lun has a timer running */
++#define	LUN_STATE_WAIT	3	/* indicates the lun is suspended */
++#define	LUN_STATE_TIMEOUT  4	/* indicates the lun has timed out */
++
++} os_lun_t;
++
++
++/* LUN BitMask structure definition, array of 32bit words,
++ * 1 bit per lun.  When bit == 1, the lun is masked.
++ * Most significant bit of mask[0] is lun 0, bit 24 is lun 7.
++ */
++typedef struct lun_bit_mask {
++	/* Must allocate at least enough bits to accomodate all LUNs */
++#if ((MAX_FIBRE_LUNS & 0x7) == 0)
++	UINT8	mask[MAX_FIBRE_LUNS >> 3];
++#else
++	uint8_t	mask[(MAX_FIBRE_LUNS + 8) >> 3];
++#endif
++} lun_bit_mask_t;
++
++/*
++ * Fibre channel port structure.
++ */
++typedef struct fc_port {
++	struct list_head	list;
++
++	struct list_head	fcluns;
++
++	struct scsi_qla_host	*ha;
++	struct scsi_qla_host	*vis_ha; /* only used when suspending lun */
++	port_id_t		d_id;
++	uint16_t		loop_id;
++	uint16_t		old_loop_id;
++	int16_t			lun_cnt;
++	int16_t			dev_id;	/* index in fc_dev table */
++#define FC_NO_LOOP_ID		0x100
++	uint8_t			node_name[WWN_SIZE];	/* Big Endian. */
++	uint8_t			port_name[WWN_SIZE];	/* Big Endian. */
++	uint8_t			mp_byte;	/* multi-path byte (not used) */
++    	uint8_t		cur_path;		/* current path id */
++	int			port_login_retry_count;
++	int		login_retry;
++	atomic_t		state;		/* port state */
++#define FC_DEVICE_DEAD		1
++#define FC_DEVICE_LOST		2
++#define FC_ONLINE		3
++#define FC_LOGIN_NEEDED		4
++
++	uint8_t			flags;
++#define	FC_FABRIC_DEVICE	BIT_0
++#define	FC_TAPE_DEVICE		BIT_1
++#define	FC_INITIATOR_DEVICE	BIT_2
++#define	FC_CONFIG		BIT_3
++#define	FC_VSA			BIT_4
++#define	FC_HD_DEVICE		BIT_5
++#define	FC_SUPPORT_RPT_LUNS	BIT_6
++	atomic_t	port_down_timer;
++	lun_bit_mask_t	lun_mask;
++} fc_port_t;
++
++/*
++ * Fibre channel LUN structure.
++ */
++typedef struct fc_lun {
++        struct list_head	list;
++
++	fc_port_t		*fcport;
++	uint16_t		lun;
++	uint8_t			max_path_retries;
++	uint8_t			flags;
++#define	FC_DISCON_LUN		BIT_0
++} fc_lun_t;
++
++typedef struct
++{
++    uint8_t   in_use;
++}fabricid_t;
++
++typedef struct {
++	struct list_head	list;
++
++	uint8_t		node_name[WWN_SIZE];
++	uint8_t		port_name[WWN_SIZE];
++	port_id_t	d_id;
++	uint16_t	loop_id;
++} fc_initiator_t;
++
++/*
++ * Registered State Change Notification structures.
++ */
++typedef struct {
++    port_id_t d_id;
++    uint8_t format;
++} rscn_t;
++
++/*
++ * Flash Database structures.
++ */
++#define FLASH_DATABASE_0        0x1c000
++#define FLASH_DATABASE_1        0x18000
++#define FLASH_DATABASE_VERSION  1
++
++typedef struct
++{
++    uint32_t seq;
++    uint8_t  version;
++    uint8_t  checksum;
++    uint16_t size;
++    uint8_t  spares[8];
++}flash_hdr_t;
++
++typedef struct
++{
++    uint8_t name[WWN_SIZE];
++    uint8_t  spares[8];
++}flash_node_t;
++
++typedef struct
++{
++    flash_hdr_t  hdr;
++    flash_node_t node[MAX_FIBRE_DEVICES];
++}flash_database_t;
++//TODO End formatting
++
++/*
++ * FC-CT interface
++ *
++ * NOTE: All structures are in big-endian in form.
++ */
++
++#define CT_REJECT_RESPONSE	0x8001
++#define CT_ACCEPT_RESPONSE	0x8002
++
++#define NS_N_PORT_TYPE	0x01
++#define NS_NL_PORT_TYPE	0x02
++#define NS_NX_PORT_TYPE	0x7F
++
++#define	GA_NXT_CMD	0x100
++#define	GA_NXT_REQ_SIZE	(16 + 4)
++#define	GA_NXT_RSP_SIZE	(16 + 620)
++
++#define	GID_PT_CMD	0x1A1
++#define	GID_PT_REQ_SIZE	(16 + 4)
++#define	GID_PT_RSP_SIZE	(16 + (MAX_FIBRE_DEVICES * 4))
++
++#define	GPN_ID_CMD	0x112
++#define	GPN_ID_REQ_SIZE	(16 + 4)
++#define	GPN_ID_RSP_SIZE	(16 + 8)
++
++#define	GNN_ID_CMD	0x113
++#define	GNN_ID_REQ_SIZE	(16 + 4)
++#define	GNN_ID_RSP_SIZE	(16 + 8)
++
++#define	GFT_ID_CMD	0x117
++#define	GFT_ID_REQ_SIZE	(16 + 4)
++#define	GFT_ID_RSP_SIZE	(16 + 32)
++
++#define	RFT_ID_CMD	0x217
++#define	RFT_ID_REQ_SIZE	(16 + 4 + 32)
++#define	RFT_ID_RSP_SIZE	16
++
++#define	RFF_ID_CMD	0x21F
++#define	RFF_ID_REQ_SIZE	(16 + 4 + 2 + 1 + 1)
++#define	RFF_ID_RSP_SIZE	16
++
++#define	RNN_ID_CMD	0x213
++#define	RNN_ID_REQ_SIZE	(16 + 4 + 8)
++#define	RNN_ID_RSP_SIZE	16
++
++#define	RSNN_NN_CMD	 0x239
++#define	RSNN_NN_REQ_SIZE (16 + 8 + 1 + 255)
++#define	RSNN_NN_RSP_SIZE 16
++
++/* CT command header -- request/response common fields */
++struct ct_cmd_hdr {
++	uint8_t	revision;
++	uint8_t	in_id[3];
++	uint8_t gs_type;
++	uint8_t gs_subtype;
++	uint8_t options;
++	uint8_t reserved;
++};
++
++/* CT command request */
++struct ct_sns_req {
++	struct ct_cmd_hdr header;
++	uint16_t	command;
++	uint16_t	max_rsp_size;
++	uint32_t	reserved;
++
++	union {
++		/* GA_NXT, GPN_ID, GNN_ID, GFT_ID */
++		struct {
++			uint8_t reserved;
++			uint8_t	port_id[3];
++		} port_id;
++
++		struct {
++			uint8_t port_type;
++			uint8_t	domain;
++			uint8_t	area;
++			uint8_t	reserved;
++		} gid_pt;
++
++		struct {
++			uint8_t reserved;
++			uint8_t	port_id[3];
++			uint8_t	fc4_types[32];
++		} rft_id;
++
++		struct {
++			uint8_t reserved;
++			uint8_t	port_id[3];
++			uint16_t reserved2;
++			uint8_t	fc4_feature;
++			uint8_t	fc4_type;
++		} rff_id;
++
++		struct {
++			uint8_t reserved;
++			uint8_t	port_id[3];
++			uint8_t	node_name[8];
++		} rnn_id;
++
++		struct {
++			uint8_t	node_name[8];
++			uint8_t	name_len;
++			uint8_t	sym_node_name[255];
++		} rsnn_nn;
++	} req;
++};
++
++/* CT command response header */
++struct ct_rsp_hdr {
++	struct ct_cmd_hdr header;
++	uint16_t	response;
++	uint16_t	residual;
++	uint8_t		reserved;
++	uint8_t		reason_code;
++	uint8_t		explanation_code;
++	uint8_t		vendor_unique;
++};
++
++struct ct_sns_gid_pt_data {
++	uint8_t	control_byte;
++	uint8_t	port_id[3];
++};
++
++struct ct_sns_rsp {
++	struct ct_rsp_hdr header;
++
++	union {
++		struct {
++			uint8_t	port_type;
++			uint8_t	port_id[3];
++			uint8_t	port_name[8];
++			uint8_t	sym_port_name_len;
++			uint8_t	sym_port_name[255];
++			uint8_t	node_name[8];
++			uint8_t	sym_node_name_len;
++			uint8_t	sym_node_name[255];
++			uint8_t	init_proc_assoc[8];
++			uint8_t	node_ip_addr[16];
++			uint8_t	class_of_service[4];
++			uint8_t	fc4_types[32];
++			uint8_t ip_address[16];
++			uint8_t	fabric_port_name[8];
++			uint8_t	reserved;
++			uint8_t	hard_address[3];
++		} ga_nxt;
++
++		struct {
++			struct ct_sns_gid_pt_data entries[MAX_FIBRE_DEVICES];
++		} gid_pt;
++
++		struct {
++			uint8_t	port_name[8];
++		} gpn_id;
++
++		struct {
++			uint8_t	node_name[8];
++		} gnn_id;
++
++		struct {
++			uint8_t	fc4_types[32];
++		} gft_id;
++	} rsp;
++};
++
++struct ct_sns_pkt {
++	union {
++		struct ct_sns_req req;
++		struct ct_sns_rsp rsp;
++	} p;
++};
++
++#if defined(ISP2100)
++#define GN_LIST_LENGTH  126 * sizeof(port_list_entry_t)
++#else
++#define GN_LIST_LENGTH  256 * sizeof(port_list_entry_t)
++#endif
++
++/*
++ * Structure used in Get Port List mailbox command (0x75).
++ */
++typedef struct {
++	uint8_t		name[WWN_SIZE];
++	uint16_t	loop_id;
++} port_list_entry_t;
++
++/*
++ * Structure used for device info.
++ */
++typedef struct {
++	uint8_t		name[WWN_SIZE];
++	uint8_t		wwn[WWN_SIZE];
++	uint16_t		loop_id;
++	uint8_t		port_id[3];
++} device_data_t;
++
++//TODO Complete Formatting...
++
++/* Mailbox command completion status */
++#define MBS_PORT_ID_IN_USE              0x4007
++#define MBS_LOOP_ID_IN_USE              0x4008
++#define MBS_ALL_LOOP_IDS_IN_USE         0x4009
++#define MBS_NAME_SERVER_NOT_LOGGED_IN   0x400A
++
++
++#define MAX_IOCTL_WAIT_THREADS	32
++typedef struct _wait_q_t {
++	uint8_t			flags;
++#define WQ_IN_USE	0x1
++
++	struct semaphore	wait_q_sem;
++	struct _wait_q_t	*pnext;
++} wait_q_t;
++
++typedef struct hba_ioctl{
++
++	/* Ioctl cmd serialization */
++	uint16_t	access_bits; /* bits should be used atomically */
++#define IOCTL_ACTIVE	1 /* first bit */
++#define IOCTL_WANT	2 /* 2nd bit */
++
++	spinlock_t	wait_q_lock; /* IOCTL wait_q Queue Lock */
++	wait_q_t	wait_q_arr[MAX_IOCTL_WAIT_THREADS];
++	wait_q_t	*wait_q_head;
++	wait_q_t	*wait_q_tail;
++
++	/* Passthru cmd/completion */
++	struct semaphore	cmpl_sem;
++	struct timer_list	cmpl_timer;
++	uint8_t		ioctl_tov;
++	uint8_t		SCSIPT_InProgress;
++	uint8_t		MSIOCB_InProgress;
++
++	os_tgt_t	*ioctl_tq;
++	os_lun_t	*ioctl_lq;
++
++	/* AEN queue */
++	void		*aen_tracking_queue;/* points to async events buffer */
++	uint8_t		aen_q_head;	/* index to the current head of q */
++	uint8_t		aen_q_tail;	/* index to the current tail of q */
++
++	/* Misc. */
++	uint32_t	flags;
++#define	IOCTL_OPEN			BIT_0
++#define	IOCTL_AEN_TRACKING_ENABLE	BIT_1
++	uint8_t		*scrap_mem;	/* per ha scrap buf for ioctl usage */
++	uint32_t	scrap_mem_size; /* total size */
++	uint32_t	scrap_mem_used; /* portion used */
++
++} hba_ioctl_context;
++
++/* Mailbox command semaphore queue for command serialization */
++typedef struct _mbx_cmdq_t {
++	struct semaphore	cmd_sem;
++	struct _mbx_cmdq_t	*pnext;
++} mbx_cmdq_t;
++
++/*
++ * Linux Host Adapter structure
++ */
++typedef struct scsi_qla_host
++{
++	struct list_head	list;
++
++	/* Linux adapter configuration data */
++	struct Scsi_Host *host;             /* pointer to host data */
++	struct pci_dev   *pdev;
++
++	u_long            host_no;
++	u_long            instance;
++
++	device_reg_t     *iobase;           /* Base Memory-mapped I/O address */
++	volatile unsigned char  *mmpbase;      /* memory mapped address */
++
++	struct qla_board_info	*brd_info;
++	uint16_t		fw_major_version;
++	uint16_t		fw_minor_version;
++	uint16_t		fw_subminor_version;
++	uint16_t		fw_attributes;
++	uint32_t		fw_transfer_size;
++
++	uint16_t		fw_options1;
++	uint16_t		fw_options2;
++	uint16_t		fw_options3;
++	uint8_t			fw_seriallink_options[2];
++
++	ms_iocb_entry_t		*ms_iocb;
++	dma_addr_t		ms_iocb_dma;
++	struct ct_sns_pkt	*ct_sns;
++	dma_addr_t		ct_sns_dma;
++
++	uint16_t		isp_ctrl_status;
++
++	uint16_t           revision;
++	uint8_t           ports;
++	u_long            actthreads;
++	u_long            ipreq_cnt;
++	u_long            qthreads;
++	u_long            spurious_int;
++	uint32_t        total_isr_cnt;		/* Interrupt count */
++	uint32_t        total_isp_aborts;	/* controller err cnt */
++	uint32_t        total_lip_cnt;		/* LIP cnt */
++	uint32_t	total_dev_errs;		/* device error cnt */
++	uint32_t	total_ios;		/* IO cnt */
++	uint64_t	total_bytes;		/* xfr byte cnt */
++
++	/* Adapter I/O statistics for failover */
++	uint64_t	IosRequested;
++	uint64_t	BytesRequested;
++	uint64_t	IosExecuted;
++	uint64_t	BytesExecuted;
++
++	/* ISP connection configuration data */
++	uint16_t         max_public_loop_ids;
++	uint16_t         min_external_loopid; /* First external loop Id */
++	uint8_t          current_topology; /* Current ISP configuration */
++	uint8_t          prev_topology;    /* Previous ISP configuration */
++                     #define ISP_CFG_NL     1
++                     #define ISP_CFG_N      2
++                     #define ISP_CFG_FL     4
++                     #define ISP_CFG_F      8
++	uint8_t         id;                 /* Host adapter SCSI id */
++	uint16_t        loop_id;       /* Host adapter loop id */
++	port_id_t       d_id;           /* Host adapter port id */
++
++	uint8_t         operating_mode;  /* current F/W operating mode */
++		#define LOOP      0
++		#define P2P       1
++		#define LOOP_P2P  2
++		#define P2P_LOOP  3
++
++	uint8_t         active_fc4_types;/* active fc4 types */
++	uint8_t         current_speed;   /* current F/W operating speed */
++
++	/* NVRAM configuration data */
++	uint16_t        loop_reset_delay;   /* Loop reset delay. */
++	uint16_t        hiwat;              /* High water mark per device. */
++	uint16_t        execution_throttle; /* queue depth */ 
++	uint16_t        minimum_timeout;    /* Minimum timeout. */
++	uint8_t         retry_count;
++	uint8_t         login_timeout;
++	int             port_down_retry_count;
++	uint8_t         loop_down_timeout;
++	uint16_t        max_probe_luns;
++	uint16_t        max_luns;
++	uint16_t        max_targets;
++	
++	/* Fibre Channel Device List. */
++        struct list_head	fcports;
++
++	/* OS target queue pointers. */
++	os_tgt_t		*otgt[MAX_FIBRE_DEVICES];
++
++	/* Fibre Channel Device Database and LIP sequence. */
++	fcdev_t           fc_db[MAX_FIBRE_DEVICES]; /* Driver database. */
++	uint32_t          flash_db;         /* Flash database address in use. */
++	fabricid_t        fabricid[MAX_FIBRE_DEVICES]; /* Fabric ids table . */
++	uint32_t          flash_seq;        /* Flash database seq # in use. */
++	volatile uint16_t lip_seq;          /* LIP sequence number. */
++	
++	/* Tracks host adapters we find */	
++	struct list_head	fcinitiators;	/* Initiator database */
++    
++	  /* RSCN queue. */
++	rscn_t rscn_queue[MAX_RSCN_COUNT];
++	uint8_t rscn_in_ptr;
++	uint8_t rscn_out_ptr;
++
++	/* Doneq bottom half handler */
++	struct work_struct run_qla_task;
++
++	/* __get_free_pages() srb_t pool */
++	srb_t	*srb_pool;
++	int	srb_pool_order;
++
++	/*
++	 * Need to hold the list_lock with irq's disabled in order to
++	 * access the following list.
++	 * This list_lock is of lower priority than the io_request_lock.
++	 */
++	/*********************************************************/
++        spinlock_t              list_lock;      /* lock to guard lists which 
++						   hold srb_t's*/
++        struct list_head        retry_queue;    /* watchdog queue */
++        struct list_head        done_queue;     /* job on done queue */
++        struct list_head        failover_queue; /* failover list link. */
++	struct list_head        free_queue;     /* SRB free queue */
++	struct list_head        scsi_retry_queue;     /* SCSI retry queue */
++	
++	struct list_head        pending_queue;	/* SCSI command pending queue */
++
++        /*********************************************************/
++
++	/* This spinlock is used to protect "io transactions", you must	
++	 * aquire it before doing any IO to the card, eg with RD_REG*() and
++	 * WRT_REG*() for the duration of your entire commandtransaction.
++	 *
++	 * This spinlock is of lower priority than the io request lock.
++	 */
++
++	spinlock_t		hardware_lock;
++
++	/* Linux kernel thread */
++#if 0
++	struct task_struct  *dpc_handler;     /* kernel thread */
++	struct semaphore    *dpc_notify;     /* requester waits for DPC on this semaphore */
++	struct semaphore    dpc_sem;       /* DPC's semaphore */
++#endif
++	pid_t			dpc_pid;
++	int			dpc_should_die;
++	struct completion	dpc_inited;
++	struct completion	dpc_exited;
++	struct semaphore	*dpc_wait;
++
++	uint8_t dpc_active;                  /* DPC routine is active */
++
++	/* Received ISP mailbox data. */
++	volatile uint16_t mailbox_out[MAILBOX_REGISTER_COUNT];
++
++	/* Outstandings ISP commands. */
++	srb_t           *outstanding_cmds[MAX_OUTSTANDING_COMMANDS];
++	uint32_t current_outstanding_cmd; 
++
++	/* ISP ring lock, rings, and indexes */
++	dma_addr_t	request_dma;        /* Physical address. */
++	request_t       *request_ring;      /* Base virtual address */
++	request_t       *request_ring_ptr;  /* Current address. */
++	uint16_t        req_ring_index;     /* Current index. */
++	uint16_t        req_q_cnt;          /* Number of available entries. */
++
++	dma_addr_t	response_dma;       /* Physical address. */
++	response_t      *response_ring;     /* Base virtual address */
++	response_t      *response_ring_ptr; /* Current address. */
++	uint16_t        rsp_ring_index;     /* Current index. */
++    
++#if defined(FC_IP_SUPPORT)
++	/* Data for IP support */
++	uint8_t		ip_port_name[WWN_SIZE];
++
++	struct risc_rec_entry *risc_rec_q;	/* RISC receive queue */
++	dma_addr_t	risc_rec_q_dma;		/*  physical address */
++	uint16_t	rec_entries_in;
++	uint16_t	rec_entries_out;
++
++	struct send_cb	*active_scb_q[MAX_SEND_PACKETS];
++	uint32_t	current_scb_q_idx;
++
++	uint32_t	mtu;
++	uint16_t	header_size;
++	uint16_t        max_receive_buffers;
++	struct buffer_cb *receive_buffers;
++	uint32_t	receive_buff_data_size;
++
++	void		(*send_completion_routine)
++				(struct send_cb *scb);
++	void		*receive_packets_context;
++	void		(*receive_packets_routine)
++				(void *context, struct buffer_cb *bcb);
++	void		*notify_context;
++	void		(*notify_routine)
++				(void *context, uint32_t type);
++
++	struct ip_device ipdev_db[QLLAN_MAX_IP_DEVICES];
++	struct ip_device *ipdev_db_next_free;
++	struct ip_device *ipdev_db_top;
++	struct ip_device *ipdev_db_bottom;
++#endif
++
++	/* Firmware Initialization Control Block data */
++	dma_addr_t	init_cb_dma;         /* Physical address. */
++	init_cb_t       *init_cb;
++  
++	/* Timeout timers. */
++	uint8_t         queue_restart_timer;   
++	atomic_t         loop_down_timer;         /* loop down timer */
++	uint8_t         loop_down_abort_time;    /* port down timer */
++	uint32_t        timer_active;
++	uint32_t        forceLip;
++	struct timer_list        timer;
++
++	/* These are used by mailbox operations. */
++	mbx_cmd_t	*mcp;
++	unsigned long	mbx_cmd_flags;
++#define MBX_CMD_ACTIVE	1 /* first bit */
++#define MBX_CMD_WANT	2 /* 2nd bit */
++#define MBX_INTERRUPT	3 /* 3rd bit */
++#define MBX_INTR_WAIT   4 /* 4rd bit */
++
++	spinlock_t	mbx_reg_lock;   /* Mbx Cmd Register Lock */
++	spinlock_t	mbx_q_lock;     /* Mbx Active Cmd Queue Lock */
++	spinlock_t	mbx_bits_lock;  /* Mailbox access bits Lock */
++
++	uint32_t	mbx_lock_bits;  /* controlled by mbx_bits_lock */
++#define MBX_CMD_LOCK	1 /* first bit */
++#define MBX_CMD_WANT	2 /* 2nd bit */
++
++	struct semaphore  mbx_intr_sem;  /* Used for completion notification */
++
++	mbx_cmdq_t	*mbx_sem_pool_head;  /* Head Pointer to a list of
++			                      * recyclable mbx semaphore pool
++			                      * to be used during run time.
++			                      */
++	mbx_cmdq_t	*mbx_sem_pool_tail;  /* Tail Pointer to semaphore pool*/
++#define MBQ_INIT_LEN	16 /* initial mbx sem pool q len. actual len may vary */
++
++	mbx_cmdq_t	*mbx_q_head; /* Head Pointer to sem q for active cmds */
++	mbx_cmdq_t	*mbx_q_tail; /* Tail Pointer to sem q for active cmds */
++
++
++        uint32_t	retry_q_cnt; 
++        uint32_t	scsi_retry_q_cnt; 
++        uint32_t	failover_cnt; 
++
++	uint8_t	*cmdline;
++
++        uint32_t	login_retry_count; 
++    
++	volatile struct
++	{
++		uint32_t     online                  :1;   /* 0 */
++		uint32_t     enable_64bit_addressing :1;   /* 1 */
++		uint32_t     mbox_int                :1;   /* 2 */
++		uint32_t     mbox_busy               :1;   /* 3 */
++		// UNUSED and UNASSIGNED
++		uint32_t     port_name_used          :1;   /* 4 */
++		uint32_t     failover_enabled        :1;   /* 5 */
++		uint32_t     watchdog_enabled        :1;   /* 6 */
++		uint32_t     cfg_suspended   	     :1;   /* 7 */
++
++		uint32_t     disable_host_adapter    :1;   /* 8 */
++		uint32_t     rscn_queue_overflow     :1;   /* 9 */
++		uint32_t     reset_active            :1;   /* 10 */
++		uint32_t     link_down_error_enable  :1;   /* 11 */
++
++		uint32_t     disable_risc_code_load  :1;   /* 12 */
++		uint32_t     set_cache_line_size_1   :1;   /* 13 */
++		uint32_t     enable_target_mode      :1;   /* 14 */
++		uint32_t     disable_luns            :1;   /* 15 */
++
++		uint32_t     enable_lip_reset        :1;   /* 16 */
++		uint32_t     enable_lip_full_login   :1;   /* 17 */
++		uint32_t     enable_target_reset     :1;   /* 18 */
++		uint32_t     updated_fc_db           :1;   /* 19 */
++
++		uint32_t     enable_flash_db_update  :1;   /* 20 */
++		uint32_t     in_isr                  :1;   /* 21 */
++		uint32_t     dpc_sched               :1;   /* 23 */
++
++		uint32_t     nvram_config_done       :1;   /* 24 */
++		uint32_t     update_config_needed    :1;   /* 25 */
++		uint32_t     management_server_logged_in    :1; /* 26 */
++#if defined(FC_IP_SUPPORT)
++                uint32_t     enable_ip               :1;   /* 27 */
++#endif
++
++	} flags;
++
++	uint32_t     device_flags;
++#define DFLG_LOCAL_DEVICES		BIT_0
++#define DFLG_RETRY_LOCAL_DEVICES	BIT_1
++#define DFLG_FABRIC_DEVICES		BIT_2
++#define	SWITCH_FOUND			BIT_3
++#define	DFLG_NO_CABLE			BIT_4
++
++	unsigned long	cpu_flags;
++
++        uint8_t		marker_needed; 
++	uint8_t		missing_targets;
++	uint8_t		sns_retry_cnt;
++	uint8_t		cmd_wait_cnt;
++	uint8_t		mem_err;
++
++	unsigned long   dpc_flags;
++#define	RESET_MARKER_NEEDED	0	/* initiate sending a marker to ISP */
++#define	RESET_ACTIVE		1
++#define	ISP_ABORT_NEEDED	2	/* initiate ISP Abort */
++#define	ABORT_ISP_ACTIVE	3	/* isp abort in progress */
++
++#define	LOOP_RESYNC_NEEDED	4	/* initiate a configure fabric sequence */
++#define	LOOP_RESYNC_ACTIVE	5
++#define	COMMAND_WAIT_NEEDED	6
++#define	COMMAND_WAIT_ACTIVE	7
++
++#define LOCAL_LOOP_UPDATE       8	/* Perform a local loop update */
++#define RSCN_UPDATE             9	/* Perform a RSCN update */
++#define MAILBOX_RETRY           10
++#define ISP_RESET_NEEDED        11	/* Initiate a ISP reset ??? */
++
++#define FAILOVER_EVENT_NEEDED   12
++#define FAILOVER_EVENT		13
++#define FAILOVER_NEEDED   	14
++#define LOOP_RESET_NEEDED	15
++
++#define DEVICE_RESET_NEEDED	16
++#define DEVICE_ABORT_NEEDED	17
++#define SCSI_RESTART_NEEDED	18	/* Processes any requests in scsi retry queue */
++#define PORT_RESTART_NEEDED	19	/* Processes any requests in retry queue */
++
++#define RESTART_QUEUES_NEEDED	20	/* Restarts requeusts in the lun queue */
++#define ABORT_QUEUES_NEEDED	21
++#define RELOGIN_NEEDED	        22
++#define LOGIN_RETRY_NEEDED	23	/* initiates any fabric logins that are required */ 
++#define REGISTER_FC4_NEEDED	24	/* set when need to register again.*/
++
++#define TASKLET_SCHED		25	/* Tasklet is scheduled.  */ 
++#define DONE_RUNNING		26	/* Done task is running. */
++#define ISP_ABORT_RETRY         27      /* ISP aborted. */
++
++
++/* macro for timer to start dpc for handling mailbox commands */
++#define MAILBOX_CMD_NEEDED	(LOOP_RESET_NEEDED|DEVICE_RESET_NEEDED|   \
++    DEVICE_ABORT_NEEDED|ISP_ABORT_NEEDED)
++
++	/* These 3 fields are used by the reset done in dpc thread */
++	uint16_t	reset_bus_id;
++	uint16_t	reset_tgt_id;
++	uint16_t	reset_lun;
++
++	uint8_t		interrupts_on;
++	uint8_t		init_done;
++
++	volatile uint16_t loop_state;
++#define LOOP_TIMEOUT 0x01
++#define LOOP_DOWN    0x02
++#define LOOP_UP      0x04
++#define LOOP_UPDATE  0x08
++#define LOOP_READY   0x10
++
++	mbx_cmd_t 	mc;
++	uint32_t	mbx_flags;
++#define  MBX_IN_PROGRESS  BIT_0
++#define  MBX_BUSY       BIT_1 /* Got the Access */
++#define  MBX_SLEEPING_ON_SEM  BIT_2 
++#define  MBX_POLLING_FOR_COMP  BIT_3
++#define  MBX_COMPLETED      BIT_4
++#define  MBX_TIMEDOUT       BIT_5 
++#define  MBX_ACCESS_TIMEDOUT BIT_6
++
++/* following are new and needed for IOCTL support */
++	hba_ioctl_context *ioctl;
++	uint8_t     node_name[WWN_SIZE];
++
++	uint8_t     optrom_major; 
++	uint8_t     optrom_minor; 
++
++	uint8_t     nvram_version; 
++
++	void        *ioctl_mem;
++	dma_addr_t  ioctl_mem_phys;
++	uint32_t    ioctl_mem_size;
++	uint32_t    isp_abort_cnt;
++
++	/* HBA serial number */
++	uint8_t     serial0;
++	uint8_t     serial1;
++	uint8_t     serial2;
++
++	/* oem related items */
++	uint8_t	oem_id;
++	uint8_t oem_specific[31];
++
++	uint32_t    dump_done;
++	unsigned long    done_q_cnt;
++	unsigned long    pending_in_q;
++
++	uint32_t failover_type;
++	uint32_t failback_delay;
++	unsigned long   cfg_flags;
++#define	CFG_ACTIVE	0	/* CFG during a failover, event update, or ioctl */
++	/* uint8_t	cfg_active; */
++	int	eh_start;
++
++#if defined(IOCB_THROLLE_USAGE)
++	uint32_t 	 iocb_hiwat;
++	uint32_t 	 iocb_cnt;
++	uint32_t 	 iocb_overflow_cnt;
++#endif
++	
++	int	srb_cnt;
++	int	srb_alloc_cnt;	/*Number of allocated SRBs  */
++
++	uint32_t mbox_trace;
++
++	uint32_t	binding_type;
++#define BIND_BY_PORT_NAME	0
++#define BIND_BY_PORT_ID		1
++#define BIND_BY_NODE_NAME	2
++
++	srb_t	*status_srb;    /* Keep track of Status Continuation Entries */
++
++	uint32_t	dropped_frame_error_cnt;
++} scsi_qla_host_t;
++
++#if defined(__BIG_ENDIAN)
++/* Big endian machine correction defines. */
++#define	LITTLE_ENDIAN_16(x)	qla2x00_chg_endian((uint8_t *)&(x), 2)
++#define	LITTLE_ENDIAN_24(x)	qla2x00_chg_endian((uint8_t *)&(x), 3)
++#define	LITTLE_ENDIAN_32(x)	qla2x00_chg_endian((uint8_t *)&(x), 4)
++#define	LITTLE_ENDIAN_64(x)	qla2x00_chg_endian((uint8_t *)&(x), 8)
++#define	BIG_ENDIAN_16(x)
++#define	BIG_ENDIAN_24(x)
++#define	BIG_ENDIAN_32(x)
++#define	BIG_ENDIAN_64(x)
++
++#else
++/* Little endian machine correction defines. */
++#define	LITTLE_ENDIAN_16(x)
++#define	LITTLE_ENDIAN_24(x)
++#define	LITTLE_ENDIAN_32(x)
++#define	LITTLE_ENDIAN_64(x)
++#define	BIG_ENDIAN_16(x)	qla2x00_chg_endian((uint8_t *)&(x), 2)
++#define	BIG_ENDIAN_24(x)	qla2x00_chg_endian((uint8_t *)&(x), 3)
++#define	BIG_ENDIAN_32(x)	qla2x00_chg_endian((uint8_t *)&(x), 4)
++#define	BIG_ENDIAN_64(x)	qla2x00_chg_endian((uint8_t *)&(x), 8)
++
++#endif
++
++/*
++ * Macros to help code, maintain, etc.
++ */
++#define	LOOP_TRANSITION(ha)	( test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags) || \
++				  test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags) )
++
++#define	LOOP_NOT_READY(ha)	 ( (test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags) || \
++				    test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags) || \
++                                    test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags) || \
++				    test_bit(LOOP_RESYNC_ACTIVE, &ha->dpc_flags) || \
++				    test_bit(COMMAND_WAIT_NEEDED, &ha->dpc_flags) || \
++                                    test_bit(COMMAND_WAIT_ACTIVE, &ha->dpc_flags)) ||  \
++				 ha->loop_state == LOOP_DOWN)
++				 
++#define	LOOP_RDY(ha)	 ( !LOOP_NOT_READY(ha) )
++
++#define	TGT_Q(ha, t)		(ha->otgt[t])
++#define	LUN_Q(ha, t, l)		(TGT_Q(ha, t)->olun[l])
++#define GET_LU_Q(ha, t, l)  ( (TGT_Q(ha,t) != NULL)? TGT_Q(ha, t)->olun[l] : NULL)
++#define PORT_DOWN_TIMER(ha, t)    ((ha)->fc_db[(t)].port_timer)
++#define PORT(ha, t)    		((ha)->fc_db[(t)])
++#define PORT_LOGIN_RETRY(fcport)    ((fcport)->port_login_retry_count)
++
++#define MBOX_TRACE(ha,b)		{(ha)->mbox_trace |= (b);}
++
++#define	MBS_MASK			0x3fff
++#define	MBS_END				0x100
++#define	QLA2X00_SUCCESS		(MBS_COMMAND_COMPLETE & MBS_MASK)
++#define	QLA2X00_FAILED		(MBS_END + 2)
++#define	QLA2X00_FUNCTION_FAILED		(MBS_END + 2)
++
++#define  KMEM_ZALLOC(siz,id)	qla2x00_kmem_zalloc((siz), GFP_ATOMIC, (id))
++#define  KMEM_FREE(ip,siz)	kfree((ip))
++
++/*
++ * LOCK MACROS
++ */
++#define QLA_MBX_REG_LOCK(ha)	\
++    spin_lock_irqsave(&(ha)->mbx_reg_lock, mbx_flags);
++#define QLA_MBX_REG_UNLOCK(ha)	\
++    spin_unlock_irqrestore(&(ha)->mbx_reg_lock, mbx_flags);
++
++/*
++* Stat info for all adpaters
++*/
++struct _qla2x00stats  {
++        unsigned long   mboxtout;            /* mailbox timeouts */
++        unsigned long   mboxerr;             /* mailbox errors */
++        unsigned long   ispAbort;            /* ISP aborts */
++        unsigned long   debugNo;
++        unsigned long   loop_resync;
++        unsigned long   outarray_full;
++        unsigned long   retry_q_cnt;
++};
++
++#define SYS_DELAY(x)		udelay(x);barrier()
++#define QLA2100_DELAY(sec)	mdelay(sec * HZ)
++#define NVRAM_DELAY()		udelay(10)
++#define UDELAY(x)		udelay(x)
++
++#define  CACHE_FLUSH(a) (RD_REG_WORD(a))
++#define  INVALID_HANDLE    (MAX_OUTSTANDING_COMMANDS+1)
++
++#define  ABORTS_ACTIVE  ((test_bit(LOOP_RESET_NEEDED, &ha->dpc_flags)) || \
++			(test_bit(DEVICE_RESET_NEEDED, &ha->dpc_flags)) || \
++			(test_bit(DEVICE_ABORT_NEEDED, &ha->dpc_flags)) || \
++			(test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags)))
++
++/*
++ * Flash support definitions
++ */
++#define FLASH_IMAGE_SIZE	131072
++
++#include "qla_fo.h"
++#include "qla_cfg.h"
++#include "qla_gbl.h"
++#include "qla_dbg.h"
++#include "qla_inline.h"
++#include "qla_listops.h"
++
++#endif
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qla_fo.c	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,1681 @@
++/********************************************************************************
++*                  QLOGIC LINUX SOFTWARE
++*
++* QLogic ISP2x00 device driver for Linux 2.5.x
++* Copyright (C) 2003 Qlogic Corporation
++* (www.qlogic.com)
++*
++* This program is free software; you can redistribute it and/or modify it
++* under the terms of the GNU General Public License as published by the
++* Free Software Foundation; either version 2, or (at your option) any
++* later version.
++*
++* This program is distributed in the hope that it will be useful, but
++* WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++* General Public License for more details.
++*
++******************************************************************************
++* Failover include file
++******************************************************************************/
++
++#include "qla_os.h"
++#include "qla_def.h"
++
++#include "qlfo.h"
++#include "qlfolimits.h"
++
++//TODO Why??
++#include "qla_fo.cfg"
++
++/*
++ * Global variables
++ */
++SysFoParams_t qla_fo_params;
++
++/*
++ * Local routines
++ */
++#if !defined(linux)
++static int qla2x00_sdm_setup(EXT_IOCTL *cmd_stp, void *arg, int mode);
++#endif
++static uint32_t qla2x00_fo_get_params(PFO_PARAMS pp);
++static uint32_t qla2x00_fo_set_params(PFO_PARAMS pp);
++static uint8_t qla2x00_fo_count_retries(scsi_qla_host_t *ha, srb_t *sp);
++static int qla2x00_fo_get_lun_data(EXT_IOCTL *pext,
++		FO_LUN_DATA_INPUT *bp, int mode);
++static int qla2x00_fo_set_lun_data(EXT_IOCTL *pext,
++		FO_LUN_DATA_INPUT *bp, int mode);
++static uint32_t qla2x00_fo_stats(FO_HBA_STAT *stat_p, uint8_t reset);
++static int qla2x00_fo_set_target_data(EXT_IOCTL *pext,
++		FO_TARGET_DATA_INPUT *bp, int mode);
++static int qla2x00_fo_get_target_data(EXT_IOCTL *pext,
++		FO_TARGET_DATA_INPUT *bp, int mode);
++
++/*
++ * qla2x00_get_hba
++ *	Searches the hba structure chain for the requested instance
++ *      aquires the mutex and returns a pointer to the hba structure.
++ *
++ * Input:
++ *	inst = adapter instance number.
++ *
++ * Returns:
++ *	Return value is a pointer to the adapter structure or
++ *      NULL if instance not found.
++ *
++ * Context:
++ *	Kernel context.
++ */
++scsi_qla_host_t *
++qla2x00_get_hba(int instance)
++{
++	int	found;
++	struct list_head *hal;
++	scsi_qla_host_t *ha;
++
++	ha = NULL;
++	found = 0;
++	read_lock(&qla_hostlist_lock);
++	list_for_each(hal, &qla_hostlist) {
++		ha = list_entry(hal, scsi_qla_host_t, list);
++
++		if (ha->instance == instance) {
++			found++;
++			break;
++		}
++	}
++	read_unlock(&qla_hostlist_lock);
++
++	return (found ? ha : NULL);
++}
++
++/*
++ * qla2x00_fo_stats
++ *	Searches the hba structure chan for the requested instance
++ *      aquires the mutex and returns a pointer to the hba structure.
++ *
++ * Input:
++ *	stat_p = Pointer to FO_HBA_STAT union.
++ *      reset  = Flag, TRUE = reset statistics.
++ *                     FALSE = return statistics values.
++ *
++ * Returns:
++ *	0 = success
++ *
++ * Context:
++ *	Kernel context.
++ */
++static uint32_t
++qla2x00_fo_stats(FO_HBA_STAT *stat_p, uint8_t reset)
++{
++	int32_t	inst, idx;
++	uint32_t rval = 0;
++	struct list_head *hal;
++	scsi_qla_host_t *ha;
++
++	DEBUG9(printk("%s: entered.\n", __func__);)
++
++	inst = stat_p->input.HbaInstance;
++	stat_p->info.HbaCount = 0;
++
++	ha = NULL;
++
++	read_lock(&qla_hostlist_lock);
++	list_for_each(hal, &qla_hostlist) {
++		ha = list_entry(hal, scsi_qla_host_t, list);
++
++		if (inst == FO_ADAPTER_ALL) {
++			stat_p->info.HbaCount++;
++			idx = ha->instance;
++		} else if (ha->instance == inst) {
++			stat_p->info.HbaCount = 1;
++			idx = inst;
++		}
++		if (reset == TRUE) {
++			DEBUG9(printk("%s: reset stats.\n", __func__);)
++			ha->IosRequested = 0;
++			ha->BytesRequested = 0;
++			ha->IosExecuted = 0;
++			ha->BytesExecuted = 0;
++		} else {
++ 			DEBUG9(printk("%s: get stats for inst %d.\n",
++ 			    __func__, inst);)
++ 
++#if 0
++			stat_p->info.StatEntry[idx].IosRequested =
++				ha->IosRequested;
++			stat_p->info.StatEntry[idx].BytesRequested =
++				ha->BytesRequested;
++			stat_p->info.StatEntry[idx].IosExecuted =
++				ha->IosExecuted;
++			stat_p->info.StatEntry[idx].BytesExecuted =
++				ha->BytesExecuted;
++#endif
++		}
++		if (inst != FO_ADAPTER_ALL)
++			break;
++	}
++	read_unlock(&qla_hostlist_lock);
++ 
++ 	DEBUG9(printk("%s: exiting.\n", __func__);)
++ 
++	return rval;
++}
++
++/*
++ * qla2x00_fo_get_lun_data
++ *      Get lun data from all devices attached to a HBA (FO_GET_LUN_DATA).
++ *      Gets lun mask if failover not enabled.
++ *
++ * Input:
++ *      ha = pointer to adapter
++ *      bp = pointer to buffer
++ *
++ * Return;
++ *      0 on success or errno.
++ *
++ * Context:
++ *      Kernel context.
++ */
++static int
++qla2x00_fo_get_lun_data(EXT_IOCTL *pext, FO_LUN_DATA_INPUT *bp, int mode)
++{
++	scsi_qla_host_t  *ha;
++	struct list_head	*fcports, *fcpl;
++	fc_port_t        *fcport;
++	int              ret = 0;
++	mp_host_t        *host = NULL;
++	mp_device_t      *dp;
++	mp_path_t        *path;
++	mp_path_list_t   *pathlist;
++	os_tgt_t         *ostgt;
++	uint8_t          path_id;
++	uint16_t         dev_no;
++	uint16_t         cnt;
++	uint16_t         lun;
++	FO_EXTERNAL_LUN_DATA_ENTRY *u_entry, *entry;
++	FO_LUN_DATA_LIST *u_list, *list;
++
++
++	DEBUG9(printk("%s: entered.\n", __func__);)
++
++	ha = qla2x00_get_hba((int)bp->HbaInstance);
++
++	if (!ha) {
++		DEBUG2_9_10(printk("%s: no ha matching inst %d.\n",
++		    __func__, bp->HbaInstance);)
++
++		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++		return (ret);
++	}
++
++	DEBUG9(printk("%s: ha inst %ld, buff %p.\n",
++	    __func__, ha->instance, bp);)
++	DEBUG4(printk("%s: hba %p, buff %p bp->HbaInstance(%x).\n",
++	    __func__, ha, bp, (int)bp->HbaInstance));
++
++	if (ha->flags.failover_enabled)
++		if ((host = qla2x00_cfg_find_host(ha)) == NULL) {
++			DEBUG2_9_10(printk("%s: no HOST for ha inst %ld.\n",
++			    __func__, ha->instance);)
++			pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++			return (ret);
++		}
++
++	list = (FO_LUN_DATA_LIST *)qla2x00_kmem_zalloc(
++	    sizeof(FO_LUN_DATA_LIST), GFP_ATOMIC, 12);
++	if (list == NULL) {
++		DEBUG2_9_10(printk("%s: failed to alloc memory of size (%d)\n",
++		    __func__, (int)sizeof(FO_LUN_DATA_LIST));)
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		return (-ENOMEM);
++	}
++
++	entry = &list->DataEntry[0];
++
++	u_list = (FO_LUN_DATA_LIST *)pext->ResponseAdr;
++	u_entry = &u_list->DataEntry[0];
++
++	/* find the correct fcport list */
++	if (!ha->flags.failover_enabled)
++		fcports = &ha->fcports;
++	else
++		fcports = host->fcports;
++
++	/* Check thru this adapter's fcport list */
++	fcport = NULL;
++	list_for_each(fcpl, fcports) {
++		fcport = list_entry(fcpl, fc_port_t, list);
++
++		memcpy(entry->NodeName,
++		    fcport->node_name, EXT_DEF_WWN_NAME_SIZE);
++		memcpy(entry->PortName,
++		    fcport->port_name, EXT_DEF_WWN_NAME_SIZE);
++
++		if (!ha->flags.failover_enabled) {
++			/*
++			 * Failover disabled. Just return LUN mask info
++			 * in lun data entry of this port.
++			 */
++			entry->TargetId = 0;
++			for (cnt = 0; cnt < MAX_FIBRE_DEVICES; cnt++) {
++				if (!(ostgt = ha->otgt[cnt])) {
++					continue;
++				}
++
++				if (ostgt->vis_port == fcport) {
++					entry->TargetId = cnt;
++					break;
++				}
++			}
++			if (cnt == MAX_FIBRE_DEVICES) {
++				/* Not found?  For now just go to next port. */
++#if defined(QL_DEBUG_LEVEL_2) || defined(QL_DEBUG_LEVEL_10)
++				uint8_t          *tmp_name;
++
++				tmp_name = fcport->port_name;
++
++ 				printk("%s(%ld): ERROR - port "
++ 				    "%02x%02x%02x%02x%02x%02x%02x%02x "
++ 				    "not configured.\n",
++ 				    __func__, ha->host_no,
++ 				    tmp_name[0], tmp_name[1], tmp_name[2],
++ 				    tmp_name[3], tmp_name[4], tmp_name[5],
++ 				    tmp_name[6], tmp_name[7]);
++#endif /* DEBUG */
++
++				continue;
++			}
++
++			/* Got a valid port */
++			list->EntryCount++;
++
++			for (lun = 0; lun < MAX_LUNS; lun++) {
++				/* set MSB if masked */
++				entry->Data[lun] = LUN_DATA_PREFERRED_PATH;
++				if (!EXT_IS_LUN_BIT_SET(&(fcport->lun_mask),
++				    lun)) {
++					entry->Data[lun] |= LUN_DATA_ENABLED;
++				}
++			}
++
++ 			DEBUG9(printk("%s: got lun_mask for tgt %d\n",
++ 			    __func__, cnt);)
++ 			DEBUG9(qla2x00_dump_buffer((char *)&(fcport->lun_mask),
++ 			    sizeof(lun_bit_mask_t));)
++ 
++ 			ret = verify_area(VERIFY_WRITE, (void *)u_entry,
++ 			    sizeof(FO_EXTERNAL_LUN_DATA_ENTRY));
++ 			if (ret) {
++ 				/* error */
++ 				DEBUG9_10(printk("%s: u_entry %p verify write"
++ 				    " error. list->EntryCount=%d.\n",
++ 				    __func__, u_entry, list->EntryCount);)
++ 				pext->Status = EXT_STATUS_COPY_ERR;
++ 				break;
++ 			}
++ 
++ 			ret = copy_to_user(u_entry, entry,
++ 			    sizeof(FO_EXTERNAL_LUN_DATA_ENTRY));
++ 
++ 			if (ret) {
++ 				/* error */
++ 				DEBUG9_10(printk("%s: u_entry %p copy "
++ 				    "error. list->EntryCount=%d.\n",
++ 				    __func__, u_entry, list->EntryCount);)
++ 				pext->Status = EXT_STATUS_COPY_ERR;
++ 				break;
++ 			}
++
++			copy_to_user(u_entry, entry,
++					sizeof(FO_EXTERNAL_LUN_DATA_ENTRY));
++
++			/* Go to next port */
++			u_entry++;
++			continue;
++		}
++
++		/*
++		 * Failover is enabled. Go through the mp_devs list and return
++		 * lun data in configured path.
++		 */
++		for (dev_no = 0; dev_no < MAX_MP_DEVICES; dev_no++) {
++			dp = host->mp_devs[dev_no];
++
++			if (dp == NULL)
++				continue;
++
++			/* Lookup entry name */
++			if (!qla2x00_is_portname_in_device(dp, entry->PortName))
++				continue;
++
++			if ((pathlist = dp->path_list) == NULL)
++				continue;
++
++			path = pathlist->last;
++			for (path_id = 0; path_id < pathlist->path_cnt;
++			    path_id++, path = path->next) {
++
++				if (path->host != host)
++					continue;
++
++				if (!qla2x00_is_portname_equal(path->portname,
++				    entry->PortName))
++					continue;
++
++				/* Got an entry */
++				entry->TargetId = dp->dev_id;
++				entry->Dev_No = path->id;
++				list->EntryCount++;
++
++				for (lun = 0; lun < MAX_LUNS; lun++) {
++					entry->Data[lun] =
++					    path->lun_data.data[lun];
++				}
++
++				ret = verify_area(VERIFY_WRITE, (void *)u_entry,
++				    sizeof(FO_EXTERNAL_LUN_DATA_ENTRY));
++				if (ret) {
++					/* error */
++					DEBUG2_9_10(printk("%s: u_entry %p "
++					    "verify wrt err. EntryCount=%d.\n",
++					    __func__, u_entry, list->EntryCount);)
++					pext->Status = EXT_STATUS_COPY_ERR;
++					break;
++				}
++
++				ret = copy_to_user(u_entry, entry,
++				    sizeof(FO_EXTERNAL_LUN_DATA_ENTRY));
++				if (ret) {
++					/* error */
++					DEBUG2_9_10(printk("%s: u_entry %p "
++					    "copy out err. EntryCount=%d.\n",
++					    __func__, u_entry, list->EntryCount);)
++					pext->Status = EXT_STATUS_COPY_ERR;
++					break;
++				}
++
++				u_entry++;
++
++				DEBUG9(printk("%s: (output) get_lun_data - "
++				    "u_entry(%p) - lun entry[%d] :\n",
++				    __func__, u_entry,list->EntryCount - 1);)
++
++				DEBUG9(qla2x00_dump_buffer((void *)entry, 64);)
++
++				/*
++				 * We found the right path for this port.
++				 * Continue with next port.
++				 */
++				break;
++			}
++
++			/* Continue with next port. */
++			break;
++		}
++	}
++
++	DEBUG9(printk("%s: get_lun_data - entry count = [%d]\n",
++	    __func__, list->EntryCount);)
++	DEBUG4(printk("%s: get_lun_data - entry count = [%d]\n",
++	    __func__, list->EntryCount);)
++
++	if (ret == 0) {
++		ret = verify_area(VERIFY_WRITE, (void *)&u_list->EntryCount,
++		    sizeof(list->EntryCount));
++		if (ret) {
++			/* error */
++			DEBUG2_9_10(printk("%s: u_list->EntryCount %p verify "
++			    " write error. list->EntryCount=%d.\n",
++			    __func__, u_entry, list->EntryCount);)
++			pext->Status = EXT_STATUS_COPY_ERR;
++		} else {
++			/* copy number of entries */
++			ret = copy_to_user(&u_list->EntryCount, &list->EntryCount,
++			    sizeof(list->EntryCount));
++			pext->ResponseLen = FO_LUN_DATA_LIST_MAX_SIZE;
++		}
++	}
++
++	KMEM_FREE(list, sizeof(FO_LUN_DATA_LIST));
++
++	DEBUG9(printk("%s: exiting. ret=%d.\n", __func__, ret);)
++
++	return ret;
++}
++
++/*
++ * qla2x00_fo_set_lun_data
++ *      Set lun data for the specified device on the attached hba
++ *      (FO_SET_LUN_DATA).
++ *      Sets lun mask if failover not enabled.
++ *
++ * Input:
++ *      bp = pointer to buffer
++ *
++ * Return;
++ *      0 on success or errno.
++ *
++ * Context:
++ *      Kernel context.
++ */
++static int
++qla2x00_fo_set_lun_data(EXT_IOCTL *pext, FO_LUN_DATA_INPUT  *bp, int mode)
++{
++	scsi_qla_host_t  *ha;
++	fc_port_t        *fcport;
++	int              i;
++	int              ret = 0;
++	mp_host_t        *host = NULL;
++	mp_device_t      *dp;
++	mp_path_t        *path;
++	mp_path_list_t   *pathlist;
++	os_tgt_t         *ostgt;
++	uint8_t	         path_id;
++	uint16_t         dev_no;
++	uint16_t         lun;
++	FO_LUN_DATA_LIST *u_list, *list;
++	FO_EXTERNAL_LUN_DATA_ENTRY *u_entry, *entry;
++
++	typedef struct _tagStruct {
++		FO_LUN_DATA_INPUT   foLunDataInput;
++		FO_LUN_DATA_LIST    foLunDataList;
++	}
++	com_struc;
++	com_struc *com_iter;
++
++
++	DEBUG9(printk("%s: entered.\n", __func__);)
++
++	ha = qla2x00_get_hba((int)bp->HbaInstance);
++
++	if (!ha) {
++		DEBUG2_9_10(printk("%s: no ha matching inst %d.\n",
++		    __func__, bp->HbaInstance);)
++
++		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++		return (ret);
++	}
++
++	DEBUG9(printk("%s: ha inst %ld, buff %p.\n",
++	    __func__, ha->instance, bp);)
++
++	if (ha->flags.failover_enabled)
++		if ((host = qla2x00_cfg_find_host(ha)) == NULL) {
++			DEBUG2_9_10(printk("%s: no HOST for ha inst %ld.\n",
++			    __func__, ha->instance);)
++			pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++			return (ret);
++		}
++
++	list = (FO_LUN_DATA_LIST *)qla2x00_kmem_zalloc(
++	    sizeof(FO_LUN_DATA_LIST), GFP_ATOMIC, 13);
++	if (list == NULL) {
++		DEBUG2_9_10(printk("%s: failed to alloc memory of size (%d)\n",
++		    __func__, (int)sizeof(FO_LUN_DATA_LIST));)
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		return (-ENOMEM);
++	}
++
++	entry = &list->DataEntry[0];
++
++	/* get lun data list from user */
++	com_iter = (com_struc *)pext->RequestAdr;
++	u_list = &(com_iter->foLunDataList);
++	u_entry = &u_list->DataEntry[0];
++
++	ret = verify_area(VERIFY_READ, (void *)u_list,
++	    sizeof(FO_LUN_DATA_LIST));
++	if (ret) {
++		/* error */
++		DEBUG2_9_10(printk("%s: u_list %p verify read error.\n",
++		    __func__, u_list);)
++		pext->Status = EXT_STATUS_COPY_ERR;
++		KMEM_FREE(list, FO_LUN_DATA_LIST);
++		return (ret);
++	}
++
++	ret = copy_from_user(list, u_list, sizeof(FO_LUN_DATA_LIST));
++	if (ret) {
++		/* error */
++		DEBUG2_9_10(printk("%s: u_list %p copy error.\n",
++		    __func__, u_list);)
++		pext->Status = EXT_STATUS_COPY_ERR;
++		KMEM_FREE(list, FO_LUN_DATA_LIST);
++		return (ret);
++	}
++
++	DEBUG2(printk("qla_fo_set_lun_data: pext->RequestAdr(%p) u_list (%p) "
++			"sizeof(FO_LUN_DATA_INPUT) =(%d) and 64 bytes...\n",
++			pext->RequestAdr, u_list,
++			(int)sizeof(FO_LUN_DATA_INPUT));)
++	DEBUG2(qla2x00_dump_buffer((void *)u_list, 64);)
++
++	for (i = 0; i < list->EntryCount; i++, u_entry++) {
++
++		ret = verify_area(VERIFY_READ, (void *)u_entry,
++		    sizeof(FO_EXTERNAL_LUN_DATA_ENTRY));
++		if (ret) {
++			/* error */
++			DEBUG2_9_10(printk("%s: u_entry %p verify "
++			    " read error.\n",
++			    __func__, u_entry);)
++			pext->Status = EXT_STATUS_COPY_ERR;
++			break;
++		}
++		ret = copy_from_user(entry, u_entry,
++		    sizeof(FO_EXTERNAL_LUN_DATA_ENTRY));
++		if (ret) {
++			/* error */
++			DEBUG2_9_10(printk("%s: u_entry %p copy error.\n",
++			    __func__, u_entry);)
++			pext->Status = EXT_STATUS_COPY_ERR;
++			break;
++		}
++
++		if (!ha->flags.failover_enabled) {
++			/*
++			 * Failover disabled. Just find the port and set
++			 * LUN mask values in lun_mask field of this port.
++			 */
++
++			if (entry->TargetId >= MAX_FIBRE_DEVICES)
++				/* ERROR */
++				continue;
++
++			if (!(ostgt = ha->otgt[entry->TargetId]))
++				/* ERROR */
++				continue;
++
++			if (!(fcport = ostgt->vis_port))
++				/* ERROR */
++				continue;
++
++			for (lun = 0; lun < MAX_LUNS; lun++) {
++				/* set MSB if masked */
++				if (entry->Data[lun] | LUN_DATA_ENABLED) {
++					EXT_CLR_LUN_BIT(&(fcport->lun_mask),
++								lun);
++				} else {
++					EXT_SET_LUN_BIT(&(fcport->lun_mask),
++								lun);
++				}
++			}
++
++			/* Go to next entry */
++			continue;
++		}
++
++		/*
++		 * Failover is enabled. Go through the mp_devs list and set lun
++		 * data in configured path.
++		 */
++		for (dev_no = 0; dev_no < MAX_MP_DEVICES; dev_no++) {
++			dp = host->mp_devs[dev_no];
++
++			if (dp == NULL)
++				continue;
++
++			/* Lookup entry name */
++			if (!qla2x00_is_portname_in_device(dp, entry->PortName))
++					continue;
++
++			if ((pathlist = dp->path_list) == NULL)
++					continue;
++
++			path = pathlist->last;
++			for (path_id = 0; path_id < pathlist->path_cnt;
++			    path_id++, path = path->next) {
++
++				if (path->host != host)
++					continue;
++
++				if (!qla2x00_is_portname_equal(path->portname,
++				    entry->PortName))
++					continue;
++
++				for (lun = 0; lun < MAX_LUNS; lun++) {
++					path->lun_data.data[lun] =
++					    entry->Data[lun];
++					DEBUG4(printk("cfg_set_lun_data: lun "
++					    "data[%d] = 0x%x \n", lun,
++					    path->lun_data.data[lun]);)
++				}
++
++				break;
++			}
++			break;
++		}
++	}
++
++	KMEM_FREE(list, FO_LUN_DATA_LIST);
++
++	DEBUG9(printk("%s: exiting. ret = %d.\n", __func__, ret);)
++
++	return ret;
++}
++
++/*
++ * qla2x00_fo_get_target_data
++ *      Get the target control byte for all devices attached to a HBA.
++ *
++ * Input:
++ *      bp = pointer to buffer
++ *
++ * Return;
++ *      0 on success or errno.
++ *
++ * Context:
++ *      Kernel context.
++ */
++static int
++qla2x00_fo_get_target_data(EXT_IOCTL *pext, FO_TARGET_DATA_INPUT *bp, int mode)
++{
++	scsi_qla_host_t  *ha;
++	struct list_head	*fcports, *fcpl;
++	fc_port_t        *fcport;
++	int              ret = 0;
++	mp_host_t        *host = NULL;
++	mp_device_t      *dp;
++	mp_path_t        *path;
++	mp_path_list_t   *pathlist;
++	os_tgt_t         *ostgt;
++	uint8_t          i, cnt;
++	uint8_t          path_id;
++	uint16_t         dev_no;
++	FO_DEVICE_DATA   *entry, *u_entry;
++	uint32_t	b;
++
++
++	DEBUG9(printk("%s: entered.\n", __func__);)
++
++	ha = qla2x00_get_hba((int)bp->HbaInstance);
++
++	if (!ha) {
++		DEBUG2_9_10(printk("%s: no ha matching inst %d.\n",
++		    __func__, bp->HbaInstance);)
++
++		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++		return (ret);
++	}
++
++	DEBUG9(printk("%s: ha inst %ld, buff %p.\n",
++	    __func__, ha->instance, bp);)
++
++	if (ha->flags.failover_enabled)
++		if ((host = qla2x00_cfg_find_host(ha)) == NULL) {
++			DEBUG2_9_10(printk("%s: no HOST for ha inst %ld.\n",
++			    __func__, ha->instance);)
++			pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++			return (ret);
++		}
++
++	entry = (FO_DEVICE_DATA *)qla2x00_kmem_zalloc(
++	    sizeof(FO_DEVICE_DATA), GFP_ATOMIC, 14);
++	if (entry == NULL) {
++		DEBUG2_9_10(printk("%s: failed to alloc memory of size (%d)\n",
++		    __func__, (int)sizeof(FO_DEVICE_DATA));)
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		return (-ENOMEM);
++	}
++
++	u_entry = (FO_DEVICE_DATA *) pext->ResponseAdr;
++
++	/* find the correct fcport list */
++	if (!ha->flags.failover_enabled)
++		fcports = &ha->fcports;
++	else
++		fcports = host->fcports;
++
++	/* Check thru this adapter's fcport list */
++	i = 0;
++	fcport = NULL;
++	list_for_each(fcpl, fcports) {
++		fcport = list_entry(fcpl, fc_port_t, list);
++
++		if (i >= MAX_TARGETS)
++			break;
++
++		memcpy(entry->WorldWideName,
++		    fcport->node_name, EXT_DEF_WWN_NAME_SIZE);
++		memcpy(entry->PortName,
++		    fcport->port_name, EXT_DEF_WWN_NAME_SIZE);
++
++		for (b = 0; b < 3 ; b++)
++			entry->PortId[b] = fcport->d_id.r.d_id[2-b];
++
++		if (!ha->flags.failover_enabled) {
++			/*
++			 * Failover disabled. Just find the port and return
++			 * target info.
++			 */
++			for (cnt = 0; cnt < MAX_FIBRE_DEVICES; cnt++) {
++				if (!(ostgt = ha->otgt[cnt])) {
++					continue;
++				}
++
++				if (ostgt->vis_port == fcport) {
++					entry->TargetId = cnt;
++					break;
++				}
++			}
++			if (cnt == MAX_FIBRE_DEVICES) {
++				/* Not found?  For now just go to next port. */
++#if defined(QL_DEBUG_LEVEL_2) || defined(QL_DEBUG_LEVEL_10)
++				uint8_t          *tmp_name;
++
++				tmp_name = fcport->port_name;
++
++				printk("fo_get_target_data(%ld): ERROR "
++				    "port %02x%02x%02x%02x%02x%02x%02x%02x "
++				    "not configured.\n", ha->host_no,
++				    tmp_name[0], tmp_name[1], tmp_name[2],
++				    tmp_name[3], tmp_name[4], tmp_name[5],
++				    tmp_name[6], tmp_name[7]);
++#endif /* DEBUG */
++
++				continue;
++			}
++
++			entry->MultipathControl = 0; /* always configured */
++
++			ret = verify_area(VERIFY_WRITE, (void *)u_entry,
++			    sizeof(FO_DEVICE_DATA));
++			if (ret) {
++				/* error */
++				DEBUG2_9_10(printk("%s: u_entry %p verify "
++				    " wrt err. tgt id=%d.\n",
++				    __func__, u_entry, cnt);)
++				pext->Status = EXT_STATUS_COPY_ERR;
++				break;
++			}
++
++			ret = copy_to_user(u_entry, entry,
++			    sizeof(FO_DEVICE_DATA));
++			if (ret) {
++				/* error */
++				DEBUG2_9_10(printk("%s: u_entry %p copy "
++				    "out err. tgt id=%d.\n",
++				    __func__, u_entry, cnt);)
++				pext->Status = EXT_STATUS_COPY_ERR;
++				break;
++			}
++
++			u_entry++;
++
++			i++;
++			continue;
++		}
++
++		/*
++		 * Failover is enabled. Go through the mp_devs list and
++		 * get target data in configured path.
++		 */
++		for (dev_no = 0; dev_no < MAX_MP_DEVICES; dev_no++) {
++			dp = host->mp_devs[dev_no];
++
++			if (dp == NULL)
++				continue;
++
++			/* Lookup entry name */
++			if (!qla2x00_is_portname_in_device(dp, entry->PortName))
++				continue;
++
++			if ((pathlist = dp->path_list) == NULL)
++				continue;
++
++			path = pathlist->last;
++			for (path_id = 0; path_id < pathlist->path_cnt;
++			    path_id++, path= path->next) {
++
++				if (path->host != host)
++					continue;
++
++				if (!qla2x00_is_portname_equal(path->portname,
++				    entry->PortName))
++					continue;
++
++				entry->TargetId = dp->dev_id;
++				entry->Dev_No = path->id;
++				entry->MultipathControl = path->mp_byte;
++
++				DEBUG9(printk("cfg_get_target_data: path->id "
++				    "= %d, target data = 0x%x \n",
++				    path->id, path->mp_byte);)
++
++				ret = verify_area(VERIFY_WRITE, (void *)u_entry,
++				    sizeof(FO_DEVICE_DATA));
++				if (ret) {
++					/* error */
++					DEBUG2_9_10(printk("%s: u_entry %p "
++					    "verify wrt err. tgt id=%d.\n",
++					    __func__, u_entry, dp->dev_id);)
++					pext->Status = EXT_STATUS_COPY_ERR;
++					break;
++				}
++
++				ret = copy_to_user(u_entry, entry,
++				    sizeof(FO_DEVICE_DATA));
++				if (ret) {
++					/* error */
++					DEBUG2_9_10(printk("%s: u_entry %p "
++					    "copy out err. tgt id=%d.\n",
++					    __func__, u_entry, dp->dev_id);)
++					pext->Status = EXT_STATUS_COPY_ERR;
++					break;
++				}
++
++				u_entry++;
++
++				/* Path found. Continue with next fcport */
++				break;
++			}
++			break;
++		}
++		i++;
++	}
++
++	if (ret == 0) {
++		pext->ResponseLen = sizeof(FO_DEVICE_DATABASE);
++	}
++
++	KMEM_FREE(entry, sizeof(FO_DEVICE_DATA));
++
++	DEBUG9(printk("%s: exiting. ret = %d.\n", __func__, ret);)
++
++	return (ret);
++}
++
++/*
++ * qla2x00_fo_set_target_data
++ *      Set multipath control byte for all devices on the attached hba
++ *
++ * Input:
++ *      bp = pointer to buffer
++ *
++ * Return;
++ *      0 on success or errno.
++ *
++ * Context:
++ *      Kernel context.
++ */
++static int
++qla2x00_fo_set_target_data(EXT_IOCTL *pext, FO_TARGET_DATA_INPUT  *bp, int mode)
++{
++	scsi_qla_host_t  *ha;
++	int              i;
++	int              ret = 0;
++	mp_host_t        *host;
++	mp_device_t      *dp;
++	mp_path_t        *path;
++	mp_path_list_t   *pathlist;
++	uint16_t         dev_no;
++	uint8_t	         path_id;
++	FO_DEVICE_DATA *entry, *u_entry;
++
++	DEBUG9(printk("%s: entered.\n", __func__);)
++
++	ha = qla2x00_get_hba((int)bp->HbaInstance);
++
++	if (!ha) {
++		DEBUG2_9_10(printk("%s: no ha matching inst %d.\n",
++		    __func__, bp->HbaInstance);)
++
++		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++		return (ret);
++	}
++
++	DEBUG9(printk("%s: ha inst %ld, buff %p.\n",
++	    __func__, ha->instance, bp);)
++
++	if (!ha->flags.failover_enabled)
++		/* non-failover mode. nothing to be done. */
++		return 0;
++
++	if ((host = qla2x00_cfg_find_host(ha)) == NULL) {
++		DEBUG2_9_10(printk("%s: no HOST for ha inst %ld.\n",
++		    __func__, ha->instance);)
++		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++		return (ret);
++	}
++
++	entry = (FO_DEVICE_DATA *)qla2x00_kmem_zalloc(
++	    sizeof(FO_DEVICE_DATA), GFP_ATOMIC, 15);
++	if (entry == NULL) {
++		DEBUG2_9_10(printk("%s: failed to alloc memory of size (%d)\n",
++		    __func__, (int)sizeof(FO_DEVICE_DATA));)
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		return (-ENOMEM);
++	}
++
++	u_entry = (FO_DEVICE_DATA *)(pext->RequestAdr +
++	    sizeof(FO_TARGET_DATA_INPUT));
++
++	for (i = 0; i < MAX_TARGETS; i++, u_entry++) {
++		ret = verify_area(VERIFY_READ, (void *)u_entry,
++		    sizeof(FO_DEVICE_DATA));
++		if (ret) {
++			/* error */
++			DEBUG2_9_10(printk("%s: u_entry %p verify read err.\n",
++			    __func__, u_entry);)
++			pext->Status = EXT_STATUS_COPY_ERR;
++			break;
++		}
++
++		ret = copy_from_user(entry, u_entry, sizeof(FO_DEVICE_DATA));
++
++		if (ret) {
++			/* error */
++			DEBUG2_9_10(printk("%s: u_entry %p copy error.\n",
++			    __func__, u_entry);)
++			pext->Status = EXT_STATUS_COPY_ERR;
++			break;
++		}
++
++		for (dev_no = 0; dev_no < MAX_MP_DEVICES; dev_no++) {
++			dp = host->mp_devs[dev_no];
++
++			if (dp == NULL)
++				continue;
++
++			/* Lookup entry name */
++			if (!qla2x00_is_portname_in_device(dp, entry->PortName))
++				continue;
++
++			if ((pathlist = dp->path_list) == NULL)
++				continue;
++
++			path = pathlist->last;
++			for (path_id = 0; path_id < pathlist->path_cnt;
++			    path_id++, path= path->next) {
++
++				if (path->host != host)
++					continue;
++
++				if (!qla2x00_is_portname_equal(path->portname,
++				    entry->PortName))
++					continue;
++
++				path->mp_byte = entry->MultipathControl;
++
++				DEBUG9(printk("cfg_set_target_data: %d target "
++				    "data = 0x%x \n",
++				    path->id,path->mp_byte);)
++
++				/*
++				 * If this is the visible path, then make it
++				 * available on next reboot.
++				 */
++				if (!((path->mp_byte & MP_MASK_HIDDEN) ||
++				    (path->mp_byte & MP_MASK_UNCONFIGURED))) {
++					pathlist->visible = path->id;
++				}
++
++				/* Found path. Go to next entry. */
++				break;
++			}
++			break;
++		}
++	}
++
++	KMEM_FREE(entry, sizeof(FO_DEVICE_DATA));
++
++	DEBUG9(printk("%s: exiting. ret = %d.\n", __func__, ret);)
++
++	return (ret);
++
++}
++
++/*
++ * qla2x00_fo_ioctl
++ *	Provides functions for failover ioctl() calls.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	ioctl_code = ioctl function to perform
++ *	arg = Address of application EXT_IOCTL cmd data
++ *	mode = flags
++ *
++ * Returns:
++ *	Return value is the ioctl rval_p return value.
++ *	0 = success
++ *
++ * Context:
++ *	Kernel context.
++ */
++/* ARGSUSED */
++int
++qla2x00_fo_ioctl(scsi_qla_host_t *ha, int ioctl_code, void *ret_arg, int mode)
++{
++	static EXT_IOCTL cmd_struct;
++	int    rval = 0;
++	size_t	in_size, out_size;
++	static	union {
++		FO_PARAMS params;
++		FO_GET_PATHS path;
++		FO_SET_CURRENT_PATH set_path;
++		/* FO_HBA_STAT_INPUT stat; */
++		FO_HBA_STAT stat;
++		FO_LUN_DATA_INPUT lun_data;
++		FO_TARGET_DATA_INPUT target_data;
++	} buff;
++
++
++	ENTER("qla2x00_fo_ioctl");
++	DEBUG9(printk("%s: entered. arg (%p):\n", __func__, ret_arg);)
++
++	memcpy(&cmd_struct, ret_arg, sizeof(cmd_struct));
++
++	/*
++	 * default case for this switch not needed,
++	 * ioctl_code validated by caller.
++	 */
++	in_size = out_size = 0;
++	switch (ioctl_code) {
++		case FO_CC_GET_PARAMS:
++			out_size = sizeof(FO_PARAMS);
++			break;
++		case FO_CC_SET_PARAMS:
++			in_size = sizeof(FO_PARAMS);
++			break;
++		case FO_CC_GET_PATHS:
++			in_size = sizeof(FO_GET_PATHS);
++			break;
++		case FO_CC_SET_CURRENT_PATH:
++			in_size = sizeof(FO_SET_CURRENT_PATH);
++			break;
++		case FO_CC_GET_HBA_STAT:
++		case FO_CC_RESET_HBA_STAT:
++			in_size = sizeof(FO_HBA_STAT_INPUT);
++			break;
++		case FO_CC_GET_LUN_DATA:
++			in_size = sizeof(FO_LUN_DATA_INPUT);
++			break;
++		case FO_CC_SET_LUN_DATA:
++			in_size = sizeof(FO_LUN_DATA_INPUT);
++			break;
++		case FO_CC_GET_TARGET_DATA:
++			in_size = sizeof(FO_TARGET_DATA_INPUT);
++			break;
++		case FO_CC_SET_TARGET_DATA:
++			in_size = sizeof(FO_TARGET_DATA_INPUT);
++			break;
++
++	}
++	if (in_size != 0) {
++		if ((int)cmd_struct.RequestLen < in_size) {
++			cmd_struct.Status = EXT_STATUS_INVALID_PARAM;
++			cmd_struct.DetailStatus = EXT_DSTATUS_REQUEST_LEN;
++			DEBUG10(printk("%s: got invalie req len (%d).\n",
++			    __func__, cmd_struct.RequestLen);)
++
++		} else {
++
++			rval = verify_area(VERIFY_READ,
++			    (void *)cmd_struct.RequestAdr, in_size);
++			if (rval) {
++				/* error */
++				DEBUG2_9_10(printk("%s: req buf verify read "
++				    "error. size=%d.\n",
++				    __func__, in_size);)
++				cmd_struct.Status = EXT_STATUS_COPY_ERR;
++			}
++			rval = copy_from_user(&buff,
++			    (void *)cmd_struct.RequestAdr, in_size);
++
++			if (rval) {
++				DEBUG2_9_10(printk("%s: req buf copy error. "
++				    "size=%d.\n",
++				    __func__, in_size);)
++
++				cmd_struct.Status = EXT_STATUS_COPY_ERR;
++			} else {
++				DEBUG9(printk("qla2x00_fo_ioctl: req buf "
++				    "copied ok.\n"));
++			}
++		}
++	} else if (out_size != 0 && (int)cmd_struct.ResponseLen < out_size) {
++		cmd_struct.Status = EXT_STATUS_BUFFER_TOO_SMALL;
++		cmd_struct.DetailStatus = out_size;
++		DEBUG10(printk("%s: got invalie resp len (%d).\n",
++		    __func__, cmd_struct.ResponseLen);)
++	}
++
++	if (rval != 0 || cmd_struct.Status != 0)
++		goto done_fo_ioctl;
++
++	cmd_struct.Status = EXT_STATUS_OK;
++	cmd_struct.DetailStatus = EXT_STATUS_OK;
++
++	switch (ioctl_code) {
++		case FO_CC_GET_PARAMS:
++			rval = qla2x00_fo_get_params(&buff.params);
++			break;
++		case FO_CC_SET_PARAMS:
++			rval = qla2x00_fo_set_params(&buff.params);
++			break;
++		case FO_CC_GET_PATHS:
++			rval = qla2x00_cfg_get_paths(&cmd_struct,
++					&buff.path,mode);
++			if (rval != 0)
++				out_size = 0;
++			break;
++		case FO_CC_SET_CURRENT_PATH:
++			rval = qla2x00_cfg_set_current_path(&cmd_struct,
++					&buff.set_path,mode);
++			break;
++		case FO_CC_RESET_HBA_STAT:
++			rval = qla2x00_fo_stats(&buff.stat, TRUE);
++			break;
++		case FO_CC_GET_HBA_STAT:
++			rval = qla2x00_fo_stats(&buff.stat, FALSE);
++			break;
++		case FO_CC_GET_LUN_DATA:
++
++			DEBUG4(printk("calling qla2x00_fo_get_lun_data\n");)
++			DEBUG4(printk("cmd_struct.RequestAdr (%p):\n",
++					cmd_struct.RequestAdr);)
++
++			rval = qla2x00_fo_get_lun_data(&cmd_struct,
++			    &buff.lun_data, mode);
++
++			if (rval != 0)
++				out_size = 0;
++			break;
++		case FO_CC_SET_LUN_DATA:
++
++			DEBUG4(printk("calling qla2x00_fo_set_lun_data\n");)
++			DEBUG4(printk("	cmd_struct.RequestAdr (%p):\n",
++			    cmd_struct.RequestAdr);)
++
++			rval = qla2x00_fo_set_lun_data(&cmd_struct,
++			    &buff.lun_data, mode);
++			break;
++		case FO_CC_GET_TARGET_DATA:
++			DEBUG4(printk("calling qla2x00_fo_get_target_data\n");)
++			DEBUG4(printk("cmd_struct.RequestAdr (%p):\n",
++			    cmd_struct.RequestAdr);)
++
++			rval = qla2x00_fo_get_target_data(&cmd_struct,
++			    &buff.target_data, mode);
++
++			if (rval != 0) {
++				out_size = 0;
++			}
++			break;
++		case FO_CC_SET_TARGET_DATA:
++			DEBUG4(printk("calling qla2x00_fo_set_target_data\n");)
++			DEBUG4(printk("	cmd_struct.RequestAdr (%p):\n",
++			    cmd_struct.RequestAdr);)
++			rval = qla2x00_fo_set_target_data(&cmd_struct,
++			    &buff.target_data, mode);
++			break;
++
++	}
++
++	if (rval == 0 && (cmd_struct.ResponseLen = out_size) != 0) {
++		rval = verify_area(VERIFY_WRITE, (void *)cmd_struct.ResponseAdr,
++		    out_size);
++		if (rval != 0) {
++			DEBUG10(printk("%s: resp buf very write error.\n",
++			    __func__);)
++			cmd_struct.Status = EXT_STATUS_COPY_ERR;
++		}
++	}
++
++	if (rval == 0) {
++		rval = copy_to_user((void *)cmd_struct.ResponseAdr,
++		    &buff, out_size);
++
++		if (rval != 0) {
++			DEBUG10(printk("%s: resp buf copy error. size=%d.\n",
++			    __func__, out_size);)
++			cmd_struct.Status = EXT_STATUS_COPY_ERR;
++		}
++	}
++
++done_fo_ioctl:
++
++	/* Set Status and DetailStatus fields in application EXT_IOCTL */
++	(((EXT_IOCTL*)ret_arg)->Status) 	= cmd_struct.Status;
++	(((EXT_IOCTL*)ret_arg)->DetailStatus)	= cmd_struct.DetailStatus;
++	(((EXT_IOCTL*)ret_arg)->ResponseLen)	= cmd_struct.ResponseLen;
++
++	if (rval != 0) {
++		/*EMPTY*/
++		DEBUG10(printk("%s: **** FAILED ****\n", __func__);)
++	} else {
++		/*EMPTY*/
++		DEBUG9(printk("%s: exiting normally\n", __func__);)
++	}
++
++	return rval;
++}
++
++
++/*
++ * qla2x00_fo_count_retries
++ *	Increment the retry counter for the command.
++ *      Set or reset the SRB_RETRY flag.
++ *
++ * Input:
++ *	sp = Pointer to command.
++ *
++ * Returns:
++ *	TRUE -- retry
++ * 	FALSE -- don't retry
++ *
++ * Context:
++ *	Kernel context.
++ */
++static uint8_t
++qla2x00_fo_count_retries(scsi_qla_host_t *ha, srb_t *sp)
++{
++	uint8_t		retry = TRUE;
++	os_lun_t	*lq;
++	os_tgt_t	*tq;
++
++	DEBUG9(printk("%s: entered.\n", __func__);)
++
++	if (++sp->fo_retry_cnt >  qla_fo_params.MaxRetriesPerIo) {
++		/* no more failovers for this request */
++		retry = FALSE;
++		sp->fo_retry_cnt = 0;
++		printk(KERN_INFO
++		    "qla2x00: no more failovers for request - "
++		    "pid= %ld\n", sp->cmd->serial_number);
++	} else {
++		/*
++		 * We haven't exceeded the max retries for this request, check
++		 * max retries this path
++		 */
++		if ((sp->fo_retry_cnt % qla_fo_params.MaxRetriesPerPath) == 0) {
++			DEBUG(printk(" qla2x00_fo_count_retries: FAILOVER - "
++			    "queuing ha=%ld, sp=%p, pid =%ld, "
++			    "fo retry= %d \n",
++			    ha->host_no,
++			    sp, sp->cmd->serial_number,
++			    sp->fo_retry_cnt);)
++
++			/*
++			 * Note: we don't want it to timeout, so it is
++			 * recycling on the retry queue and the fialover queue.
++			 */
++			lq = sp->lun_queue;
++			tq = sp->tgt_queue;
++			set_bit(LUN_MPIO_BUSY, &lq->q_flag);
++
++			/*
++			 * ??? We can get a path error on any ha, but always
++			 * queue failover on originating ha. This will allow us
++			 * to syncronized the requests for a given lun.
++			 */
++			sp->f_start=jiffies;/*ra 10/29/01*/
++			/* Now queue it on to be failover */
++			sp->ha = ha;
++			add_to_failover_queue(ha,sp);
++		}
++	}
++
++	DEBUG9(printk("%s: exiting. retry = %d.\n", __func__, retry);)
++
++	return retry ;
++}
++
++
++/*
++ * qla2x00_fo_check
++ *	This function is called from the done routine to see if
++ *  the SRB requires a failover.
++ *
++ *	This function examines the available os returned status and
++ *  if meets condition, the command(srb) is placed ont the failover
++ *  queue for processing.
++ *
++ * Input:
++ *	sp  = Pointer to the SCSI Request Block
++ *
++ * Output:
++ *      sp->flags SRB_RETRY bit id command is to
++ *      be retried otherwise bit is reset.
++ *
++ * Returns:
++ *      None.
++ *
++ * Context:
++ *	Kernel/Interrupt context.
++ */
++uint8_t
++qla2x00_fo_check(scsi_qla_host_t *ha, srb_t *sp)
++{
++	uint8_t		retry = FALSE;
++	int host_status;
++#if DEBUG_QLA2100
++	static char *reason[] = {
++		"DID_OK",
++		"DID_NO_CONNECT",
++		"DID_BUS_BUSY",
++		"DID_TIME_OUT",
++		"DID_BAD_TARGET",
++		"DID_ABORT",
++		"DID_PARITY",
++		"DID_ERROR",
++		"DID_RESET",
++		"DID_BAD_INTR"
++	};
++#endif
++
++	DEBUG9(printk("%s: entered.\n", __func__);)
++
++	/* we failover on selction timeouts only */
++	host_status = CMD_RESULT(sp->cmd) >>16;
++	if( host_status == DID_NO_CONNECT) {
++		if( qla2x00_fo_count_retries(ha,sp) ) {
++			/* Force a retry  on this request, it will
++			 * cause the LINUX timer to get reset, while we
++			 * we are processing the failover.
++			 */
++			CMD_RESULT(sp->cmd) = DID_BUS_BUSY << 16;
++			retry = TRUE;
++		}
++		DEBUG(printk("qla2x00_fo_check: pid= %ld sp %p "
++				"retry count=%d, retry flag = %d, "
++				"host status (%s)\n\r",
++				sp->cmd->serial_number,
++				sp, sp->fo_retry_cnt,
++				retry, reason[host_status]);)
++	}
++
++	DEBUG9(printk("%s: exiting. retry = %d.\n", __func__, retry);)
++
++	return retry;
++}
++
++/*
++ * qla2x00_fo_path_change
++ *	This function is called from configuration mgr to notify
++ *	of a path change.
++ *
++ * Input:
++ *      type    = Failover notify type, FO_NOTIFY_LUN_RESET or FO_NOTIFY_LOGOUT
++ *      newlunp = Pointer to the fc_lun struct for current path.
++ *      oldlunp = Pointer to fc_lun struct for previous path.
++ *
++ * Returns:
++ *
++ * Context:
++ *	Kernel context.
++ */
++uint32_t
++qla2x00_fo_path_change(uint32_t type, fc_lun_t *newlunp, fc_lun_t *oldlunp)
++{
++	uint32_t	ret = QLA2X00_SUCCESS;
++
++	newlunp->max_path_retries = 0;
++	return ret;
++}
++
++/*
++ * qla2x00_fo_get_params
++ *	Process an ioctl request to get system wide failover parameters.
++ *
++ * Input:
++ *	pp = Pointer to FO_PARAMS structure.
++ *
++ * Returns:
++ *	EXT_STATUS code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++static uint32_t
++qla2x00_fo_get_params(PFO_PARAMS pp)
++{
++	DEBUG9(printk("%s: entered.\n", __func__);)
++
++	pp->MaxPathsPerDevice = qla_fo_params.MaxPathsPerDevice;
++	pp->MaxRetriesPerPath = qla_fo_params.MaxRetriesPerPath;
++	pp->MaxRetriesPerIo = qla_fo_params.MaxRetriesPerIo;
++	pp->Flags = qla_fo_params.Flags;
++	pp->FailoverNotifyType = qla_fo_params.FailoverNotifyType;
++	pp->FailoverNotifyCdbLength = qla_fo_params.FailoverNotifyCdbLength;
++	memset(pp->FailoverNotifyCdb, 0, sizeof(pp->FailoverNotifyCdb));
++	memcpy(pp->FailoverNotifyCdb,
++	    &qla_fo_params.FailoverNotifyCdb[0], sizeof(pp->FailoverNotifyCdb));
++
++	DEBUG9(printk("%s: exiting.\n", __func__);)
++
++	return EXT_STATUS_OK;
++}
++
++/*
++ * qla2x00_fo_set_params
++ *	Process an ioctl request to set system wide failover parameters.
++ *
++ * Input:
++ *	pp = Pointer to FO_PARAMS structure.
++ *
++ * Returns:
++ *	EXT_STATUS code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++static uint32_t
++qla2x00_fo_set_params(PFO_PARAMS pp)
++{
++	DEBUG9(printk("%s: entered.\n", __func__);)
++
++	/* Check values for defined MIN and MAX */
++	if ((pp->MaxPathsPerDevice > SDM_DEF_MAX_PATHS_PER_DEVICE) ||
++	    (pp->MaxRetriesPerPath < FO_MAX_RETRIES_PER_PATH_MIN) ||
++	    (pp->MaxRetriesPerPath > FO_MAX_RETRIES_PER_PATH_MAX) ||
++	    (pp->MaxRetriesPerIo < FO_MAX_RETRIES_PER_IO_MIN) ||
++	    (pp->MaxRetriesPerPath > FO_MAX_RETRIES_PER_IO_MAX)) {
++		DEBUG2_9_10(printk("%s: got invalid params.\n", __func__);)
++		return EXT_STATUS_INVALID_PARAM;
++	}
++
++	/* Update the global structure. */
++	qla_fo_params.MaxPathsPerDevice = pp->MaxPathsPerDevice;
++	qla_fo_params.MaxRetriesPerPath = pp->MaxRetriesPerPath;
++	qla_fo_params.MaxRetriesPerIo = pp->MaxRetriesPerIo;
++	qla_fo_params.Flags = pp->Flags;
++	qla_fo_params.FailoverNotifyType = pp->FailoverNotifyType;
++	qla_fo_params.FailoverNotifyCdbLength = pp->FailoverNotifyCdbLength;
++	if (pp->FailoverNotifyType & FO_NOTIFY_TYPE_CDB) {
++		if (pp->FailoverNotifyCdbLength >
++		    sizeof(qla_fo_params.FailoverNotifyCdb)) {
++			DEBUG2_9_10(printk("%s: got invalid cdb length.\n",
++			    __func__);)
++			return EXT_STATUS_INVALID_PARAM;
++		}
++
++		memcpy(qla_fo_params.FailoverNotifyCdb,
++		    pp->FailoverNotifyCdb,
++		    sizeof(qla_fo_params.FailoverNotifyCdb));
++	}
++
++	DEBUG9(printk("%s: exiting.\n", __func__);)
++
++	return EXT_STATUS_OK;
++}
++
++
++/*
++ * qla2x00_fo_init_params
++ *	Gets driver configuration file failover properties to initalize
++ *	the global failover parameters structure.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *
++ * Context:
++ *	Kernel context.
++ */
++void
++qla2x00_fo_init_params(scsi_qla_host_t *ha)
++{
++	DEBUG3(printk("%s: entered.\n", __func__);)
++
++	/* For parameters that are not completely implemented yet, */
++
++	memset(&qla_fo_params, 0, sizeof(qla_fo_params));
++
++	if(MaxPathsPerDevice) {
++		qla_fo_params.MaxPathsPerDevice = MaxPathsPerDevice;
++	} else
++		qla_fo_params.MaxPathsPerDevice =FO_MAX_PATHS_PER_DEVICE_DEF ;
++	if(MaxRetriesPerPath) {
++		qla_fo_params.MaxRetriesPerPath = MaxRetriesPerPath;
++	} else
++		qla_fo_params.MaxRetriesPerPath =FO_MAX_RETRIES_PER_PATH_DEF;
++	if(MaxRetriesPerIo) {
++		qla_fo_params.MaxRetriesPerIo =MaxRetriesPerIo;
++	} else
++		qla_fo_params.MaxRetriesPerIo =FO_MAX_RETRIES_PER_IO_DEF;
++
++	qla_fo_params.Flags =  0;
++	qla_fo_params.FailoverNotifyType = FO_NOTIFY_TYPE_NONE;
++
++	DEBUG3(printk("%s: exiting.\n", __func__);)
++
++}
++
++/*
++ * qla2x00_send_fo_notification
++ *      Sends failover notification if needed.  Change the fc_lun pointer
++ *      in the old path lun queue.
++ *
++ * Input:
++ *      old_lp = Pointer to old fc_lun.
++ *      new_lp = Pointer to new fc_lun.
++ *
++ * Returns:
++ *      Local function status code.
++ *
++ * Context:
++ *      Kernel context.
++ */
++uint32_t
++qla2x00_send_fo_notification(fc_lun_t *old_lp, fc_lun_t *new_lp)
++{
++	scsi_qla_host_t	*old_ha = old_lp->fcport->ha;
++	int		rval = QLA2X00_SUCCESS;
++	inq_cmd_rsp_t	*pkt;
++	uint16_t	loop_id, lun;
++	dma_addr_t	phys_address;
++
++
++	ENTER("qla2x00_send_fo_notification");
++	DEBUG3(printk("%s: entered.\n", __func__);)
++
++	loop_id = old_lp->fcport->loop_id;
++	lun = old_lp->lun;
++
++	if (qla_fo_params.FailoverNotifyType == FO_NOTIFY_TYPE_LUN_RESET) {
++		rval = qla2x00_lun_reset(old_ha, loop_id, lun);
++		if (rval == QLA2X00_SUCCESS) {
++			DEBUG4(printk("qla2x00_send_fo_notification: LUN "
++			    "reset succeded\n");)
++		} else {
++			DEBUG4(printk("qla2x00_send_fo_notification: LUN "
++			    "reset failed\n");)
++		}
++
++	}
++	if ( (qla_fo_params.FailoverNotifyType ==
++	     FO_NOTIFY_TYPE_LOGOUT_OR_LUN_RESET) ||
++	    (qla_fo_params.FailoverNotifyType ==
++	     FO_NOTIFY_TYPE_LOGOUT_OR_CDB) )  {
++
++		rval = qla2x00_fabric_logout(old_ha, loop_id);
++		if (rval == QLA2X00_SUCCESS) {
++			DEBUG4(printk("qla2x00_send_fo_failover_notify: "
++			    "logout succeded\n");)
++		} else {
++			DEBUG4(printk("qla2x00_send_fo_failover_notify: "
++			    "logout failed\n");)
++		}
++
++	}
++
++	if (qla_fo_params.FailoverNotifyType == FO_NOTIFY_TYPE_CDB) {
++		pkt = pci_alloc_consistent(old_ha->pdev,
++		    sizeof(inq_cmd_rsp_t), &phys_address);
++		if (pkt == NULL) {
++			DEBUG4(printk("qla2x00_send_fo_failover_notify: "
++			    "memory allocation failed\n");)
++
++			return(QLA2X00_FUNCTION_FAILED);
++		}
++
++		memset(pkt,0, sizeof(inq_cmd_rsp_t));
++		pkt->p.cmd.entry_type = COMMAND_A64_TYPE;
++		pkt->p.cmd.entry_count = 1;
++		pkt->p.cmd.lun = lun;
++		pkt->p.cmd.target = (uint8_t)loop_id;
++		pkt->p.cmd.control_flags = CF_SIMPLE_TAG;
++		memcpy(pkt->p.cmd.scsi_cdb,
++		    qla_fo_params.FailoverNotifyCdb,
++		    qla_fo_params.FailoverNotifyCdbLength);
++		/* FIXME This setup needs to be verified with Dennis. */
++		pkt->p.cmd.dseg_count = __constant_cpu_to_le16(1);
++		pkt->p.cmd.byte_count = __constant_cpu_to_le32(0);
++		pkt->p.cmd.dseg_0_address[0] = cpu_to_le32(
++		    LSD(phys_address + sizeof (sts_entry_t)));
++		pkt->p.cmd.dseg_0_address[1] = cpu_to_le32(
++		    MSD(phys_address + sizeof (sts_entry_t)));
++		pkt->p.cmd.dseg_0_length = __constant_cpu_to_le32(0);
++
++		rval = qla2x00_issue_iocb(old_ha,
++		    pkt, phys_address, sizeof (inq_cmd_rsp_t));
++
++		if (rval != QLA2X00_SUCCESS ||
++		    pkt->p.rsp.comp_status != CS_COMPLETE ||
++		    pkt->p.rsp.scsi_status & SS_CHECK_CONDITION ||
++		    pkt->inq[0] == 0x7f) {
++
++			DEBUG4(printk("qla2x00_fo_notification: send CDB "
++			    "failed: comp_status = %x"
++			    "scsi_status = %x inq[0] = %x\n",
++			    pkt->p.rsp.comp_status,
++			    pkt->p.rsp.scsi_status,
++			    pkt->inq[0]);)
++		}
++
++		pci_free_consistent(old_ha->pdev,
++		    sizeof(inq_cmd_rsp_t), pkt, phys_address);
++	}
++
++	DEBUG3(printk("%s: exiting. rval = %d.\n", __func__, rval);)
++
++	return rval;
++}
++
++
++/*
++ * qla2100_fo_enabled
++ *      Reads and validates the failover enabled property.
++ *
++ * Input:
++ *      ha = adapter state pointer.
++ *      instance = HBA number.
++ *
++ * Returns:
++ *      TRUE when failover is authorized else FALSE
++ *
++ * Context:
++ *      Kernel context.
++ */
++uint8_t
++qla2x00_fo_enabled(scsi_qla_host_t *ha, int instance)
++{
++	uint8_t enable = FALSE;
++
++	if (ha->flags.failover_enabled)
++		enable = TRUE;
++
++	return enable;
++}
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qla_fo.cfg	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,31 @@
++/******************************************************************************
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.4.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ ******************************************************************************/
++
++/*
++ * QLogic ISP2x00 Multi-path LUN Support Driver
++ */
++int	MaxPathsPerDevice = 0;
++int	MaxRetriesPerPath =0 ;
++int	MaxRetriesPerIo =0;
++#if defined(MODULE)
++/* insmod qla2100 <options> ql2xopts=<string> */
++MODULE_PARM(MaxPathsPerDevice, "i");
++MODULE_PARM(MaxRetriesPerPath, "i");
++MODULE_PARM(MaxRetriesPerIo, "i");
++#endif
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qla_fo.h	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,75 @@
++/******************************************************************************
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ ******************************************************************************/
++
++/*
++ * QLogic ISP2x00 Failover Header 
++ *
++ */
++#ifndef _QLA_FO_H
++#define _QLA_FO_H
++
++#if defined(__cplusplus)
++extern "C"
++{
++#endif
++
++#include "qlfo.h"
++        /*
++         * This structure definition is for a scsi I/O request NOT subject to
++         * failover re-routing.  It is for the use of configuration operations
++         * and diagnostics functions as definted in ExIoct.h
++         */
++        typedef struct scsi_cdb_request {
++                struct adapter_state		*ha;
++                uint16_t	target;
++                uint16_t	lun;
++                uint8_t		*cdb_ptr;	/* Pointer to cdb to be sent */
++                uint8_t		cdb_len;	/* cdb length */
++                uint8_t		direction;	/* Direction of I/O for buffer */
++                uint8_t		scb_len;	/* Scsi completion block length */
++                uint8_t		*scb_ptr;	/* Scsi completion block pointer */
++                uint8_t		*buf_ptr;	/* Pointer to I/O buffer */
++                uint16_t	buf_len;	/* Buffer size */
++        }
++        SCSI_REQ_t, *SCSI_REQ_p;
++
++
++        /*
++        * Special defines
++        */
++        typedef	union	_FO_HBA_STAT {
++                FO_HBA_STAT_INPUT	input;
++                FO_HBA_STAT_INFO	info;
++        } FO_HBA_STAT;
++
++        typedef	union	_FO_LUN_DATA {
++                FO_LUN_DATA_INPUT	input;
++                FO_LUN_DATA_LIST	list;
++        } FO_LUN_DATA;
++
++        typedef union	_FO_TARGET_DATA {
++                FO_TARGET_DATA_INPUT    input;
++                FO_DEVICE_DATABASE    list;
++        } FO_TARGET_DATA;
++
++#if defined(__cplusplus)
++}
++#endif
++
++#endif	/* ifndef _QLA_FO_H */
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qla_gbl.h	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,395 @@
++/********************************************************************************
++*                  QLOGIC LINUX SOFTWARE
++*
++* QLogic ISP2x00 device driver for Linux 2.5.x
++* Copyright (C) 2003 Qlogic Corporation
++* (www.qlogic.com)
++*
++* This program is free software; you can redistribute it and/or modify it
++* under the terms of the GNU General Public License as published by the
++* Free Software Foundation; either version 2, or (at your option) any
++* later version.
++*
++* This program is distributed in the hope that it will be useful, but
++* WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++* General Public License for more details.
++*
++******************************************************************************
++* Global include file.
++******************************************************************************/
++
++
++#ifndef __QLA_GBL_H
++#define	__QLA_GBL_H
++
++/*
++ * Global Data in FW files.
++ */
++extern unsigned char  fw2100tp_version[];
++extern unsigned char  fw2100tp_version_str[];
++extern unsigned short fw2100tp_addr01;
++extern unsigned short fw2100tp_code01[];
++extern unsigned short fw2100tp_length01;
++
++extern unsigned char  fw2200ip_version[];
++extern unsigned char  fw2200ip_version_str[];
++extern unsigned short fw2200ip_addr01;
++extern unsigned short fw2200ip_code01[];
++extern unsigned short fw2200ip_length01;
++
++extern unsigned char  fw2300tpx_version[];
++extern unsigned char  fw2300tpx_version_str[];
++extern unsigned short fw2300tpx_addr01;
++extern unsigned short fw2300tpx_code01[];
++extern unsigned short fw2300tpx_length01;
++
++extern unsigned char  fw2300ipx_version[];
++extern unsigned char  fw2300ipx_version_str[];
++extern unsigned short fw2300ipx_addr01;
++extern unsigned short fw2300ipx_code01[];
++extern unsigned short fw2300ipx_length01;
++
++#if defined(ISP2322)
++extern unsigned char  fw2322tpx_version[];
++extern unsigned char  fw2322tpx_version_str[];
++extern unsigned short fw2322tpx_addr01;
++extern unsigned short fw2322tpx_code01[];
++extern unsigned short fw2322tpx_length01;
++extern unsigned long rseqtpx_code_addr01;
++extern unsigned short rseqtpx_code01[];
++extern unsigned short rseqtpx_code_length01;
++extern unsigned long xseqtpx_code_addr01;
++extern unsigned short xseqtpx_code01[];
++extern unsigned short xseqtpx_code_length01;
++
++extern unsigned char  fw2322ipx_version[];
++extern unsigned char  fw2322ipx_version_str[];
++extern unsigned short fw2322ipx_addr01;
++extern unsigned short fw2322ipx_code01[];
++extern unsigned short fw2322ipx_length01;
++extern unsigned long rseqipx_code_addr01;
++extern unsigned short rseqipx_code01[];
++extern unsigned short rseqipx_code_length01;
++extern unsigned long xseqipx_code_addr01;
++extern unsigned short xseqipx_code01[];
++extern unsigned short xseqipx_code_length01;
++#endif
++
++/*
++ * Global Function Prototypes in qla_init.c source file.
++ */
++extern uint8_t qla2x00_initialize_adapter(scsi_qla_host_t *);
++extern uint8_t qla2x00_loop_resync(scsi_qla_host_t *);
++extern void qla2x00_tgt_free(scsi_qla_host_t *ha, uint16_t t);
++extern uint8_t qla2x00_fabric_login(scsi_qla_host_t *, fcdev_t *);
++extern uint8_t qla2x00_local_device_login(scsi_qla_host_t *, uint16_t);
++
++extern void qla2x00_restart_queues(scsi_qla_host_t *, uint8_t);
++
++extern os_tgt_t *qla2x00_tgt_alloc(scsi_qla_host_t *, uint16_t);
++extern os_lun_t * qla2x00_lun_alloc(scsi_qla_host_t *, uint16_t, uint16_t);
++
++extern uint8_t qla2x00_abort_isp(scsi_qla_host_t *, uint8_t);
++
++
++/*
++ * Global Data in qla_os.c source file.
++ */
++extern char qla2x00_version_str[];
++extern unsigned long qla2x00_verbose;
++extern unsigned long qla2x00_quiet;
++extern unsigned long qla2x00_reinit;
++extern unsigned long qla2x00_req_dmp;
++
++extern int num_hosts;
++extern int apiHBAInstance;
++
++extern struct _qla2x00stats qla2x00_stats;
++extern char *ql2xdevconf;
++extern int ql2xretrycount;
++extern int qla2xenbinq;
++extern int max_srbs;
++#if defined(ISP2200) || defined(ISP2300)
++extern int ql2xlogintimeout;
++extern int qlport_down_retry;
++#endif
++extern int ql2xmaxqdepth;
++extern int displayConfig;
++
++extern int ql2xfailover;
++
++extern int ConfigRequired;
++extern int recoveryTime;
++extern int failbackTime;
++
++extern int Bind;
++extern int ql2xsuspendcount;
++extern int qla2x00_retryq_dmp;
++#if defined(MODULE)
++extern char *ql2xopts;
++#endif
++extern struct list_head qla_hostlist;
++extern rwlock_t qla_hostlist_lock;
++
++extern int qla2x00_queuecommand(Scsi_Cmnd *, void (*)(Scsi_Cmnd *));
++
++extern uint8_t 
++__qla2x00_suspend_lun(scsi_qla_host_t *, os_lun_t *, int, int, int);
++
++extern int qla2x00_done(scsi_qla_host_t *);
++extern void qla2x00_next(scsi_qla_host_t *);
++extern void qla2x00_flush_failover_q(scsi_qla_host_t *, os_lun_t *);
++extern void qla2x00_reset_lun_fo_counts(scsi_qla_host_t *, os_lun_t *);
++
++extern uint8_t qla2x00_check_tgt_status(scsi_qla_host_t *, Scsi_Cmnd *);
++extern uint8_t qla2x00_check_port_status(scsi_qla_host_t *, fc_port_t *);
++
++extern void qla2x00_extend_timeout(Scsi_Cmnd *, int);
++extern srb_t * qla2x00_get_new_sp (scsi_qla_host_t *ha);
++
++extern void qla2x00_mark_device_lost(scsi_qla_host_t *, fc_port_t *);
++extern void qla2x00_mark_all_devices_lost(scsi_qla_host_t *);
++
++extern int qla2x00_get_prop_xstr(scsi_qla_host_t *, char *, uint8_t *, int);
++
++extern void qla2x00_abort_queues(scsi_qla_host_t *, uint8_t);
++
++/*
++ * Global Function Prototypes in qla_iocb.c source file.
++ */
++extern request_t *qla2x00_req_pkt(scsi_qla_host_t *);
++extern request_t *qla2x00_ms_req_pkt(scsi_qla_host_t *, srb_t *);
++extern void qla2x00_isp_cmd(scsi_qla_host_t *);
++extern int qla2x00_start_scsi(srb_t *sp);
++int qla2x00_marker(scsi_qla_host_t *, uint16_t, uint16_t, uint8_t);
++int __qla2x00_marker(scsi_qla_host_t *, uint16_t, uint16_t, uint8_t);
++
++/*
++ * Global Function Prototypes in qla_mbx.c source file.
++ */
++extern uint8_t
++qla2x00_mailbox_command(scsi_qla_host_t *, mbx_cmd_t *);
++
++extern int
++qla2x00_load_ram(scsi_qla_host_t *, dma_addr_t, uint16_t, uint16_t);
++
++extern int
++qla2x00_load_ram_ext(scsi_qla_host_t *, dma_addr_t, uint32_t, uint16_t);
++
++extern int
++qla2x00_execute_fw(scsi_qla_host_t *);
++
++extern void
++qla2x00_get_fw_version(scsi_qla_host_t *, uint16_t *,
++    uint16_t *, uint16_t *, uint16_t *);
++
++extern int
++qla2x00_get_fw_options(scsi_qla_host_t *, uint16_t *, uint16_t *, uint16_t *);
++
++extern int
++qla2x00_set_fw_options(scsi_qla_host_t *,
++    uint16_t, uint16_t, uint16_t, uint16_t, uint16_t);
++
++extern int
++qla2x00_read_ram_word(scsi_qla_host_t *, uint16_t, uint16_t *);
++extern int
++qla2x00_write_ram_word(scsi_qla_host_t *, uint16_t, uint16_t);
++extern int
++qla2x00_write_ram_word_ext(scsi_qla_host_t *, uint32_t, uint16_t);
++
++extern int
++qla2x00_mbx_reg_test(scsi_qla_host_t *);
++
++extern int
++qla2x00_verify_checksum(scsi_qla_host_t *);
++
++extern int
++qla2x00_issue_iocb(scsi_qla_host_t *, void *, dma_addr_t, size_t);
++
++extern int
++qla2x00_abort_command(scsi_qla_host_t *, srb_t *);
++
++extern int
++qla2x00_abort_device(scsi_qla_host_t *, uint16_t, uint16_t);
++
++#if USE_ABORT_TGT
++extern int
++qla2x00_abort_target(fc_port_t *fcport);
++#endif
++
++extern int
++qla2x00_target_reset(scsi_qla_host_t *, uint16_t, uint16_t);
++
++extern int
++qla2x00_get_adapter_id(scsi_qla_host_t *, uint16_t *, uint8_t *, uint8_t *,
++    uint8_t *, uint16_t *);
++
++extern int
++qla2x00_get_retry_cnt(scsi_qla_host_t *, uint8_t *, uint8_t *);
++
++int
++qla2x00_loopback_test(scsi_qla_host_t *, INT_LOOPBACK_REQ *, uint16_t *);
++
++extern int
++qla2x00_init_firmware(scsi_qla_host_t *, uint16_t);
++
++extern int
++qla2x00_get_port_database(scsi_qla_host_t *, fcdev_t *, uint8_t);
++
++extern int
++qla2x00_get_firmware_state(scsi_qla_host_t *, uint16_t *);
++
++extern int
++qla2x00_get_port_name(scsi_qla_host_t *, uint16_t, uint8_t *, uint8_t);
++
++extern uint8_t
++qla2x00_get_link_status(scsi_qla_host_t *, uint8_t, void *, uint16_t *);
++
++extern int
++qla2x00_lip_reset(scsi_qla_host_t *);
++
++extern int
++qla2x00_send_sns(scsi_qla_host_t *, dma_addr_t, uint16_t, size_t);
++
++extern int
++qla2x00_login_fabric(scsi_qla_host_t *, uint16_t, uint8_t, uint8_t, uint8_t,
++    uint16_t *, uint8_t);
++
++extern int
++qla2x00_login_local_device(scsi_qla_host_t *, uint16_t, uint16_t *, uint8_t);
++
++extern int
++qla2x00_fabric_logout(scsi_qla_host_t *ha, uint16_t loop_id);
++
++extern int
++qla2x00_full_login_lip(scsi_qla_host_t *ha);
++
++extern int
++qla2x00_get_port_list(scsi_qla_host_t *, port_list_entry_t *, dma_addr_t,
++    uint16_t, uint16_t *);
++
++#if 0 /* not yet needed */
++extern int
++qla2x00_dump_ram(scsi_qla_host_t *, uint32_t, dma_addr_t, uint32_t);
++#endif
++
++extern int
++qla2x00_lun_reset(scsi_qla_host_t *, uint16_t, uint16_t);
++
++extern int
++qla2x00_send_rnid_mbx(scsi_qla_host_t *, uint16_t, uint8_t, dma_addr_t,
++    size_t, uint16_t *);
++
++extern int
++qla2x00_set_rnid_params_mbx(scsi_qla_host_t *, dma_addr_t, size_t, uint16_t *);
++
++extern int
++qla2x00_get_rnid_params_mbx(scsi_qla_host_t *, dma_addr_t, size_t, uint16_t *);
++
++#if defined(QL_DEBUG_LEVEL_3)
++extern int
++qla2x00_get_fcal_position_map(scsi_qla_host_t *ha, char *pos_map);
++#endif
++
++/*
++ * Global Data in qla_fo.c source file.
++ */
++extern SysFoParams_t qla_fo_params;
++
++/*
++ * Global Function Prototypes in qla_fo.c source file.
++ */
++extern scsi_qla_host_t *qla2x00_get_hba(int);
++extern uint32_t qla2x00_send_fo_notification(fc_lun_t *fclun_p, fc_lun_t *olun_p);
++extern void qla2x00_fo_init_params(scsi_qla_host_t *ha);
++extern uint8_t qla2x00_fo_enabled(scsi_qla_host_t *ha, int instance);
++
++/*
++ * Global Data in qla_cfg.c source file.
++ */
++extern mp_host_t  *mp_hosts_base;
++extern uint8_t   mp_config_required;
++/*
++ * Global Function Prototypes in qla_cfg.c source file.
++ */
++extern mp_host_t * qla2x00_cfg_find_host(scsi_qla_host_t *);
++extern uint8_t qla2x00_is_portname_in_device(mp_device_t *, uint8_t *);
++extern int qla2x00_cfg_init (scsi_qla_host_t *ha);
++extern int qla2x00_cfg_path_discovery(scsi_qla_host_t *ha);
++extern int qla2x00_cfg_event_notify(scsi_qla_host_t *ha, uint32_t i_type);
++extern fc_lun_t *qla2x00_cfg_failover(scsi_qla_host_t *ha, fc_lun_t *fp,
++					      os_tgt_t *tgt, srb_t *sp);
++extern int qla2x00_cfg_get_paths( EXT_IOCTL *, FO_GET_PATHS *, int);
++extern int qla2x00_cfg_set_current_path( EXT_IOCTL *,
++			FO_SET_CURRENT_PATH *, int);
++extern void qla2x00_fo_properties(scsi_qla_host_t *ha);
++extern mp_host_t * qla2x00_add_mp_host(uint8_t *);
++extern void qla2x00_cfg_mem_free(scsi_qla_host_t *ha);
++extern mp_host_t * qla2x00_alloc_host(scsi_qla_host_t *);
++extern uint8_t qla2x00_fo_check(scsi_qla_host_t *ha, srb_t *sp);
++extern mp_path_t *qla2x00_find_path_by_name(mp_host_t *, mp_path_list_t *,
++			uint8_t *name);
++
++/*
++ * Global Function Prototypes in qla_cfgln.c source file.
++ */
++extern void qla2x00_cfg_build_path_tree( scsi_qla_host_t *ha);
++extern uint8_t qla2x00_update_mp_device(mp_host_t *,
++					     fc_port_t  *, uint16_t	);
++extern void qla2x00_cfg_display_devices(void);
++
++/*
++ * Global Function Prototypes in qla_xioctl.c source file.
++ */
++extern void qla2x00_enqueue_aen(scsi_qla_host_t *, uint16_t, void *);
++extern int qla2x00_fo_ioctl(scsi_qla_host_t *, int, void *, int);
++extern int qla2x00_alloc_ioctl_mem(scsi_qla_host_t *);
++extern void qla2x00_free_ioctl_mem(scsi_qla_host_t *);
++extern int qla2x00_get_ioctl_scrap_mem(scsi_qla_host_t *, void **, uint32_t);
++extern void qla2x00_free_ioctl_scrap_mem(scsi_qla_host_t *);
++
++/*
++ * Global Function Prototypes in qla_inioctl.c source file.
++ */
++extern int qla2x00_read_nvram(scsi_qla_host_t *, EXT_IOCTL *, int);
++extern int qla2x00_update_nvram(scsi_qla_host_t *, EXT_IOCTL *, int);
++extern int qla2x00_write_nvram_word(scsi_qla_host_t *, uint8_t, uint16_t);
++extern int qla2x00_send_loopback(scsi_qla_host_t *, EXT_IOCTL *, int);
++extern int qla2x00_read_option_rom(scsi_qla_host_t *, EXT_IOCTL *, int);
++extern int qla2x00_update_option_rom(scsi_qla_host_t *, EXT_IOCTL *, int);
++
++
++/*
++ * Global Function Prototypes in qla_isr.c source file.
++ */
++extern irqreturn_t qla2x00_intr_handler(int, void *, struct pt_regs *);
++
++
++/*
++ * Global Function Prototypes in qla_sup.c source file.
++ */
++extern uint16_t qla2x00_get_nvram_word(scsi_qla_host_t *, uint32_t);
++extern void qla2x00_nv_write(scsi_qla_host_t *, uint16_t);
++extern void qla2x00_nv_deselect(scsi_qla_host_t *);
++extern uint8_t qla2x00_read_flash_byte(scsi_qla_host_t *, uint32_t);
++extern uint8_t qla2x00_get_flash_manufacturer(scsi_qla_host_t *);
++extern uint16_t qla2x00_get_flash_version(scsi_qla_host_t *);
++extern uint16_t qla2x00_get_flash_image(scsi_qla_host_t *, uint8_t *);
++extern uint16_t qla2x00_set_flash_image(scsi_qla_host_t *, uint8_t *);
++
++/*
++ * Global Function Prototypes in qla_vendor.c source file.
++ */
++void qla2x00_set_vend_direction(scsi_qla_host_t *, Scsi_Cmnd *, cmd_entry_t *);
++
++/*
++ * Global Function Prototypes in qla_dbg.c source file.
++ */
++extern void qla2x00_dump_isp(scsi_qla_host_t *, int);
++extern void qla2x00_dump_regs(struct Scsi_Host *);
++extern void qla2x00_dump_buffer(uint8_t *, uint32_t);
++extern void qla2x00_print_scsi_cmd(Scsi_Cmnd *);
++extern void qla2x00_print_q_info(struct os_lun *);
++
++#endif /* _QLA_GBL_H */
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qla_inioct.c	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,495 @@
++/******************************************************************************
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ ******************************************************************************/
++
++#include "qla_os.h"
++#include "qla_def.h"
++
++#include "inioct.h"
++
++extern int qla2x00_loopback_test(scsi_qla_host_t *ha, INT_LOOPBACK_REQ *req,
++    uint16_t *ret_mb);
++
++int qla2x00_read_nvram(scsi_qla_host_t *, EXT_IOCTL *, int);
++int qla2x00_update_nvram(scsi_qla_host_t *, EXT_IOCTL *, int);
++int qla2x00_write_nvram_word(scsi_qla_host_t *, uint8_t, uint16_t);
++int qla2x00_send_loopback(scsi_qla_host_t *, EXT_IOCTL *, int);
++int qla2x00_read_option_rom(scsi_qla_host_t *, EXT_IOCTL *, int);
++int qla2x00_update_option_rom(scsi_qla_host_t *, EXT_IOCTL *, int);
++
++int
++qla2x00_read_nvram(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
++{
++	uint8_t  *usr_temp, *kernel_tmp;
++	uint16_t data;
++	uint32_t i, cnt;
++	uint32_t transfer_size;
++
++	DEBUG9(printk("qla2x00_read_nvram: entered.\n");)
++
++	if (pext->ResponseLen < sizeof(nvram_t))
++		transfer_size = pext->ResponseLen / 2;
++	else
++		transfer_size = sizeof(nvram_t) / 2;
++
++	/* Dump NVRAM. */
++	usr_temp = (uint8_t *)pext->ResponseAdr;
++	for (i = 0, cnt = 0; cnt < transfer_size; cnt++, i++) {
++		data = cpu_to_le16(qla2x00_get_nvram_word(ha, cnt));
++
++		kernel_tmp = (uint8_t *)&data;
++
++		__put_user(*kernel_tmp, usr_temp);
++
++		/* next byte */
++		usr_temp++;
++		kernel_tmp++;
++
++		__put_user(*kernel_tmp, usr_temp);
++
++		usr_temp++;
++	}
++
++	pext->Status       = EXT_STATUS_OK;
++	pext->DetailStatus = EXT_STATUS_OK;
++
++	DEBUG9(printk("qla2x00_read_nvram: exiting.\n");)
++
++	return 0;
++}
++
++/*
++ * qla2x00_update_nvram
++ *	Write data to NVRAM.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	pext = pointer to driver internal IOCTL structure.
++ *
++ * Returns:
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_update_nvram(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
++{
++	uint8_t i, cnt;
++	uint8_t *usr_tmp, *kernel_tmp;
++	nvram_t *pnew_nv;
++	uint16_t *wptr;
++	uint16_t data;
++	uint32_t transfer_size;
++	uint8_t chksum = 0;
++	int ret = 0;
++
++	// FIXME: Endianess?
++	DEBUG9(printk("qla2x00_update_nvram: entered.\n");)
++
++	if (pext->RequestLen < sizeof(nvram_t))
++		transfer_size = pext->RequestLen;
++	else
++		transfer_size = sizeof(nvram_t);
++
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pnew_nv,
++	    sizeof(nvram_t))) {
++		/* not enough memory */
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "size requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(nvram_t));)
++		return (ret);
++	}
++
++	/* Read from user buffer */
++	kernel_tmp = (uint8_t *)pnew_nv;
++	usr_tmp = (uint8_t *)pext->RequestAdr;
++
++	ret = verify_area(VERIFY_READ, (void *)usr_tmp, transfer_size);
++	if (ret) {
++		DEBUG9_10(printk(
++		    "qla2x00_update_nvram: ERROR in buffer verify READ. "
++		    "RequestAdr=%p\n", pext->RequestAdr);)
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return ret;
++	}
++
++	copy_from_user(kernel_tmp, usr_tmp, transfer_size);
++
++	kernel_tmp = (uint8_t *)pnew_nv;
++
++	/* we need to checksum the nvram */
++	for (i = 0; i < sizeof(nvram_t) - 1; i++) {
++		chksum += *kernel_tmp;
++		kernel_tmp++;
++	}
++
++	chksum = ~chksum + 1;
++
++	*kernel_tmp = chksum;
++
++	/* Write to NVRAM */
++	wptr = (uint16_t *)pnew_nv;
++	for (cnt = 0; cnt < transfer_size / 2; cnt++) {
++		data = *wptr++;
++		qla2x00_write_nvram_word(ha, cnt, data);
++	}
++
++	pext->Status       = EXT_STATUS_OK;
++	pext->DetailStatus = EXT_STATUS_OK;
++
++	DEBUG9(printk("qla2x00_update_nvram: exiting.\n");)
++
++	qla2x00_free_ioctl_scrap_mem(ha);
++	return 0;
++}
++
++int
++qla2x00_write_nvram_word(scsi_qla_host_t *ha, uint8_t addr, uint16_t data)
++{
++	int count;
++	uint16_t word;
++	uint32_t nv_cmd;
++	device_reg_t *reg = ha->iobase;
++
++	qla2x00_nv_write(ha, NVR_DATA_OUT);
++	qla2x00_nv_write(ha, 0);
++	qla2x00_nv_write(ha, 0);
++
++	for (word = 0; word < 8; word++)
++		qla2x00_nv_write(ha, NVR_DATA_OUT);
++
++	qla2x00_nv_deselect(ha);
++
++	/* Erase Location */
++	nv_cmd = (addr << 16) | NV_ERASE_OP;
++	nv_cmd <<= 5;
++	for (count = 0; count < 11; count++) {
++		if (nv_cmd & BIT_31)
++			qla2x00_nv_write(ha, NVR_DATA_OUT);
++		else
++			qla2x00_nv_write(ha, 0);
++
++		nv_cmd <<= 1;
++	}
++
++	qla2x00_nv_deselect(ha);
++
++	/* Wait for Erase to Finish */
++	WRT_REG_WORD(&reg->nvram, NVR_SELECT);
++	do {
++		NVRAM_DELAY();
++		word = RD_REG_WORD(&reg->nvram);
++	} while ((word & NVR_DATA_IN) == 0);
++
++	qla2x00_nv_deselect(ha);
++
++	/* Write data */
++	nv_cmd = (addr << 16) | NV_WRITE_OP;
++	nv_cmd |= data;
++	nv_cmd <<= 5;
++	for (count = 0; count < 27; count++) {
++		if (nv_cmd & BIT_31)
++			qla2x00_nv_write(ha, NVR_DATA_OUT);
++		else
++			qla2x00_nv_write(ha, 0);
++
++		nv_cmd <<= 1;
++	}
++
++	qla2x00_nv_deselect(ha);
++
++	/* Wait for NVRAM to become ready */
++	WRT_REG_WORD(&reg->nvram, NVR_SELECT);
++	do {
++		NVRAM_DELAY();
++		word = RD_REG_WORD(&reg->nvram);
++	} while ((word & NVR_DATA_IN) == 0);
++
++	qla2x00_nv_deselect(ha);
++
++	/* Disable writes */
++	qla2x00_nv_write(ha, NVR_DATA_OUT);
++	for (count = 0; count < 10; count++)
++		qla2x00_nv_write(ha, 0);
++
++	qla2x00_nv_deselect(ha);
++
++	DEBUG9(printk("qla2x00_write_nvram_word: exiting.\n");)
++
++	return 0;
++}
++
++int
++qla2x00_send_loopback(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
++{
++	int		status;
++	uint16_t	ret_mb[MAILBOX_REGISTER_COUNT];
++	INT_LOOPBACK_REQ req;
++	INT_LOOPBACK_RSP rsp;
++
++	DEBUG9(printk("qla2x00_send_loopback: entered.\n");)
++
++
++	if (pext->RequestLen != sizeof(INT_LOOPBACK_REQ)) {
++		pext->Status = EXT_STATUS_INVALID_PARAM;
++		DEBUG9_10(printk(
++		    "qla2x00_send_loopback: invalid RequestLen =%d.\n",
++		    pext->RequestLen);)
++		return pext->Status;
++	}
++
++	if (pext->ResponseLen != sizeof(INT_LOOPBACK_RSP)) {
++		pext->Status = EXT_STATUS_INVALID_PARAM;
++		DEBUG9_10(printk(
++		    "qla2x00_send_loopback: invalid ResponseLen =%d.\n",
++		    pext->ResponseLen);)
++		return pext->Status;
++	}
++
++	status = verify_area(VERIFY_READ, (void *)pext->RequestAdr,
++			pext->RequestLen);
++	if (status) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("qla2x00_send_loopback: ERROR verify read of "
++		    "request buffer.\n");)
++		return pext->Status;
++	}
++
++	copy_from_user((uint8_t *)&req, (uint8_t *)pext->RequestAdr,
++	    pext->RequestLen);
++
++	status = verify_area(VERIFY_READ, (void *)pext->ResponseAdr,
++			pext->ResponseLen);
++	if (status) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("qla2x00_send_loopback: ERROR verify read of "
++		    "response buffer.\n");)
++		return pext->Status;
++	}
++
++	copy_from_user((uint8_t *)&rsp, (uint8_t *)pext->ResponseAdr,
++	    pext->ResponseLen);
++
++	if (req.TransferCount > req.BufferLength ||
++	    req.TransferCount > rsp.BufferLength) {
++
++		/* Buffer lengths not large enough. */
++		pext->Status = EXT_STATUS_INVALID_PARAM;
++
++		DEBUG9_10(printk(
++		    "qla2x00_send_loopback: invalid TransferCount =%d. "
++		    "req BufferLength =%d rspBufferLength =%d.\n",
++		    req.TransferCount, req.BufferLength, rsp.BufferLength);)
++
++		return pext->Status;
++	}
++
++	status = verify_area(VERIFY_READ, (void *)req.BufferAddress,
++	    req.TransferCount);
++	if (status) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("qla2x00_send_loopback: ERROR verify read of "
++		    "user loopback data buffer.\n");)
++		return pext->Status;
++	}
++
++	copy_from_user((uint8_t *)ha->ioctl_mem, (uint8_t *)req.BufferAddress,
++	    req.TransferCount);
++
++	DEBUG9(printk("qla2x00_send_loopback: req -- bufadr=%p, buflen=%x, "
++	    "xfrcnt=%x, rsp -- bufadr=%p, buflen=%x.\n",
++	    req.BufferAddress, req.BufferLength, req.TransferCount,
++	    rsp.BufferAddress, rsp.BufferLength);)
++
++	/*
++	 * AV - the caller of this IOCTL expects the FW to handle
++	 * a loopdown situation and return a good status for the
++	 * call function and a LOOPDOWN status for the test operations
++	 */
++	/*if (ha->loop_state != LOOP_READY || */
++	if (
++	    (test_bit(CFG_ACTIVE, &ha->cfg_flags)) ||
++	    (test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)) ||
++	    ABORTS_ACTIVE || ha->dpc_active) {
++
++		pext->Status = EXT_STATUS_BUSY;
++		DEBUG9_10(printk("qla2x00_send_loopback(%ld): "
++		    "loop not ready.\n", ha->host_no);)
++		return pext->Status;
++	}
++
++	status = qla2x00_loopback_test(ha, &req, ret_mb);
++
++	if (status) {
++		if (status == QL_STATUS_TIMEOUT ) {
++			pext->Status = EXT_STATUS_BUSY;
++			DEBUG9_10(printk("qla2x00_send_loopback: ERROR "
++			    "command timed out.\n");)
++			return pext->Status;
++		} else {
++			/* EMPTY. Just proceed to copy back mailbox reg
++			 * values for users to interpret.
++			 */
++			DEBUG10(printk("qla2x00_send_loopback: ERROR "
++			    "loopback command failed 0x%x.\n", ret_mb[0]);)
++		}
++	}
++
++	status = verify_area(VERIFY_WRITE, (void *)rsp.BufferAddress,
++	    req.TransferCount);
++	if (status) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("qla2x00_send_loopback: ERROR verify "
++		    "write of return data buffer.\n");)
++		return pext->Status;
++	}
++
++	DEBUG9(printk("qla2x00_send_loopback: loopback mbx cmd ok. "
++	    "copying data.\n");)
++
++	/* put loopback return data in user buffer */
++	copy_to_user((uint8_t *)rsp.BufferAddress,
++	    (uint8_t *)ha->ioctl_mem, req.TransferCount);
++
++	rsp.CompletionStatus = ret_mb[0];
++	if (rsp.CompletionStatus == INT_DEF_LB_COMPLETE) {
++		rsp.CrcErrorCount = ret_mb[1];
++		rsp.DisparityErrorCount = ret_mb[2];
++		rsp.FrameLengthErrorCount = ret_mb[3];
++		rsp.IterationCountLastError = (ret_mb[19] << 16) | ret_mb[18];
++	}
++
++	status = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr,
++	    pext->ResponseLen);
++	if (status) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("qla2x00_send_loopback: ERROR verify "
++		    "write of response buffer.\n");)
++		return pext->Status;
++	}
++
++	copy_to_user((uint8_t *)pext->ResponseAdr, (uint8_t *)&rsp,
++	    pext->ResponseLen);
++
++	pext->Status       = EXT_STATUS_OK;
++	pext->DetailStatus = EXT_STATUS_OK;
++
++	DEBUG9(printk("qla2x00_send_loopback: exiting.\n");)
++
++	return pext->Status;
++}
++
++int qla2x00_read_option_rom(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
++{
++	uint8_t		*usr_tmp;
++	uint32_t	addr;
++	uint32_t	midpoint;
++	uint32_t	transfer_size;
++	uint8_t		data;
++	device_reg_t	*reg = ha->iobase;
++	unsigned long	cpu_flags;
++
++	DEBUG9(printk("%s: entered.\n", __func__);)
++
++	if (pext->ResponseLen != FLASH_IMAGE_SIZE) {
++		pext->Status = EXT_STATUS_BUFFER_TOO_SMALL;
++		return (1);
++	}
++
++	transfer_size = FLASH_IMAGE_SIZE;
++
++	midpoint = FLASH_IMAGE_SIZE / 2;
++	usr_tmp = (uint8_t *)pext->ResponseAdr;
++
++	/* Dump FLASH. */
++	spin_lock_irqsave(&ha->hardware_lock, cpu_flags);
++	WRT_REG_WORD(&reg->nvram, 0);
++	for (addr = 0; addr < transfer_size; addr++, usr_tmp++) {
++		if (addr == midpoint)
++			WRT_REG_WORD(&reg->nvram, NVR_SELECT);
++
++		data = qla2x00_read_flash_byte(ha, addr);
++		__put_user(data, usr_tmp);
++	}
++	spin_unlock_irqrestore(&ha->hardware_lock, cpu_flags);
++
++	pext->Status = EXT_STATUS_OK;
++	pext->DetailStatus = EXT_STATUS_OK;
++
++	DEBUG9(printk("%s: exiting.\n", __func__);)
++
++	return (0);
++}
++
++int qla2x00_update_option_rom(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
++{
++	int		ret;
++	uint8_t		*usr_tmp;
++	uint8_t		*kern_tmp;
++	uint16_t	status;
++	unsigned long	cpu_flags;
++
++	DEBUG9(printk("%s: entered.\n", __func__);)
++
++	if (pext->RequestLen != FLASH_IMAGE_SIZE) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		return (1);
++	}
++
++	pext->Status = EXT_STATUS_OK;
++	pext->DetailStatus = EXT_STATUS_OK;
++
++	/* Read from user buffer */
++	usr_tmp = (uint8_t *)pext->RequestAdr;
++	ret = verify_area(VERIFY_READ, (void *)usr_tmp, FLASH_IMAGE_SIZE);
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s: ERROR in buffer verify READ. "
++				"RequestAdr=%p\n",
++				__func__, pext->RequestAdr);)
++		return (ret);
++	}
++
++	kern_tmp = (uint8_t *)KMEM_ZALLOC(FLASH_IMAGE_SIZE, 30);
++	if (kern_tmp == NULL) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		printk(KERN_WARNING
++			"%s: ERROR in flash allocation.\n", __func__);
++		return (1);
++	}
++	copy_from_user(kern_tmp, usr_tmp, FLASH_IMAGE_SIZE);
++
++	/* Go with update */
++	spin_lock_irqsave(&ha->hardware_lock, cpu_flags);
++	status = qla2x00_set_flash_image(ha, kern_tmp);
++	spin_unlock_irqrestore(&ha->hardware_lock, cpu_flags);
++
++	KMEM_FREE(kern_tmp, FLASH_IMAGE_SIZE);
++
++	if (status) {
++		ret = 1;
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s: ERROR updating flash.\n", __func__);)
++	}
++
++	DEBUG9(printk("%s: exiting.\n", __func__);)
++
++	return (ret);
++}
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qla_init.c	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,5945 @@
++/*
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ */
++#include "qla_os.h"
++
++#include "qla_def.h"
++
++/*
++*  QLogic ISP2x00 Hardware Support Function Prototypes.
++*/
++uint8_t qla2x00_initialize_adapter(scsi_qla_host_t *);
++
++static uint8_t qla2x00_isp_firmware(scsi_qla_host_t *);
++static void qla2x00_reset_chip(scsi_qla_host_t *);
++static uint8_t qla2x00_pci_config(scsi_qla_host_t *);
++static uint8_t qla2x00_set_cache_line(scsi_qla_host_t *);
++static uint8_t qla2x00_chip_diag(scsi_qla_host_t *);
++static uint8_t qla2x00_setup_chip(scsi_qla_host_t *ha);
++static uint8_t qla2x00_init_rings(scsi_qla_host_t *ha);
++static uint8_t qla2x00_fw_ready(scsi_qla_host_t *ha);
++static uint8_t qla2x00_nvram_config(scsi_qla_host_t *);
++
++static void qla2x00_init_fc_db(scsi_qla_host_t *);
++static void qla2x00_init_tgt_map(scsi_qla_host_t *);
++
++static uint8_t qla2x00_configure_loop(scsi_qla_host_t *);
++static uint8_t qla2x00_configure_local_loop(scsi_qla_host_t *, uint8_t );
++static uint8_t qla2x00_configure_fabric(scsi_qla_host_t *, uint8_t );
++static uint8_t qla2x00_find_all_fabric_devs(scsi_qla_host_t *,
++    struct new_dev *, uint16_t *, uint8_t *);
++static void qla2x00_device_resync(scsi_qla_host_t *);
++static int qla2x00_ga_nxt(scsi_qla_host_t *, sw_info_t *);
++static int qla2x00_gid_pt(scsi_qla_host_t *, sw_info_t *);
++static int qla2x00_gpn_id(scsi_qla_host_t *, sw_info_t *);
++static int qla2x00_gnn_id(scsi_qla_host_t *, sw_info_t *);
++static int qla2x00_gft_id(scsi_qla_host_t *, sw_info_t *);
++static int qla2x00_rft_id(scsi_qla_host_t *);
++static int qla2x00_rff_id(scsi_qla_host_t *);
++static int qla2x00_rnn_id(scsi_qla_host_t *);
++static int qla2x00_rsnn_nn(scsi_qla_host_t *);
++
++static int qla2x00_add_initiator_device(scsi_qla_host_t *, fcdev_t *);
++
++uint8_t qla2x00_fabric_login(scsi_qla_host_t *, fcdev_t *);
++uint8_t qla2x00_local_device_login(scsi_qla_host_t *, uint16_t);
++
++static uint8_t qla2x00_update_fc_database(scsi_qla_host_t *,
++    fcdev_t *, uint8_t);
++static int qla2x00_build_fcport_list(scsi_qla_host_t *ha);
++static void qla2x00_config_os(scsi_qla_host_t *ha);
++static uint16_t qla2x00_fcport_bind(scsi_qla_host_t *ha, fc_port_t *fcport);
++static int qla2x00_update_fcport(scsi_qla_host_t *ha, fc_port_t *fcport, int);
++static int qla2x00_lun_discovery(scsi_qla_host_t *ha, fc_port_t *fcport, int);
++static int qla2x00_rpt_lun_discovery(scsi_qla_host_t *ha, fc_port_t *fcport);
++static void qla2x00_cfg_lun(fc_port_t *fcport, uint16_t lun);
++
++static void qla2x00_lun_free(scsi_qla_host_t *, uint16_t, uint16_t);
++
++static void qla2x00_get_lun_mask_from_config(scsi_qla_host_t *,
++    fc_port_t *, uint16_t, uint16_t);
++static int qla2x00_bstr_to_hex(char *, uint8_t *, int);
++
++static uint8_t qla2x00_find_propname(scsi_qla_host_t *,
++    char *, char *, char *, int);
++static int qla2x00_get_prop_16chars(scsi_qla_host_t *,
++    char *, char *, char *);
++static void qla2x00_get_properties(scsi_qla_host_t *, char *);
++
++static void qla2x00_cfg_persistent_binding(scsi_qla_host_t *);
++
++static int qla2x00_restart_isp(scsi_qla_host_t *);
++static void qla2x00_reset_adapter(scsi_qla_host_t *);
++
++#define MAX_LOCAL_LOOP_IDS	127
++static uint8_t alpa_table[MAX_LOCAL_LOOP_IDS] = {
++	0xEF, 0xE8, 0xE4, 0xE2, 0xE1, 0xE0, 0xDC, 0xDA,
++	0xD9, 0xD6, 0xD5, 0xD4, 0xD3, 0xD2, 0xD1, 0xCE,
++	0xCD, 0xCC, 0xCB, 0xCA, 0xC9, 0xC7, 0xC6, 0xC5,
++	0xC3, 0xBC, 0xBA, 0xB9, 0xB6, 0xB5, 0xB4, 0xB3,
++	0xB2, 0xB1, 0xAE, 0xAD, 0xAC, 0xAB, 0xAA, 0xA9,
++	0xA7, 0xA6, 0xA5, 0xA3, 0x9F, 0x9E, 0x9D, 0x9B,
++	0x98, 0x97, 0x90, 0x8F, 0x88, 0x84, 0x82, 0x81,
++	0x80, 0x7C, 0x7A, 0x79, 0x76, 0x75, 0x74, 0x73,
++	0x72, 0x71, 0x6E, 0x6D, 0x6C, 0x6B, 0x6A, 0x69,
++	0x67, 0x66, 0x65, 0x63, 0x5C, 0x5A, 0x59, 0x56,
++	0x55, 0x54, 0x53, 0x52, 0x51, 0x4E, 0x4D, 0x4C,
++	0x4B, 0x4A, 0x49, 0x47, 0x46, 0x45, 0x43, 0x3C,
++	0x3A, 0x39, 0x36, 0x35, 0x34, 0x33, 0x32, 0x31,
++	0x2E, 0x2D, 0x2C, 0x2B, 0x2A, 0x29, 0x27, 0x26,
++	0x25, 0x23, 0x1F, 0x1E, 0x1D, 0x1B, 0x18, 0x17,
++	0x10, 0x0F, 0x08, 0x04, 0x02, 0x01, 0x00
++};
++
++/****************************************************************************/
++/*                QLogic ISP2x00 Hardware Support Functions.                */
++/****************************************************************************/
++
++/*
++* qla2x00_initialize_adapter
++*      Initialize board.
++*
++* Input:
++*      ha = adapter block pointer.
++*
++* Returns:
++*      0 = success
++*/
++uint8_t
++qla2x00_initialize_adapter(scsi_qla_host_t *ha)
++{
++	uint8_t	status;
++	uint8_t	isp_init = 0;
++	uint8_t	restart_risc = 0;
++	uint8_t	retry;
++	unsigned long	wait_device = 0;
++
++	ENTER(__func__);
++
++	/* Clear adapter flags. */
++	ha->forceLip = 0;
++	ha->flags.online = FALSE;
++	ha->flags.disable_host_adapter = FALSE;
++	ha->flags.reset_active = FALSE;
++	ha->flags.watchdog_enabled = FALSE;
++	atomic_set(&ha->loop_down_timer, LOOP_DOWN_TIME);
++	ha->loop_state = LOOP_DOWN;
++	ha->device_flags = 0;
++	ha->sns_retry_cnt = 0;
++	ha->device_flags = 0;
++	ha->dpc_flags = 0;
++	ha->sns_retry_cnt = 0;
++	ha->failback_delay = 0;
++#if defined(IOCB_THROLLE_USAGE)
++	ha->iocb_cnt = 0;
++	ha->iocb_overflow_cnt = 0;
++#endif
++	ha->flags.management_server_logged_in = 0;
++	ha->marker_needed = 0;
++	ha->mbx_flags = 0;
++	ha->isp_abort_cnt = 0;
++
++	if (!(status = qla2x00_pci_config(ha))) {
++
++		qla2x00_reset_chip(ha);
++
++		/* Initialize Fibre Channel database. */
++		qla2x00_init_fc_db(ha);
++
++		/* Initialize target map database. */
++		qla2x00_init_tgt_map(ha);
++
++		/* Get Flash Version */
++		qla2x00_get_flash_version(ha);
++
++		if (qla2x00_verbose)
++			printk("scsi(%ld): Configure NVRAM parameters...\n",
++				ha->host_no);
++
++		qla2x00_nvram_config(ha);
++
++		ha->retry_count = ql2xretrycount;
++
++		if (qla2x00_verbose)
++			printk("scsi(%ld): Verifying loaded RISC code...\n",
++				ha->host_no);
++
++		qla2x00_set_cache_line(ha);
++
++		/*
++		 * If the user specified a device configuration on the command
++		 * line then use it as the configuration.  Otherwise, we scan
++		 * for all devices.
++		 */
++		if (ql2xdevconf) {
++			ha->cmdline = ql2xdevconf;
++			if (!ha->flags.failover_enabled)
++				qla2x00_get_properties(ha, ql2xdevconf);
++		}
++
++		retry = 10;
++		/*
++		 * Try an configure the loop.
++		 */
++		do {
++			restart_risc = 0;
++			isp_init = 0;
++
++			/* If firmware needs to be loaded */
++			if (qla2x00_isp_firmware(ha)) {
++				if (qla2x00_verbose)
++					printk("scsi(%ld): Verifying chip...\n",
++						ha->host_no);
++
++				if (!(status = qla2x00_chip_diag(ha)))
++					status = qla2x00_setup_chip(ha);
++
++				if (!status) {
++					DEBUG(printk("scsi(%ld): Chip verified "
++							"and RISC loaded...\n",
++							ha->host_no));
++				}
++			}
++
++			/* Retrieve firmware information */
++			qla2x00_get_fw_version(ha, &ha->fw_major_version,
++			    &ha->fw_minor_version, &ha->fw_subminor_version,
++			    &ha->fw_attributes);
++
++			if (!status && !(status = qla2x00_init_rings(ha))) {
++				/* dg - 7/3/1999
++				 *
++				 * Wait for a successful LIP up to a maximum 
++				 * of (in seconds): RISC login timeout value,
++				 * RISC retry count value, and port down retry
++				 * value OR a minimum of 4 seconds OR If no 
++				 * cable, only 5 seconds.
++				 */
++				DEBUG(printk("scsi(%ld): Init rings OK..."
++				    "calling qla2x00_fw_ready()...\n",
++				    ha->host_no));
++
++				if (!qla2x00_fw_ready(ha)) {
++					clear_bit(RESET_MARKER_NEEDED,
++							&ha->dpc_flags);
++					clear_bit(COMMAND_WAIT_NEEDED,
++							&ha->dpc_flags);
++
++					/*
++					 * Go setup flash database devices 
++					 * with proper Loop ID's.
++					 */
++					do {
++						clear_bit(LOOP_RESYNC_NEEDED,
++								&ha->dpc_flags);
++						status = qla2x00_configure_loop(ha);
++
++						/*
++						 * Temp code: delay a while for certain
++						 * slower devices to become ready.
++						 */
++						for ((wait_device = jiffies + HZ);
++							!time_after_eq(jiffies,wait_device);) {
++							qla2x00_check_fabric_devices(ha);
++
++							set_current_state(TASK_INTERRUPTIBLE);
++							schedule_timeout(5);
++						}
++
++					} while (!atomic_read(&ha->loop_down_timer) &&
++						!(test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags)) &&
++						(test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags)) );
++				}
++
++				if (ha->flags.update_config_needed) {
++					ha->init_cb->add_firmware_options[0] |=
++					    ((ha->operating_mode << 4) &
++						(BIT_6 | BIT_5 | BIT_4));
++
++					restart_risc = 1;
++				}
++
++				if (ha->mem_err) {
++					restart_risc = 1;
++				}
++				isp_init = 1;
++
++			}
++		} while (restart_risc && retry--);
++
++		if (isp_init) {
++			clear_bit(RESET_MARKER_NEEDED, &ha->dpc_flags);
++			ha->marker_needed = 1;
++			qla2x00_marker(ha, 0, 0, MK_SYNC_ALL);
++			ha->marker_needed = 0;
++
++			ha->flags.online = TRUE;
++		}
++
++	}
++
++#if defined(QL_DEBUG_LEVEL_2) || defined(QL_DEBUG_LEVEL_3)
++	if (status)
++		printk("%s(): **** FAILED ****\n", __func__);
++#endif
++
++	LEAVE(__func__);
++
++	return (status);
++}
++
++/**
++ * qla2x00_isp_firmware() - Choose firmware image.
++ * @ha: HA context
++ *
++ * Returns 0 on success.
++ */
++static uint8_t
++qla2x00_isp_firmware(scsi_qla_host_t *ha)
++{
++	uint8_t  status;
++
++
++	ENTER(__func__);
++
++	/* Assume loading risc code */
++	status = 1; 
++
++	if (ha->flags.disable_risc_code_load) {
++		DEBUG2(printk("scsi(%ld): RISC CODE NOT loaded\n",
++		    ha->host_no));
++		printk(KERN_INFO
++		    "scsi(%ld): RISC CODE NOT loaded\n", ha->host_no);
++
++		/* Verify checksum of loaded RISC code. */
++		status = qla2x00_verify_checksum(ha);
++	}
++
++	if (status) {
++		DEBUG2_3(printk("scsi(%ld): **** Load RISC code ****\n",
++		    ha->host_no));
++	}
++
++	LEAVE(__func__);
++
++	return (status);
++}
++
++/**
++ * qla2x00_reset_chip() - Reset ISP chip.
++ * @ha: HA context
++ *
++ * Returns 0 on success.
++ */
++static void
++qla2x00_reset_chip(scsi_qla_host_t *ha) 
++{
++	unsigned long   flags = 0;
++	device_reg_t	*reg = ha->iobase;
++	uint32_t	cnt;
++	unsigned long	mbx_flags = 0;
++	uint16_t	cmd;
++
++	ENTER(__func__);
++
++	/* Disable ISP interrupts. */
++	qla2x00_disable_intrs(ha);
++
++	spin_lock_irqsave(&ha->hardware_lock, flags);
++
++	/* Turn off master enable */
++	cmd = 0;
++	pci_read_config_word(ha->pdev, PCI_COMMAND, &cmd);
++	cmd &= ~PCI_COMMAND_MASTER;
++	pci_write_config_word(ha->pdev, PCI_COMMAND, cmd);
++
++#if defined(ISP2200) || defined(ISP2300)
++	/* Pause RISC. */
++	WRT_REG_WORD(&reg->hccr, HCCR_PAUSE_RISC);
++	if (ha->pdev->device == QLA2312_DEVICE_ID ||
++	    ha->pdev->device == QLA2322_DEVICE_ID) {
++		for (cnt = 0; cnt < 30000; cnt++) {
++			if ((RD_REG_WORD(&reg->hccr) & HCCR_RISC_PAUSE) != 0)
++				break;
++			udelay(100);
++		}
++	} else {
++		udelay(10);
++	}
++
++	/* Select FPM registers. */
++	WRT_REG_WORD(&reg->ctrl_status, 0x20);
++
++	/* FPM Soft Reset. */
++	WRT_REG_WORD(&reg->fpm_diag_config, 0x100);
++
++#if defined(ISP2300)
++	/* Toggle Fpm Reset. */
++	WRT_REG_WORD(&reg->fpm_diag_config, 0x0);
++#endif
++
++	/* Select frame buffer registers. */
++	WRT_REG_WORD(&reg->ctrl_status, 0x10);
++
++	/* Reset frame buffer FIFOs. */
++#if defined(ISP2200)
++	WRT_REG_WORD(&reg->fb_cmd, 0xa000);
++#else
++	WRT_REG_WORD(&reg->fb_cmd, 0x00fc);
++
++	/* Read back fb_cmd until zero or 3 seconds max */
++	for (cnt = 0; cnt < 3000; cnt++) {
++		if ((RD_REG_WORD(&reg->fb_cmd) & 0xff) == 0)
++			break;
++		udelay(100);
++	}
++#endif /* defined(ISP2200) */
++
++	/* Select RISC module registers. */
++	WRT_REG_WORD(&reg->ctrl_status, 0);
++
++	/* Reset RISC processor. */
++	WRT_REG_WORD(&reg->hccr, HCCR_RESET_RISC);
++
++	/* Release RISC processor. */
++	WRT_REG_WORD(&reg->hccr, HCCR_RELEASE_RISC);
++
++#endif /* defined(ISP2200) || defined(ISP2300) */
++
++	WRT_REG_WORD(&reg->hccr, HCCR_CLR_RISC_INT);
++	WRT_REG_WORD(&reg->hccr, HCCR_CLR_HOST_INT);
++
++	/* Reset ISP chip. */
++	WRT_REG_WORD(&reg->ctrl_status, CSR_ISP_SOFT_RESET);
++
++	/* Wait for RISC to recover from reset. */
++	if (ha->pdev->device == QLA2312_DEVICE_ID ||
++	    ha->pdev->device == QLA2322_DEVICE_ID) {
++		udelay(10);
++	} else {
++		for (cnt = 30000; cnt; cnt--) {
++			if ((RD_REG_WORD(&reg->ctrl_status) &
++			    CSR_ISP_SOFT_RESET) == 0)
++				break;
++			udelay(100);
++		}
++	}
++
++	/* Reset RISC processor. */
++	WRT_REG_WORD(&reg->hccr, HCCR_RESET_RISC);
++
++	WRT_REG_WORD(&reg->semaphore, 0);
++
++	/* Release RISC processor. */
++	WRT_REG_WORD(&reg->hccr, HCCR_RELEASE_RISC);
++
++	if (ha->pdev->device == QLA2312_DEVICE_ID ||
++	    ha->pdev->device == QLA2322_DEVICE_ID) {
++		udelay(100);
++	} else {
++		for (cnt = 0; cnt < 30000; cnt++) {
++			if (!(test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)))
++				QLA_MBX_REG_LOCK(ha);
++
++			if (RD_REG_WORD(&reg->mailbox0) != MBS_BUSY) {
++				if (!(test_bit(ABORT_ISP_ACTIVE,
++				    &ha->dpc_flags)))
++					QLA_MBX_REG_UNLOCK(ha);
++				break;
++			}
++
++			if (!(test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)))
++				QLA_MBX_REG_UNLOCK(ha);
++
++			udelay(100);
++		}
++	}
++
++	/* Turn on master enable */
++	cmd |= PCI_COMMAND_MASTER;
++	pci_write_config_word(ha->pdev, PCI_COMMAND, cmd);
++
++#if defined(ISP2200) || defined(ISP2300)
++	/* Disable RISC pause on FPM parity error. */
++	WRT_REG_WORD(&reg->hccr, HCCR_DISABLE_PARITY_PAUSE);
++#endif
++
++	/* Save PCI information. */
++	ha->isp_ctrl_status = RD_REG_WORD(&reg->ctrl_status);
++
++	spin_unlock_irqrestore(&ha->hardware_lock, flags);
++
++	LEAVE(__func__);
++}
++
++/**
++ * qla2x00_pci_config() - Setup device PCI configuration registers.
++ * @ha: HA context
++ *
++ * Returns 0 on success.
++ */
++static uint8_t
++qla2x00_pci_config(scsi_qla_host_t *ha)
++{
++	uint8_t		status;
++	uint16_t	w;
++#if defined(ISP2300)
++	uint32_t	cnt;
++	unsigned long   flags = 0;
++#endif
++#if MEMORY_MAPPED_IO
++	uint32_t	mmapbase;
++	uint32_t	page_offset, base;
++#endif
++
++	ENTER(__func__);
++
++	if (qla2x00_verbose)
++		printk("scsi(%ld): Configuring PCI space...\n",
++			ha->host_no);
++
++	/* 
++	 * Turn on PCI master; for system BIOSes that don't turn it on by
++	 * default.
++	 */
++	pci_set_master(ha->pdev);
++	pci_read_config_word(ha->pdev, PCI_REVISION_ID, &ha->revision);
++
++	if (ha->iobase)
++		return 0;
++
++	/*
++	 * We want to respect framework's setting of PCI configuration space
++	 * command register and also want to make sure that all bits of
++	 * interest to us are properly set in command register.
++	 */
++	pci_read_config_word(ha->pdev, PCI_COMMAND, &w);
++	w |= (PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER | 
++	    PCI_COMMAND_INVALIDATE | PCI_COMMAND_PARITY | PCI_COMMAND_SERR);
++
++#if MEMORY_MAPPED_IO
++	DEBUG(printk("scsi(%ld): I/O SPACE and MEMORY MAPPED I/O enabled.\n",
++	    ha->host_no));
++#else
++	DEBUG(printk("scsi(%ld): I/O SPACE enabled and MEMORY MAPPED I/O "
++	    "disabled.\n", ha->host_no));
++
++	w &= ~PCI_COMMAND_MEMORY;
++#endif
++
++#if defined(ISP2300)
++	/* PCI Specification Revision 2.3 changes */
++	if (ha->pdev->device == QLA2322_DEVICE_ID) {
++		/* Command Register -- Reset Interrupt Disable -- BIT_10 */
++		w &= ~BIT_10;
++	}
++
++	/*
++	 * If this is a 2300 card and not 2312, reset the COMMAND_INVALIDATE
++	 * due to a bug in the 2300. Unfortunately, the 2310 also reports
++	 * itself as a 2300 so we need to get the fb revision level -- a 6
++	 * indicates it really is a 2300 and not a 2310.
++	 */
++	if (ha->pdev->device == QLA2300_DEVICE_ID) {
++		spin_lock_irqsave(&ha->hardware_lock, flags);
++
++		/* Pause RISC. */
++		WRT_REG_WORD(&ha->iobase->hccr, HCCR_PAUSE_RISC);
++		for (cnt = 0; cnt < 30000; cnt++) {
++			if ((RD_REG_WORD(&ha->iobase->hccr) &
++			    HCCR_RISC_PAUSE) != 0)
++				break;
++
++			udelay(10);
++		}
++
++		/* Select FPM registers. */
++		WRT_REG_WORD(&ha->iobase->ctrl_status, 0x20);
++
++		/* Get the fb rev level */
++		if (RD_REG_WORD(&ha->iobase->fb_cmd) == FPM_2300)
++			w &= ~PCI_COMMAND_INVALIDATE;
++
++		/* Deselect FPM registers. */
++		WRT_REG_WORD(&ha->iobase->ctrl_status, 0x0);
++
++		/* Release RISC module. */
++		WRT_REG_WORD(&ha->iobase->hccr, HCCR_RELEASE_RISC);
++		for (cnt = 0; cnt < 30000; cnt++) {
++			if ((RD_REG_WORD(&ha->iobase->hccr) &
++			    HCCR_RISC_PAUSE) == 0)
++				break;
++
++			udelay(10);
++		}
++
++		spin_unlock_irqrestore(&ha->hardware_lock, flags);
++	}
++#endif
++
++	pci_write_config_word(ha->pdev, PCI_COMMAND, w);
++
++	/* Reset expansion ROM address decode enable */
++	pci_read_config_word(ha->pdev, PCI_ROM_ADDRESS, &w);
++	w &= ~PCI_ROM_ADDRESS_ENABLE;
++	pci_write_config_word(ha->pdev, PCI_ROM_ADDRESS, w);
++
++	status = 0;
++#if MEMORY_MAPPED_IO
++	/* Get memory mapped I/O address */
++	pci_read_config_dword(ha->pdev, PCI_BASE_ADDRESS_1, &mmapbase);
++	mmapbase &= PCI_BASE_ADDRESS_MEM_MASK;
++
++	/* Find proper memory chunk for memory map I/O reg */
++	base = mmapbase & PAGE_MASK;
++	page_offset = mmapbase - base;
++
++	/* Get virtual address for I/O registers  */
++	ha->mmpbase = ioremap(base, page_offset + 256);
++	if (ha->mmpbase) {
++		ha->mmpbase += page_offset;
++		ha->iobase = ha->mmpbase;
++		status = 0;
++	}
++#endif
++
++	LEAVE(__func__);
++
++	return (status);
++}
++
++/**
++ * qla2x00_set_cache_line() - Sets PCI cache line parameter.
++ * @ha: HA context
++ *
++ * Returns 0 on success.
++ */
++static uint8_t
++qla2x00_set_cache_line(struct scsi_qla_host * ha)
++{
++	unsigned char cache_size;
++
++	ENTER(__func__);
++
++	/* Set the cache line. */
++	if (!ha->flags.set_cache_line_size_1) {
++		LEAVE(__func__);
++
++		return (0);
++	}
++
++	/* Taken from drivers/net/acenic.c */
++	pci_read_config_byte(ha->pdev, PCI_CACHE_LINE_SIZE, &cache_size);
++	cache_size <<= 2;
++	if (cache_size != SMP_CACHE_BYTES) {
++		printk(KERN_INFO
++		    "scsi(%ld): PCI cache line size set incorrectly "
++		    "(%d bytes) by BIOS/FW, ",
++		    ha->host_no, cache_size);
++
++		if (cache_size > SMP_CACHE_BYTES) {
++			printk(KERN_INFO "expecting %d.\n", SMP_CACHE_BYTES);
++		} else {
++			printk(KERN_INFO
++			    "correcting to %d.\n", SMP_CACHE_BYTES);
++			pci_write_config_byte(ha->pdev,
++			    PCI_CACHE_LINE_SIZE, SMP_CACHE_BYTES >> 2);
++		}
++	}
++
++	LEAVE(__func__);
++
++	return (0);
++}
++
++/**
++ * qla2x00_chip_diag() - Test chip for proper operation.
++ * @ha: HA context
++ *
++ * Returns 0 on success.
++ */
++static uint8_t
++qla2x00_chip_diag(scsi_qla_host_t *ha)
++{
++	uint8_t		status;
++	device_reg_t	*reg = ha->iobase;
++	unsigned long	flags = 0;
++	uint16_t	data;
++	uint32_t	cnt;
++	uint16_t	mb[5];
++
++	ENTER(__func__);
++
++	/* Assume a failed state */
++	status = 1;
++
++	DEBUG3(printk("scsi(%ld): Testing device at %lx.\n",
++	    ha->host_no, (u_long)&reg->flash_address));
++
++	spin_lock_irqsave(&ha->hardware_lock, flags);
++
++	/* Reset ISP chip. */
++	WRT_REG_WORD(&reg->ctrl_status, CSR_ISP_SOFT_RESET);
++	data = qla2x00_debounce_register(&reg->ctrl_status);
++	for (cnt = 6000000 ; cnt && (data & CSR_ISP_SOFT_RESET); cnt--) {
++		udelay(5);
++		data = RD_REG_WORD(&reg->ctrl_status);
++		barrier();
++	}
++
++	if (!cnt)
++		goto chip_diag_failed;
++
++	DEBUG3(printk("scsi(%ld): Reset register cleared by chip reset\n",
++	    ha->host_no));
++
++	/* Reset RISC processor. */
++	WRT_REG_WORD(&reg->hccr, HCCR_RESET_RISC);
++	WRT_REG_WORD(&reg->hccr, HCCR_RELEASE_RISC);
++
++#if defined(ISP2300)
++	/* Workaround for QLA2312 PCI parity error */
++	if (ha->pdev->device == QLA2312_DEVICE_ID ||
++	    ha->pdev->device == QLA2322_DEVICE_ID) {
++		udelay(10);
++	} else {
++		data = qla2x00_debounce_register(&reg->mailbox0);
++		for (cnt = 6000000; cnt && (data == MBS_BUSY); cnt--) {
++			udelay(5);
++			data = RD_REG_WORD(&reg->mailbox0);
++			barrier(); 
++		}
++	}
++#else
++	data = qla2x00_debounce_register(&reg->mailbox0);
++	for (cnt = 6000000; cnt && (data == MBS_BUSY); cnt--) {
++		udelay(5);
++		data = RD_REG_WORD(&reg->mailbox0);
++		barrier(); 
++	}
++#endif
++	if (!cnt)
++		goto chip_diag_failed;
++
++	/* Check product ID of chip */
++	DEBUG3(printk("scsi(%ld): Checking product ID of chip\n",
++	    ha->host_no));
++
++	mb[1] = RD_REG_WORD(&reg->mailbox1);
++	mb[2] = RD_REG_WORD(&reg->mailbox2);
++	mb[3] = RD_REG_WORD(&reg->mailbox3);
++	mb[4] = qla2x00_debounce_register(&reg->mailbox4);
++
++	if (mb[1] != PROD_ID_1 ||
++	    (mb[2] != PROD_ID_2 && mb[2] != PROD_ID_2a) ||
++	    mb[3] != PROD_ID_3 ||
++	    (mb[4] != PROD_ID_4 && mb[4] != PROD_ID_4a)) {
++
++		printk(KERN_WARNING
++		    "scsi(%ld): Wrong product ID = 0x%x,0x%x,0x%x,0x%x\n",
++		    ha->host_no, mb[1], mb[2], mb[3], mb[4]);
++
++		goto chip_diag_failed;
++	}
++
++	/* Adjust fw RISC transfer size */
++	ha->fw_transfer_size = REQUEST_ENTRY_SIZE * REQUEST_ENTRY_CNT;
++#if defined(ISP2200)
++	if (ha->pdev->device == QLA2200_DEVICE_ID &&
++	    RD_REG_WORD(&reg->mailbox7) == QLA2200A_RISC_ROM_VER) {
++
++		/* Limit firmware transfer size with a 2200A */
++		DEBUG3(printk("scsi(%ld): Found QLA2200A chip.\n",
++		    ha->host_no));
++
++		ha->fw_transfer_size = 128;
++	}
++#endif
++
++	/* Wrap Incoming Mailboxes Test. */
++	spin_unlock_irqrestore(&ha->hardware_lock, flags);
++
++	DEBUG3(printk("scsi(%ld): Checking mailboxes.\n", ha->host_no));
++	status = qla2x00_mbx_reg_test(ha);
++	if (status) {
++		DEBUG(printk("scsi(%ld): Failed mailbox send register test\n",
++		    ha->host_no));
++		printk(KERN_WARNING
++		    "scsi(%ld): Failed mailbox send register test\n",
++		    ha->host_no);
++	}
++	else {
++		/* Flag a successful status */
++		status = 0;
++	}
++	spin_lock_irqsave(&ha->hardware_lock, flags);
++
++chip_diag_failed:
++	if (status)
++		DEBUG2_3(printk("scsi(%ld): Chip diagnostics **** FAILED "
++		    "****\n", ha->host_no));
++
++	spin_unlock_irqrestore(&ha->hardware_lock, flags);
++
++	LEAVE(__func__);
++
++	return (status);
++}
++
++/**
++ * qla2x00_setup_chip() - Load and start RISC firmware.
++ * @ha: HA context
++ *
++ * Returns 0 on success.
++ */
++static uint8_t
++qla2x00_setup_chip(scsi_qla_host_t *ha)
++{
++	uint8_t		status = 0;
++	uint16_t	cnt;
++	uint16_t	*risc_code;
++	unsigned long	risc_address;
++	unsigned long	risc_code_size;
++	int		num;
++	int		i;
++	uint16_t	*req_ring;
++	struct qla_fw_info	*fw_iter;
++
++	ENTER(__func__);
++
++	/* Load firmware sequences */
++	fw_iter = ha->brd_info->fwinfo;
++	while (fw_iter->addressing != FW_INFO_ADDR_NOMORE) {
++		risc_code = fw_iter->fwcode;
++		risc_code_size = *fw_iter->fwlen;
++
++		if (fw_iter->addressing == FW_INFO_ADDR_NORMAL) {
++			risc_address = *fw_iter->fwstart;
++		} else {
++			/* Extended address */
++			risc_address = *fw_iter->lfwstart;
++		}
++
++		num = 0;
++		status = 0;
++		while (risc_code_size > 0 && !status) {
++			cnt = (uint16_t)(ha->fw_transfer_size >> 1);
++			if (cnt > risc_code_size)
++				cnt = risc_code_size;
++
++			DEBUG7(printk("scsi(%ld): Loading risc segment@ "
++			    "addr %p, number of bytes 0x%x, offset 0x%lx.\n",
++			    ha->host_no, risc_code, cnt, risc_address));
++
++			req_ring = (uint16_t *)ha->request_ring;
++			for (i = 0; i < cnt; i++)
++				req_ring[i] = cpu_to_le16(risc_code[i]);
++
++			/*
++			 * Flush written firmware to the ha->request_ring buffer
++			 * before DMA.
++			 */
++			flush_cache_all();
++
++			if (fw_iter->addressing == FW_INFO_ADDR_NORMAL) {
++				status = qla2x00_load_ram(ha,
++				    ha->request_dma, risc_address, cnt);
++			} else {
++				status = qla2x00_load_ram_ext(ha,
++				    ha->request_dma, risc_address, cnt);
++			}
++			if (status) {
++				DEBUG(printk("scsi(%ld): [ERROR] Failed to "
++				    "load segment %d of firmware\n",
++				    ha->host_no, num));
++				printk(KERN_WARNING
++				    "scsi(%ld): [ERROR] Failed to load "
++				    "segment %d of firmware\n",
++				    ha->host_no, num);
++
++				qla2x00_dump_regs(ha->host);
++				break;
++			}
++
++			risc_code += cnt;
++			risc_address += cnt;
++			risc_code_size -= cnt;
++			num++;
++		}
++
++		/* Next firmware sequence */
++		fw_iter++;
++	}
++
++	/* Verify checksum of loaded RISC code. */
++	if (!status) {
++		DEBUG(printk("scsi(%ld): Verifying Checksum of loaded RISC "
++		    "code.\n", ha->host_no));
++
++		status = qla2x00_verify_checksum(ha);
++		if (status == QL_STATUS_SUCCESS) {
++			/* Start firmware execution. */
++			DEBUG(printk("scsi(%ld): Checksum OK, start "
++			    "firmware.\n", ha->host_no));
++
++			status = qla2x00_execute_fw(ha);
++		}
++		else {
++			DEBUG2(printk(KERN_INFO
++			    "scsi(%ld): ISP Firmware failed checksum.\n",
++			    ha->host_no));
++		}
++	}
++
++	if (status) {
++		DEBUG2_3(printk("scsi(%ld): Setup chip **** FAILED ****.\n",
++		    ha->host_no));
++	}
++
++	return (status);
++}
++
++/**
++ * qla2x00_init_rings() - Initializes firmware.
++ * @ha: HA context
++ *
++ * Beginning of request ring has initialization control block already built
++ * by nvram config routine.
++ *
++ * Returns 0 on success.
++ */
++static uint8_t
++qla2x00_init_rings(scsi_qla_host_t *ha)
++{
++	unsigned long flags = 0;
++	uint8_t  status;
++	int cnt;
++	device_reg_t *reg = ha->iobase;
++
++
++	spin_lock_irqsave(&ha->hardware_lock, flags);
++
++	/* Clear outstanding commands array. */
++	for (cnt = 0; cnt < MAX_OUTSTANDING_COMMANDS; cnt++)
++		ha->outstanding_cmds[cnt] = 0;
++
++	ha->current_outstanding_cmd = 0;
++
++	/* Clear RSCN queue. */
++	ha->rscn_in_ptr = 0;
++	ha->rscn_out_ptr = 0;
++
++	/* Initialize firmware. */
++	ha->request_ring_ptr  = ha->request_ring;
++	ha->req_ring_index    = 0;
++	ha->req_q_cnt         = REQUEST_ENTRY_CNT;
++	ha->response_ring_ptr = ha->response_ring;
++	ha->rsp_ring_index    = 0;
++
++	WRT_REG_WORD(ISP_REQ_Q_IN(reg), 0);
++	WRT_REG_WORD(ISP_REQ_Q_OUT(reg), 0);
++	WRT_REG_WORD(ISP_RSP_Q_IN(reg), 0);
++	WRT_REG_WORD(ISP_RSP_Q_OUT(reg), 0);
++
++	spin_unlock_irqrestore(&ha->hardware_lock, flags);
++
++	DEBUG(printk("scsi(%ld): Issue init firmware.\n", ha->host_no));
++	status = qla2x00_init_firmware(ha, sizeof(init_cb_t));
++	if (status) {
++		DEBUG2_3(printk("scsi(%ld): Init firmware **** FAILED ****.\n",
++		    ha->host_no));
++	} else {
++		/* Setup seriallink options */
++		uint16_t swing, emphasis;
++		uint16_t opt10, opt11;
++
++		DEBUG3(printk("scsi(%ld): Serial link options:\n",
++		    ha->host_no));
++		DEBUG3(qla2x00_dump_buffer(
++		    (uint8_t *)&ha->fw_seriallink_options,
++		    sizeof(ha->fw_seriallink_options)));
++
++		qla2x00_get_fw_options(ha,
++		    &ha->fw_options1, &ha->fw_options2, &ha->fw_options3);
++
++		ha->fw_options1 &= ~BIT_8;
++		if (ha->fw_seriallink_options[1] & BIT_2)
++			ha->fw_options1 |= BIT_8;
++
++		/* 1G settings */
++		swing = ha->fw_seriallink_options[0] & (BIT_2 | BIT_1 | BIT_0);
++		emphasis = ha->fw_seriallink_options[0] & (BIT_4 | BIT_3);
++		emphasis >>= 3;
++		opt10 = (emphasis << 14) | (swing << 8) | 0x3;
++
++		/* 2G settings */
++		swing = ha->fw_seriallink_options[0] & (BIT_7 | BIT_6 | BIT_5);
++		swing >>= 5;
++		emphasis = ha->fw_seriallink_options[1] & (BIT_1 | BIT_0);
++		opt11 = (emphasis << 14) | (swing << 8) | 0x3;
++
++		qla2x00_set_fw_options(ha, ha->fw_options1,
++		    ha->fw_options2, ha->fw_options3, opt10, opt11);
++
++		DEBUG3(printk("scsi(%ld): Init firmware -- success.\n",
++		    ha->host_no));
++	}
++
++	return (status);
++}
++
++/**
++ * qla2x00_fw_ready() - Waits for firmware ready.
++ * @ha: HA context
++ *
++ * Returns 0 on success.
++ */
++static uint8_t
++qla2x00_fw_ready(scsi_qla_host_t *ha)
++{
++	uint8_t		status = 0;
++	unsigned long	wtime, mtime;
++	uint16_t	min_wait;	/* Minimum wait time if loop is down */
++	uint16_t	wait_time;	/* Wait time if loop is coming ready */
++	uint16_t	pause_time;
++	uint16_t	fw_state;
++
++	/* 20 seconds for loop down. */
++	min_wait = 20;		
++	ha->device_flags &= ~DFLG_NO_CABLE;
++
++	/*
++	 * Firmware should take at most one RATOV to login, plus 5 seconds for
++	 * our own processing.
++	 */
++	if ((wait_time = (ha->retry_count*ha->login_timeout) + 5) < min_wait) {
++		wait_time = min_wait;
++	}
++
++	pause_time = 1000;	/* 1000 usec */
++
++	/* Min wait time if loop down */
++	mtime = jiffies + (min_wait * HZ);
++
++	/* wait time before firmware ready */
++	wtime = jiffies + (wait_time * HZ);
++
++	/* Wait for ISP to finish LIP */
++	if (!qla2x00_quiet)
++		printk(KERN_INFO
++		    "scsi(%ld): Waiting for LIP to complete...\n", ha->host_no);
++
++	DEBUG3(printk("scsi(%ld): Waiting for LIP to complete...\n",
++	    ha->host_no));
++
++	do {
++		status = qla2x00_get_firmware_state(ha, &fw_state);
++
++		if (status == QL_STATUS_SUCCESS) {
++			if (fw_state == FSTATE_READY) {
++				DEBUG(printk("scsi(%ld): F/W Ready - OK \n",
++				    ha->host_no));
++
++				qla2x00_get_retry_cnt(ha,
++				    &ha->retry_count, &ha->login_timeout);
++
++				status = QL_STATUS_SUCCESS;
++				break;
++			}
++
++			status = QL_STATUS_ERROR;
++
++			if (atomic_read(&ha->loop_down_timer) ||
++			    fw_state == FSTATE_LOSS_OF_SYNC) {
++
++				/* Loop down. Timeout on min_wait */
++				if (time_after_eq(jiffies, mtime)) {
++					printk(KERN_INFO
++					    "scsi(%ld): Cable is "
++					    "unplugged...\n",
++					    ha->host_no);
++
++					ha->device_flags |= DFLG_NO_CABLE;
++					break;
++				}
++			}
++		} else {
++			/* Mailbox cmd failed. Timeout on min_wait. */
++			if (time_after_eq(jiffies, mtime))
++				break;
++		}
++
++		if (time_after_eq(jiffies, wtime))
++			break;
++
++		/* Delay for a while */
++		set_current_state(TASK_INTERRUPTIBLE);
++		schedule_timeout(HZ / 2);
++
++		DEBUG3(printk("scsi(%ld): fw_state=%x curr time=%lx.\n",
++		    ha->host_no, fw_state, jiffies));
++	} while (1);
++
++	DEBUG(printk("scsi(%ld): fw_state=%x curr time=%lx.\n",
++	    ha->host_no, fw_state, jiffies));
++
++	if (status) {
++		DEBUG2_3(printk("scsi(%ld): Firmware ready **** FAILED ****.\n",
++		    ha->host_no));
++	}
++
++	return (status);
++}
++
++/*
++*  qla2x00_configure_hba
++*      Setup adapter context.
++*
++* Input:
++*      ha = adapter state pointer.
++*
++* Returns:
++*      0 = success
++*
++* Context:
++*      Kernel context.
++*/
++static uint8_t
++qla2x00_configure_hba(scsi_qla_host_t *ha)
++{
++	uint8_t       rval;
++	uint16_t      loop_id;
++	uint16_t      topo;
++	uint8_t       al_pa;
++	uint8_t       area;
++	uint8_t       domain;
++	char		connect_type[22];
++
++	ENTER(__func__);
++
++	/* Get host addresses. */
++	rval = qla2x00_get_adapter_id(ha,
++	    &loop_id, &al_pa, &area, &domain, &topo);
++	if (rval != QL_STATUS_SUCCESS) {
++		printk(KERN_WARNING
++		    "scsi(%ld): ERROR -- Unable to get host loop ID.\n",
++		    ha->host_no);
++		return (rval);
++	}
++
++	if (topo == 4) {
++		printk(KERN_INFO
++			"scsi(%ld): Cannot get topology - retrying.\n",
++			ha->host_no);
++		return (QL_STATUS_ERROR);
++	}
++
++	ha->loop_id = loop_id;
++
++#if defined(ISP2100)
++	/* Make sure 2100 only has loop, in case of any firmware bug. */
++	topo = 0;
++#endif
++
++	/* initialize */
++	ha->min_external_loopid = SNS_FIRST_LOOP_ID;
++	ha->operating_mode = LOOP;
++
++	switch (topo) {
++	case 0:
++		DEBUG3(printk("scsi(%ld): HBA in NL topology.\n",
++		    ha->host_no));
++		ha->current_topology = ISP_CFG_NL;
++		strcpy(connect_type, "(Loop)");
++		break;
++
++	case 1:
++		DEBUG3(printk("scsi(%ld): HBA in FL topology.\n",
++		    ha->host_no));
++		ha->current_topology = ISP_CFG_FL;
++		strcpy(connect_type, "(FL_Port)");
++		break;
++
++	case 2:
++		DEBUG3(printk("scsi(%ld): HBA in N P2P topology.\n",
++		    ha->host_no));
++		ha->operating_mode = P2P;
++		ha->current_topology = ISP_CFG_N;
++		strcpy(connect_type, "(N_Port-to-N_Port)");
++		break;
++
++	case 3:
++		DEBUG3(printk("scsi(%ld): HBA in F P2P topology.\n",
++		    ha->host_no));
++		ha->operating_mode = P2P;
++		ha->current_topology = ISP_CFG_F;
++		strcpy(connect_type, "(F_Port)");
++		break;
++
++	default:
++		DEBUG3(printk("scsi(%ld): HBA in unknown topology %x. "
++		    "Using NL.\n",
++		    ha->host_no, topo));
++		ha->current_topology = ISP_CFG_NL;
++		strcpy(connect_type, "(Loop)");
++		break;
++	}
++
++	/* Save Host port and loop ID. */
++	/* byte order - Big Endian */
++	ha->d_id.b.domain = domain;
++	ha->d_id.b.area = area;
++	ha->d_id.b.al_pa = al_pa;
++
++	if (!qla2x00_quiet)
++		printk(KERN_INFO
++		    "scsi(%ld): Topology - %s, Host Loop address 0x%x\n",
++		    ha->host_no, connect_type, ha->loop_id);
++
++	if (rval) {
++		DEBUG2_3(printk("scsi(%ld): FAILED.\n", ha->host_no));
++	} else {
++		DEBUG3(printk("scsi(%ld): exiting normally.\n", ha->host_no));
++	}
++
++	return(rval);
++}
++
++/*
++* NVRAM configuration for ISP 2xxx
++*
++* Input:
++*      ha                = adapter block pointer.
++*
++* Output:
++*      initialization control block in response_ring
++*      host adapters parameters in host adapter block
++*
++* Returns:
++*      0 = success.
++*/
++static uint8_t
++qla2x00_nvram_config(scsi_qla_host_t *ha)
++{
++	uint8_t   status = 0;
++	uint8_t   chksum = 0;
++	uint16_t  cnt, base;
++	uint8_t   *dptr1, *dptr2;
++	init_cb_t *icb   = ha->init_cb;
++	nvram_t *nv    = (nvram_t *)ha->request_ring;
++	uint16_t  *wptr  = (uint16_t *)ha->request_ring;
++#if defined(ISP2300)
++	device_reg_t *reg = ha->iobase;
++	uint16_t  data;
++#endif
++
++	if (ha->flags.nvram_config_done)
++		return (status);
++
++	ENTER(__func__);
++ 
++	/* Determine NVRAM starting address. */
++	base = 0;
++#if defined(ISP2300)
++	if (ha->pdev->device == QLA2312_DEVICE_ID ||
++	    ha->pdev->device == QLA2322_DEVICE_ID) {
++		data = RD_REG_WORD(&reg->ctrl_status);
++		if ((data >> 14) == 1)
++			base = 0x80;
++
++		data = RD_REG_WORD(&reg->nvram);
++		while (data & NVR_BUSY) {
++			udelay(100);
++			data = RD_REG_WORD(&reg->nvram);
++		}
++
++		/* Lock resource */
++		WRT_REG_WORD(&reg->host_semaphore, 0x1);
++		udelay(5);
++		data = RD_REG_WORD(&reg->host_semaphore);
++		while ((data & BIT_0) == 0) {
++			/* Lock failed */
++			udelay(100);
++			WRT_REG_WORD(&reg->host_semaphore, 0x1);
++			udelay(5);
++			data = RD_REG_WORD(&reg->host_semaphore);
++		}
++	}
++#endif
++
++	/* Get NVRAM data and calculate checksum. */
++	for (cnt = 0; cnt < sizeof(nvram_t)/2; cnt++) {
++		*wptr = cpu_to_le16(qla2x00_get_nvram_word(ha, (cnt+base)));
++		chksum += (uint8_t)*wptr;
++		chksum += (uint8_t)(*wptr >> 8);
++		wptr++;
++	}
++
++#if defined(ISP2300)
++	if (ha->pdev->device == QLA2312_DEVICE_ID ||
++	    ha->pdev->device == QLA2322_DEVICE_ID) {
++		/* Unlock resource */
++		WRT_REG_WORD(&reg->host_semaphore, 0);
++	}
++#endif
++
++	DEBUG5(printk("scsi(%ld): Contents of NVRAM\n", ha->host_no));
++	DEBUG5(qla2x00_dump_buffer(
++	    (uint8_t *)ha->request_ring, sizeof(nvram_t)));
++
++	/* Bad NVRAM data, set defaults parameters. */
++	if (chksum || nv->id[0] != 'I' || nv->id[1] != 'S' ||
++	    nv->id[2] != 'P' || nv->id[3] != ' ' || nv->nvram_version < 1) {
++
++		/* Reset NVRAM data. */
++		DEBUG(printk("scsi(%ld): Using defaults for NVRAM - "
++		    "checksum=0x%x, Id=%c, version=0x%x\n",
++		    ha->host_no,
++		    chksum, nv->id[0], nv->nvram_version));
++
++		memset(nv, 0, sizeof(nvram_t));
++
++		/*
++		 * Set default initialization control block.
++		 */
++		nv->parameter_block_version = ICB_VERSION;
++
++#if defined(ISP2300)
++		nv->firmware_options[0] = BIT_2 | BIT_1;
++		nv->firmware_options[1] = BIT_7 | BIT_5;
++		nv->add_firmware_options[0] = BIT_5;
++		nv->add_firmware_options[1] = BIT_5 | BIT_4;
++		nv->frame_payload_size  = __constant_cpu_to_le16(2048);
++#elif defined(ISP2200)
++		nv->firmware_options[0] = BIT_3 | BIT_2 | BIT_1;
++		nv->firmware_options[1] = BIT_7 | BIT_5;
++		nv->add_firmware_options[0] = BIT_5 | BIT_4;
++		nv->add_firmware_options[1] = BIT_5 | BIT_4;
++		nv->frame_payload_size  = __constant_cpu_to_le16(1024);
++#else /* defined(ISP2100) */
++		nv->firmware_options[0] = BIT_3 | BIT_1;
++		nv->firmware_options[1] = BIT_5;
++		nv->frame_payload_size  = __constant_cpu_to_le16(1024);
++#endif
++
++		nv->max_iocb_allocation = __constant_cpu_to_le16(256);
++		nv->execution_throttle  = __constant_cpu_to_le16(16);
++		nv->retry_count = 8;
++		nv->retry_delay = 1;
++
++		nv->port_name[0] = 33;
++		nv->port_name[3] = 224;
++		nv->port_name[4] = 139;
++
++		nv->login_timeout = 4;
++
++		/*
++		 * Set default host adapter parameters
++		 */
++		nv->host_p[1] = BIT_2;
++		nv->reset_delay = 5;
++		nv->port_down_retry_count = 8;
++		nv->max_luns_per_target = __constant_cpu_to_le16(8);
++
++		status = 1;
++	}
++
++	/* Reset Initialization control block */
++	memset(icb, 0, sizeof(init_cb_t));
++
++	/*
++	 * Setup driver NVRAM options.
++	 */
++	nv->firmware_options[0] |= (BIT_6 | BIT_1);
++	nv->firmware_options[0] &= ~(BIT_5 | BIT_4);
++	nv->firmware_options[1] |= (BIT_5 | BIT_0);
++	nv->firmware_options[1] &= ~BIT_4;
++#if defined(ISP2300)
++	nv->firmware_options[0] |= BIT_2;
++	nv->firmware_options[0] &= ~BIT_3;
++#elif defined(ISP2200)
++	nv->firmware_options[0] |= BIT_2;
++#endif
++
++#if !defined(FC_IP_SUPPORT)
++	/* Enable FC-Tape support */
++	nv->firmware_options[1] |= BIT_7;
++	nv->add_firmware_options[1] |= (BIT_5 | BIT_4);
++#endif
++
++	/*
++	 * Copy over NVRAM RISC parameter block to initialization control block.
++	 */
++	dptr1 = (uint8_t *)icb;
++	dptr2 = (uint8_t *)&nv->parameter_block_version;
++	cnt = (uint8_t *)&icb->request_q_outpointer - (uint8_t *)&icb->version;
++	while (cnt--)
++		*dptr1++ = *dptr2++;
++
++	/* Copy 2nd half. */
++	dptr1 = (uint8_t *)icb->add_firmware_options;
++	cnt = (uint8_t *)icb->reserved_3 - (uint8_t *)icb->add_firmware_options;
++	while (cnt--)
++		*dptr1++ = *dptr2++;
++
++	/* Prepare nodename */
++	if ((icb->firmware_options[1] & BIT_6) == 0) {
++		/*
++		 * Firmware will apply the following mask if the nodename was
++		 * not provided.
++		 */
++		memcpy(icb->node_name, icb->port_name, WWN_SIZE);
++		icb->node_name[0] &= 0xF0;
++	}
++
++	/*
++	 * Set host adapter parameters.
++	 */
++	ha->nvram_version = nv->nvram_version;
++
++	ha->flags.disable_luns = ((nv->host_p[0] & BIT_2) ? 1 : 0);
++	ha->flags.disable_risc_code_load = ((nv->host_p[0] & BIT_4) ? 1 : 0);
++	ha->flags.set_cache_line_size_1 = ((nv->host_p[0] & BIT_5) ? 1 : 0);
++	ha->flags.enable_64bit_addressing = ((nv->host_p[1] & BIT_0) ? 1 : 0);
++	ha->flags.enable_lip_reset = ((nv->host_p[1] & BIT_1) ? 1 : 0);
++	ha->flags.enable_lip_full_login = ((nv->host_p[1] & BIT_2) ? 1 : 0);
++	ha->flags.enable_target_reset = ((nv->host_p[1] & BIT_3) ? 1 : 0);
++	ha->flags.enable_flash_db_update = ((nv->host_p[1] & BIT_4) ? 1 : 0);
++
++	ha->flags.link_down_error_enable  = 1;
++
++	ha->flags.enable_target_mode =
++	    ((icb->firmware_options[0] & BIT_4) ? 1 : 0);
++	ha->operating_mode =
++	    (icb->add_firmware_options[0] & (BIT_6 | BIT_5 | BIT_4)) >> 4;
++
++	qla2x00_config_dma_addressing(ha);
++
++	ha->fw_seriallink_options[0] = nv->seriallink_options[0];
++	ha->fw_seriallink_options[1] = nv->seriallink_options[1];
++
++	/* save HBA serial number */
++	ha->serial0 = icb->port_name[5];
++	ha->serial1 = icb->port_name[6];
++	ha->serial2 = icb->port_name[7];
++	memcpy(ha->node_name, icb->node_name, WWN_SIZE);
++#if defined(FC_IP_SUPPORT)
++	memcpy(ha->ip_port_name, icb->port_name, WWN_SIZE);
++#endif
++
++	ha->hiwat = le16_to_cpu(icb->max_iocb_allocation);
++	ha->execution_throttle = 0xFFFF;
++	icb->execution_throttle = __constant_cpu_to_le16(0xFFFF);
++
++	ha->retry_count = nv->retry_count;
++
++	/* Set minimum login_timeout to 4 seconds. */
++	if (nv->login_timeout < ql2xlogintimeout)
++		nv->login_timeout = ql2xlogintimeout;
++	if (nv->login_timeout < 4)
++		nv->login_timeout = 4;
++	ha->login_timeout = nv->login_timeout;
++	icb->login_timeout = nv->login_timeout;
++
++/* FIXME
++ *
++ * port_down_retry_count updated twice
++ *
++ */
++	ha->port_down_retry_count = nv->port_down_retry_count;
++	ha->minimum_timeout =
++	    (ha->login_timeout * ha->retry_count) + ha->port_down_retry_count;
++	ha->loop_reset_delay = nv->reset_delay;
++
++	/* Will get the value from NVRAM. */
++	ha->loop_down_timeout = LOOP_DOWN_TIMEOUT;
++	ha->loop_down_abort_time = LOOP_DOWN_TIME - ha->loop_down_timeout;
++
++	/* save OEM related items for QLA2200s and QLA2300s */
++	ha->oem_id = nv->oem_id;
++	memcpy(ha->oem_specific, nv->oem_specific, sizeof(ha->oem_specific));
++
++	ha->max_probe_luns = le16_to_cpu(nv->max_luns_per_target);
++	if (ha->max_probe_luns == 0)
++		ha->max_probe_luns = MIN_LUNS;
++
++#if defined(IOCB_THROLLE_USAGE)
++	/* High-water mark of IOCBs */
++	ha->iocb_hiwat = MAX_IOCBS_AVAILBALE;
++#endif
++
++#if USE_BIOS_MAX_LUNS
++	ha->max_luns = le16_to_cpu(nv->max_luns_per_target);
++	if (ha->max_luns == 0)
++		ha->max_luns = MAX_LUNS;
++	else if (ha->max_luns > MAX_LUNS)
++		ha->max_luns = MAX_LUNS;
++#else
++	ha->max_luns = MAX_LUNS;
++#endif
++
++/* FIXME
++ *
++ * port_down_retry_count updated twice
++ *
++ */
++	/*
++	 * Need enough time to try and get the port back.
++	 */
++	if (qlport_down_retry)
++		ha->port_down_retry_count = qlport_down_retry;
++	/* Set login_retry_count */
++	ha->login_retry_count  = nv->retry_count;
++	if (ha->port_down_retry_count == nv->port_down_retry_count &&
++	    ha->port_down_retry_count > 3)
++		ha->login_retry_count = ha->port_down_retry_count;
++	else if (ha->port_down_retry_count > ha->login_retry_count)
++		ha->login_retry_count = ha->port_down_retry_count;
++
++	ha->binding_type = Bind;
++	if ((ha->binding_type != BIND_BY_PORT_NAME) &&
++	    (ha->binding_type != BIND_BY_PORT_ID) &&
++	    (ha->binding_type != BIND_BY_NODE_NAME)) {
++
++		printk(KERN_WARNING
++		    "scsi(%ld): Invalid binding type specified (%d), "
++		    "defaulting to BIND_BY_PORT_NAME!!!\n",
++		    ha->host_no, ha->binding_type);
++
++		ha->binding_type = BIND_BY_PORT_NAME;
++	}
++
++	/*
++	 * Setup ring parameters in initialization control block
++	 */
++	icb->request_q_outpointer = __constant_cpu_to_le16(0);
++	icb->response_q_inpointer = __constant_cpu_to_le16(0);
++	icb->request_q_length = __constant_cpu_to_le16(REQUEST_ENTRY_CNT);
++	icb->response_q_length = __constant_cpu_to_le16(RESPONSE_ENTRY_CNT);
++	icb->request_q_address[0] = cpu_to_le32(LSD(ha->request_dma));
++	icb->request_q_address[1] = cpu_to_le32(MSD(ha->request_dma));
++	icb->response_q_address[0] = cpu_to_le32(LSD(ha->response_dma));
++	icb->response_q_address[1] = cpu_to_le32(MSD(ha->response_dma));
++
++	icb->lun_enables = __constant_cpu_to_le16(0);
++	icb->command_resource_count = 0;
++	icb->immediate_notify_resource_count = 0;
++	icb->timeout = __constant_cpu_to_le16(0);
++
++	ha->flags.nvram_config_done = 1;
++
++	if (status) {
++		DEBUG2_3(printk(KERN_WARNING
++		    "scsi(%ld): NVRAM configuration failed!\n", ha->host_no));
++	}
++
++	LEAVE(__func__);
++
++	return (status);
++}
++
++/*
++* qla2x00_init_fc_db
++*      Initializes Fibre Channel Device Database.
++*
++* Input:
++*      ha = adapter block pointer.
++*
++* Output:
++*      ha->fc_db = initialized
++*/
++static void
++qla2x00_init_fc_db(scsi_qla_host_t *ha)
++{
++	uint16_t cnt;
++
++	ENTER(__func__);
++
++	/* Initialize fc database if it is not initialized. */
++	if (!ha->fc_db[0].loop_id && !ha->fc_db[1].loop_id) {
++		ha->flags.updated_fc_db = FALSE;
++
++		/* Initialize target database. */
++		for (cnt = 0; cnt < MAX_FIBRE_DEVICES; cnt++) {
++			ha->fc_db[cnt].name[0] = 0L;
++			ha->fc_db[cnt].name[1] = 0L;
++			ha->fc_db[cnt].loop_id = PORT_UNUSED;
++			ha->fc_db[cnt].port_login_retry_count =
++			    ha->port_down_retry_count * PORT_RETRY_TIME;
++			ha->fc_db[cnt].flag = 0;   /* v2.19.5b3 */
++		}
++	}
++
++	LEAVE(__func__);
++}
++
++
++/*
++* qla2x00_init_tgt_map
++*      Initializes target map.
++*
++* Input:
++*      ha = adapter block pointer.
++*
++* Output:
++*      TGT_Q initialized
++*/
++static void
++qla2x00_init_tgt_map(scsi_qla_host_t *ha)
++{
++	uint32_t t;
++
++	ENTER(__func__);
++
++	for (t = 0; t < MAX_TARGETS; t++)
++		TGT_Q(ha, t) = (os_tgt_t *)NULL;
++
++	LEAVE(__func__);
++}
++
++/*
++ * qla2x00_configure_loop
++ *      Updates Fibre Channel Device Database with what is actually on loop.
++ *
++ * Input:
++ *      ha                = adapter block pointer.
++ *
++ * Output:
++ *      ha->fc_db = updated
++ *
++ * Returns:
++ *      0 = success.
++ *      1 = error.
++ *      2 = database was full and device was not configured.
++ */
++static uint8_t
++qla2x00_configure_loop(scsi_qla_host_t *ha) 
++{
++	uint8_t  rval = 0;
++	uint8_t  rval1 = 0;
++	uint8_t  enable_slot_reuse = FALSE;
++	uint16_t  cnt;
++	static unsigned long  flags, save_flags;
++#if defined(FC_IP_SUPPORT)
++	struct ip_device	*ipdev;
++#endif
++
++	ENTER(__func__);
++
++	DEBUG(printk("scsi(%ld): Begin configure loop.\n", ha->host_no));
++
++	/* Get Initiator ID */
++	if (qla2x00_configure_hba(ha)) {
++		DEBUG(printk("scsi(%ld): Unable to configure HBA.\n",
++		    ha->host_no));
++		return(1);
++	}
++
++#if defined(FC_IP_SUPPORT)
++	/* Disable all IP devices in linked list */
++	for (ipdev = ha->ipdev_db_top; ipdev; ipdev = ipdev->next)
++		ipdev->flags &= ~IP_DEV_FLAG_PRESENT;
++#endif /* FC_IP_SUPPORT */
++
++	save_flags = flags = ha->dpc_flags;
++	DEBUG(printk("scsi(%ld): Configure loop -- dpc flags =0x%lx\n",
++	    ha->host_no, flags));
++
++	/* dg 02/26/02 ha->dpc_flags &= ~(LOCAL_LOOP_UPDATE | RSCN_UPDATE); */
++
++	/*
++	 * If we have both an RSCN and PORT UPDATE pending then handle them
++	 * both at the same time.
++	 */
++	clear_bit(LOCAL_LOOP_UPDATE, &ha->dpc_flags);
++	clear_bit(RSCN_UPDATE, &ha->dpc_flags);
++	ha->mem_err = 0 ;
++
++	/* Determine what we need to do */
++	if (ha->current_topology == ISP_CFG_FL &&
++	    (test_bit(LOCAL_LOOP_UPDATE, &flags))) {
++
++		ha->flags.rscn_queue_overflow = TRUE;
++		set_bit(RSCN_UPDATE, &flags);
++
++	} else if (ha->current_topology == ISP_CFG_F &&
++	    (test_bit(LOCAL_LOOP_UPDATE, &flags))) {
++
++		ha->flags.rscn_queue_overflow = TRUE;
++		set_bit(RSCN_UPDATE, &flags);
++		clear_bit(LOCAL_LOOP_UPDATE, &flags);
++
++	} else if (!ha->flags.online ||
++	    (test_bit(ABORT_ISP_ACTIVE, &flags))) {
++
++		ha->flags.rscn_queue_overflow = TRUE;
++		set_bit(RSCN_UPDATE, &flags);
++		set_bit(LOCAL_LOOP_UPDATE, &flags);
++	}
++
++	do {
++		if (test_bit(LOCAL_LOOP_UPDATE, &flags)) {
++			rval = rval |
++			    qla2x00_configure_local_loop(ha, enable_slot_reuse);
++		}
++
++		if (test_bit(RSCN_UPDATE, &flags)) {
++			rval1 = qla2x00_configure_fabric(ha, enable_slot_reuse);
++			if ((rval1 & BIT_0) && ha->sns_retry_cnt < 8) {
++				ha->sns_retry_cnt++;
++				set_bit(LOGIN_RETRY_NEEDED, &ha->dpc_flags);
++			}
++		}
++
++		/* If devices not configured first time try reusing slots.*/
++		if (enable_slot_reuse == FALSE && (rval & BIT_1))
++			enable_slot_reuse = TRUE;
++		else
++			enable_slot_reuse = FALSE;
++
++		/* Isolate error status. */
++		if (rval & BIT_0) {
++			rval = 1;
++		} else {
++			rval = 0;
++		}
++
++	} while (enable_slot_reuse == TRUE && rval == 0);
++
++	if (!atomic_read(&ha->loop_down_timer) &&
++	    !(test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags))) {
++
++		/* Mark devices that are not present as DEV_ABSENCE */
++		for (cnt = 0; cnt < MAX_FIBRE_DEVICES; cnt++) {
++			if (ha->fc_db[cnt].loop_id & PORT_LOST_ID) {
++				ha->fc_db[cnt].flag |= DEV_ABSENCE;
++			} else {
++				/* device returned */
++				if (ha->fc_db[cnt].loop_id <
++				    LAST_SNS_LOOP_ID &&
++				    ha->fc_db[cnt].flag & DEV_ABSENCE) {
++					ha->fc_db[cnt].flag &= ~DEV_ABSENCE;
++					ha->fc_db[cnt].flag |= DEV_RETURN;
++					ha->fc_db[cnt].port_login_retry_count =
++					    ha->port_down_retry_count *
++					     PORT_RETRY_TIME;
++				}
++			}
++		}
++
++		rval1 = qla2x00_build_fcport_list(ha);
++		if (((rval1 & BIT_0) || ha->mem_err != 0) &&
++		    ha->sns_retry_cnt < 8) {
++
++			ha->sns_retry_cnt++;
++			set_bit(LOGIN_RETRY_NEEDED, &ha->dpc_flags);
++		}
++
++		if (!ha->flags.failover_enabled)
++			qla2x00_config_os(ha);
++
++		/* If we found all devices then go ready */
++		if (!(test_bit(LOGIN_RETRY_NEEDED, &ha->dpc_flags))) {
++			ha->loop_state = LOOP_READY;
++
++			if (ha->flags.failover_enabled) {
++				DEBUG(printk("scsi(%ld): schedule FAILBACK "
++				    "EVENT\n", ha->host_no));
++				if (!(test_and_set_bit(FAILOVER_EVENT_NEEDED,
++				    &ha->dpc_flags))) {
++					ha->failback_delay = failbackTime;
++				}
++				set_bit(COMMAND_WAIT_NEEDED, &ha->dpc_flags);
++				ha->failover_type = MP_NOTIFY_LOOP_UP;
++			}
++
++			DEBUG(printk("scsi(%ld): LOOP READY\n", ha->host_no));
++		} else {
++			if (test_bit(LOCAL_LOOP_UPDATE, &save_flags))
++				set_bit(LOCAL_LOOP_UPDATE, &ha->dpc_flags);
++			if (test_bit(RSCN_UPDATE, &save_flags))
++				set_bit(RSCN_UPDATE, &ha->dpc_flags);
++		}
++	} else {
++		DEBUG(printk("scsi(%ld): Loop down counter running= %d or "
++		    "Resync needed- dpc flags= %ld\n",
++		    ha->host_no,
++		    atomic_read(&ha->loop_down_timer), ha->dpc_flags));
++		/* ???? dg 02/26/02  rval = 1; */
++	}
++
++	if (rval) {
++		DEBUG2_3(printk("%s(%ld): *** FAILED ***\n",
++		    __func__, ha->host_no));
++	} else {
++		DEBUG3(printk("%s: exiting normally\n", __func__));
++	}
++
++	return(rval);
++}
++
++/*
++ * qla2x00_configure_local_loop
++ *	Updates Fibre Channel Device Database with local loop devices.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	enable_slot_reuse = allows the use of PORT_AVAILABLE slots.
++ *
++ * Returns:
++ *	0 = success.
++ *	BIT_0 = error.
++ *	BIT_1 = database was full and a device was not configured.
++ */
++static uint8_t
++qla2x00_configure_local_loop(scsi_qla_host_t *ha, uint8_t enable_slot_reuse) 
++{
++	uint8_t  status = 0;
++	uint8_t  rval;
++	uint8_t  port_name[8];
++	uint8_t  update_status = 0;
++	uint16_t index, size;
++	dma_addr_t phys_address = 0;
++	fcdev_t device;
++	port_list_entry_t *gn_list, *port_entry;
++	uint16_t localdevices = 0;
++#if defined(FC_IP_SUPPORT)
++	uint16_t list_entry_loop_id;
++#endif
++
++	ENTER(__func__);
++
++	/*
++	 * No point in continuing if the loop is in a volatile state -- 
++	 * reschedule LOCAL_LOOP_UPDATE for later processing
++	 */
++	if (test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags)) {
++		set_bit(LOCAL_LOOP_UPDATE, &ha->dpc_flags);
++		return (0);
++	}
++
++	gn_list = pci_alloc_consistent(ha->pdev,
++	    sizeof(GN_LIST_LENGTH), &phys_address);
++	if (gn_list == NULL) {
++		DEBUG2(printk("scsi(%ld): Failed to allocate memory, No local "
++		    "loop\n",
++		    ha->host_no));
++
++		printk(KERN_WARNING
++		    "scsi(%ld): Memory Allocation failed - port_list",
++		    ha->host_no);
++
++		ha->mem_err++;
++		return (BIT_0);
++	}
++	memset(gn_list, 0, sizeof(GN_LIST_LENGTH));
++
++	/* Mark all local devices PORT_LOST_ID first */
++	for (index = 0; index < MAX_FIBRE_DEVICES; index++) {
++		if (ha->fc_db[index].loop_id <= LAST_SNS_LOOP_ID &&
++		    !(ha->fc_db[index].flag & DEV_PUBLIC)) {
++
++			DEBUG(printk("scsi(%ld): Marking port lost @ slot "
++			    "%d %02x%02x%02x\n",
++			    ha->host_no,
++			    index,
++			    ha->fc_db[index].d_id.b.domain,
++			    ha->fc_db[index].d_id.b.area,
++			    ha->fc_db[index].d_id.b.al_pa));
++
++			ha->fc_db[index].loop_id |= PORT_LOST_ID;
++		}
++	}
++
++	DEBUG3(printk("scsi(%ld): Getting FCAL position map\n", ha->host_no));
++	DEBUG3(qla2x00_get_fcal_position_map(ha, NULL));
++
++	/* Get port name list
++	 *
++	 * Via qla2x00_get_port_list:
++	 *
++	 *	Bit 0 - return node names,
++	 *	Bit 1 - loop IDs 0-255
++	 */
++#if defined(FC_IP_SUPPORT)
++	if (ha->flags.enable_ip == FALSE)
++		rval = qla2x00_get_port_list(ha,
++		    gn_list, phys_address, BIT_0, &size);
++	else
++		rval = qla2x00_get_port_list(ha,
++		    gn_list, phys_address, BIT_0|BIT_1, &size);
++#else
++	rval = qla2x00_get_port_list(ha, gn_list, phys_address, BIT_0, &size);
++#endif
++	if (rval) {
++		status = BIT_0;
++		goto cleanup_allocation;
++	}
++
++	DEBUG3(printk("scsi(%ld): Port list size (%d)\n", ha->host_no, size));
++	DEBUG3(qla2x00_dump_buffer((uint8_t *)gn_list, size));
++
++	/* Any valid entries returned? */
++	if (size / sizeof(port_list_entry_t) == 0)
++		goto cleanup_allocation;
++
++	port_entry = gn_list;
++	for ( ; size >= sizeof(port_list_entry_t);
++	    size -= sizeof(port_list_entry_t), port_entry++) {
++
++		device.loop_id = le16_to_cpu(port_entry->loop_id);
++
++#if defined(FC_IP_SUPPORT)
++    		list_entry_loop_id = device.loop_id;
++		device.loop_id &= LOOP_ID_MASK; 
++#endif
++
++		/* Skip any non-local loop-ids - this includes 'known ports' */
++		if (device.loop_id > LAST_LOCAL_LOOP_ID) 
++			continue;
++#if NOT_NEEDED
++		/* Skip the known ports. */
++		if ((device.loop_id == SNS_FL_PORT) ||
++			(device.loop_id == FABRIC_CONTROLLER) ||
++			(device.loop_id == SIMPLE_NAME_SERVER))
++			continue;
++#endif
++
++		device.flag = 0;
++
++		/* Prep node name -- big-endian format */
++		*((u64 *)device.name) = __swab64p((u64 *)port_entry->name);
++
++		/* Retrieve port name */
++		rval = qla2x00_get_port_name(ha, device.loop_id, port_name, 0);
++		if (rval || qla2x00_is_wwn_zero(port_name)) {
++			DEBUG2(printk("scsi(%ld): Loop -- error retrieving "
++			    "port_name.\n",
++			    ha->host_no));
++
++			status = BIT_0;
++			break;
++		}
++		memcpy(device.wwn, port_name, WWN_SIZE);
++
++		/* Derive portid from alpa table */
++		device.d_id.b24 = 0;
++		device.d_id.b.al_pa = alpa_table[device.loop_id];
++
++		DEBUG2_3(printk("scsi(%ld): Loop scan found device - "
++		    "nodename %02x%02x%02x%02x%02x%02x%02x%02x "
++		    "portname %02x%02x%02x%02x%02x%02x%02x%02x "
++		    "portid %02x%02x%02x.\n", 
++		    ha->host_no,
++		    device.name[0], device.name[1],
++		    device.name[2], device.name[3],
++		    device.name[4], device.name[5],
++		    device.name[6], device.name[7],
++		    device.wwn[0], device.wwn[1], device.wwn[2], device.wwn[3],
++		    device.wwn[4], device.wwn[5], device.wwn[6], device.wwn[7],
++		    device.d_id.b.domain,
++		    device.d_id.b.area,
++		    device.d_id.b.al_pa));
++
++#if !defined(FC_IP_SUPPORT)
++		/* SCSI type device */
++		update_status = qla2x00_update_fc_database(ha,
++		    &device, enable_slot_reuse);
++		if (update_status)
++			status |= update_status;
++		else
++			localdevices++;
++#else
++		if (!(list_entry_loop_id & PLE_NOT_SCSI_DEVICE)) {
++			/* SCSI type device */
++			update_status = qla2x00_update_fc_database(ha,
++			    &device, enable_slot_reuse);
++
++			if (update_status)
++				status |= update_status;
++			else
++				localdevices++;
++		} else if (ha->flags.enable_ip == TRUE) {
++			/* SCSI login failed, assume it is IP device */
++			DEBUG12(printk("scsi(%ld): Loop scan found IP device "
++			    "WWNN:%02x%02x%02x%02x%02x%02x%02x%02x "
++			    "DID:%02x%02x%02x.\n",
++			    ha->host_no,
++			    device.name[0], device.name[1],
++			    device.name[2], device.name[3],
++			    device.name[4], device.name[5],
++			    device.name[6], device.name[7],
++			    device.d_id.b.domain,
++			    device.d_id.b.area,
++			    device.d_id.b.al_pa));
++
++			update_status =
++			    qla2x00_update_ip_device_data(ha, &device);
++			if (update_status == QL_STATUS_SUCCESS)
++				localdevices++;
++			else if (update_status == QL_STATUS_RESOURCE_ERROR)
++				status |= BIT_1;
++			else
++				status |= BIT_0;
++		}
++#endif
++	} /* for each port entry */
++
++cleanup_allocation:
++	pci_free_consistent(ha->pdev,
++	    sizeof(GN_LIST_LENGTH), gn_list, phys_address);
++
++	if (status & BIT_0) {
++		DEBUG2(printk("scsi(%ld): Configure local loop error exit: "
++		    "rval=%x\n", ha->host_no, rval));
++	}
++
++	if (localdevices > 0) {
++		ha->device_flags |= DFLG_LOCAL_DEVICES;
++		ha->device_flags &= ~DFLG_RETRY_LOCAL_DEVICES;
++	}
++
++	LEAVE(__func__);
++
++	return (status);
++}
++
++/*
++ * qla2x00_configure_fabric
++ *      Setup SNS devices with loop ID's.
++ *
++ * Input:
++ *      ha = adapter block pointer.
++ *
++ * Returns:
++ *      0 = success.
++ *      BIT_0 = error
++ *      BIT_1 = database was full and device was not configured.
++ */
++#define MAX_PUBLIC_LOOP_IDS LAST_SNS_LOOP_ID + 1
++
++static uint8_t
++qla2x00_configure_fabric(scsi_qla_host_t *ha, uint8_t enable_slot_reuse) 
++{
++	uint8_t     rval = 0;
++	uint8_t     rval1;
++	uint8_t     local_flags = 0;
++	uint8_t     tmp_name[8];
++	fcdev_t     dev;
++	uint16_t    i, index, found_cnt;
++	uint16_t    new_dev_cnt;
++	uint16_t    tmp_loop_id;
++	uint16_t    tmp_topo;
++	struct new_dev *new_dev_list;
++	struct list_head *fcil, *fcitemp;
++	fc_initiator_t	*fcinitiator;
++
++	ENTER(__func__);
++
++	DEBUG2(printk("scsi(%ld): Begin configure fabric -- hba=%p\n",
++	    ha->host_no, ha));
++
++	/* If FL port exists, then SNS is present */
++	rval1 = qla2x00_get_port_name(ha, SNS_FL_PORT, tmp_name, 0);
++	if (rval1 || qla2x00_is_wwn_zero(tmp_name)) {
++		DEBUG2(printk("scsi(%ld): MBC_GET_PORT_NAME Failed, No FL "
++		    "Port\n", ha->host_no));
++
++		ha->device_flags &= ~SWITCH_FOUND;
++		return (0);
++	}
++
++	new_dev_list = kmalloc(sizeof(struct new_dev) * MAX_FIBRE_DEVICES,
++	    GFP_ATOMIC);
++	if (new_dev_list == NULL) {
++		DEBUG2(printk("scsi(%ld): Configure Fabric allocation failed, "
++		    "device list\n", ha->host_no));
++		ha->mem_err++;
++		return (BIT_0);
++	}
++
++	/* Get adapter port ID. */
++	rval = qla2x00_get_adapter_id(ha, &tmp_loop_id,
++	    &ha->d_id.b.al_pa, &ha->d_id.b.area, &ha->d_id.b.domain, &tmp_topo);
++
++	/* Mark devices that need re-synchronization. */
++	qla2x00_device_resync(ha);
++	found_cnt = 0;
++	do {
++		if (test_and_clear_bit(REGISTER_FC4_NEEDED, &ha->dpc_flags)) {
++			if (qla2x00_rft_id(ha)) {
++				/* EMPTY */
++				DEBUG2(printk("scsi(%ld): Register FC-4 "
++				    "TYPE failed.\n", ha->host_no));
++			}
++			if (qla2x00_rff_id(ha)) {
++				/* EMPTY */
++				DEBUG2(printk("scsi(%ld): Register FC-4 "
++				    "Features failed.\n", ha->host_no));
++			}
++			if (qla2x00_rnn_id(ha)) {
++				/* EMPTY */
++				DEBUG2(printk("scsi(%ld): Register Node Name "
++				    "failed.\n", ha->host_no));
++			}
++			if (qla2x00_rsnn_nn(ha)) {
++				/* EMPTY */
++				DEBUG2(printk("scsi(%ld): Register Symbolic "
++				    "Node Name failed.\n", ha->host_no));
++			}
++		}
++
++		rval = qla2x00_find_all_fabric_devs(ha,
++		    new_dev_list, &new_dev_cnt, &local_flags);
++		if (rval != 0)
++			break;
++
++		/*
++		 * Logout all previous fabric devices marked lost, except
++		 * tape devices.
++		 */
++		for (index = 0; index < MAX_FIBRE_DEVICES &&
++		    !atomic_read(&ha->loop_down_timer) &&
++		    !(test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags)); index++) {
++
++			if (ha->fc_db[index].loop_id & PORT_LOST_ID &&
++			    (ha->fc_db[index].flag & DEV_PUBLIC) &&
++			    !(ha->fc_db[index].flag & DEV_TAPE_DEVICE)) {
++
++				qla2x00_fabric_logout(ha,
++				    ha->fc_db[index].loop_id & 0xff);
++				local_flags |= LOGOUT_PERFORMED;
++			}
++		}
++
++		/* Logout and remove any lost initiator devices */
++		list_for_each_safe(fcil, fcitemp, &ha->fcinitiators) {
++			fcinitiator = list_entry(fcil, fc_initiator_t, list);
++
++			if ((fcinitiator->loop_id & PORT_LOST_ID) == 0)
++				continue;
++
++			qla2x00_fabric_logout(ha, fcinitiator->loop_id & 0xff);
++			ha->fabricid[fcinitiator->loop_id &0xFF].in_use = FALSE;
++
++			list_del(&fcinitiator->list);
++			kfree(fcinitiator);
++		}
++
++		/*
++		 * Scan through our database and login entries already in our
++		 * database.
++		 */
++		for (index = 0; index < MAX_FIBRE_DEVICES &&
++		    !atomic_read(&ha->loop_down_timer) &&
++		    !(test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags)); index++) {
++
++			if (!(ha->fc_db[index].loop_id & PORT_LOGIN_NEEDED))
++				continue;
++
++			ha->fc_db[index].loop_id &= ~PORT_LOGIN_NEEDED;
++			if (ha->fc_db[index].loop_id <= LAST_SNS_LOOP_ID) {
++				/* loop_id reusable */
++				dev.loop_id = ha->fc_db[index].loop_id & 0xff;
++			} else {
++				for (i = ha->min_external_loopid;
++				    i < MAX_PUBLIC_LOOP_IDS; i++) {
++
++					if (!ha->fabricid[i].in_use) {
++						ha->fabricid[i].in_use = TRUE;
++						dev.loop_id = i;
++						break;
++					}
++				}
++
++				if (i == MAX_PUBLIC_LOOP_IDS)
++					break;
++			}
++
++			dev.d_id.b24 = ha->fc_db[index].d_id.b24;
++
++			/* login and update database */
++			if (qla2x00_fabric_login(ha, &dev) == 0) {
++				ha->fc_db[index].loop_id = dev.loop_id;
++		 	 	found_cnt++;
++			}
++		}
++
++		/*
++		 * Scan through new device list and login and add to our
++		 * database.
++		 */
++		for (index = 0; index < new_dev_cnt &&
++		    !atomic_read(&ha->loop_down_timer) &&
++		    !(test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags)); index++) {
++
++			memcpy(&dev,
++			    &new_dev_list[index], sizeof(struct new_dev));
++
++			dev.flag = DEV_PUBLIC;
++
++			for (i = ha->min_external_loopid;
++			    i < MAX_PUBLIC_LOOP_IDS; i++) {
++
++				if (!ha->fabricid[i].in_use) {
++					ha->fabricid[i].in_use = TRUE;
++					dev.loop_id = i;
++					break;
++				}
++			}
++
++			if (i == MAX_PUBLIC_LOOP_IDS)
++				break;
++
++			if (qla2x00_fabric_login(ha, &dev) == 0) {
++		 	 	found_cnt++;
++				rval = qla2x00_update_fc_database(ha,
++				    &dev, enable_slot_reuse);
++
++				if (rval) {
++					qla2x00_fabric_logout(ha, dev.loop_id);
++					ha->fabricid[i].in_use = FALSE;
++					break;
++				}
++			}
++		}
++	} while(0);
++
++	kfree(new_dev_list);
++
++	if (rval) {
++		DEBUG2(printk("scsi(%ld): Configure fabric error exit: "
++		    "rval=%d\n", ha->host_no, rval));
++	} else {
++		/* EMPTY */
++		DEBUG2(if (found_cnt))
++		DEBUG2(printk("scsi(%ld) Found (%d) ports\n",
++		    ha->host_no, found_cnt));
++	}
++
++	LEAVE(__func__);
++
++	return(rval);
++}
++
++
++/*
++ * qla2x00_find_all_fabric_devs
++ *	Go through GAN list to find all fabric devices.  Will perform
++ *	necessary logout of previously existed devices that have changed
++ *	and save new devices in a new device list.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	dev = database device entry pointer.
++ *
++ * Returns:
++ *	0 = success.
++ *	BIT_0 = error.
++ *
++ * Context:
++ *	Kernel context.
++ */
++static uint8_t
++qla2x00_find_all_fabric_devs(scsi_qla_host_t *ha, 
++    struct new_dev *new_dev_list, uint16_t *new_dev_cnt, uint8_t *flags) 
++{
++	fcdev_t		dev;
++	uint8_t		rval = 0;
++	int		status = 0;
++	uint16_t	i;
++	uint16_t	index;
++	uint16_t	new_cnt;
++	uint16_t	public_count;
++	uint16_t	initiator;
++	struct list_head *fcil;
++	fc_initiator_t	*fcinitiator;
++
++	sw_info_t	*swl;
++	sw_info_t	swl_entry;
++	int		swl_idx;
++	int		first_dev, last_dev;
++	port_id_t	wrap;
++	int		ip_dev;
++
++	ENTER(__func__);
++
++	/* Try GID_PT to get device list, else GAN. */
++	swl = kmalloc(sizeof(sw_info_t) * MAX_FIBRE_DEVICES, GFP_ATOMIC);
++	if (swl == NULL) {
++		/*EMPTY*/
++		DEBUG2(printk("scsi(%ld): GID_PT allocations failed, fallback "
++		    "on GAN\n", ha->host_no));
++	} else if (qla2x00_gid_pt(ha, swl) != QL_STATUS_SUCCESS) {
++		kfree(swl);
++		swl = NULL;
++	} else if (qla2x00_gpn_id(ha, swl) != QL_STATUS_SUCCESS) {
++		kfree(swl);
++		swl = NULL;
++	} else if (qla2x00_gnn_id(ha, swl) != QL_STATUS_SUCCESS) {
++		kfree(swl);
++		swl = NULL;
++	} else if (qla2x00_gft_id(ha, swl) != QL_STATUS_SUCCESS) {
++		kfree(swl);
++		swl = NULL;
++	}
++	swl_idx = 0;
++
++	/*
++	 * Loop getting devices from switch. Logout the devices that were in
++	 * our database but changed port ID.
++	 */
++#if defined(ISP2100)
++	ha->max_public_loop_ids = LAST_SNS_LOOP_ID - SNS_FIRST_LOOP_ID + 1;
++	public_count = ha->max_public_loop_ids;
++#else
++	ha->max_public_loop_ids = MAX_PUBLIC_LOOP_IDS;
++	public_count = ha->max_public_loop_ids - ha->min_external_loopid + 2;
++#endif
++
++	/* Set start port ID scan at adapter ID. */
++	swl_entry.d_id.b24 = ha->d_id.b24;
++	first_dev = 1;
++	last_dev = 0;
++
++	new_cnt = 0;	/* new device count */
++
++	for (i = 0;
++	    i < public_count && !atomic_read(&ha->loop_down_timer) &&
++	    !(test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags)); i++) {
++
++		if (swl != NULL) {
++			if (last_dev) {
++				wrap.b24 = dev.d_id.b24;
++			} else {
++				dev.flag = DEV_PUBLIC;
++				dev.d_id.b24 = swl[swl_idx].d_id.b24;
++				memcpy(dev.name,
++				    swl[swl_idx].node_name, WWN_SIZE);
++				memcpy(dev.wwn,
++				    swl[swl_idx].port_name, WWN_SIZE);
++
++				/* IP capable device */
++				ip_dev = 0;
++				if (swl[swl_idx].type & SW_TYPE_IP)
++					ip_dev = 1;
++
++				if (swl[swl_idx].d_id.b.rsvd_1 != 0) {
++					last_dev = 1;
++				}
++				swl_idx++;
++			}
++		} else {
++			/* Send GAN to the switch */
++			rval = 0;
++			if (qla2x00_ga_nxt(ha, &swl_entry) !=
++			    QL_STATUS_SUCCESS) {
++				rval |= BIT_0;
++				break;
++			}
++
++			dev.flag = DEV_PUBLIC;
++			dev.d_id.b24 = swl_entry.d_id.b24;
++			memcpy(dev.name, swl_entry.node_name, WWN_SIZE);
++			memcpy(dev.wwn, swl_entry.port_name, WWN_SIZE);
++
++			/* IP capable device */
++			ip_dev = 0;
++			if (swl_entry.type & SW_TYPE_IP)
++				ip_dev = 1;
++		}
++
++		/* If wrap on switch device list, exit. */
++		if (first_dev) {
++			wrap.b24 = dev.d_id.b24;
++			first_dev = 0;
++		} else if (dev.d_id.b24 == wrap.b24) {
++			DEBUG2(printk("scsi(%ld): device wrap (%02x%02x%02x)\n",
++			    ha->host_no,
++			    dev.d_id.b.domain, 
++			    dev.d_id.b.area, 
++			    dev.d_id.b.al_pa));
++			break;
++		}
++
++		DEBUG(printk("scsi(%ld): Fabric scan found device(%d) - port "
++		    "Id=%02x%02x%02x\n",
++		    ha->host_no, i,
++		    dev.d_id.b.domain, dev.d_id.b.area, dev.d_id.b.al_pa));
++
++		/* Bypass if host adapter. */
++		if (dev.d_id.b24 == ha->d_id.b24)
++			continue;
++
++		/* Bypass reserved domain fields. */
++		if ((dev.d_id.b.domain & 0xf0) == 0xf0)
++			continue;
++
++		/* Bypass if same domain and area of adapter. */
++		if ((dev.d_id.b24 & 0xffff00) == (ha->d_id.b24 & 0xffff00))
++			continue;
++
++#if defined(FC_IP_SUPPORT)
++		/* Check for IP device */
++		if (ip_dev) {
++			/* Found IP device */
++			DEBUG12(printk("scsi(%ld): IP fabric "
++			    "WWN: %02x%02x%02x%02x%02x%02x%02x%02x "
++			    "DID: %02x%02x%02x.\n",
++			    ha->host_no,
++			    dev.name[0], dev.name[1], dev.name[2], dev.name[3],
++			    dev.name[4], dev.name[5], dev.name[6], dev.name[7],
++			    dev.d_id.b.domain, 
++			    dev.d_id.b.area, 
++			    dev.d_id.b.al_pa));
++
++			qla2x00_update_ip_device_data(ha, &dev);
++			continue;
++		}
++#endif
++
++		/* Bypass if initiator */
++		initiator = FALSE;
++		list_for_each(fcil, &ha->fcinitiators) {
++			fcinitiator = list_entry(fcil, fc_initiator_t, list);
++
++			if (memcmp(dev.wwn, fcinitiator->port_name, 8) != 0)
++				continue;
++
++			initiator = TRUE;
++			DEBUG(printk("scsi(%ld): found host "
++			    "%02x%02x%02x%02x%02x%02x%02x%02x, "
++			    "portid=%02x%02x%02x.\n",
++			    ha->host_no,
++			    dev.name[0], dev.name[1], dev.name[2], dev.name[3],
++			    dev.name[4], dev.name[5], dev.name[6], dev.name[7],
++			    dev.d_id.b.domain, 
++			    dev.d_id.b.area, 
++			    dev.d_id.b.al_pa));
++
++			/*
++			 * If the initiator was marked as lost, perform the
++			 * required logout and relogin the initiator by
++			 * assuming a new device.
++			 */
++			if ((fcinitiator->loop_id & PORT_LOST_ID) == 0)
++				break;
++
++			initiator = FALSE;
++			break;
++		}
++
++		/* Bypass if initiator */
++		if (initiator)
++			continue;
++
++		/* Locate matching device in database. */
++		for (index = 0; index < MAX_FIBRE_DEVICES; index++) {
++			if (ha->fc_db[index].loop_id == PORT_UNUSED)
++				continue;
++
++			status = 1;
++			switch (ha->binding_type) {
++			case BIND_BY_PORT_NAME:
++				status = memcmp(dev.wwn,
++				    ha->fc_db[index].wwn, WWN_SIZE);
++				break;
++
++			case BIND_BY_PORT_ID:
++				status = (dev.d_id.b24 !=
++				    ha->fc_db[index].d_id.b24);
++				break;
++
++			case BIND_BY_NODE_NAME:
++				status = memcmp(dev.name,
++				    ha->fc_db[index].name, WWN_SIZE);
++				break;
++			}
++			if (status)
++				continue;
++
++			/*
++			 * Update volatile unbound fields for PortID binding
++			 * only
++			 */
++			if (ha->binding_type == BIND_BY_PORT_ID) {
++				memcpy(ha->fc_db[index].name,
++				    dev.name, WWN_SIZE);
++				memcpy(ha->fc_db[index].wwn,
++				    dev.wwn, WWN_SIZE);
++			}
++
++			/* Now we found a matching device name */
++			DEBUG(printk("scsi(%ld): Found fabric dev %d in "
++			    "tgt %d db, flags= 0x%x, loop_id=0x%04x, port="
++			    "%02x%02x%02x, "
++			    "name=%02x%02x%02x%02x%02x%02x%02x%02x.\n",
++			    ha->host_no, i, index,
++			    ha->fc_db[index].flag,
++			    ha->fc_db[index].loop_id,
++			    ha->fc_db[index].d_id.b.domain,
++			    ha->fc_db[index].d_id.b.area,
++			    ha->fc_db[index].d_id.b.al_pa,
++			    dev.wwn[0], dev.wwn[1], dev.wwn[2], dev.wwn[3],
++			    dev.wwn[4], dev.wwn[5], dev.wwn[6], dev.wwn[7]));
++
++			if (!(ha->fc_db[index].flag & DEV_PUBLIC)) {
++				/*
++				 * This was in our database as a local device.
++				 * Here we assume this device either has
++				 * changed location so configure_local_loop has
++				 * already done necessary clean up, or it's
++				 * saved here due to persistent name binding.
++				 * We'll just add it in as a fabric device.
++				 */
++				/* Copy port id and name fields. */
++				ha->fc_db[index].flag |= DEV_PUBLIC;
++				ha->fc_db[index].d_id.b24 = dev.d_id.b24;
++				ha->fc_db[index].loop_id |= PORT_LOGIN_NEEDED;
++
++				break;
++			}
++
++			/* This was in our database as a fabric device. */
++			if ((ha->fc_db[index].d_id.b24 == dev.d_id.b24) &&
++			    (ha->fc_db[index].loop_id <= LAST_SNS_LOOP_ID))
++				/* Device didn't change */
++				break;
++
++			if (ha->fc_db[index].loop_id == PORT_AVAILABLE) {
++				ha->fc_db[index].flag |= DEV_PUBLIC;
++				ha->fc_db[index].d_id.b24 = dev.d_id.b24;
++				ha->fc_db[index].loop_id |= PORT_LOGIN_NEEDED;
++				break;
++			}
++
++			/*
++			 * Port ID changed or device was marked to be updated;
++			 * logout and mark it for relogin later.
++			 */
++			qla2x00_fabric_logout(ha,
++			    ha->fc_db[index].loop_id & 0xff);
++			ha->fc_db[index].flag |= DEV_PUBLIC;
++			ha->fc_db[index].d_id.b24 = dev.d_id.b24;
++
++			ha->fc_db[index].loop_id |= PORT_LOGIN_NEEDED;
++			ha->fc_db[index].loop_id &= ~PORT_LOST_ID;
++
++			*flags |= LOGOUT_PERFORMED;
++
++			break;
++		}
++
++		if (index == MAX_FIBRE_DEVICES) {
++			/*
++			 * Did not find a match in our database.  This is a new
++			 * device.
++			 */
++			DEBUG3(printk("scsi(%ld): Found new device "
++			    "%02x%02x%02x%02x%02x%02x%02x%02x.\n",
++			    ha->host_no,
++			    dev.wwn[0], dev.wwn[1], dev.wwn[2], dev.wwn[3],
++			    dev.wwn[4], dev.wwn[5], dev.wwn[6], dev.wwn[7]));
++
++			memcpy(&new_dev_list[new_cnt],
++			    &dev, sizeof(struct new_dev));
++			new_cnt++;
++		}
++	}
++
++	if (swl)
++		kfree(swl);
++
++	*new_dev_cnt = new_cnt;
++
++	if (new_cnt >  0)
++		ha->device_flags |= DFLG_FABRIC_DEVICES;
++
++	LEAVE(__func__);
++
++	return (rval);
++}
++
++/*
++ * qla2x00_device_resync
++ *	Marks devices in the database that needs resynchronization.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *
++ * Context:
++ *	Kernel context.
++ */
++static void
++qla2x00_device_resync(scsi_qla_host_t *ha) 
++{
++	uint16_t index;
++	uint32_t mask;
++	rscn_t dev;
++	struct list_head *fcil;
++	fc_initiator_t	*fcinitiator;
++
++	ENTER(__func__);
++
++	while (ha->rscn_out_ptr != ha->rscn_in_ptr ||
++	    ha->flags.rscn_queue_overflow) {
++
++		memcpy(&dev, &ha->rscn_queue[ha->rscn_out_ptr], sizeof(rscn_t));
++
++		DEBUG(printk("scsi(%ld): device_resync: rscn_queue[%d], "
++		    "portID=%02x%02x%02x.\n",
++		    ha->host_no,
++		    ha->rscn_out_ptr,
++		    ha->rscn_queue[ha->rscn_out_ptr].d_id.b.domain,
++		    ha->rscn_queue[ha->rscn_out_ptr].d_id.b.area,
++		    ha->rscn_queue[ha->rscn_out_ptr].d_id.b.al_pa));
++
++		ha->rscn_out_ptr++;
++		if (ha->rscn_out_ptr == MAX_RSCN_COUNT)
++			ha->rscn_out_ptr = 0;
++
++		/* Queue overflow, set switch default case. */
++		if (ha->flags.rscn_queue_overflow) {
++			DEBUG(printk("scsi(%ld): device_resync: rscn "
++			    "overflow.\n", ha->host_no));
++
++			dev.format = 3;
++			ha->flags.rscn_queue_overflow = 0;
++		}
++
++		switch (dev.format) {
++		case 0:
++			mask = 0xffffff;
++			break;
++		case 1:
++			mask = 0xffff00;
++			break;
++		case 2:
++			mask = 0xff0000;
++			break;
++		default:
++			mask = 0x0;
++			dev.d_id.b24 = 0;
++			ha->rscn_out_ptr = ha->rscn_in_ptr;
++			break;
++		}
++
++		/* Mark target devices indicated by RSCN for later processing */
++		for (index = 0; index < MAX_FIBRE_DEVICES; index++) {
++			if ((ha->fc_db[index].flag & DEV_PUBLIC) &&
++			    (ha->fc_db[index].d_id.b24 & mask) ==
++			     dev.d_id.b24) {
++
++				/* fabric device */
++				if (ha->fc_db[index].loop_id != PORT_UNUSED) {
++					ha->fc_db[index].loop_id |=
++					    PORT_LOST_ID;
++
++					DEBUG(printk("scsi(%ld): RSCN port @ "
++					    "slot %d port_id=%02x%02x%02x.\n",
++					    ha->host_no,
++					    index,
++					    ha->fc_db[index].d_id.b.domain,
++					    ha->fc_db[index].d_id.b.area,
++					    ha->fc_db[index].d_id.b.al_pa));
++				}
++			}
++		}
++
++		if (dev.format == 3)
++			continue;
++
++		/*
++		 * Invalidate initiator devices indicated by RSCN so we know
++		 * they are no longer logged in.
++		 */
++		list_for_each(fcil, &ha->fcinitiators) {
++			fcinitiator = list_entry(fcil, fc_initiator_t, list);
++
++			if ((fcinitiator->d_id.b24 & mask) != dev.d_id.b24)
++				continue;
++			if (fcinitiator->loop_id & PORT_LOST_ID ||
++				fcinitiator->loop_id & PORT_LOGIN_NEEDED)
++				continue;
++
++			fcinitiator->loop_id |= PORT_LOST_ID;
++			fcinitiator->d_id.b24 = 0;
++		}
++	}
++
++	LEAVE(__func__);
++}
++
++
++/*
++ *  qla2x00_loop_resync
++ *      Resync with fibre channel devices.
++ *
++ * Input:
++ *      ha = adapter block pointer.
++ *
++ * Returns:
++ *      0 = success
++ */
++uint8_t
++qla2x00_loop_resync(scsi_qla_host_t *ha) 
++{
++	uint8_t   status;
++
++	ENTER(__func__);
++
++	ha->loop_state = LOOP_UPDATE;
++	qla2x00_stats.loop_resync++;
++	clear_bit(ISP_ABORT_RETRY, &ha->dpc_flags);
++	if (ha->flags.online) {
++		if (!(status = qla2x00_fw_ready(ha))) {
++			do {
++				/* v2.19.05b6 */
++				ha->loop_state = LOOP_UPDATE;
++
++				/*
++				 * Issue marker command only when we are going
++				 * to start the I/O .
++				 */
++				ha->marker_needed = 1;
++
++				/* Remap devices on Loop. */
++				clear_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags);
++
++				qla2x00_configure_loop(ha);
++
++			} while (!atomic_read(&ha->loop_down_timer) &&
++				!(test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags)) &&
++				(test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags)));
++		}
++		qla2x00_restart_queues(ha,TRUE);
++	} else
++		status = 0;
++
++	if (test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags)) {
++		return (1);
++	}
++
++	if (status) {
++		DEBUG2_3(printk("%s(): **** FAILED ****\n", __func__));
++	}
++
++	LEAVE(__func__);
++
++	return(status);
++}
++
++/*
++ * qla2x00_fabric_login
++ *	Issue fabric login command.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	device = pointer to FC device type structure.
++ *
++ * Returns:
++ *      0 - Login successfully
++ *      1 - Login failed
++ *      2 - Initiator device
++ *      3 - Fatal error
++ */
++uint8_t
++qla2x00_fabric_login(scsi_qla_host_t *ha, fcdev_t *device) 
++{
++	uint16_t	status[3];
++
++	for (;;) {
++		DEBUG(printk("scsi(%ld): Trying Fabric Login w/loop id 0x%04x "
++ 		    "for port %02x%02x%02x.\n",
++ 		    ha->host_no, device->loop_id,
++		    device->d_id.b.domain,
++		    device->d_id.b.area,
++		    device->d_id.b.al_pa));
++
++		/* Login device on switch. */
++		qla2x00_login_fabric(ha,
++ 		    device->loop_id, device->d_id.b.domain,
++ 		    device->d_id.b.area, device->d_id.b.al_pa, 
++ 		    &status[0], BIT_0);
++
++		if (status[0] == 0x4007) {
++			ha->fabricid[device->loop_id].in_use = FALSE;
++			device->loop_id = status[1];
++
++			DEBUG(printk("Fabric Login: port in use - next "
++ 			    "loop id=0x%04x, port Id=%02x%02x%02x.\n",
++			    device->loop_id,
++			    device->d_id.b.domain,
++			    device->d_id.b.area,
++			    device->d_id.b.al_pa));
++
++			if (device->loop_id <= LAST_SNS_LOOP_ID)
++				ha->fabricid[device->loop_id].in_use = TRUE;
++			else
++				return 1;
++
++		} else if (status[0] == 0x4000) {
++			if (status[1] & 0x0001) {
++				/* Initiator only device */
++				qla2x00_add_initiator_device(ha, device);
++
++				return 2;
++			}
++
++			/* This is target capable device */
++			qla2x00_get_port_database(ha, device, 0);
++
++			DEBUG(printk("scsi(%ld): Fabric Login OK. loop "
++ 			    "id=0x%04x, port Id=%02x%02x%02x.\n",
++ 			    ha->host_no,
++			    device->loop_id,
++			    device->d_id.b.domain,
++			    device->d_id.b.area,
++			    device->d_id.b.al_pa));
++			return 0;
++
++		} else if (status[0] == 0x4008) {
++			if (device->loop_id++ <= LAST_SNS_LOOP_ID)
++				ha->fabricid[device->loop_id].in_use = TRUE;
++			else
++				return 1;
++
++		} else if (status[0] == 0x4006) {
++			/* No more retry needed. */
++			return 3;
++		} else {
++			DEBUG2(printk("%s(%ld): failed=%x port_id=%02x%02x%02x "
++ 			    "loop_id=%x jiffies=%lx.\n", 
++ 			    __func__, ha->host_no, status[0], 
++			    device->d_id.b.domain,
++			    device->d_id.b.area,
++			    device->d_id.b.al_pa,
++			    device->loop_id, jiffies));
++			return 1;
++		}
++	}
++}
++
++/*
++ * qla2x00_local_device_login
++ *	Issue local device login command.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	loop_id = loop id of device to login to.
++ *
++ * Returns (Where's the #define!!!!):
++ *      0 - Login successfully
++ *      1 - Login failed
++ *      3 - Fatal error
++ */
++uint8_t
++qla2x00_local_device_login(scsi_qla_host_t *ha, uint16_t loop_id)
++{
++	int		rval;
++	uint16_t	mb[MAILBOX_REGISTER_COUNT];
++
++	memset(mb, 0, sizeof(mb));
++	rval = qla2x00_login_local_device(ha, loop_id, mb, BIT_0);
++	if (rval == QL_STATUS_SUCCESS) {
++		/* Interrogate mailbox registers for any errors */
++		if (mb[0] == 0x4005)
++			rval = 1;
++		else if (mb[0] == 0x4006)
++			/* device not in PCB table */
++			rval = 3;
++	}
++	return rval;
++}
++
++
++/**
++ * qla2x00_ga_nxt() - SNS scan for fabric devices via GA_NXT command.
++ * @ha: HA context
++ * @swl_entry: switch info entry to updated
++ *
++ * NOTE: Non-Nx_Ports are skipped.
++ *
++ * Returns 0 on success.
++ */
++static int
++qla2x00_ga_nxt(scsi_qla_host_t *ha, sw_info_t *swl_entry)
++{
++	int		rval;
++
++	ms_iocb_entry_t	*ms_pkt;
++	struct ct_sns_req	*ct_req;
++	struct ct_sns_rsp	*ct_rsp;
++
++	ENTER(__func__);
++
++retry_ga_nxt:
++	/* Issue GA_NXT */
++	/* Prepare common MS IOCB */
++	ms_pkt = qla2x00_prep_ms_iocb(ha, GA_NXT_REQ_SIZE, GA_NXT_RSP_SIZE);
++
++	/* Prepare CT request */
++	ct_req = &ha->ct_sns->p.req;
++	ct_rsp = &ha->ct_sns->p.rsp;
++	memset(ct_req, 0, sizeof(struct ct_sns_pkt));
++
++	ct_req->header.revision = 0x01;
++	ct_req->header.gs_type = 0xFC;
++	ct_req->header.gs_subtype = 0x02;
++	ct_req->command = __constant_cpu_to_be16(GA_NXT_CMD);
++	ct_req->max_rsp_size =
++	    __constant_cpu_to_be16((GA_NXT_RSP_SIZE - 16) / 4);
++
++	/* Prepare CT arguments -- port_id */
++	ct_req->req.port_id.port_id[0] = swl_entry->d_id.b.domain;
++	ct_req->req.port_id.port_id[1] = swl_entry->d_id.b.area;
++	ct_req->req.port_id.port_id[2] = swl_entry->d_id.b.al_pa;
++
++	/* Execute MS IOCB */
++	rval = qla2x00_issue_iocb(ha,
++	    ha->ms_iocb, ha->ms_iocb_dma, sizeof(ms_iocb_entry_t));
++	if (rval != QL_STATUS_SUCCESS) {
++		/*EMPTY*/
++		DEBUG2_3(printk("scsi(%ld): GA_NXT issue IOCB failed (%d).\n",
++		    ha->host_no, rval));
++	} else if (ct_rsp->header.response !=
++	    __constant_cpu_to_be16(CT_ACCEPT_RESPONSE)) {
++		DEBUG2_3(printk("scsi(%ld): GA_NXT failed, rejected request, "
++		    "ga_nxt_rsp:\n", ha->host_no));
++		DEBUG2_3(qla2x00_dump_buffer((uint8_t *)&ct_rsp->header,
++		    sizeof(struct ct_rsp_hdr)));
++		rval = QL_STATUS_ERROR;
++	} else if (ct_rsp->rsp.ga_nxt.port_type != NS_N_PORT_TYPE &&
++	    ct_rsp->rsp.ga_nxt.port_type != NS_NL_PORT_TYPE) {
++		/* We're only interested in Nx ports */
++		DEBUG2_3(printk("scsi(%ld): GA_NXT skipping *NON* Nx_Port - "
++		    "nodename %02x%02x%02x%02x%02x%02x%02x%02x "
++		    "portname %02x%02x%02x%02x%02x%02x%02x%02x "
++		    "portid=%02x%02x%02x port_type=%x.\n",
++		    ha->host_no,
++		    ct_rsp->rsp.ga_nxt.node_name[0],
++		    ct_rsp->rsp.ga_nxt.node_name[1], 
++		    ct_rsp->rsp.ga_nxt.node_name[2], 
++		    ct_rsp->rsp.ga_nxt.node_name[3], 
++		    ct_rsp->rsp.ga_nxt.node_name[4], 
++		    ct_rsp->rsp.ga_nxt.node_name[5], 
++		    ct_rsp->rsp.ga_nxt.node_name[6], 
++		    ct_rsp->rsp.ga_nxt.node_name[7], 
++		    ct_rsp->rsp.ga_nxt.port_name[0],
++		    ct_rsp->rsp.ga_nxt.port_name[1], 
++		    ct_rsp->rsp.ga_nxt.port_name[2], 
++		    ct_rsp->rsp.ga_nxt.port_name[3], 
++		    ct_rsp->rsp.ga_nxt.port_name[4], 
++		    ct_rsp->rsp.ga_nxt.port_name[5], 
++		    ct_rsp->rsp.ga_nxt.port_name[6], 
++		    ct_rsp->rsp.ga_nxt.port_name[7], 
++		    ct_rsp->rsp.ga_nxt.port_id[0], 
++		    ct_rsp->rsp.ga_nxt.port_id[1], 
++		    ct_rsp->rsp.ga_nxt.port_id[2],
++		    ct_rsp->rsp.ga_nxt.port_type));
++		goto retry_ga_nxt;
++	} else {
++		/* Populate switch info entry. */
++		swl_entry->d_id.b.domain = ct_rsp->rsp.ga_nxt.port_id[0];
++		swl_entry->d_id.b.area = ct_rsp->rsp.ga_nxt.port_id[1];
++		swl_entry->d_id.b.al_pa = ct_rsp->rsp.ga_nxt.port_id[2];
++
++		memcpy(swl_entry->node_name,
++		    ct_rsp->rsp.ga_nxt.node_name, WWN_SIZE);
++		memcpy(swl_entry->port_name,
++		    ct_rsp->rsp.ga_nxt.port_name, WWN_SIZE);
++
++		swl_entry->type = SW_TYPE_SCSI;
++		if (ct_rsp->rsp.ga_nxt.fc4_types[3] & 0x20)
++			swl_entry->type |= SW_TYPE_IP;
++
++		DEBUG2_3(printk("scsi(%ld): GA_NXT entry - "
++		    "nodename %02x%02x%02x%02x%02x%02x%02x%02x "
++		    "portname %02x%02x%02x%02x%02x%02x%02x%02x "
++		    "portid=%02x%02x%02x type=%02x.\n",
++		    ha->host_no,
++		    swl_entry->node_name[0], swl_entry->node_name[1],
++		    swl_entry->node_name[2], swl_entry->node_name[3],
++		    swl_entry->node_name[4], swl_entry->node_name[5],
++		    swl_entry->node_name[6], swl_entry->node_name[7],
++		    swl_entry->port_name[0], swl_entry->port_name[1],
++		    swl_entry->port_name[2], swl_entry->port_name[3],
++		    swl_entry->port_name[4], swl_entry->port_name[5],
++		    swl_entry->port_name[6], swl_entry->port_name[7],
++		    swl_entry->d_id.b.domain,
++		    swl_entry->d_id.b.area,
++		    swl_entry->d_id.b.al_pa,
++		    swl_entry->type));
++	}
++
++	LEAVE(__func__);
++
++	return (rval);
++}
++
++/**
++ * qla2x00_gid_pt() - SNS scan for fabric devices via GID_PT command.
++ * @ha: HA context
++ * @list: switch info entries to populate
++ *
++ * NOTE: Non-Nx_Ports are not requested.
++ *
++ * Returns 0 on success.
++ */
++static int
++qla2x00_gid_pt(scsi_qla_host_t *ha, sw_info_t *list)
++{
++	int		rval;
++	uint16_t	i;
++
++	ms_iocb_entry_t	*ms_pkt;
++	struct ct_sns_req	*ct_req;
++	struct ct_sns_rsp	*ct_rsp;
++
++	struct ct_sns_gid_pt_data *gid_data;
++
++	ENTER(__func__);
++
++	gid_data = NULL;
++
++	/* Issue GID_PT */
++	/* Prepare common MS IOCB */
++	ms_pkt = qla2x00_prep_ms_iocb(ha, GID_PT_REQ_SIZE, GID_PT_RSP_SIZE);
++
++	/* Prepare CT request */
++	ct_req = &ha->ct_sns->p.req;
++	ct_rsp = &ha->ct_sns->p.rsp;
++	memset(ct_req, 0, sizeof(struct ct_sns_pkt));
++
++	ct_req->header.revision = 0x01;
++	ct_req->header.gs_type = 0xFC;
++	ct_req->header.gs_subtype = 0x02;
++	ct_req->command = __constant_cpu_to_be16(GID_PT_CMD);
++	ct_req->max_rsp_size =
++	    __constant_cpu_to_be16((GID_PT_RSP_SIZE - 16) / 4);
++
++	/* Prepare CT arguments -- port_type */
++	ct_req->req.gid_pt.port_type = NS_NX_PORT_TYPE;
++
++	/* Execute MS IOCB */
++	rval = qla2x00_issue_iocb(ha,
++	    ha->ms_iocb, ha->ms_iocb_dma, sizeof(ms_iocb_entry_t));
++	if (rval != QL_STATUS_SUCCESS) {
++		/*EMPTY*/
++		DEBUG2_3(printk("scsi(%ld): GID_PT issue IOCB failed (%d).\n",
++		    ha->host_no, rval));
++	} else if (ct_rsp->header.response !=
++	    __constant_cpu_to_be16(CT_ACCEPT_RESPONSE)) {
++		DEBUG2_3(printk("scsi(%ld): GID_PT failed, rejected request, "
++		    "gid_pt_rsp:\n", ha->host_no));
++		DEBUG2_3(qla2x00_dump_buffer((uint8_t *)&ct_rsp->header,
++		    sizeof(struct ct_rsp_hdr)));
++		rval = QL_STATUS_ERROR;
++	} else {
++		/* Set port IDs in switch info list. */
++		for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
++			memset(&list[i], 0, sizeof(sw_info_t));
++			gid_data = &ct_rsp->rsp.gid_pt.entries[i];
++			list[i].d_id.b.domain = gid_data->port_id[0];
++			list[i].d_id.b.area = gid_data->port_id[1];
++			list[i].d_id.b.al_pa = gid_data->port_id[2];
++
++			/* Last one exit. */
++			if (gid_data->control_byte & BIT_7) {
++				list[i].d_id.b.rsvd_1 = gid_data->control_byte;
++				break;
++			}
++		}
++	}
++
++	LEAVE(__func__);
++
++	return (rval);
++}
++
++/**
++ * qla2x00_gpn_id() - SNS Get Port Name (GPN_ID) query.
++ * @ha: HA context
++ * @list: switch info entries to populate
++ *
++ * Returns 0 on success.
++ */
++static int
++qla2x00_gpn_id(scsi_qla_host_t *ha, sw_info_t *list)
++{
++	int		rval;
++	uint16_t	i;
++
++	ms_iocb_entry_t	*ms_pkt;
++	struct ct_sns_req	*ct_req;
++	struct ct_sns_rsp	*ct_rsp;
++
++	ENTER(__func__);
++
++	for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
++		/* Issue GPN_ID */
++		/* Prepare common MS IOCB */
++		ms_pkt = qla2x00_prep_ms_iocb(ha,
++		    GPN_ID_REQ_SIZE, GPN_ID_RSP_SIZE);
++
++		/* Prepare CT request */
++		ct_req = &ha->ct_sns->p.req;
++		ct_rsp = &ha->ct_sns->p.rsp;
++		memset(ct_req, 0, sizeof(struct ct_sns_pkt));
++
++		ct_req->header.revision = 0x01;
++		ct_req->header.gs_type = 0xFC;
++		ct_req->header.gs_subtype = 0x02;
++		ct_req->command = __constant_cpu_to_be16(GPN_ID_CMD);
++		ct_req->max_rsp_size =
++		    __constant_cpu_to_be16((GPN_ID_RSP_SIZE - 16) / 4);
++
++		/* Prepare CT arguments -- port_id */
++		ct_req->req.port_id.port_id[0] = list[i].d_id.b.domain;
++		ct_req->req.port_id.port_id[1] = list[i].d_id.b.area;
++		ct_req->req.port_id.port_id[2] = list[i].d_id.b.al_pa;
++
++		/* Execute MS IOCB */
++		rval = qla2x00_issue_iocb(ha,
++		    ha->ms_iocb, ha->ms_iocb_dma, sizeof(ms_iocb_entry_t));
++		if (rval != QL_STATUS_SUCCESS) {
++			/*EMPTY*/
++			DEBUG2_3(printk("scsi(%ld): GPN_ID issue IOCB failed "
++			    "(%d).\n",
++			    ha->host_no, rval));
++		} else if (ct_rsp->header.response !=
++		    __constant_cpu_to_be16(CT_ACCEPT_RESPONSE)) {
++			DEBUG2_3(printk("scsi(%ld): GPN_ID failed, rejected "
++			    "request, gpn_id_rsp:\n", ha->host_no));
++			DEBUG2_3(qla2x00_dump_buffer((uint8_t *)&ct_rsp->header,
++			    sizeof(struct ct_rsp_hdr)));
++			rval = QL_STATUS_ERROR;
++		} else {
++			/* Save portname */
++			memcpy(list[i].port_name,
++			    ct_rsp->rsp.gpn_id.port_name, WWN_SIZE);
++		}
++
++		/* Last device exit. */
++		if (list[i].d_id.b.rsvd_1 != 0)
++			break;
++	}
++
++	LEAVE(__func__);
++
++	return (rval);
++}
++
++/**
++ * qla2x00_gnn_id() - SNS Get Node Name (GPN_ID) query.
++ * @ha: HA context
++ * @list: switch info entries to populate
++ *
++ * Returns 0 on success.
++ */
++static int
++qla2x00_gnn_id(scsi_qla_host_t *ha, sw_info_t *list)
++{
++	int		rval;
++	uint16_t	i;
++
++	ms_iocb_entry_t	*ms_pkt;
++	struct ct_sns_req	*ct_req;
++	struct ct_sns_rsp	*ct_rsp;
++
++	ENTER(__func__);
++
++	for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
++		/* Issue GNN_ID */
++		/* Prepare common MS IOCB */
++		ms_pkt = qla2x00_prep_ms_iocb(ha,
++		    GNN_ID_REQ_SIZE, GNN_ID_RSP_SIZE);
++
++		/* Prepare CT request */
++		ct_req = &ha->ct_sns->p.req;
++		ct_rsp = &ha->ct_sns->p.rsp;
++		memset(ct_req, 0, sizeof(struct ct_sns_pkt));
++
++		ct_req->header.revision = 0x01;
++		ct_req->header.gs_type = 0xFC;
++		ct_req->header.gs_subtype = 0x02;
++		ct_req->command = __constant_cpu_to_be16(GNN_ID_CMD);
++		ct_req->max_rsp_size =
++		    __constant_cpu_to_be16((GNN_ID_RSP_SIZE - 16) / 4);
++
++		/* Prepare CT arguments -- port_id */
++		ct_req->req.port_id.port_id[0] = list[i].d_id.b.domain;
++		ct_req->req.port_id.port_id[1] = list[i].d_id.b.area;
++		ct_req->req.port_id.port_id[2] = list[i].d_id.b.al_pa;
++
++		/* Execute MS IOCB */
++		rval = qla2x00_issue_iocb(ha,
++		    ha->ms_iocb, ha->ms_iocb_dma, sizeof(ms_iocb_entry_t));
++		if (rval != QL_STATUS_SUCCESS) {
++			/*EMPTY*/
++			DEBUG2_3(printk("scsi(%ld): GNN_ID issue IOCB failed "
++			    "(%d).\n",
++			    ha->host_no, rval));
++		} else if (ct_rsp->header.response !=
++		    __constant_cpu_to_be16(CT_ACCEPT_RESPONSE)) {
++			DEBUG2_3(printk("scsi(%ld): GNN_ID failed, rejected "
++			    "request, gnn_id_rsp:\n", ha->host_no));
++			DEBUG2_3(qla2x00_dump_buffer((uint8_t *)&ct_rsp->header,
++			    sizeof(struct ct_rsp_hdr)));
++			rval = QL_STATUS_ERROR;
++		} else {
++			/* Save nodename */
++			memcpy(list[i].node_name,
++			    ct_rsp->rsp.gnn_id.node_name, WWN_SIZE);
++		}
++
++		/* Last device exit. */
++		if (list[i].d_id.b.rsvd_1 != 0)
++			break;
++	}
++
++	LEAVE(__func__);
++
++	return (rval);
++}
++
++/**
++ * qla2x00_gft_id() - SNS Get FC-4 TYPEs (GFT_ID) query.
++ * @ha: HA context
++ * @list: switch info entries to populate
++ *
++ * Returns 0 on success.
++ */
++static int
++qla2x00_gft_id(scsi_qla_host_t *ha, sw_info_t *list)
++{
++	int		rval;
++	uint16_t	i;
++
++	ms_iocb_entry_t	*ms_pkt;
++	struct ct_sns_req	*ct_req;
++	struct ct_sns_rsp	*ct_rsp;
++
++	ENTER(__func__);
++
++	for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
++		/* Issue GFT_ID */
++		/* Prepare common MS IOCB */
++		ms_pkt = qla2x00_prep_ms_iocb(ha,
++		    GFT_ID_REQ_SIZE, GFT_ID_RSP_SIZE);
++
++		/* Prepare CT request */
++		ct_req = &ha->ct_sns->p.req;
++		ct_rsp = &ha->ct_sns->p.rsp;
++		memset(ct_req, 0, sizeof(struct ct_sns_pkt));
++
++		ct_req->header.revision = 0x01;
++		ct_req->header.gs_type = 0xFC;
++		ct_req->header.gs_subtype = 0x02;
++		ct_req->command = __constant_cpu_to_be16(GFT_ID_CMD);
++		ct_req->max_rsp_size =
++		    __constant_cpu_to_be16((GFT_ID_RSP_SIZE - 16) / 4);
++
++		/* Prepare CT arguments -- port_id */
++		ct_req->req.port_id.port_id[0] = list[i].d_id.b.domain;
++		ct_req->req.port_id.port_id[1] = list[i].d_id.b.area;
++		ct_req->req.port_id.port_id[2] = list[i].d_id.b.al_pa;
++
++		/* Execute MS IOCB */
++		rval = qla2x00_issue_iocb(ha,
++		    ha->ms_iocb, ha->ms_iocb_dma, sizeof(ms_iocb_entry_t));
++		if (rval != QL_STATUS_SUCCESS) {
++			/*EMPTY*/
++			DEBUG2_3(printk("scsi(%ld): GFT_ID issue IOCB failed "
++			    "(%d).\n",
++			    ha->host_no, rval));
++		} else if (ct_rsp->header.response !=
++		    __constant_cpu_to_be16(CT_ACCEPT_RESPONSE)) {
++			DEBUG2_3(printk("scsi(%ld): GFT_ID failed, rejected "
++			    "request, gft_id_rsp:\n", ha->host_no));
++			DEBUG2_3(qla2x00_dump_buffer((uint8_t *)&ct_rsp->header,
++			    sizeof(struct ct_rsp_hdr)));
++			rval = QL_STATUS_ERROR;
++		} else {
++			/* FCP-3 check necessary?  No, assume FCP-3 */
++			/*if (ct_rsp->rsp.gft_id.fc4_types[2] & 0x01)*/
++			list[i].type = SW_TYPE_SCSI;
++			if (ct_rsp->rsp.gft_id.fc4_types[3] & 0x20)
++				list[i].type |= SW_TYPE_IP;
++
++			DEBUG2_3(printk("scsi(%ld): GID_PT entry - "
++			    "nodename %02x%02x%02x%02x%02x%02x%02x%02x "
++			    "portname %02x%02x%02x%02x%02x%02x%02x%02x "
++			    "portid=%02x%02x%02x type=%02x.\n",
++			    ha->host_no,
++			    list[i].node_name[0], list[i].node_name[1],
++			    list[i].node_name[2], list[i].node_name[3],
++			    list[i].node_name[4], list[i].node_name[5],
++			    list[i].node_name[6], list[i].node_name[7],
++			    list[i].port_name[0], list[i].port_name[1],
++			    list[i].port_name[2], list[i].port_name[3],
++			    list[i].port_name[4], list[i].port_name[5],
++			    list[i].port_name[6], list[i].port_name[7],
++			    list[i].d_id.b.domain,
++			    list[i].d_id.b.area,
++			    list[i].d_id.b.al_pa,
++			    list[i].type));
++		}
++
++		/* Last device exit. */
++		if (list[i].d_id.b.rsvd_1 != 0)
++			break;
++	}
++
++	LEAVE(__func__);
++
++	return (rval);
++}
++
++/**
++ * qla2x00_rft_id() - SNS Register FC-4 TYPEs (RFT_ID) supported by the HBA.
++ * @ha: HA context
++ *
++ * Returns 0 on success.
++ */
++static int
++qla2x00_rft_id(scsi_qla_host_t *ha)
++{
++	int		rval;
++
++	ms_iocb_entry_t	*ms_pkt;
++	struct ct_sns_req	*ct_req;
++	struct ct_sns_rsp	*ct_rsp;
++
++	ENTER(__func__);
++
++	/* Issue RFT_ID */
++	/* Prepare common MS IOCB */
++	ms_pkt = qla2x00_prep_ms_iocb(ha, RFT_ID_REQ_SIZE, RFT_ID_RSP_SIZE);
++
++	/* Prepare CT request */
++	ct_req = &ha->ct_sns->p.req;
++	ct_rsp = &ha->ct_sns->p.rsp;
++	memset(ct_req, 0, sizeof(struct ct_sns_pkt));
++
++	ct_req->header.revision = 0x01;
++	ct_req->header.gs_type = 0xFC;
++	ct_req->header.gs_subtype = 0x02;
++	ct_req->command = __constant_cpu_to_be16(RFT_ID_CMD);
++	ct_req->max_rsp_size =
++	    __constant_cpu_to_be16((RFT_ID_RSP_SIZE - 16) / 4);
++
++	/* Prepare CT arguments -- port_id, FC-4 types */
++	ct_req->req.rft_id.port_id[0] = ha->d_id.b.domain;
++	ct_req->req.rft_id.port_id[1] = ha->d_id.b.area;
++	ct_req->req.rft_id.port_id[2] = ha->d_id.b.al_pa;
++
++	ct_req->req.rft_id.fc4_types[2] = 0x01;		/* FCP-3 */
++	ha->active_fc4_types = EXT_DEF_FC4_TYPE_SCSI;
++
++#if defined(FC_IP_SUPPORT)
++	if (ha->flags.enable_ip) {
++		ct_req->req.rft_id.fc4_types[3] = 0x20; /* IP over FC */
++		ha->active_fc4_types |= EXT_DEF_FC4_TYPE_IP;
++	}
++#endif
++#if defined(FC_VI_SUPPORT)
++	ct_req->req.rft_id.fc4_types[8] = 0x01;		/* FC-VI */
++	ha->active_fc4_types |= EXT_DEF_FC4_TYPE_VI;
++#endif
++
++	/* Execute MS IOCB */
++	rval = qla2x00_issue_iocb(ha,
++	    ha->ms_iocb, ha->ms_iocb_dma, sizeof(ms_iocb_entry_t));
++	if (rval != QL_STATUS_SUCCESS) {
++		/*EMPTY*/
++		DEBUG2_3(printk("scsi(%ld): RFT_ID issue IOCB failed (%d).\n",
++		    ha->host_no, rval));
++	} else if (ct_rsp->header.response !=
++	    __constant_cpu_to_be16(CT_ACCEPT_RESPONSE)) {
++		DEBUG2_3(printk("scsi(%ld): RFT_ID failed, rejected "
++		    "request, rft_id_rsp:\n", ha->host_no));
++		DEBUG2_3(qla2x00_dump_buffer((uint8_t *)&ct_rsp->header,
++		    sizeof(struct ct_rsp_hdr)));
++		rval = QL_STATUS_ERROR;
++	} else {
++		DEBUG2(printk("scsi(%ld): RFT_ID exiting normally.\n",
++		    ha->host_no));
++	}
++
++	LEAVE(__func__);
++
++	return (rval);
++}
++
++/**
++ * qla2x00_rff_id() - SNS Register FC-4 Features (RFF_ID) supported by the HBA.
++ * @ha: HA context
++ *
++ * Returns 0 on success.
++ */
++static int
++qla2x00_rff_id(scsi_qla_host_t *ha)
++{
++	int		rval;
++
++	ms_iocb_entry_t	*ms_pkt;
++	struct ct_sns_req	*ct_req;
++	struct ct_sns_rsp	*ct_rsp;
++
++	ENTER(__func__);
++
++	/* Issue RFF_ID */
++	/* Prepare common MS IOCB */
++	ms_pkt = qla2x00_prep_ms_iocb(ha, RFF_ID_REQ_SIZE, RFF_ID_RSP_SIZE);
++
++	/* Prepare CT request */
++	ct_req = &ha->ct_sns->p.req;
++	ct_rsp = &ha->ct_sns->p.rsp;
++	memset(ct_req, 0, sizeof(struct ct_sns_pkt));
++
++	ct_req->header.revision = 0x01;
++	ct_req->header.gs_type = 0xFC;
++	ct_req->header.gs_subtype = 0x02;
++	ct_req->command = __constant_cpu_to_be16(RFF_ID_CMD);
++	ct_req->max_rsp_size =
++	    __constant_cpu_to_be16((RFF_ID_RSP_SIZE - 16) / 4);
++
++	/* Prepare CT arguments -- port_id, FC-4 feature, FC-4 type */
++	ct_req->req.rff_id.port_id[0] = ha->d_id.b.domain;
++	ct_req->req.rff_id.port_id[1] = ha->d_id.b.area;
++	ct_req->req.rff_id.port_id[2] = ha->d_id.b.al_pa;
++
++	if (!ha->flags.enable_target_mode)
++		ct_req->req.rff_id.fc4_feature = 0x02;	/* SCSI Initiator */
++
++	ct_req->req.rff_id.fc4_type = 0x08;		/* SCSI - FCP */
++
++	/* Execute MS IOCB */
++	rval = qla2x00_issue_iocb(ha,
++	    ha->ms_iocb, ha->ms_iocb_dma, sizeof(ms_iocb_entry_t));
++	if (rval != QL_STATUS_SUCCESS) {
++		/*EMPTY*/
++		DEBUG2_3(printk("scsi(%ld): RFF_ID issue IOCB failed (%d).\n",
++		    ha->host_no, rval));
++	} else if (ct_rsp->header.response !=
++	    __constant_cpu_to_be16(CT_ACCEPT_RESPONSE)) {
++		DEBUG2_3(printk("scsi(%ld): RFF_ID failed, rejected "
++		    "request, rff_id_rsp:\n", ha->host_no));
++		DEBUG2_3(qla2x00_dump_buffer((uint8_t *)&ct_rsp->header,
++		    sizeof(struct ct_rsp_hdr)));
++		rval = QL_STATUS_ERROR;
++	} else {
++		DEBUG2(printk("scsi(%ld): RFF_ID exiting normally.\n",
++		    ha->host_no));
++	}
++
++	LEAVE(__func__);
++
++	return (rval);
++}
++
++/**
++ * qla2x00_rnn_id() - SNS Register Node Name (RNN_ID) of the HBA.
++ * @ha: HA context
++ *
++ * Returns 0 on success.
++ */
++static int
++qla2x00_rnn_id(scsi_qla_host_t *ha)
++{
++	int		rval;
++
++	ms_iocb_entry_t	*ms_pkt;
++	struct ct_sns_req	*ct_req;
++	struct ct_sns_rsp	*ct_rsp;
++
++	ENTER(__func__);
++
++	/* Issue RNN_ID */
++	/* Prepare common MS IOCB */
++	ms_pkt = qla2x00_prep_ms_iocb(ha, RNN_ID_REQ_SIZE, RNN_ID_RSP_SIZE);
++
++	/* Prepare CT request */
++	ct_req = &ha->ct_sns->p.req;
++	ct_rsp = &ha->ct_sns->p.rsp;
++	memset(ct_req, 0, sizeof(struct ct_sns_pkt));
++
++	ct_req->header.revision = 0x01;
++	ct_req->header.gs_type = 0xFC;
++	ct_req->header.gs_subtype = 0x02;
++	ct_req->command = __constant_cpu_to_be16(RNN_ID_CMD);
++	ct_req->max_rsp_size =
++	    __constant_cpu_to_be16((RNN_ID_RSP_SIZE - 16) / 4);
++
++	/* Prepare CT arguments -- port_id, node_name */
++	ct_req->req.rnn_id.port_id[0] = ha->d_id.b.domain;
++	ct_req->req.rnn_id.port_id[1] = ha->d_id.b.area;
++	ct_req->req.rnn_id.port_id[2] = ha->d_id.b.al_pa;
++
++	memcpy(ct_req->req.rnn_id.node_name, ha->init_cb->node_name, WWN_SIZE);
++
++	/* Execute MS IOCB */
++	rval = qla2x00_issue_iocb(ha,
++	    ha->ms_iocb, ha->ms_iocb_dma, sizeof(ms_iocb_entry_t));
++	if (rval != QL_STATUS_SUCCESS) {
++		/*EMPTY*/
++		DEBUG2_3(printk("scsi(%ld): RNN_ID issue IOCB failed (%d).\n",
++		    ha->host_no, rval));
++	} else if (ct_rsp->header.response !=
++	    __constant_cpu_to_be16(CT_ACCEPT_RESPONSE)) {
++		DEBUG2_3(printk("scsi(%ld): RNN_ID failed, rejected "
++		    "request, rnn_id_rsp:\n", ha->host_no));
++		DEBUG2_3(qla2x00_dump_buffer((uint8_t *)&ct_rsp->header,
++		    sizeof(struct ct_rsp_hdr)));
++		rval = QL_STATUS_ERROR;
++	} else {
++		DEBUG2(printk("scsi(%ld): RNN_ID exiting normally.\n",
++		    ha->host_no));
++	}
++
++	LEAVE(__func__);
++
++	return (rval);
++}
++
++/**
++ * qla2x00_rsnn_nn() - SNS Register Symbolic Node Name (RSNN_NN) of the HBA.
++ * @ha: HA context
++ *
++ * Returns 0 on success.
++ */
++static int
++qla2x00_rsnn_nn(scsi_qla_host_t *ha)
++{
++	int		rval;
++	uint8_t		*snn;
++	uint8_t		version[20];
++
++	ms_iocb_entry_t	*ms_pkt;
++	struct ct_sns_req	*ct_req;
++	struct ct_sns_rsp	*ct_rsp;
++
++	ENTER(__func__);
++
++	/* Issue RSNN_NN */
++	/* Prepare common MS IOCB */
++	/*   Request size adjusted after CT preparation */
++	ms_pkt = qla2x00_prep_ms_iocb(ha, 0, RSNN_NN_RSP_SIZE);
++
++	/* Prepare CT request */
++	ct_req = &ha->ct_sns->p.req;
++	ct_rsp = &ha->ct_sns->p.rsp;
++	memset(ct_req, 0, sizeof(struct ct_sns_pkt));
++
++	ct_req->header.revision = 0x01;
++	ct_req->header.gs_type = 0xFC;
++	ct_req->header.gs_subtype = 0x02;
++	ct_req->command = __constant_cpu_to_be16(RSNN_NN_CMD);
++	ct_req->max_rsp_size =
++	    __constant_cpu_to_be16((RSNN_NN_RSP_SIZE - 16) / 4);
++
++	/* Prepare CT arguments -- node_name, symbolic node_name, size */
++	memcpy(ct_req->req.rsnn_nn.node_name, ha->init_cb->node_name, WWN_SIZE);
++	
++	/* Prepare the Symbolic Node Name */
++	/* Board type */
++	snn = ct_req->req.rsnn_nn.sym_node_name;
++#if defined(ISP2300)
++	if (ha->pdev->device == QLA2312_DEVICE_ID) {
++		switch (ha->pdev->subsystem_device) {
++		case 0x0100:
++			strcpy(snn , "QLA2340");
++			break;
++
++		case 0x0101:
++			strcpy(snn , "QLA2342");
++			break;
++
++		case 0x0102:
++			strcpy(snn , "QLA2312");
++			break;
++
++		default:
++			strcpy(snn , "QLA2312");
++			break;
++		}
++	} else {
++		strcpy(snn ,"QLA23xx");
++	}
++#else
++	sprintf(snn, "QLA%04x", ha->pdev->device);
++#endif
++
++	/* Firmware version */
++	strcat(snn, " FW:v");
++	sprintf(version, "%d.%02d.%02d", ha->fw_major_version,
++	    ha->fw_minor_version, ha->fw_subminor_version);
++	strcat(snn, version);
++
++	/* Driver version */
++	strcat(snn, " DVR:v");
++	strcat(snn, qla2x00_version_str);
++
++	/* Calculate SNN length */
++	ct_req->req.rsnn_nn.name_len = (uint8_t)strlen(snn);
++
++	/* Update MS IOCB request */
++	ms_pkt->req_bytecount =
++	    cpu_to_le32(24 + 1 + ct_req->req.rsnn_nn.name_len);
++	ms_pkt->dseg_req_length = ms_pkt->req_bytecount;
++
++	/* Execute MS IOCB */
++	rval = qla2x00_issue_iocb(ha,
++	    ha->ms_iocb, ha->ms_iocb_dma, sizeof(ms_iocb_entry_t));
++	if (rval != QL_STATUS_SUCCESS) {
++		/*EMPTY*/
++		DEBUG2_3(printk("scsi(%ld): RSNN_NN issue IOCB failed (%d).\n",
++		    ha->host_no, rval));
++	} else if (ct_rsp->header.response !=
++	    __constant_cpu_to_be16(CT_ACCEPT_RESPONSE)) {
++		DEBUG2_3(printk("scsi(%ld): RSNN_NN failed, rejected "
++		    "request, rsnn_id_rsp:\n", ha->host_no));
++		DEBUG2_3(qla2x00_dump_buffer((uint8_t *)&ct_rsp->header,
++		    sizeof(struct ct_rsp_hdr)));
++		rval = QL_STATUS_ERROR;
++	} else {
++		DEBUG2(printk("scsi(%ld): RSNN_NN exiting normally.\n",
++		    ha->host_no));
++	}
++
++	LEAVE(__func__);
++
++	return (rval);
++}
++
++static int
++qla2x00_add_initiator_device(scsi_qla_host_t *ha, fcdev_t *device)
++{
++	int	ret;
++	fc_initiator_t	*fcinitiator;
++
++	ret = 1;
++	fcinitiator = kmalloc(sizeof(fc_initiator_t), GFP_ATOMIC);
++	if (fcinitiator != NULL) {
++		/* Setup initiator structure. */
++		memset(fcinitiator, 0, sizeof(fc_initiator_t));
++	
++		memcpy(fcinitiator->node_name, device->name, WWN_SIZE);
++		memcpy(fcinitiator->port_name, device->wwn, WWN_SIZE);
++		fcinitiator->d_id.b24 = device->d_id.b24;
++		fcinitiator->loop_id = device->loop_id;
++		list_add_tail(&fcinitiator->list, &ha->fcinitiators);
++		ret = 0;
++	} else {
++		printk(KERN_WARNING
++		    "%s(): Memory Allocation failed - FCINITIATOR\n",
++		    __func__);
++	}
++
++	return (ret);
++}
++
++/*
++ *  qla2x00_restart_queues
++ *	Restart device queues.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *
++ * Context:
++ *	Kernel/Interrupt context.
++ */
++void
++qla2x00_restart_queues(scsi_qla_host_t *ha, uint8_t flush) 
++{
++	srb_t  		*sp;
++	int		retry_q_cnt = 0;
++	int		pending_q_cnt = 0;
++	struct list_head *list, *temp;
++	unsigned long flags = 0;
++	struct list_head *hal;
++	scsi_qla_host_t *vis_ha;
++
++
++	ENTER(__func__);
++
++	clear_bit(RESTART_QUEUES_NEEDED, &ha->dpc_flags);
++
++	/*
++	 * start pending queue
++	 */
++	pending_q_cnt = ha->qthreads;
++	if (flush) {
++		spin_lock_irqsave(&ha->list_lock,flags);
++		list_for_each_safe(list, temp, &ha->pending_queue) {
++			sp = list_entry(list, srb_t, list);
++			/* 
++			 * When time expire return request back to OS as BUSY 
++			 */
++			__del_from_pending_queue(ha, sp);
++			CMD_RESULT(sp->cmd) = DID_BUS_BUSY << 16;
++			CMD_HANDLE(sp->cmd) = (unsigned char *)NULL;
++			__add_to_done_queue(ha, sp);
++		}
++		spin_unlock_irqrestore(&ha->list_lock, flags);
++	} else {
++		if (!list_empty(&ha->pending_queue))
++			qla2x00_next(ha);
++	}
++
++	/*
++	 * Clear out our retry queue
++	 */
++	if (flush) {
++		spin_lock_irqsave(&ha->list_lock, flags);
++		retry_q_cnt = ha->retry_q_cnt;
++		list_for_each_safe(list, temp, &ha->retry_queue) {
++			sp = list_entry(list, srb_t, list);
++			/* when time expire return request back to OS as BUSY */
++			__del_from_retry_queue(ha, sp);
++			CMD_RESULT(sp->cmd) = DID_BUS_BUSY << 16;
++			CMD_HANDLE(sp->cmd) = (unsigned char *) NULL;
++			__add_to_done_queue(ha, sp);
++		}
++		spin_unlock_irqrestore(&ha->list_lock, flags);
++
++		DEBUG2(printk("%s(%ld): callback %d commands.\n",
++				__func__,
++				ha->host_no,
++				retry_q_cnt);)
++	}
++
++	DEBUG2(printk("%s(%ld): active=%ld, retry=%d, pending=%d, "
++			"done=%ld, failover=%d, scsi retry=%d commands.\n",
++			__func__,
++			ha->host_no,
++			ha->actthreads,
++			ha->retry_q_cnt,
++			pending_q_cnt,
++			ha->done_q_cnt,
++			ha->failover_cnt,
++			ha->scsi_retry_q_cnt);)
++
++	if (ha->flags.failover_enabled) {
++		/* Try and start all visible adapters */
++		read_lock(&qla_hostlist_lock);
++		list_for_each(hal, &qla_hostlist) {
++			vis_ha = list_entry(hal, scsi_qla_host_t, list);
++
++			if (!list_empty(&vis_ha->pending_queue))
++				qla2x00_next(vis_ha);
++
++			DEBUG2(printk("host(%ld):Commands busy=%d "
++					"failed=%d\nin_recovery=%d "
++					"eh_active=%d\n ",
++					vis_ha->host_no,
++					vis_ha->host->host_busy,
++					vis_ha->host->host_failed,
++					vis_ha->host->in_recovery,
++					vis_ha->host->eh_active);)	
++		}
++		read_unlock(&qla_hostlist_lock);
++	}
++
++	if (!list_empty(&ha->done_queue))
++		schedule_work(&ha->run_qla_task);
++
++	LEAVE(__func__);
++}
++
++/*
++ * qla2x00_update_fc_database
++ *      This routine updates the device data in the database.
++ *
++ * Input:
++ *      ha = adapter block pointer.
++ *      device = device data pointer.
++ *
++ * Returns:
++ *      0 = success, if device found or added to database.
++ *      BIT_0 = error
++ *      BIT_1 = database was full and device was not configured.
++ */
++static uint8_t
++qla2x00_update_fc_database(scsi_qla_host_t *ha,
++    fcdev_t *device, uint8_t enable_slot_reuse) 
++{
++	int		rval;
++	uint16_t	cnt, i;
++
++	DEBUG(printk("scsi(%ld): Found device - "
++	    "nodename=%02x%02x%02x%02x%02x%02x%02x%02x, "
++	    "portname=%02x%02x%02x%02x%02x%02x%02x%02x, "
++	    "port Id=%02x%02x%02x, loop id=%04x\n",
++	    ha->host_no,
++	    device->name[0], device->name[1],
++	    device->name[2], device->name[3],
++	    device->name[4], device->name[5],
++	    device->name[6], device->name[7],
++	    device->wwn[0], device->wwn[1],
++	    device->wwn[2], device->wwn[3],
++	    device->wwn[4], device->wwn[5],
++	    device->wwn[6], device->wwn[7],
++	    device->d_id.b.domain, device->d_id.b.area, device->d_id.b.al_pa,
++	    device->loop_id));
++
++	/* Look for device in database. */
++	for (cnt = 0; cnt < MAX_FIBRE_DEVICES; cnt++) {
++		if (ha->fc_db[cnt].loop_id == PORT_UNUSED)
++			continue;
++
++		rval = 1;
++		switch (ha->binding_type) {
++		case BIND_BY_PORT_NAME:
++			rval = memcmp(device->wwn,
++			    ha->fc_db[cnt].wwn, WWN_SIZE);
++			break;
++
++		case BIND_BY_PORT_ID:
++			rval = (device->d_id.b24 != ha->fc_db[cnt].d_id.b24);
++			break;
++
++		case BIND_BY_NODE_NAME:
++			rval = memcmp(device->name,
++			    ha->fc_db[cnt].name, WWN_SIZE);
++			break;
++		}
++		if (rval)
++			continue;
++
++		DEBUG(printk("scsi(%ld): Reusing slot %d for device "
++		    "%02x%02x%02x%02x%02x%02x%02x%02x\n",
++		    ha->host_no, cnt,
++		    device->wwn[0],
++		    device->wwn[1],
++		    device->wwn[2],
++		    device->wwn[3],
++		    device->wwn[4],
++		    device->wwn[5],
++		    device->wwn[6],
++		    device->wwn[7]));
++
++		if (device->flag & DEV_PUBLIC) {
++			ha->fc_db[cnt].flag |= DEV_PUBLIC;
++		} else {
++			if (ha->fc_db[cnt].flag & DEV_PUBLIC) {
++				ha->fc_db[cnt].flag &= ~DEV_PUBLIC;
++				ha->fabricid[ha->fc_db[cnt].loop_id].in_use 
++				    = FALSE;
++			}
++		}
++
++		ha->fc_db[cnt].loop_id = device->loop_id;
++		ha->fc_db[cnt].d_id.b24 = device->d_id.b24;
++
++		/* Update volatile unbound fields for PortID binding only */
++		if (ha->binding_type == BIND_BY_PORT_ID) {
++			memcpy(ha->fc_db[cnt].name, device->name, WWN_SIZE);
++			memcpy(ha->fc_db[cnt].wwn, device->wwn, WWN_SIZE);
++		}
++
++		return (0);
++	}
++
++	/* Find a empty slot and add device into database. */
++	for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
++
++/* FlexServ Patch */
++#if QLA2XXX_HOTSWAP_ENUMERATION
++		/*
++		 * Enumerate upon the actual ID so add-single-device works
++		 */
++		if (i != device->loop_id) {
++			continue;
++		}
++#endif
++
++		if ((ha->fc_db[i].loop_id == PORT_UNUSED) ||
++			(ha->fc_db[i].loop_id == PORT_NEED_MAP)) {
++
++			DEBUG(printk("scsi(%ld): New slot %d for device "
++			    "%02x%02x%02x%02x%02x%02x%02x%02x\n",
++			    ha->host_no, i,
++			    device->wwn[0],
++			    device->wwn[1],
++			    device->wwn[2],
++			    device->wwn[3],
++			    device->wwn[4],
++			    device->wwn[5],
++			    device->wwn[6],
++			    device->wwn[7]));
++
++			memcpy(ha->fc_db[i].name, device->name, WWN_SIZE);
++ 			memcpy(ha->fc_db[i].wwn, device->wwn, WWN_SIZE);
++			ha->fc_db[i].loop_id = device->loop_id;
++			ha->fc_db[i].d_id.b24 = device->d_id.b24;
++
++			if (device->flag & DEV_PUBLIC)
++				ha->fc_db[i].flag |= DEV_PUBLIC;
++
++			ha->flags.updated_fc_db = TRUE;
++
++			return (0);
++		}
++	}
++
++	if (enable_slot_reuse) {
++		for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
++			if (ha->fc_db[i].loop_id == PORT_AVAILABLE) {
++				DEBUG(printk("scsi(%ld): Assigned slot %d "
++				    "reuse for device "
++				    "%02x%02x%02x%02x%02x%02x%02x%02x\n",
++				    ha->host_no, i, 
++				    device->wwn[0],
++				    device->wwn[1],
++				    device->wwn[2],
++				    device->wwn[3],
++				    device->wwn[4],
++				    device->wwn[5],
++				    device->wwn[6],
++				    device->wwn[7]));
++
++				memcpy(ha->fc_db[i].name,
++				    device->name, WWN_SIZE);
++				memcpy(ha->fc_db[i].wwn,
++				    device->wwn, WWN_SIZE);
++				ha->fc_db[i].loop_id = device->loop_id;
++				ha->fc_db[i].d_id.b24 = device->d_id.b24;
++
++				if (device->flag & DEV_PUBLIC)
++					ha->fc_db[i].flag |= DEV_PUBLIC;
++
++				ha->flags.updated_fc_db = TRUE;
++
++				return (0);
++			}
++		}
++	}
++
++	return(BIT_1);
++}
++
++/*
++ * qla2x00_build_fcport_list
++ *	Updates device on list.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	fcport = port structure pointer.
++ *
++ * Return:
++ *	0  - Success
++ *  BIT_0 - error
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int 
++qla2x00_build_fcport_list(scsi_qla_host_t *ha) 
++{
++// FIXME: FIX THIS C*!P!!!
++	int	rval;
++	fcdev_t		*dev;
++	int	found = 0;
++	int cnt, i;
++	struct list_head	*fcpl;
++	fc_port_t	*fcport;
++
++	ENTER(__func__);
++
++	for (cnt = 0; cnt < MAX_FIBRE_DEVICES; cnt++) {
++		dev = &ha->fc_db[cnt];
++
++		/* Skip if zero port name */
++		if (qla2x00_is_wwn_zero(dev->wwn)) {
++			continue;
++		}
++
++		DEBUG3(printk("scsi(%ld): found tgt %d in fc_db.\n",
++		    ha->host_no, cnt));
++
++		/* Check for matching device in port list. */
++		i = 0;
++		found = 0;
++		fcport = NULL;
++		list_for_each(fcpl, &ha->fcports) {
++			fcport = list_entry(fcpl, fc_port_t, list);
++
++			rval = 1;
++			switch (ha->binding_type) {
++				case BIND_BY_PORT_NAME:
++					rval = memcmp(dev->wwn,
++							fcport->port_name,
++							WWN_SIZE);
++					break;
++
++				case BIND_BY_PORT_ID:
++					rval = (dev->d_id.b24 !=
++						 fcport->d_id.b24);
++					break;
++
++				case BIND_BY_NODE_NAME:
++					rval = memcmp(dev->name,
++							fcport->node_name,
++							WWN_SIZE);
++					break;
++			}
++			if (rval) {
++				i++;
++				continue;
++			}
++
++			/*
++			 * Update volatile unbound fields for PortID binding
++			 * only
++			 */
++			if (ha->binding_type == BIND_BY_PORT_ID) {
++				memcpy(fcport->node_name, dev->name, WWN_SIZE);
++				memcpy(fcport->port_name, dev->wwn, WWN_SIZE);
++			}
++
++			DEBUG(printk("%s(): Found matching port %02x%02x%02x, "
++					"device flags= 0x%x\n",
++					__func__,
++					dev->d_id.b.domain,
++					dev->d_id.b.area,
++					dev->d_id.b.al_pa,
++					dev->flag);)
++
++			/* if device found is missing then mark it */
++			if (dev->flag & DEV_ABSENCE) {
++				DEBUG(printk("%s(): Port missing ---  "
++						"(port_name) -> "
++						"%02x%02x%02x%02x%02x"
++						"%02x%02x%02x, "
++						"loop id = 0x%04x\n",
++						__func__,
++						fcport->port_name[0],
++						fcport->port_name[1],
++						fcport->port_name[2],
++						fcport->port_name[3],
++						fcport->port_name[4],
++						fcport->port_name[5],
++						fcport->port_name[6],
++						fcport->port_name[7],
++						fcport->loop_id);)
++
++				fcport->loop_id = FC_NO_LOOP_ID;
++
++				qla2x00_mark_device_lost(ha, fcport);
++
++				found++;
++				break;
++			}
++
++			/* if device was missing but returned */
++			if (fcport->loop_id == FC_NO_LOOP_ID ||
++				!(dev->flag & DEV_PUBLIC) ||
++				atomic_read(&fcport->state) != FC_ONLINE) {
++
++				DEBUG(printk("%s(): Port returned +++  "
++						"(port_name) -> "
++						"%02x%02x%02x%02x%02x"
++						"%02x%02x%02x, "
++						"loop id = 0x%04x\n",
++						__func__,
++						fcport->port_name[0],
++						fcport->port_name[1],
++						fcport->port_name[2],
++						fcport->port_name[3],
++						fcport->port_name[4],
++						fcport->port_name[5],
++						fcport->port_name[6],
++						fcport->port_name[7],
++						fcport->loop_id);)
++
++				fcport->loop_id = dev->loop_id;
++				fcport->old_loop_id = dev->loop_id;
++				fcport->d_id.b24 = dev->d_id.b24;
++
++				if (qla2x00_update_fcport(ha, fcport, cnt)) {
++					DEBUG2(printk("%s(%ld): update_fcport "
++							"failed.\n",
++							__func__,
++							ha->host_no);)
++
++					return BIT_0;
++				}
++
++				found++;
++				break;
++			}
++
++			DEBUG(printk("%s(): Match - fcport[%d] = fc_db[%d] "
++					"(ignored) -> "
++					"%02x%02x%02x%02x%02x%02x%02x%02x, "
++					"loop id = 0x%04x\n",
++					__func__,
++					i, 
++					cnt,
++					fcport->port_name[0],
++					fcport->port_name[1],
++					fcport->port_name[2],
++					fcport->port_name[3],
++					fcport->port_name[4],
++					fcport->port_name[5],
++					fcport->port_name[6],
++					fcport->port_name[7],
++					fcport->loop_id);)
++
++			fcport->loop_id = dev->loop_id;
++			fcport->old_loop_id = dev->loop_id;
++
++			found++;
++			break;
++		}
++		if (found)
++			continue;
++
++		/* Add device to port list. */
++		DEBUG3(printk("%s(%ld): adding new device to list.\n",
++				__func__,
++				ha->host_no);)
++
++		fcport = kmalloc(sizeof(fc_port_t), GFP_ATOMIC);
++		if (fcport == NULL)
++			break;
++
++		memset(fcport, 0, sizeof(fc_port_t));
++
++		INIT_LIST_HEAD(&fcport->fcluns);
++
++		/* copy fields into fcport */
++		memcpy(fcport->port_name, dev->wwn, WWN_SIZE);
++		memcpy(fcport->node_name, dev->name, WWN_SIZE);
++
++		fcport->dev_id = cnt;
++
++		if (dev->flag & DEV_ABSENCE) {
++			DEBUG(printk("%s(): Port missing --- "
++					"(port_name) -> "
++					"%02x%02x%02x%02x"
++					"%02x%02x%02x%02x, "
++					"loop id = 0x%04x\n",
++					__func__,
++					fcport->port_name[0],
++					fcport->port_name[1],
++					fcport->port_name[2],
++					fcport->port_name[3],
++					fcport->port_name[4],
++					fcport->port_name[5],
++					fcport->port_name[6],
++					fcport->port_name[7],
++					fcport->loop_id);)
++
++ 			fcport->loop_id = FC_NO_LOOP_ID;
++ 
++ 			qla2x00_mark_device_lost(ha, fcport);
++ 		} else {
++ 			fcport->loop_id = dev->loop_id;
++ 			fcport->old_loop_id = dev->loop_id;
++ 		}
++ 
++ 		fcport->d_id.b24 = dev->d_id.b24;
++ 
++ 		DEBUG(printk("%s(): New Device +++ (port_name) -> "
++ 				"%02x%02x%02x%02x%02x%02x%02x%02x, "
++ 				"loop id = 0x%04x\n",
++ 				__func__,
++ 				fcport->port_name[0],
++ 				fcport->port_name[1],
++ 				fcport->port_name[2],
++ 				fcport->port_name[3],
++ 				fcport->port_name[4],
++ 				fcport->port_name[5],
++ 				fcport->port_name[6],
++ 				fcport->port_name[7],
++ 				fcport->loop_id);)
++ 
++ 		/* flags */
++ 		if (dev->flag & DEV_PUBLIC)
++ 			fcport->flags |= FC_FABRIC_DEVICE;
++ 
++ 		if (dev->flag & DEV_INITIATOR)
++ 			fcport->flags |= FC_INITIATOR_DEVICE;
++ 
++ 		/* Assume the device supports RLC */
++ 		fcport->flags |= FC_SUPPORT_RPT_LUNS;
++ 
++ 		if (!ha->flags.failover_enabled)
++ 			qla2x00_get_lun_mask_from_config(ha, fcport, cnt, 0);
++ 
++ 		/* Add to our list */
++ 		list_add_tail(&fcport->list, &ha->fcports);
++ 
++ 		if (qla2x00_update_fcport(ha, fcport, cnt)) {
++ 			DEBUG2(printk("%s(%ld): update_fcport failed.\n",
++ 					__func__,
++ 					ha->host_no);)
++ 
++ 			return BIT_0;
++		}
++	}
++
++	LEAVE(__func__);
++
++	return (0);
++}
++
++/*
++ * qla2x00_config_os
++ *	Setup OS target and LUN structures.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *
++ * Context:
++ *	Kernel context.
++ */
++static void
++qla2x00_config_os(scsi_qla_host_t *ha) 
++{
++	struct list_head	*fcpl;
++	fc_port_t	*fcport;
++	struct list_head	*fcll;
++	fc_lun_t	*fclun;
++	os_lun_t	*lq;
++	uint16_t	t, l;
++
++
++	DEBUG3(printk("%s(%ld): entered.\n", __func__, ha->host_no);)
++
++	list_for_each(fcpl, &ha->fcports) {
++		fcport = list_entry(fcpl, fc_port_t, list);
++
++		/* Allocate target */
++#if 0
++		if (fcport->loop_id == FC_NO_LOOP_ID)
++			continue;
++#endif
++
++		/* Bind fcport to target number. */
++		DEBUG5(printk("%s(%ld): fcport bind= %p\n",
++				__func__,
++				ha->host_no, fcport);)
++
++		if ((t = qla2x00_fcport_bind(ha, fcport)) == MAX_TARGETS)
++			continue;
++
++#if VSA
++		if ((ha->fc_db[t].flag & DEV_FLAG_VSA))
++			fcport->flags |= FC_VSA;
++#endif
++		DEBUG5(printk("%s(%ld): going to alloc lun for tgt %d. mask="
++				"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x"
++				"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x"
++				"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x"
++				".\n",
++				__func__,
++				ha->host_no, 
++				t, 
++				fcport->lun_mask.mask[0],
++				fcport->lun_mask.mask[1],
++				fcport->lun_mask.mask[2],
++				fcport->lun_mask.mask[3],
++				fcport->lun_mask.mask[4],
++				fcport->lun_mask.mask[5],
++				fcport->lun_mask.mask[6],
++				fcport->lun_mask.mask[7],
++				fcport->lun_mask.mask[8],
++				fcport->lun_mask.mask[9],
++				fcport->lun_mask.mask[10],
++				fcport->lun_mask.mask[11],
++				fcport->lun_mask.mask[12],
++				fcport->lun_mask.mask[13],
++				fcport->lun_mask.mask[14],
++				fcport->lun_mask.mask[15],
++				fcport->lun_mask.mask[16],
++				fcport->lun_mask.mask[17],
++				fcport->lun_mask.mask[18],
++				fcport->lun_mask.mask[19],
++				fcport->lun_mask.mask[20],
++				fcport->lun_mask.mask[21],
++				fcport->lun_mask.mask[22],
++				fcport->lun_mask.mask[23],
++				fcport->lun_mask.mask[24],
++				fcport->lun_mask.mask[25],
++				fcport->lun_mask.mask[26],
++				fcport->lun_mask.mask[27],
++				fcport->lun_mask.mask[28],
++				fcport->lun_mask.mask[29],
++				fcport->lun_mask.mask[30],
++				fcport->lun_mask.mask[31]);)
++
++		/* Allocate LUNs */
++		list_for_each(fcll, &fcport->fcluns) {
++			fclun = list_entry(fcll, fc_lun_t, list);
++
++			l = fclun->lun;		/* Must not exceed MAX_LUN */
++
++			/*
++			 * Always alloc LUN 0 so kernel will scan past LUN 0.
++			 */
++			if (l != 0 &&
++			    (EXT_IS_LUN_BIT_SET(&(fcport->lun_mask), l))) {
++
++				/* mask this LUN */
++				continue;
++			}
++
++			if ((lq = qla2x00_lun_alloc(ha, t, l)) == NULL)
++				continue;
++
++			lq->fclun = fclun;
++		}
++	}
++
++	DEBUG3(printk("%s(%ld): exiting normally.\n", __func__, ha->host_no);)
++}
++
++/*
++ * qla2x00_fcport_bind
++ *	Locates a target number for FC port.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	fcport = FC port structure pointer.
++ *
++ * Returns:
++ *	target number
++ *
++ * Context:
++ *	Kernel context.
++ */
++static uint16_t
++qla2x00_fcport_bind(scsi_qla_host_t *ha, fc_port_t *fcport) 
++{
++	int		rval;
++	uint16_t	t;
++	os_tgt_t	*tq;
++
++	ENTER(__func__);
++
++	/* Check for tgt already allocated for persistent binding. */
++	for (t = 0; t < MAX_TARGETS; t++) {
++		if ((tq = TGT_Q(ha, t)) == NULL)
++			continue;
++
++		rval = 0;
++		switch (ha->binding_type) {
++		case BIND_BY_PORT_NAME:
++			rval = memcmp(fcport->port_name,
++			    tq->port_name, WWN_SIZE);
++			break;
++
++		case BIND_BY_PORT_ID:
++			rval = (fcport->d_id.b24 != tq->d_id.b24);
++			break;
++
++		case BIND_BY_NODE_NAME:
++			rval = memcmp(fcport->node_name,
++			    tq->node_name, WWN_SIZE);
++			break;
++		}
++		/* Found a persistently bound match */
++		if (rval == 0)
++			break;
++	}
++
++	if (fcport->loop_id == FC_NO_LOOP_ID) {
++		DEBUG(tq = TGT_Q(ha, t);)
++		DEBUG(printk("scsi%ld: Missing target ID %02x @ %p to "
++				"loop id: %04x, port state=0x%x, "
++				"port down retry=%d\n",
++				ha->host_no,
++				t,
++				tq,
++				fcport->loop_id,
++				atomic_read(&fcport->state),
++				atomic_read(&fcport->port_down_timer));)
++		return (MAX_TARGETS);
++	}
++
++	if (t != MAX_TARGETS) {
++		tq = TGT_Q(ha, t);
++		tq->vis_port = fcport;
++
++		DEBUG(printk("scsi%ld: Assigning target ID %02x @ %p to "
++				"loop id: %04x, port state=0x%x, "
++				"port down retry=%d\n",
++				ha->host_no,
++				t,
++				tq,
++				fcport->loop_id,
++				atomic_read(&fcport->state),
++				atomic_read(&fcport->port_down_timer));)
++		return (t);
++	}
++
++	/* Check for persistent binding not yet configured. */
++	for (t = 0; t < MAX_TARGETS; t++) {
++		rval = 0;
++		switch (ha->binding_type) {
++			case BIND_BY_PORT_NAME:
++				rval = memcmp(fcport->port_name,
++						ha->fc_db[t].wwn, WWN_SIZE);
++				break;
++
++			case BIND_BY_PORT_ID:
++				rval = (fcport->d_id.b24 !=
++						ha->fc_db[t].d_id.b24);
++				break;
++
++			case BIND_BY_NODE_NAME:
++				rval = memcmp(fcport->node_name,
++						ha->fc_db[t].name, WWN_SIZE);
++				break;
++		}
++		/* Found not-yet-allocated target at t */
++		if (rval == 0)
++			break;
++	}
++
++	if (t == MAX_TARGETS) {
++		/* Check if slot at loop ID is available. */
++		t = fcport->loop_id;
++		if (TGT_Q(ha, t) != NULL) {
++			/* Locate first free target id in db for device. */
++			for (t = 0; t < MAX_TARGETS; t++) {
++				if (TGT_Q(ha, t) == NULL)
++					break;
++			}
++		}
++	}
++
++	if (t != MAX_TARGETS) {
++	       	tq = qla2x00_tgt_alloc(ha, t);
++		if (tq != NULL) {
++			memcpy(tq->port_name, fcport->port_name, WWN_SIZE);
++			tq->d_id.b24 = fcport->d_id.b24;
++			memcpy(tq->node_name, fcport->node_name, WWN_SIZE);
++		}
++		else
++			t = MAX_TARGETS;
++	}
++
++	if (t == MAX_TARGETS) {
++		DEBUG2(printk("%s(): **** FAILED ****", __func__);)
++		printk(KERN_WARNING
++			"%s(): **** FAILED ****", __func__);
++	} else {
++		if (!ha->flags.failover_enabled) {
++			/* fcport IS the visible port in non-failover mode */
++			tq = TGT_Q(ha, t);
++			tq->vis_port = fcport;
++		}
++
++		DEBUG(tq = TGT_Q(ha, t);)
++		DEBUG(printk("scsi%ld: Assigning target ID %02x @ %p to "
++				"loop id: %04x, port state=0x%x, "
++				"port down retry=%d\n",
++				ha->host_no,
++				t,
++				tq,
++				fcport->loop_id,
++				atomic_read(&fcport->state),
++				atomic_read(&fcport->port_down_timer));)
++	}
++
++	LEAVE(__func__);
++
++	return (t);
++}
++
++/*
++ * qla2x00_update_fcport
++ *	Updates device on list.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	fcport = port structure pointer.
++ *
++ * Return:
++ *	0  - Success
++ *  BIT_0 - error
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_update_fcport(scsi_qla_host_t *ha, fc_port_t *fcport, int index) 
++{
++	DEBUG4(printk("%s(): entered, loop_id = %d\n",
++			__func__,
++			fcport->loop_id);)
++
++	fcport->port_login_retry_count =
++	    ha->port_down_retry_count * PORT_RETRY_TIME;
++	atomic_set(&fcport->state, FC_ONLINE);
++	fcport->login_retry = 0;
++	fcport->ha = ha;
++	atomic_set(&fcport->port_down_timer,
++	    ha->port_down_retry_count * PORT_RETRY_TIME);
++
++	/* Do LUN discovery. */
++	return (qla2x00_lun_discovery(ha, fcport, index));
++}
++
++/*
++ * qla2x00_lun_discovery
++ *	Issue SCSI inquiry command for LUN discovery.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	fcport = FC port structure pointer.
++ *
++ * Return:
++ *	0  - Success
++ *  BIT_0 - error
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_lun_discovery(scsi_qla_host_t *ha, fc_port_t *fcport, int index) 
++{
++	inq_cmd_rsp_t	*pkt;
++	int		rval;
++	uint16_t	lun;
++	struct list_head	*fcll;
++	fc_lun_t	*fclun;
++	int		found;
++	dma_addr_t	phys_address = 0;
++	int		disconnected;
++	int		retry;
++	fcdev_t		dev;
++	int		rlc_succeeded;
++	uint16_t	comp_status;
++	uint16_t	scsi_status;
++
++	ENTER(__func__);
++
++	/* 
++	 * Immediately issue a RLC to the fcport
++	 */
++	rlc_succeeded = 0;
++	if (qla2x00_rpt_lun_discovery(ha, fcport) == QLA2X00_SUCCESS) {
++		/* 
++		 * We always need at least LUN 0 to be present in our fclun
++		 * list if RLC succeeds.
++		 */
++		qla2x00_cfg_lun(fcport, 0);
++		/* 
++		 * At least do an inquiry on LUN 0 to determine peripheral
++		 * qualifier type.
++		 */
++		rlc_succeeded = 1;
++	}
++
++	/*
++	 * RLC failed for some reason, try basic inquiries
++	 */
++	pkt = pci_alloc_consistent(ha->pdev,
++	    sizeof(inq_cmd_rsp_t), &phys_address);
++	if (pkt == NULL) {
++		printk(KERN_WARNING
++		    "scsi(%ld): Memory Allocation failed - INQ\n",
++		    ha->host_no);
++
++		ha->mem_err++;
++		return BIT_0;
++	}
++
++	for (lun = 0; lun < ha->max_probe_luns; lun++) {
++		retry = 2;
++		do {
++			memset(pkt, 0, sizeof(inq_cmd_rsp_t));
++			pkt->p.cmd.entry_type = COMMAND_A64_TYPE;
++			pkt->p.cmd.entry_count = 1;
++			pkt->p.cmd.lun = cpu_to_le16(lun);
++#if defined(EXTENDED_IDS)
++			pkt->p.cmd.target = cpu_to_le16(fcport->loop_id & 0xFF);
++#else
++			pkt->p.cmd.target = (uint8_t)fcport->loop_id;
++#endif
++			pkt->p.cmd.control_flags =
++			    __constant_cpu_to_le16(CF_READ | CF_SIMPLE_TAG);
++			pkt->p.cmd.scsi_cdb[0] = INQ_SCSI_OPCODE;
++			pkt->p.cmd.scsi_cdb[4] = INQ_DATA_SIZE;
++			pkt->p.cmd.dseg_count = __constant_cpu_to_le16(1);
++			pkt->p.cmd.timeout = __constant_cpu_to_le16(10);
++			pkt->p.cmd.byte_count =
++			    __constant_cpu_to_le32(INQ_DATA_SIZE);
++			pkt->p.cmd.dseg_0_address[0] = cpu_to_le32(
++			    LSD(phys_address + sizeof(sts_entry_t)));
++			pkt->p.cmd.dseg_0_address[1] = cpu_to_le32(
++			    MSD(phys_address + sizeof(sts_entry_t)));
++			pkt->p.cmd.dseg_0_length =
++			    __constant_cpu_to_le32(INQ_DATA_SIZE);
++
++			DEBUG5(printk("scsi(%ld): Lun Inquiry - fcport=%p,"
++			    " lun (%d)\n",
++			    ha->host_no, fcport, lun));
++
++			rval = qla2x00_issue_iocb(ha,
++			    pkt, phys_address, sizeof(inq_cmd_rsp_t));
++
++			comp_status = le16_to_cpu(pkt->p.rsp.comp_status);
++			scsi_status = le16_to_cpu(pkt->p.rsp.scsi_status);
++
++			DEBUG5(printk("scsi(%ld): lun (%d) inquiry - "
++			    "inq[0]= 0x%x, comp status 0x%x, scsi status 0x%x, "
++			    "rval=%d\n",
++			    ha->host_no,
++			    lun, pkt->inq[0],
++			    comp_status, scsi_status, rval));
++
++			/* if port not logged in then try and login */
++			if (lun == 0 && comp_status == CS_PORT_LOGGED_OUT) {
++				memset(&dev, 0, sizeof (dev));
++				dev.d_id.b24 = ha->fc_db[index].d_id.b24;
++
++				/* login and update database */
++				if (qla2x00_fabric_login(ha, &dev) == 0)
++					ha->fc_db[index].loop_id = dev.loop_id;
++			}
++		} while ((rval != QLA2X00_SUCCESS ||
++		    comp_status != CS_COMPLETE) && retry--);
++
++		if (rval != QLA2X00_SUCCESS ||
++		    comp_status != CS_COMPLETE ||
++		    (scsi_status & SS_CHECK_CONDITION)) {
++
++			DEBUG(printk("scsi(%ld): Failed lun inquiry - "
++			    "inq[0]= 0x%x, comp status 0x%x, scsi status 0x%x. "
++			    "loop_id=%d\n",
++			    ha->host_no,
++			    pkt->inq[0],
++			    comp_status, scsi_status,
++			    fcport->loop_id));
++
++			break;
++		}
++
++		disconnected = 0;
++
++		/*
++		 * We only need to issue an inquiry on LUN 0 to determine the
++		 * port's peripheral qualifier type
++		 */
++		if (rlc_succeeded == 1) {
++			if (pkt->inq[0] == 0 || pkt->inq[0] == 0xc) {
++				fcport->flags &= ~(FC_TAPE_DEVICE);
++				ha->fc_db[index].flag &= ~DEV_TAPE_DEVICE;
++			} else if (pkt->inq[0] == 1 || pkt->inq[0] == 8) {
++				fcport->flags |= FC_TAPE_DEVICE;
++				ha->fc_db[index].flag |= DEV_TAPE_DEVICE;
++			}
++
++			/* Stop the scan */
++			break;
++		}
++
++		/* inq[0] ==:
++		 *	 0x0- Hard Disk.
++		 *	 0xc- is a processor device.	
++		 *	 0x1- is a Tape Device.
++		 *       0x8- is a medium changer device
++		 * 	      which is basically a Tape device.
++		 */
++		if (pkt->inq[0] == 0 || pkt->inq[0] == 0xc) {
++			fcport->flags &= ~(FC_TAPE_DEVICE);
++			ha->fc_db[index].flag &= ~DEV_TAPE_DEVICE;
++		} else if (pkt->inq[0] == 1 || pkt->inq[0] == 8) {
++			fcport->flags |= FC_TAPE_DEVICE;
++			ha->fc_db[index].flag |= DEV_TAPE_DEVICE;
++		} else if (pkt->inq[0] == 0x20 || pkt->inq[0] == 0x7f) {
++			disconnected++;
++		} else {
++			continue;
++		}
++		
++		/* Allocate LUN if not already allocated. */
++		found = 0;
++		list_for_each(fcll, &fcport->fcluns) {
++			fclun = list_entry(fcll, fc_lun_t, list);
++
++			if (fclun->lun == lun) {
++				found++;
++				break;
++			}
++		}
++		if (found)
++			continue;
++
++		/* Add this lun to our list */
++		fclun = kmalloc(sizeof(fc_lun_t), GFP_ATOMIC);
++		if (fclun != NULL) {
++			fcport->lun_cnt++;
++			/* Setup LUN structure. */
++			memset(fclun, 0, sizeof(fc_lun_t));
++
++			fclun->fcport = fcport;
++			fclun->lun = lun;
++
++			if (disconnected)
++				fclun->flags |= FC_DISCON_LUN;
++
++			list_add_tail(&fclun->list, &fcport->fcluns);
++
++			DEBUG5(printk("scsi(%ld): Allocated fclun %p, lun=%d"
++			    "disconnected=%d\n",
++			    ha->host_no,
++			    fclun,
++			    fclun->lun,
++			    disconnected));
++		} else {
++			printk(KERN_WARNING
++			    "scsi(%ld): Memory Allocation failed - fclun\n",
++			    ha->host_no);
++
++			ha->mem_err++;
++			pci_free_consistent(ha->pdev,
++			    sizeof(inq_cmd_rsp_t), pkt, phys_address);
++
++			return BIT_0;
++		}
++
++	}
++
++	DEBUG(printk("scsi(%ld): fcport lun count=%d, fcport= %p\n",
++	    ha->host_no, fcport->lun_cnt, fcport));
++
++	pci_free_consistent(ha->pdev, sizeof(inq_cmd_rsp_t), pkt, phys_address);
++
++	LEAVE(__func__);
++
++	return 0;
++}
++
++/*
++ * qla2x00_rpt_lun_discovery
++ *	Issue SCSI report LUN command for LUN discovery.
++ *
++ * Input:
++ *	ha:		adapter state pointer.
++ *	fcport:		FC port structure pointer.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_rpt_lun_discovery(scsi_qla_host_t *ha, fc_port_t *fcport) 
++{
++	rpt_lun_cmd_rsp_t	*pkt;
++	dma_addr_t		phys_address = 0;
++	int			rval;
++	uint32_t		len, cnt;
++	uint8_t			retries;
++	uint16_t		lun;
++	uint16_t		comp_status;
++	uint16_t		scsi_status;
++
++	ENTER(__func__);
++
++	/* Assume a failed status */
++	rval = QLA2X00_FAILED;
++
++	/* No point in continuing if the device doesn't support RLC */
++	if (!(fcport->flags & FC_SUPPORT_RPT_LUNS))
++		return (rval);
++
++	pkt = pci_alloc_consistent(ha->pdev,
++	    sizeof(rpt_lun_cmd_rsp_t), &phys_address);
++	if (pkt == NULL) {
++		printk(KERN_WARNING
++			"scsi(%ld): Memory Allocation failed - RLC",
++			ha->host_no);
++
++		ha->mem_err++;
++		return BIT_0;
++	}
++
++	for (retries = 4; retries; retries--) {
++		memset(pkt, 0, sizeof(rpt_lun_cmd_rsp_t));
++		pkt->p.cmd.entry_type = COMMAND_A64_TYPE;
++		pkt->p.cmd.entry_count = 1;
++#if defined(EXTENDED_IDS)
++		pkt->p.cmd.target = cpu_to_le16(fcport->loop_id & 0xFF);
++#else
++		pkt->p.cmd.target = (uint8_t)fcport->loop_id;
++#endif
++		pkt->p.cmd.control_flags =
++		    __constant_cpu_to_le16(CF_READ | CF_SIMPLE_TAG);
++		pkt->p.cmd.scsi_cdb[0] = RPT_LUN_SCSI_OPCODE;
++		pkt->p.cmd.scsi_cdb[8] = MSB(sizeof(rpt_lun_lst_t));
++		pkt->p.cmd.scsi_cdb[9] = LSB(sizeof(rpt_lun_lst_t));
++		pkt->p.cmd.dseg_count = __constant_cpu_to_le16(1);
++		pkt->p.cmd.timeout = __constant_cpu_to_le16(10);
++		pkt->p.cmd.byte_count =
++		    __constant_cpu_to_le32(sizeof(rpt_lun_lst_t));
++		pkt->p.cmd.dseg_0_address[0] = cpu_to_le32(
++		    LSD(phys_address + sizeof(sts_entry_t)));
++		pkt->p.cmd.dseg_0_address[1] = cpu_to_le32(
++		    MSD(phys_address + sizeof(sts_entry_t)));
++		pkt->p.cmd.dseg_0_length =
++		    __constant_cpu_to_le32(sizeof(rpt_lun_lst_t));
++
++		rval = qla2x00_issue_iocb(ha,
++		    pkt, phys_address, sizeof(rpt_lun_cmd_rsp_t));
++
++		comp_status = le16_to_cpu(pkt->p.rsp.comp_status);
++		scsi_status = le16_to_cpu(pkt->p.rsp.scsi_status);
++
++		if (rval != QLA2X00_SUCCESS ||
++		    comp_status != CS_COMPLETE ||
++		    scsi_status & SS_CHECK_CONDITION) {
++
++			/* Device underrun, treat as OK. */
++			if (comp_status == CS_DATA_UNDERRUN &&
++			    scsi_status & SS_RESIDUAL_UNDER) {
++
++				rval = QLA2X00_SUCCESS;
++				break;
++			}
++
++			DEBUG(printk("scsi(%ld): RLC failed to issue iocb! "
++			    "fcport = %p rval = %x cs = %x ss = %x\n",
++			    ha->host_no,
++			    fcport,
++			    rval, comp_status, scsi_status));
++
++			rval = QLA2X00_FAILED;
++			if (scsi_status & SS_CHECK_CONDITION) {
++				DEBUG2(printk("scsi(%ld): RLC "
++				    "SS_CHECK_CONDITION Sense Data "
++				    "%02x %02x %02x %02x %02x %02x %02x %02x\n",
++				    ha->host_no,
++				    pkt->p.rsp.req_sense_data[0],
++				    pkt->p.rsp.req_sense_data[1],
++				    pkt->p.rsp.req_sense_data[2],
++				    pkt->p.rsp.req_sense_data[3],
++				    pkt->p.rsp.req_sense_data[4],
++				    pkt->p.rsp.req_sense_data[5],
++				    pkt->p.rsp.req_sense_data[6],
++				    pkt->p.rsp.req_sense_data[7]));
++				/* No point in retrying if ILLEGAL REQUEST */
++				if (pkt->p.rsp.req_sense_data[2] ==
++				    ILLEGAL_REQUEST) {
++					/* Clear RLC support flag */
++					fcport->flags &= ~(FC_SUPPORT_RPT_LUNS);
++					break;
++				}
++			}
++		} else {
++			break;
++		}
++	}
++
++	/* Test for report LUN failure. */
++	if (rval == QLA2X00_SUCCESS) {
++		/* Configure LUN list. */
++		len = be32_to_cpu(pkt->list.hdr.len);
++		len /= 8;
++		if (len == 0) {
++			rval = QLA2X00_FAILED;
++		} else {
++			for (cnt = 0; cnt < len; cnt++) {
++				lun = CHAR_TO_SHORT(pkt->list.lst[cnt].lsb,
++				    pkt->list.lst[cnt].msb.b);
++
++				DEBUG3(printk("scsi(%ld): RLC lun = (%d)\n",
++				    ha->host_no, lun));
++
++				/* We only support 0 through MAX_LUNS-1 range */
++				if (lun < MAX_LUNS) {
++					qla2x00_cfg_lun(fcport, lun);
++				}
++			}
++			rval = QLA2X00_SUCCESS;
++		}
++	} else {
++		rval = QLA2X00_FAILED;
++	}
++
++	pci_free_consistent(ha->pdev,
++	    sizeof(rpt_lun_cmd_rsp_t), pkt, phys_address);
++
++
++	LEAVE(__func__);
++
++	return (rval);
++}
++
++/*
++ * qla2x00_cfg_lun
++ *	Configures LUN into fcport LUN list.
++ *
++ * Input:
++ *	fcport:		FC port structure pointer.
++ *	lun:		LUN number.
++ *
++ * Context:
++ *	Kernel context.
++ */
++static void
++qla2x00_cfg_lun(fc_port_t *fcport, uint16_t lun) 
++{
++	int			found;
++	struct list_head	*fcll;
++	fc_lun_t		*fclun;
++
++	/* Allocate LUN if not already allocated. */
++	found = 0;
++	list_for_each(fcll, &fcport->fcluns) {
++		fclun = list_entry(fcll, fc_lun_t, list);
++
++		if (fclun->lun == lun) {
++			found++;
++			break;
++		}
++	}
++	if (!found) {
++		fclun = kmalloc(sizeof(fc_lun_t), GFP_ATOMIC);
++		if (fclun != NULL) {
++			fcport->lun_cnt++;
++			/* Setup LUN structure. */
++			memset(fclun, 0, sizeof(fc_lun_t));
++			fclun->fcport = fcport;
++			fclun->lun = lun;
++			/* How dow we assign the following */
++			/*  fclun->state = FCS_ONLINE; */
++
++			list_add_tail(&fclun->list, &fcport->fcluns);
++		} else {
++			printk(KERN_WARNING
++				"%s(): Memory Allocation failed - FCLUN\n",
++				__func__);
++		}
++	}
++}
++
++/*
++ * qla2x00_tgt_alloc
++ *	Allocate and pre-initialize target queue.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	t = SCSI target number.
++ *
++ * Returns:
++ *	NULL = failure
++ *
++ * Context:
++ *	Kernel context.
++ */
++os_tgt_t *
++qla2x00_tgt_alloc(scsi_qla_host_t *ha, uint16_t t) 
++{
++	os_tgt_t	*tq;
++
++	ENTER(__func__);
++
++	/*
++	 * If SCSI addressing OK, allocate TGT queue and lock.
++	 */
++	if (t >= MAX_TARGETS) {
++		DEBUG2(printk("%s(%ld): *** Invalid target number, exiting ***",
++				__func__,
++				ha->host_no);)
++		return (NULL);
++	}
++
++	tq = TGT_Q(ha, t);
++	if (tq == NULL) {
++		tq = kmalloc(sizeof(os_tgt_t), GFP_ATOMIC);
++		if (tq != NULL) {
++			DEBUG(printk("Alloc Target %d @ %p\n", t, tq);)
++
++			memset(tq, 0, sizeof(os_tgt_t));
++			tq->flags = TGT_TAGGED_QUEUE;
++			tq->ha = ha;
++
++			TGT_Q(ha, t) = tq;
++		}
++	}
++	if (tq != NULL) {
++		tq->port_down_retry_count = ha->port_down_retry_count;
++	} else {
++		printk(KERN_WARNING
++			"%s(%ld): Failed to allocate target\n",
++			__func__,
++			ha->host_no);
++		ha->mem_err++;
++	}
++
++	LEAVE(__func__);
++
++	return (tq);
++}
++
++/*
++ * qla2x00_tgt_free
++ *	Frees target and LUN queues.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	t = SCSI target number.
++ *
++ * Context:
++ *	Kernel context.
++ */
++void
++qla2x00_tgt_free(scsi_qla_host_t *ha, uint16_t t) 
++{
++	os_tgt_t	*tq;
++	uint16_t	l;
++
++	ENTER(__func__);
++
++	/*
++	 * If SCSI addressing OK, allocate TGT queue and lock.
++	 */
++	if (t >= MAX_TARGETS) {
++		DEBUG2(printk("%s(): **** FAILED exiting ****", __func__);)
++
++		return;
++	}
++
++	tq = TGT_Q(ha, t);
++	if (tq != NULL) {
++		TGT_Q(ha, t) = NULL;
++		DEBUG(printk("Dealloc target @ %p -- deleted\n", tq);)
++
++		/* Free LUN structures. */
++		for (l = 0; l < MAX_LUNS; l++)
++			qla2x00_lun_free(ha, t, l);
++
++		kfree(tq);
++	}
++
++	LEAVE(__func__);
++
++	return;
++}
++
++/*
++ * qla2x00_lun_alloc
++ *	Allocate and initialize LUN queue.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	t = SCSI target number.
++ *	l = LUN number.
++ *
++ * Returns:
++ *	NULL = failure
++ *
++ * Context:
++ *	Kernel context.
++ */
++os_lun_t *
++qla2x00_lun_alloc(scsi_qla_host_t *ha, uint16_t t, uint16_t l) 
++{
++	os_lun_t	*lq;
++
++	ENTER(__func__);
++
++	/*
++	 * If SCSI addressing OK, allocate LUN queue.
++	 */
++	if (t >= MAX_TARGETS || 
++		l >= MAX_LUNS || 
++		TGT_Q(ha, t) == NULL) {
++
++		DEBUG2(printk("%s(): tgt=%d, tgt_q= %p, lun=%d, "
++				"instance=%ld **** FAILED exiting ****\n",
++				__func__,
++				t,
++				TGT_Q(ha,t),
++				l,
++				ha->instance);)
++
++		return (NULL);
++	}
++
++	lq = LUN_Q(ha, t, l);
++	if (lq == NULL) {
++		lq = kmalloc(sizeof(os_lun_t), GFP_ATOMIC);
++		if (lq != NULL) {
++
++			DEBUG5(printk("Alloc Lun %d @ %p \n",l,lq);)
++
++			memset(lq, 0, sizeof (os_lun_t));
++			LUN_Q(ha, t, l) = lq;
++			/*
++			 * The following lun queue initialization code
++			 * must be duplicated in alloc_ioctl_mem function
++			 * for ioctl_lq.
++			 */
++			lq->q_state = LUN_STATE_READY;
++			spin_lock_init(&lq->q_lock);
++		} else {
++			/*EMPTY*/
++			DEBUG2(printk("%s(): Failed to allocate lun %d ***\n",
++					__func__,
++					l);)
++			printk(KERN_WARNING
++				"scsi(%ld): Memory Allocation failed - FCLUN\n",
++				ha->host_no);
++			ha->mem_err++;
++		}
++	}
++
++	if (lq == NULL) {
++		DEBUG2(printk("%s(): **** FAILED exiting ****\n", __func__);)
++	} else {
++		LEAVE(__func__);
++	}
++
++	return (lq);
++}
++
++/*
++ * qla2x00_lun_free
++ *	Frees LUN queue.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	t = SCSI target number.
++ *
++ * Context:
++ *	Kernel context.
++ */
++static void
++qla2x00_lun_free(scsi_qla_host_t *ha, uint16_t t, uint16_t l) 
++{
++	os_lun_t	*lq;
++
++	ENTER(__func__);
++
++	/*
++	 * If SCSI addressing OK, allocate TGT queue and lock.
++	 */
++	if (t >= MAX_TARGETS || l >= MAX_LUNS) {
++		DEBUG2(printk("%s(): **** FAILED exiting ****", __func__);)
++
++		return;
++	}
++
++	if (TGT_Q(ha, t) != NULL && 
++		(lq = LUN_Q(ha, t, l)) != NULL) {
++
++		LUN_Q(ha, t, l) = NULL;
++		kfree(lq);
++
++		DEBUG3(printk("Dealloc lun @ %p -- deleted\n", lq);)
++	}
++
++	LEAVE(__func__);
++
++	return;
++}
++
++
++/*
++ * qla2x00_get_lun_mask_from_config
++ *      Get lun mask from the configuration parameters.
++ *      Bit order is little endian.
++ *
++ * Input:
++ * ha  -- Host adapter
++ * tgt  -- target/device number
++ * port -- pointer to port
++ */
++static void
++qla2x00_get_lun_mask_from_config(scsi_qla_host_t *ha, 
++		fc_port_t *port, uint16_t tgt, uint16_t dev_no) 
++{
++	char		propbuf[60]; /* size of search string */
++	int		rval, lun, l;
++	lun_bit_mask_t	lun_mask, *mask_ptr = &lun_mask;
++
++	/* Get "target-N-device-N-lun-mask" as a 256 bit lun_mask*/
++	sprintf(propbuf, "scsi-qla%ld-tgt-%d-di-%d-lun-disabled",
++			ha->instance, tgt, dev_no);
++
++	rval = qla2x00_get_prop_xstr(ha, propbuf, (uint8_t *)&lun_mask,
++			sizeof(lun_bit_mask_t));
++	if (rval != -1 && 
++		(rval == sizeof(lun_bit_mask_t))) {
++
++		DEBUG3(printk("%s(%ld): lun mask for port %p from file:\n",
++				__func__,
++				ha->host_no, 
++				port);)
++		DEBUG3(qla2x00_dump_buffer((uint8_t *)&port->lun_mask,
++					sizeof(lun_bit_mask_t));)
++
++		for (lun = 8 * sizeof(lun_bit_mask_t) - 1, l = 0; 
++			lun >= 0; 
++			lun--, l++) {
++
++			if (EXT_IS_LUN_BIT_SET(mask_ptr, lun))
++				EXT_SET_LUN_BIT((&port->lun_mask),l);
++			else
++				EXT_CLR_LUN_BIT((&port->lun_mask),l);
++		}
++
++		DEBUG3(printk("%s(%ld): returning lun mask for port "
++				"%02x%02x%02x%02x%02x%02x%02x%02x:\n",
++				__func__,
++				ha->host_no, 
++				port->port_name[0], port->port_name[1],
++				port->port_name[2], port->port_name[3],
++				port->port_name[4], port->port_name[5],
++				port->port_name[6], port->port_name[7]);)
++		DEBUG3(qla2x00_dump_buffer((uint8_t *)&port->lun_mask,
++				sizeof(lun_bit_mask_t));)
++	}
++}
++
++/*
++ * qla2x00_bstr_to_hex
++ *	Convert hex byte string to number.
++ *
++ * Input:
++ *	s = byte string pointer.
++ *	bp = byte pointer for number.
++ *	size = number of bytes.
++ *
++ * Context:
++ *	Kernel/Interrupt context.
++ */
++static int
++qla2x00_bstr_to_hex(char *s, uint8_t *bp, int size) 
++{
++	int		cnt;
++	uint8_t		n;
++
++	ENTER(__func__);
++
++	for (cnt = 0; *s != '\0' && cnt / 2 < size; cnt++) {
++		if (*s >= 'A' && *s <= 'F') {
++			n = (*s++ - 'A') + 10;
++		} else if (*s >= 'a' && *s <= 'f') {
++			n = (*s++ - 'a') + 10;
++		} else if (*s >= '0' && *s <= '9') {
++			n = *s++ - '0';
++		} else {
++			cnt = 0;
++			break;
++		}
++
++		if (cnt & BIT_0)
++			*bp++ |= n;
++		else
++			*bp = n << 4;
++	}
++	/* fixme(dg) Need to swap data little endian */
++
++	LEAVE(__func__);
++
++	return (cnt / 2);
++}
++
++/*
++ * qla2x00_get_prop_xstr
++ *      Get a string property value for the specified property name and
++ *      convert from the property string found in the configuration file,
++ *      which are ASCII characters representing nibbles, 2 characters represent
++ *      the hexdecimal value for a byte in the byte array.
++ *      The byte array is initialized to zero.
++ *      The resulting converted value is in big endian format (MSB at byte0).
++ *
++ * Input:
++ *      ha = adapter state pointer.
++ *      propname = property name pointer.
++ *      propval  = pointer where to store converted property val.
++ *      size = max or expected size of 'propval' array.
++ *
++ * Returns:
++ *      0 = empty value string or invalid character in string
++ *      >0 = count of characters converted
++ *      -1 = property not found
++ *
++ * Context:
++ *      Kernel context.
++ */
++int
++qla2x00_get_prop_xstr(scsi_qla_host_t *ha, 
++		char *propname, uint8_t *propval, int size) 
++{
++	char		*propstr;
++	int		rval = -1;
++	static char	buf[LINESIZE];
++
++	ENTER(__func__);
++
++	/* Get the requested property string */
++	rval = qla2x00_find_propname(ha, propname, buf, ha->cmdline, size*2);
++	DEBUG3(printk("%s(): Ret rval from find propname = %d\n",
++			__func__,
++			rval);)
++
++	propstr = &buf[0];
++	if (*propstr == '=')
++		propstr++;   /* ignore equal sign */
++
++	if (rval == 0) {  /* not found */
++		LEAVE(__func__);
++		return (-1);
++	}
++
++	rval = qla2x00_bstr_to_hex(propstr, (uint8_t *)propval, size);
++	if (rval == 0) {
++		/* Invalid character in value string */
++		printk(KERN_INFO
++			"%s(): %s Invalid hex string for property\n",
++			__func__,
++			propname);
++		printk(KERN_INFO
++			" Invalid string - %s\n", 
++			propstr);
++	}
++
++	LEAVE(__func__);
++
++	return (rval);
++}
++
++/*
++ * qla2x00_find_propname
++ *	Get property in database.
++ *
++ * Input:
++ *	ha = adapter structure pointer.
++ *      db = pointer to database
++ *      propstr = pointer to dest array for string
++ *	propname = name of property to search for.
++ *	siz = size of property
++ *
++ * Returns:
++ *	0 = no property
++ *      size = index of property
++ *
++ * Context:
++ *	Kernel context.
++ */
++static uint8_t
++qla2x00_find_propname(scsi_qla_host_t *ha, 
++			char *propname, char *propstr, 
++			char *db, int siz) 
++{
++	char	*cp;
++
++	/* find the specified string */
++	if (db) {
++		/* find the property name */
++		if ((cp = strstr(db,propname)) != NULL) {
++			while ((*cp)  && *cp != '=')
++				cp++;
++			if (*cp) {
++				strncpy(propstr, cp, siz+1);
++				propstr[siz+1] = '\0';
++				DEBUG(printk("qla2x00_find_propname: found "
++						"property = {%s}\n",
++						propstr);)
++				return (siz);   /* match */
++			}
++		}
++	}
++
++	return (0);
++}
++
++
++/*
++ * qla2x00_get_prop_16chars
++ *	Get an 8-byte property value for the specified property name by
++ *      converting from the property string found in the configuration file.
++ *      The resulting converted value is in big endian format (MSB at byte0).
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	propname = property name pointer.
++ *	propval  = pointer to location for the converted property val.
++ *      db = pointer to database
++ *
++ * Returns:
++ *	0 = value returned successfully.
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_get_prop_16chars(scsi_qla_host_t *ha,
++				char *propname, char *propval, char *db) 
++{
++	char		*propstr;
++	int		i, k;
++	int		rval;
++	uint8_t		nval;
++	uint8_t		*pchar;
++	uint8_t		*ret_byte;
++	uint8_t		*tmp_byte;
++	uint8_t		*retval = (uint8_t*)propval;
++	uint8_t		tmpval[8] = {0, 0, 0, 0, 0, 0, 0, 0};
++	uint16_t	max_byte_cnt = 8; /* 16 chars = 8 bytes */
++	uint16_t	max_strlen = 16;
++	static char	buf[LINESIZE];
++
++	rval = qla2x00_find_propname(ha, propname, buf, db, max_strlen);
++
++	propstr = &buf[0];
++	if (*propstr == '=')
++		propstr++;   /* ignore equal sign */
++
++	if (rval == 0) {
++		return (1);
++	}
++
++	/* Convert string to numbers. */
++	pchar = (uint8_t *)propstr;
++	tmp_byte = (uint8_t *)tmpval;
++
++	rval = 0;
++	for (i = 0; i < max_strlen; i++) {
++		/*
++		 * Check for invalid character, two at a time,
++		 * then convert them starting with first byte.
++		 */
++
++		if ((pchar[i] >= '0') && (pchar[i] <= '9')) {
++			nval = pchar[i] - '0';
++		} else if ((pchar[i] >= 'A') && (pchar[i] <= 'F')) {
++			nval = pchar[i] - 'A' + 10;
++		} else if ((pchar[i] >= 'a') && (pchar[i] <= 'f')) {
++			nval = pchar[i] - 'a' + 10;
++		} else {
++			/* invalid character */
++			rval = 1;
++			break;
++		}
++
++		if (i & BIT_0) {
++			*tmp_byte = *tmp_byte | nval;
++			tmp_byte++;
++		} else {
++			*tmp_byte = *tmp_byte | nval << 4;
++		}
++	}
++
++	if (rval != 0) {
++		/* Encountered invalid character. */
++		return (rval);
++	}
++
++	/* Copy over the converted value. */
++	ret_byte = retval;
++	tmp_byte = tmpval;
++
++	i = max_byte_cnt;
++	k = 0;
++	while (i--) {
++		*ret_byte++ = *tmp_byte++;
++	}
++
++	/* big endian retval[0]; */
++	return (0);
++}
++
++/*
++* qla2x00_get_properties
++*	Find all properties for the specified adapeter in
++*      command line.
++*
++* Input:
++*	ha = adapter block pointer.
++*	cmdline = pointer to command line string
++*
++* Context:
++*	Kernel context.
++*/
++static void
++qla2x00_get_properties(scsi_qla_host_t *ha, char *cmdline) 
++{
++	static char	propbuf[LINESIZE];
++	uint8_t		tmp_name[8];
++
++	/* Adapter FC node names. */
++	sprintf(propbuf, "scsi-qla%d-adapter-node", (int) ha->instance);
++	qla2x00_get_prop_16chars (ha, 
++			propbuf,
++			(uint8_t *)(&ha->init_cb->node_name), 
++			cmdline);
++
++	sprintf(propbuf, "scsi-qla%d-adapter-port", (int) ha->instance);
++
++	/* DG 04/07 check portname of adapter */
++	qla2x00_get_prop_16chars (ha, 
++			propbuf,
++			tmp_name, 
++			cmdline);
++	if (memcmp(ha->init_cb->port_name, tmp_name, 8) != 0) {
++		/*
++		 * Adapter port name is WWN, and cannot be changed.
++		 * Inform users of the mismatch, then just continue driver
++		 * loading using the original adapter port name in NVRAM.
++		 */
++		printk(KERN_WARNING
++			"qla2x00: qla%ld found mismatch in "
++			"adapter port names.\n",
++			ha->instance);
++		printk(KERN_INFO
++			"       qla%ld port name found in NVRAM "
++			"-> %02x%02x%02x%02x%02x%02x%02x%02x\n",
++			ha->instance,
++			ha->init_cb->port_name[0],
++			ha->init_cb->port_name[1],
++			ha->init_cb->port_name[2],
++			ha->init_cb->port_name[3],
++			ha->init_cb->port_name[4],
++			ha->init_cb->port_name[5],
++			ha->init_cb->port_name[6],
++			ha->init_cb->port_name[7]);
++		printk(KERN_INFO
++			"      qla%ld port name found on command line "
++			"-> %02x%02x%02x%02x%02x%02x%02x%02x\n",
++			ha->instance,
++			tmp_name[0],
++			tmp_name[1],
++			tmp_name[2],
++			tmp_name[3],
++			tmp_name[4],
++			tmp_name[5],
++			tmp_name[6],
++			tmp_name[7]);
++		printk(KERN_INFO
++			"      Using port name from NVRAM.\n");
++	}
++
++	qla2x00_cfg_persistent_binding(ha);
++}
++
++/*
++ * qla2x00_cfg_persistent_binding
++ *	Get driver configuration file target persistent binding entries.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *
++ * Context:
++ *	Kernel context.
++ */
++static void
++qla2x00_cfg_persistent_binding(scsi_qla_host_t *ha) 
++{
++	int		rval;
++	static char	propbuf[LINESIZE];
++	uint16_t	tgt;
++	uint16_t	dev_no = 0; /* not used */
++	char		*cmdline = ha->cmdline;
++	port_id_t	d_id, *pd_id;
++	uint8_t		portid[3];
++	uint8_t		node_name[8], *pnn;
++	uint8_t		port_name[8], *ppn;
++	os_tgt_t	*tq;
++
++	ENTER(__func__);
++
++	/* FC name for devices */
++	for (tgt = 0; tgt < MAX_FIBRE_DEVICES; tgt++) {
++
++		/*
++		 * Retrive as much information as possible (PN/PID/NN).
++		 *
++		 * Based on binding type, skip incomplete entries.
++		 */
++		ppn = port_name;
++		sprintf(propbuf, "scsi-qla%d-tgt-%d-di-%d-port",
++				(int)ha->instance, tgt, dev_no);
++		rval = qla2x00_get_prop_16chars(ha, propbuf, ppn, cmdline);
++		if (rval != 0)
++			ppn = NULL;
++		if (ha->binding_type == BIND_BY_PORT_NAME && rval != 0)
++			continue;
++
++		pd_id = &d_id;
++		sprintf(propbuf, "scsi-qla%d-tgt-%d-di-%d-pid",
++				(int)ha->instance, tgt, dev_no);
++		rval = qla2x00_get_prop_xstr(ha,
++				propbuf, portid, sizeof(portid));
++		if (rval == -1 || rval != sizeof(portid))
++			pd_id = NULL;
++		if (ha->binding_type == BIND_BY_PORT_ID &&
++			(rval == -1 || rval != sizeof(portid)))
++			continue;
++
++		pnn = node_name;
++		sprintf(propbuf, "scsi-qla%d-tgt-%d-di-%d-node",
++				(int)ha->instance, tgt, dev_no);
++		rval = qla2x00_get_prop_16chars(ha, propbuf, pnn, cmdline);
++		if (rval != 0)
++			pnn = NULL;
++		if (ha->binding_type == BIND_BY_NODE_NAME && rval != 0)
++			continue;
++
++		tq = qla2x00_tgt_alloc(ha, tgt);
++		if (tq == NULL) {
++			printk(KERN_WARNING
++				"%s(): Unable to allocate memory for target\n",
++				__func__);
++			continue;
++		}
++
++		ha->fc_db[tgt].loop_id = PORT_AVAILABLE;
++		ha->fc_db[tgt].flag = 0;  /* v2.19.05b3 */
++		ha->fc_db[tgt].flag |= DEV_CONFIGURED;
++
++		if (ppn != NULL) {
++			memcpy(tq->port_name, ppn, WWN_SIZE);
++			memcpy(ha->fc_db[tgt].wwn, ppn, WWN_SIZE);
++		}
++		if (pd_id != NULL) {
++			/*
++			 * The portid is read in big-endian format, convert 
++			 * before updating information
++			 */
++			pd_id->r.d_id[0] = portid[2];
++			pd_id->r.d_id[1] = portid[1];
++			pd_id->r.d_id[2] = portid[0];
++			tq->d_id.b24 = pd_id->b24;
++			ha->fc_db[tgt].d_id.b24 = pd_id->b24;
++		}
++		if (pnn != NULL) {
++			memcpy(tq->node_name, pnn, WWN_SIZE);
++			memcpy(ha->fc_db[tgt].name, pnn, WWN_SIZE);
++		}
++
++		DEBUG(printk("Target %03d - configured by user: ",tgt);)
++		switch (ha->binding_type) {
++			case BIND_BY_PORT_NAME:
++				DEBUG(printk("tgt-%03d="
++					"%02x%02x%02x%02x%02x%02x%02x%02x\n",
++					tgt,
++					ppn[0], ppn[1], ppn[2], ppn[3],
++					ppn[4], ppn[5], ppn[6], ppn[7]);)
++				break;
++
++			case BIND_BY_PORT_ID:
++				DEBUG(printk("tgt-%03d=%02x%02x%02x\n",
++					tgt,
++					pd_id->b.domain,
++					pd_id->b.area,
++					pd_id->b.al_pa));
++				break;
++
++			case BIND_BY_NODE_NAME:
++				DEBUG(printk("tgt-%03d="
++					"%02x%02x%02x%02x%02x%02x%02x%02x\n",
++					tgt,
++					pnn[0], pnn[1], pnn[2], pnn[3],
++					pnn[4], pnn[5], pnn[6], pnn[7]);)
++				break;
++		}
++		/* look for VSA */
++#if VSA
++		qla2x00_get_vsa_opt_from_config(ha, tgt, dev_no);
++#endif
++
++	}
++
++	LEAVE(__func__);
++}
++
++/*
++*  qla2x00_abort_isp
++*      Resets ISP and aborts all outstanding commands.
++*
++* Input:
++*      ha           = adapter block pointer.
++*
++* Returns:
++*      0 = success
++*/
++uint8_t
++qla2x00_abort_isp(scsi_qla_host_t *ha, uint8_t flag)
++{
++	unsigned long flags = 0;
++	uint16_t       cnt;
++	srb_t          *sp;
++	uint8_t        status = 0;
++
++	ENTER("qla2x00_abort_isp");
++
++	if (ha->flags.online) {
++		ha->flags.online = FALSE;
++		clear_bit(COMMAND_WAIT_NEEDED, &ha->dpc_flags);
++		clear_bit(COMMAND_WAIT_ACTIVE, &ha->dpc_flags);
++		clear_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
++		qla2x00_stats.ispAbort++;
++		ha->total_isp_aborts++;  /* used by ioctl */
++		ha->sns_retry_cnt = 0;
++
++		printk(KERN_INFO
++		    "scsi(%ld): Performing ISP error recovery - ha= %p.\n",
++		    ha->host_no, ha);
++		qla2x00_reset_chip(ha);
++
++		if (ha->loop_state != LOOP_DOWN) {
++			ha->loop_state = LOOP_DOWN;
++			atomic_set(&ha->loop_down_timer, LOOP_DOWN_TIME);
++			qla2x00_mark_all_devices_lost(ha);
++		}
++
++#if defined(FC_IP_SUPPORT)
++		/* Return all IP send packets */
++		for (cnt = 0; cnt < MAX_SEND_PACKETS; cnt++) {
++			if (ha->active_scb_q[cnt] != NULL) {
++				/* Via IP callback */
++				(*ha->send_completion_routine)
++					(ha->active_scb_q[cnt]);
++
++				ha->active_scb_q[cnt] = NULL;
++			}
++		}
++#endif
++
++		spin_lock_irqsave(&ha->hardware_lock, flags);
++		/* Requeue all commands in outstanding command list. */
++		for (cnt = 1; cnt < MAX_OUTSTANDING_COMMANDS; cnt++) {
++			sp = ha->outstanding_cmds[cnt];
++			if (sp) {
++				ha->outstanding_cmds[cnt] = 0;
++				if( ha->actthreads )
++					ha->actthreads--;
++				sp->lun_queue->out_cnt--;
++#if defined(IOCB_THROLLE_USAGE)
++				ha->iocb_cnt -= sp->iocb_cnt;
++#endif
++				
++				sp->flags = 0;
++
++				/* 
++				 * We need to send the command back to OS now 
++				 * if returning RESET status for kernel's 
++				 * error handling.
++				 */
++				if (flag == 0) {
++					CMD_RESULT(sp->cmd) = DID_BUS_BUSY << 16;
++				} else {
++					CMD_RESULT(sp->cmd) = DID_RESET << 16;
++				}
++				CMD_HANDLE(sp->cmd) = (unsigned char *) NULL;
++				add_to_done_queue(ha, sp);
++			}
++		}
++
++		spin_unlock_irqrestore(&ha->hardware_lock, flags);
++
++#if defined(ISP2100)
++		qla2100_nvram_config(ha);
++#else
++		qla2x00_nvram_config(ha);
++#endif
++
++		if (!qla2x00_restart_isp(ha)) {
++			clear_bit(RESET_MARKER_NEEDED, &ha->dpc_flags);
++
++			if (!atomic_read(&ha->loop_down_timer)) {
++				/*
++				 * Issue marker command only when we are going
++				 * to start the I/O .
++				 */
++				ha->marker_needed = 1;
++			}
++
++			ha->flags.online = TRUE;
++
++#if defined(FC_IP_SUPPORT)
++			/* Reenable IP support */
++			if (ha->flags.enable_ip) {
++				set_bit(REGISTER_FC4_NEEDED, &ha->dpc_flags);
++				qla2x00_ip_initialize(ha);
++			}
++#endif
++			/* Enable ISP interrupts. */
++			qla2x00_enable_intrs(ha);
++
++			/* v2.19.5b6 Return all commands */
++			qla2x00_abort_queues(ha, TRUE);
++
++			/* Restart queues that may have been stopped. */
++			qla2x00_restart_queues(ha,TRUE);
++			ha->isp_abort_cnt = 0; 
++			clear_bit(ISP_ABORT_RETRY, &ha->dpc_flags);
++		} else {	/* failed the ISP abort */
++			ha->flags.online = TRUE;
++			if( test_bit(ISP_ABORT_RETRY, &ha->dpc_flags) ){
++				if( ha->isp_abort_cnt == 0 ){
++					printk(KERN_WARNING
++					"qla2x00(%ld): ISP error recovery failed - "
++					"board disabled\n",ha->host_no);
++					/* 
++					 * The next call disables the board
++					 * completely.
++					 */
++					qla2x00_reset_adapter(ha);
++					qla2x00_abort_queues(ha, FALSE);
++					ha->flags.online = TRUE;
++					clear_bit(ISP_ABORT_RETRY, &ha->dpc_flags);
++					status = 0;
++				} else { /* schedule another ISP abort */
++					ha->isp_abort_cnt--;
++					DEBUG(printk("qla%ld: ISP abort - retry remainning %d\n",
++					ha->host_no, 
++					ha->isp_abort_cnt);)
++					status = 1;
++				}
++			} else {
++				ha->isp_abort_cnt = MAX_RETRIES_OF_ISP_ABORT;
++				DEBUG(printk( "qla2x00(%ld): ISP error recovery - "
++				"retrying (%d) more times\n",ha->host_no,
++				ha->isp_abort_cnt);)
++				set_bit(ISP_ABORT_RETRY, &ha->dpc_flags);
++				status = 1;
++			}
++		}
++		       
++	}
++
++	if (status) {
++		printk(KERN_INFO
++			"qla2x00_abort_isp(%ld): **** FAILED ****\n",
++			ha->host_no);
++	} else {
++		DEBUG(printk(KERN_INFO
++				"qla2x00_abort_isp(%ld): exiting.\n",
++				ha->host_no);)
++	}
++
++	return(status);
++}
++
++/*
++*  qla2x00_restart_isp
++*      restarts the ISP after a reset
++*
++* Input:
++*      ha = adapter block pointer.
++*
++* Returns:
++*      0 = success
++*/
++static int
++qla2x00_restart_isp(scsi_qla_host_t *ha)
++{
++	uint8_t		status = 0;
++#if defined(ISP2300)
++	device_reg_t	*reg;
++	unsigned long	flags = 0;
++#endif
++
++	/* If firmware needs to be loaded */
++	if (qla2x00_isp_firmware(ha)) {
++		ha->flags.online = FALSE;
++		if (!(status = qla2x00_chip_diag(ha))) {
++#if defined(ISP2300)
++			reg = ha->iobase;
++			spin_lock_irqsave(&ha->hardware_lock, flags);
++			/* Disable SRAM, Instruction RAM and GP RAM parity. */
++			WRT_REG_WORD(&reg->hccr, (HCCR_ENABLE_PARITY + 0x0));
++			spin_unlock_irqrestore(&ha->hardware_lock, flags);
++#endif
++			status = qla2x00_setup_chip(ha);
++#if defined(ISP2300)
++			spin_lock_irqsave(&ha->hardware_lock, flags);
++ 
++ 			/* Enable proper parity */
++ 			if (ha->pdev->device == QLA2312_DEVICE_ID ||
++			    ha->pdev->device == QLA2322_DEVICE_ID)
++ 				/* SRAM, Instruction RAM and GP RAM parity */
++ 				WRT_REG_WORD(&reg->hccr,
++ 				    (HCCR_ENABLE_PARITY + 0x7));
++ 			else
++ 				/* SRAM parity */
++ 				WRT_REG_WORD(&reg->hccr,
++ 				    (HCCR_ENABLE_PARITY + 0x1));
++
++			spin_unlock_irqrestore(&ha->hardware_lock, flags);
++#endif
++		}
++	}
++	if (!status && !(status = qla2x00_init_rings(ha))) {
++		clear_bit(RESET_MARKER_NEEDED, &ha->dpc_flags);
++		clear_bit(COMMAND_WAIT_NEEDED, &ha->dpc_flags);
++		if (!(status = qla2x00_fw_ready(ha))) {
++			DEBUG(printk("%s(): Start configure loop, "
++					"status = %d\n",
++					__func__,
++					status);)
++			ha->flags.online = TRUE;
++			do {
++				clear_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags);
++				qla2x00_configure_loop(ha);
++			} while (!atomic_read(&ha->loop_down_timer) &&
++				!(test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags)) &&
++				(test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags)));
++		}
++
++		/* if no cable then assume it's good */
++		if ((ha->device_flags & DFLG_NO_CABLE)) 
++			status = 0;
++
++		DEBUG(printk("%s(): Configure loop done, status = 0x%x\n",
++				__func__,
++				status);)
++	}
++	return (status);
++}
++
++/*
++* qla2x00_reset_adapter
++*      Reset adapter.
++*
++* Input:
++*      ha = adapter block pointer.
++*/
++static void
++qla2x00_reset_adapter(scsi_qla_host_t *ha)
++{
++	unsigned long flags = 0;
++	device_reg_t *reg = ha->iobase;
++
++	ENTER(__func__);
++
++	ha->flags.online = FALSE;
++	qla2x00_disable_intrs(ha);
++	/* Reset RISC processor. */
++	spin_lock_irqsave(&ha->hardware_lock, flags);
++	WRT_REG_WORD(&reg->hccr, HCCR_RESET_RISC);
++	WRT_REG_WORD(&reg->hccr, HCCR_RELEASE_RISC);
++	spin_unlock_irqrestore(&ha->hardware_lock, flags);
++
++	LEAVE(__func__);
++}
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qla_inline.h	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,375 @@
++/*
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ */
++
++
++static __inline__ uint16_t qla2x00_debounce_register(volatile uint16_t *);
++/*
++ * qla2x00_debounce_register
++ *      Debounce register.
++ *
++ * Input:
++ *      port = register address.
++ *
++ * Returns:
++ *      register value.
++ */
++static __inline__ uint16_t
++qla2x00_debounce_register(volatile uint16_t *addr) 
++{
++	volatile uint16_t first;
++	volatile uint16_t second;
++
++	do {
++		first = RD_REG_WORD(addr);
++		barrier();
++		second = RD_REG_WORD(addr);
++	} while (first != second);
++
++	return (first);
++}
++
++static __inline__ void qla2x00_config_dma_addressing(scsi_qla_host_t *ha);
++
++/**
++ * qla2x00_config_dma_addressing() - Configure OS DMA addressing method.
++ * @ha: HA context
++ *
++ * At exit, the @ha's flags.enable_64bit_addressing set to indicated
++ * supported addressing method.
++ */
++static __inline__ void
++qla2x00_config_dma_addressing(scsi_qla_host_t *ha)
++{
++	/*
++	 * Given the two variants pci_set_dma_mask(), allow the compiler to
++	 * assist in setting the proper dma mask.
++	 */
++	if (sizeof(dma_addr_t) > 4) {
++		ha->flags.enable_64bit_addressing = 1;
++		/* Update our PCI device dma_mask for full 64 bits */
++		if (pci_set_dma_mask(ha->pdev, 0xffffffffffffffffULL)) {
++			printk("scsi(%ld): Failed to set 64 bit PCI DMA mask, "
++			    "using 32 bits\n",
++			    ha->host_no);
++			ha->flags.enable_64bit_addressing = 0;
++			pci_set_dma_mask(ha->pdev, 0xffffffff);
++		}
++	}
++	else {
++		ha->flags.enable_64bit_addressing = 0;
++		pci_set_dma_mask(ha->pdev, 0xffffffff);
++	}
++	printk(KERN_INFO
++	    "scsi(%ld): %d Bit DMA Addressing Enabled.\n",
++	    ha->host_no,
++	    (ha->flags.enable_64bit_addressing ? 64 : 32));
++}
++
++
++static __inline__ int qla2x00_normalize_dma_addr(
++    dma_addr_t *e_addr,  uint32_t *e_len,
++    dma_addr_t *ne_addr, uint32_t *ne_len);
++
++/**
++ * qla2x00_normalize_dma_addr() - Normalize an DMA address.
++ * @e_addr: Raw DMA address
++ * @e_len: Raw DMA length
++ * @ne_addr: Normalized second DMA address
++ * @ne_len: Normalized second DMA length
++ *
++ * If the address does not span a 4GB page boundary, the contents of @ne_addr
++ * and @ne_len are undefined.  @e_len is updated to reflect a normalization.
++ *
++ * Example:
++ *
++ * 	ffffabc0ffffeeee	(e_addr) start of DMA address
++ * 	0000000020000000	(e_len)  length of DMA transfer
++ *	ffffabc11fffeeed	end of DMA transfer
++ *
++ * Is the 4GB boundary crossed?
++ *
++ * 	ffffabc0ffffeeee	(e_addr)
++ *	ffffabc11fffeeed	(e_addr + e_len - 1)
++ *	00000001e0000003	((e_addr ^ (e_addr + e_len - 1))
++ *	0000000100000000	((e_addr ^ (e_addr + e_len - 1)) & ~(0xffffffff)
++ *
++ * Compute start of second DMA segment:
++ *
++ * 	ffffabc0ffffeeee	(e_addr)
++ *	ffffabc1ffffeeee	(0x100000000 + e_addr)
++ *	ffffabc100000000	(0x100000000 + e_addr) & ~(0xffffffff)
++ *	ffffabc100000000	(ne_addr)
++ *	
++ * Compute length of second DMA segment:
++ *
++ *	00000000ffffeeee	(e_addr & 0xffffffff)
++ *	0000000000001112	(0x100000000 - (e_addr & 0xffffffff))
++ *	000000001fffeeee	(e_len - (0x100000000 - (e_addr & 0xffffffff))
++ *	000000001fffeeee	(ne_len)
++ *
++ * Adjust length of first DMA segment
++ *
++ * 	0000000020000000	(e_len)
++ *	0000000000001112	(e_len - ne_len)
++ *	0000000000001112	(e_len)
++ *
++ * Returns non-zero if the specified address was normalized, else zero.
++ */
++static __inline__ int
++qla2x00_normalize_dma_addr(
++    dma_addr_t *e_addr,  uint32_t *e_len,
++    dma_addr_t *ne_addr, uint32_t *ne_len)
++{
++	int normalized;
++
++	normalized = 0;
++	if ((*e_addr ^ (*e_addr + *e_len - 1)) & ~(0xFFFFFFFFULL)) {
++		/* Compute normalized crossed address and len */
++		*ne_addr = (0x100000000ULL + *e_addr) & ~(0xFFFFFFFFULL);
++		*ne_len = *e_len - (0x100000000ULL - (*e_addr & 0xFFFFFFFFULL));
++		*e_len -= *ne_len;
++
++		normalized++;
++	}
++	return (normalized);
++}
++
++static __inline__ void qla2x00_poll(scsi_qla_host_t *);
++static inline void 
++qla2x00_poll(scsi_qla_host_t *ha)
++{
++	qla2x00_intr_handler(0, ha, NULL);
++}
++
++
++static __inline__ void qla2x00_enable_intrs(scsi_qla_host_t *);
++static __inline__ void qla2x00_disable_intrs(scsi_qla_host_t *);
++
++static inline void 
++qla2x00_enable_intrs(scsi_qla_host_t *ha)
++{
++	unsigned long flags = 0;
++	device_reg_t *reg;
++
++	spin_lock_irqsave(&ha->hardware_lock, flags);
++	reg = ha->iobase;
++	ha->interrupts_on = 1;
++	/* enable risc and host interrupts */
++	WRT_REG_WORD(&reg->ictrl, ICR_EN_INT | ICR_EN_RISC);
++	CACHE_FLUSH(&reg->ictrl);
++	spin_unlock_irqrestore(&ha->hardware_lock, flags);
++
++}
++
++static inline void 
++qla2x00_disable_intrs(scsi_qla_host_t *ha)
++{
++	unsigned long flags = 0;
++	device_reg_t *reg;
++
++	spin_lock_irqsave(&ha->hardware_lock, flags);
++	reg = ha->iobase;
++	ha->interrupts_on = 0;
++	/* disable risc and host interrupts */
++	WRT_REG_WORD(&reg->ictrl, 0);
++	CACHE_FLUSH(&reg->ictrl);
++	spin_unlock_irqrestore(&ha->hardware_lock, flags);
++}
++
++
++static __inline__ int qla2x00_is_wwn_zero(uint8_t *);
++
++/*
++ * qla2x00_is_wwn_zero - Check for zero node name
++ *
++ * Input:
++ *      wwn = Pointer to WW name to check
++ *
++ * Returns:
++ *      TRUE if name is 0 else FALSE
++ *
++ * Context:
++ *      Kernel context.
++ */
++static __inline__ int
++qla2x00_is_wwn_zero(uint8_t *wwn)
++{
++	int cnt;
++
++	for (cnt = 0; cnt < WWN_SIZE ; cnt++, wwn++) {
++		if (*wwn != 0)
++			break;
++	}
++	/* if zero return TRUE */
++	if (cnt == WWN_SIZE)
++		return (1);
++	else
++		return (0);
++}
++
++static __inline__ uint8_t
++qla2x00_suspend_lun(scsi_qla_host_t *, os_lun_t *, int, int);
++static __inline__ uint8_t
++qla2x00_delay_lun(scsi_qla_host_t *, os_lun_t *, int);
++
++static __inline__ uint8_t
++qla2x00_suspend_lun(scsi_qla_host_t *ha, os_lun_t *lq, int time, int count)
++{
++	return (__qla2x00_suspend_lun(ha, lq, time, count, 0));
++}
++
++static __inline__ uint8_t
++qla2x00_delay_lun(scsi_qla_host_t *ha, os_lun_t *lq, int time)
++{
++	return (__qla2x00_suspend_lun(ha, lq, time, 1, 1));
++}
++
++
++
++static __inline__ void qla2x00_chg_endian(uint8_t *, size_t);
++/*
++ * qla2x00_chg_endian
++ *	Change endianess of byte array.
++ *
++ * Input:
++ *	buf = array pointer.
++ *	size = size of array in bytes.
++ *
++ * Context:
++ *	Kernel context.
++ */
++static __inline__ void
++qla2x00_chg_endian(uint8_t *buf, size_t size) 
++{
++	uint8_t byte;
++	size_t cnt1;
++	size_t cnt;
++
++	cnt1 = size - 1;
++	for (cnt = 0; cnt < size / 2; cnt++) {
++		byte = buf[cnt1];
++		buf[cnt1] = buf[cnt];
++		buf[cnt] = byte;
++		cnt1--;
++	}
++}
++
++static __inline__ void qla2x00_check_fabric_devices(scsi_qla_host_t *);
++/*
++ * This routine will wait for fabric devices for
++ * the reset delay.
++ */
++static __inline__ void qla2x00_check_fabric_devices(scsi_qla_host_t *ha) 
++{
++	uint16_t	fw_state;
++
++	qla2x00_get_firmware_state(ha, &fw_state);
++}
++
++static inline void qla2x00_filter_command(scsi_qla_host_t *ha, srb_t *sp);
++static inline void
++qla2x00_filter_command(scsi_qla_host_t *ha, srb_t *sp)
++{
++	Scsi_Cmnd	*cp = sp->cmd;
++	uint8_t		*strp;
++
++	/*
++	 * Special case considertaion on an Inquiry command (0x12) for Lun 0,
++	 * device responds with no devices (0x7F), then Linux will not scan
++	 * further Luns. While reporting that some device exists on Lun 0 Linux
++	 * will scan all devices on this target.
++	 */
++	if (qla2xenbinq && (cp->cmnd[0] == INQUIRY) && (SCSI_LUN_32(cp) == 0)) {
++		strp = (uint8_t *)cp->request_buffer;
++		if (*strp == 0x7f) {
++			/* Make lun unassigned and processor type */
++			*strp = 0x23;
++		}
++	}
++}
++
++static __inline__ void * qla2x00_kmem_zalloc(int, int, int);
++/*
++ * qla2x00_kmem_zalloc
++ * Allocate and zero out the block of memory
++ */
++static __inline__ void *
++qla2x00_kmem_zalloc(int siz, int code, int id) 
++{
++	uint8_t *bp;
++
++	if ((bp = kmalloc(siz, code)) != NULL) {
++		memset(bp, 0, siz);
++	}
++#if QL_TRACE_MEMORY
++	if (mem_trace_ptr == 1000)
++		mem_trace_ptr = 0;
++	mem_trace[mem_trace_ptr] = (u_long ) bp;
++	mem_id[mem_trace_ptr++] = (u_long ) id;
++#endif
++
++	return ((void *)bp);
++}
++
++
++static __inline__ ms_iocb_entry_t *
++qla2x00_prep_ms_iocb(scsi_qla_host_t *, uint32_t, uint32_t);
++/**
++ * qla2x00_prep_ms_iocb() - Prepare common MS IOCB fields for SNS CT query.
++ * @ha: HA context
++ * @req_size: request size in bytes
++ * @rsp_size: response size in bytes
++ *
++ * Returns a pointer to the @ha's ms_iocb.
++ */
++static __inline__ ms_iocb_entry_t *
++qla2x00_prep_ms_iocb(scsi_qla_host_t *ha, uint32_t req_size, uint32_t rsp_size)
++{
++	ms_iocb_entry_t *ms_pkt;
++
++	ms_pkt = ha->ms_iocb;
++	memset(ms_pkt, 0, sizeof(ms_iocb_entry_t));
++
++	ms_pkt->entry_type = MS_IOCB_TYPE;
++	ms_pkt->entry_count = 1;
++#if defined(EXTENDED_IDS)
++	ms_pkt->loop_id = __constant_cpu_to_le16(SIMPLE_NAME_SERVER);
++#else
++	ms_pkt->loop_id = SIMPLE_NAME_SERVER;
++#endif
++	ms_pkt->control_flags =
++	    __constant_cpu_to_le16(CF_READ | CF_HEAD_TAG);
++	ms_pkt->timeout = __constant_cpu_to_le16(25);
++	ms_pkt->cmd_dsd_count = __constant_cpu_to_le16(1);
++	ms_pkt->total_dsd_count = __constant_cpu_to_le16(2);
++	ms_pkt->rsp_bytecount = cpu_to_le32(rsp_size);
++	ms_pkt->req_bytecount = cpu_to_le32(req_size);
++
++	ms_pkt->dseg_req_address[0] = cpu_to_le32(LSD(ha->ct_sns_dma));
++	ms_pkt->dseg_req_address[1] = cpu_to_le32(MSD(ha->ct_sns_dma));
++	ms_pkt->dseg_req_length = ms_pkt->req_bytecount;
++
++	ms_pkt->dseg_rsp_address[0] = cpu_to_le32(LSD(ha->ct_sns_dma));
++	ms_pkt->dseg_rsp_address[1] = cpu_to_le32(MSD(ha->ct_sns_dma));
++	ms_pkt->dseg_rsp_length = ms_pkt->rsp_bytecount;
++
++	return (ms_pkt);
++}
++
++
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qla_iocb.c	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,1276 @@
++/******************************************************************************
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ ******************************************************************************/
++
++#include "qla_os.h"
++#include "qla_def.h"
++
++static inline uint16_t qla2x00_get_cmd_direction(Scsi_Cmnd *cmd);
++
++static inline int qla2x00_cmd_build_iocb(scsi_qla_host_t *ha,
++    srb_t *sp, cmd_entry_t *cmd_pkt, uint16_t *req_q_cnt,
++    uint16_t *req_ring_index, request_t **request_ring_ptr,
++    uint16_t *tot_iocbs, uint16_t *tot_dsds);
++
++static inline int qla2x00_cmd_build_64bit_iocbs(scsi_qla_host_t *ha,
++    srb_t *sp, cmd_entry_t *cmd_pkt, uint16_t *req_q_cnt,
++    uint16_t *req_ring_index, request_t **request_ring_ptr,
++    uint16_t *tot_iocbs, uint16_t *tot_dsds);
++
++static inline int qla2x00_cmd_build_32bit_iocbs(scsi_qla_host_t *ha,
++    srb_t *sp, cmd_entry_t *cmd_pkt, uint16_t *req_q_cnt,
++    uint16_t *req_ring_index, request_t **request_ring_ptr,
++    uint16_t *tot_iocbs, uint16_t *tot_dsds);
++
++static inline int qla2x00_check_request_ring(scsi_qla_host_t *ha,
++    uint16_t tot_iocbs, uint16_t req_ring_index, uint16_t *req_q_cnt);
++
++static inline cont_a64_entry_t *qla2x00_prep_a64_cont_packet(
++    scsi_qla_host_t *ha,
++    uint16_t *req_ring_index, request_t **request_ring_ptr);
++
++static inline cont_entry_t *qla2x00_prep_cont_packet(scsi_qla_host_t *ha,
++    uint16_t *req_ring_index, request_t **request_ring_ptr);
++
++
++/* Command queuing function */
++
++/**
++ * qla2x00_get_cmd_direction() - Determine control_flag data direction.
++ * @cmd: SCSI command
++ *
++ * This is ridiculous, the mid-layer applications should perform this step for
++ * all commands sent down through the SCSI layers.  The following is a terrible
++ * hack.
++ *
++ * Returns the proper CF_* direction based on CDB.
++ */
++static inline uint16_t
++qla2x00_get_cmd_direction(Scsi_Cmnd *cmd)
++{
++	uint16_t cflags;
++
++	cflags = 0;
++
++#if defined(SANE_USAGE_OF_CMD_DIRECTION)
++	/* Set transfer direction */
++	if (cmd->sc_data_direction == SCSI_DATA_WRITE)
++		cflags = CF_WRITE;
++	else if (cmd->sc_data_direction == SCSI_DATA_READ)
++		cflags = CF_READ;
++	else {
++		switch (cmd->data_cmnd[0]) {
++		case WRITE_6:
++		case WRITE_10:
++		case WRITE_12:
++		case WRITE_BUFFER:
++		case WRITE_LONG:
++		case WRITE_SAME:
++		case WRITE_VERIFY:
++		case WRITE_VERIFY_12:
++		case FORMAT_UNIT:
++		case SEND_VOLUME_TAG:
++		case MODE_SELECT:
++		case SEND_DIAGNOSTIC:
++		case MODE_SELECT_10:
++			cflags = CF_WRITE;
++			break;
++		default:
++			cflags = CF_READ;
++			break;
++		}
++	}
++#else
++	switch (cmd->data_cmnd[0]) {
++	case WRITE_6:
++	case WRITE_10:
++	case WRITE_12:
++	case WRITE_BUFFER:
++	case WRITE_LONG:
++	case WRITE_SAME:
++	case WRITE_VERIFY:
++	case WRITE_VERIFY_12:
++	case FORMAT_UNIT:
++	case SEND_VOLUME_TAG:
++	case MODE_SELECT:
++	case SEND_DIAGNOSTIC:
++	case MODE_SELECT_10:
++		cflags = CF_WRITE;
++		break;
++	default:
++		if (cmd->sc_data_direction == SCSI_DATA_WRITE)
++			cflags = CF_WRITE;
++		else
++			cflags = CF_READ;
++		break;
++	}
++#endif
++
++	return (cflags);
++}
++
++/**
++ * qla2x00_check_request_ring() - Checks request ring for additional IOCB space.
++ * @ha: HA context
++ * @tot_iocbs: Number of IOCBs required
++ * @req_ring_index: Current index to request ring
++ * @req_q_cnt: Number of free request entries
++ *
++ * Returns non-zero if no additional room available on request ring, else zero.
++ */
++static inline int
++qla2x00_check_request_ring(scsi_qla_host_t *ha,
++    uint16_t tot_iocbs, uint16_t req_ring_index, uint16_t *req_q_cnt)
++{
++	uint16_t	ret;
++	uint16_t	cnt;
++	device_reg_t	*reg;
++
++	reg = ha->iobase;
++
++	/* If room for request in request ring for at least N IOCB */
++	ret = 0;
++	if ((tot_iocbs + 2) >= *req_q_cnt) {
++		/*
++		 * Calculate number of free request entries.
++		 */
++		cnt = RD_REG_WORD(ISP_REQ_Q_OUT(reg));
++		if (req_ring_index < cnt)
++			*req_q_cnt = cnt - req_ring_index;
++		else
++			*req_q_cnt = REQUEST_ENTRY_CNT - (req_ring_index - cnt);
++	}
++	if ((tot_iocbs + 2) >= *req_q_cnt) {
++		DEBUG5(printk("scsi(%ld): in-ptr=%x req_q_cnt=%x "
++		    "tot_iocbs=%x.\n",
++		    ha->host_no, req_ring_index, *req_q_cnt, tot_iocbs));
++
++		ret++;
++	}
++#if defined(IOCB_THROLLE_USAGE)
++	if ((ha->iocb_cnt + tot_iocbs) >= ha->iocb_hiwat) {
++		DEBUG5(printk("%s(): Not Enough IOCBS for request. "
++		    "iocb_cnt=%x, tot_iocbs=%x, hiwat=%x.\n",
++		    __func__, ha->iocb_cnt, tot_iocbs, ha->iocb_hiwat));
++#if defined(IOCB_HIT_RATE)
++		ha->iocb_overflow_cnt++;
++#endif
++		ret++;
++	}
++#endif
++
++	return (ret);
++}
++
++/**
++ * qla2x00_prep_a64_cont_packet() - Initialize an A64 continuation packet.
++ * @ha: HA context
++ * @req_ring_index: Current index to request ring
++ * @req_ring_ptr: Current pointer to request ring
++ *
++ * Returns a pointer to the continuation packet.
++ */
++static inline cont_a64_entry_t *
++qla2x00_prep_a64_cont_packet(scsi_qla_host_t *ha,
++    uint16_t *req_ring_index, request_t **request_ring_ptr)
++{
++	cont_a64_entry_t *cont_pkt;
++
++	/* Adjust ring index. */
++	*req_ring_index += 1;
++	if (*req_ring_index == REQUEST_ENTRY_CNT) {
++		*req_ring_index = 0;
++		*request_ring_ptr = ha->request_ring;
++	} else
++		*request_ring_ptr += 1;
++
++	cont_pkt = (cont_a64_entry_t *)(*request_ring_ptr);
++
++	/* Load packet defaults. */
++	*((uint32_t *)(&cont_pkt->entry_type)) =
++	    __constant_cpu_to_le32(CONTINUE_A64_TYPE);
++	//cont_pkt->entry_type = CONTINUE_A64_TYPE;
++	//cont_pkt->entry_count = 0;
++	//cont_pkt->sys_define = (uint8_t)req_ring_index;
++
++	return (cont_pkt);
++}
++
++/**
++ * qla2x00_prep_cont_packet() - Initialize a continuation packet.
++ * @ha: HA context
++ * @req_ring_index: Current index to request ring
++ * @req_ring_ptr: Current pointer to request ring
++ *
++ * Returns a pointer to the continuation packet.
++ */
++static inline cont_entry_t *
++qla2x00_prep_cont_packet(scsi_qla_host_t *ha,
++    uint16_t *req_ring_index, request_t **request_ring_ptr)
++{
++	cont_entry_t *cont_pkt;
++
++	/* Adjust ring index. */
++	*req_ring_index += 1;
++	if (*req_ring_index == REQUEST_ENTRY_CNT) {
++		*req_ring_index = 0;
++		*request_ring_ptr = ha->request_ring;
++	} else
++		*request_ring_ptr += 1;
++
++	cont_pkt = (cont_entry_t *)(*request_ring_ptr);
++
++	/* Load packet defaults. */
++	*((uint32_t *)(&cont_pkt->entry_type)) =
++	    __constant_cpu_to_le32(CONTINUE_TYPE);
++	//cont_pkt->entry_type = CONTINUE_TYPE;
++	//cont_pkt->entry_count = 0;
++	//cont_pkt->sys_define = (uint8_t)req_ring_index;
++
++	return (cont_pkt);
++}
++
++static inline int
++qla2x00_cmd_build_64bit_iocbs(scsi_qla_host_t *ha,
++    srb_t *sp,
++    cmd_entry_t *cmd_pkt,
++    uint16_t *req_q_cnt,
++    uint16_t *req_ring_index, request_t **request_ring_ptr,
++    uint16_t *tot_iocbs, uint16_t *tot_dsds)
++{
++	uint16_t	avail_dsds;
++	uint32_t	*cur_dsd;
++	Scsi_Cmnd	*cmd;
++
++	cmd = sp->cmd;
++
++	/* No data transfer */
++	if (cmd->request_bufflen == 0 ||
++	    cmd->sc_data_direction == SCSI_DATA_NONE) {
++		cmd_pkt->byte_count = __constant_cpu_to_le32(0);
++		return (QL_STATUS_SUCCESS);
++	}
++
++	cmd_pkt->control_flags |= cpu_to_le16(qla2x00_get_cmd_direction(cmd));
++	sp->dir = cmd_pkt->control_flags &
++	    __constant_cpu_to_le16(CF_READ | CF_WRITE);
++
++	/* Two DSDs are available in the command 64 IOCB */
++	avail_dsds = 2;
++	cur_dsd = (uint32_t *)&cmd_pkt->dseg_0_address;
++
++	/* Load data segments */
++	if (cmd->use_sg != 0) {
++		struct	scatterlist *cur_seg;
++		struct	scatterlist *end_seg;
++		int	nseg;
++
++		cur_seg = (struct scatterlist *)cmd->request_buffer;
++		nseg = pci_map_sg(ha->pdev, cur_seg, cmd->use_sg,
++		    scsi_to_pci_dma_dir(cmd->sc_data_direction));
++		end_seg = cur_seg + nseg;
++		while (cur_seg < end_seg) {
++			int		failed;
++			dma_addr_t	sle_dma;
++			uint32_t	sle_len;
++			dma_addr_t	nml_dma;
++			uint32_t	nml_len;
++			uint32_t	normalized;
++			cont_a64_entry_t *cont_pkt;
++
++			/* Allocate additional continuation packets? */
++			if (avail_dsds == 0) {
++				*tot_iocbs += 1;
++				failed = qla2x00_check_request_ring(ha,
++				    *tot_iocbs,
++				    *req_ring_index,
++				    req_q_cnt);
++				if (failed) {
++					goto mapped_queuing_error_64;
++				}
++
++				cont_pkt = qla2x00_prep_a64_cont_packet(ha,
++				    req_ring_index,
++				    request_ring_ptr);
++
++				cur_dsd = (uint32_t *)&cont_pkt->dseg_0_address;
++				avail_dsds = 5;
++			}
++
++			sle_dma = sg_dma_address(cur_seg);
++			sle_len = sg_dma_len(cur_seg);
++
++			normalized = qla2x00_normalize_dma_addr(
++			    &sle_dma, &sle_len,
++			    &nml_dma, &nml_len);
++
++			/* One entry always consumed */
++			*cur_dsd++ = cpu_to_le32(LSD(sle_dma));
++			*cur_dsd++ = cpu_to_le32(MSD(sle_dma));
++			*cur_dsd++ = cpu_to_le32(sle_len);
++			*tot_dsds += 1;
++			avail_dsds--;
++
++			cur_seg++;
++			if (!normalized)
++				continue;
++
++			/*
++			 * Allocate additional continuation packets?
++			 */
++			if (avail_dsds == 0) {
++				*tot_iocbs += 1;
++				failed = qla2x00_check_request_ring(ha,
++				    *tot_iocbs,
++				    *req_ring_index,
++				    req_q_cnt);
++				if (failed)
++					goto mapped_queuing_error_64;
++
++				cont_pkt = qla2x00_prep_a64_cont_packet(ha,
++				    req_ring_index,
++				    request_ring_ptr);
++
++				cur_dsd = (uint32_t *)&cont_pkt->dseg_0_address;
++				avail_dsds = 5;
++			}
++
++			*cur_dsd++ = cpu_to_le32(LSD(nml_dma));
++			*cur_dsd++ = cpu_to_le32(MSD(nml_dma));
++			*cur_dsd++ = cpu_to_le32(nml_len);
++			*tot_dsds += 1;
++			avail_dsds--;
++		}
++	}
++	else {
++		/*
++		 * No more than 1 (one) IOCB is needed for this type of 
++		 * request, even if the DMA address spans the 4GB page 
++		 * boundary.
++		 *
++		 * @tot_dsds == 1 if non-spanning, else 2
++		 */
++		dma_addr_t	req_dma;
++		uint32_t	req_len;
++		dma_addr_t	nml_dma;
++		uint32_t	nml_len;
++		uint32_t	normalized;
++		struct page	*page;
++		unsigned long	offset;
++
++		page = virt_to_page(cmd->request_buffer);
++		offset = ((unsigned long)cmd->request_buffer & ~PAGE_MASK);
++		req_dma = pci_map_page(ha->pdev,
++		    page,
++		    offset,
++		    cmd->request_bufflen,
++		    scsi_to_pci_dma_dir(cmd->sc_data_direction));
++		req_len = cmd->request_bufflen;
++
++		sp->saved_dma_handle = req_dma;
++
++		normalized = qla2x00_normalize_dma_addr(
++		    &req_dma, &req_len,
++		    &nml_dma, &nml_len);
++
++		/* One entry always consumed */
++		*cur_dsd++ = cpu_to_le32(LSD(req_dma));
++		*cur_dsd++ = cpu_to_le32(MSD(req_dma));
++		*cur_dsd++ = cpu_to_le32(req_len);
++		*tot_dsds += 1;
++
++		if (normalized) {
++			*cur_dsd++ = cpu_to_le32(LSD(nml_dma));
++			*cur_dsd++ = cpu_to_le32(MSD(nml_dma));
++			*cur_dsd++ = cpu_to_le32(nml_len);
++			*tot_dsds += 1;
++		}
++	}
++
++	return (QL_STATUS_SUCCESS);
++
++mapped_queuing_error_64:
++	pci_unmap_sg(ha->pdev, (struct scatterlist *)cmd->request_buffer,
++	    cmd->use_sg, scsi_to_pci_dma_dir(cmd->sc_data_direction));
++	return (QL_STATUS_ERROR);
++}
++
++static inline int
++qla2x00_cmd_build_32bit_iocbs(scsi_qla_host_t *ha,
++    srb_t *sp,
++    cmd_entry_t *cmd_pkt,
++    uint16_t *req_q_cnt,
++    uint16_t *req_ring_index, request_t **request_ring_ptr,
++    uint16_t *tot_iocbs, uint16_t *tot_dsds)
++{
++	uint16_t	avail_dsds;
++	uint32_t	*cur_dsd;
++	Scsi_Cmnd	*cmd;
++
++	cmd = sp->cmd;
++
++	/* No data transfer */
++	if (cmd->request_bufflen == 0 ||
++	    cmd->sc_data_direction == SCSI_DATA_NONE) {
++		cmd_pkt->byte_count = __constant_cpu_to_le32(0);
++		return (QL_STATUS_SUCCESS);
++	}
++
++	cmd_pkt->control_flags |= cpu_to_le16(qla2x00_get_cmd_direction(cmd));
++	sp->dir = cmd_pkt->control_flags &
++	    __constant_cpu_to_le16(CF_READ | CF_WRITE);
++
++	/* Three DSDs are available in the command IOCB */
++	avail_dsds = 3;
++	cur_dsd = (uint32_t *)&cmd_pkt->dseg_0_address;
++
++	/* Load data segments */
++	if (cmd->use_sg != 0) {
++		struct	scatterlist *cur_seg;
++		struct	scatterlist *end_seg;
++		int	nseg;
++
++		cur_seg = (struct scatterlist *)cmd->request_buffer;
++		nseg = pci_map_sg(ha->pdev, cur_seg, cmd->use_sg,
++		    scsi_to_pci_dma_dir(cmd->sc_data_direction));
++		end_seg = cur_seg + nseg;
++
++		while (cur_seg < end_seg) {
++			int		failed;
++			dma_addr_t	sle_dma;
++			uint32_t	sle_len;
++			cont_entry_t	*cont_pkt;
++
++			/* Allocate additional continuation packets? */
++			if (avail_dsds == 0) {
++				*tot_iocbs += 1;
++				failed = qla2x00_check_request_ring(ha,
++				    *tot_iocbs,
++				    *req_ring_index,
++				    req_q_cnt);
++				if (failed) {
++					goto mapped_queuing_error_32;
++				}
++
++				cont_pkt = qla2x00_prep_cont_packet(ha,
++				    req_ring_index,
++				    request_ring_ptr);
++
++				cur_dsd = (uint32_t *)&cont_pkt->dseg_0_address;
++				avail_dsds = 7;
++			}
++
++			sle_dma = sg_dma_address(cur_seg);
++			sle_len = sg_dma_len(cur_seg);
++
++			/* One entry always consumed */
++			*cur_dsd++ = cpu_to_le32(sle_dma);
++			*cur_dsd++ = cpu_to_le32(sle_len);
++			*tot_dsds += 1;
++			avail_dsds--;
++
++			cur_seg++;
++		}
++	}
++	else {
++		/*
++		 * No more than 1 (one) IOCB is needed for this type of request.
++		 */
++		dma_addr_t	req_dma;
++		uint32_t	req_len;
++		struct page	*page;
++		unsigned long	offset;
++
++		page = virt_to_page(cmd->request_buffer);
++		offset = ((unsigned long)cmd->request_buffer & ~PAGE_MASK);
++		req_dma = pci_map_page(ha->pdev,
++		    page,
++		    offset,
++		    cmd->request_bufflen,
++		    scsi_to_pci_dma_dir(cmd->sc_data_direction));
++		req_len = cmd->request_bufflen;
++
++		sp->saved_dma_handle = req_dma;
++
++		/* One entry always consumed */
++		*cur_dsd++ = cpu_to_le32(req_dma);
++		*cur_dsd++ = cpu_to_le32(req_len);
++		*tot_dsds += 1;
++	}
++
++	return (QL_STATUS_SUCCESS);
++
++mapped_queuing_error_32:
++	pci_unmap_sg(ha->pdev, (struct scatterlist *)cmd->request_buffer,
++	    cmd->use_sg, scsi_to_pci_dma_dir(cmd->sc_data_direction));
++	return (QL_STATUS_ERROR);
++}
++
++static inline int
++qla2x00_cmd_build_iocb(scsi_qla_host_t *ha,
++    srb_t *sp,
++    cmd_entry_t *cmd_pkt,
++    uint16_t *req_q_cnt,
++    uint16_t *req_ring_index, request_t **request_ring_ptr,
++    uint16_t *tot_iocbs, uint16_t *tot_dsds)
++{
++	int		ret;
++
++	ret = QL_STATUS_ERROR;
++
++	if (ha->flags.enable_64bit_addressing) {
++		*((uint32_t *)(&cmd_pkt->entry_type)) =
++		    __constant_cpu_to_le32(COMMAND_A64_TYPE);
++		//cmd_pkt->entry_type = COMMAND_A64_TYPE;
++		//cmd_pkt->entry_count = (uint8_t)tot_iocbs;
++		//cmd_pkt->sys_define = (uint8_t)ha->req_ring_index;
++		//cmd_pkt->entry_status = 0;
++
++		ret = qla2x00_cmd_build_64bit_iocbs(ha,
++		    sp, cmd_pkt, req_q_cnt, req_ring_index, request_ring_ptr,
++		    tot_iocbs, tot_dsds);
++
++	} else {
++		*((uint32_t *)(&cmd_pkt->entry_type)) =
++		    __constant_cpu_to_le32(COMMAND_TYPE);
++		//cmd_pkt->entry_type = COMMAND_TYPE;
++		//cmd_pkt->entry_count = (uint8_t)tot_iocbs;
++		//cmd_pkt->sys_define = (uint8_t)ha->req_ring_index;
++		//cmd_pkt->entry_status = 0;
++
++		ret = qla2x00_cmd_build_32bit_iocbs(ha,
++		    sp, cmd_pkt, req_q_cnt, req_ring_index, request_ring_ptr,
++		    tot_iocbs, tot_dsds);
++	}
++
++	return (ret);
++}
++
++/**
++ * qla2x00_start_scsi() - Send a SCSI command to the ISP
++ * @sp: command to send to the ISP
++ *
++ * Returns non-zero if a failure occured, else zero.
++ */
++int
++qla2x00_start_scsi(srb_t *sp)
++{
++	int		ret;
++	unsigned long   flags;
++	uint16_t        failed;
++	scsi_qla_host_t	*ha;
++	fc_lun_t	*fclun;
++	Scsi_Cmnd	*cmd;
++	uint16_t	req_q_cnt;
++	uint16_t	req_ring_index;
++	request_t	*request_ring_ptr;
++	uint32_t	*clr_ptr;
++	uint32_t	found;
++	uint32_t        index;
++	uint32_t	handle;
++	uint16_t	tot_iocbs;
++	uint16_t	tot_dsds;
++	cmd_entry_t	*cmd_pkt;
++	uint32_t        timeout;
++
++	device_reg_t	*reg;
++	uint16_t        reg_flushed;
++
++	ENTER(__func__);
++
++	/* Setup device pointers. */
++	ret = 0;
++	fclun = sp->lun_queue->fclun;
++	ha = fclun->fcport->ha;
++
++	cmd = sp->cmd;
++	reg = ha->iobase;
++
++	DEBUG3(printk("scsi(%ld): cmd=%p sp=%p CDB=%x\n",
++	    ha->host_no,
++	    cmd, sp, cmd->cmnd[0]));
++
++	/* Send marker if required */
++	if (ha->marker_needed != 0) {
++		if (qla2x00_marker(ha, 0, 0, MK_SYNC_ALL) != QLA2X00_SUCCESS) {
++			return (QL_STATUS_ERROR);
++		}
++		ha->marker_needed = 0;
++	}
++
++	/* Acquire ring specific lock */
++	spin_lock_irqsave(&ha->hardware_lock, flags);
++
++	/* Save ha fields for post-update */
++	req_ring_index = ha->req_ring_index;
++	request_ring_ptr = ha->request_ring_ptr;
++	req_q_cnt = ha->req_q_cnt;
++
++	tot_dsds = 0;
++	tot_iocbs = 1;
++
++	/* Allocate space for an additional IOCB */
++	failed = qla2x00_check_request_ring(ha,
++	    tot_iocbs, req_ring_index, &req_q_cnt);
++	if (failed)
++		goto queuing_error;
++
++	/* Check for room in outstanding command list. */
++	found = 0;
++	handle = ha->current_outstanding_cmd;
++	for (index = 1; index < MAX_OUTSTANDING_COMMANDS; index++) {
++		handle++;
++		if (handle == MAX_OUTSTANDING_COMMANDS)
++			handle = 1;
++		if (ha->outstanding_cmds[handle] == 0) {
++			found = 1;
++			ha->current_outstanding_cmd = handle;
++			break;
++		}
++	}
++	if (!found) {
++		DEBUG5(printk("scsi(%ld): Unable to queue command -- NO ROOM "
++		    "IN OUTSTANDING ARRAY (req_q_cnt=%lx).\n",
++		    ha->host_no,
++		    (u_long)ha->req_q_cnt));
++		goto queuing_error;
++	}
++
++	/*
++	 * Build command packet.
++	 */
++	cmd_pkt = (cmd_entry_t *)request_ring_ptr;
++
++	cmd_pkt->handle = handle;
++
++	/* Zero out remaining portion of packet. */
++	clr_ptr = (uint32_t *)cmd_pkt + 2;
++	for (index = 2; index < REQUEST_ENTRY_SIZE / 4; index++)
++		*clr_ptr++ = 0;
++
++	/* Set target ID */
++#if defined(EXTENDED_IDS)
++	cmd_pkt->target = cpu_to_le16(fclun->fcport->loop_id & 0xFF);
++#else
++	cmd_pkt->target = (uint8_t)fclun->fcport->loop_id;
++#endif
++
++	/* Set LUN number*/
++#if VSA
++	if ((cmd->data_cmnd[0] == 0x26) ||
++	    (cmd->data_cmnd[0] == 0xA0) ||
++	    (cmd->data_cmnd[0] == 0xCB) ) {
++		cmd_pkt->lun = cpu_to_le16(fclun->lun);
++	} else if ((fclun->fcport->flags & FC_VSA))
++		cmd_pkt->lun = cpu_to_le16(fclun->lun | 0x4000);
++	else
++		cmd_pkt->lun = cpu_to_le16(fclun->lun);
++#else
++	cmd_pkt->lun = cpu_to_le16(fclun->lun);
++#endif
++
++	/* Update tagged queuing modifier */
++	cmd_pkt->control_flags = __constant_cpu_to_le16(CF_SIMPLE_TAG);
++	if (cmd->device->tagged_queue) {
++		switch (cmd->tag) {
++		case HEAD_OF_QUEUE_TAG:
++			cmd_pkt->control_flags =
++			    __constant_cpu_to_le16(CF_HEAD_TAG);
++			break;
++		case ORDERED_QUEUE_TAG:
++			cmd_pkt->control_flags =
++			    __constant_cpu_to_le16(CF_ORDERED_TAG);
++			break;
++		}
++	}
++
++	/*
++	 * Allocate at least 5 (+ QLA_CMD_TIMER_DELTA) seconds for RISC timeout.
++	 */
++	timeout = (uint32_t) CMD_TIMEOUT(cmd)/HZ;
++	if (timeout > 65535)
++		cmd_pkt->timeout = __constant_cpu_to_le16(0);
++	if (timeout > 25)
++		cmd_pkt->timeout = cpu_to_le16((uint16_t)timeout -
++		    (5 + QLA_CMD_TIMER_DELTA));
++	else
++		cmd_pkt->timeout = cpu_to_le16((uint16_t)timeout);
++
++	/* Load SCSI command packet. */
++	memcpy(cmd_pkt->scsi_cdb, cmd->cmnd, cmd->cmd_len);
++
++	cmd_pkt->byte_count = cpu_to_le32((uint32_t)cmd->request_bufflen);
++
++	/* Load IOCB segments */
++	ret = qla2x00_cmd_build_iocb(ha,
++	    sp,
++	    cmd_pkt,
++	    &req_q_cnt, &req_ring_index, &request_ring_ptr,
++	    &tot_iocbs, &tot_dsds);
++	if (ret)
++		goto queuing_error;
++
++	/* Set total data segment count. */
++	cmd_pkt->dseg_count = cpu_to_le16(tot_dsds);
++	cmd_pkt->entry_count = (uint8_t)tot_iocbs;
++
++	/* Update ha fields */
++	ha->req_ring_index = req_ring_index;
++	ha->request_ring_ptr = request_ring_ptr;
++	ha->req_q_cnt = req_q_cnt;
++	ha->req_q_cnt -= tot_iocbs;
++#if defined(IOCB_THROLLE_USAGE)
++	ha->iocb_cnt += tot_iocbs;
++
++	sp->iocb_cnt = tot_iocbs;
++#endif
++
++	/* Add command to the active array */
++	ha->outstanding_cmds[handle] = sp;
++	CMD_HANDLE(sp->cmd) = (unsigned char *)(u_long)handle;
++
++	/* Adjust ring index. */
++	ha->req_ring_index++;
++	if (ha->req_ring_index == REQUEST_ENTRY_CNT) {
++		ha->req_ring_index = 0;
++		ha->request_ring_ptr = ha->request_ring;
++	} else
++		ha->request_ring_ptr++;
++
++	ha->actthreads++;
++	ha->total_ios++;
++	sp->ha = ha;
++	sp->lun_queue->out_cnt++;
++	sp->flags |= SRB_DMA_VALID;
++	sp->state = SRB_ACTIVE_STATE;
++	sp->u_start = jiffies;
++
++	/* Set chip new ring index. */
++	reg_flushed = CACHE_FLUSH(ISP_REQ_Q_IN(reg));
++	WRT_REG_WORD(ISP_REQ_Q_IN(reg), ha->req_ring_index);
++
++	spin_unlock_irqrestore(&ha->hardware_lock, flags);
++	return (QL_STATUS_SUCCESS);
++
++queuing_error:
++	spin_unlock_irqrestore(&ha->hardware_lock, flags);
++	return (QL_STATUS_ERROR);
++}
++
++
++/**
++ * qla2x00_marker() - Send a marker IOCB to the firmware.
++ * @ha: HA context
++ * @loop_id: loop ID
++ * @lun: LUN
++ * @type: marker modifier
++ *
++ * Can be called from both normal and interrupt context.
++ *
++ * Returns non-zero if a failure occured, else zero.
++ */
++int
++__qla2x00_marker(scsi_qla_host_t *ha,
++    uint16_t loop_id,
++    uint16_t lun,
++    uint8_t type)
++{
++	mrk_entry_t	*pkt;
++
++	ENTER(__func__);
++
++	pkt = (mrk_entry_t *)qla2x00_req_pkt(ha);
++	if (pkt == NULL) {
++		DEBUG2_3(printk("%s(): **** FAILED ****\n", __func__));
++
++		return (QL_STATUS_ERROR);
++	}
++
++	pkt->entry_type = MARKER_TYPE;
++	pkt->modifier = type;
++
++	if (type != MK_SYNC_ALL) {
++		pkt->lun = cpu_to_le16(lun);
++#if defined(EXTENDED_IDS)
++		pkt->target = cpu_to_le16(loop_id & 0xFF);
++#else
++		pkt->target = (uint8_t)loop_id;
++#endif
++	}
++
++	/* Issue command to ISP */
++	qla2x00_isp_cmd(ha);
++
++	LEAVE(__func__);
++
++	return (QL_STATUS_SUCCESS);
++}
++
++int 
++qla2x00_marker(scsi_qla_host_t *ha,
++    uint16_t loop_id,
++    uint16_t lun,
++    uint8_t type)
++{
++	int ret;
++	unsigned long flags = 0;
++
++	spin_lock_irqsave(&ha->hardware_lock, flags);
++	ret = __qla2x00_marker(ha, loop_id, lun, type);
++	spin_unlock_irqrestore(&ha->hardware_lock, flags);
++
++	return (ret);
++}
++
++/**
++ * qla2x00_req_pkt() - Retrieve a request packet from the request ring.
++ * @ha: HA context
++ *
++ * Note: The caller must hold the hardware lock before calling this routine.
++ *
++ * Returns NULL if function failed, else, a pointer to the request packet.
++ */
++request_t *
++qla2x00_req_pkt(scsi_qla_host_t *ha)
++{
++	device_reg_t	*reg = ha->iobase;
++	request_t	*pkt = NULL;
++	uint16_t	cnt;
++	uint32_t	*dword_ptr;
++	uint32_t	timer;
++	uint16_t	req_cnt = 1;
++
++	ENTER(__func__);
++
++	/* Wait 1 second for slot. */
++	for (timer = HZ; timer; timer--) {
++		if ((req_cnt + 2) >= ha->req_q_cnt) {
++			/* Calculate number of free request entries. */
++			cnt = qla2x00_debounce_register(ISP_REQ_Q_OUT(reg));
++			if  (ha->req_ring_index < cnt)
++				ha->req_q_cnt = cnt - ha->req_ring_index;
++			else
++				ha->req_q_cnt = REQUEST_ENTRY_CNT -
++				    (ha->req_ring_index - cnt);
++		}
++		/* If room for request in request ring. */
++		if ((req_cnt + 2) < ha->req_q_cnt) {
++			ha->req_q_cnt--;
++			pkt = ha->request_ring_ptr;
++
++			/* Zero out packet. */
++			dword_ptr = (uint32_t *)pkt;
++			for (cnt = 0; cnt < REQUEST_ENTRY_SIZE / 4; cnt++)
++				*dword_ptr++ = 0;
++
++			/* Set system defined field. */
++			pkt->sys_define = (uint8_t)ha->req_ring_index;
++
++			/* Set entry count. */
++			pkt->entry_count = 1;
++
++			break;
++		}
++
++		/* Release ring specific lock */
++		spin_unlock(&ha->hardware_lock);
++
++		udelay(2);   /* 2 us */
++
++		/* Check for pending interrupts. */
++		/* During init we issue marker directly */
++		if (!ha->marker_needed)
++			qla2x00_poll(ha);
++
++		spin_lock_irq(&ha->hardware_lock);
++	}
++	if (!pkt) {
++		DEBUG2_3(printk("%s(): **** FAILED ****\n", __func__));
++	}
++
++	LEAVE(__func__);
++
++	return (pkt);
++}
++
++/**
++ * qla2x00_ms_req_pkt() - Retrieve a Management Server request packet from
++ * 				the request ring.
++ * @ha: HA context
++ * @sp: pointer to handle post function call
++ *
++ * Note: The caller must hold the hardware lock before calling this routine.
++ *
++ * Returns NULL if function failed, else, a pointer to the request packet.
++ */
++request_t *
++qla2x00_ms_req_pkt(scsi_qla_host_t *ha, srb_t  *sp)
++{
++	device_reg_t	*reg = ha->iobase;
++	request_t	*pkt = NULL;
++	uint16_t	cnt, i, index;
++	uint32_t	*dword_ptr;
++	uint32_t	timer;
++	uint8_t		found = 0;
++	uint16_t	req_cnt = 1;
++
++	ENTER(__func__);
++
++	/* Wait 1 second for slot. */
++	for (timer = HZ; timer; timer--) {
++		if ((req_cnt + 2) >= ha->req_q_cnt) {
++			/* Calculate number of free request entries. */
++			cnt = qla2x00_debounce_register(ISP_REQ_Q_OUT(reg));
++			if (ha->req_ring_index < cnt) {
++				ha->req_q_cnt = cnt - ha->req_ring_index;
++			} else {
++				ha->req_q_cnt = REQUEST_ENTRY_CNT -
++				    (ha->req_ring_index - cnt);
++			}
++		}
++
++		/* Check for room in outstanding command list. */
++		cnt = ha->current_outstanding_cmd;
++		for (index = 1; index < MAX_OUTSTANDING_COMMANDS; index++) {
++			cnt++;
++			if (cnt == MAX_OUTSTANDING_COMMANDS)
++				cnt = 1;
++
++			if (ha->outstanding_cmds[cnt] == 0) {
++				found = 1;
++				ha->current_outstanding_cmd = cnt;
++				break;
++			}
++		}
++
++		/* If room for request in request ring. */
++		if (found && (req_cnt + 2) < ha->req_q_cnt) {
++			pkt = ha->request_ring_ptr;
++
++			/* Zero out packet. */
++			dword_ptr = (uint32_t *)pkt;
++			for (i = 0; i < REQUEST_ENTRY_SIZE / 4; i++ )
++				*dword_ptr++ = 0;
++
++			DEBUG5(printk("%s(): putting sp=%p in "
++			    "outstanding_cmds[%x]\n",
++			    __func__,
++			    sp, cnt));
++
++			ha->outstanding_cmds[cnt] = sp;
++
++			/* save the handle */
++			CMD_HANDLE(sp->cmd) = (unsigned char *) (u_long) cnt;
++			CMD_SP(sp->cmd) = (void *)sp;
++
++			ha->req_q_cnt--;
++			pkt->handle = (uint32_t)cnt;
++
++			/* Set system defined field. */
++			pkt->sys_define = (uint8_t)ha->req_ring_index;
++			pkt->entry_status = 0;
++
++			break;
++		}
++
++		/* Release ring specific lock */
++		spin_unlock(&ha->hardware_lock);
++		udelay(20);
++
++		/* Check for pending interrupts. */
++		qla2x00_poll(ha);
++
++		spin_lock_irq(&ha->hardware_lock);
++	}
++	if (!pkt) {
++		DEBUG2_3(printk("%s(): **** FAILED ****\n", __func__));
++	}
++
++	LEAVE(__func__);
++
++	return (pkt);
++}
++
++/**
++ * qla2x00_isp_cmd() - Modify the request ring pointer.
++ * @ha: HA context
++ *
++ * Note: The caller must hold the hardware lock before calling this routine.
++ */
++void
++qla2x00_isp_cmd(scsi_qla_host_t *ha)
++{
++	device_reg_t *reg = ha->iobase;
++
++	ENTER(__func__);
++
++	DEBUG5(printk("%s(): IOCB data:\n", __func__));
++	DEBUG5(qla2x00_dump_buffer(
++	    (uint8_t *)ha->request_ring_ptr, REQUEST_ENTRY_SIZE));
++
++	/* Adjust ring index. */
++	ha->req_ring_index++;
++	if (ha->req_ring_index == REQUEST_ENTRY_CNT) {
++		ha->req_ring_index = 0;
++		ha->request_ring_ptr = ha->request_ring;
++	} else
++		ha->request_ring_ptr++;
++
++	/* Set chip new ring index. */
++	WRT_REG_WORD(ISP_REQ_Q_IN(reg), ha->req_ring_index);
++
++	LEAVE(__func__);
++}
++
++// TODO: Complete implementation.
++// TODO: Add support for EXTENDED_IDS.
++#ifdef COMPLETE_IMPLEMENTATION
++
++/* MAILBOX IOCB stuff */
++
++/**
++ * qla2x00_send_login_port_iocb() - Login to a device.
++ * @ha: SCSI driver HA context
++ * @ipdev: IP device to login to
++ *
++ * This routine will build and send a mailbox IOCB to login to a fabric port.
++ *
++ * The qla2x00_mailbox_iocb_done() routine will be called upon IOCB
++ * completion, where further processing is performed.
++ *
++ * Returns QL_STATUS_SUCCESS if the operation succeeded.
++ */
++static int
++qla2x00_send_login_port_iocb(scsi_qla_host_t *ha, fcdev_t *device)
++{
++	unsigned long	flags = 0;
++	struct mbx_entry *mbxentry;
++
++	DEBUG2(printk("%s(): port ID: %x\n",
++			__func__,
++			device->port_id[2]<<16 |
++			device->port_id[1]<<8 |
++			device->port_id[0]);)
++
++	/* Send marker if required */
++	if (ha->marker_needed != 0) {
++		if (qla2x00_marker(ha, 0, 0, MK_SYNC_ALL) != QLA2X00_SUCCESS)
++			return (QL_STATUS_ERROR);
++		ha->marker_needed = 0;
++	}
++
++	spin_lock_irqsave(&ha->hardware_lock, flags);
++
++	mbxentry = (struct mbx_entry *)qla2x00_req_pkt(ha);
++	if (mbxentry == NULL) {
++		DEBUG2(printk("%s(): failed\n", __func__);)
++
++		spin_unlock_irqrestore(&ha->hardware_lock, flags);
++
++		return (QL_STATUS_ERROR);
++	}
++
++	/* Build fabric login MBX IOCB */
++	mbxentry->entry_type = ET_MAILBOX_COMMAND;
++	mbxentry->entry_count = 1;
++	mbxentry->sys_define1 = SOURCE_SCSI;
++	mbxentry->entry_status = 0;
++	mbxentry->handle = cpu_to_le32(device->dev_id |
++				(MBC_LOGIN_FABRIC_PORT << 16));
++	mbxentry->loop_id = device->loop_id;
++	mbxentry->mb0 = __constant_cpu_to_le16(MBC_LOGIN_FABRIC_PORT);
++	mbxentry->mb1 = cpu_to_le16((device->loop_id << 8) | 
++				(MBC_NO_PROCESS_LOGIN |
++				 MBC_NO_PLOGI_IF_LOGGED_IN));
++	mbxentry->mb2 = cpu_to_le16(device->port_id[2]);
++	mbxentry->mb3 = cpu_to_le16((device->port_id[1] << 8) |
++				device->port_id[0]);
++	mbxentry->mb6 = __constant_cpu_to_le16(0);
++	mbxentry->mb7 = __constant_cpu_to_le16(0);
++
++	/* Issue command to ISP */
++	qla2x00_isp_cmd(ha);
++
++	spin_unlock_irqrestore(&ha->hardware_lock, flags);
++
++	return (QL_STATUS_SUCCESS);
++}
++
++/**
++ * qla2x00_send_logout_port_iocb() - Logout an FC device.
++ * @ha: SCSI driver HA context
++ * @device: FC device to logout
++ *
++ * This routine will build and send a mailbox IOCB to logout a fabric port.
++ *
++ * The qla2x00_mailbox_iocb_done() routine will be called upon IOCB
++ * completion, where further processing is performed.
++ *
++ * Returns QL_STATUS_SUCCESS if the operation succeeded.
++ */
++static int
++qla2x00_send_logout_port_iocb(scsi_qla_host_t *ha, fcdev_t *device)
++{
++	unsigned long	flags = 0;
++	struct mbx_entry *mbxentry;
++
++	DEBUG2(printk("%s(): port ID: %x\n",
++			__func__,
++			device->port_id[2]<<16 |
++			device->port_id[1]<<8 |
++			device->port_id[0]);)
++
++	/* Send marker if required */
++	if (ha->marker_needed != 0) {
++		if (qla2x00_marker(ha, 0, 0, MK_SYNC_ALL) != QLA2X00_SUCCESS)
++			return (QL_STATUS_ERROR);
++		ha->marker_needed = 0;
++	}
++
++	spin_lock_irqsave(&ha->hardware_lock, flags);
++
++	mbxentry = (struct mbx_entry *)qla2x00_req_pkt(ha);
++	if (mbxentry == NULL) {
++		DEBUG3(printk("%s(): failed\n", __func__);)
++
++		spin_unlock_irqrestore(&ha->hardware_lock, flags);
++
++		return (QL_STATUS_ERROR);
++	}
++
++	/* Build fabric logout MBX IOCB */
++	mbxentry->entry_type = ET_MAILBOX_COMMAND;
++	mbxentry->entry_count = 1;
++	mbxentry->sys_define1 = SOURCE_SCSI;
++	mbxentry->entry_status = 0;
++	mbxentry->handle = cpu_to_le32(device->dev_id |
++				(MBC_LOGOUT_FABRIC_PORT << 16));
++	mbxentry->loop_id = device->loop_id;
++	mbxentry->mb0 = __constant_cpu_to_le16(MBC_LOGOUT_FABRIC_PORT);
++	mbxentry->mb1 = cpu_to_le16(device->loop_id << 8);
++	mbxentry->mb2 = __constant_cpu_to_le16(0);
++	mbxentry->mb3 = __constant_cpu_to_le16(0);
++	mbxentry->mb6 = __constant_cpu_to_le16(0);
++	mbxentry->mb7 = __constant_cpu_to_le16(0);
++
++	/* Issue command to ISP */
++	qla2x00_isp_cmd(ha);
++
++	spin_unlock_irqrestore(&ha->hardware_lock, flags);
++
++	return (QL_STATUS_SUCCESS);
++}
++
++/**
++ * qla2x00_mailbox_iocb_done() - Process an mailbox IOCB completion.
++ * @ha: SCSI driver HA context
++ * @mbxentry: completed mailbox IOCB entry
++ *
++ * This routine is currently used for fabric login and logouts only.
++ */
++static void
++qla2x00_mailbox_iocb_done(scsi_qla_host_t *ha, struct mbx_entry *mbxentry)
++{
++	int		status;
++	uint16_t	cmd;
++	uint16_t	index;
++	fcdev		*device;
++
++// FIXME: endianess?
++	/* Parse-out originating mailbox command */
++	cmd = MSW(mbxentry->handle);
++
++	DEBUG2(printk("%s: cmd %x, status %x, mb0 %x, mb1 %x, mb2 %x\n",
++			__func__,
++			cmd,
++			mbxentry->status,
++			mbxentry->mb0,
++			mbxentry->mb1,
++			mbxentry->mb2);)
++
++	/* Get device block pointer */
++	index = LSW(mbxentry->handle);
++	if (index >= QLLAN_MAX_IP_DEVICES) {
++		/* Bad handle from ISP */
++		DEBUG3(printk("%s: bad handle from isp\n", __func__);)
++
++		/* TODO: Cleanup??? */
++
++		return;
++	}
++// FIXME FROM HERE!!!
++	ipdev = &ha->ipdev_db[index];
++
++	if (cmd == MBC_LOGOUT_FABRIC_PORT) {
++		/* Check fabric logout completion status */
++		if (/*mbxentry->status == CS_COMPLETE && */
++			mbxentry->mb0 == MBS_COMMAND_COMPLETE) {
++
++			/* Logout successful -- do nothing */
++		}
++		else {
++			DEBUG12(printk("%s: fabric logout failed\n", __func__);)
++		}
++	}
++	else {
++		/* Check fabric login completion status */
++		/* Note: sometimes ISP returns Status=0x30 and MB0=0x4000 */
++		/* Therefore, only check mb0 for now */
++		if (/* mbxentry->status == CS_COMPLETE && */
++			mbxentry->mb0 == MBS_COMMAND_COMPLETE) {
++
++			/* Login successful */
++			ipdev->flags |= IP_DEV_FLAG_PRESENT;
++		}
++		else if (mbxentry->mb0 == MBS_PORT_ID_IN_USE) {
++			/* Different loop ID already assigned to port ID */
++			/* Use the one that is already assigned */
++			qla2x00_free_loopid(ha, ipdev->loop_id);
++			ipdev->loop_id = mbxentry->mb1;
++
++			/* Do logout first and then relogin */
++			qla2x00_ip_send_logout_port_iocb(ha, ipdev, 1);
++			qla2x00_ip_send_login_port_iocb(ha, ipdev, 1);
++		}
++		else if (mbxentry->mb0 == MBS_LOOP_ID_IN_USE) {
++			/* Loop ID already used for different port ID */
++			/* Get a new loop ID and reissue login request */
++			status = qla2x00_reserve_loopid(ha, &ipdev->loop_id);
++			if (status == QL_STATUS_SUCCESS) {
++				qla2x00_ip_send_login_port_iocb(ha, ipdev, 1);
++			}
++			else {
++				DEBUG12(printk("%s: out of loop IDs\n",
++						__func__);)
++
++				qla2x00_free_ip_block(ha, ipdev);
++			}
++		}
++		else {
++			/* Login failed, return resources */
++			DEBUG12(printk("%s: fabric login failed\n", __func__);)
++
++			qla2x00_free_loopid(ha, ipdev->loop_id);
++			qla2x00_free_ip_block(ha, ipdev);
++		}
++	}
++}
++
++#endif
++
++
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qla_ip.c	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,1769 @@
++/******************************************************************************
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ ******************************************************************************/
++
++/****************************************************************************
++              Please see revision.notes for revision history.
++*****************************************************************************/
++
++static __u8	hwbroadcast_addr[ETH_ALEN] = { [0 ... ETH_ALEN-1] = 0xFF };
++
++
++/**
++ * qla2x00_ip_initialize() - Initialize RISC IP support.
++ * @ha: SCSI driver HA context
++ *
++ * Prior to RISC IP initialization, this routine, if necessary, will reset all
++ * buffers in the receive buffer ring.
++ *
++ * Returns TRUE if the RISC IP initialization succeeds.
++ */
++static int
++qla2x00_ip_initialize(scsi_qla_host_t *ha)
++{
++	int		i;
++	int		status;
++	unsigned long	flags;
++	device_reg_t	*reg;
++	static mbx_cmd_t mc;
++	mbx_cmd_t	*mcp = &mc;
++	struct ip_init_cb *ipinit_cb;
++	dma_addr_t	ipinit_cb_dma;
++
++	DEBUG12(printk("%s: enter\n", __func__);)
++
++	status = FALSE;
++
++	/* Initialize IP data in ha */
++	ha->ipdev_db_top = NULL;
++	ha->ipdev_db_bottom = NULL;
++	ha->ipdev_db_next_free = &ha->ipdev_db[0];
++	for (i = 0; i < QLLAN_MAX_IP_DEVICES; i++) {
++		ha->ipdev_db[i].index = i;
++		ha->ipdev_db[i].next = &ha->ipdev_db[i+1];
++	}
++	ha->ipdev_db[QLLAN_MAX_IP_DEVICES-1].next = NULL;
++
++	/* Reset/pack buffers owned by RISC in receive buffer ring */
++	if (ha->rec_entries_in != ha->rec_entries_out) {
++		struct buffer_cb	*bcb;
++		uint16_t		rec_out;
++		struct risc_rec_entry	*rec_entry;
++
++		bcb = ha->receive_buffers;
++		rec_out = ha->rec_entries_out;
++
++		/*
++		 * Must locate all RISC owned buffers and pack them in the
++		 * buffer ring.
++		 */
++		/* between IpBufferOut and IpBufferIN */
++		for (i = 0; i < ha->max_receive_buffers; i++, bcb++) {
++			if (test_bit(BCB_RISC_OWNS_BUFFER, &bcb->state)) {
++				/*
++				 * Set RISC owned buffer into receive buffer
++				 * ring.
++				 */
++				rec_entry = &ha->risc_rec_q[rec_out];
++				rec_entry->handle = bcb->handle;
++				rec_entry->data_addr_low =
++					LSD(bcb->skb_data_dma);
++			       	rec_entry->data_addr_high =
++					MSD(bcb->skb_data_dma);
++				if (rec_out < IP_BUFFER_QUEUE_DEPTH - 1)
++					rec_out++;
++				else
++					rec_out = 0;
++			}
++		}
++
++		/* Verify correct number of RISC owned buffers were found */
++		if (rec_out != ha->rec_entries_in) {
++			/* Incorrect number of RISC owned buffers?? */
++			DEBUG12(printk("%s: incorrect number of RISC "
++					"owned buffers, disable IP\n",
++					__func__);)
++			ha->flags.enable_ip = FALSE;
++			return (FALSE);
++		}
++	}
++
++	/* Init RISC buffer pointer */
++	spin_lock_irqsave(&ha->hardware_lock, flags);
++	reg = ha->iobase;
++	WRT_REG_WORD(&reg->mailbox8, ha->rec_entries_in);
++	spin_unlock_irqrestore(&ha->hardware_lock, flags);
++
++	/* Wait for a ready state from the adapter */
++	while (!ha->init_done || ha->dpc_active) {
++		set_current_state(TASK_INTERRUPTIBLE);
++		schedule_timeout(HZ);
++	}
++
++	/* Setup IP initialization control block */
++	ipinit_cb = pci_alloc_consistent(ha->pdev,
++				sizeof(struct ip_init_cb), 
++				&ipinit_cb_dma);
++	if (ipinit_cb) {
++		memset(ipinit_cb, 0, sizeof(struct ip_init_cb));
++		ipinit_cb->version = IPICB_VERSION;
++		ipinit_cb->firmware_options =
++			__constant_cpu_to_le16(
++				IPICB_OPTION_NO_BROADCAST_FASTPOST |
++				 IPICB_OPTION_64BIT_ADDRESSING);
++		ipinit_cb->header_size = cpu_to_le16(ha->header_size);
++		ipinit_cb->mtu = cpu_to_le16((uint16_t)ha->mtu);
++		ipinit_cb->receive_buffer_size =
++			cpu_to_le16((uint16_t)ha->receive_buff_data_size);
++		ipinit_cb->receive_queue_size =
++			 __constant_cpu_to_le16(IP_BUFFER_QUEUE_DEPTH);
++		ipinit_cb->low_water_mark =
++			 __constant_cpu_to_le16(IPICB_LOW_WATER_MARK);
++		ipinit_cb->receive_queue_addr[0] =
++			cpu_to_le16(LSW(ha->risc_rec_q_dma));
++		ipinit_cb->receive_queue_addr[1] =
++			cpu_to_le16(MSW(ha->risc_rec_q_dma));
++		ipinit_cb->receive_queue_addr[2] =
++			cpu_to_le16(LSW(MSD(ha->risc_rec_q_dma)));
++		ipinit_cb->receive_queue_addr[3] =
++			cpu_to_le16(MSW(MSD(ha->risc_rec_q_dma)));
++		ipinit_cb->receive_queue_in = cpu_to_le16(ha->rec_entries_out);
++		ipinit_cb->fast_post_count =
++			 __constant_cpu_to_le16(IPICB_FAST_POST_COUNT);
++		ipinit_cb->container_count =
++			 __constant_cpu_to_le16(IPICB_BUFFER_CONTAINER_COUNT);
++		ipinit_cb->resource_allocation =
++			 __constant_cpu_to_le16(IPICB_IOCB_RESERVE_COUNT);
++
++		/* Issue mailbox command to initialize IP firmware */
++		mcp->mb[0] = MBC_INITIALIZE_IP;
++		mcp->mb[2] = MSW(ipinit_cb_dma);
++		mcp->mb[3] = LSW(ipinit_cb_dma);
++		mcp->mb[6] = MSW(MSD(ipinit_cb_dma));
++		mcp->mb[7] = LSW(MSD(ipinit_cb_dma));
++		mcp->out_mb = MBX_7|MBX_6|MBX_3|MBX_2|MBX_0;
++		mcp->in_mb = MBX_0;
++		mcp->tov = 30;
++		mcp->buf_size = sizeof(struct ip_init_cb);
++		mcp->flags = MBX_DMA_OUT;
++
++		status = qla2x00_mailbox_command(ha, mcp);
++		if (status == QL_STATUS_SUCCESS) {
++			/* IP initialization successful */
++			DEBUG12(printk("%s: successful\n", __func__);)
++
++			ha->flags.enable_ip = TRUE;
++
++			/* Force database update */
++			set_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags);
++			set_bit(LOCAL_LOOP_UPDATE, &ha->dpc_flags);
++			set_bit(REGISTER_FC4_NEEDED, &ha->dpc_flags);
++
++			/* qla2x00_loop_resync(ha); */
++			if (ha->dpc_wait && !ha->dpc_active) {
++				up(ha->dpc_wait);
++			}
++			status = TRUE;
++		}
++		else {
++			DEBUG12(printk("%s: MBC_INITIALIZE_IP "
++					"failed %x MB0 %x\n",
++					__func__, 
++					status,
++					mcp->mb[0]);)
++			status = FALSE;
++		}
++		pci_free_consistent(ha->pdev, sizeof(struct ip_init_cb),
++					ipinit_cb, ipinit_cb_dma);
++
++	}
++	else {
++		DEBUG12(printk("%s: memory allocation error\n", __func__);)
++	}
++
++	return (status);
++}
++
++/**
++ * qla2x00_ip_send_complete() - Handle IP send completion.
++ * @ha: SCSI driver HA context
++ * @handle: handle to completed send_cb
++ * @comp_status: Firmware completion status of send_cb
++ *
++ * Upon cleanup of the internal active-scb queue, the IP driver is notified of
++ * the completion.
++ */
++static void
++qla2x00_ip_send_complete(scsi_qla_host_t *ha,
++			uint32_t handle, uint16_t comp_status)
++{
++	struct send_cb *scb;
++
++	/* Set packet pointer from queue entry handle */
++	if (handle < MAX_SEND_PACKETS) {
++		scb = ha->active_scb_q[handle];
++		if (scb) {
++			ha->ipreq_cnt--;
++			ha->active_scb_q[handle] = NULL;
++
++			scb->comp_status = comp_status;
++			pci_unmap_single(ha->pdev,
++					scb->skb_data_dma,
++					scb->skb->len,
++					PCI_DMA_TODEVICE);
++	
++			/* Return send packet to IP driver */
++			(*ha->send_completion_routine)(scb);
++			return;
++		}
++	}
++
++	/* Invalid handle from RISC, reset RISC firmware */
++	printk(KERN_WARNING
++		"%s: Bad IP send handle %x - aborting ISP\n",
++		__func__, handle);
++
++	set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
++}
++
++/**
++ * qla2x00_ip_receive() - Handle IP receive IOCB.
++ * @ha: SCSI driver HA context
++ * @pkt: RISC IP receive packet
++ *
++ * Upon preparation of one or more buffer_cbs, the IP driver is notified of
++ * the received packet.
++ */
++static void
++qla2x00_ip_receive(scsi_qla_host_t *ha, response_t *pkt)
++{
++	uint32_t	handle;
++	uint32_t	packet_size;
++	uint16_t	linked_bcb_cnt;
++	uint32_t	rec_data_size;
++	uint16_t	comp_status;
++	struct buffer_cb *bcb;
++	struct buffer_cb *nbcb;
++	struct ip_rec_entry *iprec_entry;
++
++	DEBUG12(printk("%s: enter\n", __func__);)
++
++	iprec_entry = (struct ip_rec_entry *)pkt;
++	comp_status = le16_to_cpu(iprec_entry->comp_status);
++
++	/* If split buffer, set header size for 1st buffer */
++	if (comp_status & IPREC_STATUS_SPLIT_BUFFER)
++		rec_data_size = ha->header_size;
++	else
++		rec_data_size = ha->receive_buff_data_size;
++
++	handle = iprec_entry->buffer_handles[0];
++	if (handle >= ha->max_receive_buffers) {
++		/* Invalid handle from RISC, reset RISC firmware */
++		printk(KERN_WARNING
++			"%s: Bad IP buffer handle %x (> buffer_count)...Post "
++			"ISP Abort\n",
++			__func__,
++			handle);
++		set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
++		return;
++	}
++
++	bcb = &ha->receive_buffers[handle];
++
++	if (!test_and_clear_bit(BCB_RISC_OWNS_BUFFER, &bcb->state)) {
++		/* Invalid handle from RISC, reset RISC firmware */
++		printk(KERN_WARNING
++			"%s: Bad IP buffer handle %x (!RISC_owned)...Post "
++			"ISP Abort\n",
++			__func__,
++			handle);
++		set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
++		return;
++	}
++
++	packet_size = le16_to_cpu(iprec_entry->sequence_length);
++	bcb->comp_status = comp_status;
++	bcb->packet_size = packet_size;
++	nbcb = bcb;
++
++	/* Prepare any linked buffers */
++	for (linked_bcb_cnt = 1; ; linked_bcb_cnt++) {
++		if (packet_size > rec_data_size) {
++			nbcb->rec_data_size = rec_data_size;
++			packet_size -= rec_data_size;
++
++			/*
++			 * If split buffer, only use header size on 1st buffer
++			 */
++			rec_data_size = ha->receive_buff_data_size;
++
++			handle = iprec_entry->buffer_handles[linked_bcb_cnt];
++			if (handle >= ha->max_receive_buffers) {
++				/*
++				 * Invalid handle from RISC reset RISC firmware
++				 */
++				printk(KERN_WARNING
++					"%s: Bad IP buffer handle %x (> "
++					"buffer_count - PS)...Post ISP Abort\n",
++					__func__,
++					handle);
++				set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
++				return;
++			}
++			nbcb->next_bcb = &ha->receive_buffers[handle];
++			nbcb = nbcb->next_bcb;
++
++			if (!test_and_clear_bit(BCB_RISC_OWNS_BUFFER,
++							&nbcb->state)) {
++				/*
++				 * Invalid handle from RISC reset RISC firmware
++				 */
++				printk(KERN_WARNING
++					"%s: Bad IP buffer handle %x "
++					"(!RISC_owned - PS)...Post ISP Abort\n",
++					__func__,
++					handle);
++				set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
++				return;
++			}
++		}
++		else {
++			/* Single buffer_cb */
++			nbcb->rec_data_size = packet_size;
++			nbcb->next_bcb = NULL;
++			break;
++		}
++	}
++
++	/* Check for incoming ARP packet with matching IP address */
++	if (le16_to_cpu(iprec_entry->service_class) == 0) {
++		uint8_t	port_id[3];
++		struct ip_device *ipdev;
++		struct packet_header *packethdr;
++
++		packethdr = (struct packet_header *)bcb->skb_data;
++
++		/* Scan list of IP devices to see if login needed */
++		for (ipdev = ha->ipdev_db_top; ipdev; ipdev = ipdev->next) {
++			if (!memcmp(&ipdev->port_name[2],
++				packethdr->networkh.s.na.addr, ETH_ALEN)) {
++				/* Device already in IP list, skip login */
++				goto skip_device_login;
++			}
++		}
++
++		/* Device not in list, need to do login */
++		port_id[2] = iprec_entry->s_idhigh;
++// FIXME: endianess?
++		port_id[1] = MSB(iprec_entry->s_idlow);
++		port_id[0] = LSB(iprec_entry->s_idlow);
++
++		/* Make sure its not a local device */
++		if (port_id[2] == ha->d_id.b.domain &&
++			port_id[1] == ha->d_id.b.area) {
++
++			goto skip_device_login;
++		}
++
++		if (qla2x00_add_new_ip_device(ha,
++					PUBLIC_LOOP_DEVICE,
++					port_id,
++					packethdr->networkh.s.fcaddr,
++					TRUE,
++					1) == QL_STATUS_FATAL_ERROR) {
++
++			/* Fatal error, reinitialize */
++			set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
++		}
++
++	}
++
++skip_device_login:
++
++	/* Pass received packet to IP driver */
++	bcb->linked_bcb_cnt = linked_bcb_cnt;
++	(*ha->receive_packets_routine)(ha->receive_packets_context, bcb);
++
++	/* Keep track of RISC buffer pointer (for IP reinit) */
++	ha->rec_entries_out += linked_bcb_cnt;
++	if (ha->rec_entries_out >= IP_BUFFER_QUEUE_DEPTH)
++		ha->rec_entries_out -= IP_BUFFER_QUEUE_DEPTH;
++}
++
++/**
++ * qla2x00_ip_receive_fastpost() - Handle IP receive fastpost.
++ * @ha: SCSI driver HA context
++ * @type: RISC fastpost type
++ *
++ * Upon preparation of one or more buffer_cbs, the IP driver is notified of
++ * the received packet.
++ */
++static void
++qla2x00_ip_receive_fastpost(scsi_qla_host_t *ha, uint16_t type)
++{
++	uint32_t	handle;
++	uint32_t	packet_size;
++	uint16_t	linked_bcb_cnt;
++	uint32_t	rec_data_size;
++	volatile uint16_t *next_mb;
++	device_reg_t	*reg = ha->iobase;
++	struct buffer_cb *bcb;
++	struct buffer_cb *nbcb;
++
++	DEBUG12(printk("%s: enter\n", __func__);)
++
++	next_mb = &reg->mailbox10;
++
++	/* If split buffer, set header size for 1st buffer */
++	if (type == MBA_IP_RECEIVE_COMPLETE_SPLIT)
++		rec_data_size = ha->header_size;
++	else
++		rec_data_size = ha->receive_buff_data_size;
++
++	handle = RD_REG_WORD(next_mb);
++	if (handle >= ha->max_receive_buffers) {
++		goto invalid_handle;
++	}
++
++	bcb = &ha->receive_buffers[handle];
++
++	if (!test_and_clear_bit(BCB_RISC_OWNS_BUFFER, &bcb->state)) {
++		goto invalid_handle;
++	}
++
++	packet_size = RD_REG_WORD(&reg->mailbox3);
++	/* Fastpost entries are always successfully transferred */
++	bcb->comp_status = CS_COMPLETE;
++	bcb->packet_size = packet_size;
++	nbcb = bcb;
++
++	/* Prepare any linked buffers */
++	for (linked_bcb_cnt = 1; ; linked_bcb_cnt++) {
++		if (packet_size > rec_data_size) {
++			nbcb->rec_data_size = rec_data_size;
++			packet_size -= rec_data_size;
++			/*
++			 * If split buffer, only use header size on 1st buffer
++			 */
++			rec_data_size = ha->receive_buff_data_size;
++
++			next_mb++;
++			handle = RD_REG_WORD(next_mb);
++			if (handle >= ha->max_receive_buffers) {
++invalid_handle:
++				printk(KERN_WARNING
++					"%s: bad IP receive fast post handle "
++					"%x\n", 
++					__func__,
++					handle);
++				set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
++				return;
++			}
++
++			nbcb->next_bcb = &ha->receive_buffers[handle];
++			nbcb = nbcb->next_bcb;
++
++			if (!test_and_clear_bit(BCB_RISC_OWNS_BUFFER,
++							&nbcb->state)) {
++				goto invalid_handle;
++			}
++		}
++		else {
++			/* Single buffer_cb */
++			nbcb->rec_data_size = packet_size;
++			nbcb->next_bcb = NULL;
++			break;
++		}
++	}
++
++	/* Pass received packet to IP driver */
++	bcb->linked_bcb_cnt = linked_bcb_cnt;
++	(*ha->receive_packets_routine)(ha->receive_packets_context, bcb);
++
++	/* Keep track of RISC buffer pointer (for IP reinit) */
++	ha->rec_entries_out += linked_bcb_cnt;
++	if (ha->rec_entries_out >= IP_BUFFER_QUEUE_DEPTH)
++		ha->rec_entries_out -= IP_BUFFER_QUEUE_DEPTH;
++}
++
++/**
++ * qla2x00_convert_to_arp() - Convert an IP send packet to an ARP packet
++ * @ha: SCSI driver HA context
++ * @scb: The send_cb structure to convert
++ *
++ * Returns TRUE if conversion successful.
++ */
++static int
++qla2x00_convert_to_arp(scsi_qla_host_t *ha, struct send_cb *scb)
++{
++	struct sk_buff		*skb;
++	struct packet_header	*packethdr;
++	struct arp_header	*arphdr;
++	struct ip_header	*iphdr;
++
++	DEBUG12(printk("%s: convert packet to ARP\n", __func__);)
++
++	skb = scb->skb;
++	packethdr = scb->header;
++	arphdr = (struct arp_header *)skb->data;
++	iphdr  = (struct ip_header *)skb->data;
++
++	if (packethdr->snaph.ethertype == __constant_htons(ETH_P_IP)) {
++		/* Convert IP packet to ARP packet */
++		packethdr->networkh.d.na.naa = NAA_IEEE_MAC_TYPE;
++		packethdr->networkh.d.na.unused = 0;
++		memcpy(packethdr->networkh.d.na.addr,
++				hwbroadcast_addr, ETH_ALEN);
++		packethdr->snaph.ethertype = __constant_htons(ETH_P_ARP);
++
++		arphdr->ar_tip = iphdr->iph.daddr;
++		arphdr->ar_sip = iphdr->iph.saddr;
++		arphdr->arph.ar_hrd = __constant_htons(ARPHRD_IEEE802);
++		arphdr->arph.ar_pro = __constant_htons(ETH_P_IP);
++		arphdr->arph.ar_hln = ETH_ALEN;
++		arphdr->arph.ar_pln = sizeof(iphdr->iph.daddr); /* 4 */
++		arphdr->arph.ar_op = __constant_htons(ARPOP_REQUEST);
++		memcpy(arphdr->ar_sha, packethdr->networkh.s.na.addr, ETH_ALEN);
++		memset(arphdr->ar_tha, 0, ETH_ALEN);
++
++		skb->len = sizeof(struct arp_header);
++
++		return (TRUE);
++	}
++	else {
++		return (FALSE);
++	}
++}
++
++/**
++ * qla2x00_get_ip_loopid() - Retrieve loop id of an IP device.
++ * @ha: SCSI driver HA context
++ * @packethdr: IP device to remove
++ * @loop_id: loop id of discovered device
++ *
++ * This routine will interrogate the packet header to determine if the sender is
++ * in the list of active IP devices.  The first two bytes of the destination
++ * address will be modified to match the port name stored in the active IP
++ * device list.
++ *
++ * Returns TRUE if a valid loop id is returned.
++ */
++static int
++qla2x00_get_ip_loopid(scsi_qla_host_t *ha,
++		struct packet_header *packethdr, uint8_t *loop_id)
++{
++	struct ip_device *ipdev;
++
++	/* Scan list of logged in IP devices for match */
++	for (ipdev = ha->ipdev_db_top; ipdev; ipdev = ipdev->next) {
++		if (memcmp(&ipdev->port_name[2],
++				&(packethdr->networkh.d.fcaddr[2]), ETH_ALEN))
++			continue;
++
++		/* Found match, return loop ID  */
++		*loop_id = (uint8_t)ipdev->loop_id;
++
++		/* Update first 2 bytes of port name */
++		packethdr->networkh.d.fcaddr[0] = ipdev->port_name[0];
++		packethdr->networkh.d.fcaddr[1] = ipdev->port_name[1];
++
++		if (ipdev != ha->ipdev_db_top) {
++			/* Device not at top, move it to top of list */
++			/* Unhook it first */
++			if (ipdev == ha->ipdev_db_bottom) {
++				ha->ipdev_db_bottom = ipdev->last;
++				ipdev->last->next = NULL;
++			}
++			else {
++				ipdev->last->next = ipdev->next;
++				ipdev->next->last = ipdev->last;
++			}
++
++			/* Now put it at top of list */
++			ipdev->next = ha->ipdev_db_top;
++			ipdev->last = NULL;
++			ha->ipdev_db_top->last = ipdev;
++			ha->ipdev_db_top = ipdev;
++		}
++		return (TRUE);
++	}
++
++	/* Check for broadcast packet */
++	if (!memcmp(packethdr->networkh.d.na.addr,
++				hwbroadcast_addr, ETH_ALEN)) {
++		/* Broadcast packet, return broadcast loop ID  */
++		*loop_id = BROADCAST;
++
++		/* Update destination NAA of header */
++		packethdr->networkh.d.na.naa = NAA_IEEE_MAC_TYPE;
++		packethdr->networkh.d.na.unused = 0;
++
++		return (TRUE);
++	}
++
++	/* Check for multicast packet */
++	if (packethdr->networkh.d.na.addr[0] & 0x01) {
++		/* Use broadcast loop ID for multicast packets  */
++		*loop_id = BROADCAST;
++
++		/* Update destination NAA of header */
++		packethdr->networkh.d.na.naa = NAA_IEEE_MAC_TYPE;
++		packethdr->networkh.d.na.unused = 0;
++
++		return (TRUE);
++	}
++
++	/* TODO */
++	/* Try sending FARP IOCB to request login */
++
++	DEBUG12(printk("%s: ID not found for "
++			"XX XX %02x %02x %02x %02x %02x %02x\n",
++			__func__,
++			packethdr->networkh.d.na.addr[0],
++			packethdr->networkh.d.na.addr[1],
++			packethdr->networkh.d.na.addr[2],
++			packethdr->networkh.d.na.addr[3],
++			packethdr->networkh.d.na.addr[4],
++			packethdr->networkh.d.na.addr[5]);)
++
++	return (FALSE);
++}
++
++/**
++ * qla2x00_reserve_loopid() - Reserve an unused public loop id.
++ * @ha: SCSI driver HA context
++ * @loop_id: loop id reserved
++ *
++ * Returns QL_STATUS_SUCCESS if a valid loop id is returned.
++ */
++static int
++qla2x00_reserve_loopid(scsi_qla_host_t *ha, uint16_t *loop_id)
++{
++	int i;
++
++	/* Look for unused loop ID */
++	for (i = ha->min_external_loopid; i < ha->max_public_loop_ids; i++) {
++		if (ha->fabricid[i].in_use)
++			continue;
++
++		/* Found free loop ID */
++		ha->fabricid[i].in_use = TRUE;
++		*loop_id = i;
++
++		DEBUG12(printk("%s: assigned loop ID %x\n",
++				__func__,
++				*loop_id);)
++
++		return (QL_STATUS_SUCCESS);
++	}
++
++	/* Out of loop IDs */
++	*loop_id = ha->max_public_loop_ids + 1;     /* Set out of range */
++
++	DEBUG12(printk("%s: out of loop IDs\n", __func__);)
++
++	return (QL_STATUS_RESOURCE_ERROR);
++}
++
++/**
++ * qla2x00_free_loopid() - Free a public loop id.
++ * @ha: SCSI driver HA context
++ * @loop_id: loop id to free
++ */
++static void
++qla2x00_free_loopid(scsi_qla_host_t *ha, uint16_t loop_id)
++{
++	if (loop_id < ha->max_public_loop_ids) {
++		ha->fabricid[loop_id].in_use = FALSE;
++		DEBUG12(printk("%s: free loop ID %x\n",
++				__func__,
++				loop_id);)
++	}
++	else {
++		DEBUG12(printk("%s: loop ID %x out of range\n",
++				__func__,
++				loop_id);)
++	}
++}
++
++
++/**
++ * qla2x00_add_new_ip_device() - Add a new IP capable device to the list.
++ * @ha: SCSI driver HA context
++ * @loop_id: loop id, if a private loop, of the new device
++ * @port_id: port id of the new device
++ * @port_name: port name of the new device
++ * @force_add: should the function force the addition of the device
++ * @ha_locked: Flag indicating if the function is called with the hardware lock
++ *
++ * Prior to RISC IP initialization, this routine, if necessary, will reset all
++ * buffers in the receive buffer ring.
++ *
++ * Returns QL_STATUS_SUCCESS if there were no errors adding the device.
++ */
++static int
++qla2x00_add_new_ip_device(scsi_qla_host_t *ha,
++			     uint16_t loop_id,
++			     uint8_t *port_id,
++			     uint8_t *port_name,
++			     int force_add,
++			     uint32_t ha_locked)
++{
++	int	status;
++	struct ip_device *ipdev;
++
++	/* Get free IP device block */
++	status = qla2x00_reserve_ip_block(ha, &ipdev);
++	if (status == QL_STATUS_RESOURCE_ERROR) {
++		if (!force_add)
++			return (status);
++
++		/*
++		 * Out of IP blocks, bump public device at bottom of list
++		 */
++		DEBUG12(printk("%s: bump device from IP list\n", __func__);)
++
++		for (ipdev = ha->ipdev_db_bottom; ipdev; ipdev = ipdev->last) {
++			if (!(ipdev->flags & IP_DEV_FLAG_PUBLIC_DEVICE))
++				continue;
++
++			/* Do fabric logout and free loop ID */
++			qla2x00_ip_send_logout_port_iocb(ha, ipdev, ha_locked);
++			qla2x00_free_loopid(ha, ipdev->loop_id);
++
++			/* Move device to top of list */
++			qla2x00_free_ip_block(ha, ipdev);
++			status = qla2x00_reserve_ip_block(ha, &ipdev);
++			break;
++		}
++		if (status != QL_STATUS_SUCCESS)
++			return (status);
++	}
++
++	/* Save IP port name */
++	memcpy(ipdev->port_name, port_name, WWN_SIZE);
++
++	if (loop_id != PUBLIC_LOOP_DEVICE) {
++		/* Private loop device */
++		ipdev->loop_id = loop_id;
++		ipdev->flags = IP_DEV_FLAG_PRESENT;
++
++		DEBUG12(printk("%s: WWN:%02x%02x%02x%02x%02x%02x%02x%02x, "
++				"LoopID:%x\n",
++				__func__,
++				ipdev->port_name[0],
++				ipdev->port_name[1],
++				ipdev->port_name[2],
++				ipdev->port_name[3],
++				ipdev->port_name[4],
++				ipdev->port_name[5],
++				ipdev->port_name[6],
++				ipdev->port_name[7],
++				ipdev->loop_id);)
++	}
++	else {
++		/* Public device */
++		/* Reserve public loop ID, save it in database */
++		status = qla2x00_reserve_loopid(ha, &ipdev->loop_id);
++		if (status == QL_STATUS_RESOURCE_ERROR) {
++			struct ip_device *ipdev_bump;
++
++			if (!force_add) { 
++				/* Failed to get loop ID */
++				DEBUG12(printk("%s: failed to get loop ID\n",
++						__func__);)
++				qla2x00_free_ip_block(ha, ipdev);
++
++				return (status);
++			}
++
++			/*
++			 * Out of loop IDs, bump public device at bottom of
++			 * list.
++			 */
++			DEBUG12(printk("%s: bump device from IP list\n",
++					__func__);)
++
++			for (ipdev_bump = ha->ipdev_db_bottom;
++				ipdev_bump;
++				ipdev_bump = ipdev_bump->last) {
++
++				if (!(ipdev_bump->flags &
++						IP_DEV_FLAG_PUBLIC_DEVICE))
++					continue;
++
++				/*
++				 * Do fabric logout, steal loop ID, free bumped
++				 * IP block.
++				 */
++				qla2x00_ip_send_logout_port_iocb(ha,
++						ipdev_bump, ha_locked);
++				ipdev->loop_id = ipdev_bump->loop_id;
++				qla2x00_free_ip_block(ha, ipdev_bump);
++
++				status = QL_STATUS_SUCCESS;
++				break;
++			}
++
++			if (status != QL_STATUS_SUCCESS) {
++				/* Failed to get loop ID */
++				DEBUG12(printk("%s: failed to get loop ID\n",
++						__func__);)
++				qla2x00_free_ip_block(ha, ipdev);
++
++				return (status);
++			}
++		}
++
++		/* Save device data */
++		ipdev->port_id[0] = port_id[0];
++		ipdev->port_id[1] = port_id[1];
++		ipdev->port_id[2] = port_id[2];
++		ipdev->flags = IP_DEV_FLAG_PUBLIC_DEVICE;
++
++		/* Login public device */
++		status = qla2x00_ip_send_login_port_iocb(ha, ipdev, ha_locked);
++		if (status == QL_STATUS_SUCCESS) {
++			DEBUG12(printk("%s: "
++					"WWN:%02x%02x%02x%02x%02x%02x%02x%02x, "
++					"LoopID:%x, PortID:%x\n",
++					__func__,
++					ipdev->port_name[0],
++					ipdev->port_name[1],
++					ipdev->port_name[2],
++					ipdev->port_name[3],
++					ipdev->port_name[4],
++					ipdev->port_name[5],
++					ipdev->port_name[6],
++					ipdev->port_name[7],
++					ipdev->loop_id,
++					ipdev->port_id[2]<<16 |
++					ipdev->port_id[1]<<8 |
++					ipdev->port_id[0]);)
++		}
++		else {
++			/* Login failed, return resources */
++			qla2x00_free_loopid(ha, ipdev->loop_id);
++			qla2x00_free_ip_block(ha, ipdev);
++		}
++	}
++
++	return (status);
++}
++
++/**
++ * qla2x00_free_ip_block() - Remove an IP device from the active IP list.
++ * @ha: SCSI driver HA context
++ * @ipdev: IP device to remove
++ */
++static void
++qla2x00_free_ip_block(scsi_qla_host_t *ha, struct ip_device *ipdev)
++{
++	/* Unhook IP device block from active list */
++	if (ipdev->last == NULL)
++		ha->ipdev_db_top = ipdev->next;
++	else
++		ipdev->last->next = ipdev->next;
++
++	if (ipdev->next == NULL)
++		ha->ipdev_db_bottom = ipdev->last;
++	else
++		ipdev->next->last = ipdev->last;
++
++	/* Add IP device block to free list */
++	ipdev->next = ha->ipdev_db_next_free;
++	ha->ipdev_db_next_free = ipdev;
++}
++
++/**
++ * qla2x00_reserve_ip_block() - Move an IP device to the IP device list.
++ * @ha: SCSI driver HA context
++ * @ipdevblk: reserved IP device to add 
++ *
++ * This routine will move the unused @ipdevblk from the free list to the top of
++ * the active IP device list.
++ *
++ * Returns QL_STATUS_SUCCESS if the operation succeeded.
++ */
++static int
++qla2x00_reserve_ip_block(scsi_qla_host_t *ha, struct ip_device **ipdevblk)
++{
++	struct ip_device *ipdev;
++
++	/* Get free IP device block */
++	ipdev = ha->ipdev_db_next_free;
++	if (ipdev) { 
++		/* Remove IP device block from free list */
++		ha->ipdev_db_next_free = ipdev->next;
++
++		/* Add IP device block to top of IP device list */
++		ipdev->next = ha->ipdev_db_top;
++		ipdev->last = NULL;
++		if (ha->ipdev_db_top == NULL)
++			ha->ipdev_db_bottom = ipdev;
++		else
++			ha->ipdev_db_top->last = ipdev;
++		ha->ipdev_db_top = ipdev;
++
++		*ipdevblk = ipdev;
++
++		return (QL_STATUS_SUCCESS);
++	}
++
++	/* Out of IP blocks */
++	DEBUG12(printk("%s: out of IP blocks\n", __func__);)
++
++	return (QL_STATUS_RESOURCE_ERROR);
++}
++
++/**
++ * qla2x00_update_ip_device_data() - Update IP device list with driver data.
++ * @ha: SCSI driver HA context
++ * @fcdev: SCSI driver FC device list
++ *
++ * This routine searchs for the device port name in the current IP database and
++ * updates the IP device list.
++ *
++ * If device found:
++ *	- Handle device movement between public and private loops
++ *	- Mark device present
++ *	- Log in device if necessary
++ * If device not found and private loop device:
++ *	- Insert the new entry in database
++ * If device not found and public IP device:
++ * 	- Ignore device until packet received from device
++ *
++ * Returns QL_STATUS_SUCCESS if the operation succeeded.
++ */
++static int
++qla2x00_update_ip_device_data(scsi_qla_host_t *ha, fcdev_t *fcdev)
++{
++	int	status;
++	struct ip_device *ipdev;
++
++	status = 0;
++
++	if (!ha->flags.enable_ip) {
++		/* IP not enabled, just return */
++		return (QL_STATUS_SUCCESS);
++	}
++
++	/* Scan list of IP devices for match */
++	for (ipdev = ha->ipdev_db_top; ipdev; ipdev = ipdev->next) {
++		if (memcmp(fcdev->wwn, ipdev->port_name, WWN_SIZE))
++			continue;
++
++		/* Found device in IP device list */
++		DEBUG12(printk("%s: already in IP list, port ID: %x\n",
++				__func__,
++				ipdev->port_id[2] << 16 |
++				 ipdev->port_id[1] << 8 |
++				 ipdev->port_id[0]);)
++
++		if (fcdev->flag != DEV_PUBLIC &&
++			!(ipdev->flags & IP_DEV_FLAG_PUBLIC_DEVICE)) {
++			/*
++			 * Device on private loop now, was on private loop
++			 * before.
++			 */
++			DEBUG12(printk("%s: was private loop, now "
++					"private loop\n",
++					__func__);)
++
++			/* Update private loop ID in database */
++			ipdev->loop_id = fcdev->loop_id;
++			ipdev->flags |= IP_DEV_FLAG_PRESENT;
++		}
++		else if (fcdev->flag != DEV_PUBLIC &&
++				(ipdev->flags & IP_DEV_FLAG_PUBLIC_DEVICE)) {
++			/*
++			 * Device on private loop now, was public device before.
++			 */
++			DEBUG12(printk("%s: was public, now private loop\n",
++					__func__);)
++
++			/*
++			 * If loop ID changed, logout device and free loop ID.
++			 */
++			if (fcdev->loop_id != ipdev->loop_id) { 
++				qla2x00_ip_send_logout_port_iocb(ha, ipdev, 0);
++				qla2x00_free_loopid(ha, ipdev->loop_id);
++
++				/*
++				 * Clear public device flag and save private
++				 * loop ID in database.
++				 */
++				ipdev->flags &= ~IP_DEV_FLAG_PUBLIC_DEVICE;
++				ipdev->loop_id = fcdev->loop_id;
++			}
++			ipdev->flags |= IP_DEV_FLAG_PRESENT;
++		}
++		else if (fcdev->flag == DEV_PUBLIC &&
++				!(ipdev->flags & IP_DEV_FLAG_PUBLIC_DEVICE)) {
++			/*
++			 * Device public now, was on private loop before.
++			 */
++			DEBUG12(printk("%s: was private loop, now public\n",
++					__func__);)
++
++			/*
++			 * Reserve public loop ID, save it in database.
++			 */
++			status = qla2x00_reserve_loopid(ha, &ipdev->loop_id);
++			if (status == QL_STATUS_SUCCESS) { 
++				/*
++				 * Save port ID and set public device flag.
++				 */
++				ipdev->port_id[0] = fcdev->d_id.r.d_id[0];
++				ipdev->port_id[1] = fcdev->d_id.r.d_id[1];
++				ipdev->port_id[2] = fcdev->d_id.r.d_id[2];
++				ipdev->flags |= IP_DEV_FLAG_PUBLIC_DEVICE;
++
++				/* Login public device */
++				status = qla2x00_ip_send_login_port_iocb(ha,
++							ipdev, 0);
++			}
++			if (status == QL_STATUS_RESOURCE_ERROR) {
++				/* Out of loop IDs */
++				ipdev->flags &= ~IP_DEV_FLAG_PUBLIC_DEVICE;
++			}
++		}
++		else {
++			/*
++			 * Device public now, was public device before.
++			 */
++			DEBUG12(printk("%s: was public, now public\n",
++					__func__);)
++
++			/* Check if port ID changed */
++			if (ipdev->port_id[0] != fcdev->d_id.r.d_id[0] ||
++				ipdev->port_id[1] != fcdev->d_id.r.d_id[1] ||
++				ipdev->port_id[2] != fcdev->d_id.r.d_id[2]) {
++
++				/* Save new port ID */
++				ipdev->port_id[0] = fcdev->d_id.r.d_id[0];
++				ipdev->port_id[1] = fcdev->d_id.r.d_id[1];
++				ipdev->port_id[2] = fcdev->d_id.r.d_id[2];
++
++				DEBUG12(printk("%s: Port ID changed\n",
++						__func__);)
++
++				/* Logout public device */
++				qla2x00_ip_send_logout_port_iocb(ha, ipdev, 0);
++			}
++
++			/* Login public device */
++			status = qla2x00_ip_send_login_port_iocb(ha, ipdev, 0);
++			if (status == QL_STATUS_RESOURCE_ERROR) {
++				/* Out of loop IDs */
++				ipdev->flags &= ~IP_DEV_FLAG_PUBLIC_DEVICE;
++			}
++		}
++		return (status);
++	}
++
++	/* Device not found in database */
++	DEBUG12(printk("%s: device NOT in list\n", __func__);)
++
++	/* If private loop device, add device to IP list */
++	/* Public devices will be added as needed when packet received */
++	if (fcdev->flag != DEV_PUBLIC) {
++		/* Add (force) new private loop device to IP list */
++		status = qla2x00_add_new_ip_device(ha,
++					fcdev->loop_id,
++					NULL,
++					fcdev->wwn,
++					TRUE,
++					0);
++	}
++
++	/* The following code is temporary, until FARP supported */
++	/* Login all IP public devices for now */
++	if (fcdev->flag == DEV_PUBLIC) {
++		/* Add (don't force) new public device to IP list */
++		status = qla2x00_add_new_ip_device(ha,
++					PUBLIC_LOOP_DEVICE,
++					(uint8_t *)&fcdev->d_id,
++					fcdev->wwn,
++					FALSE,
++					0);
++	}
++
++	return (status);
++}
++
++/**
++ * qla2x00_ip_send_login_port_iocb() - Login to an IP device.
++ * @ha: SCSI driver HA context
++ * @ipdev: IP device to login to
++ * @ha_locked: Flag indicating if the function is called with the hardware lock
++ *
++ * This routine will build and send a mailbox IOCB to login to a fabric port.
++ *
++ * The qla2x00_ip_mailbox_iocb_done() routine will be called upon IOCB
++ * completion, where further processing is performed.
++ *
++ * Returns QL_STATUS_SUCCESS if the operation succeeded.
++ */
++static int
++qla2x00_ip_send_login_port_iocb(scsi_qla_host_t *ha,
++				struct ip_device *ipdev, uint32_t ha_locked)
++{
++	unsigned long	flags = 0;
++	struct mbx_entry *mbxentry;
++
++	DEBUG12(printk("%s: port ID: %x\n",
++			__func__,
++			ipdev->port_id[2]<<16 |
++			ipdev->port_id[1]<<8 |
++			ipdev->port_id[0]);)
++
++	/* Send marker if required */
++	if (ha->marker_needed != 0) {
++		if (ha_locked) {
++			if(__qla2x00_marker(ha,
++					0, 0, MK_SYNC_ALL) != QLA2X00_SUCCESS)
++				return (QL_STATUS_ERROR);
++		}
++		else {
++			if(qla2x00_marker(ha,
++					0, 0, MK_SYNC_ALL) != QLA2X00_SUCCESS)
++				return (QL_STATUS_ERROR);
++		}
++		ha->marker_needed = 0;
++	}
++
++	if (!ha_locked)
++		spin_lock_irqsave(&ha->hardware_lock, flags);
++
++	mbxentry = (struct mbx_entry *)qla2x00_req_pkt(ha);
++	if (mbxentry == NULL) {
++		DEBUG12(printk("%s: failed\n", __func__);)
++
++		if (!ha_locked)
++			spin_unlock_irqrestore(&ha->hardware_lock, flags);
++
++		return (QL_STATUS_ERROR);
++	}
++
++	/* Build fabric login MBX IOCB */
++	mbxentry->entry_type = ET_MAILBOX_COMMAND;
++	mbxentry->entry_count = 1;
++	mbxentry->sys_define1 = SOURCE_IP;
++	mbxentry->entry_status = 0;
++	mbxentry->handle = cpu_to_le32(ipdev->index |
++				(MBC_LOGIN_FABRIC_PORT << 16));
++	mbxentry->loop_id = ipdev->loop_id;
++	mbxentry->mb0 = __constant_cpu_to_le16(MBC_LOGIN_FABRIC_PORT);
++	mbxentry->mb1 = cpu_to_le16((ipdev->loop_id << 8) | 
++				(MBC_NO_PROCESS_LOGIN |
++				 MBC_NO_PLOGI_IF_LOGGED_IN));
++	mbxentry->mb2 = cpu_to_le16(ipdev->port_id[2]);
++	mbxentry->mb3 = cpu_to_le16((ipdev->port_id[1] << 8) |
++				ipdev->port_id[0]);
++	mbxentry->mb6 = __constant_cpu_to_le16(0);
++	mbxentry->mb7 = __constant_cpu_to_le16(0);
++
++	/* Issue command to ISP */
++	qla2x00_isp_cmd(ha);
++
++	if (!ha_locked)
++		spin_unlock_irqrestore(&ha->hardware_lock, flags);
++
++	return (QL_STATUS_SUCCESS);
++}
++
++/**
++ * qla2x00_ip_send_logout_port_iocb() - Logout an IP device.
++ * @ha: SCSI driver HA context
++ * @ipdev: IP device to logout
++ * @ha_locked: Flag indicating if the function is called with the hardware lock
++ *
++ * This routine will build and send a mailbox IOCB to logout a fabric port.
++ *
++ * The qla2x00_ip_mailbox_iocb_done() routine will be called upon IOCB
++ * completion, where further processing is performed.
++ *
++ * Returns QL_STATUS_SUCCESS if the operation succeeded.
++ */
++static int
++qla2x00_ip_send_logout_port_iocb(scsi_qla_host_t *ha,
++				struct ip_device *ipdev, uint32_t ha_locked)
++{
++	unsigned long	flags = 0;
++	struct mbx_entry *mbxentry;
++
++	DEBUG12(printk("%s: port ID: %x\n",
++			__func__,
++			ipdev->port_id[2]<<16 |
++			ipdev->port_id[1]<<8 |
++			ipdev->port_id[0]);)
++
++	/* Send marker if required */
++	if (ha->marker_needed != 0) {
++		if (ha_locked) {
++			if(__qla2x00_marker(ha,
++					0, 0, MK_SYNC_ALL) != QLA2X00_SUCCESS)
++				return (QL_STATUS_ERROR);
++		}
++		else {
++			if(qla2x00_marker(ha,
++					0, 0, MK_SYNC_ALL) != QLA2X00_SUCCESS)
++				return (QL_STATUS_ERROR);
++		}
++		ha->marker_needed = 0;
++	}
++
++	if (!ha_locked)
++		spin_lock_irqsave(&ha->hardware_lock, flags);
++
++	mbxentry = (struct mbx_entry *)qla2x00_req_pkt(ha);
++	if (mbxentry == NULL) {
++		DEBUG12(printk("%s: failed\n", __func__);)
++
++		if (!ha_locked)
++			spin_unlock_irqrestore(&ha->hardware_lock, flags);
++
++		return (QL_STATUS_ERROR);
++	}
++
++	/* Build fabric logout MBX IOCB */
++	mbxentry->entry_type = ET_MAILBOX_COMMAND;
++	mbxentry->entry_count = 1;
++	mbxentry->sys_define1 = SOURCE_IP;
++	mbxentry->entry_status = 0;
++	mbxentry->handle = cpu_to_le32(ipdev->index |
++				(MBC_LOGOUT_FABRIC_PORT << 16));
++	mbxentry->loop_id = ipdev->loop_id;
++	mbxentry->mb0 = __constant_cpu_to_le16(MBC_LOGOUT_FABRIC_PORT);
++	mbxentry->mb1 = cpu_to_le16(ipdev->loop_id << 8);
++	mbxentry->mb2 = __constant_cpu_to_le16(0);
++	mbxentry->mb3 = __constant_cpu_to_le16(0);
++	mbxentry->mb6 = __constant_cpu_to_le16(0);
++	mbxentry->mb7 = __constant_cpu_to_le16(0);
++
++	/* Issue command to ISP */
++	qla2x00_isp_cmd(ha);
++
++	if (!ha_locked)
++		spin_unlock_irqrestore(&ha->hardware_lock, flags);
++
++	return (QL_STATUS_SUCCESS);
++}
++
++/**
++ * qla2x00_ip_mailbox_iocb_done() - Process an mailbox IOCB completion.
++ * @ha: SCSI driver HA context
++ * @mbxentry: completed mailbox IOCB entry
++ *
++ * This routine is currently used for fabric login and logouts only.
++ */
++static void
++qla2x00_ip_mailbox_iocb_done(scsi_qla_host_t *ha, struct mbx_entry *mbxentry)
++{
++	int		status;
++	uint16_t	cmd;
++	uint16_t	index;
++	struct ip_device *ipdev;
++// FIXME: endianess?
++	/* Parse-out originating mailbox command */
++	cmd = MSW(mbxentry->handle);
++
++	DEBUG12(printk("%s: cmd %x, status %x, mb0 %x, mb1 %x, mb2 %x\n",
++			__func__,
++			cmd,
++			mbxentry->status,
++			mbxentry->mb0,
++			mbxentry->mb1,
++			mbxentry->mb2);)
++
++	/* Get device block pointer */
++	index = LSW(mbxentry->handle);
++	if (index >= QLLAN_MAX_IP_DEVICES) {
++		/* Bad handle from ISP */
++		DEBUG12(printk("%s: bad handle from isp\n", __func__);)
++
++		/* TODO: Cleanup??? */
++
++		return;
++	}
++
++	ipdev = &ha->ipdev_db[index];
++
++	if (cmd == MBC_LOGOUT_FABRIC_PORT) {
++		/* Check fabric logout completion status */
++		if (/*mbxentry->status == CS_COMPLETE && */
++			mbxentry->mb0 == MBS_COMMAND_COMPLETE) {
++
++			/* Logout successful -- do nothing */
++		}
++		else {
++			DEBUG12(printk("%s: fabric logout failed\n", __func__);)
++		}
++	}
++	else {
++		/* Check fabric login completion status */
++		/* Note: sometimes ISP returns Status=0x30 and MB0=0x4000 */
++		/* Therefore, only check mb0 for now */
++		if (/* mbxentry->status == CS_COMPLETE && */
++			mbxentry->mb0 == MBS_COMMAND_COMPLETE) {
++
++			/* Login successful */
++			ipdev->flags |= IP_DEV_FLAG_PRESENT;
++		}
++		else if (mbxentry->mb0 == MBS_PORT_ID_IN_USE) {
++			/* Different loop ID already assigned to port ID */
++			/* Use the one that is already assigned */
++			qla2x00_free_loopid(ha, ipdev->loop_id);
++			ipdev->loop_id = mbxentry->mb1;
++
++			/* Do logout first and then relogin */
++			qla2x00_ip_send_logout_port_iocb(ha, ipdev, 1);
++			qla2x00_ip_send_login_port_iocb(ha, ipdev, 1);
++		}
++		else if (mbxentry->mb0 == MBS_LOOP_ID_IN_USE) {
++			/* Loop ID already used for different port ID */
++			/* Get a new loop ID and reissue login request */
++			status = qla2x00_reserve_loopid(ha, &ipdev->loop_id);
++			if (status == QL_STATUS_SUCCESS) {
++				qla2x00_ip_send_login_port_iocb(ha, ipdev, 1);
++			}
++			else {
++				DEBUG12(printk("%s: out of loop IDs\n",
++						__func__);)
++
++				qla2x00_free_ip_block(ha, ipdev);
++			}
++		}
++		else {
++			/* Login failed, return resources */
++			DEBUG12(printk("%s: fabric login failed\n", __func__);)
++
++			qla2x00_free_loopid(ha, ipdev->loop_id);
++			qla2x00_free_ip_block(ha, ipdev);
++		}
++	}
++}
++
++
++/**
++ * qla2x00_ip_inquiry() - Discover IP-capable adapters.
++ * @adapter_num: adapter number to check (instance)
++ * @inq_data: return bd_inquiry data of the discovered adapter
++ *
++ * This routine is called by the IP driver to discover adapters that support IP
++ * and to get adapter parameters from the SCSI driver.
++ *
++ * Returns TRUE if the specified adapter supports IP.
++ */
++#if defined (ISP2200)
++int
++qla2200_ip_inquiry(uint16_t adapter_num, struct bd_inquiry *inq_data)
++#elif defined(ISP2300)
++int
++qla2300_ip_inquiry(uint16_t adapter_num, struct bd_inquiry *inq_data)
++#endif
++{
++	int	found;
++	struct list_head *hal;
++	scsi_qla_host_t *ha;
++
++	/* Verify structure size and version */
++	if ((inq_data->length != BDI_LENGTH) ||
++		(inq_data->version != BDI_VERSION)) {
++
++		DEBUG12(printk("%s: incompatable structure\n", __func__);)
++		return (FALSE);
++	}
++
++	/* Find the specified host adapter */
++	ha = NULL;
++	found = 0;
++	read_lock(&qla_hostlist_lock);
++	list_for_each(hal, &qla_hostlist) {
++		ha = list_entry(hal, scsi_qla_host_t, list);
++
++		if (ha->instance == adapter_num) {
++			found++;
++			break;
++		}
++	}
++	read_unlock(&qla_hostlist_lock);
++
++	if (found) {
++		if (!ha->flags.online)
++			return (FALSE);
++
++		DEBUG12(printk("%s: found adapter %d\n",
++				__func__,
++				adapter_num);)
++
++		/* Return inquiry data to backdoor IP driver */
++		set_bit(BDI_IP_SUPPORT, &inq_data->options);
++		if (ha->flags.enable_64bit_addressing)
++			set_bit(BDI_64BIT_ADDRESSING, &inq_data->options);
++		inq_data->ha = ha;                
++		inq_data->risc_rec_q = ha->risc_rec_q;
++		inq_data->risc_rec_q_size = IP_BUFFER_QUEUE_DEPTH;
++		inq_data->link_speed = ha->current_speed;
++		memcpy(inq_data->port_name, ha->ip_port_name, WWN_SIZE);
++		inq_data->pdev = ha->pdev;
++		inq_data->ip_enable_routine = qla2x00_ip_enable;
++		inq_data->ip_disable_routine = qla2x00_ip_disable;
++		inq_data->ip_add_buffers_routine = qla2x00_add_buffers;
++		inq_data->ip_send_packet_routine = qla2x00_send_packet;
++		inq_data->ip_tx_timeout_routine = qla2x00_tx_timeout;
++		return (TRUE);
++	}
++	return (FALSE);
++}
++
++/**
++ * qla2x00_ip_enable() - Create IP-driver/SCSI-driver IP connection.
++ * @ha: SCSI driver HA context
++ * @enable_data: bd_enable data describing the IP connection
++ *
++ * This routine is called by the IP driver to enable an IP connection to the
++ * SCSI driver and to pass in IP driver parameters.
++ *
++ * The HA context is propagated with the specified @enable_data and the
++ * Firmware is initialized for IP support.
++ * 
++ * Returns TRUE if the IP connection was successfully enabled.
++ */
++static int
++qla2x00_ip_enable(scsi_qla_host_t *ha, struct bd_enable *enable_data)
++{
++	int status;
++
++	DEBUG12(printk("%s: enable adapter %d\n", __func__, (int)ha->host_no);)
++
++	status = FALSE;
++
++	/* Verify structure size and version and adapter online */
++	if (!(ha->flags.online) ||
++		(enable_data->length != BDE_LENGTH) ||
++		(enable_data->version != BDE_VERSION)) {
++
++		DEBUG12(printk("%s: incompatable structure or offline\n",
++				__func__);)
++		return (status);
++	}
++
++	/* Save parameters from IP driver */
++	ha->mtu = enable_data->mtu;
++	ha->header_size = enable_data->header_size;
++	ha->receive_buffers = enable_data->receive_buffers;
++	ha->max_receive_buffers = enable_data->max_receive_buffers;
++	ha->receive_buff_data_size = enable_data->receive_buff_data_size;
++	if (test_bit(BDE_NOTIFY_ROUTINE, &enable_data->options)) {
++		ha->notify_routine = enable_data->notify_routine;
++		ha->notify_context = enable_data->notify_context;
++	}
++	ha->send_completion_routine = enable_data->send_completion_routine;
++	ha->receive_packets_routine = enable_data->receive_packets_routine;
++	ha->receive_packets_context = enable_data->receive_packets_context;
++
++	/* Enable RISC IP support */
++	status = qla2x00_ip_initialize(ha);
++	if (!status) {
++		DEBUG12(printk("%s: IP initialization failed", __func__);)
++		ha->notify_routine = NULL;
++	}
++	return (status);
++}
++
++/**
++ * qla2x00_ip_disable() - Remove IP-driver/SCSI-driver IP connection.
++ * @ha: SCSI driver HA context
++ *
++ * This routine is called by the IP driver to disable a previously created IP
++ * connection.
++ *
++ * A Firmware call to disable IP support is issued.
++ */
++static void
++qla2x00_ip_disable(scsi_qla_host_t *ha)
++{
++	int	rval;
++	static mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++
++	DEBUG12(printk("%s: disable adapter %d\n", __func__, (int)ha->host_no);)
++
++	/* Wait for a ready state from the adapter */
++	while (!ha->init_done || ha->dpc_active) {
++		set_current_state(TASK_INTERRUPTIBLE);
++		schedule_timeout(HZ);
++	}
++
++	/* Disable IP support */
++	ha->flags.enable_ip = FALSE;
++
++	mcp->mb[0] = MBC_DISABLE_IP;
++	mcp->out_mb = MBX_0;
++	mcp->in_mb = MBX_0;
++	mcp->tov = 30;
++	mcp->flags = 0;
++	rval = qla2x00_mailbox_command(ha, mcp);
++	if (rval == QL_STATUS_SUCCESS) {
++		/* IP disabled successful */
++		DEBUG12(printk(KERN_INFO
++				"%s: successful\n", __func__);)
++	}
++	else {
++		DEBUG12(printk(KERN_WARNING
++				"%s: MBC_DISABLE_IP failed\n", __func__);)
++	}
++
++	/* Reset IP parameters */
++	ha->rec_entries_in = 0;
++	ha->rec_entries_out = 0;
++	ha->notify_routine = NULL;
++}
++
++/**
++ * qla2x00_add_buffers() - Adds buffers to the receive buffer queue.
++ * @ha: SCSI driver HA context
++ * @rec_count: The number of receive buffers to add to the queue
++ * @ha_locked: Flag indicating if the function is called with the hardware lock
++ *
++ * This routine is called by the IP driver to pass new buffers to the receive
++ * buffer queue.
++ */
++static void
++qla2x00_add_buffers(scsi_qla_host_t *ha, uint16_t rec_count, int ha_locked)
++{
++	int		i;
++	uint16_t	rec_in;
++	uint16_t	handle;
++	unsigned long	flags = 0;
++	device_reg_t	*reg;
++	struct risc_rec_entry *risc_rec_q;
++	struct buffer_cb *bcbs;
++
++	flags = 0;
++	risc_rec_q = ha->risc_rec_q;
++	rec_in = ha->rec_entries_in;
++	bcbs = ha->receive_buffers;
++
++	/* Set RISC owns buffer flag on new entries */
++	for (i = 0; i < rec_count; i++) {
++		handle = risc_rec_q[rec_in].handle;
++		set_bit(BCB_RISC_OWNS_BUFFER, &(bcbs[handle].state));
++		if (rec_in < IP_BUFFER_QUEUE_DEPTH - 1)
++			rec_in++;
++		else
++			rec_in = 0;
++	}
++	
++	/* Update RISC buffer pointer */
++	if (!ha_locked)
++		spin_lock_irqsave(&ha->hardware_lock, flags);
++
++	reg = ha->iobase;
++	WRT_REG_WORD(&reg->mailbox8, rec_in);
++	ha->rec_entries_in = rec_in;
++
++	if (!ha_locked)
++		spin_unlock_irqrestore(&ha->hardware_lock, flags);
++}
++
++/**
++ * qla2x00_send_packet() - Transmit a send_cb.
++ * @ha: SCSI driver HA context
++ * @scb: The send_cb structure to send
++ *
++ * This routine is called by the IP driver to pass @scb (IP packet) to the ISP
++ * for transmission.
++ *
++ * Returns QL_STATUS_SUCCESS if @scb was sent, QL_STATUS_RESOURCE_ERROR if the
++ * RISC was too busy to send, or QL_STATUS_ERROR.
++ */
++static int
++qla2x00_send_packet(scsi_qla_host_t *ha, struct send_cb *scb)
++{
++	int		i;
++	uint16_t	cnt;
++	uint16_t	temp;
++	uint32_t	handle;
++	unsigned long	flags;
++	struct ip_cmd_entry *ipcmd_entry;
++	struct sk_buff	*skb;
++	device_reg_t	*reg;
++
++	DEBUG12(printk("%s: enter\n", __func__);)
++
++	skb = scb->skb;
++	reg = ha->iobase;
++
++	/* Check adapter state */
++	if (!ha->flags.online) {
++		return (QL_STATUS_ERROR);
++	}
++
++	/* Send marker if required */
++	if (ha->marker_needed != 0) {
++		if(qla2x00_marker(ha, 0, 0, MK_SYNC_ALL) != QLA2X00_SUCCESS) {
++			printk(KERN_WARNING
++				"%s: Unable to issue marker.\n",
++				__func__);
++			return (QL_STATUS_ERROR);
++		}
++		ha->marker_needed = 0;
++	}
++
++	/* Acquire ring specific lock */
++	spin_lock_irqsave(&ha->hardware_lock, flags);
++
++	if (ha->req_q_cnt < 4) {
++		/* Update number of free request entries */
++		cnt = qla2x00_debounce_register(ISP_REQ_Q_OUT(reg));
++		if (ha->req_ring_index < cnt)
++			ha->req_q_cnt = cnt - ha->req_ring_index;
++		else
++			ha->req_q_cnt = REQUEST_ENTRY_CNT -
++						(ha->req_ring_index - cnt);
++	}
++
++	if (ha->req_q_cnt >= 4) {
++		/* Get tag handle for command */
++		handle = ha->current_scb_q_idx;
++		for (i = 0; i < MAX_SEND_PACKETS; i++) {
++			handle++;
++			if (handle == MAX_SEND_PACKETS)
++				handle = 0;
++			if (ha->active_scb_q[handle] == NULL) {
++				ha->current_scb_q_idx = handle;
++				goto found_handle;
++			}
++		}
++	}
++
++	/* Low on resources, try again later */
++	spin_unlock_irqrestore(&ha->hardware_lock, flags);
++	printk(KERN_WARNING
++		"%s: Low on resources, try again later...\n",
++		__func__);
++
++	return (QL_STATUS_RESOURCE_ERROR);
++
++found_handle:
++
++	/* Build ISP command packet */
++	ipcmd_entry = (struct ip_cmd_entry *)ha->request_ring_ptr;
++
++	/* OPTIMIZATION ??? */
++	/* Throughput increases an additional 10 Mbps with the following code */
++	*((uint32_t *)(&ipcmd_entry->entry_type)) = 
++			 __constant_cpu_to_le32(ET_IP_COMMAND_64 | (1 << 8));
++	//ipcmd_entry->entry_type = ET_IP_COMMAND_64;
++	//ipcmd_entry->entry_count = 1;
++	//ipcmd_entry->sys_define = 0;
++	//ipcmd_entry->entry_status = 0;
++	
++	ipcmd_entry->handle = handle;
++	ipcmd_entry->reserved_1 = 0;
++
++	/* Get destination loop ID for packet */
++	if (!qla2x00_get_ip_loopid(ha, scb->header, &ipcmd_entry->loop_id)) {
++		/* Failed to get loop ID, convert packet to ARP */
++		if (qla2x00_convert_to_arp(ha, scb)) {
++			/* Broadcast ARP */
++			ipcmd_entry->loop_id = BROADCAST;
++		}
++		else {
++			/* Return packet */
++			spin_unlock_irqrestore(&ha->hardware_lock, flags);
++			printk(KERN_WARNING
++				"%s: Unable to determine loop id for "
++				"destination.\n",
++				__func__);
++			return (QL_STATUS_ERROR);
++		}
++	}
++
++	/* Default five second firmware timeout */
++	ipcmd_entry->timeout = __constant_cpu_to_le16(5);
++	ipcmd_entry->control_flags = __constant_cpu_to_le16(CF_WRITE);
++	ipcmd_entry->reserved_2 = 0;
++	ipcmd_entry->service_class = __constant_cpu_to_le16(0);
++
++	ipcmd_entry->data_seg_count = __constant_cpu_to_le16(2);
++	ipcmd_entry->ds.data_segs64[0].address[0] =
++			cpu_to_le32(LSD(scb->header_dma));
++	ipcmd_entry->ds.data_segs64[0].address[1] =
++			cpu_to_le32(MSD(scb->header_dma));
++	ipcmd_entry->ds.data_segs64[0].length =
++			__constant_cpu_to_le32(sizeof(struct packet_header));
++	scb->skb_data_dma = pci_map_single(ha->pdev,
++					skb->data, skb->len,
++					PCI_DMA_TODEVICE);
++	ipcmd_entry->ds.data_segs64[1].address[0] =
++			cpu_to_le32(LSD(scb->skb_data_dma));
++	ipcmd_entry->ds.data_segs64[1].address[1] =
++			cpu_to_le32(MSD(scb->skb_data_dma));
++	ipcmd_entry->ds.data_segs64[1].length = cpu_to_le32(skb->len);
++
++	ipcmd_entry->byte_count =
++			cpu_to_le32(skb->len + sizeof(struct packet_header));
++
++	/* Adjust ring index. */
++	ha->req_ring_index++;
++	if (ha->req_ring_index == REQUEST_ENTRY_CNT) {
++		ha->req_ring_index = 0;
++		ha->request_ring_ptr = ha->request_ring;
++	} else
++		ha->request_ring_ptr++;
++
++	ha->ipreq_cnt++;
++	ha->req_q_cnt--;
++	ha->active_scb_q[handle] = scb;
++
++	/* Set chip new ring index. */
++	temp = CACHE_FLUSH(ISP_REQ_Q_IN(reg));
++	WRT_REG_WORD(ISP_REQ_Q_IN(reg), ha->req_ring_index);
++
++	spin_unlock_irqrestore(&ha->hardware_lock, flags);
++
++	return (QL_STATUS_SUCCESS);
++}
++
++/**
++ * qla2x00_tx_timeout() - Handle transmission timeout.
++ * @ha: SCSI driver HA context
++ *
++ * This routine is called by the IP driver to handle packet transmission
++ * timeouts.
++ *
++ * Returns QL_STATUS_SUCCESS if timeout handling completed successfully.
++ */
++static int
++qla2x00_tx_timeout(scsi_qla_host_t *ha)
++{
++	/* TODO: complete interface */
++
++	/* Reset RISC firmware for basic recovery */
++	printk(KERN_WARNING
++		"%s: A transmission timeout occured - aborting ISP\n",
++		__func__);
++	set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
++
++	return (QL_STATUS_SUCCESS);
++}
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qla_ip.h	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,420 @@
++/******************************************************************************
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 IP network driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ ******************************************************************************/
++
++/****************************************************************************
++              Please see revision.notes for revision history.
++*****************************************************************************/
++
++#if !defined(_QLA_IP_H_)
++#define _QLA_IP_H_
++
++#define MAX_SEND_PACKETS		32	/* Maximum # send packets */
++#define MAX_RECEIVE_BUFFERS		64	/* Maximum # receive buffers */
++#define MIN_RECEIVE_BUFFERS		8	/* Minimum # receive buffers */
++#define IP_BUFFER_QUEUE_DEPTH		(MAX_RECEIVE_BUFFERS+1)
++
++/* Async notification types */
++#define NOTIFY_EVENT_LINK_DOWN		1	/* Link went down */
++#define NOTIFY_EVENT_LINK_UP		2	/* Link is back up */
++#define NOTIFY_EVENT_RESET_DETECTED	3	/* Reset detected */
++
++/* QLogic subroutine status definitions */
++#define QL_STATUS_SUCCESS		0
++#define QL_STATUS_ERROR			1
++#define QL_STATUS_FATAL_ERROR		2
++#define QL_STATUS_RESOURCE_ERROR	3
++#define QL_STATUS_LOOP_ID_IN_USE	4
++#define QL_STATUS_NO_DATA		5
++
++/************************************************************************/
++/* RFC 2625 -- networking structure definitions                         */
++/************************************************************************/
++
++/* Network header definitions */
++struct network_address
++{
++#if defined(__LITTLE_ENDIAN_BITFIELD)
++	__u16	unused:12,
++		naa:4;
++#elif defined (__BIG_ENDIAN_BITFIELD)
++	__u16	naa:4,
++		unused:12;
++#else
++#error  "Please fix <asm/byteorder.h>"
++#endif
++
++#define NAA_IEEE_MAC_TYPE	1		/* NAA code - IEEE MAC addr */
++
++	__u8	addr[6];
++};
++
++struct network_header
++{
++	union
++	{
++		struct network_address	na;
++		__u8	fcaddr[8];
++	} d;
++
++	union
++	{
++		struct network_address	na;
++		__u8	fcaddr[8];
++	} s;
++};
++
++/* SNAP header definitions */
++/* from linux/if_fc.h */
++struct snap_header
++{
++	__u8  dsap;				/* destination SAP */
++	__u8  ssap;				/* source SAP */
++#define LLC_SAP_IEEE_802DOT2	0xAA		/* LLC SAP code - IEEE 802.2 */
++
++	__u8  llc;				/* LLC control field */
++#define LLC_CONTROL		0x03		/* LLC control code */
++
++	__u8  protid[3];			/* protocol id */
++#define SNAP_OUI		0x00		/* SNAP OUI code */
++
++	__u16 ethertype;			/* ether type field */
++};
++
++/* Packet header definitions */
++struct packet_header
++{
++	struct network_header	networkh;
++	struct snap_header	snaph;
++};
++
++/* ARP header definitions */
++/* from linux/if_arp.h */
++struct arp_header
++{
++	struct arphdr	arph;
++	__u8		ar_sha[ETH_ALEN];	/* sender hardware address */
++	__u32		ar_sip;			/* sender IP address */
++        __u8		ar_tha[ETH_ALEN];	/* target hardware address */
++	__u32		ar_tip;			/* target IP address */
++};
++
++/* IP header definitions */
++struct ip_header
++{
++	struct iphdr	iph;
++	__u32		options;		/* IP packet options */
++};
++
++
++/************************************************************************/
++/* Support structures.                                                  */
++/************************************************************************/
++
++/* Definitions for IP support */
++#define LOOP_ID_MASK		0x00FF
++#define PLE_NOT_SCSI_DEVICE	0x8000		/* Upper bit of loop ID set */
++						/*  if not SCSI */
++
++/* Receive buffer control block definitions */
++struct buffer_cb
++{
++	uint16_t	handle;			/* ISP buffer handle */
++	uint16_t	comp_status;		/* completion status from FW */
++
++	uint32_t	state;			/* Buffer CB state */
++#define BCB_RISC_OWNS_BUFFER	1
++
++	struct sk_buff	*skb;			/* Socket buffer */
++	uint8_t		*skb_data;		/* Socket buffer data */
++	dma_addr_t	skb_data_dma;		/* SKB data physical address */
++	uint32_t	rec_data_size;		/* Size of received data */
++	uint32_t	packet_size;		/* Size of packet received */
++
++	uint16_t	linked_bcb_cnt;		/* # of linked CBs for packet */
++	uint16_t	unused2;
++	struct buffer_cb *next_bcb;		/* Next buffer CB */
++};
++
++/* Send control block definitions */
++struct send_cb
++{
++	uint16_t	comp_status;		/* completion status from FW */
++#define SCB_CS_COMPLETE		0x0		
++#define SCB_CS_INCOMPLETE	0x1
++#define SCB_CS_RESET		0x4
++#define SCB_CS_ABORTED		0x5
++#define SCB_CS_TIMEOUT		0x6
++#define SCB_CS_PORT_UNAVAILABLE	0x28
++#define SCB_CS_PORT_LOGGED_OUT	0x29
++#define SCB_CS_PORT_CONFIG_CHG	0x2A
++#define SCB_CS_FW_RESOURCE_UNAVAILABLE	0x2C
++
++	uint16_t	unused1;
++
++	void		*qdev;			/* netdev private structure */
++
++	struct packet_header *header;		/* Network and SNAP headers */
++	dma_addr_t	header_dma;		/* Header physical address */
++
++	struct sk_buff	*skb;			/* socket buffer to send */
++	dma_addr_t	skb_data_dma;		/* skb data physical address */
++};
++
++/* IP device data structure */
++#define QLLAN_MAX_IP_DEVICES	64	/* Maximum number of IP devices */
++
++struct ip_device
++{
++	uint16_t	index;
++	uint16_t	unused1;
++
++	uint32_t	flags;
++#define IP_DEV_FLAG_PRESENT		0x00000001 
++#define IP_DEV_FLAG_PUBLIC_DEVICE	0x00000002
++
++	uint16_t	loop_id;
++#define PUBLIC_LOOP_DEVICE		((uint16_t)-1)
++
++	uint16_t	unused2;
++	uint8_t		port_id[3];
++	uint8_t		unused3;
++	uint8_t		port_name[8]; 
++
++	struct ip_device *next;
++	struct ip_device *last;
++};
++
++/************************************************************************/
++/* Definitions for Backdoor Inquiry.                                   */
++/************************************************************************/
++
++struct bd_inquiry
++{
++	uint16_t	length;			/* Length of structure */
++#define BDI_LENGTH		sizeof(struct bd_inquiry)
++
++	uint16_t	version;		/* Structure version number */
++/* NOTE: Update this value anytime the structure changes */
++#define BDI_VERSION		2
++
++						/* Exports */
++	uint32_t	options;		/*  supported options */
++#define BDI_IP_SUPPORT		1		/*   IP supported */
++#define BDI_64BIT_ADDRESSING	2		/*   64bit address supported */
++
++	void		*ha;			/*  Driver ha pointer */
++	void		*risc_rec_q;		/*  RISC receive queue */
++	uint16_t	risc_rec_q_size;	/*   size */
++
++	uint16_t	link_speed;		/* Current link speed */
++#define BDI_1GBIT_PORTSPEED	1		/*   operating at 1GBIT */
++#define BDI_2GBIT_PORTSPEED	2		/*   operating at 2GBIT */
++#define BDI_10GBIT_PORTSPEED	4		/*   operating at 10GBIT */
++
++	uint8_t		port_name[8];		/*  Adapter port name */
++
++	struct pci_dev	*pdev;			/* PCI device information */
++
++	/* Pointers to SCSI-backdoor callbacks */
++	void            *ip_enable_routine;
++	void            *ip_disable_routine;
++	void            *ip_add_buffers_routine;
++	void            *ip_send_packet_routine;
++	void            *ip_tx_timeout_routine;
++
++	uint32_t        unused2[9];
++};
++
++/************************************************************************/
++/* Definitions for Backdoor Enable.                                    */
++/************************************************************************/
++
++struct bd_enable
++{
++	uint16_t	length;			/* Length of structure */
++#define BDE_LENGTH		sizeof(struct bd_enable)
++
++	uint16_t	version;		/* Structure version number */
++/* NOTE: Update this value anytime the structure changes */
++#define BDE_VERSION		2
++
++						/* Imports */
++	uint32_t	options;		/*  supported options */
++#define BDE_NOTIFY_ROUTINE	1		/*  notify routine imported */
++
++	uint32_t	mtu;			/*  maximum transfer size */
++	uint16_t	header_size;		/*  split header size */
++	uint16_t	unused1;
++
++	void		*receive_buffers;	/*  receive buffers array */
++	uint16_t	max_receive_buffers;	/*  max # receive buffers */
++	uint16_t	unused2;
++	uint32_t	receive_buff_data_size;	/*  buffer size */
++
++	/* Pointers to IP-backdoor callbacks */
++	void		*notify_routine;
++	void		*notify_context;
++	void		*send_completion_routine;
++	void		*receive_packets_routine;
++	void		*receive_packets_context;
++
++	uint32_t        unused3[9];
++};
++
++
++/************************************************************************/
++/* RISC interface structures                                            */
++/************************************************************************/
++
++/* IP mailbox commands */
++#define MBC_INITIALIZE_IP               0x0077
++#define MBC_DISABLE_IP                  0x0079
++
++/* IP async events */
++#define MBA_IP_TRANSMIT_COMPLETE        0x8022
++#define MBA_IP_RECEIVE_COMPLETE         0x8023
++#define MBA_IP_BROADCAST_RECEIVED       0x8024
++#define MBA_IP_RECEIVE_BUFFERS_LOW      0x8025
++#define MBA_IP_OUT_OF_BUFFERS           0x8026
++#define MBA_IP_RECEIVE_COMPLETE_SPLIT   0x8027
++
++/* IP fast post completions for 2300 */
++#define RHS_IP_SEND_COMPLETE            0x18
++#define RHS_IP_RECV_COMPLETE            0x19
++#define RHS_IP_RECV_DA_COMPLETE         0x1B
++
++/* RISC IP receive buffer queue entry structure */
++struct risc_rec_entry
++{
++	uint32_t        data_addr_low;
++	uint32_t        data_addr_high;
++	uint16_t        handle;
++	uint16_t        unused;
++};
++
++/* Firmware IP initialization control block definitions */
++struct ip_init_cb
++{
++	uint8_t		version;
++#define IPICB_VERSION				0x01
++
++	uint8_t		reserved_1;
++
++	uint16_t	firmware_options;
++#define IPICB_OPTION_64BIT_ADDRESSING		0x0001
++#define IPICB_OPTION_NO_BROADCAST_FASTPOST	0x0002
++#define IPICB_OPTION_OUT_OF_BUFFERS_EVENT	0x0004
++
++	uint16_t	header_size;
++	uint16_t	mtu;
++	uint16_t	receive_buffer_size;
++	uint16_t	reserved_2;
++	uint16_t	reserved_3;
++	uint16_t	reserved_4;
++	uint16_t	reserved_5;
++
++	uint16_t	receive_queue_size;
++	uint16_t	low_water_mark;
++#define IPICB_LOW_WATER_MARK			0
++
++	uint16_t	receive_queue_addr[4];
++	uint16_t	receive_queue_in;
++	uint16_t	fast_post_count;
++#define IPICB_FAST_POST_COUNT			4
++
++	uint16_t	container_count;
++#define IPICB_BUFFER_CONTAINER_COUNT		64
++
++	uint16_t	resource_allocation;
++#define IPICB_IOCB_RESERVE_COUNT		250
++};
++
++
++/* IP IOCB types */
++
++/* Data segment descriptor structures */
++struct data_seg
++{
++	uint32_t	address;
++	uint32_t	length;
++};
++
++struct data_seg_a64
++{
++	uint32_t	address[2];
++	uint32_t	length;
++};
++
++/* IP Command IOCB structure */
++struct ip_cmd_entry
++{
++	uint8_t		entry_type;
++#define ET_IP_COMMAND_32		0x13
++#define ET_IP_COMMAND_64		0x1B
++
++	uint8_t		entry_count;
++	uint8_t		sys_define;
++	uint8_t		entry_status;
++
++	uint32_t	handle;
++	uint8_t		reserved_1;
++	uint8_t		loop_id;
++	uint16_t	comp_status;
++	uint16_t	control_flags;
++	uint16_t	reserved_2;
++	uint16_t	timeout;
++	uint16_t	data_seg_count;
++	uint16_t	service_class;
++	uint16_t	reserved_3[7];
++	uint32_t	byte_count;
++	union
++	{
++		struct data_seg		data_segs[3];
++		struct data_seg_a64	data_segs64[2];
++	} ds;
++};
++
++/* IP Receive IOCB structure */
++#define ET_IP_RECEIVE_CONTINUATION  0x2B
++
++struct ip_rec_entry
++{
++	uint8_t		entry_type;
++#define ET_IP_RECEIVE			0x23
++
++	uint8_t		entry_count;
++	uint8_t		segment_count;
++	uint8_t		entry_status;
++
++	uint16_t	s_idlow;
++	uint8_t		s_idhigh;
++	uint8_t		reserved_1;
++	uint8_t		reserved_2;
++	uint8_t		loop_id;
++	uint16_t	comp_status;
++#define IPREC_STATUS_SPLIT_BUFFER	0x0001
++
++	uint16_t	service_class;
++	uint16_t	sequence_length;
++
++#define IPREC_MAX_HANDLES		24
++	uint16_t	buffer_handles[IPREC_MAX_HANDLES];
++};
++
++#endif /* _QLA_IP_H_ */
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qla_isr.c	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,1474 @@
++/*
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ */
++
++#include "qla_os.h"
++
++#include "qla_def.h"
++
++static void qla2x00_mbx_completion(scsi_qla_host_t *, uint16_t);
++static void qla2x00_async_event(scsi_qla_host_t *, uint32_t);
++static void qla2x00_process_completed_request(struct scsi_qla_host *, int);
++static void qla2x00_response_pkt(scsi_qla_host_t *, uint16_t);
++static void qla2x00_status_entry(scsi_qla_host_t *, sts_entry_t *);
++static void qla2x00_status_cont_entry(scsi_qla_host_t *, sts_cont_entry_t *);
++static void qla2x00_error_entry(scsi_qla_host_t *, response_t *);
++static void qla2x00_ms_entry(scsi_qla_host_t *, ms_iocb_entry_t *);
++
++static int qla2x00_check_sense(Scsi_Cmnd *cp, os_lun_t *);
++
++/**
++ * qla2x00_intr_handler() - Process interrupts for the ISP.
++ * @irq:
++ * @dev_id: SCSI driver HA context
++ * @regs:
++ *
++ * Called by system whenever the host adapter generates an interrupt.
++ *
++ * Returns handled flag.
++ */
++irqreturn_t
++qla2x00_intr_handler(int irq, void *dev_id, struct pt_regs *regs)
++{
++	scsi_qla_host_t	*ha;
++	device_reg_t	*reg;
++	uint32_t	mbx;
++	uint16_t	stat;
++	int		status = 0;
++	unsigned long	flags = 0;
++	unsigned long	mbx_flags = 0;
++	unsigned long	intr_iter;
++
++	/* Don't loop forever, interrupt are OFF */
++	intr_iter = 50; 
++
++	ha = (scsi_qla_host_t *) dev_id;
++	if (!ha) {
++		printk(KERN_INFO
++		    "%s(): NULL host pointer\n", __func__);
++		return (IRQ_NONE);
++	}
++
++	reg = ha->iobase;
++
++	spin_lock_irqsave(&ha->hardware_lock, flags);
++
++	for (;;) {
++		/* Relax CPU! */
++		if (!(intr_iter--))
++			break;
++
++#if defined(ISP2100) || defined(ISP2200)
++		if ((RD_REG_WORD(&reg->istatus) & ISR_RISC_INT) == 0) {
++			break;
++		}
++
++		if (RD_REG_WORD(&reg->semaphore) & BIT_0) {
++			WRT_REG_WORD(&reg->hccr, HCCR_CLR_RISC_INT);
++
++			/* Get mailbox data. */
++			mbx = RD_REG_WORD(&reg->mailbox0);
++			if (mbx > 0x3fff && mbx < 0x8000) {
++				qla2x00_mbx_completion(ha, (uint16_t)mbx);
++				status |= MBX_INTERRUPT;
++			} else if (mbx > 0x7fff && mbx < 0xc000) {
++				qla2x00_async_event(ha, mbx);
++			} else {
++				/*EMPTY*/
++				DEBUG2(printk("scsi(%ld): Unrecognized "
++				    "interrupt type (%d)\n",
++				    ha->host_no, mbx));
++			}
++			/* Release mailbox registers. */
++			WRT_REG_WORD(&reg->semaphore, 0);
++		} else {
++			stat = RD_REG_WORD(&reg->mailbox5);
++			qla2x00_response_pkt(ha, stat);
++
++			WRT_REG_WORD(&reg->hccr, HCCR_CLR_RISC_INT);
++		}
++
++#else /* ISP2300 */
++		if ((ha->pdev->device == QLA2312_DEVICE_ID ||
++		    ha->pdev->device == QLA2322_DEVICE_ID) &&
++		    (RD_REG_WORD(&reg->istatus) & ISR_RISC_INT) == 0) {
++			break;
++		}
++
++		stat = RD_REG_WORD(&reg->host_status_lo);
++		if ((stat & HSR_INT) == 0) {
++			break;
++		}
++		if (stat & HSR_RISC_PAUSED) {
++			uint16_t hccr;
++
++			hccr = RD_REG_WORD(&reg->hccr);
++			printk(KERN_INFO
++			    "scsi(%ld): RISC paused, dumping HCCR (%x)\n",
++			    ha->host_no,
++			    hccr);
++
++			/*
++			 * Issue a "HARD" reset in order for the RISC interrupt
++			 * bit to be cleared.  Schedule a big hammmer to get
++			 * out of the RISC PAUSED state.
++			 */
++			WRT_REG_WORD(&reg->hccr, HCCR_RESET_RISC);
++			set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
++			break;
++		}
++		mbx = RD_REG_WORD(&reg->host_status_hi);
++		switch (stat & 0xff) {
++		case 0x1:
++		case 0x2:
++		case 0x10:
++		case 0x11:
++			qla2x00_mbx_completion(ha, (uint16_t)mbx);
++			status |= MBX_INTERRUPT;
++
++			/* Release mailbox registers. */
++			WRT_REG_WORD(&reg->semaphore, 0);
++			break;
++		case 0x12:
++			qla2x00_async_event(ha, mbx);
++			break;
++		case 0x13:
++			qla2x00_response_pkt(ha, (uint16_t)mbx);
++			break;
++		case 0x16:
++			mbx = mbx << 16 | MBA_SCSI_COMPLETION;
++			qla2x00_async_event(ha, mbx);
++			break;
++#if defined(FC_IP_SUPPORT)
++		case 0x18:
++			WRT_REG_WORD(&reg->hccr, HCCR_CLR_RISC_INT);
++			qla2x00_ip_send_complete(ha, mbx, CS_COMPLETE);
++			continue;
++			break;
++		case 0x19:
++			qla2x00_ip_receive_fastpost(ha,
++			    MBA_IP_RECEIVE_COMPLETE);
++			break;
++		case 0x1b:
++			qla2x00_ip_receive_fastpost(ha,
++			    MBA_IP_RECEIVE_COMPLETE_SPLIT);
++			break;
++#endif
++		default:
++			DEBUG2(printk("scsi(%ld): Unrecognized interrupt type "
++			    "(%d)\n",
++			    ha->host_no, stat & 0xff));
++			break;
++		}
++
++		WRT_REG_WORD(&reg->hccr, HCCR_CLR_RISC_INT);
++#endif
++	}
++
++	spin_unlock_irqrestore(&ha->hardware_lock, flags);
++
++	ha->total_isr_cnt++;
++
++	if (test_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags) &&
++	    (status & MBX_INTERRUPT) && ha->flags.mbox_int) {
++
++		/* There was a mailbox completion */
++		DEBUG3(printk("%s(%ld): Going to get mbx reg lock.\n",
++		    __func__, ha->host_no));
++
++		QLA_MBX_REG_LOCK(ha);
++
++		MBOX_TRACE(ha, BIT_5);
++		if (ha->mcp == NULL) {
++			DEBUG3(printk("%s(%ld): Error mbx pointer.\n",
++			    __func__, ha->host_no));
++		} else {
++			DEBUG3(printk("%s(%ld): Going to set mbx intr flags. "
++			    "cmd=%x.\n",
++			    __func__, ha->host_no, ha->mcp->mb[0]));
++		}
++		set_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
++
++		DEBUG3(printk("%s(%ld): Going to wake up mbx function for "
++		    "completion.\n",
++		    __func__, ha->host_no));
++
++		MBOX_TRACE(ha,BIT_6);
++		up(&ha->mbx_intr_sem);
++
++		DEBUG3(printk("%s(%ld): Going to release mbx reg lock.\n",
++		    __func__, ha->host_no));
++		QLA_MBX_REG_UNLOCK(ha);
++	}
++
++	if (!list_empty(&ha->done_queue))
++		schedule_work(&ha->run_qla_task);
++
++	/* Wakeup the DPC routine */
++	if ((!ha->flags.mbox_busy &&
++	    (test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags) ||
++		test_bit(RESET_MARKER_NEEDED, &ha->dpc_flags) ||
++		test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags))) &&
++		    ha->dpc_wait && !ha->dpc_active) {
++
++		up(ha->dpc_wait);
++	}
++
++	return (IRQ_HANDLED);
++}
++
++/**
++ * qla2x00_mbx_completion() - Process mailbox command completions.
++ * @ha: SCSI driver HA context
++ * @mb0: Mailbox0 register
++ */
++static void
++qla2x00_mbx_completion(scsi_qla_host_t *ha, uint16_t mb0)
++{
++	uint16_t                cnt;
++	uint16_t                *wptr;
++	device_reg_t            *reg = ha->iobase;
++
++	ENTER(__func__);
++
++	/* Load return mailbox registers. */
++	ha->flags.mbox_int = TRUE;
++	ha->mailbox_out[0] = mb0;
++	wptr = (uint16_t *)&reg->mailbox1;
++
++	for (cnt = 1; cnt < MAILBOX_REGISTER_COUNT; cnt++) {
++#if defined(ISP2200)
++		if (cnt == 8) 
++			wptr = (uint16_t *)&reg->mailbox8;
++#endif
++		if (cnt == 4 || cnt == 5)
++			ha->mailbox_out[cnt] = qla2x00_debounce_register(wptr);
++		else
++			ha->mailbox_out[cnt] = RD_REG_WORD(wptr);
++	
++		wptr++;
++	}
++
++	if (ha->mcp) {
++		DEBUG3(printk("%s(%ld): Got mailbox completion. cmd=%x.\n",
++		    __func__, ha->host_no, ha->mcp->mb[0]));
++	} else {
++		DEBUG2_3(printk("%s(%ld): MBX pointer ERROR!\n",
++		    __func__, ha->host_no));
++	}
++
++	LEAVE(__func__);
++}
++
++/**
++ * qla2x00_async_event() - Process aynchronous events.
++ * @ha: SCSI driver HA context
++ * @mb0: Mailbox0 register
++ */
++static void
++qla2x00_async_event(scsi_qla_host_t *ha, uint32_t mbx)
++{
++	uint32_t	index;
++	uint16_t	mb[4];
++	device_reg_t	*reg = ha->iobase;
++	uint8_t		rscn_queue_index;
++
++	ENTER(__func__);
++
++	/* Setup to process completions */
++	mb[0] = LSW(mbx);
++	switch(mb[0]) {
++	case MBA_SCSI_COMPLETION:	/* Fast Post */
++#if defined(ISP2100) || defined(ISP2200)
++		mb[1] = RD_REG_WORD(&reg->mailbox1);
++#else
++		mb[1] = MSW(mbx);
++#endif
++		mb[2] = RD_REG_WORD(&reg->mailbox2);
++
++		DEBUG5(printk("%s(): mailbox response completion.\n",
++		    __func__));
++
++		if (!ha->flags.online)
++			break;
++
++		/* Get outstanding command index  */
++		index = (uint32_t)(mb[2] << 16 | mb[1]);
++		qla2x00_process_completed_request(ha, index);
++		break;
++
++#if defined(FC_IP_SUPPORT)
++	case MBA_IP_TRANSMIT_COMPLETE:	/* IP Completion */
++		mb[1] = RD_REG_WORD(&reg->mailbox1);
++
++		qla2x00_ip_send_complete(ha, mb[1], CS_COMPLETE);
++		break;
++
++	case MBA_IP__RECEIVE_COMPLETE:
++	case MBA_IP_RECEIVE_COMPLETE_SPLIT:
++		qla2x00_ip_receive_fastpost(ha, mb[0]);
++		break;
++#endif /* FC_IP_SUPPORT */
++
++	case MBA_RESET:			/* Reset */
++		DEBUG2(printk("scsi(%ld): Asynchronous RESET.\n", ha->host_no));
++
++		set_bit(RESET_MARKER_NEEDED, &ha->dpc_flags);
++		break;
++
++	case MBA_SYSTEM_ERR:		/* System Error */
++		mb[1] = RD_REG_WORD(&reg->mailbox1);
++		mb[2] = RD_REG_WORD(&reg->mailbox2);
++		mb[3] = RD_REG_WORD(&reg->mailbox3);
++
++		printk(KERN_INFO
++		    "scsi(%ld): ISP System Error - mbx1=%xh mbx2=%xh "
++		    "mbx3=%xh.\n",
++		    ha->host_no, mb[1], mb[2], mb[3]);
++
++    		qla2x00_dump_isp(ha, 1);
++
++		set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
++		break;
++
++	case MBA_REQ_TRANSFER_ERR:	/* Request Transfer Error */
++		DEBUG2(printk("scsi(%ld): ISP Request Transfer Error.\n",
++		    ha->host_no));
++		printk(KERN_WARNING
++		    "scsi(%ld): ISP Request Transfer Error.\n", ha->host_no);
++
++		set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
++		break;
++
++	case MBA_RSP_TRANSFER_ERR:	/* Response Transfer Error */
++		DEBUG2(printk("scsi(%ld): ISP Response Transfer Error.\n",
++		    ha->host_no));
++		printk(KERN_WARNING
++		    "scsi(%ld): ISP Response Transfer Error.\n", ha->host_no);
++
++		set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
++		break;
++
++	case MBA_WAKEUP_THRES:		/* Request Queue Wake-up */
++		DEBUG2(printk("scsi(%ld): Asynchronous WAKEUP_THRES.\n",
++		    ha->host_no));
++		break;
++
++	case MBA_LIP_OCCURRED:		/* Loop Initialization Procedure */
++		mb[1] = RD_REG_WORD(&reg->mailbox1);
++
++		DEBUG2(printk("scsi(%ld): Asynchronous LIP Occured.\n",
++		    ha->host_no));
++		printk(KERN_INFO
++		    "scsi(%ld): Asynchronous LIP Occured.\n", ha->host_no);
++
++		/* Save LIP sequence. */
++		ha->lip_seq = mb[1];
++		if (ha->loop_state != LOOP_DOWN) {
++			ha->loop_state = LOOP_DOWN;
++			atomic_set(&ha->loop_down_timer, LOOP_DOWN_TIME);
++			qla2x00_mark_all_devices_lost(ha);
++		}
++
++		set_bit(COMMAND_WAIT_NEEDED, &ha->dpc_flags);
++		set_bit(REGISTER_FC4_NEEDED, &ha->dpc_flags);
++
++		ha->flags.management_server_logged_in = 0;
++
++		/* Update AEN queue. */
++		if (ha->ioctl->flags & IOCTL_AEN_TRACKING_ENABLE) {
++			qla2x00_enqueue_aen(ha, MBA_LIP_OCCURRED, NULL);
++		}
++
++		ha->total_lip_cnt++;
++		break;
++
++	case MBA_LOOP_UP:		/* Loop Up Event */
++		mb[1] = RD_REG_WORD(&reg->mailbox1);
++
++		DEBUG2(printk("scsi(%ld): Asynchronous LOOP UP.\n",
++		    ha->host_no));
++		printk(KERN_INFO
++		    "scsi(%ld): LOOP UP detected.\n", ha->host_no);
++
++		ha->flags.management_server_logged_in = 0;
++
++		/* Update AEN queue. */
++		if (ha->ioctl->flags & IOCTL_AEN_TRACKING_ENABLE) {
++			qla2x00_enqueue_aen(ha, MBA_LOOP_UP, NULL);
++		}
++
++		/* Save the current speed for use by ioctl and IP driver */
++		ha->current_speed = EXT_DEF_PORTSPEED_1GBIT;
++#if defined(ISP2300)
++		if (mb[1] == 1)
++			ha->current_speed = EXT_DEF_PORTSPEED_2GBIT;
++#endif
++		break;
++
++	case MBA_LOOP_DOWN:		/* Loop Down Event */
++		DEBUG2(printk("scsi(%ld): Asynchronous LOOP DOWN.\n",
++		    ha->host_no));
++		printk(KERN_INFO
++		    "scsi(%ld): LOOP DOWN detected.\n", ha->host_no);
++
++		if (ha->loop_state != LOOP_DOWN) {
++			ha->loop_state = LOOP_DOWN;
++			atomic_set(&ha->loop_down_timer, LOOP_DOWN_TIME);
++			qla2x00_mark_all_devices_lost(ha);
++		}
++
++		ha->flags.management_server_logged_in = 0;
++		ha->current_speed = 0; /* reset value */
++
++		/* Update AEN queue. */
++		if (ha->ioctl->flags & IOCTL_AEN_TRACKING_ENABLE) {
++			qla2x00_enqueue_aen(ha, MBA_LOOP_DOWN, NULL);
++		}
++		break;
++
++	case MBA_LIP_RESET:		/* LIP reset occurred */
++		DEBUG2(printk("scsi(%ld): Asynchronous LIP RESET.\n",
++		    ha->host_no));
++		printk(KERN_INFO
++		    "scsi(%ld): LIP reset occured.\n", ha->host_no);
++
++		if (ha->loop_state != LOOP_DOWN) {
++			ha->loop_state = LOOP_DOWN;
++			atomic_set(&ha->loop_down_timer, LOOP_DOWN_TIME);
++			qla2x00_mark_all_devices_lost(ha);
++		}
++
++		set_bit(COMMAND_WAIT_NEEDED, &ha->dpc_flags);
++		set_bit(RESET_MARKER_NEEDED, &ha->dpc_flags);
++
++		ha->operating_mode = LOOP;
++		ha->flags.management_server_logged_in = 0;
++
++		/* Update AEN queue. */
++		if (ha->ioctl->flags & IOCTL_AEN_TRACKING_ENABLE) {
++			qla2x00_enqueue_aen(ha, MBA_LIP_RESET, NULL);
++		}
++
++		ha->total_lip_cnt++;
++		break;
++
++#if !defined(ISP2100)
++	case MBA_LINK_MODE_UP:		/* Link mode up. */
++		DEBUG2(printk("scsi(%ld): Asynchronous LINK MODE UP.\n",
++		    ha->host_no));
++		printk(KERN_INFO
++		    "scsi(%ld): Link mode is up.\n",
++		    ha->host_no);
++
++		/*
++		 * Until there's a transition from loop down to loop up, treat
++		 * this as loop down only.
++		 */
++		if (ha->loop_state != LOOP_DOWN) {
++			ha->loop_state = LOOP_DOWN;
++			if (!atomic_read(&ha->loop_down_timer))
++				atomic_set(&ha->loop_down_timer,
++				    LOOP_DOWN_TIME);
++			qla2x00_mark_all_devices_lost(ha);
++		}
++
++		if (!(test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags))) {
++			set_bit(COMMAND_WAIT_NEEDED, &ha->dpc_flags);
++			set_bit(RESET_MARKER_NEEDED, &ha->dpc_flags);
++		}
++		set_bit(REGISTER_FC4_NEEDED, &ha->dpc_flags);
++		break;
++
++	case MBA_UPDATE_CONFIG:		/* Update Configuration. */
++		mb[1] = RD_REG_WORD(&reg->mailbox1);
++
++		DEBUG2(printk("scsi(%ld): Asynchronous UPDATE CONFIG.\n",
++		    ha->host_no));
++		printk(KERN_INFO
++		    "scsi(%ld): Configuration change detected: value=%x.\n",
++		    ha->host_no, mb[1]);
++
++		if (ha->loop_state != LOOP_DOWN) {
++			ha->loop_state = LOOP_DOWN;  
++			if (!atomic_read(&ha->loop_down_timer))
++				atomic_set(&ha->loop_down_timer,
++				    LOOP_DOWN_TIME);
++			qla2x00_mark_all_devices_lost(ha);
++		}
++
++		set_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags);
++		set_bit(LOCAL_LOOP_UPDATE, &ha->dpc_flags);
++		break;
++#endif	/* #if !defined(ISP2100) */
++
++	case MBA_PORT_UPDATE:		/* Port database update */
++		/*
++		 * If PORT UPDATE is global (recieved LIP_OCCURED/LIP_RESET
++		 * event etc. earlier indicating loop is down) then process
++		 * it.  Otherwise ignore it and Wait for RSCN to come in.
++		 */
++		if (ha->loop_state != LOOP_DOWN) {
++			DEBUG2(printk("scsi(%ld): Asynchronous PORT UPDATE "
++			    "ignored.\n", ha->host_no));
++			printk(KERN_INFO
++			    "scsi(%ld): Asynchronous PORT UPDATE ignored.\n",
++			    ha->host_no);
++			break;
++		}
++
++		DEBUG2(printk("scsi(%ld): Asynchronous PORT UPDATE.\n",
++		    ha->host_no));
++		printk(KERN_INFO
++		    "scsi(%ld): Port database changed.\n", ha->host_no);
++
++		/*
++		 * Mark all devices as missing so we will login again.
++		 */
++		ha->loop_state = LOOP_UP;
++
++		atomic_set(&ha->loop_down_timer, 0);
++		qla2x00_mark_all_devices_lost(ha);
++
++		ha->flags.rscn_queue_overflow = 1;
++
++		set_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags);
++		set_bit(LOCAL_LOOP_UPDATE, &ha->dpc_flags);
++
++		/* Update AEN queue. */
++		if (ha->ioctl->flags & IOCTL_AEN_TRACKING_ENABLE) {
++			qla2x00_enqueue_aen(ha, MBA_PORT_UPDATE, NULL);
++		}
++		break;
++
++	case MBA_SCR_UPDATE:		/* State Change Registration */
++		mb[1] = RD_REG_WORD(&reg->mailbox1);
++		mb[2] = RD_REG_WORD(&reg->mailbox2);
++
++		DEBUG2(printk("scsi(%ld): Asynchronous RSCR UPDATE.\n",
++		    ha->host_no));
++		DEBUG(printk(KERN_INFO
++		    "scsi(%ld): RSCN database changed - 0x%x, 0x%x.\n",
++		    ha->host_no, mb[1], mb[2]));
++
++		rscn_queue_index = ha->rscn_in_ptr + 1;
++		if (rscn_queue_index == MAX_RSCN_COUNT)
++			rscn_queue_index = 0;
++		if (rscn_queue_index != ha->rscn_out_ptr) {
++			ha->rscn_queue[ha->rscn_in_ptr].format =
++			    MSB(mb[1]);
++			ha->rscn_queue[ha->rscn_in_ptr].d_id.b.domain =
++			    LSB(mb[1]);
++			ha->rscn_queue[ha->rscn_in_ptr].d_id.b.area =
++			    MSB(mb[2]);
++			ha->rscn_queue[ha->rscn_in_ptr].d_id.b.al_pa =
++			    LSB(mb[2]);
++			ha->rscn_in_ptr = rscn_queue_index;
++		} else {
++			ha->flags.rscn_queue_overflow = 1;
++		}
++
++		ha->loop_state = LOOP_UPDATE;
++		atomic_set(&ha->loop_down_timer, 0);
++		ha->flags.management_server_logged_in = 0;
++
++		set_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags);
++		set_bit(RSCN_UPDATE, &ha->dpc_flags);
++
++		/* Update AEN queue. */
++		if (ha->ioctl->flags & IOCTL_AEN_TRACKING_ENABLE) {
++			qla2x00_enqueue_aen(ha, MBA_RSCN_UPDATE, &mb[0]);
++		}
++		break;
++	}
++}
++
++/**
++ * qla2x00_process_completed_request() - Process a Fast Post response.
++ * @ha: SCSI driver HA context
++ * @index: SRB index
++ */
++static void
++qla2x00_process_completed_request(struct scsi_qla_host *ha, int index)
++{
++	srb_t *sp;
++	struct scsi_qla_host *vis_ha;
++
++	ENTER(__func__);
++
++	/* Validate handle. */
++	if (index >= MAX_OUTSTANDING_COMMANDS) {
++		DEBUG2(printk("scsi(%ld): Invalid SCSI completion handle %d.\n",
++		    ha->host_no, index));
++		printk(KERN_WARNING
++		    "scsi(%ld): Invalid SCSI completion handle %d.\n",
++		    ha->host_no, index);
++
++		set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
++		return;
++	}
++
++	sp = ha->outstanding_cmds[index];
++	if (sp) {
++		/* Free outstanding command slot. */
++		ha->outstanding_cmds[index] = 0;
++#if defined(IOCB_THROLLE_USAGE)
++		ha->iocb_cnt -= sp->iocb_cnt;
++#endif
++		vis_ha = (scsi_qla_host_t *)sp->cmd->device->host->hostdata;
++		if (ha->actthreads)
++			ha->actthreads--;
++		sp->lun_queue->out_cnt--;
++		sp->flags |= SRB_ISP_COMPLETED;
++		CMD_COMPL_STATUS(sp->cmd) = 0L;
++		CMD_SCSI_STATUS(sp->cmd) = 0L;
++
++		/* Save ISP completion status */
++		CMD_RESULT(sp->cmd) = DID_OK << 16;
++		sp->fo_retry_cnt = 0;
++		add_to_done_queue(ha, sp);
++	} else {
++		DEBUG2(printk("scsi(%ld): Invalid ISP SCSI completion handle\n",
++		    ha->host_no));
++		printk(KERN_WARNING
++		    "scsi(%ld): Invalid ISP SCSI completion handle\n",
++		    ha->host_no);
++
++		set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
++	}
++
++	LEAVE(__func__);
++}
++
++/**
++ * qla2x00_response_pkt() - Process response queue entries.
++ * @ha: SCSI driver HA context
++ * @index: Response queue out pointer
++ */
++static void
++qla2x00_response_pkt(scsi_qla_host_t *ha, uint16_t index) 
++{
++	device_reg_t	*reg = ha->iobase;
++	response_t	*pkt;
++
++	ENTER(__func__);
++
++	if (!ha->flags.online)
++		return;
++
++	if (index >= RESPONSE_ENTRY_CNT) {
++		/* Invalid response pointer value. */
++		DEBUG(printk("scsi(%ld): Response Pointer Error - index=%x.\n",
++		    ha->host_no, index));
++
++		set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
++		return;
++	}
++
++	while (ha->rsp_ring_index != index) {
++		pkt = ha->response_ring_ptr;
++
++		DEBUG5(printk("%s(%ld): ha->rsp_ring_index=%ld index=%ld.\n",
++		    __func__, ha->host_no,
++		    (u_long)ha->rsp_ring_index, (u_long)index));
++		DEBUG5(printk("%s(%ld): response packet data:",
++		    __func__, ha->host_no));
++		DEBUG5(qla2x00_dump_buffer((uint8_t *)pkt,
++		    RESPONSE_ENTRY_SIZE));
++
++		ha->rsp_ring_index++;
++		if (ha->rsp_ring_index == RESPONSE_ENTRY_CNT) {
++			ha->rsp_ring_index = 0;
++			ha->response_ring_ptr = ha->response_ring;
++		} else {
++			ha->response_ring_ptr++;
++		}
++
++#if defined(FC_IP_SUPPORT)
++		/*
++		 * This code is temporary until FW is fixed.  FW is mistakenly
++		 * setting bit 6 on Mailbox IOCB response
++		 */
++		pkt->entry_status &= 0x3f;
++#endif
++
++		if (pkt->entry_status != 0) {
++			DEBUG3(printk(KERN_INFO
++			    "scsi(%ld): Process error entry.\n", ha->host_no));
++
++			qla2x00_error_entry(ha, pkt);
++			continue;
++		}
++
++		switch (pkt->entry_type) {
++		case STATUS_TYPE:
++			qla2x00_status_entry(ha, (sts_entry_t *)pkt);
++			break;
++
++		case STATUS_CONT_TYPE:
++			qla2x00_status_cont_entry(ha, (sts_cont_entry_t *)pkt);
++			break;
++
++		case MS_IOCB_TYPE:
++			qla2x00_ms_entry(ha, (ms_iocb_entry_t *)pkt);
++			break;
++
++#if defined(FC_IP_SUPPORT)
++		case ET_IP_COMMAND_64:
++			/* Handle IP send completion */
++			qla2x00_ip_send_complete(ha,
++			    pkt->handle, le16_to_cpu(pkt->comp_status));
++			break;
++
++		case ET_IP_RECEIVE:
++			/* Handle IP receive packet */
++			qla2x00_ip_receive(ha, pkt);
++			break;
++
++		case ET_MAILBOX_COMMAND:
++		    if (pkt->sys_define == SOURCE_IP) {
++			    qla2x00_ip_mailbox_iocb_done(ha,
++				(struct mbx_entry *)pkt);
++			    break;
++		    }       
++#endif  /* FC_IP_SUPPORT */
++
++		default:
++			/* Type Not Supported. */
++			DEBUG4(printk(KERN_WARNING
++			    "scsi(%ld): Received unknown response pkt type %x "
++			    "entry status=%x.\n",
++			    ha->host_no, pkt->entry_type, pkt->entry_status));
++			break;
++		}
++	}
++
++	/* Adjust ring index */
++	WRT_REG_WORD(ISP_RSP_Q_OUT(reg), ha->rsp_ring_index);
++
++	LEAVE(__func__);
++}
++
++/**
++ * qla2x00_status_entry() - Process a Status IOCB entry.
++ * @ha: SCSI driver HA context
++ * @pkt: Entry pointer
++ */
++static void
++qla2x00_status_entry(scsi_qla_host_t *ha, sts_entry_t *pkt ) 
++{
++	uint32_t	b, t, l;
++	scsi_qla_host_t	*vis_ha;
++	srb_t		*sp;
++	os_lun_t	*lq;
++	os_tgt_t	*tq;
++	fc_port_t	*fcport;
++	Scsi_Cmnd	*cp;
++	uint16_t	comp_status;
++	uint16_t	scsi_status;
++	uint8_t		lscsi_status;
++	uint32_t	resid;
++	uint8_t		sense_sz = 0;
++
++
++	ENTER(__func__);
++
++	/* Validate handle. */
++	if (pkt->handle < MAX_OUTSTANDING_COMMANDS) {
++		sp = ha->outstanding_cmds[pkt->handle];
++		/* Free outstanding command slot. */
++		ha->outstanding_cmds[pkt->handle] = 0;
++	} else
++		sp = NULL;
++
++	if (sp == NULL) {
++		DEBUG2(printk("scsi(%ld): Status Entry invalid handle.\n",
++		    ha->host_no));
++		printk(KERN_WARNING
++		    "scsi(%ld): Status Entry invalid handle.\n", ha->host_no);
++
++		set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
++		if (ha->dpc_wait && !ha->dpc_active) 
++			up(ha->dpc_wait);
++		return;
++	}
++
++	cp = sp->cmd;
++	if (cp == NULL) {
++		DEBUG2(printk("scsi(%ld): Cmd already returned back to OS "
++		    "pkt->handle: %d sp=%p sp->state:%d\n",
++		    ha->host_no, pkt->handle, sp, sp->state));
++		printk(KERN_WARNING
++		    "scsi(%ld): Cmd is NULL: already returned to OS (sp=%p)\n",
++		    ha->host_no, sp);
++		return;
++	}
++
++	/*
++	 * Set the visible adapter for lun Q access.
++	 */
++	vis_ha = (scsi_qla_host_t *)cp->device->host->hostdata;
++	if (ha->actthreads)
++		ha->actthreads--;
++
++	if (sp->lun_queue == NULL) {
++		DEBUG2(printk("scsi(%ld): Status Entry invalid lun "
++		    "pointer.\n", ha->host_no));
++		printk(KERN_WARNING
++		    "scsi(%ld): Status Entry invalid lun pointer.\n",
++		    ha->host_no);
++
++		set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
++		if (ha->dpc_wait && !ha->dpc_active) 
++			up(ha->dpc_wait);
++		return;
++	}
++
++	sp->lun_queue->out_cnt--;
++#if defined(IOCB_THROLLE_USAGE)
++	ha->iocb_cnt -= sp->iocb_cnt;
++#endif
++
++	comp_status = le16_to_cpu(pkt->comp_status);
++	/* Mask of reserved bits 12-15.  Before we examine the scsi status */
++	scsi_status = le16_to_cpu(pkt->scsi_status) & SS_MASK;
++	lscsi_status = scsi_status & STATUS_MASK;
++
++	CMD_ENTRY_STATUS(cp) = pkt->entry_status;
++	CMD_COMPL_STATUS(cp) = comp_status;
++	CMD_SCSI_STATUS(cp) = scsi_status;
++
++	/* dg 10/11 */
++	sp->flags |= SRB_ISP_COMPLETED;
++
++	/* Generate LU queue on cntrl, target, LUN */
++	b = SCSI_BUS_32(cp);
++	t = SCSI_TCN_32(cp);
++	l = SCSI_LUN_32(cp);
++
++	tq = sp->tgt_queue;
++	lq = sp->lun_queue;
++
++	/*
++	 * If loop is in transient state Report DID_BUS_BUSY
++	 */
++	if (!(sp->flags & SRB_IOCTL) &&
++	    (atomic_read(&ha->loop_down_timer) ||
++		ha->loop_state != LOOP_READY) &&
++	    (comp_status != CS_COMPLETE || scsi_status != 0)) {
++
++		DEBUG2(printk("scsi(%ld:%d:%d:%d): Loop Not Ready - "
++		    "pid=%lx.\n",
++		    ha->host_no,
++		    b, t, l, sp->cmd->serial_number));
++
++		qla2x00_extend_timeout(sp->cmd, EXTEND_CMD_TIMEOUT);
++		add_to_retry_queue(ha, sp);
++		return;
++	}
++
++	/*
++	 * Based on Host and scsi status generate status code for Linux
++	 */
++	switch (comp_status) {
++	case CS_COMPLETE:
++		/*
++		 * Host complted command OK.  Check SCSI Status to determine
++		 * the correct Host status.
++		 */
++		if (scsi_status == 0) {
++			CMD_RESULT(cp) = DID_OK << 16;
++
++			/* Perform any post command processing */
++			qla2x00_filter_command(ha, sp);
++		} else {   /* Check for non zero scsi status */
++			if (lscsi_status == SS_BUSY_CONDITION) {
++				CMD_RESULT(cp) =
++				    DID_BUS_BUSY << 16 | lscsi_status;
++			} else {
++				CMD_RESULT(cp) =
++				    DID_OK << 16 | lscsi_status;
++
++				if (lscsi_status != SS_CHECK_CONDITION)
++					break;
++
++				/*
++				 * Copy Sense Data into sense buffer
++				 */
++				memset(cp->sense_buffer,
++				    0, sizeof(cp->sense_buffer));
++
++				if (!(scsi_status & SS_SENSE_LEN_VALID))
++					break;
++
++				if (le16_to_cpu(pkt->req_sense_length) <
++				    CMD_SNSLEN(cp))
++					sense_sz =
++					    le16_to_cpu(pkt->req_sense_length);
++				else
++					sense_sz = CMD_SNSLEN(cp) - 1;
++
++				CMD_ACTUAL_SNSLEN(cp) = sense_sz;
++				sp->request_sense_length = sense_sz;
++				sp->request_sense_ptr =
++				    (void *)cp->sense_buffer;
++
++				if (sp->request_sense_length > 32) 
++					sense_sz = 32;
++
++				memcpy(cp->sense_buffer,
++				    pkt->req_sense_data, sense_sz);
++
++				sp->request_sense_ptr += sense_sz;
++				sp->request_sense_length -= sense_sz;
++				if (sp->request_sense_length != 0)
++					ha->status_srb = sp;
++
++				if (!(sp->flags & SRB_IOCTL) &&
++				    qla2x00_check_sense(cp, lq) ==
++				        QL_STATUS_SUCCESS) {
++					/*
++					 * Throw away status_cont if any
++					 */
++					ha->status_srb = NULL;
++					add_to_scsi_retry_queue(ha, sp);
++					return;
++				}
++
++				DEBUG5(printk("%s(): Check condition Sense "
++				    "data, scsi(%ld:%d:%d:%d) cmd=%p "
++				    "pid=%ld\n",
++				    __func__,
++				    ha->host_no,
++				    b, t, l,
++				    cp, cp->serial_number));
++				if (sense_sz)
++					DEBUG5(qla2x00_dump_buffer(
++					    cp->sense_buffer,
++					    CMD_ACTUAL_SNSLEN(cp)));
++			}
++		}
++		break;
++
++	case CS_DATA_UNDERRUN:
++		DEBUG2(printk(KERN_INFO
++		    "scsi(%ld:%d:%d) UNDERRUN status detected 0x%x-0x%x.\n",
++		    ha->host_no,
++		    t, l, comp_status, scsi_status));
++
++		resid = le32_to_cpu(pkt->residual_length);
++		CMD_RESID_LEN(cp) = resid;
++
++		/*
++		 * Check to see if SCSI Status is non zero.  If so report SCSI
++		 * Status.
++		 */
++		if (lscsi_status != 0) {
++			if (lscsi_status == SS_BUSY_CONDITION) {
++				CMD_RESULT(cp) =
++				    DID_BUS_BUSY << 16 | lscsi_status;
++			} else {
++				CMD_RESULT(cp) =
++				    DID_OK << 16 | lscsi_status;
++
++				if (lscsi_status != SS_CHECK_CONDITION)
++					break;
++
++				/*
++				 * Copy Sense Data into sense buffer
++				 */
++				memset(cp->sense_buffer,
++				    0, sizeof(cp->sense_buffer));
++
++				if (!(scsi_status & SS_SENSE_LEN_VALID))
++					break;
++
++				if (le16_to_cpu(pkt->req_sense_length) <
++				    CMD_SNSLEN(cp))
++					sense_sz =
++					    le16_to_cpu(pkt->req_sense_length);
++				else
++					sense_sz = CMD_SNSLEN(cp) - 1;
++
++				CMD_ACTUAL_SNSLEN(cp) = sense_sz;
++				sp->request_sense_length = sense_sz;
++				sp->request_sense_ptr =
++				    (void *)cp->sense_buffer;
++
++				if (sp->request_sense_length > 32) 
++					sense_sz = 32;
++
++				memcpy(cp->sense_buffer,
++				    pkt->req_sense_data, sense_sz);
++
++				sp->request_sense_ptr += sense_sz;
++				sp->request_sense_length -= sense_sz;
++				if (sp->request_sense_length != 0)
++					ha->status_srb = sp;
++
++				if (!(sp->flags & SRB_IOCTL) &&
++				    (qla2x00_check_sense(cp, lq) ==
++					QL_STATUS_SUCCESS)) {
++					ha->status_srb = NULL;
++					add_to_scsi_retry_queue(ha,sp);
++					return;
++				}
++
++				DEBUG5(printk("%s(): Check condition Sense "
++				    "data, scsi(%ld:%d:%d:%d) cmd=%p "
++				    "pid=%ld\n",
++				    __func__,
++				    ha->host_no,
++				    b, t, l,
++				    cp, cp->serial_number));
++				if (sense_sz)
++					DEBUG5(qla2x00_dump_buffer(
++					    cp->sense_buffer,
++					    CMD_ACTUAL_SNSLEN(cp)));
++			}
++		} else {
++			/*
++			 * If RISC reports underrun and target does not report
++			 * it then we must have a lost frame, so tell upper
++			 * layer to retry it by reporting a bus busy.
++			 */
++			if (!(scsi_status & SS_RESIDUAL_UNDER)) {
++				DEBUG2(printk("scsi(%ld:%d:%d:%d) Dropped "
++				    "frame(s) detected (%x of %x bytes)..."
++				    "retrying command.\n",
++				    ha->host_no,
++				    b, t, l, resid, CMD_XFRLEN(cp)));
++
++				CMD_RESULT(cp) = DID_BUS_BUSY << 16;
++				ha->dropped_frame_error_cnt++;
++				break;
++			}
++
++			/*
++			 * Handle mid-layer underflow???
++			 *
++			 * For kernels less than 2.4, the driver must return
++			 * an error if an underflow is detected.  For kernels
++			 * equal-to and above 2.4, the mid-layer will
++			 * appearantly handle the underflow by detecting the
++			 * residual count -- unfortunately, we do not see
++			 * where this is actually being done.  In the interim,
++			 * we will return DID_ERROR.
++			 */
++			cp->resid = resid;
++/* TODO:
++ *
++ * Determine if this is a valid check for 2.5
++ */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
++			if ((unsigned)(CMD_XFRLEN(cp) - resid) <
++			    cp->underflow) {
++				printk(KERN_INFO
++				    "scsi(%ld): Mid-layer underflow detected "
++				    "(%x of %x bytes) wanted %x bytes..."
++				    "returning DID_ERROR status!\n",
++				    ha->host_no,
++				    resid, CMD_XFRLEN(cp), cp->underflow);
++
++				CMD_RESULT(cp) = DID_ERROR << 16;
++				break;
++			}
++#endif
++			/* Everybody online, looking good... */
++			CMD_RESULT(cp) = DID_OK << 16;
++
++			/* Perform any post command processing */
++			qla2x00_filter_command(ha, sp);
++		}
++		break;
++
++	case CS_PORT_LOGGED_OUT:
++	case CS_PORT_CONFIG_CHG:
++	case CS_PORT_BUSY:
++	case CS_INCOMPLETE:
++	case CS_PORT_UNAVAILABLE:
++		/*
++		 * If the port is in Target Down state, return all IOs for this
++		 * Target with DID_NO_CONNECT ELSE Queue the IOs in the
++		 * retry_queue.
++		 */
++		fcport = lq->fclun->fcport;
++		DEBUG2(printk("scsi(%ld:%d:%d): status_entry: Port Down "
++		    "pid=%ld, compl status=0x%x, port state=0x%x\n",
++		    ha->host_no,
++		    t, l,
++		    sp->cmd->serial_number,
++		    comp_status,
++		    atomic_read(&fcport->state)));
++
++		if ((sp->flags & SRB_IOCTL) ||
++		    (atomic_read(&fcport->state) == FC_DEVICE_DEAD)) {
++			CMD_RESULT(cp) = DID_NO_CONNECT << 16;
++			add_to_done_queue(ha, sp);
++		} else {
++			qla2x00_extend_timeout(cp, EXTEND_CMD_TIMEOUT);
++			add_to_retry_queue(ha, sp);
++		}
++
++		if (atomic_read(&fcport->state) == FC_ONLINE) {
++			qla2x00_mark_device_lost(ha, fcport);
++		}
++
++		return;
++		break;
++
++	case CS_RESET:
++		DEBUG2(printk(KERN_INFO
++		    "scsi(%ld): RESET status detected 0x%x-0x%x.\n",
++		    ha->host_no, comp_status, scsi_status));
++
++		if (sp->flags & SRB_IOCTL) {
++			CMD_RESULT(cp) = DID_RESET << 16;
++		}
++		else {
++			qla2x00_extend_timeout(cp, EXTEND_CMD_TIMEOUT);
++			add_to_retry_queue(ha, sp);
++			return;
++		}
++		break;
++
++	case CS_ABORTED:
++		/* 
++		 * hv2.19.12 - DID_ABORT does not retry the request if we
++		 * aborted this request then abort otherwise it must be a
++		 * reset.
++		 */
++		DEBUG2(printk(KERN_INFO
++		    "scsi(%ld): ABORT status detected 0x%x-0x%x.\n",
++		    ha->host_no, comp_status, scsi_status));
++
++		CMD_RESULT(cp) = DID_RESET << 16;
++		break;
++
++	case CS_TIMEOUT:
++		DEBUG2(printk(KERN_INFO
++		    "scsi(%ld:%d:%d:%d): TIMEOUT status detected 0x%x-0x%x.\n",
++		    ha->host_no,
++		    b, t, l,
++		    comp_status, scsi_status));
++
++		CMD_RESULT(cp) = DID_BUS_BUSY << 16;
++
++		fcport = lq->fclun->fcport;
++// Dump FW
++printk("***TIMEOUT cmd=(%lx) cdb=(%x)\n\n", cp->serial_number, cp->cmnd[0]);
++//qla2x00_dump_isp(ha, 1);
++
++		/* 
++		 * Check to see if logout occurred
++		 */
++		t = SCSI_TCN_32(cp);
++		if ((le16_to_cpu(pkt->status_flags) & IOCBSTAT_SF_LOGO)) {
++			DEBUG2(printk("scsi: Timeout occurred with Logo, "
++			    "status flag (%x) with public device loop id "
++			    "(%x), attempt new recovery\n",
++			    le16_to_cpu(pkt->status_flags),
++			    ha->fc_db[t].loop_id));
++
++			ha->fc_db[t].flag |= DEV_RELOGIN;
++			fcport->login_retry = ha->login_retry_count;
++			set_bit(RELOGIN_NEEDED, &ha->dpc_flags);
++		}
++		break;
++
++	case CS_QUEUE_FULL:
++		DEBUG2(printk(KERN_INFO
++		    "scsi(%ld): QUEUE FULL status detected 0x%x-0x%x.\n",
++		    ha->host_no, comp_status, scsi_status));
++
++		/*
++		 * SCSI Mid-Layer handles device queue full.
++		 */				 
++		CMD_RESULT(cp) = DID_OK << 16 | lscsi_status;
++
++/* Adjust queue depth */
++{
++int ret;
++
++ret = scsi_track_queue_full(cp->device, sp->lun_queue->out_cnt-1);
++printk("scsi(%ld:%d:%d:%d): QUEUE FULL adjustments -- "
++    "outstanding/adjusted (%ld/%d) -- qd/lqfd/lqfc (%d/%d/%d).\n",
++    ha->host_no,
++    cp->device->channel, cp->device->id, cp->device->lun,
++    sp->lun_queue->out_cnt-1, ret,
++    cp->device->queue_depth,
++    cp->device->last_queue_full_count,
++    cp->device->last_queue_full_depth);
++}
++
++
++		break;
++
++	default:
++		DEBUG3(printk("scsi(%ld): Error detected (unknown status) "
++		    "0x%x-0x%x.\n",
++		    ha->host_no, comp_status, scsi_status));
++		printk(KERN_INFO
++		    "scsi(%ld): Unknown status detected 0x%x-0x%x.\n",
++		    ha->host_no, comp_status, scsi_status);
++
++		CMD_RESULT(cp) = DID_ERROR << 16;
++		break;
++	}
++
++	/* Place command on done queue. */
++	if (ha->status_srb == NULL)
++		add_to_done_queue(ha, sp);
++
++	LEAVE(__func__);
++}
++
++/**
++ * qla2x00_status_cont_entry() - Process a Status Continuations entry.
++ * @ha: SCSI driver HA context
++ * @pkt: Entry pointer
++ *
++ * Extended sense data.
++ */
++static void
++qla2x00_status_cont_entry(scsi_qla_host_t *ha, sts_cont_entry_t *pkt)
++{
++	uint8_t		sense_sz = 0;
++	srb_t		*sp = ha->status_srb;
++	Scsi_Cmnd	*cp;
++
++	ENTER(__func__);
++
++	if (sp != NULL && sp->request_sense_length != 0) {
++		cp = sp->cmd;
++		if (cp == NULL) {
++			DEBUG2(printk("%s(): Cmd already returned back to OS "
++			    "sp=%p sp->state:%d\n",
++			    __func__, sp, sp->state));
++			printk(KERN_INFO
++			    "%s(): cmd is NULL: already returned to OS "
++			    "(sp=%p)\n",
++			    __func__, sp); 
++
++			ha->status_srb = NULL;
++			return;
++		}
++
++		if (sp->request_sense_length > sizeof (pkt->req_sense_data)) {
++			sense_sz = sizeof(pkt->req_sense_data);
++		} else {
++			sense_sz = sp->request_sense_length;
++		}
++
++		/* Move sense data. */
++		memcpy(sp->request_sense_ptr, pkt->req_sense_data, sense_sz);
++		DEBUG5(qla2x00_dump_buffer(sp->request_sense_ptr, sense_sz));
++
++		sp->request_sense_ptr += sense_sz;
++		sp->request_sense_length -= sense_sz;
++
++		/* Place command on done queue. */
++		if (sp->request_sense_length == 0) {
++			add_to_done_queue(ha, sp);
++			ha->status_srb = NULL;
++		}
++	}
++
++	LEAVE(__func__);
++}
++
++/**
++ * qla2x00_error_entry() - Process an error entry.
++ * @ha: SCSI driver HA context
++ * @pkt: Entry pointer
++ */
++static void
++qla2x00_error_entry(scsi_qla_host_t *ha, response_t *pkt) 
++{
++	srb_t *sp;
++
++	ENTER(__func__);
++
++#if defined(QL_DEBUG_LEVEL_2)
++	if (pkt->entry_status & RF_INV_E_ORDER)
++		printk("%s(%ld): Invalid Entry Order\n",
++		    __func__, ha->host_no);
++	else if (pkt->entry_status & RF_INV_E_COUNT)
++		printk("%s(%ld): Invalid Entry Count\n",
++		    __func__, ha->host_no);
++	else if (pkt->entry_status & RF_INV_E_PARAM)
++		printk("%s(%ld): Invalid Entry Parameter\n",
++		    __func__, ha->host_no);
++	else if (pkt->entry_status & RF_INV_E_TYPE)
++		printk("%s(%ld): Invalid Entry Type\n",
++		    __func__, ha->host_no);
++	else if (pkt->entry_status & RF_BUSY)
++		printk("%s(%ld): Busy\n",
++		    __func__, ha->host_no);
++	else
++		printk("%s(%ld): UNKNOWN flag error\n",
++		    __func__, ha->host_no);
++#endif
++
++	/* Validate handle. */
++	if (pkt->handle < MAX_OUTSTANDING_COMMANDS)
++		sp = ha->outstanding_cmds[pkt->handle];
++	else
++		sp = NULL;
++
++	if (sp) {
++		/* Free outstanding command slot. */
++		ha->outstanding_cmds[pkt->handle] = 0;
++		if (ha->actthreads)
++			ha->actthreads--;
++		sp->lun_queue->out_cnt--;
++#if defined(IOCB_THROLLE_USAGE)
++		ha->iocb_cnt -= sp->iocb_cnt;
++#endif
++
++		sp->flags |= SRB_ISP_COMPLETED;
++
++		/* Bad payload or header */
++		if (pkt->entry_status &
++		    (RF_INV_E_ORDER | RF_INV_E_COUNT |
++		     RF_INV_E_PARAM | RF_INV_E_TYPE)) {
++			CMD_RESULT(sp->cmd) = DID_ERROR << 16;
++		} else if (pkt->entry_status & RF_BUSY) {
++			CMD_RESULT(sp->cmd) = DID_BUS_BUSY << 16;
++		} else {
++			CMD_RESULT(sp->cmd) = DID_ERROR << 16;
++		}
++		/* Place command on done queue. */
++		add_to_done_queue(ha, sp);
++
++	} else if (pkt->entry_type == COMMAND_A64_TYPE ||
++	    pkt->entry_type == COMMAND_TYPE) {
++		DEBUG2(printk("scsi(%ld): Error entry - invalid handle\n",
++		    ha->host_no));
++		printk(KERN_WARNING
++		    "scsi(%ld): Error entry - invalid handle\n",
++		    ha->host_no);
++
++		set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
++		if (ha->dpc_wait && !ha->dpc_active) 
++			up(ha->dpc_wait);
++	}
++
++	LEAVE(__func__);
++}
++
++/**
++ * qla2x00_ms_entry() - Process a Management Server entry.
++ * @ha: SCSI driver HA context
++ * @index: Response queue out pointer
++ */
++static void
++qla2x00_ms_entry(scsi_qla_host_t *ha, ms_iocb_entry_t *pkt) 
++{
++	srb_t          *sp;
++
++	ENTER(__func__);
++
++	DEBUG3(printk("%s(%ld): pkt=%p pkthandle=%d.\n",
++	    __func__, ha->host_no, pkt, pkt->handle1));
++
++	/* Validate handle. */
++ 	if (pkt->handle1 < MAX_OUTSTANDING_COMMANDS)
++ 		sp = ha->outstanding_cmds[pkt->handle1];
++	else
++		sp = NULL;
++
++	if (sp == NULL) {
++		DEBUG2(printk("scsi(%ld): MS entry - invalid handle\n",
++		    ha->host_no));
++		printk(KERN_WARNING
++		    "scsi(%ld): MS entry - invalid handle\n",
++		    ha->host_no);
++
++		set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
++		return;
++	}
++
++	CMD_COMPL_STATUS(sp->cmd) = le16_to_cpu(pkt->status);
++	CMD_ENTRY_STATUS(sp->cmd) = pkt->entry_status;
++
++	/* Free outstanding command slot. */
++	ha->outstanding_cmds[pkt->handle1] = 0;
++	sp->flags |= SRB_ISP_COMPLETED;
++
++	add_to_done_queue(ha, sp);
++
++	LEAVE(__func__);
++}
++
++/**
++ * qla2x00_check_sense() - Perform any sense data interrogation.
++ * @cp: SCSI Command
++ * @lq: Lun queue
++ *
++ * Returns QL_STATUS_SUCCESS if the lun queue is suspended, else
++ * QL_STATUS_ERROR  (lun queue not suspended).
++ */
++static int 
++qla2x00_check_sense(Scsi_Cmnd *cp, os_lun_t *lq)
++{
++	scsi_qla_host_t	*ha;
++	srb_t		*sp;
++	fc_port_t	*fcport;
++
++	ha = (scsi_qla_host_t *) cp->device->host->hostdata;
++	if (((cp->sense_buffer[0] & 0x70) >> 4) != 7) {
++		return (QL_STATUS_ERROR);
++	}
++
++	sp = (srb_t * )CMD_SP(cp);
++	sp->flags |= SRB_GOT_SENSE;
++
++	switch (cp->sense_buffer[2] & 0xf) {
++	case RECOVERED_ERROR:
++		CMD_RESULT(cp)  = DID_OK << 16;
++		cp->sense_buffer[0] = 0;
++		break;
++
++	case NOT_READY:
++		fcport = lq->fclun->fcport;
++
++		/*
++		 * Suspend the lun only for hard disk device type.
++		 */
++		if (!(fcport->flags & FC_TAPE_DEVICE) &&
++		    lq->q_state != LUN_STATE_TIMEOUT) {
++			/*
++			 * If target is in process of being ready then suspend
++			 * lun for 6 secs and retry all the commands.
++			 */
++			if (cp->sense_buffer[12] == 0x4 &&
++			    cp->sense_buffer[13] == 0x1) {
++
++				/* Suspend the lun for 6 secs */
++				qla2x00_suspend_lun(ha,
++				    lq, 6, ql2xsuspendcount);
++
++				return (QL_STATUS_SUCCESS);
++			}
++		}
++		break;
++	}
++
++	return (QL_STATUS_ERROR);
++}
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qla_listops.h	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,397 @@
++/******************************************************************************
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ ******************************************************************************/
++
++/* Management functions for various lists */
++
++/*
++ * Found in kernel 2.4.9 and higher in include/linux/lists.h
++ *
++ * Iterate over a list safe against removal of list.
++ *
++ */
++#if !defined(list_for_each_safe)
++#define list_for_each_safe(pos, n, head) \
++	for( pos= (head)->next, n = pos->next; pos != (head); \
++		pos = n, n = pos->next )
++#endif
++
++/* __add_to_done_queue()
++ * 
++ * Place SRB command on done queue.
++ *
++ * Input:
++ *      ha           = host pointer
++ *      sp           = srb pointer.
++ * Locking:
++ * 	this function assumes the ha->list_lock is already taken
++ */
++static inline void 
++__add_to_done_queue(struct scsi_qla_host * ha, srb_t * sp)
++{
++	/*
++        if (sp->state != SRB_NO_QUEUE_STATE && 
++        	sp->state != SRB_ACTIVE_STATE)
++		BUG();
++	*/
++
++        /* Place block on done queue */
++        sp->cmd->host_scribble = (unsigned char *) NULL;
++        sp->state = SRB_DONE_STATE;
++        list_add_tail(&sp->list,&ha->done_queue);
++        ha->done_q_cnt++;
++	sp->ha = ha;
++}
++
++/* __add_to_free_queue()
++ * 
++ * Place SRB command on free queue.
++ *
++ * Input:
++ *      ha           = host pointer
++ *      sp           = srb pointer.
++ * Locking:
++ * 	this function assumes the ha->list_lock is already taken
++ */
++static inline void 
++__add_to_free_queue(struct scsi_qla_host * ha, srb_t * sp)
++{
++	/*
++        if (atomic_read(&sp->ref_count) != 0)
++                BUG();
++	*/
++
++
++        /* Place block on free queue */
++        sp->state = SRB_FREE_STATE;
++        list_add_tail(&sp->list,&ha->free_queue);
++        ha->srb_cnt++;
++}
++
++static inline void 
++__add_to_retry_queue(struct scsi_qla_host * ha, srb_t * sp)
++{
++	/*
++        if( sp->state != SRB_NO_QUEUE_STATE && 
++        	sp->state != SRB_ACTIVE_STATE)
++		BUG();
++	*/
++
++        /* Place block on retry queue */
++        list_add_tail(&sp->list,&ha->retry_queue);
++        ha->retry_q_cnt++;
++        sp->flags |= SRB_WATCHDOG;
++        ha->flags.watchdog_enabled = TRUE;
++        sp->state = SRB_RETRY_STATE;
++	sp->ha = ha;
++}
++
++static inline void 
++__add_to_scsi_retry_queue(struct scsi_qla_host * ha, srb_t * sp)
++{
++	/*
++        if( sp->state != SRB_NO_QUEUE_STATE && 
++        	sp->state != SRB_ACTIVE_STATE)
++		BUG();
++	*/
++
++        /* Place block on retry queue */
++        list_add_tail(&sp->list,&ha->scsi_retry_queue);
++        ha->scsi_retry_q_cnt++;
++        sp->state = SRB_SCSI_RETRY_STATE;
++	sp->ha = ha;
++}
++
++static inline void 
++add_to_done_queue(struct scsi_qla_host * ha, srb_t * sp)
++{
++        unsigned long flags;
++
++        spin_lock_irqsave(&ha->list_lock, flags);
++        __add_to_done_queue(ha,sp);
++        spin_unlock_irqrestore(&ha->list_lock, flags);
++}
++
++static inline void 
++add_to_free_queue(struct scsi_qla_host * ha, srb_t * sp)
++{
++        unsigned long flags;
++
++        spin_lock_irqsave(&ha->list_lock, flags);
++        __add_to_free_queue(ha,sp);
++        spin_unlock_irqrestore(&ha->list_lock, flags);
++}
++
++static inline void 
++add_to_retry_queue(struct scsi_qla_host * ha, srb_t * sp)
++{
++        unsigned long flags;
++
++        spin_lock_irqsave(&ha->list_lock, flags);
++        __add_to_retry_queue(ha,sp);
++        spin_unlock_irqrestore(&ha->list_lock, flags);
++}
++
++static inline void 
++add_to_scsi_retry_queue(struct scsi_qla_host * ha, srb_t * sp)
++{
++        unsigned long flags;
++
++        spin_lock_irqsave(&ha->list_lock, flags);
++        __add_to_scsi_retry_queue(ha,sp);
++        spin_unlock_irqrestore(&ha->list_lock, flags);
++}
++
++/*
++ * __del_from_retry_queue
++ *      Function used to remove a command block from the
++ *      watchdog timer queue.
++ *
++ *      Note: Must insure that command is on watchdog
++ *            list before calling del_from_retry_queue
++ *            if (sp->flags & SRB_WATCHDOG)
++ *
++ * Input: 
++ *      ha = adapter block pointer.
++ *      sp = srb pointer.
++ * Locking:
++ *	this function assumes the list_lock is already taken
++ */
++static inline void 
++__del_from_retry_queue(struct scsi_qla_host * ha, srb_t * sp)
++{
++        list_del_init(&sp->list);
++
++        if (list_empty(&ha->retry_queue))
++                ha->flags.watchdog_enabled = FALSE;
++        sp->flags &= ~(SRB_WATCHDOG | SRB_BUSY);
++        sp->state = SRB_NO_QUEUE_STATE;
++        ha->retry_q_cnt--;
++}
++
++/*
++ * __del_from_scsi_retry_queue
++ *      Function used to remove a command block from the
++ *      scsi retry queue.
++ *
++ * Input: 
++ *      ha = adapter block pointer.
++ *      sp = srb pointer.
++ * Locking:
++ *	this function assumes the list_lock is already taken
++ */
++static inline void 
++__del_from_scsi_retry_queue(struct scsi_qla_host * ha, srb_t * sp)
++{
++        list_del_init(&sp->list);
++
++        ha->scsi_retry_q_cnt--;
++        sp->state = SRB_NO_QUEUE_STATE;
++}
++
++/*
++ * del_from_retry_queue
++ *      Function used to remove a command block from the
++ *      watchdog timer queue.
++ *
++ *      Note: Must insure that command is on watchdog
++ *            list before calling del_from_retry_queue
++ *            if (sp->flags & SRB_WATCHDOG)
++ *
++ * Input: 
++ *      ha = adapter block pointer.
++ *      sp = srb pointer.
++ * Locking:
++ *	this function takes and releases the list_lock
++ */
++static inline void 
++del_from_retry_queue(struct scsi_qla_host * ha, srb_t * sp)
++{
++        unsigned long flags;
++
++        /*	if (unlikely(!(sp->flags & SRB_WATCHDOG)))
++        		BUG();*/
++        spin_lock_irqsave(&ha->list_lock, flags);
++
++        /*	if (unlikely(list_empty(&ha->retry_queue)))
++        		BUG();*/
++
++        __del_from_retry_queue(ha,sp);
++
++        spin_unlock_irqrestore(&ha->list_lock, flags);
++}
++/*
++ * del_from_scsi_retry_queue
++ *      Function used to remove a command block from the
++ *      scsi retry queue.
++ *
++ * Input: 
++ *      ha = adapter block pointer.
++ *      sp = srb pointer.
++ * Locking:
++ *	this function takes and releases the list_lock
++ */
++static inline void 
++del_from_scsi_retry_queue(struct scsi_qla_host * ha, srb_t * sp)
++{
++        unsigned long flags;
++
++        spin_lock_irqsave(&ha->list_lock, flags);
++
++        /*	if (unlikely(list_empty(&ha->scsi_retry_queue)))
++        		BUG();*/
++
++        __del_from_scsi_retry_queue(ha,sp);
++
++        spin_unlock_irqrestore(&ha->list_lock, flags);
++}
++
++static inline void
++__del_from_free_queue(struct scsi_qla_host * ha, srb_t * sp)
++{
++        ha->srb_cnt--;
++        list_del_init(&sp->list);
++        sp->state = SRB_NO_QUEUE_STATE;
++}
++
++/*
++ * __add_to_pending_queue
++ *      Add the standard SCB job to the bottom of standard SCB commands.
++ *
++ * Input:
++ * COMPLETE!!!
++ *      q  = SCSI LU pointer.
++ *      sp = srb pointer.
++ *      SCSI_LU_Q lock must be already obtained.
++ */
++static inline void 
++__add_to_pending_queue(struct scsi_qla_host *ha, srb_t * sp)
++{
++	/*
++        if( sp->state != SRB_NO_QUEUE_STATE &&
++        	sp->state != SRB_FREE_STATE &&
++        	sp->state != SRB_ACTIVE_STATE)
++		BUG();
++	*/
++
++	list_add_tail(&sp->list, &ha->pending_queue);
++	ha->qthreads++;
++	sp->state = SRB_PENDING_STATE;
++}
++
++static inline void 
++__add_to_pending_queue_head(struct scsi_qla_host *ha, srb_t * sp)
++{
++	/*
++        if( sp->state != SRB_NO_QUEUE_STATE && 
++        	sp->state != SRB_FREE_STATE &&
++        	sp->state != SRB_ACTIVE_STATE)
++		BUG();
++	*/
++
++	list_add(&sp->list, &ha->pending_queue);
++	ha->qthreads++;
++	sp->state = SRB_PENDING_STATE;
++}
++
++static inline void
++add_to_pending_queue(struct scsi_qla_host *ha, srb_t *sp)
++{
++	unsigned long flags;
++
++	spin_lock_irqsave(&ha->list_lock, flags);
++	__add_to_pending_queue(ha, sp);
++	spin_unlock_irqrestore(&ha->list_lock, flags);
++}
++static inline void
++add_to_pending_queue_head(struct scsi_qla_host *ha, srb_t *sp)
++{
++	unsigned long flags;
++
++	spin_lock_irqsave(&ha->list_lock, flags);
++	__add_to_pending_queue_head(ha, sp);
++	spin_unlock_irqrestore(&ha->list_lock, flags);
++}
++
++static inline void
++__del_from_pending_queue(struct scsi_qla_host *ha, srb_t *sp)
++{
++	list_del_init(&sp->list);
++	ha->qthreads--;
++	sp->state = SRB_NO_QUEUE_STATE;
++}
++
++/*
++ * Failover Stuff.
++ */
++static inline void
++__add_to_failover_queue(struct scsi_qla_host * ha, srb_t * sp)
++{
++	/*
++        if( sp->state != SRB_NO_QUEUE_STATE && 
++        	sp->state != SRB_ACTIVE_STATE)
++		BUG();
++	*/
++
++        list_add_tail(&sp->list,&ha->failover_queue);
++        ha->failover_cnt++;
++        sp->state = SRB_FAILOVER_STATE;
++	sp->ha = ha;
++}
++
++static inline void add_to_failover_queue(struct scsi_qla_host * ha, srb_t * sp)
++{
++        unsigned long flags;
++
++        spin_lock_irqsave(&ha->list_lock, flags);
++
++        __add_to_failover_queue(ha,sp);
++
++        spin_unlock_irqrestore(&ha->list_lock, flags);
++}
++static inline void __del_from_failover_queue(struct scsi_qla_host * ha, srb_t *
++                sp)
++{
++        ha->failover_cnt--;
++        list_del_init(&sp->list);
++        sp->state = SRB_NO_QUEUE_STATE;
++}
++
++static inline void del_from_failover_queue(struct scsi_qla_host * ha, srb_t * sp)
++{
++        unsigned long flags;
++
++        spin_lock_irqsave(&ha->list_lock, flags);
++
++        __del_from_failover_queue(ha,sp);
++
++        spin_unlock_irqrestore(&ha->list_lock, flags);
++}
++
++static inline void 
++del_from_pending_queue(struct scsi_qla_host * ha, srb_t * sp)
++{
++        unsigned long flags;
++
++        spin_lock_irqsave(&ha->list_lock, flags);
++
++        __del_from_pending_queue(ha,sp);
++
++        spin_unlock_irqrestore(&ha->list_lock, flags);
++}
++
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qla_mbx.c	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,2884 @@
++/*
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ */
++
++#include "qla_os.h"
++
++#include "qla_def.h"
++
++/*
++ *  Local Function Prototypes.
++ */
++static void
++qla2x00_mbx_sem_timeout(unsigned long);
++
++static uint8_t
++qla2x00_get_mbx_access(scsi_qla_host_t *, uint32_t);
++
++static uint8_t
++qla2x00_release_mbx_access(scsi_qla_host_t *, uint32_t);
++
++static uint8_t
++qla2x00_mbx_q_add(scsi_qla_host_t *, mbx_cmdq_t **);
++
++static void
++qla2x00_mbx_q_get(scsi_qla_host_t *, mbx_cmdq_t **);
++
++static void
++qla2x00_mbx_q_memb_alloc(scsi_qla_host_t *, mbx_cmdq_t **);
++
++static void
++qla2x00_mbx_q_memb_free(scsi_qla_host_t *, mbx_cmdq_t *);
++
++/***************************/
++/* Function implementation */
++/***************************/
++
++static void
++qla2x00_mbx_sem_timeout(unsigned long data)
++{
++	struct semaphore	*sem_ptr = (struct semaphore *)data;
++
++	DEBUG11(printk("qla2x00_sem_timeout: entered.\n");)
++
++	if (sem_ptr != NULL) {
++		up(sem_ptr);
++	}
++
++	DEBUG11(printk("qla2x00_mbx_sem_timeout: exiting.\n");)
++}
++
++/*
++ *  tov = timeout value in seconds
++ */
++static uint8_t
++qla2x00_get_mbx_access(scsi_qla_host_t *ha, uint32_t tov)
++{
++	uint8_t		ret;
++	int		prev_val = 1;  /* assume no access yet */
++	mbx_cmdq_t	*ptmp_mbq;
++	struct timer_list	tmp_cmd_timer;
++	unsigned long	cpu_flags;
++
++
++	DEBUG11(printk("qla2x00_get_mbx_access(%ld): entered.\n",
++	    ha->host_no);)
++
++	while (1) {
++		if (test_bit(MBX_CMD_WANT, &ha->mbx_cmd_flags) == 0) {
++
++			DEBUG11(printk("qla2x00_get_mbx_access(%ld): going "
++			    " to test access flags.\n", ha->host_no);)
++
++			/* No one else is waiting. Go ahead and try to
++			 * get access.
++			 */
++			if ((prev_val = test_and_set_bit(MBX_CMD_ACTIVE,
++			    &ha->mbx_cmd_flags)) == 0) {
++				break;
++			}
++		}
++
++		/* wait for previous command to finish */
++		DEBUG(printk("qla2x00_get_mbx_access(%ld): access "
++		    "flags=%lx. busy. Waiting for access. curr time=0x%lx.\n",
++		    ha->host_no, ha->mbx_cmd_flags, jiffies);)
++
++		DEBUG11(printk("qla2x00_get_mbx_access(%ld): access "
++		    "flags=%lx. busy. Waiting for access. curr time=0x%lx.\n",
++		    ha->host_no, ha->mbx_cmd_flags, jiffies);)
++
++		/*
++		 * Init timer and get semaphore from mbx q. After we got valid
++		 * semaphore pointer the MBX_CMD_WANT flag would also had
++		 * been set.
++		 */
++		qla2x00_mbx_q_add(ha, &ptmp_mbq);
++
++		if (ptmp_mbq == NULL) {
++			/* queue full? problem? can't proceed. */
++			DEBUG2_3_11(printk("qla2x00_get_mbx_access(%ld): ERROR "
++			    "no more mbx_q allowed. exiting.\n", ha->host_no);)
++
++			break;
++		}
++
++		/* init timer and semaphore */
++		init_timer(&tmp_cmd_timer);
++		tmp_cmd_timer.data = (unsigned long)&ptmp_mbq->cmd_sem;
++		tmp_cmd_timer.function =
++		    (void (*)(unsigned long))qla2x00_mbx_sem_timeout;
++		tmp_cmd_timer.expires = jiffies + tov * HZ;
++
++		DEBUG11(printk("get_mbx_access(%ld): adding timer. "
++		    "curr time=0x%lx timeoutval=0x%lx.\n",
++		    ha->host_no, jiffies, tmp_cmd_timer.expires);)
++
++			/* wait. */
++/*	 	 add_timer(&tmp_cmd_timer);*/
++		DEBUG11(printk("get_mbx_access(%ld): going to sleep. "
++		    "current time=0x%lx.\n", ha->host_no, jiffies);)
++
++		down_interruptible(&ptmp_mbq->cmd_sem);
++
++		DEBUG11(printk("get_mbx_access(%ld): woke up. current "
++		    "time=0x%lx.\n",
++		    ha->host_no, jiffies);)
++
++/*		del_timer(&tmp_cmd_timer);*/
++
++		/* try to get lock again. we'll test later to see
++		 * if we actually got the lock.
++		 */
++		prev_val = test_and_set_bit(MBX_CMD_ACTIVE,
++		    &ha->mbx_cmd_flags);
++
++		/*
++		 * After we tried to get access then we check to see
++		 * if we need to clear the MBX_CMD_WANT flag. Don't clear
++		 * this flag before trying to get access or else another
++		 * new thread might grab it before we did.
++		 */
++		spin_lock_irqsave(&ha->mbx_q_lock, cpu_flags);
++		if (ha->mbx_q_head == NULL) {
++			/* We're the last thread in queue. */
++			clear_bit(MBX_CMD_WANT, &ha->mbx_cmd_flags);
++		}
++		qla2x00_mbx_q_memb_free(ha, ptmp_mbq);
++		spin_unlock_irqrestore(&ha->mbx_q_lock, cpu_flags);
++
++		break;
++	}
++
++	if (prev_val == 0) {
++		/* We got the lock */
++		DEBUG11(printk("qla2x00_get_mbx_access(%ld): success.\n",
++		    ha->host_no);)
++
++		ret = QL_STATUS_SUCCESS;
++	} else {
++		/* Timeout or resource error. */
++		DEBUG2_3_11(printk("qla2x00_get_mbx_access(%ld): timed out.\n",
++		    ha->host_no);)
++
++		ret = QL_STATUS_TIMEOUT;
++	}
++
++	return ret;
++}
++
++static uint8_t
++qla2x00_release_mbx_access(scsi_qla_host_t *ha, uint32_t tov)
++{
++	mbx_cmdq_t	*next_thread;
++
++	DEBUG11(printk("qla2x00_release_mbx_access:(%ld): entered.\n",
++	    ha->host_no);)
++
++	clear_bit(MBX_CMD_ACTIVE, &ha->mbx_cmd_flags);
++
++	/* Wake up one pending mailbox cmd thread in queue. */
++	qla2x00_mbx_q_get(ha, &next_thread);
++	if (next_thread) {
++		DEBUG11(printk("qla2x00_release_mbx_access: found pending "
++		    "mbx cmd. Waking up sem in %p.\n", &next_thread);)
++		up(&next_thread->cmd_sem);
++	}
++
++	DEBUG11(printk("qla2x00_release_mbx_access:(%ld): exiting.\n",
++	    ha->host_no);)
++
++	return QL_STATUS_SUCCESS;
++}
++
++/* Allocates a mbx_cmdq_t struct and add to the mbx_q list. */
++static uint8_t
++qla2x00_mbx_q_add(scsi_qla_host_t *ha, mbx_cmdq_t **ret_mbq)
++{
++	uint8_t		ret;
++	unsigned long	cpu_flags;
++	mbx_cmdq_t	*ptmp = NULL;
++
++	spin_lock_irqsave(&ha->mbx_q_lock, cpu_flags);
++
++	DEBUG11(printk("qla2x00_mbx_q_add: got mbx_q spinlock. "
++	    "Inst=%d.\n", apiHBAInstance);)
++
++	qla2x00_mbx_q_memb_alloc(ha, &ptmp);
++	if (ptmp == NULL) {
++		/* can't add any more threads */
++		DEBUG2_3_11(printk("qla2x00_mbx_q_add: ERROR no more "
++		    "ioctl threads allowed. Inst=%d.\n", apiHBAInstance);)
++
++		ret = QL_STATUS_RESOURCE_ERROR;
++	} else {
++		if (ha->mbx_q_tail == NULL) {
++			/* First thread to queue. */
++			set_bit(IOCTL_WANT, &ha->mbx_cmd_flags);
++
++			ha->mbx_q_head = ptmp;
++		} else {
++			ha->mbx_q_tail->pnext = ptmp;
++		}
++		ha->mbx_q_tail = ptmp;
++
++		/* Now init the semaphore */
++		init_MUTEX_LOCKED(&ptmp->cmd_sem);
++		ret = QL_STATUS_SUCCESS;
++	}
++
++	*ret_mbq = ptmp;
++
++	DEBUG11(printk("qla2x00_mbx_q_add: going to release spinlock. "
++	    "ret_mbq=%p, ret=%d. Inst=%d.\n", *ret_mbq, ret, apiHBAInstance);)
++
++	spin_unlock_irqrestore(&ha->mbx_q_lock, cpu_flags);
++
++	return ret;
++}
++
++/* Just remove and return first member from mbx_cmdq.  Don't free anything. */
++static void
++qla2x00_mbx_q_get(scsi_qla_host_t *ha, mbx_cmdq_t **ret_mbq)
++{
++	unsigned long	cpu_flags;
++
++	spin_lock_irqsave(&ha->mbx_q_lock, cpu_flags);
++
++	DEBUG11(printk("qla2x00_mbx_q_get: got mbx_q spinlock. "
++	    "Inst=%d.\n", apiHBAInstance);)
++
++	/* Remove from head */
++	*ret_mbq = ha->mbx_q_head;
++	if (ha->mbx_q_head != NULL) {
++		ha->mbx_q_head = ha->mbx_q_head->pnext;
++		if (ha->mbx_q_head == NULL) {
++			/* That's the last one in queue. */
++			ha->mbx_q_tail = NULL;
++		}
++		(*ret_mbq)->pnext = NULL;
++	}
++
++	DEBUG11(printk("qla2x00_mbx_q_remove: return ret_mbq=%p. Going to "
++	    "release spinlock. Inst=%d.\n", *ret_mbq, apiHBAInstance);)
++
++	spin_unlock_irqrestore(&ha->mbx_q_lock, cpu_flags);
++}
++
++/* Find a free mbx_q member from the array. Must already got the
++ * mbx_q_lock spinlock.
++ */
++static void
++qla2x00_mbx_q_memb_alloc(scsi_qla_host_t *ha, mbx_cmdq_t **ret_mbx_q_memb)
++{
++	mbx_cmdq_t	*ptmp = NULL;
++
++	DEBUG11(printk("qla2x00_mbx_q_memb_alloc: entered. "
++	    "Inst=%d.\n", apiHBAInstance);)
++
++	ptmp = ha->mbx_sem_pool_head;
++	if (ptmp != NULL) {
++		ha->mbx_sem_pool_head = ptmp->pnext;
++		ptmp->pnext = NULL;
++		if (ha->mbx_sem_pool_head == NULL) {
++			ha->mbx_sem_pool_tail = NULL;
++		}
++	} else {
++		/* We ran out of pre-allocated semaphores.  Try to allocate
++		 * a new one.
++		 */
++		ptmp = (void *)KMEM_ZALLOC(sizeof(mbx_cmdq_t), 40);
++	}
++
++	*ret_mbx_q_memb = ptmp;
++
++	DEBUG11(printk("qla2x00_mbx_q_memb_alloc: return waitq_memb=%p. "
++	    "Inst=%d.\n", *ret_mbx_q_memb, apiHBAInstance);)
++}
++
++/* Add the specified mbx_q member back to the free semaphore pool. Must
++ * already got the mbx_q_lock spinlock.
++ */
++static void
++qla2x00_mbx_q_memb_free(scsi_qla_host_t *ha, mbx_cmdq_t *pfree_mbx_q_memb)
++{
++	DEBUG11(printk("qla2x00_mbx_q_memb_free: entered. Inst=%d.\n",
++	    apiHBAInstance);)
++
++	if (pfree_mbx_q_memb != NULL) {
++		if (ha->mbx_sem_pool_tail != NULL) {
++			/* Add to tail */
++			ha->mbx_sem_pool_tail->pnext = pfree_mbx_q_memb;
++		} else {
++			ha->mbx_sem_pool_head = pfree_mbx_q_memb;
++		}
++		ha->mbx_sem_pool_tail = pfree_mbx_q_memb;
++	}
++
++	/* put it back to the free pool. */
++
++	DEBUG11(printk("qla2x00_mbx_q_memb_free: exiting. "
++	    "Inst=%d.\n", apiHBAInstance);)
++}
++
++/*
++ * qla2x00_mailbox_command
++ *	Issue mailbox command and waits for completion.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	mcp = driver internal mbx struct pointer.
++ *
++ * Output:
++ *	mb[MAX_MAILBOX_REGISTER_COUNT] = returned mailbox data.
++ *
++ * Returns:
++ *	0 : QL_STATUS_SUCCESS = cmd performed success
++ *	1 : QL_STATUS_ERROR   (error encountered)
++ *	6 : QL_STATUS_TIMEOUT (timeout condition encountered)
++ *
++ * Context:
++ *	Kernel context.
++ */
++uint8_t
++qla2x00_mailbox_command(scsi_qla_host_t *ha, mbx_cmd_t *mcp)
++{
++	unsigned long    flags = 0;
++	device_reg_t     *reg       = ha->iobase;
++	struct timer_list	tmp_intr_timer;
++	uint8_t		abort_active = test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags);
++	uint8_t		io_lock_on = ha->init_done;
++	uint8_t		mbx_count;
++	uint8_t		status = 0;
++	uint8_t		tmp_stat = 0;
++	uint16_t	command;
++	uint16_t	*iptr, *optr;
++	uint32_t	cnt;
++	uint32_t	mboxes;
++	unsigned long	mbx_flags = 0;
++	unsigned long	wait_time;
++
++	DEBUG11(printk("qla2x00_mailbox_command(%ld): entered.\n",
++	    ha->host_no);)
++	/*
++	 * Wait for active mailbox commands to finish by waiting at most
++	 * tov seconds. This is to serialize actual issuing of mailbox cmds
++	 * during non ISP abort time.
++	 */
++	if (!abort_active) {
++		tmp_stat = qla2x00_get_mbx_access(ha, mcp->tov);
++		if (tmp_stat != QL_STATUS_SUCCESS) {
++			/* Timeout occurred. Return error. */
++			DEBUG2_3_11(printk("qla2x00_mailbox_command(%ld): cmd "
++			    "access timeout. Exiting.\n", ha->host_no);)
++			return QL_STATUS_TIMEOUT;
++		}
++	}
++
++	ha->flags.mbox_busy = TRUE;
++	/* Save mailbox command for debug */
++	ha->mcp = mcp;
++
++	/* Try to get mailbox register access */
++	if (!abort_active)
++		QLA_MBX_REG_LOCK(ha);
++
++	DEBUG11(printk("scsi%d: prepare to issue mbox cmd=0x%x.\n",
++	    (int)ha->host_no, mcp->mb[0]);)
++
++	ha->mbox_trace = 0;
++
++	spin_lock_irqsave(&ha->hardware_lock, flags);
++
++	/* Load mailbox registers. */
++	optr = (uint16_t *)&reg->mailbox0;
++	mbx_count = MAILBOX_REGISTER_COUNT;
++
++	iptr = mcp->mb;
++	command = mcp->mb[0];
++	mboxes = mcp->out_mb;
++
++	for (cnt = 0; cnt < mbx_count; cnt++) {
++#if defined(ISP2200)
++		if (cnt == 8) {
++			optr = (uint16_t *)&reg->mailbox8;
++		}
++#endif
++		if (mboxes & BIT_0) {
++			WRT_REG_WORD(optr, *iptr);
++		}
++
++		mboxes >>= 1;
++		optr++;
++		iptr++;
++	}
++
++#if defined(QL_DEBUG_LEVEL_1)
++	printk("qla2x00_mailbox_command: Loaded MBX registers "
++	    "(displayed in bytes) = \n");
++	qla2x00_dump_buffer((uint8_t *)mcp->mb, 16);
++	printk("\n");
++	qla2x00_dump_buffer(((uint8_t *)mcp->mb + 0x10), 16);
++	printk("\n");
++	qla2x00_dump_buffer(((uint8_t *)mcp->mb + 0x20), 8);
++	printk("\n");
++	printk("qla2x00_mailbox_command: I/O address = %lx.\n",
++	    (u_long)optr);
++	qla2x00_dump_regs(ha->host);
++#endif
++
++	/* Issue set host interrupt command to send cmd out. */
++	ha->flags.mbox_int = FALSE;
++	clear_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
++
++	/* Unlock mbx registers and wait for interrupt */
++
++	DEBUG11(printk("qla2x00_mailbox_command: going to unlock irq & "
++	    "waiting for interrupt. jiffies=%lx.\n", jiffies);)
++
++	/* Wait for mbx cmd completion until timeout */
++
++	if (!abort_active && io_lock_on) {
++		/* sleep on completion semaphore */
++		DEBUG11(printk("qla2x00_mailbox_command(%ld): "
++		    "INTERRUPT MODE. Initializing timer.\n",
++		    ha->host_no);)
++
++		init_timer(&tmp_intr_timer);
++		tmp_intr_timer.data = (unsigned long)&ha->mbx_intr_sem;
++		tmp_intr_timer.expires = jiffies + mcp->tov * HZ;
++		tmp_intr_timer.function =
++		    (void (*)(unsigned long))qla2x00_mbx_sem_timeout;
++
++		DEBUG11(printk("qla2x00_mailbox_command(%ld): "
++		    "Adding timer.\n", ha->host_no);)
++		add_timer(&tmp_intr_timer);
++
++		DEBUG11(printk("qla2x00_mailbox_command: going to "
++		    "unlock & sleep. time=0x%lx.\n", jiffies);)
++
++		MBOX_TRACE(ha,BIT_0);
++		set_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags);
++
++		WRT_REG_WORD(&reg->hccr, HCCR_SET_HOST_INT);
++		spin_unlock_irqrestore(&ha->hardware_lock, flags);
++
++		if (!abort_active)
++			QLA_MBX_REG_UNLOCK(ha);
++
++		MBOX_TRACE(ha,BIT_1);
++
++		/* Wait for either the timer to expire
++		 * or the mbox completion interrupt
++		 */
++		down_interruptible(&ha->mbx_intr_sem);
++
++		DEBUG11(printk("qla2x00_mailbox_command:"
++		    "waking up."
++		    "time=0x%lx\n", jiffies);)
++		clear_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags);
++
++		/* delete the timer */
++		del_timer(&tmp_intr_timer);
++#if QLA2100_LIPTEST
++		if (mbxtimeout) {
++			DEBUG(printk("qla2x00_mailbox_command(%ld): "
++			    "INTERRUPT MODE - testing timeout handling.\n",
++			    ha->host_no);)
++			ha->flags.mbox_int= FALSE;
++		}
++		mbxtimeout= 0;
++#endif
++
++	} else {
++
++		DEBUG3_11(printk("qla2x00_mailbox_command(%ld): cmd=%x "
++			"POLLING MODE.\n", ha->host_no, command);)
++
++		WRT_REG_WORD(&reg->hccr, HCCR_SET_HOST_INT);
++		spin_unlock_irqrestore(&ha->hardware_lock, flags);
++		if (!abort_active)
++			QLA_MBX_REG_UNLOCK(ha);
++
++
++		wait_time = jiffies + mcp->tov * HZ; /* wait at most tov secs */
++		while (!ha->flags.mbox_int) {
++			if (time_after(jiffies, wait_time))
++				break;
++
++			/* Check for pending interrupts. */
++			qla2x00_poll(ha);
++
++			udelay(10); /* v4.27 */
++		} /* while */
++	}
++
++	if (!abort_active)
++		QLA_MBX_REG_LOCK(ha);
++
++	/* Check whether we timed out */
++	if (ha->flags.mbox_int) {
++
++		DEBUG3_11(printk("qla2x00_mailbox_cmd: cmd %x completed.\n",
++		    command);)
++
++		/* Got interrupt. Clear the flag. */
++		ha->flags.mbox_int = FALSE;
++		clear_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);
++
++		if( ha->mailbox_out[0] != MBS_CMD_CMP ) {
++			qla2x00_stats.mboxerr++;
++			status = QL_STATUS_ERROR;
++		}
++
++		/* Load return mailbox registers. */
++		optr = mcp->mb;
++		iptr = (uint16_t *)&ha->mailbox_out[0];
++		mboxes = mcp->in_mb;
++		for (cnt = 0; cnt < mbx_count; cnt++) {
++
++			if (mboxes & BIT_0)
++				*optr = *iptr;
++
++			mboxes >>= 1;
++			optr++;
++			iptr++;
++		}
++	} else {
++
++#if defined(QL_DEBUG_LEVEL_2) || defined(QL_DEBUG_LEVEL_3) || \
++		defined(QL_DEBUG_LEVEL_11)
++		printk("qla2x00_mailbox_command(%ld): **** MB Command Timeout "
++		    "for cmd %x ****\n", ha->host_no, command);
++		printk("qla2x00_mailbox_command: icontrol=%x jiffies=%lx\n",
++		    RD_REG_WORD(&reg->ictrl), jiffies);
++		printk("qla2x00_mailbox_command: *** mailbox[0] = 0x%x ***\n",
++		    RD_REG_WORD(optr));
++		qla2x00_dump_regs(ha->host);
++#endif
++
++		qla2x00_stats.mboxtout++;
++		status = QL_STATUS_TIMEOUT;
++	}
++
++	if (!abort_active)
++		QLA_MBX_REG_UNLOCK(ha);
++
++	ha->flags.mbox_busy = FALSE;
++
++	/* Clean up */
++	ha->mcp = NULL;
++
++	if (!abort_active) {
++		DEBUG11(printk("qla2x00_mailbox_cmd: checking for additional "
++		    "resp interrupt.\n");)
++
++		/* polling mode for non isp_abort commands. */
++		qla2x00_poll(ha);
++	}
++
++	if (status == QL_STATUS_TIMEOUT ) {
++		if (!io_lock_on || (mcp->flags & IOCTL_CMD)) {
++			/* not in dpc. schedule it for dpc to take over. */
++			DEBUG(printk("qla2x00_mailbox_command(%ld): timeout "
++			    "schedule isp_abort_needed.\n",
++			    ha->host_no);)
++			DEBUG2_3_11(printk("qla2x00_mailbox_command(%ld): "
++			    "timeout schedule isp_abort_needed.\n",
++			    ha->host_no);)
++			set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
++			if (ha->dpc_wait && !ha->dpc_active) 
++				up(ha->dpc_wait);
++
++		} else if (!abort_active) {
++
++			/* call abort directly since we are in the DPC thread */
++			DEBUG(printk("qla2x00_mailbox_command(%ld): timeout "
++			    "calling abort_isp\n", ha->host_no);)
++			DEBUG2_3_11(printk("qla2x00_mailbox_command(%ld): "
++			    "timeout calling abort_isp\n", ha->host_no);)
++
++			set_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags);
++			clear_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
++			if (qla2x00_abort_isp(ha, 0)) {
++				/* failed. retry later. */
++				set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
++			}
++			clear_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags);
++
++			DEBUG(printk("qla2x00_mailbox_command: finished "
++			    "abort_isp\n");)
++			DEBUG2_3_11(printk("qla2x00_mailbox_command: finished "
++			    "abort_isp\n");)
++		}
++	}
++
++	/* Allow next mbx cmd to come in. */
++	if (!abort_active) {
++		tmp_stat = qla2x00_release_mbx_access(ha, mcp->tov);
++
++		if (status == 0)
++			status = tmp_stat;
++	}
++
++	if (status) {
++		DEBUG2_3_11(printk("qla2x00_mailbox_command(%ld): **** FAILED. "
++		    "mbx0=%x, mbx1=%x, mbx2=%x, cmd=%x ****\n",
++		ha->host_no, mcp->mb[0], mcp->mb[1], mcp->mb[2], command);)
++	} else {
++		DEBUG11(printk("qla2x00_mailbox_command(%ld): done.\n",
++		    ha->host_no);)
++	}
++
++	DEBUG11(printk("qla2x00_mailbox_command(%ld): exiting.\n",
++	    ha->host_no);)
++
++	return status;
++}
++
++/*
++ * qla2x00_load_ram
++ *	Load adapter RAM using DMA.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_load_ram(scsi_qla_host_t *ha, dma_addr_t req_dma,
++		uint16_t risc_addr, uint16_t risc_code_size)
++{
++	int rval;
++	mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++	uint32_t	req_len;
++	dma_addr_t	nml_dma;
++	uint32_t	nml_len;
++	uint32_t	normalized;
++
++	DEBUG11(printk("qla2x00_load_ram(%ld): entered.\n",
++	    ha->host_no);)
++
++	req_len = risc_code_size;
++	nml_dma = 0;
++	nml_len = 0;
++
++	normalized = qla2x00_normalize_dma_addr(
++			&req_dma, &req_len,
++			&nml_dma, &nml_len);
++
++	/* Load first segment */
++	mcp->mb[0] = MBC_LOAD_RAM_A64;
++	mcp->mb[1] = risc_addr;
++	mcp->mb[2] = MSW(req_dma);
++	mcp->mb[3] = LSW(req_dma);
++	mcp->mb[4] = (uint16_t)req_len;
++	mcp->mb[6] = MSW(MSD(req_dma));
++	mcp->mb[7] = LSW(MSD(req_dma));
++
++	mcp->out_mb = MBX_7|MBX_6|MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;
++	mcp->in_mb = MBX_0;
++	mcp->tov = 30;
++	mcp->flags = 0;
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	/* Load second segment - if necessary */
++	if (normalized && (rval == QL_STATUS_SUCCESS)) {
++		mcp->mb[0] = MBC_LOAD_RAM_A64;
++		mcp->mb[1] = risc_addr + (uint16_t)req_len;
++		mcp->mb[2] = MSW(nml_dma);
++		mcp->mb[3] = LSW(nml_dma);
++		mcp->mb[4] = (uint16_t)nml_len;
++		mcp->mb[6] = MSW(MSD(nml_dma));
++		mcp->mb[7] = LSW(MSD(nml_dma));
++
++		mcp->out_mb = MBX_7|MBX_6|MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;
++		mcp->in_mb = MBX_0;
++		mcp->tov = 30;
++		mcp->flags = 0;
++		rval = (int)qla2x00_mailbox_command(ha, mcp);
++	}
++
++	if (rval == QL_STATUS_SUCCESS) {
++		/* Empty */
++		DEBUG11(printk("qla2x00_load_ram(%ld): done.\n",
++		    ha->host_no);)
++	} else {
++		/* Empty */
++		DEBUG2_3_11(printk("qla2x00_load_ram(%ld): failed. rval=%x "
++		    "mb[0]=%x.\n",
++		    ha->host_no, rval, mcp->mb[0]);)
++	}
++	return rval;
++}
++
++/*
++ * qla2x00_load_ram_ext
++ *	Load adapter extended RAM using DMA.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_load_ram_ext(scsi_qla_host_t *ha,
++    dma_addr_t req_dma, uint32_t risc_addr, uint16_t risc_code_size)
++{
++	int rval;
++	mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++	uint32_t	req_len;
++	dma_addr_t	nml_dma;
++	uint32_t	nml_len;
++	uint32_t	normalized;
++
++	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha->host_no));
++
++	req_len = risc_code_size;
++	nml_dma = 0;
++	nml_len = 0;
++
++	normalized = qla2x00_normalize_dma_addr(
++			&req_dma, &req_len,
++			&nml_dma, &nml_len);
++
++	/* Load first segment */
++	mcp->mb[0] = MBC_LOAD_RAM_EXTENDED;
++	mcp->mb[1] = LSW(risc_addr);
++	mcp->mb[2] = MSW(req_dma);
++	mcp->mb[3] = LSW(req_dma);
++	mcp->mb[4] = (uint16_t)req_len;
++	mcp->mb[6] = MSW(MSD(req_dma));
++	mcp->mb[7] = LSW(MSD(req_dma));
++	mcp->mb[8] = MSW(risc_addr);
++
++	mcp->out_mb = MBX_8|MBX_7|MBX_6|MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;
++	mcp->in_mb = MBX_0;
++	mcp->tov = 30;
++	mcp->flags = 0;
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	/* Load second segment - if necessary */
++	if (normalized && (rval == QL_STATUS_SUCCESS)) {
++		risc_addr += req_len;
++		mcp->mb[0] = MBC_LOAD_RAM_EXTENDED;
++		mcp->mb[1] = LSW(risc_addr);
++		mcp->mb[2] = MSW(nml_dma);
++		mcp->mb[3] = LSW(nml_dma);
++		mcp->mb[4] = (uint16_t)nml_len;
++		mcp->mb[6] = MSW(MSD(nml_dma));
++		mcp->mb[7] = LSW(MSD(nml_dma));
++		mcp->mb[8] = MSW(risc_addr);
++
++		mcp->out_mb = MBX_8|MBX_7|MBX_6|MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;
++		mcp->in_mb = MBX_0;
++		mcp->tov = 30;
++		mcp->flags = 0;
++		rval = (int)qla2x00_mailbox_command(ha, mcp);
++	}
++
++	if (rval != QL_STATUS_SUCCESS) {
++		/*EMPTY*/
++		DEBUG2_3_11(printk("%s(%ld): failed=%x mb[0]=%x.\n",
++		    __func__, ha->host_no, rval, mcp->mb[0]));
++	} else {
++		/*EMPTY*/
++		DEBUG11(printk("%s(%ld): done.\n", __func__, ha->host_no));
++	}
++
++	return rval;
++}
++
++/*
++ * qla2x00_execute_fw
++ *	Start adapter firmware.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	TARGET_QUEUE_LOCK must be released.
++ *	ADAPTER_STATE_LOCK must be released.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_execute_fw(scsi_qla_host_t *ha)
++{
++	int rval;
++	mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++
++	DEBUG11(printk("qla2x00_execute_fw(%ld): entered.\n",
++	    ha->host_no);)
++
++	mcp->mb[0] = MBC_EXECUTE_FIRMWARE;
++	mcp->mb[1] = *ha->brd_info->fwinfo[0].fwstart;
++	mcp->out_mb = MBX_1|MBX_0;
++	if (ha->pdev->device == QLA2322_DEVICE_ID) {
++		mcp->mb[2] = 0;
++		mcp->out_mb |= MBX_2;
++	}
++	mcp->in_mb = MBX_0;
++	mcp->tov = 30;
++	mcp->flags = 0;
++	rval = qla2x00_mailbox_command(ha, mcp);
++
++	DEBUG11(printk("qla2x00_execute_fw(%ld): done.\n",
++	    ha->host_no);)
++
++	return rval;
++}
++
++/*
++ * qla2x00_get_fw_version
++ *	Get firmware version.
++ *
++ * Input:
++ *	ha:		adapter state pointer.
++ *	major:		pointer for major number.
++ *	minor:		pointer for minor number.
++ *	subminor:	pointer for subminor number.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++void
++qla2x00_get_fw_version(scsi_qla_host_t *ha, uint16_t *major,
++    uint16_t *minor, uint16_t *subminor, uint16_t *attributes)
++{
++	int		rval;
++	mbx_cmd_t	mc;
++	mbx_cmd_t	*mcp = &mc;
++
++	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha->host_no));
++
++	mcp->mb[0] = MBC_ABOUT_FIRMWARE;
++	mcp->out_mb = MBX_0;
++	mcp->in_mb = MBX_6|MBX_3|MBX_2|MBX_1|MBX_0;
++	mcp->flags = 0;
++	mcp->tov = 30;
++	rval = qla2x00_mailbox_command(ha, mcp);
++
++	/* Return mailbox data. */
++	*major = mcp->mb[1];
++	*minor = mcp->mb[2];
++	*subminor = mcp->mb[3];
++	*attributes = mcp->mb[6];
++
++	if (rval != QL_STATUS_SUCCESS) {
++		/*EMPTY*/
++		DEBUG2_3_11(printk("%s(%ld): failed=%x.\n",
++		    __func__, ha->host_no, rval));
++	} else {
++		/*EMPTY*/
++		DEBUG11(printk("%s(%ld): done.\n", __func__, ha->host_no));
++	}
++}
++
++/*
++ * qla2x00_get_fw_options
++ *	Set firmware options.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	fwopt = pointer for firmware options.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_get_fw_options(scsi_qla_host_t *ha,
++    uint16_t *fwopts1, uint16_t *fwopts2, uint16_t *fwopts3)
++{
++	int rval;
++	mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++
++	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha->host_no));
++
++	mcp->mb[0] = MBC_GET_FIRMWARE_OPTIONS;
++	mcp->out_mb = MBX_0;
++	mcp->in_mb = MBX_3|MBX_2|MBX_1|MBX_0;
++	mcp->tov = 30;
++	mcp->flags = 0;
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	if (rval != QL_STATUS_SUCCESS) {
++		/*EMPTY*/
++		DEBUG2_3_11(printk("%s(%ld): failed=%x.\n",
++		    __func__, ha->host_no, rval));
++	} else {
++		*fwopts1 = mcp->mb[1];
++		*fwopts2 = mcp->mb[2];
++		*fwopts3 = mcp->mb[3];
++
++		DEBUG11(printk("%s(%ld): done.\n", __func__, ha->host_no));
++	}
++
++	return rval;
++}
++
++
++/*
++ * qla2x00_set_fw_options
++ *	Set firmware options.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	fwopt = pointer for firmware options.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_set_fw_options(scsi_qla_host_t *ha,
++    uint16_t fwopts1, uint16_t fwopts2, uint16_t fwopts3, 
++    uint16_t fwopts10, uint16_t fwopts11)
++{
++	int rval;
++	mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++
++	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha->host_no));
++
++	mcp->mb[0] = MBC_SET_FIRMWARE_OPTIONS;
++	mcp->mb[1] = fwopts1;
++	mcp->mb[2] = fwopts2;
++	mcp->mb[3] = fwopts3;
++	mcp->mb[10] = fwopts10;
++	mcp->mb[11] = fwopts11;
++	mcp->mb[12] = 0;	/* Undocumented, but used */
++	mcp->out_mb = MBX_12|MBX_11|MBX_10|MBX_3|MBX_2|MBX_1|MBX_0;
++	mcp->in_mb = MBX_0;
++	mcp->tov = 30;
++	mcp->flags = 0;
++
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	if (rval != QL_STATUS_SUCCESS) {
++		/*EMPTY*/
++		DEBUG2_3_11(printk("%s(%ld): failed=%x.\n",
++		    __func__, ha->host_no, rval));
++	} else {
++		/*EMPTY*/
++		DEBUG11(printk("%s(%ld): done.\n", __func__, ha->host_no));
++	}
++
++	return rval;
++}
++
++/*
++ * qla2x00_read_ram_word
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_read_ram_word(scsi_qla_host_t *ha, uint16_t addr, uint16_t *data)
++{
++	int rval;
++	mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++
++	DEBUG11(printk("qla2x00_read_ram_word(%ld): entered.\n",
++	    ha->host_no);)
++
++	mcp->mb[0] = MBC_READ_RAM_WORD;
++	mcp->mb[1] = addr;
++
++	mcp->out_mb = MBX_1|MBX_0;
++	mcp->in_mb = MBX_0|MBX_2;
++	mcp->tov = 30;
++	mcp->flags = 0;
++
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	if (rval != QL_STATUS_SUCCESS) {
++		/*EMPTY*/
++		DEBUG2_3_11(printk("qla2x00_read_ram_word(%ld): failed=%x.\n",
++		    ha->host_no, rval);)
++	} else {
++		*data = mcp->mb[2];
++		DEBUG11(printk("qla2x00_read_ram_word(%ld): done.\n",
++		    ha->host_no);)
++	}
++
++	return rval;
++}
++
++/*
++ * qla2x00_write_ram_word
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_write_ram_word(scsi_qla_host_t *ha, uint16_t addr, uint16_t data)
++{
++	int rval;
++	mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++
++	DEBUG11(printk("qla2x00_write_ram_word(%ld): entered.\n",
++	    ha->host_no);)
++
++	mcp->mb[0] = MBC_WRITE_RAM_WORD;
++	mcp->mb[1] = addr;
++	mcp->mb[2] = data;
++	mcp->out_mb = MBX_2|MBX_1|MBX_0;
++	mcp->in_mb = MBX_0;
++	mcp->tov = 30;
++	mcp->flags = 0;
++
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	if (rval != QL_STATUS_SUCCESS) {
++		/*EMPTY*/
++		DEBUG2_3_11(printk("qla2x00_write_ram_word(%ld): failed=%x.\n",
++		    ha->host_no, rval);)
++	} else {
++		/*EMPTY*/
++		DEBUG11(printk("qla2x00_write_ram_word(%ld): done.\n",
++		    ha->host_no);)
++	}
++
++	return rval;
++}
++
++/*
++ * qla2x00_write_ram_word_ext
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_write_ram_word_ext(scsi_qla_host_t *ha, uint32_t addr, uint16_t data)
++{
++	int rval;
++	mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++
++	DEBUG11(printk("%s(%ld): entered.\n", __func__, ha->host_no));
++
++	mcp->mb[0] = MBC_WRITE_RAM_WORD_EXTENDED;
++	mcp->mb[1] = LSW(addr);
++	mcp->mb[2] = data;
++	mcp->mb[8] = MSW(addr);
++	mcp->out_mb = MBX_8|MBX_2|MBX_1|MBX_0;
++	mcp->in_mb = MBX_0;
++	mcp->tov = 30;
++	mcp->flags = 0;
++
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	if (rval != QL_STATUS_SUCCESS) {
++		/*EMPTY*/
++		DEBUG2_3_11(printk("%s(%ld): failed=%x.\n",
++		    __func__, ha->host_no, rval));
++	} else {
++		/*EMPTY*/
++		DEBUG11(printk("%s(%ld): done.\n", __func__, ha->host_no));
++	}
++
++	return rval;
++}
++
++/*
++ * qla2x00_mbx_reg_test
++ *	Mailbox register wrap test.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	TARGET_QUEUE_LOCK must be released.
++ *	ADAPTER_STATE_LOCK must be released.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_mbx_reg_test(scsi_qla_host_t *ha)
++{
++	int rval;
++	mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++
++	DEBUG11(printk("qla2x00_mbx_reg_test(%ld): entered.\n",
++	    ha->host_no);)
++
++	mcp->mb[0] = MBC_MAILBOX_REGISTER_TEST;
++	mcp->mb[1] = 0xAAAA;
++	mcp->mb[2] = 0x5555;
++	mcp->mb[3] = 0xAA55;
++	mcp->mb[4] = 0x55AA;
++	mcp->mb[5] = 0xA5A5;
++	mcp->mb[6] = 0x5A5A;
++	mcp->mb[7] = 0x2525;
++	mcp->out_mb = MBX_7|MBX_6|MBX_5|MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;
++	mcp->in_mb = MBX_7|MBX_6|MBX_5|MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;
++	mcp->tov = 30;
++	mcp->flags = 0;
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	if (rval == QL_STATUS_SUCCESS) {
++		if (mcp->mb[1] != 0xAAAA || mcp->mb[2] != 0x5555 ||
++		    mcp->mb[3] != 0xAA55 || mcp->mb[4] != 0x55AA)
++			rval = QL_STATUS_ERROR;
++		if (mcp->mb[5] != 0xA5A5 || mcp->mb[6] != 0x5A5A ||
++		    mcp->mb[7] != 0x2525)
++			rval = QL_STATUS_ERROR;
++	}
++
++	if (rval != QL_STATUS_SUCCESS) {
++		/*EMPTY*/
++		DEBUG2_3_11(printk("qla2x00_mbx_reg_test(%ld): failed=%x.\n",
++		    ha->host_no, rval);)
++	} else {
++		/*EMPTY*/
++		DEBUG11(printk("qla2x00_mbx_reg_test(%ld): done.\n",
++		    ha->host_no);)
++	}
++
++	return rval;
++}
++
++/*
++ * qla2x00_verify_checksum
++ *	Verify firmware checksum.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	TARGET_QUEUE_LOCK must be released.
++ *	ADAPTER_STATE_LOCK must be released.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_verify_checksum(scsi_qla_host_t *ha)
++{
++	int rval;
++	mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++
++	DEBUG11(printk("qla2x00_verify_checksum(%ld): entered.\n",
++	    ha->host_no);)
++
++	mcp->mb[0] = MBC_VERIFY_CHECKSUM;
++	mcp->mb[1] = *ha->brd_info->fwinfo[0].fwstart;
++	mcp->out_mb = MBX_1|MBX_0;
++	mcp->in_mb = MBX_2|MBX_0;
++	mcp->tov = 30;
++	mcp->flags = 0;
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	if (rval != QL_STATUS_SUCCESS) {
++		/*EMPTY*/
++		DEBUG2_3_11(printk("qla2x00_verify_checksum(%ld): failed=%x.\n",
++		    ha->host_no, rval);)
++	} else {
++		/*EMPTY*/
++		DEBUG11(printk("qla2x00_verify_checksum(%ld): done.\n",
++		    ha->host_no);)
++	}
++
++	return rval;
++}
++
++/*
++ * qla2x00_issue_iocb
++ *	Issue IOCB using mailbox command
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	buffer = buffer pointer.
++ *	phys_addr = physical address of buffer.
++ *	size = size of buffer.
++ *	TARGET_QUEUE_LOCK must be released.
++ *	ADAPTER_STATE_LOCK must be released.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_issue_iocb(scsi_qla_host_t *ha, void*  buffer, dma_addr_t phys_addr,
++    size_t size)
++{
++	int		rval;
++	mbx_cmd_t	mc;
++	mbx_cmd_t	*mcp = &mc;
++
++	ENTER("qla2x00_issue_iocb: started");
++
++	mcp->mb[0] = MBC_IOCB_EXECUTE_A64;
++	mcp->mb[1] = 0;
++	mcp->mb[2] = MSW(phys_addr);
++	mcp->mb[3] = LSW(phys_addr);
++	mcp->mb[6] = MSW(MSD(phys_addr));
++	mcp->mb[7] = LSW(MSD(phys_addr));
++	mcp->out_mb = MBX_7|MBX_6|MBX_3|MBX_2|MBX_1|MBX_0;
++	mcp->in_mb = MBX_2|MBX_0;
++	mcp->tov = 30;
++	mcp->flags = 0;
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	if (rval != QLA2X00_SUCCESS) {
++		/*EMPTY*/
++		DEBUG(printk("qla2x00_issue_iocb(%ld): failed rval 0x%x",
++		    ha->host_no,rval);)
++		DEBUG2(printk("qla2x00_issue_iocb(%ld): failed rval 0x%x",
++		    ha->host_no,rval);)
++	} else {
++		/*EMPTY*/
++		LEAVE("qla2x00_issue_iocb: exiting normally");
++	}
++
++	return rval;
++}
++
++/*
++ * qla2x00_abort_command
++ *	Abort command aborts a specified IOCB.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	sp = SB structure pointer.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_abort_command(scsi_qla_host_t *ha, srb_t *sp)
++{
++	unsigned long   flags = 0;
++	scsi_qla_host_t	*curr_ha;
++	fc_port_t	*fcport;
++	int		rval;
++	uint32_t	handle;
++	uint16_t	t;
++	mbx_cmd_t	mc;
++	mbx_cmd_t	*mcp = &mc;
++	os_lun_t	*lq = sp->lun_queue;
++
++	DEBUG11(printk("qla2x00_abort_command(%ld): entered.\n",
++	    ha->host_no);)
++
++	curr_ha = lq->fclun->fcport->ha;
++	t = SCSI_TCN_32(sp->cmd);
++	fcport = lq->fclun->fcport;
++	if (curr_ha->loop_state == LOOP_DOWN ||
++		atomic_read(&fcport->state) == FC_DEVICE_LOST) {
++		/* v2.19.8 Ignore abort request if port is down */
++		return 1;
++	}
++
++	spin_lock_irqsave(&ha->hardware_lock, flags);
++	for (handle = 1; handle < MAX_OUTSTANDING_COMMANDS; handle++) {
++		if( ha->outstanding_cmds[handle] == sp )
++			break;
++	}
++	spin_unlock_irqrestore(&ha->hardware_lock, flags);
++
++	if (handle == MAX_OUTSTANDING_COMMANDS) {
++		/* command not found */
++		return QL_STATUS_ERROR;
++	}
++
++	mcp->mb[0] = MBC_ABORT_COMMAND;
++#if defined(EXTENDED_IDS)
++	mcp->mb[1] = fcport->loop_id & 0xFF;
++#else
++	mcp->mb[1] = fcport->loop_id << 8;
++#endif
++	mcp->mb[2] = (uint16_t)handle;
++	mcp->mb[3] = (uint16_t)(handle >> 16);
++	mcp->mb[6] = (uint16_t)lq->fclun->lun;
++	mcp->out_mb = MBX_6|MBX_3|MBX_2|MBX_1|MBX_0;
++	mcp->in_mb = MBX_0;
++	mcp->tov = 30;
++	mcp->flags = 0;
++
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	if (rval != QL_STATUS_SUCCESS) {
++		DEBUG2_3_11(printk("qla2x00_abort_command(%ld): failed=%x.\n",
++		    ha->host_no, rval);)
++	} else {
++		sp->flags |= SRB_ABORT_PENDING;
++		DEBUG11(printk("qla2x00_abort_command(%ld): done.\n",
++		    ha->host_no);)
++	}
++
++	return rval;
++}
++
++/*
++ * qla2x00_abort_device
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *      loop_id  = FC loop ID
++ *      lun  = SCSI LUN.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_abort_device(scsi_qla_host_t *ha, uint16_t loop_id, uint16_t lun)
++{
++	int rval;
++	mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++
++	DEBUG11(printk("qla2x00_abort_device(%ld): entered.\n",
++			ha->host_no);)
++
++	mcp->mb[0] = MBC_ABORT_DEVICE;
++#if defined(EXTENDED_IDS)
++	mcp->mb[1] = loop_id & 0xFF;
++#else
++	mcp->mb[1] = loop_id << 8;
++#endif
++	mcp->mb[2] = lun;
++	mcp->out_mb = MBX_2|MBX_1|MBX_0;
++	mcp->in_mb = MBX_0;
++	mcp->tov = 30;
++	mcp->flags = 0;
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	/* Issue marker command. */
++	qla2x00_marker(ha, loop_id, lun, MK_SYNC_ID_LUN);
++
++	if (rval != QL_STATUS_SUCCESS) {
++		set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
++		if (ha->dpc_wait && !ha->dpc_active) 
++			up(ha->dpc_wait);
++		DEBUG2_3_11(printk("qla2x00_abort_device(%ld): failed=%x.\n",
++		    ha->host_no, rval);)
++	} else {
++		/*EMPTY*/
++		DEBUG11(printk("qla2x00_abort_device(%ld): done.\n",
++		    ha->host_no);)
++	}
++
++	return rval;
++}
++
++#if USE_ABORT_TGT
++/*
++ * qla2x00_abort_target
++ *	Issue abort target mailbox command.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	b = Always 0.
++ *	t = SCSI ID.
++ *	TARGET_QUEUE_LOCK must be released.
++ *	ADAPTER_STATE_LOCK must be released.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_abort_target(fc_port_t *fcport)
++{
++	int        rval;
++	uint16_t   loop_id;
++	mbx_cmd_t  mc;
++	mbx_cmd_t  *mcp = &mc;
++
++	DEBUG11(printk("qla2x00_abort_target(%ld): entered.\n",
++	    fcport->ha->host_no);)
++
++	if (fcport == NULL) {
++		/* no target to abort */
++		return 0;
++	}
++
++	loop_id = fcport->loop_id;
++
++	mcp->mb[0] = MBC_ABORT_TARGET;
++#if defined(EXTENDED_IDS)
++	mcp->mb[1] = loop_id & 0xFF;
++#else
++	mcp->mb[1] = loop_id << 8;
++#endif
++	mcp->mb[2] = fcport->ha->loop_reset_delay;
++	mcp->out_mb = MBX_2|MBX_1|MBX_0;
++#if defined(EXTENDED_IDS)
++	mcp->mb[10] = 0;
++	mcp->out_mb |= MBX_10;
++#endif
++	mcp->in_mb = MBX_0;
++	mcp->tov = 30;
++	mcp->flags = 0;
++	rval = (int)qla2x00_mailbox_command(fcport->ha, mcp);
++
++	/* Issue marker command. */
++/*	qla2x00_marker(fcport->ha, loop_id, 0, MK_SYNC_ID);*/
++	fcport->ha->marker_needed = 1;
++
++	if (rval != QL_STATUS_SUCCESS) {
++/*		set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
++		if (ha->dpc_wait && !ha->dpc_active) 
++			up(ha->dpc_wait); */
++		DEBUG2_3_11(printk("qla2x00_abort_target(%ld): failed=%x.\n",
++		    fcport->ha->host_no, rval);)
++	} else {
++		/*EMPTY*/
++		DEBUG11(printk("qla2x00_abort_target(%ld): done.\n",
++		    fcport->ha->host_no);)
++	}
++
++	return rval;
++}
++#endif
++
++/*
++ * qla2x00_target_reset
++ *	Issue target reset mailbox command.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	TARGET_QUEUE_LOCK must be released.
++ *	ADAPTER_STATE_LOCK must be released.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_target_reset(scsi_qla_host_t *ha, uint16_t b, uint16_t t)
++{
++	int rval;
++	mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++	os_tgt_t *tgt;
++
++	DEBUG11(printk("qla2x00_target_reset(%ld): entered.\n", ha->host_no);)
++
++	tgt = TGT_Q(ha, t);
++	if (tgt->vis_port == NULL) {
++		/* no target to abort */
++		return 0;
++	}
++	if (atomic_read(&tgt->vis_port->state) != FC_ONLINE) {
++		/* target not online */
++		return 0;
++	}
++
++	mcp->mb[0] = MBC_TARGET_RESET;
++#if defined(EXTENDED_IDS)
++	mcp->mb[1] = tgt->vis_port->loop_id & 0xFF;
++#else
++	mcp->mb[1] = tgt->vis_port->loop_id << 8;
++#endif
++	mcp->mb[2] = ha->loop_reset_delay;
++	mcp->out_mb = MBX_2|MBX_1|MBX_0;
++	mcp->in_mb = MBX_0;
++	mcp->tov = 30;
++	mcp->flags = 0;
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	if (rval != QL_STATUS_SUCCESS) {
++		/*EMPTY*/
++		DEBUG2_3_11(printk("qla2x00_target_reset(%ld): failed=%x.\n",
++		    ha->host_no, rval);)
++	} else {
++		/*EMPTY*/
++		DEBUG11(printk("qla2x00_target_reset(%ld): done.\n",
++		    ha->host_no);)
++	}
++
++	return rval;
++}
++
++/*
++ * qla2x00_get_adapter_id
++ *	Get adapter ID and topology.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	id = pointer for loop ID.
++ *	al_pa = pointer for AL_PA.
++ *	area = pointer for area.
++ *	domain = pointer for domain.
++ *	top = pointer for topology.
++ *	TARGET_QUEUE_LOCK must be released.
++ *	ADAPTER_STATE_LOCK must be released.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_get_adapter_id(scsi_qla_host_t *ha, uint16_t *id, uint8_t *al_pa,
++    uint8_t *area, uint8_t *domain, uint16_t *top)
++{
++	int rval;
++	mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++
++	DEBUG11(printk("qla2x00_get_adapter_id(%ld): entered.\n",
++	    ha->host_no);)
++
++	mcp->mb[0] = MBC_GET_ADAPTER_LOOP_ID;
++	mcp->out_mb = MBX_0;
++	mcp->in_mb = MBX_7|MBX_6|MBX_3|MBX_2|MBX_1|MBX_0;
++	mcp->tov = 30;
++	mcp->flags = 0;
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	/* Return data. */
++	*id = mcp->mb[1];
++	*al_pa = LSB(mcp->mb[2]);
++	*area = MSB(mcp->mb[2]);
++	*domain	= LSB(mcp->mb[3]);
++	*top = mcp->mb[6];
++
++	if (rval != QL_STATUS_SUCCESS) {
++		/*EMPTY*/
++		DEBUG2_3_11(printk("qla2x00_get_adapter_id(%ld): failed=%x.\n",
++		    ha->host_no, rval);)
++	} else {
++		/*EMPTY*/
++		DEBUG11(printk("qla2x00_get_adapter_id(%ld): done.\n",
++		    ha->host_no);)
++	}
++
++	return rval;
++}
++
++/*
++ * qla2x00_get_retry_cnt
++ *	Get current firmware login retry count and delay.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	retry_cnt = pointer to login retry count.
++ *	tov = pointer to login timeout value.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_get_retry_cnt(scsi_qla_host_t *ha, uint8_t *retry_cnt, uint8_t *tov)
++{
++	int rval;
++	uint16_t ratov;
++	mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++
++	DEBUG11(printk("qla2x00_get_retry_cnt(%ld): entered.\n",
++			ha->host_no);)
++
++	mcp->mb[0] = MBC_GET_RETRY_COUNT;
++	mcp->out_mb = MBX_0;
++	mcp->in_mb = MBX_3|MBX_2|MBX_1|MBX_0;
++	mcp->tov = 30;
++	mcp->flags = 0;
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	if (rval != QL_STATUS_SUCCESS) {
++		/*EMPTY*/
++		DEBUG2_3_11(printk("qla2x00_get_retry_cnt(%ld): failed = %x.\n",
++		    ha->host_no, mcp->mb[0]);)
++	} else {
++		/* Convert returned data and check our values. */
++		ratov = (mcp->mb[3]/2) / 10;  /* mb[3] value is in 100ms */
++		if (mcp->mb[1] * ratov > (*retry_cnt) * (*tov)) {
++			/* Update to the larger values */
++			*retry_cnt = (uint8_t)mcp->mb[1];
++			*tov = ratov;
++		}
++
++		DEBUG11(printk("qla2x00_get_retry_cnt(%ld): done. mb3=%d "
++		    "ratov=%d.\n", ha->host_no, mcp->mb[3], ratov);)
++	}
++
++	return rval;
++}
++
++/*
++ * qla2x00_loopback_test
++ *	Send out a LOOPBACK mailbox command.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	retry_cnt = pointer to login retry count.
++ *	tov = pointer to login timeout value.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_loopback_test(scsi_qla_host_t *ha, INT_LOOPBACK_REQ *req,
++    uint16_t *ret_mb)
++{
++	int		rval;
++	mbx_cmd_t	mc;
++	mbx_cmd_t	*mcp = &mc;
++
++	memset(mcp->mb, 0 , sizeof(mcp->mb));
++
++	mcp->mb[0] = MBC_DIAGNOSTIC_LOOP_BACK;
++	mcp->mb[1] = req->Options;
++	mcp->mb[10] = LSW(req->TransferCount);
++	mcp->mb[11] = MSW(req->TransferCount);
++
++	mcp->mb[14] = LSW(ha->ioctl_mem_phys); /* send data address */
++	mcp->mb[15] = MSW(ha->ioctl_mem_phys);
++	mcp->mb[20] = LSW(MSD(ha->ioctl_mem_phys));
++	mcp->mb[21] = MSW(MSD(ha->ioctl_mem_phys));
++
++	mcp->mb[16] = LSW(ha->ioctl_mem_phys); /* rcv data address */
++	mcp->mb[17] = MSW(ha->ioctl_mem_phys);
++	mcp->mb[6] = LSW(MSD(ha->ioctl_mem_phys));
++	mcp->mb[7] = MSW(MSD(ha->ioctl_mem_phys));
++
++	mcp->mb[18] = LSW(req->IterationCount); /* iteration count lsb */
++	mcp->mb[19] = MSW(req->IterationCount); /* iteration count msb */
++
++	mcp->out_mb = MBX_21|MBX_20|MBX_19|MBX_18|MBX_17|MBX_16|MBX_15|
++		MBX_14|MBX_13|MBX_12|MBX_11|MBX_10|MBX_7|MBX_6|MBX_1|MBX_0;
++	mcp->in_mb = MBX_19|MBX_18|MBX_3|MBX_2|MBX_1|MBX_0;
++	mcp->buf_size = req->TransferCount;
++	mcp->flags = MBX_DMA_OUT|MBX_DMA_IN|IOCTL_CMD;
++	mcp->tov = 30;
++
++	DEBUG11(printk("qla2x00_send_loopback: req.Options=%x iterations=%x "
++	    "MAILBOX_CNT=%d.\n", req->Options, req->IterationCount,
++	    MAILBOX_REGISTER_COUNT);)
++
++	rval = qla2x00_mailbox_command(ha, mcp);
++
++	/* Always copy back return mailbox values. */
++	memcpy((void *)ret_mb, (void *)mcp->mb, sizeof(mcp->mb));
++
++	if (rval != QL_STATUS_SUCCESS) {
++		/* Empty. */
++		DEBUG2_3_11(printk(
++		    "qla2x00_loopback_test(%ld): mailbox command FAILED=%x.\n",
++		    ha->host_no, mcp->mb[0]);)
++	} else {
++		/* Empty. */
++		DEBUG11(printk(
++		    "qla2x00_loopback_test(%ld): done.\n", ha->host_no);)
++	}
++
++	return rval;
++}
++
++/*
++ * qla2x00_init_firmware
++ *	Initialize adapter firmware.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	dptr = Initialization control block pointer.
++ *	size = size of initialization control block.
++ *	TARGET_QUEUE_LOCK must be released.
++ *	ADAPTER_STATE_LOCK must be released.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_init_firmware(scsi_qla_host_t *ha, uint16_t size)
++{
++	int rval;
++	mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++
++	DEBUG11(printk("qla2x00_init_firmware(%ld): entered.\n",
++	    ha->host_no);)
++
++	mcp->mb[0] = MBC_INITIALIZE_FIRMWARE;
++	mcp->mb[2] = MSW(ha->init_cb_dma);
++	mcp->mb[3] = LSW(ha->init_cb_dma);
++	mcp->mb[4] = 0;
++	mcp->mb[5] = 0;
++	mcp->mb[6] = MSW(MSD(ha->init_cb_dma));
++	mcp->mb[7] = LSW(MSD(ha->init_cb_dma));
++	mcp->out_mb = MBX_7|MBX_6|MBX_3|MBX_2|MBX_0;
++	mcp->in_mb = MBX_5|MBX_4|MBX_0;
++	mcp->buf_size = size;
++	mcp->flags = MBX_DMA_OUT;
++	mcp->tov = 30;
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	if (rval != QL_STATUS_SUCCESS) {
++		/*EMPTY*/
++		DEBUG2_3_11(printk("qla2x00_init_firmware(%ld): failed=%x "
++		    "mb0=%x.\n",
++		    ha->host_no, rval, mcp->mb[0]);)
++	} else {
++		/*EMPTY*/
++		DEBUG11(printk("qla2x00_init_firmware(%ld): done.\n",
++		    ha->host_no);)
++	}
++
++	return rval;
++}
++
++/*
++ * qla2x00_get_port_database
++ *	Issue normal/enhanced get port database mailbox command
++ *	and copy device name as necessary.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	dev = structure pointer.
++ *	opt = enhanced cmd option byte.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_get_port_database(scsi_qla_host_t *ha, fcdev_t *dev, uint8_t opt)
++{
++	int rval;
++	mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++	port_database_t *pd;
++	dma_addr_t phys_address = 0;
++
++	DEBUG11(printk("qla2x00_get_port_database(%ld): entered.\n",
++	    ha->host_no);)
++
++	pd = pci_alloc_consistent(ha->pdev, PORT_DATABASE_SIZE, &phys_address);
++	if (pd  == NULL) {
++		DEBUG2_3_11(printk("qla2x00_get_port_database(%ld): **** "
++		    "Mem Alloc Failed ****",
++		    ha->host_no);)
++		return QL_STATUS_RESOURCE_ERROR;
++	}
++
++	memset(pd, 0, PORT_DATABASE_SIZE);
++
++	if (opt != 0)
++		mcp->mb[0] = MBC_ENHANCED_GET_PORT_DATABASE;
++	else
++		mcp->mb[0] = MBC_GET_PORT_DATABASE;
++
++#if defined(EXTENDED_IDS)
++	mcp->mb[1] = dev->loop_id & 0xFF;
++#else
++	mcp->mb[1] = dev->loop_id << 8 | opt;
++#endif
++	mcp->mb[2] = MSW(phys_address);
++	mcp->mb[3] = LSW(phys_address);
++	mcp->mb[6] = MSW(MSD(phys_address));
++	mcp->mb[7] = LSW(MSD(phys_address));
++	mcp->out_mb = MBX_7|MBX_6|MBX_3|MBX_2|MBX_1|MBX_0;
++#if defined(EXTENDED_IDS)
++	mcp->mb[10] = opt;
++	mcp->out_mb |= MBX_10;
++#endif
++	mcp->in_mb = MBX_0;
++	mcp->buf_size = PORT_DATABASE_SIZE;
++	mcp->flags = MBX_DMA_IN;
++	/*mcp->tov = ha->retry_count * ha->login_timeout * 2;*/
++	mcp->tov =  ha->login_timeout * 2;
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	if (rval == QL_STATUS_SUCCESS) {
++		/* Save some data */
++		/* Names are big endian. */
++		memcpy((void *)&dev->name[0],(void *)&pd->node_name[0], 8);
++		memcpy((void *)&dev->wwn[0], (void *)&pd->port_name[0], 8);
++
++		/* Get port_id of device. */
++		dev->d_id.b.al_pa = pd->port_id[2];
++		dev->d_id.b.area = pd->port_id[3];
++		dev->d_id.b.domain = pd->port_id[0];
++		dev->d_id.b.rsvd_1 = 0;
++
++		/* Get initiator status of device. */
++		pd->prli_svc_param_word_3[0] & BIT_5 ?
++		    (dev->flag = dev->flag | DEV_INITIATOR) :
++		    (dev->flag = dev->flag & ~DEV_INITIATOR);
++
++		/* Check for logged in and whether target device. */
++		if (pd->master_state != PD_STATE_PORT_LOGGED_IN &&
++		    pd->slave_state != PD_STATE_PORT_LOGGED_IN) {
++			rval = QL_STATUS_ERROR;
++		} else if (pd->master_state == PD_STATE_PORT_UNAVAILABLE) {
++			rval = QL_STATUS_ERROR;
++		}
++	}
++
++	pci_free_consistent(ha->pdev, PORT_DATABASE_SIZE, pd, phys_address);
++
++	if (rval != QL_STATUS_SUCCESS) {
++		/*EMPTY*/
++		DEBUG2_3_11(printk("qla2x00_get_port_database(%ld): "
++		    "failed=%x.\n", ha->host_no, rval);)
++	} else {
++		/*EMPTY*/
++		DEBUG11(printk("qla2x00_get_port_database(%ld): done.\n",
++		    ha->host_no);)
++	}
++
++	return rval;
++}
++
++/*
++ * qla2x00_get_firmware_state
++ *	Get adapter firmware state.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	dptr = pointer for firmware state.
++ *	TARGET_QUEUE_LOCK must be released.
++ *	ADAPTER_STATE_LOCK must be released.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_get_firmware_state(scsi_qla_host_t *ha, uint16_t *dptr)
++{
++	int rval;
++	mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++
++	DEBUG11(printk("qla2x00_get_firmware_state(%ld): entered.\n",
++	    ha->host_no);)
++
++	mcp->mb[0] = MBC_GET_FIRMWARE_STATE;
++	mcp->out_mb = MBX_0;
++	mcp->in_mb = MBX_2|MBX_1|MBX_0;
++	mcp->tov = 30;
++	mcp->flags = 0;
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	/* Return firmware state. */
++	*dptr = mcp->mb[1];
++
++	if (rval != QL_STATUS_SUCCESS) {
++		/*EMPTY*/
++		DEBUG2_3_11(printk("qla2x00_get_firmware_state(%ld): "
++		    "failed=%x.\n", ha->host_no, rval);)
++	} else {
++		/*EMPTY*/
++		DEBUG11(printk("qla2x00_get_firmware_state(%ld): done.\n",
++		    ha->host_no);)
++	}
++
++	return rval;
++}
++
++/*
++ * qla2x00_get_port_name
++ *	Issue get port name mailbox command.
++ *	Returned name is in big endian format.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	loop_id = loop ID of device.
++ *	name = pointer for name.
++ *	TARGET_QUEUE_LOCK must be released.
++ *	ADAPTER_STATE_LOCK must be released.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_get_port_name(scsi_qla_host_t *ha, uint16_t loop_id, uint8_t *name,
++    uint8_t opt)
++{
++	int rval;
++	mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++
++	DEBUG11(printk("qla2x00_get_port_name(%ld): entered.\n",
++	    ha->host_no);)
++
++	mcp->mb[0] = MBC_GET_PORT_NAME;
++#if defined(EXTENDED_IDS)
++	mcp->mb[1] = loop_id & 0xFF;
++#else
++	mcp->mb[1] = loop_id << 8 | opt;
++#endif
++	mcp->out_mb = MBX_1|MBX_0;
++#if defined(EXTENDED_IDS)
++	mcp->mb[10] = opt;
++	mcp->out_mb |= MBX_10;
++#endif
++	mcp->in_mb = MBX_7|MBX_6|MBX_3|MBX_2|MBX_1|MBX_0;
++	mcp->tov = 30;
++	mcp->flags = 0;
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	if (rval != QL_STATUS_SUCCESS) {
++		/*EMPTY*/
++		DEBUG2_3_11(printk("qla2x00_get_port_name(%ld): failed=%x.\n",
++		    ha->host_no, rval);)
++	} else {
++		if (name != NULL) {
++			/* This function returns name in big endian. */
++			name[0] = LSB(mcp->mb[2]);
++			name[1] = MSB(mcp->mb[2]);
++			name[2] = LSB(mcp->mb[3]);
++			name[3] = MSB(mcp->mb[3]);
++			name[4] = LSB(mcp->mb[6]);
++			name[5] = MSB(mcp->mb[6]);
++			name[6] = LSB(mcp->mb[7]);
++			name[7] = MSB(mcp->mb[7]);
++		}
++
++		DEBUG11(printk("qla2x00_get_port_name(%ld): done.\n",
++		    ha->host_no);)
++	}
++
++	return rval;
++}
++
++/*
++ * qla2x00_get_link_status
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	loop_id = device loop ID.
++ *	ret_buf = pointer to link status return buffer.
++ *
++ * Returns:
++ *	0 = success.
++ *	BIT_0 = mem alloc error.
++ *	BIT_1 = mailbox error.
++ */
++uint8_t
++qla2x00_get_link_status(scsi_qla_host_t *ha, uint8_t loop_id, void *ret_buf,
++    uint16_t *status)
++{
++	int rval;
++	mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++	link_stat_t *stat_buf;
++	dma_addr_t phys_address = 0;
++
++
++	DEBUG11(printk("qla2x00_get_link_status(%ld): entered.\n",
++	    ha->host_no);)
++
++	stat_buf = pci_alloc_consistent(ha->pdev, sizeof(link_stat_t),
++	    &phys_address);
++	if (stat_buf == NULL) {
++		DEBUG2_3_11(printk("qla2x00_get_link_status(%ld): Failed to "
++		    "allocate memory.\n", ha->host_no));
++		return BIT_0;
++	}
++
++	memset(stat_buf, 0, sizeof(link_stat_t));
++
++	mcp->mb[0] = MBC_GET_LINK_STATUS;
++#if defined(EXTENDED_IDS)
++	mcp->mb[1] = loop_id & 0xFF;
++#else
++	mcp->mb[1] = loop_id << 8;
++#endif
++	mcp->mb[2] = MSW(phys_address);
++	mcp->mb[3] = LSW(phys_address);
++	mcp->mb[6] = MSW(MSD(phys_address));
++	mcp->mb[7] = LSW(MSD(phys_address));
++	mcp->out_mb = MBX_7|MBX_6|MBX_3|MBX_2|MBX_1|MBX_0;
++#if defined(EXTENDED_IDS)
++	mcp->mb[10] = 0;
++	mcp->out_mb |= MBX_10;
++#endif
++	mcp->in_mb = MBX_0;
++	mcp->tov = 30;
++	mcp->flags = IOCTL_CMD;
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	if (rval == QL_STATUS_SUCCESS) {
++
++		if (mcp->mb[0] != MBS_COMMAND_COMPLETE) {
++			DEBUG2_3_11(printk("qla2x00_get_link_status(%ld): cmd "
++			    "failed. mbx0=%x.\n", ha->host_no, mcp->mb[0]);)
++			status[0] = mcp->mb[0];
++			rval = BIT_1;
++		} else {
++			/* copy over data */
++			memcpy(ret_buf, stat_buf,sizeof(link_stat_t));
++			DEBUG(printk("qla2x00_get_link_status(%ld): stat dump: "
++			    "fail_cnt=%d loss_sync=%d loss_sig=%d seq_err=%d "
++			    "inval_xmt_word=%d inval_crc=%d.\n",
++			    ha->host_no,
++			    stat_buf->link_fail_cnt, stat_buf->loss_sync_cnt,
++			    stat_buf->loss_sig_cnt, stat_buf->prim_seq_err_cnt,
++			    stat_buf->inval_xmit_word_cnt,
++			    stat_buf->inval_crc_cnt);)
++			DEBUG11(printk("qla2x00_get_link_status(%ld): stat "
++			    "dump: fail_cnt=%d loss_sync=%d loss_sig=%d "
++			    "seq_err=%d inval_xmt_word=%d inval_crc=%d.\n",
++			    ha->host_no,
++			    stat_buf->link_fail_cnt, stat_buf->loss_sync_cnt,
++			    stat_buf->loss_sig_cnt, stat_buf->prim_seq_err_cnt,
++			    stat_buf->inval_xmit_word_cnt,
++			    stat_buf->inval_crc_cnt);)
++		}
++	} else {
++		/* Failed. */
++		DEBUG2_3_11(printk("qla2x00_get_link_status(%ld): failed=%x.\n",
++		    ha->host_no, rval);)
++		rval = BIT_1;
++	}
++
++	pci_free_consistent(ha->pdev, sizeof(link_stat_t),
++	    stat_buf, phys_address);
++
++	return rval;
++}
++
++/*
++ * qla2x00_lip_reset
++ *	Issue LIP reset mailbox command.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	TARGET_QUEUE_LOCK must be released.
++ *	ADAPTER_STATE_LOCK must be released.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_lip_reset(scsi_qla_host_t *ha)
++{
++	int rval;
++	mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++
++	DEBUG11(printk("qla2x00_lip_reset(%ld): entered.\n",
++	    ha->host_no);)
++
++	mcp->mb[0] = MBC_LIP_RESET;
++#if defined(EXTENDED_IDS)
++	mcp->mb[1] = 0x00ff;
++#else
++	mcp->mb[1] = 0xff00;
++#endif
++	mcp->mb[2] = ha->loop_reset_delay;
++	mcp->mb[3] = 0;
++	mcp->out_mb = MBX_3|MBX_2|MBX_1|MBX_0;
++#if defined(EXTENDED_IDS)
++	mcp->mb[10] = 0;
++	mcp->out_mb |= MBX_10;
++#endif
++	mcp->in_mb = MBX_0;
++	mcp->tov = 30;
++	mcp->flags = 0;
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	if (rval != QL_STATUS_SUCCESS) {
++		/*EMPTY*/
++		DEBUG2_3_11(printk("qla2x00_lip_reset(%ld): failed=%x.\n",
++		    ha->host_no, rval);)
++	} else {
++		/*EMPTY*/
++		DEBUG11(printk("qla2x00_lip_reset(%ld): done.\n",
++		    ha->host_no);)
++	}
++
++	return rval;
++}
++
++/*
++ * qla2x00_send_sns
++ *	Send SNS command.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	sns = pointer for command.
++ *	cmd_size = command size.
++ *	buf_size = response/command size.
++ *	TARGET_QUEUE_LOCK must be released.
++ *	ADAPTER_STATE_LOCK must be released.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_send_sns(scsi_qla_host_t *ha, dma_addr_t sns_phys_address,
++    uint16_t cmd_size, size_t buf_size)
++{
++	int rval;
++	mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++
++	DEBUG11(printk("qla2x00_send_sns(%ld): entered.\n",
++	    ha->host_no);)
++
++	mcp->mb[0] = MBC_SEND_SNS_COMMAND;
++	mcp->mb[1] = cmd_size;
++	mcp->mb[2] = MSW(sns_phys_address);
++	mcp->mb[3] = LSW(sns_phys_address);
++	mcp->mb[6] = MSW(MSD(sns_phys_address));
++	mcp->mb[7] = LSW(MSD(sns_phys_address));
++	mcp->out_mb = MBX_7|MBX_6|MBX_3|MBX_2|MBX_1|MBX_0;
++	mcp->in_mb = MBX_0|MBX_1;
++	mcp->buf_size = buf_size;
++	mcp->flags = MBX_DMA_OUT|MBX_DMA_IN;
++	/*mcp->tov = ha->retry_count * ha->login_timeout * 2;*/
++	mcp->tov =  ha->login_timeout * 2;
++
++	DEBUG11(printk("qla2x00_send_sns: retry cnt=%d ratov=%d total "
++	    "tov=%d.\n", ha->retry_count, ha->login_timeout, mcp->tov);)
++
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	if (rval != QL_STATUS_SUCCESS) {
++		/*EMPTY*/
++		DEBUG(printk("qla2x00_send_sns(%ld): failed=%x mb[0]=%x "
++		    "mb[1]=%x.\n",
++		    ha->host_no, rval, mcp->mb[0], mcp->mb[1]);)
++		DEBUG2_3_11(printk("qla2x00_send_sns(%ld): failed=%x mb[0]=%x "
++		    "mb[1]=%x.\n",
++		    ha->host_no, rval, mcp->mb[0], mcp->mb[1]);)
++	} else {
++		/*EMPTY*/
++		DEBUG11(printk("qla2x00_send_sns(%ld): done.\n",
++		    ha->host_no);)
++	}
++
++	return rval;
++}
++
++/*
++ * qla2x00_login_fabric
++ *	Issue login fabric port mailbox command.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	loop_id = device loop ID.
++ *	domain = device domain.
++ *	area = device area.
++ *	al_pa = device AL_PA.
++ *	status = pointer for return status.
++ *	opt = command options.
++ *	TARGET_QUEUE_LOCK must be released.
++ *	ADAPTER_STATE_LOCK must be released.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_login_fabric(scsi_qla_host_t *ha, uint16_t loop_id, uint8_t domain,
++    uint8_t area, uint8_t al_pa, uint16_t *status, uint8_t opt)
++{
++	int rval;
++	mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++
++	DEBUG11(printk("qla2x00_login_fabric(%ld): entered.\n",
++	    ha->host_no);)
++
++	mcp->mb[0] = MBC_LOGIN_FABRIC_PORT;
++#if defined(EXTENDED_IDS)
++	mcp->mb[1] = loop_id & 0xFF;
++#else
++	mcp->mb[1] = (loop_id << 8) | opt;
++#endif
++	mcp->mb[2] = domain;
++	mcp->mb[3] = area << 8 | al_pa;
++	mcp->out_mb = MBX_3|MBX_2|MBX_1|MBX_0;
++#if defined(EXTENDED_IDS)
++	mcp->mb[10] = opt;
++	mcp->out_mb |= MBX_10;
++#endif
++	mcp->in_mb = MBX_2|MBX_1|MBX_0;
++	/*mcp->tov = ha->retry_count * ha->login_timeout * 2;*/
++	mcp->tov = ha->login_timeout * 2;
++	mcp->flags = 0;
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	/* Return mailbox statuses. */
++	if (status != NULL) {
++		*status++ = mcp->mb[0];
++		*status++ = mcp->mb[1];
++		*status = mcp->mb[2];
++	}
++
++	if (rval != QL_STATUS_SUCCESS) {
++		/* RLU tmp code: need to change main mailbox_command function to
++		 * return ok even when the mailbox completion value is not
++		 * SUCCESS. The caller needs to be responsible to interpret
++		 * the return values of this mailbox command if we're not
++		 * to change too much of the existing code.
++		 */
++		if (mcp->mb[0] == 0x4001 || mcp->mb[0] == 0x4002 ||
++		    mcp->mb[0] == 0x4003 || mcp->mb[0] == 0x4005 ||
++		    mcp->mb[0] == 0x4006)
++			rval = QL_STATUS_SUCCESS;
++
++		/*EMPTY*/
++		DEBUG2_3_11(printk("qla2x00_login_fabric(%ld): failed=%x "
++		    "mb[1]=%x mb[2]=%x.\n",
++		    ha->host_no, rval, mcp->mb[1], mcp->mb[2]);)
++	} else {
++		/*EMPTY*/
++		DEBUG11(printk("qla2x00_login_fabric(%ld): done.\n",
++		    ha->host_no);)
++	}
++
++	return rval;
++}
++
++/*
++ * qla2x00_login_local_device
++ *           Issue login loop port mailbox command.
++ *    
++ * Input:
++ *           ha = adapter block pointer.
++ *           loop_id = device loop ID.
++ *           opt = command options.
++ *          
++ * Returns:
++ *            Return status code.
++ *             
++ * Context:
++ *            Kernel context.
++ *             
++ */
++int
++qla2x00_login_local_device(scsi_qla_host_t *ha,
++		uint16_t loop_id, uint16_t *mb_ret, uint8_t opt)
++{
++	int rval;
++	mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++
++	DEBUG3(printk("%s(%ld): entered.\n", __func__, ha->host_no);)
++
++	mcp->mb[0] = MBC_LOGIN_LOOP_PORT;
++#if defined(EXTENDED_IDS)
++	mcp->mb[1] = loop_id & 0xFF;
++#else
++	mcp->mb[1] = (loop_id << 8);
++#endif
++	mcp->mb[2] = opt;
++	mcp->out_mb = MBX_2|MBX_1|MBX_0;
++ 	mcp->in_mb = MBX_7|MBX_6|MBX_1|MBX_0;
++	mcp->tov =  ha->login_timeout * 2;
++	mcp->flags = 0;
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++ 	/* Return mailbox statuses. */
++ 	if (mb_ret != NULL) {
++ 		mb_ret[0] = mcp->mb[0];
++ 		mb_ret[1] = mcp->mb[1];
++ 		mb_ret[6] = mcp->mb[6];
++ 		mb_ret[7] = mcp->mb[7];
++ 	}
++
++	if (rval != QL_STATUS_SUCCESS) {
++ 		/* AV tmp code: need to change main mailbox_command function to
++ 		 * return ok even when the mailbox completion value is not
++ 		 * SUCCESS. The caller needs to be responsible to interpret
++ 		 * the return values of this mailbox command if we're not
++ 		 * to change too much of the existing code.
++ 		 */
++ 		if (mcp->mb[0] == 0x4005 || mcp->mb[0] == 0x4006)
++ 			rval = QL_STATUS_SUCCESS;
++
++		DEBUG(printk("%s(%ld): failed=%x mb[0]=%x mb[1]=%x "
++		    "mb[6]=%x mb[7]=%x.\n",
++		    __func__, ha->host_no, rval, mcp->mb[0], mcp->mb[1],
++		    mcp->mb[6], mcp->mb[7]);)
++		DEBUG2_3(printk("%s(%ld): failed=%x mb[0]=%x mb[1]=%x "
++		    "mb[6]=%x mb[7]=%x.\n",
++		    __func__, ha->host_no, rval, mcp->mb[0], mcp->mb[1],
++		    mcp->mb[6], mcp->mb[7]);)
++	} else {
++		/*EMPTY*/
++		DEBUG3(printk("%s(%ld): done.\n", __func__, ha->host_no);)
++	}
++
++	return (rval);
++}
++
++/*
++ * qla2x00_fabric_logout
++ *	Issue logout fabric port mailbox command.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	loop_id = device loop ID.
++ *	TARGET_QUEUE_LOCK must be released.
++ *	ADAPTER_STATE_LOCK must be released.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_fabric_logout(scsi_qla_host_t *ha, uint16_t loop_id)
++{
++	int rval;
++	mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++
++	DEBUG11(printk("qla2x00_fabric_logout(%ld): entered.\n",
++	    ha->host_no);)
++
++	mcp->mb[0] = MBC_LOGOUT_FABRIC_PORT;
++#if defined(EXTENDED_IDS)
++	mcp->mb[1] = loop_id & 0xFF;
++#else
++	mcp->mb[1] = loop_id << 8;
++#endif
++	mcp->out_mb = MBX_1|MBX_0;
++#if defined(EXTENDED_IDS)
++	mcp->mb[10] = 0;
++	mcp->out_mb |= MBX_10;
++#endif
++	mcp->in_mb = MBX_1|MBX_0;
++	mcp->tov = 30;
++	mcp->flags = 0;
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	if (rval != QL_STATUS_SUCCESS) {
++		/*EMPTY*/
++		DEBUG2_3_11(printk("qla2x00_fabric_logout(%ld): failed=%x "
++		    "mbx1=%x.\n",
++		    ha->host_no, rval, mcp->mb[1]);)
++	} else {
++		/*EMPTY*/
++		DEBUG11(printk("qla2x00_fabric_logout(%ld): done.\n",
++		    ha->host_no);)
++	}
++
++	return rval;
++}
++
++/*
++ * qla2x00_full_login_lip
++ *	Issue full login LIP mailbox command.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	TARGET_QUEUE_LOCK must be released.
++ *	ADAPTER_STATE_LOCK must be released.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_full_login_lip(scsi_qla_host_t *ha)
++{
++	int rval;
++	mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++
++	DEBUG11(printk("qla2x00_full_login_lip(%ld): entered.\n",
++	    ha->host_no);)
++
++	mcp->mb[0] = MBC_LIP_FULL_LOGIN;
++	mcp->mb[1] = 0;
++	mcp->mb[2] = 0;
++	mcp->mb[3] = 0;
++	mcp->out_mb = MBX_3|MBX_2|MBX_1|MBX_0;
++	mcp->in_mb = MBX_0;
++	mcp->tov = 30;
++	mcp->flags = 0;
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	if (rval != QL_STATUS_SUCCESS) {
++		/*EMPTY*/
++		DEBUG2_3_11(printk("qla2x00_full_login_lip(%ld): failed=%x.\n",
++		    ha->instance, rval);)
++	} else {
++		/*EMPTY*/
++		DEBUG11(printk("qla2x00_full_login_lip(%ld): done.\n",
++		    ha->host_no);)
++	}
++
++	return rval;
++}
++
++/*
++ * qla2x00_get_port_list
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	TARGET_QUEUE_LOCK must be released.
++ *	ADAPTER_STATE_LOCK must be released.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_get_port_list(scsi_qla_host_t *ha, port_list_entry_t *gp_list,
++    dma_addr_t gpl_phys_address, uint16_t opt, uint16_t *size)
++{
++	int rval;
++	mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++
++	DEBUG11(printk("qla2x00_get_port_list(%ld): entered.\n",
++	    ha->host_no);)
++
++	if( gp_list == NULL ) {
++		return QL_STATUS_ERROR;
++	}
++
++	mcp->mb[0] = MBC_GET_PORT_LIST;
++	mcp->mb[1] = opt;
++	mcp->mb[2] = MSW(gpl_phys_address);
++	mcp->mb[3] = LSW(gpl_phys_address);
++	mcp->mb[6] = MSW(MSD(gpl_phys_address));
++	mcp->mb[7] = LSW(MSD(gpl_phys_address));
++
++	mcp->out_mb = MBX_7|MBX_6|MBX_3|MBX_2|MBX_1|MBX_0;
++	mcp->in_mb = MBX_1|MBX_0;
++	mcp->tov = 30;
++	mcp->flags = 0;
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	if (rval != QL_STATUS_SUCCESS) {
++		/*EMPTY*/
++		DEBUG2_3_11(printk("qla2x00_get_port_list(%ld): failed=%x.\n",
++		    ha->host_no, rval);)
++	} else {
++		*size = mcp->mb[1];
++		DEBUG11(printk("qla2x00_get_port_list(%ld): done.\n",
++		    ha->host_no);)
++	}
++
++	return rval;
++}
++
++#if 0 /* not yet needed */
++int
++qla2x00_dump_ram(scsi_qla_host_t *ha, uint32_t risc_address,
++    dma_addr_t ispdump_dma, uint32_t size)
++{
++	int rval;
++	mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++
++	mcp->mb[0] = MBC_DUMP_RAM;
++	mcp->mb[1] = risc_address & 0xffff;
++	mcp->mb[2] = MSW(ispdump_dma);
++	mcp->mb[3] = LSW(ispdump_dma);
++	mcp->mb[4] = 0;
++	mcp->mb[6] = MSW(MSD(ispdump_dma));
++	mcp->mb[7] = LSW(MSD(ispdump_dma));
++
++	mcp->out_mb = MBX_7|MBX_6|MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;
++	mcp->in_mb = MBX_0;
++	mcp->tov = 30;
++	mcp->flags = 0;
++	rval = qla2x00_mailbox_command(ha, mcp);
++
++	return rval;
++}
++#endif
++
++/*
++ * qla2x00_lun_reset
++ *	Issue lun reset mailbox command.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	loop_id = device loop ID.
++ *      lun = lun to be reset.
++ *	TARGET_QUEUE_LOCK must be released.
++ *	ADAPTER_STATE_LOCK must be released.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_lun_reset(scsi_qla_host_t *ha, uint16_t loop_id, uint16_t lun)
++{
++	int		rval;
++	mbx_cmd_t	mc;
++	mbx_cmd_t	*mcp = &mc;
++
++	ENTER("qla2x00_lun_reset");
++
++	mcp->mb[0] = MBC_LUN_RESET;
++#if defined(EXTENDED_IDS)
++	mcp->mb[1] = loop_id & 0xFF;
++#else
++	mcp->mb[1] = loop_id << 8;
++#endif
++	mcp->mb[2] = lun;
++	mcp->out_mb = MBX_2|MBX_1|MBX_0;
++	mcp->in_mb = MBX_0;
++	mcp->tov = 30;
++	mcp->flags = 0;
++	rval = qla2x00_mailbox_command(ha, mcp);
++
++	if (rval != QLA2X00_SUCCESS) {
++		/*EMPTY*/
++		printk(KERN_WARNING "qla2x00_lun_reset(%d): failed = %d",
++		    (int)ha->instance, rval);
++	} else {
++		/*EMPTY*/
++		LEAVE("qla2x00_lun_reset: exiting normally");
++	}
++
++	return rval;
++}
++
++/*
++ * qla2x00_send_rnid_mbx
++ *	Issue RNID ELS using mailbox command
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	loop_id = loop ID of the target device.
++ *	data_fmt = currently supports only 0xDF.
++ *	buffer = buffer pointer.
++ *	buf_size = size of buffer.
++ *	mb_reg = pointer to return mailbox registers.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_send_rnid_mbx(scsi_qla_host_t *ha, uint16_t loop_id, uint8_t data_fmt,
++    dma_addr_t buf_phys_addr, size_t buf_size, uint16_t *mb_reg)
++{
++	int		rval;
++	mbx_cmd_t	mc;
++	mbx_cmd_t	*mcp = &mc;
++
++	DEBUG11(printk("qla2x00_send_rnid_mbx(%ld): entered.\n",
++	    ha->host_no);)
++
++	mcp->mb[0] = MBC_SEND_RNID_ELS;
++#if defined(EXTENDED_IDS)
++	mcp->mb[1] = loop_id & 0xFF;
++#else
++	mcp->mb[1] = (loop_id << 8 ) | data_fmt;
++#endif
++	mcp->mb[2] = MSW(buf_phys_addr);
++	mcp->mb[3] = LSW(buf_phys_addr);
++	mcp->mb[6] = MSW(MSD(buf_phys_addr));
++	mcp->mb[7] = LSW(MSD(buf_phys_addr));
++	mcp->out_mb = MBX_7|MBX_6|MBX_3|MBX_2|MBX_1|MBX_0;
++#if defined(EXTENDED_IDS)
++	mcp->mb[10] = data_fmt;
++	mcp->out_mb |= MBX_10;
++#endif
++	mcp->in_mb = MBX_1|MBX_0;
++	mcp->buf_size = buf_size;
++	mcp->flags = MBX_DMA_IN;
++	mcp->tov = 30;
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	if (rval != QL_STATUS_SUCCESS) {
++		memcpy(mb_reg, mcp->mb, 2 * 2); /* 2 status regs */
++
++		DEBUG2_3_11(printk("qla2x00_send_rnid_mbx(%ld): failed=%x "
++		    "mb[1]=%x.\n",
++		    ha->host_no, mcp->mb[0], mcp->mb[1]);)
++	} else {
++		/*EMPTY*/
++	 	DEBUG11(printk("qla2x00_send_rnid_mbx(%ld): done.\n",
++		     ha->host_no);)
++	}
++
++	return (rval);
++}
++
++/*
++ * qla2x00_set_rnid_params_mbx
++ *	Set RNID parameters using mailbox command
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	buffer = buffer pointer.
++ *	buf_size = size of buffer.
++ *	mb_reg = pointer to return mailbox registers.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_set_rnid_params_mbx(scsi_qla_host_t *ha, dma_addr_t buf_phys_addr,
++    size_t buf_size, uint16_t *mb_reg)
++{
++	int		rval;
++	mbx_cmd_t	mc;
++	mbx_cmd_t	*mcp = &mc;
++
++	DEBUG11(printk("qla2x00_set_rnid_params_mbx(%ld): entered.\n",
++	    ha->host_no);)
++
++	mcp->mb[0] = MBC_SET_RNID_PARAMS;
++	mcp->mb[1] = 0;
++	mcp->mb[2] = MSW(buf_phys_addr);
++	mcp->mb[3] = LSW(buf_phys_addr);
++	mcp->mb[6] = MSW(MSD(buf_phys_addr));
++	mcp->mb[7] = LSW(MSD(buf_phys_addr));
++	mcp->out_mb = MBX_7|MBX_6|MBX_3|MBX_2|MBX_1|MBX_0;
++	mcp->in_mb = MBX_1|MBX_0;
++	mcp->buf_size = buf_size;
++	mcp->flags = MBX_DMA_OUT;
++	mcp->tov = 30;
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	if (rval != QLA2X00_SUCCESS) {
++		memcpy(mb_reg, mcp->mb, 2 * 2); /* 2 status regs */
++
++		DEBUG2_3_11(printk("qla2x00_set_rnid_params_mbx(%ld): "
++		    "failed=%x mb[1]=%x.\n",
++		    ha->host_no, mcp->mb[0], mcp->mb[1]);)
++	} else {
++		/*EMPTY*/
++		DEBUG11(printk("qla2x00_set_rnid_params_mbx(%ld): done.\n",
++		    ha->host_no);)
++	}
++
++	return (rval);
++}
++
++/*
++ * qla2x00_get_rnid_params_mbx
++ *	Get RNID parameters using mailbox command
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	buffer = buffer pointer.
++ *	buf_size = size of buffer.
++ *	mb_reg = pointer to return mailbox registers.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_get_rnid_params_mbx(scsi_qla_host_t *ha, dma_addr_t buf_phys_addr,
++    size_t buf_size, uint16_t *mb_reg)
++{
++	int		rval;
++	mbx_cmd_t	mc;
++	mbx_cmd_t	*mcp = &mc;
++
++	DEBUG11(printk("qla2x00_get_rnid_params_mbx(%ld): entered.\n",
++	    ha->host_no);)
++
++	mcp->mb[0] = MBC_GET_RNID_PARAMS;
++	mcp->mb[1] = 0;
++	mcp->mb[2] = MSW(buf_phys_addr);
++	mcp->mb[3] = LSW(buf_phys_addr);
++	mcp->mb[6] = MSW(MSD(buf_phys_addr));
++	mcp->mb[7] = LSW(MSD(buf_phys_addr));
++	mcp->out_mb = MBX_7|MBX_6|MBX_3|MBX_2|MBX_1|MBX_0;
++	mcp->in_mb = MBX_1|MBX_0;
++	mcp->buf_size = buf_size;
++	mcp->flags = MBX_DMA_IN;
++	mcp->tov = 30;
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	if (rval != QLA2X00_SUCCESS) {
++		memcpy(mb_reg, mcp->mb, 2 * 2); /* 2 status regs */
++
++		DEBUG2_3_11(printk("qla2x00_get_rnid_params_mbx(%ld): "
++		    "failed=%x mb[1]=%x.\n",
++		    ha->host_no, mcp->mb[0], mcp->mb[1]);)
++	} else {
++		/*EMPTY*/
++		DEBUG11(printk("qla2x00_get_rnid_params_mbx(%ld): done.\n",
++		    ha->host_no);)
++	}
++
++	return (rval);
++}
++
++#if defined(QL_DEBUG_LEVEL_3)
++/*
++ * qla2x00_get_fcal_position_map
++ *	Get FCAL (LILP) position map using mailbox command
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	pos_map = buffer pointer (can be NULL).
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_get_fcal_position_map(scsi_qla_host_t *ha, char *pos_map)
++{
++	int rval;
++	mbx_cmd_t mc;
++	mbx_cmd_t *mcp = &mc;
++	char *pmap;
++	dma_addr_t pmap_dma;
++
++	pmap = pci_alloc_consistent(ha->pdev, FCAL_MAP_SIZE, &pmap_dma);
++	if (pmap  == NULL) {
++		DEBUG2_3_11(printk("%s(%ld): **** Mem Alloc Failed ****",
++		    __func__, ha->host_no));
++		return QL_STATUS_RESOURCE_ERROR;
++	}
++
++	memset(pmap, 0, FCAL_MAP_SIZE);
++
++	mcp->mb[0] = MBC_GET_FCAL_MAP;
++	mcp->mb[2] = MSW(pmap_dma);
++	mcp->mb[3] = LSW(pmap_dma);
++	mcp->mb[6] = MSW(MSD(pmap_dma));
++	mcp->mb[7] = LSW(MSD(pmap_dma));
++	mcp->out_mb = MBX_7|MBX_6|MBX_3|MBX_2|MBX_0;
++	mcp->in_mb = MBX_1|MBX_0;
++	mcp->buf_size = FCAL_MAP_SIZE;
++	mcp->flags = MBX_DMA_IN;
++	mcp->tov =  ha->login_timeout * 2;
++	rval = (int)qla2x00_mailbox_command(ha, mcp);
++
++	if (rval == QL_STATUS_SUCCESS) {
++		DEBUG11(printk("%s(%ld): (mb0=%x/mb1=%x) FC/AL Position Map "
++		    "size (%x)\n",
++		    __func__, ha->host_no,
++		    mcp->mb[0], mcp->mb[1], (unsigned)pmap[0]));
++		DEBUG11(qla2x00_dump_buffer(pmap, pmap[0] + 1));
++
++		if (pos_map)
++			memcpy(pos_map, pmap, FCAL_MAP_SIZE);
++	}
++	pci_free_consistent(ha->pdev, FCAL_MAP_SIZE, pmap, pmap_dma);
++
++	if (rval != QL_STATUS_SUCCESS) {
++		DEBUG2_3_11(printk("%s(%ld): failed=%x.\n",
++		    __func__, ha->host_no, rval));
++	} else {
++		DEBUG11(printk("%s(%ld): done.\n",
++		    __func__, ha->host_no));
++	}
++
++	return rval;
++}
++#endif
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qla_os.c	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,5879 @@
++/*
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ */
++#define QLA_MODVERSION
++#include "qla_os.h"
++
++#include "qla_def.h"
++
++/*
++ * Driver version
++ */
++char qla2x00_version_str[40] = { 0 };
++
++/*
++* Command line options.
++*/
++unsigned long qla2x00_verbose = 1L;
++unsigned long qla2x00_quiet   = 0L;
++unsigned long qla2x00_reinit = 1L;
++unsigned long qla2x00_req_dmp = 0L;
++
++/*
++ * Stats for all adpaters.
++ */
++struct _qla2x00stats qla2x00_stats;
++
++/*
++ * Ioctl related information.
++ */
++int num_hosts = 0;       
++int apiHBAInstance = 0;
++
++/*
++ * Module parameter information and variables
++ */
++
++char *ql2xdevconf = NULL;
++#if MPIO_SUPPORT
++int ql2xretrycount = 30;
++#else
++int ql2xretrycount = 20;
++#endif
++int qla2xenbinq = 1;
++int max_srbs = MAX_SRBS;
++#if defined(ISP2200) || defined(ISP2300)
++int ql2xlogintimeout = 20;
++int qlport_down_retry = 0;
++#endif
++int ql2xmaxqdepth = 0;
++int displayConfig = 0;
++
++/* Enable for failover */
++#if MPIO_SUPPORT
++int ql2xfailover = 1;
++#else
++int ql2xfailover = 0;
++#endif
++
++int ConfigRequired = 0;
++int recoveryTime = MAX_RECOVERYTIME;
++int failbackTime = MAX_FAILBACKTIME;
++
++/* Persistent binding type */
++int Bind = BIND_BY_PORT_NAME;
++
++int ql2xsuspendcount = SUSPEND_COUNT;
++
++int qla2x00_retryq_dmp = 0;
++
++#if defined(MODULE)
++char *ql2xopts = NULL;
++
++static char dummy_buffer[60] =
++		"Please don't add commas in your insmod command!!\n";
++
++/* insmod qla2100 ql2xopts=verbose" */
++MODULE_PARM(ql2xopts, "s");
++MODULE_PARM_DESC(ql2xopts,
++		"Additional driver options.");
++
++MODULE_PARM(ql2xfailover, "i");
++MODULE_PARM_DESC(ql2xfailover,
++		"Driver failover support: 0 to disable; 1 to enable. "
++		"Default behaviour based on compile-time option "
++		"MPIO_SUPPORT.");
++
++MODULE_PARM(ql2xmaxqdepth, "i");
++MODULE_PARM_DESC(ql2xmaxqdepth,
++		"Maximum queue depth to report for target devices.");
++
++#if defined(ISP2200) || defined(ISP2300)
++MODULE_PARM(ql2xlogintimeout,"i");
++MODULE_PARM_DESC(ql2xlogintimeout,
++		"Login timeout value in seconds.");
++
++MODULE_PARM(qlport_down_retry,"i");
++MODULE_PARM_DESC(qlport_down_retry,
++		"Maximum number of command retries to a port that returns"
++		"a PORT-DOWN status.");
++#endif
++
++MODULE_PARM(ql2xretrycount,"i");
++MODULE_PARM_DESC(ql2xretrycount,
++		"Maximum number of mid-layer retries allowed for a command.  "
++		"Default value in non-failover mode is 20, "
++		"in failover mode, 30.");
++
++MODULE_PARM(max_srbs,"i");
++MODULE_PARM_DESC(max_srbs,
++		"Maximum number of simultaneous commands allowed for an HBA.");
++
++MODULE_PARM(displayConfig, "i");
++MODULE_PARM_DESC(displayConfig,
++		"If 1 then display the configuration used in "
++		"/etc/modules.conf.");
++
++MODULE_PARM(ConfigRequired, "i");
++MODULE_PARM_DESC(ConfigRequired,
++		"If 1, then only configured devices passed in through the"
++		"ql2xopts parameter will be presented to the OS");
++
++MODULE_PARM(recoveryTime, "i");
++MODULE_PARM_DESC(recoveryTime,
++		"Recovery time in seconds before a target device is sent I/O "
++		"after a failback is performed.");
++
++MODULE_PARM(failbackTime, "i");
++MODULE_PARM_DESC(failbackTime,
++		"Delay in seconds before a failback is performed.");
++
++MODULE_PARM(Bind, "i");
++MODULE_PARM_DESC(Bind,
++		"Target persistent binding method: "
++		"0 by Portname (default); 1 by PortID; 2 by Nodename. ");
++
++MODULE_PARM(ql2xsuspendcount,"i");
++MODULE_PARM_DESC(ql2xsuspendcount,
++		"Number of 6-second suspend iterations to perform while a "
++		"target returns a <NOT READY> status.  Default is 10 "
++		"iterations.");
++#endif
++
++MODULE_AUTHOR("QLogic Corporation");
++MODULE_DESCRIPTION("QLogic " ISP_NAME " FC-SCSI Host Bus Adapter driver");
++MODULE_LICENSE("GPL");
++
++
++/*
++ * Proc structures and functions
++ */
++struct info_str {
++	char	*buffer;
++	int	length;
++	off_t	offset;
++	int	pos;
++};
++
++static void copy_mem_info(struct info_str *, char *, int);
++static int copy_info(struct info_str *, char *, ...);
++
++
++/*
++ * List of host adapters
++ */
++struct list_head qla_hostlist;
++rwlock_t qla_hostlist_lock;
++
++
++/*
++ * PCI driver interface definitions
++ */
++#define ISP21XX_FW_INDEX	0
++#define ISP22XX_FW_INDEX	0
++#define ISP23XX_FW_INDEX	0
++#define ISP232X_FW_INDEX	2
++
++static struct qla_fw_info qla_fw_tbl[] = {
++#if defined(ISP2100)
++	/* Start of 21xx firmware list */
++	{
++		.addressing	= FW_INFO_ADDR_NORMAL,
++		.fwcode		= &fw2100tp_code01[0],
++		.fwlen		= &fw2100tp_length01,
++		.fwstart	= &fw2100tp_addr01,
++	},
++#endif
++
++#if defined(ISP2200)
++	/* Start of 22xx firmware list */
++	{
++		.addressing	= FW_INFO_ADDR_NORMAL,
++		.fwcode		= &fw2200ip_code01[0],
++		.fwlen		= &fw2200ip_length01,
++		.fwstart	= &fw2200ip_addr01,
++	},
++#endif
++
++#if defined(ISP2300)
++	/* Start of 23xx firmware list */
++#if defined(TPX)
++	{
++		.addressing	= FW_INFO_ADDR_NORMAL,
++		.fwcode		= &fw2300tpx_code01[0],
++		.fwlen		= &fw2300tpx_length01,
++		.fwstart	= &fw2300tpx_addr01,
++	},
++#else
++	{
++		.addressing	= FW_INFO_ADDR_NORMAL,
++		.fwcode		= &fw2300ipx_code01[0],
++		.fwlen		= &fw2300ipx_length01,
++		.fwstart	= &fw2300ipx_addr01,
++	},
++#endif
++
++#if defined(ISP2322)
++	/* End of 23xx firmware list */
++	{ FW_INFO_ADDR_NOMORE, },
++
++	/* Start of 232x firmware list */
++#if defined(TPX)
++	{
++		.addressing	= FW_INFO_ADDR_NORMAL,
++		.fwcode		= &fw2322tpx_code01[0],
++		.fwlen		= &fw2322tpx_length01,
++		.fwstart	= &fw2322tpx_addr01,
++	},
++	{
++		.addressing	= FW_INFO_ADDR_EXTENDED,
++		.fwcode		= &rseqtpx_code01[0],
++		.fwlen		= &rseqtpx_code_length01,
++		.lfwstart	= &rseqtpx_code_addr01,
++	},
++	{
++		.addressing	= FW_INFO_ADDR_EXTENDED,
++		.fwcode		= &xseqtpx_code01[0],
++		.fwlen		= &xseqtpx_code_length01,
++		.lfwstart	= &xseqtpx_code_addr01,
++	},
++#else
++	{
++		.addressing	= FW_INFO_ADDR_NORMAL,
++		.fwcode		= &fw2322ipx_code01[0],
++		.fwlen		= &fw2322ipx_length01,
++		.fwstart	= &fw2322ipx_addr01,
++	},
++	{
++		.addressing	= FW_INFO_ADDR_EXTENDED,
++		.fwcode		= &rseqipx_code01[0],
++		.fwlen		= &rseqipx_code_length01,
++		.lfwstart	= &rseqipx_code_addr01,
++	},
++	{
++		.addressing	= FW_INFO_ADDR_EXTENDED,
++		.fwcode		= &xseqipx_code01[0],
++		.fwlen		= &xseqipx_code_length01,
++		.lfwstart	= &xseqipx_code_addr01,
++	},
++#endif
++
++#endif
++
++#endif
++
++	/* End of firmware list */
++	{ FW_INFO_ADDR_NOMORE, },
++};
++
++#define ISP21XX_BRD_INDEX	0
++#define ISP22XX_BRD_INDEX	0
++#define ISP23XX_BRD_INDEX	0
++#define ISP2312_BRD_INDEX	1
++#define ISP2322_BRD_INDEX	2
++
++static struct qla_board_info qla_board_tbl[] = {
++#if defined(ISP2100)
++	{
++		.name		= "QLA2100 ",
++		.fwinfo		= &qla_fw_tbl[ISP21XX_FW_INDEX],
++	}
++#endif
++
++#if defined(ISP2200)
++	{
++		.name		= "QLA2200 ",
++		.fwinfo		= &qla_fw_tbl[ISP22XX_FW_INDEX],
++	}
++#endif
++
++#if defined(ISP2300)
++	{
++		.name		= "QLA2300 ",
++		.fwinfo		= &qla_fw_tbl[ISP23XX_FW_INDEX],
++	},
++
++	{
++		.name		= "QLA2312 ",
++		.fwinfo		= &qla_fw_tbl[ISP23XX_FW_INDEX],
++	},
++
++#if defined(ISP2322)
++	{
++		.name		= "QLA2322 ",
++		.fwinfo		= &qla_fw_tbl[ISP232X_FW_INDEX],
++	}
++#endif
++#endif
++};
++
++static struct pci_device_id qla_pci_tbl[] __devinitdata = {
++#if defined(ISP2100)
++	{
++		.vendor		= QLA2X00_VENDOR_ID,
++		.device		= QLA2100_DEVICE_ID,
++		.subvendor	= PCI_ANY_ID,
++		.subdevice	= PCI_ANY_ID,
++		.driver_data
++			= (unsigned long)&qla_board_tbl[ISP21XX_BRD_INDEX],
++	},
++#endif
++
++#if defined(ISP2200)
++	{
++		.vendor		= QLA2X00_VENDOR_ID,
++		.device		= QLA2200_DEVICE_ID,
++		.subvendor	= PCI_ANY_ID,
++		.subdevice	= PCI_ANY_ID,
++		.driver_data
++			= (unsigned long)&qla_board_tbl[ISP22XX_BRD_INDEX],
++	},
++#endif
++
++#if defined(ISP2300)
++	{
++		.vendor		= QLA2X00_VENDOR_ID,
++		.device		= QLA2300_DEVICE_ID,
++		.subvendor	= PCI_ANY_ID,
++		.subdevice	= PCI_ANY_ID,
++		.driver_data
++			= (unsigned long)&qla_board_tbl[ISP23XX_BRD_INDEX],
++	},
++
++	{
++		.vendor		= QLA2X00_VENDOR_ID,
++		.device		= QLA2312_DEVICE_ID,
++		.subvendor	= PCI_ANY_ID,
++		.subdevice	= PCI_ANY_ID,
++		.driver_data
++			= (unsigned long)&qla_board_tbl[ISP2312_BRD_INDEX],
++	},
++
++#if defined(ISP2322)
++	{
++		.vendor		= QLA2X00_VENDOR_ID,
++		.device		= QLA2322_DEVICE_ID,
++		.subvendor	= PCI_ANY_ID,
++		.subdevice	= PCI_ANY_ID,
++		.driver_data
++			= (unsigned long)&qla_board_tbl[ISP2322_BRD_INDEX],
++	},
++#endif
++#endif
++	{0 , 0}
++};
++MODULE_DEVICE_TABLE(pci, qla_pci_tbl);
++
++static int __devinit qla_probe_device(struct pci_dev *,
++    const struct pci_device_id *);
++static void __devexit qla_remove_device(struct pci_dev *);
++static void qla2x00_free_device(scsi_qla_host_t *);
++
++struct pci_driver qla_pci_driver = {
++	.name		= DRIVER_NAME,
++	.id_table	= qla_pci_tbl,
++
++	.probe		= qla_probe_device,
++	.remove		= __devexit_p(qla_remove_device),
++};
++
++
++/*
++ * SCSI host template entry points 
++ */
++static int qla2x00_detect(Scsi_Host_Template *);
++static int qla2x00_release(struct Scsi_Host *);
++static const char *qla2x00_info(struct Scsi_Host *);
++static int qla2xxx_slave_configure(Scsi_Device * device);
++static int qla2x00_biosparam(struct scsi_device *,
++    struct block_device *, sector_t, int[]);
++extern int qla2x00_ioctl(Scsi_Device *, int , void *);
++static int qla2xxx_eh_abort(Scsi_Cmnd *);
++static int qla2xxx_eh_device_reset(Scsi_Cmnd *);
++static int qla2xxx_eh_bus_reset(Scsi_Cmnd *);
++static int qla2xxx_eh_host_reset(Scsi_Cmnd *);
++static uint8_t qla2x00_loop_reset(scsi_qla_host_t *ha);
++static int qla2x00_device_reset(scsi_qla_host_t *, uint16_t, uint16_t);
++
++static int qla2x00_proc_info(char *, char **, off_t, int, int, int);
++
++static uint8_t qla2x00_register_with_Linux(scsi_qla_host_t *, uint8_t);
++
++#if defined (CONFIG_SCSIFCHOTSWAP) || defined(CONFIG_GAMAP)
++int qla2x00_get_scsi_info_from_wwn(int mode, unsigned long long wwn, int *host, int *channel, int *lun, int *id);
++int qla2x00_get_wwn_from_scsi_info(int host, int id, unsigned long long *wwn);
++#endif /* CONFIG_SCSIFCHOTSWAP || CONFIG_GAMAP */
++
++#if !defined(MODULE)
++static int __init qla2x00_setup(char *);
++#else
++static void qla2x00_setup(char *);
++#endif
++static char *qla2x00_get_line(char *, char *);
++static int qla2x00_get_tokens(char *, char **, int);
++
++
++static Scsi_Host_Template qla2x00_driver_template = {
++	.module			= THIS_MODULE,
++	.name			= DRIVER_NAME,
++	.proc_name		= DRIVER_NAME,
++	.proc_info		= qla2x00_proc_info,
++	.detect			= qla2x00_detect,
++	.release		= qla2x00_release,
++	.info			= qla2x00_info,
++	.ioctl			= qla2x00_ioctl,
++	.queuecommand		= qla2x00_queuecommand,
++
++	.eh_abort_handler	= qla2xxx_eh_abort,
++	.eh_device_reset_handler = qla2xxx_eh_device_reset,
++	.eh_bus_reset_handler	= qla2xxx_eh_bus_reset,
++	.eh_host_reset_handler	= qla2xxx_eh_host_reset,
++	.bios_param		= qla2x00_biosparam,
++
++	.slave_configure	= qla2xxx_slave_configure,
++
++	.this_id		= -1,
++	.can_queue		= 255,
++	.cmd_per_lun		= 3,
++	.sg_tablesize		= SG_ALL,
++	.use_clustering		= ENABLE_CLUSTERING,
++	.unchecked_isa_dma	= 0,
++	.max_sectors		= 8192,
++	.highmem_io		= 1,
++};
++
++static void qla2x00_display_fc_names(scsi_qla_host_t *);
++
++/* TODO Convert to inlines
++ *
++ * Timer routines
++ */
++#define	WATCH_INTERVAL		1       /* number of seconds */
++
++static void qla2x00_timer(scsi_qla_host_t *);
++
++static __inline__ void qla2x00_start_timer(scsi_qla_host_t *,
++    void *, unsigned long);
++static __inline__ void qla2x00_restart_timer(scsi_qla_host_t *, unsigned long);
++static __inline__ void qla2x00_stop_timer(scsi_qla_host_t *);
++
++static inline void
++qla2x00_start_timer(scsi_qla_host_t *ha, void *func, unsigned long interval)
++{
++	init_timer(&ha->timer);
++	ha->timer.expires = jiffies + interval * HZ;
++	ha->timer.data = (unsigned long)ha;
++	ha->timer.function = (void (*)(unsigned long))func;
++	add_timer(&ha->timer);
++	ha->timer_active = 1;
++}
++
++static inline void
++qla2x00_restart_timer(scsi_qla_host_t *ha, unsigned long interval)
++{
++	mod_timer(&ha->timer, jiffies + interval * HZ);
++}
++
++static __inline__ void
++qla2x00_stop_timer(scsi_qla_host_t *ha)
++{
++	del_timer_sync(&ha->timer);
++	ha->timer_active = 0;
++}
++
++
++static void qla2x00_cmd_timeout(srb_t *sp);
++static __inline__ void qla2x00_add_timer_to_cmd(srb_t *sp, int timeout);
++static __inline__ void qla2x00_delete_timer_from_cmd(srb_t *sp);
++
++/**************************************************************************
++*   qla2x00_add_timer_to_cmd
++*
++* Description:
++*       Creates a timer for the specified command. The timeout is usually
++*       the command time from kernel minus 2 secs.
++*
++* Input:
++*     sp - pointer to validate
++*
++* Returns:
++*     None.
++**************************************************************************/
++static inline void
++qla2x00_add_timer_to_cmd(srb_t *sp, int timeout)
++{
++	init_timer(&sp->timer);
++	sp->timer.expires = jiffies + timeout * HZ;
++	sp->timer.data = (unsigned long) sp;
++	sp->timer.function = (void (*) (unsigned long))qla2x00_cmd_timeout;
++	add_timer(&sp->timer);
++}
++
++/**************************************************************************
++*   qla2x00_delete_timer_from_cmd
++*
++* Description:
++*       Delete the timer for the specified command.
++*
++* Input:
++*     sp - pointer to validate
++*
++* Returns:
++*     None.
++**************************************************************************/
++static inline void 
++qla2x00_delete_timer_from_cmd(srb_t *sp)
++{
++	if (sp->timer.function != NULL) {
++		del_timer(&sp->timer);
++		sp->timer.function =  NULL;
++		sp->timer.data = (unsigned long) NULL;
++	}
++}
++
++static __inline__ void qla2x00_callback(scsi_qla_host_t *, Scsi_Cmnd *);
++static __inline__ void sp_put(struct scsi_qla_host * ha, srb_t *sp);
++static __inline__ void sp_get(struct scsi_qla_host * ha, srb_t *sp);
++static __inline__ void __sp_put(struct scsi_qla_host * ha, srb_t *sp);
++static __inline__ void
++qla2x00_delete_from_done_queue(scsi_qla_host_t *, srb_t *); 
++
++/**************************************************************************
++* sp_put
++*
++* Description:
++*   Decrement reference count and call the callback if we're the last
++*   owner of the specified sp. Will get io_request_lock before calling
++*   the callback.
++*
++* Input:
++*   ha - pointer to the scsi_qla_host_t where the callback is to occur.
++*   sp - pointer to srb_t structure to use.
++*
++* Returns:
++*
++**************************************************************************/
++static inline void
++sp_put(struct scsi_qla_host * ha, srb_t *sp)
++{
++        unsigned long flags;
++
++        if (atomic_read(&sp->ref_count) == 0) {
++		printk(KERN_INFO
++			"%s(): **** SP->ref_count not zero\n",
++			__func__);
++                DEBUG2(BUG();)
++
++                return;
++	}
++
++        if (!atomic_dec_and_test(&sp->ref_count))
++        {
++                return;
++        }
++
++        spin_lock_irqsave(ha->host->host_lock, flags);
++
++        qla2x00_callback(ha, sp->cmd);
++
++        spin_unlock_irqrestore(ha->host->host_lock, flags);
++}
++
++/**************************************************************************
++* sp_get
++*
++* Description:
++*   Increment reference count of the specified sp.
++*
++* Input:
++*   sp - pointer to srb_t structure to use.
++*
++* Returns:
++*
++**************************************************************************/
++static inline void
++sp_get(struct scsi_qla_host * ha, srb_t *sp)
++{
++        atomic_inc(&sp->ref_count);
++
++        if (atomic_read(&sp->ref_count) > 2) {
++		printk(KERN_INFO
++			"%s(): **** SP->ref_count greater than two\n",
++			__func__);
++                DEBUG2(BUG();)
++
++		return;
++	}
++}
++
++/**************************************************************************
++* __sp_put
++*
++* Description:
++*   Decrement reference count and call the callback if we're the last
++*   owner of the specified sp. Will NOT get io_request_lock before calling
++*   the callback.
++*
++* Input:
++*   ha - pointer to the scsi_qla_host_t where the callback is to occur.
++*   sp - pointer to srb_t structure to use.
++*
++* Returns:
++*
++**************************************************************************/
++static inline void
++__sp_put(struct scsi_qla_host * ha, srb_t *sp)
++{
++        if (atomic_read(&sp->ref_count) == 0) {
++		printk(KERN_INFO
++			"%s(): **** SP->ref_count not zero\n",
++			__func__);
++                DEBUG2(BUG();)
++
++		return;
++	}
++
++        if (!atomic_dec_and_test(&sp->ref_count))
++        {
++                return;
++        }
++
++        qla2x00_callback(ha, sp->cmd);
++}
++
++
++/*
++* qla2x00_callback
++*      Returns the completed SCSI command to LINUX.
++*
++* Input:
++*	ha -- Host adapter structure
++*	cmd -- SCSI mid-level command structure.
++* Returns:
++*      None
++* Note:From failover point of view we always get the sp
++*      from vis_ha pool in queuecommand.So when we put it 
++*      back to the pool it has to be the vis_ha.	 
++*      So rely on Scsi_Cmnd to get the vis_ha and not on sp. 		 	
++*/
++static inline void
++qla2x00_callback(scsi_qla_host_t *ha, Scsi_Cmnd *cmd)
++{
++	srb_t *sp = (srb_t *) CMD_SP(cmd);
++	scsi_qla_host_t *vis_ha;
++	os_lun_t *lq;
++	int got_sense;
++	unsigned long	cpu_flags = 0;
++
++	ENTER(__func__);
++
++	CMD_HANDLE(cmd) = (unsigned char *) NULL;
++	vis_ha = (scsi_qla_host_t *) cmd->device->host->hostdata;
++
++	if (sp == NULL) {
++		printk(KERN_INFO
++			"%s(): **** CMD derives a NULL SP\n",
++			__func__);
++                DEBUG2(BUG();)
++		return;
++	}
++
++	/*
++	 * If command status is not DID_BUS_BUSY then go ahead and freed sp.
++	 */
++	/*
++	 * Cancel command timeout
++	 */
++	qla2x00_delete_timer_from_cmd(sp);
++
++	/*
++	 * Put SP back in the free queue
++	 */
++	sp->cmd   = NULL;
++	CMD_SP(cmd) = NULL;
++	lq = sp->lun_queue;
++	got_sense = (sp->flags & SRB_GOT_SENSE)? 1: 0;
++	add_to_free_queue(vis_ha, sp);
++
++	if ((CMD_RESULT(cmd)>>16) == DID_OK) {
++		/* device ok */
++		ha->total_bytes += cmd->bufflen;
++		if (!got_sense) {
++			/* If lun was suspended then clear retry count */
++			spin_lock_irqsave(&lq->q_lock, cpu_flags);
++			if (!test_bit(LUN_EXEC_DELAYED, &lq->q_flag))
++				lq->q_state = LUN_STATE_READY;
++			spin_unlock_irqrestore(&lq->q_lock, cpu_flags);
++		}
++	} else if ((CMD_RESULT(cmd)>>16) == DID_ERROR) {
++		/* device error */
++		ha->total_dev_errs++;
++	}
++
++	if (cmd->flags & IS_RESETTING) {
++		CMD_RESULT(cmd) = (int)DID_RESET << 16;
++	}
++
++	/* Call the mid-level driver interrupt handler */
++	(*(cmd)->scsi_done)(cmd);
++
++	LEAVE(__func__);
++}
++
++static inline void 
++qla2x00_delete_from_done_queue(scsi_qla_host_t *dest_ha, srb_t *sp) 
++{
++	/* remove command from done list */
++	list_del_init(&sp->list);
++	dest_ha->done_q_cnt--;
++	sp->state = SRB_NO_QUEUE_STATE;
++
++	if (sp->flags & SRB_DMA_VALID) {
++		sp->flags &= ~SRB_DMA_VALID;
++
++		/* Release memory used for this I/O */
++		if (sp->cmd->use_sg) {
++			pci_unmap_sg(dest_ha->pdev,
++					sp->cmd->request_buffer,
++					sp->cmd->use_sg,
++					scsi_to_pci_dma_dir(
++						sp->cmd->sc_data_direction));
++		} else if (sp->cmd->request_bufflen) {
++			pci_unmap_page(dest_ha->pdev,
++					sp->saved_dma_handle,
++					sp->cmd->request_bufflen,
++					scsi_to_pci_dma_dir(
++						sp->cmd->sc_data_direction));
++		}
++	}
++}
++
++static int qla2x00_do_dpc(void *data);
++static uint8_t qla2x00_check_for_devices_online(scsi_qla_host_t *);
++
++static void qla2x00_rst_aen(scsi_qla_host_t *);
++static void qla2x00_done_work(void *);
++
++static void qla2x00_process_failover(scsi_qla_host_t *);
++
++static uint8_t qla2x00_mem_alloc(scsi_qla_host_t *);
++static void qla2x00_mem_free(scsi_qla_host_t *ha);
++uint8_t qla2x00_allocate_sp_pool( scsi_qla_host_t *ha);
++void qla2x00_free_sp_pool(scsi_qla_host_t *ha);
++
++
++static int apidev_init(struct Scsi_Host *);
++static int apidev_cleanup(void);
++static int apidev_open(struct inode *, struct file *);
++static int apidev_close(struct inode *, struct file *);
++static int apidev_ioctl(struct inode *,
++    struct file *, unsigned int, unsigned long arg);
++
++/*************************************************************************
++*   qla2x00_set_info
++*
++* Description:
++*   Set parameters for the driver from the /proc filesystem.
++*
++* Returns:
++*************************************************************************/
++int
++qla2x00_set_info(char *buffer, int length, struct Scsi_Host *shost)
++{
++	return (-ENOSYS);  /* Currently this is a no-op */
++}
++
++/**************************************************************************
++* qla2x00_detect
++*
++* Description:
++*    This routine will probe for Qlogic FC SCSI host adapters.
++*    It returns the number of host adapters of a particular
++*    type that were found.	 It also initialize all data necessary for
++*    the driver.  It is passed-in the host number, so that it
++*    knows where its first entry is in the scsi_hosts[] array.
++*
++* Input:
++*     template - pointer to SCSI template
++*
++* Returns:
++*  num - number of host adapters found.
++**************************************************************************/
++int
++qla2x00_detect(Scsi_Host_Template *template)
++{
++#if defined(MODULE)
++	DEBUG2(printk("DEBUG: qla2x00_set_info() starts at address = %p\n",
++	    qla2x00_set_info));
++	printk(KERN_INFO
++	    "qla2x00_set_info() starts at address = %p\n",
++	    qla2x00_set_info);
++
++	/*
++	 * If we are called as a module, the qla2100 pointer may not be null
++	 * and it would point to our bootup string, just like on the lilo
++	 * command line.  IF not NULL, then process this config string with
++	 * qla2x00_setup
++	 *
++	 * Boot time Options To add options at boot time add a line to your
++	 * lilo.conf file like:
++	 * append="qla2100=verbose,tag_info:{{32,32,32,32},{32,32,32,32}}"
++	 * which will result in the first four devices on the first two
++	 * controllers being set to a tagged queue depth of 32.
++	 */
++	if (ql2xopts)
++		qla2x00_setup(ql2xopts);
++	if (dummy_buffer[0] != 'P')
++		printk(KERN_WARNING
++		    "qla2x00: Please read the file "
++		    "/usr/src/linux/drivers/scsi/README.qla2x00\n"
++		    "qla2x00: to see the proper way to specify options to "
++		    "the qla2x00 module\n"
++		    "qla2x00: Specifically, don't use any commas when passing "
++		    "arguments to\n"
++		    "qla2x00: insmod or else it might trash certain memory "
++		    "areas.\n");
++#endif
++
++	rwlock_init(&qla_hostlist_lock);
++	INIT_LIST_HEAD(&qla_hostlist);
++
++	pci_module_init(&qla_pci_driver);
++
++	return (num_hosts);
++}
++
++/**************************************************************************
++*   qla2x00_register_with_Linux
++*
++* Description:
++*   Free the passed in Scsi_Host memory structures prior to unloading the
++*   module.
++*
++* Input:
++*     ha - pointer to host adapter structure
++*     maxchannels - MAX number of channels.
++*
++* Returns:
++*  0 - Sucessfully reserved resources.
++*  1 - Failed to reserved a resource.
++**************************************************************************/
++static uint8_t
++qla2x00_register_with_Linux(scsi_qla_host_t *ha, uint8_t maxchannels)
++{
++	struct Scsi_Host *host = ha->host;
++
++	host->can_queue = max_srbs;  /* default value:-MAX_SRBS(4096)  */
++	host->cmd_per_lun = 3;
++	host->max_cmd_len = MAX_CMDSZ;
++
++#if defined (CONFIG_SCSIFCHOTSWAP) || defined(CONFIG_GAMAP)
++	host->hostt->get_scsi_info_from_wwn = qla2x00_get_scsi_info_from_wwn;
++	host->hostt->get_wwn_from_scsi_info = qla2x00_get_wwn_from_scsi_info;
++#endif /* CONFIG_SCSIFCHOTSWAP || CONFIG_GAMAP */
++
++	host->n_io_port = 0xFF;
++
++#if MEMORY_MAPPED_IO
++	host->base = (unsigned long)ha->mmpbase;
++#else
++	host->base = 0;
++#endif
++
++	host->max_channel = maxchannels;
++	host->max_lun = ha->max_luns;
++	host->unique_id = ha->instance;
++	host->max_id = ha->max_targets;
++
++	/* set our host ID  (need to do something about our two IDs) */
++	host->this_id = 255;
++
++#if defined(CONFIG_MD_MULTIHOST_FC)
++	{
++		unsigned long   i;
++		unsigned long   j;
++
++		union {
++			__u64   identifier;
++			char    wwn[WWN_SIZE];
++		} foo;
++
++		for (i = 0, j = WWN_SIZE-1; i < WWN_SIZE; i++, j--) {
++			foo.wwn[i] = ha->init_cb->port_name[j];
++		}
++
++		host->fc_wwn = foo.identifier;
++	}
++#endif /* CONFIG_MD_MULTIHOST_FC */
++
++	/* Register the I/O space with Linux */
++	if (request_region(host->io_port, 0xff, DRIVER_NAME) == 0) {
++		printk(KERN_WARNING
++		    "scsi(%ld): Failed to reserved i/o base region "
++		    "0x%04lx-0x%04lx already in use\n",
++		    ha->host_no,
++		    host->io_port, host->io_port + 0xff);
++		return 1;
++	}
++
++	/* Register the IRQ with Linux (sharable) */
++	if (request_irq(host->irq, qla2x00_intr_handler,
++	    SA_INTERRUPT|SA_SHIRQ, DRIVER_NAME, ha)) {
++		printk(KERN_WARNING
++		    "scsi(%ld): Failed to reserve interrupt %d already in "
++		    "use\n",
++		    ha->host_no, host->irq);
++		release_region(host->io_port, 0xff);
++		return 1;
++	}
++
++	/* Initialized the timer */
++	qla2x00_start_timer(ha, qla2x00_timer, WATCH_INTERVAL);
++
++	return 0;
++}
++
++
++/**************************************************************************
++*   qla2x00_release
++*
++* Description:
++*   Free the passed in Scsi_Host memory structures prior to unloading the
++*   module.
++*
++* Input:
++*     ha - pointer to host adapter structure
++*
++* Returns:
++*  0 - Always returns good status
++**************************************************************************/
++int
++qla2x00_release(struct Scsi_Host *host)
++{
++	scsi_qla_host_t *ha;
++
++	if (host != NULL) {
++		ha = (scsi_qla_host_t *)host->hostdata;
++		list_del(&ha->list);
++		qla2x00_free_device(ha);
++	}
++
++	if (list_empty(&qla_hostlist))
++		pci_unregister_driver(&qla_pci_driver);
++
++	return 0;
++}
++
++/**************************************************************************
++*   qla2x00_info
++*
++* Description:
++*
++* Input:
++*     host - pointer to Scsi host adapter structure
++*
++* Returns:
++*     Return a text string describing the driver.
++**************************************************************************/
++const char *
++qla2x00_info(struct Scsi_Host *host)
++{
++	static char qla2x00_buffer[255];
++	char *bp;
++	scsi_qla_host_t *ha;
++
++	/*
++	 * We must create the api node here instead of qla2x00_detect since we
++	 * want the api node to be subdirectory of /proc/scsi/qla2x00 which
++	 * will not have been created when qla2x00_detect exits, but which will
++	 * have been created by this point.
++	 */
++	apidev_init(host);
++
++	bp = &qla2x00_buffer[0];
++	ha = (scsi_qla_host_t *)host->hostdata;
++	memset(bp, 0, sizeof(qla2x00_buffer));
++
++	sprintf(bp,
++	    "QLogic %sPCI to Fibre Channel Host Adapter: bus %d device %d "
++	    "irq %d\n        Firmware version: %2d.%02d.%02d, "
++	    "Driver version %s\n",
++	    ha->brd_info->name,
++	    ha->pdev->bus->number,
++	    PCI_SLOT(ha->pdev->devfn),
++	    host->irq,
++	    ha->fw_major_version, 
++	    ha->fw_minor_version, 
++	    ha->fw_subminor_version,
++	    qla2x00_version_str);
++
++	return bp;
++}
++
++/**************************************************************************
++* qla2x00_queuecommand
++*
++* Description:
++*     Queue a command to the controller.
++*
++* Input:
++*     cmd - pointer to Scsi cmd structure
++*     fn - pointer to Scsi done function
++*
++* Returns:
++*   0 - Always
++*
++* Note:
++* The mid-level driver tries to ensures that queuecommand never gets invoked
++* concurrently with itself or the interrupt handler (although the
++* interrupt handler may call this routine as part of request-completion
++* handling).
++**************************************************************************/
++int
++qla2x00_queuecommand(Scsi_Cmnd *cmd, void (*fn)(Scsi_Cmnd *))
++{
++	fc_port_t	*fcport;
++	os_lun_t	*lq;
++	os_tgt_t	*tq;
++	scsi_qla_host_t	*ha, *ha2;
++	srb_t		*sp;
++	struct Scsi_Host *host;
++	uint32_t	b, t, l;
++#if  BITS_PER_LONG <= 32
++	uint32_t	handle;
++#else
++	u_long		handle;
++#endif
++
++	ENTER(__func__);
++
++	host = cmd->device->host;
++	ha = (scsi_qla_host_t *) host->hostdata;
++
++	cmd->scsi_done = fn;
++
++	spin_unlock(ha->host->host_lock);
++
++	/*
++	 * Allocate a command packet from the "sp" pool.  If we cant get back
++	 * one then let scsi layer come back later.
++	 */
++	if ((sp = qla2x00_get_new_sp(ha)) == NULL) {
++		printk(KERN_WARNING
++		    "scsi(%ld): Couldn't allocate memory for sp - retried.\n",
++		    ha->host_no);
++
++		spin_lock_irq(ha->host->host_lock);
++
++		LEAVE(__func__);
++		return (1);
++	}
++
++	sp->cmd = cmd;
++	CMD_SP(cmd) = (void *)sp;
++
++	sp->flags = 0;
++	if (CMD_RESID_LEN(cmd) & SRB_IOCTL) {
++		/* Need to set sp->flags */
++		sp->flags |= SRB_IOCTL;
++		CMD_RESID_LEN(cmd) = 0; /* Clear it since no more use. */
++	}
++
++	sp->fo_retry_cnt = 0;
++#if defined(IOCB_THROLLE_USAGE)
++	sp->iocb_cnt = 0;
++#endif
++
++	if (cmd->allowed < ql2xretrycount) {
++		cmd->allowed = ql2xretrycount;
++	}
++
++	/* Generate LU queue on bus, target, LUN */
++	b = SCSI_BUS_32(cmd);
++	t = SCSI_TCN_32(cmd);
++	l = SCSI_LUN_32(cmd);
++
++	/*
++	 * Start Command Timer. Typically it will be 2 seconds less than what
++	 * is requested by the Host such that we can return the IO before
++	 * aborts are called.
++	 */
++	if ((CMD_TIMEOUT(cmd)/HZ) > QLA_CMD_TIMER_DELTA)
++		qla2x00_add_timer_to_cmd(sp,
++		    (CMD_TIMEOUT(cmd)/HZ) - QLA_CMD_TIMER_DELTA);
++	else
++		qla2x00_add_timer_to_cmd(sp, (CMD_TIMEOUT(cmd)/HZ));
++
++	if (l >= ha->max_luns) {
++		CMD_RESULT(cmd) = DID_NO_CONNECT << 16;
++
++		spin_lock_irq(ha->host->host_lock);
++
++		__sp_put(ha, sp);
++		LEAVE(__func__);
++
++		return (0);
++	}
++
++	if ((tq = (os_tgt_t *) TGT_Q(ha, t)) != NULL &&
++		(lq = (os_lun_t *) LUN_Q(ha, t, l)) != NULL ) {
++
++		fcport = lq->fclun->fcport;
++		ha2 = fcport->ha;
++	} else {
++		lq = NULL;
++		fcport = NULL;
++		ha2 = ha;
++	}
++
++	/* Set an invalid handle until we issue the command to ISP */
++	/* then we will set the real handle value.                 */
++	handle = INVALID_HANDLE;
++	CMD_HANDLE(cmd) = (unsigned char *)handle;
++
++	/* Bookkeeping information */
++	sp->r_start = jiffies;       /* time the request was recieved */
++	sp->u_start = 0;
++
++	/* Setup device queue pointers. */
++	sp->tgt_queue = tq;
++	sp->lun_queue = lq;
++
++	/*
++	 * NOTE : q is NULL
++	 *
++	 * 1. When device is added from persistent binding but has not been
++	 *    discovered yet.The state of loopid == PORT_AVAIL.
++	 * 2. When device is never found on the bus.(loopid == UNUSED)
++	 *
++	 * IF Device Queue is not created, or device is not in a valid state
++	 * and link down error reporting is enabled, reject IO.
++	 */
++	if (fcport == NULL) {
++		DEBUG3(printk("scsi(%ld:%2d:%2d): port unavailable\n",
++		    ha->host_no,t,l));
++
++		CMD_RESULT(cmd) = DID_NO_CONNECT << 16;
++
++		spin_lock_irq(ha->host->host_lock);
++
++		__sp_put(ha, sp);
++
++		return (0);
++	}
++
++	DEBUG5(printk("scsi(%ld:%2d:%2d): (queuecmd) queue sp = %p, "
++	    "flags=0x%x fo retry=%d, pid=%ld, cmd flags= 0x%x\n",
++	    ha->host_no,
++	    t, l,
++	    sp, sp->flags, sp->fo_retry_cnt,
++	    cmd->serial_number,cmd->flags));
++	DEBUG5(qla2x00_print_scsi_cmd(cmd));
++
++	sp->flags &= ~SRB_ISP_COMPLETED;
++
++	sp->fclun = lq->fclun;
++	sp->ha = ha2;
++
++	sp->cmd_length = CMD_CDBLEN(cmd);
++
++	if (cmd->sc_data_direction == SCSI_DATA_UNKNOWN &&
++	    cmd->request_bufflen != 0) {
++
++		DEBUG2(printk(KERN_WARNING
++		    "scsi(%ld): Incorrect data direction - transfer "
++		    "length=%d, direction=%d, pid=%ld, opcode=%x\n",
++		    ha->host_no,
++		    cmd->request_bufflen,
++		    cmd->sc_data_direction,
++		    cmd->serial_number,
++		    cmd->cmnd[0]));
++	}
++
++	/* Final pre-check */
++	if (atomic_read(&fcport->state) == FC_DEVICE_DEAD) {
++		/*
++		 * Add the command to the done-queue for later failover
++		 * processing
++		 */
++		CMD_RESULT(cmd) = DID_NO_CONNECT << 16;
++		add_to_done_queue(ha, sp);
++		schedule_work(&ha->run_qla_task);
++
++		spin_lock_irq(ha->host->host_lock);
++		return (0);
++	}
++
++	add_to_pending_queue(ha, sp);
++
++	/* First start cmds for this lun if possible */
++	qla2x00_next(ha);
++
++	spin_lock_irq(ha->host->host_lock);
++
++	LEAVE(__func__);
++	return (0);
++}
++
++/*
++ * qla2x00_eh_wait_on_command
++ *    Waits for the command to be returned by the Firmware for some
++ *    max time.
++ *
++ * Input:
++ *    ha = actual ha whose done queue will contain the command
++ *	      returned by firmware.
++ *    cmd = Scsi Command to wait on.
++ *    flag = Abort/Reset(Bus or Device Reset)
++ *
++ * Return:
++ *    Not Found : 0
++ *    Found : 1
++ */
++static int
++qla2x00_eh_wait_on_command(scsi_qla_host_t *ha, Scsi_Cmnd *cmd)
++{
++#define ABORT_WAIT_TIME	10 /* seconds */
++#define EH_ACTIVE       1  /* Error Handler Active */	
++
++	int		found = 0;
++	int		done = 0;
++	srb_t		*rp;
++	struct list_head *list, *temp;
++	u_long		cpu_flags = 0;
++	u_long		max_wait_time = ABORT_WAIT_TIME;
++
++	ENTER(__func__);
++
++	do {
++		/* Check on done queue */
++		if (!found) {
++			spin_lock_irqsave(&ha->list_lock, cpu_flags);
++			list_for_each_safe(list, temp, &ha->done_queue) {
++				rp = list_entry(list, srb_t, list);
++
++				/*
++				* Found command.  Just exit and wait for the
++				* cmd sent to OS.
++			 	*/
++				if (cmd == rp->cmd) {
++					found++;
++					DEBUG3(printk("%s: found in done "
++							"queue.\n", __func__);)
++					break;
++				}
++			}
++			spin_unlock_irqrestore(&ha->list_lock, cpu_flags);
++		}
++
++		/* Checking to see if its returned to OS */
++		rp = (srb_t *) CMD_SP(cmd);
++		if (rp == NULL ) {
++			done++;
++			break;
++		}
++
++		spin_unlock_irq(ha->host->host_lock);
++
++		set_current_state(TASK_INTERRUPTIBLE);
++		schedule_timeout(2*HZ);
++
++		spin_lock_irq(ha->host->host_lock);
++
++	} while ((max_wait_time--));
++
++	DEBUG2(if (done))
++	DEBUG2(printk("%s: found cmd=%p.\n", __func__, cmd);)
++
++	LEAVE(__func__);
++
++	return(done);
++}
++
++/**************************************************************************
++* qla2xxx_eh_abort
++*
++* Description:
++*    The abort function will abort the specified command.
++*
++* Input:
++*    cmd = Linux SCSI command packet to be aborted.
++*
++* Returns:
++*    Either SUCCESS or FAILED.
++*
++* Note:
++**************************************************************************/
++int
++qla2xxx_eh_abort(Scsi_Cmnd *cmd)
++{
++	int		i;
++	int		return_status = FAILED;
++	os_lun_t	*q;
++	scsi_qla_host_t *ha;
++	scsi_qla_host_t *vis_ha;
++	srb_t		*sp;
++	srb_t		*rp;
++	struct list_head *list, *temp;
++	struct Scsi_Host *host;
++	uint8_t		found = 0;
++	uint32_t	b, t, l;
++	unsigned long	flags;
++
++
++	ENTER("qla2xxx_eh_abort");
++
++	/* Get the SCSI request ptr */
++	sp = (srb_t *) CMD_SP(cmd);
++
++	/*
++	 * If sp is NULL, command is already returned.
++	 * sp is NULLed just before we call back scsi_done
++	 *
++	 */
++	if ((sp == NULL)) {
++		/* no action - we don't have command */
++		DEBUG(printk("qla2xxx_eh_abort: cmd already done sp=%p\n",sp);)
++		return(SUCCESS);
++	}
++	if (sp) {
++		DEBUG(printk("qla2xxx_eh_abort: refcount %i \n",
++		    atomic_read(&sp->ref_count));)
++	}
++
++	vis_ha = (scsi_qla_host_t *) cmd->device->host->hostdata;
++	vis_ha->eh_start=0;
++	if (vis_ha->flags.failover_enabled)
++		/* Get Actual HA pointer */
++		ha = (scsi_qla_host_t *)sp->ha;
++	else
++		ha = (scsi_qla_host_t *)cmd->device->host->hostdata;
++
++	host = ha->host;
++
++	/* Generate LU queue on bus, target, LUN */
++	b = SCSI_BUS_32(cmd);
++	t = SCSI_TCN_32(cmd);
++	l = SCSI_LUN_32(cmd);
++	q = GET_LU_Q(vis_ha, t, l);
++
++	/*
++	 * if no LUN queue then something is very wrong!!!
++	 */
++	if (q == NULL) {
++		printk(KERN_WARNING
++			"qla2x00: (%x:%x:%x) No LUN queue.\n", b, t, l);
++
++		/* no action - we don't have command */
++		return(FAILED);
++	}
++
++	DEBUG2(printk("scsi(%ld): ABORTing cmd=%p sp=%p jiffies = 0x%lx, "
++	    "timeout=%x, dpc_flags=%lx, vis_ha->dpc_flags=%lx\n",
++	    ha->host_no,
++	    cmd,
++	    sp,
++	    jiffies,
++	    CMD_TIMEOUT(cmd)/HZ,
++	    ha->dpc_flags,
++	    vis_ha->dpc_flags);)
++	DEBUG2(qla2x00_print_scsi_cmd(cmd));
++	DEBUG2(qla2x00_print_q_info(q);)
++
++	/* Search done queue */
++	spin_lock_irqsave(&ha->list_lock,flags);
++	list_for_each_safe(list, temp, &ha->done_queue) {
++		rp = list_entry(list, srb_t, list);
++
++		if (cmd != rp->cmd)
++			continue;
++
++		/*
++		 * Found command. No need to remove command from done list.
++		 * Just proceed to call done.
++		 */
++		return_status = SUCCESS;
++		found++;
++		qla2x00_delete_from_done_queue(ha, sp);
++
++		break;
++	} /* list_for_each_safe() */
++	spin_unlock_irqrestore(&ha->list_lock, flags);
++
++	/*
++	 * Return immediately if the aborted command was already in the done
++	 * queue
++	 */
++	if (found) {
++		printk(KERN_INFO "qla2xxx_eh_abort: Returning completed "
++			"command=%p sp=%p\n", cmd, sp);
++		__sp_put(ha, sp);
++		return (return_status);
++	}
++	
++
++	/*
++	 * See if this command is in the retry queue
++	 */
++	if (!found) {
++		DEBUG3(printk("qla2xxx_eh_abort: searching sp %p "
++		    "in retry queue.\n", sp);)
++
++		spin_lock_irqsave(&ha->list_lock, flags);
++		list_for_each_safe(list, temp, &ha->retry_queue) {
++			rp = list_entry(list, srb_t, list);
++
++			if (cmd != rp->cmd)
++				continue;
++
++
++			DEBUG2(printk("qla2xxx_eh_abort: found "
++			    "in retry queue. SP=%p\n", sp);)
++
++			__del_from_retry_queue(ha, rp);
++			CMD_RESULT(rp->cmd) = DID_ABORT << 16;
++			__add_to_done_queue(ha, rp);
++
++			return_status = SUCCESS;
++			found++;
++
++			break;
++
++		} /* list_for_each_safe() */
++		spin_unlock_irqrestore(&ha->list_lock, flags);
++	}
++
++	/*
++	 * Search failover queue
++	 */
++	if (ha->flags.failover_enabled) {
++		if (!found) {
++			DEBUG3(printk("qla2xxx_eh_abort: searching sp %p "
++					"in failover queue.\n", sp);)
++
++			spin_lock_irqsave(&ha->list_lock, flags);
++			list_for_each_safe(list, temp, &ha->failover_queue) {
++				rp = list_entry(list, srb_t, list);
++
++				if (cmd != rp->cmd)
++					continue;
++
++				DEBUG2(printk(KERN_WARNING
++						"qla2xxx_eh_abort: found "
++						"in failover queue. SP=%p\n",
++						sp);)
++
++				/* Remove srb from failover queue. */
++				__del_from_failover_queue(ha, rp);
++				CMD_RESULT(rp->cmd) = DID_ABORT << 16;
++				__add_to_done_queue(ha, rp);
++
++				return_status = SUCCESS;
++				found++;
++
++				break;
++
++			} /* list_for_each_safe() */
++			spin_unlock_irqrestore(&ha->list_lock, flags);
++		} /*End of if !found */
++	}
++
++	/*
++	 * Our SP pointer points at the command we want to remove from the
++	 * pending queue providing we haven't already sent it to the adapter.
++	 */
++	if (!found) {
++		DEBUG3(printk("qla2xxx_eh_abort: searching sp %p "
++		    "in pending queue.\n", sp);)
++
++		spin_lock_irqsave(&vis_ha->list_lock, flags);
++		list_for_each_safe(list, temp, &vis_ha->pending_queue) {
++			rp = list_entry(list, srb_t, list);
++			if (rp->cmd != cmd)
++				continue;
++
++			/* Remove srb from LUN queue. */
++			rp->flags |=  SRB_ABORTED;
++
++			DEBUG2(printk("qla2xxx_eh_abort: Cmd in pending queue."
++			    " serial_number %ld.\n",
++			    sp->cmd->serial_number);)
++
++			__del_from_pending_queue(vis_ha, rp);
++			CMD_RESULT(cmd) = DID_ABORT << 16;
++
++			__add_to_done_queue(vis_ha, rp);
++
++			return_status = SUCCESS;
++
++			found++;
++			break;
++		} /* list_for_each_safe() */
++		spin_unlock_irqrestore(&vis_ha->list_lock, flags);
++	} /*End of if !found */
++
++	if (!found) {  /* find the command in our active list */
++		DEBUG3(printk("qla2xxx_eh_abort: searching sp %p "
++		    "in outstanding queue.\n", sp);)
++
++		spin_lock_irqsave(&ha->hardware_lock, flags);
++		for (i = 1; i < MAX_OUTSTANDING_COMMANDS; i++) {
++			sp = ha->outstanding_cmds[i];
++
++			if (sp == NULL)
++				continue;
++
++			if (sp->cmd != cmd)
++				continue;
++
++
++			DEBUG2(printk("qla2xxx_eh_abort(%ld): aborting sp %p "
++			    "from RISC. pid=%d sp->state=%x\n",
++			    ha->host_no, 
++			    sp, 
++			    (int)sp->cmd->serial_number,
++			    sp->state);)
++			DEBUG(qla2x00_print_scsi_cmd(cmd);)
++			DEBUG(qla2x00_print_q_info(q);)
++
++			/* Get a reference to the sp and drop the lock.*/
++			sp_get(ha,sp);
++
++			spin_unlock_irqrestore(&ha->hardware_lock, flags);
++			spin_unlock(ha->host->host_lock);
++
++			if (qla2x00_abort_command(ha, sp)) {
++				DEBUG2(printk("qla2xxx_eh_abort: abort_command "
++				    "mbx failed.\n");)
++				return_status = FAILED;
++			} else {
++				DEBUG3(printk("qla2xxx_eh_abort: abort_command "
++				    " mbx success.\n");)
++				return_status = SUCCESS;
++			}
++
++			sp_put(ha,sp);
++
++			spin_lock_irq(ha->host->host_lock);
++			spin_lock_irqsave(&ha->hardware_lock, flags);
++
++			/*
++			 * Regardless of mailbox command status, go check on
++			 * done queue just in case the sp is already done.
++			 */
++			break;
++
++		}/*End of for loop */
++		spin_unlock_irqrestore(&ha->hardware_lock, flags);
++
++	} /*End of if !found */
++
++	  /*Waiting for our command in done_queue to be returned to OS.*/
++	if (qla2x00_eh_wait_on_command(ha, cmd) != 0) {
++		DEBUG2(printk("qla2xxx_eh_abort: cmd returned back to OS.\n");)
++		return_status = SUCCESS;
++	}
++
++	if (return_status == FAILED) {
++		printk(KERN_INFO "qla2xxx_eh_abort Exiting: status=Failed\n");
++		return FAILED;
++	}
++
++	DEBUG(printk("qla2xxx_eh_abort: Exiting. return_status=0x%x.\n",
++	    return_status));
++
++	LEAVE("qla2xxx_eh_abort");
++
++	return(return_status);
++}
++
++/**************************************************************************
++* qla2x00_eh_wait_for_pending_target_commands
++*
++* Description:
++*    Waits for all the commands to come back from the specified target.
++*
++* Input:
++*    ha - pointer to scsi_qla_host structure.
++*    t  - target 	
++* Returns:
++*    Either SUCCESS or FAILED.
++*
++* Note:
++**************************************************************************/
++int
++qla2x00_eh_wait_for_pending_target_commands(scsi_qla_host_t *ha, int t)
++{
++	int	cnt;
++	int	status;
++	unsigned long	flags;
++	srb_t		*sp;
++	Scsi_Cmnd	*cmd;
++
++	status = 0;
++
++	/*
++	 * Waiting for all commands for the designated target in the active
++	 * array
++	 */
++	for (cnt = 1; cnt < MAX_OUTSTANDING_COMMANDS; cnt++) {
++		spin_lock_irqsave(&ha->hardware_lock, flags);
++		sp = ha->outstanding_cmds[cnt];
++		if (sp) {
++			cmd = sp->cmd;
++			spin_unlock_irqrestore(&ha->hardware_lock, flags);
++			if (SCSI_TCN_32(cmd) == t) {
++				qla2x00_eh_wait_on_command(ha, cmd);
++			}
++		}
++		else {
++			spin_unlock_irqrestore(&ha->hardware_lock, flags);
++		}
++	}
++	return (status);
++}
++
++
++/**************************************************************************
++* qla2xxx_eh_device_reset
++*
++* Description:
++*    The device reset function will reset the target and abort any
++*    executing commands.
++*
++*    NOTE: The use of SP is undefined within this context.  Do *NOT*
++*          attempt to use this value, even if you determine it is 
++*          non-null.
++*
++* Input:
++*    cmd = Linux SCSI command packet of the command that cause the
++*          bus device reset.
++*
++* Returns:
++*    SUCCESS/FAILURE (defined as macro in scsi.h).
++*
++**************************************************************************/
++int
++qla2xxx_eh_device_reset(Scsi_Cmnd *cmd)
++{
++	int		return_status = SUCCESS;
++	uint32_t	b, t, l;
++	scsi_qla_host_t	*ha;
++
++#if defined(LOGOUT_AFTER_DEVICE_RESET)
++	os_lun_t	*lq;
++	fc_port_t	*fcport;
++#endif
++
++	ENTER(__func__);
++
++	if (cmd == NULL) {
++		printk(KERN_INFO
++			"%s(): **** SCSI mid-layer passing in NULL cmd\n",
++			__func__);
++                DEBUG2(BUG();)
++
++		return (FAILED);
++	}
++
++	/* Verify the device exists. */
++	ha = (scsi_qla_host_t *)cmd->device->host->hostdata;
++	ha->eh_start = 0;
++	b = SCSI_BUS_32(cmd);
++	t = SCSI_TCN_32(cmd);
++	l = SCSI_LUN_32(cmd);
++	if (TGT_Q(ha, t) == NULL) {
++		printk(KERN_INFO
++			"%s(): **** CMD derives a NULL TGT_Q\n",
++			__func__);
++                DEBUG2(BUG();)
++
++		return (FAILED);
++	}
++
++	ha = (scsi_qla_host_t *)cmd->device->host->hostdata;
++
++#if STOP_ON_RESET
++	printk(debug_buff,"Resetting Device= 0x%x\n", (int)cmd);
++/* WE SHOULD NOT call this function, since it dereferences SP */
++ 	//qla2x00_print_scsi_cmd(cmd);
++	qla2x00_panic(__func__, ha->host);
++#endif
++
++	if (qla2x00_verbose)
++		printk(KERN_INFO
++			"scsi(%ld:%d:%d:%d): DEVICE RESET ISSUED.\n",
++			ha->host_no, (int)b, (int)t, (int)l);
++
++	DEBUG2(printk("scsi(%ld): DEVICE_RESET cmd=%p jiffies = 0x%lx, "
++		"timeout=%x, dpc_flags=%lx, status=%x allowed=%d "
++		"cmd.state=%x\n",
++		ha->host_no,
++		cmd,
++		jiffies,
++		CMD_TIMEOUT(cmd)/HZ,
++		ha->dpc_flags,
++		cmd->result,
++		cmd->allowed,
++		cmd->state);)
++/* WE SHOULD NOT call this function, since it dereferences SP */
++	//qla2x00_print_scsi_cmd(cmd);
++
++	if (!((test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)) ||
++		(test_bit(LOOP_RESET_NEEDED, &ha->dpc_flags)) ||
++		(test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags)) ||
++		(!atomic_read(&ha->loop_down_timer) &&
++		 ha->loop_state == LOOP_DOWN)||
++		test_bit(CFG_ACTIVE, &ha->cfg_flags) ||
++		ha->loop_state != LOOP_READY)) {
++
++		clear_bit(DEVICE_RESET_NEEDED, &ha->dpc_flags);
++
++		spin_unlock_irq(ha->host->host_lock);
++
++		if (qla2x00_device_reset(ha, t, l) != 0) {
++			return_status = FAILED;
++		}
++
++#if defined(LOGOUT_AFTER_DEVICE_RESET)
++		if (return_status == SUCCESS) {
++			lq = (os_lun_t *)LUN_Q(ha, t, l);
++			fcport = lq->fclun->fcport;
++
++			if (fcport->flags & FC_FABRIC_DEVICE) {
++				qla2x00_fabric_logout(ha,
++						ha->fc_db[t].loop_id & 0xff);
++				ha->fc_db[t].flag |= DEV_RELOGIN;
++				qla2x00_mark_device_lost(ha, fcport);
++			}
++		}
++#endif
++
++		spin_lock_irq(ha->host->host_lock);
++	} else {
++		/*
++		 * Wait a while for the loop to come back. Return SUCCESS
++		 * for the kernel to try again.
++		 */
++		spin_unlock_irq(ha->host->host_lock);
++
++		set_current_state(TASK_INTERRUPTIBLE);
++		schedule_timeout(5 * HZ);
++
++		spin_lock_irq(ha->host->host_lock);
++
++		return_status = SUCCESS;
++	}
++
++	if (return_status == FAILED) {
++		DEBUG2(printk("%s() Exiting: Reset Failed\n", __func__);)
++		return (FAILED);
++	}
++
++	/* Waiting for all commands to complete for the device */
++	if (qla2x00_eh_wait_for_pending_target_commands(ha, t))
++		return_status = FAILED;
++
++	if (return_status == FAILED) {
++		printk(KERN_INFO "%s() Exiting: status = Failed\n", __func__);
++		return (FAILED);
++	}
++
++	LEAVE(__func__);
++
++	return (return_status);
++}
++
++/**************************************************************************
++* qla2x00_eh_wait_for_pending_commands
++*
++* Description:
++*    Waits for all the commands to come back from the specified host.
++*
++* Input:
++*    ha - pointer to scsi_qla_host structure.
++*
++* Returns:
++*    1 : SUCCESS
++*    0 : FAILED
++*
++* Note:
++**************************************************************************/
++int
++qla2x00_eh_wait_for_pending_commands(scsi_qla_host_t *ha)
++{
++	int	cnt;
++	int	status;
++	unsigned long	flags;
++	srb_t		*sp;
++	Scsi_Cmnd	*cmd;
++
++	status = 1;
++
++	/*
++	 * Waiting for all commands for the designated target in the active
++	 * array
++	 */
++	for (cnt = 1; cnt < MAX_OUTSTANDING_COMMANDS; cnt++) {
++		spin_lock_irqsave(&ha->hardware_lock, flags);
++		sp = ha->outstanding_cmds[cnt];
++		if (sp) {
++			cmd = sp->cmd;
++			spin_unlock_irqrestore(&ha->hardware_lock, flags);
++				status = qla2x00_eh_wait_on_command(ha, cmd);
++		}
++		else {
++			spin_unlock_irqrestore(&ha->hardware_lock, flags);
++		}
++	}
++	return (status);
++}
++
++
++/**************************************************************************
++* qla2xxx_eh_bus_reset
++*
++* Description:
++*    The bus reset function will reset the bus and abort any executing
++*    commands.
++*
++* Input:
++*    cmd = Linux SCSI command packet of the command that cause the
++*          bus reset.
++*
++* Returns:
++*    SUCCESS/FAILURE (defined as macro in scsi.h).
++*
++**************************************************************************/
++int
++qla2xxx_eh_bus_reset(Scsi_Cmnd *cmd)
++{
++	int        return_status = SUCCESS;
++	uint32_t   b, t, l;
++	srb_t      *sp;
++	int	found;
++	struct list_head *hal;
++	scsi_qla_host_t *ha, *search_ha;
++
++
++	ENTER("qla2xxx_eh_bus_reset");
++
++	if (cmd == NULL) {
++		printk(KERN_INFO
++			"%s(): **** SCSI mid-layer passing in NULL cmd\n",
++			__func__);
++                DEBUG2(BUG();)
++
++		return (FAILED);
++	}
++
++	b = SCSI_BUS_32(cmd);
++	t = SCSI_TCN_32(cmd);
++	l = SCSI_LUN_32(cmd);
++
++	ha = (scsi_qla_host_t *) cmd->device->host->hostdata;
++	ha->eh_start=0;
++	sp = (srb_t *) CMD_SP(cmd);
++
++	if (ha == NULL) {
++		printk(KERN_INFO
++			"%s(): **** CMD derives a NULL HA\n",
++			__func__);
++                DEBUG2(BUG();)
++
++		return (FAILED);
++	}
++
++	found = 0;
++	read_lock(&qla_hostlist_lock);
++	list_for_each(hal, &qla_hostlist) {
++		search_ha = list_entry(hal, scsi_qla_host_t, list);
++
++		if (search_ha == ha) {
++			found ++;
++			break;
++		}
++	}
++	read_unlock(&qla_hostlist_lock);
++
++	if (!found) {
++		printk(KERN_INFO
++			"%s(): **** CMD derives a NULL search HA\n",
++			__func__);
++                DEBUG2(BUG();)
++
++		return (FAILED);
++	}
++
++#if  STOP_ON_RESET
++	printk("Resetting the Bus= 0x%x\n", (int)cmd);
++	qla2x00_print_scsi_cmd(cmd);
++	qla2x00_panic("qla2100_reset", ha->host);
++#endif
++
++	if (qla2x00_verbose)
++		printk(KERN_INFO
++			"scsi(%ld:%d:%d:%d): LOOP RESET ISSUED.\n",
++			ha->host_no, (int)b, (int)t, (int)l);
++
++	if (!((test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)) ||
++		(test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags)) ||
++		(!atomic_read(&ha->loop_down_timer) &&
++		 ha->loop_state == LOOP_DOWN)||
++		test_bit(CFG_ACTIVE, &ha->cfg_flags) ||
++		ha->loop_state != LOOP_READY)) {
++
++		clear_bit(LOOP_RESET_NEEDED, &ha->dpc_flags);
++		spin_unlock_irq(ha->host->host_lock);
++
++		if (qla2x00_loop_reset(ha) != 0) {
++			return_status = FAILED;
++		}
++		spin_lock_irq(ha->host->host_lock);
++	} else {
++		/*
++		 * Wait a while for the loop to come back. Return SUCCESS
++		 * for the kernel to try again.
++		 */
++		spin_unlock_irq(ha->host->host_lock);
++
++		set_current_state(TASK_INTERRUPTIBLE);
++		schedule_timeout(5 * HZ);
++
++		spin_lock_irq(ha->host->host_lock);
++
++		return_status = SUCCESS;
++	}
++
++	if (return_status == FAILED) {
++		DEBUG2(printk("qla2xxx_eh_bus_reset Exiting: Reset Failed\n");)
++		printk("qla2xxx_eh_bus_reset Exiting: Reset Failed\n");
++		return FAILED;
++	}
++
++	/* Blocking Call. It goes to sleep waiting for cmd to get to done q */
++	 /* Waiting for our command in done_queue to be returned to OS.*/
++
++	if ( qla2x00_eh_wait_for_pending_commands(ha) == 0) {
++		return_status = FAILED;
++	}
++
++	if(return_status == FAILED) {
++		printk(KERN_INFO "qla2xxx_eh_bus_reset Exiting: status=Failed\n");
++		return FAILED;
++	} else
++		printk(KERN_INFO "qla2xxx_eh_bus_reset Exiting: status=SUCCESS\n");
++
++	LEAVE("qla2xxx_eh_bus_reset");
++
++	return (return_status);
++}
++
++/**************************************************************************
++* qla2xxx_eh_host_reset
++*
++* Description:
++*    The reset function will reset the Adapter.
++*
++* Input:
++*      cmd = Linux SCSI command packet of the command that cause the
++*            adapter reset.
++*
++* Returns:
++*      Either SUCCESS or FAILED.
++*
++* Note:
++**************************************************************************/
++int
++qla2xxx_eh_host_reset(Scsi_Cmnd *cmd)
++{
++	int		return_status = SUCCESS;
++	srb_t		*sp;
++	uint32_t        b, t, l;
++	int	found;
++	struct list_head *hal;
++	scsi_qla_host_t *ha, *search_ha;
++
++	ENTER("qla2xxx_eh_host_reset");
++
++	if (cmd == NULL) {
++		printk(KERN_INFO
++			"%s(): **** SCSI mid-layer passing in NULL cmd\n",
++			__func__);
++                DEBUG2(BUG();)
++
++		return (FAILED);
++	}
++
++	ha = (scsi_qla_host_t *)cmd->device->host->hostdata;
++	ha->eh_start= 0;
++	/* Find actual ha */
++	sp = (srb_t *)CMD_SP(cmd);
++	if (ha->flags.failover_enabled && sp != NULL)
++		ha = sp->ha;
++	else
++		ha = (scsi_qla_host_t *)cmd->device->host->hostdata;
++
++	if (ha == NULL) {
++		printk(KERN_INFO
++			"%s(): **** CMD derives a NULL HA\n",
++			__func__);
++                DEBUG2(BUG();)
++
++		return (FAILED);
++	}
++
++	found = 0;
++	read_lock(&qla_hostlist_lock);
++	list_for_each(hal, &qla_hostlist) {
++		search_ha = list_entry(hal, scsi_qla_host_t, list);
++
++		if (search_ha == ha) {
++			found ++;
++			break;
++		}
++	}
++	read_unlock(&qla_hostlist_lock);
++
++	if (!found) {
++		printk(KERN_INFO
++			"%s(): **** CMD derives a NULL search HA\n",
++			__func__);
++                DEBUG2(BUG();)
++
++		return (FAILED);
++	}
++
++	/* Display which one we're actually resetting for debug. */
++	DEBUG(printk("qla2xxx_eh_host_reset: entered for scsi%ld. "
++			"Resetting host_no %ld.\n", 
++			((scsi_qla_host_t *)cmd->device->host->hostdata)->host_no,
++			ha->host_no));
++
++#if  STOP_ON_RESET
++	printk("Host Reset...  Command=\n");
++	qla2x00_print_scsi_cmd(cmd);
++	qla2x00_panic("qla2xxx_eh_host_reset", ha->host);
++#endif
++
++	/*
++	 *  Now issue reset.
++	 */
++	b = SCSI_BUS_32(cmd);
++	t = SCSI_TCN_32(cmd);
++	l = SCSI_LUN_32(cmd);
++
++	if (qla2x00_verbose) {
++		printk(KERN_INFO
++			"scsi(%ld:%d:%d:%d): now issue ADAPTER RESET.\n",
++			((scsi_qla_host_t *)cmd->device->host->hostdata)->host_no,
++			(int)b, 
++			(int)t, 
++			(int)l);
++	}
++
++	DEBUG2(printk(KERN_INFO
++	    "scsi(%ld:%d:%d:%d): now issue ADAPTER RESET.\n",
++	    ((scsi_qla_host_t *)cmd->device->host->hostdata)->host_no,
++	    (int)b, (int)t, (int)l));
++
++	if (!(test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags))) {
++		set_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags);
++
++		spin_unlock_irq(ha->host->host_lock);
++
++		if (qla2x00_abort_isp(ha, 1)) {
++			/* failed. try later */
++			set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
++			return_status = FAILED;
++
++			DEBUG2(printk(KERN_WARNING
++			    "scsi(%ld:%d:%d:%d): ha %ld ADAPTER RESET "
++			    "failed. Scheduled retry later.\n",
++			    ((scsi_qla_host_t *)cmd->device->host->hostdata)->host_no,
++			    (int)b, (int)t, (int)l, ha->host_no);)
++		} else {
++			return_status = SUCCESS;
++		}
++
++		spin_lock_irq(ha->host->host_lock);
++
++		clear_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags);
++	} else {
++		/*
++		 * Already active. Sleep a while then return SUCCESS for kernel
++		 * to retry the IO.
++		 */
++		spin_unlock_irq(ha->host->host_lock);
++
++		set_current_state(TASK_INTERRUPTIBLE);
++		schedule_timeout(5 * HZ);
++
++		spin_lock_irq(ha->host->host_lock);
++
++		return_status = SUCCESS;
++	}
++	if ( return_status == FAILED) {
++		DEBUG2(printk("qla2xxx_eh_host_reset Exiting: Reset Failed\n");)
++		return FAILED;
++	}
++
++	/* Waiting for our command in done_queue to be returned to OS.*/
++	if ( qla2x00_eh_wait_for_pending_commands(ha) == 0) {
++		return_status = FAILED;
++	}
++
++	if(return_status == FAILED) {
++		printk(KERN_INFO "qla2xxx_eh_host_reset Exiting: status=Failed\n");
++		return FAILED;
++	} else
++		printk(KERN_INFO "qla2xxx_eh_host_reset Exiting: status=SUCCESS\n");
++
++	LEAVE("qla2xxx_eh_host_reset");
++
++	return(return_status);
++}
++
++
++/*
++* qla2x00_loop_reset
++*      Issue loop reset.
++*
++* Input:
++*      ha = adapter block pointer.
++*
++* Returns:
++*      0 = success
++*/
++static uint8_t
++qla2x00_loop_reset(scsi_qla_host_t *ha)
++{
++	uint8_t  status = QL_STATUS_SUCCESS;
++	uint16_t t;
++	os_tgt_t        *tq;
++
++	ENTER(__func__);
++
++	if (ha->flags.enable_lip_reset) {
++		status = qla2x00_lip_reset(ha);
++	}
++
++	if (status == QL_STATUS_SUCCESS && ha->flags.enable_target_reset) {
++		for (t = 0; t < MAX_FIBRE_DEVICES; t++) {
++			if ((tq = TGT_Q(ha, t)) == NULL)
++				continue;
++
++			if (tq->vis_port == NULL)
++				continue;
++
++			status = qla2x00_target_reset(ha, 0, t);
++			if (status != QL_STATUS_SUCCESS) {
++				break;
++			}
++		}
++	}
++
++	if (status == QL_STATUS_SUCCESS &&
++		((!ha->flags.enable_target_reset && 
++		  !ha->flags.enable_lip_reset) ||
++		ha->flags.enable_lip_full_login)) {
++
++		status = qla2x00_full_login_lip(ha);
++	}
++
++	/* Issue marker command only when we are going to start the I/O */
++	ha->marker_needed = 1;
++
++	if (status) {
++		/* Empty */
++		DEBUG2_3(printk("%s(%ld): **** FAILED ****\n",
++				__func__,
++				ha->host_no);)
++	} else {
++		/* Empty */
++		DEBUG3(printk("%s(%ld): exiting normally.\n",
++				__func__,
++				ha->host_no);)
++	}
++
++	LEAVE(__func__);
++
++	return(status);
++}
++
++/*
++ * qla2x00_device_reset
++ *	Issue bus device reset message to the target.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	t = SCSI ID.
++ *	TARGET_QUEUE_LOCK must be released.
++ *	ADAPTER_STATE_LOCK must be released.
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_device_reset(scsi_qla_host_t *vis_ha, uint16_t tgt, uint16_t lun)
++{
++#if !USE_ABORT_TGT
++	uint16_t	l;
++	fc_port_t	*fcport;
++#endif
++	os_lun_t	*lq;
++	uint8_t		status = 0;
++
++	ENTER(__func__);
++
++#if USE_ABORT_TGT
++	/* Abort Target command will clear Reservation */
++	lq = GET_LU_Q(vis_ha, tgt, lun);
++	if (lq && lq->fclun)
++		 status = qla2x00_abort_target(lq->fclun->fcport);
++#else
++	/* Abort Device command will not clear Reservation */
++	for (l = 0; l < MAX_LUNS; l++) {
++		lq = GET_LU_Q(vis_ha, tgt, l);
++		if (lq == NULL)
++			continue;
++
++		fcport = lq->fclun->fcport;
++		if (LOOP_RDY(fcport->ha)) {
++			qla2x00_abort_device(fcport->ha, 
++					fcport->loop_id,
++					lq->fclun->lun);
++		}
++	}
++#endif
++
++	LEAVE(__func__);
++
++	return( status );
++}
++
++/**************************************************************************
++* qla1200_biosparam
++*
++* Description:
++*   Return the disk geometry for the given SCSI device.
++**************************************************************************/
++int
++qla2x00_biosparam(struct scsi_device *sdev,
++    struct block_device *bdev, sector_t capacity, int geom[])
++{
++	int heads, sectors, cylinders;
++
++	heads = 64;
++	sectors = 32;
++	cylinders = (unsigned long)capacity / (heads * sectors);
++	if (cylinders > 1024) {
++		heads = 255;
++		sectors = 63;
++		cylinders = (unsigned long)capacity / (heads * sectors);
++	}
++
++	geom[0] = heads;
++	geom[1] = sectors;
++	geom[2] = cylinders;
++
++	return (0);
++}
++
++/**************************************************************************
++ * qla2x00_slave_configure
++ *   Determines the queue depth for a given device.  There are two ways
++ *   a queue depth can be obtained for a tagged queueing device.  One
++ *   way is the default queue depth which is determined by whether
++ *   If it is defined, then it is used
++ *   as the default queue depth.  Otherwise, we use either 4 or 8 as the
++ *   default queue depth (dependent on the number of hardware SCBs).
++ **************************************************************************/
++int
++qla2xxx_slave_configure(Scsi_Device * device)
++{
++	int queue_depth = 64;
++
++	if (device->tagged_supported) {
++#if defined(MODULE)
++		if (!(ql2xmaxqdepth == 0 || ql2xmaxqdepth > 256))
++			queue_depth = ql2xmaxqdepth;
++#endif 
++		ql2xmaxqdepth = queue_depth;
++
++		scsi_adjust_queue_depth(device, MSG_ORDERED_TAG, queue_depth);
++
++		printk(KERN_INFO
++		    "scsi(%d:%d:%d:%d): Enabled tagged queuing, queue "
++		    "depth %d.\n",
++		    device->host->host_no,
++		    device->channel, device->id, device->lun,
++		    device->queue_depth);
++	} else {
++		 scsi_adjust_queue_depth(device, 0 /* TCQ off */,
++		     device->host->hostt->cmd_per_lun /* 3 */);
++	}
++
++	return (0);
++}
++
++/*
++ * PCI driver interface
++ */
++static int __devinit
++qla_probe_device(struct pci_dev *pdev, const struct pci_device_id *ent)
++{
++	device_reg_t	*reg;
++	struct Scsi_Host *host;
++	scsi_qla_host_t *ha;
++	unsigned long		flags = 0;
++	unsigned long		wait_switch = 0;
++
++	if (pci_enable_device(pdev))
++		return -1;
++
++	printk(KERN_INFO
++	    "qla2x00: Found VID=%x DID=%x SSVID=%x SSDID=%x\n",
++	    pdev->vendor, pdev->device,
++	    pdev->subsystem_vendor, pdev->subsystem_device);
++
++	if (ql2xfailover) {
++		sprintf(qla2x00_version_str, "%s-fo", QLA2100_VERSION);
++	} else {
++		sprintf(qla2x00_version_str, "%s", QLA2100_VERSION);
++	}
++
++	host = scsi_register(&qla2x00_driver_template, sizeof(scsi_qla_host_t));
++	if (host == NULL) {
++		printk(KERN_WARNING
++		    "qla2x00: Couldn't register with scsi layer!\n");
++		return -1;
++	}
++
++	/* Clear our data area */
++	ha = (scsi_qla_host_t *)host->hostdata;
++	memset(ha, 0, sizeof(scsi_qla_host_t));
++
++	ha->host_no = host->host_no;
++	ha->host = host;
++
++	/* Sanitize the information from PCI BIOS. */
++	host->irq = pdev->irq;
++	host->io_port = pci_resource_start(pdev, 0);
++	ha->pdev = pdev;
++	scsi_set_device(host, &pdev->dev);
++
++	ha->brd_info = (struct qla_board_info *)ent->driver_data;
++
++	if (qla2x00_verbose) {
++		printk(KERN_INFO
++		    "scsi(%d): Found a %s @ bus %d, device 0x%x, irq %d, "
++		    "iobase 0x%lx\n",
++		    host->host_no,
++		    ha->brd_info->name,
++		    ha->pdev->bus->number,
++		    PCI_SLOT(ha->pdev->devfn),
++		    host->irq, host->io_port);
++	}
++
++	ha->iobase = (device_reg_t *) host->io_port;
++
++	spin_lock_init(&ha->hardware_lock);
++
++	/* 4.23 Initialize /proc/scsi/qla2x00 counters */
++	ha->actthreads = 0;
++	ha->qthreads   = 0;
++	ha->dump_done  = 0;
++	ha->total_isr_cnt = 0;
++	ha->total_isp_aborts = 0;
++	ha->total_lip_cnt = 0;
++	ha->total_dev_errs = 0;
++	ha->total_ios = 0;
++	ha->total_bytes = 0;
++
++	if (qla2x00_mem_alloc(ha)) {
++		printk(KERN_WARNING
++		    "scsi(%d): [ERROR] Failed to allocate memory for adapter\n",
++		    host->host_no);
++
++		qla2x00_mem_free(ha);
++
++		scsi_unregister(host);
++
++		return -1;
++	}
++
++	ha->prev_topology = 0;
++	ha->ports = MAX_BUSES;
++
++#if defined(ISP2100)
++	ha->max_targets = MAX_TARGETS_2100;
++#else
++	ha->max_targets = MAX_TARGETS_2200;
++#endif
++
++	/* load the F/W, read paramaters, and init the H/W */
++	ha->instance = num_hosts;
++
++	init_MUTEX_LOCKED(&ha->mbx_intr_sem);
++
++	INIT_LIST_HEAD(&ha->list);
++	INIT_LIST_HEAD(&ha->fcports);
++	INIT_LIST_HEAD(&ha->fcinitiators);
++	INIT_LIST_HEAD(&ha->done_queue);
++	INIT_LIST_HEAD(&ha->retry_queue);
++	INIT_LIST_HEAD(&ha->scsi_retry_queue);
++	INIT_LIST_HEAD(&ha->failover_queue);
++	INIT_LIST_HEAD(&ha->pending_queue);
++
++	if (ql2xfailover)
++		ha->flags.failover_enabled = 1;
++	else
++		ha->flags.failover_enabled = 0;
++
++	INIT_WORK(&ha->run_qla_task, qla2x00_done_work, (void *) ha);
++
++	/*
++	 * These locks are used to prevent more than one CPU
++	 * from modifying the queue at the same time. The
++	 * higher level "io_request_lock" will reduce most
++	 * contention for these locks.
++	 */
++	spin_lock_init(&ha->mbx_bits_lock);
++	spin_lock_init(&ha->mbx_reg_lock);
++	spin_lock_init(&ha->mbx_q_lock);
++	spin_lock_init(&ha->list_lock);
++
++	if (qla2x00_initialize_adapter(ha) &&
++	    !(ha->device_flags & DFLG_NO_CABLE)) {
++
++		printk(KERN_WARNING
++		    "scsi(%ld): Failed to initialize adapter\n", ha->host_no);
++
++		DEBUG2(printk("scsi(%ld): Failed to initialize adapter - "
++		    "Adapter flags %x.\n",
++		    ha->host_no, ha->device_flags));
++
++		qla2x00_mem_free(ha);
++
++		scsi_unregister(host);
++
++		return -1;
++	}
++
++	/*
++	 * Startup the kernel thread for this host adapter
++	 */
++	init_completion(&ha->dpc_inited);
++	init_completion(&ha->dpc_exited);
++
++	ha->dpc_should_die = 0;
++	ha->dpc_pid = kernel_thread(qla2x00_do_dpc, ha, 0);
++	if (ha->dpc_pid < 0) {
++		printk(KERN_WARNING
++		    "scsi(%ld): Unable to start DPC thread!\n", ha->host_no);
++
++		qla2x00_mem_free(ha);
++
++		scsi_unregister(host);
++
++		return -1;
++	}
++	wait_for_completion(&ha->dpc_inited);
++
++	/*  Mark preallocated Loop IDs in use. */
++	ha->fabricid[SNS_FL_PORT].in_use = TRUE;
++	ha->fabricid[FABRIC_CONTROLLER].in_use = TRUE;
++	ha->fabricid[SIMPLE_NAME_SERVER].in_use = TRUE;
++
++	/* Register our resources with Linux */
++	if (qla2x00_register_with_Linux(ha, ha->ports - 1)) {
++		printk(KERN_WARNING
++		    "scsi(%ld): Failed to register resources.\n",
++		    ha->host_no);
++
++		qla2x00_mem_free(ha);
++
++		scsi_unregister(host);
++
++		return -1;
++	}
++
++	DEBUG2(printk("DEBUG: detect hba %ld at address = %p\n",
++	    ha->host_no, ha));
++
++	reg = ha->iobase;
++
++	/* Disable ISP interrupts. */
++	qla2x00_disable_intrs(ha);
++
++	/* Ensure mailbox registers are free. */
++	spin_lock_irqsave(&ha->hardware_lock, flags);
++	WRT_REG_WORD(&reg->semaphore, 0);
++	WRT_REG_WORD(&reg->hccr, HCCR_CLR_RISC_INT);
++	WRT_REG_WORD(&reg->hccr, HCCR_CLR_HOST_INT);
++
++	/* Enable proper parity */
++#if defined(ISP2300)
++	if (ha->pdev->device == QLA2312_DEVICE_ID ||
++	    ha->pdev->device == QLA2322_DEVICE_ID)
++		/* SRAM, Instruction RAM and GP RAM parity */
++		WRT_REG_WORD(&reg->hccr, (HCCR_ENABLE_PARITY + 0x7));
++	else
++		/* SRAM parity */
++		WRT_REG_WORD(&reg->hccr, (HCCR_ENABLE_PARITY + 0x1));
++#endif
++	spin_unlock_irqrestore(&ha->hardware_lock, flags);
++
++	/*
++	 * if failover is enabled read the user configuration
++	 */
++	if (ha->flags.failover_enabled) {
++		if (ConfigRequired > 0)
++			mp_config_required = 1;
++		else
++			mp_config_required = 0;
++
++		DEBUG(printk("qla2x00_detect: qla2x00_cfg_init for hba %ld\n",
++		    ha->instance));
++
++		qla2x00_cfg_init(ha);
++	}
++
++	/* Enable chip interrupts. */
++	qla2x00_enable_intrs(ha);
++
++	/* Insert new entry into the list of adapters */
++	write_lock(&qla_hostlist_lock);
++	list_add_tail(&ha->list, &qla_hostlist);
++	write_unlock(&qla_hostlist_lock);
++
++	/* v2.19.5b6 */
++	/*
++	 * Wait around max loop_reset_delay secs for the devices to come
++	 * on-line. We don't want Linux scanning before we are ready.
++	 *
++	 */
++	for (wait_switch = jiffies + (ha->loop_reset_delay * HZ);
++	    time_before(jiffies,wait_switch) &&
++	     !(ha->device_flags & (DFLG_NO_CABLE | DFLG_FABRIC_DEVICES))
++	     && (ha->device_flags & SWITCH_FOUND) ;) {
++
++		qla2x00_check_fabric_devices(ha);
++
++		set_current_state(TASK_INTERRUPTIBLE);
++		schedule_timeout(5);
++	}
++
++	/* List the target we have found */
++	if (displayConfig && (!ha->flags.failover_enabled))
++		qla2x00_display_fc_names(ha);
++
++	pci_set_drvdata(pdev, ha);
++	ha->init_done = 1;
++	num_hosts++;
++
++ 	if (displayConfig && ha->flags.failover_enabled)
++		qla2x00_cfg_display_devices();
++
++	return 0;
++}
++
++static void __devexit
++qla_remove_device(struct pci_dev *pdev)
++{
++	struct list_head *hal, *temp;
++	scsi_qla_host_t *ha, *iter_ha;
++
++	ha = pci_get_drvdata(pdev);
++
++	/* Sanity check -- make sure the entry is in our list */
++	write_lock(&qla_hostlist_lock);
++	list_for_each_safe(hal, temp, &qla_hostlist) {
++		iter_ha = list_entry(hal, scsi_qla_host_t, list);
++						 
++		if (iter_ha == ha) {
++			list_del(&ha->list);
++			qla2x00_free_device(ha);
++			break;
++		}
++	}
++	write_unlock(&qla_hostlist_lock);
++}
++
++static void
++qla2x00_free_device(scsi_qla_host_t *ha)
++{
++	int ret;
++	struct Scsi_Host *host;
++
++	host = ha->host;
++
++	/* turn-off interrupts on the card */
++	if (ha->interrupts_on)
++		qla2x00_disable_intrs(ha);
++
++	/* Detach interrupts */
++	if (host->irq)
++		free_irq(host->irq, ha);
++
++	/* release io space registers  */
++	if (host->io_port)
++		release_region(host->io_port, 0xff);
++
++	/* Disable timer */
++	if (ha->timer_active)
++		qla2x00_stop_timer(ha);
++
++	/* Kill the kernel thread for this host */
++	if (ha->dpc_pid >= 0) {
++		ha->dpc_should_die = 1;
++		wmb();
++		ret = kill_proc(ha->dpc_pid, SIGTERM, 1);
++		if (ret) {
++			printk(KERN_ERR
++			    "scsi(%ld): Unable to signal DPC thread -- (%d)\n",
++			    ha->host_no, ret);
++
++			/* TODO: SOMETHING MORE??? */
++		} else {
++			wait_for_completion(&ha->dpc_exited);
++		}
++	}
++
++#if MEMORY_MAPPED_IO
++	if (ha->mmpbase) {
++		iounmap((void *) (((unsigned long) ha->mmpbase) & PAGE_MASK));
++	}
++#endif
++
++	apidev_cleanup();
++
++	qla2x00_mem_free(ha);
++
++	if (ha->flags.failover_enabled)
++		qla2x00_cfg_mem_free(ha);
++
++	ha->flags.online = FALSE;
++
++	scsi_unregister(host);
++}
++
++
++/*
++ * The following support functions are adopted to handle
++ * the re-entrant qla2x00_proc_info correctly.
++ */
++static void
++copy_mem_info(struct info_str *info, char *data, int len)
++{
++	if (info->pos + len > info->offset + info->length)
++		len = info->offset + info->length - info->pos;
++
++	if (info->pos + len < info->offset) {
++		info->pos += len;
++		return;
++	}
++ 
++	if (info->pos < info->offset) {
++		off_t partial;
++ 
++		partial = info->offset - info->pos;
++		data += partial;
++		info->pos += partial;
++		len  -= partial;
++	}
++ 
++	if (len > 0) {
++		memcpy(info->buffer, data, len);
++		info->pos += len;
++		info->buffer += len;
++	}
++}
++
++static int
++copy_info(struct info_str *info, char *fmt, ...)
++{
++	va_list args;
++	char buf[256];
++	int len;
++ 
++	va_start(args, fmt);
++	len = vsprintf(buf, fmt, args);
++	va_end(args);
++ 
++	copy_mem_info(info, buf, len);
++
++	return (len);
++}
++
++/*************************************************************************
++* qla2x00_proc_info
++*
++* Description:
++*   Return information to handle /proc support for the driver.
++*
++* inout : decides the direction of the dataflow and the meaning of the
++*         variables
++* buffer: If inout==FALSE data is being written to it else read from it
++*         (ptr to a page buffer)
++* *start: If inout==FALSE start of the valid data in the buffer
++* offset: If inout==FALSE starting offset from the beginning of all
++*         possible data to return.
++* length: If inout==FALSE max number of bytes to be written into the buffer
++*         else number of bytes in "buffer"
++* Returns:
++*         < 0:  error. errno value.
++*         >= 0: sizeof data returned.
++*************************************************************************/
++int
++qla2x00_proc_info(char *buffer,
++    char **start, off_t offset, int length, int hostno, int inout)
++{
++	struct Scsi_Host *host;
++	struct info_str	info;
++	int             i;
++	int             retval = -EINVAL;
++	os_lun_t	*up;
++	uint32_t        t, l;
++	uint32_t        tmp_sn;
++	unsigned long   *flags;
++	struct list_head *list, *temp;
++	unsigned long	cpu_flags;
++	uint8_t		*loop_state;
++#if REQ_TRACE
++	Scsi_Cmnd       *cp;
++	srb_t           *sp;
++#endif
++	int	found;
++	struct list_head *hal;
++	scsi_qla_host_t *ha;
++
++	DEBUG3(printk(KERN_INFO
++	    "Entering proc_info buff_in=%p, offset=0x%lx, length=0x%x, "
++	    "hostno=%d\n", buffer, offset, length, hostno);)
++
++	ha = NULL;
++	host = NULL;
++
++	/* Find the host that was specified */
++	found = 0;
++	read_lock(&qla_hostlist_lock);
++	list_for_each(hal, &qla_hostlist) {
++		ha = list_entry(hal, scsi_qla_host_t, list);
++
++		if (ha->host->host_no == hostno) {
++			found++;
++			break;
++		}
++	}
++	read_unlock(&qla_hostlist_lock);
++
++	/* if host wasn't found then exit */
++	if (!found) {
++		DEBUG2_3(printk(KERN_WARNING
++		    "%s: Can't find adapter for host number %d\n", 
++		    __func__, hostno);)
++
++		return (retval);
++	}
++
++	host = ha->host;
++
++	if (inout == TRUE) {
++		/* Has data been written to the file? */
++		DEBUG3(printk(
++		    "%s: has data been written to the file. \n",
++		    __func__);)
++		return (qla2x00_set_info(buffer, length, host));
++	}
++
++	if (start) {
++		*start = buffer;
++	}
++
++	info.buffer = buffer;
++	info.length = length;
++	info.offset = offset;
++	info.pos    = 0;
++
++	/* start building the print buffer */
++	copy_info(&info,
++	    "QLogic PCI to Fibre Channel Host Adapter for " ISP_NAME ":\n"
++	    "        Firmware version: %2d.%02d.%02d ",
++	    ha->fw_major_version, 
++	    ha->fw_minor_version, 
++	    ha->fw_subminor_version);
++
++	switch (ha->fw_attributes & 0xFF) {
++	case 0x7:
++		copy_info(&info, "EF");
++		break;
++	case 0x17:
++		copy_info(&info, "TP");
++		break;
++	case 0x37:
++		copy_info(&info, "IP");
++		break;
++	case 0x77:
++		copy_info(&info, "VI");
++		break;
++	default:
++		copy_info(&info, "(%x)", ha->fw_attributes);
++		break;
++	}
++	if (ha->fw_attributes & 0x100)
++		copy_info(&info, "X");
++	copy_info(&info, ", ");
++
++	copy_info(&info, "Driver version %s\n", qla2x00_version_str);
++
++	copy_info(&info, "Entry address = %p\n", qla2x00_set_info);
++
++	tmp_sn = ((ha->serial0 & 0x1f) << 16) | (ha->serial2 << 8) | 
++	    ha->serial1;
++	copy_info(&info, "HBA: %s, Serial# %c%05d\n",
++	    ha->brd_info->name, ('A' + tmp_sn/100000), (tmp_sn%100000));
++
++	copy_info(&info,
++	    "Request Queue = 0x%lx, Response Queue = 0x%lx\n",
++	    (long unsigned int)ha->request_dma,
++	    (long unsigned int)ha->response_dma);
++
++	copy_info(&info,
++	    "Request Queue count= %ld, Response Queue count= %ld\n",
++	    (long)REQUEST_ENTRY_CNT, (long)RESPONSE_ENTRY_CNT);
++
++	copy_info(&info,
++	    "Total number of active commands = %ld\n",
++	    ha->actthreads);
++
++	copy_info(&info,
++	    "Total number of interrupts = %ld\n",
++	    (long)ha->total_isr_cnt);
++
++#if defined(FC_IP_SUPPORT)
++	copy_info(&info,
++	    "Total number of active IP commands = %ld\n",
++	    ha->ipreq_cnt);
++#endif
++
++#if defined(IOCB_THROLLE_USAGE)
++#if defined(IOCB_HIT_RATE)
++	copy_info(&info,
++	    "Total number of IOCBs (used/max/#hit) "
++	    "= (%d/%d/%d)\n",
++	    (int)ha->iocb_cnt,
++	    (int)ha->iocb_hiwat,
++	    (int)ha->iocb_overflow_cnt);
++#else
++	copy_info(&info,
++	    "Total number of IOCBs (used/max) "
++	    "= (%d/%d)\n",
++	    (int)ha->iocb_cnt, (int)ha->iocb_hiwat);
++#endif
++#endif
++
++
++	copy_info(&info,
++	    "Total number of queued commands = %d\n",
++	    (max_srbs - ha->srb_cnt));
++
++	copy_info(&info,
++	    "    Device queue depth = 0x%x\n",
++	    (ql2xmaxqdepth == 0) ? 16 : ql2xmaxqdepth);
++
++	copy_info(&info,
++	    "Number of free request entries = %d\n", ha->req_q_cnt);
++
++	copy_info(&info,
++	    "Number of mailbox timeouts = %ld\n",
++	    qla2x00_stats.mboxtout);
++
++	copy_info(&info,
++	    "Number of ISP aborts = %ld\n",qla2x00_stats.ispAbort);
++
++	copy_info(&info,
++	    "Number of loop resyncs = %ld\n",
++	    qla2x00_stats.loop_resync);
++
++	copy_info(&info,
++	    "Number of retries for empty slots = %ld\n",
++	    qla2x00_stats.outarray_full);
++
++	copy_info(&info,
++	    "Number of reqs in pending_q= %ld, retry_q= %d, "
++	    "done_q= %ld, scsi_retry_q= %d\n",
++	    ha->qthreads, ha->retry_q_cnt,
++	    ha->done_q_cnt, ha->scsi_retry_q_cnt);
++
++	if (ha->flags.failover_enabled) {
++		copy_info(&info,
++		    "Number of reqs in failover_q= %d\n",
++		    ha->failover_cnt);
++	}
++
++	flags = (unsigned long *) &ha->flags;
++
++	if (ha->loop_state == LOOP_DOWN) {
++		loop_state = "DOWN";
++	} else if (ha->loop_state ==LOOP_UP) {
++		loop_state = "UP";
++	} else if (ha->loop_state ==LOOP_READY) {
++		loop_state = "READY";
++	} else if (ha->loop_state ==LOOP_TIMEOUT) {
++		loop_state = "TIMEOUT";
++	} else if (ha->loop_state ==LOOP_UPDATE) {
++		loop_state = "UPDATE";
++	} else {
++		loop_state = "UNKNOWN";
++	}
++
++	copy_info(&info, 
++	    "Host adapter:loop state= <%s>, flags= 0x%lx\n",
++	    loop_state , *flags);
++
++	copy_info(&info, "Dpc flags = 0x%lx\n", ha->dpc_flags);
++
++	copy_info(&info, "MBX flags = 0x%x\n", ha->mbx_flags);
++
++	copy_info(&info, "SRB Free Count = %d\n", ha->srb_cnt);
++
++	copy_info(&info, "Port down retry = %3.3d\n",
++	    ha->port_down_retry_count);
++
++	copy_info(&info, "Login retry count = %3.3d\n",
++	    ha->login_retry_count);
++
++	copy_info(&info,
++	    "Commands retried with dropped frame(s) = %d\n",
++	    ha->dropped_frame_error_cnt);
++
++	copy_info(&info, "\n");
++
++#if REQ_TRACE
++	if (qla2x00_req_dmp) {
++		copy_info(&info,
++		    "Outstanding Commands on controller:\n");
++
++		for (i = 1; i < MAX_OUTSTANDING_COMMANDS; i++) {
++			if ((sp = ha->outstanding_cmds[i]) == NULL) {
++				continue;
++			}
++
++			if ((cp = sp->cmd) == NULL) {
++				continue;
++			}
++
++			copy_info(&info, "(%d): Pid=%d, sp flags=0x%lx"
++			    ", cmd=0x%p, state=%d\n", 
++			    i, 
++			    (int)sp->cmd->serial_number, 
++			    (long)sp->flags,
++			    CMD_SP(sp->cmd),
++			    (int)sp->state);
++
++			if (info.pos >= info.offset + info.length) {
++				/* No need to continue */
++				goto profile_stop;
++			}
++		}
++	}
++#endif /* REQ_TRACE */
++
++	if (qla2x00_retryq_dmp) {
++		if (!list_empty(&ha->retry_queue)) {
++			copy_info(&info,
++			    "qla%ld: Retry queue requests:\n",
++			    ha->host_no);
++
++			spin_lock_irqsave(&ha->list_lock, cpu_flags);
++
++			i = 0;
++			list_for_each_safe(list, temp, &ha->retry_queue) {
++				sp = list_entry(list, srb_t, list);
++				t = SCSI_TCN_32(sp->cmd);
++				l = SCSI_LUN_32(sp->cmd);
++
++				copy_info(&info,
++				    "%d: target=%d, lun=%d, "
++				    "pid=%ld sp=%p, sp->flags=0x%x,"
++				    "sp->state= %d\n", 
++				    i, t, l, 
++				    sp->cmd->serial_number, sp, 
++				    sp->flags, sp->state );
++
++				i++;
++
++				if (info.pos >= info.offset + info.length) {
++					/* No need to continue */
++					goto profile_stop;
++				}
++			}
++
++			spin_unlock_irqrestore(&ha->list_lock, cpu_flags);
++
++		} /* if (!list_empty(&ha->retry_queue))*/
++	} /* if ( qla2x00_retryq_dmp )  */
++
++	/* 2.25 node/port display to proc */
++	/* Display the node name for adapter */
++	copy_info(&info, "\nSCSI Device Information:\n");
++	copy_info(&info,
++	    "scsi-qla%d-adapter-node="
++	    "%02x%02x%02x%02x%02x%02x%02x%02x;\n",
++	    (int)ha->instance,
++	    ha->init_cb->node_name[0],
++	    ha->init_cb->node_name[1],
++	    ha->init_cb->node_name[2],
++	    ha->init_cb->node_name[3],
++	    ha->init_cb->node_name[4],
++	    ha->init_cb->node_name[5],
++	    ha->init_cb->node_name[6],
++	    ha->init_cb->node_name[7]);
++
++	/* display the port name for adapter */
++	copy_info(&info,
++	    "scsi-qla%d-adapter-port="
++	    "%02x%02x%02x%02x%02x%02x%02x%02x;\n",
++	    (int)ha->instance,
++	    ha->init_cb->port_name[0],
++	    ha->init_cb->port_name[1],
++	    ha->init_cb->port_name[2],
++	    ha->init_cb->port_name[3],
++	    ha->init_cb->port_name[4],
++	    ha->init_cb->port_name[5],
++	    ha->init_cb->port_name[6],
++	    ha->init_cb->port_name[7]);
++
++	/* Print out device port names */
++	for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
++		if (ha->fc_db[i].loop_id == PORT_UNUSED) {
++			continue;
++		}
++
++		if (ha->flags.failover_enabled) {
++			copy_info(&info,
++			    "scsi-qla%d-port-%d="
++			    "%02x%02x%02x%02x%02x%02x%02x%02x:"
++			    "%02x%02x%02x%02x%02x%02x%02x%02x;\n",
++			    (int)ha->instance, i,
++			    ha->fc_db[i].name[0],
++			    ha->fc_db[i].name[1],
++			    ha->fc_db[i].name[2],
++			    ha->fc_db[i].name[3],
++			    ha->fc_db[i].name[4],
++			    ha->fc_db[i].name[5],
++			    ha->fc_db[i].name[6],
++			    ha->fc_db[i].name[7],
++			    ha->fc_db[i].wwn[0],
++			    ha->fc_db[i].wwn[1],
++			    ha->fc_db[i].wwn[2],
++			    ha->fc_db[i].wwn[3],
++			    ha->fc_db[i].wwn[4],
++			    ha->fc_db[i].wwn[5],
++			    ha->fc_db[i].wwn[6],
++			    ha->fc_db[i].wwn[7]);
++		} else {
++			copy_info(&info,
++			    "scsi-qla%d-target-%d="
++			    "%02x%02x%02x%02x%02x%02x%02x%02x;\n",
++			    (int)ha->instance, i,
++			    ha->fc_db[i].wwn[0],
++			    ha->fc_db[i].wwn[1],
++			    ha->fc_db[i].wwn[2],
++			    ha->fc_db[i].wwn[3],
++			    ha->fc_db[i].wwn[4],
++			    ha->fc_db[i].wwn[5],
++			    ha->fc_db[i].wwn[6],
++			    ha->fc_db[i].wwn[7]);
++		}
++
++	} /* 2.25 node/port display to proc */
++
++	copy_info(&info, "\nSCSI LUN Information:\n");
++
++	copy_info(&info, "(Id:Lun)\n");
++
++	/* scan for all equipment stats */
++	for (t = 0; t < MAX_FIBRE_DEVICES; t++) {
++		/* scan all luns */
++		for (l = 0; l < ha->max_luns; l++) {
++			up = (os_lun_t *) GET_LU_Q(ha, t, l);
++
++			if (up == NULL) {
++				continue;
++			}
++			if (up->fclun == NULL) {
++				continue;
++			}
++			if (up->fclun->flags & FC_DISCON_LUN) {
++				continue;
++			}
++
++			copy_info(&info,
++			    "(%2d:%2d): Total reqs %ld,",
++			    t,l,up->io_cnt);
++
++			copy_info(&info,
++			    " Pending reqs %ld,",
++			    up->out_cnt);
++
++			if (up->io_cnt < 3) {
++				copy_info(&info,
++				    " flags 0x%x*,",
++				    (int)up->q_flag);
++			} else {
++				copy_info(&info,
++				    " flags 0x%x,",
++				    (int)up->q_flag);
++			}
++
++			copy_info(&info, 
++			    " %ld:%d:%02x,",
++			    up->fclun->fcport->ha->instance,
++			    up->fclun->fcport->cur_path,
++			    up->fclun->fcport->loop_id);
++
++			copy_info(&info, "\n");
++
++			if (info.pos >= info.offset + info.length) {
++				/* No need to continue */
++				goto profile_stop;
++			}
++		}
++
++		if (info.pos >= info.offset + info.length) {
++			/* No need to continue */
++			break;
++		}
++	}
++
++profile_stop:
++
++	retval = info.pos > info.offset ? info.pos - info.offset : 0;
++
++	DEBUG3(printk(KERN_INFO 
++	    "Exiting proc_info: info.pos=%d, offset=0x%lx, "
++	    "length=0x%x\n", info.pos, offset, length);)
++
++#if QLA2100_LIPTEST
++	qla2x00_lip = 1;
++#endif
++
++	return (retval);
++}
++
++#if defined (CONFIG_SCSIFCHOTSWAP) || defined(CONFIG_GAMAP)
++union wwnmap {
++	unsigned long long wwn;
++	unsigned char wwn_u8[8];
++};
++
++int qla2x00_get_scsi_info_from_wwn (int mode,
++	unsigned long long wwn,
++	int *host,
++	int *channel,
++	int *lun,
++	int *id) {
++
++scsi_qla_host_t *list;
++Scsi_Device *scsi_device;
++union wwnmap wwncompare;
++union wwnmap wwncompare2;
++int i, j, k;
++
++	/*
++	 * Retrieve big endian version of world wide name
++	 */
++	wwncompare2.wwn = wwn;
++	for (j = 0, k=7; j < 8; j++, k--) {
++		wwncompare.wwn_u8[j] = wwncompare2.wwn_u8[k];
++	}
++
++	/*
++	 * query all hosts searching for WWN
++	 */
++	for (list = qla2x00_hostlist; list; list = list->next) {
++		for (i = 0; i < MAX_FIBRE_DEVICES; i++) {
++			/*
++			 * Scan all devices in FibreChannel database
++			 * if WWN match found, return SCSI device information
++			 */
++			if (memcmp (wwncompare.wwn_u8, list->fc_db[i].name, 8) == 0) {
++				/*
++				 * If inserting, avoid scan for channel and lun information
++				 */
++				if (mode == 0) {
++					*channel = 0;
++					*lun = 0;
++					*host = list->host->host_no;
++					*id = i;
++					return (0);
++				}
++			
++
++				/*
++				 * WWN matches, find channel and lun information from scsi
++				 * device
++				 */
++				for (scsi_device = list->host->host_queue; scsi_device; scsi_device = scsi_device->next) {
++					if (scsi_device->id == i) {
++						*channel = scsi_device->channel;
++						*lun = scsi_device->lun;
++						break;
++					}
++				}
++				if (scsi_device == 0) {
++					return (-ENOENT);
++				}
++				/*
++				 * Device found, return all data
++				 */
++				*host = list->host->host_no;
++				*id = i;
++				return (0);
++			} /* memcmp */
++		} /* i < MAXFIBREDEVICES */
++	}
++	return (-ENOENT);
++}
++
++int qla2x00_get_wwn_from_scsi_info (int host, int id, unsigned long long *wwn) {
++scsi_qla_host_t *list;
++union wwnmap wwnendian;
++union wwnmap wwnendian2;
++int j, k;
++
++	/*
++	 * Examine all QLogic hosts
++	 */
++	for (list = qla2x00_hostlist; list; list = list->next) {
++		if (host == list->host->host_no) {
++			/*
++			 * Get endian corrected 64 bit WWN
++			 */
++
++			memcpy (&wwnendian2.wwn, list->fc_db[id].name, 8);
++			for (j = 0, k=7; j < 8; j++, k--) {
++				wwnendian.wwn_u8[j] = wwnendian2.wwn_u8[k];
++			}
++			*wwn = wwnendian.wwn;
++			return (0);
++		}
++	}
++	return (-ENOENT);
++}
++#endif /* CONFIG_SCSIFCHOTSWAP || CONFIG_GAMAP */
++
++/**************************************************************************
++*   qla2x00_setup
++*
++*   Handle Linux boot parameters. This routine allows for assigning a value
++*   to a parameter with a ';' between the parameter and the value.
++*   ie. qla2x00=arg0;arg1;...;argN;<properties .... properties>  OR
++*   via the command line.
++*   ie. qla2x00 ql2xopts=arg0;arg1;...;argN;<properties .... properties>
++**************************************************************************/
++#if !defined(MODULE)
++static int __init
++qla2x00_setup(char *s)
++#else
++void 
++qla2x00_setup(char *s)
++#endif	
++{
++	char		*cp, *np;
++	char		*slots[MAXARGS];
++	char		**argv = &slots[0];
++	static char	buf[LINESIZE];
++	int		argc, opts;
++
++#if !defined(MODULE)
++	if (s == NULL || *s == '\0')
++		return 0;
++#endif
++
++	/*
++	 * Determine if we have any properties.
++	 */
++	cp = s;
++	opts = 1;
++	while (*cp && (np = qla2x00_get_line(cp, buf)) != NULL) {
++		if (strncmp("scsi-qla",buf,8) == 0) {
++			DEBUG(printk("qla2100: devconf=%s\n",cp);)
++
++			ql2xdevconf = cp;
++			(opts > 0)? opts-- : 0;
++			break;
++		}
++		opts++;
++		cp = np;
++	}
++
++	/*
++	 * Parse the args before the properties
++	 */
++	if (opts) {
++		opts = (opts > MAXARGS-1)? MAXARGS-1: opts;
++		argc = qla2x00_get_tokens(s, argv, opts);
++		while (argc > 0) {
++			cp = *argv;
++			DEBUG(printk("scsi: found cmd arg =[%s]\n", cp));
++
++			if (strcmp(cp, "verbose") == 0) {
++				DEBUG(printk("qla2100: verbose\n"));
++				qla2x00_verbose++;
++			} else if (strcmp(cp, "quiet") == 0) {
++				qla2x00_quiet = 1;
++			} else if (strcmp(cp, "reinit_on_loopdown") == 0) {
++				qla2x00_reinit++;
++				DEBUG(printk("qla2100: reinit_on_loopdown\n"));
++			}
++			argc--, argv++;
++		}
++	}
++
++#if !defined(MODULE)
++	if (ql2xdevconf)
++		return 1;
++	else
++		return 0;
++#endif
++}
++
++#if !defined(MODULE)
++__setup("ql2xopts=", qla2x00_setup);
++#endif
++
++/********************** qla2x00_get_line *********************
++* qla2x00_get_line
++* Copy a substring from the specified string. The substring
++* consists of any number of chars seperated by white spaces (i.e. spaces)
++* and ending with a newline '\n' or a semicolon ';'.
++*
++* Enter:
++* str - orig string
++* line - substring
++*
++* Returns:
++*   cp - pointer to next string
++*     or
++*   null - End of string
++*************************************************************/
++static char *
++qla2x00_get_line(char *str, char *line) 
++{
++	register	char 	*cp = str;
++	register	char 	*sp = line;
++
++	/* skip preceeding spaces */
++	while (*cp && *cp == ' ')
++		++cp;
++	while ((*cp) && *cp != '\n' && *cp != ';')   /* end of line */
++		*sp++ = *cp++;
++
++	*sp = '\0';
++
++	DEBUG5(printk("%s(): %s\n", __func__, line));
++
++	if( (*cp) ) {
++		cp++;
++		return (cp);
++	}
++
++	return (NULL);
++}
++
++
++/**************************** get_tokens *********************
++* Parse command line into argv1, argv2, ... argvX
++* Arguments are seperated by white spaces and colons and end
++* with a NULL.
++*************************************************************/
++static int 
++qla2x00_get_tokens(char *line, char **argv, int maxargs) 
++{
++	register	char 	*cp = line;
++	int	count = 0;
++
++	while (*cp && count < maxargs) {
++		/* skip preceeding spaces */
++		while ((*cp) && *cp == ' ')
++			++cp;
++		/* symbol starts here */
++		argv[count++] = cp;
++		/* skip symbols */
++		while ((*cp) && !(*cp == ' ' || *cp == ';' || *cp == ':'))
++			cp++;
++		/* replace comma or space with a null */
++		if((*cp) && (*cp ==' ' ) && argv[count-1] != cp)
++			*cp++ = '\0';
++	}
++	return (count);
++}
++
++/*
++* qla2x00_display_fc_names
++*      This routine will the node names of the different devices found
++*      after port inquiry.
++*
++* Input:
++*      cmd = SCSI command structure
++*
++* Returns:
++*      None.
++*/
++static void
++qla2x00_display_fc_names(scsi_qla_host_t *ha) 
++{
++	uint16_t	tgt;
++	os_tgt_t	*tq;
++
++	/* Display the node name for adapter */
++	printk(KERN_INFO
++	    "scsi-qla%d-adapter-node=%02x%02x%02x%02x%02x%02x%02x%02x\\;\n",
++	    (int)ha->instance,
++	    ha->init_cb->node_name[0],
++	    ha->init_cb->node_name[1],
++	    ha->init_cb->node_name[2],
++	    ha->init_cb->node_name[3],
++	    ha->init_cb->node_name[4],
++	    ha->init_cb->node_name[5],
++	    ha->init_cb->node_name[6],
++	    ha->init_cb->node_name[7]);
++
++	/* display the port name for adapter */
++	printk(KERN_INFO
++	    "scsi-qla%d-adapter-port=%02x%02x%02x%02x%02x%02x%02x%02x\\;\n",
++	    (int)ha->instance,
++	    ha->init_cb->port_name[0],
++	    ha->init_cb->port_name[1],
++	    ha->init_cb->port_name[2],
++	    ha->init_cb->port_name[3],
++	    ha->init_cb->port_name[4],
++	    ha->init_cb->port_name[5],
++	    ha->init_cb->port_name[6],
++	    ha->init_cb->port_name[7]);
++
++	/* Print out device port names */
++	for (tgt = 0; tgt < MAX_TARGETS; tgt++) {
++		if ((tq = ha->otgt[tgt]) == NULL)
++			continue;
++
++		if (tq->vis_port == NULL)
++			continue;
++
++		switch (ha->binding_type) {
++			case BIND_BY_PORT_NAME:
++				printk(KERN_INFO
++				    "scsi-qla%d-tgt-%d-di-0-port="
++				    "%02x%02x%02x%02x%02x%02x%02x%02x\\;\n",
++				    (int)ha->instance, 
++				    tgt,
++				    tq->port_name[0], 
++				    tq->port_name[1],
++				    tq->port_name[2], 
++				    tq->port_name[3],
++				    tq->port_name[4], 
++				    tq->port_name[5],
++				    tq->port_name[6], 
++				    tq->port_name[7]);
++
++				break;
++
++			case BIND_BY_PORT_ID:
++				printk(KERN_INFO
++				    "scsi-qla%d-tgt-%d-di-0-pid="
++				    "%02x%02x%02x\\;\n",
++				    (int)ha->instance,
++				    tgt,
++				    tq->d_id.b.domain,
++				    tq->d_id.b.area,
++				    tq->d_id.b.al_pa);
++				break;
++
++			case BIND_BY_NODE_NAME:
++				printk(KERN_INFO
++				    "scsi-qla%d-tgt-%d-di-0-node="
++				    "%02x%02x%02x%02x%02x%02x%02x%02x\\;\n",
++				    (int)ha->instance, 
++				    tgt,
++				    tq->node_name[0], 
++				    tq->node_name[1],
++				    tq->node_name[2], 
++				    tq->node_name[3],
++				    tq->node_name[4], 
++				    tq->node_name[5],
++				    tq->node_name[6], 
++				    tq->node_name[7]);
++				break;
++		}
++
++#if VSA
++		printk(KERN_INFO
++		    "scsi-qla%d-target-%d-vsa=01;\n", (int)ha->instance, tgt);
++#endif
++	}
++}
++
++/*
++ *  qla2x00_suspend_lun
++ *	Suspend lun and start port down timer
++ *
++ * Input:
++ *	ha = visable adapter block pointer.
++ *  lq = lun queue
++ *  cp = Scsi command pointer 
++ *  time = time in seconds
++ *  count = number of times to let time expire
++ *  delay_lun = non-zero, if lun should be delayed rather than suspended
++ *
++ * Return:
++ *     QL_STATUS_SUCCESS  -- suspended lun 
++ *     QL_STATUS_ERROR  -- Didn't suspend lun
++ *
++ * Context:
++ *	Interrupt context.
++ */
++uint8_t
++__qla2x00_suspend_lun(scsi_qla_host_t *ha,
++		os_lun_t *lq, int time, int count, int delay_lun)
++{
++	srb_t *sp;
++	struct list_head *list, *temp;
++	unsigned long flags;
++	uint8_t	status;
++
++	/* if the lun_q is already suspended then don't do it again */
++	if (lq->q_state == LUN_STATE_READY ||lq->q_state == LUN_STATE_RUN) {
++
++		spin_lock_irqsave(&lq->q_lock, flags);
++		if (lq->q_state == LUN_STATE_READY) {
++			lq->q_max = count;
++			lq->q_count = 0;
++		}
++		/* Set the suspend time usually 6 secs */
++		atomic_set(&lq->q_timer, time);
++
++		/* now suspend the lun */
++		lq->q_state = LUN_STATE_WAIT;
++
++		if (delay_lun) {
++			set_bit(LUN_EXEC_DELAYED, &lq->q_flag);
++			DEBUG(printk(KERN_INFO
++			    "scsi(%ld): Delay lun execution for %d secs, "
++			    "count=%d, max count=%d, state=%d\n",
++			    ha->host_no,
++			    time,
++			    lq->q_count, lq->q_max, lq->q_state));
++		} else {
++			DEBUG(printk(KERN_INFO
++			    "scsi(%ld): Suspend lun for %d secs, count=%d, "
++			    "max count=%d, state=%d\n",
++			    ha->host_no,
++			    time,
++			    lq->q_count, lq->q_max, lq->q_state));
++		}
++		spin_unlock_irqrestore(&lq->q_lock, flags);
++
++		/*
++		 * Remove all pending commands from request queue and  put them
++		 * in the scsi_retry queue.
++		 */
++		spin_lock_irqsave(&ha->list_lock, flags);
++		list_for_each_safe(list, temp, &ha->pending_queue) {
++			sp = list_entry(list, srb_t, list);
++			if (sp->lun_queue != lq)
++				continue;
++
++			__del_from_pending_queue(ha, sp);
++
++			if (sp->cmd->allowed < count)
++				sp->cmd->allowed = count;
++			__add_to_scsi_retry_queue(ha,sp);
++
++		} /* list_for_each_safe */
++		spin_unlock_irqrestore(&ha->list_lock, flags);
++		status = QL_STATUS_SUCCESS;
++	} else {
++		status = QL_STATUS_ERROR;
++	}
++
++	return (status);
++
++}
++
++/*
++ * qla2x00_mark_device_lost Updates fcport state when device goes offline.
++ *
++ * Input: ha = adapter block pointer.  fcport = port structure pointer.
++ *
++ * Return: None.
++ *
++ * Context:
++ */
++void qla2x00_mark_device_lost(scsi_qla_host_t *ha, fc_port_t *fcport)
++{
++	/* 
++	 * We may need to retry the login, so don't change the state of the
++	 * port but do the retries.
++	 */
++	if (atomic_read(&fcport->state) != FC_DEVICE_DEAD)
++		atomic_set(&fcport->state, FC_DEVICE_LOST);
++
++	if (fcport->login_retry == 0) {
++		fcport->login_retry = ha->login_retry_count;
++		set_bit(RELOGIN_NEEDED, &ha->dpc_flags);
++
++		DEBUG(printk("scsi(%ld): Port login retry: "
++		    "%02x%02x%02x%02x%02x%02x%02x%02x, "
++		    "id = 0x%04x retry cnt=%d\n",
++		    ha->host_no,
++		    fcport->port_name[0],
++		    fcport->port_name[1],
++		    fcport->port_name[2],
++		    fcport->port_name[3],
++		    fcport->port_name[4],
++		    fcport->port_name[5],
++		    fcport->port_name[6],
++		    fcport->port_name[7],
++		    fcport->loop_id,
++		    fcport->login_retry));
++	}
++}
++
++/*
++ * qla2x00_mark_all_devices_lost
++ *	Updates fcport state when device goes offline.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	fcport = port structure pointer.
++ *
++ * Return:
++ *	None.
++ *
++ * Context:
++ */
++void
++qla2x00_mark_all_devices_lost(scsi_qla_host_t *ha) 
++{
++	struct list_head	*fcpl;
++	fc_port_t		*fcport;
++
++	list_for_each(fcpl, &ha->fcports) {
++		fcport = list_entry(fcpl, fc_port_t, list);
++
++		/*
++		 * No point in marking the device as lost, if the device is
++		 * already DEAD.
++		 */
++		if (atomic_read(&fcport->state) == FC_DEVICE_DEAD)
++			continue;
++
++		atomic_set(&fcport->state, FC_DEVICE_LOST);
++	}
++}
++
++/*
++* qla2x00_mem_alloc
++*      Allocates adapter memory.
++*
++* Returns:
++*      0  = success.
++*      1  = failure.
++*/
++static uint8_t
++qla2x00_mem_alloc(scsi_qla_host_t *ha)
++{
++	uint8_t   status = 1;
++	uint8_t   i;
++	int	retry= 10;
++	mbx_cmdq_t	*ptmp;
++	mbx_cmdq_t	*tmp_q_head;
++	mbx_cmdq_t	*tmp_q_tail;
++
++	ENTER(__func__);
++
++	do {
++		/*
++		 * This will loop only once if everything goes well, else some
++		 * number of retries will be performed to get around a kernel
++		 * bug where available mem is not allocated until after a
++		 * little delay and a retry.
++		 */
++
++#if defined(FC_IP_SUPPORT)
++		ha->risc_rec_q = pci_alloc_consistent(ha->pdev,
++		    ((IP_BUFFER_QUEUE_DEPTH) * (sizeof(struct risc_rec_entry))),
++		    &ha->risc_rec_q_dma);
++		if (ha->risc_rec_q == NULL) {
++			printk(KERN_WARNING
++			    "scsi(%ld): Memory Allocation failed - "
++			    "risc_rec_q\n",
++			    ha->host_no);
++
++			set_current_state(TASK_INTERRUPTIBLE);
++			schedule_timeout(HZ/10);
++
++			continue;
++		}
++#endif	/* #if defined(FC_IP_SUPPORT) */
++
++		ha->request_ring = pci_alloc_consistent(ha->pdev,
++		    ((REQUEST_ENTRY_CNT + 1) * (sizeof(request_t))),
++		    &ha->request_dma);
++		if (ha->request_ring == NULL) {
++			printk(KERN_WARNING
++			    "scsi(%ld): Memory Allocation failed - "
++			    "request_ring\n",
++			    ha->host_no);
++
++			qla2x00_mem_free(ha);
++			set_current_state(TASK_INTERRUPTIBLE);
++			schedule_timeout(HZ/10);
++
++			continue;
++		}
++
++		ha->response_ring = pci_alloc_consistent(ha->pdev,
++		    ((RESPONSE_ENTRY_CNT + 1) * (sizeof(response_t))),
++		    &ha->response_dma);
++		if (ha->response_ring == NULL) {
++			printk(KERN_WARNING
++			    "scsi(%ld): Memory Allocation failed - "
++			    "response_ring\n",
++			    ha->host_no);
++
++			qla2x00_mem_free(ha);
++			set_current_state(TASK_INTERRUPTIBLE);
++			schedule_timeout(HZ/10);
++
++			continue;
++		}
++
++		/* get consistent memory allocated for init control block */
++		ha->init_cb = pci_alloc_consistent(ha->pdev,
++		    sizeof(init_cb_t), &ha->init_cb_dma);
++		if (ha->init_cb == NULL) {
++			printk(KERN_WARNING
++			    "scsi(%ld): Memory Allocation failed - "
++			    "init_cb\n",
++			    ha->host_no);
++
++			qla2x00_mem_free(ha);
++			set_current_state(TASK_INTERRUPTIBLE);
++			schedule_timeout(HZ/10);
++
++			continue;
++		}
++		memset(ha->init_cb, 0, sizeof(init_cb_t));
++
++		/* Allocate ioctl related memory. */
++		if (qla2x00_alloc_ioctl_mem(ha)) {
++			printk(KERN_WARNING
++			    "scsi(%ld): Memory Allocation failed - "
++			    "ioctl_mem\n",
++			    ha->host_no);
++
++			qla2x00_mem_free(ha);
++			set_current_state(TASK_INTERRUPTIBLE);
++			schedule_timeout(HZ/10);
++
++			continue;
++		}
++
++		if (qla2x00_allocate_sp_pool(ha)) {
++			printk(KERN_WARNING
++			    "scsi(%ld): Memory Allocation failed - "
++			    "qla2x00_allocate_sp_pool()\n",
++			    ha->host_no);
++
++			qla2x00_mem_free(ha);
++			set_current_state(TASK_INTERRUPTIBLE);
++			schedule_timeout(HZ/10);
++
++			continue;
++		}
++
++		/*
++		 * Allocate an initial list of mailbox semaphore queue to be
++		 * used for serialization of the mailbox commands.
++		 */
++		tmp_q_head = (void *)KMEM_ZALLOC(sizeof(mbx_cmdq_t), 20);
++		if (tmp_q_head == NULL) {
++			/* error */
++			printk(KERN_WARNING
++			    "scsi(%ld): Memory Allocation failed - "
++			    "mbx_cmd_q",
++			    ha->host_no);
++
++			qla2x00_mem_free(ha);
++			set_current_state(TASK_INTERRUPTIBLE);
++			schedule_timeout(HZ/10);
++
++			continue;
++		}
++		ha->mbx_sem_pool_head = tmp_q_head;
++		tmp_q_tail = tmp_q_head;
++
++		/* Now try to allocate more */
++		for (i = 1; i < MBQ_INIT_LEN; i++) {
++			ptmp = (void *)KMEM_ZALLOC(sizeof(mbx_cmdq_t), 20 + i);
++			if (ptmp == NULL) {
++				/*
++				 * Error. Just exit. If more is needed later
++				 * they will be allocated at that time.
++				 */
++				break;
++			}
++			tmp_q_tail->pnext = ptmp;
++			tmp_q_tail = ptmp;
++		}
++		ha->mbx_sem_pool_tail = tmp_q_tail;
++
++		/* Get consistent memory allocated for MS IOCB */
++		ha->ms_iocb = pci_alloc_consistent(ha->pdev,
++		    sizeof(ms_iocb_entry_t), &ha->ms_iocb_dma);
++		if (ha->ms_iocb == NULL) {
++			/* error */
++			printk(KERN_WARNING
++			    "scsi(%ld): Memory Allocation failed - ms_iocb\n",
++			    ha->host_no);
++
++			qla2x00_mem_free(ha);
++			set_current_state(TASK_INTERRUPTIBLE);
++			schedule_timeout(HZ/10);
++
++			continue;
++		}
++		memset(ha->ms_iocb, 0, sizeof(ms_iocb_entry_t));
++
++		/* Get consistent memory allocated for CT SNS commands */
++		ha->ct_sns = pci_alloc_consistent(ha->pdev,
++		    sizeof(struct ct_sns_pkt), &ha->ct_sns_dma);
++		if (ha->ct_sns == NULL) {
++			/* error */
++			printk(KERN_WARNING
++			    "scsi(%ld): Memory Allocation failed - ct_sns\n",
++			    ha->host_no);
++
++			qla2x00_mem_free(ha);
++			set_current_state(TASK_INTERRUPTIBLE);
++			schedule_timeout(HZ/10);
++
++			continue;
++		}
++		memset(ha->ct_sns, 0, sizeof(struct ct_sns_pkt));
++
++		/* Done all allocations without any error. */
++		status = 0;
++
++	} while (retry-- && status != 0);
++
++	if (status) {
++		printk(KERN_WARNING
++			"%s(): **** FAILED ****\n", __func__);
++	}
++
++	LEAVE(__func__);
++
++	return(status);
++}
++
++/*
++* qla2x00_mem_free
++*      Frees all adapter allocated memory.
++*
++* Input:
++*      ha = adapter block pointer.
++*/
++static void
++qla2x00_mem_free(scsi_qla_host_t *ha)
++{
++	uint32_t	t;
++	struct list_head	*fcpl, *fcptemp;
++	fc_port_t	*fcport;
++	struct list_head	*fcll, *fcltemp;
++	fc_lun_t	*fclun;
++	mbx_cmdq_t	*ptmp;
++	mbx_cmdq_t	*tmp_q_head;
++	unsigned long	wtime;/* max wait time if mbx cmd is busy. */
++	struct list_head *fcil, *fcitemp;
++	fc_initiator_t	*fcinitiator;
++
++	ENTER(__func__);
++
++	if (ha == NULL) {
++		/* error */
++		DEBUG2(printk("%s(): ERROR invalid ha pointer.\n", __func__));
++		return;
++	}
++
++	/* Free the target queues */
++	for (t = 0; t < MAX_TARGETS; t++) {
++		qla2x00_tgt_free(ha, t);
++	}
++
++	/* Make sure all other threads are stopped. */
++	wtime = 60 * HZ;
++	while ((ha->dpc_wait != NULL || ha->mbx_q_head != NULL) && wtime) {
++		set_current_state(TASK_INTERRUPTIBLE);
++		wtime = schedule_timeout(wtime);
++	}
++
++	/* Now free the mbx sem pool */
++	tmp_q_head = ha->mbx_sem_pool_head;
++	while (tmp_q_head != NULL) {
++		ptmp = tmp_q_head->pnext;
++		KMEM_FREE(tmp_q_head, sizeof(mbx_cmdq_t));
++		tmp_q_head = ptmp;
++	}
++	ha->mbx_sem_pool_head = NULL;
++
++	/* free ioctl memory */
++	qla2x00_free_ioctl_mem(ha);
++
++	/* Free host database. */
++	list_for_each_safe(fcil, fcitemp, &ha->fcinitiators) {
++		fcinitiator = list_entry(fcil, fc_initiator_t, list);
++
++		list_del(&fcinitiator->list);
++		kfree(fcinitiator);
++	}
++	INIT_LIST_HEAD(&ha->fcinitiators);
++
++	/* free sp pool */
++	qla2x00_free_sp_pool(ha);
++
++	if (ha->ct_sns) {
++		pci_free_consistent(ha->pdev,
++		    sizeof(struct ct_sns_pkt), ha->ct_sns, ha->ct_sns_dma);
++	}
++	if (ha->ms_iocb) {
++		pci_free_consistent(ha->pdev,
++		    sizeof(ms_iocb_entry_t), ha->ms_iocb, ha->ms_iocb_dma);
++	}
++
++	if (ha->init_cb) {
++		pci_free_consistent(ha->pdev,
++		    sizeof(init_cb_t), ha->init_cb, ha->init_cb_dma);
++	}
++
++	if (ha->request_ring) {
++		pci_free_consistent(ha->pdev,
++		    ((REQUEST_ENTRY_CNT + 1) * (sizeof(request_t))),
++		    ha->request_ring, ha->request_dma);
++	}
++
++	if (ha->response_ring) {
++		pci_free_consistent(ha->pdev,
++		    ((RESPONSE_ENTRY_CNT + 1) * (sizeof(response_t))),
++		    ha->response_ring, ha->response_dma);
++	}
++
++#if defined(FC_IP_SUPPORT)
++	if (ha->risc_rec_q) {
++		pci_free_consistent(ha->pdev,
++		    ((IP_BUFFER_QUEUE_DEPTH) * (sizeof(struct risc_rec_entry))),
++		    ha->risc_rec_q, ha->risc_rec_q_dma);
++	}
++	ha->risc_rec_q = NULL;
++	ha->risc_rec_q_dma = 0;
++#endif
++
++	ha->ct_sns = NULL;
++	ha->ms_iocb = NULL;
++
++	ha->init_cb = NULL;
++	ha->request_ring = NULL;
++	ha->request_dma = 0;
++	ha->response_ring = NULL;
++	ha->response_dma = 0;
++
++	list_for_each_safe(fcpl, fcptemp, &ha->fcports) {
++		fcport = list_entry(fcpl, fc_port_t, list);
++
++		/* fc luns */
++		list_for_each_safe(fcll, fcltemp, &fcport->fcluns) {
++			fclun = list_entry(fcll, fc_lun_t, list);
++
++			list_del_init(&fclun->list);
++			kfree(fclun);
++		}
++
++		/* fc ports */
++		list_del_init(&fcport->list);
++		kfree(fcport);
++	}
++	INIT_LIST_HEAD(&ha->fcports);
++
++	LEAVE(__func__);
++}
++
++/*
++ * qla2x00_allocate_sp_pool
++ * 	 This routine is called during initialization to allocate
++ *  	 memory for local srb_t.
++ *
++ * Input:
++ *	 ha   = adapter block pointer.
++ *
++ * Context:
++ *      Kernel context.
++ * 
++ * Note: Sets the ref_count for non Null sp to one.
++ */
++uint8_t
++qla2x00_allocate_sp_pool(scsi_qla_host_t *ha) 
++{
++	srb_t   *sp;
++	int  i;
++	uint8_t      status = QL_STATUS_SUCCESS;
++
++	ENTER(__func__);
++	
++	INIT_LIST_HEAD(&ha->free_queue);
++	ha->srb_alloc_cnt = 0;
++
++	ha->srb_pool_order = get_order(max_srbs * sizeof(srb_t));
++	ha->srb_pool =
++	    (srb_t *) __get_free_pages(GFP_KERNEL, ha->srb_pool_order);
++	if (ha->srb_pool != NULL) {
++		for (i = 0, sp = ha->srb_pool; i < max_srbs; i++, sp++) {
++			memset(sp, 0, sizeof(srb_t));
++			__add_to_free_queue (ha, sp);
++			sp->magic = SRB_MAGIC;
++			sp->ref_num = ha->srb_alloc_cnt;
++			sp->host_no = ha->host_no;
++			atomic_set(&sp->ref_count, 0);
++
++			ha->srb_alloc_cnt++;
++		}
++	}
++
++	/*
++	 * If we fail to allocte memory return an error
++	 */
++	if (ha->srb_alloc_cnt == 0)
++		status = QL_STATUS_ERROR;
++
++	printk(KERN_INFO
++	    "scsi(%ld): Allocated %d SRB(s).\n",
++	    ha->host_no, ha->srb_alloc_cnt);
++
++	LEAVE(__func__);
++
++	return (status);
++}
++
++/*
++ *  This routine frees all adapter allocated memory.
++ *  
++ */
++void
++qla2x00_free_sp_pool( scsi_qla_host_t *ha) 
++{
++	int cnt_free_srbs = 0;
++	srb_t *sp;
++	struct list_head *list, *temp;
++
++	/*
++	 * Count the number of entries, remove the entries from the list, then
++	 * free the pool.
++	 */
++	list_for_each_safe(list, temp, &ha->free_queue) {
++		sp = list_entry(list, srb_t, list);
++		
++		__del_from_free_queue(ha, sp);
++		cnt_free_srbs++;
++	}
++	free_pages((unsigned long)ha->srb_pool, ha->srb_pool_order);
++
++	if (cnt_free_srbs != ha->srb_alloc_cnt) {
++		DEBUG(printk("scsi(%ld): Did not free all srbs, Free count = "
++		    "%d, Alloc Count = %d\n",
++		    ha->host_no, cnt_free_srbs, ha->srb_alloc_cnt));
++		printk(KERN_INFO
++		    "scsi(%ld): Did not free all srbs, Free count = %d, "
++		    "Alloc Count = %d\n",
++		    ha->host_no, cnt_free_srbs, ha->srb_alloc_cnt);
++	}
++}
++
++
++
++/**************************************************************************
++* qla2x00_do_dpc
++*   This kernel thread is a task that is schedule by the interrupt handler
++*   to perform the background processing for interrupts.
++*
++* Notes:
++* This task always run in the context of a kernel thread.  It
++* is kick-off by the driver's detect code and starts up
++* up one per adapter. It immediately goes to sleep and waits for
++* some fibre event.  When either the interrupt handler or
++* the timer routine detects a event it will one of the task
++* bits then wake us up.
++**************************************************************************/
++static int
++qla2x00_do_dpc(void *data)
++{
++	DECLARE_MUTEX_LOCKED(sem);
++	scsi_qla_host_t *ha;
++	fcdev_t         dev;
++	struct list_head *fcpl;
++	fc_port_t	*fcport;
++	os_lun_t        *q;
++	srb_t           *sp;
++	uint8_t		status;
++	uint32_t        t;
++	unsigned long	flags = 0;
++	struct list_head *list, *templist;
++	int	dead_cnt, online_cnt;
++
++	ha = (scsi_qla_host_t *)data;
++
++	lock_kernel();
++
++	daemonize("%s_dpc%ld", DRIVER_NAME, ha->host_no);
++	allow_signal(SIGTERM);
++
++	ha->dpc_wait = &sem;
++
++	unlock_kernel();
++
++	complete(&ha->dpc_inited);
++
++	while (1) {
++		/*
++		 * If we get a signal, it means we are supposed to go
++		 * away and die.  This typically happens if the user is
++		 * trying to unload a module.
++		 */
++		DEBUG3(printk("qla2x00: DPC handler sleeping\n"));
++
++		down_interruptible(&sem);
++
++		if (signal_pending(current))
++			break;   /* get out */
++
++		if (ha->dpc_should_die)
++			break;
++
++		if (!list_empty(&ha->done_queue))
++			schedule_work(&ha->run_qla_task);
++
++		DEBUG3(printk("qla2x00: DPC handler waking up\n"));
++
++		/* Initialization not yet finished. Don't do anything yet. */
++		if (!ha->init_done || ha->dpc_active)
++			continue;
++
++		DEBUG3(printk("scsi(%ld): DPC handler\n", ha->host_no));
++
++		/* spin_lock_irqsave(&io_request_lock, ha->cpu_flags);*/
++		ha->dpc_active = 1;
++
++		/* Determine what action is necessary */
++
++		/* Process commands in retry queue */
++		if (test_and_clear_bit(PORT_RESTART_NEEDED, &ha->dpc_flags)) {
++			DEBUG(printk("scsi(%ld): DPC checking retry_q. "
++			    "total=%d\n",
++			    ha->host_no, ha->retry_q_cnt));
++
++			spin_lock_irqsave(&ha->list_lock, flags);
++			dead_cnt = online_cnt = 0;
++			list_for_each_safe(list, templist, &ha->retry_queue) {
++				sp = list_entry(list, srb_t, list);
++				q = sp->lun_queue;
++				DEBUG3(printk("scsi(%ld): pid=%ld sp=%p, "
++				    "spflags=0x%x, q_flag= 0x%lx\n",
++				    ha->host_no,
++				    sp->cmd->serial_number,
++				    sp, sp->flags, q->q_flag));
++
++				if (q == NULL)
++					continue;
++				fcport = q->fclun->fcport;
++
++				if (atomic_read(&fcport->state) ==
++				    FC_DEVICE_DEAD) {
++
++					__del_from_retry_queue(ha, sp);
++					CMD_RESULT(sp->cmd) =
++					    DID_NO_CONNECT << 16;
++					CMD_HANDLE(sp->cmd) =
++					    (unsigned char *) NULL;
++					__add_to_done_queue(ha, sp);
++					dead_cnt++;
++				} else if (atomic_read(&fcport->state) !=
++				    FC_DEVICE_LOST) {
++
++					__del_from_retry_queue(ha, sp);
++					CMD_RESULT(sp->cmd) =
++					    DID_BUS_BUSY << 16;
++					CMD_HANDLE(sp->cmd) =
++					    (unsigned char *) NULL;
++					__add_to_done_queue(ha, sp);
++					online_cnt++;
++				}
++			} /* list_for_each_safe() */
++			spin_unlock_irqrestore(&ha->list_lock, flags);
++
++			DEBUG(printk("scsi(%ld): done processing retry queue "
++			    "- dead=%d, online=%d\n ",
++			    ha->host_no, dead_cnt, online_cnt));
++		}
++
++		/* Process commands in scsi retry queue */
++		if (test_and_clear_bit(SCSI_RESTART_NEEDED, &ha->dpc_flags)) {
++			/*
++			 * Any requests we want to delay for some period is put
++			 * in the scsi retry queue with a delay added. The
++			 * timer will schedule a "scsi_restart_needed" every 
++			 * second as long as there are requests in the scsi
++			 * queue. 
++			 */
++			DEBUG(printk("scsi(%ld): DPC checking scsi "
++			    "retry_q.total=%d\n",
++			    ha->host_no, ha->scsi_retry_q_cnt));
++
++			online_cnt = 0;
++			spin_lock_irqsave(&ha->list_lock, flags);
++			list_for_each_safe(list,
++						templist,
++						&ha->scsi_retry_queue) {
++
++				sp = list_entry(list, srb_t, list);
++				q = sp->lun_queue;
++
++				DEBUG3(printk("scsi(%ld): scsi_retry_q: "
++				    "pid=%ld sp=%p, spflags=0x%x, "
++				    "q_flag= 0x%lx,q_state=%d\n",
++				    ha->host_no,
++				    sp->cmd->serial_number,
++				    sp, sp->flags, q->q_flag, q->q_state));
++
++				/* Was this lun suspended */
++				if (q->q_state != LUN_STATE_WAIT) {
++					online_cnt++;
++					__del_from_scsi_retry_queue(ha, sp);
++					__add_to_retry_queue(ha,sp);
++				}
++
++				/* Was this command suspended for N secs */
++				if (sp->delay != 0) {
++					sp->delay--;
++					if (sp->delay == 0) {
++						online_cnt++;
++						__del_from_scsi_retry_queue(
++						    ha, sp);
++						__add_to_retry_queue(ha,sp);
++					}
++				}
++			}
++			spin_unlock_irqrestore(&ha->list_lock, flags);
++
++			DEBUG(if (online_cnt > 0))
++			DEBUG(printk("scsi(%ld): dpc() found scsi reqs to "
++			    "restart= %d\n",
++			    ha->host_no, online_cnt));
++		}
++
++		if (ha->flags.mbox_busy) {
++			if (!list_empty(&ha->done_queue))
++				schedule_work(&ha->run_qla_task);
++
++			ha->dpc_active = 0;
++			continue;
++		}
++
++		if (test_and_clear_bit(ISP_ABORT_NEEDED, &ha->dpc_flags)) {
++
++			DEBUG(printk("scsi(%ld): dpc: sched "
++			    "qla2x00_abort_isp ha = %p\n",
++			    ha->host_no, ha));
++			if (!(test_and_set_bit(ABORT_ISP_ACTIVE,
++			    &ha->dpc_flags))) {
++
++				if (qla2x00_abort_isp(ha, 0)) {
++					/* failed. retry later */
++					set_bit(ISP_ABORT_NEEDED,
++					    &ha->dpc_flags);
++				}
++				clear_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags);
++			}
++			DEBUG(printk("scsi(%ld): dpc: qla2x00_abort_isp end\n",
++			    ha->host_no));
++		}
++
++		if (test_and_clear_bit(LOOP_RESET_NEEDED, &ha->dpc_flags)) {
++
++			DEBUG(printk("scsi(%ld): Loop Reset Needed -- "
++			    "calling qla2x00_loop_reset().\n",
++			    ha->host_no));
++
++			qla2x00_loop_reset(ha);
++		}
++
++		if (test_and_clear_bit(DEVICE_ABORT_NEEDED, &ha->dpc_flags)) {
++
++			DEBUG(printk("scsi(%ld): Device Abort Needed -- "
++			    "calling qla2x00_abort_device().\n",
++			    ha->host_no));
++
++			t = ha->reset_tgt_id;
++			if (ha->otgt[t] && ha->otgt[t]->vis_port)
++				qla2x00_abort_device(ha,
++					ha->otgt[t]->vis_port->loop_id,
++					ha->reset_lun);
++		}
++
++		if (test_and_clear_bit(RESET_MARKER_NEEDED, &ha->dpc_flags) &&
++		    (!(test_and_set_bit(RESET_ACTIVE, &ha->dpc_flags)))) {
++
++			DEBUG(printk("scsi(%ld): qla2x00_reset_marker()\n",
++			    ha->host_no));
++
++			qla2x00_rst_aen(ha);
++			clear_bit(RESET_ACTIVE, &ha->dpc_flags);
++		}
++
++		/* Retry each device up to login retry count */
++		if ((test_and_clear_bit(RELOGIN_NEEDED, &ha->dpc_flags)) &&
++		    !test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags) &&
++		    ha->loop_state != LOOP_DOWN) {
++
++			DEBUG(printk("scsi(%ld): qla2x00_port_login()\n",
++			    ha->host_no));
++
++			list_for_each(fcpl, &ha->fcports) {
++				fcport = list_entry(fcpl, fc_port_t, list);
++				
++				/*
++				 * If the port is not ONLINE then try to login
++				 * to it if we haven't run out of retries.
++				 */
++				if (atomic_read(&fcport->state) != FC_ONLINE &&
++				    fcport->login_retry) {
++
++					fcport->login_retry--;
++					memset(&dev, 0, sizeof(fcdev_t));
++					dev.loop_id = fcport->old_loop_id;
++					dev.d_id.b24 = fcport->d_id.b24;
++					if (ha->fc_db[fcport->dev_id].flag &
++					    DEV_PUBLIC)	
++						status = qla2x00_fabric_login(
++						    ha, &dev);
++					else 	
++						status =
++						    qla2x00_local_device_login(
++							ha,
++							(dev.loop_id & 0xff));
++
++					if (status == QL_STATUS_SUCCESS) {
++						ha->fc_db[fcport->dev_id].loop_id = dev.loop_id;
++						fcport->loop_id = dev.loop_id;
++						fcport->old_loop_id = dev.loop_id;
++
++						DEBUG(printk("scsi(%ld): port login OK: logged in ID 0x%x\n",
++						    ha->host_no, fcport->loop_id));
++						
++						fcport->port_login_retry_count =
++						    ha->port_down_retry_count * PORT_RETRY_TIME;
++						atomic_set(&fcport->state, FC_ONLINE);
++						atomic_set(&fcport->port_down_timer,
++						    ha->port_down_retry_count * PORT_RETRY_TIME);
++
++						fcport->login_retry = 0;
++					} else if (status == 1) {
++						if (dev.loop_id != fcport->old_loop_id) {
++							fcport->old_loop_id = dev.loop_id;
++							ha->fc_db[fcport->dev_id].loop_id = dev.loop_id;
++						}
++
++						set_bit(RELOGIN_NEEDED, &ha->dpc_flags);
++						/* retry the login again */
++						DEBUG(printk("scsi(%ld): Retrying %d login again loop_id 0x%x\n",
++						    ha->host_no,
++						    fcport->login_retry, fcport->loop_id));
++					} else {
++						fcport->login_retry = 0;
++					}
++				}
++				if (test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags))
++					break;
++			}
++			DEBUG(printk("scsi(%ld): qla2x00_port_login - end\n",
++			    ha->host_no));
++		}
++
++		if ((test_bit(LOGIN_RETRY_NEEDED, &ha->dpc_flags)) &&
++		    ha->loop_state != LOOP_DOWN ) {
++
++			clear_bit(LOGIN_RETRY_NEEDED, &ha->dpc_flags);
++			DEBUG(printk("scsi(%ld): qla2x00_login_retry()\n",
++			    ha->host_no));
++				
++			set_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags);
++
++			DEBUG(printk("scsi(%ld): qla2x00_login_retry - end\n",
++			    ha->host_no));
++		}
++
++		if (test_and_clear_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags)) {
++
++			DEBUG(printk("scsi(%ld): qla2x00_loop_resync()\n",
++			    ha->host_no));
++
++			if (!(test_and_set_bit(LOOP_RESYNC_ACTIVE,
++			    &ha->dpc_flags))) {
++
++				qla2x00_loop_resync(ha);
++
++				clear_bit(LOOP_RESYNC_ACTIVE, &ha->dpc_flags);
++			}
++
++			DEBUG(printk("scsi(%ld): qla2x00_loop_resync - end\n",
++			    ha->host_no));
++		}
++
++		if (ha->flags.failover_enabled) {
++			/*
++			 * If we are not processing a ioctl or one of
++			 * the ports are still MISSING or need a resync
++			 * then process the failover event.
++			*/  
++			if (!test_bit(CFG_ACTIVE, &ha->cfg_flags)) {
++				if (qla2x00_check_for_devices_online(ha)) {
++					if (test_and_clear_bit(FAILOVER_EVENT, &ha->dpc_flags)) {
++
++						DEBUG(printk("scsi(%ld): qla2x00_cfg_event_notify()\n",
++						    ha->host_no));
++
++						if (ha->flags.online) {
++							qla2x00_cfg_event_notify(ha, ha->failover_type);
++						}
++
++						DEBUG(printk("scsi(%ld): qla2x00_cfg_event_notify - end\n",
++						    ha->host_no));
++					}
++				}
++
++				if (test_and_clear_bit(FAILOVER_NEEDED, &ha->dpc_flags)) {
++					/*
++					 * Get any requests from failover queue
++					 */
++					DEBUG(printk("scsi(%ld): qla2x00_process_failover()\n",
++					    ha->host_no));
++
++					qla2x00_process_failover(ha);
++
++					DEBUG(printk("scsi(%ld): qla2x00_process_failover - end\n",
++					    ha->host_no));
++				}
++			}
++		}
++
++		if (test_bit(RESTART_QUEUES_NEEDED, &ha->dpc_flags)) {
++			DEBUG(printk("scsi(%ld): qla2x00_restart_queues()\n",
++			    ha->host_no));
++
++			qla2x00_restart_queues(ha,FALSE);
++
++			DEBUG(printk("scsi(%ld): qla2x00_restart_queues - end\n",
++			    ha->host_no));
++		}
++
++		if (test_bit(ABORT_QUEUES_NEEDED, &ha->dpc_flags)) {
++
++			DEBUG(printk("scsi(%ld): qla2x00_abort_queues()\n",
++			    ha->host_no));
++				
++			qla2x00_abort_queues(ha, FALSE);
++
++			DEBUG(printk("scsi(%ld): qla2x00_abort_queues - end\n",
++			    ha->host_no));
++		}
++
++		if (!ha->interrupts_on)
++			qla2x00_enable_intrs(ha);
++
++		if (!list_empty(&ha->done_queue))
++			schedule_work(&ha->run_qla_task);
++
++		ha->dpc_active = 0;
++	} /* End of while(1) */
++
++	DEBUG(printk("scsi(%ld): DPC handler exiting\n", ha->host_no));
++
++	/*
++	 * Make sure that nobody tries to wake us up again.
++	 */
++	ha->dpc_wait = NULL;
++	ha->dpc_active = 0;
++
++	complete_and_exit(&ha->dpc_exited, 0);
++}
++
++/*
++ *  qla2x00_abort_queues
++ *	Abort all commands on queues on device
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *
++ * Context:
++ *	Interrupt context.
++ */
++void
++qla2x00_abort_queues(scsi_qla_host_t *ha, uint8_t doneqflg) 
++{
++
++	srb_t       *sp;
++	struct list_head *list, *temp;
++	unsigned long flags;
++
++	ENTER(__func__);
++
++	clear_bit(ABORT_QUEUES_NEEDED, &ha->dpc_flags);
++
++	/* Return all commands device queues. */
++	spin_lock_irqsave(&ha->list_lock,flags);
++	list_for_each_safe(list, temp, &ha->pending_queue) {
++		sp = list_entry(list, srb_t, list);
++
++		if (sp->flags & SRB_ABORTED)
++			continue;
++
++		/* Remove srb from LUN queue. */
++		__del_from_pending_queue(ha, sp);
++
++		/* Set ending status. */
++		CMD_RESULT(sp->cmd) = DID_BUS_BUSY << 16;
++
++		__add_to_done_queue(ha, sp);
++	}
++	spin_unlock_irqrestore(&ha->list_lock, flags);
++
++	LEAVE(__func__);
++}
++
++/*
++ * qla2x00_check_for_devices_online
++ *
++ *	Check fcport state of all devices to make sure online.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *
++ * Return:
++ *	None.
++ *
++ * Context:
++ */
++static uint8_t
++qla2x00_check_for_devices_online(scsi_qla_host_t *ha) 
++{
++	struct list_head	*fcpl;
++	fc_port_t	*fcport;
++	int		found, cnt;
++
++	found = 0;
++	cnt = 0;
++
++	list_for_each(fcpl, &ha->fcports) {
++		fcport = list_entry(fcpl, fc_port_t, list);
++
++		if ((atomic_read(&fcport->state) == FC_ONLINE) ||
++			(atomic_read(&fcport->state) == FC_DEVICE_DEAD))
++			found++;
++
++		cnt++;
++	}
++	if (cnt == found) {
++		DEBUG5(printk("%s(%ld): all online\n",
++				__func__,
++				ha->host_no);)
++		return 1;
++	} else
++		return 0;
++}
++
++/*
++*  qla2x00_rst_aen
++*      Processes asynchronous reset.
++*
++* Input:
++*      ha  = adapter block pointer.
++*/
++static void
++qla2x00_rst_aen(scsi_qla_host_t *ha) 
++{
++	ENTER(__func__);
++
++	if (ha->flags.online && !ha->flags.reset_active &&
++	    !atomic_read(&ha->loop_down_timer) &&
++	    !(test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags))) {
++
++		/* 10/15 ha->flags.reset_active = TRUE; */
++		do {
++			clear_bit(RESET_MARKER_NEEDED, &ha->dpc_flags);
++
++			/*
++			 * Issue marker command only when we are going to start
++			 * the I/O.
++			 */
++			ha->marker_needed = 1;
++		} while (!atomic_read(&ha->loop_down_timer) &&
++		    (test_bit(RESET_MARKER_NEEDED, &ha->dpc_flags)));
++
++		/* 10/15 ha->flags.reset_active = FALSE; */
++	}
++
++	LEAVE(__func__);
++}
++
++
++/*
++ * This routine will alloacte SP from the free queue
++ * input:
++ *        scsi_qla_host_t *
++ * output:
++ *        srb_t * or NULL
++ */
++srb_t *
++qla2x00_get_new_sp(scsi_qla_host_t *ha)
++{
++	srb_t * sp = NULL;
++	ulong  flags;
++
++	spin_lock_irqsave(&ha->list_lock, flags);
++	if (!list_empty(&ha->free_queue)) {
++		sp = list_entry(ha->free_queue.next, srb_t, list);
++		__del_from_free_queue(ha, sp);
++	}
++	spin_unlock_irqrestore(&ha->list_lock, flags);
++
++	if (sp) {
++#if defined(QL_DEBUG_LEVEL_4)
++		if ((int)atomic_read(&sp->ref_count) != 0) {
++			printk(KERN_WARNING
++			    "scsi(%ld): WARNING ref_count not zero!\n",
++			    ha->host_no);
++		}
++#endif
++
++		sp_get(ha, sp);
++	}
++
++	return (sp);
++}
++
++/**************************************************************************
++*   qla2x00_timer
++*
++* Description:
++*   One second timer
++*
++* Context: Interrupt
++***************************************************************************/
++static void
++qla2x00_timer(scsi_qla_host_t *ha)
++{
++	int		t,l;
++	unsigned long	cpu_flags = 0;
++	struct list_head	*fcpl;
++	fc_port_t	*fcport;
++	os_lun_t *lq;
++	os_tgt_t *tq;
++	int		start_dpc = 0;
++
++	/*
++	 * We try and restart any request in the retry queue every second.
++	 */
++	if (!list_empty(&ha->retry_queue)) {
++		set_bit(PORT_RESTART_NEEDED, &ha->dpc_flags);
++		start_dpc++;
++	}
++
++	/*
++	 * We try and restart any request in the scsi_retry queue every second.
++	 */
++	if (!list_empty(&ha->scsi_retry_queue)) {
++		set_bit(SCSI_RESTART_NEEDED, &ha->dpc_flags);
++		start_dpc++;
++	}
++
++	/*
++	 * We try and failover any request in the failover queue every second.
++	 */
++	if (!list_empty(&ha->failover_queue)) {
++		set_bit(FAILOVER_NEEDED, &ha->dpc_flags);
++		start_dpc++;
++	}
++
++	/*
++	 * Ports - Port down timer.
++	 *
++	 * Whenever, a port is in the LOST state we start decrementing its port
++	 * down timer every second until it reaches zero. Once  it reaches zero
++	 * the port it marked DEAD. 
++	 */
++	t = 0;
++	list_for_each(fcpl, &ha->fcports) {
++		fcport = list_entry(fcpl, fc_port_t, list);
++
++		if (atomic_read(&fcport->state) == FC_DEVICE_LOST) {
++
++			if (atomic_read(&fcport->port_down_timer) == 0)
++				continue;
++
++			if (atomic_dec_and_test(&fcport->port_down_timer) != 0) 
++				atomic_set(&fcport->state, FC_DEVICE_DEAD);
++			
++			DEBUG(printk("scsi(%ld): fcport-%d - port retry count: "
++			    "%d remainning\n",
++			    ha->host_no,
++			    t, atomic_read(&fcport->port_down_timer)));
++		}
++		t++;
++	} /* End of for fcport  */
++
++	/*
++	 * LUNS - lun suspend timer.
++	 *
++	 * Whenever, a lun is suspended the timer starts decrementing its
++	 * suspend timer every second until it reaches zero. Once  it reaches
++	 * zero the lun retry count is decremented. 
++	 */
++
++	/*
++	 * FIXME(dg) - Need to convert this linear search of luns into a search
++	 * of a list of suspended luns.
++	 */
++	for (t = 0; t < ha->max_targets; t++) {
++		if ((tq = ha->otgt[t]) == NULL)
++			continue;
++
++		for (l = 0; l < ha->max_luns; l++) {
++			if ((lq = (os_lun_t *) tq->olun[l]) == NULL)
++				continue;
++
++			spin_lock_irqsave(&lq->q_lock, cpu_flags);
++			if (lq->q_state == LUN_STATE_WAIT &&
++				atomic_read(&lq->q_timer) != 0) {
++
++				if (atomic_dec_and_test(&lq->q_timer) != 0) {
++					/*
++					 * A delay should immediately
++					 * transition to a READY state
++					 */
++					if (test_and_clear_bit(LUN_EXEC_DELAYED,
++					    &lq->q_flag)) {
++						lq->q_state = LUN_STATE_READY;
++					}
++					else {
++						lq->q_count++;
++						if (lq->q_count == lq->q_max)
++							lq->q_state =
++							    LUN_STATE_TIMEOUT;
++						else
++							lq->q_state =
++							    LUN_STATE_RUN;
++					}
++				}
++				DEBUG3(printk("scsi(%ld): lun%d - timer %d, "
++				    "count=%d, max=%d, state=%d\n",
++				    ha->host_no,
++				    l,
++				    atomic_read(&lq->q_timer),
++				    lq->q_count, lq->q_max, lq->q_state));
++			}
++			spin_unlock_irqrestore(&lq->q_lock, cpu_flags);
++		} /* End of for luns  */
++	} /* End of for targets  */
++
++	/* Loop down handler. */
++	if (atomic_read(&ha->loop_down_timer) > 0 &&
++	    !(test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)) && ha->flags.online) {
++
++		/* dg 10/30 if (atomic_read(&ha->loop_down_timer) == LOOP_DOWN_TIME) { */
++		if (atomic_read(&ha->loop_down_timer) ==
++		    ha->loop_down_abort_time ) {
++
++			DEBUG(printk("scsi(%ld): Loop Down - aborting the "
++			    "queues before time expire\n",
++			    ha->host_no));
++
++			set_bit(ABORT_QUEUES_NEEDED, &ha->dpc_flags);
++			start_dpc++;
++		}
++
++		/* if the loop has been down for 4 minutes, reinit adapter */
++		if (atomic_dec_and_test(&ha->loop_down_timer) != 0) {
++			DEBUG(printk("scsi(%ld): Loop down exceed 4 mins - "
++			    "restarting queues.\n",
++			    ha->host_no));
++
++			set_bit(RESTART_QUEUES_NEEDED, &ha->dpc_flags);
++			start_dpc++;
++			if (!(ha->device_flags & DFLG_NO_CABLE) &&
++			    qla2x00_reinit && !ha->flags.failover_enabled) {
++
++				DEBUG(printk("scsi(%ld): Loop down - "
++				    "aborting ISP.\n",
++				    ha->host_no));
++
++				set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
++			}
++		}
++		DEBUG3(printk("scsi(%ld): Loop Down - seconds remainning %d\n",
++		    ha->host_no,
++		    atomic_read(&ha->loop_down_timer)));
++	}
++
++	/*
++	 * Done Q Handler -- dgFIXME This handler will kick off doneq if we
++	 * haven't process it in 2 seconds.
++	 */
++	if (!list_empty(&ha->done_queue))
++		schedule_work(&ha->run_qla_task);
++
++#if QLA2100_LIPTEST
++	/*
++	 * This block is used to periodically schedule isp abort after
++	 * qla2x00_lip flag is set. 
++	 */
++
++	/*
++	   if (qla2x00_lip && (ha->forceLip++) == (60*2)) {
++	   printk("timer: schedule isp abort.\n");
++	   set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
++	   ha->forceLip = 0;
++	   }
++	 */
++
++	/*
++	 * This block is used to periodically schedule mailbox cmd timeout
++	 * simulation
++	 */
++	if (qla2x00_lip && (ha->forceLip++) == (60*6)) {
++		printk("qla2x00_timer: Going to force mbx timeout\n");
++
++		ha->forceLip = 0;
++		mbxtimeout = 1;
++	}
++#endif
++
++	if (test_bit(FAILOVER_EVENT_NEEDED, &ha->dpc_flags)) {
++		if (ha->failback_delay)  {
++			ha->failback_delay--;
++			if (ha->failback_delay == 0)  {
++				set_bit(FAILOVER_EVENT, &ha->dpc_flags);
++				clear_bit(FAILOVER_EVENT_NEEDED,
++				    &ha->dpc_flags);
++			}
++		} else {
++			set_bit(FAILOVER_EVENT, &ha->dpc_flags);
++			clear_bit(FAILOVER_EVENT_NEEDED, &ha->dpc_flags);
++		}
++	}
++
++	/* Schedule the DPC routine if needed */
++	if ((test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags) ||
++	    test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags) ||
++	    start_dpc ||
++	    test_bit(LOGIN_RETRY_NEEDED, &ha->dpc_flags) ||
++	    test_bit(FAILOVER_EVENT, &ha->dpc_flags) ||
++	    test_bit(FAILOVER_NEEDED, &ha->dpc_flags) ||
++	    test_bit(MAILBOX_CMD_NEEDED, &ha->dpc_flags)) &&
++	    ha->dpc_wait && !ha->dpc_active ) {
++
++		up(ha->dpc_wait);
++	}
++
++	qla2x00_restart_timer(ha, WATCH_INTERVAL);
++}
++
++/*
++ * qla2x00_extend_timeout
++ *      This routine will extend the timeout to the specified value.
++ *
++ * Input:
++ *      cmd = SCSI command structure
++ *
++ * Returns:
++ *      None.
++ */
++void 
++qla2x00_extend_timeout(Scsi_Cmnd *cmd, int timeout) 
++{
++	srb_t *sp = (srb_t *) CMD_SP(cmd);
++	u_long our_jiffies = (timeout * HZ) + jiffies;
++
++    	sp->ext_history= 0; 
++	sp->e_start = jiffies;
++	if (cmd->eh_timeout.function) {
++		mod_timer(&cmd->eh_timeout,our_jiffies);
++		sp->ext_history |= 1;
++	}
++	if (sp->timer.function != NULL) {
++		/* 
++		 * Our internal timer should timeout before the midlayer has a
++		 * chance begin the abort process
++		 */
++		mod_timer(&sp->timer,our_jiffies - (QLA_CMD_TIMER_DELTA * HZ));
++
++    	 	sp->ext_history |= 2;
++	}
++}
++
++/**************************************************************************
++*   qla2x00_cmd_timeout
++*
++* Description:
++*       Handles the command if it times out in any state.
++*
++* Input:
++*     sp - pointer to validate
++*
++* Returns:
++* None.
++* Note:Need to add the support for if( sp->state == SRB_FAILOVER_STATE).
++**************************************************************************/
++static void
++qla2x00_cmd_timeout(srb_t *sp)
++{
++	int t, l;
++	int processed;
++	scsi_qla_host_t *vis_ha, *dest_ha;
++	Scsi_Cmnd *cmd;
++	ulong      flags;
++#if defined(QL_DEBUG_LEVEL_3)
++	ulong      cpu_flags;
++#endif
++	fc_port_t	*fcport;
++
++	cmd = sp->cmd;
++	vis_ha = (scsi_qla_host_t *)cmd->device->host->hostdata;
++
++	DEBUG3(printk("cmd_timeout: Entering sp->state = %x\n", sp->state));
++
++	t = SCSI_TCN_32(cmd);
++	l = SCSI_LUN_32(cmd);
++	fcport = sp->fclun->fcport;
++	dest_ha = sp->ha;
++
++	/*
++	 * If IO is found either in retry Queue 
++	 *    OR in Lun Queue
++	 * Return this IO back to host
++	 */
++	spin_lock_irqsave(&vis_ha->list_lock, flags);
++	processed = 0;
++	if (sp->state == SRB_PENDING_STATE) {
++		__del_from_pending_queue(vis_ha, sp);
++		DEBUG2(printk("scsi(%ld): Found in Pending queue pid %ld, "
++		    "State = %x., fcport state=%d jiffies=%lx\n",
++		    vis_ha->host_no,
++		    sp->cmd->serial_number, sp->state,
++		    atomic_read(&fcport->state), jiffies));
++
++		/*
++		 * If FC_DEVICE is marked as dead return the cmd with
++		 * DID_NO_CONNECT status.  Otherwise set the host_byte to
++		 * DID_BUS_BUSY to let the OS  retry this cmd.
++		 */
++		if (atomic_read(&fcport->state) == FC_DEVICE_DEAD) {
++			cmd->result = DID_NO_CONNECT << 16;
++		} else {
++			cmd->result = DID_BUS_BUSY << 16;
++		}
++		__add_to_done_queue(vis_ha, sp);
++		processed++;
++	} 
++	spin_unlock_irqrestore(&vis_ha->list_lock, flags);
++
++	if (processed) {
++		 schedule_work(&vis_ha->run_qla_task);
++
++		 return;
++	}
++
++	spin_lock_irqsave(&dest_ha->list_lock, flags);
++	if ((sp->state == SRB_RETRY_STATE) ||
++	    (sp->state == SRB_SCSI_RETRY_STATE) ||
++	    (sp->state == SRB_FAILOVER_STATE)) {
++
++		DEBUG2(printk("scsi(%ld): Found in (Scsi) Retry queue or "
++		    "failover Q pid %ld, State = %x., fcport state=%d "
++		    "jiffies=%lx retried=%d\n",
++		    dest_ha->host_no,
++		    sp->cmd->serial_number, sp->state,
++		    atomic_read(&fcport->state),
++		    jiffies, sp->cmd->retries));
++
++		if ((sp->state == SRB_RETRY_STATE)) {
++			__del_from_retry_queue(dest_ha, sp);
++		} else if ((sp->state == SRB_SCSI_RETRY_STATE)) {
++			__del_from_scsi_retry_queue(dest_ha, sp);
++		} else if ((sp->state == SRB_FAILOVER_STATE)) {
++			__del_from_failover_queue(dest_ha, sp);
++		}
++
++		/*
++		 * If FC_DEVICE is marked as dead return the cmd with
++		 * DID_NO_CONNECT status.  Otherwise set the host_byte to
++		 * DID_BUS_BUSY to let the OS  retry this cmd.
++		 */
++		if (dest_ha->flags.failover_enabled) {
++			cmd->result = DID_BUS_BUSY << 16;
++		} else {
++			if (atomic_read(&fcport->state) == FC_DEVICE_DEAD) {
++				cmd->result = DID_NO_CONNECT << 16;
++				qla2x00_extend_timeout(cmd, EXTEND_CMD_TIMEOUT);
++			} else {
++				cmd->result = DID_BUS_BUSY << 16;
++			}
++		}
++
++		__add_to_done_queue(dest_ha, sp);
++		processed++;
++	} 
++	spin_unlock_irqrestore(&dest_ha->list_lock, flags);
++
++	if (processed) {
++		 schedule_work(&dest_ha->run_qla_task);
++
++		 return;
++	}
++/* TODO: Remove this code!!! */
++#if defined(QL_DEBUG_LEVEL_3)
++	spin_lock_irqsave(&dest_ha->list_lock, cpu_flags);
++	if (sp->state == SRB_DONE_STATE) {
++		/* IO in done_q  -- leave it */
++		DEBUG(printk("scsi(%ld): Found in Done queue pid %ld sp=%p.\n",
++		    dest_ha->host_no, sp->cmd->serial_number, sp));
++	} else if (sp->state == SRB_SUSPENDED_STATE) {
++		DEBUG(printk("scsi(%ld): Found SP %p in suspended state  "
++		    "- pid %d:\n",
++		    dest_ha->host_no,sp,
++		    (int)sp->cmd->serial_number));
++		DEBUG(qla2x00_dump_buffer((uint8_t *)sp, sizeof(srb_t));)
++	} else if (sp->state == SRB_ACTIVE_STATE) {
++		/*
++		 * IO is with ISP find the command in our active list.
++		 */
++		spin_unlock_irqrestore(&dest_ha->list_lock, cpu_flags);
++		spin_lock_irqsave(&dest_ha->hardware_lock, flags);
++		if (sp ==
++		    dest_ha->outstanding_cmds[(u_long)CMD_HANDLE(sp->cmd)]) {
++
++			DEBUG(printk("cmd_timeout: Found in ISP \n");)
++
++			sp->state = SRB_ACTIVE_TIMEOUT_STATE;
++			spin_unlock_irqrestore(&dest_ha->hardware_lock, flags);
++		} else {
++			spin_unlock_irqrestore(&dest_ha->hardware_lock, flags);
++			printk(KERN_INFO 
++				"qla_cmd_timeout: State indicates it is with "
++				"ISP, But not in active array\n");
++		}
++		spin_lock_irqsave(&dest_ha->list_lock, cpu_flags); 	/* 01/03 */
++	} else if (sp->state == SRB_ACTIVE_TIMEOUT_STATE) {
++		DEBUG(printk("qla2100%ld: Found in Active timeout state"
++				"pid %ld, State = %x., \n",
++				dest_ha->host_no,
++				sp->cmd->serial_number, sp->state);)
++	} else {
++		/* EMPTY */
++		DEBUG2(printk("cmd_timeout%ld: LOST command state = "
++				"0x%x, sp=%p\n",
++				vis_ha->host_no, sp->state,sp);)
++
++		printk(KERN_INFO
++			"cmd_timeout: LOST command state = 0x%x\n", sp->state);
++	}
++	spin_unlock_irqrestore(&dest_ha->list_lock, cpu_flags);
++#endif
++	
++	DEBUG3(printk("cmd_timeout: Leaving\n");)
++}
++
++/*
++ * qla2x00_done_work
++ *
++ * This is a task to process completion only similar to a
++ * bottom half handler.
++ *
++ *      Input:
++ *      p -- pointer to hba struct
++ *
++ */
++void
++qla2x00_done_work(void *p)
++{
++	scsi_qla_host_t *ha = (scsi_qla_host_t *) p;
++
++	ENTER(__func__);
++
++	set_bit(TASKLET_SCHED, &ha->dpc_flags);
++
++	if (!list_empty(&ha->done_queue))
++		qla2x00_done(ha);
++	
++	clear_bit(TASKLET_SCHED, &ha->dpc_flags);
++
++	LEAVE(__func__);
++}
++
++
++/**************************************************************************
++* qla2x00_done
++*      Process completed commands.
++*
++* Input:
++*      old_ha           = adapter block pointer.
++*
++* Returns:
++* int     
++**************************************************************************/
++int
++qla2x00_done(scsi_qla_host_t *old_ha)
++{
++	os_lun_t	*lq;
++	Scsi_Cmnd	*cmd;
++	unsigned long	flags = 0;
++	scsi_qla_host_t	*ha;
++	scsi_qla_host_t	*vis_ha;
++	int	cnt;
++	int	send_marker_once = 0;
++	struct list_head	*spl, *sptemp;
++	srb_t           *sp;
++	struct	list_head local_sp_list;
++
++	ENTER(__func__);
++
++	if (test_bit(DONE_RUNNING, &old_ha->dpc_flags))
++		return (0);
++
++	set_bit(DONE_RUNNING, &old_ha->dpc_flags);
++	cnt = 0;
++
++	INIT_LIST_HEAD(&local_sp_list);
++
++	/*
++	 * Get into local queue such that we do not wind up calling done queue
++	 * takslet for the same IOs from DPC or any other place.
++	 */
++	spin_lock_irqsave(&old_ha->list_lock,flags);
++	list_for_each_safe(spl, sptemp, &old_ha->done_queue) {
++		sp = list_entry(spl, srb_t, list);
++
++		/* remove command from done list */
++		list_del_init(&sp->list);
++
++		old_ha->done_q_cnt--;
++        	sp->state = SRB_NO_QUEUE_STATE;
++
++		/* add to local queue */
++		list_add_tail(&sp->list, &local_sp_list);
++	}
++	spin_unlock_irqrestore(&old_ha->list_lock, flags);
++
++	/*
++	 * All done commands are in the local queue, now do the call back.
++	 */
++	list_for_each_safe(spl, sptemp, &local_sp_list) {
++		sp = list_entry(spl, srb_t, list);
++
++		/* remove command from local list */
++		list_del_init(&sp->list);
++
++		cnt++;
++
++		cmd = sp->cmd;
++		if (cmd == NULL)
++		 	continue;
++
++		vis_ha = (scsi_qla_host_t *)cmd->device->host->hostdata;
++		lq = sp->lun_queue;
++		ha = lq->fclun->fcport->ha;
++
++		if (sp->flags & SRB_DMA_VALID) {
++			sp->flags &= ~SRB_DMA_VALID;
++
++			/* 4.10   64 and 32 bit */
++			/* Release memory used for this I/O */
++			if (cmd->use_sg) {
++				pci_unmap_sg(ha->pdev,
++				    cmd->request_buffer,
++				    cmd->use_sg,
++				    scsi_to_pci_dma_dir(
++					    cmd->sc_data_direction));
++			} else if (cmd->request_bufflen) {
++				pci_unmap_page(ha->pdev,
++				    sp->saved_dma_handle,
++				    cmd->request_bufflen,
++				    scsi_to_pci_dma_dir(
++					    cmd->sc_data_direction));
++			}
++		}
++
++		if (!(sp->flags & SRB_IOCTL) && ha->flags.failover_enabled) {
++			/*
++			 * This routine checks for DID_NO_CONNECT to decide
++			 * whether to failover to another path or not. We only
++			 * failover on that status.
++			 */
++			if (qla2x00_fo_check(ha,sp)) {
++				if ((sp->state != SRB_FAILOVER_STATE)) {
++					/*
++					 * Retry the command on this path
++					 * several times before selecting a new
++					 * path.
++					 */
++					add_to_pending_queue_head(vis_ha, sp);
++					qla2x00_next(vis_ha);
++				}
++				else {
++					/* we failover this path */
++					qla2x00_extend_timeout(sp->cmd,
++							EXTEND_CMD_TIMEOUT);
++				}
++				continue;
++			}
++			
++		}
++
++		switch ((CMD_RESULT(cmd)>>16)) {
++			case DID_OK:
++			case DID_ERROR:
++				break;
++
++			case DID_RESET:
++				/*
++				 * Set marker needed, so we don't have to
++				 * send multiple markers
++				 */
++				if (!send_marker_once) {
++					ha->marker_needed = 1;
++					send_marker_once++;
++				}
++
++				/*
++				 * WORKAROUND
++				 *
++				 * A backdoor device-reset requires different
++				 * error handling.  This code differentiates
++				 * between normal error handling and the
++				 * backdoor method.
++				 *
++				 */
++				if (ha->host->eh_active != EH_ACTIVE)
++					CMD_RESULT(sp->cmd) =
++					    DID_BUS_BUSY << 16;
++				break;
++
++
++			case DID_ABORT:
++				sp->flags &= ~SRB_ABORT_PENDING;
++				sp->flags |= SRB_ABORTED;
++
++				if (sp->flags & SRB_TIMEOUT)
++					CMD_RESULT(cmd)= DID_TIME_OUT << 16;
++
++				break;
++
++			default:
++				DEBUG2(printk("scsi(%ld:%d:%d) %s: did_error "
++				    "= %d, comp-scsi= 0x%x-0x%x.\n",
++				    vis_ha->host_no,
++				    SCSI_TCN_32(cmd),
++				    SCSI_LUN_32(cmd),
++				    __func__,
++				    (CMD_RESULT(cmd)>>16),
++				    CMD_COMPL_STATUS(cmd),
++				    CMD_SCSI_STATUS(cmd)));
++				break;
++		}
++
++		/*
++		 * Call the mid-level driver interrupt handler -- via sp_put()
++		 */
++		sp_put(ha, sp);
++
++		qla2x00_next(vis_ha);
++
++	} /* end of while */
++	clear_bit(DONE_RUNNING, &old_ha->dpc_flags);
++
++	LEAVE(__func__);
++
++	return (cnt);
++}
++
++/*
++ * qla2x00_next
++ *	Retrieve and process next job in the LUN queue.
++ *
++ * Input:
++ *	tq = SCSI target queue pointer.
++ *	lq = SCSI LUN queue pointer.
++ *	TGT_LOCK must be already obtained.
++ *
++ * Output:
++ *	Releases TGT_LOCK upon exit.
++ *
++ * Context:
++ *	Kernel/Interrupt context.
++ * 
++ * Note: This routine will always try to start I/O from visible HBA.
++ */
++void
++qla2x00_next(scsi_qla_host_t *vis_ha) 
++{
++	scsi_qla_host_t *dest_ha;
++	fc_port_t	*fcport;
++	srb_t		*sp;
++	int		rval;
++	unsigned long   flags;
++
++	ENTER(__func__);
++
++	spin_lock_irqsave(&vis_ha->list_lock, flags);
++	while (!list_empty(&vis_ha->pending_queue)) {
++		sp = list_entry(vis_ha->pending_queue.next, srb_t, list);
++
++		fcport = sp->fclun->fcport;
++		dest_ha = fcport->ha;
++
++		/* Check if command can be started, exit if not. */
++		if (LOOP_TRANSITION(dest_ha)) {
++			break;
++		}
++
++		__del_from_pending_queue(vis_ha, sp);
++
++		/* If device is dead then send request back to OS */
++		if ((dest_ha->flags.link_down_error_enable &&
++		    atomic_read(&fcport->state) == FC_DEVICE_DEAD)) {
++
++			CMD_RESULT(sp->cmd) = DID_NO_CONNECT << 16;
++
++			if (!atomic_read(&dest_ha->loop_down_timer) &&
++			    dest_ha->loop_state == LOOP_DOWN) {
++				sp->err_id = 2;
++			} else {
++				sp->err_id = 1;
++			}
++			DEBUG3(printk("scsi(%ld): loop/port is down - "
++			    "pid=%ld, sp=%p loopid=0x%x queued to dest HBA "
++			    "scsi%ld.\n",
++			    dest_ha->host_no,
++			    sp->cmd->serial_number, sp,
++			    fcport->loop_id, dest_ha->host_no));
++			/* 
++			 * Initiate a failover - done routine will initiate.
++			 */
++			__add_to_done_queue(vis_ha, sp);
++
++			continue;
++		}
++
++		/*
++		 * SCSI Kluge: Whenever, we need to wait for an event such as
++		 * loop down (i.e. loop_down_timer ) or port down (i.e.  LUN
++		 * request qeueue is suspended) then we will recycle new
++		 * commands back to the SCSI layer.  We do this because this is
++		 * normally a temporary condition and we don't want the
++		 * mid-level scsi.c driver to get upset and start aborting
++		 * commands.  The timeout value is extracted from the command
++		 * minus 1-second and put on a retry queue (watchdog). Once the
++		 * command timeout it is returned to the mid-level with a BUSY
++		 * status, so the mid-level will retry it. This process
++		 * continues until the LOOP DOWN time expires or the condition
++		 * goes away.
++		 */
++	 	if (!(sp->flags & SRB_IOCTL) &&
++		    (atomic_read(&fcport->state) != FC_ONLINE ||
++			test_bit(ABORT_ISP_ACTIVE, &dest_ha->dpc_flags) ||
++			(dest_ha->loop_state != LOOP_READY) ||
++			(sp->flags & SRB_FAILOVER))) {
++
++			DEBUG3(printk("scsi(%ld): port=(0x%x) retry_q(%d) "
++			    "loop state = %d, loop counter = 0x%x dpc flags "
++			    "= 0x%lx\n",
++			    dest_ha->host_no,
++			    fcport->loop_id,
++			    atomic_read(&fcport->state),
++			    dest_ha->loop_state,
++			    atomic_read(&dest_ha->loop_down_timer),
++			    dest_ha->dpc_flags));
++
++			qla2x00_extend_timeout(sp->cmd, EXTEND_CMD_TIMEOUT);
++			__add_to_retry_queue(vis_ha, sp);
++
++			continue;
++		} 
++
++		/*
++		 * If this request's lun is suspended then put the request on
++		 * the  scsi_retry queue. 
++		 */
++	 	if (!(sp->flags & SRB_IOCTL) &&
++		    sp->lun_queue->q_state == LUN_STATE_WAIT) {
++			DEBUG3(printk("scsi(%ld): lun wait state - pid=%ld, "
++			    "opcode=%d, allowed=%d, retries=%d\n",
++			    dest_ha->host_no,
++			    sp->cmd->serial_number,
++			    sp->cmd->cmnd[0],
++			    sp->cmd->allowed,
++			    sp->cmd->retries));
++				
++			__add_to_scsi_retry_queue(vis_ha, sp);
++
++			continue;
++		}
++
++		sp->lun_queue->io_cnt++;
++
++		/* Release target queue lock */
++		spin_unlock_irqrestore(&vis_ha->list_lock, flags);
++
++		rval = qla2x00_start_scsi(sp);
++
++		spin_lock_irqsave(&vis_ha->list_lock, flags);
++
++		if (rval != QLA2X00_SUCCESS) {
++			/* Place request back on top of device queue */
++			/* add to the top of queue */
++			__add_to_pending_queue_head(vis_ha, sp);
++
++			sp->lun_queue->io_cnt--;
++			break;
++		}
++	}
++	spin_unlock_irqrestore(&vis_ha->list_lock, flags);
++
++	LEAVE(__func__);
++}
++
++/*
++ *  qla2x00_flush_failover_queue
++ *	Return cmds of a "specific" LUN from the failover queue with
++ *      DID_BUS_BUSY status.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *      q  = lun queue.
++ *
++ * Context:
++ *	Interrupt context.
++ */
++void
++qla2x00_flush_failover_q(scsi_qla_host_t *ha, os_lun_t *q)
++{
++	srb_t  *sp;
++	struct list_head *list, *temp;
++	unsigned long flags;
++
++	spin_lock_irqsave(&ha->list_lock, flags);
++	list_for_each_safe(list, temp, &ha->failover_queue) {
++		sp = list_entry(list, srb_t, list);
++		/*
++		 * If request originated from the same lun_q then delete it
++		 * from the failover queue 
++		 */
++		if (q == sp->lun_queue) {
++			/* Remove srb from failover queue. */
++			__del_from_failover_queue(ha,sp);
++			CMD_RESULT(sp->cmd) = DID_BUS_BUSY << 16;
++			CMD_HANDLE(sp->cmd) = (unsigned char *) NULL;
++			__add_to_done_queue(ha, sp);
++		}
++	}
++	spin_unlock_irqrestore(&ha->list_lock, flags);
++}
++
++
++/*
++ * qla2x00_reset_lun_fo_counts
++ *	Reset failover retry counts
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *
++ * Context:
++ *	Interrupt context.
++ */
++void 
++qla2x00_reset_lun_fo_counts(scsi_qla_host_t *ha, os_lun_t *lq) 
++{
++	srb_t		*tsp;
++	os_lun_t	*orig_lq;
++	struct list_head *list;
++	unsigned long	flags ;
++
++	spin_lock_irqsave(&ha->list_lock, flags);
++	/*
++	 * the pending queue.
++	 */
++	list_for_each(list,&ha->pending_queue) {
++		tsp = list_entry(list, srb_t, list);
++		orig_lq = tsp->lun_queue;
++		if (orig_lq == lq)
++			tsp->fo_retry_cnt = 0;
++	}
++	/*
++	 * the retry queue.
++	 */
++	list_for_each(list,&ha->retry_queue) {
++		tsp = list_entry(list, srb_t, list);
++		orig_lq = tsp->lun_queue;
++		if (orig_lq == lq)
++			tsp->fo_retry_cnt = 0;
++	}
++
++	/*
++	 * the done queue.
++	 */
++	list_for_each(list, &ha->done_queue) {
++		tsp = list_entry(list, srb_t, list);
++		orig_lq = tsp->lun_queue;
++		if (orig_lq == lq)
++			tsp->fo_retry_cnt = 0;
++	}
++	spin_unlock_irqrestore(&ha->list_lock, flags);
++}
++
++/*
++ *  qla2x00_failover_cleanup
++ *	Cleanup queues after a failover.
++ *
++ * Input:
++ *	sp = command pointer
++ *
++ * Context:
++ *	Interrupt context.
++ */
++static void
++qla2x00_failover_cleanup(srb_t *sp) 
++{
++	CMD_RESULT(sp->cmd) = DID_BUS_BUSY << 16;
++	CMD_HANDLE(sp->cmd) = (unsigned char *) NULL;
++
++	/* turn-off all failover flags */
++	sp->flags = sp->flags & ~(SRB_RETRY|SRB_FAILOVER|SRB_FO_CANCEL);
++}
++
++
++/*
++ *  qla2x00_process_failover
++ *	Process any command on the failover queue.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *
++ * Context:
++ *	Interrupt context.
++ */
++static void
++qla2x00_process_failover(scsi_qla_host_t *ha) 
++{
++
++	os_tgt_t	*tq;
++	os_lun_t	*lq;
++	srb_t       *sp;
++	fc_port_t *fcport;
++	struct list_head *list, *temp;
++	unsigned long flags;
++	uint32_t    t, l;
++	scsi_qla_host_t *vis_ha = NULL;
++
++	DEBUG(printk("scsi(%ld): Processing failover for hba.\n", ha->host_no));
++
++	/*
++	 * Process all the commands in the failover queue. Attempt to failover
++	 * then either complete the command as is or requeue for retry.
++	 */
++
++	/* Prevent or allow acceptance of new I/O requests. */
++	spin_lock_irqsave(&ha->list_lock, flags);
++
++	/*
++	 * Get first entry to find our visible adapter.  We could never get
++	 * here if the list is empty
++	 */
++	list = ha->failover_queue.next;
++	sp = list_entry(list, srb_t, list);
++	vis_ha = (scsi_qla_host_t *) sp->cmd->device->host->hostdata;
++	list_for_each_safe(list, temp, &ha->failover_queue) {
++		sp = list_entry(list, srb_t, list);
++
++		tq = sp->tgt_queue;
++		lq = sp->lun_queue;
++		fcport = lq->fclun->fcport;
++
++		/* Remove srb from failover queue. */
++		__del_from_failover_queue(ha, sp);
++
++		DEBUG2(printk("%s(): pid %ld retrycnt=%d\n",
++		    __func__, sp->cmd->serial_number, sp->cmd->retries));
++
++		/*** Select an alternate path ***/
++		/* 
++		 * If the path has already been change by a previous request
++		 * sp->fclun != lq->fclun
++		 */
++		if (sp->fclun != lq->fclun ||
++		    atomic_read(&fcport->state) != FC_DEVICE_DEAD) {
++
++			qla2x00_failover_cleanup(sp);
++
++		} else if (qla2x00_cfg_failover(ha,
++		    lq->fclun, tq, sp) == NULL) {
++
++			/*
++			 * We ran out of paths, so just post the status which
++			 * is already set in the cmd.
++			 */
++			printk(KERN_INFO
++			    "scsi(%ld): Ran out of paths - pid %ld\n",
++			    ha->host_no, sp->cmd->serial_number);
++		} else {
++			qla2x00_failover_cleanup(sp);
++
++		}
++		__add_to_done_queue(ha, sp);
++	} /* list_for_each_safe */
++	spin_unlock_irqrestore(&ha->list_lock,flags);
++
++	for (t = 0; t < vis_ha->max_targets; t++) {
++		if ((tq = vis_ha->otgt[t]) == NULL)
++			continue;
++		for (l = 0; l < vis_ha->max_luns; l++) {
++			if ((lq = (os_lun_t *) tq->olun[l]) == NULL)
++				continue;
++
++			if( test_and_clear_bit(LUN_MPIO_BUSY, &lq->q_flag) ) {
++				/* EMPTY */
++				DEBUG(printk("scsi(%ld): remove suspend for "
++				    "lun %d\n", ha->host_no, lq->fclun->lun));
++			}
++		}
++	}
++
++	//qla2x00_restart_queues(ha,TRUE);
++	qla2x00_restart_queues(ha, FALSE);
++
++	DEBUG(printk("%s() - done", __func__));
++}
++
++/**************************************************************************
++*   qla2x00_check_tgt_status
++*
++* Description:
++*     Checks to see if the target or loop is down.
++*
++* Input:
++*     cmd - pointer to Scsi cmd structure
++*
++* Returns:
++*   1 - if target is present
++*   0 - if target is not present
++*
++**************************************************************************/
++uint8_t
++qla2x00_check_tgt_status(scsi_qla_host_t *ha, Scsi_Cmnd *cmd)
++{
++	os_lun_t        *lq;
++	uint32_t         b, t, l;
++	fc_port_t	*fcport;
++
++	/* Generate LU queue on bus, target, LUN */
++	b = SCSI_BUS_32(cmd);
++	t = SCSI_TCN_32(cmd);
++	l = SCSI_LUN_32(cmd);
++
++	if ((lq = GET_LU_Q(ha,t,l)) == NULL) {
++		return(QL_STATUS_ERROR);
++	}
++
++	fcport = lq->fclun->fcport;
++
++	if (TGT_Q(ha, t) == NULL ||
++	    l >= ha->max_luns ||
++	    (atomic_read(&fcport->state) == FC_DEVICE_DEAD) ||
++	    (!atomic_read(&ha->loop_down_timer) &&
++		ha->loop_state == LOOP_DOWN) ||
++	    (test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)) ||
++	    ABORTS_ACTIVE ||
++	    ha->loop_state != LOOP_READY) {
++
++		DEBUG(printk(KERN_INFO
++		    "scsi(%ld:%2d:%2d:%2d): %s connection is down\n",
++		    ha->host_no,
++		    b, t, l,
++		    __func__));
++
++		CMD_RESULT(cmd) = DID_NO_CONNECT << 16;
++		return(QL_STATUS_ERROR);
++	}
++	return (QL_STATUS_SUCCESS);
++}
++
++/**************************************************************************
++*   qla2x00_check_port_status
++*
++* Description:
++*     Checks to see if the port or loop is down.
++*
++* Input:
++*     fcport - pointer to fc_port_t structure.
++*
++* Returns:
++*   1 - if port is present
++*   0 - if port is not present
++*
++**************************************************************************/
++uint8_t
++qla2x00_check_port_status(scsi_qla_host_t *ha, fc_port_t *fcport)
++{
++	uint32_t	port_state;
++
++	if (fcport == NULL) {
++		return(QL_STATUS_ERROR);
++	}
++
++	port_state = (uint32_t)atomic_read(&fcport->state);
++	if ((port_state != FC_ONLINE) ||
++	    (port_state == FC_DEVICE_DEAD) ||
++	    (!atomic_read(&ha->loop_down_timer) &&
++		ha->loop_state == LOOP_DOWN) ||
++	    (test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)) ||
++	    test_bit(CFG_ACTIVE, &ha->cfg_flags) ||
++	    ABORTS_ACTIVE || ha->loop_state != LOOP_READY) {
++
++		DEBUG(printk(KERN_INFO
++		    "scsi(%ld): Connection is down. fcport=%p.\n",
++		    ha->host_no, fcport));
++
++		return (QL_STATUS_ERROR);
++	}
++
++	return (QL_STATUS_SUCCESS);
++}
++
++/****************************************************************************/
++/* Create character driver "HbaApiDev" w dynamically allocated major number */
++/* and create "/proc/scsi/qla2x00/HbaApiNode" as the device node associated */
++/* with the major number.                                                   */
++/****************************************************************************/
++
++#define APIDEV_NODE  "HbaApiNode"
++#define APIDEV_NAME  "HbaApiDev"
++
++static int apidev_major = 0;
++static struct Scsi_Host *apidev_host = 0;
++
++static struct file_operations apidev_fops = {
++	.ioctl = apidev_ioctl,
++	.open = apidev_open,
++	.release = apidev_close,
++};
++
++static int 
++apidev_init(struct Scsi_Host *host) 
++{
++	if (apidev_host)
++		return (0);
++
++	apidev_major = register_chrdev(0, APIDEV_NAME, &apidev_fops);
++	if (0 > apidev_major) {
++		DEBUG(printk("%s(): register_chrdev rc=%d\n",
++		    __func__, apidev_major));
++
++		return (apidev_major);
++	}
++
++	apidev_host = host;
++
++	DEBUG(printk("%s(): Creating (%s) %s/%s major=%d\n",
++	    __func__,
++	    host->hostt->proc_name, host->hostt->proc_dir->name,
++	    APIDEV_NODE, apidev_major));
++
++	proc_mknod(APIDEV_NODE, 0777+S_IFCHR, host->hostt->proc_dir,
++	    (kdev_t)mk_kdev(apidev_major, 0));
++
++	return 0;
++}
++
++static int apidev_cleanup() 
++{
++	if (!apidev_host)
++		return (0);
++
++	unregister_chrdev(apidev_major,APIDEV_NAME);
++	remove_proc_entry(APIDEV_NODE,apidev_host->hostt->proc_dir);
++	apidev_host = 0;
++
++	return (0);
++}
++
++static int 
++apidev_open(struct inode *inode, struct file *file) 
++{
++	DEBUG9(printk(KERN_INFO
++	    "%s(): open MAJOR number = %d, MINOR number = %d\n",
++	    __func__, major(inode->i_rdev), minor(inode->i_rdev)));
++
++	return 0;
++}
++
++static int 
++apidev_close(struct inode *inode, struct file *file) 
++{
++	DEBUG9(printk(KERN_INFO
++	    "%s(): closed\n", __func__));
++
++	return 0;
++}
++
++static int 
++apidev_ioctl(struct inode *inode,
++    struct file *fp, unsigned int cmd, unsigned long arg) 
++{
++	/*
++	 * Since this var is not really used, use static type to conserve
++	 * stack space.
++	 */
++	static Scsi_Device dummy_scsi_device;
++
++	dummy_scsi_device.host = apidev_host;
++
++	return (qla2x00_ioctl(&dummy_scsi_device, (int)cmd, (void*)arg));
++}
++
++#define driver_template qla2x00_driver_template
++#include "scsi_module.c"
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qla_os.h	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,156 @@
++/******************************************************************************
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * Portions (C) Arjan van de Ven <arjanv@redhat.com> for Red Hat, Inc.
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ ******************************************************************************/
++
++#ifndef __QLA_OS_H
++#define __QLA_OS_H
++
++/*
++ * Driver debug definitions.
++ */
++/* #define QL_DEBUG_LEVEL_1  */ /* Output register accesses to COM1 */
++/* #define QL_DEBUG_LEVEL_2  */ /* Output error msgs to COM1 */
++/* #define QL_DEBUG_LEVEL_3  */ /* Output function trace msgs to COM1 */
++/* #define QL_DEBUG_LEVEL_4  */ /* Output NVRAM trace msgs to COM1 */
++/* #define QL_DEBUG_LEVEL_5  */ /* Output ring trace msgs to COM1 */
++/* #define QL_DEBUG_LEVEL_6  */ /* Output WATCHDOG timer trace to COM1 */
++/* #define QL_DEBUG_LEVEL_7  */ /* Output RISC load trace msgs to COM1 */
++/* #define QL_DEBUG_LEVEL_8  */ /* Output ring saturation msgs to COM1 */
++/* #define QL_DEBUG_LEVEL_9  */ /* Output IOCTL trace msgs */
++/* #define QL_DEBUG_LEVEL_10 */ /* Output IOCTL error msgs */
++/* #define QL_DEBUG_LEVEL_11 */ /* Output Mbx Cmd trace msgs */
++/* #define QL_DEBUG_LEVEL_12 */ /* Output IP trace msgs */
++/*
++ *  Local Macro Definitions.
++ */
++#if defined(QL_DEBUG_LEVEL_1)  || defined(QL_DEBUG_LEVEL_2) || \
++    defined(QL_DEBUG_LEVEL_3)  || defined(QL_DEBUG_LEVEL_4) || \
++    defined(QL_DEBUG_LEVEL_5)  || defined(QL_DEBUG_LEVEL_6) || \
++    defined(QL_DEBUG_LEVEL_7)  || defined(QL_DEBUG_LEVEL_8) || \
++    defined(QL_DEBUG_LEVEL_9)  || defined(QL_DEBUG_LEVEL_10) || \
++    defined(QL_DEBUG_LEVEL_11) || defined(QL_DEBUG_LEVEL_12)
++    #define QL_DEBUG_ROUTINES
++#endif
++
++#include <linux/config.h>
++#ifndef QLA_MODVERSION
++#define __NO_VERSION__
++#endif
++#include <linux/module.h>
++#include <linux/version.h>
++#include <linux/init.h>
++#include <linux/string.h>
++#include <linux/errno.h>
++#include <linux/kernel.h>
++#include <linux/ioport.h>
++#include <linux/delay.h>
++#include <linux/timer.h>
++#include <linux/sched.h>
++#include <linux/pci.h>
++#include <linux/proc_fs.h>
++#include <linux/blk.h>
++#include <linux/interrupt.h>
++#include <linux/stat.h>
++#include <linux/slab.h>
++#define __KERNEL_SYSCALLS__
++#include <linux/unistd.h>
++#include <linux/smp_lock.h>
++#include <linux/bio.h>
++#include <linux/moduleparam.h>
++
++#include <asm/system.h>
++
++#include <asm/io.h>
++#include <asm/irq.h>
++#include <asm/segment.h>
++#include <asm/byteorder.h>
++#include <asm/pgtable.h>
++
++#include "scsi.h"
++#include "hosts.h"
++
++#if defined(FC_IP_SUPPORT)
++#include <linux/ip.h>
++#include <linux/if_arp.h>
++#include <linux/skbuff.h>
++#endif
++
++#include <linux/ioctl.h>
++#include <scsi/scsi_ioctl.h>
++#include <asm/uaccess.h>
++
++//TODO Fix this!!!
++/*
++* String arrays
++*/
++#define LINESIZE    256
++#define MAXARGS      26
++
++/* PCI interface definitions */
++struct qla_fw_info {
++	unsigned short	addressing;	/* addressing method used to load fw */
++#define FW_INFO_ADDR_NORMAL	0
++#define FW_INFO_ADDR_EXTENDED	1
++#define FW_INFO_ADDR_NOMORE	0xffff
++	unsigned short	*fwcode;	/* pointer to FW array */
++	unsigned short	*fwlen;		/* number of words in array */
++	unsigned short	*fwstart;	/* start address for F/W */
++	unsigned long	*lfwstart;	/* start address (long) for F/W */
++};
++struct qla_board_info {
++	char			name[9];	/* Board ID String */
++	struct qla_fw_info	*fwinfo;
++};
++
++/***********************************************************************
++* We use the Scsi_Pointer structure that's included with each command
++* SCSI_Cmnd as a scratchpad. 
++*
++* SCp is defined as follows:
++*  - SCp.ptr  -- > pointer to the SRB
++*  - SCp.this_residual  -- > HBA completion status for ioctl code. 
++*
++* Cmnd->host_scribble --> Used to hold the hba actived handle (1..255).
++***********************************************************************/
++#define	CMD_SP(Cmnd)		((Cmnd)->SCp.ptr)
++#define CMD_COMPL_STATUS(Cmnd)  ((Cmnd)->SCp.this_residual)
++#define	CMD_HANDLE(Cmnd)	((Cmnd)->host_scribble)
++/* Additional fields used by ioctl passthru */
++#define CMD_RESID_LEN(Cmnd)	((Cmnd)->SCp.buffers_residual)
++#define CMD_SCSI_STATUS(Cmnd)	((Cmnd)->SCp.Status)
++#define CMD_ACTUAL_SNSLEN(Cmnd)	((Cmnd)->SCp.Message)
++#define CMD_ENTRY_STATUS(Cmnd)	((Cmnd)->SCp.have_data_in)
++
++/*
++ * Other SCS__Cmnd members we only reference
++ */
++#define	CMD_XFRLEN(Cmnd)	(Cmnd)->request_bufflen
++#define	CMD_CDBLEN(Cmnd)	(Cmnd)->cmd_len
++#define	CMD_CDBP(Cmnd)		(Cmnd)->cmnd
++#define	CMD_SNSP(Cmnd)		(Cmnd)->sense_buffer
++#define	CMD_SNSLEN(Cmnd)	(sizeof (Cmnd)->sense_buffer)
++#define	CMD_RESULT(Cmnd)	((Cmnd)->result)
++#define	CMD_TIMEOUT(Cmnd)	((Cmnd)->timeout_per_command)
++
++#define  SCSI_BUS_32(scp)	((scp)->device->channel)
++#define  SCSI_TCN_32(scp)	((scp)->device->id)
++#define  SCSI_LUN_32(scp)	((scp)->device->lun)
++
++#endif
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qla_settings.h	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,80 @@
++/******************************************************************************
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ ******************************************************************************/
++/*
++ * Compile time Options:
++ *     0 - Disable and 1 - Enable
++ */
++#define MEMORY_MAPPED_IO              0
++#define STOP_ON_ERROR                 0   /* Stop on aborts and resets  */
++#define STOP_ON_RESET                 0
++#define STOP_ON_ABORT                 0
++#define QLA_SCSI_VENDOR_DIR           0 /* Decode vendor specific opcodes for direction */
++#define QLA2100_LIPTEST    	       0
++#define REQ_TRACE    		       1
++#define USE_ABORT_TGT                  1 /* Use Abort Target mbx cmd */
++
++#define DEBUG_QLA2100                 0  /* For Debug of qla2x00 */
++
++#define MPIO_SUPPORT			0
++#define VSA				0  /* Volume Set Addressing */
++
++/* 
++ * When a lun is suspended for the "Not Ready" condition
++ * then it will suspend the lun for increments of 6 sec delays.
++ * SUSPEND_COUNT is that count.
++ */
++#define SUSPEND_COUNT 	 		10  /* 6 secs * 10 retries = 60 secs */
++					
++/* Failover options */
++#define MAX_RECOVERYTIME  		10  /* Max suspend time for a lun recovery time */
++#define MAX_FAILBACKTIME  		5  /* (60) Max suspend time before failing back */
++
++#define QLA_CMD_TIMER_DELTA 	 	3
++
++#define MAX_RETRIES_OF_ISP_ABORT  	5  /*  */
++
++/*
++ * Defines the time in seconds that 
++ * the driver extends the command timeout
++ * to get around the problem where the
++ * mid-layer only allows 5 retries for commands
++ * that return BUS_BUSY
++ */
++#define EXTEND_CMD_TIMEOUT 	 	 60
++
++/*
++ * We need to hardcode this value since the firmware
++ * does not allow us to retrieve the maximum number of 
++ * IOCBs available during initializtion.
++ *
++ * Factors that affect this value include the amount of 
++ * memory on-board (HBA) and firmware IP support.
++ *
++ */
++#undef IOCB_THROTTLE_USAGE
++#undef IOCB_HIT_RATE
++#define MAX_IOCBS_AVAILBALE 	 	3000
++
++/*
++ * Some vendor subsystems do not recover properly after a device reset.  Define
++ * the following to force a logout after a successful device reset.
++ */
++#undef LOGOUT_AFTER_DEVICE_RESET
++
++#include "qla_version.h"
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qla_sup.c	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,560 @@
++/******************************************************************************
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ ******************************************************************************/
++
++#include "qla_os.h"
++#include "qla_def.h"
++
++static uint16_t qla2x00_nvram_request(scsi_qla_host_t *, uint32_t);
++
++static void qla2x00_flash_enable(scsi_qla_host_t *);
++static void qla2x00_flash_disable(scsi_qla_host_t *);
++
++uint8_t qla2x00_read_flash_byte(scsi_qla_host_t *, uint32_t);
++static void qla2x00_write_flash_byte(scsi_qla_host_t *, uint32_t, uint8_t);
++static uint8_t qla2x00_poll_flash(scsi_qla_host_t *ha,
++		uint32_t addr, uint8_t poll_data, uint8_t mid);
++static uint8_t qla2x00_program_flash_address(scsi_qla_host_t *ha,
++		uint32_t addr, uint8_t data, uint8_t mid);
++static uint8_t qla2x00_erase_flash_sector(scsi_qla_host_t *ha,
++		uint32_t addr, uint32_t sec_mask, uint8_t mid);
++
++uint8_t qla2x00_get_flash_manufacturer(scsi_qla_host_t *ha);
++uint16_t qla2x00_get_flash_version(scsi_qla_host_t *);
++uint16_t qla2x00_get_flash_image(scsi_qla_host_t *ha, uint8_t *image);
++uint16_t qla2x00_set_flash_image(scsi_qla_host_t *ha, uint8_t *image);
++
++
++/*
++ * NVRAM support routines
++ */
++
++/**
++ * qla2x00_get_nvram_word() - Calculates word position in NVRAM and calls the
++ *	request routine to get the word from NVRAM.
++ * @ha: HA context
++ * @addr: Address in NVRAM to read
++ *
++ * Returns the word read from nvram @addr.
++ */
++uint16_t
++qla2x00_get_nvram_word(scsi_qla_host_t *ha, uint32_t addr)
++{
++	uint16_t	data;
++	uint32_t	nv_cmd;
++
++	ENTER(__func__);
++
++	nv_cmd = addr << 16;
++	nv_cmd |= NV_READ_OP;
++	data = qla2x00_nvram_request(ha, nv_cmd);
++
++	DEBUG4(printk("%s(%ld): NVRAM[%lx]=%lx.\n",
++	    __func__, ha->host_no, (u_long)addr, (u_long)data));
++
++	LEAVE(__func__);
++
++	return (data);
++}
++
++/**
++ * qla2x00_nvram_request() - Sends read command to NVRAM and gets data from
++ *	NVRAM.
++ * @ha: HA context
++ * @nv_cmd: NVRAM command
++ *
++ * Bit definitions for NVRAM command:
++ *
++ *	Bit 26     = start bit
++ *	Bit 25, 24 = opcode
++ *	Bit 23-16  = address
++ *	Bit 15-0   = write data
++ *
++ * Returns the word read from nvram @addr.
++ */
++static uint16_t
++qla2x00_nvram_request(scsi_qla_host_t *ha, uint32_t nv_cmd)
++{
++	uint8_t		cnt;
++	device_reg_t	*reg = ha->iobase;
++	uint16_t	data = 0;
++	uint16_t	reg_data;
++
++	/* Send command to NVRAM. */
++	nv_cmd <<= 5;
++	for (cnt = 0; cnt < 11; cnt++) {
++		if (nv_cmd & BIT_31)
++			qla2x00_nv_write(ha, NVR_DATA_OUT);
++		else
++			qla2x00_nv_write(ha, 0);
++		nv_cmd <<= 1;
++	}
++
++	/* Read data from NVRAM. */
++	for (cnt = 0; cnt < 16; cnt++) {
++		WRT_REG_WORD(&reg->nvram, NVR_SELECT | NVR_CLOCK);
++		NVRAM_DELAY();
++		data <<= 1;
++		reg_data = RD_REG_WORD(&reg->nvram);
++		if (reg_data & NVR_DATA_IN)
++			data |= BIT_0;
++		WRT_REG_WORD(&reg->nvram, NVR_SELECT);
++		NVRAM_DELAY();
++	}
++
++	/* Deselect chip. */
++	WRT_REG_WORD(&reg->nvram, NVR_DESELECT);
++	NVRAM_DELAY();
++
++	return (data);
++}
++
++/**
++ * qla2x00_nv_write() - Clean NVRAM operations.
++ * @ha: HA context
++ */
++void
++qla2x00_nv_deselect(scsi_qla_host_t *ha)
++{
++	device_reg_t *reg = ha->iobase;
++
++	WRT_REG_WORD(&reg->nvram, NVR_DESELECT);
++	NVRAM_DELAY();
++}
++
++/**
++ * qla2x00_nv_write() - Prepare for NVRAM read/write operation.
++ * @ha: HA context
++ * @data: Serial interface selector
++ */
++void
++qla2x00_nv_write(scsi_qla_host_t *ha, uint16_t data)
++{
++	device_reg_t *reg = ha->iobase;
++
++	WRT_REG_WORD(&reg->nvram, data | NVR_SELECT);
++	NVRAM_DELAY();
++	WRT_REG_WORD(&reg->nvram, data | NVR_SELECT | NVR_CLOCK);
++	NVRAM_DELAY();
++	WRT_REG_WORD(&reg->nvram, data | NVR_SELECT);
++	NVRAM_DELAY();
++}
++
++/*
++ * Flash support routines
++ */
++
++/**
++ * qla2x00_flash_enable() - Setup flash for reading and writing.
++ * @ha: HA context
++ */
++static void
++qla2x00_flash_enable(scsi_qla_host_t *ha)
++{
++	uint16_t	data;
++	device_reg_t	*reg = ha->iobase;
++
++	data = RD_REG_WORD(&reg->ctrl_status);
++	data |= CSR_FLASH_ENABLE;
++	WRT_REG_WORD(&reg->ctrl_status, data);
++}
++
++/**
++ * qla2x00_flash_disable() - Disable flash and allow RISC to run.
++ * @ha: HA context
++ */
++static void
++qla2x00_flash_disable(scsi_qla_host_t *ha)
++{
++	uint16_t	data;
++	device_reg_t	*reg = ha->iobase;
++
++	data = RD_REG_WORD(&reg->ctrl_status);
++	data &= ~(CSR_FLASH_ENABLE);
++	WRT_REG_WORD(&reg->ctrl_status, data);
++}
++
++/**
++ * qla2x00_read_flash_byte() - Reads a byte from flash
++ * @ha: HA context
++ * @addr: Address in flash to read
++ *
++ * A word is read from the chip, but, only the lower byte is valid.
++ *
++ * Returns the byte read from flash @addr.
++ */
++uint8_t
++qla2x00_read_flash_byte(scsi_qla_host_t *ha, uint32_t addr)
++{
++	uint16_t	data;
++	uint16_t	bank_select;
++	device_reg_t	*reg = ha->iobase;
++
++	/* Setup bit 16 of flash address. */
++	bank_select = RD_REG_WORD(&reg->ctrl_status);
++	if ((addr & BIT_16) && ((bank_select & CSR_FLASH_64K_BANK) == 0)) {
++		bank_select |= CSR_FLASH_64K_BANK;
++		WRT_REG_WORD(&reg->ctrl_status, bank_select);
++	} else if (((addr & BIT_16) == 0) &&
++	    (bank_select & CSR_FLASH_64K_BANK)) {
++		bank_select &= ~(CSR_FLASH_64K_BANK);
++		WRT_REG_WORD(&reg->ctrl_status, bank_select);
++	}
++	WRT_REG_WORD(&reg->flash_address, (uint16_t)addr);
++	data = qla2x00_debounce_register(&reg->flash_data);
++
++	return ((uint8_t)data);
++}
++
++/**
++ * qla2x00_write_flash_byte() - Write a byte to flash
++ * @ha: HA context
++ * @addr: Address in flash to write
++ * @data: Data to write
++ */
++static void
++qla2x00_write_flash_byte(scsi_qla_host_t *ha, uint32_t addr, uint8_t data)
++{
++	uint16_t	bank_select;
++	device_reg_t	*reg = ha->iobase;
++
++	/* Setup bit 16 of flash address. */
++	bank_select = RD_REG_WORD(&reg->ctrl_status);
++	if ((addr & BIT_16) && ((bank_select & CSR_FLASH_64K_BANK) == 0)) {
++		bank_select |= CSR_FLASH_64K_BANK;
++		WRT_REG_WORD(&reg->ctrl_status, bank_select);
++	} else if (((addr & BIT_16) == 0) &&
++	    (bank_select & CSR_FLASH_64K_BANK)) {
++		bank_select &= ~(CSR_FLASH_64K_BANK);
++		WRT_REG_WORD(&reg->ctrl_status, bank_select);
++	}
++	WRT_REG_WORD(&reg->flash_address, (uint16_t)addr);
++	WRT_REG_WORD(&reg->flash_data, (uint16_t)data);
++}
++
++/**
++ * qla2x00_poll_flash() - Polls flash for completion.
++ * @ha: HA context
++ * @addr: Address in flash to poll
++ * @poll_data: Data to be polled
++ * @mid: Flash manufacturer ID
++ *
++ * This function polls the device until bit 7 of what is read matches data
++ * bit 7 or until data bit 5 becomes a 1.  If that hapens, the flash ROM timed
++ * out (a fatal error).  The flash book recommeds reading bit 7 again after
++ * reading bit 5 as a 1.
++ *
++ * Returns 0 on success, else non-zero.
++ */
++static uint8_t
++qla2x00_poll_flash(scsi_qla_host_t *ha,
++    uint32_t addr, uint8_t poll_data, uint8_t mid)
++{
++	uint8_t		status;
++	uint8_t		flash_data;
++	uint32_t	cnt;
++	int		failed_pass;
++
++	status = 1;
++	failed_pass = 1;
++
++	/* Wait for 30 seconds for command to finish. */
++	poll_data &= BIT_7;
++	for (cnt = 3000000; cnt; cnt--) {
++		flash_data = qla2x00_read_flash_byte(ha, addr);
++		if ((flash_data & BIT_7) == poll_data) {
++			status = 0;
++			break;
++		}
++
++		if (mid != 0x40 && mid != 0xda) {
++			if (flash_data & BIT_5)
++				failed_pass--;
++			if (failed_pass < 0)
++				break;
++		}
++		udelay(10);
++		barrier();
++	}
++	return (status);
++}
++
++/**
++ * qla2x00_program_flash_address() - Programs a flash address
++ * @ha: HA context
++ * @addr: Address in flash to program
++ * @data: Data to be written in flash
++ * @mid: Flash manufacturer ID
++ *
++ * Returns 0 on success, else non-zero.
++ */
++static uint8_t
++qla2x00_program_flash_address(scsi_qla_host_t *ha,
++    uint32_t addr, uint8_t data, uint8_t mid)
++{
++	/* Write Program Command Sequence */
++	qla2x00_write_flash_byte(ha, 0x5555, 0xaa);
++	qla2x00_write_flash_byte(ha, 0x2aaa, 0x55);
++	qla2x00_write_flash_byte(ha, 0x5555, 0xa0);
++	qla2x00_write_flash_byte(ha, addr, data);
++
++	/* Wait for write to complete. */
++	return (qla2x00_poll_flash(ha, addr, data, mid));
++}
++
++/**
++ * qla2x00_erase_flash_sector() - Erase a flash sector.
++ * @ha: HA context
++ * @addr: Flash sector to erase
++ * @sec_mask: Sector address mask
++ * @mid: Flash manufacturer ID
++ *
++ * Returns 0 on success, else non-zero.
++ */
++static uint8_t
++qla2x00_erase_flash_sector(scsi_qla_host_t *ha,
++    uint32_t addr, uint32_t sec_mask, uint8_t mid)
++{
++	/* Individual Sector Erase Command Sequence */
++	qla2x00_write_flash_byte(ha, 0x5555, 0xaa);
++	qla2x00_write_flash_byte(ha, 0x2aaa, 0x55);
++	qla2x00_write_flash_byte(ha, 0x5555, 0x80);
++	qla2x00_write_flash_byte(ha, 0x5555, 0xaa);
++	qla2x00_write_flash_byte(ha, 0x2aaa, 0x55);
++
++	if (mid == 0xda)
++		qla2x00_write_flash_byte(ha, addr & sec_mask, 0x10);
++	else
++		qla2x00_write_flash_byte(ha, addr & sec_mask, 0x30);
++
++	udelay(150);
++
++	/* Wait for erase to complete. */
++	return (qla2x00_poll_flash(ha, addr, 0x80, mid));
++}
++
++/**
++ * qla2x00_get_flash_manufacturer() - Read manufacturer ID from flash chip.
++ * @ha: HA context
++ *
++ * Returns the manufacturer's ID read from the flash chip.
++ */
++uint8_t
++qla2x00_get_flash_manufacturer(scsi_qla_host_t *ha)
++{
++	uint8_t	manuf_id;
++
++	qla2x00_write_flash_byte(ha, 0x5555, 0xaa);
++	qla2x00_write_flash_byte(ha, 0x2aaa, 0x55);
++	qla2x00_write_flash_byte(ha, 0x5555, 0x90);
++	manuf_id = qla2x00_read_flash_byte(ha, 0x0001);
++
++	return (manuf_id);
++}
++
++/**
++ * qla2x00_get_flash_version() - Read version information from flash.
++ * @ha: HA context
++ *
++ * Returns QL_STATUS_SUCCESS on successful retrieval of flash version.
++ */
++uint16_t
++qla2x00_get_flash_version(scsi_qla_host_t *ha)
++{
++	uint16_t	ret = QL_STATUS_SUCCESS;
++	uint32_t	loop_cnt = 1;  /* this is for error exit only */
++	uint32_t	pcir_adr;
++
++	ENTER(__func__);
++
++	qla2x00_flash_enable(ha);
++	do {	/* Loop once to provide quick error exit */
++		/* Match signature */
++		if (!(qla2x00_read_flash_byte(ha, 0) == 0x55 &&
++		    qla2x00_read_flash_byte(ha, 1) == 0xaa)) {
++			/* No signature */
++			DEBUG2(printk("scsi(%ld): No matching FLASH "
++			    "signature.\n", ha->host_no));
++			ret = QL_STATUS_ERROR;
++			break;
++		}
++
++		pcir_adr = qla2x00_read_flash_byte(ha, 0x18) & 0xff;
++
++		/* validate signature of PCI data structure */
++		if ((qla2x00_read_flash_byte(ha, pcir_adr)) == 'P' &&
++		    (qla2x00_read_flash_byte(ha, pcir_adr + 1)) == 'C' &&
++		    (qla2x00_read_flash_byte(ha, pcir_adr + 2)) == 'I' &&
++		    (qla2x00_read_flash_byte(ha, pcir_adr + 3)) == 'R') {
++
++			/* Read version */
++			ha->optrom_minor =
++			    qla2x00_read_flash_byte(ha, pcir_adr + 0x12);
++			ha->optrom_major =
++			    qla2x00_read_flash_byte(ha, pcir_adr + 0x13);
++			DEBUG3(printk("%s(): got %d.%d.\n",
++			    __func__, ha->optrom_major, ha->optrom_minor));
++		} else {
++			/* error */
++			DEBUG2(printk("%s(): PCI data struct not found. "
++			    "pcir_adr=%x.\n",
++			    __func__, pcir_adr));
++			ret = QL_STATUS_ERROR;
++			break;
++		}
++
++	} while (--loop_cnt);
++	qla2x00_flash_disable(ha);
++
++	LEAVE(__func__);
++
++	return (ret);
++}
++
++/**
++ * qla2x00_get_flash_image() - Read image from flash chip.
++ * @ha: HA context
++ * @image: Buffer to receive flash image
++ *
++ * Returns 0 on success, else non-zero.
++ */
++uint16_t
++qla2x00_get_flash_image(scsi_qla_host_t *ha, uint8_t *image)
++{
++	uint32_t	addr;
++	uint32_t	midpoint;
++	uint8_t		*data;
++	device_reg_t	*reg = ha->iobase;
++
++	midpoint = FLASH_IMAGE_SIZE / 2;
++
++	qla2x00_flash_enable(ha);
++	WRT_REG_WORD(&reg->nvram, 0);
++	for (addr = 0, data = image; addr < FLASH_IMAGE_SIZE; addr++, data++) {
++		if (addr == midpoint)
++			WRT_REG_WORD(&reg->nvram, NVR_SELECT);
++
++		*data = qla2x00_read_flash_byte(ha, addr);
++	}
++	qla2x00_flash_disable(ha);
++
++	return (0);
++}
++
++/**
++ * qla2x00_set_flash_image() - Write image to flash chip.
++ * @ha: HA context
++ * @image: Source image to write to flash
++ *
++ * Returns 0 on success, else non-zero.
++ */
++uint16_t
++qla2x00_set_flash_image(scsi_qla_host_t *ha, uint8_t *image)
++{
++	uint16_t	status;
++	uint32_t	addr;
++	uint32_t	midpoint;
++	uint32_t	sec_mask;
++	uint32_t	rest_addr;
++	uint8_t		mid;
++	uint8_t		sec_number;
++	uint8_t		data;
++	device_reg_t	*reg = ha->iobase;
++
++	status = 0;
++	sec_number = 0;
++
++	/* Reset ISP chip. */
++	WRT_REG_WORD(&reg->ctrl_status, CSR_ISP_SOFT_RESET);
++
++	qla2x00_flash_enable(ha);
++	do {	/* Loop once to provide quick error exit */
++		/* Structure of flash memory based on manufacturer */
++		mid = qla2x00_get_flash_manufacturer(ha);
++		if (mid == 0x6d) {
++			// Am29LV001 part
++			rest_addr = 0x1fff;
++			sec_mask = 0x1e000;
++		}
++		else if (mid == 0x40) {
++			// Mostel v29c51001 part
++			rest_addr = 0x1ff;
++			sec_mask = 0x1fe00;
++		}
++		else if (mid == 0xbf) {
++			// SST39sf10 part
++			rest_addr = 0xfff;
++			sec_mask = 0x1f000;
++		}
++		else if (mid == 0xda) {
++			// Winbond W29EE011 part
++			rest_addr = 0x7f;
++			sec_mask = 0x1ff80;
++			addr = 0;
++			if (qla2x00_erase_flash_sector(ha,
++			    addr, sec_mask, mid)) {
++				status = 1;
++				break;
++			}
++		}
++		else {
++			// Am29F010 part
++			rest_addr = 0x3fff;
++			sec_mask = 0x1c000;
++		}
++
++		midpoint = FLASH_IMAGE_SIZE / 2;
++		for (addr = 0; addr < FLASH_IMAGE_SIZE; addr++) {
++			data = *image++;
++			/* Are we at the beginning of a sector? */
++			if (!(addr & rest_addr)) {
++				if (addr == midpoint)
++					WRT_REG_WORD(&reg->nvram, NVR_SELECT);
++
++				/* Then erase it */
++				if (qla2x00_erase_flash_sector(ha,
++				    addr, sec_mask, mid)) {
++					status = 1;
++					break;
++				}
++
++				sec_number++;
++			}
++			if (mid == 0x6d) {
++				if (sec_number == 1 &&
++				    (addr == (rest_addr - 1))) {
++					rest_addr = 0x0fff;
++					sec_mask   = 0x1f000;
++				}
++				else if (sec_number == 3 && (addr & 0x7ffe)) {
++					rest_addr = 0x3fff;
++					sec_mask   = 0x1c000;
++				}
++			}
++
++			if (qla2x00_program_flash_address(ha,
++			    addr, data, mid)) {
++				status = 1;
++				break;
++			}
++		}
++	} while (0);
++	qla2x00_flash_disable(ha);
++
++	return (status);
++}
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qla_vendor.c	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,193 @@
++/******************************************************************************
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ ******************************************************************************/
++
++#include "qla_os.h"
++#include "qla_def.h"
++
++/*
++ * vendor specific op codes.
++*/
++#define	UCSCSI_DCMD		0x20 /* vendor specific command */
++#define DAC_CDB_LEN		12
++#define DAC_SENSE_LEN		64
++
++#define DACMD_WRITE_CONF_ONDISK	0x4B
++#define	DACMD_WRITE_CONFIG	0x06
++#define	DACMD_WRITE_CONF2	0x3C
++#define	DACMD_WRITE_CONFLABEL	0x49 /* Write configuration label */
++#define	DACMD_WRITE_CONFIG_V3x	0x4F
++#define	DACMD_ADD_CONFIG_V2x	0x18
++#define	DACMD_ADD_CONFIG_V3x	0x4C
++#define	DACMD_STORE_IMAGE	0x21
++#define	DACMD_ADD_CAPACITY	0x2A /* add physical drives to existing array */
++#define	DACMD_WRITE_IOPORT	0x3A /* write port B */
++#define	DACMD_S2S_WRITEFULLCONF		0x60 /* write full configuration */
++#define	DACMD_S2S_ADDFULLCONF		0x62 /* add   full configuration */
++#define	DACMD_S2S_WRITELUNMAP_OLD	0x58 /* write LUN map information */
++#define DACMD_S2S_WRITELUNMAP		0xD2	/* Write LUN MAP Information */
++#define	DACMD_S2S_WRITE_IOPORT	0x66 /* write expanded IO port */
++#define	DACMD_WRITE_V3x		0x34 /* write data from plain memory */
++#define	DACMD_S2S_WRITESIG	0x4D /* write signature information */
++
++#if !defined(s08bits)
++#define	s08bits	char
++#define	s16bits	short
++#define	s32bits	int
++#define	u08bits	unsigned s08bits
++#define	u16bits	unsigned s16bits
++#define	u32bits	unsigned s32bits
++#endif
++
++typedef struct dac_command
++{
++        u08bits	mb_Command;	/* Mail Box register 0	*/
++        u08bits	mb_CmdID;	/* Mail Box register 1	*/
++        u08bits	mb_ChannelNo;	/* Mail Box register 2	*/
++        u08bits	mb_TargetID;	/* Mail Box register 3	*/
++        u08bits	mb_DevState;	/* Mail Box register 4	*/
++        u08bits	mb_MailBox5;	/* Mail Box register 5	*/
++        u08bits	mb_MailBox6;	/* Mail Box register 6	*/
++        u08bits	mb_SysDevNo;	/* Mail Box register 7	*/
++        u32bits	mb_Datap;	/* Mail Box register 8-B */
++        u08bits	mb_MailBoxC;	/* Mail Box register C	*/
++        u08bits	mb_StatusID;	/* Mail box register D	*/
++        u16bits	mb_Status;	/* Mail Box Register E,F */
++}
++dac_command_t;
++
++typedef struct	dac_scdb
++{
++        u08bits db_ChannelTarget;	/* ChannelNo 7..4 & Target 3..0 */
++        u08bits db_DATRET;		/* different bits, see below */
++        u16bits	db_TransferSize;	/* Request/done size in bytes */
++        u32bits db_PhysDatap;		/* Physical addr in host memory	*/
++        u08bits db_CdbLen;		/* 6, 10 or 12			*/
++        u08bits db_SenseLen;		/* If returned from DAC (<= 64)	*/
++        u08bits	db_Cdb[DAC_CDB_LEN];	/* The CDB itself		*/
++        u08bits	db_SenseData[DAC_SENSE_LEN];/* Result of request sense	*/
++        u08bits db_StatusIn;		/* SCSI status returned		*/
++        u08bits	db_Reserved1;
++}
++dac_scdb_t;
++
++typedef	struct dga_scdb
++{
++        u08bits	dsc_osreq[1024];	/* OS related buffer:sizeof(mdac_req_t) */
++
++        u08bits	dsc_familyctlno;	/* Controller number within family */
++        u08bits	dsc_ctlno;		/* Controller number */
++        u08bits	dsc_chno;		/* Channel number */
++        u08bits	dsc_tgt;		/* target ID */
++
++        u08bits	dsc_lun;		/* Lun ID */
++        u08bits	dsc_rebuildflag;	/* current rebuild flag */
++        u16bits	dsc_status;		/* completion status */
++
++        u08bits	dsc_scsiversion;	/* SCSI protocol version */
++        u08bits	dsc_hostctlno;		/* host system controller number */
++        u16bits	dsc_reqsenseseqno;	/* request sense sequence number */
++
++        u32bits	dsc_events;		/* # events at start */
++
++        u32bits	dsc_pollwaitchan;	/* sleep/wakeup channel */
++        u32bits	dsc_poll;		/* polling value, if =0 op complete */
++
++        struct dga_ctldev *dsc_ctp;	/* pointer back to controller */
++        void *dsc_pdp;	/* pointer back to physical device */
++        void *dsc_ldp;	/* pointer back to logical device */
++        void (*dsc_intr)(void);	/* completion call back function */
++
++        /* all save functions are used in S2S */
++        u08bits	dsc_savedcdb[DAC_CDB_LEN];/* 12 bytes saved CDB from SCSI CDB */
++        u32bits	(*dsc_statsintr)(struct dga_scdb *); /* statistics completion function */
++
++        void (*dsc_savedintr)(void);	/* completion call back function */
++        void *dsc_savedctp;		/* pointer back to controller */
++        u08bits	dsc_savedfamilyctlno;	/* Controller number within family */
++        u08bits	dsc_savedctlno;		/* Controller number */
++        u08bits	dsc_savedchno;		/* Channel number */
++        u08bits	dsc_savedtgt;		/* target ID */
++
++        u08bits	dsc_savedlun;		/* Lun ID */
++        u08bits	dsc_savedcdblen;	/* saved CDB len for SCDB */
++        u08bits	dsc_scanmode;
++        u08bits dsc_pageno;             /* pageno for data > 4K */
++        u32bits	dsc_residue;
++        u32bits	dsc_Reserved4;
++
++        dac_command_t dsc_dcmd;		/* DCMD space, 16 bytes */
++        dac_scdb_t dsc_scdb;		/* SCDB space */
++        u32bits	dsc_EventSeqNo;
++        u32bits	dsc_ReqSenseNo;
++
++        u32bits	dsc_Reserved64[16];	/* leave this for OLD SCO driver bug */
++
++        u08bits	dsc_data[256];		/* Rest is data */
++}
++dga_scdb_t;
++
++/*
++* qla2100_set_scsi_direction
++*      This routine will set the proper direction for vendor specific
++*      commands. 
++*
++*      Note: Vendors should modify this routine to set the proper 
++*      direction of the transfer if they used vendor specific commands.
++*
++* Input:
++*      ha = adapter block pointer.
++*      sp = SCSI Request Block structure pointer.
++*
++* Returns:
++*      0 = success, was able to issue command.
++*/
++void
++qla2x00_set_vend_direction(scsi_qla_host_t *ha,
++    Scsi_Cmnd *cmd, cmd_entry_t *pkt)
++{
++	dga_scdb_t	*dsp = (dga_scdb_t *) cmd;
++
++	if (cmd->data_cmnd[0] == UCSCSI_DCMD) {
++		switch( dsp->dsc_dcmd.mb_Command ) {
++		case DACMD_WRITE_CONF_ONDISK:
++		case DACMD_WRITE_CONFIG:
++		case DACMD_WRITE_CONF2:
++		case DACMD_WRITE_CONFLABEL:
++		case DACMD_WRITE_CONFIG_V3x:
++		case DACMD_ADD_CONFIG_V2x:
++		case DACMD_ADD_CONFIG_V3x:
++		case DACMD_STORE_IMAGE:
++		case DACMD_ADD_CAPACITY:
++		case DACMD_WRITE_IOPORT:
++		case DACMD_S2S_WRITEFULLCONF:
++		case DACMD_S2S_ADDFULLCONF:
++		case DACMD_S2S_WRITELUNMAP_OLD:
++		case DACMD_S2S_WRITELUNMAP:
++		case DACMD_S2S_WRITE_IOPORT:
++		case DACMD_WRITE_V3x:
++		case DACMD_S2S_WRITESIG:
++			pkt->control_flags |= BIT_6;
++			break;
++		default:
++			pkt->control_flags |= BIT_5;
++		}
++	} else
++		pkt->control_flags |= BIT_5;
++}
++
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qla_version.h	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,31 @@
++/******************************************************************************
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ ******************************************************************************/
++/*
++ * Driver version 
++ */
++#if DEBUG_QLA2100
++#define QLA2100_VERSION      "8.00.00b1-debug"
++#else
++#define QLA2100_VERSION      "8.00.00b1"
++#endif
++
++#define QLA_DRIVER_MAJOR_VER	8
++#define QLA_DRIVER_MINOR_VER	0
++#define QLA_DRIVER_PATCH_VER	0
++#define QLA_DRIVER_BETA_VER	1
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qla_xioct.c	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,6589 @@
++/******************************************************************************
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ ******************************************************************************/
++
++
++#include "qla_os.h"
++#include "qla_def.h"
++
++#include "inioct.h"
++
++
++#define	QLA_PT_CMD_TOV			(60) /* firmware timeout */
++#define QLA_PT_CMD_DRV_TOV		(QLA_PT_CMD_TOV + 1) /* drvr timeout */
++#define QLA_IOCTL_ACCESS_WAIT_TIME	(QLA_PT_CMD_DRV_TOV + 2) /* wait_q tov */
++#define QLA_INITIAL_IOCTLMEM_SIZE	(2 * PAGE_SIZE)
++#define QLA_IOCTL_SCRAP_SIZE		2048 /* scrap memory for local use. */
++
++/* ELS related defines */
++#define FC_HEADER_LEN		24
++#define ELS_RJT_LENGTH		0x08	/* 8  */
++#define ELS_RPS_ACC_LENGTH	0x40	/* 64 */
++#define ELS_RLS_ACC_LENGTH	0x1C	/* 28 */
++
++/* ELS cmd Reply Codes */
++#define ELS_STAT_LS_RJT		0x01
++#define ELS_STAT_LS_ACC		0x02
++
++#define IOCTL_INVALID_STATUS    0xffff
++
++
++int qla2x00_alloc_ioctl_mem(scsi_qla_host_t *);
++void qla2x00_free_ioctl_mem(scsi_qla_host_t *);
++
++int qla2x00_get_ioctl_scrap_mem(scsi_qla_host_t *, void **, uint32_t);
++void qla2x00_free_ioctl_scrap_mem(scsi_qla_host_t *);
++
++/*
++ * Local prototypes
++ */
++static int qla2x00_get_new_ioctl_dma_mem(scsi_qla_host_t *, uint32_t);
++
++#if defined(ISP2300)
++static uint8_t qla2x00_get_next_free_pub_id(scsi_qla_host_t *, uint16_t *);
++static uint8_t qla2x00_host_relogin(scsi_qla_host_t *, fcdev_t *);
++#endif
++
++static int qla2x00_find_curr_ha(uint16_t, scsi_qla_host_t **);
++
++static int qla2x00_get_driver_specifics(EXT_IOCTL *);
++
++static int qla2x00_aen_reg(scsi_qla_host_t *, EXT_IOCTL *, int);
++static int qla2x00_aen_get(scsi_qla_host_t *, EXT_IOCTL *, int);
++
++static int qla2x00_query(scsi_qla_host_t *, EXT_IOCTL *, int);
++static int qla2x00_query_hba_node(scsi_qla_host_t *, EXT_IOCTL *, int);
++static int qla2x00_query_hba_port(scsi_qla_host_t *, EXT_IOCTL *, int);
++static int qla2x00_query_disc_port(scsi_qla_host_t *, EXT_IOCTL *, int);
++static int qla2x00_query_disc_tgt(scsi_qla_host_t *, EXT_IOCTL *, int);
++static int qla2x00_query_chip(scsi_qla_host_t *, EXT_IOCTL *, int);
++
++static int qla2x00_get_data(scsi_qla_host_t *, EXT_IOCTL *, int);
++static int qla2x00_get_statistics(scsi_qla_host_t *, EXT_IOCTL *, int);
++static int qla2x00_get_fc_statistics(scsi_qla_host_t *, EXT_IOCTL *, int);
++static int qla2x00_get_port_summary(scsi_qla_host_t *, EXT_IOCTL *, int);
++static int qla2x00_query_driver(scsi_qla_host_t *, EXT_IOCTL *, int);
++static int qla2x00_query_fw(scsi_qla_host_t *, EXT_IOCTL *, int);
++
++#if defined(ISP2300)
++static int qla2x00_send_els_passthru(scsi_qla_host_t *, EXT_IOCTL *, int);
++#endif
++static int qla2x00_send_fcct(scsi_qla_host_t *, EXT_IOCTL *, int);
++static int qla2x00_start_ms_cmd(scsi_qla_host_t *, EXT_IOCTL *, srb_t *,
++    EXT_ELS_PT_REQ *);
++
++static int qla2x00_wwpn_to_scsiaddr(scsi_qla_host_t *, EXT_IOCTL *, int);
++static int qla2x00_scsi_passthru(scsi_qla_host_t *, EXT_IOCTL *, int);
++static int qla2x00_sc_scsi_passthru(scsi_qla_host_t *, EXT_IOCTL *, int);
++static int qla2x00_sc_fc_scsi_passthru(scsi_qla_host_t *, EXT_IOCTL *, int);
++static int qla2x00_sc_scsi3_passthru(scsi_qla_host_t *, EXT_IOCTL *, int);
++
++static int qla2x00_send_els_rnid(scsi_qla_host_t *, EXT_IOCTL *, int);
++static int qla2x00_get_rnid_params(scsi_qla_host_t *, EXT_IOCTL *, int);
++static int qla2x00_set_host_data(scsi_qla_host_t *, EXT_IOCTL *, int);
++static int qla2x00_set_rnid_params(scsi_qla_host_t *, EXT_IOCTL *, int);
++
++static void qla2x00_waitq_sem_timeout(unsigned long);
++static uint8_t qla2x00_get_ioctl_access(scsi_qla_host_t *, uint32_t);
++static uint8_t qla2x00_release_ioctl_access(scsi_qla_host_t *);
++
++static void qla2x00_wait_q_memb_alloc(scsi_qla_host_t *, wait_q_t **);
++static void qla2x00_wait_q_memb_free(scsi_qla_host_t *, wait_q_t *);
++static uint8_t qla2x00_wait_q_add(scsi_qla_host_t *, wait_q_t **);
++static void qla2x00_wait_q_get_next(scsi_qla_host_t *, wait_q_t **);
++static void qla2x00_wait_q_remove(scsi_qla_host_t *, wait_q_t *);
++
++
++/*
++ * qla2x00_ioctl_sleep_done
++ *
++ * Description:
++ *   This is the callback function to wakeup ioctl completion semaphore
++ *   for the ioctl request that is waiting.
++ *
++ * Input:
++ *   sem - pointer to the ioctl completion semaphore.
++ *
++ * Returns:
++ */
++static void
++qla2x00_ioctl_sleep_done(struct semaphore * sem)
++{
++	DEBUG9(printk("%s: entered.\n", __func__);)
++
++	if (sem != NULL){
++		DEBUG9(printk("ioctl_sleep: wake up sem.\n");)
++		up(sem);
++	}
++
++	DEBUG9(printk("%s: exiting.\n", __func__);)
++}
++
++/*
++ * qla2x00_ioctl_sem_init
++ *
++ * Description:
++ *   Initialize the ioctl timer and semaphore used to wait for passthru
++ *   completion.
++ *
++ * Input:
++ *   ha - pointer to scsi_qla_host_t structure used for initialization.
++ *
++ * Returns:
++ *   None.
++ */
++static void
++qla2x00_ioctl_sem_init(scsi_qla_host_t *ha)
++{
++	init_MUTEX_LOCKED(&ha->ioctl->cmpl_sem);
++	init_timer(&(ha->ioctl->cmpl_timer));
++	ha->ioctl->cmpl_timer.data = (unsigned long)&ha->ioctl->cmpl_sem;
++	ha->ioctl->cmpl_timer.function =
++	    (void (*)(unsigned long))qla2x00_ioctl_sleep_done;
++}
++
++/*
++ * qla2x00_scsi_pt_done
++ *
++ * Description:
++ *   Resets ioctl progress flag and wakes up the ioctl completion semaphore.
++ *
++ * Input:
++ *   pscsi_cmd - pointer to the passthru Scsi cmd structure which has completed.
++ *
++ * Returns:
++ */
++static void
++qla2x00_scsi_pt_done(Scsi_Cmnd *pscsi_cmd)
++{
++	struct Scsi_Host *host;
++	scsi_qla_host_t  *ha;
++
++	host = pscsi_cmd->device->host;
++	ha = (scsi_qla_host_t *) host->hostdata;
++
++	DEBUG9(printk("%s post function called OK\n", __func__);)
++
++	/* save detail status for IOCTL reporting */
++	ha->ioctl->SCSIPT_InProgress = 0;
++	ha->ioctl->ioctl_tov = 0;
++
++	up(&ha->ioctl->cmpl_sem);
++
++	DEBUG9(printk("%s: exiting.\n", __func__);)
++
++	return;
++}
++
++/*
++ * qla2x00_msiocb_done
++ *
++ * Description:
++ *   Resets MSIOCB ioctl progress flag and wakes up the ioctl completion
++ *   semaphore.
++ *
++ * Input:
++ *   cmd - pointer to the passthru Scsi cmd structure which has completed.
++ *
++ * Returns:
++ */
++static void
++qla2x00_msiocb_done(Scsi_Cmnd *pscsi_cmd)
++{
++	struct Scsi_Host *host;
++	scsi_qla_host_t  *ha;
++
++	host = pscsi_cmd->device->host;
++	ha = (scsi_qla_host_t *) host->hostdata;
++
++	DEBUG9(printk("%s post function called OK\n", __func__);)
++
++	ha->ioctl->MSIOCB_InProgress = 0;
++	ha->ioctl->ioctl_tov = 0;
++
++	up(&ha->ioctl->cmpl_sem);
++
++	DEBUG9(printk("%s: exiting.\n", __func__);)
++		
++	return;
++}
++
++/*************************************************************************
++ * qla2x00_ioctl
++ *
++ * Description:
++ *   Performs additional ioctl requests not satisfied by the upper levels.
++ *
++ * Returns:
++ *   ret  = 0    Success
++ *   ret != 0    Failed; detailed status copied to EXT_IOCTL structure
++ *               if possible
++ *************************************************************************/
++int
++qla2x00_ioctl(Scsi_Device *dev, int cmd, void *arg)
++{
++	int		mode = 0;
++	int		tmp_rval = 0;
++	int		ret = -EINVAL;
++
++	uint8_t		*temp;
++	uint8_t		tempbuf[8];
++	uint32_t	i;
++	uint32_t	status;
++
++	EXT_IOCTL	*pext;
++
++	scsi_qla_host_t	*ha;
++
++
++	DEBUG9(printk("%s: entry to command (%x), arg (%p)\n",
++	    __func__, cmd, arg);)
++
++	/* Catch any non-exioct ioctls */
++	if (_IOC_TYPE(cmd) != QLMULTIPATH_MAGIC) {
++		return (ret);
++	}
++
++	ret = verify_area(VERIFY_READ, (void *)arg, sizeof(EXT_IOCTL));
++	if (ret) {
++		DEBUG9_10(printk("%s: ERROR VERIFY_READ EXT_IOCTL "
++		    "sturct. cmd=%d arg=%p.\n", __func__, cmd, arg);)
++		return (ret);
++	}
++
++	/* Allocate ioctl structure buffer to support multiple concurrent
++	 * entries.
++	 */
++	pext = KMEM_ZALLOC(sizeof(EXT_IOCTL), 16);
++	if (pext == NULL) {
++		/* error */
++		printk(KERN_WARNING
++		    "qla2x00: ERROR in main ioctl buffer allocation.\n");
++		return (-ENOMEM);
++	}
++
++	/* copy in application layer EXT_IOCTL */
++	ret = copy_from_user(pext, arg, sizeof(EXT_IOCTL));
++	if (ret) {
++		DEBUG9_10(printk("%s: ERROR COPY_FROM_USER "
++		    "EXT_IOCTL sturct. cmd=%d arg=%p.\n",
++		    __func__, cmd, arg);)
++
++		KMEM_FREE(pext, sizeof(EXT_IOCTL));
++		return (ret);
++	}
++
++	/* Verify before update status fields in EXT_IOCTL struct. */
++	ret = verify_area(VERIFY_WRITE, (void *)arg, sizeof(EXT_IOCTL));
++	if (ret) {
++		DEBUG9_10(printk("%s: ERROR VERIFY_WRITE EXT_IOCTL "
++		    "sturct. cmd=%d arg=%p.\n", __func__, cmd, arg);)
++
++		KMEM_FREE(pext, sizeof(EXT_IOCTL));
++		return (ret);
++	}
++
++	/* check signature of this ioctl */
++	temp = (uint8_t *) &pext->Signature;
++
++	for (i = 0; i < 4; i++, temp++)
++		tempbuf[i] = *temp;
++
++	if ((tempbuf[0] == 'Q') && (tempbuf[1] == 'L') &&
++	    (tempbuf[2] == 'O') && (tempbuf[3] == 'G'))
++		status = 0;
++	else
++		status = 1;
++
++	if (status != 0) {
++		DEBUG9_10(printk("%s: signature did not match. "
++		    "cmd=%d arg=%p.\n", __func__, cmd, arg);)
++		pext->Status = EXT_STATUS_INVALID_PARAM;
++		copy_to_user((void *)arg, (void *)pext, sizeof(EXT_IOCTL));
++
++		KMEM_FREE(pext, sizeof(EXT_IOCTL));
++		return (-EINVAL);
++	}
++
++	/* check version of this ioctl */
++	if (pext->Version > EXT_VERSION) {
++		printk(KERN_WARNING
++		    "qla2x00: ioctl interface version not supported = %d.\n",
++		    pext->Version);
++		pext->Status = EXT_STATUS_UNSUPPORTED_VERSION;
++		copy_to_user((void *)arg, (void *)pext, sizeof(EXT_IOCTL));
++
++		KMEM_FREE(pext, sizeof(EXT_IOCTL));
++		return (-EINVAL);
++	}
++
++	/* check for special cmds used during application's setup time. */
++	switch (cmd) {
++	case EXT_CC_STARTIOCTL:
++		DEBUG9(printk("%s: got startioctl command.\n", __func__);)
++
++		pext->Instance = num_hosts;
++		pext->Status = EXT_STATUS_OK;
++		ret = copy_to_user((void *)arg, (void *)pext,
++		    sizeof(EXT_IOCTL));
++
++		KMEM_FREE(pext, sizeof(EXT_IOCTL));
++		return (ret);
++
++	case EXT_CC_SETINSTANCE:
++		/* This call is used to return the HBA's host number to
++		 * ioctl caller.  All subsequent ioctl commands will put
++		 * the host number in HbaSelect field to tell us which
++		 * HBA is the destination.
++		 */
++		if (pext->Instance < num_hosts) {
++			if (!((uint32_t)pext->VendorSpecificData &
++			    EXT_DEF_USE_HBASELECT)) {
++				/* Backward compatible code. */
++				apiHBAInstance = pext->Instance;
++			}
++
++			/*
++			 * Return host number via pext->HbaSelect for
++			 * specified API instance number.
++			 */
++			if (qla2x00_find_curr_ha(pext->Instance, &ha) != 0) {
++				pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++				ret = copy_to_user(arg, pext, sizeof(EXT_IOCTL));
++				DEBUG9_10(printk("%s: SETINSTANCE invalid inst "
++				    "%d. num_hosts=%d ha=%p ret=%d.\n",
++				    __func__, pext->Instance, num_hosts, ha,
++				    ret);)
++
++				KMEM_FREE(pext, sizeof(EXT_IOCTL));
++				return (ret); /* ioctl completed ok */
++			}
++
++			pext->HbaSelect = ha->host_no;
++			pext->Status = EXT_STATUS_OK;
++
++			DEBUG9(printk("%s: Matching instance %d to hba "
++			    "%ld.\n", __func__, pext->Instance, ha->host_no);)
++		} else {
++			DEBUG9_10(printk("%s: ERROR EXT_SETINSTANCE."
++			    " Instance=%d num_hosts=%d ha=%p.\n",
++			    __func__, pext->Instance, num_hosts, ha);)
++
++			pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++		}
++		ret = copy_to_user(arg, pext, sizeof(EXT_IOCTL));
++		KMEM_FREE(pext, sizeof(EXT_IOCTL));
++
++		DEBUG9(printk("%s: SETINSTANCE exiting. ret=%d.\n",
++		    __func__, ret);)
++
++		return (ret);
++
++	case EXT_CC_DRIVER_SPECIFIC:
++		ret = qla2x00_get_driver_specifics(pext);
++		tmp_rval = copy_to_user(arg, (void *)pext, sizeof(EXT_IOCTL));
++
++		if (ret == 0)
++			ret = tmp_rval;
++
++		KMEM_FREE(pext, sizeof(EXT_IOCTL));
++		return (ret);
++
++	default:
++		break;
++	}
++
++	if (!((uint32_t)pext->VendorSpecificData & EXT_DEF_USE_HBASELECT)) {
++		/* Backward compatible code. */
++		/* Will phase out soon. */
++
++		/* Check for valid apiHBAInstance (set previously by
++		 * EXT_SETINSTANCE or default 0)  and set ha context
++		 * for this IOCTL.
++		 */
++		if (qla2x00_find_curr_ha(apiHBAInstance, &ha) != 0) {
++
++			DEBUG9_10(printk("%s: ERROR matching apiHBAInstance "
++			    "%d to an HBA Instance.\n",
++			    __func__, pext->HbaSelect);)
++
++			pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++			copy_to_user(arg, pext, sizeof(EXT_IOCTL));
++
++			KMEM_FREE(pext, sizeof(EXT_IOCTL));
++			return (-EINVAL);
++		}
++
++		DEBUG9(printk("%s: active apiHBAInstance=%d host_no=%ld "
++		    "CC=%x SC=%x.\n",
++		    __func__, apiHBAInstance, ha->host_no, cmd, pext->SubCode);)
++
++	} else {
++		/* Use HbaSelect value to get a matching ha instance
++		 * for this ioctl command.
++		 */
++		if (qla2x00_find_curr_ha(pext->HbaSelect, &ha) != 0) {
++
++			DEBUG9_10(printk("%s: ERROR matching pext->HbaSelect "
++			    "%d to an HBA Instance.\n",
++			    __func__, pext->HbaSelect);)
++
++			pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++			copy_to_user(arg, pext, sizeof(EXT_IOCTL));
++
++			KMEM_FREE(pext, sizeof(EXT_IOCTL));
++			return (-EINVAL);
++		}
++
++		DEBUG9(printk("%s: active host_inst=%ld CC=%x SC=%x.\n",
++		    __func__, ha->instance, cmd, pext->SubCode);)
++	}
++
++	/*
++	 * Get permission to process ioctl command. Only one will proceed
++	 * at a time.
++	 */
++	if (qla2x00_get_ioctl_access(ha, QLA_IOCTL_ACCESS_WAIT_TIME) != 0) {
++		/* error timed out */
++		DEBUG9_10(printk("%s: ERROR timeout getting ioctl "
++		    "access. host no=%d.\n", __func__, pext->HbaSelect);)
++
++		pext->Status = EXT_STATUS_BUSY;
++		copy_to_user(arg, pext, sizeof(EXT_IOCTL));
++
++		KMEM_FREE(pext, sizeof(EXT_IOCTL));
++		return (-EBUSY);
++	}
++
++
++	while (test_bit(CFG_ACTIVE, &ha->cfg_flags) || ha->dpc_active) {
++		if( signal_pending(current) )
++			break;   /* get out */
++
++		set_current_state(TASK_INTERRUPTIBLE);
++		schedule_timeout(HZ);
++	}
++
++	switch (cmd) { /* switch on EXT IOCTL COMMAND CODE */
++
++	case EXT_CC_QUERY:
++		DEBUG9(printk("%s: got query command.\n", __func__);)
++
++		ret = qla2x00_query(ha, pext, 0);
++
++		break;
++
++	case EXT_CC_GET_DATA:
++		DEBUG9(printk("%s: got get_data command.\n", __func__);)
++
++		ret = qla2x00_get_data(ha, pext, 0);
++
++		break;
++
++	case EXT_CC_SEND_FCCT_PASSTHRU:
++		DEBUG9(printk("%s: got CT passthru cmd.\n", __func__));
++
++		ret = qla2x00_send_fcct(ha, pext, 0);
++
++		break;
++
++	case EXT_CC_SEND_SCSI_PASSTHRU:
++		DEBUG9(printk("%s: got SCSI passthru cmd.\n", __func__));
++
++		ret = qla2x00_scsi_passthru(ha, pext, mode);
++
++		break;
++
++	case EXT_CC_REG_AEN:
++		ret = qla2x00_aen_reg(ha, pext, mode);
++
++		break;
++
++	case EXT_CC_GET_AEN:
++		ret = qla2x00_aen_get(ha, pext, mode);
++
++		break;
++
++	case EXT_CC_WWPN_TO_SCSIADDR:
++		ret = qla2x00_wwpn_to_scsiaddr(ha, pext, 0);
++		break;
++
++	case EXT_CC_SEND_ELS_RNID:
++		ret = qla2x00_send_els_rnid(ha, pext, mode);
++		break;
++
++	case EXT_CC_SET_DATA:
++		ret = qla2x00_set_host_data(ha, pext, mode);
++		break;                                                          
++
++	case INT_CC_READ_NVRAM:
++		ret = qla2x00_read_nvram(ha, pext, mode);
++
++		break;
++
++	case INT_CC_UPDATE_NVRAM:
++		ret = qla2x00_update_nvram(ha, pext, mode);
++
++		break;
++
++	case INT_CC_LOOPBACK:
++		ret = qla2x00_send_loopback(ha, pext, mode);
++
++		break;
++
++	case INT_CC_READ_OPTION_ROM:
++		ret = qla2x00_read_option_rom(ha, pext, mode);
++
++		break;
++
++	case INT_CC_UPDATE_OPTION_ROM:
++		ret = qla2x00_update_option_rom(ha, pext, mode);
++
++		break;
++
++#if defined(ISP2300)
++	case EXT_CC_SEND_ELS_PASSTHRU:
++		DEBUG9(printk("%s: got ELS passthru cmd.\n", __func__));
++
++		ret = qla2x00_send_els_passthru(ha, pext, 0);
++
++		break;
++#endif
++
++	/* all others go here */
++	/*
++	   case EXT_CC_PLATFORM_REG:
++	   break;
++	 */
++
++	/* Failover IOCTLs */
++	case FO_CC_GET_PARAMS:
++	case FO_CC_SET_PARAMS:
++	case FO_CC_GET_PATHS:
++	case FO_CC_SET_CURRENT_PATH:
++	case FO_CC_RESET_HBA_STAT:
++	case FO_CC_GET_HBA_STAT:
++	case FO_CC_GET_LUN_DATA:
++	case FO_CC_SET_LUN_DATA:
++	case FO_CC_GET_TARGET_DATA:
++	case FO_CC_SET_TARGET_DATA:
++		DEBUG9(printk("%s: failover arg (%p):\n", __func__, arg);)
++
++		qla2x00_fo_ioctl(ha, cmd, pext, mode);
++
++		break;
++
++	default:
++		pext->Status = EXT_STATUS_INVALID_REQUEST;
++		break;
++
++	} /* end of CC decode switch */
++
++	/* Always try to copy values back regardless what happened before. */
++	tmp_rval = copy_to_user(arg, (void *)pext, sizeof(EXT_IOCTL));
++
++	if (ret == 0)
++		ret = tmp_rval;
++
++	DEBUG9(printk("%s: exiting. tmp_rval(%d) ret(%d)\n",
++	    __func__, tmp_rval, ret);)
++
++	qla2x00_release_ioctl_access(ha);
++
++	KMEM_FREE(pext, sizeof(EXT_IOCTL));
++	return (ret);
++}
++
++/*
++ * qla2x00_alloc_ioctl_mem
++ *	Allocates memory needed by IOCTL code.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_alloc_ioctl_mem(scsi_qla_host_t *ha)
++{
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	if (qla2x00_get_new_ioctl_dma_mem(ha, QLA_INITIAL_IOCTLMEM_SIZE) !=
++	    QL_STATUS_SUCCESS) {
++		printk(KERN_WARNING
++		    "qla2x00: ERROR in ioctl physical memory allocation\n");
++
++		return QL_STATUS_RESOURCE_ERROR;
++	}
++
++	/* Allocate context memory buffer */
++	ha->ioctl = KMEM_ZALLOC(sizeof(hba_ioctl_context), 11);
++	if (ha->ioctl == NULL) {
++		/* error */
++		printk(KERN_WARNING
++		    "qla2x00: ERROR in ioctl context allocation.\n");
++		return QL_STATUS_RESOURCE_ERROR;
++	}
++
++	/* Allocate AEN tracking buffer */
++	ha->ioctl->aen_tracking_queue =
++	    KMEM_ZALLOC(EXT_DEF_MAX_AEN_QUEUE * sizeof(EXT_ASYNC_EVENT), 12);
++	if (ha->ioctl->aen_tracking_queue == NULL) {
++		printk(KERN_WARNING
++		    "qla2x00: ERROR in ioctl aen_queue allocation.\n");
++		return QL_STATUS_RESOURCE_ERROR;
++	}
++
++	ha->ioctl->ioctl_tq = KMEM_ZALLOC(sizeof(os_tgt_t), 13);
++	if (ha->ioctl->ioctl_tq == NULL) {
++		printk(KERN_WARNING
++		    "qla2x00: ERROR in ioctl tgt queue allocation.\n");
++		return QL_STATUS_RESOURCE_ERROR;
++	}
++
++	ha->ioctl->ioctl_lq = KMEM_ZALLOC(sizeof(os_lun_t), 14);
++	if (ha->ioctl->ioctl_lq == NULL) {
++		printk(KERN_WARNING
++		    "qla2x00: ERROR in ioctl lun queue allocation.\n");
++		return QL_STATUS_RESOURCE_ERROR;
++	}
++	/*INIT_LIST_HEAD(&(ha->ioctl->ioctl_lq->cmd));*/
++
++	/* Pick the largest size we'll need per ha of all ioctl cmds.
++	 * Use this size when freeing.
++	 */
++	ha->ioctl->scrap_mem = KMEM_ZALLOC(QLA_IOCTL_SCRAP_SIZE, 15);
++	if (ha->ioctl->scrap_mem == NULL) {
++		printk(KERN_WARNING
++		    "qla2x00: ERROR in ioctl scrap_mem allocation.\n");
++		return QL_STATUS_RESOURCE_ERROR;
++	}
++	ha->ioctl->scrap_mem_size = QLA_IOCTL_SCRAP_SIZE;
++	ha->ioctl->scrap_mem_used = 0;
++	DEBUG9(printk("%s(%ld): scrap_mem_size=%d.\n",
++	    __func__, ha->host_no, ha->ioctl->scrap_mem_size);)
++
++	ha->ioctl->ioctl_lq->q_state = LUN_STATE_READY;
++	ha->ioctl->ioctl_lq->q_lock = SPIN_LOCK_UNLOCKED;
++
++	/* Init wait_q fields */
++	ha->ioctl->wait_q_lock = SPIN_LOCK_UNLOCKED;
++
++ 	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
++ 	    __func__, ha->host_no, ha->instance);)
++  
++ 	return QL_STATUS_SUCCESS;
++}
++
++/*
++ * qla2x00_get_new_ioctl_dma_mem
++ *	Allocates dma memory of the specified size.
++ *	This is done to replace any previously allocated ioctl dma buffer.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_get_new_ioctl_dma_mem(scsi_qla_host_t *ha, uint32_t size)
++{
++	DEBUG9(printk("%s entered.\n", __func__);)
++
++	if (ha->ioctl_mem) {
++		DEBUG9(printk("%s: ioctl_mem was previously allocated. "
++		    "Dealloc old buffer.\n", __func__);)
++
++	 	/* free the memory first */
++	 	pci_free_consistent(ha->pdev, ha->ioctl_mem_size, ha->ioctl_mem,
++		    ha->ioctl_mem_phys);
++	}
++
++	/* Get consistent memory allocated for ioctl I/O operations. */
++	ha->ioctl_mem = pci_alloc_consistent(ha->pdev,
++	    size, &ha->ioctl_mem_phys);
++
++	if (ha->ioctl_mem == NULL) {
++		printk(KERN_WARNING
++		    "%s: ERROR in ioctl physical memory allocation. "
++		    "Requested length=%x.\n", __func__, size);
++
++		ha->ioctl_mem_size = 0;
++		return QL_STATUS_RESOURCE_ERROR;
++	}
++	ha->ioctl_mem_size = size;
++
++	DEBUG9(printk("%s exiting.\n", __func__);)
++
++	return QL_STATUS_SUCCESS;
++}
++
++/*
++ * qla2x00_free_ioctl_mem
++ *	Frees memory used by IOCTL code for the specified ha.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *
++ * Context:
++ *	Kernel context.
++ */
++void
++qla2x00_free_ioctl_mem(scsi_qla_host_t *ha)
++{
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	if (ha->ioctl != NULL) {
++
++		if (ha->ioctl->scrap_mem != NULL) {
++			/* The size here must match up to what we
++			 * allocated before.
++			 */
++			KMEM_FREE(ha->ioctl->scrap_mem,
++			    ha->ioctl->scrap_mem_size);
++			ha->ioctl->scrap_mem = NULL;
++			ha->ioctl->scrap_mem_size = 0;
++		}
++
++		if (ha->ioctl->ioctl_tq != NULL) {
++			KMEM_FREE(ha->ioctl->ioctl_tq, sizeof(os_tgt_t));
++			ha->ioctl->ioctl_tq = NULL;
++		}
++
++		if (ha->ioctl->ioctl_lq != NULL) {
++			KMEM_FREE(ha->ioctl->ioctl_lq, sizeof(os_lun_t));
++			ha->ioctl->ioctl_lq = NULL;
++		}
++
++		if (ha->ioctl->aen_tracking_queue != NULL) {
++			KMEM_FREE(ha->ioctl->aen_tracking_queue,
++			    EXT_DEF_MAX_AEN_QUEUE * sizeof(EXT_ASYNC_EVENT));
++			ha->ioctl->aen_tracking_queue = NULL;
++		}
++
++		KMEM_FREE(ha->ioctl, sizeof(hba_ioctl_context));
++		ha->ioctl = NULL;
++	}
++
++	/* free memory allocated for ioctl operations */
++	pci_free_consistent(ha->pdev, ha->ioctl_mem_size, ha->ioctl_mem,
++	    ha->ioctl_mem_phys);
++	ha->ioctl_mem = NULL;
++
++	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++}
++
++/*
++ * qla2x00_get_ioctl_scrap_mem
++ *	Returns pointer to memory of the specified size from the scrap buffer.
++ *	This can be called multiple times before the free call as long
++ *	as the memory is to be used by the same ioctl command and
++ *	there's still memory left in the scrap buffer.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	ppmem = pointer to return a buffer pointer.
++ *	size = size of buffer to return.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++int
++qla2x00_get_ioctl_scrap_mem(scsi_qla_host_t *ha, void **ppmem, uint32_t size)
++{
++	int		ret = QL_STATUS_SUCCESS;
++	uint32_t	free_mem;
++
++	DEBUG9(printk("%s(%ld): inst=%ld entered. size=%d.\n",
++	    __func__, ha->host_no, ha->instance, size);)
++
++	free_mem = ha->ioctl->scrap_mem_size - ha->ioctl->scrap_mem_used;
++	if (free_mem >= size) {
++		*ppmem = ha->ioctl->scrap_mem + ha->ioctl->scrap_mem_used;
++		ha->ioctl->scrap_mem_used += size;
++	} else {
++		DEBUG10(printk("%s(%ld): no more scrap memory.\n",
++		    __func__, ha->host_no);)
++
++		ret = QL_STATUS_ERROR;
++	}
++
++	DEBUG9(printk("%s(%ld): exiting. ret=%d.\n",
++	    __func__, ha->host_no, ret);)
++
++	return (ret);
++}
++
++/*
++ * qla2x00_free_ioctl_scrap_mem
++ *	Makes the entire scrap buffer free for use.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ */
++void
++qla2x00_free_ioctl_scrap_mem(scsi_qla_host_t *ha)
++{
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	memset(ha->ioctl->scrap_mem, 0, ha->ioctl->scrap_mem_size);
++	ha->ioctl->scrap_mem_used = 0;
++
++	DEBUG9(printk("%s(%ld): exiting.\n",
++	    __func__, ha->host_no);)
++}
++
++#if defined(ISP2300)
++/*
++ * qla2x00_get_next_free_pub_id
++ *	Find the next free public loop ID to use, starting from the old
++ *	loop ID passed in.  If the old loop ID is invalid, this function
++ *	will start the search from beginning.
++ *
++ * Input:
++ *	ha		= adapter block pointer.
++ *	ploop_id	= pointer to a 16bit var containing the old loop
++ *			ID which is also to be used to get the new loop ID.
++ *
++ * Returns:
++ *      QL_STATUS_SUCCESS - Found an usable loop ID
++ *      QL_STATUS_RESOURCE_ERROR - No more free loop ID
++ */
++static uint8_t
++qla2x00_get_next_free_pub_id(scsi_qla_host_t *ha, uint16_t *ploop_id)
++{
++	uint8_t		retval = QL_STATUS_SUCCESS;
++	uint16_t	index;
++	uint16_t	old_id;
++
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	old_id = *ploop_id;
++	if (old_id >= LAST_SNS_LOOP_ID) {
++		/* set a starting point */
++		old_id = ha->min_external_loopid;
++	}
++
++	for (index = old_id; index < LAST_SNS_LOOP_ID; index++) {
++		if (!ha->fabricid[index].in_use) {
++			ha->fabricid[index].in_use = TRUE;
++			*ploop_id = index;
++			DEBUG9(printk("%s(%ld): found Lid %02x.\n",
++			    __func__, ha->host_no, index);)
++			break;
++		}
++	}
++	if (index >= LAST_SNS_LOOP_ID) {
++		/* no more free ID */
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR no more free LID "
++		    "available.\n", __func__, ha->host_no, ha->instance);)
++
++		retval = QL_STATUS_RESOURCE_ERROR;
++	}
++
++	DEBUG9(printk("%s(%ld): inst=%ld exiting. retval=%d.\n",
++	     __func__, ha->host_no, ha->instance, retval);)
++
++	return retval;
++}
++
++/*
++ * qla2x00_host_relogin
++ *	Issue fabric login command to a host in the host_db which
++ *	had somehow been lost before. All updates are passed back
++ *	via pdevice. No update will be done to any of ha's database.
++ *
++ * Input:
++ *	ha = adapter block pointer.
++ *	pdevice = pointer to FC device type structure.
++ *
++ * Returns:
++ *      QL_STATUS_SUCCESS - Login successfully
++ *      QL_STATUS_ERROR - Login failed
++ *      QL_STATUS_FATAL_ERROR - Fatal error
++ */
++static uint8_t
++qla2x00_host_relogin(scsi_qla_host_t *ha, fcdev_t *pdevice) 
++{
++	uint8_t		retval = QL_STATUS_SUCCESS;
++	uint16_t	status[3];
++	uint16_t	tmp_loop_id;
++
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	/* pdevice->loop_id is assumed to be straight from the current
++	 * database content.
++	 */
++	tmp_loop_id = pdevice->loop_id & 0xff;
++	if (tmp_loop_id >= LAST_SNS_LOOP_ID) {
++		/* Invalid value.  We need to find a valid ID to use. */
++		if (qla2x00_get_next_free_pub_id(ha, &tmp_loop_id) != 0) {
++			/* no more free IDs to use */
++			DEBUG9_10(printk("%s(%ld): inst=%ld no free loop_id "
++			    " available for login.\n",
++			    __func__, ha->host_no, ha->instance);)
++
++			return QL_STATUS_ERROR;
++		}
++	}
++
++	for (;;) {
++		DEBUG9(printk("%s(%ld): Login w/loop id 0x%02x for port "
++		    "%02x%02x%02x\n",
++		    __func__, ha->host_no, pdevice->loop_id,
++		    pdevice->d_id.b.domain,
++		    pdevice->d_id.b.area,
++		    pdevice->d_id.b.al_pa));
++
++		/* Login device on switch. */
++		qla2x00_login_fabric(ha,
++		    tmp_loop_id, pdevice->d_id.b.domain,
++		    pdevice->d_id.b.area, pdevice->d_id.b.al_pa, 
++		    &status[0], 0);
++
++		if (status[0] != MBS_CMD_CMP &&
++		    status[0] != MBS_PORT_ID_IN_USE &&
++		    status[0] != MBS_LOOP_ID_IN_USE) {
++
++	 		DEBUG9_10(printk("%s(%ld): inst=%ld "
++			    "ERROR login status[0]=%x status[1]=%x.\n",
++			    __func__, ha->host_no, ha->instance, status[0],
++			    status[1]);)
++
++			retval = QL_STATUS_FATAL_ERROR;
++			break;
++		}
++
++		if (status[0] == MBS_CMD_CMP) {
++			DEBUG9(printk("%s(%ld): inst=%ld "
++			    " host login success; loop_id=%x.\n",
++			    __func__, ha->host_no, ha->instance, tmp_loop_id);)
++
++			pdevice->loop_id = tmp_loop_id;
++			retval = QL_STATUS_SUCCESS;
++			break;
++
++		} else if (status[0] == MBS_PORT_ID_IN_USE) {
++			ha->fabricid[tmp_loop_id].in_use = FALSE;
++			tmp_loop_id = status[1];
++
++			DEBUG9(printk("%s(%ld): inst=%ld "
++			    "port %02x%02x%02x already using loop id=0x%02x in "
++			    "f/w database. Retrying.\n",
++			    __func__, ha->host_no, ha->instance,
++			    pdevice->d_id.b.domain,
++			    pdevice->d_id.b.area,
++			    pdevice->d_id.b.al_pa,
++			    tmp_loop_id);)
++
++			if (tmp_loop_id <= LAST_SNS_LOOP_ID) {
++				ha->fabricid[tmp_loop_id].in_use = TRUE;
++			} else {
++				/* Error */
++				DEBUG9_10(printk("%s(%ld): inst=%ld "
++				    "PORT_ID_IN_USE - invalid loop id %02x "
++				    "returned.\n",
++				    __func__, ha->host_no, ha->instance,
++				    pdevice->loop_id);)
++				retval = QL_STATUS_ERROR;
++				break;
++			}
++
++		} else if (status[0] == MBS_LOOP_ID_IN_USE) {
++			/* loop id already used by others; try another one */
++			DEBUG9_10(printk("%s(%ld): inst=%ld "
++			    "loop id %02x already used.\n",
++			    __func__, ha->host_no, ha->instance,
++			    pdevice->loop_id);)
++
++			/* Search for another usable loop_id */
++			if (qla2x00_get_next_free_pub_id(ha,
++			    &tmp_loop_id) == 0) {
++
++				DEBUG9(printk("%s(%ld): previous loop "
++				    "id in use. Retry with 0x%02x.\n",
++				    __func__, ha->host_no, tmp_loop_id);)
++
++				ha->fabricid[tmp_loop_id].in_use = TRUE;
++			} else {
++				/* Error */
++				DEBUG9_10(printk("%s(%ld): inst=%ld loop id "
++				    "in use; no more free loop id.\n",
++				    __func__, ha->host_no, ha->instance);)
++
++				retval = QL_STATUS_ERROR;
++				break;
++			}
++		}
++	}
++
++	DEBUG9(printk("%s(%ld): inst=%ld exiting. retval=%d.\n",
++	     __func__, ha->host_no, ha->instance, retval);)
++
++	return (retval);
++}
++#endif
++
++/*
++ * qla2x00_find_curr_ha
++ *	Searches and returns the pointer to the adapter host_no specified.
++ *
++ * Input:
++ *	host_inst = driver internal adapter instance number to search.
++ *	ha = adapter state pointer of the instance requested.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_find_curr_ha(uint16_t host_inst, scsi_qla_host_t **ret_ha)
++{
++	int	rval = QL_STATUS_SUCCESS;
++	int	found;
++	struct list_head *hal;
++	scsi_qla_host_t *search_ha = NULL;
++
++	/*
++ 	 * Set ha context for this IOCTL by matching host_no.
++	 */
++	found = 0;
++	read_lock(&qla_hostlist_lock);
++	list_for_each(hal, &qla_hostlist) {
++		search_ha = list_entry(hal, scsi_qla_host_t, list);
++
++		if (search_ha->instance == host_inst) {
++			found++;
++			break;
++		}
++	}
++	read_unlock(&qla_hostlist_lock);
++
++	if (!found) {
++ 		DEBUG10(printk("%s: ERROR matching host_inst "
++ 		    "%d to an HBA Instance.\n", __func__, host_inst);)
++		rval = QL_STATUS_ERROR;
++	} else {
++		DEBUG9(printk("%s: found matching host_inst "
++		    "%d to an HBA Instance.\n", __func__, host_inst);)
++		*ret_ha = search_ha;
++	}
++
++	return rval;
++}
++
++/*
++ * qla2x00_get_driver_specifics
++ *	Returns driver specific data in the response buffer.
++ *
++ * Input:
++ *	pext = pointer to EXT_IOCTL structure containing values from user.
++ *
++ * Returns:
++ *	0 = success
++ *	others = errno value
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_get_driver_specifics(EXT_IOCTL *pext)
++{
++	int			ret = 0;
++	EXT_LN_DRIVER_DATA	data;
++
++	DEBUG9(printk("%s: entered.\n",
++	    __func__);)
++
++	if (pext->ResponseLen < sizeof(EXT_LN_DRIVER_DATA)) {
++		pext->Status = EXT_STATUS_BUFFER_TOO_SMALL;
++		DEBUG9_10(printk("%s: ERROR ResponseLen too small.\n",
++		    __func__);)
++
++		return (ret);
++	}
++
++	data.DrvVer.Major = QLA_DRIVER_MAJOR_VER;
++	data.DrvVer.Minor = QLA_DRIVER_MINOR_VER;
++	data.DrvVer.Patch = QLA_DRIVER_PATCH_VER;
++	data.DrvVer.Beta = QLA_DRIVER_BETA_VER;
++
++	ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr,
++	    sizeof(EXT_LN_DRIVER_DATA));
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s: ERROR verify write resp buf\n",
++		    __func__);)
++
++		return (ret);
++	}
++
++	ret = copy_to_user(pext->ResponseAdr, &data, sizeof(EXT_LN_DRIVER_DATA));
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s: ERROR copy resp buf\n",
++		    __func__);)
++	}
++
++	DEBUG9(printk("%s: exiting. ret=%d.\n",
++	    __func__, ret);)
++
++	return (ret);
++}
++
++/*
++ * qla2x00_aen_reg
++ *	IOCTL management server Asynchronous Event Tracking Enable/Disable.
++ *
++ * Input:
++ *	ha = pointer to the adapter struct of the adapter to register.
++ *	cmd = pointer to EXT_IOCTL structure containing values from user.
++ *	mode = flags. not used.
++ *
++ * Returns:
++ *	0 = success
++ *	others = errno value
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_aen_reg(scsi_qla_host_t *ha, EXT_IOCTL *cmd, int mode)
++{
++	int		rval = 0;
++	EXT_REG_AEN	reg_struct;
++
++	DEBUG9(printk("%s(%ld): inst %ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	rval = verify_area(VERIFY_READ, (void *)cmd->RequestAdr,
++	    sizeof(EXT_REG_AEN));
++	if (rval) {
++		cmd->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst %ld ERROR verify read req buf\n",
++		    __func__, ha->host_no, ha->instance);)
++
++		return (rval);
++	}
++
++	rval = copy_from_user(&reg_struct, cmd->RequestAdr, sizeof(EXT_REG_AEN));
++	if (rval == 0) {
++		cmd->Status = EXT_STATUS_OK;
++		if (reg_struct.Enable) {
++			ha->ioctl->flags |= IOCTL_AEN_TRACKING_ENABLE;
++		} else {
++			ha->ioctl->flags &= ~IOCTL_AEN_TRACKING_ENABLE;
++		}
++	} else {
++		cmd->Status = EXT_STATUS_COPY_ERR;
++	}
++
++	DEBUG9(printk("%s(%ld): inst %ld reg_struct.Enable(%d) "
++	    "ha->ioctl_flag(%x) cmd->Status(%d).",
++	    __func__, ha->host_no, ha->instance, reg_struct.Enable,
++	    ha->ioctl->flags, cmd->Status);)
++
++	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	return (rval);
++}
++
++/*
++ * qla2x00_aen_get
++ *	Asynchronous Event Record Transfer to user.
++ *	The entire queue will be emptied and transferred back.
++ *
++ * Input:
++ *	ha = pointer to the adapter struct of the specified adapter.
++ *	pext = pointer to EXT_IOCTL structure containing values from user.
++ *	mode = flags.
++ *
++ * Returns:
++ *	0 = success
++ *	others = errno value
++ *
++ * Context:
++ *	Kernel context.
++ *
++ * NOTE: Need to use hardware lock to protect the queues from updates
++ *	 via isr/enqueue_aen after we get rid of io_request_lock.
++ */
++static int
++qla2x00_aen_get(scsi_qla_host_t *ha, EXT_IOCTL *cmd, int mode)
++{
++	int		rval = 0;
++	EXT_ASYNC_EVENT	*tmp_q;
++	EXT_ASYNC_EVENT	*paen;
++	uint8_t		i;
++	uint8_t		queue_cnt;
++	uint8_t		request_cnt;
++	uint32_t	stat = EXT_STATUS_OK;
++	uint32_t	ret_len = 0;
++	unsigned long   cpu_flags = 0;
++
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	request_cnt = (uint8_t)(cmd->ResponseLen / sizeof(EXT_ASYNC_EVENT));
++
++	if (request_cnt < EXT_DEF_MAX_AEN_QUEUE) {
++		/* We require caller to alloc for the maximum request count */
++		cmd->Status       = EXT_STATUS_BUFFER_TOO_SMALL;
++		DEBUG9_10(printk("%s(%ld): inst=%ld Buffer too small. "
++		    "Exiting normally.",
++		    __func__, ha->host_no, ha->instance);)
++
++		return (rval);
++	}
++
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&paen,
++	    sizeof(EXT_ASYNC_EVENT) * EXT_DEF_MAX_AEN_QUEUE)) {
++		/* not enough memory */
++		cmd->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "size requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(EXT_ASYNC_EVENT)*EXT_DEF_MAX_AEN_QUEUE);)
++		return (rval);
++	}
++
++	/* 1st: Make a local copy of the entire queue content. */
++	tmp_q = (EXT_ASYNC_EVENT *)ha->ioctl->aen_tracking_queue;
++	queue_cnt = 0;
++
++	spin_lock_irqsave(&ha->hardware_lock, cpu_flags);
++	i = ha->ioctl->aen_q_head;
++
++	for (; queue_cnt < EXT_DEF_MAX_AEN_QUEUE;) {
++		if (tmp_q[i].AsyncEventCode != 0) {
++			memcpy(&paen[queue_cnt], &tmp_q[i],
++			    sizeof(EXT_ASYNC_EVENT));
++			queue_cnt++;
++			tmp_q[i].AsyncEventCode = 0; /* empty out the slot */
++		}
++
++		if (i == ha->ioctl->aen_q_tail) {
++			/* done. */
++			break;
++		}
++
++		i++;
++
++		if (i == EXT_DEF_MAX_AEN_QUEUE) {
++			i = 0;
++		}
++	}
++
++	/* Empty the queue. */
++	ha->ioctl->aen_q_head = 0;
++	ha->ioctl->aen_q_tail = 0;
++
++	spin_unlock_irqrestore(&ha->hardware_lock, cpu_flags);
++
++	/* 2nd: Now transfer the queue content to user buffer */
++	/* Copy the entire queue to user's buffer. */
++	ret_len = (uint32_t)(queue_cnt * sizeof(EXT_ASYNC_EVENT));
++	if (queue_cnt != 0) {
++		rval = verify_area(VERIFY_WRITE, (void *)cmd->ResponseAdr,
++		    ret_len);
++		if (rval != 0) {
++			cmd->Status = EXT_STATUS_COPY_ERR;
++			DEBUG9_10(printk(
++			    "%s(%ld): inst=%ld ERROR verify write resp buf.\n",
++			    __func__, ha->host_no, ha->instance);)
++
++			qla2x00_free_ioctl_scrap_mem(ha);
++			return (rval);
++		}
++
++		rval = copy_to_user(cmd->ResponseAdr, paen, ret_len);
++	}
++	cmd->ResponseLen = ret_len;
++
++	if (rval != 0) {
++		stat = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst=%ld FAILED. error = %d\n",
++		    __func__, ha->host_no, ha->instance, stat);)
++	} else {
++		stat = EXT_STATUS_OK;
++	}
++
++	cmd->Status = stat;
++	qla2x00_free_ioctl_scrap_mem(ha);
++
++	DEBUG9(printk("%s(%ld): inst=%ld exiting. rval=%d.\n",
++	     __func__, ha->host_no, ha->instance, rval);)
++
++	return (rval);
++}
++
++/*
++ * qla2x00_enqueue_aen
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	event_code = async event code of the event to add to queue.
++ *	payload = event payload for the queue.
++ *
++ * Context:
++ *	Interrupt context.
++ * NOTE: Need to hold the hardware lock to protect the queues from
++ *	 aen_get after we get rid of the io_request_lock.
++ */
++void
++qla2x00_enqueue_aen(scsi_qla_host_t *ha, uint16_t event_code, void *payload)
++{
++	uint8_t			new_entry; /* index to current entry */
++	uint16_t		*mbx;
++	EXT_ASYNC_EVENT		*aen_queue;
++
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	aen_queue = (EXT_ASYNC_EVENT *)ha->ioctl->aen_tracking_queue;
++	if (aen_queue[ha->ioctl->aen_q_tail].AsyncEventCode != 0) {
++		/* Need to change queue pointers to make room. */
++
++		/* Increment tail for adding new entry. */
++		ha->ioctl->aen_q_tail++;
++		if (ha->ioctl->aen_q_tail == EXT_DEF_MAX_AEN_QUEUE) {
++			ha->ioctl->aen_q_tail = 0;
++		}
++
++		if (ha->ioctl->aen_q_head == ha->ioctl->aen_q_tail) {
++			/*
++			 * We're overwriting the oldest entry, so need to
++			 * update the head pointer.
++			 */
++			ha->ioctl->aen_q_head++;
++			if (ha->ioctl->aen_q_head == EXT_DEF_MAX_AEN_QUEUE) {
++				ha->ioctl->aen_q_head = 0;
++			}
++		}
++	}
++
++	DEBUG(printk("%s(%ld): inst=%ld Adding code 0x%x to aen_q %p @ %d\n",
++	    __func__, ha->host_no, ha->instance, event_code, aen_queue,
++	    ha->ioctl->aen_q_tail);)
++
++	new_entry = ha->ioctl->aen_q_tail;
++	aen_queue[new_entry].AsyncEventCode = event_code;
++
++		/* Update payload */
++	switch (event_code) {
++	case MBA_LIP_OCCURRED:
++	case MBA_LOOP_UP:
++	case MBA_LOOP_DOWN:
++	case MBA_LIP_RESET:
++	case MBA_PORT_UPDATE:
++		/* empty */
++		break;
++
++	case MBA_SCR_UPDATE:
++		mbx = (uint16_t *)payload;
++		/* al_pa */
++		aen_queue[new_entry].Payload.RSCN.RSCNInfo[0] = LSB(mbx[2]);
++		/* area */
++		aen_queue[new_entry].Payload.RSCN.RSCNInfo[1] = MSB(mbx[2]);
++		/* domain */
++		aen_queue[new_entry].Payload.RSCN.RSCNInfo[2] = LSB(mbx[1]);
++		/* save in big endian */
++		BIG_ENDIAN_24(aen_queue[new_entry].Payload.RSCN.RSCNInfo[0]);
++
++		aen_queue[new_entry].Payload.RSCN.AddrFormat = MSB(mbx[1]);
++
++		break;
++
++	default:
++		/* Not supported */
++		aen_queue[new_entry].AsyncEventCode = 0;
++		break;
++	}
++
++	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
++	    __func__, ha->host_no, ha->instance);)
++}
++
++/*
++ * qla2x00_query
++ *	Handles all subcommands of the EXT_CC_QUERY command.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	pext = EXT_IOCTL structure pointer.
++ *	mode = not used.
++ *
++ * Returns:
++ *	0 = success
++ *	others = errno value
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_query(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
++{
++	int rval = 0;
++
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	/* All Query type ioctls are done here */
++	switch(pext->SubCode) {
++
++	case EXT_SC_QUERY_HBA_NODE:
++		/* fill in HBA NODE Information */
++		rval = qla2x00_query_hba_node(ha, pext, mode);
++		break;
++
++	case EXT_SC_QUERY_HBA_PORT:
++		/* return HBA PORT related info */
++		rval = qla2x00_query_hba_port(ha, pext, mode);
++		break;
++
++	case EXT_SC_QUERY_DISC_PORT:
++		/* return discovered port information */
++		rval = qla2x00_query_disc_port(ha, pext, mode);
++		break;
++
++	case EXT_SC_QUERY_DISC_TGT:
++		/* return discovered target information */
++		rval = qla2x00_query_disc_tgt(ha, pext, mode);
++		break;
++
++	case EXT_SC_QUERY_CHIP:
++		rval = qla2x00_query_chip(ha, pext, mode);
++		break;
++
++	case EXT_SC_QUERY_DISC_LUN:
++		pext->Status = EXT_STATUS_UNSUPPORTED_SUBCODE;
++		break;
++
++	default:
++ 		DEBUG9_10(printk("%s(%ld): inst=%ld unknown SubCode %d.\n",
++ 		    __func__, ha->host_no, ha->instance, pext->SubCode);)
++		pext->Status = EXT_STATUS_UNSUPPORTED_SUBCODE;
++		break;
++	}
++
++ 	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
++ 	    __func__, ha->host_no, ha->instance);)
++	return rval;
++}
++
++/*
++ * qla2x00_query_hba_node
++ *	Handles EXT_SC_QUERY_HBA_NODE subcommand.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	pext = EXT_IOCTL structure pointer.
++ *	mode = not used.
++ *
++ * Returns:
++ *	0 = success
++ *	others = errno value
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_query_hba_node(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
++{
++	int		ret = 0;
++	uint32_t	i, transfer_size;
++	EXT_HBA_NODE	*ptmp_hba_node;
++
++ 	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++ 	    __func__, ha->host_no, ha->instance);)
++
++ 	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&ptmp_hba_node,
++ 	    sizeof(EXT_HBA_NODE))) {
++ 		/* not enough memory */
++ 		pext->Status = EXT_STATUS_NO_MEMORY;
++ 		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++ 		    "size requested=%d.\n",
++ 		    __func__, ha->host_no, ha->instance,
++ 		    sizeof(EXT_HBA_NODE));)
++ 		return (ret);
++ 	}
++
++	/* fill all available HBA NODE Information */
++	for (i = 0; i < 8 ; i++)
++		ptmp_hba_node->WWNN[i] = ha->node_name[i];
++
++	sprintf((char *)(ptmp_hba_node->Manufacturer),"Qlogic Corp.");
++	sprintf((char *)(ptmp_hba_node->Model), ha->brd_info->name);
++
++	ptmp_hba_node->SerialNum[0] = ha->serial0;
++	ptmp_hba_node->SerialNum[1] = ha->serial1;
++	ptmp_hba_node->SerialNum[2] = ha->serial2;
++	sprintf((char *)(ptmp_hba_node->DriverVersion), qla2x00_version_str);
++	sprintf((char *)(ptmp_hba_node->FWVersion),"%2d.%02d.%02d",
++	    ha->fw_major_version, 
++	    ha->fw_minor_version, 
++	    ha->fw_subminor_version);
++
++	sprintf((char *)(ptmp_hba_node->OptRomVersion),"%d.%d",
++	    ha->optrom_major, ha->optrom_minor);
++
++	ptmp_hba_node->InterfaceType = EXT_DEF_FC_INTF_TYPE;
++	ptmp_hba_node->PortCount = 1;
++
++
++	ptmp_hba_node->DriverAttr = (ha->flags.failover_enabled) ?
++	    DRVR_FO_ENABLED : 0;
++
++	ret = verify_area(VERIFY_WRITE, (void  *)pext->ResponseAdr,
++	    sizeof(EXT_HBA_NODE));
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify wrt rsp buf\n",
++		    __func__, ha->host_no, ha->instance);)
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return (ret);
++	}
++
++	/* now copy up the HBA_NODE to user */
++	if (pext->ResponseLen < sizeof(EXT_HBA_NODE))
++		transfer_size = pext->ResponseLen;
++	else
++		transfer_size = sizeof(EXT_HBA_NODE);
++
++	ret = copy_to_user((uint8_t *)pext->ResponseAdr,
++	    (uint8_t *)ptmp_hba_node, transfer_size);
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buffer.\n",
++		    __func__, ha->host_no, ha->instance);)
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return (ret);
++	}
++
++	pext->Status       = EXT_STATUS_OK;
++	pext->DetailStatus = EXT_STATUS_OK;
++
++	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	qla2x00_free_ioctl_scrap_mem(ha);
++	return (ret);
++}
++
++/*
++ * qla2x00_query_hba_port
++ *	Handles EXT_SC_QUERY_HBA_PORT subcommand.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	pext = EXT_IOCTL structure pointer.
++ *	mode = not used.
++ *
++ * Returns:
++ *	0 = success
++ *	others = errno value
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_query_hba_port(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
++{
++	int		ret = 0;
++	uint32_t	tgt_cnt, tgt, transfer_size;
++	uint32_t	port_cnt;
++	struct list_head	*fcpl;
++	fc_port_t	*fcport;
++	EXT_HBA_PORT	*ptmp_hba_port;
++
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&ptmp_hba_port,
++	    sizeof(EXT_HBA_PORT))) {
++		/* not enough memory */
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "size requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(EXT_HBA_PORT));)
++		return (ret);
++	}
++
++	/* reflect all HBA PORT related info */
++	ptmp_hba_port->WWPN[7] = ha->init_cb->port_name[7];
++	ptmp_hba_port->WWPN[6] = ha->init_cb->port_name[6];
++	ptmp_hba_port->WWPN[5] = ha->init_cb->port_name[5];
++	ptmp_hba_port->WWPN[4] = ha->init_cb->port_name[4];
++	ptmp_hba_port->WWPN[3] = ha->init_cb->port_name[3];
++	ptmp_hba_port->WWPN[2] = ha->init_cb->port_name[2];
++	ptmp_hba_port->WWPN[1] = ha->init_cb->port_name[1];
++	ptmp_hba_port->WWPN[0] = ha->init_cb->port_name[0];
++	ptmp_hba_port->Id[0] = 0;
++	ptmp_hba_port->Id[1] = ha->d_id.r.d_id[2];
++	ptmp_hba_port->Id[2] = ha->d_id.r.d_id[1];
++	ptmp_hba_port->Id[3] = ha->d_id.r.d_id[0];
++	ptmp_hba_port->Type =  EXT_DEF_INITIATOR_DEV;
++
++	switch (ha->current_topology) {
++	case ISP_CFG_NL:
++	case ISP_CFG_FL:
++		ptmp_hba_port->Mode = EXT_DEF_LOOP_MODE;
++		break;
++
++	case ISP_CFG_N:
++	case ISP_CFG_F:
++		ptmp_hba_port->Mode = EXT_DEF_P2P_MODE;
++		break;
++
++	default:
++		ptmp_hba_port->Mode = EXT_DEF_UNKNOWN_MODE;
++		break;
++	}
++
++	port_cnt = 0;
++	list_for_each(fcpl, &ha->fcports) {
++		fcport = list_entry(fcpl, fc_port_t, list);
++
++		/* if removed or missing */
++		if (atomic_read(&fcport->state) != FC_ONLINE) {
++			DEBUG9_10(printk(
++			    "%s(%ld): inst=%ld port %02x%02x%02x not online\n",
++			    __func__, ha->host_no, ha->instance,
++			    fcport->d_id.b.domain,
++			    fcport->d_id.b.area,
++			    fcport->d_id.b.al_pa));
++			continue;
++		}
++		port_cnt++;
++	}
++
++	tgt_cnt  = 0;
++	for (tgt = 0; tgt < MAX_TARGETS; tgt++) {
++		if (ha->otgt[tgt] == NULL) {
++			continue;
++		}
++		tgt_cnt++;
++	}
++
++	DEBUG9_10(printk("%s(%ld): inst=%ld disc_port cnt=%d, tgt cnt=%d.\n",
++	    __func__, ha->host_no, ha->instance,
++	    port_cnt, tgt_cnt);)
++	ptmp_hba_port->DiscPortCount   = port_cnt;
++	ptmp_hba_port->DiscTargetCount = tgt_cnt;
++
++	if (ha->loop_state == LOOP_DOWN) {
++
++		ptmp_hba_port->State = EXT_DEF_HBA_LOOP_DOWN;
++
++	} else if (ha->loop_state != LOOP_READY ||
++	    test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags) ||
++	    test_bit(CFG_ACTIVE, &ha->cfg_flags) || ABORTS_ACTIVE) {
++
++		ptmp_hba_port->State = EXT_DEF_HBA_SUSPENDED;
++
++	} else {
++
++		ptmp_hba_port->State = EXT_DEF_HBA_OK;
++
++	}
++
++	ptmp_hba_port->DiscPortNameType = EXT_DEF_USE_PORT_NAME;
++
++	/* Return supported FC4 type depending on driver support. */
++	ptmp_hba_port->PortSupportedFC4Types = EXT_DEF_FC4_TYPE_SCSI;
++#if defined(FC_IP_SUPPORT)
++
++	ptmp_hba_port->PortSupportedFC4Types |= EXT_DEF_FC4_TYPE_IP;
++#endif
++#if defined(FC_SCTP_SUPPORT)
++
++	ptmp_hba_port->PortSupportedFC4Types |= EXT_DEF_FC4_TYPE_SCTP;
++#endif
++
++	ptmp_hba_port->PortActiveFC4Types = ha->active_fc4_types;
++
++	/* Return supported speed depending on adapter type */
++#if defined(ISP2100)
++
++	ptmp_hba_port->PortSupportedSpeed = EXT_DEF_PORTSPEED_1GBIT;
++#elif defined(ISP2200)
++
++	ptmp_hba_port->PortSupportedSpeed = EXT_DEF_PORTSPEED_1GBIT;
++#elif defined(ISP2300)
++
++	ptmp_hba_port->PortSupportedSpeed = EXT_DEF_PORTSPEED_2GBIT;
++#else
++	/* invalid */
++	ptmp_hba_port->PortSupportedSpeed = 0;
++#endif
++
++	ptmp_hba_port->PortSpeed = ha->current_speed;
++
++	ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr ,
++	    sizeof(EXT_HBA_PORT));
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify wrt rsp buf\n",
++		    __func__, ha->host_no, ha->instance);)
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return (ret);
++	}
++
++	/* now copy up the HBA_PORT to user */
++	if (pext->ResponseLen < sizeof(EXT_HBA_PORT))
++		transfer_size = pext->ResponseLen;
++	else
++		transfer_size = sizeof(EXT_HBA_PORT);
++
++	ret = copy_to_user((uint8_t *)pext->ResponseAdr,
++	    (uint8_t *)ptmp_hba_port, transfer_size);
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buffer.\n",
++		    __func__, ha->host_no, ha->instance);)
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return (ret);
++	}
++
++	pext->Status       = EXT_STATUS_OK;
++	pext->DetailStatus = EXT_STATUS_OK;
++	qla2x00_free_ioctl_scrap_mem(ha);
++
++	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	return ret;
++}
++
++/*
++ * qla2x00_query_disc_port
++ *	Handles EXT_SC_QUERY_DISC_PORT subcommand.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	pext = EXT_IOCTL structure pointer.
++ *	mode = not used.
++ *
++ * Returns:
++ *	0 = success
++ *	others = errno value
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_query_disc_port(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
++{
++	int		ret = 0;
++	int		found;
++	uint32_t	tgt, transfer_size, inst;
++	struct list_head *fcpl;
++	fc_port_t	*fcport;
++	os_tgt_t	*tq;
++	EXT_DISC_PORT	*ptmp_disc_port;
++
++	DEBUG9(printk("%s(%ld): inst=%ld entered. Port inst=%02d.\n",
++	    __func__, ha->host_no, ha->instance, pext->Instance);)
++
++	inst = 0;
++	found = 0;
++	fcport = NULL;
++	list_for_each(fcpl, &ha->fcports) {
++		fcport = list_entry(fcpl, fc_port_t, list);
++
++		if (atomic_read(&fcport->state) != FC_ONLINE) {
++			/* port does not exist anymore */
++			DEBUG9(printk("%s(%ld): fcport marked lost. "
++			    "d_id=%02x%02x%02x loop_id=%02x not online.\n",
++			    __func__, ha->host_no,
++			    fcport->d_id.b.domain,
++			    fcport->d_id.b.area,
++			    fcport->d_id.b.al_pa,
++			    fcport->loop_id);)
++
++			continue;
++		}
++
++		if (inst != pext->Instance) {
++			DEBUG9(printk("%s(%ld): found fcport %02d "
++			    "d_id=%02x%02x%02x. Skipping.\n",
++			    __func__, ha->host_no, inst,
++			    fcport->d_id.b.domain,
++			    fcport->d_id.b.area,
++			    fcport->d_id.b.al_pa));
++
++			inst++;
++			continue;
++		}
++
++		DEBUG9(printk("%s(%ld): inst=%ld found matching fcport %02d "
++		    "online. d_id=%02x%02x%02x loop_id=%02x online.\n",
++		    __func__, ha->host_no, ha->instance, inst,
++		    fcport->d_id.b.domain,
++		    fcport->d_id.b.area,
++		    fcport->d_id.b.al_pa,
++		    fcport->loop_id);)
++
++		/* Found the matching port still connected. */
++		found++;
++		break;
++	}
++
++	if (!found) {
++		DEBUG9_10(printk("%s(%ld): inst=%ld dev not found.\n",
++		    __func__, ha->host_no, ha->instance);)
++
++		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++		return (ret);
++	}
++
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&ptmp_disc_port,
++	    sizeof(EXT_DISC_PORT))) {
++		/* not enough memory */
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "size requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(EXT_DISC_PORT));)
++		return (ret);
++	}
++
++	memcpy(ptmp_disc_port->WWNN, fcport->node_name, WWN_SIZE);
++	memcpy(ptmp_disc_port->WWPN, fcport->port_name, WWN_SIZE);
++
++	ptmp_disc_port->Id[0] = 0;
++	ptmp_disc_port->Id[1] = fcport->d_id.r.d_id[2];
++	ptmp_disc_port->Id[2] = fcport->d_id.r.d_id[1];
++	ptmp_disc_port->Id[3] = fcport->d_id.r.d_id[0];
++
++	/* Currently all devices on fcport list are target capable devices */
++	/* This default value may need to be changed after we add non target
++	 * devices also to this list.
++	 */
++	ptmp_disc_port->Type = EXT_DEF_TARGET_DEV;
++
++	if (fcport->flags & FC_FABRIC_DEVICE) {
++		ptmp_disc_port->Type |= EXT_DEF_FABRIC_DEV;
++	}
++	if (fcport->flags & FC_TAPE_DEVICE) {
++		ptmp_disc_port->Type |= EXT_DEF_TAPE_DEV;
++	}
++	if (fcport->flags & FC_INITIATOR_DEVICE) {
++		ptmp_disc_port->Type |= EXT_DEF_INITIATOR_DEV;
++	}
++
++	ptmp_disc_port->LoopID = fcport->loop_id;
++	ptmp_disc_port->Status = 0;
++	ptmp_disc_port->Bus    = 0;
++
++	for (tgt = 0; tgt < MAX_TARGETS; tgt++) {
++		if ((tq = ha->otgt[tgt]) == NULL) {
++			continue;
++		}
++
++		if (tq->vis_port == NULL)  /* dg 08/14/01 */
++			continue;
++
++		if (memcmp(fcport->port_name, tq->vis_port->port_name,
++		    EXT_DEF_WWN_NAME_SIZE) == 0) {
++			ptmp_disc_port->TargetId = tgt;
++			break;
++		}
++	}
++
++	ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr ,
++	    sizeof(EXT_DISC_PORT));
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify wrt rsp buf\n",
++		    __func__, ha->host_no, ha->instance);)
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return (ret);
++	}
++
++	/* now copy up the DISC_PORT to user */
++	if (pext->ResponseLen < sizeof(EXT_DISC_PORT))
++		transfer_size = pext->ResponseLen;
++	else
++		transfer_size = sizeof(EXT_DISC_PORT);
++
++	ret = copy_to_user((uint8_t *)pext->ResponseAdr,
++	    (uint8_t *)ptmp_disc_port, transfer_size);
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buffer.\n",
++		    __func__, ha->host_no, ha->instance);)
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return (ret);
++	}
++
++	pext->Status       = EXT_STATUS_OK;
++	pext->DetailStatus = EXT_STATUS_OK;
++	qla2x00_free_ioctl_scrap_mem(ha);
++
++	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	return (ret);
++}
++
++/*
++ * qla2x00_query_disc_tgt
++ *	Handles EXT_SC_QUERY_DISC_TGT subcommand.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	pext = EXT_IOCTL structure pointer.
++ *	mode = not used.
++ *
++ * Returns:
++ *	0 = success
++ *	others = errno value
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_query_disc_tgt(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
++{
++	int		ret = 0;
++	uint32_t	tgt, transfer_size, inst;
++	uint32_t	cnt, i;
++	fc_port_t	*tgt_fcport;
++	os_tgt_t	*tq;
++	EXT_DISC_TARGET	*ptmp_disc_target;
++
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	tq = NULL;
++	for (tgt = 0, inst = 0; tgt < MAX_TARGETS; tgt++) {
++		if (ha->otgt[tgt] == NULL) {
++			continue;
++		}
++		/* if wrong target id then skip to next entry */
++		if (inst != pext->Instance) {
++			inst++;
++			continue;
++		}
++		tq = ha->otgt[tgt];
++		break;
++	}
++
++	if (tq == NULL || tgt == MAX_TARGETS) {
++		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++		DEBUG9_10(printk("%s(%ld): inst=%ld target dev not found. "
++		    "tq=%p, tgt=%d.\n",
++		    __func__, ha->host_no, ha->instance, tq, tgt);)
++		return (ret);
++	}
++
++	if (tq->vis_port == NULL) { 	/* dg 08/14/01 */
++		pext->Status = EXT_STATUS_BUSY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld target dev not found. "
++		    "tq=%p.\n",
++		    __func__, ha->host_no, ha->instance, tq);)
++		return (ret);
++	}
++
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&ptmp_disc_target,
++	    sizeof(EXT_DISC_TARGET))) {
++		/* not enough memory */
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "size requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(EXT_DISC_TARGET));)
++		return (ret);
++	}
++
++	tgt_fcport = tq->vis_port;
++	memcpy(ptmp_disc_target->WWNN, tgt_fcport->node_name, WWN_SIZE);
++	memcpy(ptmp_disc_target->WWPN, tgt_fcport->port_name, WWN_SIZE);
++
++	ptmp_disc_target->Id[0] = 0;
++	ptmp_disc_target->Id[1] = tgt_fcport->d_id.r.d_id[2];
++	ptmp_disc_target->Id[2] = tgt_fcport->d_id.r.d_id[1];
++	ptmp_disc_target->Id[3] = tgt_fcport->d_id.r.d_id[0];
++
++	/* All devices on ha->otgt list are target capable devices. */
++	ptmp_disc_target->Type = EXT_DEF_TARGET_DEV;
++
++	if (tgt_fcport->flags & FC_FABRIC_DEVICE) {
++		ptmp_disc_target->Type |= EXT_DEF_FABRIC_DEV;
++	}
++	if (tgt_fcport->flags & FC_TAPE_DEVICE) {
++		ptmp_disc_target->Type |= EXT_DEF_TAPE_DEV;
++	}
++	if (tgt_fcport->flags & FC_INITIATOR_DEVICE) {
++		ptmp_disc_target->Type |= EXT_DEF_INITIATOR_DEV;
++	}
++
++	ptmp_disc_target->LoopID   = tgt_fcport->loop_id;
++	ptmp_disc_target->Status   = 0;
++	ptmp_disc_target->Bus      = 0;
++	ptmp_disc_target->TargetId = tgt;
++
++	cnt = 0;
++	/* enumerate available LUNs under this TGT (if any) */
++	if (ha->otgt[tgt] != NULL) {
++		for (i = 0; i < MAX_LUNS ; i++) {
++			if ((ha->otgt[tgt])->olun[i] !=0)
++				cnt++;
++		}
++	}
++
++	ptmp_disc_target->LunCount = cnt;
++
++	ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr,
++	    sizeof(EXT_DISC_TARGET));
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify wrt rsp buf\n",
++		    __func__, ha->host_no, ha->instance);)
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return (ret);
++	}
++
++	/* now copy up the DISC_PORT to user */
++	if (pext->ResponseLen < sizeof(EXT_DISC_PORT))
++		transfer_size = pext->ResponseLen;
++	else
++		transfer_size = sizeof(EXT_DISC_TARGET);
++
++	ret = copy_to_user((uint8_t *)pext->ResponseAdr,
++	    (uint8_t *)ptmp_disc_target, transfer_size);
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buffer.\n",
++		    __func__, ha->host_no, ha->instance);)
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return (ret);
++	}
++
++	pext->Status       = EXT_STATUS_OK;
++	pext->DetailStatus = EXT_STATUS_OK;
++	qla2x00_free_ioctl_scrap_mem(ha);
++
++	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	return (ret);
++}
++
++/*
++ * qla2x00_query_chip
++ *	Handles EXT_SC_QUERY_CHIP subcommand.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	pext = EXT_IOCTL structure pointer.
++ *	mode = not used.
++ *
++ * Returns:
++ *	0 = success
++ *	others = errno value
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_query_chip(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
++{
++	int		ret = 0;
++	uint32_t	transfer_size, i;
++	EXT_CHIP		*ptmp_isp;
++	struct Scsi_Host	*host;
++
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++ 	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&ptmp_isp,
++ 	    sizeof(EXT_CHIP))) {
++ 		/* not enough memory */
++ 		pext->Status = EXT_STATUS_NO_MEMORY;
++ 		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++ 		    "size requested=%d.\n",
++ 		    __func__, ha->host_no, ha->instance,
++ 		    sizeof(EXT_CHIP));)
++ 		return (ret);
++ 	}
++
++	host = ha->host;
++	ptmp_isp->VendorId       = ha->pdev->vendor;
++	ptmp_isp->DeviceId       = ha->pdev->device;
++	ptmp_isp->SubVendorId    = ha->pdev->subsystem_vendor;
++	ptmp_isp->SubSystemId    = ha->pdev->subsystem_device;
++	ptmp_isp->PciBusNumber   = ha->pdev->bus->number;
++	ptmp_isp->PciDevFunc     = ha->pdev->devfn;
++	ptmp_isp->PciSlotNumber  = PCI_SLOT(ha->pdev->devfn);
++	ptmp_isp->IoAddr         = host->io_port;
++	ptmp_isp->IoAddrLen      = 512;
++	ptmp_isp->MemAddr        = 0; /* ? */
++	ptmp_isp->MemAddrLen     = 0; /* ? */
++	ptmp_isp->ChipType       = 0; /* ? */
++	ptmp_isp->InterruptLevel = host->irq;
++
++	for (i = 0; i < 8; i++)
++		ptmp_isp->OutMbx[i] = 0;
++
++	ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr,
++	    sizeof(EXT_CHIP));
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify wrt rsp buf\n",
++		    __func__, ha->host_no, ha->instance);)
++ 		qla2x00_free_ioctl_scrap_mem(ha);
++		return (ret);
++	}
++
++	/* now copy up the ISP to user */
++	if (pext->ResponseLen < sizeof(EXT_CHIP))
++		transfer_size = pext->ResponseLen;
++	else
++		transfer_size = sizeof(EXT_CHIP);
++
++	ret = copy_to_user((uint8_t *)pext->ResponseAdr, (uint8_t *)ptmp_isp,
++	    transfer_size);
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buffer.\n",
++		    __func__, ha->host_no, ha->instance);)
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return (ret);
++	}
++
++	pext->Status       = EXT_STATUS_OK;
++	pext->DetailStatus = EXT_STATUS_OK;
++	qla2x00_free_ioctl_scrap_mem(ha);
++
++	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	return (ret);
++}
++
++/*
++ * qla2x00_get_data
++ *	Handles all subcommands of the EXT_CC_GET_DATA command.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	pext = EXT_IOCTL structure pointer.
++ *	mode = not used.
++ *
++ * Returns:
++ *	0 = success
++ *	others = errno value
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_get_data(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
++{
++	int	tmp_rval = 0;
++
++	switch(pext->SubCode) {
++	case EXT_SC_GET_STATISTICS:
++		tmp_rval = qla2x00_get_statistics(ha, pext, mode);
++		break;
++
++	case EXT_SC_GET_FC_STATISTICS:
++		tmp_rval = qla2x00_get_fc_statistics(ha, pext, mode);
++		break;
++
++	case EXT_SC_GET_PORT_SUMMARY:
++		tmp_rval = qla2x00_get_port_summary(ha, pext, mode);
++		break;
++
++	case EXT_SC_QUERY_DRIVER:
++		tmp_rval = qla2x00_query_driver(ha, pext, mode);
++		break;
++
++	case EXT_SC_QUERY_FW:
++		tmp_rval = qla2x00_query_fw(ha, pext, mode);
++		break;
++
++	case EXT_SC_GET_RNID:
++		tmp_rval = qla2x00_get_rnid_params(ha, pext, mode);
++		break;
++
++	default:
++		DEBUG10(printk("%s(%ld): inst=%ld unknown SubCode %d.\n",
++		    __func__, ha->host_no, ha->instance, pext->SubCode);)
++		pext->Status = EXT_STATUS_UNSUPPORTED_SUBCODE;
++		break;
++	 }
++
++	return (tmp_rval);
++}
++
++/*
++ * qla2x00_get_statistics
++ *	Issues get_link_status mbx cmd and returns statistics
++ *	relavent to the specified adapter.
++ *
++ * Input:
++ *	ha = pointer to adapter struct of the specified adapter.
++ *	pext = pointer to EXT_IOCTL structure containing values from user.
++ *	mode = not used.
++ *
++ * Returns:
++ *	0 = success
++ *	others = errno value
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_get_statistics(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
++{
++	EXT_HBA_PORT_STAT	*ptmp_stat;
++	int		ret = 0;
++	link_stat_t	stat_buf;
++	uint8_t		rval;
++	uint8_t		*usr_temp, *kernel_tmp;
++	uint16_t	mb_stat[1];
++	uint32_t	transfer_size;
++
++
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr,
++	    sizeof(EXT_HBA_PORT_STAT));
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR VERIFY_WRITE "
++		    "EXT_HBA_PORT_STAT.\n",
++		    __func__, ha->host_no, ha->instance);)
++		return (ret);
++	}
++
++	/* check on loop down */
++	if (ha->loop_state != LOOP_READY || 
++	    test_bit(CFG_ACTIVE, &ha->cfg_flags) ||
++	    (test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)) ||
++	    ABORTS_ACTIVE || ha->dpc_active) {
++
++		pext->Status = EXT_STATUS_BUSY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld loop not ready.\n",
++		    __func__, ha->host_no, ha->instance);)
++
++		return (ret);
++	}
++
++	/* Send mailbox cmd to get more. */
++	if ((rval = qla2x00_get_link_status(ha, ha->loop_id, &stat_buf,
++	    mb_stat)) != QL_STATUS_SUCCESS) {
++
++		if (rval == BIT_0) {
++			pext->Status = EXT_STATUS_NO_MEMORY;
++		} else if (rval == BIT_1) {
++			pext->Status = EXT_STATUS_MAILBOX;
++			pext->DetailStatus = EXT_DSTATUS_NOADNL_INFO;
++		} else {
++			pext->Status = EXT_STATUS_ERR;
++		}
++
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR mailbox failed. "
++		    "mb[0]=%x.\n",
++		    __func__, ha->host_no, ha->instance, mb_stat[0]);)
++		printk(KERN_WARNING
++		     "%s(%ld): inst=%ld ERROR mailbox failed. mb[0]=%x.\n",
++		    __func__, ha->host_no, ha->instance, mb_stat[0]);
++
++		return (ret);
++	}
++
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&ptmp_stat,
++	    sizeof(EXT_HBA_PORT_STAT))) {
++		/* not enough memory */
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "size requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(EXT_HBA_PORT_STAT));)
++		return (ret);
++	}
++
++	ptmp_stat->ControllerErrorCount   =  ha->total_isp_aborts;
++	ptmp_stat->DeviceErrorCount       =  ha->total_dev_errs;
++	ptmp_stat->TotalIoCount           =  ha->total_ios;
++	ptmp_stat->TotalMBytes            =  ha->total_bytes >> 20;
++	ptmp_stat->TotalLipResets         =  ha->total_lip_cnt;
++	/*
++	   ptmp_stat->TotalInterrupts        =  ha->total_isr_cnt;
++	 */
++
++	ptmp_stat->TotalLinkFailures               = stat_buf.link_fail_cnt;
++	ptmp_stat->TotalLossOfSync                 = stat_buf.loss_sync_cnt;
++	ptmp_stat->TotalLossOfSignals              = stat_buf.loss_sig_cnt;
++	ptmp_stat->PrimitiveSeqProtocolErrorCount  = stat_buf.prim_seq_err_cnt;
++	ptmp_stat->InvalidTransmissionWordCount    = stat_buf.inval_xmit_word_cnt;
++	ptmp_stat->InvalidCRCCount                 = stat_buf.inval_crc_cnt;
++
++	/* now copy up the STATISTICS to user */
++	if (pext->ResponseLen < sizeof(EXT_HBA_PORT_STAT))
++		transfer_size = pext->ResponseLen;
++	else
++		transfer_size = sizeof(EXT_HBA_PORT_STAT);
++
++	usr_temp   = (uint8_t *)pext->ResponseAdr;
++	kernel_tmp = (uint8_t *)ptmp_stat;
++	ret = copy_to_user(usr_temp, kernel_tmp, transfer_size);
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buffer.\n",
++		    __func__, ha->host_no, ha->instance);)
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return (ret);
++	}
++
++	pext->Status       = EXT_STATUS_OK;
++	pext->DetailStatus = EXT_STATUS_OK;
++	qla2x00_free_ioctl_scrap_mem(ha);
++
++	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	return (ret);
++}
++
++/*
++ * qla2x00_get_fc_statistics
++ *	Issues get_link_status mbx cmd to the target device with
++ *	the specified WWN and returns statistics relavent to the
++ *	device.
++ *
++ * Input:
++ *	ha = pointer to adapter struct of the specified device.
++ *	pext = pointer to EXT_IOCTL structure containing values from user.
++ *	mode = not used.
++ *
++ * Returns:
++ *	0 = success
++ *	others = errno value
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_get_fc_statistics(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
++{
++	EXT_HBA_PORT_STAT	*ptmp_stat;
++	EXT_DEST_ADDR		addr_struct;
++	int		ret = 0;
++	link_stat_t	stat_buf;
++	uint8_t		rval, tgt;
++	uint8_t		*usr_temp, *kernel_tmp;
++	uint8_t		*req_name;
++	uint16_t	mb_stat[1];
++	uint32_t	transfer_size;
++
++
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr,
++	    sizeof(EXT_HBA_PORT_STAT));
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR VERIFY_WRITE.\n",
++		    __func__, ha->host_no, ha->instance);)
++		return (ret);
++	}
++
++	ret = copy_from_user(&addr_struct, pext->RequestAdr, pext->RequestLen);
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy req buf.\n",
++		    __func__, ha->host_no, ha->instance);)
++		return (ret);
++	}
++
++	/* find the device's loop_id */
++	switch (addr_struct.DestType) {
++	case EXT_DEF_DESTTYPE_WWPN:
++		req_name = addr_struct.DestAddr.WWPN;
++		for (tgt = 0; tgt < MAX_FIBRE_DEVICES; tgt++) {
++			if (memcmp(ha->fc_db[tgt].wwn, req_name,
++			    EXT_DEF_WWN_NAME_SIZE) == 0) {
++				break;
++			}
++		}
++		break;
++
++	case EXT_DEF_DESTTYPE_WWNN:
++	case EXT_DEF_DESTTYPE_PORTID:
++	case EXT_DEF_DESTTYPE_FABRIC:
++	case EXT_DEF_DESTTYPE_SCSI:
++	default:
++		pext->Status = EXT_STATUS_INVALID_PARAM;
++		pext->DetailStatus = EXT_DSTATUS_NOADNL_INFO;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR Unsupported subcode "
++		    "address type.\n", __func__, ha->host_no, ha->instance);)
++		return (ret);
++
++		break;
++	}
++
++	if (tgt == MAX_FIBRE_DEVICES) {
++		/* not found */
++		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++		pext->DetailStatus = EXT_DSTATUS_TARGET;
++		return (ret);
++	}
++
++	/* check for suspended/lost device */
++	/*
++	   if (ha->fcport is suspended/lost) {
++	   pext->Status = EXT_STATUS_SUSPENDED;
++	   pext->DetailStatus = EXT_DSTATUS_TARGET;
++	   return pext->Status;
++	   }
++	 */
++
++	/* check on loop down */
++	if (ha->loop_state != LOOP_READY ||
++	    test_bit(CFG_ACTIVE, &ha->cfg_flags) ||
++	    (test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)) ||
++	    ABORTS_ACTIVE || ha->dpc_active) {
++
++		pext->Status = EXT_STATUS_BUSY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld loop not ready.\n",
++		     __func__, ha->host_no, ha->instance);)
++		return (ret);
++	}
++
++	/* Send mailbox cmd to get more. */
++	if ((rval = qla2x00_get_link_status(ha, ha->fc_db[tgt].loop_id,
++	    &stat_buf, mb_stat)) != QL_STATUS_SUCCESS) {
++		if (rval == BIT_0) {
++			pext->Status = EXT_STATUS_NO_MEMORY;
++		} else if (rval == BIT_1) {
++			pext->Status = EXT_STATUS_MAILBOX;
++			pext->DetailStatus = EXT_DSTATUS_NOADNL_INFO;
++		} else {
++			pext->Status = EXT_STATUS_ERR;
++		}
++
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR mailbox failed. "
++		    "mb[0]=%x.\n",
++		    __func__, ha->host_no, ha->instance, mb_stat[0]);)
++		return (ret);
++	}
++
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&ptmp_stat,
++	    sizeof(EXT_HBA_PORT_STAT))) {
++		/* not enough memory */
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "size requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(EXT_HBA_PORT_STAT));)
++		return (ret);
++	}
++
++	ptmp_stat->ControllerErrorCount   =  ha->total_isp_aborts;
++	ptmp_stat->DeviceErrorCount       =  ha->total_dev_errs;
++	ptmp_stat->TotalIoCount           =  ha->total_ios;
++	ptmp_stat->TotalMBytes            =  ha->total_bytes >> 20;
++	ptmp_stat->TotalLipResets         =  ha->total_lip_cnt;
++	/*
++	   ptmp_stat->TotalInterrupts        =  ha->total_isr_cnt;
++	 */
++
++	ptmp_stat->TotalLinkFailures               = stat_buf.link_fail_cnt;
++	ptmp_stat->TotalLossOfSync                 = stat_buf.loss_sync_cnt;
++	ptmp_stat->TotalLossOfSignals              = stat_buf.loss_sig_cnt;
++	ptmp_stat->PrimitiveSeqProtocolErrorCount  = stat_buf.prim_seq_err_cnt;
++	ptmp_stat->InvalidTransmissionWordCount    = stat_buf.inval_xmit_word_cnt;
++	ptmp_stat->InvalidCRCCount                 = stat_buf.inval_crc_cnt;
++
++	/* now copy up the STATISTICS to user */
++	if (pext->ResponseLen < sizeof(EXT_HBA_PORT_STAT))
++		transfer_size = pext->ResponseLen;
++	else
++		transfer_size = sizeof(EXT_HBA_PORT_STAT);
++
++	usr_temp   = (uint8_t *)pext->ResponseAdr;
++	kernel_tmp = (uint8_t *)ptmp_stat;
++	ret = copy_to_user(usr_temp, kernel_tmp, transfer_size);
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buffer.\n",
++		    __func__, ha->host_no, ha->instance);)
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return (ret);
++	}
++
++	pext->Status       = EXT_STATUS_OK;
++	pext->DetailStatus = EXT_STATUS_OK;
++	qla2x00_free_ioctl_scrap_mem(ha);
++
++	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	return (ret);
++}
++
++/*
++ * qla2x00_get_port_summary
++ *	Handles EXT_SC_GET_PORT_SUMMARY subcommand.
++ *	Returns values of devicedata and dd_entry list.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	pext = EXT_IOCTL structure pointer.
++ *	mode = not used.
++ *
++ * Returns:
++ *	0 = success
++ *	others = errno value
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_get_port_summary(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
++{
++	int		ret = 0;
++	uint8_t		*usr_temp, *kernel_tmp;
++	uint32_t	b;
++	uint32_t	i, port_cnt, entry;
++	uint32_t	number_of_entries = 0;
++	uint32_t	tgt_cnt, transfer_size;
++	struct list_head	*fcpl;
++	fc_port_t	*fcport;
++	uint32_t	current_offset;
++	void		*start_of_entry_list;
++
++	EXT_DEVICEDATA		*pdevicedata;
++	EXT_DEVICEDATAENTRY	*pdd_entry;
++
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	port_cnt = 0;
++	tgt_cnt  = 0;
++
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pdevicedata,
++	    sizeof(EXT_DEVICEDATA))) {
++		/* not enough memory */
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "pdevicedata requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(EXT_DEVICEDATA));)
++		return (ret);
++	}
++
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pdd_entry,
++	    sizeof(EXT_DEVICEDATAENTRY))) {
++		/* not enough memory */
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "pdd_entry requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(EXT_DEVICEDATAENTRY));)
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return (ret);
++	}
++
++	list_for_each(fcpl, &ha->fcports) {
++		fcport = list_entry(fcpl, fc_port_t, list);
++
++		port_cnt++;
++	}
++	pdevicedata->TotalDevices = port_cnt;
++
++	number_of_entries = pext->ResponseLen / sizeof(EXT_DEVICEDATAENTRY);
++
++	/* we want the lesser of port_cnt and number_of_entries */
++	if (number_of_entries > port_cnt)
++		number_of_entries = port_cnt;
++	pdevicedata->ReturnListEntryCount  = number_of_entries;
++
++	DEBUG9(printk("%s(%ld): inst=%ld EXT_SC_GET_PORT_SUMMARY port_cnt=%x, "
++	    "return entry cnt=%x.\n",
++	    __func__, ha->host_no, ha->instance, port_cnt,
++	    number_of_entries);)
++
++	transfer_size = sizeof(pdevicedata->ReturnListEntryCount) +
++	    sizeof(pdevicedata->TotalDevices);
++
++	/* copy top of devicedata here */
++	ret = verify_area(VERIFY_WRITE, (void *)(pext->ResponseAdr),
++	    transfer_size);
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify wrt rsp buf\n",
++		    __func__, ha->host_no, ha->instance);)
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return (ret);
++	}
++
++	usr_temp   = (uint8_t *)pext->ResponseAdr;
++	kernel_tmp = (uint8_t *)pdevicedata;
++	ret = copy_to_user(usr_temp, kernel_tmp, transfer_size);
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp "
++		    "devicedata buffer.\n",
++		    __func__, ha->host_no, ha->instance);)
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return (ret);
++	}
++
++	start_of_entry_list = (void *)(pext->ResponseAdr) + transfer_size;
++
++ 	entry = 0;
++ 	list_for_each(fcpl, &ha->fcports) {
++ 		fcport = list_entry(fcpl, fc_port_t, list);
++ 
++ 		if (entry >= number_of_entries)
++ 			break;
++ 
++ 		/* copy from fc_db of this target (port) to dd_entry */
++
++		memcpy(pdd_entry->NodeWWN, fcport->node_name, WWN_SIZE);
++		memcpy(pdd_entry->PortWWN, fcport->port_name, WWN_SIZE);
++
++		for (b = 0; b < 3 ; b++)
++			pdd_entry->PortID[b] = fcport->d_id.r.d_id[2-b];
++
++		if (fcport->flags & FC_FABRIC_DEVICE) {
++			pdd_entry->ControlFlags = EXT_DEF_GET_FABRIC_DEVICE;
++		} else {
++			pdd_entry->ControlFlags = 0;
++		}
++
++		pdd_entry->TargetAddress.Bus    = 0;
++		/* Retrieve 'Target' number for port via fc_db */
++		for (i = 0; i < MAX_TARGETS; i++) {
++			if (ha->fc_db[i].loop_id == PORT_UNUSED)
++				continue;
++
++			if (memcmp(fcport->port_name, ha->fc_db[i].wwn,
++			    EXT_DEF_WWN_NAME_SIZE) == 0) {
++				pdd_entry->TargetAddress.Target = i;
++				break;
++			}
++		}
++		pdd_entry->TargetAddress.Lun    = 0;
++		pdd_entry->DeviceFlags          = 0;
++		pdd_entry->LoopID               = fcport->loop_id;
++		pdd_entry->BaseLunNumber        = 0;
++
++		current_offset = entry * sizeof(EXT_DEVICEDATAENTRY);
++
++		transfer_size = sizeof(EXT_DEVICEDATAENTRY);
++		ret = verify_area(VERIFY_WRITE,
++		    (void *)(start_of_entry_list + current_offset),
++		    transfer_size);
++
++		if (ret) {
++			pext->Status = EXT_STATUS_COPY_ERR;
++			DEBUG10(printk("%s(%ld): inst=%ld ERROR verify WRITE "
++			    "rsp bufaddr=%p\n",
++			    __func__, ha->host_no, ha->instance,
++			    (void *)(start_of_entry_list + current_offset));)
++			qla2x00_free_ioctl_scrap_mem(ha);
++			return pext->Status;
++		}
++
++		/* now copy up this dd_entry to user */
++		usr_temp = (uint8_t *)((u_long) start_of_entry_list +
++		    current_offset);
++		kernel_tmp = (uint8_t *)pdd_entry;
++	 	ret = copy_to_user(usr_temp, kernel_tmp, transfer_size);
++		if (ret) {
++			pext->Status = EXT_STATUS_COPY_ERR;
++			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp "
++			    "entry list buffer.\n",
++			    __func__, ha->host_no, ha->instance);)
++			qla2x00_free_ioctl_scrap_mem(ha);
++			return (ret);
++		}
++
++		entry++;
++	} /* for number_of_entries */
++
++	pext->Status       = EXT_STATUS_OK;
++	pext->DetailStatus = EXT_STATUS_OK;
++	qla2x00_free_ioctl_scrap_mem(ha);
++
++	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	return (ret);
++}
++
++/*
++ * qla2x00_query_driver
++ *	Handles EXT_SC_QUERY_DRIVER subcommand.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	pext = EXT_IOCTL structure pointer.
++ *	mode = not used.
++ *
++ * Returns:
++ *	0 = success
++ *	others = errno value
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_query_driver(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
++{
++	int		ret = 0;
++	uint8_t		*usr_temp, *kernel_tmp;
++	uint32_t	transfer_size;
++	EXT_DRIVER	*pdriver_prop;
++
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pdriver_prop,
++	    sizeof(EXT_DRIVER))) {
++		/* not enough memory */
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "size requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(EXT_DRIVER));)
++		return (ret);
++	}
++
++	sprintf(pdriver_prop->Version, qla2x00_version_str);
++	pdriver_prop->NumOfBus = MAX_BUSES;
++	pdriver_prop->TargetsPerBus = MAX_FIBRE_DEVICES;
++	pdriver_prop->LunsPerTarget = MAX_LUNS;
++	pdriver_prop->MaxTransferLen  = 0xffffffff;
++	pdriver_prop->MaxDataSegments = 0xffffffff;
++
++	if (ha->flags.enable_64bit_addressing == 1)
++		pdriver_prop->DmaBitAddresses = 64;
++	else
++		pdriver_prop->DmaBitAddresses = 32;
++
++	if (pext->ResponseLen < sizeof(EXT_DRIVER))
++		transfer_size = pext->ResponseLen;
++	else
++		transfer_size = sizeof(EXT_DRIVER);
++
++	ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr ,
++	    transfer_size);
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++ 		DEBUG10(printk("%s(%ld): inst=%ld ERROR verify wrt rsp buf.\n",
++ 		    __func__, ha->host_no, ha->instance);)
++ 		qla2x00_free_ioctl_scrap_mem(ha);
++ 		return (ret);
++	}
++
++	/* now copy up the ISP to user */
++	usr_temp   = (uint8_t *)pext->ResponseAdr;
++	kernel_tmp = (uint8_t *)pdriver_prop;
++ 	ret = copy_to_user(usr_temp, kernel_tmp, transfer_size);
++ 	if (ret) {
++ 		pext->Status = EXT_STATUS_COPY_ERR;
++ 		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buffer.\n",
++ 		    __func__, ha->host_no, ha->instance);)
++ 		qla2x00_free_ioctl_scrap_mem(ha);
++ 		return (ret);
++ 	}
++
++	pext->Status       = EXT_STATUS_OK;
++	pext->DetailStatus = EXT_STATUS_OK;
++	qla2x00_free_ioctl_scrap_mem(ha);
++
++ 	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
++ 	    __func__, ha->host_no, ha->instance);)
++
++ 	return (ret);
++}
++
++/*
++ * qla2x00_query_fw
++ *	Handles EXT_SC_QUERY_FW subcommand.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	pext = EXT_IOCTL structure pointer.
++ *	mode = not used.
++ *
++ * Returns:
++ *	0 = success
++ *	others = errno value
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_query_fw(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
++{
++ 	int		ret = 0;
++	uint8_t		*usr_temp, *kernel_tmp;
++	uint32_t	transfer_size;
++ 	EXT_FW		*pfw_prop;
++
++ 	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++ 	    __func__, ha->host_no, ha->instance);)
++
++ 	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pfw_prop,
++ 	    sizeof(EXT_FW))) {
++ 		/* not enough memory */
++ 		pext->Status = EXT_STATUS_NO_MEMORY;
++ 		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++ 		    "size requested=%d.\n",
++ 		    __func__, ha->host_no, ha->instance,
++ 		    sizeof(EXT_FW));)
++ 		return (ret);
++ 	}
++
++	pfw_prop->Version[0] = ha->fw_major_version; 
++	pfw_prop->Version[1] = ha->fw_minor_version; 
++	pfw_prop->Version[2] = ha->fw_subminor_version;
++
++	transfer_size = sizeof(EXT_FW);
++
++	ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr ,
++	    transfer_size);
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG10(printk("%s(%ld): inst=%ld ERROR verify wrt rsp buf.\n",
++		    __func__, ha->host_no, ha->instance);)
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return (ret);
++	}
++
++	usr_temp   = (uint8_t *)pext->ResponseAdr;
++	kernel_tmp = (uint8_t *)pfw_prop;
++	ret = copy_to_user(usr_temp, kernel_tmp, transfer_size);
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buffer.\n",
++		    __func__, ha->host_no, ha->instance);)
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return (ret);
++	}
++
++	pext->Status       = EXT_STATUS_OK;
++	pext->DetailStatus = EXT_STATUS_OK;
++	qla2x00_free_ioctl_scrap_mem(ha);
++
++	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	return (ret);
++}
++
++#if defined(ISP2300)
++/*
++ * qla2x00_send_els_passthru
++ *	Passes the ELS command down to firmware as MSIOCB and
++ *	copies the response back when it completes.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	pext = EXT_IOCTL structure pointer.
++ *	mode = not used.
++ *
++ * Returns:
++ *	0 = success
++ *	others = errno value
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_send_els_passthru(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
++{
++	int		ret = 0;
++	int		tmp_rval = 0;
++
++	uint8_t		index;
++	uint8_t		invalid_wwn = FALSE;
++	uint8_t		port_found;
++	uint8_t		*ptmp_stat;
++	uint8_t		*pusr_req_buf;
++	uint8_t		*presp_payload;
++	uint32_t	payload_len;
++	uint32_t	usr_req_len;
++
++	fcdev_t		tmpdev;
++
++	fc_lun_t	*ptemp_fclun;	/* buf from scrap mem */
++	fc_port_t	*ptemp_fcport;	/* buf from scrap mem */
++
++	struct list_head *fcpl;
++	fc_port_t	*fcport;
++
++	os_lun_t	*plq;
++	os_tgt_t	*ptq;
++
++	Scsi_Cmnd	*pscsi_cmd;
++
++	srb_t		*sp = NULL;
++	EXT_ELS_PT_REQ	*pels_pt_req;
++
++	struct list_head *fcil;
++	fc_initiator_t	*fcinitiator;
++
++
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	/* check on current topology */
++	if ((ha->current_topology != ISP_CFG_F) &&
++	    (ha->current_topology != ISP_CFG_FL)) {
++		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR not in F or FL mode\n",
++		    __func__, ha->host_no, ha->instance);)
++		return (ret);
++	}
++
++	if (ha->ioctl_mem_size <= 0) {
++		if (qla2x00_get_new_ioctl_dma_mem(ha,
++		    QLA_INITIAL_IOCTLMEM_SIZE) != QL_STATUS_SUCCESS) {
++
++			DEBUG9_10(printk("%s: ERROR cannot alloc DMA "
++			    "buffer size=%lx.\n",
++			    __func__, QLA_INITIAL_IOCTLMEM_SIZE);)
++
++			pext->Status = EXT_STATUS_NO_MEMORY;
++			return (ret);
++		}
++	}
++
++	if (pext->ResponseLen > ha->ioctl_mem_size) {
++		if (qla2x00_get_new_ioctl_dma_mem(ha, pext->ResponseLen) !=
++		    QL_STATUS_SUCCESS) {
++
++			DEBUG9_10(printk("%s: ERROR cannot alloc requested"
++			    "DMA buffer size %x.\n",
++			    __func__, pext->ResponseLen);)
++
++			pext->Status = EXT_STATUS_NO_MEMORY;
++			return (ret);
++		}
++
++		DEBUG9(printk("%s(%ld): inst=%ld rsp buf length larger than "
++		    "existing size. Additional mem alloc successful.\n",
++		    __func__, ha->host_no, ha->instance);)
++	}
++
++	usr_req_len = pext->RequestLen - sizeof(EXT_ELS_PT_REQ);
++	if (usr_req_len > ha->ioctl_mem_size) {
++		pext->Status = EXT_STATUS_INVALID_PARAM;
++
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR ReqLen too big=%x.\n",
++		    __func__, ha->host_no, ha->instance, pext->RequestLen);)
++
++		return (ret);
++	}
++
++	/* Verify entire EXT IOCTL request buffer */
++	
++	ret = verify_area(VERIFY_READ, (void *)pext->RequestAdr,
++	    pext->RequestLen);
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk(
++		    "%s(%ld): inst=%ld ERROR verify read req buf\n",
++		    __func__, ha->host_no, ha->instance);)
++
++		return (ret);
++	}
++
++	DEBUG9(printk("%s(%ld): inst=%ld req buf verified.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pscsi_cmd,
++	    sizeof(Scsi_Cmnd))) {
++		/* not enough memory */
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "size requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(Scsi_Cmnd));)
++		return (ret);
++	}
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pels_pt_req,
++	    sizeof(EXT_ELS_PT_REQ))) {
++		/* not enough memory */
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "els_pt_req size requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(EXT_ELS_PT_REQ));)
++		goto els_passthru_done;
++	}
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&ptemp_fclun,
++	    sizeof(fc_lun_t))) {
++		/* not enough memory */
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "fclun size requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(fc_lun_t));)
++		goto els_passthru_done;
++	}
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&ptemp_fcport,
++	    sizeof(fc_port_t))) {
++		/* not enough memory */
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "fcport size requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(fc_port_t));)
++		goto els_passthru_done;
++	}
++
++	/* initialize */
++
++	memset(ha->ioctl_mem, 0, ha->ioctl_mem_size);
++
++	/* copy request buffer */
++	
++	ret = copy_from_user(pels_pt_req, pext->RequestAdr,
++	    sizeof(EXT_ELS_PT_REQ));
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR"
++		    "copy_from_user() of struct failed (%d).\n",
++		    __func__, ha->host_no, ha->instance, ret);)
++
++		goto els_passthru_done;
++	}
++
++	pusr_req_buf = (uint8_t *)pext->RequestAdr + sizeof(EXT_ELS_PT_REQ);
++	
++	ret = copy_from_user(ha->ioctl_mem, pusr_req_buf, usr_req_len);
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR"
++		    "copy_from_user() of request buf failed (%d).\n",
++		    __func__, ha->host_no, ha->instance, ret);)
++
++		goto els_passthru_done;
++	}
++
++	DEBUG9(printk("%s(%ld): inst=%ld after copy request.\n",
++	    __func__, ha->host_no, ha->instance);)
++	
++	/* check on loop down (1) */
++	if (ha->loop_state != LOOP_READY || 
++	    test_bit(CFG_ACTIVE, &ha->cfg_flags) ||
++	    (test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)) || ABORTS_ACTIVE) {
++
++		DEBUG9_10(printk(
++		    "%s(%ld): inst=%ld before dest port validation- loop not "
++		    "ready; cannot proceed.\n",
++		    __func__, ha->host_no, ha->instance);)
++
++		pext->Status = EXT_STATUS_BUSY;
++
++		goto els_passthru_done;
++	}
++
++	/*********************************/
++	/* Validate the destination port */
++	/*********************************/
++
++	/* first: WWN cannot be zero if no PID is specified */
++	invalid_wwn = qla2x00_is_wwn_zero(pels_pt_req->WWPN);
++	if (invalid_wwn && !(pels_pt_req->ValidMask & EXT_DEF_PID_VALID)) {
++		/* error: both are not set. */
++		pext->Status = EXT_STATUS_INVALID_PARAM;
++
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR no valid WWPN/PID\n",
++		    __func__, ha->host_no, ha->instance);)
++
++		goto els_passthru_done;
++	}
++
++	/* second: it cannot be the local/current HBA itself */
++	if (!invalid_wwn) {
++		if (memcmp(ha->init_cb->port_name, pels_pt_req->WWPN,
++		    EXT_DEF_WWN_NAME_SIZE) == 0) {
++
++			/* local HBA specified. */
++
++			pext->Status = EXT_STATUS_INVALID_PARAM;
++			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR local HBA's "
++			    "WWPN found.\n",
++			    __func__, ha->host_no, ha->instance);)
++
++			goto els_passthru_done;
++		}
++	} else { /* using PID */
++		if (pels_pt_req->Id[1] == ha->d_id.r.d_id[2]
++		    && pels_pt_req->Id[2] == ha->d_id.r.d_id[1]
++		    && pels_pt_req->Id[3] == ha->d_id.r.d_id[0]) {
++
++			/* local HBA specified. */
++
++			pext->Status = EXT_STATUS_INVALID_PARAM;
++			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR local HBA's "
++			    "PID found.\n",
++			    __func__, ha->host_no, ha->instance);)
++
++			goto els_passthru_done;
++		}
++	}
++
++	/************************/
++	/* Now find the loop ID */
++	/************************/
++
++	/* 1st: scan thru our HBA database */
++	index = 0;
++	port_found = FALSE;
++	fcinitiator = NULL;
++	if (!invalid_wwn) {
++		/* search with WWPN */
++		list_for_each(fcil, &ha->fcinitiators) {
++			fcinitiator = list_entry(fcil, fc_initiator_t, list);
++
++			if (memcmp(pels_pt_req->WWPN, fcinitiator->port_name,
++				 EXT_DEF_WWN_NAME_SIZE) == 0) {
++
++				port_found = TRUE;
++				pels_pt_req->Lid = fcinitiator->loop_id;
++
++				DEBUG9(printk("%s(%ld): inst=%ld found host "
++				    "w/ WWN. loop_id = %02x.\n",
++				    __func__, ha->host_no, ha->instance,
++				    pels_pt_req->Lid);)
++
++				break;
++			}
++		}
++	} else {
++		/* search with PID */
++		list_for_each(fcil, &ha->fcinitiators) {
++			fcinitiator = list_entry(fcil, fc_initiator_t, list);
++
++			if (pels_pt_req->Id[1] == fcinitiator->d_id.r.d_id[2]
++			    && pels_pt_req->Id[2] == fcinitiator->d_id.r.d_id[1]
++			    && pels_pt_req->Id[3] ==
++				    fcinitiator->d_id.r.d_id[0]) {
++
++				port_found = TRUE;
++				pels_pt_req->Lid = fcinitiator->loop_id;
++
++				DEBUG9(printk("%s(%ld): inst=%ld found host "
++				    "w/ WWN. loop_id = %02x.\n",
++				    __func__, ha->host_no, ha->instance,
++				    pels_pt_req->Lid);)
++
++				break;
++			}
++		}
++	}
++
++	/* If this is for a host device, check if we need to perform login */
++	if (port_found && (fcinitiator->loop_id >= LAST_SNS_LOOP_ID)) {
++
++		DEBUG9_10(printk("%s(%ld): inst=%ld need to relogin to "
++		    "dest host.\n",
++		    __func__, ha->host_no, ha->instance);)
++
++		if (fcinitiator->d_id.b24 == 0) {
++			/* Either RSCN hasn't been processed yet or
++			 * this host is no longer connected to us.
++			 */
++			pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR dest host "
++			    "port lost.\n",
++			    __func__, ha->host_no, ha->instance);)
++
++			goto els_passthru_done;
++		}
++
++		/* login and update database */
++		tmpdev.d_id.b24 = fcinitiator->d_id.b24;
++		tmpdev.loop_id = fcinitiator->loop_id;
++
++		if (qla2x00_host_relogin(ha, &tmpdev) != 0) {
++			/* login failed. */
++			pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++
++			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR login to "
++			    "host port failed. loop_id=%02x pid=%02x%02x%02x "
++			    "ret=%d.\n",
++			    __func__, ha->host_no, ha->instance, tmpdev.loop_id,
++			    tmpdev.d_id.b.domain,
++			    tmpdev.d_id.b.area,
++			    tmpdev.d_id.b.al_pa,
++			    ret);)
++
++			goto els_passthru_done;
++		} else {
++			fcinitiator->loop_id = tmpdev.loop_id;
++			pels_pt_req->Lid = tmpdev.loop_id;
++
++			DEBUG9(printk("%s(%ld): inst=%ld success login to "
++			    "remote host; Lid=%02x.\n",
++			    __func__, ha->host_no, ha->instance,
++			    fcinitiator->loop_id);)
++		}
++	}
++	
++	/* 2nd: scan thru our fcport database */
++	if (!invalid_wwn && !port_found) {
++		/* search with WWPN */
++		list_for_each(fcpl, &ha->fcports) {
++			fcport = list_entry(fcpl, fc_port_t, list);
++	 
++			if (memcmp(fcport->port_name, pels_pt_req->WWPN,
++			    EXT_DEF_WWN_NAME_SIZE) == 0) {
++
++				port_found = TRUE;
++				pels_pt_req->Lid = fcport->loop_id;
++
++				DEBUG9(printk("%s(%ld): inst=%ld found fcport "
++				    "w/ WWN. loop_id = %02x.\n",
++				    __func__, ha->host_no, ha->instance,
++				    pels_pt_req->Lid);)
++				break;
++			}
++		}
++	} else  if (!port_found) {
++		/* search with PID */
++		list_for_each(fcpl, &ha->fcports) {
++			fcport = list_entry(fcpl, fc_port_t, list);
++	 
++			if (pels_pt_req->Id[1] == fcport->d_id.r.d_id[2]
++			    && pels_pt_req->Id[2] == fcport->d_id.r.d_id[1]
++			    && pels_pt_req->Id[3] == fcport->d_id.r.d_id[0]) {
++
++				port_found = TRUE;
++				pels_pt_req->Lid = fcport->loop_id;
++
++				DEBUG9(printk("%s(%ld): inst=%ld found fcport "
++				    "w/ PID. loop_id = %02x.\n",
++				    __func__, ha->host_no, ha->instance,
++				    pels_pt_req->Lid);)
++
++				break;
++			}
++		}
++	}
++	
++	if (!port_found) {
++		/* invalid WWN or PID specified */
++		pext->Status = EXT_STATUS_INVALID_PARAM;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR WWPN/PID invalid.\n",
++		    __func__, ha->host_no, ha->instance);)
++
++		goto els_passthru_done;
++	}
++
++	/* alloc sp */
++	if ((sp = qla2x00_get_new_sp(ha)) == NULL) {
++
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s: ERROR cannot alloc sp %p.\n",
++		    __func__, sp);)
++
++		goto els_passthru_done;
++	}
++
++	DEBUG9(printk("%s(%ld): inst=%ld after alloc sp.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	/* setup sp for this command */
++	ptq = ha->ioctl->ioctl_tq;
++	plq = ha->ioctl->ioctl_lq;
++	sp->cmd = pscsi_cmd;
++	sp->flags = SRB_IOCTL;
++	sp->lun_queue = plq;
++	sp->tgt_queue = ptq;
++	ptemp_fclun->fcport = ptemp_fcport;
++	ptemp_fclun->lun = 0;
++	ptemp_fclun->flags = 0;
++	plq->fclun = ptemp_fclun;
++	plq->fclun->fcport->ha = ha;
++
++	/* init scsi_cmd */
++	pscsi_cmd->device->host = ha->host;
++	pscsi_cmd->scsi_done = qla2x00_msiocb_done;
++
++	/* check on loop down (2)- check again just before sending cmd out. */
++	if (ha->loop_state != LOOP_READY || 
++	    test_bit(CFG_ACTIVE, &ha->cfg_flags) ||
++	    (test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)) ||
++	    ABORTS_ACTIVE) {
++
++		DEBUG9_10(printk("%s(%ld): inst=%ld before issue cmd- loop "
++		    "not ready.\n",
++		    __func__, ha->host_no, ha->instance);)
++
++		pext->Status = EXT_STATUS_BUSY;
++
++		atomic_set(&sp->ref_count, 0);
++		add_to_free_queue (ha, sp);
++
++		goto els_passthru_done;
++	}
++
++	DEBUG9(printk("%s(%ld): inst=%ld going to issue command.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	tmp_rval = qla2x00_start_ms_cmd(ha, pext, sp, pels_pt_req);
++
++	DEBUG9(printk("%s(%ld): inst=%ld after issue command.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	if (tmp_rval != 0) {
++		/* We waited and post function did not get called */
++		DEBUG9_10(printk("%s(%ld): inst=%ld command timed out.\n",
++		    __func__, ha->host_no, ha->instance);)
++
++		pext->Status = EXT_STATUS_MS_NO_RESPONSE;
++
++		atomic_set(&sp->ref_count, 0);
++		add_to_free_queue (ha, sp);
++
++		goto els_passthru_done;
++	}
++
++	/* check on data returned */
++	ptmp_stat = (uint8_t *)ha->ioctl_mem + FC_HEADER_LEN;
++
++	if (*ptmp_stat == ELS_STAT_LS_RJT) {
++		payload_len = FC_HEADER_LEN + ELS_RJT_LENGTH;
++
++	} else if (*ptmp_stat == ELS_STAT_LS_ACC) {
++		payload_len = pext->ResponseLen - sizeof(EXT_ELS_PT_REQ);
++
++	} else {
++		/* invalid. just copy the status word. */
++		DEBUG9_10(printk("%s(%ld): inst=%ld invalid stat "
++		    "returned =0x%x.\n",
++		    __func__, ha->host_no, ha->instance, *ptmp_stat);)
++
++		payload_len = FC_HEADER_LEN + 4;
++	}
++
++	DEBUG9(printk("%s(%ld): inst=%ld data dump-\n",
++	    __func__, ha->host_no, ha->instance);)
++	DEBUG9(qla2x00_dump_buffer((uint8_t *)ptmp_stat,
++	    pext->ResponseLen - sizeof(EXT_ELS_PT_REQ) - FC_HEADER_LEN);)
++	
++	/* Verify response buffer to be written */
++	/* The data returned include FC frame header */
++	presp_payload = (uint8_t *)pext->ResponseAdr + sizeof(EXT_ELS_PT_REQ);
++
++	ret = verify_area(VERIFY_WRITE, (void *)presp_payload, payload_len);
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify wrt rsp "
++		    "buffer. ha=%p.\n",
++		    __func__, ha->host_no, ha->instance, ha);)
++
++		goto els_passthru_done;
++	}
++
++	/* copy back data returned to response buffer */
++	ret = copy_to_user(presp_payload, (uint8_t *)ha->ioctl_mem,
++	    payload_len);
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buffer.\n",
++		    __func__, ha->host_no, ha->instance);)
++		goto els_passthru_done;
++	}
++
++	DEBUG9(printk("%s(%ld): inst=%ld exiting normally.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++els_passthru_done:
++
++	qla2x00_free_ioctl_scrap_mem(ha);
++	return (ret);
++}
++#endif
++
++/*
++ * qla2x00_send_fcct
++ *	Passes the FC CT command down to firmware as MSIOCB and
++ *	copies the response back when it completes.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	pext = EXT_IOCTL structure pointer.
++ *	mode = not used.
++ *
++ * Returns:
++ *	0 = success
++ *	others = errno value
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_send_fcct(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
++{
++	int		ret = 0;
++	int		tmp_rval = 0;
++	uint16_t	mb[MAILBOX_REGISTER_COUNT];
++
++	fc_lun_t	*ptemp_fclun;
++	fc_port_t	*ptemp_fcport;
++
++	os_lun_t	*lq;
++	os_tgt_t	*tq;
++
++	Scsi_Cmnd	*pscsi_cmd;
++	srb_t		*sp = NULL;
++
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	/* check on current topology */
++	if ((ha->current_topology != ISP_CFG_F) &&
++	    (ha->current_topology != ISP_CFG_FL)) {
++		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR not in F or FL mode\n",
++		    __func__, ha->host_no, ha->instance);)
++		return (ret);
++	}
++
++	if (ha->ioctl_mem_size <= 0) {
++		if (qla2x00_get_new_ioctl_dma_mem(ha,
++		    QLA_INITIAL_IOCTLMEM_SIZE) != QL_STATUS_SUCCESS) {
++
++			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR cannot alloc "
++			    "DMA buffer size=%lx.\n",
++			    __func__, ha->host_no, ha->instance,
++			    QLA_INITIAL_IOCTLMEM_SIZE);)
++
++			pext->Status = EXT_STATUS_NO_MEMORY;
++			return (ret);
++		}
++	}
++
++	if (pext->ResponseLen > ha->ioctl_mem_size) {
++		if (qla2x00_get_new_ioctl_dma_mem(ha, pext->ResponseLen) !=
++		    QL_STATUS_SUCCESS) {
++			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR cannot alloc "
++			    "requested DMA buffer size %x.\n",
++			    __func__, ha->host_no, ha->instance,
++			    pext->ResponseLen);)
++			pext->Status = EXT_STATUS_NO_MEMORY;
++			return (ret);
++		}
++
++		DEBUG9(printk("%s(%ld): inst=%ld rsp buf len larger than "
++		    "existing size. Additional mem alloc successful.\n",
++		    __func__, ha->host_no, ha->instance);)
++	}
++
++	if (pext->RequestLen > ha->ioctl_mem_size) {
++		pext->Status = EXT_STATUS_INVALID_PARAM;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR ReqLen too big=%x.\n",
++		    __func__, ha->host_no, ha->instance, pext->RequestLen);)
++
++		return (ret);
++	}
++
++	ret = verify_area(VERIFY_READ, (void *)pext->RequestAdr,
++	    pext->RequestLen);
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk(
++		    "%s(%ld): inst=%ld ERROR verify read req buf\n",
++		    __func__, ha->host_no, ha->instance);)
++
++		return (ret);
++	}
++
++	DEBUG9(printk("%s(%ld): inst=%ld req buf verified.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pscsi_cmd,
++	    sizeof(Scsi_Cmnd))) {
++		/* not enough memory */
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "size requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(Scsi_Cmnd));)
++		return (ret);
++	}
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&ptemp_fclun,
++	    sizeof(fc_lun_t))) {
++		/* not enough memory */
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "fclun size requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(fc_lun_t));)
++		goto fcct_passthru_done;
++	}
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&ptemp_fcport,
++	    sizeof(fc_port_t))) {
++		/* not enough memory */
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "fcport size requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(fc_port_t));)
++		goto fcct_passthru_done;
++	}
++
++	/* initialize */
++	memset(ha->ioctl_mem, 0, ha->ioctl_mem_size);
++
++	/* copy request buffer */
++	ret = copy_from_user(ha->ioctl_mem, pext->RequestAdr, pext->RequestLen);
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk(
++		    "%s(%ld): inst=%ld ERROR copy req buf. ret=%d\n",
++		    __func__, ha->host_no, ha->instance, ret);)
++
++
++		goto fcct_passthru_done;
++	}
++
++	DEBUG9(printk("%s(%ld): inst=%ld after copy request.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	/* alloc sp */
++	if ((sp = qla2x00_get_new_sp(ha)) == NULL) {
++
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR cannot alloc "
++		    "sp %p.\n",
++		    __func__, ha->host_no, ha->instance, sp);)
++
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		goto fcct_passthru_done;
++	}
++
++	DEBUG9(printk("%s(%ld): inst=%ld after alloc sp.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	/* setup sp for this command */
++	tq = ha->ioctl->ioctl_tq;
++	lq = ha->ioctl->ioctl_lq;
++	sp->cmd = pscsi_cmd;
++	sp->flags = SRB_IOCTL;
++	sp->lun_queue = lq;
++	sp->tgt_queue = tq;
++	ptemp_fclun->fcport = ptemp_fcport;
++	ptemp_fclun->lun = 0;
++	ptemp_fclun->flags = 0;
++	lq->fclun = ptemp_fclun;
++	lq->fclun->fcport->ha = ha;
++
++	/* init scsi_cmd */
++	pscsi_cmd->device->host = ha->host;
++	pscsi_cmd->scsi_done = qla2x00_msiocb_done;
++
++	/* check on management server login status */
++	if (ha->flags.management_server_logged_in == 0) {
++		/* login to management server device */
++
++		tmp_rval = qla2x00_login_fabric(ha, MANAGEMENT_SERVER,
++		    0xff, 0xff, 0xfa, &mb[0], BIT_1);
++
++		if (tmp_rval != 0 || mb[0] != 0x4000) {
++			pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++
++	 		DEBUG10(printk("%s(%ld): inst=%ld ERROR login to MS.\n",
++			    __func__, ha->host_no, ha->instance);)
++
++			atomic_set(&sp->ref_count, 0);
++			add_to_free_queue (ha, sp);
++
++			goto fcct_passthru_done;
++		}
++
++		ha->flags.management_server_logged_in = 1;
++	}
++
++	DEBUG9(printk("%s(%ld): success login to MS.\n",
++	    __func__, ha->host_no);)
++
++	/* check on loop down */
++	if (ha->loop_state != LOOP_READY || 
++	    test_bit(CFG_ACTIVE, &ha->cfg_flags) ||
++	    (test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)) ||
++	    ABORTS_ACTIVE) {
++
++		DEBUG10(printk("%s(%ld): inst=%ld loop not ready.\n",
++		    __func__, ha->host_no, ha->instance);)
++
++		pext->Status = EXT_STATUS_BUSY;
++
++		atomic_set(&sp->ref_count, 0);
++		add_to_free_queue (ha, sp);
++
++		goto fcct_passthru_done;
++	}
++
++	DEBUG9(printk("%s(%ld): inst=%ld going to issue command.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	tmp_rval = qla2x00_start_ms_cmd(ha, pext, sp, NULL);
++
++	DEBUG9(printk("%s(%ld): inst=%ld after issue command.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	if (tmp_rval != 0) {
++		/* We waited and post function did not get called */
++		DEBUG9_10(printk("%s(%ld): inst=%ld command timed out.\n",
++		    __func__, ha->host_no, ha->instance);)
++		pext->Status = EXT_STATUS_MS_NO_RESPONSE;
++		atomic_set(&sp->ref_count, 0);
++		add_to_free_queue (ha, sp);
++
++		goto fcct_passthru_done;
++	}
++
++	if (CMD_COMPL_STATUS(pscsi_cmd) != 0 ||
++	    CMD_ENTRY_STATUS(pscsi_cmd) != 0) {
++		DEBUG9_10(printk("%s(%ld): inst=%ld cmd returned error=%x.\n",
++		    __func__, ha->host_no, ha->instance,
++		    CMD_COMPL_STATUS(pscsi_cmd));)
++		pext->Status = EXT_STATUS_ERR;
++		goto fcct_passthru_done;
++	}
++
++	/* getting device data and putting in pext->ResponseAdr */
++	ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr ,
++	    pext->ResponseLen);
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify wrt rsp "
++		    "buffer. ha=%p.\n",
++		    __func__, ha->host_no, ha->instance, ha);)
++		goto fcct_passthru_done;
++	}
++
++	/* sending back data returned from Management Server */
++	ret = copy_to_user((uint8_t *)pext->ResponseAdr,
++	    (uint8_t *)ha->ioctl_mem, pext->ResponseLen);
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buffer.\n",
++		    __func__, ha->host_no, ha->instance);)
++		goto fcct_passthru_done;
++	}
++
++	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++fcct_passthru_done:
++
++	qla2x00_free_ioctl_scrap_mem(ha);
++	return (ret);
++}
++
++/*
++ * qla2x00_start_ms_cmd
++ *	Allocates an MSIOCB request pkt and sends out the passthru cmd.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_start_ms_cmd(scsi_qla_host_t *ha, EXT_IOCTL *pext, srb_t *sp,
++    EXT_ELS_PT_REQ *pels_pt_req)
++{
++#define	ELS_REQUEST_RCTL	0x22
++#define ELS_REPLY_RCTL		0x23
++
++	uint32_t	usr_req_len;
++	uint32_t	usr_resp_len;
++	uint64_t	usr_reqbuf_addr;
++
++	ms_iocb_entry_t		*pkt;
++	unsigned long		cpu_flags = 0;
++
++
++	/* get spin lock for this operation */
++	spin_lock_irqsave(&ha->hardware_lock, cpu_flags);
++
++	/* Get MS request packet. */
++	pkt = (ms_iocb_entry_t *)qla2x00_ms_req_pkt(ha, sp);
++	if (pkt == NULL) {
++		/* release spin lock and return error. */
++		spin_unlock_irqrestore(&ha->hardware_lock, cpu_flags);
++
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG10(printk("%s(%ld): inst=%ld MSIOCB PT - could not get "
++		    "Request Packet.\n", __func__, ha->host_no, ha->instance);)
++		return (QL_STATUS_RESOURCE_ERROR);
++	}
++
++	pkt->entry_type  = MS_IOCB_TYPE;
++	pkt->entry_count = 1;
++	
++	if (pels_pt_req != NULL) {
++		/* process ELS passthru command */
++		usr_reqbuf_addr = (uint64_t)ha->ioctl_mem_phys +
++		    sizeof(EXT_ELS_PT_REQ);
++		usr_req_len = pext->RequestLen - sizeof(EXT_ELS_PT_REQ);
++		usr_resp_len = pext->ResponseLen - sizeof(EXT_ELS_PT_REQ);
++	
++		pkt->control_flags = BIT_15; /* ELS passthru enabled */
++		pkt->loop_id = pels_pt_req->Lid;
++		pkt->type    = 1; /* ELS frame */
++		
++		if (pext->ResponseLen != 0) {
++			pkt->r_ctl    = ELS_REQUEST_RCTL;
++			pkt->rx_id    = 0;
++		} else {
++			pkt->r_ctl    = ELS_REPLY_RCTL;
++			pkt->rx_id    = pels_pt_req->Rxid;
++		}
++	} else {
++		usr_reqbuf_addr = (uint64_t)ha->ioctl_mem_phys;
++		usr_req_len = pext->RequestLen;
++		usr_resp_len = pext->ResponseLen;
++		pkt->loop_id     = MANAGEMENT_SERVER;
++	}
++
++	DEBUG9_10(printk("%s(%ld): inst=%ld using loop_id=%02x req_len=%d, "
++	    "resp_len=%d.\n", __func__, ha->host_no, ha->instance,
++	    pkt->loop_id, usr_req_len, usr_resp_len);)
++
++	pkt->timeout = QLA_PT_CMD_TOV;
++	pkt->cmd_dsd_count = 1;
++	pkt->total_dsd_count = 2; /* no continuation */
++	pkt->rsp_bytecount = usr_resp_len;
++	pkt->req_bytecount = usr_req_len;
++
++	/* loading command payload address */
++	pkt->dseg_req_address[0] = LSD(usr_reqbuf_addr);
++	pkt->dseg_req_address[1] = MSD(usr_reqbuf_addr);
++	pkt->dseg_req_length = usr_req_len;
++
++	/* loading response payload address */
++	pkt->dseg_rsp_address[0] = LSD(ha->ioctl_mem_phys);
++	pkt->dseg_rsp_address[1] = MSD(ha->ioctl_mem_phys);
++	pkt->dseg_rsp_length = usr_resp_len;
++
++	/* set flag to indicate IOCTL MSIOCB cmd in progress */
++	ha->ioctl->MSIOCB_InProgress = 1;
++	ha->ioctl->ioctl_tov = pkt->timeout + 1; /* 1 second more */
++
++	/* prepare for receiving completion. */
++	qla2x00_ioctl_sem_init(ha);
++
++	/* Issue command to ISP */
++	qla2x00_isp_cmd(ha);
++
++	ha->ioctl->cmpl_timer.expires = jiffies + ha->ioctl->ioctl_tov * HZ;
++	add_timer(&ha->ioctl->cmpl_timer);
++
++	DEBUG9(printk("%s(%ld): inst=%ld releasing hardware_lock.\n",
++	    __func__, ha->host_no, ha->instance);)
++	spin_unlock_irqrestore(&ha->hardware_lock, cpu_flags);
++
++	DEBUG9(printk("%s(%ld): inst=%ld sleep for completion.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	down(&ha->ioctl->cmpl_sem);
++
++	del_timer(&ha->ioctl->cmpl_timer);
++
++	if (ha->ioctl->MSIOCB_InProgress == 1) {
++	 	DEBUG9_10(printk("%s(%ld): inst=%ld timed out. exiting.\n",
++		    __func__, ha->host_no, ha->instance);)
++		return QL_STATUS_ERROR;
++	}
++
++	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	return QL_STATUS_SUCCESS;
++}
++
++/*
++ * qla2x00_wwpn_to_scsiaddr
++ *	Handles the EXT_CC_WWPN_TO_SCSIADDR command.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	pext = EXT_IOCTL structure pointer.
++ *	mode = not used.
++ *
++ * Returns:
++ *	0 = success
++ *	others = errno value
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_wwpn_to_scsiaddr(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
++{
++	int		ret = 0;
++	fc_port_t	*tgt_fcport;
++	os_tgt_t	*tq;
++	uint8_t		tmp_wwpn[EXT_DEF_WWN_NAME_SIZE];
++	uint32_t	b, tgt, l;
++	EXT_SCSI_ADDR	tmp_addr;
++
++
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	if (pext->RequestLen != EXT_DEF_WWN_NAME_SIZE ||
++	    pext->ResponseLen < sizeof(EXT_SCSI_ADDR)) {
++		/* error */
++		DEBUG9_10(printk("%s(%ld): inst=%ld invalid WWN buffer size %d "
++		    "received.\n",
++		    __func__, ha->host_no, ha->instance, pext->ResponseLen);)
++		pext->Status = EXT_STATUS_INVALID_PARAM;
++
++		return (ret);
++	}
++
++	ret = verify_area(VERIFY_READ, (void *)pext->RequestAdr,
++	    pext->RequestLen);
++	if (ret) {
++		DEBUG9_10(printk(
++		    "%s(%ld): inst=%ld ERROR VERIFY_READ req buf\n",
++		    __func__, ha->host_no, ha->instance);)
++		pext->Status = EXT_STATUS_COPY_ERR;
++		return (ret);
++	}
++
++	ret = copy_from_user(tmp_wwpn, pext->RequestAdr, pext->RequestLen);
++	if (ret) {
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy_from_user "
++		    "failed(%d) on request buf.\n",
++		    __func__, ha->host_no, ha->instance, ret);)
++		pext->Status = EXT_STATUS_COPY_ERR;
++		return (ret);
++	}
++
++	tq = NULL;
++	for (tgt = 0; tgt < MAX_TARGETS; tgt++) {
++		if (ha->otgt[tgt] == NULL) {
++			continue;
++		}
++
++		tq = ha->otgt[tgt];
++		if (tq->vis_port == NULL) {
++			break;
++		}
++
++		tgt_fcport = tq->vis_port;
++		if (memcmp(tmp_wwpn, tgt_fcport->port_name,
++		    EXT_DEF_WWN_NAME_SIZE) == 0) {
++			break;
++		}
++	}
++
++	if (tq == NULL || tgt >= MAX_TARGETS) {
++		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++		DEBUG9_10(printk("%s(%ld): inst=%ld target dev not found. "
++		    "tq=%p, tgt=%x.\n", __func__, ha->host_no, ha->instance,
++		    tq, tgt);)
++		return (ret);
++	}
++
++	if (tq->vis_port == NULL) { 	/* dg 08/14/01 */
++		pext->Status = EXT_STATUS_BUSY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld target port not found. "
++		    "tq=%p, tgt=%x.\n",
++		    __func__, ha->host_no, ha->instance, tq, tgt);)
++		return (ret);
++	}	
++
++	/* Currently we only have bus 0 and no translation on LUN */
++	b = 0;
++	l = 0;
++
++	/*
++	 * Return SCSI address. Currently no translation is done for
++	 * LUN.
++	 */
++	tmp_addr.Bus = b;
++	tmp_addr.Target = tgt;
++	tmp_addr.Lun = l;
++	if (pext->ResponseLen > sizeof(EXT_SCSI_ADDR))
++		pext->ResponseLen = sizeof(EXT_SCSI_ADDR);
++
++	ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr,
++	    pext->ResponseLen);
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR VERIFY wrt rsp buf\n",
++		    __func__, ha->host_no, ha->instance);)
++		return (ret);
++	}
++
++	ret = copy_to_user((uint8_t *)pext->ResponseAdr, &tmp_addr,
++	    pext->ResponseLen);
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buffer.\n",
++		    __func__, ha->host_no, ha->instance);)
++		return (ret);
++	}
++
++	DEBUG9(printk(KERN_INFO
++	    "%s(%ld): Found t%d l%d for %02x%02x%02x%02x%02x%02x%02x%02x.\n",
++	    __func__, ha->host_no,
++	    tmp_addr.Target, tmp_addr.Lun,
++	    tmp_wwpn[0], tmp_wwpn[1], tmp_wwpn[2], tmp_wwpn[3],
++	    tmp_wwpn[4], tmp_wwpn[5], tmp_wwpn[6], tmp_wwpn[7]);)
++
++	pext->Status = EXT_STATUS_OK;
++
++	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	return (ret);
++}
++
++/*
++ * qla2x00_scsi_passthru
++ *	Handles all subcommands of the EXT_CC_SEND_SCSI_PASSTHRU command.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	pext = EXT_IOCTL structure pointer.
++ *	mode = not used.
++ *
++ * Returns:
++ *	0 = success
++ *	others = errno value
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_scsi_passthru(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
++{
++	int tmp_rval = 0;
++
++	switch(pext->SubCode) {
++	case EXT_SC_SEND_SCSI_PASSTHRU:
++		tmp_rval = qla2x00_sc_scsi_passthru(ha, pext, mode);
++		break;
++	case EXT_SC_SEND_FC_SCSI_PASSTHRU:
++		tmp_rval = qla2x00_sc_fc_scsi_passthru(ha, pext, mode);
++		break;
++	case EXT_SC_SCSI3_PASSTHRU:
++		tmp_rval = qla2x00_sc_scsi3_passthru(ha, pext, mode);
++		break;
++	default:
++		break;
++	}
++
++	return tmp_rval;
++}
++
++/*
++ * qla2x00_sc_scsi_passthru
++ *	Handles EXT_SC_SEND_SCSI_PASSTHRU subcommand.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	pext = EXT_IOCTL structure pointer.
++ *	mode = not used.
++ *
++ * Returns:
++ *	0 = success
++ *	others = errno value
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_sc_scsi_passthru(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
++{
++	int		ret = 0;
++	uint8_t		*usr_temp, *kernel_tmp;
++	uint8_t		scsi_direction;
++	uint32_t	i;
++
++#if defined(QL_DEBUG_LEVEL_9)
++	uint32_t	b, t, l;
++#endif
++	uint32_t	transfer_len;
++
++	EXT_SCSI_PASSTHRU	*pscsi_pass;
++
++	Scsi_Cmnd		*pscsi_cmd;
++	Scsi_Device		*pscsi_device;
++
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	ret = verify_area(VERIFY_READ, (void *)pext->RequestAdr,
++	    sizeof(EXT_SCSI_PASSTHRU));
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify READ "
++		    "req buf.\n",
++		    __func__, ha->host_no, ha->instance);)
++		return (ret);
++	}
++
++	if (pext->ResponseLen > ha->ioctl_mem_size) {
++		if (qla2x00_get_new_ioctl_dma_mem(ha, pext->ResponseLen) !=
++		    QL_STATUS_SUCCESS) {
++			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR cannot alloc "
++			    "requested DMA buffer size %x.\n",
++			    __func__, ha->host_no, ha->instance,
++			    pext->ResponseLen);)
++			pext->Status = EXT_STATUS_NO_MEMORY;
++			return (ret);
++		}
++	}
++
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pscsi_pass,
++	    sizeof(EXT_SCSI_PASSTHRU))) {
++		/* not enough memory */
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "size requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(EXT_SCSI_PASSTHRU));)
++		return (ret);
++	}
++
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pscsi_cmd,
++	    sizeof(Scsi_Cmnd))) {
++		/* not enough memory */
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "pscsi_cmd requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(Scsi_Cmnd));)
++		goto scsi_passthru_done;
++	}
++
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pscsi_device,
++	    sizeof(Scsi_Device))) {
++		/* not enough memory */
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "pscsi_device requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(Scsi_Device));)
++		goto scsi_passthru_done;
++	}
++
++	/* clear ioctl_mem to be used */
++	memset(ha->ioctl_mem, 0, ha->ioctl_mem_size);
++
++	/* Copy request buffer */
++	usr_temp = (uint8_t *)pext->RequestAdr;
++	kernel_tmp = (uint8_t *)pscsi_pass;
++	ret = copy_from_user(kernel_tmp, usr_temp, sizeof(EXT_SCSI_PASSTHRU));
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk(
++		    "%s(%ld): inst=%ld ERROR copy req buf ret=%d\n",
++		    __func__, ha->host_no, ha->instance, ret);)
++		goto scsi_passthru_done;
++	}
++
++	/* set target coordinates */
++	pscsi_cmd->device->id = pscsi_pass->TargetAddr.Target;
++	pscsi_cmd->device->lun = pscsi_pass->TargetAddr.Lun;
++
++	/* Verify target exists */
++	if (TGT_Q(ha, pscsi_cmd->device->id) == NULL) {
++		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR tgt %d not found.\n",
++		    __func__,
++		    ha->host_no, ha->instance, pscsi_cmd->device->id));
++		goto scsi_passthru_done;
++	}
++
++	/* Copy over cdb */
++
++	if (pscsi_pass->CdbLength == 6) {
++		pscsi_cmd->cmd_len = 6;
++
++	} else if (pscsi_pass->CdbLength == 10) {
++		pscsi_cmd->cmd_len = 0x0A;
++
++	} else if (pscsi_pass->CdbLength == 12) {
++		pscsi_cmd->cmd_len = 0x0C;
++
++	} else {
++		printk(KERN_WARNING
++		    "%s: Unsupported Cdb Length=%x.\n",
++		    __func__, pscsi_pass->CdbLength);
++
++		pext->Status = EXT_STATUS_INVALID_PARAM;
++		goto scsi_passthru_done;
++	}
++
++	memcpy(pscsi_cmd->data_cmnd, pscsi_pass->Cdb, pscsi_cmd->cmd_len);
++	memcpy(pscsi_cmd->cmnd, pscsi_pass->Cdb, pscsi_cmd->cmd_len);
++
++	DEBUG9(printk("%s Dump of cdb buffer:\n", __func__);)
++	DEBUG9(qla2x00_dump_buffer((uint8_t *)&pscsi_cmd->data_cmnd[0],
++	    pscsi_cmd->cmd_len);)
++
++	pscsi_cmd->device->host = ha->host;
++
++	/* mark this as a special delivery and collection command */
++	pscsi_cmd->flags     = 0;
++	pscsi_cmd->scsi_done = qla2x00_scsi_pt_done;
++
++	pscsi_cmd->device               = pscsi_device;
++	pscsi_cmd->device->tagged_queue = 0;
++	pscsi_cmd->use_sg               = 0; /* no ScatterGather */
++	pscsi_cmd->request_bufflen      = pext->ResponseLen;
++	pscsi_cmd->request_buffer       = ha->ioctl_mem;
++	pscsi_cmd->timeout_per_command  = QLA_PT_CMD_TOV * HZ;
++	CMD_RESID_LEN(pscsi_cmd) = SRB_IOCTL; /* Used to set sp->flags later */
++
++	if (pscsi_pass->Direction == EXT_DEF_SCSI_PASSTHRU_DATA_OUT) {
++		/* sending user data from pext->ResponseAdr to device */
++		ret = verify_area(VERIFY_READ, (void *)pext->ResponseAdr,
++		    pext->ResponseLen);
++		if (ret) {
++			pext->Status = EXT_STATUS_COPY_ERR;
++			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify READ "
++			    "rsp buf.\n", __func__, ha->host_no, ha->instance);)
++			goto scsi_passthru_done;
++		}
++
++		pscsi_cmd->sc_data_direction = SCSI_DATA_WRITE;
++		usr_temp   = (uint8_t *)pext->ResponseAdr;
++		kernel_tmp = (uint8_t *)ha->ioctl_mem;
++		ret = copy_from_user(kernel_tmp, usr_temp, pext->ResponseLen);
++		if (ret) {
++			pext->Status = EXT_STATUS_COPY_ERR;
++			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buf "
++			    "failed(%d).\n",
++			    __func__, ha->host_no, ha->instance, ret);)
++			goto scsi_passthru_done;
++		}
++	} else {
++		pscsi_cmd->sc_data_direction = SCSI_DATA_READ;
++	}
++
++	DEBUG9({
++		b = SCSI_BUS_32(pscsi_cmd);
++		t = SCSI_TCN_32(pscsi_cmd);
++		l = SCSI_LUN_32(pscsi_cmd);
++	})
++	DEBUG9(printk("%s(%ld): CDB=%02x %02x %02x %02x; b=%x t=%x l=%x.\n",
++	    __func__, ha->host_no, pscsi_cmd->cmnd[0], pscsi_cmd->cmnd[1],
++	    pscsi_cmd->cmnd[2], pscsi_cmd->cmnd[3], b, t, l);)
++
++	/*
++	 * Check the status of the port
++	 */
++	if (qla2x00_check_tgt_status(ha, pscsi_cmd) != QL_STATUS_SUCCESS) {
++		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++		DEBUG9_10(printk("%s(%ld): inst=%ld check_tgt_status "
++		    "failed.\n",
++		    __func__, ha->host_no, ha->instance);)
++		goto scsi_passthru_done;
++	}
++
++	/* set flag to indicate IOCTL SCSI PassThru in progress */
++	ha->ioctl->SCSIPT_InProgress = 1;
++	ha->ioctl->ioctl_tov = (int)QLA_PT_CMD_DRV_TOV;
++
++	/* prepare for receiving completion. */
++	qla2x00_ioctl_sem_init(ha);
++	CMD_COMPL_STATUS(pscsi_cmd) = (int) IOCTL_INVALID_STATUS;
++
++	/* send command to adapter */
++	DEBUG9(printk("%s(%ld): inst=%ld sending command.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	/* get spin lock for this operation */
++	spin_lock_irqsave(ha->host->host_lock, ha->cpu_flags);
++
++	qla2x00_queuecommand(pscsi_cmd, (void *) qla2x00_scsi_pt_done);
++
++	ha->ioctl->cmpl_timer.expires = jiffies + ha->ioctl->ioctl_tov * HZ;
++	add_timer(&ha->ioctl->cmpl_timer);
++
++	spin_unlock_irqrestore(ha->host->host_lock, ha->cpu_flags);
++
++	DEBUG9(printk("%s(%ld): inst=%ld waiting for completion.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	down(&ha->ioctl->cmpl_sem);
++
++	del_timer(&ha->ioctl->cmpl_timer);
++
++	DEBUG9(printk("%s(%ld): inst=%ld completed.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	if (ha->ioctl->SCSIPT_InProgress == 1) {
++
++		printk(KERN_WARNING
++		    "qla2x00: scsi%ld ERROR passthru command timeout.\n",
++		    ha->host_no);
++
++		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++		goto scsi_passthru_done;
++	}
++
++	if (CMD_COMPL_STATUS(pscsi_cmd) == (int)IOCTL_INVALID_STATUS) {
++
++		DEBUG9(printk("%s(%ld): inst=%ld ERROR - cmd not completed.\n",
++		    __func__, ha->host_no, ha->instance);)
++
++		pext->Status = EXT_STATUS_ERR;
++		goto scsi_passthru_done;
++	}
++
++	switch (CMD_COMPL_STATUS(pscsi_cmd)) {
++	case CS_INCOMPLETE:
++	case CS_ABORTED:
++	case CS_PORT_UNAVAILABLE:
++	case CS_PORT_LOGGED_OUT:
++	case CS_PORT_CONFIG_CHG:
++	case CS_PORT_BUSY:
++		DEBUG9_10(printk("%s(%ld): inst=%ld cs err = %x.\n",
++		    __func__, ha->host_no, ha->instance,
++		    CMD_COMPL_STATUS(pscsi_cmd));)
++		pext->Status = EXT_STATUS_BUSY;
++
++		goto scsi_passthru_done;
++	}
++
++	if ((CMD_COMPL_STATUS(pscsi_cmd) == CS_DATA_UNDERRUN) ||
++	    (CMD_SCSI_STATUS(pscsi_cmd) != 0)) {
++
++		/* have done the post function */
++		pext->Status       = EXT_STATUS_SCSI_STATUS;
++		pext->DetailStatus = CMD_SCSI_STATUS(pscsi_cmd) & 0xff;
++		DEBUG9_10(printk("%s(%ld): inst=%ld data underrun or scsi err. "
++		    "host status =0x%x, scsi status = 0x%x.\n",
++		    __func__, ha->host_no, ha->instance,
++		    CMD_COMPL_STATUS(pscsi_cmd), CMD_SCSI_STATUS(pscsi_cmd));)
++
++	} else if (CMD_COMPL_STATUS(pscsi_cmd) != 0) {
++		DEBUG9_10(printk("%s(%ld): inst=%ld cs err=%x.\n",
++		    __func__, ha->host_no, ha->instance,
++		    CMD_COMPL_STATUS(pscsi_cmd));)
++		pext->Status = EXT_STATUS_ERR;
++		goto scsi_passthru_done;
++	}
++
++	/* copy up structure to make sense data available to user */
++	pscsi_pass->SenseLength = CMD_ACTUAL_SNSLEN(pscsi_cmd);
++	if (CMD_ACTUAL_SNSLEN(pscsi_cmd)) {
++		for (i = 0; i < CMD_ACTUAL_SNSLEN(pscsi_cmd); i++)
++			pscsi_pass->SenseData[i] = pscsi_cmd->sense_buffer[i];
++
++		DEBUG10(printk("%s Dump of sense buffer:\n", __func__);)
++		DEBUG10(qla2x00_dump_buffer(
++		    (uint8_t *)&pscsi_pass->SenseData[0],
++		    CMD_ACTUAL_SNSLEN(pscsi_cmd));)
++
++		ret = verify_area(VERIFY_WRITE, (void *)pext->RequestAdr,
++		    sizeof(EXT_SCSI_PASSTHRU));
++		if (ret) {
++			pext->Status = EXT_STATUS_COPY_ERR;
++			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify WRITE "
++			    "req buf.\n", __func__, ha->host_no, ha->instance);)
++			goto scsi_passthru_done;
++		}
++
++		usr_temp   = (uint8_t *)pext->RequestAdr;
++		kernel_tmp = (uint8_t *)pscsi_pass;
++		ret = copy_to_user(usr_temp, kernel_tmp,
++		    sizeof(EXT_SCSI_PASSTHRU));
++		if (ret) {
++			pext->Status = EXT_STATUS_COPY_ERR;
++			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy sense "
++			    "buffer.\n",
++			    __func__, ha->host_no, ha->instance);)
++			goto scsi_passthru_done;
++		}
++	}
++
++	scsi_direction = pscsi_pass->Direction;
++
++	if (scsi_direction == EXT_DEF_SCSI_PASSTHRU_DATA_IN) {
++		DEBUG9(printk("%s(%ld): inst=%ld copying data.\n",
++		    __func__, ha->host_no, ha->instance);)
++
++		/* getting device data and putting in pext->ResponseAdr */
++		ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr ,
++		    pext->ResponseLen);
++		if (ret) {
++			pext->Status = EXT_STATUS_COPY_ERR;
++			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify write "
++			    "ResponseAdr.\n",
++			    __func__, ha->host_no, ha->instance);)
++			goto scsi_passthru_done;
++		}
++
++		/* now copy up the READ data to user */
++		if ((CMD_COMPL_STATUS(pscsi_cmd) == CS_DATA_UNDERRUN) &&
++		    (CMD_RESID_LEN(pscsi_cmd))) {
++
++			transfer_len = pext->ResponseLen -
++			    CMD_RESID_LEN(pscsi_cmd);
++
++			pext->ResponseLen = transfer_len;
++		} else {
++			transfer_len = pext->ResponseLen;
++		}
++
++		usr_temp   = (uint8_t *)pext->ResponseAdr;
++		kernel_tmp = (uint8_t *)ha->ioctl_mem;
++		ret = copy_to_user(usr_temp, kernel_tmp, transfer_len);
++		if (ret) {
++			pext->Status = EXT_STATUS_COPY_ERR;
++			DEBUG9_10(printk(
++			    "%s(%ld): inst=%ld ERROR copy rsp buf\n",
++			    __func__, ha->host_no, ha->instance);)
++			goto scsi_passthru_done;
++		}
++	}
++
++	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++scsi_passthru_done:
++
++	qla2x00_free_ioctl_scrap_mem(ha);
++	return (ret);
++}
++
++/*
++ * qla2x00_sc_fc_scsi_passthru
++ *	Handles EXT_SC_SEND_FC_SCSI_PASSTHRU subcommand.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	pext = EXT_IOCTL structure pointer.
++ *	mode = not used.
++ *
++ * Returns:
++ *	0 = success
++ *	others = errno value
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_sc_fc_scsi_passthru(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
++{
++	int			ret = 0;
++	int			port_found, lun_found;
++	fc_lun_t		temp_fclun;
++	struct list_head	*fcpl;
++	fc_port_t		*fcport;
++	struct list_head	*fcll;
++	fc_lun_t		*fclun = NULL;
++	os_lun_t		*lq;
++	os_tgt_t		*tq;
++	srb_t			*sp = NULL;
++	uint8_t			*usr_temp, *kernel_tmp;
++	uint32_t		i;
++
++#if defined(QL_DEBUG_LEVEL_9)
++	uint32_t		b, t, l;
++#endif
++	uint32_t		transfer_len;
++	uint8_t			scsi_direction;
++
++	EXT_FC_SCSI_PASSTHRU	*pfc_scsi_pass;
++
++	Scsi_Cmnd		*pfc_scsi_cmd;
++	Scsi_Device		*pfc_scsi_device;
++
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	if ((sp = qla2x00_get_new_sp(ha)) == NULL) {
++
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR cannot alloc sp.\n",
++		    __func__, ha->host_no, ha->instance);)
++
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		return (ret);
++	}
++
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pfc_scsi_pass,
++	    sizeof(EXT_FC_SCSI_PASSTHRU))) {
++		/* not enough memory */
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "size requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(EXT_FC_SCSI_PASSTHRU));)
++		return (ret);
++	}
++
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pfc_scsi_cmd,
++	    sizeof(Scsi_Cmnd))) {
++		/* not enough memory */
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "size requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(Scsi_Cmnd));)
++		goto fc_scsi_passthru_done;
++	}
++
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pfc_scsi_device,
++	    sizeof(Scsi_Device))) {
++		/* not enough memory */
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "size requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(Scsi_Device));)
++		goto fc_scsi_passthru_done;
++	}
++
++	/* clear ioctl_mem to be used */
++	memset(ha->ioctl_mem, 0, ha->ioctl_mem_size);
++
++	ret = verify_area(VERIFY_READ, (void *)pext->RequestAdr,
++	    sizeof(EXT_FC_SCSI_PASSTHRU));
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk(
++		    "%s(%ld): inst=%ld ERROR verify READ req buf.\n",
++		    __func__, ha->host_no, ha->instance);)
++		atomic_set(&sp->ref_count, 0);
++		add_to_free_queue (ha, sp);
++
++		goto fc_scsi_passthru_done;
++	}
++
++	if (pext->ResponseLen > ha->ioctl_mem_size) {
++		if (qla2x00_get_new_ioctl_dma_mem(ha, pext->ResponseLen) !=
++		    QL_STATUS_SUCCESS) {
++
++			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR cannot alloc "
++			    "requested DMA buffer size %x.\n",
++			    __func__, ha->host_no, ha->instance,
++			    pext->ResponseLen);)
++
++			pext->Status = EXT_STATUS_NO_MEMORY;
++			atomic_set(&sp->ref_count, 0);
++			add_to_free_queue (ha, sp);
++			goto fc_scsi_passthru_done;
++		}
++	}
++
++	/* Copy request buffer */
++	usr_temp   = (uint8_t *)pext->RequestAdr;
++	kernel_tmp = (uint8_t *)pfc_scsi_pass;
++	ret = copy_from_user(kernel_tmp, usr_temp,
++	    sizeof(EXT_FC_SCSI_PASSTHRU));
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk(
++		    "%s(%ld): inst=%ld ERROR copy req buf ret=%d\n",
++		    __func__, ha->host_no, ha->instance, ret);)
++		atomic_set(&sp->ref_count, 0);
++		add_to_free_queue (ha, sp);
++
++		goto fc_scsi_passthru_done;
++	}
++
++	if (pfc_scsi_pass->FCScsiAddr.DestType != EXT_DEF_DESTTYPE_WWPN) {
++		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR -wrong Dest type. \n",
++		    __func__, ha->host_no, ha->instance);)
++		ret = EXT_STATUS_ERR;
++		atomic_set(&sp->ref_count, 0);
++		add_to_free_queue (ha, sp);
++		goto fc_scsi_passthru_done;
++	}
++
++	fcport = NULL;
++	fclun = NULL;
++ 	port_found = lun_found = 0;
++ 	list_for_each(fcpl, &ha->fcports) {
++ 		fcport = list_entry(fcpl, fc_port_t, list);
++ 
++		if (memcmp(fcport->port_name,
++		    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN, 8) != 0) {
++			continue;
++
++		}
++ 		port_found++;
++ 
++ 		list_for_each(fcll, &fcport->fcluns) {
++ 			fclun = list_entry(fcll, fc_lun_t, list);
++
++			if (fclun->lun == pfc_scsi_pass->FCScsiAddr.Lun) {
++				/* Found the right LUN */
++				lun_found++;
++				break;
++			}
++		}
++		break;
++	}
++
++	if (!port_found) {
++		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++		DEBUG9_10(printk("%s(%ld): inst=%ld FC AddrFormat - DID NOT "
++		    "FIND Port matching WWPN.\n",
++		    __func__, ha->host_no, ha->instance);)
++		atomic_set(&sp->ref_count, 0);
++		add_to_free_queue (ha, sp);
++		goto fc_scsi_passthru_done;
++	}
++
++	/* v5.21b9 - use a temporary fclun */
++	if (!lun_found) {
++		fclun = &temp_fclun;
++		fclun->fcport = fcport;
++		fclun->lun = pfc_scsi_pass->FCScsiAddr.Lun;
++		fclun->flags = 0;
++	}
++
++	/* set target coordinates */
++	pfc_scsi_cmd->device->id = 0xff; /* not used. just put something there. */
++	pfc_scsi_cmd->device->lun = pfc_scsi_pass->FCScsiAddr.Lun;
++
++	DEBUG9(printk("%s(%ld): inst=%ld cmd for loopid=%04x L=%04x "
++	    "WWPN=%02x%02x%02x%02x%02x%02x%02x%02x.\n",
++	    __func__, ha->host_no, ha->instance, fclun->fcport->loop_id,
++	    pfc_scsi_cmd->device->lun,
++	    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN[0],
++	    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN[1],
++	    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN[2],
++	    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN[3],
++	    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN[4],
++	    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN[5],
++	    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN[6],
++	    pfc_scsi_pass->FCScsiAddr.DestAddr.WWPN[7]);)
++
++	if (pfc_scsi_pass->CdbLength == 6) {
++		sp->cmd_length = 6;
++		pfc_scsi_cmd->cmd_len = 6;
++
++	} else if (pfc_scsi_pass->CdbLength == 0x0A) {
++		sp->cmd_length = 0x0A;
++		pfc_scsi_cmd->cmd_len = 0x0A;
++
++	} else if (pfc_scsi_pass->CdbLength == 0x0C) {
++		sp->cmd_length = 0x0C;
++		pfc_scsi_cmd->cmd_len = 0x0C;
++
++	} else if (pfc_scsi_pass->CdbLength == 0x10) {
++		sp->cmd_length = 0x10;
++		pfc_scsi_cmd->cmd_len = 0x10;
++	} else {
++		printk(KERN_WARNING
++		    "qla2x00_ioctl: FC_SCSI_PASSTHRU Unknown Cdb Length=%x.\n",
++		    pfc_scsi_pass->CdbLength);
++		pext->Status = EXT_STATUS_INVALID_PARAM;
++		atomic_set(&sp->ref_count, 0);
++		add_to_free_queue (ha, sp);
++
++		goto fc_scsi_passthru_done;
++	}
++
++	memcpy(pfc_scsi_cmd->data_cmnd, pfc_scsi_pass->Cdb,
++	    pfc_scsi_cmd->cmd_len);
++	memcpy(pfc_scsi_cmd->cmnd, pfc_scsi_pass->Cdb,
++	    pfc_scsi_cmd->cmd_len);
++
++	DEBUG9(printk("%s Dump of cdb buffer:\n", __func__);)
++	DEBUG9(qla2x00_dump_buffer((uint8_t *)&pfc_scsi_cmd->data_cmnd[0], 16);)
++
++	pfc_scsi_cmd->device->host = ha->host;
++	sp->ha                = ha;
++	sp->cmd               = pfc_scsi_cmd;
++	sp->flags             = SRB_IOCTL;
++
++	/* set local fc_scsi_cmd's sp pointer to sp */
++	CMD_SP(pfc_scsi_cmd)  = (void *) sp;
++
++	/* mark this as a special delivery and collection command */
++	pfc_scsi_cmd->flags     = 0;
++	pfc_scsi_cmd->scsi_done = qla2x00_scsi_pt_done;
++
++	pfc_scsi_cmd->device               = pfc_scsi_device;
++	pfc_scsi_cmd->device->tagged_queue = 0;
++	pfc_scsi_cmd->use_sg               = 0; /* no ScatterGather */
++	pfc_scsi_cmd->request_bufflen      = pext->ResponseLen;
++	pfc_scsi_cmd->request_buffer       = ha->ioctl_mem;
++	pfc_scsi_cmd->timeout_per_command  = QLA_PT_CMD_TOV * HZ;
++
++	if (pfc_scsi_pass->Direction == EXT_DEF_SCSI_PASSTHRU_DATA_OUT) {
++		/* sending user data from pext->ResponseAdr to device */
++		ret = verify_area(VERIFY_READ, (void *)pext->ResponseAdr,
++		    pext->ResponseLen);
++		if (ret) {
++			pext->Status = EXT_STATUS_COPY_ERR;
++			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify read "
++			    "ResponseAdr.\n",
++			    __func__, ha->host_no, ha->instance);)
++			atomic_set(&sp->ref_count, 0);
++			add_to_free_queue (ha, sp);
++
++			goto fc_scsi_passthru_done;
++		}
++
++		pfc_scsi_cmd->sc_data_direction = SCSI_DATA_WRITE;
++		usr_temp   = (uint8_t *)pext->ResponseAdr;
++		kernel_tmp = (uint8_t *)ha->ioctl_mem;
++		ret = copy_from_user(kernel_tmp, usr_temp, pext->ResponseLen);
++		if (ret) {
++			pext->Status = EXT_STATUS_COPY_ERR;
++			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy "
++			    "failed(%d) on rsp buf.\n",
++			    __func__, ha->host_no, ha->instance, ret);)
++			atomic_set(&sp->ref_count, 0);
++			add_to_free_queue (ha, sp);
++
++			goto fc_scsi_passthru_done;
++		}
++	} else {
++		pfc_scsi_cmd->sc_data_direction = SCSI_DATA_READ;
++	}
++
++	tq = ha->ioctl->ioctl_tq;
++	lq = ha->ioctl->ioctl_lq;
++
++	if (fclun && tq && lq ) {
++		tq->olun[fclun->lun] = lq;
++		tq->ha = ha;
++
++		lq->fclun = fclun;
++		fcport = fclun->fcport;
++
++		sp->lun_queue = lq;
++		sp->tgt_queue = tq;
++		sp->fclun = fclun;
++	}
++
++	DEBUG9({
++		b = SCSI_BUS_32(pfc_scsi_cmd);
++		t = SCSI_TCN_32(pfc_scsi_cmd);
++		l = SCSI_LUN_32(pfc_scsi_cmd);
++	})
++	DEBUG9(printk("%s(%ld): ha instance=%ld tq=%p lq=%p "
++	    "fclun=%p.\n",
++	    __func__, ha->host_no, ha->instance, tq, lq, fclun);)
++	DEBUG9(printk("\tCDB=%02x %02x %02x %02x; b=%x t=%x l=%x.\n",
++	    pfc_scsi_cmd->cmnd[0], pfc_scsi_cmd->cmnd[1], pfc_scsi_cmd->cmnd[2],
++	    pfc_scsi_cmd->cmnd[3], b, t, l);)
++
++	/*
++	 * Check the status of the port
++	 */
++	if (qla2x00_check_port_status(ha, fcport) != QL_STATUS_SUCCESS) {
++		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++		atomic_set(&sp->ref_count, 0);
++		add_to_free_queue (ha, sp);
++		goto fc_scsi_passthru_done;
++	}
++
++	/* set flag to indicate IOCTL SCSI PassThru in progress */
++	ha->ioctl->SCSIPT_InProgress = 1;
++	ha->ioctl->ioctl_tov = (int)QLA_PT_CMD_DRV_TOV;
++
++	/* prepare for receiving completion. */
++	qla2x00_ioctl_sem_init(ha);
++	CMD_COMPL_STATUS(pfc_scsi_cmd) = (int) IOCTL_INVALID_STATUS;
++
++	/* send command to adapter */
++	DEBUG9(printk("%s(%ld): inst=%ld sending command.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	add_to_pending_queue(ha, sp);
++
++	qla2x00_next(ha);
++
++	ha->ioctl->cmpl_timer.expires = jiffies + ha->ioctl->ioctl_tov * HZ;
++	add_timer(&ha->ioctl->cmpl_timer);
++
++	down(&ha->ioctl->cmpl_sem);
++
++	del_timer(&ha->ioctl->cmpl_timer);
++
++	if (ha->ioctl->SCSIPT_InProgress == 1) {
++
++		printk(KERN_WARNING
++		    "qla2x00: scsi%ld ERROR passthru command timeout.\n",
++		    ha->host_no);
++
++		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++		atomic_set(&sp->ref_count, 0);
++		add_to_free_queue (ha, sp);
++		goto fc_scsi_passthru_done;
++	}
++
++	if (CMD_COMPL_STATUS(pfc_scsi_cmd) == (int)IOCTL_INVALID_STATUS) {
++
++		DEBUG9(printk("%s(%ld): inst=%ld ERROR. cmd not completed.\n",
++		    __func__, ha->host_no, ha->instance);)
++
++		pext->Status = EXT_STATUS_ERR;
++		atomic_set(&sp->ref_count, 0);
++		add_to_free_queue (ha, sp);
++		goto fc_scsi_passthru_done;
++	}
++
++	switch (CMD_COMPL_STATUS(pfc_scsi_cmd)) {
++	case CS_INCOMPLETE:
++	case CS_ABORTED:
++	case CS_PORT_UNAVAILABLE:
++	case CS_PORT_LOGGED_OUT:
++	case CS_PORT_CONFIG_CHG:
++	case CS_PORT_BUSY:
++		DEBUG10(printk("%s(%ld): inst=%ld cs err = %x.\n",
++		    __func__, ha->host_no, ha->instance,
++		    CMD_COMPL_STATUS(pfc_scsi_cmd));)
++		pext->Status = EXT_STATUS_BUSY;
++		break;
++	}
++
++	if ((CMD_COMPL_STATUS(pfc_scsi_cmd) == CS_DATA_UNDERRUN) ||
++	    (CMD_SCSI_STATUS(pfc_scsi_cmd) != 0))  {
++
++		/* have done the post function */
++		pext->Status       = EXT_STATUS_SCSI_STATUS;
++		/* The SDMAPI is only concerned with the low-order byte */
++		pext->DetailStatus = CMD_SCSI_STATUS(pfc_scsi_cmd) & 0xff;
++
++		DEBUG9_10(printk("%s(%ld): inst=%ld data underrun or scsi err. "
++		    "host status =0x%x, scsi status = 0x%x.\n",
++		    __func__, ha->host_no, ha->instance,
++		    CMD_COMPL_STATUS(pfc_scsi_cmd),
++		    CMD_SCSI_STATUS(pfc_scsi_cmd));)
++
++	} else if (CMD_COMPL_STATUS(pfc_scsi_cmd) != 0) {
++		DEBUG9_10(printk("%s(%ld): inst=%ld cs err=%x.\n",
++		    __func__, ha->host_no, ha->instance,
++		    CMD_COMPL_STATUS(pfc_scsi_cmd));)
++		pext->Status = EXT_STATUS_ERR;
++
++		goto fc_scsi_passthru_done;
++	}
++
++	/* Process completed command */
++	DEBUG9(printk("%s(%ld): inst=%ld done. host status=0x%x, "
++	    "scsi status=0x%x.\n",
++	    __func__, ha->host_no, ha->instance, CMD_COMPL_STATUS(pfc_scsi_cmd),
++	    CMD_SCSI_STATUS(pfc_scsi_cmd));)
++
++	/* copy up structure to make sense data available to user */
++	pfc_scsi_pass->SenseLength = CMD_ACTUAL_SNSLEN(pfc_scsi_cmd);
++	if (CMD_ACTUAL_SNSLEN(pfc_scsi_cmd)) {
++		DEBUG9_10(printk("%s(%ld): inst=%ld sense[0]=%x sense[2]=%x.\n",
++		    __func__, ha->host_no, ha->instance,
++		    pfc_scsi_cmd->sense_buffer[0],
++		    pfc_scsi_cmd->sense_buffer[2]);)
++
++		for (i = 0; i < CMD_ACTUAL_SNSLEN(pfc_scsi_cmd); i++) {
++			pfc_scsi_pass->SenseData[i] =
++			pfc_scsi_cmd->sense_buffer[i];
++		}
++
++		ret = verify_area(VERIFY_WRITE, (void *)pext->RequestAdr,
++		    sizeof(EXT_FC_SCSI_PASSTHRU));
++		if (ret) {
++			pext->Status = EXT_STATUS_COPY_ERR;
++			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify WRITE "
++			    "RequestAdr.\n",
++			    __func__, ha->host_no, ha->instance);)
++			goto fc_scsi_passthru_done;
++		}
++
++		usr_temp = (uint8_t *)pext->RequestAdr;
++		kernel_tmp = (uint8_t *)pfc_scsi_pass;
++		ret = copy_to_user(usr_temp, kernel_tmp,
++		    sizeof(EXT_FC_SCSI_PASSTHRU));
++		if (ret) {
++			pext->Status = EXT_STATUS_COPY_ERR;
++			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy sense "
++			    "buffer.\n",
++			    __func__, ha->host_no, ha->instance);)
++			goto fc_scsi_passthru_done;
++		}
++	}
++
++	scsi_direction = pfc_scsi_pass->Direction;
++
++	if (scsi_direction == EXT_DEF_SCSI_PASSTHRU_DATA_IN) {
++
++		DEBUG9(printk("%s(%ld): inst=%ld copying data.\n",
++		    __func__, ha->host_no, ha->instance);)
++
++		/* getting device data and putting in pext->ResponseAdr */
++		ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr,
++		    pext->ResponseLen);
++		if (ret) {
++			pext->Status = EXT_STATUS_COPY_ERR;
++
++			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify write "
++			    "ResponseAdr.\n",
++			    __func__, ha->host_no, ha->instance);)
++
++			goto fc_scsi_passthru_done;
++		}
++
++		/* now copy up the READ data to user */
++		if ((CMD_COMPL_STATUS(pfc_scsi_cmd) == CS_DATA_UNDERRUN) &&
++		    (CMD_RESID_LEN(pfc_scsi_cmd))) {
++
++			transfer_len = pext->ResponseLen -
++			    CMD_RESID_LEN(pfc_scsi_cmd);
++
++			pext->ResponseLen = transfer_len;
++		} else {
++			transfer_len = pext->ResponseLen;
++		}
++
++		usr_temp = (uint8_t *)pext->ResponseAdr;
++		kernel_tmp = (uint8_t *)ha->ioctl_mem;
++		ret = copy_to_user(usr_temp, kernel_tmp, transfer_len);
++		if (ret) {
++			pext->Status = EXT_STATUS_COPY_ERR;
++			DEBUG9_10(printk(
++			    "%s(%ld): inst=%ld ERROR copy rsp buf\n",
++			    __func__, ha->host_no, ha->instance);)
++			goto fc_scsi_passthru_done;
++		}
++	}
++
++	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++fc_scsi_passthru_done:
++
++	qla2x00_free_ioctl_scrap_mem(ha);
++	return (ret);
++}
++
++/*
++ * qla2x00_sc_scsi3_passthru
++ *	Handles EXT_SC_SCSI3_PASSTHRU subcommand.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	pext = EXT_IOCTL structure pointer.
++ *	mode = not used.
++ *
++ * Returns:
++ *	0 = success
++ *	others = errno value
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_sc_scsi3_passthru(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
++{
++#define MAX_SCSI3_CDB_LEN	16
++
++	int			ret = 0;
++	int			found;
++	fc_lun_t		temp_fclun;
++	fc_lun_t		*fclun = NULL;
++	struct list_head	*fcpl;
++	fc_port_t		*fcport;
++	os_lun_t		*lq;
++	os_tgt_t		*tq;
++	srb_t			*sp = NULL;
++	uint8_t			*usr_temp, *kernel_tmp;
++	uint32_t		transfer_len;
++	uint32_t		i, b, t;
++	uint32_t		scsi_direction;
++
++	EXT_FC_SCSI_PASSTHRU	*pfc_scsi3_pass;
++
++	Scsi_Cmnd		*pscsi3_cmd;
++	Scsi_Device		*pscsi3_device;
++
++
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	if ((sp = qla2x00_get_new_sp(ha)) == NULL) {
++
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR cannot alloc sp.\n",
++		    __func__, ha->host_no, ha->instance);)
++
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		return (ret);
++	}
++
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pfc_scsi3_pass,
++	    sizeof(EXT_FC_SCSI_PASSTHRU))) {
++		/* not enough memory */
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "size requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(EXT_FC_SCSI_PASSTHRU));)
++		return (ret);
++	}
++
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pscsi3_cmd,
++	    sizeof(Scsi_Cmnd))) {
++		/* not enough memory */
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "size requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(Scsi_Cmnd));)
++		goto scsi3_passthru_done;
++	}
++
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&pscsi3_device,
++	    sizeof(Scsi_Device))) {
++		/* not enough memory */
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "size requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(Scsi_Device));)
++		goto scsi3_passthru_done;
++	}
++
++	/* clear ioctl_mem to be used */
++	memset(ha->ioctl_mem, 0, ha->ioctl_mem_size);
++
++	ret = verify_area(VERIFY_READ, (void *)pext->RequestAdr,
++	    sizeof(EXT_FC_SCSI_PASSTHRU));
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify READ "
++		    "req buf.\n", __func__, ha->host_no, ha->instance);)
++		atomic_set(&sp->ref_count, 0);
++		add_to_free_queue (ha, sp);
++		goto scsi3_passthru_done;
++	}
++
++	if (pext->ResponseLen > ha->ioctl_mem_size) {
++		if (qla2x00_get_new_ioctl_dma_mem(ha, pext->ResponseLen) !=
++		    QL_STATUS_SUCCESS) {
++
++			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR cannot "
++			    "alloc requested DMA buffer size=%x.\n",
++			    __func__, ha->host_no, ha->instance,
++			    pext->ResponseLen);)
++
++			pext->Status = EXT_STATUS_NO_MEMORY;
++			atomic_set(&sp->ref_count, 0);
++			add_to_free_queue (ha, sp);
++			goto scsi3_passthru_done;
++		}
++	}
++
++	/* Copy request buffer */
++	usr_temp   = (uint8_t *)pext->RequestAdr;
++	kernel_tmp = (uint8_t *)pfc_scsi3_pass;
++	ret = copy_from_user(kernel_tmp, usr_temp,
++	    sizeof(EXT_FC_SCSI_PASSTHRU));
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk(
++		    "%s(%ld): inst=%ld ERROR copy req buf ret=%d\n",
++		    __func__, ha->host_no, ha->instance, ret);)
++		atomic_set(&sp->ref_count, 0);
++		add_to_free_queue (ha, sp);
++		goto scsi3_passthru_done;
++	}
++
++	if (pfc_scsi3_pass->FCScsiAddr.DestType != EXT_DEF_DESTTYPE_WWPN) {
++		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR - wrong Dest type.\n",
++		    __func__, ha->host_no, ha->instance);)
++		ret = EXT_STATUS_ERR;
++		atomic_set(&sp->ref_count, 0);
++		add_to_free_queue (ha, sp);
++
++		goto scsi3_passthru_done;
++	}
++
++	/*
++	 * For this ioctl command we always assume all 16 bytes are
++	 * initialized.
++	 */
++	if (pfc_scsi3_pass->CdbLength != MAX_SCSI3_CDB_LEN) {
++		pext->Status = EXT_STATUS_INVALID_PARAM;
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR -wrong Cdb Len %d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    pfc_scsi3_pass->CdbLength);)
++		atomic_set(&sp->ref_count, 0);
++		add_to_free_queue (ha, sp);
++		goto scsi3_passthru_done;
++	}
++
++ 	fcport = NULL;
++ 	found = 0;
++ 	list_for_each(fcpl, &ha->fcports) {
++ 		fcport = list_entry(fcpl, fc_port_t, list);
++
++		if (memcmp(fcport->port_name,
++		    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN, 8) == 0) {
++			found++;
++			break;
++		}
++	}
++	if (!found) {
++		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++
++		DEBUG9_10(printk("%s(%ld): inst=%ld DID NOT FIND Port for WWPN "
++		    "%02x%02x%02x%02x%02x%02x%02x%02x.\n",
++		    __func__, ha->host_no, ha->instance,
++		    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[0],
++		    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[1],
++		    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[2],
++		    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[3],
++		    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[4],
++		    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[5],
++		    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[6],
++		    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[7]);)
++
++		atomic_set(&sp->ref_count, 0);
++		add_to_free_queue (ha, sp);
++
++		goto scsi3_passthru_done;
++	}
++
++	/* Use a temporary fclun to send out the command. */
++	fclun = &temp_fclun;
++	fclun->fcport = fcport;
++	fclun->lun = pfc_scsi3_pass->FCScsiAddr.Lun;
++	fclun->flags = 0;
++
++	/* set target coordinates */
++	pscsi3_cmd->device->id = 0xff;  /* not used. just put something there. */
++	pscsi3_cmd->device->lun = pfc_scsi3_pass->FCScsiAddr.Lun;
++
++	DEBUG9(printk("%s(%ld): inst=%ld cmd for loopid=%04x L=%04x "
++	    "WWPN=%02x%02x%02x%02x%02x%02x%02x%02x.\n",
++	    __func__, ha->host_no, ha->instance,
++	    fclun->fcport->loop_id, pscsi3_cmd->device->lun,
++	    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[0],
++	    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[1],
++	    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[2],
++	    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[3],
++	    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[4],
++	    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[5],
++	    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[6],
++	    pfc_scsi3_pass->FCScsiAddr.DestAddr.WWPN[7]);)
++
++	sp->cmd_length = MAX_SCSI3_CDB_LEN;
++	pscsi3_cmd->cmd_len = MAX_SCSI3_CDB_LEN;
++
++	memcpy(pscsi3_cmd->data_cmnd, pfc_scsi3_pass->Cdb, pscsi3_cmd->cmd_len);
++	memcpy(pscsi3_cmd->cmnd, pfc_scsi3_pass->Cdb, pscsi3_cmd->cmd_len);
++
++	DEBUG9(printk("%s(%ld): inst=%ld cdb buffer dump:\n",
++	    __func__, ha->host_no, ha->instance);)
++	DEBUG9(qla2x00_dump_buffer((uint8_t *)&pscsi3_cmd->data_cmnd[0], 16);)
++
++	pscsi3_cmd->device->host = ha->host;
++	sp->ha                = ha;
++	sp->cmd               = pscsi3_cmd;
++	sp->flags             = SRB_IOCTL;
++
++	/* set local scsi3_cmd's sp pointer to sp */
++	CMD_SP(pscsi3_cmd)    = (void *) sp;
++
++	/* mark this as a special delivery and collection command */
++	pscsi3_cmd->flags     = 0;
++	pscsi3_cmd->scsi_done = qla2x00_scsi_pt_done;
++
++	pscsi3_cmd->device               = pscsi3_device;
++	pscsi3_cmd->device->tagged_queue = 0;
++	pscsi3_cmd->use_sg               = 0; /* no ScatterGather */
++	pscsi3_cmd->request_bufflen      = pext->ResponseLen;
++	pscsi3_cmd->request_buffer       = ha->ioctl_mem;
++	pscsi3_cmd->timeout_per_command  = QLA_PT_CMD_TOV * HZ;
++
++	if (pfc_scsi3_pass->Direction == EXT_DEF_SCSI_PASSTHRU_DATA_OUT) {
++		/* sending user data from pext->ResponseAdr to device */
++		ret = verify_area(VERIFY_READ, (void *)pext->ResponseAdr,
++		    pext->ResponseLen);
++		if (ret) {
++			pext->Status = EXT_STATUS_COPY_ERR;
++			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify read "
++			    "ResponseAdr.\n",
++			    __func__, ha->host_no, ha->instance);)
++			atomic_set(&sp->ref_count, 0);
++			add_to_free_queue (ha, sp);
++			goto scsi3_passthru_done;
++		}
++
++		pscsi3_cmd->sc_data_direction = SCSI_DATA_WRITE;
++		usr_temp   = (uint8_t *)pext->ResponseAdr;
++		kernel_tmp = (uint8_t *)ha->ioctl_mem;
++		ret = copy_from_user(kernel_tmp, usr_temp, pext->ResponseLen);
++		if (ret) {
++			pext->Status = EXT_STATUS_COPY_ERR;
++			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buf "
++			    "ret=%d.\n",
++			    __func__, ha->host_no, ha->instance, ret);)
++			atomic_set(&sp->ref_count, 0);
++			add_to_free_queue (ha, sp);
++			goto scsi3_passthru_done;
++		}
++
++	} else {
++		pscsi3_cmd->sc_data_direction = SCSI_DATA_READ;
++	}
++
++	/* Use temporary LU and TGT queue */
++	tq = ha->ioctl->ioctl_tq;
++	lq = ha->ioctl->ioctl_lq;
++
++	b = SCSI_BUS_32(pscsi3_cmd);
++	t = SCSI_TCN_32(pscsi3_cmd);
++
++	DEBUG9(printk("%s(%ld): ha instance=%ld tq=%p lq=%p fclun=%p.\n",
++	    __func__, ha->host_no, ha->instance,tq,lq,fclun); )
++	DEBUG9(printk("%s(%ld): CDB=%02x %02x %02x %02x; b=%x t=%x fclun=%x\n",
++	    __func__, ha->host_no, pscsi3_cmd->cmnd[0], pscsi3_cmd->cmnd[1],
++	    pscsi3_cmd->cmnd[2], pscsi3_cmd->cmnd[3], b, t,
++	    SCSI_LUN_32(pscsi3_cmd));)
++
++	if (tq && lq) {
++		/*
++		 * For now just save lq using the lower LUN byte value,
++		 * even though this may not be the actual LUN number.
++		 * Since we're only sending out passthru cmd one at a time,
++		 * and only passthru is using FCP LUN format now, no need
++		 * to change rest of driver just to decode the LUN.
++		 */
++		tq->olun[fclun->lun & 0xff] = lq;
++
++		tq->ha = ha;
++		lq->fclun = fclun;
++		fcport = fclun->fcport;
++
++		sp->lun_queue = lq;
++		sp->tgt_queue = tq;
++		sp->fclun = fclun;
++	} else {
++		lq = NULL;
++		fcport = NULL;
++	}
++
++	/*
++	 * Check the status of the port
++	 */
++	if (qla2x00_check_port_status(ha, fcport) != QL_STATUS_SUCCESS) {
++
++		DEBUG9_10(printk("%s(%ld): inst=%ld port missing or loop down. "
++		    "fcport=%p timer=%d state=%d dpc=%lx.\n",
++		    __func__, ha->host_no, ha->instance, fcport,
++		    atomic_read(&ha->loop_down_timer), ha->loop_state,
++		    ha->dpc_flags);)
++
++		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++		atomic_set(&sp->ref_count, 0);
++		add_to_free_queue (ha, sp);
++		goto scsi3_passthru_done;
++	}
++
++	/* set flag to indicate IOCTL SCSI PassThru in progress */
++	ha->ioctl->SCSIPT_InProgress = 1;
++	ha->ioctl->ioctl_tov = (int)QLA_PT_CMD_DRV_TOV;
++
++	/* prepare for receiving completion. */
++	qla2x00_ioctl_sem_init(ha);
++	CMD_COMPL_STATUS(pscsi3_cmd) = (int) IOCTL_INVALID_STATUS;
++
++	/* send command to adapter */
++
++	/*add_to_cmd_queue(ha, lq, sp);*/
++	add_to_pending_queue(ha, sp);
++
++	/*qla2x00_next(ha, tq, lq);*/
++	qla2x00_next(ha);
++
++	ha->ioctl->cmpl_timer.expires = jiffies + ha->ioctl->ioctl_tov * HZ;
++	add_timer(&ha->ioctl->cmpl_timer);
++
++	down(&ha->ioctl->cmpl_sem);
++
++	del_timer(&ha->ioctl->cmpl_timer);
++
++	if (ha->ioctl->SCSIPT_InProgress == 1) {
++
++		printk(KERN_WARNING
++		    "qla2x00: inst=%ld scsi%ld ERROR PT command timeout.\n",
++		    ha->host_no, ha->instance);
++
++		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++		atomic_set(&sp->ref_count, 0);
++		add_to_free_queue (ha, sp);
++		goto scsi3_passthru_done;
++
++	}
++	if (CMD_COMPL_STATUS(pscsi3_cmd) == (int)IOCTL_INVALID_STATUS) {
++
++		DEBUG9(printk("%s(%ld): inst=%ld ERROR - cmd not completed.\n",
++		    __func__, ha->host_no, ha->instance);)
++
++		pext->Status = EXT_STATUS_ERR;
++		atomic_set(&sp->ref_count, 0);
++		add_to_free_queue (ha, sp);
++		goto scsi3_passthru_done;
++	}
++
++	switch (CMD_COMPL_STATUS(pscsi3_cmd)) {
++	case CS_INCOMPLETE:
++	case CS_ABORTED:
++	case CS_PORT_UNAVAILABLE:
++	case CS_PORT_LOGGED_OUT:
++	case CS_PORT_CONFIG_CHG:
++	case CS_PORT_BUSY:
++		DEBUG10(printk("%s(%ld): inst=%ld cs err = %x.\n",
++		    __func__, ha->host_no, ha->instance,
++		    CMD_COMPL_STATUS(pscsi3_cmd));)
++		pext->Status = EXT_STATUS_BUSY;
++		break;
++	}
++
++	if ((CMD_COMPL_STATUS(pscsi3_cmd) == CS_DATA_UNDERRUN) ||
++	    (CMD_SCSI_STATUS(pscsi3_cmd) != 0)) {
++
++		/* have done the post function */
++		pext->Status       = EXT_STATUS_SCSI_STATUS;
++		pext->DetailStatus = CMD_SCSI_STATUS(pscsi3_cmd) & 0xff;
++
++		DEBUG9_10(printk("%s(%ld): inst=%ld data underrun or scsi err. "
++		    "host status =0x%x, scsi status = 0x%x.\n",
++		    __func__, ha->host_no, ha->instance,
++		    CMD_COMPL_STATUS(pscsi3_cmd), CMD_SCSI_STATUS(pscsi3_cmd));)
++
++	} else if (CMD_COMPL_STATUS(pscsi3_cmd) != 0) {
++		DEBUG9_10(printk("%s(%ld): inst=%ld cs err = %x.\n",
++		    __func__, ha->host_no, ha->instance,
++		    CMD_COMPL_STATUS(pscsi3_cmd));)
++		pext->Status = EXT_STATUS_ERR;
++		goto scsi3_passthru_done;
++	}
++
++	/* Process completed command */
++	DEBUG9(printk("%s(%ld): inst=%ld done. host status=0x%x, "
++	    "scsi status=0x%x.\n",
++	    __func__, ha->host_no, ha->instance, CMD_COMPL_STATUS(pscsi3_cmd),
++	    CMD_SCSI_STATUS(pscsi3_cmd));)
++
++	/* copy up structure to make sense data available to user */
++	pfc_scsi3_pass->SenseLength = CMD_ACTUAL_SNSLEN(pscsi3_cmd);
++	if (CMD_ACTUAL_SNSLEN(pscsi3_cmd)) {
++		DEBUG9_10(printk("%s(%ld): inst=%ld sense[0]=%x sense[2]=%x.\n",
++		    __func__, ha->host_no, ha->instance,
++		    pscsi3_cmd->sense_buffer[0],
++		    pscsi3_cmd->sense_buffer[2]);)
++
++		for (i = 0; i < CMD_ACTUAL_SNSLEN(pscsi3_cmd); i++) {
++			pfc_scsi3_pass->SenseData[i] =
++			    pscsi3_cmd->sense_buffer[i];
++		}
++
++		ret = verify_area(VERIFY_WRITE, (void *)pext->RequestAdr,
++		    sizeof(EXT_FC_SCSI_PASSTHRU));
++		if (ret) {
++			pext->Status = EXT_STATUS_COPY_ERR;
++			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify WRITE "
++			    "RequestAdr.\n",
++			    __func__, ha->host_no, ha->instance);)
++			goto scsi3_passthru_done;
++		}
++
++		usr_temp = (uint8_t *)pext->RequestAdr;
++		kernel_tmp = (uint8_t *)pfc_scsi3_pass;
++		ret = copy_to_user(usr_temp, kernel_tmp,
++		    sizeof(EXT_FC_SCSI_PASSTHRU));
++		if (ret) {
++			pext->Status = EXT_STATUS_COPY_ERR;
++			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy sense "
++			    "buffer.\n",
++			    __func__, ha->host_no, ha->instance);)
++			goto scsi3_passthru_done;
++		}
++	}
++
++	scsi_direction = pfc_scsi3_pass->Direction;
++
++	if (scsi_direction == EXT_DEF_SCSI_PASSTHRU_DATA_IN) {
++
++		DEBUG9(printk("%s(%ld): inst=%ld copying data.\n",
++		    __func__, ha->host_no, ha->instance);)
++
++		/* getting device data and putting in pext->ResponseAdr */
++		ret = verify_area(VERIFY_WRITE, (void *)pext->ResponseAdr,
++		    pext->ResponseLen);
++		if (ret) {
++			pext->Status = EXT_STATUS_COPY_ERR;
++
++			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR verify write "
++			    "ResponseAdr.\n",
++			    __func__, ha->host_no, ha->instance);)
++
++			goto scsi3_passthru_done;
++		}
++
++		/* now copy up the READ data to user */
++		if ((CMD_COMPL_STATUS(pscsi3_cmd) == CS_DATA_UNDERRUN) &&
++		    (CMD_RESID_LEN(pscsi3_cmd))) {
++
++			transfer_len = pext->ResponseLen -
++			    CMD_RESID_LEN(pscsi3_cmd);
++
++			pext->ResponseLen = transfer_len;
++		} else {
++			transfer_len = pext->ResponseLen;
++		}
++
++		usr_temp = (uint8_t *)pext->ResponseAdr;
++		kernel_tmp = (uint8_t *)ha->ioctl_mem;
++		ret = copy_to_user(usr_temp, kernel_tmp, transfer_len);
++		if (ret) {
++			pext->Status = EXT_STATUS_COPY_ERR;
++			DEBUG9_10(printk(
++			    "%s(%ld): inst=%ld ERROR copy rsp buf\n",
++			    __func__, ha->host_no, ha->instance);)
++			goto scsi3_passthru_done;
++		}
++	}
++
++	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++scsi3_passthru_done:
++
++	qla2x00_free_ioctl_scrap_mem(ha);
++	return (ret);
++}
++
++/*
++ * qla2x00_send_els_rnid
++ *	IOCTL to send extended link service RNID command to a target.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	pext = User space CT arguments pointer.
++ *	mode = flags.
++ *
++ * Returns:
++ *	0 = success
++ *	others = errno value
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_send_els_rnid(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
++{
++#define TGT_DEV 	 1
++#define HOST_DEV 	 2
++
++	EXT_RNID_REQ	*tmp_rnid;
++	int		ret = 0;
++	uint8_t 	dev_found = 0;
++	uint16_t	dev_loop_id = 0;
++	uint16_t	mb[MAILBOX_REGISTER_COUNT];
++	uint32_t	copy_len;
++	struct list_head	*fcpl;
++	fc_port_t	*fcport;
++	int		found;
++	struct list_head *fcil;
++	fc_initiator_t	*fcinitiator;
++
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	if (ha->ioctl_mem_size < SEND_RNID_RSP_SIZE) {
++		if (qla2x00_get_new_ioctl_dma_mem(ha,
++		    SEND_RNID_RSP_SIZE) != QL_STATUS_SUCCESS) {
++
++			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR cannot alloc "
++			    "DMA buffer. size=%x.\n",
++			    __func__, ha->host_no, ha->instance,
++			    SEND_RNID_RSP_SIZE);)
++
++			pext->Status = EXT_STATUS_NO_MEMORY;
++			return (ret);
++		}
++	}
++
++	if (pext->RequestLen != sizeof(EXT_RNID_REQ)) {
++		/* parameter error */
++		DEBUG9_10(printk("%s(%ld): inst=%ld invalid req length %d.\n",
++		    __func__, ha->host_no, ha->instance, pext->RequestLen);)
++		pext->Status = EXT_STATUS_INVALID_PARAM;
++		return (ret);
++	}
++
++	ret = verify_area(VERIFY_READ, (void *)pext->RequestAdr,
++	    pext->RequestLen);
++
++	if (ret != 0) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk(
++		    "%s(%ld): inst=%ld req buf verify READ FAILED\n",
++		    __func__, ha->host_no, ha->instance);)
++		return (ret);
++	}
++
++	DEBUG9(printk("%s(%ld): inst=%ld req buf verified. Copying req data.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&tmp_rnid,
++	    sizeof(EXT_RNID_REQ))) {
++		/* not enough memory */
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "size requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(EXT_RNID_REQ));)
++		return (ret);
++	}
++
++	ret = copy_from_user(tmp_rnid, pext->RequestAdr, pext->RequestLen);
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk(
++		    "%s(%ld): inst=%ld ERROR copy req buf ret=%d\n",
++		    __func__, ha->host_no, ha->instance, ret);)
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return (ret);
++	}
++
++	/* Find loop ID of the device */
++	fcinitiator = NULL;
++	switch (tmp_rnid->Addr.Type) {
++	case EXT_DEF_TYPE_WWNN:
++
++		DEBUG9(printk("%s(%ld): inst=%ld got node name.\n",
++		    __func__, ha->host_no, ha->instance);)
++
++		fcport = NULL;
++		list_for_each(fcpl, &ha->fcports) {
++			fcport = list_entry(fcpl, fc_port_t, list);
++
++			/* if removed or missing */
++			if (atomic_read(&fcport->state) == FC_ONLINE &&
++			    memcmp((void *)tmp_rnid->Addr.FcAddr.WWNN,
++			    (void *)fcport->node_name,
++			    EXT_DEF_WWN_NAME_SIZE) == 0) {
++				break;
++			}
++		}
++		if (fcport != NULL) {
++			DEBUG9(printk("%s(%ld): inst=%ld found tgt dev; "
++			    "loop_id=%x.\n",
++			    __func__, ha->host_no, ha->instance,
++			    fcport->loop_id);)
++
++			dev_found = TGT_DEV;
++			dev_loop_id = fcport->loop_id;
++			break;
++		}
++
++		found = 0;
++		fcinitiator = NULL;
++		list_for_each(fcil, &ha->fcinitiators) {
++			fcinitiator = list_entry(fcil, fc_initiator_t, list);
++
++			if (memcmp(tmp_rnid->Addr.FcAddr.WWNN,
++				 fcinitiator->node_name,
++				 EXT_DEF_WWN_NAME_SIZE) == 0 &&
++				fcinitiator->d_id.b24 != 0) {
++
++				found++;
++				break;
++			}
++		}
++		if (found) {
++			DEBUG9(printk("%s(%ld): inst=%ld found host device; "
++			    "loop_id=%x.\n",
++			    __func__, ha->host_no, ha->instance,
++			    fcinitiator->loop_id);)
++
++			dev_found = HOST_DEV;
++			dev_loop_id = fcinitiator->loop_id;
++			break;
++		}
++
++		break;
++
++	case EXT_DEF_TYPE_WWPN:
++		DEBUG9(printk("%s(%ld): inst=%ld got port name.\n",
++		    __func__, ha->host_no, ha->instance);)
++
++		fcport = NULL;
++		list_for_each(fcpl, &ha->fcports) {
++			fcport = list_entry(fcpl, fc_port_t, list);
++
++			/* if removed or missing */
++			if (atomic_read(&fcport->state) == FC_ONLINE &&
++			    memcmp((void *)tmp_rnid->Addr.FcAddr.WWPN,
++			    (void *)fcport->port_name,
++			    EXT_DEF_WWN_NAME_SIZE) == 0) {
++				break;
++			}
++		}
++		if (fcport != NULL) {
++			DEBUG9(printk("%s(%ld): inst=%ld found tgt dev; "
++			    "loop_id=%x.\n",
++			    __func__, ha->host_no, ha->instance,
++			    fcport->loop_id);)
++
++			dev_found = TGT_DEV; /* target device */
++			dev_loop_id = fcport->loop_id;
++			break;
++		}
++
++		found = 0;
++		fcinitiator = NULL;
++		list_for_each(fcil, &ha->fcinitiators) {
++			fcinitiator = list_entry(fcil, fc_initiator_t, list);
++
++			if (memcmp(tmp_rnid->Addr.FcAddr.WWPN,
++				 fcinitiator->port_name,
++				 EXT_DEF_WWN_NAME_SIZE) == 0 &&
++				fcinitiator->d_id.b24 != 0) {
++
++				found++;
++				break;
++			}
++		}
++		if (found) {
++			DEBUG9(printk("%s(%ld): inst=%ld found host device; "
++			    "loop_id=%x.\n",
++			    __func__, ha->host_no, ha->instance,
++			    fcinitiator->loop_id);)
++
++			dev_found = HOST_DEV;
++			dev_loop_id = fcinitiator->loop_id;
++			break;
++		}
++
++		break;
++
++	case EXT_DEF_TYPE_PORTID:
++		DEBUG9(printk("%s(%ld): inst=%ld got port ID.\n",
++		    __func__, ha->host_no, ha->instance);)
++
++		/* PORTID bytes entered must already be big endian */
++		fcport = NULL;
++		list_for_each(fcpl, &ha->fcports) {
++			fcport = list_entry(fcpl, fc_port_t, list);
++
++			/* if removed or missing */
++			if (atomic_read(&fcport->state) == FC_ONLINE &&
++			    memcmp((void *)&tmp_rnid->Addr.FcAddr.Id[1],
++			    (void *)(fcport->d_id.r.d_id),
++			    EXT_DEF_PORTID_SIZE_ACTUAL) == 0) {
++				break;
++			}
++		}
++		if (fcport != NULL) {
++			DEBUG9(printk("%s(%ld): inst=%ld found tgt dev; "
++			    "loop_id=%x.\n",
++			    __func__, ha->host_no, ha->instance,
++			    fcport->loop_id);)
++
++			dev_found = TGT_DEV; /* target device */
++			dev_loop_id = fcport->loop_id;
++			break;
++		}
++
++		found = 0;
++		fcinitiator = NULL;
++		list_for_each(fcil, &ha->fcinitiators) {
++			fcinitiator = list_entry(fcil, fc_initiator_t, list);
++
++			if (memcmp(&tmp_rnid->Addr.FcAddr.Id[1],
++				&fcinitiator->d_id,
++				EXT_DEF_PORTID_SIZE_ACTUAL) == 0) {
++
++				found++;
++				break;
++			}
++		}
++		if (found) {
++			DEBUG9(printk("%s(%ld): inst=%ld found host device; "
++			    "loop_id=%x.\n",
++			    __func__, ha->host_no, ha->instance,
++			    fcinitiator->loop_id);)
++
++			dev_found = HOST_DEV;
++			dev_loop_id = fcinitiator->loop_id;
++			break;
++		}
++
++		break;
++	default:
++		/* parameter error */
++		pext->Status = EXT_STATUS_INVALID_PARAM;
++		DEBUG9_10(printk("%s(%ld): inst=%ld invalid addressing type.\n",
++		    __func__, ha->host_no, ha->instance);)
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return (ret);
++	}
++
++	if (!dev_found ||
++	    (dev_found == TGT_DEV && dev_loop_id > LAST_SNS_LOOP_ID)) {
++		/* No matching device or the target device is not
++		 * configured; just return error.
++		 */
++		pext->Status = EXT_STATUS_DEV_NOT_FOUND;
++		DEBUG9_10(printk(
++		    "%s(%ld): inst=%ld device not found. dev_found=%d "
++		    "dev_loop_id=%x.\n",
++		    __func__, ha->host_no, ha->instance, dev_found,
++		    dev_loop_id);)
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return (ret);
++	}
++
++	/* check on loop down */
++	if (ha->loop_state != LOOP_READY || 
++	    test_bit(CFG_ACTIVE, &ha->cfg_flags) ||
++	    (test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)) ||
++	    ABORTS_ACTIVE || ha->dpc_active) {
++
++		pext->Status = EXT_STATUS_BUSY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld loop not ready.\n",
++		    __func__, ha->host_no, ha->instance);)
++
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return (ret);
++	}
++
++	/* Check whether we need to login first. */
++	if (dev_found == HOST_DEV && dev_loop_id > LAST_SNS_LOOP_ID) {
++		/*
++		 * Search for a usable loop ID before try to login to it.
++		 */
++		if ((dev_loop_id &= ~PORT_LOST_ID) > LAST_SNS_LOOP_ID) {
++			/* Just start searching from first possible ID. */
++			dev_loop_id = ha->min_external_loopid;
++		}
++		for (;;) {
++			if (ha->fabricid[dev_loop_id].in_use == TRUE) {
++				dev_loop_id++;
++			} else {
++				ha->fabricid[dev_loop_id].in_use = TRUE;
++				break;
++			}
++		}
++
++		DEBUG9(printk("%s(%ld): inst=%ld try relogin to host dev; "
++		    "dev_loop_id=%x.\n",
++		    __func__, ha->host_no, ha->instance, dev_loop_id);)
++
++		for (;;) {
++			if (dev_loop_id > LAST_SNS_LOOP_ID) {
++				/* error */
++				DEBUG10(printk("%s(%ld): inst=%ld "
++				    "no valid loop_id for login.\n",
++				    __func__, ha->host_no, ha->instance);)
++
++				break;
++			}
++
++			qla2x00_login_fabric(ha, 
++			    dev_loop_id,
++			    fcinitiator->d_id.b.domain,
++			    fcinitiator->d_id.b.area,
++			    fcinitiator->d_id.b.al_pa,
++			    &mb[0], 0);
++
++			if (mb[0] != MBS_CMD_CMP &&
++			    mb[0] != MBS_PORT_ID_IN_USE &&
++			    mb[0] != MBS_LOOP_ID_IN_USE) {
++
++	 			DEBUG10(printk("%s(%ld): inst=%ld "
++				    "ERROR login mb[0]=%x mb[1]=%x.\n",
++				    __func__, ha->host_no, ha->instance,
++				    mb[0], mb[1]);)
++				break;
++			}
++
++			if (mb[0] == MBS_CMD_CMP) {
++				DEBUG9(printk("%s(%ld): inst=%ld host login "
++				    "success; loop_id=%x.\n",
++				    __func__, ha->host_no, ha->instance,
++				    dev_loop_id);)
++
++				fcinitiator->loop_id = dev_loop_id;
++				break;
++			} else if (mb[0] == MBS_PORT_ID_IN_USE) {
++				ha->fabricid[dev_loop_id].in_use = FALSE;
++				dev_loop_id = mb[1];
++
++				DEBUG9(printk("%s(%ld): inst=%ld "
++				    "port %02x%02x%02x using loop id=0x%04x.\n",
++				    __func__, ha->host_no, ha->instance,
++				    fcinitiator->d_id.b.domain,
++				    fcinitiator->d_id.b.area,
++				    fcinitiator->d_id.b.al_pa,
++				    dev_loop_id);)
++
++				if (dev_loop_id <= LAST_SNS_LOOP_ID)
++					ha->fabricid[dev_loop_id].in_use = TRUE;
++				else
++					/* Error */
++					break;
++
++			} else if (mb[0] == MBS_LOOP_ID_IN_USE) {
++				/* Search for another usable loop_id */
++				dev_loop_id++;
++				while (ha->fabricid[dev_loop_id].in_use) {
++					if (dev_loop_id++ > LAST_SNS_LOOP_ID) {
++						/* Error */
++						break;
++					}
++				}
++
++				if (dev_loop_id <= LAST_SNS_LOOP_ID) {
++					DEBUG9(printk(
++					    "%s(%ld): inst=%ld previous loop "
++					    "id in use. Retry with 0x%04x.\n",
++					    __func__, ha->host_no, ha->instance,
++					    dev_loop_id);)
++
++					ha->fabricid[dev_loop_id].in_use = TRUE;
++				} else {
++					/* Error */
++					break;
++				}
++			}
++		}
++
++		if (mb[0] != MBS_CMD_CMP) {
++			pext->Status = EXT_STATUS_ERR;
++			DEBUG9_10(printk( "%s(%ld): inst=%ld login failed.\n",
++			    __func__, ha->host_no, ha->instance);)
++
++			qla2x00_free_ioctl_scrap_mem(ha);
++			return (ret);
++		}
++	}
++
++	/* Send command */
++	DEBUG9(printk("%s(%ld): inst=%ld sending rnid cmd.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	ret = qla2x00_send_rnid_mbx(ha, dev_loop_id,
++	    (uint8_t)tmp_rnid->DataFormat, ha->ioctl_mem_phys,
++	    SEND_RNID_RSP_SIZE, &mb[0]);
++
++	if (ret != QLA2X00_SUCCESS) {
++		/* error */
++		pext->Status = EXT_STATUS_ERR;
++
++                DEBUG9_10(printk("%s(%ld): inst=%ld FAILED. rval = %x.\n",
++                    __func__, ha->host_no, ha->instance, mb[0]);)
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return (ret);
++	}
++
++	DEBUG9(printk("%s(%ld): inst=%ld rnid cmd sent ok.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	/* Copy the response */
++	copy_len = (pext->ResponseLen > SEND_RNID_RSP_SIZE) ?
++	    SEND_RNID_RSP_SIZE : pext->ResponseLen;
++
++	ret = verify_area(VERIFY_WRITE, (void  *)pext->ResponseAdr,
++	    copy_len);
++
++	if (ret != 0) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk(
++		    "%s(%ld): inst=%ld rsp buf verify WRITE error\n",
++		    __func__, ha->host_no, ha->instance);)
++	} else {
++		ret = copy_to_user((uint8_t *)pext->ResponseAdr,
++		    (uint8_t *)ha->ioctl_mem, copy_len);
++		if (ret) {
++			pext->Status = EXT_STATUS_COPY_ERR;
++			DEBUG9_10(printk(
++			    "%s(%ld): inst=%ld ERROR copy rsp buf\n",
++			    __func__, ha->host_no, ha->instance);)
++			qla2x00_free_ioctl_scrap_mem(ha);
++			return (ret);
++		}
++
++		if (SEND_RNID_RSP_SIZE > pext->ResponseLen) {
++			pext->Status = EXT_STATUS_DATA_OVERRUN;
++			DEBUG9(printk("%s(%ld): inst=%ld data overrun. "
++			    "exiting normally.\n",
++			    __func__, ha->host_no, ha->instance);)
++		} else {
++			pext->Status = EXT_STATUS_OK;
++			DEBUG9(printk("%s(%ld): inst=%ld exiting normally.\n",
++			    __func__, ha->host_no, ha->instance);)
++		}
++		pext->ResponseLen = copy_len;
++	}
++
++	qla2x00_free_ioctl_scrap_mem(ha);
++	return (ret);
++}
++
++/*
++ * qla2x00_get_rnid_params
++ *	IOCTL to get RNID parameters of the adapter.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	pext = User space CT arguments pointer.
++ *	mode = flags.
++ *
++ * Returns:
++ *	0 = success
++ *	others = errno value
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_get_rnid_params(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
++{
++	int		ret = 0;
++	int		tmp_rval = 0;
++	uint32_t	copy_len;
++	uint16_t	mb[MAILBOX_REGISTER_COUNT];
++
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	/* check on loop down */
++	if (ha->loop_state != LOOP_READY || 
++	    test_bit(CFG_ACTIVE, &ha->cfg_flags) ||
++	    (test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)) ||
++	    ABORTS_ACTIVE || ha->dpc_active) {
++
++		pext->Status = EXT_STATUS_BUSY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld loop not ready.\n",
++		    __func__, ha->host_no, ha->instance);)
++
++		return (ret);
++	}
++
++	/* Send command */
++	tmp_rval = qla2x00_get_rnid_params_mbx(ha, ha->ioctl_mem_phys,
++	    sizeof(EXT_RNID_DATA), &mb[0]);
++
++	if (tmp_rval != QLA2X00_SUCCESS) {
++		/* error */
++		pext->Status = EXT_STATUS_ERR;
++
++		DEBUG9_10(printk("%s(%ld): inst=%ld cmd FAILED=%x.\n",
++		    __func__, ha->host_no, ha->instance, mb[0]);)
++		return (ret);
++	}
++
++	/* Copy the response */
++	copy_len = (pext->ResponseLen > sizeof(EXT_RNID_DATA)) ?
++	    (uint32_t)sizeof(EXT_RNID_DATA) : pext->ResponseLen;
++	ret = verify_area(VERIFY_WRITE, (void  *)pext->ResponseAdr,
++	    copy_len);
++
++	if (ret != 0) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst=%ld verify WRITE rsp buf error\n",
++		    __func__, ha->host_no, ha->instance);)
++	} else {
++		ret = copy_to_user((void *)pext->ResponseAdr,
++		    (void *)ha->ioctl_mem, copy_len);
++		if (ret) {
++			pext->Status = EXT_STATUS_COPY_ERR;
++			DEBUG9_10(printk("%s(%ld): inst=%ld ERROR copy rsp buf\n",
++			    __func__, ha->host_no, ha->instance);)
++			return (ret);
++		}
++
++		pext->ResponseLen = copy_len;
++		if (copy_len < sizeof(EXT_RNID_DATA)) {
++			pext->Status = EXT_STATUS_DATA_OVERRUN;
++			DEBUG9_10(printk("%s(%ld): inst=%ld data overrun. "
++			    "exiting normally.\n",
++			    __func__, ha->host_no, ha->instance);)
++ 		} else if (pext->ResponseLen > sizeof(EXT_RNID_DATA)) {
++ 			pext->Status = EXT_STATUS_DATA_UNDERRUN;
++ 			DEBUG9_10(printk("%s(%ld): inst=%ld data underrun. "
++ 			    "exiting normally.\n",
++ 			    __func__, ha->host_no, ha->instance);)
++		} else {
++			pext->Status = EXT_STATUS_OK;
++			DEBUG9(printk("%s(%ld): inst=%ld exiting normally.\n",
++			    __func__, ha->host_no, ha->instance);)
++		}
++	}
++
++	return (ret);
++}
++
++/*
++ * qla2x00_set_host_data
++ *	IOCTL command to set host/adapter related data.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	pext = User space CT arguments pointer.
++ *	mode = flags.
++ *
++ * Returns:
++ *	0 = success
++ *	others = errno value
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_set_host_data(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
++{
++	int	ret = 0;
++
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	/* check on loop down */
++	if (ha->loop_state != LOOP_READY || 
++	    test_bit(CFG_ACTIVE, &ha->cfg_flags) ||
++	    (test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)) ||
++	    ABORTS_ACTIVE || ha->dpc_active) {
++
++		pext->Status = EXT_STATUS_BUSY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld loop not ready.\n",
++		    __func__, ha->host_no, ha->instance);)
++
++		return (ret);
++	}
++
++	/* switch on command subcode */
++	switch (pext->SubCode) {
++	case EXT_SC_SET_RNID:
++		ret = qla2x00_set_rnid_params(ha, pext, mode);
++		break;
++	default:
++		/* function not supported. */
++		pext->Status = EXT_STATUS_UNSUPPORTED_SUBCODE;
++		break;
++	}
++
++	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	return (ret);
++}
++
++/*
++ * qla2x00_set_rnid_params
++ *	IOCTL to set RNID parameters of the adapter.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	pext = User space CT arguments pointer.
++ *	mode = flags.
++ *
++ * Returns:
++ *	0 = success
++ *	others = errno value
++ *
++ * Context:
++ *	Kernel context.
++ */
++static int
++qla2x00_set_rnid_params(scsi_qla_host_t *ha, EXT_IOCTL *pext, int mode)
++{
++	EXT_SET_RNID_REQ	*tmp_set;
++	EXT_RNID_DATA	*tmp_buf;
++	int		ret = 0;
++	int		tmp_rval = 0;
++	uint16_t	mb[MAILBOX_REGISTER_COUNT];
++
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	if (pext->RequestLen != sizeof(EXT_SET_RNID_REQ)) {
++		/* parameter error */
++		pext->Status = EXT_STATUS_INVALID_PARAM;
++		DEBUG9_10(printk("%s(%ld): inst=%ld invalid request length.\n",
++		    __func__, ha->host_no, ha->instance);)
++		return(ret);
++	}
++
++	ret = verify_area(VERIFY_READ, (void *)pext->RequestAdr,
++	    pext->RequestLen);
++
++	if (ret != 0) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk("%s(%ld): inst=%ld verify READ request buf.\n",
++		    __func__, ha->host_no, ha->instance);)
++		return(ret);
++	}
++
++	if (qla2x00_get_ioctl_scrap_mem(ha, (void **)&tmp_set,
++	    sizeof(EXT_SET_RNID_REQ))) {
++		/* not enough memory */
++		pext->Status = EXT_STATUS_NO_MEMORY;
++		DEBUG9_10(printk("%s(%ld): inst=%ld scrap not big enough. "
++		    "size requested=%d.\n",
++		    __func__, ha->host_no, ha->instance,
++		    sizeof(EXT_SET_RNID_REQ));)
++		return (ret);
++	}
++
++	ret = copy_from_user(tmp_set, pext->RequestAdr, pext->RequestLen);
++	if (ret) {
++		pext->Status = EXT_STATUS_COPY_ERR;
++		DEBUG9_10(printk(
++		    "%s(%ld): inst=%ld ERROR copy req buf ret=%d\n", 
++		    __func__, ha->host_no, ha->instance, ret);)
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return(ret);
++	}
++
++	tmp_rval = qla2x00_get_rnid_params_mbx(ha, ha->ioctl_mem_phys,
++	    sizeof(EXT_RNID_DATA), &mb[0]);
++	if (tmp_rval != QLA2X00_SUCCESS) {
++		/* error */
++		pext->Status = EXT_STATUS_ERR;
++
++                DEBUG9_10(printk("%s(%ld): inst=%ld read cmd FAILED=%x.\n",
++                    __func__, ha->host_no, ha->instance, mb[0]);)
++		qla2x00_free_ioctl_scrap_mem(ha);
++		return (ret);
++	}
++
++	tmp_buf = (EXT_RNID_DATA *)ha->ioctl_mem;
++	/* Now set the params. */
++	memcpy(tmp_buf->IPVersion, tmp_set->IPVersion, 2);
++	memcpy(tmp_buf->UDPPortNumber, tmp_set->UDPPortNumber, 2);
++	memcpy(tmp_buf->IPAddress, tmp_set->IPAddress, 16);
++	tmp_rval = qla2x00_set_rnid_params_mbx(ha, ha->ioctl_mem_phys,
++	    sizeof(EXT_RNID_DATA), &mb[0]);
++
++	if (tmp_rval != QLA2X00_SUCCESS) {
++		/* error */
++		pext->Status = EXT_STATUS_ERR;
++
++		DEBUG9_10(printk("%s(%ld): inst=%ld set cmd FAILED=%x.\n",
++		    __func__, ha->host_no, ha->instance, mb[0]);)
++	} else {
++		pext->Status = EXT_STATUS_OK;
++		DEBUG9(printk("%s(%ld): inst=%ld exiting normally.\n",
++		    __func__, ha->host_no, ha->instance);)
++	}
++
++	qla2x00_free_ioctl_scrap_mem(ha);
++	return (ret);
++}
++
++/*
++ * qla2x00_waitq_sem_timeout
++ *	Timeout function to be called when a thread on the wait_q
++ *	queue timed out.
++ *
++ * Input:
++ *	data = data pointer for timeout function.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++static void
++qla2x00_waitq_sem_timeout(unsigned long data)
++{
++	wait_q_t *tmp_ptr = (wait_q_t *)data;
++
++	DEBUG9(printk("%s: entered.\n", __func__);)
++
++	if (tmp_ptr != NULL) {
++		DEBUG9(printk("%s: wait_q thread=%p.\n", __func__, tmp_ptr);)
++		up(&tmp_ptr->wait_q_sem);
++	}
++
++	DEBUG9(printk("%s: exiting.\n", __func__);)
++
++}
++
++/*
++ * qla2x00_get_ioctl_access
++ *	Serialization routine for the ioctl commands.
++ *	When succeeded the exiting thread gains "access" and
++ *	proceeds, otherwise it gives up and returns error.
++ *	Each thread would wait tov seconds before giving up.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	tov = timeout value in seconds
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++static uint8_t
++qla2x00_get_ioctl_access(scsi_qla_host_t *ha, uint32_t tov)
++{
++	int		prev_val = 1;
++	uint8_t		rval = QL_STATUS_SUCCESS;
++	unsigned long	cpu_flags;
++	struct timer_list	tmp_access_timer;
++	wait_q_t	*ptmp_wq = NULL;
++
++
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	while (1) {
++		if (test_bit(IOCTL_WANT, (void *)&(ha->ioctl->access_bits)) ==
++		    0) {
++
++			DEBUG9(printk("%s(%ld): going to test access_bits.\n",
++			    __func__, ha->host_no);)
++
++			/* No one else is waiting. Go ahead and try to
++			 * get access.
++			 */
++			if ((prev_val = test_and_set_bit(IOCTL_ACTIVE,
++			    (void *)&ha->ioctl->access_bits)) == 0) {
++				break;
++			}
++		}
++
++		/* wait for previous command to finish */
++		DEBUG9(printk("%s(%ld): inst=%ld access_bits=%x. busy. "
++		    "Waiting for access. curr time=0x%lx.\n",
++		    __func__, ha->host_no, ha->instance,
++		    ha->ioctl->access_bits, jiffies);)
++
++		/*
++		 * Init timer and get semaphore from wait_q. if we got valid
++		 * semaphore pointer the IOCTL_WANT flag would also had
++		 * been set.
++		 */
++		qla2x00_wait_q_add(ha, &ptmp_wq);
++
++		if (ptmp_wq == NULL) {
++			/* queue full? problem? can't proceed. */
++			DEBUG9_10(printk("%s(%ld): ERROR no more wait_q "
++			    "allowed. exiting.\n", __func__, ha->host_no);)
++
++			break;
++		}
++
++		init_timer(&tmp_access_timer);
++
++		tmp_access_timer.data = (unsigned long)ptmp_wq;
++		tmp_access_timer.function =
++		    (void (*)(unsigned long))qla2x00_waitq_sem_timeout;
++		tmp_access_timer.expires = jiffies + tov * HZ;
++
++		DEBUG9(printk("%s(%ld): adding timer. "
++		    "curr time=0x%lx timeoutval=0x%lx.\n",
++		    __func__, ha->host_no, jiffies, tmp_access_timer.expires);)
++
++		/* wait. */
++		add_timer(&tmp_access_timer);
++
++		DEBUG9(printk("%s(%ld): inst=%ld wait_q %p going to sleep. "
++		    "current time=0x%lx.\n",
++		    __func__, ha->host_no, ha->instance, ptmp_wq, jiffies);)
++
++		down_interruptible(&ptmp_wq->wait_q_sem);
++
++		DEBUG9(printk("%s(%ld): inst=%ld wait_q %p woke up. current "
++		    "time=0x%lx.\n",
++		    __func__, ha->host_no, ha->instance, ptmp_wq, jiffies);)
++
++		del_timer(&tmp_access_timer);
++
++		/* try to get lock again. we'll test later to see
++		 * if we actually got the lock.
++		 */
++		prev_val = test_and_set_bit(IOCTL_ACTIVE,
++		    (void *)&(ha->ioctl->access_bits));
++
++		/*
++		 * After we tried to get access then we check to see
++		 * if we need to clear the IOCTL_WANT flag. Don't clear
++		 * this flag before trying to get access or another
++		 * new thread might grab it before we did.
++		 */
++		spin_lock_irqsave(&ha->ioctl->wait_q_lock, cpu_flags);
++		if (prev_val != 0) {
++			/* We'll return with error.
++			 * Make sure we remove ourselves from wait_q.
++			 */
++			qla2x00_wait_q_remove(ha, ptmp_wq);
++		}
++		if (ha->ioctl->wait_q_head == NULL) {
++			/* We're the last thread in wait_q queue. */
++			clear_bit(IOCTL_WANT, (void *)&ha->ioctl->access_bits);
++		}
++		qla2x00_wait_q_memb_free(ha, ptmp_wq);
++		spin_unlock_irqrestore(&ha->ioctl->wait_q_lock, cpu_flags);
++
++		break;
++	}
++
++	if (prev_val == 0) {
++		/* We got the lock */
++
++		DEBUG9(printk("%s(%ld): inst=%ld got access.\n",
++		    __func__, ha->host_no, ha->instance);)
++
++	} else {
++		/* Timeout or resource error. */
++		DEBUG9_10(printk("%s(%ld): inst=%ld timed out "
++		    "or wait_q error.\n", __func__, ha->host_no, ha->instance);)
++
++		rval = QL_STATUS_TIMEOUT;
++	}
++
++	return (rval);
++}
++
++/*
++ * qla2x00_release_ioctl_access
++ *	Serialization routine for the ioctl commands.
++ *	This releases "access" and checks on wai_q queue. If there's
++ *	another thread waiting then wakes it up.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *	tov = timeout value in seconds
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++static uint8_t
++qla2x00_release_ioctl_access(scsi_qla_host_t *ha)
++{
++	wait_q_t	*next_thread = NULL;
++
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	clear_bit(IOCTL_ACTIVE, (void *)&(ha->ioctl->access_bits));
++
++	/* Wake up one pending ioctl thread in wait_q */
++	qla2x00_wait_q_get_next(ha, &next_thread);
++	if (next_thread) {
++		DEBUG9(printk(
++		    "%s(%ld): inst=%ld found wait_q. Wake up waitq %p\n",
++		    __func__, ha->host_no, ha->instance, &next_thread);)
++		up(&next_thread->wait_q_sem);
++	}
++
++	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	return QL_STATUS_SUCCESS;
++}
++
++/*
++ * qla2x00_wait_q_memb_alloc
++ *	Finds a free wait_q member from the array. Must already got the
++ *	wait_q_lock spinlock.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++static void
++qla2x00_wait_q_memb_alloc(scsi_qla_host_t *ha, wait_q_t **ret_wait_q_memb)
++{
++	uint8_t		i;
++	wait_q_t	*ptmp = NULL;
++
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	for (i = 0; i < MAX_IOCTL_WAIT_THREADS; i++) {
++		if (!(ha->ioctl->wait_q_arr[i].flags & WQ_IN_USE)) {
++			ha->ioctl->wait_q_arr[i].flags |= WQ_IN_USE;
++			ptmp = &ha->ioctl->wait_q_arr[i];
++			break;
++		}
++	}
++
++	*ret_wait_q_memb = ptmp;
++
++	DEBUG9(printk("%s(%ld): inst=%ld return waitq_memb=%p.\n",
++	    __func__, ha->host_no, ha->instance, *ret_wait_q_memb);)
++}
++
++/*
++ * qla2x00_wait_q_memb_free
++ *	Frees the specified wait_q member. Must already got the wait_q_lock
++ *	spinlock.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++static void
++qla2x00_wait_q_memb_free(scsi_qla_host_t *ha, wait_q_t *pfree_wait_q_memb)
++{
++	DEBUG9(printk("%s(%ld): inst=%ld entered.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	if (pfree_wait_q_memb != NULL) {
++		DEBUG9(printk("%s(%ld): freeing %p.\n",
++		    __func__, ha->host_no, pfree_wait_q_memb);)
++		pfree_wait_q_memb->flags &= ~WQ_IN_USE;
++	}
++
++	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
++	    __func__, ha->host_no, ha->instance);)
++}
++
++/*
++ * qla2x00_wait_q_add
++ *	Allocates a wait_q_t struct and add to the wait_q list.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++static uint8_t
++qla2x00_wait_q_add(scsi_qla_host_t *ha, wait_q_t **ret_wq)
++{
++	uint8_t		rval = QL_STATUS_SUCCESS;
++	unsigned long	cpu_flags;
++	wait_q_t	*ptmp = NULL;
++
++	spin_lock_irqsave(&ha->ioctl->wait_q_lock, cpu_flags);
++
++	DEBUG9(printk("%s(%ld): inst=%ld got wait_q spinlock.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	qla2x00_wait_q_memb_alloc(ha, &ptmp);
++	if (ptmp == NULL) {
++		/* can't add any more threads */
++		DEBUG9_10(printk("%s(%ld): inst=%ld ERROR no more ioctl "
++		    "threads allowed.\n",
++		    __func__, ha->host_no, ha->instance);)
++
++		rval = QL_STATUS_RESOURCE_ERROR;
++	} else {
++		if (ha->ioctl->wait_q_tail == NULL) {
++			/* First thread to queue. */
++			set_bit(IOCTL_WANT, (void *)&ha->ioctl->access_bits);
++
++			ha->ioctl->wait_q_head = ptmp;
++		} else {
++			ha->ioctl->wait_q_tail->pnext = ptmp;
++		}
++		ha->ioctl->wait_q_tail = ptmp;
++
++		*ret_wq = ptmp;
++
++		/* Now init the semaphore */
++
++		init_MUTEX_LOCKED(&ptmp->wait_q_sem);
++
++		rval = QL_STATUS_SUCCESS;
++	}
++
++	DEBUG9(printk("%s(%ld): inst=%ld going to release spinlock. "
++	    "ret_wq=%p, rval=%d.\n",
++	    __func__, ha->host_no, ha->instance, *ret_wq, rval);)
++
++	spin_unlock_irqrestore(&ha->ioctl->wait_q_lock, cpu_flags);
++
++	return rval;
++}
++
++/*
++ * qla2x00_wait_q_get_next
++ *	This just removes one member from head of wait_q.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++static void
++qla2x00_wait_q_get_next(scsi_qla_host_t *ha, wait_q_t **ret_wq)
++{
++	unsigned long	cpu_flags;
++
++	if (test_bit(IOCTL_ACTIVE, (void *)&(ha->ioctl->access_bits)) != 0) {
++		/* Another thread just became active. Exit. */
++		*ret_wq = NULL;
++		return;
++	}
++
++	/* Find the next thread to wake up */
++	spin_lock_irqsave(&ha->ioctl->wait_q_lock, cpu_flags);
++
++	DEBUG9(printk("%s(%ld): inst=%ld got wait_q spinlock.\n",
++	    __func__, ha->host_no, ha->instance);)
++
++	/* Remove from head */
++	*ret_wq = ha->ioctl->wait_q_head;
++	if (ha->ioctl->wait_q_head != NULL) {
++
++		ha->ioctl->wait_q_head = ha->ioctl->wait_q_head->pnext;
++
++		if (ha->ioctl->wait_q_head == NULL) {
++			/* That's the last one in queue. */
++			ha->ioctl->wait_q_tail = NULL;
++		}
++
++		(*ret_wq)->pnext = NULL;
++	}
++
++	DEBUG9(printk("%s(%ld): inst=%ld return ret_wq=%p. Going to release "
++	    "spinlock.\n",
++	    __func__, ha->host_no, ha->instance, *ret_wq);)
++	spin_unlock_irqrestore(&ha->ioctl->wait_q_lock, cpu_flags);
++}
++
++/*
++ * qla2x00_wait_q_remove
++ *	Removes the specified member from wait_q.
++ *	Must already got the wait_q_lock spin lock.
++ *
++ * Input:
++ *	ha = adapter state pointer.
++ *
++ * Returns:
++ *	qla2x00 local function return status code.
++ *
++ * Context:
++ *	Kernel context.
++ */
++static void
++qla2x00_wait_q_remove(scsi_qla_host_t *ha, wait_q_t *rem_wq)
++{
++	wait_q_t	*ptmp_wq;
++	wait_q_t	*ptmp_prev;
++
++	DEBUG9(printk("%s(%ld): inst=%ld rem_wq=%p.\n",
++	    __func__, ha->host_no, ha->instance, rem_wq);)
++
++	/* Search then remove */
++	ptmp_prev = NULL;
++	for (ptmp_wq = ha->ioctl->wait_q_head; ptmp_wq != NULL;
++	    ptmp_wq = ptmp_wq->pnext) {
++
++		if (ptmp_wq == rem_wq) {
++			/* Found it in wait_q. Remove. */
++
++			DEBUG9(printk("%s(%ld): inst=%ld removing.\n",
++			    __func__, ha->host_no, ha->instance);)
++
++			if (ha->ioctl->wait_q_head == ptmp_wq) {
++				ha->ioctl->wait_q_head = ptmp_wq->pnext;
++			} else {
++				ptmp_prev->pnext = ptmp_wq->pnext;
++			}
++
++			if (ha->ioctl->wait_q_tail == ptmp_wq) {
++				ha->ioctl->wait_q_tail = ptmp_prev;
++			}
++
++			ptmp_wq->pnext = NULL;
++
++			break;
++		}
++		ptmp_prev = ptmp_wq;
++	}
++
++	DEBUG9(printk("%s(%ld): inst=%ld exiting.\n",
++	    __func__, ha->host_no, ha->instance);)
++}
++
++
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qlfo.h	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,413 @@
++/******************************************************************************
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ ******************************************************************************/
++
++/*
++ * San/Device Management Failover Ioctl Header
++ * File is created to adhere to Solaris requirement using 8-space tabs.
++ *
++ * !!!!! PLEASE DO NOT REMOVE THE TABS !!!!!
++ * !!!!! PLEASE NO SINGLE LINE COMMENTS: // !!!!!
++ * !!!!! PLEASE NO MORE THAN 80 CHARS PER LINE !!!!!
++ *
++ * Revision History:
++ *
++ * Rev. 0.00	August 8, 2000
++ * WTR	- Created.
++ *
++ * Rev. 0.01	August 8, 2000
++ * WTR	- Made size of HbaInstance fields consistant as UINT8.
++ *        Made command codes as 300 upward to be consistant with definitions
++ *        in ExIoct.h.
++ * Rev. 0.01	October 3, 2000
++ * TLE  - Exclusion of ExIoct.h
++ *
++ * Rev. 0.01	October 6, 2000
++ * TLE  - Made size of HbaInstance fields UINT8
++ *
++ * Rev. 0.01	October 10, 2000
++ * TLE  - Add _FO_DRIVER_VERSION data structure
++ */
++
++
++
++#ifndef _FO_H
++#define _FO_H
++
++/*
++ * ***********************************************************************
++ * X OS type definitions
++ * ***********************************************************************
++ */
++#ifdef _MSC_VER						/* NT */
++
++#pragma pack(1)
++#include "qlfont.h"
++
++#elif defined(linux)					/* Linux */
++
++#include "qlfoln.h"
++
++#elif defined(sun) || defined(__sun)			/* Solaris */
++
++#include "qlfoso.h"
++
++#endif
++
++#define SDM_DEF_MAX_DEVICES		16
++#define SDM_DEF_MAX_PATHS_PER_TARGET	4
++#define SDM_DEF_MAX_TARGETS_PER_DEVICE	4
++#define SDM_DEF_MAX_PATHS_PER_DEVICE (SDM_DEF_MAX_PATHS_PER_TARGET * SDM_DEF_MAX_TARGETS_PER_DEVICE)
++
++#define FO_MAX_LUNS_PER_DEVICE	MAX_LUNS_OS
++#define FO_MAX_PATHS (SDM_DEF_MAX_PATHS_PER_DEVICE * SDM_DEF_MAX_DEVICES)
++#define FO_MAX_ADAPTERS		32
++#define FO_ADAPTER_ALL		0xFF
++#define FO_DEF_WWN_SIZE             8
++#define FO_MAX_GEN_INFO_STRING_LEN  32
++
++
++#define FO_NOTIFY_TYPE_NONE                   0
++#define FO_NOTIFY_TYPE_LUN_RESET              1
++#define FO_NOTIFY_TYPE_CDB                    2
++#define FO_NOTIFY_TYPE_LOGOUT_OR_LUN_RESET    3
++#define FO_NOTIFY_TYPE_LOGOUT_OR_CDB          4
++
++#define FO_NOTIFY_TYPE_MIN                FO_NOTIFY_TYPE_NONE
++#define FO_NOTIFY_TYPE_MAX                FO_NOTIFY_TYPE_LOGOUT_OR_CDB
++#define FO_NOTIFY_TYPE_DEF                FO_NOTIFY_TYPE_NONE
++
++#define FO_NOTIFY_CDB_LENGTH_MIN              6
++#define FO_NOTIFY_CDB_LENGTH_MAX             16
++
++/*
++ * IOCTL Commands
++ */
++
++#define FO_CC_GET_PARAMS		        FO_CC_GET_PARAMS_OS
++#define FO_CC_SET_PARAMS		        FO_CC_SET_PARAMS_OS
++#define FO_CC_GET_PATHS		            FO_CC_GET_PATHS_OS
++#define FO_CC_SET_CURRENT_PATH	        FO_CC_SET_CURRENT_PATH_OS
++#define FO_CC_GET_HBA_STAT		        FO_CC_GET_HBA_STAT_OS
++#define FO_CC_RESET_HBA_STAT	        FO_CC_RESET_HBA_STAT_OS
++#define FO_CC_GET_LUN_DATA              FO_CC_GET_LUN_DATA_OS
++#define FO_CC_SET_LUN_DATA              FO_CC_SET_LUN_DATA_OS
++#define FO_CC_GET_TARGET_DATA           FO_CC_GET_TARGET_DATA_OS
++#define FO_CC_SET_TARGET_DATA           FO_CC_SET_TARGET_DATA_OS
++#define FO_CC_GET_FO_DRIVER_VERSION     FO_CC_GET_FO_DRIVER_VERSION_OS
++
++
++/* Systemwide failover parameters. */
++
++typedef struct _FO_PARAMS
++{
++        UINT32      InspectionInterval;     /* Timer interval to check for failover.*/
++        UINT8       MaxPathsPerDevice;	    /* Max paths to any single device. */
++        UINT8       MaxRetriesPerPath;	    /* Max retries on a path before */
++
++        /* Failover. */
++        UINT8       MaxRetriesPerIo;	    /* Max retries per i/o request. */
++        UINT8       Reserved1;
++        UINT32      Flags;			        /* Control flags. */
++        UINT8       DeviceErrorThreshold;   /* Max device errors. */
++        UINT8       DeviceTimeoutThreshold; /* Max device timeouts.*/
++        UINT8       FrameErrorThreshold;    /* Max frame errors.*/
++        UINT8       LinkErrorThreshold;     /* Max link errors.*/
++        UINT32      Reserved2[4];           /* Spares.*/
++
++        /* Load balancing parameters.*/
++
++        UINT8       RollingAverageIntervals;/* Intervals to sum for rolling average.*/
++        UINT8       MaxDevicesToMigrate;    /* Max devices to migrate in any interval.*/
++        UINT8       BalanceMethod;          /* Method to use for load balancing.*/
++        UINT8       Reserved3;              /* Memory alignment.*/
++
++        UINT16      LoadShareMinPercentage; /* Load balancing parameter.*/
++        UINT16      LoadShareMaxPercentage; /* Load balancing parameter.*/
++
++        /* Failover notify parameters. */
++
++        UINT8       FailoverNotifyType;	/* Type of notification. */
++        UINT8       FailoverNotifyCdbLength;/* Length of notification CDB. */
++        UINT16      Reserved4;
++        UINT8       FailoverNotifyCdb[16];	/* CDB if notification by CDB. */
++        UINT32      Reserved5;
++
++}
++FO_PARAMS, *PFO_PARAMS, SysFoParams_t, *SysFoParams_p;
++
++extern SysFoParams_t qla_fo_params;
++
++typedef struct _FO_GET_PATHS
++{
++        UINT8       HbaInstance;
++        EXT_DEST_ADDR HbaAddr;       /* Lun field is ignored */
++        UINT32      Reserved[5];
++
++}
++FO_GET_PATHS, *PFO_GET_PATHS;
++
++
++typedef struct _FO_PATH_ENTRY
++{
++        UINT8   Reserved1;
++        UINT8   Visible;		/* Path is visible path. */
++        UINT8   Priority;
++        UINT8   Reserved2;
++        UINT8   HbaInstance;
++        UINT8   PortName[EXT_DEF_WWN_NAME_SIZE];
++        UINT16  Reserved3;
++        UINT32  Reserved[3];
++
++}
++FO_PATH_ENTRY, *PFO_PATH_ENTRY;
++
++
++typedef struct _FO_PATHS_INFO
++{
++        /* These first fields in the output buffer are specifically the
++         * same as the fields in the input buffer.  This is because the
++         * same system buffer holds both, and this allows us to reference
++         * the input buffer parameters while filling the output buffer. */
++
++        UINT8       HbaInstance;
++        EXT_DEST_ADDR HbaAddr;
++        UINT32      Reserved[5];
++        UINT8       PathCount;          /* Number of Paths in PathEntry array */
++        UINT8       Reserved3;
++        UINT8       VisiblePathIndex;   /* Which index has BOOLEAN "visible" flag set */
++        UINT8       Reserved4;
++
++        UINT8       CurrentPathIndex[FO_MAX_LUNS_PER_DEVICE];   /* Current Path Index for each Lun */
++
++        FO_PATH_ENTRY   PathEntry[FO_MAX_PATHS];
++
++        UINT32      Reserved5[4];
++
++}
++FO_PATHS_INFO, *PFO_PATHS_INFO;
++
++typedef struct _FO_SET_CURRENT_PATH
++{
++        UINT8       HbaInstance;
++        EXT_DEST_ADDR HbaAddr;
++        UINT8       NewCurrentPathIndex;    /* Path index to make current path. */
++        UINT8       FailoverType;           /* Reason for failover. */
++        UINT32      Reserved[3];
++
++}
++FO_SET_CURRENT_PATH, *PFO_SET_CURRENT_PATH;
++
++typedef union _FO_PATHS {
++        FO_GET_PATHS input;
++        FO_SET_CURRENT_PATH set
++                ;
++        FO_PATHS_INFO info;
++} FO_PATHS;
++
++
++typedef struct  _FO_HBA_STAT_INPUT
++{
++        /* The first field in the input buffer is specifically the
++         * same as the field in the output buffer.  This is because the
++         * same system buffer holds both, and this allows us to reference
++         * the input buffer parameters while filling the output buffer. */
++
++        UINT8       HbaInstance;		/* Port number or ADAPTER_ALL. */
++        UINT8       Reserved1[3];
++        UINT32      Reserved2[7];
++
++}
++FO_HBA_STAT_INPUT, *PFO_HBA_STAT_INPUT;
++
++
++typedef struct _FO_HBA_STAT_ENTRY
++{
++        UINT8       HbaInstance;
++        UINT8       Reserved1[3];
++        UINT32      Reserved2;
++        UINT64      IosRequested; /* IOs requested on this adapter. */
++        UINT64      BytesRequested;		/* Bytes requested on this adapter. */
++        UINT64      IosExecuted; /* IOs executed on this adapter. */
++        UINT64      BytesExecuted;		/* Bytes executed on this adapter. */
++        UINT32      Reserved3[22];
++
++}
++FO_HBA_STAT_ENTRY, *PFO_HBA_STAT_ENTRY;
++
++
++typedef struct _FO_HBA_STAT_INFO
++{
++        /* The first fields in the output buffer is specifically the
++         * same as the field in the input buffer.  This is because the
++         * same system buffer holds both, and this allows us to reference
++         * the input buffer parameters while filling the output buffer. */
++
++        UINT8       HbaInstance; /* Port number or ADAPTER_ALL. */
++        UINT8       HbaCount; /* Count of adapters returned. */
++        UINT8       Reserved1[2];
++        UINT32      Reserved2[7];
++
++        FO_HBA_STAT_ENTRY StatEntry[FO_MAX_ADAPTERS];
++
++}
++FO_HBA_STAT_INFO, *PFO_HBA_STAT_INFO;
++
++
++
++/*  The "external" LUN data refers to the LUNs as represented in our
++  configuration utility, where one physical target can support up to
++  2048 LUNs, which are mapped around internally.  This is in comparison
++  to an "internal" LUN data, which is 256 LUNs, after being mapped
++  inside the driver to multiple target slots. */
++
++#define EXTERNAL_LUN_COUNT          2048
++
++/* Structure as used in the IOCTL.*/
++
++typedef struct _FO_EXTERNAL_LUN_DATA_ENTRY
++{
++        UINT8       NodeName[EXT_DEF_WWN_NAME_SIZE];
++        UINT8       PortName[EXT_DEF_WWP_NAME_SIZE];  //sri
++
++        UINT16      LunCount;   /* Entries in Lun Data array. */
++        UINT8       TargetId;
++        UINT8       Dev_No;
++        UINT32      Reserved3;
++        UINT32      Reserved4;
++        UINT32      Reserved5;                     /* Pad to 32-byte header.*/
++
++        UINT8       Data[EXTERNAL_LUN_COUNT];
++}
++FO_EXTERNAL_LUN_DATA_ENTRY, *PFO_EXTERNAL_LUN_DATA_ENTRY;
++
++//  Structure as it is stored in the NT registry.
++
++typedef struct _FO_LUN_DATA_LIST
++{
++        UINT16      Version;                       /* Should be LUN_DATA_REGISTRY_VERSION.*/
++        UINT16      EntryCount;                    /* Count of variable entries following.*/
++        UINT32      Reserved1;
++        UINT32      Reserved2;
++        UINT32      Reserved3;
++        UINT32      Reserved4;
++        UINT32      Reserved5;
++        UINT32      Reserved6;
++        UINT32      Reserved7;                     /* Pad to 32-byte header.*/
++
++        FO_EXTERNAL_LUN_DATA_ENTRY DataEntry[1];   /* Variable-length data.*/
++
++}
++FO_LUN_DATA_LIST, *PFO_LUN_DATA_LIST;
++
++typedef struct  _FO_LUN_DATA_INPUT
++{
++        /* The first field in the input buffer is specifically the
++         * same as the field in the output buffer.  This is because the
++         * same system buffer holds both, and this allows us to reference
++         * the input buffer parameters while filling the output buffer. */
++
++        UINT8       HbaInstance;		/* Port number */
++        UINT8       Reserved1[3];
++        UINT32      Reserved2[7];
++
++}
++FO_LUN_DATA_INPUT, *PFO_LUN_DATA_INPUT;
++
++typedef struct _FO_REQUEST_ADDR
++{
++        UINT8           HbaInstance;
++        EXT_DEST_ADDR   TargetAddr;
++        UINT32          Reserved[5];
++
++}
++FO_REQUEST_ADDR, *PFO_REQUEST_ADDR;
++
++typedef struct  _FO_TARGET_DATA_INPUT
++{
++        UINT8       HbaInstance;		/* Port number */
++        UINT8       Reserved1[3];
++        UINT32      Reserved2[7];
++
++}
++FO_TARGET_DATA_INPUT, *PFO_TARGET_DATA_INPUT;
++
++#define FO_INTERNAL_LUN_COUNT          256
++#define FO_INTERNAL_LUN_BITMASK_BYTES  (FO_INTERNAL_LUN_COUNT / 8)
++
++typedef struct _FO_INTERNAL_LUN_BITMASK
++{
++        UINT8       Bitmask[FO_INTERNAL_LUN_BITMASK_BYTES];
++}
++FO_INTERNAL_LUN_BITMASK, *PFO_INTERNAL_LUN_BITMASK;
++
++typedef struct _FO_DEVICE_DATA
++{
++        UINT32      DeviceFlags;        /* Device flags */
++        UINT16      LoopId;             /* Current loop ID */
++        UINT16      BaseLunNumber;      /* Base LUN number */
++        UINT8       WorldWideName[8];   /* World Wide Name for device */
++        UINT8       PortId[3];          /* Port ID */
++        UINT8       MultipathControl;   /* Multipath control byte. */
++        UINT16      DeviceState;        /* Device state */
++        UINT16      LoginRetryCount;    /* Number of login retries */
++        UINT8       PortName[8];        /* Port name for device */
++        UINT16      TimeoutCount;       /* Command timeout count */
++        UINT8       TargetId;
++        UINT8       Dev_No;
++        FO_INTERNAL_LUN_BITMASK    LunBitmask; /* LUN bitmask */
++}
++FO_DEVICE_DATA, *PFO_DEVICE_DATA;
++
++typedef struct _FO_DEVICE_DATABASE
++{
++        FO_DEVICE_DATA  DeviceData[256];
++}
++FO_DEVICE_DATABASE, *PFO_DEVICE_DATABASE;
++
++typedef struct _FO_DRIVER_VERSION
++{
++        // Numeric version.
++        UINT8       Version;                       // Major version number.
++        UINT8       Revision;                      // Minor version number.
++        UINT8       Subrevision;                   // Subminor version number.
++        UINT8       Reserved1;                      // Memory alignment.
++
++        // String version.
++        UINT8       VersionStr[FO_MAX_GEN_INFO_STRING_LEN];
++
++        // Reserved fields.
++        UINT32      Reserved2[16];
++
++}
++FO_DRIVER_VERSION, *PFO_DRIVER_VERSION;
++
++
++#define FO_LUN_DATA_LIST_MIN_ENTRIES      1
++#define FO_LUN_DATA_LIST_MAX_ENTRIES    256
++#ifdef _WIN64
++#define FO_LUN_DATA_LIST_HEADER_SIZE 32
++#else
++#define FO_LUN_DATA_LIST_HEADER_SIZE offsetof(FO_LUN_DATA_LIST, DataEntry)
++#endif
++
++#define FO_LUN_DATA_LIST_MIN_SIZE (FO_LUN_DATA_LIST_HEADER_SIZE + (sizeof(FO_EXTERNAL_LUN_DATA_ENTRY) * FO_LUN_DATA_LIST_MIN_ENTRIES))
++#define FO_LUN_DATA_LIST_MAX_SIZE (FO_LUN_DATA_LIST_HEADER_SIZE + (sizeof(FO_EXTERNAL_LUN_DATA_ENTRY) * FO_LUN_DATA_LIST_MAX_ENTRIES))
++
++
++#endif	/* ifndef _FO_H */
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qlfolimits.h	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,92 @@
++/******************************************************************************
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ ******************************************************************************/
++
++/*
++ *  Minimums, maximums, defaults, and other definitions for MC_PARAMS.
++ */
++
++#define FO_INSPECTION_INTERVAL_MIN                     0
++#define FO_INSPECTION_INTERVAL_MAX               1000000
++#define FO_INSPECTION_INTERVAL_DEF                   600
++
++#define FO_MAX_PATHS_PER_DEVICE_MIN                    1
++#define FO_MAX_PATHS_PER_DEVICE_MAX                    8
++#define FO_MAX_PATHS_PER_DEVICE_DEF                    8
++
++#define FO_MAX_RETRIES_PER_PATH_MIN                    1
++#define FO_MAX_RETRIES_PER_PATH_MAX                    8
++#define FO_MAX_RETRIES_PER_PATH_DEF                    3
++
++#define FO_MAX_RETRIES_PER_IO_MIN          ((FO_MAX_PATHS_PER_DEVICE_MIN * FO_MAX_RETRIES_PER_PATH_MIN) + 1)
++#define FO_MAX_RETRIES_PER_IO_MAX          ((FO_MAX_PATHS_PER_DEVICE_MAX * FO_MAX_RETRIES_PER_PATH_MAX) + 1)
++#define FO_MAX_RETRIES_PER_IO_DEF          ((FO_MAX_PATHS_PER_DEVICE_DEF * FO_MAX_RETRIES_PER_PATH_DEF) + 1)
++
++#define FO_DEVICE_ERROR_THRESHOLD_MIN                  1
++#define FO_DEVICE_ERROR_THRESHOLD_MAX                255
++#define FO_DEVICE_ERROR_THRESHOLD_DEF                  4
++
++#define FO_DEVICE_TIMEOUT_THRESHOLD_MIN                1
++#define FO_DEVICE_TIMEOUT_THRESHOLD_MAX              255
++#define FO_DEVICE_TIMEOUT_THRESHOLD_DEF                4
++
++#define FO_FRAME_ERROR_THRESHOLD_MIN                   1
++#define FO_FRAME_ERROR_THRESHOLD_MAX                 255
++#define FO_FRAME_ERROR_THRESHOLD_DEF                   4
++
++#define FO_LINK_ERROR_THRESHOLD_MIN                    1
++#define FO_LINK_ERROR_THRESHOLD_MAX                  255
++#define FO_LINK_ERROR_THRESHOLD_DEF                    4
++
++#define FO_ROLLING_AVERAGE_INTERVALS_MIN               1
++#define FO_ROLLING_AVERAGE_INTERVALS_MAX              10
++#define FO_ROLLING_AVERAGE_INTERVALS_DEF               1
++
++#define FO_MAX_DEVICES_TO_MIGRATE_MIN                  0
++#define FO_MAX_DEVICES_TO_MIGRATE_MAX                255
++#define FO_MAX_DEVICES_TO_MIGRATE_DEF                  4
++
++#define FO_BALANCE_METHOD_NONE                         0
++#define FO_BALANCE_METHOD_IOS                          1
++#define FO_BALANCE_METHOD_MBS                          2
++
++#define FO_BALANCE_METHOD_MIN                      FO_BALANCE_METHOD_NONE
++#define FO_BALANCE_METHOD_MAX                      FO_BALANCE_METHOD_MBS
++#define FO_BALANCE_METHOD_DEF                      FO_BALANCE_METHOD_IOS
++
++#define FO_LOAD_SHARE_MIN_PERCENTAGE_MIN              25
++#define FO_LOAD_SHARE_MIN_PERCENTAGE_MAX              99
++#define FO_LOAD_SHARE_MIN_PERCENTAGE_DEF              75
++
++#define FO_LOAD_SHARE_MAX_PERCENTAGE_MIN             101
++#define FO_LOAD_SHARE_MAX_PERCENTAGE_MAX             500
++#define FO_LOAD_SHARE_MAX_PERCENTAGE_DEF             150
++
++#define FO_NOTIFY_TYPE_NONE                   0
++#define FO_NOTIFY_TYPE_LUN_RESET              1
++#define FO_NOTIFY_TYPE_CDB                    2
++#define FO_NOTIFY_TYPE_LOGOUT_OR_LUN_RESET    3
++#define FO_NOTIFY_TYPE_LOGOUT_OR_CDB          4
++
++#define FO_NOTIFY_TYPE_MIN                FO_NOTIFY_TYPE_NONE
++#define FO_NOTIFY_TYPE_MAX                FO_NOTIFY_TYPE_LOGOUT_OR_CDB
++#define FO_NOTIFY_TYPE_DEF                FO_NOTIFY_TYPE_NONE
++
++#define FO_NOTIFY_CDB_LENGTH_MIN              6
++#define FO_NOTIFY_CDB_LENGTH_MAX             16
++
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/qlfoln.h	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,76 @@
++/******************************************************************************
++ *                  QLOGIC LINUX SOFTWARE
++ *
++ * QLogic ISP2x00 device driver for Linux 2.5.x
++ * Copyright (C) 2003 Qlogic Corporation
++ * (www.qlogic.com)
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ ******************************************************************************/
++
++
++#define QLMULTIPATH_MAGIC 'y'
++/********************************************************/
++/* Failover ioctl command codes range from 0xc0 to 0xdf */
++/********************************************************/
++
++
++#define FO_CC_GET_PARAMS_OS             \
++    _IOWR(QLMULTIPATH_MAGIC, 200, sizeof(EXT_IOCTL))	/* 0xc8 */
++#define FO_CC_SET_PARAMS_OS             \
++    _IOWR(QLMULTIPATH_MAGIC, 201, sizeof(EXT_IOCTL))	/* 0xc9 */
++#define FO_CC_GET_PATHS_OS              \
++    _IOWR(QLMULTIPATH_MAGIC, 202, sizeof(EXT_IOCTL))	/* 0xca */
++#define FO_CC_SET_CURRENT_PATH_OS       \
++    _IOWR(QLMULTIPATH_MAGIC, 203, sizeof(EXT_IOCTL))	/* 0xcb */
++#define FO_CC_GET_HBA_STAT_OS           \
++    _IOWR(QLMULTIPATH_MAGIC, 204, sizeof(EXT_IOCTL))	/* 0xcc */
++#define FO_CC_RESET_HBA_STAT_OS         \
++    _IOWR(QLMULTIPATH_MAGIC, 205, sizeof(EXT_IOCTL))	/* 0xcd */
++#define FO_CC_GET_LUN_DATA_OS           \
++    _IOWR(QLMULTIPATH_MAGIC, 206, sizeof(EXT_IOCTL))	/* 0xce */
++#define FO_CC_SET_LUN_DATA_OS           \
++    _IOWR(QLMULTIPATH_MAGIC, 207, sizeof(EXT_IOCTL))	/* 0xcf */
++#define FO_CC_GET_TARGET_DATA_OS        \
++    _IOWR(QLMULTIPATH_MAGIC, 208, sizeof(EXT_IOCTL))	/* 0xd0 */
++#define FO_CC_SET_TARGET_DATA_OS        \
++    _IOWR(QLMULTIPATH_MAGIC, 209, sizeof(EXT_IOCTL))	/* 0xd1 */
++#define FO_CC_GET_FO_DRIVER_VERSION_OS  \
++    _IOWR(QLMULTIPATH_MAGIC, 210, sizeof(EXT_IOCTL))	/* 0xd2 */
++
++
++#define BOOLEAN uint8_t
++#define MAX_LUNS_OS	256
++
++/* Driver attributes bits */
++#define DRVR_FO_ENABLED		0x1	/* bit 0 */
++
++
++/*
++ * Overrides for Emacs so that we almost follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-indent-level: 2
++ * c-brace-imaginary-offset: 0
++ * c-brace-offset: -2
++ * c-argdecl-indent: 2
++ * c-label-offset: -2
++ * c-continued-statement-offset: 2
++ * c-continued-brace-offset: 0
++ * indent-tabs-mode: nil
++ * tab-width: 8
++ * End:
++ */
++
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/release.txt	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,28 @@
++
++                 QLogic QLA2200 and QLA2300 Linux Driver 
++
++                           Release Notes
++			   =============
++
++Version  8.00.00b1	March 05, 2003
++
+++**********************************************+
++* Features supported by this version of driver *
+++**********************************************+
++o FCAL - direct attach
++o Point-to-point 
++o Fabric support 
++o Initiator mode only
++o Fault recovery on down loops
++o Persistent binding - HBA node name valid
++o Linux 2.5.x Kernel Support *ONLY*
++o IPFC support
++
+++********************************+
++* Changes From Previous Releases *
+++********************************+
++o Please view revision.notes file
++ 
+++**************+
++* Known Issues *
+++**************+
+--- /dev/null	Thu Apr 11 07:25:15 2002
++++ linux-2.5.73-n9560/drivers/scsi/qla2xxx/revision.notes	Thu Jul  3 15:34:42 2003
+@@ -0,0 +1,167 @@
++/*
++ * QLogic ISP2200 and ISP2300 Linux Driver Revision List File.
++ *
++ ********************************************************************
++ *
++ * Revision History
++ *
++ *  Rev  8.00.00	May 05, 2003		AV
++ *	- Resync with Linux Kernel 2.5.69.
++ *	- Firmware versions: 2100 TP (1.19.24), 2200 TP (2.02.05),
++ *	  2300 TPX (3.02.10).
++ *
++ *  Rev  8.00.00b1-pre45 April ??, 2003		AV
++ *	- Resync with Linux Kernel 2.5.68-bk11:
++ *	- Fix improper return-code assignment during fabric
++ *	  discovery.
++ *	- Remove additional extraneous #defines from
++ *	  qla_settings.h.
++ *	  - USE_PORTNAME -- FO will always use portname.
++ *	- Default queue depth size set to 64.
++ *
++ *  Rev  8.00.00b1-pre42 April ??, 2003		AV
++ *	- Convert bottom-half tasklet to a work_queue.
++ *	- Initial basic coding of dynamic queue depth handling
++ *	  during QUEUE FULL statuses.
++ *	- Fix mailbox interface problem with
++ *	  qla2x00_get_retry_cnt().
++ *
++ *  Rev  8.00.00b1-pre41 April ??, 2003		AV
++ *	- Convert build defines qla2[1|2|3]00 macros to
++ *	  qla2[1|2|3]xx due to module name stringification clashes.
++ *	- Add additional ISP2322 checks during board configuration.
++ *
++ *  Rev  8.00.00b1-pre40 April ??, 2003		AV
++ *	- Resync with Linux Kernel 2.5.68-bk8:
++ *	  - Updated IRQ handler interface.
++ *	- Add ISP dump code (stub) in case of SYSTEM_ERROR on
++ *	  ISP2100.
++ *	- Add new 2200 IP firmware (2.02.05).
++ *
++ *  Rev  8.00.00b1-pre39 April ??, 2003		AV
++ *	- Resync with Linux Kernel 2.5.68.
++ *	- Add simple build.sh script to aid in external compilation.
++ *	- Clean-break with Kernel 2.4 compatibility.
++ *	  - Rework DPC routine -- completion routines for signaling.
++ *	- Re-add HBAAPI character device node for IOCTL support.
++ *	- Remove residual QLA2X_PERFORMANCE defines.
++ *	- Allocate SP pool via __get_free_pages() rather than
++ *	  individual kmalloc()'s.
++ *	- Inform SCSI mid-layer of 16-byte CDB support
++ *	  (host->max_cmd_len):
++ *	  - Remove unecessary 'more_cdb' handling code from
++ *	    qla_iocb.c and qla_xioct.c.
++ *	- Reduce duplicate code in fabric scanning logic (MS IOCB
++ *	  preparation).
++ *	- Add ISP dump code in case of SYSTEM_ERROR.
++ *	- Remove 2300 VIX firmware from distribution:
++ *	  - Add initial code for IPX support.
++ *	- Add new 2300 TPX firmware (3.02.10).
++ *
++ *  Rev  8.00.00b1-pre34 April ??, 2003		AV
++ *	- Resync with Linux Kernel 2.5.67.
++ *	- Use domain/area/al_pa fields when displaying PortID 
++ *	  values -- addresses endianess issues.
++ *	- Rework large case statement to check 'common' CDB commands
++ *	  early in qla2x00_get_cmd_direction().
++ *
++ *  Rev  8.00.00b1-pre31 April ??, 2003		AV
++ *	- Update makefile to support PPC64 build.
++ *	- Retool NVRAM configuration routine and structures:
++ *	  - Consoldate ISP21xx/ISP22xx/ISP23xx configuration
++ *	    (struct nvram_t).
++ *	  - Remove big/little endian support structures in favor of
++ *	    simplified bit-operations within byte fields.
++ *	- Fix long-standing 'static' buffer sharing problem in 
++ *	  qla2x00_configure_fabric().
++ *
++ *  Rev  8.00.00b1-pre30 April ??, 2003		AV
++ *	- Complete implementation of GID_PT scan.
++ *	- Use consistent MS IOCB invocation method to query SNS:
++ *	  - Add RNN_ID and RSNN_NN registrations in a fabric.
++ *	- Remove unused Mailbox Command 6Eh (Send SNS) support
++ *	  structures.
++ *	- Use 64bit safe IOCBs while issuing INQUIRY and RLC during
++ *	  topology scan.
++ *	- Until reimplementation of fcdev_t/fcport list
++ *	  consolidation, valid loop_id ranges are still limited from
++ *	  0x00 through 0xFF -- enforce this within the code.
++ *
++ *  Rev  8.00.00b1-pre27 March ??, 2003		AV
++ *	- Resync with 6.05.00b9.
++ *	- Retool HBA PCI configuration -- qla2x00_pci_config().
++ *	- Remove inconsistent use of delay routines (UDELAY/SYS*).
++ *	- Continue to teardown/clean/add comments and debug
++ *	  routines.
++ *	- Properly swap bytes of the device's nodename in
++ *	  qla2x00_configure_local_loop().
++ *
++ *  Rev  8.00.00b1-pre25 March ??, 2003		AV
++ *	- Resync with 6.05.00b8.
++ *
++ *  Rev  8.00.00b1-pre23 March ??, 2003		AV
++ *	- Remove (#define) IOCB usage throttling.
++ *	- Abstract interrupt polling with qla2x00_poll().
++ *	- Modify lun scanning logic:
++ *	  - If the device does not support the SCSI Report Luns
++ *	    command, the driver will now only scan from 0 to the
++ *	    max#-luns as defined in the NVRAM (BIOS), rather than
++ *	    blindly scanning from 0 to 255 -- which could result in
++ *	    an increase in startup time when running against slow
++ *	    (JBOD) devices.
++ *	- Rework reset logic in qla2x00_reset_chip() (spec).
++ *
++ *  Rev  8.00.00b1-pre22 March ??, 2003		AV
++ *	- Resync with 6.05.00b7.
++ *	- Cleanup (rewrite) ISR handler.
++ *	- Rename kmem_zalloc --> qla2x00_kmem_zalloc():
++ *	  - This function will eventually be removed.
++ *	- Add new 2300 VIX firmware (3.02.09):
++ *	  - Support for Tape, Fabric, 2K logins, IP, and VI.
++ *
++ *  Rev  8.00.00b1-pre18 March ??, 2003		AV
++ *	- Support 232x type ISPs.
++ *	- Support single firmware for each ISP type:
++ *	  - Restructure brd_info/fw_info methods.
++ *	  - Streamline firmware load process.
++ *	  - Properly query firmware for version information.
++ *	- Remove extraneous scsi_qla_host members:
++ *	  - device_id ==> pdev->device
++ *	- Fix fc4 features (RFF_ID) registration.
++ *	- Convert kmem_zalloc --> qla2x00_kmem_zalloc().
++ *	- Remove unused/extraneous #defines (USE_PORTNAME).
++ *
++ *  Rev  8.00.00b1-pre14 March ??, 2003		AV
++ *	- Resync with 6.05.00b6.
++ *	- Initial source-code restructuring effort.
++ *	  - Build procedure.
++ *	  - Source file layout -- intuitive component layout.
++ *	  - Remove unused #defines (*PERFORMANCE, WORD_FW_LOAD, etc).
++ *	- Add support for 2K logins (TPX -- firmware).
++ *	- Add module parameter ql2xsuspendcount.
++ *	- Add new 2200 IP/TP firmware (2.02.04).
++ *
++ *  Rev  8.00.00b1-pre9	March ??, 2003	RL/DG/RA/AV
++ *	- Use kernel struct list_head for fcport and fclun lists.
++ *	- Remove extraneous (L|M)S_64BITS() and QL21_64*() defines.
++ *
++ *  Rev  8.00.00b1-pre8	February 28, 2003	RL/DG/RA/AV
++ *	- Resync with 6.05.00b3.
++ *
++ *  Rev  8.00.00b1-pre7	February 23, 2003	RL/DG/RA/AV
++ *	- Add alternate fabric scanning logic (GID_PT/GNN_ID/GPN_ID).
++ *	- Remove use of deprecated function check_region().
++ *	- Add new 2300 IP/TP firmware (3.02.08).
++ *
++ *  Rev  8.00.00b1-pre5	January 28, 2003	RL/DG/RA/AV
++ *	- Resync with 6.05.00b3.
++ *	- Consolidate device_reg structure definitions for ISP types.
++ *	- Add support for new queue-depth selection.
++ *	- Add new 2300 IP/TP firmware (3.02.07).
++ *
++ *  Rev  8.00.00b1-pre1	January 17, 2003	AV
++ *	- Initial branch from 6.04.00b8 driver.
++ *	- Remove VMWARE specific code.
++ *	- Add support for pci_driver interface.
++ *
++ ********************************************************************/
+
+_
diff --git a/lustre/kernel_patches/patches/removepage-2.6-suse.patch b/lustre/kernel_patches/patches/removepage-2.6-suse.patch
deleted file mode 100644
index 147816f..0000000
--- a/lustre/kernel_patches/patches/removepage-2.6-suse.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- include/linux/fs.h |    1 +
- mm/filemap.c       |    3 +++
- 2 files changed, 4 insertions(+)
-
-Index: linux-2.6.4-30.1/include/linux/fs.h
-===================================================================
---- linux-2.6.4-30.1.orig/include/linux/fs.h	2004-04-02 03:20:19.000000000 -0500
-+++ linux-2.6.4-30.1/include/linux/fs.h	2004-04-02 03:20:19.000000000 -0500
-@@ -320,6 +320,7 @@
- 	int (*releasepage) (struct page *, int);
- 	int (*direct_IO)(int, struct kiocb *, const struct iovec *iov,
- 			loff_t offset, unsigned long nr_segs);
-+	void (*removepage)(struct page *); /* called when page gets removed from the inode */
- };
- 
- struct backing_dev_info;
-Index: linux-2.6.4-30.1/mm/filemap.c
-===================================================================
---- linux-2.6.4-30.1.orig/mm/filemap.c	2004-04-02 03:19:42.000000000 -0500
-+++ linux-2.6.4-30.1/mm/filemap.c	2004-04-02 03:23:10.000000000 -0500
-@@ -102,6 +102,9 @@
- {
- 	struct address_space *mapping = page_mapping(page);
- 
-+	if (mapping->a_ops->removepage)
-+		mapping->a_ops->removepage(page);
-+
- 	if (likely(!PageSwapCache(page))) {
- 		BUG_ON(PageAnon(page));
- 		radix_tree_delete(&mapping->page_tree, page->index);
diff --git a/lustre/kernel_patches/patches/removepage-2.6.0.patch b/lustre/kernel_patches/patches/removepage-2.6.0.patch
new file mode 100644
index 0000000..268ca97
--- /dev/null
+++ b/lustre/kernel_patches/patches/removepage-2.6.0.patch
@@ -0,0 +1,28 @@
+ include/linux/fs.h |    1 +
+ mm/filemap.c       |    3 +++
+ 2 files changed, 4 insertions(+)
+
+--- linux-2.6.0-test3-l25/include/linux/fs.h~removepage-2.6.0	2003-09-05 15:31:52.000000000 -0700
++++ linux-2.6.0-test3-l25-zab/include/linux/fs.h	2003-09-08 10:47:30.000000000 -0700
+@@ -311,6 +311,7 @@ struct address_space_operations {
+ 	int (*releasepage) (struct page *, int);
+ 	int (*direct_IO)(int, struct kiocb *, const struct iovec *iov,
+ 			loff_t offset, unsigned long nr_segs);
++	void (*removepage)(struct page *); /* called when page gets removed from the inode */
+ };
+ 
+ struct backing_dev_info;
+--- linux-2.6.0-test3-l25/mm/filemap.c~removepage-2.6.0	2003-08-08 21:34:39.000000000 -0700
++++ linux-2.6.0-test3-l25-zab/mm/filemap.c	2003-09-08 10:48:10.000000000 -0700
+@@ -81,6 +81,9 @@ void __remove_from_page_cache(struct pag
+ {
+ 	struct address_space *mapping = page->mapping;
+ 
++	if (mapping->a_ops->removepage)
++		mapping->a_ops->removepage(page);
++
+ 	radix_tree_delete(&mapping->page_tree, page->index);
+ 	list_del(&page->list);
+ 	page->mapping = NULL;
+
+_
diff --git a/lustre/kernel_patches/patches/removepage-vanilla-2.6.5.patch b/lustre/kernel_patches/patches/removepage-vanilla-2.6.5.patch
deleted file mode 100644
index 9cdd51a..0000000
--- a/lustre/kernel_patches/patches/removepage-vanilla-2.6.5.patch
+++ /dev/null
@@ -1,31 +0,0 @@
- include/linux/fs.h |    1 +
- mm/filemap.c       |    3 +++
- 2 files changed, 4 insertions(+)
-
-Index: linux-2.6.4-30.1/include/linux/fs.h
-===================================================================
---- linux-2.6.4-30.1.orig/include/linux/fs.h	2004-04-02 03:20:19.000000000 -0500
-+++ linux-2.6.4-30.1/include/linux/fs.h	2004-04-02 03:20:19.000000000 -0500
-@@ -320,6 +320,7 @@
- 	int (*releasepage) (struct page *, int);
- 	int (*direct_IO)(int, struct kiocb *, const struct iovec *iov,
- 			loff_t offset, unsigned long nr_segs);
-+	void (*removepage)(struct page *); /* called when page gets removed from the inode */
- };
- 
- struct backing_dev_info;
-Index: linux-2.6.4-30.1/mm/filemap.c
-===================================================================
---- linux-2.6.4-30.1.orig/mm/filemap.c	2004-04-02 03:19:42.000000000 -0500
-+++ linux-2.6.4-30.1/mm/filemap.c	2004-04-02 03:23:10.000000000 -0500
-@@ -102,6 +102,9 @@
- {
- 	struct address_space *mapping = page->mapping;
- 
-+	if (mapping->a_ops->removepage)
-+		mapping->a_ops->removepage(page);
-+
- 	radix_tree_delete(&mapping->page_tree, page->index);
-	list_del(&page->list);
- 	page->mapping = NULL;
-
diff --git a/lustre/kernel_patches/patches/revalide-special-oops-2.6.4.suse.patch b/lustre/kernel_patches/patches/revalide-special-oops-2.6.4.suse.patch
deleted file mode 100644
index 3c5ad67..0000000
--- a/lustre/kernel_patches/patches/revalide-special-oops-2.6.4.suse.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- linux-2.6.4-51.0.orig/fs/namei.c	2004-04-06 22:16:14.000000000 +0300
-+++ linux-2.6.4-51.0/fs/namei.c	2004-04-09 16:07:42.856930416 +0300
-@@ -749,10 +749,18 @@ last_component:
-  				nd->flags |= LOOKUP_LAST;
-  				err = revalidate_special(nd);
-  				nd->flags &= ~LOOKUP_LAST;
-- 				if (err)
-+				if (err)
-  					break;
- 				goto return_reval;
- 		}
-+		
-+		if (err) {
-+			if (!nd->dentry->d_inode)
-+				err = -ENOENT;
-+			
-+			goto return_err;			
-+		}
-+		
- 		if (nd->dentry->d_op && nd->dentry->d_op->d_hash) {
- 			err = nd->dentry->d_op->d_hash(nd->dentry, &this);
- 			if (err < 0)
diff --git a/lustre/kernel_patches/patches/tcp-zero-copy-2.4.21-sles8sp3.patch b/lustre/kernel_patches/patches/tcp-zero-copy-2.4.21-sles8sp3.patch
deleted file mode 100644
index a7859bd..0000000
--- a/lustre/kernel_patches/patches/tcp-zero-copy-2.4.21-sles8sp3.patch
+++ /dev/null
@@ -1,458 +0,0 @@
-Index: linux-2.4.21/include/linux/skbuff.h
-===================================================================
---- linux-2.4.21.orig/include/linux/skbuff.h	2004-04-24 02:38:40.000000000 -0400
-+++ linux-2.4.21/include/linux/skbuff.h	2004-04-24 02:47:46.000000000 -0400
-@@ -116,6 +116,30 @@
- 	__u16 size;
- };
- 
-+/* Support for callback when skb data has been released */
-+typedef struct zccd				/* Zero Copy Callback Descriptor */
-+{						/* (embed as first member of custom struct) */
-+	atomic_t	zccd_count;		/* reference count */
-+	void           (*zccd_destructor)(struct zccd *); /* callback when refcount reaches zero */
-+} zccd_t;
-+
-+static inline void zccd_init (zccd_t *d, void (*callback)(zccd_t *))
-+{
-+	atomic_set (&d->zccd_count, 1);
-+	d->zccd_destructor = callback;
-+}
-+
-+static inline void zccd_get (zccd_t *d)		/* take a reference */
-+{
-+	atomic_inc (&d->zccd_count);
-+}
-+
-+static inline void zccd_put (zccd_t *d)		/* release a reference */
-+{
-+	if (atomic_dec_and_test (&d->zccd_count))
-+		(d->zccd_destructor)(d);
-+}
-+
- /* This data is invariant across clones and lives at
-  * the end of the header data, ie. at skb->end.
-  */
-@@ -123,6 +147,12 @@
- 	atomic_t	dataref;
- 	unsigned int	nr_frags;
- 	struct sk_buff	*frag_list;
-+	zccd_t          *zccd;			/* zero copy descriptor */
-+	zccd_t		*zccd2;			/* 2nd zero copy descriptor */
-+	/* NB we expect zero-copy data to be at least 1 packet, so
-+	 * having 2 zccds means we don't unneccessarily split the packet
-+	 * where consecutive zero-copy sends abutt.
-+	 */
- 	skb_frag_t	frags[MAX_SKB_FRAGS];
- };
- 
-Index: linux-2.4.21/include/net/tcp.h
-===================================================================
---- linux-2.4.21.orig/include/net/tcp.h	2004-04-24 02:39:20.000000000 -0400
-+++ linux-2.4.21/include/net/tcp.h	2004-04-24 02:48:27.000000000 -0400
-@@ -646,6 +646,8 @@
- 
- extern int			tcp_sendmsg(struct sock *sk, struct msghdr *msg, int size);
- extern ssize_t			tcp_sendpage(struct socket *sock, struct page *page, int offset, size_t size, int flags);
-+extern ssize_t			tcp_sendpage_zccd(struct socket *sock, struct page *page, int offset, size_t size,
-+						  int flags, zccd_t *zccd);
- 
- extern int			tcp_ioctl(struct sock *sk, 
- 					  int cmd, 
-@@ -742,6 +744,10 @@
- 					    struct msghdr *msg,
- 					    int len, int nonblock, 
- 					    int flags, int *addr_len);
-+extern int                      tcp_recvpackets(struct sock *sk,
-+                                                struct sk_buff_head *packets,
-+                                                int len, int nonblock);
-+
- 
- extern int			tcp_listen_start(struct sock *sk);
- 
-Index: linux-2.4.21/net/netsyms.c
-===================================================================
---- linux-2.4.21.orig/net/netsyms.c	2004-04-24 02:39:13.000000000 -0400
-+++ linux-2.4.21/net/netsyms.c	2004-04-24 02:47:46.000000000 -0400
-@@ -403,6 +403,8 @@
- 
- #endif
- 
-+EXPORT_SYMBOL(tcp_sendpage_zccd);
-+EXPORT_SYMBOL(tcp_recvpackets);
- EXPORT_SYMBOL(tcp_read_sock);
- 
- EXPORT_SYMBOL(netlink_set_err);
-Index: linux-2.4.21/net/core/skbuff.c
-===================================================================
---- linux-2.4.21.orig/net/core/skbuff.c	2004-04-24 02:38:40.000000000 -0400
-+++ linux-2.4.21/net/core/skbuff.c	2004-04-24 02:47:46.000000000 -0400
-@@ -208,6 +208,8 @@
- 	atomic_set(&(skb_shinfo(skb)->dataref), 1);
- 	skb_shinfo(skb)->nr_frags = 0;
- 	skb_shinfo(skb)->frag_list = NULL;
-+	skb_shinfo(skb)->zccd = NULL;		/* skbuffs kick off with NO user zero copy descriptors */
-+	skb_shinfo(skb)->zccd2 = NULL;
- 	return skb;
- 
- nodata:
-@@ -277,6 +279,10 @@
- {
- 	if (!skb->cloned ||
- 	    atomic_dec_and_test(&(skb_shinfo(skb)->dataref))) {
-+		if (skb_shinfo(skb)->zccd != NULL) /* zero copy callback descriptor? */
-+			zccd_put (skb_shinfo(skb)->zccd); /* release hold */
-+		if (skb_shinfo(skb)->zccd2 != NULL) /* 2nd zero copy callback descriptor? */
-+			zccd_put (skb_shinfo(skb)->zccd2); /* release hold */
- 		if (skb_shinfo(skb)->nr_frags) {
- 			int i;
- 			for (i = 0; i < skb_shinfo(skb)->nr_frags; i++)
-@@ -535,6 +541,8 @@
- 	atomic_set(&(skb_shinfo(skb)->dataref), 1);
- 	skb_shinfo(skb)->nr_frags = 0;
- 	skb_shinfo(skb)->frag_list = NULL;
-+	skb_shinfo(skb)->zccd = NULL;		/* copied data => no user zero copy descriptor */
-+	skb_shinfo(skb)->zccd2 = NULL;
- 
- 	/* We are no longer a clone, even if we were. */
- 	skb->cloned = 0;
-@@ -581,6 +589,14 @@
- 	n->data_len = skb->data_len;
- 	n->len = skb->len;
- 
-+	if (skb_shinfo(skb)->zccd != NULL)	/* user zero copy descriptor? */
-+		zccd_get (skb_shinfo(skb)->zccd); /* 1 more ref (pages are shared) */
-+	skb_shinfo(n)->zccd = skb_shinfo(skb)->zccd;
-+
-+	if (skb_shinfo(skb)->zccd2 != NULL)	/* 2nd user zero copy descriptor? */
-+		zccd_get (skb_shinfo(skb)->zccd2); /* 1 more ref (pages are shared) */
-+	skb_shinfo(n)->zccd2 = skb_shinfo(skb)->zccd2;
-+
- 	if (skb_shinfo(skb)->nr_frags) {
- 		int i;
- 
-@@ -623,6 +639,8 @@
- 	u8 *data;
- 	int size = nhead + (skb->end - skb->head) + ntail;
- 	long off;
-+	zccd_t *zccd = skb_shinfo(skb)->zccd;	/* stash user zero copy descriptor */
-+	zccd_t *zccd2 = skb_shinfo(skb)->zccd2;	/* stash 2nd user zero copy descriptor */
- 
- 	if (skb_shared(skb))
- 		BUG();
-@@ -644,6 +662,11 @@
- 	if (skb_shinfo(skb)->frag_list)
- 		skb_clone_fraglist(skb);
- 
-+	if (zccd != NULL)			/* user zero copy descriptor? */
-+		zccd_get (zccd);		/* extra ref (pages are shared) */
-+	if (zccd2 != NULL)			/* 2nd user zero copy descriptor? */
-+		zccd_get (zccd2);		/* extra ref (pages are shared) */
-+
- 	skb_release_data(skb);
- 
- 	off = (data+nhead) - skb->head;
-@@ -658,6 +681,8 @@
- 	skb->nh.raw += off;
- 	skb->cloned = 0;
- 	atomic_set(&skb_shinfo(skb)->dataref, 1);
-+	skb_shinfo(skb)->zccd = zccd;
-+	skb_shinfo(skb)->zccd2 = zccd2;
- 	return 0;
- 
- nodata:
-Index: linux-2.4.21/net/ipv4/tcp.c
-===================================================================
---- linux-2.4.21.orig/net/ipv4/tcp.c	2004-04-24 02:39:21.000000000 -0400
-+++ linux-2.4.21/net/ipv4/tcp.c	2004-04-24 02:50:40.000000000 -0400
-@@ -748,7 +748,7 @@
- 	goto out;
- }
- 
--ssize_t do_tcp_sendpages(struct sock *sk, struct page **pages, int poffset, size_t psize, int flags);
-+ssize_t do_tcp_sendpages(struct sock *sk, struct page **pages, int poffset, size_t psize, int flags, zccd_t *zccd);
- 
- static inline int
- can_coalesce(struct sk_buff *skb, int i, struct page *page, int off)
-@@ -827,7 +827,7 @@
- 	return err;
- }
- 
--ssize_t do_tcp_sendpages(struct sock *sk, struct page **pages, int poffset, size_t psize, int flags)
-+ssize_t do_tcp_sendpages(struct sock *sk, struct page **pages, int poffset, size_t psize, int flags, zccd_t *zccd)
- {
- 	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
- 	int mss_now;
-@@ -875,6 +875,17 @@
- 			copy = size;
- 
- 		i = skb_shinfo(skb)->nr_frags;
-+
-+		if (zccd != NULL &&		/* this is a zcc I/O */
-+		    skb_shinfo(skb)->zccd != NULL && /* skb is part of a zcc I/O */
-+		    skb_shinfo(skb)->zccd2 != NULL &&
-+		    skb_shinfo(skb)->zccd != zccd && /* not the same one */
-+		    skb_shinfo(skb)->zccd2 != zccd)
-+		{
-+			tcp_mark_push (tp, skb);
-+			goto new_segment;
-+		}
-+
- 		if (can_coalesce(skb, i, page, offset)) {
- 			skb_shinfo(skb)->frags[i-1].size += copy;
- 		} else if (i < MAX_SKB_FRAGS) {
-@@ -885,6 +896,20 @@
- 			goto new_segment;
- 		}
- 
-+		if (zccd != NULL &&	/* this is a zcc I/O */
-+		    skb_shinfo(skb)->zccd != zccd && /* not already referencing this zccd */
-+		    skb_shinfo(skb)->zccd2 != zccd)
-+		{
-+			zccd_get (zccd);	/* bump ref count */
-+
-+			BUG_TRAP (skb_shinfo(skb)->zccd2 == NULL);
-+
-+			if (skb_shinfo(skb)->zccd == NULL) /* reference this zccd */
-+				skb_shinfo(skb)->zccd = zccd;
-+			else
-+				skb_shinfo(skb)->zccd2 = zccd;
-+		}
-+
- 		skb->len += copy;
- 		skb->data_len += copy;
- 		skb->ip_summed = CHECKSUM_HW;
-@@ -948,7 +973,29 @@
- 
- 	lock_sock(sk);
- 	TCP_CHECK_TIMER(sk);
--	res = do_tcp_sendpages(sk, &page, offset, size, flags);
-+	res = do_tcp_sendpages(sk, &page, offset, size, flags, NULL);
-+	TCP_CHECK_TIMER(sk);
-+	release_sock(sk);
-+	return res;
-+}
-+
-+ssize_t tcp_sendpage_zccd(struct socket *sock, struct page *page, int offset, size_t size,
-+                          int flags, zccd_t *zccd)
-+{
-+        ssize_t res;
-+        struct sock *sk = sock->sk;
-+
-+#define TCP_ZC_CSUM_FLAGS (NETIF_F_IP_CSUM|NETIF_F_NO_CSUM|NETIF_F_HW_CSUM)
-+
-+        if (!(sk->route_caps & NETIF_F_SG) ||   /* caller shouldn't waste her time */
-+            !(sk->route_caps & TCP_ZC_CSUM_FLAGS)) /* on double mapping */
-+                BUG ();
-+
-+        lock_sock(sk);
-+        TCP_CHECK_TIMER(sk);
-+
-+        res = do_tcp_sendpages(sk, &page, 0, size, flags, zccd);
-+
- 	TCP_CHECK_TIMER(sk);
- 	release_sock(sk);
- 	return res;
-@@ -1772,6 +1819,202 @@
- 	goto out;
- }
- 
-+int tcp_recvpackets (struct sock *sk, struct sk_buff_head *packets,
-+		     int len, int nonblock)
-+{
-+	struct tcp_opt *tp = &(sk->tp_pinfo.af_tcp);
-+	int copied;
-+	long timeo;
-+
-+	BUG_TRAP (len > 0);
-+	/*BUG_TRAP ((flags & (MSG_OOB | MSG_PEEK | MSG_TRUNC)) == 0);*/
-+
-+	lock_sock(sk);
-+
-+	TCP_CHECK_TIMER(sk);
-+
-+	copied = -ENOTCONN;
-+	if (sk->state == TCP_LISTEN)
-+		goto out;
-+
-+	copied = 0;
-+	timeo = sock_rcvtimeo(sk, nonblock);
-+
-+	do {
-+		struct sk_buff * skb;
-+		u32 offset;
-+		unsigned long used;
-+		int exhausted;
-+		int eaten;
-+
-+		/* Are we at urgent data? Stop if we have read anything. */
-+		if (copied && tp->urg_data && tp->urg_seq == tp->copied_seq)
-+			break;
-+
-+		/* We need to check signals first, to get correct SIGURG
-+		 * handling. FIXME: Need to check this doesnt impact 1003.1g
-+		 * and move it down to the bottom of the loop
-+		 */
-+		if (signal_pending(current)) {
-+			if (copied)
-+				break;
-+			copied = timeo ? sock_intr_errno(timeo) : -EAGAIN;
-+			break;
-+		}
-+
-+		/* Next get a buffer. */
-+
-+		skb = skb_peek(&sk->receive_queue);
-+
-+		if (skb == NULL)		/* nothing ready */
-+		{
-+			if (copied) {
-+				if (sk->err ||
-+				    sk->state == TCP_CLOSE ||
-+				    (sk->shutdown & RCV_SHUTDOWN) ||
-+				    !timeo ||
-+				    (0))
-+					break;
-+			} else {
-+				if (sk->done)
-+					break;
-+
-+				if (sk->err) {
-+					copied = sock_error(sk);
-+					break;
-+				}
-+
-+				if (sk->shutdown & RCV_SHUTDOWN)
-+					break;
-+
-+				if (sk->state == TCP_CLOSE) {
-+					if (!sk->done) {
-+						/* This occurs when user tries to read
-+						 * from never connected socket.
-+						 */
-+						copied = -ENOTCONN;
-+						break;
-+					}
-+					break;
-+				}
-+
-+				if (!timeo) {
-+					copied = -EAGAIN;
-+					break;
-+				}
-+			}
-+
-+			cleanup_rbuf(sk, copied);
-+			timeo = tcp_data_wait(sk, timeo);
-+			continue;
-+		}
-+
-+		BUG_TRAP (atomic_read (&skb->users) == 1);
-+
-+		exhausted = eaten = 0;
-+
-+		offset = tp->copied_seq - TCP_SKB_CB(skb)->seq;
-+		if (skb->h.th->syn)
-+			offset--;
-+
-+		used = skb->len - offset;
-+
-+		if (tp->urg_data) {
-+			u32 urg_offset = tp->urg_seq - tp->copied_seq;
-+			if (urg_offset < used) {
-+				if (!urg_offset) { /* at urgent date */
-+					if (!sk->urginline) {
-+						tp->copied_seq++; /* discard the single byte of urgent data */
-+						offset++;
-+						used--;
-+					}
-+				} else		/* truncate read */
-+					used = urg_offset;
-+			}
-+		}
-+
-+		BUG_TRAP (used >= 0);
-+		if (len < used)
-+			used = len;
-+
-+		if (used == 0)
-+			exhausted = 1;
-+		else
-+		{
-+			if (skb_is_nonlinear (skb))
-+			{
-+				int   rc = skb_linearize (skb, GFP_KERNEL);
-+
-+				printk ("tcp_recvpackets(): linearising: %d\n", rc);
-+
-+				if (rc)
-+				{
-+					if (!copied)
-+						copied = rc;
-+					break;
-+				}
-+			}
-+
-+			if ((offset + used) == skb->len) /* consuming the whole packet */
-+			{
-+				__skb_unlink (skb, &sk->receive_queue);
-+				dst_release (skb->dst);
-+				skb_orphan (skb);
-+				__skb_pull (skb, offset);
-+				__skb_queue_tail (packets, skb);
-+				exhausted = eaten = 1;
-+			}
-+			else			/* consuming only part of the packet */
-+			{
-+				struct sk_buff *skb2 = skb_clone (skb, GFP_KERNEL);
-+
-+				if (skb2 == NULL)
-+				{
-+					if (!copied)
-+						copied = -ENOMEM;
-+					break;
-+				}
-+
-+				dst_release (skb2->dst);
-+				__skb_pull (skb2, offset);
-+				__skb_trim (skb2, used);
-+				__skb_queue_tail (packets, skb2);
-+			}
-+
-+			tp->copied_seq += used;
-+			copied += used;
-+			len -= used;
-+		}
-+
-+		if (tp->urg_data && after(tp->copied_seq,tp->urg_seq)) {
-+			tp->urg_data = 0;
-+			tcp_fast_path_check(sk, tp);
-+		}
-+
-+		if (!exhausted)
-+			continue;
-+
-+		if (skb->h.th->fin)
-+		{
-+			tp->copied_seq++;
-+			if (!eaten)
-+				tcp_eat_skb (sk, skb);
-+			break;
-+		}
-+
-+		if (!eaten)
-+			tcp_eat_skb (sk, skb);
-+
-+	} while (len > 0);
-+
-+ out:
-+	/* Clean up data we have read: This will do ACK frames. */
-+	cleanup_rbuf(sk, copied);
-+	TCP_CHECK_TIMER(sk);
-+	release_sock(sk);
-+	return copied;
-+}
-+
- /*
-  *	State processing on a close. This implements the state shift for
-  *	sending our FIN frame. Note that we only send a FIN for some
diff --git a/lustre/kernel_patches/patches/uml-2.6.0-fix.patch b/lustre/kernel_patches/patches/uml-2.6.0-fix.patch
new file mode 100644
index 0000000..2910f97
--- /dev/null
+++ b/lustre/kernel_patches/patches/uml-2.6.0-fix.patch
@@ -0,0 +1,19 @@
+ include/asm-um/unistd.h |    2 ++
+ 1 files changed, 2 insertions(+)
+
+diff -puN include/asm-um/unistd.h~uml-2.6.0-fix include/asm-um/unistd.h
+--- linux-2.6.0-test3/include/asm-um/unistd.h~uml-2.6.0-fix	2003-09-04 18:39:45.000000000 +0400
++++ linux-2.6.0-test3-alexey/include/asm-um/unistd.h	2003-09-04 18:39:59.000000000 +0400
+@@ -6,8 +6,10 @@
+ #ifndef _UM_UNISTD_H_
+ #define _UM_UNISTD_H_
+ 
++#ifdef __KERNEL__
+ #include "linux/resource.h"
+ #include "asm/uaccess.h"
++#endif
+ 
+ extern long sys_open(const char *filename, int flags, int mode);
+ extern long sys_dup(unsigned int fildes);
+
+_
diff --git a/lustre/kernel_patches/patches/uml-fix-2.6.3.patch b/lustre/kernel_patches/patches/uml-fix-2.6.3.patch
new file mode 100644
index 0000000..afd7e45
--- /dev/null
+++ b/lustre/kernel_patches/patches/uml-fix-2.6.3.patch
@@ -0,0 +1,13 @@
+Index: linux-2.6.3/arch/i386/kernel/sys_i386.c
+===================================================================
+--- linux-2.6.3.orig/arch/i386/kernel/sys_i386.c	2004-02-23 14:21:03.000000000 -0800
++++ linux-2.6.3/arch/i386/kernel/sys_i386.c	2004-02-23 14:24:38.000000000 -0800
+@@ -56,7 +56,7 @@
+ 	}
+ 
+ 	down_write(&current->mm->mmap_sem);
+-	error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
++	error = do_mmap_pgoff(current->mm, file, addr, len, prot, flags, pgoff);
+ 	up_write(&current->mm->mmap_sem);
+ 
+ 	if (file)
diff --git a/lustre/kernel_patches/patches/uml-patch-2.4.24-1.patch b/lustre/kernel_patches/patches/uml-patch-2.4.23-1.patch
similarity index 98%
rename from lustre/kernel_patches/patches/uml-patch-2.4.24-1.patch
rename to lustre/kernel_patches/patches/uml-patch-2.4.23-1.patch
index ade809d..7e1d17e 100644
--- a/lustre/kernel_patches/patches/uml-patch-2.4.24-1.patch
+++ b/lustre/kernel_patches/patches/uml-patch-2.4.23-1.patch
@@ -1795,7 +1795,7 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/chan_user.c um/arch/um/drive
 + */
 diff -Naur -X ../exclude-files orig/arch/um/drivers/cow.h um/arch/um/drivers/cow.h
 --- orig/arch/um/drivers/cow.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/drivers/cow.h	2004-01-16 03:45:20.000000000 -0500
++++ um/arch/um/drivers/cow.h	2003-12-15 00:32:23.000000000 -0500
 @@ -0,0 +1,41 @@
 +#ifndef __COW_H__
 +#define __COW_H__
@@ -1840,7 +1840,7 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/cow.h um/arch/um/drivers/cow
 + */
 diff -Naur -X ../exclude-files orig/arch/um/drivers/cow_kern.c um/arch/um/drivers/cow_kern.c
 --- orig/arch/um/drivers/cow_kern.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/drivers/cow_kern.c	2004-01-10 05:55:04.000000000 -0500
++++ um/arch/um/drivers/cow_kern.c	2003-10-21 03:26:06.000000000 -0400
 @@ -0,0 +1,630 @@
 +#define COW_MAJOR 60
 +#define MAJOR_NR COW_MAJOR
@@ -1874,7 +1874,7 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/cow_kern.c um/arch/um/driver
 +	unsigned long *bitmap;
 +	unsigned long bitmap_len;
 +	int bitmap_offset;
-+	int data_offset;
++        int data_offset;
 +	devfs_handle_t devfs;
 +	struct semaphore sem;
 +	struct semaphore io_sem;
@@ -1925,10 +1925,10 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/cow_kern.c um/arch/um/driver
 +static int cow_revalidate(kdev_t rdev);
 +
 +static struct block_device_operations cow_blops = {
-+	.open		= cow_open,
-+	.release	= cow_release,
-+	.ioctl		= cow_ioctl,
-+	.revalidate	= cow_revalidate,
++        .open		= cow_open,
++        .release	= cow_release,
++        .ioctl		= cow_ioctl,
++        .revalidate	= cow_revalidate,
 +};
 +
 +/* Initialized in an initcall, and unchanged thereafter */
@@ -2526,7 +2526,7 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/cow_sys.h um/arch/um/drivers
 + */
 diff -Naur -X ../exclude-files orig/arch/um/drivers/cow_user.c um/arch/um/drivers/cow_user.c
 --- orig/arch/um/drivers/cow_user.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/drivers/cow_user.c	2004-01-10 05:56:22.000000000 -0500
++++ um/arch/um/drivers/cow_user.c	2003-11-08 06:29:47.000000000 -0500
 @@ -0,0 +1,375 @@
 +#include <stddef.h>
 +#include <string.h>
@@ -2691,7 +2691,7 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/cow_user.c um/arch/um/driver
 +int write_cow_header(char *cow_file, int fd, char *backing_file, 
 +		     int sectorsize, int alignment, long long *size)
 +{
-+	struct cow_header_v3 *header;
++        struct cow_header_v3 *header;
 +	unsigned long modtime;
 +	int err;
 +
@@ -3708,8 +3708,8 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/harddog_user.c um/arch/um/dr
 + */
 diff -Naur -X ../exclude-files orig/arch/um/drivers/hostaudio_kern.c um/arch/um/drivers/hostaudio_kern.c
 --- orig/arch/um/drivers/hostaudio_kern.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/drivers/hostaudio_kern.c	2004-02-12 05:46:22.000000000 -0500
-@@ -0,0 +1,352 @@
++++ um/arch/um/drivers/hostaudio_kern.c	2003-11-10 00:04:23.000000000 -0500
+@@ -0,0 +1,339 @@
 +/* 
 + * Copyright (C) 2002 Steve Schmidtke 
 + * Licensed under the GPL
@@ -3717,6 +3717,7 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/hostaudio_kern.c um/arch/um/
 +
 +#include "linux/config.h"
 +#include "linux/module.h"
++#include "linux/version.h"
 +#include "linux/init.h"
 +#include "linux/slab.h"
 +#include "linux/fs.h"
@@ -3725,18 +3726,7 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/hostaudio_kern.c um/arch/um/
 +#include "asm/uaccess.h"
 +#include "kern_util.h"
 +#include "init.h"
-+#include "os.h"
-+
-+struct hostaudio_state {
-+	int fd;
-+};
-+
-+struct hostmixer_state {
-+	int fd;
-+};
-+
-+#define HOSTAUDIO_DEV_DSP "/dev/sound/dsp"
-+#define HOSTAUDIO_DEV_MIXER "/dev/sound/mixer"
++#include "hostaudio.h"
 +
 +/* Only changed from linux_main at boot time */
 +char *dsp = HOSTAUDIO_DEV_DSP;
@@ -3794,7 +3784,7 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/hostaudio_kern.c um/arch/um/
 +	if(kbuf == NULL)
 +		return(-ENOMEM);
 +
-+	err = os_read_file(state->fd, kbuf, count);
++        err = hostaudio_read_user(state, kbuf, count, ppos);
 +	if(err < 0)
 +		goto out;
 +
@@ -3825,10 +3815,9 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/hostaudio_kern.c um/arch/um/
 +	if(copy_from_user(kbuf, buffer, count))
 +		goto out;
 +
-+	err = os_write_file(state->fd, kbuf, count);
++        err = hostaudio_write_user(state, kbuf, count, ppos);
 +	if(err < 0)
 +		goto out;
-+	*ppos += err;
 +
 + out:
 +	kfree(kbuf);
@@ -3871,7 +3860,7 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/hostaudio_kern.c um/arch/um/
 +		break;
 +	}
 +
-+	err = os_ioctl_generic(state->fd, cmd, (unsigned long) &data);
++        err = hostaudio_ioctl_user(state, cmd, (unsigned long) &data);
 +
 +	switch(cmd){
 +	case SNDCTL_DSP_SPEED:
@@ -3901,19 +3890,17 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/hostaudio_kern.c um/arch/um/
 +#endif
 +
 +        state = kmalloc(sizeof(struct hostaudio_state), GFP_KERNEL);
-+        if(state == NULL) 
-+		return(-ENOMEM);
++        if(state == NULL) return(-ENOMEM);
 +
 +        if(file->f_mode & FMODE_READ) r = 1;
 +        if(file->f_mode & FMODE_WRITE) w = 1;
 +
-+	ret = os_open_file(dsp, of_set_rw(OPENFLAGS(), r, w), 0);
++        ret = hostaudio_open_user(state, r, w, dsp);
 +        if(ret < 0){
 +		kfree(state);
 +		return(ret);
 +        }
 +
-+	state->fd = ret;
 +        file->private_data = state;
 +        return(0);
 +}
@@ -3921,15 +3908,16 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/hostaudio_kern.c um/arch/um/
 +static int hostaudio_release(struct inode *inode, struct file *file)
 +{
 +        struct hostaudio_state *state = file->private_data;
++        int ret;
 +
 +#ifdef DEBUG
 +        printk("hostaudio: release called\n");
 +#endif
 +
-+	os_close_file(state->fd);
++        ret = hostaudio_release_user(state);
 +        kfree(state);
 +
-+        return(0);
++        return(ret);
 +}
 +
 +/* /dev/mixer file operations */
@@ -3943,7 +3931,7 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/hostaudio_kern.c um/arch/um/
 +        printk("hostmixer: ioctl called\n");
 +#endif
 +
-+	return(os_ioctl_generic(state->fd, cmd, arg));
++        return(hostmixer_ioctl_mixdev_user(state, cmd, arg));
 +}
 +
 +static int hostmixer_open_mixdev(struct inode *inode, struct file *file)
@@ -3962,11 +3950,9 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/hostaudio_kern.c um/arch/um/
 +        if(file->f_mode & FMODE_READ) r = 1;
 +        if(file->f_mode & FMODE_WRITE) w = 1;
 +
-+	ret = os_open_file(mixer, of_set_rw(OPENFLAGS(), r, w), 0);
++        ret = hostmixer_open_mixdev_user(state, r, w, mixer);
 +        
 +        if(ret < 0){
-+		printk("hostaudio_open_mixdev failed to open '%s', err = %d\n",
-+		       dsp, -ret);
 +		kfree(state);
 +		return(ret);
 +        }
@@ -3978,15 +3964,16 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/hostaudio_kern.c um/arch/um/
 +static int hostmixer_release(struct inode *inode, struct file *file)
 +{
 +        struct hostmixer_state *state = file->private_data;
++	int ret;
 +
 +#ifdef DEBUG
 +        printk("hostmixer: release called\n");
 +#endif
 +
-+	os_close_file(state->fd);
++        ret = hostmixer_release_mixdev_user(state);
 +        kfree(state);
 +
-+        return(0);
++        return(ret);
 +}
 +
 +
@@ -4062,6 +4049,144 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/hostaudio_kern.c um/arch/um/
 + * c-file-style: "linux"
 + * End:
 + */
+diff -Naur -X ../exclude-files orig/arch/um/drivers/hostaudio_user.c um/arch/um/drivers/hostaudio_user.c
+--- orig/arch/um/drivers/hostaudio_user.c	1969-12-31 19:00:00.000000000 -0500
++++ um/arch/um/drivers/hostaudio_user.c	2003-10-21 03:26:06.000000000 -0400
+@@ -0,0 +1,134 @@
++/* 
++ * Copyright (C) 2002 Steve Schmidtke 
++ * Licensed under the GPL
++ */
++
++#include <sys/types.h>
++#include <unistd.h>
++#include <errno.h>
++#include "hostaudio.h"
++#include "user_util.h"
++#include "kern_util.h"
++#include "user.h"
++#include "os.h"
++
++/* /dev/dsp file operations */
++
++ssize_t hostaudio_read_user(struct hostaudio_state *state, char *buffer, 
++			    size_t count, loff_t *ppos)
++{
++#ifdef DEBUG
++        printk("hostaudio: read_user called, count = %d\n", count);
++#endif
++
++        return(os_read_file(state->fd, buffer, count));
++}
++
++ssize_t hostaudio_write_user(struct hostaudio_state *state, const char *buffer,
++			     size_t count, loff_t *ppos)
++{
++	ssize_t ret;
++
++#ifdef DEBUG
++        printk("hostaudio: write_user called, count = %d\n", count);
++#endif
++
++        return(os_write_file(state->fd, buffer, count));
++
++        return(ret);
++}
++
++int hostaudio_ioctl_user(struct hostaudio_state *state, unsigned int cmd, 
++			 unsigned long arg)
++{
++#ifdef DEBUG
++        printk("hostaudio: ioctl_user called, cmd = %u\n", cmd);
++#endif
++
++        return(os_ioctl_generic(state->fd, cmd, arg));
++}
++
++int hostaudio_open_user(struct hostaudio_state *state, int r, int w, char *dsp)
++{
++#ifdef DEBUG
++        printk("hostaudio: open_user called\n");
++#endif
++
++        state->fd = os_open_file(dsp, of_set_rw(OPENFLAGS(), r, w), 0);
++
++        if(state->fd < 0) {
++	        printk("hostaudio_open_user failed to open '%s', err = %d\n",
++		       dsp, -state->fd);
++        	return(state->fd); 
++	}
++        
++	return(0);
++}
++
++int hostaudio_release_user(struct hostaudio_state *state)
++{
++#ifdef DEBUG
++        printk("hostaudio: release called\n");
++#endif
++        if(state->fd >= 0){
++		os_close_file(state->fd);
++		state->fd = -1;
++        }
++
++        return(0);
++}
++
++/* /dev/mixer file operations */
++
++int hostmixer_ioctl_mixdev_user(struct hostmixer_state *state, 
++				unsigned int cmd, unsigned long arg)
++{
++#ifdef DEBUG
++        printk("hostmixer: ioctl_user called cmd = %u\n",cmd);
++#endif
++
++	return(os_ioctl_generic(state->fd, cmd, arg));
++}
++
++int hostmixer_open_mixdev_user(struct hostmixer_state *state, int r, int w,
++			       char *mixer)
++{
++#ifdef DEBUG
++        printk("hostmixer: open_user called\n");
++#endif
++
++        state->fd = os_open_file(mixer, of_set_rw(OPENFLAGS(), r, w), 0);
++
++        if(state->fd < 0) {
++	        printk("hostaudio_open_mixdev_user failed to open '%s', "
++		       "err = %d\n", mixer, state->fd);
++        	return(state->fd); 
++	}
++        
++	return(0);
++}
++
++int hostmixer_release_mixdev_user(struct hostmixer_state *state)
++{
++#ifdef DEBUG
++        printk("hostmixer: release_user called\n");
++#endif
++
++        if(state->fd >= 0){
++		os_close_file(state->fd);
++		state->fd = -1;
++        }
++
++        return 0;
++}
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
 diff -Naur -X ../exclude-files orig/arch/um/drivers/line.c um/arch/um/drivers/line.c
 --- orig/arch/um/drivers/line.c	1969-12-31 19:00:00.000000000 -0500
 +++ um/arch/um/drivers/line.c	2003-11-07 03:03:57.000000000 -0500
@@ -4678,7 +4803,7 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/line.c um/arch/um/drivers/li
 + */
 diff -Naur -X ../exclude-files orig/arch/um/drivers/Makefile um/arch/um/drivers/Makefile
 --- orig/arch/um/drivers/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/drivers/Makefile	2004-02-12 03:55:08.000000000 -0500
++++ um/arch/um/drivers/Makefile	2003-11-08 09:58:54.000000000 -0500
 @@ -0,0 +1,97 @@
 +# 
 +# Copyright (C) 2000, 2002, 2003 Jeff Dike (jdike@karaya.com)
@@ -4700,7 +4825,7 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/Makefile um/arch/um/drivers/
 +pcap-libs := -lpcap -L/usr/lib
 +net-objs := net_kern.o net_user.o
 +mconsole-objs := mconsole_kern.o mconsole_user.o
-+hostaudio-objs := hostaudio_kern.o
++hostaudio-objs := hostaudio_kern.o hostaudio_user.o
 +ubd-objs := ubd_kern.o ubd_user.o
 +port-objs := port_kern.o port_user.o
 +harddog-objs := harddog_kern.o harddog_user.o
@@ -5143,8 +5268,8 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/mcast_user.c um/arch/um/driv
 + */
 diff -Naur -X ../exclude-files orig/arch/um/drivers/mconsole_kern.c um/arch/um/drivers/mconsole_kern.c
 --- orig/arch/um/drivers/mconsole_kern.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/drivers/mconsole_kern.c	2004-02-12 03:09:12.000000000 -0500
-@@ -0,0 +1,560 @@
++++ um/arch/um/drivers/mconsole_kern.c	2003-10-21 03:26:06.000000000 -0400
+@@ -0,0 +1,561 @@
 +/*
 + * Copyright (C) 2001 Lennert Buytenhek (buytenh@gnu.org)
 + * Copyright (C) 2001 - 2003 Jeff Dike (jdike@addtoit.com)
@@ -5259,7 +5384,8 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/mconsole_kern.c um/arch/um/d
 +	int len;
 +	char *ptr = req->request.data;
 +	
-+	ptr += strlen("log ");
++	ptr += strlen("log");
++	while(isspace(*ptr)) ptr++;
 +
 +	len = req->len - (ptr - req->request.data);
 +	printk("%.*s", len, ptr);
@@ -5531,8 +5657,8 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/mconsole_kern.c um/arch/um/d
 +	ptr += strlen("sysrq");
 +	while(isspace(*ptr)) ptr++;
 +
-+	mconsole_reply(req, "", 0, 0);
 +	handle_sysrq(*ptr, &current->thread.regs, NULL, NULL);
++	mconsole_reply(req, "", 0, 0);
 +}
 +#else
 +void mconsole_sysrq(struct mc_request *req)
@@ -7619,7 +7745,7 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/port.h um/arch/um/drivers/po
 + */
 diff -Naur -X ../exclude-files orig/arch/um/drivers/port_kern.c um/arch/um/drivers/port_kern.c
 --- orig/arch/um/drivers/port_kern.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/drivers/port_kern.c	2004-01-10 06:18:49.000000000 -0500
++++ um/arch/um/drivers/port_kern.c	2003-10-21 03:26:06.000000000 -0400
 @@ -0,0 +1,303 @@
 +/* 
 + * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
@@ -7844,7 +7970,7 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/port_kern.c um/arch/um/drive
 +	int fd;
 +
 +	while(1){
-+		if(down_interruptible(&port->sem))
++		if(down_interruptible(&port->sem)) 
 +			return(-ERESTARTSYS);
 +
 +		spin_lock(&port->lock);
@@ -9222,8 +9348,8 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/slirp_user.c um/arch/um/driv
 + */
 diff -Naur -X ../exclude-files orig/arch/um/drivers/ssl.c um/arch/um/drivers/ssl.c
 --- orig/arch/um/drivers/ssl.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/drivers/ssl.c	2004-01-10 06:20:17.000000000 -0500
-@@ -0,0 +1,300 @@
++++ um/arch/um/drivers/ssl.c	2003-11-08 02:57:02.000000000 -0500
+@@ -0,0 +1,306 @@
 +/* 
 + * Copyright (C) 2000, 2002 Jeff Dike (jdike@karaya.com)
 + * Licensed under the GPL
@@ -9456,6 +9582,12 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/ssl.c um/arch/um/drivers/ssl
 +
 +static kdev_t ssl_console_device(struct console *c)
 +{
++#if 0 /* This is the 2.5 implementation */
++static struct tty_driver *ssl_console_device(struct console *c, int *index)
++	*index = c->index;
++	return ssl_driver;
++#endif
++
 +	return mk_kdev(TTY_MAJOR, c->index);
 +}
 +
@@ -9930,8 +10062,8 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/tty.c um/arch/um/drivers/tty
 + */
 diff -Naur -X ../exclude-files orig/arch/um/drivers/ubd_kern.c um/arch/um/drivers/ubd_kern.c
 --- orig/arch/um/drivers/ubd_kern.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/drivers/ubd_kern.c	2004-01-21 01:28:43.000000000 -0500
-@@ -0,0 +1,1396 @@
++++ um/arch/um/drivers/ubd_kern.c	2003-12-17 10:48:17.000000000 -0500
+@@ -0,0 +1,1390 @@
 +/* 
 + * Copyright (C) 2000 Jeff Dike (jdike@karaya.com)
 + * Licensed under the GPL
@@ -10411,7 +10543,7 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/ubd_kern.c um/arch/um/driver
 +			printk("ubd_handler - physmem_subst_mapping failed, "
 +			       "err = %d\n", -err);
 +	}
-+
++	
 +	spin_lock(&io_request_lock);
 +	ubd_finish(req.error);
 +	reactivate_fd(thread_fd, UBD_IRQ);	
@@ -10667,17 +10799,12 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/ubd_kern.c um/arch/um/driver
 +
 +static void ubd_close(struct ubd *dev)
 +{
-+	if(ubd_do_mmap)
-+		physmem_forget_descriptor(dev->fd);
 +	os_close_file(dev->fd);
-+	if(dev->cow.file != NULL)
-+		return;
-+
-+	if(ubd_do_mmap)
-+		physmem_forget_descriptor(dev->cow.fd);
-+	os_close_file(dev->cow.fd);
-+	vfree(dev->cow.bitmap);
-+	dev->cow.bitmap = NULL;
++	if(dev->cow.file != NULL) {
++		os_close_file(dev->cow.fd);
++		vfree(dev->cow.bitmap);
++		dev->cow.bitmap = NULL;
++	}
 +}
 +
 +static int ubd_open_dev(struct ubd *dev)
@@ -10720,8 +10847,7 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/ubd_kern.c um/arch/um/driver
 +		err = read_cow_bitmap(dev->fd, dev->cow.bitmap, 
 +				      dev->cow.bitmap_offset, 
 +				      dev->cow.bitmap_len);
-+		if(err < 0) 
-+			goto error;
++		if(err < 0) goto error;
 +
 +		flags = dev->openflags;
 +		flags.w = 0;
@@ -11330,8 +11456,8 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/ubd_kern.c um/arch/um/driver
 + */
 diff -Naur -X ../exclude-files orig/arch/um/drivers/ubd_user.c um/arch/um/drivers/ubd_user.c
 --- orig/arch/um/drivers/ubd_user.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/drivers/ubd_user.c	2004-01-10 06:24:52.000000000 -0500
-@@ -0,0 +1,377 @@
++++ um/arch/um/drivers/ubd_user.c	2003-11-08 07:57:49.000000000 -0500
+@@ -0,0 +1,378 @@
 +/* 
 + * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
 + * Copyright (C) 2001 Ridgerun,Inc (glonnon@ridgerun.com)
@@ -11347,6 +11473,7 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/ubd_user.c um/arch/um/driver
 +#include <netinet/in.h>
 +#include <sys/time.h>
 +#include <sys/socket.h>
++#include <string.h>
 +#include <sys/mman.h>
 +#include <sys/param.h>
 +#include "asm/types.h"
@@ -11394,7 +11521,7 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/ubd_user.c um/arch/um/driver
 +	int err;
 +
 +	err = os_file_modtime(file, &modtime);
-+	if(err < 0){
++  	if(err < 0){
 +		printk("Failed to get modification time of backing file "
 +		       "\"%s\", err = %d\n", file, -err);
 +		return(err);
@@ -11444,17 +11571,17 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/ubd_user.c um/arch/um/driver
 +	__u64 size;
 +	__u32 version, align;
 +	char *backing_file;
-+	int fd, err, sectorsize, same, mode = 0644;
++        int fd, err, sectorsize, same, mode = 0644;
 +
-+	fd = os_open_file(file, *openflags, mode);
-+	if(fd < 0){
++        fd = os_open_file(file, *openflags, mode);
++        if(fd < 0){
 +		if((fd == -ENOENT) && (create_cow_out != NULL))
 +			*create_cow_out = 1;
 +                if(!openflags->w ||
 +                   ((errno != EROFS) && (errno != EACCES))) return(-errno);
 +		openflags->w = 0;
-+		fd = os_open_file(file, *openflags, mode); 
-+		if(fd < 0) 
++                fd = os_open_file(file, *openflags, mode); 
++                if(fd < 0) 
 +			return(fd);
 +        }
 +
@@ -12028,8 +12155,8 @@ diff -Naur -X ../exclude-files orig/arch/um/drivers/xterm_kern.c um/arch/um/driv
 + */
 diff -Naur -X ../exclude-files orig/arch/um/dyn_link.ld.in um/arch/um/dyn_link.ld.in
 --- orig/arch/um/dyn_link.ld.in	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/dyn_link.ld.in	2004-01-10 04:28:44.000000000 -0500
-@@ -0,0 +1,171 @@
++++ um/arch/um/dyn_link.ld.in	2003-10-21 03:26:06.000000000 -0400
+@@ -0,0 +1,172 @@
 +OUTPUT_FORMAT("ELF_FORMAT")
 +OUTPUT_ARCH(ELF_ARCH)
 +ENTRY(_start)
@@ -12040,6 +12167,7 @@ diff -Naur -X ../exclude-files orig/arch/um/dyn_link.ld.in um/arch/um/dyn_link.l
 +{
 +  . = START() + SIZEOF_HEADERS;
 +  .interp         : { *(.interp) }
++  . = ALIGN(4096);
 +  __binary_start = .;
 +  . = ALIGN(4096);		/* Init code and data */
 +  _stext = .;
@@ -13636,8 +13764,8 @@ diff -Naur -X ../exclude-files orig/arch/um/fs/hostfs/Makefile um/arch/um/fs/hos
 +	$(CC) $(CFLAGS_$@) $(USER_CFLAGS) -c -o $@ $<
 diff -Naur -X ../exclude-files orig/arch/um/fs/hppfs/hppfs_kern.c um/arch/um/fs/hppfs/hppfs_kern.c
 --- orig/arch/um/fs/hppfs/hppfs_kern.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/fs/hppfs/hppfs_kern.c	2004-01-08 23:35:58.000000000 -0500
-@@ -0,0 +1,737 @@
++++ um/arch/um/fs/hppfs/hppfs_kern.c	2003-11-08 09:42:49.000000000 -0500
+@@ -0,0 +1,727 @@
 +/* 
 + * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
 + * Licensed under the GPL
@@ -13800,8 +13928,6 @@ diff -Naur -X ../exclude-files orig/arch/um/fs/hppfs/hppfs_kern.c um/arch/um/fs/
 +	ssize_t n;
 +
 +	read = file->f_dentry->d_inode->i_fop->read;
-+	if(read == NULL)
-+		return(-EOPNOTSUPP);
 +
 +	if(!is_user)
 +		set_fs(KERNEL_DS);
@@ -13900,8 +14026,6 @@ diff -Naur -X ../exclude-files orig/arch/um/fs/hppfs/hppfs_kern.c um/arch/um/fs/
 +	int err;
 +
 +	write = proc_file->f_dentry->d_inode->i_fop->write;
-+	if(write == NULL)
-+		return(-EOPNOTSUPP);
 +
 +	proc_file->f_pos = file->f_pos;
 +	err = (*write)(proc_file, buf, len, &proc_file->f_pos);
@@ -14154,8 +14278,6 @@ diff -Naur -X ../exclude-files orig/arch/um/fs/hppfs/hppfs_kern.c um/arch/um/fs/
 +	int err;
 +
 +	readdir = proc_file->f_dentry->d_inode->i_fop->readdir;
-+	if(readdir == NULL)
-+		return(-EOPNOTSUPP);
 +
 +	proc_file->f_pos = file->f_pos;
 +	err = (*readdir)(proc_file, &dirent, hppfs_filldir);
@@ -14214,8 +14336,6 @@ diff -Naur -X ../exclude-files orig/arch/um/fs/hppfs/hppfs_kern.c um/arch/um/fs/
 +		return(err);
 +
 +	readlink = proc_dentry->d_inode->i_op->readlink;
-+	if(readlink == NULL)
-+		return(-EOPNOTSUPP);
 +	n = (*readlink)(proc_dentry, buffer, buflen);
 +
 +	if(proc_file.f_op->release)
@@ -14237,8 +14357,6 @@ diff -Naur -X ../exclude-files orig/arch/um/fs/hppfs/hppfs_kern.c um/arch/um/fs/
 +		return(err);
 +
 +	follow_link = proc_dentry->d_inode->i_op->follow_link;
-+	if(follow_link == NULL)
-+		return(-EOPNOTSUPP);
 +	n = (*follow_link)(proc_dentry, nd);
 +
 +	if(proc_file.f_op->release)
@@ -14775,6 +14893,58 @@ diff -Naur -X ../exclude-files orig/arch/um/include/helper.h um/arch/um/include/
 + * c-file-style: "linux"
 + * End:
 + */
+diff -Naur -X ../exclude-files orig/arch/um/include/hostaudio.h um/arch/um/include/hostaudio.h
+--- orig/arch/um/include/hostaudio.h	1969-12-31 19:00:00.000000000 -0500
++++ um/arch/um/include/hostaudio.h	2003-10-21 03:26:06.000000000 -0400
+@@ -0,0 +1,48 @@
++/* 
++ * Copyright (C) 2002 Steve Schmidtke 
++ * Licensed under the GPL
++ */
++
++#ifndef HOSTAUDIO_H
++#define HOSTAUDIO_H
++
++#define HOSTAUDIO_DEV_DSP "/dev/sound/dsp"
++#define HOSTAUDIO_DEV_MIXER "/dev/sound/mixer"
++
++struct hostaudio_state {
++  int fd;
++};
++
++struct hostmixer_state {
++  int fd;
++};
++
++/* UML user-side protoypes */
++extern ssize_t hostaudio_read_user(struct hostaudio_state *state, char *buffer,
++				   size_t count, loff_t *ppos);
++extern ssize_t hostaudio_write_user(struct hostaudio_state *state, 
++				    const char *buffer, size_t count, 
++				    loff_t *ppos);
++extern int hostaudio_ioctl_user(struct hostaudio_state *state, 
++				unsigned int cmd, unsigned long arg);
++extern int hostaudio_open_user(struct hostaudio_state *state, int r, int w, 
++			       char *dsp);
++extern int hostaudio_release_user(struct hostaudio_state *state);
++extern int hostmixer_ioctl_mixdev_user(struct hostmixer_state *state, 
++				unsigned int cmd, unsigned long arg);
++extern int hostmixer_open_mixdev_user(struct hostmixer_state *state, int r, 
++				      int w, char *mixer);
++extern int hostmixer_release_mixdev_user(struct hostmixer_state *state);
++
++#endif /* HOSTAUDIO_H */
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
 diff -Naur -X ../exclude-files orig/arch/um/include/init.h um/arch/um/include/init.h
 --- orig/arch/um/include/init.h	1969-12-31 19:00:00.000000000 -0500
 +++ um/arch/um/include/init.h	2003-10-21 03:26:06.000000000 -0400
@@ -15461,8 +15631,8 @@ diff -Naur -X ../exclude-files orig/arch/um/include/mconsole_kern.h um/arch/um/i
 + */
 diff -Naur -X ../exclude-files orig/arch/um/include/mem.h um/arch/um/include/mem.h
 --- orig/arch/um/include/mem.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/include/mem.h	2004-01-16 11:14:38.000000000 -0500
-@@ -0,0 +1,29 @@
++++ um/arch/um/include/mem.h	2003-10-21 03:26:06.000000000 -0400
+@@ -0,0 +1,28 @@
 +/* 
 + * Copyright (C) 2002, 2003 Jeff Dike (jdike@addtoit.com)
 + * Licensed under the GPL
@@ -15478,7 +15648,6 @@ diff -Naur -X ../exclude-files orig/arch/um/include/mem.h um/arch/um/include/mem
 +extern int physmem_subst_mapping(void *virt, int fd, __u64 offset, int w);
 +extern int is_remapped(void *virt);
 +extern int physmem_remove_mapping(void *virt);
-+extern void physmem_forget_descriptor(int fd);
 +
 +#endif
 +
@@ -15528,8 +15697,8 @@ diff -Naur -X ../exclude-files orig/arch/um/include/mem_kern.h um/arch/um/includ
 + */
 diff -Naur -X ../exclude-files orig/arch/um/include/mem_user.h um/arch/um/include/mem_user.h
 --- orig/arch/um/include/mem_user.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/include/mem_user.h	2004-01-10 00:11:06.000000000 -0500
-@@ -0,0 +1,81 @@
++++ um/arch/um/include/mem_user.h	2003-12-14 11:16:03.000000000 -0500
+@@ -0,0 +1,82 @@
 +/*
 + * arch/um/include/mem_user.h
 + *
@@ -15581,6 +15750,7 @@ diff -Naur -X ../exclude-files orig/arch/um/include/mem_user.h um/arch/um/includ
 +extern unsigned long host_task_size;
 +extern unsigned long task_size;
 +
++extern void check_devanon(void);
 +extern int init_mem_user(void);
 +extern int create_mem_file(unsigned long len);
 +extern void setup_memory(void *entry);
@@ -16255,8 +16425,8 @@ diff -Naur -X ../exclude-files orig/arch/um/include/syscall_user.h um/arch/um/in
 + */
 diff -Naur -X ../exclude-files orig/arch/um/include/sysdep-i386/checksum.h um/arch/um/include/sysdep-i386/checksum.h
 --- orig/arch/um/include/sysdep-i386/checksum.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/include/sysdep-i386/checksum.h	2004-01-13 23:40:05.000000000 -0500
-@@ -0,0 +1,218 @@
++++ um/arch/um/include/sysdep-i386/checksum.h	2003-10-21 03:26:06.000000000 -0400
+@@ -0,0 +1,217 @@
 +/* 
 + * Licensed under the GPL
 + */
@@ -16265,7 +16435,6 @@ diff -Naur -X ../exclude-files orig/arch/um/include/sysdep-i386/checksum.h um/ar
 +#define __UM_SYSDEP_CHECKSUM_H
 +
 +#include "linux/string.h"
-+#include "asm/uaccess.h"
 +
 +/*
 + * computes the checksum of a memory block at buff, length len,
@@ -16320,7 +16489,7 @@ diff -Naur -X ../exclude-files orig/arch/um/include/sysdep-i386/checksum.h um/ar
 +
 +/*
 + * These are the old (and unsafe) way of doing checksums, a warning message 
-+ * will be printed if they are used and an exception occurs.
++ * will be printed if they are used and an exeption occurs.
 + *
 + * these functions should go away after some time.
 + */
@@ -16583,7 +16752,7 @@ diff -Naur -X ../exclude-files orig/arch/um/include/sysdep-i386/frame_kern.h um/
 + */
 diff -Naur -X ../exclude-files orig/arch/um/include/sysdep-i386/frame_user.h um/arch/um/include/sysdep-i386/frame_user.h
 --- orig/arch/um/include/sysdep-i386/frame_user.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/include/sysdep-i386/frame_user.h	2004-01-14 03:54:47.000000000 -0500
++++ um/arch/um/include/sysdep-i386/frame_user.h	2003-10-21 03:26:06.000000000 -0400
 @@ -0,0 +1,91 @@
 +/* 
 + * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
@@ -16643,26 +16812,26 @@ diff -Naur -X ../exclude-files orig/arch/um/include/sysdep-i386/frame_user.h um/
 + * it would have to be __builtin_frame_address(1).
 + */
 +
-+#define frame_restorer() \
-+({ \
-+	unsigned long *fp; \
-+\
-+	fp = __builtin_frame_address(0); \
-+	((unsigned long) (fp + 1)); \
-+})
++static inline unsigned long frame_restorer(void)
++{
++	unsigned long *fp;
++
++	fp = __builtin_frame_address(0);
++	return((unsigned long) (fp + 1));
++}
 +
 +/* Similarly, this returns the value of sp when the handler was first
 + * entered.  This is used to calculate the proper sp when delivering
 + * signals.
 + */
 +
-+#define frame_sp() \
-+({ \
-+	unsigned long *fp; \
-+\
-+	fp = __builtin_frame_address(0); \
-+	((unsigned long) (fp + 1)); \
-+})
++static inline unsigned long frame_sp(void)
++{
++	unsigned long *fp;
++
++	fp = __builtin_frame_address(0);
++	return((unsigned long) (fp + 1));
++}
 +
 +#endif
 +
@@ -20374,8 +20543,8 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/irq_user.c um/arch/um/kernel/
 + */
 diff -Naur -X ../exclude-files orig/arch/um/kernel/ksyms.c um/arch/um/kernel/ksyms.c
 --- orig/arch/um/kernel/ksyms.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/kernel/ksyms.c	2004-01-23 00:44:09.000000000 -0500
-@@ -0,0 +1,120 @@
++++ um/arch/um/kernel/ksyms.c	2003-12-17 03:22:37.000000000 -0500
+@@ -0,0 +1,119 @@
 +/* 
 + * Copyright (C) 2001 - 2003 Jeff Dike (jdike@addtoit.com)
 + * Licensed under the GPL
@@ -20457,7 +20626,6 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/ksyms.c um/arch/um/kernel/ksy
 +EXPORT_SYMBOL(os_create_unix_socket);
 +EXPORT_SYMBOL(os_connect_socket);
 +EXPORT_SYMBOL(os_accept_connection);
-+EXPORT_SYMBOL(os_ioctl_generic);
 +EXPORT_SYMBOL(os_rcv_fd);
 +EXPORT_SYMBOL(run_helper);
 +EXPORT_SYMBOL(start_thread);
@@ -20575,7 +20743,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/Makefile um/arch/um/kernel/Ma
 +archmrproper: clean
 diff -Naur -X ../exclude-files orig/arch/um/kernel/mem.c um/arch/um/kernel/mem.c
 --- orig/arch/um/kernel/mem.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/kernel/mem.c	2003-12-22 01:25:00.000000000 -0500
++++ um/arch/um/kernel/mem.c	2003-11-13 23:26:35.000000000 -0500
 @@ -0,0 +1,336 @@
 +/* 
 + * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
@@ -20660,7 +20828,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/mem.c um/arch/um/kernel/mem.c
 +	start = (unsigned long) &__binary_start;
 +	if(uml_physmem != start){
 +		map_memory(uml_physmem, __pa(uml_physmem), start - uml_physmem,
-+			   1, 1, 0);
++		    1, 1, 0);
 +	}
 +
 +	/* this will put all low memory onto the freelists */
@@ -20706,7 +20874,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/mem.c um/arch/um/kernel/mem.c
 +	}
 +}
 +
-+#ifdef CONFIG_HIGHMEM
++#if CONFIG_HIGHMEM
 +pte_t *kmap_pte;
 +pgprot_t kmap_prot;
 +
@@ -20915,8 +21083,8 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/mem.c um/arch/um/kernel/mem.c
 + */
 diff -Naur -X ../exclude-files orig/arch/um/kernel/mem_user.c um/arch/um/kernel/mem_user.c
 --- orig/arch/um/kernel/mem_user.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/kernel/mem_user.c	2004-01-10 00:19:09.000000000 -0500
-@@ -0,0 +1,216 @@
++++ um/arch/um/kernel/mem_user.c	2003-12-14 11:30:57.000000000 -0500
+@@ -0,0 +1,217 @@
 +/*
 + * arch/um/kernel/mem_user.c
 + *
@@ -21002,7 +21170,9 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/mem_user.c um/arch/um/kernel/
 +	return(fd);
 +}
 +
-+static int have_devanon(void)
++static int have_devanon = 0;
++
++void check_devanon(void)
 +{
 +	int fd;
 +
@@ -21010,11 +21180,11 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/mem_user.c um/arch/um/kernel/
 +	fd = open("/dev/anon", O_RDWR);
 +	if(fd < 0){
 +		printk("Not available (open failed with errno %d)\n", errno);
-+		return(0);
++		return;
 +	}
 +
 +	printk("OK\n");
-+	return(1);
++	have_devanon = 1;
 +}
 +
 +static int create_anon_file(unsigned long len)
@@ -21042,7 +21212,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/mem_user.c um/arch/um/kernel/
 +{
 +	int err, fd;
 +
-+	if(have_devanon())
++	if(have_devanon)
 +		fd = create_anon_file(len);
 +	else fd = create_tmp_file(len);
 +
@@ -21075,7 +21245,6 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/mem_user.c um/arch/um/kernel/
 +		os_print_error(fd, "parse_iomem - Couldn't open io file");
 +		goto out;
 +	}
-+
 +	err = os_stat_fd(fd, &buf);
 +	if(err < 0){
 +		os_print_error(err, "parse_iomem - cannot stat_fd file");
@@ -21145,8 +21314,8 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/mprot.h um/arch/um/kernel/mpr
 +#endif
 diff -Naur -X ../exclude-files orig/arch/um/kernel/physmem.c um/arch/um/kernel/physmem.c
 --- orig/arch/um/kernel/physmem.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/kernel/physmem.c	2004-01-16 23:38:02.000000000 -0500
-@@ -0,0 +1,446 @@
++++ um/arch/um/kernel/physmem.c	2003-11-14 02:59:20.000000000 -0500
+@@ -0,0 +1,349 @@
 +/* 
 + * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
 + * Licensed under the GPL
@@ -21180,7 +21349,6 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/physmem.c um/arch/um/kernel/p
 +	__u64 offset;
 +	void *virt;
 +	unsigned long phys;
-+	struct list_head list;
 +};
 +
 +struct virtmem_table virtmem_hash;
@@ -21199,59 +21367,16 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/physmem.c um/arch/um/kernel/p
 +DEF_HASH(static, virtmem, struct phys_desc, virt_ptrs, void *, virt, virt_cmp, 
 +	 virt_hash);
 +
-+LIST_HEAD(descriptor_mappings);
-+
-+struct desc_mapping {
-+	int fd;
-+	struct list_head list;
-+	struct list_head pages;
-+};
-+
-+static struct desc_mapping *find_mapping(int fd)
-+{
-+	struct desc_mapping *desc;
-+	struct list_head *ele;
-+
-+	list_for_each(ele, &descriptor_mappings){
-+		desc = list_entry(ele, struct desc_mapping, list);
-+		if(desc->fd == fd)
-+			return(desc);
-+	}
-+
-+	return(NULL);
-+}
-+
-+static struct desc_mapping *descriptor_mapping(int fd)
-+{
-+	struct desc_mapping *desc;
-+
-+	desc = find_mapping(fd);
-+	if(desc != NULL)
-+		return(desc);
-+
-+	desc = kmalloc(sizeof(*desc), GFP_ATOMIC);
-+	if(desc == NULL)
-+		return(NULL);
-+
-+	*desc = ((struct desc_mapping) 
-+		{ .fd =		fd,
-+		  .list =	LIST_HEAD_INIT(desc->list),
-+		  .pages =	LIST_HEAD_INIT(desc->pages) });
-+	list_add(&desc->list, &descriptor_mappings);
-+
-+	return(desc);
-+}
-+
 +int physmem_subst_mapping(void *virt, int fd, __u64 offset, int w)
 +{
-+	struct desc_mapping *fd_maps;
 +	struct phys_desc *desc;
 +	unsigned long phys;
 +	int err;
 +
-+	fd_maps = descriptor_mapping(fd);
-+	if(fd_maps == NULL)
-+		return(-ENOMEM);
++	virt = (void *) ((unsigned long) virt & PAGE_MASK);
++	err = os_map_memory(virt, fd, offset, PAGE_SIZE, 1, w, 0);
++	if(err)
++		goto out;
 +
 +	phys = __pa(virt);
 +	if(find_virtmem_hash(&virtmem_hash, virt) != NULL)
@@ -21262,98 +21387,45 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/physmem.c um/arch/um/kernel/p
 +	if(desc == NULL)
 +		goto out;
 +
-+	*desc = ((struct phys_desc) 
-+		{ .virt_ptrs =	{ NULL, NULL },
-+		  .fd =		fd,
-+		  .offset =		offset,
-+		  .virt =		virt,
-+		  .phys =		__pa(virt),
-+		  .list = 		LIST_HEAD_INIT(desc->list) });
++	*desc = ((struct phys_desc) { .virt_ptrs =	{ NULL, NULL },
++				      .fd =		fd,
++				      .offset =		offset,
++				      .virt =		virt,
++				      .phys =		__pa(virt) });
 +	insert_virtmem_hash(&virtmem_hash, desc);
-+
-+	list_add(&desc->list, &fd_maps->pages);
-+
-+	virt = (void *) ((unsigned long) virt & PAGE_MASK);
-+	err = os_map_memory(virt, fd, offset, PAGE_SIZE, 1, w, 0);
-+	if(!err)
-+		goto out;
-+
-+	remove_virtmem_hash(&virtmem_hash, desc);
-+	kfree(desc);
++	err = 0;
 + out:
 +	return(err);
 +}
 +
 +static int physmem_fd = -1;
 +
-+static void remove_mapping(struct phys_desc *desc)
++int physmem_remove_mapping(void *virt)
 +{
-+	void *virt = desc->virt;
++	struct phys_desc *desc;
 +	int err;
 +
++	virt = (void *) ((unsigned long) virt & PAGE_MASK);
++	desc = find_virtmem_hash(&virtmem_hash, virt);
++	if(desc == NULL)
++		return(0);
++
 +	remove_virtmem_hash(&virtmem_hash, desc);
-+	list_del(&desc->list);
 +	kfree(desc);
 +
 +	err = os_map_memory(virt, physmem_fd, __pa(virt), PAGE_SIZE, 1, 1, 0);
 +	if(err)
 +		panic("Failed to unmap block device page from physical memory, "
 +		      "errno = %d", -err);
-+}
-+
-+int physmem_remove_mapping(void *virt)
-+{
-+	struct phys_desc *desc;
-+
-+	virt = (void *) ((unsigned long) virt & PAGE_MASK);
-+	desc = find_virtmem_hash(&virtmem_hash, virt);
-+	if(desc == NULL)
-+		return(0);
-+
-+	remove_mapping(desc);
 +	return(1);
 +}
 +
-+void physmem_forget_descriptor(int fd)
-+{
-+	struct desc_mapping *desc;
-+	struct phys_desc *page;
-+	struct list_head *ele, *next;
-+	__u64 offset;
-+	void *addr;
-+	int err;
-+
-+	desc = find_mapping(fd);
-+	if(desc == NULL)
-+		return;
-+
-+	list_for_each_safe(ele, next, &desc->pages){
-+		page = list_entry(ele, struct phys_desc, list);
-+		offset = page->offset;
-+		addr = page->virt;
-+		remove_mapping(page);
-+		err = os_seek_file(fd, offset);
-+		if(err)
-+			panic("physmem_forget_descriptor - failed to seek "
-+			      "to %lld in fd %d, error = %d\n",
-+			      offset, fd, -err);
-+		err = os_read_file(fd, addr, PAGE_SIZE);
-+		if(err < 0)
-+			panic("physmem_forget_descriptor - failed to read "
-+			      "from fd %d to 0x%p, error = %d\n",
-+			      fd, addr, -err);
-+	}
-+
-+	list_del(&desc->list);
-+	kfree(desc);
-+}
-+
 +void arch_free_page(struct page *page, int order)
 +{
 +	void *virt;
 +	int i;
 +
-+	for(i = 0; i < (1 << order); i++){
++	for(i = 0; i < 1 << order; i++){
 +		virt = __va(page_to_phys(page + i));
 +		physmem_remove_mapping(virt);
 +	}
@@ -21595,8 +21667,8 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/physmem.c um/arch/um/kernel/p
 + */
 diff -Naur -X ../exclude-files orig/arch/um/kernel/process.c um/arch/um/kernel/process.c
 --- orig/arch/um/kernel/process.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/kernel/process.c	2004-01-31 02:47:57.000000000 -0500
-@@ -0,0 +1,289 @@
++++ um/arch/um/kernel/process.c	2003-11-07 02:09:21.000000000 -0500
+@@ -0,0 +1,288 @@
 +/* 
 + * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
 + * Licensed under the GPL
@@ -21727,8 +21799,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/process.c um/arch/um/kernel/p
 +	if(err < 0) panic("Waiting for outer trampoline failed - errno = %d", 
 +			  errno);
 +	if(!WIFSIGNALED(status) || (WTERMSIG(status) != SIGKILL))
-+		panic("outer trampoline didn't exit with SIGKILL, "
-+		      "status = %d", status);
++		panic("outer trampoline didn't exit with SIGKILL");
 +
 +	return(arg.pid);
 +}
@@ -21830,7 +21901,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/process.c um/arch/um/kernel/p
 +
 +int run_kernel_thread(int (*fn)(void *), void *arg, void **jmp_ptr)
 +{
-+	sigjmp_buf buf;
++	jmp_buf buf;
 +	int n;
 +
 +	*jmp_ptr = &buf;
@@ -24153,8 +24224,8 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/skas/include/skas.h um/arch/u
 + */
 diff -Naur -X ../exclude-files orig/arch/um/kernel/skas/include/uaccess.h um/arch/um/kernel/skas/include/uaccess.h
 --- orig/arch/um/kernel/skas/include/uaccess.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/kernel/skas/include/uaccess.h	2004-01-17 06:35:41.000000000 -0500
-@@ -0,0 +1,40 @@
++++ um/arch/um/kernel/skas/include/uaccess.h	2003-12-17 01:19:45.000000000 -0500
+@@ -0,0 +1,38 @@
 +/* 
 + * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
 + * Licensed under the GPL
@@ -24163,8 +24234,6 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/skas/include/uaccess.h um/arc
 +#ifndef __SKAS_UACCESS_H
 +#define __SKAS_UACCESS_H
 +
-+#include "asm/errno.h"
-+
 +#define access_ok_skas(type, addr, size) \
 +	((segment_eq(get_fs(), KERNEL_DS)) || \
 +	 (((unsigned long) (addr) < TASK_SIZE) && \
@@ -24176,6 +24245,8 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/skas/include/uaccess.h um/arc
 +	return(access_ok_skas(type, addr, size) ? 0 : -EFAULT);
 +}
 +
++#endif
++
 +extern int copy_from_user_skas(void *to, const void *from, int n);
 +extern int copy_to_user_skas(void *to, const void *from, int n);
 +extern int strncpy_from_user_skas(char *dst, const char *src, int count);
@@ -24183,8 +24254,6 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/skas/include/uaccess.h um/arc
 +extern int clear_user_skas(void *mem, int len);
 +extern int strnlen_user_skas(const void *str, int len);
 +
-+#endif
-+
 +/*
 + * Overrides for Emacs so that we follow Linus's tabbing style.
 + * Emacs will notice this stuff at the end of the file and automatically
@@ -24425,7 +24494,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/skas/mmu.c um/arch/um/kernel/
 + */
 diff -Naur -X ../exclude-files orig/arch/um/kernel/skas/process.c um/arch/um/kernel/skas/process.c
 --- orig/arch/um/kernel/skas/process.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/kernel/skas/process.c	2004-01-31 02:49:36.000000000 -0500
++++ um/arch/um/kernel/skas/process.c	2003-11-19 03:00:01.000000000 -0500
 @@ -0,0 +1,417 @@
 +/* 
 + * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
@@ -24617,7 +24686,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/skas/process.c um/arch/um/ker
 +void new_thread(void *stack, void **switch_buf_ptr, void **fork_buf_ptr,
 +		void (*handler)(int))
 +{
-+	sigjmp_buf switch_buf, fork_buf;
++	jmp_buf switch_buf, fork_buf;
 +
 +	*switch_buf_ptr = &switch_buf;
 +	*fork_buf_ptr = &fork_buf;
@@ -24630,7 +24699,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/skas/process.c um/arch/um/ker
 +
 +void thread_wait(void *sw, void *fb)
 +{
-+	sigjmp_buf buf, **switch_buf = sw, *fork_buf;
++	jmp_buf buf, **switch_buf = sw, *fork_buf;
 +
 +	*switch_buf = &buf;
 +	fork_buf = fb;
@@ -24692,23 +24761,23 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/skas/process.c um/arch/um/ker
 +
 +void switch_threads(void *me, void *next)
 +{
-+	sigjmp_buf my_buf, **me_ptr = me, *next_buf = next;
++	jmp_buf my_buf, **me_ptr = me, *next_buf = next;
 +	
 +	*me_ptr = &my_buf;
 +	if(sigsetjmp(my_buf, 1) == 0)
 +		siglongjmp(*next_buf, 1);
 +}
 +
-+static sigjmp_buf initial_jmpbuf;
++static jmp_buf initial_jmpbuf;
 +
 +/* XXX Make these percpu */
 +static void (*cb_proc)(void *arg);
 +static void *cb_arg;
-+static sigjmp_buf *cb_back;
++static jmp_buf *cb_back;
 +
 +int start_idle_thread(void *stack, void *switch_buf_ptr, void **fork_buf_ptr)
 +{
-+	sigjmp_buf **switch_buf = switch_buf_ptr;
++	jmp_buf **switch_buf = switch_buf_ptr;
 +	int n;
 +
 +	*fork_buf_ptr = &initial_jmpbuf;
@@ -24744,7 +24813,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/skas/process.c um/arch/um/ker
 +
 +void initial_thread_cb_skas(void (*proc)(void *), void *arg)
 +{
-+	sigjmp_buf here;
++	jmp_buf here;
 +
 +	cb_proc = proc;
 +	cb_arg = arg;
@@ -25046,7 +25115,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/skas/process_kern.c um/arch/u
 + */
 diff -Naur -X ../exclude-files orig/arch/um/kernel/skas/syscall_kern.c um/arch/um/kernel/skas/syscall_kern.c
 --- orig/arch/um/kernel/skas/syscall_kern.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/kernel/skas/syscall_kern.c	2004-01-04 08:20:29.000000000 -0500
++++ um/arch/um/kernel/skas/syscall_kern.c	2003-10-21 03:26:07.000000000 -0400
 @@ -0,0 +1,42 @@
 +/* 
 + * Copyright (C) 2002 - 2003 Jeff Dike (jdike@addtoit.com)
@@ -25073,7 +25142,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/skas/syscall_kern.c um/arch/u
 +	nsyscalls++;
 +	syscall = UPT_SYSCALL_NR(&regs->regs);
 +
-+	if((syscall >= NR_syscalls) || (syscall < 1))
++	if((syscall >= NR_syscalls) || (syscall < 0))
 +		res = -ENOSYS;
 +	else res = EXECUTE_SYSCALL(syscall, regs);
 +
@@ -25472,8 +25541,8 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/skas/tlb.c um/arch/um/kernel/
 + */
 diff -Naur -X ../exclude-files orig/arch/um/kernel/skas/trap_user.c um/arch/um/kernel/skas/trap_user.c
 --- orig/arch/um/kernel/skas/trap_user.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/kernel/skas/trap_user.c	2004-01-21 01:17:05.000000000 -0500
-@@ -0,0 +1,66 @@
++++ um/arch/um/kernel/skas/trap_user.c	2003-12-14 11:17:37.000000000 -0500
+@@ -0,0 +1,63 @@
 +/* 
 + * Copyright (C) 2002 - 2003 Jeff Dike (jdike@addtoit.com)
 + * Licensed under the GPL
@@ -25495,10 +25564,8 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/skas/trap_user.c um/arch/um/k
 +	struct skas_regs *r;
 +	struct signal_info *info;
 +	int save_errno = errno;
-+	int save_user;
 +
 +	r = &TASK_REGS(get_current())->skas;
-+	save_user = r->is_user;
 +	r->is_user = 0;
 +	r->fault_addr = SC_FAULT_ADDR(sc);
 +	r->fault_type = SC_FAULT_TYPE(sc);
@@ -25511,7 +25578,6 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/skas/trap_user.c um/arch/um/k
 +	(*info->handler)(sig, (union uml_pt_regs *) r);
 +
 +	errno = save_errno;
-+	r->is_user = save_user;
 +}
 +
 +extern int missed_ticks[];
@@ -25542,7 +25608,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/skas/trap_user.c um/arch/um/k
 + */
 diff -Naur -X ../exclude-files orig/arch/um/kernel/skas/uaccess.c um/arch/um/kernel/skas/uaccess.c
 --- orig/arch/um/kernel/skas/uaccess.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/kernel/skas/uaccess.c	2003-12-22 01:30:09.000000000 -0500
++++ um/arch/um/kernel/skas/uaccess.c	2003-11-11 11:11:26.000000000 -0500
 @@ -0,0 +1,217 @@
 +/* 
 + * Copyright (C) 2002 - 2003 Jeff Dike (jdike@addtoit.com)
@@ -25672,7 +25738,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/skas/uaccess.c um/arch/um/ker
 +
 +static int strncpy_chunk_from_user(unsigned long from, int len, void *arg)
 +{
-+	char **to_ptr = arg, *to = *to_ptr;
++        char **to_ptr = arg, *to = *to_ptr;
 +	int n;
 +
 +	strncpy(to, (void *) from, len);
@@ -25777,9 +25843,8 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/skas/util/Makefile um/arch/um
 +	$(RM) -f mk_ptregs *.o *~
 diff -Naur -X ../exclude-files orig/arch/um/kernel/skas/util/mk_ptregs.c um/arch/um/kernel/skas/util/mk_ptregs.c
 --- orig/arch/um/kernel/skas/util/mk_ptregs.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/kernel/skas/util/mk_ptregs.c	2003-12-22 01:31:11.000000000 -0500
-@@ -0,0 +1,51 @@
-+#include <stdio.h>
++++ um/arch/um/kernel/skas/util/mk_ptregs.c	2003-10-21 03:26:07.000000000 -0400
+@@ -0,0 +1,50 @@
 +#include <asm/ptrace.h>
 +#include <asm/user.h>
 +
@@ -26164,7 +26229,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/smp.c um/arch/um/kernel/smp.c
 + */
 diff -Naur -X ../exclude-files orig/arch/um/kernel/syscall_kern.c um/arch/um/kernel/syscall_kern.c
 --- orig/arch/um/kernel/syscall_kern.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/kernel/syscall_kern.c	2004-01-10 06:37:46.000000000 -0500
++++ um/arch/um/kernel/syscall_kern.c	2003-11-07 01:41:13.000000000 -0500
 @@ -0,0 +1,343 @@
 +/* 
 + * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
@@ -26303,7 +26368,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/syscall_kern.c um/arch/um/ker
 +
 +        error = do_pipe(fd);
 +        if (!error) {
-+		if (copy_to_user(fildes, fd, sizeof(fd)))
++                if (copy_to_user(fildes, fd, sizeof(fd)))
 +                        error = -EFAULT;
 +        }
 +        return error;
@@ -27011,7 +27076,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/sys_call_table.c um/arch/um/k
 + */
 diff -Naur -X ../exclude-files orig/arch/um/kernel/syscall_user.c um/arch/um/kernel/syscall_user.c
 --- orig/arch/um/kernel/syscall_user.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/kernel/syscall_user.c	2003-12-22 01:32:48.000000000 -0500
++++ um/arch/um/kernel/syscall_user.c	2003-10-21 03:26:07.000000000 -0400
 @@ -0,0 +1,48 @@
 +/* 
 + * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
@@ -27034,7 +27099,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/syscall_user.c um/arch/um/ker
 +int record_syscall_start(int syscall)
 +{
 +	int max, index;
-+
++	
 +	max = sizeof(syscall_record)/sizeof(syscall_record[0]);
 +	index = next_syscall_index(max);
 +
@@ -27165,9 +27230,9 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/sysrq.c um/arch/um/kernel/sys
 + */
 diff -Naur -X ../exclude-files orig/arch/um/kernel/tempfile.c um/arch/um/kernel/tempfile.c
 --- orig/arch/um/kernel/tempfile.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/kernel/tempfile.c	2003-12-22 01:33:38.000000000 -0500
++++ um/arch/um/kernel/tempfile.c	2003-10-21 03:26:07.000000000 -0400
 @@ -0,0 +1,82 @@
-+/*
++/* 
 + * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
 + * Licensed under the GPL
 + */
@@ -27251,8 +27316,8 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/tempfile.c um/arch/um/kernel/
 + */
 diff -Naur -X ../exclude-files orig/arch/um/kernel/time.c um/arch/um/kernel/time.c
 --- orig/arch/um/kernel/time.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/kernel/time.c	2004-02-12 07:09:48.000000000 -0500
-@@ -0,0 +1,172 @@
++++ um/arch/um/kernel/time.c	2003-12-17 01:08:27.000000000 -0500
+@@ -0,0 +1,164 @@
 +/* 
 + * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
 + * Licensed under the GPL
@@ -27337,8 +27402,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/time.c um/arch/um/kernel/time
 +static unsigned long long get_host_hz(void)
 +{
 +	char mhzline[16], *end;
-+	unsigned long long mhz;
-+	int ret, mult, rest, len;
++	int ret, mult, mhz, rest, len;
 +
 +	ret = cpu_feature("cpu MHz", mhzline, 
 +			  sizeof(mhzline) / sizeof(mhzline[0]));
@@ -27372,13 +27436,6 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/time.c um/arch/um/kernel/time
 +
 +void time_init(void)
 +{
-+	/* XXX This is to fill xtime with something real - otherwise by the
-+	 * time /proc is mounted, no timers have fired, and xtime is still 0,
-+	 * meaning it shows times of Jan 1 1970.  The real fix is to figure
-+	 * out why no timers have happened by then.
-+	 */
-+	timer();
-+
 +	host_hz = get_host_hz();
 +	if(signal(SIGVTALRM, boot_timer_handler) == SIG_ERR)
 +		panic("Couldn't set SIGVTALRM handler");
@@ -27427,7 +27484,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/time.c um/arch/um/kernel/time
 + */
 diff -Naur -X ../exclude-files orig/arch/um/kernel/time_kern.c um/arch/um/kernel/time_kern.c
 --- orig/arch/um/kernel/time_kern.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/kernel/time_kern.c	2004-02-14 06:51:31.000000000 -0500
++++ um/arch/um/kernel/time_kern.c	2003-12-17 01:07:51.000000000 -0500
 @@ -0,0 +1,205 @@
 +/* 
 + * Copyright (C) 2000 Jeff Dike (jdike@karaya.com)
@@ -27476,17 +27533,17 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/time_kern.c um/arch/um/kernel
 +{
 +	unsigned long long ticks = 0;
 +
-+	if(!timer_irq_inited){
++        if(!timer_irq_inited){
 +		/* This is to ensure that ticks don't pile up when
 +		 * the timer handler is suspended */
 +		first_tick = 0;
 +		return;
 +	}
-+
++	
 +	if(first_tick){
 +#if defined(CONFIG_UML_REAL_TIME_CLOCK)
 +		unsigned long long tsc;
-+		/* We've had 1 tick */
++		 /* We've had 1 tick */
 +		tsc = time_stamp();
 +
 +		delta += tsc - prev_tsc;
@@ -27720,7 +27777,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/tlb.c um/arch/um/kernel/tlb.c
 + */
 diff -Naur -X ../exclude-files orig/arch/um/kernel/trap_kern.c um/arch/um/kernel/trap_kern.c
 --- orig/arch/um/kernel/trap_kern.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/kernel/trap_kern.c	2003-12-22 22:48:41.000000000 -0500
++++ um/arch/um/kernel/trap_kern.c	2003-12-14 11:18:05.000000000 -0500
 @@ -0,0 +1,220 @@
 +/* 
 + * Copyright (C) 2000, 2001 Jeff Dike (jdike@karaya.com)
@@ -27781,7 +27838,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/trap_kern.c um/arch/um/kernel
 +	pgd = pgd_offset(mm, page);
 +	pmd = pmd_offset(pgd, page);
 +	do {
-+ survive:
++	survive:
 +		switch (handle_mm_fault(mm, vma, address, is_write)) {
 +		case 1:
 +			current->min_flt++;
@@ -27944,7 +28001,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/trap_kern.c um/arch/um/kernel
 + */
 diff -Naur -X ../exclude-files orig/arch/um/kernel/trap_user.c um/arch/um/kernel/trap_user.c
 --- orig/arch/um/kernel/trap_user.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/kernel/trap_user.c	2004-01-31 02:47:39.000000000 -0500
++++ um/arch/um/kernel/trap_user.c	2003-10-21 03:26:07.000000000 -0400
 @@ -0,0 +1,138 @@
 +/* 
 + * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
@@ -28069,7 +28126,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/trap_user.c um/arch/um/kernel
 +
 +void do_longjmp(void *b, int val)
 +{
-+	sigjmp_buf *buf = b;
++	jmp_buf *buf = b;
 +
 +	siglongjmp(*buf, val);
 +}
@@ -28941,10 +28998,10 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/tt/Makefile um/arch/um/kernel
 +clean :
 diff -Naur -X ../exclude-files orig/arch/um/kernel/tt/mem.c um/arch/um/kernel/tt/mem.c
 --- orig/arch/um/kernel/tt/mem.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/kernel/tt/mem.c	2004-01-31 02:38:28.000000000 -0500
++++ um/arch/um/kernel/tt/mem.c	2003-10-21 03:26:07.000000000 -0400
 @@ -0,0 +1,51 @@
 +/* 
-+ * Copyright (C) 2002 - 2004 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
 + * Licensed under the GPL
 + */
 +
@@ -28963,7 +29020,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/tt/mem.c um/arch/um/kernel/tt
 +	if(!jail || debug)
 +		remap_data(UML_ROUND_DOWN(&_stext), UML_ROUND_UP(&_etext), 1);
 +	remap_data(UML_ROUND_DOWN(&_sdata), UML_ROUND_UP(&_edata), 1);
-+	remap_data(UML_ROUND_DOWN(&__bss_start), UML_ROUND_UP(&_end), 1);
++	remap_data(UML_ROUND_DOWN(&__bss_start), UML_ROUND_UP(brk_start), 1);
 +}
 +
 +#ifdef CONFIG_HOST_2G_2G
@@ -29049,8 +29106,8 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/tt/mem_user.c um/arch/um/kern
 + */
 diff -Naur -X ../exclude-files orig/arch/um/kernel/tt/process_kern.c um/arch/um/kernel/tt/process_kern.c
 --- orig/arch/um/kernel/tt/process_kern.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/kernel/tt/process_kern.c	2004-01-31 02:39:08.000000000 -0500
-@@ -0,0 +1,535 @@
++++ um/arch/um/kernel/tt/process_kern.c	2003-10-21 03:26:07.000000000 -0400
+@@ -0,0 +1,537 @@
 +/* 
 + * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
 + * Licensed under the GPL
@@ -29316,12 +29373,14 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/tt/process_kern.c um/arch/um/
 +{
 +	current->thread.request.op = OP_REBOOT;
 +	os_usr1_process(os_getpid());
++	os_kill_process(os_getpid(), 0);
 +}
 +
 +void halt_tt(void)
 +{
 +	current->thread.request.op = OP_HALT;
 +	os_usr1_process(os_getpid());
++	os_kill_process(os_getpid(), 0);
 +}
 +
 +void kill_off_processes_tt(void)
@@ -29456,7 +29515,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/tt/process_kern.c um/arch/um/
 +	protect_memory(start, end - start, 1, w, 1, 1);
 +
 +	start = (unsigned long) UML_ROUND_DOWN(&__bss_start);
-+	end = (unsigned long) UML_ROUND_UP(&_end);
++	end = (unsigned long) UML_ROUND_UP(brk_start);
 +	protect_memory(start, end - start, 1, w, 1, 1);
 +
 +	mprotect_kernel_vm(w);
@@ -30392,7 +30451,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/tt/ptproxy/sysdep.h um/arch/u
 + */
 diff -Naur -X ../exclude-files orig/arch/um/kernel/tt/ptproxy/wait.c um/arch/um/kernel/tt/ptproxy/wait.c
 --- orig/arch/um/kernel/tt/ptproxy/wait.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/kernel/tt/ptproxy/wait.c	2004-01-17 05:27:18.000000000 -0500
++++ um/arch/um/kernel/tt/ptproxy/wait.c	2003-10-21 03:26:07.000000000 -0400
 @@ -0,0 +1,88 @@
 +/**********************************************************************
 +wait.c
@@ -30457,7 +30516,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/tt/ptproxy/wait.c um/arch/um/
 +	pid = debugger->pid;
 +
 +	ip = ptrace(PTRACE_PEEKUSER, pid, PT_IP_OFFSET, 0);
-+	IP_RESTART_SYSCALL(ip);
++	ip = IP_RESTART_SYSCALL(ip);
 +
 +	if(ptrace(PTRACE_POKEUSER, pid, PT_IP_OFFSET, ip) < 0)
 +		tracer_panic("real_wait_return : Failed to restart system "
@@ -31681,7 +31740,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/tt/uaccess.c um/arch/um/kerne
 + */
 diff -Naur -X ../exclude-files orig/arch/um/kernel/tt/uaccess_user.c um/arch/um/kernel/tt/uaccess_user.c
 --- orig/arch/um/kernel/tt/uaccess_user.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/kernel/tt/uaccess_user.c	2004-01-31 02:48:29.000000000 -0500
++++ um/arch/um/kernel/tt/uaccess_user.c	2003-11-12 08:51:13.000000000 -0500
 @@ -0,0 +1,98 @@
 +/* 
 + * Copyright (C) 2001 Chris Emerson (cemerson@chiark.greenend.org.uk)
@@ -31757,7 +31816,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/tt/uaccess_user.c um/arch/um/
 +	struct tt_regs save = TASK_REGS(get_current())->tt;
 +	int ret;
 +	unsigned long *faddrp = (unsigned long *)fault_addr;
-+	sigjmp_buf jbuf;
++	jmp_buf jbuf;
 +
 +	*fault_catcher = &jbuf;
 +	if(sigsetjmp(jbuf, 1) == 0)
@@ -32050,7 +32109,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/tty_log.c um/arch/um/kernel/t
 + */
 diff -Naur -X ../exclude-files orig/arch/um/kernel/uaccess_user.c um/arch/um/kernel/uaccess_user.c
 --- orig/arch/um/kernel/uaccess_user.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/kernel/uaccess_user.c	2004-01-31 02:48:08.000000000 -0500
++++ um/arch/um/kernel/uaccess_user.c	2003-10-21 03:26:07.000000000 -0400
 @@ -0,0 +1,64 @@
 +/* 
 + * Copyright (C) 2001 Chris Emerson (cemerson@chiark.greenend.org.uk)
@@ -32072,7 +32131,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/uaccess_user.c um/arch/um/ker
 +{
 +	unsigned long *faddrp = (unsigned long *) fault_addr, ret;
 +
-+	sigjmp_buf jbuf;
++	jmp_buf jbuf;
 +	*fault_catcher = &jbuf;
 +	if(sigsetjmp(jbuf, 1) == 0){
 +		(*op)(to, from, n);
@@ -32118,8 +32177,8 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/uaccess_user.c um/arch/um/ker
 + */
 diff -Naur -X ../exclude-files orig/arch/um/kernel/um_arch.c um/arch/um/kernel/um_arch.c
 --- orig/arch/um/kernel/um_arch.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/kernel/um_arch.c	2004-01-10 00:11:09.000000000 -0500
-@@ -0,0 +1,431 @@
++++ um/arch/um/kernel/um_arch.c	2003-12-14 11:19:59.000000000 -0500
+@@ -0,0 +1,432 @@
 +/* 
 + * Copyright (C) 2000, 2002 Jeff Dike (jdike@karaya.com)
 + * Licensed under the GPL
@@ -32539,6 +32598,7 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/um_arch.c um/arch/um/kernel/u
 +	arch_check_bugs();
 +	check_ptrace();
 +	check_sigio();
++	check_devanon();
 +}
 +
 +/*
@@ -32553,8 +32613,8 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/um_arch.c um/arch/um/kernel/u
 + */
 diff -Naur -X ../exclude-files orig/arch/um/kernel/umid.c um/arch/um/kernel/umid.c
 --- orig/arch/um/kernel/umid.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/kernel/umid.c	2004-01-26 10:13:01.000000000 -0500
-@@ -0,0 +1,327 @@
++++ um/arch/um/kernel/umid.c	2003-10-21 03:26:07.000000000 -0400
+@@ -0,0 +1,324 @@
 +/* 
 + * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
 + * Licensed under the GPL
@@ -32762,15 +32822,12 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/umid.c um/arch/um/kernel/umid
 +			printf("Failed to malloc uml_dir - error = %d\n",
 +			       errno);
 +			uml_dir = name;
-+			/* Return 0 here because do_initcalls doesn't look at
-+			 * the return value.
-+			 */
 +			return(0);
 +		}
 +		sprintf(uml_dir, "%s/", name);
 +	}
 +	else uml_dir = name;
-+	return(0);
++	return 0;
 +}
 +
 +static int __init make_uml_dir(void)
@@ -32884,8 +32941,8 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/umid.c um/arch/um/kernel/umid
 + */
 diff -Naur -X ../exclude-files orig/arch/um/kernel/user_syms.c um/arch/um/kernel/user_syms.c
 --- orig/arch/um/kernel/user_syms.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/kernel/user_syms.c	2004-01-23 00:44:09.000000000 -0500
-@@ -0,0 +1,118 @@
++++ um/arch/um/kernel/user_syms.c	2003-10-21 03:26:07.000000000 -0400
+@@ -0,0 +1,116 @@
 +#include <stdio.h>
 +#include <unistd.h>
 +#include <dirent.h>
@@ -33000,8 +33057,6 @@ diff -Naur -X ../exclude-files orig/arch/um/kernel/user_syms.c um/arch/um/kernel
 +
 +EXPORT_SYMBOL(memset);
 +EXPORT_SYMBOL(strstr);
-+EXPORT_SYMBOL(strlen);
-+EXPORT_SYMBOL(printf);
 +
 +EXPORT_SYMBOL(find_iomem);
 diff -Naur -X ../exclude-files orig/arch/um/kernel/user_util.c um/arch/um/kernel/user_util.c
@@ -33272,8 +33327,8 @@ diff -Naur -X ../exclude-files orig/arch/um/link.ld.in um/arch/um/link.ld.in
 +}
 diff -Naur -X ../exclude-files orig/arch/um/main.c um/arch/um/main.c
 --- orig/arch/um/main.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/main.c	2004-01-29 00:48:42.000000000 -0500
-@@ -0,0 +1,199 @@
++++ um/arch/um/main.c	2003-10-21 03:26:07.000000000 -0400
+@@ -0,0 +1,198 @@
 +/* 
 + * Copyright (C) 2000, 2001 Jeff Dike (jdike@karaya.com)
 + * Licensed under the GPL
@@ -33424,7 +33479,6 @@ diff -Naur -X ../exclude-files orig/arch/um/main.c um/arch/um/main.c
 +	/* Reboot */
 +	if(ret){
 +		printf("\n");
-+
 +		execvp(new_argv[0], new_argv);
 +		perror("Failed to exec kernel");
 +		ret = 1;
@@ -33475,7 +33529,7 @@ diff -Naur -X ../exclude-files orig/arch/um/main.c um/arch/um/main.c
 + */
 diff -Naur -X ../exclude-files orig/arch/um/Makefile um/arch/um/Makefile
 --- orig/arch/um/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/Makefile	2004-02-14 06:26:41.000000000 -0500
++++ um/arch/um/Makefile	2003-12-17 03:02:28.000000000 -0500
 @@ -0,0 +1,174 @@
 +# 
 +# Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
@@ -33574,9 +33628,9 @@ diff -Naur -X ../exclude-files orig/arch/um/Makefile um/arch/um/Makefile
 +		-DELF_FORMAT=$(ELF_FORMAT) $(M4_MODE_TT) \
 +		-DKERNEL_STACK_SIZE=$$(( 4096 * $$pages )) $< > $@
 +
-+SYMLINK_HEADERS = archparam.h system.h sigcontext.h processor.h ptrace.h \
-+	arch-signal.h
-+SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),include/asm-um/$(header))
++SYMLINK_HEADERS = include/asm-um/archparam.h include/asm-um/system.h \
++	include/asm-um/sigcontext.h include/asm-um/processor.h \
++	include/asm-um/ptrace.h include/asm-um/arch-signal.h
 +
 +ARCH_SYMLINKS = include/asm-um/arch arch/um/include/sysdep arch/um/os \
 +	$(SYMLINK_HEADERS) $(ARCH_DIR)/include/uml-config.h
@@ -34563,8 +34617,8 @@ diff -Naur -X ../exclude-files orig/arch/um/os-Linux/drivers/tuntap_user.c um/ar
 + */
 diff -Naur -X ../exclude-files orig/arch/um/os-Linux/file.c um/arch/um/os-Linux/file.c
 --- orig/arch/um/os-Linux/file.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/os-Linux/file.c	2004-01-10 06:52:24.000000000 -0500
-@@ -0,0 +1,668 @@
++++ um/arch/um/os-Linux/file.c	2003-11-30 20:18:39.000000000 -0500
+@@ -0,0 +1,669 @@
 +/* 
 + * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
 + * Licensed under the GPL
@@ -34722,7 +34776,7 @@ diff -Naur -X ../exclude-files orig/arch/um/os-Linux/file.c um/arch/um/os-Linux/
 +	sencap = 0;
 +	if(ioctl(fd, SIOCSIFENCAP, &sencap) < 0){
 +		printk("Failed to set slip encapsulation - "
-+		       "errno = %d\n", errno);
++        	       "errno = %d\n", errno);
 +		return(-errno);
 +	}
 +
@@ -34734,9 +34788,10 @@ diff -Naur -X ../exclude-files orig/arch/um/os-Linux/file.c um/arch/um/os-Linux/
 +	if(fcntl(fd, F_SETOWN, pid) < 0){
 +		int save_errno = errno;
 +
-+		if(fcntl(fd, F_GETOWN, 0) != pid)
++		if(fcntl(fd, F_GETOWN, 0) != pid){
 +			return(-save_errno);
-+	}
++                }
++        }
 +
 +	return(0);
 +}
@@ -34752,14 +34807,14 @@ diff -Naur -X ../exclude-files orig/arch/um/os-Linux/file.c um/arch/um/os-Linux/
 +		return(-errno);
 +	}
 +
-+	if((fcntl(master, F_SETFL, flags | O_NONBLOCK | O_ASYNC) < 0) ||
-+	   (fcntl(master, F_SETOWN, os_getpid()) < 0)){
-+		printk("fcntl F_SETFL or F_SETOWN failed, errno = %d\n", errno);
++        if((fcntl(master, F_SETFL, flags | O_NONBLOCK | O_ASYNC) < 0) ||
++           (fcntl(master, F_SETOWN, os_getpid()) < 0)){
++                printk("fcntl F_SETFL or F_SETOWN failed, errno = %d\n", errno);
 +		return(-errno);
 +	}
 +
-+	if((fcntl(slave, F_SETFL, flags | O_NONBLOCK) < 0)){
-+		printk("fcntl F_SETFL failed, errno = %d\n", errno);
++        if((fcntl(slave, F_SETFL, flags | O_NONBLOCK) < 0)){
++                printk("fcntl F_SETFL failed, errno = %d\n", errno);
 +		return(-errno);
 +	}
 +
@@ -34976,7 +35031,7 @@ diff -Naur -X ../exclude-files orig/arch/um/os-Linux/file.c um/arch/um/os-Linux/
 +	*modtime = buf.ust_mtime;
 +	return(0);
 +}
-+
++ 
 +int os_get_exec_close(int fd, int* close_on_exec)
 +{
 +	int ret;
@@ -35216,7 +35271,7 @@ diff -Naur -X ../exclude-files orig/arch/um/os-Linux/file.c um/arch/um/os-Linux/
 +		err = -errno;
 +		goto out;
 +	}
-+
++		
 +	printk("F_SETLK failed, file already locked by pid %d\n", lock.l_pid);
 +	err = save;
 + out:
@@ -35282,7 +35337,7 @@ diff -Naur -X ../exclude-files orig/arch/um/os-Linux/Makefile um/arch/um/os-Linu
 +archmrproper:
 diff -Naur -X ../exclude-files orig/arch/um/os-Linux/process.c um/arch/um/os-Linux/process.c
 --- orig/arch/um/os-Linux/process.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/os-Linux/process.c	2004-01-10 06:53:44.000000000 -0500
++++ um/arch/um/os-Linux/process.c	2003-12-18 03:08:34.000000000 -0500
 @@ -0,0 +1,148 @@
 +/* 
 + * Copyright (C) 2002 Jeff Dike (jdike@addtoit.com)
@@ -35417,7 +35472,7 @@ diff -Naur -X ../exclude-files orig/arch/um/os-Linux/process.c um/arch/um/os-Lin
 +        int err;
 +
 +        err = munmap(addr, len);
-+	if(err < 0)
++        if(err < 0) 
 +		return(-errno);
 +        return(0);
 +}
@@ -35499,8 +35554,8 @@ diff -Naur -X ../exclude-files orig/arch/um/os-Linux/tty.c um/arch/um/os-Linux/t
 + */
 diff -Naur -X ../exclude-files orig/arch/um/sys-i386/bugs.c um/arch/um/sys-i386/bugs.c
 --- orig/arch/um/sys-i386/bugs.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/sys-i386/bugs.c	2004-01-21 22:42:39.000000000 -0500
-@@ -0,0 +1,222 @@
++++ um/arch/um/sys-i386/bugs.c	2003-11-15 02:54:48.000000000 -0500
+@@ -0,0 +1,221 @@
 +/* 
 + * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
 + * Licensed under the GPL
@@ -35520,8 +35575,8 @@ diff -Naur -X ../exclude-files orig/arch/um/sys-i386/bugs.c um/arch/um/sys-i386/
 +#define MAXTOKEN 64
 +
 +/* Set during early boot */
-+int host_has_cmov = 1;
-+int host_has_xmm = 0;
++int cpu_has_cmov = 1;
++int cpu_has_xmm = 0;
 +
 +static char token(int fd, char *buf, int len, char stop)
 +{
@@ -35679,37 +35734,36 @@ diff -Naur -X ../exclude-files orig/arch/um/sys-i386/bugs.c um/arch/um/sys-i386/
 +		return;
 +	}
 +	if(check_cpu_flag("cmov", &have_it)) 
-+		host_has_cmov = have_it;
++		cpu_has_cmov = have_it;
 +	if(check_cpu_flag("xmm", &have_it)) 
-+		host_has_xmm = have_it;
++		cpu_has_xmm = have_it;
 +}
 +
 +int arch_handle_signal(int sig, union uml_pt_regs *regs)
 +{
-+	unsigned char tmp[2];
++	unsigned long ip;
 +
 +	/* This is testing for a cmov (0x0f 0x4x) instruction causing a
 +	 * SIGILL in init.
 +	 */
 +	if((sig != SIGILL) || (TASK_PID(get_current()) != 1)) return(0);
 +
-+	if (copy_from_user_proc(tmp, (void *) UPT_IP(regs), 2))
-+		panic("SIGILL in init, could not read instructions!\n");
-+	if((tmp[0] != 0x0f) || ((tmp[1] & 0xf0) != 0x40))
++	ip = UPT_IP(regs);
++	if((*((char *) ip) != 0x0f) || ((*((char *) (ip + 1)) & 0xf0) != 0x40))
 +		return(0);
 +
-+	if(host_has_cmov == 0)
++	if(cpu_has_cmov == 0)
 +		panic("SIGILL caused by cmov, which this processor doesn't "
 +		      "implement, boot a filesystem compiled for older "
 +		      "processors");
-+	else if(host_has_cmov == 1)
++	else if(cpu_has_cmov == 1)
 +		panic("SIGILL caused by cmov, which this processor claims to "
 +		      "implement");
-+	else if(host_has_cmov == -1)
++	else if(cpu_has_cmov == -1)
 +		panic("SIGILL caused by cmov, couldn't tell if this processor "
 +		      "implements it, boot a filesystem compiled for older "
 +		      "processors");
-+	else panic("Bad value for host_has_cmov (%d)", host_has_cmov);
++	else panic("Bad value for cpu_has_cmov (%d)", cpu_has_cmov);
 +	return(0);
 +}
 +
@@ -36248,8 +36302,8 @@ diff -Naur -X ../exclude-files orig/arch/um/sys-i386/ksyms.c um/arch/um/sys-i386
 +EXPORT_SYMBOL(csum_partial_copy_to);
 diff -Naur -X ../exclude-files orig/arch/um/sys-i386/ldt.c um/arch/um/sys-i386/ldt.c
 --- orig/arch/um/sys-i386/ldt.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/sys-i386/ldt.c	2004-01-19 04:01:11.000000000 -0500
-@@ -0,0 +1,94 @@
++++ um/arch/um/sys-i386/ldt.c	2003-10-21 03:26:07.000000000 -0400
+@@ -0,0 +1,92 @@
 +/*
 + * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
 + * Licensed under the GPL
@@ -36265,8 +36319,6 @@ diff -Naur -X ../exclude-files orig/arch/um/sys-i386/ldt.c um/arch/um/sys-i386/l
 +#ifdef CONFIG_MODE_TT
 +extern int modify_ldt(int func, void *ptr, unsigned long bytecount);
 +
-+/* XXX this needs copy_to_user and copy_from_user */
-+
 +int sys_modify_ldt_tt(int func, void *ptr, unsigned long bytecount)
 +{
 +	if(verify_area(VERIFY_READ, ptr, bytecount)) return(-EFAULT);
@@ -37715,8 +37767,8 @@ diff -Naur -X ../exclude-files orig/arch/um/util/Makefile um/arch/um/util/Makefi
 +archmrproper : clean
 diff -Naur -X ../exclude-files orig/arch/um/util/mk_constants_kern.c um/arch/um/util/mk_constants_kern.c
 --- orig/arch/um/util/mk_constants_kern.c	1969-12-31 19:00:00.000000000 -0500
-+++ um/arch/um/util/mk_constants_kern.c	2004-01-10 06:54:51.000000000 -0500
-@@ -0,0 +1,25 @@
++++ um/arch/um/util/mk_constants_kern.c	2003-10-21 03:26:07.000000000 -0400
+@@ -0,0 +1,24 @@
 +#include "linux/kernel.h"
 +#include "linux/stringify.h"
 +#include "asm/page.h"
@@ -37730,7 +37782,6 @@ diff -Naur -X ../exclude-files orig/arch/um/util/mk_constants_kern.c um/arch/um/
 +{
 +  print_head();
 +  print_constant_int("UM_KERN_PAGE_SIZE", PAGE_SIZE);
-+
 +  print_constant_str("UM_KERN_EMERG", KERN_EMERG);
 +  print_constant_str("UM_KERN_ALERT", KERN_ALERT);
 +  print_constant_str("UM_KERN_CRIT", KERN_CRIT);
@@ -38220,7 +38271,7 @@ diff -Naur -X ../exclude-files orig/drivers/char/Makefile um/drivers/char/Makefi
    KEYBD    =
 diff -Naur -X ../exclude-files orig/drivers/char/mem.c um/drivers/char/mem.c
 --- orig/drivers/char/mem.c	2003-12-16 22:16:27.000000000 -0500
-+++ um/drivers/char/mem.c	2004-01-05 11:23:32.000000000 -0500
++++ um/drivers/char/mem.c	2003-12-16 22:17:25.000000000 -0500
 @@ -220,7 +220,8 @@
  	ssize_t read = 0;
  	ssize_t virtr = 0;
@@ -38397,8 +38448,8 @@ diff -Naur -X ../exclude-files orig/fs/bad_inode.c um/fs/bad_inode.c
  	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
  	inode->i_op = &bad_inode_ops;	
 diff -Naur -X ../exclude-files orig/include/asm-i386/hardirq.h um/include/asm-i386/hardirq.h
---- orig/include/asm-i386/hardirq.h	2004-01-11 22:46:12.000000000 -0500
-+++ um/include/asm-i386/hardirq.h	2004-02-14 06:28:59.000000000 -0500
+--- orig/include/asm-i386/hardirq.h	2003-12-16 22:16:35.000000000 -0500
++++ um/include/asm-i386/hardirq.h	2003-12-17 02:16:13.000000000 -0500
 @@ -4,6 +4,7 @@
  #include <linux/config.h>
  #include <linux/threads.h>
@@ -38590,7 +38641,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/arch-signal-i386.h um/include
 + */
 diff -Naur -X ../exclude-files orig/include/asm-um/atomic.h um/include/asm-um/atomic.h
 --- orig/include/asm-um/atomic.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/atomic.h	2004-02-14 06:28:59.000000000 -0500
++++ um/include/asm-um/atomic.h	2003-12-17 02:16:13.000000000 -0500
 @@ -0,0 +1,6 @@
 +#ifndef __UM_ATOMIC_H
 +#define __UM_ATOMIC_H
@@ -38600,7 +38651,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/atomic.h um/include/asm-um/at
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/bitops.h um/include/asm-um/bitops.h
 --- orig/include/asm-um/bitops.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/bitops.h	2004-02-14 06:28:59.000000000 -0500
++++ um/include/asm-um/bitops.h	2003-12-17 02:16:13.000000000 -0500
 @@ -0,0 +1,6 @@
 +#ifndef __UM_BITOPS_H
 +#define __UM_BITOPS_H
@@ -38630,7 +38681,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/bugs.h um/include/asm-um/bugs
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/byteorder.h um/include/asm-um/byteorder.h
 --- orig/include/asm-um/byteorder.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/byteorder.h	2004-01-16 03:32:58.000000000 -0500
++++ um/include/asm-um/byteorder.h	2003-12-16 22:26:55.000000000 -0500
 @@ -0,0 +1,6 @@
 +#ifndef __UM_BYTEORDER_H
 +#define __UM_BYTEORDER_H
@@ -38670,7 +38721,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/cobalt.h um/include/asm-um/co
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/current.h um/include/asm-um/current.h
 --- orig/include/asm-um/current.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/current.h	2004-02-14 06:28:59.000000000 -0500
++++ um/include/asm-um/current.h	2003-12-17 02:16:13.000000000 -0500
 @@ -0,0 +1,34 @@
 +/* 
 + * Copyright (C) 2000 Jeff Dike (jdike@karaya.com)
@@ -38739,7 +38790,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/div64.h um/include/asm-um/div
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/dma.h um/include/asm-um/dma.h
 --- orig/include/asm-um/dma.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/dma.h	2004-01-16 03:32:59.000000000 -0500
++++ um/include/asm-um/dma.h	2003-12-15 00:26:39.000000000 -0500
 @@ -0,0 +1,10 @@
 +#ifndef __UM_DMA_H
 +#define __UM_DMA_H
@@ -38795,7 +38846,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/fcntl.h um/include/asm-um/fcn
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/fixmap.h um/include/asm-um/fixmap.h
 --- orig/include/asm-um/fixmap.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/fixmap.h	2004-02-14 06:29:00.000000000 -0500
++++ um/include/asm-um/fixmap.h	2003-12-17 02:16:14.000000000 -0500
 @@ -0,0 +1,89 @@
 +#ifndef __UM_FIXMAP_H
 +#define __UM_FIXMAP_H
@@ -38898,7 +38949,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/floppy.h um/include/asm-um/fl
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/hardirq.h um/include/asm-um/hardirq.h
 --- orig/include/asm-um/hardirq.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/hardirq.h	2004-02-14 06:28:59.000000000 -0500
++++ um/include/asm-um/hardirq.h	2003-12-17 02:16:13.000000000 -0500
 @@ -0,0 +1,6 @@
 +#ifndef __UM_HARDIRQ_H
 +#define __UM_HARDIRQ_H
@@ -38918,7 +38969,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/hdreg.h um/include/asm-um/hdr
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/highmem.h um/include/asm-um/highmem.h
 --- orig/include/asm-um/highmem.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/highmem.h	2004-02-14 06:29:00.000000000 -0500
++++ um/include/asm-um/highmem.h	2003-12-17 02:16:14.000000000 -0500
 @@ -0,0 +1,12 @@
 +#ifndef __UM_HIGHMEM_H
 +#define __UM_HIGHMEM_H
@@ -38948,7 +38999,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/hw_irq.h um/include/asm-um/hw
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/ide.h um/include/asm-um/ide.h
 --- orig/include/asm-um/ide.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/ide.h	2004-01-16 23:40:52.000000000 -0500
++++ um/include/asm-um/ide.h	2003-12-15 00:29:05.000000000 -0500
 @@ -0,0 +1,6 @@
 +#ifndef __UM_IDE_H
 +#define __UM_IDE_H
@@ -38993,7 +39044,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/ioctls.h um/include/asm-um/io
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/io.h um/include/asm-um/io.h
 --- orig/include/asm-um/io.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/io.h	2004-01-16 03:32:59.000000000 -0500
++++ um/include/asm-um/io.h	2003-12-15 00:26:39.000000000 -0500
 @@ -0,0 +1,25 @@
 +#ifndef __UM_IO_H
 +#define __UM_IO_H
@@ -39133,7 +39184,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/mman.h um/include/asm-um/mman
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/mmu_context.h um/include/asm-um/mmu_context.h
 --- orig/include/asm-um/mmu_context.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/mmu_context.h	2004-02-14 06:28:59.000000000 -0500
++++ um/include/asm-um/mmu_context.h	2003-12-17 02:16:13.000000000 -0500
 @@ -0,0 +1,72 @@
 +/* 
 + * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
@@ -39255,7 +39306,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/msgbuf.h um/include/asm-um/ms
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/mtrr.h um/include/asm-um/mtrr.h
 --- orig/include/asm-um/mtrr.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/mtrr.h	2004-02-12 05:46:29.000000000 -0500
++++ um/include/asm-um/mtrr.h	2003-12-17 10:48:33.000000000 -0500
 @@ -0,0 +1,6 @@
 +#ifndef __UM_MTRR_H
 +#define __UM_MTRR_H
@@ -39275,7 +39326,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/namei.h um/include/asm-um/nam
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/page.h um/include/asm-um/page.h
 --- orig/include/asm-um/page.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/page.h	2004-01-16 03:32:58.000000000 -0500
++++ um/include/asm-um/page.h	2003-12-15 00:26:37.000000000 -0500
 @@ -0,0 +1,68 @@
 +/* 
 + * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
@@ -39352,12 +39403,14 @@ diff -Naur -X ../exclude-files orig/include/asm-um/page_offset.h um/include/asm-
 +#define PAGE_OFFSET_RAW (uml_physmem)
 diff -Naur -X ../exclude-files orig/include/asm-um/param.h um/include/asm-um/param.h
 --- orig/include/asm-um/param.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/param.h	2004-02-13 02:26:52.000000000 -0500
-@@ -0,0 +1,22 @@
++++ um/include/asm-um/param.h	2003-10-21 03:26:07.000000000 -0400
+@@ -0,0 +1,24 @@
 +#ifndef _UM_PARAM_H
 +#define _UM_PARAM_H
 +
-+#define HZ 100
++#ifndef HZ
++#define HZ 52
++#endif
 +
 +#define EXEC_PAGESIZE   4096
 +
@@ -39388,7 +39441,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/pci.h um/include/asm-um/pci.h
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/pgalloc.h um/include/asm-um/pgalloc.h
 --- orig/include/asm-um/pgalloc.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/pgalloc.h	2004-02-14 06:29:00.000000000 -0500
++++ um/include/asm-um/pgalloc.h	2003-12-17 02:16:14.000000000 -0500
 @@ -0,0 +1,164 @@
 +/* 
 + * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
@@ -39556,7 +39609,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/pgalloc.h um/include/asm-um/p
 + */
 diff -Naur -X ../exclude-files orig/include/asm-um/pgtable.h um/include/asm-um/pgtable.h
 --- orig/include/asm-um/pgtable.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/pgtable.h	2004-02-14 06:28:59.000000000 -0500
++++ um/include/asm-um/pgtable.h	2003-12-17 02:16:13.000000000 -0500
 @@ -0,0 +1,413 @@
 +/* 
 + * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
@@ -39993,7 +40046,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/posix_types.h um/include/asm-
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/processor-generic.h um/include/asm-um/processor-generic.h
 --- orig/include/asm-um/processor-generic.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/processor-generic.h	2004-02-14 06:28:59.000000000 -0500
++++ um/include/asm-um/processor-generic.h	2003-12-17 02:16:13.000000000 -0500
 @@ -0,0 +1,177 @@
 +/* 
 + * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
@@ -40174,7 +40227,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/processor-generic.h um/includ
 + */
 diff -Naur -X ../exclude-files orig/include/asm-um/processor-i386.h um/include/asm-um/processor-i386.h
 --- orig/include/asm-um/processor-i386.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/processor-i386.h	2004-02-14 06:28:59.000000000 -0500
++++ um/include/asm-um/processor-i386.h	2003-12-17 02:16:13.000000000 -0500
 @@ -0,0 +1,35 @@
 +/* 
 + * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
@@ -40232,7 +40285,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/processor-ppc.h um/include/as
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/ptrace-generic.h um/include/asm-um/ptrace-generic.h
 --- orig/include/asm-um/ptrace-generic.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/ptrace-generic.h	2004-02-14 06:28:59.000000000 -0500
++++ um/include/asm-um/ptrace-generic.h	2003-12-17 02:16:13.000000000 -0500
 @@ -0,0 +1,74 @@
 +/* 
 + * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
@@ -40310,7 +40363,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/ptrace-generic.h um/include/a
 + */
 diff -Naur -X ../exclude-files orig/include/asm-um/ptrace-i386.h um/include/asm-um/ptrace-i386.h
 --- orig/include/asm-um/ptrace-i386.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/ptrace-i386.h	2004-02-14 06:28:59.000000000 -0500
++++ um/include/asm-um/ptrace-i386.h	2003-12-17 02:16:13.000000000 -0500
 @@ -0,0 +1,46 @@
 +/* 
 + * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
@@ -40380,7 +40433,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/rwlock.h um/include/asm-um/rw
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/rwsem.h um/include/asm-um/rwsem.h
 --- orig/include/asm-um/rwsem.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/rwsem.h	2004-02-14 06:28:59.000000000 -0500
++++ um/include/asm-um/rwsem.h	2003-12-17 02:16:13.000000000 -0500
 @@ -0,0 +1,10 @@
 +#ifndef __UM_RWSEM_H__
 +#define __UM_RWSEM_H__
@@ -40412,7 +40465,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/segment.h um/include/asm-um/s
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/semaphore.h um/include/asm-um/semaphore.h
 --- orig/include/asm-um/semaphore.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/semaphore.h	2004-02-14 06:28:59.000000000 -0500
++++ um/include/asm-um/semaphore.h	2003-12-17 02:16:13.000000000 -0500
 @@ -0,0 +1,6 @@
 +#ifndef __UM_SEMAPHORE_H
 +#define __UM_SEMAPHORE_H
@@ -40496,7 +40549,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/sigcontext-ppc.h um/include/a
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/siginfo.h um/include/asm-um/siginfo.h
 --- orig/include/asm-um/siginfo.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/siginfo.h	2004-02-14 06:28:59.000000000 -0500
++++ um/include/asm-um/siginfo.h	2003-12-17 02:16:13.000000000 -0500
 @@ -0,0 +1,6 @@
 +#ifndef __UM_SIGINFO_H
 +#define __UM_SIGINFO_H
@@ -40506,7 +40559,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/siginfo.h um/include/asm-um/s
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/signal.h um/include/asm-um/signal.h
 --- orig/include/asm-um/signal.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/signal.h	2004-02-14 06:28:59.000000000 -0500
++++ um/include/asm-um/signal.h	2003-12-17 02:16:13.000000000 -0500
 @@ -0,0 +1,22 @@
 +/* 
 + * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
@@ -40532,7 +40585,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/signal.h um/include/asm-um/si
 + */
 diff -Naur -X ../exclude-files orig/include/asm-um/smp.h um/include/asm-um/smp.h
 --- orig/include/asm-um/smp.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/smp.h	2004-02-14 06:28:59.000000000 -0500
++++ um/include/asm-um/smp.h	2003-12-17 02:16:13.000000000 -0500
 @@ -0,0 +1,19 @@
 +#ifndef __UM_SMP_H
 +#define __UM_SMP_H
@@ -40555,7 +40608,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/smp.h um/include/asm-um/smp.h
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/smplock.h um/include/asm-um/smplock.h
 --- orig/include/asm-um/smplock.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/smplock.h	2004-02-14 06:28:59.000000000 -0500
++++ um/include/asm-um/smplock.h	2003-12-17 02:16:13.000000000 -0500
 @@ -0,0 +1,6 @@
 +#ifndef __UM_SMPLOCK_H
 +#define __UM_SMPLOCK_H
@@ -40585,7 +40638,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/sockios.h um/include/asm-um/s
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/softirq.h um/include/asm-um/softirq.h
 --- orig/include/asm-um/softirq.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/softirq.h	2004-02-14 06:28:59.000000000 -0500
++++ um/include/asm-um/softirq.h	2003-12-17 02:16:13.000000000 -0500
 @@ -0,0 +1,13 @@
 +#ifndef __UM_SOFTIRQ_H
 +#define __UM_SOFTIRQ_H
@@ -40602,7 +40655,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/softirq.h um/include/asm-um/s
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/spinlock.h um/include/asm-um/spinlock.h
 --- orig/include/asm-um/spinlock.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/spinlock.h	2004-02-14 06:28:59.000000000 -0500
++++ um/include/asm-um/spinlock.h	2003-12-17 02:16:13.000000000 -0500
 @@ -0,0 +1,10 @@
 +#ifndef __UM_SPINLOCK_H
 +#define __UM_SPINLOCK_H
@@ -40616,7 +40669,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/spinlock.h um/include/asm-um/
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/statfs.h um/include/asm-um/statfs.h
 --- orig/include/asm-um/statfs.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/statfs.h	2004-02-14 06:28:59.000000000 -0500
++++ um/include/asm-um/statfs.h	2003-12-17 02:16:13.000000000 -0500
 @@ -0,0 +1,6 @@
 +#ifndef _UM_STATFS_H
 +#define _UM_STATFS_H
@@ -40636,7 +40689,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/stat.h um/include/asm-um/stat
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/string.h um/include/asm-um/string.h
 --- orig/include/asm-um/string.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/string.h	2004-01-16 03:32:58.000000000 -0500
++++ um/include/asm-um/string.h	2003-12-16 22:26:55.000000000 -0500
 @@ -0,0 +1,7 @@
 +#ifndef __UM_STRING_H
 +#define __UM_STRING_H
@@ -40647,7 +40700,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/string.h um/include/asm-um/st
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/system-generic.h um/include/asm-um/system-generic.h
 --- orig/include/asm-um/system-generic.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/system-generic.h	2004-02-14 06:28:59.000000000 -0500
++++ um/include/asm-um/system-generic.h	2003-12-17 02:16:13.000000000 -0500
 @@ -0,0 +1,50 @@
 +#ifndef __UM_SYSTEM_GENERIC_H
 +#define __UM_SYSTEM_GENERIC_H
@@ -40701,7 +40754,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/system-generic.h um/include/a
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/system-i386.h um/include/asm-um/system-i386.h
 --- orig/include/asm-um/system-i386.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/system-i386.h	2004-02-14 06:28:59.000000000 -0500
++++ um/include/asm-um/system-i386.h	2003-12-17 02:16:13.000000000 -0500
 @@ -0,0 +1,39 @@
 +#ifndef __UM_SYSTEM_I386_H
 +#define __UM_SYSTEM_I386_H
@@ -40780,7 +40833,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/termios.h um/include/asm-um/t
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/timex.h um/include/asm-um/timex.h
 --- orig/include/asm-um/timex.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/timex.h	2004-02-14 06:28:59.000000000 -0500
++++ um/include/asm-um/timex.h	2003-12-17 02:16:13.000000000 -0500
 @@ -0,0 +1,18 @@
 +#ifndef __UM_TIMEX_H
 +#define __UM_TIMEX_H
@@ -40807,7 +40860,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/tlb.h um/include/asm-um/tlb.h
 +#include <asm-generic/tlb.h>
 diff -Naur -X ../exclude-files orig/include/asm-um/types.h um/include/asm-um/types.h
 --- orig/include/asm-um/types.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/types.h	2004-01-16 03:32:58.000000000 -0500
++++ um/include/asm-um/types.h	2003-12-15 00:26:37.000000000 -0500
 @@ -0,0 +1,6 @@
 +#ifndef __UM_TYPES_H
 +#define __UM_TYPES_H
@@ -40817,7 +40870,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/types.h um/include/asm-um/typ
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/uaccess.h um/include/asm-um/uaccess.h
 --- orig/include/asm-um/uaccess.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/uaccess.h	2004-02-14 06:28:59.000000000 -0500
++++ um/include/asm-um/uaccess.h	2003-12-17 02:16:13.000000000 -0500
 @@ -0,0 +1,99 @@
 +/* 
 + * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
@@ -40940,7 +40993,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/unaligned.h um/include/asm-um
 +#endif
 diff -Naur -X ../exclude-files orig/include/asm-um/unistd.h um/include/asm-um/unistd.h
 --- orig/include/asm-um/unistd.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/unistd.h	2004-02-14 06:29:00.000000000 -0500
++++ um/include/asm-um/unistd.h	2003-12-17 02:16:14.000000000 -0500
 @@ -0,0 +1,121 @@
 +/* 
 + * Copyright (C) 2000, 2001  Jeff Dike (jdike@karaya.com)
@@ -41065,7 +41118,7 @@ diff -Naur -X ../exclude-files orig/include/asm-um/unistd.h um/include/asm-um/un
 + */
 diff -Naur -X ../exclude-files orig/include/asm-um/user.h um/include/asm-um/user.h
 --- orig/include/asm-um/user.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/asm-um/user.h	2004-02-14 06:31:38.000000000 -0500
++++ um/include/asm-um/user.h	2003-12-17 02:18:31.000000000 -0500
 @@ -0,0 +1,6 @@
 +#ifndef __UM_USER_H
 +#define __UM_USER_H
@@ -41094,8 +41147,8 @@ diff -Naur -X ../exclude-files orig/include/asm-um/xor.h um/include/asm-um/xor.h
 +
 +#endif
 diff -Naur -X ../exclude-files orig/include/linux/blk.h um/include/linux/blk.h
---- orig/include/linux/blk.h	2004-01-11 22:46:30.000000000 -0500
-+++ um/include/linux/blk.h	2004-02-14 06:29:18.000000000 -0500
+--- orig/include/linux/blk.h	2002-09-15 12:13:19.000000000 -0400
++++ um/include/linux/blk.h	2003-12-17 02:16:30.000000000 -0500
 @@ -320,6 +320,24 @@
  #define DEVICE_REQUEST do_ida_request
  #define DEVICE_NR(device) (MINOR(device) >> 4)
@@ -41123,7 +41176,7 @@ diff -Naur -X ../exclude-files orig/include/linux/blk.h um/include/linux/blk.h
  /* provide DEVICE_xxx defaults, if not explicitly defined
 diff -Naur -X ../exclude-files orig/include/linux/fs.h um/include/linux/fs.h
 --- orig/include/linux/fs.h	2003-12-16 22:16:36.000000000 -0500
-+++ um/include/linux/fs.h	2004-02-14 06:28:59.000000000 -0500
++++ um/include/linux/fs.h	2003-12-17 02:16:13.000000000 -0500
 @@ -320,6 +320,8 @@
  #include <linux/ncp_fs_i.h>
  #include <linux/proc_fs_i.h>
@@ -41255,8 +41308,8 @@ diff -Naur -X ../exclude-files orig/include/linux/hppfs_fs_i.h um/include/linux/
 + * End:
 + */
 diff -Naur -X ../exclude-files orig/include/linux/kernel.h um/include/linux/kernel.h
---- orig/include/linux/kernel.h	2004-01-11 22:46:12.000000000 -0500
-+++ um/include/linux/kernel.h	2004-02-14 06:28:59.000000000 -0500
+--- orig/include/linux/kernel.h	2003-02-27 13:04:27.000000000 -0500
++++ um/include/linux/kernel.h	2003-12-17 02:16:13.000000000 -0500
 @@ -49,7 +49,7 @@
  # define ATTRIB_NORET  __attribute__((noreturn))
  # define NORET_AND     noreturn,
@@ -41267,8 +41320,8 @@ diff -Naur -X ../exclude-files orig/include/linux/kernel.h um/include/linux/kern
  #else
  #define FASTCALL(x)	x
 diff -Naur -X ../exclude-files orig/include/linux/kernel_stat.h um/include/linux/kernel_stat.h
---- orig/include/linux/kernel_stat.h	2004-01-11 22:46:12.000000000 -0500
-+++ um/include/linux/kernel_stat.h	2004-02-14 06:28:59.000000000 -0500
+--- orig/include/linux/kernel_stat.h	2003-08-29 17:26:25.000000000 -0400
++++ um/include/linux/kernel_stat.h	2003-12-17 02:16:13.000000000 -0500
 @@ -12,7 +12,7 @@
   * used by rstatd/perfmeter
   */
@@ -41280,7 +41333,7 @@ diff -Naur -X ../exclude-files orig/include/linux/kernel_stat.h um/include/linux
  struct kernel_stat {
 diff -Naur -X ../exclude-files orig/include/linux/mm.h um/include/linux/mm.h
 --- orig/include/linux/mm.h	2003-12-16 22:16:36.000000000 -0500
-+++ um/include/linux/mm.h	2004-02-14 06:28:59.000000000 -0500
++++ um/include/linux/mm.h	2003-12-17 02:16:13.000000000 -0500
 @@ -438,6 +438,18 @@
  extern struct page * FASTCALL(__alloc_pages(unsigned int gfp_mask, unsigned int order, zonelist_t *zonelist));
  extern struct page * alloc_pages_node(int nid, unsigned int gfp_mask, unsigned int order);
@@ -41345,7 +41398,7 @@ diff -Naur -X ../exclude-files orig/include/linux/mm.h um/include/linux/mm.h
  }
 diff -Naur -X ../exclude-files orig/include/linux/proc_mm.h um/include/linux/proc_mm.h
 --- orig/include/linux/proc_mm.h	1969-12-31 19:00:00.000000000 -0500
-+++ um/include/linux/proc_mm.h	2004-02-14 06:30:22.000000000 -0500
++++ um/include/linux/proc_mm.h	2003-12-17 02:17:30.000000000 -0500
 @@ -0,0 +1,48 @@
 +/* 
 + * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
@@ -41408,8 +41461,8 @@ diff -Naur -X ../exclude-files orig/include/linux/shmem_fs.h um/include/linux/sh
  	unsigned long		flags;
  	struct list_head	list;
 diff -Naur -X ../exclude-files orig/include/linux/tty.h um/include/linux/tty.h
---- orig/include/linux/tty.h	2004-01-11 22:46:12.000000000 -0500
-+++ um/include/linux/tty.h	2004-02-14 06:28:59.000000000 -0500
+--- orig/include/linux/tty.h	2003-08-29 17:26:26.000000000 -0400
++++ um/include/linux/tty.h	2003-12-17 02:16:13.000000000 -0500
 @@ -309,6 +309,9 @@
  	spinlock_t read_lock;
  	/* If the tty has a pending do_SAK, queue it here - akpm */
@@ -41493,8 +41546,8 @@ diff -Naur -X ../exclude-files orig/MAINTAINERS um/MAINTAINERS
  USB "USBNET" DRIVER
  P:	David Brownell
 diff -Naur -X ../exclude-files orig/Makefile um/Makefile
---- orig/Makefile	2004-02-14 06:26:12.000000000 -0500
-+++ um/Makefile	2004-02-14 06:26:19.000000000 -0500
+--- orig/Makefile	2003-12-16 22:16:23.000000000 -0500
++++ um/Makefile	2003-12-16 22:17:22.000000000 -0500
 @@ -5,7 +5,15 @@
  
  KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
diff --git a/lustre/kernel_patches/patches/uml-patch-2.6.0-1-fix1.patch b/lustre/kernel_patches/patches/uml-patch-2.6.0-1-fix1.patch
new file mode 100644
index 0000000..997cd49
--- /dev/null
+++ b/lustre/kernel_patches/patches/uml-patch-2.6.0-1-fix1.patch
@@ -0,0 +1,15 @@
+Index: linux-2.6.0/include/asm-um/unistd.h
+===================================================================
+--- linux-2.6.0.orig/include/asm-um/unistd.h	2004-02-03 18:07:34.000000000 +0300
++++ linux-2.6.0/include/asm-um/unistd.h	2004-02-03 20:29:49.000000000 +0300
+@@ -6,8 +6,10 @@
+ #ifndef _UM_UNISTD_H_
+ #define _UM_UNISTD_H_
+ 
++#ifdef __KERNEL__
+ #include "linux/resource.h"
+ #include "asm/uaccess.h"
++#endif
+ 
+ extern long sys_open(const char *filename, int flags, int mode);
+ extern long sys_dup(unsigned int fildes);
diff --git a/lustre/kernel_patches/patches/uml-patch-2.6.0-1.patch b/lustre/kernel_patches/patches/uml-patch-2.6.0-1.patch
new file mode 100644
index 0000000..8bfe6a2
--- /dev/null
+++ b/lustre/kernel_patches/patches/uml-patch-2.6.0-1.patch
@@ -0,0 +1,18163 @@
+diff -Naur a/arch/um/config.release b/arch/um/config.release
+--- a/arch/um/config.release	2004-01-08 22:31:37.000000000 -0500
++++ b/arch/um/config.release	2004-01-08 22:36:18.000000000 -0500
+@@ -228,7 +228,6 @@
+ CONFIG_EXT2_FS=y
+ CONFIG_SYSV_FS=m
+ CONFIG_UDF_FS=m
+-# CONFIG_UDF_RW is not set
+ CONFIG_UFS_FS=m
+ # CONFIG_UFS_FS_WRITE is not set
+ 
+diff -Naur a/arch/um/defconfig b/arch/um/defconfig
+--- a/arch/um/defconfig	2004-01-08 22:24:41.000000000 -0500
++++ b/arch/um/defconfig	2004-01-08 22:32:17.000000000 -0500
+@@ -3,29 +3,19 @@
+ #
+ CONFIG_USERMODE=y
+ CONFIG_MMU=y
+-CONFIG_SWAP=y
+ CONFIG_UID16=y
+ CONFIG_RWSEM_GENERIC_SPINLOCK=y
+-CONFIG_CONFIG_LOG_BUF_SHIFT=14
+ 
+ #
+-# Code maturity level options
+-#
+-CONFIG_EXPERIMENTAL=y
+-
+-#
+-# General Setup
++# UML-specific options
+ #
+ CONFIG_MODE_TT=y
+ CONFIG_MODE_SKAS=y
+ CONFIG_NET=y
+-CONFIG_SYSVIPC=y
+-CONFIG_BSD_PROCESS_ACCT=y
+-CONFIG_SYSCTL=y
+-CONFIG_BINFMT_AOUT=y
+ CONFIG_BINFMT_ELF=y
+ CONFIG_BINFMT_MISC=y
+ CONFIG_HOSTFS=y
++CONFIG_HPPFS=y
+ CONFIG_MCONSOLE=y
+ CONFIG_MAGIC_SYSRQ=y
+ # CONFIG_HOST_2G_2G is not set
+@@ -36,12 +26,41 @@
+ # CONFIG_HIGHMEM is not set
+ CONFIG_PROC_MM=y
+ CONFIG_KERNEL_STACK_ORDER=2
++CONFIG_UML_REAL_TIME_CLOCK=y
++
++#
++# Code maturity level options
++#
++CONFIG_EXPERIMENTAL=y
++CONFIG_CLEAN_COMPILE=y
++CONFIG_STANDALONE=y
++CONFIG_BROKEN_ON_SMP=y
++
++#
++# General setup
++#
++CONFIG_SWAP=y
++CONFIG_SYSVIPC=y
++CONFIG_BSD_PROCESS_ACCT=y
++CONFIG_SYSCTL=y
++CONFIG_LOG_BUF_SHIFT=14
++# CONFIG_IKCONFIG is not set
++# CONFIG_EMBEDDED is not set
++CONFIG_KALLSYMS=y
++CONFIG_FUTEX=y
++CONFIG_EPOLL=y
++CONFIG_IOSCHED_NOOP=y
++CONFIG_IOSCHED_AS=y
++CONFIG_IOSCHED_DEADLINE=y
+ 
+ #
+ # Loadable module support
+ #
+-CONFIG_MODULES=y
+-# CONFIG_KMOD is not set
++# CONFIG_MODULES is not set
++
++#
++# Generic Driver Options
++#
+ 
+ #
+ # Character Devices
+@@ -69,6 +88,7 @@
+ #
+ CONFIG_BLK_DEV_UBD=y
+ # CONFIG_BLK_DEV_UBD_SYNC is not set
++CONFIG_BLK_DEV_COW_COMMON=y
+ CONFIG_BLK_DEV_LOOP=y
+ CONFIG_BLK_DEV_NBD=y
+ CONFIG_BLK_DEV_RAM=y
+@@ -78,7 +98,7 @@
+ CONFIG_NETDEVICES=y
+ 
+ #
+-# Network Devices
++# UML Network Devices
+ #
+ CONFIG_UML_NET=y
+ CONFIG_UML_NET_ETHERTAP=y
+@@ -88,22 +108,6 @@
+ CONFIG_UML_NET_MCAST=y
+ # CONFIG_UML_NET_PCAP is not set
+ CONFIG_UML_NET_SLIRP=y
+-CONFIG_DUMMY=y
+-# CONFIG_BONDING is not set
+-# CONFIG_EQUALIZER is not set
+-CONFIG_TUN=y
+-# CONFIG_ETHERTAP is not set
+-CONFIG_PPP=y
+-# CONFIG_PPP_MULTILINK is not set
+-# CONFIG_PPP_ASYNC is not set
+-# CONFIG_PPP_SYNC_TTY is not set
+-# CONFIG_PPP_DEFLATE is not set
+-# CONFIG_PPP_BSDCOMP is not set
+-# CONFIG_PPPOE is not set
+-CONFIG_SLIP=y
+-# CONFIG_SLIP_COMPRESSED is not set
+-# CONFIG_SLIP_SMART is not set
+-# CONFIG_SLIP_MODE_SLIP6 is not set
+ 
+ #
+ # Networking support
+@@ -115,8 +119,6 @@
+ CONFIG_PACKET=y
+ CONFIG_PACKET_MMAP=y
+ # CONFIG_NETLINK_DEV is not set
+-# CONFIG_NETFILTER is not set
+-# CONFIG_FILTER is not set
+ CONFIG_UNIX=y
+ # CONFIG_NET_KEY is not set
+ CONFIG_INET=y
+@@ -130,8 +132,11 @@
+ # CONFIG_SYN_COOKIES is not set
+ # CONFIG_INET_AH is not set
+ # CONFIG_INET_ESP is not set
+-# CONFIG_XFRM_USER is not set
++# CONFIG_INET_IPCOMP is not set
+ # CONFIG_IPV6 is not set
++# CONFIG_DECNET is not set
++# CONFIG_BRIDGE is not set
++# CONFIG_NETFILTER is not set
+ 
+ #
+ # SCTP Configuration (EXPERIMENTAL)
+@@ -140,9 +145,9 @@
+ # CONFIG_IP_SCTP is not set
+ # CONFIG_ATM is not set
+ # CONFIG_VLAN_8021Q is not set
+-# CONFIG_LLC is not set
+-# CONFIG_DECNET is not set
+-# CONFIG_BRIDGE is not set
++# CONFIG_LLC2 is not set
++# CONFIG_IPX is not set
++# CONFIG_ATALK is not set
+ # CONFIG_X25 is not set
+ # CONFIG_LAPB is not set
+ # CONFIG_NET_DIVERT is not set
+@@ -160,6 +165,10 @@
+ # Network testing
+ #
+ # CONFIG_NET_PKTGEN is not set
++CONFIG_DUMMY=y
++# CONFIG_BONDING is not set
++# CONFIG_EQUALIZER is not set
++CONFIG_TUN=y
+ 
+ #
+ # Ethernet (10 or 100Mbit)
+@@ -171,12 +180,28 @@
+ #
+ 
+ #
++# Ethernet (10000 Mbit)
++#
++CONFIG_PPP=y
++# CONFIG_PPP_MULTILINK is not set
++# CONFIG_PPP_FILTER is not set
++# CONFIG_PPP_ASYNC is not set
++# CONFIG_PPP_SYNC_TTY is not set
++# CONFIG_PPP_DEFLATE is not set
++# CONFIG_PPP_BSDCOMP is not set
++# CONFIG_PPPOE is not set
++CONFIG_SLIP=y
++# CONFIG_SLIP_COMPRESSED is not set
++# CONFIG_SLIP_SMART is not set
++# CONFIG_SLIP_MODE_SLIP6 is not set
++
++#
+ # Wireless LAN (non-hamradio)
+ #
+ # CONFIG_NET_RADIO is not set
+ 
+ #
+-# Token Ring devices (depends on LLC=y)
++# Token Ring devices
+ #
+ # CONFIG_SHAPER is not set
+ 
+@@ -186,68 +211,101 @@
+ # CONFIG_WAN is not set
+ 
+ #
++# Amateur Radio support
++#
++# CONFIG_HAMRADIO is not set
++
++#
++# IrDA (infrared) support
++#
++# CONFIG_IRDA is not set
++
++#
++# Bluetooth support
++#
++# CONFIG_BT is not set
++
++#
+ # File systems
+ #
++CONFIG_EXT2_FS=y
++# CONFIG_EXT2_FS_XATTR is not set
++# CONFIG_EXT3_FS is not set
++# CONFIG_JBD is not set
++CONFIG_REISERFS_FS=y
++# CONFIG_REISERFS_CHECK is not set
++# CONFIG_REISERFS_PROC_INFO is not set
++# CONFIG_JFS_FS is not set
++# CONFIG_XFS_FS is not set
++CONFIG_MINIX_FS=y
++# CONFIG_ROMFS_FS is not set
+ CONFIG_QUOTA=y
+ # CONFIG_QFMT_V1 is not set
+ # CONFIG_QFMT_V2 is not set
+ CONFIG_QUOTACTL=y
+-CONFIG_AUTOFS_FS=m
+-CONFIG_AUTOFS4_FS=m
+-CONFIG_REISERFS_FS=m
+-# CONFIG_REISERFS_CHECK is not set
+-# CONFIG_REISERFS_PROC_INFO is not set
++CONFIG_AUTOFS_FS=y
++CONFIG_AUTOFS4_FS=y
++
++#
++# CD-ROM/DVD Filesystems
++#
++CONFIG_ISO9660_FS=y
++# CONFIG_JOLIET is not set
++# CONFIG_ZISOFS is not set
++# CONFIG_UDF_FS is not set
++
++#
++# DOS/FAT/NT Filesystems
++#
++CONFIG_FAT_FS=y
++CONFIG_MSDOS_FS=y
++CONFIG_VFAT_FS=y
++# CONFIG_NTFS_FS is not set
++
++#
++# Pseudo filesystems
++#
++CONFIG_PROC_FS=y
++CONFIG_PROC_KCORE=y
++CONFIG_DEVFS_FS=y
++CONFIG_DEVFS_MOUNT=y
++# CONFIG_DEVFS_DEBUG is not set
++CONFIG_DEVPTS_FS=y
++# CONFIG_DEVPTS_FS_XATTR is not set
++# CONFIG_TMPFS is not set
++# CONFIG_HUGETLB_PAGE is not set
++CONFIG_RAMFS=y
++
++#
++# Miscellaneous filesystems
++#
+ # CONFIG_ADFS_FS is not set
+ # CONFIG_AFFS_FS is not set
+ # CONFIG_HFS_FS is not set
+ # CONFIG_BEFS_FS is not set
+ # CONFIG_BFS_FS is not set
+-# CONFIG_EXT3_FS is not set
+-# CONFIG_JBD is not set
+-CONFIG_FAT_FS=m
+-CONFIG_MSDOS_FS=m
+-CONFIG_VFAT_FS=m
+ # CONFIG_EFS_FS is not set
+ CONFIG_JFFS_FS=y
+ CONFIG_JFFS_FS_VERBOSE=0
+-CONFIG_JFFS_PROC_FS=y
+ # CONFIG_JFFS2_FS is not set
+ # CONFIG_CRAMFS is not set
+-# CONFIG_TMPFS is not set
+-CONFIG_RAMFS=y
+-CONFIG_ISO9660_FS=m
+-# CONFIG_JOLIET is not set
+-# CONFIG_ZISOFS is not set
+-# CONFIG_JFS_FS is not set
+-CONFIG_MINIX_FS=m
+ # CONFIG_VXFS_FS is not set
+-# CONFIG_NTFS_FS is not set
+ # CONFIG_HPFS_FS is not set
+-CONFIG_PROC_FS=y
+-CONFIG_DEVFS_FS=y
+-CONFIG_DEVFS_MOUNT=y
+-# CONFIG_DEVFS_DEBUG is not set
+-CONFIG_DEVPTS_FS=y
+ # CONFIG_QNX4FS_FS is not set
+-# CONFIG_ROMFS_FS is not set
+-CONFIG_EXT2_FS=y
+-# CONFIG_EXT2_FS_XATTR is not set
+ # CONFIG_SYSV_FS is not set
+-# CONFIG_UDF_FS is not set
+ # CONFIG_UFS_FS is not set
+-# CONFIG_XFS_FS is not set
+ 
+ #
+ # Network File Systems
+ #
+-# CONFIG_CODA_FS is not set
+-# CONFIG_INTERMEZZO_FS is not set
+ # CONFIG_NFS_FS is not set
+ # CONFIG_NFSD is not set
+ # CONFIG_EXPORTFS is not set
+-# CONFIG_CIFS is not set
+ # CONFIG_SMB_FS is not set
++# CONFIG_CIFS is not set
+ # CONFIG_NCP_FS is not set
++# CONFIG_CODA_FS is not set
++# CONFIG_INTERMEZZO_FS is not set
+ # CONFIG_AFS_FS is not set
+ 
+ #
+@@ -317,28 +375,7 @@
+ #
+ # SCSI support
+ #
+-CONFIG_SCSI=y
+-CONFIG_GENERIC_ISA_DMA=y
+-
+-#
+-# SCSI support type (disk, tape, CD-ROM)
+-#
+-CONFIG_BLK_DEV_SD=y
+-CONFIG_SD_EXTRA_DEVS=40
+-CONFIG_CHR_DEV_ST=y
+-CONFIG_BLK_DEV_SR=y
+-CONFIG_BLK_DEV_SR_VENDOR=y
+-CONFIG_SR_EXTRA_DEVS=2
+-CONFIG_CHR_DEV_SG=y
+-
+-#
+-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+-#
+-CONFIG_SCSI_DEBUG_QUEUES=y
+-CONFIG_SCSI_MULTI_LUN=y
+-CONFIG_SCSI_CONSTANTS=y
+-CONFIG_SCSI_LOGGING=y
+-CONFIG_SCSI_DEBUG=y
++# CONFIG_SCSI is not set
+ 
+ #
+ # Multi-device support (RAID and LVM)
+@@ -360,6 +397,7 @@
+ CONFIG_MTD_BLOCK=y
+ # CONFIG_FTL is not set
+ # CONFIG_NFTL is not set
++# CONFIG_INFTL is not set
+ 
+ #
+ # RAM/ROM/Flash chip drivers
+@@ -374,20 +412,21 @@
+ #
+ # Mapping drivers for chip access
+ #
++# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+ 
+ #
+ # Self-contained MTD device drivers
+ #
+ # CONFIG_MTD_SLRAM is not set
+ # CONFIG_MTD_MTDRAM is not set
+-CONFIG_MTD_BLKMTD=m
++CONFIG_MTD_BLKMTD=y
+ 
+ #
+ # Disk-On-Chip Device Drivers
+ #
+-# CONFIG_MTD_DOC1000 is not set
+ # CONFIG_MTD_DOC2000 is not set
+ # CONFIG_MTD_DOC2001 is not set
++# CONFIG_MTD_DOC2001PLUS is not set
+ 
+ #
+ # NAND Flash Device Drivers
+diff -Naur a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
+--- a/arch/um/drivers/chan_kern.c	2004-01-08 22:32:12.000000000 -0500
++++ b/arch/um/drivers/chan_kern.c	2004-01-08 22:36:26.000000000 -0500
+@@ -8,6 +8,7 @@
+ #include <linux/list.h>
+ #include <linux/slab.h>
+ #include <linux/tty.h>
++#include <linux/string.h>
+ #include <linux/tty_flip.h>
+ #include <asm/irq.h>
+ #include "chan_kern.h"
+@@ -265,6 +266,11 @@
+ {
+ 	int n = 0;
+ 
++	if(chan == NULL){
++		CONFIG_CHUNK(str, size, n, "none", 1);
++		return(n);
++	}
++
+ 	CONFIG_CHUNK(str, size, n, chan->ops->type, 0);
+ 
+ 	if(chan->dev == NULL){
+@@ -420,7 +426,8 @@
+ 		INIT_LIST_HEAD(chans);
+ 	}
+ 
+-	if((out = strchr(str, ',')) != NULL){
++	out = strchr(str, ',');
++	if(out != NULL){
+ 		in = str;
+ 		*out = '\0';
+ 		out++;
+@@ -475,12 +482,15 @@
+ 				goto out;
+ 			}
+ 			err = chan->ops->read(chan->fd, &c, chan->data);
+-			if(err > 0) tty_receive_char(tty, c);
++			if(err > 0) 
++				tty_receive_char(tty, c);
+ 		} while(err > 0);
++
+ 		if(err == 0) reactivate_fd(chan->fd, irq);
+ 		if(err == -EIO){
+ 			if(chan->primary){
+-				if(tty != NULL) tty_hangup(tty);
++				if(tty != NULL) 
++					tty_hangup(tty);
+ 				line_disable(dev, irq);
+ 				close_chan(chans);
+ 				free_chan(chans);
+diff -Naur a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c
+--- a/arch/um/drivers/chan_user.c	2004-01-08 22:13:40.000000000 -0500
++++ b/arch/um/drivers/chan_user.c	2004-01-08 22:17:53.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* 
+- * Copyright (C) 2000, 2001 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+@@ -7,7 +7,6 @@
+ #include <stdlib.h>
+ #include <errno.h>
+ #include <termios.h>
+-#include <fcntl.h>
+ #include <string.h>
+ #include <signal.h>
+ #include <sys/stat.h>
+@@ -24,29 +23,27 @@
+ 
+ void generic_close(int fd, void *unused)
+ {
+-	close(fd);
++	os_close_file(fd);
+ }
+ 
+ int generic_read(int fd, char *c_out, void *unused)
+ {
+ 	int n;
+ 
+-	n = read(fd, c_out, sizeof(*c_out));
+-	if(n < 0){
+-		if(errno == EAGAIN) return(0);
+-		return(-errno);
+-	}
+-	else if(n == 0) return(-EIO);
+-	return(1);
++	n = os_read_file(fd, c_out, sizeof(*c_out));
++
++	if(n == -EAGAIN) 
++		return(0);
++	else if(n == 0) 
++		return(-EIO);
++	return(n);
+ }
+ 
++/* XXX Trivial wrapper around os_write_file */
++
+ int generic_write(int fd, const char *buf, int n, void *unused)
+ {
+-	int count;
+-
+-	count = write(fd, buf, n);
+-	if(count < 0) return(-errno);
+-	return(count);
++	return(os_write_file(fd, buf, n));
+ }
+ 
+ int generic_console_write(int fd, const char *buf, int n, void *unused)
+@@ -68,15 +65,18 @@
+ int generic_window_size(int fd, void *unused, unsigned short *rows_out,
+ 			unsigned short *cols_out)
+ {
+-	struct winsize size;
+-	int ret = 0;
++	int rows, cols;
++	int ret;
++
++	ret = os_window_size(fd, &rows, &cols);
++	if(ret < 0)
++		return(ret);
++
++	ret = ((*rows_out != rows) || (*cols_out != cols));
++
++	*rows_out = rows;
++	*cols_out = cols;
+ 
+-	if(ioctl(fd, TIOCGWINSZ, &size) == 0){
+-		ret = ((*rows_out != size.ws_row) || 
+-		       (*cols_out != size.ws_col));
+-		*rows_out = size.ws_row;
+-		*cols_out = size.ws_col;
+-	}
+ 	return(ret);
+ }
+ 
+@@ -100,14 +100,16 @@
+ 	struct winch_data *data = arg;
+ 	sigset_t sigs;
+ 	int pty_fd, pipe_fd;
++	int count, err;
+ 	char c = 1;
+ 
+-	close(data->close_me);
++	os_close_file(data->close_me);
+ 	pty_fd = data->pty_fd;
+ 	pipe_fd = data->pipe_fd;
+-	if(write(pipe_fd, &c, sizeof(c)) != sizeof(c))
++	count = os_write_file(pipe_fd, &c, sizeof(c));
++	if(count != sizeof(c))
+ 		printk("winch_thread : failed to write synchronization "
+-		       "byte, errno = %d\n", errno);
++		       "byte, err = %d\n", -count);
+ 
+ 	signal(SIGWINCH, winch_handler);
+ 	sigfillset(&sigs);
+@@ -123,26 +125,24 @@
+ 		exit(1);
+ 	}
+ 
+-	if(ioctl(pty_fd, TIOCSCTTY, 0) < 0){
+-		printk("winch_thread : TIOCSCTTY failed, errno = %d\n", errno);
+-		exit(1);
+-	}
+-	if(tcsetpgrp(pty_fd, os_getpid()) < 0){
+-		printk("winch_thread : tcsetpgrp failed, errno = %d\n", errno);
++	err = os_new_tty_pgrp(pty_fd, os_getpid());
++	if(err < 0){
++		printk("winch_thread : new_tty_pgrp failed, err = %d\n", -err);
+ 		exit(1);
+ 	}
+ 
+-	if(read(pipe_fd, &c, sizeof(c)) != sizeof(c))
++	count = os_read_file(pipe_fd, &c, sizeof(c));
++	if(count != sizeof(c))
+ 		printk("winch_thread : failed to read synchronization byte, "
+-		       "errno = %d\n", errno);
++		       "err = %d\n", -count);
+ 
+ 	while(1){
+ 		pause();
+ 
+-		if(write(pipe_fd, &c, sizeof(c)) != sizeof(c)){
+-			printk("winch_thread : write failed, errno = %d\n",
+-			       errno);
+-		}
++		count = os_write_file(pipe_fd, &c, sizeof(c));
++		if(count != sizeof(c))
++			printk("winch_thread : write failed, err = %d\n",
++			       -count);
+ 	}
+ }
+ 
+@@ -154,8 +154,8 @@
+ 	char c;
+ 
+ 	err = os_pipe(fds, 1, 1);
+-	if(err){
+-		printk("winch_tramp : os_pipe failed, errno = %d\n", -err);
++	if(err < 0){
++		printk("winch_tramp : os_pipe failed, err = %d\n", -err);
+ 		return(err);
+ 	}
+ 
+@@ -168,12 +168,12 @@
+ 		return(pid);
+ 	}
+ 
+-	close(fds[1]);
++	os_close_file(fds[1]);
+ 	*fd_out = fds[0];
+-	n = read(fds[0], &c, sizeof(c));
++	n = os_read_file(fds[0], &c, sizeof(c));
+ 	if(n != sizeof(c)){
+ 		printk("winch_tramp : failed to read synchronization byte\n");
+-		printk("read returned %d, errno = %d\n", n, errno);
++		printk("read failed, err = %d\n", -n);
+ 		printk("fd %d will not support SIGWINCH\n", fd);
+ 		*fd_out = -1;
+ 	}
+@@ -183,20 +183,24 @@
+ void register_winch(int fd, void *device_data)
+ {
+ 	int pid, thread, thread_fd;
++	int count;
+ 	char c = 1;
+ 
+-	if(!isatty(fd)) return;
++	if(!isatty(fd)) 
++		return;
+ 
+ 	pid = tcgetpgrp(fd);
+-	if(!CHOOSE_MODE(is_tracer_winch(pid, fd, device_data), 0) && 
+-	   (pid == -1)){
++	if(!CHOOSE_MODE_PROC(is_tracer_winch, is_skas_winch, pid, fd, 
++			     device_data) && (pid == -1)){
+ 		thread = winch_tramp(fd, device_data, &thread_fd);
+ 		if(fd != -1){
+ 			register_winch_irq(thread_fd, fd, thread, device_data);
+ 
+-			if(write(thread_fd, &c, sizeof(c)) != sizeof(c))
++			count = os_write_file(thread_fd, &c, sizeof(c));
++			if(count != sizeof(c))
+ 				printk("register_winch : failed to write "
+-				       "synchronization byte\n");
++				       "synchronization byte, err = %d\n",
++					-count);
+ 		}
+ 	}
+ }
+diff -Naur a/arch/um/drivers/cow.h b/arch/um/drivers/cow.h
+--- a/arch/um/drivers/cow.h	1969-12-31 19:00:00.000000000 -0500
++++ b/arch/um/drivers/cow.h	2004-01-08 22:20:48.000000000 -0500
+@@ -0,0 +1,41 @@
++#ifndef __COW_H__
++#define __COW_H__
++
++#include <asm/types.h>
++
++#if __BYTE_ORDER == __BIG_ENDIAN
++# define ntohll(x) (x)
++# define htonll(x) (x)
++#elif __BYTE_ORDER == __LITTLE_ENDIAN
++# define ntohll(x)  bswap_64(x)
++# define htonll(x)  bswap_64(x)
++#else
++#error "__BYTE_ORDER not defined"
++#endif
++
++extern int init_cow_file(int fd, char *cow_file, char *backing_file, 
++			 int sectorsize, int alignment, int *bitmap_offset_out, 
++			 unsigned long *bitmap_len_out, int *data_offset_out);
++
++extern int file_reader(__u64 offset, char *buf, int len, void *arg);
++extern int read_cow_header(int (*reader)(__u64, char *, int, void *), 
++			   void *arg, __u32 *version_out, 
++			   char **backing_file_out, time_t *mtime_out, 
++			   __u64 *size_out, int *sectorsize_out, 
++			   __u32 *align_out, int *bitmap_offset_out);
++
++extern int write_cow_header(char *cow_file, int fd, char *backing_file, 
++			    int sectorsize, int alignment, long long *size);
++
++extern void cow_sizes(int version, __u64 size, int sectorsize, int align,
++		      int bitmap_offset, unsigned long *bitmap_len_out, 
++		      int *data_offset_out);
++
++#endif
++
++/*
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/arch/um/drivers/cow_kern.c b/arch/um/drivers/cow_kern.c
+--- a/arch/um/drivers/cow_kern.c	1969-12-31 19:00:00.000000000 -0500
++++ b/arch/um/drivers/cow_kern.c	2004-01-08 22:36:26.000000000 -0500
+@@ -0,0 +1,630 @@
++#define COW_MAJOR 60
++#define MAJOR_NR COW_MAJOR
++
++#include <linux/stddef.h>
++#include <linux/kernel.h>
++#include <linux/ctype.h>
++#include <linux/stat.h>
++#include <linux/vmalloc.h>
++#include <linux/blkdev.h>
++#include <linux/blk.h>
++#include <linux/fs.h>
++#include <linux/genhd.h>
++#include <linux/devfs_fs.h>
++#include <asm/uaccess.h>
++#include "2_5compat.h"
++#include "cow.h"
++#include "ubd_user.h"
++
++#define COW_SHIFT 4
++
++struct cow {
++	int count;
++	char *cow_path;
++	dev_t cow_dev;
++	struct block_device *cow_bdev;
++	char *backing_path;
++	dev_t backing_dev;
++	struct block_device *backing_bdev;
++	int sectorsize;
++	unsigned long *bitmap;
++	unsigned long bitmap_len;
++	int bitmap_offset;
++	int data_offset;
++	devfs_handle_t devfs;
++	struct semaphore sem;
++	struct semaphore io_sem;
++	atomic_t working;
++	spinlock_t io_lock;
++	struct buffer_head *bh;
++	struct buffer_head *bhtail;
++	void *end_io;
++};
++
++#define DEFAULT_COW { \
++	.count			= 0, \
++	.cow_path		= NULL, \
++	.cow_dev		= 0, \
++	.backing_path		= NULL, \
++	.backing_dev		= 0, \
++        .bitmap			= NULL, \
++	.bitmap_len		= 0, \
++	.bitmap_offset		= 0, \
++        .data_offset		= 0, \
++	.devfs			= NULL, \
++	.working		= ATOMIC_INIT(0), \
++	.io_lock		= SPIN_LOCK_UNLOCKED, \
++}
++
++#define MAX_DEV (8)
++#define MAX_MINOR (MAX_DEV << COW_SHIFT)
++
++struct cow cow_dev[MAX_DEV] = { [ 0 ... MAX_DEV - 1 ] = DEFAULT_COW };
++
++/* Not modified by this driver */
++static int blk_sizes[MAX_MINOR] = { [ 0 ... MAX_MINOR - 1 ] = BLOCK_SIZE };
++static int hardsect_sizes[MAX_MINOR] = { [ 0 ... MAX_MINOR - 1 ] = 512 };
++
++/* Protected by cow_lock */
++static int sizes[MAX_MINOR] = { [ 0 ... MAX_MINOR - 1 ] = 0 };
++
++static struct hd_struct	cow_part[MAX_MINOR] =
++	{ [ 0 ... MAX_MINOR - 1 ] = { 0, 0, 0 } };
++
++/* Protected by io_request_lock */
++static request_queue_t *cow_queue;
++
++static int cow_open(struct inode *inode, struct file *filp);
++static int cow_release(struct inode * inode, struct file * file);
++static int cow_ioctl(struct inode * inode, struct file * file,
++		     unsigned int cmd, unsigned long arg);
++static int cow_revalidate(kdev_t rdev);
++
++static struct block_device_operations cow_blops = {
++       .open		= cow_open,
++       .release	= cow_release,
++       .ioctl		= cow_ioctl,
++       .revalidate	= cow_revalidate,
++};
++
++/* Initialized in an initcall, and unchanged thereafter */
++devfs_handle_t cow_dir_handle;
++
++#define INIT_GENDISK(maj, name, parts, shift, bsizes, max, blops) \
++{ \
++	.major 		= maj, \
++	.major_name  	= name, \
++	.minor_shift 	= shift, \
++	.max_p  	= 1 << shift, \
++	.part  		= parts, \
++	.sizes  	= bsizes, \
++	.nr_real  	= max, \
++	.real_devices  	= NULL, \
++	.next  		= NULL, \
++	.fops  		= blops, \
++	.de_arr  	= NULL, \
++	.flags  	= 0 \
++}
++
++static spinlock_t cow_lock = SPIN_LOCK_UNLOCKED;
++
++static struct gendisk cow_gendisk = INIT_GENDISK(MAJOR_NR, "cow", cow_part,
++						 COW_SHIFT, sizes, MAX_DEV, 
++						 &cow_blops);
++
++static int cow_add(int n)
++{
++	struct cow *dev = &cow_dev[n];
++	char name[sizeof("nnnnnn\0")];
++	int err = -ENODEV;
++
++	if(dev->cow_path == NULL)
++		goto out;
++
++	sprintf(name, "%d", n);
++	dev->devfs = devfs_register(cow_dir_handle, name, DEVFS_FL_REMOVABLE,
++				    MAJOR_NR, n << COW_SHIFT, S_IFBLK | 
++				    S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
++				    &cow_blops, NULL);
++
++	init_MUTEX_LOCKED(&dev->sem);
++	init_MUTEX(&dev->io_sem);
++
++	return(0);
++
++out:
++	return(err);
++}
++
++/*
++* Add buffer_head to back of pending list
++*/
++static void cow_add_bh(struct cow *cow, struct buffer_head *bh)
++{
++	unsigned long flags;
++
++	spin_lock_irqsave(&cow->io_lock, flags);
++	if(cow->bhtail != NULL){
++		cow->bhtail->b_reqnext = bh;
++		cow->bhtail = bh;
++	}
++	else {
++		cow->bh = bh;
++		cow->bhtail = bh;
++	}
++	spin_unlock_irqrestore(&cow->io_lock, flags);
++}
++
++/*
++* Grab first pending buffer
++*/
++static struct buffer_head *cow_get_bh(struct cow *cow)
++{
++	struct buffer_head *bh;
++
++	spin_lock_irq(&cow->io_lock);
++	bh = cow->bh;
++	if(bh != NULL){
++		if(bh == cow->bhtail)
++			cow->bhtail = NULL;
++		cow->bh = bh->b_reqnext;
++		bh->b_reqnext = NULL;
++	}
++	spin_unlock_irq(&cow->io_lock);
++
++	return(bh);
++}
++
++static void cow_handle_bh(struct cow *cow, struct buffer_head *bh, 
++			  struct buffer_head **cow_bh, int ncow_bh)
++{
++	int i;
++
++	if(ncow_bh > 0)
++		ll_rw_block(WRITE, ncow_bh, cow_bh);
++
++	for(i = 0; i < ncow_bh ; i++){
++		wait_on_buffer(cow_bh[i]);
++		brelse(cow_bh[i]);
++	}
++
++	ll_rw_block(WRITE, 1, &bh);
++	brelse(bh);
++}
++
++static struct buffer_head *cow_new_bh(struct cow *dev, int sector)
++{
++	struct buffer_head *bh;
++
++	sector = (dev->bitmap_offset + sector / 8) / dev->sectorsize;
++	bh = getblk(dev->cow_dev, sector, dev->sectorsize);
++	memcpy(bh->b_data, dev->bitmap + sector / (8 * sizeof(dev->bitmap[0])),
++	       dev->sectorsize);
++	return(bh);
++}
++
++/* Copied from loop.c, needed to avoid deadlocking in make_request. */
++
++static int cow_thread(void *data)
++{
++	struct cow *dev = data;
++	struct buffer_head *bh;
++
++	daemonize();
++	exit_files(current);
++
++	sprintf(current->comm, "cow%d", dev - cow_dev);
++
++	spin_lock_irq(&current->sigmask_lock);
++	sigfillset(&current->blocked);
++	flush_signals(current);
++	spin_unlock_irq(&current->sigmask_lock);
++
++	atomic_inc(&dev->working);
++
++	current->policy = SCHED_OTHER;
++	current->nice = -20;
++
++	current->flags |= PF_NOIO;
++
++	/*
++	 * up sem, we are running
++	 */
++	up(&dev->sem);
++
++	for(;;){
++		int start, len, nbh, i, update_bitmap = 0;
++		struct buffer_head *cow_bh[2];
++
++		down_interruptible(&dev->io_sem);
++		/*
++		 * could be upped because of tear-down, not because of
++		 * pending work
++		 */
++		if(!atomic_read(&dev->working))
++			break;
++
++		bh = cow_get_bh(dev);
++		if(bh == NULL){
++			printk(KERN_ERR "cow: missing bh\n");
++			continue;
++		}
++
++		start = bh->b_blocknr * bh->b_size / dev->sectorsize;
++		len = bh->b_size / dev->sectorsize;
++		for(i = 0; i < len ; i++){
++			if(ubd_test_bit(start +ni, 
++					(unsigned char *) dev->bitmap))
++				continue;
++
++			update_bitmap = 1;
++			ubd_set_bit(start + i, (unsigned char *) dev->bitmap);
++		}
++
++		cow_bh[0] = NULL;
++		cow_bh[1] = NULL;
++		nbh = 0;
++		if(update_bitmap){
++			cow_bh[0] = cow_new_bh(dev, start);
++			nbh++;
++			if(start / dev->sectorsize != 
++			   (start + len) / dev->sectorsize){
++				cow_bh[1] = cow_new_bh(dev, start + len);
++				nbh++;
++			}
++		}
++		
++		bh->b_dev = dev->cow_dev;
++		bh->b_blocknr += dev->data_offset / dev->sectorsize;
++
++		cow_handle_bh(dev, bh, cow_bh, nbh);
++
++		/*
++		 * upped both for pending work and tear-down, lo_pending
++		 * will hit zero then
++		 */
++		if(atomic_dec_and_test(&dev->working))
++			break;
++	}
++
++	up(&dev->sem);
++	return(0);
++}
++
++static int cow_make_request(request_queue_t *q, int rw, struct buffer_head *bh)
++{
++	struct cow *dev;
++	int n, minor;
++
++	minor = MINOR(bh->b_rdev);
++	n = minor >> COW_SHIFT;
++	dev = &cow_dev[n];
++
++	dev->end_io = NULL;
++	if(ubd_test_bit(bh->b_rsector, (unsigned char *) dev->bitmap)){
++		bh->b_rdev = dev->cow_dev;
++		bh->b_rsector += dev->data_offset / dev->sectorsize;
++	}
++	else if(rw == WRITE){
++		bh->b_dev = dev->cow_dev;
++		bh->b_blocknr += dev->data_offset / dev->sectorsize;
++
++		cow_add_bh(dev, bh);
++		up(&dev->io_sem);
++		return(0);
++	}
++	else {
++		bh->b_rdev = dev->backing_dev;
++	}
++
++	return(1);
++}
++
++int cow_init(void)
++{
++	int i;
++
++	cow_dir_handle = devfs_mk_dir (NULL, "cow", NULL);
++	if (devfs_register_blkdev(MAJOR_NR, "cow", &cow_blops)) {
++		printk(KERN_ERR "cow: unable to get major %d\n", MAJOR_NR);
++		return -1;
++	}
++	read_ahead[MAJOR_NR] = 8;		/* 8 sector (4kB) read-ahead */
++	blksize_size[MAJOR_NR] = blk_sizes;
++	blk_size[MAJOR_NR] = sizes;
++	INIT_HARDSECT(hardsect_size, MAJOR_NR, hardsect_sizes);
++
++	cow_queue = BLK_DEFAULT_QUEUE(MAJOR_NR);
++	blk_init_queue(cow_queue, NULL);
++	INIT_ELV(cow_queue, &cow_queue->elevator);
++	blk_queue_make_request(cow_queue, cow_make_request);
++
++       add_gendisk(&cow_gendisk);
++
++	for(i=0;i<MAX_DEV;i++) 
++		cow_add(i);
++
++	return(0);
++}
++
++__initcall(cow_init);
++
++static int reader(__u64 start, char *buf, int count, void *arg)
++{
++	dev_t dev = *((dev_t *) arg);
++	struct buffer_head *bh;
++	__u64 block;
++	int cur, offset, left, n, blocksize = get_hardsect_size(dev);
++
++	if(blocksize == 0)
++		panic("Zero blocksize");
++
++	block = start / blocksize;
++	offset = start % blocksize;
++	left = count;
++	cur = 0;
++	while(left > 0){
++		n = (left > blocksize) ? blocksize : left;
++
++		bh = bread(dev, block, (n < 512) ? 512 : n);
++		if(bh == NULL)
++			return(-EIO);
++
++		n -= offset;
++		memcpy(&buf[cur], bh->b_data + offset, n);
++		block++;
++		left -= n;
++		cur += n;
++		offset = 0;
++		brelse(bh);
++	}
++
++	return(count);
++}
++
++static int cow_open(struct inode *inode, struct file *filp)
++{
++	int (*dev_ioctl)(struct inode *, struct file *, unsigned int, 
++			 unsigned long);
++	mm_segment_t fs;
++	struct cow *dev;
++	__u64 size;
++	__u32 version, align;
++	time_t mtime;
++	char *backing_file;
++	int n, offset, err = 0;
++
++	n = DEVICE_NR(inode->i_rdev);
++	if(n >= MAX_DEV)
++		return(-ENODEV);
++	dev = &cow_dev[n];
++	offset = n << COW_SHIFT;
++
++	spin_lock(&cow_lock);
++
++	if(dev->count == 0){
++		dev->cow_dev = name_to_kdev_t(dev->cow_path);
++		if(dev->cow_dev == 0){
++			printk(KERN_ERR "cow_open - name_to_kdev_t(\"%s\") "
++			       "failed\n", dev->cow_path);
++			err = -ENODEV;
++		}
++
++		dev->backing_dev = name_to_kdev_t(dev->backing_path);
++		if(dev->backing_dev == 0){
++			printk(KERN_ERR "cow_open - name_to_kdev_t(\"%s\") "
++			       "failed\n", dev->backing_path);
++			err = -ENODEV;
++		}
++
++		if(err) 
++			goto out;
++
++		dev->cow_bdev = bdget(dev->cow_dev);
++		if(dev->cow_bdev == NULL){
++			printk(KERN_ERR "cow_open - bdget(\"%s\") failed\n", 
++			       dev->cow_path);
++			err = -ENOMEM;
++		}
++		dev->backing_bdev = bdget(dev->backing_dev);
++		if(dev->backing_bdev == NULL){
++			printk(KERN_ERR "cow_open - bdget(\"%s\") failed\n", 
++			       dev->backing_path);
++			err = -ENOMEM;
++		}
++
++		if(err) 
++			goto out;
++
++		err = blkdev_get(dev->cow_bdev, FMODE_READ|FMODE_WRITE, 0, 
++				 BDEV_RAW);
++		if(err){
++			printk("cow_open - blkdev_get of COW device failed, "
++			       "error = %d\n", err);
++			goto out;
++		}
++		
++		err = blkdev_get(dev->backing_bdev, FMODE_READ, 0, BDEV_RAW);
++		if(err){
++			printk("cow_open - blkdev_get of backing device "
++			       "failed, error = %d\n", err);
++			goto out;
++		}
++		
++		err = read_cow_header(reader, &dev->cow_dev, &version, 
++				      &backing_file, &mtime, &size,
++				      &dev->sectorsize, &align, 
++				      &dev->bitmap_offset);
++		if(err){
++			printk(KERN_ERR "cow_open - read_cow_header failed, "
++			       "err = %d\n", err);
++			goto out;
++		}
++
++		cow_sizes(version, size, dev->sectorsize, align, 
++			  dev->bitmap_offset, &dev->bitmap_len, 
++			  &dev->data_offset);
++		dev->bitmap = (void *) vmalloc(dev->bitmap_len);
++		if(dev->bitmap == NULL){
++			err = -ENOMEM;
++			printk(KERN_ERR "Failed to vmalloc COW bitmap\n");
++			goto out;
++		}
++		flush_tlb_kernel_vm();
++		
++		err = reader(dev->bitmap_offset, (char *) dev->bitmap, 
++			     dev->bitmap_len, &dev->cow_dev);
++		if(err < 0){
++			printk(KERN_ERR "Failed to read COW bitmap\n");
++			vfree(dev->bitmap);
++			goto out;
++		}
++
++		dev_ioctl = dev->backing_bdev->bd_op->ioctl;
++		fs = get_fs();
++		set_fs(KERNEL_DS);
++		err = (*dev_ioctl)(inode, filp, BLKGETSIZE, 
++				   (unsigned long) &sizes[offset]);
++		set_fs(fs);
++		if(err){
++			printk(KERN_ERR "cow_open - BLKGETSIZE failed, "
++			       "error = %d\n", err);
++			goto out;
++		}
++
++		kernel_thread(cow_thread, dev, 
++			      CLONE_FS | CLONE_FILES | CLONE_SIGHAND);
++		down(&dev->sem);
++	}
++	dev->count++;
++out:
++	spin_unlock(&cow_lock);
++	return(err);
++}
++
++static int cow_release(struct inode * inode, struct file * file)
++{
++	struct cow *dev;
++	int n, err;
++
++	n = DEVICE_NR(inode->i_rdev);
++	if(n >= MAX_DEV)
++		return(-ENODEV);
++	dev = &cow_dev[n];
++
++	spin_lock(&cow_lock);
++
++	if(--dev->count > 0)
++		goto out;
++
++	err = blkdev_put(dev->cow_bdev, BDEV_RAW);
++	if(err)
++		printk("cow_release - blkdev_put of cow device failed, "
++		       "error = %d\n", err);
++	bdput(dev->cow_bdev);
++	dev->cow_bdev = 0;
++
++	err = blkdev_put(dev->backing_bdev, BDEV_RAW);
++	if(err)
++		printk("cow_release - blkdev_put of backing device failed, "
++		       "error = %d\n", err);
++	bdput(dev->backing_bdev);
++	dev->backing_bdev = 0;
++
++out:
++	spin_unlock(&cow_lock);
++	return(0);
++}
++
++static int cow_ioctl(struct inode * inode, struct file * file,
++		     unsigned int cmd, unsigned long arg)
++{
++	struct cow *dev;
++	int (*dev_ioctl)(struct inode *, struct file *, unsigned int, 
++			 unsigned long);
++	int n;
++
++	n = DEVICE_NR(inode->i_rdev);
++	if(n >= MAX_DEV)
++		return(-ENODEV);
++	dev = &cow_dev[n];
++
++	dev_ioctl = dev->backing_bdev->bd_op->ioctl;
++	return((*dev_ioctl)(inode, file, cmd, arg));
++}
++
++static int cow_revalidate(kdev_t rdev)
++{
++	printk(KERN_ERR "Need to implement cow_revalidate\n");
++	return(0);
++}
++
++static int parse_unit(char **ptr)
++{
++	char *str = *ptr, *end;
++	int n = -1;
++
++	if(isdigit(*str)) {
++		n = simple_strtoul(str, &end, 0);
++		if(end == str)
++			return(-1);
++		*ptr = end;
++	}
++	else if (('a' <= *str) && (*str <= 'h')) {
++		n = *str - 'a';
++		str++;
++		*ptr = str;
++	}
++	return(n);
++}
++
++static int cow_setup(char *str)
++{
++	struct cow *dev;
++	char *cow_name, *backing_name;
++	int unit;
++
++	unit = parse_unit(&str);
++	if(unit < 0){
++		printk(KERN_ERR "cow_setup - Couldn't parse unit number\n");
++		return(1);
++	}
++
++	if(*str != '='){
++		printk(KERN_ERR "cow_setup - Missing '=' after unit "
++		       "number\n");
++		return(1);
++	}
++	str++;
++
++	cow_name = str;
++	backing_name = strchr(str, ',');
++	if(backing_name == NULL){
++		printk(KERN_ERR "cow_setup - missing backing device name\n");
++		return(0);
++	}
++	*backing_name = '\0';
++	backing_name++;
++
++	spin_lock(&cow_lock);
++
++	dev = &cow_dev[unit];
++	dev->cow_path = cow_name;
++	dev->backing_path = backing_name;
++	
++	spin_unlock(&cow_lock);
++	return(0);
++}
++
++__setup("cow", cow_setup);
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/arch/um/drivers/cow_sys.h b/arch/um/drivers/cow_sys.h
+--- a/arch/um/drivers/cow_sys.h	1969-12-31 19:00:00.000000000 -0500
++++ b/arch/um/drivers/cow_sys.h	2004-01-08 22:29:45.000000000 -0500
+@@ -0,0 +1,48 @@
++#ifndef __COW_SYS_H__
++#define __COW_SYS_H__
++
++#include "kern_util.h"
++#include "user_util.h"
++#include "os.h"
++#include "user.h"
++
++static inline void *cow_malloc(int size)
++{
++	return(um_kmalloc(size));
++}
++
++static inline void cow_free(void *ptr)
++{
++	kfree(ptr);
++}
++
++#define cow_printf printk
++
++static inline char *cow_strdup(char *str)
++{
++	return(uml_strdup(str));
++}
++
++static inline int cow_seek_file(int fd, __u64 offset)
++{
++	return(os_seek_file(fd, offset));
++}
++
++static inline int cow_file_size(char *file, __u64 *size_out)
++{
++	return(os_file_size(file, size_out));
++}
++
++static inline int cow_write_file(int fd, char *buf, int size)
++{
++	return(os_write_file(fd, buf, size));
++}
++
++#endif
++
++/*
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/arch/um/drivers/cow_user.c b/arch/um/drivers/cow_user.c
+--- a/arch/um/drivers/cow_user.c	1969-12-31 19:00:00.000000000 -0500
++++ b/arch/um/drivers/cow_user.c	2004-01-08 22:28:43.000000000 -0500
+@@ -0,0 +1,375 @@
++#include <stddef.h>
++#include <string.h>
++#include <errno.h>
++#include <unistd.h>
++#include <byteswap.h>
++#include <sys/time.h>
++#include <sys/param.h>
++#include <sys/user.h>
++#include <netinet/in.h>
++
++#include "os.h"
++
++#include "cow.h"
++#include "cow_sys.h"
++
++#define PATH_LEN_V1 256
++
++struct cow_header_v1 {
++	int magic;
++	int version;
++	char backing_file[PATH_LEN_V1];
++	time_t mtime;
++	__u64 size;
++	int sectorsize;
++};
++
++#define PATH_LEN_V2 MAXPATHLEN
++
++struct cow_header_v2 {
++	unsigned long magic;
++	unsigned long version;
++	char backing_file[PATH_LEN_V2];
++	time_t mtime;
++	__u64 size;
++	int sectorsize;
++};
++
++/* Define PATH_LEN_V3 as the usual value of MAXPATHLEN, just hard-code it in 
++ * case other systems have different values for MAXPATHLEN
++ */
++#define PATH_LEN_V3 4096
++
++/* Changes from V2 - 
++ *	PATH_LEN_V3 as described above
++ *	Explicitly specify field bit lengths for systems with different
++ *		lengths for the usual C types.  Not sure whether char or
++ *		time_t should be changed, this can be changed later without
++ *		breaking compatibility
++ *	Add alignment field so that different alignments can be used for the
++ *		bitmap and data
++ * 	Add cow_format field to allow for the possibility of different ways
++ *		of specifying the COW blocks.  For now, the only value is 0,
++ * 		for the traditional COW bitmap.
++ *	Move the backing_file field to the end of the header.  This allows
++ *		for the possibility of expanding it into the padding required
++ *		by the bitmap alignment.
++ * 	The bitmap and data portions of the file will be aligned as specified
++ * 		by the alignment field.  This is to allow COW files to be
++ *		put on devices with restrictions on access alignments, such as
++ *		/dev/raw, with a 512 byte alignment restriction.  This also
++ *		allows the data to be more aligned more strictly than on
++ *		sector boundaries.  This is needed for ubd-mmap, which needs
++ *		the data to be page aligned.
++ *	Fixed (finally!) the rounding bug
++ */
++
++struct cow_header_v3 {
++	__u32 magic;
++	__u32 version;
++	time_t mtime;
++	__u64 size;
++	__u32 sectorsize;
++	__u32 alignment;
++	__u32 cow_format;
++	char backing_file[PATH_LEN_V3];
++};
++
++/* COW format definitions - for now, we have only the usual COW bitmap */
++#define COW_BITMAP 0
++
++union cow_header {
++	struct cow_header_v1 v1;
++	struct cow_header_v2 v2;
++	struct cow_header_v3 v3;
++};
++
++#define COW_MAGIC 0x4f4f4f4d  /* MOOO */
++#define COW_VERSION 3
++
++#define DIV_ROUND(x, len) (((x) + (len) - 1) / (len))
++#define ROUND_UP(x, align) DIV_ROUND(x, align) * (align)
++
++void cow_sizes(int version, __u64 size, int sectorsize, int align, 
++	       int bitmap_offset, unsigned long *bitmap_len_out, 
++	       int *data_offset_out)
++{
++	if(version < 3){
++		*bitmap_len_out = (size + sectorsize - 1) / (8 * sectorsize);
++
++		*data_offset_out = bitmap_offset + *bitmap_len_out;
++		*data_offset_out = (*data_offset_out + sectorsize - 1) / 
++			sectorsize;
++		*data_offset_out *= sectorsize;
++	}
++	else {
++		*bitmap_len_out = DIV_ROUND(size, sectorsize);
++		*bitmap_len_out = DIV_ROUND(*bitmap_len_out, 8);
++
++		*data_offset_out = bitmap_offset + *bitmap_len_out;
++		*data_offset_out = ROUND_UP(*data_offset_out, align);
++	}
++}
++
++static int absolutize(char *to, int size, char *from)
++{
++	char save_cwd[256], *slash;
++	int remaining;
++
++	if(getcwd(save_cwd, sizeof(save_cwd)) == NULL) {
++		cow_printf("absolutize : unable to get cwd - errno = %d\n", 
++			   errno);
++		return(-1);
++	}
++	slash = strrchr(from, '/');
++	if(slash != NULL){
++		*slash = '\0';
++		if(chdir(from)){
++			*slash = '/';
++			cow_printf("absolutize : Can't cd to '%s' - " 
++				   "errno = %d\n", from, errno);
++			return(-1);
++		}
++		*slash = '/';
++		if(getcwd(to, size) == NULL){
++			cow_printf("absolutize : unable to get cwd of '%s' - "
++			       "errno = %d\n", from, errno);
++			return(-1);
++		}
++		remaining = size - strlen(to);
++		if(strlen(slash) + 1 > remaining){
++			cow_printf("absolutize : unable to fit '%s' into %d "
++			       "chars\n", from, size);
++			return(-1);
++		}
++		strcat(to, slash);
++	}
++	else {
++		if(strlen(save_cwd) + 1 + strlen(from) + 1 > size){
++			cow_printf("absolutize : unable to fit '%s' into %d "
++			       "chars\n", from, size);
++			return(-1);
++		}
++		strcpy(to, save_cwd);
++		strcat(to, "/");
++		strcat(to, from);
++	}
++	chdir(save_cwd);
++	return(0);
++}
++
++int write_cow_header(char *cow_file, int fd, char *backing_file, 
++		     int sectorsize, int alignment, long long *size)
++{
++	struct cow_header_v3 *header;
++	unsigned long modtime;
++	int err;
++
++	err = cow_seek_file(fd, 0);
++	if(err < 0){
++		cow_printf("write_cow_header - lseek failed, err = %d\n", -err);
++		goto out;
++	}
++
++	err = -ENOMEM;
++	header = cow_malloc(sizeof(*header));
++	if(header == NULL){
++		cow_printf("Failed to allocate COW V3 header\n");
++		goto out;
++	}
++	header->magic = htonl(COW_MAGIC);
++	header->version = htonl(COW_VERSION);
++
++	err = -EINVAL;
++	if(strlen(backing_file) > sizeof(header->backing_file) - 1){
++		cow_printf("Backing file name \"%s\" is too long - names are "
++			   "limited to %d characters\n", backing_file, 
++			   sizeof(header->backing_file) - 1);
++		goto out_free;
++	}
++
++	if(absolutize(header->backing_file, sizeof(header->backing_file), 
++		      backing_file))
++		goto out_free;
++
++	err = os_file_modtime(header->backing_file, &modtime);
++	if(err < 0){
++		cow_printf("Backing file '%s' mtime request failed, "
++			   "err = %d\n", header->backing_file, -err);
++		goto out_free;
++	}
++
++	err = cow_file_size(header->backing_file, size);
++	if(err < 0){
++		cow_printf("Couldn't get size of backing file '%s', "
++			   "err = %d\n", header->backing_file, -err);
++		goto out_free;
++	}
++
++	header->mtime = htonl(modtime);
++	header->size = htonll(*size);
++	header->sectorsize = htonl(sectorsize);
++	header->alignment = htonl(alignment);
++	header->cow_format = COW_BITMAP;
++
++	err = os_write_file(fd, header, sizeof(*header));
++	if(err != sizeof(*header)){
++		cow_printf("Write of header to new COW file '%s' failed, "
++			   "err = %d\n", cow_file, -err);
++		goto out_free;
++	}
++	err = 0;
++ out_free:
++	cow_free(header);
++ out:
++	return(err);
++}
++
++int file_reader(__u64 offset, char *buf, int len, void *arg)
++{
++	int fd = *((int *) arg);
++
++	return(pread(fd, buf, len, offset));
++}
++
++/* XXX Need to sanity-check the values read from the header */
++
++int read_cow_header(int (*reader)(__u64, char *, int, void *), void *arg, 
++		    __u32 *version_out, char **backing_file_out, 
++		    time_t *mtime_out, __u64 *size_out, 
++		    int *sectorsize_out, __u32 *align_out, 
++		    int *bitmap_offset_out)
++{
++	union cow_header *header;
++	char *file;
++	int err, n;
++	unsigned long version, magic;
++
++	header = cow_malloc(sizeof(*header));
++	if(header == NULL){
++	        cow_printf("read_cow_header - Failed to allocate header\n");
++		return(-ENOMEM);
++	}
++	err = -EINVAL;
++	n = (*reader)(0, (char *) header, sizeof(*header), arg);
++	if(n < offsetof(typeof(header->v1), backing_file)){
++		cow_printf("read_cow_header - short header\n");
++		goto out;
++	}
++
++	magic = header->v1.magic;
++	if(magic == COW_MAGIC) {
++		version = header->v1.version;
++	}
++	else if(magic == ntohl(COW_MAGIC)){
++		version = ntohl(header->v1.version);
++	}
++	/* No error printed because the non-COW case comes through here */
++	else goto out;
++
++	*version_out = version;
++
++	if(version == 1){
++		if(n < sizeof(header->v1)){
++			cow_printf("read_cow_header - failed to read V1 "
++				   "header\n");
++			goto out;
++		}
++		*mtime_out = header->v1.mtime;
++		*size_out = header->v1.size;
++		*sectorsize_out = header->v1.sectorsize;
++		*bitmap_offset_out = sizeof(header->v1);
++		*align_out = *sectorsize_out;
++		file = header->v1.backing_file;
++	}
++	else if(version == 2){
++		if(n < sizeof(header->v2)){
++			cow_printf("read_cow_header - failed to read V2 "
++				   "header\n");
++			goto out;
++		}
++		*mtime_out = ntohl(header->v2.mtime);
++		*size_out = ntohll(header->v2.size);
++		*sectorsize_out = ntohl(header->v2.sectorsize);
++		*bitmap_offset_out = sizeof(header->v2);
++		*align_out = *sectorsize_out;
++		file = header->v2.backing_file;
++	}
++	else if(version == 3){
++		if(n < sizeof(header->v3)){
++			cow_printf("read_cow_header - failed to read V2 "
++				   "header\n");
++			goto out;
++		}
++		*mtime_out = ntohl(header->v3.mtime);
++		*size_out = ntohll(header->v3.size);
++		*sectorsize_out = ntohl(header->v3.sectorsize);
++		*align_out = ntohl(header->v3.alignment);
++		*bitmap_offset_out = ROUND_UP(sizeof(header->v3), *align_out);
++		file = header->v3.backing_file;
++	}
++	else {
++		cow_printf("read_cow_header - invalid COW version\n");
++		goto out;		
++	}
++	err = -ENOMEM;
++	*backing_file_out = cow_strdup(file);
++	if(*backing_file_out == NULL){
++		cow_printf("read_cow_header - failed to allocate backing "
++			   "file\n");
++		goto out;
++	}
++	err = 0;
++ out:
++	cow_free(header);
++	return(err);
++}
++
++int init_cow_file(int fd, char *cow_file, char *backing_file, int sectorsize,
++		  int alignment, int *bitmap_offset_out, 
++		  unsigned long *bitmap_len_out, int *data_offset_out)
++{
++	__u64 size, offset;
++	char zero = 0;
++	int err;
++
++	err = write_cow_header(cow_file, fd, backing_file, sectorsize, 
++			       alignment, &size);
++	if(err) 
++		goto out;
++	
++	*bitmap_offset_out = ROUND_UP(sizeof(struct cow_header_v3), alignment);
++	cow_sizes(COW_VERSION, size, sectorsize, alignment, *bitmap_offset_out,
++		  bitmap_len_out, data_offset_out);
++
++	offset = *data_offset_out + size - sizeof(zero);
++	err = cow_seek_file(fd, offset);
++	if(err < 0){
++		cow_printf("cow bitmap lseek failed : err = %d\n", -err);
++		goto out;
++	}
++
++	/* does not really matter how much we write it is just to set EOF 
++	 * this also sets the entire COW bitmap
++	 * to zero without having to allocate it 
++	 */
++	err = cow_write_file(fd, &zero, sizeof(zero));
++	if(err != sizeof(zero)){
++		cow_printf("Write of bitmap to new COW file '%s' failed, "
++			   "err = %d\n", cow_file, -err);
++		err = -EINVAL;
++		goto out;
++	}
++
++	return(0);
++
++ out:
++	return(err);
++}
++
++/*
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/arch/um/drivers/daemon_user.c b/arch/um/drivers/daemon_user.c
+--- a/arch/um/drivers/daemon_user.c	2004-01-08 22:19:18.000000000 -0500
++++ b/arch/um/drivers/daemon_user.c	2004-01-08 22:25:32.000000000 -0500
+@@ -53,7 +53,8 @@
+ 	struct request_v3 req;
+ 	int fd, n, err;
+ 
+-	if((pri->control = socket(AF_UNIX, SOCK_STREAM, 0)) < 0){
++	pri->control = socket(AF_UNIX, SOCK_STREAM, 0);
++	if(pri->control < 0){
+ 		printk("daemon_open : control socket failed, errno = %d\n", 
+ 		       errno);		
+ 		return(-errno);
+@@ -67,7 +68,8 @@
+ 		goto out;
+ 	}
+ 
+-	if((fd = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0){
++	fd = socket(AF_UNIX, SOCK_DGRAM, 0);
++	if(fd < 0){
+ 		printk("daemon_open : data socket failed, errno = %d\n", 
+ 		       errno);
+ 		err = -errno;
+@@ -91,18 +93,18 @@
+ 	req.version = SWITCH_VERSION;
+ 	req.type = REQ_NEW_CONTROL;
+ 	req.sock = *local_addr;
+-	n = write(pri->control, &req, sizeof(req));
++	n = os_write_file(pri->control, &req, sizeof(req));
+ 	if(n != sizeof(req)){
+-		printk("daemon_open : control setup request returned %d, "
+-		       "errno = %d\n", n, errno);
++		printk("daemon_open : control setup request failed, err = %d\n",
++		       -n);
+ 		err = -ENOTCONN;
+ 		goto out;		
+ 	}
+ 
+-	n = read(pri->control, sun, sizeof(*sun));
++	n = os_read_file(pri->control, sun, sizeof(*sun));
+ 	if(n != sizeof(*sun)){
+-		printk("daemon_open : read of data socket returned %d, "
+-		       "errno = %d\n", n, errno);
++		printk("daemon_open : read of data socket failed, err = %d\n", 
++		       -n);
+ 		err = -ENOTCONN;
+ 		goto out_close;		
+ 	}
+@@ -111,9 +113,9 @@
+ 	return(fd);
+ 
+  out_close:
+-	close(fd);
++	os_close_file(fd);
+  out:
+-	close(pri->control);
++	os_close_file(pri->control);
+ 	return(err);
+ }
+ 
+@@ -153,8 +155,8 @@
+ {
+ 	struct daemon_data *pri = data;
+ 
+-	close(pri->fd);
+-	close(pri->control);
++	os_close_file(pri->fd);
++	os_close_file(pri->control);
+ 	if(pri->data_addr != NULL) kfree(pri->data_addr);
+ 	if(pri->ctl_addr != NULL) kfree(pri->ctl_addr);
+ 	if(pri->local_addr != NULL) kfree(pri->local_addr);
+diff -Naur a/arch/um/drivers/fd.c b/arch/um/drivers/fd.c
+--- a/arch/um/drivers/fd.c	2004-01-08 22:31:17.000000000 -0500
++++ b/arch/um/drivers/fd.c	2004-01-08 22:35:52.000000000 -0500
+@@ -35,7 +35,8 @@
+ 		printk("fd_init : couldn't parse file descriptor '%s'\n", str);
+ 		return(NULL);
+ 	}
+-	if((data = um_kmalloc(sizeof(*data))) == NULL) return(NULL);
++	data = um_kmalloc(sizeof(*data));
++	if(data == NULL) return(NULL);
+ 	*data = ((struct fd_chan) { .fd  	= n,
+ 				    .raw  	= opts->raw });
+ 	return(data);
+diff -Naur a/arch/um/drivers/harddog_user.c b/arch/um/drivers/harddog_user.c
+--- a/arch/um/drivers/harddog_user.c	2004-01-08 22:17:52.000000000 -0500
++++ b/arch/um/drivers/harddog_user.c	2004-01-08 22:23:56.000000000 -0500
+@@ -27,10 +27,10 @@
+ 	dup2(data->stdin, 0);
+ 	dup2(data->stdout, 1);
+ 	dup2(data->stdout, 2);
+-	close(data->stdin);
+-	close(data->stdout);
+-	close(data->close_me[0]);
+-	close(data->close_me[1]);
++	os_close_file(data->stdin);
++	os_close_file(data->stdout);
++	os_close_file(data->close_me[0]);
++	os_close_file(data->close_me[1]);
+ }
+ 
+ int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock)
+@@ -44,15 +44,15 @@
+ 	char **args = NULL;
+ 
+ 	err = os_pipe(in_fds, 1, 0);
+-	if(err){
+-		printk("harddog_open - os_pipe failed, errno = %d\n", -err);
+-		return(err);
++	if(err < 0){
++		printk("harddog_open - os_pipe failed, err = %d\n", -err);
++		goto out;
+ 	}
+ 
+ 	err = os_pipe(out_fds, 1, 0);
+-	if(err){
+-		printk("harddog_open - os_pipe failed, errno = %d\n", -err);
+-		return(err);
++	if(err < 0){
++		printk("harddog_open - os_pipe failed, err = %d\n", -err);
++		goto out_close_in;
+ 	}
+ 
+ 	data.stdin = out_fds[0];
+@@ -72,42 +72,47 @@
+ 
+ 	pid = run_helper(pre_exec, &data, args, NULL);
+ 
+-	close(out_fds[0]);
+-	close(in_fds[1]);
++	os_close_file(out_fds[0]);
++	os_close_file(in_fds[1]);
+ 
+ 	if(pid < 0){
+ 		err = -pid;
+-		printk("harddog_open - run_helper failed, errno = %d\n", err);
+-		goto out;
++		printk("harddog_open - run_helper failed, errno = %d\n", -err);
++		goto out_close_out;
+ 	}
+ 
+-	n = read(in_fds[0], &c, sizeof(c));
++	n = os_read_file(in_fds[0], &c, sizeof(c));
+ 	if(n == 0){
+ 		printk("harddog_open - EOF on watchdog pipe\n");
+ 		helper_wait(pid);
+ 		err = -EIO;
+-		goto out;
++		goto out_close_out;
+ 	}
+ 	else if(n < 0){
+ 		printk("harddog_open - read of watchdog pipe failed, "
+-		       "errno = %d\n", errno);
++		       "err = %d\n", -n);
+ 		helper_wait(pid);
+-		err = -errno;
+-		goto out;
++		err = n;
++		goto out_close_out;
+ 	}
+ 	*in_fd_ret = in_fds[0];
+ 	*out_fd_ret = out_fds[1];
+ 	return(0);
++
++ out_close_in:
++	os_close_file(in_fds[0]);
++	os_close_file(in_fds[1]);
++ out_close_out:
++	os_close_file(out_fds[0]);
++	os_close_file(out_fds[1]);
+  out:
+-	close(out_fds[1]);
+-	close(in_fds[0]);
+ 	return(err);
+ }
+ 
+ void stop_watchdog(int in_fd, int out_fd)
+ {
+-	close(in_fd);
+-	close(out_fd);
++	os_close_file(in_fd);
++	os_close_file(out_fd);
+ }
+ 
+ int ping_watchdog(int fd)
+@@ -115,11 +120,12 @@
+ 	int n;
+ 	char c = '\n';
+ 
+-	n = write(fd, &c, sizeof(c));
+-	if(n < sizeof(c)){
+-		printk("ping_watchdog - write failed, errno = %d\n",
+-		       errno);
+-		return(-errno);
++	n = os_write_file(fd, &c, sizeof(c));
++	if(n != sizeof(c)){
++		printk("ping_watchdog - write failed, err = %d\n", -n);
++		if(n < 0) 
++			return(n);
++		return(-EIO);
+ 	}
+ 	return 1;
+ 
+diff -Naur a/arch/um/drivers/hostaudio_kern.c b/arch/um/drivers/hostaudio_kern.c
+--- a/arch/um/drivers/hostaudio_kern.c	2004-01-08 22:31:38.000000000 -0500
++++ b/arch/um/drivers/hostaudio_kern.c	2004-01-08 22:36:17.000000000 -0500
+@@ -5,12 +5,12 @@
+ 
+ #include "linux/config.h"
+ #include "linux/module.h"
+-#include "linux/version.h"
+ #include "linux/init.h"
+ #include "linux/slab.h"
+ #include "linux/fs.h"
+ #include "linux/sound.h"
+ #include "linux/soundcard.h"
++#include "asm/uaccess.h"
+ #include "kern_util.h"
+ #include "init.h"
+ #include "hostaudio.h"
+@@ -19,30 +19,39 @@
+ char *dsp = HOSTAUDIO_DEV_DSP;
+ char *mixer = HOSTAUDIO_DEV_MIXER;
+ 
++#define DSP_HELP \
++"    This is used to specify the host dsp device to the hostaudio driver.\n" \
++"    The default is \"" HOSTAUDIO_DEV_DSP "\".\n\n"
++
++#define MIXER_HELP \
++"    This is used to specify the host mixer device to the hostaudio driver.\n" \
++"    The default is \"" HOSTAUDIO_DEV_MIXER "\".\n\n"
++
+ #ifndef MODULE
+ static int set_dsp(char *name, int *add)
+ {
+-	dsp = uml_strdup(name);
++	dsp = name;
+ 	return(0);
+ }
+ 
+-__uml_setup("dsp=", set_dsp,
+-"dsp=<dsp device>\n"
+-"    This is used to specify the host dsp device to the hostaudio driver.\n"
+-"    The default is \"" HOSTAUDIO_DEV_DSP "\".\n\n"
+-);
++__uml_setup("dsp=", set_dsp, "dsp=<dsp device>\n" DSP_HELP);
+ 
+ static int set_mixer(char *name, int *add)
+ {
+-	mixer = uml_strdup(name);
++	mixer = name;
+ 	return(0);
+ }
+ 
+-__uml_setup("mixer=", set_mixer,
+-"mixer=<mixer device>\n"
+-"    This is used to specify the host mixer device to the hostaudio driver.\n"
+-"    The default is \"" HOSTAUDIO_DEV_MIXER "\".\n\n"
+-);
++__uml_setup("mixer=", set_mixer, "mixer=<mixer device>\n" MIXER_HELP);
++
++#else /*MODULE*/
++
++MODULE_PARM(dsp, "s");
++MODULE_PARM_DESC(dsp, DSP_HELP);
++
++MODULE_PARM(mixer, "s");
++MODULE_PARM_DESC(mixer, MIXER_HELP);
++
+ #endif
+ 
+ /* /dev/dsp file operations */
+@@ -51,23 +60,55 @@
+ 			      loff_t *ppos)
+ {
+         struct hostaudio_state *state = file->private_data;
++	void *kbuf;
++	int err;
+ 
+ #ifdef DEBUG
+         printk("hostaudio: read called, count = %d\n", count);
+ #endif
+ 
+-        return(hostaudio_read_user(state, buffer, count, ppos));
++	kbuf = kmalloc(count, GFP_KERNEL);
++	if(kbuf == NULL)
++		return(-ENOMEM);
++
++        err = hostaudio_read_user(state, kbuf, count, ppos);
++	if(err < 0)
++		goto out;
++
++	if(copy_to_user(buffer, kbuf, err))
++		err = -EFAULT;
++
++ out:
++	kfree(kbuf);
++	return(err);
+ }
+ 
+ static ssize_t hostaudio_write(struct file *file, const char *buffer, 
+ 			       size_t count, loff_t *ppos)
+ {
+         struct hostaudio_state *state = file->private_data;
++	void *kbuf;
++	int err;
+ 
+ #ifdef DEBUG
+         printk("hostaudio: write called, count = %d\n", count);
+ #endif
+-        return(hostaudio_write_user(state, buffer, count, ppos));
++
++	kbuf = kmalloc(count, GFP_KERNEL);
++	if(kbuf == NULL)
++		return(-ENOMEM);
++
++	err = -EFAULT;
++	if(copy_from_user(kbuf, buffer, count))
++		goto out;
++
++        err = hostaudio_write_user(state, kbuf, count, ppos);
++	if(err < 0)
++		goto out;
++
++ out:
++	kfree(kbuf);
++	return(err);
+ }
+ 
+ static unsigned int hostaudio_poll(struct file *file, 
+@@ -86,12 +127,43 @@
+ 			   unsigned int cmd, unsigned long arg)
+ {
+         struct hostaudio_state *state = file->private_data;
++	unsigned long data = 0;
++	int err;
+ 
+ #ifdef DEBUG
+         printk("hostaudio: ioctl called, cmd = %u\n", cmd);
+ #endif
++	switch(cmd){
++	case SNDCTL_DSP_SPEED:
++	case SNDCTL_DSP_STEREO:
++	case SNDCTL_DSP_GETBLKSIZE:
++	case SNDCTL_DSP_CHANNELS:
++	case SNDCTL_DSP_SUBDIVIDE:
++	case SNDCTL_DSP_SETFRAGMENT:
++		if(get_user(data, (int *) arg))
++			return(-EFAULT);
++		break;
++	default:
++		break;
++	}
++
++        err = hostaudio_ioctl_user(state, cmd, (unsigned long) &data);
++
++	switch(cmd){
++	case SNDCTL_DSP_SPEED:
++	case SNDCTL_DSP_STEREO:
++	case SNDCTL_DSP_GETBLKSIZE:
++	case SNDCTL_DSP_CHANNELS:
++	case SNDCTL_DSP_SUBDIVIDE:
++	case SNDCTL_DSP_SETFRAGMENT:
++		if(put_user(data, (int *) arg))
++			return(-EFAULT);
++		break;
++	default:
++		break;
++	}
+ 
+-        return(hostaudio_ioctl_user(state, cmd, arg));
++	return(err);
+ }
+ 
+ static int hostaudio_open(struct inode *inode, struct file *file)
+@@ -225,7 +297,8 @@
+ 
+ static int __init hostaudio_init_module(void)
+ {
+-        printk(KERN_INFO "UML Audio Relay\n");
++        printk(KERN_INFO "UML Audio Relay (host dsp = %s, host mixer = %s)\n",
++	       dsp, mixer);
+ 
+ 	module_data.dev_audio = register_sound_dsp(&hostaudio_fops, -1);
+         if(module_data.dev_audio < 0){
+diff -Naur a/arch/um/drivers/hostaudio_user.c b/arch/um/drivers/hostaudio_user.c
+--- a/arch/um/drivers/hostaudio_user.c	2004-01-08 22:26:01.000000000 -0500
++++ b/arch/um/drivers/hostaudio_user.c	2004-01-08 22:33:41.000000000 -0500
+@@ -4,9 +4,6 @@
+  */
+ 
+ #include <sys/types.h>
+-#include <sys/stat.h>
+-#include <sys/ioctl.h>
+-#include <fcntl.h>
+ #include <unistd.h>
+ #include <errno.h>
+ #include "hostaudio.h"
+@@ -20,16 +17,11 @@
+ ssize_t hostaudio_read_user(struct hostaudio_state *state, char *buffer, 
+ 			    size_t count, loff_t *ppos)
+ {
+-	ssize_t ret;
+-
+ #ifdef DEBUG
+         printk("hostaudio: read_user called, count = %d\n", count);
+ #endif
+ 
+-        ret = read(state->fd, buffer, count);
+-
+-        if(ret < 0) return(-errno);
+-        return(ret);
++	return(os_read_file(state->fd, buffer, count));
+ }
+ 
+ ssize_t hostaudio_write_user(struct hostaudio_state *state, const char *buffer,
+@@ -41,24 +33,19 @@
+         printk("hostaudio: write_user called, count = %d\n", count);
+ #endif
+ 
+-        ret = write(state->fd, buffer, count);
++	return(os_write_file(state->fd, buffer, count));
+ 
+-        if(ret < 0) return(-errno);
+         return(ret);
+ }
+ 
+ int hostaudio_ioctl_user(struct hostaudio_state *state, unsigned int cmd, 
+ 			 unsigned long arg)
+ {
+-	int ret;
+ #ifdef DEBUG
+         printk("hostaudio: ioctl_user called, cmd = %u\n", cmd);
+ #endif
+ 
+-        ret = ioctl(state->fd, cmd, arg);
+-	
+-        if(ret < 0) return(-errno);
+-        return(ret);
++	return(os_ioctl_generic(state->fd, cmd, arg));
+ }
+ 
+ int hostaudio_open_user(struct hostaudio_state *state, int r, int w, char *dsp)
+@@ -69,12 +56,13 @@
+ 
+         state->fd = os_open_file(dsp, of_set_rw(OPENFLAGS(), r, w), 0);
+ 
+-        if(state->fd >= 0) return(0);
+-
+-        printk("hostaudio_open_user failed to open '%s', errno = %d\n",
+-	       dsp, errno);
++	if(state->fd < 0) {
++	        printk("hostaudio_open_user failed to open '%s', err = %d\n",
++		       dsp, -state->fd);
++		return(state->fd); 
++	}
+         
+-        return(-errno); 
++	return(0);
+ }
+ 
+ int hostaudio_release_user(struct hostaudio_state *state)
+@@ -83,8 +71,8 @@
+         printk("hostaudio: release called\n");
+ #endif
+         if(state->fd >= 0){
+-		close(state->fd);
+-		state->fd=-1;
++		os_close_file(state->fd);
++		state->fd = -1;
+         }
+ 
+         return(0);
+@@ -95,15 +83,11 @@
+ int hostmixer_ioctl_mixdev_user(struct hostmixer_state *state, 
+ 				unsigned int cmd, unsigned long arg)
+ {
+-	int ret;
+ #ifdef DEBUG
+         printk("hostmixer: ioctl_user called cmd = %u\n",cmd);
+ #endif
+ 
+-        ret = ioctl(state->fd, cmd, arg);
+-	if(ret < 0) 
+-		return(-errno);
+-	return(ret);
++	return(os_ioctl_generic(state->fd, cmd, arg));
+ }
+ 
+ int hostmixer_open_mixdev_user(struct hostmixer_state *state, int r, int w,
+@@ -115,12 +99,13 @@
+ 
+         state->fd = os_open_file(mixer, of_set_rw(OPENFLAGS(), r, w), 0);
+ 
+-        if(state->fd >= 0) return(0);
+-
+-        printk("hostaudio_open_mixdev_user failed to open '%s', errno = %d\n",
+-	       mixer, errno);
++	if(state->fd < 0) {
++	        printk("hostaudio_open_mixdev_user failed to open '%s', "
++		       "err = %d\n", mixer, state->fd);
++		return(state->fd); 
++	}
+         
+-        return(-errno); 
++	return(0);
+ }
+ 
+ int hostmixer_release_mixdev_user(struct hostmixer_state *state)
+@@ -130,7 +115,7 @@
+ #endif
+ 
+         if(state->fd >= 0){
+-		close(state->fd);
++		os_close_file(state->fd);
+ 		state->fd = -1;
+         }
+ 
+diff -Naur a/arch/um/drivers/line.c b/arch/um/drivers/line.c
+--- a/arch/um/drivers/line.c	2004-01-08 22:29:48.000000000 -0500
++++ b/arch/um/drivers/line.c	2004-01-08 22:35:21.000000000 -0500
+@@ -6,8 +6,8 @@
+ #include "linux/sched.h"
+ #include "linux/slab.h"
+ #include "linux/list.h"
++#include "linux/interrupt.h"
+ #include "linux/devfs_fs_kernel.h"
+-#include "asm/irq.h"
+ #include "asm/uaccess.h"
+ #include "chan_kern.h"
+ #include "irq_user.h"
+@@ -16,38 +16,55 @@
+ #include "user_util.h"
+ #include "kern_util.h"
+ #include "os.h"
++#include "irq_kern.h"
+ 
+ #define LINE_BUFSIZE 4096
+ 
+-void line_interrupt(int irq, void *data, struct pt_regs *unused)
++static irqreturn_t line_interrupt(int irq, void *data, struct pt_regs *unused)
+ {
+ 	struct line *dev = data;
+ 
+ 	if(dev->count > 0) 
+ 		chan_interrupt(&dev->chan_list, &dev->task, dev->tty, irq, 
+ 			       dev);
++	return IRQ_HANDLED;
+ }
+ 
+-void line_timer_cb(void *arg)
++static void line_timer_cb(void *arg)
+ {
+ 	struct line *dev = arg;
+ 
+ 	line_interrupt(dev->driver->read_irq, dev, NULL);
+ }
+ 
+-static void buffer_data(struct line *line, const char *buf, int len)
++static int write_room(struct line *dev)
+ {
+-	int end;
++	int n;
++
++	if(dev->buffer == NULL) return(LINE_BUFSIZE - 1);
++
++	n = dev->head - dev->tail;
++	if(n <= 0) n = LINE_BUFSIZE + n;
++	return(n - 1);
++}
++
++static int buffer_data(struct line *line, const char *buf, int len)
++{
++	int end, room;
+ 
+ 	if(line->buffer == NULL){
+ 		line->buffer = kmalloc(LINE_BUFSIZE, GFP_ATOMIC);
+ 		if(line->buffer == NULL){
+ 			printk("buffer_data - atomic allocation failed\n");
+-			return;
++			return(0);
+ 		}
+ 		line->head = line->buffer;
+ 		line->tail = line->buffer;
+ 	}
++
++	room = write_room(line);
++	len = (len > room) ? room : len;
++
+ 	end = line->buffer + LINE_BUFSIZE - line->tail;
+ 	if(len < end){
+ 		memcpy(line->tail, buf, len);
+@@ -60,6 +77,8 @@
+ 		memcpy(line->buffer, buf, len);
+ 		line->tail = line->buffer + len;
+ 	}
++
++	return(len);
+ }
+ 
+ static int flush_buffer(struct line *line)
+@@ -95,7 +114,7 @@
+ 	struct line *line;
+ 	char *new;
+ 	unsigned long flags;
+-	int n, err, i;
++	int n, err, i, ret = 0;
+ 
+ 	if(tty->stopped) return 0;
+ 
+@@ -104,9 +123,13 @@
+ 		if(new == NULL)
+ 			return(0);
+ 		n = copy_from_user(new, buf, len);
+-		if(n == len)
+-			return(-EFAULT);
+ 		buf = new;
++		if(n == len){
++			len = -EFAULT;
++			goto out_free;
++		}
++
++		len -= n;
+ 	}
+ 
+ 	i = tty->index;
+@@ -115,41 +138,50 @@
+ 	down(&line->sem);
+ 	if(line->head != line->tail){
+ 		local_irq_save(flags);
+-		buffer_data(line, buf, len);
++		ret += buffer_data(line, buf, len);
+ 		err = flush_buffer(line);
+ 		local_irq_restore(flags);
+ 		if(err <= 0)
+-			goto out;
++			goto out_up;
+ 	}
+ 	else {
+ 		n = write_chan(&line->chan_list, buf, len, 
+ 			       line->driver->write_irq);
+ 		if(n < 0){
+-			len = n;
+-			goto out;
++			ret = n;
++			goto out_up;
+ 		}
+-		if(n < len)
+-			buffer_data(line, buf + n, len - n);
++
++		len -= n;
++		ret += n;
++		if(len > 0)
++			ret += buffer_data(line, buf + n, len);
+ 	}
+- out:
++ out_up:
+ 	up(&line->sem);
+-	return(len);
++ out_free:
++	if(from_user)
++		kfree(buf);
++	return(ret);
+ }
+ 
+-void line_write_interrupt(int irq, void *data, struct pt_regs *unused)
++static irqreturn_t line_write_interrupt(int irq, void *data, 
++					struct pt_regs *unused)
+ {
+ 	struct line *dev = data;
+ 	struct tty_struct *tty = dev->tty;
+ 	int err;
+ 
+ 	err = flush_buffer(dev);
+-	if(err == 0) return;
++	if(err == 0) 
++		return(IRQ_NONE);
+ 	else if(err < 0){
+ 		dev->head = dev->buffer;
+ 		dev->tail = dev->buffer;
+ 	}
+ 
+-	if(tty == NULL) return;
++	if(tty == NULL) 
++		return(IRQ_NONE);
+ 
+ 	if(test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags) &&
+ 	   (tty->ldisc.write_wakeup != NULL))
+@@ -161,21 +193,9 @@
+ 	 * writes.
+ 	 */
+ 
+-	if (waitqueue_active(&tty->write_wait))
++	if(waitqueue_active(&tty->write_wait))
+ 		wake_up_interruptible(&tty->write_wait);
+-
+-}
+-
+-int line_write_room(struct tty_struct *tty)
+-{
+-	struct line *dev = tty->driver_data;
+-	int n;
+-
+-	if(dev->buffer == NULL) return(LINE_BUFSIZE - 1);
+-
+-	n = dev->head - dev->tail;
+-	if(n <= 0) n = LINE_BUFSIZE + n;
+-	return(n - 1);
++	return(IRQ_HANDLED);
+ }
+ 
+ int line_setup_irq(int fd, int input, int output, void *data)
+@@ -305,7 +325,7 @@
+ 		if(*end != '='){
+ 			printk(KERN_ERR "line_setup failed to parse \"%s\"\n", 
+ 			       init);
+-			return(1);
++			return(0);
+ 		}
+ 		init = end;
+ 	}
+@@ -313,12 +333,12 @@
+ 	if((n >= 0) && (n >= num)){
+ 		printk("line_setup - %d out of range ((0 ... %d) allowed)\n",
+ 		       n, num);
+-		return(1);
++		return(0);
+ 	}
+ 	else if(n >= 0){
+ 		if(lines[n].count > 0){
+ 			printk("line_setup - device %d is open\n", n);
+-			return(1);
++			return(0);
+ 		}
+ 		if(lines[n].init_pri <= INIT_ONE){
+ 			lines[n].init_pri = INIT_ONE;
+@@ -332,7 +352,7 @@
+ 	else if(!all_allowed){
+ 		printk("line_setup - can't configure all devices from "
+ 		       "mconsole\n");
+-		return(1);
++		return(0);
+ 	}
+ 	else {
+ 		for(i = 0; i < num; i++){
+@@ -346,7 +366,7 @@
+ 			}
+ 		}
+ 	}
+-	return(0);
++	return(1);
+ }
+ 
+ int line_config(struct line *lines, int num, char *str)
+@@ -357,7 +377,7 @@
+ 		printk("line_config - uml_strdup failed\n");
+ 		return(-ENOMEM);
+ 	}
+-	return(line_setup(lines, num, new, 0));
++	return(!line_setup(lines, num, new, 0));
+ }
+ 
+ int line_get_config(char *name, struct line *lines, int num, char *str, 
+@@ -369,7 +389,7 @@
+ 
+ 	dev = simple_strtoul(name, &end, 0);
+ 	if((*end != '\0') || (end == name)){
+-		*error_out = "line_setup failed to parse device number";
++		*error_out = "line_get_config failed to parse device number";
+ 		return(0);
+ 	}
+ 
+@@ -379,15 +399,15 @@
+ 	}
+ 
+ 	line = &lines[dev];
++
+ 	down(&line->sem);
+-	
+ 	if(!line->valid)
+ 		CONFIG_CHUNK(str, size, n, "none", 1);
+ 	else if(line->count == 0)
+ 		CONFIG_CHUNK(str, size, n, line->init_str, 1);
+ 	else n = chan_config_string(&line->chan_list, str, size, error_out);
+-
+ 	up(&line->sem);
++
+ 	return(n);
+ }
+ 
+@@ -396,7 +416,14 @@
+ 	char config[sizeof("conxxxx=none\0")];
+ 
+ 	sprintf(config, "%s=none", str);
+-	return(line_setup(lines, num, config, 0));
++	return(!line_setup(lines, num, config, 0));
++}
++
++int line_write_room(struct tty_struct *tty)
++{
++	struct line *dev = tty->driver_data;
++
++	return(write_room(dev));
+ }
+ 
+ struct tty_driver *line_register_devfs(struct lines *set,
+@@ -412,7 +439,8 @@
+ 		return NULL;
+ 
+ 	driver->driver_name = line_driver->name;
+-	driver->name = line_driver->devfs_name;
++	driver->name = line_driver->device_name;
++	driver->devfs_name = line_driver->devfs_name;
+ 	driver->major = line_driver->major;
+ 	driver->minor_start = line_driver->minor_start;
+ 	driver->type = line_driver->type;
+@@ -432,7 +460,7 @@
+ 
+ 	for(i = 0; i < nlines; i++){
+ 		if(!lines[i].valid) 
+-			tty_unregister_devfs(driver, i);
++			tty_unregister_device(driver, i);
+ 	}
+ 
+ 	mconsole_register_dev(&line_driver->mc);
+@@ -465,24 +493,25 @@
+ 	struct line *line;
+ };
+ 
+-void winch_interrupt(int irq, void *data, struct pt_regs *unused)
++irqreturn_t winch_interrupt(int irq, void *data, struct pt_regs *unused)
+ {
+ 	struct winch *winch = data;
+ 	struct tty_struct *tty;
+ 	int err;
+ 	char c;
+ 
+-	err = generic_read(winch->fd, &c, NULL);
+-	if(err < 0){
+-		if(err != -EAGAIN){
+-			printk("winch_interrupt : read failed, errno = %d\n", 
+-			       -err);
+-			printk("fd %d is losing SIGWINCH support\n", 
+-			       winch->tty_fd);
+-			free_irq(irq, data);
+-			return;
++	if(winch->fd != -1){
++		err = generic_read(winch->fd, &c, NULL);
++		if(err < 0){
++			if(err != -EAGAIN){
++				printk("winch_interrupt : read failed, "
++				       "errno = %d\n", -err);
++				printk("fd %d is losing SIGWINCH support\n", 
++				       winch->tty_fd);
++				return(IRQ_HANDLED);
++			}
++			goto out;
+ 		}
+-		goto out;
+ 	}
+ 	tty = winch->line->tty;
+ 	if(tty != NULL){
+@@ -492,7 +521,9 @@
+ 		kill_pg(tty->pgrp, SIGWINCH, 1);
+ 	}
+  out:
+-	reactivate_fd(winch->fd, WINCH_IRQ);
++	if(winch->fd != -1)
++		reactivate_fd(winch->fd, WINCH_IRQ);
++	return(IRQ_HANDLED);
+ }
+ 
+ DECLARE_MUTEX(winch_handler_sem);
+@@ -529,7 +560,10 @@
+ 
+ 	list_for_each(ele, &winch_handlers){
+ 		winch = list_entry(ele, struct winch, list);
+-		close(winch->fd);
++		if(winch->fd != -1){
++			deactivate_fd(winch->fd, WINCH_IRQ);
++			os_close_file(winch->fd);
++		}
+ 		if(winch->pid != -1) 
+ 			os_kill_process(winch->pid, 1);
+ 	}
+diff -Naur a/arch/um/drivers/Makefile b/arch/um/drivers/Makefile
+--- a/arch/um/drivers/Makefile	2004-01-08 22:23:04.000000000 -0500
++++ b/arch/um/drivers/Makefile	2004-01-08 22:30:06.000000000 -0500
+@@ -1,5 +1,5 @@
+ # 
+-# Copyright (C) 2000, 2002 Jeff Dike (jdike@karaya.com)
++# Copyright (C) 2000, 2002, 2003 Jeff Dike (jdike@karaya.com)
+ # Licensed under the GPL
+ #
+ 
+@@ -39,6 +39,8 @@
+ obj-$(CONFIG_TTY_CHAN) += tty.o 
+ obj-$(CONFIG_XTERM_CHAN) += xterm.o xterm_kern.o
+ obj-$(CONFIG_UML_WATCHDOG) += harddog.o
++obj-$(CONFIG_BLK_DEV_COW) += cow_kern.o
++obj-$(CONFIG_BLK_DEV_COW_COMMON) += cow_user.o
+ 
+ obj-y += stdio_console.o $(CHAN_OBJS)
+ 
+@@ -46,7 +48,7 @@
+ 
+ USER_OBJS := $(filter %_user.o,$(obj-y) $(obj-m) $(USER_SINGLE_OBJS)) fd.o \
+ 	null.o pty.o tty.o xterm.o
+-USER_OBJS := $(foreach file,$(USER_OBJS),arch/um/drivers/$(file))
++USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
+ 
+ $(USER_OBJS) : %.o: %.c
+ 	$(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
+diff -Naur a/arch/um/drivers/mcast_user.c b/arch/um/drivers/mcast_user.c
+--- a/arch/um/drivers/mcast_user.c	2004-01-08 22:22:02.000000000 -0500
++++ b/arch/um/drivers/mcast_user.c	2004-01-08 22:28:53.000000000 -0500
+@@ -23,6 +23,7 @@
+ #include "kern_util.h"
+ #include "user_util.h"
+ #include "user.h"
++#include "os.h"
+ 
+ #define MAX_PACKET (ETH_MAX_PACKET + ETH_HEADER_OTHER)
+ 
+@@ -62,7 +63,8 @@
+ 		goto out;
+ 	}
+ 
+-	if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0){
++	fd = socket(AF_INET, SOCK_DGRAM, 0);
++	if (fd < 0){
+ 		printk("mcast_open : data socket failed, errno = %d\n", 
+ 		       errno);
+ 		fd = -ENOMEM;
+@@ -72,7 +74,7 @@
+ 	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0) {
+ 		printk("mcast_open: SO_REUSEADDR failed, errno = %d\n",
+ 			errno);
+-		close(fd);
++		os_close_file(fd);
+ 		fd = -EINVAL;
+ 		goto out;
+ 	}
+@@ -82,7 +84,7 @@
+ 		       sizeof(pri->ttl)) < 0) {
+ 		printk("mcast_open: IP_MULTICAST_TTL failed, error = %d\n",
+ 			errno);
+-		close(fd);
++		os_close_file(fd);
+ 		fd = -EINVAL;
+ 		goto out;
+ 	}
+@@ -91,7 +93,7 @@
+ 	if (setsockopt(fd, SOL_IP, IP_MULTICAST_LOOP, &yes, sizeof(yes)) < 0) {
+ 		printk("mcast_open: IP_MULTICAST_LOOP failed, error = %d\n",
+ 			errno);
+-		close(fd);
++		os_close_file(fd);
+ 		fd = -EINVAL;
+ 		goto out;
+ 	}
+@@ -99,7 +101,7 @@
+ 	/* bind socket to mcast address */
+ 	if (bind(fd, (struct sockaddr *) sin, sizeof(*sin)) < 0) {
+ 		printk("mcast_open : data bind failed, errno = %d\n", errno);
+-		close(fd);
++		os_close_file(fd);
+ 		fd = -EINVAL;
+ 		goto out;
+ 	}		
+@@ -115,7 +117,7 @@
+ 		       "interface on the host.\n");
+ 		printk("eth0 should be configured in order to use the "
+ 		       "multicast transport.\n");
+-		close(fd);
++		os_close_file(fd);
+ 		fd = -EINVAL;
+ 	}
+ 
+@@ -137,7 +139,7 @@
+ 			errno);
+ 	}
+ 
+-	close(fd);
++	os_close_file(fd);
+ }
+ 
+ int mcast_user_write(int fd, void *buf, int len, struct mcast_data *pri)
+diff -Naur a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
+--- a/arch/um/drivers/mconsole_kern.c	2004-01-08 22:13:41.000000000 -0500
++++ b/arch/um/drivers/mconsole_kern.c	2004-01-08 22:17:57.000000000 -0500
+@@ -1,6 +1,6 @@
+ /*
+  * Copyright (C) 2001 Lennert Buytenhek (buytenh@gnu.org)
+- * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2001 - 2003 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+@@ -15,6 +15,9 @@
+ #include "linux/sysrq.h"
+ #include "linux/workqueue.h"
+ #include "linux/module.h"
++#include "linux/file.h"
++#include "linux/fs.h"
++#include "linux/namei.h"
+ #include "linux/proc_fs.h"
+ #include "asm/irq.h"
+ #include "asm/uaccess.h"
+@@ -27,6 +30,7 @@
+ #include "init.h"
+ #include "os.h"
+ #include "umid.h"
++#include "irq_kern.h"
+ 
+ static int do_unlink_socket(struct notifier_block *notifier, 
+ 			    unsigned long what, void *data)
+@@ -67,7 +71,7 @@
+ 
+ DECLARE_WORK(mconsole_work, mc_work_proc, NULL);
+ 
+-void mconsole_interrupt(int irq, void *dev_id, struct pt_regs *regs)
++irqreturn_t mconsole_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+ {
+ 	int fd;
+ 	struct mconsole_entry *new;
+@@ -75,9 +79,10 @@
+ 
+ 	fd = (int) dev_id;
+ 	while (mconsole_get_request(fd, &req)){
+-		if(req.cmd->as_interrupt) (*req.cmd->handler)(&req);
++		if(req.cmd->context == MCONSOLE_INTR) 
++			(*req.cmd->handler)(&req);
+ 		else {
+-			new = kmalloc(sizeof(req), GFP_ATOMIC);
++			new = kmalloc(sizeof(*new), GFP_ATOMIC);
+ 			if(new == NULL)
+ 				mconsole_reply(&req, "Out of memory", 1, 0);
+ 			else {
+@@ -88,6 +93,7 @@
+ 	}
+ 	if(!list_empty(&mc_requests)) schedule_work(&mconsole_work);
+ 	reactivate_fd(fd, MCONSOLE_IRQ);
++	return(IRQ_HANDLED);
+ }
+ 
+ void mconsole_version(struct mc_request *req)
+@@ -100,20 +106,110 @@
+ 	mconsole_reply(req, version, 0, 0);
+ }
+ 
++void mconsole_log(struct mc_request *req)
++{
++	int len;
++	char *ptr = req->request.data;
++	
++	ptr += strlen("log");
++	while(isspace(*ptr)) ptr++;
++
++	len = req->len - (ptr - req->request.data);
++	printk("%.*s", len, ptr);
++	mconsole_reply(req, "", 0, 0);
++}
++
++void mconsole_proc(struct mc_request *req)
++{
++	struct nameidata nd;
++	struct file_system_type *proc;
++	struct super_block *super;
++	struct file *file;
++	int n, err;
++	char *ptr = req->request.data, *buf;
++	
++	ptr += strlen("proc");
++	while(isspace(*ptr)) ptr++;
++
++	proc = get_fs_type("proc");
++	if(proc == NULL){
++		mconsole_reply(req, "procfs not registered", 1, 0);
++		goto out;
++	}
++
++	super = (*proc->get_sb)(proc, 0, NULL, NULL);
++	put_filesystem(proc);
++	if(super == NULL){
++		mconsole_reply(req, "Failed to get procfs superblock", 1, 0);
++		goto out;
++	}
++	up_write(&super->s_umount);
++
++	nd.dentry = super->s_root;
++	nd.mnt = NULL;
++	nd.flags = O_RDONLY + 1;
++	nd.last_type = LAST_ROOT;
++
++	err = link_path_walk(ptr, &nd);
++	if(err){
++		mconsole_reply(req, "Failed to look up file", 1, 0);
++		goto out_kill;
++	}
++
++	file = dentry_open(nd.dentry, nd.mnt, O_RDONLY);
++	if(IS_ERR(file)){
++		mconsole_reply(req, "Failed to open file", 1, 0);
++		goto out_kill;
++	}
++
++	buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
++	if(buf == NULL){
++		mconsole_reply(req, "Failed to allocate buffer", 1, 0);
++		goto out_fput;
++	}
++
++	if((file->f_op != NULL) && (file->f_op->read != NULL)){
++		do {
++			n = (*file->f_op->read)(file, buf, PAGE_SIZE - 1, 
++						&file->f_pos);
++			if(n >= 0){
++				buf[n] = '\0';
++				mconsole_reply(req, buf, 0, (n > 0));
++			}
++			else {
++				mconsole_reply(req, "Read of file failed", 
++					       1, 0);
++				goto out_free;
++			}
++		} while(n > 0);
++	}
++	else mconsole_reply(req, "", 0, 0);
++
++ out_free:
++	kfree(buf);
++ out_fput:
++	fput(file);
++ out_kill:
++	deactivate_super(super);
++ out: ;
++}
++
+ #define UML_MCONSOLE_HELPTEXT \
+-"Commands:
+-    version - Get kernel version
+-    help - Print this message
+-    halt - Halt UML
+-    reboot - Reboot UML
+-    config <dev>=<config> - Add a new device to UML; 
+-	same syntax as command line
+-    config <dev> - Query the configuration of a device
+-    remove <dev> - Remove a device from UML
+-    sysrq <letter> - Performs the SysRq action controlled by the letter
+-    cad - invoke the Ctl-Alt-Del handler
+-    stop - pause the UML; it will do nothing until it receives a 'go'
+-    go - continue the UML after a 'stop'
++"Commands: \n\
++    version - Get kernel version \n\
++    help - Print this message \n\
++    halt - Halt UML \n\
++    reboot - Reboot UML \n\
++    config <dev>=<config> - Add a new device to UML;  \n\
++	same syntax as command line \n\
++    config <dev> - Query the configuration of a device \n\
++    remove <dev> - Remove a device from UML \n\
++    sysrq <letter> - Performs the SysRq action controlled by the letter \n\
++    cad - invoke the Ctl-Alt-Del handler \n\
++    stop - pause the UML; it will do nothing until it receives a 'go' \n\
++    go - continue the UML after a 'stop' \n\
++    log <string> - make UML enter <string> into the kernel log\n\
++    proc <file> - returns the contents of the UML's /proc/<file>\n\
+ "
+ 
+ void mconsole_help(struct mc_request *req)
+@@ -302,7 +398,7 @@
+ 	if(umid_file_name("mconsole", file, sizeof(file))) return(-1);
+ 	snprintf(mconsole_socket_name, sizeof(file), "%s", file);
+ 
+-	sock = create_unix_socket(file, sizeof(file));
++	sock = os_create_unix_socket(file, sizeof(file), 1);
+ 	if (sock < 0){
+ 		printk("Failed to initialize management console\n");
+ 		return(1);
+@@ -344,11 +440,16 @@
+ 	if(buf == NULL) 
+ 		return(-ENOMEM);
+ 
+-	if(copy_from_user(buf, buffer, count))
+-		return(-EFAULT);
++	if(copy_from_user(buf, buffer, count)){
++		count = -EFAULT;
++		goto out;
++	}
++
+ 	buf[count] = '\0';
+ 
+ 	mconsole_notify(notify_socket, MCONSOLE_USER_NOTIFY, buf, count);
++ out:
++	kfree(buf);
+ 	return(count);
+ }
+ 
+diff -Naur a/arch/um/drivers/mconsole_user.c b/arch/um/drivers/mconsole_user.c
+--- a/arch/um/drivers/mconsole_user.c	2004-01-08 22:15:23.000000000 -0500
++++ b/arch/um/drivers/mconsole_user.c	2004-01-08 22:21:13.000000000 -0500
+@@ -1,6 +1,6 @@
+ /*
+  * Copyright (C) 2001 Lennert Buytenhek (buytenh@gnu.org)
+- * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2001 - 2003 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+@@ -18,16 +18,18 @@
+ #include "umid.h"
+ 
+ static struct mconsole_command commands[] = {
+-	{ "version", mconsole_version, 1 },
+-	{ "halt", mconsole_halt, 0 },
+-	{ "reboot", mconsole_reboot, 0 },
+-	{ "config", mconsole_config, 0 },
+-	{ "remove", mconsole_remove, 0 },
+-	{ "sysrq", mconsole_sysrq, 1 },
+-	{ "help", mconsole_help, 1 },
+-	{ "cad", mconsole_cad, 1 },
+-	{ "stop", mconsole_stop, 0 },
+-	{ "go", mconsole_go, 1 },
++	{ "version", mconsole_version, MCONSOLE_INTR },
++	{ "halt", mconsole_halt, MCONSOLE_PROC },
++	{ "reboot", mconsole_reboot, MCONSOLE_PROC },
++	{ "config", mconsole_config, MCONSOLE_PROC },
++	{ "remove", mconsole_remove, MCONSOLE_PROC },
++	{ "sysrq", mconsole_sysrq, MCONSOLE_INTR },
++	{ "help", mconsole_help, MCONSOLE_INTR },
++	{ "cad", mconsole_cad, MCONSOLE_INTR },
++	{ "stop", mconsole_stop, MCONSOLE_PROC },
++	{ "go", mconsole_go, MCONSOLE_INTR },
++	{ "log", mconsole_log, MCONSOLE_INTR },
++	{ "proc", mconsole_proc, MCONSOLE_PROC },
+ };
+ 
+ /* Initialized in mconsole_init, which is an initcall */
+@@ -139,6 +141,7 @@
+ 		memcpy(reply.data, str, len);
+ 		reply.data[len] = '\0';
+ 		total -= len;
++ 		str += len;
+ 		reply.len = len + 1;
+ 
+ 		len = sizeof(reply) + reply.len - sizeof(reply.data);
+diff -Naur a/arch/um/drivers/mmapper_kern.c b/arch/um/drivers/mmapper_kern.c
+--- a/arch/um/drivers/mmapper_kern.c	2004-01-08 22:14:57.000000000 -0500
++++ b/arch/um/drivers/mmapper_kern.c	2004-01-08 22:20:27.000000000 -0500
+@@ -120,7 +120,10 @@
+ 	printk(KERN_INFO "Mapper v0.1\n");
+ 
+ 	v_buf = (char *) find_iomem("mmapper", &mmapper_size);
+-	if(mmapper_size == 0) return(0);
++	if(mmapper_size == 0){
++		printk(KERN_ERR "mmapper_init - find_iomem failed\n");
++		return(0);
++	}
+ 
+ 	p_buf = __pa(v_buf);
+ 
+diff -Naur a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
+--- a/arch/um/drivers/net_kern.c	2004-01-08 22:20:39.000000000 -0500
++++ b/arch/um/drivers/net_kern.c	2004-01-08 22:27:13.000000000 -0500
+@@ -26,6 +26,7 @@
+ #include "mconsole_kern.h"
+ #include "init.h"
+ #include "irq_user.h"
++#include "irq_kern.h"
+ 
+ static spinlock_t opened_lock = SPIN_LOCK_UNLOCKED;
+ LIST_HEAD(opened);
+@@ -37,7 +38,8 @@
+ 	struct sk_buff *skb;
+ 
+ 	/* If we can't allocate memory, try again next round. */
+-	if ((skb = dev_alloc_skb(dev->mtu)) == NULL) {
++	skb = dev_alloc_skb(dev->mtu);
++	if (skb == NULL) {
+ 		lp->stats.rx_dropped++;
+ 		return 0;
+ 	}
+@@ -61,14 +63,14 @@
+ 	return pkt_len;
+ }
+ 
+-void uml_net_interrupt(int irq, void *dev_id, struct pt_regs *regs)
++irqreturn_t uml_net_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+ {
+ 	struct net_device *dev = dev_id;
+ 	struct uml_net_private *lp = dev->priv;
+ 	int err;
+ 
+ 	if(!netif_running(dev))
+-		return;
++		return(IRQ_NONE);
+ 
+ 	spin_lock(&lp->lock);
+ 	while((err = uml_net_rx(dev)) > 0) ;
+@@ -83,6 +85,7 @@
+ 
+  out:
+ 	spin_unlock(&lp->lock);
++	return(IRQ_HANDLED);
+ }
+ 
+ static int uml_net_open(struct net_device *dev)
+@@ -252,37 +255,6 @@
+ #endif
+ }
+ 
+-/*
+- * default do nothing hard header packet routines for struct net_device init.
+- * real ethernet transports will overwrite with real routines.
+- */
+-static int uml_net_hard_header(struct sk_buff *skb, struct net_device *dev,
+-                 unsigned short type, void *daddr, void *saddr, unsigned len)
+-{
+-	return(0); /* no change */
+-}
+-
+-static int uml_net_rebuild_header(struct sk_buff *skb)
+-{
+-	return(0); /* ignore */ 
+-}
+-
+-static int uml_net_header_cache(struct neighbour *neigh, struct hh_cache *hh)
+-{
+-	return(-1); /* fail */
+-}
+-
+-static void uml_net_header_cache_update(struct hh_cache *hh,
+-                 struct net_device *dev, unsigned char * haddr)
+-{
+-	/* ignore */
+-}
+-
+-static int uml_net_header_parse(struct sk_buff *skb, unsigned char *haddr)
+-{
+-	return(0); /* nothing */
+-}
+-
+ static spinlock_t devices_lock = SPIN_LOCK_UNLOCKED;
+ static struct list_head devices = LIST_HEAD_INIT(devices);
+ 
+@@ -292,7 +264,7 @@
+ 	struct uml_net *device;
+ 	struct net_device *dev;
+ 	struct uml_net_private *lp;
+-	int err, size;
++	int save, err, size;
+ 
+ 	size = transport->private_size + sizeof(struct uml_net_private) + 
+ 		sizeof(((struct uml_net_private *) 0)->user);
+@@ -334,12 +306,6 @@
+ 	snprintf(dev->name, sizeof(dev->name), "eth%d", n);
+ 	device->dev = dev;
+ 
+-        dev->hard_header = uml_net_hard_header;
+-        dev->rebuild_header = uml_net_rebuild_header;
+-        dev->hard_header_cache = uml_net_header_cache;
+-        dev->header_cache_update= uml_net_header_cache_update;
+-        dev->hard_header_parse = uml_net_header_parse;
+-
+ 	(*transport->kern->init)(dev, init);
+ 
+ 	dev->mtu = transport->user->max_packet;
+@@ -362,21 +328,29 @@
+ 		return 1;
+ 	lp = dev->priv;
+ 
+-	INIT_LIST_HEAD(&lp->list);
+-	spin_lock_init(&lp->lock);
+-	lp->dev = dev;
+-	lp->fd = -1;
+-	lp->mac = { 0xfe, 0xfd, 0x0, 0x0, 0x0, 0x0 };
+-	lp->have_mac = device->have_mac;
+-	lp->protocol = transport->kern->protocol;
+-	lp->open = transport->user->open;
+-	lp->close = transport->user->close;
+-	lp->remove = transport->user->remove;
+-	lp->read = transport->kern->read;
+-	lp->write = transport->kern->write;
+-	lp->add_address = transport->user->add_address;
+-	lp->delete_address = transport->user->delete_address;
+-	lp->set_mtu = transport->user->set_mtu;
++	/* lp.user is the first four bytes of the transport data, which
++	 * has already been initialized.  This structure assignment will
++	 * overwrite that, so we make sure that .user gets overwritten with
++	 * what it already has.
++	 */
++	save = lp->user[0];
++	*lp = ((struct uml_net_private) 
++		{ .list  		= LIST_HEAD_INIT(lp->list),
++		  .lock 		= SPIN_LOCK_UNLOCKED,
++		  .dev 			= dev,
++		  .fd 			= -1,
++		  .mac 			= { 0xfe, 0xfd, 0x0, 0x0, 0x0, 0x0},
++		  .have_mac 		= device->have_mac,
++		  .protocol 		= transport->kern->protocol,
++		  .open 		= transport->user->open,
++		  .close 		= transport->user->close,
++		  .remove 		= transport->user->remove,
++		  .read 		= transport->kern->read,
++		  .write 		= transport->kern->write,
++		  .add_address 		= transport->user->add_address,
++		  .delete_address  	= transport->user->delete_address,
++		  .set_mtu 		= transport->user->set_mtu,
++		  .user  		= { save } });
+ 
+ 	init_timer(&lp->tl);
+ 	lp->tl.function = uml_net_user_timer_expire;
+@@ -609,7 +583,8 @@
+ 	unregister_netdev(dev);
+ 
+ 	list_del(&device->list);
+-	free_netdev(device);
++	kfree(device);
++	free_netdev(dev);
+ 	return(0);
+ }
+ 
+diff -Naur a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
+--- a/arch/um/drivers/net_user.c	2004-01-08 22:16:01.000000000 -0500
++++ b/arch/um/drivers/net_user.c	2004-01-08 22:21:37.000000000 -0500
+@@ -26,8 +26,7 @@
+ 	if(gate_addr == NULL) return(0);
+ 	if(sscanf(gate_addr, "%d.%d.%d.%d", &tap_addr[0], 
+ 		  &tap_addr[1], &tap_addr[2], &tap_addr[3]) != 4){
+-		printk("Invalid tap IP address - '%s'\n", 
+-		       gate_addr);
++		printk("Invalid tap IP address - '%s'\n", gate_addr);
+ 		return(-EINVAL);
+ 	}
+ 	return(0);
+@@ -60,18 +59,18 @@
+ 	}
+ 		
+ 	*output = '\0';
+-	if(read(fd, &remain, sizeof(remain)) != sizeof(remain)){
+-		printk("read_output - read of length failed, errno = %d\n",
+-		       errno);
++	n = os_read_file(fd, &remain, sizeof(remain));
++	if(n != sizeof(remain)){
++		printk("read_output - read of length failed, err = %d\n", -n);
+ 		return;
+ 	}
+ 
+ 	while(remain != 0){
+ 		n = (remain < len) ? remain : len;
+-		actual = read(fd, output, n);
++		actual = os_read_file(fd, output, n);
+ 		if(actual != n){
+ 			printk("read_output - read of data failed, "
+-			       "errno = %d\n", errno);
++			       "err = %d\n", -actual);
+ 			return;
+ 		}
+ 		remain -= actual;
+@@ -83,13 +82,12 @@
+ {
+ 	int n;
+ 
+-	while(((n = read(fd,  buf,  len)) < 0) && (errno == EINTR)) ;
++	n = os_read_file(fd,  buf,  len);
+ 
+-	if(n < 0){
+-		if(errno == EAGAIN) return(0);
+-		return(-errno);
+-	}
+-	else if(n == 0) return(-ENOTCONN);
++	if(n == -EAGAIN) 
++		return(0);
++	else if(n == 0) 
++		return(-ENOTCONN);
+ 	return(n);
+ }
+ 
+@@ -112,13 +110,13 @@
+ {
+ 	int n;
+ 
+-	while(((n = write(fd, buf, len)) < 0) && (errno == EINTR)) ;
+-	if(n < 0){
+-		if(errno == EAGAIN) return(0);
+-		return(-errno);
+-	}
+-	else if(n == 0) return(-ENOTCONN);
+-	return(n);	
++	n = os_write_file(fd, buf, len);
++
++	if(n == -EAGAIN) 
++		return(0);
++	else if(n == 0) 
++		return(-ENOTCONN);
++	return(n);
+ }
+ 
+ int net_send(int fd, void *buf, int len)
+@@ -157,7 +155,7 @@
+ {
+ 	struct change_pre_exec_data *data = arg;
+ 
+-	close(data->close_me);
++	os_close_file(data->close_me);
+ 	dup2(data->stdout, 1);
+ }
+ 
+@@ -167,15 +165,15 @@
+ 	struct change_pre_exec_data pe_data;
+ 
+ 	err = os_pipe(fds, 1, 0);
+-	if(err){
+-		printk("change_tramp - pipe failed, errno = %d\n", -err);
++	if(err < 0){
++		printk("change_tramp - pipe failed, err = %d\n", -err);
+ 		return(err);
+ 	}
+ 	pe_data.close_me = fds[0];
+ 	pe_data.stdout = fds[1];
+ 	pid = run_helper(change_pre_exec, &pe_data, argv, NULL);
+ 
+-	close(fds[1]);
++	os_close_file(fds[1]);
+ 	read_output(fds[0], output, output_len);
+ 	waitpid(pid, NULL, 0);	
+ 	return(pid);
+diff -Naur a/arch/um/drivers/null.c b/arch/um/drivers/null.c
+--- a/arch/um/drivers/null.c	2004-01-08 22:14:29.000000000 -0500
++++ b/arch/um/drivers/null.c	2004-01-08 22:19:28.000000000 -0500
+@@ -5,7 +5,6 @@
+ 
+ #include <stdlib.h>
+ #include <errno.h>
+-#include <fcntl.h>
+ #include "chan_user.h"
+ #include "os.h"
+ 
+diff -Naur a/arch/um/drivers/port_kern.c b/arch/um/drivers/port_kern.c
+--- a/arch/um/drivers/port_kern.c	2004-01-08 22:13:51.000000000 -0500
++++ b/arch/um/drivers/port_kern.c	2004-01-08 22:18:54.000000000 -0500
+@@ -6,6 +6,7 @@
+ #include "linux/list.h"
+ #include "linux/sched.h"
+ #include "linux/slab.h"
++#include "linux/interrupt.h"
+ #include "linux/irq.h"
+ #include "linux/spinlock.h"
+ #include "linux/errno.h"
+@@ -14,6 +15,7 @@
+ #include "kern_util.h"
+ #include "kern.h"
+ #include "irq_user.h"
++#include "irq_kern.h"
+ #include "port.h"
+ #include "init.h"
+ #include "os.h"
+@@ -44,7 +46,7 @@
+ 	struct port_list *port;
+ };
+ 
+-static void pipe_interrupt(int irq, void *data, struct pt_regs *regs)
++static irqreturn_t pipe_interrupt(int irq, void *data, struct pt_regs *regs)
+ {
+ 	struct connection *conn = data;
+ 	int fd;
+@@ -52,7 +54,7 @@
+  	fd = os_rcv_fd(conn->socket[0], &conn->helper_pid);
+ 	if(fd < 0){
+ 		if(fd == -EAGAIN)
+-			return;
++			return(IRQ_NONE);
+ 
+ 		printk(KERN_ERR "pipe_interrupt : os_rcv_fd returned %d\n", 
+ 		       -fd);
+@@ -65,6 +67,7 @@
+ 	list_add(&conn->list, &conn->port->connections);
+ 
+ 	up(&conn->port->sem);
++	return(IRQ_HANDLED);
+ }
+ 
+ static int port_accept(struct port_list *port)
+@@ -138,12 +141,13 @@
+ 
+ DECLARE_WORK(port_work, port_work_proc, NULL);
+ 
+-static void port_interrupt(int irq, void *data, struct pt_regs *regs)
++static irqreturn_t port_interrupt(int irq, void *data, struct pt_regs *regs)
+ {
+ 	struct port_list *port = data;
+ 
+ 	port->has_connection = 1;
+ 	schedule_work(&port_work);
++	return(IRQ_HANDLED);
+ } 
+ 
+ void *port_data(int port_num)
+diff -Naur a/arch/um/drivers/port_user.c b/arch/um/drivers/port_user.c
+--- a/arch/um/drivers/port_user.c	2004-01-08 22:24:12.000000000 -0500
++++ b/arch/um/drivers/port_user.c	2004-01-08 22:31:27.000000000 -0500
+@@ -47,10 +47,12 @@
+ 		return(NULL);
+ 	}
+ 
+-	if((kern_data = port_data(port)) == NULL) 
++	kern_data = port_data(port);
++	if(kern_data == NULL) 
+ 		return(NULL);
+ 
+-	if((data = um_kmalloc(sizeof(*data))) == NULL) 
++	data = um_kmalloc(sizeof(*data));
++	if(data == NULL) 
+ 		goto err;
+ 
+ 	*data = ((struct port_chan) { .raw  		= opts->raw,
+@@ -90,7 +92,7 @@
+ 	struct port_chan *data = d;
+ 
+ 	port_remove_dev(data->kernel_data);
+-	close(fd);
++	os_close_file(fd);
+ }
+ 
+ int port_console_write(int fd, const char *buf, int n, void *d)
+@@ -130,11 +132,15 @@
+ 		goto out;
+ 	}
+   
+-	if((listen(fd, 1) < 0) || (os_set_fd_block(fd, 0))){
++	if(listen(fd, 1) < 0){
+ 		err = -errno;
+ 		goto out;
+ 	}
+ 
++	err = os_set_fd_block(fd, 0);
++	if(err < 0)
++		goto out;
++
+ 	return(fd);
+  out:
+ 	os_close_file(fd);
+@@ -153,10 +159,10 @@
+ 	dup2(data->sock_fd, 0);
+ 	dup2(data->sock_fd, 1);
+ 	dup2(data->sock_fd, 2);
+-	close(data->sock_fd);
++	os_close_file(data->sock_fd);
+ 	dup2(data->pipe_fd, 3);
+ 	os_shutdown_socket(3, 1, 0);
+-	close(data->pipe_fd);
++	os_close_file(data->pipe_fd);
+ }
+ 
+ int port_connection(int fd, int *socket, int *pid_out)
+@@ -166,11 +172,12 @@
+ 			 "/usr/lib/uml/port-helper", NULL };
+ 	struct port_pre_exec_data data;
+ 
+-	if((new = os_accept_connection(fd)) < 0)
+-		return(-errno);
++	new = os_accept_connection(fd);
++	if(new < 0)
++		return(new);
+ 
+ 	err = os_pipe(socket, 0, 0);
+-	if(err) 
++	if(err < 0) 
+ 		goto out_close;
+ 
+ 	data = ((struct port_pre_exec_data)
+@@ -186,11 +193,11 @@
+ 
+  out_shutdown:
+ 	os_shutdown_socket(socket[0], 1, 1);
+-	close(socket[0]);
++	os_close_file(socket[0]);
+ 	os_shutdown_socket(socket[1], 1, 1);	
+-	close(socket[1]);
++	os_close_file(socket[1]);
+  out_close:
+-	close(new);
++	os_close_file(new);
+ 	return(err);
+ }
+ 
+diff -Naur a/arch/um/drivers/pty.c b/arch/um/drivers/pty.c
+--- a/arch/um/drivers/pty.c	2004-01-08 22:29:41.000000000 -0500
++++ b/arch/um/drivers/pty.c	2004-01-08 22:35:17.000000000 -0500
+@@ -7,12 +7,12 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <errno.h>
+-#include <fcntl.h>
+ #include <termios.h>
+ #include "chan_user.h"
+ #include "user.h"
+ #include "user_util.h"
+ #include "kern_util.h"
++#include "os.h"
+ 
+ struct pty_chan {
+ 	void (*announce)(char *dev_name, int dev);
+@@ -26,7 +26,8 @@
+ {
+ 	struct pty_chan *data;
+ 
+-	if((data = um_kmalloc(sizeof(*data))) == NULL) return(NULL);
++	data = um_kmalloc(sizeof(*data));
++	if(data == NULL) return(NULL);
+ 	*data = ((struct pty_chan) { .announce  	= opts->announce, 
+ 				     .dev  		= device,
+ 				     .raw  		= opts->raw });
+@@ -39,7 +40,8 @@
+ 	char *dev;
+ 	int fd;
+ 
+-	if((fd = get_pty()) < 0){
++	fd = get_pty();
++	if(fd < 0){
+ 		printk("open_pts : Failed to open pts\n");
+ 		return(-errno);
+ 	}
+@@ -57,29 +59,27 @@
+ 
+ int getmaster(char *line)
+ {
+-	struct stat stb;
+ 	char *pty, *bank, *cp;
+-	int master;
++	int master, err;
+ 
+ 	pty = &line[strlen("/dev/ptyp")];
+ 	for (bank = "pqrs"; *bank; bank++) {
+ 		line[strlen("/dev/pty")] = *bank;
+ 		*pty = '0';
+-		if (stat(line, &stb) < 0)
++		if (os_stat_file(line, NULL) < 0)
+ 			break;
+ 		for (cp = "0123456789abcdef"; *cp; cp++) {
+ 			*pty = *cp;
+-			master = open(line, O_RDWR);
++			master = os_open_file(line, of_rdwr(OPENFLAGS()), 0);
+ 			if (master >= 0) {
+ 				char *tp = &line[strlen("/dev/")];
+-				int ok;
+ 
+ 				/* verify slave side is usable */
+ 				*tp = 't';
+-				ok = access(line, R_OK|W_OK) == 0;
++				err = os_access(line, OS_ACC_RW_OK);
+ 				*tp = 'p';
+-				if (ok) return(master);
+-				(void) close(master);
++				if(err == 0) return(master);
++				(void) os_close_file(master);
+ 			}
+ 		}
+ 	}
+diff -Naur a/arch/um/drivers/slip_user.c b/arch/um/drivers/slip_user.c
+--- a/arch/um/drivers/slip_user.c	2004-01-08 22:29:41.000000000 -0500
++++ b/arch/um/drivers/slip_user.c	2004-01-08 22:35:17.000000000 -0500
+@@ -4,11 +4,9 @@
+ #include <stddef.h>
+ #include <sched.h>
+ #include <string.h>
+-#include <sys/fcntl.h>
+ #include <sys/errno.h>
+ #include <sys/termios.h>
+ #include <sys/wait.h>
+-#include <sys/ioctl.h>
+ #include <sys/signal.h>
+ #include "user_util.h"
+ #include "kern_util.h"
+@@ -65,9 +63,9 @@
+ {
+ 	struct slip_pre_exec_data *data = arg;
+ 
+-	if(data->stdin != -1) dup2(data->stdin, 0);
++	if(data->stdin >= 0) dup2(data->stdin, 0);
+ 	dup2(data->stdout, 1);
+-	if(data->close_me != -1) close(data->close_me);
++	if(data->close_me >= 0) os_close_file(data->close_me);
+ }
+ 
+ static int slip_tramp(char **argv, int fd)
+@@ -77,8 +75,8 @@
+ 	int status, pid, fds[2], err, output_len;
+ 
+ 	err = os_pipe(fds, 1, 0);
+-	if(err){
+-		printk("slip_tramp : pipe failed, errno = %d\n", -err);
++	if(err < 0){
++		printk("slip_tramp : pipe failed, err = %d\n", -err);
+ 		return(err);
+ 	}
+ 
+@@ -96,7 +94,7 @@
+ 			printk("slip_tramp : failed to allocate output "
+ 			       "buffer\n");
+ 
+-		close(fds[1]);
++		os_close_file(fds[1]);
+ 		read_output(fds[0], output, output_len);
+ 		if(output != NULL){
+ 			printk("%s", output);
+@@ -105,7 +103,7 @@
+ 		if(waitpid(pid, &status, 0) < 0) err = errno;
+ 		else if(!WIFEXITED(status) || (WEXITSTATUS(status) != 0)){
+ 			printk("'%s' didn't exit with status 0\n", argv[0]);
+-			err = EINVAL;
++			err = -EINVAL;
+ 		}
+ 	}
+ 	return(err);
+@@ -118,15 +116,17 @@
+ 	char gate_buf[sizeof("nnn.nnn.nnn.nnn\0")];
+ 	char *argv[] = { "uml_net", version_buf, "slip", "up", gate_buf, 
+ 			 NULL };
+-	int sfd, mfd, disc, sencap, err;
++	int sfd, mfd, err;
+ 
+-	if((mfd = get_pty()) < 0){
+-		printk("umn : Failed to open pty\n");
+-		return(-1);
++	mfd = get_pty();
++	if(mfd < 0){
++		printk("umn : Failed to open pty, err = %d\n", -mfd);
++		return(mfd);
+ 	}
+-	if((sfd = os_open_file(ptsname(mfd), of_rdwr(OPENFLAGS()), 0)) < 0){
+-		printk("Couldn't open tty for slip line\n");
+-		return(-1);
++	sfd = os_open_file(ptsname(mfd), of_rdwr(OPENFLAGS()), 0);
++	if(sfd < 0){
++		printk("Couldn't open tty for slip line, err = %d\n", -sfd);
++		return(sfd);
+ 	}
+ 	if(set_up_tty(sfd)) return(-1);
+ 	pri->slave = sfd;
+@@ -138,28 +138,23 @@
+ 
+ 		err = slip_tramp(argv, sfd);
+ 
+-		if(err != 0){
+-			printk("slip_tramp failed - errno = %d\n", err);
+-			return(-err);
++		if(err < 0){
++			printk("slip_tramp failed - err = %d\n", -err);
++			return(err);
+ 		}
+-		if(ioctl(pri->slave, SIOCGIFNAME, pri->name) < 0){
+-			printk("SIOCGIFNAME failed, errno = %d\n", errno);
+-			return(-errno);
++		err = os_get_ifname(pri->slave, pri->name);
++		if(err < 0){
++			printk("get_ifname failed, err = %d\n", -err);
++			return(err);
+ 		}
+ 		iter_addresses(pri->dev, open_addr, pri->name);
+ 	}
+ 	else {
+-		disc = N_SLIP;
+-		if(ioctl(sfd, TIOCSETD, &disc) < 0){
+-			printk("Failed to set slip line discipline - "
+-			       "errno = %d\n", errno);
+-			return(-errno);
+-		}
+-		sencap = 0;
+-		if(ioctl(sfd, SIOCSIFENCAP, &sencap) < 0){
+-			printk("Failed to set slip encapsulation - "
+-			       "errno = %d\n", errno);
+-			return(-errno);
++		err = os_set_slip(sfd);
++		if(err < 0){
++			printk("Failed to set slip discipline encapsulation - "
++			       "err = %d\n", -err);
++			return(err);
+ 		}
+ 	}
+ 	return(mfd);
+@@ -181,9 +176,9 @@
+ 	err = slip_tramp(argv, -1);
+ 
+ 	if(err != 0)
+-		printk("slip_tramp failed - errno = %d\n", err);
+-	close(fd);
+-	close(pri->slave);
++		printk("slip_tramp failed - errno = %d\n", -err);
++	os_close_file(fd);
++	os_close_file(pri->slave);
+ 	pri->slave = -1;
+ }
+ 
+@@ -243,7 +238,7 @@
+ {
+ 	struct slip_data *pri = data;
+ 
+-	if(pri->slave == -1) return;
++	if(pri->slave < 0) return;
+ 	open_addr(addr, netmask, pri->name);
+ }
+ 
+@@ -252,7 +247,7 @@
+ {
+ 	struct slip_data *pri = data;
+ 
+-	if(pri->slave == -1) return;
++	if(pri->slave < 0) return;
+ 	close_addr(addr, netmask, pri->name);
+ }
+ 
+diff -Naur a/arch/um/drivers/slirp_user.c b/arch/um/drivers/slirp_user.c
+--- a/arch/um/drivers/slirp_user.c	2004-01-08 22:25:11.000000000 -0500
++++ b/arch/um/drivers/slirp_user.c	2004-01-08 22:32:27.000000000 -0500
+@@ -4,7 +4,6 @@
+ #include <stddef.h>
+ #include <sched.h>
+ #include <string.h>
+-#include <sys/fcntl.h>
+ #include <sys/errno.h>
+ #include <sys/wait.h>
+ #include <sys/signal.h>
+@@ -48,15 +47,15 @@
+ 
+ 	return(pid);
+ }
+- 
++
++/* XXX This is just a trivial wrapper around os_pipe */ 
+ static int slirp_datachan(int *mfd, int *sfd)
+ {
+ 	int fds[2], err;
+ 
+ 	err = os_pipe(fds, 1, 1);
+-	if(err){
+-		printk("slirp_datachan: Failed to open pipe, errno = %d\n",
+-		       -err);
++	if(err < 0){
++		printk("slirp_datachan: Failed to open pipe, err = %d\n", -err);
+ 		return(err);
+ 	}
+ 
+@@ -77,7 +76,7 @@
+ 	pid = slirp_tramp(pri->argw.argv, sfd);
+ 
+ 	if(pid < 0){
+-		printk("slirp_tramp failed - errno = %d\n", pid);
++		printk("slirp_tramp failed - errno = %d\n", -pid);
+ 		os_close_file(sfd);	
+ 		os_close_file(mfd);	
+ 		return(pid);
+@@ -97,8 +96,8 @@
+ 	struct slirp_data *pri = data;
+ 	int status,err;
+ 
+-	close(fd);
+-	close(pri->slave);
++	os_close_file(fd);
++	os_close_file(pri->slave);
+ 
+ 	pri->slave = -1;
+ 
+diff -Naur a/arch/um/drivers/ssl.c b/arch/um/drivers/ssl.c
+--- a/arch/um/drivers/ssl.c	2004-01-08 22:21:29.000000000 -0500
++++ b/arch/um/drivers/ssl.c	2004-01-08 22:28:16.000000000 -0500
+@@ -10,6 +10,7 @@
+ #include "linux/major.h"
+ #include "linux/mm.h"
+ #include "linux/init.h"
++#include "linux/console.h"
+ #include "asm/termbits.h"
+ #include "asm/irq.h"
+ #include "line.h"
+@@ -53,8 +54,9 @@
+ 
+ static struct line_driver driver = {
+ 	.name 			= "UML serial line",
+-	.devfs_name 		= "tts/%d",
+-	.major 			= TTYAUX_MAJOR,
++	.device_name 		= "ttS",
++	.devfs_name 		= "tts/",
++	.major 			= TTY_MAJOR,
+ 	.minor_start 		= 64,
+ 	.type 		 	= TTY_DRIVER_TYPE_SERIAL,
+ 	.subtype 	 	= 0,
+@@ -149,6 +151,9 @@
+ 	case TCSETSW:
+ 	case TCGETA:
+ 	case TIOCMGET:
++	case TCSBRK:
++	case TCSBRKP:
++	case TIOCMSET:
+ 		ret = -ENOIOCTLCMD;
+ 		break;
+ 	default:
+@@ -212,6 +217,39 @@
+  */
+ static int ssl_init_done = 0;
+ 
++extern int tty_init(void);
++
++static void ssl_console_write(struct console *c, const char *string, 
++			      unsigned len)
++{
++	struct line *line = &serial_lines[c->index];
++	if(ssl_init_done)
++		down(&line->sem);
++	console_write_chan(&line->chan_list, string, len);
++	if(ssl_init_done)
++		up(&line->sem);
++}
++
++static struct tty_driver *ssl_console_device(struct console *c, int *index)
++{
++	*index = c->index;
++	return ssl_driver;
++}
++
++static int ssl_console_setup(struct console *co, char *options)
++{
++	return(0);
++}
++
++static struct console ssl_cons = {
++	name:		"ttyS",
++	write:		ssl_console_write,
++	device:		ssl_console_device,
++	setup:		ssl_console_setup,
++	flags:		CON_PRINTBUFFER,
++	index:		-1,
++};
++
+ int ssl_init(void)
+ {
+ 	char *new_title;
+@@ -219,6 +257,8 @@
+ 	printk(KERN_INFO "Initializing software serial port version %d\n", 
+ 	       ssl_version);
+ 
++	tty_init();
++
+ 	ssl_driver = line_register_devfs(&lines, &driver, &ssl_ops,
+ 		serial_lines, sizeof(serial_lines)/sizeof(serial_lines[0]));
+ 
+@@ -227,6 +267,7 @@
+ 	new_title = add_xterm_umid(opts.xterm_title);
+ 	if(new_title != NULL) opts.xterm_title = new_title;
+ 
++	register_console(&ssl_cons);
+ 	ssl_init_done = 1;
+ 	return(0);
+ }
+@@ -235,9 +276,9 @@
+ 
+ static int ssl_chan_setup(char *str)
+ {
+-	line_setup(serial_lines, sizeof(serial_lines)/sizeof(serial_lines[0]),
+-		   str, 1);
+-	return(1);
++	return(line_setup(serial_lines, 
++			  sizeof(serial_lines)/sizeof(serial_lines[0]), 
++			  str, 1));
+ }
+ 
+ __setup("ssl", ssl_chan_setup);
+diff -Naur a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c
+--- a/arch/um/drivers/stdio_console.c	2004-01-08 22:16:37.000000000 -0500
++++ b/arch/um/drivers/stdio_console.c	2004-01-08 22:22:42.000000000 -0500
+@@ -83,7 +83,8 @@
+ 
+ static struct line_driver driver = {
+ 	.name 			= "UML console",
+-	.devfs_name 		= "vc/%d",
++	.device_name 		= "tty",
++	.devfs_name 		= "vc/",
+ 	.major 			= TTY_MAJOR,
+ 	.minor_start 		= 0,
+ 	.type 		 	= TTY_DRIVER_TYPE_CONSOLE,
+@@ -159,14 +160,28 @@
+ 
+ static int con_init_done = 0;
+ 
++static struct tty_operations console_ops = {
++	.open 	 		= con_open,
++	.close 	 		= con_close,
++	.write 	 		= con_write,
++	.chars_in_buffer 	= chars_in_buffer,
++	.set_termios 		= set_termios,
++	.write_room		= line_write_room,
++};
++
++extern int tty_init(void);
++
+ int stdio_init(void)
+ {
+ 	char *new_title;
+ 
+ 	printk(KERN_INFO "Initializing stdio console driver\n");
+ 
++	tty_init();
++
+ 	console_driver = line_register_devfs(&console_lines, &driver,
+-				&console_ops, vts, sizeof(vts)/sizeof(vts[0]));
++					     &console_ops, vts,
++					     sizeof(vts)/sizeof(vts[0]));
+ 
+ 	lines_init(vts, sizeof(vts)/sizeof(vts[0]));
+ 
+@@ -183,19 +198,14 @@
+ static void console_write(struct console *console, const char *string, 
+ 			  unsigned len)
+ {
+-	if(con_init_done) down(&vts[console->index].sem);
+-	console_write_chan(&vts[console->index].chan_list, string, len);
+-	if(con_init_done) up(&vts[console->index].sem);
+-}
++	struct line *line = &vts[console->index];
+ 
+-static struct tty_operations console_ops = {
+-	.open 	 		= con_open,
+-	.close 	 		= con_close,
+-	.write 	 		= con_write,
+-	.chars_in_buffer 	= chars_in_buffer,
+-	.set_termios 		= set_termios,
+-	.write_room		= line_write_room,
+-};
++	if(con_init_done)
++		down(&line->sem);
++	console_write_chan(&line->chan_list, string, len);
++	if(con_init_done)
++		up(&line->sem);
++}
+ 
+ static struct tty_driver *console_device(struct console *c, int *index)
+ {
+@@ -208,22 +218,28 @@
+ 	return(0);
+ }
+ 
+-static struct console stdiocons = INIT_CONSOLE("tty", console_write, 
+-					       console_device, console_setup,
+-					       CON_PRINTBUFFER);
++static struct console stdiocons = {
++	name:		"tty",
++	write:		console_write,
++	device:		console_device,
++	setup:		console_setup,
++	flags:		CON_PRINTBUFFER,
++	index:		-1,
++};
+ 
+-static void __init stdio_console_init(void)
++static int __init stdio_console_init(void)
+ {
+ 	INIT_LIST_HEAD(&vts[0].chan_list);
+ 	list_add(&init_console_chan.list, &vts[0].chan_list);
+ 	register_console(&stdiocons);
++	return(0);
+ }
++
+ console_initcall(stdio_console_init);
+ 
+ static int console_chan_setup(char *str)
+ {
+-	line_setup(vts, sizeof(vts)/sizeof(vts[0]), str, 1);
+-	return(1);
++	return(line_setup(vts, sizeof(vts)/sizeof(vts[0]), str, 1));
+ }
+ 
+ __setup("con", console_chan_setup);
+diff -Naur a/arch/um/drivers/tty.c b/arch/um/drivers/tty.c
+--- a/arch/um/drivers/tty.c	2004-01-08 22:18:51.000000000 -0500
++++ b/arch/um/drivers/tty.c	2004-01-08 22:24:43.000000000 -0500
+@@ -5,7 +5,6 @@
+ 
+ #include <stdio.h>
+ #include <termios.h>
+-#include <fcntl.h>
+ #include <errno.h>
+ #include <unistd.h>
+ #include "chan_user.h"
+@@ -30,7 +29,8 @@
+ 	}
+ 	str++;
+ 
+-	if((data = um_kmalloc(sizeof(*data))) == NULL) 
++	data = um_kmalloc(sizeof(*data)); 
++	if(data == NULL) 
+ 		return(NULL);
+ 	*data = ((struct tty_chan) { .dev 	= str,
+ 				     .raw 	= opts->raw });
+diff -Naur a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
+--- a/arch/um/drivers/ubd_kern.c	2004-01-08 22:21:09.000000000 -0500
++++ b/arch/um/drivers/ubd_kern.c	2004-01-08 22:27:27.000000000 -0500
+@@ -8,6 +8,13 @@
+  * old style ubd by setting UBD_SHIFT to 0
+  * 2002-09-27...2002-10-18 massive tinkering for 2.5
+  * partitions have changed in 2.5
++ * 2003-01-29 more tinkering for 2.5.59-1
++ * This should now address the sysfs problems and has
++ * the symlink for devfs to allow for booting with
++ * the common /dev/ubd/discX/... names rather than
++ * only /dev/ubdN/discN this version also has lots of
++ * clean ups preparing for ubd-many.
++ * James McMechan
+  */
+ 
+ #define MAJOR_NR UBD_MAJOR
+@@ -40,9 +47,12 @@
+ #include "mconsole_kern.h"
+ #include "init.h"
+ #include "irq_user.h"
++#include "irq_kern.h"
+ #include "ubd_user.h"
+ #include "2_5compat.h"
+ #include "os.h"
++#include "mem.h"
++#include "mem_kern.h"
+ 
+ static spinlock_t ubd_io_lock = SPIN_LOCK_UNLOCKED;
+ static spinlock_t ubd_lock = SPIN_LOCK_UNLOCKED;
+@@ -56,6 +66,10 @@
+ 
+ #define MAX_DEV (8)
+ 
++/* Changed in early boot */
++static int ubd_do_mmap = 0;
++#define UBD_MMAP_BLOCK_SIZE PAGE_SIZE
++
+ static struct block_device_operations ubd_blops = {
+         .owner		= THIS_MODULE,
+         .open		= ubd_open,
+@@ -67,7 +81,7 @@
+ static request_queue_t *ubd_queue;
+ 
+ /* Protected by ubd_lock */
+-static int fake_major = 0;
++static int fake_major = MAJOR_NR;
+ 
+ static struct gendisk *ubd_gendisk[MAX_DEV];
+ static struct gendisk *fake_gendisk[MAX_DEV];
+@@ -96,13 +110,19 @@
+ 
+ struct ubd {
+ 	char *file;
+-	int is_dir;
+ 	int count;
+ 	int fd;
+ 	__u64 size;
+ 	struct openflags boot_openflags;
+ 	struct openflags openflags;
++	int no_cow;
+ 	struct cow cow;
++
++	int map_writes;
++	int map_reads;
++	int nomap_writes;
++	int nomap_reads;
++	int write_maps;
+ };
+ 
+ #define DEFAULT_COW { \
+@@ -115,21 +135,28 @@
+ 
+ #define DEFAULT_UBD { \
+ 	.file = 		NULL, \
+-	.is_dir =		0, \
+ 	.count =		0, \
+ 	.fd =			-1, \
+ 	.size =			-1, \
+ 	.boot_openflags =	OPEN_FLAGS, \
+ 	.openflags =		OPEN_FLAGS, \
++        .no_cow =               0, \
+         .cow =			DEFAULT_COW, \
++	.map_writes		= 0, \
++	.map_reads		= 0, \
++	.nomap_writes		= 0, \
++	.nomap_reads		= 0, \
++	.write_maps		= 0, \
+ }
+ 
+ struct ubd ubd_dev[MAX_DEV] = { [ 0 ... MAX_DEV - 1 ] = DEFAULT_UBD };
+ 
+ static int ubd0_init(void)
+ {
+-	if(ubd_dev[0].file == NULL)
+-		ubd_dev[0].file = "root_fs";
++	struct ubd *dev = &ubd_dev[0];
++
++	if(dev->file == NULL)
++		dev->file = "root_fs";
+ 	return(0);
+ }
+ 
+@@ -196,19 +223,46 @@
+ "    Create ide0 entries that map onto ubd devices.\n\n"
+ );
+ 
++static int parse_unit(char **ptr)
++{
++	char *str = *ptr, *end;
++	int n = -1;
++
++	if(isdigit(*str)) {
++		n = simple_strtoul(str, &end, 0);
++		if(end == str)
++			return(-1);
++		*ptr = end;
++	}
++	else if (('a' <= *str) && (*str <= 'h')) {
++		n = *str - 'a';
++		str++;
++		*ptr = str;
++	}
++	return(n);
++}
++
+ static int ubd_setup_common(char *str, int *index_out)
+ {
++	struct ubd *dev;
+ 	struct openflags flags = global_openflags;
+ 	char *backing_file;
+ 	int n, err;
+ 
+ 	if(index_out) *index_out = -1;
+-	n = *str++;
++	n = *str;
+ 	if(n == '='){
+-		static int fake_major_allowed = 1;
+ 		char *end;
+ 		int major;
+ 
++		str++;
++		if(!strcmp(str, "mmap")){
++			CHOOSE_MODE(printk("mmap not supported by the ubd "
++					   "driver in tt mode\n"),
++				    ubd_do_mmap = 1);
++			return(0);
++		}
++
+ 		if(!strcmp(str, "sync")){
+ 			global_openflags.s = 1;
+ 			return(0);
+@@ -220,20 +274,14 @@
+ 			return(1);
+ 		}
+ 
+-		if(!fake_major_allowed){
+-			printk(KERN_ERR "Can't assign a fake major twice\n");
+-			return(1);
+-		}
+-
+ 		err = 1;
+  		spin_lock(&ubd_lock);
+- 		if(!fake_major_allowed){
++ 		if(fake_major != MAJOR_NR){
+  			printk(KERN_ERR "Can't assign a fake major twice\n");
+  			goto out1;
+  		}
+  
+  		fake_major = major;
+-		fake_major_allowed = 0;
+ 
+ 		printk(KERN_INFO "Setting extra ubd major number to %d\n",
+ 		       major);
+@@ -243,25 +291,23 @@
+ 		return(err);
+ 	}
+ 
+-	if(n < '0'){
+-		printk(KERN_ERR "ubd_setup : index out of range\n"); }
+-
+-	if((n >= '0') && (n <= '9')) n -= '0';
+-	else if((n >= 'a') && (n <= 'z')) n -= 'a';
+-	else {
+-		printk(KERN_ERR "ubd_setup : device syntax invalid\n");
++	n = parse_unit(&str);
++	if(n < 0){
++		printk(KERN_ERR "ubd_setup : couldn't parse unit number "
++		       "'%s'\n", str);
+ 		return(1);
+ 	}
+ 	if(n >= MAX_DEV){
+-		printk(KERN_ERR "ubd_setup : index out of range "
+-		       "(%d devices)\n", MAX_DEV);	
++		printk(KERN_ERR "ubd_setup : index %d out of range "
++		       "(%d devices)\n", n, MAX_DEV);
+ 		return(1);
+ 	}
+ 
+ 	err = 1;
+ 	spin_lock(&ubd_lock);
+ 
+-	if(ubd_dev[n].file != NULL){
++	dev = &ubd_dev[n];
++	if(dev->file != NULL){
+ 		printk(KERN_ERR "ubd_setup : device already configured\n");
+ 		goto out2;
+ 	}
+@@ -276,6 +322,11 @@
+ 		flags.s = 1;
+ 		str++;
+ 	}
++	if (*str == 'd'){
++		dev->no_cow = 1;
++		str++;
++	}
++
+ 	if(*str++ != '='){
+ 		printk(KERN_ERR "ubd_setup : Expected '='\n");
+ 		goto out2;
+@@ -284,14 +335,17 @@
+ 	err = 0;
+ 	backing_file = strchr(str, ',');
+ 	if(backing_file){
+-		*backing_file = '\0';
+-		backing_file++;
++		if(dev->no_cow)
++			printk(KERN_ERR "Can't specify both 'd' and a "
++			       "cow file\n");
++		else {
++			*backing_file = '\0';
++			backing_file++;
++		}
+ 	}
+-	ubd_dev[n].file = str;
+-	if(ubd_is_dir(ubd_dev[n].file))
+-		ubd_dev[n].is_dir = 1;
+-	ubd_dev[n].cow.file = backing_file;
+-	ubd_dev[n].boot_openflags = flags;
++	dev->file = str;
++	dev->cow.file = backing_file;
++	dev->boot_openflags = flags;
+  out2:
+ 	spin_unlock(&ubd_lock);
+ 	return(err);
+@@ -321,8 +375,7 @@
+ static int fakehd_set = 0;
+ static int fakehd(char *str)
+ {
+-	printk(KERN_INFO 
+-	       "fakehd : Changing ubd name to \"hd\".\n");
++	printk(KERN_INFO "fakehd : Changing ubd name to \"hd\".\n");
+ 	fakehd_set = 1;
+ 	return 1;
+ }
+@@ -368,32 +421,42 @@
+ {
+ 	struct io_thread_req req;
+ 	struct request *rq = elv_next_request(ubd_queue);
+-	int n;
++	int n, err;
+ 
+ 	do_ubd = NULL;
+ 	intr_count++;
+ 	n = read_ubd_fs(thread_fd, &req, sizeof(req));
+ 	if(n != sizeof(req)){
+ 		printk(KERN_ERR "Pid %d - spurious interrupt in ubd_handler, "
+-		       "errno = %d\n", os_getpid(), -n);
++		       "err = %d\n", os_getpid(), -n);
+ 		spin_lock(&ubd_io_lock);
+ 		end_request(rq, 0);
+ 		spin_unlock(&ubd_io_lock);
+ 		return;
+ 	}
+         
+-        if((req.offset != ((__u64) (rq->sector)) << 9) ||
+-	   (req.length != (rq->current_nr_sectors) << 9))
++	if((req.op != UBD_MMAP) && 
++	   ((req.offset != ((__u64) (rq->sector)) << 9) ||
++	    (req.length != (rq->current_nr_sectors) << 9)))
+ 		panic("I/O op mismatch");
+ 	
++	if(req.map_fd != -1){
++		err = physmem_subst_mapping(req.buffer, req.map_fd, 
++					    req.map_offset, 1);
++		if(err)
++			printk("ubd_handler - physmem_subst_mapping failed, "
++			       "err = %d\n", -err);
++	}
++
+ 	ubd_finish(rq, req.error);
+ 	reactivate_fd(thread_fd, UBD_IRQ);	
+ 	do_ubd_request(ubd_queue);
+ }
+ 
+-static void ubd_intr(int irq, void *dev, struct pt_regs *unused)
++static irqreturn_t ubd_intr(int irq, void *dev, struct pt_regs *unused)
+ {
+ 	ubd_handler();
++	return(IRQ_HANDLED);
+ }
+ 
+ /* Only changed by ubd_init, which is an initcall. */
+@@ -429,18 +492,20 @@
+ static int ubd_open_dev(struct ubd *dev)
+ {
+ 	struct openflags flags;
+-	int err, n, create_cow, *create_ptr;
++	char **back_ptr;
++	int err, create_cow, *create_ptr;
+ 
++	dev->openflags = dev->boot_openflags;
+ 	create_cow = 0;
+ 	create_ptr = (dev->cow.file != NULL) ? &create_cow : NULL;
+-	dev->fd = open_ubd_file(dev->file, &dev->openflags, &dev->cow.file,
++	back_ptr = dev->no_cow ? NULL : &dev->cow.file;
++	dev->fd = open_ubd_file(dev->file, &dev->openflags, back_ptr,
+ 				&dev->cow.bitmap_offset, &dev->cow.bitmap_len, 
+ 				&dev->cow.data_offset, create_ptr);
+ 
+ 	if((dev->fd == -ENOENT) && create_cow){
+-		n = dev - ubd_dev;
+ 		dev->fd = create_cow_file(dev->file, dev->cow.file, 
+-					  dev->openflags, 1 << 9,
++					  dev->openflags, 1 << 9, PAGE_SIZE,
+ 					  &dev->cow.bitmap_offset, 
+ 					  &dev->cow.bitmap_len,
+ 					  &dev->cow.data_offset);
+@@ -455,13 +520,17 @@
+ 	if(dev->cow.file != NULL){
+ 		err = -ENOMEM;
+ 		dev->cow.bitmap = (void *) vmalloc(dev->cow.bitmap_len);
+-		if(dev->cow.bitmap == NULL) goto error;
++		if(dev->cow.bitmap == NULL){
++			printk(KERN_ERR "Failed to vmalloc COW bitmap\n");
++			goto error;
++		}
+ 		flush_tlb_kernel_vm();
+ 
+ 		err = read_cow_bitmap(dev->fd, dev->cow.bitmap, 
+ 				      dev->cow.bitmap_offset, 
+ 				      dev->cow.bitmap_len);
+-		if(err) goto error;
++		if(err < 0)
++			goto error;
+ 
+ 		flags = dev->openflags;
+ 		flags.w = 0;
+@@ -481,17 +550,31 @@
+ 			
+ {
+ 	struct gendisk *disk;
++	char from[sizeof("ubd/nnnnn\0")], to[sizeof("discnnnnn/disc\0")];
++	int err;
+ 
+ 	disk = alloc_disk(1 << UBD_SHIFT);
+-	if (!disk)
+-		return -ENOMEM;
++	if(disk == NULL)
++		return(-ENOMEM);
+ 
+ 	disk->major = major;
+ 	disk->first_minor = unit << UBD_SHIFT;
+ 	disk->fops = &ubd_blops;
+ 	set_capacity(disk, size / 512);
+-	sprintf(disk->disk_name, "ubd");
+-	sprintf(disk->devfs_name, "ubd/disc%d", unit);
++	if(major == MAJOR_NR){
++		sprintf(disk->disk_name, "ubd%c", 'a' + unit);
++		sprintf(disk->devfs_name, "ubd/disc%d", unit);
++		sprintf(from, "ubd/%d", unit);
++		sprintf(to, "disc%d/disc", unit);
++		err = devfs_mk_symlink(from, to);
++		if(err)
++			printk("ubd_new_disk failed to make link from %s to "
++			       "%s, error = %d\n", from, to, err);
++	}
++	else {
++		sprintf(disk->disk_name, "ubd_fake%d", unit);
++		sprintf(disk->devfs_name, "ubd_fake/disc%d", unit);
++	}
+ 
+ 	disk->private_data = &ubd_dev[unit];
+ 	disk->queue = ubd_queue;
+@@ -506,24 +589,21 @@
+ 	struct ubd *dev = &ubd_dev[n];
+ 	int err;
+ 
+-	if(dev->is_dir)
+-		return(-EISDIR);
+-
+-	if (!dev->file)
++	if(dev->file == NULL)
+ 		return(-ENODEV);
+ 
+ 	if (ubd_open_dev(dev))
+ 		return(-ENODEV);
+ 
+ 	err = ubd_file_size(dev, &dev->size);
+-	if(err)
++	if(err < 0)
+ 		return(err);
+ 
+ 	err = ubd_new_disk(MAJOR_NR, dev->size, n, &ubd_gendisk[n]);
+ 	if(err) 
+ 		return(err);
+  
+-	if(fake_major)
++	if(fake_major != MAJOR_NR)
+ 		ubd_new_disk(fake_major, dev->size, n, 
+ 			     &fake_gendisk[n]);
+ 
+@@ -561,42 +641,42 @@
+ 	return(err);
+ }
+ 
+-static int ubd_get_config(char *dev, char *str, int size, char **error_out)
++static int ubd_get_config(char *name, char *str, int size, char **error_out)
+ {
+-	struct ubd *ubd;
++	struct ubd *dev;
+ 	char *end;
+-	int major, n = 0;
++	int n, len = 0;
+ 
+-	major = simple_strtoul(dev, &end, 0);
+-	if((*end != '\0') || (end == dev)){
+-		*error_out = "ubd_get_config : didn't parse major number";
++	n = simple_strtoul(name, &end, 0);
++	if((*end != '\0') || (end == name)){
++		*error_out = "ubd_get_config : didn't parse device number";
+ 		return(-1);
+ 	}
+ 
+-	if((major >= MAX_DEV) || (major < 0)){
+-		*error_out = "ubd_get_config : major number out of range";
++	if((n >= MAX_DEV) || (n < 0)){
++		*error_out = "ubd_get_config : device number out of range";
+ 		return(-1);
+ 	}
+ 
+-	ubd = &ubd_dev[major];
++	dev = &ubd_dev[n];
+ 	spin_lock(&ubd_lock);
+ 
+-	if(ubd->file == NULL){
+-		CONFIG_CHUNK(str, size, n, "", 1);
++	if(dev->file == NULL){
++		CONFIG_CHUNK(str, size, len, "", 1);
+ 		goto out;
+ 	}
+ 
+-	CONFIG_CHUNK(str, size, n, ubd->file, 0);
++	CONFIG_CHUNK(str, size, len, dev->file, 0);
+ 
+-	if(ubd->cow.file != NULL){
+-		CONFIG_CHUNK(str, size, n, ",", 0);
+-		CONFIG_CHUNK(str, size, n, ubd->cow.file, 1);
++	if(dev->cow.file != NULL){
++		CONFIG_CHUNK(str, size, len, ",", 0);
++		CONFIG_CHUNK(str, size, len, dev->cow.file, 1);
+ 	}
+-	else CONFIG_CHUNK(str, size, n, "", 1);
++	else CONFIG_CHUNK(str, size, len, "", 1);
+ 
+  out:
+ 	spin_unlock(&ubd_lock);
+-	return(n);
++	return(len);
+ }
+ 
+ static int ubd_remove(char *str)
+@@ -604,11 +684,9 @@
+ 	struct ubd *dev;
+ 	int n, err = -ENODEV;
+ 
+-	if(!isdigit(*str))
+-		return(err);	/* it should be a number 0-7/a-h */
++	n = parse_unit(&str);
+ 
+-	n = *str - '0';
+-	if(n >= MAX_DEV) 
++	if((n < 0) || (n >= MAX_DEV))
+ 		return(err);
+ 
+ 	dev = &ubd_dev[n];
+@@ -669,7 +747,7 @@
+ 		
+ 	elevator_init(ubd_queue, &elevator_noop);
+ 
+-	if (fake_major != 0) {
++	if (fake_major != MAJOR_NR) {
+ 		char name[sizeof("ubd_nnn\0")];
+ 
+ 		snprintf(name, sizeof(name), "ubd_%d", fake_major);
+@@ -696,6 +774,7 @@
+ 	io_pid = start_io_thread(stack + PAGE_SIZE - sizeof(void *), 
+ 				 &thread_fd);
+ 	if(io_pid < 0){
++		io_pid = -1;
+ 		printk(KERN_ERR 
+ 		       "ubd : Failed to start I/O thread (errno = %d) - "
+ 		       "falling back to synchronous I/O\n", -io_pid);
+@@ -703,8 +782,8 @@
+ 	}
+ 	err = um_request_irq(UBD_IRQ, thread_fd, IRQ_READ, ubd_intr, 
+ 			     SA_INTERRUPT, "ubd", ubd_dev);
+-	if(err != 0) printk(KERN_ERR 
+-			    "um_request_irq failed - errno = %d\n", -err);
++	if(err != 0) 
++		printk(KERN_ERR "um_request_irq failed - errno = %d\n", -err);
+ 	return(err);
+ }
+ 
+@@ -714,15 +793,9 @@
+ {
+ 	struct gendisk *disk = inode->i_bdev->bd_disk;
+ 	struct ubd *dev = disk->private_data;
+-	int err = -EISDIR;
+-
+-	if(dev->is_dir == 1)
+-		goto out;
++	int err = 0;
+ 
+-	err = 0;
+ 	if(dev->count == 0){
+-		dev->openflags = dev->boot_openflags;
+-
+ 		err = ubd_open_dev(dev);
+ 		if(err){
+ 			printk(KERN_ERR "%s: Can't open \"%s\": errno = %d\n",
+@@ -749,62 +822,156 @@
+ 	return(0);
+ }
+ 
+-void cowify_req(struct io_thread_req *req, struct ubd *dev)
++static void cowify_bitmap(__u64 io_offset, int length, unsigned long *cow_mask, 
++			  __u64 *cow_offset, unsigned long *bitmap, 
++			  __u64 bitmap_offset, unsigned long *bitmap_words,
++			  __u64 bitmap_len)
++{
++	__u64 sector = io_offset >> 9;
++	int i, update_bitmap = 0;
++
++	for(i = 0; i < length >> 9; i++){
++		if(cow_mask != NULL)
++			ubd_set_bit(i, (unsigned char *) cow_mask);
++		if(ubd_test_bit(sector + i, (unsigned char *) bitmap))
++			continue;
++
++		update_bitmap = 1;
++		ubd_set_bit(sector + i, (unsigned char *) bitmap);
++	}
++
++	if(!update_bitmap)
++		return;
++
++	*cow_offset = sector / (sizeof(unsigned long) * 8);
++
++	/* This takes care of the case where we're exactly at the end of the
++	 * device, and *cow_offset + 1 is off the end.  So, just back it up
++	 * by one word.  Thanks to Lynn Kerby for the fix and James McMechan
++	 * for the original diagnosis.
++	 */
++	if(*cow_offset == ((bitmap_len + sizeof(unsigned long) - 1) / 
++			   sizeof(unsigned long) - 1))
++		(*cow_offset)--;
++
++	bitmap_words[0] = bitmap[*cow_offset];
++	bitmap_words[1] = bitmap[*cow_offset + 1];
++
++	*cow_offset *= sizeof(unsigned long);
++	*cow_offset += bitmap_offset;
++}
++
++static void cowify_req(struct io_thread_req *req, unsigned long *bitmap, 
++		       __u64 bitmap_offset, __u64 bitmap_len)
+ {
+-        int i, update_bitmap, sector = req->offset >> 9;
++	__u64 sector = req->offset >> 9;
++	int i;
+ 
+ 	if(req->length > (sizeof(req->sector_mask) * 8) << 9)
+ 		panic("Operation too long");
++
+ 	if(req->op == UBD_READ) {
+ 		for(i = 0; i < req->length >> 9; i++){
+-			if(ubd_test_bit(sector + i, (unsigned char *) 
+-					dev->cow.bitmap)){
++			if(ubd_test_bit(sector + i, (unsigned char *) bitmap))
+ 				ubd_set_bit(i, (unsigned char *) 
+ 					    &req->sector_mask);
+-			}
+                 }
+-        } 
+-        else {
+-		update_bitmap = 0;
+-		for(i = 0; i < req->length >> 9; i++){
+-			ubd_set_bit(i, (unsigned char *) 
+-				    &req->sector_mask);
+-			if(!ubd_test_bit(sector + i, (unsigned char *) 
+-					 dev->cow.bitmap))
+-				update_bitmap = 1;
+-			ubd_set_bit(sector + i, (unsigned char *) 
+-				    dev->cow.bitmap);
+-		}
+-		if(update_bitmap){
+-			req->cow_offset = sector / (sizeof(unsigned long) * 8);
+-			req->bitmap_words[0] = 
+-				dev->cow.bitmap[req->cow_offset];
+-			req->bitmap_words[1] = 
+-				dev->cow.bitmap[req->cow_offset + 1];
+-			req->cow_offset *= sizeof(unsigned long);
+-			req->cow_offset += dev->cow.bitmap_offset;
++	}
++	else cowify_bitmap(req->offset, req->length, &req->sector_mask,
++			   &req->cow_offset, bitmap, bitmap_offset, 
++			   req->bitmap_words, bitmap_len);
++}
++
++static int mmap_fd(struct request *req, struct ubd *dev, __u64 offset)
++{
++	__u64 sector;
++	unsigned char *bitmap;
++	int bit, i;
++
++	/* mmap must have been requested on the command line */
++	if(!ubd_do_mmap)
++		return(-1);
++
++	/* The buffer must be page aligned */
++	if(((unsigned long) req->buffer % UBD_MMAP_BLOCK_SIZE) != 0)
++		return(-1);
++
++	/* The request must be a page long */
++	if((req->current_nr_sectors << 9) != PAGE_SIZE)
++		return(-1);
++
++	if(dev->cow.file == NULL)
++		return(dev->fd);
++
++	sector = offset >> 9;
++	bitmap = (unsigned char *) dev->cow.bitmap;
++	bit = ubd_test_bit(sector, bitmap);
++
++	for(i = 1; i < req->current_nr_sectors; i++){
++		if(ubd_test_bit(sector + i, bitmap) != bit)
++			return(-1);
++	}
++
++	if(bit || (rq_data_dir(req) == WRITE))
++		offset += dev->cow.data_offset;
++
++	/* The data on disk must be page aligned */
++	if((offset % UBD_MMAP_BLOCK_SIZE) != 0)
++		return(-1);
++
++	return(bit ? dev->fd : dev->cow.fd);
++}
++
++static int prepare_mmap_request(struct ubd *dev, int fd, __u64 offset, 
++				struct request *req, 
++				struct io_thread_req *io_req)
++{
++	int err;
++
++	if(rq_data_dir(req) == WRITE){
++		/* Writes are almost no-ops since the new data is already in the
++		 * host page cache
++		 */
++		dev->map_writes++;
++		if(dev->cow.file != NULL)
++			cowify_bitmap(io_req->offset, io_req->length, 
++				      &io_req->sector_mask, &io_req->cow_offset,
++				      dev->cow.bitmap, dev->cow.bitmap_offset,
++				      io_req->bitmap_words, 
++				      dev->cow.bitmap_len);
++	}
++	else {
++		int w;
++
++		if((dev->cow.file != NULL) && (fd == dev->cow.fd))
++			w = 0;
++		else w = dev->openflags.w;
++
++		if((dev->cow.file != NULL) && (fd == dev->fd))
++			offset += dev->cow.data_offset;
++
++		err = physmem_subst_mapping(req->buffer, fd, offset, w);
++		if(err){
++			printk("physmem_subst_mapping failed, err = %d\n", 
++			       -err);
++			return(1);
+ 		}
++		dev->map_reads++;
+ 	}
++	io_req->op = UBD_MMAP;
++	io_req->buffer = req->buffer;
++	return(0);
+ }
+ 
+ static int prepare_request(struct request *req, struct io_thread_req *io_req)
+ {
+ 	struct gendisk *disk = req->rq_disk;
+ 	struct ubd *dev = disk->private_data;
+-	__u64 block;
+-	int nsect;
++	__u64 offset;
++	int len, fd;
+ 
+ 	if(req->rq_status == RQ_INACTIVE) return(1);
+ 
+-	if(dev->is_dir){
+-		strcpy(req->buffer, "HOSTFS:");
+-		strcat(req->buffer, dev->file);
+- 		spin_lock(&ubd_io_lock);
+-		end_request(req, 1);
+- 		spin_unlock(&ubd_io_lock);
+-		return(1);
+-	}
+-
+ 	if((rq_data_dir(req) == WRITE) && !dev->openflags.w){
+ 		printk("Write attempted on readonly ubd device %s\n", 
+ 		       disk->disk_name);
+@@ -814,23 +981,49 @@
+ 		return(1);
+ 	}
+ 
+-        block = req->sector;
+-        nsect = req->current_nr_sectors;
++	offset = ((__u64) req->sector) << 9;
++	len = req->current_nr_sectors << 9;
+ 
+-	io_req->op = rq_data_dir(req) == READ ? UBD_READ : UBD_WRITE;
+ 	io_req->fds[0] = (dev->cow.file != NULL) ? dev->cow.fd : dev->fd;
+ 	io_req->fds[1] = dev->fd;
++	io_req->map_fd = -1;
++	io_req->cow_offset = -1;
++	io_req->offset = offset;
++	io_req->length = len;
++	io_req->error = 0;
++	io_req->sector_mask = 0;
++
++	fd = mmap_fd(req, dev, io_req->offset);
++	if(fd > 0){
++		/* If mmapping is otherwise OK, but the first access to the 
++		 * page is a write, then it's not mapped in yet.  So we have 
++		 * to write the data to disk first, then we can map the disk
++		 * page in and continue normally from there.
++		 */
++		if((rq_data_dir(req) == WRITE) && !is_remapped(req->buffer)){
++			io_req->map_fd = dev->fd;
++			io_req->map_offset = io_req->offset + 
++				dev->cow.data_offset;
++			dev->write_maps++;
++		}
++		else return(prepare_mmap_request(dev, fd, io_req->offset, req, 
++						 io_req));
++	}
++
++	if(rq_data_dir(req) == READ)
++		dev->nomap_reads++;
++	else dev->nomap_writes++;
++
++	io_req->op = (rq_data_dir(req) == READ) ? UBD_READ : UBD_WRITE;
+ 	io_req->offsets[0] = 0;
+ 	io_req->offsets[1] = dev->cow.data_offset;
+-	io_req->offset = ((__u64) block) << 9;
+-	io_req->length = nsect << 9;
+ 	io_req->buffer = req->buffer;
+ 	io_req->sectorsize = 1 << 9;
+-	io_req->sector_mask = 0;
+-	io_req->cow_offset = -1;
+-	io_req->error = 0;
+ 
+-        if(dev->cow.file != NULL) cowify_req(io_req, dev);
++	if(dev->cow.file != NULL) 
++		cowify_req(io_req, dev->cow.bitmap, dev->cow.bitmap_offset,
++			   dev->cow.bitmap_len);
++
+ 	return(0);
+ }
+ 
+@@ -885,7 +1078,7 @@
+ 		g.heads = 128;
+ 		g.sectors = 32;
+ 		g.cylinders = dev->size / (128 * 32 * 512);
+-		g.start = 2;
++		g.start = get_start_sect(inode->i_bdev);
+ 		return(copy_to_user(loc, &g, sizeof(g)) ? -EFAULT : 0);
+ 
+ 	case HDIO_SET_UNMASKINTR:
+@@ -935,6 +1128,142 @@
+ 	return(-EINVAL);
+ }
+ 
++static int ubd_check_remapped(int fd, unsigned long address, int is_write,
++			      __u64 offset)
++{
++	__u64 bitmap_offset;
++	unsigned long new_bitmap[2];
++	int i, err, n;
++
++	/* If it's not a write access, we can't do anything about it */
++	if(!is_write)
++		return(0);
++
++	/* We have a write */
++	for(i = 0; i < sizeof(ubd_dev) / sizeof(ubd_dev[0]); i++){
++		struct ubd *dev = &ubd_dev[i];
++
++		if((dev->fd != fd) && (dev->cow.fd != fd))
++			continue;
++
++		/* It's a write to a ubd device */
++
++		if(!dev->openflags.w){
++			/* It's a write access on a read-only device - probably
++			 * shouldn't happen.  If the kernel is trying to change
++			 * something with no intention of writing it back out,
++			 * then this message will clue us in that this needs
++			 * fixing
++			 */
++			printk("Write access to mapped page from readonly ubd "
++			       "device %d\n", i);
++			return(0);
++		}
++
++		/* It's a write to a writeable ubd device - it must be COWed
++		 * because, otherwise, the page would have been mapped in 
++		 * writeable
++		 */
++
++		if(!dev->cow.file)
++			panic("Write fault on writeable non-COW ubd device %d",
++			      i);
++
++		/* It should also be an access to the backing file since the 
++		 * COW pages should be mapped in read-write
++		 */
++
++		if(fd == dev->fd)
++			panic("Write fault on a backing page of ubd "
++			      "device %d\n", i);
++
++		/* So, we do the write, copying the backing data to the COW 
++		 * file... 
++		 */
++
++		err = os_seek_file(dev->fd, offset + dev->cow.data_offset);
++		if(err < 0)
++			panic("Couldn't seek to %lld in COW file of ubd "
++			      "device %d, err = %d", 
++			      offset + dev->cow.data_offset, i, -err);
++
++		n = os_write_file(dev->fd, (void *) address, PAGE_SIZE);
++		if(n != PAGE_SIZE)
++			panic("Couldn't copy data to COW file of ubd "
++			      "device %d, err = %d", i, -n);
++
++		/* ... updating the COW bitmap... */
++
++		cowify_bitmap(offset, PAGE_SIZE, NULL, &bitmap_offset, 
++			      dev->cow.bitmap, dev->cow.bitmap_offset, 
++			      new_bitmap, dev->cow.bitmap_len);
++
++		err = os_seek_file(dev->fd, bitmap_offset);
++		if(err < 0)
++			panic("Couldn't seek to %lld in COW file of ubd "
++			      "device %d, err = %d", bitmap_offset, i, -err);
++
++		n = os_write_file(dev->fd, new_bitmap, sizeof(new_bitmap));
++		if(n != sizeof(new_bitmap))
++			panic("Couldn't update bitmap  of ubd device %d, "
++			      "err = %d", i, -n);
++		
++		/* Maybe we can map the COW page in, and maybe we can't.  If
++		 * it is a pre-V3 COW file, we can't, since the alignment will 
++		 * be wrong.  If it is a V3 or later COW file which has been 
++		 * moved to a system with a larger page size, then maybe we 
++		 * can't, depending on the exact location of the page.
++		 */
++
++		offset += dev->cow.data_offset;
++
++		/* Remove the remapping, putting the original anonymous page
++		 * back.  If the COW file can be mapped in, that is done.
++		 * Otherwise, the COW page is read in.
++		 */
++
++		if(!physmem_remove_mapping((void *) address))
++			panic("Address 0x%lx not remapped by ubd device %d", 
++			      address, i);
++		if((offset % UBD_MMAP_BLOCK_SIZE) == 0)
++			physmem_subst_mapping((void *) address, dev->fd, 
++					      offset, 1);
++		else {
++			err = os_seek_file(dev->fd, offset);
++			if(err < 0)
++				panic("Couldn't seek to %lld in COW file of "
++				      "ubd device %d, err = %d", offset, i, 
++				      -err);
++
++			n = os_read_file(dev->fd, (void *) address, PAGE_SIZE);
++			if(n != PAGE_SIZE)
++				panic("Failed to read page from offset %llx of "
++				      "COW file of ubd device %d, err = %d",
++				      offset, i, -n);
++		}
++
++		return(1);
++	}
++
++	/* It's not a write on a ubd device */
++	return(0);
++}
++
++static struct remapper ubd_remapper = {
++	.list	= LIST_HEAD_INIT(ubd_remapper.list),
++	.proc	= ubd_check_remapped,
++};
++
++static int ubd_remapper_setup(void)
++{
++	if(ubd_do_mmap)
++		register_remapper(&ubd_remapper);
++
++	return(0);
++}
++
++__initcall(ubd_remapper_setup);
++
+ /*
+  * Overrides for Emacs so that we follow Linus's tabbing style.
+  * Emacs will notice this stuff at the end of the file and automatically
+diff -Naur a/arch/um/drivers/ubd_user.c b/arch/um/drivers/ubd_user.c
+--- a/arch/um/drivers/ubd_user.c	2004-01-08 22:16:38.000000000 -0500
++++ b/arch/um/drivers/ubd_user.c	2004-01-08 22:22:42.000000000 -0500
+@@ -11,11 +11,8 @@
+ #include <signal.h>
+ #include <string.h>
+ #include <netinet/in.h>
+-#include <sys/stat.h>
+ #include <sys/time.h>
+-#include <sys/fcntl.h>
+ #include <sys/socket.h>
+-#include <string.h>
+ #include <sys/mman.h>
+ #include <sys/param.h>
+ #include "asm/types.h"
+@@ -24,146 +21,30 @@
+ #include "user.h"
+ #include "ubd_user.h"
+ #include "os.h"
++#include "cow.h"
+ 
+ #include <endian.h>
+ #include <byteswap.h>
+-#if __BYTE_ORDER == __BIG_ENDIAN
+-# define ntohll(x) (x)
+-# define htonll(x) (x)
+-#elif __BYTE_ORDER == __LITTLE_ENDIAN
+-# define ntohll(x)  bswap_64(x)
+-# define htonll(x)  bswap_64(x)
+-#else
+-#error "__BYTE_ORDER not defined"
+-#endif
+-
+-#define PATH_LEN_V1 256
+-
+-struct cow_header_v1 {
+-	int magic;
+-	int version;
+-	char backing_file[PATH_LEN_V1];
+-	time_t mtime;
+-	__u64 size;
+-	int sectorsize;
+-};
+-
+-#define PATH_LEN_V2 MAXPATHLEN
+-
+-struct cow_header_v2 {
+-	unsigned long magic;
+-	unsigned long version;
+-	char backing_file[PATH_LEN_V2];
+-	time_t mtime;
+-	__u64 size;
+-	int sectorsize;
+-};
+-
+-union cow_header {
+-	struct cow_header_v1 v1;
+-	struct cow_header_v2 v2;
+-};
+-
+-#define COW_MAGIC 0x4f4f4f4d  /* MOOO */
+-#define COW_VERSION 2
+-
+-static void sizes(__u64 size, int sectorsize, int bitmap_offset, 
+-		  unsigned long *bitmap_len_out, int *data_offset_out)
+-{
+-	*bitmap_len_out = (size + sectorsize - 1) / (8 * sectorsize);
+-
+-	*data_offset_out = bitmap_offset + *bitmap_len_out;
+-	*data_offset_out = (*data_offset_out + sectorsize - 1) / sectorsize;
+-	*data_offset_out *= sectorsize;
+-}
+-
+-static int read_cow_header(int fd, int *magic_out, char **backing_file_out, 
+-			   time_t *mtime_out, __u64 *size_out, 
+-			   int *sectorsize_out, int *bitmap_offset_out)
+-{
+-	union cow_header *header;
+-	char *file;
+-	int err, n;
+-	unsigned long version, magic;
+-
+-	header = um_kmalloc(sizeof(*header));
+-	if(header == NULL){
+-		printk("read_cow_header - Failed to allocate header\n");
+-		return(-ENOMEM);
+-	}
+-	err = -EINVAL;
+-	n = read(fd, header, sizeof(*header));
+-	if(n < offsetof(typeof(header->v1), backing_file)){
+-		printk("read_cow_header - short header\n");
+-		goto out;
+-	}
+-
+-	magic = header->v1.magic;
+-	if(magic == COW_MAGIC) {
+-		version = header->v1.version;
+-	}
+-	else if(magic == ntohl(COW_MAGIC)){
+-		version = ntohl(header->v1.version);
+-	}
+-	else goto out;
+-
+-	*magic_out = COW_MAGIC;
+-
+-	if(version == 1){
+-		if(n < sizeof(header->v1)){
+-			printk("read_cow_header - failed to read V1 header\n");
+-			goto out;
+-		}
+-		*mtime_out = header->v1.mtime;
+-		*size_out = header->v1.size;
+-		*sectorsize_out = header->v1.sectorsize;
+-		*bitmap_offset_out = sizeof(header->v1);
+-		file = header->v1.backing_file;
+-	}
+-	else if(version == 2){
+-		if(n < sizeof(header->v2)){
+-			printk("read_cow_header - failed to read V2 header\n");
+-			goto out;
+-		}
+-		*mtime_out = ntohl(header->v2.mtime);
+-		*size_out = ntohll(header->v2.size);
+-		*sectorsize_out = ntohl(header->v2.sectorsize);
+-		*bitmap_offset_out = sizeof(header->v2);
+-		file = header->v2.backing_file;
+-	}
+-	else {
+-		printk("read_cow_header - invalid COW version\n");
+-		goto out;
+-	}
+-	err = -ENOMEM;
+-	*backing_file_out = uml_strdup(file);
+-	if(*backing_file_out == NULL){
+-		printk("read_cow_header - failed to allocate backing file\n");
+-		goto out;
+-	}
+-	err = 0;
+- out:
+-	kfree(header);
+-	return(err);
+-}
+ 
+ static int same_backing_files(char *from_cmdline, char *from_cow, char *cow)
+ {
+-	struct stat buf1, buf2;
++	struct uml_stat buf1, buf2;
++	int err;
+ 
+ 	if(from_cmdline == NULL) return(1);
+ 	if(!strcmp(from_cmdline, from_cow)) return(1);
+ 
+-	if(stat(from_cmdline, &buf1) < 0){
+-		printk("Couldn't stat '%s', errno = %d\n", from_cmdline, 
+-		       errno);
++	err = os_stat_file(from_cmdline, &buf1);
++	if(err < 0){
++		printk("Couldn't stat '%s', err = %d\n", from_cmdline, -err);
+ 		return(1);
+ 	}
+-	if(stat(from_cow, &buf2) < 0){
+-		printk("Couldn't stat '%s', errno = %d\n", from_cow, errno);
++	err = os_stat_file(from_cow, &buf2);
++	if(err < 0){
++		printk("Couldn't stat '%s', err = %d\n", from_cow, -err);
+ 		return(1);
+ 	}
+-	if((buf1.st_dev == buf2.st_dev) && (buf1.st_ino == buf2.st_ino))
++	if((buf1.ust_dev == buf2.ust_dev) && (buf1.ust_ino == buf2.ust_ino))
+ 		return(1);
+ 
+ 	printk("Backing file mismatch - \"%s\" requested,\n"
+@@ -174,20 +55,21 @@
+ 
+ static int backing_file_mismatch(char *file, __u64 size, time_t mtime)
+ {
+-	struct stat64 buf;
++	unsigned long modtime;
+ 	long long actual;
+ 	int err;
+ 
+-  	if(stat64(file, &buf) < 0){
+-		printk("Failed to stat backing file \"%s\", errno = %d\n",
+-		       file, errno);
+-		return(-errno);
++	err = os_file_modtime(file, &modtime);
++	if(err < 0){
++		printk("Failed to get modification time of backing file "
++		       "\"%s\", err = %d\n", file, -err);
++		return(err);
+ 	}
+ 
+ 	err = os_file_size(file, &actual);
+-	if(err){
++	if(err < 0){
+ 		printk("Failed to get size of backing file \"%s\", "
+-		       "errno = %d\n", file, -err);
++		       "err = %d\n", file, -err);
+ 		return(err);
+ 	}
+ 
+@@ -196,9 +78,9 @@
+ 		       "file\n", size, actual);
+ 		return(-EINVAL);
+ 	}
+-	if(buf.st_mtime != mtime){
++	if(modtime != mtime){
+ 		printk("mtime mismatch (%ld vs %ld) of COW header vs backing "
+-		       "file\n", mtime, buf.st_mtime);
++		       "file\n", mtime, modtime);
+ 		return(-EINVAL);
+ 	}
+ 	return(0);
+@@ -209,124 +91,16 @@
+ 	int err;
+ 
+ 	err = os_seek_file(fd, offset);
+-	if(err != 0) return(-errno);
+-	err = read(fd, buf, len);
+-	if(err < 0) return(-errno);
+-	return(0);
+-}
++	if(err < 0) 
++		return(err);
+ 
+-static int absolutize(char *to, int size, char *from)
+-{
+-	char save_cwd[256], *slash;
+-	int remaining;
++	err = os_read_file(fd, buf, len);
++	if(err < 0) 
++		return(err);
+ 
+-	if(getcwd(save_cwd, sizeof(save_cwd)) == NULL) {
+-		printk("absolutize : unable to get cwd - errno = %d\n", errno);
+-		return(-1);
+-	}
+-	slash = strrchr(from, '/');
+-	if(slash != NULL){
+-		*slash = '\0';
+-		if(chdir(from)){
+-			*slash = '/';
+-			printk("absolutize : Can't cd to '%s' - errno = %d\n",
+-			       from, errno);
+-			return(-1);
+-		}
+-		*slash = '/';
+-		if(getcwd(to, size) == NULL){
+-			printk("absolutize : unable to get cwd of '%s' - "
+-			       "errno = %d\n", from, errno);
+-			return(-1);
+-		}
+-		remaining = size - strlen(to);
+-		if(strlen(slash) + 1 > remaining){
+-			printk("absolutize : unable to fit '%s' into %d "
+-			       "chars\n", from, size);
+-			return(-1);
+-		}
+-		strcat(to, slash);
+-	}
+-	else {
+-		if(strlen(save_cwd) + 1 + strlen(from) + 1 > size){
+-			printk("absolutize : unable to fit '%s' into %d "
+-			       "chars\n", from, size);
+-			return(-1);
+-		}
+-		strcpy(to, save_cwd);
+-		strcat(to, "/");
+-		strcat(to, from);
+-	}
+-	chdir(save_cwd);
+ 	return(0);
+ }
+ 
+-static int write_cow_header(char *cow_file, int fd, char *backing_file, 
+-			    int sectorsize, long long *size)
+-{
+-        struct cow_header_v2 *header;
+-	struct stat64 buf;
+-	int err;
+-
+-	err = os_seek_file(fd, 0);
+-	if(err != 0){
+-		printk("write_cow_header - lseek failed, errno = %d\n", errno);
+-		return(-errno);
+-	}
+-
+-	err = -ENOMEM;
+-	header = um_kmalloc(sizeof(*header));
+-	if(header == NULL){
+-		printk("Failed to allocate COW V2 header\n");
+-		goto out;
+-	}
+-	header->magic = htonl(COW_MAGIC);
+-	header->version = htonl(COW_VERSION);
+-
+-	err = -EINVAL;
+-	if(strlen(backing_file) > sizeof(header->backing_file) - 1){
+-		printk("Backing file name \"%s\" is too long - names are "
+-		       "limited to %d characters\n", backing_file, 
+-		       sizeof(header->backing_file) - 1);
+-		goto out_free;
+-	}
+-
+-	if(absolutize(header->backing_file, sizeof(header->backing_file), 
+-		      backing_file))
+-		goto out_free;
+-
+-	err = stat64(header->backing_file, &buf);
+-	if(err < 0){
+-		printk("Stat of backing file '%s' failed, errno = %d\n",
+-		       header->backing_file, errno);
+-		err = -errno;
+-		goto out_free;
+-	}
+-
+-	err = os_file_size(header->backing_file, size);
+-	if(err){
+-		printk("Couldn't get size of backing file '%s', errno = %d\n",
+-		       header->backing_file, -*size);
+-		goto out_free;
+-	}
+-
+-	header->mtime = htonl(buf.st_mtime);
+-	header->size = htonll(*size);
+-	header->sectorsize = htonl(sectorsize);
+-
+-	err = write(fd, header, sizeof(*header));
+-	if(err != sizeof(*header)){
+-		printk("Write of header to new COW file '%s' failed, "
+-		       "errno = %d\n", cow_file, errno);
+-		goto out_free;
+-	}
+-	err = 0;
+- out_free:
+-	kfree(header);
+- out:
+-	return(err);
+-}
+-
+ int open_ubd_file(char *file, struct openflags *openflags, 
+ 		  char **backing_file_out, int *bitmap_offset_out, 
+ 		  unsigned long *bitmap_len_out, int *data_offset_out, 
+@@ -334,26 +108,36 @@
+ {
+ 	time_t mtime;
+ 	__u64 size;
++	__u32 version, align;
+ 	char *backing_file;
+-        int fd, err, sectorsize, magic, same, mode = 0644;
++	int fd, err, sectorsize, same, mode = 0644;
+ 
+-        if((fd = os_open_file(file, *openflags, mode)) < 0){
++	fd = os_open_file(file, *openflags, mode);
++	if(fd < 0){
+ 		if((fd == -ENOENT) && (create_cow_out != NULL))
+ 			*create_cow_out = 1;
+                 if(!openflags->w ||
+                    ((errno != EROFS) && (errno != EACCES))) return(-errno);
+ 		openflags->w = 0;
+-                if((fd = os_open_file(file, *openflags, mode)) < 0) 
++		fd = os_open_file(file, *openflags, mode); 
++		if(fd < 0) 
+ 			return(fd);
+         }
++
++	err = os_lock_file(fd, openflags->w);
++	if(err < 0){
++		printk("Failed to lock '%s', err = %d\n", file, -err);
++		goto out_close;
++	}
++	
+ 	if(backing_file_out == NULL) return(fd);
+ 
+-	err = read_cow_header(fd, &magic, &backing_file, &mtime, &size, 
+-			      &sectorsize, bitmap_offset_out);
++	err = read_cow_header(file_reader, &fd, &version, &backing_file, &mtime,
++			      &size, &sectorsize, &align, bitmap_offset_out);
+ 	if(err && (*backing_file_out != NULL)){
+ 		printk("Failed to read COW header from COW file \"%s\", "
+-		       "errno = %d\n", file, err);
+-		goto error;
++		       "errno = %d\n", file, -err);
++		goto out_close;
+ 	}
+ 	if(err) return(fd);
+ 
+@@ -363,36 +147,33 @@
+ 
+ 	if(!same && !backing_file_mismatch(*backing_file_out, size, mtime)){
+ 		printk("Switching backing file to '%s'\n", *backing_file_out);
+-		err = write_cow_header(file, fd, *backing_file_out, 
+-				       sectorsize, &size);
++		err = write_cow_header(file, fd, *backing_file_out,
++				       sectorsize, align, &size);
+ 		if(err){
+-			printk("Switch failed, errno = %d\n", err);
++			printk("Switch failed, errno = %d\n", -err);
+ 			return(err);
+ 		}
+ 	}
+ 	else {
+ 		*backing_file_out = backing_file;
+ 		err = backing_file_mismatch(*backing_file_out, size, mtime);
+-		if(err) goto error;
++		if(err) goto out_close;
+ 	}
+ 
+-	sizes(size, sectorsize, *bitmap_offset_out, bitmap_len_out, 
+-	      data_offset_out);
++	cow_sizes(version, size, sectorsize, align, *bitmap_offset_out, 
++		  bitmap_len_out, data_offset_out);
+ 
+         return(fd);
+- error:
+-	close(fd);
++ out_close:
++	os_close_file(fd);
+ 	return(err);
+ }
+ 
+ int create_cow_file(char *cow_file, char *backing_file, struct openflags flags,
+-		    int sectorsize, int *bitmap_offset_out, 
++		    int sectorsize, int alignment, int *bitmap_offset_out, 
+ 		    unsigned long *bitmap_len_out, int *data_offset_out)
+ {
+-	__u64 blocks;
+-	long zero;
+-	int err, fd, i;
+-	long long size;
++	int err, fd;
+ 
+ 	flags.c = 1;
+ 	fd = open_ubd_file(cow_file, &flags, NULL, NULL, NULL, NULL, NULL);
+@@ -403,57 +184,49 @@
+ 		goto out;
+ 	}
+ 
+-	err = write_cow_header(cow_file, fd, backing_file, sectorsize, &size);
+-	if(err) goto out_close;
+-
+-	blocks = (size + sectorsize - 1) / sectorsize;
+-	blocks = (blocks + sizeof(long) * 8 - 1) / (sizeof(long) * 8);
+-	zero = 0;
+-	for(i = 0; i < blocks; i++){
+-		err = write(fd, &zero, sizeof(zero));
+-		if(err != sizeof(zero)){
+-			printk("Write of bitmap to new COW file '%s' failed, "
+-			       "errno = %d\n", cow_file, errno);
+-			goto out_close;
+-		}
+-	}
+-
+-	sizes(size, sectorsize, sizeof(struct cow_header_v2), 
+-	      bitmap_len_out, data_offset_out);
+-	*bitmap_offset_out = sizeof(struct cow_header_v2);
+-
+-	return(fd);
+-
+- out_close:
+-	close(fd);
++	err = init_cow_file(fd, cow_file, backing_file, sectorsize, alignment,
++			    bitmap_offset_out, bitmap_len_out, 
++			    data_offset_out);
++	if(!err)
++		return(fd);
++	os_close_file(fd);
+  out:
+ 	return(err);
+ }
+ 
++/* XXX Just trivial wrappers around os_read_file and os_write_file */
+ int read_ubd_fs(int fd, void *buffer, int len)
+ {
+-	int n;
+-
+-	n = read(fd, buffer, len);
+-	if(n < 0) return(-errno);
+-	else return(n);
++	return(os_read_file(fd, buffer, len));
+ }
+ 
+ int write_ubd_fs(int fd, char *buffer, int len)
+ {
+-	int n;
+-
+-	n = write(fd, buffer, len);
+-	if(n < 0) return(-errno);
+-	else return(n);
++	return(os_write_file(fd, buffer, len));
+ }
+ 
+-int ubd_is_dir(char *file)
++static int update_bitmap(struct io_thread_req *req)
+ {
+-	struct stat64 buf;
++	int n;
++
++	if(req->cow_offset == -1)
++		return(0);
++
++	n = os_seek_file(req->fds[1], req->cow_offset);
++	if(n < 0){
++		printk("do_io - bitmap lseek failed : err = %d\n", -n);
++		return(1);
++	}
++
++	n = os_write_file(req->fds[1], &req->bitmap_words,
++		          sizeof(req->bitmap_words));
++	if(n != sizeof(req->bitmap_words)){
++		printk("do_io - bitmap update failed, err = %d fd = %d\n", -n,
++		       req->fds[1]);
++		return(1);
++	}
+ 
+-	if(stat64(file, &buf) < 0) return(0);
+-	return(S_ISDIR(buf.st_mode));
++	return(0);
+ }
+ 
+ void do_io(struct io_thread_req *req)
+@@ -461,8 +234,18 @@
+ 	char *buf;
+ 	unsigned long len;
+ 	int n, nsectors, start, end, bit;
++	int err;
+ 	__u64 off;
+ 
++	if(req->op == UBD_MMAP){
++		/* Touch the page to force the host to do any necessary IO to 
++		 * get it into memory 
++		 */
++		n = *((volatile int *) req->buffer);
++		req->error = update_bitmap(req);
++		return;
++	}
++
+ 	nsectors = req->length / req->sectorsize;
+ 	start = 0;
+ 	do {
+@@ -473,15 +256,14 @@
+ 				    &req->sector_mask) == bit))
+ 			end++;
+ 
+-		if(end != nsectors)
+-			printk("end != nsectors\n");
+ 		off = req->offset + req->offsets[bit] + 
+ 			start * req->sectorsize;
+ 		len = (end - start) * req->sectorsize;
+ 		buf = &req->buffer[start * req->sectorsize];
+ 
+-		if(os_seek_file(req->fds[bit], off) != 0){
+-			printk("do_io - lseek failed : errno = %d\n", errno);
++		err = os_seek_file(req->fds[bit], off);
++		if(err < 0){
++			printk("do_io - lseek failed : err = %d\n", -err);
+ 			req->error = 1;
+ 			return;
+ 		}
+@@ -490,11 +272,10 @@
+ 			do {
+ 				buf = &buf[n];
+ 				len -= n;
+-				n = read(req->fds[bit], buf, len);
++				n = os_read_file(req->fds[bit], buf, len);
+ 				if (n < 0) {
+-					printk("do_io - read returned %d : "
+-					       "errno = %d fd = %d\n", n,
+-					       errno, req->fds[bit]);
++					printk("do_io - read failed, err = %d "
++					       "fd = %d\n", -n, req->fds[bit]);
+ 					req->error = 1;
+ 					return;
+ 				}
+@@ -502,11 +283,10 @@
+ 			if (n < len) memset(&buf[n], 0, len - n);
+ 		}
+ 		else {
+-			n = write(req->fds[bit], buf, len);
++			n = os_write_file(req->fds[bit], buf, len);
+ 			if(n != len){
+-				printk("do_io - write returned %d : "
+-				       "errno = %d fd = %d\n", n, 
+-				       errno, req->fds[bit]);
++				printk("do_io - write failed err = %d "
++				       "fd = %d\n", -n, req->fds[bit]);
+ 				req->error = 1;
+ 				return;
+ 			}
+@@ -515,24 +295,7 @@
+ 		start = end;
+ 	} while(start < nsectors);
+ 
+-	if(req->cow_offset != -1){
+-		if(os_seek_file(req->fds[1], req->cow_offset) != 0){
+-			printk("do_io - bitmap lseek failed : errno = %d\n",
+-			       errno);
+-			req->error = 1;
+-			return;
+-		}
+-		n = write(req->fds[1], &req->bitmap_words, 
+-			  sizeof(req->bitmap_words));
+-		if(n != sizeof(req->bitmap_words)){
+-			printk("do_io - bitmap update returned %d : "
+-			       "errno = %d fd = %d\n", n, errno, req->fds[1]);
+-			req->error = 1;
+-			return;
+-		}
+-	}
+-	req->error = 0;
+-	return;
++	req->error = update_bitmap(req);
+ }
+ 
+ /* Changed in start_io_thread, which is serialized by being called only
+@@ -550,19 +313,23 @@
+ 
+ 	signal(SIGWINCH, SIG_IGN);
+ 	while(1){
+-		n = read(kernel_fd, &req, sizeof(req));
+-		if(n < 0) printk("io_thread - read returned %d, errno = %d\n",
+-				 n, errno);
+-		else if(n < sizeof(req)){
+-			printk("io_thread - short read : length = %d\n", n);
++		n = os_read_file(kernel_fd, &req, sizeof(req));
++		if(n != sizeof(req)){
++			if(n < 0)
++				printk("io_thread - read failed, fd = %d, "
++				       "err = %d\n", kernel_fd, -n);
++			else {
++				printk("io_thread - short read, fd = %d, "
++				       "length = %d\n", kernel_fd, n);
++			}
+ 			continue;
+ 		}
+ 		io_count++;
+ 		do_io(&req);
+-		n = write(kernel_fd, &req, sizeof(req));
++		n = os_write_file(kernel_fd, &req, sizeof(req));
+ 		if(n != sizeof(req))
+-			printk("io_thread - write failed, errno = %d\n",
+-			       errno);
++			printk("io_thread - write failed, fd = %d, err = %d\n",
++			       kernel_fd, -n);
+ 	}
+ }
+ 
+@@ -571,10 +338,11 @@
+ 	int pid, fds[2], err;
+ 
+ 	err = os_pipe(fds, 1, 1);
+-	if(err){
+-		printk("start_io_thread - os_pipe failed, errno = %d\n", -err);
+-		return(-1);
++	if(err < 0){
++		printk("start_io_thread - os_pipe failed, err = %d\n", -err);
++		goto out;
+ 	}
++
+ 	kernel_fd = fds[0];
+ 	*fd_out = fds[1];
+ 
+@@ -582,32 +350,19 @@
+ 		    NULL);
+ 	if(pid < 0){
+ 		printk("start_io_thread - clone failed : errno = %d\n", errno);
+-		return(-errno);
+-	}
+-	return(pid);
+-}
+-
+-#ifdef notdef
+-int start_io_thread(unsigned long sp, int *fd_out)
+-{
+-	int pid;
+-
+-	if((kernel_fd = get_pty()) < 0) return(-1);
+-	raw(kernel_fd, 0);
+-	if((*fd_out = open(ptsname(kernel_fd), O_RDWR)) < 0){
+-		printk("Couldn't open tty for IO\n");
+-		return(-1);
++		goto out_close;
+ 	}
+ 
+-	pid = clone(io_thread, (void *) sp, CLONE_FILES | CLONE_VM | SIGCHLD,
+-		    NULL);
+-	if(pid < 0){
+-		printk("start_io_thread - clone failed : errno = %d\n", errno);
+-		return(-errno);
+-	}
+ 	return(pid);
++
++ out_close:
++	os_close_file(fds[0]);
++	os_close_file(fds[1]);
++	kernel_fd = -1;
++	*fd_out = -1;
++out:
++	return(err);
+ }
+-#endif
+ 
+ /*
+  * Overrides for Emacs so that we follow Linus's tabbing style.
+diff -Naur a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c
+--- a/arch/um/drivers/xterm.c	2004-01-08 22:13:50.000000000 -0500
++++ b/arch/um/drivers/xterm.c	2004-01-08 22:18:48.000000000 -0500
+@@ -8,7 +8,6 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <errno.h>
+-#include <fcntl.h>
+ #include <termios.h>
+ #include <signal.h>
+ #include <sched.h>
+@@ -36,7 +35,8 @@
+ {
+ 	struct xterm_chan *data;
+ 
+-	if((data = malloc(sizeof(*data))) == NULL) return(NULL);
++	data = malloc(sizeof(*data));
++	if(data == NULL) return(NULL);
+ 	*data = ((struct xterm_chan) { .pid 		= -1, 
+ 				       .helper_pid 	= -1,
+ 				       .device 		= device, 
+@@ -93,7 +93,7 @@
+ 			 "/usr/lib/uml/port-helper", "-uml-socket",
+ 			 file, NULL };
+ 
+-	if(access(argv[4], X_OK))
++	if(os_access(argv[4], OS_ACC_X_OK) < 0)
+ 		argv[4] = "port-helper";
+ 
+ 	fd = mkstemp(file);
+@@ -106,13 +106,13 @@
+ 		printk("xterm_open : unlink failed, errno = %d\n", errno);
+ 		return(-errno);
+ 	}
+-	close(fd);
++	os_close_file(fd);
+ 
+-	fd = create_unix_socket(file, sizeof(file));
++	fd = os_create_unix_socket(file, sizeof(file), 1);
+ 	if(fd < 0){
+ 		printk("xterm_open : create_unix_socket failed, errno = %d\n", 
+ 		       -fd);
+-		return(-fd);
++		return(fd);
+ 	}
+ 
+ 	sprintf(title, data->title, data->device);
+@@ -128,15 +128,16 @@
+ 	if(data->direct_rcv)
+ 		new = os_rcv_fd(fd, &data->helper_pid);
+ 	else {
+-		if((err = os_set_fd_block(fd, 0)) != 0){
++		err = os_set_fd_block(fd, 0);
++		if(err < 0){
+ 			printk("xterm_open : failed to set descriptor "
+-			       "non-blocking, errno = %d\n", err);
++			       "non-blocking, err = %d\n", -err);
+ 			return(err);
+ 		}
+ 		new = xterm_fd(fd, &data->helper_pid);
+ 	}
+ 	if(new < 0){
+-		printk("xterm_open : os_rcv_fd failed, errno = %d\n", -new);
++		printk("xterm_open : os_rcv_fd failed, err = %d\n", -new);
+ 		goto out;
+ 	}
+ 
+@@ -160,7 +161,7 @@
+ 	if(data->helper_pid != -1) 
+ 		os_kill_process(data->helper_pid, 0);
+ 	data->helper_pid = -1;
+-	close(fd);
++	os_close_file(fd);
+ }
+ 
+ void xterm_free(void *d)
+diff -Naur a/arch/um/drivers/xterm_kern.c b/arch/um/drivers/xterm_kern.c
+--- a/arch/um/drivers/xterm_kern.c	2004-01-08 22:26:26.000000000 -0500
++++ b/arch/um/drivers/xterm_kern.c	2004-01-08 22:33:48.000000000 -0500
+@@ -5,9 +5,12 @@
+ 
+ #include "linux/errno.h"
+ #include "linux/slab.h"
++#include "linux/signal.h"
++#include "linux/interrupt.h"
+ #include "asm/semaphore.h"
+ #include "asm/irq.h"
+ #include "irq_user.h"
++#include "irq_kern.h"
+ #include "kern_util.h"
+ #include "os.h"
+ #include "xterm.h"
+@@ -19,17 +22,18 @@
+ 	int new_fd;
+ };
+ 
+-static void xterm_interrupt(int irq, void *data, struct pt_regs *regs)
++static irqreturn_t xterm_interrupt(int irq, void *data, struct pt_regs *regs)
+ {
+ 	struct xterm_wait *xterm = data;
+ 	int fd;
+ 
+ 	fd = os_rcv_fd(xterm->fd, &xterm->pid);
+ 	if(fd == -EAGAIN)
+-		return;
++		return(IRQ_NONE);
+ 
+ 	xterm->new_fd = fd;
+ 	up(&xterm->sem);
++	return(IRQ_HANDLED);
+ }
+ 
+ int xterm_fd(int socket, int *pid_out)
+@@ -54,7 +58,8 @@
+ 	if(err){
+ 		printk(KERN_ERR "xterm_fd : failed to get IRQ for xterm, "
+ 		       "err = %d\n",  err);
+-		return(err);
++		ret = err;
++		goto out;
+ 	}
+ 	down(&data->sem);
+ 
+@@ -62,6 +67,7 @@
+ 
+ 	ret = data->new_fd;
+ 	*pid_out = data->pid;
++ out:
+ 	kfree(data);
+ 
+ 	return(ret);
+diff -Naur a/arch/um/dyn.lds.S b/arch/um/dyn.lds.S
+--- a/arch/um/dyn.lds.S	2004-01-08 22:21:42.000000000 -0500
++++ b/arch/um/dyn.lds.S	2004-01-08 22:28:31.000000000 -0500
+@@ -10,12 +10,15 @@
+ {
+   . = START + SIZEOF_HEADERS;
+   .interp         : { *(.interp) }
+-  . = ALIGN(4096);
+   __binary_start = .;
+   . = ALIGN(4096);		/* Init code and data */
+   _stext = .;
+   __init_begin = .;
+-  .text.init : { *(.text.init) }
++  .init.text : { 
++	_sinittext = .;
++	*(.init.text)
++	_einittext = .;
++  }
+ 
+   . = ALIGN(4096);
+ 
+@@ -67,7 +70,7 @@
+ 
+   #include "asm/common.lds.S"
+ 
+-  .data.init : { *(.data.init) }
++  init.data : { *(.init.data) }
+ 
+   /* Ensure the __preinit_array_start label is properly aligned.  We
+      could instead move the label definition inside the section, but
+diff -Naur a/arch/um/include/2_5compat.h b/arch/um/include/2_5compat.h
+--- a/arch/um/include/2_5compat.h	2004-01-08 22:20:37.000000000 -0500
++++ b/arch/um/include/2_5compat.h	2004-01-08 22:27:07.000000000 -0500
+@@ -6,20 +6,6 @@
+ #ifndef __2_5_COMPAT_H__
+ #define __2_5_COMPAT_H__
+ 
+-#include "linux/version.h"
+-
+-#define INIT_CONSOLE(dev_name, write_proc, device_proc, setup_proc, f) { \
+-	name :		dev_name, \
+-	write :		write_proc, \
+-	read :		NULL, \
+-	device :	device_proc, \
+-	setup :		setup_proc, \
+-	flags :		f, \
+-	index :		-1, \
+-	cflag :		0, \
+-	next :		NULL \
+-}
+-
+ #define INIT_HARDSECT(arr, maj, sizes)
+ 
+ #define SET_PRI(task) do ; while(0)
+diff -Naur a/arch/um/include/irq_kern.h b/arch/um/include/irq_kern.h
+--- a/arch/um/include/irq_kern.h	1969-12-31 19:00:00.000000000 -0500
++++ b/arch/um/include/irq_kern.h	2004-01-08 22:27:54.000000000 -0500
+@@ -0,0 +1,28 @@
++/* 
++ * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
++ * Licensed under the GPL
++ */
++
++#ifndef __IRQ_KERN_H__
++#define __IRQ_KERN_H__
++
++#include "linux/interrupt.h"
++
++extern int um_request_irq(unsigned int irq, int fd, int type,
++			  irqreturn_t (*handler)(int, void *, 
++						 struct pt_regs *),
++			  unsigned long irqflags,  const char * devname,
++			  void *dev_id);
++
++#endif
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/arch/um/include/kern_util.h b/arch/um/include/kern_util.h
+--- a/arch/um/include/kern_util.h	2004-01-08 22:18:49.000000000 -0500
++++ b/arch/um/include/kern_util.h	2004-01-08 22:24:38.000000000 -0500
+@@ -63,10 +63,9 @@
+ extern void *syscall_sp(void *t);
+ extern void syscall_trace(void);
+ extern int hz(void);
+-extern void idle_timer(void);
++extern void uml_idle_timer(void);
+ extern unsigned int do_IRQ(int irq, union uml_pt_regs *regs);
+ extern int external_pid(void *t);
+-extern int pid_to_processor_id(int pid);
+ extern void boot_timer_handler(int sig);
+ extern void interrupt_end(void);
+ extern void initial_thread_cb(void (*proc)(void *), void *arg);
+@@ -90,9 +89,7 @@
+ extern char *uml_strdup(char *string);
+ extern void unprotect_kernel_mem(void);
+ extern void protect_kernel_mem(void);
+-extern void set_kmem_end(unsigned long);
+ extern void uml_cleanup(void);
+-extern int pid_to_processor_id(int pid);
+ extern void set_current(void *t);
+ extern void lock_signalled_task(void *t);
+ extern void IPI_handler(int cpu);
+@@ -101,7 +98,9 @@
+ extern int clear_user_proc(void *buf, int size);
+ extern int copy_to_user_proc(void *to, void *from, int size);
+ extern int copy_from_user_proc(void *to, void *from, int size);
++extern int strlen_user_proc(char *str);
+ extern void bus_handler(int sig, union uml_pt_regs *regs);
++extern void winch(int sig, union uml_pt_regs *regs);
+ extern long execute_syscall(void *r);
+ extern int smp_sigio_handler(void);
+ extern void *get_current(void);
+@@ -112,6 +111,8 @@
+ extern void free_irq(unsigned int, void *);
+ extern int um_in_interrupt(void);
+ extern int cpu(void);
++extern unsigned long long time_stamp(void);
++
+ #endif
+ 
+ /*
+diff -Naur a/arch/um/include/line.h b/arch/um/include/line.h
+--- a/arch/um/include/line.h	2004-01-08 22:27:12.000000000 -0500
++++ b/arch/um/include/line.h	2004-01-08 22:34:07.000000000 -0500
+@@ -9,12 +9,14 @@
+ #include "linux/list.h"
+ #include "linux/workqueue.h"
+ #include "linux/tty.h"
++#include "linux/interrupt.h"
+ #include "asm/semaphore.h"
+ #include "chan_user.h"
+ #include "mconsole_kern.h"
+ 
+ struct line_driver {
+ 	char *name;
++	char *device_name;
+ 	char *devfs_name;
+ 	short major;
+ 	short minor_start;
+@@ -67,8 +69,6 @@
+ 
+ #define LINES_INIT(n) {  num :		n }
+ 
+-extern void line_interrupt(int irq, void *data, struct pt_regs *unused);
+-extern void line_write_interrupt(int irq, void *data, struct pt_regs *unused);
+ extern void line_close(struct line *lines, struct tty_struct *tty);
+ extern int line_open(struct line *lines, struct tty_struct *tty, 
+ 		     struct chan_opts *opts);
+diff -Naur a/arch/um/include/mconsole.h b/arch/um/include/mconsole.h
+--- a/arch/um/include/mconsole.h	2004-01-08 22:19:58.000000000 -0500
++++ b/arch/um/include/mconsole.h	2004-01-08 22:25:57.000000000 -0500
+@@ -41,11 +41,13 @@
+ 
+ struct mc_request;
+ 
++enum mc_context { MCONSOLE_INTR, MCONSOLE_PROC };
++
+ struct mconsole_command
+ {
+ 	char *command;
+ 	void (*handler)(struct mc_request *req);
+-	int as_interrupt;
++	enum mc_context context;
+ };
+ 
+ struct mc_request
+@@ -77,6 +79,8 @@
+ extern void mconsole_cad(struct mc_request *req);
+ extern void mconsole_stop(struct mc_request *req);
+ extern void mconsole_go(struct mc_request *req);
++extern void mconsole_log(struct mc_request *req);
++extern void mconsole_proc(struct mc_request *req);
+ 
+ extern int mconsole_get_request(int fd, struct mc_request *req);
+ extern int mconsole_notify(char *sock_name, int type, const void *data, 
+diff -Naur a/arch/um/include/mem.h b/arch/um/include/mem.h
+--- a/arch/um/include/mem.h	2004-01-08 22:32:37.000000000 -0500
++++ b/arch/um/include/mem.h	2004-01-08 22:36:37.000000000 -0500
+@@ -1,19 +1,17 @@
+ /* 
+- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2002, 2003 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+ #ifndef __MEM_H__
+ #define __MEM_H__
+ 
+-struct vm_reserved {
+-	struct list_head list;
+-	unsigned long start;
+-	unsigned long end;
+-};
++#include "linux/types.h"
+ 
+-extern void set_usable_vm(unsigned long start, unsigned long end);
+-extern void set_kmem_end(unsigned long new);
++extern int phys_mapping(unsigned long phys, __u64 *offset_out);
++extern int physmem_subst_mapping(void *virt, int fd, __u64 offset, int w);
++extern int is_remapped(void *virt);
++extern int physmem_remove_mapping(void *virt);
+ 
+ #endif
+ 
+diff -Naur a/arch/um/include/mem_kern.h b/arch/um/include/mem_kern.h
+--- a/arch/um/include/mem_kern.h	1969-12-31 19:00:00.000000000 -0500
++++ b/arch/um/include/mem_kern.h	2004-01-08 22:29:31.000000000 -0500
+@@ -0,0 +1,30 @@
++/* 
++ * Copyright (C) 2003 Jeff Dike (jdike@addtoit.com)
++ * Licensed under the GPL
++ */
++
++#ifndef __MEM_KERN_H__
++#define __MEM_KERN_H__
++
++#include "linux/list.h"
++#include "linux/types.h"
++
++struct remapper {
++	struct list_head list;
++	int (*proc)(int, unsigned long, int, __u64);
++};
++
++extern void register_remapper(struct remapper *info);
++
++#endif
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/arch/um/include/mem_user.h b/arch/um/include/mem_user.h
+--- a/arch/um/include/mem_user.h	2004-01-08 22:25:06.000000000 -0500
++++ b/arch/um/include/mem_user.h	2004-01-08 22:32:22.000000000 -0500
+@@ -32,43 +32,38 @@
+ #ifndef _MEM_USER_H
+ #define _MEM_USER_H
+ 
+-struct mem_region {
++struct iomem_region {
++	struct iomem_region *next;
+ 	char *driver;
+-	unsigned long start_pfn;
+-	unsigned long start;
+-	unsigned long len;
+-	void *mem_map;
+ 	int fd;
++	int size;
++	unsigned long phys;
++	unsigned long virt;
+ };
+ 
+-extern struct mem_region *regions[];
+-extern struct mem_region physmem_region;
++extern struct iomem_region *iomem_regions;
++extern int iomem_size;
+ 
+ #define ROUND_4M(n) ((((unsigned long) (n)) + (1 << 22)) & ~((1 << 22) - 1))
+ 
+ extern unsigned long host_task_size;
+ extern unsigned long task_size;
+ 
++extern void check_devanon(void);
+ extern int init_mem_user(void);
+ extern int create_mem_file(unsigned long len);
+-extern void setup_range(int fd, char *driver, unsigned long start,
+-			unsigned long pfn, unsigned long total, int need_vm, 
+-			struct mem_region *region, void *reserved);
+ extern void setup_memory(void *entry);
+ extern unsigned long find_iomem(char *driver, unsigned long *len_out);
+-extern int init_maps(struct mem_region *region);
+-extern int nregions(void);
+-extern int reserve_vm(unsigned long start, unsigned long end, void *e);
++extern int init_maps(unsigned long physmem, unsigned long iomem, 
++		     unsigned long highmem);
+ extern unsigned long get_vm(unsigned long len);
+ extern void setup_physmem(unsigned long start, unsigned long usable,
+-			  unsigned long len);
+-extern int setup_region(struct mem_region *region, void *entry);
++			  unsigned long len, unsigned long highmem);
+ extern void add_iomem(char *name, int fd, unsigned long size);
+-extern struct mem_region *phys_region(unsigned long phys);
+ extern unsigned long phys_offset(unsigned long phys);
+ extern void unmap_physmem(void);
+-extern int map_memory(unsigned long virt, unsigned long phys, 
+-		      unsigned long len, int r, int w, int x);
++extern void map_memory(unsigned long virt, unsigned long phys, 
++		       unsigned long len, int r, int w, int x);
+ extern int protect_memory(unsigned long addr, unsigned long len, 
+ 			  int r, int w, int x, int must_succeed);
+ extern unsigned long get_kmem_end(void);
+diff -Naur a/arch/um/include/os.h b/arch/um/include/os.h
+--- a/arch/um/include/os.h	2004-01-08 22:16:19.000000000 -0500
++++ b/arch/um/include/os.h	2004-01-08 22:22:02.000000000 -0500
+@@ -17,6 +17,32 @@
+ #define OS_TYPE_FIFO 6
+ #define OS_TYPE_SOCK 7
+ 
++/* os_access() flags */
++#define OS_ACC_F_OK    0       /* Test for existence.  */
++#define OS_ACC_X_OK    1       /* Test for execute permission.  */
++#define OS_ACC_W_OK    2       /* Test for write permission.  */
++#define OS_ACC_R_OK    4       /* Test for read permission.  */
++#define OS_ACC_RW_OK   (OS_ACC_W_OK | OS_ACC_R_OK) /* Test for RW permission */
++
++/*
++ * types taken from stat_file() in hostfs_user.c
++ * (if they are wrong here, they are wrong there...).
++`*/
++struct uml_stat {
++	int                ust_dev;        /* device */
++	unsigned long long ust_ino;        /* inode */
++	int                ust_mode;       /* protection */
++	int                ust_nlink;      /* number of hard links */
++	int                ust_uid;        /* user ID of owner */
++	int                ust_gid;        /* group ID of owner */
++	unsigned long long ust_size;       /* total size, in bytes */
++	int                ust_blksize;    /* blocksize for filesystem I/O */
++	unsigned long long ust_blocks;     /* number of blocks allocated */
++	unsigned long      ust_atime;      /* time of last access */
++	unsigned long      ust_mtime;      /* time of last modification */
++	unsigned long      ust_ctime;      /* time of last change */
++};
++
+ struct openflags {
+ 	unsigned int r : 1;
+ 	unsigned int w : 1;
+@@ -91,22 +117,40 @@
+ 	return(flags); 
+ }
+   
++extern int os_stat_file(const char *file_name, struct uml_stat *buf);
++extern int os_stat_fd(const int fd, struct uml_stat *buf);
++extern int os_access(const char *file, int mode);
++extern void os_print_error(int error, const char* str);
++extern int os_get_exec_close(int fd, int *close_on_exec);
++extern int os_set_exec_close(int fd, int close_on_exec);
++extern int os_ioctl_generic(int fd, unsigned int cmd, unsigned long arg);
++extern int os_window_size(int fd, int *rows, int *cols);
++extern int os_new_tty_pgrp(int fd, int pid);
++extern int os_get_ifname(int fd, char *namebuf);
++extern int os_set_slip(int fd);
++extern int os_set_owner(int fd, int pid);
++extern int os_sigio_async(int master, int slave);
++extern int os_mode_fd(int fd, int mode);
++
+ extern int os_seek_file(int fd, __u64 offset);
+ extern int os_open_file(char *file, struct openflags flags, int mode);
+ extern int os_read_file(int fd, void *buf, int len);
+-extern int os_write_file(int fd, void *buf, int count);
++extern int os_write_file(int fd, const void *buf, int count);
+ extern int os_file_size(char *file, long long *size_out);
++extern int os_file_modtime(char *file, unsigned long *modtime);
+ extern int os_pipe(int *fd, int stream, int close_on_exec);
+ extern int os_set_fd_async(int fd, int owner);
+ extern int os_set_fd_block(int fd, int blocking);
+ extern int os_accept_connection(int fd);
++extern int os_create_unix_socket(char *file, int len, int close_on_exec);
+ extern int os_shutdown_socket(int fd, int r, int w);
+ extern void os_close_file(int fd);
+ extern int os_rcv_fd(int fd, int *helper_pid_out);
+-extern int create_unix_socket(char *file, int len);
++extern int create_unix_socket(char *file, int len, int close_on_exec);
+ extern int os_connect_socket(char *name);
+ extern int os_file_type(char *file);
+ extern int os_file_mode(char *file, struct openflags *mode_out);
++extern int os_lock_file(int fd, int excl);
+ 
+ extern unsigned long os_process_pc(int pid);
+ extern int os_process_parent(int pid);
+@@ -115,11 +159,12 @@
+ extern void os_usr1_process(int pid);
+ extern int os_getpid(void);
+ 
+-extern int os_map_memory(void *virt, int fd, unsigned long off, 
++extern int os_map_memory(void *virt, int fd, unsigned long long off, 
+ 			 unsigned long len, int r, int w, int x);
+ extern int os_protect_memory(void *addr, unsigned long len, 
+ 			     int r, int w, int x);
+ extern int os_unmap_memory(void *addr, int len);
++extern void os_flush_stdout(void);
+ 
+ #endif
+ 
+diff -Naur a/arch/um/include/sysdep-i386/sigcontext.h b/arch/um/include/sysdep-i386/sigcontext.h
+--- a/arch/um/include/sysdep-i386/sigcontext.h	2004-01-08 22:26:00.000000000 -0500
++++ b/arch/um/include/sysdep-i386/sigcontext.h	2004-01-08 22:33:43.000000000 -0500
+@@ -28,8 +28,8 @@
+  */
+ #define SC_START_SYSCALL(sc) do SC_EAX(sc) = -ENOSYS; while(0)
+ 
+-/* These are General Protection and Page Fault */
+-#define SEGV_IS_FIXABLE(trap) ((trap == 13) || (trap == 14))
++/* This is Page Fault */
++#define SEGV_IS_FIXABLE(trap) (trap == 14)
+ 
+ #define SC_SEGV_IS_FIXABLE(sc) (SEGV_IS_FIXABLE(SC_TRAPNO(sc)))
+ 
+diff -Naur a/arch/um/include/ubd_user.h b/arch/um/include/ubd_user.h
+--- a/arch/um/include/ubd_user.h	2004-01-08 22:22:40.000000000 -0500
++++ b/arch/um/include/ubd_user.h	2004-01-08 22:29:35.000000000 -0500
+@@ -9,7 +9,7 @@
+ 
+ #include "os.h"
+ 
+-enum ubd_req { UBD_READ, UBD_WRITE };
++enum ubd_req { UBD_READ, UBD_WRITE, UBD_MMAP };
+ 
+ struct io_thread_req {
+ 	enum ubd_req op;
+@@ -20,8 +20,10 @@
+ 	char *buffer;
+ 	int sectorsize;
+ 	unsigned long sector_mask;
+-	unsigned long cow_offset;
++	unsigned long long cow_offset;
+ 	unsigned long bitmap_words[2];
++	int map_fd;
++	unsigned long long map_offset;
+ 	int error;
+ };
+ 
+@@ -31,7 +33,7 @@
+ 			 int *create_cow_out);
+ extern int create_cow_file(char *cow_file, char *backing_file, 
+ 			   struct openflags flags, int sectorsize, 
+-			   int *bitmap_offset_out, 
++			   int alignment, int *bitmap_offset_out, 
+ 			   unsigned long *bitmap_len_out,
+ 			   int *data_offset_out);
+ extern int read_cow_bitmap(int fd, void *buf, int offset, int len);
+@@ -39,7 +41,6 @@
+ extern int write_ubd_fs(int fd, char *buffer, int len);
+ extern int start_io_thread(unsigned long sp, int *fds_out);
+ extern void do_io(struct io_thread_req *req);
+-extern int ubd_is_dir(char *file);
+ 
+ static inline int ubd_test_bit(__u64 bit, unsigned char *data)
+ {
+diff -Naur a/arch/um/include/um_uaccess.h b/arch/um/include/um_uaccess.h
+--- a/arch/um/include/um_uaccess.h	2004-01-08 22:25:51.000000000 -0500
++++ b/arch/um/include/um_uaccess.h	2004-01-08 22:33:28.000000000 -0500
+@@ -38,22 +38,73 @@
+ 				from, n));
+ }
+ 
++/*
++ * strncpy_from_user: - Copy a NUL terminated string from userspace.
++ * @dst:   Destination address, in kernel space.  This buffer must be at
++ *         least @count bytes long.
++ * @src:   Source address, in user space.
++ * @count: Maximum number of bytes to copy, including the trailing NUL.
++ * 
++ * Copies a NUL-terminated string from userspace to kernel space.
++ *
++ * On success, returns the length of the string (not including the trailing
++ * NUL).
++ *
++ * If access to userspace fails, returns -EFAULT (some data may have been
++ * copied).
++ *
++ * If @count is smaller than the length of the string, copies @count bytes
++ * and returns @count.
++ */
++
+ static inline int strncpy_from_user(char *dst, const char *src, int count)
+ {
+ 	return(CHOOSE_MODE_PROC(strncpy_from_user_tt, strncpy_from_user_skas,
+ 				dst, src, count));
+ }
+ 
++/*
++ * __clear_user: - Zero a block of memory in user space, with less checking.
++ * @to:   Destination address, in user space.
++ * @n:    Number of bytes to zero.
++ *
++ * Zero a block of memory in user space.  Caller must check
++ * the specified block with access_ok() before calling this function.
++ *
++ * Returns number of bytes that could not be cleared.
++ * On success, this will be zero.
++ */
+ static inline int __clear_user(void *mem, int len)
+ {
+ 	return(CHOOSE_MODE_PROC(__clear_user_tt, __clear_user_skas, mem, len));
+ }
+ 
++/*
++ * clear_user: - Zero a block of memory in user space.
++ * @to:   Destination address, in user space.
++ * @n:    Number of bytes to zero.
++ *
++ * Zero a block of memory in user space.
++ *
++ * Returns number of bytes that could not be cleared.
++ * On success, this will be zero.
++ */
+ static inline int clear_user(void *mem, int len)
+ {
+ 	return(CHOOSE_MODE_PROC(clear_user_tt, clear_user_skas, mem, len));
+ }
+ 
++/*
++ * strlen_user: - Get the size of a string in user space.
++ * @str: The string to measure.
++ * @n:   The maximum valid length
++ *
++ * Get the size of a NUL-terminated string in user space.
++ *
++ * Returns the size of the string INCLUDING the terminating NUL.
++ * On exception, returns 0.
++ * If the string is too long, returns a value greater than @n.
++ */
+ static inline int strnlen_user(const void *str, int len)
+ {
+ 	return(CHOOSE_MODE_PROC(strnlen_user_tt, strnlen_user_skas, str, len));
+diff -Naur a/arch/um/include/user.h b/arch/um/include/user.h
+--- a/arch/um/include/user.h	2004-01-08 22:13:48.000000000 -0500
++++ b/arch/um/include/user.h	2004-01-08 22:18:35.000000000 -0500
+@@ -14,6 +14,7 @@
+ extern void kfree(void *ptr);
+ extern int in_aton(char *str);
+ extern int open_gdb_chan(void);
++extern int strlcpy(char *, const char *, int);
+ 
+ #endif
+ 
+diff -Naur a/arch/um/include/user_util.h b/arch/um/include/user_util.h
+--- a/arch/um/include/user_util.h	2004-01-08 22:14:54.000000000 -0500
++++ b/arch/um/include/user_util.h	2004-01-08 22:20:21.000000000 -0500
+@@ -14,8 +14,6 @@
+ extern int unlockpt(int __fd);
+ extern char *ptsname(int __fd);
+ 
+-enum { OP_NONE, OP_EXEC, OP_FORK, OP_TRACE_ON, OP_REBOOT, OP_HALT, OP_CB };
+-
+ struct cpu_task {
+ 	int pid;
+ 	void *task;
+@@ -59,7 +57,6 @@
+ extern void *add_signal_handler(int sig, void (*handler)(int));
+ extern int start_fork_tramp(void *arg, unsigned long temp_stack, 
+ 			    int clone_flags, int (*tramp)(void *));
+-extern int clone_and_wait(int (*fn)(void *), void *arg, void *sp, int flags);
+ extern int linux_main(int argc, char **argv);
+ extern void set_cmdline(char *cmd);
+ extern void input_cb(void (*proc)(void *), void *arg, int arg_len);
+@@ -86,11 +83,13 @@
+ extern int run_kernel_thread(int (*fn)(void *), void *arg, void **jmp_ptr);
+ extern void write_sigio_workaround(void);
+ extern void arch_check_bugs(void);
++extern int cpu_feature(char *what, char *buf, int len);
+ extern int arch_handle_signal(int sig, union uml_pt_regs *regs);
+ extern int arch_fixup(unsigned long address, void *sc_ptr);
+ extern void forward_pending_sigio(int target);
+ extern int can_do_skas(void);
+- 
++extern void arch_init_thread(void);
++
+ #endif
+ 
+ /*
+diff -Naur a/arch/um/Kconfig b/arch/um/Kconfig
+--- a/arch/um/Kconfig	2004-01-08 22:21:13.000000000 -0500
++++ b/arch/um/Kconfig	2004-01-08 22:27:33.000000000 -0500
+@@ -61,6 +61,20 @@
+ 
+ config NET
+ 	bool "Networking support"
++	help
++	Unless you really know what you are doing, you should say Y here.
++	The reason is that some programs need kernel networking support even
++	when running on a stand-alone machine that isn't connected to any
++	other computer. If you are upgrading from an older kernel, you
++	should consider updating your networking tools too because changes
++	in the kernel and the tools often go hand in hand. The tools are
++	contained in the package net-tools, the location and version number
++	of which are given in Documentation/Changes.
++
++	For a general introduction to Linux networking, it is highly
++	recommended to read the NET-HOWTO, available from
++	<http://www.tldp.org/docs.html#howto>.
++
+ 
+ source "fs/Kconfig.binfmt"
+ 
+@@ -85,6 +99,19 @@
+         If you'd like to be able to work with files stored on the host, 
+         say Y or M here; otherwise say N.
+ 
++config HPPFS
++	tristate "HoneyPot ProcFS"
++	help
++	hppfs (HoneyPot ProcFS) is a filesystem which allows UML /proc 
++	entries to be overridden, removed, or fabricated from the host.
++	Its purpose is to allow a UML to appear to be a physical machine
++	by removing or changing anything in /proc which gives away the
++	identity of a UML.
++
++	See http://user-mode-linux.sf.net/hppfs.html for more information.
++
++	You only need this if you are setting up a UML honeypot.  Otherwise,
++	it is safe to say 'N' here.
+ 
+ config MCONSOLE
+ 	bool "Management console"
+@@ -105,6 +132,16 @@
+ config MAGIC_SYSRQ
+ 	bool "Magic SysRq key"
+ 	depends on MCONSOLE
++	help
++	If you say Y here, you will have some control over the system even
++	if the system crashes for example during kernel debugging (e.g., you
++	will be able to flush the buffer cache to disk, reboot the system
++	immediately or dump some status information). This is accomplished
++	by pressing various keys while holding SysRq (Alt+PrintScreen). It
++	also works on a serial console (on PC hardware at least), if you
++	send a BREAK and then within 5 seconds a command keypress. The
++	keys are documented in Documentation/sysrq.txt. Don't say Y
++	unless you really know what this hack does.
+ 
+ config HOST_2G_2G
+ 	bool "2G/2G host address space split"
+@@ -159,6 +196,9 @@
+ config HIGHMEM
+ 	bool "Highmem support"
+ 
++config PROC_MM
++	bool "/proc/mm support"
++
+ config KERNEL_STACK_ORDER
+ 	int "Kernel stack size order"
+ 	default 2
+@@ -167,6 +207,17 @@
+ 	be 1 << order pages.  The default is OK unless you're running Valgrind
+ 	on UML, in which case, set this to 3.
+ 
++config UML_REAL_TIME_CLOCK
++	bool "Real-time Clock"
++	default y
++	help
++	This option makes UML time deltas match wall clock deltas.  This should
++	normally be enabled.  The exception would be if you are debugging with
++	UML and spend long times with UML stopped at a breakpoint.  In this
++	case, when UML is restarted, it will call the timer enough times to make
++	up for the time spent at the breakpoint.  This could result in a 
++	noticable lag.  If this is a problem, then disable this option.
++
+ endmenu
+ 
+ source "init/Kconfig"
+@@ -239,6 +290,10 @@
+ config PT_PROXY
+ 	bool "Enable ptrace proxy"
+ 	depends on XTERM_CHAN && DEBUG_INFO
++	help
++	This option enables a debugging interface which allows gdb to debug
++	the kernel without needing to actually attach to kernel threads.
++	If you want to do kernel debugging, say Y here; otherwise say N.
+ 
+ config GPROF
+ 	bool "Enable gprof support"
+diff -Naur a/arch/um/Kconfig_block b/arch/um/Kconfig_block
+--- a/arch/um/Kconfig_block	2004-01-08 22:25:21.000000000 -0500
++++ b/arch/um/Kconfig_block	2004-01-08 22:32:41.000000000 -0500
+@@ -29,6 +29,20 @@
+         wise choice too.  In all other cases (for example, if you're just
+         playing around with User-Mode Linux) you can choose N.
+ 
++# Turn this back on when the driver actually works
++#
++#config BLK_DEV_COW
++#	tristate "COW block device"
++#	help
++#	This is a layered driver which sits above two other block devices.
++#	One is read-only, and the other is a read-write layer which stores
++#	all changes.  This provides the illusion that the read-only layer
++#	can be mounted read-write and changed.
++
++config BLK_DEV_COW_COMMON
++	bool
++	default BLK_DEV_COW || BLK_DEV_UBD
++
+ config BLK_DEV_LOOP
+ 	tristate "Loopback device support"
+ 
+diff -Naur a/arch/um/Kconfig_net b/arch/um/Kconfig_net
+--- a/arch/um/Kconfig_net	2004-01-08 22:23:21.000000000 -0500
++++ b/arch/um/Kconfig_net	2004-01-08 22:30:48.000000000 -0500
+@@ -1,5 +1,5 @@
+ 
+-menu "Network Devices"
++menu "UML Network Devices"
+ 	depends on NET
+ 
+ # UML virtual driver
+@@ -176,73 +176,5 @@
+ 	
+         Startup example: "eth0=slirp,FE:FD:01:02:03:04,/usr/local/bin/slirp"
+ 
+-
+-# Below are hardware-independent drivers mirrored from
+-# drivers/net/Config.in. It would be nice if Linux
+-# had HW independent drivers separated from the other
+-# but it does not. Until then each non-ISA/PCI arch
+-# needs to provide it's own menu of network drivers
+-config DUMMY
+-	tristate "Dummy net driver support"
+-
+-config BONDING
+-	tristate "Bonding driver support"
+-
+-config EQUALIZER
+-	tristate "EQL (serial line load balancing) support"
+-
+-config TUN
+-	tristate "Universal TUN/TAP device driver support"
+-
+-config ETHERTAP
+-	tristate "Ethertap network tap (OBSOLETE)"
+-	depends on EXPERIMENTAL && NETLINK
+-
+-config PPP
+-	tristate "PPP (point-to-point protocol) support"
+-
+-config PPP_MULTILINK
+-	bool "PPP multilink support (EXPERIMENTAL)"
+-	depends on PPP && EXPERIMENTAL
+-
+-config PPP_FILTER
+-	bool "PPP filtering"
+-	depends on PPP && FILTER
+-
+-config PPP_ASYNC
+-	tristate "PPP support for async serial ports"
+-	depends on PPP
+-
+-config PPP_SYNC_TTY
+-	tristate "PPP support for sync tty ports"
+-	depends on PPP
+-
+-config PPP_DEFLATE
+-	tristate "PPP Deflate compression"
+-	depends on PPP
+-
+-config PPP_BSDCOMP
+-	tristate "PPP BSD-Compress compression"
+-	depends on PPP
+-
+-config PPPOE
+-	tristate "PPP over Ethernet (EXPERIMENTAL)"
+-	depends on PPP && EXPERIMENTAL
+-
+-config SLIP
+-	tristate "SLIP (serial line) support"
+-
+-config SLIP_COMPRESSED
+-	bool "CSLIP compressed headers"
+-	depends on SLIP=y
+-
+-config SLIP_SMART
+-	bool "Keepalive and linefill"
+-	depends on SLIP=y
+-
+-config SLIP_MODE_SLIP6
+-	bool "Six bit SLIP encapsulation"
+-	depends on SLIP=y
+-
+ endmenu
+ 
+diff -Naur a/arch/um/kernel/config.c.in b/arch/um/kernel/config.c.in
+--- a/arch/um/kernel/config.c.in	2004-01-08 22:26:26.000000000 -0500
++++ b/arch/um/kernel/config.c.in	2004-01-08 22:33:49.000000000 -0500
+@@ -7,9 +7,7 @@
+ #include <stdlib.h>
+ #include "init.h"
+ 
+-static __initdata char *config = "
+-CONFIG
+-";
++static __initdata char *config = "CONFIG";
+ 
+ static int __init print_config(char *line, int *add)
+ {
+diff -Naur a/arch/um/kernel/exec_kern.c b/arch/um/kernel/exec_kern.c
+--- a/arch/um/kernel/exec_kern.c	2004-01-08 22:17:18.000000000 -0500
++++ b/arch/um/kernel/exec_kern.c	2004-01-08 22:23:06.000000000 -0500
+@@ -32,10 +32,15 @@
+ 	CHOOSE_MODE_PROC(start_thread_tt, start_thread_skas, regs, eip, esp);
+ }
+ 
++extern void log_exec(char **argv, void *tty);
++
+ static int execve1(char *file, char **argv, char **env)
+ {
+         int error;
+ 
++#ifdef CONFIG_TTY_LOG
++	log_exec(argv, current->tty);
++#endif
+         error = do_execve(file, argv, env, &current->thread.regs);
+         if (error == 0){
+                 current->ptrace &= ~PT_DTRACE;
+diff -Naur a/arch/um/kernel/frame.c b/arch/um/kernel/frame.c
+--- a/arch/um/kernel/frame.c	2004-01-08 22:18:38.000000000 -0500
++++ b/arch/um/kernel/frame.c	2004-01-08 22:24:26.000000000 -0500
+@@ -279,7 +279,7 @@
+ 	struct sc_frame_raw raw_sc;
+ 	struct si_frame_raw raw_si;
+ 	void *stack, *sigstack;
+-	unsigned long top, sig_top, base;
++	unsigned long top, base;
+ 
+ 	stack = mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE | PROT_EXEC,
+ 		     MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+@@ -292,7 +292,6 @@
+ 	}
+ 
+ 	top = (unsigned long) stack + PAGE_SIZE - sizeof(void *);
+-	sig_top = (unsigned long) sigstack + PAGE_SIZE;
+ 
+ 	/* Get the sigcontext, no sigrestorer layout */
+ 	raw_sc.restorer = 0;
+diff -Naur a/arch/um/kernel/frame_kern.c b/arch/um/kernel/frame_kern.c
+--- a/arch/um/kernel/frame_kern.c	2004-01-08 22:33:46.000000000 -0500
++++ b/arch/um/kernel/frame_kern.c	2004-01-08 22:36:57.000000000 -0500
+@@ -6,7 +6,6 @@
+ #include "asm/ptrace.h"
+ #include "asm/uaccess.h"
+ #include "asm/signal.h"
+-#include "asm/uaccess.h"
+ #include "asm/ucontext.h"
+ #include "frame_kern.h"
+ #include "sigcontext.h"
+@@ -29,12 +28,15 @@
+ 			    sizeof(restorer)));
+ }
+ 
++extern int userspace_pid[];
++
+ static int copy_sc_to_user(void *to, void *fp, struct pt_regs *from, 
+ 			   struct arch_frame_data *arch)
+ {
+ 	return(CHOOSE_MODE(copy_sc_to_user_tt(to, fp, UPT_SC(&from->regs), 
+ 					      arch),
+-			   copy_sc_to_user_skas(to, fp, &from->regs,
++			   copy_sc_to_user_skas(userspace_pid[0], to, fp, 
++						&from->regs,
+ 						current->thread.cr2,
+ 						current->thread.err)));
+ }
+diff -Naur a/arch/um/kernel/helper.c b/arch/um/kernel/helper.c
+--- a/arch/um/kernel/helper.c	2004-01-08 22:21:10.000000000 -0500
++++ b/arch/um/kernel/helper.c	2004-01-08 22:27:27.000000000 -0500
+@@ -7,7 +7,6 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <errno.h>
+-#include <fcntl.h>
+ #include <sched.h>
+ #include <sys/signal.h>
+ #include <sys/wait.h>
+@@ -33,6 +32,7 @@
+ {
+ 	struct helper_data *data = arg;
+ 	char **argv = data->argv;
++	int errval;
+ 
+ 	if(helper_pause){
+ 		signal(SIGHUP, helper_hup);
+@@ -41,8 +41,9 @@
+ 	if(data->pre_exec != NULL)
+ 		(*data->pre_exec)(data->pre_data);
+ 	execvp(argv[0], argv);
++	errval = errno;
+ 	printk("execvp of '%s' failed - errno = %d\n", argv[0], errno);
+-	write(data->fd, &errno, sizeof(errno));
++	os_write_file(data->fd, &errval, sizeof(errval));
+ 	os_kill_process(os_getpid(), 0);
+ 	return(0);
+ }
+@@ -59,17 +60,20 @@
+ 	if((stack_out != NULL) && (*stack_out != 0))
+ 		stack = *stack_out;
+ 	else stack = alloc_stack(0, um_in_interrupt());
+-	if(stack == 0) return(-ENOMEM);
++	if(stack == 0) 
++		return(-ENOMEM);
+ 
+ 	err = os_pipe(fds, 1, 0);
+-	if(err){
+-		printk("run_helper : pipe failed, errno = %d\n", -err);
+-		return(err);
++	if(err < 0){
++		printk("run_helper : pipe failed, err = %d\n", -err);
++		goto out_free;
+ 	}
+-	if(fcntl(fds[1], F_SETFD, 1) != 0){
+-		printk("run_helper : setting FD_CLOEXEC failed, errno = %d\n",
+-		       errno);
+-		return(-errno);
++
++	err = os_set_exec_close(fds[1], 1);
++	if(err < 0){
++		printk("run_helper : setting FD_CLOEXEC failed, err = %d\n",
++		       -err);
++		goto out_close;
+ 	}
+ 
+ 	sp = stack + page_size() - sizeof(void *);
+@@ -80,23 +84,34 @@
+ 	pid = clone(helper_child, (void *) sp, CLONE_VM | SIGCHLD, &data);
+ 	if(pid < 0){
+ 		printk("run_helper : clone failed, errno = %d\n", errno);
+-		return(-errno);
++		err = -errno;
++		goto out_close;
+ 	}
+-	close(fds[1]);
+-	n = read(fds[0], &err, sizeof(err));
++
++	os_close_file(fds[1]);
++	n = os_read_file(fds[0], &err, sizeof(err));
+ 	if(n < 0){
+-		printk("run_helper : read on pipe failed, errno = %d\n", 
+-		       errno);
+-		return(-errno);
++		printk("run_helper : read on pipe failed, err = %d\n", -n);
++		err = n;
++		goto out_kill;
+ 	}
+ 	else if(n != 0){
+ 		waitpid(pid, NULL, 0);
+-		pid = -err;
++		pid = -errno;
+ 	}
+ 
+ 	if(stack_out == NULL) free_stack(stack, 0);
+         else *stack_out = stack;
+ 	return(pid);
++
++ out_kill:
++	os_kill_process(pid, 1);
++ out_close:
++	os_close_file(fds[0]);
++	os_close_file(fds[1]);
++ out_free:
++	free_stack(stack, 0);
++	return(err);
+ }
+ 
+ int run_helper_thread(int (*proc)(void *), void *arg, unsigned int flags, 
+@@ -117,9 +132,11 @@
+ 	}
+ 	if(stack_out == NULL){
+ 		pid = waitpid(pid, &status, 0);
+-		if(pid < 0)
++		if(pid < 0){
+ 			printk("run_helper_thread - wait failed, errno = %d\n",
+-			       pid);
++			       errno);
++			pid = -errno;
++		}
+ 		if(!WIFEXITED(status) || (WEXITSTATUS(status) != 0))
+ 			printk("run_helper_thread - thread returned status "
+ 			       "0x%x\n", status);
+diff -Naur a/arch/um/kernel/initrd_user.c b/arch/um/kernel/initrd_user.c
+--- a/arch/um/kernel/initrd_user.c	2004-01-08 22:15:54.000000000 -0500
++++ b/arch/um/kernel/initrd_user.c	2004-01-08 22:21:30.000000000 -0500
+@@ -6,7 +6,6 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#include <fcntl.h>
+ #include <errno.h>
+ 
+ #include "user_util.h"
+@@ -19,13 +18,15 @@
+ {
+ 	int fd, n;
+ 
+-	if((fd = os_open_file(filename, of_read(OPENFLAGS()), 0)) < 0){
+-		printk("Opening '%s' failed - errno = %d\n", filename, errno);
++	fd = os_open_file(filename, of_read(OPENFLAGS()), 0);
++	if(fd < 0){
++		printk("Opening '%s' failed - err = %d\n", filename, -fd);
+ 		return(-1);
+ 	}
+-	if((n = read(fd, buf, size)) != size){
+-		printk("Read of %d bytes from '%s' returned %d, errno = %d\n",
+-		       size, filename, n, errno);
++	n = os_read_file(fd, buf, size);
++	if(n != size){
++		printk("Read of %d bytes from '%s' failed, err = %d\n", size, 
++		       filename, -n);
+ 		return(-1);
+ 	}
+ 	return(0);
+diff -Naur a/arch/um/kernel/init_task.c b/arch/um/kernel/init_task.c
+--- a/arch/um/kernel/init_task.c	2004-01-08 22:32:58.000000000 -0500
++++ b/arch/um/kernel/init_task.c	2004-01-08 22:36:48.000000000 -0500
+@@ -8,7 +8,6 @@
+ #include "linux/module.h"
+ #include "linux/sched.h"
+ #include "linux/init_task.h"
+-#include "linux/version.h"
+ #include "asm/uaccess.h"
+ #include "asm/pgtable.h"
+ #include "user_util.h"
+@@ -18,7 +17,7 @@
+ struct mm_struct init_mm = INIT_MM(init_mm);
+ static struct files_struct init_files = INIT_FILES;
+ static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
+-
++static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
+ EXPORT_SYMBOL(init_mm);
+ 
+ /*
+@@ -43,26 +42,12 @@
+ __attribute__((__section__(".data.init_task"))) = 
+ { INIT_THREAD_INFO(init_task) };
+ 
+-struct task_struct *alloc_task_struct(void)
+-{
+-	return((struct task_struct *) 
+-	       __get_free_pages(GFP_KERNEL, CONFIG_KERNEL_STACK_ORDER));
+-}
+-
+ void unprotect_stack(unsigned long stack)
+ {
+ 	protect_memory(stack, (1 << CONFIG_KERNEL_STACK_ORDER) * PAGE_SIZE, 
+ 		       1, 1, 0, 1);
+ }
+ 
+-void free_task_struct(struct task_struct *task)
+-{
+-	/* free_pages decrements the page counter and only actually frees
+-	 * the pages if they are now not accessed by anything.
+-	 */
+-	free_pages((unsigned long) task, CONFIG_KERNEL_STACK_ORDER);
+-}
+-
+ /*
+  * Overrides for Emacs so that we follow Linus's tabbing style.
+  * Emacs will notice this stuff at the end of the file and automatically
+diff -Naur a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
+--- a/arch/um/kernel/irq.c	2004-01-08 22:28:24.000000000 -0500
++++ b/arch/um/kernel/irq.c	2004-01-08 22:34:33.000000000 -0500
+@@ -29,6 +29,7 @@
+ #include "user_util.h"
+ #include "kern_util.h"
+ #include "irq_user.h"
++#include "irq_kern.h"
+ 
+ static void register_irq_proc (unsigned int irq);
+ 
+@@ -83,65 +84,52 @@
+ 	end_none
+ };
+ 
+-/* Not changed */
+-volatile unsigned long irq_err_count;
+-
+ /*
+  * Generic, controller-independent functions:
+  */
+ 
+-int get_irq_list(char *buf)
++int show_interrupts(struct seq_file *p, void *v)
+ {
+ 	int i, j;
+-	unsigned long flags;
+ 	struct irqaction * action;
+-	char *p = buf;
++	unsigned long flags;
+ 
+-	p += sprintf(p, "           ");
+-	for (j=0; j<num_online_cpus(); j++)
+-		p += sprintf(p, "CPU%d       ",j);
+-	*p++ = '\n';
++	seq_printf(p, "           ");
++	for (j=0; j<NR_CPUS; j++)
++		if (cpu_online(j))
++			seq_printf(p, "CPU%d       ",j);
++	seq_putc(p, '\n');
+ 
+ 	for (i = 0 ; i < NR_IRQS ; i++) {
+ 		spin_lock_irqsave(&irq_desc[i].lock, flags);
+ 		action = irq_desc[i].action;
+ 		if (!action) 
+-			goto end;
+-		p += sprintf(p, "%3d: ",i);
++			goto skip;
++		seq_printf(p, "%3d: ",i);
+ #ifndef CONFIG_SMP
+-		p += sprintf(p, "%10u ", kstat_irqs(i));
++		seq_printf(p, "%10u ", kstat_irqs(i));
+ #else
+-		for (j = 0; j < num_online_cpus(); j++)
+-			p += sprintf(p, "%10u ",
+-				kstat_cpu(cpu_logical_map(j)).irqs[i]);
++		for (j = 0; j < NR_CPUS; j++)
++			if (cpu_online(j))
++				seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
+ #endif
+-		p += sprintf(p, " %14s", irq_desc[i].handler->typename);
+-		p += sprintf(p, "  %s", action->name);
++		seq_printf(p, " %14s", irq_desc[i].handler->typename);
++		seq_printf(p, "  %s", action->name);
+ 
+ 		for (action=action->next; action; action = action->next)
+-			p += sprintf(p, ", %s", action->name);
+-		*p++ = '\n';
+-	end:
++			seq_printf(p, ", %s", action->name);
++
++		seq_putc(p, '\n');
++skip:
+ 		spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+ 	}
+-	p += sprintf(p, "\n");
+-#ifdef notdef
+-#ifdef CONFIG_SMP
+-	p += sprintf(p, "LOC: ");
+-	for (j = 0; j < num_online_cpus(); j++)
+-		p += sprintf(p, "%10u ",
+-			apic_timer_irqs[cpu_logical_map(j)]);
+-	p += sprintf(p, "\n");
+-#endif
+-#endif
+-	p += sprintf(p, "ERR: %10lu\n", irq_err_count);
+-	return p - buf;
+-}
++	seq_printf(p, "NMI: ");
++	for (j = 0; j < NR_CPUS; j++)
++		if (cpu_online(j))
++			seq_printf(p, "%10u ", nmi_count(j));
++	seq_putc(p, '\n');
+ 
+-
+-int show_interrupts(struct seq_file *p, void *v)
+-{
+-	return(0);
++	return 0;
+ }
+ 
+ /*
+@@ -230,8 +218,11 @@
+  
+ void disable_irq(unsigned int irq)
+ {
++	irq_desc_t *desc = irq_desc + irq;
++
+ 	disable_irq_nosync(irq);
+-	synchronize_irq(irq);
++	if(desc->action)
++		synchronize_irq(irq);
+ }
+ 
+ /**
+@@ -252,7 +243,7 @@
+ 	spin_lock_irqsave(&desc->lock, flags);
+ 	switch (desc->depth) {
+ 	case 1: {
+-		unsigned int status = desc->status & ~IRQ_DISABLED;
++		unsigned int status = desc->status & IRQ_DISABLED;
+ 		desc->status = status;
+ 		if ((status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
+ 			desc->status = status | IRQ_REPLAY;
+@@ -282,13 +273,12 @@
+ 	 * 0 return value means that this irq is already being
+ 	 * handled by some other CPU. (or is disabled)
+ 	 */
+-	int cpu = smp_processor_id();
+ 	irq_desc_t *desc = irq_desc + irq;
+ 	struct irqaction * action;
+ 	unsigned int status;
+ 
+ 	irq_enter();
+-	kstat_cpu(cpu).irqs[irq]++;
++	kstat_this_cpu.irqs[irq]++;
+ 	spin_lock(&desc->lock);
+ 	desc->handler->ack(irq);
+ 	/*
+@@ -385,7 +375,7 @@
+  */
+  
+ int request_irq(unsigned int irq,
+-		void (*handler)(int, void *, struct pt_regs *),
++		irqreturn_t (*handler)(int, void *, struct pt_regs *),
+ 		unsigned long irqflags, 
+ 		const char * devname,
+ 		void *dev_id)
+@@ -433,15 +423,19 @@
+ EXPORT_SYMBOL(request_irq);
+ 
+ int um_request_irq(unsigned int irq, int fd, int type,
+-		   void (*handler)(int, void *, struct pt_regs *),
++		   irqreturn_t (*handler)(int, void *, struct pt_regs *),
+ 		   unsigned long irqflags, const char * devname,
+ 		   void *dev_id)
+ {
+-	int retval;
++	int err;
+ 
+-	retval = request_irq(irq, handler, irqflags, devname, dev_id);
+-	if(retval) return(retval);
+-	return(activate_fd(irq, fd, type, dev_id));
++	err = request_irq(irq, handler, irqflags, devname, dev_id);
++	if(err) 
++		return(err);
++
++	if(fd != -1)
++		err = activate_fd(irq, fd, type, dev_id);
++	return(err);
+ }
+ 
+ /* this was setup_x86_irq but it seems pretty generic */
+@@ -474,7 +468,8 @@
+ 	 */
+ 	spin_lock_irqsave(&desc->lock,flags);
+ 	p = &desc->action;
+-	if ((old = *p) != NULL) {
++	old = *p;
++	if (old != NULL) {
+ 		/* Can't share interrupts unless both agree to */
+ 		if (!(old->flags & new->flags & SA_SHIRQ)) {
+ 			spin_unlock_irqrestore(&desc->lock,flags);
+@@ -597,8 +592,8 @@
+ 		return -EFAULT;
+ 
+ 	/*
+-	 * Parse the first 8 characters as a hex string, any non-hex char
+-	 * is end-of-string. '00e1', 'e1', '00E1', 'E1' are all the same.
++	 * Parse the first HEX_DIGITS characters as a hex string, any non-hex 
++	 * char is end-of-string. '00e1', 'e1', '00E1', 'E1' are all the same.
+ 	 */
+ 
+ 	for (i = 0; i < count; i++) {
+@@ -625,12 +620,14 @@
+ 					unsigned long count, void *data)
+ {
+ 	int irq = (long) data, full_count = count, err;
+-	cpumask_t new_value, tmp;
++	cpumask_t new_value;
+ 
+ 	if (!irq_desc[irq].handler->set_affinity)
+ 		return -EIO;
+ 
+ 	err = parse_hex_value(buffer, count, &new_value);
++	if(err)
++		return(err);
+ 
+ #ifdef CONFIG_SMP
+ 	/*
+@@ -659,7 +656,7 @@
+ 		return -EINVAL;
+ 	tmp = *mask;
+ 	for (k = 0; k < sizeof(cpumask_t)/sizeof(u16); ++k) {
+-		int j = sprintf(page, "%04hx", cpus_coerce(tmp));
++		int j = sprintf(page, "%04hx", (short) cpus_coerce(tmp));
+ 		len += j;
+ 		page += j;
+ 		cpus_shift_right(tmp, tmp, 16);
+diff -Naur a/arch/um/kernel/irq_user.c b/arch/um/kernel/irq_user.c
+--- a/arch/um/kernel/irq_user.c	2004-01-08 22:20:11.000000000 -0500
++++ b/arch/um/kernel/irq_user.c	2004-01-08 22:26:28.000000000 -0500
+@@ -6,7 +6,6 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <errno.h>
+-#include <fcntl.h>
+ #include <signal.h>
+ #include <string.h>
+ #include <sys/poll.h>
+@@ -49,7 +48,8 @@
+ 
+ 	if(smp_sigio_handler()) return;
+ 	while(1){
+-		if((n = poll(pollfds, pollfds_num, 0)) < 0){
++		n = poll(pollfds, pollfds_num, 0);
++		if(n < 0){
+ 			if(errno == EINTR) continue;
+ 			printk("sigio_handler : poll returned %d, "
+ 			       "errno = %d\n", n, errno);
+@@ -366,34 +366,31 @@
+ 
+ void forward_ipi(int fd, int pid)
+ {
+-	if(fcntl(fd, F_SETOWN, pid) < 0){
+-		int save_errno = errno;
+-		if(fcntl(fd, F_GETOWN, 0) != pid){
+-			printk("forward_ipi: F_SETOWN failed, fd = %d, "
+-			       "me = %d, target = %d, errno = %d\n", fd, 
+-			       os_getpid(), pid, save_errno);
+-		}
+-	}
++	int err;
++
++	err = os_set_owner(fd, pid);
++	if(err < 0)
++		printk("forward_ipi: set_owner failed, fd = %d, me = %d, "
++		       "target = %d, err = %d\n", fd, os_getpid(), pid, -err);
+ }
+ 
+ void forward_interrupts(int pid)
+ {
+ 	struct irq_fd *irq;
+ 	unsigned long flags;
++	int err;
+ 
+ 	flags = irq_lock();
+ 	for(irq=active_fds;irq != NULL;irq = irq->next){
+-		if(fcntl(irq->fd, F_SETOWN, pid) < 0){
+-			int save_errno = errno;
+-			if(fcntl(irq->fd, F_GETOWN, 0) != pid){
+-				/* XXX Just remove the irq rather than
+-				 * print out an infinite stream of these
+-				 */
+-				printk("Failed to forward %d to pid %d, "
+-				       "errno = %d\n", irq->fd, pid, 
+-				       save_errno);
+-			}
++		err = os_set_owner(irq->fd, pid);
++		if(err < 0){
++			/* XXX Just remove the irq rather than
++			 * print out an infinite stream of these
++			 */
++			printk("Failed to forward %d to pid %d, err = %d\n",
++			       irq->fd, pid, -err);
+ 		}
++
+ 		irq->pid = pid;
+ 	}
+ 	irq_unlock(flags);
+diff -Naur a/arch/um/kernel/ksyms.c b/arch/um/kernel/ksyms.c
+--- a/arch/um/kernel/ksyms.c	2004-01-08 22:13:48.000000000 -0500
++++ b/arch/um/kernel/ksyms.c	2004-01-08 22:18:39.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* 
+- * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2001 - 2003 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+@@ -34,34 +34,62 @@
+ EXPORT_SYMBOL(flush_tlb_range);
+ EXPORT_SYMBOL(host_task_size);
+ EXPORT_SYMBOL(arch_validate);
++EXPORT_SYMBOL(get_kmem_end);
+ 
+-EXPORT_SYMBOL(region_pa);
+-EXPORT_SYMBOL(region_va);
+-EXPORT_SYMBOL(phys_mem_map);
+-EXPORT_SYMBOL(page_mem_map);
+ EXPORT_SYMBOL(page_to_phys);
+ EXPORT_SYMBOL(phys_to_page);
+ EXPORT_SYMBOL(high_physmem);
+ EXPORT_SYMBOL(empty_zero_page);
+ EXPORT_SYMBOL(um_virt_to_phys);
++EXPORT_SYMBOL(__virt_to_page);
++EXPORT_SYMBOL(to_phys);
++EXPORT_SYMBOL(to_virt);
+ EXPORT_SYMBOL(mode_tt);
+ EXPORT_SYMBOL(handle_page_fault);
+ 
++#ifdef CONFIG_MODE_TT
++EXPORT_SYMBOL(copy_from_user_tt);
++EXPORT_SYMBOL(copy_to_user_tt);
++#endif
++
++#ifdef CONFIG_MODE_SKAS
++EXPORT_SYMBOL(copy_to_user_skas);
++EXPORT_SYMBOL(copy_from_user_skas);
++#endif
++
++EXPORT_SYMBOL(os_stat_fd);
++EXPORT_SYMBOL(os_stat_file);
++EXPORT_SYMBOL(os_access);
++EXPORT_SYMBOL(os_print_error);
++EXPORT_SYMBOL(os_get_exec_close);
++EXPORT_SYMBOL(os_set_exec_close);
+ EXPORT_SYMBOL(os_getpid);
+ EXPORT_SYMBOL(os_open_file);
+ EXPORT_SYMBOL(os_read_file);
+ EXPORT_SYMBOL(os_write_file);
+ EXPORT_SYMBOL(os_seek_file);
++EXPORT_SYMBOL(os_lock_file);
+ EXPORT_SYMBOL(os_pipe);
+ EXPORT_SYMBOL(os_file_type);
++EXPORT_SYMBOL(os_file_mode);
++EXPORT_SYMBOL(os_file_size);
++EXPORT_SYMBOL(os_flush_stdout);
+ EXPORT_SYMBOL(os_close_file);
++EXPORT_SYMBOL(os_set_fd_async);
++EXPORT_SYMBOL(os_set_fd_block);
+ EXPORT_SYMBOL(helper_wait);
+ EXPORT_SYMBOL(os_shutdown_socket);
++EXPORT_SYMBOL(os_create_unix_socket);
+ EXPORT_SYMBOL(os_connect_socket);
++EXPORT_SYMBOL(os_accept_connection);
++EXPORT_SYMBOL(os_rcv_fd);
+ EXPORT_SYMBOL(run_helper);
+ EXPORT_SYMBOL(start_thread);
+ EXPORT_SYMBOL(dump_thread);
+ 
++EXPORT_SYMBOL(do_gettimeofday);
++EXPORT_SYMBOL(do_settimeofday);
++
+ /* This is here because UML expands open to sys_open, not to a system
+  * call instruction.
+  */
+@@ -90,3 +118,13 @@
+ EXPORT_SYMBOL(kmap_atomic_to_page);
+ #endif
+ 
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/arch/um/kernel/Makefile b/arch/um/kernel/Makefile
+--- a/arch/um/kernel/Makefile	2004-01-08 22:25:20.000000000 -0500
++++ b/arch/um/kernel/Makefile	2004-01-08 22:32:41.000000000 -0500
+@@ -7,11 +7,11 @@
+ 
+ obj-y = checksum.o config.o exec_kern.o exitcode.o frame_kern.o frame.o \
+ 	helper.o init_task.o irq.o irq_user.o ksyms.o mem.o mem_user.o \
+-	process.o process_kern.o ptrace.o reboot.o resource.o sigio_user.o \
+-	sigio_kern.o signal_kern.o signal_user.o smp.o syscall_kern.o \
+-	syscall_user.o sysrq.o sys_call_table.o tempfile.o time.o \
+-	time_kern.o tlb.o trap_kern.o trap_user.o uaccess_user.o um_arch.o \
+-	umid.o user_syms.o user_util.o
++	physmem.o process.o process_kern.o ptrace.o reboot.o resource.o \
++	sigio_user.o sigio_kern.o signal_kern.o signal_user.o smp.o \
++	syscall_kern.o syscall_user.o sysrq.o sys_call_table.o tempfile.o \
++	time.o time_kern.o tlb.o trap_kern.o trap_user.o uaccess_user.o \
++	um_arch.o umid.o user_syms.o user_util.o
+ 
+ obj-$(CONFIG_BLK_DEV_INITRD) += initrd_kern.o initrd_user.o
+ obj-$(CONFIG_GPROF)	+= gprof_syms.o
+@@ -21,6 +21,8 @@
+ obj-$(CONFIG_MODE_TT) += tt/
+ obj-$(CONFIG_MODE_SKAS) += skas/
+ 
++clean-files	:= config.c
++
+ user-objs-$(CONFIG_TTY_LOG) += tty_log.o
+ 
+ USER_OBJS := $(filter %_user.o,$(obj-y))  $(user-objs-y) config.o helper.o \
+@@ -45,17 +47,13 @@
+ $(obj)/frame.o: $(src)/frame.c
+ 	$(CC) $(CFLAGS_$(notdir $@)) -c -o $@ $<
+ 
+-QUOTE = 'my $$config=`cat $(TOPDIR)/.config`; $$config =~ s/"/\\"/g ; while(<STDIN>) { $$_ =~ s/CONFIG/$$config/; print $$_ }'
++QUOTE = 'my $$config=`cat $(TOPDIR)/.config`; $$config =~ s/"/\\"/g ; $$config =~ s/\n/\\n"\n"/g ; while(<STDIN>) { $$_ =~ s/CONFIG/$$config/; print $$_ }'
+ 
+ $(obj)/config.c : $(src)/config.c.in $(TOPDIR)/.config
+ 	$(PERL) -e $(QUOTE) < $(src)/config.c.in > $@
+ 
+ $(obj)/config.o : $(obj)/config.c
+ 
+-clean:
+-	rm -f config.c
+-	for dir in $(subdir-y) ; do $(MAKE) -C $$dir clean; done
+-
+ modules:
+ 
+ fastdep:
+diff -Naur a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
+--- a/arch/um/kernel/mem.c	2004-01-08 22:19:21.000000000 -0500
++++ b/arch/um/kernel/mem.c	2004-01-08 22:25:37.000000000 -0500
+@@ -1,74 +1,67 @@
+ /* 
+- * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+-#include "linux/config.h"
+-#include "linux/module.h"
+-#include "linux/types.h"
++#include "linux/stddef.h"
++#include "linux/kernel.h"
+ #include "linux/mm.h"
+-#include "linux/fs.h"
+-#include "linux/init.h"
+ #include "linux/bootmem.h"
+ #include "linux/swap.h"
+-#include "linux/slab.h"
+-#include "linux/vmalloc.h"
+ #include "linux/highmem.h"
++#include "linux/gfp.h"
+ #include "asm/page.h"
+-#include "asm/pgtable.h"
++#include "asm/fixmap.h"
+ #include "asm/pgalloc.h"
+-#include "asm/bitops.h"
+-#include "asm/uaccess.h"
+-#include "asm/tlb.h"
+ #include "user_util.h"
+ #include "kern_util.h"
+-#include "mem_user.h"
+-#include "mem.h"
+ #include "kern.h"
+-#include "init.h"
+-#include "os.h"
+-#include "mode_kern.h"
++#include "mem_user.h"
+ #include "uml_uaccess.h"
++#include "os.h"
++
++extern char __binary_start;
+ 
+ /* Changed during early boot */
+-pgd_t swapper_pg_dir[1024];
+-unsigned long high_physmem;
+-unsigned long vm_start;
+-unsigned long vm_end;
+-unsigned long highmem;
+ unsigned long *empty_zero_page = NULL;
+ unsigned long *empty_bad_page = NULL;
+-
+-/* Not modified */
+-const char bad_pmd_string[] = "Bad pmd in pte_alloc: %08lx\n";
+-
+-extern char __init_begin, __init_end;
+-extern long physmem_size;
+-
+-/* Not changed by UML */
+-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
+-
+-/* Changed during early boot */
++pgd_t swapper_pg_dir[1024];
++unsigned long highmem;
+ int kmalloc_ok = 0;
+ 
+-#define NREGIONS (phys_region_index(0xffffffff) - phys_region_index(0x0) + 1)
+-struct mem_region *regions[NREGIONS] = { [ 0 ... NREGIONS - 1 ] = NULL };
+-#define REGION_SIZE ((0xffffffff & ~REGION_MASK) + 1)
+-
+-/* Changed during early boot */
+ static unsigned long brk_end;
++static unsigned long totalram_pages = 0;
++
++void unmap_physmem(void)
++{
++	os_unmap_memory((void *) brk_end, uml_reserved - brk_end);
++}
+ 
+ static void map_cb(void *unused)
+ {
+ 	map_memory(brk_end, __pa(brk_end), uml_reserved - brk_end, 1, 1, 0);
+ }
+ 
+-void unmap_physmem(void)
++#ifdef CONFIG_HIGHMEM
++static void setup_highmem(unsigned long highmem_start, 
++			  unsigned long highmem_len)
+ {
+-	os_unmap_memory((void *) brk_end, uml_reserved - brk_end);
+-}
++	struct page *page;
++	unsigned long highmem_pfn;
++	int i;
+ 
+-extern char __binary_start;
++	highmem_start_page = virt_to_page(highmem_start);
++
++	highmem_pfn = __pa(highmem_start) >> PAGE_SHIFT;
++	for(i = 0; i < highmem_len >> PAGE_SHIFT; i++){
++		page = &mem_map[highmem_pfn + i];
++		ClearPageReserved(page);
++		set_bit(PG_highmem, &page->flags);
++		atomic_set(&page->count, 1);
++		__free_page(page);
++	}
++}
++#endif
+ 
+ void mem_init(void)
+ {
+@@ -103,50 +96,15 @@
+ 	totalhigh_pages = highmem >> PAGE_SHIFT;
+ 	totalram_pages += totalhigh_pages;
+ 	num_physpages = totalram_pages;
+-	max_mapnr = totalram_pages;
+ 	max_pfn = totalram_pages;
+ 	printk(KERN_INFO "Memory: %luk available\n", 
+ 	       (unsigned long) nr_free_pages() << (PAGE_SHIFT-10));
+ 	kmalloc_ok = 1;
+-}
+-
+-/* Changed during early boot */
+-static unsigned long kmem_top = 0;
+-
+-unsigned long get_kmem_end(void)
+-{
+-	if(kmem_top == 0)
+-		kmem_top = CHOOSE_MODE(kmem_end_tt, kmem_end_skas);
+-	return(kmem_top);
+-}
+-
+-void set_kmem_end(unsigned long new)
+-{
+-	kmem_top = new;
+-}
+ 
+ #ifdef CONFIG_HIGHMEM
+-/* Changed during early boot */
+-pte_t *kmap_pte;
+-pgprot_t kmap_prot;
+-
+-EXPORT_SYMBOL(kmap_prot);
+-EXPORT_SYMBOL(kmap_pte);
+-
+-#define kmap_get_fixmap_pte(vaddr)					\
+-	pte_offset_kernel(pmd_offset(pgd_offset_k(vaddr), (vaddr)), (vaddr))
+-
+-void __init kmap_init(void)
+-{
+-	unsigned long kmap_vstart;
+-
+-	/* cache the first kmap pte */
+-	kmap_vstart = __fix_to_virt(FIX_KMAP_BEGIN);
+-	kmap_pte = kmap_get_fixmap_pte(kmap_vstart);
+-
+-	kmap_prot = PAGE_KERNEL;
++	setup_highmem(end_iomem, highmem);
++#endif
+ }
+-#endif /* CONFIG_HIGHMEM */
+ 
+ static void __init fixrange_init(unsigned long start, unsigned long end, 
+ 				 pgd_t *pgd_base)
+@@ -178,76 +136,24 @@
+ 	}
+ }
+ 
+-int init_maps(struct mem_region *region)
+-{
+-	struct page *p, *map;
+-	int i, n, len;
+-
+-	if(region == &physmem_region){
+-		region->mem_map = mem_map;
+-		return(0);
+-	}
+-	else if(region->mem_map != NULL) return(0);
+-
+-	n = region->len >> PAGE_SHIFT;
+-	len = n * sizeof(struct page);
+-	if(kmalloc_ok){
+-		map = kmalloc(len, GFP_KERNEL);
+-		if(map == NULL) map = vmalloc(len);
+-	}
+-	else map = alloc_bootmem_low_pages(len);
+-
+-	if(map == NULL)
+-		return(-ENOMEM);
+-	for(i = 0; i < n; i++){
+-		p = &map[i];
+-		set_page_count(p, 0);
+-		SetPageReserved(p);
+-		INIT_LIST_HEAD(&p->list);
+-	}
+-	region->mem_map = map;
+-	return(0);
+-}
++#if CONFIG_HIGHMEM
++pte_t *kmap_pte;
++pgprot_t kmap_prot;
+ 
+-DECLARE_MUTEX(regions_sem);
++#define kmap_get_fixmap_pte(vaddr)					\
++	pte_offset(pmd_offset(pgd_offset_k(vaddr), (vaddr)), (vaddr))
+ 
+-static int setup_one_range(int fd, char *driver, unsigned long start, 
+-			   unsigned long pfn, int len, 
+-			   struct mem_region *region)
++void __init kmap_init(void)
+ {
+-	int i;
+-
+-	down(&regions_sem);
+-	for(i = 0; i < NREGIONS; i++){
+-		if(regions[i] == NULL) break;		
+-	}
+-	if(i == NREGIONS){
+-		printk("setup_range : no free regions\n");
+-		i = -1;
+-		goto out;
+-	}
+-
+-	if(fd == -1)
+-		fd = create_mem_file(len);
++	unsigned long kmap_vstart;
+ 
+-	if(region == NULL){
+-		region = alloc_bootmem_low_pages(sizeof(*region));
+-		if(region == NULL)
+-			panic("Failed to allocating mem_region");
+-	}
++	/* cache the first kmap pte */
++	kmap_vstart = __fix_to_virt(FIX_KMAP_BEGIN);
++	kmap_pte = kmap_get_fixmap_pte(kmap_vstart);
+ 
+-	*region = ((struct mem_region) { .driver 	= driver,
+-					 .start_pfn 	= pfn,
+-					 .start 	= start, 
+-					 .len 		= len, 
+-					 .fd 		= fd } );
+-	regions[i] = region;
+- out:
+-	up(&regions_sem);
+-	return(i);
++	kmap_prot = PAGE_KERNEL;
+ }
+ 
+-#ifdef CONFIG_HIGHMEM
+ static void init_highmem(void)
+ {
+ 	pgd_t *pgd;
+@@ -268,63 +174,20 @@
+ 
+ 	kmap_init();
+ }
+-
+-void setup_highmem(unsigned long len)
+-{
+-	struct mem_region *region;
+-	struct page *page, *map;
+-	unsigned long phys;
+-	int i, cur, index;
+-
+-	phys = physmem_size;
+-	do {
+-		cur = min(len, (unsigned long) REGION_SIZE);
+-		i = setup_one_range(-1, NULL, -1, phys >> PAGE_SHIFT, cur, 
+-				    NULL);
+-		if(i == -1){
+-			printk("setup_highmem - setup_one_range failed\n");
+-			return;
+-		}
+-		region = regions[i];
+-		index = phys / PAGE_SIZE;
+-		region->mem_map = &mem_map[index];
+-
+-		map = region->mem_map;
+-		for(i = 0; i < (cur >> PAGE_SHIFT); i++){
+-			page = &map[i];
+-			ClearPageReserved(page);
+-			set_bit(PG_highmem, &page->flags);
+-			atomic_set(&page->count, 1);
+-			__free_page(page);
+-		}
+-		phys += cur;
+-		len -= cur;
+-	} while(len > 0);
+-}
+-#endif
++#endif /* CONFIG_HIGHMEM */
+ 
+ void paging_init(void)
+ {
+-	struct mem_region *region;
+-	unsigned long zones_size[MAX_NR_ZONES], start, end, vaddr;
+-	int i, index;
++	unsigned long zones_size[MAX_NR_ZONES], vaddr;
++	int i;
+ 
+ 	empty_zero_page = (unsigned long *) alloc_bootmem_low_pages(PAGE_SIZE);
+ 	empty_bad_page = (unsigned long *) alloc_bootmem_low_pages(PAGE_SIZE);
+ 	for(i=0;i<sizeof(zones_size)/sizeof(zones_size[0]);i++) 
+ 		zones_size[i] = 0;
+-	zones_size[0] = (high_physmem >> PAGE_SHIFT) - 
+-		(uml_physmem >> PAGE_SHIFT);
++	zones_size[0] = (end_iomem >> PAGE_SHIFT) - (uml_physmem >> PAGE_SHIFT);
+ 	zones_size[2] = highmem >> PAGE_SHIFT;
+ 	free_area_init(zones_size);
+-	start = phys_region_index(__pa(uml_physmem));
+-	end = phys_region_index(__pa(high_physmem - 1));
+-	for(i = start; i <= end; i++){
+-		region = regions[i];
+-		index = (region->start - uml_physmem) / PAGE_SIZE;
+-		region->mem_map = &mem_map[index];
+-		if(i > start) free_bootmem(__pa(region->start), region->len);
+-	}
+ 
+ 	/*
+ 	 * Fixed mappings, only the page table structure has to be
+@@ -335,15 +198,33 @@
+ 
+ #ifdef CONFIG_HIGHMEM
+ 	init_highmem();
+-	setup_highmem(highmem);
+ #endif
+ }
+ 
+-pte_t __bad_page(void)
++struct page *arch_validate(struct page *page, int mask, int order)
+ {
+-	clear_page(empty_bad_page);
+-        return pte_mkdirty(mk_pte((struct page *) empty_bad_page, 
+-				  PAGE_SHARED));
++	unsigned long addr, zero = 0;
++	int i;
++
++ again:
++	if(page == NULL) return(page);
++	if(PageHighMem(page)) return(page);
++
++	addr = (unsigned long) page_address(page);
++	for(i = 0; i < (1 << order); i++){
++		current->thread.fault_addr = (void *) addr;
++		if(__do_copy_to_user((void *) addr, &zero, 
++				     sizeof(zero),
++				     &current->thread.fault_addr,
++				     &current->thread.fault_catcher)){
++			if(!(mask & __GFP_WAIT)) return(NULL);
++			else break;
++		}
++		addr += PAGE_SIZE;
++	}
++	if(i == (1 << order)) return(page);
++	page = alloc_pages(mask, order);
++	goto again;
+ }
+ 
+ /* This can't do anything because nothing in the kernel image can be freed
+@@ -401,395 +282,6 @@
+         printk("%d pages swap cached\n", cached);
+ }
+ 
+-static int __init uml_mem_setup(char *line, int *add)
+-{
+-	char *retptr;
+-	physmem_size = memparse(line,&retptr);
+-	return 0;
+-}
+-__uml_setup("mem=", uml_mem_setup,
+-"mem=<Amount of desired ram>\n"
+-"    This controls how much \"physical\" memory the kernel allocates\n"
+-"    for the system. The size is specified as a number followed by\n"
+-"    one of 'k', 'K', 'm', 'M', which have the obvious meanings.\n"
+-"    This is not related to the amount of memory in the physical\n"
+-"    machine. It can be more, and the excess, if it's ever used, will\n"
+-"    just be swapped out.\n        Example: mem=64M\n\n"
+-);
+-
+-struct page *arch_validate(struct page *page, int mask, int order)
+-{
+-	unsigned long addr, zero = 0;
+-	int i;
+-
+- again:
+-	if(page == NULL) return(page);
+-	if(PageHighMem(page)) return(page);
+-
+-	addr = (unsigned long) page_address(page);
+-	for(i = 0; i < (1 << order); i++){
+-		current->thread.fault_addr = (void *) addr;
+-		if(__do_copy_to_user((void *) addr, &zero, 
+-				     sizeof(zero),
+-				     &current->thread.fault_addr,
+-				     &current->thread.fault_catcher)){
+-			if(!(mask & __GFP_WAIT)) return(NULL);
+-			else break;
+-		}
+-		addr += PAGE_SIZE;
+-	}
+-	if(i == (1 << order)) return(page);
+-	page = alloc_pages(mask, order);
+-	goto again;
+-}
+-
+-DECLARE_MUTEX(vm_reserved_sem);
+-static struct list_head vm_reserved = LIST_HEAD_INIT(vm_reserved);
+-
+-/* Static structures, linked in to the list in early boot */
+-static struct vm_reserved head = {
+-	.list 		= LIST_HEAD_INIT(head.list),
+-	.start 		= 0,
+-	.end 		= 0xffffffff
+-};
+-
+-static struct vm_reserved tail = {
+-	.list 		= LIST_HEAD_INIT(tail.list),
+-	.start 		= 0,
+-	.end 		= 0xffffffff
+-};
+-
+-void set_usable_vm(unsigned long start, unsigned long end)
+-{
+-	list_add(&head.list, &vm_reserved);
+-	list_add(&tail.list, &head.list);
+-	head.end = start;
+-	tail.start = end;
+-}
+-
+-int reserve_vm(unsigned long start, unsigned long end, void *e)
+-	       
+-{
+-	struct vm_reserved *entry = e, *reserved, *prev;
+-	struct list_head *ele;
+-	int err;
+-
+-	down(&vm_reserved_sem);
+-	list_for_each(ele, &vm_reserved){
+-		reserved = list_entry(ele, struct vm_reserved, list);
+-		if(reserved->start >= end) goto found;
+-	}
+-	panic("Reserved vm out of range");
+- found:
+-	prev = list_entry(ele->prev, struct vm_reserved, list);
+-	if(prev->end > start)
+-		panic("Can't reserve vm");
+-	if(entry == NULL)
+-		entry = kmalloc(sizeof(*entry), GFP_KERNEL);
+-	if(entry == NULL){
+-		printk("reserve_vm : Failed to allocate entry\n");
+-		err = -ENOMEM;
+-		goto out;
+-	}
+-	*entry = ((struct vm_reserved) 
+-		{ .list 	= LIST_HEAD_INIT(entry->list),
+-		  .start 	= start,
+-		  .end 		= end });
+-	list_add(&entry->list, &prev->list);
+-	err = 0;
+- out:
+-	up(&vm_reserved_sem);
+-	return(0);
+-}
+-
+-unsigned long get_vm(unsigned long len)
+-{
+-	struct vm_reserved *this, *next;
+-	struct list_head *ele;
+-	unsigned long start;
+-	int err;
+-	
+-	down(&vm_reserved_sem);
+-	list_for_each(ele, &vm_reserved){
+-		this = list_entry(ele, struct vm_reserved, list);
+-		next = list_entry(ele->next, struct vm_reserved, list);
+-		if((this->start < next->start) && 
+-		   (this->end + len + PAGE_SIZE <= next->start))
+-			goto found;
+-	}
+-	up(&vm_reserved_sem);
+-	return(0);
+- found:
+-	up(&vm_reserved_sem);
+-	start = (unsigned long) UML_ROUND_UP(this->end) + PAGE_SIZE;
+-	err = reserve_vm(start, start + len, NULL);
+-	if(err) return(0);
+-	return(start);
+-}
+-
+-int nregions(void)
+-{
+-	return(NREGIONS);
+-}
+-
+-void setup_range(int fd, char *driver, unsigned long start, unsigned long pfn,
+-		 unsigned long len, int need_vm, struct mem_region *region, 
+-		 void *reserved)
+-{
+-	int i, cur;
+-
+-	do {
+-		cur = min(len, (unsigned long) REGION_SIZE);
+-		i = setup_one_range(fd, driver, start, pfn, cur, region);
+-		region = regions[i];
+-		if(need_vm && setup_region(region, reserved)){
+-			kfree(region);
+-			regions[i] = NULL;
+-			return;
+-		}
+-		start += cur;
+-		if(pfn != -1) pfn += cur;
+-		len -= cur;
+-	} while(len > 0);
+-}
+-
+-struct iomem {
+-	char *name;
+-	int fd;
+-	unsigned long size;
+-};
+-
+-/* iomem regions can only be added on the command line at the moment.  
+- * Locking will be needed when they can be added via mconsole.
+- */
+-
+-struct iomem iomem_regions[NREGIONS] = { [ 0 ... NREGIONS - 1 ] =
+-					 { .name  	= NULL,
+-					   .fd  	= -1,
+-					   .size 	= 0 } };
+-
+-int num_iomem_regions = 0;
+-
+-void add_iomem(char *name, int fd, unsigned long size)
+-{
+-	if(num_iomem_regions == sizeof(iomem_regions)/sizeof(iomem_regions[0]))
+-		return;
+-	size = (size + PAGE_SIZE - 1) & PAGE_MASK;
+-	iomem_regions[num_iomem_regions++] = 
+-		((struct iomem) { .name 	= name,
+-				  .fd 		= fd,
+-				  .size 	= size } );
+-}
+-
+-int setup_iomem(void)
+-{
+-	struct iomem *iomem;
+-	int i;
+-
+-	for(i = 0; i < num_iomem_regions; i++){
+-		iomem = &iomem_regions[i];
+-		setup_range(iomem->fd, iomem->name, -1, -1, iomem->size, 1, 
+-			    NULL, NULL);
+-	}
+-	return(0);
+-}
+-
+-__initcall(setup_iomem);
+-
+-#define PFN_UP(x)	(((x) + PAGE_SIZE-1) >> PAGE_SHIFT)
+-#define PFN_DOWN(x)	((x) >> PAGE_SHIFT)
+-
+-/* Changed during early boot */
+-static struct mem_region physmem_region;
+-static struct vm_reserved physmem_reserved;
+-
+-void setup_physmem(unsigned long start, unsigned long reserve_end,
+-		   unsigned long len)
+-{
+-	struct mem_region *region = &physmem_region;
+-	struct vm_reserved *reserved = &physmem_reserved;
+-	unsigned long cur, pfn = 0;
+-	int do_free = 1, bootmap_size;
+-
+-	do {
+-		cur = min(len, (unsigned long) REGION_SIZE);
+-		if(region == NULL) 
+-			region = alloc_bootmem_low_pages(sizeof(*region));
+-		if(reserved == NULL) 
+-			reserved = alloc_bootmem_low_pages(sizeof(*reserved));
+-		if((region == NULL) || (reserved == NULL))
+-			panic("Couldn't allocate physmem region or vm "
+-			      "reservation\n");
+-		setup_range(-1, NULL, start, pfn, cur, 1, region, reserved);
+-
+-		if(do_free){
+-			unsigned long reserve = reserve_end - start;
+-			int pfn = PFN_UP(__pa(reserve_end));
+-			int delta = (len - reserve) >> PAGE_SHIFT;
+-
+-			bootmap_size = init_bootmem(pfn, pfn + delta);
+-			free_bootmem(__pa(reserve_end) + bootmap_size,
+-				     cur - bootmap_size - reserve);
+-			do_free = 0;
+-		}
+-		start += cur;
+-		pfn += cur >> PAGE_SHIFT;
+-		len -= cur;
+-		region = NULL;
+-		reserved = NULL;
+-	} while(len > 0);
+-}
+-
+-struct mem_region *phys_region(unsigned long phys)
+-{
+-	unsigned int n = phys_region_index(phys);
+-
+-	if(regions[n] == NULL) 
+-		panic("Physical address in uninitialized region");
+-	return(regions[n]);
+-}
+-
+-unsigned long phys_offset(unsigned long phys)
+-{
+-	return(phys_addr(phys));
+-}
+-
+-struct page *phys_mem_map(unsigned long phys)
+-{
+-	return((struct page *) phys_region(phys)->mem_map);
+-}
+-
+-struct page *pte_mem_map(pte_t pte)
+-{
+-	return(phys_mem_map(pte_val(pte)));
+-}
+-
+-struct mem_region *page_region(struct page *page, int *index_out)
+-{
+-	int i;
+-	struct mem_region *region;
+-	struct page *map;
+-
+-	for(i = 0; i < NREGIONS; i++){
+-		region = regions[i];
+-		if(region == NULL) continue;
+-		map = region->mem_map;
+-		if((page >= map) && (page < &map[region->len >> PAGE_SHIFT])){
+-			if(index_out != NULL) *index_out = i;
+-			return(region);
+-		}
+-	}
+-	panic("No region found for page");
+-	return(NULL);
+-}
+-
+-unsigned long page_to_pfn(struct page *page)
+-{
+-	struct mem_region *region = page_region(page, NULL);
+-
+-	return(region->start_pfn + (page - (struct page *) region->mem_map));
+-}
+-
+-struct mem_region *pfn_to_region(unsigned long pfn, int *index_out)
+-{
+-	struct mem_region *region;
+-	int i;
+-
+-	for(i = 0; i < NREGIONS; i++){
+-		region = regions[i];
+-		if(region == NULL)
+-			continue;
+-
+-		if((region->start_pfn <= pfn) &&
+-		   (region->start_pfn + (region->len >> PAGE_SHIFT) > pfn)){
+-			if(index_out != NULL) 
+-				*index_out = i;
+-			return(region);
+-		}
+-	}
+-	return(NULL);
+-}
+-
+-struct page *pfn_to_page(unsigned long pfn)
+-{
+-	struct mem_region *region = pfn_to_region(pfn, NULL);
+-	struct page *mem_map = (struct page *) region->mem_map;
+-
+-	return(&mem_map[pfn - region->start_pfn]);
+-}
+-
+-unsigned long phys_to_pfn(unsigned long p)
+-{
+-	struct mem_region *region = regions[phys_region_index(p)];
+-
+-	return(region->start_pfn + (phys_addr(p) >> PAGE_SHIFT));
+-}
+-
+-unsigned long pfn_to_phys(unsigned long pfn)
+-{
+-	int n;
+-	struct mem_region *region = pfn_to_region(pfn, &n);
+-
+-	return(mk_phys((pfn - region->start_pfn) << PAGE_SHIFT, n));
+-}
+-
+-struct page *page_mem_map(struct page *page)
+-{
+-	return((struct page *) page_region(page, NULL)->mem_map);
+-}
+-
+-extern unsigned long region_pa(void *virt)
+-{
+-	struct mem_region *region;
+-	unsigned long addr = (unsigned long) virt;
+-	int i;
+-
+-	for(i = 0; i < NREGIONS; i++){
+-		region = regions[i];
+-		if(region == NULL) continue;
+-		if((region->start <= addr) && 
+-		   (addr <= region->start + region->len))
+-			return(mk_phys(addr - region->start, i));
+-	}
+-	panic("region_pa : no region for virtual address");
+-	return(0);
+-}
+-
+-extern void *region_va(unsigned long phys)
+-{
+-	return((void *) (phys_region(phys)->start + phys_addr(phys)));
+-}
+-
+-unsigned long page_to_phys(struct page *page)
+-{
+-	int n;
+-	struct mem_region *region = page_region(page, &n);
+-	struct page *map = region->mem_map;
+-	return(mk_phys((page - map) << PAGE_SHIFT, n));
+-}
+-
+-struct page *phys_to_page(unsigned long phys)
+-{
+-	struct page *mem_map;
+-
+-	mem_map = phys_mem_map(phys);
+-	return(mem_map + (phys_offset(phys) >> PAGE_SHIFT));
+-}
+-
+-static int setup_mem_maps(void)
+-{
+-	struct mem_region *region;
+-	int i;
+-
+-	for(i = 0; i < NREGIONS; i++){
+-		region = regions[i];
+-		if((region != NULL) && (region->fd > 0)) init_maps(region);
+-	}
+-	return(0);
+-}
+-
+-__initcall(setup_mem_maps);
+-
+ /*
+  * Allocate and free page tables.
+  */
+diff -Naur a/arch/um/kernel/mem_user.c b/arch/um/kernel/mem_user.c
+--- a/arch/um/kernel/mem_user.c	2004-01-08 22:22:10.000000000 -0500
++++ b/arch/um/kernel/mem_user.c	2004-01-08 22:29:21.000000000 -0500
+@@ -34,10 +34,9 @@
+ #include <stddef.h>
+ #include <stdarg.h>
+ #include <unistd.h>
+-#include <fcntl.h>
+ #include <errno.h>
+ #include <string.h>
+-#include <sys/stat.h>
++#include <fcntl.h>
+ #include <sys/types.h>
+ #include <sys/mman.h>
+ #include "kern_util.h"
+@@ -47,105 +46,145 @@
+ #include "init.h"
+ #include "os.h"
+ #include "tempfile.h"
++#include "kern_constants.h"
+ 
+ extern struct mem_region physmem_region;
+ 
+ #define TEMPNAME_TEMPLATE "vm_file-XXXXXX"
+ 
+-int create_mem_file(unsigned long len)
++static int create_tmp_file(unsigned long len)
+ {
+-	int fd;
++	int fd, err;
+ 	char zero;
+ 
+ 	fd = make_tempfile(TEMPNAME_TEMPLATE, NULL, 1);
+-	if (fchmod(fd, 0777) < 0){
+-		perror("fchmod");
++	if(fd < 0) {
++		os_print_error(fd, "make_tempfile");
++		exit(1);
++	}
++
++	err = os_mode_fd(fd, 0777);
++	if(err < 0){
++		os_print_error(err, "os_mode_fd");
+ 		exit(1);
+ 	}
+-	if(os_seek_file(fd, len) < 0){
+-		perror("lseek");
++	err = os_seek_file(fd, len);
++	if(err < 0){
++		os_print_error(err, "os_seek_file");
+ 		exit(1);
+ 	}
+ 	zero = 0;
+-	if(write(fd, &zero, 1) != 1){
+-		perror("write");
++	err = os_write_file(fd, &zero, 1);
++	if(err != 1){
++		os_print_error(err, "os_write_file");
+ 		exit(1);
+ 	}
+-	if(fcntl(fd, F_SETFD, 1) != 0)
+-		perror("Setting FD_CLOEXEC failed");
++
+ 	return(fd);
+ }
+ 
+-int setup_region(struct mem_region *region, void *entry)
++static int have_devanon = 0;
++
++void check_devanon(void)
++{
++	int fd;
++
++	printk("Checking for /dev/anon on the host...");
++	fd = open("/dev/anon", O_RDWR);
++	if(fd < 0){
++		printk("Not available (open failed with errno %d)\n", errno);
++		return;
++	}
++
++	printk("OK\n");
++	have_devanon = 1;
++}
++
++static int create_anon_file(unsigned long len)
+ {
+-	void *loc, *start;
+-	char *driver;
+-	int err, offset;
+-
+-	if(region->start != -1){
+-		err = reserve_vm(region->start, 
+-				 region->start + region->len, entry);
+-		if(err){
+-			printk("setup_region : failed to reserve "
+-			       "0x%x - 0x%x for driver '%s'\n",
+-			       region->start, 
+-			       region->start + region->len,
+-			       region->driver);
+-			return(-1);
+-		}
+-	}
+-	else region->start = get_vm(region->len);
+-	if(region->start == 0){
+-		if(region->driver == NULL) driver = "physmem";
+-		else driver = region->driver;
+-		printk("setup_region : failed to find vm for "
+-		       "driver '%s' (length %d)\n", driver, region->len);
+-		return(-1);
+-	}
+-	if(region->start == uml_physmem){
+-		start = (void *) uml_reserved;
+-		offset = uml_reserved - uml_physmem;
+-	}
+-	else {
+-		start = (void *) region->start;
+-		offset = 0;
+-	}
+-
+-	loc = mmap(start, region->len - offset, PROT_READ | PROT_WRITE, 
+-		   MAP_SHARED | MAP_FIXED, region->fd, offset);
+-	if(loc != start){
+-		perror("Mapping memory");
++	void *addr;
++	int fd;
++
++	fd = open("/dev/anon", O_RDWR);
++	if(fd < 0) {
++		os_print_error(fd, "opening /dev/anon");
+ 		exit(1);
+ 	}
+-	return(0);
++
++	addr = mmap(NULL, len, PROT_READ | PROT_WRITE , MAP_PRIVATE, fd, 0);
++	if(addr == MAP_FAILED){
++		os_print_error((int) addr, "mapping physmem file");
++		exit(1);
++	}
++	munmap(addr, len);
++
++	return(fd);
++}
++
++int create_mem_file(unsigned long len)
++{
++	int err, fd;
++
++	if(have_devanon)
++		fd = create_anon_file(len);
++	else fd = create_tmp_file(len);
++
++	err = os_set_exec_close(fd, 1);
++	if(err < 0)
++		os_print_error(err, "exec_close");
++	return(fd);
+ }
+ 
++struct iomem_region *iomem_regions = NULL;
++int iomem_size = 0;
++
+ static int __init parse_iomem(char *str, int *add)
+ {
+-	struct stat buf;
++	struct iomem_region *new;
++	struct uml_stat buf;
+ 	char *file, *driver;
+-	int fd;
++	int fd, err;
+ 
+ 	driver = str;
+ 	file = strchr(str,',');
+ 	if(file == NULL){
+-		printk("parse_iomem : failed to parse iomem\n");
+-		return(1);
++		printf("parse_iomem : failed to parse iomem\n");
++		goto out;
+ 	}
+ 	*file = '\0';
+ 	file++;
+ 	fd = os_open_file(file, of_rdwr(OPENFLAGS()), 0);
+ 	if(fd < 0){
+-		printk("parse_iomem - Couldn't open io file, errno = %d\n", 
+-		       errno);
+-		return(1);
+-	}
+-	if(fstat(fd, &buf) < 0) {
+-		printk("parse_iomem - cannot fstat file, errno = %d\n", errno);
+-		return(1);
++		os_print_error(fd, "parse_iomem - Couldn't open io file");
++		goto out;
+ 	}
+-	add_iomem(driver, fd, buf.st_size);
++
++	err = os_stat_fd(fd, &buf);
++	if(err < 0){
++		os_print_error(err, "parse_iomem - cannot stat_fd file");
++		goto out_close;
++	}
++
++	new = malloc(sizeof(*new));
++	if(new == NULL){
++		perror("Couldn't allocate iomem_region struct");
++		goto out_close;
++	}
++
++	*new = ((struct iomem_region) { .next		= iomem_regions,
++					.driver		= driver,
++					.fd		= fd,
++					.size		= buf.ust_size,
++					.phys		= 0,
++					.virt		= 0 });
++	iomem_regions = new;
++	iomem_size += new->size + UM_KERN_PAGE_SIZE;
++
+ 	return(0);
++ out_close:
++	os_close_file(fd);
++ out:
++	return(1);
+ }
+ 
+ __uml_setup("iomem=", parse_iomem,
+@@ -153,73 +192,20 @@
+ "    Configure <file> as an IO memory region named <name>.\n\n"
+ );
+ 
+-#ifdef notdef
+-int logging = 0;
+-int logging_fd = -1;
+-
+-int logging_line = 0;
+-char logging_buf[256];
+-
+-void log(char *fmt, ...)
+-{
+-	va_list ap;
+-	struct timeval tv;
+-	struct openflags flags;
+-
+-	if(logging == 0) return;
+-	if(logging_fd < 0){
+-		flags = of_create(of_trunc(of_rdrw(OPENFLAGS())));
+-		logging_fd = os_open_file("log", flags, 0644);
+-	}
+-	gettimeofday(&tv, NULL);
+-	sprintf(logging_buf, "%d\t %u.%u  ", logging_line++, tv.tv_sec, 
+-		tv.tv_usec);
+-	va_start(ap, fmt);
+-	vsprintf(&logging_buf[strlen(logging_buf)], fmt, ap);
+-	va_end(ap);
+-	write(logging_fd, logging_buf, strlen(logging_buf));
+-}
+-#endif
+-
+-int map_memory(unsigned long virt, unsigned long phys, unsigned long len, 
+-	       int r, int w, int x)
+-{
+-	struct mem_region *region = phys_region(phys);
+-
+-	return(os_map_memory((void *) virt, region->fd, phys_offset(phys), len,
+-			     r, w, x));
+-}
+-
+ int protect_memory(unsigned long addr, unsigned long len, int r, int w, int x,
+ 		   int must_succeed)
+ {
+-	if(os_protect_memory((void *) addr, len, r, w, x) < 0){
++	int err;
++
++	err = os_protect_memory((void *) addr, len, r, w, x);
++	if(err < 0){
+                 if(must_succeed)
+-                        panic("protect failed, errno = %d", errno);
+-                else return(-errno);
++			panic("protect failed, err = %d", -err);
++		else return(err);
+ 	}
+ 	return(0);
+ }
+ 
+-unsigned long find_iomem(char *driver, unsigned long *len_out)
+-{
+-	struct mem_region *region;
+-	int i, n;
+-
+-	n = nregions();
+-	for(i = 0; i < n; i++){
+-		region = regions[i];
+-		if(region == NULL) continue;
+-		if((region->driver != NULL) &&
+-		   !strcmp(region->driver, driver)){
+-			*len_out = region->len;
+-			return(region->start);
+-		}
+-	}
+-	*len_out = 0;
+-	return 0;
+-}
+-
+ /*
+  * Overrides for Emacs so that we follow Linus's tabbing style.
+  * Emacs will notice this stuff at the end of the file and automatically
+diff -Naur a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c
+--- a/arch/um/kernel/physmem.c	1969-12-31 19:00:00.000000000 -0500
++++ b/arch/um/kernel/physmem.c	2004-01-08 22:20:43.000000000 -0500
+@@ -0,0 +1,349 @@
++/* 
++ * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
++ * Licensed under the GPL
++ */
++
++#include "linux/mm.h"
++#include "linux/ghash.h"
++#include "linux/slab.h"
++#include "linux/vmalloc.h"
++#include "linux/bootmem.h"
++#include "asm/types.h"
++#include "asm/pgtable.h"
++#include "kern_util.h"
++#include "user_util.h"
++#include "mode_kern.h"
++#include "mem.h"
++#include "mem_user.h"
++#include "os.h"
++#include "kern.h"
++#include "init.h"
++
++#define PHYS_HASHSIZE (8192)
++
++struct phys_desc;
++
++DEF_HASH_STRUCTS(virtmem, PHYS_HASHSIZE, struct phys_desc);
++
++struct phys_desc {
++	struct virtmem_ptrs virt_ptrs;
++	int fd;
++	__u64 offset;
++	void *virt;
++	unsigned long phys;
++};
++
++struct virtmem_table virtmem_hash;
++
++static int virt_cmp(void *virt1, void *virt2)
++{
++	return(virt1 != virt2);
++}
++
++static int virt_hash(void *virt)
++{
++	unsigned long addr = ((unsigned long) virt) >> PAGE_SHIFT;
++	return(addr % PHYS_HASHSIZE);
++}
++
++DEF_HASH(static, virtmem, struct phys_desc, virt_ptrs, void *, virt, virt_cmp, 
++	 virt_hash);
++
++int physmem_subst_mapping(void *virt, int fd, __u64 offset, int w)
++{
++	struct phys_desc *desc;
++	unsigned long phys;
++	int err;
++
++	virt = (void *) ((unsigned long) virt & PAGE_MASK);
++	err = os_map_memory(virt, fd, offset, PAGE_SIZE, 1, w, 0);
++	if(err)
++		goto out;
++
++	phys = __pa(virt);
++	if(find_virtmem_hash(&virtmem_hash, virt) != NULL)
++		panic("Address 0x%p is already substituted\n", virt);
++
++	err = -ENOMEM;
++	desc = kmalloc(sizeof(*desc), GFP_ATOMIC);
++	if(desc == NULL)
++		goto out;
++
++	*desc = ((struct phys_desc) { .virt_ptrs =	{ NULL, NULL },
++				      .fd =		fd,
++				      .offset =		offset,
++				      .virt =		virt,
++				      .phys =		__pa(virt) });
++	insert_virtmem_hash(&virtmem_hash, desc);
++	err = 0;
++ out:
++	return(err);
++}
++
++static int physmem_fd = -1;
++
++int physmem_remove_mapping(void *virt)
++{
++	struct phys_desc *desc;
++	int err;
++
++	virt = (void *) ((unsigned long) virt & PAGE_MASK);
++	desc = find_virtmem_hash(&virtmem_hash, virt);
++	if(desc == NULL)
++		return(0);
++
++	remove_virtmem_hash(&virtmem_hash, desc);
++	kfree(desc);
++
++	err = os_map_memory(virt, physmem_fd, __pa(virt), PAGE_SIZE, 1, 1, 0);
++	if(err)
++		panic("Failed to unmap block device page from physical memory, "
++		      "errno = %d", -err);
++	return(1);
++}
++
++void arch_free_page(struct page *page, int order)
++{
++	void *virt;
++	int i;
++
++	for(i = 0; i < 1 << order; i++){
++		virt = __va(page_to_phys(page + i));
++		physmem_remove_mapping(virt);
++	}
++}
++
++int is_remapped(void *virt)
++{
++	return(find_virtmem_hash(&virtmem_hash, virt) != NULL);
++}
++
++/* Changed during early boot */
++unsigned long high_physmem;
++
++extern unsigned long physmem_size;
++
++void *to_virt(unsigned long phys)
++{
++	return((void *) uml_physmem + phys);
++}
++
++unsigned long to_phys(void *virt)
++{
++	return(((unsigned long) virt) - uml_physmem);
++}
++
++int init_maps(unsigned long physmem, unsigned long iomem, unsigned long highmem)
++{
++	struct page *p, *map;
++	unsigned long phys_len, phys_pages, highmem_len, highmem_pages;
++	unsigned long iomem_len, iomem_pages, total_len, total_pages;
++	int i;
++
++	phys_pages = physmem >> PAGE_SHIFT;
++	phys_len = phys_pages * sizeof(struct page);
++
++	iomem_pages = iomem >> PAGE_SHIFT;
++	iomem_len = iomem_pages * sizeof(struct page);
++
++	highmem_pages = highmem >> PAGE_SHIFT;
++	highmem_len = highmem_pages * sizeof(struct page);
++
++	total_pages = phys_pages + iomem_pages + highmem_pages;
++	total_len = phys_len + iomem_pages + highmem_len;
++
++	if(kmalloc_ok){
++		map = kmalloc(total_len, GFP_KERNEL);
++		if(map == NULL) 
++			map = vmalloc(total_len);
++	}
++	else map = alloc_bootmem_low_pages(total_len);
++
++	if(map == NULL)
++		return(-ENOMEM);
++
++	for(i = 0; i < total_pages; i++){
++		p = &map[i];
++		set_page_count(p, 0);
++		SetPageReserved(p);
++		INIT_LIST_HEAD(&p->list);
++	}
++
++	mem_map = map;
++	max_mapnr = total_pages;
++	return(0);
++}
++
++struct page *phys_to_page(const unsigned long phys)
++{
++	return(&mem_map[phys >> PAGE_SHIFT]);
++}
++
++struct page *__virt_to_page(const unsigned long virt)
++{
++	return(&mem_map[__pa(virt) >> PAGE_SHIFT]);
++}
++
++unsigned long page_to_phys(struct page *page)
++{
++	return((page - mem_map) << PAGE_SHIFT);
++}
++
++pte_t mk_pte(struct page *page, pgprot_t pgprot)
++{
++	pte_t pte;
++
++	pte_val(pte) = page_to_phys(page) + pgprot_val(pgprot);
++	if(pte_present(pte)) pte_mknewprot(pte_mknewpage(pte));
++	return(pte);
++}
++
++/* Changed during early boot */
++static unsigned long kmem_top = 0;
++
++unsigned long get_kmem_end(void)
++{
++	if(kmem_top == 0) 
++		kmem_top = CHOOSE_MODE(kmem_end_tt, kmem_end_skas);
++	return(kmem_top);
++}
++
++void map_memory(unsigned long virt, unsigned long phys, unsigned long len, 
++		int r, int w, int x)
++{
++	__u64 offset;
++	int fd, err;
++
++	fd = phys_mapping(phys, &offset);
++	err = os_map_memory((void *) virt, fd, offset, len, r, w, x);
++	if(err)
++		panic("map_memory(0x%lx, %d, 0x%llx, %ld, %d, %d, %d) failed, "
++		      "err = %d\n", virt, fd, offset, len, r, w, x, err);
++}
++
++#define PFN_UP(x) (((x) + PAGE_SIZE-1) >> PAGE_SHIFT)
++
++void setup_physmem(unsigned long start, unsigned long reserve_end,
++		   unsigned long len, unsigned long highmem)
++{
++	unsigned long reserve = reserve_end - start;
++	int pfn = PFN_UP(__pa(reserve_end));
++	int delta = (len - reserve) >> PAGE_SHIFT;
++	int err, offset, bootmap_size;
++
++	physmem_fd = create_mem_file(len + highmem);
++
++	offset = uml_reserved - uml_physmem;
++	err = os_map_memory((void *) uml_reserved, physmem_fd, offset, 
++			    len - offset, 1, 1, 0);
++	if(err < 0){
++		os_print_error(err, "Mapping memory");
++		exit(1);
++	}
++
++	bootmap_size = init_bootmem(pfn, pfn + delta);
++	free_bootmem(__pa(reserve_end) + bootmap_size,
++		     len - bootmap_size - reserve);
++}
++
++int phys_mapping(unsigned long phys, __u64 *offset_out)
++{
++	struct phys_desc *desc = find_virtmem_hash(&virtmem_hash, 
++						   __va(phys & PAGE_MASK));
++	int fd = -1;
++
++	if(desc != NULL){
++		fd = desc->fd;
++		*offset_out = desc->offset;
++	}
++	else if(phys < physmem_size){
++		fd = physmem_fd;
++		*offset_out = phys;
++	}
++	else if(phys < __pa(end_iomem)){
++		struct iomem_region *region = iomem_regions;
++	
++		while(region != NULL){
++			if((phys >= region->phys) && 
++			   (phys < region->phys + region->size)){
++				fd = region->fd;
++				*offset_out = phys - region->phys;
++				break;
++			}
++			region = region->next;
++		}
++	}
++	else if(phys < __pa(end_iomem) + highmem){
++		fd = physmem_fd;
++		*offset_out = phys - iomem_size;
++	}
++
++	return(fd);
++}
++
++static int __init uml_mem_setup(char *line, int *add)
++{
++	char *retptr;
++	physmem_size = memparse(line,&retptr);
++	return 0;
++}
++__uml_setup("mem=", uml_mem_setup,
++"mem=<Amount of desired ram>\n"
++"    This controls how much \"physical\" memory the kernel allocates\n"
++"    for the system. The size is specified as a number followed by\n"
++"    one of 'k', 'K', 'm', 'M', which have the obvious meanings.\n"
++"    This is not related to the amount of memory in the host.  It can\n"
++"    be more, and the excess, if it's ever used, will just be swapped out.\n"
++"	Example: mem=64M\n\n"
++);
++
++unsigned long find_iomem(char *driver, unsigned long *len_out)
++{
++	struct iomem_region *region = iomem_regions;
++	
++	while(region != NULL){
++		if(!strcmp(region->driver, driver)){
++			*len_out = region->size;
++			return(region->virt);
++		}
++	}
++
++	return(0);
++}
++
++int setup_iomem(void)
++{
++	struct iomem_region *region = iomem_regions;
++	unsigned long iomem_start = high_physmem + PAGE_SIZE;
++	int err;
++
++	while(region != NULL){
++		err = os_map_memory((void *) iomem_start, region->fd, 0, 
++				    region->size, 1, 1, 0);
++		if(err)
++			printk("Mapping iomem region for driver '%s' failed, "
++			       "errno = %d\n", region->driver, -err);
++		else {
++			region->virt = iomem_start;
++			region->phys = __pa(region->virt);
++		}
++
++		iomem_start += region->size + PAGE_SIZE;
++		region = region->next;
++	}
++
++	return(0);
++}
++
++__initcall(setup_iomem);
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/arch/um/kernel/process.c b/arch/um/kernel/process.c
+--- a/arch/um/kernel/process.c	2004-01-08 22:29:24.000000000 -0500
++++ b/arch/um/kernel/process.c	2004-01-08 22:35:08.000000000 -0500
+@@ -9,12 +9,10 @@
+ #include <sched.h>
+ #include <errno.h>
+ #include <stdarg.h>
+-#include <fcntl.h>
+ #include <stdlib.h>
+ #include <setjmp.h>
+ #include <sys/time.h>
+ #include <sys/ptrace.h>
+-#include <sys/ioctl.h>
+ #include <sys/wait.h>
+ #include <sys/mman.h>
+ #include <asm/ptrace.h>
+@@ -58,7 +56,11 @@
+ {
+ 	int flags = altstack ? SA_ONSTACK : 0;
+ 
+-	set_handler(SIGSEGV, (__sighandler_t) sig_handler, flags,
++	/* NODEFER is set here because SEGV isn't turned back on when the 
++	 * handler is ready to receive signals.  This causes any segfault
++	 * during a copy_user to kill the process because the fault is blocked.
++	 */
++	set_handler(SIGSEGV, (__sighandler_t) sig_handler, flags | SA_NODEFER,
+ 		    SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);
+ 	set_handler(SIGTRAP, (__sighandler_t) sig_handler, flags, 
+ 		    SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);
+@@ -72,7 +74,6 @@
+ 		    SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);
+ 	set_handler(SIGUSR2, (__sighandler_t) sig_handler, 
+ 		    SA_NOMASK | flags, -1);
+-	(void) CHOOSE_MODE(signal(SIGCHLD, SIG_IGN), (void *) 0);
+ 	signal(SIGHUP, SIG_IGN);
+ 
+ 	init_irq_signals(altstack);
+@@ -123,11 +124,12 @@
+ 	/* Start the process and wait for it to kill itself */
+ 	new_pid = clone(outer_tramp, (void *) sp, clone_flags, &arg);
+ 	if(new_pid < 0) return(-errno);
+-	while((err = waitpid(new_pid, &status, 0) < 0) && (errno == EINTR)) ;
++	while(((err = waitpid(new_pid, &status, 0)) < 0) && (errno == EINTR)) ;
+ 	if(err < 0) panic("Waiting for outer trampoline failed - errno = %d", 
+ 			  errno);
+ 	if(!WIFSIGNALED(status) || (WTERMSIG(status) != SIGKILL))
+-		panic("outer trampoline didn't exit with SIGKILL");
++		panic("outer trampoline didn't exit with SIGKILL, "
++		      "status = %d", status);
+ 
+ 	return(arg.pid);
+ }
+@@ -138,7 +140,7 @@
+ 
+ 	os_stop_process(os_getpid());
+ 
+-	if(read(fd, &c, sizeof(c)) != sizeof(c))
++	if(os_read_file(fd, &c, sizeof(c)) != sizeof(c))
+ 		panic("read failed in suspend_new_thread");
+ }
+ 
+@@ -233,7 +235,7 @@
+ 	int n;
+ 
+ 	*jmp_ptr = &buf;
+-	n = setjmp(buf);
++	n = sigsetjmp(buf, 1);
+ 	if(n != 0)
+ 		return(n);
+ 	(*fn)(arg);
+@@ -273,7 +275,7 @@
+ 	stop_ptraced_child(pid, stack, 1);
+ 
+ 	printf("Checking for /proc/mm...");
+-	if(access("/proc/mm", W_OK)){
++	if(os_access("/proc/mm", OS_ACC_W_OK) < 0){
+ 		printf("not found\n");
+ 		ret = 0;
+ 	}
+diff -Naur a/arch/um/kernel/process_kern.c b/arch/um/kernel/process_kern.c
+--- a/arch/um/kernel/process_kern.c	2004-01-08 22:21:59.000000000 -0500
++++ b/arch/um/kernel/process_kern.c	2004-01-08 22:28:53.000000000 -0500
+@@ -16,6 +16,7 @@
+ #include "linux/module.h"
+ #include "linux/init.h"
+ #include "linux/capability.h"
++#include "linux/spinlock.h"
+ #include "asm/unistd.h"
+ #include "asm/mman.h"
+ #include "asm/segment.h"
+@@ -23,7 +24,6 @@
+ #include "asm/pgtable.h"
+ #include "asm/processor.h"
+ #include "asm/tlbflush.h"
+-#include "asm/spinlock.h"
+ #include "asm/uaccess.h"
+ #include "asm/user.h"
+ #include "user_util.h"
+@@ -52,17 +52,12 @@
+ 
+ struct task_struct *get_task(int pid, int require)
+ {
+-        struct task_struct *task, *ret;
++        struct task_struct *ret;
+ 
+-        ret = NULL;
+         read_lock(&tasklist_lock);
+-        for_each_process(task){
+-                if(task->pid == pid){
+-                        ret = task;
+-                        break;
+-                }
+-        }
++	ret = find_task_by_pid(pid);
+         read_unlock(&tasklist_lock);
++
+         if(require && (ret == NULL)) panic("get_task couldn't find a task\n");
+         return(ret);
+ }
+@@ -95,7 +90,8 @@
+ 	int flags = GFP_KERNEL;
+ 
+ 	if(atomic) flags |= GFP_ATOMIC;
+-	if((page = __get_free_pages(flags, order)) == 0)
++	page = __get_free_pages(flags, order);
++	if(page == 0)
+ 		return(0);
+ 	stack_protections(page);
+ 	return(page);
+@@ -103,13 +99,15 @@
+ 
+ int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
+ {
+-	struct task_struct *p;
++	int pid;
+ 
+ 	current->thread.request.u.thread.proc = fn;
+ 	current->thread.request.u.thread.arg = arg;
+-	p = do_fork(CLONE_VM | flags, 0, NULL, 0, NULL, NULL);
+-	if(IS_ERR(p)) panic("do_fork failed in kernel_thread");
+-	return(p->pid);
++	pid = do_fork(CLONE_VM | CLONE_UNTRACED | flags, 0, NULL, 0, NULL, 
++		      NULL);
++	if(pid < 0)
++		panic("do_fork failed in kernel_thread, errno = %d", pid);
++	return(pid);
+ }
+ 
+ void switch_mm(struct mm_struct *prev, struct mm_struct *next, 
+@@ -129,7 +127,7 @@
+ 		{ external_pid(task), task });
+ }
+ 
+-void *switch_to(void *prev, void *next, void *last)
++void *_switch_to(void *prev, void *next, void *last)
+ {
+ 	return(CHOOSE_MODE(switch_to_tt(prev, next), 
+ 			   switch_to_skas(prev, next)));
+@@ -149,7 +147,7 @@
+ void exit_thread(void)
+ {
+ 	CHOOSE_MODE(exit_thread_tt(), exit_thread_skas());
+-	unprotect_stack((unsigned long) current->thread_info);
++	unprotect_stack((unsigned long) current_thread);
+ }
+  
+ void *get_current(void)
+@@ -157,6 +155,10 @@
+ 	return(current);
+ }
+ 
++void prepare_to_copy(struct task_struct *tsk)
++{
++}
++
+ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
+ 		unsigned long stack_top, struct task_struct * p, 
+ 		struct pt_regs *regs)
+@@ -190,7 +192,7 @@
+ 
+ void default_idle(void)
+ {
+-	idle_timer();
++	uml_idle_timer();
+ 
+ 	atomic_inc(&init_mm.mm_count);
+ 	current->mm = &init_mm;
+@@ -367,10 +369,15 @@
+ 	return(clear_user(buf, size));
+ }
+ 
++int strlen_user_proc(char *str)
++{
++	return(strlen_user(str));
++}
++
+ int smp_sigio_handler(void)
+ {
+ #ifdef CONFIG_SMP
+-	int cpu = current->thread_info->cpu;
++	int cpu = current_thread->cpu;
+ 	IPI_handler(cpu);
+ 	if(cpu != 0)
+ 		return(1);
+@@ -385,7 +392,7 @@
+ 
+ int cpu(void)
+ {
+-	return(current->thread_info->cpu);
++	return(current_thread->cpu);
+ }
+ 
+ /*
+diff -Naur a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c
+--- a/arch/um/kernel/ptrace.c	2004-01-08 22:15:02.000000000 -0500
++++ b/arch/um/kernel/ptrace.c	2004-01-08 22:20:32.000000000 -0500
+@@ -311,11 +311,8 @@
+ 
+ 	/* the 0x80 provides a way for the tracing parent to distinguish
+ 	   between a syscall stop and SIGTRAP delivery */
+- 	current->exit_code = SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
+- 					? 0x80 : 0);
+-	current->state = TASK_STOPPED;
+-	notify_parent(current, SIGCHLD);
+-	schedule();
++	ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
++				 ? 0x80 : 0));
+ 
+ 	/*
+ 	 * this isn't the same as continuing with a signal, but it will do
+diff -Naur a/arch/um/kernel/reboot.c b/arch/um/kernel/reboot.c
+--- a/arch/um/kernel/reboot.c	2004-01-08 22:21:48.000000000 -0500
++++ b/arch/um/kernel/reboot.c	2004-01-08 22:28:40.000000000 -0500
+@@ -15,6 +15,7 @@
+ #ifdef CONFIG_SMP
+ static void kill_idlers(int me)
+ {
++#ifdef CONFIG_MODE_TT
+ 	struct task_struct *p;
+ 	int i;
+ 
+@@ -23,6 +24,7 @@
+ 		if((p != NULL) && (p->thread.mode.tt.extern_pid != me))
+ 			os_kill_process(p->thread.mode.tt.extern_pid, 0);
+ 	}
++#endif
+ }
+ #endif
+ 
+diff -Naur a/arch/um/kernel/sigio_kern.c b/arch/um/kernel/sigio_kern.c
+--- a/arch/um/kernel/sigio_kern.c	2004-01-08 22:16:51.000000000 -0500
++++ b/arch/um/kernel/sigio_kern.c	2004-01-08 22:22:53.000000000 -0500
+@@ -6,18 +6,21 @@
+ #include "linux/kernel.h"
+ #include "linux/list.h"
+ #include "linux/slab.h"
+-#include "asm/irq.h"
++#include "linux/signal.h"
++#include "linux/interrupt.h"
+ #include "init.h"
+ #include "sigio.h"
+ #include "irq_user.h"
++#include "irq_kern.h"
+ 
+ /* Protected by sigio_lock() called from write_sigio_workaround */
+ static int sigio_irq_fd = -1;
+ 
+-void sigio_interrupt(int irq, void *data, struct pt_regs *unused)
++irqreturn_t sigio_interrupt(int irq, void *data, struct pt_regs *unused)
+ {
+ 	read_sigio_fd(sigio_irq_fd);
+ 	reactivate_fd(sigio_irq_fd, SIGIO_WRITE_IRQ);
++	return(IRQ_HANDLED);
+ }
+ 
+ int write_sigio_irq(int fd)
+diff -Naur a/arch/um/kernel/sigio_user.c b/arch/um/kernel/sigio_user.c
+--- a/arch/um/kernel/sigio_user.c	2004-01-08 22:31:33.000000000 -0500
++++ b/arch/um/kernel/sigio_user.c	2004-01-08 22:36:15.000000000 -0500
+@@ -7,7 +7,6 @@
+ #include <stdlib.h>
+ #include <termios.h>
+ #include <pty.h>
+-#include <fcntl.h>
+ #include <signal.h>
+ #include <errno.h>
+ #include <string.h>
+@@ -26,7 +25,7 @@
+ int pty_close_sigio = 0;
+ 
+ /* Used as a flag during SIGIO testing early in boot */
+-static int got_sigio = 0;
++static volatile int got_sigio = 0;
+ 
+ void __init handler(int sig)
+ {
+@@ -45,7 +44,7 @@
+ 
+ 	info->err = 0;
+ 	if(openpty(&info->master, &info->slave, NULL, NULL, NULL))
+-		info->err = errno;
++		info->err = -errno;
+ }
+ 
+ void __init check_one_sigio(void (*proc)(int, int))
+@@ -53,11 +52,11 @@
+ 	struct sigaction old, new;
+ 	struct termios tt;
+ 	struct openpty_arg pty = { .master = -1, .slave = -1 };
+-	int master, slave, flags;
++	int master, slave, err;
+ 
+ 	initial_thread_cb(openpty_cb, &pty);
+ 	if(pty.err){
+-		printk("openpty failed, errno = %d\n", pty.err);
++		printk("openpty failed, errno = %d\n", -pty.err);
+ 		return;
+ 	}
+ 
+@@ -69,23 +68,16 @@
+ 		return;
+ 	}
+ 
++	/* XXX These can fail with EINTR */
+ 	if(tcgetattr(master, &tt) < 0)
+ 		panic("check_sigio : tcgetattr failed, errno = %d\n", errno);
+ 	cfmakeraw(&tt);
+ 	if(tcsetattr(master, TCSADRAIN, &tt) < 0)
+ 		panic("check_sigio : tcsetattr failed, errno = %d\n", errno);
+ 
+-	if((flags = fcntl(master, F_GETFL)) < 0)
+-		panic("tty_fds : fcntl F_GETFL failed, errno = %d\n", errno);
+-
+-	if((fcntl(master, F_SETFL, flags | O_NONBLOCK | O_ASYNC) < 0) ||
+-	   (fcntl(master, F_SETOWN, os_getpid()) < 0))
+-		panic("check_sigio : fcntl F_SETFL or F_SETOWN failed, "
+-		      "errno = %d\n", errno);
+-
+-	if((fcntl(slave, F_SETFL, flags | O_NONBLOCK) < 0))
+-		panic("check_sigio : fcntl F_SETFL failed, errno = %d\n", 
+-		      errno);
++	err = os_sigio_async(master, slave);
++	if(err < 0)
++		panic("tty_fds : sigio_async failed, err = %d\n", -err);
+ 
+ 	if(sigaction(SIGIO, NULL, &old) < 0)
+ 		panic("check_sigio : sigaction 1 failed, errno = %d\n", errno);
+@@ -97,8 +89,8 @@
+ 	got_sigio = 0;
+ 	(*proc)(master, slave);
+ 		
+-	close(master);
+-	close(slave);
++	os_close_file(master);
++	os_close_file(slave);
+ 
+ 	if(sigaction(SIGIO, &old, NULL) < 0)
+ 		panic("check_sigio : sigaction 3 failed, errno = %d\n", errno);
+@@ -112,25 +104,25 @@
+ 	printk("Checking that host ptys support output SIGIO...");
+ 
+ 	memset(buf, 0, sizeof(buf));
+-	while(write(master, buf, sizeof(buf)) > 0) ;
++
++	while(os_write_file(master, buf, sizeof(buf)) > 0) ;
+ 	if(errno != EAGAIN)
+ 		panic("check_sigio : write failed, errno = %d\n", errno);
+-
+-	while(((n = read(slave, buf, sizeof(buf))) > 0) && !got_sigio) ;
++	while(((n = os_read_file(slave, buf, sizeof(buf))) > 0) && !got_sigio) ;
+ 
+ 	if(got_sigio){
+ 		printk("Yes\n");
+ 		pty_output_sigio = 1;
+ 	}
+-	else if(errno == EAGAIN) printk("No, enabling workaround\n");
+-	else panic("check_sigio : read failed, errno = %d\n", errno);
++	else if(n == -EAGAIN) printk("No, enabling workaround\n");
++	else panic("check_sigio : read failed, err = %d\n", n);
+ }
+ 
+ static void tty_close(int master, int slave)
+ {
+ 	printk("Checking that host ptys support SIGIO on close...");
+ 
+-	close(slave);
++	os_close_file(slave);
+ 	if(got_sigio){
+ 		printk("Yes\n");
+ 		pty_close_sigio = 1;
+@@ -140,7 +132,8 @@
+ 
+ void __init check_sigio(void)
+ {
+-	if(access("/dev/ptmx", R_OK) && access("/dev/ptyp0", R_OK)){
++	if((os_access("/dev/ptmx", OS_ACC_R_OK) < 0) &&
++	   (os_access("/dev/ptyp0", OS_ACC_R_OK) < 0)){
+ 		printk("No pseudo-terminals available - skipping pty SIGIO "
+ 		       "check\n");
+ 		return;
+@@ -201,11 +194,10 @@
+ 			p = &fds->poll[i];
+ 			if(p->revents == 0) continue;
+ 			if(p->fd == sigio_private[1]){
+-				n = read(sigio_private[1], &c, sizeof(c));
++				n = os_read_file(sigio_private[1], &c, sizeof(c));
+ 				if(n != sizeof(c))
+ 					printk("write_sigio_thread : "
+-					       "read failed, errno = %d\n",
+-					       errno);
++					       "read failed, err = %d\n", -n);
+ 				tmp = current_poll;
+ 				current_poll = next_poll;
+ 				next_poll = tmp;
+@@ -218,10 +210,10 @@
+ 					(fds->used - i) * sizeof(*fds->poll));
+ 			}
+ 
+-			n = write(respond_fd, &c, sizeof(c));
++			n = os_write_file(respond_fd, &c, sizeof(c));
+ 			if(n != sizeof(c))
+ 				printk("write_sigio_thread : write failed, "
+-				       "errno = %d\n", errno);
++				       "err = %d\n", -n);
+ 		}
+ 	}
+ }
+@@ -252,15 +244,15 @@
+ 	char c;
+ 
+ 	flags = set_signals(0);
+-	n = write(sigio_private[0], &c, sizeof(c));
++	n = os_write_file(sigio_private[0], &c, sizeof(c));
+ 	if(n != sizeof(c)){
+-		printk("update_thread : write failed, errno = %d\n", errno);
++		printk("update_thread : write failed, err = %d\n", -n);
+ 		goto fail;
+ 	}
+ 
+-	n = read(sigio_private[0], &c, sizeof(c));
++	n = os_read_file(sigio_private[0], &c, sizeof(c));
+ 	if(n != sizeof(c)){
+-		printk("update_thread : read failed, errno = %d\n", errno);
++		printk("update_thread : read failed, err = %d\n", -n);
+ 		goto fail;
+ 	}
+ 
+@@ -271,10 +263,10 @@
+ 	if(write_sigio_pid != -1) 
+ 		os_kill_process(write_sigio_pid, 1);
+ 	write_sigio_pid = -1;
+-	close(sigio_private[0]);
+-	close(sigio_private[1]);	
+-	close(write_sigio_fds[0]);
+-	close(write_sigio_fds[1]);
++	os_close_file(sigio_private[0]);
++	os_close_file(sigio_private[1]);	
++	os_close_file(write_sigio_fds[0]);
++	os_close_file(write_sigio_fds[1]);
+ 	sigio_unlock();
+ 	set_signals(flags);
+ }
+@@ -369,15 +361,15 @@
+ 		goto out;
+ 
+ 	err = os_pipe(write_sigio_fds, 1, 1);
+-	if(err){
++	if(err < 0){
+ 		printk("write_sigio_workaround - os_pipe 1 failed, "
+-		       "errno = %d\n", -err);
++		       "err = %d\n", -err);
+ 		goto out;
+ 	}
+ 	err = os_pipe(sigio_private, 1, 1);
+-	if(err){
++	if(err < 0){
+ 		printk("write_sigio_workaround - os_pipe 2 failed, "
+-		       "errno = %d\n", -err);
++		       "err = %d\n", -err);
+ 		goto out_close1;
+ 	}
+ 	if(setup_initial_poll(sigio_private[1]))
+@@ -399,11 +391,11 @@
+ 	os_kill_process(write_sigio_pid, 1);
+ 	write_sigio_pid = -1;
+  out_close2:
+-	close(sigio_private[0]);
+-	close(sigio_private[1]);	
++	os_close_file(sigio_private[0]);
++	os_close_file(sigio_private[1]);	
+  out_close1:
+-	close(write_sigio_fds[0]);
+-	close(write_sigio_fds[1]);
++	os_close_file(write_sigio_fds[0]);
++	os_close_file(write_sigio_fds[1]);
+ 	sigio_unlock();
+ }
+ 
+@@ -412,10 +404,16 @@
+ 	int n;
+ 	char c;
+ 
+-	n = read(fd, &c, sizeof(c));
++	n = os_read_file(fd, &c, sizeof(c));
+ 	if(n != sizeof(c)){
+-		printk("read_sigio_fd - read failed, errno = %d\n", errno);
+-		return(-errno);
++		if(n < 0) {
++			printk("read_sigio_fd - read failed, err = %d\n", -n);
++			return(n);
++		} 
++		else { 
++			printk("read_sigio_fd - short read, bytes = %d\n", n);
++			return(-EIO);
++		}
+ 	}
+ 	return(n);
+ }
+diff -Naur a/arch/um/kernel/signal_kern.c b/arch/um/kernel/signal_kern.c
+--- a/arch/um/kernel/signal_kern.c	2004-01-08 22:22:59.000000000 -0500
++++ b/arch/um/kernel/signal_kern.c	2004-01-08 22:29:59.000000000 -0500
+@@ -36,7 +36,7 @@
+ 	if(sig == SIGSEGV){
+ 		struct k_sigaction *ka;
+ 
+-		ka = &current->sig->action[SIGSEGV - 1];
++		ka = &current->sighand->action[SIGSEGV - 1];
+ 		ka->sa.sa_handler = SIG_DFL;
+ 	}
+ 	force_sig(SIGSEGV, current);
+@@ -60,10 +60,10 @@
+ 	int err, ret;
+ 
+ 	ret = 0;
++	/* Always make any pending restarted system calls return -EINTR */
++	current_thread_info()->restart_block.fn = do_no_restart_syscall;
+ 	switch(error){
+ 	case -ERESTART_RESTARTBLOCK:
+-		current_thread_info()->restart_block.fn = 
+-			do_no_restart_syscall;
+ 	case -ERESTARTNOHAND:
+ 		ret = -EINTR;
+ 		break;
+@@ -142,7 +142,7 @@
+ 		return(0);
+ 
+ 	/* Whee!  Actually deliver the signal.  */
+-	ka = &current->sig->action[sig -1 ];
++	ka = &current->sighand->action[sig -1 ];
+ 	err = handle_signal(regs, sig, ka, &info, oldset, error);
+ 	if(!err) return(1);
+ 
+@@ -201,7 +201,7 @@
+ 	}
+ }
+ 
+-int sys_rt_sigsuspend(sigset_t *unewset, size_t sigsetsize)
++int sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize)
+ {
+ 	sigset_t saveset, newset;
+ 
+@@ -227,20 +227,59 @@
+ 	}
+ }
+ 
++int sys_sigaction(int sig, const struct old_sigaction __user *act,
++			 struct old_sigaction __user *oact)
++{
++	struct k_sigaction new_ka, old_ka;
++	int ret;
++
++	if (act) {
++		old_sigset_t mask;
++		if (verify_area(VERIFY_READ, act, sizeof(*act)) ||
++		    __get_user(new_ka.sa.sa_handler, &act->sa_handler) ||
++		    __get_user(new_ka.sa.sa_restorer, &act->sa_restorer))
++			return -EFAULT;
++		__get_user(new_ka.sa.sa_flags, &act->sa_flags);
++		__get_user(mask, &act->sa_mask);
++		siginitset(&new_ka.sa.sa_mask, mask);
++	}
++
++	ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
++
++	if (!ret && oact) {
++		if (verify_area(VERIFY_WRITE, oact, sizeof(*oact)) ||
++		    __put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||
++		    __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer))
++			return -EFAULT;
++		__put_user(old_ka.sa.sa_flags, &oact->sa_flags);
++		__put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask);
++	}
++
++	return ret;
++}
++
++int sys_sigaltstack(const stack_t *uss, stack_t *uoss)
++{
++	return(do_sigaltstack(uss, uoss, PT_REGS_SP(&current->thread.regs)));
++}
++
++extern int userspace_pid[];
++
+ static int copy_sc_from_user(struct pt_regs *to, void *from, 
+ 			     struct arch_frame_data *arch)
+ {
+ 	int ret;
+ 
+ 	ret = CHOOSE_MODE(copy_sc_from_user_tt(UPT_SC(&to->regs), from, arch),
+-			  copy_sc_from_user_skas(&to->regs, from));
++			  copy_sc_from_user_skas(userspace_pid[0], 
++						 &to->regs, from));
+ 	return(ret);
+ }
+ 
+ int sys_sigreturn(struct pt_regs regs)
+ {
+-	void *sc = sp_to_sc(PT_REGS_SP(&current->thread.regs));
+-	void *mask = sp_to_mask(PT_REGS_SP(&current->thread.regs));
++	void __user *sc = sp_to_sc(PT_REGS_SP(&current->thread.regs));
++	void __user *mask = sp_to_mask(PT_REGS_SP(&current->thread.regs));
+ 	int sig_size = (_NSIG_WORDS - 1) * sizeof(unsigned long);
+ 
+ 	spin_lock_irq(&current->sighand->siglock);
+@@ -257,8 +296,8 @@
+ 
+ int sys_rt_sigreturn(struct pt_regs regs)
+ {
+-	struct ucontext *uc = sp_to_uc(PT_REGS_SP(&current->thread.regs));
+-	void *fp;
++	unsigned long sp = PT_REGS_SP(&current->thread.regs);
++	struct ucontext __user *uc = sp_to_uc(sp);
+ 	int sig_size = _NSIG_WORDS * sizeof(unsigned long);
+ 
+ 	spin_lock_irq(&current->sighand->siglock);
+@@ -266,7 +305,6 @@
+ 	sigdelsetmask(&current->blocked, ~_BLOCKABLE);
+ 	recalc_sigpending();
+ 	spin_unlock_irq(&current->sighand->siglock);
+-	fp = (void *) (((unsigned long) uc) + sizeof(struct ucontext));
+ 	copy_sc_from_user(&current->thread.regs, &uc->uc_mcontext,
+ 			  &signal_frame_si.common.arch);
+ 	return(PT_REGS_SYSCALL_RET(&current->thread.regs));
+diff -Naur a/arch/um/kernel/skas/include/mode.h b/arch/um/kernel/skas/include/mode.h
+--- a/arch/um/kernel/skas/include/mode.h	2004-01-08 22:22:40.000000000 -0500
++++ b/arch/um/kernel/skas/include/mode.h	2004-01-08 22:29:35.000000000 -0500
+@@ -12,14 +12,16 @@
+ extern int have_fpx_regs;
+ 
+ extern void user_time_init_skas(void);
+-extern int copy_sc_from_user_skas(union uml_pt_regs *regs, void *from_ptr);
+-extern int copy_sc_to_user_skas(void *to_ptr, void *fp, 
++extern int copy_sc_from_user_skas(int pid, union uml_pt_regs *regs, 
++				  void *from_ptr);
++extern int copy_sc_to_user_skas(int pid, void *to_ptr, void *fp, 
+ 				union uml_pt_regs *regs, 
+ 				unsigned long fault_addr, int fault_type);
+ extern void sig_handler_common_skas(int sig, void *sc_ptr);
+ extern void halt_skas(void);
+ extern void reboot_skas(void);
+ extern void kill_off_processes_skas(void);
++extern int is_skas_winch(int pid, int fd, void *data);
+ 
+ #endif
+ 
+diff -Naur a/arch/um/kernel/skas/include/skas.h b/arch/um/kernel/skas/include/skas.h
+--- a/arch/um/kernel/skas/include/skas.h	2004-01-08 22:17:37.000000000 -0500
++++ b/arch/um/kernel/skas/include/skas.h	2004-01-08 22:23:23.000000000 -0500
+@@ -8,7 +8,7 @@
+ 
+ #include "sysdep/ptrace.h"
+ 
+-extern int userspace_pid;
++extern int userspace_pid[];
+ 
+ extern void switch_threads(void *me, void *next);
+ extern void thread_wait(void *sw, void *fb);
+@@ -32,7 +32,7 @@
+ extern int new_mm(int from);
+ extern void save_registers(union uml_pt_regs *regs);
+ extern void restore_registers(union uml_pt_regs *regs);
+-extern void start_userspace(void);
++extern void start_userspace(int cpu);
+ extern void init_registers(int pid);
+ 
+ #endif
+diff -Naur a/arch/um/kernel/skas/include/uaccess.h b/arch/um/kernel/skas/include/uaccess.h
+--- a/arch/um/kernel/skas/include/uaccess.h	2004-01-08 22:20:08.000000000 -0500
++++ b/arch/um/kernel/skas/include/uaccess.h	2004-01-08 22:26:25.000000000 -0500
+@@ -6,20 +6,10 @@
+ #ifndef __SKAS_UACCESS_H
+ #define __SKAS_UACCESS_H
+ 
+-#include "linux/string.h"
+-#include "linux/sched.h"
+-#include "linux/err.h"
+-#include "asm/processor.h"
+-#include "asm/pgtable.h"
+-#include "asm/errno.h"
+-#include "asm/current.h"
+-#include "asm/a.out.h"
+-#include "kern_util.h"
+-
+ #define access_ok_skas(type, addr, size) \
+ 	((segment_eq(get_fs(), KERNEL_DS)) || \
+ 	 (((unsigned long) (addr) < TASK_SIZE) && \
+-	  ((unsigned long) (addr) + (size) < TASK_SIZE)))
++	  ((unsigned long) (addr) + (size) <= TASK_SIZE)))
+ 
+ static inline int verify_area_skas(int type, const void * addr, 
+ 				   unsigned long size)
+@@ -27,197 +17,12 @@
+ 	return(access_ok_skas(type, addr, size) ? 0 : -EFAULT);
+ }
+ 
+-static inline unsigned long maybe_map(unsigned long virt, int is_write)
+-{
+-	pte_t pte;
+-
+-	void *phys = um_virt_to_phys(current, virt, &pte);
+-	int dummy_code;
+-
+-	if(IS_ERR(phys) || (is_write && !pte_write(pte))){
+-		if(handle_page_fault(virt, 0, is_write, 0, &dummy_code))
+-			return(0);
+-		phys = um_virt_to_phys(current, virt, NULL);
+-	}
+-	return((unsigned long) __va((unsigned long) phys));
+-}
+-
+-static inline int buffer_op(unsigned long addr, int len, 
+-			    int (*op)(unsigned long addr, int len, void *arg),
+-			    void *arg)
+-{
+-	int size = min(PAGE_ALIGN(addr) - addr, (unsigned long) len);
+-	int remain = len, n;
+-
+-	n = (*op)(addr, size, arg);
+-	if(n != 0)
+-		return(n < 0 ? remain : 0);
+-
+-	addr += size;
+-	remain -= size;
+-	if(remain == 0) 
+-		return(0);
+-
+-	while(addr < ((addr + remain) & PAGE_MASK)){
+-		n = (*op)(addr, PAGE_SIZE, arg);
+-		if(n != 0)
+-			return(n < 0 ? remain : 0);
+-
+-		addr += PAGE_SIZE;
+-		remain -= PAGE_SIZE;
+-	}
+-	if(remain == 0)
+-		return(0);
+-
+-	n = (*op)(addr, remain, arg);
+-	if(n != 0)
+-		return(n < 0 ? remain : 0);
+-	return(0);
+-}
+-
+-static inline int copy_chunk_from_user(unsigned long from, int len, void *arg)
+-{
+-	unsigned long *to_ptr = arg, to = *to_ptr;
+-
+-	from = maybe_map(from, 0);
+-	if(from == 0)
+-		return(-1);
+-
+-	memcpy((void *) to, (void *) from, len);
+-	*to_ptr += len;
+-	return(0);
+-}
+-
+-static inline int copy_from_user_skas(void *to, const void *from, int n)
+-{
+-	if(segment_eq(get_fs(), KERNEL_DS)){
+-		memcpy(to, from, n);
+-		return(0);
+-	}
+-
+-	return(access_ok_skas(VERIFY_READ, from, n) ?
+-	       buffer_op((unsigned long) from, n, copy_chunk_from_user, &to) :
+-	       n);
+-}
+-
+-static inline int copy_chunk_to_user(unsigned long to, int len, void *arg)
+-{
+-	unsigned long *from_ptr = arg, from = *from_ptr;
+-
+-	to = maybe_map(to, 1);
+-	if(to == 0)
+-		return(-1);
+-
+-	memcpy((void *) to, (void *) from, len);
+-	*from_ptr += len;
+-	return(0);
+-}
+-
+-static inline int copy_to_user_skas(void *to, const void *from, int n)
+-{
+-	if(segment_eq(get_fs(), KERNEL_DS)){
+-		memcpy(to, from, n);
+-		return(0);
+-	}
+-
+-	return(access_ok_skas(VERIFY_WRITE, to, n) ?
+-	       buffer_op((unsigned long) to, n, copy_chunk_to_user, &from) :
+-	       n);
+-}
+-
+-static inline int strncpy_chunk_from_user(unsigned long from, int len, 
+-					  void *arg)
+-{
+-        char **to_ptr = arg, *to = *to_ptr;
+-	int n;
+-
+-	from = maybe_map(from, 0);
+-	if(from == 0)
+-		return(-1);
+-
+-	strncpy(to, (void *) from, len);
+-	n = strnlen(to, len);
+-	*to_ptr += n;
+-
+-	if(n < len) 
+-	        return(1);
+-	return(0);
+-}
+-
+-static inline int strncpy_from_user_skas(char *dst, const char *src, int count)
+-{
+-	int n;
+-	char *ptr = dst;
+-
+-	if(segment_eq(get_fs(), KERNEL_DS)){
+-		strncpy(dst, src, count);
+-		return(strnlen(dst, count));
+-	}
+-
+-	if(!access_ok_skas(VERIFY_READ, src, 1))
+-		return(-EFAULT);
+-
+-	n = buffer_op((unsigned long) src, count, strncpy_chunk_from_user, 
+-		      &ptr);
+-	if(n != 0)
+-		return(-EFAULT);
+-	return(strnlen(dst, count));
+-}
+-
+-static inline int clear_chunk(unsigned long addr, int len, void *unused)
+-{
+-	addr = maybe_map(addr, 1);
+-	if(addr == 0) 
+-		return(-1);
+-
+-	memset((void *) addr, 0, len);
+-	return(0);
+-}
+-
+-static inline int __clear_user_skas(void *mem, int len)
+-{
+-	return(buffer_op((unsigned long) mem, len, clear_chunk, NULL));
+-}
+-
+-static inline int clear_user_skas(void *mem, int len)
+-{
+-	if(segment_eq(get_fs(), KERNEL_DS)){
+-		memset(mem, 0, len);
+-		return(0);
+-	}
+-
+-	return(access_ok_skas(VERIFY_WRITE, mem, len) ? 
+-	       buffer_op((unsigned long) mem, len, clear_chunk, NULL) : len);
+-}
+-
+-static inline int strnlen_chunk(unsigned long str, int len, void *arg)
+-{
+-	int *len_ptr = arg, n;
+-
+-	str = maybe_map(str, 0);
+-	if(str == 0) 
+-		return(-1);
+-
+-	n = strnlen((void *) str, len);
+-	*len_ptr += n;
+-
+-	if(n < len)
+-		return(1);
+-	return(0);
+-}
+-
+-static inline int strnlen_user_skas(const void *str, int len)
+-{
+-	int count = 0, n;
+-
+-	if(segment_eq(get_fs(), KERNEL_DS))
+-		return(strnlen(str, len) + 1);
+-
+-	n = buffer_op((unsigned long) str, len, strnlen_chunk, &count);
+-	if(n == 0)
+-		return(count + 1);
+-	return(-EFAULT);
+-}
++extern int copy_from_user_skas(void *to, const void *from, int n);
++extern int copy_to_user_skas(void *to, const void *from, int n);
++extern int strncpy_from_user_skas(char *dst, const char *src, int count);
++extern int __clear_user_skas(void *mem, int len);
++extern int clear_user_skas(void *mem, int len);
++extern int strnlen_user_skas(const void *str, int len);
+ 
+ #endif
+ 
+diff -Naur a/arch/um/kernel/skas/Makefile b/arch/um/kernel/skas/Makefile
+--- a/arch/um/kernel/skas/Makefile	2004-01-08 22:17:52.000000000 -0500
++++ b/arch/um/kernel/skas/Makefile	2004-01-08 22:23:56.000000000 -0500
+@@ -5,20 +5,24 @@
+ 
+ obj-y = exec_kern.o exec_user.o mem.o mem_user.o mmu.o process.o \
+ 	process_kern.o syscall_kern.o syscall_user.o time.o tlb.o trap_user.o \
+-	sys-$(SUBARCH)/
++	uaccess.o sys-$(SUBARCH)/
++
++host-progs	:= util/mk_ptregs
++clean-files	:= include/skas_ptregs.h
+ 
+ USER_OBJS = $(filter %_user.o,$(obj-y)) process.o time.o
+ USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
+ 
+-include/skas_ptregs.h : util/mk_ptregs
+-	util/mk_ptregs > $@
+-
+-util/mk_ptregs :
+-	$(MAKE) -C util
++$(TOPDIR)/arch/um/include/skas_ptregs.h : $(src)/util/mk_ptregs
++	@echo -n '  Generating $@'
++	@$< > $@.tmp
++	@if [ -r $@ ] && cmp -s $@ $@.tmp; then \
++		echo ' (unchanged)'; \
++		rm -f $@.tmp; \
++	else \
++		echo ' (updated)'; \
++		mv -f $@.tmp $@; \
++	fi
+ 
+ $(USER_OBJS) : %.o: %.c
+ 	$(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
+-
+-clean :
+-	$(MAKE) -C util clean
+-	$(RM) -f include/skas_ptregs.h
+diff -Naur a/arch/um/kernel/skas/mem_user.c b/arch/um/kernel/skas/mem_user.c
+--- a/arch/um/kernel/skas/mem_user.c	2004-01-08 22:18:42.000000000 -0500
++++ b/arch/um/kernel/skas/mem_user.c	2004-01-08 22:24:31.000000000 -0500
+@@ -7,6 +7,7 @@
+ #include <sys/mman.h>
+ #include <sys/ptrace.h>
+ #include "mem_user.h"
++#include "mem.h"
+ #include "user.h"
+ #include "os.h"
+ #include "proc_mm.h"
+@@ -15,12 +16,12 @@
+ 	 int r, int w, int x)
+ {
+ 	struct proc_mm_op map;
+-	struct mem_region *region;
+-	int prot, n;
++	__u64 offset;
++	int prot, n, phys_fd;
+ 
+ 	prot = (r ? PROT_READ : 0) | (w ? PROT_WRITE : 0) | 
+ 		(x ? PROT_EXEC : 0);
+-	region = phys_region(phys);
++	phys_fd = phys_mapping(phys, &offset);
+ 
+ 	map = ((struct proc_mm_op) { .op 	= MM_MMAP,
+ 				     .u 	= 
+@@ -30,12 +31,12 @@
+ 					 .prot		= prot,
+ 					 .flags		= MAP_SHARED | 
+ 					                  MAP_FIXED,
+-					 .fd		= region->fd,
+-					 .offset	= phys_offset(phys)
++					 .fd		= phys_fd,
++					 .offset	= offset
+ 				       } } } );
+ 	n = os_write_file(fd, &map, sizeof(map));
+ 	if(n != sizeof(map)) 
+-		printk("map : /proc/mm map failed, errno = %d\n", errno);
++		printk("map : /proc/mm map failed, err = %d\n", -n);
+ }
+ 
+ int unmap(int fd, void *addr, int len)
+@@ -49,8 +50,13 @@
+ 					 { .addr 	= (unsigned long) addr,
+ 					   .len		= len } } } );
+ 	n = os_write_file(fd, &unmap, sizeof(unmap));
+-	if((n != 0) && (n != sizeof(unmap)))
+-		return(-errno);
++	if(n != sizeof(unmap)) {
++		if(n < 0) 
++			return(n);
++		else if(n > 0) 
++			return(-EIO);
++	}
++
+ 	return(0);
+ }
+ 
+@@ -71,11 +77,15 @@
+ 					   .prot	= prot } } } );
+ 
+ 	n = os_write_file(fd, &protect, sizeof(protect));
+-	if((n != 0) && (n != sizeof(protect))){
++	if(n != sizeof(protect)) {
++		if(n == 0) return(0);
++
+ 		if(must_succeed)
+-			panic("protect failed, errno = %d", errno);
+-		return(-errno);
++			panic("protect failed, err = %d", -n);
++
++		return(-EIO);
+ 	}
++
+ 	return(0);
+ }
+ 
+diff -Naur a/arch/um/kernel/skas/mmu.c b/arch/um/kernel/skas/mmu.c
+--- a/arch/um/kernel/skas/mmu.c	2004-01-08 22:33:46.000000000 -0500
++++ b/arch/um/kernel/skas/mmu.c	2004-01-08 22:36:57.000000000 -0500
+@@ -22,9 +22,11 @@
+ 	else from = -1;
+ 
+ 	mm->context.skas.mm_fd = new_mm(from);
+-	if(mm->context.skas.mm_fd < 0)
+-		panic("init_new_context_skas - new_mm failed, errno = %d\n",
+-		      mm->context.skas.mm_fd);
++	if(mm->context.skas.mm_fd < 0){
++		printk("init_new_context_skas - new_mm failed, errno = %d\n",
++		       mm->context.skas.mm_fd);
++		return(mm->context.skas.mm_fd);
++	}
+ 
+ 	return(0);
+ }
+diff -Naur a/arch/um/kernel/skas/process.c b/arch/um/kernel/skas/process.c
+--- a/arch/um/kernel/skas/process.c	2004-01-08 22:31:21.000000000 -0500
++++ b/arch/um/kernel/skas/process.c	2004-01-08 22:36:09.000000000 -0500
+@@ -4,6 +4,7 @@
+  */
+ 
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <errno.h>
+ #include <signal.h>
+ #include <setjmp.h>
+@@ -24,6 +25,18 @@
+ #include "os.h"
+ #include "proc_mm.h"
+ #include "skas_ptrace.h"
++#include "chan_user.h"
++
++int is_skas_winch(int pid, int fd, void *data)
++{
++	if(pid != getpid())
++		return(0);
++
++	register_winch_irq(-1, fd, -1, data);
++	return(1);
++}
++
++/* These are set once at boot time and not changed thereafter */
+ 
+ unsigned long exec_regs[FRAME_SIZE];
+ unsigned long exec_fp_regs[HOST_FP_SIZE];
+@@ -48,11 +61,11 @@
+ 	int err, syscall_nr, status;
+ 
+ 	syscall_nr = PT_SYSCALL_NR(regs->skas.regs);
++	UPT_SYSCALL_NR(regs) = syscall_nr;
+ 	if(syscall_nr < 1){
+ 		relay_signal(SIGTRAP, regs);
+ 		return;
+ 	}
+-	UPT_SYSCALL_NR(regs) = syscall_nr;
+ 
+ 	err = ptrace(PTRACE_POKEUSER, pid, PT_SYSCALL_NR_OFFSET, __NR_getpid);
+ 	if(err < 0)
+@@ -72,8 +85,6 @@
+ 	handle_syscall(regs);
+ }
+ 
+-int userspace_pid;
+-
+ static int userspace_tramp(void *arg)
+ {
+ 	init_new_thread_signals(0);
+@@ -83,7 +94,11 @@
+ 	return(0);
+ }
+ 
+-void start_userspace(void)
++/* Each element set once, and only accessed by a single processor anyway */
++#define NR_CPUS 1
++int userspace_pid[NR_CPUS];
++
++void start_userspace(int cpu)
+ {
+ 	void *stack;
+ 	unsigned long sp;
+@@ -114,21 +129,21 @@
+ 	if(munmap(stack, PAGE_SIZE) < 0)
+ 		panic("start_userspace : munmap failed, errno = %d\n", errno);
+ 
+-	userspace_pid = pid;
++	userspace_pid[cpu] = pid;
+ }
+ 
+ void userspace(union uml_pt_regs *regs)
+ {
+-	int err, status, op;
++	int err, status, op, pid = userspace_pid[0];
+ 
+ 	restore_registers(regs);
+ 		
+-	err = ptrace(PTRACE_SYSCALL, userspace_pid, 0, 0);
++	err = ptrace(PTRACE_SYSCALL, pid, 0, 0);
+ 	if(err)
+ 		panic("userspace - PTRACE_SYSCALL failed, errno = %d\n", 
+ 		       errno);
+ 	while(1){
+-		err = waitpid(userspace_pid, &status, WUNTRACED);
++		err = waitpid(pid, &status, WUNTRACED);
+ 		if(err < 0)
+ 			panic("userspace - waitpid failed, errno = %d\n", 
+ 			      errno);
+@@ -139,16 +154,17 @@
+ 		if(WIFSTOPPED(status)){
+ 		  	switch(WSTOPSIG(status)){
+ 			case SIGSEGV:
+-				handle_segv(userspace_pid);
++				handle_segv(pid);
+ 				break;
+ 			case SIGTRAP:
+-			        handle_trap(userspace_pid, regs);
++			        handle_trap(pid, regs);
+ 				break;
+ 			case SIGIO:
+ 			case SIGVTALRM:
+ 			case SIGILL:
+ 			case SIGBUS:
+ 			case SIGFPE:
++			case SIGWINCH:
+ 				user_signal(WSTOPSIG(status), regs);
+ 				break;
+ 			default:
+@@ -162,7 +178,7 @@
+ 
+ 		op = singlestepping_skas() ? PTRACE_SINGLESTEP : 
+ 			PTRACE_SYSCALL;
+-		err = ptrace(op, userspace_pid, 0, 0);
++		err = ptrace(op, pid, 0, 0);
+ 		if(err)
+ 			panic("userspace - PTRACE_SYSCALL failed, "
+ 			      "errno = %d\n", errno);
+@@ -177,7 +193,7 @@
+ 	*switch_buf_ptr = &switch_buf;
+ 	*fork_buf_ptr = &fork_buf;
+ 
+-	if(setjmp(fork_buf) == 0)
++	if(sigsetjmp(fork_buf, 1) == 0)
+ 		new_thread_proc(stack, handler);
+ 
+ 	remove_sigstack();
+@@ -189,16 +205,16 @@
+ 
+ 	*switch_buf = &buf;
+ 	fork_buf = fb;
+-	if(setjmp(buf) == 0)
+-		longjmp(*fork_buf, 1);
++	if(sigsetjmp(buf, 1) == 0)
++		siglongjmp(*fork_buf, 1);
+ }
+ 
+-static int move_registers(int int_op, int fp_op, union uml_pt_regs *regs,
+-			  unsigned long *fp_regs)
++static int move_registers(int pid, int int_op, int fp_op, 
++			  union uml_pt_regs *regs, unsigned long *fp_regs)
+ {
+-	if(ptrace(int_op, userspace_pid, 0, regs->skas.regs) < 0)
++	if(ptrace(int_op, pid, 0, regs->skas.regs) < 0)
+ 		return(-errno);
+-	if(ptrace(fp_op, userspace_pid, 0, fp_regs) < 0)
++	if(ptrace(fp_op, pid, 0, fp_regs) < 0)
+ 		return(-errno);
+ 	return(0);
+ }
+@@ -217,10 +233,11 @@
+ 		fp_regs = regs->skas.fp;
+ 	}
+ 
+-	err = move_registers(PTRACE_GETREGS, fp_op, regs, fp_regs);
++	err = move_registers(userspace_pid[0], PTRACE_GETREGS, fp_op, regs, 
++			     fp_regs);
+ 	if(err)
+ 		panic("save_registers - saving registers failed, errno = %d\n",
+-		      err);
++		      -err);
+ }
+ 
+ void restore_registers(union uml_pt_regs *regs)
+@@ -237,10 +254,11 @@
+ 		fp_regs = regs->skas.fp;
+ 	}
+ 
+-	err = move_registers(PTRACE_SETREGS, fp_op, regs, fp_regs);
++	err = move_registers(userspace_pid[0], PTRACE_SETREGS, fp_op, regs, 
++			     fp_regs);
+ 	if(err)
+ 		panic("restore_registers - saving registers failed, "
+-		      "errno = %d\n", err);
++		      "errno = %d\n", -err);
+ }
+ 
+ void switch_threads(void *me, void *next)
+@@ -248,8 +266,8 @@
+ 	jmp_buf my_buf, **me_ptr = me, *next_buf = next;
+ 	
+ 	*me_ptr = &my_buf;
+-	if(setjmp(my_buf) == 0)
+-		longjmp(*next_buf, 1);
++	if(sigsetjmp(my_buf, 1) == 0)
++		siglongjmp(*next_buf, 1);
+ }
+ 
+ static jmp_buf initial_jmpbuf;
+@@ -265,14 +283,14 @@
+ 	int n;
+ 
+ 	*fork_buf_ptr = &initial_jmpbuf;
+-	n = setjmp(initial_jmpbuf);
++	n = sigsetjmp(initial_jmpbuf, 1);
+ 	if(n == 0)
+ 		new_thread_proc((void *) stack, new_thread_handler);
+ 	else if(n == 1)
+ 		remove_sigstack();
+ 	else if(n == 2){
+ 		(*cb_proc)(cb_arg);
+-		longjmp(*cb_back, 1);
++		siglongjmp(*cb_back, 1);
+ 	}
+ 	else if(n == 3){
+ 		kmalloc_ok = 0;
+@@ -282,7 +300,7 @@
+ 		kmalloc_ok = 0;
+ 		return(1);
+ 	}
+-	longjmp(**switch_buf, 1);
++	siglongjmp(**switch_buf, 1);
+ }
+ 
+ void remove_sigstack(void)
+@@ -304,8 +322,8 @@
+ 	cb_back = &here;
+ 
+ 	block_signals();
+-	if(setjmp(here) == 0)
+-		longjmp(initial_jmpbuf, 2);
++	if(sigsetjmp(here, 1) == 0)
++		siglongjmp(initial_jmpbuf, 2);
+ 	unblock_signals();
+ 
+ 	cb_proc = NULL;
+@@ -316,22 +334,23 @@
+ void halt_skas(void)
+ {
+ 	block_signals();
+-	longjmp(initial_jmpbuf, 3);
++	siglongjmp(initial_jmpbuf, 3);
+ }
+ 
+ void reboot_skas(void)
+ {
+ 	block_signals();
+-	longjmp(initial_jmpbuf, 4);
++	siglongjmp(initial_jmpbuf, 4);
+ }
+ 
+ int new_mm(int from)
+ {
+ 	struct proc_mm_op copy;
+-	int n, fd = os_open_file("/proc/mm", of_write(OPENFLAGS()), 0);
++	int n, fd = os_open_file("/proc/mm", 
++				 of_cloexec(of_write(OPENFLAGS())), 0);
+ 
+ 	if(fd < 0)
+-		return(-errno);
++		return(fd);
+ 
+ 	if(from != -1){
+ 		copy = ((struct proc_mm_op) { .op 	= MM_COPY_SEGMENTS,
+@@ -340,8 +359,9 @@
+ 		n = os_write_file(fd, &copy, sizeof(copy));
+ 		if(n != sizeof(copy)) 
+ 			printk("new_mm : /proc/mm copy_segments failed, "
+-			       "errno = %d\n", errno);
++			       "err = %d\n", -n);
+ 	}
++
+ 	return(fd);
+ }
+ 
+@@ -349,7 +369,8 @@
+ {
+ 	int err;
+ 
+-	err = ptrace(PTRACE_SWITCH_MM, userspace_pid, 0, mm_fd);
++#warning need cpu pid in switch_mm_skas
++	err = ptrace(PTRACE_SWITCH_MM, userspace_pid[0], 0, mm_fd);
+ 	if(err)
+ 		panic("switch_mm_skas - PTRACE_SWITCH_MM failed, errno = %d\n",
+ 		      errno);
+@@ -357,7 +378,8 @@
+ 
+ void kill_off_processes_skas(void)
+ {
+-	os_kill_process(userspace_pid, 1);
++#warning need to loop over userspace_pids in kill_off_processes_skas
++	os_kill_process(userspace_pid[0], 1);
+ }
+ 
+ void init_registers(int pid)
+diff -Naur a/arch/um/kernel/skas/process_kern.c b/arch/um/kernel/skas/process_kern.c
+--- a/arch/um/kernel/skas/process_kern.c	2004-01-08 22:16:41.000000000 -0500
++++ b/arch/um/kernel/skas/process_kern.c	2004-01-08 22:22:45.000000000 -0500
+@@ -61,11 +61,13 @@
+ 	thread_wait(&current->thread.mode.skas.switch_buf, 
+ 		    current->thread.mode.skas.fork_buf);
+ 
+-#ifdef CONFIG_SMP
+-	schedule_tail(NULL);
+-#endif
++	if(current->thread.prev_sched != NULL)
++		schedule_tail(current->thread.prev_sched);
+ 	current->thread.prev_sched = NULL;
+ 
++	/* The return value is 1 if the kernel thread execs a process,
++	 * 0 if it just exits
++	 */
+ 	n = run_kernel_thread(fn, arg, &current->thread.exec_buf);
+ 	if(n == 1)
+ 		userspace(&current->thread.regs.regs);
+@@ -93,9 +95,8 @@
+ 		    current->thread.mode.skas.fork_buf);
+   	
+ 	force_flush_all();
+-#ifdef CONFIG_SMP
+-	schedule_tail(current->thread.prev_sched);
+-#endif
++	if(current->thread.prev_sched != NULL)
++		schedule_tail(current->thread.prev_sched);
+ 	current->thread.prev_sched = NULL;
+ 	unblock_signals();
+ 
+@@ -136,7 +137,7 @@
+ 
+ void init_idle_skas(void)
+ {
+-	cpu_tasks[current->thread_info->cpu].pid = os_getpid();
++	cpu_tasks[current_thread->cpu].pid = os_getpid();
+ 	default_idle();
+ }
+ 
+@@ -160,11 +161,11 @@
+ 
+ int start_uml_skas(void)
+ {
+-	start_userspace();
++	start_userspace(0);
+ 	capture_signal_stack();
++	uml_idle_timer();
+ 
+ 	init_new_thread_signals(1);
+-	idle_timer();
+ 
+ 	init_task.thread.request.u.thread.proc = start_kernel_proc;
+ 	init_task.thread.request.u.thread.arg = NULL;
+@@ -175,12 +176,14 @@
+ 
+ int external_pid_skas(struct task_struct *task)
+ {
+-	return(userspace_pid);
++#warning Need to look up userspace_pid by cpu	
++	return(userspace_pid[0]);
+ }
+ 
+ int thread_pid_skas(struct task_struct *task)
+ {
+-	return(userspace_pid);
++#warning Need to look up userspace_pid by cpu	
++	return(userspace_pid[0]);
+ }
+ 
+ /*
+diff -Naur a/arch/um/kernel/skas/syscall_kern.c b/arch/um/kernel/skas/syscall_kern.c
+--- a/arch/um/kernel/skas/syscall_kern.c	2004-01-08 22:24:03.000000000 -0500
++++ b/arch/um/kernel/skas/syscall_kern.c	2004-01-08 22:31:17.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* 
+- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2002 - 2003 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+diff -Naur a/arch/um/kernel/skas/sys-i386/sigcontext.c b/arch/um/kernel/skas/sys-i386/sigcontext.c
+--- a/arch/um/kernel/skas/sys-i386/sigcontext.c	2004-01-08 22:13:52.000000000 -0500
++++ b/arch/um/kernel/skas/sys-i386/sigcontext.c	2004-01-08 22:18:57.000000000 -0500
+@@ -12,10 +12,9 @@
+ #include "kern_util.h"
+ #include "user.h"
+ #include "sigcontext.h"
++#include "mode.h"
+ 
+-extern int userspace_pid;
+-
+-int copy_sc_from_user_skas(union uml_pt_regs *regs, void *from_ptr)
++int copy_sc_from_user_skas(int pid, union uml_pt_regs *regs, void *from_ptr)
+ {
+   	struct sigcontext sc, *from = from_ptr;
+ 	unsigned long fpregs[FP_FRAME_SIZE];
+@@ -41,13 +40,12 @@
+ 	regs->skas.regs[EIP] = sc.eip;
+ 	regs->skas.regs[CS] = sc.cs;
+ 	regs->skas.regs[EFL] = sc.eflags;
+-	regs->skas.regs[UESP] = sc.esp_at_signal;
+ 	regs->skas.regs[SS] = sc.ss;
+ 	regs->skas.fault_addr = sc.cr2;
+ 	regs->skas.fault_type = FAULT_WRITE(sc.err);
+ 	regs->skas.trap_type = sc.trapno;
+ 
+-	err = ptrace(PTRACE_SETFPREGS, userspace_pid, 0, fpregs);
++	err = ptrace(PTRACE_SETFPREGS, pid, 0, fpregs);
+ 	if(err < 0){
+ 	  	printk("copy_sc_to_user - PTRACE_SETFPREGS failed, "
+ 		       "errno = %d\n", errno);
+@@ -57,8 +55,9 @@
+ 	return(0);
+ }
+ 
+-int copy_sc_to_user_skas(void *to_ptr, void *fp, union uml_pt_regs *regs, 
+-			 unsigned long fault_addr, int fault_type)
++int copy_sc_to_user_skas(int pid, void *to_ptr, void *fp, 
++			 union uml_pt_regs *regs, unsigned long fault_addr, 
++			 int fault_type)
+ {
+   	struct sigcontext sc, *to = to_ptr;
+ 	struct _fpstate *to_fp;
+@@ -86,7 +85,7 @@
+ 	sc.err = TO_SC_ERR(fault_type);
+ 	sc.trapno = regs->skas.trap_type;
+ 
+-	err = ptrace(PTRACE_GETFPREGS, userspace_pid, 0, fpregs);
++	err = ptrace(PTRACE_GETFPREGS, pid, 0, fpregs);
+ 	if(err < 0){
+ 	  	printk("copy_sc_to_user - PTRACE_GETFPREGS failed, "
+ 		       "errno = %d\n", errno);
+diff -Naur a/arch/um/kernel/skas/trap_user.c b/arch/um/kernel/skas/trap_user.c
+--- a/arch/um/kernel/skas/trap_user.c	2004-01-08 22:20:11.000000000 -0500
++++ b/arch/um/kernel/skas/trap_user.c	2004-01-08 22:26:28.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* 
+- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2002 - 2003 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+@@ -41,8 +41,6 @@
+ {
+ 	struct signal_info *info;
+ 
+-	if(sig == SIGVTALRM)
+-		missed_ticks[cpu()]++;
+ 	regs->skas.is_user = 1;
+ 	regs->skas.fault_addr = 0;
+ 	regs->skas.fault_type = 0;
+diff -Naur a/arch/um/kernel/skas/uaccess.c b/arch/um/kernel/skas/uaccess.c
+--- a/arch/um/kernel/skas/uaccess.c	1969-12-31 19:00:00.000000000 -0500
++++ b/arch/um/kernel/skas/uaccess.c	2004-01-08 22:33:48.000000000 -0500
+@@ -0,0 +1,219 @@
++/* 
++ * Copyright (C) 2002 - 2003 Jeff Dike (jdike@addtoit.com)
++ * Licensed under the GPL
++ */
++
++#include "linux/stddef.h"
++#include "linux/kernel.h"
++#include "linux/string.h"
++#include "linux/fs.h"
++#include "linux/highmem.h"
++#include "asm/page.h"
++#include "asm/pgtable.h"
++#include "asm/uaccess.h"
++#include "kern_util.h"
++
++extern void *um_virt_to_phys(struct task_struct *task, unsigned long addr, 
++			     pte_t *pte_out);
++
++static unsigned long maybe_map(unsigned long virt, int is_write)
++{
++	pte_t pte;
++	int err;
++
++	void *phys = um_virt_to_phys(current, virt, &pte);
++	int dummy_code;
++
++	if(IS_ERR(phys) || (is_write && !pte_write(pte))){
++		err = handle_page_fault(virt, 0, is_write, 0, &dummy_code);
++		if(err)
++			return(0);
++		phys = um_virt_to_phys(current, virt, NULL);
++	}
++	return((unsigned long) phys);
++}
++
++static int do_op(unsigned long addr, int len, int is_write, 
++		 int (*op)(unsigned long addr, int len, void *arg), void *arg)
++{
++	struct page *page;
++	int n;
++
++	addr = maybe_map(addr, is_write);
++	if(addr == -1)
++		return(-1);
++
++	page = phys_to_page(addr);
++	addr = (unsigned long) kmap(page) + (addr & ~PAGE_MASK);
++	n = (*op)(addr, len, arg);
++	kunmap(page);
++
++	return(n);
++}
++
++static int buffer_op(unsigned long addr, int len, int is_write,
++		     int (*op)(unsigned long addr, int len, void *arg),
++		     void *arg)
++{
++	int size = min(PAGE_ALIGN(addr) - addr, (unsigned long) len);
++	int remain = len, n;
++
++	n = do_op(addr, size, is_write, op, arg);
++	if(n != 0)
++		return(n < 0 ? remain : 0);
++
++	addr += size;
++	remain -= size;
++	if(remain == 0) 
++		return(0);
++
++	while(addr < ((addr + remain) & PAGE_MASK)){
++		n = do_op(addr, PAGE_SIZE, is_write, op, arg);
++		if(n != 0)
++			return(n < 0 ? remain : 0);
++
++		addr += PAGE_SIZE;
++		remain -= PAGE_SIZE;
++	}
++	if(remain == 0)
++		return(0);
++
++	n = do_op(addr, remain, is_write, op, arg);
++	if(n != 0)
++		return(n < 0 ? remain : 0);
++	return(0);
++}
++
++static int copy_chunk_from_user(unsigned long from, int len, void *arg)
++{
++	unsigned long *to_ptr = arg, to = *to_ptr;
++
++	memcpy((void *) to, (void *) from, len);
++	*to_ptr += len;
++	return(0);
++}
++
++int copy_from_user_skas(void *to, const void *from, int n)
++{
++	if(segment_eq(get_fs(), KERNEL_DS)){
++		memcpy(to, from, n);
++		return(0);
++	}
++
++	return(access_ok_skas(VERIFY_READ, from, n) ?
++	       buffer_op((unsigned long) from, n, 0, copy_chunk_from_user, &to):
++	       n);
++}
++
++static int copy_chunk_to_user(unsigned long to, int len, void *arg)
++{
++	unsigned long *from_ptr = arg, from = *from_ptr;
++
++	memcpy((void *) to, (void *) from, len);
++	*from_ptr += len;
++	return(0);
++}
++
++int copy_to_user_skas(void *to, const void *from, int n)
++{
++	if(segment_eq(get_fs(), KERNEL_DS)){
++		memcpy(to, from, n);
++		return(0);
++	}
++
++	return(access_ok_skas(VERIFY_WRITE, to, n) ?
++	       buffer_op((unsigned long) to, n, 1, copy_chunk_to_user, &from) :
++	       n);
++}
++
++static int strncpy_chunk_from_user(unsigned long from, int len, void *arg)
++{
++	char **to_ptr = arg, *to = *to_ptr;
++	int n;
++
++	strncpy(to, (void *) from, len);
++	n = strnlen(to, len);
++	*to_ptr += n;
++
++	if(n < len) 
++	        return(1);
++	return(0);
++}
++
++int strncpy_from_user_skas(char *dst, const char *src, int count)
++{
++	int n;
++	char *ptr = dst;
++
++	if(segment_eq(get_fs(), KERNEL_DS)){
++		strncpy(dst, src, count);
++		return(strnlen(dst, count));
++	}
++
++	if(!access_ok_skas(VERIFY_READ, src, 1))
++		return(-EFAULT);
++
++	n = buffer_op((unsigned long) src, count, 0, strncpy_chunk_from_user, 
++		      &ptr);
++	if(n != 0)
++		return(-EFAULT);
++	return(strnlen(dst, count));
++}
++
++static int clear_chunk(unsigned long addr, int len, void *unused)
++{
++	memset((void *) addr, 0, len);
++	return(0);
++}
++
++int __clear_user_skas(void *mem, int len)
++{
++	return(buffer_op((unsigned long) mem, len, 1, clear_chunk, NULL));
++}
++
++int clear_user_skas(void *mem, int len)
++{
++	if(segment_eq(get_fs(), KERNEL_DS)){
++		memset(mem, 0, len);
++		return(0);
++	}
++
++	return(access_ok_skas(VERIFY_WRITE, mem, len) ? 
++	       buffer_op((unsigned long) mem, len, 1, clear_chunk, NULL) : len);
++}
++
++static int strnlen_chunk(unsigned long str, int len, void *arg)
++{
++	int *len_ptr = arg, n;
++
++	n = strnlen((void *) str, len);
++	*len_ptr += n;
++
++	if(n < len)
++		return(1);
++	return(0);
++}
++
++int strnlen_user_skas(const void *str, int len)
++{
++	int count = 0, n;
++
++	if(segment_eq(get_fs(), KERNEL_DS))
++		return(strnlen(str, len) + 1);
++
++	n = buffer_op((unsigned long) str, len, 0, strnlen_chunk, &count);
++	if(n == 0)
++		return(count + 1);
++	return(-EFAULT);
++}
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/arch/um/kernel/skas/util/Makefile b/arch/um/kernel/skas/util/Makefile
+--- a/arch/um/kernel/skas/util/Makefile	2004-01-08 22:28:48.000000000 -0500
++++ b/arch/um/kernel/skas/util/Makefile	2004-01-08 22:35:00.000000000 -0500
+@@ -1,10 +1,10 @@
+ all: mk_ptregs
+ 
+ mk_ptregs : mk_ptregs.o
+-	$(CC) -o mk_ptregs mk_ptregs.o
++	$(HOSTCC) -o mk_ptregs mk_ptregs.o
+ 
+ mk_ptregs.o : mk_ptregs.c
+-	$(CC) -c $< 
++	$(HOSTCC) -c $< 
+ 
+ clean : 
+ 	$(RM) -f mk_ptregs *.o *~
+diff -Naur a/arch/um/kernel/skas/util/mk_ptregs.c b/arch/um/kernel/skas/util/mk_ptregs.c
+--- a/arch/um/kernel/skas/util/mk_ptregs.c	2004-01-08 22:19:28.000000000 -0500
++++ b/arch/um/kernel/skas/util/mk_ptregs.c	2004-01-08 22:25:46.000000000 -0500
+@@ -1,3 +1,4 @@
++#include <stdio.h>
+ #include <asm/ptrace.h>
+ #include <asm/user.h>
+ 
+diff -Naur a/arch/um/kernel/smp.c b/arch/um/kernel/smp.c
+--- a/arch/um/kernel/smp.c	2004-01-08 22:16:25.000000000 -0500
++++ b/arch/um/kernel/smp.c	2004-01-08 22:22:29.000000000 -0500
+@@ -1,9 +1,15 @@
+ /* 
+- * Copyright (C) 2000 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+ #include "linux/config.h"
++#include "linux/percpu.h"
++#include "asm/pgalloc.h"
++#include "asm/tlb.h"
++
++/* For some reason, mmu_gathers are referenced when CONFIG_SMP is off. */
++DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
+ 
+ #ifdef CONFIG_SMP
+ 
+@@ -23,7 +29,7 @@
+ #include "os.h"
+ 
+ /* CPU online map, set by smp_boot_cpus */
+-unsigned long cpu_online_map = cpumask_of_cpu(0);
++unsigned long cpu_online_map = CPU_MASK_NONE;
+ 
+ EXPORT_SYMBOL(cpu_online_map);
+ 
+@@ -55,7 +61,7 @@
+ 
+ void smp_send_reschedule(int cpu)
+ {
+-	write(cpu_data[cpu].ipi_pipe[1], "R", 1);
++	os_write_file(cpu_data[cpu].ipi_pipe[1], "R", 1);
+ 	num_reschedules_sent++;
+ }
+ 
+@@ -100,35 +106,34 @@
+ 
+ 	printk(KERN_INFO "Stopping all CPUs...");
+ 	for(i = 0; i < num_online_cpus(); i++){
+-		if(i == current->thread_info->cpu)
++		if(i == current_thread->cpu)
+ 			continue;
+-		write(cpu_data[i].ipi_pipe[1], "S", 1);
++		os_write_file(cpu_data[i].ipi_pipe[1], "S", 1);
+ 	}
+ 	printk("done\n");
+ }
+ 
+-static cpumask_t smp_commenced_mask;
+-static cpumask_t smp_callin_map = CPU_MASK_NONE;
++static cpumask_t smp_commenced_mask = CPU_MASK_NONE;
++static cpumask_t cpu_callin_map = CPU_MASK_NONE;
+ 
+ static int idle_proc(void *cpup)
+ {
+ 	int cpu = (int) cpup, err;
+ 
+ 	err = os_pipe(cpu_data[cpu].ipi_pipe, 1, 1);
+-	if(err)
+-		panic("CPU#%d failed to create IPI pipe, errno = %d", cpu, 
+-		      -err);
++	if(err < 0)
++		panic("CPU#%d failed to create IPI pipe, err = %d", cpu, -err);
+ 
+ 	activate_ipi(cpu_data[cpu].ipi_pipe[0], 
+ 		     current->thread.mode.tt.extern_pid);
+  
+ 	wmb();
+-	if (cpu_test_and_set(cpu, &smp_callin_map)) {
++	if (cpu_test_and_set(cpu, cpu_callin_map)) {
+ 		printk("huh, CPU#%d already present??\n", cpu);
+ 		BUG();
+ 	}
+ 
+-	while (!cpu_isset(cpu, &smp_commenced_mask))
++	while (!cpu_isset(cpu, smp_commenced_mask))
+ 		cpu_relax();
+ 
+ 	cpu_set(cpu, cpu_online_map);
+@@ -143,16 +148,20 @@
+ 
+         current->thread.request.u.thread.proc = idle_proc;
+         current->thread.request.u.thread.arg = (void *) cpu;
+-	new_task = do_fork(CLONE_VM | CLONE_IDLETASK, 0, NULL, 0, NULL, NULL);
+-	if(IS_ERR(new_task)) panic("do_fork failed in idle_thread");
++	new_task = copy_process(CLONE_VM | CLONE_IDLETASK, 0, NULL, 0, NULL, 
++				NULL);
++	if(IS_ERR(new_task)) 
++		panic("copy_process failed in idle_thread, error = %ld",
++		      PTR_ERR(new_task));
+ 
+ 	cpu_tasks[cpu] = ((struct cpu_task) 
+ 		          { .pid = 	new_task->thread.mode.tt.extern_pid,
+ 			    .task = 	new_task } );
+ 	idle_threads[cpu] = new_task;
+-	CHOOSE_MODE(write(new_task->thread.mode.tt.switch_pipe[1], &c, 
++	CHOOSE_MODE(os_write_file(new_task->thread.mode.tt.switch_pipe[1], &c, 
+ 			  sizeof(c)),
+ 		    ({ panic("skas mode doesn't support SMP"); }));
++	wake_up_forked_process(new_task);
+ 	return(new_task);
+ }
+ 
+@@ -160,15 +169,17 @@
+ {
+ 	struct task_struct *idle;
+ 	unsigned long waittime;
+-	int err, cpu;
++	int err, cpu, me = smp_processor_id();
+ 
+-	cpu_set(0, cpu_online_map);
+-	cpu_set(0, smp_callin_map);
++	cpu_clear(me, cpu_online_map);
++	cpu_set(me, cpu_online_map);
++	cpu_set(me, cpu_callin_map);
+ 
+-	err = os_pipe(cpu_data[0].ipi_pipe, 1, 1);
+-	if(err)	panic("CPU#0 failed to create IPI pipe, errno = %d", -err);
++	err = os_pipe(cpu_data[me].ipi_pipe, 1, 1);
++	if(err < 0)
++		panic("CPU#0 failed to create IPI pipe, errno = %d", -err);
+ 
+-	activate_ipi(cpu_data[0].ipi_pipe[0], 
++	activate_ipi(cpu_data[me].ipi_pipe[0], 
+ 		     current->thread.mode.tt.extern_pid);
+ 
+ 	for(cpu = 1; cpu < ncpus; cpu++){
+@@ -180,10 +191,10 @@
+ 		unhash_process(idle);
+ 
+ 		waittime = 200000000;
+-		while (waittime-- && !cpu_isset(cpu, smp_callin_map))
++		while (waittime-- && !cpu_isset(cpu, cpu_callin_map))
+ 			cpu_relax();
+ 
+-		if (cpu_isset(cpu, smp_callin_map))
++		if (cpu_isset(cpu, cpu_callin_map))
+ 			printk("done\n");
+ 		else printk("failed\n");
+ 	}
+@@ -216,7 +227,7 @@
+ 	int fd;
+ 
+ 	fd = cpu_data[cpu].ipi_pipe[0];
+-	while (read(fd, &c, 1) == 1) {
++	while (os_read_file(fd, &c, 1) == 1) {
+ 		switch (c) {
+ 		case 'C':
+ 			smp_call_function_slave(cpu);
+@@ -273,9 +284,9 @@
+ 	info = _info;
+ 
+ 	for (i=0;i<NR_CPUS;i++)
+-		if((i != current->thread_info->cpu) && 
++		if((i != current_thread->cpu) && 
+ 		   cpu_isset(i, cpu_online_map))
+-			write(cpu_data[i].ipi_pipe[1], "C", 1);
++			os_write_file(cpu_data[i].ipi_pipe[1], "C", 1);
+ 
+ 	while (atomic_read(&scf_started) != cpus)
+ 		barrier();
+diff -Naur a/arch/um/kernel/syscall_kern.c b/arch/um/kernel/syscall_kern.c
+--- a/arch/um/kernel/syscall_kern.c	2004-01-08 22:26:00.000000000 -0500
++++ b/arch/um/kernel/syscall_kern.c	2004-01-08 22:33:41.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* 
+- * Copyright (C) 2000 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+@@ -35,39 +35,40 @@
+ 
+ long sys_fork(void)
+ {
+-	struct task_struct *p;
++	long ret;
+ 
+ 	current->thread.forking = 1;
+-        p = do_fork(SIGCHLD, 0, NULL, 0, NULL, NULL);
++        ret = do_fork(SIGCHLD, 0, NULL, 0, NULL, NULL);
+ 	current->thread.forking = 0;
+-	return(IS_ERR(p) ? PTR_ERR(p) : p->pid);
++	return(ret);
+ }
+ 
+-long sys_clone(unsigned long clone_flags, unsigned long newsp)
++long sys_clone(unsigned long clone_flags, unsigned long newsp, 
++	       int *parent_tid, int *child_tid)
+ {
+-	struct task_struct *p;
++	long ret;
+ 
+ 	current->thread.forking = 1;
+-	p = do_fork(clone_flags, newsp, NULL, 0, NULL, NULL);
++	ret = do_fork(clone_flags, newsp, NULL, 0, parent_tid, child_tid);
+ 	current->thread.forking = 0;
+-	return(IS_ERR(p) ? PTR_ERR(p) : p->pid);
++	return(ret);
+ }
+ 
+ long sys_vfork(void)
+ {
+-	struct task_struct *p;
++	long ret;
+ 
+ 	current->thread.forking = 1;
+-	p = do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, 0, NULL, 0, NULL, NULL);
++	ret = do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, 0, NULL, 0, NULL, 
++		      NULL);
+ 	current->thread.forking = 0;
+-	return(IS_ERR(p) ? PTR_ERR(p) : p->pid);
++	return(ret);
+ }
+ 
+ /* common code for old and new mmaps */
+-static inline long do_mmap2(
+-	unsigned long addr, unsigned long len,
+-	unsigned long prot, unsigned long flags,
+-	unsigned long fd, unsigned long pgoff)
++long do_mmap2(struct mm_struct *mm, unsigned long addr, unsigned long len,
++	      unsigned long prot, unsigned long flags, unsigned long fd,
++	      unsigned long pgoff)
+ {
+ 	int error = -EBADF;
+ 	struct file * file = NULL;
+@@ -79,9 +80,9 @@
+ 			goto out;
+ 	}
+ 
+-	down_write(&current->mm->mmap_sem);
+-	error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
+-	up_write(&current->mm->mmap_sem);
++	down_write(&mm->mmap_sem);
++	error = do_mmap_pgoff(mm, file, addr, len, prot, flags, pgoff);
++	up_write(&mm->mmap_sem);
+ 
+ 	if (file)
+ 		fput(file);
+@@ -93,7 +94,7 @@
+ 	       unsigned long prot, unsigned long flags,
+ 	       unsigned long fd, unsigned long pgoff)
+ {
+-	return do_mmap2(addr, len, prot, flags, fd, pgoff);
++	return do_mmap2(current->mm, addr, len, prot, flags, fd, pgoff);
+ }
+ 
+ /*
+@@ -120,7 +121,8 @@
+ 	if (offset & ~PAGE_MASK)
+ 		goto out;
+ 
+-	err = do_mmap2(addr, len, prot, flags, fd, offset >> PAGE_SHIFT);
++	err = do_mmap2(current->mm, addr, len, prot, flags, fd, 
++		       offset >> PAGE_SHIFT);
+  out:
+ 	return err;
+ }
+@@ -135,43 +137,12 @@
+ 
+         error = do_pipe(fd);
+         if (!error) {
+-                if (copy_to_user(fildes, fd, 2*sizeof(int)))
++		if (copy_to_user(fildes, fd, sizeof(fd)))
+                         error = -EFAULT;
+         }
+         return error;
+ }
+ 
+-int sys_sigaction(int sig, const struct old_sigaction *act,
+-			 struct old_sigaction *oact)
+-{
+-	struct k_sigaction new_ka, old_ka;
+-	int ret;
+-
+-	if (act) {
+-		old_sigset_t mask;
+-		if (verify_area(VERIFY_READ, act, sizeof(*act)) ||
+-		    __get_user(new_ka.sa.sa_handler, &act->sa_handler) ||
+-		    __get_user(new_ka.sa.sa_restorer, &act->sa_restorer))
+-			return -EFAULT;
+-		__get_user(new_ka.sa.sa_flags, &act->sa_flags);
+-		__get_user(mask, &act->sa_mask);
+-		siginitset(&new_ka.sa.sa_mask, mask);
+-	}
+-
+-	ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
+-
+-	if (!ret && oact) {
+-		if (verify_area(VERIFY_WRITE, oact, sizeof(*oact)) ||
+-		    __put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||
+-		    __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer))
+-			return -EFAULT;
+-		__put_user(old_ka.sa.sa_flags, &oact->sa_flags);
+-		__put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask);
+-	}
+-
+-	return ret;
+-}
+-
+ /*
+  * sys_ipc() is the de-multiplexer for the SysV IPC calls..
+  *
+@@ -253,7 +224,7 @@
+ 		return sys_shmctl (first, second,
+ 				   (struct shmid_ds *) ptr);
+ 	default:
+-		return -EINVAL;
++		return -ENOSYS;
+ 	}
+ }
+ 
+@@ -302,11 +273,6 @@
+ 	return error;
+ }
+ 
+-int sys_sigaltstack(const stack_t *uss, stack_t *uoss)
+-{
+-	return(do_sigaltstack(uss, uoss, PT_REGS_SP(&current->thread.regs)));
+-}
+-
+ long execute_syscall(void *r)
+ {
+ 	return(CHOOSE_MODE_PROC(execute_syscall_tt, execute_syscall_skas, r));
+diff -Naur a/arch/um/kernel/sys_call_table.c b/arch/um/kernel/sys_call_table.c
+--- a/arch/um/kernel/sys_call_table.c	2004-01-08 22:28:47.000000000 -0500
++++ b/arch/um/kernel/sys_call_table.c	2004-01-08 22:35:00.000000000 -0500
+@@ -5,7 +5,6 @@
+ 
+ #include "linux/config.h"
+ #include "linux/unistd.h"
+-#include "linux/version.h"
+ #include "linux/sys.h"
+ #include "linux/swap.h"
+ #include "linux/sysctl.h"
+@@ -219,15 +218,30 @@
+ extern syscall_handler_t sys_gettid;
+ extern syscall_handler_t sys_readahead;
+ extern syscall_handler_t sys_tkill;
++extern syscall_handler_t sys_setxattr;
++extern syscall_handler_t sys_lsetxattr;
++extern syscall_handler_t sys_fsetxattr;
++extern syscall_handler_t sys_getxattr;
++extern syscall_handler_t sys_lgetxattr;
++extern syscall_handler_t sys_fgetxattr;
++extern syscall_handler_t sys_listxattr;
++extern syscall_handler_t sys_llistxattr;
++extern syscall_handler_t sys_flistxattr;
++extern syscall_handler_t sys_removexattr;
++extern syscall_handler_t sys_lremovexattr;
++extern syscall_handler_t sys_fremovexattr;
+ extern syscall_handler_t sys_sendfile64;
+ extern syscall_handler_t sys_futex;
+ extern syscall_handler_t sys_sched_setaffinity;
+ extern syscall_handler_t sys_sched_getaffinity;
++extern syscall_handler_t sys_set_thread_area;
++extern syscall_handler_t sys_get_thread_area;
+ extern syscall_handler_t sys_io_setup;
+ extern syscall_handler_t sys_io_destroy;
+ extern syscall_handler_t sys_io_getevents;
+ extern syscall_handler_t sys_io_submit;
+ extern syscall_handler_t sys_io_cancel;
++extern syscall_handler_t sys_fadvise64;
+ extern syscall_handler_t sys_exit_group;
+ extern syscall_handler_t sys_lookup_dcookie;
+ extern syscall_handler_t sys_epoll_create;
+@@ -235,6 +249,20 @@
+ extern syscall_handler_t sys_epoll_wait;
+ extern syscall_handler_t sys_remap_file_pages;
+ extern syscall_handler_t sys_set_tid_address;
++extern syscall_handler_t sys_timer_create;
++extern syscall_handler_t sys_timer_settime;
++extern syscall_handler_t sys_timer_gettime;
++extern syscall_handler_t sys_timer_getoverrun;
++extern syscall_handler_t sys_timer_delete;
++extern syscall_handler_t sys_clock_settime;
++extern syscall_handler_t sys_clock_gettime;
++extern syscall_handler_t sys_clock_getres;
++extern syscall_handler_t sys_clock_nanosleep;
++extern syscall_handler_t sys_statfs64;
++extern syscall_handler_t sys_fstatfs64;
++extern syscall_handler_t sys_tgkill;
++extern syscall_handler_t sys_utimes;
++extern syscall_handler_t sys_fadvise64_64;
+ 
+ #ifdef CONFIG_NFSD
+ #define NFSSERVCTL sys_nfsservctl
+@@ -246,7 +274,7 @@
+ extern syscall_handler_t um_time;
+ extern syscall_handler_t um_stime;
+ 
+-#define LAST_GENERIC_SYSCALL __NR_set_tid_address
++#define LAST_GENERIC_SYSCALL __NR_vserver
+ 
+ #if LAST_GENERIC_SYSCALL > LAST_ARCH_SYSCALL
+ #define LAST_SYSCALL LAST_GENERIC_SYSCALL
+@@ -455,32 +483,37 @@
+ 	[ __NR_stat64 ] = sys_stat64,
+ 	[ __NR_lstat64 ] = sys_lstat64,
+ 	[ __NR_fstat64 ] = sys_fstat64,
+-	[ __NR_fcntl64 ] = sys_fcntl64,
+ 	[ __NR_getdents64 ] = sys_getdents64,
++	[ __NR_fcntl64 ] = sys_fcntl64,
++	[ 223 ] = sys_ni_syscall,
+ 	[ __NR_gettid ] = sys_gettid,
+ 	[ __NR_readahead ] = sys_readahead,
+-	[ __NR_setxattr ] = sys_ni_syscall,
+-	[ __NR_lsetxattr ] = sys_ni_syscall,
+-	[ __NR_fsetxattr ] = sys_ni_syscall,
+-	[ __NR_getxattr ] = sys_ni_syscall,
+-	[ __NR_lgetxattr ] = sys_ni_syscall,
+-	[ __NR_fgetxattr ] = sys_ni_syscall,
+-	[ __NR_listxattr ] = sys_ni_syscall,
+-	[ __NR_llistxattr ] = sys_ni_syscall,
+-	[ __NR_flistxattr ] = sys_ni_syscall,
+-	[ __NR_removexattr ] = sys_ni_syscall,
+-	[ __NR_lremovexattr ] = sys_ni_syscall,
+-	[ __NR_fremovexattr ] = sys_ni_syscall,
++	[ __NR_setxattr ] = sys_setxattr,
++	[ __NR_lsetxattr ] = sys_lsetxattr,
++	[ __NR_fsetxattr ] = sys_fsetxattr,
++	[ __NR_getxattr ] = sys_getxattr,
++	[ __NR_lgetxattr ] = sys_lgetxattr,
++	[ __NR_fgetxattr ] = sys_fgetxattr,
++	[ __NR_listxattr ] = sys_listxattr,
++	[ __NR_llistxattr ] = sys_llistxattr,
++	[ __NR_flistxattr ] = sys_flistxattr,
++	[ __NR_removexattr ] = sys_removexattr,
++	[ __NR_lremovexattr ] = sys_lremovexattr,
++	[ __NR_fremovexattr ] = sys_fremovexattr,
+ 	[ __NR_tkill ] = sys_tkill,
+ 	[ __NR_sendfile64 ] = sys_sendfile64,
+ 	[ __NR_futex ] = sys_futex,
+ 	[ __NR_sched_setaffinity ] = sys_sched_setaffinity,
+ 	[ __NR_sched_getaffinity ] = sys_sched_getaffinity,
++	[ __NR_set_thread_area ] = sys_ni_syscall,
++	[ __NR_get_thread_area ] = sys_ni_syscall,
+ 	[ __NR_io_setup ] = sys_io_setup,
+ 	[ __NR_io_destroy ] = sys_io_destroy,
+ 	[ __NR_io_getevents ] = sys_io_getevents,
+ 	[ __NR_io_submit ] = sys_io_submit,
+ 	[ __NR_io_cancel ] = sys_io_cancel,
++	[ __NR_fadvise64 ] = sys_fadvise64,
++	[ 251 ] = sys_ni_syscall,
+ 	[ __NR_exit_group ] = sys_exit_group,
+ 	[ __NR_lookup_dcookie ] = sys_lookup_dcookie,
+ 	[ __NR_epoll_create ] = sys_epoll_create,
+@@ -488,6 +521,21 @@
+ 	[ __NR_epoll_wait ] = sys_epoll_wait,
+         [ __NR_remap_file_pages ] = sys_remap_file_pages,
+         [ __NR_set_tid_address ] = sys_set_tid_address,
++	[ __NR_timer_create ] = sys_timer_create,
++	[ __NR_timer_settime ] = sys_timer_settime,
++	[ __NR_timer_gettime ] = sys_timer_gettime,
++	[ __NR_timer_getoverrun ] = sys_timer_getoverrun,
++	[ __NR_timer_delete ] = sys_timer_delete,
++	[ __NR_clock_settime ] = sys_clock_settime,
++	[ __NR_clock_gettime ] = sys_clock_gettime,
++	[ __NR_clock_getres ] = sys_clock_getres,
++	[ __NR_clock_nanosleep ] = sys_clock_nanosleep,
++	[ __NR_statfs64 ] = sys_statfs64,
++	[ __NR_fstatfs64 ] = sys_fstatfs64,
++	[ __NR_tgkill ] = sys_tgkill,
++	[ __NR_utimes ] = sys_utimes,
++	[ __NR_fadvise64_64 ] = sys_fadvise64_64,
++	[ __NR_vserver ] = sys_ni_syscall,
+ 
+ 	ARCH_SYSCALLS
+ 	[ LAST_SYSCALL + 1 ... NR_syscalls ] = 
+diff -Naur a/arch/um/kernel/sysrq.c b/arch/um/kernel/sysrq.c
+--- a/arch/um/kernel/sysrq.c	2004-01-08 22:18:31.000000000 -0500
++++ b/arch/um/kernel/sysrq.c	2004-01-08 22:24:21.000000000 -0500
+@@ -55,6 +55,14 @@
+ 	show_trace((unsigned long *)esp);
+ }
+ 
++void show_stack(struct task_struct *task, unsigned long *sp)
++{
++	if(task)
++		show_trace_task(task);
++	else
++		show_trace(sp);
++}
++
+ /*
+  * Overrides for Emacs so that we follow Linus's tabbing style.
+  * Emacs will notice this stuff at the end of the file and automatically
+diff -Naur a/arch/um/kernel/tempfile.c b/arch/um/kernel/tempfile.c
+--- a/arch/um/kernel/tempfile.c	2004-01-08 22:22:40.000000000 -0500
++++ b/arch/um/kernel/tempfile.c	2004-01-08 22:29:35.000000000 -0500
+@@ -28,6 +28,7 @@
+ 	}
+ 	if((dir == NULL) || (*dir == '\0')) 
+ 		dir = "/tmp";
++
+ 	tempdir = malloc(strlen(dir) + 2);
+ 	if(tempdir == NULL){
+ 		fprintf(stderr, "Failed to malloc tempdir, "
+@@ -49,7 +50,8 @@
+ 	else
+ 		*tempname = 0;
+ 	strcat(tempname, template);
+-	if((fd = mkstemp(tempname)) < 0){
++	fd = mkstemp(tempname);
++	if(fd < 0){
+ 		fprintf(stderr, "open - cannot create %s: %s\n", tempname, 
+ 			strerror(errno));
+ 		return -1;
+@@ -59,7 +61,8 @@
+ 		return -1;
+ 	}
+ 	if(out_tempname){
+-		if((*out_tempname = strdup(tempname)) == NULL){
++		*out_tempname = strdup(tempname);
++		if(*out_tempname == NULL){
+ 			perror("strdup");
+ 			return -1;
+ 		}
+diff -Naur a/arch/um/kernel/time.c b/arch/um/kernel/time.c
+--- a/arch/um/kernel/time.c	2004-01-08 22:16:05.000000000 -0500
++++ b/arch/um/kernel/time.c	2004-01-08 22:21:46.000000000 -0500
+@@ -4,24 +4,33 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include <time.h>
+ #include <sys/time.h>
+ #include <signal.h>
+ #include <errno.h>
+-#include "linux/module.h"
+ #include "user_util.h"
+ #include "kern_util.h"
+ #include "user.h"
+ #include "process.h"
+ #include "signal_user.h"
+ #include "time_user.h"
++#include "kern_constants.h"
++
++/* XXX This really needs to be declared and initialized in a kernel file since 
++ * it's in <linux/time.h>
++ */
++extern struct timespec wall_to_monotonic;
+ 
+ extern struct timeval xtime;
+ 
++struct timeval local_offset = { 0, 0 };
++
+ void timer(void)
+ {
+ 	gettimeofday(&xtime, NULL);
++	timeradd(&xtime, &local_offset, &xtime);
+ }
+ 
+ void set_interval(int timer_type)
+@@ -66,7 +75,7 @@
+ 		       errno);
+ }
+ 
+-void idle_timer(void)
++void uml_idle_timer(void)
+ {
+ 	if(signal(SIGVTALRM, SIG_IGN) == SIG_ERR)
+ 		panic("Couldn't unset SIGVTALRM handler");
+@@ -76,14 +85,54 @@
+ 	set_interval(ITIMER_REAL);
+ }
+ 
++static unsigned long long get_host_hz(void)
++{
++	char mhzline[16], *end;
++	int ret, mult, mhz, rest, len;
++
++	ret = cpu_feature("cpu MHz", mhzline, 
++			  sizeof(mhzline) / sizeof(mhzline[0]));
++	if(!ret)
++		panic ("Could not get host MHZ");
++
++	mhz = strtoul(mhzline, &end, 10);
++
++	/* This business is to parse a floating point number without using
++	 * floating types.
++	 */
++
++	rest = 0;
++	mult = 0;
++	if(*end == '.'){
++		end++;
++		len = strlen(end);
++		if(len < 6)
++			mult = 6 - len;
++		else if(len > 6)
++			end[6] = '\0';
++		rest = strtoul(end, NULL, 10);
++		while(mult-- > 0)
++			rest *= 10;
++	}
++
++	return(1000000 * mhz + rest);
++}
++
++unsigned long long host_hz = 0;
++
+ void time_init(void)
+ {
++	struct timespec now;
++ 
++	host_hz = get_host_hz();
+ 	if(signal(SIGVTALRM, boot_timer_handler) == SIG_ERR)
+ 		panic("Couldn't set SIGVTALRM handler");
+ 	set_interval(ITIMER_VIRTUAL);
+-}
+ 
+-struct timeval local_offset = { 0, 0 };
++	do_posix_clock_monotonic_gettime(&now);
++	wall_to_monotonic.tv_sec = -now.tv_sec;
++	wall_to_monotonic.tv_nsec = -now.tv_nsec;
++}
+ 
+ void do_gettimeofday(struct timeval *tv)
+ {
+@@ -95,15 +144,13 @@
+ 	time_unlock(flags);
+ }
+ 
+-EXPORT_SYMBOL(do_gettimeofday);
+-
+ int do_settimeofday(struct timespec *tv)
+ {
+ 	struct timeval now;
+ 	unsigned long flags;
+ 	struct timeval tv_in;
+ 
+-	if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
++	if ((unsigned long) tv->tv_nsec >= UM_NSEC_PER_SEC)
+ 		return -EINVAL;
+ 
+ 	tv_in.tv_sec = tv->tv_sec;
+@@ -113,9 +160,9 @@
+ 	gettimeofday(&now, NULL);
+ 	timersub(&tv_in, &now, &local_offset);
+ 	time_unlock(flags);
+-}
+ 
+-EXPORT_SYMBOL(do_settimeofday);
++	return(0);
++}
+ 
+ void idle_sleep(int secs)
+ {
+diff -Naur a/arch/um/kernel/time_kern.c b/arch/um/kernel/time_kern.c
+--- a/arch/um/kernel/time_kern.c	2004-01-08 22:24:10.000000000 -0500
++++ b/arch/um/kernel/time_kern.c	2004-01-08 22:31:27.000000000 -0500
+@@ -30,6 +30,14 @@
+ 	return(HZ);
+ }
+ 
++/*
++ * Scheduler clock - returns current time in nanosec units.
++ */
++unsigned long long sched_clock(void)
++{
++	return (unsigned long long)jiffies_64 * (1000000000 / HZ);
++}
++
+ /* Changed at early boot */
+ int timer_irq_inited = 0;
+ 
+@@ -39,13 +47,47 @@
+  */
+ int __attribute__ ((__section__ (".unprotected"))) missed_ticks[NR_CPUS];
+ 
++static int first_tick;
++static unsigned long long prev_tsc;
++static long long delta;   		/* Deviation per interval */
++
++extern unsigned long long host_hz;
++
+ void timer_irq(union uml_pt_regs *regs)
+ {
+-	int cpu = current->thread_info->cpu, ticks = missed_ticks[cpu];
++	unsigned long long ticks = 0;
++
++	if(!timer_irq_inited){
++		/* This is to ensure that ticks don't pile up when
++		 * the timer handler is suspended */
++		first_tick = 0;
++		return;
++	}
++
++	if(first_tick){
++#if defined(CONFIG_UML_REAL_TIME_CLOCK)
++		unsigned long long tsc;
++		/* We've had 1 tick */
++		tsc = time_stamp();
++
++		delta += tsc - prev_tsc;
++		prev_tsc = tsc;
++
++		ticks += (delta * HZ) / host_hz;
++		delta -= (ticks * host_hz) / HZ;
++#else
++		ticks = 1;
++#endif
++	}
++	else {
++		prev_tsc = time_stamp();
++		first_tick = 1;
++	}
+ 
+-        if(!timer_irq_inited) return;
+-	missed_ticks[cpu] = 0;
+-	while(ticks--) do_IRQ(TIMER_IRQ, regs);
++	while(ticks > 0){
++		do_IRQ(TIMER_IRQ, regs);
++		ticks--;
++	}
+ }
+ 
+ void boot_timer_handler(int sig)
+@@ -58,12 +100,13 @@
+ 	do_timer(&regs);
+ }
+ 
+-void um_timer(int irq, void *dev, struct pt_regs *regs)
++irqreturn_t um_timer(int irq, void *dev, struct pt_regs *regs)
+ {
+ 	do_timer(regs);
+-	write_seqlock(&xtime_lock);
++	write_seqlock_irq(&xtime_lock);
+ 	timer();
+-	write_sequnlock(&xtime_lock);
++	write_sequnlock_irq(&xtime_lock);
++	return(IRQ_HANDLED);
+ }
+ 
+ long um_time(int * tloc)
+@@ -81,12 +124,12 @@
+ long um_stime(int * tptr)
+ {
+ 	int value;
+-	struct timeval new;
++	struct timespec new;
+ 
+ 	if (get_user(value, tptr))
+                 return -EFAULT;
+ 	new.tv_sec = value;
+-	new.tv_usec = 0;
++	new.tv_nsec = 0;
+ 	do_settimeofday(&new);
+ 	return 0;
+ }
+@@ -125,9 +168,11 @@
+ void timer_handler(int sig, union uml_pt_regs *regs)
+ {
+ #ifdef CONFIG_SMP
++	local_irq_disable();
+ 	update_process_times(user_context(UPT_SP(regs)));
++	local_irq_enable();
+ #endif
+-	if(current->thread_info->cpu == 0)
++	if(current_thread->cpu == 0)
+ 		timer_irq(regs);
+ }
+ 
+@@ -136,6 +181,7 @@
+ unsigned long time_lock(void)
+ {
+ 	unsigned long flags;
++
+ 	spin_lock_irqsave(&timer_spinlock, flags);
+ 	return(flags);
+ }
+@@ -150,8 +196,8 @@
+ 	int err;
+ 
+ 	CHOOSE_MODE(user_time_init_tt(), user_time_init_skas());
+-	if((err = request_irq(TIMER_IRQ, um_timer, SA_INTERRUPT, "timer", 
+-			      NULL)) != 0)
++	err = request_irq(TIMER_IRQ, um_timer, SA_INTERRUPT, "timer", NULL);
++	if(err != 0)
+ 		printk(KERN_ERR "timer_init : request_irq failed - "
+ 		       "errno = %d\n", -err);
+ 	timer_irq_inited = 1;
+@@ -160,7 +206,6 @@
+ 
+ __initcall(timer_init);
+ 
+-
+ /*
+  * Overrides for Emacs so that we follow Linus's tabbing style.
+  * Emacs will notice this stuff at the end of the file and automatically
+diff -Naur a/arch/um/kernel/trap_kern.c b/arch/um/kernel/trap_kern.c
+--- a/arch/um/kernel/trap_kern.c	2004-01-08 22:13:51.000000000 -0500
++++ b/arch/um/kernel/trap_kern.c	2004-01-08 22:18:52.000000000 -0500
+@@ -16,12 +16,15 @@
+ #include "asm/tlbflush.h"
+ #include "asm/a.out.h"
+ #include "asm/current.h"
++#include "asm/irq.h"
+ #include "user_util.h"
+ #include "kern_util.h"
+ #include "kern.h"
+ #include "chan_kern.h"
+ #include "mconsole_kern.h"
+ #include "2_5compat.h"
++#include "mem.h"
++#include "mem_kern.h"
+ 
+ int handle_page_fault(unsigned long address, unsigned long ip, 
+ 		      int is_write, int is_user, int *code_out)
+@@ -51,12 +54,12 @@
+ 	if(is_write && !(vma->vm_flags & VM_WRITE)) 
+ 		goto out;
+ 	page = address & PAGE_MASK;
+-	if(page == (unsigned long) current->thread_info + PAGE_SIZE)
++	if(page == (unsigned long) current_thread + PAGE_SIZE)
+ 		panic("Kernel stack overflow");
+ 	pgd = pgd_offset(mm, page);
+ 	pmd = pmd_offset(pgd, page);
+- survive:
+ 	do {
++ survive:
+ 		switch (handle_mm_fault(mm, vma, address, is_write)){
+ 		case VM_FAULT_MINOR:
+ 			current->min_flt++;
+@@ -71,14 +74,20 @@
+ 			err = -ENOMEM;
+ 			goto out_of_memory;
+ 		default:
+-			BUG();
++			if (current->pid == 1) {
++				up_read(&mm->mmap_sem);
++				yield();
++				down_read(&mm->mmap_sem);
++				goto survive;
++			}
++			goto out;
+ 		}
+ 		pte = pte_offset_kernel(pmd, page);
+ 	} while(!pte_present(*pte));
++	err = 0;
+ 	*pte = pte_mkyoung(*pte);
+ 	if(pte_write(*pte)) *pte = pte_mkdirty(*pte);
+ 	flush_tlb_page(vma, page);
+-	err = 0;
+  out:
+ 	up_read(&mm->mmap_sem);
+ 	return(err);
+@@ -98,6 +107,33 @@
+ 	goto out;
+ }
+ 
++LIST_HEAD(physmem_remappers);
++
++void register_remapper(struct remapper *info)
++{
++	list_add(&info->list, &physmem_remappers);
++}
++
++static int check_remapped_addr(unsigned long address, int is_write)
++{
++	struct remapper *remapper;
++	struct list_head *ele;
++	__u64 offset;
++	int fd;
++
++	fd = phys_mapping(__pa(address), &offset);
++	if(fd == -1)
++		return(0);
++
++	list_for_each(ele, &physmem_remappers){
++		remapper = list_entry(ele, struct remapper, list);
++		if((*remapper->proc)(fd, address, is_write, offset))
++			return(1);
++	}
++
++	return(0);
++}
++
+ unsigned long segv(unsigned long address, unsigned long ip, int is_write, 
+ 		   int is_user, void *sc)
+ {
+@@ -109,7 +145,9 @@
+                 flush_tlb_kernel_vm();
+                 return(0);
+         }
+-        if(current->mm == NULL)
++	else if(check_remapped_addr(address & PAGE_MASK, is_write))
++		return(0);
++	else if(current->mm == NULL)
+ 		panic("Segfault with no mm");
+ 	err = handle_page_fault(address, ip, is_write, is_user, &si.si_code);
+ 
+@@ -120,9 +158,8 @@
+ 		current->thread.fault_addr = (void *) address;
+ 		do_longjmp(catcher, 1);
+ 	} 
+-	else if(current->thread.fault_addr != NULL){
++	else if(current->thread.fault_addr != NULL)
+ 		panic("fault_addr set but no fault catcher");
+-	}
+ 	else if(arch_fixup(ip, sc))
+ 		return(0);
+ 
+@@ -155,8 +192,6 @@
+ {
+ 	struct siginfo si;
+ 
+-	printk(KERN_ERR "Unfixable SEGV in '%s' (pid %d) at 0x%lx "
+-	       "(ip 0x%lx)\n", current->comm, current->pid, address, ip);
+ 	si.si_signo = SIGSEGV;
+ 	si.si_code = SEGV_ACCERR;
+ 	si.si_addr = (void *) address;
+@@ -180,6 +215,11 @@
+ 	else relay_signal(sig, regs);
+ }
+ 
++void winch(int sig, union uml_pt_regs *regs)
++{
++	do_IRQ(WINCH_IRQ, regs);
++}
++
+ void trap_init(void)
+ {
+ }
+diff -Naur a/arch/um/kernel/trap_user.c b/arch/um/kernel/trap_user.c
+--- a/arch/um/kernel/trap_user.c	2004-01-08 22:20:37.000000000 -0500
++++ b/arch/um/kernel/trap_user.c	2004-01-08 22:27:07.000000000 -0500
+@@ -5,11 +5,9 @@
+ 
+ #include <stdlib.h>
+ #include <errno.h>
+-#include <fcntl.h>
+ #include <setjmp.h>
+ #include <signal.h>
+ #include <sys/time.h>
+-#include <sys/ioctl.h>
+ #include <sys/ptrace.h>
+ #include <sys/wait.h>
+ #include <asm/page.h>
+@@ -82,6 +80,8 @@
+ 		     .is_irq 		= 0 },
+ 	[ SIGILL ] { .handler 		= relay_signal,
+ 		     .is_irq 		= 0 },
++	[ SIGWINCH ] { .handler		= winch,
++		       .is_irq		= 1 },
+ 	[ SIGBUS ] { .handler 		= bus_handler,
+ 		     .is_irq 		= 0 },
+ 	[ SIGSEGV] { .handler 		= segv_handler,
+@@ -123,7 +123,7 @@
+ {
+ 	jmp_buf *buf = b;
+ 
+-	longjmp(*buf, val);
++	siglongjmp(*buf, val);
+ }
+ 
+ /*
+diff -Naur a/arch/um/kernel/tt/exec_kern.c b/arch/um/kernel/tt/exec_kern.c
+--- a/arch/um/kernel/tt/exec_kern.c	2004-01-08 22:16:01.000000000 -0500
++++ b/arch/um/kernel/tt/exec_kern.c	2004-01-08 22:21:37.000000000 -0500
+@@ -17,6 +17,7 @@
+ #include "mem_user.h"
+ #include "os.h"
+ #include "tlb.h"
++#include "mode.h"
+ 
+ static int exec_tramp(void *sig_stack)
+ {
+@@ -47,17 +48,17 @@
+ 		do_exit(SIGKILL);
+ 	}
+ 
+-	if(current->thread_info->cpu == 0)
++	if(current_thread->cpu == 0)
+ 		forward_interrupts(new_pid);
+ 	current->thread.request.op = OP_EXEC;
+ 	current->thread.request.u.exec.pid = new_pid;
+-	unprotect_stack((unsigned long) current->thread_info);
++	unprotect_stack((unsigned long) current_thread);
+ 	os_usr1_process(os_getpid());
+ 
+ 	enable_timer();
+ 	free_page(stack);
+ 	protect_memory(uml_reserved, high_physmem - uml_reserved, 1, 1, 0, 1);
+-	task_protections((unsigned long) current->thread_info);
++	task_protections((unsigned long) current_thread);
+ 	force_flush_all();
+ 	unblock_signals();
+ }
+diff -Naur a/arch/um/kernel/tt/include/mode.h b/arch/um/kernel/tt/include/mode.h
+--- a/arch/um/kernel/tt/include/mode.h	2004-01-08 22:24:28.000000000 -0500
++++ b/arch/um/kernel/tt/include/mode.h	2004-01-08 22:32:04.000000000 -0500
+@@ -8,6 +8,8 @@
+ 
+ #include "sysdep/ptrace.h"
+ 
++enum { OP_NONE, OP_EXEC, OP_FORK, OP_TRACE_ON, OP_REBOOT, OP_HALT, OP_CB };
++
+ extern int tracing_pid;
+ 
+ extern int tracer(int (*init_proc)(void *), void *sp);
+diff -Naur a/arch/um/kernel/tt/include/uaccess.h b/arch/um/kernel/tt/include/uaccess.h
+--- a/arch/um/kernel/tt/include/uaccess.h	2004-01-08 22:24:32.000000000 -0500
++++ b/arch/um/kernel/tt/include/uaccess.h	2004-01-08 22:32:07.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* 
+- * Copyright (C) 2000, 2001 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+@@ -43,65 +43,19 @@
+ 
+ extern int __do_copy_from_user(void *to, const void *from, int n,
+ 			       void **fault_addr, void **fault_catcher);
+-
+-static inline int copy_from_user_tt(void *to, const void *from, int n)
+-{
+-	return(access_ok_tt(VERIFY_READ, from, n) ?
+-	       __do_copy_from_user(to, from, n, 
+-				   &current->thread.fault_addr,
+-				   &current->thread.fault_catcher) : n);
+-}
+-
+-static inline int copy_to_user_tt(void *to, const void *from, int n)
+-{
+-	return(access_ok_tt(VERIFY_WRITE, to, n) ?
+-	       __do_copy_to_user(to, from, n, 
+-				   &current->thread.fault_addr,
+-				   &current->thread.fault_catcher) : n);
+-}
+-
+ extern int __do_strncpy_from_user(char *dst, const char *src, size_t n,
+ 				  void **fault_addr, void **fault_catcher);
+-
+-static inline int strncpy_from_user_tt(char *dst, const char *src, int count)
+-{
+-	int n;
+-
+-	if(!access_ok_tt(VERIFY_READ, src, 1)) return(-EFAULT);
+-	n = __do_strncpy_from_user(dst, src, count, 
+-				   &current->thread.fault_addr,
+-				   &current->thread.fault_catcher);
+-	if(n < 0) return(-EFAULT);
+-	return(n);
+-}
+-
+ extern int __do_clear_user(void *mem, size_t len, void **fault_addr,
+ 			   void **fault_catcher);
+-
+-static inline int __clear_user_tt(void *mem, int len)
+-{
+-	return(__do_clear_user(mem, len,
+-			       &current->thread.fault_addr,
+-			       &current->thread.fault_catcher));
+-}
+-
+-static inline int clear_user_tt(void *mem, int len)
+-{
+-	return(access_ok_tt(VERIFY_WRITE, mem, len) ? 
+-	       __do_clear_user(mem, len, 
+-			       &current->thread.fault_addr,
+-			       &current->thread.fault_catcher) : len);
+-}
+-
+ extern int __do_strnlen_user(const char *str, unsigned long n,
+ 			     void **fault_addr, void **fault_catcher);
+ 
+-static inline int strnlen_user_tt(const void *str, int len)
+-{
+-	return(__do_strnlen_user(str, len,
+-				 &current->thread.fault_addr,
+-				 &current->thread.fault_catcher));
+-}
++extern int copy_from_user_tt(void *to, const void *from, int n);
++extern int copy_to_user_tt(void *to, const void *from, int n);
++extern int strncpy_from_user_tt(char *dst, const char *src, int count);
++extern int __clear_user_tt(void *mem, int len);
++extern int clear_user_tt(void *mem, int len);
++extern int strnlen_user_tt(const void *str, int len);
+ 
+ #endif
+ 
+diff -Naur a/arch/um/kernel/tt/Makefile b/arch/um/kernel/tt/Makefile
+--- a/arch/um/kernel/tt/Makefile	2004-01-08 22:21:51.000000000 -0500
++++ b/arch/um/kernel/tt/Makefile	2004-01-08 22:28:40.000000000 -0500
+@@ -1,5 +1,5 @@
+ # 
+-# Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
++# Copyright (C) 2002 - 2003 Jeff Dike (jdike@addtoit.com)
+ # Licensed under the GPL
+ #
+ 
+@@ -7,7 +7,7 @@
+ 
+ obj-y = exec_kern.o exec_user.o gdb.o ksyms.o mem.o mem_user.o process_kern.o \
+ 	syscall_kern.o syscall_user.o time.o tlb.o tracer.o trap_user.o \
+-	uaccess_user.o sys-$(SUBARCH)/
++	uaccess.o uaccess_user.o sys-$(SUBARCH)/
+ 
+ obj-$(CONFIG_PT_PROXY) += gdb_kern.o ptproxy/
+ 
+diff -Naur a/arch/um/kernel/tt/mem_user.c b/arch/um/kernel/tt/mem_user.c
+--- a/arch/um/kernel/tt/mem_user.c	2004-01-08 22:17:23.000000000 -0500
++++ b/arch/um/kernel/tt/mem_user.c	2004-01-08 22:23:10.000000000 -0500
+@@ -25,14 +25,13 @@
+ 	size = (unsigned long) segment_end - 
+ 		(unsigned long) segment_start;
+ 	data = create_mem_file(size);
+-	if((addr = mmap(NULL, size, PROT_WRITE | PROT_READ, 
+-			MAP_SHARED, data, 0)) == MAP_FAILED){
++	addr = mmap(NULL, size, PROT_WRITE | PROT_READ, MAP_SHARED, data, 0);
++	if(addr == MAP_FAILED){
+ 		perror("mapping new data segment");
+ 		exit(1);
+ 	}
+ 	memcpy(addr, segment_start, size);
+-	if(switcheroo(data, prot, addr, segment_start, 
+-		      size) < 0){
++	if(switcheroo(data, prot, addr, segment_start, size) < 0){
+ 		printf("switcheroo failed\n");
+ 		exit(1);
+ 	}
+diff -Naur a/arch/um/kernel/tt/process_kern.c b/arch/um/kernel/tt/process_kern.c
+--- a/arch/um/kernel/tt/process_kern.c	2004-01-08 22:28:38.000000000 -0500
++++ b/arch/um/kernel/tt/process_kern.c	2004-01-08 22:34:56.000000000 -0500
+@@ -62,7 +62,7 @@
+ 	reading = 0;
+ 	err = os_write_file(to->thread.mode.tt.switch_pipe[1], &c, sizeof(c));
+ 	if(err != sizeof(c))
+-		panic("write of switch_pipe failed, errno = %d", -err);
++		panic("write of switch_pipe failed, err = %d", -err);
+ 
+ 	reading = 1;
+ 	if((from->state == TASK_ZOMBIE) || (from->state == TASK_DEAD))
+@@ -104,48 +104,72 @@
+ 
+ void release_thread_tt(struct task_struct *task)
+ {
+-	os_kill_process(task->thread.mode.tt.extern_pid, 0);
++	int pid = task->thread.mode.tt.extern_pid;
++
++	if(os_getpid() != pid)
++		os_kill_process(pid, 0);
+ }
+ 
+ void exit_thread_tt(void)
+ {
+-	close(current->thread.mode.tt.switch_pipe[0]);
+-	close(current->thread.mode.tt.switch_pipe[1]);
++	os_close_file(current->thread.mode.tt.switch_pipe[0]);
++	os_close_file(current->thread.mode.tt.switch_pipe[1]);
+ }
+ 
+ void schedule_tail(task_t *prev);
+ 
+ static void new_thread_handler(int sig)
+ {
++	unsigned long disable;
+ 	int (*fn)(void *);
+ 	void *arg;
+ 
+ 	fn = current->thread.request.u.thread.proc;
+ 	arg = current->thread.request.u.thread.arg;
++
+ 	UPT_SC(&current->thread.regs.regs) = (void *) (&sig + 1);
++	disable = (1 << (SIGVTALRM - 1)) | (1 << (SIGALRM - 1)) |
++		(1 << (SIGIO - 1)) | (1 << (SIGPROF - 1));
++	SC_SIGMASK(UPT_SC(&current->thread.regs.regs)) &= ~disable;
++
+ 	suspend_new_thread(current->thread.mode.tt.switch_pipe[0]);
+ 
+-	block_signals();
++	force_flush_all();
++	if(current->thread.prev_sched != NULL)
++		schedule_tail(current->thread.prev_sched);
++	current->thread.prev_sched = NULL;
++
+ 	init_new_thread_signals(1);
+-#ifdef CONFIG_SMP
+-	schedule_tail(current->thread.prev_sched);
+-#endif
+ 	enable_timer();
+ 	free_page(current->thread.temp_stack);
+ 	set_cmdline("(kernel thread)");
+-	force_flush_all();
+ 
+-	current->thread.prev_sched = NULL;
+ 	change_sig(SIGUSR1, 1);
+ 	change_sig(SIGVTALRM, 1);
+ 	change_sig(SIGPROF, 1);
+-	unblock_signals();
++	local_irq_enable();
+ 	if(!run_kernel_thread(fn, arg, &current->thread.exec_buf))
+ 		do_exit(0);
+ }
+ 
+ static int new_thread_proc(void *stack)
+ {
++	/* local_irq_disable is needed to block out signals until this thread is
++	 * properly scheduled.  Otherwise, the tracing thread will get mighty 
++	 * upset about any signals that arrive before that.  
++	 * This has the complication that it sets the saved signal mask in
++	 * the sigcontext to block signals.  This gets restored when this
++	 * thread (or a descendant, since they get a copy of this sigcontext)
++	 * returns to userspace.
++	 * So, this is compensated for elsewhere.
++	 * XXX There is still a small window until local_irq_disable() actually 
++	 * finishes where signals are possible - shouldn't be a problem in 
++	 * practice since SIGIO hasn't been forwarded here yet, and the 
++	 * local_irq_disable should finish before a SIGVTALRM has time to be 
++	 * delivered.
++	 */
++
++	local_irq_disable();
+ 	init_new_thread_stack(stack, new_thread_handler);
+ 	os_usr1_process(os_getpid());
+ 	return(0);
+@@ -156,7 +180,7 @@
+  * itself with a SIGUSR1.  set_user_mode has to be run with SIGUSR1 off,
+  * so it is blocked before it's called.  They are re-enabled on sigreturn
+  * despite the fact that they were blocked when the SIGUSR1 was issued because
+- * copy_thread copies the parent's signcontext, including the signal mask
++ * copy_thread copies the parent's sigcontext, including the signal mask
+  * onto the signal frame.
+  */
+ 
+@@ -165,35 +189,32 @@
+  	UPT_SC(&current->thread.regs.regs) = (void *) (&sig + 1);
+ 	suspend_new_thread(current->thread.mode.tt.switch_pipe[0]);
+ 
+-#ifdef CONFIG_SMP	
+-	schedule_tail(NULL);
+-#endif
++	force_flush_all();
++	if(current->thread.prev_sched != NULL)
++		schedule_tail(current->thread.prev_sched);
++	current->thread.prev_sched = NULL;
++
+ 	enable_timer();
+ 	change_sig(SIGVTALRM, 1);
+ 	local_irq_enable();
+-	force_flush_all();
+ 	if(current->mm != current->parent->mm)
+ 		protect_memory(uml_reserved, high_physmem - uml_reserved, 1, 
+ 			       1, 0, 1);
+-	task_protections((unsigned long) current->thread_info);
+-
+-	current->thread.prev_sched = NULL;
++	task_protections((unsigned long) current_thread);
+ 
+ 	free_page(current->thread.temp_stack);
++	local_irq_disable();
+ 	change_sig(SIGUSR1, 0);
+ 	set_user_mode(current);
+ }
+ 
+-static int sigusr1 = SIGUSR1;
+-
+ int fork_tramp(void *stack)
+ {
+-	int sig = sigusr1;
+-
+ 	local_irq_disable();
++	arch_init_thread();
+ 	init_new_thread_stack(stack, finish_fork_handler);
+ 
+-	kill(os_getpid(), sig);
++	os_usr1_process(os_getpid());
+ 	return(0);
+ }
+ 
+@@ -213,8 +234,8 @@
+ 	}
+ 
+ 	err = os_pipe(p->thread.mode.tt.switch_pipe, 1, 1);
+-	if(err){
+-		printk("copy_thread : pipe failed, errno = %d\n", -err);
++	if(err < 0){
++		printk("copy_thread : pipe failed, err = %d\n", -err);
+ 		return(err);
+ 	}
+ 
+@@ -377,8 +398,8 @@
+ 
+ 	pages = (1 << CONFIG_KERNEL_STACK_ORDER);
+ 
+-	start = (unsigned long) current->thread_info + PAGE_SIZE;
+-	end = (unsigned long) current + PAGE_SIZE * pages;
++	start = (unsigned long) current_thread + PAGE_SIZE;
++	end = (unsigned long) current_thread + PAGE_SIZE * pages;
+ 	protect_memory(uml_reserved, start - uml_reserved, 1, w, 1, 1);
+ 	protect_memory(end, high_physmem - end, 1, w, 1, 1);
+ 
+@@ -454,8 +475,9 @@
+ 
+ 	init_task.thread.mode.tt.extern_pid = pid;
+ 	err = os_pipe(init_task.thread.mode.tt.switch_pipe, 1, 1);
+-	if(err)	panic("Can't create switch pipe for init_task, errno = %d", 
+-		      err);
++	if(err)	
++		panic("Can't create switch pipe for init_task, errno = %d", 
++		      -err);
+ }
+ 
+ int singlestepping_tt(void *t)
+diff -Naur a/arch/um/kernel/tt/ptproxy/proxy.c b/arch/um/kernel/tt/ptproxy/proxy.c
+--- a/arch/um/kernel/tt/ptproxy/proxy.c	2004-01-08 22:23:52.000000000 -0500
++++ b/arch/um/kernel/tt/ptproxy/proxy.c	2004-01-08 22:31:01.000000000 -0500
+@@ -15,7 +15,6 @@
+ #include <unistd.h>
+ #include <signal.h>
+ #include <string.h>
+-#include <fcntl.h>
+ #include <termios.h>
+ #include <sys/wait.h>
+ #include <sys/types.h>
+@@ -293,10 +292,10 @@
+ }
+ 
+ char gdb_init_string[] = 
+-"att 1
+-b panic
+-b stop
+-handle SIGWINCH nostop noprint pass
++"att 1 \n\
++b panic \n\
++b stop \n\
++handle SIGWINCH nostop noprint pass \n\
+ ";
+ 
+ int start_debugger(char *prog, int startup, int stop, int *fd_out)
+@@ -304,7 +303,8 @@
+ 	int slave, child;
+ 
+ 	slave = open_gdb_chan();
+-	if((child = fork()) == 0){
++	child = fork();
++	if(child == 0){
+ 		char *tempname = NULL;
+ 		int fd;
+ 
+@@ -327,18 +327,19 @@
+ 			exit(1);
+ #endif
+ 		}
+-		if((fd = make_tempfile("/tmp/gdb_init-XXXXXX", &tempname, 0)) < 0){
+-			printk("start_debugger : make_tempfile failed, errno = %d\n",
+-			       errno);
++		fd = make_tempfile("/tmp/gdb_init-XXXXXX", &tempname, 0);
++		if(fd < 0){
++			printk("start_debugger : make_tempfile failed,"
++			       "err = %d\n", -fd);
+ 			exit(1);
+ 		}
+-		write(fd, gdb_init_string, sizeof(gdb_init_string) - 1);
++		os_write_file(fd, gdb_init_string, sizeof(gdb_init_string) - 1);
+ 		if(startup){
+ 			if(stop){
+-				write(fd, "b start_kernel\n",
++				os_write_file(fd, "b start_kernel\n",
+ 				      strlen("b start_kernel\n"));
+ 			}
+-			write(fd, "c\n", strlen("c\n"));
++			os_write_file(fd, "c\n", strlen("c\n"));
+ 		}
+ 		if(ptrace(PTRACE_TRACEME, 0, 0, 0) < 0){
+ 			printk("start_debugger :  PTRACE_TRACEME failed, "
+diff -Naur a/arch/um/kernel/tt/ptproxy/sysdep.c b/arch/um/kernel/tt/ptproxy/sysdep.c
+--- a/arch/um/kernel/tt/ptproxy/sysdep.c	2004-01-08 22:27:13.000000000 -0500
++++ b/arch/um/kernel/tt/ptproxy/sysdep.c	2004-01-08 22:34:07.000000000 -0500
+@@ -9,6 +9,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <signal.h>
++#include <errno.h>
+ #include <sys/types.h>
+ #include <sys/ptrace.h>
+ #include <asm/ptrace.h>
+diff -Naur a/arch/um/kernel/tt/ptproxy/wait.c b/arch/um/kernel/tt/ptproxy/wait.c
+--- a/arch/um/kernel/tt/ptproxy/wait.c	2004-01-08 22:29:38.000000000 -0500
++++ b/arch/um/kernel/tt/ptproxy/wait.c	2004-01-08 22:35:16.000000000 -0500
+@@ -56,21 +56,23 @@
+ int real_wait_return(struct debugger *debugger)
+ {
+ 	unsigned long ip;
+-	int err, pid;
++	int pid;
+ 
+ 	pid = debugger->pid;
++
+ 	ip = ptrace(PTRACE_PEEKUSER, pid, PT_IP_OFFSET, 0);
+ 	ip = IP_RESTART_SYSCALL(ip);
+-	err = ptrace(PTRACE_POKEUSER, pid, PT_IP_OFFSET, ip);
++
+ 	if(ptrace(PTRACE_POKEUSER, pid, PT_IP_OFFSET, ip) < 0)
+ 		tracer_panic("real_wait_return : Failed to restart system "
+-			     "call, errno = %d\n");
++			     "call, errno = %d\n", errno);
++
+ 	if((ptrace(PTRACE_SYSCALL, debugger->pid, 0, SIGCHLD) < 0) ||
+ 	   (ptrace(PTRACE_SYSCALL, debugger->pid, 0, 0) < 0) ||
+ 	   (ptrace(PTRACE_SYSCALL, debugger->pid, 0, 0) < 0) ||
+ 	   debugger_normal_return(debugger, -1))
+ 		tracer_panic("real_wait_return : gdb failed to wait, "
+-			     "errno = %d\n");
++			     "errno = %d\n", errno);
+ 	return(0);
+ }
+ 
+diff -Naur a/arch/um/kernel/tt/syscall_kern.c b/arch/um/kernel/tt/syscall_kern.c
+--- a/arch/um/kernel/tt/syscall_kern.c	2004-01-08 22:13:31.000000000 -0500
++++ b/arch/um/kernel/tt/syscall_kern.c	2004-01-08 22:17:14.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* 
+- * Copyright (C) 2000 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+diff -Naur a/arch/um/kernel/tt/tracer.c b/arch/um/kernel/tt/tracer.c
+--- a/arch/um/kernel/tt/tracer.c	2004-01-08 22:13:44.000000000 -0500
++++ b/arch/um/kernel/tt/tracer.c	2004-01-08 22:18:08.000000000 -0500
+@@ -39,16 +39,17 @@
+ 		return(0);
+ 
+ 	register_winch_irq(tracer_winch[0], fd, -1, data);
+-	return(0);
++	return(1);
+ }
+ 
+ static void tracer_winch_handler(int sig)
+ {
++	int n;
+ 	char c = 1;
+ 
+-	if(write(tracer_winch[1], &c, sizeof(c)) != sizeof(c))
+-		printk("tracer_winch_handler - write failed, errno = %d\n",
+-		       errno);
++	n = os_write_file(tracer_winch[1], &c, sizeof(c));
++	if(n != sizeof(c))
++		printk("tracer_winch_handler - write failed, err = %d\n", -n);
+ }
+ 
+ /* Called only by the tracing thread during initialization */
+@@ -58,9 +59,8 @@
+ 	int err;
+ 
+ 	err = os_pipe(tracer_winch, 1, 1);
+-	if(err){
+-		printk("setup_tracer_winch : os_pipe failed, errno = %d\n", 
+-		       -err);
++	if(err < 0){
++		printk("setup_tracer_winch : os_pipe failed, err = %d\n", -err);
+ 		return;
+ 	}
+ 	signal(SIGWINCH, tracer_winch_handler);
+@@ -130,8 +130,8 @@
+ 	case SIGTSTP:
+ 		if(ptrace(PTRACE_CONT, pid, 0, sig) < 0)
+ 			tracer_panic("sleeping_process_signal : Failed to "
+-				     "continue pid %d, errno = %d\n", pid,
+-				     sig);
++				     "continue pid %d, signal = %d, "
++				     "errno = %d\n", pid, sig, errno);
+ 		break;
+ 
+ 	/* This happens when the debugger (e.g. strace) is doing system call 
+@@ -145,7 +145,7 @@
+ 		if(ptrace(PTRACE_SYSCALL, pid, 0, 0) < 0)
+ 			tracer_panic("sleeping_process_signal : Failed to "
+ 				     "PTRACE_SYSCALL pid %d, errno = %d\n",
+-				     pid, sig);
++				     pid, errno);
+ 		break;
+ 	case SIGSTOP:
+ 		break;
+@@ -218,7 +218,7 @@
+ 			err = attach(debugger_parent);
+ 			if(err){
+ 				printf("Failed to attach debugger parent %d, "
+-				       "errno = %d\n", debugger_parent, err);
++				       "errno = %d\n", debugger_parent, -err);
+ 				debugger_parent = -1;
+ 			}
+ 			else {
+@@ -233,7 +233,8 @@
+ 	}
+ 	set_cmdline("(tracing thread)");
+ 	while(1){
+-		if((pid = waitpid(-1, &status, WUNTRACED)) <= 0){
++		pid = waitpid(-1, &status, WUNTRACED);
++		if(pid <= 0){
+ 			if(errno != ECHILD){
+ 				printf("wait failed - errno = %d\n", errno);
+ 			}
+@@ -401,7 +402,7 @@
+ 		
+ 		if(!strcmp(line, "go"))	debug_stop = 0;
+ 		else if(!strcmp(line, "parent")) debug_parent = 1;
+-		else printk("Unknown debug option : '%s'\n", line);
++		else printf("Unknown debug option : '%s'\n", line);
+ 
+ 		line = next;
+ 	}
+diff -Naur a/arch/um/kernel/tt/uaccess.c b/arch/um/kernel/tt/uaccess.c
+--- a/arch/um/kernel/tt/uaccess.c	1969-12-31 19:00:00.000000000 -0500
++++ b/arch/um/kernel/tt/uaccess.c	2004-01-08 22:18:04.000000000 -0500
+@@ -0,0 +1,73 @@
++/* 
++ * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
++ * Licensed under the GPL
++ */
++
++#include "linux/sched.h"
++#include "asm/uaccess.h"
++
++int copy_from_user_tt(void *to, const void *from, int n)
++{
++	if(!access_ok_tt(VERIFY_READ, from, n)) 
++		return(n);
++
++	return(__do_copy_from_user(to, from, n, &current->thread.fault_addr,
++				   &current->thread.fault_catcher));
++}
++
++int copy_to_user_tt(void *to, const void *from, int n)
++{
++	if(!access_ok_tt(VERIFY_WRITE, to, n))
++		return(n);
++		
++	return(__do_copy_to_user(to, from, n, &current->thread.fault_addr,
++				 &current->thread.fault_catcher));
++}
++
++int strncpy_from_user_tt(char *dst, const char *src, int count)
++{
++	int n;
++
++	if(!access_ok_tt(VERIFY_READ, src, 1)) 
++		return(-EFAULT);
++
++	n = __do_strncpy_from_user(dst, src, count, 
++				   &current->thread.fault_addr,
++				   &current->thread.fault_catcher);
++	if(n < 0) return(-EFAULT);
++	return(n);
++}
++
++int __clear_user_tt(void *mem, int len)
++{
++	return(__do_clear_user(mem, len,
++			       &current->thread.fault_addr,
++			       &current->thread.fault_catcher));
++}
++
++int clear_user_tt(void *mem, int len)
++{
++	if(!access_ok_tt(VERIFY_WRITE, mem, len))
++		return(len);
++
++	return(__do_clear_user(mem, len, &current->thread.fault_addr,
++			       &current->thread.fault_catcher));
++}
++
++int strnlen_user_tt(const void *str, int len)
++{
++	return(__do_strnlen_user(str, len,
++				 &current->thread.fault_addr,
++				 &current->thread.fault_catcher));
++}
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/arch/um/kernel/tt/uaccess_user.c b/arch/um/kernel/tt/uaccess_user.c
+--- a/arch/um/kernel/tt/uaccess_user.c	2004-01-08 22:17:56.000000000 -0500
++++ b/arch/um/kernel/tt/uaccess_user.c	2004-01-08 22:24:00.000000000 -0500
+@@ -8,15 +8,20 @@
+ #include <string.h>
+ #include "user_util.h"
+ #include "uml_uaccess.h"
++#include "task.h"
++#include "kern_util.h"
+ 
+ int __do_copy_from_user(void *to, const void *from, int n,
+ 			void **fault_addr, void **fault_catcher)
+ {
++	struct tt_regs save = TASK_REGS(get_current())->tt;
+ 	unsigned long fault;
+ 	int faulted;
+ 
+ 	fault = __do_user_copy(to, from, n, fault_addr, fault_catcher,
+ 			       __do_copy, &faulted);
++	TASK_REGS(get_current())->tt = save;
++
+ 	if(!faulted) return(0);
+ 	else return(n - (fault - (unsigned long) from));
+ }
+@@ -29,11 +34,14 @@
+ int __do_strncpy_from_user(char *dst, const char *src, unsigned long count,
+ 			   void **fault_addr, void **fault_catcher)
+ {
++	struct tt_regs save = TASK_REGS(get_current())->tt;
+ 	unsigned long fault;
+ 	int faulted;
+ 
+ 	fault = __do_user_copy(dst, src, count, fault_addr, fault_catcher,
+ 			       __do_strncpy, &faulted);
++	TASK_REGS(get_current())->tt = save;
++
+ 	if(!faulted) return(strlen(dst));
+ 	else return(-1);
+ }
+@@ -46,11 +54,14 @@
+ int __do_clear_user(void *mem, unsigned long len,
+ 		    void **fault_addr, void **fault_catcher)
+ {
++	struct tt_regs save = TASK_REGS(get_current())->tt;
+ 	unsigned long fault;
+ 	int faulted;
+ 
+ 	fault = __do_user_copy(mem, NULL, len, fault_addr, fault_catcher,
+ 			       __do_clear, &faulted);
++	TASK_REGS(get_current())->tt = save;
++
+ 	if(!faulted) return(0);
+ 	else return(len - (fault - (unsigned long) mem));
+ }
+@@ -58,19 +69,20 @@
+ int __do_strnlen_user(const char *str, unsigned long n,
+ 		      void **fault_addr, void **fault_catcher)
+ {
++	struct tt_regs save = TASK_REGS(get_current())->tt;
+ 	int ret;
+ 	unsigned long *faddrp = (unsigned long *)fault_addr;
+ 	jmp_buf jbuf;
+ 
+ 	*fault_catcher = &jbuf;
+-	if(setjmp(jbuf) == 0){
++	if(sigsetjmp(jbuf, 1) == 0)
+ 		ret = strlen(str) + 1;
+-	} 
+-	else {
+-		ret = *faddrp - (unsigned long) str;
+-	}
++	else ret = *faddrp - (unsigned long) str;
++
+ 	*fault_addr = NULL;
+ 	*fault_catcher = NULL;
++
++	TASK_REGS(get_current())->tt = save;
+ 	return ret;
+ }
+ 
+diff -Naur a/arch/um/kernel/tty_log.c b/arch/um/kernel/tty_log.c
+--- a/arch/um/kernel/tty_log.c	2004-01-08 22:23:59.000000000 -0500
++++ b/arch/um/kernel/tty_log.c	2004-01-08 22:31:12.000000000 -0500
+@@ -9,10 +9,10 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+-#include <fcntl.h>
+ #include <sys/time.h>
+ #include "init.h"
+ #include "user.h"
++#include "kern_util.h"
+ #include "os.h"
+ 
+ #define TTY_LOG_DIR "./"
+@@ -24,29 +24,40 @@
+ #define TTY_LOG_OPEN 1
+ #define TTY_LOG_CLOSE 2
+ #define TTY_LOG_WRITE 3
++#define TTY_LOG_EXEC 4
++
++#define TTY_READ 1
++#define TTY_WRITE 2
+ 
+ struct tty_log_buf {
+ 	int what;
+ 	unsigned long tty;
+ 	int len;
++	int direction;
++	unsigned long sec;
++	unsigned long usec;
+ };
+ 
+-int open_tty_log(void *tty)
++int open_tty_log(void *tty, void *current_tty)
+ {
+ 	struct timeval tv;
+ 	struct tty_log_buf data;
+ 	char buf[strlen(tty_log_dir) + sizeof("01234567890-01234567\0")];
+ 	int fd;
+ 
++	gettimeofday(&tv, NULL);
+ 	if(tty_log_fd != -1){
+-		data = ((struct tty_log_buf) { what :	TTY_LOG_OPEN,
+-					       tty : (unsigned long) tty,
+-					       len : 0 });
+-		write(tty_log_fd, &data, sizeof(data));
++		data = ((struct tty_log_buf) { .what 	= TTY_LOG_OPEN,
++					       .tty  = (unsigned long) tty,
++					       .len  = sizeof(current_tty),
++					       .direction = 0,
++					       .sec = tv.tv_sec,
++					       .usec = tv.tv_usec } );
++		os_write_file(tty_log_fd, &data, sizeof(data));
++		os_write_file(tty_log_fd, &current_tty, data.len);
+ 		return(tty_log_fd);
+ 	}
+ 
+-	gettimeofday(&tv, NULL);
+ 	sprintf(buf, "%s/%0u-%0u", tty_log_dir, (unsigned int) tv.tv_sec, 
+  		(unsigned int) tv.tv_usec);
+ 
+@@ -62,30 +73,117 @@
+ void close_tty_log(int fd, void *tty)
+ {
+ 	struct tty_log_buf data;
++	struct timeval tv;
+ 
+ 	if(tty_log_fd != -1){
+-		data = ((struct tty_log_buf) { what :	TTY_LOG_CLOSE,
+-					       tty : (unsigned long) tty,
+-					       len : 0 });
+-		write(tty_log_fd, &data, sizeof(data));
++		gettimeofday(&tv, NULL);
++		data = ((struct tty_log_buf) { .what 	= TTY_LOG_CLOSE,
++					       .tty  = (unsigned long) tty,
++					       .len  = 0,
++					       .direction = 0,
++					       .sec = tv.tv_sec,
++					       .usec = tv.tv_usec } );
++		os_write_file(tty_log_fd, &data, sizeof(data));
+ 		return;
+ 	}
+-	close(fd);
++	os_close_file(fd);
+ }
+ 
+-int write_tty_log(int fd, char *buf, int len, void *tty)
++static int log_chunk(int fd, const char *buf, int len)
+ {
++	int total = 0, try, missed, n;
++	char chunk[64];
++
++	while(len > 0){
++		try = (len > sizeof(chunk)) ? sizeof(chunk) : len;
++		missed = copy_from_user_proc(chunk, (char *) buf, try);
++		try -= missed;
++		n = os_write_file(fd, chunk, try);
++		if(n != try) {
++			if(n < 0) 
++				return(n);
++			return(-EIO);
++		}
++		if(missed != 0)
++			return(-EFAULT);
++
++		len -= try;
++		total += try;
++		buf += try;
++	}
++
++	return(total);
++}
++
++int write_tty_log(int fd, const char *buf, int len, void *tty, int is_read)
++{
++	struct timeval tv;
+ 	struct tty_log_buf data;
++	int direction;
+ 
+ 	if(fd == tty_log_fd){
+-		data = ((struct tty_log_buf) { what :	TTY_LOG_WRITE,
+-					       tty : (unsigned long) tty,
+-					       len : len });
+-		write(tty_log_fd, &data, sizeof(data));
++		gettimeofday(&tv, NULL);
++		direction = is_read ? TTY_READ : TTY_WRITE;
++		data = ((struct tty_log_buf) { .what 	= TTY_LOG_WRITE,
++					       .tty  = (unsigned long) tty,
++					       .len  = len,
++					       .direction = direction,
++					       .sec = tv.tv_sec,
++					       .usec = tv.tv_usec } );
++		os_write_file(tty_log_fd, &data, sizeof(data));
+ 	}
+-	return(write(fd, buf, len));
++
++	return(log_chunk(fd, buf, len));
+ }
+ 
++void log_exec(char **argv, void *tty)
++{
++	struct timeval tv;
++	struct tty_log_buf data;
++	char **ptr,*arg;
++	int len;
++	
++	if(tty_log_fd == -1) return;
++
++	gettimeofday(&tv, NULL);
++
++	len = 0;
++	for(ptr = argv; ; ptr++){
++		if(copy_from_user_proc(&arg, ptr, sizeof(arg)))
++			return;
++		if(arg == NULL) break;
++		len += strlen_user_proc(arg);
++	}
++
++	data = ((struct tty_log_buf) { .what 	= TTY_LOG_EXEC,
++				       .tty  = (unsigned long) tty,
++				       .len  = len,
++				       .direction = 0,
++				       .sec = tv.tv_sec,
++				       .usec = tv.tv_usec } );
++	os_write_file(tty_log_fd, &data, sizeof(data));
++
++	for(ptr = argv; ; ptr++){
++		if(copy_from_user_proc(&arg, ptr, sizeof(arg)))
++			return;
++		if(arg == NULL) break;
++		log_chunk(tty_log_fd, arg, strlen_user_proc(arg));
++	}
++}
++
++extern void register_tty_logger(int (*opener)(void *, void *),
++				int (*writer)(int, const char *, int, 
++					      void *, int),
++				void (*closer)(int, void *));
++
++static int register_logger(void)
++{
++	register_tty_logger(open_tty_log, write_tty_log, close_tty_log);
++	return(0);
++}
++
++__uml_initcall(register_logger);
++
+ static int __init set_tty_log_dir(char *name, int *add)
+ {
+ 	tty_log_dir = name;
+@@ -104,7 +202,7 @@
+ 
+ 	tty_log_fd = strtoul(name, &end, 0);
+ 	if((*end != '\0') || (end == name)){
+-		printk("set_tty_log_fd - strtoul failed on '%s'\n", name);
++		printf("set_tty_log_fd - strtoul failed on '%s'\n", name);
+ 		tty_log_fd = -1;
+ 	}
+ 	return 0;
+diff -Naur a/arch/um/kernel/uaccess_user.c b/arch/um/kernel/uaccess_user.c
+--- a/arch/um/kernel/uaccess_user.c	2004-01-08 22:26:03.000000000 -0500
++++ b/arch/um/kernel/uaccess_user.c	2004-01-08 22:33:46.000000000 -0500
+@@ -20,7 +20,7 @@
+ 
+ 	jmp_buf jbuf;
+ 	*fault_catcher = &jbuf;
+-	if(setjmp(jbuf) == 0){
++	if(sigsetjmp(jbuf, 1) == 0){
+ 		(*op)(to, from, n);
+ 		ret = 0;
+ 		*faulted_out = 0;
+diff -Naur a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c
+--- a/arch/um/kernel/um_arch.c	2004-01-08 22:28:03.000000000 -0500
++++ b/arch/um/kernel/um_arch.c	2004-01-08 22:34:23.000000000 -0500
+@@ -38,13 +38,18 @@
+ #include "mode_kern.h"
+ #include "mode.h"
+ 
+-#define DEFAULT_COMMAND_LINE "root=6200"
++#define DEFAULT_COMMAND_LINE "root=98:0"
+ 
+ struct cpuinfo_um boot_cpu_data = { 
+ 	.loops_per_jiffy	= 0,
+ 	.ipi_pipe		= { -1, -1 }
+ };
+ 
++/* Placeholder to make UML link until the vsyscall stuff is actually 
++ * implemented
++ */
++void *__kernel_vsyscall;
++
+ unsigned long thread_saved_pc(struct task_struct *task)
+ {
+ 	return(os_process_pc(CHOOSE_MODE_PROC(thread_pid_tt, thread_pid_skas,
+@@ -53,18 +58,22 @@
+ 
+ static int show_cpuinfo(struct seq_file *m, void *v)
+ {
+-	int index;
++	int index = 0;
+ 
+-	index = (struct cpuinfo_um *)v - cpu_data;
+ #ifdef CONFIG_SMP
++	index = (struct cpuinfo_um *) v - cpu_data;
+ 	if (!cpu_online(index))
+ 		return 0;
+ #endif
+ 
+-	seq_printf(m, "bogomips\t: %lu.%02lu\n",
++	seq_printf(m, "processor\t: %d\n", index);
++	seq_printf(m, "vendor_id\t: User Mode Linux\n");
++	seq_printf(m, "model name\t: UML\n");
++	seq_printf(m, "mode\t\t: %s\n", CHOOSE_MODE("tt", "skas"));
++	seq_printf(m, "host\t\t: %s\n", host_info);
++	seq_printf(m, "bogomips\t: %lu.%02lu\n\n",
+ 		   loops_per_jiffy/(500000/HZ),
+ 		   (loops_per_jiffy/(5000/HZ)) % 100);
+-	seq_printf(m, "host\t\t: %s\n", host_info);
+ 
+ 	return(0);
+ }
+@@ -134,12 +143,12 @@
+ 	if(umid != NULL){
+ 		snprintf(argv1_begin, 
+ 			 (argv1_end - argv1_begin) * sizeof(*ptr), 
+-			 "(%s)", umid);
++			 "(%s) ", umid);
+ 		ptr = &argv1_begin[strlen(argv1_begin)];
+ 	}
+ 	else ptr = argv1_begin;
+ 
+-	snprintf(ptr, (argv1_end - ptr) * sizeof(*ptr), " [%s]", cmd);
++	snprintf(ptr, (argv1_end - ptr) * sizeof(*ptr), "[%s]", cmd);
+ 	memset(argv1_begin + strlen(argv1_begin), '\0', 
+ 	       argv1_end - argv1_begin - strlen(argv1_begin));
+ #endif
+@@ -179,7 +188,7 @@
+ static int __init uml_ncpus_setup(char *line, int *add)
+ {
+        if (!sscanf(line, "%d", &ncpus)) {
+-               printk("Couldn't parse [%s]\n", line);
++               printf("Couldn't parse [%s]\n", line);
+                return -1;
+        }
+ 
+@@ -210,7 +219,7 @@
+ 
+ static int __init mode_tt_setup(char *line, int *add)
+ {
+-	printk("CONFIG_MODE_TT disabled - 'mode=tt' ignored\n");
++	printf("CONFIG_MODE_TT disabled - 'mode=tt' ignored\n");
+ 	return(0);
+ }
+ 
+@@ -221,7 +230,7 @@
+ 
+ static int __init mode_tt_setup(char *line, int *add)
+ {
+-	printk("CONFIG_MODE_SKAS disabled - 'mode=tt' redundant\n");
++	printf("CONFIG_MODE_SKAS disabled - 'mode=tt' redundant\n");
+ 	return(0);
+ }
+ 
+@@ -291,7 +300,7 @@
+ 
+ /* Set during early boot */
+ unsigned long brk_start;
+-static struct vm_reserved kernel_vm_reserved;
++unsigned long end_iomem;
+ 
+ #define MIN_VMALLOC (32 * 1024 * 1024)
+ 
+@@ -299,7 +308,7 @@
+ {
+ 	unsigned long avail;
+ 	unsigned long virtmem_size, max_physmem;
+-	unsigned int i, add, err;
++	unsigned int i, add;
+ 
+ 	for (i = 1; i < argc; i++){
+ 		if((i == 1) && (argv[i][0] == ' ')) continue;
+@@ -328,12 +337,16 @@
+ 	argv1_end = &argv[1][strlen(argv[1])];
+ #endif
+   
+-	set_usable_vm(uml_physmem, get_kmem_end());
+-
+ 	highmem = 0;
+-	max_physmem = get_kmem_end() - uml_physmem - MIN_VMALLOC;
+-	if(physmem_size > max_physmem){
+-		highmem = physmem_size - max_physmem;
++	iomem_size = (iomem_size + PAGE_SIZE - 1) & PAGE_MASK;
++	max_physmem = get_kmem_end() - uml_physmem - iomem_size - MIN_VMALLOC;
++
++	/* Zones have to begin on a 1 << MAX_ORDER page boundary,
++	 * so this makes sure that's true for highmem
++	 */
++	max_physmem &= ~((1 << (PAGE_SHIFT + MAX_ORDER)) - 1);
++	if(physmem_size + iomem_size > max_physmem){
++		highmem = physmem_size + iomem_size - max_physmem;
+ 		physmem_size -= highmem;
+ #ifndef CONFIG_HIGHMEM
+ 		highmem = 0;
+@@ -343,11 +356,19 @@
+ 	}
+ 
+ 	high_physmem = uml_physmem + physmem_size;
+-	high_memory = (void *) high_physmem;
++	end_iomem = high_physmem + iomem_size;
++	high_memory = (void *) end_iomem;
+ 
+ 	start_vm = VMALLOC_START;
+ 
+-	setup_physmem(uml_physmem, uml_reserved, physmem_size);
++	setup_physmem(uml_physmem, uml_reserved, physmem_size, highmem);
++	if(init_maps(physmem_size, iomem_size, highmem)){
++		printf("Failed to allocate mem_map for %ld bytes of physical "
++		       "memory and %ld bytes of highmem\n", physmem_size,
++		       highmem);
++		exit(1);
++	}
++
+ 	virtmem_size = physmem_size;
+ 	avail = get_kmem_end() - start_vm;
+ 	if(physmem_size > avail) virtmem_size = avail;
+@@ -357,18 +378,13 @@
+ 		printf("Kernel virtual memory size shrunk to %ld bytes\n",
+ 		       virtmem_size);
+ 
+-	err = reserve_vm(high_physmem, end_vm, &kernel_vm_reserved);
+-	if(err){
+-		printf("Failed to reserve VM area for kernel VM\n");
+-		exit(1);
+-	}
+-
+   	uml_postsetup();
+ 
+ 	init_task.thread.kernel_stack = (unsigned long) &init_thread_info + 
+ 		2 * PAGE_SIZE;
+ 
+ 	task_protections((unsigned long) &init_thread_info);
++	os_flush_stdout();
+ 
+ 	return(CHOOSE_MODE(start_uml_tt(), start_uml_skas()));
+ }
+@@ -403,6 +419,7 @@
+ 	arch_check_bugs();
+ 	check_ptrace();
+ 	check_sigio();
++	check_devanon();
+ }
+ 
+ /*
+diff -Naur a/arch/um/kernel/umid.c b/arch/um/kernel/umid.c
+--- a/arch/um/kernel/umid.c	2004-01-08 22:30:24.000000000 -0500
++++ b/arch/um/kernel/umid.c	2004-01-08 22:35:37.000000000 -0500
+@@ -5,7 +5,6 @@
+ 
+ #include <stdio.h>
+ #include <unistd.h>
+-#include <fcntl.h>
+ #include <errno.h>
+ #include <string.h>
+ #include <stdlib.h>
+@@ -33,18 +32,19 @@
+ static int umid_is_random = 1;
+ static int umid_inited = 0;
+ 
+-static int make_umid(void);
++static int make_umid(int (*printer)(const char *fmt, ...));
+ 
+-static int __init set_umid(char *name, int is_random)
++static int __init set_umid(char *name, int is_random, 
++			   int (*printer)(const char *fmt, ...))
+ {
+ 	if(umid_inited){
+-		printk("Unique machine name can't be set twice\n");
++		(*printer)("Unique machine name can't be set twice\n");
+ 		return(-1);
+ 	}
+ 
+ 	if(strlen(name) > UMID_LEN - 1)
+-		printk("Unique machine name is being truncated to %s "
+-		       "characters\n", UMID_LEN);
++		(*printer)("Unique machine name is being truncated to %s "
++			   "characters\n", UMID_LEN);
+ 	strlcpy(umid, name, sizeof(umid));
+ 
+ 	umid_is_random = is_random;
+@@ -54,7 +54,7 @@
+ 
+ static int __init set_umid_arg(char *name, int *add)
+ {
+-	return(set_umid(name, 0));
++	return(set_umid(name, 0, printf));
+ }
+ 
+ __uml_setup("umid=", set_umid_arg,
+@@ -67,7 +67,7 @@
+ {
+ 	int n;
+ 
+-	if(!umid_inited && make_umid()) return(-1);
++	if(!umid_inited && make_umid(printk)) return(-1);
+ 
+ 	n = strlen(uml_dir) + strlen(umid) + strlen(name) + 1;
+ 	if(n > len){
+@@ -85,22 +85,23 @@
+ {
+ 	char file[strlen(uml_dir) + UMID_LEN + sizeof("/pid\0")];
+ 	char pid[sizeof("nnnnn\0")];
+-	int fd;
++	int fd, n;
+ 
+ 	if(umid_file_name("pid", file, sizeof(file))) return 0;
+ 
+ 	fd = os_open_file(file, of_create(of_excl(of_rdwr(OPENFLAGS()))), 
+ 			  0644);
+ 	if(fd < 0){
+-		printk("Open of machine pid file \"%s\" failed - "
+-		       "errno = %d\n", file, -fd);
++		printf("Open of machine pid file \"%s\" failed - "
++		       "err = %d\n", file, -fd);
+ 		return 0;
+ 	}
+ 
+ 	sprintf(pid, "%d\n", os_getpid());
+-	if(write(fd, pid, strlen(pid)) != strlen(pid))
+-		printk("Write of pid file failed - errno = %d\n", errno);
+-	close(fd);
++	n = os_write_file(fd, pid, strlen(pid));
++	if(n != strlen(pid))
++		printf("Write of pid file failed - err = %d\n", -n);
++	os_close_file(fd);
+ 	return 0;
+ }
+ 
+@@ -111,7 +112,8 @@
+ 	int len;
+ 	char file[256];
+ 
+-	if((directory = opendir(dir)) == NULL){
++	directory = opendir(dir);
++	if(directory == NULL){
+ 		printk("actually_do_remove : couldn't open directory '%s', "
+ 		       "errno = %d\n", dir, errno);
+ 		return(1);
+@@ -160,22 +162,24 @@
+ {
+ 	char file[strlen(uml_dir) + UMID_LEN + sizeof("/pid\0")];
+ 	char pid[sizeof("nnnnn\0")], *end;
+-	int dead, fd, p;
++	int dead, fd, p, n;
+ 
+ 	sprintf(file, "%s/pid", dir);
+ 	dead = 0;
+-	if((fd = os_open_file(file, of_read(OPENFLAGS()), 0)) < 0){
++	fd = os_open_file(file, of_read(OPENFLAGS()), 0);
++	if(fd < 0){
+ 		if(fd != -ENOENT){
+ 			printk("not_dead_yet : couldn't open pid file '%s', "
+-			       "errno = %d\n", file, -fd);
++			       "err = %d\n", file, -fd);
+ 			return(1);
+ 		}
+ 		dead = 1;
+ 	}
+ 	if(fd > 0){
+-		if(read(fd, pid, sizeof(pid)) < 0){
++		n = os_read_file(fd, pid, sizeof(pid));
++		if(n < 0){
+ 			printk("not_dead_yet : couldn't read pid file '%s', "
+-			       "errno = %d\n", file, errno);
++			       "err = %d\n", file, -n);
+ 			return(1);
+ 		}
+ 		p = strtoul(pid, &end, 0);
+@@ -197,7 +201,7 @@
+ 	if((strlen(name) > 0) && (name[strlen(name) - 1] != '/')){
+ 		uml_dir = malloc(strlen(name) + 1);
+ 		if(uml_dir == NULL){
+-			printk("Failed to malloc uml_dir - error = %d\n",
++			printf("Failed to malloc uml_dir - error = %d\n",
+ 			       errno);
+ 			uml_dir = name;
+ 			return(0);
+@@ -217,7 +221,7 @@
+ 		char *home = getenv("HOME");
+ 
+ 		if(home == NULL){
+-			printk("make_uml_dir : no value in environment for "
++			printf("make_uml_dir : no value in environment for "
+ 			       "$HOME\n");
+ 			exit(1);
+ 		}
+@@ -232,57 +236,59 @@
+ 		dir[len + 1] = '\0';
+ 	}
+ 
+-	if((uml_dir = malloc(strlen(dir) + 1)) == NULL){
++	uml_dir = malloc(strlen(dir) + 1);
++	if(uml_dir == NULL){
+ 		printf("make_uml_dir : malloc failed, errno = %d\n", errno);
+ 		exit(1);
+ 	}
+ 	strcpy(uml_dir, dir);
+ 	
+ 	if((mkdir(uml_dir, 0777) < 0) && (errno != EEXIST)){
+-	        printk("Failed to mkdir %s - errno = %i\n", uml_dir, errno);
++	        printf("Failed to mkdir %s - errno = %i\n", uml_dir, errno);
+ 		return(-1);
+ 	}
+ 	return 0;
+ }
+ 
+-static int __init make_umid(void)
++static int __init make_umid(int (*printer)(const char *fmt, ...))
+ {
+ 	int fd, err;
+ 	char tmp[strlen(uml_dir) + UMID_LEN + 1];
+ 
+ 	strlcpy(tmp, uml_dir, sizeof(tmp));
+ 
+-	if(*umid == 0){
++	if(!umid_inited){
+ 		strcat(tmp, "XXXXXX");
+ 		fd = mkstemp(tmp);
+ 		if(fd < 0){
+-			printk("make_umid - mkstemp failed, errno = %d\n",
+-			       errno);
++			(*printer)("make_umid - mkstemp failed, errno = %d\n",
++				   errno);
+ 			return(1);
+ 		}
+ 
+-		close(fd);
++		os_close_file(fd);
+ 		/* There's a nice tiny little race between this unlink and
+ 		 * the mkdir below.  It'd be nice if there were a mkstemp
+ 		 * for directories.
+ 		 */
+ 		unlink(tmp);
+-		set_umid(&tmp[strlen(uml_dir)], 1);
++		set_umid(&tmp[strlen(uml_dir)], 1, printer);
+ 	}
+ 	
+ 	sprintf(tmp, "%s%s", uml_dir, umid);
+ 
+-	if((err = mkdir(tmp, 0777)) < 0){
++	err = mkdir(tmp, 0777);
++	if(err < 0){
+ 		if(errno == EEXIST){
+ 			if(not_dead_yet(tmp)){
+-				printk("umid '%s' is in use\n", umid);
++				(*printer)("umid '%s' is in use\n", umid);
+ 				return(-1);
+ 			}
+ 			err = mkdir(tmp, 0777);
+ 		}
+ 	}
+ 	if(err < 0){
+-		printk("Failed to create %s - errno = %d\n", umid, errno);
++		(*printer)("Failed to create %s - errno = %d\n", umid, errno);
+ 		return(-1);
+ 	}
+ 
+@@ -295,7 +301,13 @@
+ );
+ 
+ __uml_postsetup(make_uml_dir);
+-__uml_postsetup(make_umid);
++
++static int __init make_umid_setup(void)
++{
++	return(make_umid(printf));
++}
++
++__uml_postsetup(make_umid_setup);
+ __uml_postsetup(create_pid_file);
+ 
+ /*
+diff -Naur a/arch/um/kernel/user_syms.c b/arch/um/kernel/user_syms.c
+--- a/arch/um/kernel/user_syms.c	2004-01-08 22:30:12.000000000 -0500
++++ b/arch/um/kernel/user_syms.c	2004-01-08 22:35:31.000000000 -0500
+@@ -1,7 +1,7 @@
+ #include <stdio.h>
+ #include <unistd.h>
+-#include <fcntl.h>
+ #include <dirent.h>
++#include <fcntl.h>
+ #include <errno.h>
+ #include <utime.h>
+ #include <string.h>
+@@ -27,7 +27,7 @@
+ #define __MODULE_STRING_1(x)	#x
+ #define __MODULE_STRING(x)	__MODULE_STRING_1(x)
+ 
+-#if !defined(__AUTOCONF_INCLUDED__)
++#if !defined(AUTOCONF_INCLUDED)
+ 
+ #define __EXPORT_SYMBOL(sym,str)   error config_must_be_included_before_module
+ #define EXPORT_SYMBOL(var)	   error config_must_be_included_before_module
+diff -Naur a/arch/um/kernel/user_util.c b/arch/um/kernel/user_util.c
+--- a/arch/um/kernel/user_util.c	2004-01-08 22:15:27.000000000 -0500
++++ b/arch/um/kernel/user_util.c	2004-01-08 22:21:18.000000000 -0500
+@@ -5,7 +5,6 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <fcntl.h>
+ #include <unistd.h>
+ #include <limits.h>
+ #include <sys/mman.h> 
+@@ -82,7 +81,8 @@
+ 	int status, ret;
+ 
+ 	while(1){
+-		if(((ret = waitpid(pid, &status, WUNTRACED)) < 0) ||
++		ret = waitpid(pid, &status, WUNTRACED);
++		if((ret < 0) ||
+ 		   !WIFSTOPPED(status) || (WSTOPSIG(status) != sig)){
+ 			if(ret < 0){
+ 				if(errno == EINTR) continue;
+@@ -119,17 +119,6 @@
+ 	}
+ }
+ 
+-int clone_and_wait(int (*fn)(void *), void *arg, void *sp, int flags)
+-{
+-	int pid;
+-
+-	pid = clone(fn, sp, flags, arg);
+- 	if(pid < 0) return(-1);
+-	wait_for_stop(pid, SIGSTOP, PTRACE_CONT, NULL);
+-	ptrace(PTRACE_CONT, pid, 0, 0);
+-	return(pid);
+-}
+-
+ int raw(int fd, int complain)
+ {
+ 	struct termios tt;
+diff -Naur a/arch/um/main.c b/arch/um/main.c
+--- a/arch/um/main.c	2004-01-08 22:28:01.000000000 -0500
++++ b/arch/um/main.c	2004-01-08 22:34:21.000000000 -0500
+@@ -8,6 +8,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <signal.h>
++#include <errno.h>
+ #include <sys/resource.h>
+ #include <sys/mman.h>
+ #include <sys/user.h>
+@@ -123,12 +124,14 @@
+ 
+ 	set_stklim();
+ 
+-	if((new_argv = malloc((argc + 1) * sizeof(char *))) == NULL){
++	new_argv = malloc((argc + 1) * sizeof(char *));
++	if(new_argv == NULL){
+ 		perror("Mallocing argv");
+ 		exit(1);
+ 	}
+ 	for(i=0;i<argc;i++){
+-		if((new_argv[i] = strdup(argv[i])) == NULL){
++		new_argv[i] = strdup(argv[i]);
++		if(new_argv[i] == NULL){
+ 			perror("Mallocing an arg");
+ 			exit(1);
+ 		}
+diff -Naur a/arch/um/Makefile b/arch/um/Makefile
+--- a/arch/um/Makefile	2004-01-08 22:24:07.000000000 -0500
++++ b/arch/um/Makefile	2004-01-08 22:31:23.000000000 -0500
+@@ -24,15 +24,17 @@
+ # Have to precede the include because the included Makefiles reference them.
+ SYMLINK_HEADERS = include/asm-um/archparam.h include/asm-um/system.h \
+ 	include/asm-um/sigcontext.h include/asm-um/processor.h \
+-	include/asm-um/ptrace.h include/asm-um/arch-signal.h
++	include/asm-um/ptrace.h include/asm-um/arch-signal.h \
++	include/asm-um/module.h
+ 
+ ARCH_SYMLINKS = include/asm-um/arch $(ARCH_DIR)/include/sysdep $(ARCH_DIR)/os \
+ 	$(SYMLINK_HEADERS) $(ARCH_DIR)/include/uml-config.h
+ 
+ GEN_HEADERS += $(ARCH_DIR)/include/task.h $(ARCH_DIR)/include/kern_constants.h
+ 
+-include $(ARCH_DIR)/Makefile-$(SUBARCH)
+-include $(ARCH_DIR)/Makefile-os-$(OS)
++.PHONY: sys_prepare
++sys_prepare:
++	@:
+ 
+ MAKEFILE-$(CONFIG_MODE_TT) += Makefile-tt
+ MAKEFILE-$(CONFIG_MODE_SKAS) += Makefile-skas
+@@ -41,6 +43,9 @@
+   include $(addprefix $(ARCH_DIR)/,$(MAKEFILE-y))
+ endif
+ 
++include $(ARCH_DIR)/Makefile-$(SUBARCH)
++include $(ARCH_DIR)/Makefile-os-$(OS)
++
+ EXTRAVERSION := $(EXTRAVERSION)-1um
+ 
+ ARCH_INCLUDE = -I$(ARCH_DIR)/include
+@@ -52,14 +57,20 @@
+ 
+ CFLAGS += $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \
+ 	-D_LARGEFILE64_SOURCE $(ARCH_INCLUDE) -Derrno=kernel_errno \
+-	$(MODE_INCLUDE)
++	-Dsigprocmask=kernel_sigprocmask $(MODE_INCLUDE)
+ 
+ LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc
+ 
++# These are needed for clean and mrproper, since in that case .config is not
++# included; the values here are meaningless
++
++CONFIG_NEST_LEVEL ?= 0
++CONFIG_KERNEL_HALF_GIGS ?=  0
++
+ SIZE = (($(CONFIG_NEST_LEVEL) + $(CONFIG_KERNEL_HALF_GIGS)) * 0x20000000)
+ 
+ ifeq ($(CONFIG_MODE_SKAS), y)
+-$(SYS_HEADERS) : $(ARCH_DIR)/kernel/skas/include/skas_ptregs.h
++$(SYS_HEADERS) : $(TOPDIR)/$(ARCH_DIR)/include/skas_ptregs.h
+ endif
+ 
+ include/linux/version.h: arch/$(ARCH)/Makefile
+@@ -98,17 +109,17 @@
+ CONFIG_KERNEL_STACK_ORDER ?= 2
+ STACK_SIZE := $(shell echo $$[ 4096 * (1 << $(CONFIG_KERNEL_STACK_ORDER)) ] )
+ 
+-AFLAGS_vmlinux.lds.o = -U$(SUBARCH) \
++AFLAGS_vmlinux.lds.o = $(shell echo -U$(SUBARCH) \
+ 	-DSTART=$$(($(TOP_ADDR) - $(SIZE))) -DELF_ARCH=$(ELF_ARCH) \
+ 	-DELF_FORMAT=\"$(ELF_FORMAT)\" $(CPP_MODE_TT) \
+-	-DKERNEL_STACK_SIZE=$(STACK_SIZE)
++	-DKERNEL_STACK_SIZE=$(STACK_SIZE))
+ 
+-AFLAGS_$(LD_SCRIPT-y:.s=).o = $(AFLAGS_vmlinux.lds.o) -P -C -Uum
++export AFLAGS_$(LD_SCRIPT-y:.s=).o = $(AFLAGS_vmlinux.lds.o) -P -C -Uum
+ 
+ LD_SCRIPT-y := $(ARCH_DIR)/$(LD_SCRIPT-y)
+ 
+-$(LD_SCRIPT-y) : $(LD_SCRIPT-y:.s=.S) scripts FORCE
+-	$(call if_changed_dep,as_s_S)
++#$(LD_SCRIPT-y) : $(LD_SCRIPT-y:.s=.S) scripts FORCE
++#	$(call if_changed_dep,as_s_S)
+ 
+ linux: vmlinux $(LD_SCRIPT-y)
+ 	$(CC) -Wl,-T,$(LD_SCRIPT-y) $(LINK-y) $(LINK_WRAPS) \
+@@ -116,16 +127,22 @@
+ 
+ USER_CFLAGS := $(patsubst -I%,,$(CFLAGS))
+ USER_CFLAGS := $(patsubst -Derrno=kernel_errno,,$(USER_CFLAGS))
++USER_CFLAGS := $(patsubst -Dsigprocmask=kernel_sigprocmask,,$(USER_CFLAGS))
+ USER_CFLAGS := $(patsubst -D__KERNEL__,,$(USER_CFLAGS)) $(ARCH_INCLUDE) \
+ 	$(MODE_INCLUDE)
+ 
+ # To get a definition of F_SETSIG
+ USER_CFLAGS += -D_GNU_SOURCE
+ 
++ifdef CONFIG_DEBUG_INFO
++USER_CFLAGS          += -g
++endif
++
+ CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/uml.lds.s \
+-	$(ARCH_DIR)/dyn_link.ld.s $(GEN_HEADERS)
++	$(ARCH_DIR)/dyn_link.ld.s $(ARCH_DIR)/include/uml-config.h \
++	$(GEN_HEADERS)
+ 
+-$(ARCH_DIR)/main.o: $(ARCH_DIR)/main.c
++$(ARCH_DIR)/main.o: $(ARCH_DIR)/main.c sys_prepare
+ 	$(CC) $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+ 
+ archmrproper:
+@@ -161,19 +178,23 @@
+ $(ARCH_DIR)/os:
+ 	cd $(ARCH_DIR) && ln -sf os-$(OS) os
+ 
+-$(ARCH_DIR)/include/uml-config.h :
++$(ARCH_DIR)/include/uml-config.h : $(TOPDIR)/include/linux/autoconf.h
+ 	sed 's/ CONFIG/ UML_CONFIG/' $(TOPDIR)/include/linux/autoconf.h > $@
+ 
++filechk_$(ARCH_DIR)/include/task.h := $(ARCH_DIR)/util/mk_task
++
+ $(ARCH_DIR)/include/task.h : $(ARCH_DIR)/util/mk_task
+-	$< > $@
++	$(call filechk,$@)
++
++filechk_$(ARCH_DIR)/include/kern_constants.h := $(ARCH_DIR)/util/mk_constants
+ 
+ $(ARCH_DIR)/include/kern_constants.h : $(ARCH_DIR)/util/mk_constants
+-	$< > $@
++	$(call filechk,$@)
+ 
+-$(ARCH_DIR)/util/mk_task : $(ARCH_DIR)/kernel/skas/include/skas_ptregs.h \
+-	$(ARCH_DIR)/util FORCE ;
++$(ARCH_DIR)/util/mk_task $(ARCH_DIR)/util/mk_constants : $(ARCH_DIR)/util \
++	sys_prepare FORCE ;
+ 
+ $(ARCH_DIR)/util: FORCE
+-	@$(call descend,$@,)
++	$(MAKE) -f scripts/Makefile.build obj=$@
+ 
+-export SUBARCH USER_CFLAGS OS
++export SUBARCH USER_CFLAGS OS 
+diff -Naur a/arch/um/Makefile-i386 b/arch/um/Makefile-i386
+--- a/arch/um/Makefile-i386	2004-01-08 22:28:01.000000000 -0500
++++ b/arch/um/Makefile-i386	2004-01-08 22:34:22.000000000 -0500
+@@ -16,22 +16,28 @@
+ 
+ SYS_HEADERS = $(SYS_DIR)/sc.h $(SYS_DIR)/thread.h
+ 
++sys_prepare: $(SYS_DIR)/sc.h
++
+ prepare: $(SYS_HEADERS)
+ 
++filechk_$(SYS_DIR)/sc.h := $(SYS_UTIL_DIR)/mk_sc
++
+ $(SYS_DIR)/sc.h: $(SYS_UTIL_DIR)/mk_sc
+-	$< > $@
++	$(call filechk,$@)
++
++filechk_$(SYS_DIR)/thread.h := $(SYS_UTIL_DIR)/mk_thread 
+ 
+ $(SYS_DIR)/thread.h: $(SYS_UTIL_DIR)/mk_thread 
+-	$< > $@
++	$(call filechk,$@)
+ 
+-$(SYS_UTIL_DIR)/mk_sc: FORCE ; 
+-	@$(call descend,$(SYS_UTIL_DIR),$@)
++$(SYS_UTIL_DIR)/mk_sc: scripts/fixdep include/config/MARKER FORCE ; 
++	+@$(call descend,$(SYS_UTIL_DIR),$@)
+ 
+-$(SYS_UTIL_DIR)/mk_thread: $(ARCH_SYMLINKS) $(GEN_HEADERS) FORCE ; 
+-	@$(call descend,$(SYS_UTIL_DIR),$@)
++$(SYS_UTIL_DIR)/mk_thread: $(ARCH_SYMLINKS) $(GEN_HEADERS) sys_prepare FORCE ; 
++	+@$(call descend,$(SYS_UTIL_DIR),$@)
+ 
+ $(SYS_UTIL_DIR): include/asm FORCE
+-	@$(call descend,$@,)
++	+@$(call descend,$@,)
+ 
+ sysclean :
+ 	rm -f $(SYS_HEADERS)
+diff -Naur a/arch/um/Makefile-skas b/arch/um/Makefile-skas
+--- a/arch/um/Makefile-skas	2004-01-08 22:20:33.000000000 -0500
++++ b/arch/um/Makefile-skas	2004-01-08 22:27:05.000000000 -0500
+@@ -14,7 +14,7 @@
+ LINK_SKAS = -Wl,-rpath,/lib 
+ LD_SCRIPT_SKAS = dyn.lds.s
+ 
+-GEN_HEADERS += $(ARCH_DIR)/kernel/skas/include/skas_ptregs.h
++GEN_HEADERS += $(TOPDIR)/$(ARCH_DIR)/include/skas_ptregs.h
+ 
+-$(ARCH_DIR)/kernel/skas/include/skas_ptregs.h :
+-	$(MAKE) -C $(ARCH_DIR)/kernel/skas include/skas_ptregs.h
++$(TOPDIR)/$(ARCH_DIR)/include/skas_ptregs.h :
++	$(call descend,$(ARCH_DIR)/kernel/skas,$@)
+diff -Naur a/arch/um/os-Linux/drivers/ethertap_kern.c b/arch/um/os-Linux/drivers/ethertap_kern.c
+--- a/arch/um/os-Linux/drivers/ethertap_kern.c	2004-01-08 22:13:47.000000000 -0500
++++ b/arch/um/os-Linux/drivers/ethertap_kern.c	2004-01-08 22:18:35.000000000 -0500
+@@ -8,7 +8,6 @@
+ #include "linux/init.h"
+ #include "linux/netdevice.h"
+ #include "linux/etherdevice.h"
+-#include "linux/init.h"
+ #include "net_kern.h"
+ #include "net_user.h"
+ #include "etap.h"
+diff -Naur a/arch/um/os-Linux/drivers/ethertap_user.c b/arch/um/os-Linux/drivers/ethertap_user.c
+--- a/arch/um/os-Linux/drivers/ethertap_user.c	2004-01-08 22:21:31.000000000 -0500
++++ b/arch/um/os-Linux/drivers/ethertap_user.c	2004-01-08 22:28:16.000000000 -0500
+@@ -8,7 +8,6 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <stddef.h>
+-#include <fcntl.h>
+ #include <stdlib.h>
+ #include <sys/errno.h>
+ #include <sys/socket.h>
+@@ -42,13 +41,14 @@
+ {
+ 	struct addr_change change;
+ 	void *output;
++	int n;
+ 
+ 	change.what = op;
+ 	memcpy(change.addr, addr, sizeof(change.addr));
+ 	memcpy(change.netmask, netmask, sizeof(change.netmask));
+-	if(write(fd, &change, sizeof(change)) != sizeof(change))
+-		printk("etap_change - request failed, errno = %d\n",
+-		       errno);
++	n = os_write_file(fd, &change, sizeof(change));
++	if(n != sizeof(change))
++		printk("etap_change - request failed, err = %d\n", -n);
+ 	output = um_kmalloc(page_size());
+ 	if(output == NULL)
+ 		printk("etap_change : Failed to allocate output buffer\n");
+@@ -82,15 +82,15 @@
+ 	struct etap_pre_exec_data *data = arg;
+ 
+ 	dup2(data->control_remote, 1);
+-	close(data->data_me);
+-	close(data->control_me);
++	os_close_file(data->data_me);
++	os_close_file(data->control_me);
+ }
+ 
+ static int etap_tramp(char *dev, char *gate, int control_me, 
+ 		      int control_remote, int data_me, int data_remote)
+ {
+ 	struct etap_pre_exec_data pe_data;
+-	int pid, status, err;
++	int pid, status, err, n;
+ 	char version_buf[sizeof("nnnnn\0")];
+ 	char data_fd_buf[sizeof("nnnnnn\0")];
+ 	char gate_buf[sizeof("nnn.nnn.nnn.nnn\0")];
+@@ -114,21 +114,21 @@
+ 	pe_data.data_me = data_me;
+ 	pid = run_helper(etap_pre_exec, &pe_data, args, NULL);
+ 
+-	if(pid < 0) err = errno;
+-	close(data_remote);
+-	close(control_remote);
+-	if(read(control_me, &c, sizeof(c)) != sizeof(c)){
+-		printk("etap_tramp : read of status failed, errno = %d\n",
+-		       errno);
+-		return(EINVAL);
++	if(pid < 0) err = pid;
++	os_close_file(data_remote);
++	os_close_file(control_remote);
++	n = os_read_file(control_me, &c, sizeof(c));
++	if(n != sizeof(c)){
++		printk("etap_tramp : read of status failed, err = %d\n", -n);
++		return(-EINVAL);
+ 	}
+ 	if(c != 1){
+ 		printk("etap_tramp : uml_net failed\n");
+-		err = EINVAL;
+-		if(waitpid(pid, &status, 0) < 0) err = errno;
+-		else if(!WIFEXITED(status) || (WEXITSTATUS(status) != 1)){
++		err = -EINVAL;
++		if(waitpid(pid, &status, 0) < 0)
++			err = -errno;
++		else if(!WIFEXITED(status) || (WEXITSTATUS(status) != 1))
+ 			printk("uml_net didn't exit with status 1\n");
+-		}
+ 	}
+ 	return(err);
+ }
+@@ -143,14 +143,14 @@
+ 	if(err) return(err);
+ 
+ 	err = os_pipe(data_fds, 0, 0);
+-	if(err){
+-		printk("data os_pipe failed - errno = %d\n", -err);
++	if(err < 0){
++		printk("data os_pipe failed - err = %d\n", -err);
+ 		return(err);
+ 	}
+ 
+ 	err = os_pipe(control_fds, 1, 0);
+-	if(err){
+-		printk("control os_pipe failed - errno = %d\n", -err);
++	if(err < 0){
++		printk("control os_pipe failed - err = %d\n", -err);
+ 		return(err);
+ 	}
+ 	
+@@ -167,9 +167,9 @@
+ 		kfree(output);
+ 	}
+ 
+-	if(err != 0){
+-		printk("etap_tramp failed - errno = %d\n", err);
+-		return(-err);
++	if(err < 0){
++		printk("etap_tramp failed - err = %d\n", -err);
++		return(err);
+ 	}
+ 
+ 	pri->data_fd = data_fds[0];
+@@ -183,11 +183,11 @@
+ 	struct ethertap_data *pri = data;
+ 
+ 	iter_addresses(pri->dev, etap_close_addr, &pri->control_fd);
+-	close(fd);
++	os_close_file(fd);
+ 	os_shutdown_socket(pri->data_fd, 1, 1);
+-	close(pri->data_fd);
++	os_close_file(pri->data_fd);
+ 	pri->data_fd = -1;
+-	close(pri->control_fd);
++	os_close_file(pri->control_fd);
+ 	pri->control_fd = -1;
+ }
+ 
+diff -Naur a/arch/um/os-Linux/drivers/tuntap_user.c b/arch/um/os-Linux/drivers/tuntap_user.c
+--- a/arch/um/os-Linux/drivers/tuntap_user.c	2004-01-08 22:32:42.000000000 -0500
++++ b/arch/um/os-Linux/drivers/tuntap_user.c	2004-01-08 22:36:41.000000000 -0500
+@@ -8,7 +8,6 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <errno.h>
+-#include <fcntl.h>
+ #include <sys/wait.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+@@ -61,7 +60,7 @@
+ 	struct tuntap_pre_exec_data *data = arg;
+ 	
+ 	dup2(data->stdout, 1);
+-	close(data->close_me);
++	os_close_file(data->close_me);
+ }
+ 
+ static int tuntap_open_tramp(char *gate, int *fd_out, int me, int remote,
+@@ -86,7 +85,7 @@
+ 
+ 	if(pid < 0) return(-pid);
+ 
+-	close(remote);
++	os_close_file(remote);
+ 
+ 	msg.msg_name = NULL;
+ 	msg.msg_namelen = 0;
+@@ -107,19 +106,19 @@
+ 	if(n < 0){
+ 		printk("tuntap_open_tramp : recvmsg failed - errno = %d\n", 
+ 		       errno);
+-		return(errno);
++		return(-errno);
+ 	}
+ 	waitpid(pid, NULL, 0);
+ 
+ 	cmsg = CMSG_FIRSTHDR(&msg);
+ 	if(cmsg == NULL){
+ 		printk("tuntap_open_tramp : didn't receive a message\n");
+-		return(EINVAL);
++		return(-EINVAL);
+ 	}
+ 	if((cmsg->cmsg_level != SOL_SOCKET) || 
+ 	   (cmsg->cmsg_type != SCM_RIGHTS)){
+ 		printk("tuntap_open_tramp : didn't receive a descriptor\n");
+-		return(EINVAL);
++		return(-EINVAL);
+ 	}
+ 	*fd_out = ((int *) CMSG_DATA(cmsg))[0];
+ 	return(0);
+@@ -133,27 +132,29 @@
+ 	int err, fds[2], len, used;
+ 
+ 	err = tap_open_common(pri->dev, pri->gate_addr);
+-	if(err) return(err);
++	if(err < 0) 
++		return(err);
+ 
+ 	if(pri->fixed_config){
+-		if((pri->fd = open("/dev/net/tun", O_RDWR)) < 0){
+-			printk("Failed to open /dev/net/tun, errno = %d\n",
+-			       errno);
+-			return(-errno);
+-		}
++		pri->fd = os_open_file("/dev/net/tun", of_rdwr(OPENFLAGS()), 0);
++		if(pri->fd < 0){
++			printk("Failed to open /dev/net/tun, err = %d\n",
++			       -pri->fd);
++			return(pri->fd);
++		} 
+ 		memset(&ifr, 0, sizeof(ifr));
+-		ifr.ifr_flags = IFF_TAP;
++		ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
+ 		strlcpy(ifr.ifr_name, pri->dev_name, sizeof(ifr.ifr_name));
+ 		if(ioctl(pri->fd, TUNSETIFF, (void *) &ifr) < 0){
+-			printk("TUNSETIFF failed, errno = %d", errno);
+-			close(pri->fd);
++			printk("TUNSETIFF failed, errno = %d\n", errno);
++			os_close_file(pri->fd);
+ 			return(-errno);
+ 		}
+ 	}
+ 	else {
+ 		err = os_pipe(fds, 0, 0);
+-		if(err){
+-			printk("tuntap_open : os_pipe failed - errno = %d\n",
++		if(err < 0){
++			printk("tuntap_open : os_pipe failed - err = %d\n",
+ 			       -err);
+ 			return(err);
+ 		}
+@@ -166,19 +167,19 @@
+ 					fds[1], buffer, len, &used);
+ 
+ 		output = buffer;
+-		if(err == 0){
+-			pri->dev_name = uml_strdup(buffer);
+-			output += IFNAMSIZ;
+-			printk(output);
+-			free_output_buffer(buffer);
+-		}
+-		else {
+-			printk(output);
++		if(err < 0) {
++			printk("%s", output);
+ 			free_output_buffer(buffer);
+-			printk("tuntap_open_tramp failed - errno = %d\n", err);
+-			return(-err);
++			printk("tuntap_open_tramp failed - err = %d\n", -err);
++			return(err);
+ 		}
+-		close(fds[0]);
++
++		pri->dev_name = uml_strdup(buffer);
++		output += IFNAMSIZ;
++		printk("%s", output);
++		free_output_buffer(buffer);
++
++		os_close_file(fds[0]);
+ 		iter_addresses(pri->dev, open_addr, pri->dev_name);
+ 	}
+ 
+@@ -191,7 +192,7 @@
+ 
+ 	if(!pri->fixed_config) 
+ 		iter_addresses(pri->dev, close_addr, pri->dev_name);
+-	close(fd);
++	os_close_file(fd);
+ 	pri->fd = -1;
+ }
+ 
+diff -Naur a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c
+--- a/arch/um/os-Linux/file.c	2004-01-08 22:32:23.000000000 -0500
++++ b/arch/um/os-Linux/file.c	2004-01-08 22:36:32.000000000 -0500
+@@ -8,6 +8,8 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <signal.h>
++#include <sys/types.h>
++#include <sys/stat.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <sys/ioctl.h>
+@@ -17,33 +19,236 @@
+ #include "user.h"
+ #include "kern_util.h"
+ 
+-int os_file_type(char *file)
++static void copy_stat(struct uml_stat *dst, struct stat64 *src)
++{
++	*dst = ((struct uml_stat) {
++		.ust_dev     = src->st_dev,     /* device */
++		.ust_ino     = src->st_ino,     /* inode */
++		.ust_mode    = src->st_mode,    /* protection */
++		.ust_nlink   = src->st_nlink,   /* number of hard links */
++		.ust_uid     = src->st_uid,     /* user ID of owner */
++		.ust_gid     = src->st_gid,     /* group ID of owner */
++		.ust_size    = src->st_size,    /* total size, in bytes */
++		.ust_blksize = src->st_blksize, /* blocksize for filesys I/O */
++		.ust_blocks  = src->st_blocks,  /* number of blocks allocated */
++		.ust_atime   = src->st_atime,   /* time of last access */
++		.ust_mtime   = src->st_mtime,   /* time of last modification */
++		.ust_ctime   = src->st_ctime,   /* time of last change */
++	});
++}
++
++int os_stat_fd(const int fd, struct uml_stat *ubuf)
++{
++	struct stat64 sbuf;
++	int err;
++
++	do {
++		err = fstat64(fd, &sbuf);
++	} while((err < 0) && (errno == EINTR)) ;
++
++	if(err < 0) 
++		return(-errno);
++
++	if(ubuf != NULL)
++		copy_stat(ubuf, &sbuf);
++	return(err);
++}
++
++int os_stat_file(const char *file_name, struct uml_stat *ubuf)
++{
++	struct stat64 sbuf;
++	int err;
++
++	do {
++		err = stat64(file_name, &sbuf);
++	} while((err < 0) && (errno == EINTR)) ;
++
++	if(err < 0) 
++		return(-errno);
++
++	if(ubuf != NULL)
++		copy_stat(ubuf, &sbuf);
++	return(err);
++}
++
++int os_access(const char* file, int mode)
++{
++	int amode, err;
++
++	amode=(mode&OS_ACC_R_OK ? R_OK : 0) | (mode&OS_ACC_W_OK ? W_OK : 0) |
++	      (mode&OS_ACC_X_OK ? X_OK : 0) | (mode&OS_ACC_F_OK ? F_OK : 0) ;
++
++	err = access(file, amode);
++	if(err < 0)
++		return(-errno);
++
++	return(0);
++}
++
++void os_print_error(int error, const char* str)
++{
++	errno = error < 0 ? -error : error;
++
++	perror(str);
++}
++
++/* FIXME? required only by hostaudio (because it passes ioctls verbatim) */
++int os_ioctl_generic(int fd, unsigned int cmd, unsigned long arg)
++{
++	int err;
++
++	err = ioctl(fd, cmd, arg);
++	if(err < 0)
++		return(-errno);
++
++	return(err);
++}
++
++int os_window_size(int fd, int *rows, int *cols)
++{
++	struct winsize size;
++
++	if(ioctl(fd, TIOCGWINSZ, &size) < 0)
++		return(-errno);
++
++	*rows = size.ws_row;
++	*cols = size.ws_col;
++
++	return(0);
++}
++
++int os_new_tty_pgrp(int fd, int pid)
+ {
+-	struct stat64 buf;
++	if(ioctl(fd, TIOCSCTTY, 0) < 0){
++		printk("TIOCSCTTY failed, errno = %d\n", errno);
++		return(-errno);
++	}
++
++	if(tcsetpgrp(fd, pid) < 0){
++		printk("tcsetpgrp failed, errno = %d\n", errno);
++		return(-errno);
++	}
++
++	return(0);
++}
++
++/* FIXME: ensure namebuf in os_get_if_name is big enough */
++int os_get_ifname(int fd, char* namebuf)
++{
++	if(ioctl(fd, SIOCGIFNAME, namebuf) < 0)
++		return(-errno);
++
++	return(0);
++}
++
++int os_set_slip(int fd)
++{
++	int disc, sencap;
++
++	disc = N_SLIP;
++	if(ioctl(fd, TIOCSETD, &disc) < 0){
++		printk("Failed to set slip line discipline - "
++		       "errno = %d\n", errno);
++		return(-errno);
++	}
++
++	sencap = 0;
++	if(ioctl(fd, SIOCSIFENCAP, &sencap) < 0){
++		printk("Failed to set slip encapsulation - "
++		       "errno = %d\n", errno);
++		return(-errno);
++	}
++
++	return(0);
++}
++
++int os_set_owner(int fd, int pid)
++{
++	if(fcntl(fd, F_SETOWN, pid) < 0){
++		int save_errno = errno;
++
++		if(fcntl(fd, F_GETOWN, 0) != pid){
++			return(-save_errno);
++		}
++	}
++
++	return(0);
++}
++
++/* FIXME? moved wholesale from sigio_user.c to get fcntls out of that file */ 
++int os_sigio_async(int master, int slave)
++{
++	int flags;
+ 
+-	if(stat64(file, &buf) == -1)
++	flags = fcntl(master, F_GETFL);
++	if(flags < 0) {
++		printk("fcntl F_GETFL failed, errno = %d\n", errno);
+ 		return(-errno);
++	}
+ 
+-	if(S_ISDIR(buf.st_mode)) return(OS_TYPE_DIR);
+-	else if(S_ISLNK(buf.st_mode)) return(OS_TYPE_SYMLINK);
+-	else if(S_ISCHR(buf.st_mode)) return(OS_TYPE_CHARDEV);
+-	else if(S_ISBLK(buf.st_mode)) return(OS_TYPE_BLOCKDEV);
+-	else if(S_ISFIFO(buf.st_mode)) return(OS_TYPE_FIFO);
+-	else if(S_ISSOCK(buf.st_mode)) return(OS_TYPE_SOCK);
++	if((fcntl(master, F_SETFL, flags | O_NONBLOCK | O_ASYNC) < 0) ||
++	   (fcntl(master, F_SETOWN, os_getpid()) < 0)){
++		printk("fcntl F_SETFL or F_SETOWN failed, errno = %d\n", errno);
++		return(-errno);
++	}
++
++	if((fcntl(slave, F_SETFL, flags | O_NONBLOCK) < 0)){
++		printk("fcntl F_SETFL failed, errno = %d\n", errno);
++		return(-errno);
++	}
++
++	return(0);
++}
++
++int os_mode_fd(int fd, int mode)
++{
++	int err;
++
++	do {
++		err = fchmod(fd, mode);
++	} while((err < 0) && (errno==EINTR)) ;
++
++	if(err < 0)
++		return(-errno);
++
++	return(0);
++}
++
++int os_file_type(char *file)
++{
++	struct uml_stat buf;
++	int err;
++
++	err = os_stat_file(file, &buf);
++	if(err < 0)
++		return(err);
++
++	if(S_ISDIR(buf.ust_mode)) return(OS_TYPE_DIR);
++	else if(S_ISLNK(buf.ust_mode)) return(OS_TYPE_SYMLINK);
++	else if(S_ISCHR(buf.ust_mode)) return(OS_TYPE_CHARDEV);
++	else if(S_ISBLK(buf.ust_mode)) return(OS_TYPE_BLOCKDEV);
++	else if(S_ISFIFO(buf.ust_mode)) return(OS_TYPE_FIFO);
++	else if(S_ISSOCK(buf.ust_mode)) return(OS_TYPE_SOCK);
+ 	else return(OS_TYPE_FILE);
+ }
+ 
+ int os_file_mode(char *file, struct openflags *mode_out)
+ {
++	int err;
++
+ 	*mode_out = OPENFLAGS();
+ 
+-	if(!access(file, W_OK)) *mode_out = of_write(*mode_out);
+-	else if(errno != EACCES) 
+-		return(-errno);
++	err = os_access(file, OS_ACC_W_OK);
++	if((err < 0) && (err != -EACCES))
++		return(err);
+ 
+-	if(!access(file, R_OK)) *mode_out = of_read(*mode_out);
+-	else if(errno != EACCES) 
+-		return(-errno);
++	*mode_out = of_write(*mode_out);
++
++	err = os_access(file, OS_ACC_R_OK);
++	if((err < 0) && (err != -EACCES))
++		return(err);
++
++	*mode_out = of_read(*mode_out);
+ 
+ 	return(0);
+ }
+@@ -63,16 +268,14 @@
+ 	if(flags.e) f |= O_EXCL;
+ 
+ 	fd = open64(file, f, mode);
+-	if(fd < 0) return(-errno);
++	if(fd < 0) 
++		return(-errno);
+ 	
+-	if(flags.cl){
+-		if(fcntl(fd, F_SETFD, 1)){
+-			close(fd);
+-			return(-errno);
+-		}
++	if(flags.cl && fcntl(fd, F_SETFD, 1)){
++		os_close_file(fd);
++		return(-errno);
+ 	}
+ 
+- 	return(fd);
+ 	return(fd);
+ }
+ 
+@@ -90,7 +293,7 @@
+ 
+ 	err = connect(fd, (struct sockaddr *) &sock, sizeof(sock));
+ 	if(err)
+-		return(err);
++		return(-errno);
+ 
+ 	return(fd);
+ }
+@@ -109,88 +312,162 @@
+ 	return(0);
+ }
+ 
+-int os_read_file(int fd, void *buf, int len)
++static int fault_buffer(void *start, int len, 
++			int (*copy_proc)(void *addr, void *buf, int len))
+ {
+-	int n;
++	int page = getpagesize(), i;
++	char c;
+ 
+-	/* Force buf into memory if it's not already. */
++	for(i = 0; i < len; i += page){
++		if((*copy_proc)(start + i, &c, sizeof(c)))
++			return(-EFAULT);
++	}
++	if((len % page) != 0){
++		if((*copy_proc)(start + len - 1, &c, sizeof(c)))
++			return(-EFAULT);
++	}
++	return(0);
++}
+ 
+-	/* XXX This fails if buf is kernel memory */
+-#ifdef notdef
+-	if(copy_to_user_proc(buf, &c, sizeof(c)))
+-		return(-EFAULT);
+-#endif
++static int file_io(int fd, void *buf, int len,
++		   int (*io_proc)(int fd, void *buf, int len),
++		   int (*copy_user_proc)(void *addr, void *buf, int len))
++{
++	int n, err;
++
++	do {
++		n = (*io_proc)(fd, buf, len);
++		if((n < 0) && (errno == EFAULT)){
++			err = fault_buffer(buf, len, copy_user_proc);
++			if(err)
++				return(err);
++			n = (*io_proc)(fd, buf, len);
++		}
++	} while((n < 0) && (errno == EINTR));
+ 
+-	n = read(fd, buf, len);
+ 	if(n < 0)
+ 		return(-errno);
+ 	return(n);
+ }
+ 
+-int os_write_file(int fd, void *buf, int count)
++int os_read_file(int fd, void *buf, int len)
+ {
+-	int n;
+-
+-	/* Force buf into memory if it's not already. */
+-	
+-	/* XXX This fails if buf is kernel memory */
+-#ifdef notdef
+-	if(copy_to_user_proc(buf, buf, buf[0]))
+-		return(-EFAULT);
+-#endif
++	return(file_io(fd, buf, len, (int (*)(int, void *, int)) read, 
++		       copy_from_user_proc));
++}
+ 
+-	n = write(fd, buf, count);
+-	if(n < 0)
+-		return(-errno);
+-	return(n);
++int os_write_file(int fd, const void *buf, int len)
++{
++	return(file_io(fd, (void *) buf, len, 
++		       (int (*)(int, void *, int)) write, copy_to_user_proc));
+ }
+ 
+ int os_file_size(char *file, long long *size_out)
+ {
+-	struct stat64 buf;
++	struct uml_stat buf;
++	int err;
+ 
+-	if(stat64(file, &buf) == -1){
+-		printk("Couldn't stat \"%s\" : errno = %d\n", file, errno);
+-		return(-errno);
++	err = os_stat_file(file, &buf);
++	if(err < 0){
++		printk("Couldn't stat \"%s\" : err = %d\n", file, -err);
++		return(err);
+ 	}
+-	if(S_ISBLK(buf.st_mode)){
++
++	if(S_ISBLK(buf.ust_mode)){
+ 		int fd, blocks;
+ 
+-		if((fd = open64(file, O_RDONLY)) < 0){
+-			printk("Couldn't open \"%s\", errno = %d\n", file,
+-			       errno);
+-			return(-errno);
++		fd = os_open_file(file, of_read(OPENFLAGS()), 0);
++		if(fd < 0){
++			printk("Couldn't open \"%s\", errno = %d\n", file, -fd);
++			return(fd);
+ 		}
+ 		if(ioctl(fd, BLKGETSIZE, &blocks) < 0){
+ 			printk("Couldn't get the block size of \"%s\", "
+ 			       "errno = %d\n", file, errno);
+-			close(fd);
+-			return(-errno);
++			err = -errno;
++			os_close_file(fd);
++			return(err);
+ 		}
+ 		*size_out = ((long long) blocks) * 512;
+-		close(fd);
++		os_close_file(fd);
+ 		return(0);
+ 	}
+-	*size_out = buf.st_size;
++	*size_out = buf.ust_size;
++	return(0);
++}
++
++int os_file_modtime(char *file, unsigned long *modtime)
++{
++	struct uml_stat buf;
++	int err;
++
++	err = os_stat_file(file, &buf);
++	if(err < 0){
++		printk("Couldn't stat \"%s\" : err = %d\n", file, -err);
++		return(err);
++	}
++
++	*modtime = buf.ust_mtime;
+ 	return(0);
+ }
+ 
++int os_get_exec_close(int fd, int* close_on_exec)
++{
++	int ret;
++
++	do {
++		ret = fcntl(fd, F_GETFD);
++	} while((ret < 0) && (errno == EINTR)) ;
++
++	if(ret < 0)
++		return(-errno);
++
++	*close_on_exec = (ret&FD_CLOEXEC) ? 1 : 0;
++	return(ret);
++}
++
++int os_set_exec_close(int fd, int close_on_exec)
++{
++	int flag, err;
++
++	if(close_on_exec) flag = FD_CLOEXEC;
++	else flag = 0;
++
++	do {
++		err = fcntl(fd, F_SETFD, flag);
++	} while((err < 0) && (errno == EINTR)) ;
++
++	if(err < 0)
++		return(-errno);
++	return(err);
++}
++
+ int os_pipe(int *fds, int stream, int close_on_exec)
+ {
+ 	int err, type = stream ? SOCK_STREAM : SOCK_DGRAM;
+ 
+ 	err = socketpair(AF_UNIX, type, 0, fds);
+-	if(err) 
++	if(err < 0) 
+ 		return(-errno);
+ 
+ 	if(!close_on_exec)
+ 		return(0);
+ 
+-	if((fcntl(fds[0], F_SETFD, 1) < 0) || (fcntl(fds[1], F_SETFD, 1) < 0))
+-		printk("os_pipe : Setting FD_CLOEXEC failed, errno = %d", 
+-		       errno);
++	err = os_set_exec_close(fds[0], 1);
++	if(err < 0)
++		goto error;
++
++	err = os_set_exec_close(fds[1], 1);
++	if(err < 0)
++		goto error;
+ 
+ 	return(0);
++
++ error:
++	printk("os_pipe : Setting FD_CLOEXEC failed, err = %d\n", -err);
++	os_close_file(fds[1]);
++	os_close_file(fds[0]);
++	return(err);
+ }
+ 
+ int os_set_fd_async(int fd, int owner)
+@@ -270,7 +547,7 @@
+ 		return(-EINVAL);
+ 	}
+ 	err = shutdown(fd, what);
+-	if(err)
++	if(err < 0)
+ 		return(-errno);
+ 	return(0);
+ }
+@@ -315,7 +592,7 @@
+ 	return(new);
+ }
+ 
+-int create_unix_socket(char *file, int len)
++int os_create_unix_socket(char *file, int len, int close_on_exec)
+ {
+ 	struct sockaddr_un addr;
+ 	int sock, err;
+@@ -327,6 +604,13 @@
+ 		return(-errno);
+ 	}
+ 
++	if(close_on_exec) {
++		err = os_set_exec_close(sock, 1);
++		if(err < 0)
++			printk("create_unix_socket : close_on_exec failed, "
++		       "err = %d", -err);
++	}
++
+ 	addr.sun_family = AF_UNIX;
+ 
+ 	/* XXX Be more careful about overflow */
+@@ -334,14 +618,45 @@
+ 
+ 	err = bind(sock, (struct sockaddr *) &addr, sizeof(addr));
+ 	if (err < 0){
+-		printk("create_listening_socket - bind failed, errno = %d\n",
+-		       errno);
++		printk("create_listening_socket at '%s' - bind failed, "
++		       "errno = %d\n", file, errno);
+ 		return(-errno);
+ 	}
+ 
+ 	return(sock);
+ }
+ 
++void os_flush_stdout(void)
++{
++	fflush(stdout);
++}
++
++int os_lock_file(int fd, int excl)
++{
++	int type = excl ? F_WRLCK : F_RDLCK;
++	struct flock lock = ((struct flock) { .l_type	= type,
++					      .l_whence	= SEEK_SET,
++					      .l_start	= 0,
++					      .l_len	= 0 } );
++	int err, save;
++
++	err = fcntl(fd, F_SETLK, &lock);
++	if(!err)
++		goto out;
++
++	save = -errno;
++	err = fcntl(fd, F_GETLK, &lock);
++	if(err){
++		err = -errno;
++		goto out;
++	}
++	
++	printk("F_SETLK failed, file already locked by pid %d\n", lock.l_pid);
++	err = save;
++ out:
++	return(err);
++}
++
+ /*
+  * Overrides for Emacs so that we follow Linus's tabbing style.
+  * Emacs will notice this stuff at the end of the file and automatically
+diff -Naur a/arch/um/os-Linux/process.c b/arch/um/os-Linux/process.c
+--- a/arch/um/os-Linux/process.c	2004-01-08 22:14:47.000000000 -0500
++++ b/arch/um/os-Linux/process.c	2004-01-08 22:20:12.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* 
+- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2002 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+@@ -7,32 +7,37 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <signal.h>
++#include <linux/unistd.h>
+ #include <sys/mman.h>
+ #include <sys/wait.h>
+ #include "os.h"
+ #include "user.h"
+ 
++#define ARBITRARY_ADDR -1
++#define FAILURE_PID    -1
++
+ unsigned long os_process_pc(int pid)
+ {
+ 	char proc_stat[sizeof("/proc/#####/stat\0")], buf[256];
+ 	unsigned long pc;
+-	int fd;
++	int fd, err;
+ 
+ 	sprintf(proc_stat, "/proc/%d/stat", pid);
+ 	fd = os_open_file(proc_stat, of_read(OPENFLAGS()), 0);
+ 	if(fd < 0){
+-		printk("os_process_pc - couldn't open '%s', errno = %d\n", 
+-		       proc_stat, errno);
+-		return(-1);
++		printk("os_process_pc - couldn't open '%s', err = %d\n", 
++		       proc_stat, -fd);
++		return(ARBITRARY_ADDR);
+ 	}
+-	if(read(fd, buf, sizeof(buf)) < 0){
+-		printk("os_process_pc - couldn't read '%s', errno = %d\n", 
+-		       proc_stat, errno);
+-		close(fd);
+-		return(-1);
++	err = os_read_file(fd, buf, sizeof(buf));
++	if(err < 0){
++		printk("os_process_pc - couldn't read '%s', err = %d\n", 
++		       proc_stat, -err);
++		os_close_file(fd);
++		return(ARBITRARY_ADDR);
+ 	}
+-	close(fd);
+-	pc = -1;
++	os_close_file(fd);
++	pc = ARBITRARY_ADDR;
+ 	if(sscanf(buf, "%*d %*s %*c %*d %*d %*d %*d %*d %*d %*d %*d "
+ 		  "%*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d "
+ 		  "%*d %*d %*d %*d %ld", &pc) != 1){
+@@ -52,22 +57,23 @@
+ 	snprintf(stat, sizeof(stat), "/proc/%d/stat", pid);
+ 	fd = os_open_file(stat, of_read(OPENFLAGS()), 0);
+ 	if(fd < 0){
+-		printk("Couldn't open '%s', errno = %d\n", stat, -fd);
+-		return(-1);
++		printk("Couldn't open '%s', err = %d\n", stat, -fd);
++		return(FAILURE_PID);
+ 	}
+ 
+-	n = read(fd, data, sizeof(data));
+-	close(fd);
++	n = os_read_file(fd, data, sizeof(data));
++	os_close_file(fd);
+ 
+ 	if(n < 0){
+-		printk("Couldn't read '%s', errno = %d\n", stat);
+-		return(-1);
++		printk("Couldn't read '%s', err = %d\n", stat, -n);
++		return(FAILURE_PID);
+ 	}
+ 
+-	parent = -1;
++	parent = FAILURE_PID;
+ 	/* XXX This will break if there is a space in the command */
+ 	n = sscanf(data, "%*d %*s %*c %d", &parent);
+-	if(n != 1) printk("Failed to scan '%s'\n", data);
++	if(n != 1) 
++		printk("Failed to scan '%s'\n", data);
+ 
+ 	return(parent);
+ }
+@@ -87,7 +93,8 @@
+ 
+ void os_usr1_process(int pid)
+ {
+-	kill(pid, SIGUSR1);
++	syscall(__NR_tkill, pid, SIGUSR1); 
++	/* kill(pid, SIGUSR1); */
+ }
+ 
+ int os_getpid(void)
+@@ -95,7 +102,7 @@
+ 	return(getpid());
+ }
+ 
+-int os_map_memory(void *virt, int fd, unsigned long off, unsigned long len, 
++int os_map_memory(void *virt, int fd, unsigned long long off, unsigned long len,
+ 		  int r, int w, int x)
+ {
+ 	void *loc;
+@@ -104,8 +111,8 @@
+ 	prot = (r ? PROT_READ : 0) | (w ? PROT_WRITE : 0) | 
+ 		(x ? PROT_EXEC : 0);
+ 
+-	loc = mmap((void *) virt, len, prot, MAP_SHARED | MAP_FIXED, 
+-		   fd, off);
++	loc = mmap64((void *) virt, len, prot, MAP_SHARED | MAP_FIXED, 
++		     fd, off);
+ 	if(loc == MAP_FAILED)
+ 		return(-errno);
+ 	return(0);
+@@ -126,7 +133,8 @@
+         int err;
+ 
+         err = munmap(addr, len);
+-        if(err < 0) return(-errno);
++	if(err < 0) 
++		return(-errno);
+         return(0);
+ }
+ 
+diff -Naur a/arch/um/os-Linux/tty.c b/arch/um/os-Linux/tty.c
+--- a/arch/um/os-Linux/tty.c	2004-01-08 22:23:12.000000000 -0500
++++ b/arch/um/os-Linux/tty.c	2004-01-08 22:30:17.000000000 -0500
+@@ -28,10 +28,10 @@
+ 	struct grantpt_info info;
+ 	int fd;
+ 
+-	if((fd = os_open_file("/dev/ptmx", of_rdwr(OPENFLAGS()), 0)) < 0){
+-		printk("get_pty : Couldn't open /dev/ptmx - errno = %d\n",
+-		       errno);
+-		return(-1);
++	fd = os_open_file("/dev/ptmx", of_rdwr(OPENFLAGS()), 0);
++	if(fd < 0){
++		printk("get_pty : Couldn't open /dev/ptmx - err = %d\n", -fd);
++		return(fd);
+ 	}
+ 
+ 	info.fd = fd;
+@@ -39,7 +39,7 @@
+ 
+ 	if(info.res < 0){
+ 		printk("get_pty : Couldn't grant pty - errno = %d\n", 
+-		       info.err);
++		       -info.err);
+ 		return(-1);
+ 	}
+ 	if(unlockpt(fd) < 0){
+diff -Naur a/arch/um/sys-i386/bugs.c b/arch/um/sys-i386/bugs.c
+--- a/arch/um/sys-i386/bugs.c	2004-01-08 22:27:56.000000000 -0500
++++ b/arch/um/sys-i386/bugs.c	2004-01-08 22:34:17.000000000 -0500
+@@ -4,20 +4,21 @@
+  */
+ 
+ #include <unistd.h>
+-#include <fcntl.h>
+ #include <errno.h>
+ #include <string.h>
+ #include <sys/signal.h>
++#include <asm/ldt.h>
+ #include "kern_util.h"
+ #include "user.h"
+ #include "sysdep/ptrace.h"
+ #include "task.h"
++#include "os.h"
+ 
+ #define MAXTOKEN 64
+ 
+ /* Set during early boot */
+-int cpu_has_cmov = 1;
+-int cpu_has_xmm = 0;
++int host_has_cmov = 1;
++int host_has_xmm = 0;
+ 
+ static char token(int fd, char *buf, int len, char stop)
+ {
+@@ -27,13 +28,15 @@
+ 	ptr = buf;
+ 	end = &buf[len];
+ 	do {
+-		n = read(fd, ptr, sizeof(*ptr));
++		n = os_read_file(fd, ptr, sizeof(*ptr));
+ 		c = *ptr++;
+-		if(n == 0) return(0);
+-		else if(n != sizeof(*ptr)){
+-			printk("Reading /proc/cpuinfo failed, "
+-			       "errno = %d\n", errno);
+-			return(-errno);
++		if(n != sizeof(*ptr)){
++			if(n == 0) return(0);
++			printk("Reading /proc/cpuinfo failed, err = %d\n", -n);
++			if(n < 0) 
++				return(n);
++			else 
++				return(-EIO);
+ 		}
+ 	} while((c != '\n') && (c != stop) && (ptr < end));
+ 
+@@ -45,45 +48,79 @@
+ 	return(c);
+ }
+ 
+-static int check_cpu_feature(char *feature, int *have_it)
++static int find_cpuinfo_line(int fd, char *key, char *scratch, int len)
+ {
+-	char buf[MAXTOKEN], c;
+-	int fd, len = sizeof(buf)/sizeof(buf[0]), n;
+-
+-	printk("Checking for host processor %s support...", feature);
+-	fd = open("/proc/cpuinfo", O_RDONLY);
+-	if(fd < 0){
+-		printk("Couldn't open /proc/cpuinfo, errno = %d\n", errno);
+-		return(0);
+-	}
++	int n;
++	char c;
+ 
+-	*have_it = 0;
+-	buf[len - 1] = '\0';
++	scratch[len - 1] = '\0';
+ 	while(1){
+-		c = token(fd, buf, len - 1, ':');
+-		if(c <= 0) goto out;
++		c = token(fd, scratch, len - 1, ':');
++		if(c <= 0)
++			return(0);
+ 		else if(c != ':'){
+ 			printk("Failed to find ':' in /proc/cpuinfo\n");
+-			goto out;
++			return(0);
+ 		}
+ 
+-		if(!strncmp(buf, "flags", strlen("flags"))) break;
++		if(!strncmp(scratch, key, strlen(key))) 
++			return(1);
+ 
+ 		do {
+-			n = read(fd, &c, sizeof(c));
++			n = os_read_file(fd, &c, sizeof(c));
+ 			if(n != sizeof(c)){
+ 				printk("Failed to find newline in "
+-				       "/proc/cpuinfo, n = %d, errno = %d\n",
+-				       n, errno);
+-				goto out;
++				       "/proc/cpuinfo, err = %d\n", -n);
++				return(0);
+ 			}
+ 		} while(c != '\n');
+ 	}
++	return(0);
++}
++
++int cpu_feature(char *what, char *buf, int len)
++{
++	int fd, ret = 0;
++
++	fd = os_open_file("/proc/cpuinfo", of_read(OPENFLAGS()), 0);
++	if(fd < 0){
++		printk("Couldn't open /proc/cpuinfo, err = %d\n", -fd);
++		return(0);
++	}
++
++	if(!find_cpuinfo_line(fd, what, buf, len)){
++		printk("Couldn't find '%s' line in /proc/cpuinfo\n", what);
++		goto out_close;
++	}
++
++	token(fd, buf, len, '\n');
++	ret = 1;
++
++ out_close:
++	os_close_file(fd);
++	return(ret);
++}
++
++static int check_cpu_flag(char *feature, int *have_it)
++{
++	char buf[MAXTOKEN], c;
++	int fd, len = sizeof(buf)/sizeof(buf[0]);
++
++	printk("Checking for host processor %s support...", feature);
++	fd = os_open_file("/proc/cpuinfo", of_read(OPENFLAGS()), 0);
++	if(fd < 0){
++		printk("Couldn't open /proc/cpuinfo, err = %d\n", -fd);
++		return(0);
++	}
++
++	*have_it = 0;
++	if(!find_cpuinfo_line(fd, "flags", buf, sizeof(buf) / sizeof(buf[0])))
++		goto out;
+ 
+ 	c = token(fd, buf, len - 1, ' ');
+ 	if(c < 0) goto out;
+ 	else if(c != ' '){
+-		printk("Failed to find ':' in /proc/cpuinfo\n");
++		printk("Failed to find ' ' in /proc/cpuinfo\n");
+ 		goto out;
+ 	}
+ 
+@@ -100,21 +137,48 @@
+  out:
+ 	if(*have_it == 0) printk("No\n");
+ 	else if(*have_it == 1) printk("Yes\n");
+-	close(fd);
++	os_close_file(fd);
+ 	return(1);
+ }
+ 
++#if 0 /* This doesn't work in tt mode, plus it's causing compilation problems
++       * for some people.
++       */
++static void disable_lcall(void)
++{
++	struct modify_ldt_ldt_s ldt;
++	int err;
++
++	bzero(&ldt, sizeof(ldt));
++	ldt.entry_number = 7;
++	ldt.base_addr = 0;
++	ldt.limit = 0;
++	err = modify_ldt(1, &ldt, sizeof(ldt));
++	if(err)
++		printk("Failed to disable lcall7 - errno = %d\n", errno);
++}
++#endif
++
++void arch_init_thread(void)
++{
++#if 0
++	disable_lcall();
++#endif
++}
++
+ void arch_check_bugs(void)
+ {
+ 	int have_it;
+ 
+-	if(access("/proc/cpuinfo", R_OK)){
++	if(os_access("/proc/cpuinfo", OS_ACC_R_OK) < 0){
+ 		printk("/proc/cpuinfo not available - skipping CPU capability "
+ 		       "checks\n");
+ 		return;
+ 	}
+-	if(check_cpu_feature("cmov", &have_it)) cpu_has_cmov = have_it;
+-	if(check_cpu_feature("xmm", &have_it)) cpu_has_xmm = have_it;
++	if(check_cpu_flag("cmov", &have_it)) 
++		host_has_cmov = have_it;
++	if(check_cpu_flag("xmm", &have_it)) 
++		host_has_xmm = have_it;
+ }
+ 
+ int arch_handle_signal(int sig, union uml_pt_regs *regs)
+@@ -130,18 +194,18 @@
+ 	if((*((char *) ip) != 0x0f) || ((*((char *) (ip + 1)) & 0xf0) != 0x40))
+ 		return(0);
+ 
+-	if(cpu_has_cmov == 0)
++	if(host_has_cmov == 0)
+ 		panic("SIGILL caused by cmov, which this processor doesn't "
+ 		      "implement, boot a filesystem compiled for older "
+ 		      "processors");
+-	else if(cpu_has_cmov == 1)
++	else if(host_has_cmov == 1)
+ 		panic("SIGILL caused by cmov, which this processor claims to "
+ 		      "implement");
+-	else if(cpu_has_cmov == -1)
++	else if(host_has_cmov == -1)
+ 		panic("SIGILL caused by cmov, couldn't tell if this processor "
+ 		      "implements it, boot a filesystem compiled for older "
+ 		      "processors");
+-	else panic("Bad value for cpu_has_cmov (%d)", cpu_has_cmov);
++	else panic("Bad value for host_has_cmov (%d)", host_has_cmov);
+ 	return(0);
+ }
+ 
+diff -Naur a/arch/um/sys-i386/Makefile b/arch/um/sys-i386/Makefile
+--- a/arch/um/sys-i386/Makefile	2004-01-08 22:15:20.000000000 -0500
++++ b/arch/um/sys-i386/Makefile	2004-01-08 22:21:10.000000000 -0500
+@@ -1,7 +1,8 @@
+-obj-y = bugs.o checksum.o extable.o fault.o ksyms.o ldt.o module.o \
+-	ptrace.o ptrace_user.o semaphore.o sigcontext.o syscalls.o sysrq.o
++obj-y = bugs.o checksum.o extable.o fault.o ksyms.o ldt.o ptrace.o \
++	ptrace_user.o semaphore.o sigcontext.o syscalls.o sysrq.o time.o
+ 
+ obj-$(CONFIG_HIGHMEM) += highmem.o
++obj-$(CONFIG_MODULES) += module.o
+ 
+ USER_OBJS := bugs.o ptrace_user.o sigcontext.o fault.o
+ USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
+@@ -9,6 +10,8 @@
+ SYMLINKS = semaphore.c highmem.c module.c
+ SYMLINKS := $(foreach f,$(SYMLINKS),$(src)/$f)
+ 
++clean-files := $(SYMLINKS)
++
+ semaphore.c-dir = kernel
+ highmem.c-dir = mm
+ module.c-dir = kernel
+@@ -24,8 +27,7 @@
+ $(SYMLINKS): 
+ 	$(call make_link,$@)
+ 
+-clean:
+-	$(MAKE) -C util clean
++subdir- := util
+ 
+ fastdep:
+ 
+diff -Naur a/arch/um/sys-i386/ptrace_user.c b/arch/um/sys-i386/ptrace_user.c
+--- a/arch/um/sys-i386/ptrace_user.c	2004-01-08 22:16:43.000000000 -0500
++++ b/arch/um/sys-i386/ptrace_user.c	2004-01-08 22:22:45.000000000 -0500
+@@ -39,10 +39,10 @@
+ 	nregs = sizeof(dummy->u_debugreg)/sizeof(dummy->u_debugreg[0]);
+ 	for(i = 0; i < nregs; i++){
+ 		if((i == 4) || (i == 5)) continue;
+-		if(ptrace(PTRACE_POKEUSR, pid, &dummy->u_debugreg[i],
++		if(ptrace(PTRACE_POKEUSER, pid, &dummy->u_debugreg[i],
+ 			  regs[i]) < 0)
+-			printk("write_debugregs - ptrace failed, "
+-			       "errno = %d\n", errno);
++			printk("write_debugregs - ptrace failed on "
++			       "register %d, errno = %d\n", errno);
+ 	}
+ }
+ 
+@@ -54,7 +54,7 @@
+ 	dummy = NULL;
+ 	nregs = sizeof(dummy->u_debugreg)/sizeof(dummy->u_debugreg[0]);
+ 	for(i = 0; i < nregs; i++){
+-		regs[i] = ptrace(PTRACE_PEEKUSR, pid, 
++		regs[i] = ptrace(PTRACE_PEEKUSER, pid, 
+ 				 &dummy->u_debugreg[i], 0);
+ 	}
+ }
+diff -Naur a/arch/um/sys-i386/time.c b/arch/um/sys-i386/time.c
+--- a/arch/um/sys-i386/time.c	1969-12-31 19:00:00.000000000 -0500
++++ b/arch/um/sys-i386/time.c	2004-01-08 22:22:53.000000000 -0500
+@@ -0,0 +1,24 @@
++/*
++ * sys-i386/time.c 
++ * Created 		25.9.2002	Sapan Bhatia
++ *
++ */
++
++unsigned long long time_stamp(void)
++{
++	unsigned long low, high;
++
++	asm("rdtsc" : "=a" (low), "=d" (high));
++	return((((unsigned long long) high) << 32) + low);
++}
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/arch/um/sys-i386/util/Makefile b/arch/um/sys-i386/util/Makefile
+--- a/arch/um/sys-i386/util/Makefile	2004-01-08 22:31:42.000000000 -0500
++++ b/arch/um/sys-i386/util/Makefile	2004-01-08 22:36:19.000000000 -0500
+@@ -6,10 +6,10 @@
+ mk_sc-objs	:= mk_sc.o
+ 
+ $(obj)/mk_thread : $(obj)/mk_thread_kern.o $(obj)/mk_thread_user.o
+-	$(CC) $(CFLAGS) -o $@ $^
++	$(HOSTCC) $(CFLAGS) -o $@ $^
+ 
+ $(obj)/mk_thread_user.o : $(src)/mk_thread_user.c
+-	$(CC) $(USER_CFLAGS) -c -o $@ $<
++	$(HOSTCC) $(USER_CFLAGS) -c -o $@ $<
+ 
+ clean :
+ 	$(RM) -f $(build-targets)
+diff -Naur a/arch/um/sys-i386/util/mk_sc.c b/arch/um/sys-i386/util/mk_sc.c
+--- a/arch/um/sys-i386/util/mk_sc.c	2004-01-08 22:29:42.000000000 -0500
++++ b/arch/um/sys-i386/util/mk_sc.c	2004-01-08 22:35:17.000000000 -0500
+@@ -38,6 +38,7 @@
+   SC_OFFSET("SC_ERR", err);
+   SC_OFFSET("SC_CR2", cr2);
+   SC_OFFSET("SC_FPSTATE", fpstate);
++  SC_OFFSET("SC_SIGMASK", oldmask);
+   SC_FP_OFFSET("SC_FP_CW", cw);
+   SC_FP_OFFSET("SC_FP_SW", sw);
+   SC_FP_OFFSET("SC_FP_TAG", tag);
+diff -Naur a/arch/um/uml.lds.S b/arch/um/uml.lds.S
+--- a/arch/um/uml.lds.S	2004-01-08 22:20:26.000000000 -0500
++++ b/arch/um/uml.lds.S	2004-01-08 22:26:51.000000000 -0500
+@@ -9,7 +9,6 @@
+ {
+   . = START + SIZEOF_HEADERS;
+ 
+-  . = ALIGN(4096);
+   __binary_start = .;
+ #ifdef MODE_TT
+   .thread_private : {
+@@ -26,7 +25,11 @@
+   . = ALIGN(4096);		/* Init code and data */
+   _stext = .;
+   __init_begin = .;
+-  .text.init : { *(.text.init) }
++  .init.text : { 
++	_sinittext = .;
++	*(.init.text)
++	_einittext = .;
++  }
+   . = ALIGN(4096);
+   .text      :
+   {
+@@ -38,7 +41,7 @@
+ 
+   #include "asm/common.lds.S"
+ 
+-  .data.init : { *(.data.init) }
++  init.data : { *(init.data) }
+   .data    :
+   {
+     . = ALIGN(KERNEL_STACK_SIZE);		/* init_task */
+diff -Naur a/arch/um/util/Makefile b/arch/um/util/Makefile
+--- a/arch/um/util/Makefile	2004-01-08 22:32:28.000000000 -0500
++++ b/arch/um/util/Makefile	2004-01-08 22:36:33.000000000 -0500
+@@ -3,19 +3,19 @@
+ 		   mk_constants_user.o mk_constants_kern.o
+ 
+ $(obj)/mk_task: $(obj)/mk_task_user.o $(obj)/mk_task_kern.o
+-	$(CC) -o $@ $^
++	$(HOSTCC) -o $@ $^
+ 
+ $(obj)/mk_task_user.o: $(src)/mk_task_user.c
+-	$(CC) -o $@ -c $< 
++	$(HOSTCC) -o $@ -c $< 
+ 
+ $(obj)/mk_constants : $(obj)/mk_constants_user.o $(obj)/mk_constants_kern.o
+-	$(CC) -o $@ $^
++	$(HOSTCC) -o $@ $^
+ 
+ $(obj)/mk_constants_user.o : $(src)/mk_constants_user.c
+-	$(CC) -c $< -o $@
++	$(HOSTCC) -c $< -o $@
+ 
+ $(obj)/mk_constants_kern.o : $(src)/mk_constants_kern.c
+-	$(CC) $(CFLAGS) -c $< -o $@
++	$(HOSTCC) $(CFLAGS) -c $< -o $@
+ 
+ clean:
+ 	$(RM) $(build-targets)
+diff -Naur a/arch/um/util/mk_constants_kern.c b/arch/um/util/mk_constants_kern.c
+--- a/arch/um/util/mk_constants_kern.c	2004-01-08 22:14:20.000000000 -0500
++++ b/arch/um/util/mk_constants_kern.c	2004-01-08 22:19:17.000000000 -0500
+@@ -1,5 +1,6 @@
+ #include "linux/kernel.h"
+ #include "linux/stringify.h"
++#include "linux/time.h"
+ #include "asm/page.h"
+ 
+ extern void print_head(void);
+@@ -11,6 +12,7 @@
+ {
+   print_head();
+   print_constant_int("UM_KERN_PAGE_SIZE", PAGE_SIZE);
++
+   print_constant_str("UM_KERN_EMERG", KERN_EMERG);
+   print_constant_str("UM_KERN_ALERT", KERN_ALERT);
+   print_constant_str("UM_KERN_CRIT", KERN_CRIT);
+@@ -19,6 +21,8 @@
+   print_constant_str("UM_KERN_NOTICE", KERN_NOTICE);
+   print_constant_str("UM_KERN_INFO", KERN_INFO);
+   print_constant_str("UM_KERN_DEBUG", KERN_DEBUG);
++
++  print_constant_int("UM_NSEC_PER_SEC", NSEC_PER_SEC);
+   print_tail();
+   return(0);
+ }
+diff -Naur a/drivers/char/tty_io.c b/drivers/char/tty_io.c
+--- a/drivers/char/tty_io.c	2004-01-08 22:23:22.000000000 -0500
++++ b/drivers/char/tty_io.c	2004-01-08 22:30:52.000000000 -0500
+@@ -2419,12 +2419,18 @@
+ static struct cdev vc0_cdev;
+ #endif
+ 
++static int tty_initialized;
++
+ /*
+  * Ok, now we can initialize the rest of the tty devices and can count
+  * on memory allocations, interrupts etc..
+  */
+-static int __init tty_init(void)
++int __init tty_init(void)
+ {
++        if (tty_initialized)
++                return 0;
++	tty_initialized = 1;
++
+ 	strcpy(tty_cdev.kobj.name, "dev.tty");
+ 	cdev_init(&tty_cdev, &tty_fops);
+ 	if (cdev_add(&tty_cdev, MKDEV(TTYAUX_MAJOR, 0), 1) ||
+diff -Naur a/fs/hostfs/hostfs.h b/fs/hostfs/hostfs.h
+--- a/fs/hostfs/hostfs.h	1969-12-31 19:00:00.000000000 -0500
++++ b/fs/hostfs/hostfs.h	2004-01-08 22:17:40.000000000 -0500
+@@ -0,0 +1,79 @@
++#ifndef __UM_FS_HOSTFS
++#define __UM_FS_HOSTFS
++
++#include "os.h"
++
++/* These are exactly the same definitions as in fs.h, but the names are 
++ * changed so that this file can be included in both kernel and user files.
++ */
++
++#define HOSTFS_ATTR_MODE	1
++#define HOSTFS_ATTR_UID 	2
++#define HOSTFS_ATTR_GID 	4
++#define HOSTFS_ATTR_SIZE	8
++#define HOSTFS_ATTR_ATIME	16
++#define HOSTFS_ATTR_MTIME	32
++#define HOSTFS_ATTR_CTIME	64
++#define HOSTFS_ATTR_ATIME_SET	128
++#define HOSTFS_ATTR_MTIME_SET	256
++#define HOSTFS_ATTR_FORCE	512	/* Not a change, but a change it */
++#define HOSTFS_ATTR_ATTR_FLAG	1024
++
++struct hostfs_iattr {
++	unsigned int	ia_valid;
++	mode_t		ia_mode;
++	uid_t		ia_uid;
++	gid_t		ia_gid;
++	loff_t		ia_size;
++	struct timespec	ia_atime;
++	struct timespec	ia_mtime;
++	struct timespec	ia_ctime;
++	unsigned int	ia_attr_flags;
++};
++
++extern int stat_file(const char *path, unsigned long long *inode_out, 
++		     int *mode_out, int *nlink_out, int *uid_out, int *gid_out,
++		     unsigned long long *size_out, struct timespec *atime_out, 
++		     struct timespec *mtime_out, struct timespec *ctime_out, 
++		     int *blksize_out, unsigned long long *blocks_out);
++extern int access_file(char *path, int r, int w, int x);
++extern int open_file(char *path, int r, int w, int append);
++extern int file_type(const char *path, int *rdev);
++extern void *open_dir(char *path, int *err_out);
++extern char *read_dir(void *stream, unsigned long long *pos, 
++		      unsigned long long *ino_out, int *len_out);
++extern void close_file(void *stream);
++extern void close_dir(void *stream);
++extern int read_file(int fd, unsigned long long *offset, char *buf, int len);
++extern int write_file(int fd, unsigned long long *offset, const char *buf,
++		      int len);
++extern int lseek_file(int fd, long long offset, int whence);
++extern int file_create(char *name, int ur, int uw, int ux, int gr, 
++		       int gw, int gx, int or, int ow, int ox);
++extern int set_attr(const char *file, struct hostfs_iattr *attrs);
++extern int make_symlink(const char *from, const char *to);
++extern int unlink_file(const char *file);
++extern int do_mkdir(const char *file, int mode);
++extern int do_rmdir(const char *file);
++extern int do_mknod(const char *file, int mode, int dev);
++extern int link_file(const char *from, const char *to);
++extern int do_readlink(char *file, char *buf, int size);
++extern int rename_file(char *from, char *to);
++extern int do_statfs(char *root, long *bsize_out, long long *blocks_out, 
++		     long long *bfree_out, long long *bavail_out, 
++		     long long *files_out, long long *ffree_out, 
++		     void *fsid_out, int fsid_size, long *namelen_out, 
++		     long *spare_out);
++
++#endif
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
+--- a/fs/hostfs/hostfs_kern.c	1969-12-31 19:00:00.000000000 -0500
++++ b/fs/hostfs/hostfs_kern.c	2004-01-08 22:18:32.000000000 -0500
+@@ -0,0 +1,1008 @@
++/* 
++ * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
++ * Licensed under the GPL
++ *
++ * Ported the filesystem routines to 2.5.
++ * 2003-02-10 Petr Baudis <pasky@ucw.cz>
++ */
++
++#include <linux/stddef.h>
++#include <linux/fs.h>
++#include <linux/version.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/slab.h>
++#include <linux/pagemap.h>
++#include <linux/blkdev.h>
++#include <linux/list.h>
++#include <linux/buffer_head.h>
++#include <linux/root_dev.h>
++#include <linux/statfs.h>
++#include <asm/uaccess.h>
++#include "hostfs.h"
++#include "kern_util.h"
++#include "kern.h"
++#include "user_util.h"
++#include "2_5compat.h"
++#include "init.h"
++
++struct hostfs_inode_info {
++	char *host_filename;
++	int fd;
++	int mode;
++	struct inode vfs_inode;
++};
++
++static inline struct hostfs_inode_info *HOSTFS_I(struct inode *inode)
++{
++	return(list_entry(inode, struct hostfs_inode_info, vfs_inode));
++}
++
++#define FILE_HOSTFS_I(file) HOSTFS_I((file)->f_dentry->d_inode)
++
++int hostfs_d_delete(struct dentry *dentry)
++{
++	return(1);
++}
++
++struct dentry_operations hostfs_dentry_ops = {
++	.d_delete		= hostfs_d_delete,
++};
++
++/* Changed in hostfs_args before the kernel starts running */
++static char *root_ino = "/";
++static int append = 0;
++
++#define HOSTFS_SUPER_MAGIC 0x00c0ffee
++
++static struct inode_operations hostfs_iops;
++static struct inode_operations hostfs_dir_iops;
++static struct address_space_operations hostfs_link_aops;
++
++static int __init hostfs_args(char *options, int *add)
++{
++	char *ptr;
++
++	ptr = strchr(options, ',');
++	if(ptr != NULL)
++		*ptr++ = '\0';
++	if(*options != '\0')
++		root_ino = options;
++
++	options = ptr;
++	while(options){
++		ptr = strchr(options, ',');
++		if(ptr != NULL)
++			*ptr++ = '\0';
++		if(*options != '\0'){
++			if(!strcmp(options, "append"))
++				append = 1;
++			else printf("hostfs_args - unsupported option - %s\n",
++				    options);
++		}
++		options = ptr;
++	}
++	return(0);
++}
++
++__uml_setup("hostfs=", hostfs_args,
++"hostfs=<root dir>,<flags>,...\n"
++"    This is used to set hostfs parameters.  The root directory argument\n"
++"    is used to confine all hostfs mounts to within the specified directory\n"
++"    tree on the host.  If this isn't specified, then a user inside UML can\n"
++"    mount anything on the host that's accessible to the user that's running\n"
++"    it.\n"
++"    The only flag currently supported is 'append', which specifies that all\n"
++"    files opened by hostfs will be opened in append mode.\n\n"
++);
++
++static char *dentry_name(struct dentry *dentry, int extra)
++{
++	struct dentry *parent;
++	char *root, *name;
++	int len;
++
++	len = 0;
++	parent = dentry;
++	while(parent->d_parent != parent){
++		len += parent->d_name.len + 1;
++		parent = parent->d_parent;
++	}
++	
++	root = HOSTFS_I(parent->d_inode)->host_filename;
++	len += strlen(root);
++	name = kmalloc(len + extra + 1, GFP_KERNEL);
++	if(name == NULL) return(NULL);
++
++	name[len] = '\0';
++	parent = dentry;
++	while(parent->d_parent != parent){
++		len -= parent->d_name.len + 1;
++		name[len] = '/';
++		strncpy(&name[len + 1], parent->d_name.name, 
++			parent->d_name.len);
++		parent = parent->d_parent;
++	}
++	strncpy(name, root, strlen(root));
++	return(name);
++}
++
++static char *inode_name(struct inode *ino, int extra)
++{
++	struct dentry *dentry;
++
++	dentry = list_entry(ino->i_dentry.next, struct dentry, d_alias);
++	return(dentry_name(dentry, extra));
++}
++
++static int read_name(struct inode *ino, char *name)
++{
++	/* The non-int inode fields are copied into ints by stat_file and
++	 * then copied into the inode because passing the actual pointers
++	 * in and having them treated as int * breaks on big-endian machines
++	 */
++	int err;
++	int i_mode, i_nlink, i_blksize;
++	unsigned long long i_size;
++	unsigned long long i_ino;
++	unsigned long long i_blocks;
++
++	err = stat_file(name, &i_ino, &i_mode, &i_nlink, &ino->i_uid, 
++			&ino->i_gid, &i_size, &ino->i_atime, &ino->i_mtime, 
++			&ino->i_ctime, &i_blksize, &i_blocks);
++	if(err) 
++		return(err);
++
++	ino->i_ino = i_ino;
++	ino->i_mode = i_mode;
++	ino->i_nlink = i_nlink;
++	ino->i_size = i_size;
++	ino->i_blksize = i_blksize;
++	ino->i_blocks = i_blocks;
++	if((ino->i_sb->s_dev == ROOT_DEV) && (ino->i_uid == getuid()))
++		ino->i_uid = 0;
++	return(0);
++}
++
++static char *follow_link(char *link)
++{
++	int len, n;
++	char *name, *resolved, *end;
++
++	len = 64;
++	while(1){
++		n = -ENOMEM;
++		name = kmalloc(len, GFP_KERNEL);
++		if(name == NULL)
++			goto out;
++
++		n = do_readlink(link, name, len);
++		if(n < len)
++			break;
++		len *= 2;
++		kfree(name);
++	}
++	if(n < 0)
++		goto out_free;
++
++	if(*name == '/')
++		return(name);
++
++	end = strrchr(link, '/');
++	if(end == NULL)
++		return(name);
++
++	*(end + 1) = '\0';
++	len = strlen(link) + strlen(name) + 1;
++
++	resolved = kmalloc(len, GFP_KERNEL);
++	if(resolved == NULL){
++		n = -ENOMEM;
++		goto out_free;
++	}
++
++	sprintf(resolved, "%s%s", link, name);
++	kfree(name);
++	kfree(link);
++	return(resolved);
++
++ out_free:
++	kfree(name);
++ out:
++	return(ERR_PTR(n));
++}
++
++static int read_inode(struct inode *ino)
++{
++	char *name;
++	int err = 0;
++
++	/* Unfortunately, we are called from iget() when we don't have a dentry
++	 * allocated yet.
++	 */
++	if(list_empty(&ino->i_dentry))
++		goto out;
++ 
++	err = -ENOMEM;
++	name = inode_name(ino, 0);
++	if(name == NULL) 
++		goto out;
++
++	if(file_type(name, NULL) == OS_TYPE_SYMLINK){
++		name = follow_link(name);
++		if(IS_ERR(name)){
++			err = PTR_ERR(name);
++			goto out;
++		}
++	}
++	
++	err = read_name(ino, name);
++	kfree(name);
++ out:
++	return(err);
++}
++
++int hostfs_statfs(struct super_block *sb, struct kstatfs *sf)
++{
++	/* do_statfs uses struct statfs64 internally, but the linux kernel
++	 * struct statfs still has 32-bit versions for most of these fields,
++	 * so we convert them here
++	 */
++	int err;
++	long long f_blocks;
++	long long f_bfree;
++	long long f_bavail;
++	long long f_files;
++	long long f_ffree;
++
++	err = do_statfs(HOSTFS_I(sb->s_root->d_inode)->host_filename,
++			&sf->f_bsize, &f_blocks, &f_bfree, &f_bavail, &f_files,
++			&f_ffree, &sf->f_fsid, sizeof(sf->f_fsid), 
++			&sf->f_namelen, sf->f_spare);
++	if(err) return(err);
++	sf->f_blocks = f_blocks;
++	sf->f_bfree = f_bfree;
++	sf->f_bavail = f_bavail;
++	sf->f_files = f_files;
++	sf->f_ffree = f_ffree;
++	sf->f_type = HOSTFS_SUPER_MAGIC;
++	return(0);
++}
++
++static struct inode *hostfs_alloc_inode(struct super_block *sb)
++{
++	struct hostfs_inode_info *hi;
++
++	hi = kmalloc(sizeof(*hi), GFP_KERNEL);
++	if(hi == NULL) 
++		return(NULL);
++
++	*hi = ((struct hostfs_inode_info) { .host_filename	= NULL,
++					    .fd			= -1,
++					    .mode		= 0 });
++	inode_init_once(&hi->vfs_inode);
++	return(&hi->vfs_inode);
++}
++
++static void hostfs_destroy_inode(struct inode *inode)
++{
++	if(HOSTFS_I(inode)->host_filename) 
++		kfree(HOSTFS_I(inode)->host_filename);
++
++	if(HOSTFS_I(inode)->fd != -1) 
++		close_file(&HOSTFS_I(inode)->fd);
++
++	kfree(HOSTFS_I(inode));
++}
++
++static void hostfs_read_inode(struct inode *inode)
++{
++	read_inode(inode);
++}
++
++static struct super_operations hostfs_sbops = { 
++	.alloc_inode	= hostfs_alloc_inode,
++	.destroy_inode	= hostfs_destroy_inode,
++	.read_inode	= hostfs_read_inode,
++	.statfs		= hostfs_statfs,
++};
++
++int hostfs_readdir(struct file *file, void *ent, filldir_t filldir)
++{
++	void *dir;
++	char *name;
++	unsigned long long next, ino;
++	int error, len;
++
++	name = dentry_name(file->f_dentry, 0);
++	if(name == NULL) return(-ENOMEM);
++	dir = open_dir(name, &error);
++	kfree(name);
++	if(dir == NULL) return(-error);
++	next = file->f_pos;
++	while((name = read_dir(dir, &next, &ino, &len)) != NULL){
++		error = (*filldir)(ent, name, len, file->f_pos, 
++				   ino, DT_UNKNOWN);
++		if(error) break;
++		file->f_pos = next;
++	}
++	close_dir(dir);
++	return(0);
++}
++
++int hostfs_file_open(struct inode *ino, struct file *file)
++{
++	char *name;
++	int mode = 0, r = 0, w = 0, fd;
++
++	mode = file->f_mode & (FMODE_READ | FMODE_WRITE);
++	if((mode & HOSTFS_I(ino)->mode) == mode)
++		return(0);
++
++	/* The file may already have been opened, but with the wrong access,
++	 * so this resets things and reopens the file with the new access.
++	 */
++	if(HOSTFS_I(ino)->fd != -1){
++		close_file(&HOSTFS_I(ino)->fd);
++		HOSTFS_I(ino)->fd = -1;
++	}
++
++	HOSTFS_I(ino)->mode |= mode;
++	if(HOSTFS_I(ino)->mode & FMODE_READ) 
++		r = 1;
++	if(HOSTFS_I(ino)->mode & FMODE_WRITE) 
++		w = 1;
++	if(w) 
++		r = 1;
++
++	name = dentry_name(file->f_dentry, 0);
++	if(name == NULL) 
++		return(-ENOMEM);
++
++	fd = open_file(name, r, w, append);
++	kfree(name);
++	if(fd < 0) return(fd);
++	FILE_HOSTFS_I(file)->fd = fd;
++
++	return(0);
++}
++
++int hostfs_fsync(struct file *file, struct dentry *dentry, int datasync)
++{
++	return(0);
++}
++
++static struct file_operations hostfs_file_fops = {
++	.llseek		= generic_file_llseek,
++	.read		= generic_file_read,
++	.write		= generic_file_write,
++	.mmap		= generic_file_mmap,
++	.open		= hostfs_file_open,
++	.release	= NULL,
++	.fsync		= hostfs_fsync,
++};
++
++static struct file_operations hostfs_dir_fops = {
++	.readdir	= hostfs_readdir,
++	.read		= generic_read_dir,
++};
++
++int hostfs_writepage(struct page *page, struct writeback_control *wbc)
++{
++	struct address_space *mapping = page->mapping;
++	struct inode *inode = mapping->host;
++	char *buffer;
++	unsigned long long base;
++	int count = PAGE_CACHE_SIZE;
++	int end_index = inode->i_size >> PAGE_CACHE_SHIFT;
++	int err;
++
++	if (page->index >= end_index)
++		count = inode->i_size & (PAGE_CACHE_SIZE-1);
++
++	buffer = kmap(page);
++	base = ((unsigned long long) page->index) << PAGE_CACHE_SHIFT;
++
++	err = write_file(HOSTFS_I(inode)->fd, &base, buffer, count);
++	if(err != count){
++		ClearPageUptodate(page);
++		goto out;
++	}
++
++	if (base > inode->i_size)
++		inode->i_size = base;
++
++	if (PageError(page))
++		ClearPageError(page);	
++	err = 0;
++
++ out:	
++	kunmap(page);
++
++	unlock_page(page);
++	return err; 
++}
++
++int hostfs_readpage(struct file *file, struct page *page)
++{
++	char *buffer;
++	long long start;
++	int err = 0;
++
++	start = (long long) page->index << PAGE_CACHE_SHIFT;
++	buffer = kmap(page);
++	err = read_file(FILE_HOSTFS_I(file)->fd, &start, buffer,
++			PAGE_CACHE_SIZE);
++	if(err < 0) goto out;
++
++	memset(&buffer[err], 0, PAGE_CACHE_SIZE - err);
++
++	flush_dcache_page(page);
++	SetPageUptodate(page);
++	if (PageError(page)) ClearPageError(page);
++	err = 0;
++ out:
++	kunmap(page);
++	unlock_page(page);
++	return(err);
++}
++
++int hostfs_prepare_write(struct file *file, struct page *page, 
++			 unsigned int from, unsigned int to)
++{
++	char *buffer;
++	long long start, tmp;
++	int err;
++
++	start = (long long) page->index << PAGE_CACHE_SHIFT;
++	buffer = kmap(page);
++	if(from != 0){
++		tmp = start;
++		err = read_file(FILE_HOSTFS_I(file)->fd, &tmp, buffer,
++				from);
++		if(err < 0) goto out;
++	}
++	if(to != PAGE_CACHE_SIZE){
++		start += to;
++		err = read_file(FILE_HOSTFS_I(file)->fd, &start, buffer + to,
++				PAGE_CACHE_SIZE - to);
++		if(err < 0) goto out;		
++	}
++	err = 0;
++ out:
++	kunmap(page);
++	return(err);
++}
++
++int hostfs_commit_write(struct file *file, struct page *page, unsigned from,
++		 unsigned to)
++{
++	struct address_space *mapping = page->mapping;
++	struct inode *inode = mapping->host;
++	char *buffer;
++	long long start;
++	int err = 0;
++
++	start = (long long) (page->index << PAGE_CACHE_SHIFT) + from;
++	buffer = kmap(page);
++	err = write_file(FILE_HOSTFS_I(file)->fd, &start, buffer + from, 
++			 to - from);
++	if(err > 0) err = 0;
++	if(!err && (start > inode->i_size))
++		inode->i_size = start;
++
++	kunmap(page);
++	return(err);
++}
++
++static struct address_space_operations hostfs_aops = {
++	.writepage 	= hostfs_writepage,
++	.readpage	= hostfs_readpage,
++/* 	.set_page_dirty = __set_page_dirty_nobuffers, */
++	.prepare_write	= hostfs_prepare_write,
++	.commit_write	= hostfs_commit_write
++};
++
++static int init_inode(struct inode *inode, struct dentry *dentry)
++{
++	char *name;
++	int type, err = -ENOMEM, rdev;
++
++	if(dentry){
++		name = dentry_name(dentry, 0);
++		if(name == NULL)
++			goto out;
++		type = file_type(name, &rdev);
++		kfree(name);
++	}
++	else type = OS_TYPE_DIR;
++
++	err = 0;
++	if(type == OS_TYPE_SYMLINK)
++		inode->i_op = &page_symlink_inode_operations;
++	else if(type == OS_TYPE_DIR)
++		inode->i_op = &hostfs_dir_iops;
++	else inode->i_op = &hostfs_iops;
++
++	if(type == OS_TYPE_DIR) inode->i_fop = &hostfs_dir_fops;
++	else inode->i_fop = &hostfs_file_fops;
++
++	if(type == OS_TYPE_SYMLINK) 
++		inode->i_mapping->a_ops = &hostfs_link_aops;
++	else inode->i_mapping->a_ops = &hostfs_aops;
++
++	switch (type) {
++	case OS_TYPE_CHARDEV:
++		init_special_inode(inode, S_IFCHR, rdev);
++		break;
++	case OS_TYPE_BLOCKDEV:
++		init_special_inode(inode, S_IFBLK, rdev);
++		break;
++	case OS_TYPE_FIFO:
++		init_special_inode(inode, S_IFIFO, 0);
++		break;
++	case OS_TYPE_SOCK:
++		init_special_inode(inode, S_IFSOCK, 0);
++		break;
++	}
++ out:
++	return(err);
++}
++
++int hostfs_create(struct inode *dir, struct dentry *dentry, int mode, 
++                 struct nameidata *nd)
++{
++	struct inode *inode;
++	char *name;
++	int error, fd;
++
++	error = -ENOMEM;
++	inode = iget(dir->i_sb, 0);
++	if(inode == NULL) goto out;
++
++	error = init_inode(inode, dentry);
++	if(error) 
++		goto out_put;
++	
++	error = -ENOMEM;
++	name = dentry_name(dentry, 0);
++	if(name == NULL)
++		goto out_put;
++
++	fd = file_create(name, 
++			 mode & S_IRUSR, mode & S_IWUSR, mode & S_IXUSR, 
++			 mode & S_IRGRP, mode & S_IWGRP, mode & S_IXGRP, 
++			 mode & S_IROTH, mode & S_IWOTH, mode & S_IXOTH);
++	if(fd < 0) 
++		error = fd;
++	else error = read_name(inode, name);
++
++	kfree(name);
++	if(error)
++		goto out_put;
++
++	HOSTFS_I(inode)->fd = fd;
++	HOSTFS_I(inode)->mode = FMODE_READ | FMODE_WRITE;
++	d_instantiate(dentry, inode);
++	return(0);
++
++ out_put:
++	iput(inode);
++ out:
++	return(error);
++}
++
++struct dentry *hostfs_lookup(struct inode *ino, struct dentry *dentry, 
++                            struct nameidata *nd)
++{
++	struct inode *inode;
++	char *name;
++	int err;
++
++	err = -ENOMEM;
++	inode = iget(ino->i_sb, 0);
++	if(inode == NULL) 
++		goto out;
++ 
++	err = init_inode(inode, dentry);
++	if(err) 
++		goto out_put;
++
++	err = -ENOMEM;
++	name = dentry_name(dentry, 0);
++	if(name == NULL)
++		goto out_put;
++
++	err = read_name(inode, name);
++	kfree(name);
++	if(err == -ENOENT){
++		iput(inode);
++		inode = NULL;
++	}
++	else if(err)
++		goto out_put;
++
++	d_add(dentry, inode);
++	dentry->d_op = &hostfs_dentry_ops;
++	return(NULL);
++
++ out_put:
++	iput(inode);
++ out:
++	return(ERR_PTR(err));
++}
++
++static char *inode_dentry_name(struct inode *ino, struct dentry *dentry)
++{
++        char *file;
++	int len;
++
++	file = inode_name(ino, dentry->d_name.len + 1);
++	if(file == NULL) return(NULL);
++        strcat(file, "/");
++	len = strlen(file);
++        strncat(file, dentry->d_name.name, dentry->d_name.len);
++	file[len + dentry->d_name.len] = '\0';
++        return(file);
++}
++
++int hostfs_link(struct dentry *to, struct inode *ino, struct dentry *from)
++{
++        char *from_name, *to_name;
++        int err;
++
++        if((from_name = inode_dentry_name(ino, from)) == NULL) 
++                return(-ENOMEM);
++        to_name = dentry_name(to, 0);
++	if(to_name == NULL){
++		kfree(from_name);
++		return(-ENOMEM);
++	}
++        err = link_file(to_name, from_name);
++        kfree(from_name);
++        kfree(to_name);
++        return(err);
++}
++
++int hostfs_unlink(struct inode *ino, struct dentry *dentry)
++{
++	char *file;
++	int err;
++
++	if((file = inode_dentry_name(ino, dentry)) == NULL) return(-ENOMEM);
++	if(append)
++		return(-EPERM);
++
++	err = unlink_file(file);
++	kfree(file);
++	return(err);
++}
++
++int hostfs_symlink(struct inode *ino, struct dentry *dentry, const char *to)
++{
++	char *file;
++	int err;
++
++	if((file = inode_dentry_name(ino, dentry)) == NULL) return(-ENOMEM);
++	err = make_symlink(file, to);
++	kfree(file);
++	return(err);
++}
++
++int hostfs_mkdir(struct inode *ino, struct dentry *dentry, int mode)
++{
++	char *file;
++	int err;
++
++	if((file = inode_dentry_name(ino, dentry)) == NULL) return(-ENOMEM);
++	err = do_mkdir(file, mode);
++	kfree(file);
++	return(err);
++}
++
++int hostfs_rmdir(struct inode *ino, struct dentry *dentry)
++{
++	char *file;
++	int err;
++
++	if((file = inode_dentry_name(ino, dentry)) == NULL) return(-ENOMEM);
++	err = do_rmdir(file);
++	kfree(file);
++	return(err);
++}
++
++int hostfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
++{
++	struct inode *inode;
++	char *name;
++	int err = -ENOMEM;
++ 
++	inode = iget(dir->i_sb, 0);
++	if(inode == NULL) 
++		goto out;
++
++	err = init_inode(inode, dentry);
++	if(err) 
++		goto out_put;
++
++	err = -ENOMEM;
++	name = dentry_name(dentry, 0);
++	if(name == NULL)
++		goto out_put;
++
++	init_special_inode(inode, mode, dev);
++	err = do_mknod(name, mode, dev);
++	if(err)
++		goto out_free;
++
++	err = read_name(inode, name);
++	kfree(name);
++	if(err)
++		goto out_put;
++
++	d_instantiate(dentry, inode);
++	return(0);
++
++ out_free:
++	kfree(name);
++ out_put:
++	iput(inode);
++ out:
++	return(err);
++}
++
++int hostfs_rename(struct inode *from_ino, struct dentry *from,
++		  struct inode *to_ino, struct dentry *to)
++{
++	char *from_name, *to_name;
++	int err;
++
++	if((from_name = inode_dentry_name(from_ino, from)) == NULL)
++		return(-ENOMEM);
++	if((to_name = inode_dentry_name(to_ino, to)) == NULL){
++		kfree(from_name);
++		return(-ENOMEM);
++	}
++	err = rename_file(from_name, to_name);
++	kfree(from_name);
++	kfree(to_name);
++	return(err);
++}
++
++void hostfs_truncate(struct inode *ino)
++{
++	not_implemented();
++}
++
++int hostfs_permission(struct inode *ino, int desired, struct nameidata *nd)
++{
++	char *name;
++	int r = 0, w = 0, x = 0, err;
++
++	if(desired & MAY_READ) r = 1;
++	if(desired & MAY_WRITE) w = 1;
++	if(desired & MAY_EXEC) x = 1;
++	name = inode_name(ino, 0);
++	if(name == NULL) return(-ENOMEM);
++	err = access_file(name, r, w, x);
++	kfree(name);
++	if(!err) err = vfs_permission(ino, desired);
++	return(err);
++}
++
++int hostfs_setattr(struct dentry *dentry, struct iattr *attr)
++{
++	struct hostfs_iattr attrs;
++	char *name;
++	int err;
++	
++	if(append) 
++		attr->ia_valid &= ~ATTR_SIZE;
++
++	attrs.ia_valid = 0;
++	if(attr->ia_valid & ATTR_MODE){
++		attrs.ia_valid |= HOSTFS_ATTR_MODE;
++		attrs.ia_mode = attr->ia_mode;
++	}
++	if(attr->ia_valid & ATTR_UID){
++		if((dentry->d_inode->i_sb->s_dev == ROOT_DEV) && 
++		   (attr->ia_uid == 0))
++			attr->ia_uid = getuid();
++		attrs.ia_valid |= HOSTFS_ATTR_UID;
++		attrs.ia_uid = attr->ia_uid;
++	}
++	if(attr->ia_valid & ATTR_GID){
++		if((dentry->d_inode->i_sb->s_dev == ROOT_DEV) && 
++		   (attr->ia_gid == 0))
++			attr->ia_gid = getuid();
++		attrs.ia_valid |= HOSTFS_ATTR_GID;
++		attrs.ia_gid = attr->ia_gid;
++	}
++	if(attr->ia_valid & ATTR_SIZE){
++		attrs.ia_valid |= HOSTFS_ATTR_SIZE;
++		attrs.ia_size = attr->ia_size;
++	}
++	if(attr->ia_valid & ATTR_ATIME){
++		attrs.ia_valid |= HOSTFS_ATTR_ATIME;
++		attrs.ia_atime = attr->ia_atime;
++	}
++	if(attr->ia_valid & ATTR_MTIME){
++		attrs.ia_valid |= HOSTFS_ATTR_MTIME;
++		attrs.ia_mtime = attr->ia_mtime;
++	}
++	if(attr->ia_valid & ATTR_CTIME){
++		attrs.ia_valid |= HOSTFS_ATTR_CTIME;
++		attrs.ia_ctime = attr->ia_ctime;
++	}
++	if(attr->ia_valid & ATTR_ATIME_SET){
++		attrs.ia_valid |= HOSTFS_ATTR_ATIME_SET;
++	}
++	if(attr->ia_valid & ATTR_MTIME_SET){
++		attrs.ia_valid |= HOSTFS_ATTR_MTIME_SET;
++	}
++	name = dentry_name(dentry, 0);
++	if(name == NULL) return(-ENOMEM);
++	err = set_attr(name, &attrs);
++	kfree(name);
++	if(err)
++		return(err);
++
++	return(inode_setattr(dentry->d_inode, attr));
++}
++
++int hostfs_getattr(struct vfsmount *mnt, struct dentry *dentry, 
++	   struct kstat *stat)
++{
++	generic_fillattr(dentry->d_inode, stat);
++	return(0);
++}
++
++static struct inode_operations hostfs_iops = {
++	.create		= hostfs_create,
++	.link		= hostfs_link,
++	.unlink		= hostfs_unlink,
++	.symlink	= hostfs_symlink,
++	.mkdir		= hostfs_mkdir,
++	.rmdir		= hostfs_rmdir,
++	.mknod		= hostfs_mknod,
++	.rename		= hostfs_rename,
++	.truncate	= hostfs_truncate,
++	.permission	= hostfs_permission,
++	.setattr	= hostfs_setattr,
++	.getattr	= hostfs_getattr,
++};
++
++static struct inode_operations hostfs_dir_iops = {
++	.create		= hostfs_create,
++	.lookup		= hostfs_lookup,
++	.link		= hostfs_link,
++	.unlink		= hostfs_unlink,
++	.symlink	= hostfs_symlink,
++	.mkdir		= hostfs_mkdir,
++	.rmdir		= hostfs_rmdir,
++	.mknod		= hostfs_mknod,
++	.rename		= hostfs_rename,
++	.truncate	= hostfs_truncate,
++	.permission	= hostfs_permission,
++	.setattr	= hostfs_setattr,
++	.getattr	= hostfs_getattr,
++};
++
++int hostfs_link_readpage(struct file *file, struct page *page)
++{
++	char *buffer, *name;
++	long long start;
++	int err;
++
++	start = page->index << PAGE_CACHE_SHIFT;
++	buffer = kmap(page);
++	name = inode_name(page->mapping->host, 0);
++	if(name == NULL) return(-ENOMEM);
++	err = do_readlink(name, buffer, PAGE_CACHE_SIZE);
++	kfree(name);
++	if(err == PAGE_CACHE_SIZE)
++		err = -E2BIG;
++	else if(err > 0){
++		flush_dcache_page(page);
++		SetPageUptodate(page);
++		if (PageError(page)) ClearPageError(page);
++		err = 0;
++	}
++	kunmap(page);
++	unlock_page(page);
++	return(err);
++}
++
++static struct address_space_operations hostfs_link_aops = {
++	.readpage	= hostfs_link_readpage,
++};
++
++static int hostfs_fill_sb_common(struct super_block *sb, void *d, int silent)
++{
++	struct inode *root_inode;
++	char *name, *data = d;
++	int err;
++
++	sb->s_blocksize = 1024;
++	sb->s_blocksize_bits = 10;
++	sb->s_magic = HOSTFS_SUPER_MAGIC;
++	sb->s_op = &hostfs_sbops;
++
++	if((data == NULL) || (*data == '\0')) 
++		data = root_ino;
++
++	err = -ENOMEM;
++	name = kmalloc(strlen(data) + 1, GFP_KERNEL);
++	if(name == NULL) 
++		goto out;
++
++	strcpy(name, data);
++
++	root_inode = iget(sb, 0);
++	if(root_inode == NULL)
++		goto out_free;
++
++	err = init_inode(root_inode, NULL);
++	if(err)
++		goto out_put;
++
++	HOSTFS_I(root_inode)->host_filename = name;
++
++	err = -ENOMEM;
++	sb->s_root = d_alloc_root(root_inode);
++	if(sb->s_root == NULL)
++		goto out_put;
++
++	err = read_inode(root_inode);
++	if(err)
++		goto out_put;
++
++	return(0);
++
++ out_put:
++	iput(root_inode);
++ out_free:
++	kfree(name);
++ out:
++	return(err);
++}
++
++static struct super_block *hostfs_read_sb(struct file_system_type *type,
++					     int flags, const char *dev_name,
++					     void *data)
++{
++	return(get_sb_nodev(type, flags, data, hostfs_fill_sb_common));
++}
++
++static struct file_system_type hostfs_type = {
++	.owner 		= THIS_MODULE,
++	.name 		= "hostfs",
++	.get_sb 	= hostfs_read_sb,
++	.kill_sb	= kill_anon_super,
++	.fs_flags 	= 0,
++};
++
++static int __init init_hostfs(void)
++{
++	return(register_filesystem(&hostfs_type));
++}
++
++static void __exit exit_hostfs(void)
++{
++	unregister_filesystem(&hostfs_type);
++}
++
++module_init(init_hostfs)
++module_exit(exit_hostfs)
++MODULE_LICENSE("GPL");
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/fs/hostfs/hostfs_user.c b/fs/hostfs/hostfs_user.c
+--- a/fs/hostfs/hostfs_user.c	1969-12-31 19:00:00.000000000 -0500
++++ b/fs/hostfs/hostfs_user.c	2004-01-08 22:21:31.000000000 -0500
+@@ -0,0 +1,361 @@
++/* 
++ * Copyright (C) 2000 Jeff Dike (jdike@karaya.com)
++ * Licensed under the GPL
++ */
++
++#include <unistd.h>
++#include <stdio.h>
++#include <fcntl.h>
++#include <dirent.h>
++#include <errno.h>
++#include <utime.h>
++#include <string.h>
++#include <sys/stat.h>
++#include <sys/time.h>
++#include <sys/vfs.h>
++#include "hostfs.h"
++#include "kern_util.h"
++#include "user.h"
++
++int stat_file(const char *path, unsigned long long *inode_out, int *mode_out,
++	      int *nlink_out, int *uid_out, int *gid_out, 
++	      unsigned long long *size_out, struct timespec *atime_out,
++	      struct timespec *mtime_out, struct timespec *ctime_out,
++	      int *blksize_out, unsigned long long *blocks_out)
++{
++	struct stat64 buf;
++
++	if(lstat64(path, &buf) < 0) 
++		return(-errno);
++
++	/* See the Makefile for why STAT64_INO_FIELD is passed in
++	 * by the build
++	 */
++	if(inode_out != NULL) *inode_out = buf.STAT64_INO_FIELD;
++	if(mode_out != NULL) *mode_out = buf.st_mode;
++	if(nlink_out != NULL) *nlink_out = buf.st_nlink;
++	if(uid_out != NULL) *uid_out = buf.st_uid;
++	if(gid_out != NULL) *gid_out = buf.st_gid;
++	if(size_out != NULL) *size_out = buf.st_size;
++	if(atime_out != NULL) {
++		atime_out->tv_sec = buf.st_atime;
++		atime_out->tv_nsec = 0;
++	}
++	if(mtime_out != NULL) {
++		mtime_out->tv_sec = buf.st_mtime;
++		mtime_out->tv_nsec = 0;
++	}
++	if(ctime_out != NULL) {
++		ctime_out->tv_sec = buf.st_ctime;
++		ctime_out->tv_nsec = 0;
++	}
++	if(blksize_out != NULL) *blksize_out = buf.st_blksize;
++	if(blocks_out != NULL) *blocks_out = buf.st_blocks;
++	return(0);
++}
++
++int file_type(const char *path, int *rdev)
++{
++ 	struct stat64 buf;
++
++	if(lstat64(path, &buf) < 0) 
++		return(-errno);
++	if(rdev != NULL) 
++		*rdev = buf.st_rdev;
++
++	if(S_ISDIR(buf.st_mode)) return(OS_TYPE_DIR);
++	else if(S_ISLNK(buf.st_mode)) return(OS_TYPE_SYMLINK);
++	else if(S_ISCHR(buf.st_mode)) return(OS_TYPE_CHARDEV);
++	else if(S_ISBLK(buf.st_mode)) return(OS_TYPE_BLOCKDEV);
++	else if(S_ISFIFO(buf.st_mode))return(OS_TYPE_FIFO);
++	else if(S_ISSOCK(buf.st_mode))return(OS_TYPE_SOCK);
++	else return(OS_TYPE_FILE);
++}
++
++int access_file(char *path, int r, int w, int x)
++{
++	int mode = 0;
++
++	if(r) mode = R_OK;
++	if(w) mode |= W_OK;
++	if(x) mode |= X_OK;
++	if(access(path, mode) != 0) return(-errno);
++	else return(0);
++}
++
++int open_file(char *path, int r, int w, int append)
++{
++	int mode = 0, fd;
++
++	if(r && !w) 
++		mode = O_RDONLY;
++	else if(!r && w) 
++		mode = O_WRONLY;
++	else if(r && w) 
++		mode = O_RDWR;
++	else panic("Impossible mode in open_file");
++
++	if(append)
++		mode |= O_APPEND;
++	fd = open64(path, mode);
++	if(fd < 0) return(-errno);
++	else return(fd);
++}
++
++void *open_dir(char *path, int *err_out)
++{
++	DIR *dir;
++
++	dir = opendir(path);
++	*err_out = errno;
++	if(dir == NULL) return(NULL);
++	return(dir);
++}
++
++char *read_dir(void *stream, unsigned long long *pos, 
++	       unsigned long long *ino_out, int *len_out)
++{
++	DIR *dir = stream;
++	struct dirent *ent;
++
++	seekdir(dir, *pos);
++	ent = readdir(dir);
++	if(ent == NULL) return(NULL);
++	*len_out = strlen(ent->d_name);
++	*ino_out = ent->d_ino;
++	*pos = telldir(dir);
++	return(ent->d_name);
++}
++
++int read_file(int fd, unsigned long long *offset, char *buf, int len)
++{
++	int n;
++
++	n = pread64(fd, buf, len, *offset);
++	if(n < 0) return(-errno);
++	*offset += n;
++	return(n);
++}
++
++int write_file(int fd, unsigned long long *offset, const char *buf, int len)
++{
++	int n;
++
++	n = pwrite64(fd, buf, len, *offset);
++	if(n < 0) return(-errno);
++	*offset += n;
++	return(n);
++}
++
++int lseek_file(int fd, long long offset, int whence)
++{
++	int ret;
++
++	ret = lseek64(fd, offset, whence);
++	if(ret < 0) return(-errno);
++	return(0);
++}
++
++void close_file(void *stream)
++{
++	close(*((int *) stream));
++}
++
++void close_dir(void *stream)
++{
++	closedir(stream);
++}
++
++int file_create(char *name, int ur, int uw, int ux, int gr, 
++		int gw, int gx, int or, int ow, int ox)
++{
++	int mode, fd;
++
++	mode = 0;
++	mode |= ur ? S_IRUSR : 0;
++	mode |= uw ? S_IWUSR : 0;
++	mode |= ux ? S_IXUSR : 0;
++	mode |= gr ? S_IRGRP : 0;
++	mode |= gw ? S_IWGRP : 0;
++	mode |= gx ? S_IXGRP : 0;
++	mode |= or ? S_IROTH : 0;
++	mode |= ow ? S_IWOTH : 0;
++	mode |= ox ? S_IXOTH : 0;
++	fd = open64(name, O_CREAT | O_RDWR, mode);
++	if(fd < 0) 
++		return(-errno);
++	return(fd);
++}
++
++int set_attr(const char *file, struct hostfs_iattr *attrs)
++{
++	struct utimbuf buf;
++	int err, ma;
++
++	if(attrs->ia_valid & HOSTFS_ATTR_MODE){
++		if(chmod(file, attrs->ia_mode) != 0) return(-errno);
++	}
++	if(attrs->ia_valid & HOSTFS_ATTR_UID){
++		if(chown(file, attrs->ia_uid, -1)) return(-errno);
++	}
++	if(attrs->ia_valid & HOSTFS_ATTR_GID){
++		if(chown(file, -1, attrs->ia_gid)) return(-errno);
++	}
++	if(attrs->ia_valid & HOSTFS_ATTR_SIZE){
++		if(truncate(file, attrs->ia_size)) return(-errno);
++	}
++	ma = HOSTFS_ATTR_ATIME_SET | HOSTFS_ATTR_MTIME_SET;
++	if((attrs->ia_valid & ma) == ma){
++		buf.actime = attrs->ia_atime.tv_sec;
++		buf.modtime = attrs->ia_mtime.tv_sec;
++		if(utime(file, &buf) != 0) return(-errno);
++	}
++	else {
++		struct timespec ts;
++
++		if(attrs->ia_valid & HOSTFS_ATTR_ATIME_SET){
++			err = stat_file(file, NULL, NULL, NULL, NULL, NULL, 
++					NULL, NULL, &ts, NULL, NULL, NULL);
++			if(err != 0) 
++				return(err);
++			buf.actime = attrs->ia_atime.tv_sec;
++			buf.modtime = ts.tv_sec;
++			if(utime(file, &buf) != 0) 
++				return(-errno);
++		}
++		if(attrs->ia_valid & HOSTFS_ATTR_MTIME_SET){
++			err = stat_file(file, NULL, NULL, NULL, NULL, NULL, 
++					NULL, &ts, NULL, NULL, NULL, NULL);
++			if(err != 0) 
++				return(err);
++			buf.actime = ts.tv_sec;
++			buf.modtime = attrs->ia_mtime.tv_sec;
++			if(utime(file, &buf) != 0) 
++				return(-errno);
++		}
++	}
++	if(attrs->ia_valid & HOSTFS_ATTR_CTIME) ;
++	if(attrs->ia_valid & (HOSTFS_ATTR_ATIME | HOSTFS_ATTR_MTIME)){
++		err = stat_file(file, NULL, NULL, NULL, NULL, NULL, NULL, 
++				&attrs->ia_atime, &attrs->ia_mtime, NULL, 
++				NULL, NULL);
++		if(err != 0) return(err);
++	}
++	return(0);
++}
++
++int make_symlink(const char *from, const char *to)
++{
++	int err;
++
++	err = symlink(to, from);
++	if(err) return(-errno);
++	return(0);
++}
++
++int unlink_file(const char *file)
++{
++	int err;
++
++	err = unlink(file);
++	if(err) return(-errno);
++	return(0);
++}
++
++int do_mkdir(const char *file, int mode)
++{
++	int err;
++
++	err = mkdir(file, mode);
++	if(err) return(-errno);
++	return(0);
++}
++
++int do_rmdir(const char *file)
++{
++	int err;
++
++	err = rmdir(file);
++	if(err) return(-errno);
++	return(0);
++}
++
++int do_mknod(const char *file, int mode, int dev)
++{
++	int err;
++
++	err = mknod(file, mode, dev);
++	if(err) return(-errno);
++	return(0);
++}
++
++int link_file(const char *to, const char *from)
++{
++	int err;
++
++	err = link(to, from);
++	if(err) return(-errno);
++	return(0);
++}
++
++int do_readlink(char *file, char *buf, int size)
++{
++	int n;
++
++	n = readlink(file, buf, size);
++	if(n < 0) 
++		return(-errno);
++	if(n < size) 
++		buf[n] = '\0';
++	return(n);
++}
++
++int rename_file(char *from, char *to)
++{
++	int err;
++
++	err = rename(from, to);
++	if(err < 0) return(-errno);
++	return(0);	
++}
++
++int do_statfs(char *root, long *bsize_out, long long *blocks_out, 
++	      long long *bfree_out, long long *bavail_out, 
++	      long long *files_out, long long *ffree_out,
++	      void *fsid_out, int fsid_size, long *namelen_out, 
++	      long *spare_out)
++{
++	struct statfs64 buf;
++	int err;
++
++	err = statfs64(root, &buf);
++	if(err < 0) return(-errno);
++	*bsize_out = buf.f_bsize;
++	*blocks_out = buf.f_blocks;
++	*bfree_out = buf.f_bfree;
++	*bavail_out = buf.f_bavail;
++	*files_out = buf.f_files;
++	*ffree_out = buf.f_ffree;
++	memcpy(fsid_out, &buf.f_fsid, 
++	       sizeof(buf.f_fsid) > fsid_size ? fsid_size : 
++	       sizeof(buf.f_fsid));
++	*namelen_out = buf.f_namelen;
++	spare_out[0] = buf.f_spare[0];
++	spare_out[1] = buf.f_spare[1];
++	spare_out[2] = buf.f_spare[2];
++	spare_out[3] = buf.f_spare[3];
++	spare_out[4] = buf.f_spare[4];
++	spare_out[5] = buf.f_spare[5];
++	return(0);
++}
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/fs/hostfs/Makefile b/fs/hostfs/Makefile
+--- a/fs/hostfs/Makefile	1969-12-31 19:00:00.000000000 -0500
++++ b/fs/hostfs/Makefile	2004-01-08 22:17:43.000000000 -0500
+@@ -0,0 +1,36 @@
++# 
++# Copyright (C) 2000 Jeff Dike (jdike@karaya.com)
++# Licensed under the GPL
++#
++
++# struct stat64 changed the inode field name between 2.2 and 2.4 from st_ino
++# to __st_ino.  It stayed in the same place, so as long as the correct name
++# is used, hostfs compiled on 2.2 should work on 2.4 and vice versa.
++
++STAT64_INO_FIELD := $(shell grep -q __st_ino /usr/include/bits/stat.h && \
++				echo __)st_ino
++
++hostfs-objs := hostfs_kern.o hostfs_user.o
++
++obj-y = 
++obj-$(CONFIG_HOSTFS) += hostfs.o
++
++SINGLE_OBJS = $(foreach f,$(patsubst %.o,%,$(obj-y) $(obj-m)),$($(f)-objs))
++
++USER_OBJS := $(filter %_user.o,$(obj-y) $(obj-m) $(SINGLE_OBJS))
++USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
++
++USER_CFLAGS += -DSTAT64_INO_FIELD=$(STAT64_INO_FIELD)
++
++$(USER_OBJS) : %.o: %.c
++	$(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
++
++clean:
++
++modules:
++
++fastdep:
++
++dep:
++
++archmrproper: clean
+diff -Naur a/fs/hppfs/hppfs_kern.c b/fs/hppfs/hppfs_kern.c
+--- a/fs/hppfs/hppfs_kern.c	1969-12-31 19:00:00.000000000 -0500
++++ b/fs/hppfs/hppfs_kern.c	2004-01-08 22:27:11.000000000 -0500
+@@ -0,0 +1,811 @@
++/* 
++ * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
++ * Licensed under the GPL
++ */
++
++#include <linux/fs.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/slab.h>
++#include <linux/list.h>
++#include <linux/kernel.h>
++#include <linux/ctype.h>
++#include <linux/dcache.h>
++#include <linux/statfs.h>
++#include <asm/uaccess.h>
++#include <asm/fcntl.h>
++#include "os.h"
++
++static int init_inode(struct inode *inode, struct dentry *dentry);
++
++struct hppfs_data {
++	struct list_head list;
++	char contents[PAGE_SIZE - sizeof(struct list_head)];
++};
++
++struct hppfs_private {
++	struct file proc_file;
++	int host_fd;
++	loff_t len;
++	struct hppfs_data *contents;
++};
++
++struct hppfs_inode_info {
++        struct dentry *proc_dentry;
++	struct inode vfs_inode;
++};
++
++static inline struct hppfs_inode_info *HPPFS_I(struct inode *inode)
++{
++	return(list_entry(inode, struct hppfs_inode_info, vfs_inode));
++}
++
++#define HPPFS_SUPER_MAGIC 0xb00000ee
++
++static struct super_operations hppfs_sbops;
++
++static int is_pid(struct dentry *dentry)
++{
++	struct super_block *sb;
++	int i;
++
++	sb = dentry->d_sb;
++	if((sb->s_op != &hppfs_sbops) || (dentry->d_parent != sb->s_root))
++		return(0);
++
++	for(i = 0; i < dentry->d_name.len; i++){
++		if(!isdigit(dentry->d_name.name[i]))
++			return(0);
++	}
++	return(1);
++}
++
++static char *dentry_name(struct dentry *dentry, int extra)
++{
++	struct dentry *parent;
++	char *root, *name;
++	const char *seg_name;
++	int len, seg_len;
++
++	len = 0;
++	parent = dentry;
++	while(parent->d_parent != parent){
++		if(is_pid(parent))
++			len += strlen("pid") + 1;
++		else len += parent->d_name.len + 1;
++		parent = parent->d_parent;
++	}
++	
++	root = "proc";
++	len += strlen(root);
++	name = kmalloc(len + extra + 1, GFP_KERNEL);
++	if(name == NULL) return(NULL);
++
++	name[len] = '\0';
++	parent = dentry;
++	while(parent->d_parent != parent){
++		if(is_pid(parent)){
++			seg_name = "pid";
++			seg_len = strlen("pid");
++		}
++		else {
++			seg_name = parent->d_name.name;
++			seg_len = parent->d_name.len;
++		}
++
++		len -= seg_len + 1;
++		name[len] = '/';
++		strncpy(&name[len + 1], seg_name, seg_len);
++		parent = parent->d_parent;
++	}
++	strncpy(name, root, strlen(root));
++	return(name);
++}
++
++struct dentry_operations hppfs_dentry_ops = {
++};
++
++static int file_removed(struct dentry *dentry, const char *file)
++{
++	char *host_file;
++	int extra, fd;
++
++	extra = 0;
++	if(file != NULL) extra += strlen(file) + 1;
++
++	host_file = dentry_name(dentry, extra + strlen("/remove"));
++	if(host_file == NULL){
++		printk("file_removed : allocation failed\n");
++		return(-ENOMEM);
++	}
++
++	if(file != NULL){
++		strcat(host_file, "/");
++		strcat(host_file, file);
++	}
++	strcat(host_file, "/remove");
++
++	fd = os_open_file(host_file, of_read(OPENFLAGS()), 0);
++	kfree(host_file);
++	if(fd > 0){
++		os_close_file(fd);
++		return(1);
++	}
++	return(0);
++}
++
++static void hppfs_read_inode(struct inode *ino)
++{
++	struct inode *proc_ino;
++
++	if(HPPFS_I(ino)->proc_dentry == NULL)
++		return;
++
++	proc_ino = HPPFS_I(ino)->proc_dentry->d_inode;
++	ino->i_uid = proc_ino->i_uid;
++	ino->i_gid = proc_ino->i_gid;
++	ino->i_atime = proc_ino->i_atime;
++	ino->i_mtime = proc_ino->i_mtime;
++	ino->i_ctime = proc_ino->i_ctime;
++	ino->i_ino = proc_ino->i_ino;
++	ino->i_mode = proc_ino->i_mode;
++	ino->i_nlink = proc_ino->i_nlink;
++	ino->i_size = proc_ino->i_size;
++	ino->i_blksize = proc_ino->i_blksize;
++	ino->i_blocks = proc_ino->i_blocks;
++}
++
++static struct dentry *hppfs_lookup(struct inode *ino, struct dentry *dentry, 
++                                  struct nameidata *nd)
++{
++	struct dentry *proc_dentry, *new, *parent;
++	struct inode *inode;
++	int err, deleted;
++
++	deleted = file_removed(dentry, NULL);
++	if(deleted < 0)
++		return(ERR_PTR(deleted));
++	else if(deleted)
++		return(ERR_PTR(-ENOENT));
++
++	err = -ENOMEM;
++	parent = HPPFS_I(ino)->proc_dentry;
++	down(&parent->d_inode->i_sem);
++	proc_dentry = d_lookup(parent, &dentry->d_name);
++	if(proc_dentry == NULL){
++		proc_dentry = d_alloc(parent, &dentry->d_name);
++		if(proc_dentry == NULL){
++			up(&parent->d_inode->i_sem);
++			goto out;
++		}
++		new = (*parent->d_inode->i_op->lookup)(parent->d_inode, 
++						       proc_dentry, NULL);
++		if(new){
++			dput(proc_dentry);
++			proc_dentry = new;
++		}
++	}
++	up(&parent->d_inode->i_sem);
++
++	if(IS_ERR(proc_dentry))
++		return(proc_dentry);
++
++	inode = iget(ino->i_sb, 0);
++	if(inode == NULL) 
++		goto out_dput;
++
++	err = init_inode(inode, proc_dentry);
++	if(err) 
++		goto out_put;
++	
++	hppfs_read_inode(inode);
++
++ 	d_add(dentry, inode);
++	dentry->d_op = &hppfs_dentry_ops;
++	return(NULL);
++
++ out_put:
++	iput(inode);
++ out_dput:
++	dput(proc_dentry);
++ out:
++	return(ERR_PTR(err));
++}
++
++static struct inode_operations hppfs_file_iops = {
++};
++
++static ssize_t read_proc(struct file *file, char *buf, ssize_t count, 
++			 loff_t *ppos, int is_user)
++{
++	ssize_t (*read)(struct file *, char *, size_t, loff_t *);
++	ssize_t n;
++
++	read = file->f_dentry->d_inode->i_fop->read;
++
++	if(!is_user)
++		set_fs(KERNEL_DS);
++		
++	n = (*read)(file, buf, count, &file->f_pos);
++
++	if(!is_user)
++		set_fs(USER_DS);
++
++	if(ppos) *ppos = file->f_pos;
++	return(n);
++}
++
++static ssize_t hppfs_read_file(int fd, char *buf, ssize_t count)
++{
++	ssize_t n;
++	int cur, err;
++	char *new_buf;
++
++	n = -ENOMEM;
++	new_buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
++	if(new_buf == NULL){
++		printk("hppfs_read_file : kmalloc failed\n");
++		goto out;
++	}
++	n = 0;
++	while(count > 0){
++		cur = min_t(ssize_t, count, PAGE_SIZE);
++		err = os_read_file(fd, new_buf, cur);
++		if(err < 0){
++			printk("hppfs_read : read failed, errno = %d\n",
++			       count);
++			n = err;
++			goto out_free;
++		}
++		else if(err == 0)
++			break;
++
++		if(copy_to_user(buf, new_buf, err)){
++			n = -EFAULT;
++			goto out_free;
++		}
++		n += err;
++		count -= err;
++	}
++ out_free:
++	kfree(new_buf);
++ out:
++	return(n);
++}
++
++static ssize_t hppfs_read(struct file *file, char *buf, size_t count, 
++			  loff_t *ppos)
++{
++	struct hppfs_private *hppfs = file->private_data;
++	struct hppfs_data *data;
++	loff_t off;
++	int err;
++
++	if(hppfs->contents != NULL){
++		if(*ppos >= hppfs->len) return(0);
++
++		data = hppfs->contents;
++		off = *ppos;
++		while(off >= sizeof(data->contents)){
++			data = list_entry(data->list.next, struct hppfs_data,
++					  list);
++			off -= sizeof(data->contents);
++		}
++
++		if(off + count > hppfs->len)
++			count = hppfs->len - off;
++		copy_to_user(buf, &data->contents[off], count);
++		*ppos += count;
++	}
++	else if(hppfs->host_fd != -1){
++		err = os_seek_file(hppfs->host_fd, *ppos);
++		if(err){
++			printk("hppfs_read : seek failed, errno = %d\n", err);
++			return(err);
++		}
++		count = hppfs_read_file(hppfs->host_fd, buf, count);
++		if(count > 0)
++			*ppos += count;
++	}
++	else count = read_proc(&hppfs->proc_file, buf, count, ppos, 1);
++
++	return(count);
++}
++
++static ssize_t hppfs_write(struct file *file, const char *buf, size_t len, 
++			   loff_t *ppos)
++{
++	struct hppfs_private *data = file->private_data;
++	struct file *proc_file = &data->proc_file;
++	ssize_t (*write)(struct file *, const char *, size_t, loff_t *);
++	int err;
++
++	write = proc_file->f_dentry->d_inode->i_fop->write;
++
++	proc_file->f_pos = file->f_pos;
++	err = (*write)(proc_file, buf, len, &proc_file->f_pos);
++	file->f_pos = proc_file->f_pos;
++
++	return(err);
++}
++
++static int open_host_sock(char *host_file, int *filter_out)
++{
++	char *end;
++	int fd;
++
++	end = &host_file[strlen(host_file)];
++	strcpy(end, "/rw");
++	*filter_out = 1;
++	fd = os_connect_socket(host_file);
++	if(fd > 0)
++		return(fd);
++
++	strcpy(end, "/r");
++	*filter_out = 0;
++	fd = os_connect_socket(host_file);
++	return(fd);
++}
++
++static void free_contents(struct hppfs_data *head)
++{
++	struct hppfs_data *data;
++	struct list_head *ele, *next;
++
++	if(head == NULL) return;
++
++	list_for_each_safe(ele, next, &head->list){
++		data = list_entry(ele, struct hppfs_data, list);
++		kfree(data);
++	}
++	kfree(head);
++}
++
++static struct hppfs_data *hppfs_get_data(int fd, int filter, 
++					 struct file *proc_file, 
++					 struct file *hppfs_file, 
++					 loff_t *size_out)
++{
++	struct hppfs_data *data, *new, *head;
++	int n, err;
++
++	err = -ENOMEM;
++	data = kmalloc(sizeof(*data), GFP_KERNEL);
++	if(data == NULL){
++		printk("hppfs_get_data : head allocation failed\n");
++		goto failed;
++	}
++
++	INIT_LIST_HEAD(&data->list);
++
++	head = data;
++	*size_out = 0;
++
++	if(filter){
++		while((n = read_proc(proc_file, data->contents,
++				     sizeof(data->contents), NULL, 0)) > 0)
++			os_write_file(fd, data->contents, n);
++		err = os_shutdown_socket(fd, 0, 1);
++		if(err){
++			printk("hppfs_get_data : failed to shut down "
++			       "socket\n");
++			goto failed_free;
++		}
++	}
++	while(1){
++		n = os_read_file(fd, data->contents, sizeof(data->contents));
++		if(n < 0){
++			err = n;
++			printk("hppfs_get_data : read failed, errno = %d\n",
++			       err);
++			goto failed_free;
++		}
++		else if(n == 0)
++			break;
++
++		*size_out += n;
++
++		if(n < sizeof(data->contents))
++			break;
++
++		new = kmalloc(sizeof(*data), GFP_KERNEL);
++		if(new == 0){
++			printk("hppfs_get_data : data allocation failed\n");
++			err = -ENOMEM;
++			goto failed_free;
++		}
++	
++		INIT_LIST_HEAD(&new->list);
++		list_add(&new->list, &data->list);
++		data = new;
++	}
++	return(head);
++
++ failed_free:
++	free_contents(head);
++ failed:		
++	return(ERR_PTR(err));
++}
++
++static struct hppfs_private *hppfs_data(void)
++{
++	struct hppfs_private *data;
++
++	data = kmalloc(sizeof(*data), GFP_KERNEL);
++	if(data == NULL)
++		return(data);
++
++	*data = ((struct hppfs_private ) { .host_fd  		= -1,
++					   .len  		= -1,
++					   .contents 		= NULL } );
++	return(data);
++}
++
++static int file_mode(int fmode)
++{
++	if(fmode == (FMODE_READ | FMODE_WRITE))
++		return(O_RDWR);
++	if(fmode == FMODE_READ)
++		return(O_RDONLY);
++	if(fmode == FMODE_WRITE)
++		return(O_WRONLY);
++	return(0);
++}
++
++static int hppfs_open(struct inode *inode, struct file *file)
++{
++	struct hppfs_private *data;
++	struct dentry *proc_dentry;
++	char *host_file;
++	int err, fd, type, filter;
++
++	err = -ENOMEM;
++	data = hppfs_data();
++	if(data == NULL)
++		goto out;
++
++	host_file = dentry_name(file->f_dentry, strlen("/rw"));
++	if(host_file == NULL)
++		goto out_free2;
++
++	proc_dentry = HPPFS_I(inode)->proc_dentry;
++
++	/* XXX This isn't closed anywhere */
++	err = open_private_file(&data->proc_file, proc_dentry, 
++				file_mode(file->f_mode));
++	if(err)
++		goto out_free1;
++
++	type = os_file_type(host_file);
++	if(type == OS_TYPE_FILE){
++		fd = os_open_file(host_file, of_read(OPENFLAGS()), 0);
++		if(fd >= 0) 
++			data->host_fd = fd;
++		else printk("hppfs_open : failed to open '%s', errno = %d\n",
++			    host_file, -fd);
++
++		data->contents = NULL;
++	}
++	else if(type == OS_TYPE_DIR){
++		fd = open_host_sock(host_file, &filter);
++		if(fd > 0){
++			data->contents = hppfs_get_data(fd, filter, 
++							&data->proc_file, 
++							file, &data->len);
++			if(!IS_ERR(data->contents))
++				data->host_fd = fd;
++		}
++		else printk("hppfs_open : failed to open a socket in "
++			    "'%s', errno = %d\n", host_file, -fd);
++	}
++	kfree(host_file);
++
++	file->private_data = data;
++	return(0);
++
++ out_free1:
++	kfree(host_file);
++ out_free2:
++	free_contents(data->contents);
++	kfree(data);
++ out:
++	return(err);
++}
++
++static int hppfs_dir_open(struct inode *inode, struct file *file)
++{
++	struct hppfs_private *data;
++	struct dentry *proc_dentry;
++	int err;
++
++	err = -ENOMEM;
++	data = hppfs_data();
++	if(data == NULL)
++		goto out;
++
++	proc_dentry = HPPFS_I(inode)->proc_dentry;
++	err = open_private_file(&data->proc_file, proc_dentry, 
++				file_mode(file->f_mode));
++	if(err)
++		goto out_free;
++
++	file->private_data = data;
++	return(0);
++
++ out_free:
++	kfree(data);
++ out:
++	return(err);
++}
++
++static loff_t hppfs_llseek(struct file *file, loff_t off, int where)
++{
++	struct hppfs_private *data = file->private_data;
++	struct file *proc_file = &data->proc_file;
++	loff_t (*llseek)(struct file *, loff_t, int);
++	loff_t ret;
++
++	llseek = proc_file->f_dentry->d_inode->i_fop->llseek;
++	if(llseek != NULL){
++		ret = (*llseek)(proc_file, off, where);
++		if(ret < 0)
++			return(ret);
++	}
++
++	return(default_llseek(file, off, where));
++}
++
++static struct file_operations hppfs_file_fops = {
++	.owner		= NULL,
++	.llseek		= hppfs_llseek,
++	.read		= hppfs_read,
++	.write		= hppfs_write,
++	.open		= hppfs_open,
++};
++
++struct hppfs_dirent {
++	void *vfs_dirent;
++	filldir_t filldir;
++	struct dentry *dentry;
++};
++
++static int hppfs_filldir(void *d, const char *name, int size, 
++			 loff_t offset, ino_t inode, unsigned int type)
++{
++	struct hppfs_dirent *dirent = d;
++
++	if(file_removed(dirent->dentry, name))
++		return(0);
++
++	return((*dirent->filldir)(dirent->vfs_dirent, name, size, offset, 
++				  inode, type));
++}
++
++static int hppfs_readdir(struct file *file, void *ent, filldir_t filldir)
++{
++	struct hppfs_private *data = file->private_data;
++	struct file *proc_file = &data->proc_file;
++	int (*readdir)(struct file *, void *, filldir_t);
++	struct hppfs_dirent dirent = ((struct hppfs_dirent)
++		                      { .vfs_dirent  	= ent,
++					.filldir 	= filldir,
++					.dentry  	= file->f_dentry } );
++	int err;
++
++	readdir = proc_file->f_dentry->d_inode->i_fop->readdir;
++
++	proc_file->f_pos = file->f_pos;
++	err = (*readdir)(proc_file, &dirent, hppfs_filldir);
++	file->f_pos = proc_file->f_pos;
++
++	return(err);
++}
++
++static int hppfs_fsync(struct file *file, struct dentry *dentry, int datasync)
++{
++	return(0);
++}
++
++static struct file_operations hppfs_dir_fops = {
++	.owner		= NULL,
++	.readdir	= hppfs_readdir,
++	.open		= hppfs_dir_open,
++	.fsync		= hppfs_fsync,
++};
++
++static int hppfs_statfs(struct super_block *sb, struct kstatfs *sf)
++{
++	sf->f_blocks = 0;
++	sf->f_bfree = 0;
++	sf->f_bavail = 0;
++	sf->f_files = 0;
++	sf->f_ffree = 0;
++	sf->f_type = HPPFS_SUPER_MAGIC;
++	return(0);
++}
++
++static struct inode *hppfs_alloc_inode(struct super_block *sb)
++{
++	struct hppfs_inode_info *hi;
++
++	hi = kmalloc(sizeof(*hi), GFP_KERNEL);
++	if(hi == NULL) 
++		return(NULL);
++
++	*hi = ((struct hppfs_inode_info) { .proc_dentry	= NULL });
++	inode_init_once(&hi->vfs_inode);
++	return(&hi->vfs_inode);
++}
++
++void hppfs_delete_inode(struct inode *ino)
++{
++	clear_inode(ino);
++}
++
++static void hppfs_destroy_inode(struct inode *inode)
++{
++	kfree(HPPFS_I(inode));
++}
++
++static struct super_operations hppfs_sbops = { 
++	.alloc_inode	= hppfs_alloc_inode,
++	.destroy_inode	= hppfs_destroy_inode,
++	.read_inode	= hppfs_read_inode,
++	.delete_inode	= hppfs_delete_inode,
++	.statfs		= hppfs_statfs,
++};
++
++static int hppfs_readlink(struct dentry *dentry, char *buffer, int buflen)
++{
++	struct file proc_file;
++	struct dentry *proc_dentry;
++	int (*readlink)(struct dentry *, char *, int);
++	int err, n;
++
++	proc_dentry = HPPFS_I(dentry->d_inode)->proc_dentry;
++	err = open_private_file(&proc_file, proc_dentry, O_RDONLY);
++	if(err) 
++		return(err);
++
++	readlink = proc_dentry->d_inode->i_op->readlink;
++	n = (*readlink)(proc_dentry, buffer, buflen);
++
++	close_private_file(&proc_file);
++	
++	return(n);
++}
++
++static int hppfs_follow_link(struct dentry *dentry, struct nameidata *nd)
++{
++	struct file proc_file;
++	struct dentry *proc_dentry;
++	int (*follow_link)(struct dentry *, struct nameidata *);
++	int err, n;
++
++	proc_dentry = HPPFS_I(dentry->d_inode)->proc_dentry;
++	err = open_private_file(&proc_file, proc_dentry, O_RDONLY);
++	if(err) 
++		return(err);
++
++	follow_link = proc_dentry->d_inode->i_op->follow_link;
++	n = (*follow_link)(proc_dentry, nd);
++
++	close_private_file(&proc_file);
++	
++	return(n);
++}
++
++static struct inode_operations hppfs_dir_iops = {
++	.lookup		= hppfs_lookup,
++};
++
++static struct inode_operations hppfs_link_iops = {
++	.readlink	= hppfs_readlink,
++	.follow_link	= hppfs_follow_link,
++};
++
++static int init_inode(struct inode *inode, struct dentry *dentry)
++{
++	if(S_ISDIR(dentry->d_inode->i_mode)){
++		inode->i_op = &hppfs_dir_iops;
++		inode->i_fop = &hppfs_dir_fops;
++	}
++	else if(S_ISLNK(dentry->d_inode->i_mode)){
++		inode->i_op = &hppfs_link_iops;
++		inode->i_fop = &hppfs_file_fops;
++	}
++	else {
++		inode->i_op = &hppfs_file_iops;
++		inode->i_fop = &hppfs_file_fops;
++	}
++
++	HPPFS_I(inode)->proc_dentry = dentry;
++
++	return(0);
++}
++
++static int hppfs_fill_super(struct super_block *sb, void *d, int silent)
++{
++	struct inode *root_inode;
++	struct file_system_type *procfs;
++	struct super_block *proc_sb;
++	int err;
++
++	err = -ENOENT;
++	procfs = get_fs_type("proc");
++	if(procfs == NULL) 
++		goto out;
++
++	if(list_empty(&procfs->fs_supers))
++		goto out;
++
++	proc_sb = list_entry(procfs->fs_supers.next, struct super_block,
++			     s_instances);
++	
++	sb->s_blocksize = 1024;
++	sb->s_blocksize_bits = 10;
++	sb->s_magic = HPPFS_SUPER_MAGIC;
++	sb->s_op = &hppfs_sbops;
++
++	root_inode = iget(sb, 0);
++	if(root_inode == NULL)
++		goto out;
++
++	err = init_inode(root_inode, proc_sb->s_root);
++	if(err)
++		goto out_put;
++
++	err = -ENOMEM;
++	sb->s_root = d_alloc_root(root_inode);
++	if(sb->s_root == NULL)
++		goto out_put;
++
++	hppfs_read_inode(root_inode);
++
++	return(0);
++
++ out_put:
++	iput(root_inode);
++ out:
++	return(err);
++}
++
++static struct super_block *hppfs_read_super(struct file_system_type *type,
++					     int flags, const char *dev_name,
++					     void *data)
++{
++	return(get_sb_nodev(type, flags, data, hppfs_fill_super));
++}
++
++static struct file_system_type hppfs_type = {
++	.owner 		= THIS_MODULE,
++	.name 		= "hppfs",
++	.get_sb 	= hppfs_read_super,
++	.kill_sb	= kill_anon_super,
++	.fs_flags 	= 0,
++};
++
++static int __init init_hppfs(void)
++{
++	return(register_filesystem(&hppfs_type));
++}
++
++static void __exit exit_hppfs(void)
++{
++	unregister_filesystem(&hppfs_type);
++}
++
++module_init(init_hppfs)
++module_exit(exit_hppfs)
++MODULE_LICENSE("GPL");
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/fs/hppfs/Makefile b/fs/hppfs/Makefile
+--- a/fs/hppfs/Makefile	1969-12-31 19:00:00.000000000 -0500
++++ b/fs/hppfs/Makefile	2004-01-08 22:28:32.000000000 -0500
+@@ -0,0 +1,19 @@
++# 
++# Copyright (C) 2002, 2003 Jeff Dike (jdike@karaya.com)
++# Licensed under the GPL
++#
++
++hppfs-objs := hppfs_kern.o
++
++obj-y = 
++obj-$(CONFIG_HPPFS) += hppfs.o
++
++clean:
++
++modules:
++
++fastdep:
++
++dep:
++
++archmrproper: clean
+diff -Naur a/fs/Makefile b/fs/Makefile
+--- a/fs/Makefile	2004-01-08 22:23:07.000000000 -0500
++++ b/fs/Makefile	2004-01-08 22:30:15.000000000 -0500
+@@ -91,3 +91,5 @@
+ obj-$(CONFIG_XFS_FS)		+= xfs/
+ obj-$(CONFIG_AFS_FS)		+= afs/
+ obj-$(CONFIG_BEFS_FS)		+= befs/
++obj-$(CONFIG_HOSTFS)		+= hostfs/
++obj-$(CONFIG_HPPFS)		+= hppfs/
+diff -Naur a/include/asm-um/archparam-i386.h b/include/asm-um/archparam-i386.h
+--- a/include/asm-um/archparam-i386.h	2004-01-08 22:28:22.000000000 -0500
++++ b/include/asm-um/archparam-i386.h	2004-01-08 22:34:31.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* 
+- * Copyright (C) 2000, 2001 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+@@ -56,6 +56,65 @@
+ 	pr_reg[16] = PT_REGS_SS(regs);		\
+ } while(0);
+ 
++#define VSYSCALL_BASE	(__fix_to_virt(FIX_VSYSCALL))
++#define VSYSCALL_EHDR	((const struct elfhdr *) VSYSCALL_BASE)
++#define VSYSCALL_ENTRY	((unsigned long) &__kernel_vsyscall)
++extern void *__kernel_vsyscall;
++
++/*
++ * Architecture-neutral AT_ values in 0-17, leave some room
++ * for more of them, start the x86-specific ones at 32.
++ */
++#define AT_SYSINFO		32
++#define AT_SYSINFO_EHDR		33
++
++#define ARCH_DLINFO						\
++do {								\
++		NEW_AUX_ENT(AT_SYSINFO,	VSYSCALL_ENTRY);	\
++		NEW_AUX_ENT(AT_SYSINFO_EHDR, VSYSCALL_BASE);	\
++} while (0)
++
++/*
++ * These macros parameterize elf_core_dump in fs/binfmt_elf.c to write out
++ * extra segments containing the vsyscall DSO contents.  Dumping its
++ * contents makes post-mortem fully interpretable later without matching up
++ * the same kernel and hardware config to see what PC values meant.
++ * Dumping its extra ELF program headers includes all the other information
++ * a debugger needs to easily find how the vsyscall DSO was being used.
++ */
++#define ELF_CORE_EXTRA_PHDRS		(VSYSCALL_EHDR->e_phnum)
++#define ELF_CORE_WRITE_EXTRA_PHDRS					      \
++do {									      \
++	const struct elf_phdr *const vsyscall_phdrs =			      \
++		(const struct elf_phdr *) (VSYSCALL_BASE		      \
++					   + VSYSCALL_EHDR->e_phoff);	      \
++	int i;								      \
++	Elf32_Off ofs = 0;						      \
++	for (i = 0; i < VSYSCALL_EHDR->e_phnum; ++i) {			      \
++		struct elf_phdr phdr = vsyscall_phdrs[i];		      \
++		if (phdr.p_type == PT_LOAD) {				      \
++			ofs = phdr.p_offset = offset;			      \
++			offset += phdr.p_filesz;			      \
++		}							      \
++		else							      \
++			phdr.p_offset += ofs;				      \
++		phdr.p_paddr = 0; /* match other core phdrs */		      \
++		DUMP_WRITE(&phdr, sizeof(phdr));			      \
++	}								      \
++} while (0)
++#define ELF_CORE_WRITE_EXTRA_DATA					      \
++do {									      \
++	const struct elf_phdr *const vsyscall_phdrs =			      \
++		(const struct elf_phdr *) (VSYSCALL_BASE		      \
++					   + VSYSCALL_EHDR->e_phoff);	      \
++	int i;								      \
++	for (i = 0; i < VSYSCALL_EHDR->e_phnum; ++i) {			      \
++		if (vsyscall_phdrs[i].p_type == PT_LOAD)		      \
++			DUMP_WRITE((void *) vsyscall_phdrs[i].p_vaddr,	      \
++				   vsyscall_phdrs[i].p_filesz);		      \
++	}								      \
++} while (0)
++
+ /********* Bits for asm-um/delay.h **********/
+ 
+ typedef unsigned long um_udelay_t;
+diff -Naur a/include/asm-um/common.lds.S b/include/asm-um/common.lds.S
+--- a/include/asm-um/common.lds.S	2004-01-08 22:16:07.000000000 -0500
++++ b/include/asm-um/common.lds.S	2004-01-08 22:21:49.000000000 -0500
+@@ -1,3 +1,5 @@
++#include <asm-generic/vmlinux.lds.h>
++
+   .fini      : { *(.fini)    } =0x9090
+   _etext = .;
+   PROVIDE (etext = .);
+@@ -67,6 +69,10 @@
+   }
+   __initcall_end = .;
+ 
++  __con_initcall_start = .;
++  .con_initcall.init : { *(.con_initcall.init) }
++  __con_initcall_end = .;
++
+   __uml_initcall_start = .;
+   .uml.initcall.init : { *(.uml.initcall.init) }
+   __uml_initcall_end = .;
+@@ -80,7 +86,33 @@
+   .uml.exitcall : { *(.uml.exitcall.exit) }
+   __uml_exitcall_end = .;
+ 
+-  . = ALIGN(4096);
++  . = ALIGN(4);
++  __alt_instructions = .;
++  .altinstructions : { *(.altinstructions) } 
++  __alt_instructions_end = .; 
++  .altinstr_replacement : { *(.altinstr_replacement) } 
++  /* .exit.text is discard at runtime, not link time, to deal with references
++     from .altinstructions and .eh_frame */
++  .exit.text : { *(.exit.text) }
++  .exit.data : { *(.exit.data) }
++ 
++  __preinit_array_start = .;
++  .preinit_array : { *(.preinit_array) }
++  __preinit_array_end = .;
++  __init_array_start = .;
++  .init_array : { *(.init_array) }
++  __init_array_end = .;
++  __fini_array_start = .;
++  .fini_array : { *(.fini_array) }
++  __fini_array_end = .;
++
++   . = ALIGN(4096);
+   __initramfs_start = .;
+   .init.ramfs : { *(.init.ramfs) }
+   __initramfs_end = .;
++
++  /* Sections to be discarded */
++  /DISCARD/ : {
++ 	*(.exitcall.exit)
++  }
++ 
+diff -Naur a/include/asm-um/cpufeature.h b/include/asm-um/cpufeature.h
+--- a/include/asm-um/cpufeature.h	1969-12-31 19:00:00.000000000 -0500
++++ b/include/asm-um/cpufeature.h	2004-01-08 22:17:48.000000000 -0500
+@@ -0,0 +1,6 @@
++#ifndef __UM_CPUFEATURE_H
++#define __UM_CPUFEATURE_H
++
++#include "asm/arch/cpufeature.h"
++
++#endif
+diff -Naur a/include/asm-um/current.h b/include/asm-um/current.h
+--- a/include/asm-um/current.h	2004-01-08 22:14:14.000000000 -0500
++++ b/include/asm-um/current.h	2004-01-08 22:19:07.000000000 -0500
+@@ -16,8 +16,10 @@
+ #define CURRENT_THREAD(dummy) (((unsigned long) &dummy) & \
+ 			        (PAGE_MASK << CONFIG_KERNEL_STACK_ORDER))
+ 
+-#define current ({ int dummy; \
+-                   ((struct thread_info *) CURRENT_THREAD(dummy))->task; })
++#define current_thread \
++	({ int dummy; ((struct thread_info *) CURRENT_THREAD(dummy)); })
++
++#define current (current_thread->task)
+ 
+ #endif /* __ASSEMBLY__ */
+ 
+diff -Naur a/include/asm-um/fixmap.h b/include/asm-um/fixmap.h
+--- a/include/asm-um/fixmap.h	2004-01-08 22:30:17.000000000 -0500
++++ b/include/asm-um/fixmap.h	2004-01-08 22:35:33.000000000 -0500
+@@ -34,6 +34,7 @@
+ 	FIX_KMAP_BEGIN,	/* reserved pte's for temporary kernel mappings */
+ 	FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,
+ #endif
++	FIX_VSYSCALL,
+ 	__end_of_fixed_addresses
+ };
+ 
+@@ -63,6 +64,13 @@
+ #define __fix_to_virt(x)	(FIXADDR_TOP - ((x) << PAGE_SHIFT))
+ #define __virt_to_fix(x)      ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT)
+ 
++/*
++ * This is the range that is readable by user mode, and things
++ * acting like user mode such as get_user_pages.
++ */
++#define FIXADDR_USER_START	(__fix_to_virt(FIX_VSYSCALL))
++#define FIXADDR_USER_END	(FIXADDR_USER_START + PAGE_SIZE)
++
+ extern void __this_fixmap_does_not_exist(void);
+ 
+ /*
+diff -Naur a/include/asm-um/irq.h b/include/asm-um/irq.h
+--- a/include/asm-um/irq.h	2004-01-08 22:32:16.000000000 -0500
++++ b/include/asm-um/irq.h	2004-01-08 22:36:27.000000000 -0500
+@@ -1,15 +1,6 @@
+ #ifndef __UM_IRQ_H
+ #define __UM_IRQ_H
+ 
+-/* The i386 irq.h has a struct task_struct in a prototype without including
+- * sched.h.  This forward declaration kills the resulting warning.
+- */
+-struct task_struct;
+-
+-#include "asm/ptrace.h"
+-
+-#undef NR_IRQS
+-
+ #define TIMER_IRQ		0
+ #define UMN_IRQ			1
+ #define CONSOLE_IRQ		2
+@@ -28,8 +19,4 @@
+ #define LAST_IRQ XTERM_IRQ
+ #define NR_IRQS (LAST_IRQ + 1)
+ 
+-extern int um_request_irq(unsigned int irq, int fd, int type,
+-			  void (*handler)(int, void *, struct pt_regs *),
+-			  unsigned long irqflags,  const char * devname,
+-			  void *dev_id);
+ #endif
+diff -Naur a/include/asm-um/local.h b/include/asm-um/local.h
+--- a/include/asm-um/local.h	1969-12-31 19:00:00.000000000 -0500
++++ b/include/asm-um/local.h	2004-01-08 22:31:28.000000000 -0500
+@@ -0,0 +1,6 @@
++#ifndef __UM_LOCAL_H
++#define __UM_LOCAL_H
++
++#include "asm/arch/local.h"
++
++#endif
+diff -Naur a/include/asm-um/module-generic.h b/include/asm-um/module-generic.h
+--- a/include/asm-um/module-generic.h	1969-12-31 19:00:00.000000000 -0500
++++ b/include/asm-um/module-generic.h	2004-01-08 22:29:52.000000000 -0500
+@@ -0,0 +1,6 @@
++#ifndef __UM_MODULE_GENERIC_H
++#define __UM_MODULE_GENERIC_H
++
++#include "asm/arch/module.h"
++
++#endif
+diff -Naur a/include/asm-um/module-i386.h b/include/asm-um/module-i386.h
+--- a/include/asm-um/module-i386.h	1969-12-31 19:00:00.000000000 -0500
++++ b/include/asm-um/module-i386.h	2004-01-08 22:29:46.000000000 -0500
+@@ -0,0 +1,13 @@
++#ifndef __UM_MODULE_I386_H
++#define __UM_MODULE_I386_H
++
++/* UML is simple */
++struct mod_arch_specific
++{
++};
++
++#define Elf_Shdr Elf32_Shdr
++#define Elf_Sym Elf32_Sym
++#define Elf_Ehdr Elf32_Ehdr
++
++#endif
+diff -Naur a/include/asm-um/page.h b/include/asm-um/page.h
+--- a/include/asm-um/page.h	2004-01-08 22:23:04.000000000 -0500
++++ b/include/asm-um/page.h	2004-01-08 22:30:06.000000000 -0500
+@@ -1,10 +1,14 @@
++/* 
++ *  Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
++ * Licensed under the GPL
++ */
++
+ #ifndef __UM_PAGE_H
+ #define __UM_PAGE_H
+ 
+ struct page;
+ 
+ #include "asm/arch/page.h"
+-#include "asm/bug.h"
+ 
+ #undef __pa
+ #undef __va
+@@ -24,25 +28,36 @@
+ 
+ #define __va_space (8*1024*1024)
+ 
+-extern unsigned long region_pa(void *virt);
+-extern void *region_va(unsigned long phys);
+-
+-#define __pa(virt) region_pa((void *) (virt))
+-#define __va(phys) region_va((unsigned long) (phys))
+-
+-extern unsigned long page_to_pfn(struct page *page);
+-extern struct page *pfn_to_page(unsigned long pfn);
++extern unsigned long to_phys(void *virt);
++extern void *to_virt(unsigned long phys);
+ 
+-extern struct page *phys_to_page(unsigned long phys);
++#define __pa(virt) to_phys((void *) virt)
++#define __va(phys) to_virt((unsigned long) phys)
+ 
+-#define virt_to_page(v) (phys_to_page(__pa(v)))
++#define page_to_pfn(page) ((page) - mem_map)
++#define pfn_to_page(pfn) (mem_map + (pfn))
+ 
+-extern struct page *page_mem_map(struct page *page);
++#define phys_to_pfn(p) ((p) >> PAGE_SHIFT)
++#define pfn_to_phys(pfn) ((pfn) << PAGE_SHIFT)
+ 
+-#define pfn_valid(pfn) (page_mem_map(pfn_to_page(pfn)) != NULL)
+-#define virt_addr_valid(v) pfn_valid(__pa(v) >> PAGE_SHIFT)
++#define pfn_valid(pfn) ((pfn) < max_mapnr)
++#define virt_addr_valid(v) pfn_valid(phys_to_pfn(__pa(v)))
+ 
+ extern struct page *arch_validate(struct page *page, int mask, int order);
+ #define HAVE_ARCH_VALIDATE
+ 
++extern void arch_free_page(struct page *page, int order);
++#define HAVE_ARCH_FREE_PAGE
++
+ #endif
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/include/asm-um/pgtable.h b/include/asm-um/pgtable.h
+--- a/include/asm-um/pgtable.h	2004-01-08 22:33:43.000000000 -0500
++++ b/include/asm-um/pgtable.h	2004-01-08 22:36:57.000000000 -0500
+@@ -65,10 +65,10 @@
+  * area for the same reason. ;)
+  */
+ 
+-extern unsigned long high_physmem;
++extern unsigned long end_iomem;
+ 
+ #define VMALLOC_OFFSET	(__va_space)
+-#define VMALLOC_START	(((unsigned long) high_physmem + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
++#define VMALLOC_START	((end_iomem + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
+ 
+ #ifdef CONFIG_HIGHMEM
+ # define VMALLOC_END	(PKMAP_BASE-2*PAGE_SIZE)
+@@ -78,12 +78,13 @@
+ 
+ #define _PAGE_PRESENT	0x001
+ #define _PAGE_NEWPAGE	0x002
+-#define _PAGE_PROTNONE	0x004	/* If not present */
+-#define _PAGE_RW	0x008
+-#define _PAGE_USER	0x010
+-#define _PAGE_ACCESSED	0x020
+-#define _PAGE_DIRTY	0x040
+-#define _PAGE_NEWPROT   0x080
++#define _PAGE_NEWPROT   0x004
++#define _PAGE_FILE	0x008   /* set:pagecache unset:swap */
++#define _PAGE_PROTNONE	0x010	/* If not present */
++#define _PAGE_RW	0x020
++#define _PAGE_USER	0x040
++#define _PAGE_ACCESSED	0x080
++#define _PAGE_DIRTY	0x100
+ 
+ #define REGION_MASK	0xf0000000
+ #define REGION_SHIFT	28
+@@ -143,7 +144,8 @@
+ 
+ #define BAD_PAGETABLE __bad_pagetable()
+ #define BAD_PAGE __bad_page()
+-#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
++
++#define ZERO_PAGE(vaddr) virt_to_page(empty_zero_page)
+ 
+ /* number of bits that fit into a memory pointer */
+ #define BITS_PER_PTR			(8*sizeof(unsigned long))
+@@ -164,9 +166,6 @@
+ 
+ #define pte_clear(xp)	do { pte_val(*(xp)) = _PAGE_NEWPAGE; } while (0)
+ 
+-#define phys_region_index(x) (((x) & REGION_MASK) >> REGION_SHIFT)
+-#define pte_region_index(x) phys_region_index(pte_val(x))
+-
+ #define pmd_none(x)	(!(pmd_val(x) & ~_PAGE_NEWPAGE))
+ #define	pmd_bad(x)	((pmd_val(x) & (~PAGE_MASK & ~_PAGE_USER)) != _KERNPG_TABLE)
+ #define pmd_present(x)	(pmd_val(x) & _PAGE_PRESENT)
+@@ -188,19 +187,25 @@
+ 
+ #define pages_to_mb(x) ((x) >> (20-PAGE_SHIFT))
+ 
+-extern struct page *pte_mem_map(pte_t pte);
+-extern struct page *phys_mem_map(unsigned long phys);
+-extern unsigned long phys_to_pfn(unsigned long p);
+-extern unsigned long pfn_to_phys(unsigned long pfn);
+-
+-#define pte_page(x) pfn_to_page(pte_pfn(x))
+-#define pte_address(x) (__va(pte_val(x) & PAGE_MASK))
+-#define mk_phys(a, r) ((a) + (r << REGION_SHIFT))
+-#define phys_addr(p) ((p) & ~REGION_MASK)
+-#define phys_page(p) (phys_mem_map(p) + ((phys_addr(p)) >> PAGE_SHIFT))
++#define pte_page(pte) phys_to_page(pte_val(pte))
++#define pmd_page(pmd) phys_to_page(pmd_val(pmd) & PAGE_MASK)
++
+ #define pte_pfn(x) phys_to_pfn(pte_val(x))
+ #define pfn_pte(pfn, prot) __pte(pfn_to_phys(pfn) | pgprot_val(prot))
+-#define pfn_pmd(pfn, prot) __pmd(pfn_to_phys(pfn) | pgprot_val(prot))
++
++extern struct page *phys_to_page(const unsigned long phys);
++extern struct page *__virt_to_page(const unsigned long virt);
++#define virt_to_page(addr) __virt_to_page((const unsigned long) addr)
++  
++/*
++ * Bits 0 through 3 are taken
++ */
++#define PTE_FILE_MAX_BITS	28
++
++#define pte_to_pgoff(pte) ((pte).pte_low >> 4)
++
++#define pgoff_to_pte(off) \
++	((pte_t) { ((off) << 4) + _PAGE_FILE })
+ 
+ static inline pte_t pte_mknewprot(pte_t pte)
+ {
+@@ -235,6 +240,12 @@
+  * The following only work if pte_present() is true.
+  * Undefined behaviour if not..
+  */
++static inline int pte_user(pte_t pte)
++{ 
++	return((pte_val(pte) & _PAGE_USER) && 
++	       !(pte_val(pte) & _PAGE_PROTNONE));
++}
++
+ static inline int pte_read(pte_t pte)
+ { 
+ 	return((pte_val(pte) & _PAGE_USER) && 
+@@ -252,6 +263,14 @@
+ 	       !(pte_val(pte) & _PAGE_PROTNONE));
+ }
+ 
++/*
++ * The following only works if pte_present() is not true.
++ */
++static inline int pte_file(pte_t pte)
++{ 
++	return (pte).pte_low & _PAGE_FILE; 
++}
++
+ static inline int pte_dirty(pte_t pte)	{ return pte_val(pte) & _PAGE_DIRTY; }
+ static inline int pte_young(pte_t pte)	{ return pte_val(pte) & _PAGE_ACCESSED; }
+ static inline int pte_newpage(pte_t pte) { return pte_val(pte) & _PAGE_NEWPAGE; }
+@@ -334,14 +353,7 @@
+  * and a page entry and page directory to the page they refer to.
+  */
+ 
+-#define mk_pte(page, pgprot) \
+-({					\
+-	pte_t __pte;                    \
+-                                        \
+-	pte_val(__pte) = page_to_phys(page) + pgprot_val(pgprot);\
+-	if(pte_present(__pte)) pte_mknewprot(pte_mknewpage(__pte)); \
+-	__pte;                          \
+-})
++extern pte_t mk_pte(struct page *page, pgprot_t pgprot);
+ 
+ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
+ {
+@@ -351,17 +363,27 @@
+ }
+ 
+ #define pmd_page_kernel(pmd) ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
+-#define pmd_page(pmd) (phys_mem_map(pmd_val(pmd) & PAGE_MASK) + \
+-		       ((phys_addr(pmd_val(pmd)) >> PAGE_SHIFT)))
+ 
+-/* to find an entry in a page-table-directory. */
++/*
++ * the pgd page can be thought of an array like this: pgd_t[PTRS_PER_PGD]
++ *
++ * this macro returns the index of the entry in the pgd page which would
++ * control the given virtual address
++ */
+ #define pgd_index(address) ((address >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))
+ 
+-/* to find an entry in a page-table-directory */
++/*
++ * pgd_offset() returns a (pgd_t *)
++ * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
++ */
+ #define pgd_offset(mm, address) \
+ ((mm)->pgd + ((address) >> PGDIR_SHIFT))
+ 
+-/* to find an entry in a kernel page-table-directory */
++
++/*
++ * a shortcut which implies the use of the kernel's pgd, instead
++ * of a process's
++ */
+ #define pgd_offset_k(address) pgd_offset(&init_mm, address)
+ 
+ #define pmd_index(address) \
+@@ -373,7 +395,12 @@
+ 	return (pmd_t *) dir;
+ }
+ 
+-/* Find an entry in the third-level page table.. */ 
++/*
++ * the pte page can be thought of an array like this: pte_t[PTRS_PER_PTE]
++ *
++ * this macro returns the index of the entry in the pte page which would
++ * control the given virtual address
++ */
+ #define pte_index(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
+ #define pte_offset_kernel(dir, address) \
+ 	((pte_t *) pmd_page_kernel(*(dir)) +  pte_index(address))
+@@ -399,11 +426,11 @@
+ #define update_mmu_cache(vma,address,pte) do ; while (0)
+ 
+ /* Encode and de-code a swap entry */
+-#define __swp_type(x)			(((x).val >> 3) & 0x7f)
+-#define __swp_offset(x)			((x).val >> 10)
++#define __swp_type(x)			(((x).val >> 4) & 0x3f)
++#define __swp_offset(x)			((x).val >> 11)
+ 
+ #define __swp_entry(type, offset) \
+-	((swp_entry_t) { ((type) << 3) | ((offset) << 10) })
++	((swp_entry_t) { ((type) << 4) | ((offset) << 11) })
+ #define __pte_to_swp_entry(pte) \
+ 	((swp_entry_t) { pte_val(pte_mkuptodate(pte)) })
+ #define __swp_entry_to_pte(x)		((pte_t) { (x).val })
+diff -Naur a/include/asm-um/processor-generic.h b/include/asm-um/processor-generic.h
+--- a/include/asm-um/processor-generic.h	2004-01-08 22:15:51.000000000 -0500
++++ b/include/asm-um/processor-generic.h	2004-01-08 22:21:26.000000000 -0500
+@@ -11,9 +11,7 @@
+ struct task_struct;
+ 
+ #include "linux/config.h"
+-#include "linux/signal.h"
+ #include "asm/ptrace.h"
+-#include "asm/siginfo.h"
+ #include "choose-mode.h"
+ 
+ struct mm_struct;
+@@ -22,23 +20,6 @@
+ 
+ #define cpu_relax()	do ; while (0)
+ 
+-#ifdef CONFIG_MODE_TT
+-struct proc_tt_mode {
+-	int extern_pid;
+-	int tracing;
+-	int switch_pipe[2];
+-	int singlestep_syscall;
+-	int vm_seq;
+-};
+-#endif
+-
+-#ifdef CONFIG_MODE_SKAS
+-struct proc_skas_mode {
+-	void *switch_buf;
+-	void *fork_buf;
+-};
+-#endif
+-
+ struct thread_struct {
+ 	int forking;
+ 	unsigned long kernel_stack;
+@@ -46,6 +27,7 @@
+ 	struct pt_regs regs;
+ 	unsigned long cr2;
+ 	int err;
++	unsigned long trap_no;
+ 	void *fault_addr;
+ 	void *fault_catcher;
+ 	struct task_struct *prev_sched;
+@@ -54,10 +36,20 @@
+ 	struct arch_thread arch;
+ 	union {
+ #ifdef CONFIG_MODE_TT
+-		struct proc_tt_mode tt;
++		struct {
++			int extern_pid;
++			int tracing;
++			int switch_pipe[2];
++			int singlestep_syscall;
++			int vm_seq;
++		} tt;
+ #endif
+ #ifdef CONFIG_MODE_SKAS
+-		struct proc_skas_mode skas;
++		struct {
++			void *switch_buf;
++			void *fork_buf;
++			int mm_count;
++		} skas;
+ #endif
+ 	} mode;
+ 	struct {
+@@ -101,14 +93,19 @@
+ } mm_segment_t;
+ 
+ extern struct task_struct *alloc_task_struct(void);
+-extern void free_task_struct(struct task_struct *task);
+ 
+ extern void release_thread(struct task_struct *);
+ extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
+ extern void dump_thread(struct pt_regs *regs, struct user *u);
++extern void prepare_to_copy(struct task_struct *tsk);
+ 
+ extern unsigned long thread_saved_pc(struct task_struct *t);
+ 
++static inline void mm_copy_segments(struct mm_struct *from_mm, 
++				    struct mm_struct *new_mm)
++{
++}
++
+ #define init_stack	(init_thread_union.stack)
+ 
+ /*
+diff -Naur a/include/asm-um/processor-i386.h b/include/asm-um/processor-i386.h
+--- a/include/asm-um/processor-i386.h	2004-01-08 22:13:50.000000000 -0500
++++ b/include/asm-um/processor-i386.h	2004-01-08 22:18:50.000000000 -0500
+@@ -6,8 +6,8 @@
+ #ifndef __UM_PROCESSOR_I386_H
+ #define __UM_PROCESSOR_I386_H
+ 
+-extern int cpu_has_xmm;
+-extern int cpu_has_cmov;
++extern int host_has_xmm;
++extern int host_has_cmov;
+ 
+ struct arch_thread {
+ 	unsigned long debugregs[8];
+diff -Naur a/include/asm-um/sections.h b/include/asm-um/sections.h
+--- a/include/asm-um/sections.h	1969-12-31 19:00:00.000000000 -0500
++++ b/include/asm-um/sections.h	2004-01-08 22:32:18.000000000 -0500
+@@ -0,0 +1,7 @@
++#ifndef _UM_SECTIONS_H
++#define _UM_SECTIONS_H
++
++/* nothing to see, move along */
++#include <asm-generic/sections.h>
++
++#endif
+diff -Naur a/include/asm-um/smp.h b/include/asm-um/smp.h
+--- a/include/asm-um/smp.h	2004-01-08 22:13:34.000000000 -0500
++++ b/include/asm-um/smp.h	2004-01-08 22:17:25.000000000 -0500
+@@ -10,7 +10,7 @@
+ 
+ extern cpumask_t cpu_online_map;
+ 
+-#define smp_processor_id() (current->thread_info->cpu)
++#define smp_processor_id() (current_thread->cpu)
+ #define cpu_logical_map(n) (n)
+ #define cpu_number_map(n) (n)
+ #define PROC_CHANGE_PENALTY	15 /* Pick a number, any number */
+diff -Naur a/include/asm-um/spinlock.h b/include/asm-um/spinlock.h
+--- a/include/asm-um/spinlock.h	2004-01-08 22:29:58.000000000 -0500
++++ b/include/asm-um/spinlock.h	1969-12-31 19:00:00.000000000 -0500
+@@ -1,10 +0,0 @@
+-#ifndef __UM_SPINLOCK_H
+-#define __UM_SPINLOCK_H
+-
+-#include "linux/config.h"
+-
+-#ifdef CONFIG_SMP
+-#include "asm/arch/spinlock.h"
+-#endif
+-
+-#endif
+diff -Naur a/include/asm-um/system-generic.h b/include/asm-um/system-generic.h
+--- a/include/asm-um/system-generic.h	2004-01-08 22:32:37.000000000 -0500
++++ b/include/asm-um/system-generic.h	2004-01-08 22:36:38.000000000 -0500
+@@ -23,8 +23,10 @@
+ extern void block_signals(void);
+ extern void unblock_signals(void);
+ 
+-#define local_save_flags(flags) do { (flags) = get_signals(); } while(0)
+-#define local_irq_restore(flags) do { set_signals(flags); } while(0)
++#define local_save_flags(flags) do { typecheck(unsigned long, flags); \
++				     (flags) = get_signals(); } while(0)
++#define local_irq_restore(flags) do { typecheck(unsigned long, flags); \
++				      set_signals(flags); } while(0)
+ 
+ #define local_irq_save(flags) do { local_save_flags(flags); \
+                                    local_irq_disable(); } while(0)
+@@ -39,4 +41,7 @@
+         (flags == 0);                   \
+ })
+ 
++extern void *_switch_to(void *prev, void *next, void *last);
++#define switch_to(prev, next, last) prev = _switch_to(prev, next, last)
++
+ #endif
+diff -Naur a/include/asm-um/thread_info.h b/include/asm-um/thread_info.h
+--- a/include/asm-um/thread_info.h	2004-01-08 22:18:02.000000000 -0500
++++ b/include/asm-um/thread_info.h	2004-01-08 22:24:10.000000000 -0500
+@@ -9,6 +9,7 @@
+ #ifndef __ASSEMBLY__
+ 
+ #include <asm/processor.h>
++#include <asm/types.h>
+ 
+ struct thread_info {
+ 	struct task_struct	*task;		/* main task structure */
+@@ -43,15 +44,18 @@
+ static inline struct thread_info *current_thread_info(void)
+ {
+ 	struct thread_info *ti;
+-	__asm__("andl %%esp,%0; ":"=r" (ti) : "0" (~16383UL));
++	unsigned long mask = PAGE_SIZE * 
++		(1 << CONFIG_KERNEL_STACK_ORDER) - 1;
++	__asm__("andl %%esp,%0; ":"=r" (ti) : "0" (~mask));
+ 	return ti;
+ }
+ 
+ /* thread information allocation */
+-#define THREAD_SIZE (4*PAGE_SIZE)
+-#define alloc_thread_info(tsk) ((struct thread_info *) \
+-	__get_free_pages(GFP_KERNEL,2))
+-#define free_thread_info(ti) free_pages((unsigned long) (ti), 2)
++#define THREAD_SIZE ((1 << CONFIG_KERNEL_STACK_ORDER) * PAGE_SIZE)
++#define alloc_thread_info(tsk) \
++	((struct thread_info *) kmalloc(THREAD_SIZE, GFP_KERNEL))
++#define free_thread_info(ti) kfree(ti)
++	
+ #define get_thread_info(ti) get_task_struct((ti)->task)
+ #define put_thread_info(ti) put_task_struct((ti)->task)
+ 
+@@ -65,11 +69,13 @@
+ #define TIF_POLLING_NRFLAG      3       /* true if poll_idle() is polling 
+ 					 * TIF_NEED_RESCHED 
+ 					 */
++#define TIF_RESTART_BLOCK 	4
+ 
+ #define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)
+ #define _TIF_SIGPENDING		(1 << TIF_SIGPENDING)
+ #define _TIF_NEED_RESCHED	(1 << TIF_NEED_RESCHED)
+ #define _TIF_POLLING_NRFLAG     (1 << TIF_POLLING_NRFLAG)
++#define _TIF_RESTART_BLOCK	(1 << TIF_RESTART_BLOCK)
+ 
+ #endif
+ 
+diff -Naur a/include/asm-um/timex.h b/include/asm-um/timex.h
+--- a/include/asm-um/timex.h	2004-01-08 22:24:16.000000000 -0500
++++ b/include/asm-um/timex.h	2004-01-08 22:31:33.000000000 -0500
+@@ -1,8 +1,6 @@
+ #ifndef __UM_TIMEX_H
+ #define __UM_TIMEX_H
+ 
+-#include "linux/time.h"
+-
+ typedef unsigned long cycles_t;
+ 
+ #define cacheflush_time (0)
+diff -Naur a/include/asm-um/uaccess.h b/include/asm-um/uaccess.h
+--- a/include/asm-um/uaccess.h	2004-01-08 22:25:21.000000000 -0500
++++ b/include/asm-um/uaccess.h	2004-01-08 22:32:41.000000000 -0500
+@@ -6,6 +6,8 @@
+ #ifndef __UM_UACCESS_H
+ #define __UM_UACCESS_H
+ 
++#include "linux/sched.h"
++
+ #define VERIFY_READ 0
+ #define VERIFY_WRITE 1
+ 
+diff -Naur a/include/asm-um/unistd.h b/include/asm-um/unistd.h
+--- a/include/asm-um/unistd.h	2004-01-08 22:28:40.000000000 -0500
++++ b/include/asm-um/unistd.h	2004-01-08 22:34:56.000000000 -0500
+@@ -33,7 +33,10 @@
+ 	set_fs(KERNEL_DS);			\
+ 	ret = sys(args);			\
+ 	set_fs(fs);				\
+-	return ret;
++	if (ret >= 0)				\
++		return ret;			\
++	errno = -(long)ret;			\
++	return -1;
+ 
+ static inline long open(const char *pathname, int flags, int mode) 
+ {
+diff -Naur a/include/linux/gfp.h b/include/linux/gfp.h
+--- a/include/linux/gfp.h	2004-01-08 22:16:45.000000000 -0500
++++ b/include/linux/gfp.h	2004-01-08 22:22:50.000000000 -0500
+@@ -63,6 +63,11 @@
+  * For the normal case of non-DISCONTIGMEM systems the NODE_DATA() gets
+  * optimized to &contig_page_data at compile-time.
+  */
++
++#ifndef HAVE_ARCH_FREE_PAGE
++static inline void arch_free_page(struct page *page, int order) { }
++#endif
++
+ extern struct page * FASTCALL(__alloc_pages(unsigned int, unsigned int, struct zonelist *));
+ static inline struct page * alloc_pages_node(int nid, unsigned int gfp_mask, unsigned int order)
+ {
+diff -Naur a/include/linux/ghash.h b/include/linux/ghash.h
+--- a/include/linux/ghash.h	1969-12-31 19:00:00.000000000 -0500
++++ b/include/linux/ghash.h	2004-01-08 22:22:33.000000000 -0500
+@@ -0,0 +1,236 @@
++/*
++ * include/linux/ghash.h -- generic hashing with fuzzy retrieval
++ *
++ * (C) 1997 Thomas Schoebel-Theuer
++ *
++ * The algorithms implemented here seem to be a completely new invention,
++ * and I'll publish the fundamentals in a paper.
++ */
++
++#ifndef _GHASH_H
++#define _GHASH_H
++/* HASHSIZE _must_ be a power of two!!! */
++
++
++#define DEF_HASH_FUZZY_STRUCTS(NAME,HASHSIZE,TYPE) \
++\
++struct NAME##_table {\
++	TYPE * hashtable[HASHSIZE];\
++	TYPE * sorted_list;\
++	int nr_entries;\
++};\
++\
++struct NAME##_ptrs {\
++	TYPE * next_hash;\
++	TYPE * prev_hash;\
++	TYPE * next_sorted;\
++	TYPE * prev_sorted;\
++};
++
++#define DEF_HASH_FUZZY(LINKAGE,NAME,HASHSIZE,TYPE,PTRS,KEYTYPE,KEY,KEYCMP,KEYEQ,HASHFN)\
++\
++LINKAGE void insert_##NAME##_hash(struct NAME##_table * tbl, TYPE * elem)\
++{\
++	int ix = HASHFN(elem->KEY);\
++	TYPE ** base = &tbl->hashtable[ix];\
++	TYPE * ptr = *base;\
++	TYPE * prev = NULL;\
++\
++	tbl->nr_entries++;\
++	while(ptr && KEYCMP(ptr->KEY, elem->KEY)) {\
++		base = &ptr->PTRS.next_hash;\
++		prev = ptr;\
++		ptr = *base;\
++	}\
++	elem->PTRS.next_hash = ptr;\
++	elem->PTRS.prev_hash = prev;\
++	if(ptr) {\
++		ptr->PTRS.prev_hash = elem;\
++	}\
++	*base = elem;\
++\
++	ptr = prev;\
++	if(!ptr) {\
++		ptr = tbl->sorted_list;\
++		prev = NULL;\
++	} else {\
++		prev = ptr->PTRS.prev_sorted;\
++	}\
++	while(ptr) {\
++		TYPE * next = ptr->PTRS.next_hash;\
++		if(next && KEYCMP(next->KEY, elem->KEY)) {\
++			prev = ptr;\
++			ptr = next;\
++		} else if(KEYCMP(ptr->KEY, elem->KEY)) {\
++			prev = ptr;\
++			ptr = ptr->PTRS.next_sorted;\
++		} else\
++			break;\
++	}\
++	elem->PTRS.next_sorted = ptr;\
++	elem->PTRS.prev_sorted = prev;\
++	if(ptr) {\
++		ptr->PTRS.prev_sorted = elem;\
++	}\
++	if(prev) {\
++		prev->PTRS.next_sorted = elem;\
++	} else {\
++		tbl->sorted_list = elem;\
++	}\
++}\
++\
++LINKAGE void remove_##NAME##_hash(struct NAME##_table * tbl, TYPE * elem)\
++{\
++	TYPE * next = elem->PTRS.next_hash;\
++	TYPE * prev = elem->PTRS.prev_hash;\
++\
++	tbl->nr_entries--;\
++	if(next)\
++		next->PTRS.prev_hash = prev;\
++	if(prev)\
++		prev->PTRS.next_hash = next;\
++	else {\
++		int ix = HASHFN(elem->KEY);\
++		tbl->hashtable[ix] = next;\
++	}\
++\
++	next = elem->PTRS.next_sorted;\
++	prev = elem->PTRS.prev_sorted;\
++	if(next)\
++		next->PTRS.prev_sorted = prev;\
++	if(prev)\
++		prev->PTRS.next_sorted = next;\
++	else\
++		tbl->sorted_list = next;\
++}\
++\
++LINKAGE TYPE * find_##NAME##_hash(struct NAME##_table * tbl, KEYTYPE pos)\
++{\
++	int ix = hashfn(pos);\
++	TYPE * ptr = tbl->hashtable[ix];\
++	while(ptr && KEYCMP(ptr->KEY, pos))\
++		ptr = ptr->PTRS.next_hash;\
++	if(ptr && !KEYEQ(ptr->KEY, pos))\
++		ptr = NULL;\
++	return ptr;\
++}\
++\
++LINKAGE TYPE * find_##NAME##_hash_fuzzy(struct NAME##_table * tbl, KEYTYPE pos)\
++{\
++	int ix;\
++	int offset;\
++	TYPE * ptr;\
++	TYPE * next;\
++\
++	ptr = tbl->sorted_list;\
++	if(!ptr || KEYCMP(pos, ptr->KEY))\
++		return NULL;\
++	ix = HASHFN(pos);\
++	offset = HASHSIZE;\
++	do {\
++		offset >>= 1;\
++		next = tbl->hashtable[(ix+offset) & ((HASHSIZE)-1)];\
++		if(next && (KEYCMP(next->KEY, pos) || KEYEQ(next->KEY, pos))\
++		   && KEYCMP(ptr->KEY, next->KEY))\
++			ptr = next;\
++	} while(offset);\
++\
++	for(;;) {\
++		next = ptr->PTRS.next_hash;\
++		if(next) {\
++			if(KEYCMP(next->KEY, pos)) {\
++				ptr = next;\
++				continue;\
++			}\
++		}\
++		next = ptr->PTRS.next_sorted;\
++		if(next && KEYCMP(next->KEY, pos)) {\
++			ptr = next;\
++			continue;\
++		}\
++		return ptr;\
++	}\
++	return NULL;\
++}
++
++/* LINKAGE - empty or "static", depending on whether you want the definitions to
++ *	be public or not
++ * NAME - a string to stick in names to make this hash table type distinct from
++ * 	any others
++ * HASHSIZE - number of buckets
++ * TYPE - type of data contained in the buckets - must be a structure, one 
++ * 	field is of type NAME_ptrs, another is the hash key
++ * PTRS - TYPE must contain a field of type NAME_ptrs, PTRS is the name of that
++ * 	field
++ * KEYTYPE - type of the key field within TYPE
++ * KEY - name of the key field within TYPE
++ * KEYCMP - pointer to function that compares KEYTYPEs to each other - the
++ * 	prototype is int KEYCMP(KEYTYPE, KEYTYPE), it returns zero for equal, 
++ * 	non-zero for not equal
++ * HASHFN - the hash function - the prototype is int HASHFN(KEYTYPE),
++ * 	it returns a number in the range 0 ... HASHSIZE - 1
++ * Call DEF_HASH_STRUCTS, define your hash table as a NAME_table, then call
++ * DEF_HASH.
++ */
++
++#define DEF_HASH_STRUCTS(NAME,HASHSIZE,TYPE) \
++\
++struct NAME##_table {\
++	TYPE * hashtable[HASHSIZE];\
++	int nr_entries;\
++};\
++\
++struct NAME##_ptrs {\
++	TYPE * next_hash;\
++	TYPE * prev_hash;\
++};
++
++#define DEF_HASH(LINKAGE,NAME,TYPE,PTRS,KEYTYPE,KEY,KEYCMP,HASHFN)\
++\
++LINKAGE void insert_##NAME##_hash(struct NAME##_table * tbl, TYPE * elem)\
++{\
++	int ix = HASHFN(elem->KEY);\
++	TYPE ** base = &tbl->hashtable[ix];\
++	TYPE * ptr = *base;\
++	TYPE * prev = NULL;\
++\
++	tbl->nr_entries++;\
++	while(ptr && KEYCMP(ptr->KEY, elem->KEY)) {\
++		base = &ptr->PTRS.next_hash;\
++		prev = ptr;\
++		ptr = *base;\
++	}\
++	elem->PTRS.next_hash = ptr;\
++	elem->PTRS.prev_hash = prev;\
++	if(ptr) {\
++		ptr->PTRS.prev_hash = elem;\
++	}\
++	*base = elem;\
++}\
++\
++LINKAGE void remove_##NAME##_hash(struct NAME##_table * tbl, TYPE * elem)\
++{\
++	TYPE * next = elem->PTRS.next_hash;\
++	TYPE * prev = elem->PTRS.prev_hash;\
++\
++	tbl->nr_entries--;\
++	if(next)\
++		next->PTRS.prev_hash = prev;\
++	if(prev)\
++		prev->PTRS.next_hash = next;\
++	else {\
++		int ix = HASHFN(elem->KEY);\
++		tbl->hashtable[ix] = next;\
++	}\
++}\
++\
++LINKAGE TYPE * find_##NAME##_hash(struct NAME##_table * tbl, KEYTYPE pos)\
++{\
++	int ix = HASHFN(pos);\
++	TYPE * ptr = tbl->hashtable[ix];\
++	while(ptr && KEYCMP(ptr->KEY, pos))\
++		ptr = ptr->PTRS.next_hash;\
++	return ptr;\
++}
++
++#endif
+diff -Naur a/include/linux/mm.h b/include/linux/mm.h
+--- a/include/linux/mm.h	2004-01-08 22:13:47.000000000 -0500
++++ b/include/linux/mm.h	2004-01-08 22:18:35.000000000 -0500
+@@ -487,6 +487,9 @@
+ 	return __set_page_dirty_buffers(page);
+ }
+ 
++extern long do_mprotect(struct mm_struct *mm, unsigned long start, 
++			size_t len, unsigned long prot);
++
+ /*
+  * On a two-level page table, this ends up being trivial. Thus the
+  * inlining and the symmetry break with pte_alloc_map() that does all
+@@ -517,9 +520,10 @@
+ 
+ extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
+ 
+-extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+-	unsigned long len, unsigned long prot,
+-	unsigned long flag, unsigned long pgoff);
++extern unsigned long do_mmap_pgoff(struct mm_struct *mm, struct file *file, 
++				   unsigned long addr, unsigned long len,
++				   unsigned long prot, unsigned long flag,
++				   unsigned long pgoff);
+ 
+ static inline unsigned long do_mmap(struct file *file, unsigned long addr,
+ 	unsigned long len, unsigned long prot,
+@@ -529,7 +533,8 @@
+ 	if ((offset + PAGE_ALIGN(len)) < offset)
+ 		goto out;
+ 	if (!(offset & ~PAGE_MASK))
+-		ret = do_mmap_pgoff(file, addr, len, prot, flag, offset >> PAGE_SHIFT);
++		ret = do_mmap_pgoff(current->mm, file, addr, len, prot, flag, 
++				    offset >> PAGE_SHIFT);
+ out:
+ 	return ret;
+ }
+diff -Naur a/include/linux/proc_mm.h b/include/linux/proc_mm.h
+--- a/include/linux/proc_mm.h	1969-12-31 19:00:00.000000000 -0500
++++ b/include/linux/proc_mm.h	2004-01-08 22:16:52.000000000 -0500
+@@ -0,0 +1,48 @@
++/* 
++ * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
++ * Licensed under the GPL
++ */
++
++#ifndef __PROC_MM_H
++#define __PROC_MM_H
++
++#include "linux/sched.h"
++
++#define MM_MMAP 54
++#define MM_MUNMAP 55
++#define MM_MPROTECT 56
++#define MM_COPY_SEGMENTS 57
++
++struct mm_mmap {
++	unsigned long addr;
++	unsigned long len;
++	unsigned long prot;
++	unsigned long flags;
++	unsigned long fd;
++	unsigned long offset;
++};
++
++struct mm_munmap {
++	unsigned long addr;
++	unsigned long len;	
++};
++
++struct mm_mprotect {
++	unsigned long addr;
++	unsigned long len;
++        unsigned int prot;
++};
++
++struct proc_mm_op {
++	int op;
++	union {
++		struct mm_mmap mmap;
++		struct mm_munmap munmap;
++	        struct mm_mprotect mprotect;
++		int copy_segments;
++	} u;
++};
++
++extern struct mm_struct *proc_mm_get_mm(int fd);
++
++#endif
+diff -Naur a/mm/Makefile b/mm/Makefile
+--- a/mm/Makefile	2004-01-08 22:24:14.000000000 -0500
++++ b/mm/Makefile	2004-01-08 22:31:33.000000000 -0500
+@@ -12,3 +12,5 @@
+ 			   slab.o swap.o truncate.o vmscan.o $(mmu-y)
+ 
+ obj-$(CONFIG_SWAP)	+= page_io.o swap_state.o swapfile.o
++obj-$(CONFIG_PROC_MM)	+= proc_mm.o
++
+diff -Naur a/mm/memory.c b/mm/memory.c
+--- a/mm/memory.c	2004-01-08 22:20:23.000000000 -0500
++++ b/mm/memory.c	2004-01-08 22:26:51.000000000 -0500
+@@ -44,6 +44,7 @@
+ #include <linux/highmem.h>
+ #include <linux/pagemap.h>
+ #include <linux/rmap-locking.h>
++#include <linux/init.h>
+ #include <linux/module.h>
+ 
+ #include <asm/pgalloc.h>
+@@ -680,6 +681,24 @@
+ }
+ 
+ 
++static struct vm_area_struct fixmap_vma = {
++	/* Catch users - if there are any valid
++	   ones, we can make this be "&init_mm" or
++	   something.  */
++	.vm_mm = NULL,
++	.vm_page_prot = PAGE_READONLY,
++	.vm_flags = VM_READ | VM_EXEC,
++};
++
++static int init_fixmap_vma(void)
++{
++	fixmap_vma.vm_start = FIXADDR_START;
++	fixmap_vma.vm_end = FIXADDR_TOP;
++	return(0);
++}
++
++__initcall(init_fixmap_vma);
++
+ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
+ 		unsigned long start, int len, int write, int force,
+ 		struct page **pages, struct vm_area_struct **vmas)
+@@ -700,19 +719,8 @@
+ 
+ 		vma = find_extend_vma(mm, start);
+ 
+-#ifdef FIXADDR_USER_START
+-		if (!vma &&
+-		    start >= FIXADDR_USER_START && start < FIXADDR_USER_END) {
+-			static struct vm_area_struct fixmap_vma = {
+-				/* Catch users - if there are any valid
+-				   ones, we can make this be "&init_mm" or
+-				   something.  */
+-				.vm_mm = NULL,
+-				.vm_start = FIXADDR_USER_START,
+-				.vm_end = FIXADDR_USER_END,
+-				.vm_page_prot = PAGE_READONLY,
+-				.vm_flags = VM_READ | VM_EXEC,
+-			};
++#ifdef FIXADDR_START
++		if (!vma && start >= FIXADDR_START && start < FIXADDR_TOP) {
+ 			unsigned long pg = start & PAGE_MASK;
+ 			pgd_t *pgd;
+ 			pmd_t *pmd;
+diff -Naur a/mm/mmap.c b/mm/mmap.c
+--- a/mm/mmap.c	2004-01-08 22:24:04.000000000 -0500
++++ b/mm/mmap.c	2004-01-08 22:31:23.000000000 -0500
+@@ -462,11 +462,11 @@
+  * The caller must hold down_write(current->mm->mmap_sem).
+  */
+ 
+-unsigned long do_mmap_pgoff(struct file * file, unsigned long addr,
+-			unsigned long len, unsigned long prot,
+-			unsigned long flags, unsigned long pgoff)
++unsigned long do_mmap_pgoff(struct mm_struct *mm, struct file * file, 
++			    unsigned long addr, unsigned long len,
++			    unsigned long prot, unsigned long flags,
++			    unsigned long pgoff)
+ {
+-	struct mm_struct * mm = current->mm;
+ 	struct vm_area_struct * vma, * prev;
+ 	struct inode *inode;
+ 	unsigned int vm_flags;
+diff -Naur a/mm/mprotect.c b/mm/mprotect.c
+--- a/mm/mprotect.c	2004-01-08 22:19:21.000000000 -0500
++++ b/mm/mprotect.c	2004-01-08 22:25:37.000000000 -0500
+@@ -222,7 +222,8 @@
+ }
+ 
+ asmlinkage long
+-sys_mprotect(unsigned long start, size_t len, unsigned long prot)
++do_mprotect(struct mm_struct *mm, unsigned long start, size_t len, 
++	     unsigned long prot)
+ {
+ 	unsigned long vm_flags, nstart, end, tmp;
+ 	struct vm_area_struct * vma, * next, * prev;
+@@ -245,9 +246,9 @@
+ 
+ 	vm_flags = calc_vm_prot_bits(prot);
+ 
+-	down_write(&current->mm->mmap_sem);
++	down_write(&mm->mmap_sem);
+ 
+-	vma = find_vma_prev(current->mm, start, &prev);
++	vma = find_vma_prev(mm, start, &prev);
+ 	error = -ENOMEM;
+ 	if (!vma)
+ 		goto out;
+@@ -326,6 +327,11 @@
+ 		prev->vm_mm->map_count--;
+ 	}
+ out:
+-	up_write(&current->mm->mmap_sem);
++	up_write(&mm->mmap_sem);
+ 	return error;
+ }
++
++asmlinkage long sys_mprotect(unsigned long start, size_t len, unsigned long prot)
++{
++        return(do_mprotect(current->mm, start, len, prot));
++}
+diff -Naur a/mm/page_alloc.c b/mm/page_alloc.c
+--- a/mm/page_alloc.c	2004-01-08 22:13:53.000000000 -0500
++++ b/mm/page_alloc.c	2004-01-08 22:19:05.000000000 -0500
+@@ -268,6 +268,8 @@
+ {
+ 	LIST_HEAD(list);
+ 
++	arch_free_page(page, order);
++
+ 	mod_page_state(pgfree, 1 << order);
+ 	free_pages_check(__FUNCTION__, page);
+ 	list_add(&page->list, &list);
+diff -Naur a/mm/proc_mm.c b/mm/proc_mm.c
+--- a/mm/proc_mm.c	1969-12-31 19:00:00.000000000 -0500
++++ b/mm/proc_mm.c	2004-01-08 22:26:26.000000000 -0500
+@@ -0,0 +1,174 @@
++/* 
++ * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
++ * Licensed under the GPL
++ */
++
++#include "linux/mm.h"
++#include "linux/init.h"
++#include "linux/proc_fs.h"
++#include "linux/proc_mm.h"
++#include "linux/file.h"
++#include "asm/uaccess.h"
++#include "asm/mmu_context.h"
++
++static struct file_operations proc_mm_fops;
++
++struct mm_struct *proc_mm_get_mm(int fd)
++{
++	struct mm_struct *ret = ERR_PTR(-EBADF);
++	struct file *file;
++
++	file = fget(fd);
++	if (!file)
++		goto out;
++
++	ret = ERR_PTR(-EINVAL);
++	if(file->f_op != &proc_mm_fops)
++		goto out_fput;
++
++	ret = file->private_data;
++ out_fput:
++	fput(file);
++ out:
++	return(ret);
++}
++
++extern long do_mmap2(struct mm_struct *mm, unsigned long addr, 
++		     unsigned long len, unsigned long prot, 
++		     unsigned long flags, unsigned long fd,
++		     unsigned long pgoff);
++
++static ssize_t write_proc_mm(struct file *file, const char *buffer,
++			     size_t count, loff_t *ppos)
++{
++	struct mm_struct *mm = file->private_data;
++	struct proc_mm_op req;
++	int n, ret;
++
++	if(count > sizeof(req))
++		return(-EINVAL);
++
++	n = copy_from_user(&req, buffer, count);
++	if(n != 0)
++		return(-EFAULT);
++
++	ret = count;
++	switch(req.op){
++	case MM_MMAP: {
++		struct mm_mmap *map = &req.u.mmap;
++
++		ret = do_mmap2(mm, map->addr, map->len, map->prot, 
++			       map->flags, map->fd, map->offset >> PAGE_SHIFT);
++		if((ret & ~PAGE_MASK) == 0)
++			ret = count;
++	
++		break;
++	}
++	case MM_MUNMAP: {
++		struct mm_munmap *unmap = &req.u.munmap;
++
++		down_write(&mm->mmap_sem);
++		ret = do_munmap(mm, unmap->addr, unmap->len);
++		up_write(&mm->mmap_sem);
++
++		if(ret == 0)
++			ret = count;
++		break;
++	}
++	case MM_MPROTECT: {
++		struct mm_mprotect *protect = &req.u.mprotect;
++
++		ret = do_mprotect(mm, protect->addr, protect->len, 
++				  protect->prot);
++		if(ret == 0)
++			ret = count;
++		break;
++	}
++
++	case MM_COPY_SEGMENTS: {
++		struct mm_struct *from = proc_mm_get_mm(req.u.copy_segments);
++
++		if(IS_ERR(from)){
++			ret = PTR_ERR(from);
++			break;
++		}
++
++		mm_copy_segments(from, mm);
++		break;
++	}
++	default:
++		ret = -EINVAL;
++		break;
++	}
++
++	return(ret);
++}
++
++static int open_proc_mm(struct inode *inode, struct file *file)
++{
++	struct mm_struct *mm = mm_alloc();
++	int ret;
++
++	ret = -ENOMEM;
++	if(mm == NULL)
++		goto out_mem;
++
++	ret = init_new_context(current, mm);
++	if(ret)
++		goto out_free;
++
++	spin_lock(&mmlist_lock);
++	list_add(&mm->mmlist, &current->mm->mmlist);
++	mmlist_nr++;
++	spin_unlock(&mmlist_lock);
++
++	file->private_data = mm;
++
++	return(0);
++
++ out_free:
++	mmput(mm);
++ out_mem:
++	return(ret);
++}
++
++static int release_proc_mm(struct inode *inode, struct file *file)
++{
++	struct mm_struct *mm = file->private_data;
++
++	mmput(mm);
++	return(0);
++}
++
++static struct file_operations proc_mm_fops = {
++	.open		= open_proc_mm,
++	.release	= release_proc_mm,
++	.write		= write_proc_mm,
++};
++
++static int make_proc_mm(void)
++{
++	struct proc_dir_entry *ent;
++
++	ent = create_proc_entry("mm", 0222, &proc_root);
++	if(ent == NULL){
++		printk("make_proc_mm : Failed to register /proc/mm\n");
++		return(0);
++	}
++	ent->proc_fops = &proc_mm_fops;
++
++	return(0);
++}
++
++__initcall(make_proc_mm);
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
diff --git a/lustre/kernel_patches/patches/uml-patch-2.6.0-test5.patch b/lustre/kernel_patches/patches/uml-patch-2.6.0-test5.patch
new file mode 100644
index 0000000..1c4ec8d
--- /dev/null
+++ b/lustre/kernel_patches/patches/uml-patch-2.6.0-test5.patch
@@ -0,0 +1,9304 @@
+diff -Naur a/arch/um/Kconfig b/arch/um/Kconfig
+--- a/arch/um/Kconfig	Tue Sep  9 16:43:10 2003
++++ b/arch/um/Kconfig	Tue Sep  9 16:48:54 2003
+@@ -61,6 +61,20 @@
+ 
+ config NET
+ 	bool "Networking support"
++	help
++	Unless you really know what you are doing, you should say Y here.
++	The reason is that some programs need kernel networking support even
++	when running on a stand-alone machine that isn't connected to any
++	other computer. If you are upgrading from an older kernel, you
++	should consider updating your networking tools too because changes
++	in the kernel and the tools often go hand in hand. The tools are
++	contained in the package net-tools, the location and version number
++	of which are given in Documentation/Changes.
++
++	For a general introduction to Linux networking, it is highly
++	recommended to read the NET-HOWTO, available from
++	<http://www.tldp.org/docs.html#howto>.
++
+ 
+ source "fs/Kconfig.binfmt"
+ 
+@@ -85,6 +99,19 @@
+         If you'd like to be able to work with files stored on the host, 
+         say Y or M here; otherwise say N.
+ 
++config HPPFS
++	tristate "HoneyPot ProcFS"
++	help
++	hppfs (HoneyPot ProcFS) is a filesystem which allows UML /proc 
++	entries to be overridden, removed, or fabricated from the host.
++	Its purpose is to allow a UML to appear to be a physical machine
++	by removing or changing anything in /proc which gives away the
++	identity of a UML.
++
++	See http://user-mode-linux.sf.net/hppfs.html for more information.
++
++	You only need this if you are setting up a UML honeypot.  Otherwise,
++	it is safe to say 'N' here.
+ 
+ config MCONSOLE
+ 	bool "Management console"
+@@ -105,6 +132,16 @@
+ config MAGIC_SYSRQ
+ 	bool "Magic SysRq key"
+ 	depends on MCONSOLE
++	help
++	If you say Y here, you will have some control over the system even
++	if the system crashes for example during kernel debugging (e.g., you
++	will be able to flush the buffer cache to disk, reboot the system
++	immediately or dump some status information). This is accomplished
++	by pressing various keys while holding SysRq (Alt+PrintScreen). It
++	also works on a serial console (on PC hardware at least), if you
++	send a BREAK and then within 5 seconds a command keypress. The
++	keys are documented in Documentation/sysrq.txt. Don't say Y
++	unless you really know what this hack does.
+ 
+ config HOST_2G_2G
+ 	bool "2G/2G host address space split"
+@@ -159,6 +196,9 @@
+ config HIGHMEM
+ 	bool "Highmem support"
+ 
++config PROC_MM
++	bool "/proc/mm support"
++
+ config KERNEL_STACK_ORDER
+ 	int "Kernel stack size order"
+ 	default 2
+@@ -239,6 +279,10 @@
+ config PT_PROXY
+ 	bool "Enable ptrace proxy"
+ 	depends on XTERM_CHAN && DEBUG_INFO
++	help
++	This option enables a debugging interface which allows gdb to debug
++	the kernel without needing to actually attach to kernel threads.
++	If you want to do kernel debugging, say Y here; otherwise say N.
+ 
+ config GPROF
+ 	bool "Enable gprof support"
+diff -Naur a/arch/um/Kconfig_block b/arch/um/Kconfig_block
+--- a/arch/um/Kconfig_block	Tue Sep  9 16:44:02 2003
++++ b/arch/um/Kconfig_block	Tue Sep  9 16:49:30 2003
+@@ -29,6 +29,20 @@
+         wise choice too.  In all other cases (for example, if you're just
+         playing around with User-Mode Linux) you can choose N.
+ 
++# Turn this back on when the driver actually works
++#
++#config BLK_DEV_COW
++#	tristate "COW block device"
++#	help
++#	This is a layered driver which sits above two other block devices.
++#	One is read-only, and the other is a read-write layer which stores
++#	all changes.  This provides the illusion that the read-only layer
++#	can be mounted read-write and changed.
++
++config BLK_DEV_COW_COMMON
++	bool
++	default BLK_DEV_COW || BLK_DEV_UBD
++
+ config BLK_DEV_LOOP
+ 	tristate "Loopback device support"
+ 
+diff -Naur a/arch/um/Kconfig_net b/arch/um/Kconfig_net
+--- a/arch/um/Kconfig_net	Tue Sep  9 16:43:43 2003
++++ b/arch/um/Kconfig_net	Tue Sep  9 16:49:20 2003
+@@ -1,5 +1,5 @@
+ 
+-menu "Network Devices"
++menu "UML Network Devices"
+ 	depends on NET
+ 
+ # UML virtual driver
+@@ -176,73 +176,5 @@
+ 	
+         Startup example: "eth0=slirp,FE:FD:01:02:03:04,/usr/local/bin/slirp"
+ 
+-
+-# Below are hardware-independent drivers mirrored from
+-# drivers/net/Config.in. It would be nice if Linux
+-# had HW independent drivers separated from the other
+-# but it does not. Until then each non-ISA/PCI arch
+-# needs to provide it's own menu of network drivers
+-config DUMMY
+-	tristate "Dummy net driver support"
+-
+-config BONDING
+-	tristate "Bonding driver support"
+-
+-config EQUALIZER
+-	tristate "EQL (serial line load balancing) support"
+-
+-config TUN
+-	tristate "Universal TUN/TAP device driver support"
+-
+-config ETHERTAP
+-	tristate "Ethertap network tap (OBSOLETE)"
+-	depends on EXPERIMENTAL && NETLINK
+-
+-config PPP
+-	tristate "PPP (point-to-point protocol) support"
+-
+-config PPP_MULTILINK
+-	bool "PPP multilink support (EXPERIMENTAL)"
+-	depends on PPP && EXPERIMENTAL
+-
+-config PPP_FILTER
+-	bool "PPP filtering"
+-	depends on PPP && FILTER
+-
+-config PPP_ASYNC
+-	tristate "PPP support for async serial ports"
+-	depends on PPP
+-
+-config PPP_SYNC_TTY
+-	tristate "PPP support for sync tty ports"
+-	depends on PPP
+-
+-config PPP_DEFLATE
+-	tristate "PPP Deflate compression"
+-	depends on PPP
+-
+-config PPP_BSDCOMP
+-	tristate "PPP BSD-Compress compression"
+-	depends on PPP
+-
+-config PPPOE
+-	tristate "PPP over Ethernet (EXPERIMENTAL)"
+-	depends on PPP && EXPERIMENTAL
+-
+-config SLIP
+-	tristate "SLIP (serial line) support"
+-
+-config SLIP_COMPRESSED
+-	bool "CSLIP compressed headers"
+-	depends on SLIP=y
+-
+-config SLIP_SMART
+-	bool "Keepalive and linefill"
+-	depends on SLIP=y
+-
+-config SLIP_MODE_SLIP6
+-	bool "Six bit SLIP encapsulation"
+-	depends on SLIP=y
+-
+ endmenu
+ 
+diff -Naur a/arch/um/Makefile b/arch/um/Makefile
+--- a/arch/um/Makefile	Tue Sep  9 16:43:50 2003
++++ b/arch/um/Makefile	Tue Sep  9 16:49:24 2003
+@@ -24,15 +24,17 @@
+ # Have to precede the include because the included Makefiles reference them.
+ SYMLINK_HEADERS = include/asm-um/archparam.h include/asm-um/system.h \
+ 	include/asm-um/sigcontext.h include/asm-um/processor.h \
+-	include/asm-um/ptrace.h include/asm-um/arch-signal.h
++	include/asm-um/ptrace.h include/asm-um/arch-signal.h \
++	include/asm-um/module.h
+ 
+ ARCH_SYMLINKS = include/asm-um/arch $(ARCH_DIR)/include/sysdep $(ARCH_DIR)/os \
+ 	$(SYMLINK_HEADERS) $(ARCH_DIR)/include/uml-config.h
+ 
+ GEN_HEADERS += $(ARCH_DIR)/include/task.h $(ARCH_DIR)/include/kern_constants.h
+ 
+-include $(ARCH_DIR)/Makefile-$(SUBARCH)
+-include $(ARCH_DIR)/Makefile-os-$(OS)
++.PHONY: sys_prepare
++sys_prepare:
++	@:
+ 
+ MAKEFILE-$(CONFIG_MODE_TT) += Makefile-tt
+ MAKEFILE-$(CONFIG_MODE_SKAS) += Makefile-skas
+@@ -41,6 +43,9 @@
+   include $(addprefix $(ARCH_DIR)/,$(MAKEFILE-y))
+ endif
+ 
++include $(ARCH_DIR)/Makefile-$(SUBARCH)
++include $(ARCH_DIR)/Makefile-os-$(OS)
++
+ EXTRAVERSION := $(EXTRAVERSION)-1um
+ 
+ ARCH_INCLUDE = -I$(ARCH_DIR)/include
+@@ -52,14 +57,14 @@
+ 
+ CFLAGS += $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \
+ 	-D_LARGEFILE64_SOURCE $(ARCH_INCLUDE) -Derrno=kernel_errno \
+-	$(MODE_INCLUDE)
++	-Dsigprocmask=kernel_sigprocmask $(MODE_INCLUDE)
+ 
+ LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc
+ 
+ SIZE = (($(CONFIG_NEST_LEVEL) + $(CONFIG_KERNEL_HALF_GIGS)) * 0x20000000)
+ 
+ ifeq ($(CONFIG_MODE_SKAS), y)
+-$(SYS_HEADERS) : $(ARCH_DIR)/kernel/skas/include/skas_ptregs.h
++$(SYS_HEADERS) : $(TOPDIR)/$(ARCH_DIR)/include/skas_ptregs.h
+ endif
+ 
+ include/linux/version.h: arch/$(ARCH)/Makefile
+@@ -98,17 +103,17 @@
+ CONFIG_KERNEL_STACK_ORDER ?= 2
+ STACK_SIZE := $(shell echo $$[ 4096 * (1 << $(CONFIG_KERNEL_STACK_ORDER)) ] )
+ 
+-AFLAGS_vmlinux.lds.o = -U$(SUBARCH) \
++AFLAGS_vmlinux.lds.o = $(shell echo -U$(SUBARCH) \
+ 	-DSTART=$$(($(TOP_ADDR) - $(SIZE))) -DELF_ARCH=$(ELF_ARCH) \
+ 	-DELF_FORMAT=\"$(ELF_FORMAT)\" $(CPP_MODE_TT) \
+-	-DKERNEL_STACK_SIZE=$(STACK_SIZE)
++	-DKERNEL_STACK_SIZE=$(STACK_SIZE))
+ 
+-AFLAGS_$(LD_SCRIPT-y:.s=).o = $(AFLAGS_vmlinux.lds.o) -P -C -Uum
++export AFLAGS_$(LD_SCRIPT-y:.s=).o = $(AFLAGS_vmlinux.lds.o) -P -C -Uum
+ 
+ LD_SCRIPT-y := $(ARCH_DIR)/$(LD_SCRIPT-y)
+ 
+-$(LD_SCRIPT-y) : $(LD_SCRIPT-y:.s=.S) scripts FORCE
+-	$(call if_changed_dep,as_s_S)
++#$(LD_SCRIPT-y) : $(LD_SCRIPT-y:.s=.S) scripts FORCE
++#	$(call if_changed_dep,as_s_S)
+ 
+ linux: vmlinux $(LD_SCRIPT-y)
+ 	$(CC) -Wl,-T,$(LD_SCRIPT-y) $(LINK-y) $(LINK_WRAPS) \
+@@ -116,6 +121,7 @@
+ 
+ USER_CFLAGS := $(patsubst -I%,,$(CFLAGS))
+ USER_CFLAGS := $(patsubst -Derrno=kernel_errno,,$(USER_CFLAGS))
++USER_CFLAGS := $(patsubst -Dsigprocmask=kernel_sigprocmask,,$(USER_CFLAGS))
+ USER_CFLAGS := $(patsubst -D__KERNEL__,,$(USER_CFLAGS)) $(ARCH_INCLUDE) \
+ 	$(MODE_INCLUDE)
+ 
+@@ -123,9 +129,10 @@
+ USER_CFLAGS += -D_GNU_SOURCE
+ 
+ CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/uml.lds.s \
+-	$(ARCH_DIR)/dyn_link.ld.s $(GEN_HEADERS)
++	$(ARCH_DIR)/dyn_link.ld.s $(ARCH_DIR)/include/uml-config.h \
++	$(GEN_HEADERS)
+ 
+-$(ARCH_DIR)/main.o: $(ARCH_DIR)/main.c
++$(ARCH_DIR)/main.o: $(ARCH_DIR)/main.c sys_prepare
+ 	$(CC) $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+ 
+ archmrproper:
+@@ -161,19 +168,23 @@
+ $(ARCH_DIR)/os:
+ 	cd $(ARCH_DIR) && ln -sf os-$(OS) os
+ 
+-$(ARCH_DIR)/include/uml-config.h :
++$(ARCH_DIR)/include/uml-config.h : $(TOPDIR)/include/linux/autoconf.h
+ 	sed 's/ CONFIG/ UML_CONFIG/' $(TOPDIR)/include/linux/autoconf.h > $@
+ 
++filechk_$(ARCH_DIR)/include/task.h := $(ARCH_DIR)/util/mk_task
++
+ $(ARCH_DIR)/include/task.h : $(ARCH_DIR)/util/mk_task
+-	$< > $@
++	$(call filechk,$@)
++
++filechk_$(ARCH_DIR)/include/kern_constants.h := $(ARCH_DIR)/util/mk_constants
+ 
+ $(ARCH_DIR)/include/kern_constants.h : $(ARCH_DIR)/util/mk_constants
+-	$< > $@
++	$(call filechk,$@)
+ 
+-$(ARCH_DIR)/util/mk_task : $(ARCH_DIR)/kernel/skas/include/skas_ptregs.h \
+-	$(ARCH_DIR)/util FORCE ;
++$(ARCH_DIR)/util/mk_task $(ARCH_DIR)/util/mk_constants : $(ARCH_DIR)/util \
++	sys_prepare FORCE ;
+ 
+ $(ARCH_DIR)/util: FORCE
+-	@$(call descend,$@,)
++	$(MAKE) -f scripts/Makefile.build obj=$@
+ 
+-export SUBARCH USER_CFLAGS OS
++export SUBARCH USER_CFLAGS OS 
+diff -Naur a/arch/um/Makefile-i386 b/arch/um/Makefile-i386
+--- a/arch/um/Makefile-i386	Tue Sep  9 16:45:38 2003
++++ b/arch/um/Makefile-i386	Tue Sep  9 16:50:11 2003
+@@ -16,22 +16,28 @@
+ 
+ SYS_HEADERS = $(SYS_DIR)/sc.h $(SYS_DIR)/thread.h
+ 
++sys_prepare: $(SYS_DIR)/sc.h
++
+ prepare: $(SYS_HEADERS)
+ 
++filechk_$(SYS_DIR)/sc.h := $(SYS_UTIL_DIR)/mk_sc
++
+ $(SYS_DIR)/sc.h: $(SYS_UTIL_DIR)/mk_sc
+-	$< > $@
++	$(call filechk,$@)
++
++filechk_$(SYS_DIR)/thread.h := $(SYS_UTIL_DIR)/mk_thread 
+ 
+ $(SYS_DIR)/thread.h: $(SYS_UTIL_DIR)/mk_thread 
+-	$< > $@
++	$(call filechk,$@)
+ 
+-$(SYS_UTIL_DIR)/mk_sc: FORCE ; 
+-	@$(call descend,$(SYS_UTIL_DIR),$@)
++$(SYS_UTIL_DIR)/mk_sc: scripts/fixdep include/config/MARKER FORCE ; 
++	+@$(call descend,$(SYS_UTIL_DIR),$@)
+ 
+-$(SYS_UTIL_DIR)/mk_thread: $(ARCH_SYMLINKS) $(GEN_HEADERS) FORCE ; 
+-	@$(call descend,$(SYS_UTIL_DIR),$@)
++$(SYS_UTIL_DIR)/mk_thread: $(ARCH_SYMLINKS) $(GEN_HEADERS) sys_prepare FORCE ; 
++	+@$(call descend,$(SYS_UTIL_DIR),$@)
+ 
+ $(SYS_UTIL_DIR): include/asm FORCE
+-	@$(call descend,$@,)
++	+@$(call descend,$@,)
+ 
+ sysclean :
+ 	rm -f $(SYS_HEADERS)
+diff -Naur a/arch/um/Makefile-skas b/arch/um/Makefile-skas
+--- a/arch/um/Makefile-skas	Tue Sep  9 16:43:05 2003
++++ b/arch/um/Makefile-skas	Tue Sep  9 16:48:52 2003
+@@ -14,7 +14,7 @@
+ LINK_SKAS = -Wl,-rpath,/lib 
+ LD_SCRIPT_SKAS = dyn.lds.s
+ 
+-GEN_HEADERS += $(ARCH_DIR)/kernel/skas/include/skas_ptregs.h
++GEN_HEADERS += $(TOPDIR)/$(ARCH_DIR)/include/skas_ptregs.h
+ 
+-$(ARCH_DIR)/kernel/skas/include/skas_ptregs.h :
+-	$(MAKE) -C $(ARCH_DIR)/kernel/skas include/skas_ptregs.h
++$(TOPDIR)/$(ARCH_DIR)/include/skas_ptregs.h :
++	$(call descend,$(ARCH_DIR)/kernel/skas,$@)
+diff -Naur a/arch/um/config.release b/arch/um/config.release
+--- a/arch/um/config.release	Tue Sep  9 16:46:07 2003
++++ b/arch/um/config.release	Tue Sep  9 16:51:08 2003
+@@ -228,7 +228,6 @@
+ CONFIG_EXT2_FS=y
+ CONFIG_SYSV_FS=m
+ CONFIG_UDF_FS=m
+-# CONFIG_UDF_RW is not set
+ CONFIG_UFS_FS=m
+ # CONFIG_UFS_FS_WRITE is not set
+ 
+diff -Naur a/arch/um/defconfig b/arch/um/defconfig
+--- a/arch/um/defconfig	Tue Sep  9 16:43:55 2003
++++ b/arch/um/defconfig	Tue Sep  9 16:49:28 2003
+@@ -3,29 +3,19 @@
+ #
+ CONFIG_USERMODE=y
+ CONFIG_MMU=y
+-CONFIG_SWAP=y
+ CONFIG_UID16=y
+ CONFIG_RWSEM_GENERIC_SPINLOCK=y
+-CONFIG_CONFIG_LOG_BUF_SHIFT=14
+-
+-#
+-# Code maturity level options
+-#
+-CONFIG_EXPERIMENTAL=y
+ 
+ #
+-# General Setup
++# UML-specific options
+ #
+ CONFIG_MODE_TT=y
+ CONFIG_MODE_SKAS=y
+ CONFIG_NET=y
+-CONFIG_SYSVIPC=y
+-CONFIG_BSD_PROCESS_ACCT=y
+-CONFIG_SYSCTL=y
+-CONFIG_BINFMT_AOUT=y
+ CONFIG_BINFMT_ELF=y
+ CONFIG_BINFMT_MISC=y
+ CONFIG_HOSTFS=y
++CONFIG_HPPFS=y
+ CONFIG_MCONSOLE=y
+ CONFIG_MAGIC_SYSRQ=y
+ # CONFIG_HOST_2G_2G is not set
+@@ -38,10 +28,38 @@
+ CONFIG_KERNEL_STACK_ORDER=2
+ 
+ #
++# Code maturity level options
++#
++CONFIG_EXPERIMENTAL=y
++CONFIG_CLEAN_COMPILE=y
++CONFIG_STANDALONE=y
++CONFIG_BROKEN_ON_SMP=y
++
++#
++# General setup
++#
++CONFIG_SWAP=y
++CONFIG_SYSVIPC=y
++CONFIG_BSD_PROCESS_ACCT=y
++CONFIG_SYSCTL=y
++CONFIG_LOG_BUF_SHIFT=14
++# CONFIG_IKCONFIG is not set
++# CONFIG_EMBEDDED is not set
++CONFIG_KALLSYMS=y
++CONFIG_FUTEX=y
++CONFIG_EPOLL=y
++CONFIG_IOSCHED_NOOP=y
++CONFIG_IOSCHED_AS=y
++CONFIG_IOSCHED_DEADLINE=y
++
++#
+ # Loadable module support
+ #
+-CONFIG_MODULES=y
+-# CONFIG_KMOD is not set
++# CONFIG_MODULES is not set
++
++#
++# Generic Driver Options
++#
+ 
+ #
+ # Character Devices
+@@ -69,6 +87,7 @@
+ #
+ CONFIG_BLK_DEV_UBD=y
+ # CONFIG_BLK_DEV_UBD_SYNC is not set
++CONFIG_BLK_DEV_COW_COMMON=y
+ CONFIG_BLK_DEV_LOOP=y
+ CONFIG_BLK_DEV_NBD=y
+ CONFIG_BLK_DEV_RAM=y
+@@ -78,7 +97,7 @@
+ CONFIG_NETDEVICES=y
+ 
+ #
+-# Network Devices
++# UML Network Devices
+ #
+ CONFIG_UML_NET=y
+ CONFIG_UML_NET_ETHERTAP=y
+@@ -88,22 +107,6 @@
+ CONFIG_UML_NET_MCAST=y
+ # CONFIG_UML_NET_PCAP is not set
+ CONFIG_UML_NET_SLIRP=y
+-CONFIG_DUMMY=y
+-# CONFIG_BONDING is not set
+-# CONFIG_EQUALIZER is not set
+-CONFIG_TUN=y
+-# CONFIG_ETHERTAP is not set
+-CONFIG_PPP=y
+-# CONFIG_PPP_MULTILINK is not set
+-# CONFIG_PPP_ASYNC is not set
+-# CONFIG_PPP_SYNC_TTY is not set
+-# CONFIG_PPP_DEFLATE is not set
+-# CONFIG_PPP_BSDCOMP is not set
+-# CONFIG_PPPOE is not set
+-CONFIG_SLIP=y
+-# CONFIG_SLIP_COMPRESSED is not set
+-# CONFIG_SLIP_SMART is not set
+-# CONFIG_SLIP_MODE_SLIP6 is not set
+ 
+ #
+ # Networking support
+@@ -115,8 +118,6 @@
+ CONFIG_PACKET=y
+ CONFIG_PACKET_MMAP=y
+ # CONFIG_NETLINK_DEV is not set
+-# CONFIG_NETFILTER is not set
+-# CONFIG_FILTER is not set
+ CONFIG_UNIX=y
+ # CONFIG_NET_KEY is not set
+ CONFIG_INET=y
+@@ -130,8 +131,11 @@
+ # CONFIG_SYN_COOKIES is not set
+ # CONFIG_INET_AH is not set
+ # CONFIG_INET_ESP is not set
+-# CONFIG_XFRM_USER is not set
++# CONFIG_INET_IPCOMP is not set
+ # CONFIG_IPV6 is not set
++# CONFIG_DECNET is not set
++# CONFIG_BRIDGE is not set
++# CONFIG_NETFILTER is not set
+ 
+ #
+ # SCTP Configuration (EXPERIMENTAL)
+@@ -141,8 +145,6 @@
+ # CONFIG_ATM is not set
+ # CONFIG_VLAN_8021Q is not set
+ # CONFIG_LLC is not set
+-# CONFIG_DECNET is not set
+-# CONFIG_BRIDGE is not set
+ # CONFIG_X25 is not set
+ # CONFIG_LAPB is not set
+ # CONFIG_NET_DIVERT is not set
+@@ -160,6 +162,10 @@
+ # Network testing
+ #
+ # CONFIG_NET_PKTGEN is not set
++CONFIG_DUMMY=y
++# CONFIG_BONDING is not set
++# CONFIG_EQUALIZER is not set
++CONFIG_TUN=y
+ 
+ #
+ # Ethernet (10 or 100Mbit)
+@@ -171,6 +177,22 @@
+ #
+ 
+ #
++# Ethernet (10000 Mbit)
++#
++CONFIG_PPP=y
++# CONFIG_PPP_MULTILINK is not set
++# CONFIG_PPP_FILTER is not set
++# CONFIG_PPP_ASYNC is not set
++# CONFIG_PPP_SYNC_TTY is not set
++# CONFIG_PPP_DEFLATE is not set
++# CONFIG_PPP_BSDCOMP is not set
++# CONFIG_PPPOE is not set
++CONFIG_SLIP=y
++# CONFIG_SLIP_COMPRESSED is not set
++# CONFIG_SLIP_SMART is not set
++# CONFIG_SLIP_MODE_SLIP6 is not set
++
++#
+ # Wireless LAN (non-hamradio)
+ #
+ # CONFIG_NET_RADIO is not set
+@@ -188,66 +210,82 @@
+ #
+ # File systems
+ #
++CONFIG_EXT2_FS=y
++# CONFIG_EXT2_FS_XATTR is not set
++# CONFIG_EXT3_FS is not set
++# CONFIG_JBD is not set
++CONFIG_REISERFS_FS=y
++# CONFIG_REISERFS_CHECK is not set
++# CONFIG_REISERFS_PROC_INFO is not set
++# CONFIG_JFS_FS is not set
++# CONFIG_XFS_FS is not set
++CONFIG_MINIX_FS=y
++# CONFIG_ROMFS_FS is not set
+ CONFIG_QUOTA=y
+ # CONFIG_QFMT_V1 is not set
+ # CONFIG_QFMT_V2 is not set
+ CONFIG_QUOTACTL=y
+-CONFIG_AUTOFS_FS=m
+-CONFIG_AUTOFS4_FS=m
+-CONFIG_REISERFS_FS=m
+-# CONFIG_REISERFS_CHECK is not set
+-# CONFIG_REISERFS_PROC_INFO is not set
++CONFIG_AUTOFS_FS=y
++CONFIG_AUTOFS4_FS=y
++
++#
++# CD-ROM/DVD Filesystems
++#
++CONFIG_ISO9660_FS=y
++# CONFIG_JOLIET is not set
++# CONFIG_ZISOFS is not set
++# CONFIG_UDF_FS is not set
++
++#
++# DOS/FAT/NT Filesystems
++#
++CONFIG_FAT_FS=y
++CONFIG_MSDOS_FS=y
++CONFIG_VFAT_FS=y
++# CONFIG_NTFS_FS is not set
++
++#
++# Pseudo filesystems
++#
++CONFIG_PROC_FS=y
++CONFIG_DEVFS_FS=y
++CONFIG_DEVFS_MOUNT=y
++# CONFIG_DEVFS_DEBUG is not set
++CONFIG_DEVPTS_FS=y
++# CONFIG_DEVPTS_FS_XATTR is not set
++# CONFIG_TMPFS is not set
++CONFIG_RAMFS=y
++
++#
++# Miscellaneous filesystems
++#
+ # CONFIG_ADFS_FS is not set
+ # CONFIG_AFFS_FS is not set
+ # CONFIG_HFS_FS is not set
+ # CONFIG_BEFS_FS is not set
+ # CONFIG_BFS_FS is not set
+-# CONFIG_EXT3_FS is not set
+-# CONFIG_JBD is not set
+-CONFIG_FAT_FS=m
+-CONFIG_MSDOS_FS=m
+-CONFIG_VFAT_FS=m
+ # CONFIG_EFS_FS is not set
+ CONFIG_JFFS_FS=y
+ CONFIG_JFFS_FS_VERBOSE=0
+-CONFIG_JFFS_PROC_FS=y
+ # CONFIG_JFFS2_FS is not set
+ # CONFIG_CRAMFS is not set
+-# CONFIG_TMPFS is not set
+-CONFIG_RAMFS=y
+-CONFIG_ISO9660_FS=m
+-# CONFIG_JOLIET is not set
+-# CONFIG_ZISOFS is not set
+-# CONFIG_JFS_FS is not set
+-CONFIG_MINIX_FS=m
+ # CONFIG_VXFS_FS is not set
+-# CONFIG_NTFS_FS is not set
+ # CONFIG_HPFS_FS is not set
+-CONFIG_PROC_FS=y
+-CONFIG_DEVFS_FS=y
+-CONFIG_DEVFS_MOUNT=y
+-# CONFIG_DEVFS_DEBUG is not set
+-CONFIG_DEVPTS_FS=y
+ # CONFIG_QNX4FS_FS is not set
+-# CONFIG_ROMFS_FS is not set
+-CONFIG_EXT2_FS=y
+-# CONFIG_EXT2_FS_XATTR is not set
+ # CONFIG_SYSV_FS is not set
+-# CONFIG_UDF_FS is not set
+ # CONFIG_UFS_FS is not set
+-# CONFIG_XFS_FS is not set
+ 
+ #
+ # Network File Systems
+ #
+-# CONFIG_CODA_FS is not set
+-# CONFIG_INTERMEZZO_FS is not set
+ # CONFIG_NFS_FS is not set
+ # CONFIG_NFSD is not set
+ # CONFIG_EXPORTFS is not set
+-# CONFIG_CIFS is not set
+ # CONFIG_SMB_FS is not set
++# CONFIG_CIFS is not set
+ # CONFIG_NCP_FS is not set
++# CONFIG_CODA_FS is not set
++# CONFIG_INTERMEZZO_FS is not set
+ # CONFIG_AFS_FS is not set
+ 
+ #
+@@ -317,28 +355,7 @@
+ #
+ # SCSI support
+ #
+-CONFIG_SCSI=y
+-CONFIG_GENERIC_ISA_DMA=y
+-
+-#
+-# SCSI support type (disk, tape, CD-ROM)
+-#
+-CONFIG_BLK_DEV_SD=y
+-CONFIG_SD_EXTRA_DEVS=40
+-CONFIG_CHR_DEV_ST=y
+-CONFIG_BLK_DEV_SR=y
+-CONFIG_BLK_DEV_SR_VENDOR=y
+-CONFIG_SR_EXTRA_DEVS=2
+-CONFIG_CHR_DEV_SG=y
+-
+-#
+-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+-#
+-CONFIG_SCSI_DEBUG_QUEUES=y
+-CONFIG_SCSI_MULTI_LUN=y
+-CONFIG_SCSI_CONSTANTS=y
+-CONFIG_SCSI_LOGGING=y
+-CONFIG_SCSI_DEBUG=y
++# CONFIG_SCSI is not set
+ 
+ #
+ # Multi-device support (RAID and LVM)
+@@ -360,6 +377,7 @@
+ CONFIG_MTD_BLOCK=y
+ # CONFIG_FTL is not set
+ # CONFIG_NFTL is not set
++# CONFIG_INFTL is not set
+ 
+ #
+ # RAM/ROM/Flash chip drivers
+@@ -374,20 +392,21 @@
+ #
+ # Mapping drivers for chip access
+ #
++# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+ 
+ #
+ # Self-contained MTD device drivers
+ #
+ # CONFIG_MTD_SLRAM is not set
+ # CONFIG_MTD_MTDRAM is not set
+-CONFIG_MTD_BLKMTD=m
++CONFIG_MTD_BLKMTD=y
+ 
+ #
+ # Disk-On-Chip Device Drivers
+ #
+-# CONFIG_MTD_DOC1000 is not set
+ # CONFIG_MTD_DOC2000 is not set
+ # CONFIG_MTD_DOC2001 is not set
++# CONFIG_MTD_DOC2001PLUS is not set
+ 
+ #
+ # NAND Flash Device Drivers
+diff -Naur a/arch/um/drivers/Makefile b/arch/um/drivers/Makefile
+--- a/arch/um/drivers/Makefile	Tue Sep  9 16:43:32 2003
++++ b/arch/um/drivers/Makefile	Tue Sep  9 16:49:19 2003
+@@ -1,5 +1,5 @@
+ # 
+-# Copyright (C) 2000, 2002 Jeff Dike (jdike@karaya.com)
++# Copyright (C) 2000, 2002, 2003 Jeff Dike (jdike@karaya.com)
+ # Licensed under the GPL
+ #
+ 
+@@ -39,6 +39,8 @@
+ obj-$(CONFIG_TTY_CHAN) += tty.o 
+ obj-$(CONFIG_XTERM_CHAN) += xterm.o xterm_kern.o
+ obj-$(CONFIG_UML_WATCHDOG) += harddog.o
++obj-$(CONFIG_BLK_DEV_COW) += cow_kern.o
++obj-$(CONFIG_BLK_DEV_COW_COMMON) += cow_user.o
+ 
+ obj-y += stdio_console.o $(CHAN_OBJS)
+ 
+@@ -46,7 +48,7 @@
+ 
+ USER_OBJS := $(filter %_user.o,$(obj-y) $(obj-m) $(USER_SINGLE_OBJS)) fd.o \
+ 	null.o pty.o tty.o xterm.o
+-USER_OBJS := $(foreach file,$(USER_OBJS),arch/um/drivers/$(file))
++USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
+ 
+ $(USER_OBJS) : %.o: %.c
+ 	$(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
+diff -Naur a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
+--- a/arch/um/drivers/chan_kern.c	Tue Sep  9 16:46:09 2003
++++ b/arch/um/drivers/chan_kern.c	Tue Sep  9 16:51:12 2003
+@@ -8,6 +8,7 @@
+ #include <linux/list.h>
+ #include <linux/slab.h>
+ #include <linux/tty.h>
++#include <linux/string.h>
+ #include <linux/tty_flip.h>
+ #include <asm/irq.h>
+ #include "chan_kern.h"
+diff -Naur a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c
+--- a/arch/um/drivers/chan_user.c	Tue Sep  9 16:41:10 2003
++++ b/arch/um/drivers/chan_user.c	Tue Sep  9 16:47:22 2003
+@@ -188,8 +188,8 @@
+ 	if(!isatty(fd)) return;
+ 
+ 	pid = tcgetpgrp(fd);
+-	if(!CHOOSE_MODE(is_tracer_winch(pid, fd, device_data), 0) && 
+-	   (pid == -1)){
++	if(!CHOOSE_MODE_PROC(is_tracer_winch, is_skas_winch, pid, fd, 
++			     device_data) && (pid == -1)){
+ 		thread = winch_tramp(fd, device_data, &thread_fd);
+ 		if(fd != -1){
+ 			register_winch_irq(thread_fd, fd, thread, device_data);
+diff -Naur a/arch/um/drivers/cow.h b/arch/um/drivers/cow.h
+--- a/arch/um/drivers/cow.h	Wed Dec 31 19:00:00 1969
++++ b/arch/um/drivers/cow.h	Tue Sep  9 16:47:42 2003
+@@ -0,0 +1,40 @@
++#ifndef __COW_H__
++#define __COW_H__
++
++#include <asm/types.h>
++
++#if __BYTE_ORDER == __BIG_ENDIAN
++# define ntohll(x) (x)
++# define htonll(x) (x)
++#elif __BYTE_ORDER == __LITTLE_ENDIAN
++# define ntohll(x)  bswap_64(x)
++# define htonll(x)  bswap_64(x)
++#else
++#error "__BYTE_ORDER not defined"
++#endif
++
++extern int init_cow_file(int fd, char *cow_file, char *backing_file, 
++			 int sectorsize, int *bitmap_offset_out, 
++			 unsigned long *bitmap_len_out, int *data_offset_out);
++
++extern int file_reader(__u64 offset, char *buf, int len, void *arg);
++extern int read_cow_header(int (*reader)(__u64, char *, int, void *), 
++			   void *arg, __u32 *magic_out, 
++			   char **backing_file_out, time_t *mtime_out, 
++			   __u64 *size_out, int *sectorsize_out, 
++			   int *bitmap_offset_out);
++
++extern int write_cow_header(char *cow_file, int fd, char *backing_file, 
++			    int sectorsize, long long *size);
++
++extern void cow_sizes(__u64 size, int sectorsize, int bitmap_offset, 
++		      unsigned long *bitmap_len_out, int *data_offset_out);
++
++#endif
++
++/*
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/arch/um/drivers/cow_kern.c b/arch/um/drivers/cow_kern.c
+--- a/arch/um/drivers/cow_kern.c	Wed Dec 31 19:00:00 1969
++++ b/arch/um/drivers/cow_kern.c	Tue Sep  9 16:51:12 2003
+@@ -0,0 +1,628 @@
++#define COW_MAJOR 60
++#define MAJOR_NR COW_MAJOR
++
++#include <linux/stddef.h>
++#include <linux/kernel.h>
++#include <linux/ctype.h>
++#include <linux/stat.h>
++#include <linux/vmalloc.h>
++#include <linux/blkdev.h>
++#include <linux/blk.h>
++#include <linux/fs.h>
++#include <linux/genhd.h>
++#include <linux/devfs_fs.h>
++#include <asm/uaccess.h>
++#include "2_5compat.h"
++#include "cow.h"
++#include "ubd_user.h"
++
++#define COW_SHIFT 4
++
++struct cow {
++	int count;
++	char *cow_path;
++	dev_t cow_dev;
++	struct block_device *cow_bdev;
++	char *backing_path;
++	dev_t backing_dev;
++	struct block_device *backing_bdev;
++	int sectorsize;
++	unsigned long *bitmap;
++	unsigned long bitmap_len;
++	int bitmap_offset;
++	int data_offset;
++	devfs_handle_t devfs;
++	struct semaphore sem;
++	struct semaphore io_sem;
++	atomic_t working;
++	spinlock_t io_lock;
++	struct buffer_head *bh;
++	struct buffer_head *bhtail;
++	void *end_io;
++};
++
++#define DEFAULT_COW { \
++	.count			= 0, \
++	.cow_path		= NULL, \
++	.cow_dev		= 0, \
++	.backing_path		= NULL, \
++	.backing_dev		= 0, \
++        .bitmap			= NULL, \
++	.bitmap_len		= 0, \
++	.bitmap_offset		= 0, \
++        .data_offset		= 0, \
++	.devfs			= NULL, \
++	.working		= ATOMIC_INIT(0), \
++	.io_lock		= SPIN_LOCK_UNLOCKED, \
++}
++
++#define MAX_DEV (8)
++#define MAX_MINOR (MAX_DEV << COW_SHIFT)
++
++struct cow cow_dev[MAX_DEV] = { [ 0 ... MAX_DEV - 1 ] = DEFAULT_COW };
++
++/* Not modified by this driver */
++static int blk_sizes[MAX_MINOR] = { [ 0 ... MAX_MINOR - 1 ] = BLOCK_SIZE };
++static int hardsect_sizes[MAX_MINOR] = { [ 0 ... MAX_MINOR - 1 ] = 512 };
++
++/* Protected by cow_lock */
++static int sizes[MAX_MINOR] = { [ 0 ... MAX_MINOR - 1 ] = 0 };
++
++static struct hd_struct	cow_part[MAX_MINOR] =
++	{ [ 0 ... MAX_MINOR - 1 ] = { 0, 0, 0 } };
++
++/* Protected by io_request_lock */
++static request_queue_t *cow_queue;
++
++static int cow_open(struct inode *inode, struct file *filp);
++static int cow_release(struct inode * inode, struct file * file);
++static int cow_ioctl(struct inode * inode, struct file * file,
++		     unsigned int cmd, unsigned long arg);
++static int cow_revalidate(kdev_t rdev);
++
++static struct block_device_operations cow_blops = {
++       .open		= cow_open,
++       .release	= cow_release,
++       .ioctl		= cow_ioctl,
++       .revalidate	= cow_revalidate,
++};
++
++/* Initialized in an initcall, and unchanged thereafter */
++devfs_handle_t cow_dir_handle;
++
++#define INIT_GENDISK(maj, name, parts, shift, bsizes, max, blops) \
++{ \
++	.major 		= maj, \
++	.major_name  	= name, \
++	.minor_shift 	= shift, \
++	.max_p  	= 1 << shift, \
++	.part  		= parts, \
++	.sizes  	= bsizes, \
++	.nr_real  	= max, \
++	.real_devices  	= NULL, \
++	.next  		= NULL, \
++	.fops  		= blops, \
++	.de_arr  	= NULL, \
++	.flags  	= 0 \
++}
++
++static spinlock_t cow_lock = SPIN_LOCK_UNLOCKED;
++
++static struct gendisk cow_gendisk = INIT_GENDISK(MAJOR_NR, "cow", cow_part,
++						 COW_SHIFT, sizes, MAX_DEV, 
++						 &cow_blops);
++
++static int cow_add(int n)
++{
++	struct cow *dev = &cow_dev[n];
++	char name[sizeof("nnnnnn\0")];
++	int err = -ENODEV;
++
++	if(dev->cow_path == NULL)
++		goto out;
++
++	sprintf(name, "%d", n);
++	dev->devfs = devfs_register(cow_dir_handle, name, DEVFS_FL_REMOVABLE,
++				    MAJOR_NR, n << COW_SHIFT, S_IFBLK | 
++				    S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
++				    &cow_blops, NULL);
++
++	init_MUTEX_LOCKED(&dev->sem);
++	init_MUTEX(&dev->io_sem);
++
++	return(0);
++
++out:
++	return(err);
++}
++
++/*
++* Add buffer_head to back of pending list
++*/
++static void cow_add_bh(struct cow *cow, struct buffer_head *bh)
++{
++	unsigned long flags;
++
++	spin_lock_irqsave(&cow->io_lock, flags);
++	if(cow->bhtail != NULL){
++		cow->bhtail->b_reqnext = bh;
++		cow->bhtail = bh;
++	}
++	else {
++		cow->bh = bh;
++		cow->bhtail = bh;
++	}
++	spin_unlock_irqrestore(&cow->io_lock, flags);
++}
++
++/*
++* Grab first pending buffer
++*/
++static struct buffer_head *cow_get_bh(struct cow *cow)
++{
++	struct buffer_head *bh;
++
++	spin_lock_irq(&cow->io_lock);
++	bh = cow->bh;
++	if(bh != NULL){
++		if(bh == cow->bhtail)
++			cow->bhtail = NULL;
++		cow->bh = bh->b_reqnext;
++		bh->b_reqnext = NULL;
++	}
++	spin_unlock_irq(&cow->io_lock);
++
++	return(bh);
++}
++
++static void cow_handle_bh(struct cow *cow, struct buffer_head *bh, 
++			  struct buffer_head **cow_bh, int ncow_bh)
++{
++	int i;
++
++	if(ncow_bh > 0)
++		ll_rw_block(WRITE, ncow_bh, cow_bh);
++
++	for(i = 0; i < ncow_bh ; i++){
++		wait_on_buffer(cow_bh[i]);
++		brelse(cow_bh[i]);
++	}
++
++	ll_rw_block(WRITE, 1, &bh);
++	brelse(bh);
++}
++
++static struct buffer_head *cow_new_bh(struct cow *dev, int sector)
++{
++	struct buffer_head *bh;
++
++	sector = (dev->bitmap_offset + sector / 8) / dev->sectorsize;
++	bh = getblk(dev->cow_dev, sector, dev->sectorsize);
++	memcpy(bh->b_data, dev->bitmap + sector / (8 * sizeof(dev->bitmap[0])),
++	       dev->sectorsize);
++	return(bh);
++}
++
++/* Copied from loop.c, needed to avoid deadlocking in make_request. */
++
++static int cow_thread(void *data)
++{
++	struct cow *dev = data;
++	struct buffer_head *bh;
++
++	daemonize();
++	exit_files(current);
++
++	sprintf(current->comm, "cow%d", dev - cow_dev);
++
++	spin_lock_irq(&current->sigmask_lock);
++	sigfillset(&current->blocked);
++	flush_signals(current);
++	spin_unlock_irq(&current->sigmask_lock);
++
++	atomic_inc(&dev->working);
++
++	current->policy = SCHED_OTHER;
++	current->nice = -20;
++
++	current->flags |= PF_NOIO;
++
++	/*
++	 * up sem, we are running
++	 */
++	up(&dev->sem);
++
++	for(;;){
++		int start, len, nbh, i, update_bitmap = 0;
++		struct buffer_head *cow_bh[2];
++
++		down_interruptible(&dev->io_sem);
++		/*
++		 * could be upped because of tear-down, not because of
++		 * pending work
++		 */
++		if(!atomic_read(&dev->working))
++			break;
++
++		bh = cow_get_bh(dev);
++		if(bh == NULL){
++			printk(KERN_ERR "cow: missing bh\n");
++			continue;
++		}
++
++		start = bh->b_blocknr * bh->b_size / dev->sectorsize;
++		len = bh->b_size / dev->sectorsize;
++		for(i = 0; i < len ; i++){
++			if(ubd_test_bit(start +ni, 
++					(unsigned char *) dev->bitmap))
++				continue;
++
++			update_bitmap = 1;
++			ubd_set_bit(start + i, (unsigned char *) dev->bitmap);
++		}
++
++		cow_bh[0] = NULL;
++		cow_bh[1] = NULL;
++		nbh = 0;
++		if(update_bitmap){
++			cow_bh[0] = cow_new_bh(dev, start);
++			nbh++;
++			if(start / dev->sectorsize != 
++			   (start + len) / dev->sectorsize){
++				cow_bh[1] = cow_new_bh(dev, start + len);
++				nbh++;
++			}
++		}
++		
++		bh->b_dev = dev->cow_dev;
++		bh->b_blocknr += dev->data_offset / dev->sectorsize;
++
++		cow_handle_bh(dev, bh, cow_bh, nbh);
++
++		/*
++		 * upped both for pending work and tear-down, lo_pending
++		 * will hit zero then
++		 */
++		if(atomic_dec_and_test(&dev->working))
++			break;
++	}
++
++	up(&dev->sem);
++	return(0);
++}
++
++static int cow_make_request(request_queue_t *q, int rw, struct buffer_head *bh)
++{
++	struct cow *dev;
++	int n, minor;
++
++	minor = MINOR(bh->b_rdev);
++	n = minor >> COW_SHIFT;
++	dev = &cow_dev[n];
++
++	dev->end_io = NULL;
++	if(ubd_test_bit(bh->b_rsector, (unsigned char *) dev->bitmap)){
++		bh->b_rdev = dev->cow_dev;
++		bh->b_rsector += dev->data_offset / dev->sectorsize;
++	}
++	else if(rw == WRITE){
++		bh->b_dev = dev->cow_dev;
++		bh->b_blocknr += dev->data_offset / dev->sectorsize;
++
++		cow_add_bh(dev, bh);
++		up(&dev->io_sem);
++		return(0);
++	}
++	else {
++		bh->b_rdev = dev->backing_dev;
++	}
++
++	return(1);
++}
++
++int cow_init(void)
++{
++	int i;
++
++	cow_dir_handle = devfs_mk_dir (NULL, "cow", NULL);
++	if (devfs_register_blkdev(MAJOR_NR, "cow", &cow_blops)) {
++		printk(KERN_ERR "cow: unable to get major %d\n", MAJOR_NR);
++		return -1;
++	}
++	read_ahead[MAJOR_NR] = 8;		/* 8 sector (4kB) read-ahead */
++	blksize_size[MAJOR_NR] = blk_sizes;
++	blk_size[MAJOR_NR] = sizes;
++	INIT_HARDSECT(hardsect_size, MAJOR_NR, hardsect_sizes);
++
++	cow_queue = BLK_DEFAULT_QUEUE(MAJOR_NR);
++	blk_init_queue(cow_queue, NULL);
++	INIT_ELV(cow_queue, &cow_queue->elevator);
++	blk_queue_make_request(cow_queue, cow_make_request);
++
++       add_gendisk(&cow_gendisk);
++
++	for(i=0;i<MAX_DEV;i++) 
++		cow_add(i);
++
++	return(0);
++}
++
++__initcall(cow_init);
++
++static int reader(__u64 start, char *buf, int count, void *arg)
++{
++	dev_t dev = *((dev_t *) arg);
++	struct buffer_head *bh;
++	__u64 block;
++	int cur, offset, left, n, blocksize = get_hardsect_size(dev);
++
++	if(blocksize == 0)
++		panic("Zero blocksize");
++
++	block = start / blocksize;
++	offset = start % blocksize;
++	left = count;
++	cur = 0;
++	while(left > 0){
++		n = (left > blocksize) ? blocksize : left;
++
++		bh = bread(dev, block, (n < 512) ? 512 : n);
++		if(bh == NULL)
++			return(-EIO);
++
++		n -= offset;
++		memcpy(&buf[cur], bh->b_data + offset, n);
++		block++;
++		left -= n;
++		cur += n;
++		offset = 0;
++		brelse(bh);
++	}
++
++	return(count);
++}
++
++static int cow_open(struct inode *inode, struct file *filp)
++{
++	int (*dev_ioctl)(struct inode *, struct file *, unsigned int, 
++			 unsigned long);
++	mm_segment_t fs;
++	struct cow *dev;
++	__u64 size;
++	__u32 magic;
++	time_t mtime;
++	char *backing_file;
++	int n, offset, err = 0;
++
++	n = DEVICE_NR(inode->i_rdev);
++	if(n >= MAX_DEV)
++		return(-ENODEV);
++	dev = &cow_dev[n];
++	offset = n << COW_SHIFT;
++
++	spin_lock(&cow_lock);
++
++	if(dev->count == 0){
++		dev->cow_dev = name_to_kdev_t(dev->cow_path);
++		if(dev->cow_dev == 0){
++			printk(KERN_ERR "cow_open - name_to_kdev_t(\"%s\") "
++			       "failed\n", dev->cow_path);
++			err = -ENODEV;
++		}
++
++		dev->backing_dev = name_to_kdev_t(dev->backing_path);
++		if(dev->backing_dev == 0){
++			printk(KERN_ERR "cow_open - name_to_kdev_t(\"%s\") "
++			       "failed\n", dev->backing_path);
++			err = -ENODEV;
++		}
++
++		if(err) 
++			goto out;
++
++		dev->cow_bdev = bdget(dev->cow_dev);
++		if(dev->cow_bdev == NULL){
++			printk(KERN_ERR "cow_open - bdget(\"%s\") failed\n", 
++			       dev->cow_path);
++			err = -ENOMEM;
++		}
++		dev->backing_bdev = bdget(dev->backing_dev);
++		if(dev->backing_bdev == NULL){
++			printk(KERN_ERR "cow_open - bdget(\"%s\") failed\n", 
++			       dev->backing_path);
++			err = -ENOMEM;
++		}
++
++		if(err) 
++			goto out;
++
++		err = blkdev_get(dev->cow_bdev, FMODE_READ|FMODE_WRITE, 0, 
++				 BDEV_RAW);
++		if(err){
++			printk("cow_open - blkdev_get of COW device failed, "
++			       "error = %d\n", err);
++			goto out;
++		}
++		
++		err = blkdev_get(dev->backing_bdev, FMODE_READ, 0, BDEV_RAW);
++		if(err){
++			printk("cow_open - blkdev_get of backing device "
++			       "failed, error = %d\n", err);
++			goto out;
++		}
++		
++		err = read_cow_header(reader, &dev->cow_dev, &magic, 
++				      &backing_file, &mtime, &size,
++				      &dev->sectorsize, &dev->bitmap_offset);
++		if(err){
++			printk(KERN_ERR "cow_open - read_cow_header failed, "
++			       "err = %d\n", err);
++			goto out;
++		}
++
++		cow_sizes(size, dev->sectorsize, dev->bitmap_offset, 
++			  &dev->bitmap_len, &dev->data_offset);
++		dev->bitmap = (void *) vmalloc(dev->bitmap_len);
++		if(dev->bitmap == NULL){
++			err = -ENOMEM;
++			printk(KERN_ERR "Failed to vmalloc COW bitmap\n");
++			goto out;
++		}
++		flush_tlb_kernel_vm();
++		
++		err = reader(dev->bitmap_offset, (char *) dev->bitmap, 
++			     dev->bitmap_len, &dev->cow_dev);
++		if(err < 0){
++			printk(KERN_ERR "Failed to read COW bitmap\n");
++			vfree(dev->bitmap);
++			goto out;
++		}
++
++		dev_ioctl = dev->backing_bdev->bd_op->ioctl;
++		fs = get_fs();
++		set_fs(KERNEL_DS);
++		err = (*dev_ioctl)(inode, filp, BLKGETSIZE, 
++				   (unsigned long) &sizes[offset]);
++		set_fs(fs);
++		if(err){
++			printk(KERN_ERR "cow_open - BLKGETSIZE failed, "
++			       "error = %d\n", err);
++			goto out;
++		}
++
++		kernel_thread(cow_thread, dev, 
++			      CLONE_FS | CLONE_FILES | CLONE_SIGHAND);
++		down(&dev->sem);
++	}
++	dev->count++;
++out:
++	spin_unlock(&cow_lock);
++	return(err);
++}
++
++static int cow_release(struct inode * inode, struct file * file)
++{
++	struct cow *dev;
++	int n, err;
++
++	n = DEVICE_NR(inode->i_rdev);
++	if(n >= MAX_DEV)
++		return(-ENODEV);
++	dev = &cow_dev[n];
++
++	spin_lock(&cow_lock);
++
++	if(--dev->count > 0)
++		goto out;
++
++	err = blkdev_put(dev->cow_bdev, BDEV_RAW);
++	if(err)
++		printk("cow_release - blkdev_put of cow device failed, "
++		       "error = %d\n", err);
++	bdput(dev->cow_bdev);
++	dev->cow_bdev = 0;
++
++	err = blkdev_put(dev->backing_bdev, BDEV_RAW);
++	if(err)
++		printk("cow_release - blkdev_put of backing device failed, "
++		       "error = %d\n", err);
++	bdput(dev->backing_bdev);
++	dev->backing_bdev = 0;
++
++out:
++	spin_unlock(&cow_lock);
++	return(0);
++}
++
++static int cow_ioctl(struct inode * inode, struct file * file,
++		     unsigned int cmd, unsigned long arg)
++{
++	struct cow *dev;
++	int (*dev_ioctl)(struct inode *, struct file *, unsigned int, 
++			 unsigned long);
++	int n;
++
++	n = DEVICE_NR(inode->i_rdev);
++	if(n >= MAX_DEV)
++		return(-ENODEV);
++	dev = &cow_dev[n];
++
++	dev_ioctl = dev->backing_bdev->bd_op->ioctl;
++	return((*dev_ioctl)(inode, file, cmd, arg));
++}
++
++static int cow_revalidate(kdev_t rdev)
++{
++	printk(KERN_ERR "Need to implement cow_revalidate\n");
++	return(0);
++}
++
++static int parse_unit(char **ptr)
++{
++	char *str = *ptr, *end;
++	int n = -1;
++
++	if(isdigit(*str)) {
++		n = simple_strtoul(str, &end, 0);
++		if(end == str)
++			return(-1);
++		*ptr = end;
++	}
++	else if (('a' <= *str) && (*str <= 'h')) {
++		n = *str - 'a';
++		str++;
++		*ptr = str;
++	}
++	return(n);
++}
++
++static int cow_setup(char *str)
++{
++	struct cow *dev;
++	char *cow_name, *backing_name;
++	int unit;
++
++	unit = parse_unit(&str);
++	if(unit < 0){
++		printk(KERN_ERR "cow_setup - Couldn't parse unit number\n");
++		return(1);
++	}
++
++	if(*str != '='){
++		printk(KERN_ERR "cow_setup - Missing '=' after unit "
++		       "number\n");
++		return(1);
++	}
++	str++;
++
++	cow_name = str;
++	backing_name = strchr(str, ',');
++	if(backing_name == NULL){
++		printk(KERN_ERR "cow_setup - missing backing device name\n");
++		return(0);
++	}
++	*backing_name = '\0';
++	backing_name++;
++
++	spin_lock(&cow_lock);
++
++	dev = &cow_dev[unit];
++	dev->cow_path = cow_name;
++	dev->backing_path = backing_name;
++	
++	spin_unlock(&cow_lock);
++	return(0);
++}
++
++__setup("cow", cow_setup);
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/arch/um/drivers/cow_sys.h b/arch/um/drivers/cow_sys.h
+--- a/arch/um/drivers/cow_sys.h	Wed Dec 31 19:00:00 1969
++++ b/arch/um/drivers/cow_sys.h	Tue Sep  9 16:49:10 2003
+@@ -0,0 +1,48 @@
++#ifndef __COW_SYS_H__
++#define __COW_SYS_H__
++
++#include "kern_util.h"
++#include "user_util.h"
++#include "os.h"
++#include "user.h"
++
++static inline void *cow_malloc(int size)
++{
++	return(um_kmalloc(size));
++}
++
++static inline void cow_free(void *ptr)
++{
++	kfree(ptr);
++}
++
++#define cow_printf printk
++
++static inline char *cow_strdup(char *str)
++{
++	return(uml_strdup(str));
++}
++
++static inline int cow_seek_file(int fd, __u64 offset)
++{
++	return(os_seek_file(fd, offset));
++}
++
++static inline int cow_file_size(char *file, __u64 *size_out)
++{
++	return(os_file_size(file, size_out));
++}
++
++static inline int cow_write_file(int fd, char *buf, int size)
++{
++	return(os_write_file(fd, buf, size));
++}
++
++#endif
++
++/*
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/arch/um/drivers/cow_user.c b/arch/um/drivers/cow_user.c
+--- a/arch/um/drivers/cow_user.c	Wed Dec 31 19:00:00 1969
++++ b/arch/um/drivers/cow_user.c	Tue Sep  9 16:49:06 2003
+@@ -0,0 +1,296 @@
++#include <stddef.h>
++#include <string.h>
++#include <errno.h>
++#include <unistd.h>
++#include <byteswap.h>
++#include <sys/stat.h>
++#include <sys/time.h>
++#include <sys/param.h>
++#include <netinet/in.h>
++
++#include "cow.h"
++#include "cow_sys.h"
++
++#define PATH_LEN_V1 256
++
++struct cow_header_v1 {
++	int magic;
++	int version;
++	char backing_file[PATH_LEN_V1];
++	time_t mtime;
++	__u64 size;
++	int sectorsize;
++};
++
++#define PATH_LEN_V2 MAXPATHLEN
++
++struct cow_header_v2 {
++	unsigned long magic;
++	unsigned long version;
++	char backing_file[PATH_LEN_V2];
++	time_t mtime;
++	__u64 size;
++	int sectorsize;
++};
++
++union cow_header {
++	struct cow_header_v1 v1;
++	struct cow_header_v2 v2;
++};
++
++#define COW_MAGIC 0x4f4f4f4d  /* MOOO */
++#define COW_VERSION 2
++
++void cow_sizes(__u64 size, int sectorsize, int bitmap_offset, 
++	       unsigned long *bitmap_len_out, int *data_offset_out)
++{
++	*bitmap_len_out = (size + sectorsize - 1) / (8 * sectorsize);
++
++	*data_offset_out = bitmap_offset + *bitmap_len_out;
++	*data_offset_out = (*data_offset_out + sectorsize - 1) / sectorsize;
++	*data_offset_out *= sectorsize;
++}
++
++static int absolutize(char *to, int size, char *from)
++{
++	char save_cwd[256], *slash;
++	int remaining;
++
++	if(getcwd(save_cwd, sizeof(save_cwd)) == NULL) {
++		cow_printf("absolutize : unable to get cwd - errno = %d\n", 
++			   errno);
++		return(-1);
++	}
++	slash = strrchr(from, '/');
++	if(slash != NULL){
++		*slash = '\0';
++		if(chdir(from)){
++			*slash = '/';
++			cow_printf("absolutize : Can't cd to '%s' - " 
++				   "errno = %d\n", from, errno);
++			return(-1);
++		}
++		*slash = '/';
++		if(getcwd(to, size) == NULL){
++			cow_printf("absolutize : unable to get cwd of '%s' - "
++			       "errno = %d\n", from, errno);
++			return(-1);
++		}
++		remaining = size - strlen(to);
++		if(strlen(slash) + 1 > remaining){
++			cow_printf("absolutize : unable to fit '%s' into %d "
++			       "chars\n", from, size);
++			return(-1);
++		}
++		strcat(to, slash);
++	}
++	else {
++		if(strlen(save_cwd) + 1 + strlen(from) + 1 > size){
++			cow_printf("absolutize : unable to fit '%s' into %d "
++			       "chars\n", from, size);
++			return(-1);
++		}
++		strcpy(to, save_cwd);
++		strcat(to, "/");
++		strcat(to, from);
++	}
++	chdir(save_cwd);
++	return(0);
++}
++
++int write_cow_header(char *cow_file, int fd, char *backing_file, 
++		     int sectorsize, long long *size)
++{
++	struct cow_header_v2 *header;
++	struct stat64 buf;
++	int err;
++
++	err = cow_seek_file(fd, 0);
++	if(err != 0){
++		cow_printf("write_cow_header - lseek failed, errno = %d\n", 
++			   errno);
++		return(-errno);
++	}
++
++	err = -ENOMEM;
++	header = cow_malloc(sizeof(*header));
++	if(header == NULL){
++		cow_printf("Failed to allocate COW V2 header\n");
++		goto out;
++	}
++	header->magic = htonl(COW_MAGIC);
++	header->version = htonl(COW_VERSION);
++
++	err = -EINVAL;
++	if(strlen(backing_file) > sizeof(header->backing_file) - 1){
++		cow_printf("Backing file name \"%s\" is too long - names are "
++			   "limited to %d characters\n", backing_file, 
++			   sizeof(header->backing_file) - 1);
++		goto out_free;
++	}
++
++	if(absolutize(header->backing_file, sizeof(header->backing_file), 
++		      backing_file))
++		goto out_free;
++
++	err = stat64(header->backing_file, &buf);
++	if(err < 0){
++		cow_printf("Stat of backing file '%s' failed, errno = %d\n",
++			   header->backing_file, errno);
++		err = -errno;
++		goto out_free;
++	}
++
++	err = cow_file_size(header->backing_file, size);
++	if(err){
++		cow_printf("Couldn't get size of backing file '%s', "
++			   "errno = %d\n", header->backing_file, -*size);
++		goto out_free;
++	}
++
++	header->mtime = htonl(buf.st_mtime);
++	header->size = htonll(*size);
++	header->sectorsize = htonl(sectorsize);
++
++	err = write(fd, header, sizeof(*header));
++	if(err != sizeof(*header)){
++		cow_printf("Write of header to new COW file '%s' failed, "
++			   "errno = %d\n", cow_file, errno);
++		goto out_free;
++	}
++	err = 0;
++ out_free:
++	cow_free(header);
++ out:
++	return(err);
++}
++
++int file_reader(__u64 offset, char *buf, int len, void *arg)
++{
++	int fd = *((int *) arg);
++
++	return(pread(fd, buf, len, offset));
++}
++
++int read_cow_header(int (*reader)(__u64, char *, int, void *), void *arg, 
++		    __u32 *magic_out, char **backing_file_out, 
++		    time_t *mtime_out, __u64 *size_out, 
++		    int *sectorsize_out, int *bitmap_offset_out)
++{
++	union cow_header *header;
++	char *file;
++	int err, n;
++	unsigned long version, magic;
++
++	header = cow_malloc(sizeof(*header));
++	if(header == NULL){
++	        cow_printf("read_cow_header - Failed to allocate header\n");
++		return(-ENOMEM);
++	}
++	err = -EINVAL;
++	n = (*reader)(0, (char *) header, sizeof(*header), arg);
++	if(n < offsetof(typeof(header->v1), backing_file)){
++		cow_printf("read_cow_header - short header\n");
++		goto out;
++	}
++
++	magic = header->v1.magic;
++	if(magic == COW_MAGIC) {
++		version = header->v1.version;
++	}
++	else if(magic == ntohl(COW_MAGIC)){
++		version = ntohl(header->v1.version);
++	}
++	/* No error printed because the non-COW case comes through here */
++	else goto out;
++
++	*magic_out = COW_MAGIC;
++
++	if(version == 1){
++		if(n < sizeof(header->v1)){
++			cow_printf("read_cow_header - failed to read V1 "
++				   "header\n");
++			goto out;
++		}
++		*mtime_out = header->v1.mtime;
++		*size_out = header->v1.size;
++		*sectorsize_out = header->v1.sectorsize;
++		*bitmap_offset_out = sizeof(header->v1);
++		file = header->v1.backing_file;
++	}
++	else if(version == 2){
++		if(n < sizeof(header->v2)){
++			cow_printf("read_cow_header - failed to read V2 "
++				   "header\n");
++			goto out;
++		}
++		*mtime_out = ntohl(header->v2.mtime);
++		*size_out = ntohll(header->v2.size);
++		*sectorsize_out = ntohl(header->v2.sectorsize);
++		*bitmap_offset_out = sizeof(header->v2);
++		file = header->v2.backing_file;
++	}
++	else {
++		cow_printf("read_cow_header - invalid COW version\n");
++		goto out;
++	}
++	err = -ENOMEM;
++	*backing_file_out = cow_strdup(file);
++	if(*backing_file_out == NULL){
++		cow_printf("read_cow_header - failed to allocate backing "
++			   "file\n");
++		goto out;
++	}
++	err = 0;
++ out:
++	cow_free(header);
++	return(err);
++}
++
++int init_cow_file(int fd, char *cow_file, char *backing_file, int sectorsize,
++		  int *bitmap_offset_out, unsigned long *bitmap_len_out, 
++		  int *data_offset_out)
++{
++	__u64 size, offset;
++	char zero = 0;
++	int err;
++
++	err = write_cow_header(cow_file, fd, backing_file, sectorsize, &size);
++	if(err) 
++		goto out;
++	
++	cow_sizes(size, sectorsize, sizeof(struct cow_header_v2), 
++		  bitmap_len_out, data_offset_out);
++	*bitmap_offset_out = sizeof(struct cow_header_v2);
++
++	offset = *data_offset_out + size - sizeof(zero);
++	err = cow_seek_file(fd, offset);
++	if(err != 0){
++		cow_printf("cow bitmap lseek failed : errno = %d\n", errno);
++		goto out;
++	}
++
++	/* does not really matter how much we write it is just to set EOF 
++	 * this also sets the entire COW bitmap
++	 * to zero without having to allocate it 
++	 */
++	err = cow_write_file(fd, &zero, sizeof(zero));
++	if(err != sizeof(zero)){
++		err = -EINVAL;
++		cow_printf("Write of bitmap to new COW file '%s' failed, "
++			   "errno = %d\n", cow_file, errno);
++		goto out;
++	}
++
++	return(0);
++
++ out:
++	return(err);
++}
++
++/*
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/arch/um/drivers/hostaudio_kern.c b/arch/um/drivers/hostaudio_kern.c
+--- a/arch/um/drivers/hostaudio_kern.c	Tue Sep  9 16:46:07 2003
++++ b/arch/um/drivers/hostaudio_kern.c	Tue Sep  9 16:51:08 2003
+@@ -11,6 +11,7 @@
+ #include "linux/fs.h"
+ #include "linux/sound.h"
+ #include "linux/soundcard.h"
++#include "asm/uaccess.h"
+ #include "kern_util.h"
+ #include "init.h"
+ #include "hostaudio.h"
+@@ -22,7 +23,7 @@
+ #ifndef MODULE
+ static int set_dsp(char *name, int *add)
+ {
+-	dsp = uml_strdup(name);
++	dsp = name;
+ 	return(0);
+ }
+ 
+@@ -34,7 +35,7 @@
+ 
+ static int set_mixer(char *name, int *add)
+ {
+-	mixer = uml_strdup(name);
++	mixer = name;
+ 	return(0);
+ }
+ 
+@@ -51,23 +52,55 @@
+ 			      loff_t *ppos)
+ {
+         struct hostaudio_state *state = file->private_data;
++	void *kbuf;
++	int err;
+ 
+ #ifdef DEBUG
+         printk("hostaudio: read called, count = %d\n", count);
+ #endif
+ 
+-        return(hostaudio_read_user(state, buffer, count, ppos));
++	kbuf = kmalloc(count, GFP_KERNEL);
++	if(kbuf == NULL)
++		return(-ENOMEM);
++
++        err = hostaudio_read_user(state, kbuf, count, ppos);
++	if(err < 0)
++		goto out;
++
++	if(copy_to_user(buffer, kbuf, err))
++		err = -EFAULT;
++
++ out:
++	kfree(kbuf);
++	return(err);
+ }
+ 
+ static ssize_t hostaudio_write(struct file *file, const char *buffer, 
+ 			       size_t count, loff_t *ppos)
+ {
+         struct hostaudio_state *state = file->private_data;
++	void *kbuf;
++	int err;
+ 
+ #ifdef DEBUG
+         printk("hostaudio: write called, count = %d\n", count);
+ #endif
+-        return(hostaudio_write_user(state, buffer, count, ppos));
++
++	kbuf = kmalloc(count, GFP_KERNEL);
++	if(kbuf == NULL)
++		return(-ENOMEM);
++
++	err = -EFAULT;
++	if(copy_from_user(kbuf, buffer, count))
++		goto out;
++
++        err = hostaudio_write_user(state, kbuf, count, ppos);
++	if(err < 0)
++		goto out;
++
++ out:
++	kfree(kbuf);
++	return(err);
+ }
+ 
+ static unsigned int hostaudio_poll(struct file *file, 
+@@ -86,12 +119,43 @@
+ 			   unsigned int cmd, unsigned long arg)
+ {
+         struct hostaudio_state *state = file->private_data;
++	unsigned long data = 0;
++	int err;
+ 
+ #ifdef DEBUG
+         printk("hostaudio: ioctl called, cmd = %u\n", cmd);
+ #endif
++	switch(cmd){
++	case SNDCTL_DSP_SPEED:
++	case SNDCTL_DSP_STEREO:
++	case SNDCTL_DSP_GETBLKSIZE:
++	case SNDCTL_DSP_CHANNELS:
++	case SNDCTL_DSP_SUBDIVIDE:
++	case SNDCTL_DSP_SETFRAGMENT:
++		if(get_user(data, (int *) arg))
++			return(-EFAULT);
++		break;
++	default:
++		break;
++	}
++
++        err = hostaudio_ioctl_user(state, cmd, (unsigned long) &data);
++
++	switch(cmd){
++	case SNDCTL_DSP_SPEED:
++	case SNDCTL_DSP_STEREO:
++	case SNDCTL_DSP_GETBLKSIZE:
++	case SNDCTL_DSP_CHANNELS:
++	case SNDCTL_DSP_SUBDIVIDE:
++	case SNDCTL_DSP_SETFRAGMENT:
++		if(put_user(data, (int *) arg))
++			return(-EFAULT);
++		break;
++	default:
++		break;
++	}
+ 
+-        return(hostaudio_ioctl_user(state, cmd, arg));
++	return(err);
+ }
+ 
+ static int hostaudio_open(struct inode *inode, struct file *file)
+@@ -225,7 +289,8 @@
+ 
+ static int __init hostaudio_init_module(void)
+ {
+-        printk(KERN_INFO "UML Audio Relay\n");
++        printk(KERN_INFO "UML Audio Relay (host dsp = %s, host mixer = %s)\n",
++	       dsp, mixer);
+ 
+ 	module_data.dev_audio = register_sound_dsp(&hostaudio_fops, -1);
+         if(module_data.dev_audio < 0){
+diff -Naur a/arch/um/drivers/line.c b/arch/um/drivers/line.c
+--- a/arch/um/drivers/line.c	Tue Sep  9 16:45:58 2003
++++ b/arch/um/drivers/line.c	Tue Sep  9 16:50:27 2003
+@@ -6,8 +6,8 @@
+ #include "linux/sched.h"
+ #include "linux/slab.h"
+ #include "linux/list.h"
++#include "linux/interrupt.h"
+ #include "linux/devfs_fs_kernel.h"
+-#include "asm/irq.h"
+ #include "asm/uaccess.h"
+ #include "chan_kern.h"
+ #include "irq_user.h"
+@@ -16,16 +16,18 @@
+ #include "user_util.h"
+ #include "kern_util.h"
+ #include "os.h"
++#include "irq_kern.h"
+ 
+ #define LINE_BUFSIZE 4096
+ 
+-void line_interrupt(int irq, void *data, struct pt_regs *unused)
++irqreturn_t line_interrupt(int irq, void *data, struct pt_regs *unused)
+ {
+ 	struct line *dev = data;
+ 
+ 	if(dev->count > 0) 
+ 		chan_interrupt(&dev->chan_list, &dev->task, dev->tty, irq, 
+ 			       dev);
++	return IRQ_HANDLED;
+ }
+ 
+ void line_timer_cb(void *arg)
+@@ -136,20 +138,22 @@
+ 	return(len);
+ }
+ 
+-void line_write_interrupt(int irq, void *data, struct pt_regs *unused)
++irqreturn_t line_write_interrupt(int irq, void *data, struct pt_regs *unused)
+ {
+ 	struct line *dev = data;
+ 	struct tty_struct *tty = dev->tty;
+ 	int err;
+ 
+ 	err = flush_buffer(dev);
+-	if(err == 0) return;
++	if(err == 0) 
++		return(IRQ_NONE);
+ 	else if(err < 0){
+ 		dev->head = dev->buffer;
+ 		dev->tail = dev->buffer;
+ 	}
+ 
+-	if(tty == NULL) return;
++	if(tty == NULL) 
++		return(IRQ_NONE);
+ 
+ 	if(test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags) &&
+ 	   (tty->ldisc.write_wakeup != NULL))
+@@ -161,9 +165,9 @@
+ 	 * writes.
+ 	 */
+ 
+-	if (waitqueue_active(&tty->write_wait))
++	if(waitqueue_active(&tty->write_wait))
+ 		wake_up_interruptible(&tty->write_wait);
+-
++	return(IRQ_HANDLED);
+ }
+ 
+ int line_write_room(struct tty_struct *tty)
+@@ -369,7 +373,7 @@
+ 
+ 	dev = simple_strtoul(name, &end, 0);
+ 	if((*end != '\0') || (end == name)){
+-		*error_out = "line_setup failed to parse device number";
++		*error_out = "line_get_config failed to parse device number";
+ 		return(0);
+ 	}
+ 
+@@ -379,15 +383,15 @@
+ 	}
+ 
+ 	line = &lines[dev];
++
+ 	down(&line->sem);
+-	
+ 	if(!line->valid)
+ 		CONFIG_CHUNK(str, size, n, "none", 1);
+ 	else if(line->count == 0)
+ 		CONFIG_CHUNK(str, size, n, line->init_str, 1);
+ 	else n = chan_config_string(&line->chan_list, str, size, error_out);
+-
+ 	up(&line->sem);
++
+ 	return(n);
+ }
+ 
+@@ -412,7 +416,8 @@
+ 		return NULL;
+ 
+ 	driver->driver_name = line_driver->name;
+-	driver->name = line_driver->devfs_name;
++	driver->name = line_driver->device_name;
++	driver->devfs_name = line_driver->devfs_name;
+ 	driver->major = line_driver->major;
+ 	driver->minor_start = line_driver->minor_start;
+ 	driver->type = line_driver->type;
+@@ -432,7 +437,7 @@
+ 
+ 	for(i = 0; i < nlines; i++){
+ 		if(!lines[i].valid) 
+-			tty_unregister_devfs(driver, i);
++			tty_unregister_device(driver, i);
+ 	}
+ 
+ 	mconsole_register_dev(&line_driver->mc);
+@@ -465,24 +470,25 @@
+ 	struct line *line;
+ };
+ 
+-void winch_interrupt(int irq, void *data, struct pt_regs *unused)
++irqreturn_t winch_interrupt(int irq, void *data, struct pt_regs *unused)
+ {
+ 	struct winch *winch = data;
+ 	struct tty_struct *tty;
+ 	int err;
+ 	char c;
+ 
+-	err = generic_read(winch->fd, &c, NULL);
+-	if(err < 0){
+-		if(err != -EAGAIN){
+-			printk("winch_interrupt : read failed, errno = %d\n", 
+-			       -err);
+-			printk("fd %d is losing SIGWINCH support\n", 
+-			       winch->tty_fd);
+-			free_irq(irq, data);
+-			return;
++	if(winch->fd != -1){
++		err = generic_read(winch->fd, &c, NULL);
++		if(err < 0){
++			if(err != -EAGAIN){
++				printk("winch_interrupt : read failed, "
++				       "errno = %d\n", -err);
++				printk("fd %d is losing SIGWINCH support\n", 
++				       winch->tty_fd);
++				return(IRQ_HANDLED);
++			}
++			goto out;
+ 		}
+-		goto out;
+ 	}
+ 	tty = winch->line->tty;
+ 	if(tty != NULL){
+@@ -492,7 +498,9 @@
+ 		kill_pg(tty->pgrp, SIGWINCH, 1);
+ 	}
+  out:
+-	reactivate_fd(winch->fd, WINCH_IRQ);
++	if(winch->fd != -1)
++		reactivate_fd(winch->fd, WINCH_IRQ);
++	return(IRQ_HANDLED);
+ }
+ 
+ DECLARE_MUTEX(winch_handler_sem);
+@@ -529,7 +537,10 @@
+ 
+ 	list_for_each(ele, &winch_handlers){
+ 		winch = list_entry(ele, struct winch, list);
+-		close(winch->fd);
++		if(winch->fd != -1){
++			deactivate_fd(winch->fd, WINCH_IRQ);
++			close(winch->fd);
++		}
+ 		if(winch->pid != -1) 
+ 			os_kill_process(winch->pid, 1);
+ 	}
+diff -Naur a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
+--- a/arch/um/drivers/mconsole_kern.c	Tue Sep  9 16:41:12 2003
++++ b/arch/um/drivers/mconsole_kern.c	Tue Sep  9 16:47:22 2003
+@@ -27,6 +27,7 @@
+ #include "init.h"
+ #include "os.h"
+ #include "umid.h"
++#include "irq_kern.h"
+ 
+ static int do_unlink_socket(struct notifier_block *notifier, 
+ 			    unsigned long what, void *data)
+@@ -67,7 +68,7 @@
+ 
+ DECLARE_WORK(mconsole_work, mc_work_proc, NULL);
+ 
+-void mconsole_interrupt(int irq, void *dev_id, struct pt_regs *regs)
++irqreturn_t mconsole_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+ {
+ 	int fd;
+ 	struct mconsole_entry *new;
+@@ -88,6 +89,7 @@
+ 	}
+ 	if(!list_empty(&mc_requests)) schedule_work(&mconsole_work);
+ 	reactivate_fd(fd, MCONSOLE_IRQ);
++	return(IRQ_HANDLED);
+ }
+ 
+ void mconsole_version(struct mc_request *req)
+@@ -100,20 +102,34 @@
+ 	mconsole_reply(req, version, 0, 0);
+ }
+ 
++void mconsole_log(struct mc_request *req)
++{
++	int len;
++	char *ptr = req->request.data;
++	
++	ptr += strlen("log");
++	while(isspace(*ptr)) ptr++;
++
++	len = ptr - req->request.data;
++	printk("%.*s", len, ptr);
++	mconsole_reply(req, "", 0, 0);
++}
++
+ #define UML_MCONSOLE_HELPTEXT \
+-"Commands:
+-    version - Get kernel version
+-    help - Print this message
+-    halt - Halt UML
+-    reboot - Reboot UML
+-    config <dev>=<config> - Add a new device to UML; 
+-	same syntax as command line
+-    config <dev> - Query the configuration of a device
+-    remove <dev> - Remove a device from UML
+-    sysrq <letter> - Performs the SysRq action controlled by the letter
+-    cad - invoke the Ctl-Alt-Del handler
+-    stop - pause the UML; it will do nothing until it receives a 'go'
+-    go - continue the UML after a 'stop'
++"Commands: \n\
++    version - Get kernel version \n\
++    help - Print this message \n\
++    halt - Halt UML \n\
++    reboot - Reboot UML \n\
++    config <dev>=<config> - Add a new device to UML;  \n\
++	same syntax as command line \n\
++    config <dev> - Query the configuration of a device \n\
++    remove <dev> - Remove a device from UML \n\
++    sysrq <letter> - Performs the SysRq action controlled by the letter \n\
++    cad - invoke the Ctl-Alt-Del handler \n\
++    stop - pause the UML; it will do nothing until it receives a 'go' \n\
++    go - continue the UML after a 'stop' \n\
++    log <string> - make UML enter <string> into the kernel log\n\
+ "
+ 
+ void mconsole_help(struct mc_request *req)
+@@ -302,7 +318,7 @@
+ 	if(umid_file_name("mconsole", file, sizeof(file))) return(-1);
+ 	snprintf(mconsole_socket_name, sizeof(file), "%s", file);
+ 
+-	sock = create_unix_socket(file, sizeof(file));
++	sock = create_unix_socket(file, sizeof(file), 1);
+ 	if (sock < 0){
+ 		printk("Failed to initialize management console\n");
+ 		return(1);
+diff -Naur a/arch/um/drivers/mconsole_user.c b/arch/um/drivers/mconsole_user.c
+--- a/arch/um/drivers/mconsole_user.c	Tue Sep  9 16:41:40 2003
++++ b/arch/um/drivers/mconsole_user.c	Tue Sep  9 16:47:42 2003
+@@ -28,6 +28,7 @@
+ 	{ "cad", mconsole_cad, 1 },
+ 	{ "stop", mconsole_stop, 0 },
+ 	{ "go", mconsole_go, 1 },
++	{ "log", mconsole_log, 1 },
+ };
+ 
+ /* Initialized in mconsole_init, which is an initcall */
+@@ -139,6 +140,7 @@
+ 		memcpy(reply.data, str, len);
+ 		reply.data[len] = '\0';
+ 		total -= len;
++ 		str += len;
+ 		reply.len = len + 1;
+ 
+ 		len = sizeof(reply) + reply.len - sizeof(reply.data);
+diff -Naur a/arch/um/drivers/mmapper_kern.c b/arch/um/drivers/mmapper_kern.c
+--- a/arch/um/drivers/mmapper_kern.c	Tue Sep  9 16:41:34 2003
++++ b/arch/um/drivers/mmapper_kern.c	Tue Sep  9 16:47:40 2003
+@@ -120,7 +120,10 @@
+ 	printk(KERN_INFO "Mapper v0.1\n");
+ 
+ 	v_buf = (char *) find_iomem("mmapper", &mmapper_size);
+-	if(mmapper_size == 0) return(0);
++	if(mmapper_size == 0){
++		printk(KERN_ERR "mmapper_init - find_iomem failed\n");
++		return(0);
++	}
+ 
+ 	p_buf = __pa(v_buf);
+ 
+diff -Naur a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
+--- a/arch/um/drivers/net_kern.c	Tue Sep  9 16:43:06 2003
++++ b/arch/um/drivers/net_kern.c	Tue Sep  9 16:48:52 2003
+@@ -26,6 +26,7 @@
+ #include "mconsole_kern.h"
+ #include "init.h"
+ #include "irq_user.h"
++#include "irq_kern.h"
+ 
+ static spinlock_t opened_lock = SPIN_LOCK_UNLOCKED;
+ LIST_HEAD(opened);
+@@ -61,14 +62,14 @@
+ 	return pkt_len;
+ }
+ 
+-void uml_net_interrupt(int irq, void *dev_id, struct pt_regs *regs)
++irqreturn_t uml_net_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+ {
+ 	struct net_device *dev = dev_id;
+ 	struct uml_net_private *lp = dev->priv;
+ 	int err;
+ 
+ 	if(!netif_running(dev))
+-		return;
++		return(IRQ_NONE);
+ 
+ 	spin_lock(&lp->lock);
+ 	while((err = uml_net_rx(dev)) > 0) ;
+@@ -83,6 +84,7 @@
+ 
+  out:
+ 	spin_unlock(&lp->lock);
++	return(IRQ_HANDLED);
+ }
+ 
+ static int uml_net_open(struct net_device *dev)
+@@ -252,37 +254,6 @@
+ #endif
+ }
+ 
+-/*
+- * default do nothing hard header packet routines for struct net_device init.
+- * real ethernet transports will overwrite with real routines.
+- */
+-static int uml_net_hard_header(struct sk_buff *skb, struct net_device *dev,
+-                 unsigned short type, void *daddr, void *saddr, unsigned len)
+-{
+-	return(0); /* no change */
+-}
+-
+-static int uml_net_rebuild_header(struct sk_buff *skb)
+-{
+-	return(0); /* ignore */ 
+-}
+-
+-static int uml_net_header_cache(struct neighbour *neigh, struct hh_cache *hh)
+-{
+-	return(-1); /* fail */
+-}
+-
+-static void uml_net_header_cache_update(struct hh_cache *hh,
+-                 struct net_device *dev, unsigned char * haddr)
+-{
+-	/* ignore */
+-}
+-
+-static int uml_net_header_parse(struct sk_buff *skb, unsigned char *haddr)
+-{
+-	return(0); /* nothing */
+-}
+-
+ static spinlock_t devices_lock = SPIN_LOCK_UNLOCKED;
+ static struct list_head devices = LIST_HEAD_INIT(devices);
+ 
+@@ -292,7 +263,7 @@
+ 	struct uml_net *device;
+ 	struct net_device *dev;
+ 	struct uml_net_private *lp;
+-	int err, size;
++	int save, err, size;
+ 
+ 	size = transport->private_size + sizeof(struct uml_net_private) + 
+ 		sizeof(((struct uml_net_private *) 0)->user);
+@@ -334,12 +305,6 @@
+ 	snprintf(dev->name, sizeof(dev->name), "eth%d", n);
+ 	device->dev = dev;
+ 
+-        dev->hard_header = uml_net_hard_header;
+-        dev->rebuild_header = uml_net_rebuild_header;
+-        dev->hard_header_cache = uml_net_header_cache;
+-        dev->header_cache_update= uml_net_header_cache_update;
+-        dev->hard_header_parse = uml_net_header_parse;
+-
+ 	(*transport->kern->init)(dev, init);
+ 
+ 	dev->mtu = transport->user->max_packet;
+@@ -362,21 +327,29 @@
+ 		return 1;
+ 	lp = dev->priv;
+ 
+-	INIT_LIST_HEAD(&lp->list);
+-	spin_lock_init(&lp->lock);
+-	lp->dev = dev;
+-	lp->fd = -1;
+-	lp->mac = { 0xfe, 0xfd, 0x0, 0x0, 0x0, 0x0 };
+-	lp->have_mac = device->have_mac;
+-	lp->protocol = transport->kern->protocol;
+-	lp->open = transport->user->open;
+-	lp->close = transport->user->close;
+-	lp->remove = transport->user->remove;
+-	lp->read = transport->kern->read;
+-	lp->write = transport->kern->write;
+-	lp->add_address = transport->user->add_address;
+-	lp->delete_address = transport->user->delete_address;
+-	lp->set_mtu = transport->user->set_mtu;
++	/* lp.user is the first four bytes of the transport data, which
++	 * has already been initialized.  This structure assignment will
++	 * overwrite that, so we make sure that .user gets overwritten with
++	 * what it already has.
++	 */
++	save = lp->user[0];
++	*lp = ((struct uml_net_private) 
++		{ .list  		= LIST_HEAD_INIT(lp->list),
++		  .lock 		= SPIN_LOCK_UNLOCKED,
++		  .dev 			= dev,
++		  .fd 			= -1,
++		  .mac 			= { 0xfe, 0xfd, 0x0, 0x0, 0x0, 0x0},
++		  .have_mac 		= device->have_mac,
++		  .protocol 		= transport->kern->protocol,
++		  .open 		= transport->user->open,
++		  .close 		= transport->user->close,
++		  .remove 		= transport->user->remove,
++		  .read 		= transport->kern->read,
++		  .write 		= transport->kern->write,
++		  .add_address 		= transport->user->add_address,
++		  .delete_address  	= transport->user->delete_address,
++		  .set_mtu 		= transport->user->set_mtu,
++		  .user  		= { save } });
+ 
+ 	init_timer(&lp->tl);
+ 	lp->tl.function = uml_net_user_timer_expire;
+@@ -609,7 +582,8 @@
+ 	unregister_netdev(dev);
+ 
+ 	list_del(&device->list);
+-	free_netdev(device);
++	kfree(device);
++	free_netdev(dev);
+ 	return(0);
+ }
+ 
+diff -Naur a/arch/um/drivers/port_kern.c b/arch/um/drivers/port_kern.c
+--- a/arch/um/drivers/port_kern.c	Tue Sep  9 16:41:19 2003
++++ b/arch/um/drivers/port_kern.c	Tue Sep  9 16:47:28 2003
+@@ -6,6 +6,7 @@
+ #include "linux/list.h"
+ #include "linux/sched.h"
+ #include "linux/slab.h"
++#include "linux/interrupt.h"
+ #include "linux/irq.h"
+ #include "linux/spinlock.h"
+ #include "linux/errno.h"
+@@ -14,6 +15,7 @@
+ #include "kern_util.h"
+ #include "kern.h"
+ #include "irq_user.h"
++#include "irq_kern.h"
+ #include "port.h"
+ #include "init.h"
+ #include "os.h"
+@@ -44,7 +46,7 @@
+ 	struct port_list *port;
+ };
+ 
+-static void pipe_interrupt(int irq, void *data, struct pt_regs *regs)
++static irqreturn_t pipe_interrupt(int irq, void *data, struct pt_regs *regs)
+ {
+ 	struct connection *conn = data;
+ 	int fd;
+@@ -52,7 +54,7 @@
+  	fd = os_rcv_fd(conn->socket[0], &conn->helper_pid);
+ 	if(fd < 0){
+ 		if(fd == -EAGAIN)
+-			return;
++			return(IRQ_NONE);
+ 
+ 		printk(KERN_ERR "pipe_interrupt : os_rcv_fd returned %d\n", 
+ 		       -fd);
+@@ -65,6 +67,7 @@
+ 	list_add(&conn->list, &conn->port->connections);
+ 
+ 	up(&conn->port->sem);
++	return(IRQ_HANDLED);
+ }
+ 
+ static int port_accept(struct port_list *port)
+@@ -138,12 +141,13 @@
+ 
+ DECLARE_WORK(port_work, port_work_proc, NULL);
+ 
+-static void port_interrupt(int irq, void *data, struct pt_regs *regs)
++static irqreturn_t port_interrupt(int irq, void *data, struct pt_regs *regs)
+ {
+ 	struct port_list *port = data;
+ 
+ 	port->has_connection = 1;
+ 	schedule_work(&port_work);
++	return(IRQ_HANDLED);
+ } 
+ 
+ void *port_data(int port_num)
+diff -Naur a/arch/um/drivers/ssl.c b/arch/um/drivers/ssl.c
+--- a/arch/um/drivers/ssl.c	Tue Sep  9 16:43:21 2003
++++ b/arch/um/drivers/ssl.c	Tue Sep  9 16:48:57 2003
+@@ -53,8 +53,9 @@
+ 
+ static struct line_driver driver = {
+ 	.name 			= "UML serial line",
+-	.devfs_name 		= "tts/%d",
+-	.major 			= TTYAUX_MAJOR,
++	.device_name 		= "ttS",
++	.devfs_name 		= "tts/",
++	.major 			= TTY_MAJOR,
+ 	.minor_start 		= 64,
+ 	.type 		 	= TTY_DRIVER_TYPE_SERIAL,
+ 	.subtype 	 	= 0,
+diff -Naur a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c
+--- a/arch/um/drivers/stdio_console.c	Tue Sep  9 16:41:51 2003
++++ b/arch/um/drivers/stdio_console.c	Tue Sep  9 16:47:57 2003
+@@ -83,7 +83,8 @@
+ 
+ static struct line_driver driver = {
+ 	.name 			= "UML console",
+-	.devfs_name 		= "vc/%d",
++	.device_name 		= "tty",
++	.devfs_name 		= "vc/",
+ 	.major 			= TTY_MAJOR,
+ 	.minor_start 		= 0,
+ 	.type 		 	= TTY_DRIVER_TYPE_CONSOLE,
+@@ -159,6 +160,15 @@
+ 
+ static int con_init_done = 0;
+ 
++static struct tty_operations console_ops = {
++	.open 	 		= con_open,
++	.close 	 		= con_close,
++	.write 	 		= con_write,
++	.chars_in_buffer 	= chars_in_buffer,
++	.set_termios 		= set_termios,
++	.write_room		= line_write_room,
++};
++
+ int stdio_init(void)
+ {
+ 	char *new_title;
+@@ -166,7 +176,8 @@
+ 	printk(KERN_INFO "Initializing stdio console driver\n");
+ 
+ 	console_driver = line_register_devfs(&console_lines, &driver,
+-				&console_ops, vts, sizeof(vts)/sizeof(vts[0]));
++					     &console_ops, vts,
++					     sizeof(vts)/sizeof(vts[0]));
+ 
+ 	lines_init(vts, sizeof(vts)/sizeof(vts[0]));
+ 
+@@ -188,15 +199,6 @@
+ 	if(con_init_done) up(&vts[console->index].sem);
+ }
+ 
+-static struct tty_operations console_ops = {
+-	.open 	 		= con_open,
+-	.close 	 		= con_close,
+-	.write 	 		= con_write,
+-	.chars_in_buffer 	= chars_in_buffer,
+-	.set_termios 		= set_termios,
+-	.write_room		= line_write_room,
+-};
+-
+ static struct tty_driver *console_device(struct console *c, int *index)
+ {
+ 	*index = c->index;
+@@ -212,12 +214,14 @@
+ 					       console_device, console_setup,
+ 					       CON_PRINTBUFFER);
+ 
+-static void __init stdio_console_init(void)
++static int __init stdio_console_init(void)
+ {
+ 	INIT_LIST_HEAD(&vts[0].chan_list);
+ 	list_add(&init_console_chan.list, &vts[0].chan_list);
+ 	register_console(&stdiocons);
++	return(0);
+ }
++
+ console_initcall(stdio_console_init);
+ 
+ static int console_chan_setup(char *str)
+diff -Naur a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
+--- a/arch/um/drivers/ubd_kern.c	Tue Sep  9 16:43:08 2003
++++ b/arch/um/drivers/ubd_kern.c	Tue Sep  9 16:48:54 2003
+@@ -8,6 +8,13 @@
+  * old style ubd by setting UBD_SHIFT to 0
+  * 2002-09-27...2002-10-18 massive tinkering for 2.5
+  * partitions have changed in 2.5
++ * 2003-01-29 more tinkering for 2.5.59-1
++ * This should now address the sysfs problems and has
++ * the symlink for devfs to allow for booting with
++ * the common /dev/ubd/discX/... names rather than
++ * only /dev/ubdN/discN this version also has lots of
++ * clean ups preparing for ubd-many.
++ * James McMechan
+  */
+ 
+ #define MAJOR_NR UBD_MAJOR
+@@ -40,6 +47,7 @@
+ #include "mconsole_kern.h"
+ #include "init.h"
+ #include "irq_user.h"
++#include "irq_kern.h"
+ #include "ubd_user.h"
+ #include "2_5compat.h"
+ #include "os.h"
+@@ -67,7 +75,7 @@
+ static request_queue_t *ubd_queue;
+ 
+ /* Protected by ubd_lock */
+-static int fake_major = 0;
++static int fake_major = MAJOR_NR;
+ 
+ static struct gendisk *ubd_gendisk[MAX_DEV];
+ static struct gendisk *fake_gendisk[MAX_DEV];
+@@ -96,12 +104,12 @@
+ 
+ struct ubd {
+ 	char *file;
+-	int is_dir;
+ 	int count;
+ 	int fd;
+ 	__u64 size;
+ 	struct openflags boot_openflags;
+ 	struct openflags openflags;
++	int no_cow;
+ 	struct cow cow;
+ };
+ 
+@@ -115,12 +123,12 @@
+ 
+ #define DEFAULT_UBD { \
+ 	.file = 		NULL, \
+-	.is_dir =		0, \
+ 	.count =		0, \
+ 	.fd =			-1, \
+ 	.size =			-1, \
+ 	.boot_openflags =	OPEN_FLAGS, \
+ 	.openflags =		OPEN_FLAGS, \
++        .no_cow =               0, \
+         .cow =			DEFAULT_COW, \
+ }
+ 
+@@ -128,8 +136,10 @@
+ 
+ static int ubd0_init(void)
+ {
+-	if(ubd_dev[0].file == NULL)
+-		ubd_dev[0].file = "root_fs";
++	struct ubd *dev = &ubd_dev[0];
++
++	if(dev->file == NULL)
++		dev->file = "root_fs";
+ 	return(0);
+ }
+ 
+@@ -196,19 +206,39 @@
+ "    Create ide0 entries that map onto ubd devices.\n\n"
+ );
+ 
++static int parse_unit(char **ptr)
++{
++	char *str = *ptr, *end;
++	int n = -1;
++
++	if(isdigit(*str)) {
++		n = simple_strtoul(str, &end, 0);
++		if(end == str)
++			return(-1);
++		*ptr = end;
++	}
++	else if (('a' <= *str) && (*str <= 'h')) {
++		n = *str - 'a';
++		str++;
++		*ptr = str;
++	}
++	return(n);
++}
++
+ static int ubd_setup_common(char *str, int *index_out)
+ {
++	struct ubd *dev;
+ 	struct openflags flags = global_openflags;
+ 	char *backing_file;
+ 	int n, err;
+ 
+ 	if(index_out) *index_out = -1;
+-	n = *str++;
++	n = *str;
+ 	if(n == '='){
+-		static int fake_major_allowed = 1;
+ 		char *end;
+ 		int major;
+ 
++		str++;
+ 		if(!strcmp(str, "sync")){
+ 			global_openflags.s = 1;
+ 			return(0);
+@@ -220,20 +250,14 @@
+ 			return(1);
+ 		}
+ 
+-		if(!fake_major_allowed){
+-			printk(KERN_ERR "Can't assign a fake major twice\n");
+-			return(1);
+-		}
+-
+ 		err = 1;
+  		spin_lock(&ubd_lock);
+- 		if(!fake_major_allowed){
++ 		if(fake_major != MAJOR_NR){
+  			printk(KERN_ERR "Can't assign a fake major twice\n");
+  			goto out1;
+  		}
+  
+  		fake_major = major;
+-		fake_major_allowed = 0;
+ 
+ 		printk(KERN_INFO "Setting extra ubd major number to %d\n",
+ 		       major);
+@@ -243,25 +267,23 @@
+ 		return(err);
+ 	}
+ 
+-	if(n < '0'){
+-		printk(KERN_ERR "ubd_setup : index out of range\n"); }
+-
+-	if((n >= '0') && (n <= '9')) n -= '0';
+-	else if((n >= 'a') && (n <= 'z')) n -= 'a';
+-	else {
+-		printk(KERN_ERR "ubd_setup : device syntax invalid\n");
++	n = parse_unit(&str);
++	if(n < 0){
++		printk(KERN_ERR "ubd_setup : couldn't parse unit number "
++		       "'%s'\n", str);
+ 		return(1);
+ 	}
+ 	if(n >= MAX_DEV){
+-		printk(KERN_ERR "ubd_setup : index out of range "
+-		       "(%d devices)\n", MAX_DEV);	
++		printk(KERN_ERR "ubd_setup : index %d out of range "
++		       "(%d devices)\n", n, MAX_DEV);
+ 		return(1);
+ 	}
+ 
+ 	err = 1;
+ 	spin_lock(&ubd_lock);
+ 
+-	if(ubd_dev[n].file != NULL){
++	dev = &ubd_dev[n];
++	if(dev->file != NULL){
+ 		printk(KERN_ERR "ubd_setup : device already configured\n");
+ 		goto out2;
+ 	}
+@@ -276,6 +298,11 @@
+ 		flags.s = 1;
+ 		str++;
+ 	}
++	if (*str == 'd'){
++		dev->no_cow = 1;
++		str++;
++	}
++
+ 	if(*str++ != '='){
+ 		printk(KERN_ERR "ubd_setup : Expected '='\n");
+ 		goto out2;
+@@ -284,14 +311,17 @@
+ 	err = 0;
+ 	backing_file = strchr(str, ',');
+ 	if(backing_file){
+-		*backing_file = '\0';
+-		backing_file++;
++		if(dev->no_cow)
++			printk(KERN_ERR "Can't specify both 'd' and a "
++			       "cow file\n");
++		else {
++			*backing_file = '\0';
++			backing_file++;
++		}
+ 	}
+-	ubd_dev[n].file = str;
+-	if(ubd_is_dir(ubd_dev[n].file))
+-		ubd_dev[n].is_dir = 1;
+-	ubd_dev[n].cow.file = backing_file;
+-	ubd_dev[n].boot_openflags = flags;
++	dev->file = str;
++	dev->cow.file = backing_file;
++	dev->boot_openflags = flags;
+  out2:
+ 	spin_unlock(&ubd_lock);
+ 	return(err);
+@@ -321,8 +351,7 @@
+ static int fakehd_set = 0;
+ static int fakehd(char *str)
+ {
+-	printk(KERN_INFO 
+-	       "fakehd : Changing ubd name to \"hd\".\n");
++	printk(KERN_INFO "fakehd : Changing ubd name to \"hd\".\n");
+ 	fakehd_set = 1;
+ 	return 1;
+ }
+@@ -391,9 +420,10 @@
+ 	do_ubd_request(ubd_queue);
+ }
+ 
+-static void ubd_intr(int irq, void *dev, struct pt_regs *unused)
++static irqreturn_t ubd_intr(int irq, void *dev, struct pt_regs *unused)
+ {
+ 	ubd_handler();
++	return(IRQ_HANDLED);
+ }
+ 
+ /* Only changed by ubd_init, which is an initcall. */
+@@ -429,16 +459,18 @@
+ static int ubd_open_dev(struct ubd *dev)
+ {
+ 	struct openflags flags;
+-	int err, n, create_cow, *create_ptr;
++	char **back_ptr;
++	int err, create_cow, *create_ptr;
+ 
++	dev->openflags = dev->boot_openflags;
+ 	create_cow = 0;
+ 	create_ptr = (dev->cow.file != NULL) ? &create_cow : NULL;
+-	dev->fd = open_ubd_file(dev->file, &dev->openflags, &dev->cow.file,
++	back_ptr = dev->no_cow ? NULL : &dev->cow.file;
++	dev->fd = open_ubd_file(dev->file, &dev->openflags, back_ptr,
+ 				&dev->cow.bitmap_offset, &dev->cow.bitmap_len, 
+ 				&dev->cow.data_offset, create_ptr);
+ 
+ 	if((dev->fd == -ENOENT) && create_cow){
+-		n = dev - ubd_dev;
+ 		dev->fd = create_cow_file(dev->file, dev->cow.file, 
+ 					  dev->openflags, 1 << 9,
+ 					  &dev->cow.bitmap_offset, 
+@@ -455,7 +487,10 @@
+ 	if(dev->cow.file != NULL){
+ 		err = -ENOMEM;
+ 		dev->cow.bitmap = (void *) vmalloc(dev->cow.bitmap_len);
+-		if(dev->cow.bitmap == NULL) goto error;
++		if(dev->cow.bitmap == NULL){
++			printk(KERN_ERR "Failed to vmalloc COW bitmap\n");
++			goto error;
++		}
+ 		flush_tlb_kernel_vm();
+ 
+ 		err = read_cow_bitmap(dev->fd, dev->cow.bitmap, 
+@@ -481,17 +516,31 @@
+ 			
+ {
+ 	struct gendisk *disk;
++	char from[sizeof("ubd/nnnnn\0")], to[sizeof("discnnnnn/disc\0")];
++	int err;
+ 
+ 	disk = alloc_disk(1 << UBD_SHIFT);
+-	if (!disk)
+-		return -ENOMEM;
++	if(disk == NULL)
++		return(-ENOMEM);
+ 
+ 	disk->major = major;
+ 	disk->first_minor = unit << UBD_SHIFT;
+ 	disk->fops = &ubd_blops;
+ 	set_capacity(disk, size / 512);
+-	sprintf(disk->disk_name, "ubd");
+-	sprintf(disk->devfs_name, "ubd/disc%d", unit);
++	if(major == MAJOR_NR){
++		sprintf(disk->disk_name, "ubd%d", unit);
++		sprintf(disk->devfs_name, "ubd/disc%d", unit);
++		sprintf(from, "ubd/%d", unit);
++		sprintf(to, "disc%d/disc", unit);
++		err = devfs_mk_symlink(from, to);
++		if(err)
++			printk("ubd_new_disk failed to make link from %s to "
++			       "%s, error = %d\n", from, to, err);
++	}
++	else {
++		sprintf(disk->disk_name, "ubd_fake%d", unit);
++		sprintf(disk->devfs_name, "ubd_fake/disc%d", unit);
++	}
+ 
+ 	disk->private_data = &ubd_dev[unit];
+ 	disk->queue = ubd_queue;
+@@ -506,10 +555,7 @@
+ 	struct ubd *dev = &ubd_dev[n];
+ 	int err;
+ 
+-	if(dev->is_dir)
+-		return(-EISDIR);
+-
+-	if (!dev->file)
++	if(dev->file == NULL)
+ 		return(-ENODEV);
+ 
+ 	if (ubd_open_dev(dev))
+@@ -523,7 +569,7 @@
+ 	if(err) 
+ 		return(err);
+  
+-	if(fake_major)
++	if(fake_major != MAJOR_NR)
+ 		ubd_new_disk(fake_major, dev->size, n, 
+ 			     &fake_gendisk[n]);
+ 
+@@ -561,42 +607,42 @@
+ 	return(err);
+ }
+ 
+-static int ubd_get_config(char *dev, char *str, int size, char **error_out)
++static int ubd_get_config(char *name, char *str, int size, char **error_out)
+ {
+-	struct ubd *ubd;
++	struct ubd *dev;
+ 	char *end;
+-	int major, n = 0;
++	int n, len = 0;
+ 
+-	major = simple_strtoul(dev, &end, 0);
+-	if((*end != '\0') || (end == dev)){
+-		*error_out = "ubd_get_config : didn't parse major number";
++	n = simple_strtoul(name, &end, 0);
++	if((*end != '\0') || (end == name)){
++		*error_out = "ubd_get_config : didn't parse device number";
+ 		return(-1);
+ 	}
+ 
+-	if((major >= MAX_DEV) || (major < 0)){
+-		*error_out = "ubd_get_config : major number out of range";
++	if((n >= MAX_DEV) || (n < 0)){
++		*error_out = "ubd_get_config : device number out of range";
+ 		return(-1);
+ 	}
+ 
+-	ubd = &ubd_dev[major];
++	dev = &ubd_dev[n];
+ 	spin_lock(&ubd_lock);
+ 
+-	if(ubd->file == NULL){
+-		CONFIG_CHUNK(str, size, n, "", 1);
++	if(dev->file == NULL){
++		CONFIG_CHUNK(str, size, len, "", 1);
+ 		goto out;
+ 	}
+ 
+-	CONFIG_CHUNK(str, size, n, ubd->file, 0);
++	CONFIG_CHUNK(str, size, len, dev->file, 0);
+ 
+-	if(ubd->cow.file != NULL){
+-		CONFIG_CHUNK(str, size, n, ",", 0);
+-		CONFIG_CHUNK(str, size, n, ubd->cow.file, 1);
++	if(dev->cow.file != NULL){
++		CONFIG_CHUNK(str, size, len, ",", 0);
++		CONFIG_CHUNK(str, size, len, dev->cow.file, 1);
+ 	}
+-	else CONFIG_CHUNK(str, size, n, "", 1);
++	else CONFIG_CHUNK(str, size, len, "", 1);
+ 
+  out:
+ 	spin_unlock(&ubd_lock);
+-	return(n);
++	return(len);
+ }
+ 
+ static int ubd_remove(char *str)
+@@ -604,11 +650,9 @@
+ 	struct ubd *dev;
+ 	int n, err = -ENODEV;
+ 
+-	if(!isdigit(*str))
+-		return(err);	/* it should be a number 0-7/a-h */
++	n = parse_unit(&str);
+ 
+-	n = *str - '0';
+-	if(n >= MAX_DEV) 
++	if((n < 0) || (n >= MAX_DEV))
+ 		return(err);
+ 
+ 	dev = &ubd_dev[n];
+@@ -669,7 +713,7 @@
+ 		
+ 	elevator_init(ubd_queue, &elevator_noop);
+ 
+-	if (fake_major != 0) {
++	if (fake_major != MAJOR_NR) {
+ 		char name[sizeof("ubd_nnn\0")];
+ 
+ 		snprintf(name, sizeof(name), "ubd_%d", fake_major);
+@@ -714,15 +758,9 @@
+ {
+ 	struct gendisk *disk = inode->i_bdev->bd_disk;
+ 	struct ubd *dev = disk->private_data;
+-	int err = -EISDIR;
+-
+-	if(dev->is_dir == 1)
+-		goto out;
++	int err = 0;
+ 
+-	err = 0;
+ 	if(dev->count == 0){
+-		dev->openflags = dev->boot_openflags;
+-
+ 		err = ubd_open_dev(dev);
+ 		if(err){
+ 			printk(KERN_ERR "%s: Can't open \"%s\": errno = %d\n",
+@@ -796,15 +834,6 @@
+ 
+ 	if(req->rq_status == RQ_INACTIVE) return(1);
+ 
+-	if(dev->is_dir){
+-		strcpy(req->buffer, "HOSTFS:");
+-		strcat(req->buffer, dev->file);
+- 		spin_lock(&ubd_io_lock);
+-		end_request(req, 1);
+- 		spin_unlock(&ubd_io_lock);
+-		return(1);
+-	}
+-
+ 	if((rq_data_dir(req) == WRITE) && !dev->openflags.w){
+ 		printk("Write attempted on readonly ubd device %s\n", 
+ 		       disk->disk_name);
+diff -Naur a/arch/um/drivers/ubd_user.c b/arch/um/drivers/ubd_user.c
+--- a/arch/um/drivers/ubd_user.c	Tue Sep  9 16:41:52 2003
++++ b/arch/um/drivers/ubd_user.c	Tue Sep  9 16:47:57 2003
+@@ -24,142 +24,24 @@
+ #include "user.h"
+ #include "ubd_user.h"
+ #include "os.h"
++#include "cow.h"
+ 
+ #include <endian.h>
+ #include <byteswap.h>
+-#if __BYTE_ORDER == __BIG_ENDIAN
+-# define ntohll(x) (x)
+-# define htonll(x) (x)
+-#elif __BYTE_ORDER == __LITTLE_ENDIAN
+-# define ntohll(x)  bswap_64(x)
+-# define htonll(x)  bswap_64(x)
+-#else
+-#error "__BYTE_ORDER not defined"
+-#endif
+-
+-#define PATH_LEN_V1 256
+-
+-struct cow_header_v1 {
+-	int magic;
+-	int version;
+-	char backing_file[PATH_LEN_V1];
+-	time_t mtime;
+-	__u64 size;
+-	int sectorsize;
+-};
+-
+-#define PATH_LEN_V2 MAXPATHLEN
+-
+-struct cow_header_v2 {
+-	unsigned long magic;
+-	unsigned long version;
+-	char backing_file[PATH_LEN_V2];
+-	time_t mtime;
+-	__u64 size;
+-	int sectorsize;
+-};
+-
+-union cow_header {
+-	struct cow_header_v1 v1;
+-	struct cow_header_v2 v2;
+-};
+-
+-#define COW_MAGIC 0x4f4f4f4d  /* MOOO */
+-#define COW_VERSION 2
+-
+-static void sizes(__u64 size, int sectorsize, int bitmap_offset, 
+-		  unsigned long *bitmap_len_out, int *data_offset_out)
+-{
+-	*bitmap_len_out = (size + sectorsize - 1) / (8 * sectorsize);
+-
+-	*data_offset_out = bitmap_offset + *bitmap_len_out;
+-	*data_offset_out = (*data_offset_out + sectorsize - 1) / sectorsize;
+-	*data_offset_out *= sectorsize;
+-}
+-
+-static int read_cow_header(int fd, int *magic_out, char **backing_file_out, 
+-			   time_t *mtime_out, __u64 *size_out, 
+-			   int *sectorsize_out, int *bitmap_offset_out)
+-{
+-	union cow_header *header;
+-	char *file;
+-	int err, n;
+-	unsigned long version, magic;
+-
+-	header = um_kmalloc(sizeof(*header));
+-	if(header == NULL){
+-		printk("read_cow_header - Failed to allocate header\n");
+-		return(-ENOMEM);
+-	}
+-	err = -EINVAL;
+-	n = read(fd, header, sizeof(*header));
+-	if(n < offsetof(typeof(header->v1), backing_file)){
+-		printk("read_cow_header - short header\n");
+-		goto out;
+-	}
+-
+-	magic = header->v1.magic;
+-	if(magic == COW_MAGIC) {
+-		version = header->v1.version;
+-	}
+-	else if(magic == ntohl(COW_MAGIC)){
+-		version = ntohl(header->v1.version);
+-	}
+-	else goto out;
+-
+-	*magic_out = COW_MAGIC;
+-
+-	if(version == 1){
+-		if(n < sizeof(header->v1)){
+-			printk("read_cow_header - failed to read V1 header\n");
+-			goto out;
+-		}
+-		*mtime_out = header->v1.mtime;
+-		*size_out = header->v1.size;
+-		*sectorsize_out = header->v1.sectorsize;
+-		*bitmap_offset_out = sizeof(header->v1);
+-		file = header->v1.backing_file;
+-	}
+-	else if(version == 2){
+-		if(n < sizeof(header->v2)){
+-			printk("read_cow_header - failed to read V2 header\n");
+-			goto out;
+-		}
+-		*mtime_out = ntohl(header->v2.mtime);
+-		*size_out = ntohll(header->v2.size);
+-		*sectorsize_out = ntohl(header->v2.sectorsize);
+-		*bitmap_offset_out = sizeof(header->v2);
+-		file = header->v2.backing_file;
+-	}
+-	else {
+-		printk("read_cow_header - invalid COW version\n");
+-		goto out;
+-	}
+-	err = -ENOMEM;
+-	*backing_file_out = uml_strdup(file);
+-	if(*backing_file_out == NULL){
+-		printk("read_cow_header - failed to allocate backing file\n");
+-		goto out;
+-	}
+-	err = 0;
+- out:
+-	kfree(header);
+-	return(err);
+-}
+ 
+ static int same_backing_files(char *from_cmdline, char *from_cow, char *cow)
+ {
+-	struct stat buf1, buf2;
++	struct stat64 buf1, buf2;
+ 
+ 	if(from_cmdline == NULL) return(1);
+ 	if(!strcmp(from_cmdline, from_cow)) return(1);
+ 
+-	if(stat(from_cmdline, &buf1) < 0){
++	if(stat64(from_cmdline, &buf1) < 0){
+ 		printk("Couldn't stat '%s', errno = %d\n", from_cmdline, 
+ 		       errno);
+ 		return(1);
+ 	}
+-	if(stat(from_cow, &buf2) < 0){
++	if(stat64(from_cow, &buf2) < 0){
+ 		printk("Couldn't stat '%s', errno = %d\n", from_cow, errno);
+ 		return(1);
+ 	}
+@@ -215,118 +97,6 @@
+ 	return(0);
+ }
+ 
+-static int absolutize(char *to, int size, char *from)
+-{
+-	char save_cwd[256], *slash;
+-	int remaining;
+-
+-	if(getcwd(save_cwd, sizeof(save_cwd)) == NULL) {
+-		printk("absolutize : unable to get cwd - errno = %d\n", errno);
+-		return(-1);
+-	}
+-	slash = strrchr(from, '/');
+-	if(slash != NULL){
+-		*slash = '\0';
+-		if(chdir(from)){
+-			*slash = '/';
+-			printk("absolutize : Can't cd to '%s' - errno = %d\n",
+-			       from, errno);
+-			return(-1);
+-		}
+-		*slash = '/';
+-		if(getcwd(to, size) == NULL){
+-			printk("absolutize : unable to get cwd of '%s' - "
+-			       "errno = %d\n", from, errno);
+-			return(-1);
+-		}
+-		remaining = size - strlen(to);
+-		if(strlen(slash) + 1 > remaining){
+-			printk("absolutize : unable to fit '%s' into %d "
+-			       "chars\n", from, size);
+-			return(-1);
+-		}
+-		strcat(to, slash);
+-	}
+-	else {
+-		if(strlen(save_cwd) + 1 + strlen(from) + 1 > size){
+-			printk("absolutize : unable to fit '%s' into %d "
+-			       "chars\n", from, size);
+-			return(-1);
+-		}
+-		strcpy(to, save_cwd);
+-		strcat(to, "/");
+-		strcat(to, from);
+-	}
+-	chdir(save_cwd);
+-	return(0);
+-}
+-
+-static int write_cow_header(char *cow_file, int fd, char *backing_file, 
+-			    int sectorsize, long long *size)
+-{
+-        struct cow_header_v2 *header;
+-	struct stat64 buf;
+-	int err;
+-
+-	err = os_seek_file(fd, 0);
+-	if(err != 0){
+-		printk("write_cow_header - lseek failed, errno = %d\n", errno);
+-		return(-errno);
+-	}
+-
+-	err = -ENOMEM;
+-	header = um_kmalloc(sizeof(*header));
+-	if(header == NULL){
+-		printk("Failed to allocate COW V2 header\n");
+-		goto out;
+-	}
+-	header->magic = htonl(COW_MAGIC);
+-	header->version = htonl(COW_VERSION);
+-
+-	err = -EINVAL;
+-	if(strlen(backing_file) > sizeof(header->backing_file) - 1){
+-		printk("Backing file name \"%s\" is too long - names are "
+-		       "limited to %d characters\n", backing_file, 
+-		       sizeof(header->backing_file) - 1);
+-		goto out_free;
+-	}
+-
+-	if(absolutize(header->backing_file, sizeof(header->backing_file), 
+-		      backing_file))
+-		goto out_free;
+-
+-	err = stat64(header->backing_file, &buf);
+-	if(err < 0){
+-		printk("Stat of backing file '%s' failed, errno = %d\n",
+-		       header->backing_file, errno);
+-		err = -errno;
+-		goto out_free;
+-	}
+-
+-	err = os_file_size(header->backing_file, size);
+-	if(err){
+-		printk("Couldn't get size of backing file '%s', errno = %d\n",
+-		       header->backing_file, -*size);
+-		goto out_free;
+-	}
+-
+-	header->mtime = htonl(buf.st_mtime);
+-	header->size = htonll(*size);
+-	header->sectorsize = htonl(sectorsize);
+-
+-	err = write(fd, header, sizeof(*header));
+-	if(err != sizeof(*header)){
+-		printk("Write of header to new COW file '%s' failed, "
+-		       "errno = %d\n", cow_file, errno);
+-		goto out_free;
+-	}
+-	err = 0;
+- out_free:
+-	kfree(header);
+- out:
+-	return(err);
+-}
+-
+ int open_ubd_file(char *file, struct openflags *openflags, 
+ 		  char **backing_file_out, int *bitmap_offset_out, 
+ 		  unsigned long *bitmap_len_out, int *data_offset_out, 
+@@ -346,10 +116,17 @@
+                 if((fd = os_open_file(file, *openflags, mode)) < 0) 
+ 			return(fd);
+         }
++
++	err = os_lock_file(fd, openflags->w);
++	if(err){
++		printk("Failed to lock '%s', errno = %d\n", file, -err);
++		goto error;
++	}
++	
+ 	if(backing_file_out == NULL) return(fd);
+ 
+-	err = read_cow_header(fd, &magic, &backing_file, &mtime, &size, 
+-			      &sectorsize, bitmap_offset_out);
++	err = read_cow_header(file_reader, &fd, &magic, &backing_file, &mtime, 
++			      &size, &sectorsize, bitmap_offset_out);
+ 	if(err && (*backing_file_out != NULL)){
+ 		printk("Failed to read COW header from COW file \"%s\", "
+ 		       "errno = %d\n", file, err);
+@@ -376,12 +153,12 @@
+ 		if(err) goto error;
+ 	}
+ 
+-	sizes(size, sectorsize, *bitmap_offset_out, bitmap_len_out, 
+-	      data_offset_out);
++	cow_sizes(size, sectorsize, *bitmap_offset_out, bitmap_len_out, 
++		  data_offset_out);
+ 
+         return(fd);
+  error:
+-	close(fd);
++	os_close_file(fd);
+ 	return(err);
+ }
+ 
+@@ -389,10 +166,7 @@
+ 		    int sectorsize, int *bitmap_offset_out, 
+ 		    unsigned long *bitmap_len_out, int *data_offset_out)
+ {
+-	__u64 blocks;
+-	long zero;
+-	int err, fd, i;
+-	long long size;
++	int err, fd;
+ 
+ 	flags.c = 1;
+ 	fd = open_ubd_file(cow_file, &flags, NULL, NULL, NULL, NULL, NULL);
+@@ -403,29 +177,12 @@
+ 		goto out;
+ 	}
+ 
+-	err = write_cow_header(cow_file, fd, backing_file, sectorsize, &size);
+-	if(err) goto out_close;
+-
+-	blocks = (size + sectorsize - 1) / sectorsize;
+-	blocks = (blocks + sizeof(long) * 8 - 1) / (sizeof(long) * 8);
+-	zero = 0;
+-	for(i = 0; i < blocks; i++){
+-		err = write(fd, &zero, sizeof(zero));
+-		if(err != sizeof(zero)){
+-			printk("Write of bitmap to new COW file '%s' failed, "
+-			       "errno = %d\n", cow_file, errno);
+-			goto out_close;
+-		}
+-	}
+-
+-	sizes(size, sectorsize, sizeof(struct cow_header_v2), 
+-	      bitmap_len_out, data_offset_out);
+-	*bitmap_offset_out = sizeof(struct cow_header_v2);
+-
+-	return(fd);
+-
+- out_close:
+-	close(fd);
++	err = init_cow_file(fd, cow_file, backing_file, sectorsize, 
++			    bitmap_offset_out, bitmap_len_out, 
++			    data_offset_out);
++	if(!err)
++		return(fd);
++	os_close_file(fd);
+  out:
+ 	return(err);
+ }
+@@ -448,14 +205,6 @@
+ 	else return(n);
+ }
+ 
+-int ubd_is_dir(char *file)
+-{
+-	struct stat64 buf;
+-
+-	if(stat64(file, &buf) < 0) return(0);
+-	return(S_ISDIR(buf.st_mode));
+-}
+-
+ void do_io(struct io_thread_req *req)
+ {
+ 	char *buf;
+diff -Naur a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c
+--- a/arch/um/drivers/xterm.c	Tue Sep  9 16:41:17 2003
++++ b/arch/um/drivers/xterm.c	Tue Sep  9 16:47:27 2003
+@@ -108,7 +108,7 @@
+ 	}
+ 	close(fd);
+ 
+-	fd = create_unix_socket(file, sizeof(file));
++	fd = create_unix_socket(file, sizeof(file), 1);
+ 	if(fd < 0){
+ 		printk("xterm_open : create_unix_socket failed, errno = %d\n", 
+ 		       -fd);
+diff -Naur a/arch/um/drivers/xterm_kern.c b/arch/um/drivers/xterm_kern.c
+--- a/arch/um/drivers/xterm_kern.c	Tue Sep  9 16:45:16 2003
++++ b/arch/um/drivers/xterm_kern.c	Tue Sep  9 16:50:00 2003
+@@ -5,9 +5,12 @@
+ 
+ #include "linux/errno.h"
+ #include "linux/slab.h"
++#include "linux/signal.h"
++#include "linux/interrupt.h"
+ #include "asm/semaphore.h"
+ #include "asm/irq.h"
+ #include "irq_user.h"
++#include "irq_kern.h"
+ #include "kern_util.h"
+ #include "os.h"
+ #include "xterm.h"
+@@ -19,17 +22,18 @@
+ 	int new_fd;
+ };
+ 
+-static void xterm_interrupt(int irq, void *data, struct pt_regs *regs)
++static irqreturn_t xterm_interrupt(int irq, void *data, struct pt_regs *regs)
+ {
+ 	struct xterm_wait *xterm = data;
+ 	int fd;
+ 
+ 	fd = os_rcv_fd(xterm->fd, &xterm->pid);
+ 	if(fd == -EAGAIN)
+-		return;
++		return(IRQ_NONE);
+ 
+ 	xterm->new_fd = fd;
+ 	up(&xterm->sem);
++	return(IRQ_HANDLED);
+ }
+ 
+ int xterm_fd(int socket, int *pid_out)
+diff -Naur a/arch/um/dyn.lds.S b/arch/um/dyn.lds.S
+--- a/arch/um/dyn.lds.S	Tue Sep  9 16:43:23 2003
++++ b/arch/um/dyn.lds.S	Tue Sep  9 16:49:04 2003
+@@ -15,7 +15,11 @@
+   . = ALIGN(4096);		/* Init code and data */
+   _stext = .;
+   __init_begin = .;
+-  .text.init : { *(.text.init) }
++  .init.text : { 
++	_sinittext = .;
++	*(.init.text)
++	_einittext = .;
++  }
+ 
+   . = ALIGN(4096);
+ 
+@@ -67,7 +71,7 @@
+ 
+   #include "asm/common.lds.S"
+ 
+-  .data.init : { *(.data.init) }
++  init.data : { *(.init.data) }
+ 
+   /* Ensure the __preinit_array_start label is properly aligned.  We
+      could instead move the label definition inside the section, but
+diff -Naur a/arch/um/include/irq_kern.h b/arch/um/include/irq_kern.h
+--- a/arch/um/include/irq_kern.h	Wed Dec 31 19:00:00 1969
++++ b/arch/um/include/irq_kern.h	Tue Sep  9 16:48:56 2003
+@@ -0,0 +1,28 @@
++/* 
++ * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
++ * Licensed under the GPL
++ */
++
++#ifndef __IRQ_KERN_H__
++#define __IRQ_KERN_H__
++
++#include "linux/interrupt.h"
++
++extern int um_request_irq(unsigned int irq, int fd, int type,
++			  irqreturn_t (*handler)(int, void *, 
++						 struct pt_regs *),
++			  unsigned long irqflags,  const char * devname,
++			  void *dev_id);
++
++#endif
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/arch/um/include/kern_util.h b/arch/um/include/kern_util.h
+--- a/arch/um/include/kern_util.h	Tue Sep  9 16:42:24 2003
++++ b/arch/um/include/kern_util.h	Tue Sep  9 16:48:18 2003
+@@ -63,10 +63,9 @@
+ extern void *syscall_sp(void *t);
+ extern void syscall_trace(void);
+ extern int hz(void);
+-extern void idle_timer(void);
++extern void uml_idle_timer(void);
+ extern unsigned int do_IRQ(int irq, union uml_pt_regs *regs);
+ extern int external_pid(void *t);
+-extern int pid_to_processor_id(int pid);
+ extern void boot_timer_handler(int sig);
+ extern void interrupt_end(void);
+ extern void initial_thread_cb(void (*proc)(void *), void *arg);
+@@ -90,9 +89,7 @@
+ extern char *uml_strdup(char *string);
+ extern void unprotect_kernel_mem(void);
+ extern void protect_kernel_mem(void);
+-extern void set_kmem_end(unsigned long);
+ extern void uml_cleanup(void);
+-extern int pid_to_processor_id(int pid);
+ extern void set_current(void *t);
+ extern void lock_signalled_task(void *t);
+ extern void IPI_handler(int cpu);
+@@ -101,7 +98,9 @@
+ extern int clear_user_proc(void *buf, int size);
+ extern int copy_to_user_proc(void *to, void *from, int size);
+ extern int copy_from_user_proc(void *to, void *from, int size);
++extern int strlen_user_proc(char *str);
+ extern void bus_handler(int sig, union uml_pt_regs *regs);
++extern void winch(int sig, union uml_pt_regs *regs);
+ extern long execute_syscall(void *r);
+ extern int smp_sigio_handler(void);
+ extern void *get_current(void);
+diff -Naur a/arch/um/include/line.h b/arch/um/include/line.h
+--- a/arch/um/include/line.h	Tue Sep  9 16:45:29 2003
++++ b/arch/um/include/line.h	Tue Sep  9 16:50:05 2003
+@@ -9,12 +9,14 @@
+ #include "linux/list.h"
+ #include "linux/workqueue.h"
+ #include "linux/tty.h"
++#include "linux/interrupt.h"
+ #include "asm/semaphore.h"
+ #include "chan_user.h"
+ #include "mconsole_kern.h"
+ 
+ struct line_driver {
+ 	char *name;
++	char *device_name;
+ 	char *devfs_name;
+ 	short major;
+ 	short minor_start;
+@@ -67,8 +69,9 @@
+ 
+ #define LINES_INIT(n) {  num :		n }
+ 
+-extern void line_interrupt(int irq, void *data, struct pt_regs *unused);
+-extern void line_write_interrupt(int irq, void *data, struct pt_regs *unused);
++extern irqreturn_t line_interrupt(int irq, void *data, struct pt_regs *unused);
++extern irqreturn_t line_write_interrupt(int irq, void *data, 
++					struct pt_regs *unused);
+ extern void line_close(struct line *lines, struct tty_struct *tty);
+ extern int line_open(struct line *lines, struct tty_struct *tty, 
+ 		     struct chan_opts *opts);
+diff -Naur a/arch/um/include/mconsole.h b/arch/um/include/mconsole.h
+--- a/arch/um/include/mconsole.h	Tue Sep  9 16:42:56 2003
++++ b/arch/um/include/mconsole.h	Tue Sep  9 16:48:27 2003
+@@ -77,6 +77,7 @@
+ extern void mconsole_cad(struct mc_request *req);
+ extern void mconsole_stop(struct mc_request *req);
+ extern void mconsole_go(struct mc_request *req);
++extern void mconsole_log(struct mc_request *req);
+ 
+ extern int mconsole_get_request(int fd, struct mc_request *req);
+ extern int mconsole_notify(char *sock_name, int type, const void *data, 
+diff -Naur a/arch/um/include/mem.h b/arch/um/include/mem.h
+--- a/arch/um/include/mem.h	Tue Sep  9 16:46:13 2003
++++ b/arch/um/include/mem.h	Tue Sep  9 16:51:14 2003
+@@ -13,7 +13,6 @@
+ };
+ 
+ extern void set_usable_vm(unsigned long start, unsigned long end);
+-extern void set_kmem_end(unsigned long new);
+ 
+ #endif
+ 
+diff -Naur a/arch/um/include/mem_user.h b/arch/um/include/mem_user.h
+--- a/arch/um/include/mem_user.h	Tue Sep  9 16:43:56 2003
++++ b/arch/um/include/mem_user.h	Tue Sep  9 16:49:29 2003
+@@ -51,9 +51,6 @@
+ 
+ extern int init_mem_user(void);
+ extern int create_mem_file(unsigned long len);
+-extern void setup_range(int fd, char *driver, unsigned long start,
+-			unsigned long pfn, unsigned long total, int need_vm, 
+-			struct mem_region *region, void *reserved);
+ extern void setup_memory(void *entry);
+ extern unsigned long find_iomem(char *driver, unsigned long *len_out);
+ extern int init_maps(struct mem_region *region);
+diff -Naur a/arch/um/include/os.h b/arch/um/include/os.h
+--- a/arch/um/include/os.h	Tue Sep  9 16:41:47 2003
++++ b/arch/um/include/os.h	Tue Sep  9 16:47:55 2003
+@@ -103,10 +103,11 @@
+ extern int os_shutdown_socket(int fd, int r, int w);
+ extern void os_close_file(int fd);
+ extern int os_rcv_fd(int fd, int *helper_pid_out);
+-extern int create_unix_socket(char *file, int len);
++extern int create_unix_socket(char *file, int len, int close_on_exec);
+ extern int os_connect_socket(char *name);
+ extern int os_file_type(char *file);
+ extern int os_file_mode(char *file, struct openflags *mode_out);
++extern int os_lock_file(int fd, int excl);
+ 
+ extern unsigned long os_process_pc(int pid);
+ extern int os_process_parent(int pid);
+@@ -120,6 +121,7 @@
+ extern int os_protect_memory(void *addr, unsigned long len, 
+ 			     int r, int w, int x);
+ extern int os_unmap_memory(void *addr, int len);
++extern void os_flush_stdout(void);
+ 
+ #endif
+ 
+diff -Naur a/arch/um/include/sysdep-i386/sigcontext.h b/arch/um/include/sysdep-i386/sigcontext.h
+--- a/arch/um/include/sysdep-i386/sigcontext.h	Tue Sep  9 16:45:13 2003
++++ b/arch/um/include/sysdep-i386/sigcontext.h	Tue Sep  9 16:49:58 2003
+@@ -28,8 +28,8 @@
+  */
+ #define SC_START_SYSCALL(sc) do SC_EAX(sc) = -ENOSYS; while(0)
+ 
+-/* These are General Protection and Page Fault */
+-#define SEGV_IS_FIXABLE(trap) ((trap == 13) || (trap == 14))
++/* This is Page Fault */
++#define SEGV_IS_FIXABLE(trap) (trap == 14)
+ 
+ #define SC_SEGV_IS_FIXABLE(sc) (SEGV_IS_FIXABLE(SC_TRAPNO(sc)))
+ 
+diff -Naur a/arch/um/include/ubd_user.h b/arch/um/include/ubd_user.h
+--- a/arch/um/include/ubd_user.h	Tue Sep  9 16:43:28 2003
++++ b/arch/um/include/ubd_user.h	Tue Sep  9 16:49:08 2003
+@@ -39,7 +39,6 @@
+ extern int write_ubd_fs(int fd, char *buffer, int len);
+ extern int start_io_thread(unsigned long sp, int *fds_out);
+ extern void do_io(struct io_thread_req *req);
+-extern int ubd_is_dir(char *file);
+ 
+ static inline int ubd_test_bit(__u64 bit, unsigned char *data)
+ {
+diff -Naur a/arch/um/include/user.h b/arch/um/include/user.h
+--- a/arch/um/include/user.h	Tue Sep  9 16:41:16 2003
++++ b/arch/um/include/user.h	Tue Sep  9 16:47:26 2003
+@@ -14,7 +14,7 @@
+ extern void kfree(void *ptr);
+ extern int in_aton(char *str);
+ extern int open_gdb_chan(void);
+-
++extern int strlcpy(char *, const char *, int);
+ #endif
+ 
+ /*
+diff -Naur a/arch/um/include/user_util.h b/arch/um/include/user_util.h
+--- a/arch/um/include/user_util.h	Tue Sep  9 16:41:34 2003
++++ b/arch/um/include/user_util.h	Tue Sep  9 16:47:39 2003
+@@ -59,7 +59,6 @@
+ extern void *add_signal_handler(int sig, void (*handler)(int));
+ extern int start_fork_tramp(void *arg, unsigned long temp_stack, 
+ 			    int clone_flags, int (*tramp)(void *));
+-extern int clone_and_wait(int (*fn)(void *), void *arg, void *sp, int flags);
+ extern int linux_main(int argc, char **argv);
+ extern void set_cmdline(char *cmd);
+ extern void input_cb(void (*proc)(void *), void *arg, int arg_len);
+@@ -90,7 +89,8 @@
+ extern int arch_fixup(unsigned long address, void *sc_ptr);
+ extern void forward_pending_sigio(int target);
+ extern int can_do_skas(void);
+- 
++extern void arch_init_thread(void);
++
+ #endif
+ 
+ /*
+diff -Naur a/arch/um/kernel/Makefile b/arch/um/kernel/Makefile
+--- a/arch/um/kernel/Makefile	Tue Sep  9 16:44:02 2003
++++ b/arch/um/kernel/Makefile	Tue Sep  9 16:49:30 2003
+@@ -21,6 +21,8 @@
+ obj-$(CONFIG_MODE_TT) += tt/
+ obj-$(CONFIG_MODE_SKAS) += skas/
+ 
++clean-files	:= config.c
++
+ user-objs-$(CONFIG_TTY_LOG) += tty_log.o
+ 
+ USER_OBJS := $(filter %_user.o,$(obj-y))  $(user-objs-y) config.o helper.o \
+@@ -45,17 +47,13 @@
+ $(obj)/frame.o: $(src)/frame.c
+ 	$(CC) $(CFLAGS_$(notdir $@)) -c -o $@ $<
+ 
+-QUOTE = 'my $$config=`cat $(TOPDIR)/.config`; $$config =~ s/"/\\"/g ; while(<STDIN>) { $$_ =~ s/CONFIG/$$config/; print $$_ }'
++QUOTE = 'my $$config=`cat $(TOPDIR)/.config`; $$config =~ s/"/\\"/g ; $$config =~ s/\n/\\n"\n"/g ; while(<STDIN>) { $$_ =~ s/CONFIG/$$config/; print $$_ }'
+ 
+ $(obj)/config.c : $(src)/config.c.in $(TOPDIR)/.config
+ 	$(PERL) -e $(QUOTE) < $(src)/config.c.in > $@
+ 
+ $(obj)/config.o : $(obj)/config.c
+ 
+-clean:
+-	rm -f config.c
+-	for dir in $(subdir-y) ; do $(MAKE) -C $$dir clean; done
+-
+ modules:
+ 
+ fastdep:
+diff -Naur a/arch/um/kernel/config.c.in b/arch/um/kernel/config.c.in
+--- a/arch/um/kernel/config.c.in	Tue Sep  9 16:45:16 2003
++++ b/arch/um/kernel/config.c.in	Tue Sep  9 16:50:00 2003
+@@ -7,9 +7,7 @@
+ #include <stdlib.h>
+ #include "init.h"
+ 
+-static __initdata char *config = "
+-CONFIG
+-";
++static __initdata char *config = "CONFIG";
+ 
+ static int __init print_config(char *line, int *add)
+ {
+diff -Naur a/arch/um/kernel/exec_kern.c b/arch/um/kernel/exec_kern.c
+--- a/arch/um/kernel/exec_kern.c	Tue Sep  9 16:41:55 2003
++++ b/arch/um/kernel/exec_kern.c	Tue Sep  9 16:48:00 2003
+@@ -32,10 +32,15 @@
+ 	CHOOSE_MODE_PROC(start_thread_tt, start_thread_skas, regs, eip, esp);
+ }
+ 
++extern void log_exec(char **argv, void *tty);
++
+ static int execve1(char *file, char **argv, char **env)
+ {
+         int error;
+ 
++#ifdef CONFIG_TTY_LOG
++	log_exec(argv, current->tty);
++#endif
+         error = do_execve(file, argv, env, &current->thread.regs);
+         if (error == 0){
+                 current->ptrace &= ~PT_DTRACE;
+diff -Naur a/arch/um/kernel/init_task.c b/arch/um/kernel/init_task.c
+--- a/arch/um/kernel/init_task.c	Tue Sep  9 16:46:17 2003
++++ b/arch/um/kernel/init_task.c	Tue Sep  9 16:51:23 2003
+@@ -17,6 +17,7 @@
+ struct mm_struct init_mm = INIT_MM(init_mm);
+ static struct files_struct init_files = INIT_FILES;
+ static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
++static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
+ 
+ /*
+  * Initial task structure.
+@@ -38,26 +39,12 @@
+ __attribute__((__section__(".data.init_task"))) = 
+ { INIT_THREAD_INFO(init_task) };
+ 
+-struct task_struct *alloc_task_struct(void)
+-{
+-	return((struct task_struct *) 
+-	       __get_free_pages(GFP_KERNEL, CONFIG_KERNEL_STACK_ORDER));
+-}
+-
+ void unprotect_stack(unsigned long stack)
+ {
+ 	protect_memory(stack, (1 << CONFIG_KERNEL_STACK_ORDER) * PAGE_SIZE, 
+ 		       1, 1, 0, 1);
+ }
+ 
+-void free_task_struct(struct task_struct *task)
+-{
+-	/* free_pages decrements the page counter and only actually frees
+-	 * the pages if they are now not accessed by anything.
+-	 */
+-	free_pages((unsigned long) task, CONFIG_KERNEL_STACK_ORDER);
+-}
+-
+ /*
+  * Overrides for Emacs so that we follow Linus's tabbing style.
+  * Emacs will notice this stuff at the end of the file and automatically
+diff -Naur a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
+--- a/arch/um/kernel/irq.c	Tue Sep  9 16:45:47 2003
++++ b/arch/um/kernel/irq.c	Tue Sep  9 16:50:14 2003
+@@ -28,6 +28,7 @@
+ #include "user_util.h"
+ #include "kern_util.h"
+ #include "irq_user.h"
++#include "irq_kern.h"
+ 
+ static void register_irq_proc (unsigned int irq);
+ 
+@@ -82,65 +83,52 @@
+ 	end_none
+ };
+ 
+-/* Not changed */
+-volatile unsigned long irq_err_count;
+-
+ /*
+  * Generic, controller-independent functions:
+  */
+ 
+-int get_irq_list(char *buf)
++int show_interrupts(struct seq_file *p, void *v)
+ {
+ 	int i, j;
+-	unsigned long flags;
+ 	struct irqaction * action;
+-	char *p = buf;
++	unsigned long flags;
+ 
+-	p += sprintf(p, "           ");
+-	for (j=0; j<num_online_cpus(); j++)
+-		p += sprintf(p, "CPU%d       ",j);
+-	*p++ = '\n';
++	seq_printf(p, "           ");
++	for (j=0; j<NR_CPUS; j++)
++		if (cpu_online(j))
++			seq_printf(p, "CPU%d       ",j);
++	seq_putc(p, '\n');
+ 
+ 	for (i = 0 ; i < NR_IRQS ; i++) {
+ 		spin_lock_irqsave(&irq_desc[i].lock, flags);
+ 		action = irq_desc[i].action;
+ 		if (!action) 
+-			goto end;
+-		p += sprintf(p, "%3d: ",i);
++			goto skip;
++		seq_printf(p, "%3d: ",i);
+ #ifndef CONFIG_SMP
+-		p += sprintf(p, "%10u ", kstat_irqs(i));
++		seq_printf(p, "%10u ", kstat_irqs(i));
+ #else
+-		for (j = 0; j < num_online_cpus(); j++)
+-			p += sprintf(p, "%10u ",
+-				kstat_cpu(cpu_logical_map(j)).irqs[i]);
++		for (j = 0; j < NR_CPUS; j++)
++			if (cpu_online(j))
++				seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
+ #endif
+-		p += sprintf(p, " %14s", irq_desc[i].handler->typename);
+-		p += sprintf(p, "  %s", action->name);
++		seq_printf(p, " %14s", irq_desc[i].handler->typename);
++		seq_printf(p, "  %s", action->name);
+ 
+ 		for (action=action->next; action; action = action->next)
+-			p += sprintf(p, ", %s", action->name);
+-		*p++ = '\n';
+-	end:
++			seq_printf(p, ", %s", action->name);
++
++		seq_putc(p, '\n');
++skip:
+ 		spin_unlock_irqrestore(&irq_desc[i].lock, flags);
+ 	}
+-	p += sprintf(p, "\n");
+-#ifdef notdef
+-#ifdef CONFIG_SMP
+-	p += sprintf(p, "LOC: ");
+-	for (j = 0; j < num_online_cpus(); j++)
+-		p += sprintf(p, "%10u ",
+-			apic_timer_irqs[cpu_logical_map(j)]);
+-	p += sprintf(p, "\n");
+-#endif
+-#endif
+-	p += sprintf(p, "ERR: %10lu\n", irq_err_count);
+-	return p - buf;
+-}
++	seq_printf(p, "NMI: ");
++	for (j = 0; j < NR_CPUS; j++)
++		if (cpu_online(j))
++			seq_printf(p, "%10u ", nmi_count(j));
++	seq_putc(p, '\n');
+ 
+-
+-int show_interrupts(struct seq_file *p, void *v)
+-{
+-	return(0);
++	return 0;
+ }
+ 
+ /*
+@@ -281,13 +269,12 @@
+ 	 * 0 return value means that this irq is already being
+ 	 * handled by some other CPU. (or is disabled)
+ 	 */
+-	int cpu = smp_processor_id();
+ 	irq_desc_t *desc = irq_desc + irq;
+ 	struct irqaction * action;
+ 	unsigned int status;
+ 
+ 	irq_enter();
+-	kstat_cpu(cpu).irqs[irq]++;
++	kstat_this_cpu.irqs[irq]++;
+ 	spin_lock(&desc->lock);
+ 	desc->handler->ack(irq);
+ 	/*
+@@ -384,7 +371,7 @@
+  */
+  
+ int request_irq(unsigned int irq,
+-		void (*handler)(int, void *, struct pt_regs *),
++		irqreturn_t (*handler)(int, void *, struct pt_regs *),
+ 		unsigned long irqflags, 
+ 		const char * devname,
+ 		void *dev_id)
+@@ -430,15 +417,19 @@
+ }
+ 
+ int um_request_irq(unsigned int irq, int fd, int type,
+-		   void (*handler)(int, void *, struct pt_regs *),
++		   irqreturn_t (*handler)(int, void *, struct pt_regs *),
+ 		   unsigned long irqflags, const char * devname,
+ 		   void *dev_id)
+ {
+-	int retval;
++	int err;
+ 
+-	retval = request_irq(irq, handler, irqflags, devname, dev_id);
+-	if(retval) return(retval);
+-	return(activate_fd(irq, fd, type, dev_id));
++	err = request_irq(irq, handler, irqflags, devname, dev_id);
++	if(err) 
++		return(err);
++
++	if(fd != -1)
++		err = activate_fd(irq, fd, type, dev_id);
++	return(err);
+ }
+ 
+ /* this was setup_x86_irq but it seems pretty generic */
+@@ -654,7 +645,7 @@
+ 		return -EINVAL;
+ 	tmp = *mask;
+ 	for (k = 0; k < sizeof(cpumask_t)/sizeof(u16); ++k) {
+-		int j = sprintf(page, "%04hx", cpus_coerce(tmp));
++		int j = sprintf(page, "%04hx", (short) cpus_coerce(tmp));
+ 		len += j;
+ 		page += j;
+ 		cpus_shift_right(tmp, tmp, 16);
+diff -Naur a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
+--- a/arch/um/kernel/mem.c	Tue Sep  9 16:42:54 2003
++++ b/arch/um/kernel/mem.c	Tue Sep  9 16:48:27 2003
+@@ -119,11 +119,6 @@
+ 	return(kmem_top);
+ }
+ 
+-void set_kmem_end(unsigned long new)
+-{
+-	kmem_top = new;
+-}
+-
+ #ifdef CONFIG_HIGHMEM
+ /* Changed during early boot */
+ pte_t *kmap_pte;
+@@ -218,7 +213,7 @@
+ 		if(regions[i] == NULL) break;		
+ 	}
+ 	if(i == NREGIONS){
+-		printk("setup_range : no free regions\n");
++		printk("setup_one_range : no free regions\n");
+ 		i = -1;
+ 		goto out;
+ 	}
+@@ -227,7 +222,9 @@
+ 		fd = create_mem_file(len);
+ 
+ 	if(region == NULL){
+-		region = alloc_bootmem_low_pages(sizeof(*region));
++		if(kmalloc_ok)
++			region = kmalloc(sizeof(*region), GFP_KERNEL);
++		else region = alloc_bootmem_low_pages(sizeof(*region));
+ 		if(region == NULL)
+ 			panic("Failed to allocating mem_region");
+ 	}
+@@ -528,9 +525,9 @@
+ 	return(NREGIONS);
+ }
+ 
+-void setup_range(int fd, char *driver, unsigned long start, unsigned long pfn,
+-		 unsigned long len, int need_vm, struct mem_region *region, 
+-		 void *reserved)
++static void setup_range(int fd, char *driver, unsigned long start, 
++			unsigned long pfn, unsigned long len, int need_vm, 
++			struct mem_region *region, void *reserved)
+ {
+ 	int i, cur;
+ 
+diff -Naur a/arch/um/kernel/mem_user.c b/arch/um/kernel/mem_user.c
+--- a/arch/um/kernel/mem_user.c	Tue Sep  9 16:43:27 2003
++++ b/arch/um/kernel/mem_user.c	Tue Sep  9 16:49:07 2003
+@@ -111,6 +111,11 @@
+ 		offset = 0;
+ 	}
+ 
++	if(offset >= region->len){
++		printf("%ld bytes of physical memory is insufficient\n",
++		       region->len);
++		exit(1);
++	}
+ 	loc = mmap(start, region->len - offset, PROT_READ | PROT_WRITE, 
+ 		   MAP_SHARED | MAP_FIXED, region->fd, offset);
+ 	if(loc != start){
+@@ -122,26 +127,26 @@
+ 
+ static int __init parse_iomem(char *str, int *add)
+ {
+-	struct stat buf;
++	struct stat64 buf;
+ 	char *file, *driver;
+ 	int fd;
+ 
+ 	driver = str;
+ 	file = strchr(str,',');
+ 	if(file == NULL){
+-		printk("parse_iomem : failed to parse iomem\n");
++		printf("parse_iomem : failed to parse iomem\n");
+ 		return(1);
+ 	}
+ 	*file = '\0';
+ 	file++;
+ 	fd = os_open_file(file, of_rdwr(OPENFLAGS()), 0);
+ 	if(fd < 0){
+-		printk("parse_iomem - Couldn't open io file, errno = %d\n", 
++		printf("parse_iomem - Couldn't open io file, errno = %d\n", 
+ 		       errno);
+ 		return(1);
+ 	}
+-	if(fstat(fd, &buf) < 0) {
+-		printk("parse_iomem - cannot fstat file, errno = %d\n", errno);
++	if(fstat64(fd, &buf) < 0) {
++		printf("parse_iomem - cannot fstat file, errno = %d\n", errno);
+ 		return(1);
+ 	}
+ 	add_iomem(driver, fd, buf.st_size);
+diff -Naur a/arch/um/kernel/process.c b/arch/um/kernel/process.c
+--- a/arch/um/kernel/process.c	Tue Sep  9 16:45:56 2003
++++ b/arch/um/kernel/process.c	Tue Sep  9 16:50:22 2003
+@@ -72,7 +72,6 @@
+ 		    SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);
+ 	set_handler(SIGUSR2, (__sighandler_t) sig_handler, 
+ 		    SA_NOMASK | flags, -1);
+-	(void) CHOOSE_MODE(signal(SIGCHLD, SIG_IGN), (void *) 0);
+ 	signal(SIGHUP, SIG_IGN);
+ 
+ 	init_irq_signals(altstack);
+@@ -127,7 +126,8 @@
+ 	if(err < 0) panic("Waiting for outer trampoline failed - errno = %d", 
+ 			  errno);
+ 	if(!WIFSIGNALED(status) || (WTERMSIG(status) != SIGKILL))
+-		panic("outer trampoline didn't exit with SIGKILL");
++		panic("outer trampoline didn't exit with SIGKILL, "
++		      "status = %d", status);
+ 
+ 	return(arg.pid);
+ }
+diff -Naur a/arch/um/kernel/process_kern.c b/arch/um/kernel/process_kern.c
+--- a/arch/um/kernel/process_kern.c	Tue Sep  9 16:43:24 2003
++++ b/arch/um/kernel/process_kern.c	Tue Sep  9 16:49:06 2003
+@@ -52,17 +52,12 @@
+ 
+ struct task_struct *get_task(int pid, int require)
+ {
+-        struct task_struct *task, *ret;
++        struct task_struct *ret;
+ 
+-        ret = NULL;
+         read_lock(&tasklist_lock);
+-        for_each_process(task){
+-                if(task->pid == pid){
+-                        ret = task;
+-                        break;
+-                }
+-        }
++	ret = find_task_by_pid(pid);
+         read_unlock(&tasklist_lock);
++
+         if(require && (ret == NULL)) panic("get_task couldn't find a task\n");
+         return(ret);
+ }
+@@ -103,13 +98,14 @@
+ 
+ int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
+ {
+-	struct task_struct *p;
++	int pid;
+ 
+ 	current->thread.request.u.thread.proc = fn;
+ 	current->thread.request.u.thread.arg = arg;
+-	p = do_fork(CLONE_VM | flags, 0, NULL, 0, NULL, NULL);
+-	if(IS_ERR(p)) panic("do_fork failed in kernel_thread");
+-	return(p->pid);
++	pid = do_fork(CLONE_VM | flags, 0, NULL, 0, NULL, NULL);
++	if(pid < 0)
++		panic("do_fork failed in kernel_thread, errno = %d", pid);
++	return(pid);
+ }
+ 
+ void switch_mm(struct mm_struct *prev, struct mm_struct *next, 
+@@ -129,7 +125,7 @@
+ 		{ external_pid(task), task });
+ }
+ 
+-void *switch_to(void *prev, void *next, void *last)
++void *_switch_to(void *prev, void *next, void *last)
+ {
+ 	return(CHOOSE_MODE(switch_to_tt(prev, next), 
+ 			   switch_to_skas(prev, next)));
+@@ -149,7 +145,7 @@
+ void exit_thread(void)
+ {
+ 	CHOOSE_MODE(exit_thread_tt(), exit_thread_skas());
+-	unprotect_stack((unsigned long) current->thread_info);
++	unprotect_stack((unsigned long) current_thread);
+ }
+  
+ void *get_current(void)
+@@ -157,6 +153,10 @@
+ 	return(current);
+ }
+ 
++void prepare_to_copy(struct task_struct *tsk)
++{
++}
++
+ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
+ 		unsigned long stack_top, struct task_struct * p, 
+ 		struct pt_regs *regs)
+@@ -190,7 +190,7 @@
+ 
+ void default_idle(void)
+ {
+-	idle_timer();
++	uml_idle_timer();
+ 
+ 	atomic_inc(&init_mm.mm_count);
+ 	current->mm = &init_mm;
+@@ -363,10 +363,15 @@
+ 	return(clear_user(buf, size));
+ }
+ 
++int strlen_user_proc(char *str)
++{
++	return(strlen_user(str));
++}
++
+ int smp_sigio_handler(void)
+ {
+ #ifdef CONFIG_SMP
+-	int cpu = current->thread_info->cpu;
++	int cpu = current_thread->cpu;
+ 	IPI_handler(cpu);
+ 	if(cpu != 0)
+ 		return(1);
+@@ -381,7 +386,7 @@
+ 
+ int cpu(void)
+ {
+-	return(current->thread_info->cpu);
++	return(current_thread->cpu);
+ }
+ 
+ /*
+diff -Naur a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c
+--- a/arch/um/kernel/ptrace.c	Tue Sep  9 16:41:35 2003
++++ b/arch/um/kernel/ptrace.c	Tue Sep  9 16:47:40 2003
+@@ -311,11 +311,8 @@
+ 
+ 	/* the 0x80 provides a way for the tracing parent to distinguish
+ 	   between a syscall stop and SIGTRAP delivery */
+- 	current->exit_code = SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
+- 					? 0x80 : 0);
+-	current->state = TASK_STOPPED;
+-	notify_parent(current, SIGCHLD);
+-	schedule();
++	ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
++				 ? 0x80 : 0));
+ 
+ 	/*
+ 	 * this isn't the same as continuing with a signal, but it will do
+diff -Naur a/arch/um/kernel/sigio_kern.c b/arch/um/kernel/sigio_kern.c
+--- a/arch/um/kernel/sigio_kern.c	Tue Sep  9 16:41:54 2003
++++ b/arch/um/kernel/sigio_kern.c	Tue Sep  9 16:47:58 2003
+@@ -6,18 +6,21 @@
+ #include "linux/kernel.h"
+ #include "linux/list.h"
+ #include "linux/slab.h"
+-#include "asm/irq.h"
++#include "linux/signal.h"
++#include "linux/interrupt.h"
+ #include "init.h"
+ #include "sigio.h"
+ #include "irq_user.h"
++#include "irq_kern.h"
+ 
+ /* Protected by sigio_lock() called from write_sigio_workaround */
+ static int sigio_irq_fd = -1;
+ 
+-void sigio_interrupt(int irq, void *data, struct pt_regs *unused)
++irqreturn_t sigio_interrupt(int irq, void *data, struct pt_regs *unused)
+ {
+ 	read_sigio_fd(sigio_irq_fd);
+ 	reactivate_fd(sigio_irq_fd, SIGIO_WRITE_IRQ);
++	return(IRQ_HANDLED);
+ }
+ 
+ int write_sigio_irq(int fd)
+diff -Naur a/arch/um/kernel/signal_kern.c b/arch/um/kernel/signal_kern.c
+--- a/arch/um/kernel/signal_kern.c	Tue Sep  9 16:43:31 2003
++++ b/arch/um/kernel/signal_kern.c	Tue Sep  9 16:49:19 2003
+@@ -36,7 +36,7 @@
+ 	if(sig == SIGSEGV){
+ 		struct k_sigaction *ka;
+ 
+-		ka = &current->sig->action[SIGSEGV - 1];
++		ka = &current->sighand->action[SIGSEGV - 1];
+ 		ka->sa.sa_handler = SIG_DFL;
+ 	}
+ 	force_sig(SIGSEGV, current);
+@@ -142,7 +142,7 @@
+ 		return(0);
+ 
+ 	/* Whee!  Actually deliver the signal.  */
+-	ka = &current->sig->action[sig -1 ];
++	ka = &current->sighand->action[sig -1 ];
+ 	err = handle_signal(regs, sig, ka, &info, oldset, error);
+ 	if(!err) return(1);
+ 
+@@ -201,7 +201,7 @@
+ 	}
+ }
+ 
+-int sys_rt_sigsuspend(sigset_t *unewset, size_t sigsetsize)
++int sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize)
+ {
+ 	sigset_t saveset, newset;
+ 
+@@ -227,6 +227,42 @@
+ 	}
+ }
+ 
++int sys_sigaction(int sig, const struct old_sigaction __user *act,
++			 struct old_sigaction __user *oact)
++{
++	struct k_sigaction new_ka, old_ka;
++	int ret;
++
++	if (act) {
++		old_sigset_t mask;
++		if (verify_area(VERIFY_READ, act, sizeof(*act)) ||
++		    __get_user(new_ka.sa.sa_handler, &act->sa_handler) ||
++		    __get_user(new_ka.sa.sa_restorer, &act->sa_restorer))
++			return -EFAULT;
++		__get_user(new_ka.sa.sa_flags, &act->sa_flags);
++		__get_user(mask, &act->sa_mask);
++		siginitset(&new_ka.sa.sa_mask, mask);
++	}
++
++	ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
++
++	if (!ret && oact) {
++		if (verify_area(VERIFY_WRITE, oact, sizeof(*oact)) ||
++		    __put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||
++		    __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer))
++			return -EFAULT;
++		__put_user(old_ka.sa.sa_flags, &oact->sa_flags);
++		__put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask);
++	}
++
++	return ret;
++}
++
++int sys_sigaltstack(const stack_t *uss, stack_t *uoss)
++{
++	return(do_sigaltstack(uss, uoss, PT_REGS_SP(&current->thread.regs)));
++}
++
+ static int copy_sc_from_user(struct pt_regs *to, void *from, 
+ 			     struct arch_frame_data *arch)
+ {
+@@ -239,8 +275,8 @@
+ 
+ int sys_sigreturn(struct pt_regs regs)
+ {
+-	void *sc = sp_to_sc(PT_REGS_SP(&current->thread.regs));
+-	void *mask = sp_to_mask(PT_REGS_SP(&current->thread.regs));
++	void __user *sc = sp_to_sc(PT_REGS_SP(&current->thread.regs));
++	void __user *mask = sp_to_mask(PT_REGS_SP(&current->thread.regs));
+ 	int sig_size = (_NSIG_WORDS - 1) * sizeof(unsigned long);
+ 
+ 	spin_lock_irq(&current->sighand->siglock);
+@@ -257,7 +293,8 @@
+ 
+ int sys_rt_sigreturn(struct pt_regs regs)
+ {
+-	struct ucontext *uc = sp_to_uc(PT_REGS_SP(&current->thread.regs));
++	unsigned long sp = PT_REGS_SP(&current->thread.regs);
++	struct ucontext __user *uc = sp_to_uc(sp);
+ 	void *fp;
+ 	int sig_size = _NSIG_WORDS * sizeof(unsigned long);
+ 
+diff -Naur a/arch/um/kernel/skas/Makefile b/arch/um/kernel/skas/Makefile
+--- a/arch/um/kernel/skas/Makefile	Tue Sep  9 16:42:00 2003
++++ b/arch/um/kernel/skas/Makefile	Tue Sep  9 16:48:10 2003
+@@ -7,18 +7,22 @@
+ 	process_kern.o syscall_kern.o syscall_user.o time.o tlb.o trap_user.o \
+ 	sys-$(SUBARCH)/
+ 
++host-progs	:= util/mk_ptregs
++clean-files	:= include/skas_ptregs.h
++
+ USER_OBJS = $(filter %_user.o,$(obj-y)) process.o time.o
+ USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
+ 
+-include/skas_ptregs.h : util/mk_ptregs
+-	util/mk_ptregs > $@
+-
+-util/mk_ptregs :
+-	$(MAKE) -C util
++$(TOPDIR)/arch/um/include/skas_ptregs.h : $(src)/util/mk_ptregs
++	@echo -n '  Generating $@'
++	@$< > $@.tmp
++	@if [ -r $@ ] && cmp -s $@ $@.tmp; then \
++		echo ' (unchanged)'; \
++		rm -f $@.tmp; \
++	else \
++		echo ' (updated)'; \
++		mv -f $@.tmp $@; \
++	fi
+ 
+ $(USER_OBJS) : %.o: %.c
+ 	$(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
+-
+-clean :
+-	$(MAKE) -C util clean
+-	$(RM) -f include/skas_ptregs.h
+diff -Naur a/arch/um/kernel/skas/include/mode.h b/arch/um/kernel/skas/include/mode.h
+--- a/arch/um/kernel/skas/include/mode.h	Tue Sep  9 16:43:28 2003
++++ b/arch/um/kernel/skas/include/mode.h	Tue Sep  9 16:49:08 2003
+@@ -20,6 +20,7 @@
+ extern void halt_skas(void);
+ extern void reboot_skas(void);
+ extern void kill_off_processes_skas(void);
++extern int is_skas_winch(int pid, int fd, void *data);
+ 
+ #endif
+ 
+diff -Naur a/arch/um/kernel/skas/include/uaccess.h b/arch/um/kernel/skas/include/uaccess.h
+--- a/arch/um/kernel/skas/include/uaccess.h	Tue Sep  9 16:42:57 2003
++++ b/arch/um/kernel/skas/include/uaccess.h	Tue Sep  9 16:48:51 2003
+@@ -19,7 +19,7 @@
+ #define access_ok_skas(type, addr, size) \
+ 	((segment_eq(get_fs(), KERNEL_DS)) || \
+ 	 (((unsigned long) (addr) < TASK_SIZE) && \
+-	  ((unsigned long) (addr) + (size) < TASK_SIZE)))
++	  ((unsigned long) (addr) + (size) <= TASK_SIZE)))
+ 
+ static inline int verify_area_skas(int type, const void * addr, 
+ 				   unsigned long size)
+diff -Naur a/arch/um/kernel/skas/process.c b/arch/um/kernel/skas/process.c
+--- a/arch/um/kernel/skas/process.c	Tue Sep  9 16:46:01 2003
++++ b/arch/um/kernel/skas/process.c	Tue Sep  9 16:51:06 2003
+@@ -4,6 +4,7 @@
+  */
+ 
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <errno.h>
+ #include <signal.h>
+ #include <setjmp.h>
+@@ -24,6 +25,16 @@
+ #include "os.h"
+ #include "proc_mm.h"
+ #include "skas_ptrace.h"
++#include "chan_user.h"
++
++int is_skas_winch(int pid, int fd, void *data)
++{
++	if(pid != getpid())
++		return(0);
++
++	register_winch_irq(-1, fd, -1, data);
++	return(1);
++}
+ 
+ unsigned long exec_regs[FRAME_SIZE];
+ unsigned long exec_fp_regs[HOST_FP_SIZE];
+@@ -48,11 +59,11 @@
+ 	int err, syscall_nr, status;
+ 
+ 	syscall_nr = PT_SYSCALL_NR(regs->skas.regs);
++	UPT_SYSCALL_NR(regs) = syscall_nr;
+ 	if(syscall_nr < 1){
+ 		relay_signal(SIGTRAP, regs);
+ 		return;
+ 	}
+-	UPT_SYSCALL_NR(regs) = syscall_nr;
+ 
+ 	err = ptrace(PTRACE_POKEUSER, pid, PT_SYSCALL_NR_OFFSET, __NR_getpid);
+ 	if(err < 0)
+@@ -72,8 +83,6 @@
+ 	handle_syscall(regs);
+ }
+ 
+-int userspace_pid;
+-
+ static int userspace_tramp(void *arg)
+ {
+ 	init_new_thread_signals(0);
+@@ -83,6 +92,8 @@
+ 	return(0);
+ }
+ 
++int userspace_pid;
++
+ void start_userspace(void)
+ {
+ 	void *stack;
+@@ -149,6 +160,7 @@
+ 			case SIGILL:
+ 			case SIGBUS:
+ 			case SIGFPE:
++			case SIGWINCH:
+ 				user_signal(WSTOPSIG(status), regs);
+ 				break;
+ 			default:
+@@ -328,7 +340,8 @@
+ int new_mm(int from)
+ {
+ 	struct proc_mm_op copy;
+-	int n, fd = os_open_file("/proc/mm", of_write(OPENFLAGS()), 0);
++	int n, fd = os_open_file("/proc/mm", 
++				 of_cloexec(of_write(OPENFLAGS())), 0);
+ 
+ 	if(fd < 0)
+ 		return(-errno);
+@@ -342,6 +355,7 @@
+ 			printk("new_mm : /proc/mm copy_segments failed, "
+ 			       "errno = %d\n", errno);
+ 	}
++
+ 	return(fd);
+ }
+ 
+diff -Naur a/arch/um/kernel/skas/process_kern.c b/arch/um/kernel/skas/process_kern.c
+--- a/arch/um/kernel/skas/process_kern.c	Tue Sep  9 16:41:52 2003
++++ b/arch/um/kernel/skas/process_kern.c	Tue Sep  9 16:47:57 2003
+@@ -61,9 +61,8 @@
+ 	thread_wait(&current->thread.mode.skas.switch_buf, 
+ 		    current->thread.mode.skas.fork_buf);
+ 
+-#ifdef CONFIG_SMP
+-	schedule_tail(NULL);
+-#endif
++	if(current->thread.prev_sched != NULL)
++		schedule_tail(current->thread.prev_sched);
+ 	current->thread.prev_sched = NULL;
+ 
+ 	n = run_kernel_thread(fn, arg, &current->thread.exec_buf);
+@@ -93,9 +92,8 @@
+ 		    current->thread.mode.skas.fork_buf);
+   	
+ 	force_flush_all();
+-#ifdef CONFIG_SMP
+-	schedule_tail(current->thread.prev_sched);
+-#endif
++	if(current->thread.prev_sched != NULL)
++		schedule_tail(current->thread.prev_sched);
+ 	current->thread.prev_sched = NULL;
+ 	unblock_signals();
+ 
+@@ -136,7 +134,7 @@
+ 
+ void init_idle_skas(void)
+ {
+-	cpu_tasks[current->thread_info->cpu].pid = os_getpid();
++	cpu_tasks[current_thread->cpu].pid = os_getpid();
+ 	default_idle();
+ }
+ 
+@@ -164,7 +162,7 @@
+ 	capture_signal_stack();
+ 
+ 	init_new_thread_signals(1);
+-	idle_timer();
++	uml_idle_timer();
+ 
+ 	init_task.thread.request.u.thread.proc = start_kernel_proc;
+ 	init_task.thread.request.u.thread.arg = NULL;
+diff -Naur a/arch/um/kernel/skas/util/mk_ptregs.c b/arch/um/kernel/skas/util/mk_ptregs.c
+--- a/arch/um/kernel/skas/util/mk_ptregs.c	Tue Sep  9 16:42:54 2003
++++ b/arch/um/kernel/skas/util/mk_ptregs.c	Tue Sep  9 16:48:27 2003
+@@ -1,3 +1,4 @@
++#include <stdio.h>
+ #include <asm/ptrace.h>
+ #include <asm/user.h>
+ 
+diff -Naur a/arch/um/kernel/smp.c b/arch/um/kernel/smp.c
+--- a/arch/um/kernel/smp.c	Tue Sep  9 16:41:48 2003
++++ b/arch/um/kernel/smp.c	Tue Sep  9 16:47:56 2003
+@@ -22,7 +22,7 @@
+ #include "os.h"
+ 
+ /* CPU online map, set by smp_boot_cpus */
+-unsigned long cpu_online_map = cpumask_of_cpu(0);
++unsigned long cpu_online_map = CPU_MASK_NONE;
+ 
+ /* Per CPU bogomips and other parameters
+  * The only piece used here is the ipi pipe, which is set before SMP is
+@@ -97,15 +97,15 @@
+ 
+ 	printk(KERN_INFO "Stopping all CPUs...");
+ 	for(i = 0; i < num_online_cpus(); i++){
+-		if(i == current->thread_info->cpu)
++		if(i == current_thread->cpu)
+ 			continue;
+ 		write(cpu_data[i].ipi_pipe[1], "S", 1);
+ 	}
+ 	printk("done\n");
+ }
+ 
+-static cpumask_t smp_commenced_mask;
+-static cpumask_t smp_callin_map = CPU_MASK_NONE;
++static cpumask_t smp_commenced_mask = CPU_MASK_NONE;
++static cpumask_t cpu_callin_map = CPU_MASK_NONE;
+ 
+ static int idle_proc(void *cpup)
+ {
+@@ -120,12 +120,12 @@
+ 		     current->thread.mode.tt.extern_pid);
+  
+ 	wmb();
+-	if (cpu_test_and_set(cpu, &smp_callin_map)) {
++	if (cpu_test_and_set(cpu, cpu_callin_map)) {
+ 		printk("huh, CPU#%d already present??\n", cpu);
+ 		BUG();
+ 	}
+ 
+-	while (!cpu_isset(cpu, &smp_commenced_mask))
++	while (!cpu_isset(cpu, smp_commenced_mask))
+ 		cpu_relax();
+ 
+ 	cpu_set(cpu, cpu_online_map);
+@@ -140,8 +140,11 @@
+ 
+         current->thread.request.u.thread.proc = idle_proc;
+         current->thread.request.u.thread.arg = (void *) cpu;
+-	new_task = do_fork(CLONE_VM | CLONE_IDLETASK, 0, NULL, 0, NULL, NULL);
+-	if(IS_ERR(new_task)) panic("do_fork failed in idle_thread");
++	new_task = copy_process(CLONE_VM | CLONE_IDLETASK, 0, NULL, 0, NULL, 
++				NULL);
++	if(IS_ERR(new_task)) 
++		panic("copy_process failed in idle_thread, error = %ld",
++		      PTR_ERR(new_task));
+ 
+ 	cpu_tasks[cpu] = ((struct cpu_task) 
+ 		          { .pid = 	new_task->thread.mode.tt.extern_pid,
+@@ -150,6 +153,7 @@
+ 	CHOOSE_MODE(write(new_task->thread.mode.tt.switch_pipe[1], &c, 
+ 			  sizeof(c)),
+ 		    ({ panic("skas mode doesn't support SMP"); }));
++	wake_up_forked_process(new_task);
+ 	return(new_task);
+ }
+ 
+@@ -157,15 +161,16 @@
+ {
+ 	struct task_struct *idle;
+ 	unsigned long waittime;
+-	int err, cpu;
++	int err, cpu, me = smp_processor_id();
+ 
+-	cpu_set(0, cpu_online_map);
+-	cpu_set(0, smp_callin_map);
++	cpu_clear(me, cpu_online_map);
++	cpu_set(me, cpu_online_map);
++	cpu_set(me, cpu_callin_map);
+ 
+-	err = os_pipe(cpu_data[0].ipi_pipe, 1, 1);
++	err = os_pipe(cpu_data[me].ipi_pipe, 1, 1);
+ 	if(err)	panic("CPU#0 failed to create IPI pipe, errno = %d", -err);
+ 
+-	activate_ipi(cpu_data[0].ipi_pipe[0], 
++	activate_ipi(cpu_data[me].ipi_pipe[0], 
+ 		     current->thread.mode.tt.extern_pid);
+ 
+ 	for(cpu = 1; cpu < ncpus; cpu++){
+@@ -177,10 +182,10 @@
+ 		unhash_process(idle);
+ 
+ 		waittime = 200000000;
+-		while (waittime-- && !cpu_isset(cpu, smp_callin_map))
++		while (waittime-- && !cpu_isset(cpu, cpu_callin_map))
+ 			cpu_relax();
+ 
+-		if (cpu_isset(cpu, smp_callin_map))
++		if (cpu_isset(cpu, cpu_callin_map))
+ 			printk("done\n");
+ 		else printk("failed\n");
+ 	}
+@@ -270,7 +275,7 @@
+ 	info = _info;
+ 
+ 	for (i=0;i<NR_CPUS;i++)
+-		if((i != current->thread_info->cpu) && 
++		if((i != current_thread->cpu) && 
+ 		   cpu_isset(i, cpu_online_map))
+ 			write(cpu_data[i].ipi_pipe[1], "C", 1);
+ 
+diff -Naur a/arch/um/kernel/sys_call_table.c b/arch/um/kernel/sys_call_table.c
+--- a/arch/um/kernel/sys_call_table.c	Tue Sep  9 16:45:55 2003
++++ b/arch/um/kernel/sys_call_table.c	Tue Sep  9 16:50:22 2003
+@@ -219,15 +219,30 @@
+ extern syscall_handler_t sys_gettid;
+ extern syscall_handler_t sys_readahead;
+ extern syscall_handler_t sys_tkill;
++extern syscall_handler_t sys_setxattr;
++extern syscall_handler_t sys_lsetxattr;
++extern syscall_handler_t sys_fsetxattr;
++extern syscall_handler_t sys_getxattr;
++extern syscall_handler_t sys_lgetxattr;
++extern syscall_handler_t sys_fgetxattr;
++extern syscall_handler_t sys_listxattr;
++extern syscall_handler_t sys_llistxattr;
++extern syscall_handler_t sys_flistxattr;
++extern syscall_handler_t sys_removexattr;
++extern syscall_handler_t sys_lremovexattr;
++extern syscall_handler_t sys_fremovexattr;
+ extern syscall_handler_t sys_sendfile64;
+ extern syscall_handler_t sys_futex;
+ extern syscall_handler_t sys_sched_setaffinity;
+ extern syscall_handler_t sys_sched_getaffinity;
++extern syscall_handler_t sys_set_thread_area;
++extern syscall_handler_t sys_get_thread_area;
+ extern syscall_handler_t sys_io_setup;
+ extern syscall_handler_t sys_io_destroy;
+ extern syscall_handler_t sys_io_getevents;
+ extern syscall_handler_t sys_io_submit;
+ extern syscall_handler_t sys_io_cancel;
++extern syscall_handler_t sys_fadvise64;
+ extern syscall_handler_t sys_exit_group;
+ extern syscall_handler_t sys_lookup_dcookie;
+ extern syscall_handler_t sys_epoll_create;
+@@ -235,6 +250,20 @@
+ extern syscall_handler_t sys_epoll_wait;
+ extern syscall_handler_t sys_remap_file_pages;
+ extern syscall_handler_t sys_set_tid_address;
++extern syscall_handler_t sys_timer_create;
++extern syscall_handler_t sys_timer_settime;
++extern syscall_handler_t sys_timer_gettime;
++extern syscall_handler_t sys_timer_getoverrun;
++extern syscall_handler_t sys_timer_delete;
++extern syscall_handler_t sys_clock_settime;
++extern syscall_handler_t sys_clock_gettime;
++extern syscall_handler_t sys_clock_getres;
++extern syscall_handler_t sys_clock_nanosleep;
++extern syscall_handler_t sys_statfs64;
++extern syscall_handler_t sys_fstatfs64;
++extern syscall_handler_t sys_tgkill;
++extern syscall_handler_t sys_utimes;
++extern syscall_handler_t sys_fadvise64_64;
+ 
+ #ifdef CONFIG_NFSD
+ #define NFSSERVCTL sys_nfsservctl
+@@ -246,7 +275,7 @@
+ extern syscall_handler_t um_time;
+ extern syscall_handler_t um_stime;
+ 
+-#define LAST_GENERIC_SYSCALL __NR_set_tid_address
++#define LAST_GENERIC_SYSCALL __NR_fadvise64_64
+ 
+ #if LAST_GENERIC_SYSCALL > LAST_ARCH_SYSCALL
+ #define LAST_SYSCALL LAST_GENERIC_SYSCALL
+@@ -455,32 +484,37 @@
+ 	[ __NR_stat64 ] = sys_stat64,
+ 	[ __NR_lstat64 ] = sys_lstat64,
+ 	[ __NR_fstat64 ] = sys_fstat64,
+-	[ __NR_fcntl64 ] = sys_fcntl64,
+ 	[ __NR_getdents64 ] = sys_getdents64,
++	[ __NR_fcntl64 ] = sys_fcntl64,
++	[ 223 ] = sys_ni_syscall,
+ 	[ __NR_gettid ] = sys_gettid,
+ 	[ __NR_readahead ] = sys_readahead,
+-	[ __NR_setxattr ] = sys_ni_syscall,
+-	[ __NR_lsetxattr ] = sys_ni_syscall,
+-	[ __NR_fsetxattr ] = sys_ni_syscall,
+-	[ __NR_getxattr ] = sys_ni_syscall,
+-	[ __NR_lgetxattr ] = sys_ni_syscall,
+-	[ __NR_fgetxattr ] = sys_ni_syscall,
+-	[ __NR_listxattr ] = sys_ni_syscall,
+-	[ __NR_llistxattr ] = sys_ni_syscall,
+-	[ __NR_flistxattr ] = sys_ni_syscall,
+-	[ __NR_removexattr ] = sys_ni_syscall,
+-	[ __NR_lremovexattr ] = sys_ni_syscall,
+-	[ __NR_fremovexattr ] = sys_ni_syscall,
++	[ __NR_setxattr ] = sys_setxattr,
++	[ __NR_lsetxattr ] = sys_lsetxattr,
++	[ __NR_fsetxattr ] = sys_fsetxattr,
++	[ __NR_getxattr ] = sys_getxattr,
++	[ __NR_lgetxattr ] = sys_lgetxattr,
++	[ __NR_fgetxattr ] = sys_fgetxattr,
++	[ __NR_listxattr ] = sys_listxattr,
++	[ __NR_llistxattr ] = sys_llistxattr,
++	[ __NR_flistxattr ] = sys_flistxattr,
++	[ __NR_removexattr ] = sys_removexattr,
++	[ __NR_lremovexattr ] = sys_lremovexattr,
++	[ __NR_fremovexattr ] = sys_fremovexattr,
+ 	[ __NR_tkill ] = sys_tkill,
+ 	[ __NR_sendfile64 ] = sys_sendfile64,
+ 	[ __NR_futex ] = sys_futex,
+ 	[ __NR_sched_setaffinity ] = sys_sched_setaffinity,
+ 	[ __NR_sched_getaffinity ] = sys_sched_getaffinity,
++	[ __NR_set_thread_area ] = sys_ni_syscall,
++	[ __NR_get_thread_area ] = sys_ni_syscall,
+ 	[ __NR_io_setup ] = sys_io_setup,
+ 	[ __NR_io_destroy ] = sys_io_destroy,
+ 	[ __NR_io_getevents ] = sys_io_getevents,
+ 	[ __NR_io_submit ] = sys_io_submit,
+ 	[ __NR_io_cancel ] = sys_io_cancel,
++	[ __NR_fadvise64 ] = sys_fadvise64,
++	[ 251 ] = sys_ni_syscall,
+ 	[ __NR_exit_group ] = sys_exit_group,
+ 	[ __NR_lookup_dcookie ] = sys_lookup_dcookie,
+ 	[ __NR_epoll_create ] = sys_epoll_create,
+@@ -488,6 +522,20 @@
+ 	[ __NR_epoll_wait ] = sys_epoll_wait,
+         [ __NR_remap_file_pages ] = sys_remap_file_pages,
+         [ __NR_set_tid_address ] = sys_set_tid_address,
++	[ __NR_timer_create ] = sys_timer_create,
++	[ __NR_timer_settime ] = sys_timer_settime,
++	[ __NR_timer_gettime ] = sys_timer_gettime,
++	[ __NR_timer_getoverrun ] = sys_timer_getoverrun,
++	[ __NR_timer_delete ] = sys_timer_delete,
++	[ __NR_clock_settime ] = sys_clock_settime,
++	[ __NR_clock_gettime ] = sys_clock_gettime,
++	[ __NR_clock_getres ] = sys_clock_getres,
++	[ __NR_clock_nanosleep ] = sys_clock_nanosleep,
++	[ __NR_statfs64 ] = sys_statfs64,
++	[ __NR_fstatfs64 ] = sys_fstatfs64,
++	[ __NR_tgkill ] = sys_tgkill,
++	[ __NR_utimes ] = sys_utimes,
++	[ __NR_fadvise64_64 ] = sys_fadvise64_64,
+ 
+ 	ARCH_SYSCALLS
+ 	[ LAST_SYSCALL + 1 ... NR_syscalls ] = 
+diff -Naur a/arch/um/kernel/syscall_kern.c b/arch/um/kernel/syscall_kern.c
+--- a/arch/um/kernel/syscall_kern.c	Tue Sep  9 16:45:13 2003
++++ b/arch/um/kernel/syscall_kern.c	Tue Sep  9 16:49:58 2003
+@@ -35,39 +35,40 @@
+ 
+ long sys_fork(void)
+ {
+-	struct task_struct *p;
++	long ret;
+ 
+ 	current->thread.forking = 1;
+-        p = do_fork(SIGCHLD, 0, NULL, 0, NULL, NULL);
++        ret = do_fork(SIGCHLD, 0, NULL, 0, NULL, NULL);
+ 	current->thread.forking = 0;
+-	return(IS_ERR(p) ? PTR_ERR(p) : p->pid);
++	return(ret);
+ }
+ 
+-long sys_clone(unsigned long clone_flags, unsigned long newsp)
++long sys_clone(unsigned long clone_flags, unsigned long newsp, 
++	       int *parent_tid, int *child_tid)
+ {
+-	struct task_struct *p;
++	long ret;
+ 
+ 	current->thread.forking = 1;
+-	p = do_fork(clone_flags, newsp, NULL, 0, NULL, NULL);
++	ret = do_fork(clone_flags, newsp, NULL, 0, parent_tid, child_tid);
+ 	current->thread.forking = 0;
+-	return(IS_ERR(p) ? PTR_ERR(p) : p->pid);
++	return(ret);
+ }
+ 
+ long sys_vfork(void)
+ {
+-	struct task_struct *p;
++	long ret;
+ 
+ 	current->thread.forking = 1;
+-	p = do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, 0, NULL, 0, NULL, NULL);
++	ret = do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, 0, NULL, 0, NULL, 
++		      NULL);
+ 	current->thread.forking = 0;
+-	return(IS_ERR(p) ? PTR_ERR(p) : p->pid);
++	return(ret);
+ }
+ 
+ /* common code for old and new mmaps */
+-static inline long do_mmap2(
+-	unsigned long addr, unsigned long len,
+-	unsigned long prot, unsigned long flags,
+-	unsigned long fd, unsigned long pgoff)
++long do_mmap2(struct mm_struct *mm, unsigned long addr, unsigned long len,
++	      unsigned long prot, unsigned long flags, unsigned long fd,
++	      unsigned long pgoff)
+ {
+ 	int error = -EBADF;
+ 	struct file * file = NULL;
+@@ -79,9 +80,9 @@
+ 			goto out;
+ 	}
+ 
+-	down_write(&current->mm->mmap_sem);
+-	error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
+-	up_write(&current->mm->mmap_sem);
++	down_write(&mm->mmap_sem);
++	error = do_mmap_pgoff(mm, file, addr, len, prot, flags, pgoff);
++	up_write(&mm->mmap_sem);
+ 
+ 	if (file)
+ 		fput(file);
+@@ -93,7 +94,7 @@
+ 	       unsigned long prot, unsigned long flags,
+ 	       unsigned long fd, unsigned long pgoff)
+ {
+-	return do_mmap2(addr, len, prot, flags, fd, pgoff);
++	return do_mmap2(current->mm, addr, len, prot, flags, fd, pgoff);
+ }
+ 
+ /*
+@@ -120,7 +121,8 @@
+ 	if (offset & ~PAGE_MASK)
+ 		goto out;
+ 
+-	err = do_mmap2(addr, len, prot, flags, fd, offset >> PAGE_SHIFT);
++	err = do_mmap2(current->mm, addr, len, prot, flags, fd, 
++		       offset >> PAGE_SHIFT);
+  out:
+ 	return err;
+ }
+@@ -141,37 +143,6 @@
+         return error;
+ }
+ 
+-int sys_sigaction(int sig, const struct old_sigaction *act,
+-			 struct old_sigaction *oact)
+-{
+-	struct k_sigaction new_ka, old_ka;
+-	int ret;
+-
+-	if (act) {
+-		old_sigset_t mask;
+-		if (verify_area(VERIFY_READ, act, sizeof(*act)) ||
+-		    __get_user(new_ka.sa.sa_handler, &act->sa_handler) ||
+-		    __get_user(new_ka.sa.sa_restorer, &act->sa_restorer))
+-			return -EFAULT;
+-		__get_user(new_ka.sa.sa_flags, &act->sa_flags);
+-		__get_user(mask, &act->sa_mask);
+-		siginitset(&new_ka.sa.sa_mask, mask);
+-	}
+-
+-	ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
+-
+-	if (!ret && oact) {
+-		if (verify_area(VERIFY_WRITE, oact, sizeof(*oact)) ||
+-		    __put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||
+-		    __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer))
+-			return -EFAULT;
+-		__put_user(old_ka.sa.sa_flags, &oact->sa_flags);
+-		__put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask);
+-	}
+-
+-	return ret;
+-}
+-
+ /*
+  * sys_ipc() is the de-multiplexer for the SysV IPC calls..
+  *
+@@ -253,7 +224,7 @@
+ 		return sys_shmctl (first, second,
+ 				   (struct shmid_ds *) ptr);
+ 	default:
+-		return -EINVAL;
++		return -ENOSYS;
+ 	}
+ }
+ 
+@@ -302,11 +273,6 @@
+ 	return error;
+ }
+ 
+-int sys_sigaltstack(const stack_t *uss, stack_t *uoss)
+-{
+-	return(do_sigaltstack(uss, uoss, PT_REGS_SP(&current->thread.regs)));
+-}
+-
+ long execute_syscall(void *r)
+ {
+ 	return(CHOOSE_MODE_PROC(execute_syscall_tt, execute_syscall_skas, r));
+diff -Naur a/arch/um/kernel/sysrq.c b/arch/um/kernel/sysrq.c
+--- a/arch/um/kernel/sysrq.c	Tue Sep  9 16:42:22 2003
++++ b/arch/um/kernel/sysrq.c	Tue Sep  9 16:48:13 2003
+@@ -53,6 +53,14 @@
+ 	show_trace((unsigned long *)esp);
+ }
+ 
++void show_stack(struct task_struct *task, unsigned long *sp)
++{
++	if(task)
++		show_trace_task(task);
++	else
++		show_trace(sp);
++}
++
+ /*
+  * Overrides for Emacs so that we follow Linus's tabbing style.
+  * Emacs will notice this stuff at the end of the file and automatically
+diff -Naur a/arch/um/kernel/time.c b/arch/um/kernel/time.c
+--- a/arch/um/kernel/time.c	Tue Sep  9 16:41:45 2003
++++ b/arch/um/kernel/time.c	Tue Sep  9 16:47:55 2003
+@@ -15,12 +15,16 @@
+ #include "process.h"
+ #include "signal_user.h"
+ #include "time_user.h"
++#include "kern_constants.h"
+ 
+ extern struct timeval xtime;
+ 
++struct timeval local_offset = { 0, 0 };
++
+ void timer(void)
+ {
+ 	gettimeofday(&xtime, NULL);
++	timeradd(&xtime, &local_offset, &xtime);
+ }
+ 
+ void set_interval(int timer_type)
+@@ -65,7 +69,7 @@
+ 		       errno);
+ }
+ 
+-void idle_timer(void)
++void uml_idle_timer(void)
+ {
+ 	if(signal(SIGVTALRM, SIG_IGN) == SIG_ERR)
+ 		panic("Couldn't unset SIGVTALRM handler");
+@@ -82,8 +86,6 @@
+ 	set_interval(ITIMER_VIRTUAL);
+ }
+ 
+-struct timeval local_offset = { 0, 0 };
+-
+ void do_gettimeofday(struct timeval *tv)
+ {
+ 	unsigned long flags;
+@@ -100,7 +102,7 @@
+ 	unsigned long flags;
+ 	struct timeval tv_in;
+ 
+-	if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
++	if ((unsigned long) tv->tv_nsec >= UM_NSEC_PER_SEC)
+ 		return -EINVAL;
+ 
+ 	tv_in.tv_sec = tv->tv_sec;
+@@ -110,6 +112,8 @@
+ 	gettimeofday(&now, NULL);
+ 	timersub(&tv_in, &now, &local_offset);
+ 	time_unlock(flags);
++
++	return(0);
+ }
+ 
+ void idle_sleep(int secs)
+diff -Naur a/arch/um/kernel/time_kern.c b/arch/um/kernel/time_kern.c
+--- a/arch/um/kernel/time_kern.c	Tue Sep  9 16:43:50 2003
++++ b/arch/um/kernel/time_kern.c	Tue Sep  9 16:49:26 2003
+@@ -38,7 +38,7 @@
+ 
+ void timer_irq(union uml_pt_regs *regs)
+ {
+-	int cpu = current->thread_info->cpu, ticks = missed_ticks[cpu];
++	int cpu = current_thread->cpu, ticks = missed_ticks[cpu];
+ 
+         if(!timer_irq_inited) return;
+ 	missed_ticks[cpu] = 0;
+@@ -55,12 +55,13 @@
+ 	do_timer(&regs);
+ }
+ 
+-void um_timer(int irq, void *dev, struct pt_regs *regs)
++irqreturn_t um_timer(int irq, void *dev, struct pt_regs *regs)
+ {
+ 	do_timer(regs);
+-	write_seqlock(&xtime_lock);
++	write_seqlock_irq(&xtime_lock);
+ 	timer();
+-	write_sequnlock(&xtime_lock);
++	write_sequnlock_irq(&xtime_lock);
++	return(IRQ_HANDLED);
+ }
+ 
+ long um_time(int * tloc)
+@@ -78,12 +79,12 @@
+ long um_stime(int * tptr)
+ {
+ 	int value;
+-	struct timeval new;
++	struct timespec new;
+ 
+ 	if (get_user(value, tptr))
+                 return -EFAULT;
+ 	new.tv_sec = value;
+-	new.tv_usec = 0;
++	new.tv_nsec = 0;
+ 	do_settimeofday(&new);
+ 	return 0;
+ }
+@@ -122,9 +123,11 @@
+ void timer_handler(int sig, union uml_pt_regs *regs)
+ {
+ #ifdef CONFIG_SMP
++	local_irq_disable();
+ 	update_process_times(user_context(UPT_SP(regs)));
++	local_irq_enable();
+ #endif
+-	if(current->thread_info->cpu == 0)
++	if(current_thread->cpu == 0)
+ 		timer_irq(regs);
+ }
+ 
+diff -Naur a/arch/um/kernel/trap_kern.c b/arch/um/kernel/trap_kern.c
+--- a/arch/um/kernel/trap_kern.c	Tue Sep  9 16:41:19 2003
++++ b/arch/um/kernel/trap_kern.c	Tue Sep  9 16:47:27 2003
+@@ -16,6 +16,7 @@
+ #include "asm/tlbflush.h"
+ #include "asm/a.out.h"
+ #include "asm/current.h"
++#include "asm/irq.h"
+ #include "user_util.h"
+ #include "kern_util.h"
+ #include "kern.h"
+@@ -51,7 +52,7 @@
+ 	if(is_write && !(vma->vm_flags & VM_WRITE)) 
+ 		goto out;
+ 	page = address & PAGE_MASK;
+-	if(page == (unsigned long) current->thread_info + PAGE_SIZE)
++	if(page == (unsigned long) current_thread + PAGE_SIZE)
+ 		panic("Kernel stack overflow");
+ 	pgd = pgd_offset(mm, page);
+ 	pmd = pmd_offset(pgd, page);
+@@ -180,6 +181,11 @@
+ 	else relay_signal(sig, regs);
+ }
+ 
++void winch(int sig, union uml_pt_regs *regs)
++{
++	do_IRQ(WINCH_IRQ, regs);
++}
++
+ void trap_init(void)
+ {
+ }
+diff -Naur a/arch/um/kernel/trap_user.c b/arch/um/kernel/trap_user.c
+--- a/arch/um/kernel/trap_user.c	Tue Sep  9 16:43:06 2003
++++ b/arch/um/kernel/trap_user.c	Tue Sep  9 16:48:52 2003
+@@ -82,6 +82,8 @@
+ 		     .is_irq 		= 0 },
+ 	[ SIGILL ] { .handler 		= relay_signal,
+ 		     .is_irq 		= 0 },
++	[ SIGWINCH ] { .handler		= winch,
++		       .is_irq		= 1 },
+ 	[ SIGBUS ] { .handler 		= bus_handler,
+ 		     .is_irq 		= 0 },
+ 	[ SIGSEGV] { .handler 		= segv_handler,
+diff -Naur a/arch/um/kernel/tt/exec_kern.c b/arch/um/kernel/tt/exec_kern.c
+--- a/arch/um/kernel/tt/exec_kern.c	Tue Sep  9 16:41:43 2003
++++ b/arch/um/kernel/tt/exec_kern.c	Tue Sep  9 16:47:53 2003
+@@ -47,17 +47,17 @@
+ 		do_exit(SIGKILL);
+ 	}
+ 
+-	if(current->thread_info->cpu == 0)
++	if(current_thread->cpu == 0)
+ 		forward_interrupts(new_pid);
+ 	current->thread.request.op = OP_EXEC;
+ 	current->thread.request.u.exec.pid = new_pid;
+-	unprotect_stack((unsigned long) current->thread_info);
++	unprotect_stack((unsigned long) current_thread);
+ 	os_usr1_process(os_getpid());
+ 
+ 	enable_timer();
+ 	free_page(stack);
+ 	protect_memory(uml_reserved, high_physmem - uml_reserved, 1, 1, 0, 1);
+-	task_protections((unsigned long) current->thread_info);
++	task_protections((unsigned long) current_thread);
+ 	force_flush_all();
+ 	unblock_signals();
+ }
+diff -Naur a/arch/um/kernel/tt/include/uaccess.h b/arch/um/kernel/tt/include/uaccess.h
+--- a/arch/um/kernel/tt/include/uaccess.h	Tue Sep  9 16:43:54 2003
++++ b/arch/um/kernel/tt/include/uaccess.h	Tue Sep  9 16:49:28 2003
+@@ -46,18 +46,20 @@
+ 
+ static inline int copy_from_user_tt(void *to, const void *from, int n)
+ {
+-	return(access_ok_tt(VERIFY_READ, from, n) ?
+-	       __do_copy_from_user(to, from, n, 
+-				   &current->thread.fault_addr,
+-				   &current->thread.fault_catcher) : n);
++	if(!access_ok_tt(VERIFY_READ, from, n)) 
++		return(n);
++
++	return(__do_copy_from_user(to, from, n, &current->thread.fault_addr,
++				   &current->thread.fault_catcher));
+ }
+ 
+ static inline int copy_to_user_tt(void *to, const void *from, int n)
+ {
+-	return(access_ok_tt(VERIFY_WRITE, to, n) ?
+-	       __do_copy_to_user(to, from, n, 
+-				   &current->thread.fault_addr,
+-				   &current->thread.fault_catcher) : n);
++	if(!access_ok_tt(VERIFY_WRITE, to, n))
++		return(n);
++		
++	return(__do_copy_to_user(to, from, n, &current->thread.fault_addr,
++				 &current->thread.fault_catcher));
+ }
+ 
+ extern int __do_strncpy_from_user(char *dst, const char *src, size_t n,
+@@ -67,7 +69,9 @@
+ {
+ 	int n;
+ 
+-	if(!access_ok_tt(VERIFY_READ, src, 1)) return(-EFAULT);
++	if(!access_ok_tt(VERIFY_READ, src, 1)) 
++		return(-EFAULT);
++
+ 	n = __do_strncpy_from_user(dst, src, count, 
+ 				   &current->thread.fault_addr,
+ 				   &current->thread.fault_catcher);
+@@ -87,10 +91,11 @@
+ 
+ static inline int clear_user_tt(void *mem, int len)
+ {
+-	return(access_ok_tt(VERIFY_WRITE, mem, len) ? 
+-	       __do_clear_user(mem, len, 
+-			       &current->thread.fault_addr,
+-			       &current->thread.fault_catcher) : len);
++	if(!access_ok_tt(VERIFY_WRITE, mem, len))
++		return(len);
++
++	return(__do_clear_user(mem, len, &current->thread.fault_addr,
++			       &current->thread.fault_catcher));
+ }
+ 
+ extern int __do_strnlen_user(const char *str, unsigned long n,
+diff -Naur a/arch/um/kernel/tt/process_kern.c b/arch/um/kernel/tt/process_kern.c
+--- a/arch/um/kernel/tt/process_kern.c	Tue Sep  9 16:45:54 2003
++++ b/arch/um/kernel/tt/process_kern.c	Tue Sep  9 16:50:21 2003
+@@ -104,7 +104,10 @@
+ 
+ void release_thread_tt(struct task_struct *task)
+ {
+-	os_kill_process(task->thread.mode.tt.extern_pid, 0);
++	int pid = task->thread.mode.tt.extern_pid;
++
++	if(os_getpid() != pid)
++		os_kill_process(pid, 0);
+ }
+ 
+ void exit_thread_tt(void)
+@@ -125,27 +128,27 @@
+ 	UPT_SC(&current->thread.regs.regs) = (void *) (&sig + 1);
+ 	suspend_new_thread(current->thread.mode.tt.switch_pipe[0]);
+ 
+-	block_signals();
++	force_flush_all();
++	if(current->thread.prev_sched != NULL)
++		schedule_tail(current->thread.prev_sched);
++	current->thread.prev_sched = NULL;
++
+ 	init_new_thread_signals(1);
+-#ifdef CONFIG_SMP
+-	schedule_tail(current->thread.prev_sched);
+-#endif
+ 	enable_timer();
+ 	free_page(current->thread.temp_stack);
+ 	set_cmdline("(kernel thread)");
+-	force_flush_all();
+ 
+-	current->thread.prev_sched = NULL;
+ 	change_sig(SIGUSR1, 1);
+ 	change_sig(SIGVTALRM, 1);
+ 	change_sig(SIGPROF, 1);
+-	unblock_signals();
++	local_irq_enable();
+ 	if(!run_kernel_thread(fn, arg, &current->thread.exec_buf))
+ 		do_exit(0);
+ }
+ 
+ static int new_thread_proc(void *stack)
+ {
++	local_irq_disable();
+ 	init_new_thread_stack(stack, new_thread_handler);
+ 	os_usr1_process(os_getpid());
+ 	return(0);
+@@ -165,35 +168,32 @@
+  	UPT_SC(&current->thread.regs.regs) = (void *) (&sig + 1);
+ 	suspend_new_thread(current->thread.mode.tt.switch_pipe[0]);
+ 
+-#ifdef CONFIG_SMP	
+-	schedule_tail(NULL);
+-#endif
++	force_flush_all();
++	if(current->thread.prev_sched != NULL)
++		schedule_tail(current->thread.prev_sched);
++	current->thread.prev_sched = NULL;
++
+ 	enable_timer();
+ 	change_sig(SIGVTALRM, 1);
+ 	local_irq_enable();
+-	force_flush_all();
+ 	if(current->mm != current->parent->mm)
+ 		protect_memory(uml_reserved, high_physmem - uml_reserved, 1, 
+ 			       1, 0, 1);
+-	task_protections((unsigned long) current->thread_info);
+-
+-	current->thread.prev_sched = NULL;
++	task_protections((unsigned long) current_thread);
+ 
+ 	free_page(current->thread.temp_stack);
++	local_irq_disable();
+ 	change_sig(SIGUSR1, 0);
+ 	set_user_mode(current);
+ }
+ 
+-static int sigusr1 = SIGUSR1;
+-
+ int fork_tramp(void *stack)
+ {
+-	int sig = sigusr1;
+-
+ 	local_irq_disable();
++	arch_init_thread();
+ 	init_new_thread_stack(stack, finish_fork_handler);
+ 
+-	kill(os_getpid(), sig);
++	os_usr1_process(os_getpid());
+ 	return(0);
+ }
+ 
+@@ -377,8 +377,8 @@
+ 
+ 	pages = (1 << CONFIG_KERNEL_STACK_ORDER);
+ 
+-	start = (unsigned long) current->thread_info + PAGE_SIZE;
+-	end = (unsigned long) current + PAGE_SIZE * pages;
++	start = (unsigned long) current_thread + PAGE_SIZE;
++	end = (unsigned long) current_thread + PAGE_SIZE * pages;
+ 	protect_memory(uml_reserved, start - uml_reserved, 1, w, 1, 1);
+ 	protect_memory(end, high_physmem - end, 1, w, 1, 1);
+ 
+diff -Naur a/arch/um/kernel/tt/ptproxy/proxy.c b/arch/um/kernel/tt/ptproxy/proxy.c
+--- a/arch/um/kernel/tt/ptproxy/proxy.c	Tue Sep  9 16:43:48 2003
++++ b/arch/um/kernel/tt/ptproxy/proxy.c	Tue Sep  9 16:49:22 2003
+@@ -293,10 +293,10 @@
+ }
+ 
+ char gdb_init_string[] = 
+-"att 1
+-b panic
+-b stop
+-handle SIGWINCH nostop noprint pass
++"att 1 \n\
++b panic \n\
++b stop \n\
++handle SIGWINCH nostop noprint pass \n\
+ ";
+ 
+ int start_debugger(char *prog, int startup, int stop, int *fd_out)
+diff -Naur a/arch/um/kernel/tt/tracer.c b/arch/um/kernel/tt/tracer.c
+--- a/arch/um/kernel/tt/tracer.c	Tue Sep  9 16:41:14 2003
++++ b/arch/um/kernel/tt/tracer.c	Tue Sep  9 16:47:25 2003
+@@ -39,7 +39,7 @@
+ 		return(0);
+ 
+ 	register_winch_irq(tracer_winch[0], fd, -1, data);
+-	return(0);
++	return(1);
+ }
+ 
+ static void tracer_winch_handler(int sig)
+@@ -401,7 +401,7 @@
+ 		
+ 		if(!strcmp(line, "go"))	debug_stop = 0;
+ 		else if(!strcmp(line, "parent")) debug_parent = 1;
+-		else printk("Unknown debug option : '%s'\n", line);
++		else printf("Unknown debug option : '%s'\n", line);
+ 
+ 		line = next;
+ 	}
+diff -Naur a/arch/um/kernel/tt/uaccess_user.c b/arch/um/kernel/tt/uaccess_user.c
+--- a/arch/um/kernel/tt/uaccess_user.c	Tue Sep  9 16:42:02 2003
++++ b/arch/um/kernel/tt/uaccess_user.c	Tue Sep  9 16:48:11 2003
+@@ -8,15 +8,20 @@
+ #include <string.h>
+ #include "user_util.h"
+ #include "uml_uaccess.h"
++#include "task.h"
++#include "kern_util.h"
+ 
+ int __do_copy_from_user(void *to, const void *from, int n,
+ 			void **fault_addr, void **fault_catcher)
+ {
++	struct tt_regs save = TASK_REGS(get_current())->tt;
+ 	unsigned long fault;
+ 	int faulted;
+ 
+ 	fault = __do_user_copy(to, from, n, fault_addr, fault_catcher,
+ 			       __do_copy, &faulted);
++	TASK_REGS(get_current())->tt = save;
++
+ 	if(!faulted) return(0);
+ 	else return(n - (fault - (unsigned long) from));
+ }
+@@ -29,11 +34,14 @@
+ int __do_strncpy_from_user(char *dst, const char *src, unsigned long count,
+ 			   void **fault_addr, void **fault_catcher)
+ {
++	struct tt_regs save = TASK_REGS(get_current())->tt;
+ 	unsigned long fault;
+ 	int faulted;
+ 
+ 	fault = __do_user_copy(dst, src, count, fault_addr, fault_catcher,
+ 			       __do_strncpy, &faulted);
++	TASK_REGS(get_current())->tt = save;
++
+ 	if(!faulted) return(strlen(dst));
+ 	else return(-1);
+ }
+@@ -46,11 +54,14 @@
+ int __do_clear_user(void *mem, unsigned long len,
+ 		    void **fault_addr, void **fault_catcher)
+ {
++	struct tt_regs save = TASK_REGS(get_current())->tt;
+ 	unsigned long fault;
+ 	int faulted;
+ 
+ 	fault = __do_user_copy(mem, NULL, len, fault_addr, fault_catcher,
+ 			       __do_clear, &faulted);
++	TASK_REGS(get_current())->tt = save;
++
+ 	if(!faulted) return(0);
+ 	else return(len - (fault - (unsigned long) mem));
+ }
+@@ -58,6 +69,7 @@
+ int __do_strnlen_user(const char *str, unsigned long n,
+ 		      void **fault_addr, void **fault_catcher)
+ {
++	struct tt_regs save = TASK_REGS(get_current())->tt;
+ 	int ret;
+ 	unsigned long *faddrp = (unsigned long *)fault_addr;
+ 	jmp_buf jbuf;
+@@ -71,6 +83,8 @@
+ 	}
+ 	*fault_addr = NULL;
+ 	*fault_catcher = NULL;
++
++	TASK_REGS(get_current())->tt = save;
+ 	return ret;
+ }
+ 
+diff -Naur a/arch/um/kernel/tty_log.c b/arch/um/kernel/tty_log.c
+--- a/arch/um/kernel/tty_log.c	Tue Sep  9 16:43:49 2003
++++ b/arch/um/kernel/tty_log.c	Tue Sep  9 16:49:22 2003
+@@ -13,6 +13,7 @@
+ #include <sys/time.h>
+ #include "init.h"
+ #include "user.h"
++#include "kern_util.h"
+ #include "os.h"
+ 
+ #define TTY_LOG_DIR "./"
+@@ -24,29 +25,40 @@
+ #define TTY_LOG_OPEN 1
+ #define TTY_LOG_CLOSE 2
+ #define TTY_LOG_WRITE 3
++#define TTY_LOG_EXEC 4
++
++#define TTY_READ 1
++#define TTY_WRITE 2
+ 
+ struct tty_log_buf {
+ 	int what;
+ 	unsigned long tty;
+ 	int len;
++	int direction;
++	unsigned long sec;
++	unsigned long usec;
+ };
+ 
+-int open_tty_log(void *tty)
++int open_tty_log(void *tty, void *current_tty)
+ {
+ 	struct timeval tv;
+ 	struct tty_log_buf data;
+ 	char buf[strlen(tty_log_dir) + sizeof("01234567890-01234567\0")];
+ 	int fd;
+ 
++	gettimeofday(&tv, NULL);
+ 	if(tty_log_fd != -1){
+-		data = ((struct tty_log_buf) { what :	TTY_LOG_OPEN,
+-					       tty : (unsigned long) tty,
+-					       len : 0 });
++		data = ((struct tty_log_buf) { .what 	= TTY_LOG_OPEN,
++					       .tty  = (unsigned long) tty,
++					       .len  = sizeof(current_tty),
++					       .direction = 0,
++					       .sec = tv.tv_sec,
++					       .usec = tv.tv_usec } );
+ 		write(tty_log_fd, &data, sizeof(data));
++		write(tty_log_fd, &current_tty, data.len);
+ 		return(tty_log_fd);
+ 	}
+ 
+-	gettimeofday(&tv, NULL);
+ 	sprintf(buf, "%s/%0u-%0u", tty_log_dir, (unsigned int) tv.tv_sec, 
+  		(unsigned int) tv.tv_usec);
+ 
+@@ -62,30 +74,114 @@
+ void close_tty_log(int fd, void *tty)
+ {
+ 	struct tty_log_buf data;
++	struct timeval tv;
+ 
+ 	if(tty_log_fd != -1){
+-		data = ((struct tty_log_buf) { what :	TTY_LOG_CLOSE,
+-					       tty : (unsigned long) tty,
+-					       len : 0 });
++		gettimeofday(&tv, NULL);
++		data = ((struct tty_log_buf) { .what 	= TTY_LOG_CLOSE,
++					       .tty  = (unsigned long) tty,
++					       .len  = 0,
++					       .direction = 0,
++					       .sec = tv.tv_sec,
++					       .usec = tv.tv_usec } );
+ 		write(tty_log_fd, &data, sizeof(data));
+ 		return;
+ 	}
+ 	close(fd);
+ }
+ 
+-int write_tty_log(int fd, char *buf, int len, void *tty)
++static int log_chunk(int fd, const char *buf, int len)
+ {
++	int total = 0, try, missed, n;
++	char chunk[64];
++
++	while(len > 0){
++		try = (len > sizeof(chunk)) ? sizeof(chunk) : len;
++		missed = copy_from_user_proc(chunk, (char *) buf, try);
++		try -= missed;
++		n = write(fd, chunk, try);
++		if(n != try)
++			return(-errno);
++		if(missed != 0)
++			return(-EFAULT);
++
++		len -= try;
++		total += try;
++		buf += try;
++	}
++
++	return(total);
++}
++
++int write_tty_log(int fd, const char *buf, int len, void *tty, int is_read)
++{
++	struct timeval tv;
+ 	struct tty_log_buf data;
++	int direction;
+ 
+ 	if(fd == tty_log_fd){
+-		data = ((struct tty_log_buf) { what :	TTY_LOG_WRITE,
+-					       tty : (unsigned long) tty,
+-					       len : len });
++		gettimeofday(&tv, NULL);
++		direction = is_read ? TTY_READ : TTY_WRITE;
++		data = ((struct tty_log_buf) { .what 	= TTY_LOG_WRITE,
++					       .tty  = (unsigned long) tty,
++					       .len  = len,
++					       .direction = direction,
++					       .sec = tv.tv_sec,
++					       .usec = tv.tv_usec } );
+ 		write(tty_log_fd, &data, sizeof(data));
+ 	}
+-	return(write(fd, buf, len));
++
++	return(log_chunk(fd, buf, len));
+ }
+ 
++void log_exec(char **argv, void *tty)
++{
++	struct timeval tv;
++	struct tty_log_buf data;
++	char **ptr,*arg;
++	int len;
++	
++	if(tty_log_fd == -1) return;
++
++	gettimeofday(&tv, NULL);
++
++	len = 0;
++	for(ptr = argv; ; ptr++){
++		if(copy_from_user_proc(&arg, ptr, sizeof(arg)))
++			return;
++		if(arg == NULL) break;
++		len += strlen_user_proc(arg);
++	}
++
++	data = ((struct tty_log_buf) { .what 	= TTY_LOG_EXEC,
++				       .tty  = (unsigned long) tty,
++				       .len  = len,
++				       .direction = 0,
++				       .sec = tv.tv_sec,
++				       .usec = tv.tv_usec } );
++	write(tty_log_fd, &data, sizeof(data));
++
++	for(ptr = argv; ; ptr++){
++		if(copy_from_user_proc(&arg, ptr, sizeof(arg)))
++			return;
++		if(arg == NULL) break;
++		log_chunk(tty_log_fd, arg, strlen_user_proc(arg));
++	}
++}
++
++extern void register_tty_logger(int (*opener)(void *, void *),
++				int (*writer)(int, const char *, int, 
++					      void *, int),
++				void (*closer)(int, void *));
++
++static int register_logger(void)
++{
++	register_tty_logger(open_tty_log, write_tty_log, close_tty_log);
++	return(0);
++}
++
++__uml_initcall(register_logger);
++
+ static int __init set_tty_log_dir(char *name, int *add)
+ {
+ 	tty_log_dir = name;
+@@ -104,7 +200,7 @@
+ 
+ 	tty_log_fd = strtoul(name, &end, 0);
+ 	if((*end != '\0') || (end == name)){
+-		printk("set_tty_log_fd - strtoul failed on '%s'\n", name);
++		printf("set_tty_log_fd - strtoul failed on '%s'\n", name);
+ 		tty_log_fd = -1;
+ 	}
+ 	return 0;
+diff -Naur a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c
+--- a/arch/um/kernel/um_arch.c	Tue Sep  9 16:45:38 2003
++++ b/arch/um/kernel/um_arch.c	Tue Sep  9 16:50:11 2003
+@@ -38,13 +38,18 @@
+ #include "mode_kern.h"
+ #include "mode.h"
+ 
+-#define DEFAULT_COMMAND_LINE "root=6200"
++#define DEFAULT_COMMAND_LINE "root=ubd0"
+ 
+ struct cpuinfo_um boot_cpu_data = { 
+ 	.loops_per_jiffy	= 0,
+ 	.ipi_pipe		= { -1, -1 }
+ };
+ 
++/* Placeholder to make UML link until the vsyscall stuff is actually 
++ * implemented
++ */
++void *__kernel_vsyscall;
++
+ unsigned long thread_saved_pc(struct task_struct *task)
+ {
+ 	return(os_process_pc(CHOOSE_MODE_PROC(thread_pid_tt, thread_pid_skas,
+@@ -61,10 +66,14 @@
+ 		return 0;
+ #endif
+ 
+-	seq_printf(m, "bogomips\t: %lu.%02lu\n",
++	seq_printf(m, "processor\t: %d\n", index);
++	seq_printf(m, "vendor_id\t: User Mode Linux\n");
++	seq_printf(m, "model name\t: UML\n");
++	seq_printf(m, "mode\t\t: %s\n", CHOOSE_MODE("tt", "skas"));
++	seq_printf(m, "host\t\t: %s\n", host_info);
++	seq_printf(m, "bogomips\t: %lu.%02lu\n\n",
+ 		   loops_per_jiffy/(500000/HZ),
+ 		   (loops_per_jiffy/(5000/HZ)) % 100);
+-	seq_printf(m, "host\t\t: %s\n", host_info);
+ 
+ 	return(0);
+ }
+@@ -134,12 +143,12 @@
+ 	if(umid != NULL){
+ 		snprintf(argv1_begin, 
+ 			 (argv1_end - argv1_begin) * sizeof(*ptr), 
+-			 "(%s)", umid);
++			 "(%s) ", umid);
+ 		ptr = &argv1_begin[strlen(argv1_begin)];
+ 	}
+ 	else ptr = argv1_begin;
+ 
+-	snprintf(ptr, (argv1_end - ptr) * sizeof(*ptr), " [%s]", cmd);
++	snprintf(ptr, (argv1_end - ptr) * sizeof(*ptr), "[%s]", cmd);
+ 	memset(argv1_begin + strlen(argv1_begin), '\0', 
+ 	       argv1_end - argv1_begin - strlen(argv1_begin));
+ #endif
+@@ -179,7 +188,7 @@
+ static int __init uml_ncpus_setup(char *line, int *add)
+ {
+        if (!sscanf(line, "%d", &ncpus)) {
+-               printk("Couldn't parse [%s]\n", line);
++               printf("Couldn't parse [%s]\n", line);
+                return -1;
+        }
+ 
+@@ -210,7 +219,7 @@
+ 
+ static int __init mode_tt_setup(char *line, int *add)
+ {
+-	printk("CONFIG_MODE_TT disabled - 'mode=tt' ignored\n");
++	printf("CONFIG_MODE_TT disabled - 'mode=tt' ignored\n");
+ 	return(0);
+ }
+ 
+@@ -221,7 +230,7 @@
+ 
+ static int __init mode_tt_setup(char *line, int *add)
+ {
+-	printk("CONFIG_MODE_SKAS disabled - 'mode=tt' redundant\n");
++	printf("CONFIG_MODE_SKAS disabled - 'mode=tt' redundant\n");
+ 	return(0);
+ }
+ 
+@@ -369,6 +378,7 @@
+ 		2 * PAGE_SIZE;
+ 
+ 	task_protections((unsigned long) &init_thread_info);
++	os_flush_stdout();
+ 
+ 	return(CHOOSE_MODE(start_uml_tt(), start_uml_skas()));
+ }
+diff -Naur a/arch/um/kernel/umid.c b/arch/um/kernel/umid.c
+--- a/arch/um/kernel/umid.c	Tue Sep  9 16:46:00 2003
++++ b/arch/um/kernel/umid.c	Tue Sep  9 16:51:03 2003
+@@ -33,18 +33,19 @@
+ static int umid_is_random = 1;
+ static int umid_inited = 0;
+ 
+-static int make_umid(void);
++static int make_umid(int (*printer)(const char *fmt, ...));
+ 
+-static int __init set_umid(char *name, int is_random)
++static int __init set_umid(char *name, int is_random, 
++			   int (*printer)(const char *fmt, ...))
+ {
+ 	if(umid_inited){
+-		printk("Unique machine name can't be set twice\n");
++		(*printer)("Unique machine name can't be set twice\n");
+ 		return(-1);
+ 	}
+ 
+ 	if(strlen(name) > UMID_LEN - 1)
+-		printk("Unique machine name is being truncated to %s "
+-		       "characters\n", UMID_LEN);
++		(*printer)("Unique machine name is being truncated to %s "
++			   "characters\n", UMID_LEN);
+ 	strlcpy(umid, name, sizeof(umid));
+ 
+ 	umid_is_random = is_random;
+@@ -54,7 +55,7 @@
+ 
+ static int __init set_umid_arg(char *name, int *add)
+ {
+-	return(set_umid(name, 0));
++	return(set_umid(name, 0, printf));
+ }
+ 
+ __uml_setup("umid=", set_umid_arg,
+@@ -67,7 +68,7 @@
+ {
+ 	int n;
+ 
+-	if(!umid_inited && make_umid()) return(-1);
++	if(!umid_inited && make_umid(printk)) return(-1);
+ 
+ 	n = strlen(uml_dir) + strlen(umid) + strlen(name) + 1;
+ 	if(n > len){
+@@ -92,14 +93,14 @@
+ 	fd = os_open_file(file, of_create(of_excl(of_rdwr(OPENFLAGS()))), 
+ 			  0644);
+ 	if(fd < 0){
+-		printk("Open of machine pid file \"%s\" failed - "
++		printf("Open of machine pid file \"%s\" failed - "
+ 		       "errno = %d\n", file, -fd);
+ 		return 0;
+ 	}
+ 
+ 	sprintf(pid, "%d\n", os_getpid());
+ 	if(write(fd, pid, strlen(pid)) != strlen(pid))
+-		printk("Write of pid file failed - errno = %d\n", errno);
++		printf("Write of pid file failed - errno = %d\n", errno);
+ 	close(fd);
+ 	return 0;
+ }
+@@ -197,7 +198,7 @@
+ 	if((strlen(name) > 0) && (name[strlen(name) - 1] != '/')){
+ 		uml_dir = malloc(strlen(name) + 1);
+ 		if(uml_dir == NULL){
+-			printk("Failed to malloc uml_dir - error = %d\n",
++			printf("Failed to malloc uml_dir - error = %d\n",
+ 			       errno);
+ 			uml_dir = name;
+ 			return(0);
+@@ -217,7 +218,7 @@
+ 		char *home = getenv("HOME");
+ 
+ 		if(home == NULL){
+-			printk("make_uml_dir : no value in environment for "
++			printf("make_uml_dir : no value in environment for "
+ 			       "$HOME\n");
+ 			exit(1);
+ 		}
+@@ -239,25 +240,25 @@
+ 	strcpy(uml_dir, dir);
+ 	
+ 	if((mkdir(uml_dir, 0777) < 0) && (errno != EEXIST)){
+-	        printk("Failed to mkdir %s - errno = %i\n", uml_dir, errno);
++	        printf("Failed to mkdir %s - errno = %i\n", uml_dir, errno);
+ 		return(-1);
+ 	}
+ 	return 0;
+ }
+ 
+-static int __init make_umid(void)
++static int __init make_umid(int (*printer)(const char *fmt, ...))
+ {
+ 	int fd, err;
+ 	char tmp[strlen(uml_dir) + UMID_LEN + 1];
+ 
+ 	strlcpy(tmp, uml_dir, sizeof(tmp));
+ 
+-	if(*umid == 0){
++	if(!umid_inited){
+ 		strcat(tmp, "XXXXXX");
+ 		fd = mkstemp(tmp);
+ 		if(fd < 0){
+-			printk("make_umid - mkstemp failed, errno = %d\n",
+-			       errno);
++			(*printer)("make_umid - mkstemp failed, errno = %d\n",
++				   errno);
+ 			return(1);
+ 		}
+ 
+@@ -267,7 +268,7 @@
+ 		 * for directories.
+ 		 */
+ 		unlink(tmp);
+-		set_umid(&tmp[strlen(uml_dir)], 1);
++		set_umid(&tmp[strlen(uml_dir)], 1, printer);
+ 	}
+ 	
+ 	sprintf(tmp, "%s%s", uml_dir, umid);
+@@ -275,14 +276,14 @@
+ 	if((err = mkdir(tmp, 0777)) < 0){
+ 		if(errno == EEXIST){
+ 			if(not_dead_yet(tmp)){
+-				printk("umid '%s' is in use\n", umid);
++				(*printer)("umid '%s' is in use\n", umid);
+ 				return(-1);
+ 			}
+ 			err = mkdir(tmp, 0777);
+ 		}
+ 	}
+ 	if(err < 0){
+-		printk("Failed to create %s - errno = %d\n", umid, errno);
++		(*printer)("Failed to create %s - errno = %d\n", umid, errno);
+ 		return(-1);
+ 	}
+ 
+@@ -295,7 +296,13 @@
+ );
+ 
+ __uml_postsetup(make_uml_dir);
+-__uml_postsetup(make_umid);
++
++static int __init make_umid_setup(void)
++{
++	return(make_umid(printf));
++}
++
++__uml_postsetup(make_umid_setup);
+ __uml_postsetup(create_pid_file);
+ 
+ /*
+diff -Naur a/arch/um/kernel/user_util.c b/arch/um/kernel/user_util.c
+--- a/arch/um/kernel/user_util.c	Tue Sep  9 16:41:41 2003
++++ b/arch/um/kernel/user_util.c	Tue Sep  9 16:47:43 2003
+@@ -119,17 +119,6 @@
+ 	}
+ }
+ 
+-int clone_and_wait(int (*fn)(void *), void *arg, void *sp, int flags)
+-{
+-	int pid;
+-
+-	pid = clone(fn, sp, flags, arg);
+- 	if(pid < 0) return(-1);
+-	wait_for_stop(pid, SIGSTOP, PTRACE_CONT, NULL);
+-	ptrace(PTRACE_CONT, pid, 0, 0);
+-	return(pid);
+-}
+-
+ int raw(int fd, int complain)
+ {
+ 	struct termios tt;
+diff -Naur a/arch/um/os-Linux/drivers/tuntap_user.c b/arch/um/os-Linux/drivers/tuntap_user.c
+--- a/arch/um/os-Linux/drivers/tuntap_user.c	Tue Sep  9 16:46:16 2003
++++ b/arch/um/os-Linux/drivers/tuntap_user.c	Tue Sep  9 16:51:17 2003
+@@ -142,7 +142,7 @@
+ 			return(-errno);
+ 		}
+ 		memset(&ifr, 0, sizeof(ifr));
+-		ifr.ifr_flags = IFF_TAP;
++		ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
+ 		strlcpy(ifr.ifr_name, pri->dev_name, sizeof(ifr.ifr_name));
+ 		if(ioctl(pri->fd, TUNSETIFF, (void *) &ifr) < 0){
+ 			printk("TUNSETIFF failed, errno = %d", errno);
+diff -Naur a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c
+--- a/arch/um/os-Linux/file.c	Tue Sep  9 16:46:10 2003
++++ b/arch/um/os-Linux/file.c	Tue Sep  9 16:51:13 2003
+@@ -315,7 +315,7 @@
+ 	return(new);
+ }
+ 
+-int create_unix_socket(char *file, int len)
++int create_unix_socket(char *file, int len, int close_on_exec)
+ {
+ 	struct sockaddr_un addr;
+ 	int sock, err;
+@@ -327,6 +327,10 @@
+ 		return(-errno);
+ 	}
+ 
++	if(close_on_exec && fcntl(sock, F_SETFD, 1) < 0)
++		printk("create_unix_socket : Setting FD_CLOEXEC failed, "
++		       "errno = %d", errno);
++
+ 	addr.sun_family = AF_UNIX;
+ 
+ 	/* XXX Be more careful about overflow */
+@@ -342,6 +346,37 @@
+ 	return(sock);
+ }
+ 
++void os_flush_stdout(void)
++{
++	fflush(stdout);
++}
++
++int os_lock_file(int fd, int excl)
++{
++	int type = excl ? F_WRLCK : F_RDLCK;
++	struct flock lock = ((struct flock) { .l_type	= type,
++					      .l_whence	= SEEK_SET,
++					      .l_start	= 0,
++					      .l_len	= 0 } );
++	int err, save;
++
++	err = fcntl(fd, F_SETLK, &lock);
++	if(!err)
++		goto out;
++
++	save = -errno;
++	err = fcntl(fd, F_GETLK, &lock);
++	if(err){
++		err = -errno;
++		goto out;
++	}
++	
++	printk("F_SETLK failed, file already locked by pid %d\n", lock.l_pid);
++	err = save;
++ out:
++	return(err);
++}
++
+ /*
+  * Overrides for Emacs so that we follow Linus's tabbing style.
+  * Emacs will notice this stuff at the end of the file and automatically
+diff -Naur a/arch/um/sys-i386/Makefile b/arch/um/sys-i386/Makefile
+--- a/arch/um/sys-i386/Makefile	Tue Sep  9 16:41:38 2003
++++ b/arch/um/sys-i386/Makefile	Tue Sep  9 16:47:42 2003
+@@ -1,7 +1,8 @@
+-obj-y = bugs.o checksum.o extable.o fault.o ksyms.o ldt.o module.o \
+-	ptrace.o ptrace_user.o semaphore.o sigcontext.o syscalls.o sysrq.o
++obj-y = bugs.o checksum.o extable.o fault.o ksyms.o ldt.o ptrace.o \
++	ptrace_user.o semaphore.o sigcontext.o syscalls.o sysrq.o
+ 
+ obj-$(CONFIG_HIGHMEM) += highmem.o
++obj-$(CONFIG_MODULES) += module.o
+ 
+ USER_OBJS := bugs.o ptrace_user.o sigcontext.o fault.o
+ USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
+@@ -9,6 +10,8 @@
+ SYMLINKS = semaphore.c highmem.c module.c
+ SYMLINKS := $(foreach f,$(SYMLINKS),$(src)/$f)
+ 
++clean-files := $(SYMLINKS)
++
+ semaphore.c-dir = kernel
+ highmem.c-dir = mm
+ module.c-dir = kernel
+@@ -24,8 +27,7 @@
+ $(SYMLINKS): 
+ 	$(call make_link,$@)
+ 
+-clean:
+-	$(MAKE) -C util clean
++subdir- := util
+ 
+ fastdep:
+ 
+diff -Naur a/arch/um/sys-i386/bugs.c b/arch/um/sys-i386/bugs.c
+--- a/arch/um/sys-i386/bugs.c	Tue Sep  9 16:45:37 2003
++++ b/arch/um/sys-i386/bugs.c	Tue Sep  9 16:50:09 2003
+@@ -8,6 +8,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <sys/signal.h>
++#include <asm/ldt.h>
+ #include "kern_util.h"
+ #include "user.h"
+ #include "sysdep/ptrace.h"
+@@ -16,8 +17,8 @@
+ #define MAXTOKEN 64
+ 
+ /* Set during early boot */
+-int cpu_has_cmov = 1;
+-int cpu_has_xmm = 0;
++int host_has_cmov = 1;
++int host_has_xmm = 0;
+ 
+ static char token(int fd, char *buf, int len, char stop)
+ {
+@@ -104,6 +105,25 @@
+ 	return(1);
+ }
+ 
++static void disable_lcall(void)
++{
++	struct modify_ldt_ldt_s ldt;
++	int err;
++
++	bzero(&ldt, sizeof(ldt));
++	ldt.entry_number = 7;
++	ldt.base_addr = 0;
++	ldt.limit = 0;
++	err = modify_ldt(1, &ldt, sizeof(ldt));
++	if(err)
++		printk("Failed to disable lcall7 - errno = %d\n", errno);
++}
++
++void arch_init_thread(void)
++{
++	disable_lcall();
++}
++
+ void arch_check_bugs(void)
+ {
+ 	int have_it;
+@@ -113,8 +133,8 @@
+ 		       "checks\n");
+ 		return;
+ 	}
+-	if(check_cpu_feature("cmov", &have_it)) cpu_has_cmov = have_it;
+-	if(check_cpu_feature("xmm", &have_it)) cpu_has_xmm = have_it;
++	if(check_cpu_feature("cmov", &have_it)) host_has_cmov = have_it;
++	if(check_cpu_feature("xmm", &have_it)) host_has_xmm = have_it;
+ }
+ 
+ int arch_handle_signal(int sig, union uml_pt_regs *regs)
+@@ -130,18 +150,18 @@
+ 	if((*((char *) ip) != 0x0f) || ((*((char *) (ip + 1)) & 0xf0) != 0x40))
+ 		return(0);
+ 
+-	if(cpu_has_cmov == 0)
++	if(host_has_cmov == 0)
+ 		panic("SIGILL caused by cmov, which this processor doesn't "
+ 		      "implement, boot a filesystem compiled for older "
+ 		      "processors");
+-	else if(cpu_has_cmov == 1)
++	else if(host_has_cmov == 1)
+ 		panic("SIGILL caused by cmov, which this processor claims to "
+ 		      "implement");
+-	else if(cpu_has_cmov == -1)
++	else if(host_has_cmov == -1)
+ 		panic("SIGILL caused by cmov, couldn't tell if this processor "
+ 		      "implements it, boot a filesystem compiled for older "
+ 		      "processors");
+-	else panic("Bad value for cpu_has_cmov (%d)", cpu_has_cmov);
++	else panic("Bad value for host_has_cmov (%d)", host_has_cmov);
+ 	return(0);
+ }
+ 
+diff -Naur a/arch/um/uml.lds.S b/arch/um/uml.lds.S
+--- a/arch/um/uml.lds.S	Tue Sep  9 16:43:03 2003
++++ b/arch/um/uml.lds.S	Tue Sep  9 16:48:52 2003
+@@ -26,7 +26,11 @@
+   . = ALIGN(4096);		/* Init code and data */
+   _stext = .;
+   __init_begin = .;
+-  .text.init : { *(.text.init) }
++  .init.text : { 
++	_sinittext = .;
++	*(.init.text)
++	_einittext = .;
++  }
+   . = ALIGN(4096);
+   .text      :
+   {
+@@ -38,7 +42,7 @@
+ 
+   #include "asm/common.lds.S"
+ 
+-  .data.init : { *(.data.init) }
++  init.data : { *(init.data) }
+   .data    :
+   {
+     . = ALIGN(KERNEL_STACK_SIZE);		/* init_task */
+diff -Naur a/arch/um/util/mk_constants_kern.c b/arch/um/util/mk_constants_kern.c
+--- a/arch/um/util/mk_constants_kern.c	Tue Sep  9 16:41:24 2003
++++ b/arch/um/util/mk_constants_kern.c	Tue Sep  9 16:47:30 2003
+@@ -1,5 +1,6 @@
+ #include "linux/kernel.h"
+ #include "linux/stringify.h"
++#include "linux/time.h"
+ #include "asm/page.h"
+ 
+ extern void print_head(void);
+@@ -11,6 +12,7 @@
+ {
+   print_head();
+   print_constant_int("UM_KERN_PAGE_SIZE", PAGE_SIZE);
++
+   print_constant_str("UM_KERN_EMERG", KERN_EMERG);
+   print_constant_str("UM_KERN_ALERT", KERN_ALERT);
+   print_constant_str("UM_KERN_CRIT", KERN_CRIT);
+@@ -19,6 +21,8 @@
+   print_constant_str("UM_KERN_NOTICE", KERN_NOTICE);
+   print_constant_str("UM_KERN_INFO", KERN_INFO);
+   print_constant_str("UM_KERN_DEBUG", KERN_DEBUG);
++
++  print_constant_int("UM_NSEC_PER_SEC", NSEC_PER_SEC);
+   print_tail();
+   return(0);
+ }
+diff -Naur a/fs/Makefile b/fs/Makefile
+--- a/fs/Makefile	Tue Sep  9 16:43:32 2003
++++ b/fs/Makefile	Tue Sep  9 16:49:19 2003
+@@ -91,3 +91,5 @@
+ obj-$(CONFIG_XFS_FS)		+= xfs/
+ obj-$(CONFIG_AFS_FS)		+= afs/
+ obj-$(CONFIG_BEFS_FS)		+= befs/
++obj-$(CONFIG_HOSTFS)		+= hostfs/
++obj-$(CONFIG_HPPFS)		+= hppfs/
+diff -Naur a/fs/hostfs/Makefile b/fs/hostfs/Makefile
+--- a/fs/hostfs/Makefile	Wed Dec 31 19:00:00 1969
++++ b/fs/hostfs/Makefile	Tue Sep  9 16:47:22 2003
+@@ -0,0 +1,36 @@
++# 
++# Copyright (C) 2000 Jeff Dike (jdike@karaya.com)
++# Licensed under the GPL
++#
++
++# struct stat64 changed the inode field name between 2.2 and 2.4 from st_ino
++# to __st_ino.  It stayed in the same place, so as long as the correct name
++# is used, hostfs compiled on 2.2 should work on 2.4 and vice versa.
++
++STAT64_INO_FIELD := $(shell grep -q __st_ino /usr/include/bits/stat.h && \
++				echo __)st_ino
++
++hostfs-objs := hostfs_kern.o hostfs_user.o
++
++obj-y = 
++obj-$(CONFIG_HOSTFS) += hostfs.o
++
++SINGLE_OBJS = $(foreach f,$(patsubst %.o,%,$(obj-y) $(obj-m)),$($(f)-objs))
++
++USER_OBJS := $(filter %_user.o,$(obj-y) $(obj-m) $(SINGLE_OBJS))
++USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
++
++USER_CFLAGS += -DSTAT64_INO_FIELD=$(STAT64_INO_FIELD)
++
++$(USER_OBJS) : %.o: %.c
++	$(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
++
++clean:
++
++modules:
++
++fastdep:
++
++dep:
++
++archmrproper: clean
+diff -Naur a/fs/hostfs/hostfs.h b/fs/hostfs/hostfs.h
+--- a/fs/hostfs/hostfs.h	Wed Dec 31 19:00:00 1969
++++ b/fs/hostfs/hostfs.h	Tue Sep  9 16:47:21 2003
+@@ -0,0 +1,79 @@
++#ifndef __UM_FS_HOSTFS
++#define __UM_FS_HOSTFS
++
++#include "os.h"
++
++/* These are exactly the same definitions as in fs.h, but the names are 
++ * changed so that this file can be included in both kernel and user files.
++ */
++
++#define HOSTFS_ATTR_MODE	1
++#define HOSTFS_ATTR_UID 	2
++#define HOSTFS_ATTR_GID 	4
++#define HOSTFS_ATTR_SIZE	8
++#define HOSTFS_ATTR_ATIME	16
++#define HOSTFS_ATTR_MTIME	32
++#define HOSTFS_ATTR_CTIME	64
++#define HOSTFS_ATTR_ATIME_SET	128
++#define HOSTFS_ATTR_MTIME_SET	256
++#define HOSTFS_ATTR_FORCE	512	/* Not a change, but a change it */
++#define HOSTFS_ATTR_ATTR_FLAG	1024
++
++struct hostfs_iattr {
++	unsigned int	ia_valid;
++	mode_t		ia_mode;
++	uid_t		ia_uid;
++	gid_t		ia_gid;
++	loff_t		ia_size;
++	struct timespec	ia_atime;
++	struct timespec	ia_mtime;
++	struct timespec	ia_ctime;
++	unsigned int	ia_attr_flags;
++};
++
++extern int stat_file(const char *path, unsigned long long *inode_out, 
++		     int *mode_out, int *nlink_out, int *uid_out, int *gid_out,
++		     unsigned long long *size_out, struct timespec *atime_out, 
++		     struct timespec *mtime_out, struct timespec *ctime_out, 
++		     int *blksize_out, unsigned long long *blocks_out);
++extern int access_file(char *path, int r, int w, int x);
++extern int open_file(char *path, int r, int w, int append);
++extern int file_type(const char *path, int *rdev);
++extern void *open_dir(char *path, int *err_out);
++extern char *read_dir(void *stream, unsigned long long *pos, 
++		      unsigned long long *ino_out, int *len_out);
++extern void close_file(void *stream);
++extern void close_dir(void *stream);
++extern int read_file(int fd, unsigned long long *offset, char *buf, int len);
++extern int write_file(int fd, unsigned long long *offset, const char *buf,
++		      int len);
++extern int lseek_file(int fd, long long offset, int whence);
++extern int file_create(char *name, int ur, int uw, int ux, int gr, 
++		       int gw, int gx, int or, int ow, int ox);
++extern int set_attr(const char *file, struct hostfs_iattr *attrs);
++extern int make_symlink(const char *from, const char *to);
++extern int unlink_file(const char *file);
++extern int do_mkdir(const char *file, int mode);
++extern int do_rmdir(const char *file);
++extern int do_mknod(const char *file, int mode, int dev);
++extern int link_file(const char *from, const char *to);
++extern int do_readlink(char *file, char *buf, int size);
++extern int rename_file(char *from, char *to);
++extern int do_statfs(char *root, long *bsize_out, long long *blocks_out, 
++		     long long *bfree_out, long long *bavail_out, 
++		     long long *files_out, long long *ffree_out, 
++		     void *fsid_out, int fsid_size, long *namelen_out, 
++		     long *spare_out);
++
++#endif
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
+--- a/fs/hostfs/hostfs_kern.c	Wed Dec 31 19:00:00 1969
++++ b/fs/hostfs/hostfs_kern.c	Tue Sep  9 16:47:25 2003
+@@ -0,0 +1,1008 @@
++/* 
++ * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
++ * Licensed under the GPL
++ *
++ * Ported the filesystem routines to 2.5.
++ * 2003-02-10 Petr Baudis <pasky@ucw.cz>
++ */
++
++#include <linux/stddef.h>
++#include <linux/fs.h>
++#include <linux/version.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/slab.h>
++#include <linux/pagemap.h>
++#include <linux/blkdev.h>
++#include <linux/list.h>
++#include <linux/buffer_head.h>
++#include <linux/root_dev.h>
++#include <linux/statfs.h>
++#include <asm/uaccess.h>
++#include "hostfs.h"
++#include "kern_util.h"
++#include "kern.h"
++#include "user_util.h"
++#include "2_5compat.h"
++#include "init.h"
++
++struct hostfs_inode_info {
++	char *host_filename;
++	int fd;
++	int mode;
++	struct inode vfs_inode;
++};
++
++static inline struct hostfs_inode_info *HOSTFS_I(struct inode *inode)
++{
++	return(list_entry(inode, struct hostfs_inode_info, vfs_inode));
++}
++
++#define FILE_HOSTFS_I(file) HOSTFS_I((file)->f_dentry->d_inode)
++
++int hostfs_d_delete(struct dentry *dentry)
++{
++	return(1);
++}
++
++struct dentry_operations hostfs_dentry_ops = {
++	.d_delete		= hostfs_d_delete,
++};
++
++/* Changed in hostfs_args before the kernel starts running */
++static char *root_ino = "/";
++static int append = 0;
++
++#define HOSTFS_SUPER_MAGIC 0x00c0ffee
++
++static struct inode_operations hostfs_iops;
++static struct inode_operations hostfs_dir_iops;
++static struct address_space_operations hostfs_link_aops;
++
++static int __init hostfs_args(char *options, int *add)
++{
++	char *ptr;
++
++	ptr = strchr(options, ',');
++	if(ptr != NULL)
++		*ptr++ = '\0';
++	if(*options != '\0')
++		root_ino = options;
++
++	options = ptr;
++	while(options){
++		ptr = strchr(options, ',');
++		if(ptr != NULL)
++			*ptr++ = '\0';
++		if(*options != '\0'){
++			if(!strcmp(options, "append"))
++				append = 1;
++			else printf("hostfs_args - unsupported option - %s\n",
++				    options);
++		}
++		options = ptr;
++	}
++	return(0);
++}
++
++__uml_setup("hostfs=", hostfs_args,
++"hostfs=<root dir>,<flags>,...\n"
++"    This is used to set hostfs parameters.  The root directory argument\n"
++"    is used to confine all hostfs mounts to within the specified directory\n"
++"    tree on the host.  If this isn't specified, then a user inside UML can\n"
++"    mount anything on the host that's accessible to the user that's running\n"
++"    it.\n"
++"    The only flag currently supported is 'append', which specifies that all\n"
++"    files opened by hostfs will be opened in append mode.\n\n"
++);
++
++static char *dentry_name(struct dentry *dentry, int extra)
++{
++	struct dentry *parent;
++	char *root, *name;
++	int len;
++
++	len = 0;
++	parent = dentry;
++	while(parent->d_parent != parent){
++		len += parent->d_name.len + 1;
++		parent = parent->d_parent;
++	}
++	
++	root = HOSTFS_I(parent->d_inode)->host_filename;
++	len += strlen(root);
++	name = kmalloc(len + extra + 1, GFP_KERNEL);
++	if(name == NULL) return(NULL);
++
++	name[len] = '\0';
++	parent = dentry;
++	while(parent->d_parent != parent){
++		len -= parent->d_name.len + 1;
++		name[len] = '/';
++		strncpy(&name[len + 1], parent->d_name.name, 
++			parent->d_name.len);
++		parent = parent->d_parent;
++	}
++	strncpy(name, root, strlen(root));
++	return(name);
++}
++
++static char *inode_name(struct inode *ino, int extra)
++{
++	struct dentry *dentry;
++
++	dentry = list_entry(ino->i_dentry.next, struct dentry, d_alias);
++	return(dentry_name(dentry, extra));
++}
++
++static int read_name(struct inode *ino, char *name)
++{
++	/* The non-int inode fields are copied into ints by stat_file and
++	 * then copied into the inode because passing the actual pointers
++	 * in and having them treated as int * breaks on big-endian machines
++	 */
++	int err;
++	int i_mode, i_nlink, i_blksize;
++	unsigned long long i_size;
++	unsigned long long i_ino;
++	unsigned long long i_blocks;
++
++	err = stat_file(name, &i_ino, &i_mode, &i_nlink, &ino->i_uid, 
++			&ino->i_gid, &i_size, &ino->i_atime, &ino->i_mtime, 
++			&ino->i_ctime, &i_blksize, &i_blocks);
++	if(err) 
++		return(err);
++
++	ino->i_ino = i_ino;
++	ino->i_mode = i_mode;
++	ino->i_nlink = i_nlink;
++	ino->i_size = i_size;
++	ino->i_blksize = i_blksize;
++	ino->i_blocks = i_blocks;
++	if((ino->i_sb->s_dev == ROOT_DEV) && (ino->i_uid == getuid()))
++		ino->i_uid = 0;
++	return(0);
++}
++
++static char *follow_link(char *link)
++{
++	int len, n;
++	char *name, *resolved, *end;
++
++	len = 64;
++	while(1){
++		n = -ENOMEM;
++		name = kmalloc(len, GFP_KERNEL);
++		if(name == NULL)
++			goto out;
++
++		n = do_readlink(link, name, len);
++		if(n < len)
++			break;
++		len *= 2;
++		kfree(name);
++	}
++	if(n < 0)
++		goto out_free;
++
++	if(*name == '/')
++		return(name);
++
++	end = strrchr(link, '/');
++	if(end == NULL)
++		return(name);
++
++	*(end + 1) = '\0';
++	len = strlen(link) + strlen(name) + 1;
++
++	resolved = kmalloc(len, GFP_KERNEL);
++	if(resolved == NULL){
++		n = -ENOMEM;
++		goto out_free;
++	}
++
++	sprintf(resolved, "%s%s", link, name);
++	kfree(name);
++	kfree(link);
++	return(resolved);
++
++ out_free:
++	kfree(name);
++ out:
++	return(ERR_PTR(n));
++}
++
++static int read_inode(struct inode *ino)
++{
++	char *name;
++	int err = 0;
++
++	/* Unfortunately, we are called from iget() when we don't have a dentry
++	 * allocated yet.
++	 */
++	if(list_empty(&ino->i_dentry))
++		goto out;
++ 
++	err = -ENOMEM;
++	name = inode_name(ino, 0);
++	if(name == NULL) 
++		goto out;
++
++	if(file_type(name, NULL) == OS_TYPE_SYMLINK){
++		name = follow_link(name);
++		if(IS_ERR(name)){
++			err = PTR_ERR(name);
++			goto out;
++		}
++	}
++	
++	err = read_name(ino, name);
++	kfree(name);
++ out:
++	return(err);
++}
++
++int hostfs_statfs(struct super_block *sb, struct kstatfs *sf)
++{
++	/* do_statfs uses struct statfs64 internally, but the linux kernel
++	 * struct statfs still has 32-bit versions for most of these fields,
++	 * so we convert them here
++	 */
++	int err;
++	long long f_blocks;
++	long long f_bfree;
++	long long f_bavail;
++	long long f_files;
++	long long f_ffree;
++
++	err = do_statfs(HOSTFS_I(sb->s_root->d_inode)->host_filename,
++			&sf->f_bsize, &f_blocks, &f_bfree, &f_bavail, &f_files,
++			&f_ffree, &sf->f_fsid, sizeof(sf->f_fsid), 
++			&sf->f_namelen, sf->f_spare);
++	if(err) return(err);
++	sf->f_blocks = f_blocks;
++	sf->f_bfree = f_bfree;
++	sf->f_bavail = f_bavail;
++	sf->f_files = f_files;
++	sf->f_ffree = f_ffree;
++	sf->f_type = HOSTFS_SUPER_MAGIC;
++	return(0);
++}
++
++static struct inode *hostfs_alloc_inode(struct super_block *sb)
++{
++	struct hostfs_inode_info *hi;
++
++	hi = kmalloc(sizeof(*hi), GFP_KERNEL);
++	if(hi == NULL) 
++		return(NULL);
++
++	*hi = ((struct hostfs_inode_info) { .host_filename	= NULL,
++					    .fd			= -1,
++					    .mode		= 0 });
++	inode_init_once(&hi->vfs_inode);
++	return(&hi->vfs_inode);
++}
++
++static void hostfs_destroy_inode(struct inode *inode)
++{
++	if(HOSTFS_I(inode)->host_filename) 
++		kfree(HOSTFS_I(inode)->host_filename);
++
++	if(HOSTFS_I(inode)->fd != -1) 
++		close_file(&HOSTFS_I(inode)->fd);
++
++	kfree(HOSTFS_I(inode));
++}
++
++static void hostfs_read_inode(struct inode *inode)
++{
++	read_inode(inode);
++}
++
++static struct super_operations hostfs_sbops = { 
++	.alloc_inode	= hostfs_alloc_inode,
++	.destroy_inode	= hostfs_destroy_inode,
++	.read_inode	= hostfs_read_inode,
++	.statfs		= hostfs_statfs,
++};
++
++int hostfs_readdir(struct file *file, void *ent, filldir_t filldir)
++{
++	void *dir;
++	char *name;
++	unsigned long long next, ino;
++	int error, len;
++
++	name = dentry_name(file->f_dentry, 0);
++	if(name == NULL) return(-ENOMEM);
++	dir = open_dir(name, &error);
++	kfree(name);
++	if(dir == NULL) return(-error);
++	next = file->f_pos;
++	while((name = read_dir(dir, &next, &ino, &len)) != NULL){
++		error = (*filldir)(ent, name, len, file->f_pos, 
++				   ino, DT_UNKNOWN);
++		if(error) break;
++		file->f_pos = next;
++	}
++	close_dir(dir);
++	return(0);
++}
++
++int hostfs_file_open(struct inode *ino, struct file *file)
++{
++	char *name;
++	int mode = 0, r = 0, w = 0, fd;
++
++	mode = file->f_mode & (FMODE_READ | FMODE_WRITE);
++	if((mode & HOSTFS_I(ino)->mode) == mode)
++		return(0);
++
++	/* The file may already have been opened, but with the wrong access,
++	 * so this resets things and reopens the file with the new access.
++	 */
++	if(HOSTFS_I(ino)->fd != -1){
++		close_file(&HOSTFS_I(ino)->fd);
++		HOSTFS_I(ino)->fd = -1;
++	}
++
++	HOSTFS_I(ino)->mode |= mode;
++	if(HOSTFS_I(ino)->mode & FMODE_READ) 
++		r = 1;
++	if(HOSTFS_I(ino)->mode & FMODE_WRITE) 
++		w = 1;
++	if(w) 
++		r = 1;
++
++	name = dentry_name(file->f_dentry, 0);
++	if(name == NULL) 
++		return(-ENOMEM);
++
++	fd = open_file(name, r, w, append);
++	kfree(name);
++	if(fd < 0) return(fd);
++	FILE_HOSTFS_I(file)->fd = fd;
++
++	return(0);
++}
++
++int hostfs_fsync(struct file *file, struct dentry *dentry, int datasync)
++{
++	return(0);
++}
++
++static struct file_operations hostfs_file_fops = {
++	.llseek		= generic_file_llseek,
++	.read		= generic_file_read,
++	.write		= generic_file_write,
++	.mmap		= generic_file_mmap,
++	.open		= hostfs_file_open,
++	.release	= NULL,
++	.fsync		= hostfs_fsync,
++};
++
++static struct file_operations hostfs_dir_fops = {
++	.readdir	= hostfs_readdir,
++	.read		= generic_read_dir,
++};
++
++int hostfs_writepage(struct page *page, struct writeback_control *wbc)
++{
++	struct address_space *mapping = page->mapping;
++	struct inode *inode = mapping->host;
++	char *buffer;
++	unsigned long long base;
++	int count = PAGE_CACHE_SIZE;
++	int end_index = inode->i_size >> PAGE_CACHE_SHIFT;
++	int err;
++
++	if (page->index >= end_index)
++		count = inode->i_size & (PAGE_CACHE_SIZE-1);
++
++	buffer = kmap(page);
++	base = ((unsigned long long) page->index) << PAGE_CACHE_SHIFT;
++
++	err = write_file(HOSTFS_I(inode)->fd, &base, buffer, count);
++	if(err != count){
++		ClearPageUptodate(page);
++		goto out;
++	}
++
++	if (base > inode->i_size)
++		inode->i_size = base;
++
++	if (PageError(page))
++		ClearPageError(page);	
++	err = 0;
++
++ out:	
++	kunmap(page);
++
++	unlock_page(page);
++	return err; 
++}
++
++int hostfs_readpage(struct file *file, struct page *page)
++{
++	char *buffer;
++	long long start;
++	int err = 0;
++
++	start = (long long) page->index << PAGE_CACHE_SHIFT;
++	buffer = kmap(page);
++	err = read_file(FILE_HOSTFS_I(file)->fd, &start, buffer,
++			PAGE_CACHE_SIZE);
++	if(err < 0) goto out;
++
++	memset(&buffer[err], 0, PAGE_CACHE_SIZE - err);
++
++	flush_dcache_page(page);
++	SetPageUptodate(page);
++	if (PageError(page)) ClearPageError(page);
++	err = 0;
++ out:
++	kunmap(page);
++	unlock_page(page);
++	return(err);
++}
++
++int hostfs_prepare_write(struct file *file, struct page *page, 
++			 unsigned int from, unsigned int to)
++{
++	char *buffer;
++	long long start, tmp;
++	int err;
++
++	start = (long long) page->index << PAGE_CACHE_SHIFT;
++	buffer = kmap(page);
++	if(from != 0){
++		tmp = start;
++		err = read_file(FILE_HOSTFS_I(file)->fd, &tmp, buffer,
++				from);
++		if(err < 0) goto out;
++	}
++	if(to != PAGE_CACHE_SIZE){
++		start += to;
++		err = read_file(FILE_HOSTFS_I(file)->fd, &start, buffer + to,
++				PAGE_CACHE_SIZE - to);
++		if(err < 0) goto out;		
++	}
++	err = 0;
++ out:
++	kunmap(page);
++	return(err);
++}
++
++int hostfs_commit_write(struct file *file, struct page *page, unsigned from,
++		 unsigned to)
++{
++	struct address_space *mapping = page->mapping;
++	struct inode *inode = mapping->host;
++	char *buffer;
++	long long start;
++	int err = 0;
++
++	start = (long long) (page->index << PAGE_CACHE_SHIFT) + from;
++	buffer = kmap(page);
++	err = write_file(FILE_HOSTFS_I(file)->fd, &start, buffer + from, 
++			 to - from);
++	if(err > 0) err = 0;
++	if(!err && (start > inode->i_size))
++		inode->i_size = start;
++
++	kunmap(page);
++	return(err);
++}
++
++static struct address_space_operations hostfs_aops = {
++	.writepage 	= hostfs_writepage,
++	.readpage	= hostfs_readpage,
++/* 	.set_page_dirty = __set_page_dirty_nobuffers, */
++	.prepare_write	= hostfs_prepare_write,
++	.commit_write	= hostfs_commit_write
++};
++
++static int init_inode(struct inode *inode, struct dentry *dentry)
++{
++	char *name;
++	int type, err = -ENOMEM, rdev;
++
++	if(dentry){
++		name = dentry_name(dentry, 0);
++		if(name == NULL)
++			goto out;
++		type = file_type(name, &rdev);
++		kfree(name);
++	}
++	else type = OS_TYPE_DIR;
++
++	err = 0;
++	if(type == OS_TYPE_SYMLINK)
++		inode->i_op = &page_symlink_inode_operations;
++	else if(type == OS_TYPE_DIR)
++		inode->i_op = &hostfs_dir_iops;
++	else inode->i_op = &hostfs_iops;
++
++	if(type == OS_TYPE_DIR) inode->i_fop = &hostfs_dir_fops;
++	else inode->i_fop = &hostfs_file_fops;
++
++	if(type == OS_TYPE_SYMLINK) 
++		inode->i_mapping->a_ops = &hostfs_link_aops;
++	else inode->i_mapping->a_ops = &hostfs_aops;
++
++	switch (type) {
++	case OS_TYPE_CHARDEV:
++		init_special_inode(inode, S_IFCHR, rdev);
++		break;
++	case OS_TYPE_BLOCKDEV:
++		init_special_inode(inode, S_IFBLK, rdev);
++		break;
++	case OS_TYPE_FIFO:
++		init_special_inode(inode, S_IFIFO, 0);
++		break;
++	case OS_TYPE_SOCK:
++		init_special_inode(inode, S_IFSOCK, 0);
++		break;
++	}
++ out:
++	return(err);
++}
++
++int hostfs_create(struct inode *dir, struct dentry *dentry, int mode, 
++                 struct nameidata *nd)
++{
++	struct inode *inode;
++	char *name;
++	int error, fd;
++
++	error = -ENOMEM;
++	inode = iget(dir->i_sb, 0);
++	if(inode == NULL) goto out;
++
++	error = init_inode(inode, dentry);
++	if(error) 
++		goto out_put;
++	
++	error = -ENOMEM;
++	name = dentry_name(dentry, 0);
++	if(name == NULL)
++		goto out_put;
++
++	fd = file_create(name, 
++			 mode & S_IRUSR, mode & S_IWUSR, mode & S_IXUSR, 
++			 mode & S_IRGRP, mode & S_IWGRP, mode & S_IXGRP, 
++			 mode & S_IROTH, mode & S_IWOTH, mode & S_IXOTH);
++	if(fd < 0) 
++		error = fd;
++	else error = read_name(inode, name);
++
++	kfree(name);
++	if(error)
++		goto out_put;
++
++	HOSTFS_I(inode)->fd = fd;
++	HOSTFS_I(inode)->mode = FMODE_READ | FMODE_WRITE;
++	d_instantiate(dentry, inode);
++	return(0);
++
++ out_put:
++	iput(inode);
++ out:
++	return(error);
++}
++
++struct dentry *hostfs_lookup(struct inode *ino, struct dentry *dentry, 
++                            struct nameidata *nd)
++{
++	struct inode *inode;
++	char *name;
++	int err;
++
++	err = -ENOMEM;
++	inode = iget(ino->i_sb, 0);
++	if(inode == NULL) 
++		goto out;
++ 
++	err = init_inode(inode, dentry);
++	if(err) 
++		goto out_put;
++
++	err = -ENOMEM;
++	name = dentry_name(dentry, 0);
++	if(name == NULL)
++		goto out_put;
++
++	err = read_name(inode, name);
++	kfree(name);
++	if(err == -ENOENT){
++		iput(inode);
++		inode = NULL;
++	}
++	else if(err)
++		goto out_put;
++
++	d_add(dentry, inode);
++	dentry->d_op = &hostfs_dentry_ops;
++	return(NULL);
++
++ out_put:
++	iput(inode);
++ out:
++	return(ERR_PTR(err));
++}
++
++static char *inode_dentry_name(struct inode *ino, struct dentry *dentry)
++{
++        char *file;
++	int len;
++
++	file = inode_name(ino, dentry->d_name.len + 1);
++	if(file == NULL) return(NULL);
++        strcat(file, "/");
++	len = strlen(file);
++        strncat(file, dentry->d_name.name, dentry->d_name.len);
++	file[len + dentry->d_name.len] = '\0';
++        return(file);
++}
++
++int hostfs_link(struct dentry *to, struct inode *ino, struct dentry *from)
++{
++        char *from_name, *to_name;
++        int err;
++
++        if((from_name = inode_dentry_name(ino, from)) == NULL) 
++                return(-ENOMEM);
++        to_name = dentry_name(to, 0);
++	if(to_name == NULL){
++		kfree(from_name);
++		return(-ENOMEM);
++	}
++        err = link_file(to_name, from_name);
++        kfree(from_name);
++        kfree(to_name);
++        return(err);
++}
++
++int hostfs_unlink(struct inode *ino, struct dentry *dentry)
++{
++	char *file;
++	int err;
++
++	if((file = inode_dentry_name(ino, dentry)) == NULL) return(-ENOMEM);
++	if(append)
++		return(-EPERM);
++
++	err = unlink_file(file);
++	kfree(file);
++	return(err);
++}
++
++int hostfs_symlink(struct inode *ino, struct dentry *dentry, const char *to)
++{
++	char *file;
++	int err;
++
++	if((file = inode_dentry_name(ino, dentry)) == NULL) return(-ENOMEM);
++	err = make_symlink(file, to);
++	kfree(file);
++	return(err);
++}
++
++int hostfs_mkdir(struct inode *ino, struct dentry *dentry, int mode)
++{
++	char *file;
++	int err;
++
++	if((file = inode_dentry_name(ino, dentry)) == NULL) return(-ENOMEM);
++	err = do_mkdir(file, mode);
++	kfree(file);
++	return(err);
++}
++
++int hostfs_rmdir(struct inode *ino, struct dentry *dentry)
++{
++	char *file;
++	int err;
++
++	if((file = inode_dentry_name(ino, dentry)) == NULL) return(-ENOMEM);
++	err = do_rmdir(file);
++	kfree(file);
++	return(err);
++}
++
++int hostfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
++{
++	struct inode *inode;
++	char *name;
++	int err = -ENOMEM;
++ 
++	inode = iget(dir->i_sb, 0);
++	if(inode == NULL) 
++		goto out;
++
++	err = init_inode(inode, dentry);
++	if(err) 
++		goto out_put;
++
++	err = -ENOMEM;
++	name = dentry_name(dentry, 0);
++	if(name == NULL)
++		goto out_put;
++
++	init_special_inode(inode, mode, dev);
++	err = do_mknod(name, mode, dev);
++	if(err)
++		goto out_free;
++
++	err = read_name(inode, name);
++	kfree(name);
++	if(err)
++		goto out_put;
++
++	d_instantiate(dentry, inode);
++	return(0);
++
++ out_free:
++	kfree(name);
++ out_put:
++	iput(inode);
++ out:
++	return(err);
++}
++
++int hostfs_rename(struct inode *from_ino, struct dentry *from,
++		  struct inode *to_ino, struct dentry *to)
++{
++	char *from_name, *to_name;
++	int err;
++
++	if((from_name = inode_dentry_name(from_ino, from)) == NULL)
++		return(-ENOMEM);
++	if((to_name = inode_dentry_name(to_ino, to)) == NULL){
++		kfree(from_name);
++		return(-ENOMEM);
++	}
++	err = rename_file(from_name, to_name);
++	kfree(from_name);
++	kfree(to_name);
++	return(err);
++}
++
++void hostfs_truncate(struct inode *ino)
++{
++	not_implemented();
++}
++
++int hostfs_permission(struct inode *ino, int desired, struct nameidata *nd)
++{
++	char *name;
++	int r = 0, w = 0, x = 0, err;
++
++	if(desired & MAY_READ) r = 1;
++	if(desired & MAY_WRITE) w = 1;
++	if(desired & MAY_EXEC) x = 1;
++	name = inode_name(ino, 0);
++	if(name == NULL) return(-ENOMEM);
++	err = access_file(name, r, w, x);
++	kfree(name);
++	if(!err) err = vfs_permission(ino, desired);
++	return(err);
++}
++
++int hostfs_setattr(struct dentry *dentry, struct iattr *attr)
++{
++	struct hostfs_iattr attrs;
++	char *name;
++	int err;
++	
++	if(append) 
++		attr->ia_valid &= ~ATTR_SIZE;
++
++	attrs.ia_valid = 0;
++	if(attr->ia_valid & ATTR_MODE){
++		attrs.ia_valid |= HOSTFS_ATTR_MODE;
++		attrs.ia_mode = attr->ia_mode;
++	}
++	if(attr->ia_valid & ATTR_UID){
++		if((dentry->d_inode->i_sb->s_dev == ROOT_DEV) && 
++		   (attr->ia_uid == 0))
++			attr->ia_uid = getuid();
++		attrs.ia_valid |= HOSTFS_ATTR_UID;
++		attrs.ia_uid = attr->ia_uid;
++	}
++	if(attr->ia_valid & ATTR_GID){
++		if((dentry->d_inode->i_sb->s_dev == ROOT_DEV) && 
++		   (attr->ia_gid == 0))
++			attr->ia_gid = getuid();
++		attrs.ia_valid |= HOSTFS_ATTR_GID;
++		attrs.ia_gid = attr->ia_gid;
++	}
++	if(attr->ia_valid & ATTR_SIZE){
++		attrs.ia_valid |= HOSTFS_ATTR_SIZE;
++		attrs.ia_size = attr->ia_size;
++	}
++	if(attr->ia_valid & ATTR_ATIME){
++		attrs.ia_valid |= HOSTFS_ATTR_ATIME;
++		attrs.ia_atime = attr->ia_atime;
++	}
++	if(attr->ia_valid & ATTR_MTIME){
++		attrs.ia_valid |= HOSTFS_ATTR_MTIME;
++		attrs.ia_mtime = attr->ia_mtime;
++	}
++	if(attr->ia_valid & ATTR_CTIME){
++		attrs.ia_valid |= HOSTFS_ATTR_CTIME;
++		attrs.ia_ctime = attr->ia_ctime;
++	}
++	if(attr->ia_valid & ATTR_ATIME_SET){
++		attrs.ia_valid |= HOSTFS_ATTR_ATIME_SET;
++	}
++	if(attr->ia_valid & ATTR_MTIME_SET){
++		attrs.ia_valid |= HOSTFS_ATTR_MTIME_SET;
++	}
++	name = dentry_name(dentry, 0);
++	if(name == NULL) return(-ENOMEM);
++	err = set_attr(name, &attrs);
++	kfree(name);
++	if(err)
++		return(err);
++
++	return(inode_setattr(dentry->d_inode, attr));
++}
++
++int hostfs_getattr(struct vfsmount *mnt, struct dentry *dentry, 
++	   struct kstat *stat)
++{
++	generic_fillattr(dentry->d_inode, stat);
++	return(0);
++}
++
++static struct inode_operations hostfs_iops = {
++	.create		= hostfs_create,
++	.link		= hostfs_link,
++	.unlink		= hostfs_unlink,
++	.symlink	= hostfs_symlink,
++	.mkdir		= hostfs_mkdir,
++	.rmdir		= hostfs_rmdir,
++	.mknod		= hostfs_mknod,
++	.rename		= hostfs_rename,
++	.truncate	= hostfs_truncate,
++	.permission	= hostfs_permission,
++	.setattr	= hostfs_setattr,
++	.getattr	= hostfs_getattr,
++};
++
++static struct inode_operations hostfs_dir_iops = {
++	.create		= hostfs_create,
++	.lookup		= hostfs_lookup,
++	.link		= hostfs_link,
++	.unlink		= hostfs_unlink,
++	.symlink	= hostfs_symlink,
++	.mkdir		= hostfs_mkdir,
++	.rmdir		= hostfs_rmdir,
++	.mknod		= hostfs_mknod,
++	.rename		= hostfs_rename,
++	.truncate	= hostfs_truncate,
++	.permission	= hostfs_permission,
++	.setattr	= hostfs_setattr,
++	.getattr	= hostfs_getattr,
++};
++
++int hostfs_link_readpage(struct file *file, struct page *page)
++{
++	char *buffer, *name;
++	long long start;
++	int err;
++
++	start = page->index << PAGE_CACHE_SHIFT;
++	buffer = kmap(page);
++	name = inode_name(page->mapping->host, 0);
++	if(name == NULL) return(-ENOMEM);
++	err = do_readlink(name, buffer, PAGE_CACHE_SIZE);
++	kfree(name);
++	if(err == PAGE_CACHE_SIZE)
++		err = -E2BIG;
++	else if(err > 0){
++		flush_dcache_page(page);
++		SetPageUptodate(page);
++		if (PageError(page)) ClearPageError(page);
++		err = 0;
++	}
++	kunmap(page);
++	unlock_page(page);
++	return(err);
++}
++
++static struct address_space_operations hostfs_link_aops = {
++	.readpage	= hostfs_link_readpage,
++};
++
++static int hostfs_fill_sb_common(struct super_block *sb, void *d, int silent)
++{
++	struct inode *root_inode;
++	char *name, *data = d;
++	int err;
++
++	sb->s_blocksize = 1024;
++	sb->s_blocksize_bits = 10;
++	sb->s_magic = HOSTFS_SUPER_MAGIC;
++	sb->s_op = &hostfs_sbops;
++
++	if((data == NULL) || (*data == '\0')) 
++		data = root_ino;
++
++	err = -ENOMEM;
++	name = kmalloc(strlen(data) + 1, GFP_KERNEL);
++	if(name == NULL) 
++		goto out;
++
++	strcpy(name, data);
++
++	root_inode = iget(sb, 0);
++	if(root_inode == NULL)
++		goto out_free;
++
++	err = init_inode(root_inode, NULL);
++	if(err)
++		goto out_put;
++
++	HOSTFS_I(root_inode)->host_filename = name;
++
++	err = -ENOMEM;
++	sb->s_root = d_alloc_root(root_inode);
++	if(sb->s_root == NULL)
++		goto out_put;
++
++	err = read_inode(root_inode);
++	if(err)
++		goto out_put;
++
++	return(0);
++
++ out_put:
++	iput(root_inode);
++ out_free:
++	kfree(name);
++ out:
++	return(err);
++}
++
++static struct super_block *hostfs_read_sb(struct file_system_type *type,
++					     int flags, const char *dev_name,
++					     void *data)
++{
++	return(get_sb_nodev(type, flags, data, hostfs_fill_sb_common));
++}
++
++static struct file_system_type hostfs_type = {
++	.owner 		= THIS_MODULE,
++	.name 		= "hostfs",
++	.get_sb 	= hostfs_read_sb,
++	.kill_sb	= kill_anon_super,
++	.fs_flags 	= 0,
++};
++
++static int __init init_hostfs(void)
++{
++	return(register_filesystem(&hostfs_type));
++}
++
++static void __exit exit_hostfs(void)
++{
++	unregister_filesystem(&hostfs_type);
++}
++
++module_init(init_hostfs)
++module_exit(exit_hostfs)
++MODULE_LICENSE("GPL");
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/fs/hostfs/hostfs_user.c b/fs/hostfs/hostfs_user.c
+--- a/fs/hostfs/hostfs_user.c	Wed Dec 31 19:00:00 1969
++++ b/fs/hostfs/hostfs_user.c	Tue Sep  9 16:47:43 2003
+@@ -0,0 +1,361 @@
++/* 
++ * Copyright (C) 2000 Jeff Dike (jdike@karaya.com)
++ * Licensed under the GPL
++ */
++
++#include <unistd.h>
++#include <stdio.h>
++#include <fcntl.h>
++#include <dirent.h>
++#include <errno.h>
++#include <utime.h>
++#include <string.h>
++#include <sys/stat.h>
++#include <sys/time.h>
++#include <sys/vfs.h>
++#include "hostfs.h"
++#include "kern_util.h"
++#include "user.h"
++
++int stat_file(const char *path, unsigned long long *inode_out, int *mode_out,
++	      int *nlink_out, int *uid_out, int *gid_out, 
++	      unsigned long long *size_out, struct timespec *atime_out,
++	      struct timespec *mtime_out, struct timespec *ctime_out,
++	      int *blksize_out, unsigned long long *blocks_out)
++{
++	struct stat64 buf;
++
++	if(lstat64(path, &buf) < 0) 
++		return(-errno);
++
++	/* See the Makefile for why STAT64_INO_FIELD is passed in
++	 * by the build
++	 */
++	if(inode_out != NULL) *inode_out = buf.STAT64_INO_FIELD;
++	if(mode_out != NULL) *mode_out = buf.st_mode;
++	if(nlink_out != NULL) *nlink_out = buf.st_nlink;
++	if(uid_out != NULL) *uid_out = buf.st_uid;
++	if(gid_out != NULL) *gid_out = buf.st_gid;
++	if(size_out != NULL) *size_out = buf.st_size;
++	if(atime_out != NULL) {
++		atime_out->tv_sec = buf.st_atime;
++		atime_out->tv_nsec = 0;
++	}
++	if(mtime_out != NULL) {
++		mtime_out->tv_sec = buf.st_mtime;
++		mtime_out->tv_nsec = 0;
++	}
++	if(ctime_out != NULL) {
++		ctime_out->tv_sec = buf.st_ctime;
++		ctime_out->tv_nsec = 0;
++	}
++	if(blksize_out != NULL) *blksize_out = buf.st_blksize;
++	if(blocks_out != NULL) *blocks_out = buf.st_blocks;
++	return(0);
++}
++
++int file_type(const char *path, int *rdev)
++{
++ 	struct stat64 buf;
++
++	if(lstat64(path, &buf) < 0) 
++		return(-errno);
++	if(rdev != NULL) 
++		*rdev = buf.st_rdev;
++
++	if(S_ISDIR(buf.st_mode)) return(OS_TYPE_DIR);
++	else if(S_ISLNK(buf.st_mode)) return(OS_TYPE_SYMLINK);
++	else if(S_ISCHR(buf.st_mode)) return(OS_TYPE_CHARDEV);
++	else if(S_ISBLK(buf.st_mode)) return(OS_TYPE_BLOCKDEV);
++	else if(S_ISFIFO(buf.st_mode))return(OS_TYPE_FIFO);
++	else if(S_ISSOCK(buf.st_mode))return(OS_TYPE_SOCK);
++	else return(OS_TYPE_FILE);
++}
++
++int access_file(char *path, int r, int w, int x)
++{
++	int mode = 0;
++
++	if(r) mode = R_OK;
++	if(w) mode |= W_OK;
++	if(x) mode |= X_OK;
++	if(access(path, mode) != 0) return(-errno);
++	else return(0);
++}
++
++int open_file(char *path, int r, int w, int append)
++{
++	int mode = 0, fd;
++
++	if(r && !w) 
++		mode = O_RDONLY;
++	else if(!r && w) 
++		mode = O_WRONLY;
++	else if(r && w) 
++		mode = O_RDWR;
++	else panic("Impossible mode in open_file");
++
++	if(append)
++		mode |= O_APPEND;
++	fd = open64(path, mode);
++	if(fd < 0) return(-errno);
++	else return(fd);
++}
++
++void *open_dir(char *path, int *err_out)
++{
++	DIR *dir;
++
++	dir = opendir(path);
++	*err_out = errno;
++	if(dir == NULL) return(NULL);
++	return(dir);
++}
++
++char *read_dir(void *stream, unsigned long long *pos, 
++	       unsigned long long *ino_out, int *len_out)
++{
++	DIR *dir = stream;
++	struct dirent *ent;
++
++	seekdir(dir, *pos);
++	ent = readdir(dir);
++	if(ent == NULL) return(NULL);
++	*len_out = strlen(ent->d_name);
++	*ino_out = ent->d_ino;
++	*pos = telldir(dir);
++	return(ent->d_name);
++}
++
++int read_file(int fd, unsigned long long *offset, char *buf, int len)
++{
++	int n;
++
++	n = pread64(fd, buf, len, *offset);
++	if(n < 0) return(-errno);
++	*offset += n;
++	return(n);
++}
++
++int write_file(int fd, unsigned long long *offset, const char *buf, int len)
++{
++	int n;
++
++	n = pwrite64(fd, buf, len, *offset);
++	if(n < 0) return(-errno);
++	*offset += n;
++	return(n);
++}
++
++int lseek_file(int fd, long long offset, int whence)
++{
++	int ret;
++
++	ret = lseek64(fd, offset, whence);
++	if(ret < 0) return(-errno);
++	return(0);
++}
++
++void close_file(void *stream)
++{
++	close(*((int *) stream));
++}
++
++void close_dir(void *stream)
++{
++	closedir(stream);
++}
++
++int file_create(char *name, int ur, int uw, int ux, int gr, 
++		int gw, int gx, int or, int ow, int ox)
++{
++	int mode, fd;
++
++	mode = 0;
++	mode |= ur ? S_IRUSR : 0;
++	mode |= uw ? S_IWUSR : 0;
++	mode |= ux ? S_IXUSR : 0;
++	mode |= gr ? S_IRGRP : 0;
++	mode |= gw ? S_IWGRP : 0;
++	mode |= gx ? S_IXGRP : 0;
++	mode |= or ? S_IROTH : 0;
++	mode |= ow ? S_IWOTH : 0;
++	mode |= ox ? S_IXOTH : 0;
++	fd = open64(name, O_CREAT | O_RDWR, mode);
++	if(fd < 0) 
++		return(-errno);
++	return(fd);
++}
++
++int set_attr(const char *file, struct hostfs_iattr *attrs)
++{
++	struct utimbuf buf;
++	int err, ma;
++
++	if(attrs->ia_valid & HOSTFS_ATTR_MODE){
++		if(chmod(file, attrs->ia_mode) != 0) return(-errno);
++	}
++	if(attrs->ia_valid & HOSTFS_ATTR_UID){
++		if(chown(file, attrs->ia_uid, -1)) return(-errno);
++	}
++	if(attrs->ia_valid & HOSTFS_ATTR_GID){
++		if(chown(file, -1, attrs->ia_gid)) return(-errno);
++	}
++	if(attrs->ia_valid & HOSTFS_ATTR_SIZE){
++		if(truncate(file, attrs->ia_size)) return(-errno);
++	}
++	ma = HOSTFS_ATTR_ATIME_SET | HOSTFS_ATTR_MTIME_SET;
++	if((attrs->ia_valid & ma) == ma){
++		buf.actime = attrs->ia_atime.tv_sec;
++		buf.modtime = attrs->ia_mtime.tv_sec;
++		if(utime(file, &buf) != 0) return(-errno);
++	}
++	else {
++		struct timespec ts;
++
++		if(attrs->ia_valid & HOSTFS_ATTR_ATIME_SET){
++			err = stat_file(file, NULL, NULL, NULL, NULL, NULL, 
++					NULL, NULL, &ts, NULL, NULL, NULL);
++			if(err != 0) 
++				return(err);
++			buf.actime = attrs->ia_atime.tv_sec;
++			buf.modtime = ts.tv_sec;
++			if(utime(file, &buf) != 0) 
++				return(-errno);
++		}
++		if(attrs->ia_valid & HOSTFS_ATTR_MTIME_SET){
++			err = stat_file(file, NULL, NULL, NULL, NULL, NULL, 
++					NULL, &ts, NULL, NULL, NULL, NULL);
++			if(err != 0) 
++				return(err);
++			buf.actime = ts.tv_sec;
++			buf.modtime = attrs->ia_mtime.tv_sec;
++			if(utime(file, &buf) != 0) 
++				return(-errno);
++		}
++	}
++	if(attrs->ia_valid & HOSTFS_ATTR_CTIME) ;
++	if(attrs->ia_valid & (HOSTFS_ATTR_ATIME | HOSTFS_ATTR_MTIME)){
++		err = stat_file(file, NULL, NULL, NULL, NULL, NULL, NULL, 
++				&attrs->ia_atime, &attrs->ia_mtime, NULL, 
++				NULL, NULL);
++		if(err != 0) return(err);
++	}
++	return(0);
++}
++
++int make_symlink(const char *from, const char *to)
++{
++	int err;
++
++	err = symlink(to, from);
++	if(err) return(-errno);
++	return(0);
++}
++
++int unlink_file(const char *file)
++{
++	int err;
++
++	err = unlink(file);
++	if(err) return(-errno);
++	return(0);
++}
++
++int do_mkdir(const char *file, int mode)
++{
++	int err;
++
++	err = mkdir(file, mode);
++	if(err) return(-errno);
++	return(0);
++}
++
++int do_rmdir(const char *file)
++{
++	int err;
++
++	err = rmdir(file);
++	if(err) return(-errno);
++	return(0);
++}
++
++int do_mknod(const char *file, int mode, int dev)
++{
++	int err;
++
++	err = mknod(file, mode, dev);
++	if(err) return(-errno);
++	return(0);
++}
++
++int link_file(const char *to, const char *from)
++{
++	int err;
++
++	err = link(to, from);
++	if(err) return(-errno);
++	return(0);
++}
++
++int do_readlink(char *file, char *buf, int size)
++{
++	int n;
++
++	n = readlink(file, buf, size);
++	if(n < 0) 
++		return(-errno);
++	if(n < size) 
++		buf[n] = '\0';
++	return(n);
++}
++
++int rename_file(char *from, char *to)
++{
++	int err;
++
++	err = rename(from, to);
++	if(err < 0) return(-errno);
++	return(0);	
++}
++
++int do_statfs(char *root, long *bsize_out, long long *blocks_out, 
++	      long long *bfree_out, long long *bavail_out, 
++	      long long *files_out, long long *ffree_out,
++	      void *fsid_out, int fsid_size, long *namelen_out, 
++	      long *spare_out)
++{
++	struct statfs64 buf;
++	int err;
++
++	err = statfs64(root, &buf);
++	if(err < 0) return(-errno);
++	*bsize_out = buf.f_bsize;
++	*blocks_out = buf.f_blocks;
++	*bfree_out = buf.f_bfree;
++	*bavail_out = buf.f_bavail;
++	*files_out = buf.f_files;
++	*ffree_out = buf.f_ffree;
++	memcpy(fsid_out, &buf.f_fsid, 
++	       sizeof(buf.f_fsid) > fsid_size ? fsid_size : 
++	       sizeof(buf.f_fsid));
++	*namelen_out = buf.f_namelen;
++	spare_out[0] = buf.f_spare[0];
++	spare_out[1] = buf.f_spare[1];
++	spare_out[2] = buf.f_spare[2];
++	spare_out[3] = buf.f_spare[3];
++	spare_out[4] = buf.f_spare[4];
++	spare_out[5] = buf.f_spare[5];
++	return(0);
++}
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/fs/hppfs/Makefile b/fs/hppfs/Makefile
+--- a/fs/hppfs/Makefile	Wed Dec 31 19:00:00 1969
++++ b/fs/hppfs/Makefile	Tue Sep  9 16:49:04 2003
+@@ -0,0 +1,19 @@
++# 
++# Copyright (C) 2002, 2003 Jeff Dike (jdike@karaya.com)
++# Licensed under the GPL
++#
++
++hppfs-objs := hppfs_kern.o
++
++obj-y = 
++obj-$(CONFIG_HPPFS) += hppfs.o
++
++clean:
++
++modules:
++
++fastdep:
++
++dep:
++
++archmrproper: clean
+diff -Naur a/fs/hppfs/hppfs_kern.c b/fs/hppfs/hppfs_kern.c
+--- a/fs/hppfs/hppfs_kern.c	Wed Dec 31 19:00:00 1969
++++ b/fs/hppfs/hppfs_kern.c	Tue Sep  9 16:48:52 2003
+@@ -0,0 +1,811 @@
++/* 
++ * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
++ * Licensed under the GPL
++ */
++
++#include <linux/fs.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/slab.h>
++#include <linux/list.h>
++#include <linux/kernel.h>
++#include <linux/ctype.h>
++#include <linux/dcache.h>
++#include <linux/statfs.h>
++#include <asm/uaccess.h>
++#include <asm/fcntl.h>
++#include "os.h"
++
++static int init_inode(struct inode *inode, struct dentry *dentry);
++
++struct hppfs_data {
++	struct list_head list;
++	char contents[PAGE_SIZE - sizeof(struct list_head)];
++};
++
++struct hppfs_private {
++	struct file proc_file;
++	int host_fd;
++	loff_t len;
++	struct hppfs_data *contents;
++};
++
++struct hppfs_inode_info {
++        struct dentry *proc_dentry;
++	struct inode vfs_inode;
++};
++
++static inline struct hppfs_inode_info *HPPFS_I(struct inode *inode)
++{
++	return(list_entry(inode, struct hppfs_inode_info, vfs_inode));
++}
++
++#define HPPFS_SUPER_MAGIC 0xb00000ee
++
++static struct super_operations hppfs_sbops;
++
++static int is_pid(struct dentry *dentry)
++{
++	struct super_block *sb;
++	int i;
++
++	sb = dentry->d_sb;
++	if((sb->s_op != &hppfs_sbops) || (dentry->d_parent != sb->s_root))
++		return(0);
++
++	for(i = 0; i < dentry->d_name.len; i++){
++		if(!isdigit(dentry->d_name.name[i]))
++			return(0);
++	}
++	return(1);
++}
++
++static char *dentry_name(struct dentry *dentry, int extra)
++{
++	struct dentry *parent;
++	char *root, *name;
++	const char *seg_name;
++	int len, seg_len;
++
++	len = 0;
++	parent = dentry;
++	while(parent->d_parent != parent){
++		if(is_pid(parent))
++			len += strlen("pid") + 1;
++		else len += parent->d_name.len + 1;
++		parent = parent->d_parent;
++	}
++	
++	root = "proc";
++	len += strlen(root);
++	name = kmalloc(len + extra + 1, GFP_KERNEL);
++	if(name == NULL) return(NULL);
++
++	name[len] = '\0';
++	parent = dentry;
++	while(parent->d_parent != parent){
++		if(is_pid(parent)){
++			seg_name = "pid";
++			seg_len = strlen("pid");
++		}
++		else {
++			seg_name = parent->d_name.name;
++			seg_len = parent->d_name.len;
++		}
++
++		len -= seg_len + 1;
++		name[len] = '/';
++		strncpy(&name[len + 1], seg_name, seg_len);
++		parent = parent->d_parent;
++	}
++	strncpy(name, root, strlen(root));
++	return(name);
++}
++
++struct dentry_operations hppfs_dentry_ops = {
++};
++
++static int file_removed(struct dentry *dentry, const char *file)
++{
++	char *host_file;
++	int extra, fd;
++
++	extra = 0;
++	if(file != NULL) extra += strlen(file) + 1;
++
++	host_file = dentry_name(dentry, extra + strlen("/remove"));
++	if(host_file == NULL){
++		printk("file_removed : allocation failed\n");
++		return(-ENOMEM);
++	}
++
++	if(file != NULL){
++		strcat(host_file, "/");
++		strcat(host_file, file);
++	}
++	strcat(host_file, "/remove");
++
++	fd = os_open_file(host_file, of_read(OPENFLAGS()), 0);
++	kfree(host_file);
++	if(fd > 0){
++		os_close_file(fd);
++		return(1);
++	}
++	return(0);
++}
++
++static void hppfs_read_inode(struct inode *ino)
++{
++	struct inode *proc_ino;
++
++	if(HPPFS_I(ino)->proc_dentry == NULL)
++		return;
++
++	proc_ino = HPPFS_I(ino)->proc_dentry->d_inode;
++	ino->i_uid = proc_ino->i_uid;
++	ino->i_gid = proc_ino->i_gid;
++	ino->i_atime = proc_ino->i_atime;
++	ino->i_mtime = proc_ino->i_mtime;
++	ino->i_ctime = proc_ino->i_ctime;
++	ino->i_ino = proc_ino->i_ino;
++	ino->i_mode = proc_ino->i_mode;
++	ino->i_nlink = proc_ino->i_nlink;
++	ino->i_size = proc_ino->i_size;
++	ino->i_blksize = proc_ino->i_blksize;
++	ino->i_blocks = proc_ino->i_blocks;
++}
++
++static struct dentry *hppfs_lookup(struct inode *ino, struct dentry *dentry, 
++                                  struct nameidata *nd)
++{
++	struct dentry *proc_dentry, *new, *parent;
++	struct inode *inode;
++	int err, deleted;
++
++	deleted = file_removed(dentry, NULL);
++	if(deleted < 0)
++		return(ERR_PTR(deleted));
++	else if(deleted)
++		return(ERR_PTR(-ENOENT));
++
++	err = -ENOMEM;
++	parent = HPPFS_I(ino)->proc_dentry;
++	down(&parent->d_inode->i_sem);
++	proc_dentry = d_lookup(parent, &dentry->d_name);
++	if(proc_dentry == NULL){
++		proc_dentry = d_alloc(parent, &dentry->d_name);
++		if(proc_dentry == NULL){
++			up(&parent->d_inode->i_sem);
++			goto out;
++		}
++		new = (*parent->d_inode->i_op->lookup)(parent->d_inode, 
++						       proc_dentry, NULL);
++		if(new){
++			dput(proc_dentry);
++			proc_dentry = new;
++		}
++	}
++	up(&parent->d_inode->i_sem);
++
++	if(IS_ERR(proc_dentry))
++		return(proc_dentry);
++
++	inode = iget(ino->i_sb, 0);
++	if(inode == NULL) 
++		goto out_dput;
++
++	err = init_inode(inode, proc_dentry);
++	if(err) 
++		goto out_put;
++	
++	hppfs_read_inode(inode);
++
++ 	d_add(dentry, inode);
++	dentry->d_op = &hppfs_dentry_ops;
++	return(NULL);
++
++ out_put:
++	iput(inode);
++ out_dput:
++	dput(proc_dentry);
++ out:
++	return(ERR_PTR(err));
++}
++
++static struct inode_operations hppfs_file_iops = {
++};
++
++static ssize_t read_proc(struct file *file, char *buf, ssize_t count, 
++			 loff_t *ppos, int is_user)
++{
++	ssize_t (*read)(struct file *, char *, size_t, loff_t *);
++	ssize_t n;
++
++	read = file->f_dentry->d_inode->i_fop->read;
++
++	if(!is_user)
++		set_fs(KERNEL_DS);
++		
++	n = (*read)(file, buf, count, &file->f_pos);
++
++	if(!is_user)
++		set_fs(USER_DS);
++
++	if(ppos) *ppos = file->f_pos;
++	return(n);
++}
++
++static ssize_t hppfs_read_file(int fd, char *buf, ssize_t count)
++{
++	ssize_t n;
++	int cur, err;
++	char *new_buf;
++
++	n = -ENOMEM;
++	new_buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
++	if(new_buf == NULL){
++		printk("hppfs_read_file : kmalloc failed\n");
++		goto out;
++	}
++	n = 0;
++	while(count > 0){
++		cur = min_t(ssize_t, count, PAGE_SIZE);
++		err = os_read_file(fd, new_buf, cur);
++		if(err < 0){
++			printk("hppfs_read : read failed, errno = %d\n",
++			       count);
++			n = err;
++			goto out_free;
++		}
++		else if(err == 0)
++			break;
++
++		if(copy_to_user(buf, new_buf, err)){
++			n = -EFAULT;
++			goto out_free;
++		}
++		n += err;
++		count -= err;
++	}
++ out_free:
++	kfree(new_buf);
++ out:
++	return(n);
++}
++
++static ssize_t hppfs_read(struct file *file, char *buf, size_t count, 
++			  loff_t *ppos)
++{
++	struct hppfs_private *hppfs = file->private_data;
++	struct hppfs_data *data;
++	loff_t off;
++	int err;
++
++	if(hppfs->contents != NULL){
++		if(*ppos >= hppfs->len) return(0);
++
++		data = hppfs->contents;
++		off = *ppos;
++		while(off >= sizeof(data->contents)){
++			data = list_entry(data->list.next, struct hppfs_data,
++					  list);
++			off -= sizeof(data->contents);
++		}
++
++		if(off + count > hppfs->len)
++			count = hppfs->len - off;
++		copy_to_user(buf, &data->contents[off], count);
++		*ppos += count;
++	}
++	else if(hppfs->host_fd != -1){
++		err = os_seek_file(hppfs->host_fd, *ppos);
++		if(err){
++			printk("hppfs_read : seek failed, errno = %d\n", err);
++			return(err);
++		}
++		count = hppfs_read_file(hppfs->host_fd, buf, count);
++		if(count > 0)
++			*ppos += count;
++	}
++	else count = read_proc(&hppfs->proc_file, buf, count, ppos, 1);
++
++	return(count);
++}
++
++static ssize_t hppfs_write(struct file *file, const char *buf, size_t len, 
++			   loff_t *ppos)
++{
++	struct hppfs_private *data = file->private_data;
++	struct file *proc_file = &data->proc_file;
++	ssize_t (*write)(struct file *, const char *, size_t, loff_t *);
++	int err;
++
++	write = proc_file->f_dentry->d_inode->i_fop->write;
++
++	proc_file->f_pos = file->f_pos;
++	err = (*write)(proc_file, buf, len, &proc_file->f_pos);
++	file->f_pos = proc_file->f_pos;
++
++	return(err);
++}
++
++static int open_host_sock(char *host_file, int *filter_out)
++{
++	char *end;
++	int fd;
++
++	end = &host_file[strlen(host_file)];
++	strcpy(end, "/rw");
++	*filter_out = 1;
++	fd = os_connect_socket(host_file);
++	if(fd > 0)
++		return(fd);
++
++	strcpy(end, "/r");
++	*filter_out = 0;
++	fd = os_connect_socket(host_file);
++	return(fd);
++}
++
++static void free_contents(struct hppfs_data *head)
++{
++	struct hppfs_data *data;
++	struct list_head *ele, *next;
++
++	if(head == NULL) return;
++
++	list_for_each_safe(ele, next, &head->list){
++		data = list_entry(ele, struct hppfs_data, list);
++		kfree(data);
++	}
++	kfree(head);
++}
++
++static struct hppfs_data *hppfs_get_data(int fd, int filter, 
++					 struct file *proc_file, 
++					 struct file *hppfs_file, 
++					 loff_t *size_out)
++{
++	struct hppfs_data *data, *new, *head;
++	int n, err;
++
++	err = -ENOMEM;
++	data = kmalloc(sizeof(*data), GFP_KERNEL);
++	if(data == NULL){
++		printk("hppfs_get_data : head allocation failed\n");
++		goto failed;
++	}
++
++	INIT_LIST_HEAD(&data->list);
++
++	head = data;
++	*size_out = 0;
++
++	if(filter){
++		while((n = read_proc(proc_file, data->contents,
++				     sizeof(data->contents), NULL, 0)) > 0)
++			os_write_file(fd, data->contents, n);
++		err = os_shutdown_socket(fd, 0, 1);
++		if(err){
++			printk("hppfs_get_data : failed to shut down "
++			       "socket\n");
++			goto failed_free;
++		}
++	}
++	while(1){
++		n = os_read_file(fd, data->contents, sizeof(data->contents));
++		if(n < 0){
++			err = n;
++			printk("hppfs_get_data : read failed, errno = %d\n",
++			       err);
++			goto failed_free;
++		}
++		else if(n == 0)
++			break;
++
++		*size_out += n;
++
++		if(n < sizeof(data->contents))
++			break;
++
++		new = kmalloc(sizeof(*data), GFP_KERNEL);
++		if(new == 0){
++			printk("hppfs_get_data : data allocation failed\n");
++			err = -ENOMEM;
++			goto failed_free;
++		}
++	
++		INIT_LIST_HEAD(&new->list);
++		list_add(&new->list, &data->list);
++		data = new;
++	}
++	return(head);
++
++ failed_free:
++	free_contents(head);
++ failed:		
++	return(ERR_PTR(err));
++}
++
++static struct hppfs_private *hppfs_data(void)
++{
++	struct hppfs_private *data;
++
++	data = kmalloc(sizeof(*data), GFP_KERNEL);
++	if(data == NULL)
++		return(data);
++
++	*data = ((struct hppfs_private ) { .host_fd  		= -1,
++					   .len  		= -1,
++					   .contents 		= NULL } );
++	return(data);
++}
++
++static int file_mode(int fmode)
++{
++	if(fmode == (FMODE_READ | FMODE_WRITE))
++		return(O_RDWR);
++	if(fmode == FMODE_READ)
++		return(O_RDONLY);
++	if(fmode == FMODE_WRITE)
++		return(O_WRONLY);
++	return(0);
++}
++
++static int hppfs_open(struct inode *inode, struct file *file)
++{
++	struct hppfs_private *data;
++	struct dentry *proc_dentry;
++	char *host_file;
++	int err, fd, type, filter;
++
++	err = -ENOMEM;
++	data = hppfs_data();
++	if(data == NULL)
++		goto out;
++
++	host_file = dentry_name(file->f_dentry, strlen("/rw"));
++	if(host_file == NULL)
++		goto out_free2;
++
++	proc_dentry = HPPFS_I(inode)->proc_dentry;
++
++	/* XXX This isn't closed anywhere */
++	err = open_private_file(&data->proc_file, proc_dentry, 
++				file_mode(file->f_mode));
++	if(err)
++		goto out_free1;
++
++	type = os_file_type(host_file);
++	if(type == OS_TYPE_FILE){
++		fd = os_open_file(host_file, of_read(OPENFLAGS()), 0);
++		if(fd >= 0) 
++			data->host_fd = fd;
++		else printk("hppfs_open : failed to open '%s', errno = %d\n",
++			    host_file, -fd);
++
++		data->contents = NULL;
++	}
++	else if(type == OS_TYPE_DIR){
++		fd = open_host_sock(host_file, &filter);
++		if(fd > 0){
++			data->contents = hppfs_get_data(fd, filter, 
++							&data->proc_file, 
++							file, &data->len);
++			if(!IS_ERR(data->contents))
++				data->host_fd = fd;
++		}
++		else printk("hppfs_open : failed to open a socket in "
++			    "'%s', errno = %d\n", host_file, -fd);
++	}
++	kfree(host_file);
++
++	file->private_data = data;
++	return(0);
++
++ out_free1:
++	kfree(host_file);
++ out_free2:
++	free_contents(data->contents);
++	kfree(data);
++ out:
++	return(err);
++}
++
++static int hppfs_dir_open(struct inode *inode, struct file *file)
++{
++	struct hppfs_private *data;
++	struct dentry *proc_dentry;
++	int err;
++
++	err = -ENOMEM;
++	data = hppfs_data();
++	if(data == NULL)
++		goto out;
++
++	proc_dentry = HPPFS_I(inode)->proc_dentry;
++	err = open_private_file(&data->proc_file, proc_dentry, 
++				file_mode(file->f_mode));
++	if(err)
++		goto out_free;
++
++	file->private_data = data;
++	return(0);
++
++ out_free:
++	kfree(data);
++ out:
++	return(err);
++}
++
++static loff_t hppfs_llseek(struct file *file, loff_t off, int where)
++{
++	struct hppfs_private *data = file->private_data;
++	struct file *proc_file = &data->proc_file;
++	loff_t (*llseek)(struct file *, loff_t, int);
++	loff_t ret;
++
++	llseek = proc_file->f_dentry->d_inode->i_fop->llseek;
++	if(llseek != NULL){
++		ret = (*llseek)(proc_file, off, where);
++		if(ret < 0)
++			return(ret);
++	}
++
++	return(default_llseek(file, off, where));
++}
++
++static struct file_operations hppfs_file_fops = {
++	.owner		= NULL,
++	.llseek		= hppfs_llseek,
++	.read		= hppfs_read,
++	.write		= hppfs_write,
++	.open		= hppfs_open,
++};
++
++struct hppfs_dirent {
++	void *vfs_dirent;
++	filldir_t filldir;
++	struct dentry *dentry;
++};
++
++static int hppfs_filldir(void *d, const char *name, int size, 
++			 loff_t offset, ino_t inode, unsigned int type)
++{
++	struct hppfs_dirent *dirent = d;
++
++	if(file_removed(dirent->dentry, name))
++		return(0);
++
++	return((*dirent->filldir)(dirent->vfs_dirent, name, size, offset, 
++				  inode, type));
++}
++
++static int hppfs_readdir(struct file *file, void *ent, filldir_t filldir)
++{
++	struct hppfs_private *data = file->private_data;
++	struct file *proc_file = &data->proc_file;
++	int (*readdir)(struct file *, void *, filldir_t);
++	struct hppfs_dirent dirent = ((struct hppfs_dirent)
++		                      { .vfs_dirent  	= ent,
++					.filldir 	= filldir,
++					.dentry  	= file->f_dentry } );
++	int err;
++
++	readdir = proc_file->f_dentry->d_inode->i_fop->readdir;
++
++	proc_file->f_pos = file->f_pos;
++	err = (*readdir)(proc_file, &dirent, hppfs_filldir);
++	file->f_pos = proc_file->f_pos;
++
++	return(err);
++}
++
++static int hppfs_fsync(struct file *file, struct dentry *dentry, int datasync)
++{
++	return(0);
++}
++
++static struct file_operations hppfs_dir_fops = {
++	.owner		= NULL,
++	.readdir	= hppfs_readdir,
++	.open		= hppfs_dir_open,
++	.fsync		= hppfs_fsync,
++};
++
++static int hppfs_statfs(struct super_block *sb, struct kstatfs *sf)
++{
++	sf->f_blocks = 0;
++	sf->f_bfree = 0;
++	sf->f_bavail = 0;
++	sf->f_files = 0;
++	sf->f_ffree = 0;
++	sf->f_type = HPPFS_SUPER_MAGIC;
++	return(0);
++}
++
++static struct inode *hppfs_alloc_inode(struct super_block *sb)
++{
++	struct hppfs_inode_info *hi;
++
++	hi = kmalloc(sizeof(*hi), GFP_KERNEL);
++	if(hi == NULL) 
++		return(NULL);
++
++	*hi = ((struct hppfs_inode_info) { .proc_dentry	= NULL });
++	inode_init_once(&hi->vfs_inode);
++	return(&hi->vfs_inode);
++}
++
++void hppfs_delete_inode(struct inode *ino)
++{
++	clear_inode(ino);
++}
++
++static void hppfs_destroy_inode(struct inode *inode)
++{
++	kfree(HPPFS_I(inode));
++}
++
++static struct super_operations hppfs_sbops = { 
++	.alloc_inode	= hppfs_alloc_inode,
++	.destroy_inode	= hppfs_destroy_inode,
++	.read_inode	= hppfs_read_inode,
++	.delete_inode	= hppfs_delete_inode,
++	.statfs		= hppfs_statfs,
++};
++
++static int hppfs_readlink(struct dentry *dentry, char *buffer, int buflen)
++{
++	struct file proc_file;
++	struct dentry *proc_dentry;
++	int (*readlink)(struct dentry *, char *, int);
++	int err, n;
++
++	proc_dentry = HPPFS_I(dentry->d_inode)->proc_dentry;
++	err = open_private_file(&proc_file, proc_dentry, O_RDONLY);
++	if(err) 
++		return(err);
++
++	readlink = proc_dentry->d_inode->i_op->readlink;
++	n = (*readlink)(proc_dentry, buffer, buflen);
++
++	close_private_file(&proc_file);
++	
++	return(n);
++}
++
++static int hppfs_follow_link(struct dentry *dentry, struct nameidata *nd)
++{
++	struct file proc_file;
++	struct dentry *proc_dentry;
++	int (*follow_link)(struct dentry *, struct nameidata *);
++	int err, n;
++
++	proc_dentry = HPPFS_I(dentry->d_inode)->proc_dentry;
++	err = open_private_file(&proc_file, proc_dentry, O_RDONLY);
++	if(err) 
++		return(err);
++
++	follow_link = proc_dentry->d_inode->i_op->follow_link;
++	n = (*follow_link)(proc_dentry, nd);
++
++	close_private_file(&proc_file);
++	
++	return(n);
++}
++
++static struct inode_operations hppfs_dir_iops = {
++	.lookup		= hppfs_lookup,
++};
++
++static struct inode_operations hppfs_link_iops = {
++	.readlink	= hppfs_readlink,
++	.follow_link	= hppfs_follow_link,
++};
++
++static int init_inode(struct inode *inode, struct dentry *dentry)
++{
++	if(S_ISDIR(dentry->d_inode->i_mode)){
++		inode->i_op = &hppfs_dir_iops;
++		inode->i_fop = &hppfs_dir_fops;
++	}
++	else if(S_ISLNK(dentry->d_inode->i_mode)){
++		inode->i_op = &hppfs_link_iops;
++		inode->i_fop = &hppfs_file_fops;
++	}
++	else {
++		inode->i_op = &hppfs_file_iops;
++		inode->i_fop = &hppfs_file_fops;
++	}
++
++	HPPFS_I(inode)->proc_dentry = dentry;
++
++	return(0);
++}
++
++static int hppfs_fill_super(struct super_block *sb, void *d, int silent)
++{
++	struct inode *root_inode;
++	struct file_system_type *procfs;
++	struct super_block *proc_sb;
++	int err;
++
++	err = -ENOENT;
++	procfs = get_fs_type("proc");
++	if(procfs == NULL) 
++		goto out;
++
++	if(list_empty(&procfs->fs_supers))
++		goto out;
++
++	proc_sb = list_entry(procfs->fs_supers.next, struct super_block,
++			     s_instances);
++	
++	sb->s_blocksize = 1024;
++	sb->s_blocksize_bits = 10;
++	sb->s_magic = HPPFS_SUPER_MAGIC;
++	sb->s_op = &hppfs_sbops;
++
++	root_inode = iget(sb, 0);
++	if(root_inode == NULL)
++		goto out;
++
++	err = init_inode(root_inode, proc_sb->s_root);
++	if(err)
++		goto out_put;
++
++	err = -ENOMEM;
++	sb->s_root = d_alloc_root(root_inode);
++	if(sb->s_root == NULL)
++		goto out_put;
++
++	hppfs_read_inode(root_inode);
++
++	return(0);
++
++ out_put:
++	iput(root_inode);
++ out:
++	return(err);
++}
++
++static struct super_block *hppfs_read_super(struct file_system_type *type,
++					     int flags, const char *dev_name,
++					     void *data)
++{
++	return(get_sb_nodev(type, flags, data, hppfs_fill_super));
++}
++
++static struct file_system_type hppfs_type = {
++	.owner 		= THIS_MODULE,
++	.name 		= "hppfs",
++	.get_sb 	= hppfs_read_super,
++	.kill_sb	= kill_anon_super,
++	.fs_flags 	= 0,
++};
++
++static int __init init_hppfs(void)
++{
++	return(register_filesystem(&hppfs_type));
++}
++
++static void __exit exit_hppfs(void)
++{
++	unregister_filesystem(&hppfs_type);
++}
++
++module_init(init_hppfs)
++module_exit(exit_hppfs)
++MODULE_LICENSE("GPL");
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/include/asm-um/archparam-i386.h b/include/asm-um/archparam-i386.h
+--- a/include/asm-um/archparam-i386.h	Tue Sep  9 16:45:45 2003
++++ b/include/asm-um/archparam-i386.h	Tue Sep  9 16:50:12 2003
+@@ -56,6 +56,65 @@
+ 	pr_reg[16] = PT_REGS_SS(regs);		\
+ } while(0);
+ 
++#define VSYSCALL_BASE	(__fix_to_virt(FIX_VSYSCALL))
++#define VSYSCALL_EHDR	((const struct elfhdr *) VSYSCALL_BASE)
++#define VSYSCALL_ENTRY	((unsigned long) &__kernel_vsyscall)
++extern void *__kernel_vsyscall;
++
++/*
++ * Architecture-neutral AT_ values in 0-17, leave some room
++ * for more of them, start the x86-specific ones at 32.
++ */
++#define AT_SYSINFO		32
++#define AT_SYSINFO_EHDR		33
++
++#define ARCH_DLINFO						\
++do {								\
++		NEW_AUX_ENT(AT_SYSINFO,	VSYSCALL_ENTRY);	\
++		NEW_AUX_ENT(AT_SYSINFO_EHDR, VSYSCALL_BASE);	\
++} while (0)
++
++/*
++ * These macros parameterize elf_core_dump in fs/binfmt_elf.c to write out
++ * extra segments containing the vsyscall DSO contents.  Dumping its
++ * contents makes post-mortem fully interpretable later without matching up
++ * the same kernel and hardware config to see what PC values meant.
++ * Dumping its extra ELF program headers includes all the other information
++ * a debugger needs to easily find how the vsyscall DSO was being used.
++ */
++#define ELF_CORE_EXTRA_PHDRS		(VSYSCALL_EHDR->e_phnum)
++#define ELF_CORE_WRITE_EXTRA_PHDRS					      \
++do {									      \
++	const struct elf_phdr *const vsyscall_phdrs =			      \
++		(const struct elf_phdr *) (VSYSCALL_BASE		      \
++					   + VSYSCALL_EHDR->e_phoff);	      \
++	int i;								      \
++	Elf32_Off ofs = 0;						      \
++	for (i = 0; i < VSYSCALL_EHDR->e_phnum; ++i) {			      \
++		struct elf_phdr phdr = vsyscall_phdrs[i];		      \
++		if (phdr.p_type == PT_LOAD) {				      \
++			ofs = phdr.p_offset = offset;			      \
++			offset += phdr.p_filesz;			      \
++		}							      \
++		else							      \
++			phdr.p_offset += ofs;				      \
++		phdr.p_paddr = 0; /* match other core phdrs */		      \
++		DUMP_WRITE(&phdr, sizeof(phdr));			      \
++	}								      \
++} while (0)
++#define ELF_CORE_WRITE_EXTRA_DATA					      \
++do {									      \
++	const struct elf_phdr *const vsyscall_phdrs =			      \
++		(const struct elf_phdr *) (VSYSCALL_BASE		      \
++					   + VSYSCALL_EHDR->e_phoff);	      \
++	int i;								      \
++	for (i = 0; i < VSYSCALL_EHDR->e_phnum; ++i) {			      \
++		if (vsyscall_phdrs[i].p_type == PT_LOAD)		      \
++			DUMP_WRITE((void *) vsyscall_phdrs[i].p_vaddr,	      \
++				   vsyscall_phdrs[i].p_filesz);		      \
++	}								      \
++} while (0)
++
+ /********* Bits for asm-um/delay.h **********/
+ 
+ typedef unsigned long um_udelay_t;
+diff -Naur a/include/asm-um/common.lds.S b/include/asm-um/common.lds.S
+--- a/include/asm-um/common.lds.S	Tue Sep  9 16:41:45 2003
++++ b/include/asm-um/common.lds.S	Tue Sep  9 16:47:55 2003
+@@ -1,3 +1,5 @@
++#include <asm-generic/vmlinux.lds.h>
++
+   .fini      : { *(.fini)    } =0x9090
+   _etext = .;
+   PROVIDE (etext = .);
+@@ -67,6 +69,10 @@
+   }
+   __initcall_end = .;
+ 
++  __con_initcall_start = .;
++  .con_initcall.init : { *(.con_initcall.init) }
++  __con_initcall_end = .;
++
+   __uml_initcall_start = .;
+   .uml.initcall.init : { *(.uml.initcall.init) }
+   __uml_initcall_end = .;
+@@ -80,7 +86,33 @@
+   .uml.exitcall : { *(.uml.exitcall.exit) }
+   __uml_exitcall_end = .;
+ 
+-  . = ALIGN(4096);
++  . = ALIGN(4);
++  __alt_instructions = .;
++  .altinstructions : { *(.altinstructions) } 
++  __alt_instructions_end = .; 
++  .altinstr_replacement : { *(.altinstr_replacement) } 
++  /* .exit.text is discard at runtime, not link time, to deal with references
++     from .altinstructions and .eh_frame */
++  .exit.text : { *(.exit.text) }
++  .exit.data : { *(.exit.data) }
++ 
++  __preinit_array_start = .;
++  .preinit_array : { *(.preinit_array) }
++  __preinit_array_end = .;
++  __init_array_start = .;
++  .init_array : { *(.init_array) }
++  __init_array_end = .;
++  __fini_array_start = .;
++  .fini_array : { *(.fini_array) }
++  __fini_array_end = .;
++
++   . = ALIGN(4096);
+   __initramfs_start = .;
+   .init.ramfs : { *(.init.ramfs) }
+   __initramfs_end = .;
++
++  /* Sections to be discarded */
++  /DISCARD/ : {
++ 	*(.exitcall.exit)
++  }
++ 
+diff -Naur a/include/asm-um/cpufeature.h b/include/asm-um/cpufeature.h
+--- a/include/asm-um/cpufeature.h	Wed Dec 31 19:00:00 1969
++++ b/include/asm-um/cpufeature.h	Tue Sep  9 16:47:22 2003
+@@ -0,0 +1,6 @@
++#ifndef __UM_CPUFEATURE_H
++#define __UM_CPUFEATURE_H
++
++#include "asm/arch/cpufeature.h"
++
++#endif
+diff -Naur a/include/asm-um/current.h b/include/asm-um/current.h
+--- a/include/asm-um/current.h	Tue Sep  9 16:41:22 2003
++++ b/include/asm-um/current.h	Tue Sep  9 16:47:29 2003
+@@ -16,8 +16,10 @@
+ #define CURRENT_THREAD(dummy) (((unsigned long) &dummy) & \
+ 			        (PAGE_MASK << CONFIG_KERNEL_STACK_ORDER))
+ 
+-#define current ({ int dummy; \
+-                   ((struct thread_info *) CURRENT_THREAD(dummy))->task; })
++#define current_thread \
++	({ int dummy; ((struct thread_info *) CURRENT_THREAD(dummy)); })
++
++#define current (current_thread->task)
+ 
+ #endif /* __ASSEMBLY__ */
+ 
+diff -Naur a/include/asm-um/fixmap.h b/include/asm-um/fixmap.h
+--- a/include/asm-um/fixmap.h	Tue Sep  9 16:46:00 2003
++++ b/include/asm-um/fixmap.h	Tue Sep  9 16:51:02 2003
+@@ -34,6 +34,7 @@
+ 	FIX_KMAP_BEGIN,	/* reserved pte's for temporary kernel mappings */
+ 	FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,
+ #endif
++	FIX_VSYSCALL,
+ 	__end_of_fixed_addresses
+ };
+ 
+@@ -63,6 +64,13 @@
+ #define __fix_to_virt(x)	(FIXADDR_TOP - ((x) << PAGE_SHIFT))
+ #define __virt_to_fix(x)      ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT)
+ 
++/*
++ * This is the range that is readable by user mode, and things
++ * acting like user mode such as get_user_pages.
++ */
++#define FIXADDR_USER_START	(__fix_to_virt(FIX_VSYSCALL))
++#define FIXADDR_USER_END	(FIXADDR_USER_START + PAGE_SIZE)
++
+ extern void __this_fixmap_does_not_exist(void);
+ 
+ /*
+diff -Naur a/include/asm-um/irq.h b/include/asm-um/irq.h
+--- a/include/asm-um/irq.h	Tue Sep  9 16:46:09 2003
++++ b/include/asm-um/irq.h	Tue Sep  9 16:51:12 2003
+@@ -1,15 +1,6 @@
+ #ifndef __UM_IRQ_H
+ #define __UM_IRQ_H
+ 
+-/* The i386 irq.h has a struct task_struct in a prototype without including
+- * sched.h.  This forward declaration kills the resulting warning.
+- */
+-struct task_struct;
+-
+-#include "asm/ptrace.h"
+-
+-#undef NR_IRQS
+-
+ #define TIMER_IRQ		0
+ #define UMN_IRQ			1
+ #define CONSOLE_IRQ		2
+@@ -28,8 +19,4 @@
+ #define LAST_IRQ XTERM_IRQ
+ #define NR_IRQS (LAST_IRQ + 1)
+ 
+-extern int um_request_irq(unsigned int irq, int fd, int type,
+-			  void (*handler)(int, void *, struct pt_regs *),
+-			  unsigned long irqflags,  const char * devname,
+-			  void *dev_id);
+ #endif
+diff -Naur a/include/asm-um/local.h b/include/asm-um/local.h
+--- a/include/asm-um/local.h	Wed Dec 31 19:00:00 1969
++++ b/include/asm-um/local.h	Tue Sep  9 16:49:26 2003
+@@ -0,0 +1,6 @@
++#ifndef __UM_LOCAL_H
++#define __UM_LOCAL_H
++
++#include "asm/arch/local.h"
++
++#endif
+diff -Naur a/include/asm-um/module-generic.h b/include/asm-um/module-generic.h
+--- a/include/asm-um/module-generic.h	Wed Dec 31 19:00:00 1969
++++ b/include/asm-um/module-generic.h	Tue Sep  9 16:49:17 2003
+@@ -0,0 +1,6 @@
++#ifndef __UM_MODULE_GENERIC_H
++#define __UM_MODULE_GENERIC_H
++
++#include "asm/arch/module.h"
++
++#endif
+diff -Naur a/include/asm-um/module-i386.h b/include/asm-um/module-i386.h
+--- a/include/asm-um/module-i386.h	Wed Dec 31 19:00:00 1969
++++ b/include/asm-um/module-i386.h	Tue Sep  9 16:49:10 2003
+@@ -0,0 +1,13 @@
++#ifndef __UM_MODULE_I386_H
++#define __UM_MODULE_I386_H
++
++/* UML is simple */
++struct mod_arch_specific
++{
++};
++
++#define Elf_Shdr Elf32_Shdr
++#define Elf_Sym Elf32_Sym
++#define Elf_Ehdr Elf32_Ehdr
++
++#endif
+diff -Naur a/include/asm-um/page.h b/include/asm-um/page.h
+--- a/include/asm-um/page.h	Tue Sep  9 16:43:32 2003
++++ b/include/asm-um/page.h	Tue Sep  9 16:49:19 2003
+@@ -4,7 +4,6 @@
+ struct page;
+ 
+ #include "asm/arch/page.h"
+-#include "asm/bug.h"
+ 
+ #undef __pa
+ #undef __va
+diff -Naur a/include/asm-um/pgtable.h b/include/asm-um/pgtable.h
+--- a/include/asm-um/pgtable.h	Tue Sep  9 16:46:25 2003
++++ b/include/asm-um/pgtable.h	Tue Sep  9 16:51:24 2003
+@@ -79,12 +79,13 @@
+ 
+ #define _PAGE_PRESENT	0x001
+ #define _PAGE_NEWPAGE	0x002
+-#define _PAGE_PROTNONE	0x004	/* If not present */
+-#define _PAGE_RW	0x008
+-#define _PAGE_USER	0x010
+-#define _PAGE_ACCESSED	0x020
+-#define _PAGE_DIRTY	0x040
+-#define _PAGE_NEWPROT   0x080
++#define _PAGE_NEWPROT   0x004
++#define _PAGE_FILE	0x008   /* set:pagecache unset:swap */
++#define _PAGE_PROTNONE	0x010	/* If not present */
++#define _PAGE_RW	0x020
++#define _PAGE_USER	0x040
++#define _PAGE_ACCESSED	0x080
++#define _PAGE_DIRTY	0x100
+ 
+ #define REGION_MASK	0xf0000000
+ #define REGION_SHIFT	28
+@@ -203,6 +204,16 @@
+ #define pfn_pte(pfn, prot) __pte(pfn_to_phys(pfn) | pgprot_val(prot))
+ #define pfn_pmd(pfn, prot) __pmd(pfn_to_phys(pfn) | pgprot_val(prot))
+ 
++/*
++ * Bits 0 through 3 are taken
++ */
++#define PTE_FILE_MAX_BITS	28
++
++#define pte_to_pgoff(pte) ((pte).pte_low >> 4)
++
++#define pgoff_to_pte(off) \
++	((pte_t) { ((off) << 4) + _PAGE_FILE })
++
+ static inline pte_t pte_mknewprot(pte_t pte)
+ {
+  	pte_val(pte) |= _PAGE_NEWPROT;
+@@ -236,6 +247,12 @@
+  * The following only work if pte_present() is true.
+  * Undefined behaviour if not..
+  */
++static inline int pte_user(pte_t pte)
++{ 
++	return((pte_val(pte) & _PAGE_USER) && 
++	       !(pte_val(pte) & _PAGE_PROTNONE));
++}
++
+ static inline int pte_read(pte_t pte)
+ { 
+ 	return((pte_val(pte) & _PAGE_USER) && 
+@@ -253,6 +270,14 @@
+ 	       !(pte_val(pte) & _PAGE_PROTNONE));
+ }
+ 
++/*
++ * The following only works if pte_present() is not true.
++ */
++static inline int pte_file(pte_t pte)
++{ 
++	return (pte).pte_low & _PAGE_FILE; 
++}
++
+ static inline int pte_dirty(pte_t pte)	{ return pte_val(pte) & _PAGE_DIRTY; }
+ static inline int pte_young(pte_t pte)	{ return pte_val(pte) & _PAGE_ACCESSED; }
+ static inline int pte_newpage(pte_t pte) { return pte_val(pte) & _PAGE_NEWPAGE; }
+@@ -355,14 +380,26 @@
+ #define pmd_page(pmd) (phys_mem_map(pmd_val(pmd) & PAGE_MASK) + \
+ 		       ((phys_addr(pmd_val(pmd)) >> PAGE_SHIFT)))
+ 
+-/* to find an entry in a page-table-directory. */
++/*
++ * the pgd page can be thought of an array like this: pgd_t[PTRS_PER_PGD]
++ *
++ * this macro returns the index of the entry in the pgd page which would
++ * control the given virtual address
++ */
+ #define pgd_index(address) ((address >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))
+ 
+-/* to find an entry in a page-table-directory */
++/*
++ * pgd_offset() returns a (pgd_t *)
++ * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
++ */
+ #define pgd_offset(mm, address) \
+ ((mm)->pgd + ((address) >> PGDIR_SHIFT))
+ 
+-/* to find an entry in a kernel page-table-directory */
++
++/*
++ * a shortcut which implies the use of the kernel's pgd, instead
++ * of a process's
++ */
+ #define pgd_offset_k(address) pgd_offset(&init_mm, address)
+ 
+ #define pmd_index(address) \
+@@ -374,7 +411,12 @@
+ 	return (pmd_t *) dir;
+ }
+ 
+-/* Find an entry in the third-level page table.. */ 
++/*
++ * the pte page can be thought of an array like this: pte_t[PTRS_PER_PTE]
++ *
++ * this macro returns the index of the entry in the pte page which would
++ * control the given virtual address
++ */
+ #define pte_index(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
+ #define pte_offset_kernel(dir, address) \
+ 	((pte_t *) pmd_page_kernel(*(dir)) +  pte_index(address))
+@@ -400,11 +442,11 @@
+ #define update_mmu_cache(vma,address,pte) do ; while (0)
+ 
+ /* Encode and de-code a swap entry */
+-#define __swp_type(x)			(((x).val >> 3) & 0x7f)
+-#define __swp_offset(x)			((x).val >> 10)
++#define __swp_type(x)			(((x).val >> 4) & 0x3f)
++#define __swp_offset(x)			((x).val >> 11)
+ 
+ #define __swp_entry(type, offset) \
+-	((swp_entry_t) { ((type) << 3) | ((offset) << 10) })
++	((swp_entry_t) { ((type) << 4) | ((offset) << 11) })
+ #define __pte_to_swp_entry(pte) \
+ 	((swp_entry_t) { pte_val(pte_mkuptodate(pte)) })
+ #define __swp_entry_to_pte(x)		((pte_t) { (x).val })
+diff -Naur a/include/asm-um/processor-generic.h b/include/asm-um/processor-generic.h
+--- a/include/asm-um/processor-generic.h	Tue Sep  9 16:41:42 2003
++++ b/include/asm-um/processor-generic.h	Tue Sep  9 16:47:43 2003
+@@ -11,9 +11,7 @@
+ struct task_struct;
+ 
+ #include "linux/config.h"
+-#include "linux/signal.h"
+ #include "asm/ptrace.h"
+-#include "asm/siginfo.h"
+ #include "choose-mode.h"
+ 
+ struct mm_struct;
+@@ -101,14 +99,19 @@
+ } mm_segment_t;
+ 
+ extern struct task_struct *alloc_task_struct(void);
+-extern void free_task_struct(struct task_struct *task);
+ 
+ extern void release_thread(struct task_struct *);
+ extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
+ extern void dump_thread(struct pt_regs *regs, struct user *u);
++extern void prepare_to_copy(struct task_struct *tsk);
+ 
+ extern unsigned long thread_saved_pc(struct task_struct *t);
+ 
++static inline void mm_copy_segments(struct mm_struct *from_mm, 
++				    struct mm_struct *new_mm)
++{
++}
++
+ #define init_stack	(init_thread_union.stack)
+ 
+ /*
+diff -Naur a/include/asm-um/processor-i386.h b/include/asm-um/processor-i386.h
+--- a/include/asm-um/processor-i386.h	Tue Sep  9 16:41:17 2003
++++ b/include/asm-um/processor-i386.h	Tue Sep  9 16:47:27 2003
+@@ -6,8 +6,8 @@
+ #ifndef __UM_PROCESSOR_I386_H
+ #define __UM_PROCESSOR_I386_H
+ 
+-extern int cpu_has_xmm;
+-extern int cpu_has_cmov;
++extern int host_has_xmm;
++extern int host_has_cmov;
+ 
+ struct arch_thread {
+ 	unsigned long debugregs[8];
+diff -Naur a/include/asm-um/sections.h b/include/asm-um/sections.h
+--- a/include/asm-um/sections.h	Wed Dec 31 19:00:00 1969
++++ b/include/asm-um/sections.h	Tue Sep  9 16:49:28 2003
+@@ -0,0 +1,7 @@
++#ifndef _UM_SECTIONS_H
++#define _UM_SECTIONS_H
++
++/* nothing to see, move along */
++#include <asm-generic/sections.h>
++
++#endif
+diff -Naur a/include/asm-um/smp.h b/include/asm-um/smp.h
+--- a/include/asm-um/smp.h	Tue Sep  9 16:41:04 2003
++++ b/include/asm-um/smp.h	Tue Sep  9 16:47:18 2003
+@@ -10,7 +10,7 @@
+ 
+ extern cpumask_t cpu_online_map;
+ 
+-#define smp_processor_id() (current->thread_info->cpu)
++#define smp_processor_id() (current_thread->cpu)
+ #define cpu_logical_map(n) (n)
+ #define cpu_number_map(n) (n)
+ #define PROC_CHANGE_PENALTY	15 /* Pick a number, any number */
+diff -Naur a/include/asm-um/system-generic.h b/include/asm-um/system-generic.h
+--- a/include/asm-um/system-generic.h	Tue Sep  9 16:46:13 2003
++++ b/include/asm-um/system-generic.h	Tue Sep  9 16:51:14 2003
+@@ -23,8 +23,10 @@
+ extern void block_signals(void);
+ extern void unblock_signals(void);
+ 
+-#define local_save_flags(flags) do { (flags) = get_signals(); } while(0)
+-#define local_irq_restore(flags) do { set_signals(flags); } while(0)
++#define local_save_flags(flags) do { typecheck(unsigned long, flags); \
++				     (flags) = get_signals(); } while(0)
++#define local_irq_restore(flags) do { typecheck(unsigned long, flags); \
++				      set_signals(flags); } while(0)
+ 
+ #define local_irq_save(flags) do { local_save_flags(flags); \
+                                    local_irq_disable(); } while(0)
+@@ -39,4 +41,7 @@
+         (flags == 0);                   \
+ })
+ 
++extern void *_switch_to(void *prev, void *next, void *last);
++#define switch_to(prev, next, last) prev = _switch_to(prev, next, last)
++
+ #endif
+diff -Naur a/include/asm-um/thread_info.h b/include/asm-um/thread_info.h
+--- a/include/asm-um/thread_info.h	Tue Sep  9 16:42:02 2003
++++ b/include/asm-um/thread_info.h	Tue Sep  9 16:48:12 2003
+@@ -9,6 +9,7 @@
+ #ifndef __ASSEMBLY__
+ 
+ #include <asm/processor.h>
++#include <asm/types.h>
+ 
+ struct thread_info {
+ 	struct task_struct	*task;		/* main task structure */
+@@ -43,15 +44,18 @@
+ static inline struct thread_info *current_thread_info(void)
+ {
+ 	struct thread_info *ti;
+-	__asm__("andl %%esp,%0; ":"=r" (ti) : "0" (~16383UL));
++	unsigned long mask = PAGE_SIZE * 
++		(1 << CONFIG_KERNEL_STACK_ORDER) - 1;
++	__asm__("andl %%esp,%0; ":"=r" (ti) : "0" (~mask));
+ 	return ti;
+ }
+ 
+ /* thread information allocation */
+-#define THREAD_SIZE (4*PAGE_SIZE)
+-#define alloc_thread_info(tsk) ((struct thread_info *) \
+-	__get_free_pages(GFP_KERNEL,2))
+-#define free_thread_info(ti) free_pages((unsigned long) (ti), 2)
++#define THREAD_SIZE ((1 << CONFIG_KERNEL_STACK_ORDER) * PAGE_SIZE)
++#define alloc_thread_info(tsk) \
++	((struct thread_info *) kmalloc(THREAD_SIZE, GFP_KERNEL))
++#define free_thread_info(ti) kfree(ti)
++	
+ #define get_thread_info(ti) get_task_struct((ti)->task)
+ #define put_thread_info(ti) put_task_struct((ti)->task)
+ 
+@@ -65,11 +69,13 @@
+ #define TIF_POLLING_NRFLAG      3       /* true if poll_idle() is polling 
+ 					 * TIF_NEED_RESCHED 
+ 					 */
++#define TIF_RESTART_BLOCK 	4
+ 
+ #define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)
+ #define _TIF_SIGPENDING		(1 << TIF_SIGPENDING)
+ #define _TIF_NEED_RESCHED	(1 << TIF_NEED_RESCHED)
+ #define _TIF_POLLING_NRFLAG     (1 << TIF_POLLING_NRFLAG)
++#define _TIF_RESTART_BLOCK	(1 << TIF_RESTART_BLOCK)
+ 
+ #endif
+ 
+diff -Naur a/include/asm-um/timex.h b/include/asm-um/timex.h
+--- a/include/asm-um/timex.h	Tue Sep  9 16:43:51 2003
++++ b/include/asm-um/timex.h	Tue Sep  9 16:49:27 2003
+@@ -1,8 +1,6 @@
+ #ifndef __UM_TIMEX_H
+ #define __UM_TIMEX_H
+ 
+-#include "linux/time.h"
+-
+ typedef unsigned long cycles_t;
+ 
+ #define cacheflush_time (0)
+diff -Naur a/include/linux/mm.h b/include/linux/mm.h
+--- a/include/linux/mm.h	Tue Sep  9 16:41:15 2003
++++ b/include/linux/mm.h	Tue Sep  9 16:47:26 2003
+@@ -487,6 +487,9 @@
+ 	return __set_page_dirty_buffers(page);
+ }
+ 
++extern long do_mprotect(struct mm_struct *mm, unsigned long start, 
++			size_t len, unsigned long prot);
++
+ /*
+  * On a two-level page table, this ends up being trivial. Thus the
+  * inlining and the symmetry break with pte_alloc_map() that does all
+@@ -517,9 +520,10 @@
+ 
+ extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
+ 
+-extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+-	unsigned long len, unsigned long prot,
+-	unsigned long flag, unsigned long pgoff);
++extern unsigned long do_mmap_pgoff(struct mm_struct *mm, struct file *file, 
++				   unsigned long addr, unsigned long len,
++				   unsigned long prot, unsigned long flag,
++				   unsigned long pgoff);
+ 
+ static inline unsigned long do_mmap(struct file *file, unsigned long addr,
+ 	unsigned long len, unsigned long prot,
+@@ -529,7 +533,8 @@
+ 	if ((offset + PAGE_ALIGN(len)) < offset)
+ 		goto out;
+ 	if (!(offset & ~PAGE_MASK))
+-		ret = do_mmap_pgoff(file, addr, len, prot, flag, offset >> PAGE_SHIFT);
++		ret = do_mmap_pgoff(current->mm, file, addr, len, prot, flag, 
++				    offset >> PAGE_SHIFT);
+ out:
+ 	return ret;
+ }
+diff -Naur a/include/linux/proc_mm.h b/include/linux/proc_mm.h
+--- a/include/linux/proc_mm.h	Wed Dec 31 19:00:00 1969
++++ b/include/linux/proc_mm.h	Tue Sep  9 16:47:15 2003
+@@ -0,0 +1,48 @@
++/* 
++ * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
++ * Licensed under the GPL
++ */
++
++#ifndef __PROC_MM_H
++#define __PROC_MM_H
++
++#include "linux/sched.h"
++
++#define MM_MMAP 54
++#define MM_MUNMAP 55
++#define MM_MPROTECT 56
++#define MM_COPY_SEGMENTS 57
++
++struct mm_mmap {
++	unsigned long addr;
++	unsigned long len;
++	unsigned long prot;
++	unsigned long flags;
++	unsigned long fd;
++	unsigned long offset;
++};
++
++struct mm_munmap {
++	unsigned long addr;
++	unsigned long len;	
++};
++
++struct mm_mprotect {
++	unsigned long addr;
++	unsigned long len;
++        unsigned int prot;
++};
++
++struct proc_mm_op {
++	int op;
++	union {
++		struct mm_mmap mmap;
++		struct mm_munmap munmap;
++	        struct mm_mprotect mprotect;
++		int copy_segments;
++	} u;
++};
++
++extern struct mm_struct *proc_mm_get_mm(int fd);
++
++#endif
+diff -Naur a/mm/Makefile b/mm/Makefile
+--- a/mm/Makefile	Tue Sep  9 16:43:50 2003
++++ b/mm/Makefile	Tue Sep  9 16:49:26 2003
+@@ -12,3 +12,5 @@
+ 			   slab.o swap.o truncate.o vmscan.o $(mmu-y)
+ 
+ obj-$(CONFIG_SWAP)	+= page_io.o swap_state.o swapfile.o
++obj-$(CONFIG_PROC_MM)	+= proc_mm.o
++
+diff -Naur a/mm/memory.c b/mm/memory.c
+--- a/mm/memory.c	Tue Sep  9 16:43:03 2003
++++ b/mm/memory.c	Tue Sep  9 16:48:52 2003
+@@ -44,6 +44,7 @@
+ #include <linux/highmem.h>
+ #include <linux/pagemap.h>
+ #include <linux/rmap-locking.h>
++#include <linux/init.h>
+ #include <linux/module.h>
+ 
+ #include <asm/pgalloc.h>
+@@ -673,6 +674,24 @@
+ }
+ 
+ 
++static struct vm_area_struct fixmap_vma = {
++	/* Catch users - if there are any valid
++	   ones, we can make this be "&init_mm" or
++	   something.  */
++	.vm_mm = NULL,
++	.vm_page_prot = PAGE_READONLY,
++	.vm_flags = VM_READ | VM_EXEC,
++};
++
++static int init_fixmap_vma(void)
++{
++	fixmap_vma.vm_start = FIXADDR_START;
++	fixmap_vma.vm_end = FIXADDR_TOP;
++	return(0);
++}
++
++__initcall(init_fixmap_vma);
++
+ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
+ 		unsigned long start, int len, int write, int force,
+ 		struct page **pages, struct vm_area_struct **vmas)
+@@ -693,19 +712,8 @@
+ 
+ 		vma = find_extend_vma(mm, start);
+ 
+-#ifdef FIXADDR_USER_START
+-		if (!vma &&
+-		    start >= FIXADDR_USER_START && start < FIXADDR_USER_END) {
+-			static struct vm_area_struct fixmap_vma = {
+-				/* Catch users - if there are any valid
+-				   ones, we can make this be "&init_mm" or
+-				   something.  */
+-				.vm_mm = NULL,
+-				.vm_start = FIXADDR_USER_START,
+-				.vm_end = FIXADDR_USER_END,
+-				.vm_page_prot = PAGE_READONLY,
+-				.vm_flags = VM_READ | VM_EXEC,
+-			};
++#ifdef FIXADDR_START
++		if (!vma && start >= FIXADDR_START && start < FIXADDR_TOP) {
+ 			unsigned long pg = start & PAGE_MASK;
+ 			pgd_t *pgd;
+ 			pmd_t *pmd;
+diff -Naur a/mm/mmap.c b/mm/mmap.c
+--- a/mm/mmap.c	Tue Sep  9 16:43:49 2003
++++ b/mm/mmap.c	Tue Sep  9 16:49:24 2003
+@@ -434,11 +434,11 @@
+  * The caller must hold down_write(current->mm->mmap_sem).
+  */
+ 
+-unsigned long do_mmap_pgoff(struct file * file, unsigned long addr,
+-			unsigned long len, unsigned long prot,
+-			unsigned long flags, unsigned long pgoff)
++unsigned long do_mmap_pgoff(struct mm_struct *mm, struct file * file, 
++			    unsigned long addr, unsigned long len,
++			    unsigned long prot, unsigned long flags,
++			    unsigned long pgoff)
+ {
+-	struct mm_struct * mm = current->mm;
+ 	struct vm_area_struct * vma, * prev;
+ 	struct inode *inode;
+ 	unsigned int vm_flags;
+diff -Naur a/mm/mprotect.c b/mm/mprotect.c
+--- a/mm/mprotect.c	Tue Sep  9 16:42:54 2003
++++ b/mm/mprotect.c	Tue Sep  9 16:48:27 2003
+@@ -222,7 +222,8 @@
+ }
+ 
+ asmlinkage long
+-sys_mprotect(unsigned long start, size_t len, unsigned long prot)
++do_mprotect(struct mm_struct *mm, unsigned long start, size_t len, 
++	     unsigned long prot)
+ {
+ 	unsigned long vm_flags, nstart, end, tmp;
+ 	struct vm_area_struct * vma, * next, * prev;
+@@ -241,9 +242,9 @@
+ 
+ 	vm_flags = calc_vm_prot_bits(prot);
+ 
+-	down_write(&current->mm->mmap_sem);
++	down_write(&mm->mmap_sem);
+ 
+-	vma = find_vma_prev(current->mm, start, &prev);
++	vma = find_vma_prev(mm, start, &prev);
+ 	error = -ENOMEM;
+ 	if (!vma || vma->vm_start > start)
+ 		goto out;
+@@ -304,6 +305,11 @@
+ 		prev->vm_mm->map_count--;
+ 	}
+ out:
+-	up_write(&current->mm->mmap_sem);
++	up_write(&mm->mmap_sem);
+ 	return error;
+ }
++
++asmlinkage long sys_mprotect(unsigned long start, size_t len, unsigned long prot)
++{
++        return(do_mprotect(current->mm, start, len, prot));
++}
+diff -Naur a/mm/proc_mm.c b/mm/proc_mm.c
+--- a/mm/proc_mm.c	Wed Dec 31 19:00:00 1969
++++ b/mm/proc_mm.c	Tue Sep  9 16:48:51 2003
+@@ -0,0 +1,174 @@
++/* 
++ * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
++ * Licensed under the GPL
++ */
++
++#include "linux/mm.h"
++#include "linux/init.h"
++#include "linux/proc_fs.h"
++#include "linux/proc_mm.h"
++#include "linux/file.h"
++#include "asm/uaccess.h"
++#include "asm/mmu_context.h"
++
++static struct file_operations proc_mm_fops;
++
++struct mm_struct *proc_mm_get_mm(int fd)
++{
++	struct mm_struct *ret = ERR_PTR(-EBADF);
++	struct file *file;
++
++	file = fget(fd);
++	if (!file)
++		goto out;
++
++	ret = ERR_PTR(-EINVAL);
++	if(file->f_op != &proc_mm_fops)
++		goto out_fput;
++
++	ret = file->private_data;
++ out_fput:
++	fput(file);
++ out:
++	return(ret);
++}
++
++extern long do_mmap2(struct mm_struct *mm, unsigned long addr, 
++		     unsigned long len, unsigned long prot, 
++		     unsigned long flags, unsigned long fd,
++		     unsigned long pgoff);
++
++static ssize_t write_proc_mm(struct file *file, const char *buffer,
++			     size_t count, loff_t *ppos)
++{
++	struct mm_struct *mm = file->private_data;
++	struct proc_mm_op req;
++	int n, ret;
++
++	if(count > sizeof(req))
++		return(-EINVAL);
++
++	n = copy_from_user(&req, buffer, count);
++	if(n != 0)
++		return(-EFAULT);
++
++	ret = count;
++	switch(req.op){
++	case MM_MMAP: {
++		struct mm_mmap *map = &req.u.mmap;
++
++		ret = do_mmap2(mm, map->addr, map->len, map->prot, 
++			       map->flags, map->fd, map->offset >> PAGE_SHIFT);
++		if((ret & ~PAGE_MASK) == 0)
++			ret = count;
++	
++		break;
++	}
++	case MM_MUNMAP: {
++		struct mm_munmap *unmap = &req.u.munmap;
++
++		down_write(&mm->mmap_sem);
++		ret = do_munmap(mm, unmap->addr, unmap->len);
++		up_write(&mm->mmap_sem);
++
++		if(ret == 0)
++			ret = count;
++		break;
++	}
++	case MM_MPROTECT: {
++		struct mm_mprotect *protect = &req.u.mprotect;
++
++		ret = do_mprotect(mm, protect->addr, protect->len, 
++				  protect->prot);
++		if(ret == 0)
++			ret = count;
++		break;
++	}
++
++	case MM_COPY_SEGMENTS: {
++		struct mm_struct *from = proc_mm_get_mm(req.u.copy_segments);
++
++		if(IS_ERR(from)){
++			ret = PTR_ERR(from);
++			break;
++		}
++
++		mm_copy_segments(from, mm);
++		break;
++	}
++	default:
++		ret = -EINVAL;
++		break;
++	}
++
++	return(ret);
++}
++
++static int open_proc_mm(struct inode *inode, struct file *file)
++{
++	struct mm_struct *mm = mm_alloc();
++	int ret;
++
++	ret = -ENOMEM;
++	if(mm == NULL)
++		goto out_mem;
++
++	ret = init_new_context(current, mm);
++	if(ret)
++		goto out_free;
++
++	spin_lock(&mmlist_lock);
++	list_add(&mm->mmlist, &current->mm->mmlist);
++	mmlist_nr++;
++	spin_unlock(&mmlist_lock);
++
++	file->private_data = mm;
++
++	return(0);
++
++ out_free:
++	mmput(mm);
++ out_mem:
++	return(ret);
++}
++
++static int release_proc_mm(struct inode *inode, struct file *file)
++{
++	struct mm_struct *mm = file->private_data;
++
++	mmput(mm);
++	return(0);
++}
++
++static struct file_operations proc_mm_fops = {
++	.open		= open_proc_mm,
++	.release	= release_proc_mm,
++	.write		= write_proc_mm,
++};
++
++static int make_proc_mm(void)
++{
++	struct proc_dir_entry *ent;
++
++	ent = create_proc_entry("mm", 0222, &proc_root);
++	if(ent == NULL){
++		printk("make_proc_mm : Failed to register /proc/mm\n");
++		return(0);
++	}
++	ent->proc_fops = &proc_mm_fops;
++
++	return(0);
++}
++
++__initcall(make_proc_mm);
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
diff --git a/lustre/kernel_patches/patches/uml-patch-2.6.3-rc2-1.patch b/lustre/kernel_patches/patches/uml-patch-2.6.3-rc2-1.patch
new file mode 100644
index 0000000..50ccbe5
--- /dev/null
+++ b/lustre/kernel_patches/patches/uml-patch-2.6.3-rc2-1.patch
@@ -0,0 +1,18844 @@
+diff -Naur a/arch/um/config.release b/arch/um/config.release
+--- a/arch/um/config.release	2004-02-11 12:16:48.000000000 -0500
++++ b/arch/um/config.release	2004-02-11 12:29:03.000000000 -0500
+@@ -228,7 +228,6 @@
+ CONFIG_EXT2_FS=y
+ CONFIG_SYSV_FS=m
+ CONFIG_UDF_FS=m
+-# CONFIG_UDF_RW is not set
+ CONFIG_UFS_FS=m
+ # CONFIG_UFS_FS_WRITE is not set
+ 
+diff -Naur a/arch/um/defconfig b/arch/um/defconfig
+--- a/arch/um/defconfig	2004-02-11 12:16:02.000000000 -0500
++++ b/arch/um/defconfig	2004-02-11 12:27:57.000000000 -0500
+@@ -3,29 +3,19 @@
+ #
+ CONFIG_USERMODE=y
+ CONFIG_MMU=y
+-CONFIG_SWAP=y
+ CONFIG_UID16=y
+ CONFIG_RWSEM_GENERIC_SPINLOCK=y
+-CONFIG_CONFIG_LOG_BUF_SHIFT=14
+ 
+ #
+-# Code maturity level options
+-#
+-CONFIG_EXPERIMENTAL=y
+-
+-#
+-# General Setup
++# UML-specific options
+ #
+ CONFIG_MODE_TT=y
+ CONFIG_MODE_SKAS=y
+ CONFIG_NET=y
+-CONFIG_SYSVIPC=y
+-CONFIG_BSD_PROCESS_ACCT=y
+-CONFIG_SYSCTL=y
+-CONFIG_BINFMT_AOUT=y
+ CONFIG_BINFMT_ELF=y
+ CONFIG_BINFMT_MISC=y
+ CONFIG_HOSTFS=y
++CONFIG_HPPFS=y
+ CONFIG_MCONSOLE=y
+ CONFIG_MAGIC_SYSRQ=y
+ # CONFIG_HOST_2G_2G is not set
+@@ -36,12 +26,41 @@
+ # CONFIG_HIGHMEM is not set
+ CONFIG_PROC_MM=y
+ CONFIG_KERNEL_STACK_ORDER=2
++CONFIG_UML_REAL_TIME_CLOCK=y
++
++#
++# Code maturity level options
++#
++CONFIG_EXPERIMENTAL=y
++CONFIG_CLEAN_COMPILE=y
++CONFIG_STANDALONE=y
++CONFIG_BROKEN_ON_SMP=y
++
++#
++# General setup
++#
++CONFIG_SWAP=y
++CONFIG_SYSVIPC=y
++CONFIG_BSD_PROCESS_ACCT=y
++CONFIG_SYSCTL=y
++CONFIG_LOG_BUF_SHIFT=14
++# CONFIG_IKCONFIG is not set
++# CONFIG_EMBEDDED is not set
++CONFIG_KALLSYMS=y
++CONFIG_FUTEX=y
++CONFIG_EPOLL=y
++CONFIG_IOSCHED_NOOP=y
++CONFIG_IOSCHED_AS=y
++CONFIG_IOSCHED_DEADLINE=y
+ 
+ #
+ # Loadable module support
+ #
+-CONFIG_MODULES=y
+-# CONFIG_KMOD is not set
++# CONFIG_MODULES is not set
++
++#
++# Generic Driver Options
++#
+ 
+ #
+ # Character Devices
+@@ -69,6 +88,7 @@
+ #
+ CONFIG_BLK_DEV_UBD=y
+ # CONFIG_BLK_DEV_UBD_SYNC is not set
++CONFIG_BLK_DEV_COW_COMMON=y
+ CONFIG_BLK_DEV_LOOP=y
+ CONFIG_BLK_DEV_NBD=y
+ CONFIG_BLK_DEV_RAM=y
+@@ -78,7 +98,7 @@
+ CONFIG_NETDEVICES=y
+ 
+ #
+-# Network Devices
++# UML Network Devices
+ #
+ CONFIG_UML_NET=y
+ CONFIG_UML_NET_ETHERTAP=y
+@@ -88,22 +108,6 @@
+ CONFIG_UML_NET_MCAST=y
+ # CONFIG_UML_NET_PCAP is not set
+ CONFIG_UML_NET_SLIRP=y
+-CONFIG_DUMMY=y
+-# CONFIG_BONDING is not set
+-# CONFIG_EQUALIZER is not set
+-CONFIG_TUN=y
+-# CONFIG_ETHERTAP is not set
+-CONFIG_PPP=y
+-# CONFIG_PPP_MULTILINK is not set
+-# CONFIG_PPP_ASYNC is not set
+-# CONFIG_PPP_SYNC_TTY is not set
+-# CONFIG_PPP_DEFLATE is not set
+-# CONFIG_PPP_BSDCOMP is not set
+-# CONFIG_PPPOE is not set
+-CONFIG_SLIP=y
+-# CONFIG_SLIP_COMPRESSED is not set
+-# CONFIG_SLIP_SMART is not set
+-# CONFIG_SLIP_MODE_SLIP6 is not set
+ 
+ #
+ # Networking support
+@@ -115,8 +119,6 @@
+ CONFIG_PACKET=y
+ CONFIG_PACKET_MMAP=y
+ # CONFIG_NETLINK_DEV is not set
+-# CONFIG_NETFILTER is not set
+-# CONFIG_FILTER is not set
+ CONFIG_UNIX=y
+ # CONFIG_NET_KEY is not set
+ CONFIG_INET=y
+@@ -130,8 +132,11 @@
+ # CONFIG_SYN_COOKIES is not set
+ # CONFIG_INET_AH is not set
+ # CONFIG_INET_ESP is not set
+-# CONFIG_XFRM_USER is not set
++# CONFIG_INET_IPCOMP is not set
+ # CONFIG_IPV6 is not set
++# CONFIG_DECNET is not set
++# CONFIG_BRIDGE is not set
++# CONFIG_NETFILTER is not set
+ 
+ #
+ # SCTP Configuration (EXPERIMENTAL)
+@@ -140,9 +145,9 @@
+ # CONFIG_IP_SCTP is not set
+ # CONFIG_ATM is not set
+ # CONFIG_VLAN_8021Q is not set
+-# CONFIG_LLC is not set
+-# CONFIG_DECNET is not set
+-# CONFIG_BRIDGE is not set
++# CONFIG_LLC2 is not set
++# CONFIG_IPX is not set
++# CONFIG_ATALK is not set
+ # CONFIG_X25 is not set
+ # CONFIG_LAPB is not set
+ # CONFIG_NET_DIVERT is not set
+@@ -160,6 +165,10 @@
+ # Network testing
+ #
+ # CONFIG_NET_PKTGEN is not set
++CONFIG_DUMMY=y
++# CONFIG_BONDING is not set
++# CONFIG_EQUALIZER is not set
++CONFIG_TUN=y
+ 
+ #
+ # Ethernet (10 or 100Mbit)
+@@ -171,12 +180,28 @@
+ #
+ 
+ #
++# Ethernet (10000 Mbit)
++#
++CONFIG_PPP=y
++# CONFIG_PPP_MULTILINK is not set
++# CONFIG_PPP_FILTER is not set
++# CONFIG_PPP_ASYNC is not set
++# CONFIG_PPP_SYNC_TTY is not set
++# CONFIG_PPP_DEFLATE is not set
++# CONFIG_PPP_BSDCOMP is not set
++# CONFIG_PPPOE is not set
++CONFIG_SLIP=y
++# CONFIG_SLIP_COMPRESSED is not set
++# CONFIG_SLIP_SMART is not set
++# CONFIG_SLIP_MODE_SLIP6 is not set
++
++#
+ # Wireless LAN (non-hamradio)
+ #
+ # CONFIG_NET_RADIO is not set
+ 
+ #
+-# Token Ring devices (depends on LLC=y)
++# Token Ring devices
+ #
+ # CONFIG_SHAPER is not set
+ 
+@@ -186,68 +211,101 @@
+ # CONFIG_WAN is not set
+ 
+ #
++# Amateur Radio support
++#
++# CONFIG_HAMRADIO is not set
++
++#
++# IrDA (infrared) support
++#
++# CONFIG_IRDA is not set
++
++#
++# Bluetooth support
++#
++# CONFIG_BT is not set
++
++#
+ # File systems
+ #
++CONFIG_EXT2_FS=y
++# CONFIG_EXT2_FS_XATTR is not set
++# CONFIG_EXT3_FS is not set
++# CONFIG_JBD is not set
++CONFIG_REISERFS_FS=y
++# CONFIG_REISERFS_CHECK is not set
++# CONFIG_REISERFS_PROC_INFO is not set
++# CONFIG_JFS_FS is not set
++# CONFIG_XFS_FS is not set
++CONFIG_MINIX_FS=y
++# CONFIG_ROMFS_FS is not set
+ CONFIG_QUOTA=y
+ # CONFIG_QFMT_V1 is not set
+ # CONFIG_QFMT_V2 is not set
+ CONFIG_QUOTACTL=y
+-CONFIG_AUTOFS_FS=m
+-CONFIG_AUTOFS4_FS=m
+-CONFIG_REISERFS_FS=m
+-# CONFIG_REISERFS_CHECK is not set
+-# CONFIG_REISERFS_PROC_INFO is not set
++CONFIG_AUTOFS_FS=y
++CONFIG_AUTOFS4_FS=y
++
++#
++# CD-ROM/DVD Filesystems
++#
++CONFIG_ISO9660_FS=y
++# CONFIG_JOLIET is not set
++# CONFIG_ZISOFS is not set
++# CONFIG_UDF_FS is not set
++
++#
++# DOS/FAT/NT Filesystems
++#
++CONFIG_FAT_FS=y
++CONFIG_MSDOS_FS=y
++CONFIG_VFAT_FS=y
++# CONFIG_NTFS_FS is not set
++
++#
++# Pseudo filesystems
++#
++CONFIG_PROC_FS=y
++CONFIG_PROC_KCORE=y
++CONFIG_DEVFS_FS=y
++CONFIG_DEVFS_MOUNT=y
++# CONFIG_DEVFS_DEBUG is not set
++CONFIG_DEVPTS_FS=y
++# CONFIG_DEVPTS_FS_XATTR is not set
++# CONFIG_TMPFS is not set
++# CONFIG_HUGETLB_PAGE is not set
++CONFIG_RAMFS=y
++
++#
++# Miscellaneous filesystems
++#
+ # CONFIG_ADFS_FS is not set
+ # CONFIG_AFFS_FS is not set
+ # CONFIG_HFS_FS is not set
+ # CONFIG_BEFS_FS is not set
+ # CONFIG_BFS_FS is not set
+-# CONFIG_EXT3_FS is not set
+-# CONFIG_JBD is not set
+-CONFIG_FAT_FS=m
+-CONFIG_MSDOS_FS=m
+-CONFIG_VFAT_FS=m
+ # CONFIG_EFS_FS is not set
+ CONFIG_JFFS_FS=y
+ CONFIG_JFFS_FS_VERBOSE=0
+-CONFIG_JFFS_PROC_FS=y
+ # CONFIG_JFFS2_FS is not set
+ # CONFIG_CRAMFS is not set
+-# CONFIG_TMPFS is not set
+-CONFIG_RAMFS=y
+-CONFIG_ISO9660_FS=m
+-# CONFIG_JOLIET is not set
+-# CONFIG_ZISOFS is not set
+-# CONFIG_JFS_FS is not set
+-CONFIG_MINIX_FS=m
+ # CONFIG_VXFS_FS is not set
+-# CONFIG_NTFS_FS is not set
+ # CONFIG_HPFS_FS is not set
+-CONFIG_PROC_FS=y
+-CONFIG_DEVFS_FS=y
+-CONFIG_DEVFS_MOUNT=y
+-# CONFIG_DEVFS_DEBUG is not set
+-CONFIG_DEVPTS_FS=y
+ # CONFIG_QNX4FS_FS is not set
+-# CONFIG_ROMFS_FS is not set
+-CONFIG_EXT2_FS=y
+-# CONFIG_EXT2_FS_XATTR is not set
+ # CONFIG_SYSV_FS is not set
+-# CONFIG_UDF_FS is not set
+ # CONFIG_UFS_FS is not set
+-# CONFIG_XFS_FS is not set
+ 
+ #
+ # Network File Systems
+ #
+-# CONFIG_CODA_FS is not set
+-# CONFIG_INTERMEZZO_FS is not set
+ # CONFIG_NFS_FS is not set
+ # CONFIG_NFSD is not set
+ # CONFIG_EXPORTFS is not set
+-# CONFIG_CIFS is not set
+ # CONFIG_SMB_FS is not set
++# CONFIG_CIFS is not set
+ # CONFIG_NCP_FS is not set
++# CONFIG_CODA_FS is not set
++# CONFIG_INTERMEZZO_FS is not set
+ # CONFIG_AFS_FS is not set
+ 
+ #
+@@ -317,28 +375,7 @@
+ #
+ # SCSI support
+ #
+-CONFIG_SCSI=y
+-CONFIG_GENERIC_ISA_DMA=y
+-
+-#
+-# SCSI support type (disk, tape, CD-ROM)
+-#
+-CONFIG_BLK_DEV_SD=y
+-CONFIG_SD_EXTRA_DEVS=40
+-CONFIG_CHR_DEV_ST=y
+-CONFIG_BLK_DEV_SR=y
+-CONFIG_BLK_DEV_SR_VENDOR=y
+-CONFIG_SR_EXTRA_DEVS=2
+-CONFIG_CHR_DEV_SG=y
+-
+-#
+-# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+-#
+-CONFIG_SCSI_DEBUG_QUEUES=y
+-CONFIG_SCSI_MULTI_LUN=y
+-CONFIG_SCSI_CONSTANTS=y
+-CONFIG_SCSI_LOGGING=y
+-CONFIG_SCSI_DEBUG=y
++# CONFIG_SCSI is not set
+ 
+ #
+ # Multi-device support (RAID and LVM)
+@@ -360,6 +397,7 @@
+ CONFIG_MTD_BLOCK=y
+ # CONFIG_FTL is not set
+ # CONFIG_NFTL is not set
++# CONFIG_INFTL is not set
+ 
+ #
+ # RAM/ROM/Flash chip drivers
+@@ -374,20 +412,21 @@
+ #
+ # Mapping drivers for chip access
+ #
++# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+ 
+ #
+ # Self-contained MTD device drivers
+ #
+ # CONFIG_MTD_SLRAM is not set
+ # CONFIG_MTD_MTDRAM is not set
+-CONFIG_MTD_BLKMTD=m
++CONFIG_MTD_BLKMTD=y
+ 
+ #
+ # Disk-On-Chip Device Drivers
+ #
+-# CONFIG_MTD_DOC1000 is not set
+ # CONFIG_MTD_DOC2000 is not set
+ # CONFIG_MTD_DOC2001 is not set
++# CONFIG_MTD_DOC2001PLUS is not set
+ 
+ #
+ # NAND Flash Device Drivers
+diff -Naur a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
+--- a/arch/um/drivers/chan_kern.c	2004-02-11 12:16:50.000000000 -0500
++++ b/arch/um/drivers/chan_kern.c	2004-02-11 12:29:06.000000000 -0500
+@@ -8,6 +8,7 @@
+ #include <linux/list.h>
+ #include <linux/slab.h>
+ #include <linux/tty.h>
++#include <linux/string.h>
+ #include <linux/tty_flip.h>
+ #include <asm/irq.h>
+ #include "chan_kern.h"
+@@ -265,6 +266,11 @@
+ {
+ 	int n = 0;
+ 
++	if(chan == NULL){
++		CONFIG_CHUNK(str, size, n, "none", 1);
++		return(n);
++	}
++
+ 	CONFIG_CHUNK(str, size, n, chan->ops->type, 0);
+ 
+ 	if(chan->dev == NULL){
+@@ -420,7 +426,8 @@
+ 		INIT_LIST_HEAD(chans);
+ 	}
+ 
+-	if((out = strchr(str, ',')) != NULL){
++	out = strchr(str, ',');
++	if(out != NULL){
+ 		in = str;
+ 		*out = '\0';
+ 		out++;
+@@ -475,12 +482,15 @@
+ 				goto out;
+ 			}
+ 			err = chan->ops->read(chan->fd, &c, chan->data);
+-			if(err > 0) tty_receive_char(tty, c);
++			if(err > 0) 
++				tty_receive_char(tty, c);
+ 		} while(err > 0);
++
+ 		if(err == 0) reactivate_fd(chan->fd, irq);
+ 		if(err == -EIO){
+ 			if(chan->primary){
+-				if(tty != NULL) tty_hangup(tty);
++				if(tty != NULL) 
++					tty_hangup(tty);
+ 				line_disable(dev, irq);
+ 				close_chan(chans);
+ 				free_chan(chans);
+diff -Naur a/arch/um/drivers/chan_user.c b/arch/um/drivers/chan_user.c
+--- a/arch/um/drivers/chan_user.c	2004-02-11 12:14:14.000000000 -0500
++++ b/arch/um/drivers/chan_user.c	2004-02-11 12:25:42.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* 
+- * Copyright (C) 2000, 2001 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+@@ -7,7 +7,6 @@
+ #include <stdlib.h>
+ #include <errno.h>
+ #include <termios.h>
+-#include <fcntl.h>
+ #include <string.h>
+ #include <signal.h>
+ #include <sys/stat.h>
+@@ -24,29 +23,27 @@
+ 
+ void generic_close(int fd, void *unused)
+ {
+-	close(fd);
++	os_close_file(fd);
+ }
+ 
+ int generic_read(int fd, char *c_out, void *unused)
+ {
+ 	int n;
+ 
+-	n = read(fd, c_out, sizeof(*c_out));
+-	if(n < 0){
+-		if(errno == EAGAIN) return(0);
+-		return(-errno);
+-	}
+-	else if(n == 0) return(-EIO);
+-	return(1);
++	n = os_read_file(fd, c_out, sizeof(*c_out));
++
++	if(n == -EAGAIN) 
++		return(0);
++	else if(n == 0) 
++		return(-EIO);
++	return(n);
+ }
+ 
++/* XXX Trivial wrapper around os_write_file */
++
+ int generic_write(int fd, const char *buf, int n, void *unused)
+ {
+-	int count;
+-
+-	count = write(fd, buf, n);
+-	if(count < 0) return(-errno);
+-	return(count);
++	return(os_write_file(fd, buf, n));
+ }
+ 
+ int generic_console_write(int fd, const char *buf, int n, void *unused)
+@@ -68,15 +65,18 @@
+ int generic_window_size(int fd, void *unused, unsigned short *rows_out,
+ 			unsigned short *cols_out)
+ {
+-	struct winsize size;
+-	int ret = 0;
++	int rows, cols;
++	int ret;
++
++	ret = os_window_size(fd, &rows, &cols);
++	if(ret < 0)
++		return(ret);
++
++	ret = ((*rows_out != rows) || (*cols_out != cols));
++
++	*rows_out = rows;
++	*cols_out = cols;
+ 
+-	if(ioctl(fd, TIOCGWINSZ, &size) == 0){
+-		ret = ((*rows_out != size.ws_row) || 
+-		       (*cols_out != size.ws_col));
+-		*rows_out = size.ws_row;
+-		*cols_out = size.ws_col;
+-	}
+ 	return(ret);
+ }
+ 
+@@ -100,14 +100,16 @@
+ 	struct winch_data *data = arg;
+ 	sigset_t sigs;
+ 	int pty_fd, pipe_fd;
++	int count, err;
+ 	char c = 1;
+ 
+-	close(data->close_me);
++	os_close_file(data->close_me);
+ 	pty_fd = data->pty_fd;
+ 	pipe_fd = data->pipe_fd;
+-	if(write(pipe_fd, &c, sizeof(c)) != sizeof(c))
++	count = os_write_file(pipe_fd, &c, sizeof(c));
++	if(count != sizeof(c))
+ 		printk("winch_thread : failed to write synchronization "
+-		       "byte, errno = %d\n", errno);
++		       "byte, err = %d\n", -count);
+ 
+ 	signal(SIGWINCH, winch_handler);
+ 	sigfillset(&sigs);
+@@ -123,26 +125,24 @@
+ 		exit(1);
+ 	}
+ 
+-	if(ioctl(pty_fd, TIOCSCTTY, 0) < 0){
+-		printk("winch_thread : TIOCSCTTY failed, errno = %d\n", errno);
+-		exit(1);
+-	}
+-	if(tcsetpgrp(pty_fd, os_getpid()) < 0){
+-		printk("winch_thread : tcsetpgrp failed, errno = %d\n", errno);
++	err = os_new_tty_pgrp(pty_fd, os_getpid());
++	if(err < 0){
++		printk("winch_thread : new_tty_pgrp failed, err = %d\n", -err);
+ 		exit(1);
+ 	}
+ 
+-	if(read(pipe_fd, &c, sizeof(c)) != sizeof(c))
++	count = os_read_file(pipe_fd, &c, sizeof(c));
++	if(count != sizeof(c))
+ 		printk("winch_thread : failed to read synchronization byte, "
+-		       "errno = %d\n", errno);
++		       "err = %d\n", -count);
+ 
+ 	while(1){
+ 		pause();
+ 
+-		if(write(pipe_fd, &c, sizeof(c)) != sizeof(c)){
+-			printk("winch_thread : write failed, errno = %d\n",
+-			       errno);
+-		}
++		count = os_write_file(pipe_fd, &c, sizeof(c));
++		if(count != sizeof(c))
++			printk("winch_thread : write failed, err = %d\n",
++			       -count);
+ 	}
+ }
+ 
+@@ -154,8 +154,8 @@
+ 	char c;
+ 
+ 	err = os_pipe(fds, 1, 1);
+-	if(err){
+-		printk("winch_tramp : os_pipe failed, errno = %d\n", -err);
++	if(err < 0){
++		printk("winch_tramp : os_pipe failed, err = %d\n", -err);
+ 		return(err);
+ 	}
+ 
+@@ -168,12 +168,12 @@
+ 		return(pid);
+ 	}
+ 
+-	close(fds[1]);
++	os_close_file(fds[1]);
+ 	*fd_out = fds[0];
+-	n = read(fds[0], &c, sizeof(c));
++	n = os_read_file(fds[0], &c, sizeof(c));
+ 	if(n != sizeof(c)){
+ 		printk("winch_tramp : failed to read synchronization byte\n");
+-		printk("read returned %d, errno = %d\n", n, errno);
++		printk("read failed, err = %d\n", -n);
+ 		printk("fd %d will not support SIGWINCH\n", fd);
+ 		*fd_out = -1;
+ 	}
+@@ -183,20 +183,24 @@
+ void register_winch(int fd, void *device_data)
+ {
+ 	int pid, thread, thread_fd;
++	int count;
+ 	char c = 1;
+ 
+-	if(!isatty(fd)) return;
++	if(!isatty(fd)) 
++		return;
+ 
+ 	pid = tcgetpgrp(fd);
+-	if(!CHOOSE_MODE(is_tracer_winch(pid, fd, device_data), 0) && 
+-	   (pid == -1)){
++	if(!CHOOSE_MODE_PROC(is_tracer_winch, is_skas_winch, pid, fd, 
++			     device_data) && (pid == -1)){
+ 		thread = winch_tramp(fd, device_data, &thread_fd);
+ 		if(fd != -1){
+ 			register_winch_irq(thread_fd, fd, thread, device_data);
+ 
+-			if(write(thread_fd, &c, sizeof(c)) != sizeof(c))
++			count = os_write_file(thread_fd, &c, sizeof(c));
++			if(count != sizeof(c))
+ 				printk("register_winch : failed to write "
+-				       "synchronization byte\n");
++				       "synchronization byte, err = %d\n",
++					-count);
+ 		}
+ 	}
+ }
+diff -Naur a/arch/um/drivers/cow.h b/arch/um/drivers/cow.h
+--- a/arch/um/drivers/cow.h	1969-12-31 19:00:00.000000000 -0500
++++ b/arch/um/drivers/cow.h	2004-02-11 12:26:08.000000000 -0500
+@@ -0,0 +1,41 @@
++#ifndef __COW_H__
++#define __COW_H__
++
++#include <asm/types.h>
++
++#if __BYTE_ORDER == __BIG_ENDIAN
++# define ntohll(x) (x)
++# define htonll(x) (x)
++#elif __BYTE_ORDER == __LITTLE_ENDIAN
++# define ntohll(x)  bswap_64(x)
++# define htonll(x)  bswap_64(x)
++#else
++#error "__BYTE_ORDER not defined"
++#endif
++
++extern int init_cow_file(int fd, char *cow_file, char *backing_file, 
++			 int sectorsize, int alignment, int *bitmap_offset_out, 
++			 unsigned long *bitmap_len_out, int *data_offset_out);
++
++extern int file_reader(__u64 offset, char *buf, int len, void *arg);
++extern int read_cow_header(int (*reader)(__u64, char *, int, void *), 
++			   void *arg, __u32 *version_out, 
++			   char **backing_file_out, time_t *mtime_out, 
++			   __u64 *size_out, int *sectorsize_out, 
++			   __u32 *align_out, int *bitmap_offset_out);
++
++extern int write_cow_header(char *cow_file, int fd, char *backing_file, 
++			    int sectorsize, int alignment, long long *size);
++
++extern void cow_sizes(int version, __u64 size, int sectorsize, int align,
++		      int bitmap_offset, unsigned long *bitmap_len_out, 
++		      int *data_offset_out);
++
++#endif
++
++/*
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/arch/um/drivers/cow_kern.c b/arch/um/drivers/cow_kern.c
+--- a/arch/um/drivers/cow_kern.c	1969-12-31 19:00:00.000000000 -0500
++++ b/arch/um/drivers/cow_kern.c	2004-02-11 12:29:06.000000000 -0500
+@@ -0,0 +1,630 @@
++#define COW_MAJOR 60
++#define MAJOR_NR COW_MAJOR
++
++#include <linux/stddef.h>
++#include <linux/kernel.h>
++#include <linux/ctype.h>
++#include <linux/stat.h>
++#include <linux/vmalloc.h>
++#include <linux/blkdev.h>
++#include <linux/blk.h>
++#include <linux/fs.h>
++#include <linux/genhd.h>
++#include <linux/devfs_fs.h>
++#include <asm/uaccess.h>
++#include "2_5compat.h"
++#include "cow.h"
++#include "ubd_user.h"
++
++#define COW_SHIFT 4
++
++struct cow {
++	int count;
++	char *cow_path;
++	dev_t cow_dev;
++	struct block_device *cow_bdev;
++	char *backing_path;
++	dev_t backing_dev;
++	struct block_device *backing_bdev;
++	int sectorsize;
++	unsigned long *bitmap;
++	unsigned long bitmap_len;
++	int bitmap_offset;
++	int data_offset;
++	devfs_handle_t devfs;
++	struct semaphore sem;
++	struct semaphore io_sem;
++	atomic_t working;
++	spinlock_t io_lock;
++	struct buffer_head *bh;
++	struct buffer_head *bhtail;
++	void *end_io;
++};
++
++#define DEFAULT_COW { \
++	.count			= 0, \
++	.cow_path		= NULL, \
++	.cow_dev		= 0, \
++	.backing_path		= NULL, \
++	.backing_dev		= 0, \
++        .bitmap			= NULL, \
++	.bitmap_len		= 0, \
++	.bitmap_offset		= 0, \
++        .data_offset		= 0, \
++	.devfs			= NULL, \
++	.working		= ATOMIC_INIT(0), \
++	.io_lock		= SPIN_LOCK_UNLOCKED, \
++}
++
++#define MAX_DEV (8)
++#define MAX_MINOR (MAX_DEV << COW_SHIFT)
++
++struct cow cow_dev[MAX_DEV] = { [ 0 ... MAX_DEV - 1 ] = DEFAULT_COW };
++
++/* Not modified by this driver */
++static int blk_sizes[MAX_MINOR] = { [ 0 ... MAX_MINOR - 1 ] = BLOCK_SIZE };
++static int hardsect_sizes[MAX_MINOR] = { [ 0 ... MAX_MINOR - 1 ] = 512 };
++
++/* Protected by cow_lock */
++static int sizes[MAX_MINOR] = { [ 0 ... MAX_MINOR - 1 ] = 0 };
++
++static struct hd_struct	cow_part[MAX_MINOR] =
++	{ [ 0 ... MAX_MINOR - 1 ] = { 0, 0, 0 } };
++
++/* Protected by io_request_lock */
++static request_queue_t *cow_queue;
++
++static int cow_open(struct inode *inode, struct file *filp);
++static int cow_release(struct inode * inode, struct file * file);
++static int cow_ioctl(struct inode * inode, struct file * file,
++		     unsigned int cmd, unsigned long arg);
++static int cow_revalidate(kdev_t rdev);
++
++static struct block_device_operations cow_blops = {
++	.open		= cow_open,
++	.release	= cow_release,
++	.ioctl		= cow_ioctl,
++	.revalidate	= cow_revalidate,
++};
++
++/* Initialized in an initcall, and unchanged thereafter */
++devfs_handle_t cow_dir_handle;
++
++#define INIT_GENDISK(maj, name, parts, shift, bsizes, max, blops) \
++{ \
++	.major 		= maj, \
++	.major_name  	= name, \
++	.minor_shift 	= shift, \
++	.max_p  	= 1 << shift, \
++	.part  		= parts, \
++	.sizes  	= bsizes, \
++	.nr_real  	= max, \
++	.real_devices  	= NULL, \
++	.next  		= NULL, \
++	.fops  		= blops, \
++	.de_arr  	= NULL, \
++	.flags  	= 0 \
++}
++
++static spinlock_t cow_lock = SPIN_LOCK_UNLOCKED;
++
++static struct gendisk cow_gendisk = INIT_GENDISK(MAJOR_NR, "cow", cow_part,
++						 COW_SHIFT, sizes, MAX_DEV, 
++						 &cow_blops);
++
++static int cow_add(int n)
++{
++	struct cow *dev = &cow_dev[n];
++	char name[sizeof("nnnnnn\0")];
++	int err = -ENODEV;
++
++	if(dev->cow_path == NULL)
++		goto out;
++
++	sprintf(name, "%d", n);
++	dev->devfs = devfs_register(cow_dir_handle, name, DEVFS_FL_REMOVABLE,
++				    MAJOR_NR, n << COW_SHIFT, S_IFBLK | 
++				    S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
++				    &cow_blops, NULL);
++
++	init_MUTEX_LOCKED(&dev->sem);
++	init_MUTEX(&dev->io_sem);
++
++	return(0);
++
++ out:
++	return(err);
++}
++
++/*
++ * Add buffer_head to back of pending list
++ */
++static void cow_add_bh(struct cow *cow, struct buffer_head *bh)
++{
++	unsigned long flags;
++
++	spin_lock_irqsave(&cow->io_lock, flags);
++	if(cow->bhtail != NULL){
++		cow->bhtail->b_reqnext = bh;
++		cow->bhtail = bh;
++	}
++	else {
++		cow->bh = bh;
++		cow->bhtail = bh;
++	}
++	spin_unlock_irqrestore(&cow->io_lock, flags);
++}
++
++/*
++* Grab first pending buffer
++*/
++static struct buffer_head *cow_get_bh(struct cow *cow)
++{
++	struct buffer_head *bh;
++
++	spin_lock_irq(&cow->io_lock);
++	bh = cow->bh;
++	if(bh != NULL){
++		if(bh == cow->bhtail)
++			cow->bhtail = NULL;
++		cow->bh = bh->b_reqnext;
++		bh->b_reqnext = NULL;
++	}
++	spin_unlock_irq(&cow->io_lock);
++
++	return(bh);
++}
++
++static void cow_handle_bh(struct cow *cow, struct buffer_head *bh, 
++			  struct buffer_head **cow_bh, int ncow_bh)
++{
++	int i;
++
++	if(ncow_bh > 0)
++		ll_rw_block(WRITE, ncow_bh, cow_bh);
++
++	for(i = 0; i < ncow_bh ; i++){
++		wait_on_buffer(cow_bh[i]);
++		brelse(cow_bh[i]);
++	}
++
++	ll_rw_block(WRITE, 1, &bh);
++	brelse(bh);
++}
++
++static struct buffer_head *cow_new_bh(struct cow *dev, int sector)
++{
++	struct buffer_head *bh;
++
++	sector = (dev->bitmap_offset + sector / 8) / dev->sectorsize;
++	bh = getblk(dev->cow_dev, sector, dev->sectorsize);
++	memcpy(bh->b_data, dev->bitmap + sector / (8 * sizeof(dev->bitmap[0])),
++	       dev->sectorsize);
++	return(bh);
++}
++
++/* Copied from loop.c, needed to avoid deadlocking in make_request. */
++
++static int cow_thread(void *data)
++{
++	struct cow *dev = data;
++	struct buffer_head *bh;
++
++	daemonize();
++	exit_files(current);
++
++	sprintf(current->comm, "cow%d", dev - cow_dev);
++
++	spin_lock_irq(&current->sigmask_lock);
++	sigfillset(&current->blocked);
++	flush_signals(current);
++	spin_unlock_irq(&current->sigmask_lock);
++
++	atomic_inc(&dev->working);
++
++	current->policy = SCHED_OTHER;
++	current->nice = -20;
++
++	current->flags |= PF_NOIO;
++
++	/*
++	 * up sem, we are running
++	 */
++	up(&dev->sem);
++
++	for(;;){
++		int start, len, nbh, i, update_bitmap = 0;
++		struct buffer_head *cow_bh[2];
++
++		down_interruptible(&dev->io_sem);
++		/*
++		 * could be upped because of tear-down, not because of
++		 * pending work
++		 */
++		if(!atomic_read(&dev->working))
++			break;
++
++		bh = cow_get_bh(dev);
++		if(bh == NULL){
++			printk(KERN_ERR "cow: missing bh\n");
++			continue;
++		}
++
++		start = bh->b_blocknr * bh->b_size / dev->sectorsize;
++		len = bh->b_size / dev->sectorsize;
++		for(i = 0; i < len ; i++){
++			if(ubd_test_bit(start + i, 
++					(unsigned char *) dev->bitmap))
++				continue;
++
++			update_bitmap = 1;
++			ubd_set_bit(start + i, (unsigned char *) dev->bitmap);
++		}
++
++		cow_bh[0] = NULL;
++		cow_bh[1] = NULL;
++		nbh = 0;
++		if(update_bitmap){
++			cow_bh[0] = cow_new_bh(dev, start);
++			nbh++;
++			if(start / dev->sectorsize != 
++			   (start + len) / dev->sectorsize){
++				cow_bh[1] = cow_new_bh(dev, start + len);
++				nbh++;
++			}
++		}
++		
++		bh->b_dev = dev->cow_dev;
++		bh->b_blocknr += dev->data_offset / dev->sectorsize;
++
++		cow_handle_bh(dev, bh, cow_bh, nbh);
++
++		/*
++		 * upped both for pending work and tear-down, lo_pending
++		 * will hit zero then
++		 */
++		if(atomic_dec_and_test(&dev->working))
++			break;
++	}
++
++	up(&dev->sem);
++	return(0);
++}
++
++static int cow_make_request(request_queue_t *q, int rw, struct buffer_head *bh)
++{
++	struct cow *dev;
++	int n, minor;
++
++	minor = MINOR(bh->b_rdev);
++	n = minor >> COW_SHIFT;
++	dev = &cow_dev[n];
++
++	dev->end_io = NULL;
++	if(ubd_test_bit(bh->b_rsector, (unsigned char *) dev->bitmap)){
++		bh->b_rdev = dev->cow_dev;
++		bh->b_rsector += dev->data_offset / dev->sectorsize;
++	}
++	else if(rw == WRITE){
++		bh->b_dev = dev->cow_dev;
++		bh->b_blocknr += dev->data_offset / dev->sectorsize;
++
++		cow_add_bh(dev, bh);
++		up(&dev->io_sem);
++		return(0);
++	}
++	else {
++		bh->b_rdev = dev->backing_dev;
++	}
++
++	return(1);
++}
++
++int cow_init(void)
++{
++	int i;
++
++	cow_dir_handle = devfs_mk_dir (NULL, "cow", NULL);
++	if (devfs_register_blkdev(MAJOR_NR, "cow", &cow_blops)) {
++		printk(KERN_ERR "cow: unable to get major %d\n", MAJOR_NR);
++		return -1;
++	}
++	read_ahead[MAJOR_NR] = 8;		/* 8 sector (4kB) read-ahead */
++	blksize_size[MAJOR_NR] = blk_sizes;
++	blk_size[MAJOR_NR] = sizes;
++	INIT_HARDSECT(hardsect_size, MAJOR_NR, hardsect_sizes);
++
++	cow_queue = BLK_DEFAULT_QUEUE(MAJOR_NR);
++	blk_init_queue(cow_queue, NULL);
++	INIT_ELV(cow_queue, &cow_queue->elevator);
++	blk_queue_make_request(cow_queue, cow_make_request);
++
++	add_gendisk(&cow_gendisk);
++
++	for(i=0;i<MAX_DEV;i++) 
++		cow_add(i);
++
++	return(0);
++}
++
++__initcall(cow_init);
++
++static int reader(__u64 start, char *buf, int count, void *arg)
++{
++	dev_t dev = *((dev_t *) arg);
++	struct buffer_head *bh;
++	__u64 block;
++	int cur, offset, left, n, blocksize = get_hardsect_size(dev);
++
++	if(blocksize == 0)
++		panic("Zero blocksize");
++
++	block = start / blocksize;
++	offset = start % blocksize;
++	left = count;
++	cur = 0;
++	while(left > 0){
++		n = (left > blocksize) ? blocksize : left;
++
++		bh = bread(dev, block, (n < 512) ? 512 : n);
++		if(bh == NULL)
++			return(-EIO);
++
++		n -= offset;
++		memcpy(&buf[cur], bh->b_data + offset, n);
++		block++;
++		left -= n;
++		cur += n;
++		offset = 0;
++		brelse(bh);
++	}
++
++	return(count);
++}
++
++static int cow_open(struct inode *inode, struct file *filp)
++{
++	int (*dev_ioctl)(struct inode *, struct file *, unsigned int, 
++			 unsigned long);
++	mm_segment_t fs;
++	struct cow *dev;
++	__u64 size;
++	__u32 version, align;
++	time_t mtime;
++	char *backing_file;
++	int n, offset, err = 0;
++
++	n = DEVICE_NR(inode->i_rdev);
++	if(n >= MAX_DEV)
++		return(-ENODEV);
++	dev = &cow_dev[n];
++	offset = n << COW_SHIFT;
++
++	spin_lock(&cow_lock);
++
++	if(dev->count == 0){
++		dev->cow_dev = name_to_kdev_t(dev->cow_path);
++		if(dev->cow_dev == 0){
++			printk(KERN_ERR "cow_open - name_to_kdev_t(\"%s\") "
++			       "failed\n", dev->cow_path);
++			err = -ENODEV;
++		}
++
++		dev->backing_dev = name_to_kdev_t(dev->backing_path);
++		if(dev->backing_dev == 0){
++			printk(KERN_ERR "cow_open - name_to_kdev_t(\"%s\") "
++			       "failed\n", dev->backing_path);
++			err = -ENODEV;
++		}
++
++		if(err) 
++			goto out;
++
++		dev->cow_bdev = bdget(dev->cow_dev);
++		if(dev->cow_bdev == NULL){
++			printk(KERN_ERR "cow_open - bdget(\"%s\") failed\n", 
++			       dev->cow_path);
++			err = -ENOMEM;
++		}
++		dev->backing_bdev = bdget(dev->backing_dev);
++		if(dev->backing_bdev == NULL){
++			printk(KERN_ERR "cow_open - bdget(\"%s\") failed\n", 
++			       dev->backing_path);
++			err = -ENOMEM;
++		}
++
++		if(err) 
++			goto out;
++
++		err = blkdev_get(dev->cow_bdev, FMODE_READ|FMODE_WRITE, 0, 
++				 BDEV_RAW);
++		if(err){
++			printk("cow_open - blkdev_get of COW device failed, "
++			       "error = %d\n", err);
++			goto out;
++		}
++		
++		err = blkdev_get(dev->backing_bdev, FMODE_READ, 0, BDEV_RAW);
++		if(err){
++			printk("cow_open - blkdev_get of backing device "
++			       "failed, error = %d\n", err);
++			goto out;
++		}
++		
++		err = read_cow_header(reader, &dev->cow_dev, &version, 
++				      &backing_file, &mtime, &size,
++				      &dev->sectorsize, &align, 
++				      &dev->bitmap_offset);
++		if(err){
++			printk(KERN_ERR "cow_open - read_cow_header failed, "
++			       "err = %d\n", err);
++			goto out;
++		}
++
++		cow_sizes(version, size, dev->sectorsize, align, 
++			  dev->bitmap_offset, &dev->bitmap_len, 
++			  &dev->data_offset);
++		dev->bitmap = (void *) vmalloc(dev->bitmap_len);
++		if(dev->bitmap == NULL){
++			err = -ENOMEM;
++			printk(KERN_ERR "Failed to vmalloc COW bitmap\n");
++			goto out;
++		}
++		flush_tlb_kernel_vm();
++		
++		err = reader(dev->bitmap_offset, (char *) dev->bitmap, 
++			     dev->bitmap_len, &dev->cow_dev);
++		if(err < 0){
++			printk(KERN_ERR "Failed to read COW bitmap\n");
++			vfree(dev->bitmap);
++			goto out;
++		}
++
++		dev_ioctl = dev->backing_bdev->bd_op->ioctl;
++		fs = get_fs();
++		set_fs(KERNEL_DS);
++		err = (*dev_ioctl)(inode, filp, BLKGETSIZE, 
++				   (unsigned long) &sizes[offset]);
++		set_fs(fs);
++		if(err){
++			printk(KERN_ERR "cow_open - BLKGETSIZE failed, "
++			       "error = %d\n", err);
++			goto out;
++		}
++
++		kernel_thread(cow_thread, dev, 
++			      CLONE_FS | CLONE_FILES | CLONE_SIGHAND);
++		down(&dev->sem);
++	}
++	dev->count++;
++ out:
++	spin_unlock(&cow_lock);
++	return(err);
++}
++
++static int cow_release(struct inode * inode, struct file * file)
++{
++	struct cow *dev;
++	int n, err;
++
++	n = DEVICE_NR(inode->i_rdev);
++	if(n >= MAX_DEV)
++		return(-ENODEV);
++	dev = &cow_dev[n];
++
++	spin_lock(&cow_lock);
++
++	if(--dev->count > 0)
++		goto out;
++
++	err = blkdev_put(dev->cow_bdev, BDEV_RAW);
++	if(err)
++		printk("cow_release - blkdev_put of cow device failed, "
++		       "error = %d\n", err);
++	bdput(dev->cow_bdev);
++	dev->cow_bdev = 0;
++
++	err = blkdev_put(dev->backing_bdev, BDEV_RAW);
++	if(err)
++		printk("cow_release - blkdev_put of backing device failed, "
++		       "error = %d\n", err);
++	bdput(dev->backing_bdev);
++	dev->backing_bdev = 0;
++
++ out:
++	spin_unlock(&cow_lock);
++	return(0);
++}
++
++static int cow_ioctl(struct inode * inode, struct file * file,
++		     unsigned int cmd, unsigned long arg)
++{
++	struct cow *dev;
++	int (*dev_ioctl)(struct inode *, struct file *, unsigned int, 
++			 unsigned long);
++	int n;
++
++	n = DEVICE_NR(inode->i_rdev);
++	if(n >= MAX_DEV)
++		return(-ENODEV);
++	dev = &cow_dev[n];
++
++	dev_ioctl = dev->backing_bdev->bd_op->ioctl;
++	return((*dev_ioctl)(inode, file, cmd, arg));
++}
++
++static int cow_revalidate(kdev_t rdev)
++{
++	printk(KERN_ERR "Need to implement cow_revalidate\n");
++	return(0);
++}
++
++static int parse_unit(char **ptr)
++{
++	char *str = *ptr, *end;
++	int n = -1;
++
++	if(isdigit(*str)) {
++		n = simple_strtoul(str, &end, 0);
++		if(end == str)
++			return(-1);
++		*ptr = end;
++	}
++	else if (('a' <= *str) && (*str <= 'h')) {
++		n = *str - 'a';
++		str++;
++		*ptr = str;
++	}
++	return(n);
++}
++
++static int cow_setup(char *str)
++{
++	struct cow *dev;
++	char *cow_name, *backing_name;
++	int unit;
++
++	unit = parse_unit(&str);
++	if(unit < 0){
++		printk(KERN_ERR "cow_setup - Couldn't parse unit number\n");
++		return(1);
++	}
++
++	if(*str != '='){
++		printk(KERN_ERR "cow_setup - Missing '=' after unit "
++		       "number\n");
++		return(1);
++	}
++	str++;
++
++	cow_name = str;
++	backing_name = strchr(str, ',');
++	if(backing_name == NULL){
++		printk(KERN_ERR "cow_setup - missing backing device name\n");
++		return(0);
++	}
++	*backing_name = '\0';
++	backing_name++;
++
++	spin_lock(&cow_lock);
++
++	dev = &cow_dev[unit];
++	dev->cow_path = cow_name;
++	dev->backing_path = backing_name;
++	
++	spin_unlock(&cow_lock);
++	return(0);
++}
++
++__setup("cow", cow_setup);
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/arch/um/drivers/cow_sys.h b/arch/um/drivers/cow_sys.h
+--- a/arch/um/drivers/cow_sys.h	1969-12-31 19:00:00.000000000 -0500
++++ b/arch/um/drivers/cow_sys.h	2004-02-11 12:27:42.000000000 -0500
+@@ -0,0 +1,48 @@
++#ifndef __COW_SYS_H__
++#define __COW_SYS_H__
++
++#include "kern_util.h"
++#include "user_util.h"
++#include "os.h"
++#include "user.h"
++
++static inline void *cow_malloc(int size)
++{
++	return(um_kmalloc(size));
++}
++
++static inline void cow_free(void *ptr)
++{
++	kfree(ptr);
++}
++
++#define cow_printf printk
++
++static inline char *cow_strdup(char *str)
++{
++	return(uml_strdup(str));
++}
++
++static inline int cow_seek_file(int fd, __u64 offset)
++{
++	return(os_seek_file(fd, offset));
++}
++
++static inline int cow_file_size(char *file, __u64 *size_out)
++{
++	return(os_file_size(file, size_out));
++}
++
++static inline int cow_write_file(int fd, char *buf, int size)
++{
++	return(os_write_file(fd, buf, size));
++}
++
++#endif
++
++/*
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/arch/um/drivers/cow_user.c b/arch/um/drivers/cow_user.c
+--- a/arch/um/drivers/cow_user.c	1969-12-31 19:00:00.000000000 -0500
++++ b/arch/um/drivers/cow_user.c	2004-02-11 12:27:36.000000000 -0500
+@@ -0,0 +1,375 @@
++#include <stddef.h>
++#include <string.h>
++#include <errno.h>
++#include <unistd.h>
++#include <byteswap.h>
++#include <sys/time.h>
++#include <sys/param.h>
++#include <sys/user.h>
++#include <netinet/in.h>
++
++#include "os.h"
++
++#include "cow.h"
++#include "cow_sys.h"
++
++#define PATH_LEN_V1 256
++
++struct cow_header_v1 {
++	int magic;
++	int version;
++	char backing_file[PATH_LEN_V1];
++	time_t mtime;
++	__u64 size;
++	int sectorsize;
++};
++
++#define PATH_LEN_V2 MAXPATHLEN
++
++struct cow_header_v2 {
++	unsigned long magic;
++	unsigned long version;
++	char backing_file[PATH_LEN_V2];
++	time_t mtime;
++	__u64 size;
++	int sectorsize;
++};
++
++/* Define PATH_LEN_V3 as the usual value of MAXPATHLEN, just hard-code it in 
++ * case other systems have different values for MAXPATHLEN
++ */
++#define PATH_LEN_V3 4096
++
++/* Changes from V2 - 
++ *	PATH_LEN_V3 as described above
++ *	Explicitly specify field bit lengths for systems with different
++ *		lengths for the usual C types.  Not sure whether char or
++ *		time_t should be changed, this can be changed later without
++ *		breaking compatibility
++ *	Add alignment field so that different alignments can be used for the
++ *		bitmap and data
++ * 	Add cow_format field to allow for the possibility of different ways
++ *		of specifying the COW blocks.  For now, the only value is 0,
++ * 		for the traditional COW bitmap.
++ *	Move the backing_file field to the end of the header.  This allows
++ *		for the possibility of expanding it into the padding required
++ *		by the bitmap alignment.
++ * 	The bitmap and data portions of the file will be aligned as specified
++ * 		by the alignment field.  This is to allow COW files to be
++ *		put on devices with restrictions on access alignments, such as
++ *		/dev/raw, with a 512 byte alignment restriction.  This also
++ *		allows the data to be more aligned more strictly than on
++ *		sector boundaries.  This is needed for ubd-mmap, which needs
++ *		the data to be page aligned.
++ *	Fixed (finally!) the rounding bug
++ */
++
++struct cow_header_v3 {
++	__u32 magic;
++	__u32 version;
++	time_t mtime;
++	__u64 size;
++	__u32 sectorsize;
++	__u32 alignment;
++	__u32 cow_format;
++	char backing_file[PATH_LEN_V3];
++};
++
++/* COW format definitions - for now, we have only the usual COW bitmap */
++#define COW_BITMAP 0
++
++union cow_header {
++	struct cow_header_v1 v1;
++	struct cow_header_v2 v2;
++	struct cow_header_v3 v3;
++};
++
++#define COW_MAGIC 0x4f4f4f4d  /* MOOO */
++#define COW_VERSION 3
++
++#define DIV_ROUND(x, len) (((x) + (len) - 1) / (len))
++#define ROUND_UP(x, align) DIV_ROUND(x, align) * (align)
++
++void cow_sizes(int version, __u64 size, int sectorsize, int align, 
++	       int bitmap_offset, unsigned long *bitmap_len_out, 
++	       int *data_offset_out)
++{
++	if(version < 3){
++		*bitmap_len_out = (size + sectorsize - 1) / (8 * sectorsize);
++
++		*data_offset_out = bitmap_offset + *bitmap_len_out;
++		*data_offset_out = (*data_offset_out + sectorsize - 1) / 
++			sectorsize;
++		*data_offset_out *= sectorsize;
++	}
++	else {
++		*bitmap_len_out = DIV_ROUND(size, sectorsize);
++		*bitmap_len_out = DIV_ROUND(*bitmap_len_out, 8);
++
++		*data_offset_out = bitmap_offset + *bitmap_len_out;
++		*data_offset_out = ROUND_UP(*data_offset_out, align);
++	}
++}
++
++static int absolutize(char *to, int size, char *from)
++{
++	char save_cwd[256], *slash;
++	int remaining;
++
++	if(getcwd(save_cwd, sizeof(save_cwd)) == NULL) {
++		cow_printf("absolutize : unable to get cwd - errno = %d\n", 
++			   errno);
++		return(-1);
++	}
++	slash = strrchr(from, '/');
++	if(slash != NULL){
++		*slash = '\0';
++		if(chdir(from)){
++			*slash = '/';
++			cow_printf("absolutize : Can't cd to '%s' - " 
++				   "errno = %d\n", from, errno);
++			return(-1);
++		}
++		*slash = '/';
++		if(getcwd(to, size) == NULL){
++			cow_printf("absolutize : unable to get cwd of '%s' - "
++			       "errno = %d\n", from, errno);
++			return(-1);
++		}
++		remaining = size - strlen(to);
++		if(strlen(slash) + 1 > remaining){
++			cow_printf("absolutize : unable to fit '%s' into %d "
++			       "chars\n", from, size);
++			return(-1);
++		}
++		strcat(to, slash);
++	}
++	else {
++		if(strlen(save_cwd) + 1 + strlen(from) + 1 > size){
++			cow_printf("absolutize : unable to fit '%s' into %d "
++			       "chars\n", from, size);
++			return(-1);
++		}
++		strcpy(to, save_cwd);
++		strcat(to, "/");
++		strcat(to, from);
++	}
++	chdir(save_cwd);
++	return(0);
++}
++
++int write_cow_header(char *cow_file, int fd, char *backing_file, 
++		     int sectorsize, int alignment, long long *size)
++{
++	struct cow_header_v3 *header;
++	unsigned long modtime;
++	int err;
++
++	err = cow_seek_file(fd, 0);
++	if(err < 0){
++		cow_printf("write_cow_header - lseek failed, err = %d\n", -err);
++		goto out;
++	}
++
++	err = -ENOMEM;
++	header = cow_malloc(sizeof(*header));
++	if(header == NULL){
++		cow_printf("Failed to allocate COW V3 header\n");
++		goto out;
++	}
++	header->magic = htonl(COW_MAGIC);
++	header->version = htonl(COW_VERSION);
++
++	err = -EINVAL;
++	if(strlen(backing_file) > sizeof(header->backing_file) - 1){
++		cow_printf("Backing file name \"%s\" is too long - names are "
++			   "limited to %d characters\n", backing_file, 
++			   sizeof(header->backing_file) - 1);
++		goto out_free;
++	}
++
++	if(absolutize(header->backing_file, sizeof(header->backing_file), 
++		      backing_file))
++		goto out_free;
++
++	err = os_file_modtime(header->backing_file, &modtime);
++	if(err < 0){
++		cow_printf("Backing file '%s' mtime request failed, "
++			   "err = %d\n", header->backing_file, -err);
++		goto out_free;
++	}
++
++	err = cow_file_size(header->backing_file, size);
++	if(err < 0){
++		cow_printf("Couldn't get size of backing file '%s', "
++			   "err = %d\n", header->backing_file, -err);
++		goto out_free;
++	}
++
++	header->mtime = htonl(modtime);
++	header->size = htonll(*size);
++	header->sectorsize = htonl(sectorsize);
++	header->alignment = htonl(alignment);
++	header->cow_format = COW_BITMAP;
++
++	err = os_write_file(fd, header, sizeof(*header));
++	if(err != sizeof(*header)){
++		cow_printf("Write of header to new COW file '%s' failed, "
++			   "err = %d\n", cow_file, -err);
++		goto out_free;
++	}
++	err = 0;
++ out_free:
++	cow_free(header);
++ out:
++	return(err);
++}
++
++int file_reader(__u64 offset, char *buf, int len, void *arg)
++{
++	int fd = *((int *) arg);
++
++	return(pread(fd, buf, len, offset));
++}
++
++/* XXX Need to sanity-check the values read from the header */
++
++int read_cow_header(int (*reader)(__u64, char *, int, void *), void *arg, 
++		    __u32 *version_out, char **backing_file_out, 
++		    time_t *mtime_out, __u64 *size_out, 
++		    int *sectorsize_out, __u32 *align_out, 
++		    int *bitmap_offset_out)
++{
++	union cow_header *header;
++	char *file;
++	int err, n;
++	unsigned long version, magic;
++
++	header = cow_malloc(sizeof(*header));
++	if(header == NULL){
++	        cow_printf("read_cow_header - Failed to allocate header\n");
++		return(-ENOMEM);
++	}
++	err = -EINVAL;
++	n = (*reader)(0, (char *) header, sizeof(*header), arg);
++	if(n < offsetof(typeof(header->v1), backing_file)){
++		cow_printf("read_cow_header - short header\n");
++		goto out;
++	}
++
++	magic = header->v1.magic;
++	if(magic == COW_MAGIC) {
++		version = header->v1.version;
++	}
++	else if(magic == ntohl(COW_MAGIC)){
++		version = ntohl(header->v1.version);
++	}
++	/* No error printed because the non-COW case comes through here */
++	else goto out;
++
++	*version_out = version;
++
++	if(version == 1){
++		if(n < sizeof(header->v1)){
++			cow_printf("read_cow_header - failed to read V1 "
++				   "header\n");
++			goto out;
++		}
++		*mtime_out = header->v1.mtime;
++		*size_out = header->v1.size;
++		*sectorsize_out = header->v1.sectorsize;
++		*bitmap_offset_out = sizeof(header->v1);
++		*align_out = *sectorsize_out;
++		file = header->v1.backing_file;
++	}
++	else if(version == 2){
++		if(n < sizeof(header->v2)){
++			cow_printf("read_cow_header - failed to read V2 "
++				   "header\n");
++			goto out;
++		}
++		*mtime_out = ntohl(header->v2.mtime);
++		*size_out = ntohll(header->v2.size);
++		*sectorsize_out = ntohl(header->v2.sectorsize);
++		*bitmap_offset_out = sizeof(header->v2);
++		*align_out = *sectorsize_out;
++		file = header->v2.backing_file;
++	}
++	else if(version == 3){
++		if(n < sizeof(header->v3)){
++			cow_printf("read_cow_header - failed to read V2 "
++				   "header\n");
++			goto out;
++		}
++		*mtime_out = ntohl(header->v3.mtime);
++		*size_out = ntohll(header->v3.size);
++		*sectorsize_out = ntohl(header->v3.sectorsize);
++		*align_out = ntohl(header->v3.alignment);
++		*bitmap_offset_out = ROUND_UP(sizeof(header->v3), *align_out);
++		file = header->v3.backing_file;
++	}
++	else {
++		cow_printf("read_cow_header - invalid COW version\n");
++		goto out;		
++	}
++	err = -ENOMEM;
++	*backing_file_out = cow_strdup(file);
++	if(*backing_file_out == NULL){
++		cow_printf("read_cow_header - failed to allocate backing "
++			   "file\n");
++		goto out;
++	}
++	err = 0;
++ out:
++	cow_free(header);
++	return(err);
++}
++
++int init_cow_file(int fd, char *cow_file, char *backing_file, int sectorsize,
++		  int alignment, int *bitmap_offset_out, 
++		  unsigned long *bitmap_len_out, int *data_offset_out)
++{
++	__u64 size, offset;
++	char zero = 0;
++	int err;
++
++	err = write_cow_header(cow_file, fd, backing_file, sectorsize, 
++			       alignment, &size);
++	if(err) 
++		goto out;
++	
++	*bitmap_offset_out = ROUND_UP(sizeof(struct cow_header_v3), alignment);
++	cow_sizes(COW_VERSION, size, sectorsize, alignment, *bitmap_offset_out,
++		  bitmap_len_out, data_offset_out);
++
++	offset = *data_offset_out + size - sizeof(zero);
++	err = cow_seek_file(fd, offset);
++	if(err < 0){
++		cow_printf("cow bitmap lseek failed : err = %d\n", -err);
++		goto out;
++	}
++
++	/* does not really matter how much we write it is just to set EOF 
++	 * this also sets the entire COW bitmap
++	 * to zero without having to allocate it 
++	 */
++	err = cow_write_file(fd, &zero, sizeof(zero));
++	if(err != sizeof(zero)){
++		cow_printf("Write of bitmap to new COW file '%s' failed, "
++			   "err = %d\n", cow_file, -err);
++		err = -EINVAL;
++		goto out;
++	}
++
++	return(0);
++
++ out:
++	return(err);
++}
++
++/*
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/arch/um/drivers/daemon_user.c b/arch/um/drivers/daemon_user.c
+--- a/arch/um/drivers/daemon_user.c	2004-02-11 12:15:11.000000000 -0500
++++ b/arch/um/drivers/daemon_user.c	2004-02-11 12:26:57.000000000 -0500
+@@ -53,7 +53,8 @@
+ 	struct request_v3 req;
+ 	int fd, n, err;
+ 
+-	if((pri->control = socket(AF_UNIX, SOCK_STREAM, 0)) < 0){
++	pri->control = socket(AF_UNIX, SOCK_STREAM, 0);
++	if(pri->control < 0){
+ 		printk("daemon_open : control socket failed, errno = %d\n", 
+ 		       errno);		
+ 		return(-errno);
+@@ -67,7 +68,8 @@
+ 		goto out;
+ 	}
+ 
+-	if((fd = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0){
++	fd = socket(AF_UNIX, SOCK_DGRAM, 0);
++	if(fd < 0){
+ 		printk("daemon_open : data socket failed, errno = %d\n", 
+ 		       errno);
+ 		err = -errno;
+@@ -91,18 +93,18 @@
+ 	req.version = SWITCH_VERSION;
+ 	req.type = REQ_NEW_CONTROL;
+ 	req.sock = *local_addr;
+-	n = write(pri->control, &req, sizeof(req));
++	n = os_write_file(pri->control, &req, sizeof(req));
+ 	if(n != sizeof(req)){
+-		printk("daemon_open : control setup request returned %d, "
+-		       "errno = %d\n", n, errno);
++		printk("daemon_open : control setup request failed, err = %d\n",
++		       -n);
+ 		err = -ENOTCONN;
+ 		goto out;		
+ 	}
+ 
+-	n = read(pri->control, sun, sizeof(*sun));
++	n = os_read_file(pri->control, sun, sizeof(*sun));
+ 	if(n != sizeof(*sun)){
+-		printk("daemon_open : read of data socket returned %d, "
+-		       "errno = %d\n", n, errno);
++		printk("daemon_open : read of data socket failed, err = %d\n", 
++		       -n);
+ 		err = -ENOTCONN;
+ 		goto out_close;		
+ 	}
+@@ -111,9 +113,9 @@
+ 	return(fd);
+ 
+  out_close:
+-	close(fd);
++	os_close_file(fd);
+  out:
+-	close(pri->control);
++	os_close_file(pri->control);
+ 	return(err);
+ }
+ 
+@@ -153,8 +155,8 @@
+ {
+ 	struct daemon_data *pri = data;
+ 
+-	close(pri->fd);
+-	close(pri->control);
++	os_close_file(pri->fd);
++	os_close_file(pri->control);
+ 	if(pri->data_addr != NULL) kfree(pri->data_addr);
+ 	if(pri->ctl_addr != NULL) kfree(pri->ctl_addr);
+ 	if(pri->local_addr != NULL) kfree(pri->local_addr);
+diff -Naur a/arch/um/drivers/fd.c b/arch/um/drivers/fd.c
+--- a/arch/um/drivers/fd.c	2004-02-11 12:16:47.000000000 -0500
++++ b/arch/um/drivers/fd.c	2004-02-11 12:29:01.000000000 -0500
+@@ -35,7 +35,8 @@
+ 		printk("fd_init : couldn't parse file descriptor '%s'\n", str);
+ 		return(NULL);
+ 	}
+-	if((data = um_kmalloc(sizeof(*data))) == NULL) return(NULL);
++	data = um_kmalloc(sizeof(*data));
++	if(data == NULL) return(NULL);
+ 	*data = ((struct fd_chan) { .fd  	= n,
+ 				    .raw  	= opts->raw });
+ 	return(data);
+diff -Naur a/arch/um/drivers/harddog_user.c b/arch/um/drivers/harddog_user.c
+--- a/arch/um/drivers/harddog_user.c	2004-02-11 12:14:38.000000000 -0500
++++ b/arch/um/drivers/harddog_user.c	2004-02-11 12:26:41.000000000 -0500
+@@ -27,10 +27,10 @@
+ 	dup2(data->stdin, 0);
+ 	dup2(data->stdout, 1);
+ 	dup2(data->stdout, 2);
+-	close(data->stdin);
+-	close(data->stdout);
+-	close(data->close_me[0]);
+-	close(data->close_me[1]);
++	os_close_file(data->stdin);
++	os_close_file(data->stdout);
++	os_close_file(data->close_me[0]);
++	os_close_file(data->close_me[1]);
+ }
+ 
+ int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock)
+@@ -44,15 +44,15 @@
+ 	char **args = NULL;
+ 
+ 	err = os_pipe(in_fds, 1, 0);
+-	if(err){
+-		printk("harddog_open - os_pipe failed, errno = %d\n", -err);
+-		return(err);
++	if(err < 0){
++		printk("harddog_open - os_pipe failed, err = %d\n", -err);
++		goto out;
+ 	}
+ 
+ 	err = os_pipe(out_fds, 1, 0);
+-	if(err){
+-		printk("harddog_open - os_pipe failed, errno = %d\n", -err);
+-		return(err);
++	if(err < 0){
++		printk("harddog_open - os_pipe failed, err = %d\n", -err);
++		goto out_close_in;
+ 	}
+ 
+ 	data.stdin = out_fds[0];
+@@ -72,42 +72,47 @@
+ 
+ 	pid = run_helper(pre_exec, &data, args, NULL);
+ 
+-	close(out_fds[0]);
+-	close(in_fds[1]);
++	os_close_file(out_fds[0]);
++	os_close_file(in_fds[1]);
+ 
+ 	if(pid < 0){
+ 		err = -pid;
+-		printk("harddog_open - run_helper failed, errno = %d\n", err);
+-		goto out;
++		printk("harddog_open - run_helper failed, errno = %d\n", -err);
++		goto out_close_out;
+ 	}
+ 
+-	n = read(in_fds[0], &c, sizeof(c));
++	n = os_read_file(in_fds[0], &c, sizeof(c));
+ 	if(n == 0){
+ 		printk("harddog_open - EOF on watchdog pipe\n");
+ 		helper_wait(pid);
+ 		err = -EIO;
+-		goto out;
++		goto out_close_out;
+ 	}
+ 	else if(n < 0){
+ 		printk("harddog_open - read of watchdog pipe failed, "
+-		       "errno = %d\n", errno);
++		       "err = %d\n", -n);
+ 		helper_wait(pid);
+-		err = -errno;
+-		goto out;
++		err = n;
++		goto out_close_out;
+ 	}
+ 	*in_fd_ret = in_fds[0];
+ 	*out_fd_ret = out_fds[1];
+ 	return(0);
++
++ out_close_in:
++	os_close_file(in_fds[0]);
++	os_close_file(in_fds[1]);
++ out_close_out:
++	os_close_file(out_fds[0]);
++	os_close_file(out_fds[1]);
+  out:
+-	close(out_fds[1]);
+-	close(in_fds[0]);
+ 	return(err);
+ }
+ 
+ void stop_watchdog(int in_fd, int out_fd)
+ {
+-	close(in_fd);
+-	close(out_fd);
++	os_close_file(in_fd);
++	os_close_file(out_fd);
+ }
+ 
+ int ping_watchdog(int fd)
+@@ -115,11 +120,12 @@
+ 	int n;
+ 	char c = '\n';
+ 
+-	n = write(fd, &c, sizeof(c));
+-	if(n < sizeof(c)){
+-		printk("ping_watchdog - write failed, errno = %d\n",
+-		       errno);
+-		return(-errno);
++	n = os_write_file(fd, &c, sizeof(c));
++	if(n != sizeof(c)){
++		printk("ping_watchdog - write failed, err = %d\n", -n);
++		if(n < 0) 
++			return(n);
++		return(-EIO);
+ 	}
+ 	return 1;
+ 
+diff -Naur a/arch/um/drivers/hostaudio_kern.c b/arch/um/drivers/hostaudio_kern.c
+--- a/arch/um/drivers/hostaudio_kern.c	2004-02-11 12:16:48.000000000 -0500
++++ b/arch/um/drivers/hostaudio_kern.c	2004-02-11 12:29:03.000000000 -0500
+@@ -5,12 +5,12 @@
+ 
+ #include "linux/config.h"
+ #include "linux/module.h"
+-#include "linux/version.h"
+ #include "linux/init.h"
+ #include "linux/slab.h"
+ #include "linux/fs.h"
+ #include "linux/sound.h"
+ #include "linux/soundcard.h"
++#include "asm/uaccess.h"
+ #include "kern_util.h"
+ #include "init.h"
+ #include "hostaudio.h"
+@@ -19,30 +19,39 @@
+ char *dsp = HOSTAUDIO_DEV_DSP;
+ char *mixer = HOSTAUDIO_DEV_MIXER;
+ 
++#define DSP_HELP \
++"    This is used to specify the host dsp device to the hostaudio driver.\n" \
++"    The default is \"" HOSTAUDIO_DEV_DSP "\".\n\n"
++
++#define MIXER_HELP \
++"    This is used to specify the host mixer device to the hostaudio driver.\n" \
++"    The default is \"" HOSTAUDIO_DEV_MIXER "\".\n\n"
++
+ #ifndef MODULE
+ static int set_dsp(char *name, int *add)
+ {
+-	dsp = uml_strdup(name);
++	dsp = name;
+ 	return(0);
+ }
+ 
+-__uml_setup("dsp=", set_dsp,
+-"dsp=<dsp device>\n"
+-"    This is used to specify the host dsp device to the hostaudio driver.\n"
+-"    The default is \"" HOSTAUDIO_DEV_DSP "\".\n\n"
+-);
++__uml_setup("dsp=", set_dsp, "dsp=<dsp device>\n" DSP_HELP);
+ 
+ static int set_mixer(char *name, int *add)
+ {
+-	mixer = uml_strdup(name);
++	mixer = name;
+ 	return(0);
+ }
+ 
+-__uml_setup("mixer=", set_mixer,
+-"mixer=<mixer device>\n"
+-"    This is used to specify the host mixer device to the hostaudio driver.\n"
+-"    The default is \"" HOSTAUDIO_DEV_MIXER "\".\n\n"
+-);
++__uml_setup("mixer=", set_mixer, "mixer=<mixer device>\n" MIXER_HELP);
++
++#else /*MODULE*/
++
++MODULE_PARM(dsp, "s");
++MODULE_PARM_DESC(dsp, DSP_HELP);
++
++MODULE_PARM(mixer, "s");
++MODULE_PARM_DESC(mixer, MIXER_HELP);
++
+ #endif
+ 
+ /* /dev/dsp file operations */
+@@ -51,23 +60,55 @@
+ 			      loff_t *ppos)
+ {
+         struct hostaudio_state *state = file->private_data;
++	void *kbuf;
++	int err;
+ 
+ #ifdef DEBUG
+         printk("hostaudio: read called, count = %d\n", count);
+ #endif
+ 
+-        return(hostaudio_read_user(state, buffer, count, ppos));
++	kbuf = kmalloc(count, GFP_KERNEL);
++	if(kbuf == NULL)
++		return(-ENOMEM);
++
++        err = hostaudio_read_user(state, kbuf, count, ppos);
++	if(err < 0)
++		goto out;
++
++	if(copy_to_user(buffer, kbuf, err))
++		err = -EFAULT;
++
++ out:
++	kfree(kbuf);
++	return(err);
+ }
+ 
+ static ssize_t hostaudio_write(struct file *file, const char *buffer, 
+ 			       size_t count, loff_t *ppos)
+ {
+         struct hostaudio_state *state = file->private_data;
++	void *kbuf;
++	int err;
+ 
+ #ifdef DEBUG
+         printk("hostaudio: write called, count = %d\n", count);
+ #endif
+-        return(hostaudio_write_user(state, buffer, count, ppos));
++
++	kbuf = kmalloc(count, GFP_KERNEL);
++	if(kbuf == NULL)
++		return(-ENOMEM);
++
++	err = -EFAULT;
++	if(copy_from_user(kbuf, buffer, count))
++		goto out;
++
++        err = hostaudio_write_user(state, kbuf, count, ppos);
++	if(err < 0)
++		goto out;
++
++ out:
++	kfree(kbuf);
++	return(err);
+ }
+ 
+ static unsigned int hostaudio_poll(struct file *file, 
+@@ -86,12 +127,43 @@
+ 			   unsigned int cmd, unsigned long arg)
+ {
+         struct hostaudio_state *state = file->private_data;
++	unsigned long data = 0;
++	int err;
+ 
+ #ifdef DEBUG
+         printk("hostaudio: ioctl called, cmd = %u\n", cmd);
+ #endif
++	switch(cmd){
++	case SNDCTL_DSP_SPEED:
++	case SNDCTL_DSP_STEREO:
++	case SNDCTL_DSP_GETBLKSIZE:
++	case SNDCTL_DSP_CHANNELS:
++	case SNDCTL_DSP_SUBDIVIDE:
++	case SNDCTL_DSP_SETFRAGMENT:
++		if(get_user(data, (int *) arg))
++			return(-EFAULT);
++		break;
++	default:
++		break;
++	}
++
++        err = hostaudio_ioctl_user(state, cmd, (unsigned long) &data);
++
++	switch(cmd){
++	case SNDCTL_DSP_SPEED:
++	case SNDCTL_DSP_STEREO:
++	case SNDCTL_DSP_GETBLKSIZE:
++	case SNDCTL_DSP_CHANNELS:
++	case SNDCTL_DSP_SUBDIVIDE:
++	case SNDCTL_DSP_SETFRAGMENT:
++		if(put_user(data, (int *) arg))
++			return(-EFAULT);
++		break;
++	default:
++		break;
++	}
+ 
+-        return(hostaudio_ioctl_user(state, cmd, arg));
++	return(err);
+ }
+ 
+ static int hostaudio_open(struct inode *inode, struct file *file)
+@@ -225,7 +297,8 @@
+ 
+ static int __init hostaudio_init_module(void)
+ {
+-        printk(KERN_INFO "UML Audio Relay\n");
++        printk(KERN_INFO "UML Audio Relay (host dsp = %s, host mixer = %s)\n",
++	       dsp, mixer);
+ 
+ 	module_data.dev_audio = register_sound_dsp(&hostaudio_fops, -1);
+         if(module_data.dev_audio < 0){
+diff -Naur a/arch/um/drivers/hostaudio_user.c b/arch/um/drivers/hostaudio_user.c
+--- a/arch/um/drivers/hostaudio_user.c	2004-02-11 12:16:08.000000000 -0500
++++ b/arch/um/drivers/hostaudio_user.c	2004-02-11 12:28:04.000000000 -0500
+@@ -4,9 +4,6 @@
+  */
+ 
+ #include <sys/types.h>
+-#include <sys/stat.h>
+-#include <sys/ioctl.h>
+-#include <fcntl.h>
+ #include <unistd.h>
+ #include <errno.h>
+ #include "hostaudio.h"
+@@ -20,45 +17,31 @@
+ ssize_t hostaudio_read_user(struct hostaudio_state *state, char *buffer, 
+ 			    size_t count, loff_t *ppos)
+ {
+-	ssize_t ret;
+-
+ #ifdef DEBUG
+         printk("hostaudio: read_user called, count = %d\n", count);
+ #endif
+ 
+-        ret = read(state->fd, buffer, count);
+-
+-        if(ret < 0) return(-errno);
+-        return(ret);
++	return(os_read_file(state->fd, buffer, count));
+ }
+ 
+ ssize_t hostaudio_write_user(struct hostaudio_state *state, const char *buffer,
+ 			     size_t count, loff_t *ppos)
+ {
+-	ssize_t ret;
+-
+ #ifdef DEBUG
+         printk("hostaudio: write_user called, count = %d\n", count);
+ #endif
+ 
+-        ret = write(state->fd, buffer, count);
+-
+-        if(ret < 0) return(-errno);
+-        return(ret);
++	return(os_write_file(state->fd, buffer, count));
+ }
+ 
+ int hostaudio_ioctl_user(struct hostaudio_state *state, unsigned int cmd, 
+ 			 unsigned long arg)
+ {
+-	int ret;
+ #ifdef DEBUG
+         printk("hostaudio: ioctl_user called, cmd = %u\n", cmd);
+ #endif
+ 
+-        ret = ioctl(state->fd, cmd, arg);
+-	
+-        if(ret < 0) return(-errno);
+-        return(ret);
++	return(os_ioctl_generic(state->fd, cmd, arg));
+ }
+ 
+ int hostaudio_open_user(struct hostaudio_state *state, int r, int w, char *dsp)
+@@ -67,14 +50,15 @@
+         printk("hostaudio: open_user called\n");
+ #endif
+ 
+-        state->fd = os_open_file(dsp, of_set_rw(OPENFLAGS(), r, w), 0);
+-
+-        if(state->fd >= 0) return(0);
++	state->fd = os_open_file(dsp, of_set_rw(OPENFLAGS(), r, w), 0);
+ 
+-        printk("hostaudio_open_user failed to open '%s', errno = %d\n",
+-	       dsp, errno);
++	if(state->fd < 0) {
++		printk("hostaudio_open_user failed to open '%s', err = %d\n",
++		       dsp, -state->fd);
++		return(state->fd); 
++	}
+         
+-        return(-errno); 
++	return(0);
+ }
+ 
+ int hostaudio_release_user(struct hostaudio_state *state)
+@@ -82,10 +66,10 @@
+ #ifdef DEBUG
+         printk("hostaudio: release called\n");
+ #endif
+-        if(state->fd >= 0){
+-		close(state->fd);
+-		state->fd=-1;
+-        }
++	if(state->fd >= 0){
++		os_close_file(state->fd);
++		state->fd = -1;
++	}
+ 
+         return(0);
+ }
+@@ -95,15 +79,11 @@
+ int hostmixer_ioctl_mixdev_user(struct hostmixer_state *state, 
+ 				unsigned int cmd, unsigned long arg)
+ {
+-	int ret;
+ #ifdef DEBUG
+         printk("hostmixer: ioctl_user called cmd = %u\n",cmd);
+ #endif
+ 
+-        ret = ioctl(state->fd, cmd, arg);
+-	if(ret < 0) 
+-		return(-errno);
+-	return(ret);
++	return(os_ioctl_generic(state->fd, cmd, arg));
+ }
+ 
+ int hostmixer_open_mixdev_user(struct hostmixer_state *state, int r, int w,
+@@ -115,12 +95,13 @@
+ 
+         state->fd = os_open_file(mixer, of_set_rw(OPENFLAGS(), r, w), 0);
+ 
+-        if(state->fd >= 0) return(0);
+-
+-        printk("hostaudio_open_mixdev_user failed to open '%s', errno = %d\n",
+-	       mixer, errno);
++	if(state->fd < 0) {
++	        printk("hostaudio_open_mixdev_user failed to open '%s', "
++		       "err = %d\n", mixer, state->fd);
++		return(state->fd); 
++	}
+         
+-        return(-errno); 
++	return(0);
+ }
+ 
+ int hostmixer_release_mixdev_user(struct hostmixer_state *state)
+@@ -130,7 +111,7 @@
+ #endif
+ 
+         if(state->fd >= 0){
+-		close(state->fd);
++		os_close_file(state->fd);
+ 		state->fd = -1;
+         }
+ 
+diff -Naur a/arch/um/drivers/line.c b/arch/um/drivers/line.c
+--- a/arch/um/drivers/line.c	2004-02-11 12:16:38.000000000 -0500
++++ b/arch/um/drivers/line.c	2004-02-11 12:28:38.000000000 -0500
+@@ -6,8 +6,8 @@
+ #include "linux/sched.h"
+ #include "linux/slab.h"
+ #include "linux/list.h"
++#include "linux/interrupt.h"
+ #include "linux/devfs_fs_kernel.h"
+-#include "asm/irq.h"
+ #include "asm/uaccess.h"
+ #include "chan_kern.h"
+ #include "irq_user.h"
+@@ -16,38 +16,55 @@
+ #include "user_util.h"
+ #include "kern_util.h"
+ #include "os.h"
++#include "irq_kern.h"
+ 
+ #define LINE_BUFSIZE 4096
+ 
+-void line_interrupt(int irq, void *data, struct pt_regs *unused)
++static irqreturn_t line_interrupt(int irq, void *data, struct pt_regs *unused)
+ {
+ 	struct line *dev = data;
+ 
+ 	if(dev->count > 0) 
+ 		chan_interrupt(&dev->chan_list, &dev->task, dev->tty, irq, 
+ 			       dev);
++	return IRQ_HANDLED;
+ }
+ 
+-void line_timer_cb(void *arg)
++static void line_timer_cb(void *arg)
+ {
+ 	struct line *dev = arg;
+ 
+ 	line_interrupt(dev->driver->read_irq, dev, NULL);
+ }
+ 
+-static void buffer_data(struct line *line, const char *buf, int len)
++static int write_room(struct line *dev)
+ {
+-	int end;
++	int n;
++
++	if(dev->buffer == NULL) return(LINE_BUFSIZE - 1);
++
++	n = dev->head - dev->tail;
++	if(n <= 0) n = LINE_BUFSIZE + n;
++	return(n - 1);
++}
++
++static int buffer_data(struct line *line, const char *buf, int len)
++{
++	int end, room;
+ 
+ 	if(line->buffer == NULL){
+ 		line->buffer = kmalloc(LINE_BUFSIZE, GFP_ATOMIC);
+ 		if(line->buffer == NULL){
+ 			printk("buffer_data - atomic allocation failed\n");
+-			return;
++			return(0);
+ 		}
+ 		line->head = line->buffer;
+ 		line->tail = line->buffer;
+ 	}
++
++	room = write_room(line);
++	len = (len > room) ? room : len;
++
+ 	end = line->buffer + LINE_BUFSIZE - line->tail;
+ 	if(len < end){
+ 		memcpy(line->tail, buf, len);
+@@ -60,6 +77,8 @@
+ 		memcpy(line->buffer, buf, len);
+ 		line->tail = line->buffer + len;
+ 	}
++
++	return(len);
+ }
+ 
+ static int flush_buffer(struct line *line)
+@@ -95,7 +114,7 @@
+ 	struct line *line;
+ 	char *new;
+ 	unsigned long flags;
+-	int n, err, i;
++	int n, err, i, ret = 0;
+ 
+ 	if(tty->stopped) return 0;
+ 
+@@ -104,9 +123,13 @@
+ 		if(new == NULL)
+ 			return(0);
+ 		n = copy_from_user(new, buf, len);
+-		if(n == len)
+-			return(-EFAULT);
+ 		buf = new;
++		if(n == len){
++			len = -EFAULT;
++			goto out_free;
++		}
++
++		len -= n;
+ 	}
+ 
+ 	i = tty->index;
+@@ -115,41 +138,50 @@
+ 	down(&line->sem);
+ 	if(line->head != line->tail){
+ 		local_irq_save(flags);
+-		buffer_data(line, buf, len);
++		ret += buffer_data(line, buf, len);
+ 		err = flush_buffer(line);
+ 		local_irq_restore(flags);
+ 		if(err <= 0)
+-			goto out;
++			goto out_up;
+ 	}
+ 	else {
+ 		n = write_chan(&line->chan_list, buf, len, 
+ 			       line->driver->write_irq);
+ 		if(n < 0){
+-			len = n;
+-			goto out;
++			ret = n;
++			goto out_up;
+ 		}
+-		if(n < len)
+-			buffer_data(line, buf + n, len - n);
++
++		len -= n;
++		ret += n;
++		if(len > 0)
++			ret += buffer_data(line, buf + n, len);
+ 	}
+- out:
++ out_up:
+ 	up(&line->sem);
+-	return(len);
++ out_free:
++	if(from_user)
++		kfree(buf);
++	return(ret);
+ }
+ 
+-void line_write_interrupt(int irq, void *data, struct pt_regs *unused)
++static irqreturn_t line_write_interrupt(int irq, void *data, 
++					struct pt_regs *unused)
+ {
+ 	struct line *dev = data;
+ 	struct tty_struct *tty = dev->tty;
+ 	int err;
+ 
+ 	err = flush_buffer(dev);
+-	if(err == 0) return;
++	if(err == 0) 
++		return(IRQ_NONE);
+ 	else if(err < 0){
+ 		dev->head = dev->buffer;
+ 		dev->tail = dev->buffer;
+ 	}
+ 
+-	if(tty == NULL) return;
++	if(tty == NULL) 
++		return(IRQ_NONE);
+ 
+ 	if(test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags) &&
+ 	   (tty->ldisc.write_wakeup != NULL))
+@@ -161,21 +193,9 @@
+ 	 * writes.
+ 	 */
+ 
+-	if (waitqueue_active(&tty->write_wait))
++	if(waitqueue_active(&tty->write_wait))
+ 		wake_up_interruptible(&tty->write_wait);
+-
+-}
+-
+-int line_write_room(struct tty_struct *tty)
+-{
+-	struct line *dev = tty->driver_data;
+-	int n;
+-
+-	if(dev->buffer == NULL) return(LINE_BUFSIZE - 1);
+-
+-	n = dev->head - dev->tail;
+-	if(n <= 0) n = LINE_BUFSIZE + n;
+-	return(n - 1);
++	return(IRQ_HANDLED);
+ }
+ 
+ int line_setup_irq(int fd, int input, int output, void *data)
+@@ -305,7 +325,7 @@
+ 		if(*end != '='){
+ 			printk(KERN_ERR "line_setup failed to parse \"%s\"\n", 
+ 			       init);
+-			return(1);
++			return(0);
+ 		}
+ 		init = end;
+ 	}
+@@ -313,12 +333,12 @@
+ 	if((n >= 0) && (n >= num)){
+ 		printk("line_setup - %d out of range ((0 ... %d) allowed)\n",
+ 		       n, num);
+-		return(1);
++		return(0);
+ 	}
+ 	else if(n >= 0){
+ 		if(lines[n].count > 0){
+ 			printk("line_setup - device %d is open\n", n);
+-			return(1);
++			return(0);
+ 		}
+ 		if(lines[n].init_pri <= INIT_ONE){
+ 			lines[n].init_pri = INIT_ONE;
+@@ -332,7 +352,7 @@
+ 	else if(!all_allowed){
+ 		printk("line_setup - can't configure all devices from "
+ 		       "mconsole\n");
+-		return(1);
++		return(0);
+ 	}
+ 	else {
+ 		for(i = 0; i < num; i++){
+@@ -346,7 +366,7 @@
+ 			}
+ 		}
+ 	}
+-	return(0);
++	return(1);
+ }
+ 
+ int line_config(struct line *lines, int num, char *str)
+@@ -357,7 +377,7 @@
+ 		printk("line_config - uml_strdup failed\n");
+ 		return(-ENOMEM);
+ 	}
+-	return(line_setup(lines, num, new, 0));
++	return(!line_setup(lines, num, new, 0));
+ }
+ 
+ int line_get_config(char *name, struct line *lines, int num, char *str, 
+@@ -369,7 +389,7 @@
+ 
+ 	dev = simple_strtoul(name, &end, 0);
+ 	if((*end != '\0') || (end == name)){
+-		*error_out = "line_setup failed to parse device number";
++		*error_out = "line_get_config failed to parse device number";
+ 		return(0);
+ 	}
+ 
+@@ -379,15 +399,15 @@
+ 	}
+ 
+ 	line = &lines[dev];
++
+ 	down(&line->sem);
+-	
+ 	if(!line->valid)
+ 		CONFIG_CHUNK(str, size, n, "none", 1);
+ 	else if(line->count == 0)
+ 		CONFIG_CHUNK(str, size, n, line->init_str, 1);
+ 	else n = chan_config_string(&line->chan_list, str, size, error_out);
+-
+ 	up(&line->sem);
++
+ 	return(n);
+ }
+ 
+@@ -396,7 +416,14 @@
+ 	char config[sizeof("conxxxx=none\0")];
+ 
+ 	sprintf(config, "%s=none", str);
+-	return(line_setup(lines, num, config, 0));
++	return(!line_setup(lines, num, config, 0));
++}
++
++int line_write_room(struct tty_struct *tty)
++{
++	struct line *dev = tty->driver_data;
++
++	return(write_room(dev));
+ }
+ 
+ struct tty_driver *line_register_devfs(struct lines *set,
+@@ -412,7 +439,8 @@
+ 		return NULL;
+ 
+ 	driver->driver_name = line_driver->name;
+-	driver->name = line_driver->devfs_name;
++	driver->name = line_driver->device_name;
++	driver->devfs_name = line_driver->devfs_name;
+ 	driver->major = line_driver->major;
+ 	driver->minor_start = line_driver->minor_start;
+ 	driver->type = line_driver->type;
+@@ -432,7 +460,7 @@
+ 
+ 	for(i = 0; i < nlines; i++){
+ 		if(!lines[i].valid) 
+-			tty_unregister_devfs(driver, i);
++			tty_unregister_device(driver, i);
+ 	}
+ 
+ 	mconsole_register_dev(&line_driver->mc);
+@@ -465,24 +493,25 @@
+ 	struct line *line;
+ };
+ 
+-void winch_interrupt(int irq, void *data, struct pt_regs *unused)
++irqreturn_t winch_interrupt(int irq, void *data, struct pt_regs *unused)
+ {
+ 	struct winch *winch = data;
+ 	struct tty_struct *tty;
+ 	int err;
+ 	char c;
+ 
+-	err = generic_read(winch->fd, &c, NULL);
+-	if(err < 0){
+-		if(err != -EAGAIN){
+-			printk("winch_interrupt : read failed, errno = %d\n", 
+-			       -err);
+-			printk("fd %d is losing SIGWINCH support\n", 
+-			       winch->tty_fd);
+-			free_irq(irq, data);
+-			return;
++	if(winch->fd != -1){
++		err = generic_read(winch->fd, &c, NULL);
++		if(err < 0){
++			if(err != -EAGAIN){
++				printk("winch_interrupt : read failed, "
++				       "errno = %d\n", -err);
++				printk("fd %d is losing SIGWINCH support\n", 
++				       winch->tty_fd);
++				return(IRQ_HANDLED);
++			}
++			goto out;
+ 		}
+-		goto out;
+ 	}
+ 	tty = winch->line->tty;
+ 	if(tty != NULL){
+@@ -492,7 +521,9 @@
+ 		kill_pg(tty->pgrp, SIGWINCH, 1);
+ 	}
+  out:
+-	reactivate_fd(winch->fd, WINCH_IRQ);
++	if(winch->fd != -1)
++		reactivate_fd(winch->fd, WINCH_IRQ);
++	return(IRQ_HANDLED);
+ }
+ 
+ DECLARE_MUTEX(winch_handler_sem);
+@@ -529,7 +560,10 @@
+ 
+ 	list_for_each(ele, &winch_handlers){
+ 		winch = list_entry(ele, struct winch, list);
+-		close(winch->fd);
++		if(winch->fd != -1){
++			deactivate_fd(winch->fd, WINCH_IRQ);
++			os_close_file(winch->fd);
++		}
+ 		if(winch->pid != -1) 
+ 			os_kill_process(winch->pid, 1);
+ 	}
+diff -Naur a/arch/um/drivers/Makefile b/arch/um/drivers/Makefile
+--- a/arch/um/drivers/Makefile	2004-02-11 12:15:52.000000000 -0500
++++ b/arch/um/drivers/Makefile	2004-02-11 12:27:45.000000000 -0500
+@@ -1,5 +1,5 @@
+ # 
+-# Copyright (C) 2000, 2002 Jeff Dike (jdike@karaya.com)
++# Copyright (C) 2000, 2002, 2003 Jeff Dike (jdike@karaya.com)
+ # Licensed under the GPL
+ #
+ 
+@@ -39,6 +39,8 @@
+ obj-$(CONFIG_TTY_CHAN) += tty.o 
+ obj-$(CONFIG_XTERM_CHAN) += xterm.o xterm_kern.o
+ obj-$(CONFIG_UML_WATCHDOG) += harddog.o
++obj-$(CONFIG_BLK_DEV_COW) += cow_kern.o
++obj-$(CONFIG_BLK_DEV_COW_COMMON) += cow_user.o
+ 
+ obj-y += stdio_console.o $(CHAN_OBJS)
+ 
+@@ -46,18 +48,7 @@
+ 
+ USER_OBJS := $(filter %_user.o,$(obj-y) $(obj-m) $(USER_SINGLE_OBJS)) fd.o \
+ 	null.o pty.o tty.o xterm.o
+-USER_OBJS := $(foreach file,$(USER_OBJS),arch/um/drivers/$(file))
++USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
+ 
+ $(USER_OBJS) : %.o: %.c
+ 	$(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
+-
+-clean:
+-
+-modules:
+-
+-fastdep:
+-
+-dep:
+-
+-archmrproper: clean
+-
+diff -Naur a/arch/um/drivers/mcast_user.c b/arch/um/drivers/mcast_user.c
+--- a/arch/um/drivers/mcast_user.c	2004-02-11 12:15:46.000000000 -0500
++++ b/arch/um/drivers/mcast_user.c	2004-02-11 12:27:37.000000000 -0500
+@@ -23,6 +23,7 @@
+ #include "kern_util.h"
+ #include "user_util.h"
+ #include "user.h"
++#include "os.h"
+ 
+ #define MAX_PACKET (ETH_MAX_PACKET + ETH_HEADER_OTHER)
+ 
+@@ -62,7 +63,8 @@
+ 		goto out;
+ 	}
+ 
+-	if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0){
++	fd = socket(AF_INET, SOCK_DGRAM, 0);
++	if (fd < 0){
+ 		printk("mcast_open : data socket failed, errno = %d\n", 
+ 		       errno);
+ 		fd = -ENOMEM;
+@@ -72,7 +74,7 @@
+ 	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0) {
+ 		printk("mcast_open: SO_REUSEADDR failed, errno = %d\n",
+ 			errno);
+-		close(fd);
++		os_close_file(fd);
+ 		fd = -EINVAL;
+ 		goto out;
+ 	}
+@@ -82,7 +84,7 @@
+ 		       sizeof(pri->ttl)) < 0) {
+ 		printk("mcast_open: IP_MULTICAST_TTL failed, error = %d\n",
+ 			errno);
+-		close(fd);
++		os_close_file(fd);
+ 		fd = -EINVAL;
+ 		goto out;
+ 	}
+@@ -91,7 +93,7 @@
+ 	if (setsockopt(fd, SOL_IP, IP_MULTICAST_LOOP, &yes, sizeof(yes)) < 0) {
+ 		printk("mcast_open: IP_MULTICAST_LOOP failed, error = %d\n",
+ 			errno);
+-		close(fd);
++		os_close_file(fd);
+ 		fd = -EINVAL;
+ 		goto out;
+ 	}
+@@ -99,7 +101,7 @@
+ 	/* bind socket to mcast address */
+ 	if (bind(fd, (struct sockaddr *) sin, sizeof(*sin)) < 0) {
+ 		printk("mcast_open : data bind failed, errno = %d\n", errno);
+-		close(fd);
++		os_close_file(fd);
+ 		fd = -EINVAL;
+ 		goto out;
+ 	}		
+@@ -115,7 +117,7 @@
+ 		       "interface on the host.\n");
+ 		printk("eth0 should be configured in order to use the "
+ 		       "multicast transport.\n");
+-		close(fd);
++		os_close_file(fd);
+ 		fd = -EINVAL;
+ 	}
+ 
+@@ -137,7 +139,7 @@
+ 			errno);
+ 	}
+ 
+-	close(fd);
++	os_close_file(fd);
+ }
+ 
+ int mcast_user_write(int fd, void *buf, int len, struct mcast_data *pri)
+diff -Naur a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
+--- a/arch/um/drivers/mconsole_kern.c	2004-02-11 12:14:15.000000000 -0500
++++ b/arch/um/drivers/mconsole_kern.c	2004-02-11 12:25:42.000000000 -0500
+@@ -1,6 +1,6 @@
+ /*
+  * Copyright (C) 2001 Lennert Buytenhek (buytenh@gnu.org)
+- * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2001 - 2003 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+@@ -15,6 +15,9 @@
+ #include "linux/sysrq.h"
+ #include "linux/workqueue.h"
+ #include "linux/module.h"
++#include "linux/file.h"
++#include "linux/fs.h"
++#include "linux/namei.h"
+ #include "linux/proc_fs.h"
+ #include "asm/irq.h"
+ #include "asm/uaccess.h"
+@@ -27,6 +30,7 @@
+ #include "init.h"
+ #include "os.h"
+ #include "umid.h"
++#include "irq_kern.h"
+ 
+ static int do_unlink_socket(struct notifier_block *notifier, 
+ 			    unsigned long what, void *data)
+@@ -67,7 +71,7 @@
+ 
+ DECLARE_WORK(mconsole_work, mc_work_proc, NULL);
+ 
+-void mconsole_interrupt(int irq, void *dev_id, struct pt_regs *regs)
++irqreturn_t mconsole_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+ {
+ 	int fd;
+ 	struct mconsole_entry *new;
+@@ -75,9 +79,10 @@
+ 
+ 	fd = (int) dev_id;
+ 	while (mconsole_get_request(fd, &req)){
+-		if(req.cmd->as_interrupt) (*req.cmd->handler)(&req);
++		if(req.cmd->context == MCONSOLE_INTR) 
++			(*req.cmd->handler)(&req);
+ 		else {
+-			new = kmalloc(sizeof(req), GFP_ATOMIC);
++			new = kmalloc(sizeof(*new), GFP_ATOMIC);
+ 			if(new == NULL)
+ 				mconsole_reply(&req, "Out of memory", 1, 0);
+ 			else {
+@@ -88,6 +93,7 @@
+ 	}
+ 	if(!list_empty(&mc_requests)) schedule_work(&mconsole_work);
+ 	reactivate_fd(fd, MCONSOLE_IRQ);
++	return(IRQ_HANDLED);
+ }
+ 
+ void mconsole_version(struct mc_request *req)
+@@ -100,20 +106,110 @@
+ 	mconsole_reply(req, version, 0, 0);
+ }
+ 
++void mconsole_log(struct mc_request *req)
++{
++	int len;
++	char *ptr = req->request.data;
++	
++	ptr += strlen("log");
++	while(isspace(*ptr)) ptr++;
++
++	len = req->len - (ptr - req->request.data);
++	printk("%.*s", len, ptr);
++	mconsole_reply(req, "", 0, 0);
++}
++
++void mconsole_proc(struct mc_request *req)
++{
++	struct nameidata nd;
++	struct file_system_type *proc;
++	struct super_block *super;
++	struct file *file;
++	int n, err;
++	char *ptr = req->request.data, *buf;
++	
++	ptr += strlen("proc");
++	while(isspace(*ptr)) ptr++;
++
++	proc = get_fs_type("proc");
++	if(proc == NULL){
++		mconsole_reply(req, "procfs not registered", 1, 0);
++		goto out;
++	}
++
++	super = (*proc->get_sb)(proc, 0, NULL, NULL);
++	put_filesystem(proc);
++	if(super == NULL){
++		mconsole_reply(req, "Failed to get procfs superblock", 1, 0);
++		goto out;
++	}
++	up_write(&super->s_umount);
++
++	nd.dentry = super->s_root;
++	nd.mnt = NULL;
++	nd.flags = O_RDONLY + 1;
++	nd.last_type = LAST_ROOT;
++
++	err = link_path_walk(ptr, &nd);
++	if(err){
++		mconsole_reply(req, "Failed to look up file", 1, 0);
++		goto out_kill;
++	}
++
++	file = dentry_open(nd.dentry, nd.mnt, O_RDONLY);
++	if(IS_ERR(file)){
++		mconsole_reply(req, "Failed to open file", 1, 0);
++		goto out_kill;
++	}
++
++	buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
++	if(buf == NULL){
++		mconsole_reply(req, "Failed to allocate buffer", 1, 0);
++		goto out_fput;
++	}
++
++	if((file->f_op != NULL) && (file->f_op->read != NULL)){
++		do {
++			n = (*file->f_op->read)(file, buf, PAGE_SIZE - 1, 
++						&file->f_pos);
++			if(n >= 0){
++				buf[n] = '\0';
++				mconsole_reply(req, buf, 0, (n > 0));
++			}
++			else {
++				mconsole_reply(req, "Read of file failed", 
++					       1, 0);
++				goto out_free;
++			}
++		} while(n > 0);
++	}
++	else mconsole_reply(req, "", 0, 0);
++
++ out_free:
++	kfree(buf);
++ out_fput:
++	fput(file);
++ out_kill:
++	deactivate_super(super);
++ out: ;
++}
++
+ #define UML_MCONSOLE_HELPTEXT \
+-"Commands:
+-    version - Get kernel version
+-    help - Print this message
+-    halt - Halt UML
+-    reboot - Reboot UML
+-    config <dev>=<config> - Add a new device to UML; 
+-	same syntax as command line
+-    config <dev> - Query the configuration of a device
+-    remove <dev> - Remove a device from UML
+-    sysrq <letter> - Performs the SysRq action controlled by the letter
+-    cad - invoke the Ctl-Alt-Del handler
+-    stop - pause the UML; it will do nothing until it receives a 'go'
+-    go - continue the UML after a 'stop'
++"Commands: \n\
++    version - Get kernel version \n\
++    help - Print this message \n\
++    halt - Halt UML \n\
++    reboot - Reboot UML \n\
++    config <dev>=<config> - Add a new device to UML;  \n\
++	same syntax as command line \n\
++    config <dev> - Query the configuration of a device \n\
++    remove <dev> - Remove a device from UML \n\
++    sysrq <letter> - Performs the SysRq action controlled by the letter \n\
++    cad - invoke the Ctl-Alt-Del handler \n\
++    stop - pause the UML; it will do nothing until it receives a 'go' \n\
++    go - continue the UML after a 'stop' \n\
++    log <string> - make UML enter <string> into the kernel log\n\
++    proc <file> - returns the contents of the UML's /proc/<file>\n\
+ "
+ 
+ void mconsole_help(struct mc_request *req)
+@@ -302,7 +398,7 @@
+ 	if(umid_file_name("mconsole", file, sizeof(file))) return(-1);
+ 	snprintf(mconsole_socket_name, sizeof(file), "%s", file);
+ 
+-	sock = create_unix_socket(file, sizeof(file));
++	sock = os_create_unix_socket(file, sizeof(file), 1);
+ 	if (sock < 0){
+ 		printk("Failed to initialize management console\n");
+ 		return(1);
+@@ -344,11 +440,16 @@
+ 	if(buf == NULL) 
+ 		return(-ENOMEM);
+ 
+-	if(copy_from_user(buf, buffer, count))
+-		return(-EFAULT);
++	if(copy_from_user(buf, buffer, count)){
++		count = -EFAULT;
++		goto out;
++	}
++
+ 	buf[count] = '\0';
+ 
+ 	mconsole_notify(notify_socket, MCONSOLE_USER_NOTIFY, buf, count);
++ out:
++	kfree(buf);
+ 	return(count);
+ }
+ 
+diff -Naur a/arch/um/drivers/mconsole_user.c b/arch/um/drivers/mconsole_user.c
+--- a/arch/um/drivers/mconsole_user.c	2004-02-11 12:14:27.000000000 -0500
++++ b/arch/um/drivers/mconsole_user.c	2004-02-11 12:26:08.000000000 -0500
+@@ -1,6 +1,6 @@
+ /*
+  * Copyright (C) 2001 Lennert Buytenhek (buytenh@gnu.org)
+- * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2001 - 2003 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+@@ -18,16 +18,18 @@
+ #include "umid.h"
+ 
+ static struct mconsole_command commands[] = {
+-	{ "version", mconsole_version, 1 },
+-	{ "halt", mconsole_halt, 0 },
+-	{ "reboot", mconsole_reboot, 0 },
+-	{ "config", mconsole_config, 0 },
+-	{ "remove", mconsole_remove, 0 },
+-	{ "sysrq", mconsole_sysrq, 1 },
+-	{ "help", mconsole_help, 1 },
+-	{ "cad", mconsole_cad, 1 },
+-	{ "stop", mconsole_stop, 0 },
+-	{ "go", mconsole_go, 1 },
++	{ "version", mconsole_version, MCONSOLE_INTR },
++	{ "halt", mconsole_halt, MCONSOLE_PROC },
++	{ "reboot", mconsole_reboot, MCONSOLE_PROC },
++	{ "config", mconsole_config, MCONSOLE_PROC },
++	{ "remove", mconsole_remove, MCONSOLE_PROC },
++	{ "sysrq", mconsole_sysrq, MCONSOLE_INTR },
++	{ "help", mconsole_help, MCONSOLE_INTR },
++	{ "cad", mconsole_cad, MCONSOLE_INTR },
++	{ "stop", mconsole_stop, MCONSOLE_PROC },
++	{ "go", mconsole_go, MCONSOLE_INTR },
++	{ "log", mconsole_log, MCONSOLE_INTR },
++	{ "proc", mconsole_proc, MCONSOLE_PROC },
+ };
+ 
+ /* Initialized in mconsole_init, which is an initcall */
+@@ -139,6 +141,7 @@
+ 		memcpy(reply.data, str, len);
+ 		reply.data[len] = '\0';
+ 		total -= len;
++		str += len;
+ 		reply.len = len + 1;
+ 
+ 		len = sizeof(reply) + reply.len - sizeof(reply.data);
+diff -Naur a/arch/um/drivers/mmapper_kern.c b/arch/um/drivers/mmapper_kern.c
+--- a/arch/um/drivers/mmapper_kern.c	2004-02-11 12:14:23.000000000 -0500
++++ b/arch/um/drivers/mmapper_kern.c	2004-02-11 12:26:07.000000000 -0500
+@@ -120,7 +120,10 @@
+ 	printk(KERN_INFO "Mapper v0.1\n");
+ 
+ 	v_buf = (char *) find_iomem("mmapper", &mmapper_size);
+-	if(mmapper_size == 0) return(0);
++	if(mmapper_size == 0){
++		printk(KERN_ERR "mmapper_init - find_iomem failed\n");
++		return(0);
++	}
+ 
+ 	p_buf = __pa(v_buf);
+ 
+diff -Naur a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
+--- a/arch/um/drivers/net_kern.c	2004-02-11 12:15:23.000000000 -0500
++++ b/arch/um/drivers/net_kern.c	2004-02-11 12:27:11.000000000 -0500
+@@ -26,6 +26,7 @@
+ #include "mconsole_kern.h"
+ #include "init.h"
+ #include "irq_user.h"
++#include "irq_kern.h"
+ 
+ static spinlock_t opened_lock = SPIN_LOCK_UNLOCKED;
+ LIST_HEAD(opened);
+@@ -37,7 +38,8 @@
+ 	struct sk_buff *skb;
+ 
+ 	/* If we can't allocate memory, try again next round. */
+-	if ((skb = dev_alloc_skb(dev->mtu)) == NULL) {
++	skb = dev_alloc_skb(dev->mtu);
++	if (skb == NULL) {
+ 		lp->stats.rx_dropped++;
+ 		return 0;
+ 	}
+@@ -61,14 +63,14 @@
+ 	return pkt_len;
+ }
+ 
+-void uml_net_interrupt(int irq, void *dev_id, struct pt_regs *regs)
++irqreturn_t uml_net_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+ {
+ 	struct net_device *dev = dev_id;
+ 	struct uml_net_private *lp = dev->priv;
+ 	int err;
+ 
+ 	if(!netif_running(dev))
+-		return;
++		return(IRQ_NONE);
+ 
+ 	spin_lock(&lp->lock);
+ 	while((err = uml_net_rx(dev)) > 0) ;
+@@ -83,6 +85,7 @@
+ 
+  out:
+ 	spin_unlock(&lp->lock);
++	return(IRQ_HANDLED);
+ }
+ 
+ static int uml_net_open(struct net_device *dev)
+@@ -252,37 +255,6 @@
+ #endif
+ }
+ 
+-/*
+- * default do nothing hard header packet routines for struct net_device init.
+- * real ethernet transports will overwrite with real routines.
+- */
+-static int uml_net_hard_header(struct sk_buff *skb, struct net_device *dev,
+-                 unsigned short type, void *daddr, void *saddr, unsigned len)
+-{
+-	return(0); /* no change */
+-}
+-
+-static int uml_net_rebuild_header(struct sk_buff *skb)
+-{
+-	return(0); /* ignore */ 
+-}
+-
+-static int uml_net_header_cache(struct neighbour *neigh, struct hh_cache *hh)
+-{
+-	return(-1); /* fail */
+-}
+-
+-static void uml_net_header_cache_update(struct hh_cache *hh,
+-                 struct net_device *dev, unsigned char * haddr)
+-{
+-	/* ignore */
+-}
+-
+-static int uml_net_header_parse(struct sk_buff *skb, unsigned char *haddr)
+-{
+-	return(0); /* nothing */
+-}
+-
+ static spinlock_t devices_lock = SPIN_LOCK_UNLOCKED;
+ static struct list_head devices = LIST_HEAD_INIT(devices);
+ 
+@@ -292,7 +264,7 @@
+ 	struct uml_net *device;
+ 	struct net_device *dev;
+ 	struct uml_net_private *lp;
+-	int err, size;
++	int save, err, size;
+ 
+ 	size = transport->private_size + sizeof(struct uml_net_private) + 
+ 		sizeof(((struct uml_net_private *) 0)->user);
+@@ -334,12 +306,6 @@
+ 	snprintf(dev->name, sizeof(dev->name), "eth%d", n);
+ 	device->dev = dev;
+ 
+-        dev->hard_header = uml_net_hard_header;
+-        dev->rebuild_header = uml_net_rebuild_header;
+-        dev->hard_header_cache = uml_net_header_cache;
+-        dev->header_cache_update= uml_net_header_cache_update;
+-        dev->hard_header_parse = uml_net_header_parse;
+-
+ 	(*transport->kern->init)(dev, init);
+ 
+ 	dev->mtu = transport->user->max_packet;
+@@ -362,21 +328,29 @@
+ 		return 1;
+ 	lp = dev->priv;
+ 
+-	INIT_LIST_HEAD(&lp->list);
+-	spin_lock_init(&lp->lock);
+-	lp->dev = dev;
+-	lp->fd = -1;
+-	lp->mac = { 0xfe, 0xfd, 0x0, 0x0, 0x0, 0x0 };
+-	lp->have_mac = device->have_mac;
+-	lp->protocol = transport->kern->protocol;
+-	lp->open = transport->user->open;
+-	lp->close = transport->user->close;
+-	lp->remove = transport->user->remove;
+-	lp->read = transport->kern->read;
+-	lp->write = transport->kern->write;
+-	lp->add_address = transport->user->add_address;
+-	lp->delete_address = transport->user->delete_address;
+-	lp->set_mtu = transport->user->set_mtu;
++	/* lp.user is the first four bytes of the transport data, which
++	 * has already been initialized.  This structure assignment will
++	 * overwrite that, so we make sure that .user gets overwritten with
++	 * what it already has.
++	 */
++	save = lp->user[0];
++	*lp = ((struct uml_net_private) 
++		{ .list  		= LIST_HEAD_INIT(lp->list),
++		  .lock 		= SPIN_LOCK_UNLOCKED,
++		  .dev 			= dev,
++		  .fd 			= -1,
++		  .mac 			= { 0xfe, 0xfd, 0x0, 0x0, 0x0, 0x0},
++		  .have_mac 		= device->have_mac,
++		  .protocol 		= transport->kern->protocol,
++		  .open 		= transport->user->open,
++		  .close 		= transport->user->close,
++		  .remove 		= transport->user->remove,
++		  .read 		= transport->kern->read,
++		  .write 		= transport->kern->write,
++		  .add_address 		= transport->user->add_address,
++		  .delete_address  	= transport->user->delete_address,
++		  .set_mtu 		= transport->user->set_mtu,
++		  .user  		= { save } });
+ 
+ 	init_timer(&lp->tl);
+ 	lp->tl.function = uml_net_user_timer_expire;
+@@ -609,7 +583,8 @@
+ 	unregister_netdev(dev);
+ 
+ 	list_del(&device->list);
+-	free_netdev(device);
++	kfree(device);
++	free_netdev(dev);
+ 	return(0);
+ }
+ 
+diff -Naur a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
+--- a/arch/um/drivers/net_user.c	2004-02-11 12:14:28.000000000 -0500
++++ b/arch/um/drivers/net_user.c	2004-02-11 12:26:11.000000000 -0500
+@@ -26,8 +26,7 @@
+ 	if(gate_addr == NULL) return(0);
+ 	if(sscanf(gate_addr, "%d.%d.%d.%d", &tap_addr[0], 
+ 		  &tap_addr[1], &tap_addr[2], &tap_addr[3]) != 4){
+-		printk("Invalid tap IP address - '%s'\n", 
+-		       gate_addr);
++		printk("Invalid tap IP address - '%s'\n", gate_addr);
+ 		return(-EINVAL);
+ 	}
+ 	return(0);
+@@ -60,18 +59,18 @@
+ 	}
+ 		
+ 	*output = '\0';
+-	if(read(fd, &remain, sizeof(remain)) != sizeof(remain)){
+-		printk("read_output - read of length failed, errno = %d\n",
+-		       errno);
++	n = os_read_file(fd, &remain, sizeof(remain));
++	if(n != sizeof(remain)){
++		printk("read_output - read of length failed, err = %d\n", -n);
+ 		return;
+ 	}
+ 
+ 	while(remain != 0){
+ 		n = (remain < len) ? remain : len;
+-		actual = read(fd, output, n);
++		actual = os_read_file(fd, output, n);
+ 		if(actual != n){
+ 			printk("read_output - read of data failed, "
+-			       "errno = %d\n", errno);
++			       "err = %d\n", -actual);
+ 			return;
+ 		}
+ 		remain -= actual;
+@@ -83,13 +82,12 @@
+ {
+ 	int n;
+ 
+-	while(((n = read(fd,  buf,  len)) < 0) && (errno == EINTR)) ;
++	n = os_read_file(fd,  buf,  len);
+ 
+-	if(n < 0){
+-		if(errno == EAGAIN) return(0);
+-		return(-errno);
+-	}
+-	else if(n == 0) return(-ENOTCONN);
++	if(n == -EAGAIN) 
++		return(0);
++	else if(n == 0) 
++		return(-ENOTCONN);
+ 	return(n);
+ }
+ 
+@@ -112,13 +110,13 @@
+ {
+ 	int n;
+ 
+-	while(((n = write(fd, buf, len)) < 0) && (errno == EINTR)) ;
+-	if(n < 0){
+-		if(errno == EAGAIN) return(0);
+-		return(-errno);
+-	}
+-	else if(n == 0) return(-ENOTCONN);
+-	return(n);	
++	n = os_write_file(fd, buf, len);
++
++	if(n == -EAGAIN) 
++		return(0);
++	else if(n == 0) 
++		return(-ENOTCONN);
++	return(n);
+ }
+ 
+ int net_send(int fd, void *buf, int len)
+@@ -157,7 +155,7 @@
+ {
+ 	struct change_pre_exec_data *data = arg;
+ 
+-	close(data->close_me);
++	os_close_file(data->close_me);
+ 	dup2(data->stdout, 1);
+ }
+ 
+@@ -167,15 +165,15 @@
+ 	struct change_pre_exec_data pe_data;
+ 
+ 	err = os_pipe(fds, 1, 0);
+-	if(err){
+-		printk("change_tramp - pipe failed, errno = %d\n", -err);
++	if(err < 0){
++		printk("change_tramp - pipe failed, err = %d\n", -err);
+ 		return(err);
+ 	}
+ 	pe_data.close_me = fds[0];
+ 	pe_data.stdout = fds[1];
+ 	pid = run_helper(change_pre_exec, &pe_data, argv, NULL);
+ 
+-	close(fds[1]);
++	os_close_file(fds[1]);
+ 	read_output(fds[0], output, output_len);
+ 	waitpid(pid, NULL, 0);	
+ 	return(pid);
+diff -Naur a/arch/um/drivers/null.c b/arch/um/drivers/null.c
+--- a/arch/um/drivers/null.c	2004-02-11 12:14:21.000000000 -0500
++++ b/arch/um/drivers/null.c	2004-02-11 12:26:02.000000000 -0500
+@@ -5,7 +5,6 @@
+ 
+ #include <stdlib.h>
+ #include <errno.h>
+-#include <fcntl.h>
+ #include "chan_user.h"
+ #include "os.h"
+ 
+diff -Naur a/arch/um/drivers/port_kern.c b/arch/um/drivers/port_kern.c
+--- a/arch/um/drivers/port_kern.c	2004-02-11 12:14:18.000000000 -0500
++++ b/arch/um/drivers/port_kern.c	2004-02-11 12:26:00.000000000 -0500
+@@ -6,6 +6,7 @@
+ #include "linux/list.h"
+ #include "linux/sched.h"
+ #include "linux/slab.h"
++#include "linux/interrupt.h"
+ #include "linux/irq.h"
+ #include "linux/spinlock.h"
+ #include "linux/errno.h"
+@@ -14,6 +15,7 @@
+ #include "kern_util.h"
+ #include "kern.h"
+ #include "irq_user.h"
++#include "irq_kern.h"
+ #include "port.h"
+ #include "init.h"
+ #include "os.h"
+@@ -38,21 +40,21 @@
+ struct connection {
+ 	struct list_head list;
+ 	int fd;
+- 	int helper_pid;
++	int helper_pid;
+ 	int socket[2];
+ 	int telnetd_pid;
+ 	struct port_list *port;
+ };
+ 
+-static void pipe_interrupt(int irq, void *data, struct pt_regs *regs)
++static irqreturn_t pipe_interrupt(int irq, void *data, struct pt_regs *regs)
+ {
+ 	struct connection *conn = data;
+ 	int fd;
+ 
+- 	fd = os_rcv_fd(conn->socket[0], &conn->helper_pid);
++	fd = os_rcv_fd(conn->socket[0], &conn->helper_pid);
+ 	if(fd < 0){
+ 		if(fd == -EAGAIN)
+-			return;
++			return(IRQ_NONE);
+ 
+ 		printk(KERN_ERR "pipe_interrupt : os_rcv_fd returned %d\n", 
+ 		       -fd);
+@@ -65,6 +67,7 @@
+ 	list_add(&conn->list, &conn->port->connections);
+ 
+ 	up(&conn->port->sem);
++	return(IRQ_HANDLED);
+ }
+ 
+ static int port_accept(struct port_list *port)
+@@ -102,8 +105,7 @@
+ 	}
+ 
+ 	list_add(&conn->list, &port->pending);
+-	ret = 1;
+-	goto out;
++	return(1);
+ 
+  out_free:
+ 	kfree(conn);
+@@ -138,12 +140,13 @@
+ 
+ DECLARE_WORK(port_work, port_work_proc, NULL);
+ 
+-static void port_interrupt(int irq, void *data, struct pt_regs *regs)
++static irqreturn_t port_interrupt(int irq, void *data, struct pt_regs *regs)
+ {
+ 	struct port_list *port = data;
+ 
+ 	port->has_connection = 1;
+ 	schedule_work(&port_work);
++	return(IRQ_HANDLED);
+ } 
+ 
+ void *port_data(int port_num)
+diff -Naur a/arch/um/drivers/port_user.c b/arch/um/drivers/port_user.c
+--- a/arch/um/drivers/port_user.c	2004-02-11 12:15:59.000000000 -0500
++++ b/arch/um/drivers/port_user.c	2004-02-11 12:27:52.000000000 -0500
+@@ -47,10 +47,12 @@
+ 		return(NULL);
+ 	}
+ 
+-	if((kern_data = port_data(port)) == NULL) 
++	kern_data = port_data(port);
++	if(kern_data == NULL) 
+ 		return(NULL);
+ 
+-	if((data = um_kmalloc(sizeof(*data))) == NULL) 
++	data = um_kmalloc(sizeof(*data));
++	if(data == NULL) 
+ 		goto err;
+ 
+ 	*data = ((struct port_chan) { .raw  		= opts->raw,
+@@ -90,7 +92,7 @@
+ 	struct port_chan *data = d;
+ 
+ 	port_remove_dev(data->kernel_data);
+-	close(fd);
++	os_close_file(fd);
+ }
+ 
+ int port_console_write(int fd, const char *buf, int n, void *d)
+@@ -130,11 +132,15 @@
+ 		goto out;
+ 	}
+   
+-	if((listen(fd, 1) < 0) || (os_set_fd_block(fd, 0))){
++	if(listen(fd, 1) < 0){
+ 		err = -errno;
+ 		goto out;
+ 	}
+ 
++	err = os_set_fd_block(fd, 0);
++	if(err < 0)
++		goto out;
++
+ 	return(fd);
+  out:
+ 	os_close_file(fd);
+@@ -153,10 +159,10 @@
+ 	dup2(data->sock_fd, 0);
+ 	dup2(data->sock_fd, 1);
+ 	dup2(data->sock_fd, 2);
+-	close(data->sock_fd);
++	os_close_file(data->sock_fd);
+ 	dup2(data->pipe_fd, 3);
+ 	os_shutdown_socket(3, 1, 0);
+-	close(data->pipe_fd);
++	os_close_file(data->pipe_fd);
+ }
+ 
+ int port_connection(int fd, int *socket, int *pid_out)
+@@ -166,11 +172,12 @@
+ 			 "/usr/lib/uml/port-helper", NULL };
+ 	struct port_pre_exec_data data;
+ 
+-	if((new = os_accept_connection(fd)) < 0)
+-		return(-errno);
++	new = os_accept_connection(fd);
++	if(new < 0)
++		return(new);
+ 
+ 	err = os_pipe(socket, 0, 0);
+-	if(err) 
++	if(err < 0) 
+ 		goto out_close;
+ 
+ 	data = ((struct port_pre_exec_data)
+@@ -186,11 +193,11 @@
+ 
+  out_shutdown:
+ 	os_shutdown_socket(socket[0], 1, 1);
+-	close(socket[0]);
++	os_close_file(socket[0]);
+ 	os_shutdown_socket(socket[1], 1, 1);	
+-	close(socket[1]);
++	os_close_file(socket[1]);
+  out_close:
+-	close(new);
++	os_close_file(new);
+ 	return(err);
+ }
+ 
+diff -Naur a/arch/um/drivers/pty.c b/arch/um/drivers/pty.c
+--- a/arch/um/drivers/pty.c	2004-02-11 12:16:37.000000000 -0500
++++ b/arch/um/drivers/pty.c	2004-02-11 12:28:37.000000000 -0500
+@@ -7,12 +7,12 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <errno.h>
+-#include <fcntl.h>
+ #include <termios.h>
+ #include "chan_user.h"
+ #include "user.h"
+ #include "user_util.h"
+ #include "kern_util.h"
++#include "os.h"
+ 
+ struct pty_chan {
+ 	void (*announce)(char *dev_name, int dev);
+@@ -26,7 +26,8 @@
+ {
+ 	struct pty_chan *data;
+ 
+-	if((data = um_kmalloc(sizeof(*data))) == NULL) return(NULL);
++	data = um_kmalloc(sizeof(*data));
++	if(data == NULL) return(NULL);
+ 	*data = ((struct pty_chan) { .announce  	= opts->announce, 
+ 				     .dev  		= device,
+ 				     .raw  		= opts->raw });
+@@ -39,7 +40,8 @@
+ 	char *dev;
+ 	int fd;
+ 
+-	if((fd = get_pty()) < 0){
++	fd = get_pty();
++	if(fd < 0){
+ 		printk("open_pts : Failed to open pts\n");
+ 		return(-errno);
+ 	}
+@@ -57,29 +59,27 @@
+ 
+ int getmaster(char *line)
+ {
+-	struct stat stb;
+ 	char *pty, *bank, *cp;
+-	int master;
++	int master, err;
+ 
+ 	pty = &line[strlen("/dev/ptyp")];
+ 	for (bank = "pqrs"; *bank; bank++) {
+ 		line[strlen("/dev/pty")] = *bank;
+ 		*pty = '0';
+-		if (stat(line, &stb) < 0)
++		if (os_stat_file(line, NULL) < 0)
+ 			break;
+ 		for (cp = "0123456789abcdef"; *cp; cp++) {
+ 			*pty = *cp;
+-			master = open(line, O_RDWR);
++			master = os_open_file(line, of_rdwr(OPENFLAGS()), 0);
+ 			if (master >= 0) {
+ 				char *tp = &line[strlen("/dev/")];
+-				int ok;
+ 
+ 				/* verify slave side is usable */
+ 				*tp = 't';
+-				ok = access(line, R_OK|W_OK) == 0;
++				err = os_access(line, OS_ACC_RW_OK);
+ 				*tp = 'p';
+-				if (ok) return(master);
+-				(void) close(master);
++				if(err == 0) return(master);
++				(void) os_close_file(master);
+ 			}
+ 		}
+ 	}
+diff -Naur a/arch/um/drivers/slip_user.c b/arch/um/drivers/slip_user.c
+--- a/arch/um/drivers/slip_user.c	2004-02-11 12:16:37.000000000 -0500
++++ b/arch/um/drivers/slip_user.c	2004-02-11 12:28:37.000000000 -0500
+@@ -4,11 +4,9 @@
+ #include <stddef.h>
+ #include <sched.h>
+ #include <string.h>
+-#include <sys/fcntl.h>
+ #include <sys/errno.h>
+ #include <sys/termios.h>
+ #include <sys/wait.h>
+-#include <sys/ioctl.h>
+ #include <sys/signal.h>
+ #include "user_util.h"
+ #include "kern_util.h"
+@@ -65,9 +63,9 @@
+ {
+ 	struct slip_pre_exec_data *data = arg;
+ 
+-	if(data->stdin != -1) dup2(data->stdin, 0);
++	if(data->stdin >= 0) dup2(data->stdin, 0);
+ 	dup2(data->stdout, 1);
+-	if(data->close_me != -1) close(data->close_me);
++	if(data->close_me >= 0) os_close_file(data->close_me);
+ }
+ 
+ static int slip_tramp(char **argv, int fd)
+@@ -77,8 +75,8 @@
+ 	int status, pid, fds[2], err, output_len;
+ 
+ 	err = os_pipe(fds, 1, 0);
+-	if(err){
+-		printk("slip_tramp : pipe failed, errno = %d\n", -err);
++	if(err < 0){
++		printk("slip_tramp : pipe failed, err = %d\n", -err);
+ 		return(err);
+ 	}
+ 
+@@ -96,7 +94,7 @@
+ 			printk("slip_tramp : failed to allocate output "
+ 			       "buffer\n");
+ 
+-		close(fds[1]);
++		os_close_file(fds[1]);
+ 		read_output(fds[0], output, output_len);
+ 		if(output != NULL){
+ 			printk("%s", output);
+@@ -105,7 +103,7 @@
+ 		if(waitpid(pid, &status, 0) < 0) err = errno;
+ 		else if(!WIFEXITED(status) || (WEXITSTATUS(status) != 0)){
+ 			printk("'%s' didn't exit with status 0\n", argv[0]);
+-			err = EINVAL;
++			err = -EINVAL;
+ 		}
+ 	}
+ 	return(err);
+@@ -118,15 +116,17 @@
+ 	char gate_buf[sizeof("nnn.nnn.nnn.nnn\0")];
+ 	char *argv[] = { "uml_net", version_buf, "slip", "up", gate_buf, 
+ 			 NULL };
+-	int sfd, mfd, disc, sencap, err;
++	int sfd, mfd, err;
+ 
+-	if((mfd = get_pty()) < 0){
+-		printk("umn : Failed to open pty\n");
+-		return(-1);
++	mfd = get_pty();
++	if(mfd < 0){
++		printk("umn : Failed to open pty, err = %d\n", -mfd);
++		return(mfd);
+ 	}
+-	if((sfd = os_open_file(ptsname(mfd), of_rdwr(OPENFLAGS()), 0)) < 0){
+-		printk("Couldn't open tty for slip line\n");
+-		return(-1);
++	sfd = os_open_file(ptsname(mfd), of_rdwr(OPENFLAGS()), 0);
++	if(sfd < 0){
++		printk("Couldn't open tty for slip line, err = %d\n", -sfd);
++		return(sfd);
+ 	}
+ 	if(set_up_tty(sfd)) return(-1);
+ 	pri->slave = sfd;
+@@ -138,28 +138,23 @@
+ 
+ 		err = slip_tramp(argv, sfd);
+ 
+-		if(err != 0){
+-			printk("slip_tramp failed - errno = %d\n", err);
+-			return(-err);
++		if(err < 0){
++			printk("slip_tramp failed - err = %d\n", -err);
++			return(err);
+ 		}
+-		if(ioctl(pri->slave, SIOCGIFNAME, pri->name) < 0){
+-			printk("SIOCGIFNAME failed, errno = %d\n", errno);
+-			return(-errno);
++		err = os_get_ifname(pri->slave, pri->name);
++		if(err < 0){
++			printk("get_ifname failed, err = %d\n", -err);
++			return(err);
+ 		}
+ 		iter_addresses(pri->dev, open_addr, pri->name);
+ 	}
+ 	else {
+-		disc = N_SLIP;
+-		if(ioctl(sfd, TIOCSETD, &disc) < 0){
+-			printk("Failed to set slip line discipline - "
+-			       "errno = %d\n", errno);
+-			return(-errno);
+-		}
+-		sencap = 0;
+-		if(ioctl(sfd, SIOCSIFENCAP, &sencap) < 0){
+-			printk("Failed to set slip encapsulation - "
+-			       "errno = %d\n", errno);
+-			return(-errno);
++		err = os_set_slip(sfd);
++		if(err < 0){
++			printk("Failed to set slip discipline encapsulation - "
++			       "err = %d\n", -err);
++			return(err);
+ 		}
+ 	}
+ 	return(mfd);
+@@ -181,9 +176,9 @@
+ 	err = slip_tramp(argv, -1);
+ 
+ 	if(err != 0)
+-		printk("slip_tramp failed - errno = %d\n", err);
+-	close(fd);
+-	close(pri->slave);
++		printk("slip_tramp failed - errno = %d\n", -err);
++	os_close_file(fd);
++	os_close_file(pri->slave);
+ 	pri->slave = -1;
+ }
+ 
+@@ -243,7 +238,7 @@
+ {
+ 	struct slip_data *pri = data;
+ 
+-	if(pri->slave == -1) return;
++	if(pri->slave < 0) return;
+ 	open_addr(addr, netmask, pri->name);
+ }
+ 
+@@ -252,7 +247,7 @@
+ {
+ 	struct slip_data *pri = data;
+ 
+-	if(pri->slave == -1) return;
++	if(pri->slave < 0) return;
+ 	close_addr(addr, netmask, pri->name);
+ }
+ 
+diff -Naur a/arch/um/drivers/slirp_user.c b/arch/um/drivers/slirp_user.c
+--- a/arch/um/drivers/slirp_user.c	2004-02-11 12:16:03.000000000 -0500
++++ b/arch/um/drivers/slirp_user.c	2004-02-11 12:27:58.000000000 -0500
+@@ -4,7 +4,6 @@
+ #include <stddef.h>
+ #include <sched.h>
+ #include <string.h>
+-#include <sys/fcntl.h>
+ #include <sys/errno.h>
+ #include <sys/wait.h>
+ #include <sys/signal.h>
+@@ -48,15 +47,15 @@
+ 
+ 	return(pid);
+ }
+- 
++
++/* XXX This is just a trivial wrapper around os_pipe */ 
+ static int slirp_datachan(int *mfd, int *sfd)
+ {
+ 	int fds[2], err;
+ 
+ 	err = os_pipe(fds, 1, 1);
+-	if(err){
+-		printk("slirp_datachan: Failed to open pipe, errno = %d\n",
+-		       -err);
++	if(err < 0){
++		printk("slirp_datachan: Failed to open pipe, err = %d\n", -err);
+ 		return(err);
+ 	}
+ 
+@@ -77,7 +76,7 @@
+ 	pid = slirp_tramp(pri->argw.argv, sfd);
+ 
+ 	if(pid < 0){
+-		printk("slirp_tramp failed - errno = %d\n", pid);
++		printk("slirp_tramp failed - errno = %d\n", -pid);
+ 		os_close_file(sfd);	
+ 		os_close_file(mfd);	
+ 		return(pid);
+@@ -97,8 +96,8 @@
+ 	struct slirp_data *pri = data;
+ 	int status,err;
+ 
+-	close(fd);
+-	close(pri->slave);
++	os_close_file(fd);
++	os_close_file(pri->slave);
+ 
+ 	pri->slave = -1;
+ 
+diff -Naur a/arch/um/drivers/ssl.c b/arch/um/drivers/ssl.c
+--- a/arch/um/drivers/ssl.c	2004-02-11 12:15:28.000000000 -0500
++++ b/arch/um/drivers/ssl.c	2004-02-11 12:27:17.000000000 -0500
+@@ -10,6 +10,7 @@
+ #include "linux/major.h"
+ #include "linux/mm.h"
+ #include "linux/init.h"
++#include "linux/console.h"
+ #include "asm/termbits.h"
+ #include "asm/irq.h"
+ #include "line.h"
+@@ -53,8 +54,9 @@
+ 
+ static struct line_driver driver = {
+ 	.name 			= "UML serial line",
+-	.devfs_name 		= "tts/%d",
+-	.major 			= TTYAUX_MAJOR,
++	.device_name 		= "ttS",
++	.devfs_name 		= "tts/",
++	.major 			= TTY_MAJOR,
+ 	.minor_start 		= 64,
+ 	.type 		 	= TTY_DRIVER_TYPE_SERIAL,
+ 	.subtype 	 	= 0,
+@@ -149,6 +151,9 @@
+ 	case TCSETSW:
+ 	case TCGETA:
+ 	case TIOCMGET:
++	case TCSBRK:
++	case TCSBRKP:
++	case TIOCMSET:
+ 		ret = -ENOIOCTLCMD;
+ 		break;
+ 	default:
+@@ -212,6 +217,37 @@
+  */
+ static int ssl_init_done = 0;
+ 
++static void ssl_console_write(struct console *c, const char *string, 
++			      unsigned len)
++{
++	struct line *line = &serial_lines[c->index];
++	if(ssl_init_done)
++		down(&line->sem);
++	console_write_chan(&line->chan_list, string, len);
++	if(ssl_init_done)
++		up(&line->sem);
++}
++
++static struct tty_driver *ssl_console_device(struct console *c, int *index)
++{
++	*index = c->index;
++	return ssl_driver;
++}
++
++static int ssl_console_setup(struct console *co, char *options)
++{
++	return(0);
++}
++
++static struct console ssl_cons = {
++	name:		"ttyS",
++	write:		ssl_console_write,
++	device:		ssl_console_device,
++	setup:		ssl_console_setup,
++	flags:		CON_PRINTBUFFER,
++	index:		-1,
++};
++
+ int ssl_init(void)
+ {
+ 	char *new_title;
+@@ -227,17 +263,18 @@
+ 	new_title = add_xterm_umid(opts.xterm_title);
+ 	if(new_title != NULL) opts.xterm_title = new_title;
+ 
++	register_console(&ssl_cons);
+ 	ssl_init_done = 1;
+ 	return(0);
+ }
+ 
+-__initcall(ssl_init);
++late_initcall(ssl_init);
+ 
+ static int ssl_chan_setup(char *str)
+ {
+-	line_setup(serial_lines, sizeof(serial_lines)/sizeof(serial_lines[0]),
+-		   str, 1);
+-	return(1);
++	return(line_setup(serial_lines, 
++			  sizeof(serial_lines)/sizeof(serial_lines[0]), 
++			  str, 1));
+ }
+ 
+ __setup("ssl", ssl_chan_setup);
+diff -Naur a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c
+--- a/arch/um/drivers/stdio_console.c	2004-02-11 12:14:32.000000000 -0500
++++ b/arch/um/drivers/stdio_console.c	2004-02-11 12:26:14.000000000 -0500
+@@ -83,7 +83,8 @@
+ 
+ static struct line_driver driver = {
+ 	.name 			= "UML console",
+-	.devfs_name 		= "vc/%d",
++	.device_name 		= "tty",
++	.devfs_name 		= "vc/",
+ 	.major 			= TTY_MAJOR,
+ 	.minor_start 		= 0,
+ 	.type 		 	= TTY_DRIVER_TYPE_CONSOLE,
+@@ -159,6 +160,15 @@
+ 
+ static int con_init_done = 0;
+ 
++static struct tty_operations console_ops = {
++	.open 	 		= con_open,
++	.close 	 		= con_close,
++	.write 	 		= con_write,
++	.chars_in_buffer 	= chars_in_buffer,
++	.set_termios 		= set_termios,
++	.write_room		= line_write_room,
++};
++
+ int stdio_init(void)
+ {
+ 	char *new_title;
+@@ -166,7 +176,8 @@
+ 	printk(KERN_INFO "Initializing stdio console driver\n");
+ 
+ 	console_driver = line_register_devfs(&console_lines, &driver,
+-				&console_ops, vts, sizeof(vts)/sizeof(vts[0]));
++					     &console_ops, vts,
++					     sizeof(vts)/sizeof(vts[0]));
+ 
+ 	lines_init(vts, sizeof(vts)/sizeof(vts[0]));
+ 
+@@ -178,24 +189,19 @@
+ 	return(0);
+ }
+ 
+-__initcall(stdio_init);
++late_initcall(stdio_init);
+ 
+ static void console_write(struct console *console, const char *string, 
+ 			  unsigned len)
+ {
+-	if(con_init_done) down(&vts[console->index].sem);
+-	console_write_chan(&vts[console->index].chan_list, string, len);
+-	if(con_init_done) up(&vts[console->index].sem);
+-}
++	struct line *line = &vts[console->index];
+ 
+-static struct tty_operations console_ops = {
+-	.open 	 		= con_open,
+-	.close 	 		= con_close,
+-	.write 	 		= con_write,
+-	.chars_in_buffer 	= chars_in_buffer,
+-	.set_termios 		= set_termios,
+-	.write_room		= line_write_room,
+-};
++	if(con_init_done)
++		down(&line->sem);
++	console_write_chan(&line->chan_list, string, len);
++	if(con_init_done)
++		up(&line->sem);
++}
+ 
+ static struct tty_driver *console_device(struct console *c, int *index)
+ {
+@@ -208,22 +214,28 @@
+ 	return(0);
+ }
+ 
+-static struct console stdiocons = INIT_CONSOLE("tty", console_write, 
+-					       console_device, console_setup,
+-					       CON_PRINTBUFFER);
++static struct console stdiocons = {
++	name:		"tty",
++	write:		console_write,
++	device:		console_device,
++	setup:		console_setup,
++	flags:		CON_PRINTBUFFER,
++	index:		-1,
++};
+ 
+-static void __init stdio_console_init(void)
++static int __init stdio_console_init(void)
+ {
+ 	INIT_LIST_HEAD(&vts[0].chan_list);
+ 	list_add(&init_console_chan.list, &vts[0].chan_list);
+ 	register_console(&stdiocons);
++	return(0);
+ }
++
+ console_initcall(stdio_console_init);
+ 
+ static int console_chan_setup(char *str)
+ {
+-	line_setup(vts, sizeof(vts)/sizeof(vts[0]), str, 1);
+-	return(1);
++	return(line_setup(vts, sizeof(vts)/sizeof(vts[0]), str, 1));
+ }
+ 
+ __setup("con", console_chan_setup);
+diff -Naur a/arch/um/drivers/tty.c b/arch/um/drivers/tty.c
+--- a/arch/um/drivers/tty.c	2004-02-11 12:15:02.000000000 -0500
++++ b/arch/um/drivers/tty.c	2004-02-11 12:26:51.000000000 -0500
+@@ -5,7 +5,6 @@
+ 
+ #include <stdio.h>
+ #include <termios.h>
+-#include <fcntl.h>
+ #include <errno.h>
+ #include <unistd.h>
+ #include "chan_user.h"
+@@ -30,7 +29,8 @@
+ 	}
+ 	str++;
+ 
+-	if((data = um_kmalloc(sizeof(*data))) == NULL) 
++	data = um_kmalloc(sizeof(*data)); 
++	if(data == NULL) 
+ 		return(NULL);
+ 	*data = ((struct tty_chan) { .dev 	= str,
+ 				     .raw 	= opts->raw });
+diff -Naur a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
+--- a/arch/um/drivers/ubd_kern.c	2004-02-11 12:15:25.000000000 -0500
++++ b/arch/um/drivers/ubd_kern.c	2004-02-11 12:27:12.000000000 -0500
+@@ -8,6 +8,13 @@
+  * old style ubd by setting UBD_SHIFT to 0
+  * 2002-09-27...2002-10-18 massive tinkering for 2.5
+  * partitions have changed in 2.5
++ * 2003-01-29 more tinkering for 2.5.59-1
++ * This should now address the sysfs problems and has
++ * the symlink for devfs to allow for booting with
++ * the common /dev/ubd/discX/... names rather than
++ * only /dev/ubdN/discN this version also has lots of
++ * clean ups preparing for ubd-many.
++ * James McMechan
+  */
+ 
+ #define MAJOR_NR UBD_MAJOR
+@@ -40,9 +47,12 @@
+ #include "mconsole_kern.h"
+ #include "init.h"
+ #include "irq_user.h"
++#include "irq_kern.h"
+ #include "ubd_user.h"
+ #include "2_5compat.h"
+ #include "os.h"
++#include "mem.h"
++#include "mem_kern.h"
+ 
+ static spinlock_t ubd_io_lock = SPIN_LOCK_UNLOCKED;
+ static spinlock_t ubd_lock = SPIN_LOCK_UNLOCKED;
+@@ -56,6 +66,10 @@
+ 
+ #define MAX_DEV (8)
+ 
++/* Changed in early boot */
++static int ubd_do_mmap = 0;
++#define UBD_MMAP_BLOCK_SIZE PAGE_SIZE
++
+ static struct block_device_operations ubd_blops = {
+         .owner		= THIS_MODULE,
+         .open		= ubd_open,
+@@ -67,7 +81,7 @@
+ static request_queue_t *ubd_queue;
+ 
+ /* Protected by ubd_lock */
+-static int fake_major = 0;
++static int fake_major = MAJOR_NR;
+ 
+ static struct gendisk *ubd_gendisk[MAX_DEV];
+ static struct gendisk *fake_gendisk[MAX_DEV];
+@@ -96,13 +110,19 @@
+ 
+ struct ubd {
+ 	char *file;
+-	int is_dir;
+ 	int count;
+ 	int fd;
+ 	__u64 size;
+ 	struct openflags boot_openflags;
+ 	struct openflags openflags;
++	int no_cow;
+ 	struct cow cow;
++
++	int map_writes;
++	int map_reads;
++	int nomap_writes;
++	int nomap_reads;
++	int write_maps;
+ };
+ 
+ #define DEFAULT_COW { \
+@@ -115,21 +135,28 @@
+ 
+ #define DEFAULT_UBD { \
+ 	.file = 		NULL, \
+-	.is_dir =		0, \
+ 	.count =		0, \
+ 	.fd =			-1, \
+ 	.size =			-1, \
+ 	.boot_openflags =	OPEN_FLAGS, \
+ 	.openflags =		OPEN_FLAGS, \
++        .no_cow =               0, \
+         .cow =			DEFAULT_COW, \
++	.map_writes		= 0, \
++	.map_reads		= 0, \
++	.nomap_writes		= 0, \
++	.nomap_reads		= 0, \
++	.write_maps		= 0, \
+ }
+ 
+ struct ubd ubd_dev[MAX_DEV] = { [ 0 ... MAX_DEV - 1 ] = DEFAULT_UBD };
+ 
+ static int ubd0_init(void)
+ {
+-	if(ubd_dev[0].file == NULL)
+-		ubd_dev[0].file = "root_fs";
++	struct ubd *dev = &ubd_dev[0];
++
++	if(dev->file == NULL)
++		dev->file = "root_fs";
+ 	return(0);
+ }
+ 
+@@ -196,19 +223,46 @@
+ "    Create ide0 entries that map onto ubd devices.\n\n"
+ );
+ 
++static int parse_unit(char **ptr)
++{
++	char *str = *ptr, *end;
++	int n = -1;
++
++	if(isdigit(*str)) {
++		n = simple_strtoul(str, &end, 0);
++		if(end == str)
++			return(-1);
++		*ptr = end;
++	}
++	else if (('a' <= *str) && (*str <= 'h')) {
++		n = *str - 'a';
++		str++;
++		*ptr = str;
++	}
++	return(n);
++}
++
+ static int ubd_setup_common(char *str, int *index_out)
+ {
++	struct ubd *dev;
+ 	struct openflags flags = global_openflags;
+ 	char *backing_file;
+ 	int n, err;
+ 
+ 	if(index_out) *index_out = -1;
+-	n = *str++;
++	n = *str;
+ 	if(n == '='){
+-		static int fake_major_allowed = 1;
+ 		char *end;
+ 		int major;
+ 
++		str++;
++		if(!strcmp(str, "mmap")){
++			CHOOSE_MODE(printk("mmap not supported by the ubd "
++					   "driver in tt mode\n"),
++				    ubd_do_mmap = 1);
++			return(0);
++		}
++
+ 		if(!strcmp(str, "sync")){
+ 			global_openflags.s = 1;
+ 			return(0);
+@@ -220,20 +274,14 @@
+ 			return(1);
+ 		}
+ 
+-		if(!fake_major_allowed){
+-			printk(KERN_ERR "Can't assign a fake major twice\n");
+-			return(1);
+-		}
+-
+ 		err = 1;
+  		spin_lock(&ubd_lock);
+- 		if(!fake_major_allowed){
++ 		if(fake_major != MAJOR_NR){
+  			printk(KERN_ERR "Can't assign a fake major twice\n");
+  			goto out1;
+  		}
+  
+  		fake_major = major;
+-		fake_major_allowed = 0;
+ 
+ 		printk(KERN_INFO "Setting extra ubd major number to %d\n",
+ 		       major);
+@@ -243,25 +291,23 @@
+ 		return(err);
+ 	}
+ 
+-	if(n < '0'){
+-		printk(KERN_ERR "ubd_setup : index out of range\n"); }
+-
+-	if((n >= '0') && (n <= '9')) n -= '0';
+-	else if((n >= 'a') && (n <= 'z')) n -= 'a';
+-	else {
+-		printk(KERN_ERR "ubd_setup : device syntax invalid\n");
++	n = parse_unit(&str);
++	if(n < 0){
++		printk(KERN_ERR "ubd_setup : couldn't parse unit number "
++		       "'%s'\n", str);
+ 		return(1);
+ 	}
+ 	if(n >= MAX_DEV){
+-		printk(KERN_ERR "ubd_setup : index out of range "
+-		       "(%d devices)\n", MAX_DEV);	
++		printk(KERN_ERR "ubd_setup : index %d out of range "
++		       "(%d devices)\n", n, MAX_DEV);
+ 		return(1);
+ 	}
+ 
+ 	err = 1;
+ 	spin_lock(&ubd_lock);
+ 
+-	if(ubd_dev[n].file != NULL){
++	dev = &ubd_dev[n];
++	if(dev->file != NULL){
+ 		printk(KERN_ERR "ubd_setup : device already configured\n");
+ 		goto out2;
+ 	}
+@@ -276,6 +322,11 @@
+ 		flags.s = 1;
+ 		str++;
+ 	}
++	if (*str == 'd'){
++		dev->no_cow = 1;
++		str++;
++	}
++
+ 	if(*str++ != '='){
+ 		printk(KERN_ERR "ubd_setup : Expected '='\n");
+ 		goto out2;
+@@ -284,14 +335,17 @@
+ 	err = 0;
+ 	backing_file = strchr(str, ',');
+ 	if(backing_file){
+-		*backing_file = '\0';
+-		backing_file++;
++		if(dev->no_cow)
++			printk(KERN_ERR "Can't specify both 'd' and a "
++			       "cow file\n");
++		else {
++			*backing_file = '\0';
++			backing_file++;
++		}
+ 	}
+-	ubd_dev[n].file = str;
+-	if(ubd_is_dir(ubd_dev[n].file))
+-		ubd_dev[n].is_dir = 1;
+-	ubd_dev[n].cow.file = backing_file;
+-	ubd_dev[n].boot_openflags = flags;
++	dev->file = str;
++	dev->cow.file = backing_file;
++	dev->boot_openflags = flags;
+  out2:
+ 	spin_unlock(&ubd_lock);
+ 	return(err);
+@@ -321,8 +375,7 @@
+ static int fakehd_set = 0;
+ static int fakehd(char *str)
+ {
+-	printk(KERN_INFO 
+-	       "fakehd : Changing ubd name to \"hd\".\n");
++	printk(KERN_INFO "fakehd : Changing ubd name to \"hd\".\n");
+ 	fakehd_set = 1;
+ 	return 1;
+ }
+@@ -368,32 +421,42 @@
+ {
+ 	struct io_thread_req req;
+ 	struct request *rq = elv_next_request(ubd_queue);
+-	int n;
++	int n, err;
+ 
+ 	do_ubd = NULL;
+ 	intr_count++;
+ 	n = read_ubd_fs(thread_fd, &req, sizeof(req));
+ 	if(n != sizeof(req)){
+ 		printk(KERN_ERR "Pid %d - spurious interrupt in ubd_handler, "
+-		       "errno = %d\n", os_getpid(), -n);
++		       "err = %d\n", os_getpid(), -n);
+ 		spin_lock(&ubd_io_lock);
+ 		end_request(rq, 0);
+ 		spin_unlock(&ubd_io_lock);
+ 		return;
+ 	}
+         
+-        if((req.offset != ((__u64) (rq->sector)) << 9) ||
+-	   (req.length != (rq->current_nr_sectors) << 9))
++	if((req.op != UBD_MMAP) && 
++	   ((req.offset != ((__u64) (rq->sector)) << 9) ||
++	    (req.length != (rq->current_nr_sectors) << 9)))
+ 		panic("I/O op mismatch");
+ 	
++	if(req.map_fd != -1){
++		err = physmem_subst_mapping(req.buffer, req.map_fd, 
++					    req.map_offset, 1);
++		if(err)
++			printk("ubd_handler - physmem_subst_mapping failed, "
++			       "err = %d\n", -err);
++	}
++
+ 	ubd_finish(rq, req.error);
+ 	reactivate_fd(thread_fd, UBD_IRQ);	
+ 	do_ubd_request(ubd_queue);
+ }
+ 
+-static void ubd_intr(int irq, void *dev, struct pt_regs *unused)
++static irqreturn_t ubd_intr(int irq, void *dev, struct pt_regs *unused)
+ {
+ 	ubd_handler();
++	return(IRQ_HANDLED);
+ }
+ 
+ /* Only changed by ubd_init, which is an initcall. */
+@@ -417,10 +480,14 @@
+ 
+ static void ubd_close(struct ubd *dev)
+ {
++	if(ubd_do_mmap)
++		physmem_forget_descriptor(dev->fd);
+ 	os_close_file(dev->fd);
+ 	if(dev->cow.file == NULL)
+ 		return;
+ 
++	if(ubd_do_mmap)
++		physmem_forget_descriptor(dev->cow.fd);
+ 	os_close_file(dev->cow.fd);
+ 	vfree(dev->cow.bitmap);
+ 	dev->cow.bitmap = NULL;
+@@ -429,18 +496,20 @@
+ static int ubd_open_dev(struct ubd *dev)
+ {
+ 	struct openflags flags;
+-	int err, n, create_cow, *create_ptr;
++	char **back_ptr;
++	int err, create_cow, *create_ptr;
+ 
++	dev->openflags = dev->boot_openflags;
+ 	create_cow = 0;
+ 	create_ptr = (dev->cow.file != NULL) ? &create_cow : NULL;
+-	dev->fd = open_ubd_file(dev->file, &dev->openflags, &dev->cow.file,
++	back_ptr = dev->no_cow ? NULL : &dev->cow.file;
++	dev->fd = open_ubd_file(dev->file, &dev->openflags, back_ptr,
+ 				&dev->cow.bitmap_offset, &dev->cow.bitmap_len, 
+ 				&dev->cow.data_offset, create_ptr);
+ 
+ 	if((dev->fd == -ENOENT) && create_cow){
+-		n = dev - ubd_dev;
+ 		dev->fd = create_cow_file(dev->file, dev->cow.file, 
+-					  dev->openflags, 1 << 9,
++					  dev->openflags, 1 << 9, PAGE_SIZE,
+ 					  &dev->cow.bitmap_offset, 
+ 					  &dev->cow.bitmap_len,
+ 					  &dev->cow.data_offset);
+@@ -455,13 +524,17 @@
+ 	if(dev->cow.file != NULL){
+ 		err = -ENOMEM;
+ 		dev->cow.bitmap = (void *) vmalloc(dev->cow.bitmap_len);
+-		if(dev->cow.bitmap == NULL) goto error;
++		if(dev->cow.bitmap == NULL){
++			printk(KERN_ERR "Failed to vmalloc COW bitmap\n");
++			goto error;
++		}
+ 		flush_tlb_kernel_vm();
+ 
+ 		err = read_cow_bitmap(dev->fd, dev->cow.bitmap, 
+ 				      dev->cow.bitmap_offset, 
+ 				      dev->cow.bitmap_len);
+-		if(err) goto error;
++		if(err < 0)
++			goto error;
+ 
+ 		flags = dev->openflags;
+ 		flags.w = 0;
+@@ -481,17 +554,31 @@
+ 			
+ {
+ 	struct gendisk *disk;
++	char from[sizeof("ubd/nnnnn\0")], to[sizeof("discnnnnn/disc\0")];
++	int err;
+ 
+ 	disk = alloc_disk(1 << UBD_SHIFT);
+-	if (!disk)
+-		return -ENOMEM;
++	if(disk == NULL)
++		return(-ENOMEM);
+ 
+ 	disk->major = major;
+ 	disk->first_minor = unit << UBD_SHIFT;
+ 	disk->fops = &ubd_blops;
+ 	set_capacity(disk, size / 512);
+-	sprintf(disk->disk_name, "ubd");
+-	sprintf(disk->devfs_name, "ubd/disc%d", unit);
++	if(major == MAJOR_NR){
++		sprintf(disk->disk_name, "ubd%c", 'a' + unit);
++		sprintf(disk->devfs_name, "ubd/disc%d", unit);
++		sprintf(from, "ubd/%d", unit);
++		sprintf(to, "disc%d/disc", unit);
++		err = devfs_mk_symlink(from, to);
++		if(err)
++			printk("ubd_new_disk failed to make link from %s to "
++			       "%s, error = %d\n", from, to, err);
++	}
++	else {
++		sprintf(disk->disk_name, "ubd_fake%d", unit);
++		sprintf(disk->devfs_name, "ubd_fake/disc%d", unit);
++	}
+ 
+ 	disk->private_data = &ubd_dev[unit];
+ 	disk->queue = ubd_queue;
+@@ -506,24 +593,21 @@
+ 	struct ubd *dev = &ubd_dev[n];
+ 	int err;
+ 
+-	if(dev->is_dir)
+-		return(-EISDIR);
+-
+-	if (!dev->file)
++	if(dev->file == NULL)
+ 		return(-ENODEV);
+ 
+ 	if (ubd_open_dev(dev))
+ 		return(-ENODEV);
+ 
+ 	err = ubd_file_size(dev, &dev->size);
+-	if(err)
++	if(err < 0)
+ 		return(err);
+ 
+ 	err = ubd_new_disk(MAJOR_NR, dev->size, n, &ubd_gendisk[n]);
+ 	if(err) 
+ 		return(err);
+  
+-	if(fake_major)
++	if(fake_major != MAJOR_NR)
+ 		ubd_new_disk(fake_major, dev->size, n, 
+ 			     &fake_gendisk[n]);
+ 
+@@ -561,42 +645,42 @@
+ 	return(err);
+ }
+ 
+-static int ubd_get_config(char *dev, char *str, int size, char **error_out)
++static int ubd_get_config(char *name, char *str, int size, char **error_out)
+ {
+-	struct ubd *ubd;
++	struct ubd *dev;
+ 	char *end;
+-	int major, n = 0;
++	int n, len = 0;
+ 
+-	major = simple_strtoul(dev, &end, 0);
+-	if((*end != '\0') || (end == dev)){
+-		*error_out = "ubd_get_config : didn't parse major number";
++	n = simple_strtoul(name, &end, 0);
++	if((*end != '\0') || (end == name)){
++		*error_out = "ubd_get_config : didn't parse device number";
+ 		return(-1);
+ 	}
+ 
+-	if((major >= MAX_DEV) || (major < 0)){
+-		*error_out = "ubd_get_config : major number out of range";
++	if((n >= MAX_DEV) || (n < 0)){
++		*error_out = "ubd_get_config : device number out of range";
+ 		return(-1);
+ 	}
+ 
+-	ubd = &ubd_dev[major];
++	dev = &ubd_dev[n];
+ 	spin_lock(&ubd_lock);
+ 
+-	if(ubd->file == NULL){
+-		CONFIG_CHUNK(str, size, n, "", 1);
++	if(dev->file == NULL){
++		CONFIG_CHUNK(str, size, len, "", 1);
+ 		goto out;
+ 	}
+ 
+-	CONFIG_CHUNK(str, size, n, ubd->file, 0);
++	CONFIG_CHUNK(str, size, len, dev->file, 0);
+ 
+-	if(ubd->cow.file != NULL){
+-		CONFIG_CHUNK(str, size, n, ",", 0);
+-		CONFIG_CHUNK(str, size, n, ubd->cow.file, 1);
++	if(dev->cow.file != NULL){
++		CONFIG_CHUNK(str, size, len, ",", 0);
++		CONFIG_CHUNK(str, size, len, dev->cow.file, 1);
+ 	}
+-	else CONFIG_CHUNK(str, size, n, "", 1);
++	else CONFIG_CHUNK(str, size, len, "", 1);
+ 
+  out:
+ 	spin_unlock(&ubd_lock);
+-	return(n);
++	return(len);
+ }
+ 
+ static int ubd_remove(char *str)
+@@ -604,11 +688,9 @@
+ 	struct ubd *dev;
+ 	int n, err = -ENODEV;
+ 
+-	if(!isdigit(*str))
+-		return(err);	/* it should be a number 0-7/a-h */
++	n = parse_unit(&str);
+ 
+-	n = *str - '0';
+-	if(n >= MAX_DEV) 
++	if((n < 0) || (n >= MAX_DEV))
+ 		return(err);
+ 
+ 	dev = &ubd_dev[n];
+@@ -669,7 +751,7 @@
+ 		
+ 	elevator_init(ubd_queue, &elevator_noop);
+ 
+-	if (fake_major != 0) {
++	if (fake_major != MAJOR_NR) {
+ 		char name[sizeof("ubd_nnn\0")];
+ 
+ 		snprintf(name, sizeof(name), "ubd_%d", fake_major);
+@@ -696,6 +778,7 @@
+ 	io_pid = start_io_thread(stack + PAGE_SIZE - sizeof(void *), 
+ 				 &thread_fd);
+ 	if(io_pid < 0){
++		io_pid = -1;
+ 		printk(KERN_ERR 
+ 		       "ubd : Failed to start I/O thread (errno = %d) - "
+ 		       "falling back to synchronous I/O\n", -io_pid);
+@@ -703,8 +786,8 @@
+ 	}
+ 	err = um_request_irq(UBD_IRQ, thread_fd, IRQ_READ, ubd_intr, 
+ 			     SA_INTERRUPT, "ubd", ubd_dev);
+-	if(err != 0) printk(KERN_ERR 
+-			    "um_request_irq failed - errno = %d\n", -err);
++	if(err != 0) 
++		printk(KERN_ERR "um_request_irq failed - errno = %d\n", -err);
+ 	return(err);
+ }
+ 
+@@ -714,15 +797,9 @@
+ {
+ 	struct gendisk *disk = inode->i_bdev->bd_disk;
+ 	struct ubd *dev = disk->private_data;
+-	int err = -EISDIR;
+-
+-	if(dev->is_dir == 1)
+-		goto out;
++	int err = 0;
+ 
+-	err = 0;
+ 	if(dev->count == 0){
+-		dev->openflags = dev->boot_openflags;
+-
+ 		err = ubd_open_dev(dev);
+ 		if(err){
+ 			printk(KERN_ERR "%s: Can't open \"%s\": errno = %d\n",
+@@ -749,62 +826,156 @@
+ 	return(0);
+ }
+ 
+-void cowify_req(struct io_thread_req *req, struct ubd *dev)
++static void cowify_bitmap(__u64 io_offset, int length, unsigned long *cow_mask, 
++			  __u64 *cow_offset, unsigned long *bitmap, 
++			  __u64 bitmap_offset, unsigned long *bitmap_words,
++			  __u64 bitmap_len)
++{
++	__u64 sector = io_offset >> 9;
++	int i, update_bitmap = 0;
++
++	for(i = 0; i < length >> 9; i++){
++		if(cow_mask != NULL)
++			ubd_set_bit(i, (unsigned char *) cow_mask);
++		if(ubd_test_bit(sector + i, (unsigned char *) bitmap))
++			continue;
++
++		update_bitmap = 1;
++		ubd_set_bit(sector + i, (unsigned char *) bitmap);
++	}
++
++	if(!update_bitmap)
++		return;
++
++	*cow_offset = sector / (sizeof(unsigned long) * 8);
++
++	/* This takes care of the case where we're exactly at the end of the
++	 * device, and *cow_offset + 1 is off the end.  So, just back it up
++	 * by one word.  Thanks to Lynn Kerby for the fix and James McMechan
++	 * for the original diagnosis.
++	 */
++	if(*cow_offset == ((bitmap_len + sizeof(unsigned long) - 1) / 
++			   sizeof(unsigned long) - 1))
++		(*cow_offset)--;
++
++	bitmap_words[0] = bitmap[*cow_offset];
++	bitmap_words[1] = bitmap[*cow_offset + 1];
++
++	*cow_offset *= sizeof(unsigned long);
++	*cow_offset += bitmap_offset;
++}
++
++static void cowify_req(struct io_thread_req *req, unsigned long *bitmap, 
++		       __u64 bitmap_offset, __u64 bitmap_len)
+ {
+-        int i, update_bitmap, sector = req->offset >> 9;
++	__u64 sector = req->offset >> 9;
++	int i;
+ 
+ 	if(req->length > (sizeof(req->sector_mask) * 8) << 9)
+ 		panic("Operation too long");
++
+ 	if(req->op == UBD_READ) {
+ 		for(i = 0; i < req->length >> 9; i++){
+-			if(ubd_test_bit(sector + i, (unsigned char *) 
+-					dev->cow.bitmap)){
++			if(ubd_test_bit(sector + i, (unsigned char *) bitmap))
+ 				ubd_set_bit(i, (unsigned char *) 
+ 					    &req->sector_mask);
+-			}
+                 }
+-        } 
+-        else {
+-		update_bitmap = 0;
+-		for(i = 0; i < req->length >> 9; i++){
+-			ubd_set_bit(i, (unsigned char *) 
+-				    &req->sector_mask);
+-			if(!ubd_test_bit(sector + i, (unsigned char *) 
+-					 dev->cow.bitmap))
+-				update_bitmap = 1;
+-			ubd_set_bit(sector + i, (unsigned char *) 
+-				    dev->cow.bitmap);
+-		}
+-		if(update_bitmap){
+-			req->cow_offset = sector / (sizeof(unsigned long) * 8);
+-			req->bitmap_words[0] = 
+-				dev->cow.bitmap[req->cow_offset];
+-			req->bitmap_words[1] = 
+-				dev->cow.bitmap[req->cow_offset + 1];
+-			req->cow_offset *= sizeof(unsigned long);
+-			req->cow_offset += dev->cow.bitmap_offset;
++	}
++	else cowify_bitmap(req->offset, req->length, &req->sector_mask,
++			   &req->cow_offset, bitmap, bitmap_offset, 
++			   req->bitmap_words, bitmap_len);
++}
++
++static int mmap_fd(struct request *req, struct ubd *dev, __u64 offset)
++{
++	__u64 sector;
++	unsigned char *bitmap;
++	int bit, i;
++
++	/* mmap must have been requested on the command line */
++	if(!ubd_do_mmap)
++		return(-1);
++
++	/* The buffer must be page aligned */
++	if(((unsigned long) req->buffer % UBD_MMAP_BLOCK_SIZE) != 0)
++		return(-1);
++
++	/* The request must be a page long */
++	if((req->current_nr_sectors << 9) != PAGE_SIZE)
++		return(-1);
++
++	if(dev->cow.file == NULL)
++		return(dev->fd);
++
++	sector = offset >> 9;
++	bitmap = (unsigned char *) dev->cow.bitmap;
++	bit = ubd_test_bit(sector, bitmap);
++
++	for(i = 1; i < req->current_nr_sectors; i++){
++		if(ubd_test_bit(sector + i, bitmap) != bit)
++			return(-1);
++	}
++
++	if(bit || (rq_data_dir(req) == WRITE))
++		offset += dev->cow.data_offset;
++
++	/* The data on disk must be page aligned */
++	if((offset % UBD_MMAP_BLOCK_SIZE) != 0)
++		return(-1);
++
++	return(bit ? dev->fd : dev->cow.fd);
++}
++
++static int prepare_mmap_request(struct ubd *dev, int fd, __u64 offset, 
++				struct request *req, 
++				struct io_thread_req *io_req)
++{
++	int err;
++
++	if(rq_data_dir(req) == WRITE){
++		/* Writes are almost no-ops since the new data is already in the
++		 * host page cache
++		 */
++		dev->map_writes++;
++		if(dev->cow.file != NULL)
++			cowify_bitmap(io_req->offset, io_req->length, 
++				      &io_req->sector_mask, &io_req->cow_offset,
++				      dev->cow.bitmap, dev->cow.bitmap_offset,
++				      io_req->bitmap_words, 
++				      dev->cow.bitmap_len);
++	}
++	else {
++		int w;
++
++		if((dev->cow.file != NULL) && (fd == dev->cow.fd))
++			w = 0;
++		else w = dev->openflags.w;
++
++		if((dev->cow.file != NULL) && (fd == dev->fd))
++			offset += dev->cow.data_offset;
++
++		err = physmem_subst_mapping(req->buffer, fd, offset, w);
++		if(err){
++			printk("physmem_subst_mapping failed, err = %d\n", 
++			       -err);
++			return(1);
+ 		}
++		dev->map_reads++;
+ 	}
++	io_req->op = UBD_MMAP;
++	io_req->buffer = req->buffer;
++	return(0);
+ }
+ 
+ static int prepare_request(struct request *req, struct io_thread_req *io_req)
+ {
+ 	struct gendisk *disk = req->rq_disk;
+ 	struct ubd *dev = disk->private_data;
+-	__u64 block;
+-	int nsect;
++	__u64 offset;
++	int len, fd;
+ 
+ 	if(req->rq_status == RQ_INACTIVE) return(1);
+ 
+-	if(dev->is_dir){
+-		strcpy(req->buffer, "HOSTFS:");
+-		strcat(req->buffer, dev->file);
+- 		spin_lock(&ubd_io_lock);
+-		end_request(req, 1);
+- 		spin_unlock(&ubd_io_lock);
+-		return(1);
+-	}
+-
+ 	if((rq_data_dir(req) == WRITE) && !dev->openflags.w){
+ 		printk("Write attempted on readonly ubd device %s\n", 
+ 		       disk->disk_name);
+@@ -814,23 +985,49 @@
+ 		return(1);
+ 	}
+ 
+-        block = req->sector;
+-        nsect = req->current_nr_sectors;
++	offset = ((__u64) req->sector) << 9;
++	len = req->current_nr_sectors << 9;
+ 
+-	io_req->op = rq_data_dir(req) == READ ? UBD_READ : UBD_WRITE;
+ 	io_req->fds[0] = (dev->cow.file != NULL) ? dev->cow.fd : dev->fd;
+ 	io_req->fds[1] = dev->fd;
++	io_req->map_fd = -1;
++	io_req->cow_offset = -1;
++	io_req->offset = offset;
++	io_req->length = len;
++	io_req->error = 0;
++	io_req->sector_mask = 0;
++
++	fd = mmap_fd(req, dev, io_req->offset);
++	if(fd > 0){
++		/* If mmapping is otherwise OK, but the first access to the 
++		 * page is a write, then it's not mapped in yet.  So we have 
++		 * to write the data to disk first, then we can map the disk
++		 * page in and continue normally from there.
++		 */
++		if((rq_data_dir(req) == WRITE) && !is_remapped(req->buffer)){
++			io_req->map_fd = dev->fd;
++			io_req->map_offset = io_req->offset + 
++				dev->cow.data_offset;
++			dev->write_maps++;
++		}
++		else return(prepare_mmap_request(dev, fd, io_req->offset, req, 
++						 io_req));
++	}
++
++	if(rq_data_dir(req) == READ)
++		dev->nomap_reads++;
++	else dev->nomap_writes++;
++
++	io_req->op = (rq_data_dir(req) == READ) ? UBD_READ : UBD_WRITE;
+ 	io_req->offsets[0] = 0;
+ 	io_req->offsets[1] = dev->cow.data_offset;
+-	io_req->offset = ((__u64) block) << 9;
+-	io_req->length = nsect << 9;
+ 	io_req->buffer = req->buffer;
+ 	io_req->sectorsize = 1 << 9;
+-	io_req->sector_mask = 0;
+-	io_req->cow_offset = -1;
+-	io_req->error = 0;
+ 
+-        if(dev->cow.file != NULL) cowify_req(io_req, dev);
++	if(dev->cow.file != NULL) 
++		cowify_req(io_req, dev->cow.bitmap, dev->cow.bitmap_offset,
++			   dev->cow.bitmap_len);
++
+ 	return(0);
+ }
+ 
+@@ -841,7 +1038,7 @@
+ 	int err, n;
+ 
+ 	if(thread_fd == -1){
+-		while(!list_empty(&q->queue_head)){
++		while(!elv_queue_empty(q)){
+ 			req = elv_next_request(q);
+ 			err = prepare_request(req, &io_req);
+ 			if(!err){
+@@ -851,7 +1048,8 @@
+ 		}
+ 	}
+ 	else {
+-		if(do_ubd || list_empty(&q->queue_head)) return;
++		if(do_ubd || elv_queue_empty(q))
++			return;
+ 		req = elv_next_request(q);
+ 		err = prepare_request(req, &io_req);
+ 		if(!err){
+@@ -885,7 +1083,7 @@
+ 		g.heads = 128;
+ 		g.sectors = 32;
+ 		g.cylinders = dev->size / (128 * 32 * 512);
+-		g.start = 2;
++		g.start = get_start_sect(inode->i_bdev);
+ 		return(copy_to_user(loc, &g, sizeof(g)) ? -EFAULT : 0);
+ 
+ 	case HDIO_SET_UNMASKINTR:
+@@ -935,6 +1133,142 @@
+ 	return(-EINVAL);
+ }
+ 
++static int ubd_check_remapped(int fd, unsigned long address, int is_write,
++			      __u64 offset)
++{
++	__u64 bitmap_offset;
++	unsigned long new_bitmap[2];
++	int i, err, n;
++
++	/* If it's not a write access, we can't do anything about it */
++	if(!is_write)
++		return(0);
++
++	/* We have a write */
++	for(i = 0; i < sizeof(ubd_dev) / sizeof(ubd_dev[0]); i++){
++		struct ubd *dev = &ubd_dev[i];
++
++		if((dev->fd != fd) && (dev->cow.fd != fd))
++			continue;
++
++		/* It's a write to a ubd device */
++
++		if(!dev->openflags.w){
++			/* It's a write access on a read-only device - probably
++			 * shouldn't happen.  If the kernel is trying to change
++			 * something with no intention of writing it back out,
++			 * then this message will clue us in that this needs
++			 * fixing
++			 */
++			printk("Write access to mapped page from readonly ubd "
++			       "device %d\n", i);
++			return(0);
++		}
++
++		/* It's a write to a writeable ubd device - it must be COWed
++		 * because, otherwise, the page would have been mapped in 
++		 * writeable
++		 */
++
++		if(!dev->cow.file)
++			panic("Write fault on writeable non-COW ubd device %d",
++			      i);
++
++		/* It should also be an access to the backing file since the 
++		 * COW pages should be mapped in read-write
++		 */
++
++		if(fd == dev->fd)
++			panic("Write fault on a backing page of ubd "
++			      "device %d\n", i);
++
++		/* So, we do the write, copying the backing data to the COW 
++		 * file... 
++		 */
++
++		err = os_seek_file(dev->fd, offset + dev->cow.data_offset);
++		if(err < 0)
++			panic("Couldn't seek to %lld in COW file of ubd "
++			      "device %d, err = %d", 
++			      offset + dev->cow.data_offset, i, -err);
++
++		n = os_write_file(dev->fd, (void *) address, PAGE_SIZE);
++		if(n != PAGE_SIZE)
++			panic("Couldn't copy data to COW file of ubd "
++			      "device %d, err = %d", i, -n);
++
++		/* ... updating the COW bitmap... */
++
++		cowify_bitmap(offset, PAGE_SIZE, NULL, &bitmap_offset, 
++			      dev->cow.bitmap, dev->cow.bitmap_offset, 
++			      new_bitmap, dev->cow.bitmap_len);
++
++		err = os_seek_file(dev->fd, bitmap_offset);
++		if(err < 0)
++			panic("Couldn't seek to %lld in COW file of ubd "
++			      "device %d, err = %d", bitmap_offset, i, -err);
++
++		n = os_write_file(dev->fd, new_bitmap, sizeof(new_bitmap));
++		if(n != sizeof(new_bitmap))
++			panic("Couldn't update bitmap  of ubd device %d, "
++			      "err = %d", i, -n);
++		
++		/* Maybe we can map the COW page in, and maybe we can't.  If
++		 * it is a pre-V3 COW file, we can't, since the alignment will 
++		 * be wrong.  If it is a V3 or later COW file which has been 
++		 * moved to a system with a larger page size, then maybe we 
++		 * can't, depending on the exact location of the page.
++		 */
++
++		offset += dev->cow.data_offset;
++
++		/* Remove the remapping, putting the original anonymous page
++		 * back.  If the COW file can be mapped in, that is done.
++		 * Otherwise, the COW page is read in.
++		 */
++
++		if(!physmem_remove_mapping((void *) address))
++			panic("Address 0x%lx not remapped by ubd device %d", 
++			      address, i);
++		if((offset % UBD_MMAP_BLOCK_SIZE) == 0)
++			physmem_subst_mapping((void *) address, dev->fd, 
++					      offset, 1);
++		else {
++			err = os_seek_file(dev->fd, offset);
++			if(err < 0)
++				panic("Couldn't seek to %lld in COW file of "
++				      "ubd device %d, err = %d", offset, i, 
++				      -err);
++
++			n = os_read_file(dev->fd, (void *) address, PAGE_SIZE);
++			if(n != PAGE_SIZE)
++				panic("Failed to read page from offset %llx of "
++				      "COW file of ubd device %d, err = %d",
++				      offset, i, -n);
++		}
++
++		return(1);
++	}
++
++	/* It's not a write on a ubd device */
++	return(0);
++}
++
++static struct remapper ubd_remapper = {
++	.list	= LIST_HEAD_INIT(ubd_remapper.list),
++	.proc	= ubd_check_remapped,
++};
++
++static int ubd_remapper_setup(void)
++{
++	if(ubd_do_mmap)
++		register_remapper(&ubd_remapper);
++
++	return(0);
++}
++
++__initcall(ubd_remapper_setup);
++
+ /*
+  * Overrides for Emacs so that we follow Linus's tabbing style.
+  * Emacs will notice this stuff at the end of the file and automatically
+diff -Naur a/arch/um/drivers/ubd_user.c b/arch/um/drivers/ubd_user.c
+--- a/arch/um/drivers/ubd_user.c	2004-02-11 12:14:32.000000000 -0500
++++ b/arch/um/drivers/ubd_user.c	2004-02-11 12:26:14.000000000 -0500
+@@ -11,11 +11,8 @@
+ #include <signal.h>
+ #include <string.h>
+ #include <netinet/in.h>
+-#include <sys/stat.h>
+ #include <sys/time.h>
+-#include <sys/fcntl.h>
+ #include <sys/socket.h>
+-#include <string.h>
+ #include <sys/mman.h>
+ #include <sys/param.h>
+ #include "asm/types.h"
+@@ -24,146 +21,30 @@
+ #include "user.h"
+ #include "ubd_user.h"
+ #include "os.h"
++#include "cow.h"
+ 
+ #include <endian.h>
+ #include <byteswap.h>
+-#if __BYTE_ORDER == __BIG_ENDIAN
+-# define ntohll(x) (x)
+-# define htonll(x) (x)
+-#elif __BYTE_ORDER == __LITTLE_ENDIAN
+-# define ntohll(x)  bswap_64(x)
+-# define htonll(x)  bswap_64(x)
+-#else
+-#error "__BYTE_ORDER not defined"
+-#endif
+-
+-#define PATH_LEN_V1 256
+-
+-struct cow_header_v1 {
+-	int magic;
+-	int version;
+-	char backing_file[PATH_LEN_V1];
+-	time_t mtime;
+-	__u64 size;
+-	int sectorsize;
+-};
+-
+-#define PATH_LEN_V2 MAXPATHLEN
+-
+-struct cow_header_v2 {
+-	unsigned long magic;
+-	unsigned long version;
+-	char backing_file[PATH_LEN_V2];
+-	time_t mtime;
+-	__u64 size;
+-	int sectorsize;
+-};
+-
+-union cow_header {
+-	struct cow_header_v1 v1;
+-	struct cow_header_v2 v2;
+-};
+-
+-#define COW_MAGIC 0x4f4f4f4d  /* MOOO */
+-#define COW_VERSION 2
+-
+-static void sizes(__u64 size, int sectorsize, int bitmap_offset, 
+-		  unsigned long *bitmap_len_out, int *data_offset_out)
+-{
+-	*bitmap_len_out = (size + sectorsize - 1) / (8 * sectorsize);
+-
+-	*data_offset_out = bitmap_offset + *bitmap_len_out;
+-	*data_offset_out = (*data_offset_out + sectorsize - 1) / sectorsize;
+-	*data_offset_out *= sectorsize;
+-}
+-
+-static int read_cow_header(int fd, int *magic_out, char **backing_file_out, 
+-			   time_t *mtime_out, __u64 *size_out, 
+-			   int *sectorsize_out, int *bitmap_offset_out)
+-{
+-	union cow_header *header;
+-	char *file;
+-	int err, n;
+-	unsigned long version, magic;
+-
+-	header = um_kmalloc(sizeof(*header));
+-	if(header == NULL){
+-		printk("read_cow_header - Failed to allocate header\n");
+-		return(-ENOMEM);
+-	}
+-	err = -EINVAL;
+-	n = read(fd, header, sizeof(*header));
+-	if(n < offsetof(typeof(header->v1), backing_file)){
+-		printk("read_cow_header - short header\n");
+-		goto out;
+-	}
+-
+-	magic = header->v1.magic;
+-	if(magic == COW_MAGIC) {
+-		version = header->v1.version;
+-	}
+-	else if(magic == ntohl(COW_MAGIC)){
+-		version = ntohl(header->v1.version);
+-	}
+-	else goto out;
+-
+-	*magic_out = COW_MAGIC;
+-
+-	if(version == 1){
+-		if(n < sizeof(header->v1)){
+-			printk("read_cow_header - failed to read V1 header\n");
+-			goto out;
+-		}
+-		*mtime_out = header->v1.mtime;
+-		*size_out = header->v1.size;
+-		*sectorsize_out = header->v1.sectorsize;
+-		*bitmap_offset_out = sizeof(header->v1);
+-		file = header->v1.backing_file;
+-	}
+-	else if(version == 2){
+-		if(n < sizeof(header->v2)){
+-			printk("read_cow_header - failed to read V2 header\n");
+-			goto out;
+-		}
+-		*mtime_out = ntohl(header->v2.mtime);
+-		*size_out = ntohll(header->v2.size);
+-		*sectorsize_out = ntohl(header->v2.sectorsize);
+-		*bitmap_offset_out = sizeof(header->v2);
+-		file = header->v2.backing_file;
+-	}
+-	else {
+-		printk("read_cow_header - invalid COW version\n");
+-		goto out;
+-	}
+-	err = -ENOMEM;
+-	*backing_file_out = uml_strdup(file);
+-	if(*backing_file_out == NULL){
+-		printk("read_cow_header - failed to allocate backing file\n");
+-		goto out;
+-	}
+-	err = 0;
+- out:
+-	kfree(header);
+-	return(err);
+-}
+ 
+ static int same_backing_files(char *from_cmdline, char *from_cow, char *cow)
+ {
+-	struct stat buf1, buf2;
++	struct uml_stat buf1, buf2;
++	int err;
+ 
+ 	if(from_cmdline == NULL) return(1);
+ 	if(!strcmp(from_cmdline, from_cow)) return(1);
+ 
+-	if(stat(from_cmdline, &buf1) < 0){
+-		printk("Couldn't stat '%s', errno = %d\n", from_cmdline, 
+-		       errno);
++	err = os_stat_file(from_cmdline, &buf1);
++	if(err < 0){
++		printk("Couldn't stat '%s', err = %d\n", from_cmdline, -err);
+ 		return(1);
+ 	}
+-	if(stat(from_cow, &buf2) < 0){
+-		printk("Couldn't stat '%s', errno = %d\n", from_cow, errno);
++	err = os_stat_file(from_cow, &buf2);
++	if(err < 0){
++		printk("Couldn't stat '%s', err = %d\n", from_cow, -err);
+ 		return(1);
+ 	}
+-	if((buf1.st_dev == buf2.st_dev) && (buf1.st_ino == buf2.st_ino))
++	if((buf1.ust_dev == buf2.ust_dev) && (buf1.ust_ino == buf2.ust_ino))
+ 		return(1);
+ 
+ 	printk("Backing file mismatch - \"%s\" requested,\n"
+@@ -174,20 +55,21 @@
+ 
+ static int backing_file_mismatch(char *file, __u64 size, time_t mtime)
+ {
+-	struct stat64 buf;
++	unsigned long modtime;
+ 	long long actual;
+ 	int err;
+ 
+-  	if(stat64(file, &buf) < 0){
+-		printk("Failed to stat backing file \"%s\", errno = %d\n",
+-		       file, errno);
+-		return(-errno);
++	err = os_file_modtime(file, &modtime);
++	if(err < 0){
++		printk("Failed to get modification time of backing file "
++		       "\"%s\", err = %d\n", file, -err);
++		return(err);
+ 	}
+ 
+ 	err = os_file_size(file, &actual);
+-	if(err){
++	if(err < 0){
+ 		printk("Failed to get size of backing file \"%s\", "
+-		       "errno = %d\n", file, -err);
++		       "err = %d\n", file, -err);
+ 		return(err);
+ 	}
+ 
+@@ -196,9 +78,9 @@
+ 		       "file\n", size, actual);
+ 		return(-EINVAL);
+ 	}
+-	if(buf.st_mtime != mtime){
++	if(modtime != mtime){
+ 		printk("mtime mismatch (%ld vs %ld) of COW header vs backing "
+-		       "file\n", mtime, buf.st_mtime);
++		       "file\n", mtime, modtime);
+ 		return(-EINVAL);
+ 	}
+ 	return(0);
+@@ -209,124 +91,16 @@
+ 	int err;
+ 
+ 	err = os_seek_file(fd, offset);
+-	if(err != 0) return(-errno);
+-	err = read(fd, buf, len);
+-	if(err < 0) return(-errno);
+-	return(0);
+-}
++	if(err < 0) 
++		return(err);
+ 
+-static int absolutize(char *to, int size, char *from)
+-{
+-	char save_cwd[256], *slash;
+-	int remaining;
++	err = os_read_file(fd, buf, len);
++	if(err < 0) 
++		return(err);
+ 
+-	if(getcwd(save_cwd, sizeof(save_cwd)) == NULL) {
+-		printk("absolutize : unable to get cwd - errno = %d\n", errno);
+-		return(-1);
+-	}
+-	slash = strrchr(from, '/');
+-	if(slash != NULL){
+-		*slash = '\0';
+-		if(chdir(from)){
+-			*slash = '/';
+-			printk("absolutize : Can't cd to '%s' - errno = %d\n",
+-			       from, errno);
+-			return(-1);
+-		}
+-		*slash = '/';
+-		if(getcwd(to, size) == NULL){
+-			printk("absolutize : unable to get cwd of '%s' - "
+-			       "errno = %d\n", from, errno);
+-			return(-1);
+-		}
+-		remaining = size - strlen(to);
+-		if(strlen(slash) + 1 > remaining){
+-			printk("absolutize : unable to fit '%s' into %d "
+-			       "chars\n", from, size);
+-			return(-1);
+-		}
+-		strcat(to, slash);
+-	}
+-	else {
+-		if(strlen(save_cwd) + 1 + strlen(from) + 1 > size){
+-			printk("absolutize : unable to fit '%s' into %d "
+-			       "chars\n", from, size);
+-			return(-1);
+-		}
+-		strcpy(to, save_cwd);
+-		strcat(to, "/");
+-		strcat(to, from);
+-	}
+-	chdir(save_cwd);
+ 	return(0);
+ }
+ 
+-static int write_cow_header(char *cow_file, int fd, char *backing_file, 
+-			    int sectorsize, long long *size)
+-{
+-        struct cow_header_v2 *header;
+-	struct stat64 buf;
+-	int err;
+-
+-	err = os_seek_file(fd, 0);
+-	if(err != 0){
+-		printk("write_cow_header - lseek failed, errno = %d\n", errno);
+-		return(-errno);
+-	}
+-
+-	err = -ENOMEM;
+-	header = um_kmalloc(sizeof(*header));
+-	if(header == NULL){
+-		printk("Failed to allocate COW V2 header\n");
+-		goto out;
+-	}
+-	header->magic = htonl(COW_MAGIC);
+-	header->version = htonl(COW_VERSION);
+-
+-	err = -EINVAL;
+-	if(strlen(backing_file) > sizeof(header->backing_file) - 1){
+-		printk("Backing file name \"%s\" is too long - names are "
+-		       "limited to %d characters\n", backing_file, 
+-		       sizeof(header->backing_file) - 1);
+-		goto out_free;
+-	}
+-
+-	if(absolutize(header->backing_file, sizeof(header->backing_file), 
+-		      backing_file))
+-		goto out_free;
+-
+-	err = stat64(header->backing_file, &buf);
+-	if(err < 0){
+-		printk("Stat of backing file '%s' failed, errno = %d\n",
+-		       header->backing_file, errno);
+-		err = -errno;
+-		goto out_free;
+-	}
+-
+-	err = os_file_size(header->backing_file, size);
+-	if(err){
+-		printk("Couldn't get size of backing file '%s', errno = %d\n",
+-		       header->backing_file, -*size);
+-		goto out_free;
+-	}
+-
+-	header->mtime = htonl(buf.st_mtime);
+-	header->size = htonll(*size);
+-	header->sectorsize = htonl(sectorsize);
+-
+-	err = write(fd, header, sizeof(*header));
+-	if(err != sizeof(*header)){
+-		printk("Write of header to new COW file '%s' failed, "
+-		       "errno = %d\n", cow_file, errno);
+-		goto out_free;
+-	}
+-	err = 0;
+- out_free:
+-	kfree(header);
+- out:
+-	return(err);
+-}
+-
+ int open_ubd_file(char *file, struct openflags *openflags, 
+ 		  char **backing_file_out, int *bitmap_offset_out, 
+ 		  unsigned long *bitmap_len_out, int *data_offset_out, 
+@@ -334,26 +108,36 @@
+ {
+ 	time_t mtime;
+ 	__u64 size;
++	__u32 version, align;
+ 	char *backing_file;
+-        int fd, err, sectorsize, magic, same, mode = 0644;
++	int fd, err, sectorsize, same, mode = 0644;
+ 
+-        if((fd = os_open_file(file, *openflags, mode)) < 0){
++	fd = os_open_file(file, *openflags, mode);
++	if(fd < 0){
+ 		if((fd == -ENOENT) && (create_cow_out != NULL))
+ 			*create_cow_out = 1;
+                 if(!openflags->w ||
+                    ((errno != EROFS) && (errno != EACCES))) return(-errno);
+ 		openflags->w = 0;
+-                if((fd = os_open_file(file, *openflags, mode)) < 0) 
++		fd = os_open_file(file, *openflags, mode); 
++		if(fd < 0) 
+ 			return(fd);
+         }
++
++	err = os_lock_file(fd, openflags->w);
++	if(err < 0){
++		printk("Failed to lock '%s', err = %d\n", file, -err);
++		goto out_close;
++	}
++	
+ 	if(backing_file_out == NULL) return(fd);
+ 
+-	err = read_cow_header(fd, &magic, &backing_file, &mtime, &size, 
+-			      &sectorsize, bitmap_offset_out);
++	err = read_cow_header(file_reader, &fd, &version, &backing_file, &mtime,
++			      &size, &sectorsize, &align, bitmap_offset_out);
+ 	if(err && (*backing_file_out != NULL)){
+ 		printk("Failed to read COW header from COW file \"%s\", "
+-		       "errno = %d\n", file, err);
+-		goto error;
++		       "errno = %d\n", file, -err);
++		goto out_close;
+ 	}
+ 	if(err) return(fd);
+ 
+@@ -363,36 +147,33 @@
+ 
+ 	if(!same && !backing_file_mismatch(*backing_file_out, size, mtime)){
+ 		printk("Switching backing file to '%s'\n", *backing_file_out);
+-		err = write_cow_header(file, fd, *backing_file_out, 
+-				       sectorsize, &size);
++		err = write_cow_header(file, fd, *backing_file_out,
++				       sectorsize, align, &size);
+ 		if(err){
+-			printk("Switch failed, errno = %d\n", err);
++			printk("Switch failed, errno = %d\n", -err);
+ 			return(err);
+ 		}
+ 	}
+ 	else {
+ 		*backing_file_out = backing_file;
+ 		err = backing_file_mismatch(*backing_file_out, size, mtime);
+-		if(err) goto error;
++		if(err) goto out_close;
+ 	}
+ 
+-	sizes(size, sectorsize, *bitmap_offset_out, bitmap_len_out, 
+-	      data_offset_out);
++	cow_sizes(version, size, sectorsize, align, *bitmap_offset_out, 
++		  bitmap_len_out, data_offset_out);
+ 
+         return(fd);
+- error:
+-	close(fd);
++ out_close:
++	os_close_file(fd);
+ 	return(err);
+ }
+ 
+ int create_cow_file(char *cow_file, char *backing_file, struct openflags flags,
+-		    int sectorsize, int *bitmap_offset_out, 
++		    int sectorsize, int alignment, int *bitmap_offset_out, 
+ 		    unsigned long *bitmap_len_out, int *data_offset_out)
+ {
+-	__u64 blocks;
+-	long zero;
+-	int err, fd, i;
+-	long long size;
++	int err, fd;
+ 
+ 	flags.c = 1;
+ 	fd = open_ubd_file(cow_file, &flags, NULL, NULL, NULL, NULL, NULL);
+@@ -403,57 +184,49 @@
+ 		goto out;
+ 	}
+ 
+-	err = write_cow_header(cow_file, fd, backing_file, sectorsize, &size);
+-	if(err) goto out_close;
+-
+-	blocks = (size + sectorsize - 1) / sectorsize;
+-	blocks = (blocks + sizeof(long) * 8 - 1) / (sizeof(long) * 8);
+-	zero = 0;
+-	for(i = 0; i < blocks; i++){
+-		err = write(fd, &zero, sizeof(zero));
+-		if(err != sizeof(zero)){
+-			printk("Write of bitmap to new COW file '%s' failed, "
+-			       "errno = %d\n", cow_file, errno);
+-			goto out_close;
+-		}
+-	}
+-
+-	sizes(size, sectorsize, sizeof(struct cow_header_v2), 
+-	      bitmap_len_out, data_offset_out);
+-	*bitmap_offset_out = sizeof(struct cow_header_v2);
+-
+-	return(fd);
+-
+- out_close:
+-	close(fd);
++	err = init_cow_file(fd, cow_file, backing_file, sectorsize, alignment,
++			    bitmap_offset_out, bitmap_len_out, 
++			    data_offset_out);
++	if(!err)
++		return(fd);
++	os_close_file(fd);
+  out:
+ 	return(err);
+ }
+ 
++/* XXX Just trivial wrappers around os_read_file and os_write_file */
+ int read_ubd_fs(int fd, void *buffer, int len)
+ {
+-	int n;
+-
+-	n = read(fd, buffer, len);
+-	if(n < 0) return(-errno);
+-	else return(n);
++	return(os_read_file(fd, buffer, len));
+ }
+ 
+ int write_ubd_fs(int fd, char *buffer, int len)
+ {
+-	int n;
+-
+-	n = write(fd, buffer, len);
+-	if(n < 0) return(-errno);
+-	else return(n);
++	return(os_write_file(fd, buffer, len));
+ }
+ 
+-int ubd_is_dir(char *file)
++static int update_bitmap(struct io_thread_req *req)
+ {
+-	struct stat64 buf;
++	int n;
++
++	if(req->cow_offset == -1)
++		return(0);
++
++	n = os_seek_file(req->fds[1], req->cow_offset);
++	if(n < 0){
++		printk("do_io - bitmap lseek failed : err = %d\n", -n);
++		return(1);
++	}
++
++	n = os_write_file(req->fds[1], &req->bitmap_words,
++		          sizeof(req->bitmap_words));
++	if(n != sizeof(req->bitmap_words)){
++		printk("do_io - bitmap update failed, err = %d fd = %d\n", -n,
++		       req->fds[1]);
++		return(1);
++	}
+ 
+-	if(stat64(file, &buf) < 0) return(0);
+-	return(S_ISDIR(buf.st_mode));
++	return(0);
+ }
+ 
+ void do_io(struct io_thread_req *req)
+@@ -461,8 +234,18 @@
+ 	char *buf;
+ 	unsigned long len;
+ 	int n, nsectors, start, end, bit;
++	int err;
+ 	__u64 off;
+ 
++	if(req->op == UBD_MMAP){
++		/* Touch the page to force the host to do any necessary IO to 
++		 * get it into memory 
++		 */
++		n = *((volatile int *) req->buffer);
++		req->error = update_bitmap(req);
++		return;
++	}
++
+ 	nsectors = req->length / req->sectorsize;
+ 	start = 0;
+ 	do {
+@@ -473,15 +256,14 @@
+ 				    &req->sector_mask) == bit))
+ 			end++;
+ 
+-		if(end != nsectors)
+-			printk("end != nsectors\n");
+ 		off = req->offset + req->offsets[bit] + 
+ 			start * req->sectorsize;
+ 		len = (end - start) * req->sectorsize;
+ 		buf = &req->buffer[start * req->sectorsize];
+ 
+-		if(os_seek_file(req->fds[bit], off) != 0){
+-			printk("do_io - lseek failed : errno = %d\n", errno);
++		err = os_seek_file(req->fds[bit], off);
++		if(err < 0){
++			printk("do_io - lseek failed : err = %d\n", -err);
+ 			req->error = 1;
+ 			return;
+ 		}
+@@ -490,11 +272,10 @@
+ 			do {
+ 				buf = &buf[n];
+ 				len -= n;
+-				n = read(req->fds[bit], buf, len);
++				n = os_read_file(req->fds[bit], buf, len);
+ 				if (n < 0) {
+-					printk("do_io - read returned %d : "
+-					       "errno = %d fd = %d\n", n,
+-					       errno, req->fds[bit]);
++					printk("do_io - read failed, err = %d "
++					       "fd = %d\n", -n, req->fds[bit]);
+ 					req->error = 1;
+ 					return;
+ 				}
+@@ -502,11 +283,10 @@
+ 			if (n < len) memset(&buf[n], 0, len - n);
+ 		}
+ 		else {
+-			n = write(req->fds[bit], buf, len);
++			n = os_write_file(req->fds[bit], buf, len);
+ 			if(n != len){
+-				printk("do_io - write returned %d : "
+-				       "errno = %d fd = %d\n", n, 
+-				       errno, req->fds[bit]);
++				printk("do_io - write failed err = %d "
++				       "fd = %d\n", -n, req->fds[bit]);
+ 				req->error = 1;
+ 				return;
+ 			}
+@@ -515,24 +295,7 @@
+ 		start = end;
+ 	} while(start < nsectors);
+ 
+-	if(req->cow_offset != -1){
+-		if(os_seek_file(req->fds[1], req->cow_offset) != 0){
+-			printk("do_io - bitmap lseek failed : errno = %d\n",
+-			       errno);
+-			req->error = 1;
+-			return;
+-		}
+-		n = write(req->fds[1], &req->bitmap_words, 
+-			  sizeof(req->bitmap_words));
+-		if(n != sizeof(req->bitmap_words)){
+-			printk("do_io - bitmap update returned %d : "
+-			       "errno = %d fd = %d\n", n, errno, req->fds[1]);
+-			req->error = 1;
+-			return;
+-		}
+-	}
+-	req->error = 0;
+-	return;
++	req->error = update_bitmap(req);
+ }
+ 
+ /* Changed in start_io_thread, which is serialized by being called only
+@@ -550,19 +313,23 @@
+ 
+ 	signal(SIGWINCH, SIG_IGN);
+ 	while(1){
+-		n = read(kernel_fd, &req, sizeof(req));
+-		if(n < 0) printk("io_thread - read returned %d, errno = %d\n",
+-				 n, errno);
+-		else if(n < sizeof(req)){
+-			printk("io_thread - short read : length = %d\n", n);
++		n = os_read_file(kernel_fd, &req, sizeof(req));
++		if(n != sizeof(req)){
++			if(n < 0)
++				printk("io_thread - read failed, fd = %d, "
++				       "err = %d\n", kernel_fd, -n);
++			else {
++				printk("io_thread - short read, fd = %d, "
++				       "length = %d\n", kernel_fd, n);
++			}
+ 			continue;
+ 		}
+ 		io_count++;
+ 		do_io(&req);
+-		n = write(kernel_fd, &req, sizeof(req));
++		n = os_write_file(kernel_fd, &req, sizeof(req));
+ 		if(n != sizeof(req))
+-			printk("io_thread - write failed, errno = %d\n",
+-			       errno);
++			printk("io_thread - write failed, fd = %d, err = %d\n",
++			       kernel_fd, -n);
+ 	}
+ }
+ 
+@@ -571,10 +338,11 @@
+ 	int pid, fds[2], err;
+ 
+ 	err = os_pipe(fds, 1, 1);
+-	if(err){
+-		printk("start_io_thread - os_pipe failed, errno = %d\n", -err);
+-		return(-1);
++	if(err < 0){
++		printk("start_io_thread - os_pipe failed, err = %d\n", -err);
++		goto out;
+ 	}
++
+ 	kernel_fd = fds[0];
+ 	*fd_out = fds[1];
+ 
+@@ -582,32 +350,19 @@
+ 		    NULL);
+ 	if(pid < 0){
+ 		printk("start_io_thread - clone failed : errno = %d\n", errno);
+-		return(-errno);
++		goto out_close;
+ 	}
+-	return(pid);
+-}
+-
+-#ifdef notdef
+-int start_io_thread(unsigned long sp, int *fd_out)
+-{
+-	int pid;
+ 
+-	if((kernel_fd = get_pty()) < 0) return(-1);
+-	raw(kernel_fd, 0);
+-	if((*fd_out = open(ptsname(kernel_fd), O_RDWR)) < 0){
+-		printk("Couldn't open tty for IO\n");
+-		return(-1);
+-	}
+-
+-	pid = clone(io_thread, (void *) sp, CLONE_FILES | CLONE_VM | SIGCHLD,
+-		    NULL);
+-	if(pid < 0){
+-		printk("start_io_thread - clone failed : errno = %d\n", errno);
+-		return(-errno);
+-	}
+ 	return(pid);
++
++ out_close:
++	os_close_file(fds[0]);
++	os_close_file(fds[1]);
++	kernel_fd = -1;
++	*fd_out = -1;
++ out:
++	return(err);
+ }
+-#endif
+ 
+ /*
+  * Overrides for Emacs so that we follow Linus's tabbing style.
+diff -Naur a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c
+--- a/arch/um/drivers/xterm.c	2004-02-11 12:14:17.000000000 -0500
++++ b/arch/um/drivers/xterm.c	2004-02-11 12:26:00.000000000 -0500
+@@ -8,7 +8,6 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <errno.h>
+-#include <fcntl.h>
+ #include <termios.h>
+ #include <signal.h>
+ #include <sched.h>
+@@ -36,7 +35,8 @@
+ {
+ 	struct xterm_chan *data;
+ 
+-	if((data = malloc(sizeof(*data))) == NULL) return(NULL);
++	data = malloc(sizeof(*data));
++	if(data == NULL) return(NULL);
+ 	*data = ((struct xterm_chan) { .pid 		= -1, 
+ 				       .helper_pid 	= -1,
+ 				       .device 		= device, 
+@@ -93,7 +93,7 @@
+ 			 "/usr/lib/uml/port-helper", "-uml-socket",
+ 			 file, NULL };
+ 
+-	if(access(argv[4], X_OK))
++	if(os_access(argv[4], OS_ACC_X_OK) < 0)
+ 		argv[4] = "port-helper";
+ 
+ 	fd = mkstemp(file);
+@@ -106,13 +106,13 @@
+ 		printk("xterm_open : unlink failed, errno = %d\n", errno);
+ 		return(-errno);
+ 	}
+-	close(fd);
++	os_close_file(fd);
+ 
+-	fd = create_unix_socket(file, sizeof(file));
++	fd = os_create_unix_socket(file, sizeof(file), 1);
+ 	if(fd < 0){
+ 		printk("xterm_open : create_unix_socket failed, errno = %d\n", 
+ 		       -fd);
+-		return(-fd);
++		return(fd);
+ 	}
+ 
+ 	sprintf(title, data->title, data->device);
+@@ -128,15 +128,16 @@
+ 	if(data->direct_rcv)
+ 		new = os_rcv_fd(fd, &data->helper_pid);
+ 	else {
+-		if((err = os_set_fd_block(fd, 0)) != 0){
++		err = os_set_fd_block(fd, 0);
++		if(err < 0){
+ 			printk("xterm_open : failed to set descriptor "
+-			       "non-blocking, errno = %d\n", err);
++			       "non-blocking, err = %d\n", -err);
+ 			return(err);
+ 		}
+ 		new = xterm_fd(fd, &data->helper_pid);
+ 	}
+ 	if(new < 0){
+-		printk("xterm_open : os_rcv_fd failed, errno = %d\n", -new);
++		printk("xterm_open : os_rcv_fd failed, err = %d\n", -new);
+ 		goto out;
+ 	}
+ 
+@@ -160,7 +161,7 @@
+ 	if(data->helper_pid != -1) 
+ 		os_kill_process(data->helper_pid, 0);
+ 	data->helper_pid = -1;
+-	close(fd);
++	os_close_file(fd);
+ }
+ 
+ void xterm_free(void *d)
+diff -Naur a/arch/um/drivers/xterm_kern.c b/arch/um/drivers/xterm_kern.c
+--- a/arch/um/drivers/xterm_kern.c	2004-02-11 12:16:10.000000000 -0500
++++ b/arch/um/drivers/xterm_kern.c	2004-02-11 12:28:20.000000000 -0500
+@@ -5,9 +5,12 @@
+ 
+ #include "linux/errno.h"
+ #include "linux/slab.h"
++#include "linux/signal.h"
++#include "linux/interrupt.h"
+ #include "asm/semaphore.h"
+ #include "asm/irq.h"
+ #include "irq_user.h"
++#include "irq_kern.h"
+ #include "kern_util.h"
+ #include "os.h"
+ #include "xterm.h"
+@@ -19,17 +22,18 @@
+ 	int new_fd;
+ };
+ 
+-static void xterm_interrupt(int irq, void *data, struct pt_regs *regs)
++static irqreturn_t xterm_interrupt(int irq, void *data, struct pt_regs *regs)
+ {
+ 	struct xterm_wait *xterm = data;
+ 	int fd;
+ 
+ 	fd = os_rcv_fd(xterm->fd, &xterm->pid);
+ 	if(fd == -EAGAIN)
+-		return;
++		return(IRQ_NONE);
+ 
+ 	xterm->new_fd = fd;
+ 	up(&xterm->sem);
++	return(IRQ_HANDLED);
+ }
+ 
+ int xterm_fd(int socket, int *pid_out)
+@@ -54,7 +58,8 @@
+ 	if(err){
+ 		printk(KERN_ERR "xterm_fd : failed to get IRQ for xterm, "
+ 		       "err = %d\n",  err);
+-		return(err);
++		ret = err;
++		goto out;
+ 	}
+ 	down(&data->sem);
+ 
+@@ -62,6 +67,7 @@
+ 
+ 	ret = data->new_fd;
+ 	*pid_out = data->pid;
++ out:
+ 	kfree(data);
+ 
+ 	return(ret);
+diff -Naur a/arch/um/dyn.lds.S b/arch/um/dyn.lds.S
+--- a/arch/um/dyn.lds.S	2004-02-11 12:15:45.000000000 -0500
++++ b/arch/um/dyn.lds.S	2004-02-11 12:27:35.000000000 -0500
+@@ -10,12 +10,15 @@
+ {
+   . = START + SIZEOF_HEADERS;
+   .interp         : { *(.interp) }
+-  . = ALIGN(4096);
+   __binary_start = .;
+   . = ALIGN(4096);		/* Init code and data */
+   _stext = .;
+   __init_begin = .;
+-  .text.init : { *(.text.init) }
++  .init.text : { 
++	_sinittext = .;
++	*(.init.text)
++	_einittext = .;
++  }
+ 
+   . = ALIGN(4096);
+ 
+@@ -67,7 +70,7 @@
+ 
+   #include "asm/common.lds.S"
+ 
+-  .data.init : { *(.data.init) }
++  init.data : { *(.init.data) }
+ 
+   /* Ensure the __preinit_array_start label is properly aligned.  We
+      could instead move the label definition inside the section, but
+diff -Naur a/arch/um/include/2_5compat.h b/arch/um/include/2_5compat.h
+--- a/arch/um/include/2_5compat.h	2004-02-11 12:15:23.000000000 -0500
++++ b/arch/um/include/2_5compat.h	2004-02-11 12:27:10.000000000 -0500
+@@ -6,20 +6,6 @@
+ #ifndef __2_5_COMPAT_H__
+ #define __2_5_COMPAT_H__
+ 
+-#include "linux/version.h"
+-
+-#define INIT_CONSOLE(dev_name, write_proc, device_proc, setup_proc, f) { \
+-	name :		dev_name, \
+-	write :		write_proc, \
+-	read :		NULL, \
+-	device :	device_proc, \
+-	setup :		setup_proc, \
+-	flags :		f, \
+-	index :		-1, \
+-	cflag :		0, \
+-	next :		NULL \
+-}
+-
+ #define INIT_HARDSECT(arr, maj, sizes)
+ 
+ #define SET_PRI(task) do ; while(0)
+diff -Naur a/arch/um/include/irq_kern.h b/arch/um/include/irq_kern.h
+--- a/arch/um/include/irq_kern.h	1969-12-31 19:00:00.000000000 -0500
++++ b/arch/um/include/irq_kern.h	2004-02-11 12:27:15.000000000 -0500
+@@ -0,0 +1,28 @@
++/* 
++ * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
++ * Licensed under the GPL
++ */
++
++#ifndef __IRQ_KERN_H__
++#define __IRQ_KERN_H__
++
++#include "linux/interrupt.h"
++
++extern int um_request_irq(unsigned int irq, int fd, int type,
++			  irqreturn_t (*handler)(int, void *, 
++						 struct pt_regs *),
++			  unsigned long irqflags,  const char * devname,
++			  void *dev_id);
++
++#endif
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/arch/um/include/kern_util.h b/arch/um/include/kern_util.h
+--- a/arch/um/include/kern_util.h	2004-02-11 12:15:00.000000000 -0500
++++ b/arch/um/include/kern_util.h	2004-02-11 12:26:51.000000000 -0500
+@@ -63,10 +63,9 @@
+ extern void *syscall_sp(void *t);
+ extern void syscall_trace(void);
+ extern int hz(void);
+-extern void idle_timer(void);
++extern void uml_idle_timer(void);
+ extern unsigned int do_IRQ(int irq, union uml_pt_regs *regs);
+ extern int external_pid(void *t);
+-extern int pid_to_processor_id(int pid);
+ extern void boot_timer_handler(int sig);
+ extern void interrupt_end(void);
+ extern void initial_thread_cb(void (*proc)(void *), void *arg);
+@@ -90,9 +89,7 @@
+ extern char *uml_strdup(char *string);
+ extern void unprotect_kernel_mem(void);
+ extern void protect_kernel_mem(void);
+-extern void set_kmem_end(unsigned long);
+ extern void uml_cleanup(void);
+-extern int pid_to_processor_id(int pid);
+ extern void set_current(void *t);
+ extern void lock_signalled_task(void *t);
+ extern void IPI_handler(int cpu);
+@@ -101,7 +98,9 @@
+ extern int clear_user_proc(void *buf, int size);
+ extern int copy_to_user_proc(void *to, void *from, int size);
+ extern int copy_from_user_proc(void *to, void *from, int size);
++extern int strlen_user_proc(char *str);
+ extern void bus_handler(int sig, union uml_pt_regs *regs);
++extern void winch(int sig, union uml_pt_regs *regs);
+ extern long execute_syscall(void *r);
+ extern int smp_sigio_handler(void);
+ extern void *get_current(void);
+@@ -112,6 +111,8 @@
+ extern void free_irq(unsigned int, void *);
+ extern int um_in_interrupt(void);
+ extern int cpu(void);
++extern unsigned long long time_stamp(void);
++
+ #endif
+ 
+ /*
+diff -Naur a/arch/um/include/line.h b/arch/um/include/line.h
+--- a/arch/um/include/line.h	2004-02-11 12:16:27.000000000 -0500
++++ b/arch/um/include/line.h	2004-02-11 12:28:24.000000000 -0500
+@@ -9,12 +9,14 @@
+ #include "linux/list.h"
+ #include "linux/workqueue.h"
+ #include "linux/tty.h"
++#include "linux/interrupt.h"
+ #include "asm/semaphore.h"
+ #include "chan_user.h"
+ #include "mconsole_kern.h"
+ 
+ struct line_driver {
+ 	char *name;
++	char *device_name;
+ 	char *devfs_name;
+ 	short major;
+ 	short minor_start;
+@@ -67,8 +69,6 @@
+ 
+ #define LINES_INIT(n) {  num :		n }
+ 
+-extern void line_interrupt(int irq, void *data, struct pt_regs *unused);
+-extern void line_write_interrupt(int irq, void *data, struct pt_regs *unused);
+ extern void line_close(struct line *lines, struct tty_struct *tty);
+ extern int line_open(struct line *lines, struct tty_struct *tty, 
+ 		     struct chan_opts *opts);
+diff -Naur a/arch/um/include/mconsole.h b/arch/um/include/mconsole.h
+--- a/arch/um/include/mconsole.h	2004-02-11 12:15:15.000000000 -0500
++++ b/arch/um/include/mconsole.h	2004-02-11 12:27:02.000000000 -0500
+@@ -41,11 +41,13 @@
+ 
+ struct mc_request;
+ 
++enum mc_context { MCONSOLE_INTR, MCONSOLE_PROC };
++
+ struct mconsole_command
+ {
+ 	char *command;
+ 	void (*handler)(struct mc_request *req);
+-	int as_interrupt;
++	enum mc_context context;
+ };
+ 
+ struct mc_request
+@@ -77,6 +79,8 @@
+ extern void mconsole_cad(struct mc_request *req);
+ extern void mconsole_stop(struct mc_request *req);
+ extern void mconsole_go(struct mc_request *req);
++extern void mconsole_log(struct mc_request *req);
++extern void mconsole_proc(struct mc_request *req);
+ 
+ extern int mconsole_get_request(int fd, struct mc_request *req);
+ extern int mconsole_notify(char *sock_name, int type, const void *data, 
+diff -Naur a/arch/um/include/mem.h b/arch/um/include/mem.h
+--- a/arch/um/include/mem.h	2004-02-11 12:17:08.000000000 -0500
++++ b/arch/um/include/mem.h	2004-02-11 12:29:12.000000000 -0500
+@@ -1,19 +1,18 @@
+ /* 
+- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2002, 2003 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+ #ifndef __MEM_H__
+ #define __MEM_H__
+ 
+-struct vm_reserved {
+-	struct list_head list;
+-	unsigned long start;
+-	unsigned long end;
+-};
++#include "linux/types.h"
+ 
+-extern void set_usable_vm(unsigned long start, unsigned long end);
+-extern void set_kmem_end(unsigned long new);
++extern int phys_mapping(unsigned long phys, __u64 *offset_out);
++extern int physmem_subst_mapping(void *virt, int fd, __u64 offset, int w);
++extern int is_remapped(void *virt);
++extern int physmem_remove_mapping(void *virt);
++extern void physmem_forget_descriptor(int fd);
+ 
+ #endif
+ 
+diff -Naur a/arch/um/include/mem_kern.h b/arch/um/include/mem_kern.h
+--- a/arch/um/include/mem_kern.h	1969-12-31 19:00:00.000000000 -0500
++++ b/arch/um/include/mem_kern.h	2004-02-11 12:27:40.000000000 -0500
+@@ -0,0 +1,30 @@
++/* 
++ * Copyright (C) 2003 Jeff Dike (jdike@addtoit.com)
++ * Licensed under the GPL
++ */
++
++#ifndef __MEM_KERN_H__
++#define __MEM_KERN_H__
++
++#include "linux/list.h"
++#include "linux/types.h"
++
++struct remapper {
++	struct list_head list;
++	int (*proc)(int, unsigned long, int, __u64);
++};
++
++extern void register_remapper(struct remapper *info);
++
++#endif
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/arch/um/include/mem_user.h b/arch/um/include/mem_user.h
+--- a/arch/um/include/mem_user.h	2004-02-11 12:16:03.000000000 -0500
++++ b/arch/um/include/mem_user.h	2004-02-11 12:27:57.000000000 -0500
+@@ -32,43 +32,38 @@
+ #ifndef _MEM_USER_H
+ #define _MEM_USER_H
+ 
+-struct mem_region {
++struct iomem_region {
++	struct iomem_region *next;
+ 	char *driver;
+-	unsigned long start_pfn;
+-	unsigned long start;
+-	unsigned long len;
+-	void *mem_map;
+ 	int fd;
++	int size;
++	unsigned long phys;
++	unsigned long virt;
+ };
+ 
+-extern struct mem_region *regions[];
+-extern struct mem_region physmem_region;
++extern struct iomem_region *iomem_regions;
++extern int iomem_size;
+ 
+ #define ROUND_4M(n) ((((unsigned long) (n)) + (1 << 22)) & ~((1 << 22) - 1))
+ 
+ extern unsigned long host_task_size;
+ extern unsigned long task_size;
+ 
++extern void check_devanon(void);
+ extern int init_mem_user(void);
+ extern int create_mem_file(unsigned long len);
+-extern void setup_range(int fd, char *driver, unsigned long start,
+-			unsigned long pfn, unsigned long total, int need_vm, 
+-			struct mem_region *region, void *reserved);
+ extern void setup_memory(void *entry);
+ extern unsigned long find_iomem(char *driver, unsigned long *len_out);
+-extern int init_maps(struct mem_region *region);
+-extern int nregions(void);
+-extern int reserve_vm(unsigned long start, unsigned long end, void *e);
++extern int init_maps(unsigned long physmem, unsigned long iomem, 
++		     unsigned long highmem);
+ extern unsigned long get_vm(unsigned long len);
+ extern void setup_physmem(unsigned long start, unsigned long usable,
+-			  unsigned long len);
+-extern int setup_region(struct mem_region *region, void *entry);
++			  unsigned long len, unsigned long highmem);
+ extern void add_iomem(char *name, int fd, unsigned long size);
+-extern struct mem_region *phys_region(unsigned long phys);
+ extern unsigned long phys_offset(unsigned long phys);
+ extern void unmap_physmem(void);
+-extern int map_memory(unsigned long virt, unsigned long phys, 
+-		      unsigned long len, int r, int w, int x);
++extern void map_memory(unsigned long virt, unsigned long phys, 
++		       unsigned long len, int r, int w, int x);
+ extern int protect_memory(unsigned long addr, unsigned long len, 
+ 			  int r, int w, int x, int must_succeed);
+ extern unsigned long get_kmem_end(void);
+diff -Naur a/arch/um/include/os.h b/arch/um/include/os.h
+--- a/arch/um/include/os.h	2004-02-11 12:14:31.000000000 -0500
++++ b/arch/um/include/os.h	2004-02-11 12:26:12.000000000 -0500
+@@ -17,6 +17,32 @@
+ #define OS_TYPE_FIFO 6
+ #define OS_TYPE_SOCK 7
+ 
++/* os_access() flags */
++#define OS_ACC_F_OK    0       /* Test for existence.  */
++#define OS_ACC_X_OK    1       /* Test for execute permission.  */
++#define OS_ACC_W_OK    2       /* Test for write permission.  */
++#define OS_ACC_R_OK    4       /* Test for read permission.  */
++#define OS_ACC_RW_OK   (OS_ACC_W_OK | OS_ACC_R_OK) /* Test for RW permission */
++
++/*
++ * types taken from stat_file() in hostfs_user.c
++ * (if they are wrong here, they are wrong there...).
++ */
++struct uml_stat {
++	int                ust_dev;        /* device */
++	unsigned long long ust_ino;        /* inode */
++	int                ust_mode;       /* protection */
++	int                ust_nlink;      /* number of hard links */
++	int                ust_uid;        /* user ID of owner */
++	int                ust_gid;        /* group ID of owner */
++	unsigned long long ust_size;       /* total size, in bytes */
++	int                ust_blksize;    /* blocksize for filesystem I/O */
++	unsigned long long ust_blocks;     /* number of blocks allocated */
++	unsigned long      ust_atime;      /* time of last access */
++	unsigned long      ust_mtime;      /* time of last modification */
++	unsigned long      ust_ctime;      /* time of last change */
++};
++
+ struct openflags {
+ 	unsigned int r : 1;
+ 	unsigned int w : 1;
+@@ -84,29 +110,47 @@
+ 	flags.e = 1; 
+ 	return(flags); 
+ }
+- 
++
+ static inline struct openflags of_cloexec(struct openflags flags)
+ { 
+ 	flags.cl = 1; 
+ 	return(flags); 
+ }
+   
++extern int os_stat_file(const char *file_name, struct uml_stat *buf);
++extern int os_stat_fd(const int fd, struct uml_stat *buf);
++extern int os_access(const char *file, int mode);
++extern void os_print_error(int error, const char* str);
++extern int os_get_exec_close(int fd, int *close_on_exec);
++extern int os_set_exec_close(int fd, int close_on_exec);
++extern int os_ioctl_generic(int fd, unsigned int cmd, unsigned long arg);
++extern int os_window_size(int fd, int *rows, int *cols);
++extern int os_new_tty_pgrp(int fd, int pid);
++extern int os_get_ifname(int fd, char *namebuf);
++extern int os_set_slip(int fd);
++extern int os_set_owner(int fd, int pid);
++extern int os_sigio_async(int master, int slave);
++extern int os_mode_fd(int fd, int mode);
++
+ extern int os_seek_file(int fd, __u64 offset);
+ extern int os_open_file(char *file, struct openflags flags, int mode);
+ extern int os_read_file(int fd, void *buf, int len);
+-extern int os_write_file(int fd, void *buf, int count);
++extern int os_write_file(int fd, const void *buf, int count);
+ extern int os_file_size(char *file, long long *size_out);
++extern int os_file_modtime(char *file, unsigned long *modtime);
+ extern int os_pipe(int *fd, int stream, int close_on_exec);
+ extern int os_set_fd_async(int fd, int owner);
+ extern int os_set_fd_block(int fd, int blocking);
+ extern int os_accept_connection(int fd);
++extern int os_create_unix_socket(char *file, int len, int close_on_exec);
+ extern int os_shutdown_socket(int fd, int r, int w);
+ extern void os_close_file(int fd);
+ extern int os_rcv_fd(int fd, int *helper_pid_out);
+-extern int create_unix_socket(char *file, int len);
++extern int create_unix_socket(char *file, int len, int close_on_exec);
+ extern int os_connect_socket(char *name);
+ extern int os_file_type(char *file);
+ extern int os_file_mode(char *file, struct openflags *mode_out);
++extern int os_lock_file(int fd, int excl);
+ 
+ extern unsigned long os_process_pc(int pid);
+ extern int os_process_parent(int pid);
+@@ -115,11 +159,12 @@
+ extern void os_usr1_process(int pid);
+ extern int os_getpid(void);
+ 
+-extern int os_map_memory(void *virt, int fd, unsigned long off, 
++extern int os_map_memory(void *virt, int fd, unsigned long long off, 
+ 			 unsigned long len, int r, int w, int x);
+ extern int os_protect_memory(void *addr, unsigned long len, 
+ 			     int r, int w, int x);
+ extern int os_unmap_memory(void *addr, int len);
++extern void os_flush_stdout(void);
+ 
+ #endif
+ 
+diff -Naur a/arch/um/include/skas_ptrace.h b/arch/um/include/skas_ptrace.h
+--- a/arch/um/include/skas_ptrace.h	2004-02-11 12:16:37.000000000 -0500
++++ b/arch/um/include/skas_ptrace.h	2004-02-11 12:28:37.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* 
+- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
+  * Licensed under the GPL
+  */
+ 
+diff -Naur a/arch/um/include/sysdep-i386/frame_user.h b/arch/um/include/sysdep-i386/frame_user.h
+--- a/arch/um/include/sysdep-i386/frame_user.h	2004-02-11 12:16:44.000000000 -0500
++++ b/arch/um/include/sysdep-i386/frame_user.h	2004-02-11 12:29:00.000000000 -0500
+@@ -56,26 +56,26 @@
+  * it would have to be __builtin_frame_address(1).
+  */
+ 
+-static inline unsigned long frame_restorer(void)
+-{
+-	unsigned long *fp;
+-
+-	fp = __builtin_frame_address(0);
+-	return((unsigned long) (fp + 1));
+-}
++#define frame_restorer() \
++({ \
++	unsigned long *fp; \
++\
++	fp = __builtin_frame_address(0); \
++	((unsigned long) (fp + 1)); \
++})
+ 
+ /* Similarly, this returns the value of sp when the handler was first
+  * entered.  This is used to calculate the proper sp when delivering
+  * signals.
+  */
+ 
+-static inline unsigned long frame_sp(void)
+-{
+-	unsigned long *fp;
+-
+-	fp = __builtin_frame_address(0);
+-	return((unsigned long) (fp + 1));
+-}
++#define frame_sp() \
++({ \
++	unsigned long *fp; \
++\
++	fp = __builtin_frame_address(0); \
++	((unsigned long) (fp + 1)); \
++})
+ 
+ #endif
+ 
+diff -Naur a/arch/um/include/sysdep-i386/sigcontext.h b/arch/um/include/sysdep-i386/sigcontext.h
+--- a/arch/um/include/sysdep-i386/sigcontext.h	2004-02-11 12:16:08.000000000 -0500
++++ b/arch/um/include/sysdep-i386/sigcontext.h	2004-02-11 12:28:19.000000000 -0500
+@@ -28,8 +28,8 @@
+  */
+ #define SC_START_SYSCALL(sc) do SC_EAX(sc) = -ENOSYS; while(0)
+ 
+-/* These are General Protection and Page Fault */
+-#define SEGV_IS_FIXABLE(trap) ((trap == 13) || (trap == 14))
++/* This is Page Fault */
++#define SEGV_IS_FIXABLE(trap) (trap == 14)
+ 
+ #define SC_SEGV_IS_FIXABLE(sc) (SEGV_IS_FIXABLE(SC_TRAPNO(sc)))
+ 
+diff -Naur a/arch/um/include/ubd_user.h b/arch/um/include/ubd_user.h
+--- a/arch/um/include/ubd_user.h	2004-02-11 12:15:48.000000000 -0500
++++ b/arch/um/include/ubd_user.h	2004-02-11 12:27:41.000000000 -0500
+@@ -9,7 +9,7 @@
+ 
+ #include "os.h"
+ 
+-enum ubd_req { UBD_READ, UBD_WRITE };
++enum ubd_req { UBD_READ, UBD_WRITE, UBD_MMAP };
+ 
+ struct io_thread_req {
+ 	enum ubd_req op;
+@@ -20,8 +20,10 @@
+ 	char *buffer;
+ 	int sectorsize;
+ 	unsigned long sector_mask;
+-	unsigned long cow_offset;
++	unsigned long long cow_offset;
+ 	unsigned long bitmap_words[2];
++	int map_fd;
++	unsigned long long map_offset;
+ 	int error;
+ };
+ 
+@@ -31,7 +33,7 @@
+ 			 int *create_cow_out);
+ extern int create_cow_file(char *cow_file, char *backing_file, 
+ 			   struct openflags flags, int sectorsize, 
+-			   int *bitmap_offset_out, 
++			   int alignment, int *bitmap_offset_out, 
+ 			   unsigned long *bitmap_len_out,
+ 			   int *data_offset_out);
+ extern int read_cow_bitmap(int fd, void *buf, int offset, int len);
+@@ -39,7 +41,6 @@
+ extern int write_ubd_fs(int fd, char *buffer, int len);
+ extern int start_io_thread(unsigned long sp, int *fds_out);
+ extern void do_io(struct io_thread_req *req);
+-extern int ubd_is_dir(char *file);
+ 
+ static inline int ubd_test_bit(__u64 bit, unsigned char *data)
+ {
+diff -Naur a/arch/um/include/um_uaccess.h b/arch/um/include/um_uaccess.h
+--- a/arch/um/include/um_uaccess.h	2004-02-11 12:16:07.000000000 -0500
++++ b/arch/um/include/um_uaccess.h	2004-02-11 12:28:02.000000000 -0500
+@@ -38,22 +38,73 @@
+ 				from, n));
+ }
+ 
++/*
++ * strncpy_from_user: - Copy a NUL terminated string from userspace.
++ * @dst:   Destination address, in kernel space.  This buffer must be at
++ *         least @count bytes long.
++ * @src:   Source address, in user space.
++ * @count: Maximum number of bytes to copy, including the trailing NUL.
++ * 
++ * Copies a NUL-terminated string from userspace to kernel space.
++ *
++ * On success, returns the length of the string (not including the trailing
++ * NUL).
++ *
++ * If access to userspace fails, returns -EFAULT (some data may have been
++ * copied).
++ *
++ * If @count is smaller than the length of the string, copies @count bytes
++ * and returns @count.
++ */
++
+ static inline int strncpy_from_user(char *dst, const char *src, int count)
+ {
+ 	return(CHOOSE_MODE_PROC(strncpy_from_user_tt, strncpy_from_user_skas,
+ 				dst, src, count));
+ }
+ 
++/*
++ * __clear_user: - Zero a block of memory in user space, with less checking.
++ * @to:   Destination address, in user space.
++ * @n:    Number of bytes to zero.
++ *
++ * Zero a block of memory in user space.  Caller must check
++ * the specified block with access_ok() before calling this function.
++ *
++ * Returns number of bytes that could not be cleared.
++ * On success, this will be zero.
++ */
+ static inline int __clear_user(void *mem, int len)
+ {
+ 	return(CHOOSE_MODE_PROC(__clear_user_tt, __clear_user_skas, mem, len));
+ }
+ 
++/*
++ * clear_user: - Zero a block of memory in user space.
++ * @to:   Destination address, in user space.
++ * @n:    Number of bytes to zero.
++ *
++ * Zero a block of memory in user space.
++ *
++ * Returns number of bytes that could not be cleared.
++ * On success, this will be zero.
++ */
+ static inline int clear_user(void *mem, int len)
+ {
+ 	return(CHOOSE_MODE_PROC(clear_user_tt, clear_user_skas, mem, len));
+ }
+ 
++/*
++ * strlen_user: - Get the size of a string in user space.
++ * @str: The string to measure.
++ * @n:   The maximum valid length
++ *
++ * Get the size of a NUL-terminated string in user space.
++ *
++ * Returns the size of the string INCLUDING the terminating NUL.
++ * On exception, returns 0.
++ * If the string is too long, returns a value greater than @n.
++ */
+ static inline int strnlen_user(const void *str, int len)
+ {
+ 	return(CHOOSE_MODE_PROC(strnlen_user_tt, strnlen_user_skas, str, len));
+diff -Naur a/arch/um/include/user.h b/arch/um/include/user.h
+--- a/arch/um/include/user.h	2004-02-11 12:14:17.000000000 -0500
++++ b/arch/um/include/user.h	2004-02-11 12:26:00.000000000 -0500
+@@ -14,6 +14,7 @@
+ extern void kfree(void *ptr);
+ extern int in_aton(char *str);
+ extern int open_gdb_chan(void);
++extern int strlcpy(char *, const char *, int);
+ 
+ #endif
+ 
+diff -Naur a/arch/um/include/user_util.h b/arch/um/include/user_util.h
+--- a/arch/um/include/user_util.h	2004-02-11 12:14:23.000000000 -0500
++++ b/arch/um/include/user_util.h	2004-02-11 12:26:06.000000000 -0500
+@@ -14,8 +14,6 @@
+ extern int unlockpt(int __fd);
+ extern char *ptsname(int __fd);
+ 
+-enum { OP_NONE, OP_EXEC, OP_FORK, OP_TRACE_ON, OP_REBOOT, OP_HALT, OP_CB };
+-
+ struct cpu_task {
+ 	int pid;
+ 	void *task;
+@@ -59,7 +57,6 @@
+ extern void *add_signal_handler(int sig, void (*handler)(int));
+ extern int start_fork_tramp(void *arg, unsigned long temp_stack, 
+ 			    int clone_flags, int (*tramp)(void *));
+-extern int clone_and_wait(int (*fn)(void *), void *arg, void *sp, int flags);
+ extern int linux_main(int argc, char **argv);
+ extern void set_cmdline(char *cmd);
+ extern void input_cb(void (*proc)(void *), void *arg, int arg_len);
+@@ -86,11 +83,13 @@
+ extern int run_kernel_thread(int (*fn)(void *), void *arg, void **jmp_ptr);
+ extern void write_sigio_workaround(void);
+ extern void arch_check_bugs(void);
++extern int cpu_feature(char *what, char *buf, int len);
+ extern int arch_handle_signal(int sig, union uml_pt_regs *regs);
+ extern int arch_fixup(unsigned long address, void *sc_ptr);
+ extern void forward_pending_sigio(int target);
+ extern int can_do_skas(void);
+- 
++extern void arch_init_thread(void);
++
+ #endif
+ 
+ /*
+diff -Naur a/arch/um/Kconfig b/arch/um/Kconfig
+--- a/arch/um/Kconfig	2004-02-11 12:15:26.000000000 -0500
++++ b/arch/um/Kconfig	2004-02-11 12:27:15.000000000 -0500
+@@ -61,6 +61,20 @@
+ 
+ config NET
+ 	bool "Networking support"
++	help
++	Unless you really know what you are doing, you should say Y here.
++	The reason is that some programs need kernel networking support even
++	when running on a stand-alone machine that isn't connected to any
++	other computer. If you are upgrading from an older kernel, you
++	should consider updating your networking tools too because changes
++	in the kernel and the tools often go hand in hand. The tools are
++	contained in the package net-tools, the location and version number
++	of which are given in Documentation/Changes.
++
++	For a general introduction to Linux networking, it is highly
++	recommended to read the NET-HOWTO, available from
++	<http://www.tldp.org/docs.html#howto>.
++
+ 
+ source "fs/Kconfig.binfmt"
+ 
+@@ -85,6 +99,19 @@
+         If you'd like to be able to work with files stored on the host, 
+         say Y or M here; otherwise say N.
+ 
++config HPPFS
++	tristate "HoneyPot ProcFS"
++	help
++	hppfs (HoneyPot ProcFS) is a filesystem which allows UML /proc 
++	entries to be overridden, removed, or fabricated from the host.
++	Its purpose is to allow a UML to appear to be a physical machine
++	by removing or changing anything in /proc which gives away the
++	identity of a UML.
++
++	See http://user-mode-linux.sf.net/hppfs.html for more information.
++
++	You only need this if you are setting up a UML honeypot.  Otherwise,
++	it is safe to say 'N' here.
+ 
+ config MCONSOLE
+ 	bool "Management console"
+@@ -105,6 +132,16 @@
+ config MAGIC_SYSRQ
+ 	bool "Magic SysRq key"
+ 	depends on MCONSOLE
++	help
++	If you say Y here, you will have some control over the system even
++	if the system crashes for example during kernel debugging (e.g., you
++	will be able to flush the buffer cache to disk, reboot the system
++	immediately or dump some status information). This is accomplished
++	by pressing various keys while holding SysRq (Alt+PrintScreen). It
++	also works on a serial console (on PC hardware at least), if you
++	send a BREAK and then within 5 seconds a command keypress. The
++	keys are documented in Documentation/sysrq.txt. Don't say Y
++	unless you really know what this hack does.
+ 
+ config HOST_2G_2G
+ 	bool "2G/2G host address space split"
+@@ -160,6 +197,9 @@
+ config HIGHMEM
+ 	bool "Highmem support"
+ 
++config PROC_MM
++	bool "/proc/mm support"
++
+ config KERNEL_STACK_ORDER
+ 	int "Kernel stack size order"
+ 	default 2
+@@ -168,6 +208,17 @@
+ 	be 1 << order pages.  The default is OK unless you're running Valgrind
+ 	on UML, in which case, set this to 3.
+ 
++config UML_REAL_TIME_CLOCK
++	bool "Real-time Clock"
++	default y
++	help
++	This option makes UML time deltas match wall clock deltas.  This should
++	normally be enabled.  The exception would be if you are debugging with
++	UML and spend long times with UML stopped at a breakpoint.  In this
++	case, when UML is restarted, it will call the timer enough times to make
++	up for the time spent at the breakpoint.  This could result in a 
++	noticable lag.  If this is a problem, then disable this option.
++
+ endmenu
+ 
+ source "init/Kconfig"
+@@ -240,6 +291,10 @@
+ config PT_PROXY
+ 	bool "Enable ptrace proxy"
+ 	depends on XTERM_CHAN && DEBUG_INFO
++	help
++	This option enables a debugging interface which allows gdb to debug
++	the kernel without needing to actually attach to kernel threads.
++	If you want to do kernel debugging, say Y here; otherwise say N.
+ 
+ config GPROF
+ 	bool "Enable gprof support"
+diff -Naur a/arch/um/Kconfig_block b/arch/um/Kconfig_block
+--- a/arch/um/Kconfig_block	2004-02-11 12:16:04.000000000 -0500
++++ b/arch/um/Kconfig_block	2004-02-11 12:28:00.000000000 -0500
+@@ -29,6 +29,20 @@
+         wise choice too.  In all other cases (for example, if you're just
+         playing around with User-Mode Linux) you can choose N.
+ 
++# Turn this back on when the driver actually works
++#
++#config BLK_DEV_COW
++#	tristate "COW block device"
++#	help
++#	This is a layered driver which sits above two other block devices.
++#	One is read-only, and the other is a read-write layer which stores
++#	all changes.  This provides the illusion that the read-only layer
++#	can be mounted read-write and changed.
++
++config BLK_DEV_COW_COMMON
++	bool
++	default BLK_DEV_COW || BLK_DEV_UBD
++
+ config BLK_DEV_LOOP
+ 	tristate "Loopback device support"
+ 
+diff -Naur a/arch/um/Kconfig_net b/arch/um/Kconfig_net
+--- a/arch/um/Kconfig_net	2004-02-11 12:15:54.000000000 -0500
++++ b/arch/um/Kconfig_net	2004-02-11 12:27:47.000000000 -0500
+@@ -1,5 +1,5 @@
+ 
+-menu "Network Devices"
++menu "UML Network Devices"
+ 	depends on NET
+ 
+ # UML virtual driver
+@@ -176,73 +176,5 @@
+ 	
+         Startup example: "eth0=slirp,FE:FD:01:02:03:04,/usr/local/bin/slirp"
+ 
+-
+-# Below are hardware-independent drivers mirrored from
+-# drivers/net/Config.in. It would be nice if Linux
+-# had HW independent drivers separated from the other
+-# but it does not. Until then each non-ISA/PCI arch
+-# needs to provide it's own menu of network drivers
+-config DUMMY
+-	tristate "Dummy net driver support"
+-
+-config BONDING
+-	tristate "Bonding driver support"
+-
+-config EQUALIZER
+-	tristate "EQL (serial line load balancing) support"
+-
+-config TUN
+-	tristate "Universal TUN/TAP device driver support"
+-
+-config ETHERTAP
+-	tristate "Ethertap network tap (OBSOLETE)"
+-	depends on EXPERIMENTAL && NETLINK
+-
+-config PPP
+-	tristate "PPP (point-to-point protocol) support"
+-
+-config PPP_MULTILINK
+-	bool "PPP multilink support (EXPERIMENTAL)"
+-	depends on PPP && EXPERIMENTAL
+-
+-config PPP_FILTER
+-	bool "PPP filtering"
+-	depends on PPP && FILTER
+-
+-config PPP_ASYNC
+-	tristate "PPP support for async serial ports"
+-	depends on PPP
+-
+-config PPP_SYNC_TTY
+-	tristate "PPP support for sync tty ports"
+-	depends on PPP
+-
+-config PPP_DEFLATE
+-	tristate "PPP Deflate compression"
+-	depends on PPP
+-
+-config PPP_BSDCOMP
+-	tristate "PPP BSD-Compress compression"
+-	depends on PPP
+-
+-config PPPOE
+-	tristate "PPP over Ethernet (EXPERIMENTAL)"
+-	depends on PPP && EXPERIMENTAL
+-
+-config SLIP
+-	tristate "SLIP (serial line) support"
+-
+-config SLIP_COMPRESSED
+-	bool "CSLIP compressed headers"
+-	depends on SLIP=y
+-
+-config SLIP_SMART
+-	bool "Keepalive and linefill"
+-	depends on SLIP=y
+-
+-config SLIP_MODE_SLIP6
+-	bool "Six bit SLIP encapsulation"
+-	depends on SLIP=y
+-
+ endmenu
+ 
+diff -Naur a/arch/um/kernel/config.c.in b/arch/um/kernel/config.c.in
+--- a/arch/um/kernel/config.c.in	2004-02-11 12:16:10.000000000 -0500
++++ b/arch/um/kernel/config.c.in	2004-02-11 12:28:20.000000000 -0500
+@@ -7,9 +7,7 @@
+ #include <stdlib.h>
+ #include "init.h"
+ 
+-static __initdata char *config = "
+-CONFIG
+-";
++static __initdata char *config = "CONFIG";
+ 
+ static int __init print_config(char *line, int *add)
+ {
+diff -Naur a/arch/um/kernel/exec_kern.c b/arch/um/kernel/exec_kern.c
+--- a/arch/um/kernel/exec_kern.c	2004-02-11 12:14:34.000000000 -0500
++++ b/arch/um/kernel/exec_kern.c	2004-02-11 12:26:17.000000000 -0500
+@@ -32,10 +32,15 @@
+ 	CHOOSE_MODE_PROC(start_thread_tt, start_thread_skas, regs, eip, esp);
+ }
+ 
++extern void log_exec(char **argv, void *tty);
++
+ static int execve1(char *file, char **argv, char **env)
+ {
+         int error;
+ 
++#ifdef CONFIG_TTY_LOG
++	log_exec(argv, current->tty);
++#endif
+         error = do_execve(file, argv, env, &current->thread.regs);
+         if (error == 0){
+                 current->ptrace &= ~PT_DTRACE;
+diff -Naur a/arch/um/kernel/frame.c b/arch/um/kernel/frame.c
+--- a/arch/um/kernel/frame.c	2004-02-11 12:14:57.000000000 -0500
++++ b/arch/um/kernel/frame.c	2004-02-11 12:26:47.000000000 -0500
+@@ -279,7 +279,7 @@
+ 	struct sc_frame_raw raw_sc;
+ 	struct si_frame_raw raw_si;
+ 	void *stack, *sigstack;
+-	unsigned long top, sig_top, base;
++	unsigned long top, base;
+ 
+ 	stack = mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE | PROT_EXEC,
+ 		     MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+@@ -292,7 +292,6 @@
+ 	}
+ 
+ 	top = (unsigned long) stack + PAGE_SIZE - sizeof(void *);
+-	sig_top = (unsigned long) sigstack + PAGE_SIZE;
+ 
+ 	/* Get the sigcontext, no sigrestorer layout */
+ 	raw_sc.restorer = 0;
+diff -Naur a/arch/um/kernel/frame_kern.c b/arch/um/kernel/frame_kern.c
+--- a/arch/um/kernel/frame_kern.c	2004-02-11 12:17:12.000000000 -0500
++++ b/arch/um/kernel/frame_kern.c	2004-02-11 12:29:17.000000000 -0500
+@@ -6,7 +6,6 @@
+ #include "asm/ptrace.h"
+ #include "asm/uaccess.h"
+ #include "asm/signal.h"
+-#include "asm/uaccess.h"
+ #include "asm/ucontext.h"
+ #include "frame_kern.h"
+ #include "sigcontext.h"
+@@ -29,12 +28,15 @@
+ 			    sizeof(restorer)));
+ }
+ 
++extern int userspace_pid[];
++
+ static int copy_sc_to_user(void *to, void *fp, struct pt_regs *from, 
+ 			   struct arch_frame_data *arch)
+ {
+ 	return(CHOOSE_MODE(copy_sc_to_user_tt(to, fp, UPT_SC(&from->regs), 
+ 					      arch),
+-			   copy_sc_to_user_skas(to, fp, &from->regs,
++			   copy_sc_to_user_skas(userspace_pid[0], to, fp, 
++						&from->regs,
+ 						current->thread.cr2,
+ 						current->thread.err)));
+ }
+diff -Naur a/arch/um/kernel/helper.c b/arch/um/kernel/helper.c
+--- a/arch/um/kernel/helper.c	2004-02-11 12:15:26.000000000 -0500
++++ b/arch/um/kernel/helper.c	2004-02-11 12:27:13.000000000 -0500
+@@ -7,7 +7,6 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <errno.h>
+-#include <fcntl.h>
+ #include <sched.h>
+ #include <sys/signal.h>
+ #include <sys/wait.h>
+@@ -33,6 +32,7 @@
+ {
+ 	struct helper_data *data = arg;
+ 	char **argv = data->argv;
++	int errval;
+ 
+ 	if(helper_pause){
+ 		signal(SIGHUP, helper_hup);
+@@ -41,8 +41,9 @@
+ 	if(data->pre_exec != NULL)
+ 		(*data->pre_exec)(data->pre_data);
+ 	execvp(argv[0], argv);
++	errval = errno;
+ 	printk("execvp of '%s' failed - errno = %d\n", argv[0], errno);
+-	write(data->fd, &errno, sizeof(errno));
++	os_write_file(data->fd, &errval, sizeof(errval));
+ 	os_kill_process(os_getpid(), 0);
+ 	return(0);
+ }
+@@ -59,17 +60,20 @@
+ 	if((stack_out != NULL) && (*stack_out != 0))
+ 		stack = *stack_out;
+ 	else stack = alloc_stack(0, um_in_interrupt());
+-	if(stack == 0) return(-ENOMEM);
++	if(stack == 0) 
++		return(-ENOMEM);
+ 
+ 	err = os_pipe(fds, 1, 0);
+-	if(err){
+-		printk("run_helper : pipe failed, errno = %d\n", -err);
+-		return(err);
++	if(err < 0){
++		printk("run_helper : pipe failed, err = %d\n", -err);
++		goto out_free;
+ 	}
+-	if(fcntl(fds[1], F_SETFD, 1) != 0){
+-		printk("run_helper : setting FD_CLOEXEC failed, errno = %d\n",
+-		       errno);
+-		return(-errno);
++
++	err = os_set_exec_close(fds[1], 1);
++	if(err < 0){
++		printk("run_helper : setting FD_CLOEXEC failed, err = %d\n",
++		       -err);
++		goto out_close;
+ 	}
+ 
+ 	sp = stack + page_size() - sizeof(void *);
+@@ -80,23 +84,34 @@
+ 	pid = clone(helper_child, (void *) sp, CLONE_VM | SIGCHLD, &data);
+ 	if(pid < 0){
+ 		printk("run_helper : clone failed, errno = %d\n", errno);
+-		return(-errno);
++		err = -errno;
++		goto out_close;
+ 	}
+-	close(fds[1]);
+-	n = read(fds[0], &err, sizeof(err));
++
++	os_close_file(fds[1]);
++	n = os_read_file(fds[0], &err, sizeof(err));
+ 	if(n < 0){
+-		printk("run_helper : read on pipe failed, errno = %d\n", 
+-		       errno);
+-		return(-errno);
++		printk("run_helper : read on pipe failed, err = %d\n", -n);
++		err = n;
++		goto out_kill;
+ 	}
+ 	else if(n != 0){
+ 		waitpid(pid, NULL, 0);
+-		pid = -err;
++		pid = -errno;
+ 	}
+ 
+ 	if(stack_out == NULL) free_stack(stack, 0);
+         else *stack_out = stack;
+ 	return(pid);
++
++ out_kill:
++	os_kill_process(pid, 1);
++ out_close:
++	os_close_file(fds[0]);
++	os_close_file(fds[1]);
++ out_free:
++	free_stack(stack, 0);
++	return(err);
+ }
+ 
+ int run_helper_thread(int (*proc)(void *), void *arg, unsigned int flags, 
+@@ -117,9 +132,11 @@
+ 	}
+ 	if(stack_out == NULL){
+ 		pid = waitpid(pid, &status, 0);
+-		if(pid < 0)
++		if(pid < 0){
+ 			printk("run_helper_thread - wait failed, errno = %d\n",
+-			       pid);
++			       errno);
++			pid = -errno;
++		}
+ 		if(!WIFEXITED(status) || (WEXITSTATUS(status) != 0))
+ 			printk("run_helper_thread - thread returned status "
+ 			       "0x%x\n", status);
+diff -Naur a/arch/um/kernel/initrd_user.c b/arch/um/kernel/initrd_user.c
+--- a/arch/um/kernel/initrd_user.c	2004-02-11 12:14:28.000000000 -0500
++++ b/arch/um/kernel/initrd_user.c	2004-02-11 12:26:11.000000000 -0500
+@@ -6,7 +6,6 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#include <fcntl.h>
+ #include <errno.h>
+ 
+ #include "user_util.h"
+@@ -19,13 +18,15 @@
+ {
+ 	int fd, n;
+ 
+-	if((fd = os_open_file(filename, of_read(OPENFLAGS()), 0)) < 0){
+-		printk("Opening '%s' failed - errno = %d\n", filename, errno);
++	fd = os_open_file(filename, of_read(OPENFLAGS()), 0);
++	if(fd < 0){
++		printk("Opening '%s' failed - err = %d\n", filename, -fd);
+ 		return(-1);
+ 	}
+-	if((n = read(fd, buf, size)) != size){
+-		printk("Read of %d bytes from '%s' returned %d, errno = %d\n",
+-		       size, filename, n, errno);
++	n = os_read_file(fd, buf, size);
++	if(n != size){
++		printk("Read of %d bytes from '%s' failed, err = %d\n", size, 
++		       filename, -n);
+ 		return(-1);
+ 	}
+ 	return(0);
+diff -Naur a/arch/um/kernel/init_task.c b/arch/um/kernel/init_task.c
+--- a/arch/um/kernel/init_task.c	2004-02-11 12:17:10.000000000 -0500
++++ b/arch/um/kernel/init_task.c	2004-02-11 12:29:16.000000000 -0500
+@@ -8,7 +8,6 @@
+ #include "linux/module.h"
+ #include "linux/sched.h"
+ #include "linux/init_task.h"
+-#include "linux/version.h"
+ #include "asm/uaccess.h"
+ #include "asm/pgtable.h"
+ #include "user_util.h"
+@@ -18,7 +17,7 @@
+ struct mm_struct init_mm = INIT_MM(init_mm);
+ static struct files_struct init_files = INIT_FILES;
+ static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
+-
++static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
+ EXPORT_SYMBOL(init_mm);
+ 
+ /*
+@@ -43,26 +42,12 @@
+ __attribute__((__section__(".data.init_task"))) = 
+ { INIT_THREAD_INFO(init_task) };
+ 
+-struct task_struct *alloc_task_struct(void)
+-{
+-	return((struct task_struct *) 
+-	       __get_free_pages(GFP_KERNEL, CONFIG_KERNEL_STACK_ORDER));
+-}
+-
+ void unprotect_stack(unsigned long stack)
+ {
+ 	protect_memory(stack, (1 << CONFIG_KERNEL_STACK_ORDER) * PAGE_SIZE, 
+ 		       1, 1, 0, 1);
+ }
+ 
+-void free_task_struct(struct task_struct *task)
+-{
+-	/* free_pages decrements the page counter and only actually frees
+-	 * the pages if they are now not accessed by anything.
+-	 */
+-	free_pages((unsigned long) task, CONFIG_KERNEL_STACK_ORDER);
+-}
+-
+ /*
+  * Overrides for Emacs so that we follow Linus's tabbing style.
+  * Emacs will notice this stuff at the end of the file and automatically
+diff -Naur a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
+--- a/arch/um/kernel/irq.c	2004-02-11 12:16:32.000000000 -0500
++++ b/arch/um/kernel/irq.c	2004-02-11 12:28:31.000000000 -0500
+@@ -29,6 +29,7 @@
+ #include "user_util.h"
+ #include "kern_util.h"
+ #include "irq_user.h"
++#include "irq_kern.h"
+ 
+ static void register_irq_proc (unsigned int irq);
+ 
+@@ -83,65 +84,55 @@
+ 	end_none
+ };
+ 
+-/* Not changed */
+-volatile unsigned long irq_err_count;
+-
+ /*
+  * Generic, controller-independent functions:
+  */
+ 
+-int get_irq_list(char *buf)
++int show_interrupts(struct seq_file *p, void *v)
+ {
+-	int i, j;
+-	unsigned long flags;
++	int i = *(loff_t *) v, j;
+ 	struct irqaction * action;
+-	char *p = buf;
++	unsigned long flags;
+ 
+-	p += sprintf(p, "           ");
+-	for (j=0; j<num_online_cpus(); j++)
+-		p += sprintf(p, "CPU%d       ",j);
+-	*p++ = '\n';
++	if (i == 0) {
++		seq_printf(p, "           ");
++		for (j=0; j<NR_CPUS; j++)
++			if (cpu_online(j))
++				seq_printf(p, "CPU%d       ",j);
++		seq_putc(p, '\n');
++	}
+ 
+-	for (i = 0 ; i < NR_IRQS ; i++) {
++	if (i < NR_IRQS) {
+ 		spin_lock_irqsave(&irq_desc[i].lock, flags);
+ 		action = irq_desc[i].action;
+ 		if (!action) 
+-			goto end;
+-		p += sprintf(p, "%3d: ",i);
++			goto skip;
++		seq_printf(p, "%3d: ",i);
+ #ifndef CONFIG_SMP
+-		p += sprintf(p, "%10u ", kstat_irqs(i));
++		seq_printf(p, "%10u ", kstat_irqs(i));
+ #else
+-		for (j = 0; j < num_online_cpus(); j++)
+-			p += sprintf(p, "%10u ",
+-				kstat_cpu(cpu_logical_map(j)).irqs[i]);
++		for (j = 0; j < NR_CPUS; j++)
++			if (cpu_online(j))
++				seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
+ #endif
+-		p += sprintf(p, " %14s", irq_desc[i].handler->typename);
+-		p += sprintf(p, "  %s", action->name);
++		seq_printf(p, " %14s", irq_desc[i].handler->typename);
++		seq_printf(p, "  %s", action->name);
+ 
+ 		for (action=action->next; action; action = action->next)
+-			p += sprintf(p, ", %s", action->name);
+-		*p++ = '\n';
+-	end:
++			seq_printf(p, ", %s", action->name);
++
++		seq_putc(p, '\n');
++skip:
+ 		spin_unlock_irqrestore(&irq_desc[i].lock, flags);
++	} else if (i == NR_IRQS) {
++		seq_printf(p, "NMI: ");
++		for (j = 0; j < NR_CPUS; j++)
++			if (cpu_online(j))
++				seq_printf(p, "%10u ", nmi_count(j));
++		seq_putc(p, '\n');
+ 	}
+-	p += sprintf(p, "\n");
+-#ifdef notdef
+-#ifdef CONFIG_SMP
+-	p += sprintf(p, "LOC: ");
+-	for (j = 0; j < num_online_cpus(); j++)
+-		p += sprintf(p, "%10u ",
+-			apic_timer_irqs[cpu_logical_map(j)]);
+-	p += sprintf(p, "\n");
+-#endif
+-#endif
+-	p += sprintf(p, "ERR: %10lu\n", irq_err_count);
+-	return p - buf;
+-}
+ 
+-
+-int show_interrupts(struct seq_file *p, void *v)
+-{
+-	return(0);
++	return 0;
+ }
+ 
+ /*
+@@ -230,8 +221,11 @@
+  
+ void disable_irq(unsigned int irq)
+ {
++	irq_desc_t *desc = irq_desc + irq;
++
+ 	disable_irq_nosync(irq);
+-	synchronize_irq(irq);
++	if(desc->action)
++		synchronize_irq(irq);
+ }
+ 
+ /**
+@@ -252,7 +246,7 @@
+ 	spin_lock_irqsave(&desc->lock, flags);
+ 	switch (desc->depth) {
+ 	case 1: {
+-		unsigned int status = desc->status & ~IRQ_DISABLED;
++		unsigned int status = desc->status & IRQ_DISABLED;
+ 		desc->status = status;
+ 		if ((status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
+ 			desc->status = status | IRQ_REPLAY;
+@@ -282,13 +276,12 @@
+ 	 * 0 return value means that this irq is already being
+ 	 * handled by some other CPU. (or is disabled)
+ 	 */
+-	int cpu = smp_processor_id();
+ 	irq_desc_t *desc = irq_desc + irq;
+ 	struct irqaction * action;
+ 	unsigned int status;
+ 
+ 	irq_enter();
+-	kstat_cpu(cpu).irqs[irq]++;
++	kstat_this_cpu.irqs[irq]++;
+ 	spin_lock(&desc->lock);
+ 	desc->handler->ack(irq);
+ 	/*
+@@ -385,7 +378,7 @@
+  */
+  
+ int request_irq(unsigned int irq,
+-		void (*handler)(int, void *, struct pt_regs *),
++		irqreturn_t (*handler)(int, void *, struct pt_regs *),
+ 		unsigned long irqflags, 
+ 		const char * devname,
+ 		void *dev_id)
+@@ -433,15 +426,19 @@
+ EXPORT_SYMBOL(request_irq);
+ 
+ int um_request_irq(unsigned int irq, int fd, int type,
+-		   void (*handler)(int, void *, struct pt_regs *),
++		   irqreturn_t (*handler)(int, void *, struct pt_regs *),
+ 		   unsigned long irqflags, const char * devname,
+ 		   void *dev_id)
+ {
+-	int retval;
++	int err;
+ 
+-	retval = request_irq(irq, handler, irqflags, devname, dev_id);
+-	if(retval) return(retval);
+-	return(activate_fd(irq, fd, type, dev_id));
++	err = request_irq(irq, handler, irqflags, devname, dev_id);
++	if(err) 
++		return(err);
++
++	if(fd != -1)
++		err = activate_fd(irq, fd, type, dev_id);
++	return(err);
+ }
+ 
+ /* this was setup_x86_irq but it seems pretty generic */
+@@ -474,7 +471,8 @@
+ 	 */
+ 	spin_lock_irqsave(&desc->lock,flags);
+ 	p = &desc->action;
+-	if ((old = *p) != NULL) {
++	old = *p;
++	if (old != NULL) {
+ 		/* Can't share interrupts unless both agree to */
+ 		if (!(old->flags & new->flags & SA_SHIRQ)) {
+ 			spin_unlock_irqrestore(&desc->lock,flags);
+@@ -586,12 +584,14 @@
+ 					unsigned long count, void *data)
+ {
+ 	int irq = (long) data, full_count = count, err;
+-	cpumask_t new_value, tmp;
++	cpumask_t new_value;
+ 
+ 	if (!irq_desc[irq].handler->set_affinity)
+ 		return -EIO;
+ 
+ 	err = cpumask_parse(buffer, count, new_value);
++	if(err)
++		return(err);
+ 
+ #ifdef CONFIG_SMP
+ 	/*
+@@ -599,9 +599,11 @@
+ 	 * way to make the system unusable accidentally :-) At least
+ 	 * one online CPU still has to be targeted.
+ 	 */
+-	cpus_and(tmp, new_value, cpu_online_map);
+-	if (cpus_empty(tmp))
++	{ cpumask_t tmp;
++	  cpus_and(tmp, new_value, cpu_online_map);
++	  if (cpus_empty(tmp))
+ 		return -EINVAL;
++	}
+ #endif
+ 
+ 	irq_affinity[irq] = new_value;
+@@ -614,6 +616,7 @@
+ 			int count, int *eof, void *data)
+ {
+ 	int len = cpumask_snprintf(page, count, *(cpumask_t *)data);
++
+ 	if (count - len < 2)
+ 		return -EINVAL;
+ 	len += sprintf(page + len, "\n");
+diff -Naur a/arch/um/kernel/irq_user.c b/arch/um/kernel/irq_user.c
+--- a/arch/um/kernel/irq_user.c	2004-02-11 12:15:17.000000000 -0500
++++ b/arch/um/kernel/irq_user.c	2004-02-11 12:27:06.000000000 -0500
+@@ -6,7 +6,6 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <errno.h>
+-#include <fcntl.h>
+ #include <signal.h>
+ #include <string.h>
+ #include <sys/poll.h>
+@@ -49,7 +48,8 @@
+ 
+ 	if(smp_sigio_handler()) return;
+ 	while(1){
+-		if((n = poll(pollfds, pollfds_num, 0)) < 0){
++		n = poll(pollfds, pollfds_num, 0);
++		if(n < 0){
+ 			if(errno == EINTR) continue;
+ 			printk("sigio_handler : poll returned %d, "
+ 			       "errno = %d\n", n, errno);
+@@ -366,34 +366,31 @@
+ 
+ void forward_ipi(int fd, int pid)
+ {
+-	if(fcntl(fd, F_SETOWN, pid) < 0){
+-		int save_errno = errno;
+-		if(fcntl(fd, F_GETOWN, 0) != pid){
+-			printk("forward_ipi: F_SETOWN failed, fd = %d, "
+-			       "me = %d, target = %d, errno = %d\n", fd, 
+-			       os_getpid(), pid, save_errno);
+-		}
+-	}
++	int err;
++
++	err = os_set_owner(fd, pid);
++	if(err < 0)
++		printk("forward_ipi: set_owner failed, fd = %d, me = %d, "
++		       "target = %d, err = %d\n", fd, os_getpid(), pid, -err);
+ }
+ 
+ void forward_interrupts(int pid)
+ {
+ 	struct irq_fd *irq;
+ 	unsigned long flags;
++	int err;
+ 
+ 	flags = irq_lock();
+ 	for(irq=active_fds;irq != NULL;irq = irq->next){
+-		if(fcntl(irq->fd, F_SETOWN, pid) < 0){
+-			int save_errno = errno;
+-			if(fcntl(irq->fd, F_GETOWN, 0) != pid){
+-				/* XXX Just remove the irq rather than
+-				 * print out an infinite stream of these
+-				 */
+-				printk("Failed to forward %d to pid %d, "
+-				       "errno = %d\n", irq->fd, pid, 
+-				       save_errno);
+-			}
++		err = os_set_owner(irq->fd, pid);
++		if(err < 0){
++			/* XXX Just remove the irq rather than
++			 * print out an infinite stream of these
++			 */
++			printk("Failed to forward %d to pid %d, err = %d\n",
++			       irq->fd, pid, -err);
+ 		}
++
+ 		irq->pid = pid;
+ 	}
+ 	irq_unlock(flags);
+diff -Naur a/arch/um/kernel/ksyms.c b/arch/um/kernel/ksyms.c
+--- a/arch/um/kernel/ksyms.c	2004-02-11 12:14:17.000000000 -0500
++++ b/arch/um/kernel/ksyms.c	2004-02-11 12:26:00.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* 
+- * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2001 - 2003 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+@@ -34,34 +34,63 @@
+ EXPORT_SYMBOL(flush_tlb_range);
+ EXPORT_SYMBOL(host_task_size);
+ EXPORT_SYMBOL(arch_validate);
++EXPORT_SYMBOL(get_kmem_end);
+ 
+-EXPORT_SYMBOL(region_pa);
+-EXPORT_SYMBOL(region_va);
+-EXPORT_SYMBOL(phys_mem_map);
+-EXPORT_SYMBOL(page_mem_map);
+ EXPORT_SYMBOL(page_to_phys);
+ EXPORT_SYMBOL(phys_to_page);
+ EXPORT_SYMBOL(high_physmem);
+ EXPORT_SYMBOL(empty_zero_page);
+ EXPORT_SYMBOL(um_virt_to_phys);
++EXPORT_SYMBOL(__virt_to_page);
++EXPORT_SYMBOL(to_phys);
++EXPORT_SYMBOL(to_virt);
+ EXPORT_SYMBOL(mode_tt);
+ EXPORT_SYMBOL(handle_page_fault);
+ 
++#ifdef CONFIG_MODE_TT
++EXPORT_SYMBOL(copy_from_user_tt);
++EXPORT_SYMBOL(copy_to_user_tt);
++#endif
++
++#ifdef CONFIG_MODE_SKAS
++EXPORT_SYMBOL(copy_to_user_skas);
++EXPORT_SYMBOL(copy_from_user_skas);
++#endif
++
++EXPORT_SYMBOL(os_stat_fd);
++EXPORT_SYMBOL(os_stat_file);
++EXPORT_SYMBOL(os_access);
++EXPORT_SYMBOL(os_print_error);
++EXPORT_SYMBOL(os_get_exec_close);
++EXPORT_SYMBOL(os_set_exec_close);
+ EXPORT_SYMBOL(os_getpid);
+ EXPORT_SYMBOL(os_open_file);
+ EXPORT_SYMBOL(os_read_file);
+ EXPORT_SYMBOL(os_write_file);
+ EXPORT_SYMBOL(os_seek_file);
++EXPORT_SYMBOL(os_lock_file);
++EXPORT_SYMBOL(os_ioctl_generic);
+ EXPORT_SYMBOL(os_pipe);
+ EXPORT_SYMBOL(os_file_type);
++EXPORT_SYMBOL(os_file_mode);
++EXPORT_SYMBOL(os_file_size);
++EXPORT_SYMBOL(os_flush_stdout);
+ EXPORT_SYMBOL(os_close_file);
++EXPORT_SYMBOL(os_set_fd_async);
++EXPORT_SYMBOL(os_set_fd_block);
+ EXPORT_SYMBOL(helper_wait);
+ EXPORT_SYMBOL(os_shutdown_socket);
++EXPORT_SYMBOL(os_create_unix_socket);
+ EXPORT_SYMBOL(os_connect_socket);
++EXPORT_SYMBOL(os_accept_connection);
++EXPORT_SYMBOL(os_rcv_fd);
+ EXPORT_SYMBOL(run_helper);
+ EXPORT_SYMBOL(start_thread);
+ EXPORT_SYMBOL(dump_thread);
+ 
++EXPORT_SYMBOL(do_gettimeofday);
++EXPORT_SYMBOL(do_settimeofday);
++
+ /* This is here because UML expands open to sys_open, not to a system
+  * call instruction.
+  */
+@@ -90,3 +119,13 @@
+ EXPORT_SYMBOL(kmap_atomic_to_page);
+ #endif
+ 
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/arch/um/kernel/Makefile b/arch/um/kernel/Makefile
+--- a/arch/um/kernel/Makefile	2004-02-11 12:16:04.000000000 -0500
++++ b/arch/um/kernel/Makefile	2004-02-11 12:28:00.000000000 -0500
+@@ -7,11 +7,11 @@
+ 
+ obj-y = checksum.o config.o exec_kern.o exitcode.o frame_kern.o frame.o \
+ 	helper.o init_task.o irq.o irq_user.o ksyms.o mem.o mem_user.o \
+-	process.o process_kern.o ptrace.o reboot.o resource.o sigio_user.o \
+-	sigio_kern.o signal_kern.o signal_user.o smp.o syscall_kern.o \
+-	syscall_user.o sysrq.o sys_call_table.o tempfile.o time.o \
+-	time_kern.o tlb.o trap_kern.o trap_user.o uaccess_user.o um_arch.o \
+-	umid.o user_syms.o user_util.o
++	physmem.o process.o process_kern.o ptrace.o reboot.o resource.o \
++	sigio_user.o sigio_kern.o signal_kern.o signal_user.o smp.o \
++	syscall_kern.o syscall_user.o sysrq.o sys_call_table.o tempfile.o \
++	time.o time_kern.o tlb.o trap_kern.o trap_user.o uaccess_user.o \
++	um_arch.o umid.o user_syms.o user_util.o
+ 
+ obj-$(CONFIG_BLK_DEV_INITRD) += initrd_kern.o initrd_user.o
+ obj-$(CONFIG_GPROF)	+= gprof_syms.o
+@@ -36,31 +36,22 @@
+ 
+ CFLAGS_frame.o := $(patsubst -fomit-frame-pointer,,$(USER_CFLAGS))
+ 
+-$(USER_OBJS) : %.o: %.c
+-	$(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
+-
+ # This has to be separate because it needs be compiled with frame pointers
+ # regardless of how the rest of the kernel is built.
+ 
+ $(obj)/frame.o: $(src)/frame.c
+ 	$(CC) $(CFLAGS_$(notdir $@)) -c -o $@ $<
+ 
+-QUOTE = 'my $$config=`cat $(TOPDIR)/.config`; $$config =~ s/"/\\"/g ; while(<STDIN>) { $$_ =~ s/CONFIG/$$config/; print $$_ }'
++$(USER_OBJS) : %.o: %.c
++	$(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
+ 
+-$(obj)/config.c : $(src)/config.c.in $(TOPDIR)/.config
+-	$(PERL) -e $(QUOTE) < $(src)/config.c.in > $@
++QUOTE = 'my $$config=`cat $(TOPDIR)/.config`; $$config =~ s/"/\\"/g ; $$config =~ s/\n/\\n"\n"/g ; while(<STDIN>) { $$_ =~ s/CONFIG/$$config/; print $$_ }'
+ 
+ $(obj)/config.o : $(obj)/config.c
+ 
+-clean:
+-	rm -f config.c
+-	for dir in $(subdir-y) ; do $(MAKE) -C $$dir clean; done
+-
+-modules:
+-
+-fastdep:
+-
+-dep:
+-
+-archmrproper: clean
++quiet_cmd_quote = QUOTE $@
++cmd_quote = $(PERL) -e $(QUOTE) < $< > $@
+ 
++targets += config.c
++$(obj)/config.c : $(src)/config.c.in $(TOPDIR)/.config FORCE
++	$(call if_changed,quote)
+diff -Naur a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
+--- a/arch/um/kernel/mem.c	2004-02-11 12:15:11.000000000 -0500
++++ b/arch/um/kernel/mem.c	2004-02-11 12:26:57.000000000 -0500
+@@ -1,74 +1,66 @@
+ /* 
+- * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+-#include "linux/config.h"
+-#include "linux/module.h"
+-#include "linux/types.h"
++#include "linux/stddef.h"
++#include "linux/kernel.h"
+ #include "linux/mm.h"
+-#include "linux/fs.h"
+-#include "linux/init.h"
+ #include "linux/bootmem.h"
+ #include "linux/swap.h"
+-#include "linux/slab.h"
+-#include "linux/vmalloc.h"
+ #include "linux/highmem.h"
++#include "linux/gfp.h"
+ #include "asm/page.h"
+-#include "asm/pgtable.h"
++#include "asm/fixmap.h"
+ #include "asm/pgalloc.h"
+-#include "asm/bitops.h"
+-#include "asm/uaccess.h"
+-#include "asm/tlb.h"
+ #include "user_util.h"
+ #include "kern_util.h"
+-#include "mem_user.h"
+-#include "mem.h"
+ #include "kern.h"
+-#include "init.h"
+-#include "os.h"
+-#include "mode_kern.h"
++#include "mem_user.h"
+ #include "uml_uaccess.h"
++#include "os.h"
++
++extern char __binary_start;
+ 
+ /* Changed during early boot */
+-pgd_t swapper_pg_dir[1024];
+-unsigned long high_physmem;
+-unsigned long vm_start;
+-unsigned long vm_end;
+-unsigned long highmem;
+ unsigned long *empty_zero_page = NULL;
+ unsigned long *empty_bad_page = NULL;
+-
+-/* Not modified */
+-const char bad_pmd_string[] = "Bad pmd in pte_alloc: %08lx\n";
+-
+-extern char __init_begin, __init_end;
+-extern long physmem_size;
+-
+-/* Not changed by UML */
+-DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
+-
+-/* Changed during early boot */
++pgd_t swapper_pg_dir[1024];
++unsigned long highmem;
+ int kmalloc_ok = 0;
+ 
+-#define NREGIONS (phys_region_index(0xffffffff) - phys_region_index(0x0) + 1)
+-struct mem_region *regions[NREGIONS] = { [ 0 ... NREGIONS - 1 ] = NULL };
+-#define REGION_SIZE ((0xffffffff & ~REGION_MASK) + 1)
+-
+-/* Changed during early boot */
+ static unsigned long brk_end;
+ 
++void unmap_physmem(void)
++{
++	os_unmap_memory((void *) brk_end, uml_reserved - brk_end);
++}
++
+ static void map_cb(void *unused)
+ {
+ 	map_memory(brk_end, __pa(brk_end), uml_reserved - brk_end, 1, 1, 0);
+ }
+ 
+-void unmap_physmem(void)
++#ifdef CONFIG_HIGHMEM
++static void setup_highmem(unsigned long highmem_start, 
++			  unsigned long highmem_len)
+ {
+-	os_unmap_memory((void *) brk_end, uml_reserved - brk_end);
+-}
++	struct page *page;
++	unsigned long highmem_pfn;
++	int i;
+ 
+-extern char __binary_start;
++	highmem_start_page = virt_to_page(highmem_start);
++
++	highmem_pfn = __pa(highmem_start) >> PAGE_SHIFT;
++	for(i = 0; i < highmem_len >> PAGE_SHIFT; i++){
++		page = &mem_map[highmem_pfn + i];
++		ClearPageReserved(page);
++		set_bit(PG_highmem, &page->flags);
++		atomic_set(&page->count, 1);
++		__free_page(page);
++	}
++}
++#endif
+ 
+ void mem_init(void)
+ {
+@@ -103,50 +95,15 @@
+ 	totalhigh_pages = highmem >> PAGE_SHIFT;
+ 	totalram_pages += totalhigh_pages;
+ 	num_physpages = totalram_pages;
+-	max_mapnr = totalram_pages;
+ 	max_pfn = totalram_pages;
+ 	printk(KERN_INFO "Memory: %luk available\n", 
+ 	       (unsigned long) nr_free_pages() << (PAGE_SHIFT-10));
+ 	kmalloc_ok = 1;
+-}
+-
+-/* Changed during early boot */
+-static unsigned long kmem_top = 0;
+-
+-unsigned long get_kmem_end(void)
+-{
+-	if(kmem_top == 0)
+-		kmem_top = CHOOSE_MODE(kmem_end_tt, kmem_end_skas);
+-	return(kmem_top);
+-}
+-
+-void set_kmem_end(unsigned long new)
+-{
+-	kmem_top = new;
+-}
+ 
+ #ifdef CONFIG_HIGHMEM
+-/* Changed during early boot */
+-pte_t *kmap_pte;
+-pgprot_t kmap_prot;
+-
+-EXPORT_SYMBOL(kmap_prot);
+-EXPORT_SYMBOL(kmap_pte);
+-
+-#define kmap_get_fixmap_pte(vaddr)					\
+-	pte_offset_kernel(pmd_offset(pgd_offset_k(vaddr), (vaddr)), (vaddr))
+-
+-void __init kmap_init(void)
+-{
+-	unsigned long kmap_vstart;
+-
+-	/* cache the first kmap pte */
+-	kmap_vstart = __fix_to_virt(FIX_KMAP_BEGIN);
+-	kmap_pte = kmap_get_fixmap_pte(kmap_vstart);
+-
+-	kmap_prot = PAGE_KERNEL;
++	setup_highmem(end_iomem, highmem);
++#endif
+ }
+-#endif /* CONFIG_HIGHMEM */
+ 
+ static void __init fixrange_init(unsigned long start, unsigned long end, 
+ 				 pgd_t *pgd_base)
+@@ -178,76 +135,24 @@
+ 	}
+ }
+ 
+-int init_maps(struct mem_region *region)
+-{
+-	struct page *p, *map;
+-	int i, n, len;
+-
+-	if(region == &physmem_region){
+-		region->mem_map = mem_map;
+-		return(0);
+-	}
+-	else if(region->mem_map != NULL) return(0);
+-
+-	n = region->len >> PAGE_SHIFT;
+-	len = n * sizeof(struct page);
+-	if(kmalloc_ok){
+-		map = kmalloc(len, GFP_KERNEL);
+-		if(map == NULL) map = vmalloc(len);
+-	}
+-	else map = alloc_bootmem_low_pages(len);
+-
+-	if(map == NULL)
+-		return(-ENOMEM);
+-	for(i = 0; i < n; i++){
+-		p = &map[i];
+-		set_page_count(p, 0);
+-		SetPageReserved(p);
+-		INIT_LIST_HEAD(&p->list);
+-	}
+-	region->mem_map = map;
+-	return(0);
+-}
++#if CONFIG_HIGHMEM
++pte_t *kmap_pte;
++pgprot_t kmap_prot;
+ 
+-DECLARE_MUTEX(regions_sem);
++#define kmap_get_fixmap_pte(vaddr)					\
++	pte_offset(pmd_offset(pgd_offset_k(vaddr), (vaddr)), (vaddr))
+ 
+-static int setup_one_range(int fd, char *driver, unsigned long start, 
+-			   unsigned long pfn, int len, 
+-			   struct mem_region *region)
++void __init kmap_init(void)
+ {
+-	int i;
+-
+-	down(&regions_sem);
+-	for(i = 0; i < NREGIONS; i++){
+-		if(regions[i] == NULL) break;		
+-	}
+-	if(i == NREGIONS){
+-		printk("setup_range : no free regions\n");
+-		i = -1;
+-		goto out;
+-	}
+-
+-	if(fd == -1)
+-		fd = create_mem_file(len);
++	unsigned long kmap_vstart;
+ 
+-	if(region == NULL){
+-		region = alloc_bootmem_low_pages(sizeof(*region));
+-		if(region == NULL)
+-			panic("Failed to allocating mem_region");
+-	}
++	/* cache the first kmap pte */
++	kmap_vstart = __fix_to_virt(FIX_KMAP_BEGIN);
++	kmap_pte = kmap_get_fixmap_pte(kmap_vstart);
+ 
+-	*region = ((struct mem_region) { .driver 	= driver,
+-					 .start_pfn 	= pfn,
+-					 .start 	= start, 
+-					 .len 		= len, 
+-					 .fd 		= fd } );
+-	regions[i] = region;
+- out:
+-	up(&regions_sem);
+-	return(i);
++	kmap_prot = PAGE_KERNEL;
+ }
+ 
+-#ifdef CONFIG_HIGHMEM
+ static void init_highmem(void)
+ {
+ 	pgd_t *pgd;
+@@ -268,63 +173,20 @@
+ 
+ 	kmap_init();
+ }
+-
+-void setup_highmem(unsigned long len)
+-{
+-	struct mem_region *region;
+-	struct page *page, *map;
+-	unsigned long phys;
+-	int i, cur, index;
+-
+-	phys = physmem_size;
+-	do {
+-		cur = min(len, (unsigned long) REGION_SIZE);
+-		i = setup_one_range(-1, NULL, -1, phys >> PAGE_SHIFT, cur, 
+-				    NULL);
+-		if(i == -1){
+-			printk("setup_highmem - setup_one_range failed\n");
+-			return;
+-		}
+-		region = regions[i];
+-		index = phys / PAGE_SIZE;
+-		region->mem_map = &mem_map[index];
+-
+-		map = region->mem_map;
+-		for(i = 0; i < (cur >> PAGE_SHIFT); i++){
+-			page = &map[i];
+-			ClearPageReserved(page);
+-			set_bit(PG_highmem, &page->flags);
+-			atomic_set(&page->count, 1);
+-			__free_page(page);
+-		}
+-		phys += cur;
+-		len -= cur;
+-	} while(len > 0);
+-}
+-#endif
++#endif /* CONFIG_HIGHMEM */
+ 
+ void paging_init(void)
+ {
+-	struct mem_region *region;
+-	unsigned long zones_size[MAX_NR_ZONES], start, end, vaddr;
+-	int i, index;
++	unsigned long zones_size[MAX_NR_ZONES], vaddr;
++	int i;
+ 
+ 	empty_zero_page = (unsigned long *) alloc_bootmem_low_pages(PAGE_SIZE);
+ 	empty_bad_page = (unsigned long *) alloc_bootmem_low_pages(PAGE_SIZE);
+ 	for(i=0;i<sizeof(zones_size)/sizeof(zones_size[0]);i++) 
+ 		zones_size[i] = 0;
+-	zones_size[0] = (high_physmem >> PAGE_SHIFT) - 
+-		(uml_physmem >> PAGE_SHIFT);
++	zones_size[0] = (end_iomem >> PAGE_SHIFT) - (uml_physmem >> PAGE_SHIFT);
+ 	zones_size[2] = highmem >> PAGE_SHIFT;
+ 	free_area_init(zones_size);
+-	start = phys_region_index(__pa(uml_physmem));
+-	end = phys_region_index(__pa(high_physmem - 1));
+-	for(i = start; i <= end; i++){
+-		region = regions[i];
+-		index = (region->start - uml_physmem) / PAGE_SIZE;
+-		region->mem_map = &mem_map[index];
+-		if(i > start) free_bootmem(__pa(region->start), region->len);
+-	}
+ 
+ 	/*
+ 	 * Fixed mappings, only the page table structure has to be
+@@ -335,15 +197,33 @@
+ 
+ #ifdef CONFIG_HIGHMEM
+ 	init_highmem();
+-	setup_highmem(highmem);
+ #endif
+ }
+ 
+-pte_t __bad_page(void)
++struct page *arch_validate(struct page *page, int mask, int order)
+ {
+-	clear_page(empty_bad_page);
+-        return pte_mkdirty(mk_pte((struct page *) empty_bad_page, 
+-				  PAGE_SHARED));
++	unsigned long addr, zero = 0;
++	int i;
++
++ again:
++	if(page == NULL) return(page);
++	if(PageHighMem(page)) return(page);
++
++	addr = (unsigned long) page_address(page);
++	for(i = 0; i < (1 << order); i++){
++		current->thread.fault_addr = (void *) addr;
++		if(__do_copy_to_user((void *) addr, &zero, 
++				     sizeof(zero),
++				     &current->thread.fault_addr,
++				     &current->thread.fault_catcher)){
++			if(!(mask & __GFP_WAIT)) return(NULL);
++			else break;
++		}
++		addr += PAGE_SIZE;
++	}
++	if(i == (1 << order)) return(page);
++	page = alloc_pages(mask, order);
++	goto again;
+ }
+ 
+ /* This can't do anything because nothing in the kernel image can be freed
+@@ -401,395 +281,6 @@
+         printk("%d pages swap cached\n", cached);
+ }
+ 
+-static int __init uml_mem_setup(char *line, int *add)
+-{
+-	char *retptr;
+-	physmem_size = memparse(line,&retptr);
+-	return 0;
+-}
+-__uml_setup("mem=", uml_mem_setup,
+-"mem=<Amount of desired ram>\n"
+-"    This controls how much \"physical\" memory the kernel allocates\n"
+-"    for the system. The size is specified as a number followed by\n"
+-"    one of 'k', 'K', 'm', 'M', which have the obvious meanings.\n"
+-"    This is not related to the amount of memory in the physical\n"
+-"    machine. It can be more, and the excess, if it's ever used, will\n"
+-"    just be swapped out.\n        Example: mem=64M\n\n"
+-);
+-
+-struct page *arch_validate(struct page *page, int mask, int order)
+-{
+-	unsigned long addr, zero = 0;
+-	int i;
+-
+- again:
+-	if(page == NULL) return(page);
+-	if(PageHighMem(page)) return(page);
+-
+-	addr = (unsigned long) page_address(page);
+-	for(i = 0; i < (1 << order); i++){
+-		current->thread.fault_addr = (void *) addr;
+-		if(__do_copy_to_user((void *) addr, &zero, 
+-				     sizeof(zero),
+-				     &current->thread.fault_addr,
+-				     &current->thread.fault_catcher)){
+-			if(!(mask & __GFP_WAIT)) return(NULL);
+-			else break;
+-		}
+-		addr += PAGE_SIZE;
+-	}
+-	if(i == (1 << order)) return(page);
+-	page = alloc_pages(mask, order);
+-	goto again;
+-}
+-
+-DECLARE_MUTEX(vm_reserved_sem);
+-static struct list_head vm_reserved = LIST_HEAD_INIT(vm_reserved);
+-
+-/* Static structures, linked in to the list in early boot */
+-static struct vm_reserved head = {
+-	.list 		= LIST_HEAD_INIT(head.list),
+-	.start 		= 0,
+-	.end 		= 0xffffffff
+-};
+-
+-static struct vm_reserved tail = {
+-	.list 		= LIST_HEAD_INIT(tail.list),
+-	.start 		= 0,
+-	.end 		= 0xffffffff
+-};
+-
+-void set_usable_vm(unsigned long start, unsigned long end)
+-{
+-	list_add(&head.list, &vm_reserved);
+-	list_add(&tail.list, &head.list);
+-	head.end = start;
+-	tail.start = end;
+-}
+-
+-int reserve_vm(unsigned long start, unsigned long end, void *e)
+-	       
+-{
+-	struct vm_reserved *entry = e, *reserved, *prev;
+-	struct list_head *ele;
+-	int err;
+-
+-	down(&vm_reserved_sem);
+-	list_for_each(ele, &vm_reserved){
+-		reserved = list_entry(ele, struct vm_reserved, list);
+-		if(reserved->start >= end) goto found;
+-	}
+-	panic("Reserved vm out of range");
+- found:
+-	prev = list_entry(ele->prev, struct vm_reserved, list);
+-	if(prev->end > start)
+-		panic("Can't reserve vm");
+-	if(entry == NULL)
+-		entry = kmalloc(sizeof(*entry), GFP_KERNEL);
+-	if(entry == NULL){
+-		printk("reserve_vm : Failed to allocate entry\n");
+-		err = -ENOMEM;
+-		goto out;
+-	}
+-	*entry = ((struct vm_reserved) 
+-		{ .list 	= LIST_HEAD_INIT(entry->list),
+-		  .start 	= start,
+-		  .end 		= end });
+-	list_add(&entry->list, &prev->list);
+-	err = 0;
+- out:
+-	up(&vm_reserved_sem);
+-	return(0);
+-}
+-
+-unsigned long get_vm(unsigned long len)
+-{
+-	struct vm_reserved *this, *next;
+-	struct list_head *ele;
+-	unsigned long start;
+-	int err;
+-	
+-	down(&vm_reserved_sem);
+-	list_for_each(ele, &vm_reserved){
+-		this = list_entry(ele, struct vm_reserved, list);
+-		next = list_entry(ele->next, struct vm_reserved, list);
+-		if((this->start < next->start) && 
+-		   (this->end + len + PAGE_SIZE <= next->start))
+-			goto found;
+-	}
+-	up(&vm_reserved_sem);
+-	return(0);
+- found:
+-	up(&vm_reserved_sem);
+-	start = (unsigned long) UML_ROUND_UP(this->end) + PAGE_SIZE;
+-	err = reserve_vm(start, start + len, NULL);
+-	if(err) return(0);
+-	return(start);
+-}
+-
+-int nregions(void)
+-{
+-	return(NREGIONS);
+-}
+-
+-void setup_range(int fd, char *driver, unsigned long start, unsigned long pfn,
+-		 unsigned long len, int need_vm, struct mem_region *region, 
+-		 void *reserved)
+-{
+-	int i, cur;
+-
+-	do {
+-		cur = min(len, (unsigned long) REGION_SIZE);
+-		i = setup_one_range(fd, driver, start, pfn, cur, region);
+-		region = regions[i];
+-		if(need_vm && setup_region(region, reserved)){
+-			kfree(region);
+-			regions[i] = NULL;
+-			return;
+-		}
+-		start += cur;
+-		if(pfn != -1) pfn += cur;
+-		len -= cur;
+-	} while(len > 0);
+-}
+-
+-struct iomem {
+-	char *name;
+-	int fd;
+-	unsigned long size;
+-};
+-
+-/* iomem regions can only be added on the command line at the moment.  
+- * Locking will be needed when they can be added via mconsole.
+- */
+-
+-struct iomem iomem_regions[NREGIONS] = { [ 0 ... NREGIONS - 1 ] =
+-					 { .name  	= NULL,
+-					   .fd  	= -1,
+-					   .size 	= 0 } };
+-
+-int num_iomem_regions = 0;
+-
+-void add_iomem(char *name, int fd, unsigned long size)
+-{
+-	if(num_iomem_regions == sizeof(iomem_regions)/sizeof(iomem_regions[0]))
+-		return;
+-	size = (size + PAGE_SIZE - 1) & PAGE_MASK;
+-	iomem_regions[num_iomem_regions++] = 
+-		((struct iomem) { .name 	= name,
+-				  .fd 		= fd,
+-				  .size 	= size } );
+-}
+-
+-int setup_iomem(void)
+-{
+-	struct iomem *iomem;
+-	int i;
+-
+-	for(i = 0; i < num_iomem_regions; i++){
+-		iomem = &iomem_regions[i];
+-		setup_range(iomem->fd, iomem->name, -1, -1, iomem->size, 1, 
+-			    NULL, NULL);
+-	}
+-	return(0);
+-}
+-
+-__initcall(setup_iomem);
+-
+-#define PFN_UP(x)	(((x) + PAGE_SIZE-1) >> PAGE_SHIFT)
+-#define PFN_DOWN(x)	((x) >> PAGE_SHIFT)
+-
+-/* Changed during early boot */
+-static struct mem_region physmem_region;
+-static struct vm_reserved physmem_reserved;
+-
+-void setup_physmem(unsigned long start, unsigned long reserve_end,
+-		   unsigned long len)
+-{
+-	struct mem_region *region = &physmem_region;
+-	struct vm_reserved *reserved = &physmem_reserved;
+-	unsigned long cur, pfn = 0;
+-	int do_free = 1, bootmap_size;
+-
+-	do {
+-		cur = min(len, (unsigned long) REGION_SIZE);
+-		if(region == NULL) 
+-			region = alloc_bootmem_low_pages(sizeof(*region));
+-		if(reserved == NULL) 
+-			reserved = alloc_bootmem_low_pages(sizeof(*reserved));
+-		if((region == NULL) || (reserved == NULL))
+-			panic("Couldn't allocate physmem region or vm "
+-			      "reservation\n");
+-		setup_range(-1, NULL, start, pfn, cur, 1, region, reserved);
+-
+-		if(do_free){
+-			unsigned long reserve = reserve_end - start;
+-			int pfn = PFN_UP(__pa(reserve_end));
+-			int delta = (len - reserve) >> PAGE_SHIFT;
+-
+-			bootmap_size = init_bootmem(pfn, pfn + delta);
+-			free_bootmem(__pa(reserve_end) + bootmap_size,
+-				     cur - bootmap_size - reserve);
+-			do_free = 0;
+-		}
+-		start += cur;
+-		pfn += cur >> PAGE_SHIFT;
+-		len -= cur;
+-		region = NULL;
+-		reserved = NULL;
+-	} while(len > 0);
+-}
+-
+-struct mem_region *phys_region(unsigned long phys)
+-{
+-	unsigned int n = phys_region_index(phys);
+-
+-	if(regions[n] == NULL) 
+-		panic("Physical address in uninitialized region");
+-	return(regions[n]);
+-}
+-
+-unsigned long phys_offset(unsigned long phys)
+-{
+-	return(phys_addr(phys));
+-}
+-
+-struct page *phys_mem_map(unsigned long phys)
+-{
+-	return((struct page *) phys_region(phys)->mem_map);
+-}
+-
+-struct page *pte_mem_map(pte_t pte)
+-{
+-	return(phys_mem_map(pte_val(pte)));
+-}
+-
+-struct mem_region *page_region(struct page *page, int *index_out)
+-{
+-	int i;
+-	struct mem_region *region;
+-	struct page *map;
+-
+-	for(i = 0; i < NREGIONS; i++){
+-		region = regions[i];
+-		if(region == NULL) continue;
+-		map = region->mem_map;
+-		if((page >= map) && (page < &map[region->len >> PAGE_SHIFT])){
+-			if(index_out != NULL) *index_out = i;
+-			return(region);
+-		}
+-	}
+-	panic("No region found for page");
+-	return(NULL);
+-}
+-
+-unsigned long page_to_pfn(struct page *page)
+-{
+-	struct mem_region *region = page_region(page, NULL);
+-
+-	return(region->start_pfn + (page - (struct page *) region->mem_map));
+-}
+-
+-struct mem_region *pfn_to_region(unsigned long pfn, int *index_out)
+-{
+-	struct mem_region *region;
+-	int i;
+-
+-	for(i = 0; i < NREGIONS; i++){
+-		region = regions[i];
+-		if(region == NULL)
+-			continue;
+-
+-		if((region->start_pfn <= pfn) &&
+-		   (region->start_pfn + (region->len >> PAGE_SHIFT) > pfn)){
+-			if(index_out != NULL) 
+-				*index_out = i;
+-			return(region);
+-		}
+-	}
+-	return(NULL);
+-}
+-
+-struct page *pfn_to_page(unsigned long pfn)
+-{
+-	struct mem_region *region = pfn_to_region(pfn, NULL);
+-	struct page *mem_map = (struct page *) region->mem_map;
+-
+-	return(&mem_map[pfn - region->start_pfn]);
+-}
+-
+-unsigned long phys_to_pfn(unsigned long p)
+-{
+-	struct mem_region *region = regions[phys_region_index(p)];
+-
+-	return(region->start_pfn + (phys_addr(p) >> PAGE_SHIFT));
+-}
+-
+-unsigned long pfn_to_phys(unsigned long pfn)
+-{
+-	int n;
+-	struct mem_region *region = pfn_to_region(pfn, &n);
+-
+-	return(mk_phys((pfn - region->start_pfn) << PAGE_SHIFT, n));
+-}
+-
+-struct page *page_mem_map(struct page *page)
+-{
+-	return((struct page *) page_region(page, NULL)->mem_map);
+-}
+-
+-extern unsigned long region_pa(void *virt)
+-{
+-	struct mem_region *region;
+-	unsigned long addr = (unsigned long) virt;
+-	int i;
+-
+-	for(i = 0; i < NREGIONS; i++){
+-		region = regions[i];
+-		if(region == NULL) continue;
+-		if((region->start <= addr) && 
+-		   (addr <= region->start + region->len))
+-			return(mk_phys(addr - region->start, i));
+-	}
+-	panic("region_pa : no region for virtual address");
+-	return(0);
+-}
+-
+-extern void *region_va(unsigned long phys)
+-{
+-	return((void *) (phys_region(phys)->start + phys_addr(phys)));
+-}
+-
+-unsigned long page_to_phys(struct page *page)
+-{
+-	int n;
+-	struct mem_region *region = page_region(page, &n);
+-	struct page *map = region->mem_map;
+-	return(mk_phys((page - map) << PAGE_SHIFT, n));
+-}
+-
+-struct page *phys_to_page(unsigned long phys)
+-{
+-	struct page *mem_map;
+-
+-	mem_map = phys_mem_map(phys);
+-	return(mem_map + (phys_offset(phys) >> PAGE_SHIFT));
+-}
+-
+-static int setup_mem_maps(void)
+-{
+-	struct mem_region *region;
+-	int i;
+-
+-	for(i = 0; i < NREGIONS; i++){
+-		region = regions[i];
+-		if((region != NULL) && (region->fd > 0)) init_maps(region);
+-	}
+-	return(0);
+-}
+-
+-__initcall(setup_mem_maps);
+-
+ /*
+  * Allocate and free page tables.
+  */
+diff -Naur a/arch/um/kernel/mem_user.c b/arch/um/kernel/mem_user.c
+--- a/arch/um/kernel/mem_user.c	2004-02-11 12:15:47.000000000 -0500
++++ b/arch/um/kernel/mem_user.c	2004-02-11 12:27:38.000000000 -0500
+@@ -34,10 +34,9 @@
+ #include <stddef.h>
+ #include <stdarg.h>
+ #include <unistd.h>
+-#include <fcntl.h>
+ #include <errno.h>
+ #include <string.h>
+-#include <sys/stat.h>
++#include <fcntl.h>
+ #include <sys/types.h>
+ #include <sys/mman.h>
+ #include "kern_util.h"
+@@ -47,105 +46,145 @@
+ #include "init.h"
+ #include "os.h"
+ #include "tempfile.h"
++#include "kern_constants.h"
+ 
+ extern struct mem_region physmem_region;
+ 
+ #define TEMPNAME_TEMPLATE "vm_file-XXXXXX"
+ 
+-int create_mem_file(unsigned long len)
++static int create_tmp_file(unsigned long len)
+ {
+-	int fd;
++	int fd, err;
+ 	char zero;
+ 
+ 	fd = make_tempfile(TEMPNAME_TEMPLATE, NULL, 1);
+-	if (fchmod(fd, 0777) < 0){
+-		perror("fchmod");
++	if(fd < 0) {
++		os_print_error(fd, "make_tempfile");
++		exit(1);
++	}
++
++	err = os_mode_fd(fd, 0777);
++	if(err < 0){
++		os_print_error(err, "os_mode_fd");
+ 		exit(1);
+ 	}
+-	if(os_seek_file(fd, len) < 0){
+-		perror("lseek");
++	err = os_seek_file(fd, len);
++	if(err < 0){
++		os_print_error(err, "os_seek_file");
+ 		exit(1);
+ 	}
+ 	zero = 0;
+-	if(write(fd, &zero, 1) != 1){
+-		perror("write");
++	err = os_write_file(fd, &zero, 1);
++	if(err != 1){
++		os_print_error(err, "os_write_file");
+ 		exit(1);
+ 	}
+-	if(fcntl(fd, F_SETFD, 1) != 0)
+-		perror("Setting FD_CLOEXEC failed");
++
+ 	return(fd);
+ }
+ 
+-int setup_region(struct mem_region *region, void *entry)
++static int have_devanon = 0;
++
++void check_devanon(void)
++{
++	int fd;
++
++	printk("Checking for /dev/anon on the host...");
++	fd = open("/dev/anon", O_RDWR);
++	if(fd < 0){
++		printk("Not available (open failed with errno %d)\n", errno);
++		return;
++	}
++
++	printk("OK\n");
++	have_devanon = 1;
++}
++
++static int create_anon_file(unsigned long len)
+ {
+-	void *loc, *start;
+-	char *driver;
+-	int err, offset;
+-
+-	if(region->start != -1){
+-		err = reserve_vm(region->start, 
+-				 region->start + region->len, entry);
+-		if(err){
+-			printk("setup_region : failed to reserve "
+-			       "0x%x - 0x%x for driver '%s'\n",
+-			       region->start, 
+-			       region->start + region->len,
+-			       region->driver);
+-			return(-1);
+-		}
+-	}
+-	else region->start = get_vm(region->len);
+-	if(region->start == 0){
+-		if(region->driver == NULL) driver = "physmem";
+-		else driver = region->driver;
+-		printk("setup_region : failed to find vm for "
+-		       "driver '%s' (length %d)\n", driver, region->len);
+-		return(-1);
+-	}
+-	if(region->start == uml_physmem){
+-		start = (void *) uml_reserved;
+-		offset = uml_reserved - uml_physmem;
+-	}
+-	else {
+-		start = (void *) region->start;
+-		offset = 0;
+-	}
+-
+-	loc = mmap(start, region->len - offset, PROT_READ | PROT_WRITE, 
+-		   MAP_SHARED | MAP_FIXED, region->fd, offset);
+-	if(loc != start){
+-		perror("Mapping memory");
++	void *addr;
++	int fd;
++
++	fd = open("/dev/anon", O_RDWR);
++	if(fd < 0) {
++		os_print_error(fd, "opening /dev/anon");
+ 		exit(1);
+ 	}
+-	return(0);
++
++	addr = mmap(NULL, len, PROT_READ | PROT_WRITE , MAP_PRIVATE, fd, 0);
++	if(addr == MAP_FAILED){
++		os_print_error((int) addr, "mapping physmem file");
++		exit(1);
++	}
++	munmap(addr, len);
++
++	return(fd);
++}
++
++int create_mem_file(unsigned long len)
++{
++	int err, fd;
++
++	if(have_devanon)
++		fd = create_anon_file(len);
++	else fd = create_tmp_file(len);
++
++	err = os_set_exec_close(fd, 1);
++	if(err < 0)
++		os_print_error(err, "exec_close");
++	return(fd);
+ }
+ 
++struct iomem_region *iomem_regions = NULL;
++int iomem_size = 0;
++
+ static int __init parse_iomem(char *str, int *add)
+ {
+-	struct stat buf;
++	struct iomem_region *new;
++	struct uml_stat buf;
+ 	char *file, *driver;
+-	int fd;
++	int fd, err;
+ 
+ 	driver = str;
+ 	file = strchr(str,',');
+ 	if(file == NULL){
+-		printk("parse_iomem : failed to parse iomem\n");
+-		return(1);
++		printf("parse_iomem : failed to parse iomem\n");
++		goto out;
+ 	}
+ 	*file = '\0';
+ 	file++;
+ 	fd = os_open_file(file, of_rdwr(OPENFLAGS()), 0);
+ 	if(fd < 0){
+-		printk("parse_iomem - Couldn't open io file, errno = %d\n", 
+-		       errno);
+-		return(1);
+-	}
+-	if(fstat(fd, &buf) < 0) {
+-		printk("parse_iomem - cannot fstat file, errno = %d\n", errno);
+-		return(1);
++		os_print_error(fd, "parse_iomem - Couldn't open io file");
++		goto out;
+ 	}
+-	add_iomem(driver, fd, buf.st_size);
++
++	err = os_stat_fd(fd, &buf);
++	if(err < 0){
++		os_print_error(err, "parse_iomem - cannot stat_fd file");
++		goto out_close;
++	}
++
++	new = malloc(sizeof(*new));
++	if(new == NULL){
++		perror("Couldn't allocate iomem_region struct");
++		goto out_close;
++	}
++
++	*new = ((struct iomem_region) { .next		= iomem_regions,
++					.driver		= driver,
++					.fd		= fd,
++					.size		= buf.ust_size,
++					.phys		= 0,
++					.virt		= 0 });
++	iomem_regions = new;
++	iomem_size += new->size + UM_KERN_PAGE_SIZE;
++
+ 	return(0);
++ out_close:
++	os_close_file(fd);
++ out:
++	return(1);
+ }
+ 
+ __uml_setup("iomem=", parse_iomem,
+@@ -153,73 +192,20 @@
+ "    Configure <file> as an IO memory region named <name>.\n\n"
+ );
+ 
+-#ifdef notdef
+-int logging = 0;
+-int logging_fd = -1;
+-
+-int logging_line = 0;
+-char logging_buf[256];
+-
+-void log(char *fmt, ...)
+-{
+-	va_list ap;
+-	struct timeval tv;
+-	struct openflags flags;
+-
+-	if(logging == 0) return;
+-	if(logging_fd < 0){
+-		flags = of_create(of_trunc(of_rdrw(OPENFLAGS())));
+-		logging_fd = os_open_file("log", flags, 0644);
+-	}
+-	gettimeofday(&tv, NULL);
+-	sprintf(logging_buf, "%d\t %u.%u  ", logging_line++, tv.tv_sec, 
+-		tv.tv_usec);
+-	va_start(ap, fmt);
+-	vsprintf(&logging_buf[strlen(logging_buf)], fmt, ap);
+-	va_end(ap);
+-	write(logging_fd, logging_buf, strlen(logging_buf));
+-}
+-#endif
+-
+-int map_memory(unsigned long virt, unsigned long phys, unsigned long len, 
+-	       int r, int w, int x)
+-{
+-	struct mem_region *region = phys_region(phys);
+-
+-	return(os_map_memory((void *) virt, region->fd, phys_offset(phys), len,
+-			     r, w, x));
+-}
+-
+ int protect_memory(unsigned long addr, unsigned long len, int r, int w, int x,
+ 		   int must_succeed)
+ {
+-	if(os_protect_memory((void *) addr, len, r, w, x) < 0){
++	int err;
++
++	err = os_protect_memory((void *) addr, len, r, w, x);
++	if(err < 0){
+                 if(must_succeed)
+-                        panic("protect failed, errno = %d", errno);
+-                else return(-errno);
++			panic("protect failed, err = %d", -err);
++		else return(err);
+ 	}
+ 	return(0);
+ }
+ 
+-unsigned long find_iomem(char *driver, unsigned long *len_out)
+-{
+-	struct mem_region *region;
+-	int i, n;
+-
+-	n = nregions();
+-	for(i = 0; i < n; i++){
+-		region = regions[i];
+-		if(region == NULL) continue;
+-		if((region->driver != NULL) &&
+-		   !strcmp(region->driver, driver)){
+-			*len_out = region->len;
+-			return(region->start);
+-		}
+-	}
+-	*len_out = 0;
+-	return 0;
+-}
+-
+ /*
+  * Overrides for Emacs so that we follow Linus's tabbing style.
+  * Emacs will notice this stuff at the end of the file and automatically
+diff -Naur a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c
+--- a/arch/um/kernel/physmem.c	1969-12-31 19:00:00.000000000 -0500
++++ b/arch/um/kernel/physmem.c	2004-02-11 12:26:07.000000000 -0500
+@@ -0,0 +1,468 @@
++/* 
++ * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
++ * Licensed under the GPL
++ */
++
++#include "linux/mm.h"
++#include "linux/ghash.h"
++#include "linux/slab.h"
++#include "linux/vmalloc.h"
++#include "linux/bootmem.h"
++#include "asm/types.h"
++#include "asm/pgtable.h"
++#include "kern_util.h"
++#include "user_util.h"
++#include "mode_kern.h"
++#include "mem.h"
++#include "mem_user.h"
++#include "os.h"
++#include "kern.h"
++#include "init.h"
++
++#if 0
++static pgd_t physmem_pgd[PTRS_PER_PGD];
++
++static struct phys_desc *lookup_mapping(void *addr)
++{
++	pgd = &physmem_pgd[pgd_index(addr)];
++	if(pgd_none(pgd))
++		return(NULL);
++
++	pmd = pmd_offset(pgd, addr);
++	if(pmd_none(pmd))
++		return(NULL);
++
++	pte = pte_offset_kernel(pmd, addr);
++	return((struct phys_desc *) pte_val(pte));
++}
++
++static struct add_mapping(void *addr, struct phys_desc *new)
++{
++}
++#endif
++
++#define PHYS_HASHSIZE (8192)
++
++struct phys_desc;
++
++DEF_HASH_STRUCTS(virtmem, PHYS_HASHSIZE, struct phys_desc);
++
++struct phys_desc {
++	struct virtmem_ptrs virt_ptrs;
++	int fd;
++	__u64 offset;
++	void *virt;
++	unsigned long phys;
++	struct list_head list;
++};
++
++struct virtmem_table virtmem_hash;
++
++static int virt_cmp(void *virt1, void *virt2)
++{
++	return(virt1 != virt2);
++}
++
++static int virt_hash(void *virt)
++{
++	unsigned long addr = ((unsigned long) virt) >> PAGE_SHIFT;
++	return(addr % PHYS_HASHSIZE);
++}
++
++DEF_HASH(static, virtmem, struct phys_desc, virt_ptrs, void *, virt, virt_cmp, 
++	 virt_hash);
++
++LIST_HEAD(descriptor_mappings);
++
++struct desc_mapping {
++	int fd;
++	struct list_head list;
++	struct list_head pages;
++};
++
++static struct desc_mapping *find_mapping(int fd)
++{
++	struct desc_mapping *desc;
++	struct list_head *ele;
++
++	list_for_each(ele, &descriptor_mappings){
++		desc = list_entry(ele, struct desc_mapping, list);
++		if(desc->fd == fd)
++			return(desc);
++	}
++
++	return(NULL);
++}
++
++static struct desc_mapping *descriptor_mapping(int fd)
++{
++	struct desc_mapping *desc;
++
++	desc = find_mapping(fd);
++	if(desc != NULL)
++		return(desc);
++
++	desc = kmalloc(sizeof(*desc), GFP_ATOMIC);
++	if(desc == NULL)
++		return(NULL);
++
++	*desc = ((struct desc_mapping) 
++		{ .fd =		fd,
++		  .list =	LIST_HEAD_INIT(desc->list),
++		  .pages =	LIST_HEAD_INIT(desc->pages) });
++	list_add(&desc->list, &descriptor_mappings);
++
++	return(desc);
++}
++
++int physmem_subst_mapping(void *virt, int fd, __u64 offset, int w)
++{
++	struct desc_mapping *fd_maps;
++	struct phys_desc *desc;
++	unsigned long phys;
++	int err;
++
++	fd_maps = descriptor_mapping(fd);
++	if(fd_maps == NULL)
++		return(-ENOMEM);
++
++	phys = __pa(virt);
++	if(find_virtmem_hash(&virtmem_hash, virt) != NULL)
++		panic("Address 0x%p is already substituted\n", virt);
++
++	err = -ENOMEM;
++	desc = kmalloc(sizeof(*desc), GFP_ATOMIC);
++	if(desc == NULL)
++		goto out;
++
++	*desc = ((struct phys_desc) 
++		{ .virt_ptrs =	{ NULL, NULL },
++		  .fd =		fd,
++		  .offset =		offset,
++		  .virt =		virt,
++		  .phys =		__pa(virt),
++		  .list = 		LIST_HEAD_INIT(desc->list) });
++	insert_virtmem_hash(&virtmem_hash, desc);
++
++	list_add(&desc->list, &fd_maps->pages);
++
++	virt = (void *) ((unsigned long) virt & PAGE_MASK);
++	err = os_map_memory(virt, fd, offset, PAGE_SIZE, 1, w, 0);
++	if(!err)
++		goto out;
++
++	remove_virtmem_hash(&virtmem_hash, desc);
++	kfree(desc);
++ out:
++	return(err);
++}
++
++static int physmem_fd = -1;
++
++static void remove_mapping(struct phys_desc *desc)
++{
++	void *virt = desc->virt;
++	int err;
++
++	remove_virtmem_hash(&virtmem_hash, desc);
++	list_del(&desc->list);
++	kfree(desc);
++
++	err = os_map_memory(virt, physmem_fd, __pa(virt), PAGE_SIZE, 1, 1, 0);
++	if(err)
++		panic("Failed to unmap block device page from physical memory, "
++		      "errno = %d", -err);
++}
++
++int physmem_remove_mapping(void *virt)
++{
++	struct phys_desc *desc;
++
++	virt = (void *) ((unsigned long) virt & PAGE_MASK);
++	desc = find_virtmem_hash(&virtmem_hash, virt);
++	if(desc == NULL)
++		return(0);
++
++	remove_mapping(desc);
++	return(1);
++}
++
++void physmem_forget_descriptor(int fd)
++{
++	struct desc_mapping *desc;
++	struct phys_desc *page;
++	struct list_head *ele, *next;
++	__u64 offset;
++	void *addr;
++	int err;
++
++	desc = find_mapping(fd);
++	if(desc == NULL)
++		return;
++
++	list_for_each_safe(ele, next, &desc->pages){
++		page = list_entry(ele, struct phys_desc, list);
++		offset = page->offset;
++		addr = page->virt;
++		remove_mapping(page);
++		err = os_seek_file(fd, offset);
++		if(err)
++			panic("physmem_forget_descriptor - failed to seek "
++			      "to %lld in fd %d, error = %d\n",
++			      offset, fd, -err);
++		err = os_read_file(fd, addr, PAGE_SIZE);
++		if(err < 0)
++			panic("physmem_forget_descriptor - failed to read "
++			      "from fd %d to 0x%p, error = %d\n",
++			      fd, addr, -err);
++	}
++
++	list_del(&desc->list);
++	kfree(desc);
++}
++
++void arch_free_page(struct page *page, int order)
++{
++	void *virt;
++	int i;
++
++	for(i = 0; i < (1 << order); i++){
++		virt = __va(page_to_phys(page + i));
++		physmem_remove_mapping(virt);
++	}
++}
++
++int is_remapped(void *virt)
++{
++	return(find_virtmem_hash(&virtmem_hash, virt) != NULL);
++}
++
++/* Changed during early boot */
++unsigned long high_physmem;
++
++extern unsigned long physmem_size;
++
++void *to_virt(unsigned long phys)
++{
++	return((void *) uml_physmem + phys);
++}
++
++unsigned long to_phys(void *virt)
++{
++	return(((unsigned long) virt) - uml_physmem);
++}
++
++int init_maps(unsigned long physmem, unsigned long iomem, unsigned long highmem)
++{
++	struct page *p, *map;
++	unsigned long phys_len, phys_pages, highmem_len, highmem_pages;
++	unsigned long iomem_len, iomem_pages, total_len, total_pages;
++	int i;
++
++	phys_pages = physmem >> PAGE_SHIFT;
++	phys_len = phys_pages * sizeof(struct page);
++
++	iomem_pages = iomem >> PAGE_SHIFT;
++	iomem_len = iomem_pages * sizeof(struct page);
++
++	highmem_pages = highmem >> PAGE_SHIFT;
++	highmem_len = highmem_pages * sizeof(struct page);
++
++	total_pages = phys_pages + iomem_pages + highmem_pages;
++	total_len = phys_len + iomem_pages + highmem_len;
++
++	if(kmalloc_ok){
++		map = kmalloc(total_len, GFP_KERNEL);
++		if(map == NULL) 
++			map = vmalloc(total_len);
++	}
++	else map = alloc_bootmem_low_pages(total_len);
++
++	if(map == NULL)
++		return(-ENOMEM);
++
++	for(i = 0; i < total_pages; i++){
++		p = &map[i];
++		set_page_count(p, 0);
++		SetPageReserved(p);
++		INIT_LIST_HEAD(&p->list);
++	}
++
++	mem_map = map;
++	max_mapnr = total_pages;
++	return(0);
++}
++
++struct page *phys_to_page(const unsigned long phys)
++{
++	return(&mem_map[phys >> PAGE_SHIFT]);
++}
++
++struct page *__virt_to_page(const unsigned long virt)
++{
++	return(&mem_map[__pa(virt) >> PAGE_SHIFT]);
++}
++
++unsigned long page_to_phys(struct page *page)
++{
++	return((page - mem_map) << PAGE_SHIFT);
++}
++
++pte_t mk_pte(struct page *page, pgprot_t pgprot)
++{
++	pte_t pte;
++
++	pte_val(pte) = page_to_phys(page) + pgprot_val(pgprot);
++	if(pte_present(pte)) pte_mknewprot(pte_mknewpage(pte));
++	return(pte);
++}
++
++/* Changed during early boot */
++static unsigned long kmem_top = 0;
++
++unsigned long get_kmem_end(void)
++{
++	if(kmem_top == 0) 
++		kmem_top = CHOOSE_MODE(kmem_end_tt, kmem_end_skas);
++	return(kmem_top);
++}
++
++void map_memory(unsigned long virt, unsigned long phys, unsigned long len, 
++		int r, int w, int x)
++{
++	__u64 offset;
++	int fd, err;
++
++	fd = phys_mapping(phys, &offset);
++	err = os_map_memory((void *) virt, fd, offset, len, r, w, x);
++	if(err)
++		panic("map_memory(0x%lx, %d, 0x%llx, %ld, %d, %d, %d) failed, "
++		      "err = %d\n", virt, fd, offset, len, r, w, x, err);
++}
++
++#define PFN_UP(x) (((x) + PAGE_SIZE-1) >> PAGE_SHIFT)
++
++void setup_physmem(unsigned long start, unsigned long reserve_end,
++		   unsigned long len, unsigned long highmem)
++{
++	unsigned long reserve = reserve_end - start;
++	int pfn = PFN_UP(__pa(reserve_end));
++	int delta = (len - reserve) >> PAGE_SHIFT;
++	int err, offset, bootmap_size;
++
++	physmem_fd = create_mem_file(len + highmem);
++
++	offset = uml_reserved - uml_physmem;
++	err = os_map_memory((void *) uml_reserved, physmem_fd, offset, 
++			    len - offset, 1, 1, 0);
++	if(err < 0){
++		os_print_error(err, "Mapping memory");
++		exit(1);
++	}
++
++	bootmap_size = init_bootmem(pfn, pfn + delta);
++	free_bootmem(__pa(reserve_end) + bootmap_size,
++		     len - bootmap_size - reserve);
++}
++
++int phys_mapping(unsigned long phys, __u64 *offset_out)
++{
++	struct phys_desc *desc = find_virtmem_hash(&virtmem_hash, 
++						   __va(phys & PAGE_MASK));
++	int fd = -1;
++
++	if(desc != NULL){
++		fd = desc->fd;
++		*offset_out = desc->offset;
++	}
++	else if(phys < physmem_size){
++		fd = physmem_fd;
++		*offset_out = phys;
++	}
++	else if(phys < __pa(end_iomem)){
++		struct iomem_region *region = iomem_regions;
++	
++		while(region != NULL){
++			if((phys >= region->phys) && 
++			   (phys < region->phys + region->size)){
++				fd = region->fd;
++				*offset_out = phys - region->phys;
++				break;
++			}
++			region = region->next;
++		}
++	}
++	else if(phys < __pa(end_iomem) + highmem){
++		fd = physmem_fd;
++		*offset_out = phys - iomem_size;
++	}
++
++	return(fd);
++}
++
++static int __init uml_mem_setup(char *line, int *add)
++{
++	char *retptr;
++	physmem_size = memparse(line,&retptr);
++	return 0;
++}
++__uml_setup("mem=", uml_mem_setup,
++"mem=<Amount of desired ram>\n"
++"    This controls how much \"physical\" memory the kernel allocates\n"
++"    for the system. The size is specified as a number followed by\n"
++"    one of 'k', 'K', 'm', 'M', which have the obvious meanings.\n"
++"    This is not related to the amount of memory in the host.  It can\n"
++"    be more, and the excess, if it's ever used, will just be swapped out.\n"
++"	Example: mem=64M\n\n"
++);
++
++unsigned long find_iomem(char *driver, unsigned long *len_out)
++{
++	struct iomem_region *region = iomem_regions;
++	
++	while(region != NULL){
++		if(!strcmp(region->driver, driver)){
++			*len_out = region->size;
++			return(region->virt);
++		}
++	}
++
++	return(0);
++}
++
++int setup_iomem(void)
++{
++	struct iomem_region *region = iomem_regions;
++	unsigned long iomem_start = high_physmem + PAGE_SIZE;
++	int err;
++
++	while(region != NULL){
++		err = os_map_memory((void *) iomem_start, region->fd, 0, 
++				    region->size, 1, 1, 0);
++		if(err)
++			printk("Mapping iomem region for driver '%s' failed, "
++			       "errno = %d\n", region->driver, -err);
++		else {
++			region->virt = iomem_start;
++			region->phys = __pa(region->virt);
++		}
++
++		iomem_start += region->size + PAGE_SIZE;
++		region = region->next;
++	}
++
++	return(0);
++}
++
++__initcall(setup_iomem);
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/arch/um/kernel/process.c b/arch/um/kernel/process.c
+--- a/arch/um/kernel/process.c	2004-02-11 12:16:36.000000000 -0500
++++ b/arch/um/kernel/process.c	2004-02-11 12:28:35.000000000 -0500
+@@ -9,12 +9,10 @@
+ #include <sched.h>
+ #include <errno.h>
+ #include <stdarg.h>
+-#include <fcntl.h>
+ #include <stdlib.h>
+ #include <setjmp.h>
+ #include <sys/time.h>
+ #include <sys/ptrace.h>
+-#include <sys/ioctl.h>
+ #include <sys/wait.h>
+ #include <sys/mman.h>
+ #include <asm/ptrace.h>
+@@ -58,7 +56,11 @@
+ {
+ 	int flags = altstack ? SA_ONSTACK : 0;
+ 
+-	set_handler(SIGSEGV, (__sighandler_t) sig_handler, flags,
++	/* NODEFER is set here because SEGV isn't turned back on when the 
++	 * handler is ready to receive signals.  This causes any segfault
++	 * during a copy_user to kill the process because the fault is blocked.
++	 */
++	set_handler(SIGSEGV, (__sighandler_t) sig_handler, flags | SA_NODEFER,
+ 		    SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);
+ 	set_handler(SIGTRAP, (__sighandler_t) sig_handler, flags, 
+ 		    SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);
+@@ -72,7 +74,6 @@
+ 		    SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);
+ 	set_handler(SIGUSR2, (__sighandler_t) sig_handler, 
+ 		    SA_NOMASK | flags, -1);
+-	(void) CHOOSE_MODE(signal(SIGCHLD, SIG_IGN), (void *) 0);
+ 	signal(SIGHUP, SIG_IGN);
+ 
+ 	init_irq_signals(altstack);
+@@ -123,11 +124,12 @@
+ 	/* Start the process and wait for it to kill itself */
+ 	new_pid = clone(outer_tramp, (void *) sp, clone_flags, &arg);
+ 	if(new_pid < 0) return(-errno);
+-	while((err = waitpid(new_pid, &status, 0) < 0) && (errno == EINTR)) ;
++	while(((err = waitpid(new_pid, &status, 0)) < 0) && (errno == EINTR)) ;
+ 	if(err < 0) panic("Waiting for outer trampoline failed - errno = %d", 
+ 			  errno);
+ 	if(!WIFSIGNALED(status) || (WTERMSIG(status) != SIGKILL))
+-		panic("outer trampoline didn't exit with SIGKILL");
++		panic("outer trampoline didn't exit with SIGKILL, "
++		      "status = %d", status);
+ 
+ 	return(arg.pid);
+ }
+@@ -138,7 +140,7 @@
+ 
+ 	os_stop_process(os_getpid());
+ 
+-	if(read(fd, &c, sizeof(c)) != sizeof(c))
++	if(os_read_file(fd, &c, sizeof(c)) != sizeof(c))
+ 		panic("read failed in suspend_new_thread");
+ }
+ 
+@@ -233,7 +235,7 @@
+ 	int n;
+ 
+ 	*jmp_ptr = &buf;
+-	n = setjmp(buf);
++	n = sigsetjmp(buf, 1);
+ 	if(n != 0)
+ 		return(n);
+ 	(*fn)(arg);
+@@ -273,7 +275,7 @@
+ 	stop_ptraced_child(pid, stack, 1);
+ 
+ 	printf("Checking for /proc/mm...");
+-	if(access("/proc/mm", W_OK)){
++	if(os_access("/proc/mm", OS_ACC_W_OK) < 0){
+ 		printf("not found\n");
+ 		ret = 0;
+ 	}
+diff -Naur a/arch/um/kernel/process_kern.c b/arch/um/kernel/process_kern.c
+--- a/arch/um/kernel/process_kern.c	2004-02-11 12:15:46.000000000 -0500
++++ b/arch/um/kernel/process_kern.c	2004-02-11 12:27:37.000000000 -0500
+@@ -16,6 +16,7 @@
+ #include "linux/module.h"
+ #include "linux/init.h"
+ #include "linux/capability.h"
++#include "linux/spinlock.h"
+ #include "asm/unistd.h"
+ #include "asm/mman.h"
+ #include "asm/segment.h"
+@@ -23,7 +24,6 @@
+ #include "asm/pgtable.h"
+ #include "asm/processor.h"
+ #include "asm/tlbflush.h"
+-#include "asm/spinlock.h"
+ #include "asm/uaccess.h"
+ #include "asm/user.h"
+ #include "user_util.h"
+@@ -52,17 +52,12 @@
+ 
+ struct task_struct *get_task(int pid, int require)
+ {
+-        struct task_struct *task, *ret;
++        struct task_struct *ret;
+ 
+-        ret = NULL;
+         read_lock(&tasklist_lock);
+-        for_each_process(task){
+-                if(task->pid == pid){
+-                        ret = task;
+-                        break;
+-                }
+-        }
++	ret = find_task_by_pid(pid);
+         read_unlock(&tasklist_lock);
++
+         if(require && (ret == NULL)) panic("get_task couldn't find a task\n");
+         return(ret);
+ }
+@@ -95,7 +90,8 @@
+ 	int flags = GFP_KERNEL;
+ 
+ 	if(atomic) flags |= GFP_ATOMIC;
+-	if((page = __get_free_pages(flags, order)) == 0)
++	page = __get_free_pages(flags, order);
++	if(page == 0)
+ 		return(0);
+ 	stack_protections(page);
+ 	return(page);
+@@ -103,13 +99,15 @@
+ 
+ int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
+ {
+-	struct task_struct *p;
++	int pid;
+ 
+ 	current->thread.request.u.thread.proc = fn;
+ 	current->thread.request.u.thread.arg = arg;
+-	p = do_fork(CLONE_VM | flags, 0, NULL, 0, NULL, NULL);
+-	if(IS_ERR(p)) panic("do_fork failed in kernel_thread");
+-	return(p->pid);
++	pid = do_fork(CLONE_VM | CLONE_UNTRACED | flags, 0, NULL, 0, NULL, 
++		      NULL);
++	if(pid < 0)
++		panic("do_fork failed in kernel_thread, errno = %d", pid);
++	return(pid);
+ }
+ 
+ void switch_mm(struct mm_struct *prev, struct mm_struct *next, 
+@@ -129,7 +127,7 @@
+ 		{ external_pid(task), task });
+ }
+ 
+-void *switch_to(void *prev, void *next, void *last)
++void *_switch_to(void *prev, void *next, void *last)
+ {
+ 	return(CHOOSE_MODE(switch_to_tt(prev, next), 
+ 			   switch_to_skas(prev, next)));
+@@ -149,7 +147,7 @@
+ void exit_thread(void)
+ {
+ 	CHOOSE_MODE(exit_thread_tt(), exit_thread_skas());
+-	unprotect_stack((unsigned long) current->thread_info);
++	unprotect_stack((unsigned long) current_thread);
+ }
+  
+ void *get_current(void)
+@@ -157,6 +155,10 @@
+ 	return(current);
+ }
+ 
++void prepare_to_copy(struct task_struct *tsk)
++{
++}
++
+ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
+ 		unsigned long stack_top, struct task_struct * p, 
+ 		struct pt_regs *regs)
+@@ -190,7 +192,7 @@
+ 
+ void default_idle(void)
+ {
+-	idle_timer();
++	uml_idle_timer();
+ 
+ 	atomic_inc(&init_mm.mm_count);
+ 	current->mm = &init_mm;
+@@ -367,10 +369,15 @@
+ 	return(clear_user(buf, size));
+ }
+ 
++int strlen_user_proc(char *str)
++{
++	return(strlen_user(str));
++}
++
+ int smp_sigio_handler(void)
+ {
+ #ifdef CONFIG_SMP
+-	int cpu = current->thread_info->cpu;
++	int cpu = current_thread->cpu;
+ 	IPI_handler(cpu);
+ 	if(cpu != 0)
+ 		return(1);
+@@ -385,7 +392,7 @@
+ 
+ int cpu(void)
+ {
+-	return(current->thread_info->cpu);
++	return(current_thread->cpu);
+ }
+ 
+ /*
+diff -Naur a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c
+--- a/arch/um/kernel/ptrace.c	2004-02-11 12:14:24.000000000 -0500
++++ b/arch/um/kernel/ptrace.c	2004-02-11 12:26:07.000000000 -0500
+@@ -311,11 +311,8 @@
+ 
+ 	/* the 0x80 provides a way for the tracing parent to distinguish
+ 	   between a syscall stop and SIGTRAP delivery */
+- 	current->exit_code = SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
+- 					? 0x80 : 0);
+-	current->state = TASK_STOPPED;
+-	notify_parent(current, SIGCHLD);
+-	schedule();
++	ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
++				 ? 0x80 : 0));
+ 
+ 	/*
+ 	 * this isn't the same as continuing with a signal, but it will do
+diff -Naur a/arch/um/kernel/reboot.c b/arch/um/kernel/reboot.c
+--- a/arch/um/kernel/reboot.c	2004-02-11 12:15:45.000000000 -0500
++++ b/arch/um/kernel/reboot.c	2004-02-11 12:27:36.000000000 -0500
+@@ -15,6 +15,7 @@
+ #ifdef CONFIG_SMP
+ static void kill_idlers(int me)
+ {
++#ifdef CONFIG_MODE_TT
+ 	struct task_struct *p;
+ 	int i;
+ 
+@@ -23,6 +24,7 @@
+ 		if((p != NULL) && (p->thread.mode.tt.extern_pid != me))
+ 			os_kill_process(p->thread.mode.tt.extern_pid, 0);
+ 	}
++#endif
+ }
+ #endif
+ 
+diff -Naur a/arch/um/kernel/sigio_kern.c b/arch/um/kernel/sigio_kern.c
+--- a/arch/um/kernel/sigio_kern.c	2004-02-11 12:14:33.000000000 -0500
++++ b/arch/um/kernel/sigio_kern.c	2004-02-11 12:26:17.000000000 -0500
+@@ -6,18 +6,21 @@
+ #include "linux/kernel.h"
+ #include "linux/list.h"
+ #include "linux/slab.h"
+-#include "asm/irq.h"
++#include "linux/signal.h"
++#include "linux/interrupt.h"
+ #include "init.h"
+ #include "sigio.h"
+ #include "irq_user.h"
++#include "irq_kern.h"
+ 
+ /* Protected by sigio_lock() called from write_sigio_workaround */
+ static int sigio_irq_fd = -1;
+ 
+-void sigio_interrupt(int irq, void *data, struct pt_regs *unused)
++irqreturn_t sigio_interrupt(int irq, void *data, struct pt_regs *unused)
+ {
+ 	read_sigio_fd(sigio_irq_fd);
+ 	reactivate_fd(sigio_irq_fd, SIGIO_WRITE_IRQ);
++	return(IRQ_HANDLED);
+ }
+ 
+ int write_sigio_irq(int fd)
+diff -Naur a/arch/um/kernel/sigio_user.c b/arch/um/kernel/sigio_user.c
+--- a/arch/um/kernel/sigio_user.c	2004-02-11 12:16:48.000000000 -0500
++++ b/arch/um/kernel/sigio_user.c	2004-02-11 12:29:02.000000000 -0500
+@@ -7,7 +7,6 @@
+ #include <stdlib.h>
+ #include <termios.h>
+ #include <pty.h>
+-#include <fcntl.h>
+ #include <signal.h>
+ #include <errno.h>
+ #include <string.h>
+@@ -26,7 +25,7 @@
+ int pty_close_sigio = 0;
+ 
+ /* Used as a flag during SIGIO testing early in boot */
+-static int got_sigio = 0;
++static volatile int got_sigio = 0;
+ 
+ void __init handler(int sig)
+ {
+@@ -45,7 +44,7 @@
+ 
+ 	info->err = 0;
+ 	if(openpty(&info->master, &info->slave, NULL, NULL, NULL))
+-		info->err = errno;
++		info->err = -errno;
+ }
+ 
+ void __init check_one_sigio(void (*proc)(int, int))
+@@ -53,11 +52,11 @@
+ 	struct sigaction old, new;
+ 	struct termios tt;
+ 	struct openpty_arg pty = { .master = -1, .slave = -1 };
+-	int master, slave, flags;
++	int master, slave, err;
+ 
+ 	initial_thread_cb(openpty_cb, &pty);
+ 	if(pty.err){
+-		printk("openpty failed, errno = %d\n", pty.err);
++		printk("openpty failed, errno = %d\n", -pty.err);
+ 		return;
+ 	}
+ 
+@@ -69,23 +68,16 @@
+ 		return;
+ 	}
+ 
++	/* XXX These can fail with EINTR */
+ 	if(tcgetattr(master, &tt) < 0)
+ 		panic("check_sigio : tcgetattr failed, errno = %d\n", errno);
+ 	cfmakeraw(&tt);
+ 	if(tcsetattr(master, TCSADRAIN, &tt) < 0)
+ 		panic("check_sigio : tcsetattr failed, errno = %d\n", errno);
+ 
+-	if((flags = fcntl(master, F_GETFL)) < 0)
+-		panic("tty_fds : fcntl F_GETFL failed, errno = %d\n", errno);
+-
+-	if((fcntl(master, F_SETFL, flags | O_NONBLOCK | O_ASYNC) < 0) ||
+-	   (fcntl(master, F_SETOWN, os_getpid()) < 0))
+-		panic("check_sigio : fcntl F_SETFL or F_SETOWN failed, "
+-		      "errno = %d\n", errno);
+-
+-	if((fcntl(slave, F_SETFL, flags | O_NONBLOCK) < 0))
+-		panic("check_sigio : fcntl F_SETFL failed, errno = %d\n", 
+-		      errno);
++	err = os_sigio_async(master, slave);
++	if(err < 0)
++		panic("tty_fds : sigio_async failed, err = %d\n", -err);
+ 
+ 	if(sigaction(SIGIO, NULL, &old) < 0)
+ 		panic("check_sigio : sigaction 1 failed, errno = %d\n", errno);
+@@ -97,8 +89,8 @@
+ 	got_sigio = 0;
+ 	(*proc)(master, slave);
+ 		
+-	close(master);
+-	close(slave);
++	os_close_file(master);
++	os_close_file(slave);
+ 
+ 	if(sigaction(SIGIO, &old, NULL) < 0)
+ 		panic("check_sigio : sigaction 3 failed, errno = %d\n", errno);
+@@ -112,25 +104,25 @@
+ 	printk("Checking that host ptys support output SIGIO...");
+ 
+ 	memset(buf, 0, sizeof(buf));
+-	while(write(master, buf, sizeof(buf)) > 0) ;
++
++	while(os_write_file(master, buf, sizeof(buf)) > 0) ;
+ 	if(errno != EAGAIN)
+ 		panic("check_sigio : write failed, errno = %d\n", errno);
+-
+-	while(((n = read(slave, buf, sizeof(buf))) > 0) && !got_sigio) ;
++	while(((n = os_read_file(slave, buf, sizeof(buf))) > 0) && !got_sigio) ;
+ 
+ 	if(got_sigio){
+ 		printk("Yes\n");
+ 		pty_output_sigio = 1;
+ 	}
+-	else if(errno == EAGAIN) printk("No, enabling workaround\n");
+-	else panic("check_sigio : read failed, errno = %d\n", errno);
++	else if(n == -EAGAIN) printk("No, enabling workaround\n");
++	else panic("check_sigio : read failed, err = %d\n", n);
+ }
+ 
+ static void tty_close(int master, int slave)
+ {
+ 	printk("Checking that host ptys support SIGIO on close...");
+ 
+-	close(slave);
++	os_close_file(slave);
+ 	if(got_sigio){
+ 		printk("Yes\n");
+ 		pty_close_sigio = 1;
+@@ -140,7 +132,8 @@
+ 
+ void __init check_sigio(void)
+ {
+-	if(access("/dev/ptmx", R_OK) && access("/dev/ptyp0", R_OK)){
++	if((os_access("/dev/ptmx", OS_ACC_R_OK) < 0) &&
++	   (os_access("/dev/ptyp0", OS_ACC_R_OK) < 0)){
+ 		printk("No pseudo-terminals available - skipping pty SIGIO "
+ 		       "check\n");
+ 		return;
+@@ -201,11 +194,10 @@
+ 			p = &fds->poll[i];
+ 			if(p->revents == 0) continue;
+ 			if(p->fd == sigio_private[1]){
+-				n = read(sigio_private[1], &c, sizeof(c));
++				n = os_read_file(sigio_private[1], &c, sizeof(c));
+ 				if(n != sizeof(c))
+ 					printk("write_sigio_thread : "
+-					       "read failed, errno = %d\n",
+-					       errno);
++					       "read failed, err = %d\n", -n);
+ 				tmp = current_poll;
+ 				current_poll = next_poll;
+ 				next_poll = tmp;
+@@ -218,10 +210,10 @@
+ 					(fds->used - i) * sizeof(*fds->poll));
+ 			}
+ 
+-			n = write(respond_fd, &c, sizeof(c));
++			n = os_write_file(respond_fd, &c, sizeof(c));
+ 			if(n != sizeof(c))
+ 				printk("write_sigio_thread : write failed, "
+-				       "errno = %d\n", errno);
++				       "err = %d\n", -n);
+ 		}
+ 	}
+ }
+@@ -252,15 +244,15 @@
+ 	char c;
+ 
+ 	flags = set_signals(0);
+-	n = write(sigio_private[0], &c, sizeof(c));
++	n = os_write_file(sigio_private[0], &c, sizeof(c));
+ 	if(n != sizeof(c)){
+-		printk("update_thread : write failed, errno = %d\n", errno);
++		printk("update_thread : write failed, err = %d\n", -n);
+ 		goto fail;
+ 	}
+ 
+-	n = read(sigio_private[0], &c, sizeof(c));
++	n = os_read_file(sigio_private[0], &c, sizeof(c));
+ 	if(n != sizeof(c)){
+-		printk("update_thread : read failed, errno = %d\n", errno);
++		printk("update_thread : read failed, err = %d\n", -n);
+ 		goto fail;
+ 	}
+ 
+@@ -271,10 +263,10 @@
+ 	if(write_sigio_pid != -1) 
+ 		os_kill_process(write_sigio_pid, 1);
+ 	write_sigio_pid = -1;
+-	close(sigio_private[0]);
+-	close(sigio_private[1]);	
+-	close(write_sigio_fds[0]);
+-	close(write_sigio_fds[1]);
++	os_close_file(sigio_private[0]);
++	os_close_file(sigio_private[1]);	
++	os_close_file(write_sigio_fds[0]);
++	os_close_file(write_sigio_fds[1]);
+ 	sigio_unlock();
+ 	set_signals(flags);
+ }
+@@ -369,15 +361,15 @@
+ 		goto out;
+ 
+ 	err = os_pipe(write_sigio_fds, 1, 1);
+-	if(err){
++	if(err < 0){
+ 		printk("write_sigio_workaround - os_pipe 1 failed, "
+-		       "errno = %d\n", -err);
++		       "err = %d\n", -err);
+ 		goto out;
+ 	}
+ 	err = os_pipe(sigio_private, 1, 1);
+-	if(err){
++	if(err < 0){
+ 		printk("write_sigio_workaround - os_pipe 2 failed, "
+-		       "errno = %d\n", -err);
++		       "err = %d\n", -err);
+ 		goto out_close1;
+ 	}
+ 	if(setup_initial_poll(sigio_private[1]))
+@@ -399,11 +391,11 @@
+ 	os_kill_process(write_sigio_pid, 1);
+ 	write_sigio_pid = -1;
+  out_close2:
+-	close(sigio_private[0]);
+-	close(sigio_private[1]);	
++	os_close_file(sigio_private[0]);
++	os_close_file(sigio_private[1]);	
+  out_close1:
+-	close(write_sigio_fds[0]);
+-	close(write_sigio_fds[1]);
++	os_close_file(write_sigio_fds[0]);
++	os_close_file(write_sigio_fds[1]);
+ 	sigio_unlock();
+ }
+ 
+@@ -412,10 +404,16 @@
+ 	int n;
+ 	char c;
+ 
+-	n = read(fd, &c, sizeof(c));
++	n = os_read_file(fd, &c, sizeof(c));
+ 	if(n != sizeof(c)){
+-		printk("read_sigio_fd - read failed, errno = %d\n", errno);
+-		return(-errno);
++		if(n < 0) {
++			printk("read_sigio_fd - read failed, err = %d\n", -n);
++			return(n);
++		} 
++		else { 
++			printk("read_sigio_fd - short read, bytes = %d\n", n);
++			return(-EIO);
++		}
+ 	}
+ 	return(n);
+ }
+diff -Naur a/arch/um/kernel/signal_kern.c b/arch/um/kernel/signal_kern.c
+--- a/arch/um/kernel/signal_kern.c	2004-02-11 12:15:52.000000000 -0500
++++ b/arch/um/kernel/signal_kern.c	2004-02-11 12:27:44.000000000 -0500
+@@ -36,7 +36,7 @@
+ 	if(sig == SIGSEGV){
+ 		struct k_sigaction *ka;
+ 
+-		ka = &current->sig->action[SIGSEGV - 1];
++		ka = &current->sighand->action[SIGSEGV - 1];
+ 		ka->sa.sa_handler = SIG_DFL;
+ 	}
+ 	force_sig(SIGSEGV, current);
+@@ -60,10 +60,10 @@
+ 	int err, ret;
+ 
+ 	ret = 0;
++	/* Always make any pending restarted system calls return -EINTR */
++	current_thread_info()->restart_block.fn = do_no_restart_syscall;
+ 	switch(error){
+ 	case -ERESTART_RESTARTBLOCK:
+-		current_thread_info()->restart_block.fn = 
+-			do_no_restart_syscall;
+ 	case -ERESTARTNOHAND:
+ 		ret = -EINTR;
+ 		break;
+@@ -142,7 +142,7 @@
+ 		return(0);
+ 
+ 	/* Whee!  Actually deliver the signal.  */
+-	ka = &current->sig->action[sig -1 ];
++	ka = &current->sighand->action[sig -1 ];
+ 	err = handle_signal(regs, sig, ka, &info, oldset, error);
+ 	if(!err) return(1);
+ 
+@@ -201,7 +201,7 @@
+ 	}
+ }
+ 
+-int sys_rt_sigsuspend(sigset_t *unewset, size_t sigsetsize)
++int sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize)
+ {
+ 	sigset_t saveset, newset;
+ 
+@@ -227,20 +227,59 @@
+ 	}
+ }
+ 
++int sys_sigaction(int sig, const struct old_sigaction __user *act,
++			 struct old_sigaction __user *oact)
++{
++	struct k_sigaction new_ka, old_ka;
++	int ret;
++
++	if (act) {
++		old_sigset_t mask;
++		if (verify_area(VERIFY_READ, act, sizeof(*act)) ||
++		    __get_user(new_ka.sa.sa_handler, &act->sa_handler) ||
++		    __get_user(new_ka.sa.sa_restorer, &act->sa_restorer))
++			return -EFAULT;
++		__get_user(new_ka.sa.sa_flags, &act->sa_flags);
++		__get_user(mask, &act->sa_mask);
++		siginitset(&new_ka.sa.sa_mask, mask);
++	}
++
++	ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
++
++	if (!ret && oact) {
++		if (verify_area(VERIFY_WRITE, oact, sizeof(*oact)) ||
++		    __put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||
++		    __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer))
++			return -EFAULT;
++		__put_user(old_ka.sa.sa_flags, &oact->sa_flags);
++		__put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask);
++	}
++
++	return ret;
++}
++
++int sys_sigaltstack(const stack_t *uss, stack_t *uoss)
++{
++	return(do_sigaltstack(uss, uoss, PT_REGS_SP(&current->thread.regs)));
++}
++
++extern int userspace_pid[];
++
+ static int copy_sc_from_user(struct pt_regs *to, void *from, 
+ 			     struct arch_frame_data *arch)
+ {
+ 	int ret;
+ 
+ 	ret = CHOOSE_MODE(copy_sc_from_user_tt(UPT_SC(&to->regs), from, arch),
+-			  copy_sc_from_user_skas(&to->regs, from));
++			  copy_sc_from_user_skas(userspace_pid[0], 
++						 &to->regs, from));
+ 	return(ret);
+ }
+ 
+ int sys_sigreturn(struct pt_regs regs)
+ {
+-	void *sc = sp_to_sc(PT_REGS_SP(&current->thread.regs));
+-	void *mask = sp_to_mask(PT_REGS_SP(&current->thread.regs));
++	void __user *sc = sp_to_sc(PT_REGS_SP(&current->thread.regs));
++	void __user *mask = sp_to_mask(PT_REGS_SP(&current->thread.regs));
+ 	int sig_size = (_NSIG_WORDS - 1) * sizeof(unsigned long);
+ 
+ 	spin_lock_irq(&current->sighand->siglock);
+@@ -257,8 +296,8 @@
+ 
+ int sys_rt_sigreturn(struct pt_regs regs)
+ {
+-	struct ucontext *uc = sp_to_uc(PT_REGS_SP(&current->thread.regs));
+-	void *fp;
++	unsigned long sp = PT_REGS_SP(&current->thread.regs);
++	struct ucontext __user *uc = sp_to_uc(sp);
+ 	int sig_size = _NSIG_WORDS * sizeof(unsigned long);
+ 
+ 	spin_lock_irq(&current->sighand->siglock);
+@@ -266,7 +305,6 @@
+ 	sigdelsetmask(&current->blocked, ~_BLOCKABLE);
+ 	recalc_sigpending();
+ 	spin_unlock_irq(&current->sighand->siglock);
+-	fp = (void *) (((unsigned long) uc) + sizeof(struct ucontext));
+ 	copy_sc_from_user(&current->thread.regs, &uc->uc_mcontext,
+ 			  &signal_frame_si.common.arch);
+ 	return(PT_REGS_SYSCALL_RET(&current->thread.regs));
+diff -Naur a/arch/um/kernel/skas/include/mode.h b/arch/um/kernel/skas/include/mode.h
+--- a/arch/um/kernel/skas/include/mode.h	2004-02-11 12:15:48.000000000 -0500
++++ b/arch/um/kernel/skas/include/mode.h	2004-02-11 12:27:41.000000000 -0500
+@@ -12,14 +12,16 @@
+ extern int have_fpx_regs;
+ 
+ extern void user_time_init_skas(void);
+-extern int copy_sc_from_user_skas(union uml_pt_regs *regs, void *from_ptr);
+-extern int copy_sc_to_user_skas(void *to_ptr, void *fp, 
++extern int copy_sc_from_user_skas(int pid, union uml_pt_regs *regs, 
++				  void *from_ptr);
++extern int copy_sc_to_user_skas(int pid, void *to_ptr, void *fp, 
+ 				union uml_pt_regs *regs, 
+ 				unsigned long fault_addr, int fault_type);
+ extern void sig_handler_common_skas(int sig, void *sc_ptr);
+ extern void halt_skas(void);
+ extern void reboot_skas(void);
+ extern void kill_off_processes_skas(void);
++extern int is_skas_winch(int pid, int fd, void *data);
+ 
+ #endif
+ 
+diff -Naur a/arch/um/kernel/skas/include/skas.h b/arch/um/kernel/skas/include/skas.h
+--- a/arch/um/kernel/skas/include/skas.h	2004-02-11 12:14:37.000000000 -0500
++++ b/arch/um/kernel/skas/include/skas.h	2004-02-11 12:26:22.000000000 -0500
+@@ -8,7 +8,7 @@
+ 
+ #include "sysdep/ptrace.h"
+ 
+-extern int userspace_pid;
++extern int userspace_pid[];
+ 
+ extern void switch_threads(void *me, void *next);
+ extern void thread_wait(void *sw, void *fb);
+@@ -32,7 +32,7 @@
+ extern int new_mm(int from);
+ extern void save_registers(union uml_pt_regs *regs);
+ extern void restore_registers(union uml_pt_regs *regs);
+-extern void start_userspace(void);
++extern void start_userspace(int cpu);
+ extern void init_registers(int pid);
+ 
+ #endif
+diff -Naur a/arch/um/kernel/skas/include/uaccess.h b/arch/um/kernel/skas/include/uaccess.h
+--- a/arch/um/kernel/skas/include/uaccess.h	2004-02-11 12:15:17.000000000 -0500
++++ b/arch/um/kernel/skas/include/uaccess.h	2004-02-11 12:27:05.000000000 -0500
+@@ -6,20 +6,12 @@
+ #ifndef __SKAS_UACCESS_H
+ #define __SKAS_UACCESS_H
+ 
+-#include "linux/string.h"
+-#include "linux/sched.h"
+-#include "linux/err.h"
+-#include "asm/processor.h"
+-#include "asm/pgtable.h"
+ #include "asm/errno.h"
+-#include "asm/current.h"
+-#include "asm/a.out.h"
+-#include "kern_util.h"
+ 
+ #define access_ok_skas(type, addr, size) \
+ 	((segment_eq(get_fs(), KERNEL_DS)) || \
+ 	 (((unsigned long) (addr) < TASK_SIZE) && \
+-	  ((unsigned long) (addr) + (size) < TASK_SIZE)))
++	  ((unsigned long) (addr) + (size) <= TASK_SIZE)))
+ 
+ static inline int verify_area_skas(int type, const void * addr, 
+ 				   unsigned long size)
+@@ -27,197 +19,12 @@
+ 	return(access_ok_skas(type, addr, size) ? 0 : -EFAULT);
+ }
+ 
+-static inline unsigned long maybe_map(unsigned long virt, int is_write)
+-{
+-	pte_t pte;
+-
+-	void *phys = um_virt_to_phys(current, virt, &pte);
+-	int dummy_code;
+-
+-	if(IS_ERR(phys) || (is_write && !pte_write(pte))){
+-		if(handle_page_fault(virt, 0, is_write, 0, &dummy_code))
+-			return(0);
+-		phys = um_virt_to_phys(current, virt, NULL);
+-	}
+-	return((unsigned long) __va((unsigned long) phys));
+-}
+-
+-static inline int buffer_op(unsigned long addr, int len, 
+-			    int (*op)(unsigned long addr, int len, void *arg),
+-			    void *arg)
+-{
+-	int size = min(PAGE_ALIGN(addr) - addr, (unsigned long) len);
+-	int remain = len, n;
+-
+-	n = (*op)(addr, size, arg);
+-	if(n != 0)
+-		return(n < 0 ? remain : 0);
+-
+-	addr += size;
+-	remain -= size;
+-	if(remain == 0) 
+-		return(0);
+-
+-	while(addr < ((addr + remain) & PAGE_MASK)){
+-		n = (*op)(addr, PAGE_SIZE, arg);
+-		if(n != 0)
+-			return(n < 0 ? remain : 0);
+-
+-		addr += PAGE_SIZE;
+-		remain -= PAGE_SIZE;
+-	}
+-	if(remain == 0)
+-		return(0);
+-
+-	n = (*op)(addr, remain, arg);
+-	if(n != 0)
+-		return(n < 0 ? remain : 0);
+-	return(0);
+-}
+-
+-static inline int copy_chunk_from_user(unsigned long from, int len, void *arg)
+-{
+-	unsigned long *to_ptr = arg, to = *to_ptr;
+-
+-	from = maybe_map(from, 0);
+-	if(from == 0)
+-		return(-1);
+-
+-	memcpy((void *) to, (void *) from, len);
+-	*to_ptr += len;
+-	return(0);
+-}
+-
+-static inline int copy_from_user_skas(void *to, const void *from, int n)
+-{
+-	if(segment_eq(get_fs(), KERNEL_DS)){
+-		memcpy(to, from, n);
+-		return(0);
+-	}
+-
+-	return(access_ok_skas(VERIFY_READ, from, n) ?
+-	       buffer_op((unsigned long) from, n, copy_chunk_from_user, &to) :
+-	       n);
+-}
+-
+-static inline int copy_chunk_to_user(unsigned long to, int len, void *arg)
+-{
+-	unsigned long *from_ptr = arg, from = *from_ptr;
+-
+-	to = maybe_map(to, 1);
+-	if(to == 0)
+-		return(-1);
+-
+-	memcpy((void *) to, (void *) from, len);
+-	*from_ptr += len;
+-	return(0);
+-}
+-
+-static inline int copy_to_user_skas(void *to, const void *from, int n)
+-{
+-	if(segment_eq(get_fs(), KERNEL_DS)){
+-		memcpy(to, from, n);
+-		return(0);
+-	}
+-
+-	return(access_ok_skas(VERIFY_WRITE, to, n) ?
+-	       buffer_op((unsigned long) to, n, copy_chunk_to_user, &from) :
+-	       n);
+-}
+-
+-static inline int strncpy_chunk_from_user(unsigned long from, int len, 
+-					  void *arg)
+-{
+-        char **to_ptr = arg, *to = *to_ptr;
+-	int n;
+-
+-	from = maybe_map(from, 0);
+-	if(from == 0)
+-		return(-1);
+-
+-	strncpy(to, (void *) from, len);
+-	n = strnlen(to, len);
+-	*to_ptr += n;
+-
+-	if(n < len) 
+-	        return(1);
+-	return(0);
+-}
+-
+-static inline int strncpy_from_user_skas(char *dst, const char *src, int count)
+-{
+-	int n;
+-	char *ptr = dst;
+-
+-	if(segment_eq(get_fs(), KERNEL_DS)){
+-		strncpy(dst, src, count);
+-		return(strnlen(dst, count));
+-	}
+-
+-	if(!access_ok_skas(VERIFY_READ, src, 1))
+-		return(-EFAULT);
+-
+-	n = buffer_op((unsigned long) src, count, strncpy_chunk_from_user, 
+-		      &ptr);
+-	if(n != 0)
+-		return(-EFAULT);
+-	return(strnlen(dst, count));
+-}
+-
+-static inline int clear_chunk(unsigned long addr, int len, void *unused)
+-{
+-	addr = maybe_map(addr, 1);
+-	if(addr == 0) 
+-		return(-1);
+-
+-	memset((void *) addr, 0, len);
+-	return(0);
+-}
+-
+-static inline int __clear_user_skas(void *mem, int len)
+-{
+-	return(buffer_op((unsigned long) mem, len, clear_chunk, NULL));
+-}
+-
+-static inline int clear_user_skas(void *mem, int len)
+-{
+-	if(segment_eq(get_fs(), KERNEL_DS)){
+-		memset(mem, 0, len);
+-		return(0);
+-	}
+-
+-	return(access_ok_skas(VERIFY_WRITE, mem, len) ? 
+-	       buffer_op((unsigned long) mem, len, clear_chunk, NULL) : len);
+-}
+-
+-static inline int strnlen_chunk(unsigned long str, int len, void *arg)
+-{
+-	int *len_ptr = arg, n;
+-
+-	str = maybe_map(str, 0);
+-	if(str == 0) 
+-		return(-1);
+-
+-	n = strnlen((void *) str, len);
+-	*len_ptr += n;
+-
+-	if(n < len)
+-		return(1);
+-	return(0);
+-}
+-
+-static inline int strnlen_user_skas(const void *str, int len)
+-{
+-	int count = 0, n;
+-
+-	if(segment_eq(get_fs(), KERNEL_DS))
+-		return(strnlen(str, len) + 1);
+-
+-	n = buffer_op((unsigned long) str, len, strnlen_chunk, &count);
+-	if(n == 0)
+-		return(count + 1);
+-	return(-EFAULT);
+-}
++extern int copy_from_user_skas(void *to, const void *from, int n);
++extern int copy_to_user_skas(void *to, const void *from, int n);
++extern int strncpy_from_user_skas(char *dst, const char *src, int count);
++extern int __clear_user_skas(void *mem, int len);
++extern int clear_user_skas(void *mem, int len);
++extern int strnlen_user_skas(const void *str, int len);
+ 
+ #endif
+ 
+diff -Naur a/arch/um/kernel/skas/Makefile b/arch/um/kernel/skas/Makefile
+--- a/arch/um/kernel/skas/Makefile	2004-02-11 12:14:38.000000000 -0500
++++ b/arch/um/kernel/skas/Makefile	2004-02-11 12:26:41.000000000 -0500
+@@ -5,20 +5,24 @@
+ 
+ obj-y = exec_kern.o exec_user.o mem.o mem_user.o mmu.o process.o \
+ 	process_kern.o syscall_kern.o syscall_user.o time.o tlb.o trap_user.o \
+-	sys-$(SUBARCH)/
++	uaccess.o sys-$(SUBARCH)/
++
++host-progs	:= util/mk_ptregs
++clean-files	:= include/skas_ptregs.h
+ 
+ USER_OBJS = $(filter %_user.o,$(obj-y)) process.o time.o
+ USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
+ 
+-include/skas_ptregs.h : util/mk_ptregs
+-	util/mk_ptregs > $@
+-
+-util/mk_ptregs :
+-	$(MAKE) -C util
++$(TOPDIR)/arch/um/include/skas_ptregs.h : $(src)/util/mk_ptregs
++	@echo -n '  Generating $@'
++	@$< > $@.tmp
++	@if [ -r $@ ] && cmp -s $@ $@.tmp; then \
++		echo ' (unchanged)'; \
++		rm -f $@.tmp; \
++	else \
++		echo ' (updated)'; \
++		mv -f $@.tmp $@; \
++	fi
+ 
+ $(USER_OBJS) : %.o: %.c
+ 	$(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
+-
+-clean :
+-	$(MAKE) -C util clean
+-	$(RM) -f include/skas_ptregs.h
+diff -Naur a/arch/um/kernel/skas/mem_user.c b/arch/um/kernel/skas/mem_user.c
+--- a/arch/um/kernel/skas/mem_user.c	2004-02-11 12:14:58.000000000 -0500
++++ b/arch/um/kernel/skas/mem_user.c	2004-02-11 12:26:50.000000000 -0500
+@@ -7,6 +7,7 @@
+ #include <sys/mman.h>
+ #include <sys/ptrace.h>
+ #include "mem_user.h"
++#include "mem.h"
+ #include "user.h"
+ #include "os.h"
+ #include "proc_mm.h"
+@@ -15,12 +16,12 @@
+ 	 int r, int w, int x)
+ {
+ 	struct proc_mm_op map;
+-	struct mem_region *region;
+-	int prot, n;
++	__u64 offset;
++	int prot, n, phys_fd;
+ 
+ 	prot = (r ? PROT_READ : 0) | (w ? PROT_WRITE : 0) | 
+ 		(x ? PROT_EXEC : 0);
+-	region = phys_region(phys);
++	phys_fd = phys_mapping(phys, &offset);
+ 
+ 	map = ((struct proc_mm_op) { .op 	= MM_MMAP,
+ 				     .u 	= 
+@@ -30,12 +31,12 @@
+ 					 .prot		= prot,
+ 					 .flags		= MAP_SHARED | 
+ 					                  MAP_FIXED,
+-					 .fd		= region->fd,
+-					 .offset	= phys_offset(phys)
++					 .fd		= phys_fd,
++					 .offset	= offset
+ 				       } } } );
+ 	n = os_write_file(fd, &map, sizeof(map));
+ 	if(n != sizeof(map)) 
+-		printk("map : /proc/mm map failed, errno = %d\n", errno);
++		printk("map : /proc/mm map failed, err = %d\n", -n);
+ }
+ 
+ int unmap(int fd, void *addr, int len)
+@@ -49,8 +50,13 @@
+ 					 { .addr 	= (unsigned long) addr,
+ 					   .len		= len } } } );
+ 	n = os_write_file(fd, &unmap, sizeof(unmap));
+-	if((n != 0) && (n != sizeof(unmap)))
+-		return(-errno);
++	if(n != sizeof(unmap)) {
++		if(n < 0) 
++			return(n);
++		else if(n > 0) 
++			return(-EIO);
++	}
++
+ 	return(0);
+ }
+ 
+@@ -71,11 +77,15 @@
+ 					   .prot	= prot } } } );
+ 
+ 	n = os_write_file(fd, &protect, sizeof(protect));
+-	if((n != 0) && (n != sizeof(protect))){
++	if(n != sizeof(protect)) {
++		if(n == 0) return(0);
++
+ 		if(must_succeed)
+-			panic("protect failed, errno = %d", errno);
+-		return(-errno);
++			panic("protect failed, err = %d", -n);
++
++		return(-EIO);
+ 	}
++
+ 	return(0);
+ }
+ 
+diff -Naur a/arch/um/kernel/skas/mmu.c b/arch/um/kernel/skas/mmu.c
+--- a/arch/um/kernel/skas/mmu.c	2004-02-11 12:17:12.000000000 -0500
++++ b/arch/um/kernel/skas/mmu.c	2004-02-11 12:29:17.000000000 -0500
+@@ -22,9 +22,11 @@
+ 	else from = -1;
+ 
+ 	mm->context.skas.mm_fd = new_mm(from);
+-	if(mm->context.skas.mm_fd < 0)
+-		panic("init_new_context_skas - new_mm failed, errno = %d\n",
+-		      mm->context.skas.mm_fd);
++	if(mm->context.skas.mm_fd < 0){
++		printk("init_new_context_skas - new_mm failed, errno = %d\n",
++		       mm->context.skas.mm_fd);
++		return(mm->context.skas.mm_fd);
++	}
+ 
+ 	return(0);
+ }
+diff -Naur a/arch/um/kernel/skas/process.c b/arch/um/kernel/skas/process.c
+--- a/arch/um/kernel/skas/process.c	2004-02-11 12:16:47.000000000 -0500
++++ b/arch/um/kernel/skas/process.c	2004-02-11 12:29:02.000000000 -0500
+@@ -4,6 +4,7 @@
+  */
+ 
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <errno.h>
+ #include <signal.h>
+ #include <setjmp.h>
+@@ -24,6 +25,18 @@
+ #include "os.h"
+ #include "proc_mm.h"
+ #include "skas_ptrace.h"
++#include "chan_user.h"
++
++int is_skas_winch(int pid, int fd, void *data)
++{
++	if(pid != getpid())
++		return(0);
++
++	register_winch_irq(-1, fd, -1, data);
++	return(1);
++}
++
++/* These are set once at boot time and not changed thereafter */
+ 
+ unsigned long exec_regs[FRAME_SIZE];
+ unsigned long exec_fp_regs[HOST_FP_SIZE];
+@@ -48,11 +61,11 @@
+ 	int err, syscall_nr, status;
+ 
+ 	syscall_nr = PT_SYSCALL_NR(regs->skas.regs);
++	UPT_SYSCALL_NR(regs) = syscall_nr;
+ 	if(syscall_nr < 1){
+ 		relay_signal(SIGTRAP, regs);
+ 		return;
+ 	}
+-	UPT_SYSCALL_NR(regs) = syscall_nr;
+ 
+ 	err = ptrace(PTRACE_POKEUSER, pid, PT_SYSCALL_NR_OFFSET, __NR_getpid);
+ 	if(err < 0)
+@@ -72,8 +85,6 @@
+ 	handle_syscall(regs);
+ }
+ 
+-int userspace_pid;
+-
+ static int userspace_tramp(void *arg)
+ {
+ 	init_new_thread_signals(0);
+@@ -83,7 +94,11 @@
+ 	return(0);
+ }
+ 
+-void start_userspace(void)
++/* Each element set once, and only accessed by a single processor anyway */
++#define NR_CPUS 1
++int userspace_pid[NR_CPUS];
++
++void start_userspace(int cpu)
+ {
+ 	void *stack;
+ 	unsigned long sp;
+@@ -114,21 +129,21 @@
+ 	if(munmap(stack, PAGE_SIZE) < 0)
+ 		panic("start_userspace : munmap failed, errno = %d\n", errno);
+ 
+-	userspace_pid = pid;
++	userspace_pid[cpu] = pid;
+ }
+ 
+ void userspace(union uml_pt_regs *regs)
+ {
+-	int err, status, op;
++	int err, status, op, pid = userspace_pid[0];
+ 
+ 	restore_registers(regs);
+ 		
+-	err = ptrace(PTRACE_SYSCALL, userspace_pid, 0, 0);
++	err = ptrace(PTRACE_SYSCALL, pid, 0, 0);
+ 	if(err)
+ 		panic("userspace - PTRACE_SYSCALL failed, errno = %d\n", 
+ 		       errno);
+ 	while(1){
+-		err = waitpid(userspace_pid, &status, WUNTRACED);
++		err = waitpid(pid, &status, WUNTRACED);
+ 		if(err < 0)
+ 			panic("userspace - waitpid failed, errno = %d\n", 
+ 			      errno);
+@@ -139,16 +154,17 @@
+ 		if(WIFSTOPPED(status)){
+ 		  	switch(WSTOPSIG(status)){
+ 			case SIGSEGV:
+-				handle_segv(userspace_pid);
++				handle_segv(pid);
+ 				break;
+ 			case SIGTRAP:
+-			        handle_trap(userspace_pid, regs);
++			        handle_trap(pid, regs);
+ 				break;
+ 			case SIGIO:
+ 			case SIGVTALRM:
+ 			case SIGILL:
+ 			case SIGBUS:
+ 			case SIGFPE:
++			case SIGWINCH:
+ 				user_signal(WSTOPSIG(status), regs);
+ 				break;
+ 			default:
+@@ -162,7 +178,7 @@
+ 
+ 		op = singlestepping_skas() ? PTRACE_SINGLESTEP : 
+ 			PTRACE_SYSCALL;
+-		err = ptrace(op, userspace_pid, 0, 0);
++		err = ptrace(op, pid, 0, 0);
+ 		if(err)
+ 			panic("userspace - PTRACE_SYSCALL failed, "
+ 			      "errno = %d\n", errno);
+@@ -177,7 +193,7 @@
+ 	*switch_buf_ptr = &switch_buf;
+ 	*fork_buf_ptr = &fork_buf;
+ 
+-	if(setjmp(fork_buf) == 0)
++	if(sigsetjmp(fork_buf, 1) == 0)
+ 		new_thread_proc(stack, handler);
+ 
+ 	remove_sigstack();
+@@ -189,16 +205,16 @@
+ 
+ 	*switch_buf = &buf;
+ 	fork_buf = fb;
+-	if(setjmp(buf) == 0)
+-		longjmp(*fork_buf, 1);
++	if(sigsetjmp(buf, 1) == 0)
++		siglongjmp(*fork_buf, 1);
+ }
+ 
+-static int move_registers(int int_op, int fp_op, union uml_pt_regs *regs,
+-			  unsigned long *fp_regs)
++static int move_registers(int pid, int int_op, int fp_op, 
++			  union uml_pt_regs *regs, unsigned long *fp_regs)
+ {
+-	if(ptrace(int_op, userspace_pid, 0, regs->skas.regs) < 0)
++	if(ptrace(int_op, pid, 0, regs->skas.regs) < 0)
+ 		return(-errno);
+-	if(ptrace(fp_op, userspace_pid, 0, fp_regs) < 0)
++	if(ptrace(fp_op, pid, 0, fp_regs) < 0)
+ 		return(-errno);
+ 	return(0);
+ }
+@@ -217,10 +233,11 @@
+ 		fp_regs = regs->skas.fp;
+ 	}
+ 
+-	err = move_registers(PTRACE_GETREGS, fp_op, regs, fp_regs);
++	err = move_registers(userspace_pid[0], PTRACE_GETREGS, fp_op, regs, 
++			     fp_regs);
+ 	if(err)
+ 		panic("save_registers - saving registers failed, errno = %d\n",
+-		      err);
++		      -err);
+ }
+ 
+ void restore_registers(union uml_pt_regs *regs)
+@@ -237,10 +254,11 @@
+ 		fp_regs = regs->skas.fp;
+ 	}
+ 
+-	err = move_registers(PTRACE_SETREGS, fp_op, regs, fp_regs);
++	err = move_registers(userspace_pid[0], PTRACE_SETREGS, fp_op, regs, 
++			     fp_regs);
+ 	if(err)
+ 		panic("restore_registers - saving registers failed, "
+-		      "errno = %d\n", err);
++		      "errno = %d\n", -err);
+ }
+ 
+ void switch_threads(void *me, void *next)
+@@ -248,8 +266,8 @@
+ 	jmp_buf my_buf, **me_ptr = me, *next_buf = next;
+ 	
+ 	*me_ptr = &my_buf;
+-	if(setjmp(my_buf) == 0)
+-		longjmp(*next_buf, 1);
++	if(sigsetjmp(my_buf, 1) == 0)
++		siglongjmp(*next_buf, 1);
+ }
+ 
+ static jmp_buf initial_jmpbuf;
+@@ -265,14 +283,14 @@
+ 	int n;
+ 
+ 	*fork_buf_ptr = &initial_jmpbuf;
+-	n = setjmp(initial_jmpbuf);
++	n = sigsetjmp(initial_jmpbuf, 1);
+ 	if(n == 0)
+ 		new_thread_proc((void *) stack, new_thread_handler);
+ 	else if(n == 1)
+ 		remove_sigstack();
+ 	else if(n == 2){
+ 		(*cb_proc)(cb_arg);
+-		longjmp(*cb_back, 1);
++		siglongjmp(*cb_back, 1);
+ 	}
+ 	else if(n == 3){
+ 		kmalloc_ok = 0;
+@@ -282,7 +300,7 @@
+ 		kmalloc_ok = 0;
+ 		return(1);
+ 	}
+-	longjmp(**switch_buf, 1);
++	siglongjmp(**switch_buf, 1);
+ }
+ 
+ void remove_sigstack(void)
+@@ -304,8 +322,8 @@
+ 	cb_back = &here;
+ 
+ 	block_signals();
+-	if(setjmp(here) == 0)
+-		longjmp(initial_jmpbuf, 2);
++	if(sigsetjmp(here, 1) == 0)
++		siglongjmp(initial_jmpbuf, 2);
+ 	unblock_signals();
+ 
+ 	cb_proc = NULL;
+@@ -316,22 +334,23 @@
+ void halt_skas(void)
+ {
+ 	block_signals();
+-	longjmp(initial_jmpbuf, 3);
++	siglongjmp(initial_jmpbuf, 3);
+ }
+ 
+ void reboot_skas(void)
+ {
+ 	block_signals();
+-	longjmp(initial_jmpbuf, 4);
++	siglongjmp(initial_jmpbuf, 4);
+ }
+ 
+ int new_mm(int from)
+ {
+ 	struct proc_mm_op copy;
+-	int n, fd = os_open_file("/proc/mm", of_write(OPENFLAGS()), 0);
++	int n, fd = os_open_file("/proc/mm", 
++				 of_cloexec(of_write(OPENFLAGS())), 0);
+ 
+ 	if(fd < 0)
+-		return(-errno);
++		return(fd);
+ 
+ 	if(from != -1){
+ 		copy = ((struct proc_mm_op) { .op 	= MM_COPY_SEGMENTS,
+@@ -340,8 +359,9 @@
+ 		n = os_write_file(fd, &copy, sizeof(copy));
+ 		if(n != sizeof(copy)) 
+ 			printk("new_mm : /proc/mm copy_segments failed, "
+-			       "errno = %d\n", errno);
++			       "err = %d\n", -n);
+ 	}
++
+ 	return(fd);
+ }
+ 
+@@ -349,7 +369,8 @@
+ {
+ 	int err;
+ 
+-	err = ptrace(PTRACE_SWITCH_MM, userspace_pid, 0, mm_fd);
++#warning need cpu pid in switch_mm_skas
++	err = ptrace(PTRACE_SWITCH_MM, userspace_pid[0], 0, mm_fd);
+ 	if(err)
+ 		panic("switch_mm_skas - PTRACE_SWITCH_MM failed, errno = %d\n",
+ 		      errno);
+@@ -357,7 +378,8 @@
+ 
+ void kill_off_processes_skas(void)
+ {
+-	os_kill_process(userspace_pid, 1);
++#warning need to loop over userspace_pids in kill_off_processes_skas
++	os_kill_process(userspace_pid[0], 1);
+ }
+ 
+ void init_registers(int pid)
+diff -Naur a/arch/um/kernel/skas/process_kern.c b/arch/um/kernel/skas/process_kern.c
+--- a/arch/um/kernel/skas/process_kern.c	2004-02-11 12:14:33.000000000 -0500
++++ b/arch/um/kernel/skas/process_kern.c	2004-02-11 12:26:15.000000000 -0500
+@@ -61,11 +61,13 @@
+ 	thread_wait(&current->thread.mode.skas.switch_buf, 
+ 		    current->thread.mode.skas.fork_buf);
+ 
+-#ifdef CONFIG_SMP
+-	schedule_tail(NULL);
+-#endif
++	if(current->thread.prev_sched != NULL)
++		schedule_tail(current->thread.prev_sched);
+ 	current->thread.prev_sched = NULL;
+ 
++	/* The return value is 1 if the kernel thread execs a process,
++	 * 0 if it just exits
++	 */
+ 	n = run_kernel_thread(fn, arg, &current->thread.exec_buf);
+ 	if(n == 1)
+ 		userspace(&current->thread.regs.regs);
+@@ -93,9 +95,8 @@
+ 		    current->thread.mode.skas.fork_buf);
+   	
+ 	force_flush_all();
+-#ifdef CONFIG_SMP
+-	schedule_tail(current->thread.prev_sched);
+-#endif
++	if(current->thread.prev_sched != NULL)
++		schedule_tail(current->thread.prev_sched);
+ 	current->thread.prev_sched = NULL;
+ 	unblock_signals();
+ 
+@@ -136,7 +137,7 @@
+ 
+ void init_idle_skas(void)
+ {
+-	cpu_tasks[current->thread_info->cpu].pid = os_getpid();
++	cpu_tasks[current_thread->cpu].pid = os_getpid();
+ 	default_idle();
+ }
+ 
+@@ -160,11 +161,11 @@
+ 
+ int start_uml_skas(void)
+ {
+-	start_userspace();
++	start_userspace(0);
+ 	capture_signal_stack();
++	uml_idle_timer();
+ 
+ 	init_new_thread_signals(1);
+-	idle_timer();
+ 
+ 	init_task.thread.request.u.thread.proc = start_kernel_proc;
+ 	init_task.thread.request.u.thread.arg = NULL;
+@@ -175,12 +176,14 @@
+ 
+ int external_pid_skas(struct task_struct *task)
+ {
+-	return(userspace_pid);
++#warning Need to look up userspace_pid by cpu	
++	return(userspace_pid[0]);
+ }
+ 
+ int thread_pid_skas(struct task_struct *task)
+ {
+-	return(userspace_pid);
++#warning Need to look up userspace_pid by cpu	
++	return(userspace_pid[0]);
+ }
+ 
+ /*
+diff -Naur a/arch/um/kernel/skas/syscall_kern.c b/arch/um/kernel/skas/syscall_kern.c
+--- a/arch/um/kernel/skas/syscall_kern.c	2004-02-11 12:15:58.000000000 -0500
++++ b/arch/um/kernel/skas/syscall_kern.c	2004-02-11 12:27:51.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* 
+- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2002 - 2003 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+diff -Naur a/arch/um/kernel/skas/sys-i386/Makefile b/arch/um/kernel/skas/sys-i386/Makefile
+--- a/arch/um/kernel/skas/sys-i386/Makefile	2004-02-11 12:16:38.000000000 -0500
++++ b/arch/um/kernel/skas/sys-i386/Makefile	2004-02-11 12:28:37.000000000 -0500
+@@ -10,5 +10,3 @@
+ 
+ $(USER_OBJS) : %.o: %.c
+ 	$(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
+-
+-clean :
+diff -Naur a/arch/um/kernel/skas/sys-i386/sigcontext.c b/arch/um/kernel/skas/sys-i386/sigcontext.c
+--- a/arch/um/kernel/skas/sys-i386/sigcontext.c	2004-02-11 12:14:18.000000000 -0500
++++ b/arch/um/kernel/skas/sys-i386/sigcontext.c	2004-02-11 12:26:01.000000000 -0500
+@@ -12,10 +12,9 @@
+ #include "kern_util.h"
+ #include "user.h"
+ #include "sigcontext.h"
++#include "mode.h"
+ 
+-extern int userspace_pid;
+-
+-int copy_sc_from_user_skas(union uml_pt_regs *regs, void *from_ptr)
++int copy_sc_from_user_skas(int pid, union uml_pt_regs *regs, void *from_ptr)
+ {
+   	struct sigcontext sc, *from = from_ptr;
+ 	unsigned long fpregs[FP_FRAME_SIZE];
+@@ -41,13 +40,12 @@
+ 	regs->skas.regs[EIP] = sc.eip;
+ 	regs->skas.regs[CS] = sc.cs;
+ 	regs->skas.regs[EFL] = sc.eflags;
+-	regs->skas.regs[UESP] = sc.esp_at_signal;
+ 	regs->skas.regs[SS] = sc.ss;
+ 	regs->skas.fault_addr = sc.cr2;
+ 	regs->skas.fault_type = FAULT_WRITE(sc.err);
+ 	regs->skas.trap_type = sc.trapno;
+ 
+-	err = ptrace(PTRACE_SETFPREGS, userspace_pid, 0, fpregs);
++	err = ptrace(PTRACE_SETFPREGS, pid, 0, fpregs);
+ 	if(err < 0){
+ 	  	printk("copy_sc_to_user - PTRACE_SETFPREGS failed, "
+ 		       "errno = %d\n", errno);
+@@ -57,8 +55,9 @@
+ 	return(0);
+ }
+ 
+-int copy_sc_to_user_skas(void *to_ptr, void *fp, union uml_pt_regs *regs, 
+-			 unsigned long fault_addr, int fault_type)
++int copy_sc_to_user_skas(int pid, void *to_ptr, void *fp, 
++			 union uml_pt_regs *regs, unsigned long fault_addr, 
++			 int fault_type)
+ {
+   	struct sigcontext sc, *to = to_ptr;
+ 	struct _fpstate *to_fp;
+@@ -86,7 +85,7 @@
+ 	sc.err = TO_SC_ERR(fault_type);
+ 	sc.trapno = regs->skas.trap_type;
+ 
+-	err = ptrace(PTRACE_GETFPREGS, userspace_pid, 0, fpregs);
++	err = ptrace(PTRACE_GETFPREGS, pid, 0, fpregs);
+ 	if(err < 0){
+ 	  	printk("copy_sc_to_user - PTRACE_GETFPREGS failed, "
+ 		       "errno = %d\n", errno);
+diff -Naur a/arch/um/kernel/skas/trap_user.c b/arch/um/kernel/skas/trap_user.c
+--- a/arch/um/kernel/skas/trap_user.c	2004-02-11 12:15:17.000000000 -0500
++++ b/arch/um/kernel/skas/trap_user.c	2004-02-11 12:27:06.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* 
+- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2002 - 2003 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+@@ -41,8 +41,6 @@
+ {
+ 	struct signal_info *info;
+ 
+-	if(sig == SIGVTALRM)
+-		missed_ticks[cpu()]++;
+ 	regs->skas.is_user = 1;
+ 	regs->skas.fault_addr = 0;
+ 	regs->skas.fault_type = 0;
+diff -Naur a/arch/um/kernel/skas/uaccess.c b/arch/um/kernel/skas/uaccess.c
+--- a/arch/um/kernel/skas/uaccess.c	1969-12-31 19:00:00.000000000 -0500
++++ b/arch/um/kernel/skas/uaccess.c	2004-02-11 12:28:20.000000000 -0500
+@@ -0,0 +1,219 @@
++/* 
++ * Copyright (C) 2002 - 2003 Jeff Dike (jdike@addtoit.com)
++ * Licensed under the GPL
++ */
++
++#include "linux/stddef.h"
++#include "linux/kernel.h"
++#include "linux/string.h"
++#include "linux/fs.h"
++#include "linux/highmem.h"
++#include "asm/page.h"
++#include "asm/pgtable.h"
++#include "asm/uaccess.h"
++#include "kern_util.h"
++
++extern void *um_virt_to_phys(struct task_struct *task, unsigned long addr, 
++			     pte_t *pte_out);
++
++static unsigned long maybe_map(unsigned long virt, int is_write)
++{
++	pte_t pte;
++	int err;
++
++	void *phys = um_virt_to_phys(current, virt, &pte);
++	int dummy_code;
++
++	if(IS_ERR(phys) || (is_write && !pte_write(pte))){
++		err = handle_page_fault(virt, 0, is_write, 0, &dummy_code);
++		if(err)
++			return(0);
++		phys = um_virt_to_phys(current, virt, NULL);
++	}
++	return((unsigned long) phys);
++}
++
++static int do_op(unsigned long addr, int len, int is_write, 
++		 int (*op)(unsigned long addr, int len, void *arg), void *arg)
++{
++	struct page *page;
++	int n;
++
++	addr = maybe_map(addr, is_write);
++	if(addr == -1)
++		return(-1);
++
++	page = phys_to_page(addr);
++	addr = (unsigned long) kmap(page) + (addr & ~PAGE_MASK);
++	n = (*op)(addr, len, arg);
++	kunmap(page);
++
++	return(n);
++}
++
++static int buffer_op(unsigned long addr, int len, int is_write,
++		     int (*op)(unsigned long addr, int len, void *arg),
++		     void *arg)
++{
++	int size = min(PAGE_ALIGN(addr) - addr, (unsigned long) len);
++	int remain = len, n;
++
++	n = do_op(addr, size, is_write, op, arg);
++	if(n != 0)
++		return(n < 0 ? remain : 0);
++
++	addr += size;
++	remain -= size;
++	if(remain == 0) 
++		return(0);
++
++	while(addr < ((addr + remain) & PAGE_MASK)){
++		n = do_op(addr, PAGE_SIZE, is_write, op, arg);
++		if(n != 0)
++			return(n < 0 ? remain : 0);
++
++		addr += PAGE_SIZE;
++		remain -= PAGE_SIZE;
++	}
++	if(remain == 0)
++		return(0);
++
++	n = do_op(addr, remain, is_write, op, arg);
++	if(n != 0)
++		return(n < 0 ? remain : 0);
++	return(0);
++}
++
++static int copy_chunk_from_user(unsigned long from, int len, void *arg)
++{
++	unsigned long *to_ptr = arg, to = *to_ptr;
++
++	memcpy((void *) to, (void *) from, len);
++	*to_ptr += len;
++	return(0);
++}
++
++int copy_from_user_skas(void *to, const void *from, int n)
++{
++	if(segment_eq(get_fs(), KERNEL_DS)){
++		memcpy(to, from, n);
++		return(0);
++	}
++
++	return(access_ok_skas(VERIFY_READ, from, n) ?
++	       buffer_op((unsigned long) from, n, 0, copy_chunk_from_user, &to):
++	       n);
++}
++
++static int copy_chunk_to_user(unsigned long to, int len, void *arg)
++{
++	unsigned long *from_ptr = arg, from = *from_ptr;
++
++	memcpy((void *) to, (void *) from, len);
++	*from_ptr += len;
++	return(0);
++}
++
++int copy_to_user_skas(void *to, const void *from, int n)
++{
++	if(segment_eq(get_fs(), KERNEL_DS)){
++		memcpy(to, from, n);
++		return(0);
++	}
++
++	return(access_ok_skas(VERIFY_WRITE, to, n) ?
++	       buffer_op((unsigned long) to, n, 1, copy_chunk_to_user, &from) :
++	       n);
++}
++
++static int strncpy_chunk_from_user(unsigned long from, int len, void *arg)
++{
++	char **to_ptr = arg, *to = *to_ptr;
++	int n;
++
++	strncpy(to, (void *) from, len);
++	n = strnlen(to, len);
++	*to_ptr += n;
++
++	if(n < len) 
++	        return(1);
++	return(0);
++}
++
++int strncpy_from_user_skas(char *dst, const char *src, int count)
++{
++	int n;
++	char *ptr = dst;
++
++	if(segment_eq(get_fs(), KERNEL_DS)){
++		strncpy(dst, src, count);
++		return(strnlen(dst, count));
++	}
++
++	if(!access_ok_skas(VERIFY_READ, src, 1))
++		return(-EFAULT);
++
++	n = buffer_op((unsigned long) src, count, 0, strncpy_chunk_from_user, 
++		      &ptr);
++	if(n != 0)
++		return(-EFAULT);
++	return(strnlen(dst, count));
++}
++
++static int clear_chunk(unsigned long addr, int len, void *unused)
++{
++	memset((void *) addr, 0, len);
++	return(0);
++}
++
++int __clear_user_skas(void *mem, int len)
++{
++	return(buffer_op((unsigned long) mem, len, 1, clear_chunk, NULL));
++}
++
++int clear_user_skas(void *mem, int len)
++{
++	if(segment_eq(get_fs(), KERNEL_DS)){
++		memset(mem, 0, len);
++		return(0);
++	}
++
++	return(access_ok_skas(VERIFY_WRITE, mem, len) ? 
++	       buffer_op((unsigned long) mem, len, 1, clear_chunk, NULL) : len);
++}
++
++static int strnlen_chunk(unsigned long str, int len, void *arg)
++{
++	int *len_ptr = arg, n;
++
++	n = strnlen((void *) str, len);
++	*len_ptr += n;
++
++	if(n < len)
++		return(1);
++	return(0);
++}
++
++int strnlen_user_skas(const void *str, int len)
++{
++	int count = 0, n;
++
++	if(segment_eq(get_fs(), KERNEL_DS))
++		return(strnlen(str, len) + 1);
++
++	n = buffer_op((unsigned long) str, len, 0, strnlen_chunk, &count);
++	if(n == 0)
++		return(count + 1);
++	return(-EFAULT);
++}
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/arch/um/kernel/skas/util/Makefile b/arch/um/kernel/skas/util/Makefile
+--- a/arch/um/kernel/skas/util/Makefile	2004-02-11 12:16:34.000000000 -0500
++++ b/arch/um/kernel/skas/util/Makefile	2004-02-11 12:28:33.000000000 -0500
+@@ -1,10 +1,9 @@
+ all: mk_ptregs
+ 
+ mk_ptregs : mk_ptregs.o
+-	$(CC) -o mk_ptregs mk_ptregs.o
++	$(HOSTCC) -o mk_ptregs mk_ptregs.o
+ 
+ mk_ptregs.o : mk_ptregs.c
+-	$(CC) -c $< 
++	$(HOSTCC) -c $< 
+ 
+-clean : 
+-	$(RM) -f mk_ptregs *.o *~
++clean-files := mk_ptregs *.o *~
+diff -Naur a/arch/um/kernel/skas/util/mk_ptregs.c b/arch/um/kernel/skas/util/mk_ptregs.c
+--- a/arch/um/kernel/skas/util/mk_ptregs.c	2004-02-11 12:15:12.000000000 -0500
++++ b/arch/um/kernel/skas/util/mk_ptregs.c	2004-02-11 12:27:00.000000000 -0500
+@@ -1,3 +1,4 @@
++#include <stdio.h>
+ #include <asm/ptrace.h>
+ #include <asm/user.h>
+ 
+diff -Naur a/arch/um/kernel/smp.c b/arch/um/kernel/smp.c
+--- a/arch/um/kernel/smp.c	2004-02-11 12:14:32.000000000 -0500
++++ b/arch/um/kernel/smp.c	2004-02-11 12:26:13.000000000 -0500
+@@ -1,9 +1,15 @@
+ /* 
+- * Copyright (C) 2000 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+ #include "linux/config.h"
++#include "linux/percpu.h"
++#include "asm/pgalloc.h"
++#include "asm/tlb.h"
++
++/* For some reason, mmu_gathers are referenced when CONFIG_SMP is off. */
++DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
+ 
+ #ifdef CONFIG_SMP
+ 
+@@ -23,7 +29,7 @@
+ #include "os.h"
+ 
+ /* CPU online map, set by smp_boot_cpus */
+-unsigned long cpu_online_map = cpumask_of_cpu(0);
++unsigned long cpu_online_map = CPU_MASK_NONE;
+ 
+ EXPORT_SYMBOL(cpu_online_map);
+ 
+@@ -55,7 +61,7 @@
+ 
+ void smp_send_reschedule(int cpu)
+ {
+-	write(cpu_data[cpu].ipi_pipe[1], "R", 1);
++	os_write_file(cpu_data[cpu].ipi_pipe[1], "R", 1);
+ 	num_reschedules_sent++;
+ }
+ 
+@@ -100,35 +106,34 @@
+ 
+ 	printk(KERN_INFO "Stopping all CPUs...");
+ 	for(i = 0; i < num_online_cpus(); i++){
+-		if(i == current->thread_info->cpu)
++		if(i == current_thread->cpu)
+ 			continue;
+-		write(cpu_data[i].ipi_pipe[1], "S", 1);
++		os_write_file(cpu_data[i].ipi_pipe[1], "S", 1);
+ 	}
+ 	printk("done\n");
+ }
+ 
+-static cpumask_t smp_commenced_mask;
+-static cpumask_t smp_callin_map = CPU_MASK_NONE;
++static cpumask_t smp_commenced_mask = CPU_MASK_NONE;
++static cpumask_t cpu_callin_map = CPU_MASK_NONE;
+ 
+ static int idle_proc(void *cpup)
+ {
+ 	int cpu = (int) cpup, err;
+ 
+ 	err = os_pipe(cpu_data[cpu].ipi_pipe, 1, 1);
+-	if(err)
+-		panic("CPU#%d failed to create IPI pipe, errno = %d", cpu, 
+-		      -err);
++	if(err < 0)
++		panic("CPU#%d failed to create IPI pipe, err = %d", cpu, -err);
+ 
+ 	activate_ipi(cpu_data[cpu].ipi_pipe[0], 
+ 		     current->thread.mode.tt.extern_pid);
+  
+ 	wmb();
+-	if (cpu_test_and_set(cpu, &smp_callin_map)) {
++	if (cpu_test_and_set(cpu, cpu_callin_map)) {
+ 		printk("huh, CPU#%d already present??\n", cpu);
+ 		BUG();
+ 	}
+ 
+-	while (!cpu_isset(cpu, &smp_commenced_mask))
++	while (!cpu_isset(cpu, smp_commenced_mask))
+ 		cpu_relax();
+ 
+ 	cpu_set(cpu, cpu_online_map);
+@@ -143,16 +148,20 @@
+ 
+         current->thread.request.u.thread.proc = idle_proc;
+         current->thread.request.u.thread.arg = (void *) cpu;
+-	new_task = do_fork(CLONE_VM | CLONE_IDLETASK, 0, NULL, 0, NULL, NULL);
+-	if(IS_ERR(new_task)) panic("do_fork failed in idle_thread");
++	new_task = copy_process(CLONE_VM | CLONE_IDLETASK, 0, NULL, 0, NULL, 
++				NULL);
++	if(IS_ERR(new_task)) 
++		panic("copy_process failed in idle_thread, error = %ld",
++		      PTR_ERR(new_task));
+ 
+ 	cpu_tasks[cpu] = ((struct cpu_task) 
+ 		          { .pid = 	new_task->thread.mode.tt.extern_pid,
+ 			    .task = 	new_task } );
+ 	idle_threads[cpu] = new_task;
+-	CHOOSE_MODE(write(new_task->thread.mode.tt.switch_pipe[1], &c, 
++	CHOOSE_MODE(os_write_file(new_task->thread.mode.tt.switch_pipe[1], &c, 
+ 			  sizeof(c)),
+ 		    ({ panic("skas mode doesn't support SMP"); }));
++	wake_up_forked_process(new_task);
+ 	return(new_task);
+ }
+ 
+@@ -160,15 +169,17 @@
+ {
+ 	struct task_struct *idle;
+ 	unsigned long waittime;
+-	int err, cpu;
++	int err, cpu, me = smp_processor_id();
+ 
+-	cpu_set(0, cpu_online_map);
+-	cpu_set(0, smp_callin_map);
++	cpu_clear(me, cpu_online_map);
++	cpu_set(me, cpu_online_map);
++	cpu_set(me, cpu_callin_map);
+ 
+-	err = os_pipe(cpu_data[0].ipi_pipe, 1, 1);
+-	if(err)	panic("CPU#0 failed to create IPI pipe, errno = %d", -err);
++	err = os_pipe(cpu_data[me].ipi_pipe, 1, 1);
++	if(err < 0)
++		panic("CPU#0 failed to create IPI pipe, errno = %d", -err);
+ 
+-	activate_ipi(cpu_data[0].ipi_pipe[0], 
++	activate_ipi(cpu_data[me].ipi_pipe[0], 
+ 		     current->thread.mode.tt.extern_pid);
+ 
+ 	for(cpu = 1; cpu < ncpus; cpu++){
+@@ -180,10 +191,10 @@
+ 		unhash_process(idle);
+ 
+ 		waittime = 200000000;
+-		while (waittime-- && !cpu_isset(cpu, smp_callin_map))
++		while (waittime-- && !cpu_isset(cpu, cpu_callin_map))
+ 			cpu_relax();
+ 
+-		if (cpu_isset(cpu, smp_callin_map))
++		if (cpu_isset(cpu, cpu_callin_map))
+ 			printk("done\n");
+ 		else printk("failed\n");
+ 	}
+@@ -216,7 +227,7 @@
+ 	int fd;
+ 
+ 	fd = cpu_data[cpu].ipi_pipe[0];
+-	while (read(fd, &c, 1) == 1) {
++	while (os_read_file(fd, &c, 1) == 1) {
+ 		switch (c) {
+ 		case 'C':
+ 			smp_call_function_slave(cpu);
+@@ -273,9 +284,9 @@
+ 	info = _info;
+ 
+ 	for (i=0;i<NR_CPUS;i++)
+-		if((i != current->thread_info->cpu) && 
++		if((i != current_thread->cpu) && 
+ 		   cpu_isset(i, cpu_online_map))
+-			write(cpu_data[i].ipi_pipe[1], "C", 1);
++			os_write_file(cpu_data[i].ipi_pipe[1], "C", 1);
+ 
+ 	while (atomic_read(&scf_started) != cpus)
+ 		barrier();
+diff -Naur a/arch/um/kernel/syscall_kern.c b/arch/um/kernel/syscall_kern.c
+--- a/arch/um/kernel/syscall_kern.c	2004-02-11 12:16:08.000000000 -0500
++++ b/arch/um/kernel/syscall_kern.c	2004-02-11 12:28:04.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* 
+- * Copyright (C) 2000 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+@@ -35,39 +35,40 @@
+ 
+ long sys_fork(void)
+ {
+-	struct task_struct *p;
++	long ret;
+ 
+ 	current->thread.forking = 1;
+-        p = do_fork(SIGCHLD, 0, NULL, 0, NULL, NULL);
++        ret = do_fork(SIGCHLD, 0, NULL, 0, NULL, NULL);
+ 	current->thread.forking = 0;
+-	return(IS_ERR(p) ? PTR_ERR(p) : p->pid);
++	return(ret);
+ }
+ 
+-long sys_clone(unsigned long clone_flags, unsigned long newsp)
++long sys_clone(unsigned long clone_flags, unsigned long newsp, 
++	       int *parent_tid, int *child_tid)
+ {
+-	struct task_struct *p;
++	long ret;
+ 
+ 	current->thread.forking = 1;
+-	p = do_fork(clone_flags, newsp, NULL, 0, NULL, NULL);
++	ret = do_fork(clone_flags, newsp, NULL, 0, parent_tid, child_tid);
+ 	current->thread.forking = 0;
+-	return(IS_ERR(p) ? PTR_ERR(p) : p->pid);
++	return(ret);
+ }
+ 
+ long sys_vfork(void)
+ {
+-	struct task_struct *p;
++	long ret;
+ 
+ 	current->thread.forking = 1;
+-	p = do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, 0, NULL, 0, NULL, NULL);
++	ret = do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, 0, NULL, 0, NULL, 
++		      NULL);
+ 	current->thread.forking = 0;
+-	return(IS_ERR(p) ? PTR_ERR(p) : p->pid);
++	return(ret);
+ }
+ 
+ /* common code for old and new mmaps */
+-static inline long do_mmap2(
+-	unsigned long addr, unsigned long len,
+-	unsigned long prot, unsigned long flags,
+-	unsigned long fd, unsigned long pgoff)
++long do_mmap2(struct mm_struct *mm, unsigned long addr, unsigned long len,
++	      unsigned long prot, unsigned long flags, unsigned long fd,
++	      unsigned long pgoff)
+ {
+ 	int error = -EBADF;
+ 	struct file * file = NULL;
+@@ -79,9 +80,9 @@
+ 			goto out;
+ 	}
+ 
+-	down_write(&current->mm->mmap_sem);
+-	error = do_mmap_pgoff(file, addr, len, prot, flags, pgoff);
+-	up_write(&current->mm->mmap_sem);
++	down_write(&mm->mmap_sem);
++	error = do_mmap_pgoff(mm, file, addr, len, prot, flags, pgoff);
++	up_write(&mm->mmap_sem);
+ 
+ 	if (file)
+ 		fput(file);
+@@ -93,7 +94,7 @@
+ 	       unsigned long prot, unsigned long flags,
+ 	       unsigned long fd, unsigned long pgoff)
+ {
+-	return do_mmap2(addr, len, prot, flags, fd, pgoff);
++	return do_mmap2(current->mm, addr, len, prot, flags, fd, pgoff);
+ }
+ 
+ /*
+@@ -120,7 +121,8 @@
+ 	if (offset & ~PAGE_MASK)
+ 		goto out;
+ 
+-	err = do_mmap2(addr, len, prot, flags, fd, offset >> PAGE_SHIFT);
++	err = do_mmap2(current->mm, addr, len, prot, flags, fd, 
++		       offset >> PAGE_SHIFT);
+  out:
+ 	return err;
+ }
+@@ -135,43 +137,12 @@
+ 
+         error = do_pipe(fd);
+         if (!error) {
+-                if (copy_to_user(fildes, fd, 2*sizeof(int)))
++		if (copy_to_user(fildes, fd, sizeof(fd)))
+                         error = -EFAULT;
+         }
+         return error;
+ }
+ 
+-int sys_sigaction(int sig, const struct old_sigaction *act,
+-			 struct old_sigaction *oact)
+-{
+-	struct k_sigaction new_ka, old_ka;
+-	int ret;
+-
+-	if (act) {
+-		old_sigset_t mask;
+-		if (verify_area(VERIFY_READ, act, sizeof(*act)) ||
+-		    __get_user(new_ka.sa.sa_handler, &act->sa_handler) ||
+-		    __get_user(new_ka.sa.sa_restorer, &act->sa_restorer))
+-			return -EFAULT;
+-		__get_user(new_ka.sa.sa_flags, &act->sa_flags);
+-		__get_user(mask, &act->sa_mask);
+-		siginitset(&new_ka.sa.sa_mask, mask);
+-	}
+-
+-	ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
+-
+-	if (!ret && oact) {
+-		if (verify_area(VERIFY_WRITE, oact, sizeof(*oact)) ||
+-		    __put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||
+-		    __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer))
+-			return -EFAULT;
+-		__put_user(old_ka.sa.sa_flags, &oact->sa_flags);
+-		__put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask);
+-	}
+-
+-	return ret;
+-}
+-
+ /*
+  * sys_ipc() is the de-multiplexer for the SysV IPC calls..
+  *
+@@ -253,7 +224,7 @@
+ 		return sys_shmctl (first, second,
+ 				   (struct shmid_ds *) ptr);
+ 	default:
+-		return -EINVAL;
++		return -ENOSYS;
+ 	}
+ }
+ 
+@@ -302,11 +273,6 @@
+ 	return error;
+ }
+ 
+-int sys_sigaltstack(const stack_t *uss, stack_t *uoss)
+-{
+-	return(do_sigaltstack(uss, uoss, PT_REGS_SP(&current->thread.regs)));
+-}
+-
+ long execute_syscall(void *r)
+ {
+ 	return(CHOOSE_MODE_PROC(execute_syscall_tt, execute_syscall_skas, r));
+diff -Naur a/arch/um/kernel/sys_call_table.c b/arch/um/kernel/sys_call_table.c
+--- a/arch/um/kernel/sys_call_table.c	2004-02-11 12:16:34.000000000 -0500
++++ b/arch/um/kernel/sys_call_table.c	2004-02-11 12:28:33.000000000 -0500
+@@ -5,7 +5,6 @@
+ 
+ #include "linux/config.h"
+ #include "linux/unistd.h"
+-#include "linux/version.h"
+ #include "linux/sys.h"
+ #include "linux/swap.h"
+ #include "linux/sysctl.h"
+@@ -219,15 +218,30 @@
+ extern syscall_handler_t sys_gettid;
+ extern syscall_handler_t sys_readahead;
+ extern syscall_handler_t sys_tkill;
++extern syscall_handler_t sys_setxattr;
++extern syscall_handler_t sys_lsetxattr;
++extern syscall_handler_t sys_fsetxattr;
++extern syscall_handler_t sys_getxattr;
++extern syscall_handler_t sys_lgetxattr;
++extern syscall_handler_t sys_fgetxattr;
++extern syscall_handler_t sys_listxattr;
++extern syscall_handler_t sys_llistxattr;
++extern syscall_handler_t sys_flistxattr;
++extern syscall_handler_t sys_removexattr;
++extern syscall_handler_t sys_lremovexattr;
++extern syscall_handler_t sys_fremovexattr;
+ extern syscall_handler_t sys_sendfile64;
+ extern syscall_handler_t sys_futex;
+ extern syscall_handler_t sys_sched_setaffinity;
+ extern syscall_handler_t sys_sched_getaffinity;
++extern syscall_handler_t sys_set_thread_area;
++extern syscall_handler_t sys_get_thread_area;
+ extern syscall_handler_t sys_io_setup;
+ extern syscall_handler_t sys_io_destroy;
+ extern syscall_handler_t sys_io_getevents;
+ extern syscall_handler_t sys_io_submit;
+ extern syscall_handler_t sys_io_cancel;
++extern syscall_handler_t sys_fadvise64;
+ extern syscall_handler_t sys_exit_group;
+ extern syscall_handler_t sys_lookup_dcookie;
+ extern syscall_handler_t sys_epoll_create;
+@@ -235,6 +249,20 @@
+ extern syscall_handler_t sys_epoll_wait;
+ extern syscall_handler_t sys_remap_file_pages;
+ extern syscall_handler_t sys_set_tid_address;
++extern syscall_handler_t sys_timer_create;
++extern syscall_handler_t sys_timer_settime;
++extern syscall_handler_t sys_timer_gettime;
++extern syscall_handler_t sys_timer_getoverrun;
++extern syscall_handler_t sys_timer_delete;
++extern syscall_handler_t sys_clock_settime;
++extern syscall_handler_t sys_clock_gettime;
++extern syscall_handler_t sys_clock_getres;
++extern syscall_handler_t sys_clock_nanosleep;
++extern syscall_handler_t sys_statfs64;
++extern syscall_handler_t sys_fstatfs64;
++extern syscall_handler_t sys_tgkill;
++extern syscall_handler_t sys_utimes;
++extern syscall_handler_t sys_fadvise64_64;
+ 
+ #ifdef CONFIG_NFSD
+ #define NFSSERVCTL sys_nfsservctl
+@@ -246,7 +274,7 @@
+ extern syscall_handler_t um_time;
+ extern syscall_handler_t um_stime;
+ 
+-#define LAST_GENERIC_SYSCALL __NR_set_tid_address
++#define LAST_GENERIC_SYSCALL __NR_vserver
+ 
+ #if LAST_GENERIC_SYSCALL > LAST_ARCH_SYSCALL
+ #define LAST_SYSCALL LAST_GENERIC_SYSCALL
+@@ -455,32 +483,37 @@
+ 	[ __NR_stat64 ] = sys_stat64,
+ 	[ __NR_lstat64 ] = sys_lstat64,
+ 	[ __NR_fstat64 ] = sys_fstat64,
+-	[ __NR_fcntl64 ] = sys_fcntl64,
+ 	[ __NR_getdents64 ] = sys_getdents64,
++	[ __NR_fcntl64 ] = sys_fcntl64,
++	[ 223 ] = sys_ni_syscall,
+ 	[ __NR_gettid ] = sys_gettid,
+ 	[ __NR_readahead ] = sys_readahead,
+-	[ __NR_setxattr ] = sys_ni_syscall,
+-	[ __NR_lsetxattr ] = sys_ni_syscall,
+-	[ __NR_fsetxattr ] = sys_ni_syscall,
+-	[ __NR_getxattr ] = sys_ni_syscall,
+-	[ __NR_lgetxattr ] = sys_ni_syscall,
+-	[ __NR_fgetxattr ] = sys_ni_syscall,
+-	[ __NR_listxattr ] = sys_ni_syscall,
+-	[ __NR_llistxattr ] = sys_ni_syscall,
+-	[ __NR_flistxattr ] = sys_ni_syscall,
+-	[ __NR_removexattr ] = sys_ni_syscall,
+-	[ __NR_lremovexattr ] = sys_ni_syscall,
+-	[ __NR_fremovexattr ] = sys_ni_syscall,
++	[ __NR_setxattr ] = sys_setxattr,
++	[ __NR_lsetxattr ] = sys_lsetxattr,
++	[ __NR_fsetxattr ] = sys_fsetxattr,
++	[ __NR_getxattr ] = sys_getxattr,
++	[ __NR_lgetxattr ] = sys_lgetxattr,
++	[ __NR_fgetxattr ] = sys_fgetxattr,
++	[ __NR_listxattr ] = sys_listxattr,
++	[ __NR_llistxattr ] = sys_llistxattr,
++	[ __NR_flistxattr ] = sys_flistxattr,
++	[ __NR_removexattr ] = sys_removexattr,
++	[ __NR_lremovexattr ] = sys_lremovexattr,
++	[ __NR_fremovexattr ] = sys_fremovexattr,
+ 	[ __NR_tkill ] = sys_tkill,
+ 	[ __NR_sendfile64 ] = sys_sendfile64,
+ 	[ __NR_futex ] = sys_futex,
+ 	[ __NR_sched_setaffinity ] = sys_sched_setaffinity,
+ 	[ __NR_sched_getaffinity ] = sys_sched_getaffinity,
++	[ __NR_set_thread_area ] = sys_ni_syscall,
++	[ __NR_get_thread_area ] = sys_ni_syscall,
+ 	[ __NR_io_setup ] = sys_io_setup,
+ 	[ __NR_io_destroy ] = sys_io_destroy,
+ 	[ __NR_io_getevents ] = sys_io_getevents,
+ 	[ __NR_io_submit ] = sys_io_submit,
+ 	[ __NR_io_cancel ] = sys_io_cancel,
++	[ __NR_fadvise64 ] = sys_fadvise64,
++	[ 251 ] = sys_ni_syscall,
+ 	[ __NR_exit_group ] = sys_exit_group,
+ 	[ __NR_lookup_dcookie ] = sys_lookup_dcookie,
+ 	[ __NR_epoll_create ] = sys_epoll_create,
+@@ -488,6 +521,21 @@
+ 	[ __NR_epoll_wait ] = sys_epoll_wait,
+         [ __NR_remap_file_pages ] = sys_remap_file_pages,
+         [ __NR_set_tid_address ] = sys_set_tid_address,
++	[ __NR_timer_create ] = sys_timer_create,
++	[ __NR_timer_settime ] = sys_timer_settime,
++	[ __NR_timer_gettime ] = sys_timer_gettime,
++	[ __NR_timer_getoverrun ] = sys_timer_getoverrun,
++	[ __NR_timer_delete ] = sys_timer_delete,
++	[ __NR_clock_settime ] = sys_clock_settime,
++	[ __NR_clock_gettime ] = sys_clock_gettime,
++	[ __NR_clock_getres ] = sys_clock_getres,
++	[ __NR_clock_nanosleep ] = sys_clock_nanosleep,
++	[ __NR_statfs64 ] = sys_statfs64,
++	[ __NR_fstatfs64 ] = sys_fstatfs64,
++	[ __NR_tgkill ] = sys_tgkill,
++	[ __NR_utimes ] = sys_utimes,
++	[ __NR_fadvise64_64 ] = sys_fadvise64_64,
++	[ __NR_vserver ] = sys_ni_syscall,
+ 
+ 	ARCH_SYSCALLS
+ 	[ LAST_SYSCALL + 1 ... NR_syscalls ] = 
+diff -Naur a/arch/um/kernel/sysrq.c b/arch/um/kernel/sysrq.c
+--- a/arch/um/kernel/sysrq.c	2004-02-11 12:14:56.000000000 -0500
++++ b/arch/um/kernel/sysrq.c	2004-02-11 12:26:47.000000000 -0500
+@@ -55,6 +55,14 @@
+ 	show_trace((unsigned long *)esp);
+ }
+ 
++void show_stack(struct task_struct *task, unsigned long *sp)
++{
++	if(task)
++		show_trace_task(task);
++	else
++		show_trace(sp);
++}
++
+ /*
+  * Overrides for Emacs so that we follow Linus's tabbing style.
+  * Emacs will notice this stuff at the end of the file and automatically
+diff -Naur a/arch/um/kernel/tempfile.c b/arch/um/kernel/tempfile.c
+--- a/arch/um/kernel/tempfile.c	2004-02-11 12:15:48.000000000 -0500
++++ b/arch/um/kernel/tempfile.c	2004-02-11 12:27:41.000000000 -0500
+@@ -28,6 +28,7 @@
+ 	}
+ 	if((dir == NULL) || (*dir == '\0')) 
+ 		dir = "/tmp";
++
+ 	tempdir = malloc(strlen(dir) + 2);
+ 	if(tempdir == NULL){
+ 		fprintf(stderr, "Failed to malloc tempdir, "
+@@ -49,7 +50,8 @@
+ 	else
+ 		*tempname = 0;
+ 	strcat(tempname, template);
+-	if((fd = mkstemp(tempname)) < 0){
++	fd = mkstemp(tempname);
++	if(fd < 0){
+ 		fprintf(stderr, "open - cannot create %s: %s\n", tempname, 
+ 			strerror(errno));
+ 		return -1;
+@@ -59,7 +61,8 @@
+ 		return -1;
+ 	}
+ 	if(out_tempname){
+-		if((*out_tempname = strdup(tempname)) == NULL){
++		*out_tempname = strdup(tempname);
++		if(*out_tempname == NULL){
+ 			perror("strdup");
+ 			return -1;
+ 		}
+diff -Naur a/arch/um/kernel/time.c b/arch/um/kernel/time.c
+--- a/arch/um/kernel/time.c	2004-02-11 12:14:28.000000000 -0500
++++ b/arch/um/kernel/time.c	2004-02-11 12:26:11.000000000 -0500
+@@ -4,24 +4,33 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include <time.h>
+ #include <sys/time.h>
+ #include <signal.h>
+ #include <errno.h>
+-#include "linux/module.h"
+ #include "user_util.h"
+ #include "kern_util.h"
+ #include "user.h"
+ #include "process.h"
+ #include "signal_user.h"
+ #include "time_user.h"
++#include "kern_constants.h"
++
++/* XXX This really needs to be declared and initialized in a kernel file since 
++ * it's in <linux/time.h>
++ */
++extern struct timespec wall_to_monotonic;
+ 
+ extern struct timeval xtime;
+ 
++struct timeval local_offset = { 0, 0 };
++
+ void timer(void)
+ {
+ 	gettimeofday(&xtime, NULL);
++	timeradd(&xtime, &local_offset, &xtime);
+ }
+ 
+ void set_interval(int timer_type)
+@@ -66,7 +75,7 @@
+ 		       errno);
+ }
+ 
+-void idle_timer(void)
++void uml_idle_timer(void)
+ {
+ 	if(signal(SIGVTALRM, SIG_IGN) == SIG_ERR)
+ 		panic("Couldn't unset SIGVTALRM handler");
+@@ -76,14 +85,56 @@
+ 	set_interval(ITIMER_REAL);
+ }
+ 
++static unsigned long long get_host_hz(void)
++{
++	char mhzline[16], *end;
++	int ret, mult, mhz, rest, len;
++
++	ret = cpu_feature("cpu MHz", mhzline, 
++			  sizeof(mhzline) / sizeof(mhzline[0]));
++	if(!ret)
++		panic ("Could not get host MHZ");
++
++	mhz = strtoul(mhzline, &end, 10);
++
++	/* This business is to parse a floating point number without using
++	 * floating types.
++	 */
++
++	rest = 0;
++	mult = 0;
++	if(*end == '.'){
++		end++;
++		len = strlen(end);
++		if(len < 6)
++			mult = 6 - len;
++		else if(len > 6)
++			end[6] = '\0';
++		rest = strtoul(end, NULL, 10);
++		while(mult-- > 0)
++			rest *= 10;
++	}
++
++	return(1000000 * mhz + rest);
++}
++
++unsigned long long host_hz = 0;
++
++extern int do_posix_clock_monotonic_gettime(struct timespec *tp);
++
+ void time_init(void)
+ {
++	struct timespec now;
++ 
++	host_hz = get_host_hz();
+ 	if(signal(SIGVTALRM, boot_timer_handler) == SIG_ERR)
+ 		panic("Couldn't set SIGVTALRM handler");
+ 	set_interval(ITIMER_VIRTUAL);
+-}
+ 
+-struct timeval local_offset = { 0, 0 };
++	do_posix_clock_monotonic_gettime(&now);
++	wall_to_monotonic.tv_sec = -now.tv_sec;
++	wall_to_monotonic.tv_nsec = -now.tv_nsec;
++}
+ 
+ void do_gettimeofday(struct timeval *tv)
+ {
+@@ -95,15 +146,13 @@
+ 	time_unlock(flags);
+ }
+ 
+-EXPORT_SYMBOL(do_gettimeofday);
+-
+ int do_settimeofday(struct timespec *tv)
+ {
+ 	struct timeval now;
+ 	unsigned long flags;
+ 	struct timeval tv_in;
+ 
+-	if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
++	if ((unsigned long) tv->tv_nsec >= UM_NSEC_PER_SEC)
+ 		return -EINVAL;
+ 
+ 	tv_in.tv_sec = tv->tv_sec;
+@@ -113,9 +162,9 @@
+ 	gettimeofday(&now, NULL);
+ 	timersub(&tv_in, &now, &local_offset);
+ 	time_unlock(flags);
+-}
+ 
+-EXPORT_SYMBOL(do_settimeofday);
++	return(0);
++}
+ 
+ void idle_sleep(int secs)
+ {
+diff -Naur a/arch/um/kernel/time_kern.c b/arch/um/kernel/time_kern.c
+--- a/arch/um/kernel/time_kern.c	2004-02-11 12:15:59.000000000 -0500
++++ b/arch/um/kernel/time_kern.c	2004-02-11 12:27:52.000000000 -0500
+@@ -30,6 +30,14 @@
+ 	return(HZ);
+ }
+ 
++/*
++ * Scheduler clock - returns current time in nanosec units.
++ */
++unsigned long long sched_clock(void)
++{
++	return (unsigned long long)jiffies_64 * (1000000000 / HZ);
++}
++
+ /* Changed at early boot */
+ int timer_irq_inited = 0;
+ 
+@@ -39,13 +47,47 @@
+  */
+ int __attribute__ ((__section__ (".unprotected"))) missed_ticks[NR_CPUS];
+ 
++static int first_tick;
++static unsigned long long prev_tsc;
++static long long delta;   		/* Deviation per interval */
++
++extern unsigned long long host_hz;
++
+ void timer_irq(union uml_pt_regs *regs)
+ {
+-	int cpu = current->thread_info->cpu, ticks = missed_ticks[cpu];
++	unsigned long long ticks = 0;
++
++	if(!timer_irq_inited){
++		/* This is to ensure that ticks don't pile up when
++		 * the timer handler is suspended */
++		first_tick = 0;
++		return;
++	}
++
++	if(first_tick){
++#if defined(CONFIG_UML_REAL_TIME_CLOCK)
++		unsigned long long tsc;
++		/* We've had 1 tick */
++		tsc = time_stamp();
++
++		delta += tsc - prev_tsc;
++		prev_tsc = tsc;
++
++		ticks += (delta * HZ) / host_hz;
++		delta -= (ticks * host_hz) / HZ;
++#else
++		ticks = 1;
++#endif
++	}
++	else {
++		prev_tsc = time_stamp();
++		first_tick = 1;
++	}
+ 
+-        if(!timer_irq_inited) return;
+-	missed_ticks[cpu] = 0;
+-	while(ticks--) do_IRQ(TIMER_IRQ, regs);
++	while(ticks > 0){
++		do_IRQ(TIMER_IRQ, regs);
++		ticks--;
++	}
+ }
+ 
+ void boot_timer_handler(int sig)
+@@ -58,12 +100,13 @@
+ 	do_timer(&regs);
+ }
+ 
+-void um_timer(int irq, void *dev, struct pt_regs *regs)
++irqreturn_t um_timer(int irq, void *dev, struct pt_regs *regs)
+ {
+ 	do_timer(regs);
+-	write_seqlock(&xtime_lock);
++	write_seqlock_irq(&xtime_lock);
+ 	timer();
+-	write_sequnlock(&xtime_lock);
++	write_sequnlock_irq(&xtime_lock);
++	return(IRQ_HANDLED);
+ }
+ 
+ long um_time(int * tloc)
+@@ -81,12 +124,12 @@
+ long um_stime(int * tptr)
+ {
+ 	int value;
+-	struct timeval new;
++	struct timespec new;
+ 
+ 	if (get_user(value, tptr))
+                 return -EFAULT;
+ 	new.tv_sec = value;
+-	new.tv_usec = 0;
++	new.tv_nsec = 0;
+ 	do_settimeofday(&new);
+ 	return 0;
+ }
+@@ -125,9 +168,11 @@
+ void timer_handler(int sig, union uml_pt_regs *regs)
+ {
+ #ifdef CONFIG_SMP
++	local_irq_disable();
+ 	update_process_times(user_context(UPT_SP(regs)));
++	local_irq_enable();
+ #endif
+-	if(current->thread_info->cpu == 0)
++	if(current_thread->cpu == 0)
+ 		timer_irq(regs);
+ }
+ 
+@@ -136,6 +181,7 @@
+ unsigned long time_lock(void)
+ {
+ 	unsigned long flags;
++
+ 	spin_lock_irqsave(&timer_spinlock, flags);
+ 	return(flags);
+ }
+@@ -150,8 +196,8 @@
+ 	int err;
+ 
+ 	CHOOSE_MODE(user_time_init_tt(), user_time_init_skas());
+-	if((err = request_irq(TIMER_IRQ, um_timer, SA_INTERRUPT, "timer", 
+-			      NULL)) != 0)
++	err = request_irq(TIMER_IRQ, um_timer, SA_INTERRUPT, "timer", NULL);
++	if(err != 0)
+ 		printk(KERN_ERR "timer_init : request_irq failed - "
+ 		       "errno = %d\n", -err);
+ 	timer_irq_inited = 1;
+@@ -160,7 +206,6 @@
+ 
+ __initcall(timer_init);
+ 
+-
+ /*
+  * Overrides for Emacs so that we follow Linus's tabbing style.
+  * Emacs will notice this stuff at the end of the file and automatically
+diff -Naur a/arch/um/kernel/trap_kern.c b/arch/um/kernel/trap_kern.c
+--- a/arch/um/kernel/trap_kern.c	2004-02-11 12:14:18.000000000 -0500
++++ b/arch/um/kernel/trap_kern.c	2004-02-11 12:26:00.000000000 -0500
+@@ -16,12 +16,15 @@
+ #include "asm/tlbflush.h"
+ #include "asm/a.out.h"
+ #include "asm/current.h"
++#include "asm/irq.h"
+ #include "user_util.h"
+ #include "kern_util.h"
+ #include "kern.h"
+ #include "chan_kern.h"
+ #include "mconsole_kern.h"
+ #include "2_5compat.h"
++#include "mem.h"
++#include "mem_kern.h"
+ 
+ int handle_page_fault(unsigned long address, unsigned long ip, 
+ 		      int is_write, int is_user, int *code_out)
+@@ -51,12 +54,12 @@
+ 	if(is_write && !(vma->vm_flags & VM_WRITE)) 
+ 		goto out;
+ 	page = address & PAGE_MASK;
+-	if(page == (unsigned long) current->thread_info + PAGE_SIZE)
++	if(page == (unsigned long) current_thread + PAGE_SIZE)
+ 		panic("Kernel stack overflow");
+ 	pgd = pgd_offset(mm, page);
+ 	pmd = pmd_offset(pgd, page);
+- survive:
+ 	do {
++ survive:
+ 		switch (handle_mm_fault(mm, vma, address, is_write)){
+ 		case VM_FAULT_MINOR:
+ 			current->min_flt++;
+@@ -71,14 +74,20 @@
+ 			err = -ENOMEM;
+ 			goto out_of_memory;
+ 		default:
+-			BUG();
++			if (current->pid == 1) {
++				up_read(&mm->mmap_sem);
++				yield();
++				down_read(&mm->mmap_sem);
++				goto survive;
++			}
++			goto out;
+ 		}
+ 		pte = pte_offset_kernel(pmd, page);
+ 	} while(!pte_present(*pte));
++	err = 0;
+ 	*pte = pte_mkyoung(*pte);
+ 	if(pte_write(*pte)) *pte = pte_mkdirty(*pte);
+ 	flush_tlb_page(vma, page);
+-	err = 0;
+  out:
+ 	up_read(&mm->mmap_sem);
+ 	return(err);
+@@ -98,6 +107,33 @@
+ 	goto out;
+ }
+ 
++LIST_HEAD(physmem_remappers);
++
++void register_remapper(struct remapper *info)
++{
++	list_add(&info->list, &physmem_remappers);
++}
++
++static int check_remapped_addr(unsigned long address, int is_write)
++{
++	struct remapper *remapper;
++	struct list_head *ele;
++	__u64 offset;
++	int fd;
++
++	fd = phys_mapping(__pa(address), &offset);
++	if(fd == -1)
++		return(0);
++
++	list_for_each(ele, &physmem_remappers){
++		remapper = list_entry(ele, struct remapper, list);
++		if((*remapper->proc)(fd, address, is_write, offset))
++			return(1);
++	}
++
++	return(0);
++}
++
+ unsigned long segv(unsigned long address, unsigned long ip, int is_write, 
+ 		   int is_user, void *sc)
+ {
+@@ -109,7 +145,9 @@
+                 flush_tlb_kernel_vm();
+                 return(0);
+         }
+-        if(current->mm == NULL)
++	else if(check_remapped_addr(address & PAGE_MASK, is_write))
++		return(0);
++	else if(current->mm == NULL)
+ 		panic("Segfault with no mm");
+ 	err = handle_page_fault(address, ip, is_write, is_user, &si.si_code);
+ 
+@@ -120,9 +158,8 @@
+ 		current->thread.fault_addr = (void *) address;
+ 		do_longjmp(catcher, 1);
+ 	} 
+-	else if(current->thread.fault_addr != NULL){
++	else if(current->thread.fault_addr != NULL)
+ 		panic("fault_addr set but no fault catcher");
+-	}
+ 	else if(arch_fixup(ip, sc))
+ 		return(0);
+ 
+@@ -155,8 +192,6 @@
+ {
+ 	struct siginfo si;
+ 
+-	printk(KERN_ERR "Unfixable SEGV in '%s' (pid %d) at 0x%lx "
+-	       "(ip 0x%lx)\n", current->comm, current->pid, address, ip);
+ 	si.si_signo = SIGSEGV;
+ 	si.si_code = SEGV_ACCERR;
+ 	si.si_addr = (void *) address;
+@@ -180,6 +215,11 @@
+ 	else relay_signal(sig, regs);
+ }
+ 
++void winch(int sig, union uml_pt_regs *regs)
++{
++	do_IRQ(WINCH_IRQ, regs);
++}
++
+ void trap_init(void)
+ {
+ }
+diff -Naur a/arch/um/kernel/trap_user.c b/arch/um/kernel/trap_user.c
+--- a/arch/um/kernel/trap_user.c	2004-02-11 12:15:23.000000000 -0500
++++ b/arch/um/kernel/trap_user.c	2004-02-11 12:27:10.000000000 -0500
+@@ -5,11 +5,9 @@
+ 
+ #include <stdlib.h>
+ #include <errno.h>
+-#include <fcntl.h>
+ #include <setjmp.h>
+ #include <signal.h>
+ #include <sys/time.h>
+-#include <sys/ioctl.h>
+ #include <sys/ptrace.h>
+ #include <sys/wait.h>
+ #include <asm/page.h>
+@@ -82,6 +80,8 @@
+ 		     .is_irq 		= 0 },
+ 	[ SIGILL ] { .handler 		= relay_signal,
+ 		     .is_irq 		= 0 },
++	[ SIGWINCH ] { .handler		= winch,
++		       .is_irq		= 1 },
+ 	[ SIGBUS ] { .handler 		= bus_handler,
+ 		     .is_irq 		= 0 },
+ 	[ SIGSEGV] { .handler 		= segv_handler,
+@@ -123,7 +123,7 @@
+ {
+ 	jmp_buf *buf = b;
+ 
+-	longjmp(*buf, val);
++	siglongjmp(*buf, val);
+ }
+ 
+ /*
+diff -Naur a/arch/um/kernel/tt/exec_kern.c b/arch/um/kernel/tt/exec_kern.c
+--- a/arch/um/kernel/tt/exec_kern.c	2004-02-11 12:14:28.000000000 -0500
++++ b/arch/um/kernel/tt/exec_kern.c	2004-02-11 12:26:11.000000000 -0500
+@@ -17,6 +17,7 @@
+ #include "mem_user.h"
+ #include "os.h"
+ #include "tlb.h"
++#include "mode.h"
+ 
+ static int exec_tramp(void *sig_stack)
+ {
+@@ -47,17 +48,17 @@
+ 		do_exit(SIGKILL);
+ 	}
+ 
+-	if(current->thread_info->cpu == 0)
++	if(current_thread->cpu == 0)
+ 		forward_interrupts(new_pid);
+ 	current->thread.request.op = OP_EXEC;
+ 	current->thread.request.u.exec.pid = new_pid;
+-	unprotect_stack((unsigned long) current->thread_info);
++	unprotect_stack((unsigned long) current_thread);
+ 	os_usr1_process(os_getpid());
+ 
+ 	enable_timer();
+ 	free_page(stack);
+ 	protect_memory(uml_reserved, high_physmem - uml_reserved, 1, 1, 0, 1);
+-	task_protections((unsigned long) current->thread_info);
++	task_protections((unsigned long) current_thread);
+ 	force_flush_all();
+ 	unblock_signals();
+ }
+diff -Naur a/arch/um/kernel/tt/include/mode.h b/arch/um/kernel/tt/include/mode.h
+--- a/arch/um/kernel/tt/include/mode.h	2004-02-11 12:16:01.000000000 -0500
++++ b/arch/um/kernel/tt/include/mode.h	2004-02-11 12:27:56.000000000 -0500
+@@ -8,6 +8,8 @@
+ 
+ #include "sysdep/ptrace.h"
+ 
++enum { OP_NONE, OP_EXEC, OP_FORK, OP_TRACE_ON, OP_REBOOT, OP_HALT, OP_CB };
++
+ extern int tracing_pid;
+ 
+ extern int tracer(int (*init_proc)(void *), void *sp);
+diff -Naur a/arch/um/kernel/tt/include/uaccess.h b/arch/um/kernel/tt/include/uaccess.h
+--- a/arch/um/kernel/tt/include/uaccess.h	2004-02-11 12:16:02.000000000 -0500
++++ b/arch/um/kernel/tt/include/uaccess.h	2004-02-11 12:27:56.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* 
+- * Copyright (C) 2000, 2001 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+@@ -43,65 +43,19 @@
+ 
+ extern int __do_copy_from_user(void *to, const void *from, int n,
+ 			       void **fault_addr, void **fault_catcher);
+-
+-static inline int copy_from_user_tt(void *to, const void *from, int n)
+-{
+-	return(access_ok_tt(VERIFY_READ, from, n) ?
+-	       __do_copy_from_user(to, from, n, 
+-				   &current->thread.fault_addr,
+-				   &current->thread.fault_catcher) : n);
+-}
+-
+-static inline int copy_to_user_tt(void *to, const void *from, int n)
+-{
+-	return(access_ok_tt(VERIFY_WRITE, to, n) ?
+-	       __do_copy_to_user(to, from, n, 
+-				   &current->thread.fault_addr,
+-				   &current->thread.fault_catcher) : n);
+-}
+-
+ extern int __do_strncpy_from_user(char *dst, const char *src, size_t n,
+ 				  void **fault_addr, void **fault_catcher);
+-
+-static inline int strncpy_from_user_tt(char *dst, const char *src, int count)
+-{
+-	int n;
+-
+-	if(!access_ok_tt(VERIFY_READ, src, 1)) return(-EFAULT);
+-	n = __do_strncpy_from_user(dst, src, count, 
+-				   &current->thread.fault_addr,
+-				   &current->thread.fault_catcher);
+-	if(n < 0) return(-EFAULT);
+-	return(n);
+-}
+-
+ extern int __do_clear_user(void *mem, size_t len, void **fault_addr,
+ 			   void **fault_catcher);
+-
+-static inline int __clear_user_tt(void *mem, int len)
+-{
+-	return(__do_clear_user(mem, len,
+-			       &current->thread.fault_addr,
+-			       &current->thread.fault_catcher));
+-}
+-
+-static inline int clear_user_tt(void *mem, int len)
+-{
+-	return(access_ok_tt(VERIFY_WRITE, mem, len) ? 
+-	       __do_clear_user(mem, len, 
+-			       &current->thread.fault_addr,
+-			       &current->thread.fault_catcher) : len);
+-}
+-
+ extern int __do_strnlen_user(const char *str, unsigned long n,
+ 			     void **fault_addr, void **fault_catcher);
+ 
+-static inline int strnlen_user_tt(const void *str, int len)
+-{
+-	return(__do_strnlen_user(str, len,
+-				 &current->thread.fault_addr,
+-				 &current->thread.fault_catcher));
+-}
++extern int copy_from_user_tt(void *to, const void *from, int n);
++extern int copy_to_user_tt(void *to, const void *from, int n);
++extern int strncpy_from_user_tt(char *dst, const char *src, int count);
++extern int __clear_user_tt(void *mem, int len);
++extern int clear_user_tt(void *mem, int len);
++extern int strnlen_user_tt(const void *str, int len);
+ 
+ #endif
+ 
+diff -Naur a/arch/um/kernel/tt/Makefile b/arch/um/kernel/tt/Makefile
+--- a/arch/um/kernel/tt/Makefile	2004-02-11 12:15:45.000000000 -0500
++++ b/arch/um/kernel/tt/Makefile	2004-02-11 12:27:36.000000000 -0500
+@@ -1,5 +1,5 @@
+ # 
+-# Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
++# Copyright (C) 2002 - 2003 Jeff Dike (jdike@addtoit.com)
+ # Licensed under the GPL
+ #
+ 
+@@ -7,7 +7,7 @@
+ 
+ obj-y = exec_kern.o exec_user.o gdb.o ksyms.o mem.o mem_user.o process_kern.o \
+ 	syscall_kern.o syscall_user.o time.o tlb.o tracer.o trap_user.o \
+-	uaccess_user.o sys-$(SUBARCH)/
++	uaccess.o uaccess_user.o sys-$(SUBARCH)/
+ 
+ obj-$(CONFIG_PT_PROXY) += gdb_kern.o ptproxy/
+ 
+@@ -27,5 +27,3 @@
+ 
+ $(obj)/unmap_fin.o : $(src)/unmap.o
+ 	ld -r -o $@ $< -lc -L/usr/lib
+-
+-clean :
+diff -Naur a/arch/um/kernel/tt/mem_user.c b/arch/um/kernel/tt/mem_user.c
+--- a/arch/um/kernel/tt/mem_user.c	2004-02-11 12:14:34.000000000 -0500
++++ b/arch/um/kernel/tt/mem_user.c	2004-02-11 12:26:17.000000000 -0500
+@@ -25,14 +25,13 @@
+ 	size = (unsigned long) segment_end - 
+ 		(unsigned long) segment_start;
+ 	data = create_mem_file(size);
+-	if((addr = mmap(NULL, size, PROT_WRITE | PROT_READ, 
+-			MAP_SHARED, data, 0)) == MAP_FAILED){
++	addr = mmap(NULL, size, PROT_WRITE | PROT_READ, MAP_SHARED, data, 0);
++	if(addr == MAP_FAILED){
+ 		perror("mapping new data segment");
+ 		exit(1);
+ 	}
+ 	memcpy(addr, segment_start, size);
+-	if(switcheroo(data, prot, addr, segment_start, 
+-		      size) < 0){
++	if(switcheroo(data, prot, addr, segment_start, size) < 0){
+ 		printf("switcheroo failed\n");
+ 		exit(1);
+ 	}
+diff -Naur a/arch/um/kernel/tt/process_kern.c b/arch/um/kernel/tt/process_kern.c
+--- a/arch/um/kernel/tt/process_kern.c	2004-02-11 12:16:33.000000000 -0500
++++ b/arch/um/kernel/tt/process_kern.c	2004-02-11 12:28:32.000000000 -0500
+@@ -62,7 +62,7 @@
+ 	reading = 0;
+ 	err = os_write_file(to->thread.mode.tt.switch_pipe[1], &c, sizeof(c));
+ 	if(err != sizeof(c))
+-		panic("write of switch_pipe failed, errno = %d", -err);
++		panic("write of switch_pipe failed, err = %d", -err);
+ 
+ 	reading = 1;
+ 	if((from->state == TASK_ZOMBIE) || (from->state == TASK_DEAD))
+@@ -104,48 +104,72 @@
+ 
+ void release_thread_tt(struct task_struct *task)
+ {
+-	os_kill_process(task->thread.mode.tt.extern_pid, 0);
++	int pid = task->thread.mode.tt.extern_pid;
++
++	if(os_getpid() != pid)
++		os_kill_process(pid, 0);
+ }
+ 
+ void exit_thread_tt(void)
+ {
+-	close(current->thread.mode.tt.switch_pipe[0]);
+-	close(current->thread.mode.tt.switch_pipe[1]);
++	os_close_file(current->thread.mode.tt.switch_pipe[0]);
++	os_close_file(current->thread.mode.tt.switch_pipe[1]);
+ }
+ 
+ void schedule_tail(task_t *prev);
+ 
+ static void new_thread_handler(int sig)
+ {
++	unsigned long disable;
+ 	int (*fn)(void *);
+ 	void *arg;
+ 
+ 	fn = current->thread.request.u.thread.proc;
+ 	arg = current->thread.request.u.thread.arg;
++
+ 	UPT_SC(&current->thread.regs.regs) = (void *) (&sig + 1);
++	disable = (1 << (SIGVTALRM - 1)) | (1 << (SIGALRM - 1)) |
++		(1 << (SIGIO - 1)) | (1 << (SIGPROF - 1));
++	SC_SIGMASK(UPT_SC(&current->thread.regs.regs)) &= ~disable;
++
+ 	suspend_new_thread(current->thread.mode.tt.switch_pipe[0]);
+ 
+-	block_signals();
++	force_flush_all();
++	if(current->thread.prev_sched != NULL)
++		schedule_tail(current->thread.prev_sched);
++	current->thread.prev_sched = NULL;
++
+ 	init_new_thread_signals(1);
+-#ifdef CONFIG_SMP
+-	schedule_tail(current->thread.prev_sched);
+-#endif
+ 	enable_timer();
+ 	free_page(current->thread.temp_stack);
+ 	set_cmdline("(kernel thread)");
+-	force_flush_all();
+ 
+-	current->thread.prev_sched = NULL;
+ 	change_sig(SIGUSR1, 1);
+ 	change_sig(SIGVTALRM, 1);
+ 	change_sig(SIGPROF, 1);
+-	unblock_signals();
++	local_irq_enable();
+ 	if(!run_kernel_thread(fn, arg, &current->thread.exec_buf))
+ 		do_exit(0);
+ }
+ 
+ static int new_thread_proc(void *stack)
+ {
++	/* local_irq_disable is needed to block out signals until this thread is
++	 * properly scheduled.  Otherwise, the tracing thread will get mighty 
++	 * upset about any signals that arrive before that.  
++	 * This has the complication that it sets the saved signal mask in
++	 * the sigcontext to block signals.  This gets restored when this
++	 * thread (or a descendant, since they get a copy of this sigcontext)
++	 * returns to userspace.
++	 * So, this is compensated for elsewhere.
++	 * XXX There is still a small window until local_irq_disable() actually 
++	 * finishes where signals are possible - shouldn't be a problem in 
++	 * practice since SIGIO hasn't been forwarded here yet, and the 
++	 * local_irq_disable should finish before a SIGVTALRM has time to be 
++	 * delivered.
++	 */
++
++	local_irq_disable();
+ 	init_new_thread_stack(stack, new_thread_handler);
+ 	os_usr1_process(os_getpid());
+ 	return(0);
+@@ -156,7 +180,7 @@
+  * itself with a SIGUSR1.  set_user_mode has to be run with SIGUSR1 off,
+  * so it is blocked before it's called.  They are re-enabled on sigreturn
+  * despite the fact that they were blocked when the SIGUSR1 was issued because
+- * copy_thread copies the parent's signcontext, including the signal mask
++ * copy_thread copies the parent's sigcontext, including the signal mask
+  * onto the signal frame.
+  */
+ 
+@@ -165,35 +189,32 @@
+  	UPT_SC(&current->thread.regs.regs) = (void *) (&sig + 1);
+ 	suspend_new_thread(current->thread.mode.tt.switch_pipe[0]);
+ 
+-#ifdef CONFIG_SMP	
+-	schedule_tail(NULL);
+-#endif
++	force_flush_all();
++	if(current->thread.prev_sched != NULL)
++		schedule_tail(current->thread.prev_sched);
++	current->thread.prev_sched = NULL;
++
+ 	enable_timer();
+ 	change_sig(SIGVTALRM, 1);
+ 	local_irq_enable();
+-	force_flush_all();
+ 	if(current->mm != current->parent->mm)
+ 		protect_memory(uml_reserved, high_physmem - uml_reserved, 1, 
+ 			       1, 0, 1);
+-	task_protections((unsigned long) current->thread_info);
+-
+-	current->thread.prev_sched = NULL;
++	task_protections((unsigned long) current_thread);
+ 
+ 	free_page(current->thread.temp_stack);
++	local_irq_disable();
+ 	change_sig(SIGUSR1, 0);
+ 	set_user_mode(current);
+ }
+ 
+-static int sigusr1 = SIGUSR1;
+-
+ int fork_tramp(void *stack)
+ {
+-	int sig = sigusr1;
+-
+ 	local_irq_disable();
++	arch_init_thread();
+ 	init_new_thread_stack(stack, finish_fork_handler);
+ 
+-	kill(os_getpid(), sig);
++	os_usr1_process(os_getpid());
+ 	return(0);
+ }
+ 
+@@ -213,8 +234,8 @@
+ 	}
+ 
+ 	err = os_pipe(p->thread.mode.tt.switch_pipe, 1, 1);
+-	if(err){
+-		printk("copy_thread : pipe failed, errno = %d\n", -err);
++	if(err < 0){
++		printk("copy_thread : pipe failed, err = %d\n", -err);
+ 		return(err);
+ 	}
+ 
+@@ -377,8 +398,8 @@
+ 
+ 	pages = (1 << CONFIG_KERNEL_STACK_ORDER);
+ 
+-	start = (unsigned long) current->thread_info + PAGE_SIZE;
+-	end = (unsigned long) current + PAGE_SIZE * pages;
++	start = (unsigned long) current_thread + PAGE_SIZE;
++	end = (unsigned long) current_thread + PAGE_SIZE * pages;
+ 	protect_memory(uml_reserved, start - uml_reserved, 1, w, 1, 1);
+ 	protect_memory(end, high_physmem - end, 1, w, 1, 1);
+ 
+@@ -454,8 +475,9 @@
+ 
+ 	init_task.thread.mode.tt.extern_pid = pid;
+ 	err = os_pipe(init_task.thread.mode.tt.switch_pipe, 1, 1);
+-	if(err)	panic("Can't create switch pipe for init_task, errno = %d", 
+-		      err);
++	if(err)	
++		panic("Can't create switch pipe for init_task, errno = %d", 
++		      -err);
+ }
+ 
+ int singlestepping_tt(void *t)
+diff -Naur a/arch/um/kernel/tt/ptproxy/Makefile b/arch/um/kernel/tt/ptproxy/Makefile
+--- a/arch/um/kernel/tt/ptproxy/Makefile	2004-02-11 12:15:11.000000000 -0500
++++ b/arch/um/kernel/tt/ptproxy/Makefile	2004-02-11 12:26:57.000000000 -0500
+@@ -9,5 +9,3 @@
+ 
+ $(USER_OBJS) : %.o: %.c
+ 	$(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
+-
+-clean:
+diff -Naur a/arch/um/kernel/tt/ptproxy/proxy.c b/arch/um/kernel/tt/ptproxy/proxy.c
+--- a/arch/um/kernel/tt/ptproxy/proxy.c	2004-02-11 12:15:57.000000000 -0500
++++ b/arch/um/kernel/tt/ptproxy/proxy.c	2004-02-11 12:27:50.000000000 -0500
+@@ -15,7 +15,6 @@
+ #include <unistd.h>
+ #include <signal.h>
+ #include <string.h>
+-#include <fcntl.h>
+ #include <termios.h>
+ #include <sys/wait.h>
+ #include <sys/types.h>
+@@ -293,10 +292,10 @@
+ }
+ 
+ char gdb_init_string[] = 
+-"att 1
+-b panic
+-b stop
+-handle SIGWINCH nostop noprint pass
++"att 1 \n\
++b panic \n\
++b stop \n\
++handle SIGWINCH nostop noprint pass \n\
+ ";
+ 
+ int start_debugger(char *prog, int startup, int stop, int *fd_out)
+@@ -304,7 +303,8 @@
+ 	int slave, child;
+ 
+ 	slave = open_gdb_chan();
+-	if((child = fork()) == 0){
++	child = fork();
++	if(child == 0){
+ 		char *tempname = NULL;
+ 		int fd;
+ 
+@@ -327,18 +327,19 @@
+ 			exit(1);
+ #endif
+ 		}
+-		if((fd = make_tempfile("/tmp/gdb_init-XXXXXX", &tempname, 0)) < 0){
+-			printk("start_debugger : make_tempfile failed, errno = %d\n",
+-			       errno);
++		fd = make_tempfile("/tmp/gdb_init-XXXXXX", &tempname, 0);
++		if(fd < 0){
++			printk("start_debugger : make_tempfile failed,"
++			       "err = %d\n", -fd);
+ 			exit(1);
+ 		}
+-		write(fd, gdb_init_string, sizeof(gdb_init_string) - 1);
++		os_write_file(fd, gdb_init_string, sizeof(gdb_init_string) - 1);
+ 		if(startup){
+ 			if(stop){
+-				write(fd, "b start_kernel\n",
++				os_write_file(fd, "b start_kernel\n",
+ 				      strlen("b start_kernel\n"));
+ 			}
+-			write(fd, "c\n", strlen("c\n"));
++			os_write_file(fd, "c\n", strlen("c\n"));
+ 		}
+ 		if(ptrace(PTRACE_TRACEME, 0, 0, 0) < 0){
+ 			printk("start_debugger :  PTRACE_TRACEME failed, "
+diff -Naur a/arch/um/kernel/tt/ptproxy/sysdep.c b/arch/um/kernel/tt/ptproxy/sysdep.c
+--- a/arch/um/kernel/tt/ptproxy/sysdep.c	2004-02-11 12:16:27.000000000 -0500
++++ b/arch/um/kernel/tt/ptproxy/sysdep.c	2004-02-11 12:28:24.000000000 -0500
+@@ -9,6 +9,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <signal.h>
++#include <errno.h>
+ #include <sys/types.h>
+ #include <sys/ptrace.h>
+ #include <asm/ptrace.h>
+diff -Naur a/arch/um/kernel/tt/ptproxy/wait.c b/arch/um/kernel/tt/ptproxy/wait.c
+--- a/arch/um/kernel/tt/ptproxy/wait.c	2004-02-11 12:16:37.000000000 -0500
++++ b/arch/um/kernel/tt/ptproxy/wait.c	2004-02-11 12:28:37.000000000 -0500
+@@ -56,21 +56,23 @@
+ int real_wait_return(struct debugger *debugger)
+ {
+ 	unsigned long ip;
+-	int err, pid;
++	int pid;
+ 
+ 	pid = debugger->pid;
++
+ 	ip = ptrace(PTRACE_PEEKUSER, pid, PT_IP_OFFSET, 0);
+-	ip = IP_RESTART_SYSCALL(ip);
+-	err = ptrace(PTRACE_POKEUSER, pid, PT_IP_OFFSET, ip);
++	IP_RESTART_SYSCALL(ip);
++
+ 	if(ptrace(PTRACE_POKEUSER, pid, PT_IP_OFFSET, ip) < 0)
+ 		tracer_panic("real_wait_return : Failed to restart system "
+-			     "call, errno = %d\n");
++			     "call, errno = %d\n", errno);
++
+ 	if((ptrace(PTRACE_SYSCALL, debugger->pid, 0, SIGCHLD) < 0) ||
+ 	   (ptrace(PTRACE_SYSCALL, debugger->pid, 0, 0) < 0) ||
+ 	   (ptrace(PTRACE_SYSCALL, debugger->pid, 0, 0) < 0) ||
+ 	   debugger_normal_return(debugger, -1))
+ 		tracer_panic("real_wait_return : gdb failed to wait, "
+-			     "errno = %d\n");
++			     "errno = %d\n", errno);
+ 	return(0);
+ }
+ 
+diff -Naur a/arch/um/kernel/tt/syscall_kern.c b/arch/um/kernel/tt/syscall_kern.c
+--- a/arch/um/kernel/tt/syscall_kern.c	2004-02-11 12:14:00.000000000 -0500
++++ b/arch/um/kernel/tt/syscall_kern.c	2004-02-11 12:25:40.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* 
+- * Copyright (C) 2000 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+diff -Naur a/arch/um/kernel/tt/sys-i386/Makefile b/arch/um/kernel/tt/sys-i386/Makefile
+--- a/arch/um/kernel/tt/sys-i386/Makefile	2004-02-11 12:15:17.000000000 -0500
++++ b/arch/um/kernel/tt/sys-i386/Makefile	2004-02-11 12:27:05.000000000 -0500
+@@ -10,5 +10,3 @@
+ 
+ $(USER_OBJS) : %.o: %.c
+ 	$(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
+-
+-clean :
+diff -Naur a/arch/um/kernel/tt/tlb.c b/arch/um/kernel/tt/tlb.c
+--- a/arch/um/kernel/tt/tlb.c	2004-02-11 12:14:18.000000000 -0500
++++ b/arch/um/kernel/tt/tlb.c	2004-02-11 12:26:01.000000000 -0500
+@@ -10,6 +10,7 @@
+ #include "asm/page.h"
+ #include "asm/pgtable.h"
+ #include "asm/uaccess.h"
++#include "asm/tlbflush.h"
+ #include "user_util.h"
+ #include "mem_user.h"
+ #include "os.h"
+diff -Naur a/arch/um/kernel/tt/tracer.c b/arch/um/kernel/tt/tracer.c
+--- a/arch/um/kernel/tt/tracer.c	2004-02-11 12:14:16.000000000 -0500
++++ b/arch/um/kernel/tt/tracer.c	2004-02-11 12:25:59.000000000 -0500
+@@ -39,16 +39,17 @@
+ 		return(0);
+ 
+ 	register_winch_irq(tracer_winch[0], fd, -1, data);
+-	return(0);
++	return(1);
+ }
+ 
+ static void tracer_winch_handler(int sig)
+ {
++	int n;
+ 	char c = 1;
+ 
+-	if(write(tracer_winch[1], &c, sizeof(c)) != sizeof(c))
+-		printk("tracer_winch_handler - write failed, errno = %d\n",
+-		       errno);
++	n = os_write_file(tracer_winch[1], &c, sizeof(c));
++	if(n != sizeof(c))
++		printk("tracer_winch_handler - write failed, err = %d\n", -n);
+ }
+ 
+ /* Called only by the tracing thread during initialization */
+@@ -58,9 +59,8 @@
+ 	int err;
+ 
+ 	err = os_pipe(tracer_winch, 1, 1);
+-	if(err){
+-		printk("setup_tracer_winch : os_pipe failed, errno = %d\n", 
+-		       -err);
++	if(err < 0){
++		printk("setup_tracer_winch : os_pipe failed, err = %d\n", -err);
+ 		return;
+ 	}
+ 	signal(SIGWINCH, tracer_winch_handler);
+@@ -130,8 +130,8 @@
+ 	case SIGTSTP:
+ 		if(ptrace(PTRACE_CONT, pid, 0, sig) < 0)
+ 			tracer_panic("sleeping_process_signal : Failed to "
+-				     "continue pid %d, errno = %d\n", pid,
+-				     sig);
++				     "continue pid %d, signal = %d, "
++				     "errno = %d\n", pid, sig, errno);
+ 		break;
+ 
+ 	/* This happens when the debugger (e.g. strace) is doing system call 
+@@ -145,7 +145,7 @@
+ 		if(ptrace(PTRACE_SYSCALL, pid, 0, 0) < 0)
+ 			tracer_panic("sleeping_process_signal : Failed to "
+ 				     "PTRACE_SYSCALL pid %d, errno = %d\n",
+-				     pid, sig);
++				     pid, errno);
+ 		break;
+ 	case SIGSTOP:
+ 		break;
+@@ -218,7 +218,7 @@
+ 			err = attach(debugger_parent);
+ 			if(err){
+ 				printf("Failed to attach debugger parent %d, "
+-				       "errno = %d\n", debugger_parent, err);
++				       "errno = %d\n", debugger_parent, -err);
+ 				debugger_parent = -1;
+ 			}
+ 			else {
+@@ -233,7 +233,8 @@
+ 	}
+ 	set_cmdline("(tracing thread)");
+ 	while(1){
+-		if((pid = waitpid(-1, &status, WUNTRACED)) <= 0){
++		pid = waitpid(-1, &status, WUNTRACED);
++		if(pid <= 0){
+ 			if(errno != ECHILD){
+ 				printf("wait failed - errno = %d\n", errno);
+ 			}
+@@ -401,7 +402,7 @@
+ 		
+ 		if(!strcmp(line, "go"))	debug_stop = 0;
+ 		else if(!strcmp(line, "parent")) debug_parent = 1;
+-		else printk("Unknown debug option : '%s'\n", line);
++		else printf("Unknown debug option : '%s'\n", line);
+ 
+ 		line = next;
+ 	}
+diff -Naur a/arch/um/kernel/tt/uaccess.c b/arch/um/kernel/tt/uaccess.c
+--- a/arch/um/kernel/tt/uaccess.c	1969-12-31 19:00:00.000000000 -0500
++++ b/arch/um/kernel/tt/uaccess.c	2004-02-11 12:25:43.000000000 -0500
+@@ -0,0 +1,73 @@
++/* 
++ * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
++ * Licensed under the GPL
++ */
++
++#include "linux/sched.h"
++#include "asm/uaccess.h"
++
++int copy_from_user_tt(void *to, const void *from, int n)
++{
++	if(!access_ok_tt(VERIFY_READ, from, n)) 
++		return(n);
++
++	return(__do_copy_from_user(to, from, n, &current->thread.fault_addr,
++				   &current->thread.fault_catcher));
++}
++
++int copy_to_user_tt(void *to, const void *from, int n)
++{
++	if(!access_ok_tt(VERIFY_WRITE, to, n))
++		return(n);
++		
++	return(__do_copy_to_user(to, from, n, &current->thread.fault_addr,
++				 &current->thread.fault_catcher));
++}
++
++int strncpy_from_user_tt(char *dst, const char *src, int count)
++{
++	int n;
++
++	if(!access_ok_tt(VERIFY_READ, src, 1)) 
++		return(-EFAULT);
++
++	n = __do_strncpy_from_user(dst, src, count, 
++				   &current->thread.fault_addr,
++				   &current->thread.fault_catcher);
++	if(n < 0) return(-EFAULT);
++	return(n);
++}
++
++int __clear_user_tt(void *mem, int len)
++{
++	return(__do_clear_user(mem, len,
++			       &current->thread.fault_addr,
++			       &current->thread.fault_catcher));
++}
++
++int clear_user_tt(void *mem, int len)
++{
++	if(!access_ok_tt(VERIFY_WRITE, mem, len))
++		return(len);
++
++	return(__do_clear_user(mem, len, &current->thread.fault_addr,
++			       &current->thread.fault_catcher));
++}
++
++int strnlen_user_tt(const void *str, int len)
++{
++	return(__do_strnlen_user(str, len,
++				 &current->thread.fault_addr,
++				 &current->thread.fault_catcher));
++}
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/arch/um/kernel/tt/uaccess_user.c b/arch/um/kernel/tt/uaccess_user.c
+--- a/arch/um/kernel/tt/uaccess_user.c	2004-02-11 12:14:38.000000000 -0500
++++ b/arch/um/kernel/tt/uaccess_user.c	2004-02-11 12:26:42.000000000 -0500
+@@ -8,15 +8,20 @@
+ #include <string.h>
+ #include "user_util.h"
+ #include "uml_uaccess.h"
++#include "task.h"
++#include "kern_util.h"
+ 
+ int __do_copy_from_user(void *to, const void *from, int n,
+ 			void **fault_addr, void **fault_catcher)
+ {
++	struct tt_regs save = TASK_REGS(get_current())->tt;
+ 	unsigned long fault;
+ 	int faulted;
+ 
+ 	fault = __do_user_copy(to, from, n, fault_addr, fault_catcher,
+ 			       __do_copy, &faulted);
++	TASK_REGS(get_current())->tt = save;
++
+ 	if(!faulted) return(0);
+ 	else return(n - (fault - (unsigned long) from));
+ }
+@@ -29,11 +34,14 @@
+ int __do_strncpy_from_user(char *dst, const char *src, unsigned long count,
+ 			   void **fault_addr, void **fault_catcher)
+ {
++	struct tt_regs save = TASK_REGS(get_current())->tt;
+ 	unsigned long fault;
+ 	int faulted;
+ 
+ 	fault = __do_user_copy(dst, src, count, fault_addr, fault_catcher,
+ 			       __do_strncpy, &faulted);
++	TASK_REGS(get_current())->tt = save;
++
+ 	if(!faulted) return(strlen(dst));
+ 	else return(-1);
+ }
+@@ -46,11 +54,14 @@
+ int __do_clear_user(void *mem, unsigned long len,
+ 		    void **fault_addr, void **fault_catcher)
+ {
++	struct tt_regs save = TASK_REGS(get_current())->tt;
+ 	unsigned long fault;
+ 	int faulted;
+ 
+ 	fault = __do_user_copy(mem, NULL, len, fault_addr, fault_catcher,
+ 			       __do_clear, &faulted);
++	TASK_REGS(get_current())->tt = save;
++
+ 	if(!faulted) return(0);
+ 	else return(len - (fault - (unsigned long) mem));
+ }
+@@ -58,19 +69,20 @@
+ int __do_strnlen_user(const char *str, unsigned long n,
+ 		      void **fault_addr, void **fault_catcher)
+ {
++	struct tt_regs save = TASK_REGS(get_current())->tt;
+ 	int ret;
+ 	unsigned long *faddrp = (unsigned long *)fault_addr;
+ 	jmp_buf jbuf;
+ 
+ 	*fault_catcher = &jbuf;
+-	if(setjmp(jbuf) == 0){
++	if(sigsetjmp(jbuf, 1) == 0)
+ 		ret = strlen(str) + 1;
+-	} 
+-	else {
+-		ret = *faddrp - (unsigned long) str;
+-	}
++	else ret = *faddrp - (unsigned long) str;
++
+ 	*fault_addr = NULL;
+ 	*fault_catcher = NULL;
++
++	TASK_REGS(get_current())->tt = save;
+ 	return ret;
+ }
+ 
+diff -Naur a/arch/um/kernel/tt/unmap.c b/arch/um/kernel/tt/unmap.c
+--- a/arch/um/kernel/tt/unmap.c	2004-02-11 12:16:26.000000000 -0500
++++ b/arch/um/kernel/tt/unmap.c	2004-02-11 12:28:22.000000000 -0500
+@@ -3,10 +3,7 @@
+  * Licensed under the GPL
+  */
+ 
+-#include <stdio.h>
+-#include <errno.h>
+ #include <sys/mman.h>
+-#include "user.h"
+ 
+ int switcheroo(int fd, int prot, void *from, void *to, int size)
+ {
+diff -Naur a/arch/um/kernel/tty_log.c b/arch/um/kernel/tty_log.c
+--- a/arch/um/kernel/tty_log.c	2004-02-11 12:15:58.000000000 -0500
++++ b/arch/um/kernel/tty_log.c	2004-02-11 12:27:51.000000000 -0500
+@@ -9,10 +9,10 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+-#include <fcntl.h>
+ #include <sys/time.h>
+ #include "init.h"
+ #include "user.h"
++#include "kern_util.h"
+ #include "os.h"
+ 
+ #define TTY_LOG_DIR "./"
+@@ -24,29 +24,40 @@
+ #define TTY_LOG_OPEN 1
+ #define TTY_LOG_CLOSE 2
+ #define TTY_LOG_WRITE 3
++#define TTY_LOG_EXEC 4
++
++#define TTY_READ 1
++#define TTY_WRITE 2
+ 
+ struct tty_log_buf {
+ 	int what;
+ 	unsigned long tty;
+ 	int len;
++	int direction;
++	unsigned long sec;
++	unsigned long usec;
+ };
+ 
+-int open_tty_log(void *tty)
++int open_tty_log(void *tty, void *current_tty)
+ {
+ 	struct timeval tv;
+ 	struct tty_log_buf data;
+ 	char buf[strlen(tty_log_dir) + sizeof("01234567890-01234567\0")];
+ 	int fd;
+ 
++	gettimeofday(&tv, NULL);
+ 	if(tty_log_fd != -1){
+-		data = ((struct tty_log_buf) { what :	TTY_LOG_OPEN,
+-					       tty : (unsigned long) tty,
+-					       len : 0 });
+-		write(tty_log_fd, &data, sizeof(data));
++		data = ((struct tty_log_buf) { .what 	= TTY_LOG_OPEN,
++					       .tty  = (unsigned long) tty,
++					       .len  = sizeof(current_tty),
++					       .direction = 0,
++					       .sec = tv.tv_sec,
++					       .usec = tv.tv_usec } );
++		os_write_file(tty_log_fd, &data, sizeof(data));
++		os_write_file(tty_log_fd, &current_tty, data.len);
+ 		return(tty_log_fd);
+ 	}
+ 
+-	gettimeofday(&tv, NULL);
+ 	sprintf(buf, "%s/%0u-%0u", tty_log_dir, (unsigned int) tv.tv_sec, 
+  		(unsigned int) tv.tv_usec);
+ 
+@@ -62,30 +73,117 @@
+ void close_tty_log(int fd, void *tty)
+ {
+ 	struct tty_log_buf data;
++	struct timeval tv;
+ 
+ 	if(tty_log_fd != -1){
+-		data = ((struct tty_log_buf) { what :	TTY_LOG_CLOSE,
+-					       tty : (unsigned long) tty,
+-					       len : 0 });
+-		write(tty_log_fd, &data, sizeof(data));
++		gettimeofday(&tv, NULL);
++		data = ((struct tty_log_buf) { .what 	= TTY_LOG_CLOSE,
++					       .tty  = (unsigned long) tty,
++					       .len  = 0,
++					       .direction = 0,
++					       .sec = tv.tv_sec,
++					       .usec = tv.tv_usec } );
++		os_write_file(tty_log_fd, &data, sizeof(data));
+ 		return;
+ 	}
+-	close(fd);
++	os_close_file(fd);
+ }
+ 
+-int write_tty_log(int fd, char *buf, int len, void *tty)
++static int log_chunk(int fd, const char *buf, int len)
+ {
++	int total = 0, try, missed, n;
++	char chunk[64];
++
++	while(len > 0){
++		try = (len > sizeof(chunk)) ? sizeof(chunk) : len;
++		missed = copy_from_user_proc(chunk, (char *) buf, try);
++		try -= missed;
++		n = os_write_file(fd, chunk, try);
++		if(n != try) {
++			if(n < 0) 
++				return(n);
++			return(-EIO);
++		}
++		if(missed != 0)
++			return(-EFAULT);
++
++		len -= try;
++		total += try;
++		buf += try;
++	}
++
++	return(total);
++}
++
++int write_tty_log(int fd, const char *buf, int len, void *tty, int is_read)
++{
++	struct timeval tv;
+ 	struct tty_log_buf data;
++	int direction;
+ 
+ 	if(fd == tty_log_fd){
+-		data = ((struct tty_log_buf) { what :	TTY_LOG_WRITE,
+-					       tty : (unsigned long) tty,
+-					       len : len });
+-		write(tty_log_fd, &data, sizeof(data));
++		gettimeofday(&tv, NULL);
++		direction = is_read ? TTY_READ : TTY_WRITE;
++		data = ((struct tty_log_buf) { .what 	= TTY_LOG_WRITE,
++					       .tty  = (unsigned long) tty,
++					       .len  = len,
++					       .direction = direction,
++					       .sec = tv.tv_sec,
++					       .usec = tv.tv_usec } );
++		os_write_file(tty_log_fd, &data, sizeof(data));
+ 	}
+-	return(write(fd, buf, len));
++
++	return(log_chunk(fd, buf, len));
+ }
+ 
++void log_exec(char **argv, void *tty)
++{
++	struct timeval tv;
++	struct tty_log_buf data;
++	char **ptr,*arg;
++	int len;
++	
++	if(tty_log_fd == -1) return;
++
++	gettimeofday(&tv, NULL);
++
++	len = 0;
++	for(ptr = argv; ; ptr++){
++		if(copy_from_user_proc(&arg, ptr, sizeof(arg)))
++			return;
++		if(arg == NULL) break;
++		len += strlen_user_proc(arg);
++	}
++
++	data = ((struct tty_log_buf) { .what 	= TTY_LOG_EXEC,
++				       .tty  = (unsigned long) tty,
++				       .len  = len,
++				       .direction = 0,
++				       .sec = tv.tv_sec,
++				       .usec = tv.tv_usec } );
++	os_write_file(tty_log_fd, &data, sizeof(data));
++
++	for(ptr = argv; ; ptr++){
++		if(copy_from_user_proc(&arg, ptr, sizeof(arg)))
++			return;
++		if(arg == NULL) break;
++		log_chunk(tty_log_fd, arg, strlen_user_proc(arg));
++	}
++}
++
++extern void register_tty_logger(int (*opener)(void *, void *),
++				int (*writer)(int, const char *, int, 
++					      void *, int),
++				void (*closer)(int, void *));
++
++static int register_logger(void)
++{
++	register_tty_logger(open_tty_log, write_tty_log, close_tty_log);
++	return(0);
++}
++
++__uml_initcall(register_logger);
++
+ static int __init set_tty_log_dir(char *name, int *add)
+ {
+ 	tty_log_dir = name;
+@@ -104,7 +202,7 @@
+ 
+ 	tty_log_fd = strtoul(name, &end, 0);
+ 	if((*end != '\0') || (end == name)){
+-		printk("set_tty_log_fd - strtoul failed on '%s'\n", name);
++		printf("set_tty_log_fd - strtoul failed on '%s'\n", name);
+ 		tty_log_fd = -1;
+ 	}
+ 	return 0;
+diff -Naur a/arch/um/kernel/uaccess_user.c b/arch/um/kernel/uaccess_user.c
+--- a/arch/um/kernel/uaccess_user.c	2004-02-11 12:16:09.000000000 -0500
++++ b/arch/um/kernel/uaccess_user.c	2004-02-11 12:28:20.000000000 -0500
+@@ -20,7 +20,7 @@
+ 
+ 	jmp_buf jbuf;
+ 	*fault_catcher = &jbuf;
+-	if(setjmp(jbuf) == 0){
++	if(sigsetjmp(jbuf, 1) == 0){
+ 		(*op)(to, from, n);
+ 		ret = 0;
+ 		*faulted_out = 0;
+diff -Naur a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c
+--- a/arch/um/kernel/um_arch.c	2004-02-11 12:16:29.000000000 -0500
++++ b/arch/um/kernel/um_arch.c	2004-02-11 12:28:28.000000000 -0500
+@@ -38,13 +38,18 @@
+ #include "mode_kern.h"
+ #include "mode.h"
+ 
+-#define DEFAULT_COMMAND_LINE "root=6200"
++#define DEFAULT_COMMAND_LINE "root=98:0"
+ 
+ struct cpuinfo_um boot_cpu_data = { 
+ 	.loops_per_jiffy	= 0,
+ 	.ipi_pipe		= { -1, -1 }
+ };
+ 
++/* Placeholder to make UML link until the vsyscall stuff is actually 
++ * implemented
++ */
++void *__kernel_vsyscall;
++
+ unsigned long thread_saved_pc(struct task_struct *task)
+ {
+ 	return(os_process_pc(CHOOSE_MODE_PROC(thread_pid_tt, thread_pid_skas,
+@@ -53,18 +58,22 @@
+ 
+ static int show_cpuinfo(struct seq_file *m, void *v)
+ {
+-	int index;
++	int index = 0;
+ 
+-	index = (struct cpuinfo_um *)v - cpu_data;
+ #ifdef CONFIG_SMP
++	index = (struct cpuinfo_um *) v - cpu_data;
+ 	if (!cpu_online(index))
+ 		return 0;
+ #endif
+ 
+-	seq_printf(m, "bogomips\t: %lu.%02lu\n",
++	seq_printf(m, "processor\t: %d\n", index);
++	seq_printf(m, "vendor_id\t: User Mode Linux\n");
++	seq_printf(m, "model name\t: UML\n");
++	seq_printf(m, "mode\t\t: %s\n", CHOOSE_MODE("tt", "skas"));
++	seq_printf(m, "host\t\t: %s\n", host_info);
++	seq_printf(m, "bogomips\t: %lu.%02lu\n\n",
+ 		   loops_per_jiffy/(500000/HZ),
+ 		   (loops_per_jiffy/(5000/HZ)) % 100);
+-	seq_printf(m, "host\t\t: %s\n", host_info);
+ 
+ 	return(0);
+ }
+@@ -134,12 +143,12 @@
+ 	if(umid != NULL){
+ 		snprintf(argv1_begin, 
+ 			 (argv1_end - argv1_begin) * sizeof(*ptr), 
+-			 "(%s)", umid);
++			 "(%s) ", umid);
+ 		ptr = &argv1_begin[strlen(argv1_begin)];
+ 	}
+ 	else ptr = argv1_begin;
+ 
+-	snprintf(ptr, (argv1_end - ptr) * sizeof(*ptr), " [%s]", cmd);
++	snprintf(ptr, (argv1_end - ptr) * sizeof(*ptr), "[%s]", cmd);
+ 	memset(argv1_begin + strlen(argv1_begin), '\0', 
+ 	       argv1_end - argv1_begin - strlen(argv1_begin));
+ #endif
+@@ -179,7 +188,7 @@
+ static int __init uml_ncpus_setup(char *line, int *add)
+ {
+        if (!sscanf(line, "%d", &ncpus)) {
+-               printk("Couldn't parse [%s]\n", line);
++               printf("Couldn't parse [%s]\n", line);
+                return -1;
+        }
+ 
+@@ -210,7 +219,7 @@
+ 
+ static int __init mode_tt_setup(char *line, int *add)
+ {
+-	printk("CONFIG_MODE_TT disabled - 'mode=tt' ignored\n");
++	printf("CONFIG_MODE_TT disabled - 'mode=tt' ignored\n");
+ 	return(0);
+ }
+ 
+@@ -221,7 +230,7 @@
+ 
+ static int __init mode_tt_setup(char *line, int *add)
+ {
+-	printk("CONFIG_MODE_SKAS disabled - 'mode=tt' redundant\n");
++	printf("CONFIG_MODE_SKAS disabled - 'mode=tt' redundant\n");
+ 	return(0);
+ }
+ 
+@@ -291,7 +300,7 @@
+ 
+ /* Set during early boot */
+ unsigned long brk_start;
+-static struct vm_reserved kernel_vm_reserved;
++unsigned long end_iomem;
+ 
+ #define MIN_VMALLOC (32 * 1024 * 1024)
+ 
+@@ -299,7 +308,7 @@
+ {
+ 	unsigned long avail;
+ 	unsigned long virtmem_size, max_physmem;
+-	unsigned int i, add, err;
++	unsigned int i, add;
+ 
+ 	for (i = 1; i < argc; i++){
+ 		if((i == 1) && (argv[i][0] == ' ')) continue;
+@@ -328,12 +337,16 @@
+ 	argv1_end = &argv[1][strlen(argv[1])];
+ #endif
+   
+-	set_usable_vm(uml_physmem, get_kmem_end());
+-
+ 	highmem = 0;
+-	max_physmem = get_kmem_end() - uml_physmem - MIN_VMALLOC;
+-	if(physmem_size > max_physmem){
+-		highmem = physmem_size - max_physmem;
++	iomem_size = (iomem_size + PAGE_SIZE - 1) & PAGE_MASK;
++	max_physmem = get_kmem_end() - uml_physmem - iomem_size - MIN_VMALLOC;
++
++	/* Zones have to begin on a 1 << MAX_ORDER page boundary,
++	 * so this makes sure that's true for highmem
++	 */
++	max_physmem &= ~((1 << (PAGE_SHIFT + MAX_ORDER)) - 1);
++	if(physmem_size + iomem_size > max_physmem){
++		highmem = physmem_size + iomem_size - max_physmem;
+ 		physmem_size -= highmem;
+ #ifndef CONFIG_HIGHMEM
+ 		highmem = 0;
+@@ -343,11 +356,19 @@
+ 	}
+ 
+ 	high_physmem = uml_physmem + physmem_size;
+-	high_memory = (void *) high_physmem;
++	end_iomem = high_physmem + iomem_size;
++	high_memory = (void *) end_iomem;
+ 
+ 	start_vm = VMALLOC_START;
+ 
+-	setup_physmem(uml_physmem, uml_reserved, physmem_size);
++	setup_physmem(uml_physmem, uml_reserved, physmem_size, highmem);
++	if(init_maps(physmem_size, iomem_size, highmem)){
++		printf("Failed to allocate mem_map for %ld bytes of physical "
++		       "memory and %ld bytes of highmem\n", physmem_size,
++		       highmem);
++		exit(1);
++	}
++
+ 	virtmem_size = physmem_size;
+ 	avail = get_kmem_end() - start_vm;
+ 	if(physmem_size > avail) virtmem_size = avail;
+@@ -357,18 +378,13 @@
+ 		printf("Kernel virtual memory size shrunk to %ld bytes\n",
+ 		       virtmem_size);
+ 
+-	err = reserve_vm(high_physmem, end_vm, &kernel_vm_reserved);
+-	if(err){
+-		printf("Failed to reserve VM area for kernel VM\n");
+-		exit(1);
+-	}
+-
+   	uml_postsetup();
+ 
+ 	init_task.thread.kernel_stack = (unsigned long) &init_thread_info + 
+ 		2 * PAGE_SIZE;
+ 
+ 	task_protections((unsigned long) &init_thread_info);
++	os_flush_stdout();
+ 
+ 	return(CHOOSE_MODE(start_uml_tt(), start_uml_skas()));
+ }
+@@ -377,7 +393,7 @@
+ 		      void *unused2)
+ {
+ #ifdef CONFIG_MAGIC_SYSRQ
+-	handle_sysrq('p', &current->thread.regs, NULL, NULL);
++	handle_sysrq('p', &current->thread.regs, NULL);
+ #endif
+ 	machine_halt();
+ 	return(0);
+@@ -403,6 +419,11 @@
+ 	arch_check_bugs();
+ 	check_ptrace();
+ 	check_sigio();
++	check_devanon();
++}
++
++void apply_alternatives(void *start, void *end)
++{
+ }
+ 
+ /*
+diff -Naur a/arch/um/kernel/umid.c b/arch/um/kernel/umid.c
+--- a/arch/um/kernel/umid.c	2004-02-11 12:16:43.000000000 -0500
++++ b/arch/um/kernel/umid.c	2004-02-11 12:28:42.000000000 -0500
+@@ -5,7 +5,6 @@
+ 
+ #include <stdio.h>
+ #include <unistd.h>
+-#include <fcntl.h>
+ #include <errno.h>
+ #include <string.h>
+ #include <stdlib.h>
+@@ -33,18 +32,19 @@
+ static int umid_is_random = 1;
+ static int umid_inited = 0;
+ 
+-static int make_umid(void);
++static int make_umid(int (*printer)(const char *fmt, ...));
+ 
+-static int __init set_umid(char *name, int is_random)
++static int __init set_umid(char *name, int is_random, 
++			   int (*printer)(const char *fmt, ...))
+ {
+ 	if(umid_inited){
+-		printk("Unique machine name can't be set twice\n");
++		(*printer)("Unique machine name can't be set twice\n");
+ 		return(-1);
+ 	}
+ 
+ 	if(strlen(name) > UMID_LEN - 1)
+-		printk("Unique machine name is being truncated to %s "
+-		       "characters\n", UMID_LEN);
++		(*printer)("Unique machine name is being truncated to %s "
++			   "characters\n", UMID_LEN);
+ 	strlcpy(umid, name, sizeof(umid));
+ 
+ 	umid_is_random = is_random;
+@@ -54,7 +54,7 @@
+ 
+ static int __init set_umid_arg(char *name, int *add)
+ {
+-	return(set_umid(name, 0));
++	return(set_umid(name, 0, printf));
+ }
+ 
+ __uml_setup("umid=", set_umid_arg,
+@@ -67,7 +67,7 @@
+ {
+ 	int n;
+ 
+-	if(!umid_inited && make_umid()) return(-1);
++	if(!umid_inited && make_umid(printk)) return(-1);
+ 
+ 	n = strlen(uml_dir) + strlen(umid) + strlen(name) + 1;
+ 	if(n > len){
+@@ -85,22 +85,23 @@
+ {
+ 	char file[strlen(uml_dir) + UMID_LEN + sizeof("/pid\0")];
+ 	char pid[sizeof("nnnnn\0")];
+-	int fd;
++	int fd, n;
+ 
+ 	if(umid_file_name("pid", file, sizeof(file))) return 0;
+ 
+ 	fd = os_open_file(file, of_create(of_excl(of_rdwr(OPENFLAGS()))), 
+ 			  0644);
+ 	if(fd < 0){
+-		printk("Open of machine pid file \"%s\" failed - "
+-		       "errno = %d\n", file, -fd);
++		printf("Open of machine pid file \"%s\" failed - "
++		       "err = %d\n", file, -fd);
+ 		return 0;
+ 	}
+ 
+ 	sprintf(pid, "%d\n", os_getpid());
+-	if(write(fd, pid, strlen(pid)) != strlen(pid))
+-		printk("Write of pid file failed - errno = %d\n", errno);
+-	close(fd);
++	n = os_write_file(fd, pid, strlen(pid));
++	if(n != strlen(pid))
++		printf("Write of pid file failed - err = %d\n", -n);
++	os_close_file(fd);
+ 	return 0;
+ }
+ 
+@@ -111,7 +112,8 @@
+ 	int len;
+ 	char file[256];
+ 
+-	if((directory = opendir(dir)) == NULL){
++	directory = opendir(dir);
++	if(directory == NULL){
+ 		printk("actually_do_remove : couldn't open directory '%s', "
+ 		       "errno = %d\n", dir, errno);
+ 		return(1);
+@@ -160,22 +162,24 @@
+ {
+ 	char file[strlen(uml_dir) + UMID_LEN + sizeof("/pid\0")];
+ 	char pid[sizeof("nnnnn\0")], *end;
+-	int dead, fd, p;
++	int dead, fd, p, n;
+ 
+ 	sprintf(file, "%s/pid", dir);
+ 	dead = 0;
+-	if((fd = os_open_file(file, of_read(OPENFLAGS()), 0)) < 0){
++	fd = os_open_file(file, of_read(OPENFLAGS()), 0);
++	if(fd < 0){
+ 		if(fd != -ENOENT){
+ 			printk("not_dead_yet : couldn't open pid file '%s', "
+-			       "errno = %d\n", file, -fd);
++			       "err = %d\n", file, -fd);
+ 			return(1);
+ 		}
+ 		dead = 1;
+ 	}
+ 	if(fd > 0){
+-		if(read(fd, pid, sizeof(pid)) < 0){
++		n = os_read_file(fd, pid, sizeof(pid));
++		if(n < 0){
+ 			printk("not_dead_yet : couldn't read pid file '%s', "
+-			       "errno = %d\n", file, errno);
++			       "err = %d\n", file, -n);
+ 			return(1);
+ 		}
+ 		p = strtoul(pid, &end, 0);
+@@ -197,7 +201,7 @@
+ 	if((strlen(name) > 0) && (name[strlen(name) - 1] != '/')){
+ 		uml_dir = malloc(strlen(name) + 1);
+ 		if(uml_dir == NULL){
+-			printk("Failed to malloc uml_dir - error = %d\n",
++			printf("Failed to malloc uml_dir - error = %d\n",
+ 			       errno);
+ 			uml_dir = name;
+ 			return(0);
+@@ -217,7 +221,7 @@
+ 		char *home = getenv("HOME");
+ 
+ 		if(home == NULL){
+-			printk("make_uml_dir : no value in environment for "
++			printf("make_uml_dir : no value in environment for "
+ 			       "$HOME\n");
+ 			exit(1);
+ 		}
+@@ -232,57 +236,59 @@
+ 		dir[len + 1] = '\0';
+ 	}
+ 
+-	if((uml_dir = malloc(strlen(dir) + 1)) == NULL){
++	uml_dir = malloc(strlen(dir) + 1);
++	if(uml_dir == NULL){
+ 		printf("make_uml_dir : malloc failed, errno = %d\n", errno);
+ 		exit(1);
+ 	}
+ 	strcpy(uml_dir, dir);
+ 	
+ 	if((mkdir(uml_dir, 0777) < 0) && (errno != EEXIST)){
+-	        printk("Failed to mkdir %s - errno = %i\n", uml_dir, errno);
++	        printf("Failed to mkdir %s - errno = %i\n", uml_dir, errno);
+ 		return(-1);
+ 	}
+ 	return 0;
+ }
+ 
+-static int __init make_umid(void)
++static int __init make_umid(int (*printer)(const char *fmt, ...))
+ {
+ 	int fd, err;
+ 	char tmp[strlen(uml_dir) + UMID_LEN + 1];
+ 
+ 	strlcpy(tmp, uml_dir, sizeof(tmp));
+ 
+-	if(*umid == 0){
++	if(!umid_inited){
+ 		strcat(tmp, "XXXXXX");
+ 		fd = mkstemp(tmp);
+ 		if(fd < 0){
+-			printk("make_umid - mkstemp failed, errno = %d\n",
+-			       errno);
++			(*printer)("make_umid - mkstemp failed, errno = %d\n",
++				   errno);
+ 			return(1);
+ 		}
+ 
+-		close(fd);
++		os_close_file(fd);
+ 		/* There's a nice tiny little race between this unlink and
+ 		 * the mkdir below.  It'd be nice if there were a mkstemp
+ 		 * for directories.
+ 		 */
+ 		unlink(tmp);
+-		set_umid(&tmp[strlen(uml_dir)], 1);
++		set_umid(&tmp[strlen(uml_dir)], 1, printer);
+ 	}
+ 	
+ 	sprintf(tmp, "%s%s", uml_dir, umid);
+ 
+-	if((err = mkdir(tmp, 0777)) < 0){
++	err = mkdir(tmp, 0777);
++	if(err < 0){
+ 		if(errno == EEXIST){
+ 			if(not_dead_yet(tmp)){
+-				printk("umid '%s' is in use\n", umid);
++				(*printer)("umid '%s' is in use\n", umid);
+ 				return(-1);
+ 			}
+ 			err = mkdir(tmp, 0777);
+ 		}
+ 	}
+ 	if(err < 0){
+-		printk("Failed to create %s - errno = %d\n", umid, errno);
++		(*printer)("Failed to create %s - errno = %d\n", umid, errno);
+ 		return(-1);
+ 	}
+ 
+@@ -295,7 +301,13 @@
+ );
+ 
+ __uml_postsetup(make_uml_dir);
+-__uml_postsetup(make_umid);
++
++static int __init make_umid_setup(void)
++{
++	return(make_umid(printf));
++}
++
++__uml_postsetup(make_umid_setup);
+ __uml_postsetup(create_pid_file);
+ 
+ /*
+diff -Naur a/arch/um/kernel/user_syms.c b/arch/um/kernel/user_syms.c
+--- a/arch/um/kernel/user_syms.c	2004-02-11 12:16:42.000000000 -0500
++++ b/arch/um/kernel/user_syms.c	2004-02-11 12:28:41.000000000 -0500
+@@ -1,7 +1,7 @@
+ #include <stdio.h>
+ #include <unistd.h>
+-#include <fcntl.h>
+ #include <dirent.h>
++#include <fcntl.h>
+ #include <errno.h>
+ #include <utime.h>
+ #include <string.h>
+@@ -16,46 +16,61 @@
+  * since this includes various user-level headers.
+  */
+ 
+-struct module_symbol
++/* Had to update this: this changed in late 2.5 to add CRC and other beasts
++ * and was never updated here- 13 Dec 2003-Blaisorblade
++ */
++
++/* v850 toolchain uses a `_' prefix for all user symbols */
++#ifndef MODULE_SYMBOL_PREFIX
++#define MODULE_SYMBOL_PREFIX ""
++#endif
++
++struct kernel_symbol
+ {
+ 	unsigned long value;
+ 	const char *name;
+ };
+ 
+-/* Indirect stringification.  */
+-
+-#define __MODULE_STRING_1(x)	#x
+-#define __MODULE_STRING(x)	__MODULE_STRING_1(x)
+-
+-#if !defined(__AUTOCONF_INCLUDED__)
+-
+-#define __EXPORT_SYMBOL(sym,str)   error config_must_be_included_before_module
+-#define EXPORT_SYMBOL(var)	   error config_must_be_included_before_module
+-#define EXPORT_SYMBOL_NOVERS(var)  error config_must_be_included_before_module
+-
+-#elif !defined(UML_CONFIG_MODULES)
++#if !defined(UML_CONFIG_MODULES)
++#define EXPORT_SYMBOL(sym)
++#define EXPORT_SYMBOL_GPL(sym)
++#define EXPORT_SYMBOL_NOVERS(sym)
++
++#else /*UML_CONFIG_MODULES*/
++#ifndef __GENKSYMS__
++#ifdef UML_CONFIG_MODVERSIONS
++/* Mark the CRC weak since genksyms apparently decides not to
++ * generate a checksums for some symbols */
++#define __CRC_SYMBOL(sym, sec)					\
++	extern void *__crc_##sym __attribute__((weak));		\
++	static const unsigned long __kcrctab_##sym		\
++	__attribute__((section("__kcrctab" sec), unused))	\
++	= (unsigned long) &__crc_##sym;
++#else
++#define __CRC_SYMBOL(sym, sec)
++#endif
+ 
+-#define __EXPORT_SYMBOL(sym,str)
+-#define EXPORT_SYMBOL(var)
+-#define EXPORT_SYMBOL_NOVERS(var)
++/* For every exported symbol, place a struct in the __ksymtab section */
++#define __EXPORT_SYMBOL(sym, sec)				\
++	__CRC_SYMBOL(sym, sec)					\
++	static const char __kstrtab_##sym[]			\
++	__attribute__((section("__ksymtab_strings")))		\
++	= MODULE_SYMBOL_PREFIX #sym;                    	\
++	static const struct kernel_symbol __ksymtab_##sym	\
++	__attribute__((section("__ksymtab" sec), unused))	\
++	= { (unsigned long)&sym, __kstrtab_##sym }
+ 
+-#else
++#define EXPORT_SYMBOL(sym)					\
++	__EXPORT_SYMBOL(sym, "")
+ 
+-#define __EXPORT_SYMBOL(sym, str)			\
+-const char __kstrtab_##sym[]				\
+-__attribute__((section(".kstrtab"))) = str;		\
+-const struct module_symbol __ksymtab_##sym 		\
+-__attribute__((section("__ksymtab"))) =			\
+-{ (unsigned long)&sym, __kstrtab_##sym }
++#define EXPORT_SYMBOL_GPL(sym)					\
++	__EXPORT_SYMBOL(sym, "_gpl")
+ 
+-#if defined(__MODVERSIONS__) || !defined(UML_CONFIG_MODVERSIONS)
+-#define EXPORT_SYMBOL(var)  __EXPORT_SYMBOL(var, __MODULE_STRING(var))
+-#else
+-#define EXPORT_SYMBOL(var)  __EXPORT_SYMBOL(var, __MODULE_STRING(__VERSIONED_SYMBOL(var)))
+ #endif
+ 
+-#define EXPORT_SYMBOL_NOVERS(var)  __EXPORT_SYMBOL(var, __MODULE_STRING(var))
+-
++/* We don't mangle the actual symbol anymore, so no need for
++ * special casing EXPORT_SYMBOL_NOVERS.  FIXME: Deprecated */
++#define EXPORT_SYMBOL_NOVERS(sym) EXPORT_SYMBOL(sym)
+ #endif
+ 
+ EXPORT_SYMBOL(__errno_location);
+@@ -109,5 +124,18 @@
+ 
+ EXPORT_SYMBOL(memset);
+ EXPORT_SYMBOL(strstr);
++EXPORT_SYMBOL(printf);
++EXPORT_SYMBOL(strlen);
+ 
+ EXPORT_SYMBOL(find_iomem);
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/arch/um/kernel/user_util.c b/arch/um/kernel/user_util.c
+--- a/arch/um/kernel/user_util.c	2004-02-11 12:14:27.000000000 -0500
++++ b/arch/um/kernel/user_util.c	2004-02-11 12:26:09.000000000 -0500
+@@ -5,7 +5,6 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <fcntl.h>
+ #include <unistd.h>
+ #include <limits.h>
+ #include <sys/mman.h> 
+@@ -82,7 +81,8 @@
+ 	int status, ret;
+ 
+ 	while(1){
+-		if(((ret = waitpid(pid, &status, WUNTRACED)) < 0) ||
++		ret = waitpid(pid, &status, WUNTRACED);
++		if((ret < 0) ||
+ 		   !WIFSTOPPED(status) || (WSTOPSIG(status) != sig)){
+ 			if(ret < 0){
+ 				if(errno == EINTR) continue;
+@@ -119,17 +119,6 @@
+ 	}
+ }
+ 
+-int clone_and_wait(int (*fn)(void *), void *arg, void *sp, int flags)
+-{
+-	int pid;
+-
+-	pid = clone(fn, sp, flags, arg);
+- 	if(pid < 0) return(-1);
+-	wait_for_stop(pid, SIGSTOP, PTRACE_CONT, NULL);
+-	ptrace(PTRACE_CONT, pid, 0, 0);
+-	return(pid);
+-}
+-
+ int raw(int fd, int complain)
+ {
+ 	struct termios tt;
+diff -Naur a/arch/um/main.c b/arch/um/main.c
+--- a/arch/um/main.c	2004-02-11 12:16:28.000000000 -0500
++++ b/arch/um/main.c	2004-02-11 12:28:27.000000000 -0500
+@@ -8,6 +8,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <signal.h>
++#include <errno.h>
+ #include <sys/resource.h>
+ #include <sys/mman.h>
+ #include <sys/user.h>
+@@ -123,12 +124,14 @@
+ 
+ 	set_stklim();
+ 
+-	if((new_argv = malloc((argc + 1) * sizeof(char *))) == NULL){
++	new_argv = malloc((argc + 1) * sizeof(char *));
++	if(new_argv == NULL){
+ 		perror("Mallocing argv");
+ 		exit(1);
+ 	}
+ 	for(i=0;i<argc;i++){
+-		if((new_argv[i] = strdup(argv[i])) == NULL){
++		new_argv[i] = strdup(argv[i]);
++		if(new_argv[i] == NULL){
+ 			perror("Mallocing an arg");
+ 			exit(1);
+ 		}
+diff -Naur a/arch/um/Makefile b/arch/um/Makefile
+--- a/arch/um/Makefile	2004-02-11 12:15:58.000000000 -0500
++++ b/arch/um/Makefile	2004-02-11 12:27:51.000000000 -0500
+@@ -22,17 +22,21 @@
+ 			   $(ARCH_DIR)/sys-$(SUBARCH)/
+ 
+ # Have to precede the include because the included Makefiles reference them.
+-SYMLINK_HEADERS = include/asm-um/archparam.h include/asm-um/system.h \
+-	include/asm-um/sigcontext.h include/asm-um/processor.h \
+-	include/asm-um/ptrace.h include/asm-um/arch-signal.h
++SYMLINK_HEADERS = archparam.h system.h sigcontext.h processor.h ptrace.h \
++	arch-signal.h module.h
++SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),include/asm-um/$(header))
+ 
+ ARCH_SYMLINKS = include/asm-um/arch $(ARCH_DIR)/include/sysdep $(ARCH_DIR)/os \
+ 	$(SYMLINK_HEADERS) $(ARCH_DIR)/include/uml-config.h
+ 
+ GEN_HEADERS += $(ARCH_DIR)/include/task.h $(ARCH_DIR)/include/kern_constants.h
+ 
+-include $(ARCH_DIR)/Makefile-$(SUBARCH)
+-include $(ARCH_DIR)/Makefile-os-$(OS)
++# This target adds dependencies to "prepare". They are defined in the included
++# Makefiles (see Makefile-i386).
++
++.PHONY: sys_prepare
++sys_prepare:
++	@:
+ 
+ MAKEFILE-$(CONFIG_MODE_TT) += Makefile-tt
+ MAKEFILE-$(CONFIG_MODE_SKAS) += Makefile-skas
+@@ -41,6 +45,9 @@
+   include $(addprefix $(ARCH_DIR)/,$(MAKEFILE-y))
+ endif
+ 
++include $(ARCH_DIR)/Makefile-$(SUBARCH)
++include $(ARCH_DIR)/Makefile-os-$(OS)
++
+ EXTRAVERSION := $(EXTRAVERSION)-1um
+ 
+ ARCH_INCLUDE = -I$(ARCH_DIR)/include
+@@ -52,14 +59,20 @@
+ 
+ CFLAGS += $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \
+ 	-D_LARGEFILE64_SOURCE $(ARCH_INCLUDE) -Derrno=kernel_errno \
+-	$(MODE_INCLUDE)
++	-Dsigprocmask=kernel_sigprocmask $(MODE_INCLUDE)
+ 
+ LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc
+ 
++# These are needed for clean and mrproper, since in that case .config is not
++# included; the values here are meaningless
++
++CONFIG_NEST_LEVEL ?= 0
++CONFIG_KERNEL_HALF_GIGS ?=  0
++
+ SIZE = (($(CONFIG_NEST_LEVEL) + $(CONFIG_KERNEL_HALF_GIGS)) * 0x20000000)
+ 
+ ifeq ($(CONFIG_MODE_SKAS), y)
+-$(SYS_HEADERS) : $(ARCH_DIR)/kernel/skas/include/skas_ptregs.h
++$(SYS_HEADERS) : $(TOPDIR)/$(ARCH_DIR)/include/skas_ptregs.h
+ endif
+ 
+ include/linux/version.h: arch/$(ARCH)/Makefile
+@@ -98,17 +111,17 @@
+ CONFIG_KERNEL_STACK_ORDER ?= 2
+ STACK_SIZE := $(shell echo $$[ 4096 * (1 << $(CONFIG_KERNEL_STACK_ORDER)) ] )
+ 
+-AFLAGS_vmlinux.lds.o = -U$(SUBARCH) \
++AFLAGS_vmlinux.lds.o = $(shell echo -U$(SUBARCH) \
+ 	-DSTART=$$(($(TOP_ADDR) - $(SIZE))) -DELF_ARCH=$(ELF_ARCH) \
+ 	-DELF_FORMAT=\"$(ELF_FORMAT)\" $(CPP_MODE_TT) \
+-	-DKERNEL_STACK_SIZE=$(STACK_SIZE)
++	-DKERNEL_STACK_SIZE=$(STACK_SIZE))
+ 
+-AFLAGS_$(LD_SCRIPT-y:.s=).o = $(AFLAGS_vmlinux.lds.o) -P -C -Uum
++export AFLAGS_$(LD_SCRIPT-y:.s=).o = $(AFLAGS_vmlinux.lds.o) -P -C -Uum
+ 
+ LD_SCRIPT-y := $(ARCH_DIR)/$(LD_SCRIPT-y)
+ 
+-$(LD_SCRIPT-y) : $(LD_SCRIPT-y:.s=.S) scripts FORCE
+-	$(call if_changed_dep,as_s_S)
++#$(LD_SCRIPT-y) : $(LD_SCRIPT-y:.s=.S) scripts FORCE
++#	$(call if_changed_dep,as_s_S)
+ 
+ linux: vmlinux $(LD_SCRIPT-y)
+ 	$(CC) -Wl,-T,$(LD_SCRIPT-y) $(LINK-y) $(LINK_WRAPS) \
+@@ -116,37 +129,47 @@
+ 
+ USER_CFLAGS := $(patsubst -I%,,$(CFLAGS))
+ USER_CFLAGS := $(patsubst -Derrno=kernel_errno,,$(USER_CFLAGS))
++USER_CFLAGS := $(patsubst -Dsigprocmask=kernel_sigprocmask,,$(USER_CFLAGS))
+ USER_CFLAGS := $(patsubst -D__KERNEL__,,$(USER_CFLAGS)) $(ARCH_INCLUDE) \
+ 	$(MODE_INCLUDE)
+ 
+ # To get a definition of F_SETSIG
+ USER_CFLAGS += -D_GNU_SOURCE
+ 
++# From main Makefile, these options are set after including the ARCH makefile.
++# So copy them here.
++
++ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
++USER_CFLAGS		+= -Os
++else
++USER_CFLAGS		+= -O2
++endif
++
++ifndef CONFIG_FRAME_POINTER
++USER_CFLAGS		+= -fomit-frame-pointer
++endif
++
++ifdef CONFIG_DEBUG_INFO
++USER_CFLAGS		+= -g
++endif
++
+ CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/uml.lds.s \
+-	$(ARCH_DIR)/dyn_link.ld.s $(GEN_HEADERS)
++	$(ARCH_DIR)/dyn_link.ld.s $(ARCH_DIR)/include/uml-config.h \
++	$(GEN_HEADERS)
+ 
+-$(ARCH_DIR)/main.o: $(ARCH_DIR)/main.c
+-	$(CC) $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
++MRPROPER_FILES += $(SYMLINK_HEADERS) $(ARCH_SYMLINKS) \
++	$(addprefix $(ARCH_DIR)/kernel/,$(KERN_SYMLINKS))
++
++$(ARCH_DIR)/main.o: $(ARCH_DIR)/main.c sys_prepare
++	@ echo '  MAIN    $@'
++	@ $(CC) $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+ 
+ archmrproper:
+-	for d in $(ARCH_SUBDIRS) $(ARCH_DIR)/util; \
+-	do \
+-		$(MAKE) -C $$d archmrproper; \
+-	done
+-	rm -f $(CLEAN_FILES) $(SYMLINK_HEADERS) $(ARCH_SYMLINKS) include/asm \
+-		$(addprefix $(ARCH_DIR)/kernel/,$(KERN_SYMLINKS))
+-
+-archclean: sysclean
+-	for d in $(ARCH_SUBDIRS) $(ARCH_DIR)/util; \
+-	do \
+-		$(MAKE) -C $$d clean; \
+-	done
+-	find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \
+-		-o -name '*.gcov' \) -type f -print | xargs rm -f
+-	rm -f linux x.i gmon.out $(ARCH_DIR)/link.ld $(GEN_HEADERS)
++	@:
+ 
+-archdep: 
+-	for d in $(ARCH_SUBDIRS); do $(MAKE) -C $$d fastdep; done
++archclean:
++	@find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \
++		-o -name '*.gcov' \) -type f -print | xargs rm -f
+ 
+ $(SYMLINK_HEADERS):
+ 	cd $(TOPDIR)/$(dir $@) ; \
+@@ -161,19 +184,26 @@
+ $(ARCH_DIR)/os:
+ 	cd $(ARCH_DIR) && ln -sf os-$(OS) os
+ 
+-$(ARCH_DIR)/include/uml-config.h :
+-	sed 's/ CONFIG/ UML_CONFIG/' $(TOPDIR)/include/linux/autoconf.h > $@
++# Generated files
++define filechk_umlconfig
++	sed 's/ CONFIG/ UML_CONFIG/'
++endef
++
++$(ARCH_DIR)/include/uml-config.h : $(TOPDIR)/include/linux/autoconf.h
++	$(call filechk,umlconfig)
++
++filechk_gen_header = $<
+ 
+ $(ARCH_DIR)/include/task.h : $(ARCH_DIR)/util/mk_task
+-	$< > $@
++	$(call filechk,gen_header)
+ 
+ $(ARCH_DIR)/include/kern_constants.h : $(ARCH_DIR)/util/mk_constants
+-	$< > $@
++	$(call filechk,gen_header)
+ 
+-$(ARCH_DIR)/util/mk_task : $(ARCH_DIR)/kernel/skas/include/skas_ptregs.h \
+-	$(ARCH_DIR)/util FORCE ;
++$(ARCH_DIR)/util/mk_task $(ARCH_DIR)/util/mk_constants : $(ARCH_DIR)/util \
++	sys_prepare FORCE ;
+ 
+ $(ARCH_DIR)/util: FORCE
+-	@$(call descend,$@,)
++	$(Q)$(MAKE) $(build)=$@
+ 
+-export SUBARCH USER_CFLAGS OS
++export SUBARCH USER_CFLAGS OS 
+diff -Naur a/arch/um/Makefile-i386 b/arch/um/Makefile-i386
+--- a/arch/um/Makefile-i386	2004-02-11 12:16:28.000000000 -0500
++++ b/arch/um/Makefile-i386	2004-02-11 12:28:27.000000000 -0500
+@@ -16,22 +16,27 @@
+ 
+ SYS_HEADERS = $(SYS_DIR)/sc.h $(SYS_DIR)/thread.h
+ 
++sys_prepare: $(SYS_DIR)/sc.h
++
+ prepare: $(SYS_HEADERS)
+ 
++filechk_$(SYS_DIR)/sc.h := $(SYS_UTIL_DIR)/mk_sc
++
+ $(SYS_DIR)/sc.h: $(SYS_UTIL_DIR)/mk_sc
+-	$< > $@
++	$(call filechk,$@)
++
++filechk_$(SYS_DIR)/thread.h := $(SYS_UTIL_DIR)/mk_thread 
+ 
+ $(SYS_DIR)/thread.h: $(SYS_UTIL_DIR)/mk_thread 
+-	$< > $@
++	$(call filechk,$@)
+ 
+-$(SYS_UTIL_DIR)/mk_sc: FORCE ; 
+-	@$(call descend,$(SYS_UTIL_DIR),$@)
++$(SYS_UTIL_DIR)/mk_sc: scripts/fixdep include/config/MARKER FORCE ; 
++	$(Q)$(MAKE) $(build)=$(SYS_UTIL_DIR) $@
+ 
+-$(SYS_UTIL_DIR)/mk_thread: $(ARCH_SYMLINKS) $(GEN_HEADERS) FORCE ; 
+-	@$(call descend,$(SYS_UTIL_DIR),$@)
++$(SYS_UTIL_DIR)/mk_thread: $(ARCH_SYMLINKS) $(GEN_HEADERS) sys_prepare FORCE ; 
++	$(Q)$(MAKE) $(build)=$(SYS_UTIL_DIR) $@
+ 
+ $(SYS_UTIL_DIR): include/asm FORCE
+-	@$(call descend,$@,)
++	$(Q)$(MAKE) $(build)=$(SYS_UTIL_DIR)
+ 
+-sysclean :
+-	rm -f $(SYS_HEADERS)
++CLEAN_FILES += $(SYS_HEADERS)
+diff -Naur a/arch/um/Makefile-skas b/arch/um/Makefile-skas
+--- a/arch/um/Makefile-skas	2004-02-11 12:15:22.000000000 -0500
++++ b/arch/um/Makefile-skas	2004-02-11 12:27:10.000000000 -0500
+@@ -14,7 +14,7 @@
+ LINK_SKAS = -Wl,-rpath,/lib 
+ LD_SCRIPT_SKAS = dyn.lds.s
+ 
+-GEN_HEADERS += $(ARCH_DIR)/kernel/skas/include/skas_ptregs.h
++GEN_HEADERS += $(TOPDIR)/$(ARCH_DIR)/include/skas_ptregs.h
+ 
+-$(ARCH_DIR)/kernel/skas/include/skas_ptregs.h :
+-	$(MAKE) -C $(ARCH_DIR)/kernel/skas include/skas_ptregs.h
++$(TOPDIR)/$(ARCH_DIR)/include/skas_ptregs.h :
++	$(Q)$(MAKE) $(build)=$(ARCH_DIR)/kernel/skas $@
+diff -Naur a/arch/um/os-Linux/drivers/ethertap_kern.c b/arch/um/os-Linux/drivers/ethertap_kern.c
+--- a/arch/um/os-Linux/drivers/ethertap_kern.c	2004-02-11 12:14:17.000000000 -0500
++++ b/arch/um/os-Linux/drivers/ethertap_kern.c	2004-02-11 12:26:00.000000000 -0500
+@@ -8,7 +8,6 @@
+ #include "linux/init.h"
+ #include "linux/netdevice.h"
+ #include "linux/etherdevice.h"
+-#include "linux/init.h"
+ #include "net_kern.h"
+ #include "net_user.h"
+ #include "etap.h"
+diff -Naur a/arch/um/os-Linux/drivers/ethertap_user.c b/arch/um/os-Linux/drivers/ethertap_user.c
+--- a/arch/um/os-Linux/drivers/ethertap_user.c	2004-02-11 12:15:29.000000000 -0500
++++ b/arch/um/os-Linux/drivers/ethertap_user.c	2004-02-11 12:27:17.000000000 -0500
+@@ -8,7 +8,6 @@
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <stddef.h>
+-#include <fcntl.h>
+ #include <stdlib.h>
+ #include <sys/errno.h>
+ #include <sys/socket.h>
+@@ -42,13 +41,14 @@
+ {
+ 	struct addr_change change;
+ 	void *output;
++	int n;
+ 
+ 	change.what = op;
+ 	memcpy(change.addr, addr, sizeof(change.addr));
+ 	memcpy(change.netmask, netmask, sizeof(change.netmask));
+-	if(write(fd, &change, sizeof(change)) != sizeof(change))
+-		printk("etap_change - request failed, errno = %d\n",
+-		       errno);
++	n = os_write_file(fd, &change, sizeof(change));
++	if(n != sizeof(change))
++		printk("etap_change - request failed, err = %d\n", -n);
+ 	output = um_kmalloc(page_size());
+ 	if(output == NULL)
+ 		printk("etap_change : Failed to allocate output buffer\n");
+@@ -82,15 +82,15 @@
+ 	struct etap_pre_exec_data *data = arg;
+ 
+ 	dup2(data->control_remote, 1);
+-	close(data->data_me);
+-	close(data->control_me);
++	os_close_file(data->data_me);
++	os_close_file(data->control_me);
+ }
+ 
+ static int etap_tramp(char *dev, char *gate, int control_me, 
+ 		      int control_remote, int data_me, int data_remote)
+ {
+ 	struct etap_pre_exec_data pe_data;
+-	int pid, status, err;
++	int pid, status, err, n;
+ 	char version_buf[sizeof("nnnnn\0")];
+ 	char data_fd_buf[sizeof("nnnnnn\0")];
+ 	char gate_buf[sizeof("nnn.nnn.nnn.nnn\0")];
+@@ -114,21 +114,21 @@
+ 	pe_data.data_me = data_me;
+ 	pid = run_helper(etap_pre_exec, &pe_data, args, NULL);
+ 
+-	if(pid < 0) err = errno;
+-	close(data_remote);
+-	close(control_remote);
+-	if(read(control_me, &c, sizeof(c)) != sizeof(c)){
+-		printk("etap_tramp : read of status failed, errno = %d\n",
+-		       errno);
+-		return(EINVAL);
++	if(pid < 0) err = pid;
++	os_close_file(data_remote);
++	os_close_file(control_remote);
++	n = os_read_file(control_me, &c, sizeof(c));
++	if(n != sizeof(c)){
++		printk("etap_tramp : read of status failed, err = %d\n", -n);
++		return(-EINVAL);
+ 	}
+ 	if(c != 1){
+ 		printk("etap_tramp : uml_net failed\n");
+-		err = EINVAL;
+-		if(waitpid(pid, &status, 0) < 0) err = errno;
+-		else if(!WIFEXITED(status) || (WEXITSTATUS(status) != 1)){
++		err = -EINVAL;
++		if(waitpid(pid, &status, 0) < 0)
++			err = -errno;
++		else if(!WIFEXITED(status) || (WEXITSTATUS(status) != 1))
+ 			printk("uml_net didn't exit with status 1\n");
+-		}
+ 	}
+ 	return(err);
+ }
+@@ -143,14 +143,14 @@
+ 	if(err) return(err);
+ 
+ 	err = os_pipe(data_fds, 0, 0);
+-	if(err){
+-		printk("data os_pipe failed - errno = %d\n", -err);
++	if(err < 0){
++		printk("data os_pipe failed - err = %d\n", -err);
+ 		return(err);
+ 	}
+ 
+ 	err = os_pipe(control_fds, 1, 0);
+-	if(err){
+-		printk("control os_pipe failed - errno = %d\n", -err);
++	if(err < 0){
++		printk("control os_pipe failed - err = %d\n", -err);
+ 		return(err);
+ 	}
+ 	
+@@ -167,9 +167,9 @@
+ 		kfree(output);
+ 	}
+ 
+-	if(err != 0){
+-		printk("etap_tramp failed - errno = %d\n", err);
+-		return(-err);
++	if(err < 0){
++		printk("etap_tramp failed - err = %d\n", -err);
++		return(err);
+ 	}
+ 
+ 	pri->data_fd = data_fds[0];
+@@ -183,11 +183,11 @@
+ 	struct ethertap_data *pri = data;
+ 
+ 	iter_addresses(pri->dev, etap_close_addr, &pri->control_fd);
+-	close(fd);
++	os_close_file(fd);
+ 	os_shutdown_socket(pri->data_fd, 1, 1);
+-	close(pri->data_fd);
++	os_close_file(pri->data_fd);
+ 	pri->data_fd = -1;
+-	close(pri->control_fd);
++	os_close_file(pri->control_fd);
+ 	pri->control_fd = -1;
+ }
+ 
+diff -Naur a/arch/um/os-Linux/drivers/tuntap_user.c b/arch/um/os-Linux/drivers/tuntap_user.c
+--- a/arch/um/os-Linux/drivers/tuntap_user.c	2004-02-11 12:17:08.000000000 -0500
++++ b/arch/um/os-Linux/drivers/tuntap_user.c	2004-02-11 12:29:13.000000000 -0500
+@@ -8,7 +8,6 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <errno.h>
+-#include <fcntl.h>
+ #include <sys/wait.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+@@ -61,7 +60,7 @@
+ 	struct tuntap_pre_exec_data *data = arg;
+ 	
+ 	dup2(data->stdout, 1);
+-	close(data->close_me);
++	os_close_file(data->close_me);
+ }
+ 
+ static int tuntap_open_tramp(char *gate, int *fd_out, int me, int remote,
+@@ -86,7 +85,7 @@
+ 
+ 	if(pid < 0) return(-pid);
+ 
+-	close(remote);
++	os_close_file(remote);
+ 
+ 	msg.msg_name = NULL;
+ 	msg.msg_namelen = 0;
+@@ -107,19 +106,19 @@
+ 	if(n < 0){
+ 		printk("tuntap_open_tramp : recvmsg failed - errno = %d\n", 
+ 		       errno);
+-		return(errno);
++		return(-errno);
+ 	}
+ 	waitpid(pid, NULL, 0);
+ 
+ 	cmsg = CMSG_FIRSTHDR(&msg);
+ 	if(cmsg == NULL){
+ 		printk("tuntap_open_tramp : didn't receive a message\n");
+-		return(EINVAL);
++		return(-EINVAL);
+ 	}
+ 	if((cmsg->cmsg_level != SOL_SOCKET) || 
+ 	   (cmsg->cmsg_type != SCM_RIGHTS)){
+ 		printk("tuntap_open_tramp : didn't receive a descriptor\n");
+-		return(EINVAL);
++		return(-EINVAL);
+ 	}
+ 	*fd_out = ((int *) CMSG_DATA(cmsg))[0];
+ 	return(0);
+@@ -133,27 +132,29 @@
+ 	int err, fds[2], len, used;
+ 
+ 	err = tap_open_common(pri->dev, pri->gate_addr);
+-	if(err) return(err);
++	if(err < 0) 
++		return(err);
+ 
+ 	if(pri->fixed_config){
+-		if((pri->fd = open("/dev/net/tun", O_RDWR)) < 0){
+-			printk("Failed to open /dev/net/tun, errno = %d\n",
+-			       errno);
+-			return(-errno);
++		pri->fd = os_open_file("/dev/net/tun", of_rdwr(OPENFLAGS()), 0);
++		if(pri->fd < 0){
++			printk("Failed to open /dev/net/tun, err = %d\n",
++			       -pri->fd);
++			return(pri->fd);
+ 		}
+ 		memset(&ifr, 0, sizeof(ifr));
+-		ifr.ifr_flags = IFF_TAP;
++		ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
+ 		strlcpy(ifr.ifr_name, pri->dev_name, sizeof(ifr.ifr_name));
+ 		if(ioctl(pri->fd, TUNSETIFF, (void *) &ifr) < 0){
+-			printk("TUNSETIFF failed, errno = %d", errno);
+-			close(pri->fd);
++			printk("TUNSETIFF failed, errno = %d\n", errno);
++			os_close_file(pri->fd);
+ 			return(-errno);
+ 		}
+ 	}
+ 	else {
+ 		err = os_pipe(fds, 0, 0);
+-		if(err){
+-			printk("tuntap_open : os_pipe failed - errno = %d\n",
++		if(err < 0){
++			printk("tuntap_open : os_pipe failed - err = %d\n",
+ 			       -err);
+ 			return(err);
+ 		}
+@@ -166,19 +167,19 @@
+ 					fds[1], buffer, len, &used);
+ 
+ 		output = buffer;
+-		if(err == 0){
+-			pri->dev_name = uml_strdup(buffer);
+-			output += IFNAMSIZ;
+-			printk(output);
+-			free_output_buffer(buffer);
+-		}
+-		else {
+-			printk(output);
++		if(err < 0) {
++			printk("%s", output);
+ 			free_output_buffer(buffer);
+-			printk("tuntap_open_tramp failed - errno = %d\n", err);
+-			return(-err);
++			printk("tuntap_open_tramp failed - err = %d\n", -err);
++			return(err);
+ 		}
+-		close(fds[0]);
++
++		pri->dev_name = uml_strdup(buffer);
++		output += IFNAMSIZ;
++		printk("%s", output);
++		free_output_buffer(buffer);
++
++		os_close_file(fds[0]);
+ 		iter_addresses(pri->dev, open_addr, pri->dev_name);
+ 	}
+ 
+@@ -191,7 +192,7 @@
+ 
+ 	if(!pri->fixed_config) 
+ 		iter_addresses(pri->dev, close_addr, pri->dev_name);
+-	close(fd);
++	os_close_file(fd);
+ 	pri->fd = -1;
+ }
+ 
+diff -Naur a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c
+--- a/arch/um/os-Linux/file.c	2004-02-11 12:17:07.000000000 -0500
++++ b/arch/um/os-Linux/file.c	2004-02-11 12:29:09.000000000 -0500
+@@ -8,6 +8,8 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <signal.h>
++#include <sys/types.h>
++#include <sys/stat.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <sys/ioctl.h>
+@@ -17,33 +19,235 @@
+ #include "user.h"
+ #include "kern_util.h"
+ 
+-int os_file_type(char *file)
++static void copy_stat(struct uml_stat *dst, struct stat64 *src)
++{
++	*dst = ((struct uml_stat) {
++		.ust_dev     = src->st_dev,     /* device */
++		.ust_ino     = src->st_ino,     /* inode */
++		.ust_mode    = src->st_mode,    /* protection */
++		.ust_nlink   = src->st_nlink,   /* number of hard links */
++		.ust_uid     = src->st_uid,     /* user ID of owner */
++		.ust_gid     = src->st_gid,     /* group ID of owner */
++		.ust_size    = src->st_size,    /* total size, in bytes */
++		.ust_blksize = src->st_blksize, /* blocksize for filesys I/O */
++		.ust_blocks  = src->st_blocks,  /* number of blocks allocated */
++		.ust_atime   = src->st_atime,   /* time of last access */
++		.ust_mtime   = src->st_mtime,   /* time of last modification */
++		.ust_ctime   = src->st_ctime,   /* time of last change */
++	});
++}
++
++int os_stat_fd(const int fd, struct uml_stat *ubuf)
++{
++	struct stat64 sbuf;
++	int err;
++
++	do {
++		err = fstat64(fd, &sbuf);
++	} while((err < 0) && (errno == EINTR)) ;
++
++	if(err < 0) 
++		return(-errno);
++
++	if(ubuf != NULL)
++		copy_stat(ubuf, &sbuf);
++	return(err);
++}
++
++int os_stat_file(const char *file_name, struct uml_stat *ubuf)
++{
++	struct stat64 sbuf;
++	int err;
++
++	do {
++		err = stat64(file_name, &sbuf);
++	} while((err < 0) && (errno == EINTR)) ;
++
++	if(err < 0) 
++		return(-errno);
++
++	if(ubuf != NULL)
++		copy_stat(ubuf, &sbuf);
++	return(err);
++}
++
++int os_access(const char* file, int mode)
++{
++	int amode, err;
++
++	amode=(mode&OS_ACC_R_OK ? R_OK : 0) | (mode&OS_ACC_W_OK ? W_OK : 0) |
++	      (mode&OS_ACC_X_OK ? X_OK : 0) | (mode&OS_ACC_F_OK ? F_OK : 0) ;
++
++	err = access(file, amode);
++	if(err < 0)
++		return(-errno);
++
++	return(0);
++}
++
++void os_print_error(int error, const char* str)
++{
++	errno = error < 0 ? -error : error;
++
++	perror(str);
++}
++
++/* FIXME? required only by hostaudio (because it passes ioctls verbatim) */
++int os_ioctl_generic(int fd, unsigned int cmd, unsigned long arg)
++{
++	int err;
++
++	err = ioctl(fd, cmd, arg);
++	if(err < 0)
++		return(-errno);
++
++	return(err);
++}
++
++int os_window_size(int fd, int *rows, int *cols)
++{
++	struct winsize size;
++
++	if(ioctl(fd, TIOCGWINSZ, &size) < 0)
++		return(-errno);
++
++	*rows = size.ws_row;
++	*cols = size.ws_col;
++
++	return(0);
++}
++
++int os_new_tty_pgrp(int fd, int pid)
+ {
+-	struct stat64 buf;
++	if(ioctl(fd, TIOCSCTTY, 0) < 0){
++		printk("TIOCSCTTY failed, errno = %d\n", errno);
++		return(-errno);
++	}
++
++	if(tcsetpgrp(fd, pid) < 0){
++		printk("tcsetpgrp failed, errno = %d\n", errno);
++		return(-errno);
++	}
++
++	return(0);
++}
++
++/* FIXME: ensure namebuf in os_get_if_name is big enough */
++int os_get_ifname(int fd, char* namebuf)
++{
++	if(ioctl(fd, SIOCGIFNAME, namebuf) < 0)
++		return(-errno);
++
++	return(0);
++}
++
++int os_set_slip(int fd)
++{
++	int disc, sencap;
++
++	disc = N_SLIP;
++	if(ioctl(fd, TIOCSETD, &disc) < 0){
++		printk("Failed to set slip line discipline - "
++		       "errno = %d\n", errno);
++		return(-errno);
++	}
++
++	sencap = 0;
++	if(ioctl(fd, SIOCSIFENCAP, &sencap) < 0){
++		printk("Failed to set slip encapsulation - "
++		       "errno = %d\n", errno);
++		return(-errno);
++	}
++
++	return(0);
++}
++
++int os_set_owner(int fd, int pid)
++{
++	if(fcntl(fd, F_SETOWN, pid) < 0){
++		int save_errno = errno;
++
++		if(fcntl(fd, F_GETOWN, 0) != pid)
++			return(-save_errno);
++	}
++
++	return(0);
++}
++
++/* FIXME? moved wholesale from sigio_user.c to get fcntls out of that file */ 
++int os_sigio_async(int master, int slave)
++{
++	int flags;
+ 
+-	if(stat64(file, &buf) == -1)
++	flags = fcntl(master, F_GETFL);
++	if(flags < 0) {
++		printk("fcntl F_GETFL failed, errno = %d\n", errno);
+ 		return(-errno);
++	}
++
++	if((fcntl(master, F_SETFL, flags | O_NONBLOCK | O_ASYNC) < 0) ||
++	   (fcntl(master, F_SETOWN, os_getpid()) < 0)){
++		printk("fcntl F_SETFL or F_SETOWN failed, errno = %d\n", errno);
++		return(-errno);
++	}
++
++	if((fcntl(slave, F_SETFL, flags | O_NONBLOCK) < 0)){
++		printk("fcntl F_SETFL failed, errno = %d\n", errno);
++		return(-errno);
++	}
+ 
+-	if(S_ISDIR(buf.st_mode)) return(OS_TYPE_DIR);
+-	else if(S_ISLNK(buf.st_mode)) return(OS_TYPE_SYMLINK);
+-	else if(S_ISCHR(buf.st_mode)) return(OS_TYPE_CHARDEV);
+-	else if(S_ISBLK(buf.st_mode)) return(OS_TYPE_BLOCKDEV);
+-	else if(S_ISFIFO(buf.st_mode)) return(OS_TYPE_FIFO);
+-	else if(S_ISSOCK(buf.st_mode)) return(OS_TYPE_SOCK);
++	return(0);
++}
++
++int os_mode_fd(int fd, int mode)
++{
++	int err;
++
++	do {
++		err = fchmod(fd, mode);
++	} while((err < 0) && (errno==EINTR)) ;
++
++	if(err < 0)
++		return(-errno);
++
++	return(0);
++}
++
++int os_file_type(char *file)
++{
++	struct uml_stat buf;
++	int err;
++
++	err = os_stat_file(file, &buf);
++	if(err < 0)
++		return(err);
++
++	if(S_ISDIR(buf.ust_mode)) return(OS_TYPE_DIR);
++	else if(S_ISLNK(buf.ust_mode)) return(OS_TYPE_SYMLINK);
++	else if(S_ISCHR(buf.ust_mode)) return(OS_TYPE_CHARDEV);
++	else if(S_ISBLK(buf.ust_mode)) return(OS_TYPE_BLOCKDEV);
++	else if(S_ISFIFO(buf.ust_mode)) return(OS_TYPE_FIFO);
++	else if(S_ISSOCK(buf.ust_mode)) return(OS_TYPE_SOCK);
+ 	else return(OS_TYPE_FILE);
+ }
+ 
+ int os_file_mode(char *file, struct openflags *mode_out)
+ {
++	int err;
++
+ 	*mode_out = OPENFLAGS();
+ 
+-	if(!access(file, W_OK)) *mode_out = of_write(*mode_out);
+-	else if(errno != EACCES) 
+-		return(-errno);
++	err = os_access(file, OS_ACC_W_OK);
++	if((err < 0) && (err != -EACCES))
++		return(err);
+ 
+-	if(!access(file, R_OK)) *mode_out = of_read(*mode_out);
+-	else if(errno != EACCES) 
+-		return(-errno);
++	*mode_out = of_write(*mode_out);
++
++	err = os_access(file, OS_ACC_R_OK);
++	if((err < 0) && (err != -EACCES))
++		return(err);
++
++	*mode_out = of_read(*mode_out);
+ 
+ 	return(0);
+ }
+@@ -63,16 +267,14 @@
+ 	if(flags.e) f |= O_EXCL;
+ 
+ 	fd = open64(file, f, mode);
+-	if(fd < 0) return(-errno);
+-	
+-	if(flags.cl){
+-		if(fcntl(fd, F_SETFD, 1)){
+-			close(fd);
+-			return(-errno);
+-		}
++	if(fd < 0)
++		return(-errno);
++
++	if(flags.cl && fcntl(fd, F_SETFD, 1)){
++		os_close_file(fd);
++		return(-errno);
+ 	}
+ 
+- 	return(fd);
+ 	return(fd);
+ }
+ 
+@@ -90,7 +292,7 @@
+ 
+ 	err = connect(fd, (struct sockaddr *) &sock, sizeof(sock));
+ 	if(err)
+-		return(err);
++		return(-errno);
+ 
+ 	return(fd);
+ }
+@@ -109,88 +311,162 @@
+ 	return(0);
+ }
+ 
+-int os_read_file(int fd, void *buf, int len)
++static int fault_buffer(void *start, int len, 
++			int (*copy_proc)(void *addr, void *buf, int len))
+ {
+-	int n;
++	int page = getpagesize(), i;
++	char c;
+ 
+-	/* Force buf into memory if it's not already. */
++	for(i = 0; i < len; i += page){
++		if((*copy_proc)(start + i, &c, sizeof(c)))
++			return(-EFAULT);
++	}
++	if((len % page) != 0){
++		if((*copy_proc)(start + len - 1, &c, sizeof(c)))
++			return(-EFAULT);
++	}
++	return(0);
++}
+ 
+-	/* XXX This fails if buf is kernel memory */
+-#ifdef notdef
+-	if(copy_to_user_proc(buf, &c, sizeof(c)))
+-		return(-EFAULT);
+-#endif
++static int file_io(int fd, void *buf, int len,
++		   int (*io_proc)(int fd, void *buf, int len),
++		   int (*copy_user_proc)(void *addr, void *buf, int len))
++{
++	int n, err;
++
++	do {
++		n = (*io_proc)(fd, buf, len);
++		if((n < 0) && (errno == EFAULT)){
++			err = fault_buffer(buf, len, copy_user_proc);
++			if(err)
++				return(err);
++			n = (*io_proc)(fd, buf, len);
++		}
++	} while((n < 0) && (errno == EINTR));
+ 
+-	n = read(fd, buf, len);
+ 	if(n < 0)
+ 		return(-errno);
+ 	return(n);
+ }
+ 
+-int os_write_file(int fd, void *buf, int count)
++int os_read_file(int fd, void *buf, int len)
+ {
+-	int n;
+-
+-	/* Force buf into memory if it's not already. */
+-	
+-	/* XXX This fails if buf is kernel memory */
+-#ifdef notdef
+-	if(copy_to_user_proc(buf, buf, buf[0]))
+-		return(-EFAULT);
+-#endif
++	return(file_io(fd, buf, len, (int (*)(int, void *, int)) read, 
++		       copy_from_user_proc));
++}
+ 
+-	n = write(fd, buf, count);
+-	if(n < 0)
+-		return(-errno);
+-	return(n);
++int os_write_file(int fd, const void *buf, int len)
++{
++	return(file_io(fd, (void *) buf, len, 
++		       (int (*)(int, void *, int)) write, copy_to_user_proc));
+ }
+ 
+ int os_file_size(char *file, long long *size_out)
+ {
+-	struct stat64 buf;
++	struct uml_stat buf;
++	int err;
+ 
+-	if(stat64(file, &buf) == -1){
+-		printk("Couldn't stat \"%s\" : errno = %d\n", file, errno);
+-		return(-errno);
++	err = os_stat_file(file, &buf);
++	if(err < 0){
++		printk("Couldn't stat \"%s\" : err = %d\n", file, -err);
++		return(err);
+ 	}
+-	if(S_ISBLK(buf.st_mode)){
++
++	if(S_ISBLK(buf.ust_mode)){
+ 		int fd, blocks;
+ 
+-		if((fd = open64(file, O_RDONLY)) < 0){
+-			printk("Couldn't open \"%s\", errno = %d\n", file,
+-			       errno);
+-			return(-errno);
++		fd = os_open_file(file, of_read(OPENFLAGS()), 0);
++		if(fd < 0){
++			printk("Couldn't open \"%s\", errno = %d\n", file, -fd);
++			return(fd);
+ 		}
+ 		if(ioctl(fd, BLKGETSIZE, &blocks) < 0){
+ 			printk("Couldn't get the block size of \"%s\", "
+ 			       "errno = %d\n", file, errno);
+-			close(fd);
+-			return(-errno);
++			err = -errno;
++			os_close_file(fd);
++			return(err);
+ 		}
+ 		*size_out = ((long long) blocks) * 512;
+-		close(fd);
++		os_close_file(fd);
+ 		return(0);
+ 	}
+-	*size_out = buf.st_size;
++	*size_out = buf.ust_size;
++	return(0);
++}
++
++int os_file_modtime(char *file, unsigned long *modtime)
++{
++	struct uml_stat buf;
++	int err;
++
++	err = os_stat_file(file, &buf);
++	if(err < 0){
++		printk("Couldn't stat \"%s\" : err = %d\n", file, -err);
++		return(err);
++	}
++
++	*modtime = buf.ust_mtime;
+ 	return(0);
+ }
+ 
++int os_get_exec_close(int fd, int* close_on_exec)
++{
++	int ret;
++
++	do {
++		ret = fcntl(fd, F_GETFD);
++	} while((ret < 0) && (errno == EINTR)) ;
++
++	if(ret < 0)
++		return(-errno);
++
++	*close_on_exec = (ret&FD_CLOEXEC) ? 1 : 0;
++	return(ret);
++}
++
++int os_set_exec_close(int fd, int close_on_exec)
++{
++	int flag, err;
++
++	if(close_on_exec) flag = FD_CLOEXEC;
++	else flag = 0;
++
++	do {
++		err = fcntl(fd, F_SETFD, flag);
++	} while((err < 0) && (errno == EINTR)) ;
++
++	if(err < 0)
++		return(-errno);
++	return(err);
++}
++
+ int os_pipe(int *fds, int stream, int close_on_exec)
+ {
+ 	int err, type = stream ? SOCK_STREAM : SOCK_DGRAM;
+ 
+ 	err = socketpair(AF_UNIX, type, 0, fds);
+-	if(err) 
++	if(err < 0) 
+ 		return(-errno);
+ 
+ 	if(!close_on_exec)
+ 		return(0);
+ 
+-	if((fcntl(fds[0], F_SETFD, 1) < 0) || (fcntl(fds[1], F_SETFD, 1) < 0))
+-		printk("os_pipe : Setting FD_CLOEXEC failed, errno = %d", 
+-		       errno);
++	err = os_set_exec_close(fds[0], 1);
++	if(err < 0)
++		goto error;
++
++	err = os_set_exec_close(fds[1], 1);
++	if(err < 0)
++		goto error;
+ 
+ 	return(0);
++
++ error:
++	printk("os_pipe : Setting FD_CLOEXEC failed, err = %d\n", -err);
++	os_close_file(fds[1]);
++	os_close_file(fds[0]);
++	return(err);
+ }
+ 
+ int os_set_fd_async(int fd, int owner)
+@@ -270,7 +546,7 @@
+ 		return(-EINVAL);
+ 	}
+ 	err = shutdown(fd, what);
+-	if(err)
++	if(err < 0)
+ 		return(-errno);
+ 	return(0);
+ }
+@@ -315,7 +591,7 @@
+ 	return(new);
+ }
+ 
+-int create_unix_socket(char *file, int len)
++int os_create_unix_socket(char *file, int len, int close_on_exec)
+ {
+ 	struct sockaddr_un addr;
+ 	int sock, err;
+@@ -327,6 +603,13 @@
+ 		return(-errno);
+ 	}
+ 
++	if(close_on_exec) {
++		err = os_set_exec_close(sock, 1);
++		if(err < 0)
++			printk("create_unix_socket : close_on_exec failed, "
++		       "err = %d", -err);
++	}
++
+ 	addr.sun_family = AF_UNIX;
+ 
+ 	/* XXX Be more careful about overflow */
+@@ -334,14 +617,45 @@
+ 
+ 	err = bind(sock, (struct sockaddr *) &addr, sizeof(addr));
+ 	if (err < 0){
+-		printk("create_listening_socket - bind failed, errno = %d\n",
+-		       errno);
++		printk("create_listening_socket at '%s' - bind failed, "
++		       "errno = %d\n", file, errno);
+ 		return(-errno);
+ 	}
+ 
+ 	return(sock);
+ }
+ 
++void os_flush_stdout(void)
++{
++	fflush(stdout);
++}
++
++int os_lock_file(int fd, int excl)
++{
++	int type = excl ? F_WRLCK : F_RDLCK;
++	struct flock lock = ((struct flock) { .l_type	= type,
++					      .l_whence	= SEEK_SET,
++					      .l_start	= 0,
++					      .l_len	= 0 } );
++	int err, save;
++
++	err = fcntl(fd, F_SETLK, &lock);
++	if(!err)
++		goto out;
++
++	save = -errno;
++	err = fcntl(fd, F_GETLK, &lock);
++	if(err){
++		err = -errno;
++		goto out;
++	}
++
++	printk("F_SETLK failed, file already locked by pid %d\n", lock.l_pid);
++	err = save;
++ out:
++	return(err);
++}
++
+ /*
+  * Overrides for Emacs so that we follow Linus's tabbing style.
+  * Emacs will notice this stuff at the end of the file and automatically
+diff -Naur a/arch/um/os-Linux/Makefile b/arch/um/os-Linux/Makefile
+--- a/arch/um/os-Linux/Makefile	2004-02-11 12:15:56.000000000 -0500
++++ b/arch/um/os-Linux/Makefile	2004-02-11 12:27:48.000000000 -0500
+@@ -9,7 +9,3 @@
+ 
+ $(USER_OBJS) : %.o: %.c
+ 	$(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
+-
+-clean :
+-
+-archmrproper:
+diff -Naur a/arch/um/os-Linux/process.c b/arch/um/os-Linux/process.c
+--- a/arch/um/os-Linux/process.c	2004-02-11 12:14:23.000000000 -0500
++++ b/arch/um/os-Linux/process.c	2004-02-11 12:26:04.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* 
+- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2002 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+@@ -7,32 +7,37 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <signal.h>
++#include <linux/unistd.h>
+ #include <sys/mman.h>
+ #include <sys/wait.h>
+ #include "os.h"
+ #include "user.h"
+ 
++#define ARBITRARY_ADDR -1
++#define FAILURE_PID    -1
++
+ unsigned long os_process_pc(int pid)
+ {
+ 	char proc_stat[sizeof("/proc/#####/stat\0")], buf[256];
+ 	unsigned long pc;
+-	int fd;
++	int fd, err;
+ 
+ 	sprintf(proc_stat, "/proc/%d/stat", pid);
+ 	fd = os_open_file(proc_stat, of_read(OPENFLAGS()), 0);
+ 	if(fd < 0){
+-		printk("os_process_pc - couldn't open '%s', errno = %d\n", 
+-		       proc_stat, errno);
+-		return(-1);
++		printk("os_process_pc - couldn't open '%s', err = %d\n", 
++		       proc_stat, -fd);
++		return(ARBITRARY_ADDR);
+ 	}
+-	if(read(fd, buf, sizeof(buf)) < 0){
+-		printk("os_process_pc - couldn't read '%s', errno = %d\n", 
+-		       proc_stat, errno);
+-		close(fd);
+-		return(-1);
++	err = os_read_file(fd, buf, sizeof(buf));
++	if(err < 0){
++		printk("os_process_pc - couldn't read '%s', err = %d\n", 
++		       proc_stat, -err);
++		os_close_file(fd);
++		return(ARBITRARY_ADDR);
+ 	}
+-	close(fd);
+-	pc = -1;
++	os_close_file(fd);
++	pc = ARBITRARY_ADDR;
+ 	if(sscanf(buf, "%*d %*s %*c %*d %*d %*d %*d %*d %*d %*d %*d "
+ 		  "%*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d "
+ 		  "%*d %*d %*d %*d %ld", &pc) != 1){
+@@ -52,22 +57,23 @@
+ 	snprintf(stat, sizeof(stat), "/proc/%d/stat", pid);
+ 	fd = os_open_file(stat, of_read(OPENFLAGS()), 0);
+ 	if(fd < 0){
+-		printk("Couldn't open '%s', errno = %d\n", stat, -fd);
+-		return(-1);
++		printk("Couldn't open '%s', err = %d\n", stat, -fd);
++		return(FAILURE_PID);
+ 	}
+ 
+-	n = read(fd, data, sizeof(data));
+-	close(fd);
++	n = os_read_file(fd, data, sizeof(data));
++	os_close_file(fd);
+ 
+ 	if(n < 0){
+-		printk("Couldn't read '%s', errno = %d\n", stat);
+-		return(-1);
++		printk("Couldn't read '%s', err = %d\n", stat, -n);
++		return(FAILURE_PID);
+ 	}
+ 
+-	parent = -1;
++	parent = FAILURE_PID;
+ 	/* XXX This will break if there is a space in the command */
+ 	n = sscanf(data, "%*d %*s %*c %d", &parent);
+-	if(n != 1) printk("Failed to scan '%s'\n", data);
++	if(n != 1) 
++		printk("Failed to scan '%s'\n", data);
+ 
+ 	return(parent);
+ }
+@@ -87,7 +93,8 @@
+ 
+ void os_usr1_process(int pid)
+ {
+-	kill(pid, SIGUSR1);
++	syscall(__NR_tkill, pid, SIGUSR1); 
++	/* kill(pid, SIGUSR1); */
+ }
+ 
+ int os_getpid(void)
+@@ -95,7 +102,7 @@
+ 	return(getpid());
+ }
+ 
+-int os_map_memory(void *virt, int fd, unsigned long off, unsigned long len, 
++int os_map_memory(void *virt, int fd, unsigned long long off, unsigned long len,
+ 		  int r, int w, int x)
+ {
+ 	void *loc;
+@@ -104,8 +111,8 @@
+ 	prot = (r ? PROT_READ : 0) | (w ? PROT_WRITE : 0) | 
+ 		(x ? PROT_EXEC : 0);
+ 
+-	loc = mmap((void *) virt, len, prot, MAP_SHARED | MAP_FIXED, 
+-		   fd, off);
++	loc = mmap64((void *) virt, len, prot, MAP_SHARED | MAP_FIXED, 
++		     fd, off);
+ 	if(loc == MAP_FAILED)
+ 		return(-errno);
+ 	return(0);
+@@ -126,7 +133,8 @@
+         int err;
+ 
+         err = munmap(addr, len);
+-        if(err < 0) return(-errno);
++	if(err < 0)
++		return(-errno);
+         return(0);
+ }
+ 
+diff -Naur a/arch/um/os-Linux/tty.c b/arch/um/os-Linux/tty.c
+--- a/arch/um/os-Linux/tty.c	2004-02-11 12:15:53.000000000 -0500
++++ b/arch/um/os-Linux/tty.c	2004-02-11 12:27:46.000000000 -0500
+@@ -28,10 +28,10 @@
+ 	struct grantpt_info info;
+ 	int fd;
+ 
+-	if((fd = os_open_file("/dev/ptmx", of_rdwr(OPENFLAGS()), 0)) < 0){
+-		printk("get_pty : Couldn't open /dev/ptmx - errno = %d\n",
+-		       errno);
+-		return(-1);
++	fd = os_open_file("/dev/ptmx", of_rdwr(OPENFLAGS()), 0);
++	if(fd < 0){
++		printk("get_pty : Couldn't open /dev/ptmx - err = %d\n", -fd);
++		return(fd);
+ 	}
+ 
+ 	info.fd = fd;
+@@ -39,7 +39,7 @@
+ 
+ 	if(info.res < 0){
+ 		printk("get_pty : Couldn't grant pty - errno = %d\n", 
+-		       info.err);
++		       -info.err);
+ 		return(-1);
+ 	}
+ 	if(unlockpt(fd) < 0){
+diff -Naur a/arch/um/sys-i386/bugs.c b/arch/um/sys-i386/bugs.c
+--- a/arch/um/sys-i386/bugs.c	2004-02-11 12:16:28.000000000 -0500
++++ b/arch/um/sys-i386/bugs.c	2004-02-11 12:28:27.000000000 -0500
+@@ -4,20 +4,21 @@
+  */
+ 
+ #include <unistd.h>
+-#include <fcntl.h>
+ #include <errno.h>
+ #include <string.h>
+ #include <sys/signal.h>
++#include <asm/ldt.h>
+ #include "kern_util.h"
+ #include "user.h"
+ #include "sysdep/ptrace.h"
+ #include "task.h"
++#include "os.h"
+ 
+ #define MAXTOKEN 64
+ 
+ /* Set during early boot */
+-int cpu_has_cmov = 1;
+-int cpu_has_xmm = 0;
++int host_has_cmov = 1;
++int host_has_xmm = 0;
+ 
+ static char token(int fd, char *buf, int len, char stop)
+ {
+@@ -27,13 +28,15 @@
+ 	ptr = buf;
+ 	end = &buf[len];
+ 	do {
+-		n = read(fd, ptr, sizeof(*ptr));
++		n = os_read_file(fd, ptr, sizeof(*ptr));
+ 		c = *ptr++;
+-		if(n == 0) return(0);
+-		else if(n != sizeof(*ptr)){
+-			printk("Reading /proc/cpuinfo failed, "
+-			       "errno = %d\n", errno);
+-			return(-errno);
++		if(n != sizeof(*ptr)){
++			if(n == 0) return(0);
++			printk("Reading /proc/cpuinfo failed, err = %d\n", -n);
++			if(n < 0) 
++				return(n);
++			else 
++				return(-EIO);
+ 		}
+ 	} while((c != '\n') && (c != stop) && (ptr < end));
+ 
+@@ -45,45 +48,79 @@
+ 	return(c);
+ }
+ 
+-static int check_cpu_feature(char *feature, int *have_it)
++static int find_cpuinfo_line(int fd, char *key, char *scratch, int len)
+ {
+-	char buf[MAXTOKEN], c;
+-	int fd, len = sizeof(buf)/sizeof(buf[0]), n;
+-
+-	printk("Checking for host processor %s support...", feature);
+-	fd = open("/proc/cpuinfo", O_RDONLY);
+-	if(fd < 0){
+-		printk("Couldn't open /proc/cpuinfo, errno = %d\n", errno);
+-		return(0);
+-	}
++	int n;
++	char c;
+ 
+-	*have_it = 0;
+-	buf[len - 1] = '\0';
++	scratch[len - 1] = '\0';
+ 	while(1){
+-		c = token(fd, buf, len - 1, ':');
+-		if(c <= 0) goto out;
++		c = token(fd, scratch, len - 1, ':');
++		if(c <= 0)
++			return(0);
+ 		else if(c != ':'){
+ 			printk("Failed to find ':' in /proc/cpuinfo\n");
+-			goto out;
++			return(0);
+ 		}
+ 
+-		if(!strncmp(buf, "flags", strlen("flags"))) break;
++		if(!strncmp(scratch, key, strlen(key))) 
++			return(1);
+ 
+ 		do {
+-			n = read(fd, &c, sizeof(c));
++			n = os_read_file(fd, &c, sizeof(c));
+ 			if(n != sizeof(c)){
+ 				printk("Failed to find newline in "
+-				       "/proc/cpuinfo, n = %d, errno = %d\n",
+-				       n, errno);
+-				goto out;
++				       "/proc/cpuinfo, err = %d\n", -n);
++				return(0);
+ 			}
+ 		} while(c != '\n');
+ 	}
++	return(0);
++}
++
++int cpu_feature(char *what, char *buf, int len)
++{
++	int fd, ret = 0;
++
++	fd = os_open_file("/proc/cpuinfo", of_read(OPENFLAGS()), 0);
++	if(fd < 0){
++		printk("Couldn't open /proc/cpuinfo, err = %d\n", -fd);
++		return(0);
++	}
++
++	if(!find_cpuinfo_line(fd, what, buf, len)){
++		printk("Couldn't find '%s' line in /proc/cpuinfo\n", what);
++		goto out_close;
++	}
++
++	token(fd, buf, len, '\n');
++	ret = 1;
++
++ out_close:
++	os_close_file(fd);
++	return(ret);
++}
++
++static int check_cpu_flag(char *feature, int *have_it)
++{
++	char buf[MAXTOKEN], c;
++	int fd, len = sizeof(buf)/sizeof(buf[0]);
++
++	printk("Checking for host processor %s support...", feature);
++	fd = os_open_file("/proc/cpuinfo", of_read(OPENFLAGS()), 0);
++	if(fd < 0){
++		printk("Couldn't open /proc/cpuinfo, err = %d\n", -fd);
++		return(0);
++	}
++
++	*have_it = 0;
++	if(!find_cpuinfo_line(fd, "flags", buf, sizeof(buf) / sizeof(buf[0])))
++		goto out;
+ 
+ 	c = token(fd, buf, len - 1, ' ');
+ 	if(c < 0) goto out;
+ 	else if(c != ' '){
+-		printk("Failed to find ':' in /proc/cpuinfo\n");
++		printk("Failed to find ' ' in /proc/cpuinfo\n");
+ 		goto out;
+ 	}
+ 
+@@ -100,21 +137,48 @@
+  out:
+ 	if(*have_it == 0) printk("No\n");
+ 	else if(*have_it == 1) printk("Yes\n");
+-	close(fd);
++	os_close_file(fd);
+ 	return(1);
+ }
+ 
++#if 0 /* This doesn't work in tt mode, plus it's causing compilation problems
++       * for some people.
++       */
++static void disable_lcall(void)
++{
++	struct modify_ldt_ldt_s ldt;
++	int err;
++
++	bzero(&ldt, sizeof(ldt));
++	ldt.entry_number = 7;
++	ldt.base_addr = 0;
++	ldt.limit = 0;
++	err = modify_ldt(1, &ldt, sizeof(ldt));
++	if(err)
++		printk("Failed to disable lcall7 - errno = %d\n", errno);
++}
++#endif
++
++void arch_init_thread(void)
++{
++#if 0
++	disable_lcall();
++#endif
++}
++
+ void arch_check_bugs(void)
+ {
+ 	int have_it;
+ 
+-	if(access("/proc/cpuinfo", R_OK)){
++	if(os_access("/proc/cpuinfo", OS_ACC_R_OK) < 0){
+ 		printk("/proc/cpuinfo not available - skipping CPU capability "
+ 		       "checks\n");
+ 		return;
+ 	}
+-	if(check_cpu_feature("cmov", &have_it)) cpu_has_cmov = have_it;
+-	if(check_cpu_feature("xmm", &have_it)) cpu_has_xmm = have_it;
++	if(check_cpu_flag("cmov", &have_it)) 
++		host_has_cmov = have_it;
++	if(check_cpu_flag("xmm", &have_it)) 
++		host_has_xmm = have_it;
+ }
+ 
+ int arch_handle_signal(int sig, union uml_pt_regs *regs)
+@@ -130,18 +194,18 @@
+ 	if((*((char *) ip) != 0x0f) || ((*((char *) (ip + 1)) & 0xf0) != 0x40))
+ 		return(0);
+ 
+-	if(cpu_has_cmov == 0)
++	if(host_has_cmov == 0)
+ 		panic("SIGILL caused by cmov, which this processor doesn't "
+ 		      "implement, boot a filesystem compiled for older "
+ 		      "processors");
+-	else if(cpu_has_cmov == 1)
++	else if(host_has_cmov == 1)
+ 		panic("SIGILL caused by cmov, which this processor claims to "
+ 		      "implement");
+-	else if(cpu_has_cmov == -1)
++	else if(host_has_cmov == -1)
+ 		panic("SIGILL caused by cmov, couldn't tell if this processor "
+ 		      "implements it, boot a filesystem compiled for older "
+ 		      "processors");
+-	else panic("Bad value for cpu_has_cmov (%d)", cpu_has_cmov);
++	else panic("Bad value for host_has_cmov (%d)", host_has_cmov);
+ 	return(0);
+ }
+ 
+diff -Naur a/arch/um/sys-i386/extable.c b/arch/um/sys-i386/extable.c
+--- a/arch/um/sys-i386/extable.c	2004-02-11 12:16:45.000000000 -0500
++++ b/arch/um/sys-i386/extable.c	1969-12-31 19:00:00.000000000 -0500
+@@ -1,30 +0,0 @@
+-/*
+- * linux/arch/i386/mm/extable.c
+- */
+-
+-#include <linux/config.h>
+-#include <linux/module.h>
+-#include <linux/spinlock.h>
+-#include <asm/uaccess.h>
+-
+-/* Simple binary search */
+-const struct exception_table_entry *
+-search_extable(const struct exception_table_entry *first,
+-	       const struct exception_table_entry *last,
+-	       unsigned long value)
+-{
+-        while (first <= last) {
+-		const struct exception_table_entry *mid;
+-		long diff;
+-
+-		mid = (last - first) / 2 + first;
+-		diff = mid->insn - value;
+-                if (diff == 0)
+-                        return mid;
+-                else if (diff < 0)
+-                        first = mid+1;
+-                else
+-                        last = mid-1;
+-        }
+-        return NULL;
+-}
+diff -Naur a/arch/um/sys-i386/fault.c b/arch/um/sys-i386/fault.c
+--- a/arch/um/sys-i386/fault.c	2004-02-11 12:15:44.000000000 -0500
++++ b/arch/um/sys-i386/fault.c	2004-02-11 12:27:19.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* 
+- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2002 - 2004 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+@@ -7,16 +7,24 @@
+ #include "sysdep/ptrace.h"
+ #include "sysdep/sigcontext.h"
+ 
+-extern unsigned long search_exception_table(unsigned long addr);
++/* These two are from asm-um/uaccess.h and linux/module.h, check them. */
++struct exception_table_entry
++{
++	unsigned long insn;
++	unsigned long fixup;
++};
+ 
++const struct exception_table_entry *search_exception_tables(unsigned long add);
++ 
++/* Compare this to arch/i386/mm/extable.c:fixup_exception() */
+ int arch_fixup(unsigned long address, void *sc_ptr)
+ {
+ 	struct sigcontext *sc = sc_ptr;
+-	unsigned long fixup;
++	const struct exception_table_entry *fixup;
+ 
+ 	fixup = search_exception_tables(address);
+ 	if(fixup != 0){
+-		sc->eip = fixup;
++		sc->eip = fixup->fixup;
+ 		return(1);
+ 	}
+ 	return(0);
+diff -Naur a/arch/um/sys-i386/Makefile b/arch/um/sys-i386/Makefile
+--- a/arch/um/sys-i386/Makefile	2004-02-11 12:14:27.000000000 -0500
++++ b/arch/um/sys-i386/Makefile	2004-02-11 12:26:08.000000000 -0500
+@@ -1,7 +1,8 @@
+-obj-y = bugs.o checksum.o extable.o fault.o ksyms.o ldt.o module.o \
+-	ptrace.o ptrace_user.o semaphore.o sigcontext.o syscalls.o sysrq.o
++obj-y = bugs.o checksum.o fault.o ksyms.o ldt.o ptrace.o ptrace_user.o \
++	semaphore.o sigcontext.o syscalls.o sysrq.o time.o
+ 
+ obj-$(CONFIG_HIGHMEM) += highmem.o
++obj-$(CONFIG_MODULES) += module.o
+ 
+ USER_OBJS := bugs.o ptrace_user.o sigcontext.o fault.o
+ USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
+@@ -9,6 +10,8 @@
+ SYMLINKS = semaphore.c highmem.c module.c
+ SYMLINKS := $(foreach f,$(SYMLINKS),$(src)/$f)
+ 
++clean-files := $(SYMLINKS)
++
+ semaphore.c-dir = kernel
+ highmem.c-dir = mm
+ module.c-dir = kernel
+@@ -24,19 +27,4 @@
+ $(SYMLINKS): 
+ 	$(call make_link,$@)
+ 
+-clean:
+-	$(MAKE) -C util clean
+-
+-fastdep:
+-
+-dep:
+-
+-archmrproper:
+-	rm -f $(SYMLINKS)
+-
+-archclean:
+-
+-archdep:
+-
+-modules:
+-
++subdir- := util
+diff -Naur a/arch/um/sys-i386/ptrace_user.c b/arch/um/sys-i386/ptrace_user.c
+--- a/arch/um/sys-i386/ptrace_user.c	2004-02-11 12:14:33.000000000 -0500
++++ b/arch/um/sys-i386/ptrace_user.c	2004-02-11 12:26:15.000000000 -0500
+@@ -39,10 +39,10 @@
+ 	nregs = sizeof(dummy->u_debugreg)/sizeof(dummy->u_debugreg[0]);
+ 	for(i = 0; i < nregs; i++){
+ 		if((i == 4) || (i == 5)) continue;
+-		if(ptrace(PTRACE_POKEUSR, pid, &dummy->u_debugreg[i],
++		if(ptrace(PTRACE_POKEUSER, pid, &dummy->u_debugreg[i],
+ 			  regs[i]) < 0)
+-			printk("write_debugregs - ptrace failed, "
+-			       "errno = %d\n", errno);
++			printk("write_debugregs - ptrace failed on "
++			       "register %d, errno = %d\n", errno);
+ 	}
+ }
+ 
+@@ -54,7 +54,7 @@
+ 	dummy = NULL;
+ 	nregs = sizeof(dummy->u_debugreg)/sizeof(dummy->u_debugreg[0]);
+ 	for(i = 0; i < nregs; i++){
+-		regs[i] = ptrace(PTRACE_PEEKUSR, pid, 
++		regs[i] = ptrace(PTRACE_PEEKUSER, pid, 
+ 				 &dummy->u_debugreg[i], 0);
+ 	}
+ }
+diff -Naur a/arch/um/sys-i386/time.c b/arch/um/sys-i386/time.c
+--- a/arch/um/sys-i386/time.c	1969-12-31 19:00:00.000000000 -0500
++++ b/arch/um/sys-i386/time.c	2004-02-11 12:26:16.000000000 -0500
+@@ -0,0 +1,24 @@
++/*
++ * sys-i386/time.c 
++ * Created 		25.9.2002	Sapan Bhatia
++ *
++ */
++
++unsigned long long time_stamp(void)
++{
++	unsigned long low, high;
++
++	asm("rdtsc" : "=a" (low), "=d" (high));
++	return((((unsigned long long) high) << 32) + low);
++}
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/arch/um/sys-i386/util/Makefile b/arch/um/sys-i386/util/Makefile
+--- a/arch/um/sys-i386/util/Makefile	2004-02-11 12:16:48.000000000 -0500
++++ b/arch/um/sys-i386/util/Makefile	2004-02-11 12:29:04.000000000 -0500
+@@ -1,15 +1,10 @@
++host-progs	:= mk_sc mk_thread
++always		:= $(host-progs)
+ 
+-host-progs	:= mk_sc
+-always		:= $(host-progs) mk_thread
+-targets		:= mk_thread_kern.o mk_thread_user.o
++mk_thread-objs	:= mk_thread_kern.o mk_thread_user.o
+ 
+-mk_sc-objs	:= mk_sc.o
+-
+-$(obj)/mk_thread : $(obj)/mk_thread_kern.o $(obj)/mk_thread_user.o
+-	$(CC) $(CFLAGS) -o $@ $^
+-
+-$(obj)/mk_thread_user.o : $(src)/mk_thread_user.c
+-	$(CC) $(USER_CFLAGS) -c -o $@ $<
++HOSTCFLAGS_mk_thread_kern.o	:= $(CFLAGS)
++HOSTCFLAGS_mk_thread_user.o	:= $(USER_CFLAGS)
+ 
+ clean :
+ 	$(RM) -f $(build-targets)
+diff -Naur a/arch/um/sys-i386/util/mk_sc.c b/arch/um/sys-i386/util/mk_sc.c
+--- a/arch/um/sys-i386/util/mk_sc.c	2004-02-11 12:16:38.000000000 -0500
++++ b/arch/um/sys-i386/util/mk_sc.c	2004-02-11 12:28:37.000000000 -0500
+@@ -38,6 +38,7 @@
+   SC_OFFSET("SC_ERR", err);
+   SC_OFFSET("SC_CR2", cr2);
+   SC_OFFSET("SC_FPSTATE", fpstate);
++  SC_OFFSET("SC_SIGMASK", oldmask);
+   SC_FP_OFFSET("SC_FP_CW", cw);
+   SC_FP_OFFSET("SC_FP_SW", sw);
+   SC_FP_OFFSET("SC_FP_TAG", tag);
+diff -Naur a/arch/um/sys-ia64/Makefile b/arch/um/sys-ia64/Makefile
+--- a/arch/um/sys-ia64/Makefile	2004-02-11 12:14:16.000000000 -0500
++++ b/arch/um/sys-ia64/Makefile	2004-02-11 12:25:43.000000000 -0500
+@@ -7,18 +7,5 @@
+ $(OBJ): $(OBJS)
+ 	rm -f $@
+ 	$(LD) $(LINKFLAGS) --start-group $^ --end-group -o $@
+-clean:
+-	rm -f $(OBJS)
+ 
+-fastdep:
+-
+-archmrproper:
+-
+-archclean:
+-	rm -f link.ld
+-	@$(MAKEBOOT) clean
+-
+-archdep:
+-	@$(MAKEBOOT) dep
+-
+-modules:
++clean-files := $(OBJS) link.ld
+diff -Naur a/arch/um/sys-ppc/Makefile b/arch/um/sys-ppc/Makefile
+--- a/arch/um/sys-ppc/Makefile	2004-02-11 12:15:23.000000000 -0500
++++ b/arch/um/sys-ppc/Makefile	2004-02-11 12:27:11.000000000 -0500
+@@ -66,13 +66,4 @@
+ 	$(CC) $(EXTRA_AFLAGS) $(AFLAGS) -D__ASSEMBLY__ -D__UM_PPC__ -c $< -o $*.o
+ 	rm -f asm
+ 
+-clean:
+-	rm -f $(OBJS)
+-	rm -f ppc_defs.h
+-	rm -f checksum.S semaphore.c mk_defs.c
+-
+-fastdep:
+-
+-dep:
+-
+-modules:
++clean-files := $(OBJS) ppc_defs.h checksum.S semaphore.c mk_defs.c
+diff -Naur a/arch/um/uml.lds.S b/arch/um/uml.lds.S
+--- a/arch/um/uml.lds.S	2004-02-11 12:15:21.000000000 -0500
++++ b/arch/um/uml.lds.S	2004-02-11 12:27:08.000000000 -0500
+@@ -9,7 +9,6 @@
+ {
+   . = START + SIZEOF_HEADERS;
+ 
+-  . = ALIGN(4096);
+   __binary_start = .;
+ #ifdef MODE_TT
+   .thread_private : {
+@@ -26,7 +25,11 @@
+   . = ALIGN(4096);		/* Init code and data */
+   _stext = .;
+   __init_begin = .;
+-  .text.init : { *(.text.init) }
++  .init.text : { 
++	_sinittext = .;
++	*(.init.text)
++	_einittext = .;
++  }
+   . = ALIGN(4096);
+   .text      :
+   {
+@@ -38,7 +41,7 @@
+ 
+   #include "asm/common.lds.S"
+ 
+-  .data.init : { *(.data.init) }
++  init.data : { *(init.data) }
+   .data    :
+   {
+     . = ALIGN(KERNEL_STACK_SIZE);		/* init_task */
+diff -Naur a/arch/um/util/Makefile b/arch/um/util/Makefile
+--- a/arch/um/util/Makefile	2004-02-11 12:17:07.000000000 -0500
++++ b/arch/um/util/Makefile	2004-02-11 12:29:10.000000000 -0500
+@@ -1,23 +1,8 @@
+-always		:= mk_task mk_constants
+-targets		:= mk_task_user.o mk_task_kern.o \
+-		   mk_constants_user.o mk_constants_kern.o
++host-progs		:= mk_task mk_constants
++always			:= $(host-progs)
+ 
+-$(obj)/mk_task: $(obj)/mk_task_user.o $(obj)/mk_task_kern.o
+-	$(CC) -o $@ $^
++mk_task-objs		:= mk_task_user.o mk_task_kern.o
++mk_constants-objs	:= mk_constants_user.o mk_constants_kern.o
+ 
+-$(obj)/mk_task_user.o: $(src)/mk_task_user.c
+-	$(CC) -o $@ -c $< 
+-
+-$(obj)/mk_constants : $(obj)/mk_constants_user.o $(obj)/mk_constants_kern.o
+-	$(CC) -o $@ $^
+-
+-$(obj)/mk_constants_user.o : $(src)/mk_constants_user.c
+-	$(CC) -c $< -o $@
+-
+-$(obj)/mk_constants_kern.o : $(src)/mk_constants_kern.c
+-	$(CC) $(CFLAGS) -c $< -o $@
+-
+-clean:
+-	$(RM) $(build-targets)
+-
+-archmrproper:
++HOSTCFLAGS_mk_task_kern.o	:= $(CFLAGS)
++HOSTCFLAGS_mk_constants_kern.o	:= $(CFLAGS)
+diff -Naur a/arch/um/util/mk_constants_kern.c b/arch/um/util/mk_constants_kern.c
+--- a/arch/um/util/mk_constants_kern.c	2004-02-11 12:14:19.000000000 -0500
++++ b/arch/um/util/mk_constants_kern.c	2004-02-11 12:26:02.000000000 -0500
+@@ -1,5 +1,6 @@
+ #include "linux/kernel.h"
+ #include "linux/stringify.h"
++#include "linux/time.h"
+ #include "asm/page.h"
+ 
+ extern void print_head(void);
+@@ -11,6 +12,7 @@
+ {
+   print_head();
+   print_constant_int("UM_KERN_PAGE_SIZE", PAGE_SIZE);
++
+   print_constant_str("UM_KERN_EMERG", KERN_EMERG);
+   print_constant_str("UM_KERN_ALERT", KERN_ALERT);
+   print_constant_str("UM_KERN_CRIT", KERN_CRIT);
+@@ -19,6 +21,8 @@
+   print_constant_str("UM_KERN_NOTICE", KERN_NOTICE);
+   print_constant_str("UM_KERN_INFO", KERN_INFO);
+   print_constant_str("UM_KERN_DEBUG", KERN_DEBUG);
++
++  print_constant_int("UM_NSEC_PER_SEC", NSEC_PER_SEC);
+   print_tail();
+   return(0);
+ }
+diff -Naur a/drivers/base/Makefile b/drivers/base/Makefile
+--- a/drivers/base/Makefile	2004-02-11 12:16:32.000000000 -0500
++++ b/drivers/base/Makefile	2004-02-11 12:28:31.000000000 -0500
+@@ -2,7 +2,8 @@
+ 
+ obj-y			:= core.o sys.o interface.o bus.o \
+ 			   driver.o class.o class_simple.o platform.o \
+-			   cpu.o firmware.o init.o map.o dmapool.o
++			   cpu.o firmware.o init.o map.o
+ obj-y			+= power/
+ obj-$(CONFIG_FW_LOADER)	+= firmware_class.o
+ obj-$(CONFIG_NUMA)	+= node.o
++obj-$(CONFIG_PCI)	+= dmapool.o
+diff -Naur a/fs/hostfs/hostfs.h b/fs/hostfs/hostfs.h
+--- a/fs/hostfs/hostfs.h	1969-12-31 19:00:00.000000000 -0500
++++ b/fs/hostfs/hostfs.h	2004-02-11 12:25:42.000000000 -0500
+@@ -0,0 +1,79 @@
++#ifndef __UM_FS_HOSTFS
++#define __UM_FS_HOSTFS
++
++#include "os.h"
++
++/* These are exactly the same definitions as in fs.h, but the names are 
++ * changed so that this file can be included in both kernel and user files.
++ */
++
++#define HOSTFS_ATTR_MODE	1
++#define HOSTFS_ATTR_UID 	2
++#define HOSTFS_ATTR_GID 	4
++#define HOSTFS_ATTR_SIZE	8
++#define HOSTFS_ATTR_ATIME	16
++#define HOSTFS_ATTR_MTIME	32
++#define HOSTFS_ATTR_CTIME	64
++#define HOSTFS_ATTR_ATIME_SET	128
++#define HOSTFS_ATTR_MTIME_SET	256
++#define HOSTFS_ATTR_FORCE	512	/* Not a change, but a change it */
++#define HOSTFS_ATTR_ATTR_FLAG	1024
++
++struct hostfs_iattr {
++	unsigned int	ia_valid;
++	mode_t		ia_mode;
++	uid_t		ia_uid;
++	gid_t		ia_gid;
++	loff_t		ia_size;
++	struct timespec	ia_atime;
++	struct timespec	ia_mtime;
++	struct timespec	ia_ctime;
++	unsigned int	ia_attr_flags;
++};
++
++extern int stat_file(const char *path, unsigned long long *inode_out, 
++		     int *mode_out, int *nlink_out, int *uid_out, int *gid_out,
++		     unsigned long long *size_out, struct timespec *atime_out, 
++		     struct timespec *mtime_out, struct timespec *ctime_out, 
++		     int *blksize_out, unsigned long long *blocks_out);
++extern int access_file(char *path, int r, int w, int x);
++extern int open_file(char *path, int r, int w, int append);
++extern int file_type(const char *path, int *rdev);
++extern void *open_dir(char *path, int *err_out);
++extern char *read_dir(void *stream, unsigned long long *pos, 
++		      unsigned long long *ino_out, int *len_out);
++extern void close_file(void *stream);
++extern void close_dir(void *stream);
++extern int read_file(int fd, unsigned long long *offset, char *buf, int len);
++extern int write_file(int fd, unsigned long long *offset, const char *buf,
++		      int len);
++extern int lseek_file(int fd, long long offset, int whence);
++extern int file_create(char *name, int ur, int uw, int ux, int gr, 
++		       int gw, int gx, int or, int ow, int ox);
++extern int set_attr(const char *file, struct hostfs_iattr *attrs);
++extern int make_symlink(const char *from, const char *to);
++extern int unlink_file(const char *file);
++extern int do_mkdir(const char *file, int mode);
++extern int do_rmdir(const char *file);
++extern int do_mknod(const char *file, int mode, int dev);
++extern int link_file(const char *from, const char *to);
++extern int do_readlink(char *file, char *buf, int size);
++extern int rename_file(char *from, char *to);
++extern int do_statfs(char *root, long *bsize_out, long long *blocks_out, 
++		     long long *bfree_out, long long *bavail_out, 
++		     long long *files_out, long long *ffree_out, 
++		     void *fsid_out, int fsid_size, long *namelen_out, 
++		     long *spare_out);
++
++#endif
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
+--- a/fs/hostfs/hostfs_kern.c	1969-12-31 19:00:00.000000000 -0500
++++ b/fs/hostfs/hostfs_kern.c	2004-02-11 12:25:59.000000000 -0500
+@@ -0,0 +1,1008 @@
++/* 
++ * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
++ * Licensed under the GPL
++ *
++ * Ported the filesystem routines to 2.5.
++ * 2003-02-10 Petr Baudis <pasky@ucw.cz>
++ */
++
++#include <linux/stddef.h>
++#include <linux/fs.h>
++#include <linux/version.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/slab.h>
++#include <linux/pagemap.h>
++#include <linux/blkdev.h>
++#include <linux/list.h>
++#include <linux/buffer_head.h>
++#include <linux/root_dev.h>
++#include <linux/statfs.h>
++#include <asm/uaccess.h>
++#include "hostfs.h"
++#include "kern_util.h"
++#include "kern.h"
++#include "user_util.h"
++#include "2_5compat.h"
++#include "init.h"
++
++struct hostfs_inode_info {
++	char *host_filename;
++	int fd;
++	int mode;
++	struct inode vfs_inode;
++};
++
++static inline struct hostfs_inode_info *HOSTFS_I(struct inode *inode)
++{
++	return(list_entry(inode, struct hostfs_inode_info, vfs_inode));
++}
++
++#define FILE_HOSTFS_I(file) HOSTFS_I((file)->f_dentry->d_inode)
++
++int hostfs_d_delete(struct dentry *dentry)
++{
++	return(1);
++}
++
++struct dentry_operations hostfs_dentry_ops = {
++	.d_delete		= hostfs_d_delete,
++};
++
++/* Changed in hostfs_args before the kernel starts running */
++static char *root_ino = "/";
++static int append = 0;
++
++#define HOSTFS_SUPER_MAGIC 0x00c0ffee
++
++static struct inode_operations hostfs_iops;
++static struct inode_operations hostfs_dir_iops;
++static struct address_space_operations hostfs_link_aops;
++
++static int __init hostfs_args(char *options, int *add)
++{
++	char *ptr;
++
++	ptr = strchr(options, ',');
++	if(ptr != NULL)
++		*ptr++ = '\0';
++	if(*options != '\0')
++		root_ino = options;
++
++	options = ptr;
++	while(options){
++		ptr = strchr(options, ',');
++		if(ptr != NULL)
++			*ptr++ = '\0';
++		if(*options != '\0'){
++			if(!strcmp(options, "append"))
++				append = 1;
++			else printf("hostfs_args - unsupported option - %s\n",
++				    options);
++		}
++		options = ptr;
++	}
++	return(0);
++}
++
++__uml_setup("hostfs=", hostfs_args,
++"hostfs=<root dir>,<flags>,...\n"
++"    This is used to set hostfs parameters.  The root directory argument\n"
++"    is used to confine all hostfs mounts to within the specified directory\n"
++"    tree on the host.  If this isn't specified, then a user inside UML can\n"
++"    mount anything on the host that's accessible to the user that's running\n"
++"    it.\n"
++"    The only flag currently supported is 'append', which specifies that all\n"
++"    files opened by hostfs will be opened in append mode.\n\n"
++);
++
++static char *dentry_name(struct dentry *dentry, int extra)
++{
++	struct dentry *parent;
++	char *root, *name;
++	int len;
++
++	len = 0;
++	parent = dentry;
++	while(parent->d_parent != parent){
++		len += parent->d_name.len + 1;
++		parent = parent->d_parent;
++	}
++	
++	root = HOSTFS_I(parent->d_inode)->host_filename;
++	len += strlen(root);
++	name = kmalloc(len + extra + 1, GFP_KERNEL);
++	if(name == NULL) return(NULL);
++
++	name[len] = '\0';
++	parent = dentry;
++	while(parent->d_parent != parent){
++		len -= parent->d_name.len + 1;
++		name[len] = '/';
++		strncpy(&name[len + 1], parent->d_name.name, 
++			parent->d_name.len);
++		parent = parent->d_parent;
++	}
++	strncpy(name, root, strlen(root));
++	return(name);
++}
++
++static char *inode_name(struct inode *ino, int extra)
++{
++	struct dentry *dentry;
++
++	dentry = list_entry(ino->i_dentry.next, struct dentry, d_alias);
++	return(dentry_name(dentry, extra));
++}
++
++static int read_name(struct inode *ino, char *name)
++{
++	/* The non-int inode fields are copied into ints by stat_file and
++	 * then copied into the inode because passing the actual pointers
++	 * in and having them treated as int * breaks on big-endian machines
++	 */
++	int err;
++	int i_mode, i_nlink, i_blksize;
++	unsigned long long i_size;
++	unsigned long long i_ino;
++	unsigned long long i_blocks;
++
++	err = stat_file(name, &i_ino, &i_mode, &i_nlink, &ino->i_uid, 
++			&ino->i_gid, &i_size, &ino->i_atime, &ino->i_mtime, 
++			&ino->i_ctime, &i_blksize, &i_blocks);
++	if(err) 
++		return(err);
++
++	ino->i_ino = i_ino;
++	ino->i_mode = i_mode;
++	ino->i_nlink = i_nlink;
++	ino->i_size = i_size;
++	ino->i_blksize = i_blksize;
++	ino->i_blocks = i_blocks;
++	if((ino->i_sb->s_dev == ROOT_DEV) && (ino->i_uid == getuid()))
++		ino->i_uid = 0;
++	return(0);
++}
++
++static char *follow_link(char *link)
++{
++	int len, n;
++	char *name, *resolved, *end;
++
++	len = 64;
++	while(1){
++		n = -ENOMEM;
++		name = kmalloc(len, GFP_KERNEL);
++		if(name == NULL)
++			goto out;
++
++		n = do_readlink(link, name, len);
++		if(n < len)
++			break;
++		len *= 2;
++		kfree(name);
++	}
++	if(n < 0)
++		goto out_free;
++
++	if(*name == '/')
++		return(name);
++
++	end = strrchr(link, '/');
++	if(end == NULL)
++		return(name);
++
++	*(end + 1) = '\0';
++	len = strlen(link) + strlen(name) + 1;
++
++	resolved = kmalloc(len, GFP_KERNEL);
++	if(resolved == NULL){
++		n = -ENOMEM;
++		goto out_free;
++	}
++
++	sprintf(resolved, "%s%s", link, name);
++	kfree(name);
++	kfree(link);
++	return(resolved);
++
++ out_free:
++	kfree(name);
++ out:
++	return(ERR_PTR(n));
++}
++
++static int read_inode(struct inode *ino)
++{
++	char *name;
++	int err = 0;
++
++	/* Unfortunately, we are called from iget() when we don't have a dentry
++	 * allocated yet.
++	 */
++	if(list_empty(&ino->i_dentry))
++		goto out;
++ 
++	err = -ENOMEM;
++	name = inode_name(ino, 0);
++	if(name == NULL) 
++		goto out;
++
++	if(file_type(name, NULL) == OS_TYPE_SYMLINK){
++		name = follow_link(name);
++		if(IS_ERR(name)){
++			err = PTR_ERR(name);
++			goto out;
++		}
++	}
++	
++	err = read_name(ino, name);
++	kfree(name);
++ out:
++	return(err);
++}
++
++int hostfs_statfs(struct super_block *sb, struct kstatfs *sf)
++{
++	/* do_statfs uses struct statfs64 internally, but the linux kernel
++	 * struct statfs still has 32-bit versions for most of these fields,
++	 * so we convert them here
++	 */
++	int err;
++	long long f_blocks;
++	long long f_bfree;
++	long long f_bavail;
++	long long f_files;
++	long long f_ffree;
++
++	err = do_statfs(HOSTFS_I(sb->s_root->d_inode)->host_filename,
++			&sf->f_bsize, &f_blocks, &f_bfree, &f_bavail, &f_files,
++			&f_ffree, &sf->f_fsid, sizeof(sf->f_fsid), 
++			&sf->f_namelen, sf->f_spare);
++	if(err) return(err);
++	sf->f_blocks = f_blocks;
++	sf->f_bfree = f_bfree;
++	sf->f_bavail = f_bavail;
++	sf->f_files = f_files;
++	sf->f_ffree = f_ffree;
++	sf->f_type = HOSTFS_SUPER_MAGIC;
++	return(0);
++}
++
++static struct inode *hostfs_alloc_inode(struct super_block *sb)
++{
++	struct hostfs_inode_info *hi;
++
++	hi = kmalloc(sizeof(*hi), GFP_KERNEL);
++	if(hi == NULL) 
++		return(NULL);
++
++	*hi = ((struct hostfs_inode_info) { .host_filename	= NULL,
++					    .fd			= -1,
++					    .mode		= 0 });
++	inode_init_once(&hi->vfs_inode);
++	return(&hi->vfs_inode);
++}
++
++static void hostfs_destroy_inode(struct inode *inode)
++{
++	if(HOSTFS_I(inode)->host_filename) 
++		kfree(HOSTFS_I(inode)->host_filename);
++
++	if(HOSTFS_I(inode)->fd != -1) 
++		close_file(&HOSTFS_I(inode)->fd);
++
++	kfree(HOSTFS_I(inode));
++}
++
++static void hostfs_read_inode(struct inode *inode)
++{
++	read_inode(inode);
++}
++
++static struct super_operations hostfs_sbops = { 
++	.alloc_inode	= hostfs_alloc_inode,
++	.destroy_inode	= hostfs_destroy_inode,
++	.read_inode	= hostfs_read_inode,
++	.statfs		= hostfs_statfs,
++};
++
++int hostfs_readdir(struct file *file, void *ent, filldir_t filldir)
++{
++	void *dir;
++	char *name;
++	unsigned long long next, ino;
++	int error, len;
++
++	name = dentry_name(file->f_dentry, 0);
++	if(name == NULL) return(-ENOMEM);
++	dir = open_dir(name, &error);
++	kfree(name);
++	if(dir == NULL) return(-error);
++	next = file->f_pos;
++	while((name = read_dir(dir, &next, &ino, &len)) != NULL){
++		error = (*filldir)(ent, name, len, file->f_pos, 
++				   ino, DT_UNKNOWN);
++		if(error) break;
++		file->f_pos = next;
++	}
++	close_dir(dir);
++	return(0);
++}
++
++int hostfs_file_open(struct inode *ino, struct file *file)
++{
++	char *name;
++	int mode = 0, r = 0, w = 0, fd;
++
++	mode = file->f_mode & (FMODE_READ | FMODE_WRITE);
++	if((mode & HOSTFS_I(ino)->mode) == mode)
++		return(0);
++
++	/* The file may already have been opened, but with the wrong access,
++	 * so this resets things and reopens the file with the new access.
++	 */
++	if(HOSTFS_I(ino)->fd != -1){
++		close_file(&HOSTFS_I(ino)->fd);
++		HOSTFS_I(ino)->fd = -1;
++	}
++
++	HOSTFS_I(ino)->mode |= mode;
++	if(HOSTFS_I(ino)->mode & FMODE_READ) 
++		r = 1;
++	if(HOSTFS_I(ino)->mode & FMODE_WRITE) 
++		w = 1;
++	if(w) 
++		r = 1;
++
++	name = dentry_name(file->f_dentry, 0);
++	if(name == NULL) 
++		return(-ENOMEM);
++
++	fd = open_file(name, r, w, append);
++	kfree(name);
++	if(fd < 0) return(fd);
++	FILE_HOSTFS_I(file)->fd = fd;
++
++	return(0);
++}
++
++int hostfs_fsync(struct file *file, struct dentry *dentry, int datasync)
++{
++	return(0);
++}
++
++static struct file_operations hostfs_file_fops = {
++	.llseek		= generic_file_llseek,
++	.read		= generic_file_read,
++	.write		= generic_file_write,
++	.mmap		= generic_file_mmap,
++	.open		= hostfs_file_open,
++	.release	= NULL,
++	.fsync		= hostfs_fsync,
++};
++
++static struct file_operations hostfs_dir_fops = {
++	.readdir	= hostfs_readdir,
++	.read		= generic_read_dir,
++};
++
++int hostfs_writepage(struct page *page, struct writeback_control *wbc)
++{
++	struct address_space *mapping = page->mapping;
++	struct inode *inode = mapping->host;
++	char *buffer;
++	unsigned long long base;
++	int count = PAGE_CACHE_SIZE;
++	int end_index = inode->i_size >> PAGE_CACHE_SHIFT;
++	int err;
++
++	if (page->index >= end_index)
++		count = inode->i_size & (PAGE_CACHE_SIZE-1);
++
++	buffer = kmap(page);
++	base = ((unsigned long long) page->index) << PAGE_CACHE_SHIFT;
++
++	err = write_file(HOSTFS_I(inode)->fd, &base, buffer, count);
++	if(err != count){
++		ClearPageUptodate(page);
++		goto out;
++	}
++
++	if (base > inode->i_size)
++		inode->i_size = base;
++
++	if (PageError(page))
++		ClearPageError(page);	
++	err = 0;
++
++ out:	
++	kunmap(page);
++
++	unlock_page(page);
++	return err; 
++}
++
++int hostfs_readpage(struct file *file, struct page *page)
++{
++	char *buffer;
++	long long start;
++	int err = 0;
++
++	start = (long long) page->index << PAGE_CACHE_SHIFT;
++	buffer = kmap(page);
++	err = read_file(FILE_HOSTFS_I(file)->fd, &start, buffer,
++			PAGE_CACHE_SIZE);
++	if(err < 0) goto out;
++
++	memset(&buffer[err], 0, PAGE_CACHE_SIZE - err);
++
++	flush_dcache_page(page);
++	SetPageUptodate(page);
++	if (PageError(page)) ClearPageError(page);
++	err = 0;
++ out:
++	kunmap(page);
++	unlock_page(page);
++	return(err);
++}
++
++int hostfs_prepare_write(struct file *file, struct page *page, 
++			 unsigned int from, unsigned int to)
++{
++	char *buffer;
++	long long start, tmp;
++	int err;
++
++	start = (long long) page->index << PAGE_CACHE_SHIFT;
++	buffer = kmap(page);
++	if(from != 0){
++		tmp = start;
++		err = read_file(FILE_HOSTFS_I(file)->fd, &tmp, buffer,
++				from);
++		if(err < 0) goto out;
++	}
++	if(to != PAGE_CACHE_SIZE){
++		start += to;
++		err = read_file(FILE_HOSTFS_I(file)->fd, &start, buffer + to,
++				PAGE_CACHE_SIZE - to);
++		if(err < 0) goto out;		
++	}
++	err = 0;
++ out:
++	kunmap(page);
++	return(err);
++}
++
++int hostfs_commit_write(struct file *file, struct page *page, unsigned from,
++		 unsigned to)
++{
++	struct address_space *mapping = page->mapping;
++	struct inode *inode = mapping->host;
++	char *buffer;
++	long long start;
++	int err = 0;
++
++	start = (long long) (page->index << PAGE_CACHE_SHIFT) + from;
++	buffer = kmap(page);
++	err = write_file(FILE_HOSTFS_I(file)->fd, &start, buffer + from, 
++			 to - from);
++	if(err > 0) err = 0;
++	if(!err && (start > inode->i_size))
++		inode->i_size = start;
++
++	kunmap(page);
++	return(err);
++}
++
++static struct address_space_operations hostfs_aops = {
++	.writepage 	= hostfs_writepage,
++	.readpage	= hostfs_readpage,
++/* 	.set_page_dirty = __set_page_dirty_nobuffers, */
++	.prepare_write	= hostfs_prepare_write,
++	.commit_write	= hostfs_commit_write
++};
++
++static int init_inode(struct inode *inode, struct dentry *dentry)
++{
++	char *name;
++	int type, err = -ENOMEM, rdev;
++
++	if(dentry){
++		name = dentry_name(dentry, 0);
++		if(name == NULL)
++			goto out;
++		type = file_type(name, &rdev);
++		kfree(name);
++	}
++	else type = OS_TYPE_DIR;
++
++	err = 0;
++	if(type == OS_TYPE_SYMLINK)
++		inode->i_op = &page_symlink_inode_operations;
++	else if(type == OS_TYPE_DIR)
++		inode->i_op = &hostfs_dir_iops;
++	else inode->i_op = &hostfs_iops;
++
++	if(type == OS_TYPE_DIR) inode->i_fop = &hostfs_dir_fops;
++	else inode->i_fop = &hostfs_file_fops;
++
++	if(type == OS_TYPE_SYMLINK) 
++		inode->i_mapping->a_ops = &hostfs_link_aops;
++	else inode->i_mapping->a_ops = &hostfs_aops;
++
++	switch (type) {
++	case OS_TYPE_CHARDEV:
++		init_special_inode(inode, S_IFCHR, rdev);
++		break;
++	case OS_TYPE_BLOCKDEV:
++		init_special_inode(inode, S_IFBLK, rdev);
++		break;
++	case OS_TYPE_FIFO:
++		init_special_inode(inode, S_IFIFO, 0);
++		break;
++	case OS_TYPE_SOCK:
++		init_special_inode(inode, S_IFSOCK, 0);
++		break;
++	}
++ out:
++	return(err);
++}
++
++int hostfs_create(struct inode *dir, struct dentry *dentry, int mode, 
++                 struct nameidata *nd)
++{
++	struct inode *inode;
++	char *name;
++	int error, fd;
++
++	error = -ENOMEM;
++	inode = iget(dir->i_sb, 0);
++	if(inode == NULL) goto out;
++
++	error = init_inode(inode, dentry);
++	if(error) 
++		goto out_put;
++	
++	error = -ENOMEM;
++	name = dentry_name(dentry, 0);
++	if(name == NULL)
++		goto out_put;
++
++	fd = file_create(name, 
++			 mode & S_IRUSR, mode & S_IWUSR, mode & S_IXUSR, 
++			 mode & S_IRGRP, mode & S_IWGRP, mode & S_IXGRP, 
++			 mode & S_IROTH, mode & S_IWOTH, mode & S_IXOTH);
++	if(fd < 0) 
++		error = fd;
++	else error = read_name(inode, name);
++
++	kfree(name);
++	if(error)
++		goto out_put;
++
++	HOSTFS_I(inode)->fd = fd;
++	HOSTFS_I(inode)->mode = FMODE_READ | FMODE_WRITE;
++	d_instantiate(dentry, inode);
++	return(0);
++
++ out_put:
++	iput(inode);
++ out:
++	return(error);
++}
++
++struct dentry *hostfs_lookup(struct inode *ino, struct dentry *dentry, 
++                            struct nameidata *nd)
++{
++	struct inode *inode;
++	char *name;
++	int err;
++
++	err = -ENOMEM;
++	inode = iget(ino->i_sb, 0);
++	if(inode == NULL) 
++		goto out;
++ 
++	err = init_inode(inode, dentry);
++	if(err) 
++		goto out_put;
++
++	err = -ENOMEM;
++	name = dentry_name(dentry, 0);
++	if(name == NULL)
++		goto out_put;
++
++	err = read_name(inode, name);
++	kfree(name);
++	if(err == -ENOENT){
++		iput(inode);
++		inode = NULL;
++	}
++	else if(err)
++		goto out_put;
++
++	d_add(dentry, inode);
++	dentry->d_op = &hostfs_dentry_ops;
++	return(NULL);
++
++ out_put:
++	iput(inode);
++ out:
++	return(ERR_PTR(err));
++}
++
++static char *inode_dentry_name(struct inode *ino, struct dentry *dentry)
++{
++        char *file;
++	int len;
++
++	file = inode_name(ino, dentry->d_name.len + 1);
++	if(file == NULL) return(NULL);
++        strcat(file, "/");
++	len = strlen(file);
++        strncat(file, dentry->d_name.name, dentry->d_name.len);
++	file[len + dentry->d_name.len] = '\0';
++        return(file);
++}
++
++int hostfs_link(struct dentry *to, struct inode *ino, struct dentry *from)
++{
++        char *from_name, *to_name;
++        int err;
++
++        if((from_name = inode_dentry_name(ino, from)) == NULL) 
++                return(-ENOMEM);
++        to_name = dentry_name(to, 0);
++	if(to_name == NULL){
++		kfree(from_name);
++		return(-ENOMEM);
++	}
++        err = link_file(to_name, from_name);
++        kfree(from_name);
++        kfree(to_name);
++        return(err);
++}
++
++int hostfs_unlink(struct inode *ino, struct dentry *dentry)
++{
++	char *file;
++	int err;
++
++	if((file = inode_dentry_name(ino, dentry)) == NULL) return(-ENOMEM);
++	if(append)
++		return(-EPERM);
++
++	err = unlink_file(file);
++	kfree(file);
++	return(err);
++}
++
++int hostfs_symlink(struct inode *ino, struct dentry *dentry, const char *to)
++{
++	char *file;
++	int err;
++
++	if((file = inode_dentry_name(ino, dentry)) == NULL) return(-ENOMEM);
++	err = make_symlink(file, to);
++	kfree(file);
++	return(err);
++}
++
++int hostfs_mkdir(struct inode *ino, struct dentry *dentry, int mode)
++{
++	char *file;
++	int err;
++
++	if((file = inode_dentry_name(ino, dentry)) == NULL) return(-ENOMEM);
++	err = do_mkdir(file, mode);
++	kfree(file);
++	return(err);
++}
++
++int hostfs_rmdir(struct inode *ino, struct dentry *dentry)
++{
++	char *file;
++	int err;
++
++	if((file = inode_dentry_name(ino, dentry)) == NULL) return(-ENOMEM);
++	err = do_rmdir(file);
++	kfree(file);
++	return(err);
++}
++
++int hostfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
++{
++	struct inode *inode;
++	char *name;
++	int err = -ENOMEM;
++ 
++	inode = iget(dir->i_sb, 0);
++	if(inode == NULL) 
++		goto out;
++
++	err = init_inode(inode, dentry);
++	if(err) 
++		goto out_put;
++
++	err = -ENOMEM;
++	name = dentry_name(dentry, 0);
++	if(name == NULL)
++		goto out_put;
++
++	init_special_inode(inode, mode, dev);
++	err = do_mknod(name, mode, dev);
++	if(err)
++		goto out_free;
++
++	err = read_name(inode, name);
++	kfree(name);
++	if(err)
++		goto out_put;
++
++	d_instantiate(dentry, inode);
++	return(0);
++
++ out_free:
++	kfree(name);
++ out_put:
++	iput(inode);
++ out:
++	return(err);
++}
++
++int hostfs_rename(struct inode *from_ino, struct dentry *from,
++		  struct inode *to_ino, struct dentry *to)
++{
++	char *from_name, *to_name;
++	int err;
++
++	if((from_name = inode_dentry_name(from_ino, from)) == NULL)
++		return(-ENOMEM);
++	if((to_name = inode_dentry_name(to_ino, to)) == NULL){
++		kfree(from_name);
++		return(-ENOMEM);
++	}
++	err = rename_file(from_name, to_name);
++	kfree(from_name);
++	kfree(to_name);
++	return(err);
++}
++
++void hostfs_truncate(struct inode *ino)
++{
++	not_implemented();
++}
++
++int hostfs_permission(struct inode *ino, int desired, struct nameidata *nd)
++{
++	char *name;
++	int r = 0, w = 0, x = 0, err;
++
++	if(desired & MAY_READ) r = 1;
++	if(desired & MAY_WRITE) w = 1;
++	if(desired & MAY_EXEC) x = 1;
++	name = inode_name(ino, 0);
++	if(name == NULL) return(-ENOMEM);
++	err = access_file(name, r, w, x);
++	kfree(name);
++	if(!err) err = vfs_permission(ino, desired);
++	return(err);
++}
++
++int hostfs_setattr(struct dentry *dentry, struct iattr *attr)
++{
++	struct hostfs_iattr attrs;
++	char *name;
++	int err;
++	
++	if(append) 
++		attr->ia_valid &= ~ATTR_SIZE;
++
++	attrs.ia_valid = 0;
++	if(attr->ia_valid & ATTR_MODE){
++		attrs.ia_valid |= HOSTFS_ATTR_MODE;
++		attrs.ia_mode = attr->ia_mode;
++	}
++	if(attr->ia_valid & ATTR_UID){
++		if((dentry->d_inode->i_sb->s_dev == ROOT_DEV) && 
++		   (attr->ia_uid == 0))
++			attr->ia_uid = getuid();
++		attrs.ia_valid |= HOSTFS_ATTR_UID;
++		attrs.ia_uid = attr->ia_uid;
++	}
++	if(attr->ia_valid & ATTR_GID){
++		if((dentry->d_inode->i_sb->s_dev == ROOT_DEV) && 
++		   (attr->ia_gid == 0))
++			attr->ia_gid = getuid();
++		attrs.ia_valid |= HOSTFS_ATTR_GID;
++		attrs.ia_gid = attr->ia_gid;
++	}
++	if(attr->ia_valid & ATTR_SIZE){
++		attrs.ia_valid |= HOSTFS_ATTR_SIZE;
++		attrs.ia_size = attr->ia_size;
++	}
++	if(attr->ia_valid & ATTR_ATIME){
++		attrs.ia_valid |= HOSTFS_ATTR_ATIME;
++		attrs.ia_atime = attr->ia_atime;
++	}
++	if(attr->ia_valid & ATTR_MTIME){
++		attrs.ia_valid |= HOSTFS_ATTR_MTIME;
++		attrs.ia_mtime = attr->ia_mtime;
++	}
++	if(attr->ia_valid & ATTR_CTIME){
++		attrs.ia_valid |= HOSTFS_ATTR_CTIME;
++		attrs.ia_ctime = attr->ia_ctime;
++	}
++	if(attr->ia_valid & ATTR_ATIME_SET){
++		attrs.ia_valid |= HOSTFS_ATTR_ATIME_SET;
++	}
++	if(attr->ia_valid & ATTR_MTIME_SET){
++		attrs.ia_valid |= HOSTFS_ATTR_MTIME_SET;
++	}
++	name = dentry_name(dentry, 0);
++	if(name == NULL) return(-ENOMEM);
++	err = set_attr(name, &attrs);
++	kfree(name);
++	if(err)
++		return(err);
++
++	return(inode_setattr(dentry->d_inode, attr));
++}
++
++int hostfs_getattr(struct vfsmount *mnt, struct dentry *dentry, 
++	   struct kstat *stat)
++{
++	generic_fillattr(dentry->d_inode, stat);
++	return(0);
++}
++
++static struct inode_operations hostfs_iops = {
++	.create		= hostfs_create,
++	.link		= hostfs_link,
++	.unlink		= hostfs_unlink,
++	.symlink	= hostfs_symlink,
++	.mkdir		= hostfs_mkdir,
++	.rmdir		= hostfs_rmdir,
++	.mknod		= hostfs_mknod,
++	.rename		= hostfs_rename,
++	.truncate	= hostfs_truncate,
++	.permission	= hostfs_permission,
++	.setattr	= hostfs_setattr,
++	.getattr	= hostfs_getattr,
++};
++
++static struct inode_operations hostfs_dir_iops = {
++	.create		= hostfs_create,
++	.lookup		= hostfs_lookup,
++	.link		= hostfs_link,
++	.unlink		= hostfs_unlink,
++	.symlink	= hostfs_symlink,
++	.mkdir		= hostfs_mkdir,
++	.rmdir		= hostfs_rmdir,
++	.mknod		= hostfs_mknod,
++	.rename		= hostfs_rename,
++	.truncate	= hostfs_truncate,
++	.permission	= hostfs_permission,
++	.setattr	= hostfs_setattr,
++	.getattr	= hostfs_getattr,
++};
++
++int hostfs_link_readpage(struct file *file, struct page *page)
++{
++	char *buffer, *name;
++	long long start;
++	int err;
++
++	start = page->index << PAGE_CACHE_SHIFT;
++	buffer = kmap(page);
++	name = inode_name(page->mapping->host, 0);
++	if(name == NULL) return(-ENOMEM);
++	err = do_readlink(name, buffer, PAGE_CACHE_SIZE);
++	kfree(name);
++	if(err == PAGE_CACHE_SIZE)
++		err = -E2BIG;
++	else if(err > 0){
++		flush_dcache_page(page);
++		SetPageUptodate(page);
++		if (PageError(page)) ClearPageError(page);
++		err = 0;
++	}
++	kunmap(page);
++	unlock_page(page);
++	return(err);
++}
++
++static struct address_space_operations hostfs_link_aops = {
++	.readpage	= hostfs_link_readpage,
++};
++
++static int hostfs_fill_sb_common(struct super_block *sb, void *d, int silent)
++{
++	struct inode *root_inode;
++	char *name, *data = d;
++	int err;
++
++	sb->s_blocksize = 1024;
++	sb->s_blocksize_bits = 10;
++	sb->s_magic = HOSTFS_SUPER_MAGIC;
++	sb->s_op = &hostfs_sbops;
++
++	if((data == NULL) || (*data == '\0')) 
++		data = root_ino;
++
++	err = -ENOMEM;
++	name = kmalloc(strlen(data) + 1, GFP_KERNEL);
++	if(name == NULL) 
++		goto out;
++
++	strcpy(name, data);
++
++	root_inode = iget(sb, 0);
++	if(root_inode == NULL)
++		goto out_free;
++
++	err = init_inode(root_inode, NULL);
++	if(err)
++		goto out_put;
++
++	HOSTFS_I(root_inode)->host_filename = name;
++
++	err = -ENOMEM;
++	sb->s_root = d_alloc_root(root_inode);
++	if(sb->s_root == NULL)
++		goto out_put;
++
++	err = read_inode(root_inode);
++	if(err)
++		goto out_put;
++
++	return(0);
++
++ out_put:
++	iput(root_inode);
++ out_free:
++	kfree(name);
++ out:
++	return(err);
++}
++
++static struct super_block *hostfs_read_sb(struct file_system_type *type,
++					     int flags, const char *dev_name,
++					     void *data)
++{
++	return(get_sb_nodev(type, flags, data, hostfs_fill_sb_common));
++}
++
++static struct file_system_type hostfs_type = {
++	.owner 		= THIS_MODULE,
++	.name 		= "hostfs",
++	.get_sb 	= hostfs_read_sb,
++	.kill_sb	= kill_anon_super,
++	.fs_flags 	= 0,
++};
++
++static int __init init_hostfs(void)
++{
++	return(register_filesystem(&hostfs_type));
++}
++
++static void __exit exit_hostfs(void)
++{
++	unregister_filesystem(&hostfs_type);
++}
++
++module_init(init_hostfs)
++module_exit(exit_hostfs)
++MODULE_LICENSE("GPL");
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/fs/hostfs/hostfs_user.c b/fs/hostfs/hostfs_user.c
+--- a/fs/hostfs/hostfs_user.c	1969-12-31 19:00:00.000000000 -0500
++++ b/fs/hostfs/hostfs_user.c	2004-02-11 12:26:11.000000000 -0500
+@@ -0,0 +1,361 @@
++/* 
++ * Copyright (C) 2000 Jeff Dike (jdike@karaya.com)
++ * Licensed under the GPL
++ */
++
++#include <unistd.h>
++#include <stdio.h>
++#include <fcntl.h>
++#include <dirent.h>
++#include <errno.h>
++#include <utime.h>
++#include <string.h>
++#include <sys/stat.h>
++#include <sys/time.h>
++#include <sys/vfs.h>
++#include "hostfs.h"
++#include "kern_util.h"
++#include "user.h"
++
++int stat_file(const char *path, unsigned long long *inode_out, int *mode_out,
++	      int *nlink_out, int *uid_out, int *gid_out, 
++	      unsigned long long *size_out, struct timespec *atime_out,
++	      struct timespec *mtime_out, struct timespec *ctime_out,
++	      int *blksize_out, unsigned long long *blocks_out)
++{
++	struct stat64 buf;
++
++	if(lstat64(path, &buf) < 0) 
++		return(-errno);
++
++	/* See the Makefile for why STAT64_INO_FIELD is passed in
++	 * by the build
++	 */
++	if(inode_out != NULL) *inode_out = buf.STAT64_INO_FIELD;
++	if(mode_out != NULL) *mode_out = buf.st_mode;
++	if(nlink_out != NULL) *nlink_out = buf.st_nlink;
++	if(uid_out != NULL) *uid_out = buf.st_uid;
++	if(gid_out != NULL) *gid_out = buf.st_gid;
++	if(size_out != NULL) *size_out = buf.st_size;
++	if(atime_out != NULL) {
++		atime_out->tv_sec = buf.st_atime;
++		atime_out->tv_nsec = 0;
++	}
++	if(mtime_out != NULL) {
++		mtime_out->tv_sec = buf.st_mtime;
++		mtime_out->tv_nsec = 0;
++	}
++	if(ctime_out != NULL) {
++		ctime_out->tv_sec = buf.st_ctime;
++		ctime_out->tv_nsec = 0;
++	}
++	if(blksize_out != NULL) *blksize_out = buf.st_blksize;
++	if(blocks_out != NULL) *blocks_out = buf.st_blocks;
++	return(0);
++}
++
++int file_type(const char *path, int *rdev)
++{
++ 	struct stat64 buf;
++
++	if(lstat64(path, &buf) < 0) 
++		return(-errno);
++	if(rdev != NULL) 
++		*rdev = buf.st_rdev;
++
++	if(S_ISDIR(buf.st_mode)) return(OS_TYPE_DIR);
++	else if(S_ISLNK(buf.st_mode)) return(OS_TYPE_SYMLINK);
++	else if(S_ISCHR(buf.st_mode)) return(OS_TYPE_CHARDEV);
++	else if(S_ISBLK(buf.st_mode)) return(OS_TYPE_BLOCKDEV);
++	else if(S_ISFIFO(buf.st_mode))return(OS_TYPE_FIFO);
++	else if(S_ISSOCK(buf.st_mode))return(OS_TYPE_SOCK);
++	else return(OS_TYPE_FILE);
++}
++
++int access_file(char *path, int r, int w, int x)
++{
++	int mode = 0;
++
++	if(r) mode = R_OK;
++	if(w) mode |= W_OK;
++	if(x) mode |= X_OK;
++	if(access(path, mode) != 0) return(-errno);
++	else return(0);
++}
++
++int open_file(char *path, int r, int w, int append)
++{
++	int mode = 0, fd;
++
++	if(r && !w) 
++		mode = O_RDONLY;
++	else if(!r && w) 
++		mode = O_WRONLY;
++	else if(r && w) 
++		mode = O_RDWR;
++	else panic("Impossible mode in open_file");
++
++	if(append)
++		mode |= O_APPEND;
++	fd = open64(path, mode);
++	if(fd < 0) return(-errno);
++	else return(fd);
++}
++
++void *open_dir(char *path, int *err_out)
++{
++	DIR *dir;
++
++	dir = opendir(path);
++	*err_out = errno;
++	if(dir == NULL) return(NULL);
++	return(dir);
++}
++
++char *read_dir(void *stream, unsigned long long *pos, 
++	       unsigned long long *ino_out, int *len_out)
++{
++	DIR *dir = stream;
++	struct dirent *ent;
++
++	seekdir(dir, *pos);
++	ent = readdir(dir);
++	if(ent == NULL) return(NULL);
++	*len_out = strlen(ent->d_name);
++	*ino_out = ent->d_ino;
++	*pos = telldir(dir);
++	return(ent->d_name);
++}
++
++int read_file(int fd, unsigned long long *offset, char *buf, int len)
++{
++	int n;
++
++	n = pread64(fd, buf, len, *offset);
++	if(n < 0) return(-errno);
++	*offset += n;
++	return(n);
++}
++
++int write_file(int fd, unsigned long long *offset, const char *buf, int len)
++{
++	int n;
++
++	n = pwrite64(fd, buf, len, *offset);
++	if(n < 0) return(-errno);
++	*offset += n;
++	return(n);
++}
++
++int lseek_file(int fd, long long offset, int whence)
++{
++	int ret;
++
++	ret = lseek64(fd, offset, whence);
++	if(ret < 0) return(-errno);
++	return(0);
++}
++
++void close_file(void *stream)
++{
++	close(*((int *) stream));
++}
++
++void close_dir(void *stream)
++{
++	closedir(stream);
++}
++
++int file_create(char *name, int ur, int uw, int ux, int gr, 
++		int gw, int gx, int or, int ow, int ox)
++{
++	int mode, fd;
++
++	mode = 0;
++	mode |= ur ? S_IRUSR : 0;
++	mode |= uw ? S_IWUSR : 0;
++	mode |= ux ? S_IXUSR : 0;
++	mode |= gr ? S_IRGRP : 0;
++	mode |= gw ? S_IWGRP : 0;
++	mode |= gx ? S_IXGRP : 0;
++	mode |= or ? S_IROTH : 0;
++	mode |= ow ? S_IWOTH : 0;
++	mode |= ox ? S_IXOTH : 0;
++	fd = open64(name, O_CREAT | O_RDWR, mode);
++	if(fd < 0) 
++		return(-errno);
++	return(fd);
++}
++
++int set_attr(const char *file, struct hostfs_iattr *attrs)
++{
++	struct utimbuf buf;
++	int err, ma;
++
++	if(attrs->ia_valid & HOSTFS_ATTR_MODE){
++		if(chmod(file, attrs->ia_mode) != 0) return(-errno);
++	}
++	if(attrs->ia_valid & HOSTFS_ATTR_UID){
++		if(chown(file, attrs->ia_uid, -1)) return(-errno);
++	}
++	if(attrs->ia_valid & HOSTFS_ATTR_GID){
++		if(chown(file, -1, attrs->ia_gid)) return(-errno);
++	}
++	if(attrs->ia_valid & HOSTFS_ATTR_SIZE){
++		if(truncate(file, attrs->ia_size)) return(-errno);
++	}
++	ma = HOSTFS_ATTR_ATIME_SET | HOSTFS_ATTR_MTIME_SET;
++	if((attrs->ia_valid & ma) == ma){
++		buf.actime = attrs->ia_atime.tv_sec;
++		buf.modtime = attrs->ia_mtime.tv_sec;
++		if(utime(file, &buf) != 0) return(-errno);
++	}
++	else {
++		struct timespec ts;
++
++		if(attrs->ia_valid & HOSTFS_ATTR_ATIME_SET){
++			err = stat_file(file, NULL, NULL, NULL, NULL, NULL, 
++					NULL, NULL, &ts, NULL, NULL, NULL);
++			if(err != 0) 
++				return(err);
++			buf.actime = attrs->ia_atime.tv_sec;
++			buf.modtime = ts.tv_sec;
++			if(utime(file, &buf) != 0) 
++				return(-errno);
++		}
++		if(attrs->ia_valid & HOSTFS_ATTR_MTIME_SET){
++			err = stat_file(file, NULL, NULL, NULL, NULL, NULL, 
++					NULL, &ts, NULL, NULL, NULL, NULL);
++			if(err != 0) 
++				return(err);
++			buf.actime = ts.tv_sec;
++			buf.modtime = attrs->ia_mtime.tv_sec;
++			if(utime(file, &buf) != 0) 
++				return(-errno);
++		}
++	}
++	if(attrs->ia_valid & HOSTFS_ATTR_CTIME) ;
++	if(attrs->ia_valid & (HOSTFS_ATTR_ATIME | HOSTFS_ATTR_MTIME)){
++		err = stat_file(file, NULL, NULL, NULL, NULL, NULL, NULL, 
++				&attrs->ia_atime, &attrs->ia_mtime, NULL, 
++				NULL, NULL);
++		if(err != 0) return(err);
++	}
++	return(0);
++}
++
++int make_symlink(const char *from, const char *to)
++{
++	int err;
++
++	err = symlink(to, from);
++	if(err) return(-errno);
++	return(0);
++}
++
++int unlink_file(const char *file)
++{
++	int err;
++
++	err = unlink(file);
++	if(err) return(-errno);
++	return(0);
++}
++
++int do_mkdir(const char *file, int mode)
++{
++	int err;
++
++	err = mkdir(file, mode);
++	if(err) return(-errno);
++	return(0);
++}
++
++int do_rmdir(const char *file)
++{
++	int err;
++
++	err = rmdir(file);
++	if(err) return(-errno);
++	return(0);
++}
++
++int do_mknod(const char *file, int mode, int dev)
++{
++	int err;
++
++	err = mknod(file, mode, dev);
++	if(err) return(-errno);
++	return(0);
++}
++
++int link_file(const char *to, const char *from)
++{
++	int err;
++
++	err = link(to, from);
++	if(err) return(-errno);
++	return(0);
++}
++
++int do_readlink(char *file, char *buf, int size)
++{
++	int n;
++
++	n = readlink(file, buf, size);
++	if(n < 0) 
++		return(-errno);
++	if(n < size) 
++		buf[n] = '\0';
++	return(n);
++}
++
++int rename_file(char *from, char *to)
++{
++	int err;
++
++	err = rename(from, to);
++	if(err < 0) return(-errno);
++	return(0);	
++}
++
++int do_statfs(char *root, long *bsize_out, long long *blocks_out, 
++	      long long *bfree_out, long long *bavail_out, 
++	      long long *files_out, long long *ffree_out,
++	      void *fsid_out, int fsid_size, long *namelen_out, 
++	      long *spare_out)
++{
++	struct statfs64 buf;
++	int err;
++
++	err = statfs64(root, &buf);
++	if(err < 0) return(-errno);
++	*bsize_out = buf.f_bsize;
++	*blocks_out = buf.f_blocks;
++	*bfree_out = buf.f_bfree;
++	*bavail_out = buf.f_bavail;
++	*files_out = buf.f_files;
++	*ffree_out = buf.f_ffree;
++	memcpy(fsid_out, &buf.f_fsid, 
++	       sizeof(buf.f_fsid) > fsid_size ? fsid_size : 
++	       sizeof(buf.f_fsid));
++	*namelen_out = buf.f_namelen;
++	spare_out[0] = buf.f_spare[0];
++	spare_out[1] = buf.f_spare[1];
++	spare_out[2] = buf.f_spare[2];
++	spare_out[3] = buf.f_spare[3];
++	spare_out[4] = buf.f_spare[4];
++	spare_out[5] = buf.f_spare[5];
++	return(0);
++}
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/fs/hostfs/Makefile b/fs/hostfs/Makefile
+--- a/fs/hostfs/Makefile	1969-12-31 19:00:00.000000000 -0500
++++ b/fs/hostfs/Makefile	2004-02-11 12:25:42.000000000 -0500
+@@ -0,0 +1,26 @@
++# 
++# Copyright (C) 2000 Jeff Dike (jdike@karaya.com)
++# Licensed under the GPL
++#
++
++# struct stat64 changed the inode field name between 2.2 and 2.4 from st_ino
++# to __st_ino.  It stayed in the same place, so as long as the correct name
++# is used, hostfs compiled on 2.2 should work on 2.4 and vice versa.
++
++STAT64_INO_FIELD := $(shell grep -q __st_ino /usr/include/bits/stat.h && \
++				echo __)st_ino
++
++hostfs-objs := hostfs_kern.o hostfs_user.o
++
++obj-y = 
++obj-$(CONFIG_HOSTFS) += hostfs.o
++
++SINGLE_OBJS = $(foreach f,$(patsubst %.o,%,$(obj-y) $(obj-m)),$($(f)-objs))
++
++USER_OBJS := $(filter %_user.o,$(obj-y) $(obj-m) $(SINGLE_OBJS))
++USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
++
++USER_CFLAGS += -DSTAT64_INO_FIELD=$(STAT64_INO_FIELD)
++
++$(USER_OBJS) : %.o: %.c
++	$(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
+diff -Naur a/fs/hppfs/hppfs_kern.c b/fs/hppfs/hppfs_kern.c
+--- a/fs/hppfs/hppfs_kern.c	1969-12-31 19:00:00.000000000 -0500
++++ b/fs/hppfs/hppfs_kern.c	2004-02-11 12:27:10.000000000 -0500
+@@ -0,0 +1,811 @@
++/* 
++ * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
++ * Licensed under the GPL
++ */
++
++#include <linux/fs.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/slab.h>
++#include <linux/list.h>
++#include <linux/kernel.h>
++#include <linux/ctype.h>
++#include <linux/dcache.h>
++#include <linux/statfs.h>
++#include <asm/uaccess.h>
++#include <asm/fcntl.h>
++#include "os.h"
++
++static int init_inode(struct inode *inode, struct dentry *dentry);
++
++struct hppfs_data {
++	struct list_head list;
++	char contents[PAGE_SIZE - sizeof(struct list_head)];
++};
++
++struct hppfs_private {
++	struct file proc_file;
++	int host_fd;
++	loff_t len;
++	struct hppfs_data *contents;
++};
++
++struct hppfs_inode_info {
++        struct dentry *proc_dentry;
++	struct inode vfs_inode;
++};
++
++static inline struct hppfs_inode_info *HPPFS_I(struct inode *inode)
++{
++	return(list_entry(inode, struct hppfs_inode_info, vfs_inode));
++}
++
++#define HPPFS_SUPER_MAGIC 0xb00000ee
++
++static struct super_operations hppfs_sbops;
++
++static int is_pid(struct dentry *dentry)
++{
++	struct super_block *sb;
++	int i;
++
++	sb = dentry->d_sb;
++	if((sb->s_op != &hppfs_sbops) || (dentry->d_parent != sb->s_root))
++		return(0);
++
++	for(i = 0; i < dentry->d_name.len; i++){
++		if(!isdigit(dentry->d_name.name[i]))
++			return(0);
++	}
++	return(1);
++}
++
++static char *dentry_name(struct dentry *dentry, int extra)
++{
++	struct dentry *parent;
++	char *root, *name;
++	const char *seg_name;
++	int len, seg_len;
++
++	len = 0;
++	parent = dentry;
++	while(parent->d_parent != parent){
++		if(is_pid(parent))
++			len += strlen("pid") + 1;
++		else len += parent->d_name.len + 1;
++		parent = parent->d_parent;
++	}
++	
++	root = "proc";
++	len += strlen(root);
++	name = kmalloc(len + extra + 1, GFP_KERNEL);
++	if(name == NULL) return(NULL);
++
++	name[len] = '\0';
++	parent = dentry;
++	while(parent->d_parent != parent){
++		if(is_pid(parent)){
++			seg_name = "pid";
++			seg_len = strlen("pid");
++		}
++		else {
++			seg_name = parent->d_name.name;
++			seg_len = parent->d_name.len;
++		}
++
++		len -= seg_len + 1;
++		name[len] = '/';
++		strncpy(&name[len + 1], seg_name, seg_len);
++		parent = parent->d_parent;
++	}
++	strncpy(name, root, strlen(root));
++	return(name);
++}
++
++struct dentry_operations hppfs_dentry_ops = {
++};
++
++static int file_removed(struct dentry *dentry, const char *file)
++{
++	char *host_file;
++	int extra, fd;
++
++	extra = 0;
++	if(file != NULL) extra += strlen(file) + 1;
++
++	host_file = dentry_name(dentry, extra + strlen("/remove"));
++	if(host_file == NULL){
++		printk("file_removed : allocation failed\n");
++		return(-ENOMEM);
++	}
++
++	if(file != NULL){
++		strcat(host_file, "/");
++		strcat(host_file, file);
++	}
++	strcat(host_file, "/remove");
++
++	fd = os_open_file(host_file, of_read(OPENFLAGS()), 0);
++	kfree(host_file);
++	if(fd > 0){
++		os_close_file(fd);
++		return(1);
++	}
++	return(0);
++}
++
++static void hppfs_read_inode(struct inode *ino)
++{
++	struct inode *proc_ino;
++
++	if(HPPFS_I(ino)->proc_dentry == NULL)
++		return;
++
++	proc_ino = HPPFS_I(ino)->proc_dentry->d_inode;
++	ino->i_uid = proc_ino->i_uid;
++	ino->i_gid = proc_ino->i_gid;
++	ino->i_atime = proc_ino->i_atime;
++	ino->i_mtime = proc_ino->i_mtime;
++	ino->i_ctime = proc_ino->i_ctime;
++	ino->i_ino = proc_ino->i_ino;
++	ino->i_mode = proc_ino->i_mode;
++	ino->i_nlink = proc_ino->i_nlink;
++	ino->i_size = proc_ino->i_size;
++	ino->i_blksize = proc_ino->i_blksize;
++	ino->i_blocks = proc_ino->i_blocks;
++}
++
++static struct dentry *hppfs_lookup(struct inode *ino, struct dentry *dentry, 
++                                  struct nameidata *nd)
++{
++	struct dentry *proc_dentry, *new, *parent;
++	struct inode *inode;
++	int err, deleted;
++
++	deleted = file_removed(dentry, NULL);
++	if(deleted < 0)
++		return(ERR_PTR(deleted));
++	else if(deleted)
++		return(ERR_PTR(-ENOENT));
++
++	err = -ENOMEM;
++	parent = HPPFS_I(ino)->proc_dentry;
++	down(&parent->d_inode->i_sem);
++	proc_dentry = d_lookup(parent, &dentry->d_name);
++	if(proc_dentry == NULL){
++		proc_dentry = d_alloc(parent, &dentry->d_name);
++		if(proc_dentry == NULL){
++			up(&parent->d_inode->i_sem);
++			goto out;
++		}
++		new = (*parent->d_inode->i_op->lookup)(parent->d_inode, 
++						       proc_dentry, NULL);
++		if(new){
++			dput(proc_dentry);
++			proc_dentry = new;
++		}
++	}
++	up(&parent->d_inode->i_sem);
++
++	if(IS_ERR(proc_dentry))
++		return(proc_dentry);
++
++	inode = iget(ino->i_sb, 0);
++	if(inode == NULL) 
++		goto out_dput;
++
++	err = init_inode(inode, proc_dentry);
++	if(err) 
++		goto out_put;
++	
++	hppfs_read_inode(inode);
++
++ 	d_add(dentry, inode);
++	dentry->d_op = &hppfs_dentry_ops;
++	return(NULL);
++
++ out_put:
++	iput(inode);
++ out_dput:
++	dput(proc_dentry);
++ out:
++	return(ERR_PTR(err));
++}
++
++static struct inode_operations hppfs_file_iops = {
++};
++
++static ssize_t read_proc(struct file *file, char *buf, ssize_t count, 
++			 loff_t *ppos, int is_user)
++{
++	ssize_t (*read)(struct file *, char *, size_t, loff_t *);
++	ssize_t n;
++
++	read = file->f_dentry->d_inode->i_fop->read;
++
++	if(!is_user)
++		set_fs(KERNEL_DS);
++		
++	n = (*read)(file, buf, count, &file->f_pos);
++
++	if(!is_user)
++		set_fs(USER_DS);
++
++	if(ppos) *ppos = file->f_pos;
++	return(n);
++}
++
++static ssize_t hppfs_read_file(int fd, char *buf, ssize_t count)
++{
++	ssize_t n;
++	int cur, err;
++	char *new_buf;
++
++	n = -ENOMEM;
++	new_buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
++	if(new_buf == NULL){
++		printk("hppfs_read_file : kmalloc failed\n");
++		goto out;
++	}
++	n = 0;
++	while(count > 0){
++		cur = min_t(ssize_t, count, PAGE_SIZE);
++		err = os_read_file(fd, new_buf, cur);
++		if(err < 0){
++			printk("hppfs_read : read failed, errno = %d\n",
++			       count);
++			n = err;
++			goto out_free;
++		}
++		else if(err == 0)
++			break;
++
++		if(copy_to_user(buf, new_buf, err)){
++			n = -EFAULT;
++			goto out_free;
++		}
++		n += err;
++		count -= err;
++	}
++ out_free:
++	kfree(new_buf);
++ out:
++	return(n);
++}
++
++static ssize_t hppfs_read(struct file *file, char *buf, size_t count, 
++			  loff_t *ppos)
++{
++	struct hppfs_private *hppfs = file->private_data;
++	struct hppfs_data *data;
++	loff_t off;
++	int err;
++
++	if(hppfs->contents != NULL){
++		if(*ppos >= hppfs->len) return(0);
++
++		data = hppfs->contents;
++		off = *ppos;
++		while(off >= sizeof(data->contents)){
++			data = list_entry(data->list.next, struct hppfs_data,
++					  list);
++			off -= sizeof(data->contents);
++		}
++
++		if(off + count > hppfs->len)
++			count = hppfs->len - off;
++		copy_to_user(buf, &data->contents[off], count);
++		*ppos += count;
++	}
++	else if(hppfs->host_fd != -1){
++		err = os_seek_file(hppfs->host_fd, *ppos);
++		if(err){
++			printk("hppfs_read : seek failed, errno = %d\n", err);
++			return(err);
++		}
++		count = hppfs_read_file(hppfs->host_fd, buf, count);
++		if(count > 0)
++			*ppos += count;
++	}
++	else count = read_proc(&hppfs->proc_file, buf, count, ppos, 1);
++
++	return(count);
++}
++
++static ssize_t hppfs_write(struct file *file, const char *buf, size_t len, 
++			   loff_t *ppos)
++{
++	struct hppfs_private *data = file->private_data;
++	struct file *proc_file = &data->proc_file;
++	ssize_t (*write)(struct file *, const char *, size_t, loff_t *);
++	int err;
++
++	write = proc_file->f_dentry->d_inode->i_fop->write;
++
++	proc_file->f_pos = file->f_pos;
++	err = (*write)(proc_file, buf, len, &proc_file->f_pos);
++	file->f_pos = proc_file->f_pos;
++
++	return(err);
++}
++
++static int open_host_sock(char *host_file, int *filter_out)
++{
++	char *end;
++	int fd;
++
++	end = &host_file[strlen(host_file)];
++	strcpy(end, "/rw");
++	*filter_out = 1;
++	fd = os_connect_socket(host_file);
++	if(fd > 0)
++		return(fd);
++
++	strcpy(end, "/r");
++	*filter_out = 0;
++	fd = os_connect_socket(host_file);
++	return(fd);
++}
++
++static void free_contents(struct hppfs_data *head)
++{
++	struct hppfs_data *data;
++	struct list_head *ele, *next;
++
++	if(head == NULL) return;
++
++	list_for_each_safe(ele, next, &head->list){
++		data = list_entry(ele, struct hppfs_data, list);
++		kfree(data);
++	}
++	kfree(head);
++}
++
++static struct hppfs_data *hppfs_get_data(int fd, int filter, 
++					 struct file *proc_file, 
++					 struct file *hppfs_file, 
++					 loff_t *size_out)
++{
++	struct hppfs_data *data, *new, *head;
++	int n, err;
++
++	err = -ENOMEM;
++	data = kmalloc(sizeof(*data), GFP_KERNEL);
++	if(data == NULL){
++		printk("hppfs_get_data : head allocation failed\n");
++		goto failed;
++	}
++
++	INIT_LIST_HEAD(&data->list);
++
++	head = data;
++	*size_out = 0;
++
++	if(filter){
++		while((n = read_proc(proc_file, data->contents,
++				     sizeof(data->contents), NULL, 0)) > 0)
++			os_write_file(fd, data->contents, n);
++		err = os_shutdown_socket(fd, 0, 1);
++		if(err){
++			printk("hppfs_get_data : failed to shut down "
++			       "socket\n");
++			goto failed_free;
++		}
++	}
++	while(1){
++		n = os_read_file(fd, data->contents, sizeof(data->contents));
++		if(n < 0){
++			err = n;
++			printk("hppfs_get_data : read failed, errno = %d\n",
++			       err);
++			goto failed_free;
++		}
++		else if(n == 0)
++			break;
++
++		*size_out += n;
++
++		if(n < sizeof(data->contents))
++			break;
++
++		new = kmalloc(sizeof(*data), GFP_KERNEL);
++		if(new == 0){
++			printk("hppfs_get_data : data allocation failed\n");
++			err = -ENOMEM;
++			goto failed_free;
++		}
++	
++		INIT_LIST_HEAD(&new->list);
++		list_add(&new->list, &data->list);
++		data = new;
++	}
++	return(head);
++
++ failed_free:
++	free_contents(head);
++ failed:		
++	return(ERR_PTR(err));
++}
++
++static struct hppfs_private *hppfs_data(void)
++{
++	struct hppfs_private *data;
++
++	data = kmalloc(sizeof(*data), GFP_KERNEL);
++	if(data == NULL)
++		return(data);
++
++	*data = ((struct hppfs_private ) { .host_fd  		= -1,
++					   .len  		= -1,
++					   .contents 		= NULL } );
++	return(data);
++}
++
++static int file_mode(int fmode)
++{
++	if(fmode == (FMODE_READ | FMODE_WRITE))
++		return(O_RDWR);
++	if(fmode == FMODE_READ)
++		return(O_RDONLY);
++	if(fmode == FMODE_WRITE)
++		return(O_WRONLY);
++	return(0);
++}
++
++static int hppfs_open(struct inode *inode, struct file *file)
++{
++	struct hppfs_private *data;
++	struct dentry *proc_dentry;
++	char *host_file;
++	int err, fd, type, filter;
++
++	err = -ENOMEM;
++	data = hppfs_data();
++	if(data == NULL)
++		goto out;
++
++	host_file = dentry_name(file->f_dentry, strlen("/rw"));
++	if(host_file == NULL)
++		goto out_free2;
++
++	proc_dentry = HPPFS_I(inode)->proc_dentry;
++
++	/* XXX This isn't closed anywhere */
++	err = open_private_file(&data->proc_file, proc_dentry, 
++				file_mode(file->f_mode));
++	if(err)
++		goto out_free1;
++
++	type = os_file_type(host_file);
++	if(type == OS_TYPE_FILE){
++		fd = os_open_file(host_file, of_read(OPENFLAGS()), 0);
++		if(fd >= 0) 
++			data->host_fd = fd;
++		else printk("hppfs_open : failed to open '%s', errno = %d\n",
++			    host_file, -fd);
++
++		data->contents = NULL;
++	}
++	else if(type == OS_TYPE_DIR){
++		fd = open_host_sock(host_file, &filter);
++		if(fd > 0){
++			data->contents = hppfs_get_data(fd, filter, 
++							&data->proc_file, 
++							file, &data->len);
++			if(!IS_ERR(data->contents))
++				data->host_fd = fd;
++		}
++		else printk("hppfs_open : failed to open a socket in "
++			    "'%s', errno = %d\n", host_file, -fd);
++	}
++	kfree(host_file);
++
++	file->private_data = data;
++	return(0);
++
++ out_free1:
++	kfree(host_file);
++ out_free2:
++	free_contents(data->contents);
++	kfree(data);
++ out:
++	return(err);
++}
++
++static int hppfs_dir_open(struct inode *inode, struct file *file)
++{
++	struct hppfs_private *data;
++	struct dentry *proc_dentry;
++	int err;
++
++	err = -ENOMEM;
++	data = hppfs_data();
++	if(data == NULL)
++		goto out;
++
++	proc_dentry = HPPFS_I(inode)->proc_dentry;
++	err = open_private_file(&data->proc_file, proc_dentry, 
++				file_mode(file->f_mode));
++	if(err)
++		goto out_free;
++
++	file->private_data = data;
++	return(0);
++
++ out_free:
++	kfree(data);
++ out:
++	return(err);
++}
++
++static loff_t hppfs_llseek(struct file *file, loff_t off, int where)
++{
++	struct hppfs_private *data = file->private_data;
++	struct file *proc_file = &data->proc_file;
++	loff_t (*llseek)(struct file *, loff_t, int);
++	loff_t ret;
++
++	llseek = proc_file->f_dentry->d_inode->i_fop->llseek;
++	if(llseek != NULL){
++		ret = (*llseek)(proc_file, off, where);
++		if(ret < 0)
++			return(ret);
++	}
++
++	return(default_llseek(file, off, where));
++}
++
++static struct file_operations hppfs_file_fops = {
++	.owner		= NULL,
++	.llseek		= hppfs_llseek,
++	.read		= hppfs_read,
++	.write		= hppfs_write,
++	.open		= hppfs_open,
++};
++
++struct hppfs_dirent {
++	void *vfs_dirent;
++	filldir_t filldir;
++	struct dentry *dentry;
++};
++
++static int hppfs_filldir(void *d, const char *name, int size, 
++			 loff_t offset, ino_t inode, unsigned int type)
++{
++	struct hppfs_dirent *dirent = d;
++
++	if(file_removed(dirent->dentry, name))
++		return(0);
++
++	return((*dirent->filldir)(dirent->vfs_dirent, name, size, offset, 
++				  inode, type));
++}
++
++static int hppfs_readdir(struct file *file, void *ent, filldir_t filldir)
++{
++	struct hppfs_private *data = file->private_data;
++	struct file *proc_file = &data->proc_file;
++	int (*readdir)(struct file *, void *, filldir_t);
++	struct hppfs_dirent dirent = ((struct hppfs_dirent)
++		                      { .vfs_dirent  	= ent,
++					.filldir 	= filldir,
++					.dentry  	= file->f_dentry } );
++	int err;
++
++	readdir = proc_file->f_dentry->d_inode->i_fop->readdir;
++
++	proc_file->f_pos = file->f_pos;
++	err = (*readdir)(proc_file, &dirent, hppfs_filldir);
++	file->f_pos = proc_file->f_pos;
++
++	return(err);
++}
++
++static int hppfs_fsync(struct file *file, struct dentry *dentry, int datasync)
++{
++	return(0);
++}
++
++static struct file_operations hppfs_dir_fops = {
++	.owner		= NULL,
++	.readdir	= hppfs_readdir,
++	.open		= hppfs_dir_open,
++	.fsync		= hppfs_fsync,
++};
++
++static int hppfs_statfs(struct super_block *sb, struct kstatfs *sf)
++{
++	sf->f_blocks = 0;
++	sf->f_bfree = 0;
++	sf->f_bavail = 0;
++	sf->f_files = 0;
++	sf->f_ffree = 0;
++	sf->f_type = HPPFS_SUPER_MAGIC;
++	return(0);
++}
++
++static struct inode *hppfs_alloc_inode(struct super_block *sb)
++{
++	struct hppfs_inode_info *hi;
++
++	hi = kmalloc(sizeof(*hi), GFP_KERNEL);
++	if(hi == NULL) 
++		return(NULL);
++
++	*hi = ((struct hppfs_inode_info) { .proc_dentry	= NULL });
++	inode_init_once(&hi->vfs_inode);
++	return(&hi->vfs_inode);
++}
++
++void hppfs_delete_inode(struct inode *ino)
++{
++	clear_inode(ino);
++}
++
++static void hppfs_destroy_inode(struct inode *inode)
++{
++	kfree(HPPFS_I(inode));
++}
++
++static struct super_operations hppfs_sbops = { 
++	.alloc_inode	= hppfs_alloc_inode,
++	.destroy_inode	= hppfs_destroy_inode,
++	.read_inode	= hppfs_read_inode,
++	.delete_inode	= hppfs_delete_inode,
++	.statfs		= hppfs_statfs,
++};
++
++static int hppfs_readlink(struct dentry *dentry, char *buffer, int buflen)
++{
++	struct file proc_file;
++	struct dentry *proc_dentry;
++	int (*readlink)(struct dentry *, char *, int);
++	int err, n;
++
++	proc_dentry = HPPFS_I(dentry->d_inode)->proc_dentry;
++	err = open_private_file(&proc_file, proc_dentry, O_RDONLY);
++	if(err) 
++		return(err);
++
++	readlink = proc_dentry->d_inode->i_op->readlink;
++	n = (*readlink)(proc_dentry, buffer, buflen);
++
++	close_private_file(&proc_file);
++	
++	return(n);
++}
++
++static int hppfs_follow_link(struct dentry *dentry, struct nameidata *nd)
++{
++	struct file proc_file;
++	struct dentry *proc_dentry;
++	int (*follow_link)(struct dentry *, struct nameidata *);
++	int err, n;
++
++	proc_dentry = HPPFS_I(dentry->d_inode)->proc_dentry;
++	err = open_private_file(&proc_file, proc_dentry, O_RDONLY);
++	if(err) 
++		return(err);
++
++	follow_link = proc_dentry->d_inode->i_op->follow_link;
++	n = (*follow_link)(proc_dentry, nd);
++
++	close_private_file(&proc_file);
++	
++	return(n);
++}
++
++static struct inode_operations hppfs_dir_iops = {
++	.lookup		= hppfs_lookup,
++};
++
++static struct inode_operations hppfs_link_iops = {
++	.readlink	= hppfs_readlink,
++	.follow_link	= hppfs_follow_link,
++};
++
++static int init_inode(struct inode *inode, struct dentry *dentry)
++{
++	if(S_ISDIR(dentry->d_inode->i_mode)){
++		inode->i_op = &hppfs_dir_iops;
++		inode->i_fop = &hppfs_dir_fops;
++	}
++	else if(S_ISLNK(dentry->d_inode->i_mode)){
++		inode->i_op = &hppfs_link_iops;
++		inode->i_fop = &hppfs_file_fops;
++	}
++	else {
++		inode->i_op = &hppfs_file_iops;
++		inode->i_fop = &hppfs_file_fops;
++	}
++
++	HPPFS_I(inode)->proc_dentry = dentry;
++
++	return(0);
++}
++
++static int hppfs_fill_super(struct super_block *sb, void *d, int silent)
++{
++	struct inode *root_inode;
++	struct file_system_type *procfs;
++	struct super_block *proc_sb;
++	int err;
++
++	err = -ENOENT;
++	procfs = get_fs_type("proc");
++	if(procfs == NULL) 
++		goto out;
++
++	if(list_empty(&procfs->fs_supers))
++		goto out;
++
++	proc_sb = list_entry(procfs->fs_supers.next, struct super_block,
++			     s_instances);
++	
++	sb->s_blocksize = 1024;
++	sb->s_blocksize_bits = 10;
++	sb->s_magic = HPPFS_SUPER_MAGIC;
++	sb->s_op = &hppfs_sbops;
++
++	root_inode = iget(sb, 0);
++	if(root_inode == NULL)
++		goto out;
++
++	err = init_inode(root_inode, proc_sb->s_root);
++	if(err)
++		goto out_put;
++
++	err = -ENOMEM;
++	sb->s_root = d_alloc_root(root_inode);
++	if(sb->s_root == NULL)
++		goto out_put;
++
++	hppfs_read_inode(root_inode);
++
++	return(0);
++
++ out_put:
++	iput(root_inode);
++ out:
++	return(err);
++}
++
++static struct super_block *hppfs_read_super(struct file_system_type *type,
++					     int flags, const char *dev_name,
++					     void *data)
++{
++	return(get_sb_nodev(type, flags, data, hppfs_fill_super));
++}
++
++static struct file_system_type hppfs_type = {
++	.owner 		= THIS_MODULE,
++	.name 		= "hppfs",
++	.get_sb 	= hppfs_read_super,
++	.kill_sb	= kill_anon_super,
++	.fs_flags 	= 0,
++};
++
++static int __init init_hppfs(void)
++{
++	return(register_filesystem(&hppfs_type));
++}
++
++static void __exit exit_hppfs(void)
++{
++	unregister_filesystem(&hppfs_type);
++}
++
++module_init(init_hppfs)
++module_exit(exit_hppfs)
++MODULE_LICENSE("GPL");
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/fs/hppfs/Makefile b/fs/hppfs/Makefile
+--- a/fs/hppfs/Makefile	1969-12-31 19:00:00.000000000 -0500
++++ b/fs/hppfs/Makefile	2004-02-11 12:27:35.000000000 -0500
+@@ -0,0 +1,19 @@
++# 
++# Copyright (C) 2002, 2003 Jeff Dike (jdike@karaya.com)
++# Licensed under the GPL
++#
++
++hppfs-objs := hppfs_kern.o
++
++obj-y = 
++obj-$(CONFIG_HPPFS) += hppfs.o
++
++clean:
++
++modules:
++
++fastdep:
++
++dep:
++
++archmrproper: clean
+diff -Naur a/fs/Makefile b/fs/Makefile
+--- a/fs/Makefile	2004-02-11 12:15:52.000000000 -0500
++++ b/fs/Makefile	2004-02-11 12:27:45.000000000 -0500
+@@ -91,3 +91,5 @@
+ obj-$(CONFIG_XFS_FS)		+= xfs/
+ obj-$(CONFIG_AFS_FS)		+= afs/
+ obj-$(CONFIG_BEFS_FS)		+= befs/
++obj-$(CONFIG_HOSTFS)		+= hostfs/
++obj-$(CONFIG_HPPFS)		+= hppfs/
+diff -Naur a/include/asm-um/archparam-i386.h b/include/asm-um/archparam-i386.h
+--- a/include/asm-um/archparam-i386.h	2004-02-11 12:16:32.000000000 -0500
++++ b/include/asm-um/archparam-i386.h	2004-02-11 12:28:31.000000000 -0500
+@@ -1,5 +1,5 @@
+ /* 
+- * Copyright (C) 2000, 2001 Jeff Dike (jdike@karaya.com)
++ * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
+  * Licensed under the GPL
+  */
+ 
+@@ -56,6 +56,83 @@
+ 	pr_reg[16] = PT_REGS_SS(regs);		\
+ } while(0);
+ 
++#if 0 /* Turn this back on when UML has VSYSCALL working */
++#define VSYSCALL_BASE	(__fix_to_virt(FIX_VSYSCALL))
++#else
++#define VSYSCALL_BASE	NULL
++#endif
++
++#define VSYSCALL_EHDR	((const struct elfhdr *) VSYSCALL_BASE)
++#define VSYSCALL_ENTRY	((unsigned long) &__kernel_vsyscall)
++extern void *__kernel_vsyscall;
++
++/*
++ * Architecture-neutral AT_ values in 0-17, leave some room
++ * for more of them, start the x86-specific ones at 32.
++ */
++#define AT_SYSINFO		32
++#define AT_SYSINFO_EHDR		33
++
++#define ARCH_DLINFO						\
++do {								\
++		NEW_AUX_ENT(AT_SYSINFO,	VSYSCALL_ENTRY);	\
++		NEW_AUX_ENT(AT_SYSINFO_EHDR, VSYSCALL_BASE);	\
++} while (0)
++
++/*
++ * These macros parameterize elf_core_dump in fs/binfmt_elf.c to write out
++ * extra segments containing the vsyscall DSO contents.  Dumping its
++ * contents makes post-mortem fully interpretable later without matching up
++ * the same kernel and hardware config to see what PC values meant.
++ * Dumping its extra ELF program headers includes all the other information
++ * a debugger needs to easily find how the vsyscall DSO was being used.
++ */
++#define ELF_CORE_EXTRA_PHDRS		(VSYSCALL_EHDR->e_phnum)
++#define ELF_CORE_WRITE_EXTRA_PHDRS					      \
++do {									      \
++	const struct elf_phdr *const vsyscall_phdrs =			      \
++		(const struct elf_phdr *) (VSYSCALL_BASE		      \
++					   + VSYSCALL_EHDR->e_phoff);	      \
++	int i;								      \
++	Elf32_Off ofs = 0;						      \
++	for (i = 0; i < VSYSCALL_EHDR->e_phnum; ++i) {			      \
++		struct elf_phdr phdr = vsyscall_phdrs[i];		      \
++		if (phdr.p_type == PT_LOAD) {				      \
++			ofs = phdr.p_offset = offset;			      \
++			offset += phdr.p_filesz;			      \
++		}							      \
++		else							      \
++			phdr.p_offset += ofs;				      \
++		phdr.p_paddr = 0; /* match other core phdrs */		      \
++		DUMP_WRITE(&phdr, sizeof(phdr));			      \
++	}								      \
++} while (0)
++#define ELF_CORE_WRITE_EXTRA_DATA					      \
++do {									      \
++	const struct elf_phdr *const vsyscall_phdrs =			      \
++		(const struct elf_phdr *) (VSYSCALL_BASE		      \
++					   + VSYSCALL_EHDR->e_phoff);	      \
++	int i;								      \
++	for (i = 0; i < VSYSCALL_EHDR->e_phnum; ++i) {			      \
++		if (vsyscall_phdrs[i].p_type == PT_LOAD)		      \
++			DUMP_WRITE((void *) vsyscall_phdrs[i].p_vaddr,	      \
++				   vsyscall_phdrs[i].p_filesz);		      \
++	}								      \
++} while (0)
++
++#define R_386_NONE	0
++#define R_386_32	1
++#define R_386_PC32	2
++#define R_386_GOT32	3
++#define R_386_PLT32	4
++#define R_386_COPY	5
++#define R_386_GLOB_DAT	6
++#define R_386_JMP_SLOT	7
++#define R_386_RELATIVE	8
++#define R_386_GOTOFF	9
++#define R_386_GOTPC	10
++#define R_386_NUM	11
++
+ /********* Bits for asm-um/delay.h **********/
+ 
+ typedef unsigned long um_udelay_t;
+diff -Naur a/include/asm-um/common.lds.S b/include/asm-um/common.lds.S
+--- a/include/asm-um/common.lds.S	2004-02-11 12:14:28.000000000 -0500
++++ b/include/asm-um/common.lds.S	2004-02-11 12:26:11.000000000 -0500
+@@ -1,3 +1,5 @@
++#include <asm-generic/vmlinux.lds.h>
++
+   .fini      : { *(.fini)    } =0x9090
+   _etext = .;
+   PROVIDE (etext = .);
+@@ -13,18 +15,6 @@
+ 
+   RODATA
+ 
+-  __start___ksymtab = .;	/* Kernel symbol table */
+-  __ksymtab : { *(__ksymtab) }
+-  __stop___ksymtab = .;
+-
+-  __start___gpl_ksymtab = .;	/* Kernel symbol table:	GPL-only symbols */
+-  __gpl_ksymtab : { *(__gpl_ksymtab) }
+-  __stop___gpl_ksymtab = .;
+-
+-  __start___kallsyms = .;       /* All kernel symbols */
+-  __kallsyms : { *(__kallsyms) }
+-  __stop___kallsyms = .;
+-
+   .unprotected : { *(.unprotected) }
+   . = ALIGN(4096);
+   PROVIDE (_unprotected_end = .);
+@@ -67,11 +57,17 @@
+   }
+   __initcall_end = .;
+ 
++  __con_initcall_start = .;
++  .con_initcall.init : { *(.con_initcall.init) }
++  __con_initcall_end = .;
++
+   __uml_initcall_start = .;
+   .uml.initcall.init : { *(.uml.initcall.init) }
+   __uml_initcall_end = .;
+   __init_end = .;
+ 
++  SECURITY_INIT
++
+   __exitcall_begin = .;
+   .exitcall : { *(.exitcall.exit) }
+   __exitcall_end = .;
+@@ -80,7 +76,33 @@
+   .uml.exitcall : { *(.uml.exitcall.exit) }
+   __uml_exitcall_end = .;
+ 
+-  . = ALIGN(4096);
++  . = ALIGN(4);
++  __alt_instructions = .;
++  .altinstructions : { *(.altinstructions) } 
++  __alt_instructions_end = .; 
++  .altinstr_replacement : { *(.altinstr_replacement) } 
++  /* .exit.text is discard at runtime, not link time, to deal with references
++     from .altinstructions and .eh_frame */
++  .exit.text : { *(.exit.text) }
++  .exit.data : { *(.exit.data) }
++ 
++  __preinit_array_start = .;
++  .preinit_array : { *(.preinit_array) }
++  __preinit_array_end = .;
++  __init_array_start = .;
++  .init_array : { *(.init_array) }
++  __init_array_end = .;
++  __fini_array_start = .;
++  .fini_array : { *(.fini_array) }
++  __fini_array_end = .;
++
++   . = ALIGN(4096);
+   __initramfs_start = .;
+   .init.ramfs : { *(.init.ramfs) }
+   __initramfs_end = .;
++
++  /* Sections to be discarded */
++  /DISCARD/ : {
++ 	*(.exitcall.exit)
++  }
++ 
+diff -Naur a/include/asm-um/cpufeature.h b/include/asm-um/cpufeature.h
+--- a/include/asm-um/cpufeature.h	1969-12-31 19:00:00.000000000 -0500
++++ b/include/asm-um/cpufeature.h	2004-02-11 12:25:42.000000000 -0500
+@@ -0,0 +1,6 @@
++#ifndef __UM_CPUFEATURE_H
++#define __UM_CPUFEATURE_H
++
++#include "asm/arch/cpufeature.h"
++
++#endif
+diff -Naur a/include/asm-um/current.h b/include/asm-um/current.h
+--- a/include/asm-um/current.h	2004-02-11 12:14:18.000000000 -0500
++++ b/include/asm-um/current.h	2004-02-11 12:26:01.000000000 -0500
+@@ -16,8 +16,10 @@
+ #define CURRENT_THREAD(dummy) (((unsigned long) &dummy) & \
+ 			        (PAGE_MASK << CONFIG_KERNEL_STACK_ORDER))
+ 
+-#define current ({ int dummy; \
+-                   ((struct thread_info *) CURRENT_THREAD(dummy))->task; })
++#define current_thread \
++	({ int dummy; ((struct thread_info *) CURRENT_THREAD(dummy)); })
++
++#define current (current_thread->task)
+ 
+ #endif /* __ASSEMBLY__ */
+ 
+diff -Naur a/include/asm-um/elf.h b/include/asm-um/elf.h
+--- a/include/asm-um/elf.h	2004-02-11 12:16:01.000000000 -0500
++++ b/include/asm-um/elf.h	2004-02-11 12:27:55.000000000 -0500
+@@ -15,4 +15,17 @@
+ 
+ #define USE_ELF_CORE_DUMP
+ 
++#define R_386_NONE	0
++#define R_386_32	1
++#define R_386_PC32	2
++#define R_386_GOT32	3
++#define R_386_PLT32	4
++#define R_386_COPY	5
++#define R_386_GLOB_DAT	6
++#define R_386_JMP_SLOT	7
++#define R_386_RELATIVE	8
++#define R_386_GOTOFF	9
++#define R_386_GOTPC	10
++#define R_386_NUM	11
++
+ #endif
+diff -Naur a/include/asm-um/fixmap.h b/include/asm-um/fixmap.h
+--- a/include/asm-um/fixmap.h	2004-02-11 12:16:42.000000000 -0500
++++ b/include/asm-um/fixmap.h	2004-02-11 12:28:41.000000000 -0500
+@@ -34,6 +34,7 @@
+ 	FIX_KMAP_BEGIN,	/* reserved pte's for temporary kernel mappings */
+ 	FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,
+ #endif
++	FIX_VSYSCALL,
+ 	__end_of_fixed_addresses
+ };
+ 
+@@ -63,6 +64,13 @@
+ #define __fix_to_virt(x)	(FIXADDR_TOP - ((x) << PAGE_SHIFT))
+ #define __virt_to_fix(x)      ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT)
+ 
++/*
++ * This is the range that is readable by user mode, and things
++ * acting like user mode such as get_user_pages.
++ */
++#define FIXADDR_USER_START	(__fix_to_virt(FIX_VSYSCALL))
++#define FIXADDR_USER_END	(FIXADDR_USER_START + PAGE_SIZE)
++
+ extern void __this_fixmap_does_not_exist(void);
+ 
+ /*
+diff -Naur a/include/asm-um/irq.h b/include/asm-um/irq.h
+--- a/include/asm-um/irq.h	2004-02-11 12:17:06.000000000 -0500
++++ b/include/asm-um/irq.h	2004-02-11 12:29:07.000000000 -0500
+@@ -1,15 +1,6 @@
+ #ifndef __UM_IRQ_H
+ #define __UM_IRQ_H
+ 
+-/* The i386 irq.h has a struct task_struct in a prototype without including
+- * sched.h.  This forward declaration kills the resulting warning.
+- */
+-struct task_struct;
+-
+-#include "asm/ptrace.h"
+-
+-#undef NR_IRQS
+-
+ #define TIMER_IRQ		0
+ #define UMN_IRQ			1
+ #define CONSOLE_IRQ		2
+@@ -28,8 +19,4 @@
+ #define LAST_IRQ XTERM_IRQ
+ #define NR_IRQS (LAST_IRQ + 1)
+ 
+-extern int um_request_irq(unsigned int irq, int fd, int type,
+-			  void (*handler)(int, void *, struct pt_regs *),
+-			  unsigned long irqflags,  const char * devname,
+-			  void *dev_id);
+ #endif
+diff -Naur a/include/asm-um/local.h b/include/asm-um/local.h
+--- a/include/asm-um/local.h	1969-12-31 19:00:00.000000000 -0500
++++ b/include/asm-um/local.h	2004-02-11 12:27:52.000000000 -0500
+@@ -0,0 +1,6 @@
++#ifndef __UM_LOCAL_H
++#define __UM_LOCAL_H
++
++#include "asm/arch/local.h"
++
++#endif
+diff -Naur a/include/asm-um/module-generic.h b/include/asm-um/module-generic.h
+--- a/include/asm-um/module-generic.h	1969-12-31 19:00:00.000000000 -0500
++++ b/include/asm-um/module-generic.h	2004-02-11 12:27:42.000000000 -0500
+@@ -0,0 +1,6 @@
++#ifndef __UM_MODULE_GENERIC_H
++#define __UM_MODULE_GENERIC_H
++
++#include "asm/arch/module.h"
++
++#endif
+diff -Naur a/include/asm-um/module-i386.h b/include/asm-um/module-i386.h
+--- a/include/asm-um/module-i386.h	1969-12-31 19:00:00.000000000 -0500
++++ b/include/asm-um/module-i386.h	2004-02-11 12:27:42.000000000 -0500
+@@ -0,0 +1,13 @@
++#ifndef __UM_MODULE_I386_H
++#define __UM_MODULE_I386_H
++
++/* UML is simple */
++struct mod_arch_specific
++{
++};
++
++#define Elf_Shdr Elf32_Shdr
++#define Elf_Sym Elf32_Sym
++#define Elf_Ehdr Elf32_Ehdr
++
++#endif
+diff -Naur a/include/asm-um/page.h b/include/asm-um/page.h
+--- a/include/asm-um/page.h	2004-02-11 12:15:52.000000000 -0500
++++ b/include/asm-um/page.h	2004-02-11 12:27:45.000000000 -0500
+@@ -1,10 +1,14 @@
++/* 
++ *  Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
++ * Licensed under the GPL
++ */
++
+ #ifndef __UM_PAGE_H
+ #define __UM_PAGE_H
+ 
+ struct page;
+ 
+ #include "asm/arch/page.h"
+-#include "asm/bug.h"
+ 
+ #undef __pa
+ #undef __va
+@@ -24,25 +28,36 @@
+ 
+ #define __va_space (8*1024*1024)
+ 
+-extern unsigned long region_pa(void *virt);
+-extern void *region_va(unsigned long phys);
+-
+-#define __pa(virt) region_pa((void *) (virt))
+-#define __va(phys) region_va((unsigned long) (phys))
+-
+-extern unsigned long page_to_pfn(struct page *page);
+-extern struct page *pfn_to_page(unsigned long pfn);
++extern unsigned long to_phys(void *virt);
++extern void *to_virt(unsigned long phys);
+ 
+-extern struct page *phys_to_page(unsigned long phys);
++#define __pa(virt) to_phys((void *) virt)
++#define __va(phys) to_virt((unsigned long) phys)
+ 
+-#define virt_to_page(v) (phys_to_page(__pa(v)))
++#define page_to_pfn(page) ((page) - mem_map)
++#define pfn_to_page(pfn) (mem_map + (pfn))
+ 
+-extern struct page *page_mem_map(struct page *page);
++#define phys_to_pfn(p) ((p) >> PAGE_SHIFT)
++#define pfn_to_phys(pfn) ((pfn) << PAGE_SHIFT)
+ 
+-#define pfn_valid(pfn) (page_mem_map(pfn_to_page(pfn)) != NULL)
+-#define virt_addr_valid(v) pfn_valid(__pa(v) >> PAGE_SHIFT)
++#define pfn_valid(pfn) ((pfn) < max_mapnr)
++#define virt_addr_valid(v) pfn_valid(phys_to_pfn(__pa(v)))
+ 
+ extern struct page *arch_validate(struct page *page, int mask, int order);
+ #define HAVE_ARCH_VALIDATE
+ 
++extern void arch_free_page(struct page *page, int order);
++#define HAVE_ARCH_FREE_PAGE
++
+ #endif
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
+diff -Naur a/include/asm-um/pgtable.h b/include/asm-um/pgtable.h
+--- a/include/asm-um/pgtable.h	2004-02-11 12:17:12.000000000 -0500
++++ b/include/asm-um/pgtable.h	2004-02-11 12:29:17.000000000 -0500
+@@ -12,8 +12,6 @@
+ #include "asm/page.h"
+ #include "asm/fixmap.h"
+ 
+-extern pgd_t swapper_pg_dir[1024];
+-
+ extern void *um_virt_to_phys(struct task_struct *task, unsigned long virt,
+ 			     pte_t *pte_out);
+ 
+@@ -49,6 +47,8 @@
+ #define pgd_ERROR(e) \
+         printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))
+ 
++extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
++
+ /*
+  * pgd entries used up by user/kernel:
+  */
+@@ -65,10 +65,10 @@
+  * area for the same reason. ;)
+  */
+ 
+-extern unsigned long high_physmem;
++extern unsigned long end_iomem;
+ 
+ #define VMALLOC_OFFSET	(__va_space)
+-#define VMALLOC_START	(((unsigned long) high_physmem + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
++#define VMALLOC_START	((end_iomem + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
+ 
+ #ifdef CONFIG_HIGHMEM
+ # define VMALLOC_END	(PKMAP_BASE-2*PAGE_SIZE)
+@@ -78,12 +78,13 @@
+ 
+ #define _PAGE_PRESENT	0x001
+ #define _PAGE_NEWPAGE	0x002
+-#define _PAGE_PROTNONE	0x004	/* If not present */
+-#define _PAGE_RW	0x008
+-#define _PAGE_USER	0x010
+-#define _PAGE_ACCESSED	0x020
+-#define _PAGE_DIRTY	0x040
+-#define _PAGE_NEWPROT   0x080
++#define _PAGE_NEWPROT   0x004
++#define _PAGE_FILE	0x008   /* set:pagecache unset:swap */
++#define _PAGE_PROTNONE	0x010	/* If not present */
++#define _PAGE_RW	0x020
++#define _PAGE_USER	0x040
++#define _PAGE_ACCESSED	0x080
++#define _PAGE_DIRTY	0x100
+ 
+ #define REGION_MASK	0xf0000000
+ #define REGION_SHIFT	28
+@@ -143,7 +144,8 @@
+ 
+ #define BAD_PAGETABLE __bad_pagetable()
+ #define BAD_PAGE __bad_page()
+-#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
++
++#define ZERO_PAGE(vaddr) virt_to_page(empty_zero_page)
+ 
+ /* number of bits that fit into a memory pointer */
+ #define BITS_PER_PTR			(8*sizeof(unsigned long))
+@@ -164,9 +166,6 @@
+ 
+ #define pte_clear(xp)	do { pte_val(*(xp)) = _PAGE_NEWPAGE; } while (0)
+ 
+-#define phys_region_index(x) (((x) & REGION_MASK) >> REGION_SHIFT)
+-#define pte_region_index(x) phys_region_index(pte_val(x))
+-
+ #define pmd_none(x)	(!(pmd_val(x) & ~_PAGE_NEWPAGE))
+ #define	pmd_bad(x)	((pmd_val(x) & (~PAGE_MASK & ~_PAGE_USER)) != _KERNPG_TABLE)
+ #define pmd_present(x)	(pmd_val(x) & _PAGE_PRESENT)
+@@ -188,19 +187,25 @@
+ 
+ #define pages_to_mb(x) ((x) >> (20-PAGE_SHIFT))
+ 
+-extern struct page *pte_mem_map(pte_t pte);
+-extern struct page *phys_mem_map(unsigned long phys);
+-extern unsigned long phys_to_pfn(unsigned long p);
+-extern unsigned long pfn_to_phys(unsigned long pfn);
+-
+-#define pte_page(x) pfn_to_page(pte_pfn(x))
+-#define pte_address(x) (__va(pte_val(x) & PAGE_MASK))
+-#define mk_phys(a, r) ((a) + (r << REGION_SHIFT))
+-#define phys_addr(p) ((p) & ~REGION_MASK)
+-#define phys_page(p) (phys_mem_map(p) + ((phys_addr(p)) >> PAGE_SHIFT))
++#define pte_page(pte) phys_to_page(pte_val(pte))
++#define pmd_page(pmd) phys_to_page(pmd_val(pmd) & PAGE_MASK)
++
+ #define pte_pfn(x) phys_to_pfn(pte_val(x))
+ #define pfn_pte(pfn, prot) __pte(pfn_to_phys(pfn) | pgprot_val(prot))
+-#define pfn_pmd(pfn, prot) __pmd(pfn_to_phys(pfn) | pgprot_val(prot))
++
++extern struct page *phys_to_page(const unsigned long phys);
++extern struct page *__virt_to_page(const unsigned long virt);
++#define virt_to_page(addr) __virt_to_page((const unsigned long) addr)
++  
++/*
++ * Bits 0 through 3 are taken
++ */
++#define PTE_FILE_MAX_BITS	28
++
++#define pte_to_pgoff(pte) ((pte).pte_low >> 4)
++
++#define pgoff_to_pte(off) \
++	((pte_t) { ((off) << 4) + _PAGE_FILE })
+ 
+ static inline pte_t pte_mknewprot(pte_t pte)
+ {
+@@ -235,6 +240,12 @@
+  * The following only work if pte_present() is true.
+  * Undefined behaviour if not..
+  */
++static inline int pte_user(pte_t pte)
++{ 
++	return((pte_val(pte) & _PAGE_USER) && 
++	       !(pte_val(pte) & _PAGE_PROTNONE));
++}
++
+ static inline int pte_read(pte_t pte)
+ { 
+ 	return((pte_val(pte) & _PAGE_USER) && 
+@@ -252,6 +263,14 @@
+ 	       !(pte_val(pte) & _PAGE_PROTNONE));
+ }
+ 
++/*
++ * The following only works if pte_present() is not true.
++ */
++static inline int pte_file(pte_t pte)
++{ 
++	return (pte).pte_low & _PAGE_FILE; 
++}
++
+ static inline int pte_dirty(pte_t pte)	{ return pte_val(pte) & _PAGE_DIRTY; }
+ static inline int pte_young(pte_t pte)	{ return pte_val(pte) & _PAGE_ACCESSED; }
+ static inline int pte_newpage(pte_t pte) { return pte_val(pte) & _PAGE_NEWPAGE; }
+@@ -334,14 +353,7 @@
+  * and a page entry and page directory to the page they refer to.
+  */
+ 
+-#define mk_pte(page, pgprot) \
+-({					\
+-	pte_t __pte;                    \
+-                                        \
+-	pte_val(__pte) = page_to_phys(page) + pgprot_val(pgprot);\
+-	if(pte_present(__pte)) pte_mknewprot(pte_mknewpage(__pte)); \
+-	__pte;                          \
+-})
++extern pte_t mk_pte(struct page *page, pgprot_t pgprot);
+ 
+ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
+ {
+@@ -351,17 +363,27 @@
+ }
+ 
+ #define pmd_page_kernel(pmd) ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
+-#define pmd_page(pmd) (phys_mem_map(pmd_val(pmd) & PAGE_MASK) + \
+-		       ((phys_addr(pmd_val(pmd)) >> PAGE_SHIFT)))
+ 
+-/* to find an entry in a page-table-directory. */
++/*
++ * the pgd page can be thought of an array like this: pgd_t[PTRS_PER_PGD]
++ *
++ * this macro returns the index of the entry in the pgd page which would
++ * control the given virtual address
++ */
+ #define pgd_index(address) ((address >> PGDIR_SHIFT) & (PTRS_PER_PGD-1))
+ 
+-/* to find an entry in a page-table-directory */
++/*
++ * pgd_offset() returns a (pgd_t *)
++ * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
++ */
+ #define pgd_offset(mm, address) \
+ ((mm)->pgd + ((address) >> PGDIR_SHIFT))
+ 
+-/* to find an entry in a kernel page-table-directory */
++
++/*
++ * a shortcut which implies the use of the kernel's pgd, instead
++ * of a process's
++ */
+ #define pgd_offset_k(address) pgd_offset(&init_mm, address)
+ 
+ #define pmd_index(address) \
+@@ -373,7 +395,12 @@
+ 	return (pmd_t *) dir;
+ }
+ 
+-/* Find an entry in the third-level page table.. */ 
++/*
++ * the pte page can be thought of an array like this: pte_t[PTRS_PER_PTE]
++ *
++ * this macro returns the index of the entry in the pte page which would
++ * control the given virtual address
++ */
+ #define pte_index(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
+ #define pte_offset_kernel(dir, address) \
+ 	((pte_t *) pmd_page_kernel(*(dir)) +  pte_index(address))
+@@ -399,11 +426,11 @@
+ #define update_mmu_cache(vma,address,pte) do ; while (0)
+ 
+ /* Encode and de-code a swap entry */
+-#define __swp_type(x)			(((x).val >> 3) & 0x7f)
+-#define __swp_offset(x)			((x).val >> 10)
++#define __swp_type(x)			(((x).val >> 4) & 0x3f)
++#define __swp_offset(x)			((x).val >> 11)
+ 
+ #define __swp_entry(type, offset) \
+-	((swp_entry_t) { ((type) << 3) | ((offset) << 10) })
++	((swp_entry_t) { ((type) << 4) | ((offset) << 11) })
+ #define __pte_to_swp_entry(pte) \
+ 	((swp_entry_t) { pte_val(pte_mkuptodate(pte)) })
+ #define __swp_entry_to_pte(x)		((pte_t) { (x).val })
+diff -Naur a/include/asm-um/processor-generic.h b/include/asm-um/processor-generic.h
+--- a/include/asm-um/processor-generic.h	2004-02-11 12:14:28.000000000 -0500
++++ b/include/asm-um/processor-generic.h	2004-02-11 12:26:10.000000000 -0500
+@@ -11,9 +11,7 @@
+ struct task_struct;
+ 
+ #include "linux/config.h"
+-#include "linux/signal.h"
+ #include "asm/ptrace.h"
+-#include "asm/siginfo.h"
+ #include "choose-mode.h"
+ 
+ struct mm_struct;
+@@ -22,23 +20,6 @@
+ 
+ #define cpu_relax()	do ; while (0)
+ 
+-#ifdef CONFIG_MODE_TT
+-struct proc_tt_mode {
+-	int extern_pid;
+-	int tracing;
+-	int switch_pipe[2];
+-	int singlestep_syscall;
+-	int vm_seq;
+-};
+-#endif
+-
+-#ifdef CONFIG_MODE_SKAS
+-struct proc_skas_mode {
+-	void *switch_buf;
+-	void *fork_buf;
+-};
+-#endif
+-
+ struct thread_struct {
+ 	int forking;
+ 	unsigned long kernel_stack;
+@@ -46,6 +27,7 @@
+ 	struct pt_regs regs;
+ 	unsigned long cr2;
+ 	int err;
++	unsigned long trap_no;
+ 	void *fault_addr;
+ 	void *fault_catcher;
+ 	struct task_struct *prev_sched;
+@@ -54,10 +36,20 @@
+ 	struct arch_thread arch;
+ 	union {
+ #ifdef CONFIG_MODE_TT
+-		struct proc_tt_mode tt;
++		struct {
++			int extern_pid;
++			int tracing;
++			int switch_pipe[2];
++			int singlestep_syscall;
++			int vm_seq;
++		} tt;
+ #endif
+ #ifdef CONFIG_MODE_SKAS
+-		struct proc_skas_mode skas;
++		struct {
++			void *switch_buf;
++			void *fork_buf;
++			int mm_count;
++		} skas;
+ #endif
+ 	} mode;
+ 	struct {
+@@ -101,14 +93,19 @@
+ } mm_segment_t;
+ 
+ extern struct task_struct *alloc_task_struct(void);
+-extern void free_task_struct(struct task_struct *task);
+ 
+ extern void release_thread(struct task_struct *);
+ extern int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags);
+ extern void dump_thread(struct pt_regs *regs, struct user *u);
++extern void prepare_to_copy(struct task_struct *tsk);
+ 
+ extern unsigned long thread_saved_pc(struct task_struct *t);
+ 
++static inline void mm_copy_segments(struct mm_struct *from_mm, 
++				    struct mm_struct *new_mm)
++{
++}
++
+ #define init_stack	(init_thread_union.stack)
+ 
+ /*
+diff -Naur a/include/asm-um/processor-i386.h b/include/asm-um/processor-i386.h
+--- a/include/asm-um/processor-i386.h	2004-02-11 12:14:17.000000000 -0500
++++ b/include/asm-um/processor-i386.h	2004-02-11 12:26:00.000000000 -0500
+@@ -6,8 +6,8 @@
+ #ifndef __UM_PROCESSOR_I386_H
+ #define __UM_PROCESSOR_I386_H
+ 
+-extern int cpu_has_xmm;
+-extern int cpu_has_cmov;
++extern int host_has_xmm;
++extern int host_has_cmov;
+ 
+ struct arch_thread {
+ 	unsigned long debugregs[8];
+diff -Naur a/include/asm-um/sections.h b/include/asm-um/sections.h
+--- a/include/asm-um/sections.h	1969-12-31 19:00:00.000000000 -0500
++++ b/include/asm-um/sections.h	2004-02-11 12:27:57.000000000 -0500
+@@ -0,0 +1,7 @@
++#ifndef _UM_SECTIONS_H
++#define _UM_SECTIONS_H
++
++/* nothing to see, move along */
++#include <asm-generic/sections.h>
++
++#endif
+diff -Naur a/include/asm-um/smp.h b/include/asm-um/smp.h
+--- a/include/asm-um/smp.h	2004-02-11 12:14:12.000000000 -0500
++++ b/include/asm-um/smp.h	2004-02-11 12:25:41.000000000 -0500
+@@ -10,7 +10,7 @@
+ 
+ extern cpumask_t cpu_online_map;
+ 
+-#define smp_processor_id() (current->thread_info->cpu)
++#define smp_processor_id() (current_thread->cpu)
+ #define cpu_logical_map(n) (n)
+ #define cpu_number_map(n) (n)
+ #define PROC_CHANGE_PENALTY	15 /* Pick a number, any number */
+diff -Naur a/include/asm-um/smplock.h b/include/asm-um/smplock.h
+--- a/include/asm-um/smplock.h	2004-02-11 12:14:27.000000000 -0500
++++ b/include/asm-um/smplock.h	1969-12-31 19:00:00.000000000 -0500
+@@ -1,6 +0,0 @@
+-#ifndef __UM_SMPLOCK_H
+-#define __UM_SMPLOCK_H
+-
+-#include "asm/arch/smplock.h"
+-
+-#endif
+diff -Naur a/include/asm-um/spinlock.h b/include/asm-um/spinlock.h
+--- a/include/asm-um/spinlock.h	2004-02-11 12:16:39.000000000 -0500
++++ b/include/asm-um/spinlock.h	1969-12-31 19:00:00.000000000 -0500
+@@ -1,10 +0,0 @@
+-#ifndef __UM_SPINLOCK_H
+-#define __UM_SPINLOCK_H
+-
+-#include "linux/config.h"
+-
+-#ifdef CONFIG_SMP
+-#include "asm/arch/spinlock.h"
+-#endif
+-
+-#endif
+diff -Naur a/include/asm-um/system-generic.h b/include/asm-um/system-generic.h
+--- a/include/asm-um/system-generic.h	2004-02-11 12:17:08.000000000 -0500
++++ b/include/asm-um/system-generic.h	2004-02-11 12:29:12.000000000 -0500
+@@ -23,8 +23,10 @@
+ extern void block_signals(void);
+ extern void unblock_signals(void);
+ 
+-#define local_save_flags(flags) do { (flags) = get_signals(); } while(0)
+-#define local_irq_restore(flags) do { set_signals(flags); } while(0)
++#define local_save_flags(flags) do { typecheck(unsigned long, flags); \
++				     (flags) = get_signals(); } while(0)
++#define local_irq_restore(flags) do { typecheck(unsigned long, flags); \
++				      set_signals(flags); } while(0)
+ 
+ #define local_irq_save(flags) do { local_save_flags(flags); \
+                                    local_irq_disable(); } while(0)
+@@ -39,4 +41,7 @@
+         (flags == 0);                   \
+ })
+ 
++extern void *_switch_to(void *prev, void *next, void *last);
++#define switch_to(prev, next, last) prev = _switch_to(prev, next, last)
++
+ #endif
+diff -Naur a/include/asm-um/thread_info.h b/include/asm-um/thread_info.h
+--- a/include/asm-um/thread_info.h	2004-02-11 12:14:39.000000000 -0500
++++ b/include/asm-um/thread_info.h	2004-02-11 12:26:45.000000000 -0500
+@@ -9,6 +9,7 @@
+ #ifndef __ASSEMBLY__
+ 
+ #include <asm/processor.h>
++#include <asm/types.h>
+ 
+ struct thread_info {
+ 	struct task_struct	*task;		/* main task structure */
+@@ -43,15 +44,18 @@
+ static inline struct thread_info *current_thread_info(void)
+ {
+ 	struct thread_info *ti;
+-	__asm__("andl %%esp,%0; ":"=r" (ti) : "0" (~16383UL));
++	unsigned long mask = PAGE_SIZE * 
++		(1 << CONFIG_KERNEL_STACK_ORDER) - 1;
++	__asm__("andl %%esp,%0; ":"=r" (ti) : "0" (~mask));
+ 	return ti;
+ }
+ 
+ /* thread information allocation */
+-#define THREAD_SIZE (4*PAGE_SIZE)
+-#define alloc_thread_info(tsk) ((struct thread_info *) \
+-	__get_free_pages(GFP_KERNEL,2))
+-#define free_thread_info(ti) free_pages((unsigned long) (ti), 2)
++#define THREAD_SIZE ((1 << CONFIG_KERNEL_STACK_ORDER) * PAGE_SIZE)
++#define alloc_thread_info(tsk) \
++	((struct thread_info *) kmalloc(THREAD_SIZE, GFP_KERNEL))
++#define free_thread_info(ti) kfree(ti)
++	
+ #define get_thread_info(ti) get_task_struct((ti)->task)
+ #define put_thread_info(ti) put_task_struct((ti)->task)
+ 
+@@ -65,11 +69,13 @@
+ #define TIF_POLLING_NRFLAG      3       /* true if poll_idle() is polling 
+ 					 * TIF_NEED_RESCHED 
+ 					 */
++#define TIF_RESTART_BLOCK 	4
+ 
+ #define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)
+ #define _TIF_SIGPENDING		(1 << TIF_SIGPENDING)
+ #define _TIF_NEED_RESCHED	(1 << TIF_NEED_RESCHED)
+ #define _TIF_POLLING_NRFLAG     (1 << TIF_POLLING_NRFLAG)
++#define _TIF_RESTART_BLOCK	(1 << TIF_RESTART_BLOCK)
+ 
+ #endif
+ 
+diff -Naur a/include/asm-um/timex.h b/include/asm-um/timex.h
+--- a/include/asm-um/timex.h	2004-02-11 12:16:00.000000000 -0500
++++ b/include/asm-um/timex.h	2004-02-11 12:27:53.000000000 -0500
+@@ -1,8 +1,6 @@
+ #ifndef __UM_TIMEX_H
+ #define __UM_TIMEX_H
+ 
+-#include "linux/time.h"
+-
+ typedef unsigned long cycles_t;
+ 
+ #define cacheflush_time (0)
+diff -Naur a/include/asm-um/uaccess.h b/include/asm-um/uaccess.h
+--- a/include/asm-um/uaccess.h	2004-02-11 12:16:04.000000000 -0500
++++ b/include/asm-um/uaccess.h	2004-02-11 12:28:00.000000000 -0500
+@@ -6,6 +6,8 @@
+ #ifndef __UM_UACCESS_H
+ #define __UM_UACCESS_H
+ 
++#include "linux/sched.h"
++
+ #define VERIFY_READ 0
+ #define VERIFY_WRITE 1
+ 
+diff -Naur a/include/asm-um/unistd.h b/include/asm-um/unistd.h
+--- a/include/asm-um/unistd.h	2004-02-11 12:16:33.000000000 -0500
++++ b/include/asm-um/unistd.h	2004-02-11 12:28:32.000000000 -0500
+@@ -33,7 +33,10 @@
+ 	set_fs(KERNEL_DS);			\
+ 	ret = sys(args);			\
+ 	set_fs(fs);				\
+-	return ret;
++	if (ret >= 0)				\
++		return ret;			\
++	errno = -(long)ret;			\
++	return -1;
+ 
+ static inline long open(const char *pathname, int flags, int mode) 
+ {
+diff -Naur a/include/linux/gfp.h b/include/linux/gfp.h
+--- a/include/linux/gfp.h	2004-02-11 12:14:33.000000000 -0500
++++ b/include/linux/gfp.h	2004-02-11 12:26:16.000000000 -0500
+@@ -63,6 +63,11 @@
+  * For the normal case of non-DISCONTIGMEM systems the NODE_DATA() gets
+  * optimized to &contig_page_data at compile-time.
+  */
++
++#ifndef HAVE_ARCH_FREE_PAGE
++static inline void arch_free_page(struct page *page, int order) { }
++#endif
++
+ extern struct page * FASTCALL(__alloc_pages(unsigned int, unsigned int, struct zonelist *));
+ static inline struct page * alloc_pages_node(int nid, unsigned int gfp_mask, unsigned int order)
+ {
+diff -Naur a/include/linux/ghash.h b/include/linux/ghash.h
+--- a/include/linux/ghash.h	1969-12-31 19:00:00.000000000 -0500
++++ b/include/linux/ghash.h	2004-02-11 12:26:13.000000000 -0500
+@@ -0,0 +1,236 @@
++/*
++ * include/linux/ghash.h -- generic hashing with fuzzy retrieval
++ *
++ * (C) 1997 Thomas Schoebel-Theuer
++ *
++ * The algorithms implemented here seem to be a completely new invention,
++ * and I'll publish the fundamentals in a paper.
++ */
++
++#ifndef _GHASH_H
++#define _GHASH_H
++/* HASHSIZE _must_ be a power of two!!! */
++
++
++#define DEF_HASH_FUZZY_STRUCTS(NAME,HASHSIZE,TYPE) \
++\
++struct NAME##_table {\
++	TYPE * hashtable[HASHSIZE];\
++	TYPE * sorted_list;\
++	int nr_entries;\
++};\
++\
++struct NAME##_ptrs {\
++	TYPE * next_hash;\
++	TYPE * prev_hash;\
++	TYPE * next_sorted;\
++	TYPE * prev_sorted;\
++};
++
++#define DEF_HASH_FUZZY(LINKAGE,NAME,HASHSIZE,TYPE,PTRS,KEYTYPE,KEY,KEYCMP,KEYEQ,HASHFN)\
++\
++LINKAGE void insert_##NAME##_hash(struct NAME##_table * tbl, TYPE * elem)\
++{\
++	int ix = HASHFN(elem->KEY);\
++	TYPE ** base = &tbl->hashtable[ix];\
++	TYPE * ptr = *base;\
++	TYPE * prev = NULL;\
++\
++	tbl->nr_entries++;\
++	while(ptr && KEYCMP(ptr->KEY, elem->KEY)) {\
++		base = &ptr->PTRS.next_hash;\
++		prev = ptr;\
++		ptr = *base;\
++	}\
++	elem->PTRS.next_hash = ptr;\
++	elem->PTRS.prev_hash = prev;\
++	if(ptr) {\
++		ptr->PTRS.prev_hash = elem;\
++	}\
++	*base = elem;\
++\
++	ptr = prev;\
++	if(!ptr) {\
++		ptr = tbl->sorted_list;\
++		prev = NULL;\
++	} else {\
++		prev = ptr->PTRS.prev_sorted;\
++	}\
++	while(ptr) {\
++		TYPE * next = ptr->PTRS.next_hash;\
++		if(next && KEYCMP(next->KEY, elem->KEY)) {\
++			prev = ptr;\
++			ptr = next;\
++		} else if(KEYCMP(ptr->KEY, elem->KEY)) {\
++			prev = ptr;\
++			ptr = ptr->PTRS.next_sorted;\
++		} else\
++			break;\
++	}\
++	elem->PTRS.next_sorted = ptr;\
++	elem->PTRS.prev_sorted = prev;\
++	if(ptr) {\
++		ptr->PTRS.prev_sorted = elem;\
++	}\
++	if(prev) {\
++		prev->PTRS.next_sorted = elem;\
++	} else {\
++		tbl->sorted_list = elem;\
++	}\
++}\
++\
++LINKAGE void remove_##NAME##_hash(struct NAME##_table * tbl, TYPE * elem)\
++{\
++	TYPE * next = elem->PTRS.next_hash;\
++	TYPE * prev = elem->PTRS.prev_hash;\
++\
++	tbl->nr_entries--;\
++	if(next)\
++		next->PTRS.prev_hash = prev;\
++	if(prev)\
++		prev->PTRS.next_hash = next;\
++	else {\
++		int ix = HASHFN(elem->KEY);\
++		tbl->hashtable[ix] = next;\
++	}\
++\
++	next = elem->PTRS.next_sorted;\
++	prev = elem->PTRS.prev_sorted;\
++	if(next)\
++		next->PTRS.prev_sorted = prev;\
++	if(prev)\
++		prev->PTRS.next_sorted = next;\
++	else\
++		tbl->sorted_list = next;\
++}\
++\
++LINKAGE TYPE * find_##NAME##_hash(struct NAME##_table * tbl, KEYTYPE pos)\
++{\
++	int ix = hashfn(pos);\
++	TYPE * ptr = tbl->hashtable[ix];\
++	while(ptr && KEYCMP(ptr->KEY, pos))\
++		ptr = ptr->PTRS.next_hash;\
++	if(ptr && !KEYEQ(ptr->KEY, pos))\
++		ptr = NULL;\
++	return ptr;\
++}\
++\
++LINKAGE TYPE * find_##NAME##_hash_fuzzy(struct NAME##_table * tbl, KEYTYPE pos)\
++{\
++	int ix;\
++	int offset;\
++	TYPE * ptr;\
++	TYPE * next;\
++\
++	ptr = tbl->sorted_list;\
++	if(!ptr || KEYCMP(pos, ptr->KEY))\
++		return NULL;\
++	ix = HASHFN(pos);\
++	offset = HASHSIZE;\
++	do {\
++		offset >>= 1;\
++		next = tbl->hashtable[(ix+offset) & ((HASHSIZE)-1)];\
++		if(next && (KEYCMP(next->KEY, pos) || KEYEQ(next->KEY, pos))\
++		   && KEYCMP(ptr->KEY, next->KEY))\
++			ptr = next;\
++	} while(offset);\
++\
++	for(;;) {\
++		next = ptr->PTRS.next_hash;\
++		if(next) {\
++			if(KEYCMP(next->KEY, pos)) {\
++				ptr = next;\
++				continue;\
++			}\
++		}\
++		next = ptr->PTRS.next_sorted;\
++		if(next && KEYCMP(next->KEY, pos)) {\
++			ptr = next;\
++			continue;\
++		}\
++		return ptr;\
++	}\
++	return NULL;\
++}
++
++/* LINKAGE - empty or "static", depending on whether you want the definitions to
++ *	be public or not
++ * NAME - a string to stick in names to make this hash table type distinct from
++ * 	any others
++ * HASHSIZE - number of buckets
++ * TYPE - type of data contained in the buckets - must be a structure, one 
++ * 	field is of type NAME_ptrs, another is the hash key
++ * PTRS - TYPE must contain a field of type NAME_ptrs, PTRS is the name of that
++ * 	field
++ * KEYTYPE - type of the key field within TYPE
++ * KEY - name of the key field within TYPE
++ * KEYCMP - pointer to function that compares KEYTYPEs to each other - the
++ * 	prototype is int KEYCMP(KEYTYPE, KEYTYPE), it returns zero for equal, 
++ * 	non-zero for not equal
++ * HASHFN - the hash function - the prototype is int HASHFN(KEYTYPE),
++ * 	it returns a number in the range 0 ... HASHSIZE - 1
++ * Call DEF_HASH_STRUCTS, define your hash table as a NAME_table, then call
++ * DEF_HASH.
++ */
++
++#define DEF_HASH_STRUCTS(NAME,HASHSIZE,TYPE) \
++\
++struct NAME##_table {\
++	TYPE * hashtable[HASHSIZE];\
++	int nr_entries;\
++};\
++\
++struct NAME##_ptrs {\
++	TYPE * next_hash;\
++	TYPE * prev_hash;\
++};
++
++#define DEF_HASH(LINKAGE,NAME,TYPE,PTRS,KEYTYPE,KEY,KEYCMP,HASHFN)\
++\
++LINKAGE void insert_##NAME##_hash(struct NAME##_table * tbl, TYPE * elem)\
++{\
++	int ix = HASHFN(elem->KEY);\
++	TYPE ** base = &tbl->hashtable[ix];\
++	TYPE * ptr = *base;\
++	TYPE * prev = NULL;\
++\
++	tbl->nr_entries++;\
++	while(ptr && KEYCMP(ptr->KEY, elem->KEY)) {\
++		base = &ptr->PTRS.next_hash;\
++		prev = ptr;\
++		ptr = *base;\
++	}\
++	elem->PTRS.next_hash = ptr;\
++	elem->PTRS.prev_hash = prev;\
++	if(ptr) {\
++		ptr->PTRS.prev_hash = elem;\
++	}\
++	*base = elem;\
++}\
++\
++LINKAGE void remove_##NAME##_hash(struct NAME##_table * tbl, TYPE * elem)\
++{\
++	TYPE * next = elem->PTRS.next_hash;\
++	TYPE * prev = elem->PTRS.prev_hash;\
++\
++	tbl->nr_entries--;\
++	if(next)\
++		next->PTRS.prev_hash = prev;\
++	if(prev)\
++		prev->PTRS.next_hash = next;\
++	else {\
++		int ix = HASHFN(elem->KEY);\
++		tbl->hashtable[ix] = next;\
++	}\
++}\
++\
++LINKAGE TYPE * find_##NAME##_hash(struct NAME##_table * tbl, KEYTYPE pos)\
++{\
++	int ix = HASHFN(pos);\
++	TYPE * ptr = tbl->hashtable[ix];\
++	while(ptr && KEYCMP(ptr->KEY, pos))\
++		ptr = ptr->PTRS.next_hash;\
++	return ptr;\
++}
++
++#endif
+diff -Naur a/include/linux/mm.h b/include/linux/mm.h
+--- a/include/linux/mm.h	2004-02-11 12:14:17.000000000 -0500
++++ b/include/linux/mm.h	2004-02-11 12:26:00.000000000 -0500
+@@ -507,6 +507,9 @@
+ 	return __set_page_dirty_buffers(page);
+ }
+ 
++extern long do_mprotect(struct mm_struct *mm, unsigned long start, 
++			size_t len, unsigned long prot);
++
+ /*
+  * On a two-level page table, this ends up being trivial. Thus the
+  * inlining and the symmetry break with pte_alloc_map() that does all
+@@ -537,9 +540,10 @@
+ 
+ extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
+ 
+-extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+-	unsigned long len, unsigned long prot,
+-	unsigned long flag, unsigned long pgoff);
++extern unsigned long do_mmap_pgoff(struct mm_struct *mm, struct file *file, 
++				   unsigned long addr, unsigned long len,
++				   unsigned long prot, unsigned long flag,
++				   unsigned long pgoff);
+ 
+ static inline unsigned long do_mmap(struct file *file, unsigned long addr,
+ 	unsigned long len, unsigned long prot,
+@@ -549,7 +553,8 @@
+ 	if ((offset + PAGE_ALIGN(len)) < offset)
+ 		goto out;
+ 	if (!(offset & ~PAGE_MASK))
+-		ret = do_mmap_pgoff(file, addr, len, prot, flag, offset >> PAGE_SHIFT);
++		ret = do_mmap_pgoff(current->mm, file, addr, len, prot, flag, 
++				    offset >> PAGE_SHIFT);
+ out:
+ 	return ret;
+ }
+diff -Naur a/include/linux/proc_mm.h b/include/linux/proc_mm.h
+--- a/include/linux/proc_mm.h	1969-12-31 19:00:00.000000000 -0500
++++ b/include/linux/proc_mm.h	2004-02-11 12:25:40.000000000 -0500
+@@ -0,0 +1,48 @@
++/* 
++ * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
++ * Licensed under the GPL
++ */
++
++#ifndef __PROC_MM_H
++#define __PROC_MM_H
++
++#include "linux/sched.h"
++
++#define MM_MMAP 54
++#define MM_MUNMAP 55
++#define MM_MPROTECT 56
++#define MM_COPY_SEGMENTS 57
++
++struct mm_mmap {
++	unsigned long addr;
++	unsigned long len;
++	unsigned long prot;
++	unsigned long flags;
++	unsigned long fd;
++	unsigned long offset;
++};
++
++struct mm_munmap {
++	unsigned long addr;
++	unsigned long len;	
++};
++
++struct mm_mprotect {
++	unsigned long addr;
++	unsigned long len;
++        unsigned int prot;
++};
++
++struct proc_mm_op {
++	int op;
++	union {
++		struct mm_mmap mmap;
++		struct mm_munmap munmap;
++	        struct mm_mprotect mprotect;
++		int copy_segments;
++	} u;
++};
++
++extern struct mm_struct *proc_mm_get_mm(int fd);
++
++#endif
+diff -Naur a/include/linux/time.h b/include/linux/time.h
+--- a/include/linux/time.h	2004-02-11 12:15:59.000000000 -0500
++++ b/include/linux/time.h	2004-02-11 12:27:52.000000000 -0500
+@@ -41,7 +41,7 @@
+  * Have the 32 bit jiffies value wrap 5 minutes after boot
+  * so jiffies wrap bugs show up earlier.
+  */
+-#define INITIAL_JIFFIES ((unsigned long)(unsigned int) (-300*HZ))
++#define INITIAL_JIFFIES ((unsigned long)(0))
+ 
+ /*
+  * Change timeval to jiffies, trying to avoid the
+diff -Naur a/mm/Makefile b/mm/Makefile
+--- a/mm/Makefile	2004-02-11 12:15:59.000000000 -0500
++++ b/mm/Makefile	2004-02-11 12:27:53.000000000 -0500
+@@ -12,3 +12,5 @@
+ 			   slab.o swap.o truncate.o vmscan.o $(mmu-y)
+ 
+ obj-$(CONFIG_SWAP)	+= page_io.o swap_state.o swapfile.o
++obj-$(CONFIG_PROC_MM)	+= proc_mm.o
++
+diff -Naur a/mm/mmap.c b/mm/mmap.c
+--- a/mm/mmap.c	2004-02-11 12:15:58.000000000 -0500
++++ b/mm/mmap.c	2004-02-11 12:27:51.000000000 -0500
+@@ -460,11 +460,11 @@
+  * The caller must hold down_write(current->mm->mmap_sem).
+  */
+ 
+-unsigned long do_mmap_pgoff(struct file * file, unsigned long addr,
+-			unsigned long len, unsigned long prot,
+-			unsigned long flags, unsigned long pgoff)
++unsigned long do_mmap_pgoff(struct mm_struct *mm, struct file * file, 
++			    unsigned long addr, unsigned long len,
++			    unsigned long prot, unsigned long flags,
++			    unsigned long pgoff)
+ {
+-	struct mm_struct * mm = current->mm;
+ 	struct vm_area_struct * vma, * prev;
+ 	struct inode *inode;
+ 	unsigned int vm_flags;
+diff -Naur a/mm/mprotect.c b/mm/mprotect.c
+--- a/mm/mprotect.c	2004-02-11 12:15:11.000000000 -0500
++++ b/mm/mprotect.c	2004-02-11 12:26:58.000000000 -0500
+@@ -222,7 +222,8 @@
+ }
+ 
+ asmlinkage long
+-sys_mprotect(unsigned long start, size_t len, unsigned long prot)
++do_mprotect(struct mm_struct *mm, unsigned long start, size_t len, 
++	     unsigned long prot)
+ {
+ 	unsigned long vm_flags, nstart, end, tmp;
+ 	struct vm_area_struct * vma, * next, * prev;
+@@ -245,9 +246,9 @@
+ 
+ 	vm_flags = calc_vm_prot_bits(prot);
+ 
+-	down_write(&current->mm->mmap_sem);
++	down_write(&mm->mmap_sem);
+ 
+-	vma = find_vma_prev(current->mm, start, &prev);
++	vma = find_vma_prev(mm, start, &prev);
+ 	error = -ENOMEM;
+ 	if (!vma)
+ 		goto out;
+@@ -326,6 +327,11 @@
+ 		prev->vm_mm->map_count--;
+ 	}
+ out:
+-	up_write(&current->mm->mmap_sem);
++	up_write(&mm->mmap_sem);
+ 	return error;
+ }
++
++asmlinkage long sys_mprotect(unsigned long start, size_t len, unsigned long prot)
++{
++        return(do_mprotect(current->mm, start, len, prot));
++}
+diff -Naur a/mm/page_alloc.c b/mm/page_alloc.c
+--- a/mm/page_alloc.c	2004-02-11 12:14:18.000000000 -0500
++++ b/mm/page_alloc.c	2004-02-11 12:26:01.000000000 -0500
+@@ -268,6 +268,8 @@
+ 	LIST_HEAD(list);
+ 	int i;
+ 
++	arch_free_page(page, order);
++
+ 	mod_page_state(pgfree, 1 << order);
+ 	for (i = 0 ; i < (1 << order) ; ++i)
+ 		free_pages_check(__FUNCTION__, page + i);
+@@ -449,6 +451,8 @@
+ 	struct per_cpu_pages *pcp;
+ 	unsigned long flags;
+ 
++	arch_free_page(page, 0);
++
+ 	kernel_map_pages(page, 1, 0);
+ 	inc_page_state(pgfree);
+ 	free_pages_check(__FUNCTION__, page);
+diff -Naur a/mm/proc_mm.c b/mm/proc_mm.c
+--- a/mm/proc_mm.c	1969-12-31 19:00:00.000000000 -0500
++++ b/mm/proc_mm.c	2004-02-11 12:27:05.000000000 -0500
+@@ -0,0 +1,174 @@
++/* 
++ * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
++ * Licensed under the GPL
++ */
++
++#include "linux/mm.h"
++#include "linux/init.h"
++#include "linux/proc_fs.h"
++#include "linux/proc_mm.h"
++#include "linux/file.h"
++#include "asm/uaccess.h"
++#include "asm/mmu_context.h"
++
++static struct file_operations proc_mm_fops;
++
++struct mm_struct *proc_mm_get_mm(int fd)
++{
++	struct mm_struct *ret = ERR_PTR(-EBADF);
++	struct file *file;
++
++	file = fget(fd);
++	if (!file)
++		goto out;
++
++	ret = ERR_PTR(-EINVAL);
++	if(file->f_op != &proc_mm_fops)
++		goto out_fput;
++
++	ret = file->private_data;
++ out_fput:
++	fput(file);
++ out:
++	return(ret);
++}
++
++extern long do_mmap2(struct mm_struct *mm, unsigned long addr, 
++		     unsigned long len, unsigned long prot, 
++		     unsigned long flags, unsigned long fd,
++		     unsigned long pgoff);
++
++static ssize_t write_proc_mm(struct file *file, const char *buffer,
++			     size_t count, loff_t *ppos)
++{
++	struct mm_struct *mm = file->private_data;
++	struct proc_mm_op req;
++	int n, ret;
++
++	if(count > sizeof(req))
++		return(-EINVAL);
++
++	n = copy_from_user(&req, buffer, count);
++	if(n != 0)
++		return(-EFAULT);
++
++	ret = count;
++	switch(req.op){
++	case MM_MMAP: {
++		struct mm_mmap *map = &req.u.mmap;
++
++		ret = do_mmap2(mm, map->addr, map->len, map->prot, 
++			       map->flags, map->fd, map->offset >> PAGE_SHIFT);
++		if((ret & ~PAGE_MASK) == 0)
++			ret = count;
++	
++		break;
++	}
++	case MM_MUNMAP: {
++		struct mm_munmap *unmap = &req.u.munmap;
++
++		down_write(&mm->mmap_sem);
++		ret = do_munmap(mm, unmap->addr, unmap->len);
++		up_write(&mm->mmap_sem);
++
++		if(ret == 0)
++			ret = count;
++		break;
++	}
++	case MM_MPROTECT: {
++		struct mm_mprotect *protect = &req.u.mprotect;
++
++		ret = do_mprotect(mm, protect->addr, protect->len, 
++				  protect->prot);
++		if(ret == 0)
++			ret = count;
++		break;
++	}
++
++	case MM_COPY_SEGMENTS: {
++		struct mm_struct *from = proc_mm_get_mm(req.u.copy_segments);
++
++		if(IS_ERR(from)){
++			ret = PTR_ERR(from);
++			break;
++		}
++
++		mm_copy_segments(from, mm);
++		break;
++	}
++	default:
++		ret = -EINVAL;
++		break;
++	}
++
++	return(ret);
++}
++
++static int open_proc_mm(struct inode *inode, struct file *file)
++{
++	struct mm_struct *mm = mm_alloc();
++	int ret;
++
++	ret = -ENOMEM;
++	if(mm == NULL)
++		goto out_mem;
++
++	ret = init_new_context(current, mm);
++	if(ret)
++		goto out_free;
++
++	spin_lock(&mmlist_lock);
++	list_add(&mm->mmlist, &current->mm->mmlist);
++	mmlist_nr++;
++	spin_unlock(&mmlist_lock);
++
++	file->private_data = mm;
++
++	return(0);
++
++ out_free:
++	mmput(mm);
++ out_mem:
++	return(ret);
++}
++
++static int release_proc_mm(struct inode *inode, struct file *file)
++{
++	struct mm_struct *mm = file->private_data;
++
++	mmput(mm);
++	return(0);
++}
++
++static struct file_operations proc_mm_fops = {
++	.open		= open_proc_mm,
++	.release	= release_proc_mm,
++	.write		= write_proc_mm,
++};
++
++static int make_proc_mm(void)
++{
++	struct proc_dir_entry *ent;
++
++	ent = create_proc_entry("mm", 0222, &proc_root);
++	if(ent == NULL){
++		printk("make_proc_mm : Failed to register /proc/mm\n");
++		return(0);
++	}
++	ent->proc_fops = &proc_mm_fops;
++
++	return(0);
++}
++
++__initcall(make_proc_mm);
++
++/*
++ * Overrides for Emacs so that we follow Linus's tabbing style.
++ * Emacs will notice this stuff at the end of the file and automatically
++ * adjust the settings for this buffer only.  This must remain at the end
++ * of the file.
++ * ---------------------------------------------------------------------------
++ * Local variables:
++ * c-file-style: "linux"
++ * End:
++ */
diff --git a/lustre/kernel_patches/patches/vfs_intent-2.4.18-18-chaos65.patch b/lustre/kernel_patches/patches/vfs_intent-2.4.18-18-chaos65.patch
index b7185b9..41c2772 100644
--- a/lustre/kernel_patches/patches/vfs_intent-2.4.18-18-chaos65.patch
+++ b/lustre/kernel_patches/patches/vfs_intent-2.4.18-18-chaos65.patch
@@ -11,57 +11,14 @@
  kernel/ksyms.c         |    1 
  11 files changed, 564 insertions(+), 126 deletions(-)
 
-Index: linux-2.4.18-p4smp/fs/dcache.c
-===================================================================
---- linux-2.4.18-p4smp.orig/fs/dcache.c	2004-02-03 01:00:10.000000000 -0500
-+++ linux-2.4.18-p4smp/fs/dcache.c	2004-03-19 16:05:42.000000000 -0500
-@@ -186,6 +186,13 @@
- 		spin_unlock(&dcache_lock);
- 		return 0;
- 	}
-+
-+	/* network invalidation by Lustre */
-+	if (dentry->d_flags & DCACHE_LUSTRE_INVALID) {
-+		spin_unlock(&dcache_lock);
-+		return 0;
-+	}
-+
- 	/*
- 	 * Check whether to do a partial shrink_dcache
- 	 * to get rid of unused child entries.
-@@ -859,13 +866,19 @@ void d_delete(struct dentry * dentry)
-  * Adds a dentry to the hash according to its name.
-  */
-  
--void d_rehash(struct dentry * entry)
-+void __d_rehash(struct dentry * entry, int lock)
- {
- 	struct list_head *list = d_hash(entry->d_parent, entry->d_name.hash);
- 	if (!list_empty(&entry->d_hash)) BUG();
--	spin_lock(&dcache_lock);
-+	if (lock) spin_lock(&dcache_lock);
- 	list_add(&entry->d_hash, list);
--	spin_unlock(&dcache_lock);
-+	if (lock) spin_unlock(&dcache_lock);
-+}
-+EXPORT_SYMBOL(__d_rehash);
-+
-+void d_rehash(struct dentry * entry)
-+{
-+	__d_rehash(entry, 1);
- }
- 
- #define do_switch(x,y) do { \
-Index: linux-2.4.18-p4smp/fs/exec.c
-===================================================================
---- linux-2.4.18-p4smp.orig/fs/exec.c	2004-02-03 01:00:10.000000000 -0500
-+++ linux-2.4.18-p4smp/fs/exec.c	2004-03-19 16:05:42.000000000 -0500
-@@ -117,8 +117,10 @@
+--- linux-2.4.18-chaos/fs/exec.c~vfs_intent-2.4.18-18-chaos65	2003-07-28 17:52:03.000000000 +0400
++++ linux-2.4.18-chaos-alexey/fs/exec.c	2003-09-14 17:25:41.000000000 +0400
+@@ -117,8 +117,10 @@ asmlinkage long sys_uselib(const char * 
  	struct file * file;
  	struct nameidata nd;
  	int error;
 +	struct lookup_intent it = { .it_op = IT_OPEN,
-+				    .it_flags = FMODE_READ|FMODE_EXEC };
++	                                     .it_flags = FMODE_READ|FMODE_EXEC };
  
 -	error = user_path_walk(library, &nd);
 +	error = user_path_walk_it(library, &nd, &it);
@@ -78,14 +35,14 @@ Index: linux-2.4.18-p4smp/fs/exec.c
  	error = PTR_ERR(file);
  	if (IS_ERR(file))
  		goto out;
-@@ -359,8 +362,10 @@ struct file *open_exec(const char *name)
+@@ -359,8 +362,9 @@ struct file *open_exec(const char *name)
  	struct inode *inode;
  	struct file *file;
  	int err = 0;
-+	struct lookup_intent it = { .it_op = IT_OPEN,
-+				    .it_flags = FMODE_READ|FMODE_EXEC };
- 
+-
 -	err = path_lookup(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd);
++	struct lookup_intent it = { .it_op = IT_OPEN,
++	                                     .it_flags = FMODE_READ|FMODE_EXEC };
 +	err = path_lookup_it(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd, &it);
  	file = ERR_PTR(err);
  	if (!err) {
@@ -117,10 +74,162 @@ Index: linux-2.4.18-p4smp/fs/exec.c
  		goto close_fail;
  
  	retval = binfmt->core_dump(signr, regs, file);
-Index: linux-2.4.18-p4smp/fs/namei.c
-===================================================================
---- linux-2.4.18-p4smp.orig/fs/namei.c	2004-02-03 01:00:10.000000000 -0500
-+++ linux-2.4.18-p4smp/fs/namei.c	2004-03-19 16:06:19.000000000 -0500
+--- linux-2.4.18-chaos/fs/dcache.c~vfs_intent-2.4.18-18-chaos65	2003-07-28 17:52:03.000000000 +0400
++++ linux-2.4.18-chaos-alexey/fs/dcache.c	2003-09-14 17:25:41.000000000 +0400
+@@ -186,6 +186,13 @@ int d_invalidate(struct dentry * dentry)
+ 		spin_unlock(&dcache_lock);
+ 		return 0;
+ 	}
++
++	/* network invalidation by Lustre */
++	if (dentry->d_flags & DCACHE_LUSTRE_INVALID) {
++		spin_unlock(&dcache_lock);
++		return 0;
++	}
++
+ 	/*
+ 	 * Check whether to do a partial shrink_dcache
+ 	 * to get rid of unused child entries.
+@@ -859,13 +866,19 @@ void d_delete(struct dentry * dentry)
+  * Adds a dentry to the hash according to its name.
+  */
+  
+-void d_rehash(struct dentry * entry)
++void __d_rehash(struct dentry * entry, int lock)
+ {
+ 	struct list_head *list = d_hash(entry->d_parent, entry->d_name.hash);
+ 	if (!list_empty(&entry->d_hash)) BUG();
+-	spin_lock(&dcache_lock);
++	if (lock) spin_lock(&dcache_lock);
+ 	list_add(&entry->d_hash, list);
+-	spin_unlock(&dcache_lock);
++	if (lock) spin_unlock(&dcache_lock);
++}
++EXPORT_SYMBOL(__d_rehash);
++
++void d_rehash(struct dentry * entry)
++{
++	__d_rehash(entry, 1);
+ }
+ 
+ #define do_switch(x,y) do { \
+--- linux-2.4.18-chaos/fs/namespace.c~vfs_intent-2.4.18-18-chaos65	2003-07-28 17:52:05.000000000 +0400
++++ linux-2.4.18-chaos-alexey/fs/namespace.c	2003-09-14 17:25:41.000000000 +0400
+@@ -99,6 +99,7 @@ static void detach_mnt(struct vfsmount *
+ {
+ 	old_nd->dentry = mnt->mnt_mountpoint;
+ 	old_nd->mnt = mnt->mnt_parent;
++	UNPIN(old_nd->dentry, old_nd->mnt, 1);
+ 	mnt->mnt_parent = mnt;
+ 	mnt->mnt_mountpoint = mnt->mnt_root;
+ 	list_del_init(&mnt->mnt_child);
+@@ -110,6 +111,7 @@ static void attach_mnt(struct vfsmount *
+ {
+ 	mnt->mnt_parent = mntget(nd->mnt);
+ 	mnt->mnt_mountpoint = dget(nd->dentry);
++	PIN(nd->dentry, nd->mnt, 1);
+ 	list_add(&mnt->mnt_hash, mount_hashtable+hash(nd->mnt, nd->dentry));
+ 	list_add(&mnt->mnt_child, &nd->mnt->mnt_mounts);
+ 	nd->dentry->d_mounted++;
+@@ -485,14 +487,17 @@ static int do_loopback(struct nameidata 
+ {
+ 	struct nameidata old_nd;
+ 	struct vfsmount *mnt = NULL;
++	struct lookup_intent it = { .it_op = IT_GETATTR };
+ 	int err = mount_is_safe(nd);
+ 	if (err)
+ 		return err;
+ 	if (!old_name || !*old_name)
+ 		return -EINVAL;
+-	err = path_lookup(old_name, LOOKUP_POSITIVE|LOOKUP_FOLLOW, &old_nd);
+-	if (err)
++	err = path_lookup_it(old_name, LOOKUP_POSITIVE|LOOKUP_FOLLOW, &old_nd, &it);
++	if (err) {
++		intent_release(&it);
+ 		return err;
++	}
+ 
+ 	down_write(&current->namespace->sem);
+ 	err = -EINVAL;
+@@ -515,6 +520,7 @@ static int do_loopback(struct nameidata 
+ 	}
+ 
+ 	up_write(&current->namespace->sem);
++	intent_release(&it);
+ 	path_release(&old_nd);
+ 	return err;
+ }
+@@ -698,6 +704,7 @@ long do_mount(char * dev_name, char * di
+ 		  unsigned long flags, void *data_page)
+ {
+ 	struct nameidata nd;
++	struct lookup_intent it = { .it_op = IT_GETATTR };
+ 	int retval = 0;
+ 	int mnt_flags = 0;
+ 
+@@ -722,10 +729,11 @@ long do_mount(char * dev_name, char * di
+ 	flags &= ~(MS_NOSUID|MS_NOEXEC|MS_NODEV);
+ 
+ 	/* ... and get the mountpoint */
+-	retval = path_lookup(dir_name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd);
+-	if (retval)
++	retval = path_lookup_it(dir_name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd, &it);
++	if (retval) {
++		intent_release(&it);
+ 		return retval;
+-
++	}
+ 	if (flags & MS_REMOUNT)
+ 		retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags,
+ 				    data_page);
+@@ -736,6 +744,8 @@ long do_mount(char * dev_name, char * di
+ 	else
+ 		retval = do_add_mount(&nd, type_page, flags, mnt_flags,
+ 				      dev_name, data_page);
++
++	intent_release(&it);
+ 	path_release(&nd);
+ 	return retval;
+ }
+@@ -901,6 +911,8 @@ asmlinkage long sys_pivot_root(const cha
+ {
+ 	struct vfsmount *tmp;
+ 	struct nameidata new_nd, old_nd, parent_nd, root_parent, user_nd;
++	struct lookup_intent new_it = { .it_op = IT_GETATTR };
++	struct lookup_intent old_it = { .it_op = IT_GETATTR };
+ 	int error;
+ 
+ 	if (!capable(CAP_SYS_ADMIN))
+@@ -908,14 +920,14 @@ asmlinkage long sys_pivot_root(const cha
+ 
+ 	lock_kernel();
+ 
+-	error = __user_walk(new_root, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &new_nd);
++	error = __user_walk_it(new_root, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &new_nd, &new_it);
+ 	if (error)
+ 		goto out0;
+ 	error = -EINVAL;
+ 	if (!check_mnt(new_nd.mnt))
+ 		goto out1;
+ 
+-	error = __user_walk(put_old, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &old_nd);
++	error = __user_walk_it(put_old, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &old_nd, &old_it);
+ 	if (error)
+ 		goto out1;
+ 
+@@ -970,8 +982,10 @@ out2:
+ 	up(&old_nd.dentry->d_inode->i_zombie);
+ 	up_write(&current->namespace->sem);
+ 	path_release(&user_nd);
++	intent_release(&old_it);
+ 	path_release(&old_nd);
+ out1:
++	intent_release(&new_it);
+ 	path_release(&new_nd);
+ out0:
+ 	unlock_kernel();
+--- linux-2.4.18-chaos/fs/namei.c~vfs_intent-2.4.18-18-chaos65	2003-07-28 17:52:05.000000000 +0400
++++ linux-2.4.18-chaos-alexey/fs/namei.c	2003-09-14 17:25:41.000000000 +0400
 @@ -94,6 +94,13 @@
   * XEmacs seems to be relying on it...
   */
@@ -282,11 +391,13 @@ Index: linux-2.4.18-p4smp/fs/namei.c
  			;
  
  		err = -ENOENT;
-@@ -549,7 +586,7 @@ int link_path_walk(const char * name, st
+@@ -548,8 +585,8 @@ int link_path_walk(const char * name, st
+ 		if (!inode->i_op)
  			goto out_dput;
  
- 		if (inode->i_op->follow_link) {
+-		if (inode->i_op->follow_link) {
 -			err = do_follow_link(dentry, nd);
++		if (inode->i_op->follow_link || inode->i_op->follow_link2) {
 +			err = do_follow_link(dentry, nd, NULL);
  			dput(dentry);
  			if (err)
@@ -300,7 +411,7 @@ Index: linux-2.4.18-p4smp/fs/namei.c
  			break;
  		continue;
  		/* here ends the main loop */
-@@ -592,22 +629,22 @@ last_component:
+@@ -592,22 +629,23 @@ last_component:
  			if (err < 0)
  				break;
  		}
@@ -321,8 +432,10 @@ Index: linux-2.4.18-p4smp/fs/namei.c
  			;
  		inode = dentry->d_inode;
  		if ((lookup_flags & LOOKUP_FOLLOW)
- 		    && inode && inode->i_op && inode->i_op->follow_link) {
+-		    && inode && inode->i_op && inode->i_op->follow_link) {
 -			err = do_follow_link(dentry, nd);
++		    && inode && inode->i_op &&
++		    (inode->i_op->follow_link || inode->i_op->follow_link2)) {
 +			err = do_follow_link(dentry, nd, it);
  			dput(dentry);
  			if (err)
@@ -337,10 +450,11 @@ Index: linux-2.4.18-p4smp/fs/namei.c
  				break;
  		}
  		goto return_base;
-@@ -645,6 +684,27 @@ return_reval:
+@@ -645,7 +684,26 @@ return_reval:
  		 * Check the cached dentry for staleness.
  		 */
  		dentry = nd->dentry;
+-		if (dentry && dentry->d_op && dentry->d_op->d_revalidate) {
 +		if (dentry && dentry->d_op && dentry->d_op->d_revalidate_it) {
 +			err = -ESTALE;
 +			if (!dentry->d_op->d_revalidate_it(dentry, 0, it)) {
@@ -350,21 +464,20 @@ Index: linux-2.4.18-p4smp/fs/namei.c
 +				if (err)
 +					break;
 +				new = real_lookup(dentry->d_parent,
-+						  &dentry->d_name, 0, it);
++						  &dentry->d_name, 0, NULL);
++				d_invalidate(dentry);
++				dput(dentry);
 +				if (IS_ERR(new)) {
 +					err = PTR_ERR(new);
 +					break;
 +				}
-+				d_invalidate(dentry);
-+				dput(dentry);
 +				nd->dentry = new;
 +			}
-+			if (!nd->dentry->d_inode)
-+				goto no_inode;
-+		} else
- 		if (dentry && dentry->d_op && dentry->d_op->d_revalidate) {
++		}
++		else if (dentry && dentry->d_op && dentry->d_op->d_revalidate){
  			err = -ESTALE;
  			if (!dentry->d_op->d_revalidate(dentry, 0)) {
+ 				d_invalidate(dentry);
 @@ -658,15 +716,28 @@ out_dput:
  		dput(dentry);
  		break;
@@ -673,16 +786,12 @@ Index: linux-2.4.18-p4smp/fs/namei.c
  	if (IS_ERR(dentry))
  		goto fail;
  	if (!is_dir && nd->last.name[nd->last.len] && !dentry->d_inode)
-@@ -1267,7 +1423,20 @@ asmlinkage long sys_mknod(const char * f
+@@ -1267,7 +1423,16 @@ asmlinkage long sys_mknod(const char * f
  	error = path_lookup(tmp, LOOKUP_PARENT, &nd);
  	if (error)
  		goto out;
 -	dentry = lookup_create(&nd, 0);
 +
-+	if (nd.last_type != LAST_NORM) {
-+		error = -EEXIST;
-+		goto out2;
-+	}
 +	if (nd.dentry->d_inode->i_op->mknod_raw) {
 +		struct inode_operations *op = nd.dentry->d_inode->i_op;
 +		error = op->mknod_raw(&nd, mode, dev);
@@ -703,15 +812,11 @@ Index: linux-2.4.18-p4smp/fs/namei.c
  	path_release(&nd);
  out:
  	putname(tmp);
-@@ -1335,7 +1501,18 @@ asmlinkage long sys_mkdir(const char * p
+@@ -1335,7 +1501,14 @@ asmlinkage long sys_mkdir(const char * p
  		error = path_lookup(tmp, LOOKUP_PARENT, &nd);
  		if (error)
  			goto out;
 -		dentry = lookup_create(&nd, 1);
-+		if (nd.last_type != LAST_NORM) {
-+			error = -EEXIST;
-+			goto out2;
-+		}
 +		if (nd.dentry->d_inode->i_op->mkdir_raw) {
 +			struct inode_operations *op = nd.dentry->d_inode->i_op;
 +			error = op->mkdir_raw(&nd, mode);
@@ -766,15 +871,11 @@ Index: linux-2.4.18-p4smp/fs/namei.c
  	error = PTR_ERR(dentry);
  	if (!IS_ERR(dentry)) {
  		/* Why not before? Because we want correct error value */
-@@ -1570,15 +1759,27 @@ asmlinkage long sys_symlink(const char *
+@@ -1570,15 +1759,23 @@ asmlinkage long sys_symlink(const char *
  		error = path_lookup(to, LOOKUP_PARENT, &nd);
  		if (error)
  			goto out;
 -		dentry = lookup_create(&nd, 0);
-+		if (nd.last_type != LAST_NORM) {
-+			error = -EEXIST;
-+			goto out2;
-+		}
 +		if (nd.dentry->d_inode->i_op->symlink_raw) {
 +			struct inode_operations *op = nd.dentry->d_inode->i_op;
 +			error = op->symlink_raw(&nd, from);
@@ -796,15 +897,11 @@ Index: linux-2.4.18-p4smp/fs/namei.c
  		putname(to);
  	}
  	putname(from);
-@@ -1654,7 +1851,18 @@ asmlinkage long sys_link(const char * ol
+@@ -1654,7 +1851,14 @@ asmlinkage long sys_link(const char * ol
  		error = -EXDEV;
  		if (old_nd.mnt != nd.mnt)
  			goto out_release;
 -		new_dentry = lookup_create(&nd, 0);
-+		if (nd.last_type != LAST_NORM) {
-+			error = -EEXIST;
-+			goto out_release;
-+		}
 +		if (nd.dentry->d_inode->i_op->link_raw) {
 +			struct inode_operations *op = nd.dentry->d_inode->i_op;
 +			error = op->link_raw(&old_nd, &nd);
@@ -925,126 +1022,8 @@ Index: linux-2.4.18-p4smp/fs/namei.c
  	if (page) {
  		kunmap(page);
  		page_cache_release(page);
-Index: linux-2.4.18-p4smp/fs/namespace.c
-===================================================================
---- linux-2.4.18-p4smp.orig/fs/namespace.c	2004-02-03 01:00:10.000000000 -0500
-+++ linux-2.4.18-p4smp/fs/namespace.c	2004-03-19 16:05:42.000000000 -0500
-@@ -99,6 +99,7 @@
- {
- 	old_nd->dentry = mnt->mnt_mountpoint;
- 	old_nd->mnt = mnt->mnt_parent;
-+	UNPIN(old_nd->dentry, old_nd->mnt, 1);
- 	mnt->mnt_parent = mnt;
- 	mnt->mnt_mountpoint = mnt->mnt_root;
- 	list_del_init(&mnt->mnt_child);
-@@ -110,6 +111,7 @@ static void attach_mnt(struct vfsmount *
- {
- 	mnt->mnt_parent = mntget(nd->mnt);
- 	mnt->mnt_mountpoint = dget(nd->dentry);
-+	PIN(nd->dentry, nd->mnt, 1);
- 	list_add(&mnt->mnt_hash, mount_hashtable+hash(nd->mnt, nd->dentry));
- 	list_add(&mnt->mnt_child, &nd->mnt->mnt_mounts);
- 	nd->dentry->d_mounted++;
-@@ -485,14 +487,17 @@ static int do_loopback(struct nameidata 
- {
- 	struct nameidata old_nd;
- 	struct vfsmount *mnt = NULL;
-+	struct lookup_intent it = { .it_op = IT_GETATTR };
- 	int err = mount_is_safe(nd);
- 	if (err)
- 		return err;
- 	if (!old_name || !*old_name)
- 		return -EINVAL;
--	err = path_lookup(old_name, LOOKUP_POSITIVE|LOOKUP_FOLLOW, &old_nd);
--	if (err)
-+	err = path_lookup_it(old_name, LOOKUP_POSITIVE|LOOKUP_FOLLOW, &old_nd, &it);
-+	if (err) {
-+		intent_release(&it);
- 		return err;
-+	}
- 
- 	down_write(&current->namespace->sem);
- 	err = -EINVAL;
-@@ -515,6 +520,7 @@ static int do_loopback(struct nameidata 
- 	}
- 
- 	up_write(&current->namespace->sem);
-+	intent_release(&it);
- 	path_release(&old_nd);
- 	return err;
- }
-@@ -698,6 +704,7 @@ long do_mount(char * dev_name, char * di
- 		  unsigned long flags, void *data_page)
- {
- 	struct nameidata nd;
-+	struct lookup_intent it = { .it_op = IT_GETATTR };
- 	int retval = 0;
- 	int mnt_flags = 0;
- 
-@@ -722,9 +729,11 @@ long do_mount(char * dev_name, char * di
- 	flags &= ~(MS_NOSUID|MS_NOEXEC|MS_NODEV);
- 
- 	/* ... and get the mountpoint */
--	retval = path_lookup(dir_name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd);
--	if (retval)
-+	retval = path_lookup_it(dir_name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd, &it);
-+	if (retval) {
-+		intent_release(&it);
- 		return retval;
-+	}
- 
- 	if (flags & MS_REMOUNT)
- 		retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags,
-@@ -736,6 +744,8 @@ long do_mount(char * dev_name, char * di
- 	else
- 		retval = do_add_mount(&nd, type_page, flags, mnt_flags,
- 				      dev_name, data_page);
-+
-+	intent_release(&it);
- 	path_release(&nd);
- 	return retval;
- }
-@@ -901,6 +911,8 @@ asmlinkage long sys_pivot_root(const cha
- {
- 	struct vfsmount *tmp;
- 	struct nameidata new_nd, old_nd, parent_nd, root_parent, user_nd;
-+	struct lookup_intent new_it = { .it_op = IT_GETATTR };
-+	struct lookup_intent old_it = { .it_op = IT_GETATTR };
- 	int error;
- 
- 	if (!capable(CAP_SYS_ADMIN))
-@@ -908,14 +920,14 @@ asmlinkage long sys_pivot_root(const cha
- 
- 	lock_kernel();
- 
--	error = __user_walk(new_root, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &new_nd);
-+	error = __user_walk_it(new_root, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &new_nd, &new_it);
- 	if (error)
- 		goto out0;
- 	error = -EINVAL;
- 	if (!check_mnt(new_nd.mnt))
- 		goto out1;
- 
--	error = __user_walk(put_old, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &old_nd);
-+	error = __user_walk_it(put_old, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &old_nd, &old_it);
- 	if (error)
- 		goto out1;
- 
-@@ -970,8 +982,10 @@ out2:
- 	up(&old_nd.dentry->d_inode->i_zombie);
- 	up_write(&current->namespace->sem);
- 	path_release(&user_nd);
-+	intent_release(&old_it);
- 	path_release(&old_nd);
- out1:
-+	intent_release(&new_it);
- 	path_release(&new_nd);
- out0:
- 	unlock_kernel();
-Index: linux-2.4.18-p4smp/fs/open.c
-===================================================================
---- linux-2.4.18-p4smp.orig/fs/open.c	2004-02-03 01:00:10.000000000 -0500
-+++ linux-2.4.18-p4smp/fs/open.c	2004-03-19 16:05:42.000000000 -0500
+--- linux-2.4.18-chaos/fs/open.c~vfs_intent-2.4.18-18-chaos65	2003-07-28 17:52:06.000000000 +0400
++++ linux-2.4.18-chaos-alexey/fs/open.c	2003-09-14 17:25:41.000000000 +0400
 @@ -19,6 +19,8 @@
  #include <asm/uaccess.h>
  
@@ -1224,14 +1203,16 @@ Index: linux-2.4.18-p4smp/fs/open.c
  		path_release(&nd);
  	}
  
-@@ -385,8 +430,9 @@ asmlinkage long sys_chdir(const char * f
+@@ -385,8 +430,11 @@ asmlinkage long sys_chdir(const char * f
  {
  	int error;
  	struct nameidata nd;
 +	struct lookup_intent it = { .it_op = IT_GETATTR };
  
 -	error = __user_walk(filename,LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY,&nd);
-+	error = __user_walk_it(filename,LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY,&nd, &it);
++	error = __user_walk_it(filename,
++			       LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY,
++			       &nd, &it);
  	if (error)
  		goto out;
  
@@ -1435,11 +1416,9 @@ Index: linux-2.4.18-p4smp/fs/open.c
  /*
   * Find an empty file descriptor entry, and mark it busy.
   */
-Index: linux-2.4.18-p4smp/fs/stat.c
-===================================================================
---- linux-2.4.18-p4smp.orig/fs/stat.c	2004-02-03 01:00:10.000000000 -0500
-+++ linux-2.4.18-p4smp/fs/stat.c	2004-03-19 16:06:19.000000000 -0500
-@@ -17,21 +17,24 @@
+--- linux-2.4.18-chaos/fs/stat.c~vfs_intent-2.4.18-18-chaos65	2003-07-28 17:52:06.000000000 +0400
++++ linux-2.4.18-chaos-alexey/fs/stat.c	2003-09-14 17:30:21.000000000 +0400
+@@ -17,21 +17,26 @@
   * Revalidate the inode. This is required for proper NFS attribute caching.
   */
  static __inline__ int
@@ -1448,6 +1427,8 @@ Index: linux-2.4.18-p4smp/fs/stat.c
  {
  	struct inode * inode = dentry->d_inode;
 -	if (inode->i_op && inode->i_op->revalidate)
++	if (!inode)
++		return -ENOENT;
 +	if (inode->i_op && inode->i_op->revalidate_it)
 +		return inode->i_op->revalidate_it(dentry, it);
 +	else if (inode->i_op && inode->i_op->revalidate)
@@ -1516,10 +1497,8 @@ Index: linux-2.4.18-p4smp/fs/stat.c
  			UPDATE_ATIME(inode);
  			error = inode->i_op->readlink(nd.dentry, buf, bufsiz);
  		}
-Index: linux-2.4.18-p4smp/include/linux/dcache.h
-===================================================================
---- linux-2.4.18-p4smp.orig/include/linux/dcache.h	2004-02-03 01:00:10.000000000 -0500
-+++ linux-2.4.18-p4smp/include/linux/dcache.h	2004-03-19 16:05:42.000000000 -0500
+--- linux-2.4.18-chaos/include/linux/dcache.h~vfs_intent-2.4.18-18-chaos65	2003-07-28 17:52:16.000000000 +0400
++++ linux-2.4.18-chaos-alexey/include/linux/dcache.h	2003-09-14 17:25:41.000000000 +0400
 @@ -5,6 +5,51 @@
  
  #include <asm/atomic.h>
@@ -1581,9 +1560,9 @@ Index: linux-2.4.18-p4smp/include/linux/dcache.h
 +	void (*d_unpin)(struct dentry *, struct vfsmount *, int);
  };
  
-+#define PIN(de,mnt,flag)  if (de && de->d_op && de->d_op->d_pin) \
++#define PIN(de,mnt,flag)  if (de->d_op && de->d_op->d_pin) \
 +				de->d_op->d_pin(de, mnt, flag);
-+#define UNPIN(de,mnt,flag)  if (de && de->d_op && de->d_op->d_unpin) \
++#define UNPIN(de,mnt,flag)  if (de->d_op && de->d_op->d_unpin) \
 +				de->d_op->d_unpin(de, mnt, flag);
 +
 +
@@ -1603,11 +1582,9 @@ Index: linux-2.4.18-p4smp/include/linux/dcache.h
  
  extern spinlock_t dcache_lock;
  
-Index: linux-2.4.18-p4smp/include/linux/fs.h
-===================================================================
---- linux-2.4.18-p4smp.orig/include/linux/fs.h	2004-03-19 16:05:40.000000000 -0500
-+++ linux-2.4.18-p4smp/include/linux/fs.h	2004-03-19 16:05:42.000000000 -0500
-@@ -73,6 +73,7 @@
+--- linux-2.4.18-chaos/include/linux/fs.h~vfs_intent-2.4.18-18-chaos65	2003-09-14 17:24:21.000000000 +0400
++++ linux-2.4.18-chaos-alexey/include/linux/fs.h	2003-09-14 17:25:41.000000000 +0400
+@@ -73,6 +73,7 @@ extern int leases_enable, dir_notify_ena
  
  #define FMODE_READ 1
  #define FMODE_WRITE 2
@@ -1621,7 +1598,7 @@ Index: linux-2.4.18-p4smp/include/linux/fs.h
  #define ATTR_ATTR_FLAG	1024
 +#define ATTR_RAW	0x0800	/* file system, not vfs will massage attrs */
 +#define ATTR_FROM_OPEN	0x1000	/* called from open path, ie O_TRUNC */
-+#define ATTR_CTIME_SET	0x2000
++#define ATTR_CTIME_SET	0x2000	/* called from open path, ie O_TRUNC */
  
  /*
   * This is the Inode Attributes structure, used for notify_change().  It
@@ -1659,7 +1636,7 @@ Index: linux-2.4.18-p4smp/include/linux/fs.h
  
  /*
   * File types
-@@ -900,21 +908,32 @@ struct file_operations {
+@@ -900,21 +908,34 @@ struct file_operations {
  
  struct inode_operations {
  	int (*create) (struct inode *,struct dentry *,int);
@@ -1683,6 +1660,8 @@ Index: linux-2.4.18-p4smp/include/linux/fs.h
 +	int (*rename_raw) (struct nameidata *, struct nameidata *);
  	int (*readlink) (struct dentry *, char *,int);
  	int (*follow_link) (struct dentry *, struct nameidata *);
++	int (*follow_link2) (struct dentry *, struct nameidata *,
++			     struct lookup_intent *it);
  	void (*truncate) (struct inode *);
  	int (*permission) (struct inode *, int);
  	int (*revalidate) (struct dentry *);
@@ -1737,11 +1716,25 @@ Index: linux-2.4.18-p4smp/include/linux/fs.h
  extern int page_readlink(struct dentry *, char *, int);
  extern int page_follow_link(struct dentry *, struct nameidata *);
  extern struct inode_operations page_symlink_inode_operations;
-Index: linux-2.4.18-p4smp/kernel/exit.c
-===================================================================
---- linux-2.4.18-p4smp.orig/kernel/exit.c	2004-02-03 01:00:10.000000000 -0500
-+++ linux-2.4.18-p4smp/kernel/exit.c	2004-03-19 16:05:42.000000000 -0500
-@@ -303,11 +303,14 @@
+--- linux-2.4.18-chaos/kernel/fork.c~vfs_intent-2.4.18-18-chaos65	2003-07-28 17:52:20.000000000 +0400
++++ linux-2.4.18-chaos-alexey/kernel/fork.c	2003-09-14 17:25:41.000000000 +0400
+@@ -399,10 +399,13 @@ static inline struct fs_struct *__copy_f
+ 		fs->umask = old->umask;
+ 		read_lock(&old->lock);
+ 		fs->rootmnt = mntget(old->rootmnt);
++		PIN(old->pwd, old->pwdmnt, 0);
++		PIN(old->root, old->rootmnt, 1);
+ 		fs->root = dget(old->root);
+ 		fs->pwdmnt = mntget(old->pwdmnt);
+ 		fs->pwd = dget(old->pwd);
+ 		if (old->altroot) {
++			PIN(old->altroot, old->altrootmnt, 1);
+ 			fs->altrootmnt = mntget(old->altrootmnt);
+ 			fs->altroot = dget(old->altroot);
+ 		} else {
+--- linux-2.4.18-chaos/kernel/exit.c~vfs_intent-2.4.18-18-chaos65	2003-07-28 17:52:20.000000000 +0400
++++ linux-2.4.18-chaos-alexey/kernel/exit.c	2003-09-14 17:25:41.000000000 +0400
+@@ -303,11 +303,14 @@ static inline void __put_fs_struct(struc
  {
  	/* No need to hold fs->lock if we are killing it */
  	if (atomic_dec_and_test(&fs->count)) {
@@ -1756,29 +1749,9 @@ Index: linux-2.4.18-p4smp/kernel/exit.c
  			dput(fs->altroot);
  			mntput(fs->altrootmnt);
  		}
-Index: linux-2.4.18-p4smp/kernel/fork.c
-===================================================================
---- linux-2.4.18-p4smp.orig/kernel/fork.c	2004-02-03 01:00:10.000000000 -0500
-+++ linux-2.4.18-p4smp/kernel/fork.c	2004-03-19 16:05:42.000000000 -0500
-@@ -399,10 +399,13 @@
- 		fs->umask = old->umask;
- 		read_lock(&old->lock);
- 		fs->rootmnt = mntget(old->rootmnt);
-+		PIN(old->pwd, old->pwdmnt, 0);
-+		PIN(old->root, old->rootmnt, 1);
- 		fs->root = dget(old->root);
- 		fs->pwdmnt = mntget(old->pwdmnt);
- 		fs->pwd = dget(old->pwd);
- 		if (old->altroot) {
-+			PIN(old->altroot, old->altrootmnt, 1);
- 			fs->altrootmnt = mntget(old->altrootmnt);
- 			fs->altroot = dget(old->altroot);
- 		} else {
-Index: linux-2.4.18-p4smp/kernel/ksyms.c
-===================================================================
---- linux-2.4.18-p4smp.orig/kernel/ksyms.c	2004-03-19 16:05:40.000000000 -0500
-+++ linux-2.4.18-p4smp/kernel/ksyms.c	2004-03-19 16:05:42.000000000 -0500
-@@ -293,6 +293,7 @@
+--- linux-2.4.18-chaos/kernel/ksyms.c~vfs_intent-2.4.18-18-chaos65	2003-09-14 17:24:22.000000000 +0400
++++ linux-2.4.18-chaos-alexey/kernel/ksyms.c	2003-09-14 17:25:41.000000000 +0400
+@@ -294,6 +294,7 @@ EXPORT_SYMBOL(read_cache_page);
  EXPORT_SYMBOL(set_page_dirty);
  EXPORT_SYMBOL(vfs_readlink);
  EXPORT_SYMBOL(vfs_follow_link);
@@ -1786,3 +1759,5 @@ Index: linux-2.4.18-p4smp/kernel/ksyms.c
  EXPORT_SYMBOL(page_readlink);
  EXPORT_SYMBOL(page_follow_link);
  EXPORT_SYMBOL(page_symlink_inode_operations);
+
+_
diff --git a/lustre/kernel_patches/patches/vfs_intent-2.4.19-pre1.patch b/lustre/kernel_patches/patches/vfs_intent-2.4.19-pre1.patch
index 4dd96bc..7c4ea56 100644
--- a/lustre/kernel_patches/patches/vfs_intent-2.4.19-pre1.patch
+++ b/lustre/kernel_patches/patches/vfs_intent-2.4.19-pre1.patch
@@ -12,47 +12,6 @@
  kernel/ksyms.c            |    1 
  12 files changed, 558 insertions(+), 128 deletions(-)
 
-Index: linux-2.4.19-pre1/fs/dcache.c
-===================================================================
---- linux-2.4.19-pre1.orig/fs/dcache.c	2003-11-21 02:41:00.000000000 +0300
-+++ linux-2.4.19-pre1/fs/dcache.c	2003-11-21 02:51:38.000000000 +0300
-@@ -181,6 +181,13 @@
- 		spin_unlock(&dcache_lock);
- 		return 0;
- 	}
-+
-+	/* network invalidation by Lustre */
-+	if (dentry->d_flags & DCACHE_LUSTRE_INVALID) {
-+		spin_unlock(&dcache_lock);
-+		return 0;
-+	}
-+
- 	/*
- 	 * Check whether to do a partial shrink_dcache
- 	 * to get rid of unused child entries.
-@@ -831,13 +838,19 @@
-  * Adds a dentry to the hash according to its name.
-  */
-  
--void d_rehash(struct dentry * entry)
-+void __d_rehash(struct dentry * entry, int lock)
- {
- 	struct list_head *list = d_hash(entry->d_parent, entry->d_name.hash);
- 	if (!list_empty(&entry->d_hash)) BUG();
--	spin_lock(&dcache_lock);
-+	if (lock) spin_lock(&dcache_lock);
- 	list_add(&entry->d_hash, list);
--	spin_unlock(&dcache_lock);
-+	if (lock) spin_unlock(&dcache_lock);
-+}
-+EXPORT_SYMBOL(__d_rehash);
-+
-+void d_rehash(struct dentry * entry)
-+{
-+	__d_rehash(entry, 1);
- }
- 
- #define do_switch(x,y) do { \
 Index: linux-2.4.19-pre1/fs/exec.c
 ===================================================================
 --- linux-2.4.19-pre1.orig/fs/exec.c	2003-11-21 02:41:00.000000000 +0300
@@ -119,6 +78,165 @@ Index: linux-2.4.19-pre1/fs/exec.c
  		goto close_fail;
  
  	retval = binfmt->core_dump(signr, regs, file);
+Index: linux-2.4.19-pre1/fs/dcache.c
+===================================================================
+--- linux-2.4.19-pre1.orig/fs/dcache.c	2003-11-21 02:41:00.000000000 +0300
++++ linux-2.4.19-pre1/fs/dcache.c	2003-11-21 02:51:38.000000000 +0300
+@@ -181,6 +181,13 @@
+ 		spin_unlock(&dcache_lock);
+ 		return 0;
+ 	}
++
++	/* network invalidation by Lustre */
++	if (dentry->d_flags & DCACHE_LUSTRE_INVALID) {
++		spin_unlock(&dcache_lock);
++		return 0;
++	}
++
+ 	/*
+ 	 * Check whether to do a partial shrink_dcache
+ 	 * to get rid of unused child entries.
+@@ -831,13 +838,19 @@
+  * Adds a dentry to the hash according to its name.
+  */
+  
+-void d_rehash(struct dentry * entry)
++void __d_rehash(struct dentry * entry, int lock)
+ {
+ 	struct list_head *list = d_hash(entry->d_parent, entry->d_name.hash);
+ 	if (!list_empty(&entry->d_hash)) BUG();
+-	spin_lock(&dcache_lock);
++	if (lock) spin_lock(&dcache_lock);
+ 	list_add(&entry->d_hash, list);
+-	spin_unlock(&dcache_lock);
++	if (lock) spin_unlock(&dcache_lock);
++}
++EXPORT_SYMBOL(__d_rehash);
++
++void d_rehash(struct dentry * entry)
++{
++	__d_rehash(entry, 1);
+ }
+ 
+ #define do_switch(x,y) do { \
+Index: linux-2.4.19-pre1/fs/namespace.c
+===================================================================
+--- linux-2.4.19-pre1.orig/fs/namespace.c	2003-11-21 02:41:00.000000000 +0300
++++ linux-2.4.19-pre1/fs/namespace.c	2003-11-21 02:51:38.000000000 +0300
+@@ -107,6 +107,7 @@
+ {
+ 	old_nd->dentry = mnt->mnt_mountpoint;
+ 	old_nd->mnt = mnt->mnt_parent;
++	UNPIN(old_nd->dentry, old_nd->mnt, 1);
+ 	mnt->mnt_parent = mnt;
+ 	mnt->mnt_mountpoint = mnt->mnt_root;
+ 	list_del_init(&mnt->mnt_child);
+@@ -118,6 +119,7 @@
+ {
+ 	mnt->mnt_parent = mntget(nd->mnt);
+ 	mnt->mnt_mountpoint = dget(nd->dentry);
++	PIN(nd->dentry, nd->mnt, 1);
+ 	list_add(&mnt->mnt_hash, mount_hashtable+hash(nd->mnt, nd->dentry));
+ 	list_add(&mnt->mnt_child, &nd->mnt->mnt_mounts);
+ 	nd->dentry->d_mounted++;
+@@ -500,15 +502,18 @@
+ {
+ 	struct nameidata old_nd;
+ 	struct vfsmount *mnt = NULL;
++	struct lookup_intent it = { .it_op = IT_GETATTR };
+ 	int err = mount_is_safe(nd);
+ 	if (err)
+ 		return err;
+ 	if (!old_name || !*old_name)
+ 		return -EINVAL;
+ 	if (path_init(old_name, LOOKUP_POSITIVE|LOOKUP_FOLLOW, &old_nd))
+-		err = path_walk(old_name, &old_nd);
+-	if (err)
++		err = path_walk_it(old_name, &old_nd, &it);
++	if (err) {
++		intent_release(&it);
+ 		return err;
++	}
+ 
+ 	down(&mount_sem);
+ 	err = -EINVAL;
+@@ -531,6 +536,7 @@
+ 	}
+ 
+ 	up(&mount_sem);
++	intent_release(&it);
+ 	path_release(&old_nd);
+ 	return err;
+ }
+@@ -706,6 +712,7 @@
+ 		  unsigned long flags, void *data_page)
+ {
+ 	struct nameidata nd;
++	struct lookup_intent it = { .it_op = IT_GETATTR };
+ 	int retval = 0;
+ 	int mnt_flags = 0;
+ 
+@@ -731,9 +738,11 @@
+ 
+ 	/* ... and get the mountpoint */
+ 	if (path_init(dir_name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd))
+-		retval = path_walk(dir_name, &nd);
+-	if (retval)
++		retval = path_walk_it(dir_name, &nd, &it);
++	if (retval) {
++		intent_release(&it);
+ 		return retval;
++	}
+ 
+ 	if (flags & MS_REMOUNT)
+ 		retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags,
+@@ -745,6 +754,8 @@
+ 	else
+ 		retval = do_add_mount(&nd, type_page, flags, mnt_flags,
+ 				      dev_name, data_page);
++
++	intent_release(&it);
+ 	path_release(&nd);
+ 	return retval;
+ }
+@@ -830,6 +841,8 @@
+ {
+ 	struct vfsmount *tmp;
+ 	struct nameidata new_nd, old_nd, parent_nd, root_parent, user_nd;
++	struct lookup_intent new_it = { .it_op = IT_GETATTR };
++	struct lookup_intent old_it = { .it_op = IT_GETATTR };
+ 	char *name;
+ 	int error;
+ 
+@@ -844,7 +857,7 @@
+ 		goto out0;
+ 	error = 0;
+ 	if (path_init(name, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &new_nd))
+-		error = path_walk(name, &new_nd);
++		error = path_walk_it(name, &new_nd, &new_it);
+ 	putname(name);
+ 	if (error)
+ 		goto out0;
+@@ -858,7 +871,7 @@
+ 		goto out1;
+ 	error = 0;
+ 	if (path_init(name, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &old_nd))
+-		error = path_walk(name, &old_nd);
++		error = path_walk_it(name, &old_nd, &old_it);
+ 	putname(name);
+ 	if (error)
+ 		goto out1;
+@@ -914,8 +927,10 @@
+ 	up(&old_nd.dentry->d_inode->i_zombie);
+ 	up(&mount_sem);
+ 	path_release(&user_nd);
++	intent_release(&old_it);
+ 	path_release(&old_nd);
+ out1:
++	intent_release(&new_it);
+ 	path_release(&new_nd);
+ out0:
+ 	unlock_kernel();
 Index: linux-2.4.19-pre1/fs/namei.c
 ===================================================================
 --- linux-2.4.19-pre1.orig/fs/namei.c	2003-11-21 02:41:00.000000000 +0300
@@ -252,7 +370,7 @@ Index: linux-2.4.19-pre1/fs/namei.c
  		if (!dentry) {
 -			dentry = real_lookup(nd->dentry, &this, LOOKUP_CONTINUE);
 +			dentry = real_lookup(nd->dentry, &this, LOOKUP_CONTINUE,
-+					     NULL);
++						NULL);
  			err = PTR_ERR(dentry);
  			if (IS_ERR(dentry))
  				break;
@@ -313,7 +431,7 @@ Index: linux-2.4.19-pre1/fs/namei.c
  				break;
  		}
  		goto return_base;
-@@ -625,21 +663,68 @@
+@@ -625,21 +663,66 @@
  			nd->last_type = LAST_DOT;
  		else if (this.len == 2 && this.name[1] == '.')
  			nd->last_type = LAST_DOTDOT;
@@ -332,17 +450,15 @@ Index: linux-2.4.19-pre1/fs/namei.c
 +				if (err)
 +					break;
 +				new = real_lookup(dentry->d_parent,
-+						  &dentry->d_name, 0, it);
++						  &dentry->d_name, 0, NULL);
++				d_invalidate(dentry);
++				dput(dentry);
 +				if (IS_ERR(new)) {
 +					err = PTR_ERR(new);
 +					break;
 +				}
-+				d_invalidate(dentry);
-+				dput(dentry);
 +				nd->dentry = new;
 +			}
-+			if (!nd->dentry->d_inode)
-+				goto no_inode;
 +		} else
 +		if (dentry && dentry->d_op && dentry->d_op->d_revalidate) {
 +			err = -ESTALE;
@@ -628,16 +744,12 @@ Index: linux-2.4.19-pre1/fs/namei.c
  	if (IS_ERR(dentry))
  		goto fail;
  	if (!is_dir && nd->last.name[nd->last.len] && !dentry->d_inode)
-@@ -1252,7 +1392,20 @@
+@@ -1252,7 +1392,16 @@
  		error = path_walk(tmp, &nd);
  	if (error)
  		goto out;
 -	dentry = lookup_create(&nd, 0);
 +
-+	if (nd.last_type != LAST_NORM) {
-+		error = -EEXIST;
-+		goto out2;
-+	}
 +	if (nd.dentry->d_inode->i_op->mknod_raw) {
 +		struct inode_operations *op = nd.dentry->d_inode->i_op;
 +		error = op->mknod_raw(&nd, mode, dev);
@@ -658,15 +770,11 @@ Index: linux-2.4.19-pre1/fs/namei.c
  	path_release(&nd);
  out:
  	putname(tmp);
-@@ -1321,7 +1471,18 @@
+@@ -1321,7 +1471,14 @@
  			error = path_walk(tmp, &nd);
  		if (error)
  			goto out;
 -		dentry = lookup_create(&nd, 1);
-+		if (nd.last_type != LAST_NORM) {
-+			error = -EEXIST;
-+			goto out2;
-+		}
 +		if (nd.dentry->d_inode->i_op->mkdir_raw) {
 +			struct inode_operations *op = nd.dentry->d_inode->i_op;
 +			error = op->mkdir_raw(&nd, mode);
@@ -721,15 +829,11 @@ Index: linux-2.4.19-pre1/fs/namei.c
  	error = PTR_ERR(dentry);
  	if (!IS_ERR(dentry)) {
  		/* Why not before? Because we want correct error value */
-@@ -1557,15 +1730,27 @@
+@@ -1557,15 +1730,23 @@
  			error = path_walk(to, &nd);
  		if (error)
  			goto out;
 -		dentry = lookup_create(&nd, 0);
-+		if (nd.last_type != LAST_NORM) {
-+			error = -EEXIST;
-+			goto out2;
-+		}
 +		if (nd.dentry->d_inode->i_op->symlink_raw) {
 +			struct inode_operations *op = nd.dentry->d_inode->i_op;
 +			error = op->symlink_raw(&nd, from);
@@ -751,15 +855,11 @@ Index: linux-2.4.19-pre1/fs/namei.c
  		putname(to);
  	}
  	putname(from);
-@@ -1648,7 +1829,18 @@
+@@ -1648,7 +1829,14 @@
  		error = -EXDEV;
  		if (old_nd.mnt != nd.mnt)
  			goto out_release;
 -		new_dentry = lookup_create(&nd, 0);
-+		if (nd.last_type != LAST_NORM) {
-+			error = -EEXIST;
-+			goto out_release;
-+		}
 +		if (nd.dentry->d_inode->i_op->link_raw) {
 +			struct inode_operations *op = nd.dentry->d_inode->i_op;
 +			error = op->link_raw(&old_nd, &nd);
@@ -881,124 +981,6 @@ Index: linux-2.4.19-pre1/fs/namei.c
  	if (page) {
  		kunmap(page);
  		page_cache_release(page);
-Index: linux-2.4.19-pre1/fs/namespace.c
-===================================================================
---- linux-2.4.19-pre1.orig/fs/namespace.c	2003-11-21 02:41:00.000000000 +0300
-+++ linux-2.4.19-pre1/fs/namespace.c	2003-11-21 02:51:38.000000000 +0300
-@@ -107,6 +107,7 @@
- {
- 	old_nd->dentry = mnt->mnt_mountpoint;
- 	old_nd->mnt = mnt->mnt_parent;
-+	UNPIN(old_nd->dentry, old_nd->mnt, 1);
- 	mnt->mnt_parent = mnt;
- 	mnt->mnt_mountpoint = mnt->mnt_root;
- 	list_del_init(&mnt->mnt_child);
-@@ -118,6 +119,7 @@
- {
- 	mnt->mnt_parent = mntget(nd->mnt);
- 	mnt->mnt_mountpoint = dget(nd->dentry);
-+	PIN(nd->dentry, nd->mnt, 1);
- 	list_add(&mnt->mnt_hash, mount_hashtable+hash(nd->mnt, nd->dentry));
- 	list_add(&mnt->mnt_child, &nd->mnt->mnt_mounts);
- 	nd->dentry->d_mounted++;
-@@ -500,15 +502,18 @@
- {
- 	struct nameidata old_nd;
- 	struct vfsmount *mnt = NULL;
-+	struct lookup_intent it = { .it_op = IT_GETATTR };
- 	int err = mount_is_safe(nd);
- 	if (err)
- 		return err;
- 	if (!old_name || !*old_name)
- 		return -EINVAL;
- 	if (path_init(old_name, LOOKUP_POSITIVE|LOOKUP_FOLLOW, &old_nd))
--		err = path_walk(old_name, &old_nd);
--	if (err)
-+		err = path_walk_it(old_name, &old_nd, &it);
-+	if (err) {
-+		intent_release(&it);
- 		return err;
-+	}
- 
- 	down(&mount_sem);
- 	err = -EINVAL;
-@@ -531,6 +536,7 @@
- 	}
- 
- 	up(&mount_sem);
-+	intent_release(&it);
- 	path_release(&old_nd);
- 	return err;
- }
-@@ -706,6 +712,7 @@
- 		  unsigned long flags, void *data_page)
- {
- 	struct nameidata nd;
-+	struct lookup_intent it = { .it_op = IT_GETATTR };
- 	int retval = 0;
- 	int mnt_flags = 0;
- 
-@@ -731,9 +738,11 @@
- 
- 	/* ... and get the mountpoint */
- 	if (path_init(dir_name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd))
--		retval = path_walk(dir_name, &nd);
--	if (retval)
-+		retval = path_walk_it(dir_name, &nd, &it);
-+	if (retval) {
-+		intent_release(&it);
- 		return retval;
-+	}
- 
- 	if (flags & MS_REMOUNT)
- 		retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags,
-@@ -745,6 +754,8 @@
- 	else
- 		retval = do_add_mount(&nd, type_page, flags, mnt_flags,
- 				      dev_name, data_page);
-+
-+	intent_release(&it);
- 	path_release(&nd);
- 	return retval;
- }
-@@ -830,6 +841,8 @@
- {
- 	struct vfsmount *tmp;
- 	struct nameidata new_nd, old_nd, parent_nd, root_parent, user_nd;
-+	struct lookup_intent new_it = { .it_op = IT_GETATTR };
-+	struct lookup_intent old_it = { .it_op = IT_GETATTR };
- 	char *name;
- 	int error;
- 
-@@ -844,7 +857,7 @@
- 		goto out0;
- 	error = 0;
- 	if (path_init(name, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &new_nd))
--		error = path_walk(name, &new_nd);
-+		error = path_walk_it(name, &new_nd, &new_it);
- 	putname(name);
- 	if (error)
- 		goto out0;
-@@ -858,7 +871,7 @@
- 		goto out1;
- 	error = 0;
- 	if (path_init(name, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &old_nd))
--		error = path_walk(name, &old_nd);
-+		error = path_walk_it(name, &old_nd, &old_it);
- 	putname(name);
- 	if (error)
- 		goto out1;
-@@ -914,8 +927,10 @@
- 	up(&old_nd.dentry->d_inode->i_zombie);
- 	up(&mount_sem);
- 	path_release(&user_nd);
-+	intent_release(&old_it);
- 	path_release(&old_nd);
- out1:
-+	intent_release(&new_it);
- 	path_release(&new_nd);
- out0:
- 	unlock_kernel();
 Index: linux-2.4.19-pre1/fs/open.c
 ===================================================================
 --- linux-2.4.19-pre1.orig/fs/open.c	2003-11-21 02:41:00.000000000 +0300
@@ -1415,7 +1397,7 @@ Index: linux-2.4.19-pre1/fs/stat.c
 ===================================================================
 --- linux-2.4.19-pre1.orig/fs/stat.c	2003-11-21 02:41:00.000000000 +0300
 +++ linux-2.4.19-pre1/fs/stat.c	2003-11-21 02:51:38.000000000 +0300
-@@ -17,10 +17,12 @@
+@@ -17,10 +17,14 @@
   * Revalidate the inode. This is required for proper NFS attribute caching.
   */
  static __inline__ int
@@ -1424,6 +1406,8 @@ Index: linux-2.4.19-pre1/fs/stat.c
  {
  	struct inode * inode = dentry->d_inode;
 -	if (inode->i_op && inode->i_op->revalidate)
++	if (!inode)
++		return -ENOENT;
 +	if (inode->i_op && inode->i_op->revalidate_it)
 +		return inode->i_op->revalidate_it(dentry, it);
 +	else if (inode->i_op && inode->i_op->revalidate)
@@ -1677,7 +1661,7 @@ Index: linux-2.4.19-pre1/include/linux/fs.h
  #define ATTR_ATTR_FLAG	1024
 +#define ATTR_RAW	0x0800	/* file system, not vfs will massage attrs */
 +#define ATTR_FROM_OPEN	0x1000	/* called from open path, ie O_TRUNC */
-+#define ATTR_CTIME_SET	0x2000
++#define ATTR_CTIME_SET 0x2000
  
  /*
   * This is the Inode Attributes structure, used for notify_change().  It
@@ -1820,25 +1804,18 @@ Index: linux-2.4.19-pre1/include/linux/fs_struct.h
  		dput(old_pwd);
  		mntput(old_pwdmnt);
  	}
-Index: linux-2.4.19-pre1/kernel/exit.c
+Index: linux-2.4.19-pre1/kernel/ksyms.c
 ===================================================================
---- linux-2.4.19-pre1.orig/kernel/exit.c	2003-11-21 02:41:00.000000000 +0300
-+++ linux-2.4.19-pre1/kernel/exit.c	2003-11-21 02:51:38.000000000 +0300
-@@ -245,11 +245,14 @@
- {
- 	/* No need to hold fs->lock if we are killing it */
- 	if (atomic_dec_and_test(&fs->count)) {
-+		UNPIN(fs->pwd, fs->pwdmnt, 0);
-+		UNPIN(fs->root, fs->rootmnt, 1);
- 		dput(fs->root);
- 		mntput(fs->rootmnt);
- 		dput(fs->pwd);
- 		mntput(fs->pwdmnt);
- 		if (fs->altroot) {
-+			UNPIN(fs->altroot, fs->altrootmnt, 1);
- 			dput(fs->altroot);
- 			mntput(fs->altrootmnt);
- 		}
+--- linux-2.4.19-pre1.orig/kernel/ksyms.c	2003-11-21 02:51:37.000000000 +0300
++++ linux-2.4.19-pre1/kernel/ksyms.c	2003-11-21 02:51:38.000000000 +0300
+@@ -260,6 +260,7 @@
+ EXPORT_SYMBOL(set_page_dirty);
+ EXPORT_SYMBOL(vfs_readlink);
+ EXPORT_SYMBOL(vfs_follow_link);
++EXPORT_SYMBOL(vfs_follow_link_it);
+ EXPORT_SYMBOL(page_readlink);
+ EXPORT_SYMBOL(page_follow_link);
+ EXPORT_SYMBOL(page_symlink_inode_operations);
 Index: linux-2.4.19-pre1/kernel/fork.c
 ===================================================================
 --- linux-2.4.19-pre1.orig/kernel/fork.c	2003-11-21 02:41:00.000000000 +0300
@@ -1857,15 +1834,22 @@ Index: linux-2.4.19-pre1/kernel/fork.c
  			fs->altrootmnt = mntget(old->altrootmnt);
  			fs->altroot = dget(old->altroot);
  		} else {
-Index: linux-2.4.19-pre1/kernel/ksyms.c
+Index: linux-2.4.19-pre1/kernel/exit.c
 ===================================================================
---- linux-2.4.19-pre1.orig/kernel/ksyms.c	2003-11-21 02:51:37.000000000 +0300
-+++ linux-2.4.19-pre1/kernel/ksyms.c	2003-11-21 02:51:38.000000000 +0300
-@@ -260,6 +260,7 @@
- EXPORT_SYMBOL(set_page_dirty);
- EXPORT_SYMBOL(vfs_readlink);
- EXPORT_SYMBOL(vfs_follow_link);
-+EXPORT_SYMBOL(vfs_follow_link_it);
- EXPORT_SYMBOL(page_readlink);
- EXPORT_SYMBOL(page_follow_link);
- EXPORT_SYMBOL(page_symlink_inode_operations);
+--- linux-2.4.19-pre1.orig/kernel/exit.c	2003-11-21 02:41:00.000000000 +0300
++++ linux-2.4.19-pre1/kernel/exit.c	2003-11-21 02:51:38.000000000 +0300
+@@ -245,11 +245,14 @@
+ {
+ 	/* No need to hold fs->lock if we are killing it */
+ 	if (atomic_dec_and_test(&fs->count)) {
++		UNPIN(fs->pwd, fs->pwdmnt, 0);
++		UNPIN(fs->root, fs->rootmnt, 1);
+ 		dput(fs->root);
+ 		mntput(fs->rootmnt);
+ 		dput(fs->pwd);
+ 		mntput(fs->pwdmnt);
+ 		if (fs->altroot) {
++			UNPIN(fs->altroot, fs->altrootmnt, 1);
+ 			dput(fs->altroot);
+ 			mntput(fs->altrootmnt);
+ 		}
diff --git a/lustre/kernel_patches/patches/vfs_intent-2.4.19-suse.patch b/lustre/kernel_patches/patches/vfs_intent-2.4.19-suse.patch
index d8e28ca..7741be4 100644
--- a/lustre/kernel_patches/patches/vfs_intent-2.4.19-suse.patch
+++ b/lustre/kernel_patches/patches/vfs_intent-2.4.19-suse.patch
@@ -12,47 +12,6 @@
  kernel/ksyms.c            |    1 
  12 files changed, 558 insertions(+), 128 deletions(-)
 
-Index: linux-2.4.19.SuSE/fs/dcache.c
-===================================================================
---- linux-2.4.19.SuSE.orig/fs/dcache.c	Mon Jan 27 05:08:04 2003
-+++ linux-2.4.19.SuSE/fs/dcache.c	Sat Nov 15 17:29:03 2003
-@@ -186,6 +186,13 @@
- 		spin_unlock(&dcache_lock);
- 		return 0;
- 	}
-+
-+	/* network invalidation by Lustre */
-+	if (dentry->d_flags & DCACHE_LUSTRE_INVALID) {
-+		spin_unlock(&dcache_lock);
-+		return 0;
-+	}
-+
- 	/*
- 	 * Check whether to do a partial shrink_dcache
- 	 * to get rid of unused child entries.
-@@ -838,13 +845,19 @@
-  * Adds a dentry to the hash according to its name.
-  */
-  
--void d_rehash(struct dentry * entry)
-+void __d_rehash(struct dentry * entry, int lock)
- {
- 	struct list_head *list = d_hash(entry->d_parent, entry->d_name.hash);
- 	if (!list_empty(&entry->d_hash)) BUG();
--	spin_lock(&dcache_lock);
-+	if (lock) spin_lock(&dcache_lock);
- 	list_add(&entry->d_hash, list);
--	spin_unlock(&dcache_lock);
-+	if (lock) spin_unlock(&dcache_lock);
-+}
-+EXPORT_SYMBOL(__d_rehash);
-+
-+void d_rehash(struct dentry * entry)
-+{
-+	__d_rehash(entry, 1);
- }
- 
- #define do_switch(x,y) do { \
 Index: linux-2.4.19.SuSE/fs/exec.c
 ===================================================================
 --- linux-2.4.19.SuSE.orig/fs/exec.c	Mon Jan 27 05:08:35 2003
@@ -119,6 +78,165 @@ Index: linux-2.4.19.SuSE/fs/exec.c
  		goto close_fail;
  
  	retval = binfmt->core_dump(signr, regs, file);
+Index: linux-2.4.19.SuSE/fs/dcache.c
+===================================================================
+--- linux-2.4.19.SuSE.orig/fs/dcache.c	Mon Jan 27 05:08:04 2003
++++ linux-2.4.19.SuSE/fs/dcache.c	Sat Nov 15 17:29:03 2003
+@@ -186,6 +186,13 @@
+ 		spin_unlock(&dcache_lock);
+ 		return 0;
+ 	}
++
++	/* network invalidation by Lustre */
++	if (dentry->d_flags & DCACHE_LUSTRE_INVALID) {
++		spin_unlock(&dcache_lock);
++		return 0;
++	}
++
+ 	/*
+ 	 * Check whether to do a partial shrink_dcache
+ 	 * to get rid of unused child entries.
+@@ -838,13 +845,19 @@
+  * Adds a dentry to the hash according to its name.
+  */
+  
+-void d_rehash(struct dentry * entry)
++void __d_rehash(struct dentry * entry, int lock)
+ {
+ 	struct list_head *list = d_hash(entry->d_parent, entry->d_name.hash);
+ 	if (!list_empty(&entry->d_hash)) BUG();
+-	spin_lock(&dcache_lock);
++	if (lock) spin_lock(&dcache_lock);
+ 	list_add(&entry->d_hash, list);
+-	spin_unlock(&dcache_lock);
++	if (lock) spin_unlock(&dcache_lock);
++}
++EXPORT_SYMBOL(__d_rehash);
++
++void d_rehash(struct dentry * entry)
++{
++	__d_rehash(entry, 1);
+ }
+ 
+ #define do_switch(x,y) do { \
+Index: linux-2.4.19.SuSE/fs/namespace.c
+===================================================================
+--- linux-2.4.19.SuSE.orig/fs/namespace.c	Mon Jan 27 05:08:07 2003
++++ linux-2.4.19.SuSE/fs/namespace.c	Sat Nov 15 17:56:42 2003
+@@ -97,6 +97,7 @@
+ {
+ 	old_nd->dentry = mnt->mnt_mountpoint;
+ 	old_nd->mnt = mnt->mnt_parent;
++	UNPIN(old_nd->dentry, old_nd->mnt, 1);
+ 	mnt->mnt_parent = mnt;
+ 	mnt->mnt_mountpoint = mnt->mnt_root;
+ 	list_del_init(&mnt->mnt_child);
+@@ -108,6 +109,7 @@
+ {
+ 	mnt->mnt_parent = mntget(nd->mnt);
+ 	mnt->mnt_mountpoint = dget(nd->dentry);
++	PIN(nd->dentry, nd->mnt, 1);
+ 	list_add(&mnt->mnt_hash, mount_hashtable+hash(nd->mnt, nd->dentry));
+ 	list_add(&mnt->mnt_child, &nd->mnt->mnt_mounts);
+ 	nd->dentry->d_mounted++;
+@@ -491,15 +493,18 @@
+ {
+ 	struct nameidata old_nd;
+ 	struct vfsmount *mnt = NULL;
++	struct lookup_intent it = { .it_op = IT_GETATTR };
+ 	int err = mount_is_safe(nd);
+ 	if (err)
+ 		return err;
+ 	if (!old_name || !*old_name)
+ 		return -EINVAL;
+ 	if (path_init(old_name, LOOKUP_POSITIVE|LOOKUP_FOLLOW, &old_nd))
+-		err = path_walk(old_name, &old_nd);
+-	if (err)
++		err = path_walk_it(old_name, &old_nd, &it);
++	if (err) {
++		intent_release(&it);
+ 		return err;
++	}
+ 
+ 	down_write(&current->namespace->sem);
+ 	err = -EINVAL;
+@@ -522,6 +527,7 @@
+ 	}
+ 
+ 	up_write(&current->namespace->sem);
++	intent_release(&it);
+ 	path_release(&old_nd);
+ 	return err;
+ }
+@@ -725,6 +731,7 @@
+ 		  unsigned long flags, void *data_page)
+ {
+ 	struct nameidata nd;
++	struct lookup_intent it = { .it_op = IT_GETATTR };
+ 	int retval = 0;
+ 	int mnt_flags = 0;
+ 
+@@ -750,9 +757,11 @@
+ 
+ 	/* ... and get the mountpoint */
+ 	if (path_init(dir_name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd))
+-		retval = path_walk(dir_name, &nd);
+-	if (retval)
++		retval = path_walk_it(dir_name, &nd, &it);
++	if (retval) {
++		intent_release(&it);
+ 		return retval;
++	}
+ 
+ 	if (flags & MS_REMOUNT)
+ 		retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags,
+@@ -764,6 +773,8 @@
+ 	else
+ 		retval = do_add_mount(&nd, type_page, flags, mnt_flags,
+ 				      dev_name, data_page);
++
++	intent_release(&it);
+ 	path_release(&nd);
+ 	return retval;
+ }
+@@ -929,6 +940,8 @@
+ {
+ 	struct vfsmount *tmp;
+ 	struct nameidata new_nd, old_nd, parent_nd, root_parent, user_nd;
++	struct lookup_intent new_it = { .it_op = IT_GETATTR };
++	struct lookup_intent old_it = { .it_op = IT_GETATTR };
+ 	char *name;
+ 	int error;
+ 
+@@ -943,7 +956,7 @@
+ 		goto out0;
+ 	error = 0;
+ 	if (path_init(name, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &new_nd))
+-		error = path_walk(name, &new_nd);
++		error = path_walk_it(name, &new_nd, &new_it);
+ 	putname(name);
+ 	if (error)
+ 		goto out0;
+@@ -957,7 +970,7 @@
+ 		goto out1;
+ 	error = 0;
+ 	if (path_init(name, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &old_nd))
+-		error = path_walk(name, &old_nd);
++		error = path_walk_it(name, &old_nd, &old_it);
+ 	putname(name);
+ 	if (error)
+ 		goto out1;
+@@ -1013,8 +1026,10 @@
+ 	up(&old_nd.dentry->d_inode->i_zombie);
+ 	up_write(&current->namespace->sem);
+ 	path_release(&user_nd);
++	intent_release(&old_it);
+ 	path_release(&old_nd);
+ out1:
++	intent_release(&new_it);
+ 	path_release(&new_nd);
+ out0:
+ 	unlock_kernel();
 Index: linux-2.4.19.SuSE/fs/namei.c
 ===================================================================
 --- linux-2.4.19.SuSE.orig/fs/namei.c	Mon Jan 27 05:08:07 2003
@@ -239,7 +357,7 @@ Index: linux-2.4.19.SuSE/fs/namei.c
  		}
  		/* This does the actual lookups.. */
 -		dentry = cached_lookup(nd->dentry, &this, LOOKUP_CONTINUE);
-+		dentry = cached_lookup(nd->dentry, &this, LOOKUP_CONTINUE, NULL);
++		dentry = cached_lookup(nd->dentry, &this, LOOKUP_CONTINUE,NULL);
  		if (!dentry) {
  			err = -EWOULDBLOCKIO;
  			if (atomic)
@@ -315,17 +433,15 @@ Index: linux-2.4.19.SuSE/fs/namei.c
 +				if (err)
 +					break;
 +				new = real_lookup(dentry->d_parent,
-+						  &dentry->d_name, 0, it);
++						  &dentry->d_name, 0, NULL);
++				d_invalidate(dentry);
++				dput(dentry);
 +				if (IS_ERR(new)) {
 +					err = PTR_ERR(new);
 +					break;
 +				}
-+				d_invalidate(dentry);
-+				dput(dentry);
 +				nd->dentry = new;
 +			}
-+			if (!nd->dentry->d_inode)
-+				goto no_inode;
 +		} else
  		if (dentry && dentry->d_op && dentry->d_op->d_revalidate) {
  			err = -ESTALE;
@@ -606,16 +722,12 @@ Index: linux-2.4.19.SuSE/fs/namei.c
  	if (IS_ERR(dentry))
  		goto fail;
  	if (!is_dir && nd->last.name[nd->last.len] && !dentry->d_inode)
-@@ -1286,7 +1414,20 @@
+@@ -1286,7 +1414,16 @@
  		error = path_walk(tmp, &nd);
  	if (error)
  		goto out;
 -	dentry = lookup_create(&nd, 0);
 +
-+	if (nd.last_type != LAST_NORM) {
-+		error = -EEXIST;
-+		goto out2;
-+	}
 +	if (nd.dentry->d_inode->i_op->mknod_raw) {
 +		struct inode_operations *op = nd.dentry->d_inode->i_op;
 +		error = op->mknod_raw(&nd, mode, dev);
@@ -636,15 +748,11 @@ Index: linux-2.4.19.SuSE/fs/namei.c
  	path_release(&nd);
  out:
  	putname(tmp);
-@@ -1356,7 +1494,18 @@
+@@ -1356,7 +1494,14 @@
  			error = path_walk(tmp, &nd);
  		if (error)
  			goto out;
 -		dentry = lookup_create(&nd, 1);
-+		if (nd.last_type != LAST_NORM) {
-+			error = -EEXIST;
-+			goto out2;
-+		}
 +		if (nd.dentry->d_inode->i_op->mkdir_raw) {
 +			struct inode_operations *op = nd.dentry->d_inode->i_op;
 +			error = op->mkdir_raw(&nd, mode);
@@ -699,15 +807,11 @@ Index: linux-2.4.19.SuSE/fs/namei.c
  	error = PTR_ERR(dentry);
  	if (!IS_ERR(dentry)) {
  		/* Why not before? Because we want correct error value */
-@@ -1595,15 +1756,27 @@
+@@ -1595,15 +1756,23 @@
  			error = path_walk(to, &nd);
  		if (error)
  			goto out;
 -		dentry = lookup_create(&nd, 0);
-+		if (nd.last_type != LAST_NORM) {
-+			error = -EEXIST;
-+			goto out2;
-+		}
 +		if (nd.dentry->d_inode->i_op->symlink_raw) {
 +			struct inode_operations *op = nd.dentry->d_inode->i_op;
 +			error = op->symlink_raw(&nd, from);
@@ -734,10 +838,6 @@ Index: linux-2.4.19.SuSE/fs/namei.c
  		if (old_nd.mnt != nd.mnt)
  			goto out_release;
 -		new_dentry = lookup_create(&nd, 0);
-+		if (nd.last_type != LAST_NORM) {
-+			error = -EEXIST;
-+			goto out_release;
-+		}
 +		if (nd.dentry->d_inode->i_op->link_raw) {
 +			struct inode_operations *op = nd.dentry->d_inode->i_op;
 +			error = op->link_raw(&old_nd, &nd);
@@ -859,124 +959,6 @@ Index: linux-2.4.19.SuSE/fs/namei.c
  	if (page) {
  		kunmap(page);
  		page_cache_release(page);
-Index: linux-2.4.19.SuSE/fs/namespace.c
-===================================================================
---- linux-2.4.19.SuSE.orig/fs/namespace.c	Mon Jan 27 05:08:07 2003
-+++ linux-2.4.19.SuSE/fs/namespace.c	Sat Nov 15 17:56:42 2003
-@@ -97,6 +97,7 @@
- {
- 	old_nd->dentry = mnt->mnt_mountpoint;
- 	old_nd->mnt = mnt->mnt_parent;
-+	UNPIN(old_nd->dentry, old_nd->mnt, 1);
- 	mnt->mnt_parent = mnt;
- 	mnt->mnt_mountpoint = mnt->mnt_root;
- 	list_del_init(&mnt->mnt_child);
-@@ -108,6 +109,7 @@
- {
- 	mnt->mnt_parent = mntget(nd->mnt);
- 	mnt->mnt_mountpoint = dget(nd->dentry);
-+	PIN(nd->dentry, nd->mnt, 1);
- 	list_add(&mnt->mnt_hash, mount_hashtable+hash(nd->mnt, nd->dentry));
- 	list_add(&mnt->mnt_child, &nd->mnt->mnt_mounts);
- 	nd->dentry->d_mounted++;
-@@ -491,15 +493,18 @@
- {
- 	struct nameidata old_nd;
- 	struct vfsmount *mnt = NULL;
-+	struct lookup_intent it = { .it_op = IT_GETATTR };
- 	int err = mount_is_safe(nd);
- 	if (err)
- 		return err;
- 	if (!old_name || !*old_name)
- 		return -EINVAL;
- 	if (path_init(old_name, LOOKUP_POSITIVE|LOOKUP_FOLLOW, &old_nd))
--		err = path_walk(old_name, &old_nd);
--	if (err)
-+		err = path_walk_it(old_name, &old_nd, &it);
-+	if (err) {
-+		intent_release(&it);
- 		return err;
-+	}
- 
- 	down_write(&current->namespace->sem);
- 	err = -EINVAL;
-@@ -522,6 +527,7 @@
- 	}
- 
- 	up_write(&current->namespace->sem);
-+	intent_release(&it);
- 	path_release(&old_nd);
- 	return err;
- }
-@@ -725,6 +731,7 @@
- 		  unsigned long flags, void *data_page)
- {
- 	struct nameidata nd;
-+	struct lookup_intent it = { .it_op = IT_GETATTR };
- 	int retval = 0;
- 	int mnt_flags = 0;
- 
-@@ -750,9 +757,11 @@
- 
- 	/* ... and get the mountpoint */
- 	if (path_init(dir_name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd))
--		retval = path_walk(dir_name, &nd);
--	if (retval)
-+		retval = path_walk_it(dir_name, &nd, &it);
-+	if (retval) {
-+		intent_release(&it);
- 		return retval;
-+	}
- 
- 	if (flags & MS_REMOUNT)
- 		retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags,
-@@ -764,6 +773,8 @@
- 	else
- 		retval = do_add_mount(&nd, type_page, flags, mnt_flags,
- 				      dev_name, data_page);
-+
-+	intent_release(&it);
- 	path_release(&nd);
- 	return retval;
- }
-@@ -929,6 +940,8 @@
- {
- 	struct vfsmount *tmp;
- 	struct nameidata new_nd, old_nd, parent_nd, root_parent, user_nd;
-+	struct lookup_intent new_it = { .it_op = IT_GETATTR };
-+	struct lookup_intent old_it = { .it_op = IT_GETATTR };
- 	char *name;
- 	int error;
- 
-@@ -943,7 +956,7 @@
- 		goto out0;
- 	error = 0;
- 	if (path_init(name, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &new_nd))
--		error = path_walk(name, &new_nd);
-+		error = path_walk_it(name, &new_nd, &new_it);
- 	putname(name);
- 	if (error)
- 		goto out0;
-@@ -957,7 +970,7 @@
- 		goto out1;
- 	error = 0;
- 	if (path_init(name, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &old_nd))
--		error = path_walk(name, &old_nd);
-+		error = path_walk_it(name, &old_nd, &old_it);
- 	putname(name);
- 	if (error)
- 		goto out1;
-@@ -1013,8 +1026,10 @@
- 	up(&old_nd.dentry->d_inode->i_zombie);
- 	up_write(&current->namespace->sem);
- 	path_release(&user_nd);
-+	intent_release(&old_it);
- 	path_release(&old_nd);
- out1:
-+	intent_release(&new_it);
- 	path_release(&new_nd);
- out0:
- 	unlock_kernel();
 Index: linux-2.4.19.SuSE/fs/open.c
 ===================================================================
 --- linux-2.4.19.SuSE.orig/fs/open.c	Mon Jan 27 05:08:00 2003
@@ -1395,7 +1377,7 @@ Index: linux-2.4.19.SuSE/fs/stat.c
 ===================================================================
 --- linux-2.4.19.SuSE.orig/fs/stat.c	Mon Jan 27 05:08:00 2003
 +++ linux-2.4.19.SuSE/fs/stat.c	Sat Nov 15 17:29:03 2003
-@@ -17,10 +17,16 @@
+@@ -17,10 +17,14 @@
   * Revalidate the inode. This is required for proper NFS attribute caching.
   */
  static __inline__ int
@@ -1404,6 +1386,8 @@ Index: linux-2.4.19.SuSE/fs/stat.c
  {
  	struct inode * inode = dentry->d_inode;
 -	if (inode->i_op && inode->i_op->revalidate)
++	if (!inode)
++		return -ENOENT;
 +	if (inode->i_op && inode->i_op->revalidate_it)
 +		return inode->i_op->revalidate_it(dentry, it);
 +	else if (inode->i_op && inode->i_op->revalidate)
@@ -1657,7 +1641,7 @@ Index: linux-2.4.19.SuSE/include/linux/fs.h
  #define ATTR_ATTR_FLAG	1024
 +#define ATTR_RAW	0x0800	/* file system, not vfs will massage attrs */
 +#define ATTR_FROM_OPEN	0x1000	/* called from open path, ie O_TRUNC */
-+#define ATTR_CTIME_SET	0x2000
++#define ATTR_CTIME_SET 0x2000
  
  /*
   * This is the Inode Attributes structure, used for notify_change().  It
@@ -1800,25 +1784,18 @@ Index: linux-2.4.19.SuSE/include/linux/fs_struct.h
  		dput(old_pwd);
  		mntput(old_pwdmnt);
  	}
-Index: linux-2.4.19.SuSE/kernel/exit.c
+Index: linux-2.4.19.SuSE/kernel/ksyms.c
 ===================================================================
---- linux-2.4.19.SuSE.orig/kernel/exit.c	Mon Jan 27 05:08:16 2003
-+++ linux-2.4.19.SuSE/kernel/exit.c	Sat Nov 15 17:29:03 2003
-@@ -288,11 +288,14 @@
- {
- 	/* No need to hold fs->lock if we are killing it */
- 	if (atomic_dec_and_test(&fs->count)) {
-+		UNPIN(fs->pwd, fs->pwdmnt, 0);
-+		UNPIN(fs->root, fs->rootmnt, 1);
- 		dput(fs->root);
- 		mntput(fs->rootmnt);
- 		dput(fs->pwd);
- 		mntput(fs->pwdmnt);
- 		if (fs->altroot) {
-+			UNPIN(fs->altroot, fs->altrootmnt, 1);
- 			dput(fs->altroot);
- 			mntput(fs->altrootmnt);
- 		}
+--- linux-2.4.19.SuSE.orig/kernel/ksyms.c	Sat Nov 15 17:24:46 2003
++++ linux-2.4.19.SuSE/kernel/ksyms.c	Sat Nov 15 17:29:03 2003
+@@ -315,6 +315,7 @@
+ EXPORT_SYMBOL(set_page_dirty);
+ EXPORT_SYMBOL(vfs_readlink);
+ EXPORT_SYMBOL(vfs_follow_link);
++EXPORT_SYMBOL(vfs_follow_link_it);
+ EXPORT_SYMBOL(page_readlink);
+ EXPORT_SYMBOL(page_follow_link);
+ EXPORT_SYMBOL(page_symlink_inode_operations);
 Index: linux-2.4.19.SuSE/kernel/fork.c
 ===================================================================
 --- linux-2.4.19.SuSE.orig/kernel/fork.c	Mon Jan 27 05:08:56 2003
@@ -1837,15 +1814,22 @@ Index: linux-2.4.19.SuSE/kernel/fork.c
  			fs->altrootmnt = mntget(old->altrootmnt);
  			fs->altroot = dget(old->altroot);
  		} else {
-Index: linux-2.4.19.SuSE/kernel/ksyms.c
+Index: linux-2.4.19.SuSE/kernel/exit.c
 ===================================================================
---- linux-2.4.19.SuSE.orig/kernel/ksyms.c	Sat Nov 15 17:24:46 2003
-+++ linux-2.4.19.SuSE/kernel/ksyms.c	Sat Nov 15 17:29:03 2003
-@@ -315,6 +315,7 @@
- EXPORT_SYMBOL(set_page_dirty);
- EXPORT_SYMBOL(vfs_readlink);
- EXPORT_SYMBOL(vfs_follow_link);
-+EXPORT_SYMBOL(vfs_follow_link_it);
- EXPORT_SYMBOL(page_readlink);
- EXPORT_SYMBOL(page_follow_link);
- EXPORT_SYMBOL(page_symlink_inode_operations);
+--- linux-2.4.19.SuSE.orig/kernel/exit.c	Mon Jan 27 05:08:16 2003
++++ linux-2.4.19.SuSE/kernel/exit.c	Sat Nov 15 17:29:03 2003
+@@ -288,11 +288,14 @@
+ {
+ 	/* No need to hold fs->lock if we are killing it */
+ 	if (atomic_dec_and_test(&fs->count)) {
++		UNPIN(fs->pwd, fs->pwdmnt, 0);
++		UNPIN(fs->root, fs->rootmnt, 1);
+ 		dput(fs->root);
+ 		mntput(fs->rootmnt);
+ 		dput(fs->pwd);
+ 		mntput(fs->pwdmnt);
+ 		if (fs->altroot) {
++			UNPIN(fs->altroot, fs->altrootmnt, 1);
+ 			dput(fs->altroot);
+ 			mntput(fs->altrootmnt);
+ 		}
diff --git a/lustre/kernel_patches/patches/vfs_intent-2.4.20-hp.patch b/lustre/kernel_patches/patches/vfs_intent-2.4.20-hp.patch
index 2af2a04..8585701 100644
--- a/lustre/kernel_patches/patches/vfs_intent-2.4.20-hp.patch
+++ b/lustre/kernel_patches/patches/vfs_intent-2.4.20-hp.patch
@@ -13,47 +13,6 @@
  kernel/ksyms.c            |    1 
  13 files changed, 591 insertions(+), 133 deletions(-)
 
-Index: linux/fs/dcache.c
-===================================================================
---- linux.orig/fs/dcache.c	Thu Nov 28 18:53:15 2002
-+++ linux/fs/dcache.c	Wed Mar 17 13:11:25 2004
-@@ -181,6 +181,13 @@
- 		spin_unlock(&dcache_lock);
- 		return 0;
- 	}
-+
-+	/* network invalidation by Lustre */
-+	if (dentry->d_flags & DCACHE_LUSTRE_INVALID) {
-+		spin_unlock(&dcache_lock);
-+		return 0;
-+	}
-+
- 	/*
- 	 * Check whether to do a partial shrink_dcache
- 	 * to get rid of unused child entries.
-@@ -830,13 +837,19 @@
-  * Adds a dentry to the hash according to its name.
-  */
-  
--void d_rehash(struct dentry * entry)
-+void __d_rehash(struct dentry * entry, int lock)
- {
- 	struct list_head *list = d_hash(entry->d_parent, entry->d_name.hash);
- 	if (!list_empty(&entry->d_hash)) BUG();
--	spin_lock(&dcache_lock);
-+	if (lock) spin_lock(&dcache_lock);
- 	list_add(&entry->d_hash, list);
--	spin_unlock(&dcache_lock);
-+	if (lock) spin_unlock(&dcache_lock);
-+}
-+EXPORT_SYMBOL(__d_rehash);
-+
-+void d_rehash(struct dentry * entry)
-+{
-+	__d_rehash(entry, 1);
- }
- 
- #define do_switch(x,y) do { \
 Index: linux/fs/exec.c
 ===================================================================
 --- linux.orig/fs/exec.c	Wed Mar 17 13:00:38 2004
@@ -119,6 +78,164 @@ Index: linux/fs/exec.c
  		goto close_fail;
  
  	retval = binfmt->core_dump(signr, regs, file);
+Index: linux/fs/dcache.c
+===================================================================
+--- linux.orig/fs/dcache.c	Thu Nov 28 18:53:15 2002
++++ linux/fs/dcache.c	Wed Mar 17 13:11:25 2004
+@@ -181,6 +181,13 @@
+ 		spin_unlock(&dcache_lock);
+ 		return 0;
+ 	}
++
++	/* network invalidation by Lustre */
++	if (dentry->d_flags & DCACHE_LUSTRE_INVALID) {
++		spin_unlock(&dcache_lock);
++		return 0;
++	}
++
+ 	/*
+ 	 * Check whether to do a partial shrink_dcache
+ 	 * to get rid of unused child entries.
+@@ -830,13 +837,19 @@
+  * Adds a dentry to the hash according to its name.
+  */
+  
+-void d_rehash(struct dentry * entry)
++void __d_rehash(struct dentry * entry, int lock)
+ {
+ 	struct list_head *list = d_hash(entry->d_parent, entry->d_name.hash);
+ 	if (!list_empty(&entry->d_hash)) BUG();
+-	spin_lock(&dcache_lock);
++	if (lock) spin_lock(&dcache_lock);
+ 	list_add(&entry->d_hash, list);
+-	spin_unlock(&dcache_lock);
++	if (lock) spin_unlock(&dcache_lock);
++}
++EXPORT_SYMBOL(__d_rehash);
++
++void d_rehash(struct dentry * entry)
++{
++	__d_rehash(entry, 1);
+ }
+ 
+ #define do_switch(x,y) do { \
+Index: linux/fs/namespace.c
+===================================================================
+--- linux.orig/fs/namespace.c	Thu Nov 28 18:53:15 2002
++++ linux/fs/namespace.c	Wed Mar 17 13:11:25 2004
+@@ -99,6 +99,7 @@
+ {
+ 	old_nd->dentry = mnt->mnt_mountpoint;
+ 	old_nd->mnt = mnt->mnt_parent;
++	UNPIN(old_nd->dentry, old_nd->mnt, 1);
+ 	mnt->mnt_parent = mnt;
+ 	mnt->mnt_mountpoint = mnt->mnt_root;
+ 	list_del_init(&mnt->mnt_child);
+@@ -110,6 +111,7 @@
+ {
+ 	mnt->mnt_parent = mntget(nd->mnt);
+ 	mnt->mnt_mountpoint = dget(nd->dentry);
++	PIN(nd->dentry, nd->mnt, 1);
+ 	list_add(&mnt->mnt_hash, mount_hashtable+hash(nd->mnt, nd->dentry));
+ 	list_add(&mnt->mnt_child, &nd->mnt->mnt_mounts);
+ 	nd->dentry->d_mounted++;
+@@ -485,14 +487,17 @@
+ {
+ 	struct nameidata old_nd;
+ 	struct vfsmount *mnt = NULL;
++	struct lookup_intent it = { .it_op = IT_GETATTR };
+ 	int err = mount_is_safe(nd);
+ 	if (err)
+ 		return err;
+ 	if (!old_name || !*old_name)
+ 		return -EINVAL;
+-	err = path_lookup(old_name, LOOKUP_POSITIVE|LOOKUP_FOLLOW, &old_nd);
+-	if (err)
++	err = path_lookup_it(old_name, LOOKUP_POSITIVE|LOOKUP_FOLLOW, &old_nd, &it);
++	if (err) {
++		intent_release(&it);
+ 		return err;
++	}
+ 
+ 	down_write(&current->namespace->sem);
+ 	err = -EINVAL;
+@@ -515,6 +520,7 @@
+ 	}
+ 
+ 	up_write(&current->namespace->sem);
++	intent_release(&it);
+ 	path_release(&old_nd);
+ 	return err;
+ }
+@@ -698,6 +704,7 @@
+ 		  unsigned long flags, void *data_page)
+ {
+ 	struct nameidata nd;
++	struct lookup_intent it = { .it_op = IT_GETATTR };
+ 	int retval = 0;
+ 	int mnt_flags = 0;
+ 
+@@ -722,10 +729,11 @@
+ 	flags &= ~(MS_NOSUID|MS_NOEXEC|MS_NODEV);
+ 
+ 	/* ... and get the mountpoint */
+-	retval = path_lookup(dir_name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd);
+-	if (retval)
++	retval = path_lookup_it(dir_name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd, &it);
++	if (retval) {
++		intent_release(&it);
+ 		return retval;
+-
++	}
+ 	if (flags & MS_REMOUNT)
+ 		retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags,
+ 				    data_page);
+@@ -736,6 +744,8 @@
+ 	else
+ 		retval = do_add_mount(&nd, type_page, flags, mnt_flags,
+ 				      dev_name, data_page);
++
++	intent_release(&it);
+ 	path_release(&nd);
+ 	return retval;
+ }
+@@ -901,6 +911,8 @@
+ {
+ 	struct vfsmount *tmp;
+ 	struct nameidata new_nd, old_nd, parent_nd, root_parent, user_nd;
++	struct lookup_intent new_it = { .it_op = IT_GETATTR };
++	struct lookup_intent old_it = { .it_op = IT_GETATTR };
+ 	int error;
+ 
+ 	if (!capable(CAP_SYS_ADMIN))
+@@ -908,14 +920,14 @@
+ 
+ 	lock_kernel();
+ 
+-	error = __user_walk(new_root, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &new_nd);
++	error = __user_walk_it(new_root, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &new_nd, &new_it);
+ 	if (error)
+ 		goto out0;
+ 	error = -EINVAL;
+ 	if (!check_mnt(new_nd.mnt))
+ 		goto out1;
+ 
+-	error = __user_walk(put_old, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &old_nd);
++	error = __user_walk_it(put_old, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &old_nd, &old_it);
+ 	if (error)
+ 		goto out1;
+ 
+@@ -970,8 +982,10 @@
+ 	up(&old_nd.dentry->d_inode->i_zombie);
+ 	up_write(&current->namespace->sem);
+ 	path_release(&user_nd);
++	intent_release(&old_it);
+ 	path_release(&old_nd);
+ out1:
++	intent_release(&new_it);
+ 	path_release(&new_nd);
+ out0:
+ 	unlock_kernel();
 Index: linux/fs/namei.c
 ===================================================================
 --- linux.orig/fs/namei.c	Wed Mar 17 13:00:37 2004
@@ -370,13 +487,13 @@ Index: linux/fs/namei.c
 +				if (err)
 +					break;
 +				new = real_lookup(dentry->d_parent,
-+						  &dentry->d_name, 0, it);
++						  &dentry->d_name, 0, NULL);
++				d_invalidate(dentry);
++				dput(dentry);
 +				if (IS_ERR(new)) {
 +					err = PTR_ERR(new);
 +					break;
 +				}
-+				d_invalidate(dentry);
-+				dput(dentry);
 +				nd->dentry = new;
 +			}
 +			if (!nd->dentry->d_inode)
@@ -948,123 +1065,6 @@ Index: linux/fs/namei.c
  	if (page) {
  		kunmap(page);
  		page_cache_release(page);
-Index: linux/fs/namespace.c
-===================================================================
---- linux.orig/fs/namespace.c	Thu Nov 28 18:53:15 2002
-+++ linux/fs/namespace.c	Wed Mar 17 13:11:25 2004
-@@ -99,6 +99,7 @@
- {
- 	old_nd->dentry = mnt->mnt_mountpoint;
- 	old_nd->mnt = mnt->mnt_parent;
-+	UNPIN(old_nd->dentry, old_nd->mnt, 1);
- 	mnt->mnt_parent = mnt;
- 	mnt->mnt_mountpoint = mnt->mnt_root;
- 	list_del_init(&mnt->mnt_child);
-@@ -110,6 +111,7 @@
- {
- 	mnt->mnt_parent = mntget(nd->mnt);
- 	mnt->mnt_mountpoint = dget(nd->dentry);
-+	PIN(nd->dentry, nd->mnt, 1);
- 	list_add(&mnt->mnt_hash, mount_hashtable+hash(nd->mnt, nd->dentry));
- 	list_add(&mnt->mnt_child, &nd->mnt->mnt_mounts);
- 	nd->dentry->d_mounted++;
-@@ -485,14 +487,17 @@
- {
- 	struct nameidata old_nd;
- 	struct vfsmount *mnt = NULL;
-+	struct lookup_intent it = { .it_op = IT_GETATTR };
- 	int err = mount_is_safe(nd);
- 	if (err)
- 		return err;
- 	if (!old_name || !*old_name)
- 		return -EINVAL;
--	err = path_lookup(old_name, LOOKUP_POSITIVE|LOOKUP_FOLLOW, &old_nd);
--	if (err)
-+	err = path_lookup_it(old_name, LOOKUP_POSITIVE|LOOKUP_FOLLOW, &old_nd, &it);
-+	if (err) {
-+		intent_release(&it);
- 		return err;
-+	}
- 
- 	down_write(&current->namespace->sem);
- 	err = -EINVAL;
-@@ -515,6 +520,7 @@
- 	}
- 
- 	up_write(&current->namespace->sem);
-+	intent_release(&it);
- 	path_release(&old_nd);
- 	return err;
- }
-@@ -698,6 +704,7 @@
- 		  unsigned long flags, void *data_page)
- {
- 	struct nameidata nd;
-+	struct lookup_intent it = { .it_op = IT_GETATTR };
- 	int retval = 0;
- 	int mnt_flags = 0;
- 
-@@ -722,10 +729,11 @@
- 	flags &= ~(MS_NOSUID|MS_NOEXEC|MS_NODEV);
- 
- 	/* ... and get the mountpoint */
--	retval = path_lookup(dir_name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd);
--	if (retval)
-+	retval = path_lookup_it(dir_name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd, &it);
-+	if (retval) {
-+		intent_release(&it);
- 		return retval;
--
-+	}
- 	if (flags & MS_REMOUNT)
- 		retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags,
- 				    data_page);
-@@ -736,6 +744,8 @@
- 	else
- 		retval = do_add_mount(&nd, type_page, flags, mnt_flags,
- 				      dev_name, data_page);
-+
-+	intent_release(&it);
- 	path_release(&nd);
- 	return retval;
- }
-@@ -901,6 +911,8 @@
- {
- 	struct vfsmount *tmp;
- 	struct nameidata new_nd, old_nd, parent_nd, root_parent, user_nd;
-+	struct lookup_intent new_it = { .it_op = IT_GETATTR };
-+	struct lookup_intent old_it = { .it_op = IT_GETATTR };
- 	int error;
- 
- 	if (!capable(CAP_SYS_ADMIN))
-@@ -908,14 +920,14 @@
- 
- 	lock_kernel();
- 
--	error = __user_walk(new_root, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &new_nd);
-+	error = __user_walk_it(new_root, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &new_nd, &new_it);
- 	if (error)
- 		goto out0;
- 	error = -EINVAL;
- 	if (!check_mnt(new_nd.mnt))
- 		goto out1;
- 
--	error = __user_walk(put_old, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &old_nd);
-+	error = __user_walk_it(put_old, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &old_nd, &old_it);
- 	if (error)
- 		goto out1;
- 
-@@ -970,8 +982,10 @@
- 	up(&old_nd.dentry->d_inode->i_zombie);
- 	up_write(&current->namespace->sem);
- 	path_release(&user_nd);
-+	intent_release(&old_it);
- 	path_release(&old_nd);
- out1:
-+	intent_release(&new_it);
- 	path_release(&new_nd);
- out0:
- 	unlock_kernel();
 Index: linux/fs/open.c
 ===================================================================
 --- linux.orig/fs/open.c	Thu Nov 28 18:53:15 2002
@@ -1467,20 +1467,6 @@ Index: linux/fs/open.c
  /*
   * Find an empty file descriptor entry, and mark it busy.
   */
-Index: linux/fs/proc/base.c
-===================================================================
---- linux.orig/fs/proc/base.c	Wed Mar 17 13:00:35 2004
-+++ linux/fs/proc/base.c	Wed Mar 17 13:11:25 2004
-@@ -481,6 +481,9 @@
- 
- 	error = inode->u.proc_i.op.proc_get_link(inode, &nd->dentry, &nd->mnt);
- 	nd->last_type = LAST_BIND;
-+
-+	if (nd->intent != NULL)
-+		nd->intent->d.lustre.it_int_flags |= IT_FL_FOLLOWED;
- out:
- 	return error;
- }
 Index: linux/fs/stat.c
 ===================================================================
 --- linux.orig/fs/stat.c	Thu Sep 13 19:04:43 2001
@@ -1642,6 +1628,20 @@ Index: linux/fs/stat.c
  		if (!err)
  			err = cp_new_stat64(dentry->d_inode, statbuf);
  		fput(f);
+Index: linux/fs/proc/base.c
+===================================================================
+--- linux.orig/fs/proc/base.c	Wed Mar 17 13:00:35 2004
++++ linux/fs/proc/base.c	Wed Mar 17 13:11:25 2004
+@@ -481,6 +481,9 @@
+ 
+ 	error = inode->u.proc_i.op.proc_get_link(inode, &nd->dentry, &nd->mnt);
+ 	nd->last_type = LAST_BIND;
++
++	if (nd->intent != NULL)
++		nd->intent->d.lustre.it_int_flags |= IT_FL_FOLLOWED;
+ out:
+ 	return error;
+ }
 Index: linux/include/linux/dcache.h
 ===================================================================
 --- linux.orig/include/linux/dcache.h	Thu Nov 28 18:53:15 2002
@@ -1747,7 +1747,7 @@ Index: linux/include/linux/fs.h
  #define ATTR_ATTR_FLAG	1024
 +#define ATTR_RAW	0x0800	/* file system, not vfs will massage attrs */
 +#define ATTR_FROM_OPEN	0x1000	/* called from open path, ie O_TRUNC */
-+#define ATTR_CTIME_SET	0x2000
++#define ATTR_CTIME_SET 0x2000
  
  /*
   * This is the Inode Attributes structure, used for notify_change().  It
@@ -1890,25 +1890,18 @@ Index: linux/include/linux/fs_struct.h
  		dput(old_pwd);
  		mntput(old_pwdmnt);
  	}
-Index: linux/kernel/exit.c
+Index: linux/kernel/ksyms.c
 ===================================================================
---- linux.orig/kernel/exit.c	Wed Mar 17 13:00:38 2004
-+++ linux/kernel/exit.c	Wed Mar 17 13:11:25 2004
-@@ -239,11 +239,14 @@
- {
- 	/* No need to hold fs->lock if we are killing it */
- 	if (atomic_dec_and_test(&fs->count)) {
-+		UNPIN(fs->pwd, fs->pwdmnt, 0);
-+		UNPIN(fs->root, fs->rootmnt, 1);
- 		dput(fs->root);
- 		mntput(fs->rootmnt);
- 		dput(fs->pwd);
- 		mntput(fs->pwdmnt);
- 		if (fs->altroot) {
-+			UNPIN(fs->altroot, fs->altrootmnt, 1);
- 			dput(fs->altroot);
- 			mntput(fs->altrootmnt);
- 		}
+--- linux.orig/kernel/ksyms.c	Wed Mar 17 13:11:23 2004
++++ linux/kernel/ksyms.c	Wed Mar 17 13:11:25 2004
+@@ -315,6 +315,7 @@
+ EXPORT_SYMBOL(set_page_dirty);
+ EXPORT_SYMBOL(vfs_readlink);
+ EXPORT_SYMBOL(vfs_follow_link);
++EXPORT_SYMBOL(vfs_follow_link_it);
+ EXPORT_SYMBOL(page_readlink);
+ EXPORT_SYMBOL(page_follow_link);
+ EXPORT_SYMBOL(page_symlink_inode_operations);
 Index: linux/kernel/fork.c
 ===================================================================
 --- linux.orig/kernel/fork.c	Wed Mar 17 13:00:38 2004
@@ -1927,15 +1920,22 @@ Index: linux/kernel/fork.c
  			fs->altrootmnt = mntget(old->altrootmnt);
  			fs->altroot = dget(old->altroot);
  		} else {
-Index: linux/kernel/ksyms.c
+Index: linux/kernel/exit.c
 ===================================================================
---- linux.orig/kernel/ksyms.c	Wed Mar 17 13:11:23 2004
-+++ linux/kernel/ksyms.c	Wed Mar 17 13:11:25 2004
-@@ -315,6 +315,7 @@
- EXPORT_SYMBOL(set_page_dirty);
- EXPORT_SYMBOL(vfs_readlink);
- EXPORT_SYMBOL(vfs_follow_link);
-+EXPORT_SYMBOL(vfs_follow_link_it);
- EXPORT_SYMBOL(page_readlink);
- EXPORT_SYMBOL(page_follow_link);
- EXPORT_SYMBOL(page_symlink_inode_operations);
+--- linux.orig/kernel/exit.c	Wed Mar 17 13:00:38 2004
++++ linux/kernel/exit.c	Wed Mar 17 13:11:25 2004
+@@ -239,11 +239,14 @@
+ {
+ 	/* No need to hold fs->lock if we are killing it */
+ 	if (atomic_dec_and_test(&fs->count)) {
++		UNPIN(fs->pwd, fs->pwdmnt, 0);
++		UNPIN(fs->root, fs->rootmnt, 1);
+ 		dput(fs->root);
+ 		mntput(fs->rootmnt);
+ 		dput(fs->pwd);
+ 		mntput(fs->pwdmnt);
+ 		if (fs->altroot) {
++			UNPIN(fs->altroot, fs->altrootmnt, 1);
+ 			dput(fs->altroot);
+ 			mntput(fs->altrootmnt);
+ 		}
diff --git a/lustre/kernel_patches/patches/vfs_intent-2.4.20-rh.patch b/lustre/kernel_patches/patches/vfs_intent-2.4.20-rh.patch
index 87eedc1..409c8f0 100644
--- a/lustre/kernel_patches/patches/vfs_intent-2.4.20-rh.patch
+++ b/lustre/kernel_patches/patches/vfs_intent-2.4.20-rh.patch
@@ -286,7 +286,7 @@ Index: linux-2.4.20/fs/namei.c
  {
  	struct dentry *dentry;
  	struct inode *inode;
-@@ -526,18 +579,18 @@
+@@ -526,19 +579,18 @@
  				break;
  		}
  		/* This does the actual lookups.. */
@@ -304,10 +304,11 @@ Index: linux-2.4.20/fs/namei.c
  		}
  		/* Check mountpoints.. */
 -		while (d_mountpoint(dentry) && __follow_down(&nd->mnt, &dentry))
-+		while (d_mountpoint(dentry) && __follow_down(&nd->mnt, &dentry, NULL))
- 			;
+-			;
++		while (d_mountpoint(dentry) && __follow_down(&nd->mnt, &dentry, NULL));
  
  		err = -ENOENT;
+ 		inode = dentry->d_inode;
 @@ -549,7 +601,7 @@
  			goto out_dput;
  
@@ -376,13 +377,13 @@ Index: linux-2.4.20/fs/namei.c
 +				if (err)
 +					break;
 +				new = real_lookup(dentry->d_parent,
-+						  &dentry->d_name, 0, it);
++						  &dentry->d_name, 0, NULL);
++				d_invalidate(dentry);
++				dput(dentry);
 +				if (IS_ERR(new)) {
 +					err = PTR_ERR(new);
 +					break;
 +				}
-+				d_invalidate(dentry);
-+				dput(dentry);
 +				nd->dentry = new;
 +			}
 +			if (!nd->dentry->d_inode)
@@ -1010,7 +1011,7 @@ Index: linux-2.4.20/fs/namespace.c
  	int retval = 0;
  	int mnt_flags = 0;
  
-@@ -722,9 +729,11 @@
+@@ -722,10 +729,11 @@
  	flags &= ~(MS_NOSUID|MS_NOEXEC|MS_NODEV);
  
  	/* ... and get the mountpoint */
@@ -1020,10 +1021,11 @@ Index: linux-2.4.20/fs/namespace.c
 +	if (retval) {
 +		intent_release(&it);
  		return retval;
+-
 +	}
- 
  	if (flags & MS_REMOUNT)
  		retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags,
+ 				    data_page);
 @@ -736,6 +744,8 @@
  	else
  		retval = do_add_mount(&nd, type_page, flags, mnt_flags,
@@ -1281,7 +1283,7 @@ Index: linux-2.4.20/fs/open.c
 -	error = __user_walk(filename, LOOKUP_POSITIVE | LOOKUP_FOLLOW |
 -		      LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd);
 +	error = __user_walk_it(filename, LOOKUP_POSITIVE | LOOKUP_FOLLOW |
-+			       LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd, &it);
++		      LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd, &it);
  	if (error)
  		goto out;
  
@@ -1678,7 +1680,7 @@ Index: linux-2.4.20/include/linux/fs.h
  #define ATTR_ATTR_FLAG	1024
 +#define ATTR_RAW	0x0800	/* file system, not vfs will massage attrs */
 +#define ATTR_FROM_OPEN	0x1000	/* called from open path, ie O_TRUNC */
-+#define ATTR_CTIME_SET	0x2000
++#define ATTR_CTIME_SET 0x2000
  
  /*
   * This is the Inode Attributes structure, used for notify_change().  It
@@ -1821,25 +1823,18 @@ Index: linux-2.4.20/include/linux/fs_struct.h
  		dput(old_pwd);
  		mntput(old_pwdmnt);
  	}
-Index: linux-2.4.20/kernel/exit.c
+Index: linux-2.4.20/kernel/ksyms.c
 ===================================================================
---- linux-2.4.20.orig/kernel/exit.c	Wed Mar 17 13:57:05 2004
-+++ linux-2.4.20/kernel/exit.c	Wed Mar 17 13:57:11 2004
-@@ -345,11 +345,14 @@
- {
- 	/* No need to hold fs->lock if we are killing it */
- 	if (atomic_dec_and_test(&fs->count)) {
-+		UNPIN(fs->pwd, fs->pwdmnt, 0);
-+		UNPIN(fs->root, fs->rootmnt, 1);
- 		dput(fs->root);
- 		mntput(fs->rootmnt);
- 		dput(fs->pwd);
- 		mntput(fs->pwdmnt);
- 		if (fs->altroot) {
-+			UNPIN(fs->altroot, fs->altrootmnt, 1);
- 			dput(fs->altroot);
- 			mntput(fs->altrootmnt);
- 		}
+--- linux-2.4.20.orig/kernel/ksyms.c	Wed Mar 17 13:57:11 2004
++++ linux-2.4.20/kernel/ksyms.c	Wed Mar 17 13:57:11 2004
+@@ -297,6 +297,7 @@
+ EXPORT_SYMBOL(set_page_dirty);
+ EXPORT_SYMBOL(vfs_readlink);
+ EXPORT_SYMBOL(vfs_follow_link);
++EXPORT_SYMBOL(vfs_follow_link_it);
+ EXPORT_SYMBOL(page_readlink);
+ EXPORT_SYMBOL(page_follow_link);
+ EXPORT_SYMBOL(page_symlink_inode_operations);
 Index: linux-2.4.20/kernel/fork.c
 ===================================================================
 --- linux-2.4.20.orig/kernel/fork.c	Wed Mar 17 13:57:05 2004
@@ -1858,15 +1853,22 @@ Index: linux-2.4.20/kernel/fork.c
  			fs->altrootmnt = mntget(old->altrootmnt);
  			fs->altroot = dget(old->altroot);
  		} else {
-Index: linux-2.4.20/kernel/ksyms.c
+Index: linux-2.4.20/kernel/exit.c
 ===================================================================
---- linux-2.4.20.orig/kernel/ksyms.c	Wed Mar 17 13:57:11 2004
-+++ linux-2.4.20/kernel/ksyms.c	Wed Mar 17 13:57:11 2004
-@@ -297,6 +297,7 @@
- EXPORT_SYMBOL(set_page_dirty);
- EXPORT_SYMBOL(vfs_readlink);
- EXPORT_SYMBOL(vfs_follow_link);
-+EXPORT_SYMBOL(vfs_follow_link_it);
- EXPORT_SYMBOL(page_readlink);
- EXPORT_SYMBOL(page_follow_link);
- EXPORT_SYMBOL(page_symlink_inode_operations);
+--- linux-2.4.20.orig/kernel/exit.c	Wed Mar 17 13:57:05 2004
++++ linux-2.4.20/kernel/exit.c	Wed Mar 17 13:57:11 2004
+@@ -345,11 +345,14 @@
+ {
+ 	/* No need to hold fs->lock if we are killing it */
+ 	if (atomic_dec_and_test(&fs->count)) {
++		UNPIN(fs->pwd, fs->pwdmnt, 0);
++		UNPIN(fs->root, fs->rootmnt, 1);
+ 		dput(fs->root);
+ 		mntput(fs->rootmnt);
+ 		dput(fs->pwd);
+ 		mntput(fs->pwdmnt);
+ 		if (fs->altroot) {
++			UNPIN(fs->altroot, fs->altrootmnt, 1);
+ 			dput(fs->altroot);
+ 			mntput(fs->altrootmnt);
+ 		}
diff --git a/lustre/kernel_patches/patches/vfs_intent-2.4.20-vanilla.patch b/lustre/kernel_patches/patches/vfs_intent-2.4.20-vanilla.patch
index 737f366..1ef0b01 100644
--- a/lustre/kernel_patches/patches/vfs_intent-2.4.20-vanilla.patch
+++ b/lustre/kernel_patches/patches/vfs_intent-2.4.20-vanilla.patch
@@ -12,47 +12,6 @@
  kernel/ksyms.c            |    1 
  12 files changed, 558 insertions(+), 128 deletions(-)
 
-Index: linux-2.4.24/fs/dcache.c
-===================================================================
---- linux-2.4.24.orig/fs/dcache.c	Fri Jun 13 07:51:37 2003
-+++ linux-2.4.24/fs/dcache.c	Wed Mar 17 17:36:14 2004
-@@ -181,6 +181,13 @@ int d_invalidate(struct dentry * dentry)
- 		spin_unlock(&dcache_lock);
- 		return 0;
- 	}
-+
-+	/* network invalidation by Lustre */
-+	if (dentry->d_flags & DCACHE_LUSTRE_INVALID) {
-+		spin_unlock(&dcache_lock);
-+		return 0;
-+	}
-+
- 	/*
- 	 * Check whether to do a partial shrink_dcache
- 	 * to get rid of unused child entries.
-@@ -830,13 +837,19 @@ void d_delete(struct dentry * dentry)
-  * Adds a dentry to the hash according to its name.
-  */
-  
--void d_rehash(struct dentry * entry)
-+void __d_rehash(struct dentry * entry, int lock)
- {
- 	struct list_head *list = d_hash(entry->d_parent, entry->d_name.hash);
- 	if (!list_empty(&entry->d_hash)) BUG();
--	spin_lock(&dcache_lock);
-+	if (lock) spin_lock(&dcache_lock);
- 	list_add(&entry->d_hash, list);
--	spin_unlock(&dcache_lock);
-+	if (lock) spin_unlock(&dcache_lock);
-+}
-+EXPORT_SYMBOL(__d_rehash);
-+
-+void d_rehash(struct dentry * entry)
-+{
-+	__d_rehash(entry, 1);
- }
- 
- #define do_switch(x,y) do { \
 Index: linux-2.4.24/fs/exec.c
 ===================================================================
 --- linux-2.4.24.orig/fs/exec.c	Fri Nov 28 10:26:21 2003
@@ -118,6 +77,164 @@ Index: linux-2.4.24/fs/exec.c
  		goto close_fail;
  
  	retval = binfmt->core_dump(signr, regs, file);
+Index: linux-2.4.24/fs/dcache.c
+===================================================================
+--- linux-2.4.24.orig/fs/dcache.c	Fri Jun 13 07:51:37 2003
++++ linux-2.4.24/fs/dcache.c	Wed Mar 17 17:36:14 2004
+@@ -181,6 +181,13 @@ int d_invalidate(struct dentry * dentry)
+ 		spin_unlock(&dcache_lock);
+ 		return 0;
+ 	}
++
++	/* network invalidation by Lustre */
++	if (dentry->d_flags & DCACHE_LUSTRE_INVALID) {
++		spin_unlock(&dcache_lock);
++		return 0;
++	}
++
+ 	/*
+ 	 * Check whether to do a partial shrink_dcache
+ 	 * to get rid of unused child entries.
+@@ -830,13 +837,19 @@ void d_delete(struct dentry * dentry)
+  * Adds a dentry to the hash according to its name.
+  */
+  
+-void d_rehash(struct dentry * entry)
++void __d_rehash(struct dentry * entry, int lock)
+ {
+ 	struct list_head *list = d_hash(entry->d_parent, entry->d_name.hash);
+ 	if (!list_empty(&entry->d_hash)) BUG();
+-	spin_lock(&dcache_lock);
++	if (lock) spin_lock(&dcache_lock);
+ 	list_add(&entry->d_hash, list);
+-	spin_unlock(&dcache_lock);
++	if (lock) spin_unlock(&dcache_lock);
++}
++EXPORT_SYMBOL(__d_rehash);
++
++void d_rehash(struct dentry * entry)
++{
++	__d_rehash(entry, 1);
+ }
+ 
+ #define do_switch(x,y) do { \
+Index: linux-2.4.24/fs/namespace.c
+===================================================================
+--- linux-2.4.24.orig/fs/namespace.c	Fri Nov 28 10:26:21 2003
++++ linux-2.4.24/fs/namespace.c	Wed Mar 17 17:36:14 2004
+@@ -98,6 +98,7 @@ static void detach_mnt(struct vfsmount *
+ {
+ 	old_nd->dentry = mnt->mnt_mountpoint;
+ 	old_nd->mnt = mnt->mnt_parent;
++	UNPIN(old_nd->dentry, old_nd->mnt, 1);
+ 	mnt->mnt_parent = mnt;
+ 	mnt->mnt_mountpoint = mnt->mnt_root;
+ 	list_del_init(&mnt->mnt_child);
+@@ -109,6 +110,7 @@ static void attach_mnt(struct vfsmount *
+ {
+ 	mnt->mnt_parent = mntget(nd->mnt);
+ 	mnt->mnt_mountpoint = dget(nd->dentry);
++	PIN(nd->dentry, nd->mnt, 1);
+ 	list_add(&mnt->mnt_hash, mount_hashtable+hash(nd->mnt, nd->dentry));
+ 	list_add_tail(&mnt->mnt_child, &nd->mnt->mnt_mounts);
+ 	nd->dentry->d_mounted++;
+@@ -488,14 +490,17 @@ static int do_loopback(struct nameidata 
+ {
+ 	struct nameidata old_nd;
+ 	struct vfsmount *mnt = NULL;
++	struct lookup_intent it = { .it_op = IT_GETATTR };
+ 	int err = mount_is_safe(nd);
+ 	if (err)
+ 		return err;
+ 	if (!old_name || !*old_name)
+ 		return -EINVAL;
+-	err = path_lookup(old_name, LOOKUP_POSITIVE|LOOKUP_FOLLOW, &old_nd);
+-	if (err)
++	err = path_lookup_it(old_name, LOOKUP_POSITIVE|LOOKUP_FOLLOW, &old_nd, &it);
++	if (err) {
++		intent_release(&it);
+ 		return err;
++	}
+ 
+ 	down_write(&current->namespace->sem);
+ 	err = -EINVAL;
+@@ -518,6 +523,7 @@ static int do_loopback(struct nameidata 
+ 	}
+ 
+ 	up_write(&current->namespace->sem);
++	intent_release(&it);
+ 	path_release(&old_nd);
+ 	return err;
+ }
+@@ -701,6 +707,7 @@ long do_mount(char * dev_name, char * di
+ 		  unsigned long flags, void *data_page)
+ {
+ 	struct nameidata nd;
++	struct lookup_intent it = { .it_op = IT_GETATTR };
+ 	int retval = 0;
+ 	int mnt_flags = 0;
+ 
+@@ -725,10 +732,11 @@ long do_mount(char * dev_name, char * di
+ 	flags &= ~(MS_NOSUID|MS_NOEXEC|MS_NODEV);
+ 
+ 	/* ... and get the mountpoint */
+-	retval = path_lookup(dir_name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd);
+-	if (retval)
++	retval = path_lookup_it(dir_name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd, &it);
++	if (retval) {
++		intent_release(&it);
+ 		return retval;
+-
++	}
+ 	if (flags & MS_REMOUNT)
+ 		retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags,
+ 				    data_page);
+@@ -739,6 +747,8 @@ long do_mount(char * dev_name, char * di
+ 	else
+ 		retval = do_add_mount(&nd, type_page, flags, mnt_flags,
+ 				      dev_name, data_page);
++
++	intent_release(&it);
+ 	path_release(&nd);
+ 	return retval;
+ }
+@@ -904,6 +914,8 @@ asmlinkage long sys_pivot_root(const cha
+ {
+ 	struct vfsmount *tmp;
+ 	struct nameidata new_nd, old_nd, parent_nd, root_parent, user_nd;
++	struct lookup_intent new_it = { .it_op = IT_GETATTR };
++	struct lookup_intent old_it = { .it_op = IT_GETATTR };
+ 	int error;
+ 
+ 	if (!capable(CAP_SYS_ADMIN))
+@@ -911,14 +923,14 @@ asmlinkage long sys_pivot_root(const cha
+ 
+ 	lock_kernel();
+ 
+-	error = __user_walk(new_root, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &new_nd);
++	error = __user_walk_it(new_root, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &new_nd, &new_it);
+ 	if (error)
+ 		goto out0;
+ 	error = -EINVAL;
+ 	if (!check_mnt(new_nd.mnt))
+ 		goto out1;
+ 
+-	error = __user_walk(put_old, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &old_nd);
++	error = __user_walk_it(put_old, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &old_nd, &old_it);
+ 	if (error)
+ 		goto out1;
+ 
+@@ -973,8 +985,10 @@ out2:
+ 	up(&old_nd.dentry->d_inode->i_zombie);
+ 	up_write(&current->namespace->sem);
+ 	path_release(&user_nd);
++	intent_release(&old_it);
+ 	path_release(&old_nd);
+ out1:
++	intent_release(&new_it);
+ 	path_release(&new_nd);
+ out0:
+ 	unlock_kernel();
 Index: linux-2.4.24/fs/namei.c
 ===================================================================
 --- linux-2.4.24.orig/fs/namei.c	Mon Aug 25 04:44:43 2003
@@ -307,13 +424,13 @@ Index: linux-2.4.24/fs/namei.c
 +				if (err)
 +					break;
 +				new = real_lookup(dentry->d_parent,
-+						  &dentry->d_name, 0, it);
++						  &dentry->d_name, 0, NULL);
++				d_invalidate(dentry);
++				dput(dentry);
 +				if (IS_ERR(new)) {
 +					err = PTR_ERR(new);
 +					break;
 +				}
-+				d_invalidate(dentry);
-+				dput(dentry);
 +				nd->dentry = new;
 +			}
 +			if (!nd->dentry->d_inode)
@@ -868,122 +985,6 @@ Index: linux-2.4.24/fs/namei.c
  	if (page) {
  		kunmap(page);
  		page_cache_release(page);
-Index: linux-2.4.24/fs/namespace.c
-===================================================================
---- linux-2.4.24.orig/fs/namespace.c	Fri Nov 28 10:26:21 2003
-+++ linux-2.4.24/fs/namespace.c	Wed Mar 17 17:36:14 2004
-@@ -98,6 +98,7 @@ static void detach_mnt(struct vfsmount *
- {
- 	old_nd->dentry = mnt->mnt_mountpoint;
- 	old_nd->mnt = mnt->mnt_parent;
-+	UNPIN(old_nd->dentry, old_nd->mnt, 1);
- 	mnt->mnt_parent = mnt;
- 	mnt->mnt_mountpoint = mnt->mnt_root;
- 	list_del_init(&mnt->mnt_child);
-@@ -109,6 +110,7 @@ static void attach_mnt(struct vfsmount *
- {
- 	mnt->mnt_parent = mntget(nd->mnt);
- 	mnt->mnt_mountpoint = dget(nd->dentry);
-+	PIN(nd->dentry, nd->mnt, 1);
- 	list_add(&mnt->mnt_hash, mount_hashtable+hash(nd->mnt, nd->dentry));
- 	list_add_tail(&mnt->mnt_child, &nd->mnt->mnt_mounts);
- 	nd->dentry->d_mounted++;
-@@ -488,14 +490,17 @@ static int do_loopback(struct nameidata 
- {
- 	struct nameidata old_nd;
- 	struct vfsmount *mnt = NULL;
-+	struct lookup_intent it = { .it_op = IT_GETATTR };
- 	int err = mount_is_safe(nd);
- 	if (err)
- 		return err;
- 	if (!old_name || !*old_name)
- 		return -EINVAL;
--	err = path_lookup(old_name, LOOKUP_POSITIVE|LOOKUP_FOLLOW, &old_nd);
--	if (err)
-+	err = path_lookup_it(old_name, LOOKUP_POSITIVE|LOOKUP_FOLLOW, &old_nd, &it);
-+	if (err) {
-+		intent_release(&it);
- 		return err;
-+	}
- 
- 	down_write(&current->namespace->sem);
- 	err = -EINVAL;
-@@ -518,6 +523,7 @@ static int do_loopback(struct nameidata 
- 	}
- 
- 	up_write(&current->namespace->sem);
-+	intent_release(&it);
- 	path_release(&old_nd);
- 	return err;
- }
-@@ -701,6 +707,7 @@ long do_mount(char * dev_name, char * di
- 		  unsigned long flags, void *data_page)
- {
- 	struct nameidata nd;
-+	struct lookup_intent it = { .it_op = IT_GETATTR };
- 	int retval = 0;
- 	int mnt_flags = 0;
- 
-@@ -725,9 +732,11 @@ long do_mount(char * dev_name, char * di
- 	flags &= ~(MS_NOSUID|MS_NOEXEC|MS_NODEV);
- 
- 	/* ... and get the mountpoint */
--	retval = path_lookup(dir_name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd);
--	if (retval)
-+	retval = path_lookup_it(dir_name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd, &it);
-+	if (retval) {
-+		intent_release(&it);
- 		return retval;
-+	}
- 
- 	if (flags & MS_REMOUNT)
- 		retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags,
-@@ -739,6 +747,8 @@ long do_mount(char * dev_name, char * di
- 	else
- 		retval = do_add_mount(&nd, type_page, flags, mnt_flags,
- 				      dev_name, data_page);
-+
-+	intent_release(&it);
- 	path_release(&nd);
- 	return retval;
- }
-@@ -904,6 +914,8 @@ asmlinkage long sys_pivot_root(const cha
- {
- 	struct vfsmount *tmp;
- 	struct nameidata new_nd, old_nd, parent_nd, root_parent, user_nd;
-+	struct lookup_intent new_it = { .it_op = IT_GETATTR };
-+	struct lookup_intent old_it = { .it_op = IT_GETATTR };
- 	int error;
- 
- 	if (!capable(CAP_SYS_ADMIN))
-@@ -911,14 +923,14 @@ asmlinkage long sys_pivot_root(const cha
- 
- 	lock_kernel();
- 
--	error = __user_walk(new_root, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &new_nd);
-+	error = __user_walk_it(new_root, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &new_nd, &new_it);
- 	if (error)
- 		goto out0;
- 	error = -EINVAL;
- 	if (!check_mnt(new_nd.mnt))
- 		goto out1;
- 
--	error = __user_walk(put_old, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &old_nd);
-+	error = __user_walk_it(put_old, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &old_nd, &old_it);
- 	if (error)
- 		goto out1;
- 
-@@ -973,8 +985,10 @@ out2:
- 	up(&old_nd.dentry->d_inode->i_zombie);
- 	up_write(&current->namespace->sem);
- 	path_release(&user_nd);
-+	intent_release(&old_it);
- 	path_release(&old_nd);
- out1:
-+	intent_release(&new_it);
- 	path_release(&new_nd);
- out0:
- 	unlock_kernel();
 Index: linux-2.4.24/fs/open.c
 ===================================================================
 --- linux-2.4.24.orig/fs/open.c	Mon Aug 25 04:44:43 2003
@@ -1195,7 +1196,7 @@ Index: linux-2.4.24/fs/open.c
 -	error = __user_walk(filename, LOOKUP_POSITIVE | LOOKUP_FOLLOW |
 -		      LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd);
 +	error = __user_walk_it(filename, LOOKUP_POSITIVE | LOOKUP_FOLLOW |
-+			       LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd, &it);
++		      LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd, &it);
  	if (error)
  		goto out;
  
@@ -1652,7 +1653,7 @@ Index: linux-2.4.24/include/linux/fs.h
  #define ATTR_ATTR_FLAG	1024
 +#define ATTR_RAW	0x0800	/* file system, not vfs will massage attrs */
 +#define ATTR_FROM_OPEN	0x1000	/* called from open path, ie O_TRUNC */
-+#define ATTR_CTIME_SET	0x2000
++#define ATTR_CTIME_SET 0x2000
  
  /*
   * This is the Inode Attributes structure, used for notify_change().  It
@@ -1795,25 +1796,18 @@ Index: linux-2.4.24/include/linux/fs_struct.h
  		dput(old_pwd);
  		mntput(old_pwdmnt);
  	}
-Index: linux-2.4.24/kernel/exit.c
+Index: linux-2.4.24/kernel/ksyms.c
 ===================================================================
---- linux-2.4.24.orig/kernel/exit.c	Thu Nov 28 15:53:15 2002
-+++ linux-2.4.24/kernel/exit.c	Wed Mar 17 17:36:14 2004
-@@ -238,11 +238,14 @@ static inline void __put_fs_struct(struc
- {
- 	/* No need to hold fs->lock if we are killing it */
- 	if (atomic_dec_and_test(&fs->count)) {
-+		UNPIN(fs->pwd, fs->pwdmnt, 0);
-+		UNPIN(fs->root, fs->rootmnt, 1);
- 		dput(fs->root);
- 		mntput(fs->rootmnt);
- 		dput(fs->pwd);
- 		mntput(fs->pwdmnt);
- 		if (fs->altroot) {
-+			UNPIN(fs->altroot, fs->altrootmnt, 1);
- 			dput(fs->altroot);
- 			mntput(fs->altrootmnt);
- 		}
+--- linux-2.4.24.orig/kernel/ksyms.c	Wed Mar 17 17:36:14 2004
++++ linux-2.4.24/kernel/ksyms.c	Wed Mar 17 17:36:14 2004
+@@ -275,6 +275,7 @@ EXPORT_SYMBOL(set_page_dirty);
+ EXPORT_SYMBOL(mark_page_accessed);
+ EXPORT_SYMBOL(vfs_readlink);
+ EXPORT_SYMBOL(vfs_follow_link);
++EXPORT_SYMBOL(vfs_follow_link_it);
+ EXPORT_SYMBOL(page_readlink);
+ EXPORT_SYMBOL(page_follow_link);
+ EXPORT_SYMBOL(page_symlink_inode_operations);
 Index: linux-2.4.24/kernel/fork.c
 ===================================================================
 --- linux-2.4.24.orig/kernel/fork.c	Fri Nov 28 10:26:21 2003
@@ -1832,15 +1826,22 @@ Index: linux-2.4.24/kernel/fork.c
  			fs->altrootmnt = mntget(old->altrootmnt);
  			fs->altroot = dget(old->altroot);
  		} else {
-Index: linux-2.4.24/kernel/ksyms.c
+Index: linux-2.4.24/kernel/exit.c
 ===================================================================
---- linux-2.4.24.orig/kernel/ksyms.c	Wed Mar 17 17:36:14 2004
-+++ linux-2.4.24/kernel/ksyms.c	Wed Mar 17 17:36:14 2004
-@@ -275,6 +275,7 @@ EXPORT_SYMBOL(set_page_dirty);
- EXPORT_SYMBOL(mark_page_accessed);
- EXPORT_SYMBOL(vfs_readlink);
- EXPORT_SYMBOL(vfs_follow_link);
-+EXPORT_SYMBOL(vfs_follow_link_it);
- EXPORT_SYMBOL(page_readlink);
- EXPORT_SYMBOL(page_follow_link);
- EXPORT_SYMBOL(page_symlink_inode_operations);
+--- linux-2.4.24.orig/kernel/exit.c	Thu Nov 28 15:53:15 2002
++++ linux-2.4.24/kernel/exit.c	Wed Mar 17 17:36:14 2004
+@@ -238,11 +238,14 @@ static inline void __put_fs_struct(struc
+ {
+ 	/* No need to hold fs->lock if we are killing it */
+ 	if (atomic_dec_and_test(&fs->count)) {
++		UNPIN(fs->pwd, fs->pwdmnt, 0);
++		UNPIN(fs->root, fs->rootmnt, 1);
+ 		dput(fs->root);
+ 		mntput(fs->rootmnt);
+ 		dput(fs->pwd);
+ 		mntput(fs->pwdmnt);
+ 		if (fs->altroot) {
++			UNPIN(fs->altroot, fs->altrootmnt, 1);
+ 			dput(fs->altroot);
+ 			mntput(fs->altrootmnt);
+ 		}
diff --git a/lustre/kernel_patches/patches/vfs_intent-2.4.21-chaos.patch b/lustre/kernel_patches/patches/vfs_intent-2.4.21-chaos.patch
index b331767..09ef2f9 100644
--- a/lustre/kernel_patches/patches/vfs_intent-2.4.21-chaos.patch
+++ b/lustre/kernel_patches/patches/vfs_intent-2.4.21-chaos.patch
@@ -309,17 +309,17 @@ Index: linux-ia64/fs/namei.c
 +			if (!dentry->d_op->d_revalidate_it(dentry, 0, it)) {
 +				struct dentry *new;
 +				err = permission(dentry->d_parent->d_inode,
-+						 MAY_EXEC);
++						MAY_EXEC);
 +				if (err)
 +					break;
 +				new = real_lookup(dentry->d_parent,
-+						  &dentry->d_name, 0, it);
++						&dentry->d_name, 0, NULL);
++				d_invalidate(dentry);
++				dput(dentry);
 +				if (IS_ERR(new)) {
 +					err = PTR_ERR(new);
 +					break;
 +				}
-+				d_invalidate(dentry);
-+				dput(dentry);
 +				nd->dentry = new;
 +			}
 +			if (!nd->dentry->d_inode)
@@ -554,7 +554,7 @@ Index: linux-ia64/fs/namei.c
  		if (!IS_POSIXACL(dir->d_inode))
  			mode &= ~current->fs->umask;
 -		error = vfs_create(dir->d_inode, dentry, mode);
-+		error = vfs_create_it(dir->d_inode, dentry, mode, it);
++ 		error = vfs_create_it(dir->d_inode, dentry, mode, it);
  		up(&dir->d_inode->i_sem);
  		dput(nd->dentry);
  		nd->dentry = dentry;
@@ -930,7 +930,7 @@ Index: linux-ia64/fs/namespace.c
  	int retval = 0;
  	int mnt_flags = 0;
  
-@@ -725,9 +732,11 @@ long do_mount(char * dev_name, char * di
+@@ -725,10 +732,11 @@ long do_mount(char * dev_name, char * di
  	flags &= ~(MS_NOSUID|MS_NOEXEC|MS_NODEV);
  
  	/* ... and get the mountpoint */
@@ -940,10 +940,11 @@ Index: linux-ia64/fs/namespace.c
 +	if (retval) {
 +		intent_release(&it);
  		return retval;
+-
 +	}
- 
  	if (flags & MS_REMOUNT)
  		retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags,
+ 				    data_page);
 @@ -739,6 +747,8 @@ long do_mount(char * dev_name, char * di
  	else
  		retval = do_add_mount(&nd, type_page, flags, mnt_flags,
@@ -1201,7 +1202,7 @@ Index: linux-ia64/fs/open.c
 -	error = __user_walk(filename, LOOKUP_POSITIVE | LOOKUP_FOLLOW |
 -		      LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd);
 +	error = __user_walk_it(filename, LOOKUP_POSITIVE | LOOKUP_FOLLOW |
-+			       LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd, &it);
++		      LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd, &it);
  	if (error)
  		goto out;
  
@@ -1660,7 +1661,7 @@ Index: linux-ia64/include/linux/fs.h
  #define ATTR_ATTR_FLAG	1024
 +#define ATTR_RAW	0x0800	/* file system, not vfs will massage attrs */
 +#define ATTR_FROM_OPEN	0x1000	/* called from open path, ie O_TRUNC */
-+#define ATTR_CTIME_SET	0x2000
++#define ATTR_CTIME_SET 0x2000
  
  /*
   * This is the Inode Attributes structure, used for notify_change().  It
diff --git a/lustre/kernel_patches/patches/vfs_intent-2.4.21-sles8sp3.patch b/lustre/kernel_patches/patches/vfs_intent-2.4.21-sles8sp3.patch
deleted file mode 100644
index 7fdb561..0000000
--- a/lustre/kernel_patches/patches/vfs_intent-2.4.21-sles8sp3.patch
+++ /dev/null
@@ -1,1862 +0,0 @@
- fs/dcache.c               |   19 ++
- fs/exec.c                 |   17 +-
- fs/namei.c                |  295 +++++++++++++++++++++++++++++++++++++++-------
- fs/namespace.c            |   28 +++-
- fs/open.c                 |  172 +++++++++++++++++++-------
- fs/stat.c                 |   52 +++++---
- include/linux/dcache.h    |   60 +++++++++
- include/linux/fs.h        |   32 ++++
- include/linux/fs_struct.h |    4 
- kernel/exit.c             |    3 
- kernel/fork.c             |    3 
- kernel/ksyms.c            |    1 
- 12 files changed, 558 insertions(+), 128 deletions(-)
-
-Index: linux-2.4.21/fs/dcache.c
-===================================================================
---- linux-2.4.21.orig/fs/dcache.c	2004-04-24 02:38:00.000000000 -0400
-+++ linux-2.4.21/fs/dcache.c	2004-04-26 19:06:31.000000000 -0400
-@@ -186,6 +186,13 @@
- 		spin_unlock(&dcache_lock);
- 		return 0;
- 	}
-+
-+	/* network invalidation by Lustre */
-+	if (dentry->d_flags & DCACHE_LUSTRE_INVALID) {
-+		spin_unlock(&dcache_lock);
-+		return 0;
-+	}
-+
- 	/*
- 	 * Check whether to do a partial shrink_dcache
- 	 * to get rid of unused child entries.
-@@ -838,13 +845,19 @@
-  * Adds a dentry to the hash according to its name.
-  */
-  
--void d_rehash(struct dentry * entry)
-+void __d_rehash(struct dentry * entry, int lock)
- {
- 	struct list_head *list = d_hash(entry->d_parent, entry->d_name.hash);
- 	if (!list_empty(&entry->d_hash)) BUG();
--	spin_lock(&dcache_lock);
-+	if (lock) spin_lock(&dcache_lock);
- 	list_add(&entry->d_hash, list);
--	spin_unlock(&dcache_lock);
-+	if (lock) spin_unlock(&dcache_lock);
-+}
-+EXPORT_SYMBOL(__d_rehash);
-+
-+void d_rehash(struct dentry * entry)
-+{
-+	__d_rehash(entry, 1);
- }
- 
- #define do_switch(x,y) do { \
-Index: linux-2.4.21/fs/exec.c
-===================================================================
---- linux-2.4.21.orig/fs/exec.c	2004-04-24 02:39:01.000000000 -0400
-+++ linux-2.4.21/fs/exec.c	2004-04-26 19:06:31.000000000 -0400
-@@ -113,8 +113,10 @@
- 	struct file * file;
- 	struct nameidata nd;
- 	int error;
-+	struct lookup_intent it = { .it_op = IT_OPEN,
-+				    .it_flags = FMODE_READ|FMODE_EXEC };
- 
--	error = user_path_walk(library, &nd);
-+	error = user_path_walk_it(library, &nd, &it);
- 	if (error)
- 		goto out;
- 
-@@ -126,7 +128,8 @@
- 	if (error)
- 		goto exit;
- 
--	file = dentry_open(nd.dentry, nd.mnt, O_RDONLY);
-+	file = dentry_open_it(nd.dentry, nd.mnt, O_RDONLY, &it);
-+	intent_release(&it);
- 	error = PTR_ERR(file);
- 	if (IS_ERR(file))
- 		goto out;
-@@ -383,8 +386,10 @@
- 	struct inode *inode;
- 	struct file *file;
- 	int err = 0;
-+	struct lookup_intent it = { .it_op = IT_OPEN,
-+				    .it_flags = FMODE_READ|FMODE_EXEC };
- 
--	err = path_lookup(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd);
-+	err = path_lookup_it(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd, &it);
- 	file = ERR_PTR(err);
- 	if (!err) {
- 		inode = nd.dentry->d_inode;
-@@ -396,7 +401,8 @@
- 				err = -EACCES;
- 			file = ERR_PTR(err);
- 			if (!err) {
--				file = dentry_open(nd.dentry, nd.mnt, O_RDONLY);
-+				file = dentry_open_it(nd.dentry, nd.mnt, O_RDONLY, &it);
-+				intent_release(&it);
- 				if (!IS_ERR(file)) {
- 					err = deny_write_access(file);
- 					if (err) {
-@@ -408,6 +414,7 @@
- 				return file;
- 			}
- 		}
-+		intent_release(&it);
- 		path_release(&nd);
- 	}
- 	goto out;
-@@ -1147,7 +1154,7 @@
- 		goto close_fail;
- 	if (!file->f_op->write)
- 		goto close_fail;
--	if (do_truncate(file->f_dentry, 0) != 0)
-+	if (do_truncate(file->f_dentry, 0, 0) != 0)
- 		goto close_fail;
- 
- 	retval = binfmt->core_dump(signr, regs, file);
-Index: linux-2.4.21/fs/namei.c
-===================================================================
---- linux-2.4.21.orig/fs/namei.c	2004-04-24 02:39:02.000000000 -0400
-+++ linux-2.4.21/fs/namei.c	2004-04-26 19:06:38.000000000 -0400
-@@ -94,6 +94,13 @@
-  * XEmacs seems to be relying on it...
-  */
- 
-+void intent_release(struct lookup_intent *it)
-+{
-+	if (it && it->it_op_release)
-+		it->it_op_release(it);
-+
-+}
-+
- /* In order to reduce some races, while at the same time doing additional
-  * checking and hopefully speeding things up, we copy filenames to the
-  * kernel data space before using them..
-@@ -274,10 +281,19 @@
-  * Internal lookup() using the new generic dcache.
-  * SMP-safe
-  */
--static struct dentry * cached_lookup(struct dentry * parent, struct qstr * name, int flags)
-+static struct dentry *cached_lookup(struct dentry *parent, struct qstr *name,
-+				    int flags, struct lookup_intent *it)
- {
- 	struct dentry * dentry = d_lookup(parent, name);
- 
-+	if (dentry && dentry->d_op && dentry->d_op->d_revalidate_it) {
-+		if (!dentry->d_op->d_revalidate_it(dentry, flags, it) &&
-+		    !d_invalidate(dentry)) {
-+			dput(dentry);
-+			dentry = NULL;
-+		}
-+		return dentry;
-+	} else
- 	if (dentry && dentry->d_op && dentry->d_op->d_revalidate) {
- 		if (!dentry->d_op->d_revalidate(dentry, flags) && !d_invalidate(dentry)) {
- 			dput(dentry);
-@@ -295,11 +311,15 @@
-  * make sure that nobody added the entry to the dcache in the meantime..
-  * SMP-safe
-  */
--static struct dentry * real_lookup(struct dentry * parent, struct qstr * name, int flags)
-+static struct dentry *real_lookup(struct dentry *parent, struct qstr *name,
-+				  int flags, struct lookup_intent *it)
- {
- 	struct dentry * result;
- 	struct inode *dir = parent->d_inode;
-+	int counter = 0;
- 
-+again:
-+	counter++;
- 	down(&dir->i_sem);
- 	/*
- 	 * First re-do the cached lookup just in case it was created
-@@ -314,6 +334,9 @@
- 		result = ERR_PTR(-ENOMEM);
- 		if (dentry) {
- 			lock_kernel();
-+			if (dir->i_op->lookup_it)
-+				result = dir->i_op->lookup_it(dir, dentry, it, flags);
-+			else
- 			result = dir->i_op->lookup(dir, dentry);
- 			unlock_kernel();
- 			if (result)
-@@ -335,6 +358,15 @@
- 			dput(result);
- 			result = ERR_PTR(-ENOENT);
- 		}
-+	} else if (result->d_op && result->d_op->d_revalidate_it) {
-+		if (!result->d_op->d_revalidate_it(result, flags, it) &&
-+		    !d_invalidate(result)) {
-+			dput(result);
-+			if (counter > 10)
-+				result = ERR_PTR(-ESTALE);
-+			if (!IS_ERR(result))
-+				goto again;
-+		}
- 	}
- 	return result;
- }
-@@ -346,7 +378,8 @@
-  * Without that kind of total limit, nasty chains of consecutive
-  * symlinks can cause almost arbitrarily long lookups. 
-  */
--static inline int do_follow_link(struct dentry *dentry, struct nameidata *nd)
-+static inline int do_follow_link(struct dentry *dentry, struct nameidata *nd,
-+				 struct lookup_intent *it)
- {
- 	int err;
- 	if (current->link_count >= 8)
-@@ -360,10 +393,12 @@
- 	current->link_count++;
- 	current->total_link_count++;
- 	UPDATE_ATIME(dentry->d_inode);
-+	nd->intent = it;
- 	err = dentry->d_inode->i_op->follow_link(dentry, nd);
- 	current->link_count--;
- 	return err;
- loop:
-+	intent_release(it);
- 	path_release(nd);
- 	return -ELOOP;
- }
-@@ -462,7 +497,8 @@
-  * We expect 'base' to be positive and a directory.
-  */
- static inline int __attribute__((always_inline))
--__link_path_walk(const char * name, struct nameidata *nd)
-+__link_path_walk_it(const char * name, struct nameidata *nd,
-+		    struct lookup_intent *it)
- {
- 	struct dentry *dentry;
- 	struct inode *inode;
-@@ -539,12 +575,12 @@
- 				break;
- 		}
- 		/* This does the actual lookups.. */
--		dentry = cached_lookup(nd->dentry, &this, LOOKUP_CONTINUE);
-+		dentry = cached_lookup(nd->dentry, &this, LOOKUP_CONTINUE, NULL);
- 		if (!dentry) {
- 			err = -EWOULDBLOCKIO;
- 			if (atomic)
- 				break;
--			dentry = real_lookup(nd->dentry, &this, LOOKUP_CONTINUE);
-+			dentry = real_lookup(nd->dentry, &this, LOOKUP_CONTINUE, NULL);
- 			err = PTR_ERR(dentry);
- 			if (IS_ERR(dentry))
- 				break;
-@@ -562,7 +598,7 @@
- 			goto out_dput;
- 
- 		if (inode->i_op->follow_link) {
--			err = do_follow_link(dentry, nd);
-+			err = do_follow_link(dentry, nd, NULL);
- 			dput(dentry);
- 			if (err)
- 				goto return_err;
-@@ -578,7 +614,7 @@
- 			nd->dentry = dentry;
- 		}
- 		err = -ENOTDIR; 
--		if (!inode->i_op->lookup)
-+		if (!inode->i_op->lookup && !inode->i_op->lookup_it)
- 			break;
- 		continue;
- 		/* here ends the main loop */
-@@ -605,12 +641,12 @@
- 			if (err < 0)
- 				break;
- 		}
--		dentry = cached_lookup(nd->dentry, &this, 0);
-+		dentry = cached_lookup(nd->dentry, &this, 0, it);
- 		if (!dentry) {
- 			err = -EWOULDBLOCKIO;
- 			if (atomic)
- 				break;
--			dentry = real_lookup(nd->dentry, &this, 0);
-+			dentry = real_lookup(nd->dentry, &this, 0, it);
- 			err = PTR_ERR(dentry);
- 			if (IS_ERR(dentry))
- 				break;
-@@ -620,7 +656,7 @@
- 		inode = dentry->d_inode;
- 		if ((lookup_flags & LOOKUP_FOLLOW)
- 		    && inode && inode->i_op && inode->i_op->follow_link) {
--			err = do_follow_link(dentry, nd);
-+			err = do_follow_link(dentry, nd, it);
- 			dput(dentry);
- 			if (err)
- 				goto return_err;
-@@ -634,7 +670,8 @@
- 			goto no_inode;
- 		if (lookup_flags & LOOKUP_DIRECTORY) {
- 			err = -ENOTDIR; 
--			if (!inode->i_op || !inode->i_op->lookup)
-+			if (!inode->i_op ||
-+			    (!inode->i_op->lookup && !inode->i_op->lookup_it))
- 				break;
- 		}
- 		goto return_base;
-@@ -658,6 +695,27 @@
- 		 * Check the cached dentry for staleness.
- 		 */
- 		dentry = nd->dentry;
-+		if (dentry && dentry->d_op && dentry->d_op->d_revalidate_it) {
-+			err = -ESTALE;
-+			if (!dentry->d_op->d_revalidate_it(dentry, 0, it)) {
-+				struct dentry *new;
-+				err = permission(dentry->d_parent->d_inode,
-+						 MAY_EXEC);
-+				if (err)
-+					break;
-+				new = real_lookup(dentry->d_parent,
-+						  &dentry->d_name, 0, it);
-+				if (IS_ERR(new)) {
-+					err = PTR_ERR(new);
-+					break;
-+				}
-+				d_invalidate(dentry);
-+				dput(dentry);
-+				nd->dentry = new;
-+			}
-+			if (!nd->dentry->d_inode)
-+				goto no_inode;
-+		} else
- 		if (dentry && dentry->d_op && dentry->d_op->d_revalidate) {
- 			err = -ESTALE;
- 			if (!dentry->d_op->d_revalidate(dentry, lookup_flags & LOOKUP_PARENT)) {
-@@ -671,6 +729,8 @@
- 		dput(dentry);
- 		break;
- 	}
-+	if (err)
-+		intent_release(it);
- 	path_release(nd);
- return_err:
- 	return err;
-@@ -678,13 +738,13 @@
- 
- int link_path_walk(const char * name, struct nameidata *nd)
- {
--	return __link_path_walk(name,nd);
-+	return __link_path_walk_it(name, nd, NULL);
- }
- 
- static inline int __path_walk(const char * name, struct nameidata *nd)
- {
- 	current->total_link_count = 0;
--	return __link_path_walk(name, nd);
-+	return __link_path_walk_it(name, nd, NULL);
- }
- 
- int path_walk(const char * name, struct nameidata *nd)
-@@ -692,6 +752,12 @@
- 	return __path_walk(name, nd);
- }
- 
-+int path_walk_it(const char * name, struct nameidata *nd, struct lookup_intent *it)
-+{
-+	current->total_link_count = 0;
-+	return __link_path_walk_it(name, nd, it);
-+}
-+
- /* SMP-safe */
- /* returns 1 if everything is done */
- static int __emul_lookup_dentry(const char *name, struct nameidata *nd)
-@@ -774,6 +840,17 @@
- }
- 
- /* SMP-safe */
-+int path_lookup_it(const char *path, unsigned flags, struct nameidata *nd,
-+		   struct lookup_intent *it)
-+{
-+	int error = 0;
-+	if (path_init(path, flags, nd))
-+		error = path_walk_it(path, nd, it);
-+	return error;
-+}
-+
-+
-+/* SMP-safe */
- int path_lookup(const char *path, unsigned flags, struct nameidata *nd)
- {
- 	int error = 0;
-@@ -788,6 +865,7 @@
- {
- 	nd->last_type = LAST_ROOT; /* if there are only slashes... */
- 	nd->flags = flags;
-+	nd->intent = NULL;
- 	if (*name=='/')
- 		return walk_init_root(name,nd);
- 	read_lock(&current->fs->lock);
-@@ -802,7 +880,8 @@
-  * needs parent already locked. Doesn't follow mounts.
-  * SMP-safe.
-  */
--struct dentry * lookup_hash(struct qstr *name, struct dentry * base)
-+struct dentry * lookup_hash_it(struct qstr *name, struct dentry * base,
-+			       struct lookup_intent *it)
- {
- 	struct dentry * dentry;
- 	struct inode *inode;
-@@ -825,13 +904,16 @@
- 			goto out;
- 	}
- 
--	dentry = cached_lookup(base, name, 0);
-+	dentry = cached_lookup(base, name, 0, it);
- 	if (!dentry) {
- 		struct dentry *new = d_alloc(base, name);
- 		dentry = ERR_PTR(-ENOMEM);
- 		if (!new)
- 			goto out;
- 		lock_kernel();
-+		if (inode->i_op->lookup_it)
-+			dentry = inode->i_op->lookup_it(inode, new, it, 0);
-+		else
- 		dentry = inode->i_op->lookup(inode, new);
- 		unlock_kernel();
- 		if (!dentry)
-@@ -843,6 +925,12 @@
- 	return dentry;
- }
- 
-+struct dentry * lookup_hash(struct qstr *name, struct dentry * base)
-+{
-+	return lookup_hash_it(name, base, NULL);
-+}
-+
-+
- /* SMP-safe */
- struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
- {
-@@ -864,7 +952,7 @@
- 	}
- 	this.hash = end_name_hash(hash);
- 
--	return lookup_hash(&this, base);
-+	return lookup_hash_it(&this, base, NULL);
- access:
- 	return ERR_PTR(-EACCES);
- }
-@@ -895,6 +983,23 @@
- 	return err;
- }
- 
-+int __user_walk_it(const char *name, unsigned flags, struct nameidata *nd,
-+		   struct lookup_intent *it)
-+{
-+	char *tmp;
-+	int err;
-+
-+	tmp = getname(name);
-+	err = PTR_ERR(tmp);
-+	if (!IS_ERR(tmp)) {
-+		err = 0;
-+		if (path_init(tmp, flags, nd))
-+			err = path_walk_it(tmp, nd, it);
-+		putname(tmp);
-+	}
-+	return err;
-+}
-+
- /*
-  * It's inline, so penalty for filesystems that don't use sticky bit is
-  * minimal.
-@@ -992,7 +1097,8 @@
- 	return retval;
- }
- 
--int vfs_create(struct inode *dir, struct dentry *dentry, int mode)
-+static int vfs_create_it(struct inode *dir, struct dentry *dentry, int mode,
-+			 struct lookup_intent *it)
- {
- 	int error;
- 
-@@ -1005,12 +1111,15 @@
- 		goto exit_lock;
- 
- 	error = -EACCES;	/* shouldn't it be ENOSYS? */
--	if (!dir->i_op || !dir->i_op->create)
-+	if (!dir->i_op || (!dir->i_op->create && !dir->i_op->create_it))
- 		goto exit_lock;
- 
- 	DQUOT_INIT(dir);
- 	lock_kernel();
--	error = dir->i_op->create(dir, dentry, mode);
-+	if (dir->i_op->create_it)
-+		error = dir->i_op->create_it(dir, dentry, mode, it);
-+	else
-+		error = dir->i_op->create(dir, dentry, mode);
- 	unlock_kernel();
- exit_lock:
- 	up(&dir->i_zombie);
-@@ -1019,6 +1128,11 @@
- 	return error;
- }
- 
-+int vfs_create(struct inode *dir, struct dentry *dentry, int mode)
-+{
-+	return vfs_create_it(dir, dentry, mode, NULL);
-+}
-+
- /*
-  *	open_namei()
-  *
-@@ -1033,7 +1147,8 @@
-  * for symlinks (where the permissions are checked later).
-  * SMP-safe
-  */
--int open_namei(const char * pathname, int flag, int mode, struct nameidata *nd)
-+int open_namei_it(const char *pathname, int flag, int mode,
-+		  struct nameidata *nd, struct lookup_intent *it)
- {
- 	int acc_mode, error = 0;
- 	struct inode *inode;
-@@ -1043,11 +1158,14 @@
- 
- 	acc_mode = ACC_MODE(flag);
- 
-+	if (it)
-+		it->it_flags = flag;
-+
- 	/*
- 	 * The simplest case - just a plain lookup.
- 	 */
- 	if (!(flag & O_CREAT)) {
--		error = path_lookup(pathname, lookup_flags(flag), nd);
-+		error = path_lookup_it(pathname, lookup_flags(flag), nd, it);
- 		if (error)
- 			return error;
- 		dentry = nd->dentry;
-@@ -1057,6 +1175,10 @@
- 	/*
- 	 * Create - we need to know the parent.
- 	 */
-+	if (it) {
-+		it->it_create_mode = mode;
-+		it->it_op |= IT_CREAT;
-+	}
- 	error = path_lookup(pathname, LOOKUP_PARENT, nd);
- 	if (error)
- 		return error;
-@@ -1072,7 +1194,7 @@
- 
- 	dir = nd->dentry;
- 	down(&dir->d_inode->i_sem);
--	dentry = lookup_hash(&nd->last, nd->dentry);
-+	dentry = lookup_hash_it(&nd->last, nd->dentry, it);
- 
- do_last:
- 	error = PTR_ERR(dentry);
-@@ -1081,11 +1203,12 @@
- 		goto exit;
- 	}
- 
-+	it->it_create_mode = mode;
- 	/* Negative dentry, just create the file */
- 	if (!dentry->d_inode) {
- 		if (!IS_POSIXACL(dir->d_inode))
- 			mode &= ~current->fs->umask;
--		error = vfs_create(dir->d_inode, dentry, mode);
-+		error = vfs_create_it(dir->d_inode, dentry, mode, it);
- 		up(&dir->d_inode->i_sem);
- #ifndef DENTRY_WASTE_RAM
- 		if (error)
-@@ -1193,7 +1316,7 @@
- 		if (!error) {
- 			DQUOT_INIT(inode);
- 			
--			error = do_truncate(dentry, 0);
-+			error = do_truncate(dentry, 0, 1);
- 		}
- 		put_write_access(inode);
- 		if (error)
-@@ -1205,8 +1328,10 @@
- 	return 0;
- 
- exit_dput:
-+	intent_release(it);
- 	dput(dentry);
- exit:
-+	intent_release(it);
- 	path_release(nd);
- 	return error;
- 
-@@ -1225,7 +1350,10 @@
- 	 * are done. Procfs-like symlinks just set LAST_BIND.
- 	 */
- 	UPDATE_ATIME(dentry->d_inode);
-+	nd->intent = it;
- 	error = dentry->d_inode->i_op->follow_link(dentry, nd);
-+	if (error)
-+		intent_release(it);
- 	dput(dentry);
- 	if (error)
- 		return error;
-@@ -1247,13 +1375,20 @@
- 	}
- 	dir = nd->dentry;
- 	down(&dir->d_inode->i_sem);
--	dentry = lookup_hash(&nd->last, nd->dentry);
-+	dentry = lookup_hash_it(&nd->last, nd->dentry, it);
- 	putname(nd->last.name);
- 	goto do_last;
- }
- 
-+int open_namei(const char *pathname, int flag, int mode, struct nameidata *nd)
-+{
-+	return open_namei_it(pathname, flag, mode, nd, NULL);
-+}
-+
-+
- /* SMP-safe */
--struct dentry *lookup_create(struct nameidata *nd, int is_dir)
-+struct dentry *lookup_create(struct nameidata *nd, int is_dir,
-+				    struct lookup_intent *it)
- {
- 	struct dentry *dentry;
- 
-@@ -1261,7 +1396,7 @@
- 	dentry = ERR_PTR(-EEXIST);
- 	if (nd->last_type != LAST_NORM)
- 		goto fail;
--	dentry = lookup_hash(&nd->last, nd->dentry);
-+	dentry = lookup_hash_it(&nd->last, nd->dentry, it);
- 	if (IS_ERR(dentry))
- 		goto fail;
- 	if (!is_dir && nd->last.name[nd->last.len] && !dentry->d_inode)
-@@ -1317,7 +1452,20 @@
- 	error = path_lookup(tmp, LOOKUP_PARENT, &nd);
- 	if (error)
- 		goto out;
--	dentry = lookup_create(&nd, 0);
-+
-+	if (nd.last_type != LAST_NORM) {
-+		error = -EEXIST;
-+		goto out2;
-+	}
-+	if (nd.dentry->d_inode->i_op->mknod_raw) {
-+		struct inode_operations *op = nd.dentry->d_inode->i_op;
-+		error = op->mknod_raw(&nd, mode, dev);
-+		/* the file system wants to use normal vfs path now */
-+		if (error != -EOPNOTSUPP)
-+			goto out2;
-+	}
-+
-+	dentry = lookup_create(&nd, 0, NULL);
- 	error = PTR_ERR(dentry);
- 
- 	if (!IS_POSIXACL(nd.dentry->d_inode))
-@@ -1339,6 +1487,7 @@
- 		dput(dentry);
- 	}
- 	up(&nd.dentry->d_inode->i_sem);
-+out2:
- 	path_release(&nd);
- out:
- 	putname(tmp);
-@@ -1386,7 +1535,18 @@
- 		error = path_lookup(tmp, LOOKUP_PARENT, &nd);
- 		if (error)
- 			goto out;
--		dentry = lookup_create(&nd, 1);
-+		if (nd.last_type != LAST_NORM) {
-+			error = -EEXIST;
-+			goto out2;
-+		}
-+		if (nd.dentry->d_inode->i_op->mkdir_raw) {
-+			struct inode_operations *op = nd.dentry->d_inode->i_op;
-+			error = op->mkdir_raw(&nd, mode);
-+			/* the file system wants to use normal vfs path now */
-+			if (error != -EOPNOTSUPP)
-+				goto out2;
-+		}
-+		dentry = lookup_create(&nd, 1, NULL);
- 		error = PTR_ERR(dentry);
- 		if (!IS_ERR(dentry)) {
- 			if (!IS_POSIXACL(nd.dentry->d_inode))
-@@ -1395,6 +1555,7 @@
- 			dput(dentry);
- 		}
- 		up(&nd.dentry->d_inode->i_sem);
-+out2:
- 		path_release(&nd);
- out:
- 		putname(tmp);
-@@ -1495,8 +1656,16 @@
- 			error = -EBUSY;
- 			goto exit1;
- 	}
-+	if (nd.dentry->d_inode->i_op->rmdir_raw) {
-+		struct inode_operations *op = nd.dentry->d_inode->i_op;
-+
-+		error = op->rmdir_raw(&nd);
-+		/* the file system wants to use normal vfs path now */
-+		if (error != -EOPNOTSUPP)
-+			goto exit1;
-+	}
- 	down(&nd.dentry->d_inode->i_sem);
--	dentry = lookup_hash(&nd.last, nd.dentry);
-+	dentry = lookup_hash_it(&nd.last, nd.dentry, NULL);
- 	error = PTR_ERR(dentry);
- 	if (!IS_ERR(dentry)) {
- 		error = vfs_rmdir(nd.dentry->d_inode, dentry);
-@@ -1554,8 +1723,15 @@
- 	error = -EISDIR;
- 	if (nd.last_type != LAST_NORM)
- 		goto exit1;
-+	if (nd.dentry->d_inode->i_op->unlink_raw) {
-+		struct inode_operations *op = nd.dentry->d_inode->i_op;
-+		error = op->unlink_raw(&nd);
-+		/* the file system wants to use normal vfs path now */
-+		if (error != -EOPNOTSUPP)
-+			goto exit1;
-+	}
- 	down(&nd.dentry->d_inode->i_sem);
--	dentry = lookup_hash(&nd.last, nd.dentry);
-+	dentry = lookup_hash_it(&nd.last, nd.dentry, NULL);
- 	error = PTR_ERR(dentry);
- 	if (!IS_ERR(dentry)) {
- 		/* Why not before? Because we want correct error value */
-@@ -1622,15 +1798,27 @@
- 		error = path_lookup(to, LOOKUP_PARENT, &nd);
- 		if (error)
- 			goto out;
--		dentry = lookup_create(&nd, 0);
-+		if (nd.last_type != LAST_NORM) {
-+			error = -EEXIST;
-+			goto out2;
-+		}
-+		if (nd.dentry->d_inode->i_op->symlink_raw) {
-+			struct inode_operations *op = nd.dentry->d_inode->i_op;
-+			error = op->symlink_raw(&nd, from);
-+			/* the file system wants to use normal vfs path now */
-+			if (error != -EOPNOTSUPP)
-+				goto out2;
-+		}
-+		dentry = lookup_create(&nd, 0, NULL);
- 		error = PTR_ERR(dentry);
- 		if (!IS_ERR(dentry)) {
- 			error = vfs_symlink(nd.dentry->d_inode, dentry, from);
- 			dput(dentry);
- 		}
- 		up(&nd.dentry->d_inode->i_sem);
-+	out2:
- 		path_release(&nd);
--out:
-+	out:
- 		putname(to);
- 	}
- 	putname(from);
-@@ -1706,7 +1894,18 @@
- 		error = -EXDEV;
- 		if (old_nd.mnt != nd.mnt)
- 			goto out_release;
--		new_dentry = lookup_create(&nd, 0);
-+		if (nd.last_type != LAST_NORM) {
-+			error = -EEXIST;
-+			goto out_release;
-+		}
-+		if (nd.dentry->d_inode->i_op->link_raw) {
-+			struct inode_operations *op = nd.dentry->d_inode->i_op;
-+			error = op->link_raw(&old_nd, &nd);
-+			/* the file system wants to use normal vfs path now */
-+			if (error != -EOPNOTSUPP)
-+				goto out_release;
-+		}
-+		new_dentry = lookup_create(&nd, 0, NULL);
- 		error = PTR_ERR(new_dentry);
- 		if (!IS_ERR(new_dentry)) {
- 			error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry);
-@@ -1750,7 +1949,7 @@
-  *	   locking].
-  */
- int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry,
--	       struct inode *new_dir, struct dentry *new_dentry)
-+		   struct inode *new_dir, struct dentry *new_dentry)
- {
- 	int error;
- 	struct inode *target;
-@@ -1829,7 +2028,7 @@
- }
- 
- int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry,
--	       struct inode *new_dir, struct dentry *new_dentry)
-+		     struct inode *new_dir, struct dentry *new_dentry)
- {
- 	int error;
- 
-@@ -1917,9 +2116,18 @@
- 	if (newnd.last_type != LAST_NORM)
- 		goto exit2;
- 
-+	if (old_dir->d_inode->i_op->rename_raw) {
-+		lock_kernel();
-+		error = old_dir->d_inode->i_op->rename_raw(&oldnd, &newnd);
-+		unlock_kernel();
-+		/* the file system wants to use normal vfs path now */
-+		if (error != -EOPNOTSUPP)
-+			goto exit2;
-+	}
-+
- 	double_lock(new_dir, old_dir);
- 
--	old_dentry = lookup_hash(&oldnd.last, old_dir);
-+	old_dentry = lookup_hash_it(&oldnd.last, old_dir, NULL);
- 	error = PTR_ERR(old_dentry);
- 	if (IS_ERR(old_dentry))
- 		goto exit3;
-@@ -1935,16 +2143,16 @@
- 		if (newnd.last.name[newnd.last.len])
- 			goto exit4;
- 	}
--	new_dentry = lookup_hash(&newnd.last, new_dir);
-+	new_dentry = lookup_hash_it(&newnd.last, new_dir, NULL);
- 	error = PTR_ERR(new_dentry);
- 	if (IS_ERR(new_dentry))
- 		goto exit4;
- 
-+
- 	lock_kernel();
- 	error = vfs_rename(old_dir->d_inode, old_dentry,
- 				   new_dir->d_inode, new_dentry);
- 	unlock_kernel();
--
- 	dput(new_dentry);
- exit4:
- 	dput(old_dentry);
-@@ -1995,20 +2203,26 @@
- }
- 
- static inline int __attribute__((always_inline))
--__vfs_follow_link(struct nameidata *nd, const char *link)
-+__vfs_follow_link(struct nameidata *nd, const char *link,
-+		  struct lookup_intent *it)
- {
- 	int res = 0;
- 	char *name;
- 	if (IS_ERR(link))
- 		goto fail;
- 
-+	if (it == NULL)
-+		it = nd->intent;
-+	else if (it != nd->intent)
-+		printk("it != nd->intent: tell phil@clusterfs.com\n");
-+
- 	if (*link == '/') {
- 		path_release(nd);
- 		if (!walk_init_root(link, nd))
- 			/* weird __emul_prefix() stuff did it */
- 			goto out;
- 	}
--	res = __link_path_walk(link, nd);
-+	res = __link_path_walk_it(link, nd, it);
- out:
- 	if (current->link_count || res || nd->last_type!=LAST_NORM)
- 		return res;
-@@ -2032,7 +2246,13 @@
- 
- int vfs_follow_link(struct nameidata *nd, const char *link)
- {
--	return __vfs_follow_link(nd, link);
-+	return __vfs_follow_link(nd, link, NULL);
-+}
-+
-+int vfs_follow_link_it(struct nameidata *nd, const char *link,
-+		       struct lookup_intent *it)
-+{
-+	return __vfs_follow_link(nd, link, it);
- }
- 
- /* get the link contents into pagecache */
-@@ -2074,7 +2294,7 @@
- {
- 	struct page *page = NULL;
- 	char *s = page_getlink(dentry, &page);
--	int res = __vfs_follow_link(nd, s);
-+	int res = __vfs_follow_link(nd, s, NULL);
- 	if (page) {
- 		kunmap(page);
- 		page_cache_release(page);
-Index: linux-2.4.21/fs/namespace.c
-===================================================================
---- linux-2.4.21.orig/fs/namespace.c	2004-04-24 02:38:41.000000000 -0400
-+++ linux-2.4.21/fs/namespace.c	2004-04-26 19:06:32.000000000 -0400
-@@ -98,6 +98,7 @@
- {
- 	old_nd->dentry = mnt->mnt_mountpoint;
- 	old_nd->mnt = mnt->mnt_parent;
-+	UNPIN(old_nd->dentry, old_nd->mnt, 1);
- 	mnt->mnt_parent = mnt;
- 	mnt->mnt_mountpoint = mnt->mnt_root;
- 	list_del_init(&mnt->mnt_child);
-@@ -109,6 +110,7 @@
- {
- 	mnt->mnt_parent = mntget(nd->mnt);
- 	mnt->mnt_mountpoint = dget(nd->dentry);
-+	PIN(nd->dentry, nd->mnt, 1);
- 	list_add(&mnt->mnt_hash, mount_hashtable+hash(nd->mnt, nd->dentry));
- 	list_add(&mnt->mnt_child, &nd->mnt->mnt_mounts);
- 	nd->dentry->d_mounted++;
-@@ -488,14 +490,17 @@
- {
- 	struct nameidata old_nd;
- 	struct vfsmount *mnt = NULL;
-+	struct lookup_intent it = { .it_op = IT_GETATTR };
- 	int err = mount_is_safe(nd);
- 	if (err)
- 		return err;
- 	if (!old_name || !*old_name)
- 		return -EINVAL;
--	err = path_lookup(old_name, LOOKUP_POSITIVE|LOOKUP_FOLLOW, &old_nd);
--	if (err)
-+	err = path_lookup_it(old_name, LOOKUP_POSITIVE|LOOKUP_FOLLOW, &old_nd, &it);
-+	if (err) {
-+		intent_release(&it);
- 		return err;
-+	}
- 
- 	down_write(&current->namespace->sem);
- 	err = -EINVAL;
-@@ -518,6 +523,7 @@
- 	}
- 
- 	up_write(&current->namespace->sem);
-+	intent_release(&it);
- 	path_release(&old_nd);
- 	return err;
- }
-@@ -701,6 +707,7 @@
- 		  unsigned long flags, void *data_page)
- {
- 	struct nameidata nd;
-+	struct lookup_intent it = { .it_op = IT_GETATTR };
- 	int retval = 0;
- 	int mnt_flags = 0;
- 
-@@ -725,9 +732,11 @@
- 	flags &= ~(MS_NOSUID|MS_NOEXEC|MS_NODEV);
- 
- 	/* ... and get the mountpoint */
--	retval = path_lookup(dir_name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd);
--	if (retval)
-+	retval = path_lookup_it(dir_name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, &nd, &it);
-+	if (retval) {
-+		intent_release(&it);
- 		return retval;
-+	}
- 
- 	if (flags & MS_REMOUNT)
- 		retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags,
-@@ -739,6 +748,8 @@
- 	else
- 		retval = do_add_mount(&nd, type_page, flags, mnt_flags,
- 				      dev_name, data_page);
-+
-+	intent_release(&it);
- 	path_release(&nd);
- 	return retval;
- }
-@@ -904,6 +915,8 @@
- {
- 	struct vfsmount *tmp;
- 	struct nameidata new_nd, old_nd, parent_nd, root_parent, user_nd;
-+	struct lookup_intent new_it = { .it_op = IT_GETATTR };
-+	struct lookup_intent old_it = { .it_op = IT_GETATTR };
- 	int error;
- 
- 	if (!capable(CAP_SYS_ADMIN))
-@@ -911,14 +924,14 @@
- 
- 	lock_kernel();
- 
--	error = __user_walk(new_root, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &new_nd);
-+	error = __user_walk_it(new_root, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &new_nd, &new_it);
- 	if (error)
- 		goto out0;
- 	error = -EINVAL;
- 	if (!check_mnt(new_nd.mnt))
- 		goto out1;
- 
--	error = __user_walk(put_old, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &old_nd);
-+	error = __user_walk_it(put_old, LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &old_nd, &old_it);
- 	if (error)
- 		goto out1;
- 
-@@ -973,8 +986,10 @@
- 	up(&old_nd.dentry->d_inode->i_zombie);
- 	up_write(&current->namespace->sem);
- 	path_release(&user_nd);
-+	intent_release(&old_it);
- 	path_release(&old_nd);
- out1:
-+	intent_release(&new_it);
- 	path_release(&new_nd);
- out0:
- 	unlock_kernel();
-Index: linux-2.4.21/fs/open.c
-===================================================================
---- linux-2.4.21.orig/fs/open.c	2004-04-24 02:39:01.000000000 -0400
-+++ linux-2.4.21/fs/open.c	2004-04-26 19:06:32.000000000 -0400
-@@ -20,6 +20,8 @@
- #include <asm/uaccess.h>
- 
- #define special_file(m) (S_ISCHR(m)||S_ISBLK(m)||S_ISFIFO(m)||S_ISSOCK(m))
-+extern int path_walk_it(const char *name, struct nameidata *nd,
-+			struct lookup_intent *it);
- 
- int vfs_statfs(struct super_block *sb, struct statfs *buf)
- {
-@@ -96,9 +98,10 @@
- 	write_unlock(&files->file_lock);
- }
- 
--int do_truncate(struct dentry *dentry, loff_t length)
-+int do_truncate(struct dentry *dentry, loff_t length, int called_from_open)
- {
- 	struct inode *inode = dentry->d_inode;
-+	struct inode_operations *op = dentry->d_inode->i_op;
- 	int error;
- 	struct iattr newattrs;
- 
-@@ -110,7 +113,13 @@
- 	down(&inode->i_sem);
- 	newattrs.ia_size = length;
- 	newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
--	error = notify_change(dentry, &newattrs);
-+	if (called_from_open)
-+		newattrs.ia_valid |= ATTR_FROM_OPEN;
-+	if (op->setattr_raw) {
-+		newattrs.ia_valid |= ATTR_RAW;
-+		error = op->setattr_raw(inode, &newattrs);
-+	} else
-+		error = notify_change(dentry, &newattrs);
- 	up(&inode->i_sem);
- 	up_write(&inode->i_alloc_sem);
- 	return error;
-@@ -121,12 +130,13 @@
- 	struct nameidata nd;
- 	struct inode * inode;
- 	int error;
-+	struct lookup_intent it = { .it_op = IT_GETATTR };
- 
- 	error = -EINVAL;
- 	if (length < 0)	/* sorry, but loff_t says... */
- 		goto out;
- 
--	error = user_path_walk(path, &nd);
-+	error = user_path_walk_it(path, &nd, &it);
- 	if (error)
- 		goto out;
- 	inode = nd.dentry->d_inode;
-@@ -166,11 +176,13 @@
- 	error = locks_verify_truncate(inode, NULL, length);
- 	if (!error) {
- 		DQUOT_INIT(inode);
--		error = do_truncate(nd.dentry, length);
-+		intent_release(&it);
-+		error = do_truncate(nd.dentry, length, 0);
- 	}
- 	put_write_access(inode);
- 
- dput_and_out:
-+	intent_release(&it);
- 	path_release(&nd);
- out:
- 	return error;
-@@ -218,7 +230,7 @@
- 
- 	error = locks_verify_truncate(inode, file, length);
- 	if (!error)
--		error = do_truncate(dentry, length);
-+		error = do_truncate(dentry, length, 0);
- out_putf:
- 	fput(file);
- out:
-@@ -263,11 +275,13 @@
- 	struct inode * inode;
- 	struct iattr newattrs;
- 
--	error = user_path_walk(filename, &nd);
-+	error = user_path_walk_it(filename, &nd, NULL);
- 	if (error)
- 		goto out;
- 	inode = nd.dentry->d_inode;
- 
-+	/* this is safe without a Lustre lock because it only depends
-+	   on the super block */
- 	error = -EROFS;
- 	if (IS_RDONLY(inode))
- 		goto dput_and_out;
-@@ -282,11 +296,25 @@
- 			goto dput_and_out;
- 
- 		newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET;
--	} else {
-+	}
-+
-+	if (inode->i_op->setattr_raw) {
-+		struct inode_operations *op = nd.dentry->d_inode->i_op;
-+
-+		newattrs.ia_valid |= ATTR_RAW;
-+		error = op->setattr_raw(inode, &newattrs);
-+		/* the file system wants to use normal vfs path now */
-+		if (error != -EOPNOTSUPP)
-+			goto dput_and_out;
-+	}
-+
-+	error = -EPERM;
-+	if (!times) {
- 		if (current->fsuid != inode->i_uid &&
- 		    (error = permission(inode,MAY_WRITE)) != 0)
- 			goto dput_and_out;
- 	}
-+
- 	error = notify_change(nd.dentry, &newattrs);
- dput_and_out:
- 	path_release(&nd);
-@@ -307,12 +335,14 @@
- 	struct inode * inode;
- 	struct iattr newattrs;
- 
--	error = user_path_walk(filename, &nd);
-+	error = user_path_walk_it(filename, &nd, NULL);
- 
- 	if (error)
- 		goto out;
- 	inode = nd.dentry->d_inode;
- 
-+	/* this is safe without a Lustre lock because it only depends
-+	   on the super block */
- 	error = -EROFS;
- 	if (IS_RDONLY(inode))
- 		goto dput_and_out;
-@@ -327,7 +357,20 @@
- 		newattrs.ia_atime = times[0].tv_sec;
- 		newattrs.ia_mtime = times[1].tv_sec;
- 		newattrs.ia_valid |= ATTR_ATIME_SET | ATTR_MTIME_SET;
--	} else {
-+	}
-+
-+	if (inode->i_op->setattr_raw) {
-+		struct inode_operations *op = nd.dentry->d_inode->i_op;
-+
-+		newattrs.ia_valid |= ATTR_RAW;
-+		error = op->setattr_raw(inode, &newattrs);
-+		/* the file system wants to use normal vfs path now */
-+		if (error != -EOPNOTSUPP)
-+			goto dput_and_out;
-+	}
-+
-+	error = -EPERM;
-+	if (!utimes) {
- 		if (current->fsuid != inode->i_uid &&
- 		    (error = permission(inode,MAY_WRITE)) != 0)
- 			goto dput_and_out;
-@@ -350,6 +393,7 @@
- 	int old_fsuid, old_fsgid;
- 	kernel_cap_t old_cap;
- 	int res;
-+	struct lookup_intent it = { .it_op = IT_GETATTR };
- 
- 	if (mode & ~S_IRWXO)	/* where's F_OK, X_OK, W_OK, R_OK? */
- 		return -EINVAL;
-@@ -367,13 +411,14 @@
- 	else
- 		current->cap_effective = current->cap_permitted;
- 
--	res = user_path_walk(filename, &nd);
-+	res = user_path_walk_it(filename, &nd, &it);
- 	if (!res) {
- 		res = permission(nd.dentry->d_inode, mode);
- 		/* SuS v2 requires we report a read only fs too */
- 		if(!res && (mode & S_IWOTH) && IS_RDONLY(nd.dentry->d_inode)
- 		   && !special_file(nd.dentry->d_inode->i_mode))
- 			res = -EROFS;
-+		intent_release(&it);
- 		path_release(&nd);
- 	}
- 
-@@ -388,8 +433,9 @@
- {
- 	int error;
- 	struct nameidata nd;
-+	struct lookup_intent it = { .it_op = IT_GETATTR };
- 
--	error = __user_walk(filename,LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY,&nd);
-+	error = __user_walk_it(filename,LOOKUP_POSITIVE|LOOKUP_FOLLOW|LOOKUP_DIRECTORY,&nd, &it);
- 	if (error)
- 		goto out;
- 
-@@ -400,6 +446,7 @@
- 	set_fs_pwd(current->fs, nd.mnt, nd.dentry);
- 
- dput_and_out:
-+	intent_release(&it);
- 	path_release(&nd);
- out:
- 	return error;
-@@ -439,9 +486,10 @@
- {
- 	int error;
- 	struct nameidata nd;
-+	struct lookup_intent it = { .it_op = IT_GETATTR };
- 
--	error = __user_walk(filename, LOOKUP_POSITIVE | LOOKUP_FOLLOW |
--		      LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd);
-+	error = __user_walk_it(filename, LOOKUP_POSITIVE | LOOKUP_FOLLOW |
-+			       LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd, &it);
- 	if (error)
- 		goto out;
- 
-@@ -457,39 +505,56 @@
- 	set_fs_altroot();
- 	error = 0;
- dput_and_out:
-+	intent_release(&it);
- 	path_release(&nd);
- out:
- 	return error;
- }
- 
--asmlinkage long sys_fchmod(unsigned int fd, mode_t mode)
-+int chmod_common(struct dentry *dentry, mode_t mode)
- {
--	struct inode * inode;
--	struct dentry * dentry;
--	struct file * file;
--	int err = -EBADF;
-+	struct inode *inode = dentry->d_inode;
- 	struct iattr newattrs;
-+	int err = -EROFS;
- 
--	file = fget(fd);
--	if (!file)
-+	if (IS_RDONLY(inode))
- 		goto out;
- 
--	dentry = file->f_dentry;
--	inode = dentry->d_inode;
-+	if (inode->i_op->setattr_raw) {
-+		newattrs.ia_mode = mode;
-+		newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
-+		newattrs.ia_valid |= ATTR_RAW;
-+		err = inode->i_op->setattr_raw(inode, &newattrs);
-+		/* the file system wants to use normal vfs path now */
-+		if (err != -EOPNOTSUPP)
-+			goto out;
-+	}
- 
--	err = -EROFS;
--	if (IS_RDONLY(inode))
--		goto out_putf;
- 	err = -EPERM;
- 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
--		goto out_putf;
-+		goto out;
-+
- 	if (mode == (mode_t) -1)
- 		mode = inode->i_mode;
- 	newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
- 	newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
- 	err = notify_change(dentry, &newattrs);
- 
--out_putf:
-+out:
-+	return err;
-+}
-+
-+asmlinkage long sys_fchmod(unsigned int fd, mode_t mode)
-+{
-+	struct file * file;
-+	int err = -EBADF;
-+
-+	file = fget(fd);
-+	if (!file)
-+		goto out;
-+
-+	err = chmod_common(file->f_dentry, mode);
-+
- 	fput(file);
- out:
- 	return err;
-@@ -498,30 +563,14 @@
- asmlinkage long sys_chmod(const char * filename, mode_t mode)
- {
- 	struct nameidata nd;
--	struct inode * inode;
- 	int error;
--	struct iattr newattrs;
- 
- 	error = user_path_walk(filename, &nd);
- 	if (error)
- 		goto out;
--	inode = nd.dentry->d_inode;
--
--	error = -EROFS;
--	if (IS_RDONLY(inode))
--		goto dput_and_out;
- 
--	error = -EPERM;
--	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
--		goto dput_and_out;
-+	error = chmod_common(nd.dentry, mode);
- 
--	if (mode == (mode_t) -1)
--		mode = inode->i_mode;
--	newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
--	newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
--	error = notify_change(nd.dentry, &newattrs);
--
--dput_and_out:
- 	path_release(&nd);
- out:
- 	return error;
-@@ -541,6 +590,20 @@
- 	error = -EROFS;
- 	if (IS_RDONLY(inode))
- 		goto out;
-+
-+	if (inode->i_op->setattr_raw) {
-+		struct inode_operations *op = dentry->d_inode->i_op;
-+
-+		newattrs.ia_uid = user;
-+		newattrs.ia_gid = group;
-+		newattrs.ia_valid = ATTR_UID | ATTR_GID | ATTR_CTIME;
-+		newattrs.ia_valid |= ATTR_RAW;
-+		error = op->setattr_raw(inode, &newattrs);
-+		/* the file system wants to use normal vfs path now */
-+		if (error != -EOPNOTSUPP)
-+			return error;
-+	}
-+
- 	error = -EPERM;
- 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
- 		goto out;
-@@ -645,6 +708,7 @@
- {
- 	int namei_flags, error;
- 	struct nameidata nd;
-+	struct lookup_intent it = { .it_op = IT_OPEN };
- 
- 	namei_flags = flags;
- 	if ((namei_flags+1) & O_ACCMODE)
-@@ -652,14 +716,15 @@
- 	if (namei_flags & O_TRUNC)
- 		namei_flags |= 2;
- 
--	error = open_namei(filename, namei_flags, mode, &nd);
--	if (!error)
--		return dentry_open(nd.dentry, nd.mnt, flags);
-+	error = open_namei_it(filename, namei_flags, mode, &nd, &it);
-+	if (error)
-+		return ERR_PTR(error);
- 
--	return ERR_PTR(error);
-+	return dentry_open_it(nd.dentry, nd.mnt, flags, &it);
- }
- 
--struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
-+struct file *dentry_open_it(struct dentry *dentry, struct vfsmount *mnt,
-+			    int flags, struct lookup_intent *it)
- {
- 	struct file * f;
- 	struct inode *inode;
-@@ -687,7 +752,9 @@
- 	file_move(f, &inode->i_sb->s_files);
- 
- 	if (f->f_op && f->f_op->open) {
-+		f->f_it = it;
- 		error = f->f_op->open(inode,f);
-+		f->f_it = NULL;
- 		if (error)
- 			goto cleanup_all;
- 	}
-@@ -699,6 +766,7 @@
- 				      !inode->i_mapping->a_ops->direct_IO))
- 		goto cleanup_all;
- 
-+	intent_release(it);
- 	return f;
- 
- cleanup_all:
-@@ -711,11 +779,17 @@
- cleanup_file:
- 	put_filp(f);
- cleanup_dentry:
-+	intent_release(it);
- 	dput(dentry);
- 	mntput(mnt);
- 	return ERR_PTR(error);
- }
- 
-+struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
-+{
-+	return dentry_open_it(dentry, mnt, flags, NULL);
-+}
-+
- /*
-  * Find an empty file descriptor entry, and mark it busy.
-  */
-Index: linux-2.4.21/fs/stat.c
-===================================================================
---- linux-2.4.21.orig/fs/stat.c	2004-04-24 02:37:58.000000000 -0400
-+++ linux-2.4.21/fs/stat.c	2004-04-26 19:06:32.000000000 -0400
-@@ -17,10 +17,12 @@
-  * Revalidate the inode. This is required for proper NFS attribute caching.
-  */
- static __inline__ int
--do_revalidate(struct dentry *dentry)
-+do_revalidate(struct dentry *dentry, struct lookup_intent *it)
- {
- 	struct inode * inode = dentry->d_inode;
--	if (inode->i_op && inode->i_op->revalidate)
-+	if (inode->i_op && inode->i_op->revalidate_it)
-+		return inode->i_op->revalidate_it(dentry, it);
-+	else if (inode->i_op && inode->i_op->revalidate)
- 		return inode->i_op->revalidate(dentry);
- 	return 0;
- }
-@@ -141,13 +143,15 @@
- asmlinkage long sys_stat(char * filename, struct __old_kernel_stat * statbuf)
- {
- 	struct nameidata nd;
-+	struct lookup_intent it = { .it_op = IT_GETATTR };
- 	int error;
- 
--	error = user_path_walk(filename, &nd);
-+	error = user_path_walk_it(filename, &nd, &it);
- 	if (!error) {
--		error = do_revalidate(nd.dentry);
-+		error = do_revalidate(nd.dentry, &it);
- 		if (!error)
- 			error = cp_old_stat(nd.dentry->d_inode, statbuf);
-+		intent_release(&it);
- 		path_release(&nd);
- 	}
- 	return error;
-@@ -157,13 +161,15 @@
- asmlinkage long sys_newstat(char * filename, struct stat * statbuf)
- {
- 	struct nameidata nd;
-+	struct lookup_intent it = { .it_op = IT_GETATTR };
- 	int error;
- 
--	error = user_path_walk(filename, &nd);
-+	error = user_path_walk_it(filename, &nd, &it);
- 	if (!error) {
--		error = do_revalidate(nd.dentry);
-+		error = do_revalidate(nd.dentry, &it);
- 		if (!error)
- 			error = cp_new_stat(nd.dentry->d_inode, statbuf);
-+		intent_release(&it);
- 		path_release(&nd);
- 	}
- 	return error;
-@@ -178,13 +184,15 @@
- asmlinkage long sys_lstat(char * filename, struct __old_kernel_stat * statbuf)
- {
- 	struct nameidata nd;
-+	struct lookup_intent it = { .it_op = IT_GETATTR };
- 	int error;
- 
--	error = user_path_walk_link(filename, &nd);
-+	error = user_path_walk_link_it(filename, &nd, &it);
- 	if (!error) {
--		error = do_revalidate(nd.dentry);
-+		error = do_revalidate(nd.dentry, &it);
- 		if (!error)
- 			error = cp_old_stat(nd.dentry->d_inode, statbuf);
-+		intent_release(&it);
- 		path_release(&nd);
- 	}
- 	return error;
-@@ -195,13 +203,15 @@
- asmlinkage long sys_newlstat(char * filename, struct stat * statbuf)
- {
- 	struct nameidata nd;
-+	struct lookup_intent it = { .it_op = IT_GETATTR };
- 	int error;
- 
--	error = user_path_walk_link(filename, &nd);
-+	error = user_path_walk_link_it(filename, &nd, &it);
- 	if (!error) {
--		error = do_revalidate(nd.dentry);
-+		error = do_revalidate(nd.dentry, &it);
- 		if (!error)
- 			error = cp_new_stat(nd.dentry->d_inode, statbuf);
-+		intent_release(&it);
- 		path_release(&nd);
- 	}
- 	return error;
-@@ -222,7 +232,7 @@
- 	if (f) {
- 		struct dentry * dentry = f->f_dentry;
- 
--		err = do_revalidate(dentry);
-+		err = do_revalidate(dentry, NULL);
- 		if (!err)
- 			err = cp_old_stat(dentry->d_inode, statbuf);
- 		fput(f);
-@@ -241,7 +251,7 @@
- 	if (f) {
- 		struct dentry * dentry = f->f_dentry;
- 
--		err = do_revalidate(dentry);
-+		err = do_revalidate(dentry, NULL);
- 		if (!err)
- 			err = cp_new_stat(dentry->d_inode, statbuf);
- 		fput(f);
-@@ -263,7 +273,7 @@
- 
- 		error = -EINVAL;
- 		if (inode->i_op && inode->i_op->readlink &&
--		    !(error = do_revalidate(nd.dentry))) {
-+		    !(error = do_revalidate(nd.dentry, NULL))) {
- 			UPDATE_ATIME(inode);
- 			error = inode->i_op->readlink(nd.dentry, buf, bufsiz);
- 		}
-@@ -339,12 +349,14 @@
- {
- 	struct nameidata nd;
- 	int error;
-+	struct lookup_intent it = { .it_op = IT_GETATTR };
- 
--	error = user_path_walk(filename, &nd);
-+	error = user_path_walk_it(filename, &nd, &it);
- 	if (!error) {
--		error = do_revalidate(nd.dentry);
-+		error = do_revalidate(nd.dentry, &it);
- 		if (!error)
- 			error = cp_new_stat64(nd.dentry->d_inode, statbuf);
-+		intent_release(&it);
- 		path_release(&nd);
- 	}
- 	return error;
-@@ -354,12 +366,14 @@
- {
- 	struct nameidata nd;
- 	int error;
-+	struct lookup_intent it = { .it_op = IT_GETATTR };
- 
--	error = user_path_walk_link(filename, &nd);
-+	error = user_path_walk_link_it(filename, &nd, &it);
- 	if (!error) {
--		error = do_revalidate(nd.dentry);
-+		error = do_revalidate(nd.dentry, &it);
- 		if (!error)
- 			error = cp_new_stat64(nd.dentry->d_inode, statbuf);
-+		intent_release(&it);
- 		path_release(&nd);
- 	}
- 	return error;
-@@ -374,7 +388,7 @@
- 	if (f) {
- 		struct dentry * dentry = f->f_dentry;
- 
--		err = do_revalidate(dentry);
-+		err = do_revalidate(dentry, NULL);
- 		if (!err)
- 			err = cp_new_stat64(dentry->d_inode, statbuf);
- 		fput(f);
-Index: linux-2.4.21/include/linux/dcache.h
-===================================================================
---- linux-2.4.21.orig/include/linux/dcache.h	2004-04-24 02:37:59.000000000 -0400
-+++ linux-2.4.21/include/linux/dcache.h	2004-04-26 19:06:32.000000000 -0400
-@@ -7,6 +7,51 @@
- #include <linux/gdb.h>
- #include <linux/mount.h>
- #include <linux/kernel.h>
-+#include <linux/string.h>
-+
-+#define IT_OPEN     0x0001
-+#define IT_CREAT    0x0002
-+#define IT_READDIR  0x0004
-+#define IT_GETATTR  0x0008
-+#define IT_LOOKUP   0x0010
-+#define IT_UNLINK   0x0020
-+#define IT_GETXATTR 0x0040
-+#define IT_EXEC     0x0080
-+#define IT_PIN      0x0100
-+
-+#define IT_FL_LOCKED   0x0001
-+#define IT_FL_FOLLOWED 0x0002 /* set by vfs_follow_link */
-+
-+#define INTENT_MAGIC 0x19620323
-+
-+
-+struct lustre_intent_data {
-+	int       it_disposition;
-+	int       it_status;
-+	__u64     it_lock_handle;
-+	void     *it_data;
-+	int       it_lock_mode;
-+	int it_int_flags;
-+};
-+struct lookup_intent {
-+	int     it_magic;
-+	void    (*it_op_release)(struct lookup_intent *);
-+	int     it_op;
-+	int     it_flags;
-+	int     it_create_mode;
-+	union {
-+		struct lustre_intent_data lustre;
-+	} d;
-+};
-+
-+static inline void intent_init(struct lookup_intent *it, int op, int flags)
-+{
-+	memset(it, 0, sizeof(*it));
-+	it->it_magic = INTENT_MAGIC;
-+	it->it_op = op;
-+	it->it_flags = flags;
-+}
-+
- 
- /*
-  * linux/include/linux/dcache.h
-@@ -94,8 +139,22 @@
- 	int (*d_delete)(struct dentry *);
- 	void (*d_release)(struct dentry *);
- 	void (*d_iput)(struct dentry *, struct inode *);
-+	int (*d_revalidate_it)(struct dentry *, int, struct lookup_intent *);
-+	void (*d_pin)(struct dentry *, struct vfsmount * , int);
-+	void (*d_unpin)(struct dentry *, struct vfsmount *, int);
- };
- 
-+#define PIN(de,mnt,flag)  if (de && de->d_op && de->d_op->d_pin) \
-+				de->d_op->d_pin(de, mnt, flag);
-+#define UNPIN(de,mnt,flag)  if (de && de->d_op && de->d_op->d_unpin) \
-+				de->d_op->d_unpin(de, mnt, flag);
-+
-+
-+/* defined in fs/namei.c */
-+extern void intent_release(struct lookup_intent *it);
-+/* defined in fs/dcache.c */
-+extern void __d_rehash(struct dentry * entry, int lock);
-+
- /* the dentry parameter passed to d_hash and d_compare is the parent
-  * directory of the entries to be compared. It is used in case these
-  * functions need any directory specific information for determining
-@@ -127,6 +186,7 @@
- 					 * s_nfsd_free_path semaphore will be down
- 					 */
- #define DCACHE_REFERENCED	0x0008  /* Recently used, don't discard. */
-+#define DCACHE_LUSTRE_INVALID	0x0010  /* Lustre invalidated */
- 
- extern spinlock_t dcache_lock;
- 
-Index: linux-2.4.21/include/linux/fs.h
-===================================================================
---- linux-2.4.21.orig/include/linux/fs.h	2004-04-26 18:56:44.000000000 -0400
-+++ linux-2.4.21/include/linux/fs.h	2004-04-26 19:06:32.000000000 -0400
-@@ -74,6 +74,7 @@
- 
- #define FMODE_READ 1
- #define FMODE_WRITE 2
-+#define FMODE_EXEC 4
- 
- #define READ 0
- #define WRITE 1
-@@ -360,6 +361,9 @@
- #define ATTR_MTIME_SET	256
- #define ATTR_FORCE	512	/* Not a change, but a change it */
- #define ATTR_ATTR_FLAG	1024
-+#define ATTR_RAW	0x0800	/* file system, not vfs will massage attrs */
-+#define ATTR_FROM_OPEN	0x1000	/* called from open path, ie O_TRUNC */
-+#define ATTR_CTIME_SET	0x2000
- 
- /*
-  * This is the Inode Attributes structure, used for notify_change().  It
-@@ -504,6 +508,7 @@
- 	struct pipe_inode_info	*i_pipe;
- 	struct block_device	*i_bdev;
- 	struct char_device	*i_cdev;
-+	void			*i_filterdata;
- 
- 	unsigned long		i_dnotify_mask; /* Directory notify events */
- 	struct dnotify_struct	*i_dnotify; /* for directory notifications */
-@@ -666,6 +671,7 @@
- 
- 	/* needed for tty driver, and maybe others */
- 	void			*private_data;
-+	struct lookup_intent    *f_it;
- 	struct list_head	f_ep_links;
- 	spinlock_t		f_ep_lock;
- };
-@@ -795,6 +801,7 @@
- 	struct qstr last;
- 	unsigned int flags;
- 	int last_type;
-+	struct lookup_intent *intent;
- };
- 
- /*
-@@ -916,7 +923,8 @@
- extern int __vfs_rmdir(struct inode *, struct dentry *);
- extern int vfs_rmdir(struct inode *, struct dentry *);
- extern int vfs_unlink(struct inode *, struct dentry *);
--extern int vfs_rename(struct inode *, struct dentry *, struct inode *, struct dentry *);
-+int vfs_rename(struct inode *old_dir, struct dentry *old_dentry,
-+	       struct inode *new_dir, struct dentry *new_dentry);
- 
- /*
-  * File types
-@@ -991,21 +999,32 @@
- 
- struct inode_operations {
- 	int (*create) (struct inode *,struct dentry *,int);
-+	int (*create_it) (struct inode *,struct dentry *,int, struct lookup_intent *);
- 	struct dentry * (*lookup) (struct inode *,struct dentry *);
-+	struct dentry * (*lookup_it) (struct inode *,struct dentry *, struct lookup_intent *, int flags);
- 	int (*link) (struct dentry *,struct inode *,struct dentry *);
-+	int (*link_raw) (struct nameidata *,struct nameidata *);
- 	int (*unlink) (struct inode *,struct dentry *);
-+	int (*unlink_raw) (struct nameidata *);
- 	int (*symlink) (struct inode *,struct dentry *,const char *);
-+	int (*symlink_raw) (struct nameidata *,const char *);
- 	int (*mkdir) (struct inode *,struct dentry *,int);
-+	int (*mkdir_raw) (struct nameidata *,int);
- 	int (*rmdir) (struct inode *,struct dentry *);
-+	int (*rmdir_raw) (struct nameidata *);
- 	int (*mknod) (struct inode *,struct dentry *,int,int);
-+	int (*mknod_raw) (struct nameidata *,int,dev_t);
- 	int (*rename) (struct inode *, struct dentry *,
- 			struct inode *, struct dentry *);
-+	int (*rename_raw) (struct nameidata *, struct nameidata *);
- 	int (*readlink) (struct dentry *, char *,int);
- 	int (*follow_link) (struct dentry *, struct nameidata *);
- 	void (*truncate) (struct inode *);
- 	int (*permission) (struct inode *, int);
- 	int (*revalidate) (struct dentry *);
-+	int (*revalidate_it) (struct dentry *, struct lookup_intent *);
- 	int (*setattr) (struct dentry *, struct iattr *);
-+	int (*setattr_raw) (struct inode *, struct iattr *);
- 	int (*getattr) (struct dentry *, struct iattr *);
- 	int (*setxattr) (struct dentry *, const char *, const void *, size_t, int);
- 	ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
-@@ -1204,10 +1223,14 @@
- 
- asmlinkage long sys_open(const char *, int, int);
- asmlinkage long sys_close(unsigned int);	/* yes, it's really unsigned */
--extern int do_truncate(struct dentry *, loff_t start);
-+extern int do_truncate(struct dentry *, loff_t start, int called_from_open);
- 
- extern struct file *filp_open(const char *, int, int);
- extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
-+extern int open_namei_it(const char *filename, int namei_flags, int mode,
-+			 struct nameidata *nd, struct lookup_intent *it);
-+extern struct file *dentry_open_it(struct dentry *dentry, struct vfsmount *mnt,
-+			    int flags, struct lookup_intent *it);
- extern int filp_close(struct file *, fl_owner_t id);
- extern char * getname(const char *);
- 
-@@ -1503,6 +1526,7 @@
- extern loff_t default_llseek(struct file *file, loff_t offset, int origin);
- 
- extern int FASTCALL(__user_walk(const char *, unsigned, struct nameidata *));
-+extern int FASTCALL(__user_walk_it(const char *, unsigned, struct nameidata *, struct lookup_intent *it));
- extern int FASTCALL(path_init(const char *, unsigned, struct nameidata *));
- extern int FASTCALL(path_walk(const char *, struct nameidata *));
- extern int FASTCALL(path_lookup(const char *, unsigned, struct nameidata *));
-@@ -1515,6 +1539,8 @@
- extern struct dentry * lookup_hash(struct qstr *, struct dentry *);
- #define user_path_walk(name,nd)	 __user_walk(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, nd)
- #define user_path_walk_link(name,nd) __user_walk(name, LOOKUP_POSITIVE, nd)
-+#define user_path_walk_it(name,nd,it)  __user_walk_it(name, LOOKUP_FOLLOW|LOOKUP_POSITIVE, nd, it)
-+#define user_path_walk_link_it(name,nd,it) __user_walk_it(name, LOOKUP_POSITIVE, nd, it)
- 
- extern void inode_init_once(struct inode *);
- extern void _inode_init_once(struct inode *);
-@@ -1666,6 +1692,8 @@
- 
- extern int vfs_readlink(struct dentry *, char *, int, const char *);
- extern int vfs_follow_link(struct nameidata *, const char *);
-+extern int vfs_follow_link_it(struct nameidata *, const char *,
-+			      struct lookup_intent *it);
- extern int page_readlink(struct dentry *, char *, int);
- extern int page_follow_link(struct dentry *, struct nameidata *);
- extern struct inode_operations page_symlink_inode_operations;
-Index: linux-2.4.21/include/linux/fs_struct.h
-===================================================================
---- linux-2.4.21.orig/include/linux/fs_struct.h	2001-07-13 18:10:44.000000000 -0400
-+++ linux-2.4.21/include/linux/fs_struct.h	2004-04-26 19:06:32.000000000 -0400
-@@ -34,10 +34,12 @@
- 	write_lock(&fs->lock);
- 	old_root = fs->root;
- 	old_rootmnt = fs->rootmnt;
-+	PIN(dentry, mnt, 1);
- 	fs->rootmnt = mntget(mnt);
- 	fs->root = dget(dentry);
- 	write_unlock(&fs->lock);
- 	if (old_root) {
-+		UNPIN(old_root, old_rootmnt, 1);
- 		dput(old_root);
- 		mntput(old_rootmnt);
- 	}
-@@ -57,10 +59,12 @@
- 	write_lock(&fs->lock);
- 	old_pwd = fs->pwd;
- 	old_pwdmnt = fs->pwdmnt;
-+	PIN(dentry, mnt, 0);
- 	fs->pwdmnt = mntget(mnt);
- 	fs->pwd = dget(dentry);
- 	write_unlock(&fs->lock);
- 	if (old_pwd) {
-+		UNPIN(old_pwd, old_pwdmnt, 0);
- 		dput(old_pwd);
- 		mntput(old_pwdmnt);
- 	}
-Index: linux-2.4.21/kernel/exit.c
-===================================================================
---- linux-2.4.21.orig/kernel/exit.c	2004-04-24 02:39:01.000000000 -0400
-+++ linux-2.4.21/kernel/exit.c	2004-04-26 19:06:32.000000000 -0400
-@@ -292,11 +292,14 @@
- {
- 	/* No need to hold fs->lock if we are killing it */
- 	if (atomic_dec_and_test(&fs->count)) {
-+		UNPIN(fs->pwd, fs->pwdmnt, 0);
-+		UNPIN(fs->root, fs->rootmnt, 1);
- 		dput(fs->root);
- 		mntput(fs->rootmnt);
- 		dput(fs->pwd);
- 		mntput(fs->pwdmnt);
- 		if (fs->altroot) {
-+			UNPIN(fs->altroot, fs->altrootmnt, 1);
- 			dput(fs->altroot);
- 			mntput(fs->altrootmnt);
- 		}
-Index: linux-2.4.21/kernel/fork.c
-===================================================================
---- linux-2.4.21.orig/kernel/fork.c	2004-04-24 02:39:01.000000000 -0400
-+++ linux-2.4.21/kernel/fork.c	2004-04-26 19:06:32.000000000 -0400
-@@ -466,10 +466,13 @@
- 		fs->umask = old->umask;
- 		read_lock(&old->lock);
- 		fs->rootmnt = mntget(old->rootmnt);
-+		PIN(old->pwd, old->pwdmnt, 0);
-+		PIN(old->root, old->rootmnt, 1);
- 		fs->root = dget(old->root);
- 		fs->pwdmnt = mntget(old->pwdmnt);
- 		fs->pwd = dget(old->pwd);
- 		if (old->altroot) {
-+			PIN(old->altroot, old->altrootmnt, 1);
- 			fs->altrootmnt = mntget(old->altrootmnt);
- 			fs->altroot = dget(old->altroot);
- 		} else {
-Index: linux-2.4.21/kernel/ksyms.c
-===================================================================
---- linux-2.4.21.orig/kernel/ksyms.c	2004-04-26 18:56:44.000000000 -0400
-+++ linux-2.4.21/kernel/ksyms.c	2004-04-26 19:06:32.000000000 -0400
-@@ -329,6 +329,7 @@
- EXPORT_SYMBOL(set_page_dirty);
- EXPORT_SYMBOL(vfs_readlink);
- EXPORT_SYMBOL(vfs_follow_link);
-+EXPORT_SYMBOL(vfs_follow_link_it);
- EXPORT_SYMBOL(page_readlink);
- EXPORT_SYMBOL(page_follow_link);
- EXPORT_SYMBOL(page_symlink_inode_operations);
diff --git a/lustre/kernel_patches/patches/vfs_intent-2.4.21-suse2.patch b/lustre/kernel_patches/patches/vfs_intent-2.4.21-suse2.patch
index 85f8cf4..25d147d 100644
--- a/lustre/kernel_patches/patches/vfs_intent-2.4.21-suse2.patch
+++ b/lustre/kernel_patches/patches/vfs_intent-2.4.21-suse2.patch
@@ -12,10 +12,10 @@
  kernel/ksyms.c            |    1 
  12 files changed, 558 insertions(+), 128 deletions(-)
 
-Index: linux-2.4.21-x86_64/fs/dcache.c
+Index: linux-2.4.21-suse2/fs/dcache.c
 ===================================================================
---- linux-2.4.21-x86_64.orig/fs/dcache.c	2003-10-28 10:33:59.000000000 -0800
-+++ linux-2.4.21-x86_64/fs/dcache.c	2004-04-12 19:57:36.000000000 -0700
+--- linux-2.4.21-suse2.orig/fs/dcache.c	2003-10-28 21:33:59.000000000 +0300
++++ linux-2.4.21-suse2/fs/dcache.c	2004-01-10 12:15:41.000000000 +0300
 @@ -186,6 +186,13 @@
  		spin_unlock(&dcache_lock);
  		return 0;
@@ -53,10 +53,10 @@ Index: linux-2.4.21-x86_64/fs/dcache.c
  }
  
  #define do_switch(x,y) do { \
-Index: linux-2.4.21-x86_64/fs/exec.c
+Index: linux-2.4.21-suse2/fs/exec.c
 ===================================================================
---- linux-2.4.21-x86_64.orig/fs/exec.c	2003-10-28 10:34:17.000000000 -0800
-+++ linux-2.4.21-x86_64/fs/exec.c	2004-04-12 19:57:36.000000000 -0700
+--- linux-2.4.21-suse2.orig/fs/exec.c	2003-10-28 21:34:17.000000000 +0300
++++ linux-2.4.21-suse2/fs/exec.c	2004-01-10 12:15:41.000000000 +0300
 @@ -112,8 +112,10 @@
  	struct file * file;
  	struct nameidata nd;
@@ -118,10 +118,10 @@ Index: linux-2.4.21-x86_64/fs/exec.c
  		goto close_fail;
  
  	retval = binfmt->core_dump(signr, regs, file);
-Index: linux-2.4.21-x86_64/fs/namei.c
+Index: linux-2.4.21-suse2/fs/namei.c
 ===================================================================
---- linux-2.4.21-x86_64.orig/fs/namei.c	2003-10-28 10:34:18.000000000 -0800
-+++ linux-2.4.21-x86_64/fs/namei.c	2004-04-12 19:58:44.000000000 -0700
+--- linux-2.4.21-suse2.orig/fs/namei.c	2004-01-10 12:06:40.000000000 +0300
++++ linux-2.4.21-suse2/fs/namei.c	2004-01-10 12:55:09.000000000 +0300
 @@ -94,6 +94,13 @@
   * XEmacs seems to be relying on it...
   */
@@ -300,7 +300,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  				break;
  		}
  		goto return_base;
-@@ -643,6 +680,27 @@
+@@ -643,6 +680,25 @@
  		 * Check the cached dentry for staleness.
  		 */
  		dentry = nd->dentry;
@@ -309,35 +309,33 @@ Index: linux-2.4.21-x86_64/fs/namei.c
 +			if (!dentry->d_op->d_revalidate_it(dentry, 0, it)) {
 +				struct dentry *new;
 +				err = permission(dentry->d_parent->d_inode,
-+						 MAY_EXEC);
++						MAY_EXEC);
 +				if (err)
 +					break;
 +				new = real_lookup(dentry->d_parent,
-+						  &dentry->d_name, 0, it);
++						&dentry->d_name, 0, NULL);
++				d_invalidate(dentry);
++				dput(dentry);
 +				if (IS_ERR(new)) {
 +					err = PTR_ERR(new);
 +					break;
 +				}
-+				d_invalidate(dentry);
-+				dput(dentry);
 +				nd->dentry = new;
 +			}
-+			if (!nd->dentry->d_inode)
-+				goto no_inode;
 +		} else
  		if (dentry && dentry->d_op && dentry->d_op->d_revalidate) {
  			err = -ESTALE;
  			if (!dentry->d_op->d_revalidate(dentry, lookup_flags & LOOKUP_PARENT)) {
-@@ -656,6 +714,8 @@
+@@ -656,6 +712,8 @@
  		dput(dentry);
  		break;
  	}
-+	if (err)
-+		intent_release(it);
++ 	if (err)
++ 		intent_release(it);
  	path_release(nd);
  return_err:
  	return err;
-@@ -663,13 +723,13 @@
+@@ -663,13 +721,13 @@
  
  int link_path_walk(const char * name, struct nameidata *nd)
  {
@@ -353,7 +351,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  }
  
  int path_walk(const char * name, struct nameidata *nd)
-@@ -677,6 +737,12 @@
+@@ -677,6 +735,12 @@
  	return __path_walk(name, nd);
  }
  
@@ -366,7 +364,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  /* SMP-safe */
  /* returns 1 if everything is done */
  static int __emul_lookup_dentry(const char *name, struct nameidata *nd)
-@@ -759,6 +825,17 @@
+@@ -759,6 +823,17 @@
  }
  
  /* SMP-safe */
@@ -384,7 +382,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  int path_lookup(const char *path, unsigned flags, struct nameidata *nd)
  {
  	int error = 0;
-@@ -773,6 +850,7 @@
+@@ -773,6 +848,7 @@
  {
  	nd->last_type = LAST_ROOT; /* if there are only slashes... */
  	nd->flags = flags;
@@ -392,7 +390,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  	if (*name=='/')
  		return walk_init_root(name,nd);
  	read_lock(&current->fs->lock);
-@@ -787,7 +865,8 @@
+@@ -787,7 +863,8 @@
   * needs parent already locked. Doesn't follow mounts.
   * SMP-safe.
   */
@@ -402,7 +400,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  {
  	struct dentry * dentry;
  	struct inode *inode;
-@@ -810,13 +889,16 @@
+@@ -810,13 +887,16 @@
  			goto out;
  	}
  
@@ -420,7 +418,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  		dentry = inode->i_op->lookup(inode, new);
  		unlock_kernel();
  		if (!dentry)
-@@ -828,6 +910,12 @@
+@@ -828,6 +908,12 @@
  	return dentry;
  }
  
@@ -433,7 +431,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  /* SMP-safe */
  struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
  {
-@@ -849,7 +937,7 @@
+@@ -849,7 +935,7 @@
  	}
  	this.hash = end_name_hash(hash);
  
@@ -442,7 +440,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  access:
  	return ERR_PTR(-EACCES);
  }
-@@ -880,6 +968,23 @@
+@@ -880,6 +966,23 @@
  	return err;
  }
  
@@ -466,7 +464,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  /*
   * It's inline, so penalty for filesystems that don't use sticky bit is
   * minimal.
-@@ -977,7 +1082,8 @@
+@@ -977,7 +1080,8 @@
  	return retval;
  }
  
@@ -476,7 +474,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  {
  	int error;
  
-@@ -990,12 +1096,15 @@
+@@ -990,12 +1094,15 @@
  		goto exit_lock;
  
  	error = -EACCES;	/* shouldn't it be ENOSYS? */
@@ -494,7 +492,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  	unlock_kernel();
  exit_lock:
  	up(&dir->i_zombie);
-@@ -1004,6 +1113,11 @@
+@@ -1004,6 +1111,11 @@
  	return error;
  }
  
@@ -506,7 +504,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  /*
   *	open_namei()
   *
-@@ -1018,7 +1132,8 @@
+@@ -1018,7 +1130,8 @@
   * for symlinks (where the permissions are checked later).
   * SMP-safe
   */
@@ -516,7 +514,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  {
  	int acc_mode, error = 0;
  	struct inode *inode;
-@@ -1028,11 +1143,14 @@
+@@ -1028,11 +1141,14 @@
  
  	acc_mode = ACC_MODE(flag);
  
@@ -532,7 +530,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  		if (error)
  			return error;
  		dentry = nd->dentry;
-@@ -1042,6 +1160,10 @@
+@@ -1042,6 +1158,10 @@
  	/*
  	 * Create - we need to know the parent.
  	 */
@@ -543,7 +541,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  	error = path_lookup(pathname, LOOKUP_PARENT, nd);
  	if (error)
  		return error;
-@@ -1057,7 +1179,7 @@
+@@ -1057,7 +1177,7 @@
  
  	dir = nd->dentry;
  	down(&dir->d_inode->i_sem);
@@ -552,7 +550,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  
  do_last:
  	error = PTR_ERR(dentry);
-@@ -1066,11 +1188,12 @@
+@@ -1066,11 +1186,12 @@
  		goto exit;
  	}
  
@@ -566,7 +564,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  		up(&dir->d_inode->i_sem);
  #ifndef DENTRY_WASTE_RAM
  		if (error)
-@@ -1178,7 +1301,7 @@
+@@ -1178,7 +1299,7 @@
  		if (!error) {
  			DQUOT_INIT(inode);
  			
@@ -575,7 +573,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  		}
  		put_write_access(inode);
  		if (error)
-@@ -1190,8 +1313,10 @@
+@@ -1190,8 +1311,10 @@
  	return 0;
  
  exit_dput:
@@ -586,7 +584,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  	path_release(nd);
  	return error;
  
-@@ -1210,7 +1335,10 @@
+@@ -1210,7 +1333,10 @@
  	 * are done. Procfs-like symlinks just set LAST_BIND.
  	 */
  	UPDATE_ATIME(dentry->d_inode);
@@ -597,7 +595,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  	dput(dentry);
  	if (error)
  		return error;
-@@ -1232,13 +1360,20 @@
+@@ -1232,13 +1358,20 @@
  	}
  	dir = nd->dentry;
  	down(&dir->d_inode->i_sem);
@@ -620,7 +618,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  {
  	struct dentry *dentry;
  
-@@ -1246,7 +1381,7 @@
+@@ -1246,7 +1379,7 @@
  	dentry = ERR_PTR(-EEXIST);
  	if (nd->last_type != LAST_NORM)
  		goto fail;
@@ -629,16 +627,12 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  	if (IS_ERR(dentry))
  		goto fail;
  	if (!is_dir && nd->last.name[nd->last.len] && !dentry->d_inode)
-@@ -1302,7 +1437,20 @@
+@@ -1302,7 +1435,16 @@
  	error = path_lookup(tmp, LOOKUP_PARENT, &nd);
  	if (error)
  		goto out;
 -	dentry = lookup_create(&nd, 0);
 +
-+	if (nd.last_type != LAST_NORM) {
-+		error = -EEXIST;
-+		goto out2;
-+	}
 +	if (nd.dentry->d_inode->i_op->mknod_raw) {
 +		struct inode_operations *op = nd.dentry->d_inode->i_op;
 +		error = op->mknod_raw(&nd, mode, dev);
@@ -651,7 +645,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  	error = PTR_ERR(dentry);
  
  	if (!IS_POSIXACL(nd.dentry->d_inode))
-@@ -1324,6 +1472,7 @@
+@@ -1324,6 +1466,7 @@
  		dput(dentry);
  	}
  	up(&nd.dentry->d_inode->i_sem);
@@ -659,15 +653,11 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  	path_release(&nd);
  out:
  	putname(tmp);
-@@ -1371,7 +1520,18 @@
+@@ -1371,7 +1514,14 @@
  		error = path_lookup(tmp, LOOKUP_PARENT, &nd);
  		if (error)
  			goto out;
 -		dentry = lookup_create(&nd, 1);
-+		if (nd.last_type != LAST_NORM) {
-+			error = -EEXIST;
-+			goto out2;
-+		}
 +		if (nd.dentry->d_inode->i_op->mkdir_raw) {
 +			struct inode_operations *op = nd.dentry->d_inode->i_op;
 +			error = op->mkdir_raw(&nd, mode);
@@ -679,7 +669,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  		error = PTR_ERR(dentry);
  		if (!IS_ERR(dentry)) {
  			if (!IS_POSIXACL(nd.dentry->d_inode))
-@@ -1380,6 +1540,7 @@
+@@ -1380,6 +1530,7 @@
  			dput(dentry);
  		}
  		up(&nd.dentry->d_inode->i_sem);
@@ -687,7 +677,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  		path_release(&nd);
  out:
  		putname(tmp);
-@@ -1480,8 +1641,16 @@
+@@ -1480,8 +1631,16 @@
  			error = -EBUSY;
  			goto exit1;
  	}
@@ -705,7 +695,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  	error = PTR_ERR(dentry);
  	if (!IS_ERR(dentry)) {
  		error = vfs_rmdir(nd.dentry->d_inode, dentry);
-@@ -1539,8 +1708,15 @@
+@@ -1539,8 +1698,15 @@
  	error = -EISDIR;
  	if (nd.last_type != LAST_NORM)
  		goto exit1;
@@ -722,15 +712,11 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  	error = PTR_ERR(dentry);
  	if (!IS_ERR(dentry)) {
  		/* Why not before? Because we want correct error value */
-@@ -1607,15 +1783,27 @@
+@@ -1607,15 +1773,23 @@
  		error = path_lookup(to, LOOKUP_PARENT, &nd);
  		if (error)
  			goto out;
 -		dentry = lookup_create(&nd, 0);
-+		if (nd.last_type != LAST_NORM) {
-+			error = -EEXIST;
-+			goto out2;
-+		}
 +		if (nd.dentry->d_inode->i_op->symlink_raw) {
 +			struct inode_operations *op = nd.dentry->d_inode->i_op;
 +			error = op->symlink_raw(&nd, from);
@@ -752,15 +738,11 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  		putname(to);
  	}
  	putname(from);
-@@ -1691,7 +1879,18 @@
+@@ -1691,7 +1865,14 @@
  		error = -EXDEV;
  		if (old_nd.mnt != nd.mnt)
  			goto out_release;
 -		new_dentry = lookup_create(&nd, 0);
-+		if (nd.last_type != LAST_NORM) {
-+			error = -EEXIST;
-+			goto out_release;
-+		}
 +		if (nd.dentry->d_inode->i_op->link_raw) {
 +			struct inode_operations *op = nd.dentry->d_inode->i_op;
 +			error = op->link_raw(&old_nd, &nd);
@@ -772,7 +754,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  		error = PTR_ERR(new_dentry);
  		if (!IS_ERR(new_dentry)) {
  			error = vfs_link(old_nd.dentry, nd.dentry->d_inode, new_dentry);
-@@ -1735,7 +1934,7 @@
+@@ -1735,7 +1916,7 @@
   *	   locking].
   */
  int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry,
@@ -781,7 +763,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  {
  	int error;
  	struct inode *target;
-@@ -1814,7 +2013,7 @@
+@@ -1814,7 +1995,7 @@
  }
  
  int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry,
@@ -790,7 +772,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  {
  	int error;
  
-@@ -1902,9 +2101,18 @@
+@@ -1902,9 +2083,18 @@
  	if (newnd.last_type != LAST_NORM)
  		goto exit2;
  
@@ -810,7 +792,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  	error = PTR_ERR(old_dentry);
  	if (IS_ERR(old_dentry))
  		goto exit3;
-@@ -1920,16 +2128,16 @@
+@@ -1920,16 +2110,16 @@
  		if (newnd.last.name[newnd.last.len])
  			goto exit4;
  	}
@@ -829,7 +811,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  	dput(new_dentry);
  exit4:
  	dput(old_dentry);
-@@ -1980,20 +2188,26 @@
+@@ -1980,20 +2170,26 @@
  }
  
  static inline int
@@ -858,7 +840,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  out:
  	if (current->link_count || res || nd->last_type!=LAST_NORM)
  		return res;
-@@ -2017,7 +2231,13 @@
+@@ -2017,7 +2213,13 @@
  
  int vfs_follow_link(struct nameidata *nd, const char *link)
  {
@@ -873,7 +855,7 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  }
  
  /* get the link contents into pagecache */
-@@ -2059,7 +2279,7 @@
+@@ -2059,7 +2261,7 @@
  {
  	struct page *page = NULL;
  	char *s = page_getlink(dentry, &page);
@@ -882,10 +864,10 @@ Index: linux-2.4.21-x86_64/fs/namei.c
  	if (page) {
  		kunmap(page);
  		page_cache_release(page);
-Index: linux-2.4.21-x86_64/fs/namespace.c
+Index: linux-2.4.21-suse2/fs/namespace.c
 ===================================================================
---- linux-2.4.21-x86_64.orig/fs/namespace.c	2003-10-28 10:34:12.000000000 -0800
-+++ linux-2.4.21-x86_64/fs/namespace.c	2004-04-12 19:57:36.000000000 -0700
+--- linux-2.4.21-suse2.orig/fs/namespace.c	2003-10-28 21:34:12.000000000 +0300
++++ linux-2.4.21-suse2/fs/namespace.c	2004-01-10 12:15:41.000000000 +0300
 @@ -98,6 +98,7 @@
  {
  	old_nd->dentry = mnt->mnt_mountpoint;
@@ -938,7 +920,7 @@ Index: linux-2.4.21-x86_64/fs/namespace.c
  	int retval = 0;
  	int mnt_flags = 0;
  
-@@ -725,9 +732,11 @@
+@@ -725,10 +732,11 @@
  	flags &= ~(MS_NOSUID|MS_NOEXEC|MS_NODEV);
  
  	/* ... and get the mountpoint */
@@ -948,10 +930,11 @@ Index: linux-2.4.21-x86_64/fs/namespace.c
 +	if (retval) {
 +		intent_release(&it);
  		return retval;
+-
 +	}
- 
  	if (flags & MS_REMOUNT)
  		retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags,
+ 				    data_page);
 @@ -739,6 +747,8 @@
  	else
  		retval = do_add_mount(&nd, type_page, flags, mnt_flags,
@@ -998,10 +981,10 @@ Index: linux-2.4.21-x86_64/fs/namespace.c
  	path_release(&new_nd);
  out0:
  	unlock_kernel();
-Index: linux-2.4.21-x86_64/fs/open.c
+Index: linux-2.4.21-suse2/fs/open.c
 ===================================================================
---- linux-2.4.21-x86_64.orig/fs/open.c	2003-10-28 10:33:59.000000000 -0800
-+++ linux-2.4.21-x86_64/fs/open.c	2004-04-12 19:57:36.000000000 -0700
+--- linux-2.4.21-suse2.orig/fs/open.c	2003-10-28 21:33:59.000000000 +0300
++++ linux-2.4.21-suse2/fs/open.c	2004-01-10 12:55:39.000000000 +0300
 @@ -19,6 +19,8 @@
  #include <asm/uaccess.h>
  
@@ -1209,7 +1192,7 @@ Index: linux-2.4.21-x86_64/fs/open.c
 -	error = __user_walk(filename, LOOKUP_POSITIVE | LOOKUP_FOLLOW |
 -		      LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd);
 +	error = __user_walk_it(filename, LOOKUP_POSITIVE | LOOKUP_FOLLOW |
-+			       LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd, &it);
++		      LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd, &it);
  	if (error)
  		goto out;
  
@@ -1402,11 +1385,11 @@ Index: linux-2.4.21-x86_64/fs/open.c
  /*
   * Find an empty file descriptor entry, and mark it busy.
   */
-Index: linux-2.4.21-x86_64/fs/stat.c
+Index: linux-2.4.21-suse2/fs/stat.c
 ===================================================================
---- linux-2.4.21-x86_64.orig/fs/stat.c	2003-10-28 10:33:58.000000000 -0800
-+++ linux-2.4.21-x86_64/fs/stat.c	2004-04-12 19:58:44.000000000 -0700
-@@ -17,10 +17,12 @@
+--- linux-2.4.21-suse2.orig/fs/stat.c	2003-10-28 21:33:58.000000000 +0300
++++ linux-2.4.21-suse2/fs/stat.c	2004-01-10 12:15:41.000000000 +0300
+@@ -17,10 +17,14 @@
   * Revalidate the inode. This is required for proper NFS attribute caching.
   */
  static __inline__ int
@@ -1415,13 +1398,15 @@ Index: linux-2.4.21-x86_64/fs/stat.c
  {
  	struct inode * inode = dentry->d_inode;
 -	if (inode->i_op && inode->i_op->revalidate)
++	if (!inode)
++		return -ENOENT;
 +	if (inode->i_op && inode->i_op->revalidate_it)
 +		return inode->i_op->revalidate_it(dentry, it);
 +	else if (inode->i_op && inode->i_op->revalidate)
  		return inode->i_op->revalidate(dentry);
  	return 0;
  }
-@@ -141,13 +143,15 @@
+@@ -141,13 +145,15 @@
  asmlinkage long sys_stat(char * filename, struct __old_kernel_stat * statbuf)
  {
  	struct nameidata nd;
@@ -1439,7 +1424,7 @@ Index: linux-2.4.21-x86_64/fs/stat.c
  		path_release(&nd);
  	}
  	return error;
-@@ -157,13 +161,15 @@
+@@ -157,13 +163,15 @@
  asmlinkage long sys_newstat(char * filename, struct stat * statbuf)
  {
  	struct nameidata nd;
@@ -1457,7 +1442,7 @@ Index: linux-2.4.21-x86_64/fs/stat.c
  		path_release(&nd);
  	}
  	return error;
-@@ -178,13 +184,15 @@
+@@ -178,13 +186,15 @@
  asmlinkage long sys_lstat(char * filename, struct __old_kernel_stat * statbuf)
  {
  	struct nameidata nd;
@@ -1475,7 +1460,7 @@ Index: linux-2.4.21-x86_64/fs/stat.c
  		path_release(&nd);
  	}
  	return error;
-@@ -195,13 +203,15 @@
+@@ -195,13 +205,15 @@
  asmlinkage long sys_newlstat(char * filename, struct stat * statbuf)
  {
  	struct nameidata nd;
@@ -1493,7 +1478,7 @@ Index: linux-2.4.21-x86_64/fs/stat.c
  		path_release(&nd);
  	}
  	return error;
-@@ -222,7 +232,7 @@
+@@ -222,7 +234,7 @@
  	if (f) {
  		struct dentry * dentry = f->f_dentry;
  
@@ -1502,7 +1487,7 @@ Index: linux-2.4.21-x86_64/fs/stat.c
  		if (!err)
  			err = cp_old_stat(dentry->d_inode, statbuf);
  		fput(f);
-@@ -241,7 +251,7 @@
+@@ -241,7 +253,7 @@
  	if (f) {
  		struct dentry * dentry = f->f_dentry;
  
@@ -1511,7 +1496,7 @@ Index: linux-2.4.21-x86_64/fs/stat.c
  		if (!err)
  			err = cp_new_stat(dentry->d_inode, statbuf);
  		fput(f);
-@@ -263,7 +273,7 @@
+@@ -263,7 +275,7 @@
  
  		error = -EINVAL;
  		if (inode->i_op && inode->i_op->readlink &&
@@ -1520,7 +1505,7 @@ Index: linux-2.4.21-x86_64/fs/stat.c
  			UPDATE_ATIME(inode);
  			error = inode->i_op->readlink(nd.dentry, buf, bufsiz);
  		}
-@@ -339,12 +349,14 @@
+@@ -339,12 +351,14 @@
  {
  	struct nameidata nd;
  	int error;
@@ -1537,7 +1522,7 @@ Index: linux-2.4.21-x86_64/fs/stat.c
  		path_release(&nd);
  	}
  	return error;
-@@ -354,12 +366,14 @@
+@@ -354,12 +368,14 @@
  {
  	struct nameidata nd;
  	int error;
@@ -1554,7 +1539,7 @@ Index: linux-2.4.21-x86_64/fs/stat.c
  		path_release(&nd);
  	}
  	return error;
-@@ -374,7 +388,7 @@
+@@ -374,7 +390,7 @@
  	if (f) {
  		struct dentry * dentry = f->f_dentry;
  
@@ -1563,10 +1548,10 @@ Index: linux-2.4.21-x86_64/fs/stat.c
  		if (!err)
  			err = cp_new_stat64(dentry->d_inode, statbuf);
  		fput(f);
-Index: linux-2.4.21-x86_64/include/linux/dcache.h
+Index: linux-2.4.21-suse2/include/linux/dcache.h
 ===================================================================
---- linux-2.4.21-x86_64.orig/include/linux/dcache.h	2003-11-10 16:44:28.000000000 -0800
-+++ linux-2.4.21-x86_64/include/linux/dcache.h	2004-04-12 19:57:36.000000000 -0700
+--- linux-2.4.21-suse2.orig/include/linux/dcache.h	2003-11-11 03:44:28.000000000 +0300
++++ linux-2.4.21-suse2/include/linux/dcache.h	2004-01-10 12:48:36.000000000 +0300
 @@ -7,6 +7,51 @@
  #include <linux/gdb.h>
  #include <linux/mount.h>
@@ -1650,10 +1635,10 @@ Index: linux-2.4.21-x86_64/include/linux/dcache.h
  
  extern spinlock_t dcache_lock;
  
-Index: linux-2.4.21-x86_64/include/linux/fs.h
+Index: linux-2.4.21-suse2/include/linux/fs.h
 ===================================================================
---- linux-2.4.21-x86_64.orig/include/linux/fs.h	2004-04-12 19:57:33.000000000 -0700
-+++ linux-2.4.21-x86_64/include/linux/fs.h	2004-04-12 19:57:36.000000000 -0700
+--- linux-2.4.21-suse2.orig/include/linux/fs.h	2004-01-10 11:28:05.000000000 +0300
++++ linux-2.4.21-suse2/include/linux/fs.h	2004-01-10 12:48:36.000000000 +0300
 @@ -74,6 +74,7 @@
  
  #define FMODE_READ 1
@@ -1668,7 +1653,7 @@ Index: linux-2.4.21-x86_64/include/linux/fs.h
  #define ATTR_ATTR_FLAG	1024
 +#define ATTR_RAW	0x0800	/* file system, not vfs will massage attrs */
 +#define ATTR_FROM_OPEN	0x1000	/* called from open path, ie O_TRUNC */
-+#define ATTR_CTIME_SET	0x2000
++#define ATTR_CTIME_SET 0x2000
  
  /*
   * This is the Inode Attributes structure, used for notify_change().  It
@@ -1781,10 +1766,10 @@ Index: linux-2.4.21-x86_64/include/linux/fs.h
  extern int page_readlink(struct dentry *, char *, int);
  extern int page_follow_link(struct dentry *, struct nameidata *);
  extern struct inode_operations page_symlink_inode_operations;
-Index: linux-2.4.21-x86_64/include/linux/fs_struct.h
+Index: linux-2.4.21-suse2/include/linux/fs_struct.h
 ===================================================================
---- linux-2.4.21-x86_64.orig/include/linux/fs_struct.h	2001-07-13 15:10:44.000000000 -0700
-+++ linux-2.4.21-x86_64/include/linux/fs_struct.h	2004-04-12 19:57:36.000000000 -0700
+--- linux-2.4.21-suse2.orig/include/linux/fs_struct.h	2001-07-14 02:10:44.000000000 +0400
++++ linux-2.4.21-suse2/include/linux/fs_struct.h	2004-01-10 12:15:41.000000000 +0300
 @@ -34,10 +34,12 @@
  	write_lock(&fs->lock);
  	old_root = fs->root;
@@ -1811,10 +1796,10 @@ Index: linux-2.4.21-x86_64/include/linux/fs_struct.h
  		dput(old_pwd);
  		mntput(old_pwdmnt);
  	}
-Index: linux-2.4.21-x86_64/kernel/exit.c
+Index: linux-2.4.21-suse2/kernel/exit.c
 ===================================================================
---- linux-2.4.21-x86_64.orig/kernel/exit.c	2003-10-28 10:34:13.000000000 -0800
-+++ linux-2.4.21-x86_64/kernel/exit.c	2004-04-12 19:57:36.000000000 -0700
+--- linux-2.4.21-suse2.orig/kernel/exit.c	2003-10-28 21:34:13.000000000 +0300
++++ linux-2.4.21-suse2/kernel/exit.c	2004-01-10 12:15:41.000000000 +0300
 @@ -288,11 +288,14 @@
  {
  	/* No need to hold fs->lock if we are killing it */
@@ -1830,10 +1815,10 @@ Index: linux-2.4.21-x86_64/kernel/exit.c
  			dput(fs->altroot);
  			mntput(fs->altrootmnt);
  		}
-Index: linux-2.4.21-x86_64/kernel/fork.c
+Index: linux-2.4.21-suse2/kernel/fork.c
 ===================================================================
---- linux-2.4.21-x86_64.orig/kernel/fork.c	2003-10-28 10:34:17.000000000 -0800
-+++ linux-2.4.21-x86_64/kernel/fork.c	2004-04-12 19:57:36.000000000 -0700
+--- linux-2.4.21-suse2.orig/kernel/fork.c	2003-10-28 21:34:17.000000000 +0300
++++ linux-2.4.21-suse2/kernel/fork.c	2004-01-10 12:15:41.000000000 +0300
 @@ -461,10 +461,13 @@
  		fs->umask = old->umask;
  		read_lock(&old->lock);
@@ -1848,10 +1833,10 @@ Index: linux-2.4.21-x86_64/kernel/fork.c
  			fs->altrootmnt = mntget(old->altrootmnt);
  			fs->altroot = dget(old->altroot);
  		} else {
-Index: linux-2.4.21-x86_64/kernel/ksyms.c
+Index: linux-2.4.21-suse2/kernel/ksyms.c
 ===================================================================
---- linux-2.4.21-x86_64.orig/kernel/ksyms.c	2004-04-12 19:57:33.000000000 -0700
-+++ linux-2.4.21-x86_64/kernel/ksyms.c	2004-04-12 19:57:36.000000000 -0700
+--- linux-2.4.21-suse2.orig/kernel/ksyms.c	2004-01-10 11:28:05.000000000 +0300
++++ linux-2.4.21-suse2/kernel/ksyms.c	2004-01-10 12:15:41.000000000 +0300
 @@ -327,6 +327,7 @@
  EXPORT_SYMBOL(set_page_dirty);
  EXPORT_SYMBOL(vfs_readlink);
diff --git a/lustre/kernel_patches/patches/vfs_intent-2.4.22-rh.patch b/lustre/kernel_patches/patches/vfs_intent-2.4.22-rh.patch
index b51ff06..29ad74f 100644
--- a/lustre/kernel_patches/patches/vfs_intent-2.4.22-rh.patch
+++ b/lustre/kernel_patches/patches/vfs_intent-2.4.22-rh.patch
@@ -297,17 +297,17 @@
 +			if (!dentry->d_op->d_revalidate_it(dentry, 0, it)) {
 +				struct dentry *new;
 +				err = permission(dentry->d_parent->d_inode,
-+						 MAY_EXEC);
++						MAY_EXEC);
 +				if (err)
 +					break;
 +				new = real_lookup(dentry->d_parent,
-+						  &dentry->d_name, 0, it);
++						&dentry->d_name, 0, NULL);
++				d_invalidate(dentry);
++				dput(dentry);
 +				if (IS_ERR(new)) {
 +					err = PTR_ERR(new);
 +					break;
 +				}
-+				d_invalidate(dentry);
-+				dput(dentry);
 +				nd->dentry = new;
 +			}
 +		} else
@@ -607,16 +607,12 @@
  	if (IS_ERR(dentry))
  		goto fail;
  	if (!is_dir && nd->last.name[nd->last.len] && !dentry->d_inode)
-@@ -1278,7 +1416,20 @@ asmlinkage long sys_mknod(const char * f
+@@ -1278,7 +1416,16 @@ asmlinkage long sys_mknod(const char * f
  	error = path_lookup(tmp, LOOKUP_PARENT, &nd);
  	if (error)
  		goto out;
 -	dentry = lookup_create(&nd, 0);
 +
-+	if (nd.last_type != LAST_NORM) {
-+		error = -EEXIST;
-+		goto out2;
-+	}
 +	if (nd.dentry->d_inode->i_op->mknod_raw) {
 +		struct inode_operations *op = nd.dentry->d_inode->i_op;
 +		error = op->mknod_raw(&nd, mode, dev);
@@ -637,15 +633,11 @@
  	path_release(&nd);
  out:
  	putname(tmp);
-@@ -1346,7 +1494,20 @@ asmlinkage long sys_mkdir(const char * p
+@@ -1346,7 +1494,14 @@ asmlinkage long sys_mkdir(const char * p
  		error = path_lookup(tmp, LOOKUP_PARENT, &nd);
  		if (error)
  			goto out;
 -		dentry = lookup_create(&nd, 1);
-+		if (nd.last_type != LAST_NORM) {
-+			error = -EEXIST;
-+			goto out2;
-+		}
 +		if (nd.dentry->d_inode->i_op->mkdir_raw) {
 +			struct inode_operations *op = nd.dentry->d_inode->i_op;
 +			error = op->mkdir_raw(&nd, mode);
@@ -700,15 +692,11 @@
  	error = PTR_ERR(dentry);
  	if (!IS_ERR(dentry)) {
  		/* Why not before? Because we want correct error value */
-@@ -1581,15 +1752,27 @@ asmlinkage long sys_symlink(const char *
+@@ -1581,15 +1752,23 @@ asmlinkage long sys_symlink(const char *
  		error = path_lookup(to, LOOKUP_PARENT, &nd);
  		if (error)
  			goto out;
 -		dentry = lookup_create(&nd, 0);
-+		if (nd.last_type != LAST_NORM) {
-+			error = -EEXIST;
-+			goto out2;
-+		}
 +		if (nd.dentry->d_inode->i_op->symlink_raw) {
 +			struct inode_operations *op = nd.dentry->d_inode->i_op;
 +			error = op->symlink_raw(&nd, from);
@@ -730,15 +718,11 @@
  		putname(to);
  	}
  	putname(from);
-@@ -1665,7 +1844,18 @@ asmlinkage long sys_link(const char * ol
+@@ -1665,7 +1844,14 @@ asmlinkage long sys_link(const char * ol
  		error = -EXDEV;
  		if (old_nd.mnt != nd.mnt)
  			goto out_release;
 -		new_dentry = lookup_create(&nd, 0);
-+		if (nd.last_type != LAST_NORM) {
-+			error = -EEXIST;
-+			goto out2;
-+		}
 +		if (nd.dentry->d_inode->i_op->link_raw) {
 +			struct inode_operations *op = nd.dentry->d_inode->i_op;
 +			error = op->link_raw(&old_nd, &nd);
@@ -914,7 +898,7 @@
  	int retval = 0;
  	int mnt_flags = 0;
  
-@@ -725,9 +732,11 @@ long do_mount(char * dev_name, char * di
+@@ -725,10 +732,11 @@ long do_mount(char * dev_name, char * di
  	flags &= ~(MS_NOSUID|MS_NOEXEC|MS_NODEV);
  
  	/* ... and get the mountpoint */
@@ -924,10 +908,11 @@
 +	if (retval) {
 +		intent_release(&it);
  		return retval;
+-
 +	}
-
  	if (flags & MS_REMOUNT)
  		retval = do_remount(&nd, flags & ~MS_REMOUNT, mnt_flags,
+ 				    data_page);
 @@ -739,6 +747,8 @@ long do_mount(char * dev_name, char * di
  	else
  		retval = do_add_mount(&nd, type_page, flags, mnt_flags,
@@ -1183,7 +1168,7 @@
 -	error = __user_walk(filename, LOOKUP_POSITIVE | LOOKUP_FOLLOW |
 -		      LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd);
 +	error = __user_walk_it(filename, LOOKUP_POSITIVE | LOOKUP_FOLLOW |
-+			       LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd, &it);
++		      LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd, &it);
  	if (error)
  		goto out;
  
@@ -1376,7 +1361,7 @@
   */
 --- linux-2.4.22-ac1/fs/stat.c~vfs_intent-2.4.22-rh	2003-09-25 14:16:27.000000000 +0400
 +++ linux-2.4.22-ac1-alexey/fs/stat.c	2003-09-25 14:42:46.000000000 +0400
-@@ -17,10 +17,12 @@
+@@ -17,10 +17,14 @@
   * Revalidate the inode. This is required for proper NFS attribute caching.
   */
  static __inline__ int
@@ -1385,6 +1370,8 @@
  {
  	struct inode * inode = dentry->d_inode;
 -	if (inode->i_op && inode->i_op->revalidate)
++	if (!inode)
++		return -ENOENT;
 +	if (inode->i_op && inode->i_op->revalidate_it)
 +		return inode->i_op->revalidate_it(dentry, it);
 +	else if (inode->i_op && inode->i_op->revalidate)
@@ -1634,7 +1621,7 @@
  #define ATTR_ATTR_FLAG	1024
 +#define ATTR_RAW	0x0800	/* file system, not vfs will massage attrs */
 +#define ATTR_FROM_OPEN	0x1000	/* called from open path, ie O_TRUNC */
-+#define ATTR_CTIME_SET	0x2000
++#define ATTR_CTIME_SET 0x2000
  
  /*
   * This is the Inode Attributes structure, used for notify_change().  It
diff --git a/lustre/kernel_patches/patches/vfs_intent-2.6.3-suse.patch b/lustre/kernel_patches/patches/vfs_intent-2.6.3-suse.patch
new file mode 100644
index 0000000..aaae350
--- /dev/null
+++ b/lustre/kernel_patches/patches/vfs_intent-2.6.3-suse.patch
@@ -0,0 +1,777 @@
+ fs/exec.c              |   18 +++++++---
+ fs/namei.c             |   86 +++++++++++++++++++++++++++++++++++++++++++++----
+ fs/namespace.c         |    2 +
+ fs/nfs/dir.c           |    4 +-
+ fs/open.c              |   62 +++++++++++++++++++++++------------
+ fs/stat.c              |   24 ++++++++++---
+ include/linux/dcache.h |    3 +
+ include/linux/fs.h     |    8 ++++
+ include/linux/namei.h  |   56 ++++++++++++++++++++++++++-----
+ kernel/ksyms.c         |    8 ++++
+ 10 files changed, 222 insertions(+), 49 deletions(-)
+
+.old..........pc/vfs_intent-2.6.3-suse/fs/exec.c
+.new.........fs/exec.c
+Index: linux-2.6.3-20/fs/exec.c
+===================================================================
+--- linux-2.6.3-20.orig/fs/exec.c	2004-03-05 02:07:04.000000000 -0800
++++ linux-2.6.3-20/fs/exec.c	2004-03-08 14:23:40.000000000 -0800
+@@ -121,8 +121,11 @@
+ 	struct file * file;
+ 	struct nameidata nd;
+ 	int error;
++	intent_init(&nd.intent, IT_OPEN);
+ 
+-	nd.intent.open.flags = FMODE_READ;
++	error = user_path_walk_it(library, &nd);
++
++	nd.intent.it_flags = O_RDONLY;
+ 	error = __user_walk(library, LOOKUP_FOLLOW|LOOKUP_OPEN, &nd);
+ 	if (error)
+ 		goto out;
+@@ -135,7 +138,7 @@
+ 	if (error)
+ 		goto exit;
+ 
+-	file = dentry_open(nd.dentry, nd.mnt, O_RDONLY);
++	file = dentry_open_it(nd.dentry, nd.mnt, O_RDONLY, &nd.intent);
+ 	error = PTR_ERR(file);
+ 	if (IS_ERR(file))
+ 		goto out;
+@@ -475,8 +478,9 @@
+ 	int err;
+ 	struct file *file;
+ 
+-	nd.intent.open.flags = FMODE_READ;
+-	err = path_lookup(name, LOOKUP_FOLLOW|LOOKUP_OPEN, &nd);
++	intent_init(&nd.intent, IT_OPEN);
++	nd.intent.it_flags = O_RDONLY;
++	err = path_lookup(name, LOOKUP_FOLLOW, &nd);
+ 	file = ERR_PTR(err);
+ 
+ 	if (!err) {
+@@ -489,7 +493,7 @@
+ 				err = -EACCES;
+ 			file = ERR_PTR(err);
+ 			if (!err) {
+-				file = dentry_open(nd.dentry, nd.mnt, O_RDONLY);
++				file = dentry_open_it(nd.dentry, nd.mnt, O_RDONLY, &nd.intent);
+ 				if (!IS_ERR(file)) {
+ 					err = deny_write_access(file);
+ 					if (err) {
+.old..........pc/vfs_intent-2.6.3-suse/fs/namei.c
+.new.........fs/namei.c
+Index: linux-2.6.3-20/fs/namei.c
+===================================================================
+--- linux-2.6.3-20.orig/fs/namei.c	2004-03-05 02:07:04.000000000 -0800
++++ linux-2.6.3-20/fs/namei.c	2004-03-08 14:32:24.000000000 -0800
+@@ -269,8 +269,19 @@
+ 	return 0;
+ }
+ 
++void intent_release(struct lookup_intent *it)
++{
++	if (!it)
++		return;
++	if (it->it_magic != INTENT_MAGIC)
++		return;
++	if (it->it_op_release)
++		it->it_op_release(it);
++}
++
+ void path_release(struct nameidata *nd)
+ {
++	intent_release(&nd->intent);
+ 	dput(nd->dentry);
+ 	mntput(nd->mnt);
+ }
+@@ -347,7 +358,10 @@
+ {
+ 	struct dentry * result;
+ 	struct inode *dir = parent->d_inode;
++	int counter = 0;
+ 
++again:
++	counter++;
+ 	down(&dir->i_sem);
+ 	/*
+ 	 * First re-do the cached lookup just in case it was created
+@@ -386,7 +400,10 @@
+ 	if (result->d_op && result->d_op->d_revalidate) {
+ 		if (!result->d_op->d_revalidate(result, nd) && !d_invalidate(result)) {
+ 			dput(result);
+-			result = ERR_PTR(-ENOENT);
++			if (counter > 10)
++				result = ERR_PTR(-ESTALE);
++			if (!IS_ERR(result))
++				goto again;
+ 		}
+ 	}
+ 	return result;
+@@ -563,6 +580,31 @@
+ 	return PTR_ERR(dentry);
+ }
+ 
++static int revalidate_special(struct nameidata *nd)
++{
++	struct dentry *dentry = nd->dentry;
++	int err, counter = 0;
++
++	if (!dentry->d_op || !dentry->d_op->d_revalidate)
++		return 0;
++ revalidate_again:
++	if (!dentry->d_op->d_revalidate(dentry, nd)) {
++		struct dentry *new;
++		if ((err = permission(dentry->d_parent->d_inode, MAY_EXEC,nd)))
++			return err;
++		new = real_lookup(dentry->d_parent, &dentry->d_name, nd);
++		d_invalidate(dentry);
++		dput(dentry);
++		nd->dentry = dentry = new;
++		counter++;
++		if (counter < 10)
++			goto revalidate_again;
++		printk("excessive revalidate_it loops\n");
++		return -ESTALE;
++	}
++	return 0;
++}
++
+ /*
+  * Name resolution.
+  *
+@@ -663,7 +705,9 @@
+ 
+ 		if (inode->i_op->follow_link) {
+ 			mntget(next.mnt);
++			nd->flags |= LOOKUP_LINK_NOTLAST;
+ 			err = do_follow_link(next.dentry, nd);
++			nd->flags &= ~LOOKUP_LINK_NOTLAST;
+ 			dput(next.dentry);
+ 			mntput(next.mnt);
+ 			if (err)
+@@ -702,6 +746,11 @@
+ 				inode = nd->dentry->d_inode;
+ 				/* fallthrough */
+ 			case 1:
++ 				nd->flags |= LOOKUP_LAST;
++ 				err = revalidate_special(nd);
++ 				nd->flags &= ~LOOKUP_LAST;
++ 				if (err)
++ 					break;
+ 				goto return_reval;
+ 		}
+ 		if (nd->dentry->d_op && nd->dentry->d_op->d_hash) {
+@@ -709,7 +758,9 @@
+ 			if (err < 0)
+ 				break;
+ 		}
++		nd->flags |= LOOKUP_LAST;
+ 		err = do_lookup(nd, &this, &next);
++		nd->flags &= ~LOOKUP_LAST;
+ 		if (err)
+ 			break;
+ 		follow_mount(&next.mnt, &next.dentry);
+@@ -935,7 +986,7 @@
+ }
+ 
+ /* SMP-safe */
+-struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
++struct dentry * lookup_one_len_it(const char * name, struct dentry * base, int len, struct nameidata *nd)
+ {
+ 	unsigned long hash;
+ 	struct qstr this;
+@@ -955,11 +1006,16 @@
+ 	}
+ 	this.hash = end_name_hash(hash);
+ 
+-	return lookup_hash(&this, base);
++	return __lookup_hash(&this, base, nd);
+ access:
+ 	return ERR_PTR(-EACCES);
+ }
+ 
++struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
++{
++	return lookup_one_len_it(name, base, len, NULL);
++}
++
+ /*
+  *	namei()
+  *
+@@ -971,7 +1027,7 @@
+  * that namei follows links, while lnamei does not.
+  * SMP-safe
+  */
+-int fastcall __user_walk(const char __user *name, unsigned flags, struct nameidata *nd)
++int fastcall __user_walk_it(const char __user *name, unsigned flags, struct nameidata *nd)
+ {
+ 	char *tmp = getname(name);
+ 	int err = PTR_ERR(tmp);
+@@ -983,6 +1039,12 @@
+ 	return err;
+ }
+ 
++int __user_walk(const char __user *name, unsigned flags, struct nameidata *nd)
++{
++	intent_init(&nd->intent, IT_LOOKUP);
++	return __user_walk_it(name, flags, nd);
++}
++
+ /*
+  * It's inline, so penalty for filesystems that don't use sticky bit is
+  * minimal.
+@@ -1255,8 +1317,8 @@
+ 		acc_mode |= MAY_APPEND;
+ 
+ 	/* Fill in the open() intent data */
+-	nd->intent.open.flags = flag;
+-	nd->intent.open.create_mode = mode;
++	nd->intent.it_flags = flag;
++	nd->intent.it_create_mode = mode;
+ 
+ 	/*
+ 	 * The simplest case - just a plain lookup.
+@@ -1271,6 +1333,7 @@
+ 	/*
+ 	 * Create - we need to know the parent.
+ 	 */
++	nd->intent.it_op |= IT_CREAT;
+ 	error = path_lookup(pathname, LOOKUP_PARENT|LOOKUP_OPEN|LOOKUP_CREATE, nd);
+ 	if (error)
+ 		return error;
+@@ -1287,7 +1350,9 @@
+ 	dir = nd->dentry;
+ 	nd->flags &= ~LOOKUP_PARENT;
+ 	down(&dir->d_inode->i_sem);
++	nd->flags |= LOOKUP_LAST;
+ 	dentry = __lookup_hash(&nd->last, nd->dentry, nd);
++	nd->flags &= ~LOOKUP_LAST;
+ 
+ do_last:
+ 	error = PTR_ERR(dentry);
+@@ -1392,7 +1457,9 @@
+ 	}
+ 	dir = nd->dentry;
+ 	down(&dir->d_inode->i_sem);
++	nd->flags |= LOOKUP_LAST;
+ 	dentry = __lookup_hash(&nd->last, nd->dentry, nd);
++	nd->flags &= ~LOOKUP_LAST;
+ 	putname(nd->last.name);
+ 	goto do_last;
+ }
+@@ -2154,7 +2221,9 @@
+ __vfs_follow_link(struct nameidata *nd, const char *link)
+ {
+ 	int res = 0;
++	struct lookup_intent it = nd->intent;
+ 	char *name;
++
+ 	if (IS_ERR(link))
+ 		goto fail;
+ 
+@@ -2164,6 +2233,10 @@
+ 			/* weird __emul_prefix() stuff did it */
+ 			goto out;
+ 	}
++
++	intent_init(&nd->intent, it.it_op);
++	nd->intent.it_flags = it.it_flags;
++	nd->intent.it_create_mode = it.it_create_mode;
+ 	res = link_path_walk(link, nd);
+ out:
+ 	if (current->link_count || res || nd->last_type!=LAST_NORM)
+.old..........pc/vfs_intent-2.6.3-suse/fs/namespace.c
+.new.........fs/namespace.c
+Index: linux-2.6.3-20/fs/namespace.c
+===================================================================
+--- linux-2.6.3-20.orig/fs/namespace.c	2004-03-05 02:07:04.000000000 -0800
++++ linux-2.6.3-20/fs/namespace.c	2004-03-08 14:23:40.000000000 -0800
+@@ -744,6 +744,7 @@
+ 	int retval = 0;
+ 	int mnt_flags = 0;
+ 
++	intent_init(&nd.intent, IT_LOOKUP);
+ 	/* Discard magic */
+ 	if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
+ 		flags &= ~MS_MGC_MSK;
+.old..........pc/vfs_intent-2.6.3-suse/fs/open.c
+.new.........fs/open.c
+Index: linux-2.6.3-20/fs/open.c
+===================================================================
+--- linux-2.6.3-20.orig/fs/open.c	2004-03-05 02:07:04.000000000 -0800
++++ linux-2.6.3-20/fs/open.c	2004-03-08 14:23:40.000000000 -0800
+@@ -202,7 +202,7 @@
+ 	struct nameidata nd;
+ 	struct inode * inode;
+ 	int error;
+-
++	intent_init(&nd.intent, IT_GETATTR);
+ 	error = -EINVAL;
+ 	if (length < 0)	/* sorry, but loff_t says... */
+ 		goto out;
+@@ -461,6 +461,7 @@
+ 	int old_fsuid, old_fsgid;
+ 	kernel_cap_t old_cap;
+ 	int res;
++	intent_init(&nd.intent, IT_GETATTR);
+ 
+ 	if (mode & ~S_IRWXO)	/* where's F_OK, X_OK, W_OK, R_OK? */
+ 		return -EINVAL;
+@@ -492,6 +493,7 @@
+ 		if(!res && (mode & S_IWOTH) && IS_RDONLY(nd.dentry->d_inode)
+ 		   && !special_file(nd.dentry->d_inode->i_mode))
+ 			res = -EROFS;
++
+ 		path_release(&nd);
+ 	}
+ 
+@@ -506,6 +508,7 @@
+ {
+ 	struct nameidata nd;
+ 	int error;
++	intent_init(&nd.intent, IT_GETATTR);
+ 
+ 	error = __user_walk(filename, LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &nd);
+ 	if (error)
+@@ -557,6 +560,7 @@
+ {
+ 	struct nameidata nd;
+ 	int error;
++	intent_init(&nd.intent, IT_GETATTR);
+ 
+ 	error = __user_walk(filename, LOOKUP_FOLLOW | LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd);
+ 	if (error)
+@@ -629,7 +633,7 @@
+ 	error = -EROFS;
+ 	if (IS_RDONLY(inode))
+ 		goto dput_and_out;
+-
++	
+ 	error = -EPERM;
+ 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
+ 		goto dput_and_out;
+@@ -737,27 +741,8 @@
+  * for the internal routines (ie open_namei()/follow_link() etc). 00 is
+  * used by symlinks.
+  */
+-struct file *filp_open(const char * filename, int flags, int mode)
+-{
+-	int namei_flags, error;
+-	struct nameidata nd;
+-
+-	namei_flags = flags;
+-	if ((namei_flags+1) & O_ACCMODE)
+-		namei_flags++;
+-	if (namei_flags & O_TRUNC)
+-		namei_flags |= 2;
+-
+-	error = open_namei(filename, namei_flags, mode, &nd);
+-	if (!error)
+-		return dentry_open(nd.dentry, nd.mnt, flags);
+-
+-	return ERR_PTR(error);
+-}
+-
+-EXPORT_SYMBOL(filp_open);
+-
+-struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
++struct file *dentry_open_it(struct dentry *dentry, struct vfsmount *mnt, int flags,
++			    struct lookup_intent *it)
+ {
+ 	struct file * f;
+ 	struct inode *inode;
+@@ -769,6 +754,7 @@
+ 		goto cleanup_dentry;
+ 	f->f_flags = flags;
+ 	f->f_mode = (flags+1) & O_ACCMODE;
++	f->f_it = it;
+ 	inode = dentry->d_inode;
+ 	if (f->f_mode & FMODE_WRITE) {
+ 		error = get_write_access(inode);
+@@ -788,6 +774,7 @@
+ 		error = f->f_op->open(inode,f);
+ 		if (error)
+ 			goto cleanup_all;
++		intent_release(it);
+ 	}
+ 	f->f_flags &= ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC);
+ 
+@@ -812,6 +799,7 @@
+ cleanup_file:
+ 	put_filp(f);
+ cleanup_dentry:
++	intent_release(it);
+ 	dput(dentry);
+ 	mntput(mnt);
+ 	return ERR_PTR(error);
+@@ -819,6 +807,36 @@
+ 
+ EXPORT_SYMBOL(dentry_open);
+ 
++struct file *filp_open(const char * filename, int flags, int mode)
++{
++	int namei_flags, error;
++	struct file * temp_filp;
++	struct nameidata nd;
++	intent_init(&nd.intent, IT_OPEN);
++
++	namei_flags = flags;
++	if ((namei_flags+1) & O_ACCMODE)
++		namei_flags++;
++	if (namei_flags & O_TRUNC)
++		namei_flags |= 2;
++
++	error = open_namei(filename, namei_flags, mode, &nd);
++	if (!error) {
++		temp_filp = dentry_open_it(nd.dentry, nd.mnt, flags, &nd.intent);
++		return temp_filp;
++	}	
++	return ERR_PTR(error);
++}
++
++
++struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
++{
++	struct lookup_intent it;
++	intent_init(&it, IT_LOOKUP);
++
++	return dentry_open_it(dentry, mnt, flags, &it);
++}
++
+ /*
+  * Find an empty file descriptor entry, and mark it busy.
+  */
+.old..........pc/vfs_intent-2.6.3-suse/fs/stat.c
+.new.........fs/stat.c
+Index: linux-2.6.3-20/fs/stat.c
+===================================================================
+--- linux-2.6.3-20.orig/fs/stat.c	2004-03-05 02:07:04.000000000 -0800
++++ linux-2.6.3-20/fs/stat.c	2004-03-08 14:23:40.000000000 -0800
+@@ -36,7 +36,7 @@
+ 
+ EXPORT_SYMBOL(generic_fillattr);
+ 
+-int vfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
++int vfs_getattr_it(struct vfsmount *mnt, struct dentry *dentry, struct lookup_intent *it, struct kstat *stat)
+ {
+ 	struct inode *inode = dentry->d_inode;
+ 	int retval;
+@@ -45,6 +45,8 @@
+ 	if (retval)
+ 		return retval;
+ 
++	if (inode->i_op->getattr_it)
++		return inode->i_op->getattr_it(mnt, dentry, it, stat);
+ 	if (inode->i_op->getattr)
+ 		return inode->i_op->getattr(mnt, dentry, stat);
+ 
+@@ -61,14 +63,20 @@
+ 
+ EXPORT_SYMBOL(vfs_getattr);
+ 
++int vfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
++{
++	return vfs_getattr_it(mnt, dentry, NULL, stat);
++}
++
+ int vfs_stat(char __user *name, struct kstat *stat)
+ {
+ 	struct nameidata nd;
+ 	int error;
++	intent_init(&nd.intent, IT_GETATTR);
+ 
+-	error = user_path_walk(name, &nd);
++	error = user_path_walk_it(name, &nd);
+ 	if (!error) {
+-		error = vfs_getattr(nd.mnt, nd.dentry, stat);
++		error = vfs_getattr_it(nd.mnt, nd.dentry, &nd.intent, stat);
+ 		path_release(&nd);
+ 	}
+ 	return error;
+@@ -80,10 +88,11 @@
+ {
+ 	struct nameidata nd;
+ 	int error;
++	intent_init(&nd.intent, IT_GETATTR);
+ 
+-	error = user_path_walk_link(name, &nd);
++	error = user_path_walk_link_it(name, &nd);
+ 	if (!error) {
+-		error = vfs_getattr(nd.mnt, nd.dentry, stat);
++		error = vfs_getattr_it(nd.mnt, nd.dentry, &nd.intent, stat);
+ 		path_release(&nd);
+ 	}
+ 	return error;
+@@ -95,9 +104,12 @@
+ {
+ 	struct file *f = fget(fd);
+ 	int error = -EBADF;
++	struct nameidata nd;
++	intent_init(&nd.intent, IT_GETATTR);
+ 
+ 	if (f) {
+-		error = vfs_getattr(f->f_vfsmnt, f->f_dentry, stat);
++		error = vfs_getattr_it(f->f_vfsmnt, f->f_dentry, &nd.intent, stat);
++		intent_release(&nd.intent);
+ 		fput(f);
+ 	}
+ 	return error;
+.old..........pc/vfs_intent-2.6.3-suse/fs/nfs/dir.c
+.new.........fs/nfs/dir.c
+Index: linux-2.6.3-20/fs/nfs/dir.c
+===================================================================
+--- linux-2.6.3-20.orig/fs/nfs/dir.c	2004-03-05 02:07:03.000000000 -0800
++++ linux-2.6.3-20/fs/nfs/dir.c	2004-03-08 14:23:40.000000000 -0800
+@@ -681,7 +681,7 @@
+ 		return 0;
+ 	if (!nd || (nd->flags & LOOKUP_CONTINUE) || !(nd->flags & LOOKUP_CREATE))
+ 		return 0;
+-	return (nd->intent.open.flags & O_EXCL) != 0;
++	return (nd->intent.it_flags & O_EXCL) != 0;
+ }
+ 
+ static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd)
+@@ -972,7 +972,7 @@
+ 	attr.ia_valid = ATTR_MODE;
+ 
+ 	if (nd && (nd->flags & LOOKUP_CREATE))
+-		open_flags = nd->intent.open.flags;
++		open_flags = nd->intent.it_flags;
+ 
+ 	/*
+ 	 * The 0 argument passed into the create function should one day
+.old..........pc/vfs_intent-2.6.3-suse/fs/inode.c
+.new.........fs/inode.c
+Index: linux-2.6.3-20/fs/inode.c
+===================================================================
+--- linux-2.6.3-20.orig/fs/inode.c	2004-03-05 02:07:04.000000000 -0800
++++ linux-2.6.3-20/fs/inode.c	2004-03-08 14:23:40.000000000 -0800
+@@ -223,6 +223,7 @@
+ 	inodes_stat.nr_unused--;
+ }
+ 
++EXPORT_SYMBOL(__iget);
+ /**
+  * clear_inode - clear an inode
+  * @inode: inode to clear
+.old..........pc/vfs_intent-2.6.3-suse/fs/super.c
+.new.........fs/super.c
+Index: linux-2.6.3-20/fs/super.c
+===================================================================
+--- linux-2.6.3-20.orig/fs/super.c	2004-03-05 02:07:04.000000000 -0800
++++ linux-2.6.3-20/fs/super.c	2004-03-08 14:23:40.000000000 -0800
+@@ -841,6 +841,8 @@
+ 	return (struct vfsmount *)sb;
+ }
+ 
++EXPORT_SYMBOL(do_kern_mount);
++
+ struct vfsmount *kern_mount(struct file_system_type *type)
+ {
+ 	return do_kern_mount(type->name, 0, type->name, NULL);
+.old..........pc/vfs_intent-2.6.3-suse/include/linux/dcache.h
+.new.........include/linux/dcache.h
+Index: linux-2.6.3-20/include/linux/dcache.h
+===================================================================
+--- linux-2.6.3-20.orig/include/linux/dcache.h	2004-03-05 02:07:17.000000000 -0800
++++ linux-2.6.3-20/include/linux/dcache.h	2004-03-08 14:23:40.000000000 -0800
+@@ -4,6 +4,7 @@
+ #ifdef __KERNEL__
+ 
+ #include <asm/atomic.h>
++#include <linux/string.h>
+ #include <linux/list.h>
+ #include <linux/spinlock.h>
+ #include <linux/cache.h>
+@@ -35,6 +36,8 @@
+ 	char name_str[0];
+ };
+ 
++#include <linux/namei.h>
++
+ struct dentry_stat_t {
+ 	int nr_dentry;
+ 	int nr_unused;
+.old..........pc/vfs_intent-2.6.3-suse/include/linux/fs.h
+.new.........include/linux/fs.h
+Index: linux-2.6.3-20/include/linux/fs.h
+===================================================================
+--- linux-2.6.3-20.orig/include/linux/fs.h	2004-03-05 02:07:17.000000000 -0800
++++ linux-2.6.3-20/include/linux/fs.h	2004-03-08 14:23:41.000000000 -0800
+@@ -243,6 +243,8 @@
+ #define ATTR_ATTR_FLAG	1024
+ #define ATTR_KILL_SUID	2048
+ #define ATTR_KILL_SGID	4096
++#define ATTR_RAW       	8192    /* file system, not vfs will massage attrs */
++#define ATTR_FROM_OPEN 	16384    /* called from open path, ie O_TRUNC */
+ 
+ /*
+  * This is the Inode Attributes structure, used for notify_change().  It
+@@ -409,6 +411,7 @@
+ 	struct block_device	*i_bdev;
+ 	struct cdev		*i_cdev;
+ 	int			i_cindex;
++	void			*i_filterdata;
+ 
+ 	unsigned long		i_dnotify_mask; /* Directory notify events */
+ 	struct dnotify_struct	*i_dnotify; /* for directory notifications */
+@@ -541,6 +544,7 @@
+ 	spinlock_t		f_ep_lock;
+ #endif /* #ifdef CONFIG_EPOLL */
+ 	struct address_space	*f_mapping;
++ 	struct lookup_intent    *f_it;
+ };
+ extern spinlock_t files_lock;
+ #define file_list_lock() spin_lock(&files_lock);
+@@ -846,7 +850,9 @@
+ 	void (*truncate) (struct inode *);
+ 	int (*permission) (struct inode *, int, struct nameidata *);
+ 	int (*setattr) (struct dentry *, struct iattr *);
++	int (*setattr_raw) (struct inode *, struct iattr *);
+ 	int (*getattr) (struct vfsmount *mnt, struct dentry *, struct kstat *);
++	int (*getattr_it) (struct vfsmount *, struct dentry *, struct lookup_intent *, struct kstat *);
+ 	int (*setxattr) (struct dentry *, const char *,const void *,size_t,int);
+ 	ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
+ 	ssize_t (*listxattr) (struct dentry *, char *, size_t);
+@@ -1062,6 +1068,7 @@
+ extern int unregister_filesystem(struct file_system_type *);
+ extern struct vfsmount *kern_mount(struct file_system_type *);
+ extern int may_umount(struct vfsmount *);
++struct vfsmount *do_kern_mount(const char *type, int flags, const char *name, void *data);
+ extern long do_mount(char *, char *, char *, unsigned long, void *);
+ 
+ extern int vfs_statfs(struct super_block *, struct kstatfs *);
+@@ -1126,6 +1133,7 @@
+ extern int do_truncate(struct dentry *, loff_t start);
+ extern struct file *filp_open(const char *, int, int);
+ extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
++extern struct file * dentry_open_it(struct dentry *, struct vfsmount *, int, struct lookup_intent *);
+ extern int filp_close(struct file *, fl_owner_t id);
+ extern char * getname(const char __user *);
+ 
+.old..........pc/vfs_intent-2.6.3-suse/include/linux/namei.h
+.new.........include/linux/namei.h
+Index: linux-2.6.3-20/include/linux/namei.h
+===================================================================
+--- linux-2.6.3-20.orig/include/linux/namei.h	2004-03-05 02:07:18.000000000 -0800
++++ linux-2.6.3-20/include/linux/namei.h	2004-03-08 14:23:41.000000000 -0800
+@@ -2,25 +2,55 @@
+ #define _LINUX_NAMEI_H
+ 
+ #include <linux/linkage.h>
++#include <linux/string.h>
+ 
+ struct vfsmount;
++struct nameidata;
+ 
+-struct open_intent {
+-	int	flags;
+-	int	create_mode;
++/* intent opcodes */
++#define IT_OPEN     (1)
++#define IT_CREAT    (1<<1)
++#define IT_READDIR  (1<<2)
++#define IT_GETATTR  (1<<3)
++#define IT_LOOKUP   (1<<4)
++#define IT_UNLINK   (1<<5)
++#define IT_TRUNC    (1<<6)
++#define IT_GETXATTR (1<<7)
++
++struct lustre_intent_data {
++	int       it_disposition;
++	int       it_status;
++	__u64     it_lock_handle;
++	void     *it_data;
++	int       it_lock_mode;
+ };
+ 
++#define INTENT_MAGIC 0x19620323
++struct lookup_intent {
++	int     it_magic;
++	void    (*it_op_release)(struct lookup_intent *);
++	int     it_op;
++	int	it_flags;
++	int	it_create_mode;
++	union {
++		struct lustre_intent_data lustre;
++	} d;
++};
++
++static inline void intent_init(struct lookup_intent *it, int op)
++{
++	memset(it, 0, sizeof(*it));
++	it->it_magic = INTENT_MAGIC;
++	it->it_op = op;
++}
++
+ struct nameidata {
+ 	struct dentry	*dentry;
+ 	struct vfsmount *mnt;
+ 	struct qstr	last;
+ 	unsigned int	flags;
+ 	int		last_type;
+-
+-	/* Intent data */
+-	union {
+-		struct open_intent open;
+-	} intent;
++	struct lookup_intent intent;
+ };
+ 
+ /*
+@@ -41,6 +71,9 @@
+ #define LOOKUP_CONTINUE		 4
+ #define LOOKUP_PARENT		16
+ #define LOOKUP_NOALT		32
++#define LOOKUP_LAST		 (1<<6)
++#define LOOKUP_LINK_NOTLAST	 (1<<7)
++
+ /*
+  * Intent data
+  */
+@@ -49,6 +82,12 @@
+ #define LOOKUP_ACCESS		(0x0400)
+ 
+ extern int FASTCALL(__user_walk(const char __user *, unsigned, struct nameidata *));
++extern int FASTCALL(__user_walk_it(const char __user *name, unsigned flags, struct nameidata *nd));
++#define user_path_walk_it(name,nd) \
++	__user_walk_it(name, LOOKUP_FOLLOW, nd)
++#define user_path_walk_link_it(name,nd) \
++	__user_walk_it(name, 0, nd)
++extern void intent_release(struct lookup_intent *);
+ #define user_path_walk(name,nd) \
+ 	__user_walk(name, LOOKUP_FOLLOW, nd)
+ #define user_path_walk_link(name,nd) \
+@@ -60,7 +99,6 @@
+ 
+ extern struct dentry * lookup_one_len(const char *, struct dentry *, int);
+ extern struct dentry * lookup_hash(struct qstr *, struct dentry *);
+-
+ extern int follow_down(struct vfsmount **, struct dentry **);
+ extern int follow_up(struct vfsmount **, struct dentry **);
+ 
+.old..........pc/vfs_intent-2.6.3-suse/kernel/exit.c
+.new.........kernel/exit.c
+Index: linux-2.6.3-20/kernel/exit.c
+===================================================================
+--- linux-2.6.3-20.orig/kernel/exit.c	2004-03-05 02:07:17.000000000 -0800
++++ linux-2.6.3-20/kernel/exit.c	2004-03-08 14:23:41.000000000 -0800
+@@ -258,6 +258,8 @@
+ 	write_unlock_irq(&tasklist_lock);
+ }
+ 
++EXPORT_SYMBOL(reparent_to_init);
++
+ void __set_special_pids(pid_t session, pid_t pgrp)
+ {
+ 	struct task_struct *curr = current;
+@@ -427,6 +429,8 @@
+ 	__exit_files(tsk);
+ }
+ 
++EXPORT_SYMBOL(exit_files);
++
+ static inline void __put_fs_struct(struct fs_struct *fs)
+ {
+ 	/* No need to hold fs->lock if we are killing it */
diff --git a/lustre/kernel_patches/patches/vfs_intent-2.6-suse.patch b/lustre/kernel_patches/patches/vfs_intent-2.6.3.patch
similarity index 81%
rename from lustre/kernel_patches/patches/vfs_intent-2.6-suse.patch
rename to lustre/kernel_patches/patches/vfs_intent-2.6.3.patch
index c678b4e..a801f96 100644
--- a/lustre/kernel_patches/patches/vfs_intent-2.6-suse.patch
+++ b/lustre/kernel_patches/patches/vfs_intent-2.6.3.patch
@@ -1,8 +1,20 @@
-Index: linux-2.6.4-51.0/fs/exec.c
+ fs/exec.c              |   18 +++++++---
+ fs/namei.c             |   86 +++++++++++++++++++++++++++++++++++++++++++++----
+ fs/namespace.c         |    2 +
+ fs/nfs/dir.c           |    4 +-
+ fs/open.c              |   62 +++++++++++++++++++++++------------
+ fs/stat.c              |   24 ++++++++++---
+ include/linux/dcache.h |    3 +
+ include/linux/fs.h     |    8 ++++
+ include/linux/namei.h  |   56 ++++++++++++++++++++++++++-----
+ kernel/ksyms.c         |    8 ++++
+ 10 files changed, 222 insertions(+), 49 deletions(-)
+
+Index: uml-2.6.3/fs/exec.c
 ===================================================================
---- linux-2.6.4-51.0.orig/fs/exec.c	2004-04-05 12:41:59.000000000 -0400
-+++ linux-2.6.4-51.0/fs/exec.c	2004-04-05 17:36:42.000000000 -0400
-@@ -122,8 +122,11 @@
+--- uml-2.6.3.orig/fs/exec.c	2004-02-20 15:00:48.000000000 +0800
++++ uml-2.6.3/fs/exec.c	2004-02-21 00:15:14.154506296 +0800
+@@ -120,8 +120,11 @@
  	struct file * file;
  	struct nameidata nd;
  	int error;
@@ -15,7 +27,7 @@ Index: linux-2.6.4-51.0/fs/exec.c
  	error = __user_walk(library, LOOKUP_FOLLOW|LOOKUP_OPEN, &nd);
  	if (error)
  		goto out;
-@@ -136,7 +139,7 @@
+@@ -134,7 +137,7 @@
  	if (error)
  		goto exit;
  
@@ -24,7 +36,7 @@ Index: linux-2.6.4-51.0/fs/exec.c
  	error = PTR_ERR(file);
  	if (IS_ERR(file))
  		goto out;
-@@ -485,8 +488,9 @@
+@@ -474,8 +477,9 @@
  	int err;
  	struct file *file;
  
@@ -36,7 +48,7 @@ Index: linux-2.6.4-51.0/fs/exec.c
  	file = ERR_PTR(err);
  
  	if (!err) {
-@@ -499,7 +503,7 @@
+@@ -488,7 +492,7 @@
  				err = -EACCES;
  			file = ERR_PTR(err);
  			if (!err) {
@@ -45,11 +57,11 @@ Index: linux-2.6.4-51.0/fs/exec.c
  				if (!IS_ERR(file)) {
  					err = deny_write_access(file);
  					if (err) {
-Index: linux-2.6.4-51.0/fs/namei.c
+Index: uml-2.6.3/fs/namei.c
 ===================================================================
---- linux-2.6.4-51.0.orig/fs/namei.c	2004-04-05 12:41:59.000000000 -0400
-+++ linux-2.6.4-51.0/fs/namei.c	2004-04-05 17:36:42.000000000 -0400
-@@ -269,8 +269,19 @@
+--- uml-2.6.3.orig/fs/namei.c	2004-02-20 15:01:27.000000000 +0800
++++ uml-2.6.3/fs/namei.c	2004-02-20 23:59:00.678497144 +0800
+@@ -268,8 +268,19 @@
  	return 0;
  }
  
@@ -69,7 +81,7 @@ Index: linux-2.6.4-51.0/fs/namei.c
  	dput(nd->dentry);
  	mntput(nd->mnt);
  }
-@@ -347,7 +358,10 @@
+@@ -346,7 +357,10 @@
  {
  	struct dentry * result;
  	struct inode *dir = parent->d_inode;
@@ -80,7 +92,7 @@ Index: linux-2.6.4-51.0/fs/namei.c
  	down(&dir->i_sem);
  	/*
  	 * First re-do the cached lookup just in case it was created
-@@ -386,7 +400,10 @@
+@@ -385,7 +399,10 @@
  	if (result->d_op && result->d_op->d_revalidate) {
  		if (!result->d_op->d_revalidate(result, nd) && !d_invalidate(result)) {
  			dput(result);
@@ -92,7 +104,7 @@ Index: linux-2.6.4-51.0/fs/namei.c
  		}
  	}
  	return result;
-@@ -563,6 +580,33 @@
+@@ -562,6 +579,31 @@
  	return PTR_ERR(dentry);
  }
  
@@ -109,8 +121,6 @@ Index: linux-2.6.4-51.0/fs/namei.c
 +		if ((err = permission(dentry->d_parent->d_inode, MAY_EXEC,nd)))
 +			return err;
 +		new = real_lookup(dentry->d_parent, &dentry->d_name, nd);
-+		if (IS_ERR(new))
-+			return PTR_ERR(new);
 +		d_invalidate(dentry);
 +		dput(dentry);
 +		nd->dentry = dentry = new;
@@ -126,7 +136,7 @@ Index: linux-2.6.4-51.0/fs/namei.c
  /*
   * Name resolution.
   *
-@@ -663,7 +705,9 @@
+@@ -662,7 +704,9 @@
  
  		if (inode->i_op->follow_link) {
  			mntget(next.mnt);
@@ -136,27 +146,19 @@ Index: linux-2.6.4-51.0/fs/namei.c
  			dput(next.dentry);
  			mntput(next.mnt);
  			if (err)
-@@ -702,14 +746,29 @@
+@@ -701,6 +745,11 @@
  				inode = nd->dentry->d_inode;
  				/* fallthrough */
  			case 1:
 + 				nd->flags |= LOOKUP_LAST;
 + 				err = revalidate_special(nd);
 + 				nd->flags &= ~LOOKUP_LAST;
-+				if (err)
++ 				if (err)
 + 					break;
  				goto return_reval;
  		}
-+		
-+		if (err) {
-+			if (!nd->dentry->d_inode)
-+				err = -ENOENT;
-+			
-+			goto return_err;			
-+		}
-+		
  		if (nd->dentry->d_op && nd->dentry->d_op->d_hash) {
- 			err = nd->dentry->d_op->d_hash(nd->dentry, &this);
+@@ -708,7 +757,9 @@
  			if (err < 0)
  				break;
  		}
@@ -166,7 +168,7 @@ Index: linux-2.6.4-51.0/fs/namei.c
  		if (err)
  			break;
  		follow_mount(&next.mnt, &next.dentry);
-@@ -935,7 +994,7 @@
+@@ -934,7 +985,7 @@
  }
  
  /* SMP-safe */
@@ -175,7 +177,7 @@ Index: linux-2.6.4-51.0/fs/namei.c
  {
  	unsigned long hash;
  	struct qstr this;
-@@ -955,11 +1014,16 @@
+@@ -954,11 +1005,16 @@
  	}
  	this.hash = end_name_hash(hash);
  
@@ -193,16 +195,21 @@ Index: linux-2.6.4-51.0/fs/namei.c
  /*
   *	namei()
   *
-@@ -971,7 +1035,7 @@
+@@ -970,11 +1026,12 @@
   * that namei follows links, while lnamei does not.
   * SMP-safe
   */
--int fastcall __user_walk(const char __user *name, unsigned flags, struct nameidata *nd)
-+int fastcall __user_walk_it(const char __user *name, unsigned flags, struct nameidata *nd)
+-int __user_walk(const char __user *name, unsigned flags, struct nameidata *nd)
++int __user_walk_it(const char __user *name, unsigned flags, struct nameidata *nd)
  {
  	char *tmp = getname(name);
  	int err = PTR_ERR(tmp);
-@@ -983,6 +1047,12 @@
+ 
++
+ 	if (!IS_ERR(tmp)) {
+ 		err = path_lookup(tmp, flags, nd);
+ 		putname(tmp);
+@@ -982,6 +1039,12 @@
  	return err;
  }
  
@@ -215,7 +222,7 @@ Index: linux-2.6.4-51.0/fs/namei.c
  /*
   * It's inline, so penalty for filesystems that don't use sticky bit is
   * minimal.
-@@ -1255,8 +1325,8 @@
+@@ -1254,8 +1317,8 @@
  		acc_mode |= MAY_APPEND;
  
  	/* Fill in the open() intent data */
@@ -226,7 +233,7 @@ Index: linux-2.6.4-51.0/fs/namei.c
  
  	/*
  	 * The simplest case - just a plain lookup.
-@@ -1271,6 +1341,7 @@
+@@ -1270,6 +1333,7 @@
  	/*
  	 * Create - we need to know the parent.
  	 */
@@ -234,7 +241,7 @@ Index: linux-2.6.4-51.0/fs/namei.c
  	error = path_lookup(pathname, LOOKUP_PARENT|LOOKUP_OPEN|LOOKUP_CREATE, nd);
  	if (error)
  		return error;
-@@ -1287,7 +1358,9 @@
+@@ -1286,7 +1350,9 @@
  	dir = nd->dentry;
  	nd->flags &= ~LOOKUP_PARENT;
  	down(&dir->d_inode->i_sem);
@@ -244,7 +251,7 @@ Index: linux-2.6.4-51.0/fs/namei.c
  
  do_last:
  	error = PTR_ERR(dentry);
-@@ -1392,7 +1465,9 @@
+@@ -1391,7 +1457,9 @@
  	}
  	dir = nd->dentry;
  	down(&dir->d_inode->i_sem);
@@ -254,7 +261,7 @@ Index: linux-2.6.4-51.0/fs/namei.c
  	putname(nd->last.name);
  	goto do_last;
  }
-@@ -2154,7 +2229,9 @@
+@@ -2153,7 +2221,9 @@
  __vfs_follow_link(struct nameidata *nd, const char *link)
  {
  	int res = 0;
@@ -264,7 +271,7 @@ Index: linux-2.6.4-51.0/fs/namei.c
  	if (IS_ERR(link))
  		goto fail;
  
-@@ -2164,6 +2241,10 @@
+@@ -2163,6 +2233,10 @@
  			/* weird __emul_prefix() stuff did it */
  			goto out;
  	}
@@ -275,19 +282,11 @@ Index: linux-2.6.4-51.0/fs/namei.c
  	res = link_path_walk(link, nd);
  out:
  	if (current->link_count || res || nd->last_type!=LAST_NORM)
-Index: linux-2.6.4-51.0/fs/namespace.c
+Index: uml-2.6.3/fs/namespace.c
 ===================================================================
---- linux-2.6.4-51.0.orig/fs/namespace.c	2004-04-05 12:41:59.000000000 -0400
-+++ linux-2.6.4-51.0/fs/namespace.c	2004-04-07 13:28:23.000000000 -0400
-@@ -107,6 +107,7 @@
- 
- static void detach_mnt(struct vfsmount *mnt, struct nameidata *old_nd)
- {
-+	memset(old_nd, 0, sizeof(*old_nd));
- 	old_nd->dentry = mnt->mnt_mountpoint;
- 	old_nd->mnt = mnt->mnt_parent;
- 	mnt->mnt_parent = mnt;
-@@ -748,6 +749,7 @@
+--- uml-2.6.3.orig/fs/namespace.c	2004-02-20 15:01:27.000000000 +0800
++++ uml-2.6.3/fs/namespace.c	2004-02-20 23:59:00.745486960 +0800
+@@ -744,6 +744,7 @@
  	int retval = 0;
  	int mnt_flags = 0;
  
@@ -295,11 +294,11 @@ Index: linux-2.6.4-51.0/fs/namespace.c
  	/* Discard magic */
  	if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
  		flags &= ~MS_MGC_MSK;
-Index: linux-2.6.4-51.0/fs/open.c
+Index: uml-2.6.3/fs/open.c
 ===================================================================
---- linux-2.6.4-51.0.orig/fs/open.c	2004-04-05 12:41:59.000000000 -0400
-+++ linux-2.6.4-51.0/fs/open.c	2004-04-05 17:36:42.000000000 -0400
-@@ -211,7 +211,7 @@
+--- uml-2.6.3.orig/fs/open.c	2004-02-20 15:00:48.000000000 +0800
++++ uml-2.6.3/fs/open.c	2004-02-20 23:59:00.812476776 +0800
+@@ -202,7 +202,7 @@
  	struct nameidata nd;
  	struct inode * inode;
  	int error;
@@ -308,7 +307,7 @@ Index: linux-2.6.4-51.0/fs/open.c
  	error = -EINVAL;
  	if (length < 0)	/* sorry, but loff_t says... */
  		goto out;
-@@ -470,6 +470,7 @@
+@@ -461,6 +461,7 @@
  	int old_fsuid, old_fsgid;
  	kernel_cap_t old_cap;
  	int res;
@@ -316,7 +315,7 @@ Index: linux-2.6.4-51.0/fs/open.c
  
  	if (mode & ~S_IRWXO)	/* where's F_OK, X_OK, W_OK, R_OK? */
  		return -EINVAL;
-@@ -501,6 +502,7 @@
+@@ -492,6 +493,7 @@
  		if(!res && (mode & S_IWOTH) && IS_RDONLY(nd.dentry->d_inode)
  		   && !special_file(nd.dentry->d_inode->i_mode))
  			res = -EROFS;
@@ -324,7 +323,7 @@ Index: linux-2.6.4-51.0/fs/open.c
  		path_release(&nd);
  	}
  
-@@ -515,6 +517,7 @@
+@@ -506,6 +508,7 @@
  {
  	struct nameidata nd;
  	int error;
@@ -332,7 +331,7 @@ Index: linux-2.6.4-51.0/fs/open.c
  
  	error = __user_walk(filename, LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &nd);
  	if (error)
-@@ -566,6 +569,7 @@
+@@ -557,6 +560,7 @@
  {
  	struct nameidata nd;
  	int error;
@@ -340,7 +339,7 @@ Index: linux-2.6.4-51.0/fs/open.c
  
  	error = __user_walk(filename, LOOKUP_FOLLOW | LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd);
  	if (error)
-@@ -638,7 +642,7 @@
+@@ -629,7 +633,7 @@
  	error = -EROFS;
  	if (IS_RDONLY(inode))
  		goto dput_and_out;
@@ -349,7 +348,7 @@ Index: linux-2.6.4-51.0/fs/open.c
  	error = -EPERM;
  	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
  		goto dput_and_out;
-@@ -746,27 +750,8 @@
+@@ -737,27 +741,8 @@
   * for the internal routines (ie open_namei()/follow_link() etc). 00 is
   * used by symlinks.
   */
@@ -379,7 +378,7 @@ Index: linux-2.6.4-51.0/fs/open.c
  {
  	struct file * f;
  	struct inode *inode;
-@@ -778,6 +763,7 @@
+@@ -769,6 +754,7 @@
  		goto cleanup_dentry;
  	f->f_flags = flags;
  	f->f_mode = (flags+1) & O_ACCMODE;
@@ -387,7 +386,7 @@ Index: linux-2.6.4-51.0/fs/open.c
  	inode = dentry->d_inode;
  	if (f->f_mode & FMODE_WRITE) {
  		error = get_write_access(inode);
-@@ -797,6 +783,7 @@
+@@ -788,6 +774,7 @@
  		error = f->f_op->open(inode,f);
  		if (error)
  			goto cleanup_all;
@@ -395,7 +394,7 @@ Index: linux-2.6.4-51.0/fs/open.c
  	}
  	f->f_flags &= ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC);
  
-@@ -821,6 +808,7 @@
+@@ -812,6 +799,7 @@
  cleanup_file:
  	put_filp(f);
  cleanup_dentry:
@@ -403,7 +402,7 @@ Index: linux-2.6.4-51.0/fs/open.c
  	dput(dentry);
  	mntput(mnt);
  	return ERR_PTR(error);
-@@ -828,6 +816,36 @@
+@@ -819,6 +807,36 @@
  
  EXPORT_SYMBOL(dentry_open);
  
@@ -440,10 +439,10 @@ Index: linux-2.6.4-51.0/fs/open.c
  /*
   * Find an empty file descriptor entry, and mark it busy.
   */
-Index: linux-2.6.4-51.0/fs/stat.c
+Index: uml-2.6.3/fs/stat.c
 ===================================================================
---- linux-2.6.4-51.0.orig/fs/stat.c	2004-04-05 12:41:59.000000000 -0400
-+++ linux-2.6.4-51.0/fs/stat.c	2004-04-05 17:36:42.000000000 -0400
+--- uml-2.6.3.orig/fs/stat.c	2004-02-20 15:00:48.000000000 +0800
++++ uml-2.6.3/fs/stat.c	2004-02-20 23:59:00.878466744 +0800
 @@ -36,7 +36,7 @@
  
  EXPORT_SYMBOL(generic_fillattr);
@@ -513,11 +512,11 @@ Index: linux-2.6.4-51.0/fs/stat.c
  		fput(f);
  	}
  	return error;
-Index: linux-2.6.4-51.0/fs/nfs/dir.c
+Index: uml-2.6.3/fs/nfs/dir.c
 ===================================================================
---- linux-2.6.4-51.0.orig/fs/nfs/dir.c	2004-04-05 12:41:59.000000000 -0400
-+++ linux-2.6.4-51.0/fs/nfs/dir.c	2004-04-07 13:27:47.000000000 -0400
-@@ -709,7 +709,7 @@
+--- uml-2.6.3.orig/fs/nfs/dir.c	2004-02-20 15:01:27.000000000 +0800
++++ uml-2.6.3/fs/nfs/dir.c	2004-02-20 23:59:00.880466440 +0800
+@@ -672,7 +672,7 @@
  		return 0;
  	if (!nd || (nd->flags & LOOKUP_CONTINUE) || !(nd->flags & LOOKUP_CREATE))
  		return 0;
@@ -526,7 +525,7 @@ Index: linux-2.6.4-51.0/fs/nfs/dir.c
  }
  
  static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd)
-@@ -1026,7 +1026,7 @@
+@@ -960,7 +960,7 @@
  	attr.ia_valid = ATTR_MODE;
  
  	if (nd && (nd->flags & LOOKUP_CREATE))
@@ -535,11 +534,11 @@ Index: linux-2.6.4-51.0/fs/nfs/dir.c
  
  	/*
  	 * The 0 argument passed into the create function should one day
-Index: linux-2.6.4-51.0/fs/inode.c
+Index: uml-2.6.3/fs/inode.c
 ===================================================================
---- linux-2.6.4-51.0.orig/fs/inode.c	2004-04-05 12:41:59.000000000 -0400
-+++ linux-2.6.4-51.0/fs/inode.c	2004-04-05 17:36:43.000000000 -0400
-@@ -221,6 +221,7 @@
+--- uml-2.6.3.orig/fs/inode.c	2004-01-09 15:00:12.000000000 +0800
++++ uml-2.6.3/fs/inode.c	2004-02-20 23:59:00.951455648 +0800
+@@ -223,6 +223,7 @@
  	inodes_stat.nr_unused--;
  }
  
@@ -547,11 +546,11 @@ Index: linux-2.6.4-51.0/fs/inode.c
  /**
   * clear_inode - clear an inode
   * @inode: inode to clear
-Index: linux-2.6.4-51.0/fs/super.c
+Index: uml-2.6.3/fs/super.c
 ===================================================================
---- linux-2.6.4-51.0.orig/fs/super.c	2004-04-05 12:41:59.000000000 -0400
-+++ linux-2.6.4-51.0/fs/super.c	2004-04-05 17:36:43.000000000 -0400
-@@ -787,6 +787,8 @@
+--- uml-2.6.3.orig/fs/super.c	2004-02-20 15:01:27.000000000 +0800
++++ uml-2.6.3/fs/super.c	2004-02-20 23:59:01.024444552 +0800
+@@ -757,6 +757,8 @@
  	return (struct vfsmount *)sb;
  }
  
@@ -560,10 +559,10 @@ Index: linux-2.6.4-51.0/fs/super.c
  struct vfsmount *kern_mount(struct file_system_type *type)
  {
  	return do_kern_mount(type->name, 0, type->name, NULL);
-Index: linux-2.6.4-51.0/include/linux/dcache.h
+Index: uml-2.6.3/include/linux/dcache.h
 ===================================================================
---- linux-2.6.4-51.0.orig/include/linux/dcache.h	2004-04-05 12:42:07.000000000 -0400
-+++ linux-2.6.4-51.0/include/linux/dcache.h	2004-04-05 17:36:43.000000000 -0400
+--- uml-2.6.3.orig/include/linux/dcache.h	2004-02-20 15:00:57.000000000 +0800
++++ uml-2.6.3/include/linux/dcache.h	2004-02-20 23:59:01.025444400 +0800
 @@ -4,6 +4,7 @@
  #ifdef __KERNEL__
  
@@ -581,11 +580,11 @@ Index: linux-2.6.4-51.0/include/linux/dcache.h
  struct dentry_stat_t {
  	int nr_dentry;
  	int nr_unused;
-Index: linux-2.6.4-51.0/include/linux/fs.h
+Index: uml-2.6.3/include/linux/fs.h
 ===================================================================
---- linux-2.6.4-51.0.orig/include/linux/fs.h	2004-04-05 12:42:07.000000000 -0400
-+++ linux-2.6.4-51.0/include/linux/fs.h	2004-04-05 17:36:43.000000000 -0400
-@@ -249,6 +249,8 @@
+--- uml-2.6.3.orig/include/linux/fs.h	2004-02-20 15:01:28.000000000 +0800
++++ uml-2.6.3/include/linux/fs.h	2004-02-20 23:59:01.100433000 +0800
+@@ -243,6 +243,8 @@
  #define ATTR_ATTR_FLAG	1024
  #define ATTR_KILL_SUID	2048
  #define ATTR_KILL_SGID	4096
@@ -594,7 +593,7 @@ Index: linux-2.6.4-51.0/include/linux/fs.h
  
  /*
   * This is the Inode Attributes structure, used for notify_change().  It
-@@ -422,6 +424,7 @@
+@@ -408,6 +410,7 @@
  	struct block_device	*i_bdev;
  	struct cdev		*i_cdev;
  	int			i_cindex;
@@ -602,7 +601,7 @@ Index: linux-2.6.4-51.0/include/linux/fs.h
  
  	unsigned long		i_dnotify_mask; /* Directory notify events */
  	struct dnotify_struct	*i_dnotify; /* for directory notifications */
-@@ -554,6 +557,7 @@
+@@ -538,6 +541,7 @@
  	spinlock_t		f_ep_lock;
  #endif /* #ifdef CONFIG_EPOLL */
  	struct address_space	*f_mapping;
@@ -610,7 +609,7 @@ Index: linux-2.6.4-51.0/include/linux/fs.h
  };
  extern spinlock_t files_lock;
  #define file_list_lock() spin_lock(&files_lock);
-@@ -874,7 +878,9 @@
+@@ -843,7 +847,9 @@
  	void (*truncate) (struct inode *);
  	int (*permission) (struct inode *, int, struct nameidata *);
  	int (*setattr) (struct dentry *, struct iattr *);
@@ -620,7 +619,7 @@ Index: linux-2.6.4-51.0/include/linux/fs.h
  	int (*setxattr) (struct dentry *, const char *,const void *,size_t,int);
  	ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
  	ssize_t (*listxattr) (struct dentry *, char *, size_t);
-@@ -1101,6 +1107,7 @@
+@@ -1056,6 +1062,7 @@
  extern int unregister_filesystem(struct file_system_type *);
  extern struct vfsmount *kern_mount(struct file_system_type *);
  extern int may_umount(struct vfsmount *);
@@ -628,18 +627,18 @@ Index: linux-2.6.4-51.0/include/linux/fs.h
  extern long do_mount(char *, char *, char *, unsigned long, void *);
  
  extern int vfs_statfs(struct super_block *, struct kstatfs *);
-@@ -1165,6 +1172,7 @@
- extern int do_truncate(struct dentry *, loff_t start);
+@@ -1123,6 +1130,7 @@
+ 
  extern struct file *filp_open(const char *, int, int);
  extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
 +extern struct file * dentry_open_it(struct dentry *, struct vfsmount *, int, struct lookup_intent *);
  extern int filp_close(struct file *, fl_owner_t id);
  extern char * getname(const char __user *);
  
-Index: linux-2.6.4-51.0/include/linux/namei.h
+Index: uml-2.6.3/include/linux/namei.h
 ===================================================================
---- linux-2.6.4-51.0.orig/include/linux/namei.h	2004-04-05 12:42:07.000000000 -0400
-+++ linux-2.6.4-51.0/include/linux/namei.h	2004-04-05 17:36:43.000000000 -0400
+--- uml-2.6.3.orig/include/linux/namei.h	2004-01-09 14:59:19.000000000 +0800
++++ uml-2.6.3/include/linux/namei.h	2004-02-20 23:59:01.174421752 +0800
 @@ -2,25 +2,55 @@
  #define _LINUX_NAMEI_H
  
@@ -735,11 +734,11 @@ Index: linux-2.6.4-51.0/include/linux/namei.h
  extern int follow_down(struct vfsmount **, struct dentry **);
  extern int follow_up(struct vfsmount **, struct dentry **);
  
-Index: linux-2.6.4-51.0/kernel/exit.c
+Index: uml-2.6.3/kernel/exit.c
 ===================================================================
---- linux-2.6.4-51.0.orig/kernel/exit.c	2004-04-05 12:42:08.000000000 -0400
-+++ linux-2.6.4-51.0/kernel/exit.c	2004-04-05 17:36:43.000000000 -0400
-@@ -259,6 +259,8 @@
+--- uml-2.6.3.orig/kernel/exit.c	2004-02-20 15:00:58.000000000 +0800
++++ uml-2.6.3/kernel/exit.c	2004-02-20 23:59:01.176421448 +0800
+@@ -255,6 +255,8 @@
  	write_unlock_irq(&tasklist_lock);
  }
  
@@ -748,7 +747,7 @@ Index: linux-2.6.4-51.0/kernel/exit.c
  void __set_special_pids(pid_t session, pid_t pgrp)
  {
  	struct task_struct *curr = current;
-@@ -428,6 +430,8 @@
+@@ -422,6 +424,8 @@
  	__exit_files(tsk);
  }
  
diff --git a/lustre/kernel_patches/patches/vfs_intent_2.6.0-test1.patch b/lustre/kernel_patches/patches/vfs_intent_2.6.0-test1.patch
new file mode 100644
index 0000000..3d75965
--- /dev/null
+++ b/lustre/kernel_patches/patches/vfs_intent_2.6.0-test1.patch
@@ -0,0 +1,734 @@
+ fs/exec.c              |   18 +++++++---
+ fs/namei.c             |   86 +++++++++++++++++++++++++++++++++++++++++++++----
+ fs/namespace.c         |    2 +
+ fs/nfs/dir.c           |    4 +-
+ fs/open.c              |   62 +++++++++++++++++++++++------------
+ fs/stat.c              |   24 ++++++++++---
+ include/linux/dcache.h |    3 +
+ include/linux/fs.h     |    8 ++++
+ include/linux/namei.h  |   56 ++++++++++++++++++++++++++-----
+ kernel/ksyms.c         |    8 ++++
+ 10 files changed, 222 insertions(+), 49 deletions(-)
+
+--- linux-2.6.0-test1/fs/exec.c~vfs_intent_2.6.0-test1	2003-09-13 19:08:34.000000000 +0400
++++ linux-2.6.0-test1-alexey/fs/exec.c	2003-09-14 18:13:44.000000000 +0400
+@@ -116,8 +116,11 @@ asmlinkage long sys_uselib(const char __
+ 	struct file * file;
+ 	struct nameidata nd;
+ 	int error;
++	intent_init(&nd.intent, IT_OPEN);
+ 
+-	nd.intent.open.flags = O_RDONLY;
++	error = user_path_walk_it(library, &nd);
++
++	nd.intent.it_flags = O_RDONLY;
+ 	error = __user_walk(library, LOOKUP_FOLLOW|LOOKUP_OPEN, &nd);
+ 	if (error)
+ 		goto out;
+@@ -130,7 +133,7 @@ asmlinkage long sys_uselib(const char __
+ 	if (error)
+ 		goto exit;
+ 
+-	file = dentry_open(nd.dentry, nd.mnt, O_RDONLY);
++	file = dentry_open_it(nd.dentry, nd.mnt, O_RDONLY, &nd.intent);
+ 	error = PTR_ERR(file);
+ 	if (IS_ERR(file))
+ 		goto out;
+@@ -457,8 +460,13 @@ static inline void free_arg_pages(struct
+ struct file *open_exec(const char *name)
+ {
+ 	struct nameidata nd;
+-	int err = path_lookup(name, LOOKUP_FOLLOW, &nd);
+-	struct file *file = ERR_PTR(err);
++	int err;
++	struct file *file;
++
++	intent_init(&nd.intent, IT_OPEN);
++	nd.intent.it_flags = O_RDONLY;
++	err = path_lookup(name, LOOKUP_FOLLOW, &nd);
++	file = ERR_PTR(err);
+ 
+ 	if (!err) {
+ 		struct inode *inode = nd.dentry->d_inode;
+@@ -470,7 +478,7 @@ struct file *open_exec(const char *name)
+ 				err = -EACCES;
+ 			file = ERR_PTR(err);
+ 			if (!err) {
+-				file = dentry_open(nd.dentry, nd.mnt, O_RDONLY);
++				file = dentry_open_it(nd.dentry, nd.mnt, O_RDONLY, &nd.intent);
+ 				if (!IS_ERR(file)) {
+ 					err = deny_write_access(file);
+ 					if (err) {
+--- linux-2.6.0-test1/fs/namei.c~vfs_intent_2.6.0-test1	2003-09-13 19:08:34.000000000 +0400
++++ linux-2.6.0-test1-alexey/fs/namei.c	2003-09-14 18:15:11.000000000 +0400
+@@ -263,8 +263,19 @@ int deny_write_access(struct file * file
+ 	return 0;
+ }
+ 
++void intent_release(struct lookup_intent *it)
++{
++	if (!it)
++		return;
++	if (it->it_magic != INTENT_MAGIC)
++		return;
++	if (it->it_op_release)
++		it->it_op_release(it);
++}
++
+ void path_release(struct nameidata *nd)
+ {
++	intent_release(&nd->intent);
+ 	dput(nd->dentry);
+ 	mntput(nd->mnt);
+ }
+@@ -340,7 +351,10 @@ static struct dentry * real_lookup(struc
+ {
+ 	struct dentry * result;
+ 	struct inode *dir = parent->d_inode;
++	int counter = 0;
+ 
++again:
++	counter++;
+ 	down(&dir->i_sem);
+ 	/*
+ 	 * First re-do the cached lookup just in case it was created
+@@ -379,7 +393,10 @@ static struct dentry * real_lookup(struc
+ 	if (result->d_op && result->d_op->d_revalidate) {
+ 		if (!result->d_op->d_revalidate(result, nd) && !d_invalidate(result)) {
+ 			dput(result);
+-			result = ERR_PTR(-ENOENT);
++			if (counter > 10)
++				result = ERR_PTR(-ESTALE);
++			if (!IS_ERR(result))
++				goto again;
+ 		}
+ 	}
+ 	return result;
+@@ -554,6 +571,31 @@ fail:
+ 	return PTR_ERR(dentry);
+ }
+ 
++static int revalidate_special(struct nameidata *nd)
++{
++	struct dentry *dentry = nd->dentry;
++	int err, counter = 0;
++
++	if (!dentry->d_op || !dentry->d_op->d_revalidate)
++		return 0;
++ revalidate_again:
++	if (!dentry->d_op->d_revalidate(dentry, nd)) {
++		struct dentry *new;
++		if ((err = permission(dentry->d_parent->d_inode, MAY_EXEC,nd)))
++			return err;
++		new = real_lookup(dentry->d_parent, &dentry->d_name, nd);
++		d_invalidate(dentry);
++		dput(dentry);
++		dentry = new;
++		counter++;
++		if (counter < 10)
++			goto revalidate_again;
++		printk("excessive revalidate_it loops\n");
++		return -ESTALE;
++	}
++	return 0;
++}
++
+ /*
+  * Name resolution.
+  *
+@@ -654,7 +696,9 @@ int link_path_walk(const char * name, st
+ 
+ 		if (inode->i_op->follow_link) {
+ 			mntget(next.mnt);
++			nd->flags |= LOOKUP_LINK_NOTLAST;
+ 			err = do_follow_link(next.dentry, nd);
++			nd->flags &= ~LOOKUP_LINK_NOTLAST;
+ 			dput(next.dentry);
+ 			mntput(next.mnt);
+ 			if (err)
+@@ -693,6 +737,11 @@ last_component:
+ 				inode = nd->dentry->d_inode;
+ 				/* fallthrough */
+ 			case 1:
++ 				nd->flags |= LOOKUP_LAST;
++ 				err = revalidate_special(nd);
++ 				nd->flags &= ~LOOKUP_LAST;
++ 				if (err)
++ 					break;
+ 				goto return_reval;
+ 		}
+ 		if (nd->dentry->d_op && nd->dentry->d_op->d_hash) {
+@@ -700,7 +749,9 @@ last_component:
+ 			if (err < 0)
+ 				break;
+ 		}
++		nd->flags |= LOOKUP_LAST;
+ 		err = do_lookup(nd, &this, &next);
++		nd->flags &= ~LOOKUP_LAST;
+ 		if (err)
+ 			break;
+ 		follow_mount(&next.mnt, &next.dentry);
+@@ -926,7 +977,7 @@ struct dentry * lookup_hash(struct qstr 
+ }
+ 
+ /* SMP-safe */
+-struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
++struct dentry * lookup_one_len_it(const char * name, struct dentry * base, int len, struct nameidata *nd)
+ {
+ 	unsigned long hash;
+ 	struct qstr this;
+@@ -946,11 +997,16 @@ struct dentry * lookup_one_len(const cha
+ 	}
+ 	this.hash = end_name_hash(hash);
+ 
+-	return lookup_hash(&this, base);
++	return __lookup_hash(&this, base, nd);
+ access:
+ 	return ERR_PTR(-EACCES);
+ }
+ 
++struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
++{
++	return lookup_one_len_it(name, base, len, NULL);
++}
++
+ /*
+  *	namei()
+  *
+@@ -962,11 +1018,12 @@ access:
+  * that namei follows links, while lnamei does not.
+  * SMP-safe
+  */
+-int __user_walk(const char __user *name, unsigned flags, struct nameidata *nd)
++int __user_walk_it(const char __user *name, unsigned flags, struct nameidata *nd)
+ {
+ 	char *tmp = getname(name);
+ 	int err = PTR_ERR(tmp);
+ 
++
+ 	if (!IS_ERR(tmp)) {
+ 		err = path_lookup(tmp, flags, nd);
+ 		putname(tmp);
+@@ -974,6 +1031,12 @@ int __user_walk(const char __user *name,
+ 	return err;
+ }
+ 
++int __user_walk(const char __user *name, unsigned flags, struct nameidata *nd)
++{
++	intent_init(&nd->intent, IT_LOOKUP);
++	return __user_walk_it(name, flags, nd);
++}
++
+ /*
+  * It's inline, so penalty for filesystems that don't use sticky bit is
+  * minimal.
+@@ -1246,8 +1309,8 @@ int open_namei(const char * pathname, in
+ 		acc_mode |= MAY_APPEND;
+ 
+ 	/* Fill in the open() intent data */
+-	nd->intent.open.flags = flag;
+-	nd->intent.open.create_mode = mode;
++	nd->intent.it_flags = flag;
++	nd->intent.it_create_mode = mode;
+ 
+ 	/*
+ 	 * The simplest case - just a plain lookup.
+@@ -1263,6 +1326,7 @@ int open_namei(const char * pathname, in
+ 	/*
+ 	 * Create - we need to know the parent.
+ 	 */
++	nd->intent.it_op |= IT_CREAT;
+ 	error = path_lookup(pathname, LOOKUP_PARENT|LOOKUP_OPEN|LOOKUP_CREATE, nd);
+ 	if (error)
+ 		return error;
+@@ -1279,7 +1343,9 @@ int open_namei(const char * pathname, in
+ 	dir = nd->dentry;
+ 	nd->flags &= ~LOOKUP_PARENT;
+ 	down(&dir->d_inode->i_sem);
++	nd->flags |= LOOKUP_LAST;
+ 	dentry = __lookup_hash(&nd->last, nd->dentry, nd);
++	nd->flags &= ~LOOKUP_LAST;
+ 
+ do_last:
+ 	error = PTR_ERR(dentry);
+@@ -1384,7 +1450,9 @@ do_link:
+ 	}
+ 	dir = nd->dentry;
+ 	down(&dir->d_inode->i_sem);
++	nd->flags |= LOOKUP_LAST;
+ 	dentry = __lookup_hash(&nd->last, nd->dentry, nd);
++	nd->flags &= ~LOOKUP_LAST;
+ 	putname(nd->last.name);
+ 	goto do_last;
+ }
+@@ -2142,7 +2210,9 @@ static inline int
+ __vfs_follow_link(struct nameidata *nd, const char *link)
+ {
+ 	int res = 0;
++	struct lookup_intent it = nd->intent;
+ 	char *name;
++
+ 	if (IS_ERR(link))
+ 		goto fail;
+ 
+@@ -2152,6 +2222,10 @@ __vfs_follow_link(struct nameidata *nd, 
+ 			/* weird __emul_prefix() stuff did it */
+ 			goto out;
+ 	}
++
++	intent_init(&nd->intent, it.it_op);
++	nd->intent.it_flags = it.it_flags;
++	nd->intent.it_create_mode = it.it_create_mode;
+ 	res = link_path_walk(link, nd);
+ out:
+ 	if (current->link_count || res || nd->last_type!=LAST_NORM)
+--- linux-2.6.0-test1/fs/namespace.c~vfs_intent_2.6.0-test1	2003-09-13 19:07:44.000000000 +0400
++++ linux-2.6.0-test1-alexey/fs/namespace.c	2003-09-14 18:13:44.000000000 +0400
+@@ -738,6 +738,7 @@ long do_mount(char * dev_name, char * di
+ 	int retval = 0;
+ 	int mnt_flags = 0;
+ 
++	intent_init(&nd.intent, IT_LOOKUP);
+ 	/* Discard magic */
+ 	if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
+ 		flags &= ~MS_MGC_MSK;
+@@ -947,6 +948,7 @@ void set_fs_pwd(struct fs_struct *fs, st
+ 		mntput(old_pwdmnt);
+ 	}
+ }
++EXPORT_SYMBOL(set_fs_pwd);
+ 
+ static void chroot_fs_refs(struct nameidata *old_nd, struct nameidata *new_nd)
+ {
+--- linux-2.6.0-test1/fs/open.c~vfs_intent_2.6.0-test1	2003-09-13 19:08:34.000000000 +0400
++++ linux-2.6.0-test1-alexey/fs/open.c	2003-09-14 18:13:44.000000000 +0400
+@@ -200,7 +200,7 @@ static inline long do_sys_truncate(const
+ 	struct nameidata nd;
+ 	struct inode * inode;
+ 	int error;
+-
++	intent_init(&nd.intent, IT_GETATTR);
+ 	error = -EINVAL;
+ 	if (length < 0)	/* sorry, but loff_t says... */
+ 		goto out;
+@@ -443,6 +443,7 @@ asmlinkage long sys_access(const char __
+ 	int old_fsuid, old_fsgid;
+ 	kernel_cap_t old_cap;
+ 	int res;
++	intent_init(&nd.intent, IT_GETATTR);
+ 
+ 	if (mode & ~S_IRWXO)	/* where's F_OK, X_OK, W_OK, R_OK? */
+ 		return -EINVAL;
+@@ -474,6 +475,7 @@ asmlinkage long sys_access(const char __
+ 		if(!res && (mode & S_IWOTH) && IS_RDONLY(nd.dentry->d_inode)
+ 		   && !special_file(nd.dentry->d_inode->i_mode))
+ 			res = -EROFS;
++
+ 		path_release(&nd);
+ 	}
+ 
+@@ -488,6 +490,7 @@ asmlinkage long sys_chdir(const char __u
+ {
+ 	struct nameidata nd;
+ 	int error;
++	intent_init(&nd.intent, IT_GETATTR);
+ 
+ 	error = __user_walk(filename, LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &nd);
+ 	if (error)
+@@ -539,6 +542,7 @@ asmlinkage long sys_chroot(const char __
+ {
+ 	struct nameidata nd;
+ 	int error;
++	intent_init(&nd.intent, IT_GETATTR);
+ 
+ 	error = __user_walk(filename, LOOKUP_FOLLOW | LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd);
+ 	if (error)
+@@ -611,7 +615,7 @@ asmlinkage long sys_chmod(const char __u
+ 	error = -EROFS;
+ 	if (IS_RDONLY(inode))
+ 		goto dput_and_out;
+-
++	
+ 	error = -EPERM;
+ 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
+ 		goto dput_and_out;
+@@ -719,25 +723,8 @@ asmlinkage long sys_fchown(unsigned int 
+  * for the internal routines (ie open_namei()/follow_link() etc). 00 is
+  * used by symlinks.
+  */
+-struct file *filp_open(const char * filename, int flags, int mode)
+-{
+-	int namei_flags, error;
+-	struct nameidata nd;
+-
+-	namei_flags = flags;
+-	if ((namei_flags+1) & O_ACCMODE)
+-		namei_flags++;
+-	if (namei_flags & O_TRUNC)
+-		namei_flags |= 2;
+-
+-	error = open_namei(filename, namei_flags, mode, &nd);
+-	if (!error)
+-		return dentry_open(nd.dentry, nd.mnt, flags);
+-
+-	return ERR_PTR(error);
+-}
+-
+-struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
++struct file *dentry_open_it(struct dentry *dentry, struct vfsmount *mnt, int flags,
++			    struct lookup_intent *it)
+ {
+ 	struct file * f;
+ 	struct inode *inode;
+@@ -749,6 +736,7 @@ struct file *dentry_open(struct dentry *
+ 		goto cleanup_dentry;
+ 	f->f_flags = flags;
+ 	f->f_mode = (flags+1) & O_ACCMODE;
++	f->f_it = it;
+ 	inode = dentry->d_inode;
+ 	if (f->f_mode & FMODE_WRITE) {
+ 		error = get_write_access(inode);
+@@ -767,6 +755,7 @@ struct file *dentry_open(struct dentry *
+ 		error = f->f_op->open(inode,f);
+ 		if (error)
+ 			goto cleanup_all;
++		intent_release(it);
+ 	}
+ 	f->f_flags &= ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC);
+ 
+@@ -791,11 +780,42 @@ cleanup_all:
+ cleanup_file:
+ 	put_filp(f);
+ cleanup_dentry:
++	intent_release(it);
+ 	dput(dentry);
+ 	mntput(mnt);
+ 	return ERR_PTR(error);
+ }
+ 
++struct file *filp_open(const char * filename, int flags, int mode)
++{
++	int namei_flags, error;
++	struct file * temp_filp;
++	struct nameidata nd;
++	intent_init(&nd.intent, IT_OPEN);
++
++	namei_flags = flags;
++	if ((namei_flags+1) & O_ACCMODE)
++		namei_flags++;
++	if (namei_flags & O_TRUNC)
++		namei_flags |= 2;
++
++	error = open_namei(filename, namei_flags, mode, &nd);
++	if (!error) {
++		temp_filp = dentry_open_it(nd.dentry, nd.mnt, flags, &nd.intent);
++		return temp_filp;
++	}	
++	return ERR_PTR(error);
++}
++
++
++struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
++{
++	struct lookup_intent it;
++	intent_init(&it, IT_LOOKUP);
++
++	return dentry_open_it(dentry, mnt, flags, &it);
++}
++
+ /*
+  * Find an empty file descriptor entry, and mark it busy.
+  */
+--- linux-2.6.0-test1/fs/stat.c~vfs_intent_2.6.0-test1	2003-09-13 19:08:11.000000000 +0400
++++ linux-2.6.0-test1-alexey/fs/stat.c	2003-09-14 18:13:44.000000000 +0400
+@@ -33,7 +33,7 @@ void generic_fillattr(struct inode *inod
+ 	stat->blksize = inode->i_blksize;
+ }
+ 
+-int vfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
++int vfs_getattr_it(struct vfsmount *mnt, struct dentry *dentry, struct lookup_intent *it, struct kstat *stat)
+ {
+ 	struct inode *inode = dentry->d_inode;
+ 	int retval;
+@@ -44,6 +44,8 @@ int vfs_getattr(struct vfsmount *mnt, st
+ 
+ 	if (inode->i_op->getattr)
+ 		return inode->i_op->getattr(mnt, dentry, stat);
++	if (inode->i_op->getattr_it)
++		return inode->i_op->getattr_it(mnt, dentry, it, stat);
+ 
+ 	generic_fillattr(inode, stat);
+ 	if (!stat->blksize) {
+@@ -56,14 +58,20 @@ int vfs_getattr(struct vfsmount *mnt, st
+ 	return 0;
+ }
+ 
++int vfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
++{
++	return vfs_getattr_it(mnt, dentry, NULL, stat);
++}
++
+ int vfs_stat(char __user *name, struct kstat *stat)
+ {
+ 	struct nameidata nd;
+ 	int error;
++	intent_init(&nd.intent, IT_GETATTR);
+ 
+-	error = user_path_walk(name, &nd);
++	error = user_path_walk_it(name, &nd);
+ 	if (!error) {
+-		error = vfs_getattr(nd.mnt, nd.dentry, stat);
++		error = vfs_getattr_it(nd.mnt, nd.dentry, &nd.intent, stat);
+ 		path_release(&nd);
+ 	}
+ 	return error;
+@@ -73,10 +81,11 @@ int vfs_lstat(char __user *name, struct 
+ {
+ 	struct nameidata nd;
+ 	int error;
++	intent_init(&nd.intent, IT_GETATTR);
+ 
+-	error = user_path_walk_link(name, &nd);
++	error = user_path_walk_link_it(name, &nd);
+ 	if (!error) {
+-		error = vfs_getattr(nd.mnt, nd.dentry, stat);
++		error = vfs_getattr_it(nd.mnt, nd.dentry, &nd.intent, stat);
+ 		path_release(&nd);
+ 	}
+ 	return error;
+@@ -86,9 +95,12 @@ int vfs_fstat(unsigned int fd, struct ks
+ {
+ 	struct file *f = fget(fd);
+ 	int error = -EBADF;
++	struct nameidata nd;
++	intent_init(&nd.intent, IT_GETATTR);
+ 
+ 	if (f) {
+-		error = vfs_getattr(f->f_vfsmnt, f->f_dentry, stat);
++		error = vfs_getattr_it(f->f_vfsmnt, f->f_dentry, &nd.intent, stat);
++		intent_release(&nd.intent);
+ 		fput(f);
+ 	}
+ 	return error;
+--- linux-2.6.0-test1/include/linux/dcache.h~vfs_intent_2.6.0-test1	2003-09-13 19:08:13.000000000 +0400
++++ linux-2.6.0-test1-alexey/include/linux/dcache.h	2003-09-14 18:13:44.000000000 +0400
+@@ -4,6 +4,7 @@
+ #ifdef __KERNEL__
+ 
+ #include <asm/atomic.h>
++#include <linux/string.h>
+ #include <linux/list.h>
+ #include <linux/spinlock.h>
+ #include <linux/cache.h>
+@@ -35,6 +36,8 @@ struct qstr {
+ 	char name_str[0];
+ };
+ 
++#include <linux/namei.h>
++
+ struct dentry_stat_t {
+ 	int nr_dentry;
+ 	int nr_unused;
+--- linux-2.6.0-test1/include/linux/fs.h~vfs_intent_2.6.0-test1	2003-09-13 19:08:41.000000000 +0400
++++ linux-2.6.0-test1-alexey/include/linux/fs.h	2003-09-14 18:13:44.000000000 +0400
+@@ -240,6 +240,8 @@ typedef void (dio_iodone_t)(struct inode
+ #define ATTR_ATTR_FLAG	1024
+ #define ATTR_KILL_SUID	2048
+ #define ATTR_KILL_SGID	4096
++#define ATTR_RAW       	8192    /* file system, not vfs will massage attrs */
++#define ATTR_FROM_OPEN 	16384    /* called from open path, ie O_TRUNC */
+ 
+ /*
+  * This is the Inode Attributes structure, used for notify_change().  It
+@@ -399,6 +401,7 @@ struct inode {
+ 	struct block_device	*i_bdev;
+ 	struct cdev		*i_cdev;
+ 	int			i_cindex;
++	void			*i_filterdata;
+ 
+ 	unsigned long		i_dnotify_mask; /* Directory notify events */
+ 	struct dnotify_struct	*i_dnotify; /* for directory notifications */
+@@ -514,6 +517,7 @@ struct file {
+ 	/* Used by fs/eventpoll.c to link all the hooks to this file */
+ 	struct list_head	f_ep_links;
+ 	spinlock_t		f_ep_lock;
++	struct lookup_intent    *f_it;
+ };
+ extern spinlock_t files_lock;
+ #define file_list_lock() spin_lock(&files_lock);
+@@ -814,7 +818,9 @@ struct inode_operations {
+ 	void (*truncate) (struct inode *);
+ 	int (*permission) (struct inode *, int, struct nameidata *);
+ 	int (*setattr) (struct dentry *, struct iattr *);
++	int (*setattr_raw) (struct inode *, struct iattr *);
+ 	int (*getattr) (struct vfsmount *mnt, struct dentry *, struct kstat *);
++	int (*getattr_it) (struct vfsmount *, struct dentry *, struct lookup_intent *, struct kstat *);
+ 	int (*setxattr) (struct dentry *, const char *,const void *,size_t,int);
+ 	ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
+ 	ssize_t (*listxattr) (struct dentry *, char *, size_t);
+@@ -1027,6 +1033,7 @@ extern int register_filesystem(struct fi
+ extern int unregister_filesystem(struct file_system_type *);
+ extern struct vfsmount *kern_mount(struct file_system_type *);
+ extern int may_umount(struct vfsmount *);
++struct vfsmount *do_kern_mount(const char *type, int flags, const char *name, void *data);
+ extern long do_mount(char *, char *, char *, unsigned long, void *);
+ 
+ extern int vfs_statfs(struct super_block *, struct kstatfs *);
+@@ -1094,6 +1101,7 @@ extern int do_truncate(struct dentry *, 
+ 
+ extern struct file *filp_open(const char *, int, int);
+ extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
++extern struct file * dentry_open_it(struct dentry *, struct vfsmount *, int, struct lookup_intent *);
+ extern int filp_close(struct file *, fl_owner_t id);
+ extern char * getname(const char __user *);
+ 
+--- linux-2.6.0-test1/include/linux/namei.h~vfs_intent_2.6.0-test1	2003-07-24 15:52:31.000000000 +0400
++++ linux-2.6.0-test1-alexey/include/linux/namei.h	2003-09-14 18:13:44.000000000 +0400
+@@ -2,25 +2,55 @@
+ #define _LINUX_NAMEI_H
+ 
+ #include <linux/linkage.h>
++#include <linux/string.h>
+ 
+ struct vfsmount;
++struct nameidata;
+ 
+-struct open_intent {
+-	int	flags;
+-	int	create_mode;
++/* intent opcodes */
++#define IT_OPEN     (1)
++#define IT_CREAT    (1<<1)
++#define IT_READDIR  (1<<2)
++#define IT_GETATTR  (1<<3)
++#define IT_LOOKUP   (1<<4)
++#define IT_UNLINK   (1<<5)
++#define IT_TRUNC    (1<<6)
++#define IT_GETXATTR (1<<7)
++
++struct lustre_intent_data {
++	int       it_disposition;
++	int       it_status;
++	__u64     it_lock_handle;
++	void     *it_data;
++	int       it_lock_mode;
+ };
+ 
++#define INTENT_MAGIC 0x19620323
++struct lookup_intent {
++	int     it_magic;
++	void    (*it_op_release)(struct lookup_intent *);
++	int     it_op;
++	int	it_flags;
++	int	it_create_mode;
++	union {
++		struct lustre_intent_data lustre;
++	} d;
++};
++
++static inline void intent_init(struct lookup_intent *it, int op)
++{
++	memset(it, 0, sizeof(*it));
++	it->it_magic = INTENT_MAGIC;
++	it->it_op = op;
++}
++
+ struct nameidata {
+ 	struct dentry	*dentry;
+ 	struct vfsmount *mnt;
+ 	struct qstr	last;
+ 	unsigned int	flags;
+ 	int		last_type;
+-
+-	/* Intent data */
+-	union {
+-		struct open_intent open;
+-	} intent;
++	struct lookup_intent intent;
+ };
+ 
+ /*
+@@ -41,6 +71,9 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LA
+ #define LOOKUP_CONTINUE		 4
+ #define LOOKUP_PARENT		16
+ #define LOOKUP_NOALT		32
++#define LOOKUP_LAST		 (1<<6)
++#define LOOKUP_LINK_NOTLAST	 (1<<7)
++
+ /*
+  * Intent data
+  */
+@@ -49,6 +82,12 @@ enum {LAST_NORM, LAST_ROOT, LAST_DOT, LA
+ #define LOOKUP_ACCESS		(0x0400)
+ 
+ extern int FASTCALL(__user_walk(const char __user *, unsigned, struct nameidata *));
++extern int FASTCALL(__user_walk_it(const char __user *name, unsigned flags, struct nameidata *nd));
++#define user_path_walk_it(name,nd) \
++	__user_walk_it(name, LOOKUP_FOLLOW, nd)
++#define user_path_walk_link_it(name,nd) \
++	__user_walk_it(name, 0, nd)
++extern void intent_release(struct lookup_intent *);
+ #define user_path_walk(name,nd) \
+ 	__user_walk(name, LOOKUP_FOLLOW, nd)
+ #define user_path_walk_link(name,nd) \
+@@ -60,7 +99,6 @@ extern void path_release(struct nameidat
+ 
+ extern struct dentry * lookup_one_len(const char *, struct dentry *, int);
+ extern struct dentry * lookup_hash(struct qstr *, struct dentry *);
+-
+ extern int follow_down(struct vfsmount **, struct dentry **);
+ extern int follow_up(struct vfsmount **, struct dentry **);
+ 
+--- linux-2.6.0-test1/kernel/ksyms.c~vfs_intent_2.6.0-test1	2003-09-13 19:08:42.000000000 +0400
++++ linux-2.6.0-test1-alexey/kernel/ksyms.c	2003-09-14 18:13:44.000000000 +0400
+@@ -382,6 +382,7 @@ EXPORT_SYMBOL(unregister_filesystem);
+ EXPORT_SYMBOL(kern_mount);
+ EXPORT_SYMBOL(__mntput);
+ EXPORT_SYMBOL(may_umount);
++EXPORT_SYMBOL(reparent_to_init);
+ 
+ /* executable format registration */
+ EXPORT_SYMBOL(register_binfmt);
+@@ -409,6 +410,12 @@ EXPORT_SYMBOL(proc_doulongvec_minmax);
+ EXPORT_SYMBOL(request_irq);
+ EXPORT_SYMBOL(free_irq);
+ 
++/* lustre */
++EXPORT_SYMBOL(do_kern_mount);
++EXPORT_SYMBOL(exit_files);
++//EXPORT_SYMBOL(kmem_cache_validate);
++
++
+ /* waitqueue handling */
+ EXPORT_SYMBOL(add_wait_queue);
+ EXPORT_SYMBOL(add_wait_queue_exclusive);
+@@ -558,6 +565,7 @@ EXPORT_SYMBOL(sys_tz);
+ EXPORT_SYMBOL(file_fsync);
+ EXPORT_SYMBOL(fsync_buffers_list);
+ EXPORT_SYMBOL(clear_inode);
++EXPORT_SYMBOL(__iget);
+ EXPORT_SYMBOL(init_special_inode);
+ EXPORT_SYMBOL(new_inode);
+ EXPORT_SYMBOL(__insert_inode_hash);
+--- linux-2.6.0-test1/fs/nfs/dir.c~vfs_intent_2.6.0-test1	2003-09-13 19:08:34.000000000 +0400
++++ linux-2.6.0-test1-alexey/fs/nfs/dir.c	2003-09-14 18:13:44.000000000 +0400
+@@ -652,7 +652,7 @@ int nfs_is_exclusive_create(struct inode
+ 		return 0;
+ 	if (!nd || (nd->flags & LOOKUP_CONTINUE) || !(nd->flags & LOOKUP_CREATE))
+ 		return 0;
+-	return (nd->intent.open.flags & O_EXCL) != 0;
++	return (nd->intent.it_flags & O_EXCL) != 0;
+ }
+ 
+ static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd)
+@@ -825,7 +825,7 @@ static int nfs_create(struct inode *dir,
+ 	attr.ia_valid = ATTR_MODE;
+ 
+ 	if (nd && (nd->flags & LOOKUP_CREATE))
+-		open_flags = nd->intent.open.flags;
++		open_flags = nd->intent.it_flags;
+ 
+ 	/*
+ 	 * The 0 argument passed into the create function should one day
+
+_
diff --git a/lustre/kernel_patches/patches/vfs_intent_2.6.0-test6.patch b/lustre/kernel_patches/patches/vfs_intent_2.6.0-test6.patch
new file mode 100644
index 0000000..6742227
--- /dev/null
+++ b/lustre/kernel_patches/patches/vfs_intent_2.6.0-test6.patch
@@ -0,0 +1,754 @@
+ fs/exec.c              |   18 +++++++---
+ fs/namei.c             |   86 +++++++++++++++++++++++++++++++++++++++++++++----
+ fs/namespace.c         |    2 +
+ fs/nfs/dir.c           |    4 +-
+ fs/open.c              |   62 +++++++++++++++++++++++------------
+ fs/stat.c              |   24 ++++++++++---
+ include/linux/dcache.h |    3 +
+ include/linux/fs.h     |    8 ++++
+ include/linux/namei.h  |   56 ++++++++++++++++++++++++++-----
+ kernel/ksyms.c         |    8 ++++
+ 10 files changed, 222 insertions(+), 49 deletions(-)
+
+Index: linux-2.6.0-test6/fs/exec.c
+===================================================================
+--- linux-2.6.0-test6.orig/fs/exec.c	2003-10-07 15:14:14.000000000 +0800
++++ linux-2.6.0-test6/fs/exec.c	2003-10-07 15:33:15.000000000 +0800
+@@ -120,8 +120,11 @@
+ 	struct file * file;
+ 	struct nameidata nd;
+ 	int error;
++	intent_init(&nd.intent, IT_OPEN);
+ 
+-	nd.intent.open.flags = O_RDONLY;
++	error = user_path_walk_it(library, &nd);
++
++	nd.intent.it_flags = O_RDONLY;
+ 	error = __user_walk(library, LOOKUP_FOLLOW|LOOKUP_OPEN, &nd);
+ 	if (error)
+ 		goto out;
+@@ -134,7 +137,7 @@
+ 	if (error)
+ 		goto exit;
+ 
+-	file = dentry_open(nd.dentry, nd.mnt, O_RDONLY);
++	file = dentry_open_it(nd.dentry, nd.mnt, O_RDONLY, &nd.intent);
+ 	error = PTR_ERR(file);
+ 	if (IS_ERR(file))
+ 		goto out;
+@@ -471,8 +474,13 @@
+ struct file *open_exec(const char *name)
+ {
+ 	struct nameidata nd;
+-	int err = path_lookup(name, LOOKUP_FOLLOW, &nd);
+-	struct file *file = ERR_PTR(err);
++	int err;
++	struct file *file;
++
++	intent_init(&nd.intent, IT_OPEN);
++	nd.intent.it_flags = O_RDONLY;
++	err = path_lookup(name, LOOKUP_FOLLOW, &nd);
++	file = ERR_PTR(err);
+ 
+ 	if (!err) {
+ 		struct inode *inode = nd.dentry->d_inode;
+@@ -484,7 +492,7 @@
+ 				err = -EACCES;
+ 			file = ERR_PTR(err);
+ 			if (!err) {
+-				file = dentry_open(nd.dentry, nd.mnt, O_RDONLY);
++				file = dentry_open_it(nd.dentry, nd.mnt, O_RDONLY, &nd.intent);
+ 				if (!IS_ERR(file)) {
+ 					err = deny_write_access(file);
+ 					if (err) {
+Index: linux-2.6.0-test6/fs/namei.c
+===================================================================
+--- linux-2.6.0-test6.orig/fs/namei.c	2003-10-07 15:14:14.000000000 +0800
++++ linux-2.6.0-test6/fs/namei.c	2003-10-07 15:33:15.000000000 +0800
+@@ -264,8 +264,19 @@
+ 	return 0;
+ }
+ 
++void intent_release(struct lookup_intent *it)
++{
++	if (!it)
++		return;
++	if (it->it_magic != INTENT_MAGIC)
++		return;
++	if (it->it_op_release)
++		it->it_op_release(it);
++}
++
+ void path_release(struct nameidata *nd)
+ {
++	intent_release(&nd->intent);
+ 	dput(nd->dentry);
+ 	mntput(nd->mnt);
+ }
+@@ -342,7 +353,10 @@
+ {
+ 	struct dentry * result;
+ 	struct inode *dir = parent->d_inode;
++	int counter = 0;
+ 
++again:
++	counter++;
+ 	down(&dir->i_sem);
+ 	/*
+ 	 * First re-do the cached lookup just in case it was created
+@@ -381,7 +395,10 @@
+ 	if (result->d_op && result->d_op->d_revalidate) {
+ 		if (!result->d_op->d_revalidate(result, nd) && !d_invalidate(result)) {
+ 			dput(result);
+-			result = ERR_PTR(-ENOENT);
++			if (counter > 10)
++				result = ERR_PTR(-ESTALE);
++			if (!IS_ERR(result))
++				goto again;
+ 		}
+ 	}
+ 	return result;
+@@ -556,6 +573,31 @@
+ 	return PTR_ERR(dentry);
+ }
+ 
++static int revalidate_special(struct nameidata *nd)
++{
++	struct dentry *dentry = nd->dentry;
++	int err, counter = 0;
++
++	if (!dentry->d_op || !dentry->d_op->d_revalidate)
++		return 0;
++ revalidate_again:
++	if (!dentry->d_op->d_revalidate(dentry, nd)) {
++		struct dentry *new;
++		if ((err = permission(dentry->d_parent->d_inode, MAY_EXEC,nd)))
++			return err;
++		new = real_lookup(dentry->d_parent, &dentry->d_name, nd);
++		d_invalidate(dentry);
++		dput(dentry);
++		dentry = new;
++		counter++;
++		if (counter < 10)
++			goto revalidate_again;
++		printk("excessive revalidate_it loops\n");
++		return -ESTALE;
++	}
++	return 0;
++}
++
+ /*
+  * Name resolution.
+  *
+@@ -656,7 +698,9 @@
+ 
+ 		if (inode->i_op->follow_link) {
+ 			mntget(next.mnt);
++			nd->flags |= LOOKUP_LINK_NOTLAST;
+ 			err = do_follow_link(next.dentry, nd);
++			nd->flags &= ~LOOKUP_LINK_NOTLAST;
+ 			dput(next.dentry);
+ 			mntput(next.mnt);
+ 			if (err)
+@@ -695,6 +739,11 @@
+ 				inode = nd->dentry->d_inode;
+ 				/* fallthrough */
+ 			case 1:
++ 				nd->flags |= LOOKUP_LAST;
++ 				err = revalidate_special(nd);
++ 				nd->flags &= ~LOOKUP_LAST;
++ 				if (err)
++ 					break;
+ 				goto return_reval;
+ 		}
+ 		if (nd->dentry->d_op && nd->dentry->d_op->d_hash) {
+@@ -702,7 +751,9 @@
+ 			if (err < 0)
+ 				break;
+ 		}
++		nd->flags |= LOOKUP_LAST;
+ 		err = do_lookup(nd, &this, &next);
++		nd->flags &= ~LOOKUP_LAST;
+ 		if (err)
+ 			break;
+ 		follow_mount(&next.mnt, &next.dentry);
+@@ -928,7 +979,7 @@
+ }
+ 
+ /* SMP-safe */
+-struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
++struct dentry * lookup_one_len_it(const char * name, struct dentry * base, int len, struct nameidata *nd)
+ {
+ 	unsigned long hash;
+ 	struct qstr this;
+@@ -948,11 +999,16 @@
+ 	}
+ 	this.hash = end_name_hash(hash);
+ 
+-	return lookup_hash(&this, base);
++	return __lookup_hash(&this, base, nd);
+ access:
+ 	return ERR_PTR(-EACCES);
+ }
+ 
++struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
++{
++	return lookup_one_len_it(name, base, len, NULL);
++}
++
+ /*
+  *	namei()
+  *
+@@ -964,11 +1020,12 @@
+  * that namei follows links, while lnamei does not.
+  * SMP-safe
+  */
+-int __user_walk(const char __user *name, unsigned flags, struct nameidata *nd)
++int __user_walk_it(const char __user *name, unsigned flags, struct nameidata *nd)
+ {
+ 	char *tmp = getname(name);
+ 	int err = PTR_ERR(tmp);
+ 
++
+ 	if (!IS_ERR(tmp)) {
+ 		err = path_lookup(tmp, flags, nd);
+ 		putname(tmp);
+@@ -976,6 +1033,12 @@
+ 	return err;
+ }
+ 
++int __user_walk(const char __user *name, unsigned flags, struct nameidata *nd)
++{
++	intent_init(&nd->intent, IT_LOOKUP);
++	return __user_walk_it(name, flags, nd);
++}
++
+ /*
+  * It's inline, so penalty for filesystems that don't use sticky bit is
+  * minimal.
+@@ -1248,8 +1311,8 @@
+ 		acc_mode |= MAY_APPEND;
+ 
+ 	/* Fill in the open() intent data */
+-	nd->intent.open.flags = flag;
+-	nd->intent.open.create_mode = mode;
++	nd->intent.it_flags = flag;
++	nd->intent.it_create_mode = mode;
+ 
+ 	/*
+ 	 * The simplest case - just a plain lookup.
+@@ -1265,6 +1328,7 @@
+ 	/*
+ 	 * Create - we need to know the parent.
+ 	 */
++	nd->intent.it_op |= IT_CREAT;
+ 	error = path_lookup(pathname, LOOKUP_PARENT|LOOKUP_OPEN|LOOKUP_CREATE, nd);
+ 	if (error)
+ 		return error;
+@@ -1281,7 +1345,9 @@
+ 	dir = nd->dentry;
+ 	nd->flags &= ~LOOKUP_PARENT;
+ 	down(&dir->d_inode->i_sem);
++	nd->flags |= LOOKUP_LAST;
+ 	dentry = __lookup_hash(&nd->last, nd->dentry, nd);
++	nd->flags &= ~LOOKUP_LAST;
+ 
+ do_last:
+ 	error = PTR_ERR(dentry);
+@@ -1386,7 +1452,9 @@
+ 	}
+ 	dir = nd->dentry;
+ 	down(&dir->d_inode->i_sem);
++	nd->flags |= LOOKUP_LAST;
+ 	dentry = __lookup_hash(&nd->last, nd->dentry, nd);
++	nd->flags &= ~LOOKUP_LAST;
+ 	putname(nd->last.name);
+ 	goto do_last;
+ }
+@@ -2148,7 +2216,9 @@
+ __vfs_follow_link(struct nameidata *nd, const char *link)
+ {
+ 	int res = 0;
++	struct lookup_intent it = nd->intent;
+ 	char *name;
++
+ 	if (IS_ERR(link))
+ 		goto fail;
+ 
+@@ -2158,6 +2228,10 @@
+ 			/* weird __emul_prefix() stuff did it */
+ 			goto out;
+ 	}
++
++	intent_init(&nd->intent, it.it_op);
++	nd->intent.it_flags = it.it_flags;
++	nd->intent.it_create_mode = it.it_create_mode;
+ 	res = link_path_walk(link, nd);
+ out:
+ 	if (current->link_count || res || nd->last_type!=LAST_NORM)
+Index: linux-2.6.0-test6/fs/namespace.c
+===================================================================
+--- linux-2.6.0-test6.orig/fs/namespace.c	2003-09-28 08:50:31.000000000 +0800
++++ linux-2.6.0-test6/fs/namespace.c	2003-10-07 15:33:15.000000000 +0800
+@@ -738,6 +738,7 @@
+ 	int retval = 0;
+ 	int mnt_flags = 0;
+ 
++	intent_init(&nd.intent, IT_LOOKUP);
+ 	/* Discard magic */
+ 	if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
+ 		flags &= ~MS_MGC_MSK;
+@@ -947,6 +948,7 @@
+ 		mntput(old_pwdmnt);
+ 	}
+ }
++EXPORT_SYMBOL(set_fs_pwd);
+ 
+ static void chroot_fs_refs(struct nameidata *old_nd, struct nameidata *new_nd)
+ {
+Index: linux-2.6.0-test6/fs/open.c
+===================================================================
+--- linux-2.6.0-test6.orig/fs/open.c	2003-10-07 15:14:14.000000000 +0800
++++ linux-2.6.0-test6/fs/open.c	2003-10-07 15:33:15.000000000 +0800
+@@ -202,7 +202,7 @@
+ 	struct nameidata nd;
+ 	struct inode * inode;
+ 	int error;
+-
++	intent_init(&nd.intent, IT_GETATTR);
+ 	error = -EINVAL;
+ 	if (length < 0)	/* sorry, but loff_t says... */
+ 		goto out;
+@@ -461,6 +461,7 @@
+ 	int old_fsuid, old_fsgid;
+ 	kernel_cap_t old_cap;
+ 	int res;
++	intent_init(&nd.intent, IT_GETATTR);
+ 
+ 	if (mode & ~S_IRWXO)	/* where's F_OK, X_OK, W_OK, R_OK? */
+ 		return -EINVAL;
+@@ -492,6 +493,7 @@
+ 		if(!res && (mode & S_IWOTH) && IS_RDONLY(nd.dentry->d_inode)
+ 		   && !special_file(nd.dentry->d_inode->i_mode))
+ 			res = -EROFS;
++
+ 		path_release(&nd);
+ 	}
+ 
+@@ -506,6 +508,7 @@
+ {
+ 	struct nameidata nd;
+ 	int error;
++	intent_init(&nd.intent, IT_GETATTR);
+ 
+ 	error = __user_walk(filename, LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &nd);
+ 	if (error)
+@@ -557,6 +560,7 @@
+ {
+ 	struct nameidata nd;
+ 	int error;
++	intent_init(&nd.intent, IT_GETATTR);
+ 
+ 	error = __user_walk(filename, LOOKUP_FOLLOW | LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd);
+ 	if (error)
+@@ -629,7 +633,7 @@
+ 	error = -EROFS;
+ 	if (IS_RDONLY(inode))
+ 		goto dput_and_out;
+-
++	
+ 	error = -EPERM;
+ 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
+ 		goto dput_and_out;
+@@ -737,25 +741,8 @@
+  * for the internal routines (ie open_namei()/follow_link() etc). 00 is
+  * used by symlinks.
+  */
+-struct file *filp_open(const char * filename, int flags, int mode)
+-{
+-	int namei_flags, error;
+-	struct nameidata nd;
+-
+-	namei_flags = flags;
+-	if ((namei_flags+1) & O_ACCMODE)
+-		namei_flags++;
+-	if (namei_flags & O_TRUNC)
+-		namei_flags |= 2;
+-
+-	error = open_namei(filename, namei_flags, mode, &nd);
+-	if (!error)
+-		return dentry_open(nd.dentry, nd.mnt, flags);
+-
+-	return ERR_PTR(error);
+-}
+-
+-struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
++struct file *dentry_open_it(struct dentry *dentry, struct vfsmount *mnt, int flags,
++			    struct lookup_intent *it)
+ {
+ 	struct file * f;
+ 	struct inode *inode;
+@@ -767,6 +754,7 @@
+ 		goto cleanup_dentry;
+ 	f->f_flags = flags;
+ 	f->f_mode = (flags+1) & O_ACCMODE;
++	f->f_it = it;
+ 	inode = dentry->d_inode;
+ 	if (f->f_mode & FMODE_WRITE) {
+ 		error = get_write_access(inode);
+@@ -786,6 +774,7 @@
+ 		error = f->f_op->open(inode,f);
+ 		if (error)
+ 			goto cleanup_all;
++		intent_release(it);
+ 	}
+ 	f->f_flags &= ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC);
+ 
+@@ -810,11 +799,42 @@
+ cleanup_file:
+ 	put_filp(f);
+ cleanup_dentry:
++	intent_release(it);
+ 	dput(dentry);
+ 	mntput(mnt);
+ 	return ERR_PTR(error);
+ }
+ 
++struct file *filp_open(const char * filename, int flags, int mode)
++{
++	int namei_flags, error;
++	struct file * temp_filp;
++	struct nameidata nd;
++	intent_init(&nd.intent, IT_OPEN);
++
++	namei_flags = flags;
++	if ((namei_flags+1) & O_ACCMODE)
++		namei_flags++;
++	if (namei_flags & O_TRUNC)
++		namei_flags |= 2;
++
++	error = open_namei(filename, namei_flags, mode, &nd);
++	if (!error) {
++		temp_filp = dentry_open_it(nd.dentry, nd.mnt, flags, &nd.intent);
++		return temp_filp;
++	}	
++	return ERR_PTR(error);
++}
++
++
++struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
++{
++	struct lookup_intent it;
++	intent_init(&it, IT_LOOKUP);
++
++	return dentry_open_it(dentry, mnt, flags, &it);
++}
++
+ /*
+  * Find an empty file descriptor entry, and mark it busy.
+  */
+Index: linux-2.6.0-test6/fs/stat.c
+===================================================================
+--- linux-2.6.0-test6.orig/fs/stat.c	2003-09-28 08:50:10.000000000 +0800
++++ linux-2.6.0-test6/fs/stat.c	2003-10-07 15:33:15.000000000 +0800
+@@ -33,7 +33,7 @@
+ 	stat->blksize = inode->i_blksize;
+ }
+ 
+-int vfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
++int vfs_getattr_it(struct vfsmount *mnt, struct dentry *dentry, struct lookup_intent *it, struct kstat *stat)
+ {
+ 	struct inode *inode = dentry->d_inode;
+ 	int retval;
+@@ -44,6 +44,8 @@
+ 
+ 	if (inode->i_op->getattr)
+ 		return inode->i_op->getattr(mnt, dentry, stat);
++	if (inode->i_op->getattr_it)
++		return inode->i_op->getattr_it(mnt, dentry, it, stat);
+ 
+ 	generic_fillattr(inode, stat);
+ 	if (!stat->blksize) {
+@@ -56,14 +58,20 @@
+ 	return 0;
+ }
+ 
++int vfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
++{
++	return vfs_getattr_it(mnt, dentry, NULL, stat);
++}
++
+ int vfs_stat(char __user *name, struct kstat *stat)
+ {
+ 	struct nameidata nd;
+ 	int error;
++	intent_init(&nd.intent, IT_GETATTR);
+ 
+-	error = user_path_walk(name, &nd);
++	error = user_path_walk_it(name, &nd);
+ 	if (!error) {
+-		error = vfs_getattr(nd.mnt, nd.dentry, stat);
++		error = vfs_getattr_it(nd.mnt, nd.dentry, &nd.intent, stat);
+ 		path_release(&nd);
+ 	}
+ 	return error;
+@@ -73,10 +81,11 @@
+ {
+ 	struct nameidata nd;
+ 	int error;
++	intent_init(&nd.intent, IT_GETATTR);
+ 
+-	error = user_path_walk_link(name, &nd);
++	error = user_path_walk_link_it(name, &nd);
+ 	if (!error) {
+-		error = vfs_getattr(nd.mnt, nd.dentry, stat);
++		error = vfs_getattr_it(nd.mnt, nd.dentry, &nd.intent, stat);
+ 		path_release(&nd);
+ 	}
+ 	return error;
+@@ -86,9 +95,12 @@
+ {
+ 	struct file *f = fget(fd);
+ 	int error = -EBADF;
++	struct nameidata nd;
++	intent_init(&nd.intent, IT_GETATTR);
+ 
+ 	if (f) {
+-		error = vfs_getattr(f->f_vfsmnt, f->f_dentry, stat);
++		error = vfs_getattr_it(f->f_vfsmnt, f->f_dentry, &nd.intent, stat);
++		intent_release(&nd.intent);
+ 		fput(f);
+ 	}
+ 	return error;
+Index: linux-2.6.0-test6/include/linux/dcache.h
+===================================================================
+--- linux-2.6.0-test6.orig/include/linux/dcache.h	2003-09-28 08:51:16.000000000 +0800
++++ linux-2.6.0-test6/include/linux/dcache.h	2003-10-07 15:33:15.000000000 +0800
+@@ -4,6 +4,7 @@
+ #ifdef __KERNEL__
+ 
+ #include <asm/atomic.h>
++#include <linux/string.h>
+ #include <linux/list.h>
+ #include <linux/spinlock.h>
+ #include <linux/cache.h>
+@@ -35,6 +36,8 @@
+ 	char name_str[0];
+ };
+ 
++#include <linux/namei.h>
++
+ struct dentry_stat_t {
+ 	int nr_dentry;
+ 	int nr_unused;
+Index: linux-2.6.0-test6/include/linux/fs.h
+===================================================================
+--- linux-2.6.0-test6.orig/include/linux/fs.h	2003-10-07 15:14:15.000000000 +0800
++++ linux-2.6.0-test6/include/linux/fs.h	2003-10-07 15:34:10.000000000 +0800
+@@ -243,6 +243,8 @@
+ #define ATTR_ATTR_FLAG	1024
+ #define ATTR_KILL_SUID	2048
+ #define ATTR_KILL_SGID	4096
++#define ATTR_RAW       	8192    /* file system, not vfs will massage attrs */
++#define ATTR_FROM_OPEN 	16384    /* called from open path, ie O_TRUNC */
+ 
+ /*
+  * This is the Inode Attributes structure, used for notify_change().  It
+@@ -402,6 +404,7 @@
+ 	struct block_device	*i_bdev;
+ 	struct cdev		*i_cdev;
+ 	int			i_cindex;
++	void			*i_filterdata;
+ 
+ 	unsigned long		i_dnotify_mask; /* Directory notify events */
+ 	struct dnotify_struct	*i_dnotify; /* for directory notifications */
+@@ -530,6 +533,7 @@
+ 	struct list_head	f_ep_links;
+ 	spinlock_t		f_ep_lock;
+ 	struct address_space	*f_mapping;
++ 	struct lookup_intent    *f_it;
+ };
+ extern spinlock_t files_lock;
+ #define file_list_lock() spin_lock(&files_lock);
+@@ -839,7 +843,9 @@
+ 	void (*truncate) (struct inode *);
+ 	int (*permission) (struct inode *, int, struct nameidata *);
+ 	int (*setattr) (struct dentry *, struct iattr *);
++	int (*setattr_raw) (struct inode *, struct iattr *);
+ 	int (*getattr) (struct vfsmount *mnt, struct dentry *, struct kstat *);
++	int (*getattr_it) (struct vfsmount *, struct dentry *, struct lookup_intent *, struct kstat *);
+ 	int (*setxattr) (struct dentry *, const char *,const void *,size_t,int);
+ 	ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
+ 	ssize_t (*listxattr) (struct dentry *, char *, size_t);
+@@ -1052,6 +1058,7 @@
+ extern int unregister_filesystem(struct file_system_type *);
+ extern struct vfsmount *kern_mount(struct file_system_type *);
+ extern int may_umount(struct vfsmount *);
++struct vfsmount *do_kern_mount(const char *type, int flags, const char *name, void *data);
+ extern long do_mount(char *, char *, char *, unsigned long, void *);
+ 
+ extern int vfs_statfs(struct super_block *, struct kstatfs *);
+@@ -1119,6 +1126,7 @@
+ 
+ extern struct file *filp_open(const char *, int, int);
+ extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
++extern struct file * dentry_open_it(struct dentry *, struct vfsmount *, int, struct lookup_intent *);
+ extern int filp_close(struct file *, fl_owner_t id);
+ extern char * getname(const char __user *);
+ 
+Index: linux-2.6.0-test6/include/linux/namei.h
+===================================================================
+--- linux-2.6.0-test6.orig/include/linux/namei.h	2003-09-28 08:50:15.000000000 +0800
++++ linux-2.6.0-test6/include/linux/namei.h	2003-10-07 15:33:15.000000000 +0800
+@@ -2,25 +2,55 @@
+ #define _LINUX_NAMEI_H
+ 
+ #include <linux/linkage.h>
++#include <linux/string.h>
+ 
+ struct vfsmount;
++struct nameidata;
+ 
+-struct open_intent {
+-	int	flags;
+-	int	create_mode;
++/* intent opcodes */
++#define IT_OPEN     (1)
++#define IT_CREAT    (1<<1)
++#define IT_READDIR  (1<<2)
++#define IT_GETATTR  (1<<3)
++#define IT_LOOKUP   (1<<4)
++#define IT_UNLINK   (1<<5)
++#define IT_TRUNC    (1<<6)
++#define IT_GETXATTR (1<<7)
++
++struct lustre_intent_data {
++	int       it_disposition;
++	int       it_status;
++	__u64     it_lock_handle;
++	void     *it_data;
++	int       it_lock_mode;
+ };
+ 
++#define INTENT_MAGIC 0x19620323
++struct lookup_intent {
++	int     it_magic;
++	void    (*it_op_release)(struct lookup_intent *);
++	int     it_op;
++	int	it_flags;
++	int	it_create_mode;
++	union {
++		struct lustre_intent_data lustre;
++	} d;
++};
++
++static inline void intent_init(struct lookup_intent *it, int op)
++{
++	memset(it, 0, sizeof(*it));
++	it->it_magic = INTENT_MAGIC;
++	it->it_op = op;
++}
++
+ struct nameidata {
+ 	struct dentry	*dentry;
+ 	struct vfsmount *mnt;
+ 	struct qstr	last;
+ 	unsigned int	flags;
+ 	int		last_type;
+-
+-	/* Intent data */
+-	union {
+-		struct open_intent open;
+-	} intent;
++	struct lookup_intent intent;
+ };
+ 
+ /*
+@@ -41,6 +71,9 @@
+ #define LOOKUP_CONTINUE		 4
+ #define LOOKUP_PARENT		16
+ #define LOOKUP_NOALT		32
++#define LOOKUP_LAST		 (1<<6)
++#define LOOKUP_LINK_NOTLAST	 (1<<7)
++
+ /*
+  * Intent data
+  */
+@@ -49,6 +82,12 @@
+ #define LOOKUP_ACCESS		(0x0400)
+ 
+ extern int FASTCALL(__user_walk(const char __user *, unsigned, struct nameidata *));
++extern int FASTCALL(__user_walk_it(const char __user *name, unsigned flags, struct nameidata *nd));
++#define user_path_walk_it(name,nd) \
++	__user_walk_it(name, LOOKUP_FOLLOW, nd)
++#define user_path_walk_link_it(name,nd) \
++	__user_walk_it(name, 0, nd)
++extern void intent_release(struct lookup_intent *);
+ #define user_path_walk(name,nd) \
+ 	__user_walk(name, LOOKUP_FOLLOW, nd)
+ #define user_path_walk_link(name,nd) \
+@@ -60,7 +99,6 @@
+ 
+ extern struct dentry * lookup_one_len(const char *, struct dentry *, int);
+ extern struct dentry * lookup_hash(struct qstr *, struct dentry *);
+-
+ extern int follow_down(struct vfsmount **, struct dentry **);
+ extern int follow_up(struct vfsmount **, struct dentry **);
+ 
+Index: linux-2.6.0-test6/kernel/ksyms.c
+===================================================================
+--- linux-2.6.0-test6.orig/kernel/ksyms.c	2003-10-07 15:21:57.000000000 +0800
++++ linux-2.6.0-test6/kernel/ksyms.c	2003-10-07 15:33:15.000000000 +0800
+@@ -220,11 +220,18 @@
+ EXPORT_SYMBOL(unregister_filesystem);
+ EXPORT_SYMBOL(__mntput);
+ EXPORT_SYMBOL(may_umount);
++EXPORT_SYMBOL(reparent_to_init);
+ 
+ /* interrupt handling */
+ EXPORT_SYMBOL(request_irq);
+ EXPORT_SYMBOL(free_irq);
+ 
++/* lustre */
++EXPORT_SYMBOL(do_kern_mount);
++EXPORT_SYMBOL(exit_files);
++//EXPORT_SYMBOL(kmem_cache_validate);
++
++
+ /* waitqueue handling */
+ EXPORT_SYMBOL(add_wait_queue);
+ EXPORT_SYMBOL(add_wait_queue_exclusive);
+Index: linux-2.6.0-test6/fs/nfs/dir.c
+===================================================================
+--- linux-2.6.0-test6.orig/fs/nfs/dir.c	2003-09-28 08:50:20.000000000 +0800
++++ linux-2.6.0-test6/fs/nfs/dir.c	2003-10-07 15:33:15.000000000 +0800
+@@ -652,7 +652,7 @@
+ 		return 0;
+ 	if (!nd || (nd->flags & LOOKUP_CONTINUE) || !(nd->flags & LOOKUP_CREATE))
+ 		return 0;
+-	return (nd->intent.open.flags & O_EXCL) != 0;
++	return (nd->intent.it_flags & O_EXCL) != 0;
+ }
+ 
+ static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd)
+@@ -825,7 +825,7 @@
+ 	attr.ia_valid = ATTR_MODE;
+ 
+ 	if (nd && (nd->flags & LOOKUP_CREATE))
+-		open_flags = nd->intent.open.flags;
++		open_flags = nd->intent.it_flags;
+ 
+ 	/*
+ 	 * The 0 argument passed into the create function should one day
+Index: linux-2.6.0-test6/fs/inode.c
+===================================================================
+--- linux-2.6.0-test6.orig/fs/inode.c	2003-10-07 15:14:14.000000000 +0800
++++ linux-2.6.0-test6/fs/inode.c	2003-10-07 15:38:08.000000000 +0800
+@@ -224,6 +224,7 @@
+ 	inodes_stat.nr_unused--;
+ }
+ 
++EXPORT_SYMBOL(__iget);
+ /**
+  * clear_inode - clear an inode
+  * @inode: inode to clear
diff --git a/lustre/kernel_patches/patches/vfs_intent_2.6.0.patch b/lustre/kernel_patches/patches/vfs_intent_2.6.0.patch
new file mode 100644
index 0000000..7514caa
--- /dev/null
+++ b/lustre/kernel_patches/patches/vfs_intent_2.6.0.patch
@@ -0,0 +1,762 @@
+ fs/exec.c              |   18 +++++++---
+ fs/namei.c             |   86 +++++++++++++++++++++++++++++++++++++++++++++----
+ fs/namespace.c         |    2 +
+ fs/nfs/dir.c           |    4 +-
+ fs/open.c              |   62 +++++++++++++++++++++++------------
+ fs/stat.c              |   24 ++++++++++---
+ include/linux/dcache.h |    3 +
+ include/linux/fs.h     |    8 ++++
+ include/linux/namei.h  |   56 ++++++++++++++++++++++++++-----
+ kernel/ksyms.c         |    8 ++++
+ 10 files changed, 222 insertions(+), 49 deletions(-)
+
+Index: linux-2.6.0/fs/exec.c
+===================================================================
+--- linux-2.6.0.orig/fs/exec.c	2004-01-15 02:58:27.000000000 +0300
++++ linux-2.6.0/fs/exec.c	2004-01-15 02:58:33.000000000 +0300
+@@ -120,8 +120,11 @@
+ 	struct file * file;
+ 	struct nameidata nd;
+ 	int error;
++	intent_init(&nd.intent, IT_OPEN);
+ 
+-	nd.intent.open.flags = O_RDONLY;
++	error = user_path_walk_it(library, &nd);
++
++	nd.intent.it_flags = O_RDONLY;
+ 	error = __user_walk(library, LOOKUP_FOLLOW|LOOKUP_OPEN, &nd);
+ 	if (error)
+ 		goto out;
+@@ -134,7 +137,7 @@
+ 	if (error)
+ 		goto exit;
+ 
+-	file = dentry_open(nd.dentry, nd.mnt, O_RDONLY);
++	file = dentry_open_it(nd.dentry, nd.mnt, O_RDONLY, &nd.intent);
+ 	error = PTR_ERR(file);
+ 	if (IS_ERR(file))
+ 		goto out;
+@@ -471,8 +474,13 @@
+ struct file *open_exec(const char *name)
+ {
+ 	struct nameidata nd;
+-	int err = path_lookup(name, LOOKUP_FOLLOW, &nd);
+-	struct file *file = ERR_PTR(err);
++	int err;
++	struct file *file;
++
++	intent_init(&nd.intent, IT_OPEN);
++	nd.intent.it_flags = O_RDONLY;
++	err = path_lookup(name, LOOKUP_FOLLOW, &nd);
++	file = ERR_PTR(err);
+ 
+ 	if (!err) {
+ 		struct inode *inode = nd.dentry->d_inode;
+@@ -484,7 +492,7 @@
+ 				err = -EACCES;
+ 			file = ERR_PTR(err);
+ 			if (!err) {
+-				file = dentry_open(nd.dentry, nd.mnt, O_RDONLY);
++				file = dentry_open_it(nd.dentry, nd.mnt, O_RDONLY, &nd.intent);
+ 				if (!IS_ERR(file)) {
+ 					err = deny_write_access(file);
+ 					if (err) {
+Index: linux-2.6.0/fs/namei.c
+===================================================================
+--- linux-2.6.0.orig/fs/namei.c	2003-12-30 08:32:44.000000000 +0300
++++ linux-2.6.0/fs/namei.c	2004-01-15 02:58:33.000000000 +0300
+@@ -264,8 +264,19 @@
+ 	return 0;
+ }
+ 
++void intent_release(struct lookup_intent *it)
++{
++	if (!it)
++		return;
++	if (it->it_magic != INTENT_MAGIC)
++		return;
++	if (it->it_op_release)
++		it->it_op_release(it);
++}
++
+ void path_release(struct nameidata *nd)
+ {
++	intent_release(&nd->intent);
+ 	dput(nd->dentry);
+ 	mntput(nd->mnt);
+ }
+@@ -342,7 +353,10 @@
+ {
+ 	struct dentry * result;
+ 	struct inode *dir = parent->d_inode;
++	int counter = 0;
+ 
++again:
++	counter++;
+ 	down(&dir->i_sem);
+ 	/*
+ 	 * First re-do the cached lookup just in case it was created
+@@ -381,7 +395,10 @@
+ 	if (result->d_op && result->d_op->d_revalidate) {
+ 		if (!result->d_op->d_revalidate(result, nd) && !d_invalidate(result)) {
+ 			dput(result);
+-			result = ERR_PTR(-ENOENT);
++			if (counter > 10)
++				result = ERR_PTR(-ESTALE);
++			if (!IS_ERR(result))
++				goto again;
+ 		}
+ 	}
+ 	return result;
+@@ -556,6 +573,31 @@
+ 	return PTR_ERR(dentry);
+ }
+ 
++static int revalidate_special(struct nameidata *nd)
++{
++	struct dentry *dentry = nd->dentry;
++	int err, counter = 0;
++
++	if (!dentry->d_op || !dentry->d_op->d_revalidate)
++		return 0;
++ revalidate_again:
++	if (!dentry->d_op->d_revalidate(dentry, nd)) {
++		struct dentry *new;
++		if ((err = permission(dentry->d_parent->d_inode, MAY_EXEC,nd)))
++			return err;
++		new = real_lookup(dentry->d_parent, &dentry->d_name, nd);
++		d_invalidate(dentry);
++		dput(dentry);
++		nd->dentry = dentry = new;
++		counter++;
++		if (counter < 10)
++			goto revalidate_again;
++		printk("excessive revalidate_it loops\n");
++		return -ESTALE;
++	}
++	return 0;
++}
++
+ /*
+  * Name resolution.
+  *
+@@ -656,7 +698,9 @@
+ 
+ 		if (inode->i_op->follow_link) {
+ 			mntget(next.mnt);
++			nd->flags |= LOOKUP_LINK_NOTLAST;
+ 			err = do_follow_link(next.dentry, nd);
++			nd->flags &= ~LOOKUP_LINK_NOTLAST;
+ 			dput(next.dentry);
+ 			mntput(next.mnt);
+ 			if (err)
+@@ -695,6 +739,11 @@
+ 				inode = nd->dentry->d_inode;
+ 				/* fallthrough */
+ 			case 1:
++ 				nd->flags |= LOOKUP_LAST;
++ 				err = revalidate_special(nd);
++ 				nd->flags &= ~LOOKUP_LAST;
++ 				if (err)
++ 					break;
+ 				goto return_reval;
+ 		}
+ 		if (nd->dentry->d_op && nd->dentry->d_op->d_hash) {
+@@ -702,7 +751,9 @@
+ 			if (err < 0)
+ 				break;
+ 		}
++		nd->flags |= LOOKUP_LAST;
+ 		err = do_lookup(nd, &this, &next);
++		nd->flags &= ~LOOKUP_LAST;
+ 		if (err)
+ 			break;
+ 		follow_mount(&next.mnt, &next.dentry);
+@@ -928,7 +979,7 @@
+ }
+ 
+ /* SMP-safe */
+-struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
++struct dentry * lookup_one_len_it(const char * name, struct dentry * base, int len, struct nameidata *nd)
+ {
+ 	unsigned long hash;
+ 	struct qstr this;
+@@ -948,11 +999,16 @@
+ 	}
+ 	this.hash = end_name_hash(hash);
+ 
+-	return lookup_hash(&this, base);
++	return __lookup_hash(&this, base, nd);
+ access:
+ 	return ERR_PTR(-EACCES);
+ }
+ 
++struct dentry * lookup_one_len(const char * name, struct dentry * base, int len)
++{
++	return lookup_one_len_it(name, base, len, NULL);
++}
++
+ /*
+  *	namei()
+  *
+@@ -964,11 +1020,12 @@
+  * that namei follows links, while lnamei does not.
+  * SMP-safe
+  */
+-int __user_walk(const char __user *name, unsigned flags, struct nameidata *nd)
++int __user_walk_it(const char __user *name, unsigned flags, struct nameidata *nd)
+ {
+ 	char *tmp = getname(name);
+ 	int err = PTR_ERR(tmp);
+ 
++
+ 	if (!IS_ERR(tmp)) {
+ 		err = path_lookup(tmp, flags, nd);
+ 		putname(tmp);
+@@ -976,6 +1033,12 @@
+ 	return err;
+ }
+ 
++int __user_walk(const char __user *name, unsigned flags, struct nameidata *nd)
++{
++	intent_init(&nd->intent, IT_LOOKUP);
++	return __user_walk_it(name, flags, nd);
++}
++
+ /*
+  * It's inline, so penalty for filesystems that don't use sticky bit is
+  * minimal.
+@@ -1248,8 +1311,8 @@
+ 		acc_mode |= MAY_APPEND;
+ 
+ 	/* Fill in the open() intent data */
+-	nd->intent.open.flags = flag;
+-	nd->intent.open.create_mode = mode;
++	nd->intent.it_flags = flag;
++	nd->intent.it_create_mode = mode;
+ 
+ 	/*
+ 	 * The simplest case - just a plain lookup.
+@@ -1265,6 +1328,7 @@
+ 	/*
+ 	 * Create - we need to know the parent.
+ 	 */
++	nd->intent.it_op |= IT_CREAT;
+ 	error = path_lookup(pathname, LOOKUP_PARENT|LOOKUP_OPEN|LOOKUP_CREATE, nd);
+ 	if (error)
+ 		return error;
+@@ -1281,7 +1345,9 @@
+ 	dir = nd->dentry;
+ 	nd->flags &= ~LOOKUP_PARENT;
+ 	down(&dir->d_inode->i_sem);
++	nd->flags |= LOOKUP_LAST;
+ 	dentry = __lookup_hash(&nd->last, nd->dentry, nd);
++	nd->flags &= ~LOOKUP_LAST;
+ 
+ do_last:
+ 	error = PTR_ERR(dentry);
+@@ -1386,7 +1452,9 @@
+ 	}
+ 	dir = nd->dentry;
+ 	down(&dir->d_inode->i_sem);
++	nd->flags |= LOOKUP_LAST;
+ 	dentry = __lookup_hash(&nd->last, nd->dentry, nd);
++	nd->flags &= ~LOOKUP_LAST;
+ 	putname(nd->last.name);
+ 	goto do_last;
+ }
+@@ -2148,7 +2216,9 @@
+ __vfs_follow_link(struct nameidata *nd, const char *link)
+ {
+ 	int res = 0;
++	struct lookup_intent it = nd->intent;
+ 	char *name;
++
+ 	if (IS_ERR(link))
+ 		goto fail;
+ 
+@@ -2158,6 +2228,10 @@
+ 			/* weird __emul_prefix() stuff did it */
+ 			goto out;
+ 	}
++
++	intent_init(&nd->intent, it.it_op);
++	nd->intent.it_flags = it.it_flags;
++	nd->intent.it_create_mode = it.it_create_mode;
+ 	res = link_path_walk(link, nd);
+ out:
+ 	if (current->link_count || res || nd->last_type!=LAST_NORM)
+Index: linux-2.6.0/fs/namespace.c
+===================================================================
+--- linux-2.6.0.orig/fs/namespace.c	2004-01-15 02:58:27.000000000 +0300
++++ linux-2.6.0/fs/namespace.c	2004-01-15 02:58:33.000000000 +0300
+@@ -752,6 +752,7 @@
+ 	int retval = 0;
+ 	int mnt_flags = 0;
+ 
++	intent_init(&nd.intent, IT_LOOKUP);
+ 	/* Discard magic */
+ 	if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
+ 		flags &= ~MS_MGC_MSK;
+Index: linux-2.6.0/fs/open.c
+===================================================================
+--- linux-2.6.0.orig/fs/open.c	2004-01-15 02:58:27.000000000 +0300
++++ linux-2.6.0/fs/open.c	2004-01-15 02:58:33.000000000 +0300
+@@ -204,7 +204,7 @@
+ 	struct nameidata nd;
+ 	struct inode * inode;
+ 	int error;
+-
++	intent_init(&nd.intent, IT_GETATTR);
+ 	error = -EINVAL;
+ 	if (length < 0)	/* sorry, but loff_t says... */
+ 		goto out;
+@@ -463,6 +463,7 @@
+ 	int old_fsuid, old_fsgid;
+ 	kernel_cap_t old_cap;
+ 	int res;
++	intent_init(&nd.intent, IT_GETATTR);
+ 
+ 	if (mode & ~S_IRWXO)	/* where's F_OK, X_OK, W_OK, R_OK? */
+ 		return -EINVAL;
+@@ -494,6 +495,7 @@
+ 		if(!res && (mode & S_IWOTH) && IS_RDONLY(nd.dentry->d_inode)
+ 		   && !special_file(nd.dentry->d_inode->i_mode))
+ 			res = -EROFS;
++
+ 		path_release(&nd);
+ 	}
+ 
+@@ -508,6 +510,7 @@
+ {
+ 	struct nameidata nd;
+ 	int error;
++	intent_init(&nd.intent, IT_GETATTR);
+ 
+ 	error = __user_walk(filename, LOOKUP_FOLLOW|LOOKUP_DIRECTORY, &nd);
+ 	if (error)
+@@ -559,6 +562,7 @@
+ {
+ 	struct nameidata nd;
+ 	int error;
++	intent_init(&nd.intent, IT_GETATTR);
+ 
+ 	error = __user_walk(filename, LOOKUP_FOLLOW | LOOKUP_DIRECTORY | LOOKUP_NOALT, &nd);
+ 	if (error)
+@@ -631,7 +635,7 @@
+ 	error = -EROFS;
+ 	if (IS_RDONLY(inode))
+ 		goto dput_and_out;
+-
++	
+ 	error = -EPERM;
+ 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
+ 		goto dput_and_out;
+@@ -739,27 +743,8 @@
+  * for the internal routines (ie open_namei()/follow_link() etc). 00 is
+  * used by symlinks.
+  */
+-struct file *filp_open(const char * filename, int flags, int mode)
+-{
+-	int namei_flags, error;
+-	struct nameidata nd;
+-
+-	namei_flags = flags;
+-	if ((namei_flags+1) & O_ACCMODE)
+-		namei_flags++;
+-	if (namei_flags & O_TRUNC)
+-		namei_flags |= 2;
+-
+-	error = open_namei(filename, namei_flags, mode, &nd);
+-	if (!error)
+-		return dentry_open(nd.dentry, nd.mnt, flags);
+-
+-	return ERR_PTR(error);
+-}
+-
+-EXPORT_SYMBOL(filp_open);
+-
+-struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
++struct file *dentry_open_it(struct dentry *dentry, struct vfsmount *mnt, int flags,
++			    struct lookup_intent *it)
+ {
+ 	struct file * f;
+ 	struct inode *inode;
+@@ -771,6 +756,7 @@
+ 		goto cleanup_dentry;
+ 	f->f_flags = flags;
+ 	f->f_mode = (flags+1) & O_ACCMODE;
++	f->f_it = it;
+ 	inode = dentry->d_inode;
+ 	if (f->f_mode & FMODE_WRITE) {
+ 		error = get_write_access(inode);
+@@ -790,6 +776,7 @@
+ 		error = f->f_op->open(inode,f);
+ 		if (error)
+ 			goto cleanup_all;
++		intent_release(it);
+ 	}
+ 	f->f_flags &= ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC);
+ 
+@@ -814,6 +801,7 @@
+ cleanup_file:
+ 	put_filp(f);
+ cleanup_dentry:
++	intent_release(it);
+ 	dput(dentry);
+ 	mntput(mnt);
+ 	return ERR_PTR(error);
+@@ -821,6 +809,36 @@
+ 
+ EXPORT_SYMBOL(dentry_open);
+ 
++struct file *filp_open(const char * filename, int flags, int mode)
++{
++	int namei_flags, error;
++	struct file * temp_filp;
++	struct nameidata nd;
++	intent_init(&nd.intent, IT_OPEN);
++
++	namei_flags = flags;
++	if ((namei_flags+1) & O_ACCMODE)
++		namei_flags++;
++	if (namei_flags & O_TRUNC)
++		namei_flags |= 2;
++
++	error = open_namei(filename, namei_flags, mode, &nd);
++	if (!error) {
++		temp_filp = dentry_open_it(nd.dentry, nd.mnt, flags, &nd.intent);
++		return temp_filp;
++	}	
++	return ERR_PTR(error);
++}
++
++
++struct file *dentry_open(struct dentry *dentry, struct vfsmount *mnt, int flags)
++{
++	struct lookup_intent it;
++	intent_init(&it, IT_LOOKUP);
++
++	return dentry_open_it(dentry, mnt, flags, &it);
++}
++
+ /*
+  * Find an empty file descriptor entry, and mark it busy.
+  */
+Index: linux-2.6.0/fs/stat.c
+===================================================================
+--- linux-2.6.0.orig/fs/stat.c	2004-01-15 02:58:27.000000000 +0300
++++ linux-2.6.0/fs/stat.c	2004-01-15 02:59:34.000000000 +0300
+@@ -36,7 +36,7 @@
+ 
+ EXPORT_SYMBOL(generic_fillattr);
+ 
+-int vfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
++int vfs_getattr_it(struct vfsmount *mnt, struct dentry *dentry, struct lookup_intent *it, struct kstat *stat)
+ {
+ 	struct inode *inode = dentry->d_inode;
+ 	int retval;
+@@ -45,6 +45,8 @@
+ 	if (retval)
+ 		return retval;
+ 
++	if (inode->i_op->getattr_it)
++		return inode->i_op->getattr_it(mnt, dentry, it, stat);
+ 	if (inode->i_op->getattr)
+ 		return inode->i_op->getattr(mnt, dentry, stat);
+ 
+@@ -61,14 +63,20 @@
+ 
+ EXPORT_SYMBOL(vfs_getattr);
+ 
++int vfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
++{
++	return vfs_getattr_it(mnt, dentry, NULL, stat);
++}
++
+ int vfs_stat(char __user *name, struct kstat *stat)
+ {
+ 	struct nameidata nd;
+ 	int error;
++	intent_init(&nd.intent, IT_GETATTR);
+ 
+-	error = user_path_walk(name, &nd);
++	error = user_path_walk_it(name, &nd);
+ 	if (!error) {
+-		error = vfs_getattr(nd.mnt, nd.dentry, stat);
++		error = vfs_getattr_it(nd.mnt, nd.dentry, &nd.intent, stat);
+ 		path_release(&nd);
+ 	}
+ 	return error;
+@@ -80,10 +88,11 @@
+ {
+ 	struct nameidata nd;
+ 	int error;
++	intent_init(&nd.intent, IT_GETATTR);
+ 
+-	error = user_path_walk_link(name, &nd);
++	error = user_path_walk_link_it(name, &nd);
+ 	if (!error) {
+-		error = vfs_getattr(nd.mnt, nd.dentry, stat);
++		error = vfs_getattr_it(nd.mnt, nd.dentry, &nd.intent, stat);
+ 		path_release(&nd);
+ 	}
+ 	return error;
+@@ -95,9 +104,12 @@
+ {
+ 	struct file *f = fget(fd);
+ 	int error = -EBADF;
++	struct nameidata nd;
++	intent_init(&nd.intent, IT_GETATTR);
+ 
+ 	if (f) {
+-		error = vfs_getattr(f->f_vfsmnt, f->f_dentry, stat);
++		error = vfs_getattr_it(f->f_vfsmnt, f->f_dentry, &nd.intent, stat);
++		intent_release(&nd.intent);
+ 		fput(f);
+ 	}
+ 	return error;
+Index: linux-2.6.0/fs/nfs/dir.c
+===================================================================
+--- linux-2.6.0.orig/fs/nfs/dir.c	2003-12-30 08:32:44.000000000 +0300
++++ linux-2.6.0/fs/nfs/dir.c	2004-01-15 02:58:33.000000000 +0300
+@@ -652,7 +652,7 @@
+ 		return 0;
+ 	if (!nd || (nd->flags & LOOKUP_CONTINUE) || !(nd->flags & LOOKUP_CREATE))
+ 		return 0;
+-	return (nd->intent.open.flags & O_EXCL) != 0;
++	return (nd->intent.it_flags & O_EXCL) != 0;
+ }
+ 
+ static struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *nd)
+@@ -827,7 +827,7 @@
+ 	attr.ia_valid = ATTR_MODE;
+ 
+ 	if (nd && (nd->flags & LOOKUP_CREATE))
+-		open_flags = nd->intent.open.flags;
++		open_flags = nd->intent.it_flags;
+ 
+ 	/*
+ 	 * The 0 argument passed into the create function should one day
+Index: linux-2.6.0/fs/inode.c
+===================================================================
+--- linux-2.6.0.orig/fs/inode.c	2004-01-15 02:58:27.000000000 +0300
++++ linux-2.6.0/fs/inode.c	2004-01-15 02:58:33.000000000 +0300
+@@ -224,6 +224,7 @@
+ 	inodes_stat.nr_unused--;
+ }
+ 
++EXPORT_SYMBOL(__iget);
+ /**
+  * clear_inode - clear an inode
+  * @inode: inode to clear
+Index: linux-2.6.0/fs/super.c
+===================================================================
+--- linux-2.6.0.orig/fs/super.c	2004-01-15 02:58:27.000000000 +0300
++++ linux-2.6.0/fs/super.c	2004-01-15 02:58:33.000000000 +0300
+@@ -740,6 +740,8 @@
+ 	return (struct vfsmount *)sb;
+ }
+ 
++EXPORT_SYMBOL(do_kern_mount);
++
+ struct vfsmount *kern_mount(struct file_system_type *type)
+ {
+ 	return do_kern_mount(type->name, 0, type->name, NULL);
+Index: linux-2.6.0/include/linux/dcache.h
+===================================================================
+--- linux-2.6.0.orig/include/linux/dcache.h	2003-09-19 18:01:10.000000000 +0400
++++ linux-2.6.0/include/linux/dcache.h	2004-01-15 02:58:33.000000000 +0300
+@@ -4,6 +4,7 @@
+ #ifdef __KERNEL__
+ 
+ #include <asm/atomic.h>
++#include <linux/string.h>
+ #include <linux/list.h>
+ #include <linux/spinlock.h>
+ #include <linux/cache.h>
+@@ -35,6 +36,8 @@
+ 	char name_str[0];
+ };
+ 
++#include <linux/namei.h>
++
+ struct dentry_stat_t {
+ 	int nr_dentry;
+ 	int nr_unused;
+Index: linux-2.6.0/include/linux/fs.h
+===================================================================
+--- linux-2.6.0.orig/include/linux/fs.h	2004-01-15 02:58:27.000000000 +0300
++++ linux-2.6.0/include/linux/fs.h	2004-01-15 02:58:33.000000000 +0300
+@@ -243,6 +243,8 @@
+ #define ATTR_ATTR_FLAG	1024
+ #define ATTR_KILL_SUID	2048
+ #define ATTR_KILL_SGID	4096
++#define ATTR_RAW       	8192    /* file system, not vfs will massage attrs */
++#define ATTR_FROM_OPEN 	16384    /* called from open path, ie O_TRUNC */
+ 
+ /*
+  * This is the Inode Attributes structure, used for notify_change().  It
+@@ -403,6 +405,7 @@
+ 	struct block_device	*i_bdev;
+ 	struct cdev		*i_cdev;
+ 	int			i_cindex;
++	void			*i_filterdata;
+ 
+ 	unsigned long		i_dnotify_mask; /* Directory notify events */
+ 	struct dnotify_struct	*i_dnotify; /* for directory notifications */
+@@ -533,6 +536,7 @@
+ 	spinlock_t		f_ep_lock;
+ #endif /* #ifdef CONFIG_EPOLL */
+ 	struct address_space	*f_mapping;
++ 	struct lookup_intent    *f_it;
+ };
+ extern spinlock_t files_lock;
+ #define file_list_lock() spin_lock(&files_lock);
+@@ -844,7 +848,9 @@
+ 	void (*truncate) (struct inode *);
+ 	int (*permission) (struct inode *, int, struct nameidata *);
+ 	int (*setattr) (struct dentry *, struct iattr *);
++	int (*setattr_raw) (struct inode *, struct iattr *);
+ 	int (*getattr) (struct vfsmount *mnt, struct dentry *, struct kstat *);
++	int (*getattr_it) (struct vfsmount *, struct dentry *, struct lookup_intent *, struct kstat *);
+ 	int (*setxattr) (struct dentry *, const char *,const void *,size_t,int);
+ 	ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t);
+ 	ssize_t (*listxattr) (struct dentry *, char *, size_t);
+@@ -1057,6 +1063,7 @@
+ extern int unregister_filesystem(struct file_system_type *);
+ extern struct vfsmount *kern_mount(struct file_system_type *);
+ extern int may_umount(struct vfsmount *);
++struct vfsmount *do_kern_mount(const char *type, int flags, const char *name, void *data);
+ extern long do_mount(char *, char *, char *, unsigned long, void *);
+ 
+ extern int vfs_statfs(struct super_block *, struct kstatfs *);
+@@ -1124,6 +1131,7 @@
+ 
+ extern struct file *filp_open(const char *, int, int);
+ extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
++extern struct file * dentry_open_it(struct dentry *, struct vfsmount *, int, struct lookup_intent *);
+ extern int filp_close(struct file *, fl_owner_t id);
+ extern char * getname(const char __user *);
+ 
+Index: linux-2.6.0/include/linux/namei.h
+===================================================================
+--- linux-2.6.0.orig/include/linux/namei.h	2003-07-24 15:52:31.000000000 +0400
++++ linux-2.6.0/include/linux/namei.h	2004-01-15 02:58:33.000000000 +0300
+@@ -2,25 +2,55 @@
+ #define _LINUX_NAMEI_H
+ 
+ #include <linux/linkage.h>
++#include <linux/string.h>
+ 
+ struct vfsmount;
++struct nameidata;
+ 
+-struct open_intent {
+-	int	flags;
+-	int	create_mode;
++/* intent opcodes */
++#define IT_OPEN     (1)
++#define IT_CREAT    (1<<1)
++#define IT_READDIR  (1<<2)
++#define IT_GETATTR  (1<<3)
++#define IT_LOOKUP   (1<<4)
++#define IT_UNLINK   (1<<5)
++#define IT_TRUNC    (1<<6)
++#define IT_GETXATTR (1<<7)
++
++struct lustre_intent_data {
++	int       it_disposition;
++	int       it_status;
++	__u64     it_lock_handle;
++	void     *it_data;
++	int       it_lock_mode;
+ };
+ 
++#define INTENT_MAGIC 0x19620323
++struct lookup_intent {
++	int     it_magic;
++	void    (*it_op_release)(struct lookup_intent *);
++	int     it_op;
++	int	it_flags;
++	int	it_create_mode;
++	union {
++		struct lustre_intent_data lustre;
++	} d;
++};
++
++static inline void intent_init(struct lookup_intent *it, int op)
++{
++	memset(it, 0, sizeof(*it));
++	it->it_magic = INTENT_MAGIC;
++	it->it_op = op;
++}
++
+ struct nameidata {
+ 	struct dentry	*dentry;
+ 	struct vfsmount *mnt;
+ 	struct qstr	last;
+ 	unsigned int	flags;
+ 	int		last_type;
+-
+-	/* Intent data */
+-	union {
+-		struct open_intent open;
+-	} intent;
++	struct lookup_intent intent;
+ };
+ 
+ /*
+@@ -41,6 +71,9 @@
+ #define LOOKUP_CONTINUE		 4
+ #define LOOKUP_PARENT		16
+ #define LOOKUP_NOALT		32
++#define LOOKUP_LAST		 (1<<6)
++#define LOOKUP_LINK_NOTLAST	 (1<<7)
++
+ /*
+  * Intent data
+  */
+@@ -49,6 +82,12 @@
+ #define LOOKUP_ACCESS		(0x0400)
+ 
+ extern int FASTCALL(__user_walk(const char __user *, unsigned, struct nameidata *));
++extern int FASTCALL(__user_walk_it(const char __user *name, unsigned flags, struct nameidata *nd));
++#define user_path_walk_it(name,nd) \
++	__user_walk_it(name, LOOKUP_FOLLOW, nd)
++#define user_path_walk_link_it(name,nd) \
++	__user_walk_it(name, 0, nd)
++extern void intent_release(struct lookup_intent *);
+ #define user_path_walk(name,nd) \
+ 	__user_walk(name, LOOKUP_FOLLOW, nd)
+ #define user_path_walk_link(name,nd) \
+@@ -60,7 +99,6 @@
+ 
+ extern struct dentry * lookup_one_len(const char *, struct dentry *, int);
+ extern struct dentry * lookup_hash(struct qstr *, struct dentry *);
+-
+ extern int follow_down(struct vfsmount **, struct dentry **);
+ extern int follow_up(struct vfsmount **, struct dentry **);
+ 
+Index: linux-2.6.0/kernel/exit.c
+===================================================================
+--- linux-2.6.0.orig/kernel/exit.c	2004-01-15 02:58:27.000000000 +0300
++++ linux-2.6.0/kernel/exit.c	2004-01-15 02:58:33.000000000 +0300
+@@ -255,6 +255,8 @@
+ 	write_unlock_irq(&tasklist_lock);
+ }
+ 
++EXPORT_SYMBOL(reparent_to_init);
++
+ void __set_special_pids(pid_t session, pid_t pgrp)
+ {
+ 	struct task_struct *curr = current;
+@@ -420,6 +422,8 @@
+ 	__exit_files(tsk);
+ }
+ 
++EXPORT_SYMBOL(exit_files);
++
+ static inline void __put_fs_struct(struct fs_struct *fs)
+ {
+ 	/* No need to hold fs->lock if we are killing it */
diff --git a/lustre/kernel_patches/patches/vfs_mntcwd_2.5.72_rev1.patch b/lustre/kernel_patches/patches/vfs_mntcwd_2.5.72_rev1.patch
new file mode 100644
index 0000000..e69de29
diff --git a/lustre/kernel_patches/patches/vfs_nointent-2.6.3-mm4.patch b/lustre/kernel_patches/patches/vfs_nointent-2.6.3-mm4.patch
new file mode 100644
index 0000000..4000785
--- /dev/null
+++ b/lustre/kernel_patches/patches/vfs_nointent-2.6.3-mm4.patch
@@ -0,0 +1,423 @@
+ 0 files changed
+
+Index: linux-2.6.3-mm4/fs/namei.c
+===================================================================
+--- linux-2.6.3-mm4.orig/fs/namei.c	2004-03-08 14:46:20.906229088 +0800
++++ linux-2.6.3-mm4/fs/namei.c	2004-03-08 14:51:27.317647472 +0800
+@@ -1277,7 +1277,7 @@
+ 		if (!error) {
+ 			DQUOT_INIT(inode);
+ 			
+-			error = do_truncate(dentry, 0);
++			error = do_truncate(dentry, 0, 1);
+ 		}
+ 		put_write_access(inode);
+ 		if (error)
+@@ -1527,6 +1527,7 @@
+ 	char * tmp;
+ 	struct dentry * dentry;
+ 	struct nameidata nd;
++	intent_init(&nd.intent, IT_LOOKUP);
+ 
+ 	if (S_ISDIR(mode))
+ 		return -EPERM;
+@@ -1537,6 +1538,15 @@
+ 	error = path_lookup(tmp, LOOKUP_PARENT, &nd);
+ 	if (error)
+ 		goto out;
++
++	if (nd.dentry->d_inode->i_op->mknod_raw) {
++		struct inode_operations *op = nd.dentry->d_inode->i_op;
++		error = op->mknod_raw(&nd, mode, dev);
++		/* the file system wants to use normal vfs path now */
++		if (error != -EOPNOTSUPP)
++			goto out2;
++	}
++
+ 	dentry = lookup_create(&nd, 0);
+ 	error = PTR_ERR(dentry);
+ 
+@@ -1563,6 +1573,7 @@
+ 		dput(dentry);
+ 	}
+ 	up(&nd.dentry->d_inode->i_sem);
++out2:
+ 	path_release(&nd);
+ out:
+ 	putname(tmp);
+@@ -1604,10 +1615,18 @@
+ 	if (!IS_ERR(tmp)) {
+ 		struct dentry *dentry;
+ 		struct nameidata nd;
++                intent_init(&nd.intent, IT_LOOKUP);
+ 
+ 		error = path_lookup(tmp, LOOKUP_PARENT, &nd);
+ 		if (error)
+ 			goto out;
++ 		if (nd.dentry->d_inode->i_op->mkdir_raw) {
++ 			struct inode_operations *op = nd.dentry->d_inode->i_op;
++ 			error = op->mkdir_raw(&nd, mode);
++ 			/* the file system wants to use normal vfs path now */
++ 			if (error != -EOPNOTSUPP)
++ 				goto out2;
++ 		}
+ 		dentry = lookup_create(&nd, 1);
+ 		error = PTR_ERR(dentry);
+ 		if (!IS_ERR(dentry)) {
+@@ -1617,6 +1636,7 @@
+ 			dput(dentry);
+ 		}
+ 		up(&nd.dentry->d_inode->i_sem);
++out2:
+ 		path_release(&nd);
+ out:
+ 		putname(tmp);
+@@ -1697,6 +1717,7 @@
+ 	char * name;
+ 	struct dentry *dentry;
+ 	struct nameidata nd;
++        intent_init(&nd.intent, IT_LOOKUP);
+ 
+ 	name = getname(pathname);
+ 	if(IS_ERR(name))
+@@ -1717,6 +1738,16 @@
+ 			error = -EBUSY;
+ 			goto exit1;
+ 	}
++ 
++ 	if (nd.dentry->d_inode->i_op->rmdir_raw) {
++ 		struct inode_operations *op = nd.dentry->d_inode->i_op;
++ 
++ 		error = op->rmdir_raw(&nd);
++ 		/* the file system wants to use normal vfs path now */
++ 		if (error != -EOPNOTSUPP)
++ 			goto exit1;
++ 	}
++ 
+ 	down(&nd.dentry->d_inode->i_sem);
+ 	dentry = lookup_hash(&nd.last, nd.dentry);
+ 	error = PTR_ERR(dentry);
+@@ -1775,6 +1806,7 @@
+ 	struct dentry *dentry;
+ 	struct nameidata nd;
+ 	struct inode *inode = NULL;
++        intent_init(&nd.intent, IT_LOOKUP);
+ 
+ 	name = getname(pathname);
+ 	if(IS_ERR(name))
+@@ -1786,6 +1818,13 @@
+ 	error = -EISDIR;
+ 	if (nd.last_type != LAST_NORM)
+ 		goto exit1;
++ 	if (nd.dentry->d_inode->i_op->unlink_raw) {
++ 		struct inode_operations *op = nd.dentry->d_inode->i_op;
++ 		error = op->unlink_raw(&nd);
++ 		/* the file system wants to use normal vfs path now */
++ 		if (error != -EOPNOTSUPP)
++ 			goto exit1;
++ 	}
+ 	down(&nd.dentry->d_inode->i_sem);
+ 	dentry = lookup_hash(&nd.last, nd.dentry);
+ 	error = PTR_ERR(dentry);
+@@ -1853,10 +1892,18 @@
+ 	if (!IS_ERR(to)) {
+ 		struct dentry *dentry;
+ 		struct nameidata nd;
++                intent_init(&nd.intent, IT_LOOKUP);
+ 
+ 		error = path_lookup(to, LOOKUP_PARENT, &nd);
+ 		if (error)
+ 			goto out;
++		if (nd.dentry->d_inode->i_op->symlink_raw) {
++			struct inode_operations *op = nd.dentry->d_inode->i_op;
++			error = op->symlink_raw(&nd, from);
++			/* the file system wants to use normal vfs path now */
++			if (error != -EOPNOTSUPP)
++				goto out2;
++		}
+ 		dentry = lookup_create(&nd, 0);
+ 		error = PTR_ERR(dentry);
+ 		if (!IS_ERR(dentry)) {
+@@ -1864,6 +1911,7 @@
+ 			dput(dentry);
+ 		}
+ 		up(&nd.dentry->d_inode->i_sem);
++out2:
+ 		path_release(&nd);
+ out:
+ 		putname(to);
+@@ -1927,6 +1975,8 @@
+ 	struct nameidata nd, old_nd;
+ 	int error;
+ 	char * to;
++        intent_init(&nd.intent, IT_LOOKUP);
++        intent_init(&old_nd.intent, IT_LOOKUP);
+ 
+ 	to = getname(newname);
+ 	if (IS_ERR(to))
+@@ -1941,6 +1991,13 @@
+ 	error = -EXDEV;
+ 	if (old_nd.mnt != nd.mnt)
+ 		goto out_release;
++        if (nd.dentry->d_inode->i_op->link_raw) {
++                struct inode_operations *op = nd.dentry->d_inode->i_op;
++                error = op->link_raw(&old_nd, &nd);
++                /* the file system wants to use normal vfs path now */
++                if (error != -EOPNOTSUPP)
++                        goto out_release;
++        }
+ 	new_dentry = lookup_create(&nd, 0);
+ 	error = PTR_ERR(new_dentry);
+ 	if (!IS_ERR(new_dentry)) {
+@@ -1991,7 +2048,7 @@
+  *	   locking].
+  */
+ int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry,
+-	       struct inode *new_dir, struct dentry *new_dentry)
++                   struct inode *new_dir, struct dentry *new_dentry)
+ {
+ 	int error = 0;
+ 	struct inode *target;
+@@ -2036,7 +2093,7 @@
+ }
+ 
+ int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry,
+-	       struct inode *new_dir, struct dentry *new_dentry)
++                     struct inode *new_dir, struct dentry *new_dentry)
+ {
+ 	struct inode *target;
+ 	int error;
+@@ -2113,6 +2170,8 @@
+ 	struct dentry * old_dentry, *new_dentry;
+ 	struct dentry * trap;
+ 	struct nameidata oldnd, newnd;
++        intent_init(&oldnd.intent, IT_LOOKUP);
++        intent_init(&newnd.intent, IT_LOOKUP);
+ 
+ 	error = path_lookup(oldname, LOOKUP_PARENT, &oldnd);
+ 	if (error)
+@@ -2135,6 +2194,13 @@
+ 	if (newnd.last_type != LAST_NORM)
+ 		goto exit2;
+ 
++ 	if (old_dir->d_inode->i_op->rename_raw) {
++ 		error = old_dir->d_inode->i_op->rename_raw(&oldnd, &newnd);
++ 		/* the file system wants to use normal vfs path now */
++ 		if (error != -EOPNOTSUPP)
++ 			goto exit2;
++ 	}
++
+ 	trap = lock_rename(new_dir, old_dir);
+ 
+ 	old_dentry = lookup_hash(&oldnd.last, old_dir);
+@@ -2166,8 +2232,7 @@
+ 	if (new_dentry == trap)
+ 		goto exit5;
+ 
+-	error = vfs_rename(old_dir->d_inode, old_dentry,
+-				   new_dir->d_inode, new_dentry);
++	error = vfs_rename(old_dir->d_inode, old_dentry, new_dir->d_inode, new_dentry);
+ exit5:
+ 	dput(new_dentry);
+ exit4:
+Index: linux-2.6.3-mm4/fs/open.c
+===================================================================
+--- linux-2.6.3-mm4.orig/fs/open.c	2004-03-08 14:46:21.050207200 +0800
++++ linux-2.6.3-mm4/fs/open.c	2004-03-08 14:55:01.025158992 +0800
+@@ -180,9 +180,10 @@
+ 	return error;
+ }
+ 
+-int do_truncate(struct dentry *dentry, loff_t length)
++int do_truncate(struct dentry *dentry, loff_t length, int called_from_open)
+ {
+ 	int err;
++	struct inode_operations *op = dentry->d_inode->i_op;
+ 	struct iattr newattrs;
+ 
+ 	/* Not pretty: "inode->i_size" shouldn't really be signed. But it is. */
+@@ -193,7 +194,14 @@
+ 	newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
+ 	down(&dentry->d_inode->i_sem);
+ 	down_write(&dentry->d_inode->i_alloc_sem);
+-	err = notify_change(dentry, &newattrs);
++	if (called_from_open)
++		newattrs.ia_valid |= ATTR_FROM_OPEN;
++	if (op->setattr_raw) {
++		newattrs.ia_valid |= ATTR_RAW;
++		newattrs.ia_ctime = CURRENT_TIME;
++		err = op->setattr_raw(dentry->d_inode, &newattrs);
++	} else 
++		err = notify_change(dentry, &newattrs);
+ 	up_write(&dentry->d_inode->i_alloc_sem);
+ 	up(&dentry->d_inode->i_sem);
+ 	return err;
+@@ -249,7 +257,7 @@
+ 	error = locks_verify_truncate(inode, NULL, length);
+ 	if (!error) {
+ 		DQUOT_INIT(inode);
+-		error = do_truncate(nd.dentry, length);
++		error = do_truncate(nd.dentry, length, 0);
+ 	}
+ 	put_write_access(inode);
+ 
+@@ -301,7 +309,7 @@
+ 
+ 	error = locks_verify_truncate(inode, file, length);
+ 	if (!error)
+-		error = do_truncate(dentry, length);
++		error = do_truncate(dentry, length, 0);
+ out_putf:
+ 	fput(file);
+ out:
+@@ -380,9 +388,19 @@
+ 		    (error = permission(inode,MAY_WRITE,&nd)) != 0)
+ 			goto dput_and_out;
+ 	}
+-	down(&inode->i_sem);
+-	error = notify_change(nd.dentry, &newattrs);
+-	up(&inode->i_sem);
++	if (inode->i_op->setattr_raw) {
++		struct inode_operations *op = nd.dentry->d_inode->i_op;
++
++		newattrs.ia_valid |= ATTR_RAW;
++		error = op->setattr_raw(inode, &newattrs);
++		/* the file system wants to use normal vfs path now */
++		if (error != -EOPNOTSUPP)
++			goto dput_and_out;
++	} else {
++                down(&inode->i_sem);
++                error = notify_change(nd.dentry, &newattrs);
++                up(&inode->i_sem);
++        }
+ dput_and_out:
+ 	path_release(&nd);
+ out:
+@@ -433,9 +451,19 @@
+ 		    (error = permission(inode,MAY_WRITE,&nd)) != 0)
+ 			goto dput_and_out;
+ 	}
+-	down(&inode->i_sem);
+-	error = notify_change(nd.dentry, &newattrs);
+-	up(&inode->i_sem);
++	if (inode->i_op->setattr_raw) {
++		struct inode_operations *op = nd.dentry->d_inode->i_op;
++
++		newattrs.ia_valid |= ATTR_RAW;
++		error = op->setattr_raw(inode, &newattrs);
++		/* the file system wants to use normal vfs path now */
++		if (error != -EOPNOTSUPP)
++			goto dput_and_out;
++	} else {
++                down(&inode->i_sem);
++                error = notify_change(nd.dentry, &newattrs);
++                up(&inode->i_sem);
++        }
+ dput_and_out:
+ 	path_release(&nd);
+ out:
+@@ -636,6 +664,18 @@
+ 	if (IS_RDONLY(inode))
+ 		goto dput_and_out;
+ 	
++	if (inode->i_op->setattr_raw) {
++		struct inode_operations *op = nd.dentry->d_inode->i_op;
++
++		newattrs.ia_mode = mode;
++		newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
++		newattrs.ia_valid |= ATTR_RAW;
++		error = op->setattr_raw(inode, &newattrs);
++		/* the file system wants to use normal vfs path now */
++		if (error != -EOPNOTSUPP)
++			goto dput_and_out;
++	}
++
+ 	error = -EPERM;
+ 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
+ 		goto dput_and_out;
+@@ -669,6 +709,18 @@
+ 	if (IS_RDONLY(inode))
+ 		goto out;
+ 	error = -EPERM;
++	if (inode->i_op->setattr_raw) {
++		struct inode_operations *op = dentry->d_inode->i_op;
++
++		newattrs.ia_uid = user;
++		newattrs.ia_gid = group;
++		newattrs.ia_valid = ATTR_UID | ATTR_GID;
++		newattrs.ia_valid |= ATTR_RAW;
++		error = op->setattr_raw(inode, &newattrs);
++		/* the file system wants to use normal vfs path now */
++		if (error != -EOPNOTSUPP)
++			return error;
++	}
+ 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
+ 		goto out;
+ 	newattrs.ia_valid =  ATTR_CTIME;
+@@ -682,6 +734,7 @@
+ 	}
+ 	if (!S_ISDIR(inode->i_mode))
+ 		newattrs.ia_valid |= ATTR_KILL_SUID|ATTR_KILL_SGID;
++
+ 	down(&inode->i_sem);
+ 	error = notify_change(dentry, &newattrs);
+ 	up(&inode->i_sem);
+Index: linux-2.6.3-mm4/fs/exec.c
+===================================================================
+--- linux-2.6.3-mm4.orig/fs/exec.c	2004-03-08 14:46:20.758251584 +0800
++++ linux-2.6.3-mm4/fs/exec.c	2004-03-08 14:51:27.454626648 +0800
+@@ -1408,7 +1408,7 @@
+ 		goto close_fail;
+ 	if (!file->f_op->write)
+ 		goto close_fail;
+-	if (do_truncate(file->f_dentry, 0) != 0)
++	if (do_truncate(file->f_dentry, 0, 0) != 0)
+ 		goto close_fail;
+ 
+ 	retval = binfmt->core_dump(signr, regs, file);
+Index: linux-2.6.3-mm4/include/linux/fs.h
+===================================================================
+--- linux-2.6.3-mm4.orig/include/linux/fs.h	2004-03-08 14:46:21.391155368 +0800
++++ linux-2.6.3-mm4/include/linux/fs.h	2004-03-08 14:56:25.775275016 +0800
+@@ -843,13 +843,20 @@
+ 	int (*create) (struct inode *,struct dentry *,int, struct nameidata *);
+ 	struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *);
+ 	int (*link) (struct dentry *,struct inode *,struct dentry *);
++	int (*link_raw) (struct nameidata *,struct nameidata *);
+ 	int (*unlink) (struct inode *,struct dentry *);
++	int (*unlink_raw) (struct nameidata *);
+ 	int (*symlink) (struct inode *,struct dentry *,const char *);
++	int (*symlink_raw) (struct nameidata *,const char *);
+ 	int (*mkdir) (struct inode *,struct dentry *,int);
++	int (*mkdir_raw) (struct nameidata *,int);
+ 	int (*rmdir) (struct inode *,struct dentry *);
++	int (*rmdir_raw) (struct nameidata *);
+ 	int (*mknod) (struct inode *,struct dentry *,int,dev_t);
++	int (*mknod_raw) (struct nameidata *,int,dev_t);
+ 	int (*rename) (struct inode *, struct dentry *,
+ 			struct inode *, struct dentry *);
++	int (*rename_raw) (struct nameidata *, struct nameidata *);
+ 	int (*readlink) (struct dentry *, char __user *,int);
+ 	int (*follow_link) (struct dentry *, struct nameidata *);
+ 	void (*truncate) (struct inode *);
+@@ -1133,7 +1140,7 @@
+ 
+ /* fs/open.c */
+ 
+-extern int do_truncate(struct dentry *, loff_t start);
++extern int do_truncate(struct dentry *, loff_t start, int called_from_open);
+ extern struct file *filp_open(const char *, int, int);
+ extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
+ extern struct file * dentry_open_it(struct dentry *, struct vfsmount *, int, struct lookup_intent *);
+Index: linux-2.6.3-mm4/net/unix/af_unix.c
+===================================================================
+--- linux-2.6.3-mm4.orig/net/unix/af_unix.c	2004-02-26 14:22:03.000000000 +0800
++++ linux-2.6.3-mm4/net/unix/af_unix.c	2004-03-08 14:51:27.591605824 +0800
+@@ -592,6 +592,7 @@
+ 	int err = 0;
+ 	
+ 	if (sunname->sun_path[0]) {
++		intent_init(&nd.intent, IT_LOOKUP);
+ 		err = path_lookup(sunname->sun_path, LOOKUP_FOLLOW, &nd);
+ 		if (err)
+ 			goto fail;
diff --git a/lustre/kernel_patches/patches/vfs_nointent_2.6.0-test1.patch b/lustre/kernel_patches/patches/vfs_nointent_2.6.0-test1.patch
new file mode 100644
index 0000000..7945160
--- /dev/null
+++ b/lustre/kernel_patches/patches/vfs_nointent_2.6.0-test1.patch
@@ -0,0 +1,405 @@
+ 0 files changed
+
+--- linux-2.6.0-test1/fs/namei.c~vfs_nointent_2.6.0-test1	2003-07-22 20:18:30.000000000 +0800
++++ linux-2.6.0-test1-root/fs/namei.c	2003-07-22 20:27:38.000000000 +0800
+@@ -1249,7 +1249,7 @@ int may_open(struct nameidata *nd, int a
+ 		if (!error) {
+ 			DQUOT_INIT(inode);
+ 			
+-			error = do_truncate(dentry, 0);
++			error = do_truncate(dentry, 0, 1);
+ 		}
+ 		put_write_access(inode);
+ 		if (error)
+@@ -1494,6 +1494,7 @@ do_mknod(const char __user *filename, in
+ 	char *tmp;
+ 	struct dentry *dentry;
+ 	struct nameidata nd;
++	intent_init(&nd.intent, IT_LOOKUP);
+ 
+ 	if (S_ISDIR(mode))
+ 		return -EPERM;
+@@ -1504,6 +1505,15 @@ do_mknod(const char __user *filename, in
+ 	error = path_lookup(tmp, LOOKUP_PARENT, &nd);
+ 	if (error)
+ 		goto out;
++
++	if (nd.dentry->d_inode->i_op->mknod_raw) {
++		struct inode_operations *op = nd.dentry->d_inode->i_op;
++		error = op->mknod_raw(&nd, mode, dev);
++		/* the file system wants to use normal vfs path now */
++		if (error != -EOPNOTSUPP)
++			goto out2;
++	}
++
+ 	dentry = lookup_create(&nd, 0);
+ 	error = PTR_ERR(dentry);
+ 
+@@ -1526,6 +1536,7 @@ do_mknod(const char __user *filename, in
+ 		dput(dentry);
+ 	}
+ 	up(&nd.dentry->d_inode->i_sem);
++out2:
+ 	path_release(&nd);
+ out:
+ 	putname(tmp);
+@@ -1588,10 +1599,18 @@ asmlinkage long sys_mkdir(const char __u
+ 	if (!IS_ERR(tmp)) {
+ 		struct dentry *dentry;
+ 		struct nameidata nd;
++                intent_init(&nd.intent, IT_LOOKUP);
+ 
+ 		error = path_lookup(tmp, LOOKUP_PARENT, &nd);
+ 		if (error)
+ 			goto out;
++ 		if (nd.dentry->d_inode->i_op->mkdir_raw) {
++ 			struct inode_operations *op = nd.dentry->d_inode->i_op;
++ 			error = op->mkdir_raw(&nd, mode);
++ 			/* the file system wants to use normal vfs path now */
++ 			if (error != -EOPNOTSUPP)
++ 				goto out2;
++ 		}
+ 		dentry = lookup_create(&nd, 1);
+ 		error = PTR_ERR(dentry);
+ 		if (!IS_ERR(dentry)) {
+@@ -1601,6 +1620,7 @@ asmlinkage long sys_mkdir(const char __u
+ 			dput(dentry);
+ 		}
+ 		up(&nd.dentry->d_inode->i_sem);
++out2:
+ 		path_release(&nd);
+ out:
+ 		putname(tmp);
+@@ -1681,6 +1701,7 @@ asmlinkage long sys_rmdir(const char __u
+ 	char * name;
+ 	struct dentry *dentry;
+ 	struct nameidata nd;
++        intent_init(&nd.intent, IT_LOOKUP);
+ 
+ 	name = getname(pathname);
+ 	if(IS_ERR(name))
+@@ -1701,6 +1722,16 @@ asmlinkage long sys_rmdir(const char __u
+ 			error = -EBUSY;
+ 			goto exit1;
+ 	}
++ 
++ 	if (nd.dentry->d_inode->i_op->rmdir_raw) {
++ 		struct inode_operations *op = nd.dentry->d_inode->i_op;
++ 
++ 		error = op->rmdir_raw(&nd);
++ 		/* the file system wants to use normal vfs path now */
++ 		if (error != -EOPNOTSUPP)
++ 			goto exit1;
++ 	}
++ 
+ 	down(&nd.dentry->d_inode->i_sem);
+ 	dentry = lookup_hash(&nd.last, nd.dentry);
+ 	error = PTR_ERR(dentry);
+@@ -1759,6 +1790,7 @@ asmlinkage long sys_unlink(const char __
+ 	struct dentry *dentry;
+ 	struct nameidata nd;
+ 	struct inode *inode = NULL;
++        intent_init(&nd.intent, IT_LOOKUP);
+ 
+ 	name = getname(pathname);
+ 	if(IS_ERR(name))
+@@ -1770,6 +1802,13 @@ asmlinkage long sys_unlink(const char __
+ 	error = -EISDIR;
+ 	if (nd.last_type != LAST_NORM)
+ 		goto exit1;
++ 	if (nd.dentry->d_inode->i_op->unlink_raw) {
++ 		struct inode_operations *op = nd.dentry->d_inode->i_op;
++ 		error = op->unlink_raw(&nd);
++ 		/* the file system wants to use normal vfs path now */
++ 		if (error != -EOPNOTSUPP)
++ 			goto exit1;
++ 	}
+ 	down(&nd.dentry->d_inode->i_sem);
+ 	dentry = lookup_hash(&nd.last, nd.dentry);
+ 	error = PTR_ERR(dentry);
+@@ -1837,10 +1876,18 @@ asmlinkage long sys_symlink(const char _
+ 	if (!IS_ERR(to)) {
+ 		struct dentry *dentry;
+ 		struct nameidata nd;
++                intent_init(&nd.intent, IT_LOOKUP);
+ 
+ 		error = path_lookup(to, LOOKUP_PARENT, &nd);
+ 		if (error)
+ 			goto out;
++		if (nd.dentry->d_inode->i_op->symlink_raw) {
++			struct inode_operations *op = nd.dentry->d_inode->i_op;
++			error = op->symlink_raw(&nd, from);
++			/* the file system wants to use normal vfs path now */
++			if (error != -EOPNOTSUPP)
++				goto out2;
++		}
+ 		dentry = lookup_create(&nd, 0);
+ 		error = PTR_ERR(dentry);
+ 		if (!IS_ERR(dentry)) {
+@@ -1848,6 +1895,7 @@ asmlinkage long sys_symlink(const char _
+ 			dput(dentry);
+ 		}
+ 		up(&nd.dentry->d_inode->i_sem);
++out2:
+ 		path_release(&nd);
+ out:
+ 		putname(to);
+@@ -1911,6 +1959,8 @@ asmlinkage long sys_link(const char __us
+ 	struct nameidata nd, old_nd;
+ 	int error;
+ 	char * to;
++        intent_init(&nd.intent, IT_LOOKUP);
++        intent_init(&old_nd.intent, IT_LOOKUP);
+ 
+ 	to = getname(newname);
+ 	if (IS_ERR(to))
+@@ -1925,6 +1975,13 @@ asmlinkage long sys_link(const char __us
+ 	error = -EXDEV;
+ 	if (old_nd.mnt != nd.mnt)
+ 		goto out_release;
++        if (nd.dentry->d_inode->i_op->link_raw) {
++                struct inode_operations *op = nd.dentry->d_inode->i_op;
++                error = op->link_raw(&old_nd, &nd);
++                /* the file system wants to use normal vfs path now */
++                if (error != -EOPNOTSUPP)
++                        goto out_release;
++        }
+ 	new_dentry = lookup_create(&nd, 0);
+ 	error = PTR_ERR(new_dentry);
+ 	if (!IS_ERR(new_dentry)) {
+@@ -1975,7 +2032,7 @@ exit:
+  *	   locking].
+  */
+ int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry,
+-	       struct inode *new_dir, struct dentry *new_dentry)
++                   struct inode *new_dir, struct dentry *new_dentry)
+ {
+ 	int error = 0;
+ 	struct inode *target;
+@@ -2020,7 +2077,7 @@ int vfs_rename_dir(struct inode *old_dir
+ }
+ 
+ int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry,
+-	       struct inode *new_dir, struct dentry *new_dentry)
++                     struct inode *new_dir, struct dentry *new_dentry)
+ {
+ 	struct inode *target;
+ 	int error;
+@@ -2097,6 +2154,8 @@ static inline int do_rename(const char *
+ 	struct dentry * old_dentry, *new_dentry;
+ 	struct dentry * trap;
+ 	struct nameidata oldnd, newnd;
++        intent_init(&oldnd.intent, IT_LOOKUP);
++        intent_init(&newnd.intent, IT_LOOKUP);
+ 
+ 	error = path_lookup(oldname, LOOKUP_PARENT, &oldnd);
+ 	if (error)
+@@ -2119,6 +2178,13 @@ static inline int do_rename(const char *
+ 	if (newnd.last_type != LAST_NORM)
+ 		goto exit2;
+ 
++ 	if (old_dir->d_inode->i_op->rename_raw) {
++ 		error = old_dir->d_inode->i_op->rename_raw(&oldnd, &newnd);
++ 		/* the file system wants to use normal vfs path now */
++ 		if (error != -EOPNOTSUPP)
++ 			goto exit2;
++ 	}
++
+ 	trap = lock_rename(new_dir, old_dir);
+ 
+ 	old_dentry = lookup_hash(&oldnd.last, old_dir);
+@@ -2150,8 +2216,7 @@ static inline int do_rename(const char *
+ 	if (new_dentry == trap)
+ 		goto exit5;
+ 
+-	error = vfs_rename(old_dir->d_inode, old_dentry,
+-				   new_dir->d_inode, new_dentry);
++	error = vfs_rename(old_dir->d_inode, old_dentry, new_dir->d_inode, new_dentry);
+ exit5:
+ 	dput(new_dentry);
+ exit4:
+--- linux-2.6.0-test1/fs/open.c~vfs_nointent_2.6.0-test1	2003-07-22 20:18:30.000000000 +0800
++++ linux-2.6.0-test1-root/fs/open.c	2003-07-22 20:26:41.000000000 +0800
+@@ -178,9 +178,10 @@ out:
+ 	return error;
+ }
+ 
+-int do_truncate(struct dentry *dentry, loff_t length)
++int do_truncate(struct dentry *dentry, loff_t length, int called_from_open)
+ {
+ 	int err;
++	struct inode_operations *op = dentry->d_inode->i_op;
+ 	struct iattr newattrs;
+ 
+ 	/* Not pretty: "inode->i_size" shouldn't really be signed. But it is. */
+@@ -190,7 +191,14 @@ int do_truncate(struct dentry *dentry, l
+ 	newattrs.ia_size = length;
+ 	newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
+ 	down(&dentry->d_inode->i_sem);
+-	err = notify_change(dentry, &newattrs);
++	if (called_from_open)
++		newattrs.ia_valid |= ATTR_FROM_OPEN;
++	if (op->setattr_raw) {
++		newattrs.ia_valid |= ATTR_RAW;
++		newattrs.ia_ctime = CURRENT_TIME;
++		err = op->setattr_raw(dentry->d_inode, &newattrs);
++	} else 
++                err = notify_change(dentry, &newattrs);
+ 	up(&dentry->d_inode->i_sem);
+ 	return err;
+ }
+@@ -245,7 +253,7 @@ static inline long do_sys_truncate(const
+ 	error = locks_verify_truncate(inode, NULL, length);
+ 	if (!error) {
+ 		DQUOT_INIT(inode);
+-		error = do_truncate(nd.dentry, length);
++		error = do_truncate(nd.dentry, length, 0);
+ 	}
+ 	put_write_access(inode);
+ 
+@@ -297,7 +305,7 @@ static inline long do_sys_ftruncate(unsi
+ 
+ 	error = locks_verify_truncate(inode, file, length);
+ 	if (!error)
+-		error = do_truncate(dentry, length);
++		error = do_truncate(dentry, length, 0);
+ out_putf:
+ 	fput(file);
+ out:
+@@ -368,9 +376,19 @@ asmlinkage long sys_utime(char __user * 
+ 		    (error = permission(inode,MAY_WRITE,&nd)) != 0)
+ 			goto dput_and_out;
+ 	}
+-	down(&inode->i_sem);
+-	error = notify_change(nd.dentry, &newattrs);
+-	up(&inode->i_sem);
++	if (inode->i_op->setattr_raw) {
++		struct inode_operations *op = nd.dentry->d_inode->i_op;
++
++		newattrs.ia_valid |= ATTR_RAW;
++		error = op->setattr_raw(inode, &newattrs);
++		/* the file system wants to use normal vfs path now */
++		if (error != -EOPNOTSUPP)
++			goto dput_and_out;
++	} else {
++                down(&inode->i_sem);
++                error = notify_change(nd.dentry, &newattrs);
++                up(&inode->i_sem);
++        }
+ dput_and_out:
+ 	path_release(&nd);
+ out:
+@@ -413,9 +431,19 @@ long do_utimes(char __user * filename, s
+ 		    (error = permission(inode,MAY_WRITE,&nd)) != 0)
+ 			goto dput_and_out;
+ 	}
+-	down(&inode->i_sem);
+-	error = notify_change(nd.dentry, &newattrs);
+-	up(&inode->i_sem);
++	if (inode->i_op->setattr_raw) {
++		struct inode_operations *op = nd.dentry->d_inode->i_op;
++
++		newattrs.ia_valid |= ATTR_RAW;
++		error = op->setattr_raw(inode, &newattrs);
++		/* the file system wants to use normal vfs path now */
++		if (error != -EOPNOTSUPP)
++			goto dput_and_out;
++	} else {
++                down(&inode->i_sem);
++                error = notify_change(nd.dentry, &newattrs);
++                up(&inode->i_sem);
++        }
+ dput_and_out:
+ 	path_release(&nd);
+ out:
+@@ -616,6 +644,18 @@ asmlinkage long sys_chmod(const char __u
+ 	if (IS_RDONLY(inode))
+ 		goto dput_and_out;
+ 	
++	if (inode->i_op->setattr_raw) {
++		struct inode_operations *op = nd.dentry->d_inode->i_op;
++
++		newattrs.ia_mode = mode;
++		newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
++		newattrs.ia_valid |= ATTR_RAW;
++		error = op->setattr_raw(inode, &newattrs);
++		/* the file system wants to use normal vfs path now */
++		if (error != -EOPNOTSUPP)
++			goto dput_and_out;
++	}
++
+ 	error = -EPERM;
+ 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
+ 		goto dput_and_out;
+@@ -649,6 +689,18 @@ static int chown_common(struct dentry * 
+ 	if (IS_RDONLY(inode))
+ 		goto out;
+ 	error = -EPERM;
++	if (inode->i_op->setattr_raw) {
++		struct inode_operations *op = dentry->d_inode->i_op;
++
++		newattrs.ia_uid = user;
++		newattrs.ia_gid = group;
++		newattrs.ia_valid = ATTR_UID | ATTR_GID;
++		newattrs.ia_valid |= ATTR_RAW;
++		error = op->setattr_raw(inode, &newattrs);
++		/* the file system wants to use normal vfs path now */
++		if (error != -EOPNOTSUPP)
++			return error;
++	}
+ 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
+ 		goto out;
+ 	newattrs.ia_valid =  ATTR_CTIME;
+@@ -662,6 +714,7 @@ static int chown_common(struct dentry * 
+ 	}
+ 	if (!S_ISDIR(inode->i_mode))
+ 		newattrs.ia_valid |= ATTR_KILL_SUID|ATTR_KILL_SGID;
++
+ 	down(&inode->i_sem);
+ 	error = notify_change(dentry, &newattrs);
+ 	up(&inode->i_sem);
+--- linux-2.6.0-test1/include/linux/fs.h~vfs_nointent_2.6.0-test1	2003-07-22 20:18:30.000000000 +0800
++++ linux-2.6.0-test1-root/include/linux/fs.h	2003-07-22 20:26:41.000000000 +0800
+@@ -807,13 +807,20 @@ struct inode_operations {
+ 	int (*create) (struct inode *,struct dentry *,int, struct nameidata *);
+ 	struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *);
+ 	int (*link) (struct dentry *,struct inode *,struct dentry *);
++	int (*link_raw) (struct nameidata *,struct nameidata *);
+ 	int (*unlink) (struct inode *,struct dentry *);
++	int (*unlink_raw) (struct nameidata *);
+ 	int (*symlink) (struct inode *,struct dentry *,const char *);
++	int (*symlink_raw) (struct nameidata *,const char *);
+ 	int (*mkdir) (struct inode *,struct dentry *,int);
++	int (*mkdir_raw) (struct nameidata *,int);
+ 	int (*rmdir) (struct inode *,struct dentry *);
++	int (*rmdir_raw) (struct nameidata *);
+ 	int (*mknod) (struct inode *,struct dentry *,int,dev_t);
++	int (*mknod_raw) (struct nameidata *,int,dev_t);
+ 	int (*rename) (struct inode *, struct dentry *,
+ 			struct inode *, struct dentry *);
++	int (*rename_raw) (struct nameidata *, struct nameidata *);
+ 	int (*readlink) (struct dentry *, char __user *,int);
+ 	int (*follow_link) (struct dentry *, struct nameidata *);
+ 	void (*truncate) (struct inode *);
+@@ -1098,7 +1105,7 @@ static inline int break_lease(struct ino
+ 
+ asmlinkage long sys_open(const char __user *, int, int);
+ asmlinkage long sys_close(unsigned int);	/* yes, it's really unsigned */
+-extern int do_truncate(struct dentry *, loff_t start);
++extern int do_truncate(struct dentry *, loff_t start, int called_from_open);
+ 
+ extern struct file *filp_open(const char *, int, int);
+ extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
+--- linux-2.6.0-test1/fs/exec.c~vfs_nointent_2.6.0-test1	2003-07-22 20:18:30.000000000 +0800
++++ linux-2.6.0-test1-root/fs/exec.c	2003-07-22 20:26:41.000000000 +0800
+@@ -1352,7 +1352,7 @@ int do_coredump(long signr, int exit_cod
+ 		goto close_fail;
+ 	if (!file->f_op->write)
+ 		goto close_fail;
+-	if (do_truncate(file->f_dentry, 0) != 0)
++	if (do_truncate(file->f_dentry, 0, 0) != 0)
+ 		goto close_fail;
+ 
+ 	retval = binfmt->core_dump(signr, regs, file);
+
+_
diff --git a/lustre/kernel_patches/patches/vfs_nointent_2.6.0-test6.patch b/lustre/kernel_patches/patches/vfs_nointent_2.6.0-test6.patch
new file mode 100644
index 0000000..4177aa7
--- /dev/null
+++ b/lustre/kernel_patches/patches/vfs_nointent_2.6.0-test6.patch
@@ -0,0 +1,423 @@
+ 0 files changed
+
+Index: linux-2.6.0/fs/namei.c
+===================================================================
+--- linux-2.6.0.orig/fs/namei.c	2004-01-04 15:22:42.000000000 +0300
++++ linux-2.6.0/fs/namei.c	2004-01-04 15:25:04.000000000 +0300
+@@ -1270,7 +1270,7 @@
+ 		if (!error) {
+ 			DQUOT_INIT(inode);
+ 			
+-			error = do_truncate(dentry, 0);
++			error = do_truncate(dentry, 0, 1);
+ 		}
+ 		put_write_access(inode);
+ 		if (error)
+@@ -1521,6 +1521,7 @@
+ 	char * tmp;
+ 	struct dentry * dentry;
+ 	struct nameidata nd;
++	intent_init(&nd.intent, IT_LOOKUP);
+ 
+ 	if (S_ISDIR(mode))
+ 		return -EPERM;
+@@ -1531,6 +1532,15 @@
+ 	error = path_lookup(tmp, LOOKUP_PARENT, &nd);
+ 	if (error)
+ 		goto out;
++
++	if (nd.dentry->d_inode->i_op->mknod_raw) {
++		struct inode_operations *op = nd.dentry->d_inode->i_op;
++		error = op->mknod_raw(&nd, mode, dev);
++		/* the file system wants to use normal vfs path now */
++		if (error != -EOPNOTSUPP)
++			goto out2;
++	}
++
+ 	dentry = lookup_create(&nd, 0);
+ 	error = PTR_ERR(dentry);
+ 
+@@ -1557,6 +1567,7 @@
+ 		dput(dentry);
+ 	}
+ 	up(&nd.dentry->d_inode->i_sem);
++out2:
+ 	path_release(&nd);
+ out:
+ 	putname(tmp);
+@@ -1598,10 +1609,18 @@
+ 	if (!IS_ERR(tmp)) {
+ 		struct dentry *dentry;
+ 		struct nameidata nd;
++                intent_init(&nd.intent, IT_LOOKUP);
+ 
+ 		error = path_lookup(tmp, LOOKUP_PARENT, &nd);
+ 		if (error)
+ 			goto out;
++ 		if (nd.dentry->d_inode->i_op->mkdir_raw) {
++ 			struct inode_operations *op = nd.dentry->d_inode->i_op;
++ 			error = op->mkdir_raw(&nd, mode);
++ 			/* the file system wants to use normal vfs path now */
++ 			if (error != -EOPNOTSUPP)
++ 				goto out2;
++ 		}
+ 		dentry = lookup_create(&nd, 1);
+ 		error = PTR_ERR(dentry);
+ 		if (!IS_ERR(dentry)) {
+@@ -1611,6 +1630,7 @@
+ 			dput(dentry);
+ 		}
+ 		up(&nd.dentry->d_inode->i_sem);
++out2:
+ 		path_release(&nd);
+ out:
+ 		putname(tmp);
+@@ -1691,6 +1711,7 @@
+ 	char * name;
+ 	struct dentry *dentry;
+ 	struct nameidata nd;
++        intent_init(&nd.intent, IT_LOOKUP);
+ 
+ 	name = getname(pathname);
+ 	if(IS_ERR(name))
+@@ -1711,6 +1732,16 @@
+ 			error = -EBUSY;
+ 			goto exit1;
+ 	}
++ 
++ 	if (nd.dentry->d_inode->i_op->rmdir_raw) {
++ 		struct inode_operations *op = nd.dentry->d_inode->i_op;
++ 
++ 		error = op->rmdir_raw(&nd);
++ 		/* the file system wants to use normal vfs path now */
++ 		if (error != -EOPNOTSUPP)
++ 			goto exit1;
++ 	}
++ 
+ 	down(&nd.dentry->d_inode->i_sem);
+ 	dentry = lookup_hash(&nd.last, nd.dentry);
+ 	error = PTR_ERR(dentry);
+@@ -1769,6 +1800,7 @@
+ 	struct dentry *dentry;
+ 	struct nameidata nd;
+ 	struct inode *inode = NULL;
++        intent_init(&nd.intent, IT_LOOKUP);
+ 
+ 	name = getname(pathname);
+ 	if(IS_ERR(name))
+@@ -1780,6 +1812,13 @@
+ 	error = -EISDIR;
+ 	if (nd.last_type != LAST_NORM)
+ 		goto exit1;
++ 	if (nd.dentry->d_inode->i_op->unlink_raw) {
++ 		struct inode_operations *op = nd.dentry->d_inode->i_op;
++ 		error = op->unlink_raw(&nd);
++ 		/* the file system wants to use normal vfs path now */
++ 		if (error != -EOPNOTSUPP)
++ 			goto exit1;
++ 	}
+ 	down(&nd.dentry->d_inode->i_sem);
+ 	dentry = lookup_hash(&nd.last, nd.dentry);
+ 	error = PTR_ERR(dentry);
+@@ -1847,10 +1886,18 @@
+ 	if (!IS_ERR(to)) {
+ 		struct dentry *dentry;
+ 		struct nameidata nd;
++                intent_init(&nd.intent, IT_LOOKUP);
+ 
+ 		error = path_lookup(to, LOOKUP_PARENT, &nd);
+ 		if (error)
+ 			goto out;
++		if (nd.dentry->d_inode->i_op->symlink_raw) {
++			struct inode_operations *op = nd.dentry->d_inode->i_op;
++			error = op->symlink_raw(&nd, from);
++			/* the file system wants to use normal vfs path now */
++			if (error != -EOPNOTSUPP)
++				goto out2;
++		}
+ 		dentry = lookup_create(&nd, 0);
+ 		error = PTR_ERR(dentry);
+ 		if (!IS_ERR(dentry)) {
+@@ -1858,6 +1905,7 @@
+ 			dput(dentry);
+ 		}
+ 		up(&nd.dentry->d_inode->i_sem);
++out2:
+ 		path_release(&nd);
+ out:
+ 		putname(to);
+@@ -1921,6 +1969,8 @@
+ 	struct nameidata nd, old_nd;
+ 	int error;
+ 	char * to;
++        intent_init(&nd.intent, IT_LOOKUP);
++        intent_init(&old_nd.intent, IT_LOOKUP);
+ 
+ 	to = getname(newname);
+ 	if (IS_ERR(to))
+@@ -1935,6 +1985,13 @@
+ 	error = -EXDEV;
+ 	if (old_nd.mnt != nd.mnt)
+ 		goto out_release;
++        if (nd.dentry->d_inode->i_op->link_raw) {
++                struct inode_operations *op = nd.dentry->d_inode->i_op;
++                error = op->link_raw(&old_nd, &nd);
++                /* the file system wants to use normal vfs path now */
++                if (error != -EOPNOTSUPP)
++                        goto out_release;
++        }
+ 	new_dentry = lookup_create(&nd, 0);
+ 	error = PTR_ERR(new_dentry);
+ 	if (!IS_ERR(new_dentry)) {
+@@ -1985,7 +2042,7 @@
+  *	   locking].
+  */
+ int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry,
+-	       struct inode *new_dir, struct dentry *new_dentry)
++                   struct inode *new_dir, struct dentry *new_dentry)
+ {
+ 	int error = 0;
+ 	struct inode *target;
+@@ -2030,7 +2087,7 @@
+ }
+ 
+ int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry,
+-	       struct inode *new_dir, struct dentry *new_dentry)
++                     struct inode *new_dir, struct dentry *new_dentry)
+ {
+ 	struct inode *target;
+ 	int error;
+@@ -2107,6 +2164,8 @@
+ 	struct dentry * old_dentry, *new_dentry;
+ 	struct dentry * trap;
+ 	struct nameidata oldnd, newnd;
++        intent_init(&oldnd.intent, IT_LOOKUP);
++        intent_init(&newnd.intent, IT_LOOKUP);
+ 
+ 	error = path_lookup(oldname, LOOKUP_PARENT, &oldnd);
+ 	if (error)
+@@ -2129,6 +2188,13 @@
+ 	if (newnd.last_type != LAST_NORM)
+ 		goto exit2;
+ 
++ 	if (old_dir->d_inode->i_op->rename_raw) {
++ 		error = old_dir->d_inode->i_op->rename_raw(&oldnd, &newnd);
++ 		/* the file system wants to use normal vfs path now */
++ 		if (error != -EOPNOTSUPP)
++ 			goto exit2;
++ 	}
++
+ 	trap = lock_rename(new_dir, old_dir);
+ 
+ 	old_dentry = lookup_hash(&oldnd.last, old_dir);
+@@ -2160,8 +2226,7 @@
+ 	if (new_dentry == trap)
+ 		goto exit5;
+ 
+-	error = vfs_rename(old_dir->d_inode, old_dentry,
+-				   new_dir->d_inode, new_dentry);
++	error = vfs_rename(old_dir->d_inode, old_dentry, new_dir->d_inode, new_dentry);
+ exit5:
+ 	dput(new_dentry);
+ exit4:
+Index: linux-2.6.0/fs/open.c
+===================================================================
+--- linux-2.6.0.orig/fs/open.c	2004-01-04 15:21:49.000000000 +0300
++++ linux-2.6.0/fs/open.c	2004-01-04 15:25:04.000000000 +0300
+@@ -180,9 +180,10 @@
+ 	return error;
+ }
+ 
+-int do_truncate(struct dentry *dentry, loff_t length)
++int do_truncate(struct dentry *dentry, loff_t length, int called_from_open)
+ {
+ 	int err;
++	struct inode_operations *op = dentry->d_inode->i_op;
+ 	struct iattr newattrs;
+ 
+ 	/* Not pretty: "inode->i_size" shouldn't really be signed. But it is. */
+@@ -193,7 +194,14 @@
+ 	newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
+ 	down(&dentry->d_inode->i_sem);
+ 	down_write(&dentry->d_inode->i_alloc_sem);
+-	err = notify_change(dentry, &newattrs);
++	if (called_from_open)
++ 		newattrs.ia_valid |= ATTR_FROM_OPEN;
++ 	if (op->setattr_raw) {
++ 		newattrs.ia_valid |= ATTR_RAW;
++ 		newattrs.ia_ctime = CURRENT_TIME;
++ 		err = op->setattr_raw(dentry->d_inode, &newattrs);
++ 	} else 
++                err = notify_change(dentry, &newattrs);
+ 	up_write(&dentry->d_inode->i_alloc_sem);
+ 	up(&dentry->d_inode->i_sem);
+ 	return err;
+@@ -249,7 +257,7 @@
+ 	error = locks_verify_truncate(inode, NULL, length);
+ 	if (!error) {
+ 		DQUOT_INIT(inode);
+-		error = do_truncate(nd.dentry, length);
++		error = do_truncate(nd.dentry, length, 0);
+ 	}
+ 	put_write_access(inode);
+ 
+@@ -301,7 +309,7 @@
+ 
+ 	error = locks_verify_truncate(inode, file, length);
+ 	if (!error)
+-		error = do_truncate(dentry, length);
++		error = do_truncate(dentry, length, 0);
+ out_putf:
+ 	fput(file);
+ out:
+@@ -380,9 +388,19 @@
+ 		    (error = permission(inode,MAY_WRITE,&nd)) != 0)
+ 			goto dput_and_out;
+ 	}
+-	down(&inode->i_sem);
+-	error = notify_change(nd.dentry, &newattrs);
+-	up(&inode->i_sem);
++	if (inode->i_op->setattr_raw) {
++		struct inode_operations *op = nd.dentry->d_inode->i_op;
++
++		newattrs.ia_valid |= ATTR_RAW;
++		error = op->setattr_raw(inode, &newattrs);
++		/* the file system wants to use normal vfs path now */
++		if (error != -EOPNOTSUPP)
++			goto dput_and_out;
++	} else {
++                down(&inode->i_sem);
++                error = notify_change(nd.dentry, &newattrs);
++                up(&inode->i_sem);
++        }
+ dput_and_out:
+ 	path_release(&nd);
+ out:
+@@ -433,9 +451,19 @@
+ 		    (error = permission(inode,MAY_WRITE,&nd)) != 0)
+ 			goto dput_and_out;
+ 	}
+-	down(&inode->i_sem);
+-	error = notify_change(nd.dentry, &newattrs);
+-	up(&inode->i_sem);
++	if (inode->i_op->setattr_raw) {
++		struct inode_operations *op = nd.dentry->d_inode->i_op;
++
++		newattrs.ia_valid |= ATTR_RAW;
++		error = op->setattr_raw(inode, &newattrs);
++		/* the file system wants to use normal vfs path now */
++		if (error != -EOPNOTSUPP)
++			goto dput_and_out;
++	} else {
++                down(&inode->i_sem);
++                error = notify_change(nd.dentry, &newattrs);
++                up(&inode->i_sem);
++        }
+ dput_and_out:
+ 	path_release(&nd);
+ out:
+@@ -636,6 +664,18 @@
+ 	if (IS_RDONLY(inode))
+ 		goto dput_and_out;
+ 	
++	if (inode->i_op->setattr_raw) {
++		struct inode_operations *op = nd.dentry->d_inode->i_op;
++
++		newattrs.ia_mode = mode;
++		newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
++		newattrs.ia_valid |= ATTR_RAW;
++		error = op->setattr_raw(inode, &newattrs);
++		/* the file system wants to use normal vfs path now */
++		if (error != -EOPNOTSUPP)
++			goto dput_and_out;
++	}
++
+ 	error = -EPERM;
+ 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
+ 		goto dput_and_out;
+@@ -669,6 +709,18 @@
+ 	if (IS_RDONLY(inode))
+ 		goto out;
+ 	error = -EPERM;
++	if (inode->i_op->setattr_raw) {
++		struct inode_operations *op = dentry->d_inode->i_op;
++
++		newattrs.ia_uid = user;
++		newattrs.ia_gid = group;
++		newattrs.ia_valid = ATTR_UID | ATTR_GID;
++		newattrs.ia_valid |= ATTR_RAW;
++		error = op->setattr_raw(inode, &newattrs);
++		/* the file system wants to use normal vfs path now */
++		if (error != -EOPNOTSUPP)
++			return error;
++	}
+ 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
+ 		goto out;
+ 	newattrs.ia_valid =  ATTR_CTIME;
+@@ -682,6 +734,7 @@
+ 	}
+ 	if (!S_ISDIR(inode->i_mode))
+ 		newattrs.ia_valid |= ATTR_KILL_SUID|ATTR_KILL_SGID;
++
+ 	down(&inode->i_sem);
+ 	error = notify_change(dentry, &newattrs);
+ 	up(&inode->i_sem);
+Index: linux-2.6.0/fs/exec.c
+===================================================================
+--- linux-2.6.0.orig/fs/exec.c	2004-01-04 15:21:49.000000000 +0300
++++ linux-2.6.0/fs/exec.c	2004-01-04 15:25:04.000000000 +0300
+@@ -1405,7 +1405,7 @@
+ 		goto close_fail;
+ 	if (!file->f_op->write)
+ 		goto close_fail;
+-	if (do_truncate(file->f_dentry, 0) != 0)
++	if (do_truncate(file->f_dentry, 0, 0) != 0)
+ 		goto close_fail;
+ 
+ 	retval = binfmt->core_dump(signr, regs, file);
+Index: linux-2.6.0/include/linux/fs.h
+===================================================================
+--- linux-2.6.0.orig/include/linux/fs.h	2004-01-04 15:21:49.000000000 +0300
++++ linux-2.6.0/include/linux/fs.h	2004-01-04 15:25:04.000000000 +0300
+@@ -836,13 +836,20 @@
+ 	int (*create) (struct inode *,struct dentry *,int, struct nameidata *);
+ 	struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *);
+ 	int (*link) (struct dentry *,struct inode *,struct dentry *);
++	int (*link_raw) (struct nameidata *,struct nameidata *);
+ 	int (*unlink) (struct inode *,struct dentry *);
++	int (*unlink_raw) (struct nameidata *);
+ 	int (*symlink) (struct inode *,struct dentry *,const char *);
++	int (*symlink_raw) (struct nameidata *,const char *);
+ 	int (*mkdir) (struct inode *,struct dentry *,int);
++	int (*mkdir_raw) (struct nameidata *,int);
+ 	int (*rmdir) (struct inode *,struct dentry *);
++	int (*rmdir_raw) (struct nameidata *);
+ 	int (*mknod) (struct inode *,struct dentry *,int,dev_t);
++	int (*mknod_raw) (struct nameidata *,int,dev_t);
+ 	int (*rename) (struct inode *, struct dentry *,
+ 			struct inode *, struct dentry *);
++	int (*rename_raw) (struct nameidata *, struct nameidata *);
+ 	int (*readlink) (struct dentry *, char __user *,int);
+ 	int (*follow_link) (struct dentry *, struct nameidata *);
+ 	void (*truncate) (struct inode *);
+@@ -1127,7 +1134,7 @@
+ 
+ asmlinkage long sys_open(const char __user *, int, int);
+ asmlinkage long sys_close(unsigned int);	/* yes, it's really unsigned */
+-extern int do_truncate(struct dentry *, loff_t start);
++extern int do_truncate(struct dentry *, loff_t start, int called_from_open);
+ 
+ extern struct file *filp_open(const char *, int, int);
+ extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
+Index: linux-2.6.0/net/unix/af_unix.c
+===================================================================
+--- linux-2.6.0.orig/net/unix/af_unix.c	2004-01-04 15:21:21.000000000 +0300
++++ linux-2.6.0/net/unix/af_unix.c	2004-01-04 15:25:18.000000000 +0300
+@@ -592,6 +592,7 @@
+ 	int err = 0;
+ 	
+ 	if (sunname->sun_path[0]) {
++		intent_init(&nd.intent, IT_LOOKUP);
+ 		err = path_lookup(sunname->sun_path, LOOKUP_FOLLOW, &nd);
+ 		if (err)
+ 			goto fail;
diff --git a/lustre/kernel_patches/patches/vfs_nointent_2.6.0-uml1.patch b/lustre/kernel_patches/patches/vfs_nointent_2.6.0-uml1.patch
new file mode 100644
index 0000000..99c09d1
--- /dev/null
+++ b/lustre/kernel_patches/patches/vfs_nointent_2.6.0-uml1.patch
@@ -0,0 +1,423 @@
+ 0 files changed
+
+Index: linux-2.6.0/fs/namei.c
+===================================================================
+--- linux-2.6.0.orig/fs/namei.c	2004-01-04 15:22:42.000000000 +0300
++++ linux-2.6.0/fs/namei.c	2004-01-04 15:25:04.000000000 +0300
+@@ -1270,7 +1270,7 @@
+ 		if (!error) {
+ 			DQUOT_INIT(inode);
+ 			
+-			error = do_truncate(dentry, 0);
++			error = do_truncate(dentry, 0, 1);
+ 		}
+ 		put_write_access(inode);
+ 		if (error)
+@@ -1521,6 +1521,7 @@
+ 	char * tmp;
+ 	struct dentry * dentry;
+ 	struct nameidata nd;
++	intent_init(&nd.intent, IT_LOOKUP);
+ 
+ 	if (S_ISDIR(mode))
+ 		return -EPERM;
+@@ -1531,6 +1532,15 @@
+ 	error = path_lookup(tmp, LOOKUP_PARENT, &nd);
+ 	if (error)
+ 		goto out;
++
++	if (nd.dentry->d_inode->i_op->mknod_raw) {
++		struct inode_operations *op = nd.dentry->d_inode->i_op;
++		error = op->mknod_raw(&nd, mode, dev);
++		/* the file system wants to use normal vfs path now */
++		if (error != -EOPNOTSUPP)
++			goto out2;
++	}
++
+ 	dentry = lookup_create(&nd, 0);
+ 	error = PTR_ERR(dentry);
+ 
+@@ -1557,6 +1567,7 @@
+ 		dput(dentry);
+ 	}
+ 	up(&nd.dentry->d_inode->i_sem);
++out2:
+ 	path_release(&nd);
+ out:
+ 	putname(tmp);
+@@ -1598,10 +1609,18 @@
+ 	if (!IS_ERR(tmp)) {
+ 		struct dentry *dentry;
+ 		struct nameidata nd;
++                intent_init(&nd.intent, IT_LOOKUP);
+ 
+ 		error = path_lookup(tmp, LOOKUP_PARENT, &nd);
+ 		if (error)
+ 			goto out;
++ 		if (nd.dentry->d_inode->i_op->mkdir_raw) {
++ 			struct inode_operations *op = nd.dentry->d_inode->i_op;
++ 			error = op->mkdir_raw(&nd, mode);
++ 			/* the file system wants to use normal vfs path now */
++ 			if (error != -EOPNOTSUPP)
++ 				goto out2;
++ 		}
+ 		dentry = lookup_create(&nd, 1);
+ 		error = PTR_ERR(dentry);
+ 		if (!IS_ERR(dentry)) {
+@@ -1611,6 +1630,7 @@
+ 			dput(dentry);
+ 		}
+ 		up(&nd.dentry->d_inode->i_sem);
++out2:
+ 		path_release(&nd);
+ out:
+ 		putname(tmp);
+@@ -1691,6 +1711,7 @@
+ 	char * name;
+ 	struct dentry *dentry;
+ 	struct nameidata nd;
++        intent_init(&nd.intent, IT_LOOKUP);
+ 
+ 	name = getname(pathname);
+ 	if(IS_ERR(name))
+@@ -1711,6 +1732,16 @@
+ 			error = -EBUSY;
+ 			goto exit1;
+ 	}
++ 
++ 	if (nd.dentry->d_inode->i_op->rmdir_raw) {
++ 		struct inode_operations *op = nd.dentry->d_inode->i_op;
++ 
++ 		error = op->rmdir_raw(&nd);
++ 		/* the file system wants to use normal vfs path now */
++ 		if (error != -EOPNOTSUPP)
++ 			goto exit1;
++ 	}
++ 
+ 	down(&nd.dentry->d_inode->i_sem);
+ 	dentry = lookup_hash(&nd.last, nd.dentry);
+ 	error = PTR_ERR(dentry);
+@@ -1769,6 +1800,7 @@
+ 	struct dentry *dentry;
+ 	struct nameidata nd;
+ 	struct inode *inode = NULL;
++        intent_init(&nd.intent, IT_LOOKUP);
+ 
+ 	name = getname(pathname);
+ 	if(IS_ERR(name))
+@@ -1780,6 +1812,13 @@
+ 	error = -EISDIR;
+ 	if (nd.last_type != LAST_NORM)
+ 		goto exit1;
++ 	if (nd.dentry->d_inode->i_op->unlink_raw) {
++ 		struct inode_operations *op = nd.dentry->d_inode->i_op;
++ 		error = op->unlink_raw(&nd);
++ 		/* the file system wants to use normal vfs path now */
++ 		if (error != -EOPNOTSUPP)
++ 			goto exit1;
++ 	}
+ 	down(&nd.dentry->d_inode->i_sem);
+ 	dentry = lookup_hash(&nd.last, nd.dentry);
+ 	error = PTR_ERR(dentry);
+@@ -1847,10 +1886,18 @@
+ 	if (!IS_ERR(to)) {
+ 		struct dentry *dentry;
+ 		struct nameidata nd;
++                intent_init(&nd.intent, IT_LOOKUP);
+ 
+ 		error = path_lookup(to, LOOKUP_PARENT, &nd);
+ 		if (error)
+ 			goto out;
++		if (nd.dentry->d_inode->i_op->symlink_raw) {
++			struct inode_operations *op = nd.dentry->d_inode->i_op;
++			error = op->symlink_raw(&nd, from);
++			/* the file system wants to use normal vfs path now */
++			if (error != -EOPNOTSUPP)
++				goto out2;
++		}
+ 		dentry = lookup_create(&nd, 0);
+ 		error = PTR_ERR(dentry);
+ 		if (!IS_ERR(dentry)) {
+@@ -1858,6 +1905,7 @@
+ 			dput(dentry);
+ 		}
+ 		up(&nd.dentry->d_inode->i_sem);
++out2:
+ 		path_release(&nd);
+ out:
+ 		putname(to);
+@@ -1921,6 +1969,8 @@
+ 	struct nameidata nd, old_nd;
+ 	int error;
+ 	char * to;
++        intent_init(&nd.intent, IT_LOOKUP);
++        intent_init(&old_nd.intent, IT_LOOKUP);
+ 
+ 	to = getname(newname);
+ 	if (IS_ERR(to))
+@@ -1935,6 +1985,13 @@
+ 	error = -EXDEV;
+ 	if (old_nd.mnt != nd.mnt)
+ 		goto out_release;
++        if (nd.dentry->d_inode->i_op->link_raw) {
++                struct inode_operations *op = nd.dentry->d_inode->i_op;
++                error = op->link_raw(&old_nd, &nd);
++                /* the file system wants to use normal vfs path now */
++                if (error != -EOPNOTSUPP)
++                        goto out_release;
++        }
+ 	new_dentry = lookup_create(&nd, 0);
+ 	error = PTR_ERR(new_dentry);
+ 	if (!IS_ERR(new_dentry)) {
+@@ -1985,7 +2042,7 @@
+  *	   locking].
+  */
+ int vfs_rename_dir(struct inode *old_dir, struct dentry *old_dentry,
+-	       struct inode *new_dir, struct dentry *new_dentry)
++                   struct inode *new_dir, struct dentry *new_dentry)
+ {
+ 	int error = 0;
+ 	struct inode *target;
+@@ -2030,7 +2087,7 @@
+ }
+ 
+ int vfs_rename_other(struct inode *old_dir, struct dentry *old_dentry,
+-	       struct inode *new_dir, struct dentry *new_dentry)
++                     struct inode *new_dir, struct dentry *new_dentry)
+ {
+ 	struct inode *target;
+ 	int error;
+@@ -2107,6 +2164,8 @@
+ 	struct dentry * old_dentry, *new_dentry;
+ 	struct dentry * trap;
+ 	struct nameidata oldnd, newnd;
++        intent_init(&oldnd.intent, IT_LOOKUP);
++        intent_init(&newnd.intent, IT_LOOKUP);
+ 
+ 	error = path_lookup(oldname, LOOKUP_PARENT, &oldnd);
+ 	if (error)
+@@ -2129,6 +2188,13 @@
+ 	if (newnd.last_type != LAST_NORM)
+ 		goto exit2;
+ 
++ 	if (old_dir->d_inode->i_op->rename_raw) {
++ 		error = old_dir->d_inode->i_op->rename_raw(&oldnd, &newnd);
++ 		/* the file system wants to use normal vfs path now */
++ 		if (error != -EOPNOTSUPP)
++ 			goto exit2;
++ 	}
++
+ 	trap = lock_rename(new_dir, old_dir);
+ 
+ 	old_dentry = lookup_hash(&oldnd.last, old_dir);
+@@ -2160,8 +2226,7 @@
+ 	if (new_dentry == trap)
+ 		goto exit5;
+ 
+-	error = vfs_rename(old_dir->d_inode, old_dentry,
+-				   new_dir->d_inode, new_dentry);
++	error = vfs_rename(old_dir->d_inode, old_dentry, new_dir->d_inode, new_dentry);
+ exit5:
+ 	dput(new_dentry);
+ exit4:
+Index: linux-2.6.0/fs/open.c
+===================================================================
+--- linux-2.6.0.orig/fs/open.c	2004-01-04 15:21:49.000000000 +0300
++++ linux-2.6.0/fs/open.c	2004-01-04 15:25:04.000000000 +0300
+@@ -180,9 +180,10 @@
+ 	return error;
+ }
+ 
+-int do_truncate(struct dentry *dentry, loff_t length)
++int do_truncate(struct dentry *dentry, loff_t length, int called_from_open)
+ {
+ 	int err;
++	struct inode_operations *op = dentry->d_inode->i_op;
+ 	struct iattr newattrs;
+ 
+ 	/* Not pretty: "inode->i_size" shouldn't really be signed. But it is. */
+@@ -193,7 +194,14 @@
+ 	newattrs.ia_size = length;
+ 	newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
+ 	down(&dentry->d_inode->i_sem);
+-	err = notify_change(dentry, &newattrs);
++	if (called_from_open)
++ 		newattrs.ia_valid |= ATTR_FROM_OPEN;
++ 	if (op->setattr_raw) {
++ 		newattrs.ia_valid |= ATTR_RAW;
++ 		newattrs.ia_ctime = CURRENT_TIME;
++ 		err = op->setattr_raw(dentry->d_inode, &newattrs);
++ 	} else 
++                err = notify_change(dentry, &newattrs);
+ 	up(&dentry->d_inode->i_sem);
+ 	return err;
+ }
+@@ -249,7 +257,7 @@
+ 	error = locks_verify_truncate(inode, NULL, length);
+ 	if (!error) {
+ 		DQUOT_INIT(inode);
+-		error = do_truncate(nd.dentry, length);
++		error = do_truncate(nd.dentry, length, 0);
+ 	}
+ 	put_write_access(inode);
+ 
+@@ -301,7 +309,7 @@
+ 
+ 	error = locks_verify_truncate(inode, file, length);
+ 	if (!error)
+-		error = do_truncate(dentry, length);
++		error = do_truncate(dentry, length, 0);
+ out_putf:
+ 	fput(file);
+ out:
+@@ -380,9 +388,19 @@
+ 		    (error = permission(inode,MAY_WRITE,&nd)) != 0)
+ 			goto dput_and_out;
+ 	}
+-	down(&inode->i_sem);
+-	error = notify_change(nd.dentry, &newattrs);
+-	up(&inode->i_sem);
++	if (inode->i_op->setattr_raw) {
++		struct inode_operations *op = nd.dentry->d_inode->i_op;
++
++		newattrs.ia_valid |= ATTR_RAW;
++		error = op->setattr_raw(inode, &newattrs);
++		/* the file system wants to use normal vfs path now */
++		if (error != -EOPNOTSUPP)
++			goto dput_and_out;
++	} else {
++                down(&inode->i_sem);
++                error = notify_change(nd.dentry, &newattrs);
++                up(&inode->i_sem);
++        }
+ dput_and_out:
+ 	path_release(&nd);
+ out:
+@@ -433,9 +451,19 @@
+ 		    (error = permission(inode,MAY_WRITE,&nd)) != 0)
+ 			goto dput_and_out;
+ 	}
+-	down(&inode->i_sem);
+-	error = notify_change(nd.dentry, &newattrs);
+-	up(&inode->i_sem);
++	if (inode->i_op->setattr_raw) {
++		struct inode_operations *op = nd.dentry->d_inode->i_op;
++
++		newattrs.ia_valid |= ATTR_RAW;
++		error = op->setattr_raw(inode, &newattrs);
++		/* the file system wants to use normal vfs path now */
++		if (error != -EOPNOTSUPP)
++			goto dput_and_out;
++	} else {
++                down(&inode->i_sem);
++                error = notify_change(nd.dentry, &newattrs);
++                up(&inode->i_sem);
++        }
+ dput_and_out:
+ 	path_release(&nd);
+ out:
+@@ -636,6 +664,18 @@
+ 	if (IS_RDONLY(inode))
+ 		goto dput_and_out;
+ 	
++	if (inode->i_op->setattr_raw) {
++		struct inode_operations *op = nd.dentry->d_inode->i_op;
++
++		newattrs.ia_mode = mode;
++		newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
++		newattrs.ia_valid |= ATTR_RAW;
++		error = op->setattr_raw(inode, &newattrs);
++		/* the file system wants to use normal vfs path now */
++		if (error != -EOPNOTSUPP)
++			goto dput_and_out;
++	}
++
+ 	error = -EPERM;
+ 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
+ 		goto dput_and_out;
+@@ -669,6 +709,18 @@
+ 	if (IS_RDONLY(inode))
+ 		goto out;
+ 	error = -EPERM;
++	if (inode->i_op->setattr_raw) {
++		struct inode_operations *op = dentry->d_inode->i_op;
++
++		newattrs.ia_uid = user;
++		newattrs.ia_gid = group;
++		newattrs.ia_valid = ATTR_UID | ATTR_GID;
++		newattrs.ia_valid |= ATTR_RAW;
++		error = op->setattr_raw(inode, &newattrs);
++		/* the file system wants to use normal vfs path now */
++		if (error != -EOPNOTSUPP)
++			return error;
++	}
+ 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
+ 		goto out;
+ 	newattrs.ia_valid =  ATTR_CTIME;
+@@ -682,6 +734,7 @@
+ 	}
+ 	if (!S_ISDIR(inode->i_mode))
+ 		newattrs.ia_valid |= ATTR_KILL_SUID|ATTR_KILL_SGID;
++
+ 	down(&inode->i_sem);
+ 	error = notify_change(dentry, &newattrs);
+ 	up(&inode->i_sem);
+Index: linux-2.6.0/fs/exec.c
+===================================================================
+--- linux-2.6.0.orig/fs/exec.c	2004-01-04 15:21:49.000000000 +0300
++++ linux-2.6.0/fs/exec.c	2004-01-04 15:25:04.000000000 +0300
+@@ -1405,7 +1405,7 @@
+ 		goto close_fail;
+ 	if (!file->f_op->write)
+ 		goto close_fail;
+-	if (do_truncate(file->f_dentry, 0) != 0)
++	if (do_truncate(file->f_dentry, 0, 0) != 0)
+ 		goto close_fail;
+ 
+ 	retval = binfmt->core_dump(signr, regs, file);
+Index: linux-2.6.0/include/linux/fs.h
+===================================================================
+--- linux-2.6.0.orig/include/linux/fs.h	2004-01-04 15:21:49.000000000 +0300
++++ linux-2.6.0/include/linux/fs.h	2004-01-04 15:25:04.000000000 +0300
+@@ -836,13 +836,20 @@
+ 	int (*create) (struct inode *,struct dentry *,int, struct nameidata *);
+ 	struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *);
+ 	int (*link) (struct dentry *,struct inode *,struct dentry *);
++	int (*link_raw) (struct nameidata *,struct nameidata *);
+ 	int (*unlink) (struct inode *,struct dentry *);
++	int (*unlink_raw) (struct nameidata *);
+ 	int (*symlink) (struct inode *,struct dentry *,const char *);
++	int (*symlink_raw) (struct nameidata *,const char *);
+ 	int (*mkdir) (struct inode *,struct dentry *,int);
++	int (*mkdir_raw) (struct nameidata *,int);
+ 	int (*rmdir) (struct inode *,struct dentry *);
++	int (*rmdir_raw) (struct nameidata *);
+ 	int (*mknod) (struct inode *,struct dentry *,int,dev_t);
++	int (*mknod_raw) (struct nameidata *,int,dev_t);
+ 	int (*rename) (struct inode *, struct dentry *,
+ 			struct inode *, struct dentry *);
++	int (*rename_raw) (struct nameidata *, struct nameidata *);
+ 	int (*readlink) (struct dentry *, char __user *,int);
+ 	int (*follow_link) (struct dentry *, struct nameidata *);
+ 	void (*truncate) (struct inode *);
+@@ -1127,7 +1134,7 @@
+ 
+ asmlinkage long sys_open(const char __user *, int, int);
+ asmlinkage long sys_close(unsigned int);	/* yes, it's really unsigned */
+-extern int do_truncate(struct dentry *, loff_t start);
++extern int do_truncate(struct dentry *, loff_t start, int called_from_open);
+ 
+ extern struct file *filp_open(const char *, int, int);
+ extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
+Index: linux-2.6.0/net/unix/af_unix.c
+===================================================================
+--- linux-2.6.0.orig/net/unix/af_unix.c	2004-01-04 15:21:21.000000000 +0300
++++ linux-2.6.0/net/unix/af_unix.c	2004-01-04 15:25:18.000000000 +0300
+@@ -592,6 +592,7 @@
+ 	int err = 0;
+ 	
+ 	if (sunname->sun_path[0]) {
++		intent_init(&nd.intent, IT_LOOKUP);
+ 		err = path_lookup(sunname->sun_path, LOOKUP_FOLLOW, &nd);
+ 		if (err)
+ 			goto fail;
diff --git a/lustre/kernel_patches/patches/vfs_nointent-2.6-suse.patch b/lustre/kernel_patches/patches/vfs_nointent_2.6.3-suse.patch
similarity index 76%
rename from lustre/kernel_patches/patches/vfs_nointent-2.6-suse.patch
rename to lustre/kernel_patches/patches/vfs_nointent_2.6.3-suse.patch
index 2bd3c6d..c72c0b9 100644
--- a/lustre/kernel_patches/patches/vfs_nointent-2.6-suse.patch
+++ b/lustre/kernel_patches/patches/vfs_nointent_2.6.3-suse.patch
@@ -2,10 +2,10 @@
 
 .old..........pc/vfs_nointent_2.6.0-suse/fs/namei.c
 .new.........fs/namei.c
-Index: linux-2.6.4-51.0/fs/namei.c
+Index: linux-2.6.3-20/fs/namei.c
 ===================================================================
---- linux-2.6.4-51.0.orig/fs/namei.c	2004-04-05 17:36:42.000000000 -0400
-+++ linux-2.6.4-51.0/fs/namei.c	2004-04-05 17:36:43.000000000 -0400
+--- linux-2.6.3-20.orig/fs/namei.c	2004-03-08 14:32:24.000000000 -0800
++++ linux-2.6.3-20/fs/namei.c	2004-03-08 14:40:01.000000000 -0800
 @@ -1276,7 +1276,7 @@
  		if (!error) {
  			DQUOT_INIT(inode);
@@ -82,18 +82,20 @@ Index: linux-2.6.4-51.0/fs/namei.c
  
  	name = getname(pathname);
  	if(IS_ERR(name))
-@@ -1716,6 +1737,14 @@
+@@ -1716,6 +1737,16 @@
  			error = -EBUSY;
  			goto exit1;
  	}
++ 
 + 	if (nd.dentry->d_inode->i_op->rmdir_raw) {
 + 		struct inode_operations *op = nd.dentry->d_inode->i_op;
-+
++ 
 + 		error = op->rmdir_raw(&nd);
 + 		/* the file system wants to use normal vfs path now */
 + 		if (error != -EOPNOTSUPP)
 + 			goto exit1;
 + 	}
++ 
  	down(&nd.dentry->d_inode->i_sem);
  	dentry = lookup_hash(&nd.last, nd.dentry);
  	error = PTR_ERR(dentry);
@@ -220,11 +222,13 @@ Index: linux-2.6.4-51.0/fs/namei.c
  exit5:
  	dput(new_dentry);
  exit4:
-Index: linux-2.6.4-51.0/fs/open.c
+.old..........pc/vfs_nointent_2.6.0-suse/fs/open.c
+.new.........fs/open.c
+Index: linux-2.6.3-20/fs/open.c
 ===================================================================
---- linux-2.6.4-51.0.orig/fs/open.c	2004-04-05 17:36:42.000000000 -0400
-+++ linux-2.6.4-51.0/fs/open.c	2004-04-06 01:37:39.000000000 -0400
-@@ -187,9 +187,10 @@
+--- linux-2.6.3-20.orig/fs/open.c	2004-03-08 14:23:40.000000000 -0800
++++ linux-2.6.3-20/fs/open.c	2004-03-08 14:40:01.000000000 -0800
+@@ -180,9 +180,10 @@
  	return error;
  }
  
@@ -236,23 +240,23 @@ Index: linux-2.6.4-51.0/fs/open.c
  	struct iattr newattrs;
  
  	/* Not pretty: "inode->i_size" shouldn't really be signed. But it is. */
-@@ -200,7 +201,14 @@
+@@ -192,7 +193,14 @@
+ 	newattrs.ia_size = length;
  	newattrs.ia_valid = ATTR_SIZE | ATTR_CTIME;
  	down(&dentry->d_inode->i_sem);
- 	down_write(&dentry->d_inode->i_alloc_sem);
 -	err = notify_change(dentry, &newattrs);
 +	if (called_from_open)
-+		newattrs.ia_valid |= ATTR_FROM_OPEN;
-+	if (op->setattr_raw) {
-+		newattrs.ia_valid |= ATTR_RAW;
-+		newattrs.ia_ctime = CURRENT_TIME;
-+		err = op->setattr_raw(dentry->d_inode, &newattrs);
-+	} else
-+		err = notify_change(dentry, &newattrs);
- 	up_write(&dentry->d_inode->i_alloc_sem);
++ 		newattrs.ia_valid |= ATTR_FROM_OPEN;
++ 	if (op->setattr_raw) {
++ 		newattrs.ia_valid |= ATTR_RAW;
++ 		newattrs.ia_ctime = CURRENT_TIME;
++ 		err = op->setattr_raw(dentry->d_inode, &newattrs);
++ 	} else 
++                err = notify_change(dentry, &newattrs);
  	up(&dentry->d_inode->i_sem);
  	return err;
-@@ -256,7 +264,7 @@
+ }
+@@ -247,7 +255,7 @@
  	error = locks_verify_truncate(inode, NULL, length);
  	if (!error) {
  		DQUOT_INIT(inode);
@@ -261,7 +265,7 @@ Index: linux-2.6.4-51.0/fs/open.c
  	}
  	put_write_access(inode);
  
-@@ -308,7 +316,7 @@
+@@ -299,7 +307,7 @@
  
  	error = locks_verify_truncate(inode, file, length);
  	if (!error)
@@ -270,7 +274,7 @@ Index: linux-2.6.4-51.0/fs/open.c
  out_putf:
  	fput(file);
  out:
-@@ -387,9 +395,19 @@
+@@ -378,9 +386,19 @@
  		    (error = permission(inode,MAY_WRITE,&nd)) != 0)
  			goto dput_and_out;
  	}
@@ -293,7 +297,7 @@ Index: linux-2.6.4-51.0/fs/open.c
  dput_and_out:
  	path_release(&nd);
  out:
-@@ -440,9 +458,19 @@
+@@ -431,9 +449,19 @@
  		    (error = permission(inode,MAY_WRITE,&nd)) != 0)
  			goto dput_and_out;
  	}
@@ -316,110 +320,26 @@ Index: linux-2.6.4-51.0/fs/open.c
  dput_and_out:
  	path_release(&nd);
  out:
-@@ -592,36 +620,52 @@
- 	return error;
- }
- 
--asmlinkage long sys_fchmod(unsigned int fd, mode_t mode)
-+int chmod_common(struct dentry *dentry, mode_t mode)
- {
--	struct inode * inode;
--	struct dentry * dentry;
--	struct file * file;
--	int err = -EBADF;
-+	struct inode * inode = dentry->d_inode;
- 	struct iattr newattrs;
-+	int error = -EROFS;
- 
--	file = fget(fd);
--	if (!file)
-+	if (IS_RDONLY(inode))
- 		goto out;
-+	
+@@ -634,6 +662,18 @@
+ 	if (IS_RDONLY(inode))
+ 		goto dput_and_out;
+ 	
 +	if (inode->i_op->setattr_raw) {
-+		struct inode_operations *op = dentry->d_inode->i_op;
- 
--	dentry = file->f_dentry;
--	inode = dentry->d_inode;
++		struct inode_operations *op = nd.dentry->d_inode->i_op;
++
 +		newattrs.ia_mode = mode;
 +		newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
 +		newattrs.ia_valid |= ATTR_RAW;
 +		error = op->setattr_raw(inode, &newattrs);
 +		/* the file system wants to use normal vfs path now */
 +		if (error != -EOPNOTSUPP)
-+			goto out;
++			goto dput_and_out;
 +	}
- 
--	err = -EROFS;
--	if (IS_RDONLY(inode))
--		goto out_putf;
--	err = -EPERM;
-+	error = -EPERM;
- 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
--		goto out_putf;
-+		goto out;
 +
- 	down(&inode->i_sem);
- 	if (mode == (mode_t) -1)
- 		mode = inode->i_mode;
- 	newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
- 	newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
--	err = notify_change(dentry, &newattrs);
-+	error = notify_change(dentry, &newattrs);
- 	up(&inode->i_sem);
-+out:
-+	return error;
-+}
- 
--out_putf:
-+asmlinkage long sys_fchmod(unsigned int fd, mode_t mode)
-+{
-+	struct file * file;
-+	int err = -EBADF;
-+
-+	file = fget(fd);
-+	if (!file)
-+		goto out;
-+
-+	err = chmod_common(file->f_dentry, mode);
- 	fput(file);
- out:
- 	return err;
-@@ -630,32 +674,13 @@
- asmlinkage long sys_chmod(const char __user * filename, mode_t mode)
- {
- 	struct nameidata nd;
--	struct inode * inode;
- 	int error;
--	struct iattr newattrs;
- 
- 	error = user_path_walk(filename, &nd);
- 	if (error)
- 		goto out;
--	inode = nd.dentry->d_inode;
--
--	error = -EROFS;
--	if (IS_RDONLY(inode))
--		goto dput_and_out;
--	
--	error = -EPERM;
--	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
--		goto dput_and_out;
--
--	down(&inode->i_sem);
--	if (mode == (mode_t) -1)
--		mode = inode->i_mode;
--	newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
--	newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
--	error = notify_change(nd.dentry, &newattrs);
--	up(&inode->i_sem);
- 
--dput_and_out:
-+	error = chmod_common(nd.dentry, mode);
- 	path_release(&nd);
- out:
- 	return error;
-@@ -676,6 +701,18 @@
+ 	error = -EPERM;
+ 	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
+ 		goto dput_and_out;
+@@ -667,6 +707,18 @@
  	if (IS_RDONLY(inode))
  		goto out;
  	error = -EPERM;
@@ -438,7 +358,7 @@ Index: linux-2.6.4-51.0/fs/open.c
  	if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
  		goto out;
  	newattrs.ia_valid =  ATTR_CTIME;
-@@ -689,6 +726,7 @@
+@@ -680,6 +732,7 @@
  	}
  	if (!S_ISDIR(inode->i_mode))
  		newattrs.ia_valid |= ATTR_KILL_SUID|ATTR_KILL_SGID;
@@ -446,11 +366,13 @@ Index: linux-2.6.4-51.0/fs/open.c
  	down(&inode->i_sem);
  	error = notify_change(dentry, &newattrs);
  	up(&inode->i_sem);
-Index: linux-2.6.4-51.0/fs/exec.c
+.old..........pc/vfs_nointent_2.6.0-suse/fs/exec.c
+.new.........fs/exec.c
+Index: linux-2.6.3-20/fs/exec.c
 ===================================================================
---- linux-2.6.4-51.0.orig/fs/exec.c	2004-04-05 17:36:42.000000000 -0400
-+++ linux-2.6.4-51.0/fs/exec.c	2004-04-05 17:36:43.000000000 -0400
-@@ -1418,7 +1418,7 @@
+--- linux-2.6.3-20.orig/fs/exec.c	2004-03-08 14:23:40.000000000 -0800
++++ linux-2.6.3-20/fs/exec.c	2004-03-08 14:40:01.000000000 -0800
+@@ -1406,7 +1406,7 @@
  		goto close_fail;
  	if (!file->f_op->write)
  		goto close_fail;
@@ -459,11 +381,13 @@ Index: linux-2.6.4-51.0/fs/exec.c
  		goto close_fail;
  
  	retval = binfmt->core_dump(signr, regs, file);
-Index: linux-2.6.4-51.0/include/linux/fs.h
+.old..........pc/vfs_nointent_2.6.0-suse/include/linux/fs.h
+.new.........include/linux/fs.h
+Index: linux-2.6.3-20/include/linux/fs.h
 ===================================================================
---- linux-2.6.4-51.0.orig/include/linux/fs.h	2004-04-05 17:36:43.000000000 -0400
-+++ linux-2.6.4-51.0/include/linux/fs.h	2004-04-05 17:36:43.000000000 -0400
-@@ -866,13 +866,20 @@
+--- linux-2.6.3-20.orig/include/linux/fs.h	2004-03-08 14:23:41.000000000 -0800
++++ linux-2.6.3-20/include/linux/fs.h	2004-03-08 14:42:10.000000000 -0800
+@@ -838,13 +838,20 @@
  	int (*create) (struct inode *,struct dentry *,int, struct nameidata *);
  	struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *);
  	int (*link) (struct dentry *,struct inode *,struct dentry *);
@@ -484,7 +408,7 @@ Index: linux-2.6.4-51.0/include/linux/fs.h
  	int (*readlink) (struct dentry *, char __user *,int);
  	int (*follow_link) (struct dentry *, struct nameidata *);
  	void (*truncate) (struct inode *);
-@@ -1169,7 +1176,7 @@
+@@ -1130,7 +1137,7 @@
  
  /* fs/open.c */
  
@@ -493,11 +417,13 @@ Index: linux-2.6.4-51.0/include/linux/fs.h
  extern struct file *filp_open(const char *, int, int);
  extern struct file * dentry_open(struct dentry *, struct vfsmount *, int);
  extern struct file * dentry_open_it(struct dentry *, struct vfsmount *, int, struct lookup_intent *);
-Index: linux-2.6.4-51.0/net/unix/af_unix.c
+.old..........pc/vfs_nointent_2.6.0-suse/net/unix/af_unix.c
+.new.........net/unix/af_unix.c
+Index: linux-2.6.3-20/net/unix/af_unix.c
 ===================================================================
---- linux-2.6.4-51.0.orig/net/unix/af_unix.c	2004-04-05 12:42:07.000000000 -0400
-+++ linux-2.6.4-51.0/net/unix/af_unix.c	2004-04-05 17:36:43.000000000 -0400
-@@ -676,6 +676,7 @@
+--- linux-2.6.3-20.orig/net/unix/af_unix.c	2004-03-05 02:07:04.000000000 -0800
++++ linux-2.6.3-20/net/unix/af_unix.c	2004-03-08 14:40:01.000000000 -0800
+@@ -592,6 +592,7 @@
  	int err = 0;
  	
  	if (sunname->sun_path[0]) {
diff --git a/lustre/kernel_patches/patches/vfs_races-2.6-suse.patch b/lustre/kernel_patches/patches/vfs_races_2.5.72_rev1.patch
similarity index 100%
rename from lustre/kernel_patches/patches/vfs_races-2.6-suse.patch
rename to lustre/kernel_patches/patches/vfs_races_2.5.72_rev1.patch
diff --git a/lustre/kernel_patches/patches/xattr-0.8.54-2.4.22-rh.patch b/lustre/kernel_patches/patches/xattr-0.8.54-2.4.22-rh.patch
index b221045..a213a48 100644
--- a/lustre/kernel_patches/patches/xattr-0.8.54-2.4.22-rh.patch
+++ b/lustre/kernel_patches/patches/xattr-0.8.54-2.4.22-rh.patch
@@ -64,7 +64,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -101,7 +101,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -150,7 +150,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -166,7 +166,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -182,7 +182,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -198,7 +198,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -214,7 +214,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -244,11 +244,18 @@
  	.llong .sys_perfmonctl   /* Put this here for now ... */
 --- linux-2.4.22-ac1/arch/ppc/defconfig~xattr-0.8.54-2.4.22-rh	2003-06-13 18:51:31.000000000 +0400
 +++ linux-2.4.22-ac1-alexey/arch/ppc/defconfig	2003-09-25 23:57:02.000000000 +0400
-@@ -1,6 +1,13 @@
+@@ -1,6 +1,20 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
++# CONFIG_EXT3_FS_XATTR_SHARING is not set
++# CONFIG_EXT3_FS_XATTR_USER is not set
++# CONFIG_EXT2_FS_XATTR is not set
++# CONFIG_EXT2_FS_XATTR_SHARING is not set
++# CONFIG_EXT2_FS_XATTR_USER is not set
++# CONFIG_FS_MBCACHE is not set
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -264,7 +271,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -313,7 +320,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -461,7 +468,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -477,7 +484,7 @@
  #
  # Automatically generated make config: don't edit
  #
-+CONFIG_EXT3_FS_XATTR=y
++# CONFIG_EXT3_FS_XATTR is not set
 +# CONFIG_EXT3_FS_XATTR_SHARING is not set
 +# CONFIG_EXT3_FS_XATTR_USER is not set
 +# CONFIG_EXT2_FS_XATTR is not set
@@ -1716,7 +1723,7 @@
 +		} else if (old_bh && header == HDR(old_bh)) {
 +			/* Keep this block. */
 +			new_bh = old_bh;
-+			(void)ext2_xattr_cache_insert(new_bh);
++			ext2_xattr_cache_insert(new_bh);
 +		} else {
 +			/* We need to allocate a new block */
 +			int force = EXT2_I(inode)->i_file_acl != 0;
@@ -1735,7 +1742,7 @@
 +			memcpy(new_bh->b_data, header, new_bh->b_size);
 +			mark_buffer_uptodate(new_bh, 1);
 +			unlock_buffer(new_bh);
-+			(void)ext2_xattr_cache_insert(new_bh);
++			ext2_xattr_cache_insert(new_bh);
 +			
 +			ext2_xattr_update_super_block(sb);
 +		}
@@ -3402,7 +3409,7 @@
 +		} else if (old_bh && header == HDR(old_bh)) {
 +			/* Keep this block. */
 +			new_bh = old_bh;
-+			(void)ext3_xattr_cache_insert(new_bh);
++			ext3_xattr_cache_insert(new_bh);
 +		} else {
 +			/* We need to allocate a new block */
 +			int force = EXT3_I(inode)->i_file_acl != 0;
@@ -3427,7 +3434,7 @@
 +			memcpy(new_bh->b_data, header, new_bh->b_size);
 +			mark_buffer_uptodate(new_bh, 1);
 +			unlock_buffer(new_bh);
-+			(void)ext3_xattr_cache_insert(new_bh);
++			ext3_xattr_cache_insert(new_bh);
 +			
 +			ext3_xattr_update_super_block(handle, sb);
 +		}
diff --git a/lustre/kernel_patches/series/2.6-suse.series b/lustre/kernel_patches/series/2.6-suse.series
deleted file mode 100644
index 15af341..0000000
--- a/lustre/kernel_patches/series/2.6-suse.series
+++ /dev/null
@@ -1,13 +0,0 @@
-lustre_version.patch
-vfs_intent-2.6-suse.patch 
-vfs_nointent-2.6-suse.patch 
-vfs_races-2.6-suse.patch
-ext3-wantedi-misc-2.6-suse.patch 
-nfs-cifs-intent-2.6-suse.patch 
-iopen-misc-2.6-suse.patch 
-export-truncate-2.6-suse.patch 
-export_symbols-2.6-suse.patch 
-removepage-2.6-suse.patch
-dev_read_only-2.6-suse.patch 
-export-2.6-suse.patch
-header-guards-2.6-suse.patch
diff --git a/lustre/kernel_patches/series/2.6.3-mm4 b/lustre/kernel_patches/series/2.6.3-mm4
new file mode 100644
index 0000000..cc9c683
--- /dev/null
+++ b/lustre/kernel_patches/series/2.6.3-mm4
@@ -0,0 +1,17 @@
+lustre_version.patch
+vfs_intent-2.6.3.patch 
+vfs_nointent-2.6.3-mm4.patch 
+vfs_races_2.5.72_rev1.patch
+ext3-wantedi-2.6.3.patch 
+ext3-san-jdike-2.5.73.patch
+iopen-2.6.3-mm4.patch 
+export-truncate-2.5.63.patch 
+export_symbols-2.6.0.patch 
+ext3-map_inode_page-2.6.0.patch 
+removepage-2.6.0.patch
+dev_read_only_2.6.0.patch 
+kernel_text_address-2.6.3.patch 
+ext3-init-generation-2.6.0.patch 
+ext3-ea-in-inode-2.6.0.patch
+fs-intent-2.6.3-mm4.patch 
+export-2.6.3.patch
diff --git a/lustre/kernel_patches/series/chaos-2.4.18 b/lustre/kernel_patches/series/chaos-2.4.18
index 99cdf04..9bd5681 100644
--- a/lustre/kernel_patches/series/chaos-2.4.18
+++ b/lustre/kernel_patches/series/chaos-2.4.18
@@ -36,6 +36,3 @@ ext3-xattr-ptr-arith-fix.patch
 kernel_text_address-2.4.18-chaos.patch
 procfs-ndynamic-2.4.patch 
 ext3-truncate-buffer-head.patch
-inode-max-readahead-2.4.24.patch
-dcache_refcount_debug.patch
-mkdep-revert-rh-2.4.patch
diff --git a/lustre/kernel_patches/series/chaos-2.4.18-pdirops b/lustre/kernel_patches/series/chaos-2.4.18-pdirops
index 456c2eb..c180a5b 100644
--- a/lustre/kernel_patches/series/chaos-2.4.18-pdirops
+++ b/lustre/kernel_patches/series/chaos-2.4.18-pdirops
@@ -33,4 +33,3 @@ ext3-extents-2.4.18-chaos-pdirops.patch
 nfs_export_kernel-2.4.18.patch
 ext3-raw-lookup-pdirops.patch
 ext3-truncate-buffer-head.patch
-mkdep-revert-rh-2.4.patch
diff --git a/lustre/kernel_patches/series/chaos-2.4.21 b/lustre/kernel_patches/series/chaos-2.4.21
index 0003912..bdcae1e 100644
--- a/lustre/kernel_patches/series/chaos-2.4.21
+++ b/lustre/kernel_patches/series/chaos-2.4.21
@@ -22,7 +22,7 @@ jbd-dont-account-blocks-twice.patch
 jbd-commit-tricks.patch
 ext3-o_direct-2.4.21-chaos.patch 
 ext3-no-write-super-chaos.patch
-add_page_private.patch 
+add_page_private.patch
 ext3-raw-lookup.patch
 nfs_export_kernel-2.4.21-chaos.patch 
 ext3-ea-in-inode-2.4.21-chaos.patch 
diff --git a/lustre/kernel_patches/series/kgdb_2.6.0 b/lustre/kernel_patches/series/kgdb_2.6.0
new file mode 100644
index 0000000..23d1f9f
--- /dev/null
+++ b/lustre/kernel_patches/series/kgdb_2.6.0
@@ -0,0 +1,20 @@
+2.6.0-mm2.patch 
+lustre_build.patch
+lustre_version.patch
+vfs_intent_2.6.0.patch 
+vfs_nointent_2.6.0-test6.patch 
+vfs_races_2.5.72_rev1.patch
+ext3-wantedi-2.6.patch 
+ext3-san-jdike-2.5.73.patch
+iopen-2.6.0-test6.patch 
+export-truncate-2.5.63.patch 
+qla2xxx-v8.00.00b1-2.5.73.patch
+export_symbols-2.6.0.patch 
+ext3-map_inode_page-2.6.0.patch 
+removepage-2.6.0.patch
+dev_read_only_2.6.0.patch 
+kernel_text_address-2.6.0.patch 
+ext3-init-generation-2.6.0.patch 
+invalidate_show-2.6.0.patch 
+ext3-start_this_handle-must-return-error.patch 
+ext3-ea-in-inode-2.6.0.patch
diff --git a/lustre/kernel_patches/series/kgdb_2.6.0_test1 b/lustre/kernel_patches/series/kgdb_2.6.0_test1
new file mode 100644
index 0000000..f061323
--- /dev/null
+++ b/lustre/kernel_patches/series/kgdb_2.6.0_test1
@@ -0,0 +1,16 @@
+2.6.0-test1-mm2.patch
+lkcd-cvs-2.6.0-test1.patch
+lkcd-kernel-changes-2.6.0-test1.patch
+kexec-2.6.0-full.patch
+dump_netdev.patch
+kgdb_eth.patch
+lustre_build.patch
+lustre_version.patch
+vfs_intent_2.6.0-test1.patch
+vfs_nointent_2.6.0-test1.patch
+vfs_races_2.5.72_rev1.patch
+vfs_mntcwd_2.5.72_rev1.patch
+ext3-san-jdike-2.5.73.patch
+iopen-2.5.73.patch
+export-truncate-2.5.63.patch
+qla2xxx-v8.00.00b1-2.5.73.patch
diff --git a/lustre/kernel_patches/series/kgdb_2.6.0_test6 b/lustre/kernel_patches/series/kgdb_2.6.0_test6
new file mode 100644
index 0000000..903a811
--- /dev/null
+++ b/lustre/kernel_patches/series/kgdb_2.6.0_test6
@@ -0,0 +1,23 @@
+2.6.0-test6-mm4.patch 
+netpoll-core.patch
+netpoll-pcnet32.patch
+kgdb-over-netpoll.patch 
+export-netpoll.patch 
+lkcd-cvs-2.6.0-test6.patch
+dump_netdev_over_netpoll.patch 
+netconsole-over-netpoll.patch 
+lkcd-kernel-changes-2.6.0-test6.patch 
+kexec-2.6.0-test6-full.patch
+lustre_build.patch
+lustre_version.patch
+vfs_intent_2.6.0-test6.patch 
+vfs_nointent_2.6.0-test6.patch 
+vfs_races_2.5.72_rev1.patch
+ext3-wantedi-2.6.patch 
+ext3-san-jdike-2.5.73.patch
+iopen-2.6.0-test6.patch 
+export-truncate-2.5.63.patch 
+qla2xxx-v8.00.00b1-2.5.73.patch
+export_symbols-2.6.0-test6.patch
+ext3-map_inode_page-2.6.0.patch 
+removepage-2.6.0.patch
diff --git a/lustre/kernel_patches/series/ldiskfs-2.6-suse.series b/lustre/kernel_patches/series/ldiskfs-2.6-suse.series
deleted file mode 100644
index cff99dd..0000000
--- a/lustre/kernel_patches/series/ldiskfs-2.6-suse.series
+++ /dev/null
@@ -1,9 +0,0 @@
-ext3-wantedi-2.6-suse.patch
-ext3-san-jdike-2.6-suse.patch
-iopen-2.6-suse.patch 
-export_symbols-ext3-2.6-suse.patch
-ext3-map_inode_page-2.6-suse.patch
-ext3-init-generation-2.6-suse.patch
-ext3-ea-in-inode-2.6-suse.patch
-export-ext3-2.6-suse.patch
-ext3-include-fixes-2.6-suse.patch
diff --git a/lustre/kernel_patches/series/ldiskfs-2.6.6-vanilla.series b/lustre/kernel_patches/series/ldiskfs-2.6.6-vanilla.series
deleted file mode 100644
index 3c72833..0000000
--- a/lustre/kernel_patches/series/ldiskfs-2.6.6-vanilla.series
+++ /dev/null
@@ -1,9 +0,0 @@
-ext3-wantedi-2.6-suse.patch
-ext3-san-jdike-2.6-suse.patch
-iopen-2.6-vanilla.patch 
-export_symbols-ext3-2.6-suse.patch
-ext3-map_inode_page-2.6-suse.patch
-ext3-init-generation-2.6-suse.patch
-ext3-ea-in-inode-2.6-suse.patch
-export-ext3-2.6-suse.patch
-ext3-include-fixes-2.6-suse.patch
diff --git a/lustre/kernel_patches/series/rh-2.4.20 b/lustre/kernel_patches/series/rh-2.4.20
index 0ad83a9..06b2642 100644
--- a/lustre/kernel_patches/series/rh-2.4.20
+++ b/lustre/kernel_patches/series/rh-2.4.20
@@ -45,4 +45,3 @@ ext3-xattr-ptr-arith-fix.patch
 procfs-ndynamic-2.4.patch
 ext3-truncate-buffer-head.patch
 inode-max-readahead-2.4.24.patch
-mkdep-revert-rh-2.4.patch
diff --git a/lustre/kernel_patches/series/suse-2.4.19 b/lustre/kernel_patches/series/suse-2.4.19
index 12eab3d..9905491 100644
--- a/lustre/kernel_patches/series/suse-2.4.19
+++ b/lustre/kernel_patches/series/suse-2.4.19
@@ -1,4 +1,4 @@
-dev_read_only-suse-2.4.19.patch
+dev_read_only_hp_2.4.20.patch
 exports_2.4.19-suse.patch 
 lustre_version.patch
 vfs_intent-2.4.19-suse.patch 
@@ -6,10 +6,11 @@ invalidate_show.patch
 export-truncate.patch
 iod-stock-24-exports-2.4.19-suse.patch 
 jbd-2.4.18-jcberr.patch
-ext-2.4-patch-1-suse-2.4.19.patch 
+ext-2.4-patch-1-chaos.patch 
 ext-2.4-patch-2.patch
 ext-2.4-patch-3.patch
 ext-2.4-patch-4.patch
+linux-2.4.20-xattr-0.8.54-hp.patch 
 linux-2.4.19-xattr-0.8.54-suse.patch 
 ext3-2.4-ino_t.patch
 ext3-largefile.patch
@@ -31,5 +32,5 @@ jbd-flushtime-2.4.19-suse.patch
 jbd-get_write_access.patch
 ext3-ea-in-inode-2.4.20.patch 
 listman-2.4.20.patch
-ext3-trusted_ea-suse-2.4.19.patch
+ext3-trusted_ea-2.4.20.patch 
 ext3-truncate-buffer-head.patch
diff --git a/lustre/kernel_patches/series/suse-2.4.21-2 b/lustre/kernel_patches/series/suse-2.4.21-2
index f4e7175..3593126 100644
--- a/lustre/kernel_patches/series/suse-2.4.21-2
+++ b/lustre/kernel_patches/series/suse-2.4.21-2
@@ -15,7 +15,7 @@ extN-wantedi-2.4.21-suse2.patch
 ext3-san-2.4.20.patch
 ext3-map_inode_page-2.4.21-suse2.patch 
 ext3-error-export.patch
-iopen-2.4.21-sles8sp3.patch
+iopen-2.4.19-suse.patch
 tcp-zero-copy-2.4.21-suse2.patch 
 jbd-dont-account-blocks-twice.patch
 jbd-commit-tricks.patch
diff --git a/lustre/kernel_patches/series/suse-2.6.3 b/lustre/kernel_patches/series/suse-2.6.3
new file mode 100644
index 0000000..f2c17c0
--- /dev/null
+++ b/lustre/kernel_patches/series/suse-2.6.3
@@ -0,0 +1,17 @@
+lustre_version.patch
+vfs_intent-2.6.3-suse.patch 
+vfs_nointent_2.6.3-suse.patch 
+vfs_races_2.5.72_rev1.patch
+ext3-wantedi-2.6.3.patch 
+ext3-san-jdike-2.5.73.patch
+nfs-cifs-intent-2.6.3-suse.patch
+iopen-2.6.0-test6.patch 
+export-truncate-2.5.63.patch 
+export_symbols-2.6.0.patch 
+ext3-map_inode_page-2.6.0.patch 
+removepage-2.6.0.patch
+dev_read_only_2.6.0.patch 
+kernel_text_address-2.6.3.patch 
+ext3-init-generation-2.6.0.patch 
+ext3-ea-in-inode-2.6.0.patch
+export-2.6.3.patch
diff --git a/lustre/kernel_patches/series/suse-sles8sp3-2.4.21 b/lustre/kernel_patches/series/suse-sles8sp3-2.4.21
deleted file mode 100644
index 5bc8822..0000000
--- a/lustre/kernel_patches/series/suse-sles8sp3-2.4.21
+++ /dev/null
@@ -1,31 +0,0 @@
-configurable-x86-stack-2.4.21-sles8sp3.patch 
-dev_read_only_2.4.20-rh.patch
-exports_2.4.20-rh-hp.patch
-lustre_version.patch
-vfs_intent-2.4.21-sles8sp3.patch 
-invalidate_show-2.4.21-sles8sp3.patch 
-iod-stock-24-exports_hp.patch
-ext3-htree-2.4.21-chaos.patch
-linux-2.4.21-xattr-0.8.54-suse2.patch
-ext3-orphan_lock-2.4.22-rh.patch 
-ext3-noread-2.4.21-suse2.patch
-ext3-delete_thread-2.4.21-chaos.patch 
-extN-wantedi-2.4.21-suse2.patch
-ext3-san-2.4.20.patch
-ext3-map_inode_page-2.4.21-suse2.patch 
-ext3-error-export.patch
-iopen-2.4.21-sles8sp3.patch 
-tcp-zero-copy-2.4.21-sles8sp3.patch 
-jbd-dont-account-blocks-twice.patch
-jbd-commit-tricks.patch
-ext3-no-write-super-chaos.patch
-add_page_private.patch
-nfs_export_kernel-2.4.21-suse2.patch
-ext3-raw-lookup.patch
-ext3-ea-in-inode-2.4.21-suse2.patch
-listman-2.4.20.patch
-gfp_memalloc-2.4.24.patch 
-ext3-xattr-ptr-arith-fix.patch
-kernel_text_address-2.4.21-sles8sp3.patch 
-ext3-truncate-buffer-head.patch
-export-truncate.patch
diff --git a/lustre/kernel_patches/series/uml_2.6.0 b/lustre/kernel_patches/series/uml_2.6.0
new file mode 100644
index 0000000..e1e602e
--- /dev/null
+++ b/lustre/kernel_patches/series/uml_2.6.0
@@ -0,0 +1,20 @@
+uml-patch-2.6.0-1.patch
+uml-patch-2.6.0-1-fix1.patch 
+lustre_build.patch
+lustre_version.patch
+vfs_intent_2.6.0.patch
+vfs_nointent_2.6.0-uml1.patch
+vfs_races_2.5.72_rev1.patch
+ext3-wantedi-2.6.patch 
+ext3-san-jdike-2.5.73.patch
+iopen-2.6.0-test6.patch 
+export-truncate-2.5.63.patch 
+qla2xxx-v8.00.00b1-2.5.73.patch
+export_symbols-2.6.0.patch 
+ext3-map_inode_page-2.6.0.patch 
+removepage-2.6.0.patch
+dev_read_only_2.6.0.patch 
+kernel_text_address-2.6.0.patch 
+ext3-init-generation-2.6.0.patch 
+ext3-start_this_handle-must-return-error.patch 
+ext3-ea-in-inode-2.6.0.patch
diff --git a/lustre/kernel_patches/series/uml_2.6.0_test3 b/lustre/kernel_patches/series/uml_2.6.0_test3
new file mode 100644
index 0000000..3474e04
--- /dev/null
+++ b/lustre/kernel_patches/series/uml_2.6.0_test3
@@ -0,0 +1,15 @@
+uml-patch-2.6.0-test5.patch
+lustre_build.patch
+lustre_version.patch
+vfs_intent_2.6.0-test1.patch
+vfs_nointent_2.6.0-test1.patch
+vfs_races_2.5.72_rev1.patch
+vfs_mntcwd_2.5.72_rev1.patch
+ext3-wantedi-2.6.patch
+ext3-san-jdike-2.5.73.patch
+iopen-2.6.0.patch
+export-truncate-2.5.63.patch
+qla2xxx-v8.00.00b1-2.5.73.patch
+uml-2.6.0-fix.patch
+ext3-map_inode_page-2.6.0.patch
+removepage-2.6.0.patch
diff --git a/lustre/kernel_patches/series/vanilla-2.4.20 b/lustre/kernel_patches/series/vanilla-2.4.20
index d11bec0..ae838ca 100644
--- a/lustre/kernel_patches/series/vanilla-2.4.20
+++ b/lustre/kernel_patches/series/vanilla-2.4.20
@@ -50,5 +50,7 @@ kernel_text_address-2.4.20-vanilla.patch
 ext3-xattr-ptr-arith-fix.patch
 gfp_memalloc-2.4.22.patch
 procfs-ndynamic-2.4.patch
+linux-2.4.20-tmpfs-xattr.patch
+linux-2.4.20-tmpfs-iopen.patch
 linux-2.4.20-filemap.patch
 ext3-truncate-buffer-head.patch
diff --git a/lustre/kernel_patches/series/vanilla-2.4.24 b/lustre/kernel_patches/series/vanilla-2.4.24
index 5c4852e..c7c2106 100644
--- a/lustre/kernel_patches/series/vanilla-2.4.24
+++ b/lustre/kernel_patches/series/vanilla-2.4.24
@@ -1,4 +1,4 @@
-uml-patch-2.4.24-1.patch
+uml-patch-2.4.23-1.patch
 uml-2.4.20-do_mmap_pgoff-fix.patch
 uml-export-end_iomem.patch 
 configurable-x86-stack-2.4.20.patch
@@ -25,7 +25,6 @@ jbd-commit-tricks.patch
 ext3-no-write-super-chaos.patch
 add_page_private.patch
 nfs_export_kernel-2.4.22.patch 
-ext3-raw-lookup.patch
 ext3-ea-in-inode-2.4.22-rh.patch
 listman-2.4.20.patch
 ext3-trusted_ea-2.4.20.patch
@@ -36,3 +35,7 @@ ext3-xattr-ptr-arith-fix.patch
 procfs-ndynamic-2.4.patch
 ext3-truncate-buffer-head.patch
 inode-max-readahead-2.4.24.patch
+dynamic-locks-2.4.24.patch 
+vfs-pdirops-2.4.20-rh.patch
+ext3-pdirops-2.4.24.patch 
+ext3-mds-num-2.4.24.patch 
diff --git a/lustre/kernel_patches/series/vanilla-2.6.3-nfs4 b/lustre/kernel_patches/series/vanilla-2.6.3-nfs4
new file mode 100644
index 0000000..9e4ff97
--- /dev/null
+++ b/lustre/kernel_patches/series/vanilla-2.6.3-nfs4
@@ -0,0 +1,20 @@
+uml-patch-2.6.3-rc2-1.patch
+uml-fix-2.6.3.patch
+lustre_version.patch
+vfs_intent-2.6.3.patch 
+vfs_nointent_2.6.0-uml1.patch
+vfs_races_2.5.72_rev1.patch
+ext3-wantedi-2.6.3.patch 
+ext3-san-jdike-2.5.73.patch
+iopen-2.6.0-test6.patch 
+export-truncate-2.5.63.patch 
+export_symbols-2.6.0.patch 
+ext3-map_inode_page-2.6.0.patch 
+removepage-2.6.0.patch
+dev_read_only_2.6.0.patch 
+kernel_text_address-2.6.3.patch 
+ext3-init-generation-2.6.0.patch 
+ext3-ea-in-inode-2.6.0.patch
+linux-2.6.3-CITI_NFS4_ALL.patch
+linux-2.6.3-nfs-intent.patch 
+export-2.6.3.patch
diff --git a/lustre/kernel_patches/series/vanilla-2.6.6 b/lustre/kernel_patches/series/vanilla-2.6.6
deleted file mode 100644
index 96eb50f..0000000
--- a/lustre/kernel_patches/series/vanilla-2.6.6
+++ /dev/null
@@ -1,13 +0,0 @@
-lustre_version.patch
-vfs_intent-2.6-suse.patch 
-vfs_nointent-2.6-suse.patch 
-vfs_races-2.6-suse.patch
-ext3-wantedi-misc-2.6-suse.patch 
-nfs-cifs-intent-2.6-suse.patch
-iopen-misc-2.6-suse.patch 
-export-truncate-2.6-suse.patch 
-export_symbols-2.6-suse.patch 
-removepage-vanilla-2.6.5.patch
-dev_read_only-2.6-suse.patch 
-export-2.6-suse.patch
-header-guards-2.6-suse.patch
diff --git a/lustre/kernel_patches/targets/2.6-suse.target b/lustre/kernel_patches/targets/2.6-suse.target
deleted file mode 100644
index ef3b1ae..0000000
--- a/lustre/kernel_patches/targets/2.6-suse.target
+++ /dev/null
@@ -1,13 +0,0 @@
-KERNEL=linux-2.6.4-51.8.tar.gz
-SERIES=2.6-suse
-VERSION=2.6.4
-EXTRA_VERSION=51.8_lustre
-RHBUILD=0
-
-BASE_ARCHS=""
-BIGMEM_ARCHS=""
-BOOT_ARCHS=""
-JENSEN_ARCHS=""
-SMP_ARCHS=""
-UP_ARCHS=""
-SRC_ARCHS=""
diff --git a/lustre/kernel_patches/targets/chaos-2.4.18.target b/lustre/kernel_patches/targets/chaos-2.4.18.target
deleted file mode 100644
index 22ed765..0000000
--- a/lustre/kernel_patches/targets/chaos-2.4.18.target
+++ /dev/null
@@ -1,13 +0,0 @@
-KERNEL=linux-2.4.18-p4smp-87chaos.tar.gz
-SERIES=chaos-2.4.18
-VERSION=2.4.18
-EXTRA_VERSION=p4smp-87chaos
-RHBUILD=0
-
-BASE_ARCHS="i686"
-BIGMEM_ARCHS=""
-BOOT_ARCHS=""
-JENSEN_ARCHS=""
-SMP_ARCHS="i686"
-UP_ARCHS=""
-SRC_ARCHS="i686"
diff --git a/lustre/kernel_patches/targets/rh-2.4.target b/lustre/kernel_patches/targets/rh-2.4.target
index f7e04c1..cca5324 100644
--- a/lustre/kernel_patches/targets/rh-2.4.target
+++ b/lustre/kernel_patches/targets/rh-2.4.target
@@ -1,13 +1,13 @@
-KERNEL=linux-2.4.20-31.9.tar.gz
+KERNEL=linux-2.4.20-28.9.tar.gz
 SERIES=rh-2.4.20
 VERSION=2.4.20
-EXTRA_VERSION=31.9_lustre
+EXTRA_VERSION=28.9_lustre
 RHBUILD=1
 
-BASE_ARCHS="i686"
+BASE_ARCHS="i586"
 BIGMEM_ARCHS=""
 BOOT_ARCHS=""
 JENSEN_ARCHS=""
-SMP_ARCHS="i686"
+SMP_ARCHS="i586"
 UP_ARCHS=""
-SRC_ARCHS="i686"
+SRC_ARCHS="i586"
diff --git a/lustre/kernel_patches/targets/suse-2.4.21-2.target b/lustre/kernel_patches/targets/suse-2.4.21-2.target
deleted file mode 100644
index c27c3de..0000000
--- a/lustre/kernel_patches/targets/suse-2.4.21-2.target
+++ /dev/null
@@ -1,14 +0,0 @@
-KERNEL=linux-2.4.21-x86_64.tar.gz
-SERIES=suse-2.4.21-2
-VERSION=2.4.21
-EXTRA_VERSION=lustre.1.2.1
-RHBUILD=0
-
-BASE_ARCHS="x86_64"
-BIGMEM_ARCHS=""
-BOOT_ARCH=""
-JENSEN_ARCHS=""
-SMP_ARCHS=""
-UP_ARCHS="x86_64"
-
-ARCH="x86_64"
diff --git a/lustre/kernel_patches/which_patch b/lustre/kernel_patches/which_patch
index 93f3411..f86c76d 100644
--- a/lustre/kernel_patches/which_patch
+++ b/lustre/kernel_patches/which_patch
@@ -6,4 +6,3 @@ vanilla-2.4.20         linux-2.4.20             patch with uml-2.4.20-6     um
 chaos-2.4.20           linux-chaos-2.4.20       same as rh-2.4.20-8         i386
 kgdb-2.5.73            linux-2.5.73             vanilla 2.5.73 with kgdb    i386
 bproc-2.4.20-hp-pnnl   linux-2.4.20-hp4_pnnl9   hp-pnnl + bproc             i386
-suse-2.4.19                                     SUSE ES 8
diff --git a/lustre/ldiskfs/.cvsignore b/lustre/ldiskfs/.cvsignore
deleted file mode 100644
index 9ad7f07..0000000
--- a/lustre/ldiskfs/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-.Xrefs
-config.log
-config.status
-configure
-Makefile
-.deps
-TAGS
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.cmd
-.*.flags
-.tmp_versions
-linux-stage
-linux
-*.c
-*.h
-sources
diff --git a/lustre/ldiskfs/Makefile.in b/lustre/ldiskfs/Makefile.in
deleted file mode 100644
index 7d1e229..0000000
--- a/lustre/ldiskfs/Makefile.in
+++ /dev/null
@@ -1,19 +0,0 @@
-default: all
-
-MODULES := ldiskfs
-
-# copy makefile over to not break patches
-ext3_extra := $(wildcard @LINUX@/fs/ext3/Makefile)
-
-ext3_headers := $(wildcard @LINUX@/fs/ext3/*.h)
-linux_headers := $(wildcard @LINUX@/include/linux/ext3*.h)
-
-ext3_sources := $(filter-out %.mod.c,$(wildcard @LINUX@/fs/ext3/*.c))
-new_sources := iopen.c iopen.h
-ldiskfs_sources := $(notdir $(ext3_sources) $(ext3_headers)) $(new_sources)
-
-ldiskfs-objs := $(filter %.o,$(ldiskfs_sources:.c=.o))
-
-EXTRA_PRE_CFLAGS := -I@LINUX@/fs -I@LUSTRE@ -I@LUSTRE@/ldiskfs
-
-@INCLUDE_RULES@
diff --git a/lustre/ldiskfs/autoMakefile.am b/lustre/ldiskfs/autoMakefile.am
deleted file mode 100644
index b24081e..0000000
--- a/lustre/ldiskfs/autoMakefile.am
+++ /dev/null
@@ -1,64 +0,0 @@
-if LDISKFS
-modulefs_DATA = ldiskfs$(KMODEXT)
-endif
-
-ldiskfs_linux_headers := $(addprefix linux/,$(subst ext3,ldiskfs,$(notdir $(linux_headers))))
-
-$(filter %.c,$(ldiskfs_sources)): sources $(ldiskfs_linux_headers) $(filter %.h,$(ldiskfs_sources))
-
-ldiskfs_sed_flags = \
-	-e "s/dx_hash_info/ext3_dx_hash_info/g" \
-	-e "s/dir_private_info/ext3_dir_private_info/g" \
-	-e "s/DX_HASH/EXT3_DX_HASH/g" \
-	-e "s/EXT3/LDISKFS/g" -e "s/ext3/ldiskfs/g"
-
-%.c: linux-stage/fs/ext3/%.c
-	sed $(strip $(ldiskfs_sed_flags)) $< > $@
-
-%.h: linux-stage/fs/ext3/%.h
-	sed $(strip $(ldiskfs_sed_flags)) $< > $@
-
-linux/ldiskfs%.h: linux-stage/include/linux/ext3%.h
-	sed $(strip $(ldiskfs_sed_flags)) $< > $@
-
-#
-# FIXME: we need to grab the series in configure somehow
-# (see bug 1679)
-#
-series := @top_srcdir@/kernel_patches/series/ldiskfs-2.6-suse.series
-
-sources: $(ext3_sources) $(ext3_headers) $(linux_headers) $(series)
-	rm -rf linux-stage linux sources $(ldiskfs_SOURCES)
-	mkdir -p linux-stage/fs/ext3 linux-stage/include/linux
-	cd linux-stage && quilt setup -l ../$(series)
-	cp $(ext3_sources) $(ext3_headers) $(ext3_extra) linux-stage/fs/ext3
-	cp $(linux_headers) linux-stage/include/linux
-	cd linux-stage && quilt push -a -q
-	mkdir linux
-	@echo -n "Replacing 'ext3' with 'ldiskfs':"
-	@for i in $(notdir $(ext3_headers) $(ext3_sources)) $(new_sources) ; do \
-		echo -n " $$i" ; \
-		sed $(strip $(ldiskfs_sed_flags)) \
-			linux-stage/fs/ext3/$$i > $$i ; \
-	done
-	@for i in $(subst ext3,,$(notdir $(linux_headers))) ; do \
-		echo -n " ext3$$i" ; \
-		sed $(strip $(ldiskfs_sed_flags)) \
-			linux-stage/include/linux/ext3$$i \
-			> linux/ldiskfs$$i ; \
-	done
-	touch sources
-
-foo-check:
-	@echo "ldiskfs_sources: $(ldiskfs_sources)"
-	@echo "ldiskfs_SOURCES: $(ldiskfs_SOURCES)"
-	@echo "ldiskfs_headers: $(ldiskfs_headers)"
-	@echo "ldiskfs_objects: $(ldiskfs_objects)"
-	@echo "ldiskfs_OBJECTS: $(ldiskfs_OBJECTS)"
-	@echo "ldiskfs_LDADD: $(ldiskfs_LDADD)"
-
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-CLEANFILES = sources *.c *.h
-
-clean: clean-am
-	rm -rf linux linux-stage
diff --git a/lustre/ldlm/.cvsignore b/lustre/ldlm/.cvsignore
index bde2a9f..e69dc6d 100644
--- a/lustre/ldlm/.cvsignore
+++ b/lustre/ldlm/.cvsignore
@@ -2,5 +2,3 @@
 Makefile
 Makefile.in
 .*.cmd
-.*.flags
-.tmp_versions
diff --git a/lustre/ldlm/Makefile.am b/lustre/ldlm/Makefile.am
index 7643aef..0da12fc 100644
--- a/lustre/ldlm/Makefile.am
+++ b/lustre/ldlm/Makefile.am
@@ -7,7 +7,13 @@
 # ldlm is built into ptlrpc
 #
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-DIST_SOURCES = ldlm_extent.c ldlm_flock.c ldlm_internal.h ldlm_lib.c \
-	ldlm_lock.c ldlm_lockd.c ldlm_plain.c ldlm_request.c	     \
-	ldlm_resource.c ldlm_test.c l_lock.c ldlm_inodebits.c
+DEFS= 
+
+if LIBLUSTRE
+lib_LIBRARIES = libldlm.a
+libldlm_a_SOURCES = l_lock.c ldlm_lock.c ldlm_resource.c ldlm_lib.c \
+  ldlm_plain.c ldlm_extent.c ldlm_request.c ldlm_lockd.c ldlm_internal.h
+libldlm_a_CFLAGS = -fPIC
+endif
+
+include $(top_srcdir)/Rules
diff --git a/lustre/ldlm/Makefile.mk b/lustre/ldlm/Makefile.mk
index b20c77a..650331e 100644
--- a/lustre/ldlm/Makefile.mk
+++ b/lustre/ldlm/Makefile.mk
@@ -7,5 +7,4 @@ include $(src)/../portals/Kernelenv
 
 obj-y += ldlm.o
 ldlm-objs := l_lock.o ldlm_lock.o ldlm_resource.o ldlm_extent.o ldlm_request.o \
-		ldlm_lockd.o ldlm_lib.o ldlm_flock.o ldlm_plain.o \
-		ldlm_inodebits.o
+		ldlm_lockd.o ldlm_lib.o ldlm_flock.o ldlm_plain.o
diff --git a/lustre/ldlm/ldlm_extent.c b/lustre/ldlm/ldlm_extent.c
index ea93e13..dd04c1c 100644
--- a/lustre/ldlm/ldlm_extent.c
+++ b/lustre/ldlm/ldlm_extent.c
@@ -45,7 +45,6 @@ ldlm_extent_internal_policy(struct list_head *queue, struct ldlm_lock *req,
         ldlm_mode_t req_mode = req->l_req_mode;
         __u64 req_start = req->l_req_extent.start;
         __u64 req_end = req->l_req_extent.end;
-        int conflicting = 0;
         ENTRY;
 
         lockmode_verify(req_mode);
@@ -66,24 +65,15 @@ ldlm_extent_internal_policy(struct list_head *queue, struct ldlm_lock *req,
                 if (req == lock)
                         continue;
 
-                /* Locks are compatible, overlap doesn't matter */
-                /* Until bug 20 is fixed, try to avoid granting overlapping
-                 * locks on one client (they take a long time to cancel) */
-                if (lockmode_compat(lock->l_req_mode, req_mode) &&
-                    lock->l_export != req->l_export)
-                        continue;
-
-                /* If this is a high-traffic lock, don't grow downwards at all
-                 * or grow upwards too much */
-                ++conflicting;
-                if (conflicting > 4)
-                        new_ex->start = req_start;
-
                 /* If lock doesn't overlap new_ex, skip it. */
                 if (l_extent->end < new_ex->start ||
                     l_extent->start > new_ex->end)
                         continue;
 
+                /* Locks are compatible, overlap doesn't matter */
+                if (lockmode_compat(lock->l_req_mode, req_mode))
+                        continue;
+
                 /* Locks conflicting in requested extents and we can't satisfy
                  * both locks, so ignore it.  Either we will ping-pong this
                  * extent (we would regardless of what extent we granted) or
@@ -95,10 +85,10 @@ ldlm_extent_internal_policy(struct list_head *queue, struct ldlm_lock *req,
                 /* We grow extents downwards only as far as they don't overlap
                  * with already-granted locks, on the assumtion that clients
                  * will be writing beyond the initial requested end and would
-                 * then need to enqueue a new lock beyond previous request.
-                 * l_req_extent->end strictly < req_start, checked above. */
-                if (l_extent->start < req_start && new_ex->start != req_start) {
-                        if (l_extent->end >= req_start)
+                 * then need to enqueue a new lock beyond the previous request.
+                 * We don't grow downwards if there are lots of lockers. */
+                if (l_extent->start < req_start) {
+                        if (atomic_read(&req->l_resource->lr_refcount) > 20)
                                 new_ex->start = req_start;
                         else
                                 new_ex->start = min(l_extent->end+1, req_start);
@@ -117,13 +107,6 @@ ldlm_extent_internal_policy(struct list_head *queue, struct ldlm_lock *req,
                                 new_ex->end = max(l_extent->start - 1, req_end);
                 }
         }
-
-#define LDLM_MAX_GROWN_EXTENT (32 * 1024 * 1024 - 1)
-        if (conflicting > 32 && (req_mode == LCK_PW || req_mode == LCK_CW)) {
-                if (req_end < req_start + LDLM_MAX_GROWN_EXTENT)
-                        new_ex->end = min(req_start + LDLM_MAX_GROWN_EXTENT,
-                                          new_ex->end);
-        }
         EXIT;
 }
 
@@ -164,7 +147,6 @@ ldlm_extent_compat_queue(struct list_head *queue, struct ldlm_lock *req,
         __u64 req_start = req->l_req_extent.start;
         __u64 req_end = req->l_req_extent.end;
         int compat = 1;
-        int scan = 0;
         ENTRY;
 
         lockmode_verify(req_mode);
@@ -175,43 +157,16 @@ ldlm_extent_compat_queue(struct list_head *queue, struct ldlm_lock *req,
                 if (req == lock)
                         RETURN(compat);
 
-                if (scan) {
-                        /* We only get here if we are queuing GROUP lock
-                           and met some incompatible one. The main idea of this
-                           code is to insert GROUP lock past compatible GROUP
-                           lock in the waiting queue or if there is not any,
-                           then in front of first non-GROUP lock */
-                        if (lock->l_req_mode != LCK_GROUP) {
-                        /* Ok, we hit non-GROUP lock, there should be no
-                           more GROUP locks later on, queue in front of
-                           first non-GROUP lock */
-
-                                ldlm_resource_insert_lock_after(lock, req);
-                                list_del_init(&lock->l_res_link);
-                                ldlm_resource_insert_lock_after(req, lock);
-                                RETURN(0);
-                        }
-                        if (req->l_policy_data.l_extent.gid ==
-                             lock->l_policy_data.l_extent.gid) {
-                                /* found it */
-                                ldlm_resource_insert_lock_after(lock,
-                                                                req);
-                                RETURN(0);
-                        }
-                        continue;
-                }
-
                 /* locks are compatible, overlap doesn't matter */
                 if (lockmode_compat(lock->l_req_mode, req_mode)) {
-                        /* non-group locks are compatible, overlap doesn't
-                           matter */
-                        if (req_mode != LCK_GROUP)
+                        /* nonCW locks are compatible, overlap doesn't matter */
+                        if (req_mode != LCK_CW)
                                 continue;
                                 
-                        /* If we are trying to get a GROUP lock and there is
+                        /* If we are trying to get a CW lock and there is
                            another one of this kind, we need to compare gid */
                         if (req->l_policy_data.l_extent.gid ==
-                            lock->l_policy_data.l_extent.gid) {
+                             lock->l_policy_data.l_extent.gid) {
                                 if (lock->l_req_mode == lock->l_granted_mode)
                                         RETURN(2);
 
@@ -236,31 +191,8 @@ ldlm_extent_compat_queue(struct list_head *queue, struct ldlm_lock *req,
                         }
                 }
 
-                if (req_mode == LCK_GROUP &&
-                    (lock->l_req_mode != lock->l_granted_mode)) {
-                        scan = 1;
-                        compat = 0;
-                        if (lock->l_req_mode != LCK_GROUP) {
-                        /* Ok, we hit non-GROUP lock, there should be no
-                           more GROUP locks later on, queue in front of
-                           first non-GROUP lock */
-
-                                ldlm_resource_insert_lock_after(lock, req);
-                                list_del_init(&lock->l_res_link);
-                                ldlm_resource_insert_lock_after(req, lock);
-                                RETURN(0);
-                        }
-                        if (req->l_policy_data.l_extent.gid ==
-                             lock->l_policy_data.l_extent.gid) {
-                                /* found it */
-                                ldlm_resource_insert_lock_after(lock, req);
-                                RETURN(0);
-                        }
-                        continue;
-                }
-
-                if (lock->l_req_mode == LCK_GROUP) {
-                        /* If compared lock is GROUP, then requested is PR/PW/=>
+                if (lock->l_req_mode == LCK_CW) {
+                        /* If compared lock is CW, then requested is PR/PW/ =>
                          * this is not compatible; extent range does not
                          * matter */
                         if (*flags & LDLM_FL_BLOCK_NOWAIT) {
@@ -271,7 +203,7 @@ ldlm_extent_compat_queue(struct list_head *queue, struct ldlm_lock *req,
                         }
                 } else if (lock->l_policy_data.l_extent.end < req_start ||
                            lock->l_policy_data.l_extent.start > req_end) {
-                        /* if a non grouplock doesn't overlap skip it */
+                        /* if a non-CW lock doesn't overlap skip it */
                         continue;
                 }
 
@@ -340,15 +272,13 @@ int ldlm_process_extent_lock(struct ldlm_lock *lock, int *flags, int first_enq,
         res->lr_tmp = &rpc_list;
         rc = ldlm_extent_compat_queue(&res->lr_granted, lock, 1, flags, err);
         if (rc < 0)
-                GOTO(out, rc); /* lock was destroyed */
-        if (rc == 2) {
-                res->lr_tmp = NULL;
+                RETURN(rc); /* lock was destroyed */
+        if (rc == 2)
                 goto grant;
-        }
 
         rc2 = ldlm_extent_compat_queue(&res->lr_waiting, lock, 1, flags, err);
         if (rc2 < 0)
-                GOTO(out, rc = rc2); /* lock was destroyed */
+                RETURN(rc2); /* lock was destroyed */
         res->lr_tmp = NULL;
 
         if (rc + rc2 == 2) {
@@ -372,10 +302,7 @@ int ldlm_process_extent_lock(struct ldlm_lock *lock, int *flags, int first_enq,
                         GOTO(restart, -ERESTART);
                 *flags |= LDLM_FL_BLOCK_GRANTED;
         }
-        rc = 0;
-out:
-        res->lr_tmp = NULL;
-        RETURN(rc);
+        RETURN(0);
 }
 
 /* When a lock is cancelled by a client, the KMS may undergo change if this
@@ -391,27 +318,15 @@ __u64 ldlm_extent_shift_kms(struct ldlm_lock *lock, __u64 old_kms)
         ENTRY;
 
         l_lock(&res->lr_namespace->ns_lock);
-
-        /* don't let another thread in ldlm_extent_shift_kms race in just after
-         * we finish and take our lock into account in its calculation of the
-         * kms */
-        lock->l_flags |= LDLM_FL_KMS_IGNORE;
-
         list_for_each(tmp, &res->lr_granted) {
                 lck = list_entry(tmp, struct ldlm_lock, l_res_link);
 
-                if (lck->l_flags & LDLM_FL_KMS_IGNORE)
+                if (lock == lck)
                         continue;
-
                 if (lck->l_policy_data.l_extent.end >= old_kms)
                         GOTO(out, kms = old_kms);
-
-                /* This extent _has_ to be smaller than old_kms (checked above)
-                 * so kms can only ever be smaller or the same as old_kms. */
-                if (lck->l_policy_data.l_extent.end + 1 > kms)
-                        kms = lck->l_policy_data.l_extent.end + 1;
+                kms = lck->l_policy_data.l_extent.end + 1;
         }
-        LASSERTF(kms <= old_kms, "kms "LPU64" old_kms "LPU64"\n", kms, old_kms);
 
         GOTO(out, kms);
  out:
diff --git a/lustre/ldlm/ldlm_internal.h b/lustre/ldlm/ldlm_internal.h
index 3a79a52..9b849a5 100644
--- a/lustre/ldlm/ldlm_internal.h
+++ b/lustre/ldlm/ldlm_internal.h
@@ -1,33 +1,5 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
- *  Copyright (c) 2002, 2003 Cluster File Systems, Inc.
- *   Author: Peter Braam <braam@clusterfs.com>
- *   Author: Phil Schwan <phil@clusterfs.com>
- *
- *   This file is part of Lustre, http://www.lustre.org.
- *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
- *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
 /* ldlm_request.c */
-typedef enum {
-        LDLM_ASYNC,
-        LDLM_SYNC,
-} ldlm_sync_t;
-
-int ldlm_cancel_lru(struct ldlm_namespace *ns, ldlm_sync_t sync);
+int ldlm_cancel_lru(struct ldlm_namespace *ns);
 
 /* ldlm_resource.c */
 void ldlm_resource_insert_lock_after(struct ldlm_lock *original,
@@ -35,7 +7,7 @@ void ldlm_resource_insert_lock_after(struct ldlm_lock *original,
 
 /* ldlm_lock.c */
 void ldlm_grant_lock(struct ldlm_lock *lock, void *data, int datalen,
-                     int run_ast);
+		     int run_ast);
 struct ldlm_lock *
 ldlm_lock_create(struct ldlm_namespace *ns,
                  struct lustre_handle *parent_lock_handle, struct ldlm_res_id,
@@ -54,8 +26,6 @@ int ldlm_run_ast_work(struct ldlm_namespace *, struct list_head *rpc_list);
 /* ldlm_lockd.c */
 int ldlm_bl_to_thread(struct ldlm_namespace *ns, struct ldlm_lock_desc *ld,
                       struct ldlm_lock *lock);
-void ldlm_handle_bl_callback(struct ldlm_namespace *ns,
-                             struct ldlm_lock_desc *ld, struct ldlm_lock *lock);
 
 /* ldlm_plain.c */
 int ldlm_process_plain_lock(struct ldlm_lock *lock, int *flags, int first_enq,
diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index 83ad3c2..57d1058 100644
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -46,7 +46,7 @@ int client_obd_setup(struct obd_device *obddev, obd_count len, void *buf)
         int rq_portal, rp_portal, connect_op;
         char *name = obddev->obd_type->typ_name;
         char *mgmt_name = NULL;
-        int rc;
+        int rc = 0;
         struct obd_device *mgmt_obd;
         mgmtcli_register_for_events_t register_f;
         ENTRY;
@@ -112,7 +112,7 @@ int client_obd_setup(struct obd_device *obddev, obd_count len, void *buf)
         cli->cl_max_pages_per_rpc = PTLRPC_MAX_BRW_PAGES;
         cli->cl_max_rpcs_in_flight = OSC_MAX_RIF_DEFAULT;
 
-        rc = ldlm_get_ref();
+        ldlm_get_ref();
         if (rc) {
                 CERROR("ldlm_get_ref failed: %d\n", rc);
                 GOTO(err, rc);
@@ -406,19 +406,8 @@ int target_handle_connect(struct ptlrpc_request *req, svc_handler_t handler)
         obd_str2uuid (&cluuid, str);
 
         /* XXX extract a nettype and format accordingly */
-        switch (sizeof(ptl_nid_t)) {
-                /* NB the casts only avoid compiler warnings */
-        case 8:
-                snprintf(remote_uuid.uuid, sizeof remote_uuid,
-                         "NET_"LPX64"_UUID", (__u64)req->rq_peer.peer_nid);
-                break;
-        case 4:
-                snprintf(remote_uuid.uuid, sizeof remote_uuid,
-                         "NET_%x_UUID", (__u32)req->rq_peer.peer_nid);
-                break;
-        default:
-                LBUG();
-        }
+        snprintf(remote_uuid.uuid, sizeof remote_uuid,
+                 "NET_"LPX64"_UUID", req->rq_peer.peer_nid);
 
         spin_lock_bh(&target->obd_processing_task_lock);
         abort_recovery = target->obd_abort_recovery;
@@ -713,6 +702,7 @@ void target_start_recovery_timer(struct obd_device *obd, svc_handler_t handler)
         obd->obd_recovery_handler = handler;
         obd->obd_recovery_timer.function = target_recovery_expired;
         obd->obd_recovery_timer.data = (unsigned long)obd;
+        init_timer(&obd->obd_recovery_timer);
         spin_unlock_bh(&obd->obd_processing_task_lock);
 
         reset_recovery_timer(obd);
diff --git a/lustre/ldlm/ldlm_lock.c b/lustre/ldlm/ldlm_lock.c
index ec07278..2a63c3f 100644
--- a/lustre/ldlm/ldlm_lock.c
+++ b/lustre/ldlm/ldlm_lock.c
@@ -45,8 +45,7 @@ char *ldlm_lockname[] = {
         [LCK_PR] "PR",
         [LCK_CW] "CW",
         [LCK_CR] "CR",
-        [LCK_NL] "NL",
-        [LCK_GROUP] "GROUP"
+        [LCK_NL] "NL"
 };
 char *ldlm_typename[] = {
         [LDLM_PLAIN] "PLN",
@@ -189,7 +188,6 @@ void ldlm_lock_destroy(struct ldlm_lock *lock)
         }
 
         if (!list_empty(&lock->l_res_link)) {
-                LDLM_ERROR(lock, "lock still on resource");
                 ldlm_lock_dump(D_ERROR, lock, 0);
                 LBUG();
         }
@@ -436,7 +434,7 @@ void ldlm_lock_addref_internal(struct ldlm_lock *lock, __u32 mode)
         ldlm_lock_remove_from_lru(lock);
         if (mode & (LCK_NL | LCK_CR | LCK_PR))
                 lock->l_readers++;
-        if (mode & (LCK_EX | LCK_CW | LCK_PW | LCK_GROUP))
+        if (mode & (LCK_EX | LCK_CW | LCK_PW))
                 lock->l_writers++;
         lock->l_last_used = jiffies;
         l_unlock(&lock->l_resource->lr_namespace->ns_lock);
@@ -456,7 +454,7 @@ void ldlm_lock_decref_internal(struct ldlm_lock *lock, __u32 mode)
                 LASSERT(lock->l_readers > 0);
                 lock->l_readers--;
         }
-        if (mode & (LCK_EX | LCK_CW | LCK_PW | LCK_GROUP)) {
+        if (mode & (LCK_EX | LCK_CW | LCK_PW)) {
                 LASSERT(lock->l_writers > 0);
                 lock->l_writers--;
         }
@@ -486,7 +484,7 @@ void ldlm_lock_decref_internal(struct ldlm_lock *lock, __u32 mode)
                 l_unlock(&ns->ns_lock);
 #else
                 l_unlock(&ns->ns_lock);
-                ldlm_handle_bl_callback(ns, NULL, lock);
+                liblustre_ldlm_handle_bl_callback(ns, NULL, lock);
 #endif
         } else if (ns->ns_client == LDLM_NAMESPACE_CLIENT &&
                    !lock->l_readers && !lock->l_writers) {
@@ -497,7 +495,7 @@ void ldlm_lock_decref_internal(struct ldlm_lock *lock, __u32 mode)
                 list_add_tail(&lock->l_lru, &ns->ns_unused_list);
                 ns->ns_nr_unused++;
                 l_unlock(&ns->ns_lock);
-                ldlm_cancel_lru(ns, LDLM_ASYNC);
+                ldlm_cancel_lru(ns);
         } else {
                 l_unlock(&ns->ns_lock);
         }
@@ -595,7 +593,7 @@ static struct ldlm_lock *search_queue(struct list_head *queue, ldlm_mode_t mode,
                         continue;
 
                 if (lock->l_resource->lr_type == LDLM_EXTENT &&
-                    mode == LCK_GROUP &&
+                    mode == LCK_CW &&
                     lock->l_policy_data.l_extent.gid != policy->l_extent.gid)
                         continue;
 
@@ -1051,7 +1049,8 @@ void ldlm_lock_cancel(struct ldlm_lock *lock)
         /* Please do not, no matter how tempting, remove this LBUG without
          * talking to me first. -phik */
         if (lock->l_readers || lock->l_writers) {
-                LDLM_ERROR(lock, "lock still has references");
+                LDLM_DEBUG(lock, "lock still has references");
+                ldlm_lock_dump(D_OTHER, lock, 0);
                 LBUG();
         }
 
@@ -1166,25 +1165,28 @@ void ldlm_lock_dump(int level, struct ldlm_lock *lock, int pos)
         if (lock->l_conn_export != NULL)
                 obd = lock->l_conn_export->exp_obd;
         if (lock->l_export && lock->l_export->exp_connection) {
-                CDEBUG(level, "  Node: NID %s on %s (rhandle: "LPX64")\n",
-                       ptlrpc_peernid2str(&lock->l_export->exp_connection->c_peer, str),
+                CDEBUG(level, "  Node: NID "LPX64" (%s) on %s (rhandle: "LPX64")\n",
+                       lock->l_export->exp_connection->c_peer.peer_nid,
+                       portals_nid2str(lock->l_export->exp_connection->c_peer.peer_ni->pni_number,
+                                       lock->l_export->exp_connection->c_peer.peer_nid, str),
                        lock->l_export->exp_connection->c_peer.peer_ni->pni_name,
                        lock->l_remote_handle.cookie);
         } else if (obd == NULL) {
                 CDEBUG(level, "  Node: local\n");
         } else {
                 struct obd_import *imp = obd->u.cli.cl_import;
-                CDEBUG(level, "  Node: NID %s on %s (rhandle: "LPX64")\n",
-                       ptlrpc_peernid2str(&imp->imp_connection->c_peer, str),
+                CDEBUG(level, "  Node: NID "LPX64" (%s) on %s (rhandle: "LPX64")\n",
+                       imp->imp_connection->c_peer.peer_nid,
+                       portals_nid2str(imp->imp_connection->c_peer.peer_ni->pni_number,
+                                       imp->imp_connection->c_peer.peer_nid, str),
                        imp->imp_connection->c_peer.peer_ni->pni_name,
                        lock->l_remote_handle.cookie);
         }
         CDEBUG(level, "  Resource: %p ("LPU64"/"LPU64")\n", lock->l_resource,
                lock->l_resource->lr_name.name[0],
                lock->l_resource->lr_name.name[1]);
-        CDEBUG(level, "  Req mode: %s, grant mode: %s, rc: %u, read: %d, "
-               "write: %d\n", ldlm_lockname[lock->l_req_mode],
-               ldlm_lockname[lock->l_granted_mode],
+        CDEBUG(level, "  Req mode: %d, grant mode: %d, rc: %u, read: %d, "
+               "write: %d\n", (int)lock->l_req_mode, (int)lock->l_granted_mode,
                atomic_read(&lock->l_refc), lock->l_readers, lock->l_writers);
         if (lock->l_resource->lr_type == LDLM_EXTENT)
                 CDEBUG(level, "  Extent: "LPU64" -> "LPU64
diff --git a/lustre/ldlm/ldlm_lockd.c b/lustre/ldlm/ldlm_lockd.c
index cfd1c8c..a46dd73 100644
--- a/lustre/ldlm/ldlm_lockd.c
+++ b/lustre/ldlm/ldlm_lockd.c
@@ -126,6 +126,7 @@ static int expired_lock_main(void *arg)
         wake_up(&expired_lock_thread.elt_waitq);
 
         while (1) {
+                struct list_head *tmp, *n, work_list;
                 l_wait_event(expired_lock_thread.elt_waitq,
                              have_expired_locks() ||
                              expired_lock_thread.elt_state == ELT_TERMINATE,
@@ -133,30 +134,33 @@ static int expired_lock_main(void *arg)
 
                 spin_lock_bh(&expired_lock_thread.elt_lock);
                 while (!list_empty(expired)) {
-                        struct obd_export *export;
                         struct ldlm_lock *lock;
 
-                        lock = list_entry(expired->next, struct ldlm_lock,
-                                          l_pending_chain);
-                        if ((void *)lock < LP_POISON + PAGE_SIZE &&
-                            (void *)lock >= LP_POISON) {
-                                CERROR("free lock on elt list %p\n", lock);
-                                LBUG();
-                        }
-                        list_del_init(&lock->l_pending_chain);
-                        if ((void *)lock->l_export < LP_POISON + PAGE_SIZE &&
-                            (void *)lock->l_export >= LP_POISON + PAGE_SIZE) {
-                                CERROR("lock with free export on elt list %p\n",
-                                       export);
-                                lock->l_export = NULL;
-                                LDLM_ERROR(lock, "free export\n");
-                                continue;
+                        list_add(&work_list, expired);
+                        list_del_init(expired);
+
+                        list_for_each_entry(lock, &work_list, l_pending_chain) {
+                                LDLM_DEBUG(lock, "moving to work list");
                         }
-                        export = class_export_get(lock->l_export);
+
                         spin_unlock_bh(&expired_lock_thread.elt_lock);
 
-                        ptlrpc_fail_export(export);
-                        class_export_put(export);
+
+                        list_for_each_safe(tmp, n, &work_list) {
+                                 lock = list_entry(tmp, struct ldlm_lock,
+                                                   l_pending_chain);
+                                 ptlrpc_fail_export(lock->l_export);
+                        }
+
+
+                        if (!list_empty(&work_list)) {
+                                list_for_each_entry(lock, &work_list, l_pending_chain) {
+                                        LDLM_ERROR(lock, "still on work list!");
+                                }
+                        }
+                        LASSERTF (list_empty(&work_list),
+                                  "some exports not failed properly\n");
+
                         spin_lock_bh(&expired_lock_thread.elt_lock);
                 }
                 spin_unlock_bh(&expired_lock_thread.elt_lock);
@@ -181,14 +185,17 @@ static void waiting_locks_callback(unsigned long unused)
                                   l_pending_chain);
 
                 if ((lock->l_callback_timeout > jiffies) ||
-                    (lock->l_req_mode == LCK_GROUP))
+                    (lock->l_req_mode == LCK_CW))
                         break;
 
                 LDLM_ERROR(lock, "lock callback timer expired: evicting client "
-                           "%s@%s nid %s ",
+                           "%s@%s nid "LPX64" (%s) ",
                            lock->l_export->exp_client_uuid.uuid,
                            lock->l_export->exp_connection->c_remote_uuid.uuid,
-                           ptlrpc_peernid2str(&lock->l_export->exp_connection->c_peer, str));
+                           lock->l_export->exp_connection->c_peer.peer_nid,
+                           portals_nid2str(lock->l_export->exp_connection->c_peer.peer_ni->pni_number,
+                                           lock->l_export->exp_connection->c_peer.peer_nid,
+                                           str));
 
                 spin_lock_bh(&expired_lock_thread.elt_lock);
                 list_del(&lock->l_pending_chain);
@@ -304,57 +311,24 @@ int ldlm_del_waiting_lock(struct ldlm_lock *lock)
 
 #endif /* __KERNEL__ */
 
-static void ldlm_failed_ast(struct ldlm_lock *lock, int rc,const char *ast_type)
+static void ldlm_failed_ast(struct ldlm_lock *lock, int rc, char *ast_type)
 {
-        struct ptlrpc_connection *conn = lock->l_export->exp_connection;
+        const struct ptlrpc_connection *conn = lock->l_export->exp_connection;
         char str[PTL_NALFMT_SIZE];
 
-        LDLM_ERROR(lock, "%s AST failed (%d): evicting client %s@%s NID "LPX64
-                   " (%s)", ast_type, rc, lock->l_export->exp_client_uuid.uuid,
-                   conn->c_remote_uuid.uuid, conn->c_peer.peer_nid,
-                   ptlrpc_peernid2str(&conn->c_peer, str));
+        CERROR("%s AST failed (%d) for res "LPU64"/"LPU64
+               ", mode %s: evicting client %s@%s NID "LPX64" (%s)\n",
+               ast_type, rc,
+               lock->l_resource->lr_name.name[0],
+               lock->l_resource->lr_name.name[1],
+               ldlm_lockname[lock->l_granted_mode],
+               lock->l_export->exp_client_uuid.uuid,
+               conn->c_remote_uuid.uuid, conn->c_peer.peer_nid,
+               portals_nid2str(conn->c_peer.peer_ni->pni_number,
+                               conn->c_peer.peer_nid, str));
         ptlrpc_fail_export(lock->l_export);
 }
 
-static int ldlm_handle_ast_error(struct ldlm_lock *lock,
-                                 struct ptlrpc_request *req, int rc,
-                                 const char *ast_type)
-{
-        struct ptlrpc_peer *peer = &req->rq_import->imp_connection->c_peer;
-        char str[PTL_NALFMT_SIZE];
-
-        if (rc == -ETIMEDOUT || rc == -EINTR || rc == -ENOTCONN) {
-                LASSERT(lock->l_export);
-                if (lock->l_export->exp_libclient) {
-                        LDLM_DEBUG(lock, "%s AST to liblustre client (nid %s)"
-                                   " timeout, just cancelling lock", ast_type,
-                                   ptlrpc_peernid2str(peer, str));
-                        ldlm_lock_cancel(lock);
-                        rc = -ERESTART;
-                } else {
-                        ldlm_del_waiting_lock(lock);
-                        ldlm_failed_ast(lock, rc, ast_type);
-                }
-        } else if (rc) {
-                if (rc == -EINVAL)
-                        LDLM_DEBUG(lock, "client (nid %s) returned %d"
-                                   " from %s AST - normal race",
-                                   ptlrpc_peernid2str(peer, str),
-                                   req->rq_repmsg->status, ast_type);
-                else
-                        LDLM_ERROR(lock, "client (nid %s) returned %d "
-                                   "from %s AST", ptlrpc_peernid2str(peer, str),
-                                   (req->rq_repmsg != NULL) ?
-                                   req->rq_repmsg->status : 0, ast_type);
-                ldlm_lock_cancel(lock);
-                /* Server-side AST functions are called from ldlm_reprocess_all,
-                 * which needs to be told to please restart its reprocessing. */
-                rc = -ERESTART;
-        }
-
-        return rc;
-}
-
 int ldlm_server_blocking_ast(struct ldlm_lock *lock,
                              struct ldlm_lock_desc *desc,
                              void *data, int flag)
@@ -416,8 +390,44 @@ int ldlm_server_blocking_ast(struct ldlm_lock *lock,
         req->rq_send_state = LUSTRE_IMP_FULL;
         req->rq_timeout = 2; /* 2 second timeout for initial AST reply */
         rc = ptlrpc_queue_wait(req);
-        if (rc != 0)
-                rc = ldlm_handle_ast_error(lock, req, rc, "blocking");
+        if (rc == -ETIMEDOUT || rc == -EINTR || rc == -ENOTCONN) {
+                LASSERT(lock->l_export);
+                if (lock->l_export->exp_libclient) {
+                        CDEBUG(D_HA, "BLOCKING AST to liblustre client (nid "
+                               LPU64") timeout, simply cancel lock 0x%p\n",
+                               req->rq_peer.peer_nid, lock);
+                        ldlm_lock_cancel(lock);
+                        rc = -ERESTART;
+                } else {
+                        ldlm_del_waiting_lock(lock);
+                        ldlm_failed_ast(lock, rc, "blocking");
+                }
+        } else if (rc) {
+                if (rc == -EINVAL)
+                        CDEBUG(D_DLMTRACE, "client (nid "LPU64") returned %d "
+                               "from blocking AST for lock %p--normal race\n",
+                               req->rq_peer.peer_nid,
+                               req->rq_repmsg->status, lock);
+                else if (rc == -ENOTCONN)
+                        CDEBUG(D_DLMTRACE, "client (nid "LPU64") returned %d "
+                               "from blocking AST for lock %p--this client was "
+                               "probably rebooted while it held a lock, nothing"
+                               " serious\n",req->rq_peer.peer_nid,
+                               req->rq_repmsg->status, lock);
+                else
+                        CDEBUG(D_ERROR, "client (nid "LPU64") returned %d "
+                               "from blocking AST for lock %p\n",
+                               req->rq_peer.peer_nid,
+                               (req->rq_repmsg != NULL)?
+                               req->rq_repmsg->status : 0,
+                               lock);
+                LDLM_DEBUG(lock, "client sent rc %d rq_status %d from blocking "
+                           "AST", rc, req->rq_status);
+                ldlm_lock_cancel(lock);
+                /* Server-side AST functions are called from ldlm_reprocess_all,
+                 * which needs to be told to please restart its reprocessing. */
+                rc = -ERESTART;
+        }
 
         ptlrpc_req_finished(req);
 
@@ -487,9 +497,21 @@ int ldlm_server_completion_ast(struct ldlm_lock *lock, int flags, void *data)
         l_unlock(&lock->l_resource->lr_namespace->ns_lock);
 
         rc = ptlrpc_queue_wait(req);
-        if (rc != 0)
-                rc = ldlm_handle_ast_error(lock, req, rc, "completion");
-
+        if ((rc == -ETIMEDOUT || rc == -EINTR || rc == -ENOTCONN) &&
+             !lock->l_export->exp_libclient) {
+                ldlm_del_waiting_lock(lock);
+                ldlm_failed_ast(lock, rc, "completion");
+        } else if (rc == -EINVAL) {
+                LDLM_DEBUG(lock, "lost the race -- client no longer has this "
+                           "lock");
+        } else if (rc) {
+                LDLM_ERROR(lock, "client sent rc %d rq_status %d from "
+                           "completion AST", rc, req->rq_status);
+                ldlm_lock_cancel(lock);
+                /* Server-side AST functions are called from ldlm_reprocess_all,
+                 * which needs to be told to please restart its reprocessing. */
+                rc = -ERESTART;
+        }
         ptlrpc_req_finished(req);
 
         RETURN(rc);
@@ -522,13 +544,23 @@ int ldlm_server_glimpse_ast(struct ldlm_lock *lock, void *data)
         req->rq_timeout = 2; /* 2 second timeout for initial AST reply */
 
         rc = ptlrpc_queue_wait(req);
-        if (rc == -ELDLM_NO_LOCK_DATA)
-                LDLM_DEBUG(lock, "lost race - client has a lock but no inode");
-        else if (rc != 0)
-                rc = ldlm_handle_ast_error(lock, req, rc, "glimpse");
-        else
+        if ((rc == -ETIMEDOUT || rc == -EINTR || rc == -ENOTCONN) &&
+            !lock->l_export->exp_libclient) {
+                ldlm_del_waiting_lock(lock);
+                ldlm_failed_ast(lock, rc, "glimpse");
+        } else if (rc == -EINVAL) {
+                LDLM_DEBUG(lock, "lost the race -- client no longer has this "
+                           "lock");
+        } else if (rc == -ELDLM_NO_LOCK_DATA) {
+                LDLM_DEBUG(lock, "lost a race -- client has a lock, but no "
+                           "inode");
+        } else if (rc) {
+                LDLM_ERROR(lock, "client sent rc %d rq_status %d from "
+                           "glimpse AST", rc, req->rq_status);
+        } else {
                 rc = res->lr_namespace->ns_lvbo->lvbo_update
                         (res, req->rq_repmsg, 0, 1);
+        }
         ptlrpc_req_finished(req);
         RETURN(rc);
 }
@@ -592,9 +624,6 @@ int ldlm_handle_enqueue(struct ptlrpc_request *req,
                         buffers = 2;
                 }
 
-                if (OBD_FAIL_CHECK_ONCE(OBD_FAIL_LDLM_ENQUEUE_EXTENT_ERR))
-                        GOTO(out, rc = -ENOMEM);
-
                 rc = lustre_pack_reply(req, buffers, size, NULL);
                 if (rc)
                         GOTO(out, rc);
@@ -634,7 +663,6 @@ int ldlm_handle_enqueue(struct ptlrpc_request *req,
                 err = lustre_pack_reply(req, 0, NULL, NULL);
                 if (rc == 0)
                         rc = err;
-                req->rq_status = rc;
         }
 
         /* The LOCK_CHANGED code in ldlm_lock_enqueue depends on this
@@ -643,10 +671,9 @@ int ldlm_handle_enqueue(struct ptlrpc_request *req,
                 LDLM_DEBUG(lock, "server-side enqueue handler, sending reply"
                            "(err=%d, rc=%d)", err, rc);
 
-                if (lock->l_resource->lr_lvb_len > 0 && rc == 0) {
+                if (lock->l_resource->lr_lvb_len > 0) {
                         void *lvb = lustre_msg_buf(req->rq_repmsg, 1,
                                                   lock->l_resource->lr_lvb_len);
-                        LASSERT(lvb != NULL);
                         memcpy(lvb, lock->l_resource->lr_lvb_data,
                                lock->l_resource->lr_lvb_len);
                 }
@@ -731,10 +758,12 @@ int ldlm_handle_cancel(struct ptlrpc_request *req)
         lock = ldlm_handle2lock(&dlm_req->lock_handle1);
         if (!lock) {
                 CERROR("received cancel for unknown lock cookie "LPX64
-                       " from client %s nid %s\n",
+                       " from client %s nid "LPX64" (%s)\n",
                        dlm_req->lock_handle1.cookie,
                        req->rq_export->exp_client_uuid.uuid,
-                       ptlrpc_peernid2str(&req->rq_peer, str));
+                       req->rq_peer.peer_nid,
+                       portals_nid2str(req->rq_peer.peer_ni->pni_number,
+                                       req->rq_peer.peer_nid, str));
                 LDLM_DEBUG_NOLOCK("server-side cancel handler stale lock "
                                   "(cookie "LPU64")",
                                   dlm_req->lock_handle1.cookie);
@@ -767,8 +796,9 @@ int ldlm_handle_cancel(struct ptlrpc_request *req)
         RETURN(0);
 }
 
-void ldlm_handle_bl_callback(struct ldlm_namespace *ns,
-                             struct ldlm_lock_desc *ld, struct ldlm_lock *lock)
+static void ldlm_handle_bl_callback(struct ldlm_namespace *ns,
+                                    struct ldlm_lock_desc *ld,
+                                    struct ldlm_lock *lock)
 {
         int do_ast;
         ENTRY;
@@ -914,10 +944,10 @@ static int ldlm_callback_reply(struct ptlrpc_request *req, int rc)
         return ptlrpc_reply(req);
 }
 
+#ifdef __KERNEL__
 int ldlm_bl_to_thread(struct ldlm_namespace *ns, struct ldlm_lock_desc *ld,
                       struct ldlm_lock *lock)
 {
-#ifdef __KERNEL__
         struct ldlm_bl_pool *blp = ldlm_state->ldlm_bl_pool;
         struct ldlm_bl_work_item *blwi;
         ENTRY;
@@ -935,12 +965,18 @@ int ldlm_bl_to_thread(struct ldlm_namespace *ns, struct ldlm_lock_desc *ld,
         list_add_tail(&blwi->blwi_entry, &blp->blp_list);
         wake_up(&blp->blp_waitq);
         spin_unlock(&blp->blp_lock);
-#else
-        LBUG();
-#endif
 
         RETURN(0);
 }
+#else
+/* XXX */
+void liblustre_ldlm_handle_bl_callback(struct ldlm_namespace *ns,
+                                       struct ldlm_lock_desc *ld,
+                                       struct ldlm_lock *lock)
+{
+        ldlm_handle_bl_callback(ns, ld, lock);
+}
+#endif
 
 static int ldlm_callback_handler(struct ptlrpc_request *req)
 {
@@ -959,11 +995,12 @@ static int ldlm_callback_handler(struct ptlrpc_request *req)
         if (req->rq_export == NULL) {
                 struct ldlm_request *dlm_req;
 
-                CDEBUG(D_RPCTRACE, "operation %d from nid %s with bad "
+                CDEBUG(D_RPCTRACE, "operation %d from nid "LPX64" (%s) with bad "
                        "export cookie "LPX64" (ptl req %d/rep %d); this is "
                        "normal if this node rebooted with a lock held\n",
-                       req->rq_reqmsg->opc,
-                       ptlrpc_peernid2str(&req->rq_peer, str),
+                       req->rq_reqmsg->opc, req->rq_peer.peer_nid,
+                       portals_nid2str(req->rq_peer.peer_ni->pni_number,
+                                       req->rq_peer.peer_nid, str),
                        req->rq_reqmsg->handle.cookie,
                        req->rq_request_portal, req->rq_reply_portal);
 
@@ -1005,11 +1042,6 @@ static int ldlm_callback_handler(struct ptlrpc_request *req)
                 rc = llog_origin_handle_next_block(req);
                 ldlm_callback_reply(req, rc);
                 RETURN(0);
-        case LLOG_ORIGIN_HANDLE_PREV_BLOCK:
-                OBD_FAIL_RETURN(OBD_FAIL_OBD_LOGD_NET, 0);
-                rc = llog_origin_handle_prev_block(req);
-                ldlm_callback_reply(req, rc);
-                RETURN(0);
         case LLOG_ORIGIN_HANDLE_READ_HEADER:
                 OBD_FAIL_RETURN(OBD_FAIL_OBD_LOGD_NET, 0);
                 rc = llog_origin_handle_read_header(req);
@@ -1294,6 +1326,7 @@ static int ldlm_setup(void)
                 rc = kernel_thread(ldlm_bl_thread_main, &bltd, 0);
                 if (rc < 0) {
                         CERROR("cannot start LDLM thread #%d: rc %d\n", i, rc);
+                        LBUG();
                         GOTO(out_thread, rc);
                 }
                 wait_for_completion(&blp->blp_comp);
@@ -1301,13 +1334,17 @@ static int ldlm_setup(void)
 
         rc = ptlrpc_start_n_threads(NULL, ldlm_state->ldlm_cancel_service,
                                     LDLM_NUM_THREADS, "ldlm_cn");
-        if (rc)
+        if (rc) {
+                LBUG();
                 GOTO(out_thread, rc);
+        }
 
         rc = ptlrpc_start_n_threads(NULL, ldlm_state->ldlm_cb_service,
                                     LDLM_NUM_THREADS, "ldlm_cb");
-        if (rc)
+        if (rc) {
+                LBUG();
                 GOTO(out_thread, rc);
+        }
 
         INIT_LIST_HEAD(&expired_lock_thread.elt_expired_locks);
         spin_lock_init(&expired_lock_thread.elt_lock);
diff --git a/lustre/ldlm/ldlm_request.c b/lustre/ldlm/ldlm_request.c
index 7540b69..37868ca 100644
--- a/lustre/ldlm/ldlm_request.c
+++ b/lustre/ldlm/ldlm_request.c
@@ -559,11 +559,9 @@ int ldlm_cli_cancel(struct lustre_handle *lockh)
                 rc = ptlrpc_queue_wait(req);
 
                 if (rc == ESTALE) {
-                        char str[PTL_NALFMT_SIZE];
-                        CERROR("client/server (nid %s) out of sync"
-                               " -- not fatal\n",
-                               ptlrpc_peernid2str(&req->rq_import->
-                                                  imp_connection->c_peer, str));
+                        CERROR("client/server (nid "LPU64") out of sync--not "
+                               "fatal\n",
+                               req->rq_import->imp_connection->c_peer.peer_nid);
                 } else if (rc == -ETIMEDOUT) {
                         ptlrpc_req_finished(req);
                         GOTO(restart, rc);
@@ -592,16 +590,13 @@ int ldlm_cli_cancel(struct lustre_handle *lockh)
         return rc;
 }
 
-/* when called with LDLM_ASYNC the blocking callback will be handled
- * in a thread and this function will return after the thread has been
- * asked to call the callback.  when called with LDLM_SYNC the blocking
- * callback will be performed in this function. */
-int ldlm_cancel_lru(struct ldlm_namespace *ns, ldlm_sync_t sync)
+int ldlm_cancel_lru(struct ldlm_namespace *ns)
 {
         struct list_head *tmp, *next;
-        struct ldlm_lock *lock;
-        int count, rc = 0;
+#ifndef __KERNEL__
         LIST_HEAD(cblist);
+#endif
+        int count, rc = 0;
         ENTRY;
 
         l_lock(&ns->ns_lock);
@@ -613,7 +608,7 @@ int ldlm_cancel_lru(struct ldlm_namespace *ns, ldlm_sync_t sync)
         }
 
         list_for_each_safe(tmp, next, &ns->ns_unused_list) {
-
+                struct ldlm_lock *lock;
                 lock = list_entry(tmp, struct ldlm_lock, l_lru);
 
                 LASSERT(!lock->l_readers && !lock->l_writers);
@@ -627,21 +622,25 @@ int ldlm_cancel_lru(struct ldlm_namespace *ns, ldlm_sync_t sync)
 
                 LDLM_LOCK_GET(lock); /* dropped by bl thread */
                 ldlm_lock_remove_from_lru(lock);
-                if (sync == LDLM_ASYNC)
-                        ldlm_bl_to_thread(ns, NULL, lock);
-                else
-                        list_add(&lock->l_lru, &cblist);
+#if __KERNEL__
+                ldlm_bl_to_thread(ns, NULL, lock);
+#else
+                list_add(&lock->l_lru, &cblist);
+#endif
 
                 if (--count == 0)
                         break;
         }
         l_unlock(&ns->ns_lock);
+#ifndef __KERNEL__
+        while (!list_empty(&cblist)) {
+                struct ldlm_lock *lock;
 
-        list_for_each_safe(tmp, next, &cblist) {
-                lock = list_entry(tmp, struct ldlm_lock, l_lru);
+                lock = list_entry(cblist.next, struct ldlm_lock, l_lru);
                 list_del_init(&lock->l_lru);
-                ldlm_handle_bl_callback(ns, NULL, lock);
+                liblustre_ldlm_handle_bl_callback(ns, NULL, lock);
         }
+#endif
         RETURN(rc);
 }
 
diff --git a/lustre/ldlm/ldlm_resource.c b/lustre/ldlm/ldlm_resource.c
index 7e75089..52770e9 100644
--- a/lustre/ldlm/ldlm_resource.c
+++ b/lustre/ldlm/ldlm_resource.c
@@ -50,15 +50,15 @@ static int ldlm_proc_dump_ns(struct file *file, const char *buffer,
 int ldlm_proc_setup(void)
 {
         int rc;
-        struct lprocfs_vars list[] = {
+        struct lprocfs_vars list[] = { 
                 { "dump_namespaces", NULL, ldlm_proc_dump_ns, NULL },
                 { NULL }};
         ENTRY;
         LASSERT(ldlm_ns_proc_dir == NULL);
 
         ldlm_type_proc_dir = lprocfs_register(OBD_LDLM_DEVICENAME,
-                                              proc_lustre_root,
-                                              NULL, NULL);
+                                               proc_lustre_root,
+                                               NULL, NULL);
         if (IS_ERR(ldlm_type_proc_dir)) {
                 CERROR("LProcFS failed in ldlm-init\n");
                 rc = PTR_ERR(ldlm_type_proc_dir);
@@ -87,9 +87,9 @@ int ldlm_proc_setup(void)
 
         RETURN(0);
 
-err_ns:
+err_ns:        
         lprocfs_remove(ldlm_ns_proc_dir);
-err_type:
+err_type:        
         lprocfs_remove(ldlm_type_proc_dir);
 err:
         ldlm_type_proc_dir = NULL;
@@ -148,7 +148,7 @@ static int lprocfs_write_lru_size(struct file *file, const char *buffer,
                        ns->ns_name);
                 tmp = ns->ns_max_unused;
                 ns->ns_max_unused = 0;
-                ldlm_cancel_lru(ns, LDLM_SYNC);
+                ldlm_cancel_lru(ns);
                 ns->ns_max_unused = tmp;
                 return count;
         }
@@ -158,7 +158,7 @@ static int lprocfs_write_lru_size(struct file *file, const char *buffer,
                ns->ns_name, ns->ns_max_unused, (unsigned int)tmp);
         ns->ns_max_unused = (unsigned int)tmp;
 
-        ldlm_cancel_lru(ns, LDLM_ASYNC);
+        ldlm_cancel_lru(ns);
 
         return count;
 }
@@ -534,7 +534,7 @@ ldlm_resource_get(struct ldlm_namespace *ns, struct ldlm_resource *parent,
 struct ldlm_resource *ldlm_resource_getref(struct ldlm_resource *res)
 {
         LASSERT(res != NULL);
-        LASSERT(res != LP_POISON);
+        LASSERT(res != (void *)0x5a5a5a5a);
         atomic_inc(&res->lr_refcount);
         CDEBUG(D_INFO, "getref res: %p count: %d\n", res,
                atomic_read(&res->lr_refcount));
@@ -550,7 +550,7 @@ int ldlm_resource_putref(struct ldlm_resource *res)
         CDEBUG(D_INFO, "putref res: %p count: %d\n", res,
                atomic_read(&res->lr_refcount) - 1);
         LASSERT(atomic_read(&res->lr_refcount) > 0);
-        LASSERT(atomic_read(&res->lr_refcount) < LI_POISON);
+        LASSERT(atomic_read(&res->lr_refcount) < 0x5a5a5a5a);
 
         if (atomic_dec_and_test(&res->lr_refcount)) {
                 struct ldlm_namespace *ns = res->lr_namespace;
diff --git a/lustre/liblustre/Makefile.am b/lustre/liblustre/Makefile.am
index b831bd8..66d7bf5 100644
--- a/lustre/liblustre/Makefile.am
+++ b/lustre/liblustre/Makefile.am
@@ -1,40 +1,44 @@
 ## Liblustre excecutables & libraries Makefile
+DEFS=
+
 SUBDIRS = . tests
 
-AM_CPPFLAGS = $(HAVE_EFENCE) -I$(SYSIO)/include -D_LARGEFILE64_SOURCE=1 $(LLCPPFLAGS) -I$(top_srcdir)/portals/unals
-AM_CFLAGS = $(LLCFLAGS)
+CFLAGS := -g -Wall -I$(top_srcdir)/utils -I$(top_srcdir)/portals/include \
+          -I$(top_srcdir)/portals/unals -I$(SYSIO)/include
 
+CPPFLAGS = $(HAVE_EFENCE) -D_LARGEFILE64_SOURCE=1
 LIBS = $(LIBEFENCE)
 
 LUSTRE_LIBS = libllite.a \
-              $(top_builddir)/lov/liblov.a \
-              $(top_builddir)/obdecho/libobdecho.a \
-              $(top_builddir)/osc/libosc.a \
-              $(top_builddir)/mdc/libmdc.a \
-              $(top_builddir)/ptlrpc/libptlrpc.a \
-              $(top_builddir)/obdclass/liblustreclass.a \
-              $(top_builddir)/lvfs/liblvfs.a
-
-PTL_LIBS =    $(top_builddir)/portals/utils/libuptlctl.a \
-              $(top_builddir)/portals/unals/libtcpnal.a \
-              $(top_builddir)/portals/portals/libportals.a
-
-SYSIO_LIBS =  $(SYSIO)/drivers/native/libsysio_native.a \
-              $(SYSIO)/drivers/sockets/libsysio_sockets.a \
-              $(SYSIO)/src/libsysio.a \
-              $(SYSIO)/dev/stdfd/libsysio_stdfd.a
-
-if LIBLUSTRE
+              $(top_srcdir)/lov/liblov.a \
+              $(top_srcdir)/obdecho/libobdecho.a \
+              $(top_srcdir)/osc/libosc.a \
+              $(top_srcdir)/mdc/libmdc.a \
+              $(top_srcdir)/ptlrpc/libptlrpc.a \
+              $(top_srcdir)/obdclass/liblustreclass.a \
+              $(top_srcdir)/lvfs/liblvfs.a
+
+PTL_LIBS = $(top_srcdir)/portals/utils/libuptlctl.a \
+           $(top_srcdir)/portals/unals/libtcpnal.a \
+           $(top_srcdir)/portals/portals/libportals.a
+
+SYSIO_LIBS = $(SYSIO)/drivers/native/libsysio_native.a \
+             $(SYSIO)/drivers/sockets/libsysio_sockets.a \
+             $(SYSIO)/src/libsysio.a \
+             $(SYSIO)/dev/stdfd/libsysio_stdfd.a
+
 lib_LIBRARIES = liblustre.a
 noinst_LIBRARIES = libllite.a
-endif
 
-libllite_a_SOURCES = llite_lib.c super.c namei.c rw.c file.c dir.c llite_lib.h
+libllite_a_SOURCES = llite_lib.c super.c namei.c rw.c file.c dir.c
+libllite_a_CFLAGS = -fPIC
 
 # for make rpms -- need cleanup
 liblustre_a_SOURCES = llite_lib.c super.c namei.c rw.c file.c dir.c
+liblustre_a_CFLAGS = -fPIC
 
 liblustre.a : $(LUSTRE_LIBS) $(PTL_LIBS) $(SYSIO_LIBS)
-	$(srcdir)/genlib.sh $(SYSIO) $(AR) $(LINK) || ( rm -f $@; exit 1 )
+	$(shell ./genlib.sh $(SYSIO) $(AR) $(LINK))
+
+include $(top_srcdir)/Rules
 
-EXTRA_DIST = genlib.sh
diff --git a/lustre/liblustre/dir.c b/lustre/liblustre/dir.c
index 05fc153..c236d73 100644
--- a/lustre/liblustre/dir.c
+++ b/lustre/liblustre/dir.c
@@ -1,7 +1,7 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- * Lustre Light directory handling
+ * Lustre Light Super operations
  *
  *  Copyright (c) 2002, 2003 Cluster File Systems, Inc.
  *
@@ -62,7 +62,6 @@ static int llu_dir_do_readpage(struct inode *inode, struct page *page)
         struct obd_device *obddev = class_exp2obd(sbi->ll_mdc_exp);
         struct ldlm_res_id res_id =
                 { .name = {lli->lli_st_ino, (__u64)lli->lli_st_generation} };
-        ldlm_policy_data_t policy = { .l_inodebits = { MDS_INODELOCK_UPDATE } };
         ENTRY;
 
         if ((lli->lli_st_size + PAGE_CACHE_SIZE - 1) >> PAGE_SHIFT <= page->index) {
@@ -76,11 +75,11 @@ static int llu_dir_do_readpage(struct inode *inode, struct page *page)
         }
 
         rc = ldlm_lock_match(obddev->obd_namespace, LDLM_FL_BLOCK_GRANTED,
-                             &res_id, LDLM_IBITS, &policy, LCK_PR, &lockh);
+                             &res_id, LDLM_PLAIN, NULL, LCK_PR, &lockh);
         if (!rc) {
                 llu_prepare_mdc_op_data(&data, inode, NULL, NULL, 0, 0);
 
-                rc = mdc_enqueue(sbi->ll_mdc_exp, LDLM_IBITS, &it, LCK_PR,
+                rc = mdc_enqueue(sbi->ll_mdc_exp, LDLM_PLAIN, &it, LCK_PR,
                                  &data, &lockh, NULL, 0,
                                  ldlm_completion_ast, llu_mdc_blocking_ast,
                                  inode);
diff --git a/lustre/liblustre/file.c b/lustre/liblustre/file.c
index 51d8e18..f666cdc 100644
--- a/lustre/liblustre/file.c
+++ b/lustre/liblustre/file.c
@@ -1,7 +1,7 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- * Lustre Light file operations
+ * Lustre Light Super operations
  *
  *  Copyright (c) 2002, 2003 Cluster File Systems, Inc.
  *
@@ -105,7 +105,7 @@ static int llu_local_open(struct llu_inode_info *lli, struct lookup_intent *it)
         /* already opened? */
         if (lli->lli_open_count++)
                 RETURN(0);
-
+                
         LASSERT(!lli->lli_file_data);
 
         OBD_ALLOC(fd, sizeof(*fd));
@@ -259,26 +259,26 @@ int llu_mdc_close(struct obd_export *mdc_exp, struct inode *inode)
         ENTRY;
 
         /* clear group lock, if present */
-        if (fd->fd_flags & LL_FILE_GROUP_LOCKED) {
+        if (fd->fd_flags & LL_FILE_CW_LOCKED) {
                 struct lov_stripe_md *lsm = llu_i2info(inode)->lli_smd;
-                fd->fd_flags &= ~(LL_FILE_GROUP_LOCKED|LL_FILE_IGNORE_LOCK);
-                rc = llu_extent_unlock(fd, inode, lsm, LCK_GROUP,
-                                       &fd->fd_cwlockh);
+                fd->fd_flags &= ~(LL_FILE_CW_LOCKED|LL_FILE_IGNORE_LOCK);
+                rc = llu_extent_unlock(fd, inode, lsm, LCK_CW, &fd->fd_cwlockh);
         }
 
-        obdo.o_id = lli->lli_st_ino;
-        obdo.o_valid = OBD_MD_FLID;
-        valid = OBD_MD_FLTYPE | OBD_MD_FLMODE | OBD_MD_FLSIZE |OBD_MD_FLBLOCKS |
-                OBD_MD_FLATIME | OBD_MD_FLMTIME | OBD_MD_FLCTIME;
+        valid = OBD_MD_FLID;
         if (test_bit(LLI_F_HAVE_OST_SIZE_LOCK, &lli->lli_flags))
                 valid |= OBD_MD_FLSIZE | OBD_MD_FLBLOCKS;
 
-        obdo_from_inode(&obdo, inode, valid);
-
+        memset(&obdo, 0, sizeof(obdo));
+        obdo.o_id = lli->lli_st_ino;
+        obdo.o_mode = lli->lli_st_mode;
+        obdo.o_size = lli->lli_st_size;
+        obdo.o_blocks = lli->lli_st_blocks;
         if (0 /* ll_is_inode_dirty(inode) */) {
                 obdo.o_flags = MDS_BFLAG_UNCOMMITTED_WRITES;
-                obdo.o_valid |= OBD_MD_FLFLAGS;
+                valid |= OBD_MD_FLFLAGS;
         }
+        obdo.o_valid = valid;
         rc = mdc_close(mdc_exp, &obdo, och, &req);
         if (rc == EAGAIN) {
                 /* We are the last writer, so the MDS has instructed us to get
@@ -286,7 +286,7 @@ int llu_mdc_close(struct obd_export *mdc_exp, struct inode *inode)
                 //ll_queue_done_writing(inode);
                 rc = 0;
         } else if (rc) {
-                CERROR("inode %lu close failed: rc %d\n", lli->lli_st_ino, rc);
+                CERROR("inode %lu close failed: rc = %d\n", lli->lli_st_ino, rc);
         } else {
                 rc = llu_objects_destroy(req, inode);
                 if (rc)
diff --git a/lustre/liblustre/genlib.sh b/lustre/liblustre/genlib.sh
index c31ea2f..f371650 100755
--- a/lustre/liblustre/genlib.sh
+++ b/lustre/liblustre/genlib.sh
@@ -83,6 +83,6 @@ $RANLIB $CWD/liblustre.a
 # create shared lib lustre
 rm -f $CWD/liblustre.so
 $LD -shared -o $CWD/liblustre.so -init __liblustre_setup_ -fini __liblustre_cleanup_ \
-	$ALL_OBJS -lcap -lpthread
+	$ALL_OBJS -lpthread
 
 #rm -rf $sysio_tmp
diff --git a/lustre/liblustre/llite_lib.c b/lustre/liblustre/llite_lib.c
index f5b2ba5..c028744 100644
--- a/lustre/liblustre/llite_lib.c
+++ b/lustre/liblustre/llite_lib.c
@@ -1,7 +1,7 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- * Lustre Light common routines
+ * Lustre Light Super operations
  *
  *  Copyright (c) 2002, 2003 Cluster File Systems, Inc.
  *
@@ -24,11 +24,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include <signal.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <syscall.h>
-#include <sys/utsname.h>
 #include <sys/types.h>
 #include <sys/queue.h>
 
@@ -47,6 +42,7 @@
  */
 #undef LIST_HEAD
 
+#include <portals/api-support.h> /* needed for ptpctl.h */
 #include <portals/ptlctl.h>	/* needed for parse_dump */
 #include <procbridge.h>
 
@@ -59,6 +55,23 @@ ptl_handle_ni_t         tcpnal_ni;
 struct task_struct     *current;
 
 /* portals interfaces */
+ptl_handle_ni_t *
+kportal_get_ni (int nal)
+{
+        switch (nal)
+        {
+        case SOCKNAL:
+                return &tcpnal_ni;
+        default:
+                return NULL;
+        }
+}
+
+inline void
+kportal_put_ni (int nal)
+{
+        return;
+}
 
 struct ldlm_namespace;
 struct ldlm_res_id;
@@ -85,164 +98,43 @@ char *portals_nid2str(int nal, ptl_nid_t nid, char *str)
         case TCPNAL:
                 /* userspace NAL */
         case SOCKNAL:
-                snprintf(str, PTL_NALFMT_SIZE - 1, "%u:%u.%u.%u.%u",
-                         (__u32)(nid >> 32), HIPQUAD(nid));
+                sprintf(str, "%u:%d.%d.%d.%d", (__u32)(nid >> 32),
+                        HIPQUAD(nid));
                 break;
         case QSWNAL:
         case GMNAL:
         case IBNAL:
-                snprintf(str, PTL_NALFMT_SIZE - 1, "%u:%u",
-                         (__u32)(nid >> 32), (__u32)nid);
+        case SCIMACNAL:
+                sprintf(str, "%u:%u", (__u32)(nid >> 32), (__u32)nid);
                 break;
         default:
-                snprintf(str, PTL_NALFMT_SIZE - 1, "?%d? %llx",
-                         nal, (long long)nid);
-                break;
+                return NULL;
         }
         return str;
 }
 
-/*
- * random number generator stuff
- */
-static int _rand_dev_fd = -1;
-
-static int get_ipv4_addr()
-{
-        struct utsname myname;
-        struct hostent *hptr;
-        int ip;
-
-        if (uname(&myname) < 0)
-                return 0;
-
-        hptr = gethostbyname(myname.nodename);
-        if (hptr == NULL ||
-            hptr->h_addrtype != AF_INET ||
-            *hptr->h_addr_list == NULL) {
-                printf("LibLustre: Warning: fail to get local IPv4 address\n");
-                return 0;
-        }
-
-        ip = ntohl(*((int *) *hptr->h_addr_list));
-
-        return ip;
-}
-
-static void init_random()
-{
-        int seed;
-        struct timeval tv;
-
-        _rand_dev_fd = syscall(SYS_open, "/dev/urandom", O_RDONLY);
-        if (_rand_dev_fd >= 0) {
-                if (syscall(SYS_read, _rand_dev_fd, &seed, sizeof(int)) ==
-                    sizeof(int)) {
-                        srand(seed);
-                        return;
-                }
-                syscall(SYS_close, _rand_dev_fd);
-                _rand_dev_fd = -1;
-        }
-
-        gettimeofday(&tv, NULL);
-        srand(tv.tv_sec + tv.tv_usec + getpid() + __swab32(get_ipv4_addr()));
-}
-
-void get_random_bytes(void *buf, int size)
-{
-        char *p = buf;
-
-        if (size < 1)
-                return;
-
-        if (_rand_dev_fd >= 0) {
-                if (syscall(SYS_read, _rand_dev_fd, buf, size) == size)
-                        return;
-                syscall(SYS_close, _rand_dev_fd);
-                _rand_dev_fd = -1;
-        }
-
-        while (size--) 
-                *p++ = rand();
-}
-
-int in_group_p(gid_t gid)
-{
-        int i;
-
-        if (gid == current->fsgid)
-                return 1;
-
-        for (i = 0; i < current->ngroups; i++) {
-                if (gid == current->groups[i])
-                        return 1;
-        }
-
-        return 0;
-}
-
-static void init_capability(int *res)
-{
-        cap_t syscap;
-        cap_flag_value_t capval;
-        int i;
-
-        *res = 0;
-
-        syscap = cap_get_proc();
-        if (!syscap) {
-                printf("Liblustre: Warning: failed to get system capability, "
-                       "set to minimal\n");
-                return;
-        }
-
-        for (i = 0; i < sizeof(cap_value_t) * 8; i++) {
-                if (!cap_get_flag(syscap, i, CAP_EFFECTIVE, &capval)) {
-                        if (capval == CAP_SET) {
-                                *res |= 1 << i;
-                        }
-                }
-        }
-}
-
-static int init_current(char *comm)
-{
+void init_current(char *comm)
+{ 
         current = malloc(sizeof(*current));
-        if (!current) {
-                CERROR("Not enough memory\n");
-                return -ENOMEM;
-        }
-        current->fs = &current->__fs;
+        current->fs = malloc(sizeof(*current->fs));
         current->fs->umask = umask(0777);
         umask(current->fs->umask);
-
         strncpy(current->comm, comm, sizeof(current->comm));
         current->pid = getpid();
-        current->fsuid = geteuid();
-        current->fsgid = getegid();
+        current->fsuid = 0;
+        current->fsgid = 0;
+        current->cap_effective = -1;
         memset(&current->pending, 0, sizeof(current->pending));
-
-        current->max_groups = sysconf(_SC_NGROUPS_MAX);
-        current->groups = malloc(sizeof(gid_t) * current->max_groups);
-        if (!current->groups) {
-                CERROR("Not enough memory\n");
-                return -ENOMEM;
-        }
-        current->ngroups = getgroups(current->max_groups, current->groups);
-        if (current->ngroups < 0) {
-                perror("Error getgroups");
-                return -EINVAL;
-        }
-
-        init_capability(&current->cap_effective);
-
-        return 0;
 }
 
+/* FIXME */
 void generate_random_uuid(unsigned char uuid_out[16])
 {
-        get_random_bytes(uuid_out, sizeof(uuid_out));
+        int *arr = (int*)uuid_out;
+        int i;
+
+        for (i = 0; i < sizeof(uuid_out)/sizeof(int); i++)
+                arr[i] = rand();
 }
 
 ptl_nid_t tcpnal_mynid;
@@ -253,16 +145,19 @@ int init_lib_portals()
         int rc;
         ENTRY;
 
-        rc = PtlInit(&max_interfaces);
-        if (rc != PTL_OK) {
-                CERROR("PtlInit failed: %d\n", rc);
-                RETURN (-ENXIO);
+        PtlInit(&max_interfaces);
+        rc = PtlNIInit(procbridge_interface, 0, 0, 0, &tcpnal_ni);
+        if (rc != 0) {
+                CERROR("TCPNAL: PtlNIInit failed: error %d\n", rc);
+                PtlFini();
+                RETURN (rc);
         }
-        RETURN(0);
+        PtlNIDebug(tcpnal_ni, ~0);
+        RETURN(rc);
 }
 
 int
-libcfs_nal_cmd(struct portals_cfg *pcfg)
+kportal_nal_cmd(struct portals_cfg *pcfg)
 {
         /* handle portals command if we want */
         return 0;
@@ -270,7 +165,7 @@ libcfs_nal_cmd(struct portals_cfg *pcfg)
 
 extern int class_handle_ioctl(unsigned int cmd, unsigned long arg);
 
-int lib_ioctl_nalcmd(int dev_id, unsigned int opc, void * ptr)
+int lib_ioctl_nalcmd(int dev_id, int opc, void * ptr)
 {
         struct portal_ioctl_data *ptldata;
 
@@ -290,7 +185,7 @@ int lib_ioctl_nalcmd(int dev_id, unsigned int opc, void * ptr)
 	return (0);
 }
 
-int lib_ioctl(int dev_id, unsigned int opc, void * ptr)
+int lib_ioctl(int dev_id, int opc, void * ptr)
 {
         int rc;
 
@@ -314,10 +209,6 @@ int lib_ioctl(int dev_id, unsigned int opc, void * ptr)
 
 int lllib_init(char *dumpfile)
 {
-        pid_t pid;
-        uint32_t ip;
-        struct in_addr in;
-
         if (!g_zconf) {
                 /* this parse only get my nid from config file
                  * before initialize portals
@@ -325,23 +216,16 @@ int lllib_init(char *dumpfile)
                 if (parse_dump(dumpfile, lib_ioctl_nalcmd))
                         return -1;
         } else {
-                /* need to setup mynid before tcpnal initialization */
-                /* a meaningful nid could help debugging */
-                ip = get_ipv4_addr();
-                if (ip == 0)
-                        get_random_bytes(&ip, sizeof(ip));
-                pid = getpid() & 0xffffffff;
-                tcpnal_mynid = ((uint64_t)ip << 32) | pid;
-
-                in.s_addr = htonl(ip);
-                printf("LibLustre: TCPNAL NID: %016llx (%s:%u)\n", 
-                       tcpnal_mynid, inet_ntoa(in), pid);
+                /* XXX need setup mynid before tcpnal initialize */
+                tcpnal_mynid = ((uint64_t)getpid() << 32) | time(0);
+                printf("LibLustre: TCPNAL NID: %016llx\n", tcpnal_mynid);
         }
 
-        if (init_current("dummy") ||
-            init_obdclass() ||
+        init_current("dummy");
+        if (init_obdclass() ||
             init_lib_portals() ||
             ptlrpc_init() ||
+            ldlm_init() ||
             mdc_init() ||
             lov_init() ||
             osc_init())
@@ -382,7 +266,6 @@ int liblustre_process_log(struct config_llog_instance *cfg, int allow_recov)
                 CERROR("Can't parse NID %s\n", g_zconf_mdsnid);
                 RETURN(-EINVAL);
         }
-
         nal = ptl_name2nal("tcp");
         if (nal <= 0) {
                 CERROR("Can't parse NAL tcp\n");
@@ -466,6 +349,11 @@ out:
         RETURN(rc);
 }
 
+static void sighandler_USR1(int signum)
+{
+        /* do nothing */
+}
+
 /* parse host:/mdsname/profile string */
 int ll_parse_mount_target(const char *target, char **mdsnid,
                           char **mdsname, char **profile)
@@ -520,8 +408,16 @@ void __liblustre_setup_(void)
         char *lustre_driver = "llite";
         char *root_path = "/";
         unsigned mntflgs = 0;
+
 	int err;
 
+        /* consider tha case of starting multiple liblustre instances
+         * at a same time on single node.
+         */
+        srand(time(NULL) + getpid());
+
+        signal(SIGUSR1, sighandler_USR1);
+
 	lustre_path = getenv(ENV_LUSTRE_MNTPNT);
 	if (!lustre_path) {
                 lustre_path = "/mnt/lustre";
@@ -577,8 +473,6 @@ void __liblustre_setup_(void)
 	portal_debug = 0;
 	portal_subsystem_debug = 0;
 #endif
-        init_random();
-
 	err = lllib_init(dumpfile);
 	if (err) {
 		perror("init llite driver");
diff --git a/lustre/liblustre/namei.c b/lustre/liblustre/namei.c
index 6e596d2..af4a0dc 100644
--- a/lustre/liblustre/namei.c
+++ b/lustre/liblustre/namei.c
@@ -1,7 +1,7 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- * Lustre Light name resolution
+ * Lustre Light Super operations
  *
  *  Copyright (c) 2002, 2003 Cluster File Systems, Inc.
  *
@@ -140,7 +140,6 @@ int llu_mdc_blocking_ast(struct ldlm_lock *lock,
         case LDLM_CB_CANCELING: {
                 struct inode *inode = llu_inode_from_lock(lock);
                 struct llu_inode_info *lli;
-                __u64 bits = lock->l_policy_data.l_inodebits.bits;
 
                 /* Invalidate all dentries associated with this inode */
                 if (inode == NULL)
@@ -148,16 +147,14 @@ int llu_mdc_blocking_ast(struct ldlm_lock *lock,
 
                 lli =  llu_i2info(inode);
 
-                if (bits & MDS_INODELOCK_UPDATE)
-                        clear_bit(LLI_F_HAVE_MDS_SIZE_LOCK, &lli->lli_flags);
+                clear_bit(LLI_F_HAVE_MDS_SIZE_LOCK, &lli->lli_flags);
 
                 if (lock->l_resource->lr_name.name[0] != lli->lli_st_ino ||
                     lock->l_resource->lr_name.name[1] != lli->lli_st_generation) {
                         LDLM_ERROR(lock, "data mismatch with ino %lu/%lu",
                                    lli->lli_st_ino, lli->lli_st_generation);
                 }
-                if (S_ISDIR(lli->lli_st_mode) &&
-                    (bits & MDS_INODELOCK_UPDATE)) {
+                if (S_ISDIR(lli->lli_st_mode)) {
                         CDEBUG(D_INODE, "invalidating inode %lu\n",
                                lli->lli_st_ino);
 
@@ -319,11 +316,7 @@ static int lookup_it_finish(struct ptlrpc_request *request, int offset,
 
         /* NB 1 request reference will be taken away by ll_intent_lock()
          * when I return
-         */
-        /* FIXME: for CREAT, libsysio require the inode must be generated here
-         * currently here we don't know the whether the create is successful
-         * or failed on mds. thus blinded return -EPERM in llu_iget(). need
-         * a fix later.
+         * Note: libsysio require the inode must be generated here
          */
         if ((it->it_op & IT_CREAT) || !it_disposition(it, DISP_LOOKUP_NEG)) {
                 struct lustre_md md;
@@ -335,11 +328,11 @@ static int lookup_it_finish(struct ptlrpc_request *request, int offset,
                         RETURN(rc);
 
                 inode = llu_iget(parent->i_fs, &md);
-                if (!inode || IS_ERR(inode)) {
+                if (!inode) {
                         /* free the lsm if we allocated one above */
                         if (md.lsm != NULL)
                                 obd_free_memmd(sbi->ll_osc_exp, &md.lsm);
-                        RETURN(inode ? PTR_ERR(inode) : -ENOMEM);
+                        RETURN(-ENOMEM);
                 } else if (md.lsm != NULL &&
                            llu_i2info(inode)->lli_smd != md.lsm) {
                         obd_free_memmd(sbi->ll_osc_exp, &md.lsm);
diff --git a/lustre/liblustre/rw.c b/lustre/liblustre/rw.c
index 9fe16e5..546ab73 100644
--- a/lustre/liblustre/rw.c
+++ b/lustre/liblustre/rw.c
@@ -1,7 +1,7 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- * Lustre Light block IO
+ * Lustre Light Super operations
  *
  *  Copyright (c) 2002, 2003 Cluster File Systems, Inc.
  *
@@ -75,12 +75,13 @@ static int llu_extent_lock_callback(struct ldlm_lock *lock,
         struct lustre_handle lockh = { 0 };
         int rc;
         ENTRY;
+        
 
         if ((unsigned long)data > 0 && (unsigned long)data < 0x1000) {
                 LDLM_ERROR(lock, "cancelling lock with bad data %p", data);
                 LBUG();
         }
-
+        
         switch (flag) {
         case LDLM_CB_BLOCKING:
                 ldlm_lock2handle(lock, &lockh);
@@ -94,7 +95,7 @@ static int llu_extent_lock_callback(struct ldlm_lock *lock,
                 struct lov_stripe_md *lsm;
                 __u32 stripe;
                 __u64 kms;
-
+                
                 /* This lock wasn't granted, don't try to evict pages */
                 if (lock->l_req_mode != lock->l_granted_mode)
                         RETURN(0);
@@ -123,7 +124,7 @@ iput:
         default:
                 LBUG();
         }
-
+        
         RETURN(0);
 }
 
@@ -181,7 +182,7 @@ int llu_glimpse_size(struct inode *inode, struct ost_lvb *lvb)
         struct llu_inode_info *lli = llu_i2info(inode);
         struct llu_sb_info *sbi = llu_i2sbi(inode);
         ldlm_policy_data_t policy = { .l_extent = { 0, OBD_OBJECT_EOF } };
-        struct lustre_handle lockh = { 0 };
+        struct lustre_handle lockh;
         int rc, flags = LDLM_FL_HAS_INTENT;
         ENTRY;
 
@@ -387,7 +388,7 @@ static void llu_ap_fill_obdo(void *data, int cmd, struct obdo *oa)
 }
 
 /* called for each page in a completed rpc.*/
-static void llu_ap_completion(void *data, int cmd, struct obdo *oa, int rc)
+static void llu_ap_completion(void *data, int cmd, int rc)
 {
         struct ll_async_page *llap;
         struct page *page;
@@ -448,12 +449,21 @@ void put_sysio_cookie(struct llu_sysio_cookie *cookie)
         struct lov_stripe_md *lsm = llu_i2info(cookie->lsc_inode)->lli_smd;
         struct obd_export *exp = llu_i2obdexp(cookie->lsc_inode);
         struct ll_async_page *llap = cookie->lsc_llap;
+#ifdef LIBLUSTRE_HANDLE_UNALIGNED_PAGE
+        struct page *pages = cookie->lsc_pages;
+#endif
         int i;
 
         for (i = 0; i< cookie->lsc_maxpages; i++) {
                 if (llap[i].llap_cookie)
                         obd_teardown_async_page(exp, lsm, NULL,
                                                 llap[i].llap_cookie);
+#ifdef LIBLUSTRE_HANDLE_UNALIGNED_PAGE
+                if (pages[i]._managed) {
+                        free(pages[i].addr);
+                        pages[i]._managed = 0;
+                }
+#endif
         }
 
         I_RELE(cookie->lsc_inode);
@@ -462,6 +472,85 @@ void put_sysio_cookie(struct llu_sysio_cookie *cookie)
         OBD_FREE(cookie, LLU_SYSIO_COOKIE_SIZE(cookie->lsc_maxpages));
 }
 
+#ifdef LIBLUSTRE_HANDLE_UNALIGNED_PAGE
+/* Note: these code should be removed finally, don't need
+ * more cleanup
+ */
+static
+int prepare_unaligned_write(struct llu_sysio_cookie *cookie)
+{
+        struct inode *inode = cookie->lsc_inode;
+        struct llu_inode_info *lli = llu_i2info(inode);
+        struct lov_stripe_md *lsm = lli->lli_smd;
+        struct obdo oa;
+        struct page *pages = cookie->lsc_pages;
+        int i, pgidx[2] = {0, cookie->lsc_npages-1};
+        int rc;
+        ENTRY;
+
+        for (i = 0; i < 2; i++) {
+                struct page *oldpage = &pages[pgidx[i]];
+                struct page newpage;
+                struct brw_page pg;
+                char *newbuf;
+
+                if (i == 0 && pgidx[0] == pgidx[1])
+                        continue;
+
+                LASSERT(oldpage->_offset + oldpage->_count <= PAGE_CACHE_SIZE);
+
+                if (oldpage->_count == PAGE_CACHE_SIZE)
+                        continue;
+
+                if (oldpage->index << PAGE_CACHE_SHIFT >=
+                    lli->lli_st_size)
+                        continue;
+
+                newbuf = malloc(PAGE_CACHE_SIZE);
+                if (!newbuf)
+                        return -ENOMEM;
+
+                newpage.index = oldpage->index;
+                newpage.addr = newbuf;
+
+                pg.pg = &newpage;
+                pg.off = ((obd_off)newpage.index << PAGE_CACHE_SHIFT);
+                if (pg.off + PAGE_CACHE_SIZE > lli->lli_st_size)
+                        pg.count = lli->lli_st_size % PAGE_CACHE_SIZE;
+                else
+                        pg.count = PAGE_CACHE_SIZE;
+                pg.flag = 0;
+
+                oa.o_id = lsm->lsm_object_id;
+                oa.o_mode = lli->lli_st_mode;
+                oa.o_valid = OBD_MD_FLID | OBD_MD_FLMODE | OBD_MD_FLTYPE;
+
+                /* issue read */
+                rc = obd_brw(OBD_BRW_READ, llu_i2obdexp(inode), &oa, lsm, 1, &pg, NULL);
+                if (rc) {
+                        free(newbuf);
+                        RETURN(rc);
+                }
+
+                /* copy page content, and reset page params */
+                memcpy(newbuf + oldpage->_offset,
+                       (char*)oldpage->addr + oldpage->_offset,
+                       oldpage->_count);
+
+                oldpage->addr = newbuf;
+                if ((((obd_off)oldpage->index << PAGE_CACHE_SHIFT) +
+                    oldpage->_offset + oldpage->_count) > lli->lli_st_size)
+                        oldpage->_count += oldpage->_offset;
+                else
+                        oldpage->_count = PAGE_CACHE_SIZE;
+                oldpage->_offset = 0;
+                oldpage->_managed = 1;
+        }
+
+        RETURN(0);
+}
+#endif
+
 static
 int llu_prep_async_io(struct llu_sysio_cookie *cookie, int cmd,
                       char *buf, loff_t pos, size_t count)
@@ -512,6 +601,14 @@ int llu_prep_async_io(struct llu_sysio_cookie *cookie, int cmd,
 
         cookie->lsc_npages = npages;
 
+#ifdef LIBLUSTRE_HANDLE_UNALIGNED_PAGE
+        if (cmd == OBD_BRW_WRITE) {
+                rc = prepare_unaligned_write(cookie);
+                if (rc)
+                        RETURN(rc);
+        }
+#endif
+
         for (i = 0; i < npages; i++) {
                 llap[i].llap_magic = LLAP_MAGIC;
                 rc = obd_prep_async_page(exp, lsm, NULL, &pages[i],
@@ -645,7 +742,7 @@ llu_file_write(struct inode *inode, const struct iovec *iovec,
                 if (err != ELDLM_OK)
                         GOTO(err_out, err = -ENOLCK);
 
-                CDEBUG(D_INFO, "Writing inode %lu, "LPSZ" bytes, offset %llu\n",
+                CDEBUG(D_INFO, "Writing inode %lu, "LPSZ" bytes, offset %Lu\n",
                        lli->lli_st_ino, count, pos);
 
                 cookie = llu_rw(OBD_BRW_WRITE, inode, buf, count, pos);
diff --git a/lustre/liblustre/super.c b/lustre/liblustre/super.c
index 4bedacc..25ffc0f 100644
--- a/lustre/liblustre/super.c
+++ b/lustre/liblustre/super.c
@@ -337,14 +337,13 @@ static struct inode* llu_new_inode(struct filesys *fs,
         return inode;
 }
 
-static int llu_have_md_lock(struct inode *inode, __u64 lockpart)
+static int llu_have_md_lock(struct inode *inode)
 {
         struct llu_sb_info *sbi = llu_i2sbi(inode);
         struct llu_inode_info *lli = llu_i2info(inode);
         struct lustre_handle lockh;
         struct ldlm_res_id res_id = { .name = {0} };
         struct obd_device *obddev;
-        ldlm_policy_data_t policy = { .l_inodebits = { lockpart } };
         int flags;
         ENTRY;
 
@@ -358,14 +357,14 @@ static int llu_have_md_lock(struct inode *inode, __u64 lockpart)
 
         /* FIXME use LDLM_FL_TEST_LOCK instead */
         flags = LDLM_FL_BLOCK_GRANTED | LDLM_FL_CBPENDING;
-        if (ldlm_lock_match(obddev->obd_namespace, flags, &res_id, LDLM_IBITS,
-                            &policy, LCK_PR, &lockh)) {
+        if (ldlm_lock_match(obddev->obd_namespace, flags, &res_id, LDLM_PLAIN,
+                            NULL, LCK_PR, &lockh)) {
                 ldlm_lock_decref(&lockh, LCK_PR);
                 RETURN(1);
         }
 
-        if (ldlm_lock_match(obddev->obd_namespace, flags, &res_id, LDLM_IBITS,
-                            &policy, LCK_PW, &lockh)) {
+        if (ldlm_lock_match(obddev->obd_namespace, flags, &res_id, LDLM_PLAIN,
+                            NULL, LCK_PW, &lockh)) {
                 ldlm_lock_decref(&lockh, LCK_PW);
                 RETURN(1);
         }
@@ -383,7 +382,7 @@ static int llu_inode_revalidate(struct inode *inode)
                 RETURN(0);
         }
 
-        if (!llu_have_md_lock(inode, MDS_INODELOCK_UPDATE)) {
+        if (!llu_have_md_lock(inode)) {
                 struct lustre_md md;
                 struct ptlrpc_request *req = NULL;
                 struct llu_sb_info *sbi = llu_i2sbi(inode);
@@ -1188,7 +1187,7 @@ static int llu_iop_fcntl(struct inode *ino, int cmd, va_list ap)
         return -ENOSYS;
 }
 
-static int llu_get_grouplock(struct inode *inode, unsigned long arg)
+static int llu_get_cwlock(struct inode *inode, unsigned long arg)
 {
         struct llu_inode_info *lli = llu_i2info(inode);
         struct ll_file_data *fd = lli->lli_file_data;
@@ -1200,7 +1199,7 @@ static int llu_get_grouplock(struct inode *inode, unsigned long arg)
         int flags = 0;
         ENTRY;
 
-        if (fd->fd_flags & LL_FILE_GROUP_LOCKED) {
+        if (fd->fd_flags & LL_FILE_CW_LOCKED) {
                 RETURN(-EINVAL);
         }
 
@@ -1208,19 +1207,18 @@ static int llu_get_grouplock(struct inode *inode, unsigned long arg)
         if (lli->lli_open_flags & O_NONBLOCK)
                 flags = LDLM_FL_BLOCK_NOWAIT;
 
-        err = llu_extent_lock(fd, inode, lsm, LCK_GROUP, &policy, &lockh,
-                              flags);
+        err = llu_extent_lock(fd, inode, lsm, LCK_CW, &policy, &lockh, flags);
         if (err)
                 RETURN(err);
 
-        fd->fd_flags |= LL_FILE_GROUP_LOCKED|LL_FILE_IGNORE_LOCK;
+        fd->fd_flags |= LL_FILE_CW_LOCKED|LL_FILE_IGNORE_LOCK;
         fd->fd_gid = arg;
         memcpy(&fd->fd_cwlockh, &lockh, sizeof(lockh));
 
         RETURN(0);
 }
 
-static int llu_put_grouplock(struct inode *inode, unsigned long arg)
+static int llu_put_cwlock(struct inode *inode, unsigned long arg)
 {
         struct llu_inode_info *lli = llu_i2info(inode);
         struct ll_file_data *fd = lli->lli_file_data;
@@ -1228,15 +1226,15 @@ static int llu_put_grouplock(struct inode *inode, unsigned long arg)
         ldlm_error_t err;
         ENTRY;
 
-        if (!(fd->fd_flags & LL_FILE_GROUP_LOCKED))
+        if (!(fd->fd_flags & LL_FILE_CW_LOCKED))
                 RETURN(-EINVAL);
 
         if (fd->fd_gid != arg)
                 RETURN(-EINVAL);
 
-        fd->fd_flags &= ~(LL_FILE_GROUP_LOCKED|LL_FILE_IGNORE_LOCK);
+        fd->fd_flags &= ~(LL_FILE_CW_LOCKED|LL_FILE_IGNORE_LOCK);
 
-        err = llu_extent_unlock(fd, inode, lsm, LCK_GROUP, &fd->fd_cwlockh);
+        err = llu_extent_unlock(fd, inode, lsm, LCK_CW, &fd->fd_cwlockh);
         if (err)
                 RETURN(err);
 
@@ -1252,12 +1250,12 @@ static int llu_iop_ioctl(struct inode *ino, unsigned long int request,
         unsigned long arg;
 
         switch (request) {
-        case LL_IOC_GROUP_LOCK:
+        case LL_IOC_CW_LOCK:
                 arg = va_arg(ap, unsigned long);
-                return llu_get_grouplock(ino, arg);
-        case LL_IOC_GROUP_UNLOCK:
+                return llu_get_cwlock(ino, arg);
+        case LL_IOC_CW_UNLOCK:
                 arg = va_arg(ap, unsigned long);
-                return llu_put_grouplock(ino, arg);
+                return llu_put_cwlock(ino, arg);
         }
 
         CERROR("did not support ioctl cmd %lx\n", request);
@@ -1290,11 +1288,8 @@ struct inode *llu_iget(struct filesys *fs, struct lustre_md *md)
 
         if ((md->body->valid &
              (OBD_MD_FLGENER | OBD_MD_FLID | OBD_MD_FLTYPE)) !=
-            (OBD_MD_FLGENER | OBD_MD_FLID | OBD_MD_FLTYPE)) {
-                /* FIXME this is workaround for for open(O_CREAT),
-                 * see lookup_it_finish(). */
-                return ERR_PTR(-EPERM);
-        }
+            (OBD_MD_FLGENER | OBD_MD_FLID | OBD_MD_FLTYPE))
+                CERROR("invalide fields!\n");
 
         /* try to find existing inode */
         fid.id = md->body->ino;
@@ -1493,7 +1488,7 @@ llu_fsswop_mount(const char *source,
         LASSERT(sbi->ll_rootino != 0);
 
         root = llu_iget(fs, &md);
-        if (!root || IS_ERR(root)) {
+        if (root == NULL) {
                 CERROR("fail to generate root inode\n");
                 GOTO(out_request, err = -EBADF);
         }
@@ -1563,3 +1558,5 @@ static struct inode_ops llu_inode_ops = {
 #endif
         inop_gone:      llu_iop_gone,
 };
+
+#warning "time_after() defined in liblustre.h need to be rewrite in userspace"
diff --git a/lustre/liblustre/tests/.cvsignore b/lustre/liblustre/tests/.cvsignore
index eb542ff..e995588 100644
--- a/lustre/liblustre/tests/.cvsignore
+++ b/lustre/liblustre/tests/.cvsignore
@@ -1,8 +1,3 @@
+.deps
 Makefile
 Makefile.in
-.deps
-echo_test
-recovery_small
-replay_ost_single
-replay_single
-sanity
diff --git a/lustre/liblustre/tests/Makefile.am b/lustre/liblustre/tests/Makefile.am
index ff73edf..150678a 100644
--- a/lustre/liblustre/tests/Makefile.am
+++ b/lustre/liblustre/tests/Makefile.am
@@ -1,13 +1,20 @@
 ## Liblustre excecutables & libraries Makefile
+DEFS=
 
-AM_CPPFLAGS = -I$(SYSIO)/include -I/opt/lam/include $(LLCPPFLAGS) -I$(top_srcdir)/portals/unals
-AM_CFLAGS = $(LLCFLAGS)
-LIBS = $(LIBEFENCE) $(LIBREADLINE)
+CFLAGS := -g -Wall -I$(top_srcdir)/utils -I$(top_srcdir)/portals/include \
+          -I$(top_srcdir)/portals/unals -I$(SYSIO)/include \
+          -I/opt/lam/include -L/opt/lam/lib
 
-LLIB_EXEC= ../liblustre.a -lcap -lpthread
+KFLAGS:=
+CPPFLAGS = $(HAVE_EFENCE) -D_LARGEFILE64_SOURCE=1
+LIBS = $(LIBEFENCE)
+
+
+LLIB_EXEC= ../liblustre.a -lpthread
 
-if LIBLUSTRE
 noinst_LIBRARIES = libtestcommon.a
+libtestcommon_a_SOURCES = test_common.c
+
 def_tests = echo_test sanity recovery_small replay_single replay_ost_single
 
 if MPITESTS
@@ -15,39 +22,31 @@ bin_PROGRAMS = $(def_tests) test_lock_cancel
 else
 bin_PROGRAMS = $(def_tests)
 endif
-endif # LIBLUSTRE
-
-libtestcommon_a_SOURCES = test_common.c test_common.h
 
 echo_test_SOURCES = echo_test.c  ../../utils/parser.c ../../utils/obd.c ../../utils/lustre_cfg.c
-echo_test_CFLAGS = $(LL_CFLAGS)
-echo_test_LDADD = ../liblsupport.a $(LIBREADLINE) -lcap -lpthread 
-echo_test_DEPENDENCIES=$(top_builddir)/liblustre/liblsupport.a
+echo_test_LDADD = ../liblsupport.a $(LIBREADLINE) -lpthread 
+echo_test_DEPENDENCIES=$(top_srcdir)/liblustre/liblsupport.a
 
 sanity_SOURCES = sanity.c
-sanity_CFLAGS = $(LL_CFLAGS)
 sanity_LDADD := ./libtestcommon.a $(LLIB_EXEC)
-sanity_DEPENDENCIES = $(top_builddir)/liblustre/liblustre.a ./libtestcommon.a
+sanity_DEPENDENCIES = $(top_srcdir)/liblustre/liblustre.a ./libtestcommon.a
 
 recovery_small_SOURCES = recovery_small.c
-recovery_small_CFLAGS = $(LL_CFLAGS)
 recovery_small_LDADD := ./libtestcommon.a $(LLIB_EXEC) 
-recovery_small_DEPENDENCIES = $(top_builddir)/liblustre/liblustre.a
+recovery_small_DEPENDENCIES = $(top_srcdir)/liblustre/liblustre.a
 
 replay_single_SOURCES = replay_single.c
-replay_single_CFLAGS = $(LL_CFLAGS)
 replay_single_LDADD := ./libtestcommon.a $(LLIB_EXEC)
-replay_single_DEPENDENCIES = $(top_builddir)/liblustre/liblustre.a
+replay_single_DEPENDENCIES = $(top_srcdir)/liblustre/liblustre.a
 
 replay_ost_single_SOURCES = replay_ost_single.c
-replay_ost_single_CFLAGS = $(LL_CFLAGS)
 replay_ost_single_LDADD := ./libtestcommon.a $(LLIB_EXEC)
-replay_ost_single_DEPENDENCIES = $(top_builddir)/liblustre/liblustre.a
+replay_ost_single_DEPENDENCIES = $(top_srcdir)/liblustre/liblustre.a
 
 if MPITESTS
 test_lock_cancel_SOURCES = test_lock_cancel.c
-test_lock_cancel_CFLAGS = $(LL_CFLAGS) -I/opt/lam/include -L/opt/lam/lib
 test_lock_cancel_LDADD :=  $(LLIB_EXEC) -lmpi -llam
 endif
 
+include $(top_srcdir)/Rules
 
diff --git a/lustre/liblustre/tests/echo_test.c b/lustre/liblustre/tests/echo_test.c
index 19fd83a..40d3731 100644
--- a/lustre/liblustre/tests/echo_test.c
+++ b/lustre/liblustre/tests/echo_test.c
@@ -1,11 +1,9 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- */
 #include <stdio.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 
+#include <portals/api-support.h> /* needed for ptpctl.h */
 #include <portals/ptlctl.h>	/* needed for parse_dump */
 
 
@@ -23,18 +21,7 @@ struct obd_import;
 
 unsigned int portal_subsystem_debug = ~0 - (S_PORTALS | S_QSWNAL | S_SOCKNAL |
                                             S_GMNAL | S_IBNAL);
-
-void get_random_bytes(void *ptr, int size)
-{
-        char *p = ptr;
-
-        if (size < 1)
-                return;
-
-        while(size--)
-                *p++ = rand();
-}
-
+                                                                                                                        
 void *inter_module_get(char *arg)
 {
         if (!strcmp(arg, "tcpnal_ni"))
@@ -56,19 +43,17 @@ char *portals_nid2str(int nal, ptl_nid_t nid, char *str)
         case TCPNAL:
                 /* userspace NAL */
         case SOCKNAL:
-                snprintf(str, PTL_NALFMT_SIZE - 1, "%u:%u.%u.%u.%u",
-                         (__u32)(nid >> 32), HIPQUAD(nid));
+                sprintf(str, "%u:%d.%d.%d.%d", (__u32)(nid >> 32),
+                        HIPQUAD(nid));
                 break;
         case QSWNAL:
         case GMNAL:
         case IBNAL:
-                snprintf(str, PTL_NALFMT_SIZE - 1, "%u:%u",
-                         (__u32)(nid >> 32), (__u32)nid);
+        case SCIMACNAL:
+                sprintf(str, "%u:%u", (__u32)(nid >> 32), (__u32)nid);
                 break;
         default:
-                snprintf(str, PTL_NALFMT_SIZE - 1, "?%d? %llx",
-                         nal, (long long)nid);
-                break;
+                return NULL;
         }
         return str;
 }
@@ -85,16 +70,46 @@ struct pingcli_args {
 
 struct task_struct *current;
 
-int
-libcfs_nal_cmd(struct portals_cfg *pcfg)
+/* portals interfaces */
+ptl_handle_ni_t *
+kportal_get_ni (int nal)
 {
-        CERROR("empty function!!!\n");
-        return 0;
+        switch (nal)
+        {
+        case SOCKNAL:
+                return &tcpnal_ni;
+        default:
+                return NULL;
+        }
+}
+
+inline void
+kportal_put_ni (int nal)
+{
+        return;
 }
 
-int in_group_p(gid_t gid)
+int
+kportal_nal_cmd(struct portals_cfg *pcfg)
 {
+#if 0
+        __u32 nal = pcfg->pcfg_nal;
+        int rc = -EINVAL;
+
+        ENTRY;
+
+        down(&nal_cmd_sem);
+        if (nal > 0 && nal <= NAL_MAX_NR && nal_cmd[nal].nch_handler) {
+                CDEBUG(D_IOCTL, "calling handler nal: %d, cmd: %d\n", nal, 
+                       pcfg->pcfg_command);
+                rc = nal_cmd[nal].nch_handler(pcfg, nal_cmd[nal].nch_private);
+        }
+        up(&nal_cmd_sem);
+        RETURN(rc);
+#else
+        CERROR("empty function!!!\n");
         return 0;
+#endif
 }
 
 int init_current(int argc, char **argv)
@@ -112,17 +127,20 @@ int init_lib_portals()
 	int max_interfaces;
         int rc;
 
-        rc = PtlInit(&max_interfaces);
+        PtlInit(&max_interfaces);
+        rc = PtlNIInit(procbridge_interface, 0, 0, 0, &tcpnal_ni);
         if (rc != 0) {
                 CERROR("ksocknal: PtlNIInit failed: error %d\n", rc);
+                PtlFini();
                 RETURN (rc);
         }
+        PtlNIDebug(tcpnal_ni, ~0);
         return rc;
 }
 
 extern int class_handle_ioctl(unsigned int cmd, unsigned long arg);
 
-int liblustre_ioctl(int dev_id, unsigned int opc, void *ptr)
+int liblustre_ioctl(int dev_id, int opc, void *ptr)
 {
 	int   rc = -EINVAL;
 	
@@ -331,6 +349,7 @@ int main(int argc, char **argv)
         if (init_current(argc, argv) ||
 	    init_obdclass() || init_lib_portals() ||
 	    ptlrpc_init() ||
+	    ldlm_init() ||
 	    mdc_init() ||
 	    lov_init() ||
 	    osc_init() ||
diff --git a/lustre/liblustre/tests/recovery_small.c b/lustre/liblustre/tests/recovery_small.c
index baa4877..5aed06c 100644
--- a/lustre/liblustre/tests/recovery_small.c
+++ b/lustre/liblustre/tests/recovery_small.c
@@ -39,8 +39,6 @@
 
 #include "test_common.h"
 
-#define MAX_STRING_SIZE 2048
-
 static struct {
         const char   *name;
         unsigned long code;
@@ -54,7 +52,6 @@ static struct {
 static int drop_index = 0;
 
 static char mds_server[1024] = {0, };
-static char ssh_cmd[MAX_STRING_SIZE] = {0,};
 
 int do_stat(const char *name, struct stat *buf)
 {
@@ -124,14 +121,14 @@ void cleanup_dir(const char *path)
 
 #define FAIL()                                                             \
     do {                                                                   \
-        char cmd[MAX_STRING_SIZE];                                         \
+        char cmd[1024];                                                    \
         int rc;                                                            \
                                                                            \
         if (drop_arr[drop_index].name) {                                   \
             printf("server drops next %s\n", drop_arr[drop_index].name);   \
             sprintf(cmd,                                                   \
-                    "%s %s \"echo %lu > /proc/sys/lustre/fail_loc\"",      \
-                    ssh_cmd, mds_server, drop_arr[drop_index].code);       \
+                    "ssh %s \"echo %lu > /proc/sys/lustre/fail_loc\"",     \
+                    mds_server, drop_arr[drop_index].code);                \
             if (system(cmd)) {                                             \
                 printf("error excuting remote command: %d\n", rc);         \
                 exit(rc);                                                  \
@@ -144,8 +141,8 @@ void cleanup_dir(const char *path)
         char cmd[1024];                                                    \
                                                                            \
         if (drop_arr[drop_index].name) {                                   \
-            sprintf(cmd, "%s %s \"echo 0 > /proc/sys/lustre/fail_loc\"",   \
-                    ssh_cmd, mds_server);                                  \
+            sprintf(cmd, "ssh %s \"echo 0 > /proc/sys/lustre/fail_loc\"",  \
+                    mds_server);                                           \
             system(cmd);                                                   \
         }                                                                  \
     } while (0)
@@ -316,7 +313,6 @@ int main(int argc, char * argv[])
         static struct option long_opts[] = {
                 {"target", 1, 0, 0},
                 {"dumpfile", 1, 0, 0},
-                {"ssh", 1, 0, 0},
                 {0, 0, 0, 0}
         };
 
@@ -333,14 +329,12 @@ int main(int argc, char * argv[])
                                 setenv(ENV_LUSTRE_MNTTGT, optarg, 1);
                         } else if (!strcmp(long_opts[opt_index].name, "dumpfile")) {
                                 setenv(ENV_LUSTRE_DUMPFILE, optarg, 1);
-                        } else if (!strcmp(long_opts[opt_index].name, "ssh")) {
-                                safe_strncpy(ssh_cmd, optarg, MAX_STRING_SIZE);
                         } else
                                 usage(argv[0]);
                         break;
                 }
                 case 's':
-                        safe_strncpy(mds_server, optarg, MAX_STRING_SIZE);
+                        strcpy(mds_server, optarg);
                         break;
                 default:
                         usage(argv[0]);
@@ -353,14 +347,9 @@ int main(int argc, char * argv[])
         if (strlen(mds_server) == 0)
                 usage(argv[0]);
 
-        /* default to using ssh */
-        if (!strlen(ssh_cmd)) {
-                safe_strncpy(ssh_cmd, "ssh", MAX_STRING_SIZE);
-        }
-
-        sprintf(cmd, "%s %s cat /dev/null", ssh_cmd, mds_server);
+        sprintf(cmd, "ssh %s cat /dev/null", mds_server);
         if (system(cmd)) {
-                printf("Can't access server node: %s using method: %s\n", mds_server, ssh_cmd);
+                printf("can't access server node: %s\n", mds_server);
                 exit(-1);
         }
 
diff --git a/lustre/liblustre/tests/replay_single.c b/lustre/liblustre/tests/replay_single.c
index 3394008..6645056 100644
--- a/lustre/liblustre/tests/replay_single.c
+++ b/lustre/liblustre/tests/replay_single.c
@@ -39,14 +39,13 @@
 
 #include "test_common.h"
 
-#define MAX_STRING_SIZE 2048
 
-static char mds_server[MAX_STRING_SIZE] = {0,};
-static char barrier_script[MAX_STRING_SIZE] = {0,};
-static char failover_script[MAX_STRING_SIZE] = {0,};
-static char barrier_cmd[MAX_STRING_SIZE] = {0,};
-static char failover_cmd[MAX_STRING_SIZE] = {0,};
-static char ssh_cmd[MAX_STRING_SIZE] = {0,};
+
+static char mds_server[1024] = {0,};
+static char barrier_script[1024] = {0,};
+static char failover_script[1024] = {0,};
+static char barrier_cmd[1024] = {0,};
+static char failover_cmd[1024] = {0,};
 
 static void replay_barrier()
 {
@@ -316,19 +315,19 @@ extern void __liblustre_cleanup_(void);
 void usage(const char *cmd)
 {
         printf("Usage: \t%s --target mdsnid:/mdsname/profile -s mds_hostname "
-                "-b \"barrier cmd\" -f \"failover cmd\" --ssh \"ssh_cmd\"\n", cmd);
+                "-b \"barrier cmd\" -f \"failover cmd\"\n", cmd);
         printf("       \t%s --dumpfile dumpfile -s mds_hostname -b \"barrier cmd\" "
-                "-f \"failover cmd\" --ssh \"ssh_cmd\"\n", cmd);
+                "-f \"failover cmd\"\n", cmd);
         exit(-1);
 }
 
 void test_ssh()
 {
-        char cmd[MAX_STRING_SIZE];
+        char cmd[1024];
 
-        sprintf(cmd, "%s %s cat /dev/null", ssh_cmd, mds_server);
+        sprintf(cmd, "ssh %s cat /dev/null", mds_server);
         if (system(cmd)) {
-                printf("Can't access server node: %s using method: %s\n", mds_server, ssh_cmd);
+                printf("ssh can't access server node: %s\n", mds_server);
                 exit(-1);
         }
 }
@@ -339,7 +338,6 @@ int main(int argc, char * const argv[])
         static struct option long_opts[] = {
                 {"target", 1, 0, 0},
                 {"dumpfile", 1, 0, 0},
-                {"ssh", 1, 0, 0},
                 {0, 0, 0, 0}
         };
 
@@ -356,20 +354,18 @@ int main(int argc, char * const argv[])
                                 setenv(ENV_LUSTRE_MNTTGT, optarg, 1);
                         } else if (!strcmp(long_opts[opt_index].name, "dumpfile")) {
                                 setenv(ENV_LUSTRE_DUMPFILE, optarg, 1);
-                        } else if (!strcmp(long_opts[opt_index].name, "ssh")) {
-                                safe_strncpy(ssh_cmd, optarg, MAX_STRING_SIZE);
                         } else
                                 usage(argv[0]);
                         break;
                 }
                 case 's':
-                        safe_strncpy(mds_server, optarg, MAX_STRING_SIZE);
+                        strcpy(mds_server, optarg);
                         break;
                 case 'b':
-                        safe_strncpy(barrier_script, optarg, MAX_STRING_SIZE);
+                        strcpy(barrier_script, optarg);
                         break;
                 case 'f':
-                        safe_strncpy(failover_script, optarg, MAX_STRING_SIZE);
+                        strcpy(failover_script, optarg);
                         break;
                 default:
                         usage(argv[0]);
@@ -382,18 +378,11 @@ int main(int argc, char * const argv[])
             !strlen(failover_script))
                 usage(argv[0]);
 
-        /* default to using ssh */
-        if (!strlen(ssh_cmd)) {
-                safe_strncpy(ssh_cmd, "ssh", MAX_STRING_SIZE);
-        }
-
         test_ssh();
 
         /* prepare remote command */
-        sprintf(barrier_cmd, "%s %s \"%s\"", 
-                ssh_cmd, mds_server, barrier_script);
-        sprintf(failover_cmd, "%s %s \"%s\"", 
-                ssh_cmd, mds_server, failover_script);
+        sprintf(barrier_cmd, "ssh %s \"%s\"", mds_server, barrier_script);
+        sprintf(failover_cmd, "ssh %s \"%s\"", mds_server, failover_script);
 
         setenv(ENV_LUSTRE_TIMEOUT, "10", 1);
 
diff --git a/lustre/liblustre/tests/sanity.c b/lustre/liblustre/tests/sanity.c
index cb42afe..944ae9c 100644
--- a/lustre/liblustre/tests/sanity.c
+++ b/lustre/liblustre/tests/sanity.c
@@ -105,8 +105,6 @@ void t4()
 #define PAGE_SIZE (4096)
 #define _npages (2048)
 
-#define MAX_PATH_LENGTH 4096
-
 static int _buffer[_npages][PAGE_SIZE/sizeof(int)];
 
 /* pos:   i/o start from
@@ -284,11 +282,11 @@ void t10()
 void t11()
 {
         char *base="/mnt/lustre";
-        char path[MAX_PATH_LENGTH], path2[MAX_PATH_LENGTH];
+        char path[4096], path2[4096];
         int i, j, level = 5, nreg = 5;
         ENTRY("deep tree");
 
-        safe_strncpy(path, base, MAX_PATH_LENGTH);
+        strcpy(path, base);
 
         for (i = 0; i < level; i++) {
                 for (j = 0; j < nreg; j++) {
@@ -301,7 +299,7 @@ void t11()
         }
 
         for (i = level; i > 0; i--) {
-                safe_strncpy(path, base, MAX_PATH_LENGTH);
+                strcpy(path, base);
                 for (j = 1; j < i; j++)
                         strcat(path, "/dir");
                 
diff --git a/lustre/liblustre/tests/test_common.c b/lustre/liblustre/tests/test_common.c
index a216d07..a87f0fa 100644
--- a/lustre/liblustre/tests/test_common.c
+++ b/lustre/liblustre/tests/test_common.c
@@ -313,16 +313,3 @@ void t_ls(int fd, char *buf, int size)
 		EXIT(-1);
 	}
 }
-
-char *safe_strncpy(char *dst, char *src, int max_size)
-{
-       int src_size;
-       src_size=strlen(src);
-       if (src_size >= max_size) {
-	 src_size=max_size-1;
-       }
-       memcpy(dst, src, src_size);
-       dst[src_size]=0;
-
-       return(dst);
-}
diff --git a/lustre/liblustre/tests/test_common.h b/lustre/liblustre/tests/test_common.h
index 73fe391..c3687b9 100644
--- a/lustre/liblustre/tests/test_common.h
+++ b/lustre/liblustre/tests/test_common.h
@@ -30,6 +30,4 @@ void t_grep(const char *path, char *str);
 void t_grep_v(const char *path, char *str);
 void t_ls(int fd, char *buf, int size);
 
-char *safe_strncpy(char *dst, char *src, int max_size);
-
 #endif
diff --git a/lustre/llite/.cvsignore b/lustre/llite/.cvsignore
index d749c615..49c6100 100644
--- a/lustre/llite/.cvsignore
+++ b/lustre/llite/.cvsignore
@@ -3,13 +3,7 @@ config.log
 config.status
 configure
 Makefile
+Makefile.in
 .deps
 TAGS
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
 .*.cmd
-.*.flags
-.tmp_versions
-.depend
diff --git a/lustre/llite/Makefile.am b/lustre/llite/Makefile.am
new file mode 100644
index 0000000..18c3a3a
--- /dev/null
+++ b/lustre/llite/Makefile.am
@@ -0,0 +1,21 @@
+# Copyright (C) 2001  Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+DEFS= 
+
+MODULE = llite
+modulefs_DATA = llite.o
+EXTRA_PROGRAMS = llite
+
+COMMON_SRC = dcache.c dir.c file.c llite_close.c llite_lib.c llite_nfs.c rw.c \
+             lproc_llite.c namei.c symlink.c llite_internal.h
+
+if LINUX25
+llite_SOURCES = $(COMMON_SRC) rw26.c super25.c
+else
+llite_SOURCES = $(COMMON_SRC) rw24.c super.c
+endif
+
+include $(top_srcdir)/Rules
diff --git a/lustre/llite/Makefile.in b/lustre/llite/Makefile.in
deleted file mode 100644
index 9492120..0000000
--- a/lustre/llite/Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
-MODULES := llite
-llite-objs := dcache.o dir.o file.o llite_close.o llite_lib.o llite_nfs.o rw.o lproc_llite.o namei.o special.o symlink.o
-
-ifeq ($(PATCHLEVEL),4)
-llite-objs += rw24.o super.o
-else
-llite-objs += rw26.o super25.o
-endif
-
-@INCLUDE_RULES@
\ No newline at end of file
diff --git a/lustre/llite/Makefile.mk b/lustre/llite/Makefile.mk
index 06dd10e..40345b6 100644
--- a/lustre/llite/Makefile.mk
+++ b/lustre/llite/Makefile.mk
@@ -8,4 +8,4 @@ include $(src)/../portals/Kernelenv
 obj-y += llite.o
 llite-objs := llite_lib.o dcache.o super.o rw.o \
 	super25.o file.o dir.o symlink.o namei.o lproc_llite.o \
-	rw26.o llite_nfs.o llite_close.o special.o
+	rw26.o llite_nfs.o llite_close.o
diff --git a/lustre/llite/autoMakefile.am b/lustre/llite/autoMakefile.am
deleted file mode 100644
index 9fdde59..0000000
--- a/lustre/llite/autoMakefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (C) 2001  Cluster File Systems, Inc.
-#
-# This code is issued under the GNU General Public License.
-# See the file COPYING in this distribution
-
-if MODULES
-modulefs_DATA = llite$(KMODEXT)
-endif
-
-DIST_SOURCES := $(llite-objs:.o=.c) llite_internal.h rw24.c super.c rw26.c super25.c
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
diff --git a/lustre/llite/dcache.c b/lustre/llite/dcache.c
index 544d2cf..b604792 100644
--- a/lustre/llite/dcache.c
+++ b/lustre/llite/dcache.c
@@ -49,27 +49,11 @@ static void ll_release(struct dentry *de)
         EXIT;
 }
 
-/* should NOT be called with the dcache lock, see fs/dcache.c */
-static int ll_ddelete(struct dentry *de)
-{
-        ENTRY;
-        LASSERT(de);
-        CDEBUG(D_DENTRY, "%s dentry %*s (%p, parent %p, inode %p) %s%s\n",
-               (de->d_flags & DCACHE_LUSTRE_INVALID ? "keeping" : "deleting"),
-               de->d_name.len, de->d_name.name, de, de->d_parent, de->d_inode,
-               d_unhashed(de) ? "" : "hashed,",
-               list_empty(&de->d_subdirs) ? "" : "subdirs");
-        RETURN(0);
-}
-
 void ll_set_dd(struct dentry *de)
 {
         ENTRY;
         LASSERT(de != NULL);
 
-        CDEBUG(D_DENTRY, "ldd on dentry %*s (%p) parent %p inode %p refc %d\n",
-               de->d_name.len, de->d_name.name, de, de->d_parent, de->d_inode,
-               atomic_read(&de->d_count));
         lock_kernel();
         if (de->d_fsdata == NULL) {
                 OBD_ALLOC(de->d_fsdata, sizeof(struct ll_dentry_data));
@@ -109,47 +93,43 @@ void ll_intent_release(struct lookup_intent *it)
 
 void ll_unhash_aliases(struct inode *inode)
 {
-        struct list_head *tmp, *head;
+	struct list_head *tmp, *head;
         struct ll_sb_info *sbi;
         ENTRY;
 
-        if (inode == NULL) {
-                CERROR("unexpected NULL inode, tell phil\n");
-                return;
-        }
+        sbi = ll_i2sbi(inode);
 
         CDEBUG(D_INODE, "marking dentries for ino %lu/%u(%p) invalid\n",
                inode->i_ino, inode->i_generation, inode);
 
-        sbi = ll_i2sbi(inode);
+        if (inode == NULL) {
+                CERROR("unexpected NULL inode, tell phil\n");
+                return;
+        }
         head = &inode->i_dentry;
 restart:
-        spin_lock(&dcache_lock);
-        tmp = head;
-        while ((tmp = tmp->next) != head) {
-                struct dentry *dentry = list_entry(tmp, struct dentry, d_alias);
-                if (atomic_read(&dentry->d_count) == 0) {
-                        CDEBUG(D_DENTRY, "deleting dentry %*s (%p) parent %p "
-                               "inode %p\n", dentry->d_name.len,
-                               dentry->d_name.name, dentry, dentry->d_parent,
-                               dentry->d_inode);
-                        dget_locked(dentry);
-                        __d_drop(dentry);
-                        spin_unlock(&dcache_lock);
-                        dput(dentry);
-                        goto restart;
-                } else if (!(dentry->d_flags & DCACHE_LUSTRE_INVALID)) {
-                        CDEBUG(D_DENTRY, "unhashing dentry %*s (%p) parent %p "
-                               "inode %p refc %d\n", dentry->d_name.len,
-                               dentry->d_name.name, dentry, dentry->d_parent,
-                               dentry->d_inode, atomic_read(&dentry->d_count));
+	spin_lock(&dcache_lock);
+	tmp = head;
+	while ((tmp = tmp->next) != head) {
+		struct dentry *dentry = list_entry(tmp, struct dentry, d_alias);
+                CDEBUG(D_INODE, "invalidate 0x%p: %*s -> %lu/%lu\n",
+                       dentry, dentry->d_name.len, dentry->d_name.name,
+                       (unsigned long) dentry->d_inode->i_ino,
+                       (unsigned long) dentry->d_inode->i_generation);
+		if (!atomic_read(&dentry->d_count)) {
+			dget_locked(dentry);
+			__d_drop(dentry);
+			spin_unlock(&dcache_lock);
+			dput(dentry);
+			goto restart;
+		} else {
                         hlist_del_init(&dentry->d_hash);
                         dentry->d_flags |= DCACHE_LUSTRE_INVALID;
                         hlist_add_head(&dentry->d_hash,
                                        &sbi->ll_orphan_dentry_list);
                 }
-        }
-        spin_unlock(&dcache_lock);
+	}
+	spin_unlock(&dcache_lock);
         EXIT;
 }
 
@@ -170,7 +150,8 @@ static int revalidate_it_finish(struct ptlrpc_request *request, int offset,
                 RETURN(-ENOENT);
 
         sbi = ll_i2sbi(de->d_inode);
-        rc = ll_prep_inode(sbi->ll_osc_exp, &de->d_inode, request, offset,NULL);
+        rc = ll_prep_inode(sbi->ll_osc_exp, sbi->ll_mdc_exp,
+                           &de->d_inode, request, offset,NULL);
 
         RETURN(rc);
 }
@@ -236,6 +217,11 @@ int ll_revalidate_it(struct dentry *de, int flags, struct lookup_intent *it)
         if (de->d_inode == NULL)
                 RETURN(0);
 
+        CDEBUG(D_INODE, "revalidate 0x%p: %*s -> %lu/%lu\n",
+                        de, de->d_name.len, de->d_name.name,
+                        (unsigned long) de->d_inode->i_ino,
+                        (unsigned long) de->d_inode->i_generation);
+
         exp = ll_i2mdcexp(de->d_inode);
         ll_inode2fid(&pfid, de->d_parent->d_inode);
         ll_inode2fid(&cfid, de->d_inode);
@@ -254,7 +240,7 @@ int ll_revalidate_it(struct dentry *de, int flags, struct lookup_intent *it)
 
         if (it->it_op == IT_GETATTR) { /* We need to check for LOOKUP lock
                                           as well */
-                rc = mdc_intent_lock(exp, &ctxt, &pfid, de->d_name.name,
+                rc = md_intent_lock(exp, &ctxt, &pfid, de->d_name.name,
                                      de->d_name.len, NULL, 0, &cfid, &lookup_it,
                                      flags, &req, ll_mdc_blocking_ast);
                 /* If there was no lookup lock, no point in even checking for
@@ -268,17 +254,16 @@ int ll_revalidate_it(struct dentry *de, int flags, struct lookup_intent *it)
                         it = &lookup_it;
                         GOTO(out, rc = 0);
                 }
-
+                        
                 if (req)
                         ptlrpc_req_finished(req);
                 req = NULL;
                 ll_lookup_finish_locks(&lookup_it, de);
         }
 
-        rc = mdc_intent_lock(exp, &ctxt, &pfid, de->d_name.name, de->d_name.len,
-                             NULL, 0,
-                             &cfid, it, flags, &req, ll_mdc_blocking_ast);
-        /* If req is NULL, then mdc_intent_lock only tried to do a lock match;
+        rc = md_intent_lock(exp, &ctxt, &pfid, de->d_name.name, de->d_name.len,
+                            NULL, 0, &cfid, it, flags, &req, ll_mdc_blocking_ast);
+        /* If req is NULL, then md_intent_lock only tried to do a lock match;
          * if all was well, it will return 1 if it found locks, 0 otherwise. */
         if (req == NULL && rc >= 0)
                 GOTO(out, rc);
@@ -310,13 +295,8 @@ int ll_revalidate_it(struct dentry *de, int flags, struct lookup_intent *it)
                 ptlrpc_req_finished(req);
         if (rc == 0) {
                 ll_unhash_aliases(de->d_inode);
-                /* done in ll_unhash_aliases()
-                dentry->d_flags |= DCACHE_LUSTRE_INVALID; */
+                de->d_flags |= DCACHE_LUSTRE_INVALID;
         } else {
-                CDEBUG(D_DENTRY, "revalidated dentry %*s (%p) parent %p "
-                               "inode %p refc %d\n", de->d_name.len,
-                               de->d_name.name, de, de->d_parent, de->d_inode,
-                               atomic_read(&de->d_count));
                 ll_lookup_finish_locks(it, de);
                 de->d_flags &= ~DCACHE_LUSTRE_INVALID;
         }
@@ -422,6 +402,24 @@ static int ll_revalidate_nd(struct dentry *dentry, struct nameidata *nd)
 }
 #endif
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
+static void ll_dentry_iput(struct dentry *dentry, struct inode *inode)
+{
+        struct ll_sb_info *sbi = ll_i2sbi(inode);
+        struct ll_fid parent, child;
+
+        LASSERT(dentry->d_parent && dentry->d_parent->d_inode);
+        ll_inode2fid(&parent, dentry->d_parent->d_inode);
+        ll_inode2fid(&child, inode);
+        md_change_cbdata_name(sbi->ll_mdc_exp, &parent,
+                              (char *)dentry->d_name.name, dentry->d_name.len,
+                              &child, null_if_equal, inode);
+        iput(inode);
+}
+#else
+#error "implement ->d_iput() for 2.6"
+#endif
+
 struct dentry_operations ll_d_ops = {
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
         .d_revalidate = ll_revalidate_nd,
@@ -429,7 +427,7 @@ struct dentry_operations ll_d_ops = {
         .d_revalidate_it = ll_revalidate_it,
 #endif
         .d_release = ll_release,
-        .d_delete = ll_ddelete,
+        .d_iput = ll_dentry_iput,
 #if 0
         .d_pin = ll_pin,
         .d_unpin = ll_unpin,
diff --git a/lustre/llite/dir.c b/lustre/llite/dir.c
index 961a00e..285627c 100644
--- a/lustre/llite/dir.c
+++ b/lustre/llite/dir.c
@@ -70,16 +70,17 @@ static int ll_dir_readpage(struct file *file, struct page *page)
                inode->i_generation, inode);
 
         mdc_pack_fid(&mdc_fid, inode->i_ino, inode->i_generation, S_IFDIR);
-
+        mdc_fid.mds = ll_i2info(inode)->lli_mds;
         offset = page->index << PAGE_SHIFT;
-        rc = mdc_readpage(ll_i2sbi(inode)->ll_mdc_exp, &mdc_fid,
+        rc = md_readpage(ll_i2sbi(inode)->ll_mdc_exp, &mdc_fid,
                           offset, page, &request);
         if (!rc) {
                 body = lustre_msg_buf(request->rq_repmsg, 0, sizeof (*body));
-                LASSERT (body != NULL);         /* checked by mdc_readpage() */
-                LASSERT_REPSWABBED (request, 0); /* swabbed by mdc_readpage() */
+                LASSERT (body != NULL); /* checked by md_readpage() */
+                LASSERT_REPSWABBED (request, 0);/*swabbed by md_readpage()*/
 
-                inode->i_size = body->size;
+#warning "FIXME ASAP!"
+                //inode->i_size = body->size;
                 SetPageUptodate(page);
         }
         ptlrpc_req_finished(request);
@@ -90,7 +91,7 @@ static int ll_dir_readpage(struct file *file, struct page *page)
 }
 
 struct address_space_operations ll_dir_aops = {
-        .readpage  = ll_dir_readpage,
+        readpage: ll_dir_readpage,
 };
 
 /*
@@ -201,6 +202,7 @@ Eend:
 fail:
         SetPageChecked(page);
         SetPageError(page);
+        LBUG();
 }
 
 static struct page *ll_get_dir_page(struct inode *dir, unsigned long n)
@@ -214,6 +216,7 @@ static struct page *ll_get_dir_page(struct inode *dir, unsigned long n)
         ldlm_policy_data_t policy = { .l_inodebits = { MDS_INODELOCK_UPDATE } };
         int rc;
 
+        obddev = md_get_real_obd(ll_i2sbi(dir)->ll_mdc_exp, NULL, 0);
         rc = ldlm_lock_match(obddev->obd_namespace, LDLM_FL_BLOCK_GRANTED,
                              &res_id, LDLM_IBITS, &policy, LCK_PR, &lockh);
         if (!rc) {
@@ -223,7 +226,7 @@ static struct page *ll_get_dir_page(struct inode *dir, unsigned long n)
 
                 ll_prepare_mdc_op_data(&data, dir, NULL, NULL, 0, 0);
 
-                rc = mdc_enqueue(ll_i2sbi(dir)->ll_mdc_exp, LDLM_IBITS, &it,
+                rc = md_enqueue(ll_i2sbi(dir)->ll_mdc_exp, LDLM_IBITS, &it,
                                  LCK_PR, &data, &lockh, NULL, 0,
                                  ldlm_completion_ast, ll_mdc_blocking_ast, dir);
 
@@ -322,7 +325,7 @@ int ll_readdir(struct file * filp, void * dirent, filldir_t filldir)
                        n, npages, inode->i_size);
                 page = ll_get_dir_page(inode, n);
 
-                /* size might have been updated by mdc_readpage */
+                /* size might have been updated by md_readpage */
                 npages = dir_pages(inode);
 
                 if (IS_ERR(page)) {
@@ -368,6 +371,46 @@ done:
         RETURN(rc);
 }
 
+static int ll_mkdir_stripe(struct inode *inode, unsigned long arg)
+{
+        char *name;
+        struct ll_user_mkdir_stripe lums;
+        struct ptlrpc_request *request = NULL;
+        struct ll_sb_info *sbi = ll_i2sbi(inode);
+        struct mdc_op_data op_data;
+        u16 nstripes;
+        mode_t mode;
+        int err = 0;
+        ENTRY;
+        CDEBUG(D_VFSTRACE, "ioctl Op:name=%s,dir=%lu/%u(%p)\n",
+               name, inode->i_ino, inode->i_generation, inode);
+
+        if (copy_from_user(&lums, (void *)arg, sizeof(lums)))
+                RETURN(-EFAULT);
+
+        if (lums.lums_namelen <= 0)
+                RETURN(-EINVAL);
+        OBD_ALLOC(name, lums.lums_namelen);
+        if (!name)
+                RETURN(-ENOMEM);
+
+        if (copy_from_user(name, lums.lums_name, lums.lums_namelen))
+                GOTO(out, err=-EFAULT);
+
+        nstripes = lums.lums_nstripes;
+
+        mode = lums.lums_mode;
+        mode = (mode & (S_IRWXUGO|S_ISVTX) & ~current->fs->umask) | S_IFDIR;
+        ll_prepare_mdc_op_data(&op_data, inode, NULL, name,lums.lums_namelen,0);
+        err = md_create(sbi->ll_mdc_exp, &op_data, &nstripes, sizeof(nstripes),
+                        mode, current->fsuid, current->fsgid, 0, &request);
+        ptlrpc_req_finished(request);
+
+out:
+        OBD_FREE(name, lums.lums_namelen);
+        RETURN(err);
+}
+
 static int ll_dir_ioctl(struct inode *inode, struct file *file,
                         unsigned int cmd, unsigned long arg)
 {
@@ -385,7 +428,7 @@ static int ll_dir_ioctl(struct inode *inode, struct file *file,
         switch(cmd) {
         case EXT3_IOC_GETFLAGS:
         case EXT3_IOC_SETFLAGS:
-                RETURN(ll_iocontrol(inode, file, cmd, arg));
+                RETURN( ll_iocontrol(inode, file, cmd, arg) );
         case IOC_MDC_LOOKUP: {
                 struct ptlrpc_request *request = NULL;
                 struct ll_fid fid;
@@ -409,10 +452,11 @@ static int ll_dir_ioctl(struct inode *inode, struct file *file,
 
                 valid = OBD_MD_FLID;
                 ll_inode2fid(&fid, inode);
-                rc = mdc_getattr_name(sbi->ll_mdc_exp, &fid,
-                                      filename, namelen, valid, 0, &request);
+                rc = md_getattr_name(sbi->ll_mdc_exp, &fid,
+                                          filename, namelen, valid,
+                                          0, &request);
                 if (rc < 0) {
-                        CDEBUG(D_INFO, "mdc_getattr_name: %d\n", rc);
+                        CDEBUG(D_INFO, "md_getattr_name: %d\n", rc);
                         GOTO(out, rc);
                 }
 
@@ -423,77 +467,11 @@ static int ll_dir_ioctl(struct inode *inode, struct file *file,
                 obd_ioctl_freedata(buf, len);
                 return rc;
         }
-        case LL_IOC_LOV_SETSTRIPE: {
-                struct ptlrpc_request *request = NULL;
-                struct mdc_op_data op_data;
-                struct iattr attr = { 0 };
-                struct lov_user_md lum, *lump = (struct lov_user_md *)arg;
-                int rc = 0;
-
-                ll_prepare_mdc_op_data(&op_data, inode, NULL, NULL, 0, 0);
-
-                LASSERT(sizeof(lum) == sizeof(*lump));
-                LASSERT(sizeof(lum.lmm_objects[0]) ==
-                        sizeof(lump->lmm_objects[0]));
-                rc = copy_from_user(&lum, lump, sizeof(lum));
-                if (rc)
-                        return(-EFAULT);
-
-                if (lum.lmm_magic != LOV_USER_MAGIC)
-                        RETURN(-EINVAL);
-
-                rc = mdc_setattr(sbi->ll_mdc_exp, &op_data,
-                                 &attr, &lum, sizeof(lum), NULL, 0, &request);
-                if (rc) {
-                        ptlrpc_req_finished(request);
-                        if (rc != -EPERM && rc != -EACCES)
-                                CERROR("mdc_setattr fails: rc = %d\n", rc);
-                        return rc;
-                }
-                ptlrpc_req_finished(request);
-
-                return rc;
-        }
-        case LL_IOC_LOV_GETSTRIPE: {
-                struct ptlrpc_request *request = NULL;
-                struct lov_user_md *lump = (struct lov_user_md *)arg;
-                struct lov_mds_md *lmm;
-                struct ll_fid fid;
-                struct mds_body *body;
-                unsigned long valid = 0;
-                int rc, lmmsize;
-
-                valid |= OBD_MD_FLDIREA;
-
-                ll_inode2fid(&fid, inode);
-                rc = mdc_getattr(sbi->ll_mdc_exp, &fid, valid,
-                                 obd_size_diskmd(sbi->ll_osc_exp, NULL),
-                                 &request);
-                if (rc < 0) {
-                        CDEBUG(D_INFO, "mdc_getattr failed: rc = %d\n", rc);
-                        RETURN(rc);
-                }
-
-                body = lustre_msg_buf(request->rq_repmsg, 0, sizeof(*body));
-                LASSERT(body != NULL);         /* checked by mdc_getattr_name */
-                LASSERT_REPSWABBED(request, 0);/* swabbed by mdc_getattr_name */
-
-                lmmsize = body->eadatasize;
-                if (lmmsize == 0)
-                        GOTO(out_get, rc = -ENODATA);
-
-                lmm = lustre_msg_buf(request->rq_repmsg, 1, lmmsize);
-                LASSERT(lmm != NULL);
-                LASSERT_REPSWABBED(request, 1);
-                rc = copy_to_user(lump, lmm, lmmsize);
-                if (rc)
-                        GOTO(out_get, rc = -EFAULT);
-
-                EXIT;
-        out_get:
-                ptlrpc_req_finished(request);
-                RETURN(rc);
-        }
+        case LL_IOC_MDC_MKDIRSTRIPE:
+                RETURN(ll_mkdir_stripe(inode, arg));
+        case LL_IOC_LOV_SETSTRIPE:
+        case LL_IOC_LOV_GETSTRIPE:
+                RETURN(-ENOTTY);
         case IOC_MDC_GETSTRIPE: {
                 struct ptlrpc_request *request = NULL;
                 struct ll_fid fid;
@@ -508,18 +486,19 @@ static int ll_dir_ioctl(struct inode *inode, struct file *file,
                         RETURN(PTR_ERR(filename));
 
                 ll_inode2fid(&fid, inode);
-                rc = mdc_getattr_name(sbi->ll_mdc_exp, &fid, filename,
-                                      strlen(filename)+1, OBD_MD_FLEASIZE,
-                                      obd_size_diskmd(sbi->ll_osc_exp, NULL),
-                                      &request);
+                rc = md_getattr_name(sbi->ll_mdc_exp, &fid, filename,
+                                          strlen(filename)+1, OBD_MD_FLEASIZE,
+                                          obd_size_diskmd(sbi->ll_osc_exp, NULL),
+                                          &request);
                 if (rc < 0) {
-                        CDEBUG(D_INFO, "mdc_getattr_name failed on %s: rc %d\n",
+                        CDEBUG(D_INFO,
+                               "md_getattr_name failed on %s: rc %d\n",
                                filename, rc);
                         GOTO(out_name, rc);
                 }
 
                 body = lustre_msg_buf(request->rq_repmsg, 0, sizeof (*body));
-                LASSERT(body != NULL);         /* checked by mdc_getattr_name */
+                LASSERT(body != NULL); /* checked by md_getattr_name */
                 LASSERT_REPSWABBED(request, 0);/* swabbed by mdc_getattr_name */
 
                 lmmsize = body->eadatasize;
@@ -551,17 +530,17 @@ static int ll_dir_ioctl(struct inode *inode, struct file *file,
                 int rc, len=0;
                 struct client_obd *cli;
                 struct obd_device *obd;
-
+                                                                                                                             
                 rc = obd_ioctl_getdata(&buf, &len, (void *)arg);
                 if (rc)
                         RETURN(rc);
                 data = (void *)buf;
 
                 obd = class_name2obd(data->ioc_inlbuf1);
-
+                                                                                                                             
                 if (!obd )
                         GOTO(out_ping, rc = -ENODEV);
-
+                                                                                                                             
                 if (!obd->obd_attached) {
                         CERROR("Device %d not attached\n", obd->obd_minor);
                         GOTO(out_ping, rc = -ENODEV);
@@ -580,7 +559,7 @@ static int ll_dir_ioctl(struct inode *inode, struct file *file,
 
                 rc = ptlrpc_queue_wait(req);
 
-                ptlrpc_req_finished(req);
+                ptlrpc_req_finished(req);                                                                                                 
         out_ping:
                 obd_ioctl_freedata(buf, len);
                 return rc;
@@ -591,7 +570,7 @@ static int ll_dir_ioctl(struct inode *inode, struct file *file,
                 int rc, len = 0;
                 char *bufs[2], *str;
                 int lens[2], size;
-
+                
                 rc = obd_ioctl_getdata(&buf, &len, (void *)arg);
                 if (rc)
                         RETURN(rc);
@@ -601,7 +580,7 @@ static int ll_dir_ioctl(struct inode *inode, struct file *file,
                         obd_ioctl_freedata(buf, len);
                         RETURN(-EINVAL);
                 }
-
+                
                 lens[0] = data->ioc_inllen1;
                 bufs[0] = data->ioc_inlbuf1;
                 if (data->ioc_inllen2) {
@@ -612,22 +591,22 @@ static int ll_dir_ioctl(struct inode *inode, struct file *file,
                         bufs[1] = NULL;
                 }
                 size = data->ioc_plen1;
-                req = ptlrpc_prep_req(sbi2mdc(sbi)->cl_import, LLOG_CATINFO,
+                req = ptlrpc_prep_req(sbi2mdc(sbi)->cl_import, LLOG_CATINFO, 
                                       2, lens, bufs);
                 if (!req)
                         GOTO(out_catinfo, rc = -ENOMEM);
                 req->rq_replen = lustre_msg_size(1, &size);
-
+               
                 rc = ptlrpc_queue_wait(req);
                 str = lustre_msg_string(req->rq_repmsg, 0, data->ioc_plen1);
                 if (!rc)
-                        rc = copy_to_user(data->ioc_pbuf1, str,
+                        rc = copy_to_user(data->ioc_pbuf1, str, 
                                           data->ioc_plen1);
                 ptlrpc_req_finished(req);
         out_catinfo:
                 obd_ioctl_freedata(buf, len);
                 RETURN(rc);
-        }
+        }                  
         default:
                 return obd_iocontrol(cmd, sbi->ll_osc_exp,0,NULL,(void *)arg);
         }
@@ -635,21 +614,19 @@ static int ll_dir_ioctl(struct inode *inode, struct file *file,
 
 int ll_dir_open(struct inode *inode, struct file *file)
 {
-        ENTRY;
-        RETURN(ll_file_open(inode, file));
+        return ll_file_open(inode, file);
 }
 
 int ll_dir_release(struct inode *inode, struct file *file)
 {
-        ENTRY;
-        RETURN(ll_file_release(inode, file));
+        return ll_file_release(inode, file);
 }
 
 struct file_operations ll_dir_operations = {
-        .open     = ll_dir_open,
-        .release  = ll_dir_release,
-        .read     = generic_read_dir,
-        .readdir  = ll_readdir,
-        .ioctl    = ll_dir_ioctl
+        open: ll_dir_open,
+        release: ll_dir_release,
+        read: generic_read_dir,
+        readdir: ll_readdir,
+        ioctl: ll_dir_ioctl
 };
 
diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index d06de4a..8efd389 100644
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -30,37 +30,40 @@
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
 #include <linux/lustre_compat25.h>
 #endif
+
 #include "llite_internal.h"
 
-int ll_mdc_close(struct obd_export *mdc_exp, struct inode *inode,
+static int ll_mdc_close(struct obd_export *mdc_exp, struct inode *inode,
                         struct file *file)
 {
         struct ll_file_data *fd = file->private_data;
         struct ptlrpc_request *req = NULL;
         struct obd_client_handle *och = &fd->fd_mds_och;
         struct obdo obdo;
-        int rc;
+        int rc, valid;
         ENTRY;
 
         /* clear group lock, if present */
-        if (fd->fd_flags & LL_FILE_GROUP_LOCKED) {
+        if (fd->fd_flags & LL_FILE_CW_LOCKED) {
                 struct lov_stripe_md *lsm = ll_i2info(inode)->lli_smd;
-                fd->fd_flags &= ~(LL_FILE_GROUP_LOCKED|LL_FILE_IGNORE_LOCK);
-                rc = ll_extent_unlock(fd, inode, lsm, LCK_GROUP,
-                                      &fd->fd_cwlockh);
+                fd->fd_flags &= ~(LL_FILE_CW_LOCKED|LL_FILE_IGNORE_LOCK);
+                rc = ll_extent_unlock(fd, inode, lsm, LCK_CW, &fd->fd_cwlockh);
         }
 
+        valid = OBD_MD_FLID;
+
+        memset(&obdo, 0, sizeof(obdo));
         obdo.o_id = inode->i_ino;
-        obdo.o_valid = OBD_MD_FLID;
-        obdo_from_inode(&obdo, inode, OBD_MD_FLTYPE | OBD_MD_FLMODE |
-                                      OBD_MD_FLSIZE | OBD_MD_FLBLOCKS |
-                                      OBD_MD_FLATIME | OBD_MD_FLMTIME |
-                                      OBD_MD_FLCTIME);
+        obdo.o_mode = inode->i_mode;
+        obdo.o_size = inode->i_size;
+        obdo.o_blocks = inode->i_blocks;
         if (0 /* ll_is_inode_dirty(inode) */) {
                 obdo.o_flags = MDS_BFLAG_UNCOMMITTED_WRITES;
-                obdo.o_valid |= OBD_MD_FLFLAGS;
+                valid |= OBD_MD_FLFLAGS;
         }
-        rc = mdc_close(mdc_exp, &obdo, och, &req);
+        obdo.o_valid = valid;
+        obdo.o_mds = ll_i2info(inode)->lli_mds;
+        rc = md_close(mdc_exp, &obdo, och, &req);
         if (rc == EAGAIN) {
                 /* We are the last writer, so the MDS has instructed us to get
                  * the file size and any write cookies, then close again. */
@@ -98,7 +101,8 @@ int ll_file_release(struct inode *inode, struct file *file)
         int rc;
 
         ENTRY;
-        CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p)\n", inode->i_ino,
+        CDEBUG(D_VFSTRACE, "VFS Op:inode=%u/%lu/%u(%p)\n",
+               ll_i2info(inode)->lli_mds, inode->i_ino,
                inode->i_generation, inode);
 
         /* don't do anything for / */
@@ -129,15 +133,20 @@ static int ll_intent_file_open(struct file *file, void *lmm,
 
         ll_prepare_mdc_op_data(&data, parent->d_inode, NULL, name, len, O_RDWR);
 
-        rc = mdc_enqueue(sbi->ll_mdc_exp, LDLM_IBITS, itp, LCK_PW, &data,
-                         &lockh, lmm, lmmsize, ldlm_completion_ast,
-                         ll_mdc_blocking_ast, parent->d_inode);
-        if (rc < 0)
+        rc = md_enqueue(sbi->ll_mdc_exp, LDLM_IBITS, itp, LCK_PR, &data,
+                        &lockh, lmm, lmmsize, ldlm_completion_ast,
+                        ll_mdc_blocking_ast, NULL);
+        if (rc == 0) {
+                if (itp->d.lustre.it_lock_mode)
+                        memcpy(&itp->d.lustre.it_lock_handle,
+                                        &lockh, sizeof(lockh));
+        } else if (rc < 0) {
                 CERROR("lock enqueue: err: %d\n", rc);
+        }
         RETURN(rc);
 }
 
-int ll_local_open(struct file *file, struct lookup_intent *it)
+static int ll_local_open(struct file *file, struct lookup_intent *it)
 {
         struct ptlrpc_request *req = it->d.lustre.it_data;
         struct ll_inode_info *lli = ll_i2info(file->f_dentry->d_inode);
@@ -186,8 +195,7 @@ int ll_local_open(struct file *file, struct lookup_intent *it)
 int ll_file_open(struct inode *inode, struct file *file)
 {
         struct ll_inode_info *lli = ll_i2info(inode);
-        struct lookup_intent *it, oit = { .it_op = IT_OPEN,
-                                          .it_flags = file->f_flags };
+        struct lookup_intent *it;
         struct lov_stripe_md *lsm;
         struct ptlrpc_request *req;
         int rc = 0;
@@ -202,7 +210,9 @@ int ll_file_open(struct inode *inode, struct file *file)
 
         it = file->f_it;
 
-        if (!it || !it->d.lustre.it_disposition) {
+        if (!it->d.lustre.it_disposition) {
+                struct lookup_intent oit = { .it_op = IT_OPEN,
+                                             .it_flags = file->f_flags };
                 it = &oit;
                 rc = ll_intent_file_open(file, NULL, 0, it);
                 if (rc)
@@ -218,6 +228,8 @@ int ll_file_open(struct inode *inode, struct file *file)
         if (rc)
                 LBUG();
 
+        ll_intent_drop_lock(it);
+
         if (!S_ISREG(inode->i_mode))
                 GOTO(out, rc);
 
@@ -251,10 +263,11 @@ int ll_lsm_getattr(struct obd_export *exp, struct lov_stripe_md *lsm,
 
         memset(oa, 0, sizeof *oa);
         oa->o_id = lsm->lsm_object_id;
+        oa->o_gr = lsm->lsm_object_gr;
         oa->o_mode = S_IFREG;
         oa->o_valid = OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLSIZE |
                 OBD_MD_FLBLOCKS | OBD_MD_FLBLKSZ | OBD_MD_FLMTIME |
-                OBD_MD_FLCTIME;
+                OBD_MD_FLCTIME | OBD_MD_FLGROUP;
 
         set = ptlrpc_prep_set();
         if (set == NULL) {
@@ -269,7 +282,7 @@ int ll_lsm_getattr(struct obd_export *exp, struct lov_stripe_md *lsm,
         if (rc)
                 RETURN(rc);
 
-        oa->o_valid &= (OBD_MD_FLBLOCKS | OBD_MD_FLBLKSZ | OBD_MD_FLMTIME |
+        oa->o_valid &= (OBD_MD_FLBLOCKS | OBD_MD_FLBLKSZ | OBD_MD_FLMTIME | 
                         OBD_MD_FLCTIME | OBD_MD_FLSIZE);
         RETURN(0);
 }
@@ -386,10 +399,15 @@ void ll_pgcache_remove_extent(struct inode *inode, struct lov_stripe_md *lsm,
                          tmpex.l_extent.start, lock->l_policy_data.l_extent.end,
                          start, i, end);
 
-                if (!mapping_has_pages(inode->i_mapping)) {
+                ll_pgcache_lock(inode->i_mapping);
+                if (list_empty(&inode->i_mapping->dirty_pages) &&
+                    list_empty(&inode->i_mapping->clean_pages) &&
+                    list_empty(&inode->i_mapping->locked_pages)) {
                         CDEBUG(D_INODE|D_PAGE, "nothing left\n");
+                        ll_pgcache_unlock(inode->i_mapping);
                         break;
                 }
+                ll_pgcache_unlock(inode->i_mapping);
 
                 conditional_schedule();
 
@@ -401,7 +419,14 @@ void ll_pgcache_remove_extent(struct inode *inode, struct lov_stripe_md *lsm,
                 lock_page(page);
 
                 /* page->mapping to check with racing against teardown */
-                if (!discard && clear_page_dirty_for_io(page)) {
+                if (page->mapping && PageDirty(page) && !discard) {
+                        ClearPageDirty(page);
+                        LL_CDEBUG_PAGE(D_PAGE, page, "found dirty\n");
+                        ll_pgcache_lock(inode->i_mapping);
+                        list_del(&page->list);
+                        list_add(&page->list, &inode->i_mapping->locked_pages);
+                        ll_pgcache_unlock(inode->i_mapping);
+
                         rc = ll_call_writepage(inode, page);
                         if (rc != 0)
                                 CERROR("writepage of page %p failed: %d\n",
@@ -482,7 +507,6 @@ static int ll_extent_lock_callback(struct ldlm_lock *lock,
                 down(&inode->i_sem);
                 kms = ldlm_extent_shift_kms(lock,
                                             lsm->lsm_oinfo[stripe].loi_kms);
-		
                 if (lsm->lsm_oinfo[stripe].loi_kms != kms)
                         LDLM_DEBUG(lock, "updating kms from "LPU64" to "LPU64,
                                    lsm->lsm_oinfo[stripe].loi_kms, kms);
@@ -597,7 +621,6 @@ static int ll_glimpse_callback(struct ldlm_lock *lock, void *reqp)
 }
 
 __u64 lov_merge_size(struct lov_stripe_md *lsm, int kms);
-__u64 lov_merge_blocks(struct lov_stripe_md *lsm);
 __u64 lov_merge_mtime(struct lov_stripe_md *lsm, __u64 current_time);
 
 /* NB: lov_merge_size will prefer locally cached writes if they extend the
@@ -607,7 +630,7 @@ int ll_glimpse_size(struct inode *inode, struct ost_lvb *lvb)
         struct ll_inode_info *lli = ll_i2info(inode);
         struct ll_sb_info *sbi = ll_i2sbi(inode);
         ldlm_policy_data_t policy = { .l_extent = { 0, OBD_OBJECT_EOF } };
-        struct lustre_handle lockh = { 0 };
+        struct lustre_handle lockh;
         int rc, flags = LDLM_FL_HAS_INTENT;
         ENTRY;
 
@@ -623,11 +646,9 @@ int ll_glimpse_size(struct inode *inode, struct ost_lvb *lvb)
         }
 
         lvb->lvb_size = lov_merge_size(lli->lli_smd, 0);
-        inode->i_blocks = lov_merge_blocks(lli->lli_smd);
         //inode->i_mtime = lov_merge_mtime(lli->lli_smd, inode->i_mtime);
 
-        CDEBUG(D_DLMTRACE, "glimpse: size: "LPU64", blocks: "LPU64"\n",
-               lvb->lvb_size, lvb->lvb_blocks);
+        CDEBUG(D_DLMTRACE, "glimpse: size: "LPU64"\n", lvb->lvb_size);
 
         obd_cancel(sbi->ll_osc_exp, lli->lli_smd, LCK_PR, &lockh);
 
@@ -696,7 +717,7 @@ static ssize_t ll_file_read(struct file *filp, char *buf, size_t count,
         struct lov_stripe_md *lsm = lli->lli_smd;
         struct lustre_handle lockh = { 0 };
         ldlm_policy_data_t policy;
-        int rc;
+        ldlm_error_t err;
         ssize_t retval;
         __u64 kms;
         ENTRY;
@@ -717,14 +738,14 @@ static ssize_t ll_file_read(struct file *filp, char *buf, size_t count,
         policy.l_extent.start = *ppos;
         policy.l_extent.end = *ppos + count - 1;
 
-        rc = ll_extent_lock(fd, inode, lsm, LCK_PR, &policy, &lockh,
-                                (filp->f_flags & O_NONBLOCK) ?
-                                        LDLM_FL_BLOCK_NOWAIT: 0);
-        if (rc != 0)
-                RETURN(rc);
+        err = ll_extent_lock(fd, inode, lsm, LCK_PR, &policy, &lockh,
+                             (filp->f_flags & O_NONBLOCK)?LDLM_FL_BLOCK_NOWAIT:
+                                                          0);
+        if (err != ELDLM_OK)
+                RETURN(err);
 
         kms = lov_merge_size(lsm, 1);
-        if (*ppos + count - 1 > kms) {
+        if (policy.l_extent.end > kms) {
                 /* A glimpse is necessary to determine whether we return a short
                  * read or some zeroes at the end of the buffer */
                 struct ost_lvb lvb;
@@ -764,8 +785,9 @@ static ssize_t ll_file_write(struct file *file, const char *buf, size_t count,
         struct lustre_handle lockh = { 0 };
         ldlm_policy_data_t policy;
         loff_t maxbytes = ll_file_maxbytes(inode);
+        ldlm_error_t err;
         ssize_t retval;
-        int nonblock = 0, rc;
+        int nonblock = 0;
         ENTRY;
         if (file->f_flags & O_NONBLOCK)
                 nonblock = LDLM_FL_BLOCK_NOWAIT;
@@ -793,9 +815,9 @@ static ssize_t ll_file_write(struct file *file, const char *buf, size_t count,
                 policy.l_extent.end = *ppos + count - 1;
         }
 
-        rc = ll_extent_lock(fd, inode, lsm, LCK_PW, &policy, &lockh, nonblock);
-        if (rc != 0)
-                RETURN(rc);
+        err = ll_extent_lock(fd, inode, lsm, LCK_PW, &policy, &lockh, nonblock);
+        if (err != ELDLM_OK)
+                RETURN(err);
 
         /* this is ok, g_f_w will overwrite this under i_sem if it races
          * with a local truncate, it just makes our maxbyte checking easier */
@@ -925,10 +947,10 @@ static int ll_lov_setstripe_ea_info(struct inode *inode, struct file *file,
         if (rc < 0)
                 GOTO(out, rc);
 
-        rc = mdc_req2lustre_md(req, 1, exp, &md);
+        rc = mdc_req2lustre_md(req, 1, exp, NULL, &md);
         if (rc)
                 GOTO(out, rc);
-        ll_update_inode(f->f_dentry->d_inode, md.body, md.lsm);
+        ll_update_inode(f->f_dentry->d_inode, &md);
 
         rc = ll_local_open(f, &oit);
         if (rc)
@@ -951,7 +973,7 @@ static int ll_lov_setea(struct inode *inode, struct file *file,
 {
         int flags = MDS_OPEN_HAS_OBJS | FMODE_WRITE;
         struct lov_user_md  *lump;
-        int lum_size = sizeof(struct lov_user_md) +
+        int lum_size = sizeof(struct lov_user_md) + 
                        sizeof(struct lov_user_ost_data);
         int rc;
         ENTRY;
@@ -963,7 +985,8 @@ static int ll_lov_setea(struct inode *inode, struct file *file,
         if (lump == NULL) {
                 RETURN(-ENOMEM);
         }
-        rc = copy_from_user(lump, (struct lov_user_md  *)arg, lum_size);
+        rc = copy_from_user(lump, (struct lov_user_md  *)arg, 
+                            lum_size);
         if (rc) {
                 OBD_FREE(lump, lum_size);
                 RETURN(-EFAULT);
@@ -1005,7 +1028,7 @@ static int ll_lov_getstripe(struct inode *inode, unsigned long arg)
                             (void *)arg);
 }
 
-static int ll_get_grouplock(struct inode *inode, struct file *file,
+static int ll_get_cwlock(struct inode *inode, struct file *file,
                          unsigned long arg)
 {
         struct ll_file_data *fd = file->private_data;
@@ -1014,10 +1037,11 @@ static int ll_get_grouplock(struct inode *inode, struct file *file,
         struct lustre_handle lockh = { 0 };
         struct ll_inode_info *lli = ll_i2info(inode);
         struct lov_stripe_md *lsm = lli->lli_smd;
-        int flags = 0, rc;
+        ldlm_error_t err;
+        int flags = 0;
         ENTRY;
 
-        if (fd->fd_flags & LL_FILE_GROUP_LOCKED) {
+        if (fd->fd_flags & LL_FILE_CW_LOCKED) {
                 RETURN(-EINVAL);
         }
 
@@ -1025,45 +1049,45 @@ static int ll_get_grouplock(struct inode *inode, struct file *file,
         if (file->f_flags & O_NONBLOCK)
                 flags = LDLM_FL_BLOCK_NOWAIT;
 
-        rc = ll_extent_lock(fd, inode, lsm, LCK_GROUP, &policy, &lockh, flags);
-        if (rc != 0)
-                RETURN(rc);
+        err = ll_extent_lock(fd, inode, lsm, LCK_CW, &policy, &lockh, flags);
+        if (err)
+                RETURN(err);
 
-        fd->fd_flags |= LL_FILE_GROUP_LOCKED|LL_FILE_IGNORE_LOCK;
+        fd->fd_flags |= LL_FILE_CW_LOCKED|LL_FILE_IGNORE_LOCK;
         fd->fd_gid = arg;
         memcpy(&fd->fd_cwlockh, &lockh, sizeof(lockh));
 
         RETURN(0);
 }
 
-static int ll_put_grouplock(struct inode *inode, struct file *file,
+static int ll_put_cwlock(struct inode *inode, struct file *file,
                          unsigned long arg)
 {
         struct ll_file_data *fd = file->private_data;
         struct ll_inode_info *lli = ll_i2info(inode);
         struct lov_stripe_md *lsm = lli->lli_smd;
-        int rc;
+        ldlm_error_t err;
         ENTRY;
 
-        if (!(fd->fd_flags & LL_FILE_GROUP_LOCKED)) {
+        if (!(fd->fd_flags & LL_FILE_CW_LOCKED)) {
                 /* Ugh, it's already unlocked. */
                 RETURN(-EINVAL);
         }
 
         if (fd->fd_gid != arg) /* Ugh? Unlocking with different gid? */
                 RETURN(-EINVAL);
+        
+        fd->fd_flags &= ~(LL_FILE_CW_LOCKED|LL_FILE_IGNORE_LOCK);
 
-        fd->fd_flags &= ~(LL_FILE_GROUP_LOCKED|LL_FILE_IGNORE_LOCK);
-
-        rc = ll_extent_unlock(fd, inode, lsm, LCK_GROUP, &fd->fd_cwlockh);
-        if (rc)
-                RETURN(rc);
+        err = ll_extent_unlock(fd, inode, lsm, LCK_CW, &fd->fd_cwlockh);
+        if (err)
+                RETURN(err);
 
         fd->fd_gid = 0;
         memset(&fd->fd_cwlockh, 0, sizeof(fd->fd_cwlockh));
 
         RETURN(0);
-}
+}       
 
 int ll_file_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                   unsigned long arg)
@@ -1100,7 +1124,7 @@ int ll_file_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
         case LL_IOC_LOV_SETSTRIPE:
                 RETURN(ll_lov_setstripe(inode, file, arg));
         case LL_IOC_LOV_SETEA:
-                RETURN(ll_lov_setea(inode, file, arg));
+                RETURN( ll_lov_setea(inode, file, arg) ); 
         case LL_IOC_LOV_GETSTRIPE:
                 RETURN(ll_lov_getstripe(inode, arg));
         case LL_IOC_RECREATE_OBJ:
@@ -1108,10 +1132,10 @@ int ll_file_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
         case EXT3_IOC_GETFLAGS:
         case EXT3_IOC_SETFLAGS:
                 RETURN( ll_iocontrol(inode, file, cmd, arg) );
-        case LL_IOC_GROUP_LOCK:
-                RETURN(ll_get_grouplock(inode, file, arg));
-        case LL_IOC_GROUP_UNLOCK:
-                RETURN(ll_put_grouplock(inode, file, arg));
+        case LL_IOC_CW_LOCK:
+                RETURN(ll_get_cwlock(inode, file, arg));
+        case LL_IOC_CW_UNLOCK:
+                RETURN(ll_put_cwlock(inode, file, arg));
         /* We need to special case any other ioctls we want to handle,
          * to send them to the MDS/OST as appropriate and to properly
          * network encode the arg field.
@@ -1140,16 +1164,17 @@ loff_t ll_file_seek(struct file *file, loff_t offset, int origin)
 
         lprocfs_counter_incr(ll_i2sbi(inode)->ll_stats, LPROC_LL_LLSEEK);
         if (origin == 2) { /* SEEK_END */
-                int nonblock = 0, rc;
+                ldlm_error_t err;
+                int nonblock = 0;
                 ldlm_policy_data_t policy = { .l_extent = {0, OBD_OBJECT_EOF }};
 
                 if (file->f_flags & O_NONBLOCK)
                         nonblock = LDLM_FL_BLOCK_NOWAIT;
 
-                rc = ll_extent_lock(fd, inode, lsm, LCK_PR, &policy, &lockh,
+                err = ll_extent_lock(fd, inode, lsm, LCK_PR, &policy, &lockh,
                                      nonblock);
-                if (rc != 0)
-                        RETURN(rc);
+                if (err != ELDLM_OK)
+                        RETURN(err);
 
                 offset += inode->i_size;
         } else if (origin == 1) { /* SEEK_CUR */
@@ -1191,7 +1216,7 @@ int ll_fsync(struct file *file, struct dentry *dentry, int data)
         rc = filemap_fdatawait(inode->i_mapping);
 
         ll_inode2fid(&fid, inode);
-        err = mdc_sync(ll_i2sbi(inode)->ll_mdc_exp, &fid, &req);
+        err = md_sync(ll_i2sbi(inode)->ll_mdc_exp, &fid, &req);
         if (!rc)
                 rc = err;
         if (!err)
@@ -1204,9 +1229,11 @@ int ll_fsync(struct file *file, struct dentry *dentry, int data)
                         RETURN(rc ? rc : -ENOMEM);
 
                 oa->o_id = lsm->lsm_object_id;
+                oa->o_gr = lsm->lsm_object_gr;
                 oa->o_valid = OBD_MD_FLID;
                 obdo_from_inode(oa, inode, OBD_MD_FLTYPE | OBD_MD_FLATIME |
-                                           OBD_MD_FLMTIME | OBD_MD_FLCTIME);
+                                           OBD_MD_FLMTIME | OBD_MD_FLCTIME |
+                                           OBD_MD_FLGROUP);
 
                 err = obd_sync(ll_i2sbi(inode)->ll_osc_exp, oa, lsm,
                                0, OBD_OBJECT_EOF);
@@ -1284,7 +1311,7 @@ int ll_file_flock(struct file *file, int cmd, struct file_lock *file_lock)
                "start="LPU64", end="LPU64"\n", inode->i_ino, flock.l_flock.pid,
                flags, mode, flock.l_flock.start, flock.l_flock.end);
 
-        obddev = sbi->ll_mdc_exp->exp_obd;
+        obddev = md_get_real_obd(sbi->ll_mdc_exp, NULL, 0);
         rc = ldlm_cli_enqueue(sbi->ll_mdc_exp, NULL, obddev->obd_namespace,
                               res_id, LDLM_FLOCK, &flock, mode, &flags,
                               NULL, ldlm_flock_completion_ast, NULL, file_lock,
@@ -1292,46 +1319,12 @@ int ll_file_flock(struct file *file, int cmd, struct file_lock *file_lock)
         RETURN(rc);
 }
 
-static int ll_have_md_lock(struct dentry *de, __u64 lockpart)
-{
-        struct ll_sb_info *sbi = ll_s2sbi(de->d_sb);
-        struct lustre_handle lockh;
-        struct ldlm_res_id res_id = { .name = {0} };
-        struct obd_device *obddev;
-        int flags;
-        ldlm_policy_data_t policy = { .l_inodebits = { lockpart } };
-        ENTRY;
-
-        if (!de->d_inode)
-               RETURN(0);
-
-        obddev = sbi->ll_mdc_exp->exp_obd;
-        res_id.name[0] = de->d_inode->i_ino;
-        res_id.name[1] = de->d_inode->i_generation;
-
-        CDEBUG(D_INFO, "trying to match res "LPU64"\n", res_id.name[0]);
-
-        /* FIXME use LDLM_FL_TEST_LOCK instead */
-        flags = LDLM_FL_BLOCK_GRANTED | LDLM_FL_CBPENDING;
-        if (ldlm_lock_match(obddev->obd_namespace, flags, &res_id, LDLM_IBITS,
-                            &policy, LCK_PR, &lockh)) {
-                ldlm_lock_decref(&lockh, LCK_PR);
-                RETURN(1);
-        }
-
-        if (ldlm_lock_match(obddev->obd_namespace, flags, &res_id, LDLM_IBITS,
-                            &policy, LCK_PW, &lockh)) {
-                ldlm_lock_decref(&lockh, LCK_PW);
-                RETURN(1);
-        }
-        RETURN(0);
-}
-
 int ll_inode_revalidate_it(struct dentry *dentry, struct lookup_intent *it)
 {
         struct inode *inode = dentry->d_inode;
         struct ll_inode_info *lli;
         struct lov_stripe_md *lsm;
+        struct ll_fid fid;
         int rc;
         ENTRY;
 
@@ -1339,14 +1332,16 @@ int ll_inode_revalidate_it(struct dentry *dentry, struct lookup_intent *it)
                 CERROR("REPORT THIS LINE TO PETER\n");
                 RETURN(0);
         }
+        ll_inode2fid(&fid, inode);
         lli = ll_i2info(inode);
-        CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p),name=%s\n",
-               inode->i_ino, inode->i_generation, inode, dentry->d_name.name);
+        CDEBUG(D_VFSTRACE, "VFS Op:inode=%lu/%u(%p),name=%s,intent=%s\n",
+               inode->i_ino, inode->i_generation, inode, dentry->d_name.name,
+               LL_IT2STR(it));
 #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0))
         lprocfs_counter_incr(ll_i2sbi(inode)->ll_stats, LPROC_LL_REVALIDATE);
 #endif
 
-        if (!ll_have_md_lock(dentry, MDS_INODELOCK_UPDATE)) {
+        if (!md_valid_attrs(ll_i2mdcexp(inode), &fid)) {
                 struct ptlrpc_request *req = NULL;
                 struct ll_sb_info *sbi = ll_i2sbi(dentry->d_inode);
                 struct ll_fid fid;
@@ -1358,12 +1353,13 @@ int ll_inode_revalidate_it(struct dentry *dentry, struct lookup_intent *it)
                         valid |= OBD_MD_FLEASIZE;
                 }
                 ll_inode2fid(&fid, inode);
-                rc = mdc_getattr(sbi->ll_mdc_exp, &fid, valid, ealen, &req);
+                rc = md_getattr(sbi->ll_mdc_exp, &fid, valid, ealen, &req);
                 if (rc) {
                         CERROR("failure %d inode %lu\n", rc, inode->i_ino);
                         RETURN(-abs(rc));
                 }
-                rc = ll_prep_inode(sbi->ll_osc_exp, &inode, req, 0, NULL);
+                rc = ll_prep_inode(sbi->ll_osc_exp, sbi->ll_mdc_exp,
+                                   &inode, req, 0, NULL);
                 if (rc) {
                         ptlrpc_req_finished(req);
                         RETURN(rc);
@@ -1417,28 +1413,34 @@ int ll_getattr(struct vfsmount *mnt, struct dentry *de,
 #endif
 
 struct file_operations ll_file_operations = {
-        .read           = ll_file_read,
-        .write          = ll_file_write,
-        .ioctl          = ll_file_ioctl,
-        .open           = ll_file_open,
-        .release        = ll_file_release,
-        .mmap           = generic_file_mmap,
-        .llseek         = ll_file_seek,
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
-        .sendfile       = generic_file_sendfile,
-#endif
-        .fsync          = ll_fsync,
-        //.lock           ll_file_flock
+        read:           ll_file_read,
+        write:          ll_file_write,
+        ioctl:          ll_file_ioctl,
+        open:           ll_file_open,
+        release:        ll_file_release,
+        mmap:           generic_file_mmap,
+        llseek:         ll_file_seek,
+        fsync:          ll_fsync,
+        //lock:           ll_file_flock
 };
 
 struct inode_operations ll_file_inode_operations = {
-        .setattr_raw    = ll_setattr_raw,
-        .setattr        = ll_setattr,
-        .truncate       = ll_truncate,
+        setattr_raw:    ll_setattr_raw,
+        setattr:        ll_setattr,
+        truncate:       ll_truncate,
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-        .getattr_it     = ll_getattr,
+        getattr_it:     ll_getattr,
 #else
-        .revalidate_it  = ll_inode_revalidate_it,
+        revalidate_it:  ll_inode_revalidate_it,
 #endif
 };
 
+struct inode_operations ll_special_inode_operations = {
+        setattr_raw:    ll_setattr_raw,
+        setattr:        ll_setattr,
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+        getattr_it:     ll_getattr,
+#else
+        revalidate_it:  ll_inode_revalidate_it,
+#endif
+};
diff --git a/lustre/llite/llite_close.c b/lustre/llite/llite_close.c
index c213781..f4dfdf2 100644
--- a/lustre/llite/llite_close.c
+++ b/lustre/llite/llite_close.c
@@ -134,7 +134,7 @@ static void ll_close_done_writing(struct inode *inode)
 
         rc = ll_extent_lock(NULL, inode, lli->lli_smd, LCK_PW, &policy, &lockh,
                             ast_flags);
-        if (rc != 0) {
+        if (rc != ELDLM_OK) {
                 CERROR("lock acquisition failed (%d): unable to send "
                        "DONE_WRITING for inode %lu/%u\n", rc, inode->i_ino,
                        inode->i_generation);
@@ -168,7 +168,7 @@ static void ll_close_done_writing(struct inode *inode)
         obdo.o_blocks = inode->i_blocks;
         obdo.o_valid = OBD_MD_FLID | OBD_MD_FLSIZE | OBD_MD_FLBLOCKS;
 
-        rc = mdc_done_writing(ll_i2sbi(inode)->ll_mdc_exp, &obdo);
+        rc = md_done_writing(ll_i2sbi(inode)->ll_mdc_exp, &obdo);
  out:
 }
 #endif
diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h
index 5f8d86c..0ceed8d4 100644
--- a/lustre/llite/llite_internal.h
+++ b/lustre/llite/llite_internal.h
@@ -10,24 +10,27 @@
 #ifndef LLITE_INTERNAL_H
 #define LLITE_INTERNAL_H
 
-/* default to about 40meg of readahead on a given system.  That much tied
- * up in 512k readahead requests serviced at 40ms each is about 1GB/s. */
-#define SBI_DEFAULT_RA_MAX ((40 << 20) >> PAGE_CACHE_SHIFT)
-
 struct ll_sb_info {
-        /* this protects pglist and max_r_a_pages.  It isn't safe to
-         * grab from interrupt contexts */
-        spinlock_t                ll_lock;
         struct obd_uuid           ll_sb_uuid;
+//        struct lustre_handle      ll_mdc_conn;
         struct obd_export        *ll_mdc_exp;
         struct obd_export        *ll_osc_exp;
         struct proc_dir_entry*    ll_proc_root;
         obd_id                    ll_rootino; /* number of root inode */
 
+        struct obd_uuid           ll_mds_uuid;
+        struct obd_uuid           ll_mds_peer_uuid;
         struct lustre_mount_data *ll_lmd;
         char                     *ll_instance;
 
         int                       ll_flags;
+        wait_queue_head_t         ll_commitcbd_waitq;
+        wait_queue_head_t         ll_commitcbd_ctl_waitq;
+        int                       ll_commitcbd_flags;
+        struct task_struct       *ll_commitcbd_thread;
+        time_t                    ll_commitcbd_waketime;
+        time_t                    ll_commitcbd_timeout;
+        spinlock_t                ll_commitcbd_lock;
         struct list_head          ll_conn_chain; /* per-conn chain of SBs */
 
         struct hlist_head         ll_orphan_dentry_list; /*please don't ask -p*/
@@ -35,20 +38,14 @@ struct ll_sb_info {
 
         struct lprocfs_stats     *ll_stats; /* lprocfs stats counter */
 
+        spinlock_t                ll_pglist_lock;
         unsigned long             ll_pglist_gen;
         struct list_head          ll_pglist;
-
-        unsigned long             ll_read_ahead_pages;
-        unsigned long             ll_max_read_ahead_pages;
-
 };
 
 struct ll_readahead_state {
         spinlock_t      ras_lock;
-        unsigned long   ras_last_readpage, ras_consecutive;
-        unsigned long   ras_window_start, ras_window_len;
-        unsigned long   ras_next_readahead;
-
+        unsigned long   ras_last, ras_window, ras_next_index;
 };
 
 extern kmem_cache_t *ll_file_data_slab;
@@ -150,12 +147,18 @@ void ll_prepare_mdc_op_data(struct mdc_op_data *,
 int ll_prepare_write(struct file *, struct page *, unsigned from, unsigned to);
 int ll_commit_write(struct file *, struct page *, unsigned from, unsigned to);
 void ll_inode_fill_obdo(struct inode *inode, int cmd, struct obdo *oa);
-void ll_ap_completion(void *data, int cmd, struct obdo *oa, int rc);
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
+#define ll_ap_completion ll_ap_completion_24
+void ll_ap_completion_24(void *data, int cmd, int rc);
+#else
+#define ll_ap_completion ll_ap_completion_26
+void ll_ap_completion_26(void *data, int cmd, int rc);
+#endif
 void ll_removepage(struct page *page);
+int ll_sync_page(struct page *page);
 int ll_readpage(struct file *file, struct page *page);
 struct ll_async_page *llap_from_cookie(void *cookie);
 struct ll_async_page *llap_from_page(struct page *page);
-struct ll_async_page *llap_cast_private(struct page *page);
 void ll_readahead_init(struct inode *inode, struct ll_readahead_state *ras);
 
 void ll_truncate(struct inode *inode);
@@ -163,6 +166,7 @@ void ll_truncate(struct inode *inode);
 /* llite/file.c */
 extern struct file_operations ll_file_operations;
 extern struct inode_operations ll_file_inode_operations;
+extern struct inode_operations ll_special_inode_operations;
 extern int ll_inode_revalidate_it(struct dentry *, struct lookup_intent *);
 int ll_extent_lock(struct ll_file_data *, struct inode *,
                    struct lov_stripe_md *, int mode, ldlm_policy_data_t *,
@@ -173,9 +177,6 @@ int ll_file_open(struct inode *inode, struct file *file);
 int ll_file_release(struct inode *inode, struct file *file);
 int ll_lsm_getattr(struct obd_export *, struct lov_stripe_md *, struct obdo *);
 int ll_glimpse_size(struct inode *inode, struct ost_lvb *lvb);
-int ll_local_open(struct file *file, struct lookup_intent *it);
-int ll_mdc_close(struct obd_export *mdc_exp, struct inode *inode,
-                 struct file *file);
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
 int ll_getattr(struct vfsmount *mnt, struct dentry *de,
                struct lookup_intent *it, struct kstat *stat);
@@ -191,6 +192,7 @@ void ll_lookup_finish_locks(struct lookup_intent *it, struct dentry *dentry);
 
 /* llite/llite_lib.c */
 
+extern struct super_operations ll_super_operations;
 extern struct super_operations lustre_super_operations;
 
 char *ll_read_opt(const char *opt, char *data);
@@ -200,6 +202,7 @@ void ll_lli_init(struct ll_inode_info *lli);
 int ll_fill_super(struct super_block *sb, void *data, int silent);
 int lustre_fill_super(struct super_block *sb, void *data, int silent);
 void lustre_put_super(struct super_block *sb);
+void ll_put_super(struct super_block *sb);
 struct inode *ll_inode_from_lock(struct ldlm_lock *lock);
 void ll_clear_inode(struct inode *inode);
 int ll_attr2inode(struct inode *inode, struct iattr *attr, int trunc);
@@ -208,29 +211,20 @@ int ll_setattr(struct dentry *de, struct iattr *attr);
 int ll_statfs(struct super_block *sb, struct kstatfs *sfs);
 int ll_statfs_internal(struct super_block *sb, struct obd_statfs *osfs,
                        unsigned long maxage);
-void ll_update_inode(struct inode *inode, struct mds_body *body,
-                     struct lov_stripe_md *lsm);
+void ll_update_inode(struct inode *inode, struct lustre_md *);
 int it_disposition(struct lookup_intent *it, int flag);
 void it_set_disposition(struct lookup_intent *it, int flag);
 void ll_read_inode2(struct inode *inode, void *opaque);
 int ll_iocontrol(struct inode *inode, struct file *file,
                  unsigned int cmd, unsigned long arg);
 void ll_umount_begin(struct super_block *sb);
-int ll_prep_inode(struct obd_export *exp, struct inode **inode,
+int ll_prep_inode(struct obd_export *, struct obd_export *, struct inode **inode,
                   struct ptlrpc_request *req, int offset, struct super_block *);
 __u32 get_uuid2int(const char *name, int len);
 struct dentry *ll_fh_to_dentry(struct super_block *sb, __u32 *data, int len,
                                int fhtype, int parent);
 int ll_dentry_to_fh(struct dentry *, __u32 *datap, int *lenp, int need_parent);
-
-/* llite/special.c */
-extern struct inode_operations ll_special_inode_operations;
-extern struct file_operations ll_special_chr_inode_fops;
-extern struct file_operations ll_special_chr_file_fops;
-extern struct file_operations ll_special_blk_inode_fops;
-extern struct file_operations ll_special_fifo_inode_fops;
-extern struct file_operations ll_special_fifo_file_fops;
-extern struct file_operations ll_special_sock_inode_fops;
+int null_if_equal(struct ldlm_lock *lock, void *data);
 
 /* llite/symlink.c */
 extern struct inode_operations ll_fast_symlink_inode_operations;
@@ -316,6 +310,8 @@ static inline void ll_inode2fid(struct ll_fid *fid, struct inode *inode)
 {
         mdc_pack_fid(fid, inode->i_ino, inode->i_generation,
                      inode->i_mode & S_IFMT);
+        LASSERT(ll_i2info(inode));
+        fid->mds = ll_i2info(inode)->lli_mds;
 }
 
 static inline int ll_mds_max_easize(struct super_block *sb)
diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index 53796c4..dc5d243 100644
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -38,6 +38,7 @@ kmem_cache_t *ll_file_data_slab;
 
 extern struct address_space_operations ll_aops;
 extern struct address_space_operations ll_dir_aops;
+extern struct super_operations ll_super_operations;
 
 #ifndef log2
 #define log2(n) ffz(~(n))
@@ -53,10 +54,9 @@ struct ll_sb_info *lustre_init_sbi(struct super_block *sb)
         if (!sbi)
                 RETURN(NULL);
 
-        spin_lock_init(&sbi->ll_lock);
+        spin_lock_init(&sbi->ll_pglist_lock);
         INIT_LIST_HEAD(&sbi->ll_pglist);
         sbi->ll_pglist_gen = 0;
-        sbi->ll_max_read_ahead_pages = SBI_DEFAULT_RA_MAX;
         INIT_LIST_HEAD(&sbi->ll_conn_chain);
         INIT_HLIST_HEAD(&sbi->ll_orphan_dentry_list);
         ll_s2sbi(sb) = sbi;
@@ -77,6 +77,29 @@ void lustre_free_sbi(struct super_block *sb)
         EXIT;
 }
 
+int lustre_init_ea_size(struct ll_sb_info *sbi)
+{
+        struct lov_desc desc;
+        int rc, valsize;
+        
+        /* OSC may have larger ea size */
+        valsize = sizeof(desc);
+        rc = obd_get_info(sbi->ll_osc_exp, strlen("lovdesc") + 1, "lovdesc", 
+                          &valsize, &desc);
+        if (rc == 0) {
+                obd_init_ea_size(sbi->ll_mdc_exp,
+                                 obd_size_diskmd(sbi->ll_osc_exp, NULL),
+                                 desc.ld_tgt_count*sizeof(struct llog_cookie));
+
+                /* declare ourself as real client. not connection
+                 * from another MDS 
+                 * FIXME: remove fake valsize, mdsize --bzzz */
+                rc = obd_set_info(sbi->ll_mdc_exp, strlen("client"),
+                                  "client", valsize, &desc);
+        }
+        RETURN(rc);
+}
+
 int lustre_common_fill_super(struct super_block *sb, char *mdc, char *osc)
 {
         struct inode *root = 0;
@@ -104,8 +127,6 @@ int lustre_common_fill_super(struct super_block *sb, char *mdc, char *osc)
                         CERROR("could not register mount in /proc/lustre");
         }
 
-        mdc_init_ea_size(obd, osc);
-
         err = obd_connect(&mdc_conn, obd, &sbi->ll_sb_uuid);
         if (err == -EBUSY) {
                 CERROR("An MDS (mdc %s) is performing recovery, of which this"
@@ -127,9 +148,10 @@ int lustre_common_fill_super(struct super_block *sb, char *mdc, char *osc)
         sb->s_blocksize_bits = log2(osfs.os_bsize);
         sb->s_magic = LL_SUPER_MAGIC;
         sb->s_maxbytes = PAGE_CACHE_MAXBYTES;
+       
+        devno = get_uuid2int(sbi->ll_mdc_exp->exp_obd->obd_uuid.uuid, 
+                             strlen(sbi->ll_mdc_exp->exp_obd->obd_uuid.uuid));
 
-        devno = get_uuid2int(sbi2mdc(sbi)->cl_import->imp_target_uuid.uuid,
-                             strlen(sbi2mdc(sbi)->cl_import->imp_target_uuid.uuid));
         sb->s_dev = devno;
 
         obd = class_name2obd(osc);
@@ -150,7 +172,9 @@ int lustre_common_fill_super(struct super_block *sb, char *mdc, char *osc)
         }
         sbi->ll_osc_exp = class_conn2export(&osc_conn);
 
-        err = mdc_getstatus(sbi->ll_mdc_exp, &rootfid);
+        lustre_init_ea_size(sbi);
+
+        err = md_getstatus(sbi->ll_mdc_exp, &rootfid);
         if (err) {
                 CERROR("cannot mds_connect: rc = %d\n", err);
                 GOTO(out_osc, err);
@@ -162,14 +186,15 @@ int lustre_common_fill_super(struct super_block *sb, char *mdc, char *osc)
 
         /* make root inode
          * XXX: move this to after cbd setup? */
-        err = mdc_getattr(sbi->ll_mdc_exp, &rootfid,
+        err = md_getattr(sbi->ll_mdc_exp, &rootfid,
                           OBD_MD_FLNOTOBD|OBD_MD_FLBLOCKS, 0, &request);
         if (err) {
-                CERROR("mdc_getattr failed for root: rc = %d\n", err);
+                CERROR("md_getattr failed for root: rc = %d\n", err);
                 GOTO(out_osc, err);
         }
 
-        err = mdc_req2lustre_md(request, 0, sbi->ll_osc_exp, &md);
+        err = mdc_req2lustre_md(request, 0, sbi->ll_osc_exp,
+                                sbi->ll_mdc_exp, &md);
         if (err) {
                 CERROR("failed to understand root inode md: rc = %d\n",err);
                 ptlrpc_req_finished (request);
@@ -193,14 +218,12 @@ int lustre_common_fill_super(struct super_block *sb, char *mdc, char *osc)
                 GOTO(out_root, err);
         }
 
-        /* making vm readahead 0 for 2.4.x. In the case of 2.6.x,
-           backing dev info assigned to inode mapping is used for
-           determining maximal readahead. */
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))
+#warning "Please fix this"
+#else
         /* bug 2805 - set VM readahead to zero */
         vm_max_readahead = vm_min_readahead = 0;
 #endif
-
         sb->s_root = d_alloc_root(root);
         RETURN(err);
 
@@ -239,8 +262,6 @@ void lustre_common_put_super(struct super_block *sb)
         spin_lock(&dcache_lock);
         hlist_for_each_safe(tmp, next, &sbi->ll_orphan_dentry_list) {
                 struct dentry *dentry = hlist_entry(tmp, struct dentry, d_hash);
-                CWARN("orphan dentry %*s (%p) at unmount\n",
-                      dentry->d_name.len, dentry->d_name.name, dentry);
                 shrink_dcache_parent(dentry);
         }
         spin_unlock(&dcache_lock);
@@ -366,6 +387,19 @@ out:
         RETURN(err);
 } /* ll_read_super */
 
+void ll_put_super(struct super_block *sb)
+{
+        ENTRY;
+
+        CDEBUG(D_VFSTRACE, "VFS Op: sb %p\n", sb);
+
+        lustre_common_put_super(sb);
+
+        lustre_free_sbi(sb);
+
+        EXIT;
+} /* ll_put_super */
+
 int lustre_process_log(struct lustre_mount_data *lmd, char * profile,
                        struct config_llog_instance *cfg, int allow_recov)
 {
@@ -393,7 +427,7 @@ int lustre_process_log(struct lustre_mount_data *lmd, char * profile,
                 PCFG_INIT(pcfg, NAL_CMD_REGISTER_MYNID);
                 pcfg.pcfg_nal = lmd->lmd_nal;
                 pcfg.pcfg_nid = lmd->lmd_local_nid;
-                err = libcfs_nal_cmd(&pcfg);
+                err = kportal_nal_cmd(&pcfg);
                 if (err <0)
                         GOTO(out, err);
         }
@@ -406,7 +440,7 @@ int lustre_process_log(struct lustre_mount_data *lmd, char * profile,
                 pcfg.pcfg_misc    = lmd->lmd_port;
                 pcfg.pcfg_size    = 8388608;
                 pcfg.pcfg_flags   = 0x4; /*share*/
-                err = libcfs_nal_cmd(&pcfg);
+                err = kportal_nal_cmd(&pcfg);
                 if (err <0)
                         GOTO(out, err);
         }
@@ -457,7 +491,7 @@ int lustre_process_log(struct lustre_mount_data *lmd, char * profile,
 
         exp = class_conn2export(&mdc_conn);
 
-        ctxt = llog_get_context(exp->exp_obd, LLOG_CONFIG_REPL_CTXT);
+        ctxt = llog_get_context(&exp->exp_obd->obd_llogs, LLOG_CONFIG_REPL_CTXT);
 #if 1
         rc = class_config_parse_llog(ctxt, profile, cfg);
 #else
@@ -497,7 +531,7 @@ out_del_conn:
                 pcfg.pcfg_nid     = lmd->lmd_server_nid;
                 pcfg.pcfg_id      = lmd->lmd_server_ipaddr;
                 pcfg.pcfg_flags   = 1; /*share*/
-                err = libcfs_nal_cmd(&pcfg);
+                err = kportal_nal_cmd(&pcfg);
                 if (err <0)
                         GOTO(out, err);
         }
@@ -532,7 +566,7 @@ int lustre_fill_super(struct super_block *sb, void *data, int silent)
                 struct config_llog_instance cfg;
                 int len;
 
-                if (lmd->lmd_mds[0] == '\0') {
+                if (!lmd->lmd_mds) {
                         CERROR("no mds name\n");
                         GOTO(out_free, err = -EINVAL);
                 }
@@ -723,7 +757,7 @@ struct inode *ll_inode_from_lock(struct ldlm_lock *lock)
         return inode;
 }
 
-static int null_if_equal(struct ldlm_lock *lock, void *data)
+int null_if_equal(struct ldlm_lock *lock, void *data)
 {
         if (data == lock->l_ast_data)
                 lock->l_ast_data = NULL;
@@ -746,7 +780,7 @@ void ll_clear_inode(struct inode *inode)
 
         ll_inode2fid(&fid, inode);
         clear_bit(LLI_F_HAVE_MDS_SIZE_LOCK, &(ll_i2info(inode)->lli_flags));
-        mdc_change_cbdata(sbi->ll_mdc_exp, &fid, null_if_equal, inode);
+        md_change_cbdata(sbi->ll_mdc_exp, &fid, null_if_equal, inode);
 
         if (lli->lli_smd)
                 obd_change_cbdata(sbi->ll_osc_exp, lli->lli_smd,
@@ -757,6 +791,13 @@ void ll_clear_inode(struct inode *inode)
                 lli->lli_smd = NULL;
         }
 
+        if (lli->lli_mea) {
+                /* FIXME: change cbdata for mea here */
+                obd_free_memmd(sbi->ll_mdc_exp,
+                               (struct lov_stripe_md **) &lli->lli_mea);
+                lli->lli_mea = NULL;
+        }
+
         if (lli->lli_symlink_name) {
                 OBD_FREE(lli->lli_symlink_name,
                          strlen(lli->lli_symlink_name) + 1);
@@ -836,17 +877,18 @@ int ll_setattr_raw(struct inode *inode, struct iattr *attr)
                 struct lustre_md md;
                 ll_prepare_mdc_op_data(&op_data, inode, NULL, NULL, 0, 0);
 
-                rc = mdc_setattr(sbi->ll_mdc_exp, &op_data,
-                                 attr, NULL, 0, NULL, 0, &request);
+                rc = md_setattr(sbi->ll_mdc_exp, &op_data,
+                                     attr, NULL, 0, NULL, 0, &request);
 
                 if (rc) {
                         ptlrpc_req_finished(request);
                         if (rc != -EPERM && rc != -EACCES)
-                                CERROR("mdc_setattr fails: rc = %d\n", rc);
+                                CERROR("md_setattr fails: rc = %d\n", rc);
                         RETURN(rc);
                 }
 
-                rc = mdc_req2lustre_md(request, 0, sbi->ll_osc_exp, &md);
+                rc = mdc_req2lustre_md(request, 0, sbi->ll_osc_exp,
+                                       sbi->ll_mdc_exp, &md);
                 if (rc) {
                         ptlrpc_req_finished(request);
                         RETURN(rc);
@@ -855,7 +897,7 @@ int ll_setattr_raw(struct inode *inode, struct iattr *attr)
                 /* Won't invoke vmtruncate as we already cleared ATTR_SIZE,
                  * but needed to set timestamps backwards on utime. */
                 inode_setattr(inode, attr);
-                ll_update_inode(inode, md.body, md.lsm);
+                ll_update_inode(inode, &md);
                 ptlrpc_req_finished(request);
 
                 if (!lsm || !S_ISREG(inode->i_mode)) {
@@ -874,10 +916,10 @@ int ll_setattr_raw(struct inode *inode, struct iattr *attr)
                                     (rc=ll_permission(inode,MAY_WRITE,NULL))!=0)
                                         RETURN(rc);
                         } else {
-                                /* from inode_change_ok() */
-                                if (current->fsuid != inode->i_uid &&
-                                    !capable(CAP_FOWNER))
-                                        RETURN(-EPERM);
+				/* from inode_change_ok() */
+				if (current->fsuid != inode->i_uid &&
+				    !capable(CAP_FOWNER))
+					RETURN(-EPERM);
                         }
                 }
 
@@ -908,7 +950,7 @@ int ll_setattr_raw(struct inode *inode, struct iattr *attr)
                 rc = ll_extent_lock(NULL, inode, lsm, LCK_PW, &policy, &lockh,
                                     ast_flags);
                 down(&inode->i_sem);
-                if (rc != 0)
+                if (rc != ELDLM_OK)
                         RETURN(rc);
 
                 rc = vmtruncate(inode, attr->ia_size);
@@ -931,7 +973,8 @@ int ll_setattr_raw(struct inode *inode, struct iattr *attr)
                 CDEBUG(D_INODE, "set mtime on OST inode %lu to %lu\n",
                        inode->i_ino, LTIME_S(attr->ia_mtime));
                 oa.o_id = lsm->lsm_object_id;
-                oa.o_valid = OBD_MD_FLID;
+                oa.o_gr = lsm->lsm_object_gr;
+                oa.o_valid = OBD_MD_FLID | OBD_MD_FLGROUP;
                 obdo_from_inode(&oa, inode, OBD_MD_FLTYPE | OBD_MD_FLATIME |
                                             OBD_MD_FLMTIME | OBD_MD_FLCTIME);
                 rc = obd_setattr(sbi->ll_osc_exp, &oa, lsm, NULL);
@@ -1035,13 +1078,18 @@ void dump_lsm(int level, struct lov_stripe_md *lsm)
                lsm->lsm_stripe_size, lsm->lsm_stripe_count);
 }
 
-void ll_update_inode(struct inode *inode, struct mds_body *body,
-                     struct lov_stripe_md *lsm)
+void ll_update_inode(struct inode *inode, struct lustre_md *md)
 {
         struct ll_inode_info *lli = ll_i2info(inode);
+        struct mds_body *body = md->body;
+        struct lov_stripe_md *lsm = md->lsm;
+        struct mea *mea = md->mea;
+        ENTRY;
 
-        LASSERT ((lsm != NULL) == ((body->valid & OBD_MD_FLEASIZE) != 0));
+        LASSERT((((__u32) lsm | (__u32) mea) != 0) ==
+                        ((body->valid & OBD_MD_FLEASIZE) != 0));
         if (lsm != NULL) {
+                LASSERT(lsm->lsm_object_gr > 0);
                 if (lli->lli_smd == NULL) {
                         lli->lli_smd = lsm;
                         lli->lli_maxbytes = lsm->lsm_maxbytes;
@@ -1065,6 +1113,22 @@ void ll_update_inode(struct inode *inode, struct mds_body *body,
                         obd_free_memmd(ll_i2obdexp(inode), &lsm);
         }
 
+        if (mea != NULL) {
+                if (lli->lli_mea == NULL) {
+                        lli->lli_mea = mea;
+                } else {
+                        if (memcmp(lli->lli_mea, mea, body->eadatasize)) {
+                                CERROR("mea mismatch for inode %lu\n",
+                                        inode->i_ino);
+                                LBUG();
+                        }
+                }
+                if (lli->lli_mea != mea)
+                        obd_free_memmd(ll_i2mdcexp(inode),
+                                        (struct lov_stripe_md **) &mea);
+                        
+        }
+
         if (body->valid & OBD_MD_FLID)
                 inode->i_ino = body->ino;
         if (body->valid & OBD_MD_FLATIME)
@@ -1105,14 +1169,10 @@ void ll_update_inode(struct inode *inode, struct mds_body *body,
 
         if (body->valid & OBD_MD_FLSIZE)
                 set_bit(LLI_F_HAVE_MDS_SIZE_LOCK, &lli->lli_flags);
-}
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
-static struct backing_dev_info ll_backing_dev_info = {
-        .ra_pages       = 0,    /* No readahead */
-        .memory_backed  = 0,    /* Does contribute to dirty memory */
-};
-#endif
+        lli->lli_mds = body->mds;
+        LASSERT(body->mds < 1000);
+}
 
 void ll_read_inode2(struct inode *inode, void *opaque)
 {
@@ -1134,8 +1194,7 @@ void ll_read_inode2(struct inode *inode, void *opaque)
         LTIME_S(inode->i_mtime) = 0;
         LTIME_S(inode->i_atime) = 0;
         LTIME_S(inode->i_ctime) = 0;
-        inode->i_rdev = 0;
-        ll_update_inode(inode, md->body, md->lsm);
+        ll_update_inode(inode, md);
 
         /* OIDEBUG(inode); */
 
@@ -1154,34 +1213,12 @@ void ll_read_inode2(struct inode *inode, void *opaque)
                 EXIT;
         } else {
                 inode->i_op = &ll_special_inode_operations;
-
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
                 init_special_inode(inode, inode->i_mode,
                                    kdev_t_to_nr(inode->i_rdev));
-
-                /* initializing backing dev info. */
-                inode->i_mapping->backing_dev_info = &ll_backing_dev_info;
 #else
                 init_special_inode(inode, inode->i_mode, inode->i_rdev);
 #endif
-                lli->ll_save_ifop = inode->i_fop;
-
-                if (S_ISCHR(inode->i_mode))
-                        inode->i_fop = &ll_special_chr_inode_fops;
-                else if (S_ISBLK(inode->i_mode))
-                        inode->i_fop = &ll_special_blk_inode_fops;
-                else if (S_ISFIFO(inode->i_mode))
-                        inode->i_fop = &ll_special_fifo_inode_fops;
-                else if (S_ISSOCK(inode->i_mode))
-                        inode->i_fop = &ll_special_sock_inode_fops;
-
-                CWARN("saved %p, replaced with %p\n", lli->ll_save_ifop,
-                      inode->i_fop);
-
-                if (lli->ll_save_ifop->owner) {
-                        CWARN("%p has owner %p\n", lli->ll_save_ifop,
-                              lli->ll_save_ifop->owner);
-                }
                 EXIT;
         }
 }
@@ -1201,7 +1238,7 @@ int ll_iocontrol(struct inode *inode, struct file *file,
                 struct mds_body *body;
 
                 ll_inode2fid(&fid, inode);
-                rc = mdc_getattr(sbi->ll_mdc_exp, &fid, valid, 0, &req);
+                rc = md_getattr(sbi->ll_mdc_exp, &fid, valid, 0, &req);
                 if (rc) {
                         CERROR("failure %d inode %lu\n", rc, inode->i_ino);
                         RETURN(-abs(rc));
@@ -1239,26 +1276,27 @@ int ll_iocontrol(struct inode *inode, struct file *file,
                 attr.ia_attr_flags = flags;
                 attr.ia_valid |= ATTR_ATTR_FLAG;
 
-                rc = mdc_setattr(sbi->ll_mdc_exp, &op_data,
-                                 &attr, NULL, 0, NULL, 0, &req);
+                rc = md_setattr(sbi->ll_mdc_exp, &op_data,
+                                     &attr, NULL, 0, NULL, 0, &req);
                 if (rc) {
                         ptlrpc_req_finished(req);
                         if (rc != -EPERM && rc != -EACCES)
-                                CERROR("mdc_setattr fails: rc = %d\n", rc);
+                                CERROR("md_setattr fails: rc = %d\n", rc);
                         obdo_free(oa);
                         RETURN(rc);
                 }
                 ptlrpc_req_finished(req);
 
                 oa->o_id = lsm->lsm_object_id;
+                oa->o_gr = lsm->lsm_object_gr;
                 oa->o_flags = flags;
-                oa->o_valid = OBD_MD_FLID | OBD_MD_FLFLAGS;
+                oa->o_valid = OBD_MD_FLID | OBD_MD_FLFLAGS | OBD_MD_FLGROUP;
 
                 rc = obd_setattr(sbi->ll_osc_exp, oa, lsm, NULL);
                 obdo_free(oa);
                 if (rc) {
                         if (rc != -EPERM && rc != -EACCES)
-                                CERROR("mdc_setattr fails: rc = %d\n", rc);
+                                CERROR("obd_setattr fails: rc = %d\n", rc);
                         RETURN(rc);
                 }
 
@@ -1324,25 +1362,29 @@ void ll_umount_begin(struct super_block *sb)
         EXIT;
 }
 
-int ll_prep_inode(struct obd_export *exp, struct inode **inode,
-                  struct ptlrpc_request *req, int offset,struct super_block *sb)
+int ll_prep_inode(struct obd_export *osc_exp, struct obd_export *mdc_exp,
+                  struct inode **inode, struct ptlrpc_request *req,
+                  int offset,struct super_block *sb)
 {
         struct lustre_md md;
         int rc = 0;
 
-        rc = mdc_req2lustre_md(req, offset, exp, &md);
+        rc = mdc_req2lustre_md(req, offset, osc_exp, mdc_exp, &md);
         if (rc)
                 RETURN(rc);
 
         if (*inode) {
-                ll_update_inode(*inode, md.body, md.lsm);
+                ll_update_inode(*inode, &md);
         } else {
                 LASSERT(sb);
                 *inode = ll_iget(sb, md.body->ino, &md);
                 if (*inode == NULL || is_bad_inode(*inode)) {
                         /* free the lsm if we allocated one above */
                         if (md.lsm != NULL)
-                                obd_free_memmd(exp, &md.lsm);
+                                obd_free_memmd(osc_exp, &md.lsm);
+                        if (md.mea != NULL)
+                                obd_free_memmd(mdc_exp,
+                                               (struct lov_stripe_md**)&md.mea);
                         rc = -ENOMEM;
                         CERROR("new_inode -fatal: rc %d\n", rc);
                 }
diff --git a/lustre/llite/llite_nfs.c b/lustre/llite/llite_nfs.c
index 93638fd..ddf6800 100644
--- a/lustre/llite/llite_nfs.c
+++ b/lustre/llite/llite_nfs.c
@@ -61,13 +61,14 @@ static struct inode * search_inode_for_lustre(struct super_block *sb,
         fid.generation = generation;
         fid.f_type = mode;
 
-        rc = mdc_getattr(sbi->ll_mdc_exp, &fid, valid, eadatalen, &req);
+        rc = md_getattr(sbi->ll_mdc_exp, &fid, valid, eadatalen, &req);
         if (rc) {
                 CERROR("failure %d inode %lu\n", rc, ino);
                 return ERR_PTR(rc);
         }
 
-        rc = ll_prep_inode(sbi->ll_osc_exp, &inode, req, 0, sb);
+        rc = ll_prep_inode(sbi->ll_osc_exp, sbi->ll_mdc_exp,
+                           &inode, req, 0, sb);
         if (rc) {
                 ptlrpc_req_finished(req);
                 return ERR_PTR(rc);
@@ -81,8 +82,8 @@ extern struct dentry_operations ll_d_ops;
 
 static struct dentry *ll_iget_for_nfs(struct super_block *sb, unsigned long ino,
                                       __u32 generation, umode_t mode)
-{
-        struct inode *inode;
+{                                      
+        struct inode *inode;      
         struct dentry *result;
         struct list_head *lp;
 
diff --git a/lustre/llite/lproc_llite.c b/lustre/llite/lproc_llite.c
index 35676f2..162f568 100644
--- a/lustre/llite/lproc_llite.c
+++ b/lustre/llite/lproc_llite.c
@@ -161,6 +161,14 @@ static int ll_rd_filesfree(char *page, char **start, off_t off, int count,
 
 }
 
+#if 0
+static int ll_rd_path(char *page, char **start, off_t off, int count, int *eof,
+                      void *data)
+{
+        return 0;
+}
+#endif
+
 static int ll_rd_fstype(char *page, char **start, off_t off, int count,
                         int *eof, void *data)
 {
@@ -214,41 +222,6 @@ static int ll_wr_read_ahead(struct file *file, const char *buffer,
         RETURN(count);
 }
 
-static int ll_rd_max_read_ahead_mb(char *page, char **start, off_t off, 
-                                   int count, int *eof, void *data)
-{
-        struct super_block *sb = data;
-        struct ll_sb_info *sbi = ll_s2sbi(sb);
-        unsigned val;
-
-        spin_lock(&sbi->ll_lock);
-        val = (sbi->ll_max_read_ahead_pages << PAGE_CACHE_SHIFT) >> 20;
-        spin_unlock(&sbi->ll_lock);
-
-        return snprintf(page, count, "%u\n", val);
-}
-
-static int ll_wr_max_read_ahead_mb(struct file *file, const char *buffer,
-                                   unsigned long count, void *data)
-{
-        struct super_block *sb = data;
-        struct ll_sb_info *sbi = ll_s2sbi(sb);
-        int val, rc;
-
-        rc = lprocfs_write_helper(buffer, count, &val);
-        if (rc)
-                return rc;
-
-        if (val < 0 || val > (num_physpages << PAGE_SHIFT) >> 20)
-                return -ERANGE;
-
-        spin_lock(&sbi->ll_lock);
-        sbi->ll_max_read_ahead_pages = (val << 20) >> PAGE_CACHE_SHIFT;
-        spin_unlock(&sbi->ll_lock);
-
-        return count;
-}
-
 static struct lprocfs_vars lprocfs_obd_vars[] = {
         { "uuid",         ll_rd_sb_uuid,          0, 0 },
         //{ "mntpt_path",   ll_rd_path,             0, 0 },
@@ -261,8 +234,6 @@ static struct lprocfs_vars lprocfs_obd_vars[] = {
         { "filesfree",    ll_rd_filesfree,        0, 0 },
         //{ "filegroups",   lprocfs_rd_filegroups,  0, 0 },
         { "read_ahead",   ll_rd_read_ahead, ll_wr_read_ahead, 0 },
-        { "max_read_ahead_mb",   ll_rd_max_read_ahead_mb, 
-                                 ll_wr_max_read_ahead_mb, 0 },
         { 0 }
 };
 
@@ -492,7 +463,7 @@ static int llite_dump_pgcache_seq_show(struct seq_file *seq, void *v)
                 return 0;
         }
 
-        spin_lock(&sbi->ll_lock);
+        spin_lock(&sbi->ll_pglist_lock);
 
         llap = llite_pglist_next_llap(sbi, &dummy_llap->llap_proc_item);
         if (llap != NULL)  {
@@ -515,7 +486,7 @@ static int llite_dump_pgcache_seq_show(struct seq_file *seq, void *v)
                         seq_puts(seq, "]\n");
         }
 
-        spin_unlock(&sbi->ll_lock);
+        spin_unlock(&sbi->ll_pglist_lock);
 
         return 0;
 }
@@ -545,14 +516,14 @@ static void *llite_dump_pgcache_seq_next(struct seq_file *seq, void *v,
         /* we've just displayed the llap that is after us in the list.
          * we advance to a position beyond it, returning null if there
          * isn't another llap in the list beyond that new position. */
-        spin_lock(&sbi->ll_lock);
+        spin_lock(&sbi->ll_pglist_lock);
         llap = llite_pglist_next_llap(sbi, &dummy_llap->llap_proc_item);
         list_del_init(&dummy_llap->llap_proc_item);
         if (llap) {
                 list_add(&dummy_llap->llap_proc_item, &llap->llap_proc_item);
                 llap = llite_pglist_next_llap(sbi, &dummy_llap->llap_proc_item);
         }
-        spin_unlock(&sbi->ll_lock);
+        spin_unlock(&sbi->ll_pglist_lock);
 
         ++*pos;
         if (llap == NULL) {
@@ -607,9 +578,9 @@ static int llite_dump_pgcache_seq_open(struct inode *inode, struct file *file)
         seq = file->private_data;
         seq->private = llap;
 
-        spin_lock(&sbi->ll_lock);
+        spin_lock(&sbi->ll_pglist_lock);
         list_add(&llap->llap_proc_item, &sbi->ll_pglist);
-        spin_unlock(&sbi->ll_lock);
+        spin_unlock(&sbi->ll_pglist_lock);
 
         return 0;
 }
@@ -621,17 +592,16 @@ static int llite_dump_pgcache_seq_release(struct inode *inode,
         struct ll_async_page *llap = seq->private;
         struct ll_sb_info *sbi = llap->llap_cookie;
 
-        spin_lock(&sbi->ll_lock);
+        spin_lock(&sbi->ll_pglist_lock);
         if (!list_empty(&llap->llap_proc_item))
                 list_del_init(&llap->llap_proc_item);
-        spin_unlock(&sbi->ll_lock);
+        spin_unlock(&sbi->ll_pglist_lock);
         OBD_FREE(llap, sizeof(*llap));
 
         return seq_release(inode, file);
 }
 
 struct file_operations llite_dump_pgcache_fops = {
-        .owner   = THIS_MODULE,
         .open    = llite_dump_pgcache_seq_open,
         .read    = seq_read,
         .release = llite_dump_pgcache_seq_release,
diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c
index d9eb99b..00470ca 100644
--- a/lustre/llite/namei.c
+++ b/lustre/llite/namei.c
@@ -71,20 +71,21 @@ static int ll_test_inode(struct inode *inode, void *opaque)
                 last_ino = md->body->ino;
                 last_gen = md->body->generation;
                 CDEBUG(D_VFSTRACE,
-                       "comparing inode %p ino %lu/%u to body %u/%u\n",
+                       "comparing inode %p ino %lu/%u/%u to body %u/%u/%u\n",
                        inode, inode->i_ino, inode->i_generation,
-                       md->body->ino, md->body->generation);
+                       ll_i2info(inode)->lli_mds,
+                       md->body->ino, md->body->generation,
+                       md->body->mds);
         }
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-        if (inode->i_ino != md->body->ino)
-                return 0;
-#endif
         if (inode->i_generation != md->body->generation)
                 return 0;
 
+        if (ll_i2info(inode)->lli_mds != md->body->mds)
+                return 0;
+
         /* Apply the attributes in 'opaque' to this inode */
-        ll_update_inode(inode, md->body, md->lsm);
+        ll_update_inode(inode, md);
         return 1;
 }
 
@@ -188,7 +189,7 @@ int ll_mdc_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
                         CDEBUG(D_INODE, "invalidating inode %lu\n",
                                inode->i_ino);
 
-                        truncate_inode_pages(inode->i_mapping, 0);
+                        ll_invalidate_inode_pages(inode);
                 }
 
                 if (inode->i_sb->s_root &&
@@ -227,8 +228,13 @@ void ll_prepare_mdc_op_data(struct mdc_op_data *data, struct inode *i1,
         ll_i2uctxt(&data->ctxt, i1, i2);
         ll_inode2fid(&data->fid1, i1);
 
-        if (i2)
+        /* it could be directory with mea */
+        data->mea1 = ll_i2info(i1)->lli_mea;
+
+        if (i2) {
                 ll_inode2fid(&data->fid2, i2);
+                data->mea2 = ll_i2info(i2)->lli_mea;
+        }
 
         data->name = name;
         data->namelen = namelen;
@@ -271,9 +277,6 @@ struct dentry *ll_find_alias(struct inode *inode, struct dentry *de)
                 atomic_inc(&dentry->d_count);
                 iput(inode);
                 dentry->d_flags &= ~DCACHE_LUSTRE_INVALID;
-                CDEBUG(D_DENTRY, "alias dentry %*s (%p) parent %p inode %p "
-                       "refc %d\n", de->d_name.len, de->d_name.name, de,
-                       de->d_parent, de->d_inode, atomic_read(&de->d_count));
                 return dentry;
         }
 
@@ -298,8 +301,8 @@ static int lookup_it_finish(struct ptlrpc_request *request, int offset,
         if (!it_disposition(it, DISP_LOOKUP_NEG)) {
                 ENTRY;
 
-                rc = ll_prep_inode(sbi->ll_osc_exp, &inode, request, offset,
-                                   dentry->d_sb);
+                rc = ll_prep_inode(sbi->ll_osc_exp, sbi->ll_mdc_exp,
+                                   &inode, request, offset, dentry->d_sb);
                 if (rc)
                         RETURN(rc);
 
@@ -322,7 +325,7 @@ static int lookup_it_finish(struct ptlrpc_request *request, int offset,
                         rc = ll_glimpse_size(inode, &lvb);
                         if (rc) {
                                 iput(inode);
-                                RETURN(rc);
+                                RETURN(-EIO);
                         }
                         inode->i_size = lvb.lvb_size;
                 }
@@ -372,9 +375,9 @@ static struct dentry *ll_lookup_it(struct inode *parent, struct dentry *dentry,
         ll_inode2fid(&pfid, parent);
         ll_i2uctxt(&ctxt, parent, NULL);
 
-        rc = mdc_intent_lock(ll_i2mdcexp(parent), &ctxt, &pfid,
-                             dentry->d_name.name, dentry->d_name.len, NULL, 0,
-                             NULL, it, flags, &req, ll_mdc_blocking_ast);
+        rc = md_intent_lock(ll_i2mdcexp(parent), &ctxt, &pfid,
+                            dentry->d_name.name, dentry->d_name.len, NULL, 0,
+                            NULL, it, flags, &req, ll_mdc_blocking_ast);
         if (rc < 0)
                 GOTO(out, retval = ERR_PTR(rc));
 
@@ -393,6 +396,20 @@ static struct dentry *ll_lookup_it(struct inode *parent, struct dentry *dentry,
  out:
         if (req)
                 ptlrpc_req_finished(req);
+        if (dentry->d_inode)
+                CDEBUG(D_INODE, "lookup 0x%p in %lu/%lu: %*s -> %lu/%lu\n",
+                                dentry,
+                                (unsigned long) parent->i_ino,
+                                (unsigned long) parent->i_generation,
+                                dentry->d_name.len, dentry->d_name.name,
+                                (unsigned long) dentry->d_inode->i_ino,
+                                (unsigned long) dentry->d_inode->i_generation);
+        else
+                CDEBUG(D_INODE, "lookup 0x%p in %lu/%lu: %*s -> ??\n",
+                                dentry,
+                                (unsigned long) parent->i_ino,
+                                (unsigned long) parent->i_generation,
+                                dentry->d_name.len, dentry->d_name.name);
         return retval;
 }
 
@@ -427,7 +444,8 @@ static struct inode *ll_create_node(struct inode *dir, const char *name,
         LASSERT(it && it->d.lustre.it_disposition);
 
         request = it->d.lustre.it_data;
-        rc = ll_prep_inode(sbi->ll_osc_exp, &inode, request, 1, dir->i_sb);
+        rc = ll_prep_inode(sbi->ll_osc_exp, sbi->ll_mdc_exp,
+                           &inode, request, 1, dir->i_sb);
         if (rc)
                 GOTO(out, inode = ERR_PTR(rc));
 
@@ -521,7 +539,7 @@ static int ll_mknod_raw(struct nameidata *nd, int mode, dev_t rdev)
         case S_IFIFO:
         case S_IFSOCK:
                 ll_prepare_mdc_op_data(&op_data, dir, NULL, name, len, 0);
-                err = mdc_create(sbi->ll_mdc_exp, &op_data, NULL, 0, mode,
+                err = md_create(sbi->ll_mdc_exp, &op_data, NULL, 0, mode,
                                  current->fsuid, current->fsgid,
                                  rdev, &request);
                 ptlrpc_req_finished(request);
@@ -564,11 +582,11 @@ static int ll_mknod(struct inode *dir, struct dentry *child, int mode,
         case S_IFIFO:
         case S_IFSOCK:
                 ll_prepare_mdc_op_data(&op_data, dir, NULL, name, len, 0);
-                err = mdc_create(sbi->ll_mdc_exp, &op_data, NULL, 0, mode,
+                err = md_create(sbi->ll_mdc_exp, &op_data, NULL, 0, mode,
                                  current->fsuid, current->fsgid,
                                  rdev, &request);
-                err = ll_prep_inode(sbi->ll_osc_exp, &inode, request, 0,
-                                    child->d_sb);
+                err = ll_prep_inode(sbi->ll_osc_exp, sbi->ll_mdc_exp,
+                                    &inode, request, 0, child->d_sb);
                 if (err)
                         GOTO(out_err, err);
                 break;
@@ -603,7 +621,7 @@ static int ll_symlink_raw(struct nameidata *nd, const char *tgt)
                 RETURN(err);
 
         ll_prepare_mdc_op_data(&op_data, dir, NULL, name, len, 0);
-        err = mdc_create(sbi->ll_mdc_exp, &op_data,
+        err = md_create(sbi->ll_mdc_exp, &op_data,
                          tgt, strlen(tgt) + 1, S_IFLNK | S_IRWXUGO,
                          current->fsuid, current->fsgid, 0, &request);
         ptlrpc_req_finished(request);
@@ -627,7 +645,7 @@ static int ll_link_raw(struct nameidata *srcnd, struct nameidata *tgtnd)
                dir->i_ino, dir->i_generation, dir, name);
 
         ll_prepare_mdc_op_data(&op_data, src, dir, name, len, 0);
-        err = mdc_link(sbi->ll_mdc_exp, &op_data, &request);
+        err = md_link(sbi->ll_mdc_exp, &op_data, &request);
         ptlrpc_req_finished(request);
 
         RETURN(err);
@@ -647,12 +665,9 @@ static int ll_mkdir_raw(struct nameidata *nd, int mode)
         CDEBUG(D_VFSTRACE, "VFS Op:name=%s,dir=%lu/%u(%p)\n",
                name, dir->i_ino, dir->i_generation, dir);
 
-        if (dir->i_nlink >= EXT3_LINK_MAX)
-                RETURN(err);
-
         mode = (mode & (S_IRWXUGO|S_ISVTX) & ~current->fs->umask) | S_IFDIR;
         ll_prepare_mdc_op_data(&op_data, dir, NULL, name, len, 0);
-        err = mdc_create(sbi->ll_mdc_exp, &op_data, NULL, 0, mode,
+        err = md_create(sbi->ll_mdc_exp, &op_data, NULL, 0, mode,
                          current->fsuid, current->fsgid, 0, &request);
         ptlrpc_req_finished(request);
         RETURN(err);
@@ -671,7 +686,7 @@ static int ll_rmdir_raw(struct nameidata *nd)
                name, dir->i_ino, dir->i_generation, dir);
 
         ll_prepare_mdc_op_data(&op_data, dir, NULL, name, len, S_IFDIR);
-        rc = mdc_unlink(ll_i2sbi(dir)->ll_mdc_exp, &op_data, &request);
+        rc = md_unlink(ll_i2sbi(dir)->ll_mdc_exp, &op_data, &request);
         ptlrpc_req_finished(request);
         RETURN(rc);
 }
@@ -720,8 +735,9 @@ int ll_objects_destroy(struct ptlrpc_request *request, struct inode *dir)
                 GOTO(out_free_memmd, rc = -ENOMEM);
 
         oa->o_id = lsm->lsm_object_id;
+        oa->o_gr = lsm->lsm_object_gr;
         oa->o_mode = body->mode & S_IFMT;
-        oa->o_valid = OBD_MD_FLID | OBD_MD_FLTYPE;
+        oa->o_valid = OBD_MD_FLID | OBD_MD_FLTYPE | OBD_MD_FLGROUP;
 
         if (body->valid & OBD_MD_FLCOOKIE) {
                 oa->o_valid |= OBD_MD_FLCOOKIE;
@@ -759,7 +775,7 @@ static int ll_unlink_raw(struct nameidata *nd)
                name, dir->i_ino, dir->i_generation, dir);
 
         ll_prepare_mdc_op_data(&op_data, dir, NULL, name, len, 0);
-        rc = mdc_unlink(ll_i2sbi(dir)->ll_mdc_exp, &op_data, &request);
+        rc = md_unlink(ll_i2sbi(dir)->ll_mdc_exp, &op_data, &request);
         if (rc)
                 GOTO(out, rc);
 
@@ -787,8 +803,8 @@ static int ll_rename_raw(struct nameidata *oldnd, struct nameidata *newnd)
                src, newname, tgt->i_ino, tgt->i_generation, tgt);
 
         ll_prepare_mdc_op_data(&op_data, src, tgt, NULL, 0, 0);
-        err = mdc_rename(sbi->ll_mdc_exp, &op_data,
-                         oldname, oldlen, newname, newlen, &request);
+        err = md_rename(sbi->ll_mdc_exp, &op_data,
+                             oldname, oldlen, newname, newlen, &request);
         if (!err) {
                 err = ll_objects_destroy(request, src);
         }
@@ -799,23 +815,23 @@ static int ll_rename_raw(struct nameidata *oldnd, struct nameidata *newnd)
 }
 
 struct inode_operations ll_dir_inode_operations = {
-        .link_raw           = ll_link_raw,
-        .unlink_raw         = ll_unlink_raw,
-        .symlink_raw        = ll_symlink_raw,
-        .mkdir_raw          = ll_mkdir_raw,
-        .rmdir_raw          = ll_rmdir_raw,
-        .mknod_raw          = ll_mknod_raw,
-        .mknod              = ll_mknod,
-        .rename_raw         = ll_rename_raw,
-        .setattr            = ll_setattr,
-        .setattr_raw        = ll_setattr_raw,
+        link_raw:           ll_link_raw,
+        unlink_raw:         ll_unlink_raw,
+        symlink_raw:        ll_symlink_raw,
+        mkdir_raw:          ll_mkdir_raw,
+        rmdir_raw:          ll_rmdir_raw,
+        mknod_raw:          ll_mknod_raw,
+        mknod:              ll_mknod,
+        rename_raw:         ll_rename_raw,
+        setattr:            ll_setattr,
+        setattr_raw:        ll_setattr_raw,
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-        .create_it          = ll_create_it,
-        .lookup_it          = ll_lookup_it,
-        .revalidate_it      = ll_inode_revalidate_it,
+        create_it:          ll_create_it,
+        lookup_it:          ll_lookup_it,
+        revalidate_it:      ll_inode_revalidate_it,
 #else
-        .lookup             = ll_lookup_nd,
-        .create             = ll_create_nd,
-        .getattr_it         = ll_getattr,
+        lookup:             ll_lookup_nd,
+        create:             ll_create_nd,
+        getattr_it:         ll_getattr,
 #endif
 };
diff --git a/lustre/llite/rw.c b/lustre/llite/rw.c
index 8e9aaf2..df7ab9b 100644
--- a/lustre/llite/rw.c
+++ b/lustre/llite/rw.c
@@ -65,22 +65,21 @@ static int ll_brw(int cmd, struct inode *inode, struct obdo *oa,
         ENTRY;
 
         pg.pg = page;
-        pg.disk_offset = pg.page_offset = ((obd_off)page->index) << PAGE_SHIFT;
+        pg.off = ((obd_off)page->index) << PAGE_SHIFT;
 
-        if (cmd == OBD_BRW_WRITE &&
-            (pg.disk_offset + PAGE_SIZE > inode->i_size))
+        if (cmd == OBD_BRW_WRITE && (pg.off + PAGE_SIZE > inode->i_size))
                 pg.count = inode->i_size % PAGE_SIZE;
         else
                 pg.count = PAGE_SIZE;
 
         CDEBUG(D_PAGE, "%s %d bytes ino %lu at "LPU64"/"LPX64"\n",
                cmd & OBD_BRW_WRITE ? "write" : "read", pg.count, inode->i_ino,
-               pg.disk_offset, pg.disk_offset);
+               pg.off, pg.off);
         if (pg.count == 0) {
                 CERROR("ZERO COUNT: ino %lu: size %p:%Lu(%p:%Lu) idx %lu off "
-                       LPU64"\n", inode->i_ino, inode, inode->i_size,
-                       page->mapping->host, page->mapping->host->i_size,
-                       page->index, pg.disk_offset);
+                       LPU64"\n",
+                       inode->i_ino, inode, inode->i_size, page->mapping->host,
+                       page->mapping->host->i_size, page->index, pg.off);
         }
 
         pg.flag = flags;
@@ -119,7 +118,8 @@ void ll_truncate(struct inode *inode)
         }
 
         oa.o_id = lsm->lsm_object_id;
-        oa.o_valid = OBD_MD_FLID;
+        oa.o_gr = lsm->lsm_object_gr;
+        oa.o_valid = OBD_MD_FLID | OBD_MD_FLGROUP;
         obdo_from_inode(&oa, inode, OBD_MD_FLTYPE|OBD_MD_FLMODE|OBD_MD_FLATIME|
                                     OBD_MD_FLMTIME | OBD_MD_FLCTIME);
 
@@ -155,18 +155,20 @@ int ll_prepare_write(struct file *file, struct page *page, unsigned from,
         int rc = 0;
         ENTRY;
 
-        LASSERT(PageLocked(page));
-        (void)llap_cast_private(page); /* assertion */
+        if (!PageLocked(page))
+                LBUG();
 
         /* Check to see if we should return -EIO right away */
         pga.pg = page;
-        pga.disk_offset = pga.page_offset = offset;
+        pga.off = offset;
         pga.count = PAGE_SIZE;
         pga.flag = 0;
 
         oa.o_id = lsm->lsm_object_id;
+        oa.o_gr = lsm->lsm_object_gr;
         oa.o_mode = inode->i_mode;
-        oa.o_valid = OBD_MD_FLID | OBD_MD_FLMODE | OBD_MD_FLTYPE;
+        oa.o_valid = OBD_MD_FLID | OBD_MD_FLMODE
+                                | OBD_MD_FLTYPE | OBD_MD_FLGROUP;
 
         rc = obd_brw(OBD_BRW_CHECK, ll_i2obdexp(inode), &oa, lsm, 1, &pga,
                      NULL);
@@ -209,6 +211,21 @@ int ll_prepare_write(struct file *file, struct page *page, unsigned from,
         return rc;
 }
 
+int ll_write_count(struct page *page)
+{
+        struct inode *inode = page->mapping->host;
+
+        /* catch race with truncate */
+        if (((loff_t)page->index << PAGE_SHIFT) >= inode->i_size)
+                return 0;
+
+        /* catch sub-page write at end of file */
+        if (((loff_t)page->index << PAGE_SHIFT) + PAGE_SIZE > inode->i_size)
+                return inode->i_size % PAGE_SIZE;
+
+        return PAGE_SIZE;
+}
+
 struct ll_async_page *llap_from_cookie(void *cookie)
 {
         struct ll_async_page *llap = cookie;
@@ -229,7 +246,8 @@ static int ll_ap_make_ready(void *data, int cmd)
 
         page = llap->llap_page;
 
-        LASSERT(cmd != OBD_BRW_READ);
+        if (cmd == OBD_BRW_READ)
+                RETURN(0);
 
         /* we're trying to write, but the page is locked.. come back later */
         if (TryLockPage(page))
@@ -249,26 +267,9 @@ static int ll_ap_make_ready(void *data, int cmd)
         RETURN(0);
 }
 
-/* We have two reasons for giving llite the opportunity to change the 
- * write length of a given queued page as it builds the RPC containing
- * the page: 
- *
- * 1) Further extending writes may have landed in the page cache
- *    since a partial write first queued this page requiring us
- *    to write more from the page cache.
- * 2) We might have raced with truncate and want to avoid performing
- *    write RPCs that are just going to be thrown away by the 
- *    truncate's punch on the storage targets.
- *
- * The kms serves these purposes as it is set at both truncate and extending
- * writes.
- */
 static int ll_ap_refresh_count(void *data, int cmd)
 {
         struct ll_async_page *llap;
-        struct lov_stripe_md *lsm;
-        struct page *page;
-        __u64 kms;
         ENTRY;
 
         /* readpage queues with _COUNT_STABLE, shouldn't get here. */
@@ -278,19 +279,7 @@ static int ll_ap_refresh_count(void *data, int cmd)
         if (IS_ERR(llap))
                 RETURN(PTR_ERR(llap));
 
-        page = llap->llap_page;
-        lsm = ll_i2info(page->mapping->host)->lli_smd;
-        kms = lov_merge_size(lsm, 1);
-
-        /* catch race with truncate */
-        if (((__u64)page->index << PAGE_SHIFT) >= kms)
-                return 0;
-
-        /* catch sub-page write at end of file */
-        if (((__u64)page->index << PAGE_SHIFT) + PAGE_SIZE > kms)
-                return kms % PAGE_SIZE;
-
-        return PAGE_SIZE;
+        return ll_write_count(llap->llap_page);
 }
 
 void ll_inode_fill_obdo(struct inode *inode, int cmd, struct obdo *oa)
@@ -301,11 +290,13 @@ void ll_inode_fill_obdo(struct inode *inode, int cmd, struct obdo *oa)
         lsm = ll_i2info(inode)->lli_smd;
 
         oa->o_id = lsm->lsm_object_id;
-        oa->o_valid = OBD_MD_FLID;
+        oa->o_gr = lsm->lsm_object_gr;
+        oa->o_valid = OBD_MD_FLID | OBD_MD_FLGROUP;
         valid_flags = OBD_MD_FLTYPE | OBD_MD_FLATIME;
         if (cmd == OBD_BRW_WRITE) {
                 oa->o_valid |= OBD_MD_FLIFID | OBD_MD_FLEPOCH;
                 mdc_pack_fid(obdo_fid(oa), inode->i_ino, 0, inode->i_mode);
+                obdo_fid(oa)->mds = ll_i2info(inode)->lli_mds;
                 oa->o_easize = ll_i2info(inode)->lli_io_epoch;
 
                 valid_flags |= OBD_MD_FLMTIME | OBD_MD_FLCTIME;
@@ -336,17 +327,6 @@ static struct obd_async_page_ops ll_async_page_ops = {
         .ap_completion =        ll_ap_completion,
 };
 
-struct ll_async_page *llap_cast_private(struct page *page)
-{
-        struct ll_async_page *llap = (struct ll_async_page *)page->private;
-
-        LASSERTF(llap == NULL || llap->llap_magic == LLAP_MAGIC,
-                 "page %p private %lu gave magic %d which != %d\n",
-                 page, page->private, llap->llap_magic, LLAP_MAGIC);
-
-        return llap;
-}
-
 /* XXX have the exp be an argument? */
 struct ll_async_page *llap_from_page(struct page *page)
 {
@@ -357,9 +337,12 @@ struct ll_async_page *llap_from_page(struct page *page)
         int rc;
         ENTRY;
 
-        llap = llap_cast_private(page);
-        if (llap != NULL)
+        llap = (struct ll_async_page *)page->private;
+        if (llap != NULL) {
+                if (llap->llap_magic != LLAP_MAGIC)
+                        RETURN(ERR_PTR(-EINVAL));
                 RETURN(llap);
+        }
 
         exp = ll_i2obdexp(page->mapping->host);
         if (exp == NULL)
@@ -383,10 +366,10 @@ struct ll_async_page *llap_from_page(struct page *page)
         page->private = (unsigned long)llap;
         llap->llap_page = page;
 
-        spin_lock(&sbi->ll_lock);
+        spin_lock(&sbi->ll_pglist_lock);
         sbi->ll_pglist_gen++;
         list_add_tail(&llap->llap_proc_item, &sbi->ll_pglist);
-        spin_unlock(&sbi->ll_lock);
+        spin_unlock(&sbi->ll_pglist_lock);
 
         RETURN(llap);
 }
@@ -483,75 +466,6 @@ out:
         RETURN(rc);
 }
 
-static unsigned long ll_ra_count_get(struct ll_sb_info *sbi, unsigned long len)
-{
-        unsigned long ret;
-        ENTRY;
-
-        spin_lock(&sbi->ll_lock);
-        ret = min(sbi->ll_max_read_ahead_pages - sbi->ll_read_ahead_pages,
-                  len);
-        sbi->ll_read_ahead_pages += ret;
-        spin_unlock(&sbi->ll_lock);
-
-        RETURN(ret);
-}
-
-static void ll_ra_count_put(struct ll_sb_info *sbi, unsigned long len)
-{
-        spin_lock(&sbi->ll_lock);
-        LASSERTF(sbi->ll_read_ahead_pages >= len, "r_a_p %lu len %lu\n",
-                 sbi->ll_read_ahead_pages, len);
-        sbi->ll_read_ahead_pages -= len;
-        spin_unlock(&sbi->ll_lock);
-}
-
-/* called for each page in a completed rpc.*/
-void ll_ap_completion(void *data, int cmd, struct obdo *oa, int rc)
-{
-        struct ll_async_page *llap;
-        struct page *page;
-        ENTRY;
-
-        llap = llap_from_cookie(data);
-        if (IS_ERR(llap)) {
-                EXIT;
-                return;
-        }
-
-        page = llap->llap_page;
-        LASSERT(PageLocked(page));
-
-        LL_CDEBUG_PAGE(D_PAGE, page, "completing cmd %d with %d\n", cmd, rc);
-
-        if (cmd == OBD_BRW_READ && llap->llap_defer_uptodate)
-                ll_ra_count_put(ll_i2sbi(page->mapping->host), 1);
-
-        if (rc == 0)  {
-                if (cmd == OBD_BRW_READ) {
-                        if (!llap->llap_defer_uptodate)
-                                SetPageUptodate(page);
-                } else {
-                        llap->llap_write_queued = 0;
-                }
-                ClearPageError(page);
-        } else {
-                if (cmd == OBD_BRW_READ)
-                        llap->llap_defer_uptodate = 0;
-                SetPageError(page);
-        }
-
-        unlock_page(page);
-
-        if (0 && cmd == OBD_BRW_WRITE) {
-                llap_write_complete(page->mapping->host, llap);
-                ll_try_done_writing(page->mapping->host);
-        }
-
-        page_cache_release(page);
-        EXIT;
-}
-
 /* the kernel calls us here when a page is unhashed from the page cache.
  * the page will be locked and the kernel is holding a spinlock, so
  * we need to be careful.  we're just tearing down our book-keeping
@@ -601,11 +515,11 @@ void ll_removepage(struct page *page)
          * is providing exclusivity to memory pressure/truncate/writeback..*/
         page->private = 0;
 
-        spin_lock(&sbi->ll_lock);
+        spin_lock(&sbi->ll_pglist_lock);
         if (!list_empty(&llap->llap_proc_item))
                 list_del_init(&llap->llap_proc_item);
         sbi->ll_pglist_gen++;
-        spin_unlock(&sbi->ll_lock);
+        spin_unlock(&sbi->ll_pglist_lock);
         OBD_FREE(llap, sizeof(*llap));
         EXIT;
 }
@@ -618,7 +532,7 @@ static int ll_page_matches(struct page *page, int fd_flags)
         int flags, matches;
         ENTRY;
 
-        if (fd_flags & LL_FILE_GROUP_LOCKED)
+        if (fd_flags & LL_FILE_CW_LOCKED)
                 RETURN(1);
 
         page_extent.l_extent.start = (__u64)page->index << PAGE_CACHE_SHIFT;
@@ -643,8 +557,7 @@ static int ll_issue_page_read(struct obd_export *exp,
         llap->llap_defer_uptodate = defer;
         rc = obd_queue_group_io(exp, ll_i2info(page->mapping->host)->lli_smd,
                                 NULL, oig, llap->llap_cookie, OBD_BRW_READ, 0,
-                                PAGE_SIZE, 0, ASYNC_COUNT_STABLE | ASYNC_READY
-                                              | ASYNC_URGENT);
+                                PAGE_SIZE, 0, ASYNC_COUNT_STABLE);
         if (rc) {
                 LL_CDEBUG_PAGE(D_ERROR, page, "read queue failed: rc %d\n", rc);
                 page_cache_release(page);
@@ -652,155 +565,171 @@ static int ll_issue_page_read(struct obd_export *exp,
         RETURN(rc);
 }
 
-#define RAS_CDEBUG(ras) \
-        CDEBUG(D_READA, "lrp %lu c %lu ws %lu wl %lu nra %lu\n",        \
-               ras->ras_last_readpage, ras->ras_consecutive,            \
-               ras->ras_window_start, ras->ras_window_len,              \
-               ras->ras_next_readahead);
+#define LL_RA_MIN(inode) ((unsigned long)PTLRPC_MAX_BRW_PAGES / 2)
+#define LL_RA_MAX(inode) ((ll_i2info(inode)->lli_smd->lsm_xfersize * 3) >> \
+                          PAGE_CACHE_SHIFT)
 
-static int ll_readahead(struct ll_readahead_state *ras,
+static void ll_readahead(struct ll_readahead_state *ras,
                          struct obd_export *exp, struct address_space *mapping,
                          struct obd_io_group *oig, int flags)
 {
-        unsigned long i, start = 0, end = 0, reserved;
+        unsigned long i, start, end;
         struct ll_async_page *llap;
         struct page *page;
-        int rc, ret = 0;
-        __u64 kms;
-        ENTRY;
+        int rc;
 
-        kms = lov_merge_size(ll_i2info(mapping->host)->lli_smd, 1);
-        if (kms == 0)
-                RETURN(0);
+        if (mapping->host->i_size == 0)
+                return;
 
         spin_lock(&ras->ras_lock);
 
-        if (ras->ras_window_len) {
-                start = ras->ras_next_readahead;
-                end = ras->ras_window_start + ras->ras_window_len - 1;
-                end = min(end, (unsigned long)(kms >> PAGE_CACHE_SHIFT));
-                ras->ras_next_readahead = max(end, end + 1);
+        /* make sure to issue a window's worth of read-ahead pages */
+        end = ras->ras_last;
+        start = end - ras->ras_window;
+        if (start > end)
+                start = 0;
 
-                RAS_CDEBUG(ras);
-        }
+        /* but don't iterate over pages that we've already issued.  this
+         * will set start to end + 1 if we've already read-ahead up to
+         * ras_last sothe for() won't be entered */
+        if (ras->ras_next_index > start)
+                start = ras->ras_next_index;
+        if (end != ~0UL)
+                ras->ras_next_index = end + 1;
 
-        spin_unlock(&ras->ras_lock);
+        CDEBUG(D_READA, "ni %lu last %lu win %lu: reading from %lu to %lu\n",
+               ras->ras_next_index, ras->ras_last, ras->ras_window,
+               start, end);
 
-        if (end == 0)
-                RETURN(0);
+        spin_unlock(&ras->ras_lock);
 
-        reserved = ll_ra_count_get(ll_i2sbi(mapping->host), end - start + 1);
+        /* clamp to filesize */
+        i = (mapping->host->i_size - 1) >> PAGE_CACHE_SHIFT;
+        end = min(end, i);
 
-        for (i = start; reserved > 0 && i <= end; i++) {
-                /* skip locked pages from previous readpage calls */
+        for (i = start; i <= end; i++) {
+                /* grab_cache_page_nowait returns null if this races with
+                 * truncating the page (page->mapping == NULL) */
                 page = grab_cache_page_nowait(mapping, i);
-                if (page == NULL) {
-                        CDEBUG(D_READA, "g_c_p_n failed\n");
-                        continue;
-                }
-                
-                /* we do this first so that we can see the page in the /proc
-                 * accounting */
-                llap = llap_from_page(page);
-                if (IS_ERR(llap) || llap->llap_defer_uptodate)
-                        goto next_page;
+                if (page == NULL)
+                       break;
 
-                /* skip completed pages */
+                /* the book-keeping above promises that we've tried
+                 * all the indices from start to end, so we don't
+                 * stop if anyone returns an error. This may not be good. */
                 if (Page_Uptodate(page))
                         goto next_page;
 
-                /* bail when we hit the end of the lock. */
                 if ((rc = ll_page_matches(page, flags)) <= 0) {
                         LL_CDEBUG_PAGE(D_READA | D_PAGE, page,
                                        "lock match failed: rc %d\n", rc);
-                        i = end;
                         goto next_page;
                 }
 
+                llap = llap_from_page(page);
+                if (IS_ERR(llap) || llap->llap_defer_uptodate)
+                        goto next_page;
+
                 rc = ll_issue_page_read(exp, llap, oig, 1);
-                if (rc == 0) {
-                        reserved--;
-                        ret++;
-                        LL_CDEBUG_PAGE(D_READA| D_PAGE, page, 
-                                       "started read-ahead\n");
-                }
+                if (rc == 0)
+                        LL_CDEBUG_PAGE(D_PAGE, page, "started read-ahead\n");
                 if (rc) {
         next_page:
-                        LL_CDEBUG_PAGE(D_READA | D_PAGE, page, 
-                                       "skipping read-ahead\n");
+                        LL_CDEBUG_PAGE(D_PAGE, page, "skipping read-ahead\n");
 
                         unlock_page(page);
                 }
                 page_cache_release(page);
         }
-
-        LASSERTF(reserved >= 0, "reserved %lu\n", reserved);
-        if (reserved != 0)
-                ll_ra_count_put(ll_i2sbi(mapping->host), reserved);
-        RETURN(ret);
-}
-
-static void ras_set_start(struct ll_readahead_state *ras,
-                               unsigned long index)
-{
-        ras->ras_window_start = index & (~(PTLRPC_MAX_BRW_PAGES - 1));
-        ras->ras_next_readahead = max(ras->ras_window_start,
-                                      ras->ras_next_readahead);
 }
 
 /* called with the ras_lock held or from places where it doesn't matter */
-static void ras_reset(struct ll_readahead_state *ras,
-                      unsigned long index)
+static void ll_readahead_set(struct inode *inode,
+                             struct ll_readahead_state *ras,
+                             unsigned long index)
 {
-        ras->ras_last_readpage = index;
-        ras->ras_consecutive = 1;
-        ras->ras_window_len = 0;
-        ras_set_start(ras, index);
-        ras->ras_next_readahead = ras->ras_window_start;
-
-        RAS_CDEBUG(ras);
+        ras->ras_next_index = index;
+        if (ras->ras_next_index != ~0UL)
+                ras->ras_next_index++;
+        ras->ras_window = LL_RA_MIN(inode);
+        ras->ras_last = ras->ras_next_index + ras->ras_window;
+        if (ras->ras_last < ras->ras_next_index)
+                ras->ras_last = ~0UL;
+        CDEBUG(D_READA, "ni %lu last %lu win %lu: set %lu\n",
+               ras->ras_next_index, ras->ras_last, ras->ras_window,
+               index);
 }
 
 void ll_readahead_init(struct inode *inode, struct ll_readahead_state *ras)
 {
         spin_lock_init(&ras->ras_lock);
-        ras_reset(ras, 0);
+        ll_readahead_set(inode, ras, 0);
 }
 
-static void ras_update(struct ll_readahead_state *ras,
-                       unsigned long index, unsigned long max)
+static void ll_readahead_update(struct inode *inode,
+                                struct ll_readahead_state *ras,
+                                unsigned long index, int hit)
 {
-        ENTRY;
+        unsigned long issued_start, new_last;
 
         spin_lock(&ras->ras_lock);
 
-        if (index != ras->ras_last_readpage + 1) {
-                ras_reset(ras, index);
-                GOTO(out_unlock, 0);
-        }
-
-        ras->ras_last_readpage = index;
-        ras->ras_consecutive++;
-        ras_set_start(ras, index);
-
-        if (ras->ras_consecutive == 2) {
-                ras->ras_window_len = PTLRPC_MAX_BRW_PAGES;
-                GOTO(out_unlock, 0);
+        /* we're interested in noticing the index's relation to the
+         * previously issued read-ahead pages */
+        issued_start = ras->ras_next_index - ras->ras_window - 1;
+        if (issued_start > ras->ras_next_index)
+                issued_start = 0;
+
+        CDEBUG(D_READA, "ni %lu last %lu win %lu: %s ind %lu start %lu\n",
+               ras->ras_next_index, ras->ras_last, ras->ras_window,
+               hit ? "hit" : "miss", index, issued_start);
+        if (!hit &&
+            index == ras->ras_next_index && index == ras->ras_last + 1) {
+                /* special case the kernel's read-ahead running into the
+                 * page just beyond our read-ahead window as an extension
+                 * of our read-ahead.  sigh.  wishing it was easier to
+                 * turn off 2.4's read-ahead. */
+                ras->ras_window = min(LL_RA_MAX(inode), ras->ras_window + 1);
+                if (index != ~0UL)
+                        ras->ras_next_index = index + 1;
+                ras->ras_last = index;
+        } else if (!hit &&
+                   (index > issued_start || ras->ras_next_index >= index)) {
+                /* deal with a miss way out of the window.  we interpret
+                 * this as a seek and restart the window */
+                ll_readahead_set(inode, ras, index);
+
+        } else if (!hit &&
+                   issued_start <= index && index < ras->ras_next_index) {
+                /* a miss inside the window?  surely its memory pressure
+                 * evicting our read pages before the app can see them.
+                 * we shrink the window aggressively */
+                unsigned long old_window = ras->ras_window;
+
+                ras->ras_window = max(ras->ras_window / 2, LL_RA_MIN(inode));
+                ras->ras_last -= old_window - ras->ras_window;
+                if (ras->ras_next_index > ras->ras_last)
+                        ras->ras_next_index = ras->ras_last + 1;
+                CDEBUG(D_READA, "ni %lu last %lu win %lu: miss inside\n",
+                       ras->ras_next_index, ras->ras_last, ras->ras_window);
+
+        } else if (hit &&
+                   issued_start <= index && index < ras->ras_next_index) {
+                /* a hit inside the window.  grow the window by twice the
+                 * number of pages that are satisified within the window.  */
+                ras->ras_window = min(LL_RA_MAX(inode), ras->ras_window + 2);
+
+                /* we want the next readahead pass to issue a windows worth
+                 * beyond where the app currently is */
+                new_last = index + ras->ras_window;
+                if (new_last > ras->ras_last)
+                        ras->ras_last = new_last;
+
+                CDEBUG(D_READA, "ni %lu last %lu win %lu: extended window/last\n",
+                       ras->ras_next_index, ras->ras_last, ras->ras_window);
         }
 
-        /* we need to increase the window sometimes.  we'll arbitrarily
-         * do it half-way through the pages in an rpc */
-        if ((index & (PTLRPC_MAX_BRW_PAGES - 1)) == 
-            (PTLRPC_MAX_BRW_PAGES >> 1)) {
-                ras->ras_window_len += PTLRPC_MAX_BRW_PAGES;
-                ras->ras_window_len = min(ras->ras_window_len, max);
-        }
-
-        EXIT;
-out_unlock:
-        RAS_CDEBUG(ras);
         spin_unlock(&ras->ras_lock);
-        return;
 }
 
 /*
@@ -841,22 +770,19 @@ int ll_readpage(struct file *filp, struct page *page)
         if (IS_ERR(llap))
                 GOTO(out, rc = PTR_ERR(llap));
 
-        if (ll_i2sbi(inode)->ll_flags & LL_SBI_READAHEAD)
-                ras_update(&fd->fd_ras, page->index, 
-                           ll_i2sbi(inode)->ll_max_read_ahead_pages);
-
         if (llap->llap_defer_uptodate) {
-                rc = ll_readahead(&fd->fd_ras, exp, page->mapping, oig,
-                                  fd->fd_flags);
-                if (rc > 0)
-                        obd_trigger_group_io(exp, ll_i2info(inode)->lli_smd, 
-                                             NULL, oig);
+                ll_readahead_update(inode, &fd->fd_ras, page->index, 1);
+                ll_readahead(&fd->fd_ras, exp, page->mapping, oig,fd->fd_flags);
+                obd_trigger_group_io(exp, ll_i2info(inode)->lli_smd, NULL,
+                                     oig);
                 LL_CDEBUG_PAGE(D_PAGE, page, "marking uptodate from defer\n");
                 SetPageUptodate(page);
                 unlock_page(page);
                 GOTO(out_oig, rc = 0);
         }
 
+        ll_readahead_update(inode, &fd->fd_ras, page->index, 0);
+
         rc = ll_page_matches(page, fd->fd_flags);
         if (rc < 0) {
                 LL_CDEBUG_PAGE(D_ERROR, page, "lock match failed: rc %d\n", rc);
@@ -869,10 +795,15 @@ int ll_readpage(struct file *filp, struct page *page)
                        inode->i_ino, page->index,
                        (long long)page->index << PAGE_CACHE_SHIFT);
                 if (time_after(jiffies, next_print)) {
-                        CWARN("ino %lu page %lu (%llu) not covered by "
+                        CERROR("ino %lu page %lu (%llu) not covered by "
                                "a lock (mmap?).  check debug logs.\n",
                                inode->i_ino, page->index,
                                (long long)page->index << PAGE_CACHE_SHIFT);
+                        ldlm_dump_all_namespaces();
+                        if (next_print == 0) {
+                                CERROR("%s\n", portals_debug_dumpstack());
+                                portals_debug_dumplog();
+                        }
                         next_print = jiffies + 30 * HZ;
                 }
         }
@@ -882,9 +813,8 @@ int ll_readpage(struct file *filp, struct page *page)
                 GOTO(out, rc);
 
         LL_CDEBUG_PAGE(D_PAGE, page, "queued readpage\n");
-        if (ll_i2sbi(inode)->ll_flags & LL_SBI_READAHEAD)
-                ll_readahead(&fd->fd_ras, exp, page->mapping, oig,
-                             fd->fd_flags);
+        if ((ll_i2sbi(inode)->ll_flags & LL_SBI_READAHEAD))
+                ll_readahead(&fd->fd_ras, exp, page->mapping, oig,fd->fd_flags);
 
         rc = obd_trigger_group_io(exp, ll_i2info(inode)->lli_smd, NULL, oig);
 
@@ -896,3 +826,38 @@ out_oig:
                 oig_release(oig);
         RETURN(rc);
 }
+
+#if 0
+/* this is for read pages.  we issue them as ready but not urgent.  when
+ * someone waits on them we fire them off, hopefully merged with adjacent
+ * reads that were queued by read-ahead.  */
+int ll_sync_page(struct page *page)
+{
+        struct obd_export *exp;
+        struct ll_async_page *llap;
+        int rc;
+        ENTRY;
+
+        /* we're using a low bit flag to signify that a queued read should
+         * be issued once someone goes to lock it.  it is also cleared
+         * as the page is built into an RPC */
+        if (!test_and_clear_bit(LL_PRIVBITS_READ, &page->private))
+                RETURN(0);
+
+        /* careful to only deref page->mapping after checking the bit */
+        exp = ll_i2obdexp(page->mapping->host);
+        if (exp == NULL)
+                RETURN(-EINVAL);
+
+        llap = llap_from_page(page);
+        if (IS_ERR(llap))
+                RETURN(PTR_ERR(llap));
+
+        LL_CDEBUG_PAGE(D_PAGE, page, "setting ready|urgent\n");
+
+        rc = obd_set_async_flags(exp, ll_i2info(page->mapping->host)->lli_smd,
+                                 NULL, llap->llap_cookie,
+                                 ASYNC_READY|ASYNC_URGENT);
+        return rc;
+}
+#endif
diff --git a/lustre/llite/rw24.c b/lustre/llite/rw24.c
index 5ed4bfd..22ffe38 100644
--- a/lustre/llite/rw24.c
+++ b/lustre/llite/rw24.c
@@ -49,6 +49,50 @@
 #include "llite_internal.h"
 #include <linux/lustre_compat25.h>
 
+/* called for each page in a completed rpc.*/
+void ll_ap_completion_24(void *data, int cmd, int rc)
+{
+        struct ll_async_page *llap;
+        struct page *page;
+        ENTRY;
+
+        llap = llap_from_cookie(data);
+        if (IS_ERR(llap)) {
+                EXIT;
+                return;
+        }
+
+        page = llap->llap_page;
+        LASSERT(PageLocked(page));
+
+        LL_CDEBUG_PAGE(D_PAGE, page, "completing cmd %d with %d\n", cmd, rc);
+
+        if (rc == 0)  {
+                if (cmd == OBD_BRW_READ) {
+                        if (!llap->llap_defer_uptodate)
+                                SetPageUptodate(page);
+                } else {
+                        llap->llap_write_queued = 0;
+                }
+                ClearPageError(page);
+        } else {
+                if (cmd == OBD_BRW_READ)
+                        llap->llap_defer_uptodate = 0;
+                SetPageError(page);
+        }
+
+
+        unlock_page(page);
+
+        if (0 && cmd == OBD_BRW_WRITE) {
+                llap_write_complete(page->mapping->host, llap);
+                ll_try_done_writing(page->mapping->host);
+        }
+
+        page_cache_release(page);
+        EXIT;
+}
+
 static int ll_writepage_24(struct page *page)
 {
         struct inode *inode = page->mapping->host;
@@ -116,6 +160,11 @@ static int ll_direct_IO_24(int rw,
         if (!lsm || !lsm->lsm_object_id)
                 RETURN(-EBADF);
 
+        /* FIXME: io smaller than PAGE_SIZE is broken on ia64 */
+        if ((iobuf->offset & (PAGE_SIZE - 1)) ||
+            (iobuf->length & (PAGE_SIZE - 1)))
+                RETURN(-EINVAL);
+
         set = ptlrpc_prep_set();
         if (set == NULL)
                 RETURN(-ENOMEM);
@@ -127,17 +176,15 @@ static int ll_direct_IO_24(int rw,
         }
 
         flags = 0 /* | OBD_BRW_DIRECTIO */;
-        offset = ((obd_off)blocknr * blocksize);
+        offset = ((obd_off)blocknr << inode->i_blkbits);
         length = iobuf->length;
-        pga[0].page_offset = iobuf->offset;
-        LASSERT(iobuf->offset < PAGE_SIZE);
 
         for (i = 0, length = iobuf->length; length > 0;
              length -= pga[i].count, offset += pga[i].count, i++) { /*i last!*/
                 pga[i].pg = iobuf->maplist[i];
-                pga[i].disk_offset = offset;
+                pga[i].off = offset;
                 /* To the end of the page, or the length, whatever is less */
-                pga[i].count = min_t(int, PAGE_SIZE - pga[i].page_offset,
+                pga[i].count = min_t(int, PAGE_SIZE - (offset & ~PAGE_MASK),
                                      length);
                 pga[i].flag = flags;
                 if (rw == READ)
@@ -164,14 +211,6 @@ static int ll_direct_IO_24(int rw,
                         CERROR("error from callback: rc = %d\n", rc);
         }
         ptlrpc_set_destroy(set);
-        if (rc == 0 && rw == WRITE) {
-                void lov_increase_kms(struct obd_export *,
-                                      struct lov_stripe_md *, obd_off size);
-                obd_off size = offset + length;
-                lov_increase_kms(ll_i2obdexp(inode), lsm, size);
-                if (size > inode->i_size)
-                        inode->i_size = size;
-        }
         if (rc == 0) {
                 rc = iobuf->length;
                 obdo_to_inode(inode, &oa, OBD_MD_FLBLOCKS);
@@ -182,12 +221,12 @@ static int ll_direct_IO_24(int rw,
 }
 
 struct address_space_operations ll_aops = {
-        .readpage       = ll_readpage,
-        .direct_IO      = ll_direct_IO_24,
-        .writepage      = ll_writepage_24,
-        .prepare_write  = ll_prepare_write,
-        .commit_write   = ll_commit_write,
-        .removepage     = ll_removepage,
-        .sync_page      = NULL,
-        .bmap           = NULL
+        readpage: ll_readpage,
+        direct_IO: ll_direct_IO_24,
+        writepage: ll_writepage_24,
+        prepare_write: ll_prepare_write,
+        commit_write: ll_commit_write,
+        removepage: ll_removepage,
+        sync_page: NULL,
+        bmap: NULL
 };
diff --git a/lustre/llite/rw26.c b/lustre/llite/rw26.c
index b9193e8..c8c7cbb 100644
--- a/lustre/llite/rw26.c
+++ b/lustre/llite/rw26.c
@@ -51,6 +51,44 @@
 #include "llite_internal.h"
 #include <linux/lustre_compat25.h>
 
+/* called for each page in a completed rpc.*/
+void ll_ap_completion_26(void *data, int cmd, int rc)
+{
+        struct ll_async_page *llap;
+        struct page *page;
+
+        llap = llap_from_cookie(data);
+        if (IS_ERR(llap)) {
+                EXIT;
+                return;
+        }
+
+        page = llap->llap_page;
+        LASSERT(PageLocked(page));
+
+        if (rc == 0)  {
+                if (cmd == OBD_BRW_READ) {
+                        if (!llap->llap_defer_uptodate)
+                                SetPageUptodate(page);
+                } else {
+                        llap->llap_write_queued = 0;
+                }
+        } else {
+                SetPageError(page);
+        }
+
+        LL_CDEBUG_PAGE(D_PAGE, page, "io complete, unlocking\n");
+
+        unlock_page(page);
+
+        if (0 && cmd == OBD_BRW_WRITE) {
+                llap_write_complete(page->mapping->host, llap);
+                ll_try_done_writing(page->mapping->host);
+        }
+
+        page_cache_release(page);
+}
+
 static int ll_writepage_26(struct page *page, struct writeback_control *wbc)
 {
         struct inode *inode = page->mapping->host;
@@ -95,15 +133,15 @@ out:
 }
 
 struct address_space_operations ll_aops = {
-        .readpage       = ll_readpage,
-//        .readpages      = ll_readpages,
-//        .direct_IO      = ll_direct_IO_26,
-        .writepage      = ll_writepage_26,
-        .writepages     = generic_writepages,
-        .set_page_dirty = __set_page_dirty_nobuffers,
-        .sync_page      = NULL,
-        .prepare_write  = ll_prepare_write,
-        .commit_write   = ll_commit_write,
-        .removepage     = ll_removepage,
-        .bmap           = NULL
+        readpage: ll_readpage,
+//        readpages: ll_readpages,
+//        direct_IO: ll_direct_IO_26,
+        writepage: ll_writepage_26,
+        writepages: generic_writepages,
+        set_page_dirty: __set_page_dirty_nobuffers,
+        sync_page: NULL,
+        prepare_write: ll_prepare_write,
+        commit_write: ll_commit_write,
+        removepage: ll_removepage,
+        bmap: NULL
 };
diff --git a/lustre/llite/special.c b/lustre/llite/special.c
deleted file mode 100644
index c932752..0000000
--- a/lustre/llite/special.c
+++ /dev/null
@@ -1,399 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
- * Special file handling for Lustre.
- *
- *  Copyright (c) 2002, 2003 Cluster File Systems, Inc.
- *   Author: Wang Di <wangdi@clusterfs.com>
- *   Author: Andreas Dilger <adilger@clusterfs.com>
- *
- *   This file is part of Lustre, http://www.lustre.org.
- *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
- *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#define DEBUG_SUBSYSTEM S_LLITE
-#include <linux/lustre_dlm.h>
-#include <linux/lustre_lite.h>
-#include <linux/pagemap.h>
-#include <linux/file.h>
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-#include <linux/lustre_compat25.h>
-#endif
-#include <asm/poll.h>
-#include "llite_internal.h"
-
-#define INODE_OPS 1
-#define FILE_OPS 2
-
-static struct file_operations **get_save_fops(struct file* filp, int mode)
-{
-        struct inode *inode = filp->f_dentry->d_inode;
-        struct ll_inode_info *lli = ll_i2info(inode);
-
-        if (mode == INODE_OPS) {
-                return &(lli->ll_save_ifop);
-        } else if (mode == FILE_OPS) {
-                if (S_ISFIFO(inode->i_mode)) {
-                        switch (filp->f_mode) {
-                        case 1: /*O_RDONLY*/
-                                return &(lli->ll_save_ffop);
-                        case 2: /*O_WRONLY*/
-                                return &(lli->ll_save_wfop);
-                        case 3: /* O_RDWR */
-                                return &(lli->ll_save_wrfop);
-                        default:
-                                return NULL;
-                        }
-                }
-                return &(lli->ll_save_ffop);
-        } else {
-                CERROR("invalid special file ops %d\n", mode);
-                LBUG();
-                return NULL;
-        }
-}
-
-static void save_fops(struct file *filp, struct inode *inode,
-                      struct file_operations *sfops)
-{
-        if (sfops != filp->f_op) {
-                struct file_operations **pfop = get_save_fops(filp, FILE_OPS);
-
-                *pfop = filp->f_op;
-                if (S_ISCHR(inode->i_mode))
-                        filp->f_op = &ll_special_chr_file_fops;
-                else if (S_ISFIFO(inode->i_mode))
-                        filp->f_op = &ll_special_fifo_file_fops;
-
-                CDEBUG(D_INFO,"saved %p, replaced with %p\n", *pfop,filp->f_op);
-                if ((*pfop)->owner)
-                        CDEBUG(D_INFO,"%p has owner %p\n",*pfop,(*pfop)->owner);
-        }
-}
-
-static ssize_t ll_special_file_read(struct file *filp, char *buf,
-                                    size_t count, loff_t *ppos)
-{
-        struct file_operations **pfop = get_save_fops(filp, FILE_OPS);
-        int rc = -EINVAL;
-
-        if (pfop && *pfop && (*pfop)->read)
-                rc = (*pfop)->read(filp, buf, count, ppos);
-
-        RETURN(rc);
-}
-
-static ssize_t ll_special_file_write(struct file *filp, const char *buf,
-                                     size_t count, loff_t *ppos)
-{
-        struct file_operations **pfop = get_save_fops(filp, FILE_OPS);
-        int rc = -EINVAL;
-
-        if (pfop && *pfop && (*pfop)->write)
-                rc = (*pfop)->write(filp, buf, count, ppos);
-
-        RETURN(rc);
-}
-
-static int ll_special_file_ioctl(struct inode *inode, struct file *filp,
-                                 unsigned int cmd, unsigned long arg)
-{
-        struct file_operations **pfop = get_save_fops(filp, FILE_OPS);
-        int rc = -ENOTTY;
-
-        if (pfop && *pfop && (*pfop)->ioctl) {
-                struct file_operations *sfops = filp->f_op;
-
-                rc = (*pfop)->ioctl(inode, filp, cmd, arg);
-                save_fops(filp, inode, sfops);
-        }
-        RETURN(rc);
-}
-
-static loff_t ll_special_file_seek(struct file *filp, loff_t offset, int origin)
-{
-        struct file_operations **pfop = get_save_fops(filp, FILE_OPS);
-        int rc = 0;
-
-        if (pfop && *pfop && (*pfop)->llseek)
-                rc = (*pfop)->llseek(filp, offset, origin);
-        else
-                rc = default_llseek(filp, offset, origin);
-
-        RETURN(rc);
-}
-
-
-#define DEFAULT_POLLMASK (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)
-
-static unsigned int ll_special_file_poll(struct file *filp,
-                                         struct poll_table_struct *poll_table)
-{
-        struct file_operations **pfop = get_save_fops(filp, FILE_OPS);
-        int rc = DEFAULT_POLLMASK;
-
-        if (pfop && *pfop && (*pfop)->poll)
-                rc = (*pfop)->poll(filp, poll_table);
-
-        RETURN(rc);
-}
-
-static int ll_special_file_open(struct inode *inode, struct file *filp)
-{
-        struct file_operations **pfop = get_save_fops(filp, FILE_OPS);
-        int rc = -EINVAL;
-
-        if (pfop && *pfop) {
-                fops_get(*pfop);
-
-                if ((*pfop)->open)
-                        rc = (*pfop)->open(inode, filp);
-
-                if (rc)
-                        fops_put(*pfop);
-        }
-
-        RETURN(rc);
-}
-
-static ssize_t ll_special_read(struct file *filp, char *buf, size_t count,
-                               loff_t *ppos)
-{
-        struct file_operations **pfop = get_save_fops(filp, INODE_OPS);
-        int rc = -EINVAL;
-
-        if (pfop && *pfop && (*pfop)->read)
-                rc = (*pfop)->read(filp, buf, count, ppos);
-
-        RETURN(rc);
-}
-
-static ssize_t ll_special_write(struct file *filp, const char *buf,
-                                size_t count, loff_t *ppos)
-{
-        struct file_operations **pfop = get_save_fops(filp, INODE_OPS);
-        int rc = -EINVAL;
-
-        if (pfop && *pfop && (*pfop)->write)
-                rc = (*pfop)->write(filp, buf, count, ppos);
-
-        RETURN(rc);
-}
-
-static int ll_special_ioctl(struct inode *inode, struct file *filp,
-                            unsigned int cmd, unsigned long arg)
-{
-        struct file_operations **pfop = get_save_fops(filp, INODE_OPS);
-        int rc = -ENOTTY;
-
-        if (pfop && *pfop && (*pfop)->ioctl) {
-                struct file_operations *sfops = filp->f_op;
-			
-                rc = (*pfop)->ioctl(inode, filp, cmd, arg);
-
-                /* sometimes, file_operations will be changed in ioctl */
-                save_fops(filp, inode, sfops);
-        }
-
-        RETURN(rc);
-}
-
-static int ll_special_mmap(struct file * filp, struct vm_area_struct * vma)
-{
-        struct file_operations **pfop = get_save_fops(filp, INODE_OPS);
-        int rc = -ENODEV;
-
-        if (pfop && *pfop && (*pfop)->mmap)
-                rc = (*pfop)->mmap(filp, vma);
-
-        RETURN(rc);
-}
-
-static loff_t ll_special_seek(struct file *filp, loff_t offset, int origin)
-{
-        struct file_operations** pfop = get_save_fops (filp, INODE_OPS);
-        int    rc = 0;
-
-        if (pfop && *pfop && (*pfop)->llseek)
-                rc = (*pfop)->llseek(filp, offset, origin);
-        else
-                rc = default_llseek(filp, offset, origin);
-
-        RETURN(rc);
-}
-
-static int ll_special_fsync(struct file *filp, struct dentry *dentry, int data)
-{
-        struct file_operations **pfop = get_save_fops(filp, INODE_OPS);
-        int rc = -EINVAL;
-
-        if (pfop && *pfop && (*pfop)->fsync)
-                rc = (*pfop)->fsync(filp, dentry, data);
-
-        RETURN(rc);
-}
-
-static int ll_special_file_fasync(int fd, struct file *filp, int on)
-{
-        struct file_operations **pfop = get_save_fops(filp, FILE_OPS);
-        int rc = -EINVAL;
-
-        if (pfop && *pfop && (*pfop)->fasync)
-                rc = (*pfop)->fasync(fd, filp, on);
-
-        RETURN(rc);
-}
-
-static int ll_special_release_internal(struct inode *inode, struct file *filp,
-                                       int mode)
-{
-       struct file_operations **pfop = get_save_fops(filp, mode);
-       struct ll_sb_info *sbi = ll_i2sbi(inode);
-       int rc = 0, err;
-       ENTRY;
-
-        if (pfop && *pfop) {
-                if ((*pfop)->release)
-                        rc = (*pfop)->release(inode, filp);
-                fops_put(*pfop);
-        }
-
-        lprocfs_counter_incr(sbi->ll_stats, LPROC_LL_RELEASE);
-        err = ll_mdc_close(sbi->ll_mdc_exp, inode, filp);
-
-        if (err && rc == 0)
-                rc = err;
-
-        RETURN(rc);
-}
-
-static int ll_special_open(struct inode *inode, struct file *filp)
-{
-        struct file_operations **pfop = get_save_fops(filp, INODE_OPS);
-        struct file_operations *sfops = filp->f_op;
-        struct ptlrpc_request *req;
-        struct lookup_intent *it;
-        int rc = -EINVAL, err;
-        ENTRY;
-
-        if (pfop && *pfop) {
-                /* mostly we will have @def_blk_fops here and it is not in a
-                 * module but we do this just to be sure. */
-                fops_get(*pfop);
-
-                if ((*pfop)->open) {
-                        rc = (*pfop)->open(inode, filp);
-
-                        if (rc)
-                                fops_put(*pfop);
-                        else    /* sometimes ops will be changed in open */
-                                save_fops(filp, inode, sfops);
-                }
-        }
-
-        lprocfs_counter_incr(ll_i2sbi(inode)->ll_stats, LPROC_LL_OPEN);
-
-        it = filp->f_it;
-
-        err = ll_local_open(filp, it);
-        if (rc != 0) {
-                CERROR("error opening special file: rc %d\n", rc);
-                ll_mdc_close(ll_i2sbi(inode)->ll_mdc_exp, inode, filp);
-        } else if (err) {
-                if (pfop && *pfop) {
-                        if ((*pfop)->release)
-                                (*pfop)->release(inode, filp);
-                        fops_put(*pfop);
-                }
-                rc = err;
-        }
-
-        req = it->d.lustre.it_data;
-        if (req)
-                ptlrpc_req_finished(req);
-
-        RETURN(rc);
-}
-
-static int ll_special_release(struct inode *inode, struct file *filp)
-{
-        return ll_special_release_internal(inode, filp, INODE_OPS);
-}
-
-static int ll_special_file_release(struct inode *inode, struct file *filp)
-{
-        return ll_special_release_internal(inode, filp, FILE_OPS);
-}
-
-struct inode_operations ll_special_inode_operations = {
-        .setattr_raw    = ll_setattr_raw,
-        .setattr        = ll_setattr,
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-        .getattr_it     = ll_getattr,
-#else
-        .revalidate_it  = ll_inode_revalidate_it,
-#endif
-};
-
-struct file_operations ll_special_chr_inode_fops = {
-        //FIXME .owner          = THIS_MODULE,
-        .open           = ll_special_open,
-};
-
-struct file_operations ll_special_blk_inode_fops = {
-        //FIXME .owner          = THIS_MODULE,
-        .read           = ll_special_read,
-        .write          = ll_special_write,
-        .ioctl          = ll_special_ioctl,
-        .open           = ll_special_open,
-        .release        = ll_special_release,
-        .mmap           = ll_special_mmap,
-        .llseek         = ll_special_seek,
-        .fsync          = ll_special_fsync,
-};
-
-struct file_operations ll_special_fifo_inode_fops = {
-        //FIXME .owner          = THIS_MODULE,
-        .open           = ll_special_open,
-};
-
-struct file_operations ll_special_sock_inode_fops = {
-        //FIXME .owner          = THIS_MODULE,
-        .open           = ll_special_open
-};
-
-struct file_operations ll_special_chr_file_fops = {
-        //FIXME .owner          = THIS_MODULE,
-        .llseek         = ll_special_file_seek,
-        .read           = ll_special_file_read,
-        .write          = ll_special_file_write,
-        .poll           = ll_special_file_poll,
-        .ioctl          = ll_special_file_ioctl,
-        .open           = ll_special_file_open,
-        .release        = ll_special_file_release,
-        .fasync         = ll_special_file_fasync,
-};
-
-struct file_operations ll_special_fifo_file_fops = {
-        //FIXME .owner          = THIS_MODULE,
-        .llseek         = ll_special_file_seek,
-        .read           = ll_special_file_read,
-        .write          = ll_special_file_write,
-        .poll           = ll_special_file_poll,
-        .ioctl          = ll_special_file_ioctl,
-        .open           = ll_special_file_open,
-        .release        = ll_special_file_release,
-};
-
diff --git a/lustre/llite/super.c b/lustre/llite/super.c
index 133407a..e248be7 100644
--- a/lustre/llite/super.c
+++ b/lustre/llite/super.c
@@ -60,31 +60,44 @@ static struct super_block *lustre_read_super(struct super_block *sb,
         RETURN(sb);
 }
 
+/* exported operations */
+struct super_operations ll_super_operations =
+{
+        read_inode2: ll_read_inode2,
+        clear_inode: ll_clear_inode,
+        //        delete_inode: ll_delete_inode,
+        put_super: ll_put_super,
+        statfs: ll_statfs,
+        umount_begin: ll_umount_begin,
+        fh_to_dentry: ll_fh_to_dentry,
+        dentry_to_fh: ll_dentry_to_fh
+};
+
 static struct file_system_type lustre_lite_fs_type = {
-        .owner          = THIS_MODULE,
-        .name           = "lustre_lite",
-        .fs_flags       = FS_NFSEXP_FSID,
-        .read_super     = ll_read_super,
+        name:           "lustre_lite",
+        fs_flags:       FS_NFSEXP_FSID,
+        read_super:     ll_read_super,
+        owner:          THIS_MODULE,
 };
 
 /* exported operations */
 struct super_operations lustre_super_operations =
 {
-        .read_inode2    = ll_read_inode2,
-        .clear_inode    = ll_clear_inode,
-//        .delete_inode   = ll_delete_inode,
-        .put_super      = lustre_put_super,
-        .statfs         = ll_statfs,
-        .umount_begin   = ll_umount_begin,
-        .fh_to_dentry   = ll_fh_to_dentry,
-        .dentry_to_fh   = ll_dentry_to_fh
+        read_inode2: ll_read_inode2,
+        clear_inode: ll_clear_inode,
+        //        delete_inode: ll_delete_inode,
+        put_super: lustre_put_super,
+        statfs: ll_statfs,
+        umount_begin: ll_umount_begin,
+        fh_to_dentry: ll_fh_to_dentry,
+        dentry_to_fh: ll_dentry_to_fh
 };
 
 static struct file_system_type lustre_fs_type = {
-        .owner          = THIS_MODULE,
-        .name           = "lustre",
-        .fs_flags       = FS_NFSEXP_FSID,
-        .read_super     = lustre_read_super,
+        name:           "lustre",
+        fs_flags:       FS_NFSEXP_FSID,
+        read_super:     lustre_read_super,
+        owner:          THIS_MODULE,
 };
 
 static int __init init_lustre_lite(void)
diff --git a/lustre/llite/super25.c b/lustre/llite/super25.c
index 1f5425e..526776b 100644
--- a/lustre/llite/super25.c
+++ b/lustre/llite/super25.c
@@ -100,29 +100,27 @@ void ll_destroy_inodecache(void)
 /* exported operations */
 struct super_operations lustre_super_operations =
 {
-        .alloc_inode   = ll_alloc_inode,
-        .destroy_inode = ll_destroy_inode,
-        .clear_inode   = ll_clear_inode,
-        .put_super     = lustre_put_super,
-        .statfs        = ll_statfs,
-        .umount_begin  = ll_umount_begin
+        alloc_inode: ll_alloc_inode,
+        destroy_inode: ll_destroy_inode,
+        clear_inode: ll_clear_inode,
+        put_super: ll_put_super,
+        statfs: ll_statfs,
+        umount_begin: ll_umount_begin
 };
 
 
 struct file_system_type lustre_lite_fs_type = {
-        .owner        = THIS_MODULE,
-        .name         = "lustre_lite",
-        .get_sb       = ll_get_sb,
-        .kill_sb      = kill_anon_super,
-        .fs_flags     = FS_BINARY_MOUNTDATA,
+        .owner  = THIS_MODULE,
+        .name =   "lustre_lite",
+        .get_sb = ll_get_sb,
+        .kill_sb = kill_anon_super,
 };
 
 struct file_system_type lustre_fs_type = {
-        .owner        = THIS_MODULE,
-        .name         = "lustre",
-        .get_sb       = lustre_get_sb,
-        .kill_sb      = kill_anon_super,
-        .fs_flags     = FS_BINARY_MOUNTDATA,
+        .owner  = THIS_MODULE,
+        .name =   "lustre",
+        .get_sb = lustre_get_sb,
+        .kill_sb = kill_anon_super,
 };
 
 static int __init init_lustre_lite(void)
diff --git a/lustre/llite/symlink.c b/lustre/llite/symlink.c
index e401266..4057fbc 100644
--- a/lustre/llite/symlink.c
+++ b/lustre/llite/symlink.c
@@ -48,8 +48,8 @@ static int ll_readlink_internal(struct inode *inode,
         }
 
         ll_inode2fid(&fid, inode);
-        rc = mdc_getattr(sbi->ll_mdc_exp, &fid,
-                         OBD_MD_LINKNAME, symlen, request);
+        rc = md_getattr(sbi->ll_mdc_exp, &fid,
+                             OBD_MD_LINKNAME, symlen, request);
         if (rc) {
                 CERROR("inode %lu: rc = %d\n", inode->i_ino, rc);
                 RETURN(rc);
@@ -148,13 +148,13 @@ static int ll_follow_link(struct dentry *dentry, struct nameidata *nd)
 }
 
 struct inode_operations ll_fast_symlink_inode_operations = {
-        .readlink       = ll_readlink,
-        .setattr        = ll_setattr,
-        .setattr_raw    = ll_setattr_raw,
-        .follow_link    = ll_follow_link,
+        readlink:       ll_readlink,
+        setattr:        ll_setattr,
+        setattr_raw:    ll_setattr_raw,
+        follow_link:    ll_follow_link,
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-        .revalidate_it  = ll_inode_revalidate_it
+        revalidate_it:  ll_inode_revalidate_it
 #else 
-        .getattr_it     = ll_getattr
+        getattr_it:     ll_getattr
 #endif
 };
diff --git a/lustre/include/lustre/.cvsignore b/lustre/lmv/.cvsignore
similarity index 77%
rename from lustre/include/lustre/.cvsignore
rename to lustre/lmv/.cvsignore
index 282522d..e995588 100644
--- a/lustre/include/lustre/.cvsignore
+++ b/lustre/lmv/.cvsignore
@@ -1,2 +1,3 @@
+.deps
 Makefile
 Makefile.in
diff --git a/lustre/lmv/Makefile.am b/lustre/lmv/Makefile.am
new file mode 100644
index 0000000..0d96c9b
--- /dev/null
+++ b/lustre/lmv/Makefile.am
@@ -0,0 +1,18 @@
+# Copyright (C) 2002 Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+DEFS=
+
+if LIBLUSTRE
+lib_LIBRARIES = liblmv.a
+liblmv_a_SOURCES = lmv_obd.c lmv_intent.c lmv_objmgr.c
+else
+MODULE = lmv
+modulefs_DATA = lmv.o
+EXTRA_PROGRAMS = lmv
+lmv_SOURCES = lmv_obd.c lmv_intent.c lmv_objmgr.c
+endif
+
+include $(top_srcdir)/Rules
diff --git a/lustre/lmv/lmv_intent.c b/lustre/lmv/lmv_intent.c
new file mode 100644
index 0000000..03b8f3b
--- /dev/null
+++ b/lustre/lmv/lmv_intent.c
@@ -0,0 +1,727 @@
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
+ *
+ * Copyright (C) 2002, 2003 Cluster File Systems, Inc.
+ *
+ *   This file is part of Lustre, http://www.lustre.org.
+ *
+ *   Lustre is free software; you can redistribute it and/or
+ *   modify it under the terms of version 2 of the GNU General Public
+ *   License as published by the Free Software Foundation.
+ *
+ *   Lustre is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Lustre; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef EXPORT_SYMTAB
+# define EXPORT_SYMTAB
+#endif
+#define DEBUG_SUBSYSTEM S_LMV
+#ifdef __KERNEL__
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/pagemap.h>
+#include <asm/div64.h>
+#else
+#include <liblustre.h>
+#endif
+
+#include <linux/obd_support.h>
+#include <linux/lustre_lib.h>
+#include <linux/lustre_net.h>
+#include <linux/lustre_idl.h>
+#include <linux/lustre_dlm.h>
+#include <linux/lustre_mds.h>
+#include <linux/obd_class.h>
+#include <linux/obd_ost.h>
+#include <linux/seq_file.h>
+#include <linux/lprocfs_status.h>
+#include <linux/lustre_fsfilt.h>
+#include <linux/obd_lmv.h>
+#include "lmv_internal.h"
+
+
+int lmv_handle_remote_inode(struct obd_export *exp, struct ll_uctxt *uctxt,
+                            void *lmm, int lmmsize, 
+                            struct lookup_intent *it, int flags,
+                            struct ptlrpc_request **reqp,
+                            ldlm_blocking_callback cb_blocking)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        struct mds_body *body = NULL;
+        int rc = 0;
+        ENTRY;
+
+        body = lustre_msg_buf((*reqp)->rq_repmsg, 1, sizeof(*body));
+        LASSERT(body != NULL);
+
+        if (body->valid & OBD_MD_MDS) {
+                /* oh, MDS reports that this is remote inode case
+                 * i.e. we have to ask for real attrs on another MDS */
+                struct ptlrpc_request *req;
+                struct ll_fid nfid;
+                struct lustre_handle plock;
+                int pmode;
+
+                /* we got LOOKUP lock, but we really need attrs */
+                pmode = it->d.lustre.it_lock_mode;
+                if (pmode) {
+                        memcpy(&plock, &it->d.lustre.it_lock_handle,
+                                        sizeof(plock));
+                        it->d.lustre.it_lock_mode = 0;
+                }
+
+                nfid = body->fid1;
+                it->d.lustre.it_disposition &= ~DISP_ENQ_COMPLETE;
+                rc = md_intent_lock(lmv->tgts[nfid.mds].exp, uctxt, &nfid,
+                                    NULL, 0, lmm, lmmsize, NULL, it, flags,
+                                    &req, cb_blocking);
+
+                /* llite needs LOOKUP lock to track dentry revocation in 
+                 * order to maintain dcache consistency. thus drop UPDATE
+                 * lock here and put LOOKUP in request */
+                if (rc == 0) {
+                        LASSERT(it->d.lustre.it_lock_mode != 0);
+                        ldlm_lock_decref((void *)&it->d.lustre.it_lock_handle,
+                                         it->d.lustre.it_lock_mode);
+                        memcpy(&it->d.lustre.it_lock_handle, &plock,
+                                        sizeof(plock));
+                        it->d.lustre.it_lock_mode = pmode;
+                        
+                } else if (pmode)
+                        ldlm_lock_decref(&plock, pmode);
+
+                ptlrpc_req_finished(*reqp);
+                *reqp = req;
+        }
+        RETURN(rc);
+}
+
+int lmv_intent_open(struct obd_export *exp, struct ll_uctxt *uctxt,
+                    struct ll_fid *pfid, const char *name, int len,
+                    void *lmm, int lmmsize, struct ll_fid *cfid,
+                    struct lookup_intent *it, int flags,
+                    struct ptlrpc_request **reqp,
+                    ldlm_blocking_callback cb_blocking)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        struct mds_body *body = NULL;
+        struct ll_fid rpfid = *pfid;
+        struct lmv_obj *obj;
+        struct mea *mea;
+        int rc, mds;
+        ENTRY;
+
+        /* IT_OPEN is intended to open (and create, possible) an object.
+         * parent (pfid) may be splitted dir */
+
+        mds = pfid->mds;
+        obj = lmv_grab_obj(obd, pfid, 0);
+        if (obj) {
+                /* directory is already splitted, so we have to forward
+                 * request to the right MDS */
+                mds = raw_name2idx(obj->objcount, name, len);
+                rpfid = obj->objs[mds].fid;
+                CDEBUG(D_OTHER, "forward to MDS #%u\n", mds);
+        }
+
+        rc = md_intent_lock(lmv->tgts[mds].exp, uctxt, &rpfid, name, len,
+                            lmm, lmmsize, cfid, it, flags, reqp, cb_blocking);
+       
+        lmv_put_obj(obj);
+        if (rc != 0)
+                RETURN(rc);
+
+        /* okay, MDS has returned success. probably name has been
+         * resolved in remote inode */
+        rc = lmv_handle_remote_inode(exp, uctxt, lmm, lmmsize, it, flags,
+                                     reqp, cb_blocking);
+        if (rc != 0) {
+                LASSERT(rc < 0);
+                RETURN(rc);
+        }
+
+        /* caller may use attrs MDS returns on IT_OPEN lock request
+         * so, we have to update them for splitted dir */
+        body = lustre_msg_buf((*reqp)->rq_repmsg, 1, sizeof(*body));
+        LASSERT(body != NULL);
+        cfid = &body->fid1;
+        obj = lmv_grab_obj(obd, cfid, 0);
+        if (rc == 0 && !obj && (mea = is_body_of_splitted_dir(*reqp, 1))) {
+                /* wow! this is splitted dir, we'd like to handle it */
+                rc = lmv_create_obj_from_attrs(exp, &body->fid1, mea);
+        }
+        obj = lmv_grab_obj(obd, cfid, 0);
+        if (obj) {
+                /* this is splitted dir and we'd want to get attrs */
+                CDEBUG(D_OTHER, "attrs from slaves for %lu/%lu/%lu\n",
+                                (unsigned long) cfid->mds,
+                                (unsigned long) cfid->id,
+                                (unsigned long) cfid->generation);
+                rc = lmv_revalidate_slaves(exp, reqp, cfid,
+                                it, 1, cb_blocking);
+        } else if (S_ISDIR(body->mode)) {
+                CWARN("hmmm, %lu/%lu/%lu has not lmv obj?!\n",
+                                (unsigned long) cfid->mds,
+                                (unsigned long) cfid->id,
+                                (unsigned long) cfid->generation);
+        }
+        lmv_put_obj(obj);
+        RETURN(rc);
+}
+
+int lmv_intent_getattr(struct obd_export *exp, struct ll_uctxt *uctxt,
+                       struct ll_fid *pfid, const char *name, int len,
+                       void *lmm, int lmmsize, struct ll_fid *cfid,
+                       struct lookup_intent *it, int flags,
+                       struct ptlrpc_request **reqp,
+                       ldlm_blocking_callback cb_blocking)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        struct mds_body *body = NULL;
+        struct ll_fid rpfid = *pfid;
+        struct lmv_obj *obj, *obj2;
+        struct mea *mea;
+        int rc = 0, mds;
+        ENTRY;
+
+        if (cfid) {
+                /* caller wants to revalidate attrs of obj
+                 * we have to revalidate slaves if requested
+                 * object is splitted directory */
+                CDEBUG(D_OTHER, "revalidate attrs for %lu/%lu/%lu\n",
+                       (unsigned long) cfid->mds,
+                       (unsigned long) cfid->id,
+                       (unsigned long) cfid->generation);
+                mds = cfid->mds;
+                obj = lmv_grab_obj(obd, cfid, 0);
+                if (obj) {
+                        /* in fact, we need not this with current
+                         * _intent_lock(), but it may change some day */
+                        rpfid = obj->objs[mds].fid;
+                }
+                rc = md_intent_lock(lmv->tgts[mds].exp, uctxt, &rpfid, name,
+                                    len, lmm, lmmsize, cfid, it, flags, reqp,
+                                    cb_blocking);
+                if (obj && rc >= 0) {
+                        /* this is splitted dir. in order to optimize things
+                         * a bit, we consider obj valid updating missing
+                         * parts. FIXME: do we need to return any lock here?
+                         * it would be fine if we don't. this means that
+                         * nobody should use UPDATE lock to notify about
+                         * object removal */
+                        CDEBUG(D_OTHER,
+                               "revalidate slaves for %lu/%lu/%lu, rc %d\n",
+                               (unsigned long) cfid->mds,
+                               (unsigned long) cfid->id,
+                               (unsigned long) cfid->generation, rc);
+                        rc = lmv_revalidate_slaves(exp, reqp, cfid, it, rc,
+                                                   cb_blocking);
+                }
+                RETURN(rc);                
+        }
+
+        CDEBUG(D_OTHER, "INTENT getattr for %*s on %lu/%lu/%lu\n",
+               len, name, (unsigned long) pfid->mds,
+               (unsigned long) pfid->id,
+               (unsigned long) pfid->generation);
+
+        mds = pfid->mds;
+        obj = lmv_grab_obj(obd, pfid, 0);
+        if (obj && len) {
+                /* directory is already splitted. calculate mds */
+                mds = raw_name2idx(obj->objcount, (char *) name, len);
+                rpfid = obj->objs[mds].fid;
+                CDEBUG(D_OTHER, "forward to MDS #%u (slave %lu/%lu/%lu)\n",
+                       mds, (unsigned long) rpfid.mds,
+                       (unsigned long) rpfid.id,
+                       (unsigned long) rpfid.generation);
+        }
+        rc = md_intent_lock(lmv->tgts[mds].exp, uctxt, &rpfid, name,
+                            len, lmm, lmmsize, NULL, it, flags, reqp,
+                            cb_blocking);
+        if (rc < 0)
+                RETURN(rc);
+        LASSERT(rc == 0);
+
+        /* okay, MDS has returned success. probably name has been
+         * resolved in remote inode */
+        rc = lmv_handle_remote_inode(exp, uctxt, lmm, lmmsize, it, flags,
+                                     reqp, cb_blocking);
+        if (rc < 0)
+                RETURN(rc);
+
+        body = lustre_msg_buf((*reqp)->rq_repmsg, 1, sizeof(*body));
+        LASSERT(body != NULL);
+        cfid = &body->fid1;
+        obj2 = lmv_grab_obj(obd, cfid, 0);
+
+        if (rc == 0 && !obj2 && (mea = is_body_of_splitted_dir(*reqp, 1))) {
+                /* wow! this is splitted dir, we'd like to handle it */
+                body = lustre_msg_buf((*reqp)->rq_repmsg, 1, sizeof(*body));
+                LASSERT(body != NULL);
+                rc = lmv_create_obj_from_attrs(exp, &body->fid1, mea);
+                obj2 = lmv_grab_obj(obd, cfid, 0);
+        }
+
+        if (obj2) {
+                /* this is splitted dir and we'd want to get attrs */
+                CDEBUG(D_OTHER,
+                                "attrs from slaves for %lu/%lu/%lu, rc %d\n",
+                                (unsigned long) cfid->mds,
+                                (unsigned long) cfid->id,
+                                (unsigned long) cfid->generation, rc);
+                rc = lmv_revalidate_slaves(exp, reqp, cfid,
+                                it, 1, cb_blocking);
+        }
+        RETURN(rc);
+}
+
+void lmv_update_body_from_obj(struct mds_body *body, struct lmv_inode *obj)
+{
+        /* update size */
+        body->size += obj->size;
+
+        /* update atime */
+        /* update ctime */
+        /* update mtime */
+        /* update nlink */
+}
+
+int lmv_lookup_slaves(struct obd_export *exp, struct ptlrpc_request **reqp)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        struct mds_body *body = NULL;
+        struct lustre_handle *lockh;
+        struct ldlm_lock *lock;
+        struct mds_body *body2;
+        struct ll_uctxt uctxt;
+        struct lmv_obj *obj;
+        int i, rc = 0;
+        ENTRY;
+
+        LASSERT(reqp);
+        LASSERT(*reqp);
+
+        /* master is locked. we'd like to take locks on slaves
+         * and update attributes to be returned from the slaves
+         * it's important that lookup is called in two cases:
+         *  - for first time (dcache has no such a resolving yet
+         *  - ->d_revalidate() returned false
+         * last case possible only if all the objs (master and
+         * all slaves aren't valid */
+
+        body = lustre_msg_buf((*reqp)->rq_repmsg, 1, sizeof(*body));
+        LASSERT(body != NULL);
+
+        obj = lmv_grab_obj(obd, &body->fid1, 0);
+        LASSERT(obj);
+
+        CDEBUG(D_OTHER, "lookup slaves for %lu/%lu/%lu\n",
+               (unsigned long) body->fid1.mds,
+               (unsigned long) body->fid1.id,
+               (unsigned long) body->fid1.generation);
+
+        uctxt.gid1 = 0;
+        uctxt.gid2 = 0;
+        for (i = 0; i < obj->objcount; i++) {
+                struct ll_fid fid = obj->objs[i].fid;
+                struct ptlrpc_request *req = NULL;
+                struct lookup_intent it;
+
+                if (fid_equal(&fid, &obj->fid)) {
+                        /* skip master obj */
+                        continue;
+                }
+
+                CDEBUG(D_OTHER, "lookup slave %lu/%lu/%lu\n",
+                       (unsigned long) fid.mds,
+                       (unsigned long) fid.id,
+                       (unsigned long) fid.generation);
+
+                /* is obj valid? */
+                memset(&it, 0, sizeof(it));
+                it.it_op = IT_GETATTR;
+                rc = md_intent_lock(lmv->tgts[fid.mds].exp, &uctxt, &fid,
+                                    NULL, 0, NULL, 0, &fid, &it, 0, &req,
+                                    lmv_dirobj_blocking_ast);
+                lockh = (struct lustre_handle *) &it.d.lustre.it_lock_handle;
+                if (rc > 0) {
+                        /* nice, this slave is valid */
+                        LASSERT(req == NULL);
+                        CDEBUG(D_OTHER, "cached\n");
+                        goto release_lock;
+                }
+
+                if (rc < 0) {
+                        /* error during revalidation */
+                        GOTO(cleanup, rc);
+                }
+
+                /* rc == 0, this means we have no such a lock and can't
+                 * think obj is still valid. lookup it again */
+                LASSERT(req == NULL);
+                req = NULL;
+                memset(&it, 0, sizeof(it));
+                it.it_op = IT_GETATTR;
+                rc = md_intent_lock(lmv->tgts[fid.mds].exp, &uctxt, &fid,
+                                    NULL, 0, NULL, 0, NULL, &it, 0, &req,
+                                    lmv_dirobj_blocking_ast);
+                lockh = (struct lustre_handle *) &it.d.lustre.it_lock_handle;
+                LASSERT(rc <= 0);
+                if (rc < 0) {
+                        /* error during lookup */
+                        GOTO(cleanup, rc);
+                }
+                
+                lock = ldlm_handle2lock(lockh);
+                LASSERT(lock);
+                lock->l_ast_data = obj;
+                atomic_inc(&obj->count);
+
+                body2 = lustre_msg_buf(req->rq_repmsg, 1, sizeof(*body2));
+                LASSERT(body2);
+
+                obj->objs[i].size = body2->size;
+                CDEBUG(D_OTHER, "fresh: %lu\n",
+                                (unsigned long) obj->objs[i].size);
+
+                LDLM_LOCK_PUT(lock);
+
+                if (req)
+                        ptlrpc_req_finished(req);
+release_lock:
+                lmv_update_body_from_obj(body, obj->objs + i);
+                if (it.d.lustre.it_lock_mode)
+                        ldlm_lock_decref(lockh, it.d.lustre.it_lock_mode);
+        }
+cleanup:
+        RETURN(rc);
+}
+
+int lmv_intent_lookup(struct obd_export *exp, struct ll_uctxt *uctxt,
+                struct ll_fid *pfid, const char *name, int len,
+                void *lmm, int lmmsize, struct ll_fid *cfid,
+                struct lookup_intent *it, int flags,
+                struct ptlrpc_request **reqp,
+                ldlm_blocking_callback cb_blocking)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        struct mds_body *body = NULL;
+        struct ll_fid rpfid = *pfid;
+        struct lmv_obj *obj;
+        struct mea *mea;
+        int rc, mds;
+        ENTRY;
+
+        /* IT_LOOKUP is intended to produce name -> fid resolving
+         * (let's call this lookup below) or to confirm requested
+         * resolving is still valid (let's call this revalidation)
+         * cfid != NULL specifies revalidation */
+
+        if (cfid) {
+                /* this is revalidation  during revalidation it's
+                 * enough to return 1 if we think attrs are uptodate
+                 * it may return updated attrs, though */
+                mds = cfid->mds;
+                rc = md_intent_lock(lmv->tgts[mds].exp, uctxt, pfid, name,
+                                    len, lmm, lmmsize, cfid, it, flags,
+                                    reqp, cb_blocking);
+                CDEBUG(D_OTHER, "revalidate lookup for %lu/%lu/%lu = %d\n",
+                       (unsigned long) cfid->mds,
+                       (unsigned long) cfid->id,
+                       (unsigned long) cfid->generation, rc);
+                RETURN(rc);
+        }
+
+        mds = pfid->mds;
+repeat:
+        /* this is lookup. during lookup we have to update all the
+         * attributes, because returned values will be put in struct
+         * inode */
+
+        obj = lmv_grab_obj(obd, pfid, 0);
+        if (obj && len) {
+                /* directory is already splitted. calculate mds */
+                mds = raw_name2idx(obj->objcount, (char *) name, len);
+                rpfid = obj->objs[mds].fid;
+                lmv_put_obj(obj);
+        }
+
+        rc = md_intent_lock(lmv->tgts[mds].exp, uctxt, &rpfid, name,
+                            len, lmm, lmmsize, NULL, it, flags, reqp,
+                            cb_blocking);
+        if (rc > 0) {
+                /* very interesting. it seems object is still valid
+                 * but for some reason llite calls lookup, not revalidate */
+                CWARN("lookup for %lu/%lu/%lu and data should be uptodate\n",
+                       (unsigned long) rpfid.mds,
+                       (unsigned long) rpfid.id,
+                       (unsigned long) rpfid.generation);
+                LASSERT(*reqp == NULL);
+                RETURN(rc);
+        }
+
+        if (rc == 0 && *reqp == NULL) {
+                /* once again, we're asked for lookup, not revalidate */
+                CWARN("lookup for %lu/%lu/%lu and data should be uptodate\n",
+                       (unsigned long) rpfid.mds,
+                       (unsigned long) rpfid.id,
+                       (unsigned long) rpfid.generation);
+                RETURN(rc);
+        }
+       
+        if (rc == -ESTALE) {
+                /* directory got splitted since last update. this shouldn't
+                 * be becasue splitting causes lock revocation, so revalidate
+                 * had to fail and lookup on dir had to return mea */
+                CWARN("we haven't knew about directory splitting!\n");
+                LASSERT(obj == NULL);
+                rc = lmv_create_obj_from_attrs(exp, &rpfid, NULL);
+                if (rc)
+                        RETURN(rc);
+                goto repeat;
+        }
+
+        if (rc < 0)
+                RETURN(rc);
+
+        /* okay, MDS has returned success. probably name has been
+         * resolved in remote inode */
+        rc = lmv_handle_remote_inode(exp, uctxt, lmm, lmmsize, it, flags,
+                                     reqp, cb_blocking);
+
+        if (rc == 0 && (mea = is_body_of_splitted_dir(*reqp, 1))) {
+                /* wow! this is splitted dir, we'd like to handle it */
+                body = lustre_msg_buf((*reqp)->rq_repmsg, 1, sizeof(*body));
+                LASSERT(body != NULL);
+                obj = lmv_grab_obj(obd, &body->fid1, 0);
+                if (!obj)
+                        rc = lmv_create_obj_from_attrs(exp, &body->fid1, mea);
+                lmv_put_obj(obj);
+        }
+
+        RETURN(rc);
+}
+
+int lmv_intent_lock(struct obd_export *exp, struct ll_uctxt *uctxt,
+                struct ll_fid *pfid, const char *name, int len,
+                void *lmm, int lmmsize, struct ll_fid *cfid,
+                struct lookup_intent *it, int flags,
+                struct ptlrpc_request **reqp,
+                ldlm_blocking_callback cb_blocking)
+{
+        struct obd_device *obd = exp->exp_obd;
+        int rc = 0;
+        ENTRY;
+
+        LASSERT(it);
+        LASSERT(pfid);
+
+        CDEBUG(D_OTHER, "INTENT LOCK '%s' for '%*s' on %lu/%lu -> %u\n",
+                        LL_IT2STR(it), len, name, (unsigned long) pfid->id,
+                        (unsigned long) pfid->generation, pfid->mds);
+
+        lmv_connect(obd);
+        if (it->it_op == IT_LOOKUP)
+                rc = lmv_intent_lookup(exp, uctxt, pfid, name, len, lmm,
+                                       lmmsize, cfid, it, flags, reqp,
+                                       cb_blocking);
+        else if (it->it_op & IT_OPEN)
+                rc = lmv_intent_open(exp, uctxt, pfid, name, len, lmm,
+                                     lmmsize, cfid, it, flags, reqp,
+                                     cb_blocking);
+        else if (it->it_op == IT_GETATTR)
+                rc = lmv_intent_getattr(exp, uctxt, pfid, name, len, lmm,
+                                        lmmsize, cfid, it, flags, reqp,
+                                        cb_blocking);
+        else
+                LBUG();
+        RETURN(rc);
+}
+
+int lmv_revalidate_slaves(struct obd_export *exp, struct ptlrpc_request **reqp,
+                          struct ll_fid *mfid, struct lookup_intent *oit,
+                          int master_valid, ldlm_blocking_callback cb_blocking)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct ptlrpc_request *mreq = *reqp;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        struct lustre_handle master_lockh;
+        unsigned long size = 0;
+        struct ldlm_lock *lock;
+        struct mds_body *body;
+        struct ll_uctxt uctxt;
+        struct lmv_obj *obj;
+        int master_lock_mode;
+        int i, rc = 0;
+        ENTRY;
+
+        /* we have to loop over the subobjects, check validity and update
+         * them from MDSs if needed. it's very useful that we need not to
+         * update all the fields. say, common fields (that are equal on 
+         * all the subojects need not to be update, another fields (i_size,
+         * for example) are cached all the time */
+        obj = lmv_grab_obj(obd, mfid, 0);
+        LASSERT(obj);
+
+        master_lock_mode = 0;
+        uctxt.gid1 = 0;
+        uctxt.gid2 = 0;
+        for (i = 0; i < obj->objcount; i++) {
+                struct ll_fid fid = obj->objs[i].fid;
+                struct lustre_handle *lockh = NULL;
+                struct ptlrpc_request *req = NULL;
+                ldlm_blocking_callback cb;
+                struct lookup_intent it;
+                int master = 0;
+
+                CDEBUG(D_OTHER, "revalidate subobj %lu/%lu/%lu\n",
+                       (unsigned long) fid.mds,
+                       (unsigned long) fid.id,
+                       (unsigned long) fid.generation);
+
+                memset(&it, 0, sizeof(it));
+                it.it_op = IT_GETATTR;
+                cb = lmv_dirobj_blocking_ast;
+
+                if (fid_equal(&fid, &obj->fid)) {
+                        if (master_valid) {
+                                /* lmv_intent_getattr() already checked
+                                 * validness and took the lock */
+                                if (mreq) {
+                                        /* it even got the reply
+                                         * refresh attrs from that reply */
+                                        body = lustre_msg_buf(mreq->rq_repmsg,
+                                                              1,sizeof(*body));
+                                        LASSERT(body != NULL);
+                                        goto update; 
+                                }
+                                /* take already cached attrs into account */
+                                CDEBUG(D_OTHER,
+                                       "master is locked and cached\n");
+                                goto release_lock;
+                        }
+                        master = 1;
+                        cb = cb_blocking;
+                }
+
+                /* is obj valid? */
+                rc = md_intent_lock(lmv->tgts[fid.mds].exp, &uctxt, &fid,
+                                    NULL, 0, NULL, 0, &fid, &it, 0, &req, cb);
+                lockh = (struct lustre_handle *) &it.d.lustre.it_lock_handle;
+                if (rc > 0) {
+                        /* nice, this slave is valid */
+                        LASSERT(req == NULL);
+                        CDEBUG(D_OTHER, "cached\n");
+                        goto release_lock;
+                }
+
+                if (rc < 0) {
+                        /* error during revalidation */
+                        GOTO(cleanup, rc);
+                }
+
+                /* rc == 0, this means we have no such a lock and can't
+                 * think obj is still valid. lookup it again */
+                LASSERT(req == NULL);
+                req = NULL;
+                memset(&it, 0, sizeof(it));
+                it.it_op = IT_GETATTR;
+                rc = md_intent_lock(lmv->tgts[fid.mds].exp, &uctxt, &fid,
+                                    NULL, 0, NULL, 0, NULL, &it, 0, &req, cb);
+                lockh = (struct lustre_handle *) &it.d.lustre.it_lock_handle;
+                LASSERT(rc <= 0);
+                if (rc < 0) {
+                        /* error during lookup */
+                        GOTO(cleanup, rc);
+                }
+              
+                if (master) {
+                        LASSERT(master_valid == 0);
+                        /* save lock on master to be returned to the caller */
+                        CDEBUG(D_OTHER, "no lock on master yet\n");
+                        memcpy(&master_lockh, lockh, sizeof(master_lockh));
+                        master_lock_mode = it.d.lustre.it_lock_mode;
+                        it.d.lustre.it_lock_mode = 0;
+                } else {
+                        /* this is slave. we want to control it */
+                        lock = ldlm_handle2lock(lockh);
+                        LASSERT(lock);
+                        lock->l_ast_data = obj;
+                        atomic_inc(&obj->count);
+                        LDLM_LOCK_PUT(lock);
+                }
+
+                if (*reqp == NULL) {
+                        /* this is first reply, we'll use it to return
+                         * updated data back to the caller */
+                        LASSERT(req);
+                        ptlrpc_request_addref(req);
+                        *reqp = req;
+
+                }
+
+                body = lustre_msg_buf(req->rq_repmsg, 1, sizeof(*body));
+                LASSERT(body);
+                
+update:
+                obj->objs[i].size = body->size;
+                CDEBUG(D_OTHER, "fresh: %lu\n",
+                       (unsigned long) obj->objs[i].size);
+
+                if (req)
+                        ptlrpc_req_finished(req);
+release_lock:
+                size += obj->objs[i].size;
+                if (it.d.lustre.it_lock_mode)
+                        ldlm_lock_decref(lockh, it.d.lustre.it_lock_mode);
+        }
+
+        if (*reqp) {
+                /* some attrs got refreshed, we have reply and it's time
+                 * to put fresh attrs to it */
+                CDEBUG(D_OTHER, "return refreshed attrs: size = %lu\n",
+                       (unsigned long) size);
+                body = lustre_msg_buf((*reqp)->rq_repmsg, 1, sizeof(*body));
+                LASSERT(body);
+                /* FIXME: what about another attributes? */
+                body->size = size;
+                if (mreq == NULL) {
+                        /* very important to maintain lli->mds the same
+                         * because of revalidation. mreq == NULL means
+                         * that caller has no reply and the only attr
+                         * we can return is size */
+                        body->valid = OBD_MD_FLSIZE;
+                        body->mds = obj->fid.mds;
+                }
+                if (master_valid == 0) {
+                        memcpy(&oit->d.lustre.it_lock_handle,
+                               &master_lockh, sizeof(master_lockh));
+                        oit->d.lustre.it_lock_mode = master_lock_mode;
+                }
+                rc = 0;
+        } else {
+                /* it seems all the attrs are fresh and we did no request */
+                CDEBUG(D_OTHER, "all the attrs were fresh\n");
+                if (master_valid == 0)
+                        oit->d.lustre.it_lock_mode = master_lock_mode;
+                rc = 1;
+        }
+cleanup:
+        RETURN(rc);
+}
+
diff --git a/lustre/lmv/lmv_internal.h b/lustre/lmv/lmv_internal.h
new file mode 100644
index 0000000..e531834
--- /dev/null
+++ b/lustre/lmv/lmv_internal.h
@@ -0,0 +1,88 @@
+#ifndef _LMV_INTERNAL_H_
+#define _LMV_INTERNAL_H_
+
+#define LL_IT2STR(it) ((it) ? ldlm_it2str((it)->it_op) : "0")
+#define MEA_SIZE_LMV(lmv)       \
+        ((lmv)->count * sizeof(struct ll_fid) + sizeof(struct mea))
+        
+struct lmv_inode {
+        struct ll_fid   fid;            /* fid of dirobj */
+        unsigned long   size;
+        int             flags;
+};
+
+struct lmv_obj {
+        struct list_head        list;
+        atomic_t                count;
+        struct ll_fid           fid;            /* master fid of dir */
+        void                    *update;        /* bitmap of status (uptodate) */
+        int                     objcount;
+        struct lmv_inode        *objs;          /* array of dirobjs */
+        struct obd_device       *obd;           /* pointer to LMV itself */
+};
+
+int lmv_dirobj_blocking_ast(struct ldlm_lock *,
+                            struct ldlm_lock_desc *, void *, int);
+struct lmv_obj *lmv_grab_obj(struct obd_device *obd,
+                             struct ll_fid *fid, int create);
+void lmv_put_obj(struct lmv_obj *obj);
+
+int lmv_intent_lock(struct obd_export *, struct ll_uctxt *,
+                    struct ll_fid *, const char *, int, void *, int,
+		    struct ll_fid *, struct lookup_intent *, int,
+		    struct ptlrpc_request **, ldlm_blocking_callback);
+int lmv_intent_lookup(struct obd_export *, struct ll_uctxt *,
+                      struct ll_fid *, const char *, int, void *, int,
+		      struct ll_fid *, struct lookup_intent *, int,
+		      struct ptlrpc_request **, ldlm_blocking_callback);
+int lmv_intent_getattr(struct obd_export *, struct ll_uctxt *,
+                       struct ll_fid *, const char *, int, void *, int,
+		       struct ll_fid *, struct lookup_intent *, int,
+		       struct ptlrpc_request **, ldlm_blocking_callback);
+int lmv_intent_open(struct obd_export *, struct ll_uctxt *,
+                    struct ll_fid *, const char *, int, void *, int,
+		    struct ll_fid *, struct lookup_intent *, int,
+		    struct ptlrpc_request **, ldlm_blocking_callback);
+int lmv_create_obj_from_attrs(struct obd_export *, struct ll_fid *,
+				struct mea *);
+int lmv_connect(struct obd_device *);
+int lmv_revalidate_slaves(struct obd_export *, struct ptlrpc_request **,
+                          struct ll_fid *, struct lookup_intent *, int,
+			  ldlm_blocking_callback cb_blocking);
+void lmv_cleanup_objs(struct obd_device *obd);
+
+static inline struct mea * 
+is_body_of_splitted_dir(struct ptlrpc_request *req, int offset)
+{
+	struct mds_body *body;
+	struct mea *mea;
+
+	LASSERT(req);
+
+        body = lustre_msg_buf(req->rq_repmsg, offset, sizeof(*body));
+
+	if (!body || !S_ISDIR(body->mode) || !body->eadatasize)
+		return NULL;
+
+        mea = lustre_msg_buf(req->rq_repmsg, offset + 1, body->eadatasize);
+	LASSERT(mea);
+
+	if (mea->mea_count == 0)
+		return NULL;
+	
+	return mea;
+}
+
+static inline int fid_equal(struct ll_fid *fid1, struct ll_fid *fid2)
+{
+        if (fid1->mds != fid2->mds)
+                return 0;
+        if (fid1->id != fid2->id)
+                return 0;
+        if (fid1->generation != fid2->generation)
+                return 0;
+        return 1;
+}
+
+#endif
+
diff --git a/lustre/lmv/lmv_obd.c b/lustre/lmv/lmv_obd.c
new file mode 100644
index 0000000..89bd1c2
--- /dev/null
+++ b/lustre/lmv/lmv_obd.c
@@ -0,0 +1,1206 @@
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
+ *
+ * Copyright (C) 2002, 2003 Cluster File Systems, Inc.
+ *
+ *   This file is part of Lustre, http://www.lustre.org.
+ *
+ *   Lustre is free software; you can redistribute it and/or
+ *   modify it under the terms of version 2 of the GNU General Public
+ *   License as published by the Free Software Foundation.
+ *
+ *   Lustre is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Lustre; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef EXPORT_SYMTAB
+# define EXPORT_SYMTAB
+#endif
+#define DEBUG_SUBSYSTEM S_LMV
+#ifdef __KERNEL__
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/pagemap.h>
+#include <asm/div64.h>
+#else
+#include <liblustre.h>
+#endif
+
+#include <linux/obd_support.h>
+#include <linux/lustre_lib.h>
+#include <linux/lustre_net.h>
+#include <linux/lustre_idl.h>
+#include <linux/lustre_dlm.h>
+#include <linux/lustre_mds.h>
+#include <linux/obd_class.h>
+#include <linux/obd_ost.h>
+#include <linux/seq_file.h>
+#include <linux/lprocfs_status.h>
+#include <linux/lustre_fsfilt.h>
+#include <linux/obd_lmv.h>
+#include "lmv_internal.h"
+
+int lmv_attach(struct obd_device *dev, obd_count len, void *data)
+{
+        struct lprocfs_static_vars lvars;
+        struct proc_dir_entry *entry;
+        int rc;
+        ENTRY;
+
+        lprocfs_init_vars(lmv, &lvars);
+        rc = lprocfs_obd_attach(dev, lvars.obd_vars);
+        if (rc)
+        	RETURN (rc);
+
+        entry = create_proc_entry("target_obd", 0444, dev->obd_proc_entry);
+        if (entry == NULL)
+                RETURN(-ENOMEM);
+        /* entry->proc_fops = &lmv_proc_target_fops; */
+        entry->data = dev;
+
+        RETURN (rc);
+}
+
+int lmv_detach(struct obd_device *dev)
+{
+        return lprocfs_obd_detach(dev);
+}
+
+static int lmv_connect_fake(struct lustre_handle *conn,
+                            struct obd_device *obd,
+                            struct obd_uuid *cluuid)
+{
+        struct lmv_obd *lmv = &obd->u.lmv;
+        int rc;
+        ENTRY;
+
+        rc = class_connect(conn, obd, cluuid);
+        if (rc) {
+                CERROR("class_connection() returned %d\n", rc);
+                RETURN(rc);
+        }
+
+        lmv->exp = class_conn2export(conn);
+        LASSERT(lmv->exp != NULL);
+
+        lmv->cluuid = *cluuid;
+        lmv->connected = 0;
+
+        RETURN(0);
+}
+
+int lmv_connect(struct obd_device *obd)
+{
+        struct lmv_obd *lmv = &obd->u.lmv;
+        struct obd_uuid *cluuid;
+        struct lmv_tgt_desc *tgts;
+        struct obd_export *exp;
+        int rc, i;
+        ENTRY;
+
+        if (lmv->connected)
+                RETURN(0);
+      
+        lmv->connected = 1;
+        cluuid = &lmv->cluuid;
+        exp = lmv->exp;
+        CDEBUG(D_OTHER, "time to connect %s to %s\n",
+                        cluuid->uuid, obd->obd_name);
+
+        /* We don't want to actually do the underlying connections more than
+         * once, so keep track. */
+        lmv->refcount++;
+        if (lmv->refcount > 1) {
+                class_export_put(exp);
+                RETURN(0);
+        }
+
+        for (i = 0, tgts = lmv->tgts; i < lmv->count; i++, tgts++) {
+                struct obd_device *tgt_obd;
+                struct obd_uuid lmv_osc_uuid = { "LMV_OSC_UUID" };
+                struct lustre_handle conn = {0, };
+
+                LASSERT(tgts != NULL);
+
+                tgt_obd = class_find_client_obd(&tgts->uuid, LUSTRE_MDC_NAME, 
+                                                &obd->obd_uuid);
+                if (!tgt_obd) {
+                        CERROR("Target %s not attached\n", tgts->uuid.uuid);
+                        GOTO(out_disc, rc = -EINVAL);
+                }
+
+                /* for MDS: don't connect to yourself */
+                if (obd_uuid_equals(&tgts->uuid, cluuid)) {
+                        CDEBUG(D_OTHER, "don't connect back to %s\n",
+                               cluuid->uuid);
+                        tgts->exp = NULL;
+                        continue;
+                }
+
+                CDEBUG(D_OTHER, "connect to %s(%s) - %s, %s FOR %s\n",
+                        tgt_obd->obd_name, tgt_obd->obd_uuid.uuid,
+                        tgts->uuid.uuid, obd->obd_uuid.uuid,
+                        cluuid->uuid);
+
+                if (!tgt_obd->obd_set_up) {
+                        CERROR("Target %s not set up\n", tgts->uuid.uuid);
+                        GOTO(out_disc, rc = -EINVAL);
+                }
+                
+                rc = obd_connect(&conn, tgt_obd, &lmv_osc_uuid);
+                if (rc) {
+                        CERROR("Target %s connect error %d\n",
+                                tgts->uuid.uuid, rc);
+                        GOTO(out_disc, rc);
+                }
+                tgts->exp = class_conn2export(&conn);
+
+                obd_init_ea_size(tgts->exp, lmv->max_easize,
+                                        lmv->max_cookiesize);
+                
+                rc = obd_register_observer(tgt_obd, obd);
+                if (rc) {
+                        CERROR("Target %s register_observer error %d\n",
+                               tgts->uuid.uuid, rc);
+                        obd_disconnect(tgts->exp, 0);
+                        GOTO(out_disc, rc);
+                }
+
+                CDEBUG(D_OTHER, "connected to %s(%s) successfully (%d)\n",
+                        tgt_obd->obd_name, tgt_obd->obd_uuid.uuid,
+                        atomic_read(&obd->obd_refcount));
+        }
+
+        class_export_put(exp);
+        RETURN (0);
+
+ out_disc:
+        /* FIXME: cleanup here */
+        class_disconnect(exp, 0);
+        RETURN (rc);
+}
+
+static int lmv_disconnect(struct obd_export *exp, int flags)
+{
+        struct obd_device *obd = class_exp2obd(exp);
+        struct lmv_obd *lmv = &obd->u.lmv;
+        int rc, i;
+        ENTRY;
+
+        if (!lmv->tgts)
+                goto out_local;
+
+        /* Only disconnect the underlying layers on the final disconnect. */
+        lmv->refcount--;
+        if (lmv->refcount != 0)
+                goto out_local;
+
+        for (i = 0; i < lmv->count; i++) {
+                if (lmv->tgts[i].exp == NULL)
+                        continue;
+
+                if (obd->obd_no_recov) {
+                        /* Pass it on to our clients.
+                         * XXX This should be an argument to disconnect,
+                         * XXX not a back-door flag on the OBD.  Ah well.
+                         */
+                        struct obd_device *mdc_obd;
+                        mdc_obd = class_exp2obd(lmv->tgts[i].exp);
+                        if (mdc_obd)
+                                mdc_obd->obd_no_recov = 1;
+                }
+
+                CDEBUG(D_OTHER, "disconnected from %s(%s) successfully\n",
+                        lmv->tgts[i].exp->exp_obd->obd_name,
+                        lmv->tgts[i].exp->exp_obd->obd_uuid.uuid);
+
+                obd_register_observer(lmv->tgts[i].exp->exp_obd, NULL);
+
+                rc = obd_disconnect(lmv->tgts[i].exp, flags);
+                lmv->tgts[i].exp = NULL;
+        }
+
+ out_local:
+        /* FIXME: cleanup here */
+        if (!lmv->connected)
+                class_export_put(exp);
+        rc = class_disconnect(exp, 0);
+        RETURN(rc);
+}
+
+static int lmv_setup(struct obd_device *obd, obd_count len, void *buf)
+{
+        struct lustre_cfg *lcfg = buf;
+        struct lmv_desc *desc;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        struct obd_uuid *uuids;
+        struct lmv_tgt_desc *tgts;
+        int i;
+        int count;
+        int rc = 0;
+        ENTRY;
+
+        if (lcfg->lcfg_inllen1 < 1) {
+                CERROR("LMV setup requires a descriptor\n");
+                RETURN(-EINVAL);
+        }
+
+        if (lcfg->lcfg_inllen2 < 1) {
+                CERROR("LMV setup requires an OST UUID list\n");
+                RETURN(-EINVAL);
+        }
+
+        desc = (struct lmv_desc *)lcfg->lcfg_inlbuf1;
+        if (sizeof(*desc) > lcfg->lcfg_inllen1) {
+                CERROR("descriptor size wrong: %d > %d\n",
+                       (int)sizeof(*desc), lcfg->lcfg_inllen1);
+                RETURN(-EINVAL);
+        }
+
+        count = desc->ld_count;
+        uuids = (struct obd_uuid *)lcfg->lcfg_inlbuf2;
+        if (sizeof(*uuids) * count != lcfg->lcfg_inllen2) {
+                CERROR("UUID array size wrong: %u * %u != %u\n",
+                       sizeof(*uuids), count, lcfg->lcfg_inllen2);
+                RETURN(-EINVAL);
+        }
+
+        lmv->bufsize = sizeof(struct lmv_tgt_desc) * count;
+        OBD_ALLOC(lmv->tgts, lmv->bufsize);
+        if (lmv->tgts == NULL) {
+                CERROR("Out of memory\n");
+                RETURN(-EINVAL);
+        }
+
+        for (i = 0, tgts = lmv->tgts; i < count; i++, tgts++) {
+                tgts->uuid = uuids[i];
+                lmv->count++;
+        }
+
+        lmv->max_easize = sizeof(struct ll_fid) * lmv->count
+                                        + sizeof(struct mea);
+        lmv->max_cookiesize = 0;
+
+        RETURN(rc);
+}
+
+static int lmv_statfs(struct obd_device *obd, struct obd_statfs *osfs,
+                      unsigned long max_age)
+{
+        struct lmv_obd *lmv = &obd->u.lmv;
+        struct obd_statfs temp;
+        int rc = 0, i;
+        ENTRY;
+        lmv_connect(obd);
+        for (i = 0; i < lmv->count; i++) {
+                rc = obd_statfs(lmv->tgts[i].exp->exp_obd, &temp, max_age);
+                if (rc) {
+                        CERROR("can't stat MDS #%d (%s)\n", i,
+                               lmv->tgts[i].exp->exp_obd->obd_name);
+                        RETURN(rc);
+                }
+                if (i == 0) {
+                        memcpy(osfs, &temp, sizeof(temp));
+                } else {
+                        osfs->os_bavail += temp.os_bavail;
+                        osfs->os_blocks += temp.os_blocks;
+                        osfs->os_ffree += temp.os_ffree;
+                        osfs->os_files += temp.os_files;
+                }
+        }
+        RETURN(rc);
+}
+
+static int lmv_cleanup(struct obd_device *obd, int flags) 
+{
+        struct lmv_obd *lmv = &obd->u.lmv;
+        ENTRY;
+        lmv_cleanup_objs(obd);
+        OBD_FREE(lmv->tgts, lmv->bufsize);
+        RETURN(0);
+}
+
+static int lmv_getstatus(struct obd_export *exp, struct ll_fid *fid)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        int rc;
+        ENTRY;
+        lmv_connect(obd);
+        rc = md_getstatus(lmv->tgts[0].exp, fid);
+        fid->mds = 0;
+        RETURN(rc);
+}
+
+static int lmv_getattr(struct obd_export *exp, struct ll_fid *fid,
+                unsigned long valid, unsigned int ea_size,
+                struct ptlrpc_request **request)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        int rc, i = fid->mds;
+        struct lmv_obj *obj;
+        ENTRY;
+        lmv_connect(obd);
+        obj = lmv_grab_obj(obd, fid, 0);
+        CDEBUG(D_OTHER, "GETATTR for %lu/%lu/%lu %s\n",
+               (unsigned long) fid->mds,
+               (unsigned long) fid->id,
+               (unsigned long) fid->generation,
+               obj ? "(splitted)" : "");
+
+        LASSERT(fid->mds < lmv->count);
+        rc = md_getattr(lmv->tgts[i].exp, fid,
+                             valid, ea_size, request);
+        if (rc == 0 && obj) {
+                /* we have to loop over dirobjs here and gather attrs
+                 * for all the slaves */
+#warning "attrs gathering here"
+        }
+        lmv_put_obj(obj);
+        RETURN(rc);
+}
+
+static int lmv_change_cbdata(struct obd_export *exp,
+                                 struct ll_fid *fid, 
+                                 ldlm_iterator_t it, void *data)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        int rc = 0;
+        ENTRY;
+        lmv_connect(obd);
+        CDEBUG(D_OTHER, "CBDATA for %lu/%lu/%lu\n",
+               (unsigned long) fid->mds,
+               (unsigned long) fid->id,
+               (unsigned long) fid->generation);
+        LASSERT(fid->mds < lmv->count);
+        rc = md_change_cbdata(lmv->tgts[fid->mds].exp, fid, it, data);
+        RETURN(rc);
+}
+
+static int lmv_change_cbdata_name(struct obd_export *exp, struct ll_fid *pfid,
+                                  char *name, int len, struct ll_fid *cfid,
+                                  ldlm_iterator_t it, void *data)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        struct lmv_obj *obj;
+        int rc = 0, mds;
+        ENTRY;
+        lmv_connect(obd);
+        LASSERT(pfid->mds < lmv->count);
+        LASSERT(cfid->mds < lmv->count);
+        CDEBUG(D_OTHER, "CBDATA for %lu/%lu/%lu:%*s -> %lu/%lu/%lu\n",
+               (unsigned long) pfid->mds, (unsigned long) pfid->id,
+               (unsigned long) pfid->generation, len, name,
+               (unsigned long) cfid->mds, (unsigned long) cfid->id,
+               (unsigned long) cfid->generation);
+
+        /* this is default mds for directory name belongs to */
+        mds = pfid->mds;
+        obj = lmv_grab_obj(obd, pfid, 0);
+        if (obj) {
+                /* directory is splitted. look for right mds for this name */
+                mds = raw_name2idx(obj->objcount, name, len);
+                lmv_put_obj(obj);
+        }
+        rc = md_change_cbdata(lmv->tgts[mds].exp, cfid, it, data);
+        RETURN(rc);
+}
+
+static int lmv_valid_attrs(struct obd_export *exp, struct ll_fid *fid) 
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        int rc = 0;
+        ENTRY;
+        lmv_connect(obd);
+        CDEBUG(D_OTHER, "validate %lu/%lu/%lu\n",
+               (unsigned long) fid->mds,
+               (unsigned long) fid->id,
+               (unsigned long) fid->generation);
+        LASSERT(fid->mds < lmv->count);
+        rc = md_valid_attrs(lmv->tgts[fid->mds].exp, fid);
+        RETURN(rc);
+}
+
+int lmv_close(struct obd_export *exp, struct obdo *obdo,
+                  struct obd_client_handle *och,
+                  struct ptlrpc_request **request)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        int rc, i = obdo->o_mds;
+        ENTRY;
+        lmv_connect(obd);
+        LASSERT(i < lmv->count);
+        CDEBUG(D_OTHER, "CLOSE %lu/%lu/%lu\n", (unsigned long) obdo->o_mds,
+               (unsigned long) obdo->o_id, (unsigned long) obdo->o_generation);
+        rc = md_close(lmv->tgts[i].exp, obdo, och, request);
+        RETURN(rc);
+}
+
+int lmv_create(struct obd_export *exp, struct mdc_op_data *op_data,
+                   const void *data, int datalen, int mode, __u32 uid,
+                   __u32 gid, __u64 rdev, struct ptlrpc_request **request)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        struct mea *mea = op_data->mea1;
+        struct mds_body *mds_body;
+        int rc, i, free_mea = 0;
+        ENTRY;
+        lmv_connect(obd);
+        /* TODO: where to create new directories?
+         * current design don't support directory on a slave MDS,
+         * but we lookup by name may forward any request in slave
+         */
+repeat:
+        i = mea_name2idx(mea, (char *) op_data->name, op_data->namelen);
+        if (mea)
+                op_data->fid1 = mea->mea_fids[i];
+
+        CDEBUG(D_OTHER, "CREATE '%*s' on %lu/%lu/%lu (mea 0x%p)\n",
+                        op_data->namelen, op_data->name,
+                        (unsigned long) op_data->fid1.mds,
+                        (unsigned long) op_data->fid1.id,
+                        (unsigned long) op_data->fid1.generation, mea);
+        rc = md_create(lmv->tgts[i].exp, op_data, data, datalen,
+                            mode, uid, gid, rdev, request);
+        if (rc == 0) {
+                if (*request == NULL)
+                     RETURN(rc);
+                mds_body = lustre_msg_buf((*request)->rq_repmsg, 0,
+                                          sizeof(*mds_body));
+                LASSERT(mds_body != NULL);
+                CDEBUG(D_OTHER, "created. id = %lu, generation = %lu, mds = %d\n",
+                       (unsigned long) mds_body->fid1.id,
+                       (unsigned long) mds_body->fid1.generation, i);
+                LASSERT(mds_body->mds == i);
+        } else if (rc == -ESTALE) {
+                struct ptlrpc_request *req = NULL;
+                struct lustre_md md;
+                int mealen;
+                
+                CDEBUG(D_OTHER, "it seems MDS splitted dir\n");
+                LASSERT(mea == NULL);
+
+                mealen = sizeof(struct ll_fid)*lmv->count + sizeof(struct mea);
+                /* time to update mea of parent fid */
+                i = op_data->fid1.mds;
+                rc = md_getattr(lmv->tgts[i].exp, &op_data->fid1,
+                                        OBD_MD_FLEASIZE, mealen, &req);
+                LASSERT(rc == 0);
+                md.mea = NULL;
+                rc = mdc_req2lustre_md(req, 0, NULL, exp, &md);
+                LASSERT(rc == 0);
+                LASSERT(md.mea != NULL);
+                mea = md.mea;
+                ptlrpc_req_finished(req);
+                free_mea = 1;
+
+                goto repeat;
+        }
+        if (free_mea)
+                obd_free_memmd(exp, (struct lov_stripe_md**) &mea);
+        RETURN(rc);
+}
+
+int lmv_done_writing(struct obd_export *exp, struct obdo *obdo)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        int rc;
+        ENTRY;
+        lmv_connect(obd);
+        /* FIXME: choose right MDC here */
+        rc = md_done_writing(lmv->tgts[0].exp, obdo);
+        RETURN(rc);
+}
+
+int lmv_enqueue(struct obd_export *exp, int lock_type,
+                    struct lookup_intent *it, int lock_mode,
+                    struct mdc_op_data *data, struct lustre_handle *lockh,
+                    void *lmm, int lmmsize,
+                    ldlm_completion_callback cb_completion,
+                    ldlm_blocking_callback cb_blocking, void *cb_data)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        struct lmv_obj *obj;
+        int rc, mds;
+        ENTRY;
+        lmv_connect(obd);
+        if (data->namelen) {
+                obj = lmv_grab_obj(obd, &data->fid1, 0);
+                if (obj) {
+                        /* directory is splitted. look for
+                         * right mds for this name */
+                        mds = raw_name2idx(obj->objcount, data->name,
+                                                data->namelen);
+                        data->fid1 = obj->objs[mds].fid;
+                        lmv_put_obj(obj);
+                }
+        }
+        CDEBUG(D_OTHER, "ENQUEUE '%s' on %lu/%lu\n",
+               LL_IT2STR(it), (unsigned long) data->fid1.id,
+               (unsigned long) data->fid1.generation);
+        rc = md_enqueue(lmv->tgts[data->fid1.mds].exp, lock_type, it,
+                        lock_mode, data, lockh, lmm, lmmsize, cb_completion,
+                        cb_blocking, cb_data);
+
+        RETURN(rc);
+}
+
+int lmv_getattr_name(struct obd_export *exp, struct ll_fid *fid,
+                         char *filename, int namelen, unsigned long valid,
+                         unsigned int ea_size, struct ptlrpc_request **request)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        struct ll_fid rfid = *fid;
+        int rc, mds = fid->mds;
+        struct lmv_obj *obj;
+        ENTRY;
+        lmv_connect(obd);
+        CDEBUG(D_OTHER, "getattr_name for %*s on %lu/%lu/%lu\n",
+               namelen - 1, filename, (unsigned long) fid->mds,
+               (unsigned long) fid->id, (unsigned long) fid->generation);
+        obj = lmv_grab_obj(obd, fid, 0);
+        if (obj) {
+                /* directory is splitted. look for right mds for this name */
+                mds = raw_name2idx(obj->objcount, filename, namelen - 1);
+                rfid = obj->objs[mds].fid;
+                lmv_put_obj(obj);
+        }
+        rc = md_getattr_name(lmv->tgts[mds].exp, &rfid, filename, namelen,
+                                  valid, ea_size, request);
+        RETURN(rc);
+}
+
+
+/*
+ * llite passes fid of an target inode in data->fid1 and
+ * fid of directory in data->fid2
+ */
+int lmv_link(struct obd_export *exp, struct mdc_op_data *data,
+             struct ptlrpc_request **request)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        struct mea *mea = data->mea2;
+        int rc, i;
+        ENTRY;
+        lmv_connect(obd);
+        if (data->namelen != 0) {
+                /* usual link request */
+                i = mea_name2idx(mea, (char *) data->name, data->namelen);
+                if (mea)
+                        data->fid2 = mea->mea_fids[i];
+                CDEBUG(D_OTHER,"link %u/%u/%u:%*s to %u/%u/%u mds %d mea %p\n",
+                       (unsigned) data->fid2.mds, (unsigned) data->fid2.id,
+                       (unsigned) data->fid2.generation, data->namelen,
+                       data->name, (unsigned) data->fid1.mds,
+                       (unsigned) data->fid1.id,
+                       (unsigned) data->fid1.generation, i, mea);
+        } else {
+                /* request from MDS to acquire i_links for inode by fid1 */
+                i = data->fid1.mds;
+                CDEBUG(D_OTHER, "inc i_nlinks for %u/%u/%u\n",
+                       (unsigned) data->fid1.mds, (unsigned) data->fid1.id,
+                       (unsigned) data->fid1.generation);
+        }
+                        
+        rc = md_link(lmv->tgts[i].exp, data, request);
+        RETURN(rc);
+}
+
+int lmv_rename(struct obd_export *exp, struct mdc_op_data *data,
+               const char *old, int oldlen, const char *new, int newlen,
+               struct ptlrpc_request **request)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        struct lmv_obj *obj;
+        int rc, mds;
+        ENTRY;
+
+        CDEBUG(D_OTHER, "rename %*s in %lu/%lu/%lu to %*s in %lu/%lu/%lu\n",
+               oldlen, old, (unsigned long) data->fid1.mds,
+               (unsigned long) data->fid1.id,
+               (unsigned long) data->fid1.generation,
+               newlen, new, (unsigned long) data->fid2.mds,
+               (unsigned long) data->fid2.id,
+               (unsigned long) data->fid2.generation);
+
+        lmv_connect(obd);
+
+        if (oldlen == 0) {
+                /* MDS with old dir entry is asking another MDS
+                 * to create name there */
+                CDEBUG(D_OTHER,
+                       "create %*s(%d/%d) in %lu/%lu/%lu pointing to %lu/%lu/%lu\n",
+                       newlen, new, oldlen, newlen,
+                       (unsigned long) data->fid2.mds,
+                       (unsigned long) data->fid2.id,
+                       (unsigned long) data->fid2.generation,
+                       (unsigned long) data->fid1.mds,
+                       (unsigned long) data->fid1.id,
+                       (unsigned long) data->fid1.generation);
+                mds = data->fid2.mds;
+                goto request;
+        }
+
+        obj = lmv_grab_obj(obd, &data->fid1, 0);
+        if (obj) {
+                /* directory is already splitted, so we have to forward
+                 * request to the right MDS */
+                mds = raw_name2idx(obj->objcount, old, oldlen);
+                data->fid1 = obj->objs[mds].fid;
+                CDEBUG(D_OTHER, "forward to MDS #%u (%lu/%lu/%lu)\n", mds,
+                       (unsigned long) obj->objs[mds].fid.mds,
+                       (unsigned long) obj->objs[mds].fid.id,
+                       (unsigned long) obj->objs[mds].fid.generation);
+        }
+        lmv_put_obj(obj);
+
+        obj = lmv_grab_obj(obd, &data->fid2, 0);
+        if (obj) {
+                /* directory is already splitted, so we have to forward
+                 * request to the right MDS */
+                mds = raw_name2idx(obj->objcount, new, newlen);
+                data->fid2 = obj->objs[mds].fid;
+                CDEBUG(D_OTHER, "forward to MDS #%u (%lu/%lu/%lu)\n", mds,
+                       (unsigned long) obj->objs[mds].fid.mds,
+                       (unsigned long) obj->objs[mds].fid.id,
+                       (unsigned long) obj->objs[mds].fid.generation);
+        }
+        lmv_put_obj(obj);
+        
+        mds = data->fid1.mds;
+
+request:
+        rc = md_rename(lmv->tgts[mds].exp, data, old, oldlen,
+                            new, newlen, request); 
+        RETURN(rc);
+}
+
+int lmv_setattr(struct obd_export *exp, struct mdc_op_data *data,
+                struct iattr *iattr, void *ea, int ealen, void *ea2, int ea2len,
+                struct ptlrpc_request **request)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        int rc = 0, i = data->fid1.mds;
+        struct ptlrpc_request *req;
+        struct mds_body *mds_body;
+        struct lmv_obj *obj;
+        ENTRY;
+        lmv_connect(obd);
+        obj = lmv_grab_obj(obd, &data->fid1, 0);
+        CDEBUG(D_OTHER, "SETATTR for %lu/%lu/%lu, valid 0x%x%s\n",
+               (unsigned long) data->fid1.mds,
+               (unsigned long) data->fid1.id,
+               (unsigned long) data->fid1.generation, iattr->ia_valid,
+               obj ? ", splitted" : "");
+        if (obj) {
+                for (i = 0; i < obj->objcount; i++) {
+                        data->fid1 = obj->objs[i].fid;
+                        rc = md_setattr(lmv->tgts[i].exp, data, iattr, ea,
+                                        ealen, ea2, ea2len, &req);
+                        LASSERT(rc == 0);
+                        if (fid_equal(&obj->fid, &obj->objs[i].fid)) {
+                                /* this is master object and this request
+                                 * should be returned back to llite */
+                                *request = req;
+                        } else {
+                                ptlrpc_req_finished(req);
+                        }
+                }
+                lmv_put_obj(obj);
+        } else {
+                LASSERT(data->fid1.mds < lmv->count);
+                rc = md_setattr(lmv->tgts[i].exp, data, iattr, ea, ealen,
+                                ea2, ea2len, request); 
+                if (rc == 0) {
+                        mds_body = lustre_msg_buf((*request)->rq_repmsg, 0,
+                                        sizeof(*mds_body));
+                        LASSERT(mds_body != NULL);
+                        LASSERT(mds_body->mds == i);
+                }
+        }
+        RETURN(rc);
+}
+
+int lmv_sync(struct obd_export *exp, struct ll_fid *fid,
+             struct ptlrpc_request **request)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        int rc;
+        ENTRY;
+        lmv_connect(obd);
+        rc = md_sync(lmv->tgts[0].exp, fid, request); 
+        RETURN(rc);
+}
+
+int lmv_dirobj_blocking_ast(struct ldlm_lock *lock,
+                            struct ldlm_lock_desc *desc, void *data, int flag)
+{
+        struct lustre_handle lockh;
+        struct lmv_obj *obj;
+        int rc;
+        ENTRY;
+
+        switch (flag) {
+        case LDLM_CB_BLOCKING:
+                ldlm_lock2handle(lock, &lockh);
+                rc = ldlm_cli_cancel(&lockh);
+                if (rc < 0) {
+                        CDEBUG(D_INODE, "ldlm_cli_cancel: %d\n", rc);
+                        RETURN(rc);
+                }
+                break;
+        case LDLM_CB_CANCELING:
+                /* time to drop cached attrs for dirobj */
+                obj = lock->l_ast_data;
+                if (!obj)
+                        break;
+
+                CDEBUG(D_OTHER, "cancel %s on %lu/%lu, master %lu/%lu/%lu\n",
+                       lock->l_resource->lr_name.name[3] == 1 ?
+                                "LOOKUP" : "UPDATE",
+                       (unsigned long) lock->l_resource->lr_name.name[0],
+                       (unsigned long) lock->l_resource->lr_name.name[1],
+                       (unsigned long) obj->fid.mds,
+                       (unsigned long) obj->fid.id,
+                       (unsigned long) obj->fid.generation);
+                break;
+        default:
+                LBUG();
+        }
+        RETURN(0);
+}
+
+int lmv_readpage(struct obd_export *exp, struct ll_fid *mdc_fid,
+                 __u64 offset, struct page *page,
+                 struct ptlrpc_request **request)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        struct ll_fid rfid = *mdc_fid;
+        struct lmv_obj *obj;
+        int rc, i;
+        ENTRY;
+        lmv_connect(obd);
+       
+        LASSERT(mdc_fid->mds < lmv->count);
+        CDEBUG(D_OTHER, "READPAGE at %llu from %lu/%lu/%lu\n",
+               offset, (unsigned long) rfid.mds,
+               (unsigned long) rfid.id,
+               (unsigned long) rfid.generation);
+
+        obj = lmv_grab_obj(obd, mdc_fid, 0);
+        if (obj) {
+                /* find dirobj containing page with requested offset */
+                /* FIXME: what about protecting cached attrs here? */
+                for (i = 0; i < obj->objcount; i++) {
+                        if (offset < obj->objs[i].size)
+                                break;
+                        offset -= obj->objs[i].size;
+                }
+                rfid = obj->objs[i].fid;
+                CDEBUG(D_OTHER, "forward to %lu/%lu/%lu with offset %lu\n",
+                       (unsigned long) rfid.mds,
+                       (unsigned long) rfid.id,
+                       (unsigned long) rfid.generation,
+                       (unsigned long) offset);
+        }
+        rc = md_readpage(lmv->tgts[rfid.mds].exp, &rfid, offset, page, request);
+      
+        lmv_put_obj(obj);
+
+#warning "we need fix for duplicate . and .. from slaves"
+
+        RETURN(rc);
+}
+
+int lmv_unlink(struct obd_export *exp, struct mdc_op_data *data,
+               struct ptlrpc_request **request)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        struct mea *mea = data->mea1;
+        int rc, i = 0;
+        ENTRY;
+        lmv_connect(obd);
+        if (data->namelen != 0) {
+                i = mea_name2idx(mea, (char *) data->name, data->namelen);
+                if (mea)
+                        data->fid1 = mea->mea_fids[i];
+                CDEBUG(D_OTHER, "unlink '%*s' in %lu/%lu/%lu -> %u\n",
+                       data->namelen, data->name,
+                       (unsigned long) data->fid1.mds,
+                       (unsigned long) data->fid1.id,
+                       (unsigned long) data->fid1.generation, i);
+        } else {
+                i = data->fid1.mds;
+                CDEBUG(D_OTHER, "drop i_nlink on %lu/%lu/%lu\n",
+                       (unsigned long) data->fid1.mds,
+                       (unsigned long) data->fid1.id,
+                       (unsigned long) data->fid1.generation);
+        }
+        rc = md_unlink(lmv->tgts[i].exp, data, request); 
+        RETURN(rc);
+}
+
+struct obd_device *lmv_get_real_obd(struct obd_export *exp,
+                                        char *name, int len)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        ENTRY;
+        lmv_connect(obd);
+        obd = lmv->tgts[0].exp->exp_obd;
+        EXIT;
+        return obd;
+}
+
+int lmv_init_ea_size(struct obd_export *exp, int easize, int cookiesize)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        int i, rc = 0, change = 0;
+        ENTRY;
+
+        if (lmv->max_easize < easize) {
+                lmv->max_easize = easize;
+                change = 1;
+        }
+        if (lmv->max_cookiesize < cookiesize) {
+                lmv->max_cookiesize = cookiesize;
+                change = 1;
+        }
+        if (change == 0)
+                RETURN(0);
+        
+        if (lmv->connected == 0)
+                RETURN(0);
+
+        /* FIXME: error handling? */
+        for (i = 0; i < lmv->count; i++)
+                rc = obd_init_ea_size(lmv->tgts[i].exp, easize, cookiesize);
+        RETURN(rc);
+}
+
+/*
+ * to be called from MDS only
+ */
+int lmv_obd_create(struct obd_export *exp, struct obdo *oa,
+               struct lov_stripe_md **ea, struct obd_trans_info *oti)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        struct mea *mea;
+        int i, c, rc = 0;
+        struct ll_fid mfid;
+        ENTRY;
+        lmv_connect(obd);
+
+        LASSERT(ea != NULL);
+        LASSERT(oa != NULL);
+
+        if (*ea == NULL) {
+                rc = obd_alloc_diskmd(exp, (struct lov_mds_md **) ea);
+                LASSERT(*ea != NULL);
+        }
+
+        mea = (struct mea *) *ea;
+        mfid.id = oa->o_id;
+        mfid.generation = oa->o_generation;
+        rc = 0;
+        if (!mea->mea_count || mea->mea_count > lmv->count)
+                mea->mea_count = lmv->count;
+
+        mea->mea_master = -1;
+        
+        /* FIXME: error handling? */
+        for (i = 0, c = 0; c < mea->mea_count && i < lmv->count; i++) {
+                struct lov_stripe_md obj_md;
+                struct lov_stripe_md *obj_mdp = &obj_md;
+               
+                if (lmv->tgts[i].exp == NULL) {
+                        /* this is master MDS */
+                        mea->mea_fids[c].id = mfid.id;
+                        mea->mea_fids[c].generation = mfid.generation;
+                        mea->mea_fids[c].mds = i;
+                        mea->mea_master = i;
+                        c++;
+                        continue;
+                }
+
+                /* "Master" MDS should always be part of stripped dir, so
+                   scan for it */
+                if (mea->mea_master == -1 && c == mea->mea_count - 1)
+                        continue;
+
+                oa->o_valid = OBD_MD_FLGENER | OBD_MD_FLTYPE | OBD_MD_FLMODE
+                                | OBD_MD_FLUID | OBD_MD_FLGID;
+
+                rc = obd_create(lmv->tgts[c].exp, oa, &obj_mdp, oti);
+                /* FIXME: error handling here */
+                LASSERT(rc == 0);
+
+                mea->mea_fids[c].id = oa->o_id;
+                mea->mea_fids[c].generation = oa->o_generation;
+                mea->mea_fids[c].mds = i;
+                c++;
+                CDEBUG(D_OTHER, "dirobj at mds %d: "LPU64"/%u\n",
+                       i, oa->o_id, oa->o_generation);
+        }
+        LASSERT(c == mea->mea_count);
+        CDEBUG(D_OTHER, "%d dirobjects created\n", (int) mea->mea_count);
+
+        RETURN(rc);
+}
+
+static int lmv_get_info(struct obd_export *exp, __u32 keylen,
+                           void *key, __u32 *vallen, void *val)
+{
+        struct obd_device *obd;
+        struct lmv_obd *lmv;
+        ENTRY;
+
+        obd = class_exp2obd(exp);
+        if (obd == NULL) {
+                CDEBUG(D_IOCTL, "invalid client cookie "LPX64"\n",
+                       exp->exp_handle.h_cookie);
+                RETURN(-EINVAL);
+        }
+
+        lmv = &obd->u.lmv;
+        if (keylen == 6 && memcmp(key, "mdsize", 6) == 0) {
+                __u32 *mdsize = val;
+                *vallen = sizeof(__u32);
+                *mdsize = sizeof(struct ll_fid) * lmv->count
+                                + sizeof(struct mea);
+                RETURN(0);
+        } else if (keylen == 6 && memcmp(key, "mdsnum", 6) == 0) {
+                struct obd_uuid *cluuid = &lmv->cluuid;
+                struct lmv_tgt_desc *tgts;
+                __u32 *mdsnum = val;
+                int i;
+
+                for (i = 0, tgts = lmv->tgts; i < lmv->count; i++, tgts++) {
+                        if (obd_uuid_equals(&tgts->uuid, cluuid)) {
+                                *vallen = sizeof(__u32);
+                                *mdsnum = i;
+                                RETURN(0);
+                        }
+                }
+                LASSERT(0);
+        }
+
+        CDEBUG(D_IOCTL, "invalid key\n");
+        RETURN(-EINVAL);
+}
+
+int lmv_set_info(struct obd_export *exp, obd_count keylen,
+                 void *key, obd_count vallen, void *val)
+{
+        struct obd_device *obd;
+        struct lmv_obd *lmv;
+        ENTRY;
+
+        obd = class_exp2obd(exp);
+        if (obd == NULL) {
+                CDEBUG(D_IOCTL, "invalid client cookie "LPX64"\n",
+                       exp->exp_handle.h_cookie);
+                RETURN(-EINVAL);
+        }
+        lmv = &obd->u.lmv;
+        lmv_connect(obd);
+
+        if (keylen >= strlen("client") && strcmp(key, "client") == 0) {
+                struct lmv_tgt_desc *tgts;
+                int i, rc;
+
+                for (i = 0, tgts = lmv->tgts; i < lmv->count; i++, tgts++) {
+                        rc = obd_set_info(tgts->exp, keylen, key, vallen, val);
+                        if (rc)
+                                RETURN(rc);
+                }
+                RETURN(0);
+        }
+        
+        RETURN(-EINVAL);
+}
+
+int lmv_packmd(struct obd_export *exp, struct lov_mds_md **lmmp,
+               struct lov_stripe_md *lsm)
+{
+        struct obd_device *obd = class_exp2obd(exp);
+        struct lmv_obd *lmv = &obd->u.lmv;
+        int mea_size;
+        ENTRY;
+        lmv_connect(obd);
+
+	mea_size = sizeof(struct ll_fid) * lmv->count + sizeof(struct mea);
+        if (!lmmp)
+                RETURN(mea_size);
+
+        if (*lmmp && !lsm) {
+                OBD_FREE(*lmmp, mea_size);
+                *lmmp = NULL;
+                RETURN(0);
+        }
+
+        if (!*lmmp) {
+                OBD_ALLOC(*lmmp, mea_size);
+                if (!*lmmp)
+                        RETURN(-ENOMEM);
+        }
+
+        if (!lsm)
+                RETURN(mea_size);
+
+#warning "MEA packing/convertation must be here! -bzzz"
+        memcpy(*lmmp, lsm, mea_size);
+        RETURN(mea_size);
+}
+
+int lmv_unpackmd(struct obd_export *exp, struct lov_stripe_md **mem_tgt,
+                        struct lov_mds_md *disk_src, int mdsize)
+{
+        struct obd_device *obd = class_exp2obd(exp);
+        struct lmv_obd *lmv = &obd->u.lmv;
+        struct mea **tmea = (struct mea **) mem_tgt;
+        struct mea *mea = (void *) disk_src;
+        int mea_size;
+        ENTRY;
+        lmv_connect(obd);
+
+	mea_size = sizeof(struct ll_fid) * lmv->count + sizeof(struct mea);
+        if (mem_tgt == NULL)
+                return mea_size;
+
+        if (*mem_tgt != NULL && disk_src == NULL) {
+                OBD_FREE(*tmea, mea_size);
+                RETURN(0);
+        }
+
+        LASSERT(mea_size == mdsize);
+
+        OBD_ALLOC(*tmea, mea_size);
+        /* FIXME: error handling here */
+        LASSERT(*tmea != NULL);
+
+        if (!disk_src)
+                RETURN(mea_size);
+
+#warning "MEA unpacking/convertation must be here! -bzzz"
+        memcpy(*tmea, mea, mdsize);
+        RETURN(mea_size);
+}
+
+int lmv_brw(int rw, struct obd_export *exp, struct obdo *oa,
+                struct lov_stripe_md *ea, obd_count oa_bufs,
+                struct brw_page *pgarr, struct obd_trans_info *oti)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        struct mea *mea = (struct mea *) ea;
+        int err;
+      
+        LASSERT(oa != NULL);
+        LASSERT(ea != NULL);
+        LASSERT(pgarr != NULL);
+        LASSERT(oa->o_mds < lmv->count);
+
+        oa->o_gr = mea->mea_fids[oa->o_mds].generation;
+        oa->o_id = mea->mea_fids[oa->o_mds].id;
+        oa->o_valid =  OBD_MD_FLID | OBD_MD_FLGROUP;
+        err = obd_brw(rw, lmv->tgts[oa->o_mds].exp, oa,
+                        NULL, oa_bufs, pgarr, oti);
+        RETURN(err);
+}
+
+struct obd_ops lmv_obd_ops = {
+        o_owner:                THIS_MODULE,
+        o_attach:               lmv_attach,
+        o_detach:               lmv_detach,
+        o_setup:                lmv_setup,
+        o_cleanup:              lmv_cleanup,
+        o_connect:              lmv_connect_fake,
+        o_disconnect:           lmv_disconnect,
+        o_statfs:               lmv_statfs,
+        o_get_info:             lmv_get_info,
+        o_set_info:             lmv_set_info,
+        o_create:               lmv_obd_create,
+        o_packmd:               lmv_packmd,
+        o_unpackmd:             lmv_unpackmd,
+        o_brw:                  lmv_brw,
+        o_init_ea_size:         lmv_init_ea_size,
+};
+
+struct md_ops lmv_md_ops = {
+        m_getstatus:            lmv_getstatus,
+        m_getattr:              lmv_getattr,
+        m_change_cbdata:        lmv_change_cbdata,
+        m_change_cbdata_name:   lmv_change_cbdata_name,
+        m_close:                lmv_close,
+        m_create:               lmv_create,
+        m_done_writing:         lmv_done_writing,
+        m_enqueue:              lmv_enqueue,
+        m_getattr_name:         lmv_getattr_name,
+        m_intent_lock:          lmv_intent_lock,
+        m_link:                 lmv_link,
+        m_rename:               lmv_rename,
+        m_setattr:              lmv_setattr,
+        m_sync:                 lmv_sync,
+        m_readpage:             lmv_readpage,
+        m_unlink:               lmv_unlink,
+        m_get_real_obd:         lmv_get_real_obd,
+        m_valid_attrs:          lmv_valid_attrs,
+};
+
+//#ifndef LPROCFS
+static struct lprocfs_vars lprocfs_module_vars[] = { {0} };
+static struct lprocfs_vars lprocfs_obd_vars[] = { {0} };
+//#else
+LPROCFS_INIT_VARS(lmv, lprocfs_module_vars, lprocfs_obd_vars)
+
+int __init lmv_init(void)
+{
+        struct lprocfs_static_vars lvars;
+        int rc;
+
+        lprocfs_init_vars(lmv, &lvars);
+        rc = class_register_type(&lmv_obd_ops, &lmv_md_ops,
+                                 lvars.module_vars, OBD_LMV_DEVICENAME);
+        RETURN(rc);
+}
+
+static void lmv_exit(void)
+{
+        class_unregister_type(OBD_LMV_DEVICENAME);
+}
+
+#ifdef __KERNEL__
+MODULE_AUTHOR("Cluster File Systems, Inc. <info@clusterfs.com>");
+MODULE_DESCRIPTION("Lustre Logical Metadata Volume OBD driver");
+MODULE_LICENSE("GPL");
+
+module_init(lmv_init);
+module_exit(lmv_exit);
+#endif
+
diff --git a/lustre/lmv/lmv_objmgr.c b/lustre/lmv/lmv_objmgr.c
new file mode 100644
index 0000000..59daf9d
--- /dev/null
+++ b/lustre/lmv/lmv_objmgr.c
@@ -0,0 +1,200 @@
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
+ *
+ * Copyright (C) 2002, 2003 Cluster File Systems, Inc.
+ *
+ *   This file is part of Lustre, http://www.lustre.org.
+ *
+ *   Lustre is free software; you can redistribute it and/or
+ *   modify it under the terms of version 2 of the GNU General Public
+ *   License as published by the Free Software Foundation.
+ *
+ *   Lustre is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Lustre; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef EXPORT_SYMTAB
+# define EXPORT_SYMTAB
+#endif
+#define DEBUG_SUBSYSTEM S_LMV
+#ifdef __KERNEL__
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/pagemap.h>
+#include <asm/div64.h>
+#else
+#include <liblustre.h>
+#endif
+
+#include <linux/obd_support.h>
+#include <linux/lustre_lib.h>
+#include <linux/lustre_net.h>
+#include <linux/lustre_idl.h>
+#include <linux/lustre_dlm.h>
+#include <linux/lustre_mds.h>
+#include <linux/obd_class.h>
+#include <linux/obd_ost.h>
+#include <linux/seq_file.h>
+#include <linux/lprocfs_status.h>
+#include <linux/lustre_fsfilt.h>
+#include <linux/obd_lmv.h>
+#include "lmv_internal.h"
+
+
+LIST_HEAD(lmv_obj_list);
+spinlock_t lmv_obj_list_lock = SPIN_LOCK_UNLOCKED;
+
+struct lmv_obj *lmv_grab_obj(struct obd_device *obd,
+                             struct ll_fid *fid, int create)
+{
+        struct lmv_obd *lmv = &obd->u.lmv;
+        struct list_head *cur;
+        struct lmv_obj *obj, *obj2;
+
+        spin_lock(&lmv_obj_list_lock);
+        list_for_each(cur, &lmv_obj_list) {
+                obj = list_entry(cur, struct lmv_obj, list);
+                if (obj->fid.mds == fid->mds && obj->fid.id == fid->id &&
+                                obj->fid.generation == fid->generation) {
+                        atomic_inc(&obj->count);
+                        spin_unlock(&lmv_obj_list_lock);
+                        RETURN(obj);
+                }
+        }
+        spin_unlock(&lmv_obj_list_lock);
+
+        if (!create)
+                RETURN(NULL);
+
+        /* no such object yet, allocate and initialize them */
+        OBD_ALLOC(obj, sizeof(*obj));
+        if (!obj)
+                RETURN(NULL);
+        atomic_set(&obj->count, 0);
+        obj->fid = *fid;
+        obj->obd = obd;
+
+        OBD_ALLOC(obj->objs, sizeof(struct lmv_inode) * lmv->count);
+        if (!obj->objs) {
+                OBD_FREE(obj, sizeof(*obj));
+                RETURN(NULL);
+        }
+        memset(obj->objs, 0,  sizeof(struct lmv_inode) * lmv->count);
+
+        spin_lock(&lmv_obj_list_lock);
+        list_for_each(cur, &lmv_obj_list) {
+                obj2 = list_entry(cur, struct lmv_obj, list);
+                if (obj2->fid.mds == fid->mds && obj2->fid.id == fid->id &&
+                                obj2->fid.generation == fid->generation) {
+                        /* someone created it already */
+                        OBD_FREE(obj->objs,
+                                  sizeof(struct lmv_inode) * lmv->count);
+                        OBD_FREE(obj, sizeof(*obj));
+
+                        atomic_inc(&obj2->count);
+                        spin_unlock(&lmv_obj_list_lock);
+                        RETURN(obj2);
+                }
+        }
+        list_add(&obj->list, &lmv_obj_list);
+        CDEBUG(D_OTHER, "new obj in lmv cache: %lu/%lu/%lu\n",
+               (unsigned long) fid->mds, (unsigned long) fid->id,
+               (unsigned long) fid->generation);
+        spin_unlock(&lmv_obj_list_lock);
+
+        RETURN(obj);
+        
+}
+
+void lmv_put_obj(struct lmv_obj *obj)
+{
+        if (!obj)
+                return;
+        if (atomic_dec_and_test(&obj->count)) {
+                CDEBUG(D_OTHER, "last reference to %lu/%lu/%lu\n",
+                       (unsigned long) obj->fid.mds,
+                       (unsigned long) obj->fid.id,
+                       (unsigned long) obj->fid.generation);
+        }
+}
+
+void lmv_cleanup_objs(struct obd_device *obd)
+{
+        struct lmv_obd *lmv = &obd->u.lmv;
+        struct list_head *cur, *tmp;
+        struct lmv_obj *obj;
+
+        spin_lock(&lmv_obj_list_lock);
+        list_for_each_safe(cur, tmp, &lmv_obj_list) {
+                obj = list_entry(cur, struct lmv_obj, list);
+                if (obj->obd != obd)
+                        continue;
+
+                list_del(&obj->list);
+                OBD_FREE(obj->objs,
+                                sizeof(struct lmv_inode) * lmv->count);
+                OBD_FREE(obj, sizeof(*obj));
+        }
+        spin_unlock(&lmv_obj_list_lock);
+}
+
+int lmv_create_obj_from_attrs(struct obd_export *exp,
+                              struct ll_fid *fid, struct mea *mea)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct lmv_obd *lmv = &obd->u.lmv;
+        struct ptlrpc_request *req = NULL;
+        struct lmv_obj *obj;
+        struct lustre_md md;
+        int mealen, i, rc = 0;
+        ENTRY;
+
+        CDEBUG(D_OTHER, "get mea for %lu/%lu/%lu and create lmv obj\n",
+               (unsigned long) fid->mds, (unsigned long) fid->id,
+               (unsigned long) fid->generation);
+
+        if (!mea) {
+                CDEBUG(D_OTHER, "mea isn't passed in, get it now\n");
+                mealen = MEA_SIZE_LMV(lmv);
+                /* time to update mea of parent fid */
+                i = fid->mds;
+                rc = md_getattr(lmv->tgts[fid->mds].exp, fid,
+                                OBD_MD_FLEASIZE, mealen, &req);
+                LASSERT(rc == 0);
+                md.mea = NULL;
+                rc = mdc_req2lustre_md(req, 0, NULL, exp, &md);
+                LASSERT(rc == 0);
+                LASSERT(md.mea != NULL);
+                mea = md.mea;
+        }
+
+        /* got mea, now create obj for it */
+        obj = lmv_grab_obj(obd, fid, 1);
+        if (!obj)
+                GOTO(cleanup, rc = -ENOMEM);
+
+        obj->objcount = mea->mea_count;
+        /* put all fids in */
+        for (i = 0; i < mea->mea_count; i++) {
+                CDEBUG(D_OTHER, "subobj %lu/%lu/%lu\n",
+                       (unsigned long) mea->mea_fids[i].mds,
+                       (unsigned long) mea->mea_fids[i].id,
+                       (unsigned long) mea->mea_fids[i].generation);
+                obj->objs[i].fid = mea->mea_fids[i];
+        }
+
+cleanup:
+        if (req)       
+                ptlrpc_req_finished(req);
+        RETURN(rc); 
+}
+
+
diff --git a/lustre/lov/.cvsignore b/lustre/lov/.cvsignore
index 5ed596b..e69dc6d 100644
--- a/lustre/lov/.cvsignore
+++ b/lustre/lov/.cvsignore
@@ -1,10 +1,4 @@
 .deps
 Makefile
+Makefile.in
 .*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
diff --git a/lustre/lov/autoMakefile.am b/lustre/lov/Makefile.am
similarity index 56%
rename from lustre/lov/autoMakefile.am
rename to lustre/lov/Makefile.am
index 2847d56..468d064 100644
--- a/lustre/lov/autoMakefile.am
+++ b/lustre/lov/Makefile.am
@@ -3,16 +3,17 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
+DEFS=
+
 if LIBLUSTRE
 noinst_LIBRARIES = liblov.a
 liblov_a_SOURCES = lov_log.c lov_obd.c lov_pack.c lov_internal.h
-liblov_a_CPPFLAGS = $(LLCPPFLAGS)
-liblov_a_CFLAGS = $(LLCFLAGS)
+liblov_a_CFLAGS = -fPIC
+else
+MODULE = lov
+modulefs_DATA = lov.o
+EXTRA_PROGRAMS = lov
+lov_SOURCES = lov_log.c lov_obd.c lov_pack.c lproc_lov.c lov_internal.h
 endif
 
-if MODULES
-modulefs_DATA = lov$(KMODEXT)
-endif # MODULES
-
-DIST_SOURCES = $(lov-objs:.o=.c) lov_internal.h
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+include $(top_srcdir)/Rules
diff --git a/lustre/lov/Makefile.in b/lustre/lov/Makefile.in
deleted file mode 100644
index 52dba75..0000000
--- a/lustre/lov/Makefile.in
+++ /dev/null
@@ -1,4 +0,0 @@
-MODULES := lov
-lov-objs := lov_log.o lov_obd.o lov_pack.o lproc_lov.o
-
-@INCLUDE_RULES@
diff --git a/lustre/lov/lov_internal.h b/lustre/lov/lov_internal.h
index cefe534..dd7a0a7 100644
--- a/lustre/lov/lov_internal.h
+++ b/lustre/lov/lov_internal.h
@@ -10,7 +10,7 @@
 #ifndef LOV_INTERNAL_H
 #define LOV_INTERNAL_H
 
-#include <lustre/lustre_user.h>
+#include <linux/lustre_user.h>
 
 #define LAP_MAGIC 8200
 
@@ -30,9 +30,9 @@ int lov_alloc_memmd(struct lov_stripe_md **lsmp, int stripe_count, int pattern);
 void lov_free_memmd(struct lov_stripe_md **lsmp);
 
 /* lov_log.c */
-int lov_llog_init(struct obd_device *obd, struct obd_device *tgt,
-                  int count, struct llog_catid *logid);
-int lov_llog_finish(struct obd_device *obd, int count);
+int lov_llog_init(struct obd_device *, struct obd_llogs *,
+                  struct obd_device *, int, struct llog_catid *);
+int lov_llog_finish(struct obd_device *, struct obd_llogs *, int);
 
 /* lov_pack.c */
 int lov_packmd(struct obd_export *exp, struct lov_mds_md **lmm,
diff --git a/lustre/lov/lov_log.c b/lustre/lov/lov_log.c
index 5931326..962fcd9 100644
--- a/lustre/lov/lov_log.c
+++ b/lustre/lov/lov_log.c
@@ -56,15 +56,14 @@
  * we need to keep cookies in stripe order, even if some are NULL, so that
  * the right cookies are passed back to the right OSTs at the client side.
  * Unset cookies should be all-zero (which will never occur naturally). */
-static int lov_llog_origin_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec,
-                               void *buf, struct llog_cookie *logcookies, 
-                               int numcookies, void *data)
+static int lov_llog_origin_add(struct llog_ctxt *ctxt,
+                        struct llog_rec_hdr *rec, struct lov_stripe_md *lsm,
+                        struct llog_cookie *logcookies, int numcookies)
 {
         struct obd_device *obd = ctxt->loc_obd;
         struct lov_obd *lov = &obd->u.lov;
         struct lov_oinfo *loi;
         struct llog_unlink_rec *lur;
-        struct lov_stripe_md *lsm = (struct lov_stripe_md *)data;
         int i, rc = 0;
         ENTRY;
 
@@ -78,12 +77,13 @@ static int lov_llog_origin_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec,
 
         for (i = 0,loi = lsm->lsm_oinfo; i < lsm->lsm_stripe_count; i++,loi++) {
                 struct obd_device *child = lov->tgts[loi->loi_ost_idx].ltd_exp->exp_obd; 
-                struct llog_ctxt *cctxt = llog_get_context(child, ctxt->loc_idx);
-
+                struct llog_ctxt *cctxt;
+                cctxt = llog_get_context(&child->obd_llogs, ctxt->loc_idx);
                 lur->lur_oid = loi->loi_id;
                 lur->lur_ogen = loi->loi_gr;
+                LASSERT(lsm->lsm_object_gr == loi->loi_gr);
                 rc += llog_add(cctxt, &lur->lur_hdr, NULL, logcookies + rc,
-                                numcookies - rc, NULL);
+                                numcookies - rc);
 
         }
         OBD_FREE(lur, sizeof(*lur));
@@ -104,8 +104,9 @@ static int lov_llog_origin_connect(struct llog_ctxt *ctxt, int count,
         LASSERT(lov->desc.ld_tgt_count  == count);
         for (i = 0; i < lov->desc.ld_tgt_count; i++) {
                 struct obd_device *child = lov->tgts[i].ltd_exp->exp_obd;
-                struct llog_ctxt *cctxt = llog_get_context(child, ctxt->loc_idx);
+                struct llog_ctxt *cctxt;
 
+                cctxt = llog_get_context(&child->obd_llogs, ctxt->loc_idx);
                 if (uuid && !obd_uuid_equals(uuid, &lov->tgts[i].uuid))
                         continue;
 
@@ -120,11 +121,9 @@ static int lov_llog_origin_connect(struct llog_ctxt *ctxt, int count,
 }
 
 /* the replicators commit callback */
-static int lov_llog_repl_cancel(struct llog_ctxt *ctxt, int count, 
-                                struct llog_cookie *cookies, int flags,
-                                void *data)
+static int lov_llog_repl_cancel(struct llog_ctxt *ctxt, struct lov_stripe_md *lsm,
+                          int count, struct llog_cookie *cookies, int flags)
 {
-        struct lov_stripe_md *lsm = (struct lov_stripe_md *)data;
         struct lov_obd *lov;
         struct obd_device *obd = ctxt->loc_obd;
         struct lov_oinfo *loi;
@@ -138,10 +137,11 @@ static int lov_llog_repl_cancel(struct llog_ctxt *ctxt, int count,
         lov = &obd->u.lov;
         for (i = 0; i < count; i++, cookies++, loi++) {
                 struct obd_device *child = lov->tgts[loi->loi_ost_idx].ltd_exp->exp_obd; 
-                struct llog_ctxt *cctxt = llog_get_context(child, ctxt->loc_idx);
+                struct llog_ctxt *cctxt;
                 int err;
 
-                err = llog_cancel(cctxt, 1, cookies, flags, NULL);
+                cctxt = llog_get_context(&child->obd_llogs, ctxt->loc_idx);
+                err = llog_cancel(cctxt, NULL, 1, cookies, flags);
                 if (err && lov->tgts[loi->loi_ost_idx].active) {
                         CERROR("error: objid "LPX64" subobj "LPX64
                                " on OST idx %d: rc = %d\n", lsm->lsm_object_id,
@@ -162,27 +162,28 @@ static struct llog_operations lov_size_repl_logops = {
         lop_cancel: lov_llog_repl_cancel
 };
 
-int lov_llog_init(struct obd_device *obd, struct obd_device *tgt,
-                  int count, struct llog_catid *logid)
+
+int lov_llog_init(struct obd_device *obd, struct obd_llogs *llogs,
+                  struct obd_device *tgt, int count, struct llog_catid *logid)
 {
         struct lov_obd *lov = &obd->u.lov;
         int i, rc = 0;
         ENTRY;
-        
-        rc = obd_llog_setup(obd, LLOG_UNLINK_ORIG_CTXT, tgt, 0, NULL,
-                            &lov_unlink_orig_logops);
+
+        rc = llog_setup(obd, llogs, LLOG_UNLINK_ORIG_CTXT, tgt, 0, NULL,
+                        &lov_unlink_orig_logops);
         if (rc)
                 RETURN(rc);
 
-        rc = obd_llog_setup(obd, LLOG_SIZE_REPL_CTXT, tgt, 0, NULL, 
-                            &lov_size_repl_logops);
+        rc = llog_setup(obd, llogs, LLOG_SIZE_REPL_CTXT, tgt, 0, NULL,
+                        &lov_size_repl_logops);
         if (rc)
                 RETURN(rc);
 
         LASSERT(lov->desc.ld_tgt_count  == count);
         for (i = 0; i < lov->desc.ld_tgt_count; i++) {
                 struct obd_device *child = lov->tgts[i].ltd_exp->exp_obd;
-                rc = obd_llog_init(child, tgt, 1, logid + i);
+                rc = obd_llog_init(child, &child->obd_llogs, tgt, 1, logid + i);
                 if (rc) {
                         CERROR("error osc_llog_init %d\n", i);
                         break;
@@ -191,24 +192,24 @@ int lov_llog_init(struct obd_device *obd, struct obd_device *tgt,
         RETURN(rc);
 }
 
-int lov_llog_finish(struct obd_device *obd, int count)
+int lov_llog_finish(struct obd_device *obd, struct obd_llogs *llogs, int count)
 {
         struct lov_obd *lov = &obd->u.lov;
         int i, rc = 0;
         ENTRY;
         
-        rc = obd_llog_cleanup(llog_get_context(obd, LLOG_UNLINK_ORIG_CTXT));
+        rc = llog_cleanup(llog_get_context(llogs, LLOG_UNLINK_ORIG_CTXT));
         if (rc)
                 RETURN(rc);
 
-        rc = obd_llog_cleanup(llog_get_context(obd, LLOG_SIZE_REPL_CTXT));
+        rc = llog_cleanup(llog_get_context(llogs, LLOG_SIZE_REPL_CTXT));
         if (rc)
                 RETURN(rc);
 
         LASSERT(lov->desc.ld_tgt_count  == count);
         for (i = 0; i < lov->desc.ld_tgt_count; i++) {
                 struct obd_device *child = lov->tgts[i].ltd_exp->exp_obd;
-                rc = obd_llog_finish(child, 1);
+                rc = obd_llog_finish(child, &child->obd_llogs, 1);
                 if (rc) {
                         CERROR("error osc_llog_finish %d\n", i);
                         break;
diff --git a/lustre/lov/lov_obd.c b/lustre/lov/lov_obd.c
index f16940a..9e92463 100644
--- a/lustre/lov/lov_obd.c
+++ b/lustre/lov/lov_obd.c
@@ -114,6 +114,35 @@ static void lov_llh_destroy(struct lov_lock_handles *llh)
 }
 
 /* obd methods */
+int lov_attach(struct obd_device *dev, obd_count len, void *data)
+{
+        struct lprocfs_static_vars lvars;
+        int rc;
+
+        lprocfs_init_vars(lov, &lvars);
+        rc = lprocfs_obd_attach(dev, lvars.obd_vars);
+        if (rc == 0) {
+#ifdef __KERNEL__
+                struct proc_dir_entry *entry;
+
+                entry = create_proc_entry("target_obd", 0444, 
+                                          dev->obd_proc_entry);
+                if (entry == NULL) {
+                        rc = -ENOMEM;
+                } else {
+                        entry->proc_fops = &lov_proc_target_fops;
+                        entry->data = dev;
+                }
+#endif
+        }
+        return rc;
+}
+
+int lov_detach(struct obd_device *dev)
+{
+        return lprocfs_obd_detach(dev);
+}
+
 static int lov_connect(struct lustre_handle *conn, struct obd_device *obd,
                        struct obd_uuid *cluuid)
 {
@@ -147,7 +176,7 @@ static int lov_connect(struct lustre_handle *conn, struct obd_device *obd,
 
                 LASSERT( tgt_uuid != NULL);
 
-                tgt_obd = class_find_client_obd(tgt_uuid, LUSTRE_OSC_NAME,
+                tgt_obd = class_find_client_obd(tgt_uuid, LUSTRE_OSC_NAME, 
                                                 &obd->obd_uuid);
 
                 if (!tgt_obd) {
@@ -361,7 +390,6 @@ static int lov_notify(struct obd_device *obd, struct obd_device *watched,
 
 static int lov_setup(struct obd_device *obd, obd_count len, void *buf)
 {
-        struct lprocfs_static_vars lvars;
         struct lustre_cfg *lcfg = buf;
         struct lov_desc *desc;
         struct lov_obd *lov = &obd->u.lov;
@@ -369,6 +397,7 @@ static int lov_setup(struct obd_device *obd, obd_count len, void *buf)
         struct lov_tgt_desc *tgts;
         int i;
         int count;
+        int rc = 0;
         ENTRY;
 
         if (lcfg->lcfg_inllen1 < 1) {
@@ -396,14 +425,6 @@ static int lov_setup(struct obd_device *obd, obd_count len, void *buf)
                 RETURN(-EINVAL);
         }
 
-        if (desc->ld_default_stripe_size < PTLRPC_MAX_BRW_SIZE) {
-                CWARN("Increasing default_stripe_size "LPU64" to %u\n",
-                      desc->ld_default_stripe_size, PTLRPC_MAX_BRW_SIZE);
-                CWARN("Please update config and run --write-conf on MDS\n");
-
-                desc->ld_default_stripe_size = PTLRPC_MAX_BRW_SIZE;
-        }
-
         /* Because of 64-bit divide/mod operations only work with a 32-bit
          * divisor in a 32-bit kernel, we cannot support a stripe width
          * of 4GB or larger on 32-bit CPUs.
@@ -435,31 +456,15 @@ static int lov_setup(struct obd_device *obd, obd_count len, void *buf)
                 *uuid = uuids[i];
         }
 
-        lprocfs_init_vars(lov, &lvars);
-        lprocfs_obd_setup(obd, lvars.obd_vars);
-#ifdef __KERNEL__
-        {
-                struct proc_dir_entry *entry;
 
-                entry = create_proc_entry("target_obd", 0444,
-                                          obd->obd_proc_entry);
-                if (entry != NULL) {
-                        entry->proc_fops = &lov_proc_target_fops;
-                        entry->data = obd;
-                }
-        }
-#endif
-
-        RETURN(0);
+        RETURN(rc);
 }
 
-static int lov_cleanup(struct obd_device *obd, int flags)
+static int lov_cleanup(struct obd_device *obd, int flags) 
 {
         struct lov_obd *lov = &obd->u.lov;
 
-        lprocfs_obd_cleanup(obd);
         OBD_FREE(lov->tgts, lov->bufsize);
-
         RETURN(0);
 }
 
@@ -478,6 +483,7 @@ static obd_size lov_stripe_size(struct lov_stripe_md *lsm, obd_size ost_size,
 
         /* do_div(a, b) returns a % b, and a = a / b */
         stripe_size = do_div(ost_size, ssize);
+
         if (stripe_size)
                 lov_size = ost_size * swidth + stripeno * ssize + stripe_size;
         else
@@ -551,7 +557,7 @@ static int lov_clear_orphans(struct obd_export *export, struct obdo *src_oa,
                 struct lov_stripe_md *obj_mdp = &obj_md;
                 int err;
 
-                /* if called for a specific target, we don't
+                /* if called for a specific target, we don't 
                    care if it is not active. */
                 if (lov->tgts[i].active == 0 && ost_uuid == NULL) {
                         CDEBUG(D_HA, "lov idx %d inactive\n", i);
@@ -562,7 +568,7 @@ static int lov_clear_orphans(struct obd_export *export, struct obdo *src_oa,
                         continue;
 
                 memcpy(tmp_oa, src_oa, sizeof(*tmp_oa));
-
+                
                 /* XXX: LOV STACKING: use real "obj_mdp" sub-data */
                 err = obd_create(lov->tgts[i].ltd_exp, tmp_oa, &obj_mdp, oti);
                 if (err)
@@ -658,7 +664,7 @@ static int lov_create(struct obd_export *exp, struct obdo *src_oa,
 
                         if (stripes > lov->desc.ld_active_tgt_count)
                                 RETURN(-EFBIG);
-                        if (stripes < ost_count)
+                        if (stripes > ost_count)
                                 stripes = ost_count;
                 } else {
                         stripes = ost_count;
@@ -674,8 +680,10 @@ static int lov_create(struct obd_export *exp, struct obdo *src_oa,
 
         ost_count = lov->desc.ld_tgt_count;
 
+        LASSERT(src_oa->o_gr > 0);
         LASSERT(src_oa->o_valid & OBD_MD_FLID);
         lsm->lsm_object_id = src_oa->o_id;
+        lsm->lsm_object_gr = src_oa->o_gr;
         if (!lsm->lsm_stripe_size)
                 lsm->lsm_stripe_size = lov->desc.ld_default_stripe_size;
         if (!lsm->lsm_pattern) {
@@ -761,9 +769,11 @@ static int lov_create(struct obd_export *exp, struct obdo *src_oa,
                 if (oti->oti_objid)
                         oti->oti_objid[ost_idx] = tmp_oa->o_id;
                 loi->loi_id = tmp_oa->o_id;
+                loi->loi_gr = tmp_oa->o_gr;
                 loi->loi_ost_idx = ost_idx;
-                CDEBUG(D_INODE, "objid "LPX64" has subobj "LPX64" at idx %d\n",
-                       lsm->lsm_object_id, loi->loi_id, ost_idx);
+                CDEBUG(D_INODE,
+                       "objid "LPX64" has subobj "LPX64"/"LPX64" at idx %d\n",
+                       lsm->lsm_object_id, loi->loi_id, loi->loi_id, ost_idx);
 
                 lov_merge_attrs(ret_oa, tmp_oa, tmp_oa->o_valid, lsm,
                                 obj_alloc, &set);
@@ -826,7 +836,7 @@ static int lov_create(struct obd_export *exp, struct obdo *src_oa,
                 if (lsm_new != NULL) {
                         memcpy(lsm_new, lsm, newsize);
                         lsm_new->lsm_stripe_count = obj_alloc;
-                        OBD_FREE(lsm, oldsize);
+                        OBD_FREE(lsm, newsize);
                         lsm = lsm_new;
                 } else {
                         CWARN("'leaking' %d bytes\n", oldsize - newsize);
@@ -843,6 +853,8 @@ static int lov_create(struct obd_export *exp, struct obdo *src_oa,
                 LBUG();
         }
         ret_oa->o_id = src_oa->o_id;
+        ret_oa->o_gr = src_oa->o_gr;
+        ret_oa->o_valid |= OBD_MD_FLGROUP;
         memcpy(src_oa, ret_oa, sizeof(*src_oa));
 
  out_tmp:
@@ -918,8 +930,6 @@ static int lov_destroy(struct obd_export *exp, struct obdo *oa,
                 if (lov->tgts[loi->loi_ost_idx].active == 0) {
                         CDEBUG(D_HA, "lov idx %d inactive\n", loi->loi_ost_idx);
                         /* Orphan clean up will (someday) fix this up. */
-                        if (oti != NULL && oa->o_valid & OBD_MD_FLCOOKIE)
-                                oti->oti_logcookies++;
                         continue;
                 }
 
@@ -990,7 +1000,7 @@ static int lov_getattr(struct obd_export *exp, struct obdo *oa,
         RETURN(rc);
 }
 
-static int lov_getattr_interpret(struct ptlrpc_request_set *rqset, void *data,
+static int lov_getattr_interpret(struct ptlrpc_request_set *rqset, void *data, 
                                  int rc)
 {
         struct lov_getattr_async_args *aa = data;
@@ -1114,7 +1124,10 @@ static int lov_setattr(struct obd_export *exp, struct obdo *src_oa,
         LASSERT(!(src_oa->o_valid & ~(OBD_MD_FLID|OBD_MD_FLTYPE | OBD_MD_FLMODE|
                                       OBD_MD_FLATIME | OBD_MD_FLMTIME |
                                       OBD_MD_FLCTIME | OBD_MD_FLFLAGS |
-                                      OBD_MD_FLSIZE)));
+                                      OBD_MD_FLSIZE | OBD_MD_FLGROUP)));
+
+        LASSERT(!(src_oa->o_valid & OBD_MD_FLGROUP) || src_oa->o_gr > 0);
+
         ret_oa = obdo_alloc();
         if (!ret_oa)
                 RETURN(-ENOMEM);
@@ -1134,6 +1147,7 @@ static int lov_setattr(struct obd_export *exp, struct obdo *src_oa,
 
                 memcpy(tmp_oa, src_oa, sizeof(*tmp_oa));
                 tmp_oa->o_id = loi->loi_id;
+                LASSERT(!(tmp_oa->o_valid & OBD_MD_FLGROUP) || tmp_oa->o_gr>0);
 
                 if (src_oa->o_valid & OBD_MD_FLSIZE) {
                         if (lov_stripe_offset(lsm, src_oa->o_size, i,
@@ -1468,13 +1482,14 @@ static int lov_brw_check(struct lov_obd *lov, struct obdo *oa,
         /* The caller just wants to know if there's a chance that this
          * I/O can succeed */
         for (i = 0; i < oa_bufs; i++) {
-                int stripe = lov_stripe_number(lsm, pga[i].disk_offset);
+                int stripe = lov_stripe_number(lsm, pga[i].off);
                 int ost = lsm->lsm_oinfo[stripe].loi_ost_idx;
-                obd_off start, end;
+                struct ldlm_extent ext, subext;
+                ext.start = pga[i].off;
+                ext.end = pga[i].off + pga[i].count;
 
-                if (!lov_stripe_intersects(lsm, i, pga[i].disk_offset,
-                                           pga[i].disk_offset + pga[i].count,
-                                           &start, &end))
+                if (!lov_stripe_intersects(lsm, i, ext.start, ext.end,
+                                           &subext.start, &subext.end))
                         continue;
 
                 if (lov->tgts[ost].active == 0) {
@@ -1540,7 +1555,7 @@ static int lov_brw(int cmd, struct obd_export *exp, struct obdo *src_oa,
         }
 
         for (i = 0; i < oa_bufs; i++) {
-                where[i] = lov_stripe_number(lsm, pga[i].disk_offset);
+                where[i] = lov_stripe_number(lsm, pga[i].off);
                 stripeinfo[where[i]].bufct++;
         }
 
@@ -1549,6 +1564,7 @@ static int lov_brw(int cmd, struct obd_export *exp, struct obdo *src_oa,
                 if (i > 0)
                         si->index = si_last->index + si_last->bufct;
                 si->lsm.lsm_object_id = loi->loi_id;
+                si->lsm.lsm_object_gr = lsm->lsm_object_gr;
                 si->ost_idx = loi->loi_ost_idx;
         }
 
@@ -1559,8 +1575,7 @@ static int lov_brw(int cmd, struct obd_export *exp, struct obdo *src_oa,
                 shift = stripeinfo[which].index + stripeinfo[which].subcount;
                 LASSERT(shift < oa_bufs);
                 ioarr[shift] = pga[i];
-                lov_stripe_offset(lsm, pga[i].disk_offset, which,
-                                  &ioarr[shift].disk_offset);
+                lov_stripe_offset(lsm, pga[i].off, which, &ioarr[shift].off);
                 stripeinfo[which].subcount++;
         }
 
@@ -1578,8 +1593,8 @@ static int lov_brw(int cmd, struct obd_export *exp, struct obdo *src_oa,
                                 memcpy(tmp_oa, src_oa, sizeof(*tmp_oa));
 
                         tmp_oa->o_id = si->lsm.lsm_object_id;
-                        rc = obd_brw(cmd, lov->tgts[si->ost_idx].ltd_exp,
-                                     tmp_oa, &si->lsm, si->bufct,
+                        rc = obd_brw(cmd, lov->tgts[si->ost_idx].ltd_exp, 
+                                     tmp_oa, &si->lsm, si->bufct, 
                                      &ioarr[shift], oti);
                         if (rc)
                                 GOTO(out_ioarr, rc);
@@ -1693,7 +1708,7 @@ static int lov_brw_async(int cmd, struct obd_export *exp, struct obdo *oa,
                 GOTO(out_obdos, rc = -ENOMEM);
 
         for (i = 0; i < oa_bufs; i++) {
-                where[i] = lov_stripe_number(lsm, pga[i].disk_offset);
+                where[i] = lov_stripe_number(lsm, pga[i].off);
                 stripeinfo[where[i]].bufct++;
         }
 
@@ -1717,8 +1732,7 @@ static int lov_brw_async(int cmd, struct obd_export *exp, struct obdo *oa,
                 shift = stripeinfo[which].index + stripeinfo[which].subcount;
                 LASSERT(shift < oa_bufs);
                 ioarr[shift] = pga[i];
-                lov_stripe_offset(lsm, pga[i].disk_offset, which,
-                                  &ioarr[shift].disk_offset);
+                lov_stripe_offset(lsm, pga[i].off, which, &ioarr[shift].off);
                 stripeinfo[which].subcount++;
         }
 
@@ -1789,7 +1803,7 @@ static int lov_ap_refresh_count(void *data, int cmd)
         if (IS_ERR(lap))
                 return -EINVAL;
 
-        return lap->lap_caller_ops->ap_refresh_count(lap->lap_caller_data,
+        return lap->lap_caller_ops->ap_refresh_count(lap->lap_caller_data, 
                                                      cmd);
 }
 static void lov_ap_fill_obdo(void *data, int cmd, struct obdo *oa)
@@ -1803,8 +1817,7 @@ static void lov_ap_fill_obdo(void *data, int cmd, struct obdo *oa)
         /* XXX woah, shouldn't we be altering more here?  size? */
         oa->o_id = lap->lap_loi_id;
 }
-
-static void lov_ap_completion(void *data, int cmd, struct obdo *oa, int rc)
+static void lov_ap_completion(void *data, int cmd, int rc)
 {
         struct lov_async_page *lap = lap_from_cookie(data);
         if (IS_ERR(lap))
@@ -1813,7 +1826,7 @@ static void lov_ap_completion(void *data, int cmd, struct obdo *oa, int rc)
         /* in a raid1 regime this would down a count of many ios
          * in flight, onl calling the caller_ops completion when all
          * the raid1 ios are complete */
-        lap->lap_caller_ops->ap_completion(lap->lap_caller_data, cmd, oa, rc);
+        lap->lap_caller_ops->ap_completion(lap->lap_caller_data, cmd, rc);
 }
 
 static struct obd_async_page_ops lov_async_page_ops = {
@@ -1825,7 +1838,7 @@ static struct obd_async_page_ops lov_async_page_ops = {
 
 int lov_prep_async_page(struct obd_export *exp, struct lov_stripe_md *lsm,
                            struct lov_oinfo *loi, struct page *page,
-                           obd_off offset, struct obd_async_page_ops *ops,
+                           obd_off offset, struct obd_async_page_ops *ops, 
                            void *data, void **res)
 {
         struct lov_obd *lov = &exp->exp_obd->u.lov;
@@ -1850,7 +1863,7 @@ int lov_prep_async_page(struct obd_export *exp, struct lov_stripe_md *lsm,
         lov_stripe_offset(lsm, offset, lap->lap_stripe, &lap->lap_sub_offset);
         loi = &lsm->lsm_oinfo[lap->lap_stripe];
 
-        /* so the callback doesn't need the lsm */
+        /* so the callback doesn't need the lsm */ 
         lap->lap_loi_id = loi->loi_id;
 
         rc = obd_prep_async_page(lov->tgts[loi->loi_ost_idx].ltd_exp,
@@ -1962,7 +1975,7 @@ static int lov_trigger_group_io(struct obd_export *exp,
 
         for (i = 0, loi = lsm->lsm_oinfo; i < lsm->lsm_stripe_count;
              i++, loi++) {
-                err = obd_trigger_group_io(lov->tgts[loi->loi_ost_idx].ltd_exp,
+                err = obd_trigger_group_io(lov->tgts[loi->loi_ost_idx].ltd_exp, 
                                            lsm, loi, oig);
                 if (rc == 0 && err != 0)
                         rc = err;
@@ -1988,10 +2001,10 @@ static int lov_teardown_async_page(struct obd_export *exp,
                 RETURN(PTR_ERR(lap));
 
         loi = &lsm->lsm_oinfo[lap->lap_stripe];
-        rc = obd_teardown_async_page(lov->tgts[loi->loi_ost_idx].ltd_exp,
+        rc = obd_teardown_async_page(lov->tgts[loi->loi_ost_idx].ltd_exp, 
                                      lsm, loi, lap->lap_sub_cookie);
         if (rc) {
-                CERROR("unable to teardown sub cookie %p: %d\n",
+                CERROR("unable to teardown sub cookie %p: %d\n", 
                        lap->lap_sub_cookie, rc);
                 RETURN(rc);
         }
@@ -2039,15 +2052,13 @@ static int lov_enqueue(struct obd_export *exp, struct lov_stripe_md *lsm,
         for (i = 0, loi = lsm->lsm_oinfo; i < lsm->lsm_stripe_count;
              i++, loi++, lov_lockhp++) {
                 ldlm_policy_data_t sub_ext;
-                obd_off start, end;
 
                 if (!lov_stripe_intersects(lsm, i, policy->l_extent.start,
-                                           policy->l_extent.end, &start,
-                                           &end))
+                                           policy->l_extent.end,
+                                           &sub_ext.l_extent.start,
+                                           &sub_ext.l_extent.end))
                         continue;
 
-                sub_ext.l_extent.start = start;
-                sub_ext.l_extent.end = end;
                 sub_ext.l_extent.gid = policy->l_extent.gid;
 
                 if (lov->tgts[loi->loi_ost_idx].active == 0) {
@@ -2057,11 +2068,11 @@ static int lov_enqueue(struct obd_export *exp, struct lov_stripe_md *lsm,
 
                 /* XXX LOV STACKING: submd should be from the subobj */
                 submd->lsm_object_id = loi->loi_id;
+                submd->lsm_object_gr = lsm->lsm_object_gr;
                 submd->lsm_stripe_count = 0;
                 submd->lsm_oinfo->loi_kms_valid = loi->loi_kms_valid;
                 submd->lsm_oinfo->loi_rss = loi->loi_rss;
                 submd->lsm_oinfo->loi_kms = loi->loi_kms;
-                submd->lsm_oinfo->loi_blocks = loi->loi_blocks;
                 loi->loi_mtime = submd->lsm_oinfo->loi_mtime;
                 /* XXX submd is not fully initialized here */
                 *flags = save_flags;
@@ -2082,7 +2093,6 @@ static int lov_enqueue(struct obd_export *exp, struct lov_stripe_md *lsm,
 
                         LASSERT(lock != NULL);
                         loi->loi_rss = tmp;
-                        loi->loi_blocks = submd->lsm_oinfo->loi_blocks;
                         /* Extend KMS up to the end of this lock and no further
                          * A lock on [x,y] means a KMS of up to y + 1 bytes! */
                         if (tmp > lock->l_policy_data.l_extent.end)
@@ -2105,7 +2115,6 @@ static int lov_enqueue(struct obd_export *exp, struct lov_stripe_md *lsm,
                            save_flags & LDLM_FL_HAS_INTENT) {
                         memset(lov_lockhp, 0, sizeof(*lov_lockhp));
                         loi->loi_rss = submd->lsm_oinfo->loi_rss;
-                        loi->loi_blocks = submd->lsm_oinfo->loi_blocks;
                         CDEBUG(D_INODE, "glimpsed, setting rss="LPU64"; leaving"
                                " kms="LPU64"\n", loi->loi_rss, loi->loi_kms);
                 } else {
@@ -2133,6 +2142,7 @@ static int lov_enqueue(struct obd_export *exp, struct lov_stripe_md *lsm,
 
                 /* XXX LOV STACKING: submd should be from the subobj */
                 submd.lsm_object_id = loi->loi_id;
+                submd.lsm_object_gr = lsm->lsm_object_gr;
                 submd.lsm_stripe_count = 0;
                 err = obd_cancel(lov->tgts[loi->loi_ost_idx].ltd_exp, &submd,
                                  mode, lov_lockhp);
@@ -2184,16 +2194,14 @@ static int lov_match(struct obd_export *exp, struct lov_stripe_md *lsm,
         for (i = 0, loi = lsm->lsm_oinfo; i < lsm->lsm_stripe_count;
              i++, loi++, lov_lockhp++) {
                 ldlm_policy_data_t sub_ext;
-                obd_off start, end;
                 int lov_flags;
 
                 if (!lov_stripe_intersects(lsm, i, policy->l_extent.start,
-                                           policy->l_extent.end, &start, &end))
+                                           policy->l_extent.end,
+                                           &sub_ext.l_extent.start,
+                                           &sub_ext.l_extent.end))
                         continue;
 
-                sub_ext.l_extent.start = start;
-                sub_ext.l_extent.end = end;
-
                 if (lov->tgts[loi->loi_ost_idx].active == 0) {
                         CDEBUG(D_HA, "lov idx %d inactive\n", loi->loi_ost_idx);
                         rc = -EIO;
@@ -2202,6 +2210,7 @@ static int lov_match(struct obd_export *exp, struct lov_stripe_md *lsm,
 
                 /* XXX LOV STACKING: submd should be from the subobj */
                 submd.lsm_object_id = loi->loi_id;
+                submd.lsm_object_gr = lsm->lsm_object_gr;
                 submd.lsm_stripe_count = 0;
                 lov_flags = *flags;
                 /* XXX submd is not fully initialized here */
@@ -2229,6 +2238,7 @@ static int lov_match(struct obd_export *exp, struct lov_stripe_md *lsm,
 
                 /* XXX LOV STACKING: submd should be from the subobj */
                 submd.lsm_object_id = loi->loi_id;
+                submd.lsm_object_gr = lsm->lsm_object_gr;
                 submd.lsm_stripe_count = 0;
                 err = obd_cancel(lov->tgts[loi->loi_ost_idx].ltd_exp, &submd,
                                  mode, lov_lockhp);
@@ -2261,6 +2271,8 @@ static int lov_change_cbdata(struct obd_export *exp,
         if (!exp || !exp->exp_obd)
                 RETURN(-ENODEV);
 
+        LASSERT(lsm->lsm_object_gr > 0);
+
         lov = &exp->exp_obd->u.lov;
         for (i = 0,loi = lsm->lsm_oinfo; i < lsm->lsm_stripe_count; i++,loi++) {
                 struct lov_stripe_md submd;
@@ -2268,6 +2280,7 @@ static int lov_change_cbdata(struct obd_export *exp,
                         CDEBUG(D_HA, "lov idx %d inactive\n", loi->loi_ost_idx);
 
                 submd.lsm_object_id = loi->loi_id;
+                submd.lsm_object_gr = lsm->lsm_object_gr;
                 submd.lsm_stripe_count = 0;
                 rc = obd_change_cbdata(lov->tgts[loi->loi_ost_idx].ltd_exp,
                                        &submd, it, data);
@@ -2291,6 +2304,8 @@ static int lov_cancel(struct obd_export *exp, struct lov_stripe_md *lsm,
         if (!exp || !exp->exp_obd)
                 RETURN(-ENODEV);
 
+        LASSERT(lsm->lsm_object_gr > 0);
+
         LASSERT(lockh);
         if (lsm->lsm_stripe_count > 1) {
                 lov_lockh = lov_handle2llh(lockh);
@@ -2318,6 +2333,7 @@ static int lov_cancel(struct obd_export *exp, struct lov_stripe_md *lsm,
 
                 /* XXX LOV STACKING: submd should be from the subobj */
                 submd.lsm_object_id = loi->loi_id;
+                submd.lsm_object_gr = lsm->lsm_object_gr;
                 submd.lsm_stripe_count = 0;
                 err = obd_cancel(lov->tgts[loi->loi_ost_idx].ltd_exp, &submd,
                                  mode, lov_lockhp);
@@ -2354,6 +2370,8 @@ static int lov_cancel_unused(struct obd_export *exp,
         if (!exp || !exp->exp_obd)
                 RETURN(-ENODEV);
 
+        LASSERT(lsm->lsm_object_gr > 0);
+
         lov = &exp->exp_obd->u.lov;
         for (i = 0,loi = lsm->lsm_oinfo; i < lsm->lsm_stripe_count; i++,loi++) {
                 struct lov_stripe_md submd;
@@ -2363,6 +2381,7 @@ static int lov_cancel_unused(struct obd_export *exp,
                         CDEBUG(D_HA, "lov idx %d inactive\n", loi->loi_ost_idx);
 
                 submd.lsm_object_id = loi->loi_id;
+                submd.lsm_object_gr = lsm->lsm_object_gr;
                 submd.lsm_stripe_count = 0;
                 err = obd_cancel_unused(lov->tgts[loi->loi_ost_idx].ltd_exp,
                                         &submd, flags, opaque);
@@ -2570,7 +2589,7 @@ static int lov_get_info(struct obd_export *exp, __u32 keylen,
                 for (i = 0, loi = data->lsm->lsm_oinfo;
                      i < data->lsm->lsm_stripe_count;
                      i++, loi++) {
-                        if (lov->tgts[loi->loi_ost_idx].ltd_exp ==
+                        if (lov->tgts[loi->loi_ost_idx].ltd_exp == 
                             data->lock->l_conn_export) {
                                 *stripe = i;
                                 RETURN(0);
@@ -2606,7 +2625,7 @@ static int lov_get_info(struct obd_export *exp, __u32 keylen,
         } else if (keylen >= strlen("lovdesc") && strcmp(key, "lovdesc") == 0) {
                 struct lov_desc *desc_ret = val;
                 *desc_ret = lov->desc;
-
+                
                 RETURN(0);
         }
 
@@ -2643,7 +2662,10 @@ static int lov_set_info(struct obd_export *exp, obd_count keylen,
         if (KEY_IS("growth_count")) {
                 if (vallen != sizeof(int))
                         RETURN(-EINVAL);
-        } else if (KEY_IS("mds_conn") || KEY_IS("unlinked")) {
+        } else if (KEY_IS("mds_conn")) {
+                if (vallen != sizeof(__u32))
+                        RETURN(-EINVAL);
+        } else if (KEY_IS("unlinked")) {
                 if (vallen != 0)
                         RETURN(-EINVAL);
         } else {
@@ -2653,10 +2675,7 @@ static int lov_set_info(struct obd_export *exp, obd_count keylen,
         for (i = 0; i < lov->desc.ld_tgt_count; i++) {
                 int er;
 
-                if (val && !obd_uuid_equals(val, &lov->tgts[i].uuid))
-                        continue;
-
-                if (!val && !lov->tgts[i].active)
+                if (!lov->tgts[i].active)
                         continue;
 
                 er = obd_set_info(lov->tgts[i].ltd_exp, keylen, key, vallen,
@@ -2692,26 +2711,10 @@ __u64 lov_merge_size(struct lov_stripe_md *lsm, int kms)
                 if (lov_size > size)
                         size = lov_size;
         }
-
         return size;
 }
 EXPORT_SYMBOL(lov_merge_size);
 
-/* Merge blocks */
-__u64 lov_merge_blocks(struct lov_stripe_md *lsm)
-{
-        struct lov_oinfo *loi;
-        __u64 blocks = 0;
-        int i;
-
-        for (i = 0, loi = lsm->lsm_oinfo; i < lsm->lsm_stripe_count;
-             i++, loi++) {
-                blocks += loi->loi_blocks;
-        }
-        return blocks;
-}
-EXPORT_SYMBOL(lov_merge_blocks);
-
 __u64 lov_merge_mtime(struct lov_stripe_md *lsm, __u64 current_time)
 {
         struct lov_oinfo *loi;
@@ -2838,40 +2841,42 @@ void lov_increase_kms(struct obd_export *exp, struct lov_stripe_md *lsm,
 EXPORT_SYMBOL(lov_increase_kms);
 
 struct obd_ops lov_obd_ops = {
-        .o_owner               = THIS_MODULE,
-        .o_setup               = lov_setup,
-        .o_cleanup             = lov_cleanup,
-        .o_connect             = lov_connect,
-        .o_disconnect          = lov_disconnect,
-        .o_statfs              = lov_statfs,
-        .o_packmd              = lov_packmd,
-        .o_unpackmd            = lov_unpackmd,
-        .o_create              = lov_create,
-        .o_destroy             = lov_destroy,
-        .o_getattr             = lov_getattr,
-        .o_getattr_async       = lov_getattr_async,
-        .o_setattr             = lov_setattr,
-        .o_brw                 = lov_brw,
-        .o_brw_async           = lov_brw_async,
-        .o_prep_async_page     = lov_prep_async_page,
-        .o_queue_async_io      = lov_queue_async_io,
-        .o_set_async_flags     = lov_set_async_flags,
-        .o_queue_group_io      = lov_queue_group_io,
-        .o_trigger_group_io    = lov_trigger_group_io,
-        .o_teardown_async_page = lov_teardown_async_page,
-        .o_punch               = lov_punch,
-        .o_sync                = lov_sync,
-        .o_enqueue             = lov_enqueue,
-        .o_match               = lov_match,
-        .o_change_cbdata       = lov_change_cbdata,
-        .o_cancel              = lov_cancel,
-        .o_cancel_unused       = lov_cancel_unused,
-        .o_iocontrol           = lov_iocontrol,
-        .o_get_info            = lov_get_info,
-        .o_set_info            = lov_set_info,
-        .o_llog_init           = lov_llog_init,
-        .o_llog_finish         = lov_llog_finish,
-        .o_notify              = lov_notify,
+        o_owner:       THIS_MODULE,
+        o_attach:      lov_attach,
+        o_detach:      lov_detach,
+        o_setup:       lov_setup,
+        o_cleanup:     lov_cleanup,
+        o_connect:     lov_connect,
+        o_disconnect:  lov_disconnect,
+        o_statfs:      lov_statfs,
+        o_packmd:      lov_packmd,
+        o_unpackmd:    lov_unpackmd,
+        o_create:      lov_create,
+        o_destroy:     lov_destroy,
+        o_getattr:     lov_getattr,
+        o_getattr_async: lov_getattr_async,
+        o_setattr:     lov_setattr,
+        o_brw:         lov_brw,
+        o_brw_async:   lov_brw_async,
+        .o_prep_async_page =    lov_prep_async_page,
+        .o_queue_async_io =     lov_queue_async_io,
+        .o_set_async_flags =    lov_set_async_flags,
+        .o_queue_group_io =     lov_queue_group_io,
+        .o_trigger_group_io =   lov_trigger_group_io,
+        .o_teardown_async_page  lov_teardown_async_page,
+        o_punch:       lov_punch,
+        o_sync:        lov_sync,
+        o_enqueue:     lov_enqueue,
+        o_match:       lov_match,
+        o_change_cbdata: lov_change_cbdata,
+        o_cancel:      lov_cancel,
+        o_cancel_unused: lov_cancel_unused,
+        o_iocontrol:   lov_iocontrol,
+        o_get_info:    lov_get_info,
+        o_set_info:    lov_set_info,
+        o_llog_init:   lov_llog_init,
+        o_llog_finish: lov_llog_finish,
+        o_notify: lov_notify,
 };
 
 int __init lov_init(void)
@@ -2880,7 +2885,7 @@ int __init lov_init(void)
         int rc;
 
         lprocfs_init_vars(lov, &lvars);
-        rc = class_register_type(&lov_obd_ops, lvars.module_vars,
+        rc = class_register_type(&lov_obd_ops, NULL, lvars.module_vars,
                                  OBD_LOV_DEVICENAME);
         RETURN(rc);
 }
diff --git a/lustre/lov/lov_pack.c b/lustre/lov/lov_pack.c
index 164bcec..8ffe30c 100644
--- a/lustre/lov/lov_pack.c
+++ b/lustre/lov/lov_pack.c
@@ -33,7 +33,7 @@
 #include <linux/obd_lov.h>
 #include <linux/obd_class.h>
 #include <linux/obd_support.h>
-#include <lustre/lustre_user.h>
+#include <linux/lustre_user.h>
 
 #include "lov_internal.h"
 
@@ -186,7 +186,7 @@ static int lov_verify_lmm_v0(struct lov_mds_md_v0 *lmm, int lmm_bytes,
 
         if (lmm_bytes < lov_mds_md_v0_size(*stripe_count)) {
                 CERROR("LOV EA too small: %d, need %d\n",
-                       lmm_bytes, lov_mds_md_v0_size(*stripe_count));
+                       lmm_bytes, lov_mds_md_size(*stripe_count));
                 lov_dump_lmm_v0(D_WARNING, lmm);
                 return -EINVAL;
         }
@@ -238,9 +238,9 @@ static int lov_verify_lmm_v1(struct lov_mds_md_v1 *lmm, int lmm_bytes,
                 return -EINVAL;
         }
 
-        if (lmm_bytes < lov_mds_md_v1_size(*stripe_count)) {
+        if (lmm_bytes < lov_mds_md_size(*stripe_count)) {
                 CERROR("LOV EA too small: %d, need %d\n",
-                       lmm_bytes, lov_mds_md_v1_size(*stripe_count));
+                       lmm_bytes, lov_mds_md_size(*stripe_count));
                 lov_dump_lmm_v1(D_WARNING, lmm);
                 return -EINVAL;
         }
@@ -295,7 +295,7 @@ int lov_alloc_memmd(struct lov_stripe_md **lsmp, int stripe_count, int pattern)
         (*lsmp)->lsm_magic = LOV_MAGIC;
         (*lsmp)->lsm_stripe_count = stripe_count;
         (*lsmp)->lsm_maxbytes = LUSTRE_STRIPE_MAXBYTES * stripe_count;
-        (*lsmp)->lsm_xfersize = PTLRPC_MAX_BRW_SIZE * stripe_count;
+        (*lsmp)->lsm_xfersize = PTLRPC_MTU * stripe_count;
         (*lsmp)->lsm_pattern = pattern;
         (*lsmp)->lsm_oinfo[0].loi_ost_idx = ~0;
 
@@ -505,7 +505,7 @@ int lov_setstripe(struct obd_export *exp, struct lov_stripe_md **lsmp,
 }
 
 int lov_setea(struct obd_export *exp, struct lov_stripe_md **lsmp,
-                  struct lov_user_md *lump)
+              struct lov_user_md *lump)
 {
         int i;
         int rc;
@@ -516,26 +516,25 @@ int lov_setea(struct obd_export *exp, struct lov_stripe_md **lsmp,
         for (i = 0; i < lump->lmm_stripe_count; i++) {
                 __u32 len = sizeof(last_id);
                 oexp = lov->tgts[lump->lmm_objects[i].l_ost_idx].ltd_exp;
-                rc = obd_get_info(oexp, strlen("last_id"), "last_id",
-                                  &len, &last_id);
+                rc = obd_get_info(oexp, strlen("last_id"), "last_id", 
+                                  &len, &last_id); 
                 if (rc)
                         RETURN(rc);
-                if (lump->lmm_objects[i].l_object_id > last_id) {
+                if (last_id < lump->lmm_objects[i].l_object_id) {
                         CERROR("Setting EA for object > than last id on "
-                               "ost idx %d "LPD64" > "LPD64" \n",
-                               lump->lmm_objects[i].l_ost_idx,
-                               lump->lmm_objects[i].l_object_id, last_id);
+                          "ost idx %d "LPD64" > "LPD64" \n", 
+                          lump->lmm_objects[i].l_ost_idx,
+                          lump->lmm_objects[i].l_object_id, last_id);
                         RETURN(-EINVAL);
                 }
         }
 
         rc = lov_setstripe(exp, lsmp, lump);
-        if (rc)
+        if (rc) 
                 RETURN(rc);
-
         for (i = 0; i < lump->lmm_stripe_count; i++) {
-                (*lsmp)->lsm_oinfo[i].loi_ost_idx =
-                        lump->lmm_objects[i].l_ost_idx;
+                (*lsmp)->lsm_oinfo[i].loi_ost_idx = 
+                                                 lump->lmm_objects[i].l_ost_idx;
                 (*lsmp)->lsm_oinfo[i].loi_id = lump->lmm_objects[i].l_object_id;
                 (*lsmp)->lsm_oinfo[i].loi_gr = lump->lmm_objects[i].l_object_gr;
         }
diff --git a/lustre/lov/lproc_lov.c b/lustre/lov/lproc_lov.c
index ee4883d..c29644c 100644
--- a/lustre/lov/lproc_lov.c
+++ b/lustre/lov/lproc_lov.c
@@ -198,10 +198,9 @@ static struct lprocfs_vars lprocfs_module_vars[] = {
 };
 
 struct file_operations lov_proc_target_fops = {
-        .owner   = THIS_MODULE,
-        .open    = lov_target_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
+        .open = lov_target_seq_open,
+        .read = seq_read,
+        .llseek = seq_lseek,
         .release = seq_release,
 };
 
diff --git a/lustre/lvfs/.cvsignore b/lustre/lvfs/.cvsignore
index ffeec5c..f686b81 100644
--- a/lustre/lvfs/.cvsignore
+++ b/lustre/lvfs/.cvsignore
@@ -3,15 +3,8 @@ config.log
 config.status
 configure
 Makefile
+Makefile.in
 .deps
 TAGS
 .*.cmd
-fsfilt-*.c
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
-sources
+fsfilt_extN.c
diff --git a/lustre/lvfs/Makefile.am b/lustre/lvfs/Makefile.am
new file mode 100644
index 0000000..9e91de3
--- /dev/null
+++ b/lustre/lvfs/Makefile.am
@@ -0,0 +1,52 @@
+# Copyright (C) 2001  Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+DEFS= 
+
+if LIBLUSTRE
+noinst_LIBRARIES = liblvfs.a
+liblvfs_a_SOURCES = lvfs_userfs.c
+liblvfs_a_CFLAGS = -fPIC
+
+#if MYSQL
+#liblvfs_a_SOURCES += lvfs_user_mysql.c
+#endif
+
+else
+
+MODULE = lvfs
+
+if EXTN
+FSMOD = fsfilt_extN
+else
+FSMOD = fsfilt_ext3
+endif
+
+modulefs_DATA = lvfs.o $(FSMOD).o
+
+EXTRA_PROGRAMS = lvfs $(FSMOD)
+lvfs_SOURCES = lvfs_common.c lvfs_linux.c fsfilt.c lvfs_internal.h
+if EXTN
+fsfilt_extN_SOURCES = fsfilt_extN.c lvfs_internal.h
+else
+fsfilt_ext3_SOURCES = fsfilt_ext3.c lvfs_internal.h
+endif
+endif
+
+fsfilt_extN.c: fsfilt_ext3.c
+	sed -e "s/EXT3/EXTN/g" -e "s/ext3/extN/g" $< > $@
+
+include $(top_srcdir)/Rules
+
+if LINUX25
+# workaround for fsfilt_ext3
+$(FSMOD).o: $(FSMOD).c
+	$(COMPILE) -UKBUILD_MODNAME -DKBUILD_MODNAME=$(FSMOD) -c -o $(FSMOD)_tmp.o $<
+	rm -f $(FSMOD)_tmp.c
+	$(LINUX)/scripts/modpost $(LINUX)/vmlinux $(FSMOD)_tmp.o
+	$(COMPILE) -UKBUILD_MODNAME -UKBUILD_BASENAME -DKBUILD_BASENAME=$(FSMOD) \
+		-c $(FSMOD)_tmp.mod.c
+	$(LD) -m "`$(LD) --help | awk '/supported emulations/ {print $$4}'`" -r \
+		-o $(FSMOD).o $(FSMOD)_tmp.o $(FSMOD)_tmp.mod.o
+endif
diff --git a/lustre/lvfs/Makefile.in b/lustre/lvfs/Makefile.in
deleted file mode 100644
index 89c76dd..0000000
--- a/lustre/lvfs/Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
-MODULES := lvfs fsfilt_@BACKINGFS@ fsfilt_smfs
-
-lvfs-objs := fsfilt.o lvfs_common.o llog_lvfs.o lvfs_linux.o 
-lvfs-objs += llog.o llog_cat.o lvfs_reint.o lvfs_undo.o
-
-ifeq ($(PATCHLEVEL),6)
-fsfilt_@BACKINGFS@-objs := fsfilt-@BACKINGFS@.o
-
-$(obj)/fsfilt-%.c: $(obj)/fsfilt_%.c
-	ln -s $< $@
-endif
-
-fsfilt_smfs-objs := fsfilt-smfs.o
-
-# for <ext3/xattr.h> on 2.6
-EXTRA_PRE_CFLAGS := -I@LINUX@/fs -I@LUSTRE@ -I@LUSTRE@/ldiskfs
-
-@INCLUDE_RULES@
diff --git a/lustre/lvfs/Makefile.mk b/lustre/lvfs/Makefile.mk
index bc1e6b2..81c177a 100644
--- a/lustre/lvfs/Makefile.mk
+++ b/lustre/lvfs/Makefile.mk
@@ -1,5 +1,4 @@
 include $(src)/../portals/Kernelenv
 
-obj-y += lvfs.o fsfilt_ext3.o fsfilt_smfs.o
-lvfs-objs := fsfilt.o lvfs_common.o llog_lvfs.o lvfs_linux.o 
-lvfs-objs += llog.o llog_cat.o lvfs_reint.o lvfs_undo.o
+obj-y += lvfs.o fsfilt_ext3.o 
+lvfs-objs := fsfilt.o  lvfs_common.o  lvfs_linux.o 
diff --git a/lustre/lvfs/autoMakefile.am b/lustre/lvfs/autoMakefile.am
deleted file mode 100644
index 16a2658..0000000
--- a/lustre/lvfs/autoMakefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright (C) 2001  Cluster File Systems, Inc.
-#
-# This code is issued under the GNU General Public License.
-# See the file COPYING in this distribution
-
-if LIBLUSTRE
-noinst_LIBRARIES = liblvfs.a
-liblvfs_a_SOURCES = lvfs_userfs.c llog_lvfs.c llog_cat.c llog.c
-liblvfs_a_CFLAGS = $(LLCFLAGS)
-liblvfs_a_CPPFLAGS = $(LLCPPFLAGS)
-
-#if MYSQL
-#liblvfs_a_SOURCES += lvfs_user_mysql.c
-#endif
-endif
-
-if MODULES
-
-modulefs_DATA = lvfs$(KMODEXT) fsfilt_$(BACKINGFS)$(KMODEXT) fsfilt_smfs$(KMODEXT)
-
-sources: fsfilt_$(BACKINGFS).c fsfilt_smfs.c
-	touch sources
-
-fsfilt_extN.c: fsfilt_ext3.c
-	sed -e "s/EXT3/EXTN/g" -e "s/ext3/extN/g" $< > $@
-
-fsfilt_smfs.c:
-	$< > $@
-
-ldiskfs_sed_flags = \
-	-e "s/dx_hash_info/ext3_dx_hash_info/g" \
-	-e "s/dir_private_info/ext3_dir_private_info/g" \
-	-e "s/DX_HASH/EXT3_DX_HASH/g" \
-	-e "s/EXT3/LDISKFS/g" -e "s/ext3/ldiskfs/g"
-
-fsfilt_ldiskfs.c: fsfilt_ext3.c
-	sed $(strip $(ldiskfs_sed_flags)) $< > $@
-
-endif # MODULES
-
-DIST_SOURCES = fsfilt.c fsfilt_ext3.c fsfilt_smfs.c fsfilt_reiserfs.c \
-	lvfs_common.c lvfs_internal.h lvfs_linux.c llog.c llog_cat.c \
-	llog_lvfs.c lvfs_reint.c lvfs_undo.c lvfs_userfs.c
-
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-CLEANFILES = fsfilt-*.c fsfilt_ldiskfs.c fsfilt_extN.c sources
diff --git a/lustre/lvfs/fsfilt_ext3.c b/lustre/lvfs/fsfilt_ext3.c
index 9c02ecd..b154e8a 100644
--- a/lustre/lvfs/fsfilt_ext3.c
+++ b/lustre/lvfs/fsfilt_ext3.c
@@ -35,24 +35,16 @@
 #include <linux/ext3_fs.h>
 #include <linux/ext3_jbd.h>
 #include <linux/version.h>
+/* XXX ugh */
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-#include <linux/ext3_xattr.h>
+ #include <linux/ext3_xattr.h>
 #else
-#include <ext3/xattr.h>
+ #include <linux/../../fs/ext3/xattr.h>
 #endif
-
 #include <linux/kp30.h>
 #include <linux/lustre_fsfilt.h>
 #include <linux/obd.h>
 #include <linux/obd_class.h>
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-#include <linux/module.h>
-#include <linux/iobuf.h>
-#endif
-
-#ifdef EXT3_MULTIBLOCK_ALLOCATOR
-#include <linux/ext3_extents.h>
-#endif
 
 static kmem_cache_t *fcb_cache;
 static atomic_t fcb_cache_count = ATOMIC_INIT(0);
@@ -70,6 +62,9 @@ struct fsfilt_cb_data {
 #endif
 #define XATTR_LUSTRE_MDS_LOV_EA         "lov"
 
+#define EXT3_XATTR_INDEX_LUSTRE         5                         /* old */
+#define XATTR_LUSTRE_MDS_OBJID          "system.lustre_mds_objid" /* old */
+
 /*
  * We don't currently need any additional blocks for rmdir and
  * unlink transactions because we are storing the OST oa_id inside
@@ -90,19 +85,6 @@ static void *fsfilt_ext3_start(struct inode *inode, int op, void *desc_private,
                 goto journal_start;
         }
 
-        /* XXX BUG 3188 -- must return to one set of opcodes */
-        /* FIXME - cache hook */
-        if (op & 0x20) {
-                nblocks += EXT3_INDEX_EXTRA_TRANS_BLOCKS+EXT3_DATA_TRANS_BLOCKS;
-                op = op & ~0x20;
-        }
-
-        /* FIXME - kml */
-        if (op & 0x10) {
-                nblocks += EXT3_INDEX_EXTRA_TRANS_BLOCKS+EXT3_DATA_TRANS_BLOCKS;
-                op = op & ~0x10;
-        }
-
         switch(op) {
         case FSFILT_OP_RMDIR:
         case FSFILT_OP_UNLINK:
@@ -144,11 +126,8 @@ static void *fsfilt_ext3_start(struct inode *inode, int op, void *desc_private,
                 nblocks = (LLOG_CHUNK_SIZE >> inode->i_blkbits) +
                         EXT3_DELETE_TRANS_BLOCKS * logs;
                 break;
-        case FSFILT_OP_NOOP:
-                nblocks += EXT3_INDEX_EXTRA_TRANS_BLOCKS+EXT3_DATA_TRANS_BLOCKS;
-                break;
         default: CERROR("unknown transaction start op %d\n", op);
-                LBUG();
+                 LBUG();
         }
 
         LASSERT(current->journal_info == desc_private);
@@ -325,17 +304,15 @@ static int fsfilt_ext3_commit(struct inode *inode, void *h, int force_sync)
         rc = journal_stop(handle);
         unlock_kernel();
 
+        // LASSERT(current->journal_info == NULL);
         return rc;
 }
 
 static int fsfilt_ext3_commit_async(struct inode *inode, void *h,
-                                    void **wait_handle)
+                                        void **wait_handle)
 {
-        unsigned long tid;
         transaction_t *transaction;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-        unsigned long rtid;
-#endif
+        unsigned long tid, rtid;
         handle_t *handle = h;
         journal_t *journal;
         int rc;
@@ -374,7 +351,7 @@ static int fsfilt_ext3_commit_wait(struct inode *inode, void *h)
         tid_t tid = (tid_t)(long)h;
 
         CDEBUG(D_INODE, "commit wait: %lu\n", (unsigned long) tid);
-        if (is_journal_aborted(EXT3_JOURNAL(inode)))
+	if (is_journal_aborted(EXT3_JOURNAL(inode)))
                 return -EIO;
 
         log_wait_commit(EXT3_JOURNAL(inode), tid);
@@ -442,20 +419,71 @@ static int fsfilt_ext3_iocontrol(struct inode * inode, struct file *file,
         RETURN(rc);
 }
 
+#undef INLINE_EA
+#undef OLD_EA
 static int fsfilt_ext3_set_md(struct inode *inode, void *handle,
                               void *lmm, int lmm_size)
 {
-        int rc;
+        int rc, old_ea = 0;
 
+#ifdef INLINE_EA  /* can go away before 1.0 - just for testing bug 2097 now */
+        /* Nasty hack city - store stripe MD data in the block pointers if
+         * it will fit, because putting it in an EA currently kills the MDS
+         * performance.  We'll fix this with "fast EAs" in the future.
+         */
+        if (inode->i_blocks == 0 && lmm_size <= sizeof(EXT3_I(inode)->i_data) -
+                                            sizeof(EXT3_I(inode)->i_data[0])) {
+                unsigned old_size = EXT3_I(inode)->i_data[0];
+                if (old_size != 0) {
+                        LASSERT(old_size < sizeof(EXT3_I(inode)->i_data));
+                        CERROR("setting EA on %lu/%u again... interesting\n",
+                               inode->i_ino, inode->i_generation);
+                }
+
+                EXT3_I(inode)->i_data[0] = cpu_to_le32(lmm_size);
+                memcpy(&EXT3_I(inode)->i_data[1], lmm, lmm_size);
+                mark_inode_dirty(inode);
+                return 0;
+        }
+#endif
+#ifdef OLD_EA
         /* keep this when we get rid of OLD_EA (too noisy during conversion) */
-        if (EXT3_I(inode)->i_file_acl /* || large inode EA flag */)
+        if (EXT3_I(inode)->i_file_acl /* || large inode EA flag */) {
                 CWARN("setting EA on %lu/%u again... interesting\n",
                        inode->i_ino, inode->i_generation);
+                old_ea = 1;
+        }
 
         lock_kernel();
+        /* this can go away before 1.0.  For bug 2097 testing only. */
+        rc = ext3_xattr_set_handle(handle, inode, EXT3_XATTR_INDEX_LUSTRE,
+                                   XATTR_LUSTRE_MDS_OBJID, lmm, lmm_size, 0);
+#else
+        lock_kernel();
         rc = ext3_xattr_set_handle(handle, inode, EXT3_XATTR_INDEX_TRUSTED,
                                    XATTR_LUSTRE_MDS_LOV_EA, lmm, lmm_size, 0);
 
+        /* This tries to delete the old-format LOV EA, but only as long as we
+         * have successfully saved the new-format LOV EA (we can always try
+         * the conversion again the next time the file is accessed).  It is
+         * possible (although unlikely) that the new-format LOV EA couldn't be
+         * saved because it ran out of space but we would need a file striped
+         * over least 123 OSTs before the two EAs filled a 4kB block.
+         *
+         * This can be removed when all filesystems have converted to the
+         * new EA format, but otherwise adds little if any overhead.  If we
+         * wanted backward compatibility for existing files, we could keep
+         * the old EA around for a while but we'd have to clean it up later. */
+        if (rc >= 0 && old_ea) {
+                int err = ext3_xattr_set_handle(handle, inode,
+                                                EXT3_XATTR_INDEX_LUSTRE,
+                                                XATTR_LUSTRE_MDS_OBJID,
+                                                NULL, 0, 0);
+                if (err)
+                        CERROR("error deleting old LOV EA on %lu/%u: rc %d\n",
+                               inode->i_ino, inode->i_generation, err);
+        }
+#endif
         unlock_kernel();
 
         if (rc)
@@ -471,9 +499,61 @@ static int fsfilt_ext3_get_md(struct inode *inode, void *lmm, int lmm_size)
 
         LASSERT(down_trylock(&inode->i_sem) != 0);
         lock_kernel();
+        /* Keep support for reading "inline EAs" until we convert
+         * users over to new format entirely.  See bug 841/2097. */
+        if (inode->i_blocks == 0 && EXT3_I(inode)->i_data[0]) {
+                unsigned size = le32_to_cpu(EXT3_I(inode)->i_data[0]);
+                void *handle;
+
+                LASSERT(size < sizeof(EXT3_I(inode)->i_data));
+                if (lmm) {
+                        if (size > lmm_size) {
+                                CERROR("inline EA on %lu/%u bad size %u > %u\n",
+                                       inode->i_ino, inode->i_generation,
+                                       size, lmm_size);
+                                return -ERANGE;
+                        }
+                        memcpy(lmm, &EXT3_I(inode)->i_data[1], size);
+                }
+
+#ifndef INLINE_EA
+                /* migrate LOV EA data to external block - keep same format */
+                CWARN("DEBUG: migrate inline EA for inode %lu/%u to block\n",
+                      inode->i_ino, inode->i_generation);
+
+                handle = journal_start(EXT3_JOURNAL(inode),
+                                       EXT3_XATTR_TRANS_BLOCKS);
+                if (!IS_ERR(handle)) {
+                        int err;
+                        rc = fsfilt_ext3_set_md(inode, handle,
+                                                &EXT3_I(inode)->i_data[1],size);
+                        if (rc == 0) {
+                                memset(EXT3_I(inode)->i_data, 0,
+                                       sizeof(EXT3_I(inode)->i_data));
+                                mark_inode_dirty(inode);
+                        }
+                        err = journal_stop(handle);
+                        if (err && rc == 0)
+                                rc = err;
+                } else {
+                        rc = PTR_ERR(handle);
+                }
+#endif
+                unlock_kernel();
+                return size;
+        }
 
         rc = ext3_xattr_get(inode, EXT3_XATTR_INDEX_TRUSTED,
                             XATTR_LUSTRE_MDS_LOV_EA, lmm, lmm_size);
+        /* try old EA type if new one failed - MDS will convert it for us */
+        if (rc == -ENODATA) {
+                CDEBUG(D_INFO,"failed new LOV EA %d/%s from inode %lu: rc %d\n",
+                       EXT3_XATTR_INDEX_TRUSTED, XATTR_LUSTRE_MDS_LOV_EA,
+                       inode->i_ino, rc);
+
+                rc = ext3_xattr_get(inode, EXT3_XATTR_INDEX_LUSTRE,
+                                    XATTR_LUSTRE_MDS_OBJID, lmm, lmm_size);
+        }
         unlock_kernel();
 
         /* This gives us the MD size */
@@ -482,7 +562,7 @@ static int fsfilt_ext3_get_md(struct inode *inode, void *lmm, int lmm_size)
 
         if (rc < 0) {
                 CDEBUG(D_INFO, "error getting EA %d/%s from inode %lu: rc %d\n",
-                       EXT3_XATTR_INDEX_TRUSTED, XATTR_LUSTRE_MDS_LOV_EA,
+                       EXT3_XATTR_INDEX_LUSTRE, XATTR_LUSTRE_MDS_OBJID,
                        inode->i_ino, rc);
                 memset(lmm, 0, lmm_size);
                 return (rc == -ENODATA) ? 0 : rc;
@@ -491,57 +571,6 @@ static int fsfilt_ext3_get_md(struct inode *inode, void *lmm, int lmm_size)
         return rc;
 }
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-static int fsfilt_ext3_send_bio(struct inode *inode, struct bio *bio)
-{
-        submit_bio(WRITE, bio);
-        return 0;
-}
-#else
-static int fsfilt_ext3_send_bio(struct inode *inode, struct kiobuf *bio)
-{
-        int rc, blocks_per_page;
-
-        rc = brw_kiovec(WRITE, 1, &bio, inode->i_dev,
-                        bio->blocks, 1 << inode->i_blkbits);
-
-        blocks_per_page = PAGE_SIZE >> inode->i_blkbits;
-
-        if (rc != (1 << inode->i_blkbits) * bio->nr_pages *
-            blocks_per_page) {
-                CERROR("short write?  expected %d, wrote %d\n",
-                       (1 << inode->i_blkbits) * bio->nr_pages *
-                       blocks_per_page, rc);
-        }
-
-        return rc;
-}
-#endif
-
-/* FIXME-UMKA: This should be used in 2.6.x io code later. */
-static struct page *fsfilt_ext3_getpage(struct inode *inode, long int index)
-{
-        int rc;
-        struct page *page;
-
-        page = grab_cache_page(inode->i_mapping, index);
-        if (page == NULL)
-                return ERR_PTR(-ENOMEM);
-
-        if (PageUptodate(page)) {
-                unlock_page(page);
-                return page;
-        }
-
-        rc = inode->i_mapping->a_ops->readpage(NULL, page);
-        if (rc < 0) {
-                page_cache_release(page);
-                return ERR_PTR(rc);
-        }
-
-        return page;
-}
-
 static ssize_t fsfilt_ext3_readpage(struct file *file, char *buf, size_t count,
                                     loff_t *off)
 {
@@ -608,9 +637,7 @@ static void fsfilt_ext3_cb_func(struct journal_callback *jcb, int error)
         atomic_dec(&fcb_cache_count);
 }
 
-static int fsfilt_ext3_add_journal_cb(struct obd_device *obd,
-                                      struct super_block *sb,
-                                      __u64 last_rcvd,
+static int fsfilt_ext3_add_journal_cb(struct obd_device *obd, __u64 last_rcvd,
                                       void *handle, fsfilt_cb_t cb_func,
                                       void *cb_data)
 {
@@ -665,231 +692,12 @@ static int fsfilt_ext3_sync(struct super_block *sb)
         return ext3_force_commit(sb);
 }
 
-#ifdef EXT3_MULTIBLOCK_ALLOCATOR
-struct bpointers {
-        unsigned long *blocks;
-        int *created;
-        unsigned long start;
-        int num;
-        int init_num;
-};
-
-static int ext3_ext_new_extent_cb(struct ext3_extents_tree *tree,
-                                  struct ext3_ext_path *path,
-                                  struct ext3_extent *newex, int exist)
-{
-        struct inode *inode = tree->inode;
-        struct bpointers *bp = tree->private;
-        int count, err, goal;
-        unsigned long pblock;
-        unsigned long tgen;
-        loff_t new_i_size;
-        handle_t *handle;
-        int i;
-
-        i = EXT_DEPTH(tree);
-        EXT_ASSERT(i == path->p_depth);
-        EXT_ASSERT(path[i].p_hdr);
-
-        if (exist) {
-                err = EXT_CONTINUE;
-                goto map;
-        }
-
-        tgen = EXT_GENERATION(tree);
-        count = ext3_ext_calc_credits_for_insert(tree, path);
-        up_write(&EXT3_I(inode)->truncate_sem);
-
-        handle = ext3_journal_start(inode, count + EXT3_ALLOC_NEEDED + 1);
-        if (IS_ERR(handle)) {
-                down_write(&EXT3_I(inode)->truncate_sem);
-                return PTR_ERR(handle);
-        }
-
-        if (tgen != EXT_GENERATION(tree)) {
-                /* the tree has changed. so path can be invalid at moment */
-                ext3_journal_stop(handle, inode);
-                down_write(&EXT3_I(inode)->truncate_sem);
-                return EXT_REPEAT;
-        }
-
-        down_write(&EXT3_I(inode)->truncate_sem);
-        goal = ext3_ext_find_goal(inode, path, newex->e_block);
-        count = newex->e_num;
-        pblock = ext3_new_blocks(handle, inode, &count, goal, &err);
-        if (!pblock)
-                goto out;
-        EXT_ASSERT(count <= newex->e_num);
-
-        /* insert new extent */
-        newex->e_start = pblock;
-        newex->e_num = count;
-        err = ext3_ext_insert_extent(handle, tree, path, newex);
-        if (err)
-                goto out;
-
-        /* correct on-disk inode size */
-        if (newex->e_num > 0) {
-                new_i_size = (loff_t) newex->e_block + newex->e_num;
-                new_i_size = new_i_size << inode->i_blkbits;
-                if (new_i_size > EXT3_I(inode)->i_disksize) {
-                        EXT3_I(inode)->i_disksize = new_i_size;
-                        err = ext3_mark_inode_dirty(handle, inode);
-                }
-        }
-
-out:
-        ext3_journal_stop(handle, inode);
-map:
-        if (err >= 0) {
-                /* map blocks */
-                if (bp->num == 0) {
-                        CERROR("hmm. why do we find this extent?\n");
-                        CERROR("initial space: %lu:%u\n",
-                                bp->start, bp->init_num);
-                        CERROR("current extent: %u/%u/%u %d\n",
-                                newex->e_block, newex->e_num,
-                                newex->e_start, exist);
-                }
-                i = 0;
-                if (newex->e_block < bp->start)
-                        i = bp->start - newex->e_block;
-                if (i >= newex->e_num)
-                        CERROR("nothing to do?! i = %d, e_num = %u\n",
-                                        i, newex->e_num);
-                for (; i < newex->e_num && bp->num; i++) {
-                        *(bp->created) = (exist == 0 ? 1 : 0);
-                        bp->created++;
-                        *(bp->blocks) = newex->e_start + i;
-                        bp->blocks++;
-                        bp->num--;
-                }
-        }
-        return err;
-}
-
-int fsfilt_map_nblocks(struct inode *inode, unsigned long block,
-                       unsigned long num, unsigned long *blocks,
-                       int *created, int create)
-{
-        struct ext3_extents_tree tree;
-        struct bpointers bp;
-        int err;
-
-        CDEBUG(D_OTHER, "blocks %lu-%lu requested for inode %u\n",
-                block, block + num, (unsigned) inode->i_ino);
-
-        ext3_init_tree_desc(&tree, inode);
-        tree.private = &bp;
-        bp.blocks = blocks;
-        bp.created = created;
-        bp.start = block;
-        bp.init_num = bp.num = num;
-
-        down_write(&EXT3_I(inode)->truncate_sem);
-        err = ext3_ext_walk_space(&tree, block, num, ext3_ext_new_extent_cb);
-        ext3_ext_invalidate_cache(&tree);
-        up_write(&EXT3_I(inode)->truncate_sem);
-
-        return err;
-}
-
-int fsfilt_ext3_map_ext_inode_pages(struct inode *inode, struct page **page,
-                                    int pages, unsigned long *blocks,
-                                    int *created, int create)
-{
-        int blocks_per_page = PAGE_SIZE >> inode->i_blkbits;
-        int rc = 0, i = 0;
-        struct page *fp = NULL;
-        int clen = 0;
-
-        CDEBUG(D_OTHER, "inode %lu: map %d pages from %lu\n",
-                inode->i_ino, pages, (*page)->index);
-
-        /* pages are sorted already. so, we just have to find
-         * contig. space and process them properly */
-        while (i < pages) {
-                if (fp == NULL) {
-                        /* start new extent */
-                        fp = *page++;
-                        clen = 1;
-                        i++;
-                        continue;
-                } else if (fp->index + clen == (*page)->index) {
-                        /* continue the extent */
-                        page++;
-                        clen++;
-                        i++;
-                        continue;
-                }
-
-                /* process found extent */
-                rc = fsfilt_map_nblocks(inode, fp->index * blocks_per_page,
-                                        clen * blocks_per_page, blocks,
-                                        created, create);
-                if (rc)
-                        GOTO(cleanup, rc);
-
-                /* look for next extent */
-                fp = NULL;
-                blocks += blocks_per_page * clen;
-                created += blocks_per_page * clen;
-        }
-
-        if (fp)
-                rc = fsfilt_map_nblocks(inode, fp->index * blocks_per_page,
-                                        clen * blocks_per_page, blocks,
-                                        created, create);
-cleanup:
-        return rc;
-}
-#endif
-
 extern int ext3_map_inode_page(struct inode *inode, struct page *page,
                                unsigned long *blocks, int *created, int create);
-int fsfilt_ext3_map_bm_inode_pages(struct inode *inode, struct page **page,
-                                   int pages, unsigned long *blocks,
-                                   int *created, int create)
+int fsfilt_ext3_map_inode_page(struct inode *inode, struct page *page,
+                               unsigned long *blocks, int *created, int create)
 {
-        int blocks_per_page = PAGE_SIZE >> inode->i_blkbits;
-        unsigned long *b;
-        int rc = 0, i, *cr;
-
-        for (i = 0, cr = created, b = blocks; i < pages; i++, page++) {
-                rc = ext3_map_inode_page(inode, *page, b, cr, create);
-                if (rc) {
-                        CERROR("ino %lu, blk %lu cr %u create %d: rc %d\n",
-                               inode->i_ino, *b, *cr, create, rc);
-                        break;
-                }
-
-                b += blocks_per_page;
-                cr += blocks_per_page;
-        }
-        return rc;
-}
-
-int fsfilt_ext3_map_inode_pages(struct inode *inode, struct page **page,
-                                int pages, unsigned long *blocks,
-                                int *created, int create,
-                                struct semaphore *optional_sem)
-{
-        int rc;
-#ifdef EXT3_MULTIBLOCK_ALLOCATOR
-        if (EXT3_I(inode)->i_flags & EXT3_EXTENTS_FL) {
-                rc = fsfilt_ext3_map_ext_inode_pages(inode, page, pages,
-                                                     blocks, created, create);
-                return rc;
-        }
-#endif
-        if (optional_sem != NULL)
-                down(optional_sem);
-        rc = fsfilt_ext3_map_bm_inode_pages(inode, page, pages, blocks,
-                                            created, create);
-        if (optional_sem != NULL)
-                up(optional_sem);
-
-        return rc;
+        return ext3_map_inode_page(inode, page, blocks, created, create);
 }
 
 extern int ext3_prep_san_write(struct inode *inode, long *blocks,
@@ -1034,8 +842,9 @@ out:
         return err;
 }
 
-static int fsfilt_ext3_setup(struct super_block *sb)
+static int fsfilt_ext3_setup(struct obd_device *obd, struct super_block *sb)
 {
+        struct mds_obd *mds = &obd->u.mds;
 #if 0
         EXT3_SB(sb)->dx_lock = fsfilt_ext3_dx_lock;
         EXT3_SB(sb)->dx_unlock = fsfilt_ext3_dx_unlock;
@@ -1045,45 +854,97 @@ static int fsfilt_ext3_setup(struct super_block *sb)
         set_opt(EXT3_SB(sb)->s_mount_opt, PDIROPS);
         sb->s_flags |= S_PDIROPS;
 #endif
+        /* setup mdsnum in underlying fs */
+#ifdef EXT3_FEATURE_INCOMPAT_MDSNUM
+        if (mds->mds_lmv_obd) {
+                struct ext3_sb_info *sbi = EXT3_SB(sb);
+                struct ext3_super_block *es = sbi->s_es;
+                handle_t *handle;
+                int err;
+                
+                if (!EXT3_HAS_INCOMPAT_FEATURE(sb, EXT3_FEATURE_INCOMPAT_MDSNUM)) {
+                        CWARN("%s: set mdsnum %d in ext3fs\n",
+                                        obd->obd_name, mds->mds_num);
+                        lock_kernel();
+                        handle = journal_start(sbi->s_journal, 1);
+                        unlock_kernel();
+                        LASSERT(!IS_ERR(handle));
+                        err = ext3_journal_get_write_access(handle, sbi->s_sbh);
+                        LASSERT(err == 0);
+                        EXT3_SET_INCOMPAT_FEATURE(sb,
+                                                EXT3_FEATURE_INCOMPAT_MDSNUM);
+                        es->s_mdsnum = mds->mds_num;
+                        err = ext3_journal_dirty_metadata(handle, sbi->s_sbh);
+                        LASSERT(err == 0);
+                        lock_kernel();
+                        journal_stop(handle);
+                        unlock_kernel();
+                } else {
+                        CWARN("%s: mdsnum initialized to %u in ext3fs\n",
+                                obd->obd_name, es->s_mdsnum);
+                }
+                sbi->s_mdsnum = es->s_mdsnum;
+        }
+#endif
         return 0;
 }
 
-static int fsfilt_ext3_set_xattr(struct inode * inode, void *handle, char *name,
-                                 void *buffer, int buffer_size)
+extern int ext3_add_dir_entry(struct dentry *dentry);
+extern int ext3_del_dir_entry(struct dentry *dentry);
+
+static int fsfilt_ext3_add_dir_entry(struct obd_device *obd,
+                                 struct dentry *parent,
+                                 char *name, int namelen,
+                                 unsigned long ino,
+                                 unsigned long generation,
+                                 unsigned mds)
 {
-        int rc = 0;
+#ifdef EXT3_FEATURE_INCOMPAT_MDSNUM
+        struct dentry *dentry;
+        int err;
+        dentry = ll_lookup_one_len(name, parent, namelen);
+        if (IS_ERR(dentry))
+                RETURN(PTR_ERR(dentry));
+        if (dentry->d_inode != NULL) {
+                CERROR("dentry %*s(0x%p) found\n", dentry->d_name.len,
+                       dentry->d_name.name, dentry);
+                l_dput(dentry);
+                RETURN(-EEXIST);
+        }
 
-        lock_kernel();
+        /* mds_reint_rename() may use this method to add dir entry 
+         * that points onto local inode. and we don't want to find
+         * it cross-ref by subsequent lookups */
+        d_drop(dentry);
 
-        rc = ext3_xattr_set_handle(handle, inode, EXT3_XATTR_INDEX_TRUSTED,
-                                   name, buffer, buffer_size, 0);
-        unlock_kernel();
-        if (rc)
-                CERROR("set xattr %s from inode %lu: rc %d\n",
-                       name,  inode->i_ino, rc);
-        return rc;
+        dentry->d_flags |= DCACHE_CROSS_REF;
+        dentry->d_inum = ino;
+        dentry->d_mdsnum = mds;
+        dentry->d_generation = generation;
+        err = ext3_add_dir_entry(dentry);
+        
+        l_dput(dentry);
+
+        return err;
+#else
+#error "rebuild kernel and lustre with ext3-mds-num patch!"
+        LASSERT(0);
+#endif
 }
 
-static int fsfilt_ext3_get_xattr(struct inode *inode, char *name,
-                                 void *buffer, int buffer_size)
+static int fsfilt_ext3_del_dir_entry(struct obd_device *obd,
+                                 struct dentry *dentry)
 {
-        int rc = 0;
-        lock_kernel();
-
-        rc = ext3_xattr_get(inode, EXT3_XATTR_INDEX_TRUSTED,
-                            name, buffer, buffer_size);
-        unlock_kernel();
-
-        if (buffer == NULL)
-                return (rc == -ENODATA) ? 0 : rc;
-        if (rc < 0) {
-                CDEBUG(D_INFO, "error getting EA %s from inode %lu: rc %d\n",
-                       name,  inode->i_ino, rc);
-                memset(buffer, 0, buffer_size);
-                return (rc == -ENODATA) ? 0 : rc;
-        }
-
-        return rc;
+#ifdef EXT3_FEATURE_INCOMPAT_MDSNUM
+        int err;
+        err = ext3_del_dir_entry(dentry);
+        if (err == 0)
+                d_drop(dentry);
+        return err;
+#else
+#error "rebuild kernel and lustre with ext3-mds-num patch!"
+        LASSERT(0);
+#endif
 }
 
 /* If fso is NULL, op is FSFILT operation, otherwise op is number of fso
@@ -1118,37 +979,36 @@ static int fsfilt_ext3_get_op_len(int op, struct fsfilt_objinfo *fso, int logs)
 }
 
 static struct fsfilt_operations fsfilt_ext3_ops = {
-        .fs_type                = "ext3",
-        .fs_owner               = THIS_MODULE,
-        .fs_start               = fsfilt_ext3_start,
-        .fs_brw_start           = fsfilt_ext3_brw_start,
-        .fs_commit              = fsfilt_ext3_commit,
-        .fs_commit_async        = fsfilt_ext3_commit_async,
-        .fs_commit_wait         = fsfilt_ext3_commit_wait,
-        .fs_setattr             = fsfilt_ext3_setattr,
-        .fs_iocontrol           = fsfilt_ext3_iocontrol,
-        .fs_set_md              = fsfilt_ext3_set_md,
-        .fs_get_md              = fsfilt_ext3_get_md,
-        .fs_readpage            = fsfilt_ext3_readpage,
-        .fs_add_journal_cb      = fsfilt_ext3_add_journal_cb,
-        .fs_statfs              = fsfilt_ext3_statfs,
-        .fs_sync                = fsfilt_ext3_sync,
-        .fs_map_inode_pages     = fsfilt_ext3_map_inode_pages,
-        .fs_prep_san_write      = fsfilt_ext3_prep_san_write,
-        .fs_write_record        = fsfilt_ext3_write_record,
-        .fs_read_record         = fsfilt_ext3_read_record,
-        .fs_setup               = fsfilt_ext3_setup,
-        .fs_getpage             = fsfilt_ext3_getpage,
-        .fs_send_bio            = fsfilt_ext3_send_bio,
-        .fs_set_xattr           = fsfilt_ext3_set_xattr,
-        .fs_get_xattr           = fsfilt_ext3_get_xattr,
-        .fs_get_op_len          = fsfilt_ext3_get_op_len,
+        fs_type:                "ext3",
+        fs_owner:               THIS_MODULE,
+        fs_start:               fsfilt_ext3_start,
+        fs_brw_start:           fsfilt_ext3_brw_start,
+        fs_commit:              fsfilt_ext3_commit,
+        fs_commit_async:        fsfilt_ext3_commit_async,
+        fs_commit_wait:         fsfilt_ext3_commit_wait,
+        fs_setattr:             fsfilt_ext3_setattr,
+        fs_iocontrol:           fsfilt_ext3_iocontrol,
+        fs_set_md:              fsfilt_ext3_set_md,
+        fs_get_md:              fsfilt_ext3_get_md,
+        fs_readpage:            fsfilt_ext3_readpage,
+        fs_add_journal_cb:      fsfilt_ext3_add_journal_cb,
+        fs_statfs:              fsfilt_ext3_statfs,
+        fs_sync:                fsfilt_ext3_sync,
+        fs_map_inode_page:      fsfilt_ext3_map_inode_page,
+        fs_prep_san_write:      fsfilt_ext3_prep_san_write,
+        fs_write_record:        fsfilt_ext3_write_record,
+        fs_read_record:         fsfilt_ext3_read_record,
+        fs_setup:               fsfilt_ext3_setup,
+        fs_get_op_len:          fsfilt_ext3_get_op_len,
+        fs_add_dir_entry:       fsfilt_ext3_add_dir_entry,
+        fs_del_dir_entry:       fsfilt_ext3_del_dir_entry,
 };
 
 static int __init fsfilt_ext3_init(void)
 {
         int rc;
 
+        //rc = ext3_xattr_register();
         fcb_cache = kmem_cache_create("fsfilt_ext3_fcb",
                                       sizeof(struct fsfilt_cb_data), 0,
                                       0, NULL, NULL);
@@ -1176,6 +1036,8 @@ static void __exit fsfilt_ext3_exit(void)
                 CERROR("can't free fsfilt callback cache: count %d, rc = %d\n",
                        atomic_read(&fcb_cache_count), rc);
         }
+
+        //rc = ext3_xattr_unregister();
 }
 
 module_init(fsfilt_ext3_init);
diff --git a/lustre/lvfs/fsfilt_reiserfs.c b/lustre/lvfs/fsfilt_reiserfs.c
index 861b663..b38ba4a 100644
--- a/lustre/lvfs/fsfilt_reiserfs.c
+++ b/lustre/lvfs/fsfilt_reiserfs.c
@@ -213,19 +213,19 @@ static int fsfilt_reiserfs_get_op_len(int op, struct fsfilt_objinfo *fso,
         return 0;
 }
 static struct fsfilt_operations fsfilt_reiserfs_ops = {
-        .fs_type                = "reiserfs",
-        .fs_owner               = THIS_MODULE,
-        .fs_start               = fsfilt_reiserfs_start,
-        .fs_brw_start           = fsfilt_reiserfs_brw_start,
-        .fs_commit              = fsfilt_reiserfs_commit,
-        .fs_setattr             = fsfilt_reiserfs_setattr,
-        .fs_set_md              = fsfilt_reiserfs_set_md,
-        .fs_get_md              = fsfilt_reiserfs_get_md,
-        .fs_readpage            = fsfilt_reiserfs_readpage,
-        .fs_add_journal_cb      = fsfilt_reiserfs_add_journal_cb,
-        .fs_statfs              = fsfilt_reiserfs_statfs,
-        .fs_sync                = fsfilt_reiserfs_sync,
-        .fs_get_op_len          = fsfilt_reiserfs_get_op_len,
+        fs_type:                "reiserfs",
+        fs_owner:               THIS_MODULE,
+        fs_start:               fsfilt_reiserfs_start,
+        fs_brw_start:           fsfilt_reiserfs_brw_start,
+        fs_commit:              fsfilt_reiserfs_commit,
+        fs_setattr:             fsfilt_reiserfs_setattr,
+        fs_set_md:              fsfilt_reiserfs_set_md,
+        fs_get_md:              fsfilt_reiserfs_get_md,
+        fs_readpage:            fsfilt_reiserfs_readpage,
+        fs_add_journal_cb:      fsfilt_reiserfs_add_journal_cb,
+        fs_statfs:              fsfilt_reiserfs_statfs,
+        fs_sync:                fsfilt_reiserfs_sync,
+        fs_get_op_len:          fsfilt_reiserfs_get_op_len,
 };
 
 static int __init fsfilt_reiserfs_init(void)
diff --git a/lustre/lvfs/fsfilt_smfs.c b/lustre/lvfs/fsfilt_smfs.c
deleted file mode 100644
index 151e624..0000000
--- a/lustre/lvfs/fsfilt_smfs.c
+++ /dev/null
@@ -1,700 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
- *  lustre/lib/fsfilt_smfs.c
- *  Lustre filesystem abstraction routines
- *
- *  Copyright (C) 2002, 2003 Cluster File Systems, Inc.
- *   Author: Wang Di <wangdi@clusterfs.com>
- *
- *   This file is part of Lustre, http://www.lustre.org.
- *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
- *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#define DEBUG_SUBSYSTEM S_FILTER
-
-#include <linux/fs.h>
-#include <linux/jbd.h>
-#include <linux/slab.h>
-#include <linux/pagemap.h>
-#include <linux/quotaops.h>
-#include <linux/version.h>
-#include <linux/kp30.h>
-#include <linux/lustre_fsfilt.h>
-#include <linux/lustre_smfs.h>
-#include <linux/obd.h>
-#include <linux/obd_class.h>
-#include <linux/module.h>
-#include <linux/init.h>
-
-static void *fsfilt_smfs_start(struct inode *inode, int op, 
-                               void *desc_private, int logs)
-{
-	void *handle;
-        struct inode *cache_inode = I2CI(inode);
-	struct fsfilt_operations *cache_fsfilt = I2FOPS(inode);
-
-        if (cache_fsfilt == NULL)
-                return NULL;
-
-        if (!cache_fsfilt->fs_start)
-		return ERR_PTR(-ENOSYS);
-		
-        handle = cache_fsfilt->fs_start(cache_inode, op, 
-					desc_private, logs);
-        return handle;
-}
-
-static void *fsfilt_smfs_brw_start(int objcount, struct fsfilt_objinfo *fso,
-                                   int niocount, struct niobuf_local *nb,
-                                   void *desc_private, int logs)
-{
-	struct fsfilt_operations *cache_fsfilt;
-        struct dentry *cache_dentry = NULL;
-        struct inode *cache_inode = NULL;
-        struct fsfilt_objinfo cache_fso;
-        void   *rc = NULL;
-        
-        ENTRY; 
-        cache_fsfilt = I2FOPS(fso->fso_dentry->d_inode);
-        if (cache_fsfilt == NULL) 
-                return NULL;
-
-        cache_inode = I2CI(fso->fso_dentry->d_inode);
- 	cache_dentry = pre_smfs_dentry(NULL, cache_inode, fso->fso_dentry);	
-    
-        if (!cache_dentry)
-                GOTO(exit, rc = ERR_PTR(-ENOMEM));
-    
-        cache_fso.fso_dentry = cache_dentry; 
-        cache_fso.fso_bufcnt = fso->fso_bufcnt;
- 
-        if (!cache_fsfilt->fs_brw_start)
-		return ERR_PTR(-ENOSYS);
-		
-        rc = (cache_fsfilt->fs_brw_start(objcount, &cache_fso, 
-                            		 niocount, nb, desc_private,
-                                         logs));
-exit:
-        post_smfs_dentry(cache_dentry); 
-        return rc; 
-}
-
-static int fsfilt_smfs_commit(struct inode *inode, void *h, 
-                              int force_sync)
-{
-	struct fsfilt_operations *cache_fsfilt = I2FOPS(inode);
-        struct inode *cache_inode = NULL;
-        int    rc = -EIO;      
- 
-        cache_inode = I2CI(inode);
- 
-        if (cache_fsfilt == NULL)
-                RETURN(rc);
-       
-        if (!cache_fsfilt->fs_commit) 
-		RETURN(-ENOSYS);
-        
-	rc = cache_fsfilt->fs_commit(cache_inode, h, force_sync);
-        
-        RETURN(rc);
-}
-
-static int fsfilt_smfs_commit_async(struct inode *inode, void *h,
-                                    void **wait_handle)
-{
-	struct fsfilt_operations *cache_fsfilt = I2FOPS(inode);
-        struct inode *cache_inode = NULL;
-        int    rc = -EIO;      
- 
-        cache_inode = I2CI(inode);
-        if (cache_fsfilt == NULL)
-    		RETURN(-EINVAL);
-       
-        if (!cache_fsfilt->fs_commit_async)
-		RETURN(-ENOSYS);
-		
-        rc = cache_fsfilt->fs_commit_async(cache_inode, h, wait_handle);
-        
-        RETURN(rc);
-}
-
-static int fsfilt_smfs_commit_wait(struct inode *inode, void *h)
-{
-	struct fsfilt_operations *cache_fsfilt = I2FOPS(inode);
-        struct inode *cache_inode = NULL;
-        int    rc = -EIO;      
- 
-        cache_inode = I2CI(inode);
-        if (cache_fsfilt == NULL)
-                RETURN(-EINVAL);
-       
-        if (!cache_fsfilt->fs_commit_wait) 
-		RETURN(-ENOSYS);
-        
-	rc = cache_fsfilt->fs_commit_wait(cache_inode, h);
-        
-        RETURN(rc);
-}
-
-static int fsfilt_smfs_setattr(struct dentry *dentry, void *handle,
-                               struct iattr *iattr, int do_trunc)
-{
-	struct fsfilt_operations *cache_fsfilt = I2FOPS(dentry->d_inode);
-        struct dentry *cache_dentry = NULL;
-        struct inode *cache_inode = NULL;
-        int    rc = -EIO;
- 
-        if (!cache_fsfilt) 
-                RETURN(rc);
- 
-        cache_inode = I2CI(dentry->d_inode); 
-       
-	cache_dentry = pre_smfs_dentry(NULL, cache_inode, dentry);	
-        if (!cache_dentry)
-                GOTO(exit, rc = -ENOMEM);
-  
-        pre_smfs_inode(dentry->d_inode, cache_inode);
-        
-        if (!cache_fsfilt->fs_setattr)
-		RETURN(-ENOSYS);
-		
-	rc = cache_fsfilt->fs_setattr(cache_dentry, handle, 
-                                      iattr, do_trunc);
-        
-        post_smfs_inode(dentry->d_inode, cache_inode);
-       
-exit:
-        post_smfs_dentry(cache_dentry);
-        RETURN(rc);                    
-}
-
-static int fsfilt_smfs_iocontrol(struct inode *inode, struct file *file,
-                                 unsigned int cmd, unsigned long arg)
-{
-	struct fsfilt_operations *cache_fsfilt = I2FOPS(inode);
-        struct inode *cache_inode = NULL;
-	struct smfs_file_info *sfi = NULL;
-        int    rc = -EIO;                                                                                                                                                                                                     
-        ENTRY;
-                                                                                                                                                                                                     
-        if (!cache_fsfilt) 
-                RETURN(rc);
-        
-        cache_inode = I2CI(inode);
-       
-        if (!cache_inode)
-                RETURN(rc);
-
-	if (file != NULL) {
-		sfi = F2SMFI(file);
-		
-		if (sfi->magic != SMFS_FILE_MAGIC) 
-			BUG();
-	} else {
-		sfi = NULL;
-	}
-        
-        if (!cache_fsfilt->fs_iocontrol)
-		RETURN(-ENOSYS);
-    
-	if (sfi) {
-		rc = cache_fsfilt->fs_iocontrol(cache_inode,
-						sfi->c_file, 
-                                    		cmd, arg);
-	} else {
-		rc = cache_fsfilt->fs_iocontrol(cache_inode,
-						NULL, cmd, arg);
-	}
-	
-	/* FIXME-UMKA: Should this be in duplicate_inode()? */
-	if (rc == 0 && cmd == EXT3_IOC_SETFLAGS)
-		inode->i_flags = cache_inode->i_flags;
-		
-	post_smfs_inode(inode, cache_inode); 
-
-        RETURN(rc);
-}
-
-static int fsfilt_smfs_set_md(struct inode *inode, void *handle,
-                              void *lmm, int lmm_size)
-{
-	struct fsfilt_operations *cache_fsfilt = I2FOPS(inode);
-        struct inode *cache_inode = NULL;
-        int    rc = -EIO;
-  
-        if (!cache_fsfilt) 
-                RETURN(-EINVAL);
-        
-        cache_inode = I2CI(inode);
-       
-        if (!cache_inode)
-                RETURN(-ENOENT);
-       
-        pre_smfs_inode(inode, cache_inode); 
-        
-        if (!cache_fsfilt->fs_set_md)
-		RETURN(-ENOSYS);
-		
-	down(&cache_inode->i_sem);
-		
-        rc = cache_fsfilt->fs_set_md(cache_inode, handle,
-                                     lmm, lmm_size); 
-				     
-	up(&cache_inode->i_sem);
-	
-        post_smfs_inode(inode, cache_inode); 
-        
-        RETURN(rc); 
-}
-
-/* Must be called with i_sem held */
-static int fsfilt_smfs_get_md(struct inode *inode, void *lmm, int lmm_size)
-{
-	struct fsfilt_operations *cache_fsfilt = I2FOPS(inode);
-        struct inode *cache_inode = NULL;
-        int    rc = -EIO;
-  
-        if (!cache_fsfilt) 
-                RETURN(-EINVAL);
-        
-        cache_inode = I2CI(inode);
-       
-        if (!cache_inode)
-                RETURN(-ENOENT);
-       
-        pre_smfs_inode(inode, cache_inode); 
-        
-        if (!cache_fsfilt->fs_get_md)
-		RETURN(-ENOSYS);
-		
-	down(&cache_inode->i_sem);
-	
-	rc = cache_fsfilt->fs_get_md(cache_inode, lmm, 
-				     lmm_size); 
-				     
-	up(&cache_inode->i_sem);
-        
-        post_smfs_inode(inode, cache_inode); 
-       
-        RETURN(rc); 
-}
-
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-static int fsfilt_smfs_send_bio(struct inode *inode, 
-				struct bio *bio)
-#else
-static int fsfilt_smfs_send_bio(struct inode *inode, 
-				struct kiobuf *bio)
-#endif
-{
-        struct inode *cache_inode;
-	struct fsfilt_operations *cache_fsfilt;
-	
-        cache_fsfilt = I2FOPS(inode);
-        if (!cache_fsfilt) 
-                RETURN(-EINVAL);
-        
-        cache_inode = I2CI(inode);
-        if (!cache_inode)
-                RETURN(-EINVAL);
-        
-	if (!cache_fsfilt->fs_send_bio)
-		RETURN(-ENOSYS);
-		
-	return cache_fsfilt->fs_send_bio(cache_inode, bio);
-}
-
-static struct page *
-fsfilt_smfs_getpage(struct inode *inode, long int index)
-{
-	struct  fsfilt_operations *cache_fsfilt;
-        struct  inode *cache_inode;
-
-        cache_fsfilt = I2FOPS(inode);
-        if (!cache_fsfilt) 
-                RETURN(ERR_PTR(-EINVAL));
-        
-        cache_inode = I2CI(inode);
-        if (!cache_inode)
-                RETURN(ERR_PTR(-EINVAL));
-        
-	if (!cache_fsfilt->fs_getpage)
-		RETURN(ERR_PTR(-ENOSYS));
-	
-        return cache_fsfilt->fs_getpage(cache_inode, index);
-}
-
-static ssize_t fsfilt_smfs_readpage(struct file *file, char *buf,
-                                    size_t count, loff_t *off)
-{
-	struct fsfilt_operations *cache_fsfilt;
-	struct smfs_file_info *sfi; 
-        struct inode *cache_inode;
-        loff_t tmp_ppos;
-        loff_t *cache_ppos;
-        ssize_t rc = -EIO;
-
-        ENTRY;
-
-        cache_fsfilt = I2FOPS(file->f_dentry->d_inode);
-        if (!cache_fsfilt) 
-                RETURN(rc);
-        
-        cache_inode = I2CI(file->f_dentry->d_inode);
-        if (!cache_inode)
-                RETURN(rc);
-
-	sfi = F2SMFI(file);
-	if (sfi->magic != SMFS_FILE_MAGIC)
-                BUG();
-        
-        if (off != &(file->f_pos)) {
-                cache_ppos = &tmp_ppos;
-        } else {
-                cache_ppos = &sfi->c_file->f_pos;
-        }
-        *cache_ppos = *off;
-        
-        pre_smfs_inode(file->f_dentry->d_inode, cache_inode);
-        
-        if (cache_fsfilt->fs_readpage) 
-                rc = cache_fsfilt->fs_readpage(sfi->c_file, buf,
-                                               count, cache_ppos);
-        
-        *off = *cache_ppos;
-        post_smfs_inode(file->f_dentry->d_inode, cache_inode);
-        duplicate_file(file, sfi->c_file);
-        
-        RETURN(rc);
-}
-
-static int fsfilt_smfs_add_journal_cb(struct obd_device *obd,
-                                      struct super_block *sb,
-                                      __u64 last_rcvd, void *handle,
-                                      fsfilt_cb_t cb_func,
-                                      void *cb_data)
-{
-        struct fsfilt_operations *cache_fsfilt = S2SMI(sb)->sm_cache_fsfilt;
-        struct super_block *csb = S2CSB(sb);
-        int rc = -EIO;
-
-        if (!cache_fsfilt) 
-                 RETURN(rc);
-        if (cache_fsfilt->fs_add_journal_cb)
-                rc = cache_fsfilt->fs_add_journal_cb(obd, csb, last_rcvd,
-                                                     handle, cb_func, cb_data);
-        RETURN(rc);
-}
-
-static int fsfilt_smfs_statfs(struct super_block *sb, struct obd_statfs *osfs)
-{
-	struct fsfilt_operations *cache_fsfilt = S2SMI(sb)->sm_cache_fsfilt;
-        struct super_block *csb = S2CSB(sb);
-        int rc = -EIO;
-
-        if (!cache_fsfilt)
-                RETURN(rc);
-        
-        if (!cache_fsfilt->fs_statfs)
-		RETURN(-ENOSYS);
-		
-        rc = cache_fsfilt->fs_statfs(csb, osfs);
-        duplicate_sb(csb, sb);
-        
-        RETURN(rc);
-}
-
-static int fsfilt_smfs_sync(struct super_block *sb)
-{
-	struct fsfilt_operations *cache_fsfilt = S2SMI(sb)->sm_cache_fsfilt;
-        struct super_block *csb = S2CSB(sb);
-        int    rc = -EIO;
- 
-        if(!cache_fsfilt)
-                RETURN(-EINVAL);
-        
-        if (!cache_fsfilt->fs_sync)
-		RETURN(-ENOSYS);
-        
-	rc = cache_fsfilt->fs_sync(csb);
-        
-        RETURN(rc); 
-}
-
-int fsfilt_smfs_map_inode_pages(struct inode *inode, struct page **page,
-                                int pages, unsigned long *blocks, 
-                                int *created, int create,
-                                struct semaphore *sem)
-{
-	struct  fsfilt_operations *cache_fsfilt = I2FOPS(inode);
-        struct  inode *cache_inode = NULL;
-        int     rc = -EIO;
-         
-        if (!cache_fsfilt)
-                RETURN(-EINVAL);
-        
-        cache_inode = I2CI(inode);
-       
-        if (!cache_inode)
-                RETURN(rc);
-
-        if (!cache_fsfilt->fs_map_inode_pages) 
-		RETURN(-ENOSYS);
-	
-	down(&cache_inode->i_sem);
-        rc = cache_fsfilt->fs_map_inode_pages(cache_inode, page, pages, blocks,
-                                              created, create, NULL);
-	up(&cache_inode->i_sem);
-	
-        RETURN(rc);
-}
-
-static int fsfilt_smfs_prep_san_write(struct inode *inode, long *blocks,
-                                      int nblocks, loff_t newsize)
-{
-	struct  fsfilt_operations *cache_fsfilt = I2FOPS(inode);
-        struct  inode *cache_inode = NULL;
-        int     rc = -EIO;
-         
-        if (!cache_fsfilt)
-                RETURN(-EINVAL);
-        
-        cache_inode = I2CI(inode);
-       
-        if (!cache_inode)
-                RETURN(-EINVAL);
-
-        if (!cache_fsfilt->fs_prep_san_write)
-		RETURN(-ENOSYS);
-        
-	down(&cache_inode->i_sem);
-	rc = cache_fsfilt->fs_prep_san_write(cache_inode, blocks, 
-                                             nblocks, newsize);
-	up(&cache_inode->i_sem);
-        
-	RETURN(rc);
-}
-
-static int fsfilt_smfs_read_record(struct file * file, void *buf,
-                                   int size, loff_t *offs)
-{
-	struct  fsfilt_operations *cache_fsfilt;
-        struct  inode *cache_inode;
-	struct  smfs_file_info *sfi; 
-        loff_t  tmp_ppos;
-        loff_t  *cache_ppos;
-        ssize_t rc;
-        
-        ENTRY;
-        cache_fsfilt = I2FOPS(file->f_dentry->d_inode); 
-        if (!cache_fsfilt) 
-                RETURN(-EINVAL);
-        
-        cache_inode = I2CI(file->f_dentry->d_inode);
-        
-        if (!cache_inode)
-                RETURN(-EINVAL);
-
-	sfi = F2SMFI(file);
-	if (sfi->magic != SMFS_FILE_MAGIC) BUG();
-        
-        if (offs != &(file->f_pos)) {
-                cache_ppos = &tmp_ppos;
-        } else {
-                cache_ppos = &sfi->c_file->f_pos;
-        }
-        *cache_ppos = *offs;
-
-        pre_smfs_inode(file->f_dentry->d_inode, cache_inode);
-
-        if (!cache_fsfilt->fs_read_record)
-		RETURN(-ENOSYS);
-		
-        rc = cache_fsfilt->fs_read_record(sfi->c_file, buf, 
-					  size, cache_ppos);
-        
-        *offs = *cache_ppos;
-        post_smfs_inode(file->f_dentry->d_inode, cache_inode);
-        duplicate_file(file, sfi->c_file); 
-        
-        RETURN(rc);
-}
-
-static int fsfilt_smfs_write_record(struct file *file, void *buf, int bufsize,
-                                    loff_t *offs, int force_sync)
-{
-	struct  fsfilt_operations *cache_fsfilt;
-        struct  inode *cache_inode;
-	struct  smfs_file_info *sfi; 
-        loff_t  tmp_ppos;
-        loff_t  *cache_ppos;
-        ssize_t rc = -EIO;
-
-        ENTRY;
-
-        cache_fsfilt = I2FOPS(file->f_dentry->d_inode); 
-        if (!cache_fsfilt) 
-                RETURN(-EINVAL);
-        
-        cache_inode = I2CI(file->f_dentry->d_inode);
-        
-        if (!cache_inode)
-                RETURN(-EINVAL);
-
-	sfi = F2SMFI(file);
-	if (sfi->magic != SMFS_FILE_MAGIC) BUG();
-        
-        if (offs != &(file->f_pos)) {
-                cache_ppos = &tmp_ppos;
-        } else {
-                cache_ppos = &sfi->c_file->f_pos;
-        }
-        *cache_ppos = *offs;
-       
-        pre_smfs_inode(file->f_dentry->d_inode, cache_inode);
-        
-        if (!cache_fsfilt->fs_write_record)
-		RETURN(-ENOSYS);
-        
-	rc = cache_fsfilt->fs_write_record(sfi->c_file, buf, 
-                                           bufsize, cache_ppos, force_sync);
-        *offs = *cache_ppos; 
-        post_smfs_inode(file->f_dentry->d_inode, cache_inode);
-        duplicate_file(file, sfi->c_file); 
-        
-        RETURN(rc);
-}
-
-static int fsfilt_smfs_setup(struct super_block *sb)
-{
-	struct smfs_super_info *smfs_info = S2SMI(sb);
-        struct fsfilt_operations *cache_fsfilt;
-        struct super_block *csb;
-        int rc = 0;
-
-	/* It should be initialized olready by smfs_read_super(). */
-	if (!(cache_fsfilt = smfs_info->sm_cache_fsfilt))
-    		cache_fsfilt = fsfilt_get_ops(smfs_info->cache_fs_type);
-
-        if (!cache_fsfilt)
-                RETURN(-ENOENT);
-        
-        csb = S2CSB(sb);
-
-        if (cache_fsfilt->fs_setup) 
-                rc = cache_fsfilt->fs_setup(csb);
-        
-        RETURN(rc);
-}
-
-static int fsfilt_smfs_set_xattr(struct inode *inode, void *handle,
-                                 char *name,  void *buffer, 
-                                 int buffer_size)
-{
-        struct  fsfilt_operations *cache_fsfilt = I2FOPS(inode);
-        struct  inode *cache_inode = NULL;
-        int     rc = -EIO;
-         
-        if (!cache_fsfilt)
-                RETURN(rc);
-        
-        cache_inode = I2CI(inode);
-        if (!cache_inode)
-                RETURN(rc);
-        
-        pre_smfs_inode(inode, cache_inode); 
-       
-        if (cache_fsfilt->fs_set_xattr) 
-                rc = cache_fsfilt->fs_set_xattr(cache_inode, handle, name, 
-                                                buffer, buffer_size);
-        post_smfs_inode(inode, cache_inode); 
-        
-        RETURN(rc);
-}
-
-static int fsfilt_smfs_get_xattr(struct inode *inode, char *name,
-                                 void *buffer, int buffer_size)
-{
-        struct fsfilt_operations *cache_fsfilt = I2FOPS(inode);
-        struct inode *cache_inode = NULL;
-        int    rc = -EIO;
-
-         if (!cache_fsfilt)
-                RETURN(rc);
-        
-        cache_inode = I2CI(inode);
-        if (!cache_inode)
-                RETURN(rc);
-        
-        pre_smfs_inode(inode, cache_inode); 
-       
-        if (cache_fsfilt->fs_get_xattr) 
-                rc = cache_fsfilt->fs_get_xattr(cache_inode, name, 
-                                                buffer, buffer_size);
-        post_smfs_inode(inode, cache_inode); 
-        
-        RETURN(rc);
-}
-
-static struct fsfilt_operations fsfilt_smfs_ops = {
-        .fs_type                = "smfs",
-        .fs_owner               = THIS_MODULE,
-        .fs_start               = fsfilt_smfs_start,
-        .fs_brw_start           = fsfilt_smfs_brw_start,
-        .fs_commit              = fsfilt_smfs_commit,
-        .fs_commit_async        = fsfilt_smfs_commit_async,
-        .fs_commit_wait         = fsfilt_smfs_commit_wait,
-        .fs_setattr             = fsfilt_smfs_setattr,
-        .fs_iocontrol           = fsfilt_smfs_iocontrol,
-        .fs_set_md              = fsfilt_smfs_set_md,
-        .fs_get_md              = fsfilt_smfs_get_md,
-        .fs_readpage            = fsfilt_smfs_readpage,
-        .fs_getpage             = fsfilt_smfs_getpage,
-        .fs_add_journal_cb      = fsfilt_smfs_add_journal_cb,
-        .fs_statfs              = fsfilt_smfs_statfs,
-        .fs_sync                = fsfilt_smfs_sync,
-        .fs_map_inode_pages     = fsfilt_smfs_map_inode_pages,
-        .fs_prep_san_write      = fsfilt_smfs_prep_san_write,
-        .fs_write_record        = fsfilt_smfs_write_record,
-        .fs_read_record         = fsfilt_smfs_read_record,
-        .fs_setup               = fsfilt_smfs_setup,
-        .fs_send_bio            = fsfilt_smfs_send_bio,
-        .fs_set_xattr           = fsfilt_smfs_set_xattr,
-        .fs_get_xattr           = fsfilt_smfs_get_xattr,
-        
-        /* FIXME-UMKA: probably fsfilt_smfs_get_op_len() should be put here
-         * too. */
-};
-
-static int __init fsfilt_smfs_init(void)
-{
-        int rc;
-        
-        rc = fsfilt_register_ops(&fsfilt_smfs_ops);
-        return rc;
-}
-
-static void __exit fsfilt_smfs_exit(void)
-{
-        fsfilt_unregister_ops(&fsfilt_smfs_ops);
-}
-
-module_init(fsfilt_smfs_init);
-module_exit(fsfilt_smfs_exit);
-
-MODULE_AUTHOR("Cluster File Systems, Inc. <info@clusterfs.com>");
-MODULE_DESCRIPTION("Lustre SMFS Filesystem Helper v0.1");
-MODULE_LICENSE("GPL");
diff --git a/lustre/lvfs/llog_lvfs.c b/lustre/lvfs/llog_lvfs.c
deleted file mode 100644
index 80e60e5..0000000
--- a/lustre/lvfs/llog_lvfs.c
+++ /dev/null
@@ -1,933 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
- *  Copyright (C) 2001-2003 Cluster File Systems, Inc.
- *   Author: Andreas Dilger <adilger@clusterfs.com>
- *
- *   This file is part of Lustre, http://www.lustre.org.
- *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
- *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * OST<->MDS recovery logging infrastructure.
- *
- * Invariants in implementation:
- * - we do not share logs among different OST<->MDS connections, so that
- *   if an OST or MDS fails it need only look at log(s) relevant to itself
- */
-
-#define DEBUG_SUBSYSTEM S_LOG
-
-#ifndef EXPORT_SYMTAB
-#define EXPORT_SYMTAB
-#endif
-
-#ifdef __KERNEL__
-#include <linux/fs.h>
-#else
-#include <liblustre.h>
-#endif
-
-#include <linux/lvfs.h>
-#include <linux/lustre_fsfilt.h>
-#include <linux/lustre_log.h>
-
-#ifdef __KERNEL__
-
-static int llog_lvfs_pad(struct llog_ctxt *ctxt, struct l_file *file,
-                         int len, int index)
-{
-        struct llog_rec_hdr rec;
-        struct llog_rec_tail tail;
-        int rc;
-        ENTRY;
-
-        LASSERT(len >= LLOG_MIN_REC_SIZE && (len & 0x7) == 0);
-
-        tail.lrt_len = rec.lrh_len = cpu_to_le32(len);
-        tail.lrt_index = rec.lrh_index = cpu_to_le32(index);
-        rec.lrh_type = 0;
-
-        rc = llog_fsfilt_write_record(ctxt, file, &rec, sizeof(rec),
-                                      &file->f_pos, 0);
-        if (rc) {
-                CERROR("error writing padding record: rc %d\n", rc);
-                goto out;
-        }
-
-        file->f_pos += len - sizeof(rec) - sizeof(tail);
-        rc = llog_fsfilt_write_record(ctxt, file, &tail, sizeof(tail),
-                                      &file->f_pos, 0);
-        if (rc) {
-                CERROR("error writing padding record: rc %d\n", rc);
-                goto out;
-        }
-
- out:
-        RETURN(rc);
-}
-
-static int llog_lvfs_write_blob(struct llog_ctxt *ctxt, struct l_file *file,
-                                struct llog_rec_hdr *rec, void *buf, loff_t off)
-{
-        int rc;
-        struct llog_rec_tail end;
-        loff_t saved_off = file->f_pos;
-        int buflen = le32_to_cpu(rec->lrh_len);
-
-        ENTRY;
-        file->f_pos = off;
-
-        if (!buf) {
-                rc = llog_fsfilt_write_record(ctxt, file, rec, buflen,
-                                              &file->f_pos, 0);
-                if (rc) {
-                        CERROR("error writing log record: rc %d\n", rc);
-                        goto out;
-                }
-                GOTO(out, rc = 0);
-        }
-
-        /* the buf case */
-        rec->lrh_len = cpu_to_le32(sizeof(*rec) + buflen + sizeof(end));
-        rc = llog_fsfilt_write_record(ctxt, file, rec, sizeof(*rec),
-                                      &file->f_pos, 0);
-        if (rc) {
-                CERROR("error writing log hdr: rc %d\n", rc);
-                goto out;
-        }
-
-        rc = llog_fsfilt_write_record(ctxt, file, buf, buflen,
-                                      &file->f_pos, 0);
-        if (rc) {
-                CERROR("error writing log buffer: rc %d\n", rc);
-                goto out;
-        }
-
-        end.lrt_len = rec->lrh_len;
-        end.lrt_index = rec->lrh_index;
-        rc = llog_fsfilt_write_record(ctxt, file, &end, sizeof(end),
-                                      &file->f_pos, 0);
-        if (rc) {
-                CERROR("error writing log tail: rc %d\n", rc);
-                goto out;
-        }
-
-        rc = 0;
- out:
-        if (saved_off > file->f_pos)
-                file->f_pos = saved_off;
-        LASSERT(rc <= 0);
-        RETURN(rc);
-}
-
-static int llog_lvfs_read_blob(struct llog_ctxt *ctxt, struct l_file *file,
-                               void *buf, int size, loff_t off)
-{
-        loff_t offset = off;
-        int rc;
-        ENTRY;
-
-        rc = llog_fsfilt_read_record(ctxt, file, buf, size, &offset);
-        if (rc) {
-                CERROR("error reading log record: rc %d\n", rc);
-                RETURN(rc);
-        }
-        RETURN(0);
-}
-
-static int llog_lvfs_read_header(struct llog_handle *handle)
-{
-        struct llog_ctxt *ctxt = handle->lgh_ctxt;
-        int rc;
-        ENTRY;
-
-        LASSERT(sizeof(*handle->lgh_hdr) == LLOG_CHUNK_SIZE);
-        LASSERT(ctxt != NULL);
-
-        if (handle->lgh_file->f_dentry->d_inode->i_size == 0) {
-                CDEBUG(D_HA, "not reading header from 0-byte log\n");
-                RETURN(LLOG_EEMPTY);
-        }
-
-        rc = llog_lvfs_read_blob(ctxt, handle->lgh_file, handle->lgh_hdr,
-                                 LLOG_CHUNK_SIZE, 0);
-        if (rc)
-                CERROR("error reading log header\n");
-
-        handle->lgh_last_idx = le32_to_cpu(handle->lgh_hdr->llh_tail.lrt_index);
-        handle->lgh_file->f_pos = handle->lgh_file->f_dentry->d_inode->i_size;
-
-        RETURN(rc);
-}
-
-/* returns negative in on error; 0 if success && reccookie == 0; 1 otherwise */
-/* appends if idx == -1, otherwise overwrites record idx. */
-static int llog_lvfs_write_rec(struct llog_handle *loghandle,
-                               struct llog_rec_hdr *rec,
-                               struct llog_cookie *reccookie,
-                               int cookiecount,
-                               void *buf, int idx)
-{
-        struct llog_log_hdr *llh;
-        int reclen = le32_to_cpu(rec->lrh_len), index, rc;
-        struct llog_rec_tail *lrt;
-        struct llog_ctxt *ctxt = loghandle->lgh_ctxt;
-        struct file *file;
-        loff_t offset;
-        size_t left;
-        ENTRY;
-
-        llh = loghandle->lgh_hdr;
-        file = loghandle->lgh_file;
-
-        /* record length should not bigger than LLOG_CHUNK_SIZE */
-        if (buf)
-                rc = (reclen > LLOG_CHUNK_SIZE - sizeof(struct llog_rec_hdr)
-                      - sizeof(struct llog_rec_tail)) ? -E2BIG : 0;
-        else
-                rc = (reclen > LLOG_CHUNK_SIZE) ? -E2BIG : 0;
-        if (rc)
-                RETURN(rc);
-
-        if (idx != -1) {
-                loff_t saved_offset;
-
-                /* no header: only allowed to insert record 1 */
-                if (idx != 1 && !file->f_dentry->d_inode->i_size) {
-                        CERROR("idx != -1 in empty log\n");
-                        LBUG();
-                }
-
-                if (idx && llh->llh_size && llh->llh_size != reclen)
-                        RETURN(-EINVAL);
-
-                rc = llog_lvfs_write_blob(ctxt, file, &llh->llh_hdr, NULL, 0);
-                /* we are done if we only write the header or on error */
-                if (rc || idx == 0)
-                        RETURN(rc);
-
-                saved_offset = sizeof(*llh) + (idx-1)*le32_to_cpu(rec->lrh_len);
-                rc = llog_lvfs_write_blob(ctxt, file, rec, buf, saved_offset);
-                if (rc == 0 && reccookie) {
-                        reccookie->lgc_lgl = loghandle->lgh_id;
-                        reccookie->lgc_index = idx;
-                        rc = 1;
-                }
-                RETURN(rc);
-        }
-
-        /* Make sure that records don't cross a chunk boundary, so we can
-         * process them page-at-a-time if needed.  If it will cross a chunk
-         * boundary, write in a fake (but referenced) entry to pad the chunk.
-         *
-         * We know that llog_current_log() will return a loghandle that is
-         * big enough to hold reclen, so all we care about is padding here.
-         */
-        left = LLOG_CHUNK_SIZE - (file->f_pos & (LLOG_CHUNK_SIZE - 1));
-        if (buf)
-                reclen = sizeof(*rec) + le32_to_cpu(rec->lrh_len) +
-                         sizeof(struct llog_rec_tail);
-
-        /* NOTE: padding is a record, but no bit is set */
-        if (left != 0 && left != reclen &&
-            left < (reclen + LLOG_MIN_REC_SIZE)) {
-                loghandle->lgh_last_idx++;
-                rc = llog_lvfs_pad(ctxt, file, left, loghandle->lgh_last_idx);
-                if (rc)
-                        RETURN(rc);
-        }
-
-        loghandle->lgh_last_idx++;
-        index = loghandle->lgh_last_idx;
-        rec->lrh_index = cpu_to_le32(index);
-        if (buf == NULL) {
-                lrt = (void *)rec + le32_to_cpu(rec->lrh_len) - sizeof(*lrt);
-                lrt->lrt_len = rec->lrh_len;
-                lrt->lrt_index = rec->lrh_index;
-        }
-        if (ext2_set_bit(index, llh->llh_bitmap)) {
-                CERROR("argh, index %u already set in log bitmap?\n", index);
-                LBUG(); /* should never happen */
-        }
-        llh->llh_count = cpu_to_le32(le32_to_cpu(llh->llh_count) + 1);
-        llh->llh_tail.lrt_index = cpu_to_le32(index);
-
-        offset = 0;
-        rc = llog_lvfs_write_blob(ctxt, file, &llh->llh_hdr, NULL, 0);
-        if (rc)
-                RETURN(rc);
-
-        rc = llog_lvfs_write_blob(ctxt, file, rec, buf, file->f_pos);
-        if (rc)
-                RETURN(rc);
-
-        CDEBUG(D_HA, "added record "LPX64": idx: %u, %u bytes\n",
-               loghandle->lgh_id.lgl_oid, index, le32_to_cpu(rec->lrh_len));
-        if (rc == 0 && reccookie) {
-                reccookie->lgc_lgl = loghandle->lgh_id;
-                reccookie->lgc_index = index;
-                if (le32_to_cpu(rec->lrh_type) == MDS_UNLINK_REC)
-                        reccookie->lgc_subsys = LLOG_UNLINK_ORIG_CTXT;
-                else if (le32_to_cpu(rec->lrh_type) == OST_SZ_REC)
-                        reccookie->lgc_subsys = LLOG_SIZE_ORIG_CTXT;
-                else if (le32_to_cpu(rec->lrh_type) == OST_RAID1_REC)
-                        reccookie->lgc_subsys = LLOG_RD1_ORIG_CTXT;
-                else
-                        reccookie->lgc_subsys = -1;
-                rc = 1;
-        }
-        if (rc == 0 && (le32_to_cpu(rec->lrh_type) == LLOG_GEN_REC ||
-            le32_to_cpu(rec->lrh_type) == SMFS_UPDATE_REC))
-                rc = 1;
-
-        RETURN(rc);
-}
-
-/* We can skip reading at least as many log blocks as the number of
-* minimum sized log records we are skipping.  If it turns out
-* that we are not far enough along the log (because the
-* actual records are larger than minimum size) we just skip
-* some more records. */
-
-static void llog_skip_over(__u64 *off, int curr, int goal)
-{
-        if (goal <= curr)
-                return;
-        *off = (*off + (goal-curr-1) * LLOG_MIN_REC_SIZE) &
-                ~(LLOG_CHUNK_SIZE - 1);
-}
-
-/* sets:
- *  - curr_offset to the furthest point read in the log file
- *  - curr_idx to the log index preceeding curr_offset
- * returns -EIO/-EINVAL on error
- */
-static int llog_lvfs_next_block(struct llog_handle *loghandle, int *curr_idx,
-                                int next_idx, __u64 *curr_offset, void *buf,
-                                int len)
-{
-        struct llog_ctxt *ctxt = loghandle->lgh_ctxt;
-        int rc;
-        ENTRY;
-
-        if (len == 0 || len & (LLOG_CHUNK_SIZE - 1))
-                RETURN(-EINVAL);
-
-        CDEBUG(D_OTHER, "looking for log index %u (cur idx %u off "LPU64")\n",
-               next_idx, *curr_idx, *curr_offset);
-
-        while (*curr_offset < loghandle->lgh_file->f_dentry->d_inode->i_size) {
-                struct llog_rec_hdr *rec;
-                struct llog_rec_tail *tail;
-                loff_t ppos;
-
-                llog_skip_over(curr_offset, *curr_idx, next_idx);
-
-                ppos = *curr_offset;
-                rc = llog_fsfilt_read_record(ctxt, loghandle->lgh_file,
-                                             buf, len, &ppos);
-
-                if (rc) {
-                        CERROR("Cant read llog block at log id "LPU64
-                               "/%u offset "LPU64"\n",
-                               loghandle->lgh_id.lgl_oid,
-                               loghandle->lgh_id.lgl_ogen,
-                               *curr_offset);
-                        RETURN(rc);
-                }
-
-                /* put number of bytes read into rc to make code simpler */
-                rc = ppos - *curr_offset;
-                *curr_offset = ppos;
-
-                if (rc == 0) /* end of file, nothing to do */
-                        RETURN(0);
-
-                if (rc < sizeof(*tail)) {
-                        CERROR("Invalid llog block at log id "LPU64"/%u offset "
-                               LPU64"\n", loghandle->lgh_id.lgl_oid,
-                               loghandle->lgh_id.lgl_ogen, *curr_offset);
-                        RETURN(-EINVAL);
-                }
-
-                tail = buf + rc - sizeof(struct llog_rec_tail);
-                *curr_idx = le32_to_cpu(tail->lrt_index);
-
-                /* this shouldn't happen */
-                if (tail->lrt_index == 0) {
-                        CERROR("Invalid llog tail at log id "LPU64"/%u offset "
-                               LPU64"\n", loghandle->lgh_id.lgl_oid,
-                               loghandle->lgh_id.lgl_ogen, *curr_offset);
-                        RETURN(-EINVAL);
-                }
-                if (le32_to_cpu(tail->lrt_index) < next_idx)
-                        continue;
-
-                /* sanity check that the start of the new buffer is no farther
-                 * than the record that we wanted.  This shouldn't happen. */
-                rec = buf;
-                if (le32_to_cpu(rec->lrh_index) > next_idx) {
-                        CERROR("missed desired record? %u > %u\n",
-                               le32_to_cpu(rec->lrh_index), next_idx);
-                        RETURN(-ENOENT);
-                }
-                RETURN(0);
-        }
-        RETURN(-EIO);
-}
-
-static int llog_lvfs_prev_block(struct llog_handle *loghandle,
-                                int prev_idx, void *buf, int len)
-{
-        struct llog_ctxt *ctxt = loghandle->lgh_ctxt;
-        __u64 curr_offset;
-        int rc;
-        ENTRY;
-
-        if (len == 0 || len & (LLOG_CHUNK_SIZE - 1))
-                RETURN(-EINVAL);
-
-        CDEBUG(D_OTHER, "looking for log index %u n", prev_idx);
-
-        curr_offset = LLOG_CHUNK_SIZE;
-        llog_skip_over(&curr_offset, 0, prev_idx);
-
-        while (curr_offset < loghandle->lgh_file->f_dentry->d_inode->i_size) {
-                struct llog_rec_hdr *rec;
-                struct llog_rec_tail *tail;
-                loff_t ppos;
-
-                ppos = curr_offset;
-                rc = llog_fsfilt_read_record(ctxt, loghandle->lgh_file,
-                                             buf, len, &ppos);
-
-                if (rc) {
-                        CERROR("Cant read llog block at log id "LPU64
-                               "/%u offset "LPU64"\n",
-                               loghandle->lgh_id.lgl_oid,
-                               loghandle->lgh_id.lgl_ogen,
-                               curr_offset);
-                        RETURN(rc);
-                }
-
-                /* put number of bytes read into rc to make code simpler */
-                rc = ppos - curr_offset;
-                curr_offset = ppos;
-
-                if (rc == 0) /* end of file, nothing to do */
-                        RETURN(0);
-
-                if (rc < sizeof(*tail)) {
-                        CERROR("Invalid llog block at log id "LPU64"/%u offset "
-                               LPU64"\n", loghandle->lgh_id.lgl_oid,
-                               loghandle->lgh_id.lgl_ogen, curr_offset);
-                        RETURN(-EINVAL);
-                }
-
-                tail = buf + rc - sizeof(struct llog_rec_tail);
-
-                /* this shouldn't happen */
-                if (tail->lrt_index == 0) {
-                        CERROR("Invalid llog tail at log id "LPU64"/%u offset "
-                               LPU64"\n", loghandle->lgh_id.lgl_oid,
-                               loghandle->lgh_id.lgl_ogen, curr_offset);
-                        RETURN(-EINVAL);
-                }
-                if (le32_to_cpu(tail->lrt_index) < prev_idx)
-                        continue;
-
-                /* sanity check that the start of the new buffer is no farther
-                 * than the record that we wanted.  This shouldn't happen. */
-                rec = buf;
-                if (le32_to_cpu(rec->lrh_index) > prev_idx) {
-                        CERROR("missed desired record? %u > %u\n",
-                               le32_to_cpu(rec->lrh_index), prev_idx);
-                        RETURN(-ENOENT);
-                }
-                RETURN(0);
-        }
-        RETURN(-EIO);
-}
-
-static struct file *llog_filp_open(char *name, int flags, int mode)
-{
-        char *logname;
-        struct file *filp;
-        int len;
-
-        OBD_ALLOC(logname, PATH_MAX);
-        if (logname == NULL)
-                return ERR_PTR(-ENOMEM);
-
-        len = snprintf(logname, PATH_MAX, "LOGS/%s", name);
-        if (len >= PATH_MAX - 1) {
-                filp = ERR_PTR(-ENAMETOOLONG);
-        } else {
-                filp = l_filp_open(logname, flags, mode);
-                if (IS_ERR(filp)) {
-                        CERROR("logfile creation %s: %ld\n", logname,
-                               PTR_ERR(filp));
-                }
-        }
-
-        OBD_FREE(logname, PATH_MAX);
-        return filp;
-}
-
-static struct file *llog_object_create(struct llog_ctxt *ctxt)
-{
-        unsigned int tmpname = ll_insecure_random_int();
-        char fidname[LL_FID_NAMELEN];
-        struct file *filp;
-        struct dentry *new_child, *parent;
-        void *handle;
-        int rc = 0, err, namelen;
-        ENTRY;
-
-        sprintf(fidname, "OBJECTS/%u", tmpname);
-        filp = filp_open(fidname, O_CREAT | O_EXCL, 0644);
-        if (IS_ERR(filp)) {
-                rc = PTR_ERR(filp);
-                if (rc == -EEXIST) {
-                        CERROR("impossible object name collision %u\n",
-                               tmpname);
-                        LBUG();
-                }
-                CERROR("error creating tmp object %u: rc %d\n", tmpname, rc);
-                RETURN(filp);
-        }
-
-        namelen = ll_fid2str(fidname, filp->f_dentry->d_inode->i_ino,
-                             filp->f_dentry->d_inode->i_generation);
-        parent = filp->f_dentry->d_parent;
-        down(&parent->d_inode->i_sem);
-        new_child = lookup_one_len(fidname, parent, namelen);
-        if (IS_ERR(new_child)) {
-                CERROR("getting neg dentry for obj rename: %d\n", rc);
-                GOTO(out_close, rc = PTR_ERR(new_child));
-        }
-        if (new_child->d_inode != NULL) {
-                CERROR("impossible non-negative obj dentry %lu:%u!\n",
-                       filp->f_dentry->d_inode->i_ino,
-                       filp->f_dentry->d_inode->i_generation);
-                LBUG();
-        }
-
-        handle = llog_fsfilt_start(ctxt, parent->d_inode, FSFILT_OP_RENAME, NULL);
-        if (IS_ERR(handle))
-                GOTO(out_dput, rc = PTR_ERR(handle));
-
-        lock_kernel();
-        rc = vfs_rename(parent->d_inode, filp->f_dentry,
-                        parent->d_inode, new_child);
-        unlock_kernel();
-        if (rc)
-                CERROR("error renaming new object %lu:%u: rc %d\n",
-                       filp->f_dentry->d_inode->i_ino,
-                       filp->f_dentry->d_inode->i_generation, rc);
-
-        err = llog_fsfilt_commit(ctxt, parent->d_inode, handle, 0);
-        if (!rc)
-                rc = err;
-out_dput:
-        dput(new_child);
-out_close:
-        up(&parent->d_inode->i_sem);
-        if (rc) {
-                filp_close(filp, 0);
-                filp = (struct file *)rc;
-        }
-
-        RETURN(filp);
-}
-
-static int llog_add_link_object(struct llog_ctxt *ctxt, struct llog_logid logid,
-                                struct dentry *dentry)
-{
-        struct dentry *new_child;
-        char fidname[LL_FID_NAMELEN];
-        void *handle;
-        int namelen, rc = 0, err;
-        ENTRY;
-
-        namelen = ll_fid2str(fidname, logid.lgl_oid, logid.lgl_ogen);
-        down(&ctxt->loc_objects_dir->d_inode->i_sem);
-        new_child = lookup_one_len(fidname, ctxt->loc_objects_dir, namelen);
-        if (IS_ERR(new_child)) {
-                CERROR("getting neg dentry for obj rename: %d\n", rc);
-                GOTO(out, rc = PTR_ERR(new_child));
-        }
-        if (new_child->d_inode == dentry->d_inode)
-                GOTO(out_dput, rc);
-        if (new_child->d_inode != NULL) {
-                CERROR("impossible non-negative obj dentry "LPX64":%u!\n",
-                       logid.lgl_oid, logid.lgl_ogen);
-                LBUG();
-        }
-        handle = llog_fsfilt_start(ctxt, ctxt->loc_objects_dir->d_inode,
-                                   FSFILT_OP_LINK, NULL);
-        if (IS_ERR(handle))
-                GOTO(out_dput, rc = PTR_ERR(handle));
-
-        lock_kernel();
-        rc = vfs_link(dentry, ctxt->loc_objects_dir->d_inode, new_child);
-        unlock_kernel();
-        if (rc)
-                CERROR("error link new object "LPX64":%u: rc %d\n",
-                       logid.lgl_oid, logid.lgl_ogen, rc);
-        err = llog_fsfilt_commit(ctxt, ctxt->loc_objects_dir->d_inode, handle, 0);
-out_dput:
-        l_dput(new_child);
-out:
-        up(&ctxt->loc_objects_dir->d_inode->i_sem);
-        RETURN(rc);
-}
-
-/* This is a callback from the llog_* functions.
- * Assumes caller has already pushed us into the kernel context. */
-static int llog_lvfs_create(struct llog_ctxt *ctxt, struct llog_handle **res,
-                            struct llog_logid *logid, char *name)
-{
-        struct llog_handle *handle;
-        struct lvfs_run_ctxt saved;
-        int rc = 0;
-        int open_flags = O_RDWR | O_CREAT | O_LARGEFILE;
-        ENTRY;
-
-        handle = llog_alloc_handle();
-        if (handle == NULL)
-                RETURN(-ENOMEM);
-        *res = handle;
-
-        LASSERT(ctxt);
-        if (ctxt->loc_lvfs_ctxt)
-                push_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
-
-        if (logid != NULL) {
-                char logname[LL_FID_NAMELEN + 10] = "OBJECTS/";
-                char fidname[LL_FID_NAMELEN];
-                ll_fid2str(fidname, logid->lgl_oid, logid->lgl_ogen);
-                strcat(logname, fidname);
-
-                handle->lgh_file = filp_open(logname, O_RDWR | O_LARGEFILE, 0644);
-                if (IS_ERR(handle->lgh_file)) {
-                        CERROR("cannot open %s file\n", logname);
-                        GOTO(cleanup, rc = PTR_ERR(handle->lgh_file));
-                }
-                if (!S_ISREG(handle->lgh_file->f_dentry->d_inode->i_mode)) {
-                        CERROR("%s is not a regular file!: mode = %o\n", logname,
-                               handle->lgh_file->f_dentry->d_inode->i_mode);
-                        GOTO(cleanup, rc = -ENOENT);
-                }
-                LASSERT(handle->lgh_file->f_dentry->d_parent == ctxt->loc_objects_dir);
-                handle->lgh_id = *logid;
-        } else if (name) {
-                handle->lgh_file = llog_filp_open(name, open_flags, 0644);
-                if (IS_ERR(handle->lgh_file))
-                        GOTO(cleanup, rc = PTR_ERR(handle->lgh_file));
-                LASSERT(handle->lgh_file->f_dentry->d_parent == ctxt->loc_logs_dir);
-
-                handle->lgh_id.lgl_oid = handle->lgh_file->f_dentry->d_inode->i_ino;
-                handle->lgh_id.lgl_ogen = handle->lgh_file->f_dentry->d_inode->i_generation;
-                rc = llog_add_link_object(ctxt, handle->lgh_id, handle->lgh_file->f_dentry);
-                if (rc)
-                        GOTO(cleanup, rc);
-        } else {
-                handle->lgh_file = llog_object_create(ctxt);
-                if (IS_ERR(handle->lgh_file))
-                        GOTO(cleanup, rc = PTR_ERR(handle->lgh_file));
-                LASSERT(handle->lgh_file->f_dentry->d_parent == ctxt->loc_objects_dir);
-                handle->lgh_id.lgl_oid = handle->lgh_file->f_dentry->d_inode->i_ino;
-                handle->lgh_id.lgl_ogen = handle->lgh_file->f_dentry->d_inode->i_generation;
-        }
-
-        handle->lgh_id.lgl_ogr = 1;
-        handle->lgh_ctxt = ctxt;
- finish:
-        if (ctxt->loc_lvfs_ctxt)
-                pop_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
-        RETURN(rc);
-cleanup:
-        llog_free_handle(handle);
-        goto finish;
-}
-
-static int llog_lvfs_close(struct llog_handle *handle)
-{
-        int rc;
-        ENTRY;
-
-        rc = filp_close(handle->lgh_file, 0);
-        if (rc)
-                CERROR("error closing log: rc %d\n", rc);
-        RETURN(rc);
-}
-
-static int llog_lvfs_destroy(struct llog_handle *loghandle)
-{
-        struct llog_ctxt *ctxt = loghandle->lgh_ctxt;
-        struct lvfs_run_ctxt saved;
-        struct dentry *fdentry;
-        struct inode *parent_inode;
-        char fidname[LL_FID_NAMELEN];
-        void *handle;
-        int rc = -EINVAL, err, namelen;
-        ENTRY;
-
-        if (ctxt->loc_lvfs_ctxt)
-                push_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
-
-        fdentry = loghandle->lgh_file->f_dentry;
-        parent_inode = fdentry->d_parent->d_inode;
-
-        if (!strcmp(fdentry->d_parent->d_name.name, "LOGS")) {
-                LASSERT(parent_inode == ctxt->loc_logs_dir->d_inode);
-
-                namelen = ll_fid2str(fidname, fdentry->d_inode->i_ino,
-                                     fdentry->d_inode->i_generation);
-                dget(fdentry);
-                rc = llog_lvfs_close(loghandle);
-                if (rc) {
-                        dput(fdentry);
-                        GOTO(out, rc);
-                }
-
-                handle = llog_fsfilt_start(ctxt, parent_inode,
-                                           FSFILT_OP_UNLINK, NULL);
-                if (IS_ERR(handle)) {
-                        dput(fdentry);
-                        GOTO(out, rc = PTR_ERR(handle));
-                }
-
-                down(&parent_inode->i_sem);
-                rc = vfs_unlink(parent_inode, fdentry);
-                up(&parent_inode->i_sem);
-                dput(fdentry);
-
-                if (!rc) {
-                        down(&ctxt->loc_objects_dir->d_inode->i_sem);
-                        fdentry = lookup_one_len(fidname, ctxt->loc_objects_dir,
-                                                 namelen);
-                        if (fdentry == NULL || fdentry->d_inode == NULL) {
-                                CERROR("destroy non_existent object %s\n", fidname);
-                                GOTO(out_err, rc = IS_ERR(fdentry) ?
-                                     PTR_ERR(fdentry) : -ENOENT);
-                        }
-                        rc = vfs_unlink(ctxt->loc_objects_dir->d_inode, fdentry);
-                        l_dput(fdentry);
-out_err:
-                        up(&ctxt->loc_objects_dir->d_inode->i_sem);
-                }
-                err = llog_fsfilt_commit(ctxt, parent_inode, handle, 0);
-                if (err && !rc)
-                        err = rc;
-
-                GOTO(out, rc);
-        }
-
-        if (!strcmp(fdentry->d_parent->d_name.name, "OBJECTS")) {
-                LASSERT(parent_inode == ctxt->loc_objects_dir->d_inode);
-
-                dget(fdentry);
-                rc = llog_lvfs_close(loghandle);
-                if (rc == 0) {
-                        down(&parent_inode->i_sem);
-                        rc = vfs_unlink(parent_inode, fdentry);
-                        up(&parent_inode->i_sem);
-                }
-                dput(fdentry);
-        }
-out:
-        if (ctxt->loc_lvfs_ctxt)
-                pop_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
-        RETURN(rc);
-}
-
-/* reads the catalog list */
-int llog_get_cat_list(struct lvfs_run_ctxt *ctxt,
-                      struct fsfilt_operations *fsops, char *name,
-                      int count, struct llog_catid *idarray)
-{
-        struct lvfs_run_ctxt saved;
-        struct l_file *file;
-        int size = sizeof(*idarray) * count;
-        loff_t off = 0;
-        int rc;
-
-        LASSERT(count);
-
-        if (ctxt)
-                push_ctxt(&saved, ctxt, NULL);
-        file = l_filp_open(name, O_RDWR | O_CREAT | O_LARGEFILE, 0700);
-        if (!file || IS_ERR(file)) {
-                rc = PTR_ERR(file);
-                CERROR("OBD filter: cannot open/create %s: rc = %d\n",
-                       name, rc);
-                GOTO(out, rc);
-        }
-
-        if (!S_ISREG(file->f_dentry->d_inode->i_mode)) {
-                CERROR("%s is not a regular file!: mode = %o\n", name,
-                       file->f_dentry->d_inode->i_mode);
-                GOTO(out, rc = -ENOENT);
-        }
-
-        rc = fsops->fs_read_record(file, idarray, size, &off);
-        if (rc) {
-                CDEBUG(D_INODE,"OBD filter: error reading %s: rc %d\n",
-                       name, rc);
-                GOTO(out, rc);
-        }
-
- out:
-        if (file && !IS_ERR(file))
-                rc = filp_close(file, 0);
-        if (ctxt)
-                pop_ctxt(&saved, ctxt, NULL);
-        RETURN(rc);
-}
-EXPORT_SYMBOL(llog_get_cat_list);
-
-/* writes the cat list */
-int llog_put_cat_list(struct lvfs_run_ctxt *ctxt,
-                      struct fsfilt_operations *fsops, char *name,
-                      int count, struct llog_catid *idarray)
-{
-        struct lvfs_run_ctxt saved;
-        struct l_file *file;
-        int size = sizeof(*idarray) * count;
-        loff_t off = 0;
-        int rc;
-
-        LASSERT(count);
-
-        if (ctxt)
-                push_ctxt(&saved, ctxt, NULL);
-        file = filp_open(name, O_RDWR | O_CREAT | O_LARGEFILE, 0700);
-        if (!file || IS_ERR(file)) {
-                rc = PTR_ERR(file);
-                CERROR("OBD filter: cannot open/create %s: rc = %d\n",
-                       name, rc);
-                GOTO(out, rc);
-        }
-
-        if (!S_ISREG(file->f_dentry->d_inode->i_mode)) {
-                CERROR("%s is not a regular file!: mode = %o\n", name,
-                       file->f_dentry->d_inode->i_mode);
-                GOTO(out, rc = -ENOENT);
-        }
-
-        rc = fsops->fs_write_record(file, idarray, size, &off, 1);
-        if (rc) {
-                CDEBUG(D_INODE,"OBD filter: error reading %s: rc %d\n",
-                       name, rc);
-                GOTO(out, rc);
-        }
-
- out:
-        if (file && !IS_ERR(file))
-                rc = filp_close(file, 0);
-        if (ctxt)
-                pop_ctxt(&saved, ctxt, NULL);
-        RETURN(rc);
-}
-EXPORT_SYMBOL(llog_put_cat_list);
-
-struct llog_operations llog_lvfs_ops = {
-        lop_create:      llog_lvfs_create,
-        lop_destroy:     llog_lvfs_destroy,
-        lop_close:       llog_lvfs_close,
-        lop_read_header: llog_lvfs_read_header,
-        lop_write_rec:   llog_lvfs_write_rec,
-        lop_next_block:  llog_lvfs_next_block,
-        lop_prev_block:  llog_lvfs_prev_block,
-};
-EXPORT_SYMBOL(llog_lvfs_ops);
-
-#else /* !__KERNEL__ */
-
-static int llog_lvfs_read_header(struct llog_handle *handle)
-{
-        LBUG();
-        return 0;
-}
-
-static int llog_lvfs_write_rec(struct llog_handle *loghandle,
-                               struct llog_rec_hdr *rec,
-                               struct llog_cookie *reccookie, int cookiecount,
-                               void *buf, int idx)
-{
-        LBUG();
-        return 0;
-}
-
-static int llog_lvfs_create(struct llog_ctxt *ctxt, struct llog_handle **res,
-                            struct llog_logid *logid, char *name)
-{
-        LBUG();
-        return 0;
-}
-
-static int llog_lvfs_close(struct llog_handle *handle)
-{
-        LBUG();
-        return 0;
-}
-
-static int llog_lvfs_destroy(struct llog_handle *handle)
-{
-        LBUG();
-        return 0;
-}
-
-int llog_get_cat_list(struct lvfs_run_ctxt *ctxt,
-                      struct fsfilt_operations *fsops, char *name,
-                      int count, struct llog_catid *idarray)
-{
-        LBUG();
-        return 0;
-}
-
-int llog_put_cat_list(struct lvfs_run_ctxt *ctxt,
-                      struct fsfilt_operations *fsops, char *name,
-                      int count, struct llog_catid *idarray)
-{
-        LBUG();
-        return 0;
-}
-
-int llog_lvfs_prev_block(struct llog_handle *loghandle,
-                         int prev_idx, void *buf, int len)
-{
-        LBUG();
-        return 0;
-}
-
-int llog_lvfs_next_block(struct llog_handle *loghandle, int *curr_idx,
-                         int next_idx, __u64 *offset, void *buf, int len)
-{
-        LBUG();
-        return 0;
-}
-
-struct llog_operations llog_lvfs_ops = {
-        lop_create:      llog_lvfs_create,
-        lop_destroy:     llog_lvfs_destroy,
-        lop_close:       llog_lvfs_close,
-        lop_read_header: llog_lvfs_read_header,
-        lop_write_rec:   llog_lvfs_write_rec,
-        lop_next_block:  llog_lvfs_next_block,
-        lop_prev_block:  llog_lvfs_prev_block,
-};
-#endif
diff --git a/lustre/lvfs/lvfs_common.c b/lustre/lvfs/lvfs_common.c
index d8ab4a3..c1a6640 100644
--- a/lustre/lvfs/lvfs_common.c
+++ b/lustre/lvfs/lvfs_common.c
@@ -27,7 +27,7 @@
 
 #include <linux/lvfs.h>
 
-struct dentry *lvfs_fid2dentry(struct lvfs_run_ctxt *ctxt, __u64 id,
+struct dentry *lvfs_fid2dentry(struct obd_run_ctxt *ctxt, __u64 id,
                                __u32 gen, __u64 gr, void *data)
 {
         return ctxt->cb_ops.l_fid2dentry(id, gen, gr, data);
diff --git a/lustre/lvfs/lvfs_internal.h b/lustre/lvfs/lvfs_internal.h
index d74bafd..4d68116 100644
--- a/lustre/lvfs/lvfs_internal.h
+++ b/lustre/lvfs/lvfs_internal.h
@@ -6,6 +6,3 @@ void fsfilt_extN_exit(void);
 
 int  fsfilt_reiser_init(void);
 void fsfilt_reiser_exit(void);
-
-int lookup_by_path(char *path, int flags, struct nameidata *nd);
-struct dentry *lookup_create(struct nameidata *nd, int is_dir);
diff --git a/lustre/lvfs/lvfs_linux.c b/lustre/lvfs/lvfs_linux.c
index 657076c..1e58081 100644
--- a/lustre/lvfs/lvfs_linux.c
+++ b/lustre/lvfs/lvfs_linux.c
@@ -74,8 +74,8 @@ int obd_memmax;
 #endif
 
 /* push / pop to root of obd store */
-void push_ctxt(struct lvfs_run_ctxt *save, struct lvfs_run_ctxt *new_ctx,
-               struct lvfs_ucred *uc)
+void push_ctxt(struct obd_run_ctxt *save, struct obd_run_ctxt *new_ctx,
+               struct obd_ucred *uc)
 {
         //ASSERT_NOT_KERNEL_CTXT("already in kernel context!\n");
         ASSERT_CTXT_MAGIC(new_ctx->magic);
@@ -105,21 +105,21 @@ void push_ctxt(struct lvfs_run_ctxt *save, struct lvfs_run_ctxt *new_ctx,
         LASSERT(new_ctx->pwdmnt);
 
         if (uc) {
-                save->luc.luc_fsuid = current->fsuid;
-                save->luc.luc_fsgid = current->fsgid;
-                save->luc.luc_cap = current->cap_effective;
-                save->luc.luc_suppgid1 = current_groups[0];
-                save->luc.luc_suppgid2 = current_groups[1];
-
-                current->fsuid = uc->luc_fsuid;
-                current->fsgid = uc->luc_fsgid;
-                current->cap_effective = uc->luc_cap;
+                save->ouc.ouc_fsuid = current->fsuid;
+                save->ouc.ouc_fsgid = current->fsgid;
+                save->ouc.ouc_cap = current->cap_effective;
+                save->ouc.ouc_suppgid1 = current_groups[0];
+                save->ouc.ouc_suppgid2 = current_groups[1];
+
+                current->fsuid = uc->ouc_fsuid;
+                current->fsgid = uc->ouc_fsgid;
+                current->cap_effective = uc->ouc_cap;
                 current_ngroups = 0;
 
-                if (uc->luc_suppgid1 != -1)
-                        current_groups[current_ngroups++] = uc->luc_suppgid1;
-                if (uc->luc_suppgid2 != -1)
-                        current_groups[current_ngroups++] = uc->luc_suppgid2;
+                if (uc->ouc_suppgid1 != -1)
+                        current_groups[current_ngroups++] = uc->ouc_suppgid1;
+                if (uc->ouc_suppgid2 != -1)
+                        current_groups[current_ngroups++] = uc->ouc_suppgid2;
         }
         set_fs(new_ctx->fs);
         set_fs_pwd(current->fs, new_ctx->pwdmnt, new_ctx->pwd);
@@ -137,8 +137,8 @@ void push_ctxt(struct lvfs_run_ctxt *save, struct lvfs_run_ctxt *new_ctx,
 }
 EXPORT_SYMBOL(push_ctxt);
 
-void pop_ctxt(struct lvfs_run_ctxt *saved, struct lvfs_run_ctxt *new_ctx,
-              struct lvfs_ucred *uc)
+void pop_ctxt(struct obd_run_ctxt *saved, struct obd_run_ctxt *new_ctx,
+              struct obd_ucred *uc)
 {
         //printk("pc0");
         ASSERT_CTXT_MAGIC(saved->magic);
@@ -165,12 +165,12 @@ void pop_ctxt(struct lvfs_run_ctxt *saved, struct lvfs_run_ctxt *new_ctx,
         dput(saved->pwd);
         mntput(saved->pwdmnt);
         if (uc) {
-                current->fsuid = saved->luc.luc_fsuid;
-                current->fsgid = saved->luc.luc_fsgid;
-                current->cap_effective = saved->luc.luc_cap;
+                current->fsuid = saved->ouc.ouc_fsuid;
+                current->fsgid = saved->ouc.ouc_fsgid;
+                current->cap_effective = saved->ouc.ouc_cap;
                 current_ngroups = saved->ngroups;
-                current_groups[0] = saved->luc.luc_suppgid1;
-                current_groups[1] = saved->luc.luc_suppgid2;
+                current_groups[0] = saved->ouc.ouc_suppgid1;
+                current_groups[1] = saved->ouc.ouc_suppgid2;
         }
 
         /*
@@ -325,7 +325,7 @@ int lustre_fsync(struct file *file)
 }
 EXPORT_SYMBOL(lustre_fsync);
 
-struct l_file *l_dentry_open(struct lvfs_run_ctxt *ctxt, struct l_dentry *de,
+struct l_file *l_dentry_open(struct obd_run_ctxt *ctxt, struct l_dentry *de,
                              int flags)
 {
         mntget(ctxt->pwdmnt);
diff --git a/lustre/lvfs/lvfs_reint.c b/lustre/lvfs/lvfs_reint.c
deleted file mode 100644
index 2e4e211..0000000
--- a/lustre/lvfs/lvfs_reint.c
+++ /dev/null
@@ -1,542 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- */
-
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
-
-#define DEBUG_SUBSYSTEM S_FILTER
-
-#include <linux/version.h>
-#include <linux/fs.h>
-#include <asm/unistd.h>
-#include <linux/jbd.h>
-#include <linux/slab.h>
-#include <linux/pagemap.h>
-#include <linux/quotaops.h>
-#include <linux/version.h>
-#include <linux/kp30.h>
-#include <linux/lustre_fsfilt.h>
-#include <linux/obd.h>
-#include <linux/obd_class.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/lustre_compat25.h>
-#include <linux/lvfs.h>
-#include <linux/lustre_smfs.h>
-#include "lvfs_internal.h"
-
-#include <linux/obd.h>
-#include <linux/lustre_lib.h>
-
-/* from namei.c*/
-struct dentry *lookup_create(struct nameidata *nd, int is_dir)
-{
-        struct dentry *dentry;
-                                                                                                                                                                                                     
-        dentry = ERR_PTR(-EEXIST);
-        if (nd->last_type != LAST_NORM)
-                goto fail;
-        dentry = lookup_hash(&nd->last, nd->dentry);
-        if (IS_ERR(dentry))
-                goto fail;
-        if (!is_dir && nd->last.name[nd->last.len] && !dentry->d_inode)
-                goto enoent;
-        return dentry;
-enoent:
-        dput(dentry);
-        dentry = ERR_PTR(-ENOENT);
-fail:
-        return dentry;
-}
-
-int lookup_by_path(char *path, int flags, struct nameidata *nd)
-{
-	struct dentry *dentry = NULL;
-        int rc = 0;
-        
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-        if (path_init(path, flags, nd)) {
-#else
-        if (path_lookup(path, flags, nd)) {
-#endif
-		rc = path_walk(path, nd);
-		if (rc)
-			RETURN(rc);
-	} else
-		RETURN(-EINVAL);
-
-	dentry = nd->dentry;
-
-	if (!dentry->d_inode || is_bad_inode(dentry->d_inode) || 
-	    (!S_ISDIR(dentry->d_inode->i_mode))) { 
-		path_release(nd);
-		RETURN(-ENODEV);
-	}
-        RETURN(rc); 
-}  
-
-static int lvfs_reint_create(struct super_block *sb, 
-                             struct reint_record *r_rec)
-{
-        struct fsfilt_operations *fsfilt = S2SMI(sb)->sm_fsfilt;
-        char *path = r_rec->rec_data1;
-        int type = r_rec->u_rec.ur_iattr.ia_mode & S_IFMT;
-       	struct nameidata nd;
-	struct dentry *dparent = NULL;
-	struct dentry *dentry = NULL;
-        struct inode *dir = NULL;
-        void *handle = NULL;
-        int rc = 0, created = 0, err = 0;
-
-        rc = lookup_by_path(path, LOOKUP_PARENT, &nd); 
-        if (rc)
-                RETURN(rc); 
-	
-        dparent = nd.dentry;
-        
-        down(&dparent->d_inode->i_sem);
-        /*create a new dentry*/
-        dentry = lookup_create(&nd, 0);
-        dir = dparent->d_inode;
- 
-        if (!SMFS_DO_WRITE_KML(r_rec->u_rec.ur_flags))
-                SMFS_CLEAN_INODE_REC(dir);
-        
-        switch(type) {  
-        case S_IFREG:
-                handle = fsfilt->fs_start(dir, FSFILT_OP_CREATE, NULL, 0);
-                if (IS_ERR(handle))
-                        GOTO(cleanup, rc = PTR_ERR(handle));
-                rc = ll_vfs_create(dir, dentry, r_rec->u_rec.ur_iattr.ia_mode, 
-                                   NULL);
-                break;
-        case S_IFDIR:
-                handle = fsfilt->fs_start(dir, FSFILT_OP_MKDIR, NULL, 0);
-                if (IS_ERR(handle))
-                        GOTO(cleanup, rc = PTR_ERR(handle));
-                rc = vfs_mkdir(dir, dentry, r_rec->u_rec.ur_iattr.ia_mode);
-                break;
-        case S_IFLNK: {
-                char *new_path = r_rec->rec_data2; 
-                handle = fsfilt->fs_start(dir, FSFILT_OP_SYMLINK, NULL, 0);
-                if (IS_ERR(handle))
-                        GOTO(cleanup, rc = PTR_ERR(handle));
-                rc = vfs_symlink(dir, dentry, new_path);
-                break;
-        }
-        case S_IFCHR:
-        case S_IFBLK:
-        case S_IFIFO:
-        case S_IFSOCK: {
-                int rdev = r_rec->u_rec.ur_rdev;
-                handle = fsfilt->fs_start(dir, FSFILT_OP_MKNOD, NULL, 0);
-                if (IS_ERR(handle))
-                        GOTO(cleanup, (handle = NULL, rc = PTR_ERR(handle)));
-                rc = vfs_mknod(dir, dentry, r_rec->u_rec.ur_iattr.ia_mode, 
-                               rdev);
-                break;
-        }
-        default:
-                CERROR("Error type %d in create\n", type);
-                rc = -EINVAL;
-                break;
-        }  
-       
-        if (rc) {
-                CERROR("Error for creating mkdir %s\n", path);
-                GOTO(cleanup, 0); 
-        } else {
-                struct iattr iattr;
-                
-                created = 1;
-
-                LTIME_S(iattr.ia_atime) = LTIME_S(r_rec->u_rec.ur_iattr.ia_atime);
-                LTIME_S(iattr.ia_ctime) = LTIME_S(r_rec->u_rec.ur_iattr.ia_ctime);
-                LTIME_S(iattr.ia_mtime) = LTIME_S(r_rec->u_rec.ur_iattr.ia_mtime);
-
-                iattr.ia_uid = r_rec->u_rec.ur_fsuid;
-                if (dir->i_mode & S_ISGID)
-                        iattr.ia_gid = dir->i_gid;
-                else
-                        iattr.ia_gid = r_rec->u_rec.ur_fsgid;
-                iattr.ia_valid = ATTR_UID | ATTR_GID | ATTR_ATIME |
-                        ATTR_MTIME | ATTR_CTIME;
-               
-                rc = fsfilt->fs_setattr(dentry, handle, &iattr, 0);
-                if (rc) {
-                        CERROR("error on child setattr: rc = %d\n", rc);
-                        GOTO(cleanup, rc);
-                }    
-   
-                iattr.ia_valid = ATTR_MTIME | ATTR_CTIME;
-                rc = fsfilt->fs_setattr(dparent, handle, &iattr, 0);
-                if (rc) {
-                        CERROR("error on parent setattr: rc = %d\n", rc);
-                        GOTO(cleanup, rc);
-                }
-        }
-cleanup:
-        if (rc && created) {
-                /* Destroy the file we just created.  This should not need
-                 * extra journal credits, as we have already modified all of
-                 * the blocks needed in order to create the file in the first
-                 * place.
-                 */
-                switch (type) {
-                case S_IFDIR:
-                        err = vfs_rmdir(dir, dentry);
-                        if (err)
-                                CERROR("rmdir in error path: %d\n", err);
-                        break;
-                default:
-                        err = vfs_unlink(dir, dentry);
-                        if (err)
-                                CERROR("unlink in error path: %d\n", err);
-                        break;
-                }
-        } else {
-                rc = err;
-        }
-        if (handle) 
-                rc = fsfilt->fs_commit(dentry->d_inode, handle, 0);
-       
-        if (!SMFS_DO_WRITE_KML(r_rec->u_rec.ur_flags))
-                SMFS_SET_INODE_REC(dir);
-        up(&dparent->d_inode->i_sem);
-        path_release(&nd);
-        if (dentry)
-                l_dput(dentry);
-
-        RETURN(0);
-};
-
-static int lvfs_reint_link(struct super_block *sb, 
-                           struct reint_record *r_rec)
-{       
-        struct fsfilt_operations *fsfilt = S2SMI(sb)->sm_fsfilt;
-        char   *old_path = r_rec->rec_data1;
-        char   *new_path = r_rec->rec_data2;
-        struct nameidata old_nd;
-        struct nameidata new_nd;
-        struct dentry *old_dparent;
-        struct dentry *new_dparent;
-	struct dentry *old_dentry = NULL;
-	struct dentry *new_dentry = NULL;
-        void   *handle = NULL;
-        struct inode *dir = NULL;
-        int    rc = 0;
-        
-        /*get parent dentry*/	
-        rc = lookup_by_path(new_path, LOOKUP_PARENT, &new_nd); 
-        if (rc)
-                RETURN(rc); 
-       
-        new_dparent = new_nd.dentry;
-        
-        dir = new_dparent->d_inode;
-
-        new_dentry = lookup_create(&new_nd, 0);
-        
-        rc = lookup_by_path(old_path, LOOKUP_PARENT, &old_nd);
-        if (rc) {
-                path_release(&new_nd); 
-                RETURN(rc);
-        }
-        old_dparent = old_nd.dentry;
-        old_dentry = lookup_one_len(old_nd.last.name, old_dparent, 
-                                    old_nd.last.len);    
-        
-        if (! old_dentry || !old_dentry->d_inode 
-            || is_bad_inode(old_dentry->d_inode)) {
-                GOTO(cleanup, rc = -ENODEV);
-        }       
-        if (dir->i_rdev != old_dentry->d_inode->i_rdev) {
-                GOTO(cleanup, rc = -EINVAL);
-        }
-        
-        if (!SMFS_DO_WRITE_KML(r_rec->u_rec.ur_flags))
-                SMFS_CLEAN_INODE_REC(dir);
-      
-        handle = fsfilt->fs_start(dir, FSFILT_OP_LINK, NULL, 0);
-        if (IS_ERR(handle))
-                GOTO(cleanup, rc = PTR_ERR(handle));
-        
-        rc = vfs_link(old_dentry, dir, new_dentry);
-        if (rc) {
-                CERROR("replay error: vfs_link error rc=%d", rc);
-                GOTO(cleanup, rc); 
-        }
-cleanup:
-        if (handle) {
-                rc = fsfilt->fs_commit(dir, handle, 0);
-        }
-        if (!SMFS_DO_WRITE_KML(r_rec->u_rec.ur_flags))
-                SMFS_SET_INODE_REC(dir);
-        if (old_dentry) 
-                l_dput(old_dentry); 
-        if (new_dentry)
-                l_dput(new_dentry);
-        path_release(&new_nd);
-        path_release(&old_nd);
-        RETURN(rc);
-};
-static int lvfs_reint_unlink(struct super_block *sb, 
-                             struct reint_record *r_rec)
-{
-        struct fsfilt_operations *fsfilt = S2SMI(sb)->sm_fsfilt;
-        int type = r_rec->u_rec.ur_iattr.ia_mode & S_IFMT;
-        char *path = r_rec->rec_data1;
-       	struct nameidata nd;
-	struct dentry *dparent = NULL;
-	struct dentry *dentry = NULL;
-        struct inode *dir = NULL;
-        void *handle = NULL;
-        int rc = 0;
-
-        rc = lookup_by_path(path, LOOKUP_PARENT, &nd); 
-        if (rc)
-                RETURN(rc); 
-	
-        dparent = nd.dentry;
-        
-        dir = dparent->d_inode;
-        
-        dentry = lookup_one_len(nd.last.name, dparent, 
-                                nd.last.len);
-        if (! dentry || !dentry->d_inode 
-            || is_bad_inode(dentry->d_inode)) {
-                GOTO(cleanup, rc = -ENODEV);
-        }   
-        
-        if (!SMFS_DO_WRITE_KML(r_rec->u_rec.ur_flags))
-                SMFS_CLEAN_INODE_REC(dir);
-      
-        handle = fsfilt->fs_start(dir, FSFILT_OP_UNLINK, NULL, 0);
-        
-        if (IS_ERR(handle))
-                GOTO(cleanup, rc = PTR_ERR(handle));
-        
-        switch (type) {
-                case S_IFDIR:
-                        rc = vfs_rmdir(dir, dentry);
-                        if (rc)
-                                CERROR("rmdir in error path: %d\n", rc);
-                        break;
-                default:
-                        rc = vfs_unlink(dir, dentry);
-                        if (rc)
-                                CERROR("unlink in error path: %d\n", rc);
-                        break;
-        }
-        if (!rc) {
-                /*time attr of dir inode*/
-                struct iattr *iattr = &r_rec->u_rec.ur_pattr;
-                
-                iattr->ia_valid = ATTR_MTIME | ATTR_CTIME;
-                rc = fsfilt->fs_setattr(dparent, handle, iattr, 0);
-                if (rc) {
-                        CERROR("error on parent setattr: rc = %d\n", rc);
-                        GOTO(cleanup, rc);
-                }
-        }
-cleanup:
-        if (handle) 
-                fsfilt->fs_commit(dir, handle, 0);
-        if (!SMFS_DO_WRITE_KML(r_rec->u_rec.ur_flags))
-                SMFS_SET_INODE_REC(dir);
-        if (dentry)
-                l_dput(dentry);
-        path_release(&nd);
-        RETURN(rc);
-};
-
-static int lvfs_reint_rename(struct super_block *sb, 
-                             struct reint_record *r_rec)
-{
-        struct fsfilt_operations *fsfilt = S2SMI(sb)->sm_fsfilt;
-        char *path = r_rec->rec_data1;
-        char *new_path = r_rec->rec_data2;
-       	struct nameidata nd;
-       	struct nameidata new_nd;
-	struct dentry *dparent = NULL;
-	struct dentry *new_dparent = NULL;
-	struct dentry *dentry = NULL;
-	struct dentry *new_dentry = NULL;
-        struct inode *dir = NULL;
-        struct inode *new_dir = NULL;
-        void *handle = NULL;
-        int rc = 0;
-
-        rc = lookup_by_path(path, LOOKUP_PARENT, &nd); 
-        if (rc)
-                RETURN(rc); 
-       
-        dparent = nd.dentry;
-        dir = dparent->d_inode;
-        dentry = lookup_one_len(nd.last.name, dparent, nd.last.len);
- 
-        if (!dentry || !dentry->d_inode 
-            || is_bad_inode(dentry->d_inode)) {
-                path_release(&nd);
-                RETURN(rc);
-        }       
-        rc = lookup_by_path(new_path, LOOKUP_PARENT, &new_nd);
-        if (rc) {
-                path_release(&nd); 
-                path_release(&new_nd); 
-                RETURN(rc);
-        }
-        new_dparent = new_nd.dentry;
-        new_dir = new_dparent->d_inode;
-        new_dentry = lookup_create(&new_nd, 0);
- 
-        if (!SMFS_DO_WRITE_KML(r_rec->u_rec.ur_flags)) 
-                SMFS_CLEAN_INODE_REC(dir);
-      
-        handle = fsfilt->fs_start(dir, FSFILT_OP_RENAME, NULL, 0);
-        if (IS_ERR(handle))
-                GOTO(cleanup, rc = PTR_ERR(handle));
-        
-        rc = vfs_rename(dir, dentry, new_dir, new_dentry);
-        if (rc) {
-                CERROR("unlink in error path: %d\n", rc);
-                GOTO(cleanup, 0); 
-        } else {
-                /*restore time attr of dir inode*/
-                struct iattr *iattr = &r_rec->u_rec.ur_pattr;
-                
-                iattr->ia_valid = ATTR_MTIME | ATTR_CTIME;
-                rc = fsfilt->fs_setattr(dparent, handle, iattr, 0);
-                if (rc) {
-                        CERROR("error on parent setattr: rc = %d\n", rc);
-                        GOTO(cleanup, rc);
-                }
-                rc = fsfilt->fs_setattr(new_dparent, handle, iattr, 0);
-                if (rc) {
-                        CERROR("error on parent setattr: rc = %d\n", rc);
-                        GOTO(cleanup, rc);
-                }
-        }
-cleanup:
-        if (handle) 
-                rc = fsfilt->fs_commit(dir, handle, 0);
-        if (!SMFS_DO_WRITE_KML(r_rec->u_rec.ur_flags))
-                SMFS_SET_INODE_REC(dir);
-        if (dentry)
-                l_dput(dentry);
-        if (new_dentry)
-                l_dput(new_dentry);
-        path_release(&nd);
-        path_release(&new_nd); 
-        RETURN(0);
-};
-
-static int lvfs_reint_setattr(struct super_block *sb, 
-                              struct reint_record *r_rec)
-{
-        struct fsfilt_operations *fsfilt = S2SMI(sb)->sm_fsfilt;
-        char *path = r_rec->rec_data1;
-       	struct nameidata nd;
-	struct dentry *dparent = NULL;
-	struct dentry *dentry = NULL;
-        struct inode *dir = NULL;
-        void *handle = NULL;
-        int rc = 0; 
-
-        rc = lookup_by_path(path, LOOKUP_PARENT, &nd); 
-        if (rc)
-                RETURN(rc); 
-        
-        dparent = nd.dentry;
-        dir = dparent->d_inode;
-        dentry = lookup_one_len(nd.last.name, dparent, nd.last.len);
- 
-        if (!dentry || !dentry->d_inode 
-            || is_bad_inode(dentry->d_inode)) {
-                path_release(&nd);
-                RETURN(rc);
-        }       
-        if (!SMFS_DO_WRITE_KML(r_rec->u_rec.ur_flags)) 
-                SMFS_CLEAN_INODE_REC(dir);
-        handle = fsfilt->fs_start(dir, FSFILT_OP_SETATTR, NULL, 0);
-        if (IS_ERR(handle))
-                GOTO(cleanup, rc = PTR_ERR(handle));
-        rc = fsfilt->fs_setattr(dentry, handle, &r_rec->u_rec.ur_pattr, 0);
-cleanup:
-        if (handle) 
-                fsfilt->fs_commit(dir, handle, 0); 
-        if (!SMFS_DO_WRITE_KML(r_rec->u_rec.ur_flags))
-                SMFS_SET_INODE_REC(dir);
-        if (dentry)
-                l_dput(dentry);
-        path_release(&nd);
-        RETURN(0);
-}; 
-static int lvfs_reint_close(struct super_block *sb, 
-                            struct reint_record *r_rec)
-{
-        struct fsfilt_operations *fsfilt = S2SMI(sb)->sm_fsfilt;
-        char   *path = r_rec->rec_data1;
-       	struct nameidata nd;
-	struct dentry *dparent = NULL;
-	struct dentry *dentry = NULL;
-        struct inode *dir = NULL;
-        void *handle = NULL;
-        struct iattr *iattr = &r_rec->u_rec.ur_iattr; 
-        int rc = 0; 
-
-        rc = lookup_by_path(path, LOOKUP_PARENT, &nd); 
-        if (rc)
-                RETURN(rc); 
-        
-        dparent = nd.dentry;
-        dir = dparent->d_inode;
-        dentry = lookup_one_len(nd.last.name, dparent, nd.last.len);
- 
-        if (!dentry || !dentry->d_inode 
-            || is_bad_inode(dentry->d_inode)) {
-                path_release(&nd);
-                RETURN(rc);
-        }       
-        if (!SMFS_DO_WRITE_KML(r_rec->u_rec.ur_flags)) 
-                SMFS_CLEAN_INODE_REC(dir);
-        handle = fsfilt->fs_start(dir, FSFILT_OP_CREATE, NULL, 0);
-        if (IS_ERR(handle))
-                GOTO(cleanup, rc = PTR_ERR(handle));
-        iattr->ia_valid = ATTR_MTIME | ATTR_CTIME | ATTR_SIZE;
-
-        rc = fsfilt->fs_setattr(dentry, handle, iattr, 0);
-        if (rc) {
-                CERROR("error on parent setattr: rc = %d\n", rc);
-                GOTO(cleanup, rc);
-        }
-cleanup:
-        if (handle) 
-                fsfilt->fs_commit(dir, handle, 0); 
-        if (!SMFS_DO_WRITE_KML(r_rec->u_rec.ur_flags))
-                SMFS_SET_INODE_REC(dir);
-        if (dentry)
-                l_dput(dentry);
-        path_release(&nd);
-        RETURN(0);
-}; 
-
-typedef int (*lvfs_reinter)(struct super_block *sb, struct reint_record *);
-static lvfs_reinter reinters[REINT_MAX + 1] = {
-        [REINT_SETATTR] lvfs_reint_setattr,
-        [REINT_CREATE] lvfs_reint_create,
-        [REINT_LINK] lvfs_reint_link,
-        [REINT_UNLINK] lvfs_reint_unlink,
-        [REINT_RENAME] lvfs_reint_rename,
-        [REINT_CLOSE] lvfs_reint_close,
-};
-int lvfs_reint(struct super_block *sb, 
-               void *r_rec)
-{
-        return  reinters[((struct reint_record*)r_rec)->u_rec.ur_opcode](sb, 
-                         (struct reint_record *)r_rec);     
-};
-
-EXPORT_SYMBOL(lvfs_reint);
diff --git a/lustre/lvfs/lvfs_undo.c b/lustre/lvfs/lvfs_undo.c
deleted file mode 100644
index 43e9dbf..0000000
--- a/lustre/lvfs/lvfs_undo.c
+++ /dev/null
@@ -1,421 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- */
-
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
-
-#define DEBUG_SUBSYSTEM S_FILTER
-
-#include <linux/version.h>
-#include <linux/fs.h>
-#include <asm/unistd.h>
-#include <linux/jbd.h>
-#include <linux/slab.h>
-#include <linux/pagemap.h>
-#include <linux/quotaops.h>
-#include <linux/version.h>
-#include <linux/kp30.h>
-#include <linux/lustre_fsfilt.h>
-#include <linux/obd.h>
-#include <linux/obd_class.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/lustre_compat25.h>
-#include <linux/lvfs.h>
-#include <linux/lustre_smfs.h>
-#include "lvfs_internal.h"
-
-#include <linux/obd.h>
-#include <linux/lustre_lib.h>
-
-static int lvfs_undo_create(struct super_block *sb, 
-                            struct reint_record *r_rec)
-{
-        struct fsfilt_operations *fsfilt = S2SMI(sb)->sm_fsfilt;
-        char *path = r_rec->rec_data1;
-        int type = r_rec->u_rec.ur_iattr.ia_mode & S_IFMT;
-       	struct nameidata nd;
-	struct dentry *dparent = NULL;
-	struct dentry *dentry = NULL;
-        struct inode *dir = NULL;
-        void *handle = NULL;
-        int rc = 0;
-
-	rc = lookup_by_path(path, LOOKUP_PARENT, &nd); 
-        if (rc)
-                RETURN(rc); 
-       
-        dparent = nd.dentry; 
-        dir = dparent->d_inode;
-        
-        down(&dir->i_sem);
-        dentry = lookup_one_len(nd.last.name, dparent, nd.last.len);    
-        
-	if (!dentry->d_inode || is_bad_inode(dentry->d_inode)) {
-		up(&dir->i_sem);
-                if (dentry)
-                        l_dput(dentry);
-                path_release(&nd);
-        	RETURN(-ENODEV);
-        } 
-        if (!SMFS_DO_WRITE_KML(r_rec->u_rec.ur_flags))
-                SMFS_CLEAN_INODE_REC(dir);
-        
-        switch(type) {  
-        case S_IFREG:
-        case S_IFLNK:
-        case S_IFCHR:
-        case S_IFBLK:
-        case S_IFIFO:
-        case S_IFSOCK:
-                handle = fsfilt->fs_start(dir, FSFILT_OP_UNLINK, NULL, 0);
-                if (IS_ERR(handle))
-                        GOTO(cleanup, rc = PTR_ERR(handle));
-                rc = vfs_unlink(dir, dentry);
-                if (rc)
-                        CERROR("unlink in error path: %d\n", rc);
-                break;
-        case S_IFDIR:
-                handle = fsfilt->fs_start(dir, FSFILT_OP_RMDIR, NULL, 0);
-                if (IS_ERR(handle))
-                        GOTO(cleanup, rc = PTR_ERR(handle));
-                
-                rc = vfs_rmdir(dir, dentry);
-                if (rc)
-                        CERROR("rmdir in error path: %d\n", rc);
-                break;
-        default:
-                CERROR("Error type %d in create\n", type);
-                rc = -EINVAL;
-                break;
-        }  
-       
-        if (rc) {
-                CERROR("Error for undo node %s\n", path);
-                GOTO(cleanup, 0); 
-        } else {
-                /*restore time attr of dir inode*/
-                struct iattr *iattr = &r_rec->u_rec.ur_pattr;
-                
-                iattr->ia_valid = ATTR_MTIME | ATTR_CTIME;
-                rc = fsfilt->fs_setattr(dparent, handle, iattr, 0);
-                if (rc) {
-                        CERROR("error on parent setattr: rc = %d\n", rc);
-                        GOTO(cleanup, rc);
-                }
-        }
-cleanup:
-        if (handle) 
-                rc = fsfilt->fs_commit(dparent->d_inode, handle, 0);
-        if (!SMFS_DO_WRITE_KML(r_rec->u_rec.ur_flags))
-                SMFS_SET_INODE_REC(dir);
-        if (dentry)
-                l_dput(dentry);
-        up(&dir->i_sem);
-        path_release(&nd);
-        RETURN(0);
-};
-
-static int lvfs_undo_link(struct super_block *sb, 
-                          struct reint_record *r_rec)
-{
-        struct fsfilt_operations *fsfilt = S2SMI(sb)->sm_fsfilt;
-        char   *new_path = r_rec->rec_data2;
-       	struct nameidata nd;
-	struct dentry *dparent = NULL;
-	struct dentry *dentry = NULL;
-        struct inode *dir = NULL;
-        void *handle = NULL;
-        int rc = 0;
-
-	rc = lookup_by_path(new_path, LOOKUP_PARENT, &nd); 
-        if (rc)
-                RETURN(rc); 
-       
-        dparent = nd.dentry; 
-        dir = dparent->d_inode;
-        
-        down(&dir->i_sem);
-        dentry = lookup_one_len(nd.last.name, dparent, nd.last.len);    
-        
-	if (!dentry->d_inode || is_bad_inode(dentry->d_inode)) {
-		up(&dir->i_sem);
-                path_release(&nd);
-        	RETURN(-ENODEV);
-        } 
-        if (!SMFS_DO_WRITE_KML(r_rec->u_rec.ur_flags))
-                SMFS_CLEAN_INODE_REC(dir);
-        
-        handle = fsfilt->fs_start(dir, FSFILT_OP_UNLINK, NULL, 0);
-        if (IS_ERR(handle))
-                GOTO(cleanup, rc = PTR_ERR(handle));
-        rc = vfs_unlink(dir, dentry);
-        if (rc)
-                CERROR("unlink in error path: %d\n", rc);
-
-        if (rc) {
-                CERROR("Error for undo node %s\n", new_path);
-                GOTO(cleanup, 0); 
-        } else {
-                /*restore time attr of dir inode*/
-                struct iattr *iattr = &r_rec->u_rec.ur_pattr;
-                
-                iattr->ia_valid = ATTR_MTIME | ATTR_CTIME;
-                rc = fsfilt->fs_setattr(dparent, handle, iattr, 0);
-                if (rc) {
-                        CERROR("error on parent setattr: rc = %d\n", rc);
-                        GOTO(cleanup, rc);
-                }
-        }
-cleanup:
-        if (handle) 
-                rc = fsfilt->fs_commit(dir, handle, 0);
-        if (!SMFS_DO_WRITE_KML(r_rec->u_rec.ur_flags))
-                SMFS_SET_INODE_REC(dir);
-        if (dentry)
-                l_dput(dentry);
-        up(&dir->i_sem);
-        path_release(&nd);
-        RETURN(0);
-}       
-
-static int lvfs_undo_unlink(struct super_block *sb, 
-                             struct reint_record *r_rec)
-{
-        struct fsfilt_operations *fsfilt = S2SMI(sb)->sm_fsfilt;
-        char   *path = r_rec->rec_data1;
-        struct nameidata nd;
-        struct dentry *dparent;
-	struct dentry *dentry = NULL;
-        struct nameidata del_nd;
-        struct dentry *del_dparent = NULL;
-	struct dentry *del_dentry = NULL;
-        void   *handle = NULL;
-        struct inode *dir = NULL;
-        int    rc = 0;
-        
-        /*get parent dentry*/	
-        rc = lookup_by_path(path, LOOKUP_PARENT, &nd); 
-        if (rc)
-                RETURN(rc); 
-       
-        dparent = nd.dentry;
-        dir = dparent->d_inode;
-        
-        dentry = lookup_create(&nd, 0);
-        
-        if (!SMFS_DO_WRITE_KML(r_rec->u_rec.ur_flags))
-                SMFS_CLEAN_INODE_REC(dir);
-        if (SMFS_DO_DEC_LINK(r_rec->u_rec.ur_flags)) {
-                ino_t ino = *((ino_t *)r_rec->rec_data2);
-                struct inode* inode = iget(dir->i_sb, ino);
-                if (!inode) 
-                        GOTO(cleanup1, rc = -EINVAL);        
-                handle = fsfilt->fs_start(dir, FSFILT_OP_LINK, NULL, 0);
-                if (IS_ERR(handle))
-                        GOTO(cleanup1, rc = PTR_ERR(handle));
-                
-                del_dentry = pre_smfs_dentry(NULL, inode, dentry);
-                rc = vfs_link(del_dentry, dir, dentry); 
-cleanup1:
-                post_smfs_dentry(del_dentry);
-                iput(inode);
-        } else {
-                char   *del_path = r_rec->rec_data2;
-                             
-                rc = lookup_by_path(del_path, LOOKUP_PARENT, &del_nd);
-                if (rc) 
-                        GOTO(cleanup, rc = -ENODEV);
-                del_dparent = del_nd.dentry;
-                del_dentry = lookup_one_len(del_nd.last.name, del_dparent, 
-                                    del_nd.last.len);    
-
-                if (! del_dentry || !del_dentry->d_inode 
-                    || is_bad_inode(del_dentry->d_inode)) 
-                        GOTO(cleanup2, rc = -ENODEV);
-
-                handle = fsfilt->fs_start(dir, FSFILT_OP_RENAME, NULL, 0);
-                if (IS_ERR(handle))
-                        GOTO(cleanup2, rc = PTR_ERR(handle));
-
-                lock_kernel();
-                /*move the del dentry back to the original palace*/
-                rc = vfs_rename(del_dparent->d_inode, del_dentry, dir, dentry);
-                unlock_kernel();
-                if (!rc && S_ISDIR(del_dentry->d_inode->i_mode))
-                        del_dentry->d_inode->i_flags &=~S_DEAD;
-cleanup2:
-                if (del_dentry)
-                        l_dput(del_dentry);
-                path_release(&del_nd);
-        }
-        if (!rc) {
-               /*restore time attr of dir inode*/
-                struct iattr *iattr = &r_rec->u_rec.ur_pattr;
-                
-                iattr->ia_valid = ATTR_MTIME | ATTR_CTIME;
-                rc = fsfilt->fs_setattr(dparent, handle, iattr, 0);
-                if (rc) {
-                        CERROR("error on parent setattr: rc = %d\n", rc);
-                        GOTO(cleanup, rc);
-                }
-        } 
-cleanup:
-        if (handle) 
-                fsfilt->fs_commit(dir, handle, 0);
-        if (dentry);
-                l_dput(dentry);
-        path_release(&nd);
-        if (!SMFS_DO_WRITE_KML(r_rec->u_rec.ur_flags))
-                SMFS_SET_INODE_REC(dir);
-        RETURN(rc);
-}
-
-static int lvfs_undo_rename(struct super_block *sb, 
-                             struct reint_record *r_rec)
-{
-        struct fsfilt_operations *fsfilt = S2SMI(sb)->sm_fsfilt;
-        char   *path = r_rec->rec_data1;
-        char   *new_path = r_rec->rec_data2;
-        struct nameidata nd;
-        struct nameidata new_nd;
-        struct dentry *dparent;
-        struct dentry *new_dparent;
-	struct dentry *dentry = NULL;
-	struct dentry *new_dentry = NULL;
-        void   *handle = NULL;
-        struct inode *dir = NULL;
-        struct inode *new_dir = NULL;
-        int    rc = 0;
-        
-        /*get parent dentry*/	
-        rc = lookup_by_path(path, LOOKUP_PARENT, &nd); 
-        if (rc)
-                RETURN(rc); 
-       
-        dparent = nd.dentry;
-        dir = dparent->d_inode;
-        dentry = lookup_create(&nd, 0);
-        
-        rc = lookup_by_path(new_path, LOOKUP_PARENT, &new_nd);
-        if (rc) {
-                path_release(&nd); 
-                RETURN(rc);
-        }
-        new_dparent = new_nd.dentry;
-        new_dir = new_dparent->d_inode;
-        new_dentry = lookup_one_len(new_nd.last.name, new_dparent, 
-                                    new_nd.last.len);    
-        
-        if (! new_dentry || !new_dentry->d_inode 
-            || is_bad_inode(new_dentry->d_inode)) {
-                GOTO(cleanup, rc = -ENODEV);
-        }       
-        
-        if (!SMFS_DO_WRITE_KML(r_rec->u_rec.ur_flags))
-                SMFS_CLEAN_INODE_REC(new_dir);
-	 
-        handle = fsfilt->fs_start(new_dir, FSFILT_OP_RENAME, NULL, 0);
-        if (IS_ERR(handle))
-                GOTO(cleanup, rc = PTR_ERR(handle));
-
-        lock_kernel();
-        /*move the del dentry back to the original palace*/
-        rc = vfs_rename(new_dir, new_dentry, dir, dentry);
-        unlock_kernel();
-        if (rc) {
-                CERROR("Error for undo node %s\n", new_path);
-                GOTO(cleanup, 0); 
-        } else {
-                /*restore time attr of dir inode*/
-                struct iattr *iattr = &r_rec->u_rec.ur_pattr;
-                
-                iattr->ia_valid = ATTR_MTIME | ATTR_CTIME;
-                rc = fsfilt->fs_setattr(dparent, handle, iattr, 0);
-                if (rc) {
-                        CERROR("error on parent setattr: rc = %d\n", rc);
-                        GOTO(cleanup, rc);
-                }
-        }
-cleanup:
-        if (handle) 
-                rc = fsfilt->fs_commit(new_dir, handle, 0);
-        if (dentry);
-		l_dput(dentry);
-        if (new_dentry)
-                l_dput(new_dentry);
-        if (!SMFS_DO_WRITE_KML(r_rec->u_rec.ur_flags))
-                SMFS_SET_INODE_REC(new_dir);
-        path_release(&nd);
-        path_release(&new_nd);
-        RETURN(rc);
-};
-
-static int lvfs_undo_setattr(struct super_block *sb, 
-                             struct reint_record *r_rec)
-{
-        struct fsfilt_operations *fsfilt = S2SMI(sb)->sm_fsfilt;
-        char *path = r_rec->rec_data1;
-       	struct nameidata nd;
-	struct dentry *dparent = NULL;
-	struct dentry *dentry = NULL;
-        struct inode *dir = NULL;
-        void *handle = NULL;
-        int rc = 0;
-
-        rc = lookup_by_path(path, LOOKUP_PARENT, &nd); 
-        if (rc)
-                RETURN(rc); 
-        
-        dparent = nd.dentry;
-        dir = dparent->d_inode;
-        dentry = lookup_one_len(nd.last.name, dparent, nd.last.len);
- 
-        if (!dentry || !dentry->d_inode 
-            || is_bad_inode(dentry->d_inode)) {
-                path_release(&nd);
-                RETURN(rc);
-        }       
-        if (!SMFS_DO_WRITE_KML(r_rec->u_rec.ur_flags)) 
-                SMFS_CLEAN_INODE_REC(dir);
-        handle = fsfilt->fs_start(dir, FSFILT_OP_SETATTR, NULL, 0);
-        if (IS_ERR(handle))
-                GOTO(cleanup, rc = PTR_ERR(handle));
-        
-        /*FIXME later, did not set parent attr*/
-        r_rec->u_rec.ur_iattr.ia_valid = r_rec->u_rec.ur_pattr.ia_valid;
-        rc = fsfilt->fs_setattr(dentry, handle, &r_rec->u_rec.ur_iattr, 0);
-cleanup:  
-        if (handle)
-                fsfilt->fs_commit(dir, handle, 0); 
-        if (!SMFS_DO_WRITE_KML(r_rec->u_rec.ur_flags))
-                SMFS_SET_INODE_REC(dir);
-        if (dentry)
-                l_dput(dentry);
-        path_release(&nd);
-        RETURN(0);
-       
-        RETURN(0);
-}; 
-
-
-typedef int (*lvfs_undoer)(struct super_block *sb, struct reint_record *);
-
-static lvfs_undoer undoers[REINT_MAX + 1] = {
-        [REINT_SETATTR] lvfs_undo_setattr,
-        [REINT_CREATE] lvfs_undo_create,
-        [REINT_LINK] lvfs_undo_link,
-        [REINT_UNLINK] lvfs_undo_unlink,
-        [REINT_RENAME] lvfs_undo_rename,
-};
-
-int lvfs_undo(struct super_block *sb, 
-              void *r_rec)
-{
-        return  undoers[((struct reint_record*)r_rec)->u_rec.ur_opcode](sb, 
-                         (struct reint_record *)r_rec);     
-};
-
-EXPORT_SYMBOL(lvfs_undo);
diff --git a/lustre/lvfs/lvfs_userfs.c b/lustre/lvfs/lvfs_userfs.c
index 396ee30..021a0a3 100644
--- a/lustre/lvfs/lvfs_userfs.c
+++ b/lustre/lvfs/lvfs_userfs.c
@@ -25,19 +25,20 @@
 
 #include <liblustre.h>
 #include <linux/lvfs.h>
+#include "lvfs_internal.h"
 
 #include <linux/obd.h>
 #include <linux/lustre_lib.h>
 
 /* XXX currently ctxt functions should not be used ?? */
-void push_ctxt(struct lvfs_run_ctxt *save, struct lvfs_run_ctxt *new_ctx,
-               struct lvfs_ucred *uc)
+void push_ctxt(struct obd_run_ctxt *save, struct obd_run_ctxt *new_ctx,
+               struct obd_ucred *uc)
 {
         LBUG();
 }
 
-void pop_ctxt(struct lvfs_run_ctxt *saved, struct lvfs_run_ctxt *new_ctx,
-              struct lvfs_ucred *uc)
+void pop_ctxt(struct obd_run_ctxt *saved, struct obd_run_ctxt *new_ctx,
+              struct obd_ucred *uc)
 {
         LBUG();
 }
diff --git a/lustre/mdc/.cvsignore b/lustre/mdc/.cvsignore
index 5d26f00..49c6100 100644
--- a/lustre/mdc/.cvsignore
+++ b/lustre/mdc/.cvsignore
@@ -3,13 +3,7 @@ config.log
 config.status
 configure
 Makefile
+Makefile.in
 .deps
 TAGS
 .*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
diff --git a/lustre/mdc/autoMakefile.am b/lustre/mdc/Makefile.am
similarity index 57%
rename from lustre/mdc/autoMakefile.am
rename to lustre/mdc/Makefile.am
index e46e120..0200532 100644
--- a/lustre/mdc/autoMakefile.am
+++ b/lustre/mdc/Makefile.am
@@ -3,16 +3,18 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
+DEFS=
+
 if LIBLUSTRE
 noinst_LIBRARIES = libmdc.a
 libmdc_a_SOURCES = mdc_request.c mdc_reint.c mdc_lib.c mdc_internal.h mdc_locks.c
-libmdc_a_CPPFLAGS = $(LLCPPFLAGS)
-libmdc_a_CFLAGS = $(LLCFLAGS)
-endif
+libmdc_a_CFLAGS = -fPIC
+else
+MODULE = mdc
+modulefs_DATA = mdc.o
+EXTRA_PROGRAMS = mdc
 
-if MODULES
-modulefs_DATA = mdc$(KMODEXT)
+mdc_SOURCES = mdc_request.c mdc_reint.c lproc_mdc.c mdc_lib.c mdc_locks.c mdc_internal.h
 endif
 
-DIST_SOURCES = $(mdc-objs:.o=.c) mdc_internal.h
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
+include $(top_srcdir)/Rules
diff --git a/lustre/mdc/Makefile.in b/lustre/mdc/Makefile.in
deleted file mode 100644
index b9b9793..0000000
--- a/lustre/mdc/Makefile.in
+++ /dev/null
@@ -1,4 +0,0 @@
-MODULES := mdc
-mdc-objs := mdc_request.o mdc_reint.o lproc_mdc.o mdc_lib.o mdc_locks.o
-
-@INCLUDE_RULES@
diff --git a/lustre/mdc/mdc_internal.h b/lustre/mdc/mdc_internal.h
index 568df2c..2b459b4 100644
--- a/lustre/mdc/mdc_internal.h
+++ b/lustre/mdc/mdc_internal.h
@@ -21,8 +21,6 @@ void mdc_link_pack(struct ptlrpc_request *req, int offset,
 void mdc_rename_pack(struct ptlrpc_request *req, int offset,
                      struct mdc_op_data *data,
                      const char *old, int oldlen, const char *new, int newlen);
-void mdc_close_pack(struct ptlrpc_request *req, int offset, struct obdo *oa,
-		    int valid, struct obd_client_handle *och);
 
 struct mdc_open_data {
         struct obd_client_handle *mod_och;
diff --git a/lustre/mdc/mdc_lib.c b/lustre/mdc/mdc_lib.c
index e2dc251..5d675e4 100644
--- a/lustre/mdc/mdc_lib.c
+++ b/lustre/mdc/mdc_lib.c
@@ -284,6 +284,7 @@ void mdc_getattr_pack(struct ptlrpc_request *req, int valid, int offset,
         b->suppgid = data->ctxt.gid1;
 
         b->fid1 = data->fid1;
+        b->fid2 = data->fid2;
         if (data->name) {
                 char *tmp;
                 tmp = lustre_msg_buf(req->rq_reqmsg, offset + 1,
@@ -292,37 +293,3 @@ void mdc_getattr_pack(struct ptlrpc_request *req, int valid, int offset,
         }
 }
 
-void mdc_close_pack(struct ptlrpc_request *req, int offset, struct obdo *oa,
-                    int valid, struct obd_client_handle *och)
-{
-        struct mds_body *body;
-
-        body = lustre_msg_buf(req->rq_reqmsg, 0, sizeof(*body));
-
-        mdc_pack_fid(&body->fid1, oa->o_id, 0, oa->o_mode);
-        memcpy(&body->handle, &och->och_fh, sizeof(body->handle));
-        if (oa->o_valid & OBD_MD_FLATIME) {
-                body->atime = oa->o_atime;
-                body->valid |= OBD_MD_FLATIME;
-        }
-        if (oa->o_valid & OBD_MD_FLMTIME) {
-                body->mtime = oa->o_mtime;
-                body->valid |= OBD_MD_FLMTIME;
-        }
-        if (oa->o_valid & OBD_MD_FLCTIME) {
-                body->ctime = oa->o_ctime;
-                body->valid |= OBD_MD_FLCTIME;
-        }
-        if (oa->o_valid & OBD_MD_FLSIZE) {
-                body->size = oa->o_size;
-                body->valid |= OBD_MD_FLSIZE;
-        }
-        if (oa->o_valid & OBD_MD_FLBLOCKS) {
-                body->blocks = oa->o_blocks;
-                body->valid |= OBD_MD_FLBLOCKS;
-        }
-        if (oa->o_valid & OBD_MD_FLFLAGS) {
-                body->flags = oa->o_flags;
-                body->valid |= OBD_MD_FLFLAGS;
-        }
-}
diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c
index a2bbab9..3e7410a 100644
--- a/lustre/mdc/mdc_locks.c
+++ b/lustre/mdc/mdc_locks.c
@@ -139,12 +139,12 @@ void mdc_set_lock_data(__u64 *l, void *data)
         if (lock->l_ast_data && lock->l_ast_data != data) {
                 struct inode *new_inode = data;
                 struct inode *old_inode = lock->l_ast_data;
-                LASSERTF(old_inode->i_state & I_FREEING,
-                         "Found existing inode %p/%lu/%u state %lu in lock: "
-                         "setting data to %p/%lu/%u\n", old_inode,
-                         old_inode->i_ino, old_inode->i_generation,
-                         old_inode->i_state,
-                         new_inode, new_inode->i_ino, new_inode->i_generation);
+                unsigned long state = old_inode->i_state & I_FREEING;
+                CERROR("Found existing inode %p/%lu/%u state %lu in lock: "
+                       "setting data to %p/%lu/%u\n", old_inode,
+                       old_inode->i_ino, old_inode->i_generation, state,
+                       new_inode, new_inode->i_ino, new_inode->i_generation);
+                LASSERT(state);
         }
 #endif
         lock->l_ast_data = data;
@@ -346,9 +346,6 @@ int mdc_enqueue(struct obd_export *exp,
                 spin_unlock(&req->rq_lock);
         }
 
-        DEBUG_REQ(D_RPCTRACE, req, "disposition: %x, status: %d",
-                  it->d.lustre.it_disposition, it->d.lustre.it_status);
-
         /* We know what to expect, so we do any byte flipping required here */
         LASSERT(reply_buffers == 4 || reply_buffers == 3 || reply_buffers == 1);
         if (reply_buffers >= 3) {
@@ -414,9 +411,9 @@ EXPORT_SYMBOL(mdc_enqueue);
  */
 int mdc_intent_lock(struct obd_export *exp, struct ll_uctxt *uctxt,
                     struct ll_fid *pfid, const char *name, int len,
-                    void *lmm, int lmmsize,
-                    struct ll_fid *cfid, struct lookup_intent *it,
-                    int lookup_flags, struct ptlrpc_request **reqp,
+                    void *lmm, int lmmsize, struct ll_fid *cfid,
+                    struct lookup_intent *it, int lookup_flags,
+                    struct ptlrpc_request **reqp,
                     ldlm_blocking_callback cb_blocking)
 {
         struct lustre_handle lockh;
@@ -429,9 +426,9 @@ int mdc_intent_lock(struct obd_export *exp, struct ll_uctxt *uctxt,
         LASSERT(it);
 
         CDEBUG(D_DLMTRACE, "name: %*s in %ld, intent: %s\n", len, name,
-               (unsigned long)pfid->id, ldlm_it2str(it->it_op));
+               pfid ? (unsigned long) pfid->id : 0 , ldlm_it2str(it->it_op));
 
-        if (cfid && (it->it_op == IT_LOOKUP || it->it_op == IT_GETATTR)) {
+        if ((it->it_op == IT_LOOKUP || it->it_op == IT_GETATTR) && cfid) {
                 /* We could just return 1 immediately, but since we should only
                  * be called in revalidate_it if we already have a lock, let's
                  * verify that. */
@@ -508,7 +505,12 @@ int mdc_intent_lock(struct obd_export *exp, struct ll_uctxt *uctxt,
         if (cfid != NULL) {
                 it_set_disposition(it, DISP_ENQ_COMPLETE);
                 /* Also: did we find the same inode? */
-                if (memcmp(cfid, &mds_body->fid1, sizeof(*cfid)))
+                /* we have to compare all the fields but type, because
+                 * MDS can return mds/ino/generation triple if inode
+                 * lives on another MDS -bzzz */
+                if (cfid->generation != mds_body->fid1.generation ||
+                                cfid->id != mds_body->fid1.id ||
+                                cfid->mds != mds_body->fid1.mds)
                         RETURN(-ESTALE);
         }
 
diff --git a/lustre/mdc/mdc_reint.c b/lustre/mdc/mdc_reint.c
index a845347..d092270 100644
--- a/lustre/mdc/mdc_reint.c
+++ b/lustre/mdc/mdc_reint.c
@@ -41,6 +41,7 @@ static int mdc_reint(struct ptlrpc_request *request,
                      struct mdc_rpc_lock *rpc_lock, int level)
 {
         int rc;
+        
 
         request->rq_send_state = level;
 
diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c
index 342dabd..08f853e 100644
--- a/lustre/mdc/mdc_request.c
+++ b/lustre/mdc/mdc_request.c
@@ -227,7 +227,8 @@ void mdc_store_inode_generation(struct ptlrpc_request *req, int reqoff,
 }
 
 int mdc_req2lustre_md(struct ptlrpc_request *req, int offset,
-                      struct obd_export *exp,
+                      struct obd_export *exp_osc,
+                      struct obd_export *exp_mdc,
                       struct lustre_md *md)
 {
         int rc = 0;
@@ -240,12 +241,14 @@ int mdc_req2lustre_md(struct ptlrpc_request *req, int offset,
         LASSERT (md->body != NULL);
         LASSERT_REPSWABBED (req, offset);
 
-        if (md->body->valid & OBD_MD_FLEASIZE) {
+        if (!(md->body->valid & OBD_MD_FLEASIZE))
+                RETURN(0);
+
+        /* ea is presented in reply, parse it */
+        if (S_ISREG(md->body->mode)) {
                 int lmmsize;
                 struct lov_mds_md *lmm;
 
-                LASSERT(S_ISREG(md->body->mode));
-
                 if (md->body->eadatasize == 0) {
                         CERROR ("OBD_MD_FLEASIZE set, but eadatasize 0\n");
                         RETURN(-EPROTO);
@@ -255,11 +258,31 @@ int mdc_req2lustre_md(struct ptlrpc_request *req, int offset,
                 LASSERT (lmm != NULL);
                 LASSERT_REPSWABBED (req, offset + 1);
 
-                rc = obd_unpackmd(exp, &md->lsm, lmm, lmmsize);
+                rc = obd_unpackmd(exp_osc, &md->lsm, lmm, lmmsize);
                 if (rc >= 0) {
                         LASSERT (rc >= sizeof (*md->lsm));
                         rc = 0;
                 }
+        } else if (S_ISDIR(md->body->mode)) {
+                struct mea *mea;
+                int mdsize;
+                LASSERT(exp_mdc != NULL);
+                /* dir can be non-splitted */
+                if (md->body->eadatasize == 0)
+                        RETURN(0);
+
+                mdsize = md->body->eadatasize;
+                mea = lustre_msg_buf(req->rq_repmsg, offset + 1, mdsize);
+                LASSERT(mea != NULL);
+
+                rc = obd_unpackmd(exp_mdc, (void *) &md->mea,
+                                  (void *) mea, mdsize);
+                if (rc >= 0) {
+                        LASSERT (rc >= sizeof (*md->mea));
+                        rc = 0;
+                }
+        } else {
+                LASSERT(0);
         }
         RETURN(rc);
 }
@@ -366,7 +389,7 @@ void mdc_clear_open_replay_data(struct obd_client_handle *och)
          * we're sure we won't need to fix up the close request in the future),
          * but make sure that replay doesn't poke at the och, which is about to
          * be freed. */
-        LASSERT(mod != LP_POISON);
+        LASSERT(mod != (void *)0x5a5a5a5a);
         if (mod != NULL)
                 mod->mod_och = NULL;
         och->och_mod = NULL;
@@ -388,8 +411,7 @@ static void mdc_commit_close(struct ptlrpc_request *req)
 
         open_req = mod->mod_open_req;
         LASSERT(open_req != NULL);
-        LASSERT(open_req != LP_POISON);
-        LASSERT(open_req->rq_type != LI_POISON);
+        LASSERT(open_req != (void *)0x5a5a5a5a);
 
         DEBUG_REQ(D_HA, open_req, "open req balanced");
         LASSERT(open_req->rq_transno != 0);
@@ -405,21 +427,18 @@ static void mdc_commit_close(struct ptlrpc_request *req)
 static int mdc_close_interpret(struct ptlrpc_request *req, void *data, int rc)
 {
         union ptlrpc_async_args *aa = data;
-        struct mdc_rpc_lock *rpc_lock;
+        struct mdc_rpc_lock *rpc_lock = aa->pointer_arg[0];
         struct obd_device *obd = aa->pointer_arg[1];
-        unsigned long flags;
-
-        spin_lock_irqsave(&req->rq_lock, flags);
-        rpc_lock = aa->pointer_arg[0];
-        aa->pointer_arg[0] = NULL;
-        spin_unlock_irqrestore (&req->rq_lock, flags);
 
         if (rpc_lock == NULL) {
                 CERROR("called with NULL rpc_lock\n");
         } else {
                 mdc_put_rpc_lock(rpc_lock, NULL);
-                LASSERTF(rpc_lock == obd->u.cli.cl_rpc_lock, "%p != %p\n",
-                         rpc_lock, obd->u.cli.cl_rpc_lock);
+                LASSERTF(req->rq_async_args.pointer_arg[0] ==
+                         obd->u.cli.cl_rpc_lock, "%p != %p\n",
+                         req->rq_async_args.pointer_arg[0],
+                         obd->u.cli.cl_rpc_lock);
+                aa->pointer_arg[0] = NULL;
         }
         wake_up(&req->rq_reply_waitq);
         RETURN(rc);
@@ -433,8 +452,9 @@ static int mdc_close_check_reply(struct ptlrpc_request *req)
         unsigned long flags;
 
         spin_lock_irqsave(&req->rq_lock, flags);
-        if (req->rq_async_args.pointer_arg[0] == NULL)
+        if (PTLRPC_REQUEST_COMPLETE(req)) {
                 rc = 1;
+        }
         spin_unlock_irqrestore (&req->rq_lock, flags);
         return rc;
 }
@@ -444,12 +464,13 @@ static int go_back_to_sleep(void *unused)
         return 0;
 }
 
-int mdc_close(struct obd_export *exp, struct obdo *oa,
+int mdc_close(struct obd_export *exp, struct obdo *obdo,
               struct obd_client_handle *och, struct ptlrpc_request **request)
 {
+        struct mds_body *body;
         struct obd_device *obd = class_exp2obd(exp);
-        int reqsize = sizeof(struct mds_body);
-        int rc, repsize[3] = {sizeof(struct mds_body),
+        int reqsize = sizeof(*body);
+        int rc, repsize[3] = {sizeof(*body),
                               obd->u.cli.cl_max_mds_easize,
                               obd->u.cli.cl_max_mds_cookiesize};
         struct ptlrpc_request *req;
@@ -467,14 +488,19 @@ int mdc_close(struct obd_export *exp, struct obdo *oa,
         mod = och->och_mod;
         if (likely(mod != NULL)) {
                 mod->mod_close_req = req;
-                LASSERT(mod->mod_open_req->rq_type != LI_POISON);
                 DEBUG_REQ(D_HA, mod->mod_open_req, "matched open req %p",
                           mod->mod_open_req);
         } else {
                 CDEBUG(D_HA, "couldn't find open req; expecting close error\n");
         }
 
-        mdc_close_pack(req, 0, oa, oa->o_valid, och);
+        body = lustre_msg_buf(req->rq_reqmsg, 0, sizeof(*body));
+        mdc_pack_fid(&body->fid1, obdo->o_id, 0, obdo->o_mode);
+        memcpy(&body->handle, &och->och_fh, sizeof(body->handle));
+        body->size = obdo->o_size;
+        body->blocks = obdo->o_blocks;
+        body->flags = obdo->o_flags;
+        body->valid = obdo->o_valid;
 
         req->rq_replen = lustre_msg_size(3, repsize);
         req->rq_commit_cb = mdc_commit_close;
@@ -493,12 +519,7 @@ int mdc_close(struct obd_export *exp, struct obdo *oa,
                                NULL, NULL);
         rc = l_wait_event(req->rq_reply_waitq, mdc_close_check_reply(req),
                           &lwi);
-        if (req->rq_repmsg == NULL) {
-                CDEBUG(D_HA, "request failed to send: %p, %d\n", req,
-                       req->rq_status);
-                if (rc == 0)
-                        rc = req->rq_status ? req->rq_status : -EIO;
-        } else if (rc == 0) {
+        if (rc == 0) {
                 rc = req->rq_repmsg->status;
                 if (req->rq_repmsg->type == PTL_RPC_MSG_ERR) {
                         DEBUG_REQ(D_ERROR, req, "type == PTL_RPC_MSG_ERR, err "
@@ -554,8 +575,9 @@ int mdc_done_writing(struct obd_export *exp, struct obdo *obdo)
         RETURN(rc);
 }
 
-int mdc_readpage(struct obd_export *exp, struct ll_fid *mdc_fid, __u64 offset,
-                 struct page *page, struct ptlrpc_request **request)
+int mdc_readpage(struct obd_export *exp, struct ll_fid *mdc_fid,
+                 __u64 offset, struct page *page,
+                 struct ptlrpc_request **request)
 {
         struct obd_import *imp = class_exp2cliimp(exp);
         struct ptlrpc_request *req = NULL;
@@ -616,15 +638,9 @@ static int mdc_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
         struct llog_ctxt *ctxt;
         int rc;
         ENTRY;
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
+        
         MOD_INC_USE_COUNT;
-#else
-	if (!try_module_get(THIS_MODULE)) {
-		CERROR("Can't get module. Is it alive?");
-		return -EINVAL;
-	}
-#endif
+
         switch (cmd) {
         case OBD_IOC_CLIENT_RECOVER:
                 rc = ptlrpc_recover_import(imp, data->ioc_inlbuf1);
@@ -635,30 +651,26 @@ static int mdc_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                 rc = ptlrpc_set_import_active(imp, data->ioc_offset);
                 GOTO(out, rc);
         case OBD_IOC_PARSE: {
-                ctxt = llog_get_context(exp->exp_obd, LLOG_CONFIG_REPL_CTXT);
+                ctxt = llog_get_context(&exp->exp_obd->obd_llogs,
+                                        LLOG_CONFIG_REPL_CTXT);
                 rc = class_config_parse_llog(ctxt, data->ioc_inlbuf1, NULL);
                 GOTO(out, rc);
         }
 #ifdef __KERNEL__
         case OBD_IOC_LLOG_INFO:
         case OBD_IOC_LLOG_PRINT: {
-                ctxt = llog_get_context(obd, LLOG_CONFIG_REPL_CTXT);
+                ctxt = llog_get_context(&obd->obd_llogs, LLOG_CONFIG_REPL_CTXT);
                 rc = llog_ioctl(ctxt, cmd, data);
                 
                 GOTO(out, rc);
         }
 #endif
         default:
-                CERROR("mdc_ioctl(): unrecognised ioctl %#x\n", cmd);
+                CERROR("osc_ioctl(): unrecognised ioctl %#x\n", cmd);
                 GOTO(out, rc = -ENOTTY);
         }
 out:
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
         MOD_DEC_USE_COUNT;
-#else
-	module_put(THIS_MODULE);
-#endif
-
         return rc;
 }
 
@@ -677,6 +689,19 @@ int mdc_set_info(struct obd_export *exp, obd_count keylen,
                        exp->exp_obd->obd_name,
                        imp->imp_initial_recov);
                 RETURN(0);
+        } else if (keylen >= strlen("client") && strcmp(key, "client") == 0) {
+                struct ptlrpc_request *req;
+                char *bufs[1] = {key};
+                int rc;
+                req = ptlrpc_prep_req(class_exp2cliimp(exp), OST_SET_INFO, 1,
+                                      &keylen, bufs);
+                if (req == NULL)
+                        RETURN(-ENOMEM);
+
+                req->rq_replen = lustre_msg_size(0, NULL);
+                rc = ptlrpc_queue_wait(req);
+                ptlrpc_req_finished(req);
+                RETURN(rc);
         }
         
         RETURN(rc);
@@ -832,6 +857,19 @@ int mdc_sync(struct obd_export *exp, struct ll_fid *fid,
         RETURN(rc);
 }
 
+static int mdc_attach(struct obd_device *dev, obd_count len, void *data)
+{
+        struct lprocfs_static_vars lvars;
+
+        lprocfs_init_vars(mdc, &lvars);
+        return lprocfs_obd_attach(dev, lvars.obd_vars);
+}
+
+static int mdc_detach(struct obd_device *dev)
+{
+        return lprocfs_obd_detach(dev);
+}
+
 static int mdc_import_event(struct obd_device *obd,
                             struct obd_import *imp, 
                             enum obd_import_event event)
@@ -851,7 +889,7 @@ static int mdc_import_event(struct obd_device *obd,
         }
         case IMP_EVENT_INVALIDATE: {
                 struct ldlm_namespace *ns = obd->obd_namespace;
-
+                
                 ldlm_namespace_cleanup(ns, LDLM_FL_LOCAL_ONLY);
 
                 break;
@@ -871,7 +909,6 @@ static int mdc_import_event(struct obd_device *obd,
 static int mdc_setup(struct obd_device *obd, obd_count len, void *buf)
 {
         struct client_obd *cli = &obd->u.cli;
-        struct lprocfs_static_vars lvars;
         int rc;
         ENTRY;
 
@@ -884,71 +921,43 @@ static int mdc_setup(struct obd_device *obd, obd_count len, void *buf)
 
         OBD_ALLOC(cli->cl_setattr_lock, sizeof (*cli->cl_setattr_lock));
         if (!cli->cl_setattr_lock)
-                GOTO(err_rpc_lock, rc = -ENOMEM);
+                GOTO(out_free_rpc, rc = -ENOMEM);
         mdc_init_rpc_lock(cli->cl_setattr_lock);
 
         rc = client_obd_setup(obd, len, buf);
-        if (rc)
-                GOTO(err_setattr_lock, rc);
-        lprocfs_init_vars(mdc, &lvars);
-        lprocfs_obd_setup(obd, lvars.obd_vars);
+        if (rc) {
+                OBD_FREE(cli->cl_setattr_lock, sizeof (*cli->cl_setattr_lock));
+ out_free_rpc:
+                OBD_FREE(cli->cl_rpc_lock, sizeof (*cli->cl_rpc_lock));
+        }
 
-        rc = obd_llog_init(obd, obd, 0, NULL);
+        rc = obd_llog_init(obd, &obd->obd_llogs, obd, 0, NULL);
         if (rc) {
                 mdc_cleanup(obd, 0);
                 CERROR("failed to setup llogging subsystems\n");
         }
 
         RETURN(rc);
-
-err_setattr_lock:
-        OBD_FREE(cli->cl_setattr_lock, sizeof (*cli->cl_setattr_lock));
-err_rpc_lock:
-        OBD_FREE(cli->cl_rpc_lock, sizeof (*cli->cl_rpc_lock));
-        ptlrpcd_decref();
-        RETURN(rc);
 }
 
-int mdc_init_ea_size(struct obd_device *obd, char *lov_name)
+int mdc_init_ea_size(struct obd_export *exp, int easize, int cookiesize)
 {
+        struct obd_device *obd = exp->exp_obd;
         struct client_obd *cli = &obd->u.cli;
-        struct obd_device *lov_obd;
-        struct obd_export *exp;
-        struct lustre_handle conn;
-        struct lov_desc desc;
-        int valsize;
-        int rc;
-
-        lov_obd = class_name2obd(lov_name);
-        if (!lov_obd) {
-                CERROR("MDC cannot locate LOV %s!\n", lov_name);
-                RETURN(-ENOTCONN);
-        }
-
-        rc = obd_connect(&conn, lov_obd, &obd->obd_uuid);
-        if (rc) {
-                CERROR("MDC failed connect to LOV %s (%d)\n", lov_name, rc);
-                RETURN(rc);
-        }
-        exp = class_conn2export(&conn);
+        ENTRY;
 
-        valsize = sizeof(desc);
-        rc = obd_get_info(exp, strlen("lovdesc") + 1, "lovdesc",
-                          &valsize, &desc);
-        if (rc == 0) {
-                cli->cl_max_mds_easize = obd_size_diskmd(exp, NULL);
-                cli->cl_max_mds_cookiesize = desc.ld_tgt_count *
-                        sizeof(struct llog_cookie);
-        }
-        obd_disconnect(exp, 0);
-        RETURN(rc);
+        if (cli->cl_max_mds_easize < easize)
+                cli->cl_max_mds_easize = easize;
+        if (cli->cl_max_mds_cookiesize < cookiesize)
+                cli->cl_max_mds_cookiesize = cookiesize;
+        RETURN(0);
 }
 
 static int mdc_precleanup(struct obd_device *obd, int flags)
 {
         int rc = 0;
-
-        rc = obd_llog_finish(obd, 0);
+        
+        rc = obd_llog_finish(obd, &obd->obd_llogs, 0);
         if (rc != 0)
                 CERROR("failed to cleanup llogging subsystems\n");
 
@@ -958,74 +967,272 @@ static int mdc_precleanup(struct obd_device *obd, int flags)
 static int mdc_cleanup(struct obd_device *obd, int flags)
 {
         struct client_obd *cli = &obd->u.cli;
-
+ 
         OBD_FREE(cli->cl_rpc_lock, sizeof (*cli->cl_rpc_lock));
         OBD_FREE(cli->cl_setattr_lock, sizeof (*cli->cl_setattr_lock));
 
-        lprocfs_obd_cleanup(obd);
         ptlrpcd_decref();
 
         return client_obd_cleanup(obd, flags);
 }
 
 
-static int mdc_llog_init(struct obd_device *obd, struct obd_device *tgt,
-                         int count, struct llog_catid *logid)
+static int mdc_llog_init(struct obd_device *obd, struct obd_llogs *llogs, 
+                         struct obd_device *tgt, int count,
+                         struct llog_catid *logid)
 {
         struct llog_ctxt *ctxt;
         int rc;
         ENTRY;
 
-        rc = obd_llog_setup(obd, LLOG_CONFIG_REPL_CTXT, tgt, 0, NULL,
-                            &llog_client_ops);
+        rc = llog_setup(obd, llogs, LLOG_CONFIG_REPL_CTXT, tgt, 0, NULL,
+                        &llog_client_ops);
         if (rc == 0) {
-                ctxt = llog_get_context(obd, LLOG_CONFIG_REPL_CTXT);
+                ctxt = llog_get_context(llogs, LLOG_CONFIG_REPL_CTXT);
                 ctxt->loc_imp = obd->u.cli.cl_import;
         }
 
         RETURN(rc);
 }
 
-static int mdc_llog_finish(struct obd_device *obd, int count)
+static int mdc_llog_finish(struct obd_device *obd,
+                           struct obd_llogs *llogs, int count)
 {
         int rc;
         ENTRY;
 
-        rc = obd_llog_cleanup(llog_get_context(obd, LLOG_CONFIG_REPL_CTXT));
+        rc = llog_cleanup(llog_get_context(llogs, LLOG_CONFIG_REPL_CTXT));
         RETURN(rc);
 }
 
+int mdc_obj_create(struct obd_export *exp, struct obdo *oa,
+                    struct lov_stripe_md **ea, struct obd_trans_info *oti)
+{
+        struct ptlrpc_request *request;
+        struct ost_body *body;
+        int rc, size = sizeof(*body);
+        ENTRY;
+
+        LASSERT(oa);
+
+        request = ptlrpc_prep_req(class_exp2cliimp(exp), OST_CREATE,
+                                  1, &size, NULL);
+        if (!request)
+                GOTO(out_req, rc = -ENOMEM);
+
+        body = lustre_msg_buf(request->rq_reqmsg, 0, sizeof (*body));
+        memcpy(&body->oa, oa, sizeof(body->oa));
+
+        request->rq_replen = lustre_msg_size(1, &size);
+        rc = ptlrpc_queue_wait(request);
+        if (rc)
+                GOTO(out_req, rc);
+
+        body = lustre_swab_repbuf(request, 0, sizeof(*body),
+                                  lustre_swab_ost_body);
+        if (body == NULL) {
+                CERROR ("can't unpack ost_body\n");
+                GOTO (out_req, rc = -EPROTO);
+        }
+
+        memcpy(oa, &body->oa, sizeof(*oa));
+
+        CDEBUG(D_HA, "transno: "LPD64"\n", request->rq_repmsg->transno);
+        EXIT;
+out_req:
+        ptlrpc_req_finished(request);
+        return rc;
+}
+
+static int mdc_get_info(struct obd_export *exp, obd_count keylen,
+                        void *key, __u32 *vallen, void *val)
+{
+        ENTRY;
+        if (!vallen || !val)
+                RETURN(-EFAULT);
+
+        if (keylen >= strlen("mdsize") && strcmp(key, "mdsize") == 0) {
+                struct ptlrpc_request *req;
+                __u32 *reply;
+                char *bufs[1] = {key};
+                int rc;
+                req = ptlrpc_prep_req(class_exp2cliimp(exp), OST_GET_INFO, 1,
+                                      &keylen, bufs);
+                if (req == NULL)
+                        RETURN(-ENOMEM);
+
+                req->rq_replen = lustre_msg_size(1, vallen);
+                rc = ptlrpc_queue_wait(req);
+                if (rc)
+                        GOTO(out, rc);
+
+                /* FIXME: right swap routine here! */
+                reply = lustre_swab_repbuf(req, 0, sizeof(*reply), NULL);
+                if (reply == NULL) {
+                        CERROR("Can't unpack mdsize\n");
+                        GOTO(out, rc = -EPROTO);
+                }
+                *((__u32 *)val) = *reply;
+        out:
+                ptlrpc_req_finished(req);
+                RETURN(rc);
+        }
+        RETURN(-EINVAL);
+}
+
+int mdc_brw(int rw, struct obd_export *exp, struct obdo *oa,
+                struct lov_stripe_md *ea, obd_count oa_bufs,
+                struct brw_page *pgarr, struct obd_trans_info *oti)
+{
+        struct ptlrpc_bulk_desc *desc;
+        struct niobuf_remote *niobuf;
+        struct ptlrpc_request *req;
+        struct obd_ioobj *ioobj;
+        struct ost_body *body;
+        int err, opc, i;
+        int size[3];
+
+        opc = ((rw & OBD_BRW_WRITE) != 0) ? OST_WRITE : OST_READ;
+        
+        size[0] = sizeof(*body);
+        size[1] = sizeof(*ioobj);
+        size[2] = oa_bufs * sizeof(*niobuf);
+
+        req = ptlrpc_prep_req(class_exp2cliimp(exp), opc, 3, size, NULL);
+        LASSERT(req != NULL);
+
+        if (opc == OST_WRITE)
+                desc = ptlrpc_prep_bulk_imp(req, oa_bufs, BULK_GET_SOURCE,
+                                            OST_BULK_PORTAL);
+        else
+                desc = ptlrpc_prep_bulk_imp(req, oa_bufs, BULK_PUT_SINK,
+                                            OST_BULK_PORTAL);
+        LASSERT(desc != NULL);
+
+        body = lustre_msg_buf(req->rq_reqmsg, 0, sizeof(*body));
+        ioobj = lustre_msg_buf(req->rq_reqmsg, 1, sizeof(*ioobj));
+        niobuf = lustre_msg_buf(req->rq_reqmsg, 2, oa_bufs * sizeof(*niobuf));
+
+        memcpy(&body->oa, oa, sizeof(*oa));
+        obdo_to_ioobj(oa, ioobj);
+        ioobj->ioo_bufcnt = oa_bufs;
+
+        for (i = 0; i < oa_bufs; i++, niobuf++) {
+                struct brw_page *pg = &pgarr[i];
+
+                LASSERT(pg->count > 0);
+                LASSERT((pg->off & ~PAGE_MASK) + pg->count <= PAGE_SIZE);
+
+                ptlrpc_prep_bulk_page(desc, pg->pg, pg->off & ~PAGE_MASK,
+                                      pg->count);
+
+                niobuf->offset = pg->off;
+                niobuf->len = pg->count;
+                niobuf->flags = pg->flag;
+        }
+
+        /* size[0] still sizeof (*body) */
+        if (opc == OST_WRITE) {
+                /* 1 RC per niobuf */
+                size[1] = sizeof(__u32) * oa_bufs;
+                req->rq_replen = lustre_msg_size(2, size);
+        } else {
+                /* 1 RC for the whole I/O */
+                req->rq_replen = lustre_msg_size(1, size);
+        }
+        err = ptlrpc_queue_wait(req);
+        LASSERT(err == 0);
+
+        ptlrpc_req_finished(req);
+        return 0;
+}
+
+static int mdc_valid_attrs(struct obd_export *exp, struct ll_fid *fid)
+{
+        struct ldlm_res_id res_id = { .name = {0} };
+        struct obd_device *obd = exp->exp_obd;
+        struct lustre_handle lockh;
+        ldlm_policy_data_t policy;
+        int flags;
+        ENTRY;
+
+        res_id.name[0] = fid->id;
+        res_id.name[1] = fid->generation;
+        policy.l_inodebits.bits = MDS_INODELOCK_UPDATE;
+
+        CDEBUG(D_INFO, "trying to match res "LPU64"\n", res_id.name[0]);
+
+        /* FIXME use LDLM_FL_TEST_LOCK instead */
+        flags = LDLM_FL_BLOCK_GRANTED | LDLM_FL_CBPENDING;
+        if (ldlm_lock_match(obd->obd_namespace, flags, &res_id,
+                            LDLM_IBITS, &policy, LCK_PR, &lockh)) {
+                ldlm_lock_decref(&lockh, LCK_PR);
+                RETURN(1);
+        }
+
+        if (ldlm_lock_match(obd->obd_namespace, flags, &res_id,
+                            LDLM_IBITS, &policy, LCK_PW, &lockh)) {
+                ldlm_lock_decref(&lockh, LCK_PW);
+                RETURN(1);
+        }
+        RETURN(0);
+}
+
 struct obd_ops mdc_obd_ops = {
-        .o_owner        = THIS_MODULE,
-        .o_setup        = mdc_setup,
-        .o_precleanup   = mdc_precleanup,
-        .o_cleanup      = mdc_cleanup,
-        .o_connect      = client_connect_import,
-        .o_disconnect   = client_disconnect_export,
-        .o_iocontrol    = mdc_iocontrol,
-        .o_set_info     = mdc_set_info,
-        .o_statfs       = mdc_statfs,
-        .o_pin          = mdc_pin,
-        .o_unpin        = mdc_unpin,
-        .o_import_event = mdc_import_event,
-        .o_llog_init    = mdc_llog_init,
-        .o_llog_finish  = mdc_llog_finish,
+        o_owner:        THIS_MODULE,
+        o_attach:       mdc_attach,
+        o_detach:       mdc_detach,
+        o_setup:        mdc_setup,
+        o_precleanup:   mdc_precleanup,
+        o_cleanup:      mdc_cleanup,
+        o_connect:      client_connect_import,
+        o_disconnect:   client_disconnect_export,
+        o_iocontrol:    mdc_iocontrol,
+        o_set_info:     mdc_set_info,
+        o_statfs:       mdc_statfs,
+        o_pin:          mdc_pin,
+        o_unpin:        mdc_unpin,
+        o_llog_init:    mdc_llog_init,
+        o_llog_finish:  mdc_llog_finish,
+        o_create:       mdc_obj_create,
+        o_get_info:     mdc_get_info,
+        o_brw:          mdc_brw,
+        o_init_ea_size: mdc_init_ea_size,
+};
+
+struct md_ops mdc_md_ops = {
+        m_getstatus:     mdc_getstatus,
+        m_getattr:       mdc_getattr,
+        m_change_cbdata: mdc_change_cbdata,
+        m_close:         mdc_close,
+        m_create:        mdc_create,
+        m_done_writing:  mdc_done_writing,
+        m_enqueue:       mdc_enqueue,
+        m_getattr_name:  mdc_getattr_name,
+        m_intent_lock:   mdc_intent_lock,
+        m_link:          mdc_link,
+        m_rename:        mdc_rename,
+        m_setattr:       mdc_setattr,
+        m_sync:          mdc_sync,
+        m_readpage:      mdc_readpage,
+        m_unlink:        mdc_unlink,
+        m_valid_attrs:   mdc_valid_attrs,
 };
 
 int __init mdc_init(void)
 {
         struct lprocfs_static_vars lvars;
         lprocfs_init_vars(mdc, &lvars);
-        return class_register_type(&mdc_obd_ops, lvars.module_vars,
+        return class_register_type(&mdc_obd_ops, &mdc_md_ops, lvars.module_vars,
                                    LUSTRE_MDC_NAME);
 }
 
-#ifdef __KERNEL__
 static void /*__exit*/ mdc_exit(void)
 {
         class_unregister_type(LUSTRE_MDC_NAME);
 }
 
+#ifdef __KERNEL__
 MODULE_AUTHOR("Cluster File Systems, Inc. <info@clusterfs.com>");
 MODULE_DESCRIPTION("Lustre Metadata Client");
 MODULE_LICENSE("GPL");
@@ -1047,7 +1254,6 @@ EXPORT_SYMBOL(mdc_sync);
 EXPORT_SYMBOL(mdc_set_open_replay_data);
 EXPORT_SYMBOL(mdc_clear_open_replay_data);
 EXPORT_SYMBOL(mdc_store_inode_generation);
-EXPORT_SYMBOL(mdc_init_ea_size);
 
 module_init(mdc_init);
 module_exit(mdc_exit);
diff --git a/lustre/mds/.cvsignore b/lustre/mds/.cvsignore
index d5103fa..49c6100 100644
--- a/lustre/mds/.cvsignore
+++ b/lustre/mds/.cvsignore
@@ -3,13 +3,7 @@ config.log
 config.status
 configure
 Makefile
+Makefile.in
 .deps
 TAGS
 .*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.o.flags
-.tmp_versions
-.depend
diff --git a/lustre/mds/Makefile.am b/lustre/mds/Makefile.am
new file mode 100644
index 0000000..b75c233
--- /dev/null
+++ b/lustre/mds/Makefile.am
@@ -0,0 +1,13 @@
+# Copyright (C) 2001  Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+DEFS= 
+MODULE = mds
+modulefs_DATA = mds.o
+EXTRA_PROGRAMS = mds
+mds_SOURCES = mds_log.c mds_unlink_open.c mds_lov.c handler.c mds_reint.c mds_fs.c lproc_mds.c mds_open.c \
+mds_lib.c mds_internal.h mds_lmv.c
+
+include $(top_srcdir)/Rules
diff --git a/lustre/mds/Makefile.in b/lustre/mds/Makefile.in
deleted file mode 100644
index 9063c80..0000000
--- a/lustre/mds/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-MODULES := mds
-mds-objs := mds_log.o mds_unlink_open.o mds_lov.o handler.o mds_reint.o
-mds-objs += mds_fs.o lproc_mds.o mds_open.o mds_lib.o
-
-@INCLUDE_RULES@
diff --git a/lustre/mds/autoMakefile.am b/lustre/mds/autoMakefile.am
deleted file mode 100644
index b05a4b5..0000000
--- a/lustre/mds/autoMakefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (C) 2001  Cluster File Systems, Inc.
-#
-# This code is issued under the GNU General Public License.
-# See the file COPYING in this distribution
-
-if MODULES
-modulefs_DATA = mds$(KMODEXT)
-endif
-
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-DIST_SOURCES = $(mds-objs:%.o=%.c) mds_internal.h
diff --git a/lustre/mds/handler.c b/lustre/mds/handler.c
index 262f4d8..fd7846d 100644
--- a/lustre/mds/handler.c
+++ b/lustre/mds/handler.c
@@ -101,8 +101,7 @@ static int mds_sendpage(struct ptlrpc_request *req, struct file *file,
                        file->f_dentry->d_inode->i_size);
 
                 rc = fsfilt_readpage(req->rq_export->exp_obd, file,
-                                     kmap(pages[i]), tmpsize, &offset);
-                kunmap(pages[i]);
+                                     page_address(pages[i]), tmpsize, &offset);
 
                 if (rc != tmpsize)
                         GOTO(cleanup_buf, rc = -EIO);
@@ -131,7 +130,7 @@ static int mds_sendpage(struct ptlrpc_request *req, struct file *file,
 
                 rc = -ETIMEDOUT; /* XXX should this be a different errno? */
         }
-
+        
         DEBUG_REQ(D_ERROR, req, "bulk failed: %s %d(%d), evicting %s@%s\n",
                   (rc == -ETIMEDOUT) ? "timeout" : "network error",
                   desc->bd_nob_transferred, count,
@@ -174,6 +173,32 @@ struct dentry *mds_fid2locked_dentry(struct obd_device *obd, struct ll_fid *fid,
 
         res_id.name[0] = de->d_inode->i_ino;
         res_id.name[1] = de->d_inode->i_generation;
+#ifdef S_PDIROPS
+        lockh[1].cookie = 0;
+        if (name && IS_PDIROPS(de->d_inode)) {
+                ldlm_policy_data_t cpolicy =
+                        { .l_inodebits = { MDS_INODELOCK_UPDATE } };
+                /* lock just dir { ino, generation } to flush client cache */
+                if (lock_mode == LCK_PW) {
+                        rc = ldlm_cli_enqueue(NULL, NULL, obd->obd_namespace,
+                                              res_id, LDLM_IBITS,
+                                              &cpolicy, LCK_CW, &flags,
+                                              mds_blocking_ast,
+                                              ldlm_completion_ast, NULL, NULL,
+                                              NULL, 0, NULL, lockh + 1);
+                        if (rc != ELDLM_OK) {
+                                l_dput(de);
+                                RETURN(ERR_PTR(-ENOLCK));
+                        }
+                       flags = 0;
+                }
+
+                res_id.name[2] = full_name_hash(name, namelen);
+                CDEBUG(D_INFO, "take lock on %lu:%u:"LPX64"\n",
+                       de->d_inode->i_ino, de->d_inode->i_generation,
+                       res_id.name[2]);
+        }
+#endif
         rc = ldlm_cli_enqueue(NULL, NULL, obd->obd_namespace, res_id,
                               LDLM_IBITS, &policy, lock_mode, &flags,
                               mds_blocking_ast, ldlm_completion_ast, NULL, NULL,
@@ -181,6 +206,10 @@ struct dentry *mds_fid2locked_dentry(struct obd_device *obd, struct ll_fid *fid,
         if (rc != ELDLM_OK) {
                 l_dput(de);
                 retval = ERR_PTR(-EIO); /* XXX translate ldlm code */
+#ifdef S_PDIROPS
+                if (lockh[1].cookie)
+                        ldlm_lock_decref(lockh + 1, LCK_CW);
+#endif
         }
 
         RETURN(retval);
@@ -304,7 +333,7 @@ out:
         return rc;
 }
 
-static int mds_init_export(struct obd_export *exp)
+static int mds_init_export(struct obd_export *exp) 
 {
         struct mds_export_data *med = &exp->exp_mds_data;
 
@@ -317,7 +346,7 @@ static int mds_destroy_export(struct obd_export *export)
 {
         struct mds_export_data *med;
         struct obd_device *obd = export->exp_obd;
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
         int rc = 0;
         ENTRY;
 
@@ -327,8 +356,7 @@ static int mds_destroy_export(struct obd_export *export)
         if (obd_uuid_equals(&export->exp_client_uuid, &obd->obd_uuid))
                 GOTO(out, 0);
 
-        push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
-
+        push_ctxt(&saved, &obd->obd_ctxt, NULL);
         /* Close any open files (which may also cause orphan unlinking). */
         spin_lock(&med->med_open_lock);
         while (!list_empty(&med->med_open_head)) {
@@ -343,13 +371,11 @@ static int mds_destroy_export(struct obd_export *export)
                 list_del(&mfd->mfd_list);
                 spin_unlock(&med->med_open_lock);
 
-                /* If you change this message, be sure to update
-                 * replay_single:test_46 */
                 CERROR("force closing client file handle for %*s (%s:%lu)\n",
                        dentry->d_name.len, dentry->d_name.name,
                        ll_bdevname(dentry->d_inode->i_sb, btmp),
                        dentry->d_inode->i_ino);
-                rc = mds_mfd_close(NULL, obd, mfd,
+                rc = mds_mfd_close(NULL, obd, mfd, 
                                    !(export->exp_flags & OBD_OPT_FAILOVER));
 
                 if (rc)
@@ -357,7 +383,7 @@ static int mds_destroy_export(struct obd_export *export)
                 spin_lock(&med->med_open_lock);
         }
         spin_unlock(&med->med_open_lock);
-        pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+        pop_ctxt(&saved, &obd->obd_ctxt, NULL);
 
 out:
         mds_client_free(export, !(export->exp_flags & OBD_OPT_FAILOVER));
@@ -367,6 +393,8 @@ out:
 
 static int mds_disconnect(struct obd_export *exp, int flags)
 {
+        struct obd_device *obd;
+        struct mds_obd *mds;
         unsigned long irqflags;
         int rc;
         ENTRY;
@@ -374,6 +402,29 @@ static int mds_disconnect(struct obd_export *exp, int flags)
         LASSERT(exp);
         class_export_get(exp);
 
+        obd = class_exp2obd(exp);
+        if (obd == NULL) {
+                CDEBUG(D_IOCTL, "invalid client cookie "LPX64"\n",
+                       exp->exp_handle.h_cookie);
+                RETURN(-EINVAL);
+        }
+        mds = &obd->u.mds;
+
+        if (!(exp->exp_flags & OBD_OPT_REAL_CLIENT)
+                        && !atomic_read(&mds->mds_real_clients)) {
+                /* there was no client at all */
+                mds_lmv_disconnect(obd, flags);
+        }
+
+        if ((exp->exp_flags & OBD_OPT_REAL_CLIENT)
+                        && atomic_dec_and_test(&mds->mds_real_clients)) {
+                /* time to drop LMV connections */
+                CDEBUG(D_OTHER, "%s: last real client %s disconnected.  "
+                       "Disconnnect from LMV now\n",
+                       obd->obd_name, exp->exp_client_uuid.uuid);
+                mds_lmv_disconnect(obd, flags);
+        }
+
         spin_lock_irqsave(&exp->exp_lock, irqflags);
         exp->exp_flags = flags;
         spin_unlock_irqrestore(&exp->exp_lock, irqflags);
@@ -467,37 +518,6 @@ int mds_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
         RETURN(0);
 }
 
-int mds_get_md(struct obd_device *obd, struct inode *inode, void *md,
-               int *size, int lock)
-{
-        int rc = 0;
-        int lmm_size;
-
-        if (lock)
-                down(&inode->i_sem);
-        rc = fsfilt_get_md(obd, inode, md, *size);
-        if (lock)
-                up(&inode->i_sem);
-
-        if (rc < 0) {
-                CERROR("Error %d reading eadata for ino %lu\n",
-                       rc, inode->i_ino);
-        } else if (rc > 0) {
-                lmm_size = rc;
-                rc = mds_convert_lov_ea(obd, inode, md, lmm_size);
-
-                if (rc == 0) {
-                        *size = lmm_size;
-                        rc = lmm_size;
-                } else if (rc > 0) {
-                        *size = rc;
-                }
-        }
-
-        RETURN (rc);
-}
-
-
 /* Call with lock=1 if you want mds_pack_md to take the i_sem.
  * Call with lock=0 if the caller has already taken the i_sem. */
 int mds_pack_md(struct obd_device *obd, struct lustre_msg *msg, int offset,
@@ -528,13 +548,22 @@ int mds_pack_md(struct obd_device *obd, struct lustre_msg *msg, int offset,
                        inode->i_ino, lmm_size, mds->mds_max_mdsize);
                 // RETURN(-EINVAL);
         }
-        
-        rc = mds_get_md(obd, inode, lmm, &lmm_size, lock);
-        if (rc > 0) {
-                if (S_ISDIR(inode->i_mode))
-                        body->valid |= OBD_MD_FLDIREA;
-                else
-                        body->valid |= OBD_MD_FLEASIZE;
+
+        if (lock)
+                down(&inode->i_sem);
+        rc = fsfilt_get_md(obd, inode, lmm, lmm_size);
+        if (lock)
+                up(&inode->i_sem);
+        if (rc < 0) {
+                CERROR("Error %d reading eadata for ino %lu\n",
+                       rc, inode->i_ino);
+        } else if (rc > 0) {
+                lmm_size = rc;
+                if (S_ISREG(inode->i_mode))
+                        rc = mds_convert_lov_ea(obd, inode, lmm, lmm_size);
+                if (rc > 0)
+                        lmm_size = rc;
+                body->valid |= OBD_MD_FLEASIZE;
                 body->eadatasize = lmm_size;
                 rc = 0;
         }
@@ -551,23 +580,32 @@ static int mds_getattr_internal(struct obd_device *obd, struct dentry *dentry,
         int rc = 0;
         ENTRY;
 
-        if (inode == NULL)
+        if (inode == NULL && !(dentry->d_flags & DCACHE_CROSS_REF))
                 RETURN(-ENOENT);
 
         body = lustre_msg_buf(req->rq_repmsg, reply_off, sizeof(*body));
         LASSERT(body != NULL);                 /* caller prepped reply */
 
-        mds_pack_inode2fid(&body->fid1, inode);
-        mds_pack_inode2body(body, inode);
+        if (dentry->d_flags & DCACHE_CROSS_REF) {
+                CDEBUG(D_OTHER, "cross reference: %lu/%lu/%lu\n",
+                       (unsigned long) dentry->d_mdsnum,
+                       (unsigned long) dentry->d_inum,
+                       (unsigned long) dentry->d_generation);
+                body->valid |= OBD_MD_FLID | OBD_MD_MDS;
+                body->fid1.id = dentry->d_inum;
+                body->fid1.mds = dentry->d_mdsnum;
+                body->fid1.generation = dentry->d_generation;
+                RETURN(0);
+        }
+        mds_pack_inode2fid(obd, &body->fid1, inode);
+        mds_pack_inode2body(obd, body, inode);
 
-        if ((S_ISREG(inode->i_mode) && (reqbody->valid & OBD_MD_FLEASIZE)) ||
-            (S_ISDIR(inode->i_mode) && (reqbody->valid & OBD_MD_FLDIREA))) {
+        if (S_ISREG(inode->i_mode) && (reqbody->valid & OBD_MD_FLEASIZE) != 0) {
                 rc = mds_pack_md(obd, req->rq_repmsg, reply_off + 1, body,
                                  inode, 1);
 
                 /* If we have LOV EA data, the OST holds size, atime, mtime */
-                if (!(body->valid & OBD_MD_FLEASIZE) && 
-                    !(body->valid & OBD_MD_FLDIREA))
+                if (!(body->valid & OBD_MD_FLEASIZE))
                         body->valid |= (OBD_MD_FLSIZE | OBD_MD_FLBLOCKS |
                                         OBD_MD_FLATIME | OBD_MD_FLMTIME);
         } else if (S_ISLNK(inode->i_mode) &&
@@ -592,11 +630,39 @@ static int mds_getattr_internal(struct obd_device *obd, struct dentry *dentry,
                         symname[rc] = 0;        /* NULL terminate */
                         rc = 0;
                 }
-        }
+        } else if (S_ISDIR(inode->i_mode) &&
+                        (reqbody->valid & OBD_MD_FLEASIZE) != 0) {
+                rc = mds_pack_md(obd, req->rq_repmsg, reply_off + 1, body,
+                                inode, 1);
+        } 
 
         RETURN(rc);
 }
 
+static int mds_getattr_pack_msg_cf(struct ptlrpc_request *req,
+                                        struct dentry *dentry,
+                                        int offset)
+{
+        int rc = 0, size[1] = {sizeof(struct mds_body)};
+        ENTRY;
+
+        if (OBD_FAIL_CHECK(OBD_FAIL_MDS_GETATTR_PACK)) {
+                CERROR("failed MDS_GETATTR_PACK test\n");
+                req->rq_status = -ENOMEM;
+                GOTO(out, rc = -ENOMEM);
+        }
+
+        rc = lustre_pack_reply(req, 1, size, NULL);
+        if (rc) {
+                CERROR("out of memory\n");
+                GOTO(out, req->rq_status = rc);
+        }
+
+        EXIT;
+ out:
+        return(rc);
+}
+
 static int mds_getattr_pack_msg(struct ptlrpc_request *req, struct inode *inode,
                                 int offset)
 {
@@ -609,8 +675,8 @@ static int mds_getattr_pack_msg(struct ptlrpc_request *req, struct inode *inode,
         LASSERT(body != NULL);                 /* checked by caller */
         LASSERT_REQSWABBED(req, offset);       /* swabbed by caller */
 
-        if ((S_ISREG(inode->i_mode) && (body->valid & OBD_MD_FLEASIZE)) ||
-            (S_ISDIR(inode->i_mode) && (body->valid & OBD_MD_FLDIREA))) {
+        if ((S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode))
+                        && (body->valid & OBD_MD_FLEASIZE)) {
                 int rc;
                 down(&inode->i_sem);
                 rc = fsfilt_get_md(req->rq_export->exp_obd, inode, NULL, 0);
@@ -657,16 +723,19 @@ static int mds_getattr_pack_msg(struct ptlrpc_request *req, struct inode *inode,
         return(rc);
 }
 
+#define DENTRY_VALID(dentry)    \
+        ((dentry)->d_inode || ((dentry)->d_flags & DCACHE_CROSS_REF))
+
 static int mds_getattr_name(int offset, struct ptlrpc_request *req,
                             struct lustre_handle *child_lockh, int child_part)
 {
         struct obd_device *obd = req->rq_export->exp_obd;
         struct ldlm_reply *rep = NULL;
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
         struct mds_body *body;
         struct dentry *dparent = NULL, *dchild = NULL;
-        struct lvfs_ucred uc;
-        struct lustre_handle parent_lockh;
+        struct obd_ucred uc;
+        struct lustre_handle parent_lockh[2];
         int namesize;
         int rc = 0, cleanup_phase = 0, resent_req = 0;
         char *name;
@@ -693,20 +762,42 @@ static int mds_getattr_name(int offset, struct ptlrpc_request *req,
 
         LASSERT (offset == 0 || offset == 2);
         /* if requests were at offset 2, the getattr reply goes back at 1 */
-        if (offset) {
+        if (offset) { 
                 rep = lustre_msg_buf(req->rq_repmsg, 0, sizeof (*rep));
                 offset = 1;
         }
 
-        uc.luc_fsuid = body->fsuid;
-        uc.luc_fsgid = body->fsgid;
-        uc.luc_cap = body->capability;
-        uc.luc_suppgid1 = body->suppgid;
-        uc.luc_suppgid2 = -1;
-        push_ctxt(&saved, &obd->obd_lvfs_ctxt, &uc);
+        uc.ouc_fsuid = body->fsuid;
+        uc.ouc_fsgid = body->fsgid;
+        uc.ouc_cap = body->capability;
+        uc.ouc_suppgid1 = body->suppgid;
+        uc.ouc_suppgid2 = -1;
+        push_ctxt(&saved, &obd->obd_ctxt, &uc);
         cleanup_phase = 1; /* kernel context */
         intent_set_disposition(rep, DISP_LOOKUP_EXECD);
 
+        LASSERT(namesize > 0);
+        if (namesize == 1) {
+                /* we have no dentry here, drop LOOKUP bit */
+                child_part &= ~MDS_INODELOCK_LOOKUP;
+                CDEBUG(D_OTHER, "%s: request to retrieve attrs for %lu/%lu\n",
+                       obd->obd_name, (unsigned long) body->fid1.id,
+                       (unsigned long) body->fid1.generation);
+                dchild = mds_fid2locked_dentry(obd, &body->fid1, NULL, LCK_PR,
+                                               parent_lockh, NULL, 0, child_part);
+                if (IS_ERR(dchild)) {
+                        CERROR("can't find inode: %d\n", (int) PTR_ERR(dchild));
+                        GOTO(cleanup, rc = PTR_ERR(dchild));
+                }
+                memcpy(child_lockh, parent_lockh, sizeof(parent_lockh[0]));
+#ifdef S_PDIROPS
+                if (parent_lockh[1].cookie)
+                        ldlm_lock_decref(parent_lockh + 1, LCK_CW);
+#endif
+                cleanup_phase = 2;
+                goto fill_inode;
+        }
+        
         /* FIXME: handle raw lookup */
 #if 0
         if (body->valid == OBD_MD_FLID) {
@@ -737,8 +828,8 @@ static int mds_getattr_name(int offset, struct ptlrpc_request *req,
 
         if (resent_req == 0) {
                 rc = mds_get_parent_child_locked(obd, &obd->u.mds, &body->fid1,
-                                                 &parent_lockh, &dparent,
-                                                 LCK_PR, MDS_INODELOCK_UPDATE,
+                                                 parent_lockh, &dparent,
+                                                 LCK_PR, MDS_INODELOCK_LOOKUP,
                                                  name, namesize,
                                                  child_lockh, &dchild, LCK_PR,
                                                  child_part);
@@ -762,7 +853,8 @@ static int mds_getattr_name(int offset, struct ptlrpc_request *req,
 
         cleanup_phase = 2; /* dchild, dparent, locks */
 
-        if (dchild->d_inode == NULL) {
+fill_inode:
+        if (!DENTRY_VALID(dchild)) {
                 intent_set_disposition(rep, DISP_LOOKUP_NEG);
                 /* in the intent case, the policy clears this error:
                    the disposition is enough */
@@ -772,7 +864,10 @@ static int mds_getattr_name(int offset, struct ptlrpc_request *req,
         }
 
         if (req->rq_repmsg == NULL) {
-                rc = mds_getattr_pack_msg(req, dchild->d_inode, offset);
+                if (dchild->d_flags & DCACHE_CROSS_REF)
+                        rc = mds_getattr_pack_msg_cf(req, dchild, offset);
+                else
+                        rc = mds_getattr_pack_msg(req, dchild->d_inode, offset);
                 if (rc != 0) {
                         CERROR ("mds_getattr_pack_msg: %d\n", rc);
                         GOTO (cleanup, rc);
@@ -786,14 +881,22 @@ static int mds_getattr_name(int offset, struct ptlrpc_request *req,
         switch (cleanup_phase) {
         case 2:
                 if (resent_req == 0) {
-                        if (rc && dchild->d_inode)
+                        if (rc && DENTRY_VALID(dchild))
                                 ldlm_lock_decref(child_lockh, LCK_PR);
-                        ldlm_lock_decref(&parent_lockh, LCK_PR);
-                        l_dput(dparent);
+                        if (dparent) {
+                                ldlm_lock_decref(parent_lockh, LCK_PR);
+#ifdef S_PDIROPS
+                                if (parent_lockh[1].cookie != 0)
+                                        ldlm_lock_decref(parent_lockh + 1,
+                                                        LCK_CW);
+#endif
+                        }
+                        if (dparent)
+                                l_dput(dparent);
                 }
                 l_dput(dchild);
         case 1:
-                pop_ctxt(&saved, &obd->obd_lvfs_ctxt, &uc);
+                pop_ctxt(&saved, &obd->obd_ctxt, &uc);
         default: ;
         }
         return rc;
@@ -803,10 +906,10 @@ static int mds_getattr(int offset, struct ptlrpc_request *req)
 {
         struct mds_obd *mds = mds_req2mds(req);
         struct obd_device *obd = req->rq_export->exp_obd;
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
         struct dentry *de;
         struct mds_body *body;
-        struct lvfs_ucred uc;
+        struct obd_ucred uc;
         int rc = 0;
         ENTRY;
 
@@ -817,10 +920,10 @@ static int mds_getattr(int offset, struct ptlrpc_request *req)
                 RETURN (-EFAULT);
         }
 
-        uc.luc_fsuid = body->fsuid;
-        uc.luc_fsgid = body->fsgid;
-        uc.luc_cap = body->capability;
-        push_ctxt(&saved, &obd->obd_lvfs_ctxt, &uc);
+        uc.ouc_fsuid = body->fsuid;
+        uc.ouc_fsgid = body->fsgid;
+        uc.ouc_cap = body->capability;
+        push_ctxt(&saved, &obd->obd_ctxt, &uc);
         de = mds_fid2dentry(mds, &body->fid1, NULL);
         if (IS_ERR(de)) {
                 rc = req->rq_status = -ENOENT;
@@ -838,7 +941,7 @@ static int mds_getattr(int offset, struct ptlrpc_request *req)
         l_dput(de);
         GOTO(out_pop, rc);
 out_pop:
-        pop_ctxt(&saved, &obd->obd_lvfs_ctxt, &uc);
+        pop_ctxt(&saved, &obd->obd_ctxt, &uc);
         return rc;
 }
 
@@ -921,8 +1024,8 @@ static int mds_sync(struct ptlrpc_request *req)
                         GOTO(out, rc);
 
                 body = lustre_msg_buf(req->rq_repmsg, 0, sizeof(*body));
-                mds_pack_inode2fid(&body->fid1, de->d_inode);
-                mds_pack_inode2body(body, de->d_inode);
+                mds_pack_inode2fid(obd, &body->fid1, de->d_inode);
+                mds_pack_inode2body(obd, body, de->d_inode);
         }
 out:
         req->rq_status = rc;
@@ -941,9 +1044,9 @@ static int mds_readpage(struct ptlrpc_request *req)
         struct dentry *de;
         struct file *file;
         struct mds_body *body, *repbody;
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
         int rc, size = sizeof(*repbody);
-        struct lvfs_ucred uc;
+        struct obd_ucred uc;
         ENTRY;
 
         rc = lustre_pack_reply(req, 1, &size, NULL);
@@ -956,10 +1059,10 @@ static int mds_readpage(struct ptlrpc_request *req)
         if (body == NULL)
                 GOTO (out, rc = -EFAULT);
 
-        uc.luc_fsuid = body->fsuid;
-        uc.luc_fsgid = body->fsgid;
-        uc.luc_cap = body->capability;
-        push_ctxt(&saved, &obd->obd_lvfs_ctxt, &uc);
+        uc.ouc_fsuid = body->fsuid;
+        uc.ouc_fsgid = body->fsgid;
+        uc.ouc_cap = body->capability;
+        push_ctxt(&saved, &obd->obd_ctxt, &uc);
         de = mds_fid2dentry(&obd->u.mds, &body->fid1, &mnt);
         if (IS_ERR(de))
                 GOTO(out_pop, rc = PTR_ERR(de));
@@ -998,7 +1101,7 @@ static int mds_readpage(struct ptlrpc_request *req)
 out_file:
         filp_close(file, 0);
 out_pop:
-        pop_ctxt(&saved, &obd->obd_lvfs_ctxt, &uc);
+        pop_ctxt(&saved, &obd->obd_ctxt, &uc);
 out:
         req->rq_status = rc;
         RETURN(0);
@@ -1009,6 +1112,7 @@ int mds_reint(struct ptlrpc_request *req, int offset,
 {
         struct mds_update_record *rec; /* 116 bytes on the stack?  no sir! */
         int rc;
+        ENTRY;
 
         OBD_ALLOC(rec, sizeof(*rec));
         if (rec == NULL)
@@ -1023,7 +1127,7 @@ int mds_reint(struct ptlrpc_request *req, int offset,
         rc = mds_reint_rec(rec, offset, req, lockh);
  out:
         OBD_FREE(rec, sizeof(*rec));
-        return rc;
+        RETURN(rc);
 }
 
 static int mds_filter_recovery_request(struct ptlrpc_request *req,
@@ -1063,6 +1167,215 @@ static char *reint_names[] = {
         [REINT_OPEN]    "open",
 };
 
+#define FILTER_VALID_FLAGS (OBD_MD_FLTYPE | OBD_MD_FLMODE | OBD_MD_FLGENER  |\
+                            OBD_MD_FLSIZE | OBD_MD_FLBLOCKS | OBD_MD_FLBLKSZ|\
+                            OBD_MD_FLATIME | OBD_MD_FLMTIME | OBD_MD_FLCTIME|\
+                            OBD_MD_FLID) 
+
+static int mdt_obj_create(struct ptlrpc_request *req)
+{
+        struct obd_export *exp = req->rq_export;
+        struct obd_device *obd = exp->exp_obd;
+        struct mds_obd *mds = &obd->u.mds;
+        struct ost_body *body, *repbody;
+        int rc, size = sizeof(*repbody);
+        char fidname[LL_FID_NAMELEN];
+        struct inode *parent_inode;
+        struct obd_run_ctxt saved;
+        struct dentry *new_child;
+        int err, namelen, mealen;
+        struct obd_ucred uc;
+        struct mea *mea;
+        void *handle;
+        ENTRY;
+       
+        parent_inode = mds->mds_objects_dir->d_inode;
+
+        body = lustre_swab_reqbuf(req, 0, sizeof(*body), lustre_swab_ost_body);
+        if (body == NULL)
+                RETURN(-EFAULT);
+
+        uc.ouc_fsuid = body->oa.o_uid;
+        uc.ouc_fsgid = body->oa.o_gid;
+
+        push_ctxt(&saved, &obd->obd_ctxt, &uc);
+        
+        rc = lustre_pack_reply(req, 1, &size, NULL);
+        if (rc)
+                RETURN(rc);
+
+        repbody = lustre_msg_buf(req->rq_repmsg, 0, sizeof(*repbody));
+        memcpy(&repbody->oa, &body->oa, sizeof(body->oa));
+       
+        namelen = ll_fid2str(fidname, body->oa.o_id, body->oa.o_generation);
+        
+        down(&parent_inode->i_sem);
+        new_child = lookup_one_len(fidname, mds->mds_objects_dir, namelen);
+        if (new_child->d_inode != NULL) {
+                CERROR("impossible non-negative obj dentry " LPU64":%u!\n",
+                       repbody->oa.o_id, repbody->oa.o_generation);
+                LBUG();
+        }
+        handle = fsfilt_start(exp->exp_obd, mds->mds_objects_dir->d_inode,
+                              FSFILT_OP_MKDIR, NULL);
+        /* FIXME: error handling here */
+        LASSERT(!IS_ERR(handle));
+
+        rc = vfs_mkdir(parent_inode, new_child, body->oa.o_mode);
+        up(&parent_inode->i_sem);
+        /* FIXME: error handling here */
+        if (rc)
+                CERROR("vfs_mkdir() returned %d\n", rc);
+        LASSERT(rc == 0);
+        
+	/* mark this object non-splittable */
+        mealen = obd_size_diskmd(mds->mds_lmv_exp, NULL);
+        OBD_ALLOC(mea, mealen);
+        LASSERT(mea != NULL);
+        mea->mea_count = 0;
+        down(&new_child->d_inode->i_sem);
+        handle = fsfilt_start(obd, new_child->d_inode, FSFILT_OP_SETATTR, NULL);
+        LASSERT(!IS_ERR(handle));
+	rc = fsfilt_set_md(obd, new_child->d_inode, handle, mea, mealen);
+        LASSERT(rc == 0);
+        fsfilt_commit(obd, new_child->d_inode, handle, 0);
+        LASSERT(rc == 0);
+	up(&new_child->d_inode->i_sem);
+        OBD_FREE(mea, mealen);
+
+        err = fsfilt_commit(exp->exp_obd, mds->mds_objects_dir->d_inode,
+                            handle, 0);
+        /* FIXME: error handling here */
+        LASSERT(err == 0);
+
+        obdo_from_inode(&repbody->oa, new_child->d_inode, FILTER_VALID_FLAGS);
+        repbody->oa.o_id = new_child->d_inode->i_ino;
+        repbody->oa.o_generation = new_child->d_inode->i_generation;
+        CDEBUG(D_OTHER, "created dirobj: %lu, %lu mode %o, uid %u, gid %u\n",
+                        (unsigned long) repbody->oa.o_id,
+                        (unsigned long) new_child->d_inode->i_ino,
+                        (unsigned) new_child->d_inode->i_mode,
+                        (unsigned) new_child->d_inode->i_uid,
+                        (unsigned) new_child->d_inode->i_gid);
+        dput(new_child);
+        pop_ctxt(&saved, &obd->obd_ctxt, &uc);
+        RETURN(0);
+}
+
+static int mds_get_info(struct obd_export *exp, __u32 keylen,
+                           void *key, __u32 *vallen, void *val)
+{
+        struct obd_device *obd;
+        struct mds_obd *mds;
+        ENTRY;
+
+        obd = class_exp2obd(exp);
+        if (obd == NULL) {
+                CDEBUG(D_IOCTL, "invalid client cookie "LPX64"\n",
+                       exp->exp_handle.h_cookie);
+                RETURN(-EINVAL);
+        }
+
+        mds = &obd->u.mds;
+        keylen == strlen("mdsize");
+        if (keylen && memcmp(key, "mdsize", keylen) == 0) {
+                __u32 *mdsize = val;
+                *vallen = sizeof(*mdsize);
+                *mdsize = mds->mds_max_mdsize;
+                RETURN(0);
+        }
+
+        CDEBUG(D_IOCTL, "invalid key\n");
+        RETURN(-EINVAL);
+}
+
+static int mdt_get_info(struct ptlrpc_request *req)
+{
+        char *key;
+        struct obd_export *exp = req->rq_export;
+        int keylen, rc = 0, size = sizeof(obd_id);
+        obd_id *reply;
+        ENTRY;
+
+        key = lustre_msg_buf(req->rq_reqmsg, 0, 1);
+        if (key == NULL) {
+                DEBUG_REQ(D_HA, req, "no get_info key");
+                RETURN(-EFAULT);
+        }
+        keylen = req->rq_reqmsg->buflens[0];
+
+        if (keylen < strlen("mdsize") || memcmp(key, "mdsize", 6) != 0)
+                RETURN(-EPROTO);
+
+        rc = lustre_pack_reply(req, 1, &size, NULL);
+        if (rc)
+                RETURN(rc);
+
+        reply = lustre_msg_buf(req->rq_repmsg, 0, sizeof(*reply));
+        rc = obd_get_info(exp, keylen, key, &size, reply);
+        req->rq_repmsg->status = 0;
+        RETURN(rc);
+}
+
+static int mds_set_info(struct obd_export *exp, __u32 keylen,
+                           void *key, __u32 vallen, void *val)
+{
+        struct obd_device *obd;
+        struct mds_obd *mds;
+        ENTRY;
+
+        obd = class_exp2obd(exp);
+        if (obd == NULL) {
+                CDEBUG(D_IOCTL, "invalid client cookie "LPX64"\n",
+                       exp->exp_handle.h_cookie);
+                RETURN(-EINVAL);
+        }
+
+        mds = &obd->u.mds;
+        keylen == strlen("client");
+        if (keylen && memcmp(key, "client", keylen) == 0) {
+                if (!(exp->exp_flags & OBD_OPT_REAL_CLIENT)) {
+                        atomic_inc(&mds->mds_real_clients);
+                        CDEBUG(D_OTHER, "%s: peer from %s is real client (%d)\n",
+                                        obd->obd_name,
+                                        exp->exp_client_uuid.uuid,
+                                        atomic_read(&mds->mds_real_clients));
+                        exp->exp_flags |= OBD_OPT_REAL_CLIENT;
+                }
+                RETURN(0);
+        }
+
+        CDEBUG(D_IOCTL, "invalid key\n");
+        RETURN(-EINVAL);
+}
+
+static int mdt_set_info(struct ptlrpc_request *req)
+{
+        char *key;
+        struct obd_export *exp = req->rq_export;
+        int keylen, rc = 0, size = sizeof(obd_id);
+        ENTRY;
+
+        key = lustre_msg_buf(req->rq_reqmsg, 0, 1);
+        if (key == NULL) {
+                DEBUG_REQ(D_HA, req, "no get_info key");
+                RETURN(-EFAULT);
+        }
+        keylen = req->rq_reqmsg->buflens[0];
+
+        if ((keylen < strlen("client") || memcmp(key, "client", 6) != 0))
+                RETURN(-EPROTO);
+
+        rc = lustre_pack_reply(req, 0, NULL, NULL);
+        if (rc)
+                RETURN(rc);
+        rc = obd_set_info(exp, keylen, key, size, NULL);
+        req->rq_repmsg->status = 0;
+        RETURN(rc);
+}
+
+extern int ost_brw_write(struct ptlrpc_request *, struct obd_trans_info *);
+
 int mds_handle(struct ptlrpc_request *req)
 {
         int should_process, fail = OBD_FAIL_MDS_ALL_REPLY_NET;
@@ -1090,21 +1403,6 @@ int mds_handle(struct ptlrpc_request *req)
                 obd = req->rq_export->exp_obd;
                 mds = &obd->u.mds;
 
-                /* sanity check: if the xid matches, the request must
-                 * be marked as a resent or replayed */
-                if (req->rq_xid == med->med_mcd->mcd_last_xid)
-                        LASSERTF(lustre_msg_get_flags(req->rq_reqmsg) &
-                                 (MSG_RESENT | MSG_REPLAY),
-                                 "rq_xid "LPU64" matches last_xid, "
-                                 "expected RESENT flag\n",
-                                 req->rq_xid);
-                /* else: note the opposite is not always true; a
-                 * RESENT req after a failover will usually not match
-                 * the last_xid, since it was likely never
-                 * committed. A REPLAYed request will almost never
-                 * match the last xid, however it could for a
-                 * committed, but still retained, open. */
-
                 /* Check for aborted recovery. */
                 spin_lock_bh(&obd->obd_processing_task_lock);
                 abort_recovery = obd->obd_abort_recovery;
@@ -1290,11 +1588,6 @@ int mds_handle(struct ptlrpc_request *req)
                 OBD_FAIL_RETURN(OBD_FAIL_OBD_LOGD_NET, 0);
                 rc = llog_origin_handle_next_block(req);
                 break;
-        case LLOG_ORIGIN_HANDLE_PREV_BLOCK:
-                DEBUG_REQ(D_INODE, req, "llog prev block");
-                OBD_FAIL_RETURN(OBD_FAIL_OBD_LOGD_NET, 0);
-                rc = llog_origin_handle_prev_block(req);
-                break;
         case LLOG_ORIGIN_HANDLE_READ_HEADER:
                 DEBUG_REQ(D_INODE, req, "llog read header");
                 OBD_FAIL_RETURN(OBD_FAIL_OBD_LOGD_NET, 0);
@@ -1305,6 +1598,26 @@ int mds_handle(struct ptlrpc_request *req)
                 OBD_FAIL_RETURN(OBD_FAIL_OBD_LOGD_NET, 0);
                 rc = llog_origin_handle_close(req);
                 break;
+        case OST_CREATE:
+                DEBUG_REQ(D_INODE, req, "ost_create");
+                rc = mdt_obj_create(req);
+                break;
+        case OST_GET_INFO:
+                DEBUG_REQ(D_INODE, req, "get_info");
+                rc = mdt_get_info(req);
+                break;
+        case OST_SET_INFO:
+                DEBUG_REQ(D_INODE, req, "set_info");
+                rc = mdt_set_info(req);
+                break;
+        case OST_WRITE:
+                CDEBUG(D_INODE, "write\n");
+                OBD_FAIL_RETURN(OBD_FAIL_OST_BRW_NET, 0);
+                rc = ost_brw_write(req, NULL);
+                LASSERT(current->journal_info == NULL);
+                /* mdt_brw sends its own replies */
+                RETURN(rc);
+                break;
         case LLOG_CATINFO:
                 DEBUG_REQ(D_INODE, req, "llog catinfo");
                 OBD_FAIL_RETURN(OBD_FAIL_OBD_LOGD_NET, 0);
@@ -1367,12 +1680,12 @@ int mds_update_server_data(struct obd_device *obd, int force_sync)
         struct mds_obd *mds = &obd->u.mds;
         struct mds_server_data *msd = mds->mds_server_data;
         struct file *filp = mds->mds_rcvd_filp;
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
         loff_t off = 0;
         int rc;
         ENTRY;
 
-        push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+        push_ctxt(&saved, &obd->obd_ctxt, NULL);
         msd->msd_last_transno = cpu_to_le64(mds->mds_last_transno);
 
         CDEBUG(D_SUPER, "MDS mount_count is "LPU64", last_transno is "LPU64"\n",
@@ -1380,7 +1693,7 @@ int mds_update_server_data(struct obd_device *obd, int force_sync)
         rc = fsfilt_write_record(obd, filp, msd, sizeof(*msd), &off,force_sync);
         if (rc)
                 CERROR("error writing MDS server data: rc = %d\n", rc);
-        pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+        pop_ctxt(&saved, &obd->obd_ctxt, NULL);
 
         RETURN(rc);
 }
@@ -1389,13 +1702,11 @@ int mds_update_server_data(struct obd_device *obd, int force_sync)
 /* mount the file system (secretly) */
 static int mds_setup(struct obd_device *obd, obd_count len, void *buf)
 {
-        struct lprocfs_static_vars lvars;
         struct lustre_cfg* lcfg = buf;
         struct mds_obd *mds = &obd->u.mds;
-        char *options = NULL;
         struct vfsmount *mnt;
-        unsigned long page;
         int rc = 0;
+        unsigned long page;
         ENTRY;
 
         dev_clear_rdonly(2);
@@ -1407,27 +1718,40 @@ static int mds_setup(struct obd_device *obd, obd_count len, void *buf)
         if (IS_ERR(obd->obd_fsops))
                 RETURN(rc = PTR_ERR(obd->obd_fsops));
 
-        page = __get_free_page(GFP_KERNEL);
-        if (!page)
-                RETURN(-ENOMEM);
+        mds->mds_max_mdsize = sizeof(struct lov_mds_md);
 
-        options = (char *)page;
-        memset(options, 0, PAGE_SIZE);
+        /* we have to know mdsnum before touching underlying fs -bzzz */
+        if (lcfg->lcfg_inllen4 > 0 && lcfg->lcfg_inlbuf4) {
+                class_uuid_t uuid;
 
-        /* here we use "iopen_nopriv" hardcoded, because it affects MDS utility
-         * and the rest of options are passed by mount options. Probably this
-         * should be moved to somewhere else like startup scripts or lconf. */
-        sprintf(options, "iopen_nopriv");
-        
-        if (lcfg->lcfg_inllen4 > 0 && lcfg->lcfg_inlbuf4)
-                sprintf(options + strlen(options), ",%s", 
-                        lcfg->lcfg_inlbuf4);
+                CDEBUG(D_OTHER, "MDS: %s is master for %s\n",
+                       obd->obd_name, lcfg->lcfg_inlbuf4);
 
-        mnt = do_kern_mount(lcfg->lcfg_inlbuf2, 0, 
-                            lcfg->lcfg_inlbuf1, options);
-        
+                generate_random_uuid(uuid);
+                class_uuid_unparse(uuid, &mds->mds_lmv_uuid);
+
+                OBD_ALLOC(mds->mds_lmv_name, lcfg->lcfg_inllen4);
+                if (mds->mds_lmv_name == NULL) 
+                        RETURN(rc = -ENOMEM);
+
+                memcpy(mds->mds_lmv_name, lcfg->lcfg_inlbuf4,
+                                lcfg->lcfg_inllen4);
+                rc = mds_lmv_connect(obd, mds->mds_lmv_name);
+                if (rc) {
+                        OBD_FREE(mds->mds_lmv_name, lcfg->lcfg_inllen4);
+                        GOTO(err_ops, rc);
+                }
+        }
+
+        if (!(page = __get_free_page(GFP_KERNEL)))
+                RETURN(-ENOMEM);
+
+        memset((void *)page, 0, PAGE_SIZE);
+        sprintf((char *)page, "iopen_nopriv");
+
+        mnt = do_kern_mount(lcfg->lcfg_inlbuf2, 0,
+                            lcfg->lcfg_inlbuf1, (void *)page);
         free_page(page);
-        
         if (IS_ERR(mnt)) {
                 rc = PTR_ERR(mnt);
                 CERROR("do_kern_mount failed: rc = %d\n", rc);
@@ -1439,11 +1763,11 @@ static int mds_setup(struct obd_device *obd, obd_count len, void *buf)
         sema_init(&mds->mds_orphan_recovery_sem, 1);
         sema_init(&mds->mds_epoch_sem, 1);
         spin_lock_init(&mds->mds_transno_lock);
-        mds->mds_max_mdsize = sizeof(struct lov_mds_md);
         mds->mds_max_cookiesize = sizeof(struct llog_cookie);
         atomic_set(&mds->mds_open_count, 0);
+        atomic_set(&mds->mds_real_clients, 0);
 
-        obd->obd_namespace = ldlm_namespace_new("mds_server",
+        obd->obd_namespace = ldlm_namespace_new(obd->obd_name,
                                                 LDLM_NAMESPACE_SERVER);
         if (obd->obd_namespace == NULL) {
                 mds_cleanup(obd, 0);
@@ -1460,6 +1784,7 @@ static int mds_setup(struct obd_device *obd, obd_count len, void *buf)
         rc = llog_start_commit_thread();
         if (rc < 0)
                 GOTO(err_fs, rc);
+        
 
         if (lcfg->lcfg_inllen3 > 0 && lcfg->lcfg_inlbuf3) {
                 class_uuid_t uuid;
@@ -1468,12 +1793,11 @@ static int mds_setup(struct obd_device *obd, obd_count len, void *buf)
                 class_uuid_unparse(uuid, &mds->mds_lov_uuid);
 
                 OBD_ALLOC(mds->mds_profile, lcfg->lcfg_inllen3);
-                if (mds->mds_profile == NULL)
+                if (mds->mds_profile == NULL) 
                         GOTO(err_fs, rc = -ENOMEM);
 
                 memcpy(mds->mds_profile, lcfg->lcfg_inlbuf3,
                        lcfg->lcfg_inllen3);
-
         }
 
         ptlrpc_init_client(LDLM_CB_REQUEST_PORTAL, LDLM_CB_REPLY_PORTAL,
@@ -1483,10 +1807,6 @@ static int mds_setup(struct obd_device *obd, obd_count len, void *buf)
         rc = mds_postsetup(obd);
         if (rc)
                 GOTO(err_fs, rc);
-
-        lprocfs_init_vars(mds, &lvars);
-        lprocfs_obd_setup(obd, lvars.obd_vars);
-
         RETURN(0);
 
 err_fs:
@@ -1508,28 +1828,26 @@ err_ops:
 static int mds_postsetup(struct obd_device *obd)
 {
         struct mds_obd *mds = &obd->u.mds;
+        struct llog_ctxt *ctxt;
         int rc = 0;
         ENTRY;
 
-        rc = obd_llog_setup(obd, LLOG_CONFIG_ORIG_CTXT, obd, 0,
-                            NULL, &llog_lvfs_ops);
+        rc = llog_setup(obd, &obd->obd_llogs, LLOG_CONFIG_ORIG_CTXT,
+                        obd, 0, NULL, &llog_lvfs_ops);
         if (rc)
                 RETURN(rc);
 
-        /* This check for @dumb string is needed to handle
-           mounting MDS with smfs. Read lconf:MDSDEV.write_conf() for
-           more detail explanation. */
-        if (mds->mds_profile && strcmp(mds->mds_profile, "dumb")) {
-                struct lvfs_run_ctxt saved;
+        if (mds->mds_profile) {
+                struct obd_run_ctxt saved;
                 struct lustre_profile *lprof;
                 struct config_llog_instance cfg;
 
                 cfg.cfg_instance = NULL;
                 cfg.cfg_uuid = mds->mds_lov_uuid;
-                push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
-                rc = class_config_parse_llog(llog_get_context(obd, LLOG_CONFIG_ORIG_CTXT),
-                                             mds->mds_profile, &cfg);
-                pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+                push_ctxt(&saved, &obd->obd_ctxt, NULL);
+                ctxt = llog_get_context(&obd->obd_llogs, LLOG_CONFIG_ORIG_CTXT); 
+                rc = class_config_parse_llog(ctxt, mds->mds_profile, &cfg);
+                pop_ctxt(&saved, &obd->obd_ctxt, NULL);
                 if (rc)
                         GOTO(err_llog, rc);
 
@@ -1541,6 +1859,10 @@ static int mds_postsetup(struct obd_device *obd)
                 rc = mds_lov_connect(obd, lprof->lp_osc);
                 if (rc)
                         GOTO(err_cleanup, rc);
+
+                rc = mds_lmv_postsetup(obd);
+                if (rc)
+                        GOTO(err_cleanup, rc);
         }
 
         RETURN(rc);
@@ -1548,20 +1870,23 @@ static int mds_postsetup(struct obd_device *obd)
 err_cleanup:
         mds_lov_clean(obd);
 err_llog:
-        obd_llog_cleanup(llog_get_context(obd, LLOG_CONFIG_ORIG_CTXT));
+        ctxt = llog_get_context(&obd->obd_llogs, LLOG_CONFIG_ORIG_CTXT);
+        llog_cleanup(ctxt);
         RETURN(rc);
 }
 
-static int mds_postrecov(struct obd_device *obd)
+static int mds_postrecov(struct obd_device *obd) 
 
 {
+        struct llog_ctxt *ctxt;
         int rc, rc2;
+        ENTRY;
 
         LASSERT(!obd->obd_recovering);
-        LASSERT(llog_get_context(obd, LLOG_UNLINK_ORIG_CTXT) != NULL);
+        ctxt = llog_get_context(&obd->obd_llogs, LLOG_UNLINK_ORIG_CTXT);
+        LASSERT(ctxt != NULL);
 
-        rc = llog_connect(llog_get_context(obd, LLOG_UNLINK_ORIG_CTXT),
-                          obd->u.mds.mds_lov_desc.ld_tgt_count,
+        rc = llog_connect(ctxt, obd->u.mds.mds_lov_desc.ld_tgt_count,
                           NULL, NULL, NULL);
         if (rc != 0) {
                 CERROR("faild at llog_origin_connect: %d\n", rc);
@@ -1578,11 +1903,12 @@ static int mds_postrecov(struct obd_device *obd)
 int mds_lov_clean(struct obd_device *obd)
 {
         struct mds_obd *mds = &obd->u.mds;
+        struct llog_ctxt *ctxt;
 
         if (mds->mds_profile) {
                 char * cln_prof;
                 struct config_llog_instance cfg;
-                struct lvfs_run_ctxt saved;
+                struct obd_run_ctxt saved;
                 int len = strlen(mds->mds_profile) + sizeof("-clean") + 1;
 
                 OBD_ALLOC(cln_prof, len);
@@ -1591,10 +1917,10 @@ int mds_lov_clean(struct obd_device *obd)
                 cfg.cfg_instance = NULL;
                 cfg.cfg_uuid = mds->mds_lov_uuid;
 
-                push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
-                class_config_parse_llog(llog_get_context(obd, LLOG_CONFIG_ORIG_CTXT),
-                                        cln_prof, &cfg);
-                pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+                push_ctxt(&saved, &obd->obd_ctxt, NULL);
+                ctxt = llog_get_context(&obd->obd_llogs, LLOG_CONFIG_ORIG_CTXT);
+                class_config_parse_llog(ctxt, cln_prof, &cfg);
+                pop_ctxt(&saved, &obd->obd_ctxt, NULL);
 
                 OBD_FREE(cln_prof, len);
                 OBD_FREE(mds->mds_profile, strlen(mds->mds_profile) + 1);
@@ -1603,14 +1929,26 @@ int mds_lov_clean(struct obd_device *obd)
         RETURN(0);
 }
 
+int mds_lmv_clean(struct obd_device *obd)
+{
+        struct mds_obd *mds = &obd->u.mds;
+
+        if (mds->mds_lmv_name) {
+                OBD_FREE(mds->mds_lmv_name, strlen(mds->mds_lmv_name) + 1);
+                mds->mds_lmv_name = NULL;
+        }
+        RETURN(0);
+}
+
 static int mds_precleanup(struct obd_device *obd, int flags)
 {
         int rc = 0;
         ENTRY;
 
+        mds_lmv_clean(obd);
         mds_lov_disconnect(obd, flags);
         mds_lov_clean(obd);
-        obd_llog_cleanup(llog_get_context(obd, LLOG_CONFIG_ORIG_CTXT));
+        llog_cleanup(llog_get_context(&obd->obd_llogs, LLOG_CONFIG_ORIG_CTXT));
         RETURN(rc);
 }
 
@@ -1622,8 +1960,6 @@ static int mds_cleanup(struct obd_device *obd, int flags)
         if (mds->mds_sb == NULL)
                 RETURN(0);
 
-        lprocfs_obd_cleanup(obd);
-
         mds_update_server_data(obd, 1);
         if (mds->mds_lov_objids != NULL) {
                 OBD_FREE(mds->mds_lov_objids,
@@ -1689,18 +2025,12 @@ static void fixup_handle_for_resent_req(struct ptlrpc_request *req,
         }
         l_unlock(&obd->obd_namespace->ns_lock);
 
-        /* If the xid matches, then we know this is a resent request,
-         * and allow it. (It's probably an OPEN, for which we don't
-         * send a lock */
-        if (req->rq_xid == exp->exp_mds_data.med_mcd->mcd_last_xid)
-                return;
-
         /* This remote handle isn't enqueued, so we never received or
          * processed this request.  Clear MSG_RESENT, because it can
          * be handled like any normal request now. */
 
         lustre_msg_clear_flags(req->rq_reqmsg, MSG_RESENT);
-
+        
         DEBUG_REQ(D_HA, req, "no existing lock with rhandle "LPX64,
                   remote_hdl.cookie);
 }
@@ -1779,8 +2109,15 @@ static int mds_intent_policy(struct ldlm_namespace *ns,
                         RETURN(ELDLM_LOCK_ABORTED);
                 if (intent_disposition(rep, DISP_LOOKUP_NEG) &&
                     !intent_disposition(rep, DISP_OPEN_OPEN))
-#endif
-                        RETURN(ELDLM_LOCK_ABORTED);
+#endif 
+                        if (rep->lock_policy_res2) {
+                                /* mds_open returns ENOLCK where it
+                                 * should return zero, but it has no
+                                 * lock to return */
+                                if (rep->lock_policy_res2 == ENOLCK)
+                                        rep->lock_policy_res2 = 0;
+                                RETURN(ELDLM_LOCK_ABORTED);
+                        }
                 break;
         case IT_LOOKUP:
                 getattr_part = MDS_INODELOCK_LOOKUP;
@@ -1791,11 +2128,11 @@ static int mds_intent_policy(struct ldlm_namespace *ns,
                                                          getattr_part);
                 /* FIXME: LDLM can set req->rq_status. MDS sets
                    policy_res{1,2} with disposition and status.
-                   - replay: returns 0 & req->status is old status
+                   - replay: returns 0 & req->status is old status 
                    - otherwise: returns req->status */
                 if (intent_disposition(rep, DISP_LOOKUP_NEG))
                         rep->lock_policy_res2 = 0;
-                if (!intent_disposition(rep, DISP_LOOKUP_POS) ||
+                if (!intent_disposition(rep, DISP_LOOKUP_POS) || 
                     rep->lock_policy_res2)
                         RETURN(ELDLM_LOCK_ABORTED);
                 if (req->rq_status != 0) {
@@ -1865,27 +2202,50 @@ static int mds_intent_policy(struct ldlm_namespace *ns,
         RETURN(ELDLM_LOCK_REPLACED);
 }
 
-static int mdt_setup(struct obd_device *obd, obd_count len, void *buf)
+int mds_attach(struct obd_device *dev, obd_count len, void *data)
+{
+        struct lprocfs_static_vars lvars;
+
+        lprocfs_init_multi_vars(0, &lvars);
+        return lprocfs_obd_attach(dev, lvars.obd_vars);
+}
+
+int mds_detach(struct obd_device *dev)
+{
+        return lprocfs_obd_detach(dev);
+}
+
+int mdt_attach(struct obd_device *dev, obd_count len, void *data)
 {
-        struct mds_obd *mds = &obd->u.mds;
         struct lprocfs_static_vars lvars;
+
+        lprocfs_init_multi_vars(1, &lvars);
+        return lprocfs_obd_attach(dev, lvars.obd_vars);
+}
+
+int mdt_detach(struct obd_device *dev)
+{
+        return lprocfs_obd_detach(dev);
+}
+
+static int mdt_setup(struct obd_device *obddev, obd_count len, void *buf)
+{
+        struct mds_obd *mds = &obddev->u.mds;
         int rc = 0;
         ENTRY;
 
-        lprocfs_init_vars(mdt, &lvars);
-        lprocfs_obd_setup(obd, lvars.obd_vars);
-
-        mds->mds_service =
+        mds->mds_service = 
                 ptlrpc_init_svc(MDS_NBUFS, MDS_BUFSIZE, MDS_MAXREQSIZE,
                                 MDS_REQUEST_PORTAL, MDC_REPLY_PORTAL,
-                                mds_handle, "mds", obd->obd_proc_entry);
+                                mds_handle, "mds",
+                                obddev->obd_proc_entry);
 
         if (!mds->mds_service) {
                 CERROR("failed to start service\n");
-                GOTO(err_lprocfs, rc = -ENOMEM);
+                RETURN(rc = -ENOMEM);
         }
 
-        rc = ptlrpc_start_n_threads(obd, mds->mds_service, MDT_NUM_THREADS,
+        rc = ptlrpc_start_n_threads(obddev, mds->mds_service, MDT_NUM_THREADS,
                                     "ll_mdt");
         if (rc)
                 GOTO(err_thread, rc);
@@ -1893,32 +2253,32 @@ static int mdt_setup(struct obd_device *obd, obd_count len, void *buf)
         mds->mds_setattr_service =
                 ptlrpc_init_svc(MDS_NBUFS, MDS_BUFSIZE, MDS_MAXREQSIZE,
                                 MDS_SETATTR_PORTAL, MDC_REPLY_PORTAL,
-                                mds_handle, "mds_setattr",
-                                obd->obd_proc_entry);
+                                mds_handle, "mds_setattr", 
+                                obddev->obd_proc_entry);
         if (!mds->mds_setattr_service) {
                 CERROR("failed to start getattr service\n");
                 GOTO(err_thread, rc = -ENOMEM);
         }
 
-        rc = ptlrpc_start_n_threads(obd, mds->mds_setattr_service,
-                                    MDT_NUM_THREADS, "ll_mdt_attr");
+        rc = ptlrpc_start_n_threads(obddev, mds->mds_setattr_service,
+                                 MDT_NUM_THREADS, "ll_mdt_attr");
         if (rc)
                 GOTO(err_thread2, rc);
-
+                        
         mds->mds_readpage_service =
                 ptlrpc_init_svc(MDS_NBUFS, MDS_BUFSIZE, MDS_MAXREQSIZE,
                                 MDS_READPAGE_PORTAL, MDC_REPLY_PORTAL,
-                                mds_handle, "mds_readpage",
-                                obd->obd_proc_entry);
+                                mds_handle, "mds_readpage", 
+                                obddev->obd_proc_entry);
         if (!mds->mds_readpage_service) {
                 CERROR("failed to start readpage service\n");
                 GOTO(err_thread2, rc = -ENOMEM);
         }
 
-        rc = ptlrpc_start_n_threads(obd, mds->mds_readpage_service,
+        rc = ptlrpc_start_n_threads(obddev, mds->mds_readpage_service,
                                     MDT_NUM_THREADS, "ll_mdt_rdpg");
 
-        if (rc)
+        if (rc) 
                 GOTO(err_thread3, rc);
 
         RETURN(0);
@@ -1929,14 +2289,13 @@ err_thread2:
         ptlrpc_unregister_service(mds->mds_setattr_service);
 err_thread:
         ptlrpc_unregister_service(mds->mds_service);
-err_lprocfs:
-        lprocfs_obd_cleanup(obd);
         return rc;
 }
 
-static int mdt_cleanup(struct obd_device *obd, int flags)
+
+static int mdt_cleanup(struct obd_device *obddev, int flags)
 {
-        struct mds_obd *mds = &obd->u.mds;
+        struct mds_obd *mds = &obddev->u.mds;
         ENTRY;
 
         ptlrpc_stop_all_threads(mds->mds_readpage_service);
@@ -1948,13 +2307,10 @@ static int mdt_cleanup(struct obd_device *obd, int flags)
         ptlrpc_stop_all_threads(mds->mds_service);
         ptlrpc_unregister_service(mds->mds_service);
 
-        lprocfs_obd_cleanup(obd);
-
         RETURN(0);
 }
 
-static struct dentry *mds_lvfs_fid2dentry(__u64 id, __u32 gen, __u64 gr,
-                                          void *data)
+static struct dentry *mds_lvfs_fid2dentry(__u64 id, __u32 gen, __u64 gr, void *data)
 {
         struct obd_device *obd = data;
         struct ll_fid fid;
@@ -1967,40 +2323,58 @@ struct lvfs_callback_ops mds_lvfs_ops = {
         l_fid2dentry:     mds_lvfs_fid2dentry,
 };
 
+int mds_preprw(int cmd, struct obd_export *exp, struct obdo *oa,
+                int objcount, struct obd_ioobj *obj,
+                int niocount, struct niobuf_remote *nb,
+                struct niobuf_local *res,
+                struct obd_trans_info *oti);
+int mds_commitrw(int cmd, struct obd_export *exp, struct obdo *oa,
+                 int objcount, struct obd_ioobj *obj, int niocount,
+                 struct niobuf_local *res, struct obd_trans_info *oti,
+                 int rc);
+
 /* use obd ops to offer management infrastructure */
 static struct obd_ops mds_obd_ops = {
-        .o_owner           = THIS_MODULE,
-        .o_connect         = mds_connect,
-        .o_init_export     = mds_init_export,
-        .o_destroy_export  = mds_destroy_export,
-        .o_disconnect      = mds_disconnect,
-        .o_setup           = mds_setup,
-        .o_precleanup      = mds_precleanup,
-        .o_cleanup         = mds_cleanup,
-        .o_postrecov       = mds_postrecov,
-        .o_statfs          = mds_obd_statfs,
-        .o_iocontrol       = mds_iocontrol,
-        .o_create          = mds_obd_create,
-        .o_destroy         = mds_obd_destroy,
-        .o_llog_init       = mds_llog_init,
-        .o_llog_finish     = mds_llog_finish,
-        .o_notify          = mds_notify,
+        o_owner:       THIS_MODULE,
+        o_attach:      mds_attach,
+        o_detach:      mds_detach,
+        o_connect:     mds_connect,
+        o_init_export:  mds_init_export,
+        o_destroy_export:  mds_destroy_export,
+        o_disconnect:  mds_disconnect,
+        o_setup:       mds_setup,
+        o_precleanup:  mds_precleanup,
+        o_cleanup:     mds_cleanup,
+        o_postrecov:   mds_postrecov,
+        o_statfs:      mds_obd_statfs,
+        o_iocontrol:   mds_iocontrol,
+        o_create:      mds_obd_create,
+        o_destroy:     mds_obd_destroy,
+        o_llog_init:   mds_llog_init,
+        o_llog_finish: mds_llog_finish,
+        o_notify:      mds_notify,
+        o_get_info:    mds_get_info,
+        o_set_info:    mds_set_info,
+        o_preprw:      mds_preprw, 
+        o_commitrw:    mds_commitrw,
 };
 
 static struct obd_ops mdt_obd_ops = {
-        .o_owner           = THIS_MODULE,
-        .o_setup           = mdt_setup,
-        .o_cleanup         = mdt_cleanup,
+        o_owner:       THIS_MODULE,
+        o_attach:      mdt_attach,
+        o_detach:      mdt_detach,
+        o_setup:       mdt_setup,
+        o_cleanup:     mdt_cleanup,
 };
 
 static int __init mds_init(void)
 {
         struct lprocfs_static_vars lvars;
 
-        lprocfs_init_vars(mds, &lvars);
-        class_register_type(&mds_obd_ops, lvars.module_vars, LUSTRE_MDS_NAME);
-        lprocfs_init_vars(mdt, &lvars);
-        class_register_type(&mdt_obd_ops, lvars.module_vars, LUSTRE_MDT_NAME);
+        lprocfs_init_multi_vars(0, &lvars);
+        class_register_type(&mds_obd_ops, NULL, lvars.module_vars, LUSTRE_MDS_NAME);
+        lprocfs_init_multi_vars(1, &lvars);
+        class_register_type(&mdt_obd_ops, NULL, lvars.module_vars, LUSTRE_MDT_NAME);
 
         return 0;
 }
diff --git a/lustre/mds/lproc_mds.c b/lustre/mds/lproc_mds.c
index 52225be..10365a6 100644
--- a/lustre/mds/lproc_mds.c
+++ b/lustre/mds/lproc_mds.c
@@ -163,10 +163,10 @@ struct lprocfs_vars lprocfs_mds_obd_vars[] = {
         { "filestotal",   lprocfs_rd_filestotal,  0, 0 },
         { "filesfree",    lprocfs_rd_filesfree,   0, 0 },
         { "filesopen",    lprocfs_mds_rd_filesopen,   0, 0 },
+        //{ "filegroups",   lprocfs_rd_filegroups,  0, 0 },
         { "mntdev",       lprocfs_mds_rd_mntdev,  0, 0 },
         { "recovery_status", lprocfs_mds_rd_recovery_status, 0, 0 },
         { "evict_client", 0, lprocfs_mds_wr_evict_client, 0 },
-        { "num_exports",  lprocfs_rd_num_exports, 0, 0 },
         { 0 }
 };
 
@@ -186,5 +186,11 @@ struct lprocfs_vars lprocfs_mdt_module_vars[] = {
 };
 
 #endif
-LPROCFS_INIT_VARS(mds, lprocfs_mds_module_vars, lprocfs_mds_obd_vars);
-LPROCFS_INIT_VARS(mdt, lprocfs_mdt_module_vars, lprocfs_mdt_obd_vars);
+struct lprocfs_static_vars lprocfs_array_vars[] = { {lprocfs_mds_module_vars,
+                                                     lprocfs_mds_obd_vars},
+                                                    {lprocfs_mdt_module_vars,
+                                                     lprocfs_mdt_obd_vars}};
+
+LPROCFS_INIT_MULTI_VARS(lprocfs_array_vars,
+                        (sizeof(lprocfs_array_vars) /
+                         sizeof(struct lprocfs_static_vars)))
diff --git a/lustre/mds/mds_fs.c b/lustre/mds/mds_fs.c
index c907a91..1d1594f 100644
--- a/lustre/mds/mds_fs.c
+++ b/lustre/mds/mds_fs.c
@@ -95,19 +95,18 @@ int mds_client_add(struct obd_device *obd, struct mds_obd *mds,
                cl_idx, med->med_mcd->mcd_uuid);
 
         med->med_idx = cl_idx;
-        med->med_off = le32_to_cpu(mds->mds_server_data->msd_client_start) +
-                (cl_idx * le16_to_cpu(mds->mds_server_data->msd_client_size));
+        med->med_off = MDS_LR_CLIENT_START + (cl_idx * MDS_LR_CLIENT_SIZE);
 
         if (new_client) {
-                struct lvfs_run_ctxt saved;
+                struct obd_run_ctxt saved;
                 loff_t off = med->med_off;
                 struct file *file = mds->mds_rcvd_filp;
                 int rc;
 
-                push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+                push_ctxt(&saved, &obd->obd_ctxt, NULL);
                 rc = fsfilt_write_record(obd, file, med->med_mcd,
                                          sizeof(*med->med_mcd), &off, 1);
-                pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+                pop_ctxt(&saved, &obd->obd_ctxt, NULL);
 
                 if (rc)
                         return rc;
@@ -124,7 +123,7 @@ int mds_client_free(struct obd_export *exp, int clear_client)
         struct mds_obd *mds = &exp->exp_obd->u.mds;
         struct obd_device *obd = exp->exp_obd;
         struct mds_client_data zero_mcd;
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
         int rc;
         unsigned long *bitmap = mds->mds_client_bitmap;
 
@@ -150,10 +149,10 @@ int mds_client_free(struct obd_export *exp, int clear_client)
 
         if (clear_client) {
                 memset(&zero_mcd, 0, sizeof zero_mcd);
-                push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+                push_ctxt(&saved, &obd->obd_ctxt, NULL);
                 rc = fsfilt_write_record(obd, mds->mds_rcvd_filp, &zero_mcd,
                                          sizeof(zero_mcd), &med->med_off, 1);
-                pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+                pop_ctxt(&saved, &obd->obd_ctxt, NULL);
 
                 CDEBUG(rc == 0 ? D_INFO : D_ERROR,
                        "zeroing out client %s idx %u in %s rc %d\n",
@@ -194,10 +193,10 @@ static int mds_read_last_rcvd(struct obd_device *obd, struct file *file)
         ENTRY;
 
         /* ensure padding in the struct is the correct size */
-        LASSERT(offsetof(struct mds_server_data, msd_padding) +
-                sizeof(msd->msd_padding) == MDS_LR_SERVER_SIZE);
-        LASSERT(offsetof(struct mds_client_data, mcd_padding) +
-                sizeof(mcd->mcd_padding) == MDS_LR_CLIENT_SIZE);
+        LASSERT (offsetof(struct mds_server_data, msd_padding) +
+                 sizeof(msd->msd_padding) == MDS_LR_SERVER_SIZE);
+        LASSERT (offsetof(struct mds_client_data, mcd_padding) +
+                 sizeof(mcd->mcd_padding) == MDS_LR_CLIENT_SIZE);
 
         OBD_ALLOC_WAIT(msd, sizeof(*msd));
         if (!msd)
@@ -217,7 +216,7 @@ static int mds_read_last_rcvd(struct obd_device *obd, struct file *file)
 
                 memcpy(msd->msd_uuid, obd->obd_uuid.uuid,sizeof(msd->msd_uuid));
                 msd->msd_last_transno = 0;
-                mount_count = msd->msd_mount_count = 0;
+                mount_count = msd->msd_mount_count = 0; 
                 msd->msd_server_size = cpu_to_le32(MDS_LR_SERVER_SIZE);
                 msd->msd_client_start = cpu_to_le32(MDS_LR_CLIENT_START);
                 msd->msd_client_size = cpu_to_le16(MDS_LR_CLIENT_SIZE);
@@ -266,9 +265,8 @@ static int mds_read_last_rcvd(struct obd_device *obd, struct file *file)
         CDEBUG(D_INODE, "%s: last_rcvd size: %lu\n",
                obd->obd_name, last_rcvd_size);
         CDEBUG(D_INODE, "%s: last_rcvd clients: %lu\n", obd->obd_name,
-               last_rcvd_size <= le32_to_cpu(msd->msd_client_start) ? 0 :
-               (last_rcvd_size - le32_to_cpu(msd->msd_client_start)) /
-                le16_to_cpu(msd->msd_client_size));
+               last_rcvd_size <= MDS_LR_CLIENT_START ? 0 :
+               (last_rcvd_size - MDS_LR_CLIENT_START) / MDS_LR_CLIENT_SIZE);
 
         /* When we do a clean MDS shutdown, we save the last_transno into
          * the header.  If we find clients with higher last_transno values
@@ -367,7 +365,7 @@ err_msd:
 int mds_fs_setup(struct obd_device *obd, struct vfsmount *mnt)
 {
         struct mds_obd *mds = &obd->u.mds;
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
         struct dentry *dentry;
         struct file *file;
         int rc;
@@ -382,14 +380,14 @@ int mds_fs_setup(struct obd_device *obd, struct vfsmount *mnt)
 
         fsfilt_setup(obd, mds->mds_sb);
 
-        OBD_SET_CTXT_MAGIC(&obd->obd_lvfs_ctxt);
-        obd->obd_lvfs_ctxt.pwdmnt = mnt;
-        obd->obd_lvfs_ctxt.pwd = mnt->mnt_root;
-        obd->obd_lvfs_ctxt.fs = get_ds();
-        obd->obd_lvfs_ctxt.cb_ops = mds_lvfs_ops;
+        OBD_SET_CTXT_MAGIC(&obd->obd_ctxt);
+        obd->obd_ctxt.pwdmnt = mnt;
+        obd->obd_ctxt.pwd = mnt->mnt_root;
+        obd->obd_ctxt.fs = get_ds();
+        obd->obd_ctxt.cb_ops = mds_lvfs_ops;
 
         /* setup the directory tree */
-        push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+        push_ctxt(&saved, &obd->obd_ctxt, NULL);
         dentry = simple_mkdir(current->fs->pwd, "ROOT", 0755, 0);
         if (IS_ERR(dentry)) {
                 rc = PTR_ERR(dentry);
@@ -441,6 +439,14 @@ int mds_fs_setup(struct obd_device *obd, struct vfsmount *mnt)
         }
         mds->mds_objects_dir = dentry;
 
+        dentry = simple_mkdir(current->fs->pwd, "FIDS", 0777, 1);
+        if (IS_ERR(dentry)) {
+                rc = PTR_ERR(dentry);
+                CERROR("cannot create FIDS directory: rc = %d\n", rc);
+                GOTO(err_fids, rc);
+        }
+        mds->mds_fids_dir = dentry;
+
         /* open and test the last rcvd file */
         file = filp_open(LAST_RCVD, O_RDWR | O_CREAT, 0644);
         if (IS_ERR(file)) {
@@ -475,7 +481,7 @@ int mds_fs_setup(struct obd_device *obd, struct vfsmount *mnt)
                 GOTO(err_lov_objid, rc = -ENOENT);
         }
 err_pop:
-        pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+        pop_ctxt(&saved, &obd->obd_ctxt, NULL);
 
         return rc;
 
@@ -487,6 +493,8 @@ err_client:
 err_last_rcvd:
         if (mds->mds_rcvd_filp && filp_close(mds->mds_rcvd_filp, 0))
                 CERROR("can't close %s after error\n", LAST_RCVD);
+err_fids:
+        dput(mds->mds_fids_dir);
 err_objects:
         dput(mds->mds_objects_dir);
 err_logs:
@@ -502,17 +510,19 @@ err_fid:
 int mds_fs_cleanup(struct obd_device *obd, int flags)
 {
         struct mds_obd *mds = &obd->u.mds;
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
         int rc = 0;
 
-        if (flags & OBD_OPT_FAILOVER)
+        if (flags & OBD_OPT_FAILOVER) {
                 CERROR("%s: shutting down for failover; client state will"
                        " be preserved.\n", obd->obd_name);
+                mds_lmv_disconnect(obd, flags);
+        }
 
         class_disconnect_exports(obd, flags); /* cleans up client info too */
         mds_server_free_data(mds);
 
-        push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+        push_ctxt(&saved, &obd->obd_ctxt, NULL);
         if (mds->mds_rcvd_filp) {
                 rc = filp_close(mds->mds_rcvd_filp, 0);
                 mds->mds_rcvd_filp = NULL;
@@ -525,6 +535,10 @@ int mds_fs_cleanup(struct obd_device *obd, int flags)
                 if (rc)
                         CERROR("%s file won't close, rc=%d\n", LOV_OBJID, rc);
         }
+        if (mds->mds_fids_dir != NULL) {
+                l_dput(mds->mds_fids_dir);
+                mds->mds_fids_dir = NULL;
+        }
         if (mds->mds_objects_dir != NULL) {
                 l_dput(mds->mds_objects_dir);
                 mds->mds_objects_dir = NULL;
@@ -537,7 +551,7 @@ int mds_fs_cleanup(struct obd_device *obd, int flags)
                 l_dput(mds->mds_pending_dir);
                 mds->mds_pending_dir = NULL;
         }
-        pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+        pop_ctxt(&saved, &obd->obd_ctxt, NULL);
         shrink_dcache_parent(mds->mds_fid_de);
         dput(mds->mds_fid_de);
 
@@ -548,20 +562,20 @@ int mds_fs_cleanup(struct obd_device *obd, int flags)
  * performance sensitive, it is accomplished by creating a file, checking the
  * fid, and renaming it. */
 int mds_obd_create(struct obd_export *exp, struct obdo *oa,
-                   struct lov_stripe_md **ea, struct obd_trans_info *oti)
+                      struct lov_stripe_md **ea, struct obd_trans_info *oti)
 {
         struct mds_obd *mds = &exp->exp_obd->u.mds;
         struct inode *parent_inode = mds->mds_objects_dir->d_inode;
         unsigned int tmpname = ll_insecure_random_int();
         struct file *filp;
         struct dentry *new_child;
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
         char fidname[LL_FID_NAMELEN];
         void *handle;
         int rc = 0, err, namelen;
         ENTRY;
 
-        push_ctxt(&saved, &exp->exp_obd->obd_lvfs_ctxt, NULL);
+        push_ctxt(&saved, &exp->exp_obd->obd_ctxt, NULL);
         
         sprintf(fidname, "OBJECTS/%u", tmpname);
         filp = filp_open(fidname, O_CREAT | O_EXCL, 0644);
@@ -610,8 +624,10 @@ int mds_obd_create(struct obd_export *exp, struct obdo *oa,
 
         err = fsfilt_commit(exp->exp_obd, mds->mds_objects_dir->d_inode,
                             handle, 0);
-        if (!err)
-                oa->o_valid |= OBD_MD_FLID | OBD_MD_FLGENER;
+        if (!err) {
+                oa->o_gr = FILTER_GROUP_FIRST_MDS + mds->mds_num;
+                oa->o_valid |= OBD_MD_FLID | OBD_MD_FLGENER | OBD_MD_FLGROUP;
+        }
         else if (!rc)
                 rc = err;
 out_dput:
@@ -625,7 +641,7 @@ out_close:
                         rc = err;
         }
 out_pop:
-        pop_ctxt(&saved, &exp->exp_obd->obd_lvfs_ctxt, NULL);
+        pop_ctxt(&saved, &exp->exp_obd->obd_ctxt, NULL);
         RETURN(rc);
 }
 
@@ -635,14 +651,14 @@ int mds_obd_destroy(struct obd_export *exp, struct obdo *oa,
         struct mds_obd *mds = &exp->exp_obd->u.mds;
         struct inode *parent_inode = mds->mds_objects_dir->d_inode;
         struct obd_device *obd = exp->exp_obd;
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
         char fidname[LL_FID_NAMELEN];
         struct dentry *de;
         void *handle;
         int err, namelen, rc = 0;
         ENTRY;
 
-        push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+        push_ctxt(&saved, &obd->obd_ctxt, NULL);
 
         namelen = ll_fid2str(fidname, oa->o_id, oa->o_generation);
 
@@ -658,9 +674,9 @@ int mds_obd_destroy(struct obd_export *exp, struct obdo *oa,
            that is unlinked, not spanned across multiple OSTs */
         handle = fsfilt_start_log(obd, mds->mds_objects_dir->d_inode,
                                   FSFILT_OP_UNLINK, oti, 1);
-
-        if (IS_ERR(handle))
+        if (IS_ERR(handle)) {
                 GOTO(out_dput, rc = PTR_ERR(handle));
+        }
         
         rc = vfs_unlink(mds->mds_objects_dir->d_inode, de);
         if (rc) 
@@ -674,6 +690,6 @@ out_dput:
         if (de != NULL)
                 l_dput(de);
         up(&parent_inode->i_sem);
-        pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+        pop_ctxt(&saved, &obd->obd_ctxt, NULL);
         RETURN(rc);
 }
diff --git a/lustre/mds/mds_internal.h b/lustre/mds/mds_internal.h
index e5ce7e2..cb41877a 100644
--- a/lustre/mds/mds_internal.h
+++ b/lustre/mds/mds_internal.h
@@ -7,8 +7,6 @@
 
 #include <linux/lustre_mds.h>
 
-#define MAX_ATIME_DIFF 60
-
 struct mds_filter_data {
         __u64 io_epoch;
 };
@@ -19,6 +17,10 @@ static inline struct mds_obd *mds_req2mds(struct ptlrpc_request *req)
 {
         return &req->rq_export->exp_obd->u.mds;
 }
+static inline struct obd_device *req2obd(struct ptlrpc_request *req)
+{
+        return req->rq_export->exp_obd;
+}
 
 /* mds/mds_reint.c */
 int enqueue_ordered_locks(struct obd_device *obd, struct ldlm_res_id *p1_res_id,
@@ -59,9 +61,9 @@ int mds_cleanup_orphans(struct obd_device *obd);
 int mds_log_op_unlink(struct obd_device *obd, struct inode *inode,
                       struct lov_mds_md *lmm, int lmm_size,
                       struct llog_cookie *logcookies, int cookies_size);
-int mds_llog_init(struct obd_device *obd, struct obd_device *tgt, int count,
-                  struct llog_catid *logid);
-int mds_llog_finish(struct obd_device *obd, int count);
+int mds_llog_init(struct obd_device *obd, struct obd_llogs *,
+                  struct obd_device *tgt, int count, struct llog_catid *logid);
+int mds_llog_finish(struct obd_device *obd, struct obd_llogs *, int count);
 
 /* mds/mds_lov.c */
 int mds_lov_connect(struct obd_device *obd, char * lov_name);
@@ -102,12 +104,17 @@ int mds_lov_clean(struct obd_device *obd);
 extern int mds_iocontrol(unsigned int cmd, struct obd_export *exp,
                          int len, void *karg, void *uarg);
 #ifdef __KERNEL__
-int mds_get_md(struct obd_device *, struct inode *, void *md, int *size, 
-               int lock);
 int mds_pack_md(struct obd_device *, struct lustre_msg *, int offset,
                 struct mds_body *, struct inode *, int lock);
-void mds_pack_inode2fid(struct ll_fid *fid, struct inode *inode);
-void mds_pack_inode2body(struct mds_body *body, struct inode *inode);
+void mds_pack_inode2fid(struct obd_device *, struct ll_fid *, struct inode *);
+void mds_pack_inode2body(struct obd_device *, struct mds_body *, struct inode *);
 #endif
 
+/* mds/mds_lmv.c */
+int mds_lmv_connect(struct obd_device *obd, char * lov_name);
+int mds_lmv_disconnect(struct obd_device *obd, int flags);
+int mds_try_to_split_dir(struct obd_device *, struct dentry *, struct mea **,
+                         int);
+int mds_get_lmv_attr(struct obd_device *, struct inode *, struct mea **, int *);
+
 #endif /* _MDS_INTERNAL_H */
diff --git a/lustre/mds/mds_lib.c b/lustre/mds/mds_lib.c
index 66d182c..a407176 100644
--- a/lustre/mds/mds_lib.c
+++ b/lustre/mds/mds_lib.c
@@ -49,15 +49,18 @@
 #include <linux/lustre_lib.h>
 #include <linux/lustre_mds.h>
 
-void mds_pack_inode2fid(struct ll_fid *fid, struct inode *inode)
+void mds_pack_inode2fid(struct obd_device *obd, struct ll_fid *fid,
+                                struct inode *inode)
 {
         fid->id = inode->i_ino;
         fid->generation = inode->i_generation;
         fid->f_type = (S_IFMT & inode->i_mode);
+        fid->mds = obd->u.mds.mds_num;
 }
 
 /* Note that we can copy all of the fields, just some will not be "valid" */
-void mds_pack_inode2body(struct mds_body *b, struct inode *inode)
+void mds_pack_inode2body(struct obd_device *obd, struct mds_body *b,
+                                struct inode *inode)
 {
         b->valid |= OBD_MD_FLID | OBD_MD_FLCTIME | OBD_MD_FLUID |
                     OBD_MD_FLGID | OBD_MD_FLFLAGS | OBD_MD_FLTYPE |
@@ -83,6 +86,7 @@ void mds_pack_inode2body(struct mds_body *b, struct inode *inode)
         b->nlink = mds_inode_is_orphan(inode) ? 0 : inode->i_nlink;
         b->generation = inode->i_generation;
         b->suppgid = -1;
+        b->mds = obd->u.mds.mds_num;
 }
 
 /* unpacking */
@@ -165,17 +169,27 @@ static int mds_create_unpack(struct ptlrpc_request *req, int offset,
 
         LASSERT_REQSWAB (req, offset + 2);
         if (req->rq_reqmsg->bufcount > offset + 2) {
-                /* NB for now, we only seem to pass NULL terminated symlink
-                 * target strings here.  If this ever changes, we'll have
-                 * to stop checking for a buffer filled completely with a
-                 * NULL terminated string here, and make the callers check
-                 * depending on what they expect.  We should probably stash
-                 * it in r->ur_eadata in that case, so it's obvious... -eeb
-                 */
-                r->ur_tgt = lustre_msg_string(req->rq_reqmsg, offset + 2, 0);
-                if (r->ur_tgt == NULL)
-                        RETURN (-EFAULT);
-                r->ur_tgtlen = req->rq_reqmsg->buflens[offset + 2];
+                if (S_ISLNK(r->ur_mode)) {
+                        r->ur_tgt = lustre_msg_string(req->rq_reqmsg,
+                                                      offset + 2, 0);
+                        if (r->ur_tgt == NULL)
+                                RETURN (-EFAULT);
+                        r->ur_tgtlen = req->rq_reqmsg->buflens[offset + 2];
+                } else if (S_ISDIR(r->ur_mode)) {
+                        /* Stripe info for mkdir - just a 16bit integer */
+                        if (req->rq_reqmsg->buflens[offset + 2] != 2) {
+                                CERROR("mkdir stripe info does not match "
+                                       "expected size %d vs 2\n",
+                                       req->rq_reqmsg->buflens[offset + 2]);
+                                RETURN (-EINVAL);
+                        }
+                        r->ur_eadata = lustre_swab_buf (req->rq_reqmsg,
+                                               offset + 2, 2, __swab16s);
+                        r->ur_eadatalen = req->rq_reqmsg->buflens[offset + 2];
+                } else {
+                        /* Hm, no other users so far? */
+                        LBUG();
+                }
         }
         RETURN(0);
 }
diff --git a/lustre/mds/mds_lmv.c b/lustre/mds/mds_lmv.c
new file mode 100644
index 0000000..8afb801
--- /dev/null
+++ b/lustre/mds/mds_lmv.c
@@ -0,0 +1,643 @@
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
+ *
+ *  linux/mds/mds_lov.c
+ *  Lustre Metadata Server (mds) handling of striped file data
+ *
+ *  Copyright (C) 2001-2003 Cluster File Systems, Inc.
+ *
+ *   This file is part of Lustre, http://www.lustre.org.
+ *
+ *   Lustre is free software; you can redistribute it and/or
+ *   modify it under the terms of version 2 of the GNU General Public
+ *   License as published by the Free Software Foundation.
+ *
+ *   Lustre is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Lustre; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef EXPORT_SYMTAB
+# define EXPORT_SYMTAB
+#endif
+#define DEBUG_SUBSYSTEM S_MDS
+
+#include <linux/module.h>
+#include <linux/lustre_mds.h>
+#include <linux/lustre_idl.h>
+#include <linux/obd_class.h>
+#include <linux/obd_lov.h>
+#include <linux/lustre_lib.h>
+#include <linux/lustre_fsfilt.h>
+
+#include "mds_internal.h"
+
+
+/*
+ * TODO:
+ *   - magic in mea struct
+ *   - error handling is totally missed
+ */
+
+int mds_lmv_connect(struct obd_device *obd, char * lmv_name)
+{
+        struct mds_obd *mds = &obd->u.mds;
+        struct lustre_handle conn = {0,};
+        int valsize, mdsize;
+        int rc;
+        ENTRY;
+
+        if (IS_ERR(mds->mds_lmv_obd))
+                RETURN(PTR_ERR(mds->mds_lmv_obd));
+
+        if (mds->mds_lmv_obd)
+                RETURN(0);
+
+        mds->mds_lmv_obd = class_name2obd(lmv_name);
+        if (!mds->mds_lmv_obd) {
+                CERROR("MDS cannot locate LMV %s\n",
+                       lmv_name);
+                mds->mds_lmv_obd = ERR_PTR(-ENOTCONN);
+                RETURN(-ENOTCONN);
+        }
+
+        rc = obd_connect(&conn, mds->mds_lmv_obd, &obd->obd_uuid);
+        if (rc) {
+                CERROR("MDS cannot connect to LMV %s (%d)\n",
+                       lmv_name, rc);
+                mds->mds_lmv_obd = ERR_PTR(rc);
+                RETURN(rc);
+        }
+        mds->mds_lmv_exp = class_conn2export(&conn);
+        if (mds->mds_lmv_exp == NULL)
+                CERROR("can't get export!\n");
+
+        rc = obd_register_observer(mds->mds_lmv_obd, obd);
+        if (rc) {
+                CERROR("MDS cannot register as observer of LMV %s (%d)\n",
+                       lmv_name, rc);
+                GOTO(err_discon, rc);
+        }
+
+        /* retrieve size of EA */
+        rc = obd_get_info(mds->mds_lmv_exp, strlen("mdsize"), "mdsize", 
+                          &valsize, &mdsize);
+        if (rc) 
+                GOTO(err_reg, rc);
+        if (mdsize > mds->mds_max_mdsize)
+                mds->mds_max_mdsize = mdsize;
+
+        /* find our number in LMV cluster */
+        rc = obd_get_info(mds->mds_lmv_exp, strlen("mdsnum"), "mdsnum", 
+                          &valsize, &mdsize);
+        if (rc) 
+                GOTO(err_reg, rc);
+        mds->mds_num = mdsize;
+
+	RETURN(0);
+
+err_reg:
+        RETURN(rc);
+
+err_discon:
+        /* FIXME: cleanups here! */
+        obd_disconnect(mds->mds_lmv_exp, 0);
+        mds->mds_lmv_exp = NULL;
+        mds->mds_lmv_obd = ERR_PTR(rc);
+        RETURN(rc);
+}
+
+int mds_lmv_postsetup(struct obd_device *obd)
+{
+        struct mds_obd *mds = &obd->u.mds;
+        ENTRY;
+        if (mds->mds_lmv_exp)
+                obd_init_ea_size(mds->mds_lmv_exp, mds->mds_max_mdsize, 0);
+        RETURN(0);
+}
+
+int mds_lmv_disconnect(struct obd_device *obd, int flags)
+{
+        struct mds_obd *mds = &obd->u.mds;
+        int rc = 0;
+        ENTRY;
+
+        if (!IS_ERR(mds->mds_lmv_obd) && mds->mds_lmv_exp != NULL) {
+
+                obd_register_observer(mds->mds_lmv_obd, NULL);
+
+                rc = obd_disconnect(mds->mds_lmv_exp, flags);
+                /* if obd_disconnect fails (probably because the
+                 * export was disconnected by class_disconnect_exports)
+                 * then we just need to drop our ref. */
+                if (rc != 0)
+                        class_export_put(mds->mds_lmv_exp);
+                mds->mds_lmv_exp = NULL;
+                mds->mds_lmv_obd = NULL;
+        }
+
+        RETURN(rc);
+}
+
+
+int mds_get_lmv_attr(struct obd_device *obd, struct inode *inode,
+			struct mea **mea, int *mea_size)
+{
+        struct mds_obd *mds = &obd->u.mds;
+	int rc;
+        ENTRY;
+
+	if (!mds->mds_lmv_obd)
+		RETURN(0);
+
+	/* first calculate mea size */
+        *mea_size = obd_alloc_diskmd(mds->mds_lmv_exp,
+                                     (struct lov_mds_md **) mea);
+	/* FIXME: error handling here */
+	LASSERT(*mea != NULL);
+
+	down(&inode->i_sem);
+	rc = fsfilt_get_md(obd, inode, *mea, *mea_size);
+	up(&inode->i_sem);
+	/* FIXME: error handling here */
+	if (rc <= 0) {
+		OBD_FREE(*mea, *mea_size);
+		*mea = NULL;
+                *mea_size = 0;
+	}
+        if (rc > 0)
+                rc = 0;
+	RETURN(rc);
+}
+
+struct dir_entry {
+        __u16   namelen;
+        __u16   mds;
+        __u32   ino;
+        __u32   generation;
+        char    name[0];
+};
+
+#define DIR_PAD			4
+#define DIR_ROUND		(DIR_PAD - 1)
+#define DIR_REC_LEN(name_len)	(((name_len) + 12 + DIR_ROUND) & ~DIR_ROUND)
+
+/* this struct holds dir entries for particular MDS to be flushed */
+struct dir_cache {
+        struct list_head list;
+        void *cur;
+        int free;
+        int cached;
+        struct obdo oa;
+        struct brw_page brwc;
+};
+
+struct dirsplit_control {
+        struct obd_device *obd;
+        struct inode *dir;
+        struct dentry *dentry;
+        struct mea *mea;
+        struct dir_cache *cache;
+};
+
+static int dc_new_page_to_cache(struct dir_cache * dirc)
+{
+        struct page *page;
+
+        if (!list_empty(&dirc->list) && dirc->free > sizeof(__u16)) {
+                /* current page became full, mark the end */
+                struct dir_entry *de = dirc->cur;
+                de->namelen = 0;
+        }
+
+        page = alloc_page(GFP_KERNEL);
+        if (page == NULL)
+                return -ENOMEM;
+        list_add_tail(&page->list, &dirc->list);
+        dirc->cur = page_address(page);
+        dirc->free = PAGE_SIZE;
+        return 0;
+}
+
+static int retrieve_generation_numbers(struct dirsplit_control *dc, void *buf)
+{
+        struct dir_entry *de;
+        struct dentry *dentry;
+        char * end;
+        
+        end = buf + PAGE_SIZE;
+        de = (struct dir_entry *) buf;
+        while ((char *) de < end && de->namelen) {
+                LASSERT(de->namelen <= 255);
+                /* lookup an inode */
+                dentry = ll_lookup_one_len(de->name, dc->dentry, de->namelen);
+                if (IS_ERR(dentry)) {
+                        CERROR("can't lookup '%*s'/%u in %lu: %d\n",
+                                (int) de->namelen, de->name,
+                                (unsigned) de->namelen,
+                                (unsigned long) dc->dentry->d_inode->i_ino,
+                                (int) PTR_ERR(dentry));
+                }
+                LASSERT(!IS_ERR(dentry));
+                LASSERT(dentry->d_inode != NULL);
+                de->generation = dentry->d_inode->i_generation;
+                l_dput(dentry);
+                de = (struct dir_entry *)
+                        ((char *) de + DIR_REC_LEN(de->namelen));
+        }
+        return 0;
+}
+
+static int flush_buffer_onto_mds(struct dirsplit_control *dc, int mdsnum)
+{
+        struct mds_obd *mds = &dc->obd->u.mds;
+        struct dir_cache *ca;
+        struct list_head *cur, *tmp;
+        ENTRY; 
+        ca = dc->cache + mdsnum;
+
+        if (ca->free > sizeof(__u16)) {
+                /* current page became full, mark the end */
+                struct dir_entry *de = ca->cur;
+                de->namelen = 0;
+        }
+
+        list_for_each_safe(cur, tmp, &ca->list) {
+                struct page *page;
+
+                page = list_entry(cur, struct page, list);
+                LASSERT(page != NULL);
+
+                retrieve_generation_numbers(dc, page_address(page));
+
+                ca->brwc.pg = page;
+                ca->brwc.off = 0;
+                ca->brwc.count = PAGE_SIZE;
+                ca->brwc.flag = 0;
+                ca->oa.o_mds = mdsnum;
+                obd_brw(OBD_BRW_WRITE, mds->mds_lmv_exp, &ca->oa,
+                                (struct lov_stripe_md *) dc->mea,
+                                1, &ca->brwc, NULL);
+
+                list_del(&page->list);
+                __free_page(page);
+        }
+        RETURN(0);
+}
+
+static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
+		   ino_t ino, unsigned int d_type)
+{
+        struct dirsplit_control *dc = __buf;
+        struct mds_obd *mds = &dc->obd->u.mds;
+        struct dir_cache *ca;
+        struct dir_entry *de;
+        int newmds;
+        char *n;
+        ENTRY;
+
+        if (name[0] == '.' && (namlen == 1 ||
+                                (namlen == 2 && name[1] == '.'))) {
+                /* skip special entries */
+                RETURN(0);
+        }
+
+        LASSERT(dc != NULL);
+        newmds = mea_name2idx(dc->mea, (char *) name, namlen);
+
+        if (newmds == mds->mds_num) {
+                /* this entry remains on the current MDS, skip moving */
+                RETURN(0);
+        }
+        
+        OBD_ALLOC(n, namlen + 1);
+        memcpy(n, name, namlen);
+        n[namlen] = (char) 0;
+        
+        OBD_FREE(n, namlen + 1);
+
+        /* check for space in buffer for new entry */
+        ca = dc->cache + newmds;
+        if (DIR_REC_LEN(namlen) > ca->free) {
+                int err = dc_new_page_to_cache(ca);
+                LASSERT(err == 0);
+        }
+        
+        /* insert found entry into buffer to be flushed later */
+        /* NOTE: we'll fill generations number later, because we
+         * it's stored in inode, thus we need to lookup an entry,
+         * but directory is locked for readdir(), so we delay this */
+        de = ca->cur;
+        de->ino = ino;
+        de->mds = d_type;
+        de->namelen = namlen;
+        memcpy(de->name, name, namlen);
+        ca->cur += DIR_REC_LEN(namlen);
+        ca->free -= DIR_REC_LEN(namlen);
+        ca->cached++;
+
+        RETURN(0);
+}
+
+int scan_and_distribute(struct obd_device *obd, struct dentry *dentry,
+                                struct mea *mea)
+{
+        struct inode *dir = dentry->d_inode;
+        struct dirsplit_control dc;
+        struct file * file;
+        int err, i, nlen;
+        char *file_name;
+
+        nlen = strlen("__iopen__/") + 10 + 1;
+        OBD_ALLOC(file_name, nlen);
+        if (!file_name)
+                RETURN(-ENOMEM);
+        i = sprintf(file_name, "__iopen__/%u",
+                        (unsigned) dentry->d_inode->i_ino);
+
+        file = filp_open(file_name, O_RDONLY, 0);
+        if (IS_ERR(file)) {
+                CERROR("can't open directory %s: %d\n",
+                                file_name, (int) PTR_ERR(file));
+                OBD_FREE(file_name, nlen);
+                RETURN(PTR_ERR(file));
+        }
+
+        memset(&dc, 0, sizeof(dc));
+        dc.obd = obd;
+        dc.dir = dir;
+        dc.dentry = dentry;
+        dc.mea = mea;
+        OBD_ALLOC(dc.cache, sizeof(struct dir_cache) * mea->mea_count);
+        LASSERT(dc.cache != NULL);
+        for (i = 0; i < mea->mea_count; i++) {
+                INIT_LIST_HEAD(&dc.cache[i].list);
+                dc.cache[i].free = 0;
+                dc.cache[i].cached = 0;
+        }
+
+        err = vfs_readdir(file, filldir, &dc);
+        
+        filp_close(file, 0);
+
+        for (i = 0; i < mea->mea_count; i++) {
+                if (dc.cache[i].cached)
+                        flush_buffer_onto_mds(&dc, i);
+        }
+
+        OBD_FREE(dc.cache, sizeof(struct dir_cache) * mea->mea_count);
+        OBD_FREE(file_name, nlen);
+
+        return 0;
+}
+
+#define MAX_DIR_SIZE    (32 * 1024)
+
+/*
+ * must not be called on already splitted directories
+ */
+int mds_try_to_split_dir(struct obd_device *obd,
+                         struct dentry *dentry, struct mea **mea, int nstripes)
+{
+        ldlm_policy_data_t policy = { .l_inodebits = {MDS_INODELOCK_UPDATE}};
+        struct ldlm_res_id res_id = { .name = {0} };
+        struct inode *dir = dentry->d_inode;
+        struct mds_obd *mds = &obd->u.mds;
+        struct lustre_handle lockh;
+        struct mea *tmea = NULL;
+        struct obdo *oa = NULL;
+	int rc, flags = 0;
+	int mea_size = 0;
+	void *handle;
+	ENTRY;
+
+	/* clustered MD ? */
+	if (!mds->mds_lmv_obd)
+		RETURN(0);
+
+        /* don't split root directory */
+        if (dentry->d_inode->i_ino == mds->mds_rootfid.id)
+                RETURN(0);
+
+#if 0
+        if (dir->i_size < MAX_DIR_SIZE)
+                RETURN(0);
+#endif
+
+        /* check is directory marked non-splittable */
+        if (mea && *mea)
+                RETURN(0);
+
+        CDEBUG(D_OTHER, "%s: split directory %lu/%lu (mea 0x%p)\n",
+               obd->obd_name, dir->i_ino,
+               (unsigned long) dir->i_generation, mea);
+
+        if (mea == NULL)
+                mea = &tmea;
+        mea_size = obd_size_diskmd(mds->mds_lmv_exp, NULL);
+
+        /* FIXME: Actually we may only want to allocate enough space for
+           necessary amount of stripes, but on the other hand with this approach
+           of allocating maximal possible amount of MDS slots, it would be
+           easier to split the dir over more MDSes */
+        rc = obd_alloc_diskmd(mds->mds_lmv_exp, mea);
+        if (!(*mea))
+                RETURN(-ENOMEM);
+        (*mea)->mea_count = nstripes;
+        
+        /* convert lock on the dir in order tox
+         * invalidate client's attributes -bzzz */
+        res_id.name[0] = dir->i_ino;
+        res_id.name[1] = dir->i_generation;
+        rc = ldlm_cli_enqueue(NULL, NULL, obd->obd_namespace, res_id,
+                              LDLM_IBITS, &policy, LCK_PW, &flags,
+                              mds_blocking_ast, ldlm_completion_ast, NULL, NULL,
+                              NULL, 0, NULL, &lockh);
+        if (rc != ELDLM_OK) {
+                CERROR("error: rc = %d\n", rc);
+        }
+
+	/* 1) create directory objects on slave MDS'es */
+	/* FIXME: should this be OBD method? */
+        oa = obdo_alloc();
+        /* FIXME: error handling here */
+        LASSERT(oa != NULL);
+	oa->o_id = dir->i_ino;
+	oa->o_generation = dir->i_generation;
+	obdo_from_inode(oa, dir, OBD_MD_FLTYPE | OBD_MD_FLATIME |
+			OBD_MD_FLMTIME | OBD_MD_FLCTIME |
+                        OBD_MD_FLUID | OBD_MD_FLGID);
+        oa->o_gr = FILTER_GROUP_FIRST_MDS + mds->mds_num;
+        oa->o_valid |= OBD_MD_FLFLAGS | OBD_MD_FLGROUP;
+        oa->o_mode = dir->i_mode;
+        CDEBUG(D_OTHER, "%s: create subdirs with mode %o, uid %u, gid %u\n",
+                        obd->obd_name, dir->i_mode, dir->i_uid, dir->i_gid);
+                        
+        rc = obd_create(mds->mds_lmv_exp, oa,
+                        (struct lov_stripe_md **) mea, NULL);
+        /* FIXME: error handling here */
+	LASSERT(rc == 0);
+        CDEBUG(D_OTHER, "%d dirobjects created\n",
+               (int) (*mea)->mea_count);
+
+	/* 2) update dir attribute */
+        down(&dir->i_sem);
+        handle = fsfilt_start(obd, dir, FSFILT_OP_SETATTR, NULL);
+        LASSERT(!IS_ERR(handle));
+	rc = fsfilt_set_md(obd, dir, handle, *mea, mea_size);
+        LASSERT(rc == 0);
+        fsfilt_commit(obd, dir, handle, 0);
+        LASSERT(rc == 0);
+	up(&dir->i_sem);
+	obdo_free(oa);
+
+        ldlm_lock_decref(&lockh, LCK_PW);
+
+	/* 3) read through the dir and distribute it over objects */
+        scan_and_distribute(obd, dentry, *mea);
+
+	if (mea == &tmea)
+                obd_free_diskmd(mds->mds_lmv_exp,
+                                (struct lov_mds_md **) mea);
+	RETURN(1);
+}
+
+static int filter_start_page_write(struct inode *inode,
+                                   struct niobuf_local *lnb)
+{
+        struct page *page = alloc_pages(GFP_HIGHUSER, 0);
+        if (page == NULL) {
+                CERROR("no memory for a temp page\n");
+                RETURN(lnb->rc = -ENOMEM);
+        }
+        POISON_PAGE(page, 0xf1);
+        page->index = lnb->offset >> PAGE_SHIFT;
+        lnb->page = page;
+
+        return 0;
+}
+
+struct dentry *filter_fid2dentry(struct obd_device *obd,
+                                 struct dentry *dir_dentry,
+                                 obd_gr group, obd_id id);
+void f_dput(struct dentry *dentry);
+
+int mds_preprw(int cmd, struct obd_export *exp, struct obdo *oa,
+                int objcount, struct obd_ioobj *obj,
+                int niocount, struct niobuf_remote *nb,
+                struct niobuf_local *res,
+                struct obd_trans_info *oti)
+{
+        struct mds_obd *mds = &exp->exp_obd->u.mds;
+        struct niobuf_remote *rnb;
+        struct niobuf_local *lnb = NULL;
+        int rc = 0, i, tot_bytes = 0;
+        unsigned long now = jiffies;
+        struct dentry *dentry;
+        struct ll_fid fid;
+        ENTRY;
+        LASSERT(objcount == 1);
+        LASSERT(obj->ioo_bufcnt > 0);
+
+        memset(res, 0, niocount * sizeof(*res));
+
+        fid.id = obj->ioo_id;
+        fid.generation = obj->ioo_gr;
+        dentry = mds_fid2dentry(mds, &fid, NULL);
+        LASSERT(!IS_ERR(dentry));
+
+        if (dentry->d_inode == NULL) {
+                CERROR("trying to BRW to non-existent file "LPU64"\n",
+                       obj->ioo_id);
+                f_dput(dentry);
+                GOTO(cleanup, rc = -ENOENT);
+        }
+
+        if (time_after(jiffies, now + 15 * HZ))
+                CERROR("slow preprw_write setup %lus\n", (jiffies - now) / HZ);
+        else
+                CDEBUG(D_INFO, "preprw_write setup: %lu jiffies\n",
+                       (jiffies - now));
+
+        for (i = 0, rnb = nb, lnb = res; i < obj->ioo_bufcnt;
+             i++, lnb++, rnb++) {
+                lnb->dentry = dentry;
+                lnb->offset = rnb->offset;
+                lnb->len    = rnb->len;
+                lnb->flags  = rnb->flags;
+
+                rc = filter_start_page_write(dentry->d_inode, lnb);
+                if (rc) {
+                        CDEBUG(rc == -ENOSPC ? D_INODE : D_ERROR, "page err %u@"
+                               LPU64" %u/%u %p: rc %d\n", lnb->len, lnb->offset,
+                               i, obj->ioo_bufcnt, dentry, rc);
+                        while (lnb-- > res)
+                                __free_pages(lnb->page, 0);
+                        f_dput(dentry);
+                        GOTO(cleanup, rc);
+                }
+                tot_bytes += lnb->len;
+        }
+
+        if (time_after(jiffies, now + 15 * HZ))
+                CERROR("slow start_page_write %lus\n", (jiffies - now) / HZ);
+        else
+                CDEBUG(D_INFO, "start_page_write: %lu jiffies\n",
+                       (jiffies - now));
+
+        EXIT;
+cleanup:
+        return rc;
+}
+
+int mds_commitrw(int cmd, struct obd_export *exp, struct obdo *oa,
+                 int objcount, struct obd_ioobj *obj, int niocount,
+                 struct niobuf_local *res, struct obd_trans_info *oti,
+                 int retcode)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct niobuf_local *lnb;
+        struct inode *inode = NULL;
+        int rc = 0, i, cleanup_phase = 0, err, entries = 0;
+        ENTRY;
+
+        LASSERT(objcount == 1);
+        LASSERT(current->journal_info == NULL);
+
+        cleanup_phase = 1;
+        inode = res->dentry->d_inode;
+
+        for (i = 0, lnb = res; i < obj->ioo_bufcnt; i++, lnb++) {
+                char *end, *buf;
+                struct dir_entry *de;
+
+                buf = kmap(lnb->page);
+                LASSERT(buf != NULL);
+                end = buf + lnb->len;
+                de = (struct dir_entry *) buf;
+                while ((char *) de < end && de->namelen) {
+                        err = fsfilt_add_dir_entry(obd, res->dentry, de->name,
+                                                   de->namelen, de->ino,
+                                                   de->generation, de->mds);
+                        /* FIXME: remove entries from the original dir */
+#warning "removing entries from the original dir"
+                        LASSERT(err == 0);
+                        de = (struct dir_entry *)
+                                ((char *) de + DIR_REC_LEN(de->namelen));
+                        entries++;
+                }
+                kunmap(buf);
+        }
+
+        for (i = 0, lnb = res; i < obj->ioo_bufcnt; i++, lnb++)
+                __free_page(lnb->page);
+        f_dput(res->dentry);
+
+        RETURN(rc);
+}
+
diff --git a/lustre/mds/mds_log.c b/lustre/mds/mds_log.c
index 905ee6f..1a626f6 100644
--- a/lustre/mds/mds_log.c
+++ b/lustre/mds/mds_log.c
@@ -37,9 +37,9 @@
 
 #include "mds_internal.h"
 
-static int mds_llog_origin_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec,
-                               void *buf, struct llog_cookie *logcookies,
-                               int numcookies, void *data)
+static int mds_llog_origin_add(struct llog_ctxt *ctxt,
+                        struct llog_rec_hdr *rec, struct lov_stripe_md *lsm,
+                        struct llog_cookie *logcookies, int numcookies)
 {
         struct obd_device *obd = ctxt->loc_obd;
         struct obd_device *lov_obd = obd->u.mds.mds_osc_obd;
@@ -47,14 +47,15 @@ static int mds_llog_origin_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec,
         int rc;
         ENTRY;
 
-        lctxt = llog_get_context(lov_obd, ctxt->loc_idx);
-        rc = llog_add(lctxt, rec, buf, logcookies, numcookies, data);
+        lctxt = llog_get_context(&lov_obd->obd_llogs, ctxt->loc_idx);
+        rc = llog_add(lctxt, rec, lsm, logcookies, numcookies);
         RETURN(rc);
 }
 
 static int mds_llog_origin_connect(struct llog_ctxt *ctxt, int count,
                                    struct llog_logid *logid,
-                                   struct llog_gen *gen, struct obd_uuid *uuid)
+                                   struct llog_gen *gen,
+                                   struct obd_uuid *uuid)
 {
         struct obd_device *obd = ctxt->loc_obd;
         struct obd_device *lov_obd = obd->u.mds.mds_osc_obd;
@@ -62,14 +63,13 @@ static int mds_llog_origin_connect(struct llog_ctxt *ctxt, int count,
         int rc;
         ENTRY;
 
-        lctxt = llog_get_context(lov_obd, ctxt->loc_idx);
+        lctxt = llog_get_context(&lov_obd->obd_llogs, ctxt->loc_idx);
         rc = llog_connect(lctxt, count, logid, gen, uuid);
         RETURN(rc);
 }
 
-static int mds_llog_repl_cancel(struct llog_ctxt *ctxt, int count, 
-                                struct llog_cookie *cookies, int flags,
-                                void *data)
+static int mds_llog_repl_cancel(struct llog_ctxt *ctxt, struct lov_stripe_md *lsm,
+                          int count, struct llog_cookie *cookies, int flags)
 {
         struct obd_device *obd = ctxt->loc_obd;
         struct obd_device *lov_obd = obd->u.mds.mds_osc_obd;
@@ -77,8 +77,8 @@ static int mds_llog_repl_cancel(struct llog_ctxt *ctxt, int count,
         int rc;
         ENTRY;
 
-        lctxt = llog_get_context(lov_obd, ctxt->loc_idx);
-        rc = llog_cancel(lctxt, count, cookies, flags, data);
+        lctxt = llog_get_context(&lov_obd->obd_llogs, ctxt->loc_idx);
+        rc = llog_cancel(lctxt, lsm, count, cookies,flags);
         RETURN(rc);
 }
 
@@ -100,9 +100,9 @@ int mds_log_op_unlink(struct obd_device *obd, struct inode *inode,
         if (rc < 0)
                 RETURN(rc);
 
-        ctxt = llog_get_context(obd, LLOG_UNLINK_ORIG_CTXT);
-        rc = llog_add(ctxt, NULL, NULL, logcookies,
-                      cookies_size / sizeof(struct llog_cookie), lsm);
+        ctxt = llog_get_context(&obd->obd_llogs, LLOG_UNLINK_ORIG_CTXT);
+        rc = llog_add(ctxt, NULL, lsm, logcookies,
+                      cookies_size / sizeof(struct llog_cookie));
 
         obd_free_memmd(mds->mds_osc_exp, &lsm);
 
@@ -115,48 +115,51 @@ static struct llog_operations mds_unlink_orig_logops = {
 };
 
 static struct llog_operations mds_size_repl_logops = {
-        lop_cancel:     mds_llog_repl_cancel,
+        lop_cancel:     mds_llog_repl_cancel
 };
 
-int mds_llog_init(struct obd_device *obd, struct obd_device *tgt,
-                  int count, struct llog_catid *logid)
+int mds_llog_init(struct obd_device *obd, struct obd_llogs *llogs,
+                  struct obd_device *tgt, int count, struct llog_catid *logid)
 {
         struct obd_device *lov_obd = obd->u.mds.mds_osc_obd;
         int rc;
         ENTRY;
 
-        rc = obd_llog_setup(obd, LLOG_UNLINK_ORIG_CTXT, tgt, 0, NULL,
-                            &mds_unlink_orig_logops);
+        rc = llog_setup(obd, llogs, LLOG_UNLINK_ORIG_CTXT, tgt, 0, NULL,
+                        &mds_unlink_orig_logops);
         if (rc)
                 RETURN(rc);
 
-        rc = obd_llog_setup(obd, LLOG_SIZE_REPL_CTXT, tgt, 0, NULL,
-                            &mds_size_repl_logops);
+        rc = llog_setup(obd, llogs, LLOG_SIZE_REPL_CTXT, tgt, 0, NULL,
+                        &mds_size_repl_logops);
         if (rc)
                 RETURN(rc);
 
-        rc = obd_llog_init(lov_obd, tgt, count, logid);
+        rc = obd_llog_init(lov_obd, &lov_obd->obd_llogs, tgt, count, logid);
         if (rc)
                 CERROR("error lov_llog_init\n");
 
         RETURN(rc);
 }
 
-int mds_llog_finish(struct obd_device *obd, int count)
+int mds_llog_finish(struct obd_device *obd, struct obd_llogs *llogs, int count)
 {
         struct obd_device *lov_obd = obd->u.mds.mds_osc_obd;
+        struct llog_ctxt *ctxt;
         int rc;
         ENTRY;
 
-        rc = obd_llog_cleanup(llog_get_context(obd, LLOG_UNLINK_ORIG_CTXT));
+        ctxt = llog_get_context(llogs, LLOG_UNLINK_ORIG_CTXT);
+        rc = llog_cleanup(ctxt);
         if (rc)
                 RETURN(rc);
 
-        rc = obd_llog_cleanup(llog_get_context(obd, LLOG_SIZE_REPL_CTXT));
+        ctxt = llog_get_context(llogs, LLOG_SIZE_REPL_CTXT);
+        rc = llog_cleanup(ctxt);
         if (rc)
                 RETURN(rc);
 
-        rc = obd_llog_finish(lov_obd, count);
+        rc = obd_llog_finish(lov_obd, &lov_obd->obd_llogs, count);
         if (rc)
                 CERROR("error lov_llog_finish\n");
 
diff --git a/lustre/mds/mds_lov.c b/lustre/mds/mds_lov.c
index 4a8a531..4dd05a3 100644
--- a/lustre/mds/mds_lov.c
+++ b/lustre/mds/mds_lov.c
@@ -131,7 +131,8 @@ static int mds_lov_clearorphans(struct mds_obd *mds, struct obd_uuid *ost_uuid)
          * missing objects below this ID, they will be created.  If it finds
          * objects above this ID, they will be removed. */
         memset(&oa, 0, sizeof(oa));
-        oa.o_valid = OBD_MD_FLFLAGS;
+        oa.o_gr = FILTER_GROUP_FIRST_MDS + mds->mds_num;
+        oa.o_valid = OBD_MD_FLFLAGS | OBD_MD_FLGROUP;
         oa.o_flags = OBD_FL_DELORPHAN;
         if (ost_uuid != NULL) {
                 memcpy(&oa.o_inline, ost_uuid, sizeof(*ost_uuid));
@@ -180,9 +181,8 @@ int mds_lov_connect(struct obd_device *obd, char * lov_name)
 {
         struct mds_obd *mds = &obd->u.mds;
         struct lustre_handle conn = {0,};
-        char name[32] = "CATLIST";
-        int valsize;
-        int rc, i;
+        int valsize, rc, i;
+        __u32 group;
         ENTRY;
 
         if (IS_ERR(mds->mds_osc_obd))
@@ -221,7 +221,9 @@ int mds_lov_connect(struct obd_device *obd, char * lov_name)
         if (rc)
                 GOTO(err_reg, rc);
 
-        mds->mds_max_mdsize = lov_mds_md_size(mds->mds_lov_desc.ld_tgt_count);
+        i = lov_mds_md_size(mds->mds_lov_desc.ld_tgt_count);
+        if (i > mds->mds_max_mdsize)
+                mds->mds_max_mdsize = i;
         mds->mds_max_cookiesize = mds->mds_lov_desc.ld_tgt_count*
                 sizeof(struct llog_cookie);
         mds->mds_has_lov_desc = 1;
@@ -231,15 +233,18 @@ int mds_lov_connect(struct obd_device *obd, char * lov_name)
                 GOTO(err_reg, rc);
         }
 
-        rc = obd_llog_cat_initialize(obd, mds->mds_lov_desc.ld_tgt_count, name);
+        rc = llog_cat_initialize(obd, &obd->obd_llogs,
+                                 mds->mds_lov_desc.ld_tgt_count);
         if (rc) {
                 CERROR("failed to initialize catalog %d\n", rc);
                 GOTO(err_reg, rc);
         }
 
         /* FIXME before set info call is made, we must initialize logging */
+        group = FILTER_GROUP_FIRST_MDS + mds->mds_num;
+        valsize = sizeof(group);
         rc = obd_set_info(mds->mds_osc_exp, strlen("mds_conn"), "mds_conn",
-                          0, NULL);
+                          valsize, &group);
         if (rc)
                 GOTO(err_reg, rc);
 
@@ -267,9 +272,10 @@ int mds_lov_connect(struct obd_device *obd, char * lov_name)
          * it can use the obd_recovering flag to determine when the
          * the OBD is full available. */
         if (!obd->obd_recovering) {
-                rc = llog_connect(llog_get_context(obd, LLOG_UNLINK_ORIG_CTXT),
-                                  obd->u.mds.mds_lov_desc.ld_tgt_count, NULL,
-                                  NULL, NULL);
+                struct llog_ctxt *ctxt;
+                ctxt = llog_get_context(&obd->obd_llogs, LLOG_UNLINK_ORIG_CTXT);
+                rc = llog_connect(ctxt, obd->u.mds.mds_lov_desc.ld_tgt_count,
+                                  NULL, NULL, NULL);
                 if (rc != 0)
                         CERROR("faild at llog_origin_connect: %d\n", rc);
 
@@ -285,7 +291,8 @@ int mds_lov_connect(struct obd_device *obd, char * lov_name)
 
 err_llog:
         /* cleanup all llogging subsystems */
-        rc = obd_llog_finish(obd, mds->mds_lov_desc.ld_tgt_count);
+        rc = obd_llog_finish(obd, &obd->obd_llogs,
+                             mds->mds_lov_desc.ld_tgt_count);
         if (rc)
                 CERROR("failed to cleanup llogging subsystems\n");
 err_reg:
@@ -305,7 +312,8 @@ int mds_lov_disconnect(struct obd_device *obd, int flags)
 
         if (!IS_ERR(mds->mds_osc_obd) && mds->mds_osc_exp != NULL) {
                 /* cleanup all llogging subsystems */
-                rc = obd_llog_finish(obd, mds->mds_lov_desc.ld_tgt_count);
+                rc = obd_llog_finish(obd, &obd->obd_llogs,
+                                     mds->mds_lov_desc.ld_tgt_count);
                 if (rc)
                         CERROR("failed to cleanup llogging subsystems\n");
 
@@ -331,7 +339,8 @@ int mds_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
         struct obd_device *obd = exp->exp_obd;
         struct mds_obd *mds = &obd->u.mds;
         struct obd_ioctl_data *data = karg;
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
+        struct llog_ctxt *ctxt;
         int rc = 0;
 
         switch (cmd) {
@@ -340,15 +349,15 @@ int mds_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                 if (mds->mds_cfg_llh)
                         RETURN(-EBUSY);
 
-                push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
-                rc = llog_create(llog_get_context(obd, LLOG_CONFIG_ORIG_CTXT),
-                                 &mds->mds_cfg_llh, NULL, name);
+                push_ctxt(&saved, &obd->obd_ctxt, NULL);
+                ctxt = llog_get_context(&obd->obd_llogs, LLOG_CONFIG_ORIG_CTXT);
+                rc = llog_create(ctxt, &mds->mds_cfg_llh, NULL, name);
                 if (rc == 0)
                         llog_init_handle(mds->mds_cfg_llh, LLOG_F_IS_PLAIN,
                                          &cfg_uuid);
                 else
                         mds->mds_cfg_llh = NULL;
-                pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+                pop_ctxt(&saved, &obd->obd_ctxt, NULL);
 
                 RETURN(rc);
         }
@@ -357,9 +366,9 @@ int mds_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                 if (!mds->mds_cfg_llh)
                         RETURN(-EBADF);
 
-                push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+                push_ctxt(&saved, &obd->obd_ctxt, NULL);
                 rc = llog_close(mds->mds_cfg_llh);
-                pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+                pop_ctxt(&saved, &obd->obd_ctxt, NULL);
 
                 mds->mds_cfg_llh = NULL;
                 RETURN(rc);
@@ -369,19 +378,19 @@ int mds_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                 char *name = data->ioc_inlbuf1;
                 if (mds->mds_cfg_llh)
                         RETURN(-EBUSY);
-                                                                                                                             
-                push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
-                rc = llog_create(llog_get_context(obd, LLOG_CONFIG_ORIG_CTXT),
-                                 &mds->mds_cfg_llh, NULL, name);
+
+                push_ctxt(&saved, &obd->obd_ctxt, NULL);
+                ctxt = llog_get_context(&obd->obd_llogs, LLOG_CONFIG_ORIG_CTXT);
+                rc = llog_create(ctxt, &mds->mds_cfg_llh, NULL, name);
                 if (rc == 0) {
                         llog_init_handle(mds->mds_cfg_llh, LLOG_F_IS_PLAIN,
                                          NULL);
-                                                                                                                             
+
                         rc = llog_destroy(mds->mds_cfg_llh);
                         llog_free_handle(mds->mds_cfg_llh);
                 }
-                pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
-                                                                                                                             
+                pop_ctxt(&saved, &obd->obd_ctxt, NULL);
+
                 mds->mds_cfg_llh = NULL;
                 RETURN(rc);
         }
@@ -412,10 +421,10 @@ int mds_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                         RETURN(rc);
                 }
 
-                push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+                push_ctxt(&saved, &obd->obd_ctxt, NULL);
                 rc = llog_write_rec(mds->mds_cfg_llh, &rec, NULL, 0,
                                     cfg_buf, -1);
-                pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+                pop_ctxt(&saved, &obd->obd_ctxt, NULL);
 
                 OBD_FREE(cfg_buf, data->ioc_plen1);
                 RETURN(rc);
@@ -423,10 +432,10 @@ int mds_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
 
         case OBD_IOC_PARSE: {
                 struct llog_ctxt *ctxt =
-                        llog_get_context(obd, LLOG_CONFIG_ORIG_CTXT);
-                push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+                        llog_get_context(&obd->obd_llogs, LLOG_CONFIG_ORIG_CTXT);
+                push_ctxt(&saved, &obd->obd_ctxt, NULL);
                 rc = class_config_parse_llog(ctxt, data->ioc_inlbuf1, NULL);
-                pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+                pop_ctxt(&saved, &obd->obd_ctxt, NULL);
                 if (rc)
                         RETURN(rc);
 
@@ -435,10 +444,10 @@ int mds_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
 
         case OBD_IOC_DUMP_LOG: {
                 struct llog_ctxt *ctxt =
-                        llog_get_context(obd, LLOG_CONFIG_ORIG_CTXT);
-                push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+                        llog_get_context(&obd->obd_llogs, LLOG_CONFIG_ORIG_CTXT);
+                push_ctxt(&saved, &obd->obd_ctxt, NULL);
                 rc = class_config_dump_llog(ctxt, data->ioc_inlbuf1, NULL);
-                pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+                pop_ctxt(&saved, &obd->obd_ctxt, NULL);
                 if (rc)
                         RETURN(rc);
 
@@ -462,7 +471,7 @@ int mds_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
 
         case OBD_IOC_CATLOGLIST: {
                 int count = mds->mds_lov_desc.ld_tgt_count;
-                rc = llog_catalog_list(obd, count, data);
+                rc = llog_catlog_list(obd, count, data);
                 RETURN(rc);
 
         }
@@ -470,18 +479,18 @@ int mds_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
         case OBD_IOC_LLOG_CANCEL:
         case OBD_IOC_LLOG_REMOVE: {
                 struct llog_ctxt *ctxt =
-                        llog_get_context(obd, LLOG_CONFIG_ORIG_CTXT);
-                char name[32] = "CATLIST";
+                        llog_get_context(&obd->obd_llogs, LLOG_CONFIG_ORIG_CTXT);
                 int rc2;
 
-                obd_llog_finish(obd, mds->mds_lov_desc.ld_tgt_count);
-                push_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
+                obd_llog_finish(obd, &obd->obd_llogs,
+                                mds->mds_lov_desc.ld_tgt_count);
+                push_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_ctxt, NULL);
                 rc = llog_ioctl(ctxt, cmd, data);
-                pop_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
-                obd_llog_cat_initialize(obd, mds->mds_lov_desc.ld_tgt_count,
-                                        name);
-                rc2 = obd_set_info(mds->mds_osc_exp, strlen("mds_conn"),
-                                   "mds_conn", 0, NULL);
+                pop_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_ctxt, NULL);
+                llog_cat_initialize(obd, &obd->obd_llogs,
+                                    mds->mds_lov_desc.ld_tgt_count);
+                rc2 = obd_set_info(mds->mds_osc_exp, strlen("mds_conn"), "mds_conn",
+                          0, NULL);
                 if (!rc)
                         rc = rc2;
                 RETURN(rc);
@@ -489,11 +498,11 @@ int mds_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
         case OBD_IOC_LLOG_INFO:
         case OBD_IOC_LLOG_PRINT: {
                 struct llog_ctxt *ctxt =
-                        llog_get_context(obd, LLOG_CONFIG_ORIG_CTXT);
+                        llog_get_context(&obd->obd_llogs, LLOG_CONFIG_ORIG_CTXT);
 
-                push_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
+                push_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_ctxt, NULL);
                 rc = llog_ioctl(ctxt, cmd, data);
-                pop_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
+                pop_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_ctxt, NULL);
 
                 RETURN(rc);
         }
@@ -529,15 +538,18 @@ int mds_notify(struct obd_device *obd, struct obd_device *watched, int active)
                 CWARN("MDS %s: in recovery, not resetting orphans on %s\n",
                       obd->obd_name, uuid->uuid);
         } else {
-                LASSERT(llog_get_context(obd, LLOG_UNLINK_ORIG_CTXT) != NULL);
+                struct llog_ctxt *ctxt;
+
+                ctxt = llog_get_context(&obd->obd_llogs, LLOG_UNLINK_ORIG_CTXT);
+                LASSERT(ctxt != NULL);
 
-                rc = obd_set_info(obd->u.mds.mds_osc_exp, strlen("mds_conn"),
-                                  "mds_conn", 0, uuid);
+                rc = obd_set_info(obd->u.mds.mds_osc_exp, strlen("mds_conn"), "mds_conn",
+                                  0, uuid);
                 if (rc != 0)
                         RETURN(rc);
 
-                rc = llog_connect(llog_get_context(obd, LLOG_UNLINK_ORIG_CTXT),
-                                  obd->u.mds.mds_lov_desc.ld_tgt_count,
+                ctxt = llog_get_context(&obd->obd_llogs, LLOG_UNLINK_ORIG_CTXT);
+                rc = llog_connect(ctxt, obd->u.mds.mds_lov_desc.ld_tgt_count,
                                   NULL, NULL, uuid);
                 if (rc != 0) {
                         CERROR("faild at llog_origin_connect: %d\n", rc);
diff --git a/lustre/mds/mds_open.c b/lustre/mds/mds_open.c
index ee7a50b..1a95d04 100644
--- a/lustre/mds/mds_open.c
+++ b/lustre/mds/mds_open.c
@@ -304,15 +304,13 @@ static void mds_objids_from_lmm(obd_id *ids, struct lov_mds_md *lmm,
 static int mds_create_objects(struct ptlrpc_request *req, int offset,
                               struct mds_update_record *rec,
                               struct mds_obd *mds, struct obd_device *obd,
-                              struct dentry *dchild, void **handle, 
-                              obd_id **ids)
+                              struct inode *inode, void **handle, obd_id **ids)
 {
         struct obdo *oa;
         struct obd_trans_info oti = { 0 };
         struct mds_body *body;
         struct lov_stripe_md *lsm = NULL;
         struct lov_mds_md *lmm = NULL;
-        struct inode *inode = dchild->d_inode;
         void *lmm_buf;
         int rc, lmm_bufsize, lmm_size;
         ENTRY;
@@ -333,6 +331,14 @@ static int mds_create_objects(struct ptlrpc_request *req, int offset,
                 RETURN(-ENOMEM);
         oti.oti_objid = *ids;
 
+        if (*handle == NULL)
+                *handle = fsfilt_start(obd, inode, FSFILT_OP_CREATE, NULL);
+        if (IS_ERR(*handle)) {
+                rc = PTR_ERR(*handle);
+                *handle = NULL;
+                GOTO(out_ids, rc);
+        }
+
         /* replay case */
         if(lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY) {
                 LASSERT (rec->ur_fid2->id);
@@ -341,14 +347,6 @@ static int mds_create_objects(struct ptlrpc_request *req, int offset,
                 lmm = rec->ur_eadata;
                 LASSERT(lmm);
 
-                if (*handle == NULL)
-                        *handle = fsfilt_start(obd,inode,FSFILT_OP_CREATE,NULL);
-                if (IS_ERR(*handle)) {
-                        rc = PTR_ERR(*handle);
-                        *handle = NULL;
-                        GOTO(out_ids, rc);
-                }
-
                 mds_objids_from_lmm(*ids, lmm, &mds->mds_lov_desc);
 
                 lmm_buf = lustre_msg_buf(req->rq_repmsg, offset, 0);
@@ -362,6 +360,7 @@ static int mds_create_objects(struct ptlrpc_request *req, int offset,
                 RETURN(0);
         }
 
+        
         if (OBD_FAIL_CHECK_ONCE(OBD_FAIL_MDS_ALLOC_OBDO))
                 GOTO(out_ids, rc = -ENOMEM);
 
@@ -370,40 +369,27 @@ static int mds_create_objects(struct ptlrpc_request *req, int offset,
                 GOTO(out_ids, rc = -ENOMEM);
         oa->o_mode = S_IFREG | 0600;
         oa->o_id = inode->i_ino;
+        oa->o_gr = FILTER_GROUP_FIRST_MDS + mds->mds_num;
         oa->o_generation = inode->i_generation;
         oa->o_uid = 0; /* must have 0 uid / gid on OST */
         oa->o_gid = 0;
         oa->o_valid = OBD_MD_FLID | OBD_MD_FLGENER | OBD_MD_FLTYPE |
-                OBD_MD_FLMODE | OBD_MD_FLUID | OBD_MD_FLGID;
+                OBD_MD_FLMODE | OBD_MD_FLUID | OBD_MD_FLGID | OBD_MD_FLGROUP;
         oa->o_size = 0;
 
         obdo_from_inode(oa, inode, OBD_MD_FLTYPE|OBD_MD_FLATIME|OBD_MD_FLMTIME|
                         OBD_MD_FLCTIME);
 
         if (!(rec->ur_flags & MDS_OPEN_HAS_OBJS)) {
-                /* check if things like lfs setstripe are sending us the ea */
+                /* check if things like lstripe/lfs stripe are sending us the ea */
                 if (rec->ur_flags & MDS_OPEN_HAS_EA) {
-                        rc = obd_iocontrol(OBD_IOC_LOV_SETSTRIPE,
+                        rc = obd_iocontrol(OBD_IOC_LOV_SETSTRIPE, 
                                            mds->mds_osc_exp,
                                            0, &lsm, rec->ur_eadata);
                         if (rc)
                                 GOTO(out_oa, rc);
-                } else {
-                        OBD_ALLOC(lmm, mds->mds_max_mdsize);
-                        if (lmm == NULL)
-                                GOTO(out_oa, rc = -ENOMEM);
-
-                        lmm_size = mds->mds_max_mdsize;
-                        rc = mds_get_md(obd, dchild->d_parent->d_inode,
-                                        lmm, &lmm_size, 1);
-                        if (rc > 0)
-                                rc = obd_iocontrol(OBD_IOC_LOV_SETSTRIPE,
-                                                   mds->mds_osc_exp,
-                                                   0, &lsm, lmm);
-                        OBD_FREE(lmm, mds->mds_max_mdsize);
-                        if (rc)
-                                GOTO(out_oa, rc);
                 }
+                LASSERT(oa->o_gr >= FILTER_GROUP_FIRST_MDS);
                 rc = obd_create(mds->mds_osc_exp, oa, &lsm, &oti);
                 if (rc) {
                         int level = D_ERROR;
@@ -426,6 +412,7 @@ static int mds_create_objects(struct ptlrpc_request *req, int offset,
                         GOTO(out_oa, rc);
                 }
                 lsm->lsm_object_id = oa->o_id;
+                lsm->lsm_object_gr = oa->o_gr;
         }
         if (inode->i_size) {
                 oa->o_size = inode->i_size;
@@ -454,15 +441,6 @@ static int mds_create_objects(struct ptlrpc_request *req, int offset,
         LASSERT(rc >= 0);
         lmm_size = rc;
         body->eadatasize = rc;
-
-        if (*handle == NULL)
-                *handle = fsfilt_start(obd, inode, FSFILT_OP_CREATE, NULL);
-        if (IS_ERR(*handle)) {
-                rc = PTR_ERR(*handle);
-                *handle = NULL;
-                GOTO(out_ids, rc);
-        }
-
         rc = fsfilt_set_md(obd, inode, *handle, lmm, lmm_size);
         lmm_buf = lustre_msg_buf(req->rq_repmsg, offset, 0);
         lmm_bufsize = req->rq_repmsg->buflens[offset];
@@ -534,8 +512,8 @@ static void reconstruct_open(struct mds_update_record *rec, int offset,
 
         /* get lock (write for O_CREAT, read otherwise) */
 
-        mds_pack_inode2fid(&body->fid1, child->d_inode);
-        mds_pack_inode2body(body, child->d_inode);
+        mds_pack_inode2fid(obd, &body->fid1, child->d_inode);
+        mds_pack_inode2body(obd, body, child->d_inode);
         if (S_ISREG(child->d_inode->i_mode)) {
                 rc = mds_pack_md(obd, req->rq_repmsg, 2, body,
                                  child->d_inode, 1);
@@ -583,7 +561,7 @@ static void reconstruct_open(struct mds_update_record *rec, int offset,
                 mfd = NULL;
         }
 
-        /* #warning "XXX fixme" bug 2991 */
+#warning "XXX fixme"
         /* Here it used to LASSERT(mfd) if exp_outstanding_reply != NULL.
          * Now that exp_outstanding_reply is a list, it's just using mfd != NULL
          * to detect a re-open */
@@ -597,10 +575,6 @@ static void reconstruct_open(struct mds_update_record *rec, int offset,
                         GOTO(out_dput, req->rq_status = -ENOMEM);
                 }
                 put_child = 0;
-        } else {
-                body->handle.cookie = mfd->mfd_handle.h_cookie;
-                CDEBUG(D_INODE, "resend mfd %p, cookie "LPX64"\n", mfd,
-                       mfd->mfd_handle.h_cookie);
         }
 
  out_dput:
@@ -633,13 +607,15 @@ static int mds_finish_open(struct ptlrpc_request *req, struct dentry *dchild,
         struct obd_device *obd = req->rq_export->exp_obd;
         struct mds_file_data *mfd = NULL;
         obd_id *ids = NULL; /* object IDs created */
+        unsigned mode;
         int rc = 0;
         ENTRY;
 
         /* atomically create objects if necessary */
         down(&dchild->d_inode->i_sem);
-        if (S_ISREG(dchild->d_inode->i_mode) &&
-            !(body->valid & OBD_MD_FLEASIZE)) {
+        mode = dchild->d_inode->i_mode;
+        if ((S_ISREG(mode) || S_ISDIR(mode)) &&
+                        !(body->valid & OBD_MD_FLEASIZE)) {
                 rc = mds_pack_md(obd, req->rq_repmsg, 2, body,
                                  dchild->d_inode, 0);
                 if (rc) {
@@ -650,7 +626,7 @@ static int mds_finish_open(struct ptlrpc_request *req, struct dentry *dchild,
         if (rec != NULL) {
                 /* no EA: create objects */
                 rc = mds_create_objects(req, 2, rec, mds, obd,
-                                        dchild, handle, &ids);
+                                        dchild->d_inode, handle, &ids);
                 if (rc) {
                         CERROR("mds_create_objects: rc = %d\n", rc);
                         up(&dchild->d_inode->i_sem);
@@ -706,8 +682,8 @@ static int mds_open_by_fid(struct ptlrpc_request *req, struct ll_fid *fid,
         if (dchild->d_inode != NULL) {
                 up(&pending_dir->i_sem);
                 mds_inode_set_orphan(dchild->d_inode);
-                mds_pack_inode2fid(&body->fid1, dchild->d_inode);
-                mds_pack_inode2body(body, dchild->d_inode);
+                mds_pack_inode2fid(req2obd(req), &body->fid1, dchild->d_inode);
+                mds_pack_inode2body(req2obd(req), body, dchild->d_inode);
                 intent_set_disposition(rep, DISP_LOOKUP_EXECD);
                 intent_set_disposition(rep, DISP_LOOKUP_POS);
                 CWARN("Orphan %s found and opened in PENDING directory\n",
@@ -723,8 +699,8 @@ static int mds_open_by_fid(struct ptlrpc_request *req, struct ll_fid *fid,
         if (IS_ERR(dchild))
                 RETURN(PTR_ERR(dchild));
 
-        mds_pack_inode2fid(&body->fid1, dchild->d_inode);
-        mds_pack_inode2body(body, dchild->d_inode);
+        mds_pack_inode2fid(req2obd(req), &body->fid1, dchild->d_inode);
+        mds_pack_inode2body(req2obd(req), body, dchild->d_inode);
         intent_set_disposition(rep, DISP_LOOKUP_EXECD);
         intent_set_disposition(rep, DISP_LOOKUP_POS);
 
@@ -742,7 +718,7 @@ int mds_pin(struct ptlrpc_request *req)
 {
         struct obd_device *obd = req->rq_export->exp_obd;
         struct mds_body *request_body, *reply_body;
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
         int rc, size = sizeof(*reply_body);
         ENTRY;
 
@@ -753,10 +729,10 @@ int mds_pin(struct ptlrpc_request *req)
                 RETURN(rc);
         reply_body = lustre_msg_buf(req->rq_repmsg, 0, sizeof(*reply_body));
 
-        push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+        push_ctxt(&saved, &obd->obd_ctxt, NULL);
         rc = mds_open_by_fid(req, &request_body->fid1, reply_body,
                              request_body->flags, NULL, NULL);
-        pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+        pop_ctxt(&saved, &obd->obd_ctxt, NULL);
 
         RETURN(rc);
 }
@@ -797,13 +773,18 @@ int mds_open(struct mds_update_record *rec, int offset,
         struct mds_body *body = NULL;
         struct dentry *dchild = NULL, *dparent = NULL;
         struct mds_export_data *med;
-        struct lustre_handle parent_lockh;
+        struct lustre_handle parent_lockh[2];
         int rc = 0, cleanup_phase = 0, acc_mode, created = 0;
         int parent_mode = LCK_PR;
         void *handle = NULL;
         struct dentry_params dp;
+        struct mea *mea = NULL;
+        int mea_size;
         ENTRY;
 
+        parent_lockh[0].cookie = 0;
+        parent_lockh[1].cookie = 0;
+
         if (offset == 2) { /* intent */
                 rep = lustre_msg_buf(req->rq_repmsg, 0, sizeof (*rep));
                 body = lustre_msg_buf(req->rq_repmsg, 1, sizeof (*body));
@@ -853,8 +834,24 @@ int mds_open(struct mds_update_record *rec, int offset,
                    But we do not know if it exists or not yet */
                 parent_mode = LCK_PW;
         }
+        
+        if (rec->ur_namelen == 1) {
+                /* client (LMV) wants to open the file by fid */
+                CDEBUG(D_OTHER, "OPEN by fid %u/%u/%u\n",
+                                (unsigned) rec->ur_fid1->mds,
+                                (unsigned) rec->ur_fid1->id,
+                                (unsigned) rec->ur_fid1->generation);
+                dchild = mds_fid2dentry(mds, rec->ur_fid1, NULL);
+                if (IS_ERR(dchild)) {
+                        rc = PTR_ERR(dparent);
+                        CERROR("child lookup by a fid error %d\n", rc);
+                        GOTO(cleanup, rc);
+                }
+                goto got_child;
+        }
+        
         dparent = mds_fid2locked_dentry(obd, rec->ur_fid1, NULL, parent_mode,
-                                        &parent_lockh, rec->ur_name,
+                                        parent_lockh, rec->ur_name,
                                         rec->ur_namelen - 1,
                                         MDS_INODELOCK_UPDATE);
         if (IS_ERR(dparent)) {
@@ -866,6 +863,21 @@ int mds_open(struct mds_update_record *rec, int offset,
 
         cleanup_phase = 1; /* parent dentry and lock */
 
+        /* try to retrieve MEA data for this dir */
+        rc = mds_get_lmv_attr(obd, dparent->d_inode, &mea, &mea_size);
+       
+        if (mea != NULL) {
+                /* dir is already splitted, check is requested filename
+                 * should live at this MDS or at another one */
+                int i;
+                i = mea_name2idx(mea, rec->ur_name, rec->ur_namelen - 1);
+                if (mea->mea_master != i) {
+                        CERROR("inapropriate MDS(%d) for %s. should be %d\n",
+                                mea->mea_master, rec->ur_name, i);
+                        GOTO(cleanup, rc = -ESTALE);
+                }
+        }
+
         /* Step 2: Lookup the child */
         dchild = ll_lookup_one_len(rec->ur_name, dparent, rec->ur_namelen - 1);
         if (IS_ERR(dchild)) {
@@ -874,9 +886,45 @@ int mds_open(struct mds_update_record *rec, int offset,
                 GOTO(cleanup, rc);
         }
 
+got_child:
         cleanup_phase = 2; /* child dentry */
 
         intent_set_disposition(rep, DISP_LOOKUP_EXECD);
+
+        if (dchild->d_flags & DCACHE_CROSS_REF) {
+                struct ldlm_res_id res_id = { . name = {0} };
+                ldlm_policy_data_t policy;
+                int flags = 0;
+                CDEBUG(D_OTHER, "cross reference: %lu/%lu/%lu\n",
+                       (unsigned long) dchild->d_mdsnum,
+                       (unsigned long) dchild->d_inum,
+                       (unsigned long) dchild->d_generation);
+                body->valid |= OBD_MD_FLID | OBD_MD_MDS;
+                body->fid1.id = dchild->d_inum;
+                body->fid1.mds = dchild->d_mdsnum;
+                body->fid1.generation = dchild->d_generation;
+                intent_set_disposition(rep, DISP_LOOKUP_POS);
+                res_id.name[0] = dchild->d_inum;
+                res_id.name[1] = dchild->d_generation;
+                policy.l_inodebits.bits = MDS_INODELOCK_LOOKUP;
+                rc = ldlm_cli_enqueue(NULL, NULL, obd->obd_namespace,
+                                      res_id, LDLM_IBITS, &policy,
+                                      LCK_PR, &flags,
+                                      mds_blocking_ast,
+                                      ldlm_completion_ast, NULL, NULL,
+                                      NULL, 0, NULL, child_lockh);
+#ifdef S_PDIROPS
+                if (parent_lockh[1].cookie != 0)
+                        ldlm_lock_decref(parent_lockh + 1, LCK_CW);
+#endif
+                ldlm_lock_decref(parent_lockh, parent_mode);
+                if (mea)
+                        OBD_FREE(mea, mea_size);
+                l_dput(dchild);
+                l_dput(dparent);
+                RETURN(rc);
+        }
+        
         if (dchild->d_inode)
                 intent_set_disposition(rep, DISP_LOOKUP_POS);
         else
@@ -888,6 +936,16 @@ int mds_open(struct mds_update_record *rec, int offset,
                 struct iattr iattr;
                 struct inode *inode;
 
+                if ((rc = mds_try_to_split_dir(obd, dparent, &mea, 0))) {
+                        if (rc > 0) {
+                                /* dir got splitted */
+                                GOTO(cleanup, rc = -ESTALE);
+                        } else {
+                                /* error happened during spitting */
+                                GOTO(cleanup, rc);
+                        }
+                }
+
                 if (!(rec->ur_flags & MDS_OPEN_CREAT)) {
                         /* It's negative and we weren't supposed to create it */
                         GOTO(cleanup, rc = -ENOENT);
@@ -946,16 +1004,13 @@ int mds_open(struct mds_update_record *rec, int offset,
                 if (rc)
                         CERROR("error on parent setattr: rc = %d\n", rc);
 
-                rc = mds_finish_transno(mds, dchild->d_inode, handle, req, 0,
-                                        rep ? rep->lock_policy_res1 : 0);
-                handle = NULL;
-                acc_mode = 0;           /* Don't check for permissions */
+                acc_mode = 0;                  /* Don't check for permissions */
         }
 
         LASSERT(!mds_inode_is_orphan(dchild->d_inode));
 
-        mds_pack_inode2fid(&body->fid1, dchild->d_inode);
-        mds_pack_inode2body(body, dchild->d_inode);
+        mds_pack_inode2fid(obd, &body->fid1, dchild->d_inode);
+        mds_pack_inode2body(obd, body, dchild->d_inode);
 
         if (S_ISREG(dchild->d_inode->i_mode)) {
                 /* Check permissions etc */
@@ -989,34 +1044,49 @@ int mds_open(struct mds_update_record *rec, int offset,
         if ((rec->ur_flags & MDS_OPEN_DIRECTORY) &&
             !S_ISDIR(dchild->d_inode->i_mode))
                 GOTO(cleanup, rc = -ENOTDIR);
-
-        if (S_ISDIR(dchild->d_inode->i_mode)) {
-                if (rec->ur_flags & MDS_OPEN_CREAT ||
-                    rec->ur_flags & FMODE_WRITE) {
+ 
+        if (S_ISDIR(dchild->d_inode->i_mode)) { 
+                if (rec->ur_flags & MDS_OPEN_CREAT || rec->ur_flags & FMODE_WRITE) {
                         /*we are tryying to create or write a exist dir*/
                         GOTO(cleanup, rc = -EISDIR);
                 }
                 if (ll_permission(dchild->d_inode, acc_mode, NULL)) {
-                        intent_set_disposition(rep, DISP_OPEN_OPEN);
                         GOTO(cleanup, rc = -EACCES);
                 }
         }
 
+        if (rc == 0) {
+                struct ldlm_res_id res_id = { . name = {0} };
+                ldlm_policy_data_t policy;
+                int flags = 0;
+                res_id.name[0] = dchild->d_inode->i_ino;
+                res_id.name[1] = dchild->d_inode->i_generation;
+                policy.l_inodebits.bits = MDS_INODELOCK_LOOKUP |
+                                                MDS_INODELOCK_UPDATE;
+                rc = ldlm_cli_enqueue(NULL, NULL, obd->obd_namespace,
+                                      res_id, LDLM_IBITS, &policy,
+                                      LCK_PR, &flags,
+                                      mds_blocking_ast,
+                                      ldlm_completion_ast, NULL, NULL,
+                                      NULL, 0, NULL, child_lockh);
+                if (rc == 0)
+                        cleanup_phase = 3;
+        }
+
         /* Step 5: mds_open it */
         rc = mds_finish_open(req, dchild, body, rec->ur_flags, &handle, rec,
                              rep);
         GOTO(cleanup, rc);
 
  cleanup:
-        if (dchild && dchild->d_inode)
-                rc = mds_finish_transno(mds, dchild->d_inode, handle, req, rc, 
-                                        rep ? rep->lock_policy_res1 : 0);
-        else 
-                rc = mds_finish_transno(mds, !IS_ERR(dparent) ? dparent->d_inode :
-                                        NULL, handle, req, rc, 
-                                        rep ? rep->lock_policy_res1 : 0);
+        rc = mds_finish_transno(mds, dchild ? dchild->d_inode : NULL, handle,
+                                req, rc, rep ? rep->lock_policy_res1 : 0);
+
 
         switch (cleanup_phase) {
+        case 3:
+                if (rc)
+                        ldlm_lock_decref(child_lockh, LCK_PR);
         case 2:
                 if (rc && created) {
                         int err = vfs_unlink(dparent->d_inode, dchild);
@@ -1034,13 +1104,21 @@ int mds_open(struct mds_update_record *rec, int offset,
                         break;
 
                 l_dput(dparent);
+#ifdef S_PDIROPS
+                if (parent_lockh[1].cookie != 0)
+                        ldlm_lock_decref(parent_lockh + 1, LCK_CW);
+#endif
                 if (rc)
-                        ldlm_lock_decref(&parent_lockh, parent_mode);
+                        ldlm_lock_decref(parent_lockh, parent_mode);
                 else
-                        ptlrpc_save_lock (req, &parent_lockh, parent_mode);
+                        ptlrpc_save_lock (req, parent_lockh, parent_mode);
         }
         if (rc == 0)
                 atomic_inc(&mds->mds_open_count);
+        if (mea)
+                OBD_FREE(mea, mea_size);
+        if ((cleanup_phase != 3) && !rc)
+                rc = ENOLCK;
         RETURN(rc);
 }
 
@@ -1065,15 +1143,15 @@ int mds_mfd_close(struct ptlrpc_request *req, struct obd_device *obd,
         void *handle = NULL;
         struct mds_body *request_body = NULL, *reply_body = NULL;
         struct dentry_params dp;
-        struct iattr iattr = { 0 };
+        struct lov_mds_md *lmm;
         ENTRY;
 
-        if (req && req->rq_reqmsg != NULL)
+        if (req != NULL) {
                 request_body = lustre_msg_buf(req->rq_reqmsg, 0,
                                               sizeof(*request_body));
-        if (req && req->rq_repmsg != NULL)
                 reply_body = lustre_msg_buf(req->rq_repmsg, 0,
                                             sizeof(*reply_body));
+        }
 
         fidlen = ll_fid2str(fidname, inode->i_ino, inode->i_generation);
 
@@ -1089,8 +1167,6 @@ int mds_mfd_close(struct ptlrpc_request *req, struct obd_device *obd,
         }
 
         if (last_orphan && unlink_orphan) {
-                struct lov_mds_md *lmm = NULL;
-                int stripe_count = 0;
                 LASSERT(rc == 0); /* mds_put_write_access must have succeeded */
 
                 CDEBUG(D_HA, "destroying orphan object %s\n", fidname);
@@ -1108,22 +1184,20 @@ int mds_mfd_close(struct ptlrpc_request *req, struct obd_device *obd,
                 LASSERT(pending_child->d_inode != NULL);
 
                 cleanup_phase = 2; /* dput(pending_child) when finished */
-                if (req != NULL && req->rq_repmsg != NULL) {
-                        lmm = lustre_msg_buf(req->rq_repmsg, 1, 0);
-                        stripe_count = le32_to_cpu(lmm->lmm_stripe_count);
-                }
-
-                handle = fsfilt_start_log(obd, pending_dir, FSFILT_OP_UNLINK,
-                                          NULL, stripe_count);
+                lmm = lustre_msg_buf(req->rq_repmsg, 1, 0);
+                handle = fsfilt_start_log(obd, pending_dir,
+                                          FSFILT_OP_UNLINK, NULL,
+                                          le32_to_cpu(lmm->lmm_stripe_count));
                 if (IS_ERR(handle)) {
                         rc = PTR_ERR(handle);
                         handle = NULL;
                         GOTO(cleanup, rc);
                 }
 
-                if (req != NULL && req->rq_repmsg != NULL &&
+                if (req != NULL &&
                     (reply_body->valid & OBD_MD_FLEASIZE) &&
-                    mds_log_op_unlink(obd, pending_child->d_inode, lmm,
+                    mds_log_op_unlink(obd, pending_child->d_inode,
+                                      lustre_msg_buf(req->rq_repmsg, 1, 0),
                                       req->rq_repmsg->buflens[1],
                                       lustre_msg_buf(req->rq_repmsg, 2, 0),
                                       req->rq_repmsg->buflens[2]) > 0) {
@@ -1139,64 +1213,32 @@ int mds_mfd_close(struct ptlrpc_request *req, struct obd_device *obd,
                         rc = vfs_unlink(pending_dir, pending_child);
                 if (rc)
                         CERROR("error unlinking orphan %s: rc %d\n",fidname,rc);
-
-                goto out; /* Don't bother updating attrs on unlinked inode */
-        }
-
-        if (request_body != NULL && mfd->mfd_mode & FMODE_WRITE && rc == 0) {
+        } else if (mfd->mfd_mode & FMODE_WRITE && rc == 0) {
                 /* Update the on-disk attributes if this was the last write
                  * close, and all information was provided (i.e., rc == 0)
                  *
                  * XXX this should probably be abstracted with mds_reint_setattr
                  */
-
 #if 0
-                if (request_body->valid & OBD_MD_FLMTIME &&
-                    request_body->mtime > LTIME_S(inode->i_mtime)) {
-                        LTIME_S(iattr.ia_mtime) = request_body->mtime;
-                        iattr.ia_valid |= ATTR_MTIME;
-                }
-                if (request_body->valid & OBD_MD_FLCTIME &&
-                    request_body->ctime > LTIME_S(inode->i_ctime)) {
-                        LTIME_S(iattr.ia_ctime) = request_body->ctime;
-                        iattr.ia_valid |= ATTR_CTIME;
-                }
+                struct iattr iattr;
 
                 /* XXX can't set block count with fsfilt_setattr (!) */
-                if (request_body->valid & OBD_MD_FLSIZE) {
-                        iattr.ia_valid |= ATTR_SIZE;
-                        iattr.ia_size = request_body->size;
-                }
-                /* if (request_body->valid & OBD_MD_FLBLOCKS) {
-                        iattr.ia_valid |= ATTR_BLOCKS;
-                        iattr.ia_blocks = request_body->blocks
-                } */
+                iattr.ia_valid = ATTR_CTIME | ATTR_ATIME |
+                        ATTR_MTIME | ATTR_SIZE;
+                iattr.ia_atime = request_body->atime;
+                iattr.ia_ctime = request_body->ctime;
+                iattr.ia_mtime = request_body->mtime;
+                iattr.ia_size = request_body->size;
+                /* iattr.ia_blocks = request_body->blocks */
 
-#endif
-        }
-        if (request_body != NULL && request_body->valid & OBD_MD_FLATIME) {
-                /* Only start a transaction to write out only the atime if
-                 * it is more out-of-date than the specified limit.  If we
-                 * are already going to write out the atime then do it anyway.
-                 * */
-                if ((request_body->atime >
-                     LTIME_S(inode->i_atime) + MAX_ATIME_DIFF) ||
-                    (iattr.ia_valid != 0 &&
-                     request_body->atime > LTIME_S(inode->i_atime))) {
-                        LTIME_S(iattr.ia_atime) = request_body->atime;
-                        iattr.ia_valid |= ATTR_ATIME;
-                }
-        }
-
-        if (iattr.ia_valid != 0) {
                 handle = fsfilt_start(obd, inode, FSFILT_OP_SETATTR, NULL);
                 if (IS_ERR(handle))
                         GOTO(cleanup, rc = PTR_ERR(handle));
                 rc = fsfilt_setattr(obd, mfd->mfd_dentry, handle, &iattr, 0);
                 if (rc)
                         CERROR("error in setattr(%s): rc %d\n", fidname, rc);
+#endif
         }
-out:
         /* If other clients have this file open for write, rc will be > 0 */
         if (rc > 0)
                 rc = 0;
@@ -1205,7 +1247,7 @@ out:
 
  cleanup:
         atomic_dec(&mds->mds_open_count);
-        if (req != NULL && reply_body != NULL) {
+        if (req) {
                 rc = mds_finish_transno(mds, pending_dir, handle, req, rc, 0);
         } else if (handle) {
                 int err = fsfilt_commit(obd, pending_dir, handle, 0);
@@ -1231,7 +1273,7 @@ int mds_close(struct ptlrpc_request *req)
         struct obd_device *obd = req->rq_export->exp_obd;
         struct mds_body *body;
         struct mds_file_data *mfd;
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
         struct inode *inode;
         int rc, repsize[3] = {sizeof(struct mds_body),
                               obd->u.mds.mds_max_mdsize,
@@ -1269,25 +1311,26 @@ int mds_close(struct ptlrpc_request *req)
                 body = lustre_msg_buf(req->rq_repmsg, 0, sizeof (*body));
                 LASSERT(body != NULL);
 
-                mds_pack_inode2fid(&body->fid1, inode);
-                mds_pack_inode2body(body, inode);
+                mds_pack_inode2fid(obd, &body->fid1, inode);
+                mds_pack_inode2body(obd, body, inode);
                 mds_pack_md(obd, req->rq_repmsg, 1, body, inode, 1);
         }
         spin_lock(&med->med_open_lock);
         list_del(&mfd->mfd_list);
         spin_unlock(&med->med_open_lock);
 
-        push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
-        req->rq_status = mds_mfd_close(req, obd, mfd, 1);
-        pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+        push_ctxt(&saved, &obd->obd_ctxt, NULL);
+        req->rq_status = mds_mfd_close(rc ? NULL : req, obd, mfd, 1);
+        pop_ctxt(&saved, &obd->obd_ctxt, NULL);
 
-        mds_mfd_put(mfd);
         if (OBD_FAIL_CHECK(OBD_FAIL_MDS_CLOSE_PACK)) {
                 CERROR("test case OBD_FAIL_MDS_CLOSE_PACK\n");
                 req->rq_status = -ENOMEM;
+                mds_mfd_put(mfd);
                 RETURN(-ENOMEM);
         }
 
+        mds_mfd_put(mfd);
         RETURN(0);
 }
 
diff --git a/lustre/mds/mds_reint.c b/lustre/mds/mds_reint.c
index 5ff4beb..9f7dd3a 100644
--- a/lustre/mds/mds_reint.c
+++ b/lustre/mds/mds_reint.c
@@ -38,7 +38,6 @@
 #include <linux/lustre_idl.h>
 #include <linux/lustre_mds.h>
 #include <linux/lustre_dlm.h>
-#include <linux/lustre_log.h>
 #include <linux/lustre_fsfilt.h>
 
 #include "mds_internal.h"
@@ -79,10 +78,11 @@ static void mds_cancel_cookies_cb(struct obd_device *obd, __u64 transno,
                        rc);
         } else {
                 ///* XXX 0 normally, SENDNOW for debug */);
-                ctxt = llog_get_context(obd,mlcd->mlcd_cookies[0].lgc_subsys+1);
-                rc = llog_cancel(ctxt, mlcd->mlcd_cookielen /
-                                 sizeof(*mlcd->mlcd_cookies),
-                                 mlcd->mlcd_cookies, OBD_LLOG_FL_SENDNOW, lsm);
+                ctxt = llog_get_context(&obd->obd_llogs,
+                                        mlcd->mlcd_cookies[0].lgc_subsys + 1);
+                rc = llog_cancel(ctxt, lsm, mlcd->mlcd_cookielen /
+                                                sizeof(*mlcd->mlcd_cookies),
+                                 mlcd->mlcd_cookies, OBD_LLOG_FL_SENDNOW);
                 if (rc)
                         CERROR("error cancelling %d log cookies: rc %d\n",
                                (int)(mlcd->mlcd_cookielen /
@@ -147,8 +147,8 @@ int mds_finish_transno(struct mds_obd *mds, struct inode *inode, void *handle,
         mcd->mcd_last_result = cpu_to_le32(rc);
         mcd->mcd_last_data = cpu_to_le32(op_data);
 
-        fsfilt_add_journal_cb(req->rq_export->exp_obd, mds->mds_sb,
-                              transno, handle, mds_commit_cb, NULL);
+        fsfilt_add_journal_cb(req->rq_export->exp_obd, transno, handle,
+                              mds_commit_cb, NULL);
         err = fsfilt_write_record(obd, mds->mds_rcvd_filp, mcd, sizeof(*mcd),
                                   &off, 0);
 
@@ -279,7 +279,6 @@ void mds_steal_ack_locks(struct ptlrpc_request *req)
         struct ptlrpc_reply_state *oldrep;
         struct ptlrpc_service     *svc;
         unsigned long              flags;
-        char                       str[PTL_NALFMT_SIZE];
         int                        i;
 
         /* CAVEAT EMPTOR: spinlock order */
@@ -301,13 +300,13 @@ void mds_steal_ack_locks(struct ptlrpc_request *req)
                 list_del_init (&oldrep->rs_exp_list);
 
                 CWARN("Stealing %d locks from rs %p x"LPD64".t"LPD64
-                      " o%d NID %s\n",
-                      oldrep->rs_nlocks, oldrep,
+                      " o%d NID"LPX64"\n",
+                      oldrep->rs_nlocks, oldrep, 
                       oldrep->rs_xid, oldrep->rs_transno, oldrep->rs_msg.opc,
-                      ptlrpc_peernid2str(&exp->exp_connection->c_peer, str));
+                      exp->exp_connection->c_peer.peer_nid);
 
                 for (i = 0; i < oldrep->rs_nlocks; i++)
-                        ptlrpc_save_lock(req,
+                        ptlrpc_save_lock(req, 
                                          &oldrep->rs_locks[i],
                                          oldrep->rs_modes[i]);
                 oldrep->rs_nlocks = 0;
@@ -349,8 +348,8 @@ static void reconstruct_reint_setattr(struct mds_update_record *rec,
         }
 
         body = lustre_msg_buf(req->rq_repmsg, 0, sizeof (*body));
-        mds_pack_inode2fid(&body->fid1, de->d_inode);
-        mds_pack_inode2body(body, de->d_inode);
+        mds_pack_inode2fid(req2obd(req), &body->fid1, de->d_inode);
+        mds_pack_inode2body(req2obd(req), body, de->d_inode);
 
         /* Don't return OST-specific attributes if we didn't just set them */
         if (rec->ur_iattr.ia_valid & ATTR_SIZE)
@@ -377,7 +376,7 @@ static int mds_reint_setattr(struct mds_update_record *rec, int offset,
         struct mds_body *body;
         struct dentry *de;
         struct inode *inode = NULL;
-        struct lustre_handle lockh;
+        struct lustre_handle lockh[2];
         void *handle = NULL;
         struct mds_logcancel_data *mlcd = NULL;
         int rc = 0, cleanup_phase = 0, err, locked = 0;
@@ -399,7 +398,7 @@ static int mds_reint_setattr(struct mds_update_record *rec, int offset,
                 if (rec->ur_iattr.ia_valid & (ATTR_MODE|ATTR_UID|ATTR_GID) )
                         lockpart |= MDS_INODELOCK_LOOKUP;
                 de = mds_fid2locked_dentry(obd, rec->ur_fid1, NULL, LCK_PW,
-                                           &lockh, NULL, 0, lockpart);
+                                           lockh, NULL, 0, lockpart);
                 if (IS_ERR(de))
                         GOTO(cleanup, rc = PTR_ERR(de));
                 locked = 1;
@@ -409,8 +408,7 @@ static int mds_reint_setattr(struct mds_update_record *rec, int offset,
 
         inode = de->d_inode;
         LASSERT(inode);
-        if ((S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode)) &&
-            rec->ur_eadata != NULL)
+        if (S_ISREG(inode->i_mode) && rec->ur_eadata != NULL)
                 down(&inode->i_sem);
 
         OBD_FAIL_WRITE(OBD_FAIL_MDS_REINT_SETATTR_WRITE, inode->i_sb);
@@ -433,30 +431,14 @@ static int mds_reint_setattr(struct mds_update_record *rec, int offset,
         else                                            /* setattr */
                 rc = fsfilt_setattr(obd, de, handle, &rec->ur_iattr, 0);
 
-        if (rc == 0 && (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode)) &&
-            rec->ur_eadata != NULL) {
-                struct lov_stripe_md *lsm = NULL;
-
-                rc = ll_permission(inode, MAY_WRITE, NULL);
-                if (rc < 0)
-                        GOTO(cleanup, rc);
-
-                rc = obd_iocontrol(OBD_IOC_LOV_SETSTRIPE,
-                                   mds->mds_osc_exp, 0, &lsm, rec->ur_eadata);
-                if (rc)
-                        GOTO(cleanup, rc);
-
-                obd_free_memmd(mds->mds_osc_exp, &lsm);
-
-                rc = fsfilt_set_md(obd, inode, handle, rec->ur_eadata,
-                                   rec->ur_eadatalen);
-                if (rc)
-                        GOTO(cleanup, rc);
+        if (rc == 0 && S_ISREG(inode->i_mode) && rec->ur_eadata != NULL) {
+                rc = fsfilt_set_md(obd, inode, handle,
+                                   rec->ur_eadata, rec->ur_eadatalen);
         }
 
         body = lustre_msg_buf(req->rq_repmsg, 0, sizeof (*body));
-        mds_pack_inode2fid(&body->fid1, inode);
-        mds_pack_inode2body(body, inode);
+        mds_pack_inode2fid(obd, &body->fid1, inode);
+        mds_pack_inode2body(obd, body, inode);
 
         /* Don't return OST-specific attributes if we didn't just set them */
         if (rec->ur_iattr.ia_valid & ATTR_SIZE)
@@ -487,20 +469,23 @@ static int mds_reint_setattr(struct mds_update_record *rec, int offset,
         EXIT;
  cleanup:
         if (mlcd != NULL)
-                fsfilt_add_journal_cb(req->rq_export->exp_obd, mds->mds_sb, 0,
-                                      handle, mds_cancel_cookies_cb, mlcd);
+                fsfilt_add_journal_cb(req->rq_export->exp_obd, 0, handle,
+                                      mds_cancel_cookies_cb, mlcd);
         err = mds_finish_transno(mds, inode, handle, req, rc, 0);
         switch (cleanup_phase) {
         case 1:
-                if ((S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode)) &&
-                    rec->ur_eadata != NULL)
+                if (S_ISREG(inode->i_mode) && rec->ur_eadata != NULL)
                         up(&inode->i_sem);
                 l_dput(de);
                 if (locked) {
+#ifdef S_PDIROPS
+                        if (lockh[1].cookie != 0)
+                                ldlm_lock_decref(lockh + 1, LCK_CW);
+#endif
                         if (rc) {
-                                ldlm_lock_decref(&lockh, LCK_PW);
+                                ldlm_lock_decref(lockh, LCK_PW);
                         } else {
-                                ptlrpc_save_lock (req, &lockh, LCK_PW);
+                                ptlrpc_save_lock (req, lockh, LCK_PW);
                         }
                 }
         case 0:
@@ -533,8 +518,8 @@ static void reconstruct_reint_create(struct mds_update_record *rec, int offset,
         child = ll_lookup_one_len(rec->ur_name, parent, rec->ur_namelen - 1);
         LASSERT(!IS_ERR(child));
         body = lustre_msg_buf(req->rq_repmsg, offset, sizeof (*body));
-        mds_pack_inode2fid(&body->fid1, child->d_inode);
-        mds_pack_inode2body(body, child->d_inode);
+        mds_pack_inode2fid(req2obd(req), &body->fid1, child->d_inode);
+        mds_pack_inode2body(req2obd(req), body, child->d_inode);
         l_dput(parent);
         l_dput(child);
 }
@@ -549,10 +534,12 @@ static int mds_reint_create(struct mds_update_record *rec, int offset,
         struct dentry *dchild = NULL;
         struct inode *dir = NULL;
         void *handle = NULL;
-        struct lustre_handle lockh;
+        struct lustre_handle lockh[2];
         int rc = 0, err, type = rec->ur_mode & S_IFMT, cleanup_phase = 0;
         int created = 0;
         struct dentry_params dp;
+        struct mea *mea = NULL;
+        int mea_size;
         ENTRY;
 
         LASSERT(offset == 0);
@@ -567,7 +554,7 @@ static int mds_reint_create(struct mds_update_record *rec, int offset,
         if (OBD_FAIL_CHECK(OBD_FAIL_MDS_REINT_CREATE))
                 GOTO(cleanup, rc = -ESTALE);
 
-        dparent = mds_fid2locked_dentry(obd, rec->ur_fid1, NULL, LCK_PW, &lockh,
+        dparent = mds_fid2locked_dentry(obd, rec->ur_fid1, NULL, LCK_PW, lockh,
                                         rec->ur_name, rec->ur_namelen - 1,
                                         MDS_INODELOCK_UPDATE);
         if (IS_ERR(dparent)) {
@@ -579,7 +566,21 @@ static int mds_reint_create(struct mds_update_record *rec, int offset,
         dir = dparent->d_inode;
         LASSERT(dir);
 
-        ldlm_lock_dump_handle(D_OTHER, &lockh);
+        ldlm_lock_dump_handle(D_OTHER, lockh);
+
+        /* try to retrieve MEA data for this dir */
+        rc = mds_get_lmv_attr(obd, dparent->d_inode, &mea, &mea_size);
+        if (mea != NULL) {
+                /* dir is already splitted, check is requested filename
+                 * should live at this MDS or at another one */
+                int i;
+                i = mea_name2idx(mea, rec->ur_name, rec->ur_namelen - 1);
+                if (mea->mea_master != i) {
+                        CERROR("inapropriate MDS(%d) for %s. should be %d\n",
+                                mea->mea_master, rec->ur_name, i);
+                        GOTO(cleanup, rc = -ESTALE);
+                }
+        }
 
         dchild = ll_lookup_one_len(rec->ur_name, dparent, rec->ur_namelen - 1);
         if (IS_ERR(dchild)) {
@@ -592,6 +593,18 @@ static int mds_reint_create(struct mds_update_record *rec, int offset,
 
         OBD_FAIL_WRITE(OBD_FAIL_MDS_REINT_CREATE_WRITE, dir->i_sb);
 
+        if (type == S_IFREG || type == S_IFDIR) {
+                if ((rc = mds_try_to_split_dir(obd, dparent, &mea, 0))) {
+                        if (rc > 0) {
+                                /* dir got splitted */
+                                GOTO(cleanup, rc = -ESTALE);
+                        } else {
+                                /* error happened during spitting */
+                                GOTO(cleanup, rc);
+                        }
+                }
+        }
+
         if (dir->i_mode & S_ISGID) {
                 if (S_ISDIR(rec->ur_mode))
                         rec->ur_mode |= S_ISGID;
@@ -611,10 +624,26 @@ static int mds_reint_create(struct mds_update_record *rec, int offset,
                 break;
         }
         case S_IFDIR:{
+                int nstripes = 0;
                 handle = fsfilt_start(obd, dir, FSFILT_OP_MKDIR, NULL);
                 if (IS_ERR(handle))
                         GOTO(cleanup, rc = PTR_ERR(handle));
+
                 rc = vfs_mkdir(dir, dchild, rec->ur_mode);
+
+                if (rec->ur_eadata)
+                        nstripes = *(u16 *)rec->ur_eadata;
+
+#if 1
+                /* this is for current testing yet. after the testing
+                 * directory will split if size reaches some limite -bzzz */
+                if (rc == 0) {
+#else
+                if (rc == 0 && nstripes) {
+#endif
+                        /* FIXME: error handling here */
+                        mds_try_to_split_dir(obd, dchild, NULL, nstripes);
+                }
                 EXIT;
                 break;
         }
@@ -708,8 +737,8 @@ static int mds_reint_create(struct mds_update_record *rec, int offset,
                         CERROR("error on parent setattr: rc = %d\n", rc);
 
                 body = lustre_msg_buf(req->rq_repmsg, offset, sizeof (*body));
-                mds_pack_inode2fid(&body->fid1, inode);
-                mds_pack_inode2body(body, inode);
+                mds_pack_inode2fid(obd, &body->fid1, inode);
+                mds_pack_inode2body(obd, body, inode);
         }
         EXIT;
 
@@ -741,10 +770,14 @@ cleanup:
         case 2: /* child dentry */
                 l_dput(dchild);
         case 1: /* locked parent dentry */
+#ifdef S_PDIROPS
+                if (lockh[1].cookie != 0)
+                        ldlm_lock_decref(lockh + 1, LCK_CW);
+#endif
                 if (rc) {
-                        ldlm_lock_decref(&lockh, LCK_PW);
+                        ldlm_lock_decref(lockh, LCK_PW);
                 } else {
-                        ptlrpc_save_lock (req, &lockh, LCK_PW);
+                        ptlrpc_save_lock (req, lockh, LCK_PW);
                 }
                 l_dput(dparent);
         case 0:
@@ -753,6 +786,8 @@ cleanup:
                 CERROR("invalid cleanup_phase %d\n", cleanup_phase);
                 LBUG();
         }
+        if (mea)
+                OBD_FREE(mea, mea_size);
         req->rq_status = rc;
         return 0;
 }
@@ -981,6 +1016,17 @@ static int mds_verify_child(struct obd_device *obd,
         if (IS_ERR(vchild))
                 GOTO(cleanup, rc = PTR_ERR(vchild));
 
+        if ((vchild->d_flags & DCACHE_CROSS_REF)) {
+                if  (child_res_id->name[0] == vchild->d_inum &&
+                                child_res_id->name[1] == vchild->d_generation) {
+                        if (dchild != NULL)
+                                l_dput(dchild);
+                        *dchildp = vchild;
+                        RETURN(0);
+                }
+                goto changed;
+        }
+
         if (likely((vchild->d_inode == NULL && child_res_id->name[0] == 0) ||
                    (vchild->d_inode != NULL &&
                     child_res_id->name[0] == vchild->d_inode->i_ino &&
@@ -992,6 +1038,7 @@ static int mds_verify_child(struct obd_device *obd,
                 RETURN(0);
         }
 
+changed:
         CDEBUG(D_DLMTRACE, "child inode changed: %p != %p (%lu != "LPU64")\n",
                vchild->d_inode, dchild ? dchild->d_inode : 0,
                vchild->d_inode ? vchild->d_inode->i_ino : 0,
@@ -1004,10 +1051,15 @@ static int mds_verify_child(struct obd_device *obd,
         cleanup_phase = 1; /* parent lock only */
         *dchildp = dchild = vchild;
 
-        if (dchild->d_inode) {
+        if (dchild->d_inode || (dchild->d_flags & DCACHE_CROSS_REF)) {
                 int flags = 0;
-                child_res_id->name[0] = dchild->d_inode->i_ino;
-                child_res_id->name[1] = dchild->d_inode->i_generation;
+                if (dchild->d_inode) {
+                        child_res_id->name[0] = dchild->d_inode->i_ino;
+                        child_res_id->name[1] = dchild->d_inode->i_generation;
+                } else {
+                        child_res_id->name[0] = dchild->d_inum;
+                        child_res_id->name[1] = dchild->d_generation;
+                }
 
                 if (res_gt(parent_res_id, child_res_id, NULL, NULL) ||
                     res_gt(maxres, child_res_id, NULL, NULL)) {
@@ -1063,17 +1115,43 @@ int mds_get_parent_child_locked(struct obd_device *obd, struct mds_obd *mds,
 
         /* Step 1: Lookup parent */
         *dparentp = mds_fid2dentry(mds, fid, NULL);
-        if (IS_ERR(*dparentp)) {
-                rc = PTR_ERR(*dparentp);
-                *dparentp = NULL;
-                RETURN(rc);
-        }
+        if (IS_ERR(*dparentp))
+                RETURN(rc = PTR_ERR(*dparentp));
+        LASSERT((*dparentp)->d_inode);
 
         CDEBUG(D_INODE, "parent ino %lu, name %s\n",
                (*dparentp)->d_inode->i_ino, name);
 
         parent_res_id.name[0] = (*dparentp)->d_inode->i_ino;
         parent_res_id.name[1] = (*dparentp)->d_inode->i_generation;
+#ifdef S_PDIROPS
+        parent_lockh[1].cookie = 0;
+        if (name && IS_PDIROPS((*dparentp)->d_inode)) {
+                /* lock just dir { ino, generation } to flush client cache */
+                if (parent_mode == LCK_PW) {
+                        struct ldlm_res_id res_id = { .name = {0} };
+                        ldlm_policy_data_t policy;
+                        int flags = 0;
+                        res_id.name[0] = (*dparentp)->d_inode->i_ino;
+                        res_id.name[1] = (*dparentp)->d_inode->i_generation;
+                        policy.l_inodebits.bits = MDS_INODELOCK_UPDATE;
+                        rc = ldlm_cli_enqueue(NULL, NULL, obd->obd_namespace,
+                                              res_id, LDLM_IBITS,
+                                              &policy, LCK_CW, &flags,
+                                              mds_blocking_ast,
+                                              ldlm_completion_ast, NULL, NULL,
+                                              NULL, 0, NULL, parent_lockh+1);
+                        if (rc != ELDLM_OK)
+                                RETURN(-ENOLCK);
+                }
+
+                parent_res_id.name[2] = full_name_hash(name, namelen - 1);
+                CDEBUG(D_INFO, "take lock on %lu:%u:"LPX64"\n",
+                       (*dparentp)->d_inode->i_ino, 
+                       (*dparentp)->d_inode->i_generation,
+                       parent_res_id.name[2]);
+        }
+#endif
 
         cleanup_phase = 1; /* parent dentry */
 
@@ -1085,6 +1163,15 @@ int mds_get_parent_child_locked(struct obd_device *obd, struct mds_obd *mds,
                 GOTO(cleanup, rc);
         }
 
+        if ((*dchildp)->d_flags & DCACHE_CROSS_REF) {
+                /* inode lives on another MDS: return * mds/ino/gen
+                 * and LOOKUP lock. drop possible UPDATE lock! */
+                child_policy.l_inodebits.bits &= ~MDS_INODELOCK_UPDATE;
+                child_res_id.name[0] = (*dchildp)->d_inum;
+                child_res_id.name[1] = (*dchildp)->d_generation;
+                goto retry_locks;
+        }
+
         inode = (*dchildp)->d_inode;
         if (inode != NULL)
                 inode = igrab(inode);
@@ -1102,16 +1189,15 @@ retry_locks:
         /* Step 3: Lock parent and child in resource order.  If child doesn't
          *         exist, we still have to lock the parent and re-lookup. */
         rc = enqueue_ordered_locks(obd,&parent_res_id,parent_lockh,parent_mode,
-                                   &parent_policy,
-                                   &child_res_id, child_lockh, child_mode,
-                                   &child_policy);
+                                   &parent_policy, &child_res_id, child_lockh,
+                                   child_mode, &child_policy);
         if (rc)
                 GOTO(cleanup, rc);
 
-        if (!(*dchildp)->d_inode)
-                cleanup_phase = 3; /* parent lock */
-        else
+        if ((*dchildp)->d_inode || ((*dchildp)->d_flags & DCACHE_CROSS_REF))
                 cleanup_phase = 4; /* child lock */
+        else
+                cleanup_phase = 3; /* parent lock */
 
         /* Step 4: Re-lookup child to verify it hasn't changed since locking */
         rc = mds_verify_child(obd, &parent_res_id, parent_lockh, *dparentp,
@@ -1135,6 +1221,10 @@ cleanup:
                 case 2:
                         l_dput(*dchildp);
                 case 1:
+#ifdef S_PDIROPS
+                        if (parent_lockh[1].cookie)
+                                ldlm_lock_decref(parent_lockh + 1, LCK_CW);
+#endif
                         l_dput(*dparentp);
                 default: ;
                 }
@@ -1149,6 +1239,200 @@ void mds_reconstruct_generic(struct ptlrpc_request *req)
         mds_req_from_mcd(req, med->med_mcd);
 }
 
+int mds_create_local_dentry(struct mds_update_record *rec,
+                           struct obd_device *obd)
+{
+        struct mds_obd *mds = &obd->u.mds;
+        struct inode *fids_dir = mds->mds_fids_dir->d_inode;
+        int fidlen = 0, rc, cleanup_phase = 0;
+        struct dentry *new_child = NULL;
+        char *fidname = rec->ur_name;
+        struct dentry *child = NULL;
+        struct lustre_handle lockh;
+        unsigned mode;
+        void *handle;
+        ENTRY;
+
+        down(&fids_dir->i_sem);
+        fidlen = ll_fid2str(fidname, rec->ur_fid1->id, rec->ur_fid1->generation);
+        CDEBUG(D_OTHER, "look for local dentry '%s' for %u/%u\n",
+                        fidname, (unsigned) rec->ur_fid1->id,
+                        (unsigned) rec->ur_fid1->generation);
+
+        new_child = lookup_one_len(fidname, mds->mds_fids_dir, fidlen);
+        up(&fids_dir->i_sem);
+        if (IS_ERR(new_child)) {
+                CERROR("can't lookup %s: %d\n", fidname,
+                                (int) PTR_ERR(new_child));
+                GOTO(cleanup, rc = PTR_ERR(new_child));
+        }
+        cleanup_phase = 1;
+
+        if (new_child->d_inode != NULL) {
+                /* nice. we've already have local dentry! */
+                CERROR("found dentry in FIDS/: %u/%u\n", 
+                       (unsigned) new_child->d_inode->i_ino,
+                       (unsigned) new_child->d_inode->i_generation);
+                rec->ur_fid1->id = fids_dir->i_ino;
+                rec->ur_fid1->generation = fids_dir->i_generation;
+                rec->ur_namelen = fidlen + 1;
+                GOTO(cleanup, rc = 0);
+        }
+
+        /* new, local dentry will be added soon. we need no aliases here */
+        d_drop(new_child);
+
+        child = mds_fid2locked_dentry(obd, rec->ur_fid1, NULL, LCK_EX,
+                                      &lockh, NULL, 0, MDS_INODELOCK_UPDATE);
+        if (IS_ERR(child)) {
+                CERROR("can't get victim\n");
+                GOTO(cleanup, rc = PTR_ERR(child));
+        }
+        cleanup_phase = 2;
+
+        handle = fsfilt_start(obd, fids_dir, FSFILT_OP_LINK, NULL);
+        if (IS_ERR(handle))
+                GOTO(cleanup, rc = PTR_ERR(handle));
+
+        rc = fsfilt_add_dir_entry(obd, mds->mds_fids_dir, fidname, fidlen,
+                                  rec->ur_fid1->id, rec->ur_fid1->generation,
+                                  mds->mds_num);
+        if (rc)
+                CERROR("error linking orphan %lu/%lu to FIDS: rc = %d\n",
+                       (unsigned long) child->d_inode->i_ino,
+                       (unsigned long) child->d_inode->i_generation, rc);
+        else
+                mark_inode_dirty(child->d_inode);
+        fsfilt_commit(obd, fids_dir, handle, 0);
+
+        rec->ur_fid1->id = fids_dir->i_ino;
+        rec->ur_fid1->generation = fids_dir->i_generation;
+        rec->ur_namelen = fidlen + 1;
+
+cleanup:
+        switch(cleanup_phase) {
+                case 2:
+                        ldlm_lock_decref(&lockh, LCK_EX);
+                        dput(child);
+                case 1:
+                        dput(new_child);
+                case 0:
+                       break; 
+        }
+        RETURN(rc);
+}
+
+static int mds_copy_unlink_reply(struct ptlrpc_request *master,
+                                        struct ptlrpc_request *slave)
+{
+        struct lov_mds_md *eadata;
+        void *cookie, *cookie2;
+        struct mds_body *body2;
+        struct mds_body *body;
+        void *ea, *ea2;
+        ENTRY;
+
+        body = lustre_msg_buf(slave->rq_repmsg, 0, sizeof(*body));
+        LASSERT(body != NULL);
+
+        body2 = lustre_msg_buf(master->rq_repmsg, 0, sizeof (*body));
+        LASSERT(body2 != NULL);
+
+        if (!(body->valid & (OBD_MD_FLID | OBD_MD_FLGENER))) {
+                CWARN("empty reply\n");
+                RETURN(0);
+        }
+
+        memcpy(body2, body, sizeof(*body));
+        body2->valid &= ~OBD_MD_FLCOOKIE;
+
+        if (!(body->valid & OBD_MD_FLEASIZE))
+                RETURN(0);
+
+        if (body->eadatasize == 0) {
+                CERROR("OBD_MD_FLEASIZE set but eadatasize zero\n");
+                RETURN(0);
+        }
+
+        LASSERT(master->rq_repmsg->buflens[1] >= body->eadatasize);
+        
+        ea = lustre_msg_buf(slave->rq_repmsg, 1, body->eadatasize);
+        LASSERT(ea != NULL);
+        
+        ea2 = lustre_msg_buf(master->rq_repmsg, 1, body->eadatasize);
+        LASSERT(ea2 != NULL);
+
+        memcpy(ea2, ea, body->eadatasize);
+
+        if (body->valid & OBD_MD_FLCOOKIE) {
+                LASSERT(master->rq_repmsg->buflens[2] >=
+                                slave->rq_repmsg->buflens[2]);
+                cookie = lustre_msg_buf(slave->rq_repmsg, 2,
+                                slave->rq_repmsg->buflens[2]);
+                LASSERT(cookie != NULL);
+
+                cookie2 = lustre_msg_buf(master->rq_repmsg, 2,
+                                master->rq_repmsg->buflens[2]);
+                LASSERT(cookie2 != NULL);
+                memcpy(cookie2, cookie, slave->rq_repmsg->buflens[2]);
+                body2->valid |= OBD_MD_FLCOOKIE;
+        }
+        RETURN(0);
+}
+
+static int mds_reint_unlink_remote(struct mds_update_record *rec, int offset,
+                                   struct ptlrpc_request *req,
+                                   struct lustre_handle *parent_lockh,
+                                   struct dentry *dparent,
+                                   struct lustre_handle *child_lockh,
+                                   struct dentry *dchild)
+{
+        struct mds_obd *mds = mds_req2mds(req);
+        struct mdc_op_data op_data;
+        int rc = 0, cleanup_phase = 0;
+        struct ptlrpc_request *request = NULL;
+        ENTRY;
+
+        LASSERT(offset == 0 || offset == 2);
+
+        DEBUG_REQ(D_INODE, req, "parent ino "LPU64"/%u, child %s",
+                  rec->ur_fid1->id, rec->ur_fid1->generation, rec->ur_name);
+        DEBUG_REQ(D_INODE, req, "unlink %*s (remote inode %u/%u/%u)\n",
+                  rec->ur_namelen - 1, rec->ur_name, (unsigned)dchild->d_mdsnum,
+                  (unsigned) dchild->d_inum, (unsigned) dchild->d_generation);
+
+        /* time to drop i_nlink on remote MDS */ 
+        op_data.fid1.mds = dchild->d_mdsnum;
+        op_data.fid1.id = dchild->d_inum;
+        op_data.fid1.generation = dchild->d_generation;
+        op_data.create_mode = rec->ur_mode;
+        op_data.namelen = 0;
+        op_data.name = NULL;
+        rc = md_unlink(mds->mds_lmv_exp, &op_data, &request);
+        cleanup_phase = 2;
+        if (request) {
+                mds_copy_unlink_reply(req, request);
+                ptlrpc_req_finished(request);
+        }
+        if (rc == 0)
+                rc = fsfilt_del_dir_entry(req->rq_export->exp_obd, dchild);
+        req->rq_status = rc;
+
+#ifdef S_PDIROPS
+        if (parent_lockh[1].cookie != 0)
+                ldlm_lock_decref(parent_lockh + 1, LCK_CW);
+#endif
+        ldlm_lock_decref(child_lockh, LCK_EX);
+        if (rc)
+                ldlm_lock_decref(parent_lockh, LCK_PW);
+        else
+                ptlrpc_save_lock(req, parent_lockh, LCK_PW);
+        l_dput(dchild);
+        l_dput(dparent);
+
+        return 0;
+}
+
 static int mds_reint_unlink(struct mds_update_record *rec, int offset,
                             struct ptlrpc_request *req,
                             struct lustre_handle *lh)
@@ -1158,9 +1442,11 @@ static int mds_reint_unlink(struct mds_update_record *rec, int offset,
         struct obd_device *obd = req->rq_export->exp_obd;
         struct mds_body *body = NULL;
         struct inode *child_inode;
-        struct lustre_handle parent_lockh, child_lockh, child_reuse_lockh;
+        struct lustre_handle parent_lockh[2], child_lockh, child_reuse_lockh;
+        char fidname[LL_FID_NAMELEN];
         void *handle = NULL;
         int rc = 0, log_unlink = 0, cleanup_phase = 0;
+        int unlink_by_fid = 0;
         ENTRY;
 
         LASSERT(offset == 0 || offset == 2);
@@ -1173,8 +1459,15 @@ static int mds_reint_unlink(struct mds_update_record *rec, int offset,
         if (OBD_FAIL_CHECK(OBD_FAIL_MDS_REINT_UNLINK))
                 GOTO(cleanup, rc = -ENOENT);
 
+        if (rec->ur_namelen == 1) {
+                /* this is request to drop i_nlink on local inode */
+                unlink_by_fid = 1;
+                rec->ur_name = fidname;
+                rc = mds_create_local_dentry(rec, obd);
+                LASSERT(rc == 0);
+        }
         rc = mds_get_parent_child_locked(obd, mds, rec->ur_fid1,
-                                         &parent_lockh, &dparent, LCK_PW,
+                                         parent_lockh, &dparent, LCK_PW,
                                          MDS_INODELOCK_UPDATE,
                                          rec->ur_name, rec->ur_namelen,
                                          &child_lockh, &dchild, LCK_EX,
@@ -1182,13 +1475,22 @@ static int mds_reint_unlink(struct mds_update_record *rec, int offset,
         if (rc)
                 GOTO(cleanup, rc);
 
+        if (dchild->d_flags & DCACHE_CROSS_REF) {
+                /* we should have parent lock only here */
+                LASSERT(unlink_by_fid == 0);
+                LASSERT(dchild->d_mdsnum != mds->mds_num);
+                mds_reint_unlink_remote(rec, offset, req, parent_lockh,
+                                        dparent, &child_lockh, dchild);
+                RETURN(0);
+        }
+
         cleanup_phase = 1; /* dchild, dparent, locks */
 
         dget(dchild);
         child_inode = dchild->d_inode;
         if (child_inode == NULL) {
                 CDEBUG(D_INODE, "child doesn't exist (dir %lu, name %s)\n",
-                       dparent->d_inode->i_ino, rec->ur_name);
+                       dparent ? dparent->d_inode->i_ino : 0, rec->ur_name);
                 GOTO(cleanup, rc = -ENOENT);
         }
 
@@ -1218,8 +1520,8 @@ static int mds_reint_unlink(struct mds_update_record *rec, int offset,
          * we make decisions here as to whether to remove the inode */
         if (S_ISREG(child_inode->i_mode) && child_inode->i_nlink == 1 &&
             mds_open_orphan_count(child_inode) == 0) {
-                mds_pack_inode2fid(&body->fid1, child_inode);
-                mds_pack_inode2body(body, child_inode);
+                mds_pack_inode2fid(obd, &body->fid1, child_inode);
+                mds_pack_inode2body(obd, body, child_inode);
                 mds_pack_md(obd, req->rq_repmsg, offset + 1, body,
                             child_inode, 1);
                 if (!(body->valid & OBD_MD_FLEASIZE)) {
@@ -1244,6 +1546,13 @@ static int mds_reint_unlink(struct mds_update_record *rec, int offset,
                         GOTO(cleanup, rc = -EISDIR);
         }
 
+        if (child_inode->i_nlink == (S_ISDIR(child_inode->i_mode) ? 2 : 1) &&
+            mds_open_orphan_count(child_inode) > 0) {
+                rc = mds_open_unlink_rename(rec, obd, dparent, dchild, &handle);
+                cleanup_phase = 4; /* transaction */
+                GOTO(cleanup, rc);
+        }
+
         /* Step 4: Do the unlink: we already verified ur_mode above (bug 72) */
         switch (child_inode->i_mode & S_IFMT) {
         case S_IFDIR:
@@ -1259,6 +1568,7 @@ static int mds_reint_unlink(struct mds_update_record *rec, int offset,
                 rc = vfs_rmdir(dparent->d_inode, dchild);
                 break;
         case S_IFREG: {
+#warning "optimization is possible here: we could drop nlink w/o removing local dentry in FIDS/"
                 struct lov_mds_md *lmm = lustre_msg_buf(req->rq_repmsg,
                                                         offset + 1, 0);
                 handle = fsfilt_start_log(obd, dparent->d_inode,
@@ -1314,14 +1624,6 @@ static int mds_reint_unlink(struct mds_update_record *rec, int offset,
 
         switch(cleanup_phase) {
         case 4:
-                LASSERT(dchild != NULL && dchild->d_inode != NULL);
-                LASSERT(atomic_read(&dchild->d_inode->i_count) > 0);
-                if (rc == 0 && dchild->d_inode->i_nlink == 0 &&
-                                mds_open_orphan_count(dchild->d_inode) > 0) {
-                        /* filesystem is really going to destroy an inode
-                         * we have to delay this till inode is opened -bzzz */
-                        mds_open_unlink_rename(rec, obd, dparent, dchild, NULL);
-                }
                 rc = mds_finish_transno(mds, dparent->d_inode, handle, req,
                                         rc, 0);
                 if (!rc)
@@ -1339,10 +1641,14 @@ static int mds_reint_unlink(struct mds_update_record *rec, int offset,
         case 2: /* child lock */
                 ldlm_lock_decref(&child_lockh, LCK_EX);
         case 1: /* child and parent dentry, parent lock */
+#ifdef S_PDIROPS
+                if (parent_lockh[1].cookie != 0)
+                        ldlm_lock_decref(parent_lockh + 1, LCK_CW);
+#endif
                 if (rc)
-                        ldlm_lock_decref(&parent_lockh, LCK_PW);
+                        ldlm_lock_decref(parent_lockh, LCK_PW);
                 else
-                        ptlrpc_save_lock(req, &parent_lockh, LCK_PW);
+                        ptlrpc_save_lock(req, parent_lockh, LCK_PW);
                 l_dput(dchild);
                 l_dput(dchild);
                 l_dput(dparent);
@@ -1356,6 +1662,171 @@ static int mds_reint_unlink(struct mds_update_record *rec, int offset,
         return 0;
 }
 
+/*
+ * to service requests from remote MDS to increment i_nlink
+ */
+static int mds_reint_link_acquire(struct mds_update_record *rec,
+                                 int offset, struct ptlrpc_request *req,
+                                 struct lustre_handle *lh)
+{
+        struct obd_device *obd = req->rq_export->exp_obd;
+        struct ldlm_res_id src_res_id = { .name = {0} };
+        struct lustre_handle *handle = NULL, src_lockh;
+        struct mds_obd *mds = mds_req2mds(req);
+        int rc = 0, cleanup_phase = 0;
+        struct dentry *de_src = NULL;
+        ldlm_policy_data_t policy;
+        int flags = 0;
+        ENTRY;
+
+        DEBUG_REQ(D_INODE, req, "%s: request to acquire i_nlinks %u/%u/%u\n",
+                  obd->obd_name, (unsigned) rec->ur_fid1->mds,
+                  (unsigned) rec->ur_fid1->id,
+                  (unsigned) rec->ur_fid1->generation);
+
+        /* Step 1: Lookup the source inode and target directory by FID */
+        de_src = mds_fid2dentry(mds, rec->ur_fid1, NULL);
+        if (IS_ERR(de_src))
+                GOTO(cleanup, rc = PTR_ERR(de_src));
+        cleanup_phase = 1; /* source dentry */
+
+        src_res_id.name[0] = de_src->d_inode->i_ino;
+        src_res_id.name[1] = de_src->d_inode->i_generation;
+        policy.l_inodebits.bits = MDS_INODELOCK_UPDATE;
+
+        rc = ldlm_cli_enqueue(NULL, NULL, obd->obd_namespace,
+                        src_res_id, LDLM_IBITS, &policy,
+                        LCK_EX, &flags, mds_blocking_ast,
+                        ldlm_completion_ast, NULL, NULL,
+                        NULL, 0, NULL, &src_lockh);
+        if (rc != ELDLM_OK)
+                GOTO(cleanup, rc = -ENOLCK);
+        cleanup_phase = 2; /* lock */
+
+        OBD_FAIL_WRITE(OBD_FAIL_MDS_REINT_LINK_WRITE, de_src->d_inode->i_sb);
+
+        handle = fsfilt_start(obd, de_src->d_inode, FSFILT_OP_LINK, NULL);
+        if (IS_ERR(handle)) {
+                rc = PTR_ERR(handle);
+                GOTO(cleanup, rc);
+        }
+        de_src->d_inode->i_nlink++;
+        mark_inode_dirty(de_src->d_inode);
+
+cleanup:
+        rc = mds_finish_transno(mds, de_src ? de_src->d_inode : NULL,
+                                        handle, req, rc, 0);
+        EXIT;
+        switch (cleanup_phase) {
+                case 2:
+                        if (rc)
+                                ldlm_lock_decref(&src_lockh, LCK_EX);
+                        else
+                                ptlrpc_save_lock(req, &src_lockh, LCK_EX);
+                case 1:
+                        l_dput(de_src);
+                case 0:
+                        break;
+                default:
+                        CERROR("invalid cleanup_phase %d\n", cleanup_phase);
+                        LBUG();
+        }
+        req->rq_status = rc;
+        return 0;
+}
+
+/*
+ * request to link to foreign inode:
+ *  - acquire i_nlinks on this inode
+ *  - add dentry
+ */
+static int mds_reint_link_to_remote(struct mds_update_record *rec,
+                                    int offset, struct ptlrpc_request *req,
+                                    struct lustre_handle *lh)
+{
+        struct lustre_handle *handle = NULL, tgt_dir_lockh[2];
+        struct obd_device *obd = req->rq_export->exp_obd;
+        struct dentry *de_tgt_dir = NULL;
+        struct mds_obd *mds = mds_req2mds(req);
+        int rc = 0, cleanup_phase = 0;
+        struct mdc_op_data op_data;
+        struct ptlrpc_request *request = NULL;
+        ENTRY;
+
+#define fmt     "%s: request to link %u/%u/%u:%*s to foreign inode %u/%u/%u\n"
+        DEBUG_REQ(D_INODE, req, fmt, obd->obd_name,
+                  (unsigned) rec->ur_fid2->mds,
+                  (unsigned) rec->ur_fid2->id,
+                  (unsigned) rec->ur_fid2->generation,
+                  rec->ur_namelen - 1, rec->ur_name,
+                  (unsigned) rec->ur_fid1->mds,
+                  (unsigned) rec->ur_fid1->id,
+                  (unsigned)rec->ur_fid1->generation);
+
+        de_tgt_dir = mds_fid2locked_dentry(obd, rec->ur_fid2, NULL, LCK_EX,
+                                           tgt_dir_lockh, rec->ur_name,
+                                           rec->ur_namelen - 1,
+                                           MDS_INODELOCK_UPDATE);
+        if (IS_ERR(de_tgt_dir))
+                GOTO(cleanup, rc = PTR_ERR(de_tgt_dir));
+        cleanup_phase = 1;
+
+        op_data.fid1 = *(rec->ur_fid1);
+        op_data.namelen = 0;
+        op_data.name = NULL;
+        rc = md_link(mds->mds_lmv_exp, &op_data, &request);
+        LASSERT(rc == 0);
+        cleanup_phase = 2;
+        if (request)
+                ptlrpc_req_finished(request);
+
+        OBD_FAIL_WRITE(OBD_FAIL_MDS_REINT_LINK_WRITE, de_tgt_dir->d_inode->i_sb);
+
+        handle = fsfilt_start(obd, de_tgt_dir->d_inode, FSFILT_OP_LINK, NULL);
+        if (IS_ERR(handle)) {
+                rc = PTR_ERR(handle);
+                GOTO(cleanup, rc);
+        }
+        
+        rc = fsfilt_add_dir_entry(obd, de_tgt_dir, rec->ur_name,
+                                  rec->ur_namelen - 1, rec->ur_fid1->id,
+                                  rec->ur_fid1->generation, rec->ur_fid1->mds);
+        cleanup_phase = 3;
+
+cleanup:
+        rc = mds_finish_transno(mds, de_tgt_dir ? de_tgt_dir->d_inode : NULL,
+                                handle, req, rc, 0);
+        EXIT;
+
+        switch (cleanup_phase) {
+                case 3:
+                        if (rc) {
+                                /* FIXME: drop i_nlink on remote inode here */
+                                CERROR("MUST drop drop i_nlink here\n");
+                        }
+                case 2:
+                case 1:
+                        if (rc) {
+                                ldlm_lock_decref(tgt_dir_lockh, LCK_EX);
+#ifdef S_PDIROPS
+                                ldlm_lock_decref(tgt_dir_lockh + 1, LCK_CW);
+#endif
+                        } else {
+                                ptlrpc_save_lock(req, tgt_dir_lockh, LCK_EX);
+#ifdef S_PDIROPS
+                                ptlrpc_save_lock(req, tgt_dir_lockh + 1, LCK_CW);
+#endif
+                        }
+                        l_dput(de_tgt_dir);
+                        break;
+                default:
+                        CERROR("invalid cleanup_phase %d\n", cleanup_phase);
+                        LBUG();
+        }
+        req->rq_status = rc;
+        return 0;
+}
+
 static int mds_reint_link(struct mds_update_record *rec, int offset,
                           struct ptlrpc_request *req,
                           struct lustre_handle *lh)
@@ -1365,7 +1836,7 @@ static int mds_reint_link(struct mds_update_record *rec, int offset,
         struct dentry *de_tgt_dir = NULL;
         struct dentry *dchild = NULL;
         struct mds_obd *mds = mds_req2mds(req);
-        struct lustre_handle *handle = NULL, tgt_dir_lockh, src_lockh;
+        struct lustre_handle *handle = NULL, tgt_dir_lockh[2], src_lockh;
         struct ldlm_res_id src_res_id = { .name = {0} };
         struct ldlm_res_id tgt_dir_res_id = { .name = {0} };
         ldlm_policy_data_t src_policy ={.l_inodebits = {MDS_INODELOCK_UPDATE}};
@@ -1386,6 +1857,16 @@ static int mds_reint_link(struct mds_update_record *rec, int offset,
         if (OBD_FAIL_CHECK(OBD_FAIL_MDS_REINT_LINK))
                 GOTO(cleanup, rc = -ENOENT);
 
+        if (rec->ur_fid1->mds != mds->mds_num) {
+                rc = mds_reint_link_to_remote(rec, offset, req, lh);
+                RETURN(rc);
+        }
+        
+        if (rec->ur_namelen == 1) {
+                rc = mds_reint_link_acquire(rec, offset, req, lh);
+                RETURN(rc);
+        }
+
         /* Step 1: Lookup the source inode and target directory by FID */
         de_src = mds_fid2dentry(mds, rec->ur_fid1, NULL);
         if (IS_ERR(de_src))
@@ -1394,11 +1875,8 @@ static int mds_reint_link(struct mds_update_record *rec, int offset,
         cleanup_phase = 1; /* source dentry */
 
         de_tgt_dir = mds_fid2dentry(mds, rec->ur_fid2, NULL);
-        if (IS_ERR(de_tgt_dir)) {
-                rc = PTR_ERR(de_tgt_dir);
-                de_tgt_dir = NULL;
-                GOTO(cleanup, rc);
-        }
+        if (IS_ERR(de_tgt_dir))
+                GOTO(cleanup, rc = PTR_ERR(de_tgt_dir));
 
         cleanup_phase = 2; /* target directory dentry */
 
@@ -1411,10 +1889,29 @@ static int mds_reint_link(struct mds_update_record *rec, int offset,
         src_res_id.name[1] = de_src->d_inode->i_generation;
         tgt_dir_res_id.name[0] = de_tgt_dir->d_inode->i_ino;
         tgt_dir_res_id.name[1] = de_tgt_dir->d_inode->i_generation;
-
+#ifdef S_PDIROPS
+        if (IS_PDIROPS(de_tgt_dir->d_inode)) {
+                int flags = 0;
+                /* Get a temp lock on just ino, gen to flush client cache */
+                rc = ldlm_cli_enqueue(NULL, NULL, obd->obd_namespace,
+                                      tgt_dir_res_id, LDLM_IBITS, &src_policy,
+                                      LCK_CW, &flags, mds_blocking_ast,
+                                      ldlm_completion_ast, NULL, NULL,
+                                      NULL, 0, NULL, tgt_dir_lockh + 1);
+                if (rc != ELDLM_OK)
+                        GOTO(cleanup, rc = -ENOLCK);
+
+                tgt_dir_res_id.name[2] = full_name_hash(rec->ur_name,
+                                                        rec->ur_namelen - 1);
+                CDEBUG(D_INFO, "take lock on %lu:%u:"LPX64"\n",
+                       de_tgt_dir->d_inode->i_ino,
+                       de_tgt_dir->d_inode->i_generation,
+                       tgt_dir_res_id.name[2]);
+        }
+#endif
         rc = enqueue_ordered_locks(obd, &src_res_id, &src_lockh, LCK_EX,
                                    &src_policy,
-                                   &tgt_dir_res_id, &tgt_dir_lockh, LCK_EX,
+                                   &tgt_dir_res_id, tgt_dir_lockh, LCK_EX,
                                    &tgt_dir_policy);
         if (rc)
                 GOTO(cleanup, rc);
@@ -1462,13 +1959,18 @@ cleanup:
         case 3: /* locks */
                 if (rc) {
                         ldlm_lock_decref(&src_lockh, LCK_EX);
-                        ldlm_lock_decref(&tgt_dir_lockh, LCK_EX);
+                        ldlm_lock_decref(tgt_dir_lockh, LCK_EX);
                 } else {
                         ptlrpc_save_lock(req, &src_lockh, LCK_EX);
-                        ptlrpc_save_lock(req, &tgt_dir_lockh, LCK_EX);
+                        ptlrpc_save_lock(req, tgt_dir_lockh, LCK_EX);
                 }
         case 2: /* target dentry */
-                l_dput(de_tgt_dir);
+#ifdef S_PDIROPS
+                if (tgt_dir_lockh[1].cookie)
+                        ldlm_lock_decref(tgt_dir_lockh + 1, LCK_CW);
+#endif
+                if (de_tgt_dir)
+                        l_dput(de_tgt_dir);
         case 1: /* source dentry */
                 l_dput(de_src);
         case 0:
@@ -1599,11 +2101,8 @@ static int mds_get_parents_children_locked(struct obd_device *obd,
                 *de_tgtdirp = dget(*de_srcdirp);
         } else {
                 *de_tgtdirp = mds_fid2dentry(mds, p2_fid, NULL);
-                if (IS_ERR(*de_tgtdirp)) {
-                        rc = PTR_ERR(*de_tgtdirp);
-                        *de_tgtdirp = NULL;
-                        GOTO(cleanup, rc);
-                }
+                if (IS_ERR(*de_tgtdirp))
+                        GOTO(cleanup, rc = PTR_ERR(*de_tgtdirp));
         }
 
         cleanup_phase = 2; /* target directory dentry */
@@ -1611,6 +2110,27 @@ static int mds_get_parents_children_locked(struct obd_device *obd,
         p2_res_id.name[0] = (*de_tgtdirp)->d_inode->i_ino;
         p2_res_id.name[1] = (*de_tgtdirp)->d_inode->i_generation;
 
+#ifdef S_PDIROPS
+        dlm_handles[5].cookie = 0;
+        dlm_handles[6].cookie = 0;
+        if (IS_PDIROPS((*de_srcdirp)->d_inode)) {
+                /* Get a temp lock on just ino, gen to flush client cache */
+                rc = enqueue_ordered_locks(obd, &p1_res_id, &(dlm_handles[5]),
+                                           LCK_CW, &p_policy, &p2_res_id,
+                                           &(dlm_handles[6]),LCK_CW,&p_policy);
+                if (rc != ELDLM_OK)
+                        GOTO(cleanup, rc);
+
+                p1_res_id.name[2] = full_name_hash(old_name, old_len - 1);
+                p2_res_id.name[2] = full_name_hash(new_name, new_len - 1);
+                CDEBUG(D_INFO, "take locks on %lu:%u:"LPX64", %lu:%u:"LPX64"\n",
+                       (*de_srcdirp)->d_inode->i_ino,
+                       (*de_srcdirp)->d_inode->i_generation, p1_res_id.name[2],
+                       (*de_tgtdirp)->d_inode->i_ino,
+                       (*de_tgtdirp)->d_inode->i_generation, p2_res_id.name[2]);
+        }
+#endif
+
         /* Step 3: Lookup the source child entry */
         *de_oldp = ll_lookup_one_len(old_name, *de_srcdirp, old_len - 1);
         if (IS_ERR(*de_oldp)) {
@@ -1736,6 +2256,195 @@ cleanup:
         return rc;
 }
 
+static int mds_reint_rename_create_name(struct mds_update_record *rec,
+                                        int offset, struct ptlrpc_request *req)
+{
+        struct obd_device *obd = req->rq_export->exp_obd;
+        struct dentry *de_srcdir = NULL;
+        struct dentry *de_new = NULL;
+        struct mds_obd *mds = mds_req2mds(req);
+        struct lustre_handle parent_lockh[2];
+        struct lustre_handle child_lockh;
+        int cleanup_phase = 0;
+        void *handle = NULL;
+        int rc = 0;
+        ENTRY;
+
+        /* another MDS executing rename operation has asked us
+         * to create target name. such a creation should destroy
+         * existing target name */
+
+        CDEBUG(D_OTHER, "%s: request to create name %s for %lu/%lu/%lu\n",
+                        obd->obd_name, rec->ur_tgt,
+                        (unsigned long) rec->ur_fid1->mds,
+                        (unsigned long) rec->ur_fid1->id,
+                        (unsigned long) rec->ur_fid1->generation);
+
+        /* first, lookup the target */
+        child_lockh.cookie = 0;
+        rc = mds_get_parent_child_locked(obd, mds, rec->ur_fid2, parent_lockh,
+                                         &de_srcdir,LCK_PW,MDS_INODELOCK_UPDATE,
+                                         rec->ur_tgt, rec->ur_tgtlen,
+                                         &child_lockh, &de_new, LCK_EX,
+                                         MDS_INODELOCK_LOOKUP);
+        if (rc)
+                GOTO(cleanup, rc);
+
+        cleanup_phase = 1;
+
+        LASSERT(de_srcdir);
+        LASSERT(de_srcdir->d_inode);
+        LASSERT(de_new);
+
+        if (de_new->d_inode) {
+                /* name exists and points to local inode
+                 * try to unlink this name and create new one */
+                CERROR("%s: %s points to local inode %lu/%lu\n",
+                       obd->obd_name, rec->ur_tgt,
+                       (unsigned long) de_new->d_inode->i_ino,
+                       (unsigned long) de_new->d_inode->i_generation);
+                handle = fsfilt_start(obd, de_srcdir->d_inode,
+                                      FSFILT_OP_RENAME, NULL);
+                if (IS_ERR(handle))
+                        GOTO(cleanup, rc = PTR_ERR(handle));
+                rc = fsfilt_del_dir_entry(req->rq_export->exp_obd, de_new);
+                if (rc)
+                        GOTO(cleanup, rc);
+        } else if (de_new->d_flags & DCACHE_CROSS_REF) {
+                /* name exists adn points to remove inode */
+                CERROR("%s: %s points to remote inode %lu/%lu/%lu\n",
+                       obd->obd_name, rec->ur_tgt,
+                       (unsigned long) de_new->d_mdsnum,
+                       (unsigned long) de_new->d_inum,
+                       (unsigned long) de_new->d_generation);
+        } else {
+                /* name doesn't exist. the simplest case */
+                handle = fsfilt_start(obd, de_srcdir->d_inode,
+                                      FSFILT_OP_LINK, NULL);
+                if (IS_ERR(handle))
+                        GOTO(cleanup, rc = PTR_ERR(handle));
+        }
+       
+        cleanup_phase = 2;
+        rc = fsfilt_add_dir_entry(obd, de_srcdir, rec->ur_tgt,
+                        rec->ur_tgtlen - 1, rec->ur_fid1->id,
+                        rec->ur_fid1->generation, rec->ur_fid1->mds);
+        if (rc)
+                CERROR("add_dir_entry() returned error %d\n", rc);
+cleanup:
+        EXIT;
+        rc = mds_finish_transno(mds, de_srcdir ? de_srcdir->d_inode : NULL,
+                                handle, req, rc, 0);
+        switch(cleanup_phase) {
+                case 2:
+                case 1:
+#ifdef S_PDIROPS
+                        if (parent_lockh[1].cookie != 0)
+                                ldlm_lock_decref(&parent_lockh[1], LCK_CW);
+#endif
+                        ldlm_lock_decref(&parent_lockh[0], LCK_PW);
+                        if (child_lockh.cookie != 0)
+                                ldlm_lock_decref(&child_lockh, LCK_EX);
+                        l_dput(de_new);
+                        l_dput(de_srcdir);
+                        break;
+                default:
+                        LBUG();
+        }
+
+        req->rq_status = rc;
+
+        RETURN(0);
+}
+
+static int mds_reint_rename_to_remote(struct mds_update_record *rec, int offset,
+                                      struct ptlrpc_request *req)
+{
+        struct obd_device *obd = req->rq_export->exp_obd;
+        struct ptlrpc_request *req2 = NULL;
+        struct dentry *de_srcdir = NULL;
+        struct dentry *de_old = NULL;
+        struct mds_obd *mds = mds_req2mds(req);
+        struct lustre_handle parent_lockh[2];
+        struct lustre_handle child_lockh;
+        struct mdc_op_data opdata;
+        int cleanup_phase = 0;
+        void *handle = NULL;
+        int rc = 0;
+        ENTRY;
+
+        CDEBUG(D_OTHER, "%s: move name %s onto another mds%u\n",
+               obd->obd_name, rec->ur_name, rec->ur_fid2->mds + 1);
+        memset(&opdata, 0, sizeof(opdata));
+
+        child_lockh.cookie = 0;
+        rc = mds_get_parent_child_locked(obd, mds, rec->ur_fid1, parent_lockh,
+                                         &de_srcdir,LCK_PW,MDS_INODELOCK_UPDATE,
+                                         rec->ur_name, rec->ur_namelen,
+                                         &child_lockh, &de_old, LCK_EX,
+                                         MDS_INODELOCK_LOOKUP);
+        LASSERT(rc == 0);
+        LASSERT(de_srcdir);
+        LASSERT(de_srcdir->d_inode);
+        LASSERT(de_old);
+       
+        /* we already know the target should be created on another MDS
+         * so, we have to request that MDS to do it */
+
+        /* prepare source fid */
+        if (de_old->d_flags & DCACHE_CROSS_REF) {
+                LASSERT(de_old->d_inode == NULL);
+                CDEBUG(D_OTHER, "request to move remote name\n");
+                opdata.fid1.mds = de_old->d_mdsnum;
+                opdata.fid1.id = de_old->d_inum;
+                opdata.fid1.generation = de_old->d_generation;
+        } else if (de_old->d_inode == NULL) {
+                /* oh, source doesn't exist */
+                GOTO(cleanup, rc = -ENOENT);
+        } else {
+                LASSERT(de_old->d_inode != NULL);
+                CDEBUG(D_OTHER, "request to move local name\n");
+                opdata.fid1.mds = mds->mds_num;
+                opdata.fid1.id = de_old->d_inode->i_ino;
+                opdata.fid1.generation = de_old->d_inode->i_generation;
+        }
+
+        opdata.fid2 = *(rec->ur_fid2);
+        rc = md_rename(mds->mds_lmv_exp, &opdata, NULL, 0, rec->ur_tgt,
+                       rec->ur_tgtlen - 1, &req2);
+       
+        if (rc)
+                GOTO(cleanup, rc);
+
+        handle = fsfilt_start(obd, de_srcdir->d_inode, FSFILT_OP_UNLINK, NULL);
+        if (IS_ERR(handle))
+                GOTO(cleanup, rc = PTR_ERR(handle));
+        rc = fsfilt_del_dir_entry(obd, de_old);
+        d_drop(de_old);
+
+cleanup:
+        EXIT;
+        rc = mds_finish_transno(mds, de_srcdir ? de_srcdir->d_inode : NULL,
+                                handle, req, rc, 0);
+        if (req2)
+                ptlrpc_req_finished(req2);
+
+#ifdef S_PDIROPS
+        if (parent_lockh[1].cookie != 0)
+                ldlm_lock_decref(&parent_lockh[1], LCK_CW);
+#endif
+        ldlm_lock_decref(&parent_lockh[0], LCK_PW);
+        if (child_lockh.cookie != 0)
+                ldlm_lock_decref(&child_lockh, LCK_EX);
+
+        l_dput(de_old);
+        l_dput(de_srcdir);
+
+        req->rq_status = rc;
+        RETURN(0);
+
+}
+
 static int mds_reint_rename(struct mds_update_record *rec, int offset,
                             struct ptlrpc_request *req,
                             struct lustre_handle *lockh)
@@ -1746,7 +2455,7 @@ static int mds_reint_rename(struct mds_update_record *rec, int offset,
         struct dentry *de_old = NULL;
         struct dentry *de_new = NULL;
         struct mds_obd *mds = mds_req2mds(req);
-        struct lustre_handle dlm_handles[4];
+        struct lustre_handle dlm_handles[7];
         struct mds_body *body = NULL;
         int rc = 0, lock_count = 3;
         int cleanup_phase = 0;
@@ -1761,6 +2470,16 @@ static int mds_reint_rename(struct mds_update_record *rec, int offset,
 
         MDS_CHECK_RESENT(req, mds_reconstruct_generic(req));
 
+        if (rec->ur_namelen == 1) {
+                rc = mds_reint_rename_create_name(rec, offset, req);
+                RETURN(rc);
+        }
+
+        if (rec->ur_fid2->mds != mds->mds_num) {
+                rc = mds_reint_rename_to_remote(rec, offset, req);
+                RETURN(rc);
+        }
+        
         rc = mds_get_parents_children_locked(obd, mds, rec->ur_fid1, &de_srcdir,
                                              rec->ur_fid2, &de_tgtdir, LCK_PW,
                                              rec->ur_name, rec->ur_namelen,
@@ -1799,8 +2518,8 @@ static int mds_reint_rename(struct mds_update_record *rec, int offset,
             S_ISREG(de_new->d_inode->i_mode) &&
             de_new->d_inode->i_nlink == 1 &&
             mds_open_orphan_count(de_new->d_inode) == 0) {
-                mds_pack_inode2fid(&body->fid1, de_new->d_inode);
-                mds_pack_inode2body(body, de_new->d_inode);
+                mds_pack_inode2fid(obd, &body->fid1, de_new->d_inode);
+                mds_pack_inode2body(obd, body, de_new->d_inode);
                 mds_pack_md(obd, req->rq_repmsg, 1, body, de_new->d_inode, 1);
                 if (!(body->valid & OBD_MD_FLEASIZE)) {
                         body->valid |= (OBD_MD_FLSIZE | OBD_MD_FLBLOCKS |
@@ -1841,6 +2560,12 @@ cleanup:
                                 handle, req, rc, 0);
         switch (cleanup_phase) {
         case 1:
+#ifdef S_PDIROPS
+                if (dlm_handles[5].cookie != 0)
+                        ldlm_lock_decref(&(dlm_handles[5]), LCK_CW);
+                if (dlm_handles[6].cookie != 0)
+                        ldlm_lock_decref(&(dlm_handles[6]), LCK_CW);
+#endif
                 if (rc) {
                         if (lock_count == 4)
                                 ldlm_lock_decref(&(dlm_handles[3]), LCK_EX);
@@ -1884,17 +2609,16 @@ int mds_reint_rec(struct mds_update_record *rec, int offset,
                   struct ptlrpc_request *req, struct lustre_handle *lockh)
 {
         struct obd_device *obd = req->rq_export->exp_obd;
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
         int rc;
-        ENTRY;
 
         /* checked by unpacker */
         LASSERT(rec->ur_opcode <= REINT_MAX &&
                 reinters[rec->ur_opcode] != NULL);
 
-        push_ctxt(&saved, &obd->obd_lvfs_ctxt, &rec->ur_uc);
+        push_ctxt(&saved, &obd->obd_ctxt, &rec->ur_uc);
         rc = reinters[rec->ur_opcode] (rec, offset, req, lockh);
-        pop_ctxt(&saved, &obd->obd_lvfs_ctxt, &rec->ur_uc);
+        pop_ctxt(&saved, &obd->obd_ctxt, &rec->ur_uc);
 
-        RETURN(rc);
+        return rc;
 }
diff --git a/lustre/mds/mds_unlink_open.c b/lustre/mds/mds_unlink_open.c
index b0cc7ec..87e9a27 100644
--- a/lustre/mds/mds_unlink_open.c
+++ b/lustre/mds/mds_unlink_open.c
@@ -60,7 +60,6 @@ int mds_open_unlink_rename(struct mds_update_record *rec,
         struct dentry *pending_child;
         char fidname[LL_FID_NAMELEN];
         int fidlen = 0, rc;
-        unsigned mode;
         ENTRY;
 
         LASSERT(!mds_inode_is_orphan(dchild->d_inode));
@@ -82,26 +81,18 @@ int mds_open_unlink_rename(struct mds_update_record *rec,
                 GOTO(out_dput, rc = 0);
         }
 
-        /* link() is semanticaly-wrong for S_IFDIR, so we set S_IFREG
-         * for linking and return real mode back then -bzzz */
-        mode = dchild->d_inode->i_mode;
-        dchild->d_inode->i_mode = S_IFREG;
-        rc = vfs_link(dchild, pending_dir, pending_child);
+        *handle = fsfilt_start(obd, pending_dir, FSFILT_OP_RENAME, NULL);
+        if (IS_ERR(*handle))
+                GOTO(out_dput, rc = PTR_ERR(*handle));
+
+        lock_kernel();
+        rc = vfs_rename(dparent->d_inode, dchild, pending_dir, pending_child);
+        unlock_kernel();
         if (rc)
-                CERROR("error linking orphan %s to PENDING: rc = %d\n",
-                       rec->ur_name, rc);
+                CERROR("error renaming orphan %lu/%s to PENDING: rc = %d\n",
+                       dparent->d_inode->i_ino, rec->ur_name, rc);
         else
                 mds_inode_set_orphan(dchild->d_inode);
-
-        /* return mode and correct i_nlink if inode is directory */
-        LASSERT(dchild->d_inode->i_nlink == 1);
-        dchild->d_inode->i_mode = mode;
-        if ((mode & S_IFMT) == S_IFDIR) {
-                dchild->d_inode->i_nlink++;
-                pending_dir->i_nlink++;
-        }
-        mark_inode_dirty(dchild->d_inode);
-
 out_dput:
         dput(pending_child);
 out_lock:
@@ -249,7 +240,7 @@ out_free_lmm:
 int mds_cleanup_orphans(struct obd_device *obd)
 {
         struct mds_obd *mds = &obd->u.mds;
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
         struct file *file;
         struct dentry *dchild, *dentry;
         struct vfsmount *mnt;
@@ -261,7 +252,7 @@ int mds_cleanup_orphans(struct obd_device *obd)
         int rc = 0, item = 0, namlen;
         ENTRY;
 
-        push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+        push_ctxt(&saved, &obd->obd_ctxt, NULL);
         dentry = dget(mds->mds_pending_dir);
         if (IS_ERR(dentry))
                 GOTO(err_pop, rc = PTR_ERR(dentry));
@@ -334,7 +325,7 @@ err_out:
                 OBD_FREE(dirent, sizeof(*dirent));
         }
 err_pop:
-        pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+        pop_ctxt(&saved, &obd->obd_ctxt, NULL);
         if (rc == 0)
                 rc = item;
         RETURN(rc);
diff --git a/lustre/mgmt/.cvsignore b/lustre/mgmt/.cvsignore
index c79cb94..067f05c 100644
--- a/lustre/mgmt/.cvsignore
+++ b/lustre/mgmt/.cvsignore
@@ -3,10 +3,7 @@ config.log
 config.status
 configure
 Makefile
+Makefile.in
 .deps
 tags
 TAGS
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
diff --git a/lustre/portals/autoMakefile.am b/lustre/mgmt/Makefile.am
similarity index 59%
rename from lustre/portals/autoMakefile.am
rename to lustre/mgmt/Makefile.am
index bd57e6e..f7307c8 100644
--- a/lustre/portals/autoMakefile.am
+++ b/lustre/mgmt/Makefile.am
@@ -3,6 +3,9 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
-EXTRA_DIST = archdep.m4 build.m4 include 
+DEFS=
 
-SUBDIRS = portals libcfs knals unals router tests doc utils
+modulefs_DATA = mgmt_svc.o mgmt_cli.o
+EXTRA_PROGRAMS = mgmt_svc mgmt_cli
+
+include $(top_srcdir)/Rules
diff --git a/lustre/mgmt/Makefile.in b/lustre/mgmt/Makefile.in
deleted file mode 100644
index 15ec356..0000000
--- a/lustre/mgmt/Makefile.in
+++ /dev/null
@@ -1,9 +0,0 @@
-MODULES := mgmt_svc mgmt_cli
-ifeq ($(PATCHLEVEL),6)
-mgmt_svc-objs := mgmt-svc.o
-mgmt_cli-objs := mgmt-cli.o
-mgmt-%.c: mgmt_%.c
-	ln -sf $< $@
-endif
-
-@INCLUDE_RULES@
diff --git a/lustre/mgmt/autoMakefile.am b/lustre/mgmt/autoMakefile.am
deleted file mode 100644
index 0966ec8..0000000
--- a/lustre/mgmt/autoMakefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (C) 2001  Cluster File Systems, Inc.
-#
-# This code is issued under the GNU General Public License.
-# See the file COPYING in this distribution
-
-modulefs_DATA = mgmt-svc$(KMODEXT) mgmt-cli$(KMODEXT)
-
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-DIST_SOURCES = $(mgmt-svc-objs:.o=.c) $(mgc-cli-objs:.o=.c)
diff --git a/lustre/mgmt/mgmt_cli.c b/lustre/mgmt/mgmt_cli.c
index 313a9d5..5cbcfae 100644
--- a/lustre/mgmt/mgmt_cli.c
+++ b/lustre/mgmt/mgmt_cli.c
@@ -253,9 +253,9 @@ static int mgmtcli_cleanup(struct obd_device *obd, int flags)
 }
 
 static struct obd_ops mgmtcli_obd_ops = {
-        .o_owner   = THIS_MODULE,
-        .o_setup   = mgmtcli_setup,
-        .o_cleanup = client_obd_cleanup
+        o_owner:   THIS_MODULE,
+        o_setup:   mgmtcli_setup,
+        o_cleanup: client_obd_cleanup
 };
 
 static int __init mgmtcli_init(void)
diff --git a/lustre/mgmt/mgmt_svc.c b/lustre/mgmt/mgmt_svc.c
index 88fbf48..8743e72 100644
--- a/lustre/mgmt/mgmt_svc.c
+++ b/lustre/mgmt/mgmt_svc.c
@@ -125,11 +125,11 @@ static int mgmt_cleanup(struct obd_device *obd, int flags)
 }
 
 static struct obd_ops mgmt_obd_ops = {
-        .o_owner      = THIS_MODULE,
-        .o_setup      = mgmt_setup,
-        .o_cleanup    = mgmt_cleanup,
-        .o_connect    = class_connect,
-        .o_disconnect = class_disconnect
+        o_owner:      THIS_MODULE,
+        o_setup:      mgmt_setup,
+        o_cleanup:    mgmt_cleanup,
+        o_connect:    class_connect,
+        o_disconnect: class_disconnect
 };
 
 static int __init mgmt_init(void)
diff --git a/lustre/missing b/lustre/missing
new file mode 100755
index 0000000..6a37006
--- /dev/null
+++ b/lustre/missing
@@ -0,0 +1,336 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try \`$0 --help' for more information"
+  exit 1
+fi
+
+run=:
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+  configure_ac=configure.ac
+else
+  configure_ac=configure.in
+fi
+
+case "$1" in
+--run)
+  # Try to run requested program, and just exit if it succeeds.
+  run=
+  shift
+  "$@" && exit 0
+  ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+  --run           try to run the given command, and emulate it if it fails
+
+Supported PROGRAM values:
+  aclocal      touch file \`aclocal.m4'
+  autoconf     touch file \`configure'
+  autoheader   touch file \`config.h.in'
+  automake     touch all \`Makefile.in' files
+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
+  flex         create \`lex.yy.c', if possible, from existing .c
+  help2man     touch the output file
+  lex          create \`lex.yy.c', if possible, from existing .c
+  makeinfo     touch the output file
+  tar          try tar, gnutar, gtar, then tar without non-portable flags
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing 0.4 - GNU automake"
+    ;;
+
+  -*)
+    echo 1>&2 "$0: Unknown \`$1' option"
+    echo 1>&2 "Try \`$0 --help' for more information"
+    exit 1
+    ;;
+
+  aclocal*)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
+         to install the \`Automake' and \`Perl' packages.  Grab them from
+         any GNU archive site."
+    touch aclocal.m4
+    ;;
+
+  autoconf)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`${configure_ac}'.  You might want to install the
+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+         archive site."
+    touch configure
+    ;;
+
+  autoheader)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+         from any GNU archive site."
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+    test -z "$files" && files="config.h"
+    touch_files=
+    for f in $files; do
+      case "$f" in
+      *:*) touch_files="$touch_files "`echo "$f" |
+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+      *) touch_files="$touch_files $f.in";;
+      esac
+    done
+    touch $touch_files
+    ;;
+
+  automake*)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+         You might want to install the \`Automake' and \`Perl' packages.
+         Grab them from any GNU archive site."
+    find . -type f -name Makefile.am -print |
+	   sed 's/\.am$/.in/' |
+	   while read f; do touch "$f"; done
+    ;;
+
+  autom4te)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and you do not seem to have it handy on your
+         system.  You might have modified some files without having the
+         proper tools for further handling them.
+         You can get \`$1Help2man' as part of \`Autoconf' from any GNU
+         archive site."
+
+    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo "#! /bin/sh"
+	echo "# Created by GNU Automake missing as a replacement of"
+	echo "#  $ $@"
+	echo "exit 0"
+	chmod +x $file
+	exit 1
+    fi
+    ;;
+
+  bison|yacc)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified a \`.y' file.  You may need the \`Bison' package
+         in order for those modifications to take effect.  You can get
+         \`Bison' from any GNU archive site."
+    rm -f y.tab.c y.tab.h
+    if [ $# -ne 1 ]; then
+        eval LASTARG="\${$#}"
+	case "$LASTARG" in
+	*.y)
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" y.tab.c
+	    fi
+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" y.tab.h
+	    fi
+	  ;;
+	esac
+    fi
+    if [ ! -f y.tab.h ]; then
+	echo >y.tab.h
+    fi
+    if [ ! -f y.tab.c ]; then
+	echo 'main() { return 0; }' >y.tab.c
+    fi
+    ;;
+
+  lex|flex)
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified a \`.l' file.  You may need the \`Flex' package
+         in order for those modifications to take effect.  You can get
+         \`Flex' from any GNU archive site."
+    rm -f lex.yy.c
+    if [ $# -ne 1 ]; then
+        eval LASTARG="\${$#}"
+	case "$LASTARG" in
+	*.l)
+	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+	    if [ -f "$SRCFILE" ]; then
+	         cp "$SRCFILE" lex.yy.c
+	    fi
+	  ;;
+	esac
+    fi
+    if [ ! -f lex.yy.c ]; then
+	echo 'main() { return 0; }' >lex.yy.c
+    fi
+    ;;
+
+  help2man)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+	 you modified a dependency of a manual page.  You may need the
+	 \`Help2man' package in order for those modifications to take
+	 effect.  You can get \`Help2man' from any GNU archive site."
+
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+    fi
+    if [ -f "$file" ]; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo ".ab help2man is required to generate this page"
+	exit 1
+    fi
+    ;;
+
+  makeinfo)
+    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+       # We have makeinfo, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+         you modified a \`.texi' or \`.texinfo' file, or any other file
+         indirectly affecting the aspect of the manual.  The spurious
+         call might also be the consequence of using a buggy \`make' (AIX,
+         DU, IRIX).  You might want to install the \`Texinfo' package or
+         the \`GNU make' package.  Grab either from any GNU archive site."
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+    fi
+    touch $file
+    ;;
+
+  tar)
+    shift
+    if test -n "$run"; then
+      echo 1>&2 "ERROR: \`tar' requires --run"
+      exit 1
+    fi
+
+    # We have already tried tar in the generic part.
+    # Look for gnutar/gtar before invocation to avoid ugly error
+    # messages.
+    if (gnutar --version > /dev/null 2>&1); then
+       gnutar "$@" && exit 0
+    fi
+    if (gtar --version > /dev/null 2>&1); then
+       gtar "$@" && exit 0
+    fi
+    firstarg="$1"
+    if shift; then
+	case "$firstarg" in
+	*o*)
+	    firstarg=`echo "$firstarg" | sed s/o//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+	case "$firstarg" in
+	*h*)
+	    firstarg=`echo "$firstarg" | sed s/h//`
+	    tar "$firstarg" "$@" && exit 0
+	    ;;
+	esac
+    fi
+
+    echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+         You may want to install GNU tar or Free paxutils, or check the
+         command line arguments."
+    exit 1
+    ;;
+
+  *)
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and you do not seem to have it handy on your
+         system.  You might have modified some files without having the
+         proper tools for further handling them.  Check the \`README' file,
+         it often tells you about the needed prerequirements for installing
+         this package.  You may also peek at any GNU archive site, in case
+         some other package would contain this missing \`$1' program."
+    exit 1
+    ;;
+esac
+
+exit 0
diff --git a/lustre/mkinstalldirs b/lustre/mkinstalldirs
new file mode 100755
index 0000000..aabacbd
--- /dev/null
+++ b/lustre/mkinstalldirs
@@ -0,0 +1,40 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
+# Author: Noah Friedman <friedman@prep.ai.mit.edu>
+# Created: 1993-05-16
+# Public domain
+
+# $Id: mkinstalldirs,v 1.3 2004/05/17 11:47:55 phil Exp $
+
+errstatus=0
+
+for file
+do
+   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+   shift
+
+   pathcomp=
+   for d
+   do
+     pathcomp="$pathcomp$d"
+     case "$pathcomp" in
+       -* ) pathcomp=./$pathcomp ;;
+     esac
+
+     if test ! -d "$pathcomp"; then
+        echo "mkdir $pathcomp"
+
+        mkdir "$pathcomp" || lasterr=$?
+
+        if test ! -d "$pathcomp"; then
+  	  errstatus=$lasterr
+        fi
+     fi
+
+     pathcomp="$pathcomp/"
+   done
+done
+
+exit $errstatus
+
+# mkinstalldirs ends here
diff --git a/lustre/obdclass/.cvsignore b/lustre/obdclass/.cvsignore
index 5d26f00..49c6100 100644
--- a/lustre/obdclass/.cvsignore
+++ b/lustre/obdclass/.cvsignore
@@ -3,13 +3,7 @@ config.log
 config.status
 configure
 Makefile
+Makefile.in
 .deps
 TAGS
 .*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
diff --git a/lustre/obdclass/Makefile.am b/lustre/obdclass/Makefile.am
new file mode 100644
index 0000000..cc55989
--- /dev/null
+++ b/lustre/obdclass/Makefile.am
@@ -0,0 +1,53 @@
+DEFS=
+MODULE = obdclass
+
+if LIBLUSTRE
+
+noinst_LIBRARIES = liblustreclass.a
+liblustreclass_a_SOURCES = class_obd.c debug.c genops.c statfs_pack.c uuid.c 
+liblustreclass_a_SOURCES += lustre_handles.c lustre_peer.c lprocfs_status.c
+liblustreclass_a_SOURCES += obdo.c obd_config.c llog.c llog_obd.c llog_cat.c
+liblustreclass_a_SOURCES += llog_lvfs.c #llog_ioctl.c rbtree.c
+liblustreclass_a_SOURCES += mea.c
+liblustreclass_a_CFLAGS = -fPIC
+
+class_obd.c: lustre_build_version
+
+lustre_build_version:
+	echo '#define LUSTRE_VERSION 32' > $(top_builddir)/include/linux/lustre_build_version.h
+	echo '#define BUILD_VERSION "1"' >> $(top_builddir)/include/linux/lustre_build_version.h
+
+else
+
+class_obd.o: lustre_build_version
+
+modulefs_DATA = lustre_build_version obdclass.o llog_test.o
+EXTRA_PROGRAMS = obdclass llog_test
+
+obdclass_SOURCES = llog.c llog_cat.c llog_lvfs.c llog_obd.c  class_obd.c debug.c genops.c sysctl.c uuid.c llog_ioctl.c
+obdclass_SOURCES += lprocfs_status.c lustre_handles.c lustre_peer.c
+obdclass_SOURCES += statfs_pack.c obdo.c obd_config.c llog_internal.h
+obdclass_SOURCES += mea.c
+
+lustre_build_version:
+	perl $(top_srcdir)/scripts/version_tag.pl $(top_srcdir) $(top_builddir) > tmpver
+	echo "#define LUSTRE_RELEASE @RELEASE@" >> tmpver
+	cmp -s $(top_builddir)/include/linux/lustre_build_version.h tmpver \
+                2> /dev/null &&                                            \
+                $(RM) tmpver ||                                            \
+                mv tmpver $(top_builddir)/include/linux/lustre_build_version.h
+endif
+
+include $(top_srcdir)/Rules
+
+if LINUX25
+# workaround for llog_test
+llog_test.o: llog_test.c
+	$(COMPILE) -UKBUILD_MODNAME -DKBUILD_MODNAME=llog_test -c -o llog_test_tmp.o $<
+	rm -f llog_test_tmp.c
+	$(LINUX)/scripts/modpost $(LINUX)/vmlinux llog_test_tmp.o
+	$(COMPILE) -UKBUILD_MODNAME -UKBUILD_BASENAME -DKBUILD_BASENAME=llog_test \
+		-c llog_test_tmp.mod.c
+	$(LD) -m "`$(LD) --help | awk '/supported emulations/ {print $$4}'`" -r \
+		-o llog_test.o llog_test_tmp.o llog_test_tmp.mod.o
+endif
diff --git a/lustre/obdclass/Makefile.in b/lustre/obdclass/Makefile.in
deleted file mode 100644
index bf094bd..0000000
--- a/lustre/obdclass/Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-MODULES := obdclass llog_test
-
-obdclass-objs := llog_obd.o class_obd.o
-obdclass-objs += debug.o genops.o sysctl.o uuid.o llog_ioctl.o
-obdclass-objs += lprocfs_status.o lustre_handles.o lustre_peer.o
-obdclass-objs += statfs_pack.o obdo.o obd_config.o
-
-ifeq ($(PATCHLEVEL),6)
-llog_test-objs := llog-test.o
-
-$(obj)/llog-test.c: $(obj)/llog_test.c
-	ln -sf $< $@
-endif
-
-@INCLUDE_RULES@
diff --git a/lustre/obdclass/Makefile.mk b/lustre/obdclass/Makefile.mk
index f01b998..43bdb68 100644
--- a/lustre/obdclass/Makefile.mk
+++ b/lustre/obdclass/Makefile.mk
@@ -6,9 +6,9 @@
 include $(src)/../portals/Kernelenv
 
 obj-y += obdclass.o
-obdclass-objs := class_obd.o debug.o \
+obdclass-objs := llog.o llog_cat.o class_obd.o debug.o \
 		genops.o sysctl.o uuid.o lprocfs_status.o lustre_handles.o \
-		lustre_peer.o statfs_pack.o obdo.o llog_obd.o \
+		lustre_peer.o statfs_pack.o obdo.o llog_lvfs.o llog_obd.o \
 		obd_config.o llog_ioctl.o
 
 $(obj)/class_obd.o: lustre_build_version
diff --git a/lustre/obdclass/autoMakefile.am b/lustre/obdclass/autoMakefile.am
deleted file mode 100644
index d537a22..0000000
--- a/lustre/obdclass/autoMakefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-if LIBLUSTRE
-
-noinst_LIBRARIES = liblustreclass.a
-liblustreclass_a_SOURCES = class_obd.c debug.c genops.c statfs_pack.c uuid.c 
-liblustreclass_a_SOURCES += lustre_handles.c lustre_peer.c lprocfs_status.c
-liblustreclass_a_SOURCES += obdo.c obd_config.c llog_obd.c #llog_ioctl.c rbtree.c
-liblustreclass_a_CPPFLAGS = $(LLCPPFLAGS) -DLUSTRE_VERSION=\"32\" -DBUILD_VERSION=\"1\"
-liblustreclass_a_CFLAGS = $(LLCFLAGS)
-
-endif
-
-if MODULES
-modulefs_DATA = obdclass$(KMODEXT)
-noinst_DATA = llog_test$(KMODEXT)
-endif # MODULES
-
-MOSTLYCLEANFILES = *.o *.ko *.mod.c llog-test.c
-DIST_SOURCES = $(filter-out llog-test.c,$(obdclass-objs:.o=.c)) $(llog-test-objs:.o=.c) llog_test.c
diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c
index c6404c4..b967b92 100644
--- a/lustre/obdclass/class_obd.c
+++ b/lustre/obdclass/class_obd.c
@@ -63,11 +63,9 @@
 #include <linux/obd_class.h>
 #include <linux/lustre_debug.h>
 #include <linux/lprocfs_status.h>
-#ifdef __KERNEL__
 #include <linux/lustre_build_version.h>
-#include <linux/lustre_version.h>
-#endif
 #include <portals/list.h>
+#include "llog_internal.h"
 
 #ifndef __KERNEL__
 /* liblustre workaround */
@@ -297,10 +295,10 @@ int class_handle_ioctl(unsigned int cmd, unsigned long arg)
 
         case OBD_IOC_CLOSE_UUID: {
                 ptl_nid_t       peer_nid;
-                __u32           peer_nal;
+                ptl_handle_ni_t peer_ni;
                 CDEBUG(D_IOCTL, "closing all connections to uuid %s\n",
                        data->ioc_inlbuf1);
-                lustre_uuid_to_peer(data->ioc_inlbuf1, &peer_nal, &peer_nid);
+                lustre_uuid_to_peer(data->ioc_inlbuf1, &peer_ni, &peer_nid);
                 GOTO(out, err = 0);
         }
 
@@ -362,17 +360,16 @@ static int obd_class_ioctl(struct inode *inode, struct file *filp,
 
 /* declare character device */
 static struct file_operations obd_psdev_fops = {
-        .owner   = THIS_MODULE,
-        .ioctl   = obd_class_ioctl,     /* ioctl */
-        .open    = obd_class_open,      /* open */
-        .release = obd_class_release,   /* release */
+        ioctl:   obd_class_ioctl,       /* ioctl */
+        open:    obd_class_open,        /* open */
+        release: obd_class_release,     /* release */
 };
 
 /* modules setup */
 static struct miscdevice obd_psdev = {
-        .minor = OBD_MINOR,
-        .name  = "obd_psdev",
-        .fops  = &obd_psdev_fops,
+        OBD_MINOR,
+        "obd_psdev",
+        &obd_psdev_fops
 };
 #else
 void *obd_psdev = NULL;
@@ -440,6 +437,11 @@ EXPORT_SYMBOL(class_setup);
 EXPORT_SYMBOL(class_cleanup);
 EXPORT_SYMBOL(class_detach);
 
+/* mea.c */
+EXPORT_SYMBOL(mea_name2idx);
+int raw_name2idx(int count, char *name, int namelen);
+EXPORT_SYMBOL(raw_name2idx);
+
 #ifdef LPROCFS
 int obd_proc_read_version(char *page, char **start, off_t off, int count,
                           int *eof, void *data)
@@ -448,13 +450,6 @@ int obd_proc_read_version(char *page, char **start, off_t off, int count,
         return snprintf(page, count, "%s\n", BUILD_VERSION);
 }
 
-int obd_proc_read_kernel_version(char *page, char **start, off_t off, int count,
-                                 int *eof, void *data)
-{
-        *eof = 1;
-        return snprintf(page, count, "%u\n", LUSTRE_KERNEL_VERSION);
-}
-
 int obd_proc_read_pinger(char *page, char **start, off_t off, int count,
                          int *eof, void *data)
 {
@@ -472,7 +467,6 @@ int obd_proc_read_pinger(char *page, char **start, off_t off, int count,
 struct proc_dir_entry *proc_lustre_root = NULL;
 struct lprocfs_vars lprocfs_base[] = {
         { "version", obd_proc_read_version, NULL, NULL },
-        { "kernel_version", obd_proc_read_kernel_version, NULL, NULL },
         { "pinger", obd_proc_read_pinger, NULL, NULL },
         { 0 }
 };
@@ -542,10 +536,9 @@ static int obd_device_list_open(struct inode *inode, struct file *file)
 }
 
 struct file_operations obd_device_list_fops = {
-        .owner   = THIS_MODULE,
-        .open    = obd_device_list_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
+        .open = obd_device_list_open,
+        .read = seq_read,
+        .llseek = seq_lseek,
         .release = seq_release,
 };
 #endif
@@ -612,14 +605,17 @@ int init_obdclass(void)
         return 0;
 }
 
-/* liblustre doesn't call cleanup_obdclass, apparently.  we carry on in this
- * ifdef to the end of the file to cover module and versioning goo.*/
 #ifdef __KERNEL__
-
+static void /*__exit*/ cleanup_obdclass(void)
+#else
 static void cleanup_obdclass(void)
+#endif
 {
+#ifdef __KERNEL__
         int i;
-        int leaked;
+#else
+        int i, leaked;
+#endif
         ENTRY;
 
         misc_deregister(&obd_psdev);
@@ -633,7 +629,9 @@ static void cleanup_obdclass(void)
         }
 
         obd_cleanup_caches();
+#ifdef __KERNEL__
         obd_sysctl_clean();
+#endif
 #ifdef LPROCFS
         if (proc_lustre_root) {
                 lprocfs_remove(proc_lustre_root);
@@ -644,24 +642,31 @@ static void cleanup_obdclass(void)
         class_handle_cleanup();
         class_exit_uuidlist();
 
+#ifndef __KERNEL__
         leaked = atomic_read(&obd_memory);
         CDEBUG(leaked ? D_ERROR : D_INFO,
                "obd mem max: %d leaked: %d\n", obd_memmax, leaked);
+#endif
 
         EXIT;
 }
 
 /* Check that we're building against the appropriate version of the Lustre
  * kernel patch */
+#ifdef __KERNEL__
 #include <linux/lustre_version.h>
-#define LUSTRE_MIN_VERSION 32
-#define LUSTRE_MAX_VERSION 36
+#define LUSTRE_MIN_VERSION 28
+#define LUSTRE_MAX_VERSION 34
 #if (LUSTRE_KERNEL_VERSION < LUSTRE_MIN_VERSION)
 # error Cannot continue: Your Lustre kernel patch is older than the sources
 #elif (LUSTRE_KERNEL_VERSION > LUSTRE_MAX_VERSION)
 # error Cannot continue: Your Lustre sources are older than the kernel patch
 #endif
+ #else
+# warning "Lib Lustre - no versioning information"
+#endif
 
+#ifdef __KERNEL__
 MODULE_AUTHOR("Cluster File Systems, Inc. <info@clusterfs.com>");
 MODULE_DESCRIPTION("Lustre Class Driver Build Version: " BUILD_VERSION);
 MODULE_LICENSE("GPL");
diff --git a/lustre/obdclass/genops.c b/lustre/obdclass/genops.c
index 8df70b3..16950ea 100644
--- a/lustre/obdclass/genops.c
+++ b/lustre/obdclass/genops.c
@@ -91,8 +91,8 @@ void class_put_type(struct obd_type *type)
         module_put(type->typ_ops->o_owner);
 }
 
-int class_register_type(struct obd_ops *ops, struct lprocfs_vars *vars,
-                        char *name)
+int class_register_type(struct obd_ops *ops, struct md_ops *md_ops,
+                        struct lprocfs_vars *vars, char *name)
 {
         struct obd_type *type;
         int rc = 0;
@@ -112,10 +112,17 @@ int class_register_type(struct obd_ops *ops, struct lprocfs_vars *vars,
 
         OBD_ALLOC(type->typ_ops, sizeof(*type->typ_ops));
         OBD_ALLOC(type->typ_name, strlen(name) + 1);
-        if (type->typ_ops == NULL || type->typ_name == NULL)
+        if (md_ops)
+                OBD_ALLOC(type->typ_md_ops, sizeof(*type->typ_md_ops));
+        if (type->typ_ops == NULL || type->typ_name == NULL ||
+                        (md_ops && type->typ_md_ops == NULL))
                 GOTO (failed, rc);
 
         *(type->typ_ops) = *ops;
+        if (md_ops)
+                *(type->typ_md_ops) = *md_ops;
+        else
+                type->typ_md_ops = NULL;
         strcpy(type->typ_name, name);
 
 #ifdef LPROCFS
@@ -139,6 +146,8 @@ int class_register_type(struct obd_ops *ops, struct lprocfs_vars *vars,
                 OBD_FREE(type->typ_name, strlen(name) + 1);
         if (type->typ_ops != NULL)
                 OBD_FREE (type->typ_ops, sizeof (*type->typ_ops));
+        if (type->typ_md_ops != NULL)
+                OBD_FREE (type->typ_md_ops, sizeof (*type->typ_md_ops));
         OBD_FREE(type, sizeof(*type));
         RETURN(rc);
 }
@@ -172,6 +181,8 @@ int class_unregister_type(char *name)
         OBD_FREE(type->typ_name, strlen(name) + 1);
         if (type->typ_ops != NULL)
                 OBD_FREE(type->typ_ops, sizeof(*type->typ_ops));
+        if (type->typ_md_ops != NULL)
+                OBD_FREE (type->typ_md_ops, sizeof (*type->typ_md_ops));
         OBD_FREE(type, sizeof(*type));
         RETURN(0);
 } /* class_unregister_type */
@@ -537,7 +548,7 @@ struct obd_import *class_new_import(void)
 void class_destroy_import(struct obd_import *import)
 {
         LASSERT(import != NULL);
-        LASSERT(import != LP_POISON);
+        LASSERT((unsigned long)import != 0x5a5a5a5a);
 
         class_handle_unhash(&import->imp_handle);
 
diff --git a/lustre/lvfs/llog.c b/lustre/obdclass/llog.c
similarity index 65%
rename from lustre/lvfs/llog.c
rename to lustre/obdclass/llog.c
index 0b647a7..0ad595f 100644
--- a/lustre/lvfs/llog.c
+++ b/lustre/obdclass/llog.c
@@ -38,7 +38,9 @@
 #include <liblustre.h>
 #endif
 
+#include <linux/obd_class.h>
 #include <linux/lustre_log.h>
+#include <portals/list.h>
 
 /* Allocate a new log or catalog handle */
 struct llog_handle *llog_alloc_handle(void)
@@ -56,6 +58,7 @@ struct llog_handle *llog_alloc_handle(void)
 }
 EXPORT_SYMBOL(llog_alloc_handle);
 
+
 void llog_free_handle(struct llog_handle *loghandle)
 {
         if (!loghandle)
@@ -63,9 +66,9 @@ void llog_free_handle(struct llog_handle *loghandle)
 
         if (!loghandle->lgh_hdr)
                 goto out;
-        if (le32_to_cpu(loghandle->lgh_hdr->llh_flags) & LLOG_F_IS_PLAIN)
+        if (loghandle->lgh_hdr->llh_flags & LLOG_F_IS_PLAIN)
                 list_del_init(&loghandle->u.phd.phd_entry);
-        if (le32_to_cpu(loghandle->lgh_hdr->llh_flags) & LLOG_F_IS_CAT)
+        if (loghandle->lgh_hdr->llh_flags & LLOG_F_IS_CAT)
                 LASSERT(list_empty(&loghandle->u.chd.chd_head));
         OBD_FREE(loghandle->lgh_hdr, LLOG_CHUNK_SIZE);
 
@@ -94,10 +97,10 @@ int llog_cancel_rec(struct llog_handle *loghandle, int index)
                 RETURN(-EINVAL);
         }
 
-        llh->llh_count = cpu_to_le32(le32_to_cpu(llh->llh_count) - 1);
+        llh->llh_count--;
 
-        if ((le32_to_cpu(llh->llh_flags) & LLOG_F_ZAP_WHEN_EMPTY) &&
-            (le32_to_cpu(llh->llh_count) == 1) &&
+        if ((llh->llh_flags & LLOG_F_ZAP_WHEN_EMPTY) &&
+            (llh->llh_count == 1) &&
             (loghandle->lgh_last_idx == (LLOG_BITMAP_BYTES * 8) - 1)) {
                 rc = llog_destroy(loghandle);
                 if (rc)
@@ -128,10 +131,10 @@ int llog_init_handle(struct llog_handle *handle, int flags,
                 RETURN(-ENOMEM);
         handle->lgh_hdr = llh;
         /* first assign flags to use llog_client_ops */
-        llh->llh_flags = cpu_to_le32(flags);
+        llh->llh_flags = flags;
         rc = llog_read_header(handle);
         if (rc == 0) {
-                flags = le32_to_cpu(llh->llh_flags);
+                flags = llh->llh_flags;
                 if (uuid)
                         LASSERT(obd_uuid_equals(uuid, &llh->llh_tgtuuid));
                 GOTO(out, rc);
@@ -143,21 +146,20 @@ int llog_init_handle(struct llog_handle *handle, int flags,
         rc = 0;
 
         handle->lgh_last_idx = 0; /* header is record with index 0 */
-        llh->llh_count = cpu_to_le32(1);         /* for the header record */
-        llh->llh_hdr.lrh_type = cpu_to_le32(LLOG_HDR_MAGIC);
-        llh->llh_hdr.lrh_len = llh->llh_tail.lrt_len =
-                cpu_to_le32(LLOG_CHUNK_SIZE);
+        llh->llh_count = 1;         /* for the header record */
+        llh->llh_hdr.lrh_type = LLOG_HDR_MAGIC;
+        llh->llh_hdr.lrh_len = llh->llh_tail.lrt_len = LLOG_CHUNK_SIZE;
         llh->llh_hdr.lrh_index = llh->llh_tail.lrt_index = 0;
-        llh->llh_timestamp = cpu_to_le64(LTIME_S(CURRENT_TIME));
+        llh->llh_timestamp = LTIME_S(CURRENT_TIME);
         if (uuid)
                 memcpy(&llh->llh_tgtuuid, uuid, sizeof(llh->llh_tgtuuid));
-        llh->llh_bitmap_offset = cpu_to_le32(offsetof(typeof(*llh),llh_bitmap));
+        llh->llh_bitmap_offset = offsetof(typeof(*llh),llh_bitmap);
         ext2_set_bit(0, llh->llh_bitmap);
 
 out:
         if (flags & LLOG_F_IS_CAT) {
                 INIT_LIST_HEAD(&handle->u.chd.chd_head);
-                llh->llh_size = cpu_to_le32(sizeof(struct llog_logid_rec));
+                llh->llh_size = sizeof(struct llog_logid_rec);
         }
         else if (flags & LLOG_F_IS_PLAIN)
                 INIT_LIST_HEAD(&handle->u.phd.phd_entry);
@@ -232,11 +234,12 @@ int llog_process(struct llog_handle *loghandle, llog_cb_t cb,
                         GOTO(out, rc);
 
                 rec = buf;
-                idx = le32_to_cpu(rec->lrh_index);
+                idx = rec->lrh_index;
                 if (idx < index)
                         CDEBUG(D_HA, "index %u : idx %u\n", index, idx);
                 while (idx < index) {
-                        rec = ((void *)rec + le32_to_cpu(rec->lrh_len));
+                        rec = (struct llog_rec_hdr *)
+                                ((char *)rec + rec->lrh_len);
                         idx ++;
                 }
 
@@ -263,7 +266,8 @@ int llog_process(struct llog_handle *loghandle, llog_cb_t cb,
                         ++index;
                         if (index > last_index)
                                 GOTO(out, rc = 0);
-                        rec = ((void *)rec + le32_to_cpu(rec->lrh_len));
+                        rec = (struct llog_rec_hdr *)
+                                ((char *)rec + rec->lrh_len);
                 }
         }
 
@@ -273,90 +277,3 @@ int llog_process(struct llog_handle *loghandle, llog_cb_t cb,
         RETURN(rc);
 }
 EXPORT_SYMBOL(llog_process);
-
-int llog_reverse_process(struct llog_handle *loghandle, llog_cb_t cb,
-                         void *data, void *catdata)
-{
-        struct llog_log_hdr *llh = loghandle->lgh_hdr;
-        struct llog_process_cat_data *cd = catdata;
-        void *buf;
-        int rc = 0, first_index = 1, index, idx;
-        struct llog_rec_tail *tail;
-        ENTRY;
-
-        OBD_ALLOC(buf, LLOG_CHUNK_SIZE);
-        if (!buf)
-                RETURN(-ENOMEM);
-
-        if (cd != NULL)
-                first_index = cd->first_idx + 1;
-        if (cd != NULL && cd->last_idx)
-                index = cd->last_idx;
-        else
-                index = LLOG_BITMAP_BYTES * 8 - 1;
-
-        while (rc == 0) {
-                struct llog_rec_hdr *rec;
-
-                /* skip records not set in bitmap */
-                while (index >= first_index &&
-                       !ext2_test_bit(index, llh->llh_bitmap))
-                        --index;
-
-                LASSERT(index >= first_index - 1);
-                if (index == first_index - 1)
-                        break;
-
-                /* get the buf with our target record; avoid old garbage */
-                memset(buf, 0, LLOG_CHUNK_SIZE);
-                rc = llog_prev_block(loghandle, index, buf, LLOG_CHUNK_SIZE);
-                if (rc)
-                        GOTO(out, rc);
-
-                rec = buf;
-                idx = le32_to_cpu(rec->lrh_index);
-                if (idx < index)
-                        CDEBUG(D_HA, "index %u : idx %u\n", index, idx);
-                while (idx < index) {
-                        rec = ((void *)rec + le32_to_cpu(rec->lrh_len));
-                        idx ++;
-                }
-
-                /* process records in buffer, starting where we found one */
-                while ((void *)rec >= buf) {
-                        if (rec->lrh_index == 0)
-                                GOTO(out, 0); /* no more records */
-
-                        /* if set, process the callback on this record */
-                        if (ext2_test_bit(index, llh->llh_bitmap)) {
-                                rc = cb(loghandle, rec, data);
-                                if (rc == LLOG_PROC_BREAK) {
-                                        CWARN("recovery from log: "LPX64":%x"
-                                              " stopped\n",
-                                              loghandle->lgh_id.lgl_oid,
-                                              loghandle->lgh_id.lgl_ogen);
-                                        GOTO(out, rc);
-                                }
-                                if (rc)
-                                        GOTO(out, rc);
-                        }
-
-                        /* previous record, still in buffer? */
-                        --index;
-                        if (index < first_index)
-                                GOTO(out, rc = 0);
-
-                        if ((void *)rec == buf)
-                                break;
-
-                        tail = (void *)rec - sizeof(struct llog_rec_tail);
-                        rec = ((void *)rec - le32_to_cpu(tail->lrt_len));
-                }
-        }
-
- out:
-        if (buf)
-                OBD_FREE(buf, LLOG_CHUNK_SIZE);
-        RETURN(rc);
-}
-EXPORT_SYMBOL(llog_reverse_process);
diff --git a/lustre/lvfs/llog_cat.c b/lustre/obdclass/llog_cat.c
similarity index 57%
rename from lustre/lvfs/llog_cat.c
rename to lustre/obdclass/llog_cat.c
index 67a6f80..d4fa370 100644
--- a/lustre/lvfs/llog_cat.c
+++ b/lustre/obdclass/llog_cat.c
@@ -38,6 +38,7 @@
 #include <liblustre.h>
 #endif
 
+#include <linux/obd_class.h>
 #include <linux/lustre_log.h>
 #include <portals/list.h>
 
@@ -50,7 +51,7 @@ static struct llog_handle *llog_cat_new_log(struct llog_handle *cathandle)
 {
         struct llog_handle *loghandle;
         struct llog_log_hdr *llh;
-        struct llog_logid_rec rec;
+        struct llog_logid_rec rec = { { 0 }, };
         int rc, index, bitmap_size;
         ENTRY;
 
@@ -59,8 +60,8 @@ static struct llog_handle *llog_cat_new_log(struct llog_handle *cathandle)
 
         index = (cathandle->lgh_last_idx + 1) % bitmap_size;
 
-        /* maximum number of available slots in catalog is bitmap_size - 2 */
-        if (llh->llh_cat_idx == cpu_to_le32(index)) {
+        /* maximum number of available slots in catlog is bitmap_size - 2 */
+        if (llh->llh_cat_idx == index) {
                 CERROR("no free catalog slots for log...\n");
                 RETURN(ERR_PTR(-ENOSPC));
         } else {
@@ -72,8 +73,8 @@ static struct llog_handle *llog_cat_new_log(struct llog_handle *cathandle)
                         LBUG(); /* should never happen */
                 }
                 cathandle->lgh_last_idx = index;
-                llh->llh_count = cpu_to_le32(le32_to_cpu(llh->llh_count) + 1);
-                llh->llh_tail.lrt_index = cpu_to_le32(index);
+                llh->llh_count++;
+                llh->llh_tail.lrt_index = index;
         }
 
         rc = llog_create(cathandle->lgh_ctxt, &loghandle, NULL, NULL);
@@ -90,12 +91,12 @@ static struct llog_handle *llog_cat_new_log(struct llog_handle *cathandle)
                LPX64"\n", loghandle->lgh_id.lgl_oid, loghandle->lgh_id.lgl_ogen,
                index, cathandle->lgh_id.lgl_oid);
         /* build the record for this log in the catalog */
-        rec.lid_hdr.lrh_len = cpu_to_le32(sizeof(rec));
-        rec.lid_hdr.lrh_index = cpu_to_le32(index);
-        rec.lid_hdr.lrh_type = cpu_to_le32(LLOG_LOGID_MAGIC);
+        rec.lid_hdr.lrh_len = sizeof(rec);
+        rec.lid_hdr.lrh_index = index;
+        rec.lid_hdr.lrh_type = LLOG_LOGID_MAGIC;
         rec.lid_id = loghandle->lgh_id;
-        rec.lid_tail.lrt_len = cpu_to_le32(sizeof(rec));
-        rec.lid_tail.lrt_index = cpu_to_le32(index);
+        rec.lid_tail.lrt_len = sizeof(rec);
+        rec.lid_tail.lrt_index = index;
 
         /* update the catalog: header and record */
         rc = llog_write_rec(cathandle, &rec.lid_hdr,
@@ -104,7 +105,7 @@ static struct llog_handle *llog_cat_new_log(struct llog_handle *cathandle)
                 GOTO(out_destroy, rc);
         }
 
-        loghandle->lgh_hdr->llh_cat_idx = cpu_to_le32(index);
+        loghandle->lgh_hdr->llh_cat_idx = index;
         cathandle->u.chd.chd_current_log = loghandle;
         LASSERT(list_empty(&loghandle->u.phd.phd_entry));
         list_add_tail(&loghandle->u.phd.phd_entry, &cathandle->u.chd.chd_head);
@@ -115,6 +116,7 @@ static struct llog_handle *llog_cat_new_log(struct llog_handle *cathandle)
 
         RETURN(loghandle);
 }
+EXPORT_SYMBOL(llog_cat_new_log);
 
 /* Open an existent log handle and add it to the open list.
  * This log handle will be closed when all of the records in it are removed.
@@ -123,7 +125,7 @@ static struct llog_handle *llog_cat_new_log(struct llog_handle *cathandle)
  * We return a lock on the handle to ensure nobody yanks it from us.
  */
 int llog_cat_id2handle(struct llog_handle *cathandle, struct llog_handle **res,
-                              struct llog_logid *logid)
+                       struct llog_logid *logid)
 {
         struct llog_handle *loghandle;
         int rc = 0;
@@ -161,15 +163,14 @@ int llog_cat_id2handle(struct llog_handle *cathandle, struct llog_handle **res,
         if (!rc) {
                 loghandle->u.phd.phd_cat_handle = cathandle;
                 loghandle->u.phd.phd_cookie.lgc_lgl = cathandle->lgh_id;
-                loghandle->u.phd.phd_cookie.lgc_index =
-                        le32_to_cpu(loghandle->lgh_hdr->llh_cat_idx);
+                loghandle->u.phd.phd_cookie.lgc_index = 
+                        loghandle->lgh_hdr->llh_cat_idx;
         }
 
 out:
         *res = loghandle;
         RETURN(rc);
 }
-EXPORT_SYMBOL(llog_cat_id2handle);
 
 int llog_cat_put(struct llog_handle *cathandle)
 {
@@ -256,13 +257,21 @@ int llog_cat_add_rec(struct llog_handle *cathandle, struct llog_rec_hdr *rec,
         int rc;
         ENTRY;
 
-        LASSERT(le32_to_cpu(rec->lrh_len) <= LLOG_CHUNK_SIZE);
+        LASSERT(rec->lrh_len <= LLOG_CHUNK_SIZE);
         loghandle = llog_cat_current_log(cathandle, 1);
         if (IS_ERR(loghandle))
                 RETURN(PTR_ERR(loghandle));
         /* loghandle is already locked by llog_cat_current_log() for us */
         rc = llog_write_rec(loghandle, rec, reccookie, 1, buf, -1);
         up_write(&loghandle->lgh_lock);
+        if (rc == -ENOSPC) {
+                /* to create a new plain log */
+                loghandle = llog_cat_current_log(cathandle, 1);
+                if (IS_ERR(loghandle))
+                        RETURN(PTR_ERR(loghandle));
+                rc = llog_write_rec(loghandle, rec, reccookie, 1, buf, -1);
+                up_write(&loghandle->lgh_lock);
+        }
 
         RETURN(rc);
 }
@@ -278,7 +287,7 @@ EXPORT_SYMBOL(llog_cat_add_rec);
  * Assumes caller has already pushed us into the kernel context.
  */
 int llog_cat_cancel_records(struct llog_handle *cathandle, int count,
-                            struct llog_cookie *cookies)
+                        struct llog_cookie *cookies)
 {
         int i, index, rc = 0;
         ENTRY;
@@ -319,21 +328,21 @@ int llog_cat_cancel_records(struct llog_handle *cathandle, int count,
 }
 EXPORT_SYMBOL(llog_cat_cancel_records);
 
-static int llog_cat_process_cb(struct llog_handle *cat_llh, 
-                               struct llog_rec_hdr *rec, void *data)
+int llog_cat_process_cb(struct llog_handle *cat_llh, struct llog_rec_hdr *rec,
+                        void *data)
 {
         struct llog_process_data *d = data;
         struct llog_logid_rec *lir = (struct llog_logid_rec *)rec;
         struct llog_handle *llh;
         int rc;
 
-        if (le32_to_cpu(rec->lrh_type) != LLOG_LOGID_MAGIC) {
+        if (rec->lrh_type != LLOG_LOGID_MAGIC) {
                 CERROR("invalid record in catalog\n");
                 RETURN(-EINVAL);
         }
         CWARN("processing log "LPX64":%x at index %u of catalog "LPX64"\n",
                lir->lid_id.lgl_oid, lir->lid_id.lgl_ogen,
-               le32_to_cpu(rec->lrh_index), cat_llh->lgh_id.lgl_oid);
+               rec->lrh_index, cat_llh->lgh_id.lgl_oid);
 
         rc = llog_cat_id2handle(cat_llh, &llh, &lir->lid_id);
         if (rc) {
@@ -354,15 +363,15 @@ int llog_cat_process(struct llog_handle *cat_llh, llog_cb_t cb, void *data)
         int rc;
         ENTRY;
 
-        LASSERT(llh->llh_flags &cpu_to_le32(LLOG_F_IS_CAT));
+        LASSERT(llh->llh_flags & LLOG_F_IS_CAT);
         d.lpd_data = data;
         d.lpd_cb = cb;
 
         if (llh->llh_cat_idx > cat_llh->lgh_last_idx) {
-                CWARN("catalog "LPX64" crosses index zero\n",
+                CWARN("catlog "LPX64" crosses index zero\n",
                       cat_llh->lgh_id.lgl_oid);
 
-                cd.first_idx = le32_to_cpu(llh->llh_cat_idx);
+                cd.first_idx = llh->llh_cat_idx;
                 cd.last_idx = 0;
                 rc = llog_process(cat_llh, llog_cat_process_cb, &d, &cd);
                 if (rc != 0)
@@ -379,70 +388,6 @@ int llog_cat_process(struct llog_handle *cat_llh, llog_cb_t cb, void *data)
 }
 EXPORT_SYMBOL(llog_cat_process);
 
-static int llog_cat_reverse_process_cb(struct llog_handle *cat_llh, 
-                                       struct llog_rec_hdr *rec, void *data)
-{
-        struct llog_process_data *d = data;
-        struct llog_logid_rec *lir = (struct llog_logid_rec *)rec;
-        struct llog_handle *llh;
-        int rc;
-
-        if (le32_to_cpu(rec->lrh_type) != LLOG_LOGID_MAGIC) {
-                CERROR("invalid record in catalog\n");
-                RETURN(-EINVAL);
-        }
-        CWARN("processing log "LPX64":%x at index %u of catalog "LPX64"\n",
-               lir->lid_id.lgl_oid, lir->lid_id.lgl_ogen,
-               le32_to_cpu(rec->lrh_index), cat_llh->lgh_id.lgl_oid);
-
-        rc = llog_cat_id2handle(cat_llh, &llh, &lir->lid_id);
-        if (rc) {
-                CERROR("Cannot find handle for log "LPX64"\n",
-                       lir->lid_id.lgl_oid);
-                RETURN(rc);
-        }
-
-        rc = llog_reverse_process(llh, d->lpd_cb, d->lpd_data, NULL);
-        RETURN(rc);
-}
-
-int llog_cat_reverse_process(struct llog_handle *cat_llh,
-                             llog_cb_t cb, void *data)
-{
-        struct llog_process_data d;
-        struct llog_process_cat_data cd;
-        struct llog_log_hdr *llh = cat_llh->lgh_hdr;
-        int rc;
-        ENTRY;
-
-        LASSERT(llh->llh_flags &cpu_to_le32(LLOG_F_IS_CAT));
-        d.lpd_data = data;
-        d.lpd_cb = cb;
-
-        if (llh->llh_cat_idx > cat_llh->lgh_last_idx) {
-                CWARN("catalog "LPX64" crosses index zero\n",
-                      cat_llh->lgh_id.lgl_oid);
-
-                cd.first_idx = 0;
-                cd.last_idx = cat_llh->lgh_last_idx;
-                rc = llog_reverse_process(cat_llh, llog_cat_reverse_process_cb,
-                                          &d, &cd);
-                if (rc != 0)
-                        RETURN(rc);
-
-                cd.first_idx = le32_to_cpu(llh->llh_cat_idx);
-                cd.last_idx = 0;
-                rc = llog_reverse_process(cat_llh, llog_cat_reverse_process_cb,
-                                          &d, &cd);
-        } else {
-                rc = llog_reverse_process(cat_llh, llog_cat_reverse_process_cb,
-                                          &d, NULL);
-        }
-
-        RETURN(rc);
-}
-EXPORT_SYMBOL(llog_cat_reverse_process);
-
 int llog_cat_set_first_idx(struct llog_handle *cathandle, int index)
 {
         struct llog_log_hdr *llh = cathandle->lgh_hdr;
@@ -450,17 +395,17 @@ int llog_cat_set_first_idx(struct llog_handle *cathandle, int index)
         ENTRY;
 
         bitmap_size = sizeof(llh->llh_bitmap) * 8;
-        if (llh->llh_cat_idx == cpu_to_le32(index - 1)) {
-                idx = le32_to_cpu(llh->llh_cat_idx) + 1;
-                llh->llh_cat_idx = cpu_to_le32(idx);
+        if (llh->llh_cat_idx == (index - 1)) {
+                idx = llh->llh_cat_idx + 1;
+                llh->llh_cat_idx = idx;
                 if (idx == cathandle->lgh_last_idx)
                         goto out;
                 for (i = (index + 1) % bitmap_size;
                      i != cathandle->lgh_last_idx;
                      i = (i + 1) % bitmap_size) {
                         if (!ext2_test_bit(i, llh->llh_bitmap)) {
-                                idx = le32_to_cpu(llh->llh_cat_idx) + 1;
-                                llh->llh_cat_idx = cpu_to_le32(idx);
+                                idx = llh->llh_cat_idx + 1;
+                                llh->llh_cat_idx = idx;
                         } else if (i == 0) {
                                 llh->llh_cat_idx = 0;
                         } else {
@@ -468,166 +413,55 @@ int llog_cat_set_first_idx(struct llog_handle *cathandle, int index)
                         }
                 }
 out:
-                CDEBUG(D_HA, "set catalog "LPX64" first idx %u\n",
-                       cathandle->lgh_id.lgl_oid,le32_to_cpu(llh->llh_cat_idx));
+                CDEBUG(D_HA, "set catlog "LPX64" first idx %u\n",
+                       cathandle->lgh_id.lgl_oid, llh->llh_cat_idx);
         }
 
         RETURN(0);
 }
-EXPORT_SYMBOL(llog_cat_set_first_idx);
-
-int llog_catalog_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec, 
-                     void *buf, struct llog_cookie *logcookies, 
-                     int numcookies, void *data)
-{
-        struct llog_handle *cathandle;
-        int rc;
-        ENTRY;
-        
-        cathandle = ctxt->loc_handle;
-        LASSERT(cathandle != NULL);
-        
-        rc = llog_cat_add_rec(cathandle, rec, logcookies, buf);
-        if (rc != 1)
-                CERROR("write one catalog record failed: %d\n", rc);
-        RETURN(rc);
-}
-EXPORT_SYMBOL(llog_catalog_add);
 
-int llog_catalog_cancel(struct llog_ctxt *ctxt, int count,
-                        struct llog_cookie *cookies, int flags, void *data)
+#if 0
+/* Assumes caller has already pushed us into the kernel context. */
+int llog_cat_init(struct llog_handle *cathandle, struct obd_uuid *tgtuuid)
 {
-        struct llog_handle *cathandle;
-        int rc;
-        ENTRY;
-
-        if (cookies == NULL || count == 0)
-                RETURN(-EINVAL);
-        cathandle = ctxt->loc_handle;
-        LASSERT(cathandle != NULL);
-        rc = llog_cat_cancel_records(cathandle, count, cookies);
-        RETURN(rc);
-}
-EXPORT_SYMBOL(llog_catalog_cancel);
-
-int llog_catalog_setup(struct llog_ctxt **res, char *name,
-                       struct lvfs_run_ctxt *lvfs_ctxt,
-                       struct fsfilt_operations *fsops,
-                       struct dentry *logs_de, 
-                       struct dentry *objects_de)
-{
-        struct llog_ctxt *ctxt;
-        struct llog_catid catid;
-        struct llog_handle *handle;
-        int rc;
-        
+        struct llog_log_hdr *llh;
+        loff_t offset = 0;
+        int rc = 0;
         ENTRY;
 
-        OBD_ALLOC(ctxt, sizeof(*ctxt));
-        if (!ctxt)
-                RETURN(-ENOMEM);
-
-        *res = ctxt;
+        LASSERT(sizeof(*llh) == LLOG_CHUNK_SIZE);
 
-        ctxt->loc_fsops = fsops;
-        ctxt->loc_lvfs_ctxt = lvfs_ctxt;
-        ctxt->loc_logs_dir = logs_de;
-        ctxt->loc_objects_dir = objects_de;
-        ctxt->loc_logops = &llog_lvfs_ops; 
-        ctxt->loc_logops->lop_add = llog_catalog_add;
-        ctxt->loc_logops->lop_cancel = llog_catalog_cancel;
+        down(&cathandle->lgh_lock);
+        llh = cathandle->lgh_hdr;
 
-        memset(&catid, 0, sizeof(struct llog_catid));
-        rc = llog_get_cat_list(lvfs_ctxt, fsops, name, 1, &catid);
-        if (rc) {
-                CERROR("error llog_get_cat_list rc: %d\n", rc);
-                RETURN(rc);
-        }
-        if (catid.lci_logid.lgl_oid)
-                rc = llog_create(ctxt, &handle, &catid.lci_logid, 0);
-        else {
-                rc = llog_create(ctxt, &handle, NULL, NULL);
-                if (!rc)
-                        catid.lci_logid = handle->lgh_id;
+        if (cathandle->lgh_file->f_dentry->d_inode->i_size == 0) {
+                llog_write_rec(cathandle, &llh->llh_hdr, NULL, 0, NULL, 0);
+
+write_hdr:
+                rc = lustre_fwrite(cathandle->lgh_file, llh, LLOG_CHUNK_SIZE,
+                                   &offset);
+                if (rc != LLOG_CHUNK_SIZE) {
+                        CERROR("error writing catalog header: rc %d\n", rc);
+                        OBD_FREE(llh, sizeof(*llh));
+                        if (rc >= 0)
+                                rc = -ENOSPC;
+                } else
+                        rc = 0;
+        } else {
+                rc = lustre_fread(cathandle->lgh_file, llh, LLOG_CHUNK_SIZE,
+                                  &offset);
+                if (rc != LLOG_CHUNK_SIZE) {
+                        CERROR("error reading catalog header: rc %d\n", rc);
+                        /* Can we do much else if the header is bad? */
+                        goto write_hdr;
+                } else
+                        rc = 0;
         }
-        if (rc)
-                GOTO(out, rc);
 
-        ctxt->loc_handle = handle;
-        rc = llog_init_handle(handle, LLOG_F_IS_CAT, NULL);
-        if (rc)
-                GOTO(out, rc);
-
-        rc = llog_put_cat_list(lvfs_ctxt, fsops, name, 1, &catid);
-        if (rc)
-                CERROR("error llog_get_cat_list rc: %d\n", rc);
-out:
-        if (ctxt && rc)
-                OBD_FREE(ctxt, sizeof(*ctxt));
+        cathandle->lgh_tgtuuid = &llh->llh_tgtuuid;
+        up(&cathandle->lgh_lock);
         RETURN(rc);
 }
-EXPORT_SYMBOL(llog_catalog_setup);
+EXPORT_SYMBOL(llog_cat_init);
 
-int llog_catalog_cleanup(struct llog_ctxt *ctxt)
-{
-        struct llog_handle *cathandle, *n, *loghandle;
-        struct llog_log_hdr *llh;
-        int rc, index;
-        ENTRY;
-                                                                                                                             
-        if (!ctxt)
-                return 0;
-
-        cathandle = ctxt->loc_handle;
-        if (cathandle) {
-                list_for_each_entry_safe(loghandle, n,
-                                         &cathandle->u.chd.chd_head,
-                                         u.phd.phd_entry) {
-                        llh = loghandle->lgh_hdr;
-                        if ((le32_to_cpu(llh->llh_flags) &
-                                LLOG_F_ZAP_WHEN_EMPTY) &&
-                            (le32_to_cpu(llh->llh_count) == 1)) {
-                                rc = llog_destroy(loghandle);
-                                if (rc)
-                                        CERROR("failure destroying log during "
-                                               "cleanup: %d\n", rc);
-                                LASSERT(rc == 0);
-                                index = loghandle->u.phd.phd_cookie.lgc_index;
-                                llog_free_handle(loghandle);
-                                                                                                                             
-                                LASSERT(index);
-                                llog_cat_set_first_idx(cathandle, index);
-                                rc = llog_cancel_rec(cathandle, index);
-                                if (rc == 0)
-                                        CDEBUG(D_HA, "cancel plain log at index"
-                                               " %u of catalog "LPX64"\n",
-                                               index,cathandle->lgh_id.lgl_oid);
-                        }
-                }
-                llog_cat_put(ctxt->loc_handle);
-        }
-        OBD_FREE(ctxt, sizeof(*ctxt));
-        return 0;
-}
-EXPORT_SYMBOL(llog_catalog_cleanup);
-
-int llog_cat_half_bottom(struct llog_cookie *cookie, struct llog_handle *handle)
-{
-        struct llog_handle *loghandle;
-        struct llog_logid *lgl = &cookie->lgc_lgl;
-        int rc;
-                                                                                                                             
-        down_read(&handle->lgh_lock);
-        rc = llog_cat_id2handle(handle, &loghandle, lgl);
-        if (rc)
-                GOTO(out, rc);
-        if (2 * loghandle->lgh_hdr->llh_cat_idx <=
-            handle->lgh_last_idx + handle->lgh_hdr->llh_cat_idx + 1)
-                rc = 1;
-        else
-                rc = 0;
-out:
-        up_read(&handle->lgh_lock);
-        RETURN(rc);
-}
-EXPORT_SYMBOL(llog_cat_half_bottom);
+#endif
diff --git a/lustre/obdclass/llog_internal.h b/lustre/obdclass/llog_internal.h
new file mode 100644
index 0000000..0066087
--- /dev/null
+++ b/lustre/obdclass/llog_internal.h
@@ -0,0 +1,8 @@
+#ifndef __LLOG_INTERNAL_H__
+#define __LLOG_INTERNAL_H__
+
+int llog_put_cat_list(struct obd_device *obd, struct obd_device *disk_obd,
+                      char *name, int count, struct llog_catid *idarray);
+int llog_cat_id2handle(struct llog_handle *cathandle, struct llog_handle **res,
+                       struct llog_logid *logid);
+#endif
diff --git a/lustre/obdclass/llog_ioctl.c b/lustre/obdclass/llog_ioctl.c
index 621b94f..6c060e7 100644
--- a/lustre/obdclass/llog_ioctl.c
+++ b/lustre/obdclass/llog_ioctl.c
@@ -16,6 +16,7 @@
 #include <linux/obd_class.h>
 #include <linux/lustre_log.h>
 #include <portals/list.h>
+#include "llog_internal.h"
 
 static int str2logid(struct llog_logid *logid, char *str, int len)
 {
@@ -340,7 +341,7 @@ int llog_ioctl(struct llog_ctxt *ctxt, int cmd, struct obd_ioctl_data *data)
         case OBD_IOC_LLOG_REMOVE: {
                 struct llog_logid plain;
 
-                if (handle->lgh_hdr->llh_flags & LLOG_F_IS_PLAIN) {
+                if (handle->lgh_hdr->llh_flags & cpu_to_le32(LLOG_F_IS_PLAIN)) {
                         err = llog_destroy(handle);
                         if (!err)
                                 llog_free_handle(handle);
@@ -376,8 +377,8 @@ out:
 }
 EXPORT_SYMBOL(llog_ioctl);
 
-int llog_catalog_list(struct obd_device *obd, int count,
-                      struct obd_ioctl_data *data)
+int llog_catlog_list(struct obd_device *obd, int count,
+                     struct obd_ioctl_data *data)
 {
         int size, i;
         struct llog_catid *idarray;
@@ -393,8 +394,7 @@ int llog_catalog_list(struct obd_device *obd, int count,
                 RETURN(-ENOMEM);
         memset(idarray, 0, size);
 
-        rc = llog_get_cat_list(&obd->obd_lvfs_ctxt, obd->obd_fsops,
-                               name, count, idarray);
+        rc = llog_get_cat_list(obd, obd, name, count, idarray);
         if (rc) {
                 OBD_FREE(idarray, size);
                 RETURN(rc);
@@ -418,4 +418,4 @@ int llog_catalog_list(struct obd_device *obd, int count,
         RETURN(0);
 
 }
-EXPORT_SYMBOL(llog_catalog_list);
+EXPORT_SYMBOL(llog_catlog_list);
diff --git a/lustre/obdclass/llog_lvfs.c b/lustre/obdclass/llog_lvfs.c
new file mode 100644
index 0000000..9e654ce
--- /dev/null
+++ b/lustre/obdclass/llog_lvfs.c
@@ -0,0 +1,764 @@
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
+ *
+ *  Copyright (C) 2001-2003 Cluster File Systems, Inc.
+ *   Author: Andreas Dilger <adilger@clusterfs.com>
+ *
+ *   This file is part of Lustre, http://www.lustre.org.
+ *
+ *   Lustre is free software; you can redistribute it and/or
+ *   modify it under the terms of version 2 of the GNU General Public
+ *   License as published by the Free Software Foundation.
+ *
+ *   Lustre is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Lustre; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * OST<->MDS recovery logging infrastructure.
+ *
+ * Invariants in implementation:
+ * - we do not share logs among different OST<->MDS connections, so that
+ *   if an OST or MDS fails it need only look at log(s) relevant to itself
+ */
+
+#define DEBUG_SUBSYSTEM S_LOG
+
+#ifndef EXPORT_SYMTAB
+#define EXPORT_SYMTAB
+#endif
+
+#ifdef __KERNEL__
+#include <linux/fs.h>
+#else
+#include <liblustre.h>
+#endif
+
+#include <linux/obd.h>
+#include <linux/obd_class.h>
+#include <linux/lustre_log.h>
+#include <linux/obd_ost.h>
+#include <portals/list.h>
+#include <linux/lvfs.h>
+#include <linux/lustre_fsfilt.h>
+#include "llog_internal.h"
+
+#ifdef __KERNEL__
+
+static int llog_lvfs_pad(struct obd_device *obd, struct l_file *file,
+                                int len, int index)
+{
+        struct llog_rec_hdr rec = { 0 };
+        struct llog_rec_tail tail;
+        int rc;
+        ENTRY;
+
+        LASSERT(len >= LLOG_MIN_REC_SIZE && (len & 0x7) == 0);
+
+        tail.lrt_len = rec.lrh_len = len;
+        tail.lrt_index = rec.lrh_index = index;
+        rec.lrh_type = 0;
+
+        rc = fsfilt_write_record(obd, file, &rec, sizeof(rec), &file->f_pos, 0);
+        if (rc) {
+                CERROR("error writing padding record: rc %d\n", rc);
+                goto out;
+        }
+
+        file->f_pos += len - sizeof(rec) - sizeof(tail);
+        rc = fsfilt_write_record(obd, file, &tail, sizeof(tail),&file->f_pos,0);
+        if (rc) {
+                CERROR("error writing padding record: rc %d\n", rc);
+                goto out;
+        }
+
+ out:
+        RETURN(rc);
+}
+
+static int llog_lvfs_write_blob(struct obd_device *obd, struct l_file *file,
+                                struct llog_rec_hdr *rec, void *buf, loff_t off)
+{
+        int rc;
+        struct llog_rec_tail end;
+        loff_t saved_off = file->f_pos;
+        int buflen = rec->lrh_len;
+
+        ENTRY;
+        file->f_pos = off;
+
+        if (!buf) {
+                rc = fsfilt_write_record(obd, file, rec, buflen,&file->f_pos,0);
+                if (rc) {
+                        CERROR("error writing log record: rc %d\n", rc);
+                        goto out;
+                }
+                GOTO(out, rc = 0);
+        }
+
+        /* the buf case */
+        rec->lrh_len = sizeof(*rec) + buflen + sizeof(end);
+        rc = fsfilt_write_record(obd, file, rec, sizeof(*rec), &file->f_pos, 0);
+        if (rc) {
+                CERROR("error writing log hdr: rc %d\n", rc);
+                goto out;
+        }
+
+        rc = fsfilt_write_record(obd, file, buf, buflen, &file->f_pos, 0);
+        if (rc) {
+                CERROR("error writing log buffer: rc %d\n", rc);
+                goto out;
+        }
+
+        end.lrt_len = rec->lrh_len;
+        end.lrt_index = rec->lrh_index;
+        rc = fsfilt_write_record(obd, file, &end, sizeof(end), &file->f_pos, 0);
+        if (rc) {
+                CERROR("error writing log tail: rc %d\n", rc);
+                goto out;
+        }
+
+        rc = 0;
+ out:
+        if (saved_off > file->f_pos)
+                file->f_pos = saved_off;
+        LASSERT(rc <= 0);
+        RETURN(rc);
+}
+
+static int llog_lvfs_read_blob(struct obd_device *obd, struct l_file *file,
+                                void *buf, int size, loff_t off)
+{
+        loff_t offset = off;
+        int rc;
+        ENTRY;
+
+        rc = fsfilt_read_record(obd, file, buf, size, &offset);
+        if (rc) {
+                CERROR("error reading log record: rc %d\n", rc);
+                RETURN(rc);
+        }
+        RETURN(0);
+}
+
+static int llog_lvfs_read_header(struct llog_handle *handle)
+{
+        struct obd_device *obd;
+        int rc;
+        ENTRY;
+
+        LASSERT(sizeof(*handle->lgh_hdr) == LLOG_CHUNK_SIZE);
+
+        obd = handle->lgh_ctxt->loc_exp->exp_obd;
+
+        if (handle->lgh_file->f_dentry->d_inode->i_size == 0) {
+                CDEBUG(D_HA, "not reading header from 0-byte log\n");
+                RETURN(LLOG_EEMPTY);
+        }
+
+        rc = llog_lvfs_read_blob(obd, handle->lgh_file, handle->lgh_hdr,
+                                 LLOG_CHUNK_SIZE, 0);
+        if (rc) {
+                CERROR("error reading log header from %*s\n",
+                       handle->lgh_file->f_dentry->d_name.len,
+                       handle->lgh_file->f_dentry->d_name.name);
+        } else {
+                struct llog_rec_hdr *llh_hdr = &handle->lgh_hdr->llh_hdr;
+                /*
+                 * These need to be fixed for bug 1987
+                 */
+                if (llh_hdr->lrh_type != LLOG_HDR_MAGIC) {
+                        CERROR("bad log %*s header magic: %#x (expected %#x)\n",
+                               handle->lgh_file->f_dentry->d_name.len,
+                               handle->lgh_file->f_dentry->d_name.name,
+                               llh_hdr->lrh_type, LLOG_HDR_MAGIC);
+                        rc = -EIO;
+                } else if (llh_hdr->lrh_len != LLOG_CHUNK_SIZE) {
+                        CERROR("incorrectly sized log %*s header: %#x "
+                               "(expected %#x)\n",
+                               handle->lgh_file->f_dentry->d_name.len,
+                               handle->lgh_file->f_dentry->d_name.name,
+                               llh_hdr->lrh_len, LLOG_CHUNK_SIZE);
+                        CERROR("you may need to re-run lconf --write_conf.\n");
+                        rc = -EIO;
+                }
+        }
+
+        handle->lgh_last_idx = handle->lgh_hdr->llh_tail.lrt_index;
+        handle->lgh_file->f_pos = handle->lgh_file->f_dentry->d_inode->i_size;
+
+        RETURN(rc);
+}
+
+/* returns negative in on error; 0 if success && reccookie == 0; 1 otherwise */
+/* appends if idx == -1, otherwise overwrites record idx. */
+static int llog_lvfs_write_rec(struct llog_handle *loghandle,
+                               struct llog_rec_hdr *rec,
+                               struct llog_cookie *reccookie, int cookiecount,
+                               void *buf, int idx)
+{
+        struct llog_log_hdr *llh;
+        int reclen = rec->lrh_len, index, rc;
+        struct llog_rec_tail *lrt;
+        struct obd_device *obd;
+        struct file *file;
+        size_t left;
+        ENTRY;
+
+        llh = loghandle->lgh_hdr;
+        file = loghandle->lgh_file;
+        obd = loghandle->lgh_ctxt->loc_exp->exp_obd;
+
+        /* record length should not bigger than LLOG_CHUNK_SIZE */
+        if (buf)
+                rc = (reclen > LLOG_CHUNK_SIZE - sizeof(struct llog_rec_hdr) -
+                      sizeof(struct llog_rec_tail)) ? -E2BIG : 0;
+        else
+                rc = (reclen > LLOG_CHUNK_SIZE) ? -E2BIG : 0;
+        if (rc)
+                RETURN(rc);
+
+        if (idx != -1) {
+                loff_t saved_offset;
+
+                /* no header: only allowed to insert record 1 */
+                if (idx != 1 && !file->f_dentry->d_inode->i_size) {
+                        CERROR("idx != -1 in empty log\n");
+                        LBUG();
+                }
+
+                if (idx && llh->llh_size && llh->llh_size != reclen)
+                        RETURN(-EINVAL);
+
+                rc = llog_lvfs_write_blob(obd, file, &llh->llh_hdr, NULL, 0);
+                /* we are done if we only write the header or on error */
+                if (rc || idx == 0)
+                        RETURN(rc);
+
+                saved_offset = sizeof(*llh) + (idx-1)*rec->lrh_len;
+                rc = llog_lvfs_write_blob(obd, file, rec, buf, saved_offset);
+                if (rc == 0 && reccookie) {
+                        reccookie->lgc_lgl = loghandle->lgh_id;
+                        reccookie->lgc_index = idx;
+                        rc = 1;
+                }
+                RETURN(rc);
+        }
+
+        /* Make sure that records don't cross a chunk boundary, so we can
+         * process them page-at-a-time if needed.  If it will cross a chunk
+         * boundary, write in a fake (but referenced) entry to pad the chunk.
+         *
+         * We know that llog_current_log() will return a loghandle that is
+         * big enough to hold reclen, so all we care about is padding here.
+         */
+        left = LLOG_CHUNK_SIZE - (file->f_pos & (LLOG_CHUNK_SIZE - 1));
+        if (buf)
+                reclen = sizeof(*rec) + rec->lrh_len + 
+                        sizeof(struct llog_rec_tail);
+
+        /* NOTE: padding is a record, but no bit is set */
+        if (left != 0 && left != reclen &&
+            left < (reclen + LLOG_MIN_REC_SIZE)) {
+                int bitmap_size = sizeof(llh->llh_bitmap) * 8;
+                loghandle->lgh_last_idx++;
+                rc = llog_lvfs_pad(obd, file, left, loghandle->lgh_last_idx);
+                if (rc)
+                        RETURN(rc);
+                /* if it's the last idx in log file, then return -ENOSPC */
+                if (loghandle->lgh_last_idx == bitmap_size - 1)
+                        RETURN(-ENOSPC);
+        }
+
+        loghandle->lgh_last_idx++;
+        index = loghandle->lgh_last_idx;
+        rec->lrh_index = index;
+        if (buf == NULL) {
+                lrt = (struct llog_rec_tail *)
+                        ((char *)rec + rec->lrh_len - sizeof(*lrt));
+                lrt->lrt_len = rec->lrh_len;
+                lrt->lrt_index = rec->lrh_index;
+        }
+        if (ext2_set_bit(index, llh->llh_bitmap)) {
+                CERROR("argh, index %u already set in log bitmap?\n", index);
+                LBUG(); /* should never happen */
+        }
+        llh->llh_count++;
+        llh->llh_tail.lrt_index = index;
+
+        rc = llog_lvfs_write_blob(obd, file, &llh->llh_hdr, NULL, 0);
+        if (rc)
+                RETURN(rc);
+
+        rc = llog_lvfs_write_blob(obd, file, rec, buf, file->f_pos);
+        if (rc)
+                RETURN(rc);
+
+        CDEBUG(D_HA, "added record "LPX64": idx: %u, %u bytes\n",
+               loghandle->lgh_id.lgl_oid, index, rec->lrh_len);
+        if (rc == 0 && reccookie) {
+                reccookie->lgc_lgl = loghandle->lgh_id;
+                reccookie->lgc_index = index;
+                if (rec->lrh_type == MDS_UNLINK_REC)
+                        reccookie->lgc_subsys = LLOG_UNLINK_ORIG_CTXT;
+                else if (rec->lrh_type == OST_SZ_REC)
+                        reccookie->lgc_subsys = LLOG_SIZE_ORIG_CTXT;
+                else if (rec->lrh_type == OST_RAID1_REC)
+                        reccookie->lgc_subsys = LLOG_RD1_ORIG_CTXT;
+                else
+                        reccookie->lgc_subsys = -1;
+                rc = 1;
+        }
+        if (rc == 0 && rec->lrh_type == LLOG_GEN_REC)
+                rc = 1;
+
+        RETURN(rc);
+}
+
+/* We can skip reading at least as many log blocks as the number of
+* minimum sized log records we are skipping.  If it turns out
+* that we are not far enough along the log (because the
+* actual records are larger than minimum size) we just skip
+* some more records. */
+
+static void llog_skip_over(__u64 *off, int curr, int goal)
+{
+        if (goal <= curr)
+                return;
+        *off = (*off + (goal-curr-1) * LLOG_MIN_REC_SIZE) &
+                ~(LLOG_CHUNK_SIZE - 1);
+}
+
+
+/* sets:
+ *  - cur_offset to the furthest point read in the log file
+ *  - cur_idx to the log index preceeding cur_offset
+ * returns -EIO/-EINVAL on error
+ */
+static int llog_lvfs_next_block(struct llog_handle *loghandle, int *cur_idx,
+                                int next_idx, __u64 *cur_offset, void *buf,
+                                int len)
+{
+        int rc;
+        ENTRY;
+
+        if (len == 0 || len & (LLOG_CHUNK_SIZE - 1))
+                RETURN(-EINVAL);
+
+        CDEBUG(D_OTHER, "looking for log index %u (cur idx %u off "LPU64")\n",
+               next_idx, *cur_idx, *cur_offset);
+
+        while (*cur_offset < loghandle->lgh_file->f_dentry->d_inode->i_size) {
+                struct llog_rec_hdr *rec;
+                struct llog_rec_tail *tail;
+                loff_t ppos;
+
+                llog_skip_over(cur_offset, *cur_idx, next_idx);
+
+                ppos = *cur_offset;
+                rc = fsfilt_read_record(loghandle->lgh_ctxt->loc_exp->exp_obd,
+                                        loghandle->lgh_file, buf, len,
+                                        &ppos);
+
+                if (rc) {
+                        CERROR("Cant read llog block at log id "LPU64
+                               "/%u offset "LPU64"\n",
+                               loghandle->lgh_id.lgl_oid,
+                               loghandle->lgh_id.lgl_ogen,
+                               *cur_offset);
+                        RETURN(rc);
+                }
+
+                /* put number of bytes read into rc to make code simpler */
+                rc = ppos - *cur_offset;
+                *cur_offset = ppos;
+
+                if (rc == 0) /* end of file, nothing to do */
+                        RETURN(0);
+
+                if (rc < sizeof(*tail)) {
+                        CERROR("Invalid llog block at log id "LPU64"/%u offset "
+                               LPU64"\n", loghandle->lgh_id.lgl_oid,
+                               loghandle->lgh_id.lgl_ogen, *cur_offset);
+                        RETURN(-EINVAL);
+                }
+
+                tail = buf + rc - sizeof(struct llog_rec_tail);
+                *cur_idx = tail->lrt_index;
+
+                /* this shouldn't happen */
+                if (tail->lrt_index == 0) {
+                        CERROR("Invalid llog tail at log id "LPU64"/%u offset "
+                               LPU64"\n", loghandle->lgh_id.lgl_oid,
+                               loghandle->lgh_id.lgl_ogen, *cur_offset);
+                        RETURN(-EINVAL);
+                }
+                if (tail->lrt_index < next_idx)
+                        continue;
+
+                /* sanity check that the start of the new buffer is no farther
+                 * than the record that we wanted.  This shouldn't happen. */
+                rec = buf;
+                if (rec->lrh_index > next_idx) {
+                        CERROR("missed desired record? %u > %u\n",
+                               rec->lrh_index, next_idx);
+                        RETURN(-ENOENT);
+                }
+                RETURN(0);
+        }
+        RETURN(-EIO);
+}
+
+static struct file *llog_filp_open(char *name, int flags, int mode)
+{
+        char *logname;
+        struct file *filp;
+        int len;
+
+        OBD_ALLOC(logname, PATH_MAX);
+        if (logname == NULL)
+                return ERR_PTR(-ENOMEM);
+
+        len = snprintf(logname, PATH_MAX, "LOGS/%s", name);
+        if (len >= PATH_MAX - 1) {
+                filp = ERR_PTR(-ENAMETOOLONG);
+        } else {
+                filp = l_filp_open(logname, flags, mode);
+                if (IS_ERR(filp))
+                        CERROR("logfile creation %s: %ld\n", logname,
+                               PTR_ERR(filp));
+        }
+
+        OBD_FREE(logname, PATH_MAX);
+        return filp;
+}
+
+/* This is a callback from the llog_* functions.
+ * Assumes caller has already pushed us into the kernel context. */
+static int llog_lvfs_create(struct llog_ctxt *ctxt, struct llog_handle **res,
+                            struct llog_logid *logid, char *name)
+{
+        struct llog_handle *handle;
+        struct obd_device *obd;
+        struct l_dentry *dchild = NULL;
+        struct obdo *oa = NULL;
+        int rc = 0, cleanup_phase = 1;
+        int open_flags = O_RDWR | O_CREAT | O_LARGEFILE;
+        ENTRY;
+
+        handle = llog_alloc_handle();
+        if (handle == NULL)
+                RETURN(-ENOMEM);
+        *res = handle;
+
+        LASSERT(ctxt);
+        LASSERT(ctxt->loc_exp);
+        obd = ctxt->loc_exp->exp_obd;
+
+        if (logid != NULL) {
+                dchild = obd_lvfs_fid2dentry(ctxt->loc_exp, logid->lgl_oid,
+                                             logid->lgl_ogen, logid->lgl_ogr);
+
+                if (IS_ERR(dchild)) {
+                        rc = PTR_ERR(dchild);
+                        CERROR("error looking up logfile "LPX64":0x%x: rc %d\n",
+                               logid->lgl_oid, logid->lgl_ogen, rc);
+                        GOTO(cleanup, rc);
+                }
+
+                cleanup_phase = 2;
+                if (dchild->d_inode == NULL) {
+                        rc = -ENOENT;
+                        CERROR("nonexistent log file "LPX64":"LPX64": rc %d\n",
+                               logid->lgl_oid, logid->lgl_ogr, rc);
+                        GOTO(cleanup, rc);
+                }
+
+                handle->lgh_file = l_dentry_open(&obd->obd_ctxt, dchild,
+                                                    O_RDWR | O_LARGEFILE);
+                if (IS_ERR(handle->lgh_file)) {
+                        rc = PTR_ERR(handle->lgh_file);
+                        CERROR("error opening logfile "LPX64"0x%x: rc %d\n",
+                               logid->lgl_oid, logid->lgl_ogen, rc);
+                        GOTO(cleanup, rc);
+                }
+
+                /* assign the value of lgh_id for handle directly */
+                handle->lgh_id = *logid;
+
+        } else if (name) {
+                handle->lgh_file = llog_filp_open(name, open_flags, 0644);
+                if (IS_ERR(handle->lgh_file))
+                        GOTO(cleanup, rc = PTR_ERR(handle->lgh_file));
+
+                handle->lgh_id.lgl_ogr = 1;
+                handle->lgh_id.lgl_oid =
+                        handle->lgh_file->f_dentry->d_inode->i_ino;
+                handle->lgh_id.lgl_ogen =
+                        handle->lgh_file->f_dentry->d_inode->i_generation;
+        } else {
+                oa = obdo_alloc();
+                if (oa == NULL)
+                        GOTO(cleanup, rc = -ENOMEM);
+                oa->o_gr = FILTER_GROUP_LLOG;
+                oa->o_valid = OBD_MD_FLGENER | OBD_MD_FLGROUP;
+                rc = obd_create(ctxt->loc_exp, oa, NULL, NULL);
+                if (rc)
+                        GOTO(cleanup, rc);
+
+                dchild = obd_lvfs_fid2dentry(ctxt->loc_exp, oa->o_id,
+                                             oa->o_generation, oa->o_gr);
+
+                if (IS_ERR(dchild))
+                        GOTO(cleanup, rc = PTR_ERR(dchild));
+                cleanup_phase = 2;
+                handle->lgh_file = l_dentry_open(&obd->obd_ctxt, dchild,
+                                                 open_flags);
+                if (IS_ERR(handle->lgh_file))
+                        GOTO(cleanup, rc = PTR_ERR(handle->lgh_file));
+
+                handle->lgh_id.lgl_ogr = oa->o_gr;
+                handle->lgh_id.lgl_oid = oa->o_id;
+                handle->lgh_id.lgl_ogen = oa->o_generation;
+        }
+
+        handle->lgh_ctxt = ctxt;
+ finish:
+        if (oa)
+                obdo_free(oa);
+        RETURN(rc);
+cleanup:
+        switch (cleanup_phase) {
+        case 2:
+                l_dput(dchild);
+        case 1:
+                llog_free_handle(handle);
+        }
+        goto finish;
+}
+
+static int llog_lvfs_close(struct llog_handle *handle)
+{
+        int rc;
+        ENTRY;
+
+        rc = filp_close(handle->lgh_file, 0);
+        if (rc)
+                CERROR("error closing log: rc %d\n", rc);
+        RETURN(rc);
+}
+
+static int llog_lvfs_destroy(struct llog_handle *handle)
+{
+        struct dentry *fdentry;
+        struct obdo *oa;
+        int rc;
+        ENTRY;
+
+        fdentry = handle->lgh_file->f_dentry;
+        if (!strcmp(fdentry->d_parent->d_name.name, "LOGS")) {
+                struct obd_device *obd = handle->lgh_ctxt->loc_exp->exp_obd;
+                struct inode *inode = fdentry->d_parent->d_inode;
+                struct obd_run_ctxt saved;
+
+                push_ctxt(&saved, &obd->obd_ctxt, NULL);
+                dget(fdentry);
+                rc = llog_lvfs_close(handle);
+
+                if (rc == 0) {
+                        down(&inode->i_sem);
+                        rc = vfs_unlink(inode, fdentry);
+                        up(&inode->i_sem);
+                }
+
+                dput(fdentry);
+                pop_ctxt(&saved, &obd->obd_ctxt, NULL);
+                RETURN(rc);
+        }
+
+        oa = obdo_alloc();
+        if (oa == NULL)
+                RETURN(-ENOMEM);
+
+        oa->o_id = handle->lgh_id.lgl_oid;
+        oa->o_gr = handle->lgh_id.lgl_ogr;
+        oa->o_generation = handle->lgh_id.lgl_ogen;
+        oa->o_valid = OBD_MD_FLID | OBD_MD_FLGROUP | OBD_MD_FLGENER;
+
+        rc = llog_lvfs_close(handle);
+        if (rc)
+                GOTO(out, rc);
+
+        rc = obd_destroy(handle->lgh_ctxt->loc_exp, oa, NULL, NULL);
+ out:
+        obdo_free(oa);
+        RETURN(rc);
+}
+
+/* reads the catalog list */
+int llog_get_cat_list(struct obd_device *obd, struct obd_device *disk_obd,
+                      char *name, int count, struct llog_catid *idarray)
+{
+        struct obd_run_ctxt saved;
+        struct l_file *file;
+        int rc;
+        int size = sizeof(*idarray) * count;
+        loff_t off = 0;
+
+        LASSERT(count);
+
+        push_ctxt(&saved, &obd->obd_ctxt, NULL);
+        file = filp_open(name, O_RDWR | O_CREAT | O_LARGEFILE, 0700);
+        if (!file || IS_ERR(file)) {
+                rc = PTR_ERR(file);
+                CERROR("OBD filter: cannot open/create %s: rc = %d\n",
+                       name, rc);
+                GOTO(out, rc);
+        }
+
+        if (!S_ISREG(file->f_dentry->d_inode->i_mode)) {
+                CERROR("%s is not a regular file!: mode = %o\n", name,
+                       file->f_dentry->d_inode->i_mode);
+                GOTO(out, rc = -ENOENT);
+        }
+
+        rc = fsfilt_read_record(disk_obd, file, idarray, size, &off);
+        if (rc) {
+                CDEBUG(D_INODE,"OBD filter: error reading %s: rc %d\n",
+                       name, rc);
+                GOTO(out, rc);
+        }
+
+ out:
+        pop_ctxt(&saved, &obd->obd_ctxt, NULL);
+        if (file && !IS_ERR(file))
+                rc = filp_close(file, 0);
+        RETURN(rc);
+}
+EXPORT_SYMBOL(llog_get_cat_list);
+
+/* writes the cat list */
+int llog_put_cat_list(struct obd_device *obd, struct obd_device *disk_obd,
+                      char *name, int count, struct llog_catid *idarray)
+{
+        struct obd_run_ctxt saved;
+        struct l_file *file;
+        int rc;
+        int size = sizeof(*idarray) * count;
+        loff_t off = 0;
+
+        LASSERT(count);
+
+        push_ctxt(&saved, &obd->obd_ctxt, NULL);
+        file = filp_open(name, O_RDWR | O_CREAT | O_LARGEFILE, 0700);
+        if (!file || IS_ERR(file)) {
+                rc = PTR_ERR(file);
+                CERROR("OBD filter: cannot open/create %s: rc = %d\n",
+                       name, rc);
+                GOTO(out, rc);
+        }
+
+        if (!S_ISREG(file->f_dentry->d_inode->i_mode)) {
+                CERROR("%s is not a regular file!: mode = %o\n", name,
+                       file->f_dentry->d_inode->i_mode);
+                GOTO(out, rc = -ENOENT);
+        }
+
+        rc = fsfilt_write_record(disk_obd, file, idarray, size, &off, 1);
+        if (rc) {
+                CDEBUG(D_INODE,"OBD filter: error reading %s: rc %d\n",
+                       name, rc);
+                GOTO(out, rc);
+        }
+
+ out:
+        pop_ctxt(&saved, &obd->obd_ctxt, NULL);
+        if (file && !IS_ERR(file))
+                rc = filp_close(file, 0);
+        RETURN(rc);
+}
+
+struct llog_operations llog_lvfs_ops = {
+        lop_write_rec:   llog_lvfs_write_rec,
+        lop_next_block:  llog_lvfs_next_block,
+        lop_read_header: llog_lvfs_read_header,
+        lop_create:      llog_lvfs_create,
+        lop_destroy:     llog_lvfs_destroy,
+        lop_close:       llog_lvfs_close,
+        //        lop_cancel: llog_lvfs_cancel,
+};
+
+EXPORT_SYMBOL(llog_lvfs_ops);
+
+#else /* !__KERNEL__ */
+
+static int llog_lvfs_read_header(struct llog_handle *handle)
+{
+        LBUG();
+        return 0;
+}
+
+static int llog_lvfs_write_rec(struct llog_handle *loghandle,
+                               struct llog_rec_hdr *rec,
+                               struct llog_cookie *reccookie, int cookiecount,
+                               void *buf, int idx)
+{
+        LBUG();
+        return 0;
+}
+
+static int llog_lvfs_next_block(struct llog_handle *loghandle, int *cur_idx,
+                                int next_idx, __u64 *cur_offset, void *buf,
+                                int len)
+{
+        LBUG();
+        return 0;
+}
+
+static int llog_lvfs_create(struct llog_ctxt *ctxt, struct llog_handle **res,
+                            struct llog_logid *logid, char *name)
+{
+        LBUG();
+        return 0;
+}
+
+static int llog_lvfs_close(struct llog_handle *handle)
+{
+        LBUG();
+        return 0;
+}
+
+static int llog_lvfs_destroy(struct llog_handle *handle)
+{
+        LBUG();
+        return 0;
+}
+
+int llog_get_cat_list(struct obd_device *obd, struct obd_device *disk_obd,
+                      char *name, int count, struct llog_catid *idarray)
+{
+        LBUG();
+        return 0;
+}
+
+int llog_put_cat_list(struct obd_device *obd, struct obd_device *disk_obd,
+                      char *name, int count, struct llog_catid *idarray)
+{
+        LBUG();
+        return 0;
+}
+
+struct llog_operations llog_lvfs_ops = {
+        lop_write_rec:   llog_lvfs_write_rec,
+        lop_next_block:  llog_lvfs_next_block,
+        lop_read_header: llog_lvfs_read_header,
+        lop_create:      llog_lvfs_create,
+        lop_destroy:     llog_lvfs_destroy,
+        lop_close:       llog_lvfs_close,
+//        lop_cancel:      llog_lvfs_cancel,
+};
+#endif
diff --git a/lustre/obdclass/llog_obd.c b/lustre/obdclass/llog_obd.c
index bdcf6d3..04911d5 100644
--- a/lustre/obdclass/llog_obd.c
+++ b/lustre/obdclass/llog_obd.c
@@ -22,17 +22,20 @@
 #include <linux/obd_class.h>
 #include <linux/lustre_log.h>
 #include <portals/list.h>
+#include "llog_internal.h"
 
 /* helper functions for calling the llog obd methods */
 
-int obd_llog_setup(struct obd_device *obd, int index,
-                   struct obd_device *disk_obd, int count,
-                   struct llog_logid *logid, struct llog_operations *op)
+int llog_setup(struct obd_device *obd, struct obd_llogs *llogs, int index,
+               struct obd_device *disk_obd, int count, struct llog_logid *logid,
+               struct llog_operations *op)
 {
         int rc = 0;
         struct llog_ctxt *ctxt;
         ENTRY;
 
+        LASSERT(llogs);
+
         if (index < 0 || index >= LLOG_MAX_CTXTS)
                 RETURN(-EFAULT);
 
@@ -40,53 +43,84 @@ int obd_llog_setup(struct obd_device *obd, int index,
         if (!ctxt)
                 RETURN(-ENOMEM);
 
-        obd->obd_llog_ctxt[index] = ctxt;
-        ctxt->loc_logops = op;
+        llogs->llog_ctxt[index] = ctxt;
         ctxt->loc_obd = obd;
-        ctxt->loc_idx = index;
+        ctxt->loc_llogs = llogs;
         ctxt->loc_exp = class_export_get(disk_obd->obd_self_export);
+        ctxt->loc_idx = index;
+        ctxt->loc_logops = op;
         sema_init(&ctxt->loc_sem, 1);
 
-        if (op->lop_close == llog_lvfs_ops.lop_close) {
-                ctxt->loc_fsops = disk_obd->obd_fsops;
-                ctxt->loc_lvfs_ctxt = &disk_obd->obd_lvfs_ctxt;
-                if (!strcmp(disk_obd->obd_type->typ_name, "mds")) {
-                        struct mds_obd *mds = &disk_obd->u.mds;
-                        ctxt->loc_objects_dir = mds->mds_objects_dir;
-                        ctxt->loc_logs_dir = mds->mds_logs_dir;
-                }
-        }
-
         if (op->lop_setup)
-                rc = op->lop_setup(obd, index, disk_obd, count, logid);
-        if (ctxt && rc) {
-                obd->obd_llog_ctxt[index] = NULL;
+                rc = op->lop_setup(obd, llogs, index, disk_obd, count, logid);
+        if (ctxt && rc)
                 OBD_FREE(ctxt, sizeof(*ctxt));
-        }
 
         RETURN(rc);
 }
-EXPORT_SYMBOL(obd_llog_setup);
+EXPORT_SYMBOL(llog_setup);
 
-int obd_llog_cleanup(struct llog_ctxt *ctxt)
+int llog_cleanup(struct llog_ctxt *ctxt)
 {
         int rc = 0;
         ENTRY;
 
         LASSERT(ctxt);
 
-        ctxt->loc_obd->obd_llog_ctxt[ctxt->loc_idx] = NULL;
+        if (CTXTP(ctxt, cleanup))
+                rc = CTXTP(ctxt, cleanup)(ctxt);
+
+        ctxt->loc_llogs->llog_ctxt[ctxt->loc_idx] = NULL;
         class_export_put(ctxt->loc_exp);
         ctxt->loc_exp = NULL;
+        OBD_FREE(ctxt, sizeof(*ctxt));
 
-        if (CTXTP(ctxt, cleanup)) 
-                rc = CTXTP(ctxt, cleanup)(ctxt);
-        else
-                OBD_FREE(ctxt, sizeof(*ctxt));
+        RETURN(rc);
+}
+EXPORT_SYMBOL(llog_cleanup);
+
+int llog_sync(struct llog_ctxt *ctxt, struct obd_export *exp)
+{
+        int rc = 0;
+        ENTRY;
+
+        if (!ctxt)
+                RETURN(0);
+
+        if (CTXTP(ctxt, sync))
+                rc = CTXTP(ctxt, sync)(ctxt, exp);
+
+        RETURN(rc);
+}
+EXPORT_SYMBOL(llog_sync);
+
+int llog_add(struct llog_ctxt *ctxt, struct llog_rec_hdr *rec,
+                struct lov_stripe_md *lsm, struct llog_cookie *logcookies,
+                int numcookies)
+{
+        int rc;
+        ENTRY;
+
+        LASSERT(ctxt);
+        CTXT_CHECK_OP(ctxt, add, -EOPNOTSUPP);
 
+        rc = CTXTP(ctxt, add)(ctxt, rec, lsm, logcookies, numcookies);
         RETURN(rc);
 }
-EXPORT_SYMBOL(obd_llog_cleanup);
+EXPORT_SYMBOL(llog_add);
+
+int llog_cancel(struct llog_ctxt *ctxt, struct lov_stripe_md *lsm,
+                int count, struct llog_cookie *cookies, int flags)
+{
+        int rc;
+        ENTRY;
+
+        LASSERT(ctxt);
+        CTXT_CHECK_OP(ctxt, cancel, -EOPNOTSUPP);
+        rc = CTXTP(ctxt, cancel)(ctxt, lsm, count, cookies, flags);
+        RETURN(rc);
+}
+EXPORT_SYMBOL(llog_cancel);
 
 /* callback func for llog_process in llog_obd_origin_setup */
 static int cat_cancel_cb(struct llog_handle *cathandle,
@@ -139,13 +173,13 @@ static int cat_cancel_cb(struct llog_handle *cathandle,
 
 /* lop_setup method for filter/osc */
 // XXX how to set exports
-int llog_obd_origin_setup(struct obd_device *obd, int index,
-                          struct obd_device *disk_obd, int count,
+int llog_obd_origin_setup(struct obd_device *obd, struct obd_llogs *llogs,
+                          int index, struct obd_device *disk_obd, int count,
                           struct llog_logid *logid)
 {
         struct llog_ctxt *ctxt;
         struct llog_handle *handle;
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
         int rc;
         ENTRY;
 
@@ -154,7 +188,7 @@ int llog_obd_origin_setup(struct obd_device *obd, int index,
 
         LASSERT(count == 1);
 
-        ctxt = llog_get_context(obd, index);
+        ctxt = llog_get_context(llogs, index);
         LASSERT(ctxt);
         llog_gen_init(ctxt);
 
@@ -166,26 +200,93 @@ int llog_obd_origin_setup(struct obd_device *obd, int index,
                         *logid = handle->lgh_id;
         }
         if (rc)
-                RETURN(rc);
+                GOTO(out, rc);
 
         ctxt->loc_handle = handle;
-        push_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL);
+        push_ctxt(&saved, &disk_obd->obd_ctxt, NULL);
         rc = llog_init_handle(handle, LLOG_F_IS_CAT, NULL);
-        pop_ctxt(&saved, &disk_obd->obd_lvfs_ctxt, NULL);
+        pop_ctxt(&saved, &disk_obd->obd_ctxt, NULL);
         if (rc)
-                RETURN(rc);
+                GOTO(out, rc);
 
         rc = llog_process(handle, (llog_cb_t)cat_cancel_cb, NULL, NULL);
         if (rc)
                 CERROR("llog_process with cat_cancel_cb failed: %d\n", rc);
+ out:
+        if (ctxt && rc) {
+                llogs->llog_ctxt[index] = NULL;
+                OBD_FREE(ctxt, sizeof(*ctxt));
+        }
         RETURN(rc);
 }
 EXPORT_SYMBOL(llog_obd_origin_setup);
 
-int obd_llog_cat_initialize(struct obd_device *obd, int count, char *name)
+int llog_obd_origin_cleanup(struct llog_ctxt *ctxt)
+{
+        struct llog_handle *cathandle, *n, *loghandle;
+        struct llog_log_hdr *llh;
+        int rc, index;
+        ENTRY;
+
+        if (!ctxt)
+                return 0;
+
+        cathandle = ctxt->loc_handle;
+        if (cathandle) {
+                list_for_each_entry_safe(loghandle, n,
+                                         &cathandle->u.chd.chd_head,
+                                         u.phd.phd_entry) {
+                        llh = loghandle->lgh_hdr;
+                        if ((llh->llh_flags &
+                                LLOG_F_ZAP_WHEN_EMPTY) &&
+                            (llh->llh_count == 1)) {
+                                rc = llog_destroy(loghandle);
+                                if (rc)
+                                        CERROR("failure destroying log during "
+                                               "cleanup: %d\n", rc);
+                                LASSERT(rc == 0);
+
+                                index = loghandle->u.phd.phd_cookie.lgc_index;
+                                llog_free_handle(loghandle);
+
+                                LASSERT(index);
+                                llog_cat_set_first_idx(cathandle, index);
+                                rc = llog_cancel_rec(cathandle, index);
+                                if (rc == 0)
+                                        CDEBUG(D_HA, "cancel plain log at index"
+                                               " %u of catalog "LPX64"\n",
+                                               index,cathandle->lgh_id.lgl_oid);
+                        }
+                }
+                llog_cat_put(ctxt->loc_handle);
+        }
+        return 0;
+}
+EXPORT_SYMBOL(llog_obd_origin_cleanup);
+
+/* add for obdfilter/sz and mds/unlink */
+int llog_obd_origin_add(struct llog_ctxt *ctxt,
+                        struct llog_rec_hdr *rec, struct lov_stripe_md *lsm,
+                        struct llog_cookie *logcookies, int numcookies)
+{
+        struct llog_handle *cathandle;
+        int rc;
+        ENTRY;
+
+        cathandle = ctxt->loc_handle;
+        LASSERT(cathandle != NULL);
+        rc = llog_cat_add_rec(cathandle, rec, logcookies, NULL);
+        if (rc != 1)
+                CERROR("write one catalog record failed: %d\n", rc);
+        RETURN(rc);
+}
+EXPORT_SYMBOL(llog_obd_origin_add);
+
+int llog_cat_initialize(struct obd_device *obd, struct obd_llogs *llogs, int count)
 {
         struct llog_catid *idarray;
         int size = sizeof(*idarray) * count;
+        char name[32] = CATLIST;
         int rc;
         ENTRY;
 
@@ -193,21 +294,19 @@ int obd_llog_cat_initialize(struct obd_device *obd, int count, char *name)
         if (!idarray)
                 RETURN(-ENOMEM);
 
-        rc = llog_get_cat_list(&obd->obd_lvfs_ctxt, obd->obd_fsops,
-                               name, count, idarray);
+        rc = llog_get_cat_list(obd, obd, name, count, idarray);
         if (rc) {
                 CERROR("rc: %d\n", rc);
                 GOTO(out, rc);
         }
 
-        rc = obd_llog_init(obd, obd, count, idarray);
+        rc = obd_llog_init(obd, llogs, obd, count, idarray);
         if (rc) {
                 CERROR("rc: %d\n", rc);
                 GOTO(out, rc);
         }
 
-        rc = llog_put_cat_list(&obd->obd_lvfs_ctxt, obd->obd_fsops,
-                               name, count, idarray);
+        rc = llog_put_cat_list(obd, obd, name, count, idarray);
         if (rc) {
                 CERROR("rc: %d\n", rc);
                 GOTO(out, rc);
@@ -217,29 +316,30 @@ int obd_llog_cat_initialize(struct obd_device *obd, int count, char *name)
         OBD_FREE(idarray, size);
         RETURN(rc);
 }
-EXPORT_SYMBOL(obd_llog_cat_initialize);
+EXPORT_SYMBOL(llog_cat_initialize);
 
-int obd_llog_init(struct obd_device *obd, struct obd_device *disk_obd,
-                  int count, struct llog_catid *logid)
+int obd_llog_init(struct obd_device *obd, struct obd_llogs *llogs,
+                  struct obd_device *disk_obd, int count,
+                  struct llog_catid *logid)
 {
         int rc;
         ENTRY;
         OBD_CHECK_OP(obd, llog_init, 0);
         OBD_COUNTER_INCREMENT(obd, llog_init);
 
-        rc = OBP(obd, llog_init)(obd, disk_obd, count, logid);
+        rc = OBP(obd, llog_init)(obd, llogs, disk_obd, count, logid);
         RETURN(rc);
 }
 EXPORT_SYMBOL(obd_llog_init);
 
-int obd_llog_finish(struct obd_device *obd, int count)
+int obd_llog_finish(struct obd_device *obd, struct obd_llogs *llogs, int count)
 {
         int rc;
         ENTRY;
         OBD_CHECK_OP(obd, llog_finish, 0);
         OBD_COUNTER_INCREMENT(obd, llog_finish);
 
-        rc = OBP(obd, llog_finish)(obd, count);
+        rc = OBP(obd, llog_finish)(obd, llogs, count);
         RETURN(rc);
 }
 EXPORT_SYMBOL(obd_llog_finish);
diff --git a/lustre/obdclass/llog_test.c b/lustre/obdclass/llog_test.c
index bd50854..5e3097e 100644
--- a/lustre/obdclass/llog_test.c
+++ b/lustre/obdclass/llog_test.c
@@ -81,12 +81,13 @@ static int verify_handle(char *test, struct llog_handle *llh, int num_recs)
 static int llog_test_1(struct obd_device *obd, char *name)
 {
         struct llog_handle *llh;
-        struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_TEST_ORIG_CTXT);
+        struct llog_ctxt *ctxt;
         int rc;
         int rc2;
         ENTRY;
 
         CWARN("1a: create a log with name: %s\n", name);
+        ctxt = llog_get_context(&obd->obd_llogs, LLOG_TEST_ORIG_CTXT);
         LASSERT(ctxt);
 
         rc = llog_create(ctxt, &llh, NULL, name);
@@ -117,9 +118,10 @@ static int llog_test_2(struct obd_device *obd, char *name,
         struct llog_handle *loghandle;
         struct llog_logid logid;
         int rc;
-        struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_TEST_ORIG_CTXT);
+        struct llog_ctxt *ctxt;
         ENTRY;
 
+        ctxt = llog_get_context(&obd->obd_llogs, LLOG_TEST_ORIG_CTXT);
         CWARN("2a: re-open a log with name: %s\n", name);
         rc = llog_create(ctxt, llh, NULL, name);
         if (rc) {
@@ -230,13 +232,13 @@ static int llog_test_4(struct obd_device *obd)
         int rc, i, buflen;
         struct llog_mini_rec lmr;
         struct llog_cookie cookie;
-        struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_TEST_ORIG_CTXT);
+        struct llog_ctxt *ctxt;
         int num_recs = 0;
         char *buf;
         struct llog_rec_hdr rec;
-
         ENTRY;
 
+        ctxt = llog_get_context(&obd->obd_llogs, LLOG_TEST_ORIG_CTXT);
         lmr.lmr_hdr.lrh_len = lmr.lmr_tail.lrt_len = LLOG_MIN_REC_SIZE;
         lmr.lmr_hdr.lrh_type = 0xf00f00;
 
@@ -364,6 +366,8 @@ static int llog_cancel_rec_cb(struct llog_handle *llh, struct llog_rec_hdr *rec,
         RETURN(0);
 }
 
+
+
 /* Test log and catalogue processing */
 static int llog_test_5(struct obd_device *obd)
 {
@@ -371,10 +375,10 @@ static int llog_test_5(struct obd_device *obd)
         char name[10];
         int rc;
         struct llog_mini_rec lmr;
-        struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_TEST_ORIG_CTXT);
-
+        struct llog_ctxt *ctxt;
         ENTRY;
 
+        ctxt = llog_get_context(&obd->obd_llogs, LLOG_TEST_ORIG_CTXT);
         lmr.lmr_hdr.lrh_len = lmr.lmr_tail.lrt_len = LLOG_MIN_REC_SIZE;
         lmr.lmr_hdr.lrh_type = 0xf00f00;
 
@@ -422,14 +426,6 @@ static int llog_test_5(struct obd_device *obd)
                 GOTO(out, rc);
         }
 
-        CWARN("5f: print plain log entries reversely.. expect 6\n");
-        rc = llog_cat_reverse_process(llh, plain_print_cb, "foobar");
-        if (rc) {
-                CERROR("5f: reversely process with plain_print_cb failed: %d\n",
-                       rc);
-                GOTO(out, rc);
-        }
-
  out:
         CWARN("5: close re-opened catalog\n");
         if (llh)
@@ -443,8 +439,8 @@ static int llog_test_5(struct obd_device *obd)
 static int llog_test_6(struct obd_device *obd, char *name)
 {
         struct obd_device *mdc_obd;
-        struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_TEST_ORIG_CTXT);
-        struct obd_uuid *mds_uuid = &ctxt->loc_exp->exp_obd->obd_uuid;
+        struct llog_ctxt *ctxt;
+        struct obd_uuid *mds_uuid;
         struct lustre_handle exph = {0, };
         struct obd_export *exp;
         struct obd_uuid uuid = {"LLOG_TEST6_UUID"};
@@ -452,6 +448,9 @@ static int llog_test_6(struct obd_device *obd, char *name)
         struct llog_ctxt *nctxt;
         int rc;
 
+        ctxt = llog_get_context(&obd->obd_llogs, LLOG_TEST_ORIG_CTXT);
+        mds_uuid = &ctxt->loc_exp->exp_obd->obd_uuid;
+
         CWARN("6a: re-open log %s using client API\n", name);
         mdc_obd = class_find_client_obd(mds_uuid, LUSTRE_MDC_NAME, NULL);
         if (mdc_obd == NULL) {
@@ -467,7 +466,7 @@ static int llog_test_6(struct obd_device *obd, char *name)
         }
         exp = class_conn2export(&exph);
 
-        nctxt = llog_get_context(mdc_obd, LLOG_CONFIG_REPL_CTXT);
+        nctxt = llog_get_context(&mdc_obd->obd_llogs, LLOG_CONFIG_REPL_CTXT);
         rc = llog_create(nctxt, &llh, NULL, name);
         if (rc) {
                 CERROR("6: llog_create failed %d\n", rc);
@@ -484,10 +483,6 @@ static int llog_test_6(struct obd_device *obd, char *name)
         if (rc)
                 CERROR("6: llog_process failed %d\n", rc);
 
-        rc = llog_reverse_process(llh, (llog_cb_t)plain_print_cb, NULL, NULL);
-        if (rc)
-                CERROR("6: llog_reverse_process failed %d\n", rc);
-
 parse_out:
         rc = llog_close(llh);
         if (rc) {
@@ -501,13 +496,14 @@ parse_out:
 
 static int llog_test_7(struct obd_device *obd)
 {
-        struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_TEST_ORIG_CTXT);
+        struct llog_ctxt *ctxt;
         struct llog_handle *llh;
         struct llog_create_rec lcr;
         char name[10];
         int rc;
         ENTRY;
 
+        ctxt = llog_get_context(&obd->obd_llogs, LLOG_TEST_ORIG_CTXT);
         sprintf(name, "%x", llog_test_rand+2);
         CWARN("7: create a log with name: %s\n", name);
         LASSERT(ctxt);
@@ -541,14 +537,15 @@ static int llog_test_7(struct obd_device *obd)
 static int llog_run_tests(struct obd_device *obd)
 {
         struct llog_handle *llh;
-        struct lvfs_run_ctxt saved;
-        struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_TEST_ORIG_CTXT);
+        struct obd_run_ctxt saved;
+        struct llog_ctxt *ctxt;
         int rc, err, cleanup_phase = 0;
         char name[10];
         ENTRY;
 
+        ctxt = llog_get_context(&obd->obd_llogs, LLOG_TEST_ORIG_CTXT);
         sprintf(name, "%x", llog_test_rand);
-        push_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_lvfs_ctxt, NULL);
+        push_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_ctxt, NULL);
 
         rc = llog_test_1(obd, name);
         if (rc)
@@ -588,47 +585,46 @@ static int llog_run_tests(struct obd_device *obd)
                 if (!rc)
                         rc = err;
         case 0:
-                pop_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_lvfs_ctxt, NULL);
+                pop_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_ctxt, NULL);
         }
 
         return rc;
 }
 
 
-static int llog_test_llog_init(struct obd_device *obd, struct obd_device *tgt,
-                               int count, struct llog_catid *logid)
+static int llog_test_llog_init(struct obd_device *obd, struct obd_llogs *llogs,
+                               struct obd_device *tgt, int count,
+                               struct llog_catid *logid)
 {
         int rc;
         ENTRY;
 
-        rc = obd_llog_setup(obd, LLOG_TEST_ORIG_CTXT, tgt, 0, NULL,
-                            &llog_lvfs_ops);
+        rc = llog_setup(obd, llogs, LLOG_TEST_ORIG_CTXT, tgt, 0,
+                        NULL, &llog_lvfs_ops);
         RETURN(rc);
 }
 
-static int llog_test_llog_finish(struct obd_device *obd, int count)
+static int llog_test_llog_finish(struct obd_device *obd,
+                                 struct obd_llogs *llogs, int count)
 {
         int rc;
         ENTRY;
 
-        rc = obd_llog_cleanup(llog_get_context(obd, LLOG_TEST_ORIG_CTXT));
+        rc = llog_cleanup(llog_get_context(&obd->obd_llogs, LLOG_TEST_ORIG_CTXT));
         RETURN(rc);
 }
 
 static int llog_test_cleanup(struct obd_device *obd, int flags)
 {
-        int rc = obd_llog_finish(obd, 0);
+        int rc = obd_llog_finish(obd, &obd->obd_llogs, 0);
         if (rc)
                 CERROR("failed to llog_test_llog_finish: %d\n", rc);
 
-        lprocfs_obd_cleanup(obd);
-
         return rc;
 }
 
 static int llog_test_setup(struct obd_device *obd, obd_count len, void *buf)
 {
-        struct lprocfs_static_vars lvars;
         struct lustre_cfg *lcfg = buf;
         struct obd_device *tgt;
         int rc;
@@ -646,7 +642,7 @@ static int llog_test_setup(struct obd_device *obd, obd_count len, void *buf)
                 RETURN(-EINVAL);
         }
 
-        rc = obd_llog_init(obd, tgt, 0, NULL);
+        rc = obd_llog_init(obd, &obd->obd_llogs, tgt, 0, NULL);
         if (rc)
                 RETURN(rc);
 
@@ -655,19 +651,35 @@ static int llog_test_setup(struct obd_device *obd, obd_count len, void *buf)
         rc = llog_run_tests(obd);
         if (rc)
                 llog_test_cleanup(obd, 0);
+        RETURN(rc);
+}
 
-        lprocfs_init_vars(llog_test, &lvars);
-        lprocfs_obd_setup(obd, lvars.obd_vars);
+static struct lprocfs_vars lprocfs_ost_obd_vars[] = { {0} };
+static struct lprocfs_vars lprocfs_ost_module_vars[] = { {0} };
+LPROCFS_INIT_VARS(ost, lprocfs_ost_module_vars, lprocfs_ost_obd_vars)
 
-        RETURN(rc);
+static int llog_test_attach(struct obd_device *dev, obd_count len, void *data)
+{
+        struct lprocfs_static_vars lvars;
+
+        lprocfs_init_vars(ost, &lvars);
+        return lprocfs_obd_attach(dev, lvars.obd_vars);
+}
+
+static int llog_test_detach(struct obd_device *dev)
+{
+        return lprocfs_obd_detach(dev);
 }
 
 static struct obd_ops llog_obd_ops = {
-        .o_owner       = THIS_MODULE,
-        .o_setup       = llog_test_setup,
-        .o_cleanup     = llog_test_cleanup,
-        .o_llog_init   = llog_test_llog_init,
-        .o_llog_finish = llog_test_llog_finish,
+        o_owner:       THIS_MODULE,
+        o_attach:      llog_test_attach,
+        o_detach:      llog_test_detach,
+        o_setup:       llog_test_setup,
+        o_cleanup:     llog_test_cleanup,
+        o_llog_init:   llog_test_llog_init,
+        o_llog_finish: llog_test_llog_finish,
+
 };
 
 static struct lprocfs_vars lprocfs_obd_vars[] = { {0} };
@@ -679,7 +691,8 @@ static int __init llog_test_init(void)
         struct lprocfs_static_vars lvars;
 
         lprocfs_init_vars(llog_test, &lvars);
-        return class_register_type(&llog_obd_ops,lvars.module_vars,"llog_test");
+        return class_register_type(&llog_obd_ops, NULL, lvars.module_vars,
+                                   "llog_test");
 }
 
 static void __exit llog_test_exit(void)
diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c
index f302dc0..c743e47 100644
--- a/lustre/obdclass/lprocfs_status.c
+++ b/lustre/obdclass/lprocfs_status.c
@@ -315,13 +315,20 @@ int lprocfs_rd_filesfree(char *page, char **start, off_t off, int count,
         return rc;
 }
 
+int lprocfs_rd_filegroups(char *page, char **start, off_t off, int count,
+                          int *eof, void *data)
+{
+        *eof = 1;
+        return snprintf(page, count, "unimplemented\n");
+}
+
 int lprocfs_rd_server_uuid(char *page, char **start, off_t off, int count,
                            int *eof, void *data)
 {
         struct obd_device *obd = (struct obd_device *)data;
         struct obd_import *imp;
         char *imp_state_name = NULL;
-
+        
         LASSERT(obd != NULL);
         imp = obd->u.cli.cl_import;
         imp_state_name = ptlrpc_import_state_name(imp->imp_state);
@@ -343,16 +350,6 @@ int lprocfs_rd_conn_uuid(char *page, char **start, off_t off, int count,
         return snprintf(page, count, "%s\n", conn->c_remote_uuid.uuid);
 }
 
-int lprocfs_rd_num_exports(char *page, char **start, off_t off, int count,
-                           int *eof,  void *data)
-{
-        struct obd_device *obd = (struct obd_device*)data;
-
-        LASSERT(obd != NULL);
-        *eof = 1;
-        return snprintf(page, count, "%u\n", obd->obd_num_exports);
-}
-
 int lprocfs_rd_numrefs(char *page, char **start, off_t off, int count,
                        int *eof, void *data)
 {
@@ -363,30 +360,29 @@ int lprocfs_rd_numrefs(char *page, char **start, off_t off, int count,
         return snprintf(page, count, "%d\n", class->typ_refcnt);
 }
 
-int lprocfs_obd_setup(struct obd_device *obd, struct lprocfs_vars *list)
+int lprocfs_obd_attach(struct obd_device *dev, struct lprocfs_vars *list)
 {
         int rc = 0;
 
-        LASSERT(obd != NULL);
-        LASSERT(obd->obd_type != NULL);
-        LASSERT(obd->obd_type->typ_procroot != NULL);
-
-        obd->obd_proc_entry = lprocfs_register(obd->obd_name,
-                                               obd->obd_type->typ_procroot,
-                                               list, obd);
-        if (IS_ERR(obd->obd_proc_entry)) {
-                rc = PTR_ERR(obd->obd_proc_entry);
-                CERROR("error %d setting up lprocfs for %s\n",rc,obd->obd_name);
-                obd->obd_proc_entry = NULL;
+        LASSERT(dev != NULL);
+        LASSERT(dev->obd_type != NULL);
+        LASSERT(dev->obd_type->typ_procroot != NULL);
+
+        dev->obd_proc_entry = lprocfs_register(dev->obd_name,
+                                               dev->obd_type->typ_procroot,
+                                               list, dev);
+        if (IS_ERR(dev->obd_proc_entry)) {
+                rc = PTR_ERR(dev->obd_proc_entry);
+                dev->obd_proc_entry = NULL;
         }
         return rc;
 }
 
-int lprocfs_obd_cleanup(struct obd_device *obd)
+int lprocfs_obd_detach(struct obd_device *dev)
 {
-        if (obd && obd->obd_proc_entry) {
-                lprocfs_remove(obd->obd_proc_entry);
-                obd->obd_proc_entry = NULL;
+        if (dev && dev->obd_proc_entry) {
+                lprocfs_remove(dev->obd_proc_entry);
+                dev->obd_proc_entry = NULL;
         }
         return 0;
 }
@@ -542,11 +538,10 @@ static int lprocfs_stats_seq_open(struct inode *inode, struct file *file)
 }
 
 struct file_operations lprocfs_stats_seq_fops = {
-        .owner   = THIS_MODULE,
-        .open    = lprocfs_stats_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release,
+        open:    lprocfs_stats_seq_open,
+        read:    seq_read,
+        llseek:  seq_lseek,
+        release: seq_release,
 };
 
 int lprocfs_register_stats(struct proc_dir_entry *root, const char *name,
@@ -647,13 +642,14 @@ int lprocfs_alloc_obd_stats(struct obd_device *obd, unsigned num_private_stats)
         LPROCFS_OBD_OP_INIT(num_private_stats, stats, san_preprw);
         LPROCFS_OBD_OP_INIT(num_private_stats, stats, init_export);
         LPROCFS_OBD_OP_INIT(num_private_stats, stats, destroy_export);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, llog_init);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, llog_finish);
-        LPROCFS_OBD_OP_INIT(num_private_stats, stats, pin);
+        LPROCFS_OBD_OP_INIT(num_private_stats, stats, llog_init); 
+        LPROCFS_OBD_OP_INIT(num_private_stats, stats, llog_finish); 
+        LPROCFS_OBD_OP_INIT(num_private_stats, stats, llog_connect); 
+        LPROCFS_OBD_OP_INIT(num_private_stats, stats, pin); 
         LPROCFS_OBD_OP_INIT(num_private_stats, stats, unpin);
         LPROCFS_OBD_OP_INIT(num_private_stats, stats, import_event);
         LPROCFS_OBD_OP_INIT(num_private_stats, stats, notify);
-
+        
         for (i = num_private_stats; i < num_stats; i++) {
                 /* If this LBUGs, it is likely that an obd
                  * operation was added to struct obd_ops in
@@ -793,8 +789,8 @@ EXPORT_SYMBOL(lprocfs_register);
 EXPORT_SYMBOL(lprocfs_srch);
 EXPORT_SYMBOL(lprocfs_remove);
 EXPORT_SYMBOL(lprocfs_add_vars);
-EXPORT_SYMBOL(lprocfs_obd_setup);
-EXPORT_SYMBOL(lprocfs_obd_cleanup);
+EXPORT_SYMBOL(lprocfs_obd_attach);
+EXPORT_SYMBOL(lprocfs_obd_detach);
 EXPORT_SYMBOL(lprocfs_alloc_stats);
 EXPORT_SYMBOL(lprocfs_free_stats);
 EXPORT_SYMBOL(lprocfs_register_stats);
@@ -807,7 +803,6 @@ EXPORT_SYMBOL(lprocfs_rd_name);
 EXPORT_SYMBOL(lprocfs_rd_fstype);
 EXPORT_SYMBOL(lprocfs_rd_server_uuid);
 EXPORT_SYMBOL(lprocfs_rd_conn_uuid);
-EXPORT_SYMBOL(lprocfs_rd_num_exports);
 EXPORT_SYMBOL(lprocfs_rd_numrefs);
 
 EXPORT_SYMBOL(lprocfs_rd_blksize);
@@ -816,6 +811,7 @@ EXPORT_SYMBOL(lprocfs_rd_kbytesfree);
 EXPORT_SYMBOL(lprocfs_rd_kbytesavail);
 EXPORT_SYMBOL(lprocfs_rd_filestotal);
 EXPORT_SYMBOL(lprocfs_rd_filesfree);
+EXPORT_SYMBOL(lprocfs_rd_filegroups);
 
 EXPORT_SYMBOL(lprocfs_write_helper);
 EXPORT_SYMBOL(lprocfs_write_u64_helper);
diff --git a/lustre/obdclass/lustre_peer.c b/lustre/obdclass/lustre_peer.c
index 8298fc3..1e227e1 100644
--- a/lustre/obdclass/lustre_peer.c
+++ b/lustre/obdclass/lustre_peer.c
@@ -42,6 +42,7 @@ struct uuid_nid_data {
         ptl_nid_t nid;
         char *uuid;
         __u32 nal;
+        ptl_handle_ni_t ni;
 };
 
 /* FIXME: This should probably become more elegant than a global linked list */
@@ -60,7 +61,8 @@ void class_exit_uuidlist(void)
         class_del_uuid(NULL);
 }
 
-int lustre_uuid_to_peer(char *uuid, __u32 *peer_nal, ptl_nid_t *peer_nid)
+int lustre_uuid_to_peer(char *uuid, 
+                        ptl_handle_ni_t *peer_ni, ptl_nid_t *peer_nid)
 {
         struct list_head *tmp;
 
@@ -72,7 +74,7 @@ int lustre_uuid_to_peer(char *uuid, __u32 *peer_nal, ptl_nid_t *peer_nid)
 
                 if (strcmp(data->uuid, uuid) == 0) {
                         *peer_nid = data->nid;
-                        *peer_nal = data->nal;
+                        *peer_ni = data->ni;
 
                         spin_unlock (&g_uuid_lock);
                         return 0;
@@ -85,6 +87,7 @@ int lustre_uuid_to_peer(char *uuid, __u32 *peer_nal, ptl_nid_t *peer_nid)
 
 int class_add_uuid(char *uuid, __u64 nid, __u32 nal)
 {
+        const ptl_handle_ni_t *nip;
         struct uuid_nid_data *data;
         int rc;
         int nob = strnlen (uuid, PAGE_SIZE) + 1;
@@ -92,21 +95,26 @@ int class_add_uuid(char *uuid, __u64 nid, __u32 nal)
         if (nob > PAGE_SIZE)
                 return -EINVAL;
 
+        nip = kportal_get_ni (nal);
+        if (nip == NULL) {
+                CERROR("get_ni failed: is the NAL module loaded?\n");
+                return -EIO;
+        }
+
         rc = -ENOMEM;
         OBD_ALLOC(data, sizeof(*data));
         if (data == NULL)
-                return -ENOMEM;
+                goto fail_0;
 
         OBD_ALLOC(data->uuid, nob);
-        if (data == NULL) {
-                OBD_FREE(data, sizeof(*data));
-                return -ENOMEM;
-        }
+        if (data == NULL)
+                goto fail_1;
 
         CDEBUG(D_INFO, "add uuid %s "LPX64" %u\n", uuid, nid, nal);
         memcpy(data->uuid, uuid, nob);
         data->nid = nid;
         data->nal = nal;
+        data->ni  = *nip;
 
         spin_lock (&g_uuid_lock);
 
@@ -115,6 +123,12 @@ int class_add_uuid(char *uuid, __u64 nid, __u32 nal)
         spin_unlock (&g_uuid_lock);
 
         return 0;
+
+ fail_1:
+        OBD_FREE (data, sizeof (*data));
+ fail_0:
+        kportal_put_ni (nal);
+        return (rc);
 }
 
 /* delete only one entry if uuid is specified, otherwise delete all */
@@ -150,6 +164,7 @@ int class_del_uuid (char *uuid)
 
                 list_del (&data->head);
 
+                kportal_put_ni (data->nal);
                 OBD_FREE(data->uuid, strlen(data->uuid) + 1);
                 OBD_FREE(data, sizeof(*data));
         } while (!list_empty (&deathrow));
diff --git a/lustre/obdclass/mea.c b/lustre/obdclass/mea.c
new file mode 100644
index 0000000..ceba64e
--- /dev/null
+++ b/lustre/obdclass/mea.c
@@ -0,0 +1,72 @@
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
+ *
+ * Copyright (C) 2002, 2003 Cluster File Systems, Inc.
+ *
+ *   This file is part of Lustre, http://www.lustre.org.
+ *
+ *   Lustre is free software; you can redistribute it and/or
+ *   modify it under the terms of version 2 of the GNU General Public
+ *   License as published by the Free Software Foundation.
+ *
+ *   Lustre is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Lustre; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#define DEBUG_SUBSYSTEM S_CLASS
+#ifdef __KERNEL__
+#include <linux/kmod.h>   /* for request_module() */
+#include <linux/module.h>
+#include <linux/obd_class.h>
+#include <linux/random.h>
+#include <linux/slab.h>
+#include <linux/pagemap.h>
+#else 
+#include <liblustre.h>
+#include <linux/obd_class.h>
+#include <linux/obd.h>
+#endif
+#include <linux/lprocfs_status.h>
+
+
+int mea_name2idx(struct mea *mea, char *name, int namelen)
+{
+        unsigned int c;
+
+	/* just to simplify caller code */
+       	if (mea == NULL)
+		return 0;
+
+        if (mea->mea_count == 0)
+                return 0;
+
+        /* FIXME: real hash calculation here */
+        c = name[namelen - 1];
+        c = c % mea->mea_count;
+	
+	LASSERT(c < mea->mea_count);
+        return c;
+}
+
+int raw_name2idx(int count, char *name, int namelen)
+{
+        unsigned int c;
+
+        LASSERT(namelen > 0);
+        if (count <= 1)
+                return 0;
+
+
+        /* FIXME: real hash calculation here */
+        c = name[namelen - 1];
+        c = c % count;
+	
+        return c;
+}
+
diff --git a/lustre/obdclass/obd_config.c b/lustre/obdclass/obd_config.c
index b303f71..ac86013 100644
--- a/lustre/obdclass/obd_config.c
+++ b/lustre/obdclass/obd_config.c
@@ -45,10 +45,15 @@
  */
 int class_attach(struct lustre_cfg *lcfg)
 {
+        int minor;
         struct obd_type *type;
+        int err = 0;
+        int len;
+        char *typename;
+        char *name;
+        char *uuid;
         struct obd_device *obd;
-        char *typename, *name, *uuid;
-        int minor, rc, len, dev, stage = 0;
+        int dev;
 
         if (!lcfg->lcfg_inllen1 || !lcfg->lcfg_inlbuf1) {
                 CERROR("No type passed!\n");
@@ -90,23 +95,22 @@ int class_attach(struct lustre_cfg *lcfg)
                 CERROR("OBD: unknown type: %s\n", typename);
                 RETURN(-EINVAL);
         }
-        stage = 1;
 
         obd = class_name2obd(name);
         if (obd != NULL) {
                 CERROR("obd %s already attached\n", name);
-                GOTO(out, rc = -EEXIST);
+                RETURN(-EEXIST);
         }
 
         obd = class_newdev(&dev);
         if (obd == NULL)
-                GOTO(out, rc = -EINVAL);
+                RETURN(-EINVAL);
 
         /* have we attached a type to this device */
         if (obd->obd_attached || obd->obd_type) {
                 CERROR("OBD: Device %d already typed as %s.\n",
                        obd->obd_minor, MKSTR(obd->obd_type->typ_name));
-                GOTO(out, rc = -EBUSY);
+                RETURN(-EBUSY);
         }
 
         LASSERT(obd == (obd_dev + obd->obd_minor));
@@ -124,51 +128,49 @@ int class_attach(struct lustre_cfg *lcfg)
 
         /* XXX belongs in setup not attach  */
         /* recovery data */
-        init_timer(&obd->obd_recovery_timer);
         spin_lock_init(&obd->obd_processing_task_lock);
         init_waitqueue_head(&obd->obd_next_transno_waitq);
         INIT_LIST_HEAD(&obd->obd_recovery_queue);
         INIT_LIST_HEAD(&obd->obd_delayed_reply_queue);
 
-        spin_lock_init(&obd->obd_uncommitted_replies_lock);
-        INIT_LIST_HEAD(&obd->obd_uncommitted_replies);
+        spin_lock_init (&obd->obd_uncommitted_replies_lock);
+        INIT_LIST_HEAD (&obd->obd_uncommitted_replies);
 
         len = strlen(name) + 1;
         OBD_ALLOC(obd->obd_name, len);
-        if (!obd->obd_name)
-                GOTO(out, rc = -ENOMEM);
+        if (!obd->obd_name) {
+                class_put_type(obd->obd_type);
+                obd->obd_type = NULL;
+                RETURN(-ENOMEM);
+        }
         memcpy(obd->obd_name, name, len);
-        stage = 2;
 
         len = strlen(uuid);
         if (len >= sizeof(obd->obd_uuid)) {
                 CERROR("uuid must be < "LPSZ" bytes long\n",
                        sizeof(obd->obd_uuid));
-                GOTO(out, rc = -EINVAL);
+                OBD_FREE(obd->obd_name, strlen(obd->obd_name) + 1);
+                class_put_type(obd->obd_type);
+                obd->obd_type = NULL;
+                RETURN(-EINVAL);
         }
         memcpy(obd->obd_uuid.uuid, uuid, len);
 
         /* do the attach */
-        if (OBP(obd, attach)) {
-                rc = OBP(obd,attach)(obd, sizeof *lcfg, lcfg);
-                if (rc)
-                        GOTO(out, rc = -EINVAL);
-        }
+        if (OBP(obd, attach))
+                err = OBP(obd,attach)(obd, sizeof *lcfg, lcfg);
 
-        obd->obd_attached = 1;
-        type->typ_refcnt++;
-        CDEBUG(D_IOCTL, "OBD: dev %d attached type %s\n",
-               obd->obd_minor, typename);
-        RETURN(0);
- out:
-        switch (stage) {
-        case 2:
+        if (err) {
                 OBD_FREE(obd->obd_name, strlen(obd->obd_name) + 1);
-        case 1:
                 class_put_type(obd->obd_type);
                 obd->obd_type = NULL;
+        } else {
+                obd->obd_attached = 1;
+                type->typ_refcnt++;
+                CDEBUG(D_IOCTL, "OBD: dev %d attached type %s\n",
+                       obd->obd_minor, typename);
         }
-        return rc;
+        RETURN(err);
 }
 
 int class_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
@@ -317,8 +319,8 @@ int class_cleanup(struct obd_device *obd, struct lustre_cfg *lcfg)
                 int rc;
 
                 if (!(flags & OBD_OPT_FORCE)) {
-                        CERROR("OBD device %d (%p) has refcount %d\n",
-                               obd->obd_minor, obd,
+                        CERROR("OBD device %d (%p,%s) has refcount %d\n",
+                               obd->obd_minor, obd, obd->obd_name,
                                atomic_read(&obd->obd_refcount));
                         dump_exports(obd);
                         GOTO(out, err = -EBUSY);
@@ -602,7 +604,7 @@ static int class_config_llog_handler(struct llog_handle * handle,
                         pcfg->pcfg_nid = cfg->cfg_local_nid;
                 }
 
-                rc = libcfs_nal_cmd(pcfg);
+                rc = kportal_nal_cmd(pcfg);
         }
 out:
         RETURN(rc);
diff --git a/lustre/obdclass/simple.c b/lustre/obdclass/simple.c
index 48cf4d23..722de4a 100644
--- a/lustre/obdclass/simple.c
+++ b/lustre/obdclass/simple.c
@@ -47,8 +47,8 @@
 #endif
 
 /* push / pop to root of obd store */
-void push_ctxt(struct lvfs_run_ctxt *save, struct lvfs_run_ctxt *new_ctx,
-               struct lvfs_ucred *uc)
+void push_ctxt(struct obd_run_ctxt *save, struct obd_run_ctxt *new_ctx,
+               struct obd_ucred *uc)
 {
         //ASSERT_NOT_KERNEL_CTXT("already in kernel context!\n");
         ASSERT_CTXT_MAGIC(new_ctx->magic);
@@ -78,21 +78,21 @@ void push_ctxt(struct lvfs_run_ctxt *save, struct lvfs_run_ctxt *new_ctx,
         LASSERT(new_ctx->pwdmnt);
 
         if (uc) {
-                save->luc.luc_fsuid = current->fsuid;
-                save->luc.luc_fsgid = current->fsgid;
-                save->luc.luc_cap = current->cap_effective;
-                save->luc.luc_suppgid1 = current->groups[0];
-                save->luc.luc_suppgid2 = current->groups[1];
-
-                current->fsuid = uc->luc_fsuid;
-                current->fsgid = uc->luc_fsgid;
-                current->cap_effective = uc->luc_cap;
+                save->ouc.ouc_fsuid = current->fsuid;
+                save->ouc.ouc_fsgid = current->fsgid;
+                save->ouc.ouc_cap = current->cap_effective;
+                save->ouc.ouc_suppgid1 = current->groups[0];
+                save->ouc.ouc_suppgid2 = current->groups[1];
+
+                current->fsuid = uc->ouc_fsuid;
+                current->fsgid = uc->ouc_fsgid;
+                current->cap_effective = uc->ouc_cap;
                 current->ngroups = 0;
 
-                if (uc->luc_suppgid1 != -1)
-                        current->groups[current->ngroups++] = uc->luc_suppgid1;
-                if (uc->luc_suppgid2 != -1)
-                        current->groups[current->ngroups++] = uc->luc_suppgid2;
+                if (uc->ouc_suppgid1 != -1)
+                        current->groups[current->ngroups++] = uc->ouc_suppgid1;
+                if (uc->ouc_suppgid2 != -1)
+                        current->groups[current->ngroups++] = uc->ouc_suppgid2;
         }
         set_fs(new_ctx->fs);
         set_fs_pwd(current->fs, new_ctx->pwdmnt, new_ctx->pwd);
@@ -110,8 +110,8 @@ void push_ctxt(struct lvfs_run_ctxt *save, struct lvfs_run_ctxt *new_ctx,
 }
 EXPORT_SYMBOL(push_ctxt);
 
-void pop_ctxt(struct lvfs_run_ctxt *saved, struct lvfs_run_ctxt *new_ctx,
-              struct lvfs_ucred *uc)
+void pop_ctxt(struct obd_run_ctxt *saved, struct obd_run_ctxt *new_ctx,
+              struct obd_ucred *uc)
 {
         //printk("pc0");
         ASSERT_CTXT_MAGIC(saved->magic);
@@ -138,12 +138,12 @@ void pop_ctxt(struct lvfs_run_ctxt *saved, struct lvfs_run_ctxt *new_ctx,
         dput(saved->pwd);
         mntput(saved->pwdmnt);
         if (uc) {
-                current->fsuid = saved->luc.luc_fsuid;
-                current->fsgid = saved->luc.luc_fsgid;
-                current->cap_effective = saved->luc.luc_cap;
+                current->fsuid = saved->ouc.ouc_fsuid;
+                current->fsgid = saved->ouc.ouc_fsgid;
+                current->cap_effective = saved->ouc.ouc_cap;
                 current->ngroups = saved->ngroups;
-                current->groups[0] = saved->luc.luc_suppgid1;
-                current->groups[1] = saved->luc.luc_suppgid2;
+                current->groups[0] = saved->ouc.ouc_suppgid1;
+                current->groups[1] = saved->ouc.ouc_suppgid2;
         }
 
         /*
diff --git a/lustre/obdclass/sysctl.c b/lustre/obdclass/sysctl.c
index 158a2de..8c93a48 100644
--- a/lustre/obdclass/sysctl.c
+++ b/lustre/obdclass/sysctl.c
@@ -51,7 +51,6 @@ enum {
         OBD_FAIL_LOC = 1,       /* control test failures instrumentation */
         OBD_TIMEOUT,            /* RPC timeout before recovery/intr */
         OBD_UPCALL,             /* path to recovery upcall */
-        OBD_MEMUSED,            /* bytes currently OBD_ALLOCated */
         OBD_SYNCFILTER,         /* XXX temporary, as we play with sync osts.. */
 };
 
@@ -66,8 +65,6 @@ static ctl_table obd_table[] = {
         /* XXX need to lock so we avoid update races with recovery upcall! */
         {OBD_UPCALL, "upcall", obd_lustre_upcall, 128, 0644, NULL,
                 &proc_dostring, &sysctl_string },
-        {OBD_MEMUSED, "memused", (int *)&obd_memory.counter,
-                sizeof(int), 0644, NULL, &proc_dointvec},
         {OBD_SYNCFILTER, "filter_sync_on_commit", &obd_sync_filter, sizeof(int),
                 0644, NULL, &proc_dointvec},
         { 0 }
diff --git a/lustre/obdecho/.cvsignore b/lustre/obdecho/.cvsignore
index 5d26f00..49c6100 100644
--- a/lustre/obdecho/.cvsignore
+++ b/lustre/obdecho/.cvsignore
@@ -3,13 +3,7 @@ config.log
 config.status
 configure
 Makefile
+Makefile.in
 .deps
 TAGS
 .*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
diff --git a/lustre/obdecho/autoMakefile.am b/lustre/obdecho/Makefile.am
similarity index 54%
rename from lustre/obdecho/autoMakefile.am
rename to lustre/obdecho/Makefile.am
index 24d8044..b9fa3b8 100644
--- a/lustre/obdecho/autoMakefile.am
+++ b/lustre/obdecho/Makefile.am
@@ -3,16 +3,18 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
+DEFS= 
+
 if LIBLUSTRE
 noinst_LIBRARIES = libobdecho.a
 libobdecho_a_SOURCES = echo_client.c 
-libobdecho_a_CPPFLAGS = $(LLCPPFLAGS)
-libobdecho_a_CFLAGS = $(LLCFLAGS)
+libobdecho_a_CFLAGS = -fPIC
+else
+MODULE = obdecho
+modulefs_DATA = obdecho.o
+EXTRA_PROGRAMS = obdecho
+LINX=
+obdecho_SOURCES = echo.c echo_client.c lproc_echo.c $(LINX)
 endif
 
-if MODULES
-modulefs_DATA = obdecho$(KMODEXT)
-endif # MODULES
-
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-DIST_SOURCES = $(obdecho-objs:%.o=%.c)
+include $(top_srcdir)/Rules
diff --git a/lustre/obdecho/Makefile.in b/lustre/obdecho/Makefile.in
deleted file mode 100644
index 66e61ed..0000000
--- a/lustre/obdecho/Makefile.in
+++ /dev/null
@@ -1,4 +0,0 @@
-MODULES := obdecho
-obdecho-objs := echo.o echo_client.o lproc_echo.o
-
-@INCLUDE_RULES@
diff --git a/lustre/obdecho/echo.c b/lustre/obdecho/echo.c
index e9be311..c3ed984 100644
--- a/lustre/obdecho/echo.c
+++ b/lustre/obdecho/echo.c
@@ -33,6 +33,8 @@
 #include <linux/stat.h>
 #include <linux/sched.h>
 #include <linux/smp_lock.h>
+#include <linux/ext2_fs.h>
+#include <linux/quotaops.h>
 #include <linux/proc_fs.h>
 #include <linux/init.h>
 #include <asm/unistd.h>
@@ -440,67 +442,80 @@ commitrw_cleanup:
         return rc;
 }
 
-static int echo_setup(struct obd_device *obd, obd_count len, void *buf)
+static int echo_setup(struct obd_device *obddev, obd_count len, void *buf)
 {
-        struct lprocfs_static_vars lvars;
         ENTRY;
 
-        spin_lock_init(&obd->u.echo.eo_lock);
-        obd->u.echo.eo_lastino = ECHO_INIT_OBJID;
+        spin_lock_init(&obddev->u.echo.eo_lock);
+        obddev->u.echo.eo_lastino = ECHO_INIT_OBJID;
 
-        obd->obd_namespace = ldlm_namespace_new("echo-tgt",
-                                                LDLM_NAMESPACE_SERVER);
-        if (obd->obd_namespace == NULL) {
+        obddev->obd_namespace =
+                ldlm_namespace_new("echo-tgt", LDLM_NAMESPACE_SERVER);
+        if (obddev->obd_namespace == NULL) {
                 LBUG();
                 RETURN(-ENOMEM);
         }
 
-        lprocfs_init_vars(echo, &lvars);
-        if (lprocfs_obd_setup(obd, lvars.obd_vars) == 0 &&
-            lprocfs_alloc_obd_stats(obd, LPROC_ECHO_LAST) == 0) {
-                lprocfs_counter_init(obd->obd_stats, LPROC_ECHO_READ_BYTES,
-                                     LPROCFS_CNTR_AVGMINMAX,
-                                     "read_bytes", "bytes");
-                lprocfs_counter_init(obd->obd_stats, LPROC_ECHO_WRITE_BYTES,
-                                     LPROCFS_CNTR_AVGMINMAX,
-                                     "write_bytes", "bytes");
-        }
-
         ptlrpc_init_client (LDLM_CB_REQUEST_PORTAL, LDLM_CB_REPLY_PORTAL,
-                            "echo_ldlm_cb_client", &obd->obd_ldlm_client);
+                            "echo_ldlm_cb_client", &obddev->obd_ldlm_client);
         RETURN(0);
 }
 
-static int echo_cleanup(struct obd_device *obd, int flags)
+static int echo_cleanup(struct obd_device *obddev, int flags)
 {
-        int leaked;
+        int     leaked;
         ENTRY;
 
-        lprocfs_free_obd_stats(obd);
-        lprocfs_obd_cleanup(obd);
-
-        ldlm_namespace_free(obd->obd_namespace, flags & OBD_OPT_FORCE);
+        ldlm_namespace_free(obddev->obd_namespace, flags & OBD_OPT_FORCE);
 
-        leaked = atomic_read(&obd->u.echo.eo_prep);
+        leaked = atomic_read(&obddev->u.echo.eo_prep);
         if (leaked != 0)
                 CERROR("%d prep/commitrw pages leaked\n", leaked);
 
         RETURN(0);
 }
 
+int echo_attach(struct obd_device *obd, obd_count len, void *data)
+{
+        struct lprocfs_static_vars lvars;
+        int rc;
+
+        lprocfs_init_vars(echo, &lvars);
+        rc = lprocfs_obd_attach(obd, lvars.obd_vars);
+        if (rc != 0)
+                return rc;
+        rc = lprocfs_alloc_obd_stats(obd, LPROC_ECHO_LAST);
+        if (rc != 0)
+                return rc;
+
+        lprocfs_counter_init(obd->obd_stats, LPROC_ECHO_READ_BYTES,
+                             LPROCFS_CNTR_AVGMINMAX, "read_bytes", "bytes");
+        lprocfs_counter_init(obd->obd_stats, LPROC_ECHO_WRITE_BYTES,
+                             LPROCFS_CNTR_AVGMINMAX, "write_bytes", "bytes");
+        return rc;
+}
+
+int echo_detach(struct obd_device *dev)
+{
+        lprocfs_free_obd_stats(dev);
+        return lprocfs_obd_detach(dev);
+}
+
 static struct obd_ops echo_obd_ops = {
-        .o_owner           = THIS_MODULE,
-        .o_connect         = echo_connect,
-        .o_disconnect      = echo_disconnect,
-        .o_destroy_export  = echo_destroy_export,
-        .o_create          = echo_create,
-        .o_destroy         = echo_destroy,
-        .o_getattr         = echo_getattr,
-        .o_setattr         = echo_setattr,
-        .o_preprw          = echo_preprw,
-        .o_commitrw        = echo_commitrw,
-        .o_setup           = echo_setup,
-        .o_cleanup         = echo_cleanup
+        o_owner:           THIS_MODULE,
+        o_attach:          echo_attach,
+        o_detach:          echo_detach,
+        o_connect:         echo_connect,
+        o_disconnect:      echo_disconnect,
+        o_destroy_export:  echo_destroy_export,
+        o_create:          echo_create,
+        o_destroy:         echo_destroy,
+        o_getattr:         echo_getattr,
+        o_setattr:         echo_setattr,
+        o_preprw:          echo_preprw,
+        o_commitrw:        echo_commitrw,
+        o_setup:           echo_setup,
+        o_cleanup:         echo_cleanup
 };
 
 extern int echo_client_init(void);
@@ -558,7 +573,7 @@ static int __init obdecho_init(void)
         if (rc != 0)
                 goto failed_0;
 
-        rc = class_register_type(&echo_obd_ops, lvars.module_vars,
+        rc = class_register_type(&echo_obd_ops, NULL, lvars.module_vars,
                                  OBD_ECHO_DEVICENAME);
         if (rc != 0)
                 goto failed_1;
diff --git a/lustre/obdecho/echo_client.c b/lustre/obdecho/echo_client.c
index 7182280..e2f5db2 100644
--- a/lustre/obdecho/echo_client.c
+++ b/lustre/obdecho/echo_client.c
@@ -218,8 +218,7 @@ static int echo_create_object(struct obd_device *obd, int on_target,
                 oa->o_id = ++last_object_id;
 
         if (on_target) {
-                /* XXX get some filter group constants */
-                oa->o_gr = 2;
+                oa->o_gr = FILTER_GROUP_ECHO;
                 oa->o_valid |= OBD_MD_FLGROUP;
                 rc = obd_create(ec->ec_exp, oa, &lsm, oti);
                 if (rc != 0)
@@ -535,7 +534,7 @@ static int echo_client_kbrw(struct obd_device *obd, int rw, struct obdo *oa,
                         goto out;
 
                 pgp->count = PAGE_SIZE;
-                pgp->disk_offset = pgp->page_offset = off;
+                pgp->off = off;
                 pgp->flag = 0;
 
                 if (verify)
@@ -556,8 +555,7 @@ static int echo_client_kbrw(struct obd_device *obd, int rw, struct obdo *oa,
                 if (verify) {
                         int vrc;
                         vrc = echo_client_page_debug_check(lsm, pgp->pg, oa->o_id,
-                                                           pgp->page_offset,
-                                                           pgp->count);
+                                                           pgp->off, pgp->count);
                         if (vrc != 0 && rc == 0)
                                 rc = vrc;
                 }
@@ -616,7 +614,7 @@ static int echo_client_ubrw(struct obd_device *obd, int rw,
         for (i = 0, off = offset, pgp = pga;
              i < npages;
              i++, off += PAGE_SIZE, pgp++) {
-                pgp->disk_offset = pgp->page_offset = off;
+                pgp->off = off;
                 pgp->pg = kiobuf->maplist[i];
                 pgp->count = PAGE_SIZE;
                 pgp->flag = 0;
@@ -711,8 +709,7 @@ static void ec_ap_fill_obdo(void *data, int cmd, struct obdo *oa)
 
         memcpy(oa, &eap->eap_eas->eas_oa, sizeof(*oa));
 }
-
-static void ec_ap_completion(void *data, int cmd, struct obdo *oa, int rc)
+static void ec_ap_completion(void *data, int cmd, int rc)
 {
         struct echo_async_page *eap = eap_from_cookie(data);
         struct echo_async_state *eas;
@@ -795,7 +792,7 @@ static int echo_client_async_page(struct obd_export *exp, int rw,
                         GOTO(out, rc = -ENOMEM);
 
                 page->private = 0;
-                list_add_tail(&PAGE_LIST(page), &pages);
+                list_add_tail(&page->list, &pages);
 
                 OBD_ALLOC(eap, sizeof(*eap));
                 if (eap == NULL)
@@ -881,10 +878,9 @@ static int echo_client_async_page(struct obd_export *exp, int rw,
 
 out:
         list_for_each_safe(pos, n, &pages) {
-                struct page *page = list_entry(pos, struct page, 
-                                               PAGE_LIST_ENTRY);
+                struct page *page = list_entry(pos, struct page, list);
 
-                list_del(&PAGE_LIST(page));
+                list_del(&page->list);
                 if (page->private != 0) {
                         eap = (struct echo_async_page *)page->private;
                         if (eap->eap_cookie != NULL)
@@ -998,7 +994,7 @@ int echo_client_brw_ioctl(int rw, struct obd_export *exp,
 
         data->ioc_obdo1.o_valid &= ~OBD_MD_FLHANDLE;
         data->ioc_obdo1.o_valid |= OBD_MD_FLGROUP;
-        data->ioc_obdo1.o_gr = 2;
+        data->ioc_obdo1.o_gr = FILTER_GROUP_ECHO;
 
         switch((long)data->ioc_pbuf1) {
         case 1:
@@ -1217,7 +1213,7 @@ echo_client_iocontrol(unsigned int cmd, struct obd_export *exp,
                 rc = echo_get_object (&eco, obd, &data->ioc_obdo1);
                 if (rc == 0) {
                         oa = &data->ioc_obdo1;
-                        oa->o_gr = 2;
+                        oa->o_gr = FILTER_GROUP_ECHO;
                         oa->o_valid |= OBD_MD_FLGROUP;
                         rc = obd_destroy(ec->ec_exp, oa, eco->eco_lsm, 
                                          &dummy_oti);
@@ -1437,12 +1433,12 @@ static int echo_client_disconnect(struct obd_export *exp, int flags)
 }
 
 static struct obd_ops echo_obd_ops = {
-        .o_owner       = THIS_MODULE,
-        .o_setup       = echo_client_setup,
-        .o_cleanup     = echo_client_cleanup,
-        .o_iocontrol   = echo_client_iocontrol,
-        .o_connect     = echo_client_connect,
-        .o_disconnect  = echo_client_disconnect
+        o_owner:       THIS_MODULE,
+        o_setup:       echo_client_setup,
+        o_cleanup:     echo_client_cleanup,
+        o_iocontrol:   echo_client_iocontrol,
+        o_connect:     echo_client_connect,
+        o_disconnect:  echo_client_disconnect
 };
 
 int echo_client_init(void)
@@ -1450,7 +1446,7 @@ int echo_client_init(void)
         struct lprocfs_static_vars lvars;
 
         lprocfs_init_vars(echo, &lvars);
-        return class_register_type(&echo_obd_ops, lvars.module_vars,
+        return class_register_type(&echo_obd_ops, NULL, lvars.module_vars,
                                    OBD_ECHO_CLIENT_DEVICENAME);
 }
 
diff --git a/lustre/obdfilter/.cvsignore b/lustre/obdfilter/.cvsignore
index 5d26f00..49c6100 100644
--- a/lustre/obdfilter/.cvsignore
+++ b/lustre/obdfilter/.cvsignore
@@ -3,13 +3,7 @@ config.log
 config.status
 configure
 Makefile
+Makefile.in
 .deps
 TAGS
 .*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
diff --git a/lustre/obdfilter/Makefile.am b/lustre/obdfilter/Makefile.am
new file mode 100644
index 0000000..afa74fd
--- /dev/null
+++ b/lustre/obdfilter/Makefile.am
@@ -0,0 +1,19 @@
+# Copyright (C) 2001  Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+MODULE = obdfilter
+modulefs_DATA = obdfilter.o
+EXTRA_PROGRAMS = obdfilter
+
+COMMON_SRC = filter.c filter_io.c filter_log.c filter_san.c lproc_obdfilter.c \
+             filter_internal.h filter_lvb.c
+
+if LINUX25
+obdfilter_SOURCES = $(COMMON_SRC) filter_io_26.c
+else
+obdfilter_SOURCES = $(COMMON_SRC) filter_io_24.c
+endif
+
+include $(top_srcdir)/Rules
diff --git a/lustre/obdfilter/Makefile.in b/lustre/obdfilter/Makefile.in
deleted file mode 100644
index 3e0871a..0000000
--- a/lustre/obdfilter/Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
-MODULES := obdfilter
-obdfilter-objs := filter.o filter_io.o filter_log.o filter_san.o
-obdfilter-objs += lproc_obdfilter.o filter_lvb.o
-
-ifeq ($(PATCHLEVEL),4)
-obdfilter-objs += filter_io_24.o
-else
-obdfilter-objs += filter_io_26.o
-endif # PATCHLEVEL 
-
-@INCLUDE_RULES@
diff --git a/lustre/obdfilter/autoMakefile.am b/lustre/obdfilter/autoMakefile.am
deleted file mode 100644
index 09d52b2..0000000
--- a/lustre/obdfilter/autoMakefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (C) 2001  Cluster File Systems, Inc.
-#
-# This code is issued under the GNU General Public License.
-# See the file COPYING in this distribution
-
-if MODULES
-modulefs_DATA = obdfilter$(KMODEXT)
-endif
-
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-DIST_SOURCES = $(obdfilter-objs:%.o=%.c) filter_io_24.c filter_io_26.c filter_internal.h
diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c
index 66b4633..bac0c32 100644
--- a/lustre/obdfilter/filter.c
+++ b/lustre/obdfilter/filter.c
@@ -68,7 +68,6 @@ static void filter_commit_cb(struct obd_device *obd, __u64 transno,
         obd_transno_commit_cb(obd, transno, error);
 }
 
-
 /* Assumes caller has already pushed us into the kernel context. */
 int filter_finish_transno(struct obd_export *exp, struct obd_trans_info *oti,
                           int rc)
@@ -108,8 +107,8 @@ int filter_finish_transno(struct obd_export *exp, struct obd_trans_info *oti,
         fcd->fcd_last_xid = 0;
 
         off = fed->fed_lr_off;
-        fsfilt_add_journal_cb(exp->exp_obd, filter->fo_sb, last_rcvd,
-                              oti->oti_handle, filter_commit_cb, NULL);
+        fsfilt_add_journal_cb(exp->exp_obd, last_rcvd, oti->oti_handle,
+                              filter_commit_cb, NULL);
         err = fsfilt_write_record(exp->exp_obd, filter->fo_rcvd_filp, fcd,
                                   sizeof(*fcd), &off, 0);
         if (err) {
@@ -185,7 +184,7 @@ static int filter_client_add(struct obd_device *obd, struct filter_obd *filter,
                fed->fed_lr_idx, fed->fed_lr_off, fed->fed_fcd->fcd_uuid);
 
         if (new_client) {
-                struct lvfs_run_ctxt saved;
+                struct obd_run_ctxt saved;
                 loff_t off = fed->fed_lr_off;
                 int err;
                 void *handle;
@@ -193,7 +192,7 @@ static int filter_client_add(struct obd_device *obd, struct filter_obd *filter,
                 CDEBUG(D_INFO, "writing client fcd at idx %u (%llu) (len %u)\n",
                        fed->fed_lr_idx,off,(unsigned int)sizeof(*fed->fed_fcd));
 
-                push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+                push_ctxt(&saved, &obd->obd_ctxt, NULL);
                 /* Transaction needed to fix bug 1403 */
                 handle = fsfilt_start(obd,
                                       filter->fo_rcvd_filp->f_dentry->d_inode,
@@ -210,7 +209,7 @@ static int filter_client_add(struct obd_device *obd, struct filter_obd *filter,
                                       filter->fo_rcvd_filp->f_dentry->d_inode,
                                       handle, 1);
                 }
-                pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+                pop_ctxt(&saved, &obd->obd_ctxt, NULL);
 
                 if (err) {
                         CERROR("error writing %s client idx %u: rc %d\n",
@@ -227,7 +226,7 @@ static int filter_client_free(struct obd_export *exp, int flags)
         struct filter_obd *filter = &exp->exp_obd->u.filter;
         struct obd_device *obd = exp->exp_obd;
         struct filter_client_data zero_fcd;
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
         int rc;
         loff_t off;
         ENTRY;
@@ -258,10 +257,10 @@ static int filter_client_free(struct obd_export *exp, int flags)
         }
 
         memset(&zero_fcd, 0, sizeof zero_fcd);
-        push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+        push_ctxt(&saved, &obd->obd_ctxt, NULL);
         rc = fsfilt_write_record(obd, filter->fo_rcvd_filp, &zero_fcd,
                                  sizeof(zero_fcd), &off, 1);
-        pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+        pop_ctxt(&saved, &obd->obd_ctxt, NULL);
 
         CDEBUG(rc == 0 ? D_INFO : D_ERROR,
                "zeroing disconnecting client %s at idx %u (%llu) in %s rc %d\n",
@@ -320,8 +319,14 @@ int filter_update_last_objid(struct obd_device *obd, obd_gr group,
         int rc;
         ENTRY;
 
-        CDEBUG(D_INODE, "%s: server last_objid for group "LPU64": "LPU64"\n",
-               obd->obd_name, group, filter->fo_last_objids[group]);
+        if (filter->fo_last_objid_files[group] == NULL) {
+                CERROR("Object group "LPU64" not fully setup; not updating "
+                       "last_objid\n", group);
+                RETURN(0);
+        }
+
+        CDEBUG(D_INODE, "server last_objid for group "LPU64": "LPU64"\n",
+               group, filter->fo_last_objids[group]);
 
         tmp = cpu_to_le64(filter->fo_last_objids[group]);
         rc = fsfilt_write_record(obd, filter->fo_last_objid_files[group],
@@ -417,9 +422,8 @@ static int filter_init_server_data(struct obd_device *obd, struct file * filp)
         CDEBUG(D_INODE, "%s: server subdir_count: %u\n",
                obd->obd_name, le16_to_cpu(fsd->fsd_subdir_count));
         CDEBUG(D_INODE, "%s: last_rcvd clients: %lu\n", obd->obd_name,
-               last_rcvd_size <= le32_to_cpu(fsd->fsd_client_start) ? 0 :
-               (last_rcvd_size - le32_to_cpu(fsd->fsd_client_start)) /
-                le16_to_cpu(fsd->fsd_client_size));
+               last_rcvd_size <= FILTER_LR_CLIENT_START ? 0 :
+               (last_rcvd_size-FILTER_LR_CLIENT_START) /FILTER_LR_CLIENT_SIZE);
 
         if (!obd->obd_replayable) {
                 CWARN("%s: recovery support OFF\n", obd->obd_name);
@@ -492,8 +496,8 @@ static int filter_init_server_data(struct obd_device *obd, struct file * filp)
 
         if (obd->obd_recoverable_clients) {
                 CWARN("RECOVERY: %d recoverable clients, last_rcvd "
-                      LPU64"\n", obd->obd_recoverable_clients,
-                      le64_to_cpu(fsd->fsd_last_transno));
+                       LPU64"\n", obd->obd_recoverable_clients,
+                       le64_to_cpu(fsd->fsd_last_transno));
                 obd->obd_next_recovery_transno = obd->obd_last_committed + 1;
                 obd->obd_recovering = 1;
         }
@@ -520,61 +524,221 @@ err_fsd:
 static int filter_cleanup_groups(struct obd_device *obd)
 {
         struct filter_obd *filter = &obd->u.filter;
-        struct file *filp;
         struct dentry *dentry;
-        int i;
+        int i, k;
         ENTRY;
 
-        if (filter->fo_dentry_O_groups != NULL) {
-                for (i = 0; i < FILTER_GROUPS; i++) {
-                        dentry = filter->fo_dentry_O_groups[i];
-                        if (dentry != NULL)
+        for (i = 0; i < filter->fo_group_count; i++) {
+                if (filter->fo_subdirs != NULL) {
+                        for (k = 0; k < filter->fo_subdir_count; k++) {
+                                dentry = filter->fo_subdirs[i].dentry[k];
+                                if (dentry == NULL)
+                                        continue;
                                 f_dput(dentry);
+                                filter->fo_subdirs[i].dentry[k] = NULL;
+                        }
                 }
-                OBD_FREE(filter->fo_dentry_O_groups,
-                         FILTER_GROUPS * sizeof(*filter->fo_dentry_O_groups));
-                filter->fo_dentry_O_groups = NULL;
-        }
-        if (filter->fo_last_objid_files != NULL) {
-                for (i = 0; i < FILTER_GROUPS; i++) {
-                        filp = filter->fo_last_objid_files[i];
-                        if (filp != NULL)
-                                filp_close(filp, 0);
+                if (filter->fo_last_objid_files[i] != NULL) {
+                        filp_close(filter->fo_last_objid_files[i], 0);
+                        filter->fo_last_objid_files[i] = NULL;
                 }
+                if (filter->fo_groups[i] != NULL) {
+                        dput(filter->fo_groups[i]);
+                        filter->fo_groups[i] = NULL;
+                }
+        }
+        if (filter->fo_subdirs != NULL)
+                OBD_FREE(filter->fo_subdirs,
+                         filter->fo_group_count * sizeof(*filter->fo_subdirs));
+        if (filter->fo_groups != NULL)
+                OBD_FREE(filter->fo_groups,
+                         filter->fo_group_count * sizeof(*filter->fo_groups));
+        if (filter->fo_last_objids != NULL)
+                OBD_FREE(filter->fo_last_objids,
+                         filter->fo_group_count * sizeof(__u64));
+        if (filter->fo_last_objid_files != NULL)
                 OBD_FREE(filter->fo_last_objid_files,
-                         FILTER_GROUPS * sizeof(*filter->fo_last_objid_files));
-                filter->fo_last_objid_files = NULL;
+                         filter->fo_group_count * sizeof(struct file *));
+        RETURN(0);
+}
+
+static int filter_read_group_internal(struct obd_device *obd, int group,
+                                      int create)
+{
+        struct filter_obd *filter = &obd->u.filter;
+        __u64 *new_objids = NULL;
+        struct filter_subdirs *new_subdirs = NULL, *tmp_subdirs;
+        struct dentry **new_groups = NULL;
+        struct file **new_files = NULL;
+        struct dentry *dentry;
+        struct file *filp;
+        int old_count = filter->fo_group_count, rc, stage = 0, i;
+        char name[25];
+        __u64 last_objid;
+        loff_t off = 0;
+
+        snprintf(name, 24, "%d", group);
+        name[24] = '\0';
+
+        if (!create) {
+                dentry = ll_lookup_one_len(name, filter->fo_dentry_O,
+                                           strlen(name));
+                if (IS_ERR(dentry)) {
+                        CERROR("Cannot lookup expected object group %d: %ld\n",
+                               group, PTR_ERR(dentry));
+                        RETURN(PTR_ERR(dentry));
+                }
+        } else {
+                dentry = simple_mkdir(filter->fo_dentry_O, name, 0700, 1);
+                if (IS_ERR(dentry)) {
+                        CERROR("cannot lookup/create O/%s: rc = %ld\n", name,
+                               PTR_ERR(dentry));
+                        RETURN(PTR_ERR(dentry));
+                }
         }
-        if (filter->fo_dentry_O_sub != NULL) {
+        stage = 1;
+
+        snprintf(name, 24, "O/%d/LAST_ID", group);
+        name[24] = '\0';
+        filp = filp_open(name, O_CREAT | O_RDWR, 0700);
+        if (IS_ERR(filp)) {
+                CERROR("cannot create %s: rc = %ld\n", name, PTR_ERR(filp));
+                GOTO(cleanup, rc = PTR_ERR(filp));
+        }
+        stage = 2;
+
+        rc = fsfilt_read_record(obd, filp, &last_objid, sizeof(__u64), &off);
+        if (rc) {
+                CDEBUG(D_INODE, "error reading %s: rc %d\n", name, rc);
+                GOTO(cleanup, rc);
+        }
+
+        if (filter->fo_subdir_count) {
+                OBD_ALLOC(tmp_subdirs, sizeof(*tmp_subdirs));
+                if (tmp_subdirs == NULL)
+                        GOTO(cleanup, rc = -ENOMEM);
+                stage = 3;
+
                 for (i = 0; i < filter->fo_subdir_count; i++) {
-                        dentry = filter->fo_dentry_O_sub[i];
-                        if (dentry != NULL)
-                                f_dput(dentry);
+                        char dir[20];
+                        snprintf(dir, sizeof(dir), "d%u", i);
+
+                        tmp_subdirs->dentry[i] =
+                                simple_mkdir(dentry, dir, 0700, 1);
+                        if (IS_ERR(tmp_subdirs->dentry[i])) {
+                                rc = PTR_ERR(tmp_subdirs->dentry[i]);
+                                CERROR("can't lookup/create O/%d/%s: rc = %d\n",
+                                       group, dir, rc);
+                                GOTO(cleanup, rc);
+                        }
+                        CDEBUG(D_INODE, "got/created O/%d/%s: %p\n", group, dir,
+                               tmp_subdirs->dentry[i]);
                 }
-                OBD_FREE(filter->fo_dentry_O_sub,
-                         filter->fo_subdir_count *
-                         sizeof(*filter->fo_dentry_O_sub));
-                filter->fo_dentry_O_sub = NULL;
         }
-        if (filter->fo_last_objids != NULL) {
-                OBD_FREE(filter->fo_last_objids,
-                         FILTER_GROUPS * sizeof(*filter->fo_last_objids));
-                filter->fo_last_objids = NULL;
+
+        /* 'group' is an index; we need an array of length 'group + 1' */
+        if (group + 1 > old_count) {
+                int len = group + 1;
+                OBD_ALLOC(new_objids, len * sizeof(*new_objids));
+                OBD_ALLOC(new_subdirs, len * sizeof(*new_subdirs));
+                OBD_ALLOC(new_groups, len * sizeof(*new_groups));
+                OBD_ALLOC(new_files, len * sizeof(*new_files));
+                stage = 4;
+                if (new_objids == NULL || new_subdirs == NULL ||
+                    new_groups == NULL || new_files == NULL)
+                        GOTO(cleanup, rc = -ENOMEM);
+
+                memcpy(new_objids, filter->fo_last_objids,
+                       old_count * sizeof(*new_objids));
+                memcpy(new_subdirs, filter->fo_subdirs,
+                       old_count * sizeof(*new_subdirs));
+                memcpy(new_groups, filter->fo_groups,
+                       old_count * sizeof(*new_groups));
+                memcpy(new_files, filter->fo_last_objid_files,
+                       old_count * sizeof(*new_files));
+
+                if (old_count) {
+                        OBD_FREE(filter->fo_last_objids,
+                                 old_count * sizeof(*new_objids));
+                        OBD_FREE(filter->fo_subdirs,
+                                 old_count * sizeof(*new_subdirs));
+                        OBD_FREE(filter->fo_groups,
+                                 old_count * sizeof(*new_groups));
+                        OBD_FREE(filter->fo_last_objid_files,
+                                 old_count * sizeof(*new_files));
+                }
+                filter->fo_last_objids = new_objids;
+                filter->fo_subdirs = new_subdirs;
+                filter->fo_groups = new_groups;
+                filter->fo_last_objid_files = new_files;
+                filter->fo_group_count = len;
         }
-        if (filter->fo_dentry_O != NULL) {
-                f_dput(filter->fo_dentry_O);
-                filter->fo_dentry_O = NULL;
+
+        filter->fo_groups[group] = dentry;
+        filter->fo_last_objid_files[group] = filp;
+        if (filter->fo_subdir_count) {
+                filter->fo_subdirs[group] = *tmp_subdirs;
+                OBD_FREE(tmp_subdirs, sizeof(*tmp_subdirs));
+        }
+
+        if (filp->f_dentry->d_inode->i_size == 0) {
+                filter->fo_last_objids[group] = FILTER_INIT_OBJID;
+                RETURN(0);
         }
+
+        filter->fo_last_objids[group] = le64_to_cpu(last_objid);
+        CDEBUG(D_INODE, "%s: server last_objid group %d: "LPU64"\n",
+               obd->obd_name, group, last_objid);
         RETURN(0);
+ cleanup:
+        switch (stage) {
+        case 4:
+                if (new_objids != NULL)
+                        OBD_FREE(new_objids, group * sizeof(*new_objids));
+                if (new_subdirs != NULL)
+                        OBD_FREE(new_subdirs, group * sizeof(*new_subdirs));
+                if (new_groups != NULL)
+                        OBD_FREE(new_groups, group * sizeof(*new_groups));
+                if (new_files != NULL)
+                        OBD_FREE(new_files, group * sizeof(*new_files));
+        case 3:
+                if (filter->fo_subdir_count) {
+                        for (i = 0; i < filter->fo_subdir_count; i++) {
+                                if (tmp_subdirs->dentry[i] != NULL)
+                                        dput(tmp_subdirs->dentry[i]);
+                        }
+                        OBD_FREE(tmp_subdirs, sizeof(*tmp_subdirs));
+                }
+        case 2:
+                filp_close(filp, 0);
+        case 1:
+                dput(dentry);
+        }
+        RETURN(rc);
+}
+
+static int filter_read_groups(struct obd_device *obd, int last_group,
+                              int create)
+{
+        struct filter_obd *filter = &obd->u.filter;
+        int old_count = filter->fo_group_count, group = old_count, rc = 0;
+
+        for (group = old_count; group <= last_group; group++) {
+                if (group == 0)
+                        continue; /* no group zero */
+
+                rc = filter_read_group_internal(obd, group, create);
+                if (rc != 0)
+                        break;
+        }
+        return rc;
 }
 
-/* FIXME: object groups */
 static int filter_prep_groups(struct obd_device *obd)
 {
         struct filter_obd *filter = &obd->u.filter;
         struct dentry *dentry, *O_dentry;
-        struct file *filp;
-        int i, rc = 0, cleanup_phase = 0;
+        int rc = 0, cleanup_phase = 0;
         ENTRY;
 
         O_dentry = simple_mkdir(current->fs->pwd, "O", 0700, 1);
@@ -626,120 +790,49 @@ static int filter_prep_groups(struct obd_device *obd)
                 GOTO(cleanup_O0, rc);
 
         cleanup_O0:
-                f_dput(O0_dentry);
+                dput(O0_dentry);
         cleanup_R:
-                f_dput(dentry);
+                dput(dentry);
                 if (rc)
                         GOTO(cleanup, rc);
         } else {
-                f_dput(dentry);
+                dput(dentry);
         }
 
-        OBD_ALLOC(filter->fo_last_objids, FILTER_GROUPS * sizeof(__u64));
-        if (filter->fo_last_objids == NULL)
-                GOTO(cleanup, rc = -ENOMEM);
         cleanup_phase = 2; /* groups */
 
-        OBD_ALLOC(filter->fo_dentry_O_groups, FILTER_GROUPS * sizeof(dentry));
-        if (filter->fo_dentry_O_groups == NULL)
-                GOTO(cleanup, rc = -ENOMEM);
-        OBD_ALLOC(filter->fo_last_objid_files, FILTER_GROUPS * sizeof(filp));
-        if (filter->fo_last_objid_files == NULL)
-                GOTO(cleanup, rc = -ENOMEM);
-
-        for (i = 0; i < FILTER_GROUPS; i++) {
-                char name[25];
-                loff_t off = 0;
-
-                sprintf(name, "%d", i);
-                dentry = simple_mkdir(O_dentry, name, 0700, 1);
-                CDEBUG(D_INODE, "got/created O/%s: %p\n", name, dentry);
-                if (IS_ERR(dentry)) {
-                        rc = PTR_ERR(dentry);
-                        CERROR("cannot lookup/create O/%s: rc = %d\n",
-                               name, rc);
-                        GOTO(cleanup, rc);
-                }
-                filter->fo_dentry_O_groups[i] = dentry;
-
-                sprintf(name, "O/%d/LAST_ID", i);
-                filp = filp_open(name, O_CREAT | O_RDWR, 0700);
-                if (IS_ERR(filp)) {
-                        rc = PTR_ERR(filp);
-                        CERROR("cannot create %s: rc = %d\n", name, rc);
-                        GOTO(cleanup, rc);
-                }
-                filter->fo_last_objid_files[i] = filp;
-
-                if (filp->f_dentry->d_inode->i_size == 0) {
-                        if (i == 0 && filter->fo_fsd->fsd_unused != 0) {
-                                /* OST conversion, remove sometime post 1.0 */
-                                filter->fo_last_objids[i] =
-                                        le64_to_cpu(filter->fo_fsd->fsd_unused);
-                                CWARN("saving old objid "LPU64" to LAST_ID\n",
-                                      filter->fo_last_objids[i]);
-                                rc = filter_update_last_objid(obd, 0, 1);
-                                if (rc)
-                                        GOTO(cleanup, rc);
-                        } else {
-                                filter->fo_last_objids[i] = FILTER_INIT_OBJID;
-                        }
-                        continue;
-                }
-
-                rc = fsfilt_read_record(obd, filp, &filter->fo_last_objids[i],
-                                        sizeof(__u64), &off);
-                if (rc) {
-                        CDEBUG(D_INODE,"OBD filter: error reading %s: rc %d\n",
-                               name, rc);
-                        GOTO(cleanup, rc);
-                }
-                filter->fo_last_objids[i] =
-                        le64_to_cpu(filter->fo_last_objids[i]);
-                CDEBUG(D_HA, "%s: server last_objid group %d: "LPU64"\n",
-                       obd->obd_name, i, filter->fo_last_objids[i]);
-        }
-
-        if (filter->fo_subdir_count) {
-                O_dentry = filter->fo_dentry_O_groups[0];
-                OBD_ALLOC(filter->fo_dentry_O_sub,
-                          filter->fo_subdir_count * sizeof(dentry));
-                if (filter->fo_dentry_O_sub == NULL)
-                        GOTO(cleanup, rc = -ENOMEM);
-
-                for (i = 0; i < filter->fo_subdir_count; i++) {
-                        char dir[20];
-                        snprintf(dir, sizeof(dir), "d%u", i);
+        /* Group 0 is no longer a legal group, to catch uninitialized IDs */
+#define FILTER_MIN_GROUPS 3
+        rc = filter_read_groups(obd, FILTER_MIN_GROUPS, 1);
+        if (rc)
+                GOTO(cleanup, rc);
 
-                        dentry = simple_mkdir(O_dentry, dir, 0700, 1);
-                        CDEBUG(D_INODE, "got/created O/0/%s: %p\n", dir,dentry);
-                        if (IS_ERR(dentry)) {
-                                rc = PTR_ERR(dentry);
-                                CERROR("can't lookup/create O/0/%s: rc = %d\n",
-                                       dir, rc);
-                                GOTO(cleanup, rc);
-                        }
-                        filter->fo_dentry_O_sub[i] = dentry;
-                }
-        }
         RETURN(0);
 
  cleanup:
-        filter_cleanup_groups(obd);
+        switch (cleanup_phase) {
+        case 2:
+                filter_cleanup_groups(obd);
+        case 1:
+                f_dput(filter->fo_dentry_O);
+                filter->fo_dentry_O = NULL;
+        default:
+                break;
+        }
         return rc;
 }
 
 /* setup the object store with correct subdirectories */
 static int filter_prep(struct obd_device *obd)
 {
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
         struct filter_obd *filter = &obd->u.filter;
         struct file *file;
         struct inode *inode;
         int rc = 0;
         ENTRY;
 
-        push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+        push_ctxt(&saved, &obd->obd_ctxt, NULL);
         file = filp_open(LAST_RCVD, O_RDWR | O_CREAT | O_LARGEFILE, 0700);
         if (!file || IS_ERR(file)) {
                 rc = PTR_ERR(file);
@@ -772,7 +865,7 @@ static int filter_prep(struct obd_device *obd)
                 GOTO(err_server_data, rc);
 
  out:
-        pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+        pop_ctxt(&saved, &obd->obd_ctxt, NULL);
 
         return(rc);
 
@@ -789,7 +882,7 @@ static int filter_prep(struct obd_device *obd)
 /* cleanup the filter: write last used object id to status file */
 static void filter_post(struct obd_device *obd)
 {
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
         struct filter_obd *filter = &obd->u.filter;
         int rc, i;
 
@@ -797,57 +890,49 @@ static void filter_post(struct obd_device *obd)
          * best to start a transaction with h_sync, because we removed this
          * from lastobjid */
 
-        push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+        push_ctxt(&saved, &obd->obd_ctxt, NULL);
         rc = filter_update_server_data(obd, filter->fo_rcvd_filp,
                                        filter->fo_fsd, 0);
         if (rc)
                 CERROR("error writing server data: rc = %d\n", rc);
 
-        for (i = 0; i < FILTER_GROUPS; i++) {
-                rc = filter_update_last_objid(obd, i, (i == FILTER_GROUPS - 1));
+        for (i = 1; i < filter->fo_group_count; i++) {
+                rc = filter_update_last_objid(obd, i,
+                                             (i == filter->fo_group_count - 1));
                 if (rc)
                         CERROR("error writing group %d lastobjid: rc = %d\n",
                                i, rc);
         }
 
-        rc = filp_close(filter->fo_rcvd_filp, 0);
+        filp_close(filter->fo_rcvd_filp, 0);
         filter->fo_rcvd_filp = NULL;
         if (rc)
                 CERROR("error closing %s: rc = %d\n", LAST_RCVD, rc);
 
         filter_cleanup_groups(obd);
+        f_dput(filter->fo_dentry_O);
         filter_free_server_data(filter);
-        pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+        pop_ctxt(&saved, &obd->obd_ctxt, NULL);
 }
 
-static void filter_set_last_id(struct filter_obd *filter, struct obdo *oa,
-                               obd_id id)
+static void filter_set_last_id(struct filter_obd *filter, int group, obd_id id)
 {
-        obd_gr group = 0;
         LASSERT(filter->fo_fsd != NULL);
-
-        if (oa != NULL) {
-                LASSERT(oa->o_gr <= FILTER_GROUPS);
-                group = oa->o_gr;
-        }
+        LASSERT(group > 0);
+        LASSERT(group < filter->fo_group_count);
 
         spin_lock(&filter->fo_objidlock);
         filter->fo_last_objids[group] = id;
         spin_unlock(&filter->fo_objidlock);
 }
 
-__u64 filter_last_id(struct filter_obd *filter, struct obdo *oa)
+__u64 filter_last_id(struct filter_obd *filter, int group)
 {
         obd_id id;
-        obd_gr group = 0;
         LASSERT(filter->fo_fsd != NULL);
+        LASSERT(group > 0);
+        LASSERT(group < filter->fo_group_count);
 
-        if (oa != NULL) {
-                LASSERT(oa->o_gr <= FILTER_GROUPS);
-                group = oa->o_gr;
-        }
-
-        /* FIXME: object groups */
         spin_lock(&filter->fo_objidlock);
         id = filter->fo_last_objids[group];
         spin_unlock(&filter->fo_objidlock);
@@ -916,12 +1001,13 @@ static void filter_parent_unlock(struct dentry *dparent)
 struct dentry *filter_parent(struct obd_device *obd, obd_gr group, obd_id objid)
 {
         struct filter_obd *filter = &obd->u.filter;
-        LASSERT(group < FILTER_GROUPS); /* FIXME: object groups */
+        LASSERT(group < filter->fo_group_count);
+        LASSERT(group > 0);
 
-        if (group > 0 || filter->fo_subdir_count == 0)
-                return filter->fo_dentry_O_groups[group];
+        if (/*group > 0 || */filter->fo_subdir_count == 0)
+                return filter->fo_groups[group];
 
-        return filter->fo_dentry_O_sub[objid & (filter->fo_subdir_count - 1)];
+        return filter->fo_subdirs[group].dentry[objid & (filter->fo_subdir_count - 1)];
 }
 
 /* We never dget the object parent, so DON'T dput it either */
@@ -935,6 +1021,9 @@ struct dentry *filter_parent_lock(struct obd_device *obd, obd_gr group,
         if (IS_ERR(dparent))
                 return dparent;
 
+        LASSERT(dparent);
+        LASSERT(dparent->d_inode);
+
         rc = filter_lock_dentry(obd, dparent);
         if (time_after(jiffies, now + 15 * HZ))
                 CERROR("slow parent lock %lus\n", (jiffies - now) / HZ);
@@ -987,11 +1076,12 @@ struct dentry *filter_fid2dentry(struct obd_device *obd,
         RETURN(dchild);
 }
 
-static int filter_prepare_destroy(struct obd_device *obd, obd_id objid)
+static int filter_prepare_destroy(struct obd_device *obd, obd_id objid,
+                                  obd_id group)
 {
         struct lustre_handle lockh;
         int flags = LDLM_AST_DISCARD_DATA, rc;
-        struct ldlm_res_id res_id = { .name = { objid } };
+        struct ldlm_res_id res_id = { .name = { objid, 0, group, 0 } };
         ldlm_policy_data_t policy = { .l_extent = { 0, OBD_OBJECT_EOF } };
 
         ENTRY;
@@ -1101,7 +1191,6 @@ static int filter_intent_policy(struct ldlm_namespace *ns,
         res_lvb = res->lr_lvb_data;
         LASSERT(res_lvb != NULL);
         reply_lvb->lvb_size = res_lvb->lvb_size;
-        reply_lvb->lvb_blocks = res_lvb->lvb_blocks;
         up(&res->lr_lvb_sem);
 
         list_for_each(tmp, &res->lr_granted) {
@@ -1111,7 +1200,8 @@ static int filter_intent_policy(struct ldlm_namespace *ns,
                 if (tmplock->l_granted_mode == LCK_PR)
                         continue;
 
-                if (tmplock->l_policy_data.l_extent.end <= reply_lvb->lvb_size)
+                if (tmplock->l_policy_data.l_extent.end <=
+                    reply_lvb->lvb_size)
                         continue;
 
                 if (l == NULL) {
@@ -1141,7 +1231,6 @@ static int filter_intent_policy(struct ldlm_namespace *ns,
 
         down(&res->lr_lvb_sem);
         reply_lvb->lvb_size = res_lvb->lvb_size;
-        reply_lvb->lvb_blocks = res_lvb->lvb_blocks;
         up(&res->lr_lvb_sem);
 
         LDLM_LOCK_PUT(l);
@@ -1150,13 +1239,12 @@ static int filter_intent_policy(struct ldlm_namespace *ns,
 }
 
 /* mount the file system (secretly) */
-int filter_common_setup(struct obd_device *obd, obd_count len, 
-                        void *buf, char *option)
+int filter_common_setup(struct obd_device *obd, obd_count len, void *buf,
+                        char *option)
 {
         struct lustre_cfg* lcfg = buf;
         struct filter_obd *filter = &obd->u.filter;
         struct vfsmount *mnt;
-        char name[32] = "CATLIST";
         int rc = 0;
         ENTRY;
 
@@ -1195,24 +1283,16 @@ int filter_common_setup(struct obd_device *obd, obd_count len,
         filter->fo_fstype = mnt->mnt_sb->s_type->name;
         CDEBUG(D_SUPER, "%s: mnt = %p\n", filter->fo_fstype, mnt);
 
-        OBD_SET_CTXT_MAGIC(&obd->obd_lvfs_ctxt);
-        obd->obd_lvfs_ctxt.pwdmnt = mnt;
-        obd->obd_lvfs_ctxt.pwd = mnt->mnt_root;
-        obd->obd_lvfs_ctxt.fs = get_ds();
-        obd->obd_lvfs_ctxt.cb_ops = filter_lvfs_ops;
-
-        rc = fsfilt_setup(obd, mnt->mnt_sb);
-        if (rc)
-                GOTO(err_mntput, rc);
+        OBD_SET_CTXT_MAGIC(&obd->obd_ctxt);
+        obd->obd_ctxt.pwdmnt = mnt;
+        obd->obd_ctxt.pwd = mnt->mnt_root;
+        obd->obd_ctxt.fs = get_ds();
+        obd->obd_ctxt.cb_ops = filter_lvfs_ops;
 
         rc = filter_prep(obd);
         if (rc)
                 GOTO(err_mntput, rc);
 
-        
-        filter->fo_destroy_in_progress = 0;
-        sema_init(&filter->fo_create_lock, 1);
-
         spin_lock_init(&filter->fo_translock);
         spin_lock_init(&filter->fo_objidlock);
         INIT_LIST_HEAD(&filter->fo_export_list);
@@ -1225,6 +1305,9 @@ int filter_common_setup(struct obd_device *obd, obd_count len,
         spin_lock_init(&filter->fo_w_discont_blocks.oh_lock);
         filter->fo_readcache_max_filesize = FILTER_MAX_CACHE_SIZE;
 
+        INIT_LIST_HEAD(&filter->fo_llog_list);
+        spin_lock_init(&filter->fo_llog_list_lock);
+
         obd->obd_namespace = ldlm_namespace_new("filter-tgt",
                                                 LDLM_NAMESPACE_SERVER);
         if (obd->obd_namespace == NULL)
@@ -1236,7 +1319,7 @@ int filter_common_setup(struct obd_device *obd, obd_count len,
         ptlrpc_init_client(LDLM_CB_REQUEST_PORTAL, LDLM_CB_REPLY_PORTAL,
                            "filter_ldlm_cb_client", &obd->obd_ldlm_client);
 
-        rc = obd_llog_cat_initialize(obd, 1, name);
+        rc = llog_cat_initialize(obd, &obd->obd_llogs, 1);
         if (rc) {
                 CERROR("failed to setup llogging subsystems\n");
                 GOTO(err_post, rc);
@@ -1258,30 +1341,29 @@ err_ops:
 
 static int filter_setup(struct obd_device *obd, obd_count len, void *buf)
 {
-        struct lprocfs_static_vars lvars;
         struct lustre_cfg* lcfg = buf;
+        const char *str = NULL;
+        char *option = NULL;
+        int n = 0;
         int rc;
 
-        /* all mount options including errors=remount-ro and asyncdel are passed
-         * using 4th lcfg param. And it is good, finally we have got rid of
-         * hardcoded fs types in the code. */
-        
-        rc = filter_common_setup(obd, len, buf, lcfg->lcfg_inlbuf4);
-
-        lprocfs_init_vars(filter, &lvars);
-        if (rc == 0 && lprocfs_obd_setup(obd, lvars.obd_vars) == 0 &&
-            lprocfs_alloc_obd_stats(obd, LPROC_FILTER_LAST) == 0) {
-                /* Init obdfilter private stats here */
-                lprocfs_counter_init(obd->obd_stats, LPROC_FILTER_READ_BYTES,
-                                     LPROCFS_CNTR_AVGMINMAX,
-                                     "read_bytes", "bytes");
-                lprocfs_counter_init(obd->obd_stats, LPROC_FILTER_WRITE_BYTES,
-                                     LPROCFS_CNTR_AVGMINMAX,
-                                     "write_bytes", "bytes");
-
-                lproc_filter_attach_seqstat(obd);
+        if (!strcmp(lcfg->lcfg_inlbuf2, "ext3")) {
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
+        /* bug 1577: implement async-delete for 2.5 */
+                str = "errors=remount-ro,asyncdel";
+#else
+                str = "errors=remount-ro";
+#endif
+                n = strlen(str) + 1;
+                OBD_ALLOC(option, n);
+                if (option == NULL)
+                        RETURN(-ENOMEM);
+                strcpy(option, str);
         }
 
+        rc = filter_common_setup(obd, len, buf, option);
+        if (option)
+                OBD_FREE(option, n);
         return rc;
 }
 
@@ -1308,9 +1390,6 @@ static int filter_cleanup(struct obd_device *obd, int flags)
         if (filter->fo_sb == NULL)
                 RETURN(0);
 
-        lprocfs_free_obd_stats(obd);
-        lprocfs_obd_cleanup(obd);
-
         filter_post(obd);
 
         shrink_dcache_parent(filter->fo_sb->s_root);
@@ -1333,6 +1412,35 @@ static int filter_cleanup(struct obd_device *obd, int flags)
         RETURN(0);
 }
 
+static int filter_attach(struct obd_device *obd, obd_count len, void *data)
+{
+        struct lprocfs_static_vars lvars;
+        int rc;
+
+        lprocfs_init_vars(filter, &lvars);
+        rc = lprocfs_obd_attach(obd, lvars.obd_vars);
+        if (rc != 0)
+                return rc;
+
+        rc = lprocfs_alloc_obd_stats(obd, LPROC_FILTER_LAST);
+        if (rc != 0)
+                return rc;
+
+        /* Init obdfilter private stats here */
+        lprocfs_counter_init(obd->obd_stats, LPROC_FILTER_READ_BYTES,
+                             LPROCFS_CNTR_AVGMINMAX, "read_bytes", "bytes");
+        lprocfs_counter_init(obd->obd_stats, LPROC_FILTER_WRITE_BYTES,
+                             LPROCFS_CNTR_AVGMINMAX, "write_bytes", "bytes");
+
+        return lproc_filter_attach_seqstat(obd);
+}
+
+static int filter_detach(struct obd_device *dev)
+{
+        lprocfs_free_obd_stats(dev);
+        return lprocfs_obd_detach(dev);
+}
+
 /* nearly identical to mds_connect */
 static int filter_connect(struct lustre_handle *conn, struct obd_device *obd,
                           struct obd_uuid *cluuid)
@@ -1384,10 +1492,31 @@ cleanup:
 
 static int filter_precleanup(struct obd_device *obd, int flags)
 {
+        struct filter_group_llog *log;
+        struct filter_obd *filter;
         int rc = 0;
         ENTRY;
 
-        rc = obd_llog_finish(obd, 0);
+        filter = &obd->u.filter;
+
+        spin_lock(&filter->fo_llog_list_lock);
+        while (!list_empty(&filter->fo_llog_list)) {
+                log = list_entry(filter->fo_llog_list.next,
+                                 struct filter_group_llog, list);
+                list_del(&log->list);
+                spin_unlock(&filter->fo_llog_list_lock);
+
+                rc = obd_llog_finish(obd, log->llogs, 0);
+                if (rc)
+                        CERROR("failed to cleanup llogging subsystem for %u\n",
+                                log->group);
+                OBD_FREE(log->llogs, sizeof(*(log->llogs)));
+                OBD_FREE(log, sizeof(*log));
+                spin_lock(&filter->fo_llog_list_lock);
+        }
+        spin_unlock(&filter->fo_llog_list_lock);
+
+        rc = obd_llog_finish(obd, &obd->obd_llogs, 0);
         if (rc)
                 CERROR("failed to cleanup llogging subsystem\n");
 
@@ -1397,7 +1526,7 @@ static int filter_precleanup(struct obd_device *obd, int flags)
 /* Do extra sanity checks for grant accounting.  We do this at connect,
  * disconnect, and statfs RPC time, so it shouldn't be too bad.  We can
  * always get rid of it or turn it off when we know accounting is good. */
-static void filter_grant_sanity_check(struct obd_device *obd, const char *func)
+static void filter_grant_sanity_check(struct obd_device *obd, char *func)
 {
         struct filter_export_data *fed;
         struct obd_export *exp;
@@ -1512,12 +1641,56 @@ static int filter_destroy_export(struct obd_export *exp)
         RETURN(0);
 }
 
+static void filter_sync_llogs(struct obd_export *dexp)
+{
+        struct filter_group_llog *fglog, *nlog;
+        struct obd_device *obd = dexp->exp_obd;
+        struct filter_obd *filter;
+        int worked = 0, group;
+        struct llog_ctxt *ctxt;
+
+        filter = &obd->u.filter;
+
+        /* we can't sync log holding spinlock. also, we do not want to get
+         * into livelock. so we do following: loop over MDS's exports in
+         * group order and skip already synced llogs -bzzz */
+        do {
+                /* look for group with min. number, but > worked */
+                fglog = NULL;
+                group = 1 << 30;
+                spin_lock(&filter->fo_llog_list_lock);
+                list_for_each_entry(nlog, &filter->fo_llog_list, list) {
+                       
+                        if (nlog->group <= worked) {
+                                /* this group is already synced */
+                                continue;
+                        }
+        
+                        if (group < nlog->group) {
+                                /* we have group with smaller number to sync */
+                                continue;
+                        }
+
+                        /* store current minimal group */
+                        fglog = nlog;
+                        group = nlog->group;
+                }
+                spin_lock(&filter->fo_llog_list_lock);
+
+                if (fglog) {
+                        worked = fglog->group;
+                        ctxt = llog_get_context(fglog->llogs,
+                                                LLOG_UNLINK_REPL_CTXT);
+                        llog_sync(ctxt, dexp);
+                }
+        } while (fglog != NULL);
+}
+
 /* also incredibly similar to mds_disconnect */
 static int filter_disconnect(struct obd_export *exp, int flags)
 {
         struct obd_device *obd = exp->exp_obd;
         unsigned long irqflags;
-        struct llog_ctxt *ctxt;
         int rc;
         ENTRY;
 
@@ -1540,8 +1713,7 @@ static int filter_disconnect(struct obd_export *exp, int flags)
         fsfilt_sync(obd, obd->u.filter.fo_sb);
 
         /* flush any remaining cancel messages out to the target */
-        ctxt = llog_get_context(obd, LLOG_UNLINK_REPL_CTXT);
-        llog_sync(ctxt, exp);
+        filter_sync_llogs(exp);
 
         class_export_put(exp);
         RETURN(rc);
@@ -1564,8 +1736,7 @@ struct dentry *__filter_oa2dentry(struct obd_device *obd,
         }
 
         if (dchild->d_inode == NULL) {
-                CERROR("%s: %s on non-existent object: "LPU64"\n", 
-                       obd->obd_name, what, oa->o_id);
+                CERROR("%s on non-existent object: "LPU64"\n", what, oa->o_id);
                 f_dput(dchild);
                 RETURN(ERR_PTR(-ENOENT));
         }
@@ -1604,11 +1775,11 @@ static int filter_getattr(struct obd_export *exp, struct obdo *oa,
 static int filter_setattr(struct obd_export *exp, struct obdo *oa,
                           struct lov_stripe_md *md, struct obd_trans_info *oti)
 {
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
         struct filter_obd *filter;
         struct dentry *dentry;
         struct iattr iattr;
-        struct ldlm_res_id res_id = { .name = { oa->o_id } };
+        struct ldlm_res_id res_id = { .name = { oa->o_id, 0, oa->o_gr, 0 } };
         struct ldlm_resource *res;
         void *handle;
         int rc, rc2;
@@ -1624,7 +1795,7 @@ static int filter_setattr(struct obd_export *exp, struct obdo *oa,
 
         iattr_from_obdo(&iattr, oa, oa->o_valid);
 
-        push_ctxt(&saved, &exp->exp_obd->obd_lvfs_ctxt, NULL);
+        push_ctxt(&saved, &exp->exp_obd->obd_ctxt, NULL);
         lock_kernel();
 
         if (iattr.ia_valid & ATTR_SIZE)
@@ -1672,7 +1843,7 @@ out_unlock:
         if (iattr.ia_valid & ATTR_SIZE)
                 up(&dentry->d_inode->i_sem);
         unlock_kernel();
-        pop_ctxt(&saved, &exp->exp_obd->obd_lvfs_ctxt, NULL);
+        pop_ctxt(&saved, &exp->exp_obd->obd_ctxt, NULL);
 
         f_dput(dentry);
         RETURN(rc);
@@ -1737,57 +1908,34 @@ static void filter_destroy_precreated(struct obd_export *exp, struct obdo *oa,
         LASSERT(oa);
 
         memset(&doa, 0, sizeof(doa));
-        if (oa->o_valid & OBD_MD_FLGROUP) {
-                doa.o_valid |= OBD_MD_FLGROUP;
-                doa.o_gr = oa->o_gr;
-        } else {
-                doa.o_gr = 0;
-        }
         doa.o_mode = S_IFREG;
-
-        filter->fo_destroy_in_progress = 1;
-        down(&filter->fo_create_lock);
-        if (!filter->fo_destroy_in_progress) {
-                CERROR("%s: destroy_in_progress already cleared\n",
-                        exp->exp_obd->obd_name);
-                up(&filter->fo_create_lock);
-                EXIT;
-                return;
-        }
-
-        last = filter_last_id(filter, &doa);
-        CWARN("%s: deleting orphan objects from "LPU64" to "LPU64"\n",
-               exp->exp_obd->obd_name, oa->o_id + 1, last);
+        doa.o_gr = oa->o_gr;
+        doa.o_valid = oa->o_valid & OBD_MD_FLGROUP;
+        last = filter_last_id(filter, oa->o_gr);
+        CWARN("deleting orphan objects from "LPU64" to "LPU64"\n",
+               oa->o_id + 1, last);
         for (id = oa->o_id + 1; id <= last; id++) {
                 doa.o_id = id;
                 filter_destroy(exp, &doa, NULL, NULL);
         }
-
-        CDEBUG(D_HA, "%s: after destroy: set last_objids["LPU64"] = "LPU64"\n",
-               exp->exp_obd->obd_name, doa.o_gr, oa->o_id);
-
         spin_lock(&filter->fo_objidlock);
         filter->fo_last_objids[doa.o_gr] = oa->o_id;
         spin_unlock(&filter->fo_objidlock);
-
-        filter->fo_destroy_in_progress = 0;
-        up(&filter->fo_create_lock);
-
         EXIT;
 }
 
 /* returns a negative error or a nonnegative number of files to create */
 static int filter_should_precreate(struct obd_export *exp, struct obdo *oa,
-                                   obd_gr group)
+                                   int group)
 {
         struct obd_device *obd = exp->exp_obd;
         struct filter_obd *filter = &obd->u.filter;
         int diff, rc;
         ENTRY;
 
-        diff = oa->o_id - filter_last_id(filter, oa);
+        diff = oa->o_id - filter_last_id(filter, oa->o_gr);
         CDEBUG(D_INFO, "filter_last_id() = "LPU64" -> diff = %d\n",
-               filter_last_id(filter, oa), diff);
+               filter_last_id(filter, oa->o_gr), diff);
 
         /* delete orphans request */
         if ((oa->o_valid & OBD_MD_FLFLAGS) &&
@@ -1797,7 +1945,7 @@ static int filter_should_precreate(struct obd_export *exp, struct obdo *oa,
                 if (-diff > 10000) { /* XXX make this smarter */
                         CERROR("ignoring bogus orphan destroy request: obdid "
                                LPU64" last_id "LPU64"\n",
-                               oa->o_id, filter_last_id(filter, oa));
+                               oa->o_id, filter_last_id(filter, oa->o_gr));
                         RETURN(-EINVAL);
                 }
                 filter_destroy_precreated(exp, oa, filter);
@@ -1829,10 +1977,12 @@ static int filter_should_precreate(struct obd_export *exp, struct obdo *oa,
 static int filter_precreate(struct obd_device *obd, struct obdo *oa,
                             obd_gr group, int *num)
 {
-        struct dentry *dchild = NULL, *dparent = NULL;
+        struct dentry *dchild = NULL;
         struct filter_obd *filter;
-        int err = 0, rc = 0, recreate_obj = 0, i;
+        struct dentry *dparent;
+        int err = 0, rc = 0, i;
         __u64 next_id;
+        int recreate_obj = 0;
         void *handle = NULL;
         ENTRY;
 
@@ -1843,31 +1993,22 @@ static int filter_precreate(struct obd_device *obd, struct obdo *oa,
                 recreate_obj = 1;
         }
 
-        CDEBUG(D_HA, "%s: precreating %d objects\n", obd->obd_name, *num);
-
-        down(&filter->fo_create_lock);
-
         for (i = 0; i < *num && err == 0; i++) {
                 int cleanup_phase = 0;
 
-                if (filter->fo_destroy_in_progress) {
-                        CWARN("%s: precreate aborted by destroy\n",
-                              obd->obd_name);
-                        break;
-                }
-
                 if (recreate_obj) {
                         __u64 last_id;
                         next_id = oa->o_id;
-                        last_id = filter_last_id(filter, oa);
+                        last_id = filter_last_id(filter, group);
                         if (next_id > last_id) {
                                 CERROR("Error: Trying to recreate obj greater"
                                        "than last id "LPD64" > "LPD64"\n",
                                        next_id, last_id);
-                                GOTO(cleanup, rc = -EINVAL);
+                                RETURN(-EINVAL);
                         }
-                } else
-                        next_id = filter_last_id(filter, oa) + 1;
+                } else {
+                        next_id = filter_last_id(filter, group) + 1;
+                }
 
                 CDEBUG(D_INFO, "precreate objid "LPU64"\n", next_id);
 
@@ -1887,17 +2028,13 @@ static int filter_precreate(struct obd_device *obd, struct obdo *oa,
                          * already exists
                          */
                         if (recreate_obj) {
-                                CERROR("%s: Serious error: recreating obj %*s "
-                                       "but obj already exists \n",
-                                       obd->obd_name, dchild->d_name.len,
-                                       dchild->d_name.name);
-                                LBUG();
+                                CERROR("Serious error: recreating obj %*s but "
+                                       "obj already exists \n",
+                                       dchild->d_name.len, dchild->d_name.name);
                         } else {
-                                CERROR("%s: Serious error: objid %*s already "
+                                CERROR("Serious error: objid %*s already "
                                        "exists; is this filesystem corrupt?\n",
-                                       obd->obd_name, dchild->d_name.len,
-                                       dchild->d_name.name);
-                                LBUG();
+                                       dchild->d_name.len, dchild->d_name.name);
                         }
                         GOTO(cleanup, rc = -EEXIST);
                 }
@@ -1915,7 +2052,7 @@ static int filter_precreate(struct obd_device *obd, struct obdo *oa,
                 }
 
                 if (!recreate_obj) {
-                        filter_set_last_id(filter, oa, next_id);
+                        filter_set_last_id(filter, group, next_id);
                         err = filter_update_last_objid(obd, group, 0);
                         if (err)
                                 CERROR("unable to write lastobjid "
@@ -1944,13 +2081,7 @@ static int filter_precreate(struct obd_device *obd, struct obdo *oa,
         }
         *num = i;
 
-        up(&filter->fo_create_lock);
-
-        CDEBUG(D_HA, "%s: server last_objid for group "LPU64": "LPU64"\n",
-               obd->obd_name, group, filter->fo_last_objids[group]);
-
-        CDEBUG(D_HA, "%s: filter_precreate() created %d objects\n",
-               obd->obd_name, i);
+        CDEBUG(D_INFO, "filter_precreate() created %d objects\n", i);
         RETURN(rc);
 }
 
@@ -1958,16 +2089,39 @@ static int filter_create(struct obd_export *exp, struct obdo *oa,
                          struct lov_stripe_md **ea, struct obd_trans_info *oti)
 {
         struct obd_device *obd = NULL;
-        struct lvfs_run_ctxt saved;
+        struct filter_obd *filter;
+        struct obd_run_ctxt saved;
         struct lov_stripe_md *lsm = NULL;
-        obd_gr group = 0;
+        struct filter_export_data *fed;
+        int group = oa->o_gr;
+        char str[PTL_NALFMT_SIZE];
         int rc = 0, diff;
         ENTRY;
 
-        if (oa->o_valid & OBD_MD_FLGROUP)
-                group = oa->o_gr;
+        if (!(oa->o_valid & OBD_MD_FLGROUP) || group == 0) {
+                portals_nid2str(exp->exp_connection->c_peer.peer_ni->pni_number,
+                                exp->exp_connection->c_peer.peer_nid, str);
+                CERROR("!!! nid "LPX64"/%s sent invalid object group %d\n",
+                       exp->exp_connection->c_peer.peer_nid, str, group);
+                RETURN(-EINVAL);
+        }
+
+        obd = exp->exp_obd;
+        fed = &exp->exp_filter_data;
+        filter = &obd->u.filter;
+
+        if (fed->fed_group != group) {
+                portals_nid2str(exp->exp_connection->c_peer.peer_ni->pni_number,
+                                exp->exp_connection->c_peer.peer_nid, str);
+                CERROR("!!! This export (nid "LPX64"/%s) used object group %d "
+                       "earlier; now it's trying to use group %d!  This could "
+                       "be a bug in the MDS.  Tell CFS.\n",
+                       exp->exp_connection->c_peer.peer_nid, str,
+                       fed->fed_group, group);
+                RETURN(-ENOTUNIQ);
+        }
 
-        CDEBUG(D_INFO, "filter_create(od->o_gr="LPU64",od->o_id="LPU64")\n",
+        CDEBUG(D_INFO, "filter_create(od->o_gr=%d,od->o_id="LPU64")\n",
                group, oa->o_id);
         if (ea != NULL) {
                 lsm = *ea;
@@ -1978,14 +2132,13 @@ static int filter_create(struct obd_export *exp, struct obdo *oa,
                 }
         }
 
-        obd = exp->exp_obd;
-        push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+        push_ctxt(&saved, &obd->obd_ctxt, NULL);
 
         if ((oa->o_valid & OBD_MD_FLFLAGS) &&
             (oa->o_flags & OBD_FL_RECREATE_OBJS)) {
-                if (oa->o_id > filter_last_id(&obd->u.filter, oa)) {
+                if (oa->o_id > filter_last_id(&obd->u.filter, group)) {
                         CERROR("recreate objid "LPU64" > last id "LPU64"\n",
-                               oa->o_id, filter_last_id(&obd->u.filter, oa));
+                               oa->o_id, filter_last_id(&obd->u.filter, group));
                         rc = -EINVAL;
                 } else {
                         diff = 1;
@@ -1994,14 +2147,14 @@ static int filter_create(struct obd_export *exp, struct obdo *oa,
         } else {
                 diff = filter_should_precreate(exp, oa, group);
                 if (diff > 0) {
-                        oa->o_id = filter_last_id(&obd->u.filter, oa);
+                        oa->o_id = filter_last_id(&obd->u.filter, group);
                         rc = filter_precreate(obd, oa, group, &diff);
                         oa->o_id += diff;
                         oa->o_valid = OBD_MD_FLID;
                 }
         }
 
-        pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+        pop_ctxt(&saved, &obd->obd_ctxt, NULL);
         if (rc && ea != NULL && *ea != lsm) {
                 obd_free_memmd(exp, &lsm);
         } else if (rc == 0 && ea != NULL) {
@@ -2010,6 +2163,7 @@ static int filter_create(struct obd_export *exp, struct obdo *oa,
                  * don't go touching that.  This needs to be fixed in a
                  * big way. */
                 lsm->lsm_object_id = oa->o_id;
+                lsm->lsm_object_gr = oa->o_gr;
                 *ea = lsm;
         }
 
@@ -2022,28 +2176,26 @@ static int filter_destroy(struct obd_export *exp, struct obdo *oa,
         struct obd_device *obd;
         struct filter_obd *filter;
         struct dentry *dchild = NULL, *dparent = NULL;
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
         void *handle = NULL;
         struct llog_cookie *fcc = NULL;
         int rc, rc2, cleanup_phase = 0, have_prepared = 0;
-        obd_gr group = 0;
         ENTRY;
 
-        if (oa->o_valid & OBD_MD_FLGROUP)
-                group = oa->o_gr;
+        LASSERT(oa->o_valid & OBD_MD_FLGROUP);
 
         obd = exp->exp_obd;
         filter = &obd->u.filter;
 
-        push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+        push_ctxt(&saved, &obd->obd_ctxt, NULL);
 
  acquire_locks:
-        dparent = filter_parent_lock(obd, group, oa->o_id);
+        dparent = filter_parent_lock(obd, oa->o_gr, oa->o_id);
         if (IS_ERR(dparent))
                 GOTO(cleanup, rc = PTR_ERR(dparent));
         cleanup_phase = 1;
 
-        dchild = filter_fid2dentry(obd, dparent, group, oa->o_id);
+        dchild = filter_fid2dentry(obd, dparent, oa->o_gr, oa->o_id);
         if (IS_ERR(dchild))
                 GOTO(cleanup, rc = -ENOENT);
         cleanup_phase = 2;
@@ -2070,15 +2222,14 @@ static int filter_destroy(struct obd_export *exp, struct obdo *oa,
                 f_dput(dchild);
                 filter_parent_unlock(dparent);
 
-                filter_prepare_destroy(obd, oa->o_id);
+                filter_prepare_destroy(obd, oa->o_id, oa->o_gr);
                 have_prepared = 1;
                 goto acquire_locks;
         }
 
-        handle = fsfilt_start_log(obd, dparent->d_inode, FSFILT_OP_UNLINK, oti, 1);
+        handle = fsfilt_start_log(obd, dparent->d_inode,FSFILT_OP_UNLINK,oti,1);
         if (IS_ERR(handle))
                 GOTO(cleanup, rc = PTR_ERR(handle));
-        
         cleanup_phase = 3;
 
         /* Our MDC connection is established by the MDS to us */
@@ -2095,13 +2246,11 @@ cleanup:
         case 3:
                 if (fcc != NULL) {
                         if (oti != NULL)
-                                fsfilt_add_journal_cb(obd, filter->fo_sb, 0,
-                                                      oti->oti_handle,
+                                fsfilt_add_journal_cb(obd, 0, oti->oti_handle,
                                                       filter_cancel_cookies_cb,
                                                       fcc);
                         else
-                                fsfilt_add_journal_cb(obd, filter->fo_sb, 0,
-                                                      handle,
+                                fsfilt_add_journal_cb(obd, 0, handle,
                                                       filter_cancel_cookies_cb,
                                                       fcc);
                 }
@@ -2117,7 +2266,7 @@ cleanup:
         case 1:
                 filter_parent_unlock(dparent);
         case 0:
-                pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+                pop_ctxt(&saved, &obd->obd_ctxt, NULL);
                 break;
         default:
                 CERROR("invalid cleanup_phase %d\n", cleanup_phase);
@@ -2150,29 +2299,30 @@ static int filter_truncate(struct obd_export *exp, struct obdo *oa,
 static int filter_sync(struct obd_export *exp, struct obdo *oa,
                        struct lov_stripe_md *lsm, obd_off start, obd_off end)
 {
-        struct lvfs_run_ctxt saved;
+        struct obd_device *obd = exp->exp_obd;
+        struct obd_run_ctxt saved;
         struct filter_obd *filter;
         struct dentry *dentry;
         struct llog_ctxt *ctxt;
         int rc, rc2;
         ENTRY;
 
-        filter = &exp->exp_obd->u.filter;
+        filter = &obd->u.filter;
 
         /* an objid of zero is taken to mean "sync whole filesystem" */
         if (!oa || !(oa->o_valid & OBD_MD_FLID)) {
-                rc = fsfilt_sync(exp->exp_obd, filter->fo_sb);
+                rc = fsfilt_sync(obd, filter->fo_sb);
                 /* flush any remaining cancel messages out to the target */
-                ctxt = llog_get_context(exp->exp_obd, LLOG_UNLINK_REPL_CTXT);
+                ctxt = llog_get_context(&obd->obd_llogs, LLOG_UNLINK_REPL_CTXT);
                 llog_sync(ctxt, exp);
                 RETURN(rc);
         }
 
-        dentry = filter_oa2dentry(exp->exp_obd, oa);
+        dentry = filter_oa2dentry(obd, oa);
         if (IS_ERR(dentry))
                 RETURN(PTR_ERR(dentry));
 
-        push_ctxt(&saved, &exp->exp_obd->obd_lvfs_ctxt, NULL);
+        push_ctxt(&saved, &obd->obd_ctxt, NULL);
 
         down(&dentry->d_inode->i_sem);
         rc = filemap_fdatasync(dentry->d_inode->i_mapping);
@@ -2192,7 +2342,7 @@ static int filter_sync(struct obd_export *exp, struct obdo *oa,
         oa->o_valid = OBD_MD_FLID;
         obdo_from_inode(oa, dentry->d_inode, FILTER_VALID_FLAGS);
 
-        pop_ctxt(&saved, &exp->exp_obd->obd_lvfs_ctxt, NULL);
+        pop_ctxt(&saved, &obd->obd_ctxt, NULL);
 
         f_dput(dentry);
         RETURN(rc);
@@ -2232,6 +2382,7 @@ static int filter_statfs(struct obd_device *obd, struct obd_statfs *osfs,
 static int filter_get_info(struct obd_export *exp, __u32 keylen,
                            void *key, __u32 *vallen, void *val)
 {
+        struct filter_export_data *fed = &exp->exp_filter_data;
         struct obd_device *obd;
         ENTRY;
 
@@ -2260,20 +2411,74 @@ static int filter_get_info(struct obd_export *exp, __u32 keylen,
 
         if (keylen >= strlen("last_id") && memcmp(key, "last_id", 7) == 0) {
                 obd_id *last_id = val;
-                /* FIXME: object groups */
-                *last_id = filter_last_id(&obd->u.filter, 0);
+                *last_id = filter_last_id(&obd->u.filter, fed->fed_group);
                 RETURN(0);
         }
         CDEBUG(D_IOCTL, "invalid key\n");
         RETURN(-EINVAL);
 }
 
+struct obd_llogs * filter_grab_llog_for_group(struct obd_device *obd, int group)
+{
+        struct filter_group_llog *fglog, *nlog;
+        struct filter_obd *filter;
+        struct list_head *cur;
+        int rc;
+
+        filter = &obd->u.filter;
+
+        spin_lock(&filter->fo_llog_list_lock);
+        list_for_each(cur, &filter->fo_llog_list) {
+                fglog = list_entry(cur, struct filter_group_llog, list);
+                if (fglog->group == group) {
+                        spin_unlock(&filter->fo_llog_list_lock);
+                        RETURN(fglog->llogs);
+                }
+        }
+        spin_unlock(&filter->fo_llog_list_lock);
+
+        OBD_ALLOC(fglog, sizeof(*fglog));
+        if (fglog == NULL)
+                RETURN(NULL);
+        fglog->group = group;
+
+        OBD_ALLOC(fglog->llogs, sizeof(struct obd_llogs));
+        if (fglog->llogs == NULL) {
+                OBD_FREE(fglog, sizeof(*fglog));
+                RETURN(NULL);
+        }
+
+        spin_lock(&filter->fo_llog_list_lock);
+        list_for_each(cur, &filter->fo_llog_list) {
+                nlog = list_entry(cur, struct filter_group_llog, list);
+                LASSERT(nlog->group != group);
+        }
+        list_add(&fglog->list, &filter->fo_llog_list);
+        spin_unlock(&filter->fo_llog_list_lock);
+
+        rc = llog_cat_initialize(obd, fglog->llogs, 1);
+        if (rc) {
+                OBD_FREE(fglog->llogs, sizeof(*(fglog->llogs)));
+                OBD_FREE(fglog, sizeof(*fglog));
+                RETURN(NULL);
+        }
+
+        CDEBUG(D_OTHER, "%s: new llog 0x%p for group %u\n", obd->obd_name,
+                fglog->llogs, group);
+
+        RETURN(fglog->llogs);
+}
+
 static int filter_set_info(struct obd_export *exp, __u32 keylen,
                            void *key, __u32 vallen, void *val)
 {
+        struct obd_run_ctxt saved;
+        struct filter_export_data *fed = &exp->exp_filter_data;
         struct obd_device *obd;
         struct lustre_handle conn;
+        struct obd_llogs *llog;
         struct llog_ctxt *ctxt;
+        __u32 group;
         int rc = 0;
         ENTRY;
 
@@ -2290,9 +2495,37 @@ static int filter_set_info(struct obd_export *exp, __u32 keylen,
             memcmp(key, "mds_conn", keylen) != 0)
                 RETURN(-EINVAL);
 
-        CWARN("Received MDS connection ("LPX64")\n", conn.cookie);
-        memcpy(&obd->u.filter.fo_mdc_conn, &conn, sizeof(conn));
-        ctxt = llog_get_context(obd, LLOG_UNLINK_REPL_CTXT);
+        group = *((__u32 *)val);
+        if (fed->fed_group != 0 && fed->fed_group != group) {
+                char str[PTL_NALFMT_SIZE];
+                portals_nid2str(exp->exp_connection->c_peer.peer_ni->pni_number,
+                                exp->exp_connection->c_peer.peer_nid, str);
+                CERROR("!!! This export (nid "LPX64"/%s) used object group %d "
+                       "earlier; now it's trying to use group %d!  This could "
+                       "be a bug in the MDS.  Tell CFS.\n",
+                       exp->exp_connection->c_peer.peer_nid, str,
+                       fed->fed_group, group);
+                RETURN(-EPROTO);
+        }
+        fed->fed_group = group;
+        CWARN("Received MDS connection ("LPX64"); group %d\n", conn.cookie,
+              group);
+
+        LASSERT(rc == 0);
+
+        push_ctxt(&saved, &obd->obd_ctxt, NULL);
+        rc = filter_read_groups(obd, group, 1);
+        pop_ctxt(&saved, &obd->obd_ctxt, NULL);
+        if (rc != 0) {
+                CERROR("can't read group %u\n", group);
+                RETURN(rc);
+        }
+       
+        llog = filter_grab_llog_for_group(obd, group);
+        LASSERT(llog != NULL);
+
+        ctxt = llog_get_context(llog, LLOG_UNLINK_REPL_CTXT);
+        LASSERT(ctxt != NULL);
         rc = llog_receptor_accept(ctxt, exp->exp_imp_reverse);
         RETURN(rc);
 }
@@ -2327,7 +2560,7 @@ int filter_iocontrol(unsigned int cmd, struct obd_export *exp,
         }
 
         case OBD_IOC_CATLOGLIST: {
-                rc = llog_catalog_list(obd, 1, data);
+                rc = llog_catlog_list(obd, 1, data);
                 RETURN(rc);
         }
 
@@ -2340,9 +2573,9 @@ int filter_iocontrol(unsigned int cmd, struct obd_export *exp,
 /*
                 struct llog_ctxt *ctxt = NULL;
 
-                push_ctxt(&saved, &ctxt->loc_ctxt, NULL);
+                push_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_ctxt, NULL);
                 rc = llog_ioctl(ctxt, cmd, data);
-                pop_ctxt(&saved, &ctxt->loc_ctxt, NULL);
+                pop_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_ctxt, NULL);
 
                 RETURN(rc);
 */
@@ -2358,12 +2591,13 @@ int filter_iocontrol(unsigned int cmd, struct obd_export *exp,
 static struct llog_operations filter_unlink_repl_logops;
 static struct llog_operations filter_size_orig_logops = {
         lop_setup: llog_obd_origin_setup,
-        lop_cleanup: llog_catalog_cleanup,
-        lop_add: llog_catalog_add,
+        lop_cleanup: llog_obd_origin_cleanup,
+        lop_add: llog_obd_origin_add
 };
 
-static int filter_llog_init(struct obd_device *obd, struct obd_device *tgt,
-                            int count, struct llog_catid *catid)
+static int filter_llog_init(struct obd_device *obd, struct obd_llogs *llogs,
+                            struct obd_device *tgt, int count,
+                            struct llog_catid *logid)
 {
         struct llog_ctxt *ctxt;
         int rc;
@@ -2374,30 +2608,53 @@ static int filter_llog_init(struct obd_device *obd, struct obd_device *tgt,
         filter_unlink_repl_logops.lop_connect = llog_repl_connect;
         filter_unlink_repl_logops.lop_sync = llog_obd_repl_sync;
 
-        rc = obd_llog_setup(obd, LLOG_UNLINK_REPL_CTXT, tgt, 0, NULL,
-                            &filter_unlink_repl_logops);
+        rc = llog_setup(obd, llogs, LLOG_UNLINK_REPL_CTXT, tgt, 0, NULL,
+                        &filter_unlink_repl_logops);
         if (rc)
                 RETURN(rc);
         /* FIXME - assign unlink_cb for filter's recovery */
-        ctxt = llog_get_context(obd, LLOG_UNLINK_REPL_CTXT);
-        ctxt->loc_proc_cb = filter_recov_log_unlink_cb;
+        ctxt = llog_get_context(llogs, LLOG_UNLINK_REPL_CTXT);
+        ctxt->llog_proc_cb = filter_recov_log_unlink_cb;
 
-        /* FIXME - count should be 1 to setup size log */
-        rc = obd_llog_setup(obd, LLOG_SIZE_ORIG_CTXT, tgt, 0, &catid->lci_logid,
-                            &filter_size_orig_logops);
+        rc = llog_setup(obd, llogs, LLOG_SIZE_ORIG_CTXT, tgt, 0, NULL,
+                        &filter_size_orig_logops);
         RETURN(rc);
 }
 
-static int filter_llog_finish(struct obd_device *obd, int count)
+static int filter_llog_finish(struct obd_device *obd,
+                              struct obd_llogs *llogs, int count)
 {
         int rc;
         ENTRY;
 
-        rc = obd_llog_cleanup(llog_get_context(obd, LLOG_UNLINK_REPL_CTXT));
+        rc = llog_cleanup(llog_get_context(llogs, LLOG_UNLINK_REPL_CTXT));
         if (rc)
                 RETURN(rc);
 
-        rc = obd_llog_cleanup(llog_get_context(obd, LLOG_SIZE_ORIG_CTXT));
+        rc = llog_cleanup(llog_get_context(llogs, LLOG_SIZE_ORIG_CTXT));
+        RETURN(rc);
+}
+
+static int filter_llog_connect(struct obd_device *obd,
+                                struct llogd_conn_body *body) 
+{
+        struct llog_ctxt *ctxt;
+        struct obd_llogs *llog;
+        int rc;
+        ENTRY;
+
+        CDEBUG(D_OTHER, "handle connect for %s: %u/%u/%u\n", obd->obd_name,
+               (unsigned) body->lgdc_logid.lgl_ogr,
+               (unsigned) body->lgdc_logid.lgl_oid,
+               (unsigned) body->lgdc_logid.lgl_ogen);
+        llog = filter_grab_llog_for_group(obd, body->lgdc_logid.lgl_ogr);
+        LASSERT(llog != NULL);
+        ctxt = llog_get_context(llog, body->lgdc_ctxt_idx);
+        rc = llog_connect(ctxt, 1, &body->lgdc_logid,
+                          &body->lgdc_gen, NULL);
+        if (rc != 0)
+                CERROR("failed to connect\n");
+
         RETURN(rc);
 }
 
@@ -2412,56 +2669,62 @@ static struct lvfs_callback_ops filter_lvfs_ops = {
 };
 
 static struct obd_ops filter_obd_ops = {
-        .o_owner          = THIS_MODULE,
-        .o_get_info       = filter_get_info,
-        .o_set_info       = filter_set_info,
-        .o_setup          = filter_setup,
-        .o_precleanup     = filter_precleanup,
-        .o_cleanup        = filter_cleanup,
-        .o_connect        = filter_connect,
-        .o_disconnect     = filter_disconnect,
-        .o_statfs         = filter_statfs,
-        .o_getattr        = filter_getattr,
-        .o_unpackmd       = filter_unpackmd,
-        .o_create         = filter_create,
-        .o_setattr        = filter_setattr,
-        .o_destroy        = filter_destroy,
-        .o_brw            = filter_brw,
-        .o_punch          = filter_truncate,
-        .o_sync           = filter_sync,
-        .o_preprw         = filter_preprw,
-        .o_commitrw       = filter_commitrw,
-        .o_destroy_export = filter_destroy_export,
-        .o_llog_init      = filter_llog_init,
-        .o_llog_finish    = filter_llog_finish,
-        .o_iocontrol      = filter_iocontrol,
+        o_owner:          THIS_MODULE,
+        o_attach:         filter_attach,
+        o_detach:         filter_detach,
+        o_get_info:       filter_get_info,
+        o_set_info:       filter_set_info,
+        o_setup:          filter_setup,
+        o_precleanup:     filter_precleanup,
+        o_cleanup:        filter_cleanup,
+        o_connect:        filter_connect,
+        o_disconnect:     filter_disconnect,
+        o_statfs:         filter_statfs,
+        o_getattr:        filter_getattr,
+        o_unpackmd:       filter_unpackmd,
+        o_create:         filter_create,
+        o_setattr:        filter_setattr,
+        o_destroy:        filter_destroy,
+        o_brw:            filter_brw,
+        o_punch:          filter_truncate,
+        o_sync:           filter_sync,
+        o_preprw:         filter_preprw,
+        o_commitrw:       filter_commitrw,
+        o_destroy_export: filter_destroy_export,
+        o_llog_init:      filter_llog_init,
+        o_llog_finish:    filter_llog_finish,
+        o_llog_connect:   filter_llog_connect,
+        o_iocontrol:      filter_iocontrol,
 };
 
 static struct obd_ops filter_sanobd_ops = {
-        .o_owner          = THIS_MODULE,
-        .o_get_info       = filter_get_info,
-        .o_set_info       = filter_set_info,
-        .o_setup          = filter_san_setup,
-        .o_precleanup     = filter_precleanup,
-        .o_cleanup        = filter_cleanup,
-        .o_connect        = filter_connect,
-        .o_disconnect     = filter_disconnect,
-        .o_statfs         = filter_statfs,
-        .o_getattr        = filter_getattr,
-        .o_unpackmd       = filter_unpackmd,
-        .o_create         = filter_create,
-        .o_setattr        = filter_setattr,
-        .o_destroy        = filter_destroy,
-        .o_brw            = filter_brw,
-        .o_punch          = filter_truncate,
-        .o_sync           = filter_sync,
-        .o_preprw         = filter_preprw,
-        .o_commitrw       = filter_commitrw,
-        .o_san_preprw     = filter_san_preprw,
-        .o_destroy_export = filter_destroy_export,
-        .o_llog_init      = filter_llog_init,
-        .o_llog_finish    = filter_llog_finish,
-        .o_iocontrol      = filter_iocontrol,
+        o_owner:          THIS_MODULE,
+        o_attach:         filter_attach,
+        o_detach:         filter_detach,
+        o_get_info:       filter_get_info,
+        o_set_info:       filter_set_info,
+        o_setup:          filter_san_setup,
+        o_precleanup:     filter_precleanup,
+        o_cleanup:        filter_cleanup,
+        o_connect:        filter_connect,
+        o_disconnect:     filter_disconnect,
+        o_statfs:         filter_statfs,
+        o_getattr:        filter_getattr,
+        o_unpackmd:       filter_unpackmd,
+        o_create:         filter_create,
+        o_setattr:        filter_setattr,
+        o_destroy:        filter_destroy,
+        o_brw:            filter_brw,
+        o_punch:          filter_truncate,
+        o_sync:           filter_sync,
+        o_preprw:         filter_preprw,
+        o_commitrw:       filter_commitrw,
+        o_san_preprw:     filter_san_preprw,
+        o_destroy_export: filter_destroy_export,
+        o_llog_init:      filter_llog_init,
+        o_llog_finish:    filter_llog_finish,
+        o_llog_connect:   filter_llog_connect,
+        o_iocontrol:      filter_iocontrol,
 };
 
 static int __init obdfilter_init(void)
@@ -2473,12 +2736,12 @@ static int __init obdfilter_init(void)
 
         lprocfs_init_vars(filter, &lvars);
 
-        rc = class_register_type(&filter_obd_ops, lvars.module_vars,
+        rc = class_register_type(&filter_obd_ops, NULL, lvars.module_vars,
                                  OBD_FILTER_DEVICENAME);
         if (rc)
                 return rc;
 
-        rc = class_register_type(&filter_sanobd_ops, lvars.module_vars,
+        rc = class_register_type(&filter_sanobd_ops, NULL, lvars.module_vars,
                                  OBD_FILTER_SAN_DEVICENAME);
         if (rc)
                 class_unregister_type(OBD_FILTER_DEVICENAME);
diff --git a/lustre/obdfilter/filter_internal.h b/lustre/obdfilter/filter_internal.h
index 055232d..5501315 100644
--- a/lustre/obdfilter/filter_internal.h
+++ b/lustre/obdfilter/filter_internal.h
@@ -16,8 +16,6 @@
 #include <linux/lustre_handles.h>
 #include <linux/obd.h>
 
-#define FILTER_LAYOUT_VERSION "2"
-
 #ifndef OBD_FILTER_DEVICENAME
 # define OBD_FILTER_DEVICENAME "obdfilter"
 #endif
@@ -38,9 +36,6 @@
 #define FILTER_LR_MAX_CLIENTS (PAGE_SIZE * 8)
 #define FILTER_LR_MAX_CLIENT_WORDS (FILTER_LR_MAX_CLIENTS/sizeof(unsigned long))
 
-#define FILTER_SUBDIR_COUNT      32            /* set to zero for no subdirs */
-#define FILTER_GROUPS 3 /* must be at least 3; not dynamic yet */
-
 #define FILTER_RECOVERY_TIMEOUT (obd_timeout * 5 * HZ / 2) /* *waves hands* */
 
 #define FILTER_ROCOMPAT_SUPP   (0)
@@ -103,8 +98,8 @@ struct dentry *__filter_oa2dentry(struct obd_device *obd, struct obdo *oa,
 #define filter_oa2dentry(obd, oa) __filter_oa2dentry(obd, oa, __FUNCTION__)
 
 int filter_finish_transno(struct obd_export *, struct obd_trans_info *, int rc);
-__u64 filter_next_id(struct filter_obd *, struct obdo *);
-__u64 filter_last_id(struct filter_obd *, struct obdo *);
+__u64 filter_next_id(struct filter_obd *, int group);
+__u64 filter_last_id(struct filter_obd *, int group);
 int filter_update_server_data(struct obd_device *, struct file *,
                               struct filter_server_data *, int force_sync);
 int filter_update_last_objid(struct obd_device *, obd_gr, int force_sync);
@@ -126,10 +121,6 @@ int filter_brw(int cmd, struct obd_export *, struct obdo *,
 	       struct lov_stripe_md *, obd_count oa_bufs, struct brw_page *,
 	       struct obd_trans_info *);
 void flip_into_page_cache(struct inode *inode, struct page *new_page);
-void filter_release_read_page(struct filter_obd *filter, struct inode *inode,
-                              struct page *page);
-void filter_release_write_page(struct filter_obd *filter, struct inode *inode,
-                               struct niobuf_local *lnb, int rc);
 
 /* filter_io_*.c */
 int filter_commitrw_write(struct obd_export *exp, struct obdo *oa, int objcount,
diff --git a/lustre/obdfilter/filter_io.c b/lustre/obdfilter/filter_io.c
index c7679b5..773baf4 100644
--- a/lustre/obdfilter/filter_io.c
+++ b/lustre/obdfilter/filter_io.c
@@ -35,23 +35,39 @@
 #include <linux/lustre_fsfilt.h>
 #include "filter_internal.h"
 
-static int filter_start_page_read(struct obd_device *obd, struct inode *inode,
-                                  struct niobuf_local *lnb)
+static int filter_start_page_read(struct inode *inode, struct niobuf_local *lnb)
 {
+        struct address_space *mapping = inode->i_mapping;
         struct page *page;
         unsigned long index = lnb->offset >> PAGE_SHIFT;
+        int rc;
 
-        page = fsfilt_getpage(obd, inode, index);
-        if (IS_ERR(page)) {
-                CERROR("page index %lu, rc = %ld\n", index, PTR_ERR(page));
+        page = grab_cache_page(mapping, index); /* locked page */
+        if (page == NULL)
+                return lnb->rc = -ENOMEM;
 
-                lnb->page = NULL;
-                lnb->rc = PTR_ERR(page);
-                return lnb->rc;
-        }
+        LASSERT(page->mapping == mapping);
 
         lnb->page = page;
 
+        if (inode->i_size < lnb->offset + lnb->len - 1)
+                lnb->rc = inode->i_size - lnb->offset;
+        else
+                lnb->rc = lnb->len;
+
+        if (PageUptodate(page)) {
+                unlock_page(page);
+                return 0;
+        }
+
+        rc = mapping->a_ops->readpage(NULL, page);
+        if (rc < 0) {
+                CERROR("page index %lu, rc = %d\n", index, rc);
+                lnb->page = NULL;
+                page_cache_release(page);
+                return lnb->rc = rc;
+        }
+
         return 0;
 }
 
@@ -90,9 +106,6 @@ static void filter_grant_incoming(struct obd_export *exp, struct obdo *oa)
 {
         struct filter_export_data *fed;
         struct obd_device *obd = exp->exp_obd;
-        static unsigned long last_msg;
-        static int last_count;
-        int mask = D_CACHE;
         ENTRY;
 
         LASSERT_SPIN_LOCKED(&obd->obd_osfs_lock);
@@ -106,20 +119,11 @@ static void filter_grant_incoming(struct obd_export *exp, struct obdo *oa)
 
         fed = &exp->exp_filter_data;
 
-        /* Don't print this to the console the first time it happens, since
-         * it can happen legitimately on occasion, but only rarely. */
-        if (time_after(jiffies, last_msg + 60 * HZ)) {
-                last_count = 0;
-                last_msg = jiffies;
-        }
-        if ((last_count & (-last_count)) == last_count)
-                mask = D_WARNING;
-        last_count++;
-
         /* Add some margin, since there is a small race if other RPCs arrive
          * out-or-order and have already consumed some grant.  We want to
          * leave this here in case there is a large error in accounting. */
-        CDEBUG(oa->o_grant > fed->fed_grant + FILTER_GRANT_CHUNK ? mask:D_CACHE,
+        CDEBUG(oa->o_grant > fed->fed_grant + FILTER_GRANT_CHUNK ?
+               D_ERROR : D_CACHE,
                "%s: cli %s/%p reports grant: "LPU64" dropped: %u, local: %lu\n",
                obd->obd_name, exp->exp_client_uuid.uuid, exp, oa->o_grant,
                oa->o_dropped, fed->fed_grant);
@@ -235,8 +239,9 @@ long filter_grant(struct obd_export *exp, obd_size current_grant,
          * has and what we think it has, don't grant very much and let the
          * client consume its grant first.  Either it just has lots of RPCs
          * in flight, or it was evicted and its grants will soon be used up. */
-        if (current_grant < want &&
-            current_grant < fed->fed_grant + FILTER_GRANT_CHUNK) {
+        if (current_grant < want) {
+                if (current_grant > fed->fed_grant + FILTER_GRANT_CHUNK)
+                        want = 65536;
                 grant = min((want >> blockbits) / 2,
                             (fs_space_left >> blockbits) / 8);
                 grant <<= blockbits;
@@ -268,7 +273,7 @@ static int filter_preprw_read(int cmd, struct obd_export *exp, struct obdo *oa,
                               struct obd_trans_info *oti)
 {
         struct obd_device *obd = exp->exp_obd;
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
         struct obd_ioobj *o;
         struct niobuf_remote *rnb;
         struct niobuf_local *lnb = NULL;
@@ -304,7 +309,7 @@ static int filter_preprw_read(int cmd, struct obd_export *exp, struct obdo *oa,
 
         memset(res, 0, niocount * sizeof(*res));
 
-        push_ctxt(&saved, &exp->exp_obd->obd_lvfs_ctxt, NULL);
+        push_ctxt(&saved, &exp->exp_obd->obd_ctxt, NULL);
         for (i = 0, o = obj; i < objcount; i++, o++) {
                 LASSERT(o->ioo_bufcnt);
 
@@ -345,7 +350,7 @@ static int filter_preprw_read(int cmd, struct obd_export *exp, struct obdo *oa,
                                  * easy to detect later. */
                                 break;
                         } else {
-                                rc = filter_start_page_read(obd, inode, lnb);
+                                rc = filter_start_page_read(inode, lnb);
                         }
 
                         if (rc) {
@@ -357,11 +362,6 @@ static int filter_preprw_read(int cmd, struct obd_export *exp, struct obdo *oa,
                                 GOTO(cleanup, rc);
                         }
 
-                        if (inode->i_size < lnb->offset + lnb->len - 1)
-                                lnb->rc = inode->i_size - lnb->offset;
-                        else
-                                lnb->rc = lnb->len;
-
                         tot_bytes += lnb->rc;
                         if (lnb->rc < lnb->len) {
                                 /* short read, be sure to wait on it */
@@ -411,7 +411,7 @@ static int filter_preprw_read(int cmd, struct obd_export *exp, struct obdo *oa,
                         CERROR("NULL dentry in cleanup -- tell CFS\n");
         case 0:
                 OBD_FREE(fso, objcount * sizeof(*fso));
-                pop_ctxt(&saved, &exp->exp_obd->obd_lvfs_ctxt, NULL);
+                pop_ctxt(&saved, &exp->exp_obd->obd_ctxt, NULL);
         }
         return rc;
 }
@@ -523,55 +523,25 @@ static int filter_grant_check(struct obd_export *exp, int objcount,
         return rc;
 }
 
-static int filter_start_page_write(struct obd_device *obd, struct inode *inode,
+static int filter_start_page_write(struct inode *inode,
                                    struct niobuf_local *lnb)
 {
-        struct page *page;
-
-        if (lnb->len != PAGE_SIZE)
-                return filter_start_page_read(obd, inode, lnb);
-
-        page = alloc_pages(GFP_HIGHUSER, 0);
+        struct page *page = alloc_pages(GFP_HIGHUSER, 0);
         if (page == NULL) {
                 CERROR("no memory for a temp page\n");
                 RETURN(lnb->rc = -ENOMEM);
         }
-#if 0
         POISON_PAGE(page, 0xf1);
         if (lnb->len != PAGE_SIZE) {
                 memset(kmap(page) + lnb->len, 0, PAGE_SIZE - lnb->len);
                 kunmap(page);
         }
-#endif
         page->index = lnb->offset >> PAGE_SHIFT;
         lnb->page = page;
 
         return 0;
 }
 
-static void filter_abort_page_write(struct niobuf_local *lnb)
-{
-        LASSERT(lnb->page != NULL);
-
-        if (lnb->len != PAGE_SIZE)
-                page_cache_release(lnb->page);
-        else
-                __free_pages(lnb->page, 0);
-}
-
-/* a helper for both the 2.4 and 2.6 commitrw paths which are both built
- * up by our shared filter_preprw_write() */
-void filter_release_write_page(struct filter_obd *filter, struct inode *inode,
-                               struct niobuf_local *lnb, int rc)
-{
-        if (lnb->len != PAGE_SIZE)
-                return filter_release_read_page(filter, inode, lnb->page);
-
-        if (rc == 0)
-                flip_into_page_cache(inode, lnb->page);
-        __free_page(lnb->page);
-}
-
 /* If we ever start to support multi-object BRW RPCs, we will need to get locks
  * on mulitple inodes.  That isn't all, because there still exists the
  * possibility of a truncate starting a new transaction while holding the ext3
@@ -588,7 +558,7 @@ static int filter_preprw_write(int cmd, struct obd_export *exp, struct obdo *oa,
                                struct niobuf_local *res,
                                struct obd_trans_info *oti)
 {
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
         struct niobuf_remote *rnb;
         struct niobuf_local *lnb;
         struct fsfilt_objinfo fso;
@@ -602,7 +572,7 @@ static int filter_preprw_write(int cmd, struct obd_export *exp, struct obdo *oa,
 
         memset(res, 0, niocount * sizeof(*res));
 
-        push_ctxt(&saved, &exp->exp_obd->obd_lvfs_ctxt, NULL);
+        push_ctxt(&saved, &exp->exp_obd->obd_ctxt, NULL);
         dentry = filter_fid2dentry(exp->exp_obd, NULL, obj->ioo_gr,
                                    obj->ioo_id);
         if (IS_ERR(dentry))
@@ -647,19 +617,19 @@ static int filter_preprw_write(int cmd, struct obd_export *exp, struct obdo *oa,
              i++, lnb++, rnb++) {
                 /* We still set up for ungranted pages so that granted pages
                  * can be written to disk as they were promised, and portals
-                 * needs to keep the pages all aligned properly. */
+                 * needs to keep the pages all aligned properly. */ 
                 lnb->dentry = dentry;
                 lnb->offset = rnb->offset;
                 lnb->len    = rnb->len;
                 lnb->flags  = rnb->flags;
 
-                rc = filter_start_page_write(exp->exp_obd, dentry->d_inode,lnb);
+                rc = filter_start_page_write(dentry->d_inode, lnb);
                 if (rc) {
-                        CERROR("page err %u@"LPU64" %u/%u %p: rc %d\n",
+                        CDEBUG(D_ERROR, "page err %u@"LPU64" %u/%u %p: rc %d\n",
                                lnb->len, lnb->offset,
                                i, obj->ioo_bufcnt, dentry, rc);
                         while (lnb-- > res)
-                                filter_abort_page_write(lnb);
+                                __free_pages(lnb->page, 0);
                         f_dput(dentry);
                         GOTO(cleanup, rc);
                 }
@@ -667,17 +637,6 @@ static int filter_preprw_write(int cmd, struct obd_export *exp, struct obdo *oa,
                         tot_bytes += lnb->len;
         }
 
-        while (lnb-- > res) {
-                if (lnb->len == PAGE_SIZE)
-                        continue;
-                rc = filter_finish_page_read(lnb);
-                if (rc) {
-                        CERROR("error page %u@"LPU64" %u %p: rc %d\n", lnb->len,
-                               lnb->offset, (int)(lnb - res), lnb->dentry, rc);
-                        GOTO(cleanup, rc);
-                }
-        }
-
         if (time_after(jiffies, now + 15 * HZ))
                 CERROR("slow start_page_write %lus\n", (jiffies - now) / HZ);
         else
@@ -696,7 +655,7 @@ cleanup:
                 spin_unlock(&exp->exp_obd->obd_osfs_lock);
         default: ;
         }
-        pop_ctxt(&saved, &exp->exp_obd->obd_lvfs_ctxt, NULL);
+        pop_ctxt(&saved, &exp->exp_obd->obd_ctxt, NULL);
         return rc;
 }
 
@@ -717,24 +676,6 @@ int filter_preprw(int cmd, struct obd_export *exp, struct obdo *oa,
         return -EPROTO;
 }
 
-void filter_release_read_page(struct filter_obd *filter, struct inode *inode,
-                              struct page *page)
-{
-        int drop = 0;
-
-        if (inode != NULL &&
-            (inode->i_size > filter->fo_readcache_max_filesize))
-                drop = 1;
-
-        /* drop from cache like truncate_list_pages() */
-        if (drop && !TryLockPage(page)) {
-                if (page->mapping)
-                        ll_truncate_complete_page(page);
-                unlock_page(page);
-        }
-        page_cache_release(page);
-}
-
 static int filter_commitrw_read(struct obd_export *exp, struct obdo *oa,
                                 int objcount, struct obd_ioobj *obj,
                                 int niocount, struct niobuf_local *res,
@@ -742,19 +683,24 @@ static int filter_commitrw_read(struct obd_export *exp, struct obdo *oa,
 {
         struct obd_ioobj *o;
         struct niobuf_local *lnb;
-        int i, j;
-        struct inode *inode = NULL;
+        int i, j, drop = 0;
         ENTRY;
 
         if (res->dentry != NULL)
-                inode = res->dentry->d_inode;
+                drop = (res->dentry->d_inode->i_size >
+                        exp->exp_obd->u.filter.fo_readcache_max_filesize);
 
         for (i = 0, o = obj, lnb = res; i < objcount; i++, o++) {
                 for (j = 0 ; j < o->ioo_bufcnt ; j++, lnb++) {
                         if (lnb->page == NULL)
                                 continue;
-                        filter_release_read_page(&exp->exp_obd->u.filter,
-                                                 inode, lnb->page);
+                        /* drop from cache like truncate_list_pages() */
+                        if (drop && !TryLockPage(lnb->page)) {
+                                if (lnb->page->mapping)
+                                        ll_truncate_complete_page(lnb->page);
+                                unlock_page(lnb->page);
+                        }
+                        page_cache_release(lnb->page);
                 }
         }
 
@@ -865,7 +811,7 @@ int filter_brw(int cmd, struct obd_export *exp, struct obdo *oa,
                 GOTO(out, ret = -ENOMEM);
 
         for (i = 0; i < oa_bufs; i++) {
-                rnb[i].offset = pga[i].disk_offset;
+                rnb[i].offset = pga[i].off;
                 rnb[i].len = pga[i].count;
         }
 
@@ -878,7 +824,7 @@ int filter_brw(int cmd, struct obd_export *exp, struct obdo *oa,
 
         for (i = 0; i < oa_bufs; i++) {
                 void *virt = kmap(pga[i].pg);
-                obd_off off = pga[i].disk_offset & ~PAGE_MASK;
+                obd_off off = pga[i].off & ~PAGE_MASK;
                 void *addr = kmap(lnb[i].page);
 
                 /* 2 kmaps == vanishingly small deadlock opportunity */
diff --git a/lustre/obdfilter/filter_io_24.c b/lustre/obdfilter/filter_io_24.c
index abc48ad..a3464f3 100644
--- a/lustre/obdfilter/filter_io_24.c
+++ b/lustre/obdfilter/filter_io_24.c
@@ -84,8 +84,10 @@ static int filter_direct_io(int rw, struct dentry *dchild, struct kiobuf *iobuf,
 {
         struct obd_device *obd = exp->exp_obd;
         struct inode *inode = dchild->d_inode;
-        int rc, create = (rw == OBD_BRW_WRITE), blocks_per_page;
-        int cleanup_phase = 0, *created = NULL;
+        struct page *page;
+        unsigned long *b = iobuf->blocks;
+        int rc, i, create = (rw == OBD_BRW_WRITE), blocks_per_page;
+        int *cr, cleanup_phase = 0, *created = NULL;
         int committed = 0;
         ENTRY;
 
@@ -103,11 +105,22 @@ static int filter_direct_io(int rw, struct dentry *dchild, struct kiobuf *iobuf,
                 GOTO(cleanup, rc);
         cleanup_phase = 2;
 
-        rc = fsfilt_map_inode_pages(obd, inode, iobuf->maplist,
-                                    iobuf->nr_pages, iobuf->blocks, created,
-                                    create, &obd->u.filter.fo_alloc_lock);
-        if (rc)
-                GOTO(cleanup, rc);
+        down(&exp->exp_obd->u.filter.fo_alloc_lock);
+        for (i = 0, cr = created, b = iobuf->blocks; i < iobuf->nr_pages; i++){
+                page = iobuf->maplist[i];
+
+                rc = fsfilt_map_inode_page(obd, inode, page, b, cr, create);
+                if (rc) {
+                        CERROR("ino %lu, blk %lu cr %u create %d: rc %d\n",
+                               inode->i_ino, *b, *cr, create, rc);
+                        up(&exp->exp_obd->u.filter.fo_alloc_lock);
+                        GOTO(cleanup, rc);
+                }
+
+                b += blocks_per_page;
+                cr += blocks_per_page;
+        }
+        up(&exp->exp_obd->u.filter.fo_alloc_lock);
 
         filter_tally_write(&obd->u.filter, iobuf->maplist, iobuf->nr_pages,
                            iobuf->blocks, blocks_per_page);
@@ -142,11 +155,14 @@ static int filter_direct_io(int rw, struct dentry *dchild, struct kiobuf *iobuf,
         if (rc < 0)
                 GOTO(cleanup, rc);
 
-        rc = fsfilt_send_bio(obd, inode, iobuf);
-
+        rc = brw_kiovec(WRITE, 1, &iobuf, inode->i_dev, iobuf->blocks,
+                        1 << inode->i_blkbits);
         CDEBUG(D_INFO, "tried to write %d pages, rc = %d\n",
                iobuf->nr_pages, rc);
-
+        if (rc != (1 << inode->i_blkbits) * iobuf->nr_pages * blocks_per_page)
+                CERROR("short write?  expected %d, wrote %d\n",
+                       (1 << inode->i_blkbits) * iobuf->nr_pages *
+                       blocks_per_page, rc);
         if (rc > 0)
                 rc = 0;
 
@@ -211,7 +227,7 @@ int filter_commitrw_write(struct obd_export *exp, struct obdo *oa, int objcount,
                           int rc)
 {
         struct obd_device *obd = exp->exp_obd;
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
         struct niobuf_local *lnb;
         struct fsfilt_objinfo fso;
         struct iattr iattr = { 0 };
@@ -271,7 +287,7 @@ int filter_commitrw_write(struct obd_export *exp, struct obdo *oa, int objcount,
                         iattr.ia_size = this_size;
         }
 
-        push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+        push_ctxt(&saved, &obd->obd_ctxt, NULL);
         cleanup_phase = 2;
 
         down(&inode->i_sem);
@@ -310,17 +326,18 @@ cleanup:
 
         switch (cleanup_phase) {
         case 2:
-                pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+                pop_ctxt(&saved, &obd->obd_ctxt, NULL);
                 LASSERT(current->journal_info == NULL);
         case 1:
                 free_kiovec(1, &iobuf);
         case 0:
                 for (i = 0, lnb = res; i < obj->ioo_bufcnt; i++, lnb++) {
-                        filter_release_write_page(&obd->u.filter,
-                                                  res->dentry->d_inode, lnb,
-                                                  rc);
+                        /* flip_.. gets a ref, while free_page only frees
+                         * when it decrefs to 0 */
+                        if (rc == 0)
+                                flip_into_page_cache(inode, lnb->page);
+                        __free_page(lnb->page);
                 }
-
                 f_dput(res->dentry);
         }
 
diff --git a/lustre/obdfilter/filter_io_26.c b/lustre/obdfilter/filter_io_26.c
index 8014526..5ce65c7 100644
--- a/lustre/obdfilter/filter_io_26.c
+++ b/lustre/obdfilter/filter_io_26.c
@@ -95,26 +95,23 @@ static int filter_range_is_mapped(struct inode *inode, obd_size offset, int len)
         return 1;
 }
 
-int filter_commitrw_write(struct obd_export *exp, struct obdo *oa,
-                          int objcount, struct obd_ioobj *obj, int niocount,
+int filter_commitrw_write(struct obd_export *exp, struct obdo *oa, int objcount,
+                          struct obd_ioobj *obj, int niocount,
                           struct niobuf_local *res, struct obd_trans_info *oti,
                           int rc)
 {
-        struct bio *bio = NULL;
-        int blocks_per_page, err;
+        struct obd_device *obd = exp->exp_obd;
+        struct obd_run_ctxt saved;
         struct niobuf_local *lnb;
-        struct lvfs_run_ctxt saved;
         struct fsfilt_objinfo fso;
-        struct iattr iattr = { 0 };
+        struct iattr iattr = { .ia_valid = ATTR_SIZE, .ia_size = 0, };
         struct inode *inode = NULL;
-        unsigned long now = jiffies;
-        int i, k, cleanup_phase = 0;
-
-        struct dio_request *dreq = NULL;
-        struct obd_device *obd = exp->exp_obd;
-
+        int i, k, cleanup_phase = 0, err;
+        unsigned long now = jiffies; /* DEBUGGING OST TIMEOUTS */
+        int blocks_per_page;
+        struct dio_request *dreq;
+        struct bio *bio = NULL;
         ENTRY;
-
         LASSERT(oti != NULL);
         LASSERT(objcount == 1);
         LASSERT(current->journal_info == NULL);
@@ -127,10 +124,8 @@ int filter_commitrw_write(struct obd_export *exp, struct obdo *oa,
         LASSERT(blocks_per_page <= MAX_BLOCKS_PER_PAGE);
 
         OBD_ALLOC(dreq, sizeof(*dreq));
-
         if (dreq == NULL)
                 RETURN(-ENOMEM);
-
         dreq->bio_list = NULL;
         init_waitqueue_head(&dreq->wait);
         atomic_set(&dreq->numreqs, 0);
@@ -140,12 +135,10 @@ int filter_commitrw_write(struct obd_export *exp, struct obdo *oa,
         fso.fso_dentry = res->dentry;
         fso.fso_bufcnt = obj->ioo_bufcnt;
 
-        push_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+        push_ctxt(&saved, &obd->obd_ctxt, NULL);
         cleanup_phase = 2;
 
-        oti->oti_handle = fsfilt_brw_start(obd, objcount, &fso,
-                                           niocount, res, oti);
-        
+        oti->oti_handle = fsfilt_brw_start(obd, objcount, &fso, niocount, res, oti);
         if (IS_ERR(oti->oti_handle)) {
                 rc = PTR_ERR(oti->oti_handle);
                 CDEBUG(rc == -ENOSPC ? D_INODE : D_ERROR,
@@ -161,7 +154,6 @@ int filter_commitrw_write(struct obd_export *exp, struct obdo *oa,
         for (i = 0, lnb = res; i < obj->ioo_bufcnt; i++, lnb++) {
                 loff_t this_size;
                 sector_t sector;
-                struct page *pages[1];
                 int offs;
 
                 /* If overwriting an existing block, we don't need a grant */
@@ -169,15 +161,13 @@ int filter_commitrw_write(struct obd_export *exp, struct obdo *oa,
                     filter_range_is_mapped(inode, lnb->offset, lnb->len))
                         lnb->rc = 0;
 
-                if (lnb->rc) /* ENOSPC, network RPC error, etc. */ 
+                if (lnb->rc) /* ENOSPC, network RPC error */
                         continue;
 
                 /* get block number for next page */
-                pages[0] = lnb->page;
-                rc = fsfilt_map_inode_pages(obd, inode, pages, 1, 
-                                            dreq->blocks, dreq->created, 1,
-                                            NULL);
-                if (rc != 0)
+                rc = fsfilt_map_inode_page(obd, inode, lnb->page, dreq->blocks,
+                                           dreq->created, 1);
+                if (rc)
                         GOTO(cleanup, rc);
 
                 for (k = 0; k < blocks_per_page; k++) {
@@ -203,7 +193,7 @@ int filter_commitrw_write(struct obd_export *exp, struct obdo *oa,
                         }
                 }
 
-                /* we expect these pages to be in offset order, but we'll
+                /* We expect these pages to be in offset order, but we'll
                  * be forgiving */
                 this_size = lnb->offset + lnb->len;
                 if (this_size > iattr.ia_size)
@@ -213,7 +203,7 @@ int filter_commitrw_write(struct obd_export *exp, struct obdo *oa,
 #warning This probably needs filemap_fdatasync() like filter_io_24 (bug 2366)
         if (bio) {
                 atomic_inc(&dreq->numreqs);
-                fsfilt_send_bio(obd, inode, bio);
+                submit_bio(WRITE, bio);
         }
 
         /* time to wait for I/O completion */
@@ -226,30 +216,26 @@ int filter_commitrw_write(struct obd_export *exp, struct obdo *oa,
                 bio_put(bio);
         }
 
-        down(&inode->i_sem);
-        if (iattr.ia_size > inode->i_size) {
-                CDEBUG(D_INFO, "setting i_size to "LPU64"\n",
-                       iattr.ia_size);
-            		
-                iattr.ia_valid |= ATTR_SIZE;
-			
-                fsfilt_setattr(obd, res->dentry, oti->oti_handle,
-                               &iattr, 0);
+        if (rc == 0) {
+                down(&inode->i_sem);
+                if (iattr.ia_size > inode->i_size) {
+                        CDEBUG(D_INFO, "setting i_size to "LPU64"\n",
+                               iattr.ia_size);
+                        fsfilt_setattr(obd, res->dentry, oti->oti_handle,
+                                       &iattr, 0);
+                }
+                up(&inode->i_sem);
         }
-        up(&inode->i_sem);
 
         if (time_after(jiffies, now + 15 * HZ))
                 CERROR("slow direct_io %lus\n", (jiffies - now) / HZ);
 
         rc = filter_finish_transno(exp, oti, rc);
-
         err = fsfilt_commit(obd, inode, oti->oti_handle, obd_sync_filter);
         if (err)
                 rc = err;
-
         if (obd_sync_filter)
                 LASSERT(oti->oti_transno <= obd->obd_last_committed);
-
         if (time_after(jiffies, now + 15 * HZ))
                 CERROR("slow commitrw commit %lus\n", (jiffies - now) / HZ);
 
@@ -258,17 +244,18 @@ cleanup:
 
         switch (cleanup_phase) {
         case 2:
-                pop_ctxt(&saved, &obd->obd_lvfs_ctxt, NULL);
+                pop_ctxt(&saved, &obd->obd_ctxt, NULL);
                 LASSERT(current->journal_info == NULL);
         case 1:
                 OBD_FREE(dreq, sizeof(*dreq));
         case 0:
                 for (i = 0, lnb = res; i < obj->ioo_bufcnt; i++, lnb++) {
-                        filter_release_write_page(&obd->u.filter,
-                                                  res->dentry->d_inode, lnb,
-                                                  rc);
+                        /* flip_.. gets a ref, while free_page only frees
+                         * when it decrefs to 0 */
+                        if (rc == 0)
+                                flip_into_page_cache(inode, lnb->page);
+                        __free_page(lnb->page);
                 }
-
                 f_dput(res->dentry);
         }
 
diff --git a/lustre/obdfilter/filter_log.c b/lustre/obdfilter/filter_log.c
index 1e1a3d3..1803876 100644
--- a/lustre/obdfilter/filter_log.c
+++ b/lustre/obdfilter/filter_log.c
@@ -91,17 +91,29 @@ int filter_log_sz_change(struct llog_handle *cathandle,
         out:
         RETURN(rc);
 }
+struct obd_llogs * filter_grab_llog_for_group(struct obd_device *, int);
 
 /* When this (destroy) operation is committed, return the cancel cookie */
 void filter_cancel_cookies_cb(struct obd_device *obd, __u64 transno,
                                      void *cb_data, int error)
 {
         struct llog_cookie *cookie = cb_data;
-        int rc;
-        rc = llog_cancel(llog_get_context(obd, cookie->lgc_subsys + 1),
-                         1, cookie, 0, NULL);
-        if (rc)
-                CERROR("error cancelling log cookies: rc = %d\n", rc);
+        struct obd_llogs *llogs = NULL;
+        struct llog_ctxt *ctxt;
+
+        /* we have to find context for right group */
+        llogs = filter_grab_llog_for_group(obd, cookie->lgc_lgl.lgl_ogr);
+
+        if (llogs) {
+                ctxt = llog_get_context(llogs, cookie->lgc_subsys + 1);
+                if (ctxt) {
+                        llog_cancel(ctxt, NULL, 1, cookie, 0);
+                } else
+                        CERROR("no valid context for group "LPU64"\n",
+                               cookie->lgc_lgl.lgl_ogr);
+        } else
+                CERROR("unknown group "LPU64"!\n", cookie->lgc_lgl.lgl_ogr);
+
         OBD_FREE(cb_data, sizeof(struct llog_cookie));
 }
 
@@ -121,7 +133,7 @@ int filter_recov_log_unlink_cb(struct llog_handle *llh,
         obd_id oid;
         int rc = 0;
         ENTRY;
-                                                                                                                             
+    
         if (!(le32_to_cpu(llh->lgh_hdr->llh_flags) & LLOG_F_IS_PLAIN)) {
                 CERROR("log is not plain\n");
                 RETURN(-EINVAL);
@@ -143,7 +155,7 @@ int filter_recov_log_unlink_cb(struct llog_handle *llh,
                 else
                         rc = LLOG_PROC_BREAK;
                 CWARN("fetch generation log, send cookie\n");
-                llog_cancel(ctxt, 1, &cookie, 0, NULL);
+                llog_cancel(ctxt, NULL, 1, &cookie, 0);
                 RETURN(rc);
         }
 
@@ -154,6 +166,7 @@ int filter_recov_log_unlink_cb(struct llog_handle *llh,
         oa->o_valid |= OBD_MD_FLCOOKIE;
         oa->o_id = lur->lur_oid;
         oa->o_gr = lur->lur_ogen;
+        oa->o_valid = OBD_MD_FLID | OBD_MD_FLGROUP;
         memcpy(obdo_logcookie(oa), &cookie, sizeof(cookie));
         oid = oa->o_id;
 
@@ -161,7 +174,7 @@ int filter_recov_log_unlink_cb(struct llog_handle *llh,
         obdo_free(oa);
         if (rc == -ENOENT) {
                 CDEBUG(D_HA, "object already removed, send cookie\n");
-                llog_cancel(ctxt, 1, &cookie, 0, NULL);
+                llog_cancel(ctxt, NULL, 1, &cookie, 0);
                 RETURN(0);
         }
 
diff --git a/lustre/obdfilter/filter_lvb.c b/lustre/obdfilter/filter_lvb.c
index 3ca1fad..f86d1bf 100644
--- a/lustre/obdfilter/filter_lvb.c
+++ b/lustre/obdfilter/filter_lvb.c
@@ -41,6 +41,7 @@ static int filter_lvbo_init(struct ldlm_resource *res)
         int rc = 0;
         struct ost_lvb *lvb = NULL;
         struct obd_device *obd;
+        struct obdo *oa = NULL;
         struct dentry *dentry;
         ENTRY;
 
@@ -65,26 +66,36 @@ static int filter_lvbo_init(struct ldlm_resource *res)
         obd = res->lr_namespace->ns_lvbp;
         LASSERT(obd != NULL);
 
-        dentry = filter_fid2dentry(obd, NULL, 0, res->lr_name.name[0]);
+        oa = obdo_alloc();
+        if (oa == NULL)
+                GOTO(out, rc = -ENOMEM);
+
+        oa->o_id = res->lr_name.name[0];
+        oa->o_gr = res->lr_name.name[2];
+        oa->o_valid = OBD_MD_FLID | OBD_MD_FLGROUP;
+
+        dentry = filter_oa2dentry(obd, oa);
         if (IS_ERR(dentry))
                 GOTO(out, rc = PTR_ERR(dentry));
 
-        if (dentry->d_inode == NULL)
-                GOTO(out_dentry, rc = -ENOENT);
+        /* Limit the valid bits in the return data to what we actually use */
+        oa->o_valid = OBD_MD_FLID | OBD_MD_FLGROUP;
+        obdo_from_inode(oa, dentry->d_inode, FILTER_VALID_FLAGS);
+        f_dput(dentry);
 
         lvb->lvb_size = dentry->d_inode->i_size;
         lvb->lvb_mtime = LTIME_S(dentry->d_inode->i_mtime);
-        lvb->lvb_blocks = dentry->d_inode->i_blocks;
+        CDEBUG(D_DLMTRACE, "res: "LPU64" initial lvb size: "LPU64", mtime: "
+               LPU64"\n", res->lr_name.name[0], lvb->lvb_size, lvb->lvb_mtime);
 
-        CDEBUG(D_DLMTRACE, "res: "LPU64" initial lvb size: "LPU64", "
-               "mtime: "LPU64", blocks: "LPU64"\n",
-               res->lr_name.name[0], lvb->lvb_size,
-               lvb->lvb_mtime, lvb->lvb_blocks);
-
- out_dentry:
-        f_dput(dentry);
  out:
-        /* Don't free lvb data on lookup error */
+        if (oa)
+                obdo_free(oa);
+        if (rc && lvb != NULL) {
+                OBD_FREE(lvb, sizeof(*lvb));
+                res->lr_lvb_data = NULL;
+                res->lr_lvb_len = 0;
+        }
         up(&res->lr_lvb_sem);
         return rc;
 }
@@ -102,6 +113,7 @@ static int filter_lvbo_update(struct ldlm_resource *res, struct lustre_msg *m,
         int rc = 0;
         struct ost_lvb *lvb = res->lr_lvb_data;
         struct obd_device *obd;
+        struct obdo *oa = NULL;
         struct dentry *dentry;
         ENTRY;
 
@@ -141,12 +153,6 @@ static int filter_lvbo_update(struct ldlm_resource *res, struct lustre_msg *m,
                                lvb->lvb_mtime, new->lvb_mtime);
                         lvb->lvb_mtime = new->lvb_mtime;
                 }
-                if (new->lvb_blocks > lvb->lvb_blocks || !increase) {
-                        CDEBUG(D_DLMTRACE, "res: "LPU64" updating lvb blocks: "
-                               LPU64" -> "LPU64"\n", res->lr_name.name[0],
-                               lvb->lvb_blocks, new->lvb_blocks);
-                        lvb->lvb_blocks = new->lvb_blocks;
-                }
                 GOTO(out, rc = 0);
         }
 
@@ -154,12 +160,20 @@ static int filter_lvbo_update(struct ldlm_resource *res, struct lustre_msg *m,
         obd = res->lr_namespace->ns_lvbp;
         LASSERT(obd);
 
-        dentry = filter_fid2dentry(obd, NULL, 0, res->lr_name.name[0]);
+        oa = obdo_alloc();
+        if (oa == NULL)
+                GOTO(out, rc = -ENOMEM);
+
+        oa->o_id = res->lr_name.name[0];
+        oa->o_gr = res->lr_name.name[2];
+        oa->o_valid = OBD_MD_FLID | OBD_MD_FLGROUP;
+        dentry = filter_oa2dentry(obd, oa);
         if (IS_ERR(dentry))
                 GOTO(out, rc = PTR_ERR(dentry));
 
-        if (dentry->d_inode == NULL)
-                GOTO(out_dentry, rc = -ENOENT);
+        /* Limit the valid bits in the return data to what we actually use */
+        oa->o_valid = OBD_MD_FLID | OBD_MD_FLGROUP;
+        obdo_from_inode(oa, dentry->d_inode, FILTER_VALID_FLAGS);
 
         if (dentry->d_inode->i_size > lvb->lvb_size || !increase) {
                 CDEBUG(D_DLMTRACE, "res: "LPU64" updating lvb size from disk: "
@@ -167,26 +181,23 @@ static int filter_lvbo_update(struct ldlm_resource *res, struct lustre_msg *m,
                        lvb->lvb_size, dentry->d_inode->i_size);
                 lvb->lvb_size = dentry->d_inode->i_size;
         }
-
         if (LTIME_S(dentry->d_inode->i_mtime) > lvb->lvb_mtime || !increase) {
                 CDEBUG(D_DLMTRACE, "res: "LPU64" updating lvb mtime from disk: "
                        LPU64" -> %lu\n", res->lr_name.name[0],
                        lvb->lvb_mtime, LTIME_S(dentry->d_inode->i_mtime));
                 lvb->lvb_mtime = LTIME_S(dentry->d_inode->i_mtime);
         }
-        CDEBUG(D_DLMTRACE, "res: "LPU64" updating lvb blocks from disk: "
-               LPU64" -> %lu\n", res->lr_name.name[0],
-               lvb->lvb_blocks, dentry->d_inode->i_blocks);
-        lvb->lvb_blocks = dentry->d_inode->i_blocks;
-
-out_dentry:
         f_dput(dentry);
 
-out:
+ out:
+        if (oa != NULL)
+                obdo_free(oa);
         up(&res->lr_lvb_sem);
         return rc;
 }
 
+
+
 struct ldlm_valblock_ops filter_lvbo = {
         lvbo_init: filter_lvbo_init,
         lvbo_update: filter_lvbo_update
diff --git a/lustre/obdfilter/lproc_obdfilter.c b/lustre/obdfilter/lproc_obdfilter.c
index 8f64926..10fbc8c 100644
--- a/lustre/obdfilter/lproc_obdfilter.c
+++ b/lustre/obdfilter/lproc_obdfilter.c
@@ -34,47 +34,10 @@ static struct lprocfs_vars lprocfs_obd_vars[]  = { {0} };
 static struct lprocfs_vars lprocfs_module_vars[] = { {0} };
 #else
 
-static int lprocfs_filter_rd_groups(char *page, char **start, off_t off,
-                                    int count, int *eof, void *data)
-{
-        *eof = 1;
-        return snprintf(page, count, "%u\n", FILTER_GROUPS);
-}
-
-static int lprocfs_filter_rd_tot_dirty(char *page, char **start, off_t off,
-                                       int count, int *eof, void *data)
-{
-        struct obd_device *obd = (struct obd_device *)data;
-
-        LASSERT(obd != NULL);
-        *eof = 1;
-        return snprintf(page, count, LPU64"\n", obd->u.filter.fo_tot_dirty);
-}
-
-static int lprocfs_filter_rd_tot_granted(char *page, char **start, off_t off,
-                                         int count, int *eof, void *data)
-{
-        struct obd_device *obd = (struct obd_device *)data;
-
-        LASSERT(obd != NULL);
-        *eof = 1;
-        return snprintf(page, count, LPU64"\n", obd->u.filter.fo_tot_granted);
-}
-
-static int lprocfs_filter_rd_tot_pending(char *page, char **start, off_t off,
-                                         int count, int *eof, void *data)
-{
-        struct obd_device *obd = (struct obd_device *)data;
-
-        LASSERT(obd != NULL);
-        *eof = 1;
-        return snprintf(page, count, LPU64"\n", obd->u.filter.fo_tot_pending);
-}
-
 static int lprocfs_filter_rd_mntdev(char *page, char **start, off_t off,
                                     int count, int *eof, void *data)
 {
-        struct obd_device *obd = (struct obd_device *)data;
+        struct obd_device* obd = (struct obd_device *)data;
 
         LASSERT(obd != NULL);
         LASSERT(obd->u.filter.fo_vfsmnt->mnt_devname);
@@ -87,12 +50,23 @@ static int lprocfs_filter_rd_last_id(char *page, char **start, off_t off,
                                      int count, int *eof, void *data)
 {
         struct obd_device *obd = data;
+        struct filter_obd *filter = &obd->u.filter;
+        int retval = 0, rc, i;
 
         if (obd == NULL)
                 return 0;
 
-        return snprintf(page, count, LPU64"\n",
-                        filter_last_id(&obd->u.filter, 0));
+        for (i = 1; i < filter->fo_group_count; i++) {
+                rc = snprintf(page, count, LPU64"\n",filter_last_id(filter, i));
+                if (rc < 0) {
+                        retval = rc;
+                        break;
+                }
+                page += rc;
+                count -= rc;
+                retval += rc;
+        }
+        return retval;
 }
 
 int lprocfs_filter_rd_readcache(char *page, char **start, off_t off, int count,
@@ -129,14 +103,10 @@ static struct lprocfs_vars lprocfs_obd_vars[] = {
         { "kbytesavail",  lprocfs_rd_kbytesavail,   0, 0 },
         { "filestotal",   lprocfs_rd_filestotal,    0, 0 },
         { "filesfree",    lprocfs_rd_filesfree,     0, 0 },
-        { "filegroups",   lprocfs_filter_rd_groups, 0, 0 },
+        //{ "filegroups",   lprocfs_rd_filegroups,    0, 0 },
         { "fstype",       lprocfs_rd_fstype,        0, 0 },
         { "mntdev",       lprocfs_filter_rd_mntdev, 0, 0 },
         { "last_id",      lprocfs_filter_rd_last_id,0, 0 },
-        { "tot_dirty",    lprocfs_filter_rd_tot_dirty,   0, 0 },
-        { "tot_pending",  lprocfs_filter_rd_tot_pending, 0, 0 },
-        { "tot_granted",  lprocfs_filter_rd_tot_granted, 0, 0 },
-        { "num_exports",  lprocfs_rd_num_exports,   0, 0 },
         { "readcache_max_filesize",
                           lprocfs_filter_rd_readcache,
                           lprocfs_filter_wr_readcache, 0 },
@@ -178,7 +148,7 @@ void filter_tally_write(struct filter_obd *filter, struct page **pages,
         lprocfs_oh_tally(&filter->fo_w_discont_blocks, discont_blocks);
 }
 
-void filter_tally_read(struct filter_obd *filter, struct niobuf_local *lnb,
+void filter_tally_read(struct filter_obd *filter, struct niobuf_local *lnb, 
                        int niocount)
 {
         struct niobuf_local *end;
@@ -197,7 +167,7 @@ void filter_tally_read(struct filter_obd *filter, struct niobuf_local *lnb,
                         /* XXX not so smart for now */
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
                         if ((page->buffers && last_page->buffers) &&
-                            (page->buffers->b_blocknr !=
+                            (page->buffers->b_blocknr != 
                              (last_page->buffers->b_blocknr + 1)))
                                 discont_blocks++;
 #else
@@ -243,9 +213,9 @@ static int filter_brw_stats_seq_show(struct seq_file *seq, void *v)
                 unsigned long w = filter->fo_w_pages.oh_buckets[i];
                 read_cum += r;
                 write_cum += w;
-                seq_printf(seq, "%d:\t\t%10lu %3lu %3lu   | %10lu %3lu %3lu\n",
-                                 1 << i, r, pct(r, read_tot),
-                                 pct(read_cum, read_tot), w,
+                seq_printf(seq, "%d:\t\t%10lu %3lu %3lu   | %10lu %3lu %3lu\n", 
+                                 1 << i, r, pct(r, read_tot), 
+                                 pct(read_cum, read_tot), w, 
                                  pct(w, write_tot),
                                  pct(write_cum, write_tot));
                 if (read_cum == read_tot && write_cum == write_tot)
@@ -267,9 +237,9 @@ static int filter_brw_stats_seq_show(struct seq_file *seq, void *v)
                 unsigned long w = filter->fo_w_discont_pages.oh_buckets[i];
                 read_cum += r;
                 write_cum += w;
-                seq_printf(seq, "%d:\t\t%10lu %3lu %3lu   | %10lu %3lu %3lu\n",
-                                 i, r, pct(r, read_tot),
-                                 pct(read_cum, read_tot), w,
+                seq_printf(seq, "%d:\t\t%10lu %3lu %3lu   | %10lu %3lu %3lu\n", 
+                                 i, r, pct(r, read_tot), 
+                                 pct(read_cum, read_tot), w, 
                                  pct(w, write_tot),
                                  pct(write_cum, write_tot));
                 if (read_cum == read_tot && write_cum == write_tot)
@@ -290,9 +260,9 @@ static int filter_brw_stats_seq_show(struct seq_file *seq, void *v)
                 unsigned long w = filter->fo_w_discont_blocks.oh_buckets[i];
                 read_cum += r;
                 write_cum += w;
-                seq_printf(seq, "%d:\t\t%10lu %3lu %3lu   | %10lu %3lu %3lu\n",
-                                 i, r, pct(r, read_tot),
-                                 pct(read_cum, read_tot), w,
+                seq_printf(seq, "%d:\t\t%10lu %3lu %3lu   | %10lu %3lu %3lu\n", 
+                                 i, r, pct(r, read_tot), 
+                                 pct(read_cum, read_tot), w, 
                                  pct(w, write_tot),
                                  pct(write_cum, write_tot));
                 if (read_cum == read_tot && write_cum == write_tot)
@@ -329,7 +299,7 @@ static int filter_brw_stats_seq_open(struct inode *inode, struct file *file)
         struct proc_dir_entry *dp = PDE(inode);
         struct seq_file *seq;
         int rc;
-
+ 
         rc = seq_open(file, &filter_brw_stats_seq_sops);
         if (rc)
                 return rc;
@@ -356,7 +326,6 @@ static ssize_t filter_brw_stats_seq_write(struct file *file, const char *buf,
 }
 
 struct file_operations filter_brw_stats_fops = {
-        .owner   = THIS_MODULE,
         .open    = filter_brw_stats_seq_open,
         .read    = seq_read,
         .write   = filter_brw_stats_seq_write,
@@ -366,11 +335,11 @@ struct file_operations filter_brw_stats_fops = {
 
 int lproc_filter_attach_seqstat(struct obd_device *dev)
 {
-        return lprocfs_obd_seq_create(dev, "brw_stats", 0444,
+        return lprocfs_obd_seq_create(dev, "brw_stats", 0444, 
                                       &filter_brw_stats_fops, dev);
 }
 
 
 
 #endif /* LPROCFS */
-LPROCFS_INIT_VARS(filter, lprocfs_module_vars, lprocfs_obd_vars)
+LPROCFS_INIT_VARS(filter,lprocfs_module_vars, lprocfs_obd_vars)
diff --git a/lustre/osc/.cvsignore b/lustre/osc/.cvsignore
index 5d26f00..49c6100 100644
--- a/lustre/osc/.cvsignore
+++ b/lustre/osc/.cvsignore
@@ -3,13 +3,7 @@ config.log
 config.status
 configure
 Makefile
+Makefile.in
 .deps
 TAGS
 .*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
diff --git a/lustre/osc/autoMakefile.am b/lustre/osc/Makefile.am
similarity index 58%
rename from lustre/osc/autoMakefile.am
rename to lustre/osc/Makefile.am
index dae803a..0cb3bcd 100644
--- a/lustre/osc/autoMakefile.am
+++ b/lustre/osc/Makefile.am
@@ -3,16 +3,17 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
+DEFS=
+
 if LIBLUSTRE
 noinst_LIBRARIES = libosc.a
 libosc_a_SOURCES = osc_request.c osc_lib.c osc_create.c osc_internal.h
-libosc_a_CPPFLAGS = $(LLCPPFLAGS)
-libosc_a_CFLAGS = $(LLCFLAGS)
-endif
-
-if MODULES
-modulefs_DATA = osc$(KMODEXT)
+libosc_a_CFLAGS = -fPIC
+else
+MODULE = osc
+modulefs_DATA = osc.o
+EXTRA_PROGRAMS = osc
+osc_SOURCES = osc_request.c lproc_osc.c osc_lib.c  osc_create.c osc_internal.h
 endif
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-DIST_SOURCES = $(osc-objs:%.o=%.c) osc_internal.h
+include $(top_srcdir)/Rules
diff --git a/lustre/osc/Makefile.in b/lustre/osc/Makefile.in
deleted file mode 100644
index 568a725..0000000
--- a/lustre/osc/Makefile.in
+++ /dev/null
@@ -1,4 +0,0 @@
-MODULES := osc
-osc-objs := osc_request.o lproc_osc.o osc_lib.o osc_create.o
-
-@INCLUDE_RULES@
diff --git a/lustre/osc/lproc_osc.c b/lustre/osc/lproc_osc.c
index 078d0d1..93b4276 100644
--- a/lustre/osc/lproc_osc.c
+++ b/lustre/osc/lproc_osc.c
@@ -108,13 +108,14 @@ int osc_rd_max_dirty_mb(char *page, char **start, off_t off, int count,
 {
         struct obd_device *dev = data;
         struct client_obd *cli = &dev->u.cli;
-        unsigned val;
+        int val;
+        int rc;
 
         spin_lock(&cli->cl_loi_list_lock);
         val = cli->cl_dirty_max >> 20;
+        rc = snprintf(page, count, "%d\n", val);
         spin_unlock(&cli->cl_loi_list_lock);
-
-        return snprintf(page, count, "%u\n", val);
+        return rc;
 }
 
 int osc_wr_max_dirty_mb(struct file *file, const char *buffer,
@@ -305,7 +306,7 @@ static int osc_rpc_stats_seq_show(struct seq_file *seq, void *v)
         rpcs = cli->cl_brw_in_flight;
         r = cli->cl_pending_r_pages;
         w = cli->cl_pending_w_pages;
-
+                                                                                
         seq_printf(seq, "snapshot_time:         %lu:%lu (secs:usecs)\n",
                    now.tv_sec, now.tv_usec);
         seq_printf(seq, "RPCs in flight:        %d\n", rpcs);
@@ -326,9 +327,9 @@ static int osc_rpc_stats_seq_show(struct seq_file *seq, void *v)
                 unsigned long w = cli->cl_write_page_hist.oh_buckets[i];
                 read_cum += r;
                 write_cum += w;
-                seq_printf(seq, "%d:\t\t%10lu %3lu %3lu   | %10lu %3lu %3lu\n",
-                                 1 << i, r, pct(r, read_tot),
-                                 pct(read_cum, read_tot), w,
+                seq_printf(seq, "%d:\t\t%10lu %3lu %3lu   | %10lu %3lu %3lu\n", 
+                                 1 << i, r, pct(r, read_tot), 
+                                 pct(read_cum, read_tot), w, 
                                  pct(w, write_tot),
                                  pct(write_cum, write_tot));
                 if (read_cum == read_tot && write_cum == write_tot)
@@ -349,9 +350,9 @@ static int osc_rpc_stats_seq_show(struct seq_file *seq, void *v)
                 unsigned long w = cli->cl_write_rpc_hist.oh_buckets[i];
                 read_cum += r;
                 write_cum += w;
-                seq_printf(seq, "%d:\t\t%10lu %3lu %3lu   | %10lu %3lu %3lu\n",
-                                 i, r, pct(r, read_tot),
-                                 pct(read_cum, read_tot), w,
+                seq_printf(seq, "%d:\t\t%10lu %3lu %3lu   | %10lu %3lu %3lu\n", 
+                                 i, r, pct(r, read_tot), 
+                                 pct(read_cum, read_tot), w, 
                                  pct(w, write_tot),
                                  pct(write_cum, write_tot));
                 if (read_cum == read_tot && write_cum == write_tot)
@@ -390,7 +391,7 @@ static int osc_rpc_stats_seq_open(struct inode *inode, struct file *file)
         struct proc_dir_entry *dp = PDE(inode);
         struct seq_file *seq;
         int rc;
-
+ 
         rc = seq_open(file, &osc_rpc_stats_seq_sops);
         if (rc)
                 return rc;
@@ -415,7 +416,6 @@ static ssize_t osc_rpc_stats_seq_write(struct file *file, const char *buf,
 }
 
 struct file_operations osc_rpc_stats_fops = {
-        .owner   = THIS_MODULE,
         .open    = osc_rpc_stats_seq_open,
         .read    = seq_read,
         .write   = osc_rpc_stats_seq_write,
@@ -425,9 +425,10 @@ struct file_operations osc_rpc_stats_fops = {
 
 int lproc_osc_attach_seqstat(struct obd_device *dev)
 {
-        return lprocfs_obd_seq_create(dev, "rpc_stats", 0444,
+        return lprocfs_obd_seq_create(dev, "rpc_stats", 0444, 
                                       &osc_rpc_stats_fops, dev);
 }
 
+
 #endif /* LPROCFS */
-LPROCFS_INIT_VARS(osc, lprocfs_module_vars, lprocfs_obd_vars)
+LPROCFS_INIT_VARS(osc,lprocfs_module_vars, lprocfs_obd_vars)
diff --git a/lustre/osc/osc_create.c b/lustre/osc/osc_create.c
index 50b4d12..daa8049 100644
--- a/lustre/osc/osc_create.c
+++ b/lustre/osc/osc_create.c
@@ -87,7 +87,7 @@ static int osc_interpret_create(struct ptlrpc_request *req, void *data,
         oscc->oscc_flags &= ~OSCC_FLAG_CREATING;
         spin_unlock(&oscc->oscc_lock);
 
-        CDEBUG(D_HA, "preallocated through id "LPU64" (last used "LPU64")\n",
+        CDEBUG(D_INFO, "preallocated through id "LPU64" (last used "LPU64")\n",
                oscc->oscc_last_id, oscc->oscc_next_id);
 
         wake_up(&oscc->oscc_waitq);
@@ -102,8 +102,7 @@ static int oscc_internal_create(struct osc_creator *oscc)
         ENTRY;
 
         spin_lock(&oscc->oscc_lock);
-        if (oscc->oscc_flags & OSCC_FLAG_CREATING ||
-            oscc->oscc_flags & OSCC_FLAG_RECOVERING) {
+        if (oscc->oscc_flags & OSCC_FLAG_CREATING) {
                 spin_unlock(&oscc->oscc_lock);
                 RETURN(0);
         }
@@ -124,8 +123,10 @@ static int oscc_internal_create(struct osc_creator *oscc)
 
         spin_lock(&oscc->oscc_lock);
         body->oa.o_id = oscc->oscc_last_id + oscc->oscc_grow_count;
-        body->oa.o_valid |= OBD_MD_FLID;
-        CDEBUG(D_HA, "preallocating through id "LPU64" (last used "LPU64")\n",
+        body->oa.o_gr = oscc->oscc_gr;
+        LASSERT(body->oa.o_gr > 0);
+        body->oa.o_valid |= OBD_MD_FLID | OBD_MD_FLGROUP;
+        CDEBUG(D_INFO, "preallocating through id "LPU64" (last used "LPU64")\n",
                body->oa.o_id, oscc->oscc_next_id);
         spin_unlock(&oscc->oscc_lock);
 
@@ -212,8 +213,13 @@ int osc_create(struct obd_export *exp, struct obdo *oa,
         ENTRY;
         LASSERT(oa);
         LASSERT(ea);
+        LASSERT(oa->o_valid & OBD_MD_FLGROUP);
+        LASSERT(oa->o_gr > 0);
 
-        if ((oa->o_valid & OBD_MD_FLGROUP) && (oa->o_gr != 0))
+        LASSERT(oscc->oscc_gr == 0 || oscc->oscc_gr == oa->o_gr);
+        oscc->oscc_gr = oa->o_gr;
+
+        if (oa->o_gr == FILTER_GROUP_LLOG || oa->o_gr == FILTER_GROUP_ECHO)
                 RETURN(osc_real_create(exp, oa, ea, oti));
 
         if ((oa->o_valid & OBD_MD_FLFLAGS) &&
@@ -236,10 +242,6 @@ int osc_create(struct obd_export *exp, struct obdo *oa,
                 oa->o_valid |= OBD_MD_FLID;
                 oa->o_id = oscc->oscc_next_id - 1;
 
-                CDEBUG(D_HA, "%s: deleting to next_id: "LPU64"\n", 
-                       oscc->oscc_obd->u.cli.cl_import->imp_target_uuid.uuid, 
-                       oa->o_id);
-
                 rc = osc_real_create(exp, oa, ea, NULL);
 
                 spin_lock(&oscc->oscc_lock);
@@ -255,33 +257,33 @@ int osc_create(struct obd_export *exp, struct obdo *oa,
 		RETURN(rc);
 	}
 
-        while (try_again) {
-                /* If orphans are being recovered, then we must wait until 
-                   it is finished before we can continue with create. */
-                if (oscc_recovering(oscc)) {
-                        struct l_wait_info lwi;
-                        
-                        CDEBUG(D_HA,"%p: oscc recovery in progress, waiting\n", 
-                               oscc);
-                        
-                        lwi = LWI_TIMEOUT(MAX(obd_timeout * HZ, 1), NULL, NULL);
-                        rc = l_wait_event(oscc->oscc_waitq, 
-                                          !oscc_recovering(oscc), &lwi);
-                        LASSERT(rc == 0 || rc == -ETIMEDOUT);
-                        if (rc == -ETIMEDOUT) {
-                                CDEBUG(D_HA, "%p: timed out waiting for "
-                                       "recovery\n", oscc);
-                                RETURN(rc);
-                        }
-                        CDEBUG(D_HA, "%p: oscc recovery over, waking up\n", 
-                               oscc);
+        /* If orphans are being recovered, then we must wait until it is 
+           finished before we can continue with create. */
+        if (oscc_recovering(oscc)) {
+                struct l_wait_info lwi;
+
+                CDEBUG(D_HA, "%p: oscc recovery in progress, waiting\n", oscc);
+
+                lwi = LWI_TIMEOUT(MAX(obd_timeout * HZ, 1), NULL, NULL);
+                rc = l_wait_event(oscc->oscc_waitq, !oscc_recovering(oscc),
+                                  &lwi);
+                LASSERT(rc == 0 || rc == -ETIMEDOUT);
+                if (rc == -ETIMEDOUT) {
+                        CDEBUG(D_HA, "%p: timed out waiting for recovery\n", oscc);
+                        RETURN(rc);
                 }
-                
+                CDEBUG(D_HA, "%p: oscc recovery over, waking up\n", oscc);
+        }
+        
+        
+        while (try_again) {
                 spin_lock(&oscc->oscc_lock);
                 if (oscc->oscc_last_id >= oscc->oscc_next_id) {
                         memcpy(oa, &oscc->oscc_oa, sizeof(*oa));
                         oa->o_id = oscc->oscc_next_id;
+                        oa->o_gr = oscc->oscc_gr;
                         lsm->lsm_object_id = oscc->oscc_next_id;
+                        lsm->lsm_object_gr = oscc->oscc_gr;
                         *ea = lsm;
                         oscc->oscc_next_id++;
                         try_again = 0;
@@ -297,9 +299,8 @@ int osc_create(struct obd_export *exp, struct obdo *oa,
         }
 
         if (rc == 0)
-                CDEBUG(D_HA, "%s: returning objid "LPU64"\n", 
-                       oscc->oscc_obd->u.cli.cl_import->imp_target_uuid.uuid, 
-                       lsm->lsm_object_id);
+                CDEBUG(D_INFO, "returning objid "LPU64"/"LPU64"\n",
+                                lsm->lsm_object_id, lsm->lsm_object_gr);
         else if (*ea == NULL)
                 obd_free_memmd(exp, &lsm);
         RETURN(rc);
diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index 8ac8bef..36b26df 100644
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -51,7 +51,7 @@
 # include <linux/lustre_dlm.h>
 #include <linux/kp30.h>
 #include <linux/lustre_net.h>
-#include <lustre/lustre_user.h>
+#include <linux/lustre_user.h>
 #include <linux/obd_ost.h>
 #include <linux/obd_lov.h>
 
@@ -64,6 +64,35 @@
 #include <linux/lustre_log.h>
 #include "osc_internal.h"
 
+
+static int osc_attach(struct obd_device *dev, obd_count len, void *data)
+{
+        struct lprocfs_static_vars lvars;
+        int rc;
+        ENTRY;
+
+        lprocfs_init_vars(osc,&lvars);
+        rc = lprocfs_obd_attach(dev, lvars.obd_vars);
+        if (rc < 0)
+                RETURN(rc);
+
+        rc = lproc_osc_attach_seqstat(dev);
+        if (rc < 0) {
+                lprocfs_obd_detach(dev);
+                RETURN(rc);
+        }
+
+        ptlrpc_lprocfs_register_obd(dev);
+        RETURN(0);
+}
+
+static int osc_detach(struct obd_device *dev)
+{
+        ptlrpc_lprocfs_unregister_obd(dev);
+        return lprocfs_obd_detach(dev);
+}
+
+
 /* Pack OSC object metadata for disk storage (LE byte order). */
 static int osc_packmd(struct obd_export *exp, struct lov_mds_md **lmmp,
                       struct lov_stripe_md *lsm)
@@ -89,7 +118,9 @@ static int osc_packmd(struct obd_export *exp, struct lov_mds_md **lmmp,
 
         if (lsm) {
                 LASSERT(lsm->lsm_object_id);
+                LASSERT(lsm->lsm_object_gr);
                 (*lmmp)->lmm_object_id = cpu_to_le64(lsm->lsm_object_id);
+                (*lmmp)->lmm_object_gr = cpu_to_le64(lsm->lsm_object_gr);
         }
 
         RETURN(lmm_size);
@@ -136,7 +167,9 @@ static int osc_unpackmd(struct obd_export *exp, struct lov_stripe_md **lsmp,
         if (lmm != NULL) {
                 /* XXX zero *lsmp? */
                 (*lsmp)->lsm_object_id = le64_to_cpu (lmm->lmm_object_id);
+                (*lsmp)->lsm_object_gr = le64_to_cpu (lmm->lmm_object_gr);
                 LASSERT((*lsmp)->lsm_object_id);
+                LASSERT((*lsmp)->lsm_object_gr);
         }
 
         (*lsmp)->lsm_maxbytes = LUSTRE_STRIPE_MAXBYTES;
@@ -251,6 +284,8 @@ static int osc_setattr(struct obd_export *exp, struct obdo *oa,
         int rc, size = sizeof(*body);
         ENTRY;
 
+        LASSERT(!(oa->o_valid & OBD_MD_FLGROUP) || oa->o_gr > 0);
+
         request = ptlrpc_prep_req(class_exp2cliimp(exp), OST_SETATTR, 1, &size,
                                   NULL);
         if (!request)
@@ -335,6 +370,7 @@ int osc_real_create(struct obd_export *exp, struct obdo *oa,
          * This needs to be fixed in a big way.
          */
         lsm->lsm_object_id = oa->o_id;
+        lsm->lsm_object_gr = oa->o_gr;
         *ea = lsm;
 
         if (oti != NULL) {
@@ -593,7 +629,7 @@ static void handle_short_read(int nob_read, obd_count page_count,
 
                 if (pga->count > nob_read) {
                         /* EOF inside this page */
-                        ptr = kmap(pga->pg) + (pga->page_offset & ~PAGE_MASK);
+                        ptr = kmap(pga->pg) + (pga->off & ~PAGE_MASK);
                         memset(ptr + nob_read, 0, pga->count - nob_read);
                         kunmap(pga->pg);
                         page_count--;
@@ -608,7 +644,7 @@ static void handle_short_read(int nob_read, obd_count page_count,
 
         /* zero remaining pages */
         while (page_count-- > 0) {
-                ptr = kmap(pga->pg) + (pga->page_offset & ~PAGE_MASK);
+                ptr = kmap(pga->pg) + (pga->off & ~PAGE_MASK);
                 memset(ptr, 0, pga->count);
                 kunmap(pga->pg);
                 pga++;
@@ -665,7 +701,7 @@ static inline int can_merge_pages(struct brw_page *p1, struct brw_page *p2)
                 return 0;
         }
 
-        return (p1->disk_offset + p1->count == p2->disk_offset);
+        return (p1->off + p1->count == p2->off);
 }
 
 #if CHECKSUM_BULK
@@ -750,24 +786,24 @@ static int osc_brw_prep_request(int cmd, struct obd_import *imp,struct obdo *oa,
                 struct brw_page *pg_prev = pg - 1;
 
                 LASSERT(pg->count > 0);
-                LASSERT((pg->page_offset & ~PAGE_MASK)+ pg->count <= PAGE_SIZE);
-                LASSERTF(i == 0 || pg->disk_offset > pg_prev->disk_offset,
+                LASSERT((pg->off & ~PAGE_MASK) + pg->count <= PAGE_SIZE);
+                LASSERTF(i == 0 || pg->off > pg_prev->off,
                          "i %d p_c %u pg %p [pri %lu ind %lu] off "LPU64
                          " prev_pg %p [pri %lu ind %lu] off "LPU64"\n",
                          i, page_count,
-                        pg->pg, pg->pg->private, pg->pg->index, pg->disk_offset,
+                         pg->pg, pg->pg->private, pg->pg->index, pg->off,
                          pg_prev->pg, pg_prev->pg->private, pg_prev->pg->index,
-                                 pg_prev->disk_offset);
+                                 pg_prev->off);
 
-                ptlrpc_prep_bulk_page(desc, pg->pg,
-                                      pg->page_offset & ~PAGE_MASK, pg->count);
+                ptlrpc_prep_bulk_page(desc, pg->pg, pg->off & ~PAGE_MASK,
+                                      pg->count);
                 requested_nob += pg->count;
 
                 if (i > 0 && can_merge_pages(pg_prev, pg)) {
                         niobuf--;
                         niobuf->len += pg->count;
                 } else {
-                        niobuf->offset = pg->disk_offset;
+                        niobuf->offset = pg->off;
                         niobuf->len    = pg->count;
                         niobuf->flags  = pg->flag;
                 }
@@ -823,7 +859,6 @@ static int osc_brw_fini_request(struct ptlrpc_request *req, struct obdo *oa,
         }
 
         osc_update_grant(cli, body);
-        memcpy(oa, &body->oa, sizeof(*oa));
 
         if (req->rq_reqmsg->opc == OST_WRITE) {
                 if (rc > 0) {
@@ -850,6 +885,8 @@ static int osc_brw_fini_request(struct ptlrpc_request *req, struct obdo *oa,
         if (rc < requested_nob)
                 handle_short_read(rc, page_count, pga);
 
+        memcpy(oa, &body->oa, sizeof(*oa));
+
 #if CHECKSUM_BULK
         if (oa->o_valid & OBD_MD_FLCKSUM) {
                 const struct ptlrpc_peer *peer =
@@ -859,7 +896,7 @@ static int osc_brw_fini_request(struct ptlrpc_request *req, struct obdo *oa,
                 obd_count cksum = cksum_pages(rc, page_count, pga);
                 char str[PTL_NALFMT_SIZE];
 
-                ptlrpc_peernid2str(peer, str);
+                portals_nid2str(peer->peer_ni->pni_number, peer->peer_nid, str);
 
                 cksum_counter++;
                 if (server_cksum != cksum) {
@@ -999,8 +1036,7 @@ static void sort_brw_pages(struct brw_page *array, int num)
                 for (i = stride ; i < num ; i++) {
                         tmp = array[i];
                         j = i;
-                        while (j >= stride && array[j - stride].disk_offset >
-                               tmp.disk_offset) {
+                        while (j >= stride && array[j - stride].off > tmp.off) {
                                 array[j] = array[j - stride];
                                 j -= stride;
                         }
@@ -1167,8 +1203,8 @@ unlock:
 
 /* this must be called holding the loi list lock to give coverage to exit_cache,
  * async_flag maintenance, and oap_request */
-static void osc_ap_completion(struct client_obd *cli, struct obdo *oa,
-                              struct osc_async_page *oap, int sent, int rc)
+static void osc_complete_oap(struct client_obd *cli,
+                             struct osc_async_page *oap, int sent, int rc)
 {
         osc_exit_cache(cli, oap, sent);
         oap->oap_async_flags = 0;
@@ -1179,9 +1215,6 @@ static void osc_ap_completion(struct client_obd *cli, struct obdo *oa,
                 oap->oap_request = NULL;
         }
 
-        if (rc == 0 && oa != NULL)
-                oap->oap_loi->loi_blocks = oa->o_blocks;
-
         if (oap->oap_oig) {
                 oig_complete_one(oap->oap_oig, &oap->oap_occ, rc);
                 oap->oap_oig = NULL;
@@ -1190,7 +1223,7 @@ static void osc_ap_completion(struct client_obd *cli, struct obdo *oa,
         }
 
         oap->oap_caller_ops->ap_completion(oap->oap_caller_data, oap->oap_cmd,
-                                           oa, rc);
+                                           rc);
 }
 
 static int brw_interpret_oap(struct ptlrpc_request *request,
@@ -1221,7 +1254,7 @@ static int brw_interpret_oap(struct ptlrpc_request *request,
 
         spin_lock(&cli->cl_loi_list_lock);
 
-        /* We need to decrement before osc_ap_completion->osc_wake_cache_waiters
+        /* We need to decrement before osc_complete_oap->osc_wake_cache_waiters
          * is called so we know whether to go to sync BRWs or wait for more
          * RPCs to complete */
         cli->cl_brw_in_flight--;
@@ -1235,7 +1268,7 @@ static int brw_interpret_oap(struct ptlrpc_request *request,
                        //oap->oap_page, oap->oap_page->index, oap);
 
                 list_del_init(&oap->oap_rpc_item);
-                osc_ap_completion(cli, aa->aa_oa, oap, 1, rc);
+                osc_complete_oap(cli, oap, 1, rc);
         }
 
         osc_wake_cache_waiters(cli);
@@ -1282,8 +1315,7 @@ static struct ptlrpc_request *osc_build_req(struct client_obd *cli,
                         ops = oap->oap_caller_ops;
                         caller_data = oap->oap_caller_data;
                 }
-                pga[i].disk_offset = oap->oap_obj_off + oap->oap_page_off;
-                pga[i].page_offset = pga[i].disk_offset;
+                pga[i].off = oap->oap_obj_off + oap->oap_page_off;
                 pga[i].pg = oap->oap_page;
                 pga[i].count = oap->oap_count;
                 pga[i].flag = oap->oap_brw_flags;
@@ -1401,7 +1433,8 @@ static int osc_send_oap_rpc(struct client_obd *cli, struct lov_oinfo *loi,
                 /* take the page out of our book-keeping */
                 list_del_init(&oap->oap_pending_item);
                 lop_update_pending(cli, lop, cmd, -1);
-                list_del_init(&oap->oap_urgent_item);
+                if (!list_empty(&oap->oap_urgent_item))
+                        list_del_init(&oap->oap_urgent_item);
 
                 /* ask the caller for the size of the io as the rpc leaves. */
                 if (!(oap->oap_async_flags & ASYNC_COUNT_STABLE))
@@ -1410,7 +1443,7 @@ static int osc_send_oap_rpc(struct client_obd *cli, struct lov_oinfo *loi,
                 if (oap->oap_count <= 0) {
                         CDEBUG(D_CACHE, "oap %p count %d, completing\n", oap,
                                oap->oap_count);
-                        osc_ap_completion(cli, NULL, oap, 0, oap->oap_count);
+                        osc_complete_oap(cli, oap, 0, oap->oap_count);
                         continue;
                 }
 
@@ -1442,8 +1475,7 @@ static int osc_send_oap_rpc(struct client_obd *cli, struct lov_oinfo *loi,
                          * were between the pending list and the rpc */
                         if (oap->oap_interrupted) {
                                 CDEBUG(D_INODE, "oap %p interrupted\n", oap);
-                                osc_ap_completion(cli, NULL, oap, 0,
-                                                  oap->oap_count);
+                                osc_complete_oap(cli, oap, 0, oap->oap_count);
                                 continue;
                         }
 
@@ -2097,10 +2129,9 @@ static int sanosc_brw_read(struct obd_export *exp, struct obdo *oa,
 
         for (mapped = 0; mapped < page_count; mapped++, nioptr++) {
                 LASSERT(PageLocked(pga[mapped].pg));
-                LASSERT(mapped == 0 ||
-                        pga[mapped].disk_offset > pga[mapped - 1].disk_offset);
+                LASSERT(mapped == 0 || pga[mapped].off > pga[mapped - 1].off);
 
-                nioptr->offset = pga[mapped].disk_offset;
+                nioptr->offset = pga[mapped].off;
                 nioptr->len    = pga[mapped].count;
                 nioptr->flags  = pga[mapped].flag;
         }
@@ -2227,10 +2258,9 @@ static int sanosc_brw_write(struct obd_export *exp, struct obdo *oa,
         /* pack request */
         for (mapped = 0; mapped < page_count; mapped++, nioptr++) {
                 LASSERT(PageLocked(pga[mapped].pg));
-                LASSERT(mapped == 0 ||
-                        pga[mapped].disk_offset > pga[mapped - 1].disk_offset);
+                LASSERT(mapped == 0 || pga[mapped].off > pga[mapped - 1].off);
 
-                nioptr->offset = pga[mapped].disk_offset;
+                nioptr->offset = pga[mapped].off;
                 nioptr->len    = pga[mapped].count;
                 nioptr->flags  = pga[mapped].flag;
         }
@@ -2365,9 +2395,11 @@ static void osc_set_data_with_check(struct lustre_handle *lockh, void *data)
 static int osc_change_cbdata(struct obd_export *exp, struct lov_stripe_md *lsm,
                              ldlm_iterator_t replace, void *data)
 {
-        struct ldlm_res_id res_id = { .name = {lsm->lsm_object_id} };
+        struct ldlm_res_id res_id = { .name = {0} };
         struct obd_device *obd = class_exp2obd(exp);
 
+        res_id.name[0] = lsm->lsm_object_id;
+        res_id.name[2] = lsm->lsm_object_gr;
         ldlm_change_cbdata(obd->obd_namespace, &res_id, replace, data);
         return 0;
 }
@@ -2378,12 +2410,15 @@ static int osc_enqueue(struct obd_export *exp, struct lov_stripe_md *lsm,
                        void *data, __u32 lvb_len, void *lvb_swabber,
                        struct lustre_handle *lockh)
 {
-        struct ldlm_res_id res_id = { .name = {lsm->lsm_object_id} };
         struct obd_device *obd = exp->exp_obd;
+        struct ldlm_res_id res_id = { .name = {0} };
         struct ost_lvb lvb;
         int rc;
         ENTRY;
 
+        res_id.name[0] = lsm->lsm_object_id;
+        res_id.name[2] = lsm->lsm_object_gr;
+
         /* Filesystem lock extents are extended to page boundaries so that
          * dealing with the page cache is a little smoother.  */
         policy->l_extent.start -= policy->l_extent.start & ~PAGE_MASK;
@@ -2438,10 +2473,8 @@ static int osc_enqueue(struct obd_export *exp, struct lov_stripe_md *lsm,
                               &lvb, sizeof(lvb), lustre_swab_ost_lvb, lockh);
 
         if ((*flags & LDLM_FL_HAS_INTENT && rc == ELDLM_LOCK_ABORTED) || !rc) {
-                CDEBUG(D_INODE, "received kms == "LPU64", blocks == "LPU64"\n",
-                       lvb.lvb_size, lvb.lvb_blocks);
+                CDEBUG(D_INODE, "received kms == "LPU64"\n", lvb.lvb_size);
                 lsm->lsm_oinfo->loi_rss = lvb.lvb_size;
-                lsm->lsm_oinfo->loi_blocks = lvb.lvb_blocks;
         }
 
         RETURN(rc);
@@ -2451,11 +2484,14 @@ static int osc_match(struct obd_export *exp, struct lov_stripe_md *lsm,
                      __u32 type, ldlm_policy_data_t *policy, __u32 mode,
                      int *flags, void *data, struct lustre_handle *lockh)
 {
-        struct ldlm_res_id res_id = { .name = {lsm->lsm_object_id} };
+        struct ldlm_res_id res_id = { .name = {0} };
         struct obd_device *obd = exp->exp_obd;
         int rc;
         ENTRY;
 
+        res_id.name[0] = lsm->lsm_object_id;
+        res_id.name[2] = lsm->lsm_object_gr;
+
         OBD_FAIL_RETURN(OBD_FAIL_OSC_MATCH, -EIO);
 
         /* Filesystem lock extents are extended to page boundaries so that
@@ -2493,7 +2529,7 @@ static int osc_cancel(struct obd_export *exp, struct lov_stripe_md *md,
 {
         ENTRY;
 
-        if (mode == LCK_GROUP)
+        if (mode == LCK_CW)
                 ldlm_lock_decref_and_cancel(lockh, mode);
         else
                 ldlm_lock_decref(lockh, mode);
@@ -2505,7 +2541,10 @@ static int osc_cancel_unused(struct obd_export *exp,
                              struct lov_stripe_md *lsm, int flags, void *opaque)
 {
         struct obd_device *obd = class_exp2obd(exp);
-        struct ldlm_res_id res_id = { .name = {lsm->lsm_object_id} };
+        struct ldlm_res_id res_id = { .name = {0} };
+
+        res_id.name[0] = lsm->lsm_object_id;
+        res_id.name[2] = lsm->lsm_object_gr;
 
         return ldlm_cli_cancel_unused(obd->obd_namespace, &res_id, flags,
                                       opaque);
@@ -2580,12 +2619,14 @@ static int osc_getstripe(struct lov_stripe_md *lsm, struct lov_user_md *lump)
                         RETURN(-ENOMEM);
 
                 lumk->lmm_objects[0].l_object_id = lsm->lsm_object_id;
+                lumk->lmm_objects[0].l_object_gr = lsm->lsm_object_gr;
         } else {
                 lum_size = sizeof(lum);
                 lumk = &lum;
         }
 
         lumk->lmm_object_id = lsm->lsm_object_id;
+        lumk->lmm_object_gr = lsm->lsm_object_gr;
         lumk->lmm_stripe_count = 1;
 
         if (copy_to_user(lump, lumk, lum_size))
@@ -2604,15 +2645,9 @@ static int osc_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
         struct obd_ioctl_data *data = karg;
         int err = 0;
         ENTRY;
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
+        
         MOD_INC_USE_COUNT;
-#else
-	if (!try_module_get(THIS_MODULE)) {
-		CERROR("Can't get module. Is it alive?");
-		return -EINVAL;
-	}
-#endif
+
         switch (cmd) {
         case OBD_IOC_LOV_GET_CONFIG: {
                 char *buf;
@@ -2676,11 +2711,7 @@ static int osc_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                 GOTO(out, err = -ENOTTY);
         }
 out:
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
         MOD_DEC_USE_COUNT;
-#else
-	module_put(THIS_MODULE);
-#endif
         return err;
 }
 
@@ -2733,8 +2764,8 @@ static int osc_set_info(struct obd_export *exp, obd_count keylen,
         struct obd_device  *obd = exp->exp_obd;
         struct obd_import *imp = class_exp2cliimp(exp);
         struct llog_ctxt *ctxt;
-        int rc, size = keylen;
-        char *bufs[1] = {key};
+        int rc, size[2] = {keylen, vallen};
+        char *bufs[2] = {key, val};
         ENTRY;
 
         if (keylen == strlen("next_id") &&
@@ -2742,7 +2773,7 @@ static int osc_set_info(struct obd_export *exp, obd_count keylen,
                 if (vallen != sizeof(obd_id))
                         RETURN(-EINVAL);
 		obd->u.cli.cl_oscc.oscc_next_id = *((obd_id*)val) + 1;
-                CDEBUG(D_HA, "%s: set oscc_next_id = "LPU64"\n",
+                CDEBUG(D_INODE, "%s: set oscc_next_id = "LPU64"\n",
                        exp->exp_obd->obd_name,
                        obd->u.cli.cl_oscc.oscc_next_id);
 
@@ -2783,8 +2814,7 @@ static int osc_set_info(struct obd_export *exp, obd_count keylen,
             memcmp(key, "mds_conn", strlen("mds_conn")) != 0)
                 RETURN(-EINVAL);
 
-
-        req = ptlrpc_prep_req(imp, OST_SET_INFO, 1, &size, bufs);
+        req = ptlrpc_prep_req(imp, OST_SET_INFO, 2, size, bufs);
         if (req == NULL)
                 RETURN(-ENOMEM);
 
@@ -2792,7 +2822,7 @@ static int osc_set_info(struct obd_export *exp, obd_count keylen,
         rc = ptlrpc_queue_wait(req);
         ptlrpc_req_finished(req);
 
-        ctxt = llog_get_context(exp->exp_obd, LLOG_UNLINK_ORIG_CTXT);
+        ctxt = llog_get_context(&exp->exp_obd->obd_llogs, LLOG_UNLINK_ORIG_CTXT);
         if (ctxt) {
                 rc = llog_initiator_connect(ctxt);
                 if (rc)
@@ -2812,38 +2842,40 @@ static struct llog_operations osc_size_repl_logops = {
 };
 
 static struct llog_operations osc_unlink_orig_logops;
-static int osc_llog_init(struct obd_device *obd, struct obd_device *tgt,
-                        int count, struct llog_catid *catid)
+static int osc_llog_init(struct obd_device *obd, struct obd_llogs *llogs,
+                         struct obd_device *tgt, int count,
+                         struct llog_catid *catid)
 {
         int rc;
         ENTRY;
 
         osc_unlink_orig_logops = llog_lvfs_ops;
         osc_unlink_orig_logops.lop_setup = llog_obd_origin_setup;
-        osc_unlink_orig_logops.lop_cleanup = llog_catalog_cleanup;
-        osc_unlink_orig_logops.lop_add = llog_catalog_add;
+        osc_unlink_orig_logops.lop_cleanup = llog_obd_origin_cleanup;
+        osc_unlink_orig_logops.lop_add = llog_obd_origin_add;
         osc_unlink_orig_logops.lop_connect = llog_origin_connect;
 
-        rc = obd_llog_setup(obd, LLOG_UNLINK_ORIG_CTXT, tgt, count,
-                            &catid->lci_logid, &osc_unlink_orig_logops);
+        rc = llog_setup(obd, llogs, LLOG_UNLINK_ORIG_CTXT, tgt, count,
+                        &catid->lci_logid, &osc_unlink_orig_logops);
         if (rc)
                 RETURN(rc);
 
-        rc = obd_llog_setup(obd, LLOG_SIZE_REPL_CTXT, tgt, count, NULL,
-                            &osc_size_repl_logops);
+        rc = llog_setup(obd, llogs, LLOG_SIZE_REPL_CTXT, tgt, count, NULL,
+                        &osc_size_repl_logops);
         RETURN(rc);
 }
 
-static int osc_llog_finish(struct obd_device *obd, int count)
+static int osc_llog_finish(struct obd_device *obd,
+                           struct obd_llogs *llogs, int count)
 {
         int rc;
         ENTRY;
 
-        rc = obd_llog_cleanup(llog_get_context(obd, LLOG_UNLINK_ORIG_CTXT));
+        rc = llog_cleanup(llog_get_context(llogs, LLOG_UNLINK_ORIG_CTXT));
         if (rc)
                 RETURN(rc);
 
-        rc = obd_llog_cleanup(llog_get_context(obd, LLOG_SIZE_REPL_CTXT));
+        rc = llog_cleanup(llog_get_context(llogs, LLOG_SIZE_REPL_CTXT));
         RETURN(rc);
 }
 
@@ -2861,9 +2893,10 @@ static int osc_connect(struct lustre_handle *exph,
 static int osc_disconnect(struct obd_export *exp, int flags)
 {
         struct obd_device *obd = class_exp2obd(exp);
-        struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_SIZE_REPL_CTXT);
+        struct llog_ctxt *ctxt;
         int rc;
 
+        ctxt = llog_get_context(&obd->obd_llogs, LLOG_SIZE_REPL_CTXT);
         if (obd->u.cli.cl_conn_count == 1)
                 /* flush any remaining cancel messages out to the target */
                 llog_sync(ctxt, exp);
@@ -2935,19 +2968,10 @@ int osc_setup(struct obd_device *obd, obd_count len, void *buf)
                 return rc;
 
         rc = client_obd_setup(obd, len, buf);
-        if (rc) {
+        if (rc)
                 ptlrpcd_decref();
-        } else {
-                struct lprocfs_static_vars lvars;
-
-                lprocfs_init_vars(osc, &lvars);
-                if (lprocfs_obd_setup(obd, lvars.obd_vars) == 0) {
-                        lproc_osc_attach_seqstat(obd);
-                        ptlrpc_lprocfs_register_obd(obd);
-                }
-
+        else
                 oscc_init(obd);
-        }
 
         RETURN(rc);
 }
@@ -2956,9 +2980,6 @@ int osc_cleanup(struct obd_device *obd, int flags)
 {
         int rc;
 
-        ptlrpc_lprocfs_unregister_obd(obd);
-        lprocfs_obd_cleanup(obd);
-
         rc = client_obd_cleanup(obd, flags);
         ptlrpcd_decref();
         RETURN(rc);
@@ -2966,93 +2987,92 @@ int osc_cleanup(struct obd_device *obd, int flags)
 
 
 struct obd_ops osc_obd_ops = {
-        .o_owner                = THIS_MODULE,
-        .o_setup                = osc_setup,
-        .o_cleanup              = osc_cleanup,
-        .o_connect              = osc_connect,
-        .o_disconnect           = osc_disconnect,
-        .o_statfs               = osc_statfs,
-        .o_packmd               = osc_packmd,
-        .o_unpackmd             = osc_unpackmd,
-        .o_create               = osc_create,
-        .o_destroy              = osc_destroy,
-        .o_getattr              = osc_getattr,
-        .o_getattr_async        = osc_getattr_async,
-        .o_setattr              = osc_setattr,
-        .o_brw                  = osc_brw,
-        .o_brw_async            = osc_brw_async,
-        .o_prep_async_page      = osc_prep_async_page,
-        .o_queue_async_io       = osc_queue_async_io,
-        .o_set_async_flags      = osc_set_async_flags,
-        .o_queue_group_io       = osc_queue_group_io,
-        .o_trigger_group_io     = osc_trigger_group_io,
-        .o_teardown_async_page  = osc_teardown_async_page,
-        .o_punch                = osc_punch,
-        .o_sync                 = osc_sync,
-        .o_enqueue              = osc_enqueue,
-        .o_match                = osc_match,
-        .o_change_cbdata        = osc_change_cbdata,
-        .o_cancel               = osc_cancel,
-        .o_cancel_unused        = osc_cancel_unused,
-        .o_iocontrol            = osc_iocontrol,
-        .o_get_info             = osc_get_info,
-        .o_set_info             = osc_set_info,
-        .o_import_event         = osc_import_event,
-        .o_llog_init            = osc_llog_init,
-        .o_llog_finish          = osc_llog_finish,
+        o_owner:        THIS_MODULE,
+        o_attach:       osc_attach,
+        o_detach:       osc_detach,
+        o_setup:        osc_setup,
+        o_cleanup:      osc_cleanup,
+        o_connect:      osc_connect,
+        o_disconnect:   osc_disconnect,
+        o_statfs:       osc_statfs,
+        o_packmd:       osc_packmd,
+        o_unpackmd:     osc_unpackmd,
+        o_create:       osc_create,
+        o_destroy:      osc_destroy,
+        o_getattr:      osc_getattr,
+        o_getattr_async:osc_getattr_async,
+        o_setattr:      osc_setattr,
+        o_brw:          osc_brw,
+        o_brw_async:    osc_brw_async,
+        .o_prep_async_page =            osc_prep_async_page,
+        .o_queue_async_io =             osc_queue_async_io,
+        .o_set_async_flags =            osc_set_async_flags,
+        .o_queue_group_io =             osc_queue_group_io,
+        .o_trigger_group_io =           osc_trigger_group_io,
+        .o_teardown_async_page =        osc_teardown_async_page,
+        o_punch:        osc_punch,
+        o_sync:         osc_sync,
+        o_enqueue:      osc_enqueue,
+        o_match:        osc_match,
+        o_change_cbdata:osc_change_cbdata,
+        o_cancel:       osc_cancel,
+        o_cancel_unused:osc_cancel_unused,
+        o_iocontrol:    osc_iocontrol,
+        o_get_info:     osc_get_info,
+        o_set_info:     osc_set_info,
+        o_import_event: osc_import_event,
+        o_llog_init:    osc_llog_init,
+        o_llog_finish:  osc_llog_finish,
 };
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
 struct obd_ops sanosc_obd_ops = {
-        .o_owner                = THIS_MODULE,
-        .o_cleanup              = client_obd_cleanup,
-        .o_connect              = osc_connect,
-        .o_disconnect           = client_disconnect_export,
-        .o_statfs               = osc_statfs,
-        .o_packmd               = osc_packmd,
-        .o_unpackmd             = osc_unpackmd,
-        .o_create               = osc_real_create,
-        .o_destroy              = osc_destroy,
-        .o_getattr              = osc_getattr,
-        .o_getattr_async        = osc_getattr_async,
-        .o_setattr              = osc_setattr,
-        .o_setup                = client_sanobd_setup,
-        .o_brw                  = sanosc_brw,
-        .o_punch                = osc_punch,
-        .o_sync                 = osc_sync,
-        .o_enqueue              = osc_enqueue,
-        .o_match                = osc_match,
-        .o_change_cbdata        = osc_change_cbdata,
-        .o_cancel               = osc_cancel,
-        .o_cancel_unused        = osc_cancel_unused,
-        .o_iocontrol            = osc_iocontrol,
-        .o_import_event         = osc_import_event,
-        .o_llog_init            = osc_llog_init,
-        .o_llog_finish          = osc_llog_finish,
+        o_owner:        THIS_MODULE,
+        o_attach:       osc_attach,
+        o_detach:       osc_detach,
+        o_cleanup:      client_obd_cleanup,
+        o_connect:      osc_connect,
+        o_disconnect:   client_disconnect_export,
+        o_statfs:       osc_statfs,
+        o_packmd:       osc_packmd,
+        o_unpackmd:     osc_unpackmd,
+        o_create:       osc_real_create,
+        o_destroy:      osc_destroy,
+        o_getattr:      osc_getattr,
+        o_getattr_async:osc_getattr_async,
+        o_setattr:      osc_setattr,
+        o_setup:        client_sanobd_setup,
+        o_brw:          sanosc_brw,
+        o_punch:        osc_punch,
+        o_sync:         osc_sync,
+        o_enqueue:      osc_enqueue,
+        o_match:        osc_match,
+        o_change_cbdata:osc_change_cbdata,
+        o_cancel:       osc_cancel,
+        o_cancel_unused:osc_cancel_unused,
+        o_iocontrol:    osc_iocontrol,
+        o_import_event: osc_import_event,
+        o_llog_init:    osc_llog_init,
+        o_llog_finish:  osc_llog_finish,
 };
 #endif
 
 int __init osc_init(void)
 {
-        struct lprocfs_static_vars lvars;
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-        struct lprocfs_static_vars sanlvars;
-#endif
+        struct lprocfs_static_vars lvars, sanlvars;
         int rc;
         ENTRY;
 
         lprocfs_init_vars(osc, &lvars);
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
         lprocfs_init_vars(osc, &sanlvars);
-#endif
 
-        rc = class_register_type(&osc_obd_ops, lvars.module_vars,
+        rc = class_register_type(&osc_obd_ops, NULL, lvars.module_vars,
                                  LUSTRE_OSC_NAME);
         if (rc)
                 RETURN(rc);
 
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-        rc = class_register_type(&sanosc_obd_ops, sanlvars.module_vars,
+        rc = class_register_type(&sanosc_obd_ops, NULL, sanlvars.module_vars,
                                  LUSTRE_SANOSC_NAME);
         if (rc)
                 class_unregister_type(LUSTRE_OSC_NAME);
@@ -3061,7 +3081,6 @@ int __init osc_init(void)
         RETURN(rc);
 }
 
-#ifdef __KERNEL__
 static void /*__exit*/ osc_exit(void)
 {
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
@@ -3070,6 +3089,7 @@ static void /*__exit*/ osc_exit(void)
         class_unregister_type(LUSTRE_OSC_NAME);
 }
 
+#ifdef __KERNEL__
 MODULE_AUTHOR("Cluster File Systems, Inc. <info@clusterfs.com>");
 MODULE_DESCRIPTION("Lustre Object Storage Client (OSC)");
 MODULE_LICENSE("GPL");
diff --git a/lustre/ost/.cvsignore b/lustre/ost/.cvsignore
index 5d26f00..49c6100 100644
--- a/lustre/ost/.cvsignore
+++ b/lustre/ost/.cvsignore
@@ -3,13 +3,7 @@ config.log
 config.status
 configure
 Makefile
+Makefile.in
 .deps
 TAGS
 .*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
diff --git a/lustre/ost/autoMakefile.am b/lustre/ost/Makefile.am
similarity index 54%
rename from lustre/ost/autoMakefile.am
rename to lustre/ost/Makefile.am
index 37e7583..b2e51c3 100644
--- a/lustre/ost/autoMakefile.am
+++ b/lustre/ost/Makefile.am
@@ -3,9 +3,11 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
-if MODULES
-modulefs_DATA = ost$(KMODEXT)
-endif
+DEFS= 
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-DIST_SOURCES = $(ost-objs:%.o=%.c)
+MODULE = ost
+modulefs_DATA = ost.o
+EXTRA_PROGRAMS = ost
+ost_SOURCES = ost_handler.c lproc_ost.c
+
+include $(top_srcdir)/Rules
diff --git a/lustre/ost/Makefile.in b/lustre/ost/Makefile.in
deleted file mode 100644
index 99002e4..0000000
--- a/lustre/ost/Makefile.in
+++ /dev/null
@@ -1,4 +0,0 @@
-MODULES := ost
-ost-objs := ost_handler.o lproc_ost.o
-
-@INCLUDE_RULES@
diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c
index 80cbedb..b62b753 100644
--- a/lustre/ost/ost_handler.c
+++ b/lustre/ost/ost_handler.c
@@ -517,24 +517,30 @@ static int ost_brw_read(struct ptlrpc_request *req)
                 }
                 if (req->rq_reqmsg->conn_cnt == req->rq_export->exp_conn_cnt) {
                         CERROR("bulk IO comms error: "
-                               "evicting %s@%s nid %s\n",
+                               "evicting %s@%s nid "LPX64" (%s)\n",
                                req->rq_export->exp_client_uuid.uuid,
                                req->rq_export->exp_connection->c_remote_uuid.uuid,
-                               ptlrpc_peernid2str(&req->rq_peer, str));
+                               req->rq_peer.peer_nid,
+                               portals_nid2str(req->rq_peer.peer_ni->pni_number,
+                                               req->rq_peer.peer_nid,
+                                               str));
                         ptlrpc_fail_export(req->rq_export);
                 } else {
                         CERROR("ignoring bulk IO comms error: "
-                               "client reconnected %s@%s nid %s\n",  
+                               "client reconnected %s@%s nid "LPX64" (%s)\n",  
                                req->rq_export->exp_client_uuid.uuid,
                                req->rq_export->exp_connection->c_remote_uuid.uuid,
-                               ptlrpc_peernid2str(&req->rq_peer, str));
+                               req->rq_peer.peer_nid,
+                               portals_nid2str(req->rq_peer.peer_ni->pni_number,
+                                               req->rq_peer.peer_nid,
+                                               str));
                 }
         }
 
         RETURN(rc);
 }
 
-static int ost_brw_write(struct ptlrpc_request *req, struct obd_trans_info *oti)
+int ost_brw_write(struct ptlrpc_request *req, struct obd_trans_info *oti)
 {
         struct ptlrpc_bulk_desc *desc;
         struct niobuf_remote    *remote_nb;
@@ -660,7 +666,8 @@ static int ost_brw_write(struct ptlrpc_request *req, struct obd_trans_info *oti)
                 obd_count client_cksum = body->oa.o_cksum;
                 obd_count cksum = ost_checksum_bulk(desc);
 
-                ptlrpc_peernid2str(&req->rq_connection->c_peer, str);
+                portals_nid2str(req->rq_connection->c_peer.peer_ni->pni_number,
+                                req->rq_connection->c_peer.peer_nid, str);
                 if (client_cksum != cksum) {
                         CERROR("Bad checksum: client %x, server %x, client NID "
                                LPX64" (%s)\n", client_cksum, cksum,
@@ -720,17 +727,23 @@ static int ost_brw_write(struct ptlrpc_request *req, struct obd_trans_info *oti)
                 }
                 if (req->rq_reqmsg->conn_cnt == req->rq_export->exp_conn_cnt) {
                         CERROR("bulk IO comms error: "
-                               "evicting %s@%s nid %s\n",
+                               "evicting %s@%s nid "LPX64" (%s)\n",
                                req->rq_export->exp_client_uuid.uuid,
                                req->rq_export->exp_connection->c_remote_uuid.uuid,
-                               ptlrpc_peernid2str(&req->rq_peer, str));
+                               req->rq_peer.peer_nid,
+                               portals_nid2str(req->rq_peer.peer_ni->pni_number,
+                                               req->rq_peer.peer_nid,
+                                               str));
                         ptlrpc_fail_export(req->rq_export);
                 } else {
                         CERROR("ignoring bulk IO comms error: "
-                               "client reconnected %s@%s nid %s\n",
+                               "client reconnected %s@%s nid "LPX64" (%s)\n",
                                req->rq_export->exp_client_uuid.uuid,
                                req->rq_export->exp_connection->c_remote_uuid.uuid,
-                               ptlrpc_peernid2str(&req->rq_peer, str));
+                               req->rq_peer.peer_nid,
+                               portals_nid2str(req->rq_peer.peer_ni->pni_number,
+                                               req->rq_peer.peer_nid,
+                                               str));
                 }        
         }
         RETURN(rc);
@@ -812,10 +825,9 @@ out:
         return rc;
 }
 
-
 static int ost_set_info(struct obd_export *exp, struct ptlrpc_request *req)
 {
-        char *key;
+        char *key, *val;
         int keylen, rc = 0;
         ENTRY;
 
@@ -830,7 +842,9 @@ static int ost_set_info(struct obd_export *exp, struct ptlrpc_request *req)
         if (rc)
                 RETURN(rc);
 
-        rc = obd_set_info(exp, keylen, key, 0, NULL);
+        val = lustre_msg_buf(req->rq_reqmsg, 1, 0);
+
+        rc = obd_set_info(exp, keylen, key, req->rq_reqmsg->buflens[1], val);
         req->rq_repmsg->status = 0;
         RETURN(rc);
 }
@@ -862,6 +876,19 @@ static int ost_get_info(struct obd_export *exp, struct ptlrpc_request *req)
         RETURN(rc);
 }
 
+static int ost_llog_handle_connect(struct obd_export *exp,
+                struct ptlrpc_request *req)
+{
+        struct obd_device *obd = exp->exp_obd;
+        struct llogd_conn_body *body;
+        int rc;
+        ENTRY;
+
+        body = lustre_msg_buf(req->rq_reqmsg, 0, sizeof(*body));
+        rc = obd_llog_connect(obd, body);
+        RETURN(rc);
+}
+
 static int ost_filter_recovery_request(struct ptlrpc_request *req,
                                        struct obd_device *obd, int *process)
 {
@@ -1024,7 +1051,7 @@ static int ost_handle(struct ptlrpc_request *req)
         /* FIXME - just reply status */
         case LLOG_ORIGIN_CONNECT:
                 DEBUG_REQ(D_INODE, req, "log connect\n");
-                rc = llog_handle_connect(req); 
+                rc = ost_llog_handle_connect(exp, req); 
                 req->rq_status = rc;
                 rc = lustre_pack_reply(req, 0, NULL, NULL);
                 if (rc)
@@ -1105,10 +1132,9 @@ out:
         return 0;
 }
 
-static int ost_setup(struct obd_device *obd, obd_count len, void *buf)
+static int ost_setup(struct obd_device *obddev, obd_count len, void *buf)
 {
-        struct ost_obd *ost = &obd->u.ost;
-        struct lprocfs_static_vars lvars;
+        struct ost_obd *ost = &obddev->u.ost;
         int rc;
         ENTRY;
 
@@ -1120,62 +1146,57 @@ static int ost_setup(struct obd_device *obd, obd_count len, void *buf)
         if (rc < 0)
                 RETURN(rc);
 
-        lprocfs_init_vars(ost, &lvars);
-        lprocfs_obd_setup(obd, lvars.obd_vars);
-
-        ost->ost_service =
+        ost->ost_service = 
                 ptlrpc_init_svc(OST_NBUFS, OST_BUFSIZE, OST_MAXREQSIZE,
                                 OST_REQUEST_PORTAL, OSC_REPLY_PORTAL,
                                 ost_handle, "ost",
-                                obd->obd_proc_entry);
+                                obddev->obd_proc_entry);
         if (ost->ost_service == NULL) {
                 CERROR("failed to start service\n");
-                GOTO(out_lprocfs, rc = -ENOMEM);
+                RETURN(-ENOMEM);
         }
-
-        rc = ptlrpc_start_n_threads(obd, ost->ost_service, OST_NUM_THREADS,
-                                    "ll_ost");
+        
+        rc = ptlrpc_start_n_threads(obddev, ost->ost_service, OST_NUM_THREADS, 
+                                 "ll_ost");
         if (rc)
-                GOTO(out_service, rc = -EINVAL);
+                GOTO(out, rc = -EINVAL);
 
         ost->ost_create_service =
                 ptlrpc_init_svc(OST_NBUFS, OST_BUFSIZE, OST_MAXREQSIZE,
                                 OST_CREATE_PORTAL, OSC_REPLY_PORTAL,
                                 ost_handle, "ost_create",
-                                obd->obd_proc_entry);
+                                obddev->obd_proc_entry);
         if (ost->ost_create_service == NULL) {
                 CERROR("failed to start OST create service\n");
-                GOTO(out_service, rc = -ENOMEM);
+                GOTO(out, rc = -ENOMEM);
         }
 
-        rc = ptlrpc_start_n_threads(obd, ost->ost_create_service, 1,
-                                    "ll_ost_creat");
-        if (rc)
+        rc = ptlrpc_start_n_threads(obddev, ost->ost_create_service, 1,
+                                    "ll_ost_create");
+        if (rc) 
                 GOTO(out_create, rc = -EINVAL);
 
         RETURN(0);
 
 out_create:
         ptlrpc_unregister_service(ost->ost_create_service);
-out_service:
+out:
         ptlrpc_unregister_service(ost->ost_service);
-out_lprocfs:
-        lprocfs_obd_cleanup(obd);
         RETURN(rc);
 }
 
-static int ost_cleanup(struct obd_device *obd, int flags)
+static int ost_cleanup(struct obd_device *obddev, int flags)
 {
-        struct ost_obd *ost = &obd->u.ost;
+        struct ost_obd *ost = &obddev->u.ost;
         int err = 0;
         ENTRY;
 
-        spin_lock_bh(&obd->obd_processing_task_lock);
-        if (obd->obd_recovering) {
-                target_cancel_recovery_timer(obd);
-                obd->obd_recovering = 0;
+        spin_lock_bh(&obddev->obd_processing_task_lock);
+        if (obddev->obd_recovering) {
+                target_cancel_recovery_timer(obddev);
+                obddev->obd_recovering = 0;
         }
-        spin_unlock_bh(&obd->obd_processing_task_lock);
+        spin_unlock_bh(&obddev->obd_processing_task_lock);
 
         ptlrpc_stop_all_threads(ost->ost_service);
         ptlrpc_unregister_service(ost->ost_service);
@@ -1183,16 +1204,29 @@ static int ost_cleanup(struct obd_device *obd, int flags)
         ptlrpc_stop_all_threads(ost->ost_create_service);
         ptlrpc_unregister_service(ost->ost_create_service);
 
-        lprocfs_obd_cleanup(obd);
-
         RETURN(err);
 }
 
+int ost_attach(struct obd_device *dev, obd_count len, void *data)
+{
+        struct lprocfs_static_vars lvars;
+
+        lprocfs_init_vars(ost,&lvars);
+        return lprocfs_obd_attach(dev, lvars.obd_vars);
+}
+
+int ost_detach(struct obd_device *dev)
+{
+        return lprocfs_obd_detach(dev);
+}
+
 /* use obd ops to offer management infrastructure */
 static struct obd_ops ost_obd_ops = {
-        .o_owner        = THIS_MODULE,
-        .o_setup        = ost_setup,
-        .o_cleanup      = ost_cleanup,
+        o_owner:        THIS_MODULE,
+        o_attach:       ost_attach,
+        o_detach:       ost_detach,
+        o_setup:        ost_setup,
+        o_cleanup:      ost_cleanup,
 };
 
 static int __init ost_init(void)
@@ -1201,7 +1235,7 @@ static int __init ost_init(void)
         ENTRY;
 
         lprocfs_init_vars(ost,&lvars);
-        RETURN(class_register_type(&ost_obd_ops, lvars.module_vars,
+        RETURN(class_register_type(&ost_obd_ops, NULL, lvars.module_vars,
                                    LUSTRE_OST_NAME));
 }
 
diff --git a/lustre/portals/.cvsignore b/lustre/portals/.cvsignore
index f30d862..c1a9bdf 100644
--- a/lustre/portals/.cvsignore
+++ b/lustre/portals/.cvsignore
@@ -1,11 +1,9 @@
 Kernelenv
 Makefile
-autoMakefile
-autoMakefile.in
+Makefile.in
 aclocal.m4
 autom4te.cache
 config.log
 config.status
 configure
-.*.cmd
-.depend
+.*.o.cmd
diff --git a/lustre/portals/Makefile.am b/lustre/portals/Makefile.am
new file mode 100644
index 0000000..0083ac1
--- /dev/null
+++ b/lustre/portals/Makefile.am
@@ -0,0 +1,19 @@
+# Copyright (C) 2001  Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+EXTRA_DIST = Rules.linux archdep.m4 include 
+DIST_SUBDIRS = libcfs portals knals unals utils tests doc router
+
+if LIBLUSTRE
+SUBDIRS = portals unals utils
+else
+
+if CRAY_PORTALS
+SUBDIRS = libcfs tests doc 
+else 
+SUBDIRS = libcfs portals knals unals utils tests doc router
+endif
+
+endif
diff --git a/lustre/portals/Makefile.in b/lustre/portals/Makefile.in
deleted file mode 100644
index 71d0dc8..0000000
--- a/lustre/portals/Makefile.in
+++ /dev/null
@@ -1,9 +0,0 @@
-subdir-m += libcfs
-
-cray-subdirs += portals
-cray-subdirs += knals
-cray-subdirs += router
-cray-subdirs += tests
-@CRAY_PORTALS_FALSE@subdir-m += $(cray-subdirs)
-
-@INCLUDE_RULES@
diff --git a/lustre/portals/Rules.linux b/lustre/portals/Rules.linux
new file mode 100644
index 0000000..232a248
--- /dev/null
+++ b/lustre/portals/Rules.linux
@@ -0,0 +1,29 @@
+# included in Linux kernel directories
+# Rules for module building
+
+if LINUX25
+
+basename=$(shell echo $< | sed -e 's/\.c//g' | sed -e 's/-//g' | sed -e 's/\.o//g' | sed -e 's/^.*\///g')
+AM_CPPFLAGS= -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2  -DKBUILD_MODNAME=$(MODULE) -DKBUILD_BASENAME=$(basename)
+
+$(MODULE).o: $($(MODULE)_OBJECTS) $($(MODULE)_DEPENDENCIES)
+	$(LD) -m $(MOD_LINK) -r -o $(MODULE)_tmp.o $($(MODULE)_OBJECTS)
+	rm -f $(MODULE)_tmp.c
+	$(LINUX)/scripts/modpost $(LINUX)/vmlinux $(MODULE)_tmp.o
+	$(COMPILE) -UKBUILD_BASENAME -DKBUILD_BASENAME=$(MODULE) -c $(MODULE)_tmp.mod.c
+	$(LD) -m $(MOD_LINK) -r -o $(MODULE).o $(MODULE)_tmp.o $(MODULE)_tmp.mod.o
+
+else
+
+$(MODULE).o: $($(MODULE)_OBJECTS)
+	$(LD) -m $(MOD_LINK) -r -o $(MODULE).o $($(MODULE)_OBJECTS)
+
+endif
+
+tags:
+	rm -f $(top_srcdir)/TAGS
+	rm -f $(top_srcdir)/tags
+	find $(top_srcdir)/../portals/ -name '*.[hc]' | xargs etags -a
+	find $(top_srcdir) -name '*.[hc]' | grep -v ".orig" | xargs etags -a
+	find $(top_srcdir)/../portals/ -name '*.[hc]' | xargs ctags -a
+	find $(top_srcdir) -name '*.[hc]' | grep -v ".orig" | xargs ctags -a
diff --git a/lustre/portals/archdep.m4 b/lustre/portals/archdep.m4
index 636ee1d..b203a95 100644
--- a/lustre/portals/archdep.m4
+++ b/lustre/portals/archdep.m4
@@ -1,55 +1,25 @@
-# -------- we can't build modules unless srcdir = builddir
-if test x$enable_modules != xno ; then
-AC_CHECK_FILE([autoMakefile.am],[],
-	[AC_MSG_ERROR([At this time, Lustre does not support building kernel modules with srcdir != buildir.])])
-fi
 
 # -------- in kernel compilation? (2.5 only) -------------
-AC_MSG_CHECKING([if inkernel build support is requested])
-AC_ARG_ENABLE([inkernel],
-	AC_HELP_STRING([--enable-inkernel],
-		       [set up 2.5 kernel makefiles]),
-	[],[enable_inkernel=no])
-AC_MSG_RESULT([$enable_inkernel])
+AC_ARG_ENABLE(inkernel, [  --enable-inkernel set up 2.5 kernel makefiles])
 AM_CONDITIONAL(INKERNEL, test x$enable_inkernel = xyes)
+echo "Makefile for in kernel build: $INKERNEL"
 
 # -------- are we building against an external portals? -------
-AC_MSG_CHECKING([if Cray portals should be used])
-AC_ARG_WITH([cray-portals],
-	AC_HELP_STRING([--with-cray-portals=path],
-		       [path to cray portals]),
-	[
-	        if test "$with_cray_portals" != no; then
-			if test -r $with_cray_portals/include/portals/api.h ; then
-				CRAY_PORTALS_INCLUDE="-I$with_cray_portals/include"
-				AC_DEFINE(CRAY_PORTALS, 1, [Building with Cray Portals])
-			else
-				AC_MSG_ERROR([--with-cray-portals specified badly])
-                        fi
-                fi
-	],[with_cray_portals=no])
-AC_MSG_RESULT([$with_cray_portals])
-
-AM_CONDITIONAL(CRAY_PORTALS, test x$with_cray_portals != xno)
-
-# -------- enable tests and utils? -------
-if test x$enable_tests = xno ; then
-	AC_MSG_NOTICE([disabling tests])
-	enable_tests=no
-fi
-if test x$enable_utils = xno ; then
-	AC_MSG_NOTICE([disabling utilities])
-	enable_utils=no
-fi
+# haha, I wonder how one is really supposed to do this
+# automake seems to have a DEFS variable which looks good
+AC_ARG_WITH(cray-portals, [  --with-cray-portals=[path] path to cray portals],
+	CRAY_PORTALS_INCLUDE="-I$with_cray_portals"
+	CC="$CC -DCRAY_PORTALS=1"
+	)
+AC_SUBST(CRAY_PORTALS_INCLUDE)
+AM_CONDITIONAL(CRAY_PORTALS, test ! "x$with_cray_portals" = x)
+
+# -------- liblustre compilation --------------
+AC_ARG_WITH(lib, [  --with-lib compile lustre library], host_cpu="lib")
 
 # -------- set linuxdir ------------
-AC_MSG_CHECKING([for Linux sources])
-AC_ARG_WITH([linux],
-	AC_HELP_STRING([--with-linux=path],
-		       [set path to Linux source (default=/usr/src/linux)]),
-	[LINUX=$with_linux],
-	[LINUX=/usr/src/linux])
-AC_MSG_RESULT([$LINUX])
+
+AC_ARG_WITH(linux, [  --with-linux=[path] set path to Linux source (default=/usr/src/linux)],LINUX=$with_linux,LINUX=/usr/src/linux)
 AC_SUBST(LINUX)
 if test x$enable_inkernel = xyes ; then
         echo ln -s `pwd` $LINUX/fs/lustre
@@ -57,196 +27,201 @@ if test x$enable_inkernel = xyes ; then
         ln -s `pwd` $LINUX/fs/lustre
 fi
 
-# -------- check for .confg --------
-AC_ARG_WITH([linux-config],
-	[AC_HELP_STRING([--with-linux-config=path],
-			[set path to Linux .conf (default=\$LINUX/.config)])],
-	[LINUX_CONFIG=$with_linux_config],
-	[LINUX_CONFIG=$LINUX/.config])
-AC_SUBST(LINUX_CONFIG)
-
-AC_CHECK_FILE([/boot/kernel.h],
-	[KERNEL_SOURCE_HEADER='/boot/kernel.h'],
-	[AC_CHECK_FILE([/var/adm/running-kernel.h]),
-		[KERNEL_SOURCE_HEADER='/var/adm/running-kernel.h']])
-
-AC_ARG_WITH([kernel-source-header],
-	AC_HELP_STRING([--with-kernel-source-header=path],
-			[Use a different kernel version header.  Consult README.kernel-source for details.]),
-	[KERNEL_SOURCE_HEADER=$with_kernel_source_header])
-
 #  --------------------
-ARCH_UM=
-UML_CFLAGS=
-if test x$enable_modules != xno ; then
-	AC_MSG_CHECKING([if you are running user mode linux for $host_cpu])
-	if test -e $LINUX/include/asm-um ; then
-		if test  X`ls -id $LINUX/include/asm/ | awk '{print $1}'` = X`ls -id $LINUX/include/asm-um | awk '{print $1}'` ; then
-			ARCH_UM='ARCH=um'
-			# see notes in Rules.in
-			UML_CFLAGS='-O0'
-			AC_MSG_RESULT(yes)
-	    	else
-			AC_MSG_RESULT([no (asm doesn't point at asm-um)])
-		fi
-	else
-		AC_MSG_RESULT([no (asm-um missing)])
-	fi
+AC_MSG_CHECKING(if you are running user mode linux for $host_cpu ...)
+if test $host_cpu = "lib" ; then 
+        host_cpu="lib"
+	AC_MSG_RESULT(no building Lustre library)
+else
+  if test -e $LINUX/include/asm-um ; then
+    if test  X`ls -id $LINUX/include/asm/ | awk '{print $1}'` = X`ls -id $LINUX/include/asm-um | awk '{print $1}'` ; then
+	host_cpu="um";
+	AC_MSG_RESULT(yes)
+    else
+	AC_MSG_RESULT(no (asm doesn't point at asm-um))
+    fi
+
+  else 
+        AC_MSG_RESULT(no (asm-um missing))
+  fi
 fi
-AC_SUBST(ARCH_UM)
-AC_SUBST(UML_CFLAGS)
+
 # --------- Linux 25 ------------------
 
-AC_CHECK_FILE([$LINUX/include/linux/namei.h],
-	[
-	        linux25="yes"
-		KMODEXT=".ko"
-	],[
-		KMODEXT=".o"
-        	linux25="no"
-	])
-AC_MSG_CHECKING([if you are using Linux 2.6])
-AC_MSG_RESULT([$linux25])
+AC_MSG_CHECKING(if you are running linux 2.5)
+if test -e $LINUX/include/linux/namei.h ; then
+        linux25="yes"
+        AC_MSG_RESULT(yes)
+else
+        linux25="no"
+        AC_MSG_RESULT(no)
+fi
 AM_CONDITIONAL(LINUX25, test x$linux25 = xyes)
-AC_SUBST(KMODEXT)
+echo "Makefiles for in linux 2.5 build: $LINUX25"
 
 # -------  Makeflags ------------------
 
-CPPFLAGS="$CRAY_PORTALS_INCLUDE $CRAY_PORTALS_COMMANDLINE -I\$(top_srcdir)/include -I\$(top_srcdir)/portals/include"
-
-# liblustre are all the same
-LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1"
-AC_SUBST(LLCPPFLAGS)
-
-LLCFLAGS="-g -Wall -fPIC"
-AC_SUBST(LLCFLAGS)
-
-# everyone builds against portals and lustre
-
-if test x$enable_ldiskfs = xyes ; then
-	AC_DEFINE(CONFIG_LDISKFS_FS_MODULE, 1, [build ldiskfs as a module])
-	AC_DEFINE(CONFIG_LDISKFS_FS_XATTR, 1, [enable extended attributes for ldiskfs])
-	AC_DEFINE(CONFIG_LDISKFS_FS_POSIX_ACL, 1, [enable posix acls])
-	AC_DEFINE(CONFIG_LDISKFS_FS_SECURITY, 1, [enable fs security])
+AC_MSG_CHECKING(setting make flags system architecture: )
+case ${host_cpu} in
+	lib )
+	AC_MSG_RESULT($host_cpu)
+	KCFLAGS='-g -Wall '
+	KCPPFLAGS='-D__arch_lib__ '
+   	libdir='${exec_prefix}/lib/lustre'
+        MOD_LINK=elf_i386
+;;
+	um )
+	AC_MSG_RESULT($host_cpu)
+	KCFLAGS='-g -Wall -pipe -Wno-trigraphs -Wstrict-prototypes -fno-strict-aliasing -fno-common '
+        case ${linux25} in
+                yes )
+                KCPPFLAGS='-D__KERNEL__ -U__i386__ -Ui386 -DUM_FASTCALL -D__arch_um__ -DSUBARCH="i386" -DNESTING=0 -D_LARGEFILE64_SOURCE  -Derrno=kernel_errno -DPATCHLEVEL=4 -DMODULE -I$(LINUX)/arch/um/include -I$(LINUX)/arch/um/kernel/tt/include -I$(LINUX)/arch/um/kernel/skas/include -O2 -nostdinc -iwithprefix include'
+        ;;
+                * )
+                KCPPFLAGS='-D__KERNEL__ -U__i386__ -Ui386 -DUM_FASTCALL -D__arch_um__ -DSUBARCH="i386" -DNESTING=0 -D_LARGEFILE64_SOURCE  -Derrno=kernel_errno -DPATCHLEVEL=4 -DMODULE -I$(LINUX)/arch/um/kernel/tt/include -I$(LINUX)/arch/um/include '
+        ;;
+        esac
+
+        MOD_LINK=elf_i386
+;;
+	i*86 )
+	AC_MSG_RESULT($host_cpu)
+        KCFLAGS='-g -O2 -Wall -Wstrict-prototypes -pipe'
+        case ${linux25} in
+                yes )
+                KCPPFLAGS='-D__KERNEL__ -DMODULE -march=i686 -I$(LINUX)/include/asm-i386/mach-default -nostdinc -iwithprefix include '
+        ;;
+                * )
+                KCPPFLAGS='-D__KERNEL__ -DMODULE '
+        ;;
+        esac
+        MOD_LINK=elf_i386
+;;
+
+	alphaev6 )
+	AC_MSG_RESULT($host_cpu)
+        KCFLAGS='-g -O2  -Wall -Wstrict-prototypes -Wno-trigraphs -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mno-fp-regs -ffixed-8 -mcpu=ev5 -Wa,-mev6'
+        KCPPFLAGS='-D__KERNEL__ -DMODULE '
+        MOD_LINK=elf64alpha
+;;
+
+	alphaev67 )
+	AC_MSG_RESULT($host_cpu)
+        KCFLAGS='-g -O2  -Wall -Wstrict-prototypes -Wno-trigraphs -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mno-fp-regs -ffixed-8 -mcpu=ev5 -Wa,-mev6'
+        KCPPFLAGS='-D__KERNEL__ -DMODULE '
+        MOD_LINK=elf64alpha
+;;
+
+	alpha* )
+	AC_MSG_RESULT($host_cpu)
+        KCFLAGS='-g -O2  -Wall -Wstrict-prototypes -Wno-trigraphs -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mno-fp-regs -ffixed-8 -mcpu=ev5 -Wa,-mev5'
+        KCPPFLAGS='-D__KERNEL__ -DMODULE '
+        MOD_LINK=elf64alpha
+;;
+
+	ia64 )
+	AC_MSG_RESULT($host_cpu)
+        KCFLAGS='-g -O2 -Wall -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -pipe -ffixed-r13 -mfixed-range=f10-f15,f32-f127 -falign-functions=32 -mb-step'
+	KCPPFLAGS='-D__KERNEL__ -DMODULE'
+        MOD_LINK=elf64_ia64
+;;
+
+	x86_64 )
+	AC_MSG_RESULT($host_cpu)
+        KCFLAGS='-g -O2 -Wall -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -fomit-frame-pointer -mno-red-zone -mcmodel=kernel -pipe -fno-reorder-blocks -finline-limit=2000 -fno-strength-reduce -fno-asynchronous-unwind-tables'
+	KCPPFLAGS='-D__KERNEL__ -DMODULE'
+        MOD_LINK=elf_x86_64
+;;
+
+	sparc64 )
+	AC_MSG_RESULT($host_cpu)
+        KCFLAGS='-O2 -Wall -Wstrict-prototypes -Wno-trigraphs -fomit-frame-pointer -fno-strict-aliasing -fno-common -Wno-unused -m64 -pipe -mno-fpu -mcpu=ultrasparc -mcmodel=medlow -ffixed-g4 -fcall-used-g5 -fcall-used-g7 -Wno-sign-compare -Wa,--undeclared-regs'
+        KCPPFLAGS='-D__KERNEL__'
+        MOD_LINK=elf64_sparc
+
+;;
+
+	powerpc )
+	AC_MSG_RESULT($host_cpu)
+        KCFLAGS='-O2 -g -Wall -Wstrict-prototypes -Wno-trigraphs -fomit-frame-pointer -fno-strict-aliasing -fno-common -D__powerpc__ -fsigned-char -msoft-float -pipe -ffixed-r2 -Wno-uninitialized -mmultiple -mstring'
+        KCPPFLAGS='-D__KERNEL__ -DMODULE'
+        MOD_LINK=elf32ppclinux
+;;
+
+        *)
+	AC_ERROR("Unknown Linux Platform: $host_cpu")
+;;
+esac
+
+# ----------- make dep run? ------------------
+
+if test $host_cpu != "lib" ; then 
+  AC_MSG_CHECKING(if make dep has been run in kernel source (host $host_cpu) )
+  if test -f $LINUX/include/linux/config.h ; then
+  AC_MSG_RESULT(yes)
+ else
+  AC_MSG_ERROR(** cannot find $LINUX/include/linux/config.h. Run make dep in $LINUX.)
+  fi
 fi
 
-EXTRA_KCFLAGS="-g $CRAY_PORTALS_INCLUDE $CRAY_PORTALS_COMMANDLINE -I$PWD/portals/include -I$PWD/include"
-
-# these are like AC_TRY_COMPILE, but try to build modules against the
-# kernel, inside the kernel-tests directory
-
-AC_DEFUN([LUSTRE_MODULE_CONFTEST],
-[cat >conftest.c <<_ACEOF
-$1
-_ACEOF
-])
-
-AC_DEFUN([LUSTRE_MODULE_COMPILE_IFELSE],
-[m4_ifvaln([$1], [LUSTRE_MODULE_CONFTEST([$1])])dnl
-rm -f kernel-tests/conftest.o kernel-tests/conftest.mod.c kernel-tests/conftest.ko
-AS_IF([AC_TRY_COMMAND(cp conftest.c kernel-tests && make [$2] -f $PWD/kernel-tests/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX EXTRA_CFLAGS="$EXTRA_KCFLAGS" $ARCH_UM SUBDIRS=$PWD/kernel-tests) >/dev/null && AC_TRY_COMMAND([$3])],
-	[$4],
-	[_AC_MSG_LOG_CONFTEST
-m4_ifvaln([$5],[$5])dnl])dnl
-rm -f kernel-tests/conftest.o kernel-tests/conftest.mod.c kernel-tests/conftest.mod.o kernel-tests/conftest.ko m4_ifval([$1], [kernel-tests/conftest.c conftest.c])[]dnl
-])
-
-AC_DEFUN([LUSTRE_MODULE_TRY_COMPILE],
-[LUSTRE_MODULE_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM([[$1]], [[$2]])],
-	[modules],
-	[test -s kernel-tests/conftest.o],
-	[$3], [$4])])
-
-AC_DEFUN([LUSTRE_MODULE_TRY_MAKE],
-[LUSTRE_MODULE_COMPILE_IFELSE([AC_LANG_PROGRAM([[$1]], [[$2]])], [$3], [$4], [$5], [$6])])
-
 # ------------ include paths ------------------
 
-if test x$enable_modules != xno ; then
-	# ------------ .config exists ----------------
-	AC_CHECK_FILE([$LINUX_CONFIG],[],
-		[AC_MSG_ERROR([Kernel config could not be found.  If you are building from a kernel-source rpm consult README.kernel-source])])
-
-	# ----------- make dep run? ------------------
-	AC_CHECK_FILES([$LINUX/include/linux/autoconf.h
-			$LINUX/include/linux/version.h
-			$LINUX/include/linux/config.h],[],
-		[AC_MSG_ERROR([Run make config in $LINUX.])])
-
-	# ------------ rhconfig.h includes runtime-generated bits --
-	# red hat kernel-source checks
-
-	# we know this exists after the check above.  if the user
-	# tarred up the tree and ran make dep etc. in it, then
-	# version.h gets overwritten with a standard linux one.
-
-	if grep rhconfig $LINUX/include/linux/version.h >/dev/null ; then
-		# This is a clean kernel-source tree, we need to
-		# enable extensive workarounds to get this to build
-		# modules
-		AC_CHECK_FILE([$KERNEL_SOURCE_HEADER],
-			[if test $KERNEL_SOURCE_HEADER = '/boot/kernel.h' ; then
-				AC_MSG_WARN([Using /boot/kernel.h from RUNNING kernel.])
-				AC_MSG_WARN([If this is not what you want, use --with-kernel-source-header.])
-				AC_MSG_WARN([Consult README.kernel-source for details.])
-			fi],
-			[AC_MSG_ERROR([$KERNEL_SOURCE_HEADER not found.  Consult README.kernel-source for details.])])
-		EXTRA_KCFLAGS="-include $KERNEL_SOURCE_HEADER $EXTRA_KCFLAGS"
-	fi
-
-	# --- check that we can build modules at all
-	AC_MSG_CHECKING([that modules can be built])
-	LUSTRE_MODULE_TRY_COMPILE([],[],
-		[
-			AC_MSG_RESULT([yes])
-		],[
-			AC_MSG_RESULT([no])
-			AC_MSG_WARN([Consult config.log for details.])
-			AC_MSG_WARN([If you are trying to build with a kernel-source rpm, consult README.kernel-source])
-			AC_MSG_ERROR([Kernel modules could not be built.])
-		])
-
-	# ------------ LINUXRELEASE and moduledir ------------------
-	AC_MSG_CHECKING([for Linux release])
-	rm -f kernel-tests/conftest.i
-	LINUXRELEASE=
-	if test $linux25 = 'yes' ; then
-		makerule="$PWD/kernel-tests"
-	else
-		makerule="_dir_$PWD/kernel-tests"
-	fi
-	LUSTRE_MODULE_TRY_MAKE(
-		[#include <linux/version.h>],
-		[LINUXRELEASE=UTS_RELEASE],
-		[$makerule LUSTRE_KERNEL_TEST=conftest.i],
-		[test -s kernel-tests/conftest.i],
-		[
-			# LINUXRELEASE="UTS_RELEASE"
-			eval $(grep LINUXRELEASE kernel-tests/conftest.i)
-		],[
-			AC_MSG_RESULT([unknown])
-			AC_MSG_ERROR([Could not preprocess test program.  Consult config.log for details.])
-		])
-	rm -f kernel-tests/conftest.i
-	if test x$LINUXRELEASE = x ; then
-		AC_MSG_RESULT([unknown])
-		AC_MSG_ERROR([Could not determine Linux release version from linux/version.h.])
-	fi
-	AC_MSG_RESULT([$LINUXRELEASE])
-	AC_SUBST(LINUXRELEASE)
-
-	moduledir='$(libdir)/modules/'$LINUXRELEASE/kernel
-	AC_SUBST(moduledir)
-
-	modulefsdir='$(moduledir)/fs/$(PACKAGE)'
-	AC_SUBST(modulefsdir)
-
-	# ------------ RELEASE --------------------------------
-	AC_MSG_CHECKING([for Lustre release])
-  	RELEASE="`echo ${LINUXRELEASE} | tr '-' '_'`_`date +%Y%m%d%H%M`"
-	AC_MSG_RESULT($RELEASE)
-	AC_SUBST(RELEASE)
+KINCFLAGS="$CRAY_PORTALS_INCLUDE $CRAY_PORTALS_COMMANDLINE \
+	-I\$(top_srcdir)/include \
+	-I\$(top_srcdir)/portals/include"
+if test $host_cpu != "lib" ; then 
+    KINCFLAGS="$KINCFLAGS -I$LINUX/include -I$LINUX/include"
+fi
+CPPFLAGS="$KINCFLAGS $ARCHCPPFLAGS"
+
+if test $host_cpu != "lib" ; then 
+# ------------ autoconf.h ------------------
+  AC_MSG_CHECKING(if autoconf.h is in kernel source)
+  if test -f $LINUX/include/linux/autoconf.h ; then
+      AC_MSG_RESULT(yes)
+  else
+      AC_MSG_ERROR(** cannot find $LINUX/include/linux/autoconf.h. Run make config in $LINUX.)
+  fi
+
+# ------------ LINUXRELEASE and moduledir ------------------
+  AC_MSG_CHECKING(for Linux release)
+  
+  dnl We need to rid ourselves of the nasty [ ] quotes.
+  changequote(, )
+  dnl Get release from version.h
+  LINUXRELEASE="`sed -ne 's/.*UTS_RELEASE[ \"]*\([0-9.a-zA-Z_-]*\).*/\1/p' $LINUX/include/linux/version.h`"
+  changequote([, ])
+  
+  moduledir='$(libdir)/modules/'$LINUXRELEASE/kernel
+  AC_SUBST(moduledir)
+  
+  modulefsdir='$(moduledir)/fs/$(PACKAGE)'
+  AC_SUBST(modulefsdir)
+  
+  AC_MSG_RESULT($LINUXRELEASE)
+  AC_SUBST(LINUXRELEASE)
+
+# ------------ RELEASE --------------------------------
+  AC_MSG_CHECKING(lustre release)
+  
+  dnl We need to rid ourselves of the nasty [ ] quotes.
+  changequote(, )
+  dnl Get release from version.h
+  RELEASE="`sed -ne 's/-/_/g' -e 's/.*UTS_RELEASE[ \"]*\([0-9.a-zA-Z_]*\).*/\1/p' $LINUX/include/linux/version.h`_`date +%Y%m%d%H%M`"
+  changequote([, ])
+
+  AC_MSG_RESULT($RELEASE)
+  AC_SUBST(RELEASE)
+
+# ---------- modversions? --------------------
+  AC_MSG_CHECKING(for MODVERSIONS)
+  if egrep -e 'MODVERSIONS.*1' $LINUX/include/linux/autoconf.h >/dev/null 2>&1;
+  then
+	if test $linux25 != "yes"; then
+                MFLAGS="-DMODULE -DMODVERSIONS -include $LINUX/include/linux/modversions.h -DEXPORT_SYMTAB"
+                AC_MSG_RESULT(yes)
+        fi
+  fi
 fi
 
 # ---------- Portals flags --------------------
@@ -259,299 +234,166 @@ fi
 #fi
 #AC_SUBST(usrprefix)
 
-AC_MSG_CHECKING([for zero-copy TCP support])
-AC_ARG_ENABLE([zerocopy],
-	AC_HELP_STRING([--disable-zerocopy],
-		       [disable socknal zerocopy]),
-	[],[enable_zerocopy='yes'])
-if test x$enable_zerocopy = xno ; then
-	AC_MSG_RESULT([no (by request)])
+AC_MSG_CHECKING(if kernel has CPU affinity support)
+SET_CPUS_ALLOW="`grep -c set_cpus_allowed $LINUX/kernel/softirq.c`"
+if test "$SET_CPUS_ALLOW" != 0 ; then
+  enable_affinity_temp="-DCPU_AFFINITY=1"
+  AC_MSG_RESULT(yes)
 else
-	ZCCD="`grep -c zccd $LINUX/include/linux/skbuff.h`"
-	if test "$ZCCD" != 0 ; then
-		AC_DEFINE(SOCKNAL_ZC, 1, [use zero-copy TCP])
-		AC_MSG_RESULT(yes)
-	else
-		AC_MSG_RESULT([no (no kernel support)])
-	fi
+  enable_affinity_temp=""
+  AC_MSG_RESULT(no)
 fi
 
-AC_MSG_CHECKING([for CPU affinity support])
-AC_ARG_ENABLE([affinity],
-	AC_HELP_STRING([--disable-affinity],
-		       [disable process/irq affinity]),
-	[],[enable_affinity='yes'])
-if test x$enable_affinity = xno ; then
-	AC_MSG_RESULT([no (by request)])
+AC_MSG_CHECKING(if kernel has zero-copy TCP support)
+ZCCD="`grep -c zccd $LINUX/include/linux/skbuff.h`"
+if test "$ZCCD" != 0 ; then
+  enable_zerocopy_temp="-DSOCKNAL_ZC=1"
+  AC_MSG_RESULT(yes)
 else
-	SET_CPUS_ALLOW="`grep -c set_cpus_allowed $LINUX/kernel/softirq.c`"
-	if test "$SET_CPUS_ALLOW" != 0 ; then
-		AC_DEFINE(CPU_AFFINITY, 1, [kernel has cpu affinity support])
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no (no kernel support)])
-	fi
+  enable_zerocopy_temp=""
+  AC_MSG_RESULT(no)
 fi
 
+AC_ARG_ENABLE(zerocopy, [  --disable-zerocopy disable socknal zerocopy],enable_zerocopy="", enable_zerocopy=$enable_zerocopy_temp)
 
+AC_ARG_ENABLE(affinity, [  --disable-affinity disable process/irq affinity],enable_affinity="", enable_affinity=$enable_affinity_temp)
 #####################################
 
-AC_MSG_CHECKING([if quadrics kernel headers are present])
+AC_MSG_CHECKING(if quadrics kernel headers are present)
 if test -d $LINUX/drivers/net/qsnet ; then
-	AC_MSG_RESULT([yes])
-	QSWNAL="qswnal"
-	AC_MSG_CHECKING([for multirail EKC])
-	if test -f $LINUX/include/elan/epcomms.h; then
-		AC_MSG_RESULT([supported])
-		QSWCPPFLAGS="-DMULTIRAIL_EKC=1"
-	else
-		AC_MSG_RESULT([not supported])
-		if test -d $LINUX/drivers/net/qsnet/include; then
-			QSWCPPFLAGS="-I$LINUX/drivers/net/qsnet/include"
-		else
-			QSWCPPFLAGS="-I$LINUX/include/linux"
-		fi
-	fi
+  AC_MSG_RESULT(yes)
+  QSWNAL="qswnal"
+  AC_MSG_CHECKING(for multirail EKC)
+  if test -f $LINUX/include/elan/epcomms.h; then
+	AC_MSG_RESULT(supported)
+	with_quadrics="-DMULTIRAIL_EKC=1"
+  else
+	AC_MSG_RESULT(not supported)
+	with_quadrics="-I$LINUX/drivers/net/qsnet/include"
+  fi
+  :
 else
-	AC_MSG_RESULT([no])
-	QSWNAL=""
-	QSWCPPFLAGS=""
+  AC_MSG_RESULT(no)
+  QSWNAL=""
+  with_quadrics=""
+  :
 fi
-AC_SUBST(QSWCPPFLAGS)
+AC_SUBST(with_quadrics)
 AC_SUBST(QSWNAL)
-AM_CONDITIONAL(BUILD_QSWNAL, test x$QSWNAL = "xqswnal")
-
-AC_MSG_CHECKING([if gm support was requested])
-AC_ARG_WITH([gm],
-	AC_HELP_STRING([--with-gm=path],
-		       [build gmnal against path]),
-	[
-		case $with_gm in 
-			yes)
-				AC_MSG_RESULT([yes])
-				GMCPPFLAGS="-I/usr/local/gm/include"
-				GMNAL="gmnal"
-				;;
-			no)
-				AC_MSG_RESULT([no])
-				GMCPPFLAGS=""
-				GMNAL=""
-				;;
-			*)
-				AC_MSG_RESULT([yes])
-				GMCPPFLAGS="-I$with_gm/include -I$with_gm/drivers -I$with_gm/drivers/linux/gm"
-				GMNAL="gmnal"
-				;;
-		esac
-	],[
-		AC_MSG_RESULT([no])
-		GMCPPFLAGS=""
-		GMNAL=""
-	])
-AC_SUBST(GMCPPFLAGS)
+
+# R. Read 5/02
+GMNAL=""
+echo "checking with-gm=" ${with_gm}
+if test "${with_gm+set}" = set; then
+  if test "${with_gm}" = yes; then
+    with_gm="-I/usr/local/gm/include"
+  else
+    with_gm="-I$with_gm/include -I$with_gm/drivers -I$with_gm/drivers/linux/gm"
+  fi
+  GMNAL="gmnal"
+else
+# default case - no GM
+  with_gm=""
+fi
+AC_SUBST(with_gm)
 AC_SUBST(GMNAL)
-AM_CONDITIONAL(BUILD_GMNAL, test x$GMNAL = "xgmnal")
+
 
 #fixme: where are the default IB includes?
 default_ib_include_dir=/usr/local/ib/include
 an_ib_include_file=vapi.h
 
-AC_MSG_CHECKING([if ib nal support was requested])
-AC_ARG_WITH([ib],
-	AC_HELP_STRING([--with-ib=yes/no/path],
-		       [Path to IB includes]),
-	[
-		case $with_ib in
-			yes)
-				AC_MSG_RESULT([yes])
-				IBCPPFLAGS="-I/usr/local/ib/include"
-				IBNAL="ibnal"
-				;;
-			no)
-				AC_MSG_RESULT([no])
-				IBCPPFLAGS=""
-				IBNAL=""
-				;;
-			*)
-				AC_MSG_RESULT([yes])
-				IBCPPFLAGS="-I$with_ib"
-				IBNAL=""
-				;;
-		esac
-	],[
-		AC_MSG_RESULT([no])
-		IBFLAGS=""
-		IBNAL=""
-	])
+AC_ARG_WITH(ib, [  --with-ib=[yes/no/path] Path to IB includes], with_ib=$withval, with_ib=$default_ib)
+AC_MSG_CHECKING(if IB headers are present)
+if test "$with_ib" = yes; then
+    with_ib=$default_ib_include_dir
+fi
+if test "$with_ib" != no -a -f ${with_ib}/${an_ib_include_file}; then
+    AC_MSG_RESULT(yes)
+    IBNAL="ibnal"
+    with_ib="-I${with_ib}"
+else
+    AC_MSG_RESULT(no)
+    IBNAL=""
+    with_ib=""
+fi
 AC_SUBST(IBNAL)
-AC_SUBST(IBCPPFLAGS)
-AM_CONDITIONAL(BUILD_IBNAL, test x$IBNAL = "xibnal")
+AC_SUBST(with_ib)
+
 
+def_scamac=/opt/scali/include
+AC_ARG_WITH(scamac, [  --with-scamac=[yes/no/path] Path to ScaMAC includes (default=/opt/scali/include)], with_scamac=$withval, with_scamac=$def_scamac)
+AC_MSG_CHECKING(if ScaMAC headers are present)
+if test "$with_scamac" = yes; then
+  with_scamac=$def_scamac
+fi
+if test "$with_scamac" != no -a -f ${with_scamac}/scamac.h; then
+  AC_MSG_RESULT(yes)
+  SCIMACNAL="scimacnal"
+  with_scamac="-I${with_scamac} -I${with_scamac}/icm"
+else
+  AC_MSG_RESULT(no)
+  SCIMACNAL=""
+  with_scamac=""
+fi
+
+AC_SUBST(with_scamac)
+AC_SUBST(SCIMACNAL)
+
+CFLAGS="$KCFLAGS"
+CPPFLAGS="$KINCFLAGS $KCPPFLAGS $MFLAGS $enable_zerocopy $enable_affinity $with_quadrics $with_gm $with_scamac $with_ib"
+
+AM_CONDITIONAL(LIBLUSTRE, test x$host_cpu = xlib)
 AC_SUBST(MOD_LINK)
 AC_SUBST(LINUX25)
+AM_CONDITIONAL(LIBLUSTRE, test x$host_cpu = xlib)
 
 # ---------- Red Hat 2.4.18 has iobuf->dovary --------------
 # But other kernels don't
 
 AC_MSG_CHECKING([if struct kiobuf has a dovary field])
-LUSTRE_MODULE_TRY_COMPILE(
-	[
-		#include <linux/iobuf.h>
-	],[
-		struct kiobuf iobuf;
-		iobuf.dovary = 1;
-	],[
-		AC_MSG_RESULT([yes])
-		AC_DEFINE(HAVE_KIOBUF_DOVARY, 1, [struct kiobuf has a dovary field])
-	],[
-		AC_MSG_RESULT([no])
-	])
-
-# ----------- 2.6.4 no longer has page->list ---------------
-AC_MSG_CHECKING([if struct page has a list field])
-LUSTRE_MODULE_TRY_COMPILE(
-	[
-		#include <linux/mm.h>
-	],[
-		struct page page;
-		&page.list;
-	],[
-		AC_MSG_RESULT([yes])
-		AC_DEFINE(HAVE_PAGE_LIST, 1, [struct page has a list field])
-	],[
-		AC_MSG_RESULT([no])
-	])
+AC_TRY_COMPILE([#define __KERNEL__
+		#include <linux/iobuf.h>],
+	       [struct kiobuf iobuf;
+		iobuf.dovary = 1;],
+	       [AC_MSG_RESULT([yes])
+                CPPFLAGS="$CPPFLAGS -DHAVE_KIOBUF_DOVARY"],
+	       [AC_MSG_RESULT([no])])
 
 # ---------- Red Hat 2.4.20 backports some 2.5 bits --------
 # This needs to run after we've defined the KCPPFLAGS
 
-AC_MSG_CHECKING([for kernel version])
-LUSTRE_MODULE_TRY_COMPILE(
-	[
-		#include <linux/sched.h>
-	],[
-		struct task_struct p;
-		p.sighand = NULL;
-	],[
-		AC_DEFINE(CONFIG_RH_2_4_20, 1, [this kernel contains Red Hat 2.4.20 patches])
-		AC_MSG_RESULT([redhat-2.4.20])
-	],[
-		AC_MSG_RESULT([$LINUXRELEASE])
-	])
+AC_MSG_CHECKING(for kernel version)
+AC_TRY_COMPILE([#define __KERNEL__
+             #include <linux/sched.h>],
+            [struct task_struct p;
+             p.sighand = NULL;],
+            [RH_2_4_20=1],
+            [RH_2_4_20=0])
+
+if test $RH_2_4_20 = 1; then
+	AC_MSG_RESULT(redhat-2.4.20)
+	CPPFLAGS="$CPPFLAGS -DCONFIG_RH_2_4_20"
+else
+	AC_MSG_RESULT($LINUXRELEASE)
+fi 
 
 # ---------- Red Hat 2.4.21 backports some more 2.5 bits --------
 
-AC_MSG_CHECKING([if kernel defines PDE])
+AC_MSG_CHECKING(if kernel defines PDE)
 HAVE_PDE="`grep -c 'proc_dir_entry..PDE' $LINUX/include/linux/proc_fs.h`"
 if test "$HAVE_PDE" != 0 ; then
-	AC_DEFINE(HAVE_PDE, 1, [the kernel defines PDE])
-	AC_MSG_RESULT([yes])
+  CPPFLAGS="$CPPFLAGS -DHAVE_PDE"
+  AC_MSG_RESULT(yes)
 else
-	AC_MSG_RESULT([no])
+  AC_MSG_RESULT(no)
 fi
 
-AC_MSG_CHECKING([if kernel passes struct file to direct_IO])
+AC_MSG_CHECKING(if kernel passes struct file to direct_IO)
 HAVE_DIO_FILE="`grep -c 'direct_IO.*struct file' $LINUX/include/linux/fs.h`"
 if test "$HAVE_DIO_FILE" != 0 ; then
-	AC_DEFINE(HAVE_DIO_FILE, 1, [the kernel passes struct file to direct_IO])
-	AC_MSG_RESULT(yes)
+  CPPFLAGS="$CPPFLAGS -DHAVE_DIO_FILE"
+  AC_MSG_RESULT(yes)
 else
-	AC_MSG_RESULT(no)
-fi
-
-if test x$enable_modules != xno ; then
-	# ---------- modules? ------------------------
-	AC_MSG_CHECKING([for module support])
-	LUSTRE_MODULE_TRY_COMPILE(
-		[
-			#include <linux/config.h>
-		],[
-			#ifndef CONFIG_MODULES
-			#error CONFIG_MODULES not #defined
-			#endif
-		],[
-			AC_MSG_RESULT([yes])
-		],[
-			AC_MSG_RESULT([no])
-			AC_MSG_ERROR([module support is required to build Lustre kernel modules.])
-		])
-
-	# ---------- modversions? --------------------
-	AC_MSG_CHECKING([for MODVERSIONS])
-	LUSTRE_MODULE_TRY_COMPILE(
-		[
-			#include <linux/config.h>
-		],[
-			#ifndef CONFIG_MODVERSIONS
-			#error CONFIG_MODVERSIONS not #defined
-			#endif
-		],[
-			AC_MSG_RESULT([yes])
-		],[
-			AC_MSG_RESULT([no])
-		])
-
-	# ------------ preempt -----------------------
-	AC_MSG_CHECKING([if preempt is enabled])
-	LUSTRE_MODULE_TRY_COMPILE(
-		[
-			#include <linux/config.h>
-		],[
-			#ifndef CONFIG_PREEMPT
-			#error CONFIG_PREEMPT is not #defined
-			#endif
-		],[
-			AC_MSG_RESULT([yes])
-			AC_MSG_ERROR([Lustre does not support kernels with preempt enabled.])
-		],[
-			AC_MSG_RESULT([no])
-		])
-
-	if test $BACKINGFS = 'ext3' ; then
-		# --- Check that ext3 and ext3 xattr are enabled in the kernel
-		AC_MSG_CHECKING([that ext3 is enabled in the kernel])
-		LUSTRE_MODULE_TRY_COMPILE(
-			[
-				#include <linux/config.h>
-			],[
-				#ifndef CONFIG_EXT3_FS
-				#ifndef CONFIG_EXT3_FS_MODULE
-				#error CONFIG_EXT3_FS not #defined
-				#endif
-				#endif
-			],[
-				AC_MSG_RESULT([yes])
-			],[
-				AC_MSG_RESULT([no])
-				AC_MSG_ERROR([Lustre requires that ext3 is enabled in the kernel (CONFIG_EXT3_FS)])
-			])
-
-		AC_MSG_CHECKING([that extended attributes for ext3 are enabled in the kernel])
-		LUSTRE_MODULE_TRY_COMPILE(
-			[
-				#include <linux/config.h>
-			],[
-				#ifndef CONFIG_EXT3_FS_XATTR
-				#error CONFIG_EXT3_FS_XATTR not #defined
-				#endif
-			],[
-				AC_MSG_RESULT([yes])
-			],[
-				AC_MSG_RESULT([no])
-				AC_MSG_WARN([Lustre requires that extended attributes for ext3 are enabled in the kernel (CONFIG_EXT3_FS_XATTR.)])
-				AC_MSG_WARN([This build may fail.])
-			])
-	fi # BACKINGFS = ext3
+  AC_MSG_RESULT(no)
 fi
-
-CPPFLAGS="-include \$(top_builddir)/include/config.h $CPPFLAGS"
-EXTRA_KCFLAGS="-include $PWD/include/config.h $EXTRA_KCFLAGS"
-AC_SUBST(EXTRA_KCFLAGS)
-
-#echo "KCPPFLAGS: $KCPPFLAGS"
-#echo "KCFLAGS: $KCFLAGS"
-#echo "LLCPPFLAGS: $LLCPPFLAGS"
-#echo "LLCFLAGS: $LLCFLAGS"
-#echo "MOD_LINK: $MOD_LINK"
-#echo "CFLAGS: $CFLAGS"
-#echo "CPPFLAGS: $CPPFLAGS"
diff --git a/lustre/portals/build.m4 b/lustre/portals/build.m4
index 93a370f..8c55b20 100644
--- a/lustre/portals/build.m4
+++ b/lustre/portals/build.m4
@@ -1,9 +1,5 @@
 # ----------  other tests and settings ---------
 
-AC_CHECK_TYPE([spinlock_t],
-	[AC_DEFINE(HAVE_SPINLOCK_T, 1, [spinlock_t is defined])],
-	[],
-	[#include <linux/spinlock.h>])
 
 # ---------  unsigned long long sane? -------
 
@@ -32,9 +28,6 @@ pkgexampledir='${prefix}/usr/lib/$(PACKAGE)/examples'
 AC_SUBST(pkgexampledir)
 pymoddir='${prefix}/usr/lib/${PACKAGE}/python/Lustre'
 AC_SUBST(pymoddir)
-# for substitution in lconf
-PYMOD_DIR="/usr/lib/$PACKAGE/python"
-AC_SUBST(PYMOD_DIR)
 modulenetdir='$(moduledir)/net/$(PACKAGE)'
 AC_SUBST(modulenetdir)
 
@@ -42,15 +35,14 @@ AC_SUBST(modulenetdir)
 # ----------  BAD gcc? ------------
 AC_PROG_RANLIB
 AC_PROG_CC
-AC_MSG_CHECKING([for buggy compiler])
+AC_MSG_CHECKING(for buggy compiler)
 CC_VERSION=`$CC -v 2>&1 | grep "^gcc version"`
 bad_cc() {
-	AC_MSG_RESULT([buggy compiler found!])
 	echo
 	echo "   '$CC_VERSION'"
 	echo "  has been known to generate bad code, "
 	echo "  please get an updated compiler."
-	AC_MSG_ERROR([sorry])
+	AC_MSG_ERROR(sorry)
 }
 TMP_VERSION=`echo $CC_VERSION | cut -c 1-16`
 if test "$TMP_VERSION" = "gcc version 2.95"; then
@@ -69,7 +61,7 @@ case "$CC_VERSION" in
 		bad_cc
 		;;
 	*)
-		AC_MSG_RESULT([no known problems])
+		AC_MSG_RESULT(no known problems)
 		;;
 esac
 # end ------  BAD gcc? ------------
@@ -78,30 +70,29 @@ esac
 
 # this doesn't seem to work on older autoconf
 # AC_CHECK_LIB(readline, readline,,)
-AC_MSG_CHECKING([for readline support])
-AC_ARG_ENABLE(readline,
-	AC_HELP_STRING([--disable-readline],
-			[do not use readline library]),
-	[],[enable_readline='yes'])
-AC_MSG_RESULT([$enable_readline]) 
-if test x$enable_readline = xyes ; then
-	LIBREADLINE="-lreadline -lncurses"
-	AC_DEFINE(HAVE_LIBREADLINE, 1, [readline library is available])
+AC_ARG_ENABLE(readline,	[  --enable-readline  use readline library],,
+			enable_readline="yes")
+ 
+if test "$enable_readline" = "yes" ; then
+   LIBREADLINE="-lreadline -lncurses"
+   HAVE_LIBREADLINE="-DHAVE_LIBREADLINE=1"
 else 
-	LIBREADLINE=""
+   LIBREADLINE=""
+   HAVE_LIBREADLINE=""
 fi
 AC_SUBST(LIBREADLINE)
+AC_SUBST(HAVE_LIBREADLINE)
 
-AC_MSG_CHECKING([if efence debugging support is requested])
-AC_ARG_ENABLE(efence,
-	AC_HELP_STRING([--enable-efence],
-			[use efence library]),
-	[],[enable_efence='no'])
-AC_MSG_RESULT([$enable_efence])
+AC_ARG_ENABLE(efence,  [  --enable-efence  use efence library],,
+			enable_efence="no")
+ 
 if test "$enable_efence" = "yes" ; then
-	LIBEFENCE="-lefence"
-	AC_DEFINE(HAVE_LIBEFENCE, 1, [libefence support is requested])
+   LIBEFENCE="-lefence"
+   HAVE_LIBEFENCE="-DHAVE_LIBEFENCE=1"
 else 
-	LIBEFENCE=""
+   LIBEFENCE=""
+   HAVE_LIBEFENCE=""
 fi
 AC_SUBST(LIBEFENCE)
+AC_SUBST(HAVE_LIBEFENCE)
+
diff --git a/lnet/klnds/autoMakefile.am b/lustre/portals/include/Makefile.am
similarity index 66%
rename from lnet/klnds/autoMakefile.am
rename to lustre/portals/include/Makefile.am
index 9d04a46..2cf7f99 100644
--- a/lnet/klnds/autoMakefile.am
+++ b/lustre/portals/include/Makefile.am
@@ -3,4 +3,6 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
-SUBDIRS = gmnal ibnal qswnal socknal
+SUBDIRS = portals linux
+EXTRA_DIST = config.h.in
+include $(top_srcdir)/Rules
diff --git a/lustre/portals/include/linux/Makefile.am b/lustre/portals/include/linux/Makefile.am
new file mode 100644
index 0000000..6a65cb5
--- /dev/null
+++ b/lustre/portals/include/linux/Makefile.am
@@ -0,0 +1,10 @@
+# Copyright (C) 2001  Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+include $(top_srcdir)/Rules
+
+linuxincludedir = $(includedir)/linux
+
+linuxinclude_HEADERS=kp30.h portals_lib.h
diff --git a/lustre/portals/include/linux/kp30.h b/lustre/portals/include/linux/kp30.h
index c55dd37..9e7e7c2 100644
--- a/lustre/portals/include/linux/kp30.h
+++ b/lustre/portals/include/linux/kp30.h
@@ -8,7 +8,7 @@
 #define PORTAL_DEBUG
 
 #ifndef offsetof
-# define offsetof(typ,memb)     ((unsigned long)((char *)&(((typ *)0)->memb)))
+# define offsetof(typ,memb)     ((int)((char *)&(((typ *)0)->memb)))
 #endif
 
 #define LOWEST_BIT_SET(x)       ((x) & ~((x) - 1))
@@ -301,7 +301,6 @@ extern void kportal_blockallsigs (void);
 #endif
 # include <unistd.h>
 # include <time.h>
-# include <limits.h>
 # include <asm/types.h>
 # ifndef DEBUG_SUBSYSTEM
 #  define DEBUG_SUBSYSTEM S_UNDEFINED
@@ -310,12 +309,7 @@ extern void kportal_blockallsigs (void);
 #  undef NDEBUG
 #  include <assert.h>
 #  define LASSERT(e)     assert(e)
-#  define LASSERTF(cond, args...)                                              \
-do {                                                                           \
-          if (!(cond))                                                         \
-                CERROR(args);                                                  \
-          assert(cond);                                                        \
-} while (0)
+#  define LASSERTF(cond, args...)     assert(cond)
 # else
 #  define LASSERT(e)
 #  define LASSERTF(cond, args...) do { } while (0)
@@ -323,7 +317,6 @@ do {                                                                           \
 # define printk(format, args...) printf (format, ## args)
 # define PORTAL_ALLOC(ptr, size) do { (ptr) = malloc(size); } while (0);
 # define PORTAL_FREE(a, b) do { free(a); } while (0);
-void portals_debug_dumplog(void);
 # define portals_debug_msg(subsys, mask, file, fn, line, stack, format, a...) \
     printf("%02x:%06x (@%lu %s:%s,l. %d %d %lu): " format,                    \
            (subsys), (mask), (long)time(0), file, fn, line,                   \
@@ -440,6 +433,40 @@ struct portals_device_userstate
  * USER LEVEL STUFF BELOW
  */
 
+#define PORTALS_CFG_VERSION 0x00010001;
+
+struct portals_cfg {
+        __u32 pcfg_version;
+        __u32 pcfg_command;
+
+        __u32 pcfg_nal;
+        __u32 pcfg_flags;
+
+        __u32 pcfg_gw_nal;
+        __u64 pcfg_nid;
+        __u64 pcfg_nid2;
+        __u64 pcfg_nid3;
+        __u32 pcfg_id;
+        __u32 pcfg_misc;
+        __u32 pcfg_fd;
+        __u32 pcfg_count;
+        __u32 pcfg_size;
+        __u32 pcfg_wait;
+
+        __u32 pcfg_plen1; /* buffers in userspace */
+        char *pcfg_pbuf1;
+        __u32 pcfg_plen2; /* buffers in userspace */
+        char *pcfg_pbuf2;
+};
+
+#define PCFG_INIT(pcfg, cmd)                            \
+do {                                                    \
+        memset(&pcfg, 0, sizeof(pcfg));                 \
+        pcfg.pcfg_version = PORTALS_CFG_VERSION;        \
+        pcfg.pcfg_command = (cmd);                      \
+                                                        \
+} while (0)
+
 #define PORTAL_IOCTL_VERSION 0x00010007
 #define PING_SYNC       0
 #define PING_ASYNC      1
@@ -645,13 +672,21 @@ enum {
         GMNAL     = 3,
         /*          4 unused */
         TCPNAL    = 5,
-        ROUTER    = 6,
-        IBNAL     = 7,
-        CRAY_KB_ERNAL = 8,
+        SCIMACNAL = 6,
+        ROUTER    = 7,
+        IBNAL     = 8,
         NAL_ENUM_END_MARKER
 };
 
-#define PTL_NALFMT_SIZE               26 /* %u:%u.%u.%u.%u (10+4+4+4+3+1) */
+#ifdef __KERNEL__
+extern ptl_handle_ni_t  kqswnal_ni;
+extern ptl_handle_ni_t  ksocknal_ni;
+extern ptl_handle_ni_t  kgmnal_ni;
+extern ptl_handle_ni_t  kibnal_ni;
+extern ptl_handle_ni_t  kscimacnal_ni;
+#endif
+
+#define PTL_NALFMT_SIZE         16
 
 #define NAL_MAX_NR (NAL_ENUM_END_MARKER - 1)
 
@@ -676,6 +711,10 @@ enum {
         DEBUG_DAEMON_CONTINUE    =  4,
 };
 
+/* module.c */
+typedef int (*nal_cmd_handler_t)(struct portals_cfg *, void * private);
+int kportal_nal_register(int nal, nal_cmd_handler_t handler, void * private);
+int kportal_nal_unregister(int nal);
 
 enum cfg_record_type {
         PORTALS_CFG_TYPE = 1,
@@ -683,6 +722,10 @@ enum cfg_record_type {
 };
 
 typedef int (*cfg_record_cb_t)(enum cfg_record_type, int len, void *data);
+int kportal_nal_cmd(struct portals_cfg *);
+
+ptl_handle_ni_t *kportal_get_ni (int nal);
+void kportal_put_ni (int nal);
 
 #ifdef __CYGWIN__
 # ifndef BITS_PER_LONG
@@ -694,16 +737,6 @@ typedef int (*cfg_record_cb_t)(enum cfg_record_type, int len, void *data);
 # endif
 #endif
 
-#if BITS_PER_LONG > 32
-# define LI_POISON ((int)0x5a5a5a5a5a5a5a5a)
-# define LL_POISON ((long)0x5a5a5a5a5a5a5a5a)
-# define LP_POISON ((void *)(long)0x5a5a5a5a5a5a5a5a)
-#else
-# define LI_POISON ((int)0x5a5a5a5a)
-# define LL_POISON ((long)0x5a5a5a5a)
-# define LP_POISON ((void *)(long)0x5a5a5a5a)
-#endif
-
 #if defined(__x86_64__)
 # define LPU64 "%Lu"
 # define LPD64 "%Ld"
diff --git a/lustre/portals/include/linux/kpr.h b/lustre/portals/include/linux/kpr.h
index 51d2d2f..45b58fe 100644
--- a/lustre/portals/include/linux/kpr.h
+++ b/lustre/portals/include/linux/kpr.h
@@ -81,6 +81,21 @@ typedef struct {
         void                    *kpr_arg;
 } kpr_router_t;
 
+/* Router's control interface (Kernel Portals Routing Control Interface) */
+typedef const struct {
+        int     (*kprci_add_route)(int gateway_nal, ptl_nid_t gateway_nid,
+                                   ptl_nid_t lo_nid, ptl_nid_t hi_nid);
+        int     (*kprci_del_route)(int gateway_nal, ptl_nid_t gateway_nid,
+                                   ptl_nid_t lo_nid, ptl_nid_t hi_nid);
+        int     (*kprci_get_route)(int index, int *gateway_nal,
+                                   ptl_nid_t *gateway,
+                                   ptl_nid_t *lo_nid, ptl_nid_t *hi_nid,
+                                   int *alive);
+        int     (*kprci_notify)(int gateway_nal, ptl_nid_t gateway_nid,
+                                int alive, time_t when);
+} kpr_control_interface_t;
+
+extern kpr_control_interface_t  kpr_control_interface;
 extern kpr_router_interface_t   kpr_router_interface;
 
 static inline int
diff --git a/lustre/portals/include/linux/libcfs.h b/lustre/portals/include/linux/libcfs.h
index 1d27768..3ebf935 100644
--- a/lustre/portals/include/linux/libcfs.h
+++ b/lustre/portals/include/linux/libcfs.h
@@ -6,43 +6,8 @@
 
 #define PORTAL_DEBUG
 
-/* I think this beast is just trying to get cycles_t and get_cycles().
- * this should be in its own header. */
-#ifdef __linux__
-# include <asm/types.h>
-# if defined(__powerpc__) && !defined(__KERNEL__)
-#  define __KERNEL__
-#  include <asm/timex.h>
-#  undef __KERNEL__
-# else
-#  if defined(__KERNEL__)
-#   include <asm/timex.h>
-#  else
-#   include <sys/time.h>
-#   define cycles_t unsigned long
-static inline cycles_t get_cycles(void) 
-{
-        struct timeval tv;
-        gettimeofday(&tv, NULL);
-        return (tv.tv_sec * 100000) + tv.tv_usec;
-}
-#  endif
-# endif
-#else
-# include <sys/types.h>
-typedef u_int32_t __u32;
-typedef u_int64_t __u64;
-#endif
-
-#ifdef __KERNEL__
-# include <linux/time.h>
-#else
-# include <sys/time.h>
-# define do_gettimeofday(tv) gettimeofday(tv, NULL);
-#endif
-
 #ifndef offsetof
-# define offsetof(typ,memb)     ((unsigned long)((char *)&(((typ *)0)->memb)))
+# define offsetof(typ,memb)     ((int)((char *)&(((typ *)0)->memb)))
 #endif
 
 #define LOWEST_BIT_SET(x)       ((x) & ~((x) - 1))
@@ -79,7 +44,7 @@ extern unsigned int portal_cerror;
 #define S_PTLROUTER   0x00100000
 #define S_COBD        0x00200000
 #define S_IBNAL       0x00400000
-#define S_SM          0x00800000
+#define S_LMV         0x00800000
 
 /* If you change these values, please keep portals/utils/debug.c
  * up to date! */
@@ -200,45 +165,6 @@ do {                                                                    \
 #define EXIT                            do { } while (0)
 #endif
 
-#define PORTALS_CFG_VERSION 0x00010001;
-
-struct portals_cfg {
-        __u32 pcfg_version;
-        __u32 pcfg_command;
-
-        __u32 pcfg_nal;
-        __u32 pcfg_flags;
-
-        __u32 pcfg_gw_nal;
-        __u64 pcfg_nid;
-        __u64 pcfg_nid2;
-        __u64 pcfg_nid3;
-        __u32 pcfg_id;
-        __u32 pcfg_misc;
-        __u32 pcfg_fd;
-        __u32 pcfg_count;
-        __u32 pcfg_size;
-        __u32 pcfg_wait;
-
-        __u32 pcfg_plen1; /* buffers in userspace */
-        char *pcfg_pbuf1;
-        __u32 pcfg_plen2; /* buffers in userspace */
-        char *pcfg_pbuf2;
-};
-
-#define PCFG_INIT(pcfg, cmd)                            \
-do {                                                    \
-        memset(&pcfg, 0, sizeof(pcfg));                 \
-        pcfg.pcfg_version = PORTALS_CFG_VERSION;        \
-        pcfg.pcfg_command = (cmd);                      \
-                                                        \
-} while (0)
-
-typedef int (nal_cmd_handler_fn)(struct portals_cfg *, void *);
-int libcfs_nal_cmd_register(int nal, nal_cmd_handler_fn *handler, void *arg);
-int libcfs_nal_cmd(struct portals_cfg *pcfg);
-void libcfs_nal_cmd_unregister(int nal);
-
 struct portal_ioctl_data {
         __u32 ioc_len;
         __u32 ioc_version;
@@ -271,7 +197,6 @@ struct portal_ioctl_data {
         char ioc_bulk[0];
 };
 
-
 #ifdef __KERNEL__
 
 #include <linux/list.h>
diff --git a/lustre/portals/include/linux/portals_compat25.h b/lustre/portals/include/linux/portals_compat25.h
index 9ab4020..43618589 100644
--- a/lustre/portals/include/linux/portals_compat25.h
+++ b/lustre/portals/include/linux/portals_compat25.h
@@ -40,9 +40,6 @@
 # define RECALC_SIGPENDING         recalc_sigpending()
 # define CURRENT_SECONDS           CURRENT_TIME
 
-# define kernel_text_address(addr) is_kernel_text_address(addr)
-extern int is_kernel_text_address(unsigned long addr);
-
 #else /* 2.4.x */
 
 # define SIGNAL_MASK_LOCK(task, flags)                                  \
@@ -54,30 +51,17 @@ extern int is_kernel_text_address(unsigned long addr);
 # define RECALC_SIGPENDING         recalc_sigpending(current)
 # define CURRENT_SECONDS           CURRENT_TIME
 
-# define kernel_text_address(addr) is_kernel_text_address(addr)
-extern int is_kernel_text_address(unsigned long addr);
-
 #endif
 
 #if defined(__arch_um__) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,20))
-# define THREAD_NAME(comm, len, fmt, a...)                              \
-        snprintf(comm, len, fmt "|%d", ## a, current->thread.extern_pid)
+# define THREAD_NAME(comm, fmt, a...)                                   \
+        sprintf(comm, fmt "|%d", ## a, current->thread.extern_pid)
 #elif defined(__arch_um__) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-# define THREAD_NAME(comm, len, fmt, a...)                              \
-        snprintf(comm, len,fmt"|%d", ## a,current->thread.mode.tt.extern_pid)
-#else
-# define THREAD_NAME(comm, len, fmt, a...)                              \
-        snprintf(comm, len, fmt, ## a)
-#endif
-
-#ifdef HAVE_PAGE_LIST
-/* 2.4 alloc_page users can use page->list */
-#define PAGE_LIST_ENTRY list
-#define PAGE_LIST(page) ((page)->list)
+# define THREAD_NAME(comm, fmt, a...)                                   \
+        sprintf(comm, fmt "|%d", ## a, current->thread.mode.tt.extern_pid)
 #else
-/* 2.6 alloc_page users can use page->lru */
-#define PAGE_LIST_ENTRY lru
-#define PAGE_LIST(page) ((page)->lru)
+# define THREAD_NAME(comm, fmt, a...)                                   \
+        sprintf(comm, fmt, ## a)
 #endif
 
 #endif /* _PORTALS_COMPAT_H */
diff --git a/lustre/portals/include/portals/Makefile.am b/lustre/portals/include/portals/Makefile.am
new file mode 100644
index 0000000..c61b084
--- /dev/null
+++ b/lustre/portals/include/portals/Makefile.am
@@ -0,0 +1,10 @@
+# Copyright (C) 2001  Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+SUBDIRS = base
+include $(top_srcdir)/Rules
+
+pkginclude_HEADERS=api-support.h api.h arg-blocks.h defines.h errno.h internal.h lib-dispatch.h lib-nal.h lib-p30.h lib-types.h myrnal.h nal.h p30.h ppid.h ptlctl.h stringtab.h types.h nalids.h list.h bridge.h ipmap.h procbridge.h lltrace.h
+
diff --git a/lustre/portals/include/portals/api-support.h b/lustre/portals/include/portals/api-support.h
index cfae78c..db83ae7 100644
--- a/lustre/portals/include/portals/api-support.h
+++ b/lustre/portals/include/portals/api-support.h
@@ -1,3 +1,5 @@
+# define DEBUG_SUBSYSTEM S_PORTALS
+# define PORTAL_DEBUG
 
 #include "build_check.h"
 
diff --git a/lustre/portals/include/portals/api.h b/lustre/portals/include/portals/api.h
index 6d382bb..69fa339 100644
--- a/lustre/portals/include/portals/api.h
+++ b/lustre/portals/include/portals/api.h
@@ -9,9 +9,9 @@
 int PtlInit(int *);
 void PtlFini(void);
 
-int PtlNIInit(ptl_interface_t interface, ptl_pid_t requested_pid,
-	      ptl_ni_limits_t *desired_limits, ptl_ni_limits_t *actual_limits,
-              ptl_handle_ni_t *interface_out);
+int PtlNIInit(ptl_interface_t interface, ptl_pt_index_t ptl_size_in,
+              ptl_ac_index_t acl_size_in, ptl_pid_t requested_pid,
+              ptl_handle_ni_t * interface_out);
 
 int PtlNIInitialized(ptl_interface_t);
 
@@ -37,6 +37,17 @@ int PtlNIHandle(ptl_handle_any_t handle_in, ptl_handle_ni_t * interface_out);
 #endif
 
 
+/*
+ * PtlNIDebug: 
+ *
+ * This is not an official Portals 3 API call.  It is provided
+ * by the reference implementation to allow the maintainers an
+ * easy way to turn on and off debugging information in the
+ * library.  Do not use it in code that is not intended for use
+ * with any version other than the portable reference library.
+ */
+unsigned int PtlNIDebug(ptl_handle_ni_t ni, unsigned int mask_in);
+
 /* 
  * PtlNIFailNid
  *
@@ -112,8 +123,8 @@ int PtlMDUpdate_internal(ptl_handle_md_t md_in, ptl_md_t * old_inout,
 
 /* These should be called by users */
 int PtlEQAlloc(ptl_handle_ni_t ni_in, ptl_size_t count_in,
-               ptl_eq_handler_t handler,
-               ptl_handle_eq_t *handle_out);
+               int (*callback) (ptl_event_t * event),
+               ptl_handle_eq_t * handle_out);
 int PtlEQFree(ptl_handle_eq_t eventq_in);
 
 int PtlEQCount(ptl_handle_eq_t eventq_in, ptl_size_t * count_out);
diff --git a/lustre/portals/include/portals/arg-blocks.h b/lustre/portals/include/portals/arg-blocks.h
index 21e30d5..0be8a3d 100644
--- a/lustre/portals/include/portals/arg-blocks.h
+++ b/lustre/portals/include/portals/arg-blocks.h
@@ -18,7 +18,7 @@
 #define PTL_GETID     1
 #define PTL_NISTATUS  2
 #define PTL_NIDIST    3
-// #define PTL_NIDEBUG   4
+#define PTL_NIDEBUG   4
 #define PTL_MEATTACH  5
 #define PTL_MEINSERT  6
 // #define PTL_MEPREPEND 7
@@ -205,7 +205,7 @@ typedef struct PtlEQAlloc_in {
         ptl_size_t count_in;
         void *base_in;
         int len_in;
-        ptl_eq_handler_t callback_in;
+        int (*callback_in) (ptl_event_t * event);
 } PtlEQAlloc_in;
 
 typedef struct PtlEQAlloc_out {
diff --git a/lustre/portals/include/portals/errno.h b/lustre/portals/include/portals/errno.h
index a98bfd9..499f32b 100644
--- a/lustre/portals/include/portals/errno.h
+++ b/lustre/portals/include/portals/errno.h
@@ -37,11 +37,12 @@ typedef enum {
         PTL_MD_NO_UPDATE	= 18,
         PTL_FAIL		= 19,
 
-        PTL_IOV_INVALID 	= 20,
+        PTL_IOV_TOO_MANY	= 20,
+        PTL_IOV_TOO_SMALL	= 21,
 
-	PTL_EQ_IN_USE		= 21,
+	PTL_EQ_IN_USE		= 22,
 
-        PTL_MAX_ERRNO		= 22
+        PTL_MAX_ERRNO		= 23
 } ptl_err_t;
 /* If you change these, you must update the string table in api-errno.c */
 
diff --git a/lustre/portals/include/portals/lib-dispatch.h b/lustre/portals/include/portals/lib-dispatch.h
index 610c776..90ed4f5 100644
--- a/lustre/portals/include/portals/lib-dispatch.h
+++ b/lustre/portals/include/portals/lib-dispatch.h
@@ -18,6 +18,7 @@
 extern int do_PtlGetId(nal_cb_t * nal, void *private, void *args, void *ret);
 extern int do_PtlNIStatus(nal_cb_t * nal, void *private, void *args, void *ret);
 extern int do_PtlNIDist(nal_cb_t * nal, void *private, void *args, void *ret);
+extern int do_PtlNIDebug(nal_cb_t * nal, void *private, void *args, void *ret);
 extern int do_PtlMEAttach(nal_cb_t * nal, void *private, void *args, void *ret);
 extern int do_PtlMEInsert(nal_cb_t * nal, void *private, void *args, void *ret);
 extern int do_PtlMEPrepend(nal_cb_t * nal, void *private, void *args,
diff --git a/lustre/portals/include/portals/lib-p30.h b/lustre/portals/include/portals/lib-p30.h
index efa929c..350447e 100644
--- a/lustre/portals/include/portals/lib-p30.h
+++ b/lustre/portals/include/portals/lib-p30.h
@@ -194,11 +194,11 @@ lib_md_alloc (nal_cb_t *nal, ptl_md_t *umd)
         int       niov;
 
         if ((umd->options & PTL_MD_KIOV) != 0) {
-                niov = umd->length;
+                niov = umd->niov;
                 size = offsetof(lib_md_t, md_iov.kiov[niov]);
         } else {
                 niov = ((umd->options & PTL_MD_IOVEC) != 0) ?
-                       umd->length : 1;
+                       umd->niov : 1;
                 size = offsetof(lib_md_t, md_iov.iov[niov]);
         }
 
@@ -346,9 +346,8 @@ ptl_handle2me (ptl_handle_me_t *handle, nal_cb_t *nal)
         return (lh_entry (lh, lib_me_t, me_lh));
 }
 
-extern int lib_init(nal_cb_t *cb, ptl_process_id_t pid,
-                    ptl_ni_limits_t *desired_limits, 
-                    ptl_ni_limits_t *actual_limits);
+extern int lib_init(nal_cb_t * cb, ptl_nid_t nid, ptl_pid_t pid, int gsize,
+                    ptl_pt_index_t tbl_size, ptl_ac_index_t ac_size);
 extern int lib_fini(nal_cb_t * cb);
 extern void lib_dispatch(nal_cb_t * cb, void *private, int index,
                          void *arg_block, void *ret_block);
diff --git a/lustre/portals/include/portals/lib-types.h b/lustre/portals/include/portals/lib-types.h
index ef618c7..40776a6 100644
--- a/lustre/portals/include/portals/lib-types.h
+++ b/lustre/portals/include/portals/lib-types.h
@@ -169,7 +169,7 @@ struct lib_eq_t {
         ptl_size_t        size;
         ptl_event_t      *base;
         int               eq_refcount;
-        ptl_eq_handler_t  event_callback;
+        int (*event_callback) (ptl_event_t * event);
         void             *eq_addrkey;
 };
 
@@ -245,11 +245,15 @@ typedef struct {
  * extracted by masking with (PTL_COOKIE_TYPES - 1) */
 
 typedef struct {
+        int up;
+        int refcnt;
         ptl_nid_t nid;
         ptl_pid_t pid;
+        int num_nodes;
+        unsigned int debug;
         lib_ptl_t tbl;
+        lib_ac_t ac;
         lib_counters_t counters;
-        ptl_ni_limits_t actual_limits;
 
         int               ni_lh_hash_size;      /* size of lib handle hash table */
         struct list_head *ni_lh_hash_table;     /* all extant lib handles, this interface */
diff --git a/lustre/portals/include/portals/nal.h b/lustre/portals/include/portals/nal.h
index 1f925c1..5b72046 100644
--- a/lustre/portals/include/portals/nal.h
+++ b/lustre/portals/include/portals/nal.h
@@ -18,29 +18,32 @@
 typedef struct nal_t nal_t;
 
 struct nal_t {
-	int              nal_refct;
-	void            *nal_data;
+	ptl_ni_t ni;
+	int refct;
+	void *nal_data;
+	int *timeout;		/* for libp30api users */
+	int (*forward) (nal_t * nal, int index,	/* Function ID */
+			void *args, size_t arg_len, void *ret, size_t ret_len);
 
-	int (*startup) (nal_t *nal, ptl_pid_t requested_pid,
-			ptl_ni_limits_t *req, ptl_ni_limits_t *actual);
-	
-	void (*shutdown) (nal_t *nal);
+	int (*shutdown) (nal_t * nal, int interface);
 
-	int (*forward) (nal_t *nal, int index,	/* Function ID */
-			void *args, size_t arg_len, void *ret, size_t ret_len);
+	int (*validate) (nal_t * nal, void *base, size_t extent);
 
-	int (*yield) (nal_t *nal, unsigned long *flags, int milliseconds);
+	int (*yield) (nal_t * nal, unsigned long *flags, int milliseconds);
 
-	void (*lock) (nal_t *nal, unsigned long *flags);
+	void (*lock) (nal_t * nal, unsigned long *flags);
 
-	void (*unlock) (nal_t *nal, unsigned long *flags);
+	void (*unlock) (nal_t * nal, unsigned long *flags);
 };
 
+typedef nal_t *(ptl_interface_t) (int, ptl_pt_index_t, ptl_ac_index_t, ptl_pid_t requested_pid);
+extern nal_t *PTL_IFACE_IP(int, ptl_pt_index_t, ptl_ac_index_t, ptl_pid_t requested_pid);
+extern nal_t *PTL_IFACE_MYR(int, ptl_pt_index_t, ptl_ac_index_t, ptl_pid_t requested_pid);
+
 extern nal_t *ptl_hndl2nal(ptl_handle_any_t * any);
 
-#ifdef __KERNEL__
-extern int ptl_register_nal(ptl_interface_t interface, nal_t *nal);
-extern void ptl_unregister_nal(ptl_interface_t interface);
+#ifndef PTL_IFACE_DEFAULT
+#define PTL_IFACE_DEFAULT (PTL_IFACE_IP)
 #endif
 
 #endif
diff --git a/lustre/portals/include/portals/nalids.h b/lustre/portals/include/portals/nalids.h
index 55a991b..1568593 100644
--- a/lustre/portals/include/portals/nalids.h
+++ b/lustre/portals/include/portals/nalids.h
@@ -1,2 +1,6 @@
 #include "build_check.h"
 
+#define PTL_IFACE_TCP 1
+#define PTL_IFACE_ER 2
+#define PTL_IFACE_SS 3
+#define PTL_IFACE_MAX 4
diff --git a/lustre/portals/include/portals/p30.h b/lustre/portals/include/portals/p30.h
index 4b8631d..577ffab 100644
--- a/lustre/portals/include/portals/p30.h
+++ b/lustre/portals/include/portals/p30.h
@@ -21,6 +21,45 @@
 #endif
 
 #include <portals/types.h>
+#include <portals/nal.h>
 #include <portals/api.h>
+#include <portals/nalids.h>
+
+/*
+ * Debugging flags reserved for the Portals reference library.
+ * These are not part of the API as described in the SAND report
+ * but are for the use of the maintainers of the reference implementation.
+ *
+ * It is not expected that the real implementations will export
+ * this functionality.
+ */
+#define PTL_DEBUG_NONE          0ul
+#define PTL_DEBUG_ALL           (0x0FFFul)	/* Only the Portals flags */
+
+#define __bit(x)                ((unsigned long) 1<<(x))
+#define PTL_DEBUG_PUT           __bit(0)
+#define PTL_DEBUG_GET           __bit(1)
+#define PTL_DEBUG_REPLY         __bit(2)
+#define PTL_DEBUG_ACK           __bit(3)
+#define PTL_DEBUG_DROP          __bit(4)
+#define PTL_DEBUG_REQUEST       __bit(5)
+#define PTL_DEBUG_DELIVERY      __bit(6)
+#define PTL_DEBUG_UNLINK        __bit(7)
+#define PTL_DEBUG_THRESHOLD     __bit(8)
+#define PTL_DEBUG_API           __bit(9)
+
+/*
+ * These eight are reserved for the NAL to define
+ * It should probably give them better names...
+ */
+#define PTL_DEBUG_NI_ALL        (0xF000ul)	/* Only the NAL flags */
+#define PTL_DEBUG_NI0           __bit(24)
+#define PTL_DEBUG_NI1           __bit(25)
+#define PTL_DEBUG_NI2           __bit(26)
+#define PTL_DEBUG_NI3           __bit(27)
+#define PTL_DEBUG_NI4           __bit(28)
+#define PTL_DEBUG_NI5           __bit(29)
+#define PTL_DEBUG_NI6           __bit(30)
+#define PTL_DEBUG_NI7           __bit(31)
 
 #endif
diff --git a/lustre/portals/include/portals/ptlctl.h b/lustre/portals/include/portals/ptlctl.h
index 2af336e..12ef47a 100644
--- a/lustre/portals/include/portals/ptlctl.h
+++ b/lustre/portals/include/portals/ptlctl.h
@@ -23,10 +23,6 @@
 #ifndef _PTLCTL_H_
 #define _PTLCTL_H_
 
-#include <portals/types.h>
-#include <linux/kp30.h>
-#include <linux/libcfs.h>
-
 #define PORTALS_DEV_ID 0
 #define PORTALS_DEV_PATH "/dev/portals"
 #define OBD_DEV_ID 1
@@ -80,15 +76,13 @@ int jt_dbg_panic(int argc, char **argv);
 int ptl_set_cfg_record_cb(cfg_record_cb_t cb);
 
 /* l_ioctl.c */
-typedef int (ioc_handler_t)(int dev_id, unsigned int opc, void *buf);
+typedef int (ioc_handler_t)(int dev_id, int opc, void *buf);
 void set_ioc_handler(ioc_handler_t *handler);
 int register_ioc_dev(int dev_id, const char * dev_name);
 void unregister_ioc_dev(int dev_id);
 int set_ioctl_dump(char * file);
-int l_ioctl(int dev_id, unsigned int opc, void *buf);
-int parse_dump(char * dump_file, ioc_handler_t ioc_func);
+int l_ioctl(int dev_id, int opc, void *buf);
+int parse_dump(char * dump_file, int (*ioc_func)(int dev_id, int opc, void *));
 int jt_ioc_dump(int argc, char **argv);
-extern char *dump_filename;
-int dump(int dev_id, unsigned int opc, void *buf);
 
 #endif
diff --git a/lustre/portals/include/portals/types.h b/lustre/portals/include/portals/types.h
index ef2712b..902db76 100644
--- a/lustre/portals/include/portals/types.h
+++ b/lustre/portals/include/portals/types.h
@@ -3,7 +3,28 @@
 
 #include "build_check.h"
 
-#include <linux/libcfs.h>
+#ifdef __linux__
+# include <asm/types.h>
+# if defined(__powerpc__) && !defined(__KERNEL__)
+#  define __KERNEL__
+#  include <asm/timex.h>
+#  undef __KERNEL__
+# else
+#  include <asm/timex.h>
+# endif
+#else
+# include <sys/types.h>
+typedef u_int32_t __u32;
+typedef u_int64_t __u64;
+#endif
+
+#ifdef __KERNEL__
+# include <linux/time.h>
+#else
+# include <sys/time.h>
+# define do_gettimeofday(tv) gettimeofday(tv, NULL);
+#endif
+
 #include <portals/errno.h>
 
 /* This implementation uses the same type for API function return codes and
@@ -20,6 +41,7 @@ typedef __u64 ptl_hdr_data_t;
 typedef __u32 ptl_size_t;
 
 #define PTL_TIME_FOREVER    (-1)
+#define PTL_EQ_HANDLER_NONE NULL
 
 typedef struct {
         unsigned long nal_idx;			/* which network interface */
@@ -59,6 +81,12 @@ typedef enum {
 } ptl_ins_pos_t;
 
 typedef struct {
+	struct page     *kiov_page;
+	unsigned int     kiov_len;
+	unsigned int     kiov_offset;
+} ptl_kiov_t;
+
+typedef struct {
         void            *start;
         ptl_size_t       length;
         int              threshold;
@@ -66,6 +94,7 @@ typedef struct {
         unsigned int     options;
         void            *user_ptr;
         ptl_handle_eq_t  eventq;
+	unsigned int     niov;
 } ptl_md_t;
 
 /* Options for the MD structure */
@@ -83,19 +112,9 @@ typedef struct {
 
 /* For compatibility with Cray Portals */
 #define PTL_MD_LUSTRE_COMPLETION_SEMANTICS  0
-#define PTL_MD_PHYS                         0
 
 #define PTL_MD_THRESH_INF       (-1)
 
-/* NB lustre portals uses struct iovec internally! */
-typedef struct iovec ptl_md_iovec_t;
-
-typedef struct {
-	struct page     *kiov_page;
-	unsigned int     kiov_len;
-	unsigned int     kiov_offset;
-} ptl_kiov_t;
-
 typedef enum {
         PTL_EVENT_GET_START,
         PTL_EVENT_GET_END,
@@ -149,9 +168,6 @@ typedef enum {
         PTL_NOACK_REQ
 } ptl_ack_req_t;
 
-typedef void (*ptl_eq_handler_t)(ptl_event_t *event);
-#define PTL_EQ_HANDLER_NONE NULL
-
 typedef struct {
         volatile ptl_seq_t sequence;
         ptl_size_t size;
@@ -164,14 +180,11 @@ typedef struct {
 } ptl_ni_t;
 
 typedef struct {
-	int max_mes;
-	int max_mds;
-	int max_eqs;
-	int max_ac_index;
-	int max_pt_index;
-	int max_md_iovecs;
-	int max_me_list;
-	int max_getput_md;
+        int max_match_entries;    /* max number of match entries */
+        int max_mem_descriptors;  /* max number of memory descriptors */
+        int max_event_queues;     /* max number of event queues */
+        int max_atable_index;     /* maximum access control list table index */
+        int max_ptable_index;     /* maximum portals table index */
 } ptl_ni_limits_t;
 
 /*
@@ -189,7 +202,4 @@ typedef enum {
 
 typedef int ptl_sr_value_t;
 
-typedef int ptl_interface_t;
-#define PTL_IFACE_DEFAULT    (-1)
-
 #endif
diff --git a/lustre/portals/knals/.cvsignore b/lustre/portals/knals/.cvsignore
index f5fd0b0..89a4aa6 100644
--- a/lustre/portals/knals/.cvsignore
+++ b/lustre/portals/knals/.cvsignore
@@ -1,5 +1,3 @@
 Makefile
-autoMakefile
-autoMakefile.in
-.*.cmd
-.depend
+Makefile.in
+.*.o.cmd
diff --git a/lnet/autoMakefile.am b/lustre/portals/knals/Makefile.am
similarity index 59%
rename from lnet/autoMakefile.am
rename to lustre/portals/knals/Makefile.am
index bd57e6e..df6ee5c 100644
--- a/lnet/autoMakefile.am
+++ b/lustre/portals/knals/Makefile.am
@@ -3,6 +3,5 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
-EXTRA_DIST = archdep.m4 build.m4 include 
-
-SUBDIRS = portals libcfs knals unals router tests doc utils
+DIST_SUBDIRS= socknal qswnal gmnal scimacnal ibnal
+SUBDIRS= socknal @QSWNAL@ @GMNAL@ @SCIMACNAL@ @IBNAL@
diff --git a/lustre/portals/knals/Makefile.in b/lustre/portals/knals/Makefile.in
deleted file mode 100644
index b5ed168..0000000
--- a/lustre/portals/knals/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-@BUILD_GMNAL_TRUE@subdir-m += gmnal
-@BUILD_IBNAL_TRUE@subdir-m += ibnal
-@BUILD_QSWNAL_TRUE@subdir-m += qswnal
-subdir-m += socknal
-
-@INCLUDE_RULES@
diff --git a/lustre/portals/knals/gmnal/.cvsignore b/lustre/portals/knals/gmnal/.cvsignore
index 642e2e6..e995588 100644
--- a/lustre/portals/knals/gmnal/.cvsignore
+++ b/lustre/portals/knals/gmnal/.cvsignore
@@ -1,10 +1,3 @@
 .deps
 Makefile
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.cmd
-.*.flags
-.tmp_versions
-.depend
+Makefile.in
diff --git a/lustre/portals/knals/gmnal/Makefile.am b/lustre/portals/knals/gmnal/Makefile.am
new file mode 100644
index 0000000..bac4680
--- /dev/null
+++ b/lustre/portals/knals/gmnal/Makefile.am
@@ -0,0 +1,13 @@
+# Copyright (C) 2001  Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+include ../../Rules.linux
+
+MODULE = kgmnal
+modulenet_DATA = kgmnal.o
+EXTRA_PROGRAMS = kgmnal
+
+DEFS = -DGM_KERNEL
+kgmnal_SOURCES = gmnal.h gmnal_api.c gmnal_cb.c gmnal_comm.c gmnal_utils.c gmnal_module.c
diff --git a/lustre/portals/knals/gmnal/Makefile.in b/lustre/portals/knals/gmnal/Makefile.in
deleted file mode 100644
index 89ea361..0000000
--- a/lustre/portals/knals/gmnal/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-MODULES := kgmnal
-kgmnal-objs := gmnal_api.o gmnal_cb.o gmnal_comm.o gmnal_utils.o gmnal_module.o
-
-EXTRA_PRE_CFLAGS := @GMCPPFLAGS@
-
-@INCLUDE_RULES@
diff --git a/lustre/portals/knals/gmnal/autoMakefile.am b/lustre/portals/knals/gmnal/autoMakefile.am
deleted file mode 100644
index d8b9edb..0000000
--- a/lustre/portals/knals/gmnal/autoMakefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (C) 2001  Cluster File Systems, Inc.
-#
-# This code is issued under the GNU General Public License.
-# See the file COPYING in this distribution
-
-if MODULES
-if BUILD_GMNAL
-if !CRAY_PORTALS
-modulenet_DATA = kgmnal$(KMODEXT)
-endif
-endif
-endif
-
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-DIST_SOURCES = $(kgmnal-objs:%.o=%.c) gmnal.h
diff --git a/lustre/portals/knals/gmnal/gmnal.h b/lustre/portals/knals/gmnal/gmnal.h
index e48552e..9955599 100644
--- a/lustre/portals/knals/gmnal/gmnal.h
+++ b/lustre/portals/knals/gmnal/gmnal.h
@@ -190,6 +190,7 @@ typedef struct _gmnal_rxtwe {
 #define NRXTHREADS 10 /* max number of receiver threads */
 
 typedef struct _gmnal_data_t {
+	int		refcnt;
 	spinlock_t	cb_lock;
 	spinlock_t 	stxd_lock;
 	struct semaphore stxd_token;
@@ -308,12 +309,9 @@ extern gmnal_data_t	*global_nal_data;
 /*
  *	API NAL
  */
-int gmnal_api_startup(nal_t *, ptl_pid_t, 
-                      ptl_ni_limits_t *, ptl_ni_limits_t *);
-
 int gmnal_api_forward(nal_t *, int, void *, size_t, void *, size_t);
 
-void gmnal_api_shutdown(nal_t *);
+int gmnal_api_shutdown(nal_t *, int);
 
 int gmnal_api_validate(nal_t *, void *, size_t);
 
@@ -325,13 +323,14 @@ void gmnal_api_unlock(nal_t *, unsigned long *);
 
 
 #define GMNAL_INIT_NAL(a)	do { 	\
-                                a->startup = gmnal_api_startup; \
 				a->forward = gmnal_api_forward; \
 				a->shutdown = gmnal_api_shutdown; \
+				a->validate = NULL; \
 				a->yield = gmnal_api_yield; \
 				a->lock = gmnal_api_lock; \
 				a->unlock = gmnal_api_unlock; \
 				a->timeout = NULL; \
+				a->refct = 1; \
 				a->nal_data = NULL; \
 				} while (0)
 
@@ -374,7 +373,7 @@ void gmnal_cb_sti(nal_cb_t *, unsigned long *);
 
 int gmnal_cb_dist(nal_cb_t *, ptl_nid_t, unsigned long *);
 
-int gmnal_init(void);
+nal_t *gmnal_init(int, ptl_pt_index_t, ptl_ac_index_t, ptl_pid_t rpid);
 
 void  gmnal_fini(void);
 
diff --git a/lustre/portals/knals/gmnal/gmnal_api.c b/lustre/portals/knals/gmnal/gmnal_api.c
index 7c94f93..338d75c 100644
--- a/lustre/portals/knals/gmnal/gmnal_api.c
+++ b/lustre/portals/knals/gmnal/gmnal_api.c
@@ -123,51 +123,18 @@ gmnal_api_forward(nal_t *nal, int index, void *args, size_t arg_len,
 
 /*
  *	gmnal_api_shutdown
- *      nal_refct == 0 => called on last matching PtlNIFini()
  *	Close down this interface and free any resources associated with it
  *	nal_t	nal	our nal to shutdown
  */
-void
+int
 gmnal_api_shutdown(nal_t *nal, int interface)
 {
-	gmnal_data_t	*nal_data;
-	nal_cb_t	*nal_cb;
-
-        if (nal->nal_refct != 0)
-                return;
-        
-	CDEBUG(D_TRACE, "gmnal_api_shutdown: nal_data [%p]\n", nal_data);
-
-        LASSERT(nal == global_nal_data->nal);
-        nal_data = nal->nal_data;
-        LASSERT(nal_data == global_nal_data);
-        nal_cb = nal_data->nal_cb;
-
-        /* Stop portals calling our ioctl handler */
-        libcfs_nal_cmd_unregister(GMNAL);
 
-        /* XXX for shutdown "under fire" we probably need to set a shutdown
-         * flag so when lib calls us we fail immediately and dont queue any
-         * more work but our threads can still call into lib OK.  THEN
-         * shutdown our threads, THEN lib_fini() */
-        lib_fini(nal_cb);
+	gmnal_data_t	*nal_data = nal->nal_data;
 
-	gmnal_stop_rxthread(nal_data);
-	gmnal_stop_ctthread(nal_data);
-	gmnal_free_txd(nal_data);
-	gmnal_free_srxd(nal_data);
-	GMNAL_GM_LOCK(nal_data);
-	gm_close(nal_data->gm_port);
-	gm_finalize();
-	GMNAL_GM_UNLOCK(nal_data);
-        if (nal_data->sysctl)
-                unregister_sysctl_table (nal_data->sysctl);
-	PORTAL_FREE(nal, sizeof(nal_t));	
-	PORTAL_FREE(nal_data, sizeof(gmnal_data_t));	
-	PORTAL_FREE(nal_cb, sizeof(nal_cb_t));
+	CDEBUG(D_TRACE, "gmnal_api_shutdown: nal_data [%p]\n", nal_data);
 
-        global_nal_data = NULL;
-        PORTAL_MODULE_UNUSE;
+	return(PTL_OK);
 }
 
 
@@ -243,54 +210,57 @@ gmnal_api_unlock(nal_t *nal, unsigned long *flags)
 }
 
 
-int
-gmnal_api_startup(nal_t *nal, ptl_pid_t requested_pid,
-                  ptl_ni_limits_t *requested_limits,
-                  ptl_ni_limits_t *actual_limits)
+nal_t *
+gmnal_init(int interface, ptl_pt_index_t ptl_size, ptl_ac_index_t ac_size, 
+	    ptl_pid_t rpid)
 {
 
+	nal_t		*nal = NULL;
 	nal_cb_t	*nal_cb = NULL;
 	gmnal_data_t	*nal_data = NULL;
 	gmnal_srxd_t	*srxd = NULL;
 	gm_status_t	gm_status;
 	unsigned int	local_nid = 0, global_nid = 0;
-        ptl_process_id_t process_id;
-
-        if (nal->nal_refct != 0) {
-                if (actual_limits != NULL) {
-                        nal_data = (gmnal_data_t *)nal->nal_data;
-                        nal_cb = nal_data->nal_cb;
-                        *actual_limits = nal->_cb->ni.actual_limits;
-                return (PTL_OK);
-        }
+	ptl_nid_t	portals_nid;
+	ptl_pid_t	portals_pid = 0;
 
-        /* Called on first PtlNIInit() */
 
-	CDEBUG(D_TRACE, "startup\n");
+	CDEBUG(D_TRACE, "gmnal_init : interface [%d], ptl_size [%d], "
+	       "ac_size[%d]\n", interface, ptl_size, ac_size);
 
-        LASSERT(global_nal_data == NULL);
 
 	PORTAL_ALLOC(nal_data, sizeof(gmnal_data_t));
 	if (!nal_data) {
 		CDEBUG(D_ERROR, "can't get memory\n");
-		return(PTL_NO_SPACE);
+		return(NULL);
 	}	
 	memset(nal_data, 0, sizeof(gmnal_data_t));
 	/*
  	 *	set the small message buffer size 
 	 */
+	nal_data->refcnt = 1;
 
 	CDEBUG(D_INFO, "Allocd and reset nal_data[%p]\n", nal_data);
 	CDEBUG(D_INFO, "small_msg_size is [%d]\n", nal_data->small_msg_size);
 
+	PORTAL_ALLOC(nal, sizeof(nal_t));
+	if (!nal) {
+		PORTAL_FREE(nal_data, sizeof(gmnal_data_t));
+		return(NULL);
+	}
+	memset(nal, 0, sizeof(nal_t));
+	CDEBUG(D_INFO, "Allocd and reset nal[%p]\n", nal);
+
 	PORTAL_ALLOC(nal_cb, sizeof(nal_cb_t));
 	if (!nal_cb) {
+		PORTAL_FREE(nal, sizeof(nal_t));
 		PORTAL_FREE(nal_data, sizeof(gmnal_data_t));
-		return(PTL_NO_SPACE);
+		return(NULL);
 	}
 	memset(nal_cb, 0, sizeof(nal_cb_t));
 	CDEBUG(D_INFO, "Allocd and reset nal_cb[%p]\n", nal_cb);
 
+	GMNAL_INIT_NAL(nal);
 	GMNAL_INIT_NAL_CB(nal_cb);
 	/*
 	 *	String them all together
@@ -310,9 +280,10 @@ gmnal_api_startup(nal_t *nal, ptl_pid_t requested_pid,
 	CDEBUG(D_INFO, "Calling gm_init\n");
 	if (gm_init() != GM_SUCCESS) {
 		CDEBUG(D_ERROR, "call to gm_init failed\n");
+		PORTAL_FREE(nal, sizeof(nal_t));	
 		PORTAL_FREE(nal_data, sizeof(gmnal_data_t));	
 		PORTAL_FREE(nal_cb, sizeof(nal_cb_t));
-		return(PTL_FAIL);
+		return(NULL);
 	}
 
 
@@ -355,9 +326,10 @@ gmnal_api_startup(nal_t *nal, ptl_pid_t requested_pid,
 		GMNAL_GM_LOCK(nal_data);
 		gm_finalize();
 		GMNAL_GM_UNLOCK(nal_data);
+		PORTAL_FREE(nal, sizeof(nal_t));	
 		PORTAL_FREE(nal_data, sizeof(gmnal_data_t));	
 		PORTAL_FREE(nal_cb, sizeof(nal_cb_t));
-		return(PTL_FAIL);
+		return(NULL);
 	}
 
 	
@@ -372,9 +344,10 @@ gmnal_api_startup(nal_t *nal, ptl_pid_t requested_pid,
 		gm_close(nal_data->gm_port);
 		gm_finalize();
 		GMNAL_GM_UNLOCK(nal_data);
+		PORTAL_FREE(nal, sizeof(nal_t));	
 		PORTAL_FREE(nal_data, sizeof(gmnal_data_t));	
 		PORTAL_FREE(nal_cb, sizeof(nal_cb_t));
-		return(PTL_FAIL);
+		return(NULL);
 	}
 
 
@@ -401,9 +374,10 @@ gmnal_api_startup(nal_t *nal, ptl_pid_t requested_pid,
 		gm_close(nal_data->gm_port);
 		gm_finalize();
 		GMNAL_GM_UNLOCK(nal_data);
+		PORTAL_FREE(nal, sizeof(nal_t));	
 		PORTAL_FREE(nal_data, sizeof(gmnal_data_t));	
 		PORTAL_FREE(nal_cb, sizeof(nal_cb_t));
-		return(PTL_FAIL);
+		return(NULL);
 	}
 
 	gmnal_start_kernel_threads(nal_data);
@@ -433,9 +407,10 @@ gmnal_api_startup(nal_t *nal, ptl_pid_t requested_pid,
 		gm_close(nal_data->gm_port);
 		gm_finalize();
 		GMNAL_GM_UNLOCK(nal_data);
+		PORTAL_FREE(nal, sizeof(nal_t));	
 		PORTAL_FREE(nal_data, sizeof(gmnal_data_t));	
 		PORTAL_FREE(nal_cb, sizeof(nal_cb_t));
-		return(PTL_FAIL);
+		return(NULL);
 	}
 	nal_data->gm_local_nid = local_nid;
 	CDEBUG(D_INFO, "Local node id is [%u]\n", local_nid);
@@ -453,9 +428,10 @@ gmnal_api_startup(nal_t *nal, ptl_pid_t requested_pid,
 		gm_close(nal_data->gm_port);
 		gm_finalize();
 		GMNAL_GM_UNLOCK(nal_data);
+		PORTAL_FREE(nal, sizeof(nal_t));	
 		PORTAL_FREE(nal_data, sizeof(gmnal_data_t));	
 		PORTAL_FREE(nal_cb, sizeof(nal_cb_t));
-		return(PTL_FAIL);
+		return(NULL);
 	}
 	CDEBUG(D_INFO, "Global node id is [%u]\n", global_nid);
 	nal_data->gm_global_nid = global_nid;
@@ -464,15 +440,13 @@ gmnal_api_startup(nal_t *nal, ptl_pid_t requested_pid,
 /*
 	pid = gm_getpid();
 */
-        process_id.pid = 0;
-        process_id.nid = global_nid;
-        
-	CDEBUG(D_INFO, "portals_pid is [%u]\n", process_id.pid);
-	CDEBUG(D_INFO, "portals_nid is ["LPU64"]\n", process_id.nid);
+	CDEBUG(D_INFO, "portals_pid is [%u]\n", portals_pid);
+	portals_nid = (unsigned long)global_nid;
+	CDEBUG(D_INFO, "portals_nid is ["LPU64"]\n", portals_nid);
 	
 	CDEBUG(D_PORTALS, "calling lib_init\n");
-	if (lib_init(nal_cb, process_id, 
-                     requested_limits, actual_limits) != PTL_OK) {
+	if (lib_init(nal_cb, portals_nid, portals_pid, 1024, ptl_size, 
+		     ac_size) != PTL_OK) {
 		CDEBUG(D_ERROR, "lib_init failed\n");
 		gmnal_stop_rxthread(nal_data);
 		gmnal_stop_ctthread(nal_data);
@@ -482,68 +456,22 @@ gmnal_api_startup(nal_t *nal, ptl_pid_t requested_pid,
 		gm_close(nal_data->gm_port);
 		gm_finalize();
 		GMNAL_GM_UNLOCK(nal_data);
+		PORTAL_FREE(nal, sizeof(nal_t));	
 		PORTAL_FREE(nal_data, sizeof(gmnal_data_t));	
 		PORTAL_FREE(nal_cb, sizeof(nal_cb_t));
-		return(PTL_FAIL);
+		return(NULL);
 		
 	}
-
-	if (libcfs_nal_cmd_register(GMNAL, &gmnal_cmd, nal->nal_data) != 0) {
-		CDEBUG(D_INFO, "libcfs_nal_cmd_register failed\n");
-
-                /* XXX these cleanup cases should be restructured to
-                 * minimise duplication... */
-                lib_fini(nal_cb);
-                
-		gmnal_stop_rxthread(nal_data);
-		gmnal_stop_ctthread(nal_data);
-		gmnal_free_txd(nal_data);
-		gmnal_free_srxd(nal_data);
-		GMNAL_GM_LOCK(nal_data);
-		gm_close(nal_data->gm_port);
-		gm_finalize();
-		GMNAL_GM_UNLOCK(nal_data);
-		PORTAL_FREE(nal_data, sizeof(gmnal_data_t));	
-		PORTAL_FREE(nal_cb, sizeof(nal_cb_t));
-		return(PTL_FAIL);
-        }
-
-        /* might be better to initialise this at module load rather than in
-         * NAL startup */
         nal_data->sysctl = NULL;
         nal_data->sysctl = register_sysctl_table (gmnalnal_top_sysctl_table, 0);
 
 	
 	CDEBUG(D_INFO, "gmnal_init finished\n");
 	global_nal_data = nal->nal_data;
-
-        /* no unload now until shutdown */
-        PORTAL_MODULE_USE;
-        
-	return(PTL_OK);
+	return(nal);
 }
 
-nal_t the_gm_nal;
-
-/* 
- *        Called when module loaded
- */
-int gmnal_init(void)
-{
-        int    rc;
-
-	memset(&the_gm_nal, 0, sizeof(nal_t));
-	CDEBUG(D_INFO, "reset nal[%p]\n", &the_gm_nal);
-	GMNAL_INIT_NAL(&the_gm_nal);
 
-        rc = ptl_register_nal(GMNAL, &the_gm_nal);
-        if (rc != PTL_OK)
-                CERROR("Can't register GMNAL: %d\n", rc);
-
-        return (rc);
-}
-
-                
 
 /*
  *	Called when module removed
@@ -556,7 +484,20 @@ void gmnal_fini()
 
 	CDEBUG(D_TRACE, "gmnal_fini\n");
 
-        LASSERT(global_nal_data == NULL);
+	PtlNIFini(kgmnal_ni);
+	lib_fini(nal_cb);
 
-        ptl_unregister_nal(GMNAL);
+	gmnal_stop_rxthread(nal_data);
+	gmnal_stop_ctthread(nal_data);
+	gmnal_free_txd(nal_data);
+	gmnal_free_srxd(nal_data);
+	GMNAL_GM_LOCK(nal_data);
+	gm_close(nal_data->gm_port);
+	gm_finalize();
+	GMNAL_GM_UNLOCK(nal_data);
+        if (nal_data->sysctl)
+                unregister_sysctl_table (nal_data->sysctl);
+	PORTAL_FREE(nal, sizeof(nal_t));	
+	PORTAL_FREE(nal_data, sizeof(gmnal_data_t));	
+	PORTAL_FREE(nal_cb, sizeof(nal_cb_t));
 }
diff --git a/lustre/portals/knals/gmnal/gmnal_module.c b/lustre/portals/knals/gmnal/gmnal_module.c
index 278230e..31f6819 100644
--- a/lustre/portals/knals/gmnal/gmnal_module.c
+++ b/lustre/portals/knals/gmnal/gmnal_module.c
@@ -32,6 +32,9 @@ int num_rx_threads = -1;
 int num_stxds = 5;
 int gm_port = 4;
 
+ptl_handle_ni_t	kgmnal_ni;
+
+
 int 
 gmnal_cmd(struct portals_cfg *pcfg, void *private)
 {
@@ -89,15 +92,26 @@ gmnal_load(void)
 
 
 	CDEBUG(D_INFO, "Calling gmnal_init\n");
-        statud = gmnal_init();
+	status = PtlNIInit(gmnal_init, 32, 4, 0, &kgmnal_ni);
 	if (status == PTL_OK) {
-		CDEBUG(D_INFO, "Portals GMNAL initialised ok\n");
+		CDEBUG(D_INFO, "Portals GMNAL initialised ok kgmnal_ni\n");
 	} else {
 		CDEBUG(D_INFO, "Portals GMNAL Failed to initialise\n");
-		return(-ENODEV);
+		return(1);
 		
 	}
 
+	CDEBUG(D_INFO, "Calling kportal_nal_register\n");
+	/*
+ 	 *	global_nal_data is set by gmnal_init
+	 */
+	if (kportal_nal_register(GMNAL, &gmnal_cmd, global_nal_data) != 0) {
+		CDEBUG(D_INFO, "kportal_nal_register failed\n");
+		return(1);
+	}
+
+	CDEBUG(D_INFO, "Calling PORTAL_SYMBOL_REGISTER\n");
+	PORTAL_SYMBOL_REGISTER(kgmnal_ni);
 	CDEBUG(D_INFO, "This is the end of the gmnal init routine");
 
 
@@ -108,7 +122,11 @@ gmnal_load(void)
 static void __exit
 gmnal_unload(void)
 {
+
+	kportal_nal_unregister(GMNAL);
+	PORTAL_SYMBOL_UNREGISTER(kgmnal_ni);
 	gmnal_fini();
+	global_nal_data = NULL;
 	return;
 }
 
@@ -117,6 +135,8 @@ module_init(gmnal_load);
 
 module_exit(gmnal_unload);
 
+EXPORT_SYMBOL(kgmnal_ni);
+
 MODULE_PARM(gmnal_small_msg_size, "i");
 MODULE_PARM(num_rx_threads, "i");
 MODULE_PARM(num_stxds, "i");
diff --git a/lustre/portals/knals/ibnal/.cvsignore b/lustre/portals/knals/ibnal/.cvsignore
index 48b17e9..e995588 100644
--- a/lustre/portals/knals/ibnal/.cvsignore
+++ b/lustre/portals/knals/ibnal/.cvsignore
@@ -1,10 +1,3 @@
 .deps
 Makefile
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.*.cmd
-.tmp_versions
-.depend
+Makefile.in
diff --git a/lustre/portals/knals/ibnal/Makefile.am b/lustre/portals/knals/ibnal/Makefile.am
new file mode 100644
index 0000000..84818dc
--- /dev/null
+++ b/lustre/portals/knals/ibnal/Makefile.am
@@ -0,0 +1,10 @@
+include ../../Rules.linux
+
+MODULE = kibnal
+modulenet_DATA = kibnal.o
+EXTRA_PROGRAMS = kibnal
+
+
+DEFS =
+CPPFLAGS=@CPPFLAGS@ @with_ib@
+kibnal_SOURCES = ibnal.h ibnal.c ibnal_cb.c
diff --git a/lustre/portals/knals/ibnal/Makefile.in b/lustre/portals/knals/ibnal/Makefile.in
deleted file mode 100644
index e180b3e..0000000
--- a/lustre/portals/knals/ibnal/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-MODULES := kibnal
-kibnal-objs := ibnal.o ibnal_cb.o
-
-EXTRA_PRE_CFLAGS := @IBCPPFLAGS@
-
-@INCLUDE_RULES@
diff --git a/lustre/portals/knals/ibnal/autoMakefile.am b/lustre/portals/knals/ibnal/autoMakefile.am
deleted file mode 100644
index ffe084c..0000000
--- a/lustre/portals/knals/ibnal/autoMakefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-if MODULES
-if !CRAY_PORTALS
-if BUILD_IBNAL
-modulenet_DATA = kibnal$(KMODEXT)
-endif
-endif
-endif
-
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-DIST_SOURCES = $(kibnal-objs:%.o=%.c) ibnal.h
diff --git a/lustre/portals/knals/ibnal/ibnal.c b/lustre/portals/knals/ibnal/ibnal.c
index 86c2a63..02beca7 100644
--- a/lustre/portals/knals/ibnal/ibnal.c
+++ b/lustre/portals/knals/ibnal/ibnal.c
@@ -235,6 +235,11 @@ kibnal_init(int             interface, // no use here
   kibnal_data_t *nal_data  = NULL;
   int            rc;
 
+  unsigned int nnids = 1; // number of nids 
+                          // do we know how many nodes are in this
+                          // system related to this kib_nid  
+                          //
+
   CDEBUG(D_NET, "kibnal_init:calling lib_init with nid 0x%u\n",
                   kibnal_data.kib_nid);
 
@@ -247,6 +252,7 @@ kibnal_init(int             interface, // no use here
   rc = lib_init(&kibnal_lib, 
                 kibnal_data.kib_nid, 
                 0, // process id is set as 0  
+                nnids,
                 ptl_size, 
                 ac_size);
 
@@ -2028,13 +2034,16 @@ kibnal_initialize(void)
    CDEBUG(D_PORTALS, "kibnal_initialize: Enter kibnal_initialize\n");
 
    // set api functional pointers 
-   kibnal_api.startup    = kibnal_startup;
    kibnal_api.forward    = kibnal_forward;
    kibnal_api.shutdown   = kibnal_shutdown;
    kibnal_api.yield      = kibnal_yield;
+   kibnal_api.validate   = NULL; /* our api validate is a NOOP */
    kibnal_api.lock       = kibnal_lock;
    kibnal_api.unlock     = kibnal_unlock;
    kibnal_api.nal_data   = &kibnal_data; // this is so called private data 
+   kibnal_api.refct      = 1;
+   kibnal_api.timeout    = NULL;
+   kibnal_lib.nal_data   = &kibnal_data;
   
    memset(&kibnal_data, 0, sizeof(kibnal_data));
 
diff --git a/lustre/portals/knals/qswnal/.cvsignore b/lustre/portals/knals/qswnal/.cvsignore
index 48b17e9..e995588 100644
--- a/lustre/portals/knals/qswnal/.cvsignore
+++ b/lustre/portals/knals/qswnal/.cvsignore
@@ -1,10 +1,3 @@
 .deps
 Makefile
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.*.cmd
-.tmp_versions
-.depend
+Makefile.in
diff --git a/lustre/portals/knals/qswnal/Makefile.am b/lustre/portals/knals/qswnal/Makefile.am
new file mode 100644
index 0000000..3eb4dd5
--- /dev/null
+++ b/lustre/portals/knals/qswnal/Makefile.am
@@ -0,0 +1,17 @@
+# Copyright (C) 2001  Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+include ../../Rules.linux
+
+MODULE = kqswnal
+modulenet_DATA = kqswnal.o
+EXTRA_PROGRAMS = kqswnal
+
+
+#CFLAGS:= @KCFLAGS@ 
+#CPPFLAGS:=@KCPPFLAGS@
+DEFS =
+CPPFLAGS=@CPPFLAGS@ @with_quadrics@
+kqswnal_SOURCES = qswnal.c qswnal_cb.c qswnal.h
diff --git a/lustre/portals/knals/qswnal/Makefile.in b/lustre/portals/knals/qswnal/Makefile.in
deleted file mode 100644
index d27240c..0000000
--- a/lustre/portals/knals/qswnal/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-MODULES := kqswnal
-kqswnal-objs := qswnal.o qswnal_cb.o
-
-EXTRA_POST_CFLAGS := @QSWCPPFLAGS@ -I/usr/include
-
-@INCLUDE_RULES@
diff --git a/lustre/portals/knals/qswnal/autoMakefile.am b/lustre/portals/knals/qswnal/autoMakefile.am
deleted file mode 100644
index b5b2e07..0000000
--- a/lustre/portals/knals/qswnal/autoMakefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (C) 2001  Cluster File Systems, Inc.
-#
-# This code is issued under the GNU General Public License.
-# See the file COPYING in this distribution
-
-if MODULES
-if !CRAY_PORTALS
-if BUILD_QSWNAL
-modulenet_DATA = kqswnal$(KMODEXT)
-endif
-endif
-endif
-
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-DIST_SOURCES = $(kqswnal-objs:%.o=%.c) qswnal.h
diff --git a/lustre/portals/knals/qswnal/qswnal.c b/lustre/portals/knals/qswnal/qswnal.c
index f4005de..a386eef 100644
--- a/lustre/portals/knals/qswnal/qswnal.c
+++ b/lustre/portals/knals/qswnal/qswnal.c
@@ -24,10 +24,9 @@
 
 #include "qswnal.h"
 
+ptl_handle_ni_t		kqswnal_ni;
 nal_t			kqswnal_api;
 kqswnal_data_t		kqswnal_data;
-ptl_handle_ni_t         kqswnal_ni;
-kqswnal_tunables_t      kqswnal_tunables;
 
 kpr_nal_interface_t kqswnal_router_interface = {
 	kprni_nalid:	QSWNAL,
@@ -44,7 +43,10 @@ kpr_nal_interface_t kqswnal_router_interface = {
 
 static ctl_table kqswnal_ctl_table[] = {
 	{QSWNAL_SYSCTL_OPTIMIZED_GETS, "optimized_gets",
-	 &kqswnal_tunables.kqn_optimized_gets, sizeof (int),
+	 &kqswnal_data.kqn_optimized_gets, sizeof (int),
+	 0644, NULL, &proc_dointvec},
+	{QSWNAL_SYSCTL_COPY_SMALL_FWD, "copy_small_fwd",
+	 &kqswnal_data.kqn_copy_small_fwd, sizeof (int),
 	 0644, NULL, &proc_dointvec},
 	{0}
 };
@@ -99,6 +101,15 @@ kqswnal_unlock(nal_t *nal, unsigned long *flags)
 }
 
 static int
+kqswnal_shutdown(nal_t *nal, int ni)
+{
+	CDEBUG (D_NET, "shutdown\n");
+
+	LASSERT (nal == &kqswnal_api);
+	return (0);
+}
+
+static int
 kqswnal_yield(nal_t *nal, unsigned long *flags, int milliseconds)
 {
 	/* NB called holding statelock */
@@ -108,7 +119,7 @@ kqswnal_yield(nal_t *nal, unsigned long *flags, int milliseconds)
 	CDEBUG (D_NET, "yield\n");
 
 	if (milliseconds == 0) {
-		if (need_resched())
+		if (current->need_resched)
 			schedule();
 		return 0;
 	}
@@ -137,6 +148,20 @@ kqswnal_yield(nal_t *nal, unsigned long *flags, int milliseconds)
 	return (milliseconds);
 }
 
+static nal_t *
+kqswnal_init(int interface, ptl_pt_index_t ptl_size, ptl_ac_index_t ac_size,
+	     ptl_pid_t requested_pid)
+{
+	ptl_nid_t mynid = kqswnal_elanid2nid (kqswnal_data.kqn_elanid);
+	int       nnids = kqswnal_data.kqn_nnodes;
+
+        CDEBUG(D_NET, "calling lib_init with nid "LPX64" of %d\n", mynid, nnids);
+
+	lib_init(&kqswnal_lib, mynid, 0, nnids, ptl_size, ac_size);
+
+	return (&kqswnal_api);
+}
+
 int
 kqswnal_get_tx_desc (struct portals_cfg *pcfg)
 {
@@ -194,32 +219,26 @@ kqswnal_cmd (struct portals_cfg *pcfg, void *private)
 	}
 }
 
-static void
-kqswnal_shutdown(nal_t *nal)
+void __exit
+kqswnal_finalise (void)
 {
-	unsigned long flags;
-	int           do_lib_fini = 0;
-
-	/* NB The first ref was this module! */
-	if (nal->nal_refct != 0) {
-		PORTAL_MODULE_UNUSE;
-		return;
-	}
-
-	CDEBUG (D_NET, "shutdown\n");
-	LASSERT (nal == &kqswnal_api);
-
 	switch (kqswnal_data.kqn_init)
 	{
 	default:
 		LASSERT (0);
 
 	case KQN_INIT_ALL:
-                libcfs_nal_cmd_unregister(QSWNAL);
+#if CONFIG_SYSCTL
+                if (kqswnal_data.kqn_sysctl != NULL)
+                        unregister_sysctl_table (kqswnal_data.kqn_sysctl);
+#endif		
+		PORTAL_SYMBOL_UNREGISTER (kqswnal_ni);
+                kportal_nal_unregister(QSWNAL);
 		/* fall through */
 
-	case KQN_INIT_LIB:
-		do_lib_fini = 1;
+	case KQN_INIT_PTL:
+		PtlNIFini (kqswnal_ni);
+		lib_fini (&kqswnal_lib);
 		/* fall through */
 
 	case KQN_INIT_DATA:
@@ -230,24 +249,18 @@ kqswnal_shutdown(nal_t *nal)
 	}
 
 	/**********************************************************************/
-	/* Tell router we're shutting down.  Any router calls my threads
-	 * make will now fail immediately and the router will stop calling
-	 * into me. */
+	/* Make router stop her calling me and fail any more call-ins */
 	kpr_shutdown (&kqswnal_data.kqn_router);
-	
+
 	/**********************************************************************/
-	/* Signal the start of shutdown... */
-	spin_lock_irqsave(&kqswnal_data.kqn_idletxd_lock, flags);
-	kqswnal_data.kqn_shuttingdown = 1;
-	spin_unlock_irqrestore(&kqswnal_data.kqn_idletxd_lock, flags);
+	/* flag threads we've started to terminate and wait for all to ack */
 
-	wake_up_all(&kqswnal_data.kqn_idletxd_waitq);
+	kqswnal_data.kqn_shuttingdown = 1;
+	wake_up_all (&kqswnal_data.kqn_sched_waitq);
 
-	/**********************************************************************/
-	/* wait for sends that have allocated a tx desc to launch or give up */
-	while (atomic_read (&kqswnal_data.kqn_pending_txs) != 0) {
-		CDEBUG(D_NET, "waiting for %d pending sends\n",
-		       atomic_read (&kqswnal_data.kqn_pending_txs));
+	while (atomic_read (&kqswnal_data.kqn_nthreads_running) != 0) {
+		CDEBUG(D_NET, "waiting for %d threads to start shutting down\n",
+		       atomic_read (&kqswnal_data.kqn_nthreads_running));
 		set_current_state (TASK_UNINTERRUPTIBLE);
 		schedule_timeout (HZ);
 	}
@@ -255,27 +268,18 @@ kqswnal_shutdown(nal_t *nal)
 	/**********************************************************************/
 	/* close elan comms */
 #if MULTIRAIL_EKC
-	/* Shut down receivers first; rx callbacks might try sending... */
 	if (kqswnal_data.kqn_eprx_small != NULL)
 		ep_free_rcvr (kqswnal_data.kqn_eprx_small);
 
 	if (kqswnal_data.kqn_eprx_large != NULL)
 		ep_free_rcvr (kqswnal_data.kqn_eprx_large);
 
-	/* NB ep_free_rcvr() returns only after we've freed off all receive
-	 * buffers (see shutdown handling in kqswnal_requeue_rx()).  This
-	 * means we must have completed any messages we passed to
-	 * lib_parse() or kpr_fwd_start(). */
-
 	if (kqswnal_data.kqn_eptx != NULL)
 		ep_free_xmtr (kqswnal_data.kqn_eptx);
 
-	/* NB ep_free_xmtr() returns only after all outstanding transmits
-	 * have called their callback... */
+	/* freeing the xmtr completes all txs pdq */
 	LASSERT(list_empty(&kqswnal_data.kqn_activetxds));
 #else
-	/* "Old" EKC just pretends to shutdown cleanly but actually
-	 * provides no guarantees */
 	if (kqswnal_data.kqn_eprx_small != NULL)
 		ep_remove_large_rcvr (kqswnal_data.kqn_eprx_small);
 
@@ -294,6 +298,7 @@ kqswnal_shutdown(nal_t *nal)
 #endif
 	/**********************************************************************/
 	/* flag threads to terminate, wake them and wait for them to die */
+
 	kqswnal_data.kqn_shuttingdown = 2;
 	wake_up_all (&kqswnal_data.kqn_sched_waitq);
 
@@ -311,12 +316,10 @@ kqswnal_shutdown(nal_t *nal)
 
 #if MULTIRAIL_EKC
 	LASSERT (list_empty (&kqswnal_data.kqn_readyrxds));
-	LASSERT (list_empty (&kqswnal_data.kqn_delayedtxds));
-	LASSERT (list_empty (&kqswnal_data.kqn_delayedfwds));
 #endif
 
 	/**********************************************************************/
-	/* Complete any blocked forwarding packets, with error
+	/* Complete any blocked forwarding packets with error
 	 */
 
 	while (!list_empty (&kqswnal_data.kqn_idletxd_fwdq))
@@ -324,16 +327,23 @@ kqswnal_shutdown(nal_t *nal)
 		kpr_fwd_desc_t *fwd = list_entry (kqswnal_data.kqn_idletxd_fwdq.next,
 						  kpr_fwd_desc_t, kprfd_list);
 		list_del (&fwd->kprfd_list);
-		kpr_fwd_done (&kqswnal_data.kqn_router, fwd, -ESHUTDOWN);
+		kpr_fwd_done (&kqswnal_data.kqn_router, fwd, -EHOSTUNREACH);
+	}
+
+	while (!list_empty (&kqswnal_data.kqn_delayedfwds))
+	{
+		kpr_fwd_desc_t *fwd = list_entry (kqswnal_data.kqn_delayedfwds.next,
+						  kpr_fwd_desc_t, kprfd_list);
+		list_del (&fwd->kprfd_list);
+		kpr_fwd_done (&kqswnal_data.kqn_router, fwd, -EHOSTUNREACH);
 	}
 
 	/**********************************************************************/
-	/* finalise router and portals lib */
+	/* Wait for router to complete any packets I sent her
+	 */
 
 	kpr_deregister (&kqswnal_data.kqn_router);
 
-	if (do_lib_fini)
-		lib_fini (&kqswnal_lib);
 
 	/**********************************************************************/
 	/* Unmap message buffers and free all descriptors and buffers
@@ -454,9 +464,7 @@ kqswnal_shutdown(nal_t *nal)
 }
 
 static int __init
-kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
-		 ptl_ni_limits_t *requested_limits, 
-		 ptl_ni_limits_t *actual_limits)
+kqswnal_initialise (void)
 {
 #if MULTIRAIL_EKC
 	EP_RAILMASK       all_rails = EP_RAILMASK_ALL;
@@ -466,21 +474,22 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 	int               rc;
 	int               i;
 	int               elan_page_idx;
-	ptl_process_id_t  my_process_id;
 	int               pkmem = atomic_read(&portal_kmemory);
 
-	if (nal->nal_refct != 0) {
-		if (actual_limits != NULL)
-			*actual_limits = kqswnal_lib.ni.actual_limits;
-		/* This module got the first ref */
-		PORTAL_MODULE_USE;
-		return (PTL_OK);
-	}
-
 	LASSERT (kqswnal_data.kqn_init == KQN_INIT_NOTHING);
 
 	CDEBUG (D_MALLOC, "start kmem %d\n", atomic_read(&portal_kmemory));
 
+	kqswnal_api.forward  = kqswnal_forward;
+	kqswnal_api.shutdown = kqswnal_shutdown;
+	kqswnal_api.yield    = kqswnal_yield;
+	kqswnal_api.validate = NULL;		/* our api validate is a NOOP */
+	kqswnal_api.lock     = kqswnal_lock;
+	kqswnal_api.unlock   = kqswnal_unlock;
+	kqswnal_api.nal_data = &kqswnal_data;
+
+	kqswnal_lib.nal_data = &kqswnal_data;
+
 	memset(&kqswnal_rpc_success, 0, sizeof(kqswnal_rpc_success));
 	memset(&kqswnal_rpc_failed, 0, sizeof(kqswnal_rpc_failed));
 #if MULTIRAIL_EKC
@@ -491,6 +500,9 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 	/* ensure all pointers NULL etc */
 	memset (&kqswnal_data, 0, sizeof (kqswnal_data));
 
+	kqswnal_data.kqn_optimized_gets = KQSW_OPTIMIZED_GETS;
+	kqswnal_data.kqn_copy_small_fwd = KQSW_COPY_SMALL_FWD;
+
 	kqswnal_data.kqn_cb = &kqswnal_lib;
 
 	INIT_LIST_HEAD (&kqswnal_data.kqn_idletxds);
@@ -512,19 +524,18 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 
 	/* pointers/lists/locks initialised */
 	kqswnal_data.kqn_init = KQN_INIT_DATA;
-	
+
 #if MULTIRAIL_EKC
 	kqswnal_data.kqn_ep = ep_system();
 	if (kqswnal_data.kqn_ep == NULL) {
 		CERROR("Can't initialise EKC\n");
-		kqswnal_shutdown(&kqswnal_api);
-		return (PTL_IFACE_INVALID);
+		return (-ENODEV);
 	}
 
 	if (ep_waitfor_nodeid(kqswnal_data.kqn_ep) == ELAN_INVALID_NODE) {
 		CERROR("Can't get elan ID\n");
-		kqswnal_shutdown(&kqswnal_api);
-		return (PTL_IFACE_INVALID);
+		kqswnal_finalise();
+		return (-ENODEV);
 	}
 #else
 	/**********************************************************************/
@@ -534,8 +545,7 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 	if (kqswnal_data.kqn_ep == NULL)
 	{
 		CERROR ("Can't get elan device 0\n");
-		kqswnal_shutdown(&kqswnal_api);
-		return (PTL_IFACE_INVALID);
+		return (-ENODEV);
 	}
 #endif
 
@@ -550,8 +560,8 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 	if (kqswnal_data.kqn_eptx == NULL)
 	{
 		CERROR ("Can't allocate transmitter\n");
-		kqswnal_shutdown (&kqswnal_api);
-		return (PTL_NO_SPACE);
+		kqswnal_finalise ();
+		return (-ENOMEM);
 	}
 
 	/**********************************************************************/
@@ -563,8 +573,8 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 	if (kqswnal_data.kqn_eprx_small == NULL)
 	{
 		CERROR ("Can't install small msg receiver\n");
-		kqswnal_shutdown (&kqswnal_api);
-		return (PTL_NO_SPACE);
+		kqswnal_finalise ();
+		return (-ENOMEM);
 	}
 
 	kqswnal_data.kqn_eprx_large = ep_alloc_rcvr (kqswnal_data.kqn_ep,
@@ -573,8 +583,8 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 	if (kqswnal_data.kqn_eprx_large == NULL)
 	{
 		CERROR ("Can't install large msg receiver\n");
-		kqswnal_shutdown (&kqswnal_api);
-		return (PTL_NO_SPACE);
+		kqswnal_finalise ();
+		return (-ENOMEM);
 	}
 
 	/**********************************************************************/
@@ -588,8 +598,8 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 				EP_PERM_WRITE);
 	if (kqswnal_data.kqn_ep_tx_nmh == NULL) {
 		CERROR("Can't reserve tx dma space\n");
-		kqswnal_shutdown(&kqswnal_api);
-		return (PTL_NO_SPACE);
+		kqswnal_finalise();
+		return (-ENOMEM);
 	}
 #else
         dmareq.Waitfn   = DDI_DMA_SLEEP;
@@ -603,8 +613,8 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 	if (rc != DDI_SUCCESS)
 	{
 		CERROR ("Can't reserve rx dma space\n");
-		kqswnal_shutdown (&kqswnal_api);
-		return (PTL_NO_SPACE);
+		kqswnal_finalise ();
+		return (-ENOMEM);
 	}
 #endif
 	/**********************************************************************/
@@ -617,8 +627,8 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 				EP_PERM_WRITE);
 	if (kqswnal_data.kqn_ep_tx_nmh == NULL) {
 		CERROR("Can't reserve rx dma space\n");
-		kqswnal_shutdown(&kqswnal_api);
-		return (PTL_NO_SPACE);
+		kqswnal_finalise();
+		return (-ENOMEM);
 	}
 #else
         dmareq.Waitfn   = DDI_DMA_SLEEP;
@@ -633,8 +643,8 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 	if (rc != DDI_SUCCESS)
 	{
 		CERROR ("Can't reserve rx dma space\n");
-		kqswnal_shutdown (&kqswnal_api);
-		return (PTL_NO_SPACE);
+		kqswnal_finalise ();
+		return (-ENOMEM);
 	}
 #endif
 	/**********************************************************************/
@@ -644,8 +654,8 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 		     sizeof(kqswnal_tx_t) * (KQSW_NTXMSGS + KQSW_NNBLK_TXMSGS));
 	if (kqswnal_data.kqn_txds == NULL)
 	{
-		kqswnal_shutdown (&kqswnal_api);
-		return (PTL_NO_SPACE);
+		kqswnal_finalise ();
+		return (-ENOMEM);
 	}
 
 	/* clear flags, null pointers etc */
@@ -660,8 +670,8 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 		PORTAL_ALLOC (ktx->ktx_buffer, KQSW_TX_BUFFER_SIZE);
 		if (ktx->ktx_buffer == NULL)
 		{
-			kqswnal_shutdown (&kqswnal_api);
-			return (PTL_NO_SPACE);
+			kqswnal_finalise ();
+			return (-ENOMEM);
 		}
 
 		/* Map pre-allocated buffer NOW, to save latency on transmit */
@@ -697,8 +707,8 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 		      sizeof (kqswnal_rx_t) * (KQSW_NRXMSGS_SMALL + KQSW_NRXMSGS_LARGE));
 	if (kqswnal_data.kqn_rxds == NULL)
 	{
-		kqswnal_shutdown (&kqswnal_api);
-		return (PTL_NO_SPACE);
+		kqswnal_finalise ();
+		return (-ENOMEM);
 	}
 
 	memset(kqswnal_data.kqn_rxds, 0, /* clear flags, null pointers etc */
@@ -732,8 +742,8 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 			struct page *page = alloc_page(GFP_KERNEL);
 			
 			if (page == NULL) {
-				kqswnal_shutdown (&kqswnal_api);
-				return (PTL_NO_SPACE);
+				kqswnal_finalise ();
+				return (-ENOMEM);
 			}
 
 			krx->krx_kiov[j].kiov_page = page;
@@ -777,19 +787,15 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 	/**********************************************************************/
 	/* Network interface ready to initialise */
 
-	my_process_id.nid = kqswnal_elanid2nid(kqswnal_data.kqn_elanid);
-	my_process_id.pid = 0;
-
-	rc = lib_init(&kqswnal_lib, my_process_id,
-		      requested_limits, actual_limits);
-        if (rc != PTL_OK)
+        rc = PtlNIInit(kqswnal_init, 32, 4, 0, &kqswnal_ni);
+        if (rc != 0)
 	{
-		CERROR ("lib_init failed %d\n", rc);
-		kqswnal_shutdown (&kqswnal_api);
-		return (rc);
+		CERROR ("PtlNIInit failed %d\n", rc);
+		kqswnal_finalise ();
+		return (-ENOMEM);
 	}
 
-	kqswnal_data.kqn_init = KQN_INIT_LIB;
+	kqswnal_data.kqn_init = KQN_INIT_PTL;
 
 	/**********************************************************************/
 	/* Queue receives, now that it's OK to run their completion callbacks */
@@ -810,20 +816,21 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 		if (rc != EP_SUCCESS)
 		{
 			CERROR ("failed ep_queue_receive %d\n", rc);
-			kqswnal_shutdown (&kqswnal_api);
-			return (PTL_FAIL);
+			kqswnal_finalise ();
+			return (-ENOMEM);
 		}
 	}
 
 	/**********************************************************************/
 	/* Spawn scheduling threads */
-	for (i = 0; i < num_online_cpus(); i++) {
+	for (i = 0; i < smp_num_cpus; i++)
+	{
 		rc = kqswnal_thread_start (kqswnal_scheduler, NULL);
 		if (rc != 0)
 		{
 			CERROR ("failed to spawn scheduling thread: %d\n", rc);
-			kqswnal_shutdown (&kqswnal_api);
-			return (PTL_FAIL);
+			kqswnal_finalise ();
+			return (rc);
 		}
 	}
 
@@ -832,13 +839,19 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 	rc = kpr_register (&kqswnal_data.kqn_router, &kqswnal_router_interface);
 	CDEBUG(D_NET, "Can't initialise routing interface (rc = %d): not routing\n",rc);
 
-	rc = libcfs_nal_cmd_register (QSWNAL, &kqswnal_cmd, NULL);
+	rc = kportal_nal_register (QSWNAL, &kqswnal_cmd, NULL);
 	if (rc != 0) {
 		CERROR ("Can't initialise command interface (rc = %d)\n", rc);
-		kqswnal_shutdown (&kqswnal_api);
-		return (PTL_FAIL);
+		kqswnal_finalise ();
+		return (rc);
 	}
 
+#if CONFIG_SYSCTL
+        /* Press on regardless even if registering sysctl doesn't work */
+        kqswnal_data.kqn_sysctl = register_sysctl_table (kqswnal_top_ctl_table, 0);
+#endif
+
+	PORTAL_SYMBOL_REGISTER(kqswnal_ni);
 	kqswnal_data.kqn_init = KQN_INIT_ALL;
 
 	printk(KERN_INFO "Lustre: Routing QSW NAL loaded on node %d of %d "
@@ -847,65 +860,15 @@ kqswnal_startup (nal_t *nal, ptl_pid_t requested_pid,
 	       kpr_routing (&kqswnal_data.kqn_router) ? "enabled" : "disabled",
 	       pkmem);
 
-	return (PTL_OK);
-}
-
-void __exit
-kqswnal_finalise (void)
-{
-#if CONFIG_SYSCTL
-	if (kqswnal_tunables.kqn_sysctl != NULL)
-		unregister_sysctl_table (kqswnal_tunables.kqn_sysctl);
-#endif
-	PtlNIFini(kqswnal_ni);
-
-	ptl_unregister_nal(QSWNAL);
-}
-
-static int __init
-kqswnal_initialise (void)
-{
-	int   rc;
-
-	kqswnal_api.startup  = kqswnal_startup;
-	kqswnal_api.shutdown = kqswnal_shutdown;
-	kqswnal_api.forward  = kqswnal_forward;
-	kqswnal_api.yield    = kqswnal_yield;
-	kqswnal_api.lock     = kqswnal_lock;
-	kqswnal_api.unlock   = kqswnal_unlock;
-	kqswnal_api.nal_data = &kqswnal_data;
-
-	kqswnal_lib.nal_data = &kqswnal_data;
-
-	/* Initialise dynamic tunables to defaults once only */
-	kqswnal_tunables.kqn_optimized_gets = KQSW_OPTIMIZED_GETS;
-	
-	rc = ptl_register_nal(QSWNAL, &kqswnal_api);
-	if (rc != PTL_OK) {
-		CERROR("Can't register QSWNAL: %d\n", rc);
-		return (-ENOMEM);		/* or something... */
-	}
-
-	/* Pure gateways, and the workaround for 'EKC blocks forever until
-	 * the service is active' want the NAL started up at module load
-	 * time... */
-	rc = PtlNIInit(QSWNAL, 0, NULL, NULL, &kqswnal_ni);
-	if (rc != PTL_OK && rc != PTL_IFACE_DUP) {
-		ptl_unregister_nal(QSWNAL);
-		return (-ENODEV);
-	}
-
-#if CONFIG_SYSCTL
-        /* Press on regardless even if registering sysctl doesn't work */
-        kqswnal_tunables.kqn_sysctl = 
-		register_sysctl_table (kqswnal_top_ctl_table, 0);
-#endif
 	return (0);
 }
 
+
 MODULE_AUTHOR("Cluster File Systems, Inc. <info@clusterfs.com>");
 MODULE_DESCRIPTION("Kernel Quadrics/Elan NAL v1.01");
 MODULE_LICENSE("GPL");
 
 module_init (kqswnal_initialise);
 module_exit (kqswnal_finalise);
+
+EXPORT_SYMBOL (kqswnal_ni);
diff --git a/lustre/portals/knals/qswnal/qswnal.h b/lustre/portals/knals/qswnal/qswnal.h
index 6978aa0..5e32887 100644
--- a/lustre/portals/knals/qswnal/qswnal.h
+++ b/lustre/portals/knals/qswnal/qswnal.h
@@ -53,11 +53,7 @@
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-#include <linux/locks.h>        /* wait_on_buffer */
-#else
-#include <linux/buffer_head.h>  /* wait_on_buffer */
-#endif
+#include <linux/locks.h>
 #include <linux/unistd.h>
 #include <net/sock.h>
 #include <linux/uio.h>
@@ -78,7 +74,6 @@
 #include <linux/kpr.h>
 #include <portals/p30.h>
 #include <portals/lib-p30.h>
-#include <portals/nal.h>
 
 #define KQSW_CHECKSUM   0
 #if KQSW_CHECKSUM
@@ -199,19 +194,17 @@ typedef struct
 
 typedef struct
 {
-        /* dynamic tunables... */
-        int                      kqn_optimized_gets;  /* optimized GETs? */
-#if CONFIG_SYSCTL
-        struct ctl_table_header *kqn_sysctl;          /* sysctl interface */
-#endif        
-} kqswnal_tunables_t;
-
-typedef struct
-{
         char               kqn_init;            /* what's been initialised */
         char               kqn_shuttingdown;    /* I'm trying to shut down */
-        atomic_t           kqn_nthreads;        /* # threads running */
+        atomic_t           kqn_nthreads;        /* # threads not terminated */
+        atomic_t           kqn_nthreads_running;/* # threads still running */
+
+        int                kqn_optimized_gets;  /* optimized GETs? */
+        int                kqn_copy_small_fwd;  /* fwd small msgs from pre-allocated buffer? */
 
+#if CONFIG_SYSCTL
+        struct ctl_table_header *kqn_sysctl;    /* sysctl interface */
+#endif        
         kqswnal_rx_t      *kqn_rxds;            /* all the receive descriptors */
         kqswnal_tx_t      *kqn_txds;            /* all the transmit descriptors */
 
@@ -221,7 +214,6 @@ typedef struct
         spinlock_t         kqn_idletxd_lock;    /* serialise idle txd access */
         wait_queue_head_t  kqn_idletxd_waitq;   /* sender blocks here waiting for idle txd */
         struct list_head   kqn_idletxd_fwdq;    /* forwarded packets block here waiting for idle txd */
-        atomic_t           kqn_pending_txs;     /* # transmits being prepped */
         
         spinlock_t         kqn_sched_lock;      /* serialise packet schedulers */
         wait_queue_head_t  kqn_sched_waitq;     /* scheduler blocks here */
@@ -255,13 +247,12 @@ typedef struct
 /* kqn_init state */
 #define KQN_INIT_NOTHING        0               /* MUST BE ZERO so zeroed state is initialised OK */
 #define KQN_INIT_DATA           1
-#define KQN_INIT_LIB            2
+#define KQN_INIT_PTL            2
 #define KQN_INIT_ALL            3
 
-extern nal_cb_t            kqswnal_lib;
-extern nal_t               kqswnal_api;
-extern kqswnal_tunables_t  kqswnal_tunables;
-extern kqswnal_data_t      kqswnal_data;
+extern nal_cb_t        kqswnal_lib;
+extern nal_t           kqswnal_api;
+extern kqswnal_data_t  kqswnal_data;
 
 /* global pre-prepared replies to keep off the stack */
 extern EP_STATUSBLK    kqswnal_rpc_success;
diff --git a/lustre/portals/knals/qswnal/qswnal_cb.c b/lustre/portals/knals/qswnal/qswnal_cb.c
index 2bcb853..61c88f6 100644
--- a/lustre/portals/knals/qswnal/qswnal_cb.c
+++ b/lustre/portals/knals/qswnal/qswnal_cb.c
@@ -426,8 +426,7 @@ kqswnal_put_idle_tx (kqswnal_tx_t *ktx)
         list_add (&ktx->ktx_list, &kqswnal_data.kqn_idletxds);
 
         /* anything blocking for a tx descriptor? */
-        if (!kqswnal_data.kqn_shuttingdown &&
-            !list_empty(&kqswnal_data.kqn_idletxd_fwdq)) /* forwarded packet? */
+        if (!list_empty(&kqswnal_data.kqn_idletxd_fwdq)) /* forwarded packet? */
         {
                 CDEBUG(D_NET,"wakeup fwd\n");
 
@@ -461,9 +460,6 @@ kqswnal_get_idle_tx (kpr_fwd_desc_t *fwd, int may_block)
         for (;;) {
                 spin_lock_irqsave (&kqswnal_data.kqn_idletxd_lock, flags);
 
-                if (kqswnal_data.kqn_shuttingdown)
-                        break;
-
                 /* "normal" descriptor is free */
                 if (!list_empty (&kqswnal_data.kqn_idletxds)) {
                         ktx = list_entry (kqswnal_data.kqn_idletxds.next,
@@ -471,8 +467,14 @@ kqswnal_get_idle_tx (kpr_fwd_desc_t *fwd, int may_block)
                         break;
                 }
 
-                if (fwd != NULL)                /* forwarded packet? */
+                /* "normal" descriptor pool is empty */
+
+                if (fwd != NULL) { /* forwarded packet => queue for idle txd */
+                        CDEBUG (D_NET, "blocked fwd [%p]\n", fwd);
+                        list_add_tail (&fwd->kprfd_list,
+                                       &kqswnal_data.kqn_idletxd_fwdq);
                         break;
+                }
 
                 /* doing a local transmit */
                 if (!may_block) {
@@ -492,20 +494,13 @@ kqswnal_get_idle_tx (kpr_fwd_desc_t *fwd, int may_block)
 
                 CDEBUG (D_NET, "blocking for tx desc\n");
                 wait_event (kqswnal_data.kqn_idletxd_waitq,
-                            !list_empty (&kqswnal_data.kqn_idletxds) ||
-                            kqswnal_data.kqn_shuttingdown);
+                            !list_empty (&kqswnal_data.kqn_idletxds));
         }
 
         if (ktx != NULL) {
                 list_del (&ktx->ktx_list);
                 list_add (&ktx->ktx_list, &kqswnal_data.kqn_activetxds);
                 ktx->ktx_launcher = current->pid;
-                atomic_inc(&kqswnal_data.kqn_pending_txs);
-        } else if (fwd != NULL) {
-                /* queue forwarded packet until idle txd available */
-                CDEBUG (D_NET, "blocked fwd [%p]\n", fwd);
-                list_add_tail (&fwd->kprfd_list,
-                               &kqswnal_data.kqn_idletxd_fwdq);
         }
 
         spin_unlock_irqrestore (&kqswnal_data.kqn_idletxd_lock, flags);
@@ -606,9 +601,6 @@ kqswnal_launch (kqswnal_tx_t *ktx)
 
         ktx->ktx_launchtime = jiffies;
 
-        if (kqswnal_data.kqn_shuttingdown)
-                return (-ESHUTDOWN);
-
         LASSERT (dest >= 0);                    /* must be a peer */
         if (ktx->ktx_state == KTX_GETTING) {
                 /* NB ktx_frag[0] is the GET hdr + kqswnal_remotemd_t.  The
@@ -643,6 +635,8 @@ kqswnal_launch (kqswnal_tx_t *ktx)
                 return (0);
 
         case EP_ENOMEM: /* can't allocate ep txd => queue for later */
+                LASSERT (in_interrupt());
+
                 spin_lock_irqsave (&kqswnal_data.kqn_sched_lock, flags);
 
                 list_add_tail (&ktx->ktx_delayed_list, &kqswnal_data.kqn_delayedtxds);
@@ -927,7 +921,7 @@ kqswnal_sendmsg (nal_cb_t     *nal,
         LASSERT (payload_kiov == NULL || !in_interrupt ());
         /* payload is either all vaddrs or all pages */
         LASSERT (!(payload_kiov != NULL && payload_iov != NULL));
-
+        
         if (payload_nob > KQSW_MAXPAYLOAD) {
                 CERROR ("request exceeds MTU size "LPSZ" (max %u).\n",
                         payload_nob, KQSW_MAXPAYLOAD);
@@ -973,17 +967,19 @@ kqswnal_sendmsg (nal_cb_t     *nal,
                                "nid "LPX64" via "LPX64" elanID %d\n",
                                nid, targetnid,
                                ep_rxd_node(((kqswnal_rx_t *)private)->krx_rxd));
-                        rc = -EINVAL;
-                        goto out;
+                        return (PTL_FAIL);
                 }
 
                 /* peer expects RPC completion with GET data */
                 rc = kqswnal_dma_reply (ktx, payload_niov, 
                                         payload_iov, payload_kiov, 
                                         payload_offset, payload_nob);
-                if (rc != 0)
-                        CERROR ("Can't DMA reply to "LPX64": %d\n", nid, rc);
-                goto out;
+                if (rc == 0)
+                        return (PTL_OK);
+                
+                CERROR ("Can't DMA reply to "LPX64": %d\n", nid, rc);
+                kqswnal_put_idle_tx (ktx);
+                return (PTL_FAIL);
         }
 
         memcpy (ktx->ktx_buffer, hdr, sizeof (*hdr)); /* copy hdr from caller's stack */
@@ -1027,7 +1023,7 @@ kqswnal_sendmsg (nal_cb_t     *nal,
         memcpy(ktx->ktx_buffer + sizeof(*hdr) + sizeof(csum), &csum, sizeof(csum));
 #endif
 
-        if (kqswnal_tunables.kqn_optimized_gets &&
+        if (kqswnal_data.kqn_optimized_gets &&
             type == PTL_MSG_GET &&              /* doing a GET */
             nid == targetnid) {                 /* not forwarding */
                 lib_md_t           *md = libmsg->md;
@@ -1056,8 +1052,11 @@ kqswnal_sendmsg (nal_cb_t     *nal,
                 else
                         rc = kqswnal_map_tx_iov (ktx, 0, md->length,
                                                  md->md_niov, md->md_iov.iov);
-                if (rc != 0)
-                        goto out;
+
+                if (rc < 0) {
+                        kqswnal_put_idle_tx (ktx);
+                        return (PTL_FAIL);
+                }
 
                 rmd->kqrmd_nfrag = ktx->ktx_nfrag - 1;
 
@@ -1120,26 +1119,25 @@ kqswnal_sendmsg (nal_cb_t     *nal,
                 else
                         rc = kqswnal_map_tx_iov (ktx, payload_offset, payload_nob,
                                                  payload_niov, payload_iov);
-                if (rc != 0)
-                        goto out;
+                if (rc != 0) {
+                        kqswnal_put_idle_tx (ktx);
+                        return (PTL_FAIL);
+                }
         }
         
         ktx->ktx_port = (payload_nob <= KQSW_SMALLPAYLOAD) ?
                         EP_MSG_SVC_PORTALS_SMALL : EP_MSG_SVC_PORTALS_LARGE;
 
         rc = kqswnal_launch (ktx);
-
- out:
-        CDEBUG(rc == 0 ? D_NET : D_ERROR, 
-               "%s "LPSZ" bytes to "LPX64" via "LPX64": rc %d\n", 
-               rc == 0 ? "Sent" : "Failed to send",
-               payload_nob, nid, targetnid, rc);
-
-        if (rc != 0)
+        if (rc != 0) {                    /* failed? */
+                CERROR ("Failed to send packet to "LPX64": %d\n", targetnid, rc);
                 kqswnal_put_idle_tx (ktx);
+                return (PTL_FAIL);
+        }
 
-        atomic_dec(&kqswnal_data.kqn_pending_txs);
-        return (rc == 0 ? PTL_OK : PTL_FAIL);
+        CDEBUG(D_NET, "sent "LPSZ" bytes to "LPX64" via "LPX64"\n", 
+               payload_nob, nid, targetnid);
+        return (PTL_OK);
 }
 
 static ptl_err_t
@@ -1206,7 +1204,7 @@ kqswnal_fwd_packet (void *arg, kpr_fwd_desc_t *fwd)
         if (kqswnal_nid2elanid (nid) < 0) {
                 CERROR("Can't forward [%p] to "LPX64": not a peer\n", fwd, nid);
                 rc = -EHOSTUNREACH;
-                goto out;
+                goto failed;
         }
 
         /* copy hdr into pre-mapped buffer */
@@ -1246,20 +1244,20 @@ kqswnal_fwd_packet (void *arg, kpr_fwd_desc_t *fwd)
 #endif
                 rc = kqswnal_map_tx_kiov (ktx, 0, nob, niov, kiov);
                 if (rc != 0)
-                        goto out;
+                        goto failed;
         }
 
         rc = kqswnal_launch (ktx);
- out:
-        if (rc != 0) {
-                CERROR ("Failed to forward [%p] to "LPX64": %d\n", fwd, nid, rc);
+        if (rc == 0)
+                return;
 
-                kqswnal_put_idle_tx (ktx);
-                /* complete now (with failure) */
-                kpr_fwd_done (&kqswnal_data.kqn_router, fwd, rc);
-        }
+ failed:
+        LASSERT (rc != 0);
+        CERROR ("Failed to forward [%p] to "LPX64": %d\n", fwd, nid, rc);
 
-        atomic_dec(&kqswnal_data.kqn_pending_txs);
+        kqswnal_put_idle_tx (ktx);
+        /* complete now (with failure) */
+        kpr_fwd_done (&kqswnal_data.kqn_router, fwd, rc);
 }
 
 void
@@ -1729,6 +1727,7 @@ kqswnal_thread_start (int (*fn)(void *arg), void *arg)
                 return ((int)pid);
 
         atomic_inc (&kqswnal_data.kqn_nthreads);
+        atomic_inc (&kqswnal_data.kqn_nthreads_running);
         return (0);
 }
 
@@ -1747,6 +1746,7 @@ kqswnal_scheduler (void *arg)
         long             flags;
         int              rc;
         int              counter = 0;
+        int              shuttingdown = 0;
         int              did_something;
 
         kportal_daemonize ("kqswnal_sched");
@@ -1756,6 +1756,18 @@ kqswnal_scheduler (void *arg)
 
         for (;;)
         {
+                if (kqswnal_data.kqn_shuttingdown != shuttingdown) {
+
+                        if (kqswnal_data.kqn_shuttingdown == 2)
+                                break;
+                
+                        /* During stage 1 of shutdown we are still responsive
+                         * to receives */
+
+                        atomic_dec (&kqswnal_data.kqn_nthreads_running);
+                        shuttingdown = kqswnal_data.kqn_shuttingdown;
+                }
+
                 did_something = 0;
 
                 if (!list_empty (&kqswnal_data.kqn_readyrxds))
@@ -1772,7 +1784,8 @@ kqswnal_scheduler (void *arg)
                         spin_lock_irqsave(&kqswnal_data.kqn_sched_lock, flags);
                 }
 
-                if (!list_empty (&kqswnal_data.kqn_delayedtxds))
+                if (!shuttingdown &&
+                    !list_empty (&kqswnal_data.kqn_delayedtxds))
                 {
                         ktx = list_entry(kqswnal_data.kqn_delayedtxds.next,
                                          kqswnal_tx_t, ktx_list);
@@ -1781,31 +1794,31 @@ kqswnal_scheduler (void *arg)
                                                flags);
 
                         rc = kqswnal_launch (ktx);
-                        if (rc != 0) {
+                        if (rc != 0)          /* failed: ktx_nid down? */
+                        {
                                 CERROR("Failed delayed transmit to "LPX64
                                        ": %d\n", ktx->ktx_nid, rc);
                                 kqswnal_tx_done (ktx, rc);
                         }
-                        atomic_dec (&kqswnal_data.kqn_pending_txs);
 
                         did_something = 1;
                         spin_lock_irqsave (&kqswnal_data.kqn_sched_lock, flags);
                 }
 
-                if (!list_empty (&kqswnal_data.kqn_delayedfwds))
+                if (!shuttingdown &
+                    !list_empty (&kqswnal_data.kqn_delayedfwds))
                 {
                         fwd = list_entry (kqswnal_data.kqn_delayedfwds.next, kpr_fwd_desc_t, kprfd_list);
                         list_del (&fwd->kprfd_list);
                         spin_unlock_irqrestore (&kqswnal_data.kqn_sched_lock, flags);
 
-                        /* If we're shutting down, this will just requeue fwd on kqn_idletxd_fwdq */
                         kqswnal_fwd_packet (NULL, fwd);
 
                         did_something = 1;
                         spin_lock_irqsave (&kqswnal_data.kqn_sched_lock, flags);
                 }
 
-                /* nothing to do or hogging CPU */
+                    /* nothing to do or hogging CPU */
                 if (!did_something || counter++ == KQSW_RESCHED) {
                         spin_unlock_irqrestore(&kqswnal_data.kqn_sched_lock,
                                                flags);
@@ -1813,24 +1826,21 @@ kqswnal_scheduler (void *arg)
                         counter = 0;
 
                         if (!did_something) {
-                                if (kqswnal_data.kqn_shuttingdown == 2) {
-                                        /* We only exit in stage 2 of shutdown when 
-                                         * there's nothing left to do */
-                                        break;
-                                }
                                 rc = wait_event_interruptible (kqswnal_data.kqn_sched_waitq,
-                                                               kqswnal_data.kqn_shuttingdown == 2 ||
+                                                               kqswnal_data.kqn_shuttingdown != shuttingdown ||
                                                                !list_empty(&kqswnal_data.kqn_readyrxds) ||
                                                                !list_empty(&kqswnal_data.kqn_delayedtxds) ||
                                                                !list_empty(&kqswnal_data.kqn_delayedfwds));
                                 LASSERT (rc == 0);
-                        } else if (need_resched())
+                        } else if (current->need_resched)
                                 schedule ();
 
                         spin_lock_irqsave (&kqswnal_data.kqn_sched_lock, flags);
                 }
         }
 
+        spin_unlock_irqrestore (&kqswnal_data.kqn_sched_lock, flags);
+
         kqswnal_thread_fini ();
         return (0);
 }
diff --git a/lustre/portals/knals/scimacnal/.cvsignore b/lustre/portals/knals/scimacnal/.cvsignore
index 48b17e9..e995588 100644
--- a/lustre/portals/knals/scimacnal/.cvsignore
+++ b/lustre/portals/knals/scimacnal/.cvsignore
@@ -1,10 +1,3 @@
 .deps
 Makefile
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.*.cmd
-.tmp_versions
-.depend
+Makefile.in
diff --git a/lustre/portals/knals/scimacnal/Makefile.am b/lustre/portals/knals/scimacnal/Makefile.am
new file mode 100644
index 0000000..6da31f0
--- /dev/null
+++ b/lustre/portals/knals/scimacnal/Makefile.am
@@ -0,0 +1,11 @@
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+include ../../Rules.linux
+
+MODULE = kscimacnal
+modulenet_DATA = kscimacnal.o
+EXTRA_PROGRAMS = kscimacnal
+
+DEFS =
+kscimacnal_SOURCES = scimacnal.c scimacnal_cb.c scimacnal.h
diff --git a/lustre/portals/knals/scimacnal/Makefile.in b/lustre/portals/knals/scimacnal/Makefile.in
deleted file mode 100644
index c7eb4ac..0000000
--- a/lustre/portals/knals/scimacnal/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-MODULES := kscimacnal
-kscimacnal-objs := scimacnal.o scimacnal_cb.o
-
-EXTRA_PRE_CFLAGS += @SCIMACCPPFLAGS@
-
-@INCLUDE_RULES@
diff --git a/lustre/portals/knals/scimacnal/autoMakefile.am b/lustre/portals/knals/scimacnal/autoMakefile.am
deleted file mode 100644
index 47433cd..0000000
--- a/lustre/portals/knals/scimacnal/autoMakefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-# This code is issued under the GNU General Public License.
-# See the file COPYING in this distribution
-
-if MODULES
-if !CRAY_PORTALS
-if BUILD_SCIMACNAL
-modulenet_DATA = kscimacnal$(KMODEXT)
-endif
-endif
-endif
-
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-DIST_SOURCES = $(ksimacnal-objs:%.o=%.c) scimacnal.h
diff --git a/lustre/portals/knals/scimacnal/scimacnal.c b/lustre/portals/knals/scimacnal/scimacnal.c
index e77bd8e..35de6eb 100644
--- a/lustre/portals/knals/scimacnal/scimacnal.c
+++ b/lustre/portals/knals/scimacnal/scimacnal.c
@@ -26,6 +26,7 @@
 
 #include "scimacnal.h"
 
+ptl_handle_ni_t kscimacnal_ni;
 nal_t  kscimacnal_api;
 
 kscimacnal_data_t kscimacnal_data;
@@ -100,34 +101,10 @@ static void kscimacnal_unlock(nal_t *nal, unsigned long *flags)
 }
 
 
-static void kscimacnal_shutdown(nal_t *nal, int ni)
+static int kscimacnal_shutdown(nal_t *nal, int ni)
 {
         LASSERT (nal == &kscimacnal_api);
-        LASSERT (kscimacnal_data.ksci_init);
-
-        if (nal->nal_refct != 0)
-                return;
-
-        /* Called on last matching PtlNIFini() */
-
-        /* FIXME: How should the shutdown procedure really look? 
-         */
-        kscimacnal_data.ksci_shuttingdown=1;
-
-        /* Stop handling ioctls */
-        libcfs_nal_cmd_unregister(SCIMACNAL);
-
-        mac_finish(kscimacnal_data.ksci_machandle);
-
-        /* finalise lib after net shuts up */
-        lib_fini(&kscimacnal_lib);
-
-        kscimacnal_data.ksci_init = 0;
-
-        /* Allow unload */
-        PORTAL_MODULE_UNUSE;
-
-        return;
+        return 0;
 }
 
 
@@ -146,26 +123,56 @@ static void kscimacnal_yield( nal_t *nal, unsigned long *flags, int milliseconds
 }
 
 
-static int kscimacnal_startup(nal_t *nal, ptl_pid_t requested_pid,
-                              ptl_ni_limits_t *requested_limits,
-                              ptl_ni_limits_t *actual_limits)
+static nal_t *kscimacnal_init(int interface, ptl_pt_index_t  ptl_size,
+                ptl_ac_index_t  ac_size, ptl_pid_t requested_pid)
+{
+        int     nnids = 512; /* FIXME: Need ScaMac funktion to get #nodes */
+
+        CDEBUG(D_NET, "calling lib_init with nid "LPX64" nnids %d\n", kscimacnal_data.ksci_nid, nnids);
+        lib_init(&kscimacnal_lib, kscimacnal_data.ksci_nid, 0, nnids,ptl_size, ac_size); 
+        return &kscimacnal_api;
+}
+
+
+/* Called by kernel at module unload time */
+static void /*__exit*/ 
+kscimacnal_finalize(void)
+{
+        /* FIXME: How should the shutdown procedure really look? */
+        kscimacnal_data.ksci_shuttingdown=1;
+
+        PORTAL_SYMBOL_UNREGISTER(kscimacnal_ni);
+
+        PtlNIFini(kscimacnal_ni);
+        lib_fini(&kscimacnal_lib);
+
+        mac_finish(kscimacnal_data.ksci_machandle);
+
+        CDEBUG (D_MALLOC, "done kmem %d\n", atomic_read (&portal_kmemory));
+
+        return;
+}
+
+
+/* Called by kernel at module insertion time */
+static int __init
+kscimacnal_initialize(void)
 {
         int rc;
-        mac_physaddr_t   mac_physaddr;
-        ptl_process_id_t process_id;
+        unsigned long     nid=0;
         mac_handle_t    *machandle = NULL;
 
-        if (nal->nal_refct != 0) {
-                if (actual_limits != NULL)
-                        *actual_limits = kscimacnal_lib.ni.actual_limits;
-                return (PTL_OK);
-        }
 
-        /* Called on first PtlNIInit(SCIMACNAL) */
+        CDEBUG (D_MALLOC, "start kmem %d\n", atomic_read (&portal_kmemory));
+
+        kscimacnal_api.forward = kscimacnal_forward;
+        kscimacnal_api.shutdown = kscimacnal_shutdown;
+        kscimacnal_api.yield = kscimacnal_yield;
+        kscimacnal_api.validate = NULL;         /* our api validate is a NOOP */
+        kscimacnal_api.lock= kscimacnal_lock;
+        kscimacnal_api.unlock= kscimacnal_unlock;
+        kscimacnal_api.nal_data = &kscimacnal_data;
 
-        LASSERT (nal == kscimacnal_api);
-        LASSERT (!kscimacnal_data.ksci_init);
-        
         kscimacnal_lib.nal_data = &kscimacnal_data;
 
         memset(&kscimacnal_data, 0, sizeof(kscimacnal_data));
@@ -181,7 +188,7 @@ static int kscimacnal_startup(nal_t *nal, ptl_pid_t requested_pid,
 
         if(!machandle) {
                 CERROR("mac_init() failed\n");
-                return PTL_FAIL;
+                return -1;
         }
 
         kscimacnal_data.ksci_machandle = machandle;
@@ -192,88 +199,45 @@ static int kscimacnal_startup(nal_t *nal, ptl_pid_t requested_pid,
                                 mac_get_mtusize(machandle), SCIMACNAL_MTU);
                 CERROR("Consult README.scimacnal for more information\n");
                 mac_finish(machandle);
-                return PTL_FAIL;
+                return -1;
         }
 
         /* Get the node ID */
         /* mac_get_physaddrlen() is a function instead of define, sigh */
-        LASSERT(mac_get_physaddrlen(machandle) <= sizeof(mac_physaddr));
-        if(mac_get_physaddr(machandle, &mac_physaddr)) {
+        LASSERT(mac_get_physaddrlen(machandle) <= sizeof(nid));
+        if(mac_get_physaddr(machandle, (mac_physaddr_t *) &nid)) {
                 CERROR("mac_get_physaddr() failed\n");
                 mac_finish(machandle);
-                return PTL_FAIL;
+                return -1;
         }
-        kscimacnal_data.ksci_nid = (ptl_nid_t)(ntohl(mac_physaddr));
+        nid = ntohl(nid);
+        kscimacnal_data.ksci_nid = nid;
 
-        process_id.pid = 0;
-        process_id.nid = kscimacnal_data.ksci_nid;
 
-        CDEBUG(D_NET, "calling lib_init with nid "LPX64"\n",
-               kscimacnal_data.ksci_nid);
-
-        rc = lib_init(&kscimacnal_lib, process_id,
-                      requested_limits, actual_limits);
-        if (rc != PTL_OK) {
+        /* Initialize Network Interface */
+        /* FIXME: What do the magic numbers mean? Documentation anyone? */
+        rc = PtlNIInit(kscimacnal_init, 32, 4, 0, &kscimacnal_ni);
+        if (rc) {
                 CERROR("PtlNIInit failed %d\n", rc);
                 mac_finish(machandle);
-                return (rc);
+                return (-ENOMEM);
         }
 
         /* Init command interface */
-        rc = libcfs_nal_cmd_register (SCIMACNAL, &kscimacnal_cmd, NULL);
+        rc = kportal_nal_register (SCIMACNAL, &kscimacnal_cmd, NULL);
         if (rc != 0) {
                 CERROR ("Can't initialise command interface (rc = %d)\n", rc);
-                lib_fini(&kscimacnal_lib);
+                PtlNIFini(kscimacnal_ni);
                 mac_finish(machandle);
-                return (PTL_FAIL);
+                return (rc);
         }
 
-        /* We're done now, it's OK for the RX callback to do stuff */
-        kscimacnal_data.ksci_init = 1;
 
-        /* Prevent unload before matching PtlNIFini() */
-        PORTAL_MODULE_USE;
-        
-        return (PTL_OK);
-}
-
-
-/* Called by kernel at module unload time */
-static void /*__exit*/ 
-kscimacnal_finalize(void)
-{
-        LASSERT (!kscimacnal_data.ksci_init);
-        
-        ptl_unregister_nal(SCIMACNAL);
+        PORTAL_SYMBOL_REGISTER(kscimacnal_ni);
 
-        CDEBUG (D_MALLOC, "done kmem %d\n", atomic_read (&portal_kmemory));
-
-        return;
-}
-
-
-/* Called by kernel at module insertion time */
-static int __init
-kscimacnal_initialize(void)
-{
-        int rc;
-
-        CDEBUG (D_MALLOC, "start kmem %d\n", atomic_read (&portal_kmemory));
-
-        kscimacnal_api.startup = kscimacnal_startup;
-        kscimacnal_api.forward = kscimacnal_forward;
-        kscimacnal_api.shutdown = kscimacnal_shutdown;
-        kscimacnal_api.yield = kscimacnal_yield;
-        kscimacnal_api.lock= kscimacnal_lock;
-        kscimacnal_api.unlock= kscimacnal_unlock;
-        kscimacnal_api.nal_data = &kscimacnal_data;
+        /* We're done now, it's OK for the RX callback to do stuff */
+        kscimacnal_data.ksci_init = 1;
 
-        rc = ptl_register_nal(SCIMACNAL, &kscimacnal_api);
-        if (rc != PTL_OK) {
-                CERROR("Can't register SCIMACNAL: %d\n", rc);
-                return (-ENODEV);
-        }
-        
         return 0;
 }
 
diff --git a/lustre/portals/knals/socknal/.cvsignore b/lustre/portals/knals/socknal/.cvsignore
index 5ed596b..95973d6 100644
--- a/lustre/portals/knals/socknal/.cvsignore
+++ b/lustre/portals/knals/socknal/.cvsignore
@@ -1,10 +1,4 @@
 .deps
 Makefile
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+Makefile.in
+.*.o.cmd
diff --git a/lustre/portals/knals/socknal/Makefile.am b/lustre/portals/knals/socknal/Makefile.am
new file mode 100644
index 0000000..acdba5e
--- /dev/null
+++ b/lustre/portals/knals/socknal/Makefile.am
@@ -0,0 +1,17 @@
+# Copyright (C) 2001  Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+include ../../Rules.linux
+
+MODULE = ksocknal
+modulenet_DATA = ksocknal.o
+EXTRA_PROGRAMS = ksocknal
+
+# If you don't build with -O2, your modules won't insert, becahse htonl is
+# just special that way.
+AM_CFLAGS = -O2
+
+DEFS =
+ksocknal_SOURCES = socknal.c socknal_cb.c socknal.h
diff --git a/lustre/portals/knals/socknal/Makefile.in b/lustre/portals/knals/socknal/Makefile.in
deleted file mode 100644
index 633b455..0000000
--- a/lustre/portals/knals/socknal/Makefile.in
+++ /dev/null
@@ -1,8 +0,0 @@
-MODULES := ksocknal
-ksocknal-objs := socknal.o socknal_cb.o
-
-# If you don't build with -O2, your modules won't insert, becahse htonl is
-# just special that way.
-EXTRA_POST_CFLAGS := -O2
-
-@INCLUDE_RULES@
diff --git a/lustre/portals/knals/socknal/autoMakefile.am b/lustre/portals/knals/socknal/autoMakefile.am
deleted file mode 100644
index 070b649..0000000
--- a/lustre/portals/knals/socknal/autoMakefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (C) 2001  Cluster File Systems, Inc.
-#
-# This code is issued under the GNU General Public License.
-# See the file COPYING in this distribution
-
-if MODULES
-if !CRAY_PORTALS
-modulenet_DATA = ksocknal$(KMODEXT)
-endif
-endif
-
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-DIST_SOURCES = $(ksocknal-objs:%.o=%.c) socknal.h
diff --git a/lustre/portals/knals/socknal/socknal.c b/lustre/portals/knals/socknal/socknal.c
index 32bbbec..d874a6c 100644
--- a/lustre/portals/knals/socknal/socknal.c
+++ b/lustre/portals/knals/socknal/socknal.c
@@ -25,10 +25,13 @@
 
 #include "socknal.h"
 
-nal_t                   ksocknal_api;
-ksock_nal_data_t        ksocknal_data;
 ptl_handle_ni_t         ksocknal_ni;
-ksock_tunables_t        ksocknal_tunables;
+static nal_t            ksocknal_api;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
+ksock_nal_data_t ksocknal_data;
+#else
+static ksock_nal_data_t ksocknal_data;
+#endif
 
 kpr_nal_interface_t ksocknal_router_interface = {
         kprni_nalid:      SOCKNAL,
@@ -37,7 +40,6 @@ kpr_nal_interface_t ksocknal_router_interface = {
         kprni_notify:     ksocknal_notify,
 };
 
-#ifdef CONFIG_SYSCTL
 #define SOCKNAL_SYSCTL	200
 
 #define SOCKNAL_SYSCTL_TIMEOUT     1
@@ -48,21 +50,21 @@ kpr_nal_interface_t ksocknal_router_interface = {
 
 static ctl_table ksocknal_ctl_table[] = {
         {SOCKNAL_SYSCTL_TIMEOUT, "timeout", 
-         &ksocknal_tunables.ksnd_io_timeout, sizeof (int),
+         &ksocknal_data.ksnd_io_timeout, sizeof (int),
          0644, NULL, &proc_dointvec},
         {SOCKNAL_SYSCTL_EAGER_ACK, "eager_ack", 
-         &ksocknal_tunables.ksnd_eager_ack, sizeof (int),
+         &ksocknal_data.ksnd_eager_ack, sizeof (int),
          0644, NULL, &proc_dointvec},
 #if SOCKNAL_ZC
         {SOCKNAL_SYSCTL_ZERO_COPY, "zero_copy", 
-         &ksocknal_tunables.ksnd_zc_min_frag, sizeof (int),
+         &ksocknal_data.ksnd_zc_min_frag, sizeof (int),
          0644, NULL, &proc_dointvec},
 #endif
         {SOCKNAL_SYSCTL_TYPED, "typed", 
-         &ksocknal_tunables.ksnd_typed_conns, sizeof (int),
+         &ksocknal_data.ksnd_typed_conns, sizeof (int),
          0644, NULL, &proc_dointvec},
         {SOCKNAL_SYSCTL_MIN_BULK, "min_bulk", 
-         &ksocknal_tunables.ksnd_min_bulk, sizeof (int),
+         &ksocknal_data.ksnd_min_bulk, sizeof (int),
          0644, NULL, &proc_dointvec},
         { 0 }
 };
@@ -71,7 +73,6 @@ static ctl_table ksocknal_top_ctl_table[] = {
         {SOCKNAL_SYSCTL, "socknal", NULL, 0, 0555, ksocknal_ctl_table},
         { 0 }
 };
-#endif
 
 int
 ksocknal_api_forward(nal_t *nal, int id, void *args, size_t args_len,
@@ -87,6 +88,12 @@ ksocknal_api_forward(nal_t *nal, int id, void *args, size_t args_len,
         return PTL_OK;
 }
 
+int
+ksocknal_api_shutdown(nal_t *nal, int ni)
+{
+        return PTL_OK;
+}
+
 void
 ksocknal_api_lock(nal_t *nal, unsigned long *flags)
 {
@@ -147,6 +154,19 @@ ksocknal_api_yield(nal_t *nal, unsigned long *flags, int milliseconds)
 	return (milliseconds);
 }
 
+nal_t *
+ksocknal_init(int interface, ptl_pt_index_t ptl_size,
+              ptl_ac_index_t ac_size, ptl_pid_t requested_pid)
+{
+        CDEBUG(D_NET, "calling lib_init with nid "LPX64"\n", (ptl_nid_t)0);
+        lib_init(&ksocknal_lib, (ptl_nid_t)0, 0, 10, ptl_size, ac_size);
+        return (&ksocknal_api);
+}
+
+/*
+ *  EXTRA functions follow
+ */
+
 int
 ksocknal_set_mynid(ptl_nid_t nid)
 {
@@ -812,7 +832,7 @@ ksocknal_create_conn (ksock_route_t *route, struct socket *sock,
 
         /* Set the deadline for the outgoing HELLO to drain */
         conn->ksnc_tx_deadline = jiffies +
-                                 ksocknal_tunables.ksnd_io_timeout * HZ;
+                                 ksocknal_data.ksnd_io_timeout * HZ;
 
         list_add (&conn->ksnc_list, &peer->ksnp_conns);
         atomic_inc (&conn->ksnc_refcount);
@@ -1446,34 +1466,30 @@ ksocknal_free_buffers (void)
 }
 
 void
-ksocknal_api_shutdown (nal_t *nal)
+ksocknal_module_fini (void)
 {
         int   i;
 
-        if (nal->nal_refct != 0) {
-                /* This module got the first ref */
-                PORTAL_MODULE_UNUSE;
-                return;
-        }
-
         CDEBUG(D_MALLOC, "before NAL cleanup: kmem %d\n",
                atomic_read (&portal_kmemory));
 
-        LASSERT(nal == &ksocknal_api);
-
         switch (ksocknal_data.ksnd_init) {
         default:
                 LASSERT (0);
 
         case SOCKNAL_INIT_ALL:
-                libcfs_nal_cmd_unregister(SOCKNAL);
-
-                ksocknal_data.ksnd_init = SOCKNAL_INIT_LIB;
+#if CONFIG_SYSCTL
+                if (ksocknal_data.ksnd_sysctl != NULL)
+                        unregister_sysctl_table (ksocknal_data.ksnd_sysctl);
+#endif
+                kportal_nal_unregister(SOCKNAL);
+                PORTAL_SYMBOL_UNREGISTER (ksocknal_ni);
                 /* fall through */
 
-        case SOCKNAL_INIT_LIB:
+        case SOCKNAL_INIT_PTL:
                 /* No more calls to ksocknal_cmd() to create new
                  * autoroutes/connections since we're being unloaded. */
+                PtlNIFini(ksocknal_ni);
 
                 /* Delete all autoroute entries */
                 ksocknal_del_route(PTL_NID_ANY, 0, 0, 0);
@@ -1494,8 +1510,6 @@ ksocknal_api_shutdown (nal_t *nal)
 
                 /* Tell lib we've stopped calling into her. */
                 lib_fini(&ksocknal_lib);
-
-                ksocknal_data.ksnd_init = SOCKNAL_INIT_DATA;
                 /* fall through */
 
         case SOCKNAL_INIT_DATA:
@@ -1543,8 +1557,6 @@ ksocknal_api_shutdown (nal_t *nal)
                 kpr_deregister (&ksocknal_data.ksnd_router);
 
                 ksocknal_free_buffers();
-
-                ksocknal_data.ksnd_init = SOCKNAL_INIT_NOTHING;
                 /* fall through */
 
         case SOCKNAL_INIT_NOTHING:
@@ -1559,7 +1571,7 @@ ksocknal_api_shutdown (nal_t *nal)
 }
 
 
-void
+void __init
 ksocknal_init_incarnation (void)
 {
         struct timeval tv;
@@ -1575,31 +1587,42 @@ ksocknal_init_incarnation (void)
                 (((__u64)tv.tv_sec) * 1000000) + tv.tv_usec;
 }
 
-int
-ksocknal_api_startup (nal_t *nal, ptl_pid_t requested_pid,
-                      ptl_ni_limits_t *requested_limits,
-                      ptl_ni_limits_t *actual_limits)
+int __init
+ksocknal_module_init (void)
 {
-        ptl_process_id_t  process_id;
-        int               pkmem = atomic_read(&portal_kmemory);
-        int               rc;
-        int               i;
-        int               j;
+        int   pkmem = atomic_read(&portal_kmemory);
+        int   rc;
+        int   i;
+        int   j;
 
-        LASSERT (nal == &ksocknal_api);
+        /* packet descriptor must fit in a router descriptor's scratchpad */
+        LASSERT(sizeof (ksock_tx_t) <= sizeof (kprfd_scratch_t));
+        /* the following must be sizeof(int) for proc_dointvec() */
+        LASSERT(sizeof (ksocknal_data.ksnd_io_timeout) == sizeof (int));
+        LASSERT(sizeof (ksocknal_data.ksnd_eager_ack) == sizeof (int));
+        /* check ksnr_connected/connecting field large enough */
+        LASSERT(SOCKNAL_CONN_NTYPES <= 4);
+        
+        LASSERT (ksocknal_data.ksnd_init == SOCKNAL_INIT_NOTHING);
 
-        if (nal->nal_refct != 0) {
-                if (actual_limits != NULL)
-                        *actual_limits = ksocknal_lib.ni.actual_limits;
-                /* This module got the first ref */
-                PORTAL_MODULE_USE;
-                return (PTL_OK);
-        }
+        ksocknal_api.forward  = ksocknal_api_forward;
+        ksocknal_api.shutdown = ksocknal_api_shutdown;
+        ksocknal_api.validate = NULL;           /* our api validate is a NOOP */
+        ksocknal_api.lock     = ksocknal_api_lock;
+        ksocknal_api.unlock   = ksocknal_api_unlock;
+        ksocknal_api.nal_data = &ksocknal_data;
 
-        LASSERT (ksocknal_data.ksnd_init == SOCKNAL_INIT_NOTHING);
+        ksocknal_lib.nal_data = &ksocknal_data;
 
         memset (&ksocknal_data, 0, sizeof (ksocknal_data)); /* zero pointers */
 
+        ksocknal_data.ksnd_io_timeout = SOCKNAL_IO_TIMEOUT;
+        ksocknal_data.ksnd_eager_ack  = SOCKNAL_EAGER_ACK;
+        ksocknal_data.ksnd_typed_conns = SOCKNAL_TYPED_CONNS;
+        ksocknal_data.ksnd_min_bulk   = SOCKNAL_MIN_BULK;
+#if SOCKNAL_ZC
+        ksocknal_data.ksnd_zc_min_frag = SOCKNAL_ZC_MIN_FRAG;
+#endif
         ksocknal_init_incarnation();
         
         ksocknal_data.ksnd_peer_hash_size = SOCKNAL_PEER_HASH_SIZE;
@@ -1646,7 +1669,7 @@ ksocknal_api_startup (nal_t *nal, ptl_pid_t requested_pid,
         PORTAL_ALLOC(ksocknal_data.ksnd_schedulers,
                      sizeof(ksock_sched_t) * SOCKNAL_N_SCHED);
         if (ksocknal_data.ksnd_schedulers == NULL) {
-                ksocknal_api_shutdown (&ksocknal_api);
+                ksocknal_module_fini ();
                 return (-ENOMEM);
         }
 
@@ -1662,19 +1685,15 @@ ksocknal_api_startup (nal_t *nal, ptl_pid_t requested_pid,
                 init_waitqueue_head (&kss->kss_waitq);
         }
 
-        /* NB we have to wait to be told our true NID... */
-        process_id.pid = 0;
-        process_id.nid = 0;
-        
-        rc = lib_init(&ksocknal_lib, process_id,
-                      requested_limits, actual_limits);
-        if (rc != PTL_OK) {
-                CERROR("lib_init failed: error %d\n", rc);
-                ksocknal_api_shutdown (&ksocknal_api);
+        rc = PtlNIInit(ksocknal_init, 32, 4, 0, &ksocknal_ni);
+        if (rc != 0) {
+                CERROR("ksocknal: PtlNIInit failed: error %d\n", rc);
+                ksocknal_module_fini ();
                 return (rc);
         }
+        PtlNIDebug(ksocknal_ni, ~0);
 
-        ksocknal_data.ksnd_init = SOCKNAL_INIT_LIB; // flag lib_init() called
+        ksocknal_data.ksnd_init = SOCKNAL_INIT_PTL; // flag PtlNIInit() called
 
         for (i = 0; i < SOCKNAL_N_SCHED; i++) {
                 rc = ksocknal_thread_start (ksocknal_scheduler,
@@ -1682,7 +1701,7 @@ ksocknal_api_startup (nal_t *nal, ptl_pid_t requested_pid,
                 if (rc != 0) {
                         CERROR("Can't spawn socknal scheduler[%d]: %d\n",
                                i, rc);
-                        ksocknal_api_shutdown (&ksocknal_api);
+                        ksocknal_module_fini ();
                         return (rc);
                 }
         }
@@ -1691,7 +1710,7 @@ ksocknal_api_startup (nal_t *nal, ptl_pid_t requested_pid,
                 rc = ksocknal_thread_start (ksocknal_autoconnectd, (void *)((long)i));
                 if (rc != 0) {
                         CERROR("Can't spawn socknal autoconnectd: %d\n", rc);
-                        ksocknal_api_shutdown (&ksocknal_api);
+                        ksocknal_module_fini ();
                         return (rc);
                 }
         }
@@ -1699,7 +1718,7 @@ ksocknal_api_startup (nal_t *nal, ptl_pid_t requested_pid,
         rc = ksocknal_thread_start (ksocknal_reaper, NULL);
         if (rc != 0) {
                 CERROR ("Can't spawn socknal reaper: %d\n", rc);
-                ksocknal_api_shutdown (&ksocknal_api);
+                ksocknal_module_fini ();
                 return (rc);
         }
 
@@ -1709,7 +1728,7 @@ ksocknal_api_startup (nal_t *nal, ptl_pid_t requested_pid,
                 CDEBUG(D_NET, "Can't initialise routing interface "
                        "(rc = %d): not routing\n", rc);
         } else {
-                /* Only allocate forwarding buffers if there's a router */
+                /* Only allocate forwarding buffers if I'm on a gateway */
 
                 for (i = 0; i < (SOCKNAL_SMALL_FWD_NMSGS +
                                  SOCKNAL_LARGE_FWD_NMSGS); i++) {
@@ -1725,7 +1744,7 @@ ksocknal_api_startup (nal_t *nal, ptl_pid_t requested_pid,
                         PORTAL_ALLOC(fmb, offsetof(ksock_fmb_t, 
                                                    fmb_kiov[pool->fmp_buff_pages]));
                         if (fmb == NULL) {
-                                ksocknal_api_shutdown(&ksocknal_api);
+                                ksocknal_module_fini();
                                 return (-ENOMEM);
                         }
 
@@ -1735,7 +1754,7 @@ ksocknal_api_startup (nal_t *nal, ptl_pid_t requested_pid,
                                 fmb->fmb_kiov[j].kiov_page = alloc_page(GFP_KERNEL);
 
                                 if (fmb->fmb_kiov[j].kiov_page == NULL) {
-                                        ksocknal_api_shutdown (&ksocknal_api);
+                                        ksocknal_module_fini ();
                                         return (-ENOMEM);
                                 }
 
@@ -1746,13 +1765,19 @@ ksocknal_api_startup (nal_t *nal, ptl_pid_t requested_pid,
                 }
         }
 
-        rc = libcfs_nal_cmd_register(SOCKNAL, &ksocknal_cmd, NULL);
+        rc = kportal_nal_register(SOCKNAL, &ksocknal_cmd, NULL);
         if (rc != 0) {
                 CERROR ("Can't initialise command interface (rc = %d)\n", rc);
-                ksocknal_api_shutdown (&ksocknal_api);
+                ksocknal_module_fini ();
                 return (rc);
         }
 
+        PORTAL_SYMBOL_REGISTER(ksocknal_ni);
+
+#ifdef CONFIG_SYSCTL
+        /* Press on regardless even if registering sysctl doesn't work */
+        ksocknal_data.ksnd_sysctl = register_sysctl_table (ksocknal_top_ctl_table, 0);
+#endif
         /* flag everything initialised */
         ksocknal_data.ksnd_init = SOCKNAL_INIT_ALL;
 
@@ -1764,75 +1789,6 @@ ksocknal_api_startup (nal_t *nal, ptl_pid_t requested_pid,
         return (0);
 }
 
-void __exit
-ksocknal_module_fini (void)
-{
-#ifdef CONFIG_SYSCTL
-        if (ksocknal_tunables.ksnd_sysctl != NULL)
-                unregister_sysctl_table (ksocknal_tunables.ksnd_sysctl);
-#endif
-        PtlNIFini(ksocknal_ni);
-
-        ptl_unregister_nal(SOCKNAL);
-}
-
-int __init
-ksocknal_module_init (void)
-{
-        int    rc;
-
-        /* packet descriptor must fit in a router descriptor's scratchpad */
-        LASSERT(sizeof (ksock_tx_t) <= sizeof (kprfd_scratch_t));
-        /* the following must be sizeof(int) for proc_dointvec() */
-        LASSERT(sizeof (ksocknal_tunables.ksnd_io_timeout) == sizeof (int));
-        LASSERT(sizeof (ksocknal_tunables.ksnd_eager_ack) == sizeof (int));
-        LASSERT(sizeof (ksocknal_tunables.ksnd_typed_conns) == sizeof (int));
-        LASSERT(sizeof (ksocknal_tunables.ksnd_min_bulk) == sizeof (int));
-#if SOCKNAL_ZC
-        LASSERT(sizeof (ksocknal_tunables.ksnd_zc_min_frag) == sizeof (int));
-#endif
-        /* check ksnr_connected/connecting field large enough */
-        LASSERT(SOCKNAL_CONN_NTYPES <= 4);
-        
-        ksocknal_api.startup  = ksocknal_api_startup;
-        ksocknal_api.forward  = ksocknal_api_forward;
-        ksocknal_api.shutdown = ksocknal_api_shutdown;
-        ksocknal_api.lock     = ksocknal_api_lock;
-        ksocknal_api.unlock   = ksocknal_api_unlock;
-        ksocknal_api.nal_data = &ksocknal_data;
-
-        ksocknal_lib.nal_data = &ksocknal_data;
-
-        /* Initialise dynamic tunables to defaults once only */
-        ksocknal_tunables.ksnd_io_timeout = SOCKNAL_IO_TIMEOUT;
-        ksocknal_tunables.ksnd_eager_ack  = SOCKNAL_EAGER_ACK;
-        ksocknal_tunables.ksnd_typed_conns = SOCKNAL_TYPED_CONNS;
-        ksocknal_tunables.ksnd_min_bulk   = SOCKNAL_MIN_BULK;
-#if SOCKNAL_ZC
-        ksocknal_tunables.ksnd_zc_min_frag = SOCKNAL_ZC_MIN_FRAG;
-#endif
-
-        rc = ptl_register_nal(SOCKNAL, &ksocknal_api);
-        if (rc != PTL_OK) {
-                CERROR("Can't register SOCKNAL: %d\n", rc);
-                return (-ENOMEM);               /* or something... */
-        }
-
-        /* Pure gateways want the NAL started up at module load time... */
-        rc = PtlNIInit(SOCKNAL, 0, NULL, NULL, &ksocknal_ni);
-        if (rc != PTL_OK && rc != PTL_IFACE_DUP) {
-                ptl_unregister_nal(SOCKNAL);
-                return (-ENODEV);
-        }
-        
-#ifdef CONFIG_SYSCTL
-        /* Press on regardless even if registering sysctl doesn't work */
-        ksocknal_tunables.ksnd_sysctl = 
-                register_sysctl_table (ksocknal_top_ctl_table, 0);
-#endif
-        return (0);
-}
-
 MODULE_AUTHOR("Cluster File Systems, Inc. <info@clusterfs.com>");
 MODULE_DESCRIPTION("Kernel TCP Socket NAL v0.01");
 MODULE_LICENSE("GPL");
@@ -1840,3 +1796,4 @@ MODULE_LICENSE("GPL");
 module_init(ksocknal_module_init);
 module_exit(ksocknal_module_fini);
 
+EXPORT_SYMBOL (ksocknal_ni);
diff --git a/lustre/portals/knals/socknal/socknal.h b/lustre/portals/knals/socknal/socknal.h
index e1e3aac..bd3c1fb 100644
--- a/lustre/portals/knals/socknal/socknal.h
+++ b/lustre/portals/knals/socknal/socknal.h
@@ -64,7 +64,6 @@
 #include <linux/kpr.h>
 #include <portals/p30.h>
 #include <portals/lib-p30.h>
-#include <portals/nal.h>
 #include <portals/socknal.h>
 
 #if CONFIG_SMP
@@ -142,6 +141,7 @@ typedef struct {
 } ksock_irqinfo_t;
 
 typedef struct {
+        int               ksnd_init;            /* initialisation state */
         int               ksnd_io_timeout;      /* "stuck" socket timeout (seconds) */
         int               ksnd_eager_ack;       /* make TCP ack eagerly? */
         int               ksnd_typed_conns;     /* drive sockets by type? */
@@ -150,10 +150,6 @@ typedef struct {
         unsigned int      ksnd_zc_min_frag;     /* minimum zero copy frag size */
 #endif
         struct ctl_table_header *ksnd_sysctl;   /* sysctl interface */
-} ksock_tunables_t;
-
-typedef struct {
-        int               ksnd_init;            /* initialisation state */
         __u64             ksnd_incarnation;     /* my epoch */
         
         rwlock_t          ksnd_global_lock;     /* stabilize peer/conn ops */
@@ -198,7 +194,7 @@ typedef struct {
 
 #define SOCKNAL_INIT_NOTHING    0
 #define SOCKNAL_INIT_DATA       1
-#define SOCKNAL_INIT_LIB        2
+#define SOCKNAL_INIT_PTL        2
 #define SOCKNAL_INIT_ALL        3
 
 /* A packet just assembled for transmission is represented by 1 or more
@@ -366,7 +362,6 @@ typedef struct ksock_peer
 
 extern nal_cb_t         ksocknal_lib;
 extern ksock_nal_data_t ksocknal_data;
-extern ksock_tunables_t ksocknal_tunables;
 
 static inline struct list_head *
 ksocknal_nid2peerlist (ptl_nid_t nid) 
diff --git a/lustre/portals/knals/socknal/socknal_cb.c b/lustre/portals/knals/socknal/socknal_cb.c
index 21e0abe..ebb32da 100644
--- a/lustre/portals/knals/socknal/socknal_cb.c
+++ b/lustre/portals/knals/socknal/socknal_cb.c
@@ -24,9 +24,6 @@
  */
 
 #include "socknal.h"
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-# include <linux/syscalls.h>
-#endif
 
 /*
  *  LIB functions follow
@@ -265,7 +262,7 @@ ksocknal_send_kiov (ksock_conn_t *conn, ksock_tx_t *tx)
         LASSERT (tx->tx_nkiov > 0);
 
 #if SOCKNAL_ZC
-        if (fragsize >= ksocknal_tunables.ksnd_zc_min_frag &&
+        if (fragsize >= ksocknal_data.ksnd_zc_min_frag &&
             (sock->sk->route_caps & NETIF_F_SG) &&
             (sock->sk->route_caps & (NETIF_F_IP_CSUM | NETIF_F_NO_CSUM | NETIF_F_HW_CSUM))) {
 
@@ -384,7 +381,7 @@ ksocknal_transmit (ksock_conn_t *conn, ksock_tx_t *tx)
                  * is set.  Instead, we presume peer death has occurred if
                  * the socket doesn't drain within a timout */
                 conn->ksnc_tx_deadline = jiffies + 
-                                         ksocknal_tunables.ksnd_io_timeout * HZ;
+                                         ksocknal_data.ksnd_io_timeout * HZ;
                 conn->ksnc_peer->ksnp_last_alive = jiffies;
 
         } while (tx->tx_resid != 0);
@@ -447,7 +444,7 @@ ksocknal_recv_iov (ksock_conn_t *conn)
         /* received something... */
         conn->ksnc_peer->ksnp_last_alive = jiffies;
         conn->ksnc_rx_deadline = jiffies + 
-                                 ksocknal_tunables.ksnd_io_timeout * HZ;
+                                 ksocknal_data.ksnd_io_timeout * HZ;
         mb();                           /* order with setting rx_started */
         conn->ksnc_rx_started = 1;
 
@@ -506,7 +503,7 @@ ksocknal_recv_kiov (ksock_conn_t *conn)
         /* received something... */
         conn->ksnc_peer->ksnp_last_alive = jiffies;
         conn->ksnc_rx_deadline = jiffies + 
-                                 ksocknal_tunables.ksnd_io_timeout * HZ;
+                                 ksocknal_data.ksnd_io_timeout * HZ;
         mb();                           /* order with setting rx_started */
         conn->ksnc_rx_started = 1;
 
@@ -565,7 +562,7 @@ ksocknal_receive (ksock_conn_t *conn)
 
                 if (conn->ksnc_rx_nob_wanted == 0) {
                         /* Completed a message segment (header or payload) */
-                        if ((ksocknal_tunables.ksnd_eager_ack & conn->ksnc_type) != 0 &&
+                        if ((ksocknal_data.ksnd_eager_ack & conn->ksnc_type) != 0 &&
                             (conn->ksnc_rx_state ==  SOCKNAL_RX_BODY ||
                              conn->ksnc_rx_state == SOCKNAL_RX_BODY_FWD)) {
                                 /* Remind the socket to ack eagerly... */
@@ -726,7 +723,7 @@ ksocknal_launch_autoconnect_locked (ksock_route_t *route)
         LASSERT ((route->ksnr_connected & KSNR_TYPED_ROUTES) != KSNR_TYPED_ROUTES);
         LASSERT (!route->ksnr_connecting);
         
-        if (ksocknal_tunables.ksnd_typed_conns)
+        if (ksocknal_data.ksnd_typed_conns)
                 route->ksnr_connecting = 
                         KSNR_TYPED_ROUTES & ~route->ksnr_connected;
         else
@@ -800,7 +797,7 @@ ksocknal_find_conn_locked (ksock_tx_t *tx, ksock_peer_t *peer)
                         fnob     = nob;
                 }
 
-                if (!ksocknal_tunables.ksnd_typed_conns)
+                if (!ksocknal_data.ksnd_typed_conns)
                         continue;
 
                 switch (c->ksnc_type) {
@@ -811,11 +808,11 @@ ksocknal_find_conn_locked (ksock_tx_t *tx, ksock_peer_t *peer)
                 case SOCKNAL_CONN_BULK_IN:
                         continue;
                 case SOCKNAL_CONN_BULK_OUT:
-                        if (tx->tx_nob < ksocknal_tunables.ksnd_min_bulk)
+                        if (tx->tx_nob < ksocknal_data.ksnd_min_bulk)
                                 continue;
                         break;
                 case SOCKNAL_CONN_CONTROL:
-                        if (tx->tx_nob >= ksocknal_tunables.ksnd_min_bulk)
+                        if (tx->tx_nob >= ksocknal_data.ksnd_min_bulk)
                                 continue;
                         break;
                 }
@@ -859,7 +856,7 @@ ksocknal_queue_tx_locked (ksock_tx_t *tx, ksock_conn_t *conn)
         spin_lock_irqsave (&sched->kss_lock, flags);
 
         conn->ksnc_tx_deadline = jiffies + 
-                                 ksocknal_tunables.ksnd_io_timeout * HZ;
+                                 ksocknal_data.ksnd_io_timeout * HZ;
         mb();                                   /* order with list_add_tail */
 
         list_add_tail (&tx->tx_list, &conn->ksnc_tx_queue);
@@ -2185,7 +2182,7 @@ ksocknal_setup_sock (struct socket *sock)
         /* Keepalives: If 3/4 of the timeout elapses, start probing every
          * second until the timeout elapses. */
 
-        option = (ksocknal_tunables.ksnd_io_timeout * 3) / 4;
+        option = (ksocknal_data.ksnd_io_timeout * 3) / 4;
         set_fs (KERNEL_DS);
         rc = sock->ops->setsockopt (sock, SOL_TCP, TCP_KEEPIDLE,
                                     (char *)&option, sizeof (option));
@@ -2205,7 +2202,7 @@ ksocknal_setup_sock (struct socket *sock)
                 return (rc);
         }
         
-        option = ksocknal_tunables.ksnd_io_timeout / 4;
+        option = ksocknal_data.ksnd_io_timeout / 4;
         set_fs (KERNEL_DS);
         rc = sock->ops->setsockopt (sock, SOL_TCP, TCP_KEEPCNT,
                                     (char *)&option, sizeof (option));
@@ -2262,7 +2259,7 @@ ksocknal_connect_peer (ksock_route_t *route, int type)
 
         /* Set the socket timeouts, so our connection attempt completes in
          * finite time */
-        tv.tv_sec = ksocknal_tunables.ksnd_io_timeout;
+        tv.tv_sec = ksocknal_data.ksnd_io_timeout;
         tv.tv_usec = 0;
 
         set_fs (KERNEL_DS);
@@ -2271,7 +2268,7 @@ ksocknal_connect_peer (ksock_route_t *route, int type)
         set_fs (oldmm);
         if (rc != 0) {
                 CERROR ("Can't set send timeout %d: %d\n", 
-                        ksocknal_tunables.ksnd_io_timeout, rc);
+                        ksocknal_data.ksnd_io_timeout, rc);
                 goto out;
         }
         
@@ -2281,7 +2278,7 @@ ksocknal_connect_peer (ksock_route_t *route, int type)
         set_fs (oldmm);
         if (rc != 0) {
                 CERROR ("Can't set receive timeout %d: %d\n",
-                        ksocknal_tunables.ksnd_io_timeout, rc);
+                        ksocknal_data.ksnd_io_timeout, rc);
                 goto out;
         }
 
@@ -2655,9 +2652,9 @@ ksocknal_reaper (void *arg)
                          * timeout on any connection within (n+1)/n times the
                          * timeout interval. */
 
-                        if (ksocknal_tunables.ksnd_io_timeout > n * p)
+                        if (ksocknal_data.ksnd_io_timeout > n * p)
                                 chunk = (chunk * n * p) / 
-                                        ksocknal_tunables.ksnd_io_timeout;
+                                        ksocknal_data.ksnd_io_timeout;
                         if (chunk == 0)
                                 chunk = 1;
 
diff --git a/lustre/portals/libcfs/.cvsignore b/lustre/portals/libcfs/.cvsignore
index c6f0aa4..7fa686f 100644
--- a/lustre/portals/libcfs/.cvsignore
+++ b/lustre/portals/libcfs/.cvsignore
@@ -1,11 +1,5 @@
 .deps
 Makefile
+Makefile.in
 link-stamp
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+.*.o.cmd
diff --git a/lustre/portals/libcfs/Makefile.am b/lustre/portals/libcfs/Makefile.am
new file mode 100644
index 0000000..4f0b303
--- /dev/null
+++ b/lustre/portals/libcfs/Makefile.am
@@ -0,0 +1,20 @@
+# Copyright (C) 2001, 2002 Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+
+MODULE = libcfs
+modulenet_DATA = libcfs.o
+EXTRA_PROGRAMS = libcfs
+
+DISTCLEANFILES = *.orig *.rej
+
+DEFS =
+libcfs_SOURCES = module.c proc.c debug.c lwt.c
+
+# Don't distribute any patched files.
+dist-hook:
+	list='$(EXT2C)'; for f in $$list; do rm -f $(distdir)/$$f; done
+
+include ../Rules.linux
diff --git a/lustre/portals/libcfs/Makefile.in b/lustre/portals/libcfs/Makefile.in
deleted file mode 100644
index 6f9c981..0000000
--- a/lustre/portals/libcfs/Makefile.in
+++ /dev/null
@@ -1,4 +0,0 @@
-MODULES = libcfs
-libcfs-objs := debug.o lwt.o module.o proc.o
-
-@INCLUDE_RULES@
diff --git a/lustre/portals/libcfs/autoMakefile.am b/lustre/portals/libcfs/autoMakefile.am
deleted file mode 100644
index 192c3ef..0000000
--- a/lustre/portals/libcfs/autoMakefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (C) 2001, 2002 Cluster File Systems, Inc.
-#
-# This code is issued under the GNU General Public License.
-# See the file COPYING in this distribution
-
-if MODULES
-modulenet_DATA := libcfs$(KMODEXT)
-endif
-
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-DIST_SOURCES = $(libcfs-objs:%.o=%.c)
diff --git a/lustre/portals/libcfs/debug.c b/lustre/portals/libcfs/debug.c
index 2fb06dd..be117b8 100644
--- a/lustre/portals/libcfs/debug.c
+++ b/lustre/portals/libcfs/debug.c
@@ -45,7 +45,6 @@
 #include <asm/uaccess.h>
 #include <asm/segment.h>
 #include <linux/miscdevice.h>
-#include <linux/version.h>
 
 # define DEBUG_SUBSYSTEM S_PORTALS
 
@@ -53,16 +52,12 @@
 #include <linux/portals_compat25.h>
 #include <linux/libcfs.h>
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-#include <linux/kallsyms.h>
-#endif
-
 unsigned int portal_subsystem_debug = ~0 - (S_PORTALS | S_QSWNAL | S_SOCKNAL |
                                             S_GMNAL | S_IBNAL);
 EXPORT_SYMBOL(portal_subsystem_debug);
 
 unsigned int portal_debug = (D_WARNING | D_DLMTRACE | D_ERROR | D_EMERG | D_HA |
-                             D_RPCTRACE | D_VFSTRACE);
+                             D_RPCTRACE | D_VFSTRACE | 0xffffffff);
 EXPORT_SYMBOL(portal_debug);
 
 unsigned int portal_cerror = 1;
@@ -84,7 +79,7 @@ static char *debug_buf = NULL;
 static unsigned long debug_size = 0;
 static atomic_t debug_off_a = ATOMIC_INIT(0);
 static int debug_wrapped;
-static DECLARE_WAIT_QUEUE_HEAD(debug_ctlwq);
+wait_queue_head_t debug_ctlwq;
 #define DAEMON_SND_SIZE      (64 << 10)
 
 /*
@@ -271,7 +266,7 @@ int portals_do_debug_dumplog(void *arg)
                        PTR_ERR(file));
                 GOTO(out, PTR_ERR(file));
         } else {
-                printk(KERN_ALERT "LustreError: dumping log to %s ...\n",
+                printk(KERN_ALERT "LustreError: dumping log to %s ... writing ...\n",
                        debug_file_name);
         }
 
@@ -444,26 +439,18 @@ void portals_debug_print(void)
 void portals_debug_dumplog(void)
 {
         int rc;
-        DECLARE_WAITQUEUE(wait, current);
         ENTRY;
 
-        /* we're being careful to ensure that the kernel thread is
-         * able to set our state to running as it exits before we
-         * get to schedule() */
-        set_current_state(TASK_INTERRUPTIBLE);
-        add_wait_queue(&debug_ctlwq, &wait);
+        init_waitqueue_head(&debug_ctlwq);
 
         rc = kernel_thread(portals_do_debug_dumplog,
                            NULL, CLONE_VM | CLONE_FS | CLONE_FILES);
-        if (rc < 0)
+        if (rc < 0) {
                 printk(KERN_ERR "LustreError: cannot start log dump thread: "
                        "%d\n", rc);
-        else
-                schedule();
-
-        /* be sure to teardown if kernel_thread() failed */
-        remove_wait_queue(&debug_ctlwq, &wait);
-        set_current_state(TASK_RUNNING);
+                return;
+        }
+        sleep_on(&debug_ctlwq);
 }
 
 int portals_debug_daemon_start(char *file, unsigned int size)
@@ -605,7 +592,7 @@ int portals_debug_init(unsigned long bufsize)
         debug_buf = vmalloc(bufsize + DEBUG_OVERFLOW);
         if (debug_buf == NULL)
                 return -ENOMEM;
-        memset(debug_buf, 0, bufsize + DEBUG_OVERFLOW);
+        memset(debug_buf, 0, debug_size);
         debug_wrapped = 0;
 
         //printk(KERN_INFO "Portals: allocated %lu byte debug buffer at %p.\n",
@@ -699,7 +686,7 @@ __s32 portals_debug_copy_to_user(char *buf, unsigned long len)
                         rc = -ENOMEM;
                         goto cleanup;
                 }
-                list_add(&PAGE_LIST(page), &my_pages);
+                list_add(&page->list, &my_pages);
         }
 
         spin_lock_irqsave(&portals_debug_lock, flags);
@@ -724,7 +711,7 @@ __s32 portals_debug_copy_to_user(char *buf, unsigned long len)
                 unsigned long to_copy;
                 void *addr;
 
-                page = list_entry(pos, struct page, PAGE_LIST_ENTRY);
+                page = list_entry(pos, struct page, list);
                 to_copy = min(total - off, PAGE_SIZE);
                 if (to_copy == 0) {
                         off = 0;
@@ -753,7 +740,7 @@ finish_partial:
         off = 0;
         list_for_each(pos, &my_pages) {
                 unsigned long to_copy;
-                page = list_entry(pos, struct page, PAGE_LIST_ENTRY);
+                page = list_entry(pos, struct page, list);
 
                 to_copy = min(copied - off, PAGE_SIZE);
                 rc = copy_to_user(buf + off, kmap(page), to_copy);
@@ -770,8 +757,8 @@ finish_partial:
 
 cleanup:
         list_for_each_safe(pos, n, &my_pages) {
-                page = list_entry(pos, struct page, PAGE_LIST_ENTRY);
-                list_del(&PAGE_LIST(page));
+                page = list_entry(pos, struct page, list);
+                list_del(&page->list);
                 __free_page(page);
         }
         return rc;
@@ -962,26 +949,23 @@ void portals_run_lbug_upcall(char *file, const char *fn, const int line)
 char *portals_nid2str(int nal, ptl_nid_t nid, char *str)
 {
         switch(nal){
-/* XXX this could be a nal method of some sort, 'cept it's config
- * dependent whether (say) socknal NIDs are actually IP addresses... */
+/* XXX this should be a nal method of some sort */
 #ifndef CRAY_PORTALS 
         case TCPNAL:
                 /* userspace NAL */
         case SOCKNAL:
-                snprintf(str, PTL_NALFMT_SIZE - 1, "%u:%u.%u.%u.%u",
-                         (__u32)(nid >> 32), HIPQUAD(nid));
+                sprintf(str, "%u:%d.%d.%d.%d", (__u32)(nid >> 32),
+                        HIPQUAD(nid));
                 break;
         case QSWNAL:
         case GMNAL:
         case IBNAL:
-                snprintf(str, PTL_NALFMT_SIZE - 1, "%u:%u",
-                         (__u32)(nid >> 32), (__u32)nid);
+        case SCIMACNAL:
+                sprintf(str, "%u:%u", (__u32)(nid >> 32), (__u32)nid);
                 break;
 #endif
         default:
-                snprintf(str, PTL_NALFMT_SIZE - 1, "?%d? %llx",
-                         nal, (long long)nid);
-                break;
+                snprintf(str, PTL_NALFMT_SIZE-1, "(?%llx)", (long long)nid);
         }
         return str;
 }
@@ -992,6 +976,8 @@ spinlock_t stack_backtrace_lock = SPIN_LOCK_UNLOCKED;
 
 #if defined(__arch_um__)
 
+extern int is_kernel_text_address(unsigned long addr);
+
 char *portals_debug_dumpstack(void)
 {
         asm("int $3");
@@ -1000,45 +986,33 @@ char *portals_debug_dumpstack(void)
 
 #elif defined(__i386__)
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
+extern int is_kernel_text_address(unsigned long addr);
 extern int lookup_symbol(unsigned long address, char *buf, int buflen);
-const char *kallsyms_lookup(unsigned long addr,
-                            unsigned long *symbolsize,
-                            unsigned long *offset,
-                            char **modname, char *namebuf)
-{
-        int rc = lookup_symbol(addr, namebuf, 128);
-        if (rc == -ENOSYS)
-                return NULL;
-        return namebuf;
-}
-#endif
 
 char *portals_debug_dumpstack(void)
 {
-        unsigned long esp = current->thread.esp, addr;
+        unsigned long esp = current->thread.esp;
         unsigned long *stack = (unsigned long *)&esp;
-        char *buf = stack_backtrace, *pbuf = buf;
         int size;
+        unsigned long addr;
+        char *buf = stack_backtrace;
+        char *pbuf = buf;
+        static char buffer[512];
+        int rc = 0;
 
         /* User space on another CPU? */
-        if ((esp ^ (unsigned long)current) & (PAGE_MASK << 1)){
+        if ((esp ^ (unsigned long)current) & (PAGE_MASK<<1)){
                 buf[0] = '\0';
                 goto out;
         }
 
         size = sprintf(pbuf, " Call Trace: ");
         pbuf += size;
-        while (((long) stack & (THREAD_SIZE - 1)) != 0) {
+        while (((long) stack & (THREAD_SIZE-1)) != 0) {
                 addr = *stack++;
-                if (kernel_text_address(addr)) {
-                        const char *sym_name;
-                        char *modname, buffer[128];
-                        unsigned long junk, offset;
-
-                        sym_name = kallsyms_lookup(addr, &junk, &offset,
-                                                   &modname, buffer);
-                        if (sym_name == NULL) {
+                if (is_kernel_text_address(addr)) {
+                        rc = lookup_symbol(addr, buffer, 512);
+                        if (rc == -ENOSYS) {
                                 if (buf + LUSTRE_TRACE_SIZE <= pbuf + 12)
                                         break;
                                 size = sprintf(pbuf, "[<%08lx>] ", addr);
@@ -1048,7 +1022,7 @@ char *portals_debug_dumpstack(void)
                                     <= pbuf + strlen(buffer) + 28 + 1)
                                         break;
                                 size = sprintf(pbuf, "([<%08lx>] %s (0x%p)) ",
-                                               addr, buffer, stack - 1);
+                                               addr, buffer, stack-1);
                         }
                         pbuf += size;
                 }
diff --git a/lustre/portals/libcfs/module.c b/lustre/portals/libcfs/module.c
index 4e63c86..9daa8e0 100644
--- a/lustre/portals/libcfs/module.c
+++ b/lustre/portals/libcfs/module.c
@@ -51,13 +51,7 @@
 
 #define PORTAL_MINOR 240
 
-struct nal_cmd_handler {
-        nal_cmd_handler_fn  *nch_handler;
-        void                *nch_private;
-};
-
-static struct nal_cmd_handler nal_cmd[NAL_MAX_NR + 1];
-static DECLARE_MUTEX(nal_cmd_sem);
+extern void (kping_client)(struct portal_ioctl_data *);
 
 #ifdef PORTAL_DEBUG
 void kportal_assertion_failed(char *expr, char *file, const char *func,
@@ -245,62 +239,6 @@ static inline void freedata(void *data, int len)
         PORTAL_FREE(data, len);
 }
 
-int
-libcfs_nal_cmd_register(int nal, nal_cmd_handler_fn *handler, void *private)
-{
-        int rc = 0;
-
-        CDEBUG(D_IOCTL, "Register NAL %d, handler: %p\n", nal, handler);
-
-        if (nal > 0  && nal <= NAL_MAX_NR) {
-                down(&nal_cmd_sem);
-                if (nal_cmd[nal].nch_handler != NULL)
-                        rc = -EBUSY;
-                else {
-                        nal_cmd[nal].nch_handler = handler;
-                        nal_cmd[nal].nch_private = private;
-                }
-                up(&nal_cmd_sem);
-        }
-        return rc;
-}
-EXPORT_SYMBOL(libcfs_nal_cmd_register);
-
-void
-libcfs_nal_cmd_unregister(int nal)
-{
-        CDEBUG(D_IOCTL, "Unregister NAL %d\n", nal);
-
-        LASSERT(nal > 0 && nal <= NAL_MAX_NR);
-        LASSERT(nal_cmd[nal].nch_handler != NULL);
-
-        down(&nal_cmd_sem);
-        nal_cmd[nal].nch_handler = NULL;
-        nal_cmd[nal].nch_private = NULL;
-        up(&nal_cmd_sem);
-}
-EXPORT_SYMBOL(libcfs_nal_cmd_unregister);
-
-int
-libcfs_nal_cmd(struct portals_cfg *pcfg)
-{
-        __u32 nal = pcfg->pcfg_nal;
-        int   rc = -EINVAL;
-        ENTRY;
-
-        down(&nal_cmd_sem);
-        if (nal > 0 && nal <= NAL_MAX_NR && 
-            nal_cmd[nal].nch_handler != NULL) {
-                CDEBUG(D_IOCTL, "calling handler nal: %d, cmd: %d\n", nal, 
-                       pcfg->pcfg_command);
-                rc = nal_cmd[nal].nch_handler(pcfg, nal_cmd[nal].nch_private);
-        }
-        up(&nal_cmd_sem);
-
-        RETURN(rc);
-}
-EXPORT_SYMBOL(libcfs_nal_cmd);
-
 static DECLARE_RWSEM(ioctl_list_sem);
 static LIST_HEAD(ioctl_list);
 
@@ -401,22 +339,14 @@ static int libcfs_ioctl(struct inode *inode, struct file *file,
                 err = lwt_control (data->ioc_flags, data->ioc_misc);
                 break;
                 
-        case IOC_PORTAL_LWT_SNAPSHOT: {
-                cycles_t   now;
-                int        ncpu;
-                int        total_size;
-                
-                err = lwt_snapshot (&now, &ncpu, &total_size,
+        case IOC_PORTAL_LWT_SNAPSHOT:
+                err = lwt_snapshot (&data->ioc_nid,
+                                    &data->ioc_count, &data->ioc_misc,
                                     data->ioc_pbuf1, data->ioc_plen1);
-                data->ioc_nid = now;
-                data->ioc_count = ncpu;
-                data->ioc_misc = total_size;
-
                 if (err == 0 &&
                     copy_to_user((char *)arg, data, sizeof (*data)))
                         err = -EFAULT;
                 break;
-        }
                 
         case IOC_PORTAL_LWT_LOOKUP_STRING:
                 err = lwt_lookup_string (&data->ioc_count, data->ioc_pbuf1,
@@ -426,33 +356,6 @@ static int libcfs_ioctl(struct inode *inode, struct file *file,
                         err = -EFAULT;
                 break;
 #endif
-        case IOC_PORTAL_NAL_CMD: {
-                struct portals_cfg pcfg;
-
-                if (data->ioc_plen1 != sizeof(pcfg)) {
-                        CERROR("Bad ioc_plen1 %d (wanted %d)\n",
-                               data->ioc_plen1, sizeof(pcfg));
-                        err = -EINVAL;
-                        break;
-                }
-
-                if (copy_from_user(&pcfg, (void *)data->ioc_pbuf1, 
-                                   sizeof(pcfg))) {
-                        err = -EFAULT;
-                        break;
-                }
-
-                CDEBUG (D_IOCTL, "nal command nal %d cmd %d\n", pcfg.pcfg_nal,
-                        pcfg.pcfg_command);
-                err = libcfs_nal_cmd(&pcfg);
-
-                if (err == 0 &&
-                    copy_to_user((char *)data->ioc_pbuf1, &pcfg, 
-                                 sizeof (pcfg)))
-                        err = -EFAULT;
-                break;
-        }
-
         case IOC_PORTAL_MEMHOG:
                 if (!capable (CAP_SYS_ADMIN))
                         err = -EPERM;
diff --git a/lustre/portals/libcfs/proc.c b/lustre/portals/libcfs/proc.c
index c850f69..c1b2aec 100644
--- a/lustre/portals/libcfs/proc.c
+++ b/lustre/portals/libcfs/proc.c
@@ -62,18 +62,16 @@ extern char debug_daemon_file_path[1024];
 extern char portals_upcall[1024];
 
 #define PSDEV_PORTALS  (0x100)
-enum {
-        PSDEV_DEBUG = 1,          /* control debugging */
-        PSDEV_SUBSYSTEM_DEBUG,    /* control debugging */
-        PSDEV_PRINTK,             /* force all errors to console */
-        PSDEV_CONSOLE,            /* allow _any_ messages to console */
-        PSDEV_DEBUG_PATH,         /* crashdump log location */
-        PSDEV_DEBUG_DUMP_PATH,    /* crashdump tracelog location */
-        PSDEV_PORTALS_UPCALL,     /* User mode upcall script  */
-        PSDEV_PORTALS_MEMUSED,    /* bytes currently PORTAL_ALLOCated */
-};
-
-static struct ctl_table portals_table[] = {
+#define PSDEV_DEBUG           1   /* control debugging */
+#define PSDEV_SUBSYSTEM_DEBUG 2   /* control debugging */
+#define PSDEV_PRINTK          3   /* force all errors to console */
+#define PSDEV_CONSOLE         4   /* allow _any_ messages to console */
+#define PSDEV_DEBUG_PATH      5   /* crashdump log location */
+#define PSDEV_DEBUG_DUMP_PATH 6   /* crashdump tracelog location */
+#define PSDEV_PORTALS_UPCALL  7   /* User mode upcall script  */
+
+#define PORTALS_PRIMARY_CTLCNT 7
+static struct ctl_table portals_table[PORTALS_PRIMARY_CTLCNT + 1] = {
         {PSDEV_DEBUG, "debug", &portal_debug, sizeof(int), 0644, NULL,
          &proc_dointvec},
         {PSDEV_SUBSYSTEM_DEBUG, "subsystem_debug", &portal_subsystem_debug,
@@ -90,8 +88,6 @@ static struct ctl_table portals_table[] = {
         {PSDEV_PORTALS_UPCALL, "upcall", portals_upcall,
          sizeof(portals_upcall), 0644, NULL, &proc_dostring,
          &sysctl_string},
-        {PSDEV_PORTALS_MEMUSED, "memused", (int *)&portal_kmemory.counter,
-         sizeof(int), 0644, NULL, &proc_dointvec},
         {0}
 };
 
diff --git a/lustre/portals/portals/.cvsignore b/lustre/portals/portals/.cvsignore
index 5ed596b..95973d6 100644
--- a/lustre/portals/portals/.cvsignore
+++ b/lustre/portals/portals/.cvsignore
@@ -1,10 +1,4 @@
 .deps
 Makefile
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+Makefile.in
+.*.o.cmd
diff --git a/lustre/portals/portals/autoMakefile.am b/lustre/portals/portals/Makefile.am
similarity index 57%
rename from lustre/portals/portals/autoMakefile.am
rename to lustre/portals/portals/Makefile.am
index bf7a107..59f9dd9 100644
--- a/lustre/portals/portals/autoMakefile.am
+++ b/lustre/portals/portals/Makefile.am
@@ -3,24 +3,30 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
+DEFS =
+
 my_sources = api-eq.c api-init.c api-me.c api-errno.c api-ni.c api-wrap.c \
 		lib-dispatch.c lib-init.c lib-me.c lib-msg.c lib-eq.c \
 		lib-md.c lib-move.c lib-ni.c lib-pid.c
 
-if !CRAY_PORTALS
-
-if LIBLUSTRE
 noinst_LIBRARIES= libportals.a
 libportals_a_SOURCES= $(my_sources)
-libportals_a_CPPFLAGS = $(LLCPPFLAGS)
-libportals_a_CFLAGS = $(LLCFLAGS)
-endif
 
-if MODULES
-modulenet_DATA = portals$(KMODEXT)
-endif # MODULES
+if LIBLUSTRE
+libportals_a_CFLAGS= -fPIC
+else
 
-endif # CRAY_PORTALS
+MODULE = portals
+modulenet_DATA = portals.o
+EXTRA_PROGRAMS = portals
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-DIST_SOURCES = $(portals-objs:%.o=%.c)
+DISTCLEANFILES = *.orig *.rej
+
+portals_SOURCES= module.c $(my_sources)
+
+# Don't distribute any patched files.
+dist-hook:
+	list='$(EXT2C)'; for f in $$list; do rm -f $(distdir)/$$f; done
+
+include ../Rules.linux
+endif
diff --git a/lustre/portals/portals/Makefile.in b/lustre/portals/portals/Makefile.in
deleted file mode 100644
index 6ce334b..0000000
--- a/lustre/portals/portals/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-MODULES := portals
-portals-objs := api-eq.o api-init.o api-me.o api-errno.o api-ni.o api-wrap.o
-portals-objs += lib-dispatch.o lib-init.o lib-me.o lib-msg.o lib-eq.o lib-md.o
-portals-objs += lib-move.o lib-ni.o lib-pid.o module.o
-
-@INCLUDE_RULES@
diff --git a/lustre/portals/portals/api-eq.c b/lustre/portals/portals/api-eq.c
index 0306043..390156a 100644
--- a/lustre/portals/portals/api-eq.c
+++ b/lustre/portals/portals/api-eq.c
@@ -23,9 +23,30 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#define DEBUG_SUBSYSTEM S_PORTALS
 #include <portals/api-support.h>
 
+int ptl_eq_init(void)
+{
+        /* Nothing to do anymore... */
+        return PTL_OK;
+}
+
+void ptl_eq_fini(void)
+{
+        /* Nothing to do anymore... */
+}
+
+int ptl_eq_ni_init(nal_t * nal)
+{
+        /* Nothing to do anymore... */
+        return PTL_OK;
+}
+
+void ptl_eq_ni_fini(nal_t * nal)
+{
+        /* Nothing to do anymore... */
+}
+
 int ptl_get_event (ptl_eq_t *eq, ptl_event_t *ev)
 {
         int          new_index = eq->sequence & (eq->size - 1);
diff --git a/lustre/portals/portals/api-errno.c b/lustre/portals/portals/api-errno.c
index 1c01c88..0e155da 100644
--- a/lustre/portals/portals/api-errno.c
+++ b/lustre/portals/portals/api-errno.c
@@ -36,7 +36,8 @@ const char *ptl_err_str[] = {
         "PTL_MD_NO_UPDATE",
         "PTL_FAIL",
 
-        "PTL_IOV_INVALID",
+        "PTL_IOV_TOO_MANY",
+        "PTL_IOV_TOO_SMALL",
 
         "PTL_EQ_IN_USE",
 
diff --git a/lustre/portals/portals/api-init.c b/lustre/portals/portals/api-init.c
index 9a98714..e41bad8 100644
--- a/lustre/portals/portals/api-init.c
+++ b/lustre/portals/portals/api-init.c
@@ -23,23 +23,43 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#define DEBUG_SUBSYSTEM S_PORTALS
 #include <portals/api-support.h>
 
+int ptl_init;
+
+int __p30_initialized;
+int __p30_myr_initialized;
+int __p30_ip_initialized;
+ptl_handle_ni_t __myr_ni_handle;
+ptl_handle_ni_t __ip_ni_handle;
+
 int PtlInit(int *max_interfaces)
 {
         if (max_interfaces != NULL)
-                *max_interfaces = NAL_MAX_NR;
+                *max_interfaces = NAL_ENUM_END_MARKER;
+
+        if (ptl_init)
+                return PTL_OK;
 
         LASSERT(!strcmp(ptl_err_str[PTL_MAX_ERRNO], "PTL_MAX_ERRNO"));
 
-        return ptl_ni_init();
+        ptl_ni_init();
+        ptl_me_init();
+        ptl_eq_init();
+        ptl_init = 1;
+
+        return PTL_OK;
 }
 
 
 void PtlFini(void)
 {
+
+        /* Reverse order of initialization */
+        ptl_eq_fini();
+        ptl_me_fini();
         ptl_ni_fini();
+        ptl_init = 0;
 }
 
 
diff --git a/lustre/portals/portals/api-me.c b/lustre/portals/portals/api-me.c
index 37f0150..e724e58 100644
--- a/lustre/portals/portals/api-me.c
+++ b/lustre/portals/portals/api-me.c
@@ -23,6 +23,20 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#define DEBUG_SUBSYSTEM S_PORTALS
 #include <portals/api-support.h>
 
+int ptl_me_init(void)
+{
+        return PTL_OK;
+}
+void ptl_me_fini(void)
+{                                /* Nothing to do */
+}
+int ptl_me_ni_init(nal_t * nal)
+{
+        return PTL_OK;
+}
+
+void ptl_me_ni_fini(nal_t * nal)
+{                                /* Nothing to do... */
+}
diff --git a/lustre/portals/portals/api-ni.c b/lustre/portals/portals/api-ni.c
index 4f37d13..02082c6 100644
--- a/lustre/portals/portals/api-ni.c
+++ b/lustre/portals/portals/api-ni.c
@@ -23,39 +23,15 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#define DEBUG_SUBSYSTEM S_PORTALS
 #include <portals/api-support.h>
 
-int ptl_init;
-
 /* Put some magic in the NI handle so uninitialised/zeroed handles are easy
  * to spot */
 #define NI_HANDLE_MAGIC  0xebc0de00
 #define NI_HANDLE_MASK   0x000000ff
-
-static struct nal_t *ptl_nal_table[NAL_MAX_NR];
-
-#ifdef __KERNEL__
-DECLARE_MUTEX(ptl_mutex);
-
-static void ptl_mutex_enter (void) 
-{
-        down (&ptl_mutex);
-}
-
-static void ptl_mutex_exit (void)
-{
-        up (&ptl_mutex);
-}
-#else
-static void ptl_mutex_enter (void)
-{
-}
-
-static void ptl_mutex_exit (void) 
-{
-}
-#endif
+#define MAX_NIS          8         
+static nal_t *ptl_interfaces[MAX_NIS];
+int ptl_num_interfaces = 0;
 
 nal_t *ptl_hndl2nal(ptl_handle_any_t *handle)
 {
@@ -70,188 +46,147 @@ nal_t *ptl_hndl2nal(ptl_handle_any_t *handle)
                 return NULL;
 
         idx &= NI_HANDLE_MASK;
-        
-        if (idx >= NAL_MAX_NR ||
-            ptl_nal_table[idx] == NULL ||
-            ptl_nal_table[idx]->nal_refct == 0)
-                return NULL;
+        if (idx < MAX_NIS)
+                return ptl_interfaces[idx];
 
-        return ptl_nal_table[idx];
+        return NULL;
 }
 
-int ptl_register_nal (ptl_interface_t interface, nal_t *nal)
+int ptl_ni_init(void)
 {
-        int    rc;
-        
-        ptl_mutex_enter();
+        int i;
+
+        LASSERT (MAX_NIS <= (NI_HANDLE_MASK + 1));
         
-        if (interface < 0 || interface >= NAL_MAX_NR)
-                rc = PTL_IFACE_INVALID;
-        else if (ptl_nal_table[interface] != NULL)
-                rc = PTL_IFACE_DUP;
-        else {
-                rc = PTL_OK;
-                ptl_nal_table[interface] = nal;
-                LASSERT(nal->nal_refct == 0);
-        }
+        for (i = 0; i < MAX_NIS; i++)
+                ptl_interfaces[i] = NULL;
 
-        ptl_mutex_exit();
-        return (rc);
+        return PTL_OK;
 }
 
-void ptl_unregister_nal (ptl_interface_t interface)
+void ptl_ni_fini(void)
 {
-        LASSERT(interface >= 0 && interface < NAL_MAX_NR);
-        LASSERT(ptl_nal_table[interface] != NULL);
-        LASSERT(ptl_nal_table[interface]->nal_refct == 0);
-        
-        ptl_mutex_enter();
-        
-        ptl_nal_table[interface] = NULL;
+        int i;
 
-        ptl_mutex_exit();
+        for (i = 0; i < MAX_NIS; i++) {
+                nal_t *nal = ptl_interfaces[i];
+                if (!nal)
+                        continue;
+
+                if (nal->shutdown)
+                        nal->shutdown(nal, i);
+        }
 }
 
-int ptl_ni_init(void)
+#ifdef __KERNEL__
+DECLARE_MUTEX(ptl_ni_init_mutex);
+
+static void ptl_ni_init_mutex_enter (void) 
 {
-        /* If this assertion fails, we need more bits in NI_HANDLE_MASK and
-         * to shift NI_HANDLE_MAGIC left appropriately */
-        LASSERT (NAL_MAX_NR <= (NI_HANDLE_MASK + 1));
-        
-        ptl_mutex_enter();
-
-        if (!ptl_init) {
-                /* NULL pointers, clear flags */
-                memset(ptl_nal_table, 0, sizeof(ptl_nal_table));
-#ifndef __KERNEL__
-                /* Kernel NALs register themselves when their module loads,
-                 * and unregister themselves when their module is unloaded.
-                 * Userspace NALs, are plugged in explicitly here... */
-                {
-                        extern nal_t procapi_nal;
-
-                        /* XXX pretend it's socknal to keep liblustre happy... */
-                        ptl_nal_table[SOCKNAL] = &procapi_nal;
-                        LASSERT (procapi_nal.nal_refct == 0);
-                }
-#endif
-                ptl_init = 1;
-        }
+        down (&ptl_ni_init_mutex);
+}
 
-        ptl_mutex_exit();
-        
-        return PTL_OK;
+static void ptl_ni_init_mutex_exit (void)
+{
+        up (&ptl_ni_init_mutex);
 }
 
-void ptl_ni_fini(void)
+#else
+static void ptl_ni_init_mutex_enter (void)
 {
-        nal_t  *nal;
-        int     i;
-
-        ptl_mutex_enter();
-
-        if (ptl_init) {
-                for (i = 0; i < NAL_MAX_NR; i++) {
-
-                        nal = ptl_nal_table[i];
-                        if (nal == NULL)
-                                continue;
-                        
-                        if (nal->nal_refct != 0) {
-                                CWARN("NAL %d has outstanding refcount %d\n",
-                                      i, nal->nal_refct);
-                                nal->shutdown(nal);
-                        }
-                        
-                        ptl_nal_table[i] = NULL;
-                }
+}
 
-                ptl_init = 0;
-        }
-        
-        ptl_mutex_exit();
+static void ptl_ni_init_mutex_exit (void) 
+{
 }
 
-int PtlNIInit(ptl_interface_t interface, ptl_pid_t requested_pid,
-              ptl_ni_limits_t *desired_limits, ptl_ni_limits_t *actual_limits,
-              ptl_handle_ni_t *handle)
+#endif
+
+int PtlNIInit(ptl_interface_t interface, ptl_pt_index_t ptl_size,
+              ptl_ac_index_t acl_size, ptl_pid_t requested_pid,
+              ptl_handle_ni_t * handle)
 {
         nal_t *nal;
-        int    i;
-        int    rc;
+        int i;
 
         if (!ptl_init)
                 return PTL_NO_INIT;
 
-        ptl_mutex_enter ();
+        ptl_ni_init_mutex_enter ();
 
-        if (interface == PTL_IFACE_DEFAULT) {
-                for (i = 0; i < NAL_MAX_NR; i++)
-                        if (ptl_nal_table[i] != NULL) {
-                                interface = i;
-                                break;
-                        }
-                /* NB if no interfaces are registered, 'interface' will
-                 * fail the valid test below */
+        nal = interface(ptl_num_interfaces, ptl_size, acl_size, requested_pid);
+
+        if (!nal) {
+                ptl_ni_init_mutex_exit ();
+                return PTL_NAL_FAILED;
         }
-        
-        if (interface < 0 || 
-            interface >= NAL_MAX_NR ||
-            ptl_nal_table[interface] == NULL) {
-                GOTO(out, rc = PTL_IFACE_INVALID);
+
+        for (i = 0; i < ptl_num_interfaces; i++) {
+                if (ptl_interfaces[i] == nal) {
+                        nal->refct++;
+                        handle->nal_idx = (NI_HANDLE_MAGIC & ~NI_HANDLE_MASK) | i;
+                        CDEBUG(D_OTHER, "Returning existing NAL (%d)\n", i);
+                        ptl_ni_init_mutex_exit ();
+                        return PTL_OK;
+                }
         }
+        nal->refct = 1;
 
-        nal = ptl_nal_table[interface];
+        if (ptl_num_interfaces >= MAX_NIS) {
+                if (nal->shutdown)
+                        nal->shutdown (nal, ptl_num_interfaces);
+                ptl_ni_init_mutex_exit ();
+                return PTL_NO_SPACE;
+        }
 
-        CDEBUG(D_OTHER, "Starting up NAL (%d) refs %d\n", interface, nal->nal_refct);
-        rc = nal->startup(nal, requested_pid, desired_limits, actual_limits);
+        handle->nal_idx = (NI_HANDLE_MAGIC & ~NI_HANDLE_MASK) | ptl_num_interfaces;
+        ptl_interfaces[ptl_num_interfaces++] = nal;
 
-        if (rc != PTL_OK) {
-                CERROR("Error %d starting up NAL %d, refs %d\n", rc,
-                       interface, nal->nal_refct);
-                GOTO(out, rc);
-        }
-        
-        if (nal->nal_refct != 0) {
-                /* Caller gets to know if this was the first ref or not */
-                rc = PTL_IFACE_DUP;
-        }
-        
-        nal->nal_refct++;
-        handle->nal_idx = (NI_HANDLE_MAGIC & ~NI_HANDLE_MASK) | interface;
+        ptl_eq_ni_init(nal);
+        ptl_me_ni_init(nal);
 
- out:
-        ptl_mutex_exit ();
-        return rc;
+        ptl_ni_init_mutex_exit ();
+        return PTL_OK;
 }
 
+
 int PtlNIFini(ptl_handle_ni_t ni)
 {
         nal_t *nal;
-        int    idx;
+        int idx;
+        int rc;
 
         if (!ptl_init)
                 return PTL_NO_INIT;
 
-        ptl_mutex_enter ();
+        ptl_ni_init_mutex_enter ();
 
         nal = ptl_hndl2nal (&ni);
         if (nal == NULL) {
-                ptl_mutex_exit ();
+                ptl_ni_init_mutex_exit ();
                 return PTL_HANDLE_INVALID;
         }
 
         idx = ni.nal_idx & NI_HANDLE_MASK;
 
-        LASSERT(nal->nal_refct > 0);
+        nal->refct--;
+        if (nal->refct > 0) {
+                ptl_ni_init_mutex_exit ();
+                return PTL_OK;
+        }
 
-        nal->nal_refct--;
+        ptl_me_ni_fini(nal);
+        ptl_eq_ni_fini(nal);
 
-        /* nal_refct == 0 tells nal->shutdown to really shut down */
-        nal->shutdown(nal);
+        rc = PTL_OK;
+        if (nal->shutdown)
+                rc = nal->shutdown(nal, idx);
 
-        ptl_mutex_exit ();
-        return PTL_OK;
+        ptl_interfaces[idx] = NULL;
+        ptl_num_interfaces--;
+
+        ptl_ni_init_mutex_exit ();
+        return rc;
 }
 
 int PtlNIHandle(ptl_handle_any_t handle_in, ptl_handle_ni_t * ni_out)
diff --git a/lustre/portals/portals/api-wrap.c b/lustre/portals/portals/api-wrap.c
index 3e6f9ce..9c82c30 100644
--- a/lustre/portals/portals/api-wrap.c
+++ b/lustre/portals/portals/api-wrap.c
@@ -124,6 +124,25 @@ int PtlNIDist(ptl_handle_ni_t interface_in, ptl_process_id_t process_in,
         return ret.rc;
 }
 
+
+
+unsigned int PtlNIDebug(ptl_handle_ni_t ni, unsigned int mask_in)
+{
+        PtlNIDebug_in args;
+        PtlNIDebug_out ret;
+        int rc;
+
+        args.mask_in = mask_in;
+
+        rc = do_forward(ni, PTL_NIDEBUG, &args, sizeof(args), &ret,
+                        sizeof(ret));
+
+        if (rc != PTL_OK)
+                return rc;
+
+        return ret.rc;
+}
+
 int PtlMEAttach(ptl_handle_ni_t interface_in, ptl_pt_index_t index_in,
                 ptl_process_id_t match_id_in, ptl_match_bits_t match_bits_in,
                 ptl_match_bits_t ignore_bits_in, ptl_unlink_t unlink_in,
@@ -236,6 +255,45 @@ int PtlMEDump(ptl_handle_me_t current_in)
         return ret.rc;
 }
 
+static int validate_md(ptl_handle_any_t current_in, ptl_md_t md_in)
+{
+        nal_t *nal;
+        int rc;
+        int i;
+
+        if (!ptl_init) {
+                CERROR("PtlMDAttach/Bind/Update: Not initialized\n");
+                return PTL_NO_INIT;
+        }
+
+        nal = ptl_hndl2nal(&current_in);
+        if (!nal)
+                return PTL_HANDLE_INVALID;
+
+        if (nal->validate != NULL)                /* nal->validate not a NOOP */
+        {
+                if ((md_in.options & PTL_MD_IOVEC) == 0) /* contiguous */
+                {
+                        rc = nal->validate (nal, md_in.start, md_in.length);
+                        if (rc)
+                                return (PTL_SEGV);
+                }
+                else
+                {
+                        struct iovec *iov = (struct iovec *)md_in.start;
+
+                        for (i = 0; i < md_in.niov; i++, iov++)
+                        {
+                                rc = nal->validate (nal, iov->iov_base, iov->iov_len);
+                                if (rc)
+                                        return (PTL_SEGV);
+                        }
+                }
+        }
+
+        return 0;
+}
+
 static ptl_handle_eq_t md2eq (ptl_md_t *md)
 {
         if (PtlHandleIsEqual (md->eventq, PTL_EQ_NONE))
@@ -252,13 +310,16 @@ int PtlMDAttach(ptl_handle_me_t me_in, ptl_md_t md_in,
         PtlMDAttach_out ret;
         int rc;
 
-        args.eq_in = md2eq(&md_in);
-        args.me_in = me_in;
-        args.md_in = md_in;
-        args.unlink_in = unlink_in;
+        rc = validate_md(me_in, md_in);
+        if (rc == PTL_OK) {
+                args.eq_in = md2eq(&md_in);
+                args.me_in = me_in;
+                args.md_in = md_in;
+                args.unlink_in = unlink_in;
                 
-        rc = do_forward(me_in, PTL_MDATTACH, 
-                        &args, sizeof(args), &ret, sizeof(ret));
+                rc = do_forward(me_in, PTL_MDATTACH, 
+                                &args, sizeof(args), &ret, sizeof(ret));
+        }
 
         if (rc != PTL_OK)
                 return (rc == PTL_HANDLE_INVALID) ? PTL_ME_INVALID : rc;
@@ -279,6 +340,10 @@ int PtlMDBind(ptl_handle_ni_t ni_in, ptl_md_t md_in,
         PtlMDBind_out ret;
         int rc;
 
+        rc = validate_md(ni_in, md_in);
+        if (rc != PTL_OK)
+                return rc;
+
         args.eq_in = md2eq(&md_in);
         args.ni_in = ni_in;
         args.md_in = md_in;
@@ -313,6 +378,9 @@ int PtlMDUpdate(ptl_handle_md_t md_in, ptl_md_t *old_inout,
                 args.old_inout_valid = 0;
 
         if (new_inout) {
+                rc = validate_md (md_in, *new_inout);
+                if (rc != PTL_OK)
+                        return (rc == PTL_HANDLE_INVALID) ? PTL_MD_INVALID : rc;
                 args.new_inout = *new_inout;
                 args.new_inout_valid = 1;
         } else
@@ -355,7 +423,7 @@ int PtlMDUnlink(ptl_handle_md_t md_in)
 }
 
 int PtlEQAlloc(ptl_handle_ni_t interface, ptl_size_t count,
-               ptl_eq_handler_t callback,
+               int (*callback) (ptl_event_t * event),
                ptl_handle_eq_t * handle_out)
 {
         ptl_eq_t *eq = NULL;
@@ -390,6 +458,12 @@ int PtlEQAlloc(ptl_handle_ni_t interface, ptl_size_t count,
         for (i = 0; i < count; i++)
                 ev[i].sequence = 0;
 
+        if (nal->validate != NULL) {
+                rc = nal->validate(nal, ev, count * sizeof(ptl_event_t));
+                if (rc != PTL_OK)
+                        goto fail;
+        }
+
         args.ni_in = interface;
         args.count_in = count;
         args.base_in = ev;
diff --git a/lustre/portals/portals/lib-dispatch.c b/lustre/portals/portals/lib-dispatch.c
index 798e117..13036c7 100644
--- a/lustre/portals/portals/lib-dispatch.c
+++ b/lustre/portals/portals/lib-dispatch.c
@@ -35,6 +35,7 @@ static dispatch_table_t dispatch_table[] = {
         [PTL_GETID] {do_PtlGetId, "PtlGetId"},
         [PTL_NISTATUS] {do_PtlNIStatus, "PtlNIStatus"},
         [PTL_NIDIST] {do_PtlNIDist, "PtlNIDist"},
+        [PTL_NIDEBUG] {do_PtlNIDebug, "PtlNIDebug"},
         [PTL_MEATTACH] {do_PtlMEAttach, "PtlMEAttach"},
         [PTL_MEINSERT] {do_PtlMEInsert, "PtlMEInsert"},
         [PTL_MEUNLINK] {do_PtlMEUnlink, "PtlMEUnlink"},
diff --git a/lustre/portals/portals/lib-init.c b/lustre/portals/portals/lib-init.c
index c62dbc2..61ef465 100644
--- a/lustre/portals/portals/lib-init.c
+++ b/lustre/portals/portals/lib-init.c
@@ -41,15 +41,8 @@
 #ifndef PTL_USE_LIB_FREELIST
 
 int
-kportal_descriptor_setup (nal_cb_t *nal,
-                          ptl_ni_limits_t *requested_limits,
-                          ptl_ni_limits_t *actual_limits)
+kportal_descriptor_setup (nal_cb_t *nal)
 {
-        /* Ignore requested limits! */
-        actual_limits->max_mes = INT_MAX;
-        actual_limits->max_mds = INT_MAX;
-        actual_limits->max_eqs = INT_MAX;
-
         return PTL_OK;
 }
 
@@ -107,9 +100,7 @@ lib_freelist_fini (nal_cb_t *nal, lib_freelist_t *fl)
 }
 
 int
-kportal_descriptor_setup (nal_cb_t *nal,
-                          ptl_ni_limits_t *requested_limits,
-                          ptl_ni_limits_t *actual_limits)
+kportal_descriptor_setup (nal_cb_t *nal)
 {
         /* NB on failure caller must still call kportal_descriptor_cleanup */
         /*               ******                                            */
@@ -120,13 +111,6 @@ kportal_descriptor_setup (nal_cb_t *nal,
         memset (&nal->ni.ni_free_mds,  0, sizeof (nal->ni.ni_free_mds));
         memset (&nal->ni.ni_free_eqs,  0, sizeof (nal->ni.ni_free_eqs));
 
-        /* Ignore requested limits! */
-        actual_limits->max_mes = MAX_MES;
-        actual_limits->max_mds = MAX_MDS;
-        actual_limits->max_eqs = MAX_EQS;
-        /* Hahahah what a load of bollocks.  There's nowhere to
-         * specify the max # messages in-flight */
-
         rc = lib_freelist_init (nal, &nal->ni.ni_free_mes,
                                 MAX_MES, sizeof (lib_me_t));
         if (rc != PTL_OK)
@@ -264,18 +248,21 @@ lib_invalidate_handle (nal_cb_t *nal, lib_handle_t *lh)
 }
 
 int
-lib_init(nal_cb_t *nal, ptl_process_id_t process_id,
-         ptl_ni_limits_t *requested_limits,
-         ptl_ni_limits_t *actual_limits)
+lib_init(nal_cb_t * nal, ptl_nid_t nid, ptl_pid_t pid, int gsize,
+         ptl_pt_index_t ptl_size, ptl_ac_index_t acl_size)
 {
         int       rc = PTL_OK;
         lib_ni_t *ni = &nal->ni;
-        int ptl_size;
         int i;
         ENTRY;
 
         /* NB serialised in PtlNIInit() */
 
+        if (ni->refcnt != 0) {                       /* already initialised */
+                ni->refcnt++;
+                goto out;
+        }
+
         lib_assert_wire_constants ();
         
         /*
@@ -284,8 +271,7 @@ lib_init(nal_cb_t *nal, ptl_process_id_t process_id,
          */
         memset(&ni->counters, 0, sizeof(lib_counters_t));
 
-        rc = kportal_descriptor_setup (nal, requested_limits, 
-                                       &ni->actual_limits);
+        rc = kportal_descriptor_setup (nal);
         if (rc != PTL_OK)
                 goto out;
 
@@ -301,15 +287,12 @@ lib_init(nal_cb_t *nal, ptl_process_id_t process_id,
         if (rc != PTL_OK)
                 goto out;
         
-        ni->nid = process_id.nid;
-        ni->pid = process_id.pid;
-
-        if (requested_limits != NULL)
-                ptl_size = requested_limits->max_pt_index + 1;
-        else
-                ptl_size = 64;
+        ni->nid = nid;
+        ni->pid = pid;
 
+        ni->num_nodes = gsize;
         ni->tbl.size = ptl_size;
+
         ni->tbl.tbl = nal->cb_malloc(nal, sizeof(struct list_head) * ptl_size);
         if (ni->tbl.tbl == NULL) {
                 rc = PTL_NO_SPACE;
@@ -319,20 +302,9 @@ lib_init(nal_cb_t *nal, ptl_process_id_t process_id,
         for (i = 0; i < ptl_size; i++)
                 INIT_LIST_HEAD(&(ni->tbl.tbl[i]));
 
-        /* max_{mes,mds,eqs} set in kportal_descriptor_setup */
-
-        /* We don't have an access control table! */
-        ni->actual_limits.max_ac_index = -1;
-
-        ni->actual_limits.max_pt_index = ptl_size - 1;
-        ni->actual_limits.max_md_iovecs = PTL_MD_MAX_IOV;
-        ni->actual_limits.max_me_list = INT_MAX;
-
-        /* We don't support PtlGetPut! */
-        ni->actual_limits.max_getput_md = 0;
-
-        if (actual_limits != NULL)
-                *actual_limits = ni->actual_limits;
+        ni->debug = PTL_DEBUG_NONE;
+        ni->up = 1;
+        ni->refcnt++;
 
  out:
         if (rc != PTL_OK) {
@@ -349,7 +321,12 @@ lib_fini(nal_cb_t * nal)
         lib_ni_t *ni = &nal->ni;
         int       idx;
 
-        /* NB no state_lock() since this is the last reference.  The NAL
+        ni->refcnt--;
+
+        if (ni->refcnt != 0)
+                goto out;
+
+        /* NB no stat_lock() since this is the last reference.  The NAL
          * should have shut down already, so it should be safe to unlink
          * and free all descriptors, even those that appear committed to a
          * network op (eg MD with non-zero pending count)
@@ -393,9 +370,11 @@ lib_fini(nal_cb_t * nal)
         }
 
         nal->cb_free(nal, ni->tbl.tbl, sizeof(struct list_head) * ni->tbl.size);
+        ni->up = 0;
 
         lib_cleanup_handle_hash (nal);
         kportal_descriptor_cleanup (nal);
 
+ out:
         return (PTL_OK);
 }
diff --git a/lustre/portals/portals/lib-md.c b/lustre/portals/portals/lib-md.c
index 64a55b9..9a391cd 100644
--- a/lustre/portals/portals/lib-md.c
+++ b/lustre/portals/portals/lib-md.c
@@ -86,7 +86,6 @@ static int lib_md_build(nal_cb_t *nal, lib_md_t *new, void *private,
         lib_eq_t     *eq = NULL;
         int           rc;
         int           i;
-        int           niov;
 
         /* NB we are passed an allocated, but uninitialised/active md.
          * if we return success, caller may lib_md_unlink() it.
@@ -102,7 +101,7 @@ static int lib_md_build(nal_cb_t *nal, lib_md_t *new, void *private,
         /* Must check this _before_ allocation.  Also, note that non-iov
          * MDs must set md_niov to 0. */
         LASSERT((md->options & (PTL_MD_IOVEC | PTL_MD_KIOV)) == 0 ||
-                md->length <= PTL_MD_MAX_IOV);
+                md->niov <= PTL_MD_MAX_IOV);
 
         /* This implementation doesn't know how to create START events or
          * disable END events.  Best to LASSERT our caller is compliant so
@@ -117,6 +116,7 @@ static int lib_md_build(nal_cb_t *nal, lib_md_t *new, void *private,
 
         new->me = NULL;
         new->start = md->start;
+        new->length = md->length;
         new->offset = 0;
         new->max_size = md->max_size;
         new->options = md->options;
@@ -132,13 +132,13 @@ static int lib_md_build(nal_cb_t *nal, lib_md_t *new, void *private,
                 if ((md->options & PTL_MD_KIOV) != 0) /* Can't specify both */
                         return PTL_MD_INVALID; 
 
-                new->md_niov = niov = md->length;
+                new->md_niov = md->niov;
                 
                 if (nal->cb_read (nal, private, new->md_iov.iov, md->start,
-                                  niov * sizeof (new->md_iov.iov[0])))
+                                  md->niov * sizeof (new->md_iov.iov[0])))
                         return PTL_SEGV;
 
-                for (i = 0; i < niov; i++) {
+                for (i = 0; i < new->md_niov; i++) {
                         /* We take the base address on trust */
                         if (new->md_iov.iov[i].iov_len <= 0) /* invalid length */
                                 return PTL_VAL_FAILED;
@@ -146,10 +146,11 @@ static int lib_md_build(nal_cb_t *nal, lib_md_t *new, void *private,
                         total_length += new->md_iov.iov[i].iov_len;
                 }
 
-                new->length = total_length;
-
+                if (md->length > total_length)
+                        return PTL_IOV_TOO_SMALL;
+                
                 if (nal->cb_map != NULL) {
-                        rc = nal->cb_map (nal, niov, new->md_iov.iov, 
+                        rc = nal->cb_map (nal, new->md_niov, new->md_iov.iov, 
                                           &new->md_addrkey);
                         if (rc != PTL_OK)
                                 return (rc);
@@ -165,13 +166,13 @@ static int lib_md_build(nal_cb_t *nal, lib_md_t *new, void *private,
                     nal->cb_recv_pages == NULL)
                         return PTL_MD_INVALID;
 
-                new->md_niov = niov = md->length;
+                new->md_niov = md->niov;
 
                 if (nal->cb_read (nal, private, new->md_iov.kiov, md->start,
-                                  niov * sizeof (new->md_iov.kiov[0])))
+                                  md->niov * sizeof (new->md_iov.kiov[0])))
                         return PTL_SEGV;
                 
-                for (i = 0; i < niov; i++) {
+                for (i = 0; i < new->md_niov; i++) {
                         /* We take the page pointer on trust */
                         if (new->md_iov.kiov[i].kiov_offset + 
                             new->md_iov.kiov[i].kiov_len > PAGE_SIZE )
@@ -180,23 +181,23 @@ static int lib_md_build(nal_cb_t *nal, lib_md_t *new, void *private,
                         total_length += new->md_iov.kiov[i].kiov_len;
                 }
 
-                new->length = total_length;
+                if (md->length > total_length)
+                        return PTL_IOV_TOO_SMALL;
 
                 if (nal->cb_map_pages != NULL) {
-                        rc = nal->cb_map_pages (nal, niov, new->md_iov.kiov, 
+                        rc = nal->cb_map_pages (nal, new->md_niov, new->md_iov.kiov, 
                                                 &new->md_addrkey);
                         if (rc != PTL_OK)
                                 return (rc);
                 }
 #endif
         } else {   /* contiguous */
-                new->length = md->length;
-                new->md_niov = niov = 1;
+                new->md_niov = 1;
                 new->md_iov.iov[0].iov_base = md->start;
                 new->md_iov.iov[0].iov_len = md->length;
 
                 if (nal->cb_map != NULL) {
-                        rc = nal->cb_map (nal, niov, new->md_iov.iov, 
+                        rc = nal->cb_map (nal, new->md_niov, new->md_iov.iov, 
                                           &new->md_addrkey);
                         if (rc != PTL_OK)
                                 return (rc);
@@ -222,13 +223,13 @@ void lib_md_deconstruct(nal_cb_t * nal, lib_md_t * md, ptl_md_t * new)
          * and that's all.
          */
         new->start = md->start;
-        new->length = ((md->options & (PTL_MD_IOVEC | PTL_MD_KIOV)) == 0) ?
-                      md->length : md->md_niov;
+        new->length = md->length;
         new->threshold = md->threshold;
         new->max_size = md->max_size;
         new->options = md->options;
         new->user_ptr = md->user_ptr;
         ptl_eq2handle(&new->eventq, md->eq);
+        new->niov = ((md->options & (PTL_MD_IOVEC | PTL_MD_KIOV)) == 0) ? 0 : md->md_niov;
 }
 
 int do_PtlMDAttach(nal_cb_t * nal, void *private, void *v_args, void *v_ret)
@@ -250,8 +251,8 @@ int do_PtlMDAttach(nal_cb_t * nal, void *private, void *v_args, void *v_ret)
         unsigned long flags;
 
         if ((args->md_in.options & (PTL_MD_KIOV | PTL_MD_IOVEC)) != 0 &&
-            args->md_in.length > PTL_MD_MAX_IOV) /* too many fragments */
-                return (ret->rc = PTL_IOV_INVALID);
+            args->md_in.niov > PTL_MD_MAX_IOV) /* too many fragments */
+                return (ret->rc = PTL_IOV_TOO_MANY);
 
         md = lib_md_alloc(nal, &args->md_in);
         if (md == NULL)
@@ -302,8 +303,8 @@ int do_PtlMDBind(nal_cb_t * nal, void *private, void *v_args, void *v_ret)
         unsigned long flags;
 
         if ((args->md_in.options & (PTL_MD_KIOV | PTL_MD_IOVEC)) != 0 &&
-            args->md_in.length > PTL_MD_MAX_IOV) /* too many fragments */
-                return (ret->rc = PTL_IOV_INVALID);
+            args->md_in.niov > PTL_MD_MAX_IOV) /* too many fragments */
+                return (ret->rc = PTL_IOV_TOO_MANY);
 
         md = lib_md_alloc(nal, &args->md_in);
         if (md == NULL)
@@ -406,16 +407,23 @@ int do_PtlMDUpdate_internal(nal_cb_t * nal, void *private, void *v_args,
                 goto out;
         }
 
-        /* XXX fttb, the new MD must be the same "shape" wrt fragmentation,
-         * since we simply overwrite the old lib-md */
-        if ((((new->options ^ md->options) & 
-              (PTL_MD_IOVEC | PTL_MD_KIOV)) != 0) ||
-            ((new->options & (PTL_MD_IOVEC | PTL_MD_KIOV)) != 0 && 
-             new->length != md->md_niov)) {
-                ret->rc = PTL_IOV_INVALID;
+        /* XXX fttb, the new MD must be the same type wrt fragmentation */
+        if (((new->options ^ md->options) & 
+             (PTL_MD_IOVEC | PTL_MD_KIOV)) != 0) {
+                ret->rc = PTL_MD_INVALID;
+                goto out;
+        }
+
+        if (new->niov > md->md_niov) {
+                ret->rc = PTL_IOV_TOO_MANY;
                 goto out;
         } 
 
+        if (new->niov < md->md_niov) {
+                ret->rc = PTL_IOV_TOO_SMALL;
+                goto out;
+        }
+
         if (!PtlHandleIsEqual (args->testq_in, PTL_EQ_NONE)) {
                 test_eq = ptl_handle2eq(&args->testq_in, nal);
                 if (test_eq == NULL) {
diff --git a/lustre/portals/portals/lib-me.c b/lustre/portals/portals/lib-me.c
index 271fc82..e3c46ea 100644
--- a/lustre/portals/portals/lib-me.c
+++ b/lustre/portals/portals/lib-me.c
@@ -146,6 +146,13 @@ int do_PtlMEUnlink(nal_cb_t * nal, void *private, void *v_args, void *v_ret)
 /* call with state_lock please */
 void lib_me_unlink(nal_cb_t *nal, lib_me_t *me)
 {
+        lib_ni_t *ni = &nal->ni;
+
+        if (ni->debug & PTL_DEBUG_UNLINK) {
+                ptl_handle_any_t handle;
+                ptl_me2handle(&handle, me);
+        }
+
         list_del (&me->me_list);
 
         if (me->md) {
diff --git a/lustre/portals/portals/lib-msg.c b/lustre/portals/portals/lib-msg.c
index 1b69533..869c9d6 100644
--- a/lustre/portals/portals/lib-msg.c
+++ b/lustre/portals/portals/lib-msg.c
@@ -89,6 +89,10 @@ lib_finalize(nal_cb_t *nal, void *private, lib_msg_t *msg, ptl_err_t status)
         int           rc;
         ptl_hdr_t     ack;
 
+        /* ni went down while processing this message */
+        if (nal->ni.up == 0)
+                return;
+
         if (msg == NULL)
                 return;
 
diff --git a/lustre/portals/portals/lib-ni.c b/lustre/portals/portals/lib-ni.c
index aa959fc..296bc4a 100644
--- a/lustre/portals/portals/lib-ni.c
+++ b/lustre/portals/portals/lib-ni.c
@@ -29,6 +29,18 @@
 
 #define MAX_DIST 18446744073709551615ULL
 
+int do_PtlNIDebug(nal_cb_t * nal, void *private, void *v_args, void *v_ret)
+{
+        PtlNIDebug_in *args = v_args;
+        PtlNIDebug_out *ret = v_ret;
+        lib_ni_t *ni = &nal->ni;
+
+        ret->rc = ni->debug;
+        ni->debug = args->mask_in;
+
+        return 0;
+}
+
 int do_PtlNIStatus(nal_cb_t * nal, void *private, void *v_args, void *v_ret)
 {
         /*
diff --git a/lustre/portals/portals/module.c b/lustre/portals/portals/module.c
index 40e9da4..012d3d9 100644
--- a/lustre/portals/portals/module.c
+++ b/lustre/portals/portals/module.c
@@ -46,17 +46,273 @@
 
 #include <portals/lib-p30.h>
 #include <portals/p30.h>
-#include <portals/nal.h>
 #include <linux/kp30.h>
 #include <linux/kpr.h>
 #include <linux/portals_compat25.h>
 
 extern void (kping_client)(struct portal_ioctl_data *);
 
+struct nal_cmd_handler {
+        nal_cmd_handler_t nch_handler;
+        void * nch_private;
+};
+
+static struct nal_cmd_handler nal_cmd[NAL_MAX_NR + 1];
+static DECLARE_MUTEX(nal_cmd_sem);
+
+
+static int
+kportal_add_route(int gateway_nalid, ptl_nid_t gateway_nid, 
+                  ptl_nid_t lo_nid, ptl_nid_t hi_nid)
+{
+        int rc;
+        kpr_control_interface_t *ci;
+
+        ci = (kpr_control_interface_t *) PORTAL_SYMBOL_GET (kpr_control_interface);
+        if (ci == NULL)
+                return (-ENODEV);
+
+        rc = ci->kprci_add_route (gateway_nalid, gateway_nid, lo_nid, hi_nid);
+
+        PORTAL_SYMBOL_PUT(kpr_control_interface);
+        return (rc);
+}
+
+static int
+kportal_del_route(int gw_nalid, ptl_nid_t gw_nid, 
+                  ptl_nid_t lo, ptl_nid_t hi)
+{
+        int rc;
+        kpr_control_interface_t *ci;
+
+        ci = (kpr_control_interface_t *)PORTAL_SYMBOL_GET(kpr_control_interface);
+        if (ci == NULL)
+                return (-ENODEV);
+
+        rc = ci->kprci_del_route (gw_nalid, gw_nid, lo, hi);
+
+        PORTAL_SYMBOL_PUT(kpr_control_interface);
+        return (rc);
+}
+
+static int
+kportal_notify_router (int gw_nalid, ptl_nid_t gw_nid,
+                       int alive, time_t when)
+{
+        int rc;
+        kpr_control_interface_t *ci;
+
+        /* No error if router not preset.  Sysadmin is allowed to notify
+         * _everywhere_ when a NID boots or crashes, even if they know
+         * nothing of the peer. */
+        ci = (kpr_control_interface_t *)PORTAL_SYMBOL_GET(kpr_control_interface);
+        if (ci == NULL)
+                return (0);
+
+        rc = ci->kprci_notify (gw_nalid, gw_nid, alive, when);
+
+        PORTAL_SYMBOL_PUT(kpr_control_interface);
+        return (rc);
+}
+
+static int
+kportal_get_route(int index, __u32 *gateway_nalidp, ptl_nid_t *gateway_nidp,
+                  ptl_nid_t *lo_nidp, ptl_nid_t *hi_nidp, int *alivep)
+{
+        int       gateway_nalid;
+        ptl_nid_t gateway_nid;
+        ptl_nid_t lo_nid;
+        ptl_nid_t hi_nid;
+        int       alive;
+        int       rc;
+        kpr_control_interface_t *ci;
+
+        ci = (kpr_control_interface_t *) PORTAL_SYMBOL_GET(kpr_control_interface);
+        if (ci == NULL)
+                return (-ENODEV);
+
+        rc = ci->kprci_get_route(index, &gateway_nalid, &gateway_nid,
+                                 &lo_nid, &hi_nid, &alive);
+
+        if (rc == 0) {
+                CDEBUG(D_IOCTL, "got route [%d] %d "LPX64":"LPX64" - "LPX64", %s\n",
+                       index, gateway_nalid, gateway_nid, lo_nid, hi_nid,
+                       alive ? "up" : "down");
+
+                *gateway_nalidp = (__u32)gateway_nalid;
+                *gateway_nidp   = gateway_nid;
+                *lo_nidp        = lo_nid;
+                *hi_nidp        = hi_nid;
+                *alivep         = alive;
+        }
+
+        PORTAL_SYMBOL_PUT (kpr_control_interface);
+        return (rc);
+}
+
+static int 
+kportal_router_cmd(struct portals_cfg *pcfg, void * private)
+{
+        int err = -EINVAL;
+        ENTRY;
+
+        switch(pcfg->pcfg_command) {
+        default:
+                CDEBUG(D_IOCTL, "Inappropriate cmd: %d\n", pcfg->pcfg_command);
+                break;
+                
+        case NAL_CMD_ADD_ROUTE:
+                CDEBUG(D_IOCTL, "Adding route: [%d] "LPU64" : "LPU64" - "LPU64"\n",
+                       pcfg->pcfg_nal, pcfg->pcfg_nid, 
+                       pcfg->pcfg_nid2, pcfg->pcfg_nid3);
+                err = kportal_add_route(pcfg->pcfg_gw_nal, pcfg->pcfg_nid,
+                                        pcfg->pcfg_nid2, pcfg->pcfg_nid3);
+                break;
+
+        case NAL_CMD_DEL_ROUTE:
+                CDEBUG (D_IOCTL, "Removing routes via [%d] "LPU64" : "LPU64" - "LPU64"\n",
+                        pcfg->pcfg_gw_nal, pcfg->pcfg_nid, 
+                        pcfg->pcfg_nid2, pcfg->pcfg_nid3);
+                err = kportal_del_route (pcfg->pcfg_gw_nal, pcfg->pcfg_nid,
+                                         pcfg->pcfg_nid2, pcfg->pcfg_nid3);
+                break;
+
+        case NAL_CMD_NOTIFY_ROUTER: {
+                CDEBUG (D_IOCTL, "Notifying peer [%d] "LPU64" %s @ %ld\n",
+                        pcfg->pcfg_gw_nal, pcfg->pcfg_nid,
+                        pcfg->pcfg_flags ? "Enabling" : "Disabling",
+                        (time_t)pcfg->pcfg_nid3);
+                
+                err = kportal_notify_router (pcfg->pcfg_gw_nal, pcfg->pcfg_nid,
+                                             pcfg->pcfg_flags, 
+                                             (time_t)pcfg->pcfg_nid3);
+                break;
+        }
+                
+        case NAL_CMD_GET_ROUTE:
+                CDEBUG (D_IOCTL, "Getting route [%d]\n", pcfg->pcfg_count);
+                err = kportal_get_route(pcfg->pcfg_count, &pcfg->pcfg_gw_nal,
+                                        &pcfg->pcfg_nid, 
+                                        &pcfg->pcfg_nid2, &pcfg->pcfg_nid3,
+                                        &pcfg->pcfg_flags);
+                break;
+        }
+        RETURN(err);
+}
+
+int
+kportal_nal_cmd(struct portals_cfg *pcfg)
+{
+        __u32 nal = pcfg->pcfg_nal;
+        int rc = -EINVAL;
+
+        ENTRY;
+
+        down(&nal_cmd_sem);
+        if (nal > 0 && nal <= NAL_MAX_NR && nal_cmd[nal].nch_handler) {
+                CDEBUG(D_IOCTL, "calling handler nal: %d, cmd: %d\n", nal, 
+                       pcfg->pcfg_command);
+                rc = nal_cmd[nal].nch_handler(pcfg, nal_cmd[nal].nch_private);
+        }
+        up(&nal_cmd_sem);
+        RETURN(rc);
+}
+
+ptl_handle_ni_t *
+kportal_get_ni (int nal)
+{
+
+        switch (nal)
+        {
+        case QSWNAL:
+                return (PORTAL_SYMBOL_GET(kqswnal_ni));
+        case SOCKNAL:
+                return (PORTAL_SYMBOL_GET(ksocknal_ni));
+        case GMNAL:
+                return  (PORTAL_SYMBOL_GET(kgmnal_ni));
+        case IBNAL:
+                return  (PORTAL_SYMBOL_GET(kibnal_ni));
+        case TCPNAL:
+                /* userspace NAL */
+                return (NULL);
+        case SCIMACNAL:
+                return  (PORTAL_SYMBOL_GET(kscimacnal_ni));
+        default:
+                /* A warning to a naive caller */
+                CERROR ("unknown nal: %d\n", nal);
+                return (NULL);
+        }
+}
+
+void
+kportal_put_ni (int nal)
+{
+
+        switch (nal)
+        {
+        case QSWNAL:
+                PORTAL_SYMBOL_PUT(kqswnal_ni);
+                break;
+        case SOCKNAL:
+                PORTAL_SYMBOL_PUT(ksocknal_ni);
+                break;
+        case GMNAL:
+                PORTAL_SYMBOL_PUT(kgmnal_ni);
+                break;
+        case IBNAL:
+                PORTAL_SYMBOL_PUT(kibnal_ni);
+                break;
+        case TCPNAL:
+                /* A lesson to a malicious caller */
+                LBUG ();
+        case SCIMACNAL:
+                PORTAL_SYMBOL_PUT(kscimacnal_ni);
+                break;
+        default:
+                CERROR ("unknown nal: %d\n", nal);
+        }
+}
+
+int
+kportal_nal_register(int nal, nal_cmd_handler_t handler, void * private)
+{
+        int rc = 0;
+
+        CDEBUG(D_IOCTL, "Register NAL %d, handler: %p\n", nal, handler);
+
+        if (nal > 0  && nal <= NAL_MAX_NR) {
+                down(&nal_cmd_sem);
+                if (nal_cmd[nal].nch_handler != NULL)
+                        rc = -EBUSY;
+                else {
+                        nal_cmd[nal].nch_handler = handler;
+                        nal_cmd[nal].nch_private = private;
+                }
+                up(&nal_cmd_sem);
+        }
+        return rc;
+}
+
+int
+kportal_nal_unregister(int nal)
+{
+        int rc = 0;
+
+        CDEBUG(D_IOCTL, "Unregister NAL %d\n", nal);
+
+        if (nal > 0  && nal <= NAL_MAX_NR) {
+                down(&nal_cmd_sem);
+                nal_cmd[nal].nch_handler = NULL;
+                nal_cmd[nal].nch_private = NULL;
+                up(&nal_cmd_sem);
+        }
+        return rc;
+}
+
 static int kportal_ioctl(struct portal_ioctl_data *data, 
                          unsigned int cmd, unsigned long arg)
 {
-        int err;
+        int err = 0;
         char str[PTL_NALFMT_SIZE];
         ENTRY;
 
@@ -78,53 +334,68 @@ static int kportal_ioctl(struct portal_ioctl_data *data,
         }
 
         case IOC_PORTAL_GET_NID: {
-                ptl_handle_ni_t    nih;
-                ptl_process_id_t   pid;
+                const ptl_handle_ni_t *nip;
+                ptl_process_id_t       pid;
 
                 CDEBUG (D_IOCTL, "Getting nid for nal [%d]\n", data->ioc_nal);
 
-                err = PtlNIInit(data->ioc_nal, 0, NULL, NULL, &nih);
-                if (!(err == PTL_OK || err == PTL_IFACE_DUP))
+                nip = kportal_get_ni (data->ioc_nal);
+                if (nip == NULL)
                         RETURN (-EINVAL);
 
-                err = PtlGetId (nih, &pid);
+                err = PtlGetId (*nip, &pid);
                 LASSERT (err == PTL_OK);
-
-                PtlNIFini(nih);
+                kportal_put_ni (data->ioc_nal);
 
                 data->ioc_nid = pid.nid;
                 if (copy_to_user ((char *)arg, data, sizeof (*data)))
-                        RETURN (-EFAULT);
-                RETURN(0);
+                        err = -EFAULT;
+                break;
         }
 
+        case IOC_PORTAL_NAL_CMD: {
+                struct portals_cfg pcfg;
+
+                LASSERT (data->ioc_plen1 == sizeof(pcfg));
+                err = copy_from_user(&pcfg, (void *)data->ioc_pbuf1, 
+                                     sizeof(pcfg));
+                if ( err ) {
+                        EXIT;
+                        return err;
+                }
+
+                CDEBUG (D_IOCTL, "nal command nal %d cmd %d\n", pcfg.pcfg_nal,
+                        pcfg.pcfg_command);
+                err = kportal_nal_cmd(&pcfg);
+                if (err == 0) {
+                        if (copy_to_user((char *)data->ioc_pbuf1, &pcfg, 
+                                         sizeof (pcfg)))
+                                err = -EFAULT;
+                        if (copy_to_user((char *)arg, data, sizeof (*data)))
+                                err = -EFAULT;
+                }
+                break;
+        }
         case IOC_PORTAL_FAIL_NID: {
-                ptl_handle_ni_t    nih;
+                const ptl_handle_ni_t *nip;
 
                 CDEBUG (D_IOCTL, "fail nid: [%d] "LPU64" count %d\n",
                         data->ioc_nal, data->ioc_nid, data->ioc_count);
 
-                err = PtlNIInit(data->ioc_nal, 0, NULL, NULL, &nih);
-                if (!(err == PTL_OK || err == PTL_IFACE_DUP))
+                nip = kportal_get_ni (data->ioc_nal);
+                if (nip == NULL)
                         return (-EINVAL);
 
-                if (err == PTL_OK) {
-                        /* There's no point in failing an interface that
-                         * came into existance just for this */
-                        err = -EINVAL;
-                } else {
-                        err = PtlFailNid (nih, data->ioc_nid, data->ioc_count);
-                        if (err != PTL_OK)
-                                err = -EINVAL;
-                }
-
-                PtlNIFini(nih);
-                RETURN (err);
+                err = PtlFailNid (*nip, data->ioc_nid, data->ioc_count);
+                kportal_put_ni (data->ioc_nal);
+                break;
         }
         default:
-                RETURN(-EINVAL);
+                err = -EINVAL;
+                break;
         }
-        /* Not Reached */
+
+        RETURN(err);
 }
 
 DECLARE_IOCTL_HANDLER(kportal_ioctl_handler, kportal_ioctl);
@@ -140,24 +411,30 @@ static int init_kportals_module(void)
                 RETURN(rc);
         }
 
-        rc = libcfs_register_ioctl(&kportal_ioctl_handler);
-        LASSERT (rc == 0);
+        rc = kportal_nal_register(ROUTER, kportal_router_cmd, NULL);
+        if (rc) {
+                PtlFini();
+                CERROR("kportal_nal_registre: ROUTER error %d\n", rc);
+        }
+
+        if (rc == 0)
+                libcfs_register_ioctl(&kportal_ioctl_handler);
 
         RETURN(rc);
 }
 
 static void exit_kportals_module(void)
 {
-        int rc;
-
-        rc = libcfs_deregister_ioctl(&kportal_ioctl_handler);
-        LASSERT (rc == 0);
-
+        libcfs_deregister_ioctl(&kportal_ioctl_handler);
+        kportal_nal_unregister(ROUTER);
         PtlFini();
 }
 
-EXPORT_SYMBOL(ptl_register_nal);
-EXPORT_SYMBOL(ptl_unregister_nal);
+EXPORT_SYMBOL(kportal_nal_register);
+EXPORT_SYMBOL(kportal_nal_unregister);
+EXPORT_SYMBOL(kportal_get_ni);
+EXPORT_SYMBOL(kportal_put_ni);
+EXPORT_SYMBOL(kportal_nal_cmd);
 
 EXPORT_SYMBOL(ptl_err_str);
 EXPORT_SYMBOL(lib_dispatch);
@@ -169,6 +446,7 @@ EXPORT_SYMBOL(PtlMDAttach);
 EXPORT_SYMBOL(PtlMDUnlink);
 EXPORT_SYMBOL(PtlNIInit);
 EXPORT_SYMBOL(PtlNIFini);
+EXPORT_SYMBOL(PtlNIDebug);
 EXPORT_SYMBOL(PtlInit);
 EXPORT_SYMBOL(PtlFini);
 EXPORT_SYMBOL(PtlSnprintHandle);
diff --git a/lustre/portals/router/.cvsignore b/lustre/portals/router/.cvsignore
index 5ed596b..95973d6 100644
--- a/lustre/portals/router/.cvsignore
+++ b/lustre/portals/router/.cvsignore
@@ -1,10 +1,4 @@
 .deps
 Makefile
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+Makefile.in
+.*.o.cmd
diff --git a/lustre/portals/router/Makefile.am b/lustre/portals/router/Makefile.am
new file mode 100644
index 0000000..1c8087b
--- /dev/null
+++ b/lustre/portals/router/Makefile.am
@@ -0,0 +1,16 @@
+# Copyright (C) 2001  Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+include ../Rules.linux
+
+MODULE = kptlrouter
+modulenet_DATA = kptlrouter.o
+EXTRA_PROGRAMS = kptlrouter
+
+
+#CFLAGS:= @KCFLAGS@ 
+#CPPFLAGS:=@KCPPFLAGS@
+DEFS =
+kptlrouter_SOURCES = router.c proc.c router.h
diff --git a/lustre/portals/router/Makefile.in b/lustre/portals/router/Makefile.in
deleted file mode 100644
index 3bb6cf7..0000000
--- a/lustre/portals/router/Makefile.in
+++ /dev/null
@@ -1,4 +0,0 @@
-MODULES := kptlrouter
-kptlrouter-objs := router.o proc.o
-
-@INCLUDE_RULES@
diff --git a/lustre/portals/router/autoMakefile.am b/lustre/portals/router/autoMakefile.am
deleted file mode 100644
index fa11e8c..0000000
--- a/lustre/portals/router/autoMakefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (C) 2001  Cluster File Systems, Inc.
-#
-# This code is issued under the GNU General Public License.
-# See the file COPYING in this distribution
-
-if MODULES
-if !CRAY_PORTALS
-modulenet_DATA = kptlrouter$(KMODEXT)
-endif
-endif
-
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-DIST_SOURCES = $(kptlrouter-objs:%.o=%.c) router.h
diff --git a/lustre/portals/router/router.c b/lustre/portals/router/router.c
index 9fb6afe..d0dbf0a 100644
--- a/lustre/portals/router/router.c
+++ b/lustre/portals/router/router.c
@@ -48,6 +48,13 @@ kpr_router_interface_t kpr_router_interface = {
 	kprri_deregister:	kpr_deregister_nal,
 };
 
+kpr_control_interface_t kpr_control_interface = {
+	kprci_add_route:	kpr_add_route,
+	kprci_del_route:        kpr_del_route,
+	kprci_get_route:        kpr_get_route,
+	kprci_notify:           kpr_sys_notify,
+};
+
 int
 kpr_register_nal (kpr_nal_interface_t *nalif, void **argp)
 {
@@ -282,9 +289,18 @@ kpr_shutdown_nal (void *arg)
 	LASSERT (!ne->kpne_shutdown);
 	LASSERT (!in_interrupt());
 
-	write_lock_irqsave (&kpr_rwlock, flags);
+	write_lock_irqsave (&kpr_rwlock, flags); /* locking a bit spurious... */
 	ne->kpne_shutdown = 1;
-	write_unlock_irqrestore (&kpr_rwlock, flags);
+	write_unlock_irqrestore (&kpr_rwlock, flags); /* except it's a memory barrier */
+
+	while (atomic_read (&ne->kpne_refcount) != 0)
+	{
+		CDEBUG (D_NET, "Waiting for refcount on NAL %d to reach zero (%d)\n",
+			ne->kpne_interface.kprni_nalid, atomic_read (&ne->kpne_refcount));
+
+		set_current_state (TASK_UNINTERRUPTIBLE);
+		schedule_timeout (HZ);
+	}
 }
 
 void
@@ -296,21 +312,14 @@ kpr_deregister_nal (void *arg)
         CDEBUG (D_NET, "Deregister NAL %d\n", ne->kpne_interface.kprni_nalid);
 
 	LASSERT (ne->kpne_shutdown);		/* caller must have issued shutdown already */
+	LASSERT (atomic_read (&ne->kpne_refcount) == 0); /* can't be busy */
 	LASSERT (!in_interrupt());
 
 	write_lock_irqsave (&kpr_rwlock, flags);
-	list_del (&ne->kpne_list);
-	write_unlock_irqrestore (&kpr_rwlock, flags);
 
-        /* Wait until all outstanding messages/notifications have completed */
-	while (atomic_read (&ne->kpne_refcount) != 0)
-	{
-		CDEBUG (D_NET, "Waiting for refcount on NAL %d to reach zero (%d)\n",
-			ne->kpne_interface.kprni_nalid, atomic_read (&ne->kpne_refcount));
+	list_del (&ne->kpne_list);
 
-		set_current_state (TASK_UNINTERRUPTIBLE);
-		schedule_timeout (HZ);
-	}
+	write_unlock_irqrestore (&kpr_rwlock, flags);
 
 	PORTAL_FREE (ne, sizeof (*ne));
         PORTAL_MODULE_UNUSE;
@@ -368,14 +377,11 @@ kpr_lookup_target (void *arg, ptl_nid_t target_nid, int nob,
 
         CDEBUG (D_NET, "lookup "LPX64" from NAL %d\n", target_nid, 
                 ne->kpne_interface.kprni_nalid);
-        LASSERT (!in_interrupt());
-
-	read_lock (&kpr_rwlock);
 
-	if (ne->kpne_shutdown) {	/* caller is shutting down */
-                read_unlock (&kpr_rwlock);
+	if (ne->kpne_shutdown)		/* caller is shutting down */
 		return (-ENOENT);
-        }
+
+	read_lock (&kpr_rwlock);
 
 	/* Search routes for one that has a gateway to target_nid on the callers network */
 
@@ -446,26 +452,25 @@ kpr_forward_packet (void *arg, kpr_fwd_desc_t *fwd)
 	struct list_head    *e;
         kpr_route_entry_t   *re;
         kpr_nal_entry_t     *tmp_ne;
-        int                  rc;
 
         CDEBUG (D_NET, "forward [%p] "LPX64" from NAL %d\n", fwd,
                 target_nid, src_ne->kpne_interface.kprni_nalid);
 
         LASSERT (nob == lib_kiov_nob (fwd->kprfd_niov, fwd->kprfd_kiov));
-        LASSERT (!in_interrupt());
-
-	read_lock (&kpr_rwlock);
+        
+        atomic_inc (&kpr_queue_depth);
+	atomic_inc (&src_ne->kpne_refcount); /* source nal is busy until fwd completes */
 
         kpr_fwd_packets++;                   /* (loose) stats accounting */
         kpr_fwd_bytes += nob + sizeof(ptl_hdr_t);
 
-	if (src_ne->kpne_shutdown) {         /* caller is shutting down */
-                rc = -ESHUTDOWN;
+	if (src_ne->kpne_shutdown)           /* caller is shutting down */
 		goto out;
-        }
 
 	fwd->kprfd_router_arg = src_ne;      /* stash caller's nal entry */
 
+	read_lock (&kpr_rwlock);
+
 	/* Search routes for one that has a gateway to target_nid NOT on the caller's network */
 
         list_for_each (e, &kpr_routes) {
@@ -502,9 +507,7 @@ kpr_forward_packet (void *arg, kpr_fwd_desc_t *fwd)
                 kpr_update_weight (ge, nob);
 
                 fwd->kprfd_gateway_nid = ge->kpge_nid;
-                atomic_inc (&src_ne->kpne_refcount); /* source and dest nals are */
-                atomic_inc (&dst_ne->kpne_refcount); /* busy until fwd completes */
-                atomic_inc (&kpr_queue_depth);
+                atomic_inc (&dst_ne->kpne_refcount); /* dest nal is busy until fwd completes */
 
                 read_unlock (&kpr_rwlock);
 
@@ -517,16 +520,18 @@ kpr_forward_packet (void *arg, kpr_fwd_desc_t *fwd)
                 return;
 	}
 
-        rc = -EHOSTUNREACH;
+        read_unlock (&kpr_rwlock);
  out:
         kpr_fwd_errors++;
 
-        CDEBUG (D_NET, "Failed to forward [%p] "LPX64" from NAL %d: %d\n", 
-                fwd, target_nid, src_ne->kpne_interface.kprni_nalid, rc);
+        CDEBUG (D_NET, "Failed to forward [%p] "LPX64" from NAL %d\n", fwd,
+                target_nid, src_ne->kpne_interface.kprni_nalid);
 
-	(fwd->kprfd_callback)(fwd->kprfd_callback_arg, rc);
+	/* Can't find anywhere to forward to */
+	(fwd->kprfd_callback)(fwd->kprfd_callback_arg, -EHOSTUNREACH);
 
-        read_unlock (&kpr_rwlock);
+        atomic_dec (&kpr_queue_depth);
+	atomic_dec (&src_ne->kpne_refcount);
 }
 
 void
@@ -630,7 +635,7 @@ kpr_add_route (int gateway_nalid, ptl_nid_t gateway_nid,
 
 int
 kpr_sys_notify (int gateway_nalid, ptl_nid_t gateway_nid,
-                int alive, time_t when)
+            int alive, time_t when)
 {
         return (kpr_do_notify (0, gateway_nalid, gateway_nid, alive, when));
 }
@@ -689,12 +694,11 @@ kpr_del_route (int gw_nalid, ptl_nid_t gw_nid,
 }
 
 int
-kpr_get_route (int idx, __u32 *gateway_nalid, ptl_nid_t *gateway_nid,
-               ptl_nid_t *lo_nid, ptl_nid_t *hi_nid, __u32 *alive)
+kpr_get_route (int idx, int *gateway_nalid, ptl_nid_t *gateway_nid,
+               ptl_nid_t *lo_nid, ptl_nid_t *hi_nid, int *alive)
 {
 	struct list_head  *e;
 
-        LASSERT (!in_interrupt());
 	read_lock(&kpr_rwlock);
 
         for (e = kpr_routes.next; e != &kpr_routes; e = e->next) {
@@ -718,67 +722,11 @@ kpr_get_route (int idx, __u32 *gateway_nalid, ptl_nid_t *gateway_nid,
         return (-ENOENT);
 }
 
-static int 
-kpr_nal_cmd(struct portals_cfg *pcfg, void * private)
-{
-        int err = -EINVAL;
-        ENTRY;
-
-        switch(pcfg->pcfg_command) {
-        default:
-                CDEBUG(D_IOCTL, "Inappropriate cmd: %d\n", pcfg->pcfg_command);
-                break;
-                
-        case NAL_CMD_ADD_ROUTE:
-                CDEBUG(D_IOCTL, "Adding route: [%d] "LPU64" : "LPU64" - "LPU64"\n",
-                       pcfg->pcfg_nal, pcfg->pcfg_nid, 
-                       pcfg->pcfg_nid2, pcfg->pcfg_nid3);
-                err = kpr_add_route(pcfg->pcfg_gw_nal, pcfg->pcfg_nid,
-                                    pcfg->pcfg_nid2, pcfg->pcfg_nid3);
-                break;
-
-        case NAL_CMD_DEL_ROUTE:
-                CDEBUG (D_IOCTL, "Removing routes via [%d] "LPU64" : "LPU64" - "LPU64"\n",
-                        pcfg->pcfg_gw_nal, pcfg->pcfg_nid, 
-                        pcfg->pcfg_nid2, pcfg->pcfg_nid3);
-                err = kpr_del_route (pcfg->pcfg_gw_nal, pcfg->pcfg_nid,
-                                     pcfg->pcfg_nid2, pcfg->pcfg_nid3);
-                break;
-
-        case NAL_CMD_NOTIFY_ROUTER: {
-                CDEBUG (D_IOCTL, "Notifying peer [%d] "LPU64" %s @ %ld\n",
-                        pcfg->pcfg_gw_nal, pcfg->pcfg_nid,
-                        pcfg->pcfg_flags ? "Enabling" : "Disabling",
-                        (time_t)pcfg->pcfg_nid3);
-                
-                err = kpr_sys_notify (pcfg->pcfg_gw_nal, pcfg->pcfg_nid,
-                                      pcfg->pcfg_flags, (time_t)pcfg->pcfg_nid3);
-                break;
-        }
-                
-        case NAL_CMD_GET_ROUTE:
-                CDEBUG (D_IOCTL, "Getting route [%d]\n", pcfg->pcfg_count);
-                err = kpr_get_route(pcfg->pcfg_count, &pcfg->pcfg_gw_nal,
-                                    &pcfg->pcfg_nid, 
-                                    &pcfg->pcfg_nid2, &pcfg->pcfg_nid3,
-                                    &pcfg->pcfg_flags);
-                break;
-        }
-        RETURN(err);
-}
-
-
 static void /*__exit*/
 kpr_finalise (void)
 {
         LASSERT (list_empty (&kpr_nals));
 
-        libcfs_nal_cmd_unregister(ROUTER);
-
-        PORTAL_SYMBOL_UNREGISTER(kpr_router_interface);
-
-        kpr_proc_fini();
-
         while (!list_empty (&kpr_routes)) {
                 kpr_route_entry_t *re = list_entry(kpr_routes.next,
                                                    kpr_route_entry_t,
@@ -788,6 +736,11 @@ kpr_finalise (void)
                 PORTAL_FREE(re, sizeof (*re));
         }
 
+        kpr_proc_fini();
+
+        PORTAL_SYMBOL_UNREGISTER(kpr_router_interface);
+        PORTAL_SYMBOL_UNREGISTER(kpr_control_interface);
+
         CDEBUG(D_MALLOC, "kpr_finalise: kmem back to %d\n",
                atomic_read(&portal_kmemory));
 }
@@ -795,20 +748,13 @@ kpr_finalise (void)
 static int __init
 kpr_initialise (void)
 {
-        int     rc;
-        
         CDEBUG(D_MALLOC, "kpr_initialise: kmem %d\n",
                atomic_read(&portal_kmemory));
 
         kpr_proc_init();
 
-        rc = libcfs_nal_cmd_register(ROUTER, kpr_nal_cmd, NULL);
-        if (rc != 0) {
-                CERROR("Can't register nal cmd handler\n");
-                return (rc);
-        }
-        
         PORTAL_SYMBOL_REGISTER(kpr_router_interface);
+        PORTAL_SYMBOL_REGISTER(kpr_control_interface);
         return (0);
 }
 
@@ -819,4 +765,5 @@ MODULE_LICENSE("GPL");
 module_init (kpr_initialise);
 module_exit (kpr_finalise);
 
+EXPORT_SYMBOL (kpr_control_interface);
 EXPORT_SYMBOL (kpr_router_interface);
diff --git a/lustre/portals/router/router.h b/lustre/portals/router/router.h
index 0787064..309025b3 100644
--- a/lustre/portals/router/router.h
+++ b/lustre/portals/router/router.h
@@ -93,6 +93,15 @@ extern void kpr_deregister_nal (void *arg);
 extern void kpr_proc_init (void);
 extern void kpr_proc_fini (void);
 
+extern int kpr_add_route (int gateway_nal, ptl_nid_t gateway_nid, 
+                          ptl_nid_t lo_nid, ptl_nid_t hi_nid);
+extern int kpr_del_route (int gw_nal, ptl_nid_t gw_nid,
+                          ptl_nid_t lo, ptl_nid_t hi);
+extern int kpr_get_route (int idx, int *gateway_nal, ptl_nid_t *gateway_nid, 
+                          ptl_nid_t *lo_nid, ptl_nid_t *hi_nid, int *alive);
+extern int kpr_sys_notify (int gw_nalid, ptl_nid_t gw_nid,
+                           int alive, time_t when);
+
 extern unsigned long long kpr_fwd_bytes;
 extern unsigned long      kpr_fwd_packets;
 extern unsigned long      kpr_fwd_errors;
diff --git a/lustre/portals/tests/.cvsignore b/lustre/portals/tests/.cvsignore
index e034130..d0c4c88 100644
--- a/lustre/portals/tests/.cvsignore
+++ b/lustre/portals/tests/.cvsignore
@@ -1,10 +1,4 @@
 Makefile
+Makefile.in
 .deps
-.*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+.*.o.cmd
diff --git a/lustre/portals/tests/Makefile.am b/lustre/portals/tests/Makefile.am
new file mode 100644
index 0000000..7b47ae0
--- /dev/null
+++ b/lustre/portals/tests/Makefile.am
@@ -0,0 +1,23 @@
+# Copyright (C) 2001  Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+include ../Rules.linux
+
+LDFLAGS = -m "`$(LD) --help | awk '/supported emulations/ {print $$4}'`" -r
+LINK = $(LD) $(LDFLAGS) -o $@
+DEFS =
+LIBS =
+MODULE = $(basename)
+EXTRA_DIST = startserver.sh startclient.sh stopserver.sh stopclient.sh
+
+noinst_PROGRAMS = pingsrv.o pingcli.o spingsrv.o spingcli.o 
+
+pingsrv_o_SOURCES = ping_srv.c ping.h
+
+pingcli_o_SOURCES = ping_cli.c ping.h
+
+spingsrv_o_SOURCES = sping_srv.c ping.h
+
+spingcli_o_SOURCES = sping_cli.c ping.h
diff --git a/lustre/portals/tests/Makefile.in b/lustre/portals/tests/Makefile.in
deleted file mode 100644
index c309db0..0000000
--- a/lustre/portals/tests/Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-MODULES := pingsrv pingcli spingsrv spingcli
-pingsrv-objs := ping_srv.o
-
-ifeq ($(PATCHLEVEL),6)
-pingcli-objs := ping_cli.o
-spingsrv-objs := sping_srv.o
-spingcli-objs := sping_cli.o
-else
-ping%.c: ping_%.c
-	ln -sf $< $@
-
-sping%.c: sping_%.c
-	ln -sf $< $@
-endif
-
-@INCLUDE_RULES@
diff --git a/lustre/portals/tests/autoMakefile.am b/lustre/portals/tests/autoMakefile.am
deleted file mode 100644
index 5f81b93..0000000
--- a/lustre/portals/tests/autoMakefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright (C) 2001  Cluster File Systems, Inc.
-#
-# This code is issued under the GNU General Public License.
-# See the file COPYING in this distribution
-
-if MODULES
-if !CRAY_PORTALS
-if TESTS
-noinst_DATA := pingsrv$(KMODEXT) pingcli$(KMODEXT)
-noinst_DATA += spingsrv$(KMODEXT) spingcli$(KMODEXT)
-endif
-endif
-endif
-
-MOSTLYCLEANFILES = *.o *.ko *.mod.c pingsrv.c pingcli.c spingsrv.c spingcli.c
-DIST_SOURCES = ping_srv.c ping_cli.c sping_srv.c sping_cli.c ping.h
diff --git a/lustre/portals/tests/ping_cli.c b/lustre/portals/tests/ping_cli.c
index b216df1..9977f20 100644
--- a/lustre/portals/tests/ping_cli.c
+++ b/lustre/portals/tests/ping_cli.c
@@ -46,7 +46,7 @@ static struct pingcli_data *client = NULL;
 static int count = 0;
 
 static void
-pingcli_shutdown(ptl_handle_ni_t nih, int err)
+pingcli_shutdown(int err)
 {
         int rc;
 
@@ -70,7 +70,7 @@ pingcli_shutdown(ptl_handle_ni_t nih, int err)
                         if ((rc = PtlMEUnlink (client->me)))
                                 PDEBUG ("PtlMEUnlink", rc);
                 case 3:
-                        PtlNIFini(nih);
+                        kportal_put_ni (client->args->ioc_nal);
 
                 case 4:
                         /* Free our buffers */
@@ -84,7 +84,7 @@ pingcli_shutdown(ptl_handle_ni_t nih, int err)
         CDEBUG (D_OTHER, "ping client released resources\n");
 } /* pingcli_shutdown() */
 
-static void pingcli_callback(ptl_event_t *ev)
+static int pingcli_callback(ptl_event_t *ev)
 {
         int i, magic;
         i = *(int *)(ev->mem_desc.start + ev->offset + sizeof(unsigned));
@@ -92,19 +92,21 @@ static void pingcli_callback(ptl_event_t *ev)
 
         if(magic != 0xcafebabe) {
                 printk ("LustreError: Unexpected response \n");
+                return 1;
         }
 
         if((i == count) || !count)
                 wake_up_process (client->tsk);
         else
                 printk ("LustreError: Received response after timeout for %d\n",i);
+        return 1;
 }
 
 
 static struct pingcli_data *
 pingcli_start(struct portal_ioctl_data *args)
 {
-        ptl_handle_ni_t nih = PTL_INVALID_HANDLE;
+        ptl_handle_ni_t *nip;
         unsigned ping_head_magic = PING_HEADER_MAGIC;
         unsigned ping_bulk_magic = PING_BULK_MAGIC;
         int rc;
@@ -125,7 +127,7 @@ pingcli_start(struct portal_ioctl_data *args)
         if (client->outbuf == NULL)
         {
                 CERROR ("Unable to allocate out_buf ("LPSZ" bytes)\n", STDSIZE);
-                pingcli_shutdown (nih, 4);
+                pingcli_shutdown (4);
                 return (NULL);
         }
 
@@ -134,24 +136,23 @@ pingcli_start(struct portal_ioctl_data *args)
         if (client->inbuf == NULL)
         {
                 CERROR ("Unable to allocate out_buf ("LPSZ" bytes)\n", STDSIZE);
-                pingcli_shutdown (nih, 4);
+                pingcli_shutdown (4);
                 return (NULL);
         }
 
         /* Aquire and initialize the proper nal for portals. */
-        rc = PtlNIInit(args->ioc_nal, 0, NULL, NULL, &nih);
-        if (rc != PTL_OK || rc != PTL_IFACE_DUP)
+        if ((nip = kportal_get_ni (args->ioc_nal)) == NULL)
         {
                 CERROR ("NAL %d not loaded\n", args->ioc_nal);
-                pingcli_shutdown (nih, 4);
+                pingcli_shutdown (4);
                 return (NULL);
         }
 
         /* Based on the initialization aquire our unique portal ID. */
-        if ((rc = PtlGetId (nih, &client->myid)))
+        if ((rc = PtlGetId (*nip, &client->myid)))
         {
                 CERROR ("PtlGetId error %d\n", rc);
-                pingcli_shutdown (nih, 2);
+                pingcli_shutdown (2);
                 return (NULL);
         }
 
@@ -163,20 +164,20 @@ pingcli_start(struct portal_ioctl_data *args)
         client->id_remote.nid = args->ioc_nid;
         client->id_remote.pid = 0;
 
-        if ((rc = PtlMEAttach (nih, PTL_PING_CLIENT,
+        if ((rc = PtlMEAttach (*nip, PTL_PING_CLIENT,
                    client->id_local, 0, ~0, PTL_RETAIN,
                    PTL_INS_AFTER, &client->me)))
         {
                 CERROR ("PtlMEAttach error %d\n", rc);
-                pingcli_shutdown (nih, 2);
+                pingcli_shutdown (2);
                 return (NULL);
         }
 
         /* Allocate the event queue for this network interface */
-        if ((rc = PtlEQAlloc (nih, 64, pingcli_callback, &client->eq)))
+        if ((rc = PtlEQAlloc (*nip, 64, pingcli_callback, &client->eq)))
         {
                 CERROR ("PtlEQAlloc error %d\n", rc);
-                pingcli_shutdown (nih, 2);
+                pingcli_shutdown (2);
                 return (NULL);
         }
 
@@ -195,7 +196,7 @@ pingcli_start(struct portal_ioctl_data *args)
         if ((rc = PtlMDAttach (client->me, client->md_in_head,
                               PTL_UNLINK, &client->md_in_head_h))) {
                 CERROR ("PtlMDAttach error %d\n", rc);
-                pingcli_shutdown (nih, 1);
+                pingcli_shutdown (1);
                 return (NULL);
         }
         /* Setup the outgoing ping header */
@@ -211,10 +212,10 @@ pingcli_start(struct portal_ioctl_data *args)
         count = 0;
 
         /* Bind the outgoing ping header */
-        if ((rc=PtlMDBind (nih, client->md_out_head,
+        if ((rc=PtlMDBind (*nip, client->md_out_head,
                            PTL_UNLINK, &client->md_out_head_h))) {
                 CERROR ("PtlMDBind error %d\n", rc);
-                pingcli_shutdown (nih, 1);
+                pingcli_shutdown (1);
                 return NULL;
         }
         while ((args->ioc_count - count)) {
@@ -229,7 +230,7 @@ pingcli_start(struct portal_ioctl_data *args)
                 if((rc = PtlPut (client->md_out_head_h, PTL_NOACK_REQ,
                           client->id_remote, PTL_PING_SERVER, 0, 0, 0, 0))) {
                          PDEBUG ("PtlPut (header)", rc);
-                         pingcli_shutdown (nih, 1);
+                         pingcli_shutdown (1);
                          return NULL;
                 }
                 printk ("Lustre: sent msg no %d", count);
@@ -254,7 +255,7 @@ pingcli_start(struct portal_ioctl_data *args)
                 PORTAL_FREE (client->inbuf,
                                (args->ioc_size + STDSIZE) * args->ioc_count);
 
-        pingcli_shutdown (nih, 2);
+        pingcli_shutdown (2);
 
         /* Success! */
         return NULL;
diff --git a/lustre/portals/tests/ping_srv.c b/lustre/portals/tests/ping_srv.c
index 188ba98..0aa1ea7 100644
--- a/lustre/portals/tests/ping_srv.c
+++ b/lustre/portals/tests/ping_srv.c
@@ -81,7 +81,7 @@ static void *pingsrv_shutdown(int err)
                                         PDEBUG ("PtlMEUnlink", rc);
 
                 case 3:
-                        PtlNIFini (server->ni);
+                        kportal_put_ni (nal);
 
                 case 4:
                         
@@ -167,18 +167,19 @@ int pingsrv_thread(void *arg)
         return 0;    
 }
 
-static void pingsrv_packet(ptl_event_t *ev)
+static int pingsrv_packet(ptl_event_t *ev)
 {
         atomic_inc (&pkt);
         wake_up_process (server->tsk);
+        return 1;
 } /* pingsrv_head() */
 
-static void pingsrv_callback(ptl_event_t *ev)
+static int pingsrv_callback(ptl_event_t *ev)
 {
         
         if (ev == NULL) {
                 CERROR ("null in callback, ev=%p\n", ev);
-                return;
+                return 0;
         }
         server->evnt = *ev;
         
@@ -192,24 +193,23 @@ static void pingsrv_callback(ptl_event_t *ev)
         
         packets_valid++;
 
-        pingsrv_packet(ev);
+        return pingsrv_packet(ev);
         
 } /* pingsrv_callback() */
 
 
 static struct pingsrv_data *pingsrv_setup(void)
 {
+        ptl_handle_ni_t *nip;
         int rc;
 
-        server->ni = PTL_INVALID_HANDLE;
-
        /* Aquire and initialize the proper nal for portals. */
-        rc = PtlNIInit(nal, 0, NULL, NULL, &server->ni);
-        if (!(rc == PTL_OK || rc == PTL_IFACE_DUP)) {
+        if ((nip = kportal_get_ni (nal)) == NULL) {
                 CDEBUG (D_OTHER, "NAL %d not loaded\n", nal);
                 return pingsrv_shutdown (4);
         }
 
+        server->ni= *nip;
 
         /* Based on the initialization aquire our unique portal ID. */
         if ((rc = PtlGetId (server->ni, &server->my_id))) {
@@ -229,7 +229,7 @@ static struct pingsrv_data *pingsrv_setup(void)
         }
 
 
-        if ((rc = PtlEQAlloc (server->ni, 1024, &pingsrv_callback,
+        if ((rc = PtlEQAlloc (server->ni, 1024, pingsrv_callback,
                                         &server->eq))) {
                 PDEBUG ("PtlEQAlloc (callback)", rc);
                 return pingsrv_shutdown (2);
@@ -298,7 +298,7 @@ static void /*__exit*/ pingsrv_cleanup(void)
 
 MODULE_PARM(nal, "i");
 MODULE_PARM_DESC(nal, "Use the specified NAL "
-                "(2-ksocknal, 1-kqswnal)");
+                "(6-kscimacnal, 2-ksocknal, 1-kqswnal)");
  
 MODULE_AUTHOR("Brian Behlendorf (LLNL)");
 MODULE_DESCRIPTION("A kernel space ping server for portals testing");
diff --git a/lustre/portals/tests/sping_cli.c b/lustre/portals/tests/sping_cli.c
index 8e86491..663da4e 100644
--- a/lustre/portals/tests/sping_cli.c
+++ b/lustre/portals/tests/sping_cli.c
@@ -51,7 +51,7 @@ static struct pingcli_data *client = NULL;
 static int count = 0;
 
 static void
-pingcli_shutdown(ptl_handle_ni_t nih, int err)
+pingcli_shutdown(int err)
 {
         int rc;
 
@@ -72,7 +72,7 @@ pingcli_shutdown(ptl_handle_ni_t nih, int err)
                         if ((rc = PtlMEUnlink (client->me)))
                                 PDEBUG ("PtlMEUnlink", rc);
                 case 3:
-                        PtlNIFini (nih);
+                        kportal_put_ni (client->args->ioc_nal);
 
                 case 4:
                         /* Free our buffers */
@@ -92,16 +92,17 @@ pingcli_shutdown(ptl_handle_ni_t nih, int err)
         CDEBUG (D_OTHER, "ping client released resources\n");
 } /* pingcli_shutdown() */
 
-static void pingcli_callback(ptl_event_t *ev)
+static int pingcli_callback(ptl_event_t *ev)
 {
-        wake_up_process (client->tsk);
+                wake_up_process (client->tsk);
+        return 1;
 }
 
 
 static struct pingcli_data *
 pingcli_start(struct portal_ioctl_data *args)
 {
-        ptl_handle_ni_t nih = PTL_INVALID_HANDLE;
+        const ptl_handle_ni_t *nip;
         unsigned ping_head_magic = PING_HEADER_MAGIC;
         char str[PTL_NALFMT_SIZE];
         int rc;
@@ -121,7 +122,7 @@ pingcli_start(struct portal_ioctl_data *args)
         if (client->outbuf == NULL)
         {
                 CERROR ("Unable to allocate out_buf ("LPSZ" bytes)\n", STDSIZE);
-                pingcli_shutdown (nih, 4);
+                pingcli_shutdown (4);
                 return (NULL);
         }
 
@@ -130,24 +131,23 @@ pingcli_start(struct portal_ioctl_data *args)
         if (client->inbuf == NULL)
         {
                 CERROR ("Unable to allocate out_buf ("LPSZ" bytes)\n", STDSIZE);
-                pingcli_shutdown (nih, 4);
+                pingcli_shutdown (4);
                 return (NULL);
         }
 
         /* Aquire and initialize the proper nal for portals. */
-        rc = PtlNIInit(args->ioc_nal, 0, NULL, NULL, &nih);
-        if (rc != PTL_OK && rc != PTL_IFACE_DUP)
+        if ((nip = kportal_get_ni (args->ioc_nal)) == NULL)
         {
                 CERROR ("NAL %d not loaded.\n", args->ioc_nal);
-                pingcli_shutdown (nih, 4);
+                pingcli_shutdown (4);
                 return (NULL);
         }
 
         /* Based on the initialization aquire our unique portal ID. */
-        if ((rc = PtlGetId (nih, &client->myid)))
+        if ((rc = PtlGetId (*nip, &client->myid)))
         {
                 CERROR ("PtlGetId error %d\n", rc);
-                pingcli_shutdown (nih, 2);
+                pingcli_shutdown (2);
                 return (NULL);
         }
 
@@ -159,20 +159,20 @@ pingcli_start(struct portal_ioctl_data *args)
         client->id_remote.nid = args->ioc_nid;
         client->id_remote.pid = 0;
 
-        if ((rc = PtlMEAttach (nih, PTL_PING_CLIENT,
+        if ((rc = PtlMEAttach (*nip, PTL_PING_CLIENT,
                    client->id_local, 0, ~0, PTL_RETAIN,
                    PTL_INS_AFTER, &client->me)))
         {
                 CERROR ("PtlMEAttach error %d\n", rc);
-                pingcli_shutdown (nih, 2);
+                pingcli_shutdown (2);
                 return (NULL);
         }
 
         /* Allocate the event queue for this network interface */
-        if ((rc = PtlEQAlloc (nih, 64, pingcli_callback, &client->eq)))
+        if ((rc = PtlEQAlloc (*nip, 64, pingcli_callback, &client->eq)))
         {
                 CERROR ("PtlEQAlloc error %d\n", rc);
-                pingcli_shutdown (nih, 2);
+                pingcli_shutdown (2);
                 return (NULL);
         }
 
@@ -189,7 +189,7 @@ pingcli_start(struct portal_ioctl_data *args)
         if ((rc = PtlMDAttach (client->me, client->md_in_head,
                               PTL_UNLINK, &client->md_in_head_h))) {
                 CERROR ("PtlMDAttach error %d\n", rc);
-                pingcli_shutdown (nih, 1);
+                pingcli_shutdown (1);
                 return (NULL);
         }
 
@@ -204,17 +204,17 @@ pingcli_start(struct portal_ioctl_data *args)
         memcpy (client->outbuf, &ping_head_magic, sizeof(ping_head_magic));
 
         /* Bind the outgoing ping header */
-        if ((rc=PtlMDBind (nih, client->md_out_head,
+        if ((rc=PtlMDBind (*nip, client->md_out_head,
                            PTL_UNLINK, &client->md_out_head_h))) {
                 CERROR ("PtlMDBind error %d\n", rc);
-                pingcli_shutdown (nih, 1);
+                pingcli_shutdown (1);
                 return (NULL);
         }
         /* Put the ping packet */
         if((rc = PtlPut (client->md_out_head_h, PTL_NOACK_REQ,
                          client->id_remote, PTL_PING_SERVER, 0, 0, 0, 0))) {
                 PDEBUG ("PtlPut (header)", rc);
-                pingcli_shutdown (nih, 1);
+                pingcli_shutdown (1);
                 return NULL;
         }
 
@@ -223,13 +223,13 @@ pingcli_start(struct portal_ioctl_data *args)
         rc = schedule_timeout (20 * args->ioc_timeout);
         if (rc == 0) {
                 printk ("LustreError: Time out on the server\n");
-                pingcli_shutdown (nih, 2);
+                pingcli_shutdown (2);
                 return NULL;
         } else
                 printk("Lustre: Received respose from the server \n");
 
 
-        pingcli_shutdown (nih, 2);
+        pingcli_shutdown (2);
 
         /* Success! */
         return NULL;
diff --git a/lustre/portals/tests/sping_srv.c b/lustre/portals/tests/sping_srv.c
index d840ddd..e8fb470 100644
--- a/lustre/portals/tests/sping_srv.c
+++ b/lustre/portals/tests/sping_srv.c
@@ -53,7 +53,7 @@
 
 #define STDSIZE (sizeof(int) + sizeof(int) + 4)
 
-static int nal  = PTL_IFACE_DEFAULT;            // Your NAL,
+static int nal  = 0;                            // Your NAL,
 static unsigned long packets_valid = 0;         // Valid packets 
 static int running = 1;
 atomic_t pkt;
@@ -86,7 +86,7 @@ static void *pingsrv_shutdown(int err)
                                         PDEBUG ("PtlMEUnlink", rc);
 
                 case 3:
-                        PtlNIFini(server->ni);
+                        kportal_put_ni (nal);
 
                 case 4:
                         
@@ -159,18 +159,19 @@ int pingsrv_thread(void *arg)
         return 0;    
 }
 
-static void pingsrv_packet(ptl_event_t *ev)
+static int pingsrv_packet(ptl_event_t *ev)
 {
         atomic_inc (&pkt);
         wake_up_process (server->tsk);
+        return 1;
 } /* pingsrv_head() */
 
-static void pingsrv_callback(ptl_event_t *ev)
+static int pingsrv_callback(ptl_event_t *ev)
 {
         
         if (ev == NULL) {
                 CERROR ("null in callback, ev=%p\n", ev);
-                return;
+                return 0;
         }
         server->evnt = *ev;
         
@@ -181,24 +182,24 @@ static void pingsrv_callback(ptl_event_t *ev)
         
         packets_valid++;
 
-        pingsrv_packet(ev);
+        return pingsrv_packet(ev);
         
 } /* pingsrv_callback() */
 
 
 static struct pingsrv_data *pingsrv_setup(void)
 {
+        ptl_handle_ni_t *nip;
         int rc;
 
        /* Aquire and initialize the proper nal for portals. */
-        server->ni = PTL_INVALID_HANDLE;
-
-        rc = PtlNIInit(nal, 0, NULL, NULL, &server->ni);
-        if (rc != PTL_OK && rc != PTL_IFACE_DUP) {
+        if ((nip = kportal_get_ni (nal)) == NULL) {
                 CDEBUG (D_OTHER, "Nal %d not loaded.\n", nal);
                 return pingsrv_shutdown (4);
         }
 
+        server->ni= *nip;
+
         /* Based on the initialization aquire our unique portal ID. */
         if ((rc = PtlGetId (server->ni, &server->my_id))) {
                 PDEBUG ("PtlGetId", rc);
@@ -284,7 +285,7 @@ static void /*__exit*/ pingsrv_cleanup(void)
 
 MODULE_PARM(nal, "i");
 MODULE_PARM_DESC(nal, "Use the specified NAL "
-                "(2-ksocknal, 1-kqswnal)");
+                "(6-kscimacnal, 2-ksocknal, 1-kqswnal)");
  
 MODULE_AUTHOR("Brian Behlendorf (LLNL)");
 MODULE_DESCRIPTION("A kernel space ping server for portals testing");
diff --git a/lustre/portals/unals/Makefile.am b/lustre/portals/unals/Makefile.am
index 1681250..6035ca1 100644
--- a/lustre/portals/unals/Makefile.am
+++ b/lustre/portals/unals/Makefile.am
@@ -1,10 +1,9 @@
-if LIBLUSTRE
+CPPFLAGS=
+INCLUDES=-I$(top_srcdir)/portals/include -I$(top_srcdir)/include -I$(srcdir)
 noinst_LIBRARIES = libtcpnal.a
-endif
-
-if !CRAY_PORTALS
 pkginclude_HEADERS =  pqtimer.h dispatch.h table.h timer.h connection.h ipmap.h bridge.h procbridge.h
 libtcpnal_a_SOURCES = debug.c pqtimer.c select.c table.c pqtimer.h dispatch.h table.h timer.h address.c procapi.c proclib.c connection.c tcpnal.c connection.h
-libtcpnal_a_CPPFLAGS = $(LLCPPFLAGS)
-libtcpnal_a_CFLAGS = $(LLCFLAGS)
-endif
\ No newline at end of file
+
+if LIBLUSTRE
+libtcpnal_a_CFLAGS = -fPIC
+endif
diff --git a/lustre/portals/unals/bridge.h b/lustre/portals/unals/bridge.h
index 90ce324..9a90ab8 100644
--- a/lustre/portals/unals/bridge.h
+++ b/lustre/portals/unals/bridge.h
@@ -10,12 +10,6 @@
 #define TCPNAL_PROCBRIDGE_H
 
 #include <portals/lib-p30.h>
-#include <portals/nal.h>
-
-#define PTL_IFACE_TCP 1
-#define PTL_IFACE_ER 2
-#define PTL_IFACE_SS 3
-#define PTL_IFACE_MAX 4
 
 typedef struct bridge {
     int alive;
@@ -28,6 +22,12 @@ typedef struct bridge {
 } *bridge;
 
 
+nal_t *bridge_init(ptl_interface_t nal,
+                   ptl_pid_t pid_request,
+                   ptl_ni_limits_t *desired,
+                   ptl_ni_limits_t *actual,
+                   int *rc);
+
 typedef int (*nal_initialize)(bridge);
 extern nal_initialize nal_table[PTL_IFACE_MAX];
 
diff --git a/lustre/portals/unals/connection.c b/lustre/portals/unals/connection.c
index 3448460..ca6999a 100644
--- a/lustre/portals/unals/connection.c
+++ b/lustre/portals/unals/connection.c
@@ -229,7 +229,7 @@ tcpnal_hello (int sockfd, ptl_nid_t *nid, int type, __u64 incarnation)
         hdr.type    = __cpu_to_le32 (PTL_MSG_HELLO);
 
         hdr.msg.hello.type = __cpu_to_le32 (type);
-        hdr.msg.hello.incarnation = __cpu_to_le64(incarnation);
+        hdr.msg.hello.incarnation = 0;
 
         /* Assume sufficient socket buffering for this message */
         rc = syscall(SYS_write, sockfd, &hdr, sizeof(hdr));
@@ -315,8 +315,6 @@ connection force_tcp_connection(manager m,
     connection conn;
     struct sockaddr_in addr;
     unsigned int id[2];
-    struct timeval tv;
-    __u64 incarnation;
 
     port = tcpnal_acceptor_port;
 
@@ -355,11 +353,8 @@ connection force_tcp_connection(manager m,
         setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &option, sizeof(option));
 #endif
    
-        gettimeofday(&tv, NULL);
-        incarnation = (((__u64)tv.tv_sec) * 1000000) + tv.tv_usec;
-
         /* say hello */
-        if (tcpnal_hello(fd, &peernid, SOCKNAL_CONN_ANY, incarnation))
+        if (tcpnal_hello(fd, &peernid, SOCKNAL_CONN_ANY, 0))
             exit(-1);
 
         conn = allocate_connection(m, ip, port, fd);
diff --git a/lustre/portals/unals/procapi.c b/lustre/portals/unals/procapi.c
index e40c4b9..00a7ae4 100644
--- a/lustre/portals/unals/procapi.c
+++ b/lustre/portals/unals/procapi.c
@@ -95,7 +95,7 @@ static int procbridge_forward(nal_t *n, int id, void *args, size_t args_len,
  * cleanup nal state, reclaim the lower side thread and
  *   its state using PTL_FINI codepoint
  */
-static void procbridge_shutdown(nal_t *n)
+static int procbridge_shutdown(nal_t *n, int ni)
 {
     bridge b=(bridge)n->nal_data;
     procbridge p=(procbridge)b->local;
@@ -114,6 +114,16 @@ static void procbridge_shutdown(nal_t *n)
     } while (1);
 
     free(p);
+    return(0);
+}
+
+
+/* Function: validate
+ *    useless stub
+ */
+static int procbridge_validate(nal_t *nal, void *base, size_t extent)
+{
+    return(0);
 }
 
 
@@ -177,20 +187,18 @@ static int procbridge_yield(nal_t *n, unsigned long *flags, int milliseconds)
     return (milliseconds);
 }
 
-/* forward decl */
-extern int procbridge_startup (nal_t *, ptl_pid_t,
-                               ptl_ni_limits_t *, ptl_ni_limits_t *);
 
 /* api_nal
  *  the interface vector to allow the generic code to access
  *  this nal. this is seperate from the library side nal_cb.
  *  TODO: should be dyanmically allocated
  */
-nal_t procapi_nal = {
+static nal_t api_nal = {
+    ni:       {0},
     nal_data: NULL,
-    startup:  procbridge_startup,
-    shutdown: procbridge_shutdown,
     forward:  procbridge_forward,
+    shutdown: procbridge_shutdown,
+    validate: procbridge_validate,
     yield:    procbridge_yield,
     lock:     procbridge_lock,
     unlock:   procbridge_unlock
@@ -198,7 +206,7 @@ nal_t procapi_nal = {
 
 ptl_nid_t tcpnal_mynid;
 
-/* Function: procbridge_startup
+/* Function: procbridge_interface
  *
  * Arguments:  pid: requested process id (port offset)
  *                  PTL_ID_ANY not supported.
@@ -206,34 +214,40 @@ ptl_nid_t tcpnal_mynid;
  *                      and effectively ignored
  *             actual:  limits actually allocated and returned
  *
- * Returns: portals rc
+ * Returns: a pointer to my statically allocated top side NAL
+ *          structure
  *
  * initializes the tcp nal. we define unix_failure as an
  * error wrapper to cut down clutter.
  */
-int procbridge_startup (nal_t *nal, ptl_pid_t requested_pid,
-                        ptl_ni_limits_t *requested_limits,
-                        ptl_ni_limits_t *actual_limits)
+nal_t *procbridge_interface(int num_interface,
+                            ptl_pt_index_t ptl_size,
+                            ptl_ac_index_t acl_size,
+                            ptl_pid_t requested_pid)
 {
     nal_init_args_t args;
-
     procbridge p;
     bridge b;
-    /* XXX nal_type is purely private to tcpnal here */
+    static int initialized=0;
+    ptl_ni_limits_t limits = {-1,-1,-1,-1,-1};
     int nal_type = PTL_IFACE_TCP;/* PTL_IFACE_DEFAULT FIXME hack */
 
-    LASSERT(nal == &procapi_nal);
+    if(initialized) return (&api_nal);
 
     init_unix_timer();
 
     b=(bridge)malloc(sizeof(struct bridge));
     p=(procbridge)malloc(sizeof(struct procbridge));
-    nal->nal_data=b;
+    api_nal.nal_data=b;
     b->local=p;
 
+    if (ptl_size)
+	    limits.max_ptable_index = ptl_size;
+    if (acl_size)
+	    limits.max_atable_index = acl_size;
+
     args.nia_requested_pid = requested_pid;
-    args.nia_requested_limits = requested_limits;
-    args.nia_actual_limits = actual_limits;
+    args.nia_limits = &limits;
     args.nia_nal_type = nal_type;
     args.nia_bridge = b;
 
@@ -245,19 +259,19 @@ int procbridge_startup (nal_t *nal, ptl_pid_t requested_pid,
     /* initialize notifier */
     if (socketpair(AF_UNIX, SOCK_STREAM, 0, p->notifier)) {
         perror("socketpair failed");
-        return PTL_FAIL;
+        return NULL;
     }
 
     if (!register_io_handler(p->notifier[1], READ_HANDLER,
                 procbridge_notifier_handler, p)) {
         perror("fail to register notifier handler");
-        return PTL_FAIL;
+        return NULL;
     }
 
     /* create nal thread */
     if (pthread_create(&p->t, NULL, nal_thread, &args)) {
         perror("nal_init: pthread_create");
-        return PTL_FAIL;
+        return(NULL);
     }
 
     do {
@@ -271,9 +285,10 @@ int procbridge_startup (nal_t *nal, ptl_pid_t requested_pid,
     } while (1);
 
     if (p->nal_flags & NAL_FLAG_STOPPED)
-        return PTL_FAIL;
+        return (NULL);
 
     b->nal_cb->ni.nid = tcpnal_mynid;
+    initialized = 1;
 
-    return PTL_OK;
+    return (&api_nal);
 }
diff --git a/lustre/portals/unals/procbridge.h b/lustre/portals/unals/procbridge.h
index 1c8e7dd..965f83d 100644
--- a/lustre/portals/unals/procbridge.h
+++ b/lustre/portals/unals/procbridge.h
@@ -35,8 +35,7 @@ typedef struct procbridge {
 
 typedef struct nal_init_args {
     ptl_pid_t        nia_requested_pid;
-    ptl_ni_limits_t *nia_requested_limits;
-    ptl_ni_limits_t *nia_actual_limits;
+    ptl_ni_limits_t *nia_limits;
     int              nia_nal_type;
     bridge           nia_bridge;
 } nal_init_args_t;
@@ -51,6 +50,10 @@ extern void *nal_thread(void *);
 #define MAX_PTLS        128
 
 extern void set_address(bridge t,ptl_pid_t pidrequest);
+extern nal_t *procbridge_interface(int num_interface,
+                                   ptl_pt_index_t ptl_size,
+                                   ptl_ac_index_t acl_size,
+                                   ptl_pid_t requested_pid);
 extern void procbridge_wakeup_nal(procbridge p);
 
 #endif
diff --git a/lustre/portals/unals/proclib.c b/lustre/portals/unals/proclib.c
index af0745b..1cfb233 100644
--- a/lustre/portals/unals/proclib.c
+++ b/lustre/portals/unals/proclib.c
@@ -157,6 +157,9 @@ static void check_stopping(void *z)
  *  We define a limit macro to place a ceiling on limits
  *   for syntactic convenience
  */
+#define LIMIT(x,y,max)\
+     if ((unsigned int)x > max) y = max;
+
 extern int tcpnal_init(bridge);
 
 nal_initialize nal_table[PTL_IFACE_MAX]={0,tcpnal_init,0};
@@ -167,8 +170,10 @@ void *nal_thread(void *z)
     bridge b = args->nia_bridge;
     procbridge p=b->local;
     int rc;
-    ptl_process_id_t process_id;
+    ptl_pid_t pid_request;
     int nal_type;
+    ptl_ni_limits_t desired;
+    ptl_ni_limits_t actual;
     
     b->nal_cb=(nal_cb_t *)malloc(sizeof(nal_cb_t));
     b->nal_cb->nal_data=b;
@@ -184,21 +189,28 @@ void *nal_thread(void *z)
     b->nal_cb->cb_callback=nal_callback;
     b->nal_cb->cb_dist=nal_dist;
 
+    pid_request = args->nia_requested_pid;
+    desired = *args->nia_limits;
     nal_type = args->nia_nal_type;
 
-    /* Wierd, but this sets b->nal_cb->ni.{nid,pid}, which lib_init() is
-     * about to do from the process_id passed to it...*/
-    set_address(b,args->nia_requested_pid);
+    actual = desired;
+    LIMIT(desired.max_match_entries,actual.max_match_entries,MAX_MES);
+    LIMIT(desired.max_mem_descriptors,actual.max_mem_descriptors,MAX_MDS);
+    LIMIT(desired.max_event_queues,actual.max_event_queues,MAX_EQS);
+    LIMIT(desired.max_atable_index,actual.max_atable_index,MAX_ACLS);
+    LIMIT(desired.max_ptable_index,actual.max_ptable_index,MAX_PTLS);
+
+    set_address(b,pid_request);
 
-    process_id.pid = b->nal_cb->ni.pid;
-    process_id.nid = b->nal_cb->ni.nid;
-    
     if (nal_table[nal_type]) rc=(*nal_table[nal_type])(b);
     /* initialize the generic 'library' level code */
 
-    rc = lib_init(b->nal_cb, process_id, 
-                  args->nia_requested_limits, 
-                  args->nia_actual_limits);
+    rc = lib_init(b->nal_cb, 
+                  b->nal_cb->ni.nid,
+                  b->nal_cb->ni.pid,
+		  10,
+		  actual.max_ptable_index,
+		  actual.max_atable_index);
 
     /*
      * Whatever the initialization returned is passed back to the
@@ -207,11 +219,11 @@ void *nal_thread(void *z)
      */
     /* this should perform error checking */
     pthread_mutex_lock(&p->mutex);
-    p->nal_flags |= (rc != PTL_OK) ? NAL_FLAG_STOPPED : NAL_FLAG_RUNNING;
+    p->nal_flags |= rc ? NAL_FLAG_STOPPED : NAL_FLAG_RUNNING;
     pthread_cond_broadcast(&p->cond);
     pthread_mutex_unlock(&p->mutex);
 
-    if (rc == PTL_OK) {
+    if (!rc) {
         /* the thunk function is called each time the timer loop
            performs an operation and returns to blocking mode. we
            overload this function to inform the api side that
@@ -221,3 +233,4 @@ void *nal_thread(void *z)
     }
     return(0);
 }
+#undef LIMIT
diff --git a/lustre/portals/utils/Makefile.am b/lustre/portals/utils/Makefile.am
index a14df1c..e871d9a 100644
--- a/lustre/portals/utils/Makefile.am
+++ b/lustre/portals/utils/Makefile.am
@@ -3,40 +3,36 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
-## $(srcdir)/../ for <portals/*.h>, ../../ for generated <config.h>
-#COMPILE = $(CC) -Wall -g -I$(srcdir)/../include -I../../include
-#LINK = $(CC) -o $@
+# ../ for <portals/*.h>, ../../ for <config.h>
+COMPILE = $(CC) -Wall -g -I$(srcdir)/../include -I$(srcdir)/../../include
+LINK = $(CC) -o $@
 
 if LIBLUSTRE
+
 noinst_LIBRARIES = libuptlctl.a
-libuptlctl_a_SOURCES = portals.c debug.c l_ioctl.c
-libuptlctl_a_CPPFLAGS = $(LLCPPFLAGS)
-libuptlctl_a_CFLAGS = $(LLCFLAGS)
-endif
+libuptlctl_a_SOURCES = portals.c debug.c l_ioctl.c parser.c parser.h
+libuptlctl_a_CFLAGS = -fPIC
 
-sbin_PROGRAMS = debugctl
+else
 
+sbin_PROGRAMS = acceptor ptlctl debugctl routerstat wirecheck gmnalnid
 lib_LIBRARIES = libptlctl.a
 
-libptlctl_a_SOURCES = portals.c debug.c l_ioctl.c parser.c parser.h
-
-if !CRAY_PORTALS
-sbin_PROGRAMS += acceptor ptlctl routerstat wirecheck gmnalnid
-
-acceptor_SOURCES = acceptor.c
+acceptor_SOURCES = acceptor.c # -lefence
 
 wirecheck_SOURCES = wirecheck.c
 
+libptlctl_a_SOURCES = portals.c debug.c l_ioctl.c parser.c parser.h
+
 gmnalnid_SOURCES = gmnalnid.c
 
 ptlctl_SOURCES = ptlctl.c
 ptlctl_LDADD =  -L. -lptlctl $(LIBREADLINE) $(LIBEFENCE)
 ptlctl_DEPENDENCIES = libptlctl.a
 
-routerstat_SOURCES = routerstat.c
-endif
-
 debugctl_SOURCES = debugctl.c
 debugctl_LDADD = -L. -lptlctl $(LIBREADLINE) $(LIBEFENCE)
 debugctl_DEPENDENCIES = libptlctl.a
 
+routerstat_SOURCES = routerstat.c
+endif
diff --git a/lustre/portals/utils/acceptor.c b/lustre/portals/utils/acceptor.c
index f6367d4..29b8d1e 100644
--- a/lustre/portals/utils/acceptor.c
+++ b/lustre/portals/utils/acceptor.c
@@ -11,7 +11,9 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
+#include <asm/byteorder.h>
 #include <syslog.h>
+
 #include <errno.h>
 
 #include <portals/api-support.h>
diff --git a/lustre/portals/utils/debug.c b/lustre/portals/utils/debug.c
index b6bfec0..00a6102 100644
--- a/lustre/portals/utils/debug.c
+++ b/lustre/portals/utils/debug.c
@@ -65,9 +65,9 @@ static int debug_mask = ~0;
 
 static const char *portal_debug_subsystems[] =
         {"undefined", "mdc", "mds", "osc", "ost", "class", "log", "llite",
-         "rpc", "mgmt", "portals", "libcfs", "socknal", "qswnal", "pinger",
-         "filter", "ptlbd", "echo", "ldlm", "lov", "gmnal", "router", "cobd",
-         "ibnal", NULL};
+         "rpc", "mgmt", "portals", "socknal", "qswnal", "pinger", "filter",
+         "ptlbd", "echo", "ldlm", "lov", "gmnal", "router", "cobd", "ibnal",
+         "lmv", NULL};
 static const char *portal_debug_masks[] =
         {"trace", "inode", "super", "ext2", "malloc", "cache", "info", "ioctl",
          "blocks", "net", "warning", "buffs", "other", "dentry", "portals",
@@ -183,6 +183,9 @@ static int applymask(char* procpath, int value)
         return 0;
 }
 
+extern char *dump_filename;
+extern int dump(int dev_id, int opc, void *buf);
+
 static void applymask_all(unsigned int subs_mask, unsigned int debug_mask)
 {
         if (!dump_filename) {
@@ -538,7 +541,6 @@ static struct mod_paths {
         {"mds", "lustre/mds"},
         {"mdc", "lustre/mdc"},
         {"llite", "lustre/llite"},
-        {"smfs", "lustre/smfs"},
         {"obdecho", "lustre/obdecho"},
         {"ldlm", "lustre/ldlm"},
         {"obdfilter", "lustre/obdfilter"},
@@ -547,13 +549,13 @@ static struct mod_paths {
         {"fsfilt_ext3", "lustre/lvfs"},
         {"fsfilt_extN", "lustre/lvfs"},
         {"fsfilt_reiserfs", "lustre/lvfs"},
-        {"fsfilt_smfs", "lustre/lvfs"},
         {"mds_ext2", "lustre/mds"},
         {"mds_ext3", "lustre/mds"},
         {"mds_extN", "lustre/mds"},
         {"ptlbd", "lustre/ptlbd"},
         {"mgmt_svc", "lustre/mgmt"},
         {"mgmt_cli", "lustre/mgmt"},
+        {"lmv", "lustre/lmv"},
         {NULL, NULL}
 };
 
diff --git a/lustre/portals/utils/gmnalnid.c b/lustre/portals/utils/gmnalnid.c
index e45fae4..ff6631c 100644
--- a/lustre/portals/utils/gmnalnid.c
+++ b/lustre/portals/utils/gmnalnid.c
@@ -29,7 +29,9 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
+#include <asm/byteorder.h>
 #include <syslog.h>
+
 #include <errno.h>
 
 #include <portals/api-support.h>
diff --git a/lustre/portals/utils/l_ioctl.c b/lustre/portals/utils/l_ioctl.c
index 0671c24..1adcc8e 100644
--- a/lustre/portals/utils/l_ioctl.c
+++ b/lustre/portals/utils/l_ioctl.c
@@ -56,7 +56,7 @@ static struct ioc_dev ioc_dev_list[10];
 struct dump_hdr {
 	int magic;
 	int dev_id;
-        unsigned int opc;
+	int opc;
 };
 
 char *dump_filename;
@@ -101,7 +101,7 @@ open_ioc_dev(int dev_id)
 
 
 static int 
-do_ioctl(int dev_id, unsigned int opc, void *buf)
+do_ioctl(int dev_id, int opc, void *buf)
 {
 	int fd, rc;
 	
@@ -131,7 +131,7 @@ get_dump_file()
  * used, but for now it will assumed whatever app reads the file will
  * know what to do. */
 int 
-dump(int dev_id, unsigned int opc, void *buf)
+dump(int dev_id, int opc, void *buf)
 {
 	FILE *fp;
 	struct dump_hdr dump_hdr;
@@ -212,7 +212,7 @@ set_ioctl_dump(char * file)
 }
 
 int
-l_ioctl(int dev_id, unsigned int opc, void *buf)
+l_ioctl(int dev_id, int opc, void *buf)
 {
         return current_ioc_handler(dev_id, opc, buf);
 }
@@ -226,7 +226,7 @@ l_ioctl(int dev_id, unsigned int opc, void *buf)
  * each device used in the dump.
  */
 int 
-parse_dump(char * dump_file, ioc_handler_t ioc_func)
+parse_dump(char * dump_file, int (*ioc_func)(int dev_id, int opc, void *))
 {
 	int line =0;
 	struct stat st;
diff --git a/lustre/portals/utils/parser.c b/lustre/portals/utils/parser.c
index b91295b..db5292d 100644
--- a/lustre/portals/utils/parser.c
+++ b/lustre/portals/utils/parser.c
@@ -28,16 +28,12 @@
 #include <sys/param.h>
 #include <assert.h>
 
+#include <config.h>
 #ifdef HAVE_LIBREADLINE
 #define	READLINE_LIBRARY
 #include <readline/readline.h>
-
-/* completion_matches() is #if 0-ed out in modern glibc */
-#ifndef completion_matches
-#  define completion_matches rl_completion_matches
-#endif
 #endif
-
+//extern char **completion_matches __P((char *, rl_compentry_func_t *));
 extern void using_history(void);
 extern void stifle_history(int);
 extern void add_history(char *);
@@ -225,15 +221,14 @@ static char **command_completion(char * text, int start, int end)
     char	* pos;
 
     match_tbl = top_level;
-    
     for (table = find_cmd(rl_line_buffer, match_tbl, &pos);
-	 table; table = find_cmd(pos, match_tbl, &pos)) 
-    {
+	 table;
+	 table = find_cmd(pos, match_tbl, &pos)) {
 
 	if (*(pos - 1) == ' ') match_tbl = table->pc_sub_cmd;
     }
 
-    return completion_matches(text, command_generator);
+    return(completion_matches(text, command_generator));
 }
 #endif
 
@@ -642,6 +637,68 @@ int Parser_arg2int(const char *inp, long *result, int base)
                 return 1;
 }
 
+/* Convert human readable size string to and int; "1k" -> 1000 */
+int Parser_size (int *sizep, char *str) {
+        int size;
+        char mod[32];
+
+        switch (sscanf (str, "%d%1[gGmMkK]", &size, mod)) {
+        default:
+                return (-1);
+
+        case 1:
+                *sizep = size;
+                return (0);
+
+        case 2:
+                switch (*mod) {
+                case 'g':
+                case 'G':
+                        *sizep = size << 30;
+                        return (0);
+
+                case 'm':
+                case 'M':
+                        *sizep = size << 20;
+                        return (0);
+
+                case 'k':
+                case 'K':
+                        *sizep = size << 10;
+                        return (0);
+
+                default:
+                        *sizep = size;
+                        return (0);
+                }
+        }
+}
+
+/* Convert a string boolean to an int; "enable" -> 1 */
+int Parser_bool (int *b, char *str) {
+        if (!strcasecmp (str, "no") ||
+            !strcasecmp (str, "n") ||
+            !strcasecmp (str, "off") ||
+            !strcasecmp (str, "down") ||
+            !strcasecmp (str, "disable"))
+        {
+                *b = 0;
+                return (0);
+        }
+        
+        if (!strcasecmp (str, "yes") ||
+            !strcasecmp (str, "y") ||
+            !strcasecmp (str, "on") ||
+            !strcasecmp (str, "up") ||
+            !strcasecmp (str, "enable"))
+        {
+                *b = 1;
+                return (0);
+        }
+        
+        return (-1);
+}
+
 int Parser_quit(int argc, char **argv)
 {
         argc = argc;
diff --git a/lustre/portals/utils/parser.h b/lustre/portals/utils/parser.h
index 9e7e95a..44e8f2a 100644
--- a/lustre/portals/utils/parser.h
+++ b/lustre/portals/utils/parser.h
@@ -64,4 +64,10 @@ char *Parser_strarg(char *inp, const char *prompt, const char *deft,
 /* Extracts an integer from a string  with a base */
 int Parser_arg2int(const char *inp, long *result, int base);
 
+/* Convert human readable size string to and int; "1k" -> 1000 */
+int Parser_size(int *sizep, char *str);
+
+/* Convert a string boolean to an int; "enable" -> 1 */
+int Parser_bool(int *b, char *str);
+
 #endif
diff --git a/lustre/portals/utils/portals.c b/lustre/portals/utils/portals.c
index f8107d8..fb031ae 100644
--- a/lustre/portals/utils/portals.c
+++ b/lustre/portals/utils/portals.c
@@ -34,7 +34,7 @@
 #include <unistd.h>
 #include <time.h>
 #include <stdarg.h>
-#include <endian.h>
+#include <asm/byteorder.h>
 
 #ifdef __CYGWIN__
 
@@ -61,7 +61,7 @@
 unsigned int portal_debug;
 unsigned int portal_printk;
 unsigned int portal_stack;
-unsigned int portal_cerror = 1;
+unsigned int portal_cerror;
 
 static unsigned int g_nal = 0;
 
@@ -81,73 +81,12 @@ static name2num_t nalnames[] = {
         {"elan",	QSWNAL},
         {"gm",	        GMNAL},
         {"ib",	        IBNAL},
+        {"scimac",      SCIMACNAL},
         {NULL,		-1}
 };
 
 static cfg_record_cb_t g_record_cb;
 
-/* Convert a string boolean to an int; "enable" -> 1 */
-int ptl_parse_bool (int *b, char *str) {
-        if (!strcasecmp (str, "no") ||
-            !strcasecmp (str, "n") ||
-            !strcasecmp (str, "off") ||
-            !strcasecmp (str, "down") ||
-            !strcasecmp (str, "disable"))
-        {
-                *b = 0;
-                return (0);
-        }
-        
-        if (!strcasecmp (str, "yes") ||
-            !strcasecmp (str, "y") ||
-            !strcasecmp (str, "on") ||
-            !strcasecmp (str, "up") ||
-            !strcasecmp (str, "enable"))
-        {
-                *b = 1;
-                return (0);
-        }
-        
-        return (-1);
-}
-
-/* Convert human readable size string to and int; "1k" -> 1000 */
-int ptl_parse_size (int *sizep, char *str) {
-        int size;
-        char mod[32];
-
-        switch (sscanf (str, "%d%1[gGmMkK]", &size, mod)) {
-        default:
-                return (-1);
-
-        case 1:
-                *sizep = size;
-                return (0);
-
-        case 2:
-                switch (*mod) {
-                case 'g':
-                case 'G':
-                        *sizep = size << 30;
-                        return (0);
-
-                case 'm':
-                case 'M':
-                        *sizep = size << 20;
-                        return (0);
-
-                case 'k':
-                case 'K':
-                        *sizep = size << 10;
-                        return (0);
-
-                default:
-                        *sizep = size;
-                        return (0);
-                }
-        }
-}
-
 int 
 ptl_set_cfg_record_cb(cfg_record_cb_t cb)
 {
@@ -364,40 +303,16 @@ ptl_parse_nid (ptl_nid_t *nidp, char *str)
         return (-1);
 }
 
-__u64 ptl_nid2u64(ptl_nid_t nid)
-{
-        switch (sizeof (nid)) {
-        case 8:
-                return (nid);
-        case 4:
-                return ((__u32)nid);
-        default:
-                fprintf(stderr, "Unexpected sizeof(ptl_nid_t) == %u\n", sizeof(nid));
-                abort();
-                /* notreached */
-                return (-1);
-        }
-}
-
 char *
 ptl_nid2str (char *buffer, ptl_nid_t nid)
 {
-        __u64           nid64 = ptl_nid2u64(nid);
-        struct hostent *he;
-
-        if ((nid64 & ~((__u64)((__u32)-1))) != 0) {
-                /* top bits set */
-                he = NULL;
-        } else {
-                __u32 addr = htonl((__u32)nid); /* back to NETWORK byte order */
-
-                he = gethostbyaddr ((const char *)&addr, sizeof (addr), AF_INET);
-        }
+        __u32           addr = htonl((__u32)nid); /* back to NETWORK byte order */
+        struct hostent *he = gethostbyaddr ((const char *)&addr, sizeof (addr), AF_INET);
 
         if (he != NULL)
                 strcpy (buffer, he->h_name);
         else
-                sprintf (buffer, LPX64, nid64);
+                sprintf (buffer, LPX64, nid);
         
         return (buffer);
 }
@@ -1093,7 +1008,7 @@ int jt_ptl_mynid(int argc, char **argv)
         char *nidstr;
         struct portals_cfg pcfg;
         ptl_nid_t mynid;
-
+        
         if (argc > 2) {
                 fprintf(stderr, "usage: %s [NID]\n", argv[0]);
                 fprintf(stderr, "NID defaults to the primary IP address of the machine.\n");
@@ -1127,8 +1042,7 @@ int jt_ptl_mynid(int argc, char **argv)
                 fprintf(stderr, "setting my NID failed: %s\n",
                        strerror(errno));
         else
-                printf("registered my nid "LPX64" (%s)\n", 
-                       ptl_nid2u64(mynid), hostname);
+                printf("registered my nid "LPX64" (%s)\n", mynid, hostname);
         return 0;
 }
 
@@ -1186,7 +1100,7 @@ jt_ptl_rxmem (int argc, char **argv)
         
         if (argc > 1)
         {
-                if (ptl_parse_size (&size, argv[1]) != 0 || size < 0)
+                if (Parser_size (&size, argv[1]) != 0 || size < 0)
                 {
                         fprintf (stderr, "Can't parse size %s\n", argv[1]);
                         return (0);
@@ -1205,7 +1119,7 @@ jt_ptl_txmem (int argc, char **argv)
         
         if (argc > 1)
         {
-                if (ptl_parse_size (&size, argv[1]) != 0 || size < 0)
+                if (Parser_size (&size, argv[1]) != 0 || size < 0)
                 {
                         fprintf (stderr, "Can't parse size %s\n", argv[1]);
                         return (0);
@@ -1223,7 +1137,7 @@ jt_ptl_nagle (int argc, char **argv)
 
         if (argc > 1)
         {
-                if (ptl_parse_bool (&enable, argv[1]) != 0)
+                if (Parser_bool (&enable, argv[1]) != 0)
                 {
                         fprintf (stderr, "Can't parse boolean %s\n", argv[1]);
                         return (-1);
@@ -1346,8 +1260,7 @@ jt_ptl_del_route (int argc, char **argv)
         rc = pcfg_ioctl(&pcfg);
         if (rc != 0) 
         {
-                fprintf (stderr, "NAL_CMD_DEL_ROUTE ("LPX64") failed: %s\n", 
-                         ptl_nid2u64(nid), strerror (errno));
+                fprintf (stderr, "NAL_CMD_DEL_ROUTE ("LPX64") failed: %s\n", nid, strerror (errno));
                 return (-1);
         }
         
@@ -1377,7 +1290,7 @@ jt_ptl_notify_router (int argc, char **argv)
                 return (-1);
         }
 
-        if (ptl_parse_bool (&enable, argv[2]) != 0) {
+        if (Parser_bool (&enable, argv[2]) != 0) {
                 fprintf (stderr, "Can't parse boolean %s\n", argv[2]);
                 return (-1);
         }
@@ -1409,7 +1322,7 @@ jt_ptl_notify_router (int argc, char **argv)
         if (rc != 0) 
         {
                 fprintf (stderr, "NAL_CMD_NOTIFY_ROUTER ("LPX64") failed: %s\n",
-                         ptl_nid2u64(nid), strerror (errno));
+                         nid, strerror (errno));
                 return (-1);
         }
         
@@ -1565,11 +1478,14 @@ lwt_put_string(char *ustr)
 static int
 lwt_print(FILE *f, cycles_t t0, cycles_t tlast, double mhz, int cpu, lwt_event_t *e)
 {
+        char            whenstr[32];
         char           *where = lwt_get_string(e->lwte_where);
 
         if (where == NULL)
                 return (-1);
 
+        sprintf(whenstr, LPD64, e->lwte_when - t0);
+
         fprintf(f, "%#010lx %#010lx %#010lx %#010lx: %#010lx %1d %10.6f %10.2f %s\n",
                 e->lwte_p1, e->lwte_p2, e->lwte_p3, e->lwte_p4,
                 (long)e->lwte_task, cpu, (e->lwte_when - t0) / (mhz * 1000000.0),
@@ -1621,7 +1537,6 @@ jt_ptl_lwt(int argc, char **argv)
         cycles_t        tnow;
         struct timeval  tvnow;
         int             printed_date = 0;
-        int             nlines = 0;
         FILE           *f = stdout;
 
         if (argc < 2 ||
@@ -1771,12 +1686,6 @@ jt_ptl_lwt(int argc, char **argv)
                         rc = lwt_print(f, t0, tlast, mhz, cpu, next_event[cpu]);
                         if (rc != 0)
                                 break;
-
-                        if (++nlines % 10000 == 0 && f != stdout) {
-                                /* show some activity... */
-                                printf(".");
-                                fflush (stdout);
-                        }
                 }
 
                 tlast = next_event[cpu]->lwte_when;
@@ -1790,10 +1699,8 @@ jt_ptl_lwt(int argc, char **argv)
                         next_event[cpu] = NULL;
         }
 
-        if (f != stdout) {
-                printf("\n");
+        if (f != stdout)
                 fclose(f);
-        }
 
         free(events);
         return (0);
diff --git a/lustre/portals/utils/wirecheck.c b/lustre/portals/utils/wirecheck.c
index 6316290..a73a5217 100644
--- a/lustre/portals/utils/wirecheck.c
+++ b/lustre/portals/utils/wirecheck.c
@@ -34,7 +34,7 @@ do {                                                    \
 
 #define CHECK_MEMBER_OFFSET(s,m)                \
 do {                                            \
-        CHECK_VALUE((int)offsetof(s, m));       \
+        CHECK_VALUE(offsetof(s, m));            \
 } while (0)
 
 #define CHECK_MEMBER_SIZEOF(s,m)                \
diff --git a/lustre/ptlbd/.cvsignore b/lustre/ptlbd/.cvsignore
index 8d9434e..e995588 100644
--- a/lustre/ptlbd/.cvsignore
+++ b/lustre/ptlbd/.cvsignore
@@ -1,9 +1,3 @@
 .deps
 Makefile
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
+Makefile.in
diff --git a/lustre/ptlbd/autoMakefile.am b/lustre/ptlbd/Makefile.am
similarity index 50%
rename from lustre/ptlbd/autoMakefile.am
rename to lustre/ptlbd/Makefile.am
index 0446dc8..bfaeb25 100644
--- a/lustre/ptlbd/autoMakefile.am
+++ b/lustre/ptlbd/Makefile.am
@@ -3,9 +3,12 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
-if !LINUX25
-modulefs_DATA = ptlbd$(KMODEXT)
-endif
+DEFS=
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-DIST_SOURCES = $(ptlbd-objs:%.o=%.c)
+MODULE = ptlbd
+modulefs_DATA = ptlbd.o
+EXTRA_PROGRAMS = ptlbd
+
+ptlbd_SOURCES = blk.c client.c main.c rpc.c server.c
+
+include $(top_srcdir)/Rules
diff --git a/lustre/ptlbd/Makefile.in b/lustre/ptlbd/Makefile.in
deleted file mode 100644
index 35f987b7..0000000
--- a/lustre/ptlbd/Makefile.in
+++ /dev/null
@@ -1,4 +0,0 @@
-MODULES := ptlbd
-ptlbd-objs  := blk.o client.o main.o rpc.o server.o
-
-@INCLUDE_RULES@
diff --git a/lustre/ptlbd/blk.c b/lustre/ptlbd/blk.c
index 77c0dd8..ccef070 100644
--- a/lustre/ptlbd/blk.c
+++ b/lustre/ptlbd/blk.c
@@ -255,10 +255,10 @@ static void ptlbd_request(request_queue_t *q)
 }
 
 static struct block_device_operations ptlbd_ops = {
-        .owner   = THIS_MODULE,
-        .open    = ptlbd_open,
-        .ioctl   = ptlbd_ioctl,
+        .owner = THIS_MODULE,
+        .open = ptlbd_open,
         .release = ptlbd_release,
+        .ioctl = ptlbd_ioctl,
 };
 
 int ptlbd_blk_init(void)
diff --git a/lustre/ptlbd/client.c b/lustre/ptlbd/client.c
index 94fc1f2..f21e7c8 100644
--- a/lustre/ptlbd/client.c
+++ b/lustre/ptlbd/client.c
@@ -35,7 +35,6 @@
 static int ptlbd_cl_setup(struct obd_device *obd, obd_count len, void *buf)
 {
         struct ptlbd_obd *ptlbd = &obd->u.ptlbd;
-        struct lprocfs_static_vars lvars;
         struct obd_import *imp;
         struct lustre_cfg* lcfg = buf;
         ENTRY;
@@ -67,17 +66,14 @@ static int ptlbd_cl_setup(struct obd_device *obd, obd_count len, void *buf)
         }
         imp->imp_state = LUSTRE_IMP_FULL;
 
-        ptlrpc_init_client(PTLBD_REQUEST_PORTAL, PTLBD_REPLY_PORTAL,
+        ptlrpc_init_client(PTLBD_REQUEST_PORTAL, PTLBD_REPLY_PORTAL, 
                         "ptlbd", &ptlbd->bd_client);
         imp->imp_client = &ptlbd->bd_client;
         imp->imp_obd = obd;
-        memcpy(imp->imp_target_uuid.uuid, lcfg->lcfg_inlbuf1,
+        memcpy(imp->imp_target_uuid.uuid, lcfg->lcfg_inlbuf1, 
                lcfg->lcfg_inllen1);
         ptlbd_blk_register(ptlbd);
 
-        lprocfs_init_vars(ptlbd_cl, &lvars);
-        lprocfs_obd_setup(obd, lvars.obd_vars);
-
         RETURN(0);
 }
 
@@ -93,8 +89,6 @@ static int ptlbd_cl_cleanup(struct obd_device *obd, int flags)
         if (!imp->imp_connection)
                 RETURN(-ENOENT);
 
-        lprocfs_obd_cleanup(obd);
-
         ptlrpc_cleanup_client(imp);
         ptlrpc_put_connection(imp->imp_connection);
 
@@ -116,7 +110,7 @@ int ptlbd_cl_connect(struct lustre_handle *conn, struct obd_device *obd,
         int     rc, size[] = {sizeof(imp->imp_target_uuid),
                               sizeof(obd->obd_uuid),
                               sizeof(*conn)};
-        char *tmp[] = {imp->imp_target_uuid.uuid,
+        char *tmp[] = {imp->imp_target_uuid.uuid, 
                        obd->obd_uuid.uuid,
                        (char*)conn};
         ENTRY;
@@ -146,7 +140,7 @@ int ptlbd_cl_connect(struct lustre_handle *conn, struct obd_device *obd,
 
         imp->imp_state = LUSTRE_IMP_FULL;
         imp->imp_remote_handle = request->rq_repmsg->handle;
-
+        
 out_req:
         ptlrpc_req_finished(request);
 out_disco:
@@ -191,11 +185,11 @@ out_req:
 
 
 static struct obd_ops ptlbd_cl_obd_ops = {
-        .o_owner        = THIS_MODULE,
-        .o_setup        = ptlbd_cl_setup,
-        .o_cleanup      = ptlbd_cl_cleanup,
-        .o_connect      = ptlbd_cl_connect,
-        .o_disconnect   = ptlbd_cl_disconnect,
+        o_owner:        THIS_MODULE,
+        o_setup:        ptlbd_cl_setup,
+        o_cleanup:      ptlbd_cl_cleanup,
+        o_connect:      ptlbd_cl_connect,
+        o_disconnect:   ptlbd_cl_disconnect,
 };
 
 static struct lprocfs_vars lprocfs_obd_vars[] = { {0} };
@@ -207,7 +201,7 @@ int ptlbd_cl_init(void)
         struct lprocfs_static_vars lvars;
 
         lprocfs_init_vars(ptlbd_cl,&lvars);
-        return class_register_type(&ptlbd_cl_obd_ops, lvars.module_vars,
+        return class_register_type(&ptlbd_cl_obd_ops, NULL, lvars.module_vars,
                                    OBD_PTLBD_CL_DEVICENAME);
 }
 
diff --git a/lustre/ptlbd/server.c b/lustre/ptlbd/server.c
index f25b811..dbd75d9 100644
--- a/lustre/ptlbd/server.c
+++ b/lustre/ptlbd/server.c
@@ -36,10 +36,9 @@
 
 static int ptlbd_sv_already_setup = 1;
 
-static int ptlbd_sv_setup(struct obd_device *obd, obd_count len, void *buf)
+static int ptlbd_sv_setup(struct obd_device *obddev, obd_count len, void *buf)
 {
-        struct ptlbd_obd *ptlbd = &obd->u.ptlbd;
-        struct lprocfs_static_vars lvars;
+        struct ptlbd_obd *ptlbd = &obddev->u.ptlbd;
         int rc;
         ENTRY;
 
@@ -49,20 +48,17 @@ static int ptlbd_sv_setup(struct obd_device *obd, obd_count len, void *buf)
         if ( IS_ERR(ptlbd->filp) )
                 RETURN(PTR_ERR(ptlbd->filp));
 
-        lprocfs_init_vars(ptlbd_sv, &lvars);
-        lprocfs_obd_setup(obd, lvars.obd_vars);
-
         ptlbd->ptlbd_service =
                 ptlrpc_init_svc(PTLBD_NBUFS, PTLBD_BUFSIZE, PTLBD_MAXREQSIZE,
                                 PTLBD_REQUEST_PORTAL, PTLBD_REPLY_PORTAL,
                                 ptlbd_handle, "ptlbd_sv",
-                                obd->obd_proc_entry);
+                                obddev->obd_proc_entry);
 
-        if (ptlbd->ptlbd_service == NULL)
+        if (ptlbd->ptlbd_service == NULL) 
                 GOTO(out_filp, rc = -ENOMEM);
 
-        rc = ptlrpc_start_n_threads(obd, ptlbd->ptlbd_service, 1, "ptldb");
-        if (rc != 0)
+        rc = ptlrpc_start_n_threads(obddev, ptlbd->ptlbd_service, 1, "ptldb");
+        if (rc != 0) 
                 GOTO(out_thread, rc);
 
         ptlbd_sv_already_setup = 1;
@@ -73,14 +69,13 @@ out_thread:
         ptlrpc_unregister_service(ptlbd->ptlbd_service);
 out_filp:
         filp_close(ptlbd->filp, NULL);
-        lprocfs_obd_cleanup(obd);
 
         RETURN(rc);
 }
 
-static int ptlbd_sv_cleanup(struct obd_device *obd, int flags)
+static int ptlbd_sv_cleanup(struct obd_device *obddev, int flags)
 {
-        struct ptlbd_obd *ptlbd = &obd->u.ptlbd;
+        struct ptlbd_obd *ptlbd = &obddev->u.ptlbd;
         ENTRY;
 
         /* XXX check for state */
@@ -91,18 +86,15 @@ static int ptlbd_sv_cleanup(struct obd_device *obd, int flags)
                 filp_close(ptlbd->filp, NULL);
 
         ptlbd_sv_already_setup = 0;
-
-        lprocfs_obd_cleanup(obd);
-
         RETURN(0);
 }
 
 static struct obd_ops ptlbd_sv_obd_ops = {
-        .o_owner        = THIS_MODULE,
-        .o_setup        = ptlbd_sv_setup,
-        .o_cleanup      = ptlbd_sv_cleanup,
-        .o_connect      = class_connect,
-        .o_disconnect   = class_disconnect,
+        o_owner:        THIS_MODULE,
+        o_setup:        ptlbd_sv_setup,
+        o_cleanup:      ptlbd_sv_cleanup,
+        o_connect:      class_connect,
+        o_disconnect:   class_disconnect,
 };
 
 static struct lprocfs_vars lprocfs_obd_vars[] = { {0} };
@@ -114,7 +106,7 @@ int ptlbd_sv_init(void)
         struct lprocfs_static_vars lvars;
 
         lprocfs_init_vars(ptlbd_sv,&lvars);
-        return class_register_type(&ptlbd_sv_obd_ops, lvars.module_vars,
+        return class_register_type(&ptlbd_sv_obd_ops, NULL, lvars.module_vars,
                                    OBD_PTLBD_SV_DEVICENAME);
 }
 
diff --git a/lustre/ptlrpc/.cvsignore b/lustre/ptlrpc/.cvsignore
index 7496232..cf51f30 100644
--- a/lustre/ptlrpc/.cvsignore
+++ b/lustre/ptlrpc/.cvsignore
@@ -3,14 +3,8 @@ config.log
 config.status
 configure
 Makefile
+Makefile.in
 .deps
 tags
 TAGS
 .*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
-.depend
diff --git a/lustre/ptlrpc/autoMakefile.am b/lustre/ptlrpc/Makefile.am
similarity index 72%
rename from lustre/ptlrpc/autoMakefile.am
rename to lustre/ptlrpc/Makefile.am
index 96dcfe3..1c2da01 100644
--- a/lustre/ptlrpc/autoMakefile.am
+++ b/lustre/ptlrpc/Makefile.am
@@ -3,6 +3,8 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
+DEFS=
+
 LDLM_COMM_SOURCES= $(top_srcdir)/ldlm/l_lock.c $(top_srcdir)/ldlm/ldlm_lock.c \
     $(top_srcdir)/ldlm/ldlm_resource.c $(top_srcdir)/ldlm/ldlm_lib.c          \
     $(top_srcdir)/ldlm/ldlm_plain.c $(top_srcdir)/ldlm/ldlm_extent.c          \
@@ -17,16 +19,23 @@ COMMON_SOURCES =  client.c recover.c connection.c niobuf.c pack_generic.c   \
 if LIBLUSTRE
 
 noinst_LIBRARIES = libptlrpc.a
+libptlrpc_a_CFLAGS = -fPIC
 libptlrpc_a_SOURCES = $(COMMON_SOURCES)
-libptlrpc_a_CPPFLAGS = $(LLCPPFLGS)
-libptlrpc_a_CFLAGS = $(LLCFLAGS)
+
+else
+
+MODULE = ptlrpc
+modulefs_DATA = ptlrpc.o
+EXTRA_PROGRAMS = ptlrpc
+
+ptlrpc_SOURCES = $(top_srcdir)/ldlm/ldlm_flock.c $(COMMON_SOURCES) \
+    lproc_ptlrpc.c
 
 endif
 
-if MODULES
-modulefs_DATA = ptlrpc$(KMODEXT)
-endif # MODULES
+ptlrpc_DEPENDENCIES=symlinks
 
-MOSTLYCLEANFILES = *.o *.ko *.mod.c ldlm_*.c l_lock.c
-DIST_SOURCES = $(filter-out @top_srcdir@/ldlm/%,$(ptlrpc-objs:%.o=%.c)) ptlrpc_internal.h
+symlinks:
+	ln -sf $(subst /ldlm/,/ptlrpc/,$(addsuffix .o,$(basename $(LDLMSOURCES)))) ../ldlm
 
+include $(top_srcdir)/Rules
diff --git a/lustre/ptlrpc/Makefile.in b/lustre/ptlrpc/Makefile.in
deleted file mode 100644
index 6b27d3e7..0000000
--- a/lustre/ptlrpc/Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
-MODULES := ptlrpc
-ifeq ($(PATCHLEVEL),6)
-LDLM := @top_srcdir@/ldlm/
-else
-LDLM :=
-endif
-ptlrpc-objs := $(LDLM)l_lock.o $(LDLM)ldlm_lock.o 
-ptlrpc-objs += $(LDLM)ldlm_resource.o $(LDLM)ldlm_lib.o
-ptlrpc-objs += $(LDLM)ldlm_plain.o $(LDLM)ldlm_extent.o
-ptlrpc-objs += $(LDLM)ldlm_request.o $(LDLM)ldlm_lockd.o
-ptlrpc-objs += $(LDLM)ldlm_flock.o $(LDLM)ldlm_inodebits.o
-ptlrpc-objs += client.o recover.o connection.o niobuf.o pack_generic.o
-ptlrpc-objs += events.o ptlrpc_module.o service.o pinger.o recov_thread.o
-ptlrpc-objs += llog_net.o llog_client.o llog_server.o import.o ptlrpcd.o
-ptlrpc-objs += pers.o lproc_ptlrpc.o
-
-default: all
-
-ldlm_%.c: @LUSTRE@/ldlm/ldlm_%.c
-	ln -sf $< $@
-
-l_lock.c: @LUSTRE@/ldlm/l_lock.c
-	ln -sf $< $@
-
-EXTRA_PRE_CFLAGS := -I@LUSTRE@/ldlm
-
-@INCLUDE_RULES@
diff --git a/lustre/ptlrpc/Makefile.mk b/lustre/ptlrpc/Makefile.mk
index 77aa1cb..4154582 100644
--- a/lustre/ptlrpc/Makefile.mk
+++ b/lustre/ptlrpc/Makefile.mk
@@ -13,6 +13,5 @@ ptlrpc-objs := recover.o connection.o ptlrpc_module.o events.o service.o \
 		llog_server.o ptlrpcd.o ../ldlm/l_lock.o ../ldlm/ldlm_lock.o \
 		../ldlm/ldlm_resource.o ../ldlm/ldlm_extent.o \
 		../ldlm/ldlm_request.o ../ldlm/ldlm_lockd.o \
-		../ldlm/ldlm_lib.o ../ldlm/ldlm_flock.o ../ldlm/ldlm_plain.o \
-		../ldlm/ldlm_inodebits.o
+		../ldlm/ldlm_lib.o ../ldlm/ldlm_flock.o ../ldlm/ldlm_plain.o
 
diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c
index e78176b..0774fa2 100644
--- a/lustre/ptlrpc/client.c
+++ b/lustre/ptlrpc/client.c
@@ -160,7 +160,7 @@ void ptlrpc_prep_bulk_page(struct ptlrpc_bulk_desc *desc,
 
         desc->bd_nob += len;
 
-        ptlrpc_add_bulk_page(desc, page, pageoffset, len);
+        pers_bulk_add_page(desc, page, pageoffset, len);
 }
 
 void ptlrpc_free_bulk(struct ptlrpc_bulk_desc *desc)
@@ -168,7 +168,7 @@ void ptlrpc_free_bulk(struct ptlrpc_bulk_desc *desc)
         ENTRY;
 
         LASSERT(desc != NULL);
-        LASSERT(desc->bd_iov_count != LI_POISON); /* not freed already */
+        LASSERT(desc->bd_iov_count != 0x5a5a5a5a); /* not freed already */
         LASSERT(!desc->bd_network_rw);         /* network hands off or */
         LASSERT((desc->bd_export != NULL) ^ (desc->bd_import != NULL));
         if (desc->bd_export)
@@ -400,13 +400,6 @@ static int ptlrpc_check_reply(struct ptlrpc_request *req)
                 DEBUG_REQ(D_NET, req, "REPLIED:");
                 GOTO(out, rc = 1);
         }
-        
-        if (req->rq_net_err && !req->rq_timedout) {
-                spin_unlock_irqrestore (&req->rq_lock, flags);
-                rc = ptlrpc_expire_one_request(req); 
-                spin_lock_irqsave (&req->rq_lock, flags);
-                GOTO(out, rc);
-        }
 
         if (req->rq_err) {
                 DEBUG_REQ(D_ERROR, req, "ABORTED:");
@@ -504,11 +497,8 @@ static int after_reply(struct ptlrpc_request *req)
                 spin_lock_irqsave(&imp->imp_lock, flags);
                 if (req->rq_replay || req->rq_transno != 0)
                         ptlrpc_retain_replayable_request(req, imp);
-                else if (req->rq_commit_cb != NULL) {
-            		spin_unlock_irqrestore(&imp->imp_lock, flags);
+                else if (req->rq_commit_cb != NULL)
                         req->rq_commit_cb(req);
-            		spin_lock_irqsave(&imp->imp_lock, flags);
-		}
 
                 if (req->rq_transno > imp->imp_max_transno)
                         imp->imp_max_transno = req->rq_transno;
@@ -526,7 +516,6 @@ static int after_reply(struct ptlrpc_request *req)
 
 static int ptlrpc_send_new_req(struct ptlrpc_request *req)
 {
-        char                   str[PTL_NALFMT_SIZE];
         struct obd_import     *imp;
         unsigned long          flags;
         int rc;
@@ -571,17 +560,17 @@ static int ptlrpc_send_new_req(struct ptlrpc_request *req)
 
         req->rq_reqmsg->status = current->pid;
         CDEBUG(D_RPCTRACE, "Sending RPC pname:cluuid:pid:xid:ni:nid:opc"
-               " %s:%s:%d:"LPU64":%s:%s:%d\n", current->comm,
+               " %s:%s:%d:"LPU64":%s:"LPX64":%d\n", current->comm,
                imp->imp_obd->obd_uuid.uuid, req->rq_reqmsg->status,
                req->rq_xid,
                imp->imp_connection->c_peer.peer_ni->pni_name,
-               ptlrpc_peernid2str(&imp->imp_connection->c_peer, str),
+               imp->imp_connection->c_peer.peer_nid,
                req->rq_reqmsg->opc);
 
         rc = ptl_send_rpc(req);
         if (rc) {
                 DEBUG_REQ(D_HA, req, "send failed (%d); expect timeout", rc);
-                req->rq_net_err = 1;
+                req->rq_timeout = 1;
                 RETURN(rc);
         }
         RETURN(0);
@@ -589,7 +578,6 @@ static int ptlrpc_send_new_req(struct ptlrpc_request *req)
 
 int ptlrpc_check_set(struct ptlrpc_request_set *set)
 {
-        char str[PTL_NALFMT_SIZE];
         unsigned long flags;
         struct list_head *tmp;
         int force_timer_recalc = 0;
@@ -623,9 +611,6 @@ int ptlrpc_check_set(struct ptlrpc_request_set *set)
                 if (req->rq_phase == RQ_PHASE_INTERPRET)
                         GOTO(interpret, req->rq_status);
 
-                if (req->rq_net_err && !req->rq_timedout)
-                        ptlrpc_expire_one_request(req); 
-
                 if (req->rq_err) {
                         ptlrpc_unregister_reply(req);
                         if (req->rq_status == 0)
@@ -661,9 +646,13 @@ int ptlrpc_check_set(struct ptlrpc_request_set *set)
                         if (req->rq_waiting || req->rq_resend) {
                                 int status;
 
+                                LASSERT (!ptlrpc_client_receiving_reply(req));
+                                LASSERT (req->rq_bulk == NULL ||
+                                         !ptlrpc_bulk_active(req->rq_bulk));
+
                                 spin_lock_irqsave(&imp->imp_lock, flags);
 
-                                if (ptlrpc_import_delay_req(imp, req, &status)){
+                                if (ptlrpc_import_delay_req(imp, req, &status)) {
                                         spin_unlock_irqrestore(&imp->imp_lock,
                                                                flags);
                                         continue;
@@ -697,8 +686,6 @@ int ptlrpc_check_set(struct ptlrpc_request_set *set)
                                         if (req->rq_bulk) {
                                                 __u64 old_xid = req->rq_xid;
 
-                                                ptlrpc_unregister_bulk (req);
-
                                                 /* ensure previous bulk fails */
                                                 req->rq_xid = ptlrpc_next_xid();
                                                 CDEBUG(D_HA, "resend bulk "
@@ -713,7 +700,7 @@ int ptlrpc_check_set(struct ptlrpc_request_set *set)
                                         DEBUG_REQ(D_HA, req, "send failed (%d)",
                                                   rc);
                                         force_timer_recalc = 1;
-                                        req->rq_net_err = 1;
+                                        req->rq_timeout = 0;
                                 }
                                 /* need to reset the timeout */
                                 force_timer_recalc = 1;
@@ -789,11 +776,11 @@ int ptlrpc_check_set(struct ptlrpc_request_set *set)
                 }
 
                 CDEBUG(D_RPCTRACE, "Completed RPC pname:cluuid:pid:xid:ni:nid:"
-                       "opc %s:%s:%d:"LPU64":%s:%s:%d\n", current->comm,
+                       "opc %s:%s:%d:"LPU64":%s:"LPX64":%d\n", current->comm,
                        imp->imp_obd->obd_uuid.uuid, req->rq_reqmsg->status,
                        req->rq_xid,
                        imp->imp_connection->c_peer.peer_ni->pni_name,
-                       ptlrpc_peernid2str(&imp->imp_connection->c_peer, str),
+                       imp->imp_connection->c_peer.peer_nid,
                        req->rq_reqmsg->opc);
 
                 set->set_remaining--;
@@ -1073,8 +1060,8 @@ static int __ptlrpc_req_finished(struct ptlrpc_request *request, int locked)
         if (request == NULL)
                 RETURN(1);
 
-        if (request == LP_POISON ||
-            request->rq_reqmsg == LP_POISON) {
+        if (request == (void *)(unsigned long)(0x5a5a5a5a5a5a5a5a) ||
+            request->rq_reqmsg == (void *)(unsigned long)(0x5a5a5a5a5a5a5a5a)) {
                 CERROR("dereferencing freed request (bug 575)\n");
                 LBUG();
                 RETURN(1);
@@ -1112,10 +1099,13 @@ void ptlrpc_unregister_reply (struct ptlrpc_request *request)
         if (!ptlrpc_client_receiving_reply(request))
                 return;
 
-        PtlMDUnlink (request->rq_reply_md_h);
-
-        /* We have to l_wait_event() whatever the result, to give liblustre
-         * a chance to run reply_in_callback() */
+        rc = PtlMDUnlink (request->rq_reply_md_h);
+        if (rc == PTL_MD_INVALID) {
+                LASSERT (!ptlrpc_client_receiving_reply(request));
+                return;
+        }
+        
+        LASSERT (rc == PTL_OK);
 
         if (request->rq_set == NULL)
                 wq = &request->rq_set->set_waitq;
@@ -1203,7 +1193,6 @@ void ptlrpc_resend_req(struct ptlrpc_request *req)
 
         spin_lock_irqsave (&req->rq_lock, flags);
         req->rq_resend = 1;
-        req->rq_net_err = 0;
         req->rq_timedout = 0;
         if (req->rq_bulk) {
                 __u64 old_xid = req->rq_xid;
@@ -1303,7 +1292,6 @@ void ptlrpc_retain_replayable_request(struct ptlrpc_request *req,
 
 int ptlrpc_queue_wait(struct ptlrpc_request *req)
 {
-        char str[PTL_NALFMT_SIZE];
         int rc = 0;
         int brc;
         struct l_wait_info lwi;
@@ -1320,11 +1308,11 @@ int ptlrpc_queue_wait(struct ptlrpc_request *req)
         req->rq_reqmsg->status = current->pid;
         LASSERT(imp->imp_obd != NULL);
         CDEBUG(D_RPCTRACE, "Sending RPC pname:cluuid:pid:xid:ni:nid:opc "
-               "%s:%s:%d:"LPU64":%s:%s:%d\n", current->comm,
+               "%s:%s:%d:"LPU64":%s:"LPX64":%d\n", current->comm,
                imp->imp_obd->obd_uuid.uuid,
                req->rq_reqmsg->status, req->rq_xid,
                imp->imp_connection->c_peer.peer_ni->pni_name,
-               ptlrpc_peernid2str(&imp->imp_connection->c_peer, str),
+               imp->imp_connection->c_peer.peer_nid,
                req->rq_reqmsg->opc);
 
         /* Mark phase here for a little debug help */
@@ -1407,11 +1395,11 @@ restart:
         DEBUG_REQ(D_NET, req, "-- done sleeping");
 
         CDEBUG(D_RPCTRACE, "Completed RPC pname:cluuid:pid:xid:ni:nid:opc "
-               "%s:%s:%d:"LPU64":%s:%s:%d\n", current->comm,
+               "%s:%s:%d:"LPU64":%s:"LPX64":%d\n", current->comm,
                imp->imp_obd->obd_uuid.uuid,
                req->rq_reqmsg->status, req->rq_xid,
                imp->imp_connection->c_peer.peer_ni->pni_name,
-               ptlrpc_peernid2str(&imp->imp_connection->c_peer, str),
+               imp->imp_connection->c_peer.peer_nid,
                req->rq_reqmsg->opc);
 
         spin_lock_irqsave(&imp->imp_lock, flags);
diff --git a/lustre/ptlrpc/connection.c b/lustre/ptlrpc/connection.c
index 2e0d889..466916b 100644
--- a/lustre/ptlrpc/connection.c
+++ b/lustre/ptlrpc/connection.c
@@ -37,17 +37,15 @@ static struct list_head conn_unused_list;
 
 void ptlrpc_dump_connections(void)
 {
-        char str[PTL_NALFMT_SIZE];
         struct list_head *tmp;
         struct ptlrpc_connection *c;
         ENTRY;
 
         list_for_each(tmp, &conn_list) {
                 c = list_entry(tmp, struct ptlrpc_connection, c_link);
-                CERROR("Connection %p/%s has refcount %d (nid=%s on %s)\n",
+                CERROR("Connection %p/%s has refcount %d (nid="LPX64" on %s)\n",
                        c, c->c_remote_uuid.uuid, atomic_read(&c->c_refcount),
-                       ptlrpc_peernid2str(&c->c_peer, str),
-                       c->c_peer.peer_ni->pni_name);
+                       c->c_peer.peer_nid, c->c_peer.peer_ni->pni_name);
         }
         EXIT;
 }
@@ -55,14 +53,13 @@ void ptlrpc_dump_connections(void)
 struct ptlrpc_connection *ptlrpc_get_connection(struct ptlrpc_peer *peer,
                                                 struct obd_uuid *uuid)
 {
-        char str[PTL_NALFMT_SIZE];
         struct list_head *tmp, *pos;
         struct ptlrpc_connection *c;
         ENTRY;
 
 
-        CDEBUG(D_INFO, "peer is %s on %s\n",
-               ptlrpc_peernid2str(peer, str), peer->peer_ni->pni_name);
+        CDEBUG(D_INFO, "peer is "LPX64" on %s\n",
+               peer->peer_nid, peer->peer_ni->pni_name);
 
         spin_lock(&conn_lock);
         list_for_each(tmp, &conn_list) {
@@ -87,8 +84,7 @@ struct ptlrpc_connection *ptlrpc_get_connection(struct ptlrpc_peer *peer,
 
         /* FIXME: this should be a slab once we can validate slab addresses
          * without OOPSing */
-        OBD_ALLOC_GFP(c, sizeof(*c), GFP_ATOMIC);
-	
+        OBD_ALLOC(c, sizeof(*c));
         if (c == NULL)
                 GOTO(out, c);
 
@@ -109,7 +105,6 @@ struct ptlrpc_connection *ptlrpc_get_connection(struct ptlrpc_peer *peer,
 
 int ptlrpc_put_connection(struct ptlrpc_connection *c)
 {
-        char str[PTL_NALFMT_SIZE];
         int rc = 0;
         ENTRY;
 
@@ -118,9 +113,8 @@ int ptlrpc_put_connection(struct ptlrpc_connection *c)
                 RETURN(0);
         }
 
-        CDEBUG (D_INFO, "connection=%p refcount %d to %s on %s\n",
-                c, atomic_read(&c->c_refcount) - 1, 
-                ptlrpc_peernid2str(&c->c_peer, str),
+        CDEBUG (D_INFO, "connection=%p refcount %d to "LPX64" on %s\n",
+                c, atomic_read(&c->c_refcount) - 1, c->c_peer.peer_nid,
                 c->c_peer.peer_ni->pni_name);
 
         if (atomic_dec_and_test(&c->c_refcount)) {
@@ -139,12 +133,10 @@ int ptlrpc_put_connection(struct ptlrpc_connection *c)
 
 struct ptlrpc_connection *ptlrpc_connection_addref(struct ptlrpc_connection *c)
 {
-        char str[PTL_NALFMT_SIZE];
         ENTRY;
         atomic_inc(&c->c_refcount);
-        CDEBUG (D_INFO, "connection=%p refcount %d to %s on %s\n",
-                c, atomic_read(&c->c_refcount),
-                ptlrpc_peernid2str(&c->c_peer, str),
+        CDEBUG (D_INFO, "connection=%p refcount %d to "LPX64" on %s\n",
+                c, atomic_read(&c->c_refcount), c->c_peer.peer_nid,
                 c->c_peer.peer_ni->pni_name);
         RETURN(c);
 }
@@ -158,7 +150,6 @@ void ptlrpc_init_connection(void)
 
 void ptlrpc_cleanup_connection(void)
 {
-        char str[PTL_NALFMT_SIZE];
         struct list_head *tmp, *pos;
         struct ptlrpc_connection *c;
 
@@ -170,10 +161,9 @@ void ptlrpc_cleanup_connection(void)
         }
         list_for_each_safe(tmp, pos, &conn_list) {
                 c = list_entry(tmp, struct ptlrpc_connection, c_link);
-                CERROR("Connection %p/%s has refcount %d (nid=%s on %s)\n",
+                CERROR("Connection %p/%s has refcount %d (nid="LPX64" on %s)\n",
                        c, c->c_remote_uuid.uuid, atomic_read(&c->c_refcount),
-                       ptlrpc_peernid2str(&c->c_peer, str),
-                       c->c_peer.peer_ni->pni_name);
+                       c->c_peer.peer_nid, c->c_peer.peer_ni->pni_name);
                 list_del(&c->c_link);
                 OBD_FREE(c, sizeof(*c));
         }
diff --git a/lustre/ptlrpc/events.c b/lustre/ptlrpc/events.c
index d865e1f..6e61236 100644
--- a/lustre/ptlrpc/events.c
+++ b/lustre/ptlrpc/events.c
@@ -31,12 +31,6 @@
 #include <linux/lustre_net.h>
 #include "ptlrpc_internal.h"
 
-#if !defined(__KERNEL__) && defined(CRAY_PORTALS)
-/* forward ref in events.c */
-static void cray_portals_callback(ptl_event_t *ev);
-#endif
-
-
 struct ptlrpc_ni  ptlrpc_interfaces[NAL_MAX_NR];
 int               ptlrpc_ninterfaces;
 
@@ -64,7 +58,7 @@ void request_out_callback(ptl_event_t *ev)
                  * like failing sends in client.c does currently...  */
 
                 spin_lock_irqsave(&req->rq_lock, flags);
-                req->rq_net_err = 1;
+                req->rq_timeout = 0;
                 spin_unlock_irqrestore(&req->rq_lock, flags);
                 
                 ptlrpc_wake_client_req(req);
@@ -164,8 +158,7 @@ void request_in_callback(ptl_event_t *ev)
         struct ptlrpc_srv_ni              *srv_ni = rqbd->rqbd_srv_ni;
         struct ptlrpc_service             *service = srv_ni->sni_service;
         struct ptlrpc_request             *req;
-        char                              str[PTL_NALFMT_SIZE];
-        unsigned long                     flags;
+        long                               flags;
         ENTRY;
 
         LASSERT (ev->type == PTL_EVENT_PUT_END ||
@@ -195,10 +188,8 @@ void request_in_callback(ptl_event_t *ev)
                 OBD_ALLOC_GFP(req, sizeof(*req), GFP_ATOMIC);
                 if (req == NULL) {
                         CERROR("Can't allocate incoming request descriptor: "
-                               "Dropping %s RPC from %s\n",
-                               service->srv_name, 
-                               portals_nid2str(srv_ni->sni_ni->pni_number,
-                                               ev->initiator.nid, str));
+                               "Dropping %s RPC from "LPX64"\n",
+                               service->srv_name, ev->initiator.nid);
                         return;
                 }
         }
@@ -328,13 +319,13 @@ void server_bulk_callback (ptl_event_t *ev)
         EXIT;
 }
 
-static void ptlrpc_master_callback(ptl_event_t *ev)
+static int ptlrpc_master_callback(ptl_event_t *ev)
 {
         struct ptlrpc_cb_id *cbid = ev->mem_desc.user_ptr;
         void (*callback)(ptl_event_t *ev) = cbid->cbid_fn;
 
         /* Honestly, it's best to find out early. */
-        LASSERT (cbid->cbid_arg != LP_POISON);
+        LASSERT (cbid->cbid_arg != (void *)0x5a5a5a5a5a5a5a5a);
         LASSERT (callback == request_out_callback ||
                  callback == reply_in_callback ||
                  callback == client_bulk_callback ||
@@ -343,32 +334,35 @@ static void ptlrpc_master_callback(ptl_event_t *ev)
                  callback == server_bulk_callback);
         
         callback (ev);
+        return (0);
 }
 
 int ptlrpc_uuid_to_peer (struct obd_uuid *uuid, struct ptlrpc_peer *peer)
 {
         struct ptlrpc_ni   *pni;
-        __u32               peer_nal;
         ptl_nid_t           peer_nid;
+        ptl_handle_ni_t     peer_ni;
         int                 i;
-        char                str[PTL_NALFMT_SIZE];
+        char                str[20];
         int                 rc = lustre_uuid_to_peer(uuid->uuid, 
-                                                     &peer_nal, &peer_nid);
+                                                     &peer_ni, &peer_nid);
         if (rc != 0)
                 RETURN (rc);
 
         for (i = 0; i < ptlrpc_ninterfaces; i++) {
                 pni = &ptlrpc_interfaces[i];
 
-                if (pni->pni_number == peer_nal) {
+                if (!memcmp(&peer_ni, &pni->pni_ni_h,
+                            sizeof (peer_ni))) {
                         peer->peer_nid = peer_nid;
                         peer->peer_ni = pni;
                         return (0);
                 }
         }
 
-        CERROR("Can't find ptlrpc interface for NAL %d, NID %s\n",
-               peer_nal, portals_nid2str(peer_nal, peer_nid, str));
+        PtlSnprintHandle(str, sizeof(str), peer_ni);
+        CERROR("Can't find ptlrpc interface for "LPX64" ni %s\n",
+               peer_nid, str);
         return (-ENOENT);
 }
 
@@ -391,7 +385,7 @@ void ptlrpc_ni_fini(struct ptlrpc_ni *pni)
                         LBUG();
 
                 case PTL_OK:
-                        PtlNIFini(pni->pni_ni_h);
+                        kportal_put_ni (pni->pni_number);
                         return;
                         
                 case PTL_EQ_IN_USE:
@@ -413,48 +407,25 @@ int ptlrpc_ni_init(int number, char *name, struct ptlrpc_ni *pni)
 {
         int              rc;
         char             str[20];
-        ptl_handle_ni_t  nih;
+        ptl_handle_ni_t *nip = kportal_get_ni (number);
 
-        /* We're not passing any limits yet... */
-        rc = PtlNIInit(number, 0, NULL, NULL, &nih);
-        if (rc != PTL_OK && rc != PTL_IFACE_DUP) {
-                CDEBUG (D_NET, "Can't init network interface %s: %d\n", 
-                        name, rc);
+        if (nip == NULL) {
+                CDEBUG (D_NET, "Network interface %s not loaded\n", name);
                 return (-ENOENT);
         }
 
-        PtlSnprintHandle(str, sizeof(str), nih);
+        PtlSnprintHandle(str, sizeof(str), *nip);
         CDEBUG (D_NET, "init %d %s: %s\n", number, name, str);
 
         pni->pni_name = name;
         pni->pni_number = number;
-        pni->pni_ni_h = nih;
+        pni->pni_ni_h = *nip;
 
         pni->pni_eq_h = PTL_INVALID_HANDLE;
 
-        /* CAVEAT EMPTOR: how we process portals events is _radically_
-         * different depending on... */
-#ifdef __KERNEL__
-        /* kernel portals calls our master callback when events are added to
-         * the event queue.  In fact lustre never pulls events off this queue,
-         * so it's only sized for some debug history. */
-        rc = PtlEQAlloc(pni->pni_ni_h, 1024, ptlrpc_master_callback,
+        rc = PtlEQAlloc(pni->pni_ni_h, PTLRPC_NUM_EQ, PTLRPC_EQ_CALLBACK,
                         &pni->pni_eq_h);
-#else
-        /* liblustre calls the master callback when it removes events from the
-         * event queue.  The event queue has to be big enough not to drop
-         * anything */
-# if CRAY_PORTALS
-        /* cray portals implements a non-standard callback to notify us there
-         * are buffered events even when the app is not doing a filesystem
-         * call. */
-        rc = PtlEQAlloc(pni->pni_ni_h, 10240, cray_portals_callback,
-                        &pni->pni_eq_h);
-# else
-        rc = PtlEQAlloc(pni->pni_ni_h, 10240, PTL_EQ_HANDLER_NONE,
-                        &pni->pni_eq_h);
-# endif
-#endif
+
         if (rc != PTL_OK)
                 GOTO (fail, rc = -ENOMEM);
 
@@ -562,12 +533,11 @@ liblustre_wait_event (int timeout)
         return found_something;
 }
 
-#ifdef CRAY_PORTALS
-static void cray_portals_callback(ptl_event_t *ev)
+static int cray_portals_callback(ptl_event_t *ev)
 {
         /* We get a callback from the client Cray portals implementation
          * whenever anyone calls PtlEQPoll(), and an event queue with a
-         * callback handler has outstanding events.
+         * callback handler has outstanding events.  
          *
          * If it's not liblustre calling PtlEQPoll(), this lets us know we
          * have outstanding events which we handle with
@@ -575,20 +545,13 @@ static void cray_portals_callback(ptl_event_t *ev)
          *
          * Otherwise, we're already eagerly consuming events and we'd
          * handle events out of order if we recursed. */
-        if (!liblustre_waiting)
-                liblustre_wait_event(0);
+        if (liblustre_waiting)
+                return;
+        
+        liblustre_wait_event(0);
 }
-#endif
 #endif /* __KERNEL__ */
 
-int ptlrpc_default_nal(void)
-{
-        if (ptlrpc_ninterfaces == 0)
-                return (-ENOENT);
-
-        return (ptlrpc_interfaces[0].pni_number);
-}
-
 int ptlrpc_init_portals(void)
 {
         /* Add new portals network interfaces here.
@@ -602,7 +565,7 @@ int ptlrpc_init_portals(void)
                 {GMNAL,   "gmnal"},
                 {IBNAL,   "ibnal"},
                 {TCPNAL,  "tcpnal"},
-                {CRAY_KB_ERNAL, "cray_kb_ernal"}};
+                {SCIMACNAL, "scimacnal"}};
         int   rc;
         int   i;
 
diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c
index 7ed3c17..374e46e 100644
--- a/lustre/ptlrpc/import.c
+++ b/lustre/ptlrpc/import.c
@@ -78,7 +78,7 @@ int ptlrpc_import_recovery_state_machine(struct obd_import *imp);
 int ptlrpc_init_import(struct obd_import *imp)
 {
         unsigned long flags;
-
+        
         spin_lock_irqsave(&imp->imp_lock, flags);
 
         imp->imp_generation++;
@@ -96,18 +96,18 @@ int ptlrpc_set_import_discon(struct obd_import *imp)
 {
         unsigned long flags;
         int rc = 0;
-
+        
         spin_lock_irqsave(&imp->imp_lock, flags);
 
         if (imp->imp_state == LUSTRE_IMP_FULL) {
                 IMPORT_SET_STATE_NOLOCK(imp, LUSTRE_IMP_DISCON);
-                spin_unlock_irqrestore(&imp->imp_lock, flags);
+                spin_unlock_irqrestore(&imp->imp_lock, flags); 
                 obd_import_event(imp->imp_obd, imp, IMP_EVENT_DISCON);
                 rc = 1;
         } else {
                 spin_unlock_irqrestore(&imp->imp_lock, flags);
                 CDEBUG(D_HA, "%p %s: import already not connected: %s\n",
-                       imp,imp->imp_client->cli_name,
+                       imp,imp->imp_client->cli_name, 
                        ptlrpc_import_state_name(imp->imp_state));
         }
 
@@ -153,23 +153,24 @@ void ptlrpc_invalidate_import(struct obd_import *imp, int in_rpc)
 
         if (!imp->imp_invalid)
                 ptlrpc_deactivate_import(imp);
-
+        
         LASSERT(imp->imp_invalid);
 
         if (in_rpc)
                 inflight = 1;
-        /* wait for all requests to error out and call completion callbacks */
-        lwi = LWI_TIMEOUT_INTR(MAX(obd_timeout * HZ, 1), NULL,
+        /* wait for all requests to error out and call completion 
+           callbacks */
+        lwi = LWI_TIMEOUT_INTR(MAX(obd_timeout * HZ, 1), NULL, 
                                NULL, NULL);
-        rc = l_wait_event(imp->imp_recovery_waitq,
-                          (atomic_read(&imp->imp_inflight) == inflight),
+        rc = l_wait_event(imp->imp_recovery_waitq, 
+                          (atomic_read(&imp->imp_inflight) == inflight), 
                           &lwi);
-
+        
         if (rc)
                 CERROR("%s: rc = %d waiting for callback (%d != %d)\n",
                        imp->imp_target_uuid.uuid, rc,
                        atomic_read(&imp->imp_inflight), inflight);
-
+        
         obd_import_event(imp->imp_obd, imp, IMP_EVENT_INVALIDATE);
 }
 
@@ -202,15 +203,16 @@ void ptlrpc_fail_import(struct obd_import *imp, int generation)
                                imp->imp_obd->obd_name);
                         ptlrpc_deactivate_import(imp);
                 }
-
-                CDEBUG(D_HA, "%s: waking up pinger\n",
+                
+                CDEBUG(D_HA, "%s: waking up pinger\n", 
                        imp->imp_target_uuid.uuid);
-
+                
                 spin_lock_irqsave(&imp->imp_lock, flags);
                 imp->imp_force_verify = 1;
                 spin_unlock_irqrestore(&imp->imp_lock, flags);
-
+                
                 ptlrpc_pinger_wake_up();
+                
         }
         EXIT;
 }
@@ -248,7 +250,7 @@ int ptlrpc_connect_import(struct obd_import *imp, char * new_uuid)
 
         IMPORT_SET_STATE_NOLOCK(imp, LUSTRE_IMP_CONNECTING);
 
-        imp->imp_conn_cnt++;
+        imp->imp_conn_cnt++; 
         imp->imp_last_replay_transno = 0;
 
         if (imp->imp_remote_handle.cookie == 0) {
@@ -286,7 +288,7 @@ int ptlrpc_connect_import(struct obd_import *imp, char * new_uuid)
                 imp->imp_connection = conn;
 
                 dlmexp = class_conn2export(&imp->imp_dlm_handle);
-
+                
                 LASSERT(dlmexp != NULL);
 
                 if (dlmexp->exp_connection)
@@ -337,7 +339,7 @@ static int ptlrpc_connect_interpret(struct ptlrpc_request *request,
         unsigned long flags;
         int msg_flags;
         ENTRY;
-
+        
         spin_lock_irqsave(&imp->imp_lock, flags);
         if (imp->imp_state == LUSTRE_IMP_CLOSED) {
                 spin_unlock_irqrestore(&imp->imp_lock, flags);
@@ -386,7 +388,7 @@ static int ptlrpc_connect_interpret(struct ptlrpc_request *request,
                         imp->imp_remote_handle = request->rq_repmsg->handle;
                 } else {
                         CERROR("reconnected to %s@%s after partition\n",
-                               imp->imp_target_uuid.uuid,
+                               imp->imp_target_uuid.uuid, 
                                imp->imp_connection->c_remote_uuid.uuid);
                 }
 
@@ -394,17 +396,20 @@ static int ptlrpc_connect_interpret(struct ptlrpc_request *request,
                         IMPORT_SET_STATE(imp, LUSTRE_IMP_EVICTED);
                 else
                         IMPORT_SET_STATE(imp, LUSTRE_IMP_RECOVER);
-        } else if ((MSG_CONNECT_RECOVERING & msg_flags) && !imp->imp_invalid) {
+        } 
+        else if ((MSG_CONNECT_RECOVERING & msg_flags) && !imp->imp_invalid) {
                 LASSERT(imp->imp_replayable);
                 imp->imp_remote_handle = request->rq_repmsg->handle;
                 IMPORT_SET_STATE(imp, LUSTRE_IMP_REPLAY);
-        } else {
+        } 
+        else {
                 imp->imp_remote_handle = request->rq_repmsg->handle;
                 IMPORT_SET_STATE(imp, LUSTRE_IMP_EVICTED);
         }
-
+        
         /* Sanity checks for a reconnected import. */
-        if (!(imp->imp_replayable) != !(msg_flags & MSG_CONNECT_REPLAYABLE)) {
+        if (!(imp->imp_replayable) != 
+             !(msg_flags & MSG_CONNECT_REPLAYABLE)) {
                 CERROR("imp_replayable flag does not match server "
                        "after reconnect. We should LBUG right here.\n");
         }
@@ -428,7 +433,7 @@ finish:
                                imp->imp_connection->c_remote_uuid.uuid);
                         ptlrpc_connect_import(imp, NULL);
                         RETURN(0);
-                }
+                } 
         }
  out:
         if (rc != 0) {
@@ -468,7 +473,7 @@ static int signal_completed_replay(struct obd_import *imp)
         req->rq_replen = lustre_msg_size(0, NULL);
         req->rq_send_state = LUSTRE_IMP_REPLAY_WAIT;
         req->rq_reqmsg->flags |= MSG_LAST_REPLAY;
-        req->rq_timeout *= 3;
+        req->rq_timeout *= 3; 
         req->rq_interpret_reply = completed_replay_interpret;
 
         ptlrpcd_add_req(req);
@@ -488,13 +493,13 @@ int ptlrpc_import_recovery_state_machine(struct obd_import *imp)
                 ptlrpc_invalidate_import(imp, 1);
 
                 IMPORT_SET_STATE(imp, LUSTRE_IMP_RECOVER);
-        }
-
+        } 
+        
         if (imp->imp_state == LUSTRE_IMP_REPLAY) {
                 CDEBUG(D_HA, "replay requested by %s\n",
                        imp->imp_target_uuid.uuid);
                 rc = ptlrpc_replay_next(imp, &inflight);
-                if (inflight == 0 &&
+                if (inflight == 0 && 
                     atomic_read(&imp->imp_replay_inflight) == 0) {
                         IMPORT_SET_STATE(imp, LUSTRE_IMP_REPLAY_LOCKS);
                         rc = ldlm_replay_locks(imp);
@@ -530,7 +535,7 @@ int ptlrpc_import_recovery_state_machine(struct obd_import *imp)
                         GOTO(out, rc);
                 IMPORT_SET_STATE(imp, LUSTRE_IMP_FULL);
                 ptlrpc_activate_import(imp);
-        }
+        } 
 
         if (imp->imp_state == LUSTRE_IMP_FULL) {
                 wake_up(&imp->imp_recovery_waitq);
@@ -541,7 +546,7 @@ int ptlrpc_import_recovery_state_machine(struct obd_import *imp)
         RETURN(rc);
 }
 
-static int back_to_sleep(void *unused)
+static int back_to_sleep(void *unused) 
 {
 	return 0;
 }
@@ -567,9 +572,9 @@ int ptlrpc_disconnect_import(struct obd_import *imp)
 
         if (ptlrpc_import_in_recovery(imp)) {
                 struct l_wait_info lwi;
-                lwi = LWI_TIMEOUT_INTR(MAX(obd_timeout * HZ, 1), back_to_sleep,
+                lwi = LWI_TIMEOUT_INTR(MAX(obd_timeout * HZ, 1), back_to_sleep, 
                                        NULL, NULL);
-                rc = l_wait_event(imp->imp_recovery_waitq,
+                rc = l_wait_event(imp->imp_recovery_waitq, 
                                   !ptlrpc_import_in_recovery(imp), &lwi);
 
         }
diff --git a/lustre/ptlrpc/llog_client.c b/lustre/ptlrpc/llog_client.c
index 4fcaf37..1098b40 100644
--- a/lustre/ptlrpc/llog_client.c
+++ b/lustre/ptlrpc/llog_client.c
@@ -1,7 +1,7 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- *  Copyright (C) 2001-2004 Cluster File Systems, Inc.
+ *  Copyright (C) 2001-2003 Cluster File Systems, Inc.
  *   Author: Andreas Dilger <adilger@clusterfs.com>
  *
  *   This file is part of Lustre, http://www.lustre.org.
@@ -85,12 +85,12 @@ static int llog_client_create(struct llog_ctxt *ctxt, struct llog_handle **res,
         if (rc)
                 GOTO(err_free, rc);
 
-        body = lustre_swab_repbuf(req, 0, sizeof(*body),
+	body = lustre_swab_repbuf(req, 0, sizeof(*body),
                                  lustre_swab_llogd_body);
-        if (body == NULL) {
+	if (body == NULL) {
                 CERROR ("Can't unpack llogd_body\n");
                 GOTO(err_free, rc =-EFAULT);
-        }
+	}
 
         handle->lgh_id = body->lgd_logid;
         handle->lgh_ctxt = ctxt;
@@ -105,55 +105,6 @@ err_free:
         goto out;
 }
 
-static int llog_client_prev_block(struct llog_handle *loghandle,
-                                  int prev_idx, void *buf, int len)
-{
-        struct obd_import *imp = loghandle->lgh_ctxt->loc_imp;
-        struct ptlrpc_request *req = NULL;
-        struct llogd_body *body;
-        void * ptr;
-        int size = sizeof(*body);
-        int repsize[2] = {sizeof (*body)};
-        int rc;
-        ENTRY;
-                                                                                                                             
-        req = ptlrpc_prep_req(imp, LLOG_ORIGIN_HANDLE_PREV_BLOCK, 1,&size,NULL);
-        if (!req)
-                GOTO(out, rc = -ENOMEM);
-                                                                                                                             
-        body = lustre_msg_buf(req->rq_reqmsg, 0, sizeof (*body));
-        body->lgd_logid = loghandle->lgh_id;
-        body->lgd_ctxt_idx = loghandle->lgh_ctxt->loc_idx - 1;
-        body->lgd_llh_flags = loghandle->lgh_hdr->llh_flags;
-        body->lgd_index = prev_idx;
-        body->lgd_len = len;
-        repsize[1] = len;
-                                                                                                                             
-        req->rq_replen = lustre_msg_size(2, repsize);
-        rc = ptlrpc_queue_wait(req);
-        if (rc)
-                GOTO(out, rc);
-                                                                                                                             
-        body = lustre_swab_repbuf(req, 0, sizeof(*body),
-                                 lustre_swab_llogd_body);
-        if (body == NULL) {
-                CERROR ("Can't unpack llogd_body\n");
-                GOTO(out, rc =-EFAULT);
-        }
-                                                                                                                             
-        ptr = lustre_msg_buf(req->rq_repmsg, 1, len);
-        if (ptr == NULL) {
-                CERROR ("Can't unpack bitmap\n");
-                GOTO(out, rc =-EFAULT);
-        }
-                                                                                                                             
-        memcpy(buf, ptr, len);
-                                                                                                                             
-out:
-        if (req)
-                ptlrpc_req_finished(req);
-        RETURN(rc);
-}
 
 static int llog_client_next_block(struct llog_handle *loghandle,
                                   int *cur_idx, int next_idx,
@@ -187,18 +138,18 @@ static int llog_client_next_block(struct llog_handle *loghandle,
         if (rc)
                 GOTO(out, rc);
 
-        body = lustre_swab_repbuf(req, 0, sizeof(*body),
+	body = lustre_swab_repbuf(req, 0, sizeof(*body),
                                  lustre_swab_llogd_body);
-        if (body == NULL) {
+	if (body == NULL) {
                 CERROR ("Can't unpack llogd_body\n");
                 GOTO(out, rc =-EFAULT);
-        }
+	}
 
         ptr = lustre_msg_buf(req->rq_repmsg, 1, len);
-        if (ptr == NULL) {
+	if (ptr == NULL) {
                 CERROR ("Can't unpack bitmap\n");
                 GOTO(out, rc =-EFAULT);
-        }
+	}
 
         *cur_idx = body->lgd_saved_index;
         *cur_offset = body->lgd_cur_offset;
@@ -238,8 +189,8 @@ static int llog_client_read_header(struct llog_handle *handle)
         if (rc)
                 GOTO(out, rc);
 
-        hdr = lustre_swab_repbuf(req, 0, sizeof(*hdr), lustre_swab_llog_hdr);
-        if (hdr == NULL) {
+	hdr = lustre_swab_repbuf(req, 0, sizeof(*hdr), lustre_swab_llog_hdr);
+	if (hdr == NULL) {
                 CERROR ("Can't unpack llog_hdr\n");
                 GOTO(out, rc =-EFAULT);
 	}
@@ -276,7 +227,6 @@ static int llog_client_close(struct llog_handle *handle)
 
 
 struct llog_operations llog_client_ops = {
-        lop_prev_block:  llog_client_prev_block,
         lop_next_block:  llog_client_next_block,
         lop_read_header: llog_client_read_header,
         lop_create:      llog_client_create,
diff --git a/lustre/ptlrpc/llog_net.c b/lustre/ptlrpc/llog_net.c
index 9e6ae48..38810a3 100644
--- a/lustre/ptlrpc/llog_net.c
+++ b/lustre/ptlrpc/llog_net.c
@@ -71,7 +71,7 @@ int llog_origin_connect(struct llog_ctxt *ctxt, int count,
         lgr->lgr_hdr.lrh_len = lgr->lgr_tail.lrt_len = sizeof(*lgr);
         lgr->lgr_hdr.lrh_type = LLOG_GEN_REC;
         lgr->lgr_gen = ctxt->loc_gen;
-        rc = llog_add(ctxt, &lgr->lgr_hdr, NULL, NULL, 1, NULL);
+        rc = llog_add(ctxt, &lgr->lgr_hdr, NULL, NULL, 1);
         OBD_FREE(lgr, sizeof(*lgr));
         if (rc != 1)
                 RETURN(rc);
@@ -107,7 +107,8 @@ int llog_handle_connect(struct ptlrpc_request *req)
 
         req_body = lustre_msg_buf(req->rq_reqmsg, 0, sizeof(*req_body));
 
-        ctxt = llog_get_context(obd, req_body->lgdc_ctxt_idx);
+#warning "FIXME: shouldn't llogs be passed directly?"
+        ctxt = llog_get_context(&obd->obd_llogs, req_body->lgdc_ctxt_idx);
         rc = llog_connect(ctxt, 1, &req_body->lgdc_logid,
                           &req_body->lgdc_gen, NULL);
         if (rc != 0)
diff --git a/lustre/ptlrpc/llog_server.c b/lustre/ptlrpc/llog_server.c
index d064fc8..74c89a9 100644
--- a/lustre/ptlrpc/llog_server.c
+++ b/lustre/ptlrpc/llog_server.c
@@ -47,9 +47,10 @@ int llog_origin_handle_create(struct ptlrpc_request *req)
 {
         struct obd_export *exp = req->rq_export;
         struct obd_device *obd = exp->exp_obd;
+        struct obd_device *disk_obd;
         struct llog_handle  *loghandle;
         struct llogd_body *body;
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
         struct llog_logid *logid = NULL;
         struct llog_ctxt *ctxt;
         char * name = NULL;
@@ -75,9 +76,10 @@ int llog_origin_handle_create(struct ptlrpc_request *req)
                 }
         }
 
-        ctxt = llog_get_context(obd, body->lgd_ctxt_idx);
+        ctxt = llog_get_context(&obd->obd_llogs, body->lgd_ctxt_idx);
         LASSERT(ctxt != NULL);
-        push_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
+        disk_obd = ctxt->loc_exp->exp_obd;
+        push_ctxt(&saved, &disk_obd->obd_ctxt, NULL);
 
         rc = llog_create(ctxt, &loghandle, logid, name);
         if (rc)
@@ -95,73 +97,7 @@ out_close:
         if (!rc)
                 rc = rc2;
 out_pop:
-        pop_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
-out:
-        RETURN(rc);
-}
-
-int llog_origin_handle_prev_block(struct ptlrpc_request *req)
-{
-        struct obd_export *exp = req->rq_export;
-        struct obd_device *obd = exp->exp_obd;
-        struct llog_handle  *loghandle;
-        struct llogd_body *body;
-        struct lvfs_run_ctxt saved;
-        struct llog_ctxt *ctxt;
-        __u32 flags;
-        __u8 *buf;
-        void * ptr;
-        int rc, rc2, size[] = {sizeof (*body), LLOG_CHUNK_SIZE};
-        ENTRY;
-
-        body = lustre_swab_reqbuf(req, 0, sizeof(*body),
-                                  lustre_swab_llogd_body);
-        if (body == NULL) {
-                CERROR ("Can't unpack llogd_body\n");
-                GOTO(out, rc =-EFAULT);
-        }
-
-        OBD_ALLOC(buf, LLOG_CHUNK_SIZE);
-        if (!buf)
-                GOTO(out, rc = -ENOMEM);
-
-        ctxt = llog_get_context(obd, body->lgd_ctxt_idx);
-        LASSERT(ctxt != NULL);
-        push_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
-
-        rc = llog_create(ctxt, &loghandle, &body->lgd_logid, NULL);
-        if (rc)
-                GOTO(out_pop, rc);
-
-        flags = body->lgd_llh_flags;
-        rc = llog_init_handle(loghandle, flags, NULL);
-        if (rc)
-                GOTO(out_close, rc);
-
-        memset(buf, 0, LLOG_CHUNK_SIZE);
-        rc = llog_prev_block(loghandle, body->lgd_index, buf, LLOG_CHUNK_SIZE);
-        if (rc)
-                GOTO(out_close, rc);
-
-
-        rc = lustre_pack_reply(req, 2, size, NULL);
-        if (rc)
-                GOTO(out_close, rc = -ENOMEM);
-
-        ptr = lustre_msg_buf(req->rq_repmsg, 0, sizeof (body));
-        memcpy(ptr, body, sizeof(*body));
-
-        ptr = lustre_msg_buf(req->rq_repmsg, 1, LLOG_CHUNK_SIZE);
-        memcpy(ptr, buf, LLOG_CHUNK_SIZE);
-
-out_close:
-        rc2 = llog_close(loghandle);
-        if (!rc)
-                rc = rc2;
-
-out_pop:
-        pop_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
-        OBD_FREE(buf, LLOG_CHUNK_SIZE);
+        pop_ctxt(&saved, &disk_obd->obd_ctxt, NULL);
 out:
         RETURN(rc);
 }
@@ -170,9 +106,10 @@ int llog_origin_handle_next_block(struct ptlrpc_request *req)
 {
         struct obd_export *exp = req->rq_export;
         struct obd_device *obd = exp->exp_obd;
+        struct obd_device *disk_obd;
         struct llog_handle  *loghandle;
         struct llogd_body *body;
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
         struct llog_ctxt *ctxt;
         __u32 flags;
         __u8 *buf;
@@ -193,9 +130,10 @@ int llog_origin_handle_next_block(struct ptlrpc_request *req)
         if (!buf)
                 GOTO(out, rc = -ENOMEM);
 
-        ctxt = llog_get_context(obd, body->lgd_ctxt_idx);
+        ctxt = llog_get_context(&obd->obd_llogs, body->lgd_ctxt_idx);
         LASSERT(ctxt != NULL);
-        push_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
+        disk_obd = ctxt->loc_exp->exp_obd;
+        push_ctxt(&saved, &disk_obd->obd_ctxt, NULL);
 
         rc = llog_create(ctxt, &loghandle, &body->lgd_logid, NULL);
         if (rc)
@@ -230,7 +168,7 @@ out_close:
                 rc = rc2;
 
 out_pop:
-        pop_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
+        pop_ctxt(&saved, &disk_obd->obd_ctxt, NULL);
         OBD_FREE(buf, LLOG_CHUNK_SIZE);
 out:
         RETURN(rc);
@@ -240,10 +178,11 @@ int llog_origin_handle_read_header(struct ptlrpc_request *req)
 {
         struct obd_export *exp = req->rq_export;
         struct obd_device *obd = exp->exp_obd;
+        struct obd_device *disk_obd;
         struct llog_handle  *loghandle;
         struct llogd_body *body;
         struct llog_log_hdr *hdr;
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
         struct llog_ctxt *ctxt;
         __u32 flags;
         int size[] = {sizeof (*hdr)};
@@ -257,9 +196,10 @@ int llog_origin_handle_read_header(struct ptlrpc_request *req)
                 GOTO(out, rc =-EFAULT);
         }
 
-        ctxt = llog_get_context(obd, body->lgd_ctxt_idx);
+        ctxt = llog_get_context(&obd->obd_llogs, body->lgd_ctxt_idx);
         LASSERT(ctxt != NULL);
-        push_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
+        disk_obd = ctxt->loc_exp->exp_obd;
+        push_ctxt(&saved, &disk_obd->obd_ctxt, NULL);
 
         rc = llog_create(ctxt, &loghandle, &body->lgd_logid, NULL);
         if (rc)
@@ -284,7 +224,7 @@ out_close:
                 rc = rc2;
 
 out_pop:
-        pop_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
+        pop_ctxt(&saved, &disk_obd->obd_ctxt, NULL);
 
 out:
         RETURN(rc);
@@ -302,10 +242,11 @@ int llog_origin_handle_close(struct ptlrpc_request *req)
 int llog_origin_handle_cancel(struct ptlrpc_request *req)
 {
         struct obd_device *obd = req->rq_export->exp_obd;
+        struct obd_device *disk_obd;
         struct llog_cookie *logcookies;
         struct llog_ctxt *ctxt;
         int num_cookies, rc = 0, err, i;
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
         struct llog_handle *cathandle;
         struct inode *inode;
         void *handle;
@@ -318,20 +259,21 @@ int llog_origin_handle_cancel(struct ptlrpc_request *req)
                 RETURN(-EFAULT);
         }
 
-        ctxt = llog_get_context(obd, logcookies->lgc_subsys);
+        ctxt = llog_get_context(&obd->obd_llogs, logcookies->lgc_subsys);
         if (ctxt == NULL) {
                 CWARN("llog subsys not setup or already cleanup\n");
                 RETURN(-ENOENT);
         }
 
-        push_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
+        disk_obd = ctxt->loc_exp->exp_obd;
+        push_ctxt(&saved, &disk_obd->obd_ctxt, NULL);
         for (i = 0; i < num_cookies; i++, logcookies++) {
                 cathandle = ctxt->loc_handle;
                 LASSERT(cathandle != NULL);
                 inode = cathandle->lgh_file->f_dentry->d_inode;
 
-                handle = llog_fsfilt_start(ctxt, inode,
-                                           FSFILT_OP_CANCEL_UNLINK, NULL);
+                handle = fsfilt_start_log(disk_obd, inode,
+                                          FSFILT_OP_CANCEL_UNLINK, NULL, 1);
                 if (IS_ERR(handle)) {
                         CERROR("fsfilt_start failed: %ld\n", PTR_ERR(handle));
                         GOTO(pop_ctxt, rc = PTR_ERR(handle));
@@ -339,7 +281,7 @@ int llog_origin_handle_cancel(struct ptlrpc_request *req)
 
                 rc = llog_cat_cancel_records(cathandle, 1, logcookies);
 
-                err = llog_fsfilt_commit(ctxt, inode, handle, 0);
+                err = fsfilt_commit(disk_obd, inode, handle, 0);
                 if (err) {
                         CERROR("error committing transaction: %d\n", err);
                         if (!rc)
@@ -348,7 +290,7 @@ int llog_origin_handle_cancel(struct ptlrpc_request *req)
                 }
         }
 pop_ctxt:
-        pop_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
+        pop_ctxt(&saved, &disk_obd->obd_ctxt, NULL);
         if (rc)
                 CERROR("cancel %d llog-records failed: %d\n", num_cookies, rc);
         else
@@ -362,8 +304,8 @@ static int llog_catinfo_config(struct obd_device *obd, char *buf, int buf_len,
                                char *client)
 {
         struct mds_obd *mds = &obd->u.mds;
-        struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_CONFIG_ORIG_CTXT);
-        struct lvfs_run_ctxt saved;
+        struct llog_ctxt *ctxt = llog_get_context(&obd->obd_llogs, LLOG_CONFIG_ORIG_CTXT);
+        struct obd_run_ctxt saved;
         struct llog_handle *handle = NULL;
         char name[4][64];
         int rc, i, l, remains = buf_len;
@@ -372,7 +314,7 @@ static int llog_catinfo_config(struct obd_device *obd, char *buf, int buf_len,
         if (ctxt == NULL || mds == NULL)
                 RETURN(-EOPNOTSUPP);
 
-        push_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
+        push_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_ctxt, NULL);
 
         sprintf(name[0], "%s", mds->mds_profile);
         sprintf(name[1], "%s-clean", mds->mds_profile);
@@ -408,7 +350,7 @@ static int llog_catinfo_config(struct obd_device *obd, char *buf, int buf_len,
                         break;
         }
 out_pop:
-        pop_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
+        pop_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_ctxt, NULL);
         RETURN(rc);
 }
 
@@ -480,14 +422,14 @@ static int llog_catinfo_deletions(struct obd_device *obd, char *buf,
 {
         struct mds_obd *mds = &obd->u.mds;
         struct llog_handle *handle;
-        struct lvfs_run_ctxt saved;
+        struct obd_run_ctxt saved;
         int size, i, count;
         struct llog_catid *idarray;
         struct llog_logid *id;
         char name[32] = CATLIST;
         int rc;
         struct cb_data data;
-        struct llog_ctxt *ctxt = llog_get_context(obd, LLOG_CONFIG_ORIG_CTXT);
+        struct llog_ctxt *ctxt = llog_get_context(&obd->obd_llogs, LLOG_CONFIG_ORIG_CTXT);
 
         if (ctxt == NULL || mds == NULL)
                 RETURN(-EOPNOTSUPP);
@@ -499,12 +441,11 @@ static int llog_catinfo_deletions(struct obd_device *obd, char *buf,
         if (!idarray)
                 RETURN(-ENOMEM);
 
-        rc = llog_get_cat_list(&obd->obd_lvfs_ctxt, obd->obd_fsops, 
-                               name, count, idarray);
+        rc = llog_get_cat_list(obd, obd, name, count, idarray);
         if (rc)
                 GOTO(out_free, rc);
 
-        push_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
+        push_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_ctxt, NULL);
 
         data.ctxt = ctxt;
         data.out = buf;
@@ -542,7 +483,7 @@ static int llog_catinfo_deletions(struct obd_device *obd, char *buf,
                         break;
         }
 out_pop:
-        pop_ctxt(&saved, ctxt->loc_lvfs_ctxt, NULL);
+        pop_ctxt(&saved, &ctxt->loc_exp->exp_obd->obd_ctxt, NULL);
 out_free:
         OBD_FREE(idarray, size);
         RETURN(rc);
@@ -592,11 +533,6 @@ int llog_origin_handle_create(struct ptlrpc_request *req)
         LBUG();
         return 0;
 }
-int llog_origin_handle_prev_block(struct ptlrpc_request *req)
-{
-        LBUG();
-        return 0;
-}
 int llog_origin_handle_next_block(struct ptlrpc_request *req)
 {
         LBUG();
diff --git a/lustre/ptlrpc/niobuf.c b/lustre/ptlrpc/niobuf.c
index b628216..c22e668 100644
--- a/lustre/ptlrpc/niobuf.c
+++ b/lustre/ptlrpc/niobuf.c
@@ -23,6 +23,7 @@
 #define DEBUG_SUBSYSTEM S_RPC
 #ifndef __KERNEL__
 #include <liblustre.h>
+#include <portals/lib-types.h>
 #endif
 #include <linux/obd_support.h>
 #include <linux/lustre_net.h>
@@ -43,9 +44,11 @@ static int ptl_send_buf (ptl_handle_md_t *mdh, void *base, int len,
 
         LASSERT (portal != 0);
         LASSERT (conn != NULL);
-        CDEBUG (D_INFO, "conn=%p ni %s nid %s on %s\n",
+        CDEBUG (D_INFO, "conn=%p ni %s nid "LPX64" (%s) on %s\n",
                 conn, conn->c_peer.peer_ni->pni_name,
-                ptlrpc_peernid2str(&conn->c_peer, str),
+                conn->c_peer.peer_nid,
+                portals_nid2str(conn->c_peer.peer_ni->pni_number,
+                                conn->c_peer.peer_nid, str),
                 conn->c_peer.peer_ni->pni_name);
 
         remote_id.nid = conn->c_peer.peer_nid,
@@ -81,9 +84,8 @@ static int ptl_send_buf (ptl_handle_md_t *mdh, void *base, int len,
                 /* We're going to get an UNLINK event when I unlink below,
                  * which will complete just like any other failed send, so
                  * I fall through and return success here! */
-                CERROR("PtlPut(%s, %d, "LPD64") failed: %d\n",
-                       ptlrpc_peernid2str(&conn->c_peer, str),
-                       portal, xid, rc);
+                CERROR("PtlPut("LPU64", %d, "LPD64") failed: %d\n",
+                       remote_id.nid, portal, xid, rc);
                 rc2 = PtlMDUnlink(*mdh);
                 LASSERT (rc2 == PTL_OK);
         }
@@ -91,6 +93,20 @@ static int ptl_send_buf (ptl_handle_md_t *mdh, void *base, int len,
         RETURN (0);
 }
 
+static void ptlrpc_fill_md(ptl_md_t *md, struct ptlrpc_bulk_desc *desc)
+{
+        LASSERT(ptl_md_max_iovs() == 0  || 
+                (desc->bd_iov_count <= ptl_md_max_iovs()));
+
+        if (ptl_requires_iov() || desc->bd_iov_count > 0) {
+                md->options |= PTLRPC_PTL_MD_IOV;
+                md->start = &desc->bd_iov[0];
+                md->niov = desc->bd_iov_count;
+        } else {
+                md->start = ptl_iov_base(&desc->bd_iov[0]);
+        }
+}
+
 int ptlrpc_start_bulk_transfer (struct ptlrpc_bulk_desc *desc)
 {
         int                 rc;
@@ -99,7 +115,6 @@ int ptlrpc_start_bulk_transfer (struct ptlrpc_bulk_desc *desc)
         ptl_process_id_t    remote_id;
         ptl_md_t            md;
         __u64               xid;
-        char                str[PTL_NALFMT_SIZE];
         ENTRY;
 
         if (OBD_FAIL_CHECK_ONCE(OBD_FAIL_PTLRPC_BULK_PUT_NET)) 
@@ -112,12 +127,13 @@ int ptlrpc_start_bulk_transfer (struct ptlrpc_bulk_desc *desc)
         desc->bd_success = 0;
         peer = &desc->bd_export->exp_connection->c_peer;
 
-        md.user_ptr = &desc->bd_cbid;
+        md.length = desc->bd_nob;
         md.eventq = peer->peer_ni->pni_eq_h;
         md.threshold = 2; /* SENT and ACK/REPLY */
         md.options = PTLRPC_MD_OPTIONS;
-        ptlrpc_fill_bulk_md(&md, desc);
 
+        ptlrpc_fill_md(&md, desc);
+        md.user_ptr = &desc->bd_cbid;
         LASSERT (desc->bd_cbid.cbid_fn == server_bulk_callback);
         LASSERT (desc->bd_cbid.cbid_arg == desc);
 
@@ -138,9 +154,9 @@ int ptlrpc_start_bulk_transfer (struct ptlrpc_bulk_desc *desc)
         remote_id.pid = 0;
 
         CDEBUG(D_NET, "Transferring %u pages %u bytes via portal %d on %s "
-               "nid %s pid %d xid "LPX64"\n", desc->bd_iov_count,
-               desc->bd_nob, desc->bd_portal, peer->peer_ni->pni_name,
-               ptlrpc_peernid2str(peer, str), remote_id.pid, xid);
+               "nid "LPX64" pid %d xid "LPX64"\n", 
+               md.niov, md.length, desc->bd_portal, peer->peer_ni->pni_name,
+               remote_id.nid, remote_id.pid, xid);
 
         /* Network is about to get at the memory */
         desc->bd_network_rw = 1;
@@ -156,9 +172,8 @@ int ptlrpc_start_bulk_transfer (struct ptlrpc_bulk_desc *desc)
                 /* Can't send, so we unlink the MD bound above.  The UNLINK
                  * event this creates will signal completion with failure,
                  * so we return SUCCESS here! */
-                CERROR("Transfer(%s, %d, "LPX64") failed: %d\n",
-                       ptlrpc_peernid2str(peer, str),
-                       desc->bd_portal, xid, rc);
+                CERROR("Transfer("LPU64", %d, "LPX64") failed: %d\n",
+                       remote_id.nid, desc->bd_portal, xid, rc);
                 rc2 = PtlMDUnlink(desc->bd_md_h);
                 LASSERT (rc2 == PTL_OK);
         }
@@ -179,11 +194,16 @@ void ptlrpc_abort_bulk (struct ptlrpc_bulk_desc *desc)
                 return;                         /* never started */
         
         /* The unlink ensures the callback happens ASAP and is the last
-         * one.  If it fails, it must be because completion just happened,
-         * but we must still l_wait_event() in this case, to give liblustre
-         * a chance to run server_bulk_callback()*/
+         * one.  If it fails, it must be because completion just
+         * happened. */
 
-        PtlMDUnlink (desc->bd_md_h);
+        rc = PtlMDUnlink (desc->bd_md_h);
+        if (rc == PTL_MD_INVALID) {
+                LASSERT(!ptlrpc_bulk_active(desc));
+                return;
+        }
+        
+        LASSERT (rc == PTL_OK);
 
         for (;;) {
                 /* Network access will complete in finite time but the HUGE
@@ -225,14 +245,14 @@ int ptlrpc_register_bulk (struct ptlrpc_request *req)
 
         peer = &desc->bd_import->imp_connection->c_peer;
 
-        md.user_ptr = &desc->bd_cbid;
+        md.length = desc->bd_nob;
         md.eventq = peer->peer_ni->pni_eq_h;
         md.threshold = 1;                       /* PUT or GET */
         md.options = PTLRPC_MD_OPTIONS | 
                      ((desc->bd_type == BULK_GET_SOURCE) ? 
                       PTL_MD_OP_GET : PTL_MD_OP_PUT);
-        ptlrpc_fill_bulk_md(&md, desc);
-
+        ptlrpc_fill_md(&md, desc);
+        md.user_ptr = &desc->bd_cbid;
         LASSERT (desc->bd_cbid.cbid_fn == client_bulk_callback);
         LASSERT (desc->bd_cbid.cbid_arg == desc);
 
@@ -270,7 +290,7 @@ int ptlrpc_register_bulk (struct ptlrpc_request *req)
         CDEBUG(D_NET, "Setup bulk %s buffers: %u pages %u bytes, xid "LPX64", "
                "portal %u on %s\n",
                desc->bd_type == BULK_GET_SOURCE ? "get-source" : "put-sink",
-               desc->bd_iov_count, desc->bd_nob,
+               md.niov, md.length,
                req->rq_xid, desc->bd_portal, peer->peer_ni->pni_name);
         RETURN(0);
 }
@@ -292,11 +312,16 @@ void ptlrpc_unregister_bulk (struct ptlrpc_request *req)
         LASSERT (desc->bd_req == req);          /* bd_req NULL until registered */
 
         /* the unlink ensures the callback happens ASAP and is the last
-         * one.  If it fails, it must be because completion just happened,
-         * but we must still l_wait_event() in this case to give liblustre
-         * a chance to run client_bulk_callback() */
+         * one.  If it fails, it must be because completion just
+         * happened. */
 
-        PtlMDUnlink (desc->bd_md_h);
+        rc = PtlMDUnlink (desc->bd_md_h);
+        if (rc == PTL_MD_INVALID) {
+                LASSERT(!ptlrpc_bulk_active(desc));
+                return;
+        }
+        
+        LASSERT (rc == PTL_OK);
         
         if (desc->bd_req->rq_set != NULL)
                 wq = &req->rq_set->set_waitq;
@@ -446,7 +471,6 @@ int ptl_send_rpc(struct ptlrpc_request *request)
         request->rq_replied = 0;
         request->rq_err = 0;
         request->rq_timedout = 0;
-        request->rq_net_err = 0;
         request->rq_resend = 0;
         request->rq_restart = 0;
         spin_unlock_irqrestore (&request->rq_lock, flags);
diff --git a/lustre/ptlrpc/pack_generic.c b/lustre/ptlrpc/pack_generic.c
index 94475ee..3a74d41 100644
--- a/lustre/ptlrpc/pack_generic.c
+++ b/lustre/ptlrpc/pack_generic.c
@@ -27,7 +27,7 @@
 
 #define DEBUG_SUBSYSTEM S_RPC
 #ifndef __KERNEL__
-# include <liblustre.h>
+#include <liblustre.h>
 #endif
 
 #include <linux/obd_support.h>
@@ -671,7 +671,7 @@ void lustre_assert_wire_constants(void)
          * running on Linux schnapps.adilger.int 2.4.22-l32 #4 Thu Jan 8 14:32:57 MST 2004 i686 i686 
          * with gcc version 3.2.2 20030222 (Red Hat Linux 3.2.2-5) */
 
-
+#if 0
         /* Constants... */
         LASSERTF(PTLRPC_MSG_MAGIC == 0x0BD00BD0," found %lld\n",
                  (long long)PTLRPC_MSG_MAGIC);
@@ -775,7 +775,7 @@ void lustre_assert_wire_constants(void)
                  (long long)REINT_RENAME);
         LASSERTF(REINT_OPEN == 6, " found %lld\n",
                  (long long)REINT_OPEN);
-        LASSERTF(REINT_MAX == 8, " found %lld\n",
+        LASSERTF(REINT_MAX == 6, " found %lld\n",
                  (long long)REINT_MAX);
         LASSERTF(DISP_IT_EXECD == 1, " found %lld\n",
                  (long long)DISP_IT_EXECD);
@@ -909,7 +909,7 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)sizeof(((struct lustre_msg *)0)->buflens[7]));
 
         /* Checks for struct obdo */
-        LASSERTF((int)sizeof(struct obdo) == 168, " found %lld\n",
+        LASSERTF((int)sizeof(struct obdo) == 172, " found %lld\n",
                  (long long)(int)sizeof(struct obdo));
         LASSERTF(offsetof(struct obdo, o_id) == 0, " found %lld\n",
                  (long long)offsetof(struct obdo, o_id));
@@ -983,7 +983,7 @@ void lustre_assert_wire_constants(void)
                  (long long)offsetof(struct obdo, o_easize));
         LASSERTF((int)sizeof(((struct obdo *)0)->o_easize) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_easize));
-        LASSERTF(offsetof(struct obdo, o_inline) == 104, " found %lld\n",
+        LASSERTF(offsetof(struct obdo, o_inline) == 108, " found %lld\n",
                  (long long)offsetof(struct obdo, o_inline));
         LASSERTF((int)sizeof(((struct obdo *)0)->o_inline) == 64, " found %lld\n",
                  (long long)(int)sizeof(((struct obdo *)0)->o_inline));
@@ -1193,15 +1193,15 @@ void lustre_assert_wire_constants(void)
                  (long long)OBD_BRW_FROM_GRANT);
 
         /* Checks for struct ost_body */
-        LASSERTF((int)sizeof(struct ost_body) == 168, " found %lld\n",
+        LASSERTF((int)sizeof(struct ost_body) == 172, " found %lld\n",
                  (long long)(int)sizeof(struct ost_body));
         LASSERTF(offsetof(struct ost_body, oa) == 0, " found %lld\n",
                  (long long)offsetof(struct ost_body, oa));
-        LASSERTF((int)sizeof(((struct ost_body *)0)->oa) == 168, " found %lld\n",
+        LASSERTF((int)sizeof(((struct ost_body *)0)->oa) == 172, " found %lld\n",
                  (long long)(int)sizeof(((struct ost_body *)0)->oa));
 
         /* Checks for struct ll_fid */
-        LASSERTF((int)sizeof(struct ll_fid) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(struct ll_fid) == 24, " found %lld\n",
                  (long long)(int)sizeof(struct ll_fid));
         LASSERTF(offsetof(struct ll_fid, id) == 0, " found %lld\n",
                  (long long)offsetof(struct ll_fid, id));
@@ -1229,17 +1229,17 @@ void lustre_assert_wire_constants(void)
                  (long long)(int)sizeof(((struct mds_status_req *)0)->repbuf));
 
         /* Checks for struct mds_body */
-        LASSERTF((int)sizeof(struct mds_body) == 136, " found %lld\n",
+        LASSERTF((int)sizeof(struct mds_body) == 152, " found %lld\n",
                  (long long)(int)sizeof(struct mds_body));
         LASSERTF(offsetof(struct mds_body, fid1) == 0, " found %lld\n",
                  (long long)offsetof(struct mds_body, fid1));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->fid1) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mds_body *)0)->fid1) == 24, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_body *)0)->fid1));
-        LASSERTF(offsetof(struct mds_body, fid2) == 16, " found %lld\n",
+        LASSERTF(offsetof(struct mds_body, fid2) == 24, " found %lld\n",
                  (long long)offsetof(struct mds_body, fid2));
-        LASSERTF((int)sizeof(((struct mds_body *)0)->fid2) == 16, " found %lld\n",
+        LASSERTF((int)sizeof(((struct mds_body *)0)->fid2) == 24, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_body *)0)->fid2));
-        LASSERTF(offsetof(struct mds_body, handle) == 32, " found %lld\n",
+        LASSERTF(offsetof(struct mds_body, handle) == 48, " found %lld\n",
                  (long long)offsetof(struct mds_body, handle));
         LASSERTF((int)sizeof(((struct mds_body *)0)->handle) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct mds_body *)0)->handle));
@@ -2139,5 +2139,6 @@ void lustre_assert_wire_constants(void)
                  (long long)offsetof(struct llogd_conn_body, lgdc_ctxt_idx));
         LASSERTF((int)sizeof(((struct llogd_conn_body *)0)->lgdc_ctxt_idx) == 4, " found %lld\n",
                  (long long)(int)sizeof(((struct llogd_conn_body *)0)->lgdc_ctxt_idx));
+#endif
 }
 
diff --git a/lustre/ptlrpc/pers.c b/lustre/ptlrpc/pers.c
index fff71f0..7fcccd2 100644
--- a/lustre/ptlrpc/pers.c
+++ b/lustre/ptlrpc/pers.c
@@ -36,18 +36,8 @@
 
 #ifdef __KERNEL__
 #ifndef CRAY_PORTALS
-void ptlrpc_fill_bulk_md (ptl_md_t *md, struct ptlrpc_bulk_desc *desc)
-{
-        LASSERT (desc->bd_iov_count <= PTLRPC_MAX_BRW_PAGES);
-        LASSERT (!(md->options & (PTL_MD_IOVEC | PTL_MD_KIOV | PTL_MD_PHYS)));
-
-        md->options |= PTL_MD_KIOV;
-        md->start = &desc->bd_iov[0];
-        md->length = desc->bd_iov_count;
-}
-
-void ptlrpc_add_bulk_page(struct ptlrpc_bulk_desc *desc, struct page *page,
-                          int pageoffset, int len)
+void pers_bulk_add_page(struct ptlrpc_bulk_desc *desc, struct page *page,
+                        int pageoffset, int len)
 {
         ptl_kiov_t *kiov = &desc->bd_iov[desc->bd_iov_count];
 
@@ -58,20 +48,10 @@ void ptlrpc_add_bulk_page(struct ptlrpc_bulk_desc *desc, struct page *page,
         desc->bd_iov_count++;
 }
 #else
-void ptlrpc_fill_bulk_md (ptl_md_t *md, struct ptlrpc_bulk_desc *desc)
-{
-        LASSERT (desc->bd_iov_count <= PTLRPC_MAX_BRW_PAGES);
-        LASSERT (!(md->options & (PTL_MD_IOVEC | PTL_MD_KIOV | PTL_MD_PHYS)));
-        
-        md->options |= (PTL_MD_IOVEC | PTL_MD_PHYS);
-        md->start = &desc->bd_iov[0];
-        md->length = desc->bd_iov_count;
-}
-
-void ptlrpc_add_bulk_page(struct ptlrpc_bulk_desc *desc, struct page *page,
-                          int pageoffset, int len)
+void pers_bulk_add_page(struct ptlrpc_bulk_desc *desc, struct page *page,
+                        int pageoffset, int len)
 {
-        ptl_md_iovec_t *iov = &desc->bd_iov[desc->bd_iov_count];
+        struct iovec *iov = &desc->bd_iov[desc->bd_iov_count];
 
         /* Should get a compiler warning if sizeof(physaddr) > sizeof(void *) */
         iov->iov_base = (void *)(page_to_phys(page) + pageoffset);
@@ -82,39 +62,17 @@ void ptlrpc_add_bulk_page(struct ptlrpc_bulk_desc *desc, struct page *page,
 #endif
 
 #else /* !__KERNEL__ */
-void ptlrpc_fill_bulk_md(ptl_md_t *md, struct ptlrpc_bulk_desc *desc)
-{
-        LASSERT (!(md->options & (PTL_MD_IOVEC | PTL_MD_KIOV | PTL_MD_PHYS)));
 
-        if (desc->bd_iov_count == 1) {
-                md->start = desc->bd_iov[0].iov_base;
-                md->length = desc->bd_iov[0].iov_len;
-                return;
-        }
-        
-#if CRAY_PORTALS
-        LBUG();
-#endif
-        md->options |= PTL_MD_IOVEC;
-        md->start = &desc->bd_iov[0];
-        md->length = desc->bd_iov_count;
-}
-
-static int can_merge_iovs(ptl_md_iovec_t *existing, ptl_md_iovec_t *candidate)
+int can_merge_iovs(struct iovec *existing, struct iovec *candidate)
 {
-        if (existing->iov_base + existing->iov_len == candidate->iov_base) 
+        if (existing->iov_base + existing->iov_len == candidate->iov_base)
                 return 1;
-
-        CERROR("Can't merge iovs %p for %x, %p for %x\n",
-               existing->iov_base, existing->iov_len,
-               candidate->iov_base, candidate->iov_len);
         return 0;
 }
-
-void ptlrpc_add_bulk_page(struct ptlrpc_bulk_desc *desc, struct page *page, 
-                          int pageoffset, int len)
+void pers_bulk_add_page(struct ptlrpc_bulk_desc *desc, struct page *page, 
+                        int pageoffset, int len)
 {
-        ptl_md_iovec_t *iov = &desc->bd_iov[desc->bd_iov_count];
+        struct iovec *iov = &desc->bd_iov[desc->bd_iov_count];
 
         iov->iov_base = page->addr + pageoffset;
         iov->iov_len = len;
diff --git a/lustre/ptlrpc/pinger.c b/lustre/ptlrpc/pinger.c
index bc137f37..01d7d23 100644
--- a/lustre/ptlrpc/pinger.c
+++ b/lustre/ptlrpc/pinger.c
@@ -38,6 +38,8 @@
 static DECLARE_MUTEX(pinger_sem);
 static struct list_head pinger_imports = LIST_HEAD_INIT(pinger_imports);
 
+static struct ptlrpc_thread *pinger_thread = NULL;
+
 int ptlrpc_ping(struct obd_import *imp) 
 {
         struct ptlrpc_request *req;
@@ -80,10 +82,7 @@ static int ptlrpc_pinger_main(void *arg)
         RECALC_SIGPENDING;
         SIGNAL_MASK_UNLOCK(current, flags);
 
-        LASSERTF(strlen(data->name) < sizeof(current->comm),
-                 "name %d > len %d\n",
-                 (int)strlen(data->name), (int)sizeof(current->comm));
-        THREAD_NAME(current->comm, sizeof(current->comm) - 1, "%s", data->name);
+        THREAD_NAME(current->comm, "%s", data->name);
         unlock_kernel();
 
         /* Record that the thread is running */
@@ -171,8 +170,6 @@ static int ptlrpc_pinger_main(void *arg)
         return 0;
 }
 
-static struct ptlrpc_thread *pinger_thread = NULL;
-
 int ptlrpc_start_pinger(void)
 {
         struct l_wait_info lwi = { 0 };
diff --git a/lustre/ptlrpc/ptlrpc_internal.h b/lustre/ptlrpc/ptlrpc_internal.h
index 81f46dc..d7c23785 100644
--- a/lustre/ptlrpc/ptlrpc_internal.h
+++ b/lustre/ptlrpc/ptlrpc_internal.h
@@ -108,10 +108,57 @@ enum {
 
 int ptlrpc_expire_one_request(struct ptlrpc_request *req);
 
+/* XXX these should be run-time checks so we can have one build run against
+ * many nals */
+#if defined(__KERNEL__)
+#define ptl_requires_iov() 1
+#else
+#define ptl_requires_iov() 0
+#endif
+
+#if defined(__KERNEL__)
+# if defined(CRAY_PORTALS)
+#  define PTLRPC_PTL_MD_IOV (PTL_MD_IOVEC | PTL_MD_PHYS)
+# else
+#  define PTLRPC_PTL_MD_IOV PTL_MD_KIOV
+# endif
+#else
+# define PTLRPC_PTL_MD_IOV PTL_MD_IOVEC
+#endif
+
+#if !defined(__KERNEL__) && defined(CRAY_PORTALS)
+#define ptl_md_max_iovs() 1
+#else
+#define ptl_md_max_iovs() 0 /* unlimited */
+#endif
+
+/* XXX hopefully we can make the iov a consistent type across portals imps */
+#if defined(__KERNEL__)
+#define ptl_iov_base(kiov) (NULL) /* this is meaningless */
+#else
+#define ptl_iov_base(iov) ((iov)->iov_base)
+#endif
+
+#ifdef __KERNEL__
+/* portals calls the callback when the event is added to the queue, so we don't
+ * care if we lose events */
+# define PTLRPC_NUM_EQ 1024
+# define PTLRPC_EQ_CALLBACK ptlrpc_master_callback
+#else 
+/* liblustre: no callback, or only when app polls event queues, so allocate a
+ * nice big event queue to ensure we don't drop any */
+# define PTLRPC_NUM_EQ 10240
+# if CRAY_PORTALS
+int cray_portals_callback(ptl_event_t *ev);
+#  define PTLRPC_EQ_CALLBACK cray_portals_callback
+# else 
+#  define PTLRPC_EQ_CALLBACK PTL_EQ_HANDLER_NONE
+# endif
+#endif
+
 /* pers.c */
-void ptlrpc_fill_bulk_md(ptl_md_t *md, struct ptlrpc_bulk_desc *desc);
-void ptlrpc_add_bulk_page(struct ptlrpc_bulk_desc *desc, struct page *page, 
-                          int pageoffset, int len);
+void pers_bulk_add_page(struct ptlrpc_bulk_desc *desc, struct page *page, 
+                        int pageoffset, int len);
 
 /* pinger.c */
 int ptlrpc_start_pinger(void);
diff --git a/lustre/ptlrpc/ptlrpc_module.c b/lustre/ptlrpc/ptlrpc_module.c
index 508aa82..caadab0 100644
--- a/lustre/ptlrpc/ptlrpc_module.c
+++ b/lustre/ptlrpc/ptlrpc_module.c
@@ -204,7 +204,6 @@ EXPORT_SYMBOL(ptlrpc_lprocfs_unregister_obd);
 
 /* llogd.c */
 EXPORT_SYMBOL(llog_origin_handle_create);
-EXPORT_SYMBOL(llog_origin_handle_prev_block);
 EXPORT_SYMBOL(llog_origin_handle_next_block);
 EXPORT_SYMBOL(llog_origin_handle_read_header);
 EXPORT_SYMBOL(llog_origin_handle_close);
diff --git a/lustre/ptlrpc/recov_thread.c b/lustre/ptlrpc/recov_thread.c
index bacc59b..3d66eae 100644
--- a/lustre/ptlrpc/recov_thread.c
+++ b/lustre/ptlrpc/recov_thread.c
@@ -133,8 +133,9 @@ EXPORT_SYMBOL(llcd_send);
  * log record for the deletion.  The commit callback calls this
  * function
  */
-int llog_obd_repl_cancel(struct llog_ctxt *ctxt, int count,
-                         struct llog_cookie *cookies, int flags, void *data)
+int llog_obd_repl_cancel(struct llog_ctxt *ctxt,
+                         struct lov_stripe_md *lsm, int count,
+                         struct llog_cookie *cookies, int flags)
 {
         struct llog_canceld_ctxt *llcd;
         int rc = 0;
@@ -203,7 +204,7 @@ int llog_obd_repl_sync(struct llog_ctxt *ctxt, struct obd_export *exp)
                 }
                 up(&ctxt->loc_sem);
         } else {
-                rc = llog_cancel(ctxt, 0, NULL, OBD_LLOG_FL_SENDNOW, NULL);
+                rc = llog_cancel(ctxt, NULL, 0, NULL, OBD_LLOG_FL_SENDNOW);
         }
 
         RETURN(rc);
@@ -231,8 +232,8 @@ static int log_commit_thread(void *arg)
         SIGNAL_MASK_UNLOCK(current, flags);
 
         spin_lock(&lcm->lcm_thread_lock);
-        THREAD_NAME(current->comm, sizeof(current->comm) - 1,
-                    "ll_log_comt_%02d", atomic_read(&lcm->lcm_thread_total));
+        THREAD_NAME(current->comm, "ll_log_commit_%d",
+                    atomic_read(&lcm->lcm_thread_total));
         atomic_inc(&lcm->lcm_thread_total);
         spin_unlock(&lcm->lcm_thread_lock);
         unlock_kernel();
@@ -590,7 +591,7 @@ int llog_repl_connect(struct llog_ctxt *ctxt, int count,
         ctxt->loc_llcd = llcd;
         up(&ctxt->loc_sem);
 
-        rc = llog_recovery_generic(ctxt, ctxt->loc_proc_cb, logid);
+        rc = llog_recovery_generic(ctxt, ctxt->llog_proc_cb, logid);
         if (rc != 0)
                 CERROR("error recovery process: %d\n", rc);
 
@@ -600,8 +601,9 @@ EXPORT_SYMBOL(llog_repl_connect);
 
 #else /* !__KERNEL__ */
 
-int llog_obd_repl_cancel(struct llog_ctxt *ctxt, int count,
-                         struct llog_cookie *cookies, int flags, void *data)
+int llog_obd_repl_cancel(struct llog_ctxt *ctxt,
+                         struct lov_stripe_md *lsm, int count,
+                         struct llog_cookie *cookies, int flags)
 {
         return 0;
 }
diff --git a/lustre/ptlrpc/recover.c b/lustre/ptlrpc/recover.c
index 14c9d60..18bc6f4 100644
--- a/lustre/ptlrpc/recover.c
+++ b/lustre/ptlrpc/recover.c
@@ -275,7 +275,8 @@ void ptlrpc_request_handle_notconn(struct ptlrpc_request *failed_req)
         /* Wait for recovery to complete and resend. If evicted, then
            this request will be errored out later.*/
         spin_lock_irqsave(&failed_req->rq_lock, flags);
-        failed_req->rq_resend = 1;
+        if (!failed_req->rq_no_resend)
+                failed_req->rq_resend = 1;
         spin_unlock_irqrestore(&failed_req->rq_lock, flags);
         
         EXIT;
@@ -285,7 +286,7 @@ void ptlrpc_request_handle_notconn(struct ptlrpc_request *failed_req)
  * This should only be called by the ioctl interface, currently
  * with the lctl deactivate and activate commands.
  */
-int ptlrpc_set_import_active(struct obd_import *imp, int active)
+int  ptlrpc_set_import_active(struct obd_import *imp, int active)
 {
         struct obd_device *obd = imp->imp_obd;
         int rc = 0;
diff --git a/lustre/ptlrpc/service.c b/lustre/ptlrpc/service.c
index 8a7474f..557d436 100644
--- a/lustre/ptlrpc/service.c
+++ b/lustre/ptlrpc/service.c
@@ -123,6 +123,9 @@ ptlrpc_save_lock (struct ptlrpc_request *req,
         struct ptlrpc_reply_state *rs = req->rq_reply_state;
         int                        idx;
 
+        if (!lock->cookie)
+                return;
+
         LASSERT (rs != NULL);
         LASSERT (rs->rs_nlocks < RS_MAX_LOCKS);
 
@@ -360,7 +363,6 @@ ptlrpc_server_handle_request (struct ptlrpc_service *svc)
         struct timeval         work_end;
         long                   timediff;
         int                    rc;
-        char                   str[PTL_NALFMT_SIZE];
         ENTRY;
 
         spin_lock_irqsave (&svc->srv_lock, flags);
@@ -399,18 +401,17 @@ ptlrpc_server_handle_request (struct ptlrpc_service *svc)
 #endif
         rc = lustre_unpack_msg (request->rq_reqmsg, request->rq_reqlen);
         if (rc != 0) {
-                CERROR ("error unpacking request: ptl %d from %s"
+                CERROR ("error unpacking request: ptl %d from "LPX64
                         " xid "LPU64"\n", svc->srv_req_portal,
-                        ptlrpc_peernid2str(&request->rq_peer, str),
-                       request->rq_xid);
+                       request->rq_peer.peer_nid, request->rq_xid);
                 goto out;
         }
 
         rc = -EINVAL;
         if (request->rq_reqmsg->type != PTL_RPC_MSG_REQUEST) {
-                CERROR("wrong packet type received (type=%u) from %s\n",
-                       request->rq_reqmsg->type,
-                       ptlrpc_peernid2str(&request->rq_peer, str));
+                CERROR("wrong packet type received (type=%u) from "
+                       LPX64"\n", request->rq_reqmsg->type,
+                       request->rq_peer.peer_nid);
                 goto out;
         }
 
@@ -420,9 +421,9 @@ ptlrpc_server_handle_request (struct ptlrpc_service *svc)
          * client's timeout is similar to mine, she'll be timing out this
          * REQ anyway (bug 1502) */
         if (timediff / 1000000 > (long)obd_timeout) {
-                CERROR("Dropping timed-out request from %s: %ld seconds old\n",
-                       ptlrpc_peernid2str(&request->rq_peer, str), 
-                       timediff / 1000000);
+                CERROR("Dropping timed-out request from "LPX64
+                       ": %ld seconds old\n",
+                       request->rq_peer.peer_nid, timediff / 1000000);
                 goto out;
         }
 
@@ -443,26 +444,26 @@ ptlrpc_server_handle_request (struct ptlrpc_service *svc)
         }
 
         CDEBUG(D_RPCTRACE, "Handling RPC pname:cluuid+ref:pid:xid:ni:nid:opc "
-               "%s:%s+%d:%d:"LPU64":%s:%s:%d\n", current->comm,
+               "%s:%s+%d:%d:"LPU64":%s:"LPX64":%d\n", current->comm,
                (request->rq_export ?
                 (char *)request->rq_export->exp_client_uuid.uuid : "0"),
                (request->rq_export ?
                 atomic_read(&request->rq_export->exp_refcount) : -99),
                request->rq_reqmsg->status, request->rq_xid,
                request->rq_peer.peer_ni->pni_name,
-               ptlrpc_peernid2str(&request->rq_peer, str),
+               request->rq_peer.peer_nid,
                request->rq_reqmsg->opc);
 
         rc = svc->srv_handler(request);
         CDEBUG(D_RPCTRACE, "Handled RPC pname:cluuid+ref:pid:xid:ni:nid:opc "
-               "%s:%s+%d:%d:"LPU64":%s:%s:%d\n", current->comm,
+               "%s:%s+%d:%d:"LPU64":%s:"LPX64":%d\n", current->comm,
                (request->rq_export ?
                 (char *)request->rq_export->exp_client_uuid.uuid : "0"),
                (request->rq_export ?
                 atomic_read(&request->rq_export->exp_refcount) : -99),
                request->rq_reqmsg->status, request->rq_xid,
                request->rq_peer.peer_ni->pni_name,
-               ptlrpc_peernid2str(&request->rq_peer, str),
+               request->rq_peer.peer_nid,
                request->rq_reqmsg->opc);
 
 put_conn:
@@ -475,9 +476,9 @@ put_conn:
         timediff = timeval_sub(&work_end, &work_start);
 
         CDEBUG((timediff / 1000000 > (long)obd_timeout) ? D_ERROR : D_HA,
-               "request "LPU64" opc %u from NID %s processed in %ldus "
+               "request "LPU64" opc %u from NID "LPX64" processed in %ldus "
                "(%ldus total)\n", request->rq_xid, request->rq_reqmsg->opc,
-               ptlrpc_peernid2str(&request->rq_peer, str),
+               request->rq_peer.peer_nid,
                timediff, timeval_sub(&work_end, &request->rq_arrival_time));
 
         if (svc->srv_stats != NULL) {
@@ -504,7 +505,6 @@ ptlrpc_server_handle_reply (struct ptlrpc_service *svc)
         struct obd_device         *obd;
         int                        nlocks;
         int                        been_handled;
-        char                       str[PTL_NALFMT_SIZE];
         ENTRY;
 
         spin_lock_irqsave (&svc->srv_lock, flags);
@@ -549,11 +549,10 @@ ptlrpc_server_handle_reply (struct ptlrpc_service *svc)
                 /* If we see this, we should already have seen the warning
                  * in mds_steal_ack_locks()  */
                 CWARN("All locks stolen from rs %p x"LPD64".t"LPD64
-                      " o%d NID %s\n",
+                      " o%d NID"LPX64"\n",
                       rs, 
                       rs->rs_xid, rs->rs_transno,
-                      rs->rs_msg.opc, 
-                      ptlrpc_peernid2str(&exp->exp_connection->c_peer, str));
+                      rs->rs_msg.opc, exp->exp_connection->c_peer.peer_nid);
         }
 
         if ((!been_handled && rs->rs_on_net) || 
@@ -667,10 +666,7 @@ static int ptlrpc_main(void *arg)
         RECALC_SIGPENDING;
         SIGNAL_MASK_UNLOCK(current, flags);
 
-        LASSERTF(strlen(data->name) < sizeof(current->comm),
-                 "name %d > len %d\n",
-                 (int)strlen(data->name), (int)sizeof(current->comm));
-        THREAD_NAME(current->comm, sizeof(current->comm) - 1, "%s", data->name);
+        THREAD_NAME(current->comm, "%s", data->name);
         unlock_kernel();
 
         /* Record that the thread is running */
@@ -680,7 +676,7 @@ static int ptlrpc_main(void *arg)
         spin_lock_irqsave(&svc->srv_lock, flags);
         svc->srv_nthreads++;
         spin_unlock_irqrestore(&svc->srv_lock, flags);
-
+        
         /* XXX maintain a list of all managed devices: insert here */
 
         while ((thread->t_flags & SVC_STOPPING) == 0 ||
@@ -688,7 +684,7 @@ static int ptlrpc_main(void *arg)
                 /* Don't exit while there are replies to be handled */
                 struct l_wait_info lwi = LWI_TIMEOUT(svc->srv_rqbd_timeout,
                                                      ptlrpc_retry_rqbds, svc);
-
+                                  
                 l_wait_event_exclusive (svc->srv_waitq,
                               ((thread->t_flags & SVC_STOPPING) != 0 &&
                                svc->srv_n_difficult_replies == 0) ||
@@ -697,7 +693,7 @@ static int ptlrpc_main(void *arg)
                               !list_empty (&svc->srv_reply_queue) ||
                               (!list_empty (&svc->srv_request_queue) &&
                                (svc->srv_n_difficult_replies == 0 ||
-                                svc->srv_n_active_reqs <
+                                svc->srv_n_active_reqs < 
                                 (svc->srv_nthreads - 1))),
                               &lwi);
 
@@ -750,7 +746,7 @@ static void ptlrpc_stop_thread(struct ptlrpc_service *svc,
         spin_lock_irqsave(&svc->srv_lock, flags);
         list_del(&thread->t_link);
         spin_unlock_irqrestore(&svc->srv_lock, flags);
-
+        
         OBD_FREE(thread, sizeof(*thread));
 }
 
@@ -761,7 +757,7 @@ void ptlrpc_stop_all_threads(struct ptlrpc_service *svc)
 
         spin_lock_irqsave(&svc->srv_lock, flags);
         while (!list_empty(&svc->srv_threads)) {
-                thread = list_entry(svc->srv_threads.next,
+                thread = list_entry(svc->srv_threads.next, 
                                     struct ptlrpc_thread, t_link);
 
                 spin_unlock_irqrestore(&svc->srv_lock, flags);
@@ -772,7 +768,6 @@ void ptlrpc_stop_all_threads(struct ptlrpc_service *svc)
         spin_unlock_irqrestore(&svc->srv_lock, flags);
 }
 
-/* @base_name should be 12 characters or less - 3 will be added on */
 int ptlrpc_start_n_threads(struct obd_device *dev, struct ptlrpc_service *svc,
                            int num_threads, char *base_name)
 {
@@ -846,8 +841,6 @@ int ptlrpc_unregister_service(struct ptlrpc_service *service)
         list_del_init (&service->srv_list);
         spin_unlock (&ptlrpc_all_services_lock);
 
-        ptlrpc_lprocfs_unregister_service(service);
-
         for (i = 0; i < ptlrpc_ninterfaces; i++) {
                 srv_ni = &service->srv_interfaces[i];
                 CDEBUG(D_NET, "%s: tearing down interface %s\n",
@@ -949,6 +942,8 @@ int ptlrpc_unregister_service(struct ptlrpc_service *service)
                 CWARN("Unexpectedly long timeout %p\n", service);
         }
 
+        ptlrpc_lprocfs_unregister_service(service);
+
         OBD_FREE(service,
                  offsetof(struct ptlrpc_service,
                           srv_interfaces[ptlrpc_ninterfaces]));
diff --git a/lustre/scripts/.cvsignore b/lustre/scripts/.cvsignore
index 9db437f..104ddf7 100644
--- a/lustre/scripts/.cvsignore
+++ b/lustre/scripts/.cvsignore
@@ -7,4 +7,3 @@ Makefile
 Makefile.in
 .deps
 TAGS
-version_tag.pl
diff --git a/lustre/scripts/Makefile.am b/lustre/scripts/Makefile.am
index 5e57916..4da183e 100644
--- a/lustre/scripts/Makefile.am
+++ b/lustre/scripts/Makefile.am
@@ -3,7 +3,7 @@
 # This code is issued under the GNU General Public License.
 # See the file COPYING in this distribution
 
-EXTRA_DIST = license-status maketags.sh lustre.spec version_tag.pl.in	\
+EXTRA_DIST = license-status maketags.sh lustre.spec version_tag.pl	\
 	$(initd_SCRIPTS) lustre.spec.in lustre-kernel-2.4.spec.in	\
 	lmake linux-merge-config.awk linux-merge-modules.awk		\
 	linux-rhconfig.h
@@ -11,3 +11,5 @@ EXTRA_DIST = license-status maketags.sh lustre.spec version_tag.pl.in	\
 initddir = $(sysconfdir)/init.d
 initd_SCRIPTS = lustre
 
+include $(top_srcdir)/Rules
+
diff --git a/lustre/scripts/collect-stats.sh b/lustre/scripts/collect-stats.sh
deleted file mode 100644
index b8c585c..0000000
--- a/lustre/scripts/collect-stats.sh
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/bin/bash
-
-die() {
-        echo $* 1>&2
-        exit 1
-}
-cleanup_lock=""
-cleanup() {
-        [ ! -z "$cleanup_lock" ] && rmdir $cleanup_lock
-}
-trap cleanup EXIT
-
-usage() {
-        echo "  -d dir  (required)"
-        echo "          Specifies the top level directory that all hosts share"
-        echo "          and collects stats under.  Each host will use a "
-        echo "          subdirectory named after its hostname."
-        echo
-        echo "          If the host directory doesn't exist, stats collection"
-        echo "          begins by clearing accumulators in /proc and launching"
-        echo "          background tasks."
-	echo
-        echo "          If the host directory exists, the script stops "
-	echo "		background processes and collects the results.  A host"
-        echo "          directory can not be reused once it has collected"
-        echo "          stats."
-        echo "  -h"
-        echo "		Shows this help message."
-        echo
-        echo "Example:"
-        echo " [on all nodes] $0 -d /tmp/collection"
-        echo " (time passes while a load is run)"
-        echo " [on all nodes] $0 -d /tmp/collection"
-        echo " tree /tmp/collection"
-        echo
-        exit
-}
-
-[ ${#*} == 0 ] && usage
-
-while getopts ":d:" opt; do
-        case $opt in
-                d) topdir=$OPTARG                 ;;
-                \?) usage
-        esac
-done
-
-if [ ! -e $topdir ]; then
-	mkdir -p $topdir || die "couldn't create dir $topdir"
-fi
-
-[ ! -d $topdir ] && die "$topdir isn't a directory"
-
-mydir="$topdir/`hostname`"
-lock="$topdir/.`hostname`-lock"
-
-mkdir $lock || "another script is working on $mydir, exiting."
-cleanup_lock="$lock"
-
-clear_files() {
-	for f in $1; do
-		[ ! -f $f ] && continue
-		echo 0 > $f
-	done
-}
-
-dump_files() {
-	dirglob=$1
-	shift
-	for d in $dirglob; do
-		[ ! -d $d ] && continue
-		log="$mydir/`basename $d`"
-		> $log
-		for f in $*; do
-			[ ! -f $d/$f ] && continue
-			echo "----------------- $f" >> $log
-			( cd $d && cat $f ) >> $log
-		done
-	done
-}
-
-# find filter dirs, sigh.
-num_filter_dirs=0
-for f in /proc/fs/lustre/obdfilter/*; do
-	[ ! -d $f ] && continue;
-	num_filter_dirs=$((num_filter_dirs + 1))
-	filter_dirs="$filter_dirs,`basename $f`"
-done
-if [ $num_filter_dirs == "1" ]; then
-	tmp=`echo $filter_dirs | sed -e 's/,//g'`
-	filter_dirs="/proc/fs/lustre/obdfilter/$tmp"
-fi
-if [ $num_filter_dirs -gt "1" ]; then
-	filter_dirs="/proc/fs/lustre/obdfilter/{$filter_dirs}"
-fi
-
-save_proc_files() {
-	cd /proc
-	for f in $*; do
-		save=`echo $f | sed -e 's@/@_@g'`
-		[ ! -f $f ] && continue
-		cat $f > $mydir/$save
-	done
-	cd -
-}
-
-launch() {
-	touch $mydir/pids
-
-	if ! which $1 > /dev/null 2>&1; then
-		return
-	fi
-
-	cd $mydir
-	$* > $1.log 2>&1 &
-	PID=$!
-	if [ $? = 0 ]; then
-		echo $PID >> pids
-		echo "launched '$*' as pid $PID"
-	else
-		echo "'$*' failed"
-		rm $1.log
-	fi
-	cd -
-}
-
-
-start_collection() {
-	echo "starting collection in $mydir"
-	mkdir $mydir || die "couldn't create dir $mydir"
-
-	echo clearing files in /proc/fs/lustre
-	clear_files '/proc/fs/lustre/osc/*MNT*/rpc_stats'
-	clear_files '/proc/fs/lustre/llite/*/read_ahead_stats'
-	[ ! -z "$filter_dirs" ] && clear_files "$filter_dirs/brw_stats"
-
-	launch vmstat 2
-	launch iostat -x 2
-
-
-	date > $mydir/started
-}
-
-
-stop_collection() {
-	pids="$mydir/pids"
-
-	[ -e $mydir/finished ] && die "$mydir already contains collected files"
-	[ ! -e $mydir/started ] && die "$mydir hasn't started collection?"
-
-	echo "collecting files for $mydir"
-	dump_files '/proc/fs/lustre/osc/*MNT*' max_dirty_mb max_pages_per_rpc \
-			max_rpcs_in_flight cur_grant_bytes rpc_stats
-	dump_files '/proc/fs/lustre/llite/*' read_ahead max_read_ahead_mb \
-		read_ahead_stats
-	[ ! -z "$filter_dirs" ] && dump_files $filter_dirs \
-				readcache_max_filesize tot_granted \
-				brw_stats
-
-	for pid in `cat $pids`; do
-		echo killing pid $pid
-		kill $pid
-	done
-	rm $pids
-
-	save_proc_files cpuinfo meminfo slabinfo
-
-	if which lspci > /dev/null 2>&1; then
-		lspci > $mydir/lspci 2>&1
-	fi
-
-	date > $mydir/finished
-	echo DONE
-}
-
-if [ -e $mydir ]; then
-	stop_collection
-else
-	start_collection
-fi
diff --git a/lustre/scripts/graph-rpcs.sh b/lustre/scripts/graph-rpcs.sh
deleted file mode 100755
index 4eb50c0..0000000
--- a/lustre/scripts/graph-rpcs.sh
+++ /dev/null
@@ -1,359 +0,0 @@
-#!/bin/bash
-
-# I'm sure this could be one cleaner perl script instead of a weird combination
-# of awk and shell.  This was the fastest path to feeding 'pl' for me. I'm
-# all for improvements.  Let me know.  -- zab
-
-die() {
-        echo $* 1>&2
-        exit 1
-}
-pct() {
-	echo "$1 "'('`echo "($1 * 100) / $2" | bc`'%)'
-}
-
-tmpdir=`mktemp -d /tmp/.tmpdirXXXXXX` || die "couldn't create tmp dir"
-cleanup() {
-        [ ${#tmpdir} == 18 ] && [ -d $tmpdir ] && rm -rf $tmpdir
-}
-trap cleanup EXIT
-
-hex2float() {
-	echo "ibase=16;scale=2;$*/FF" | bc
-}
-make_color() {
-	local md5=`echo "$*" | md5sum - | awk '{print $1}' | \
-			tr '[a-z]' '[A-Z]'`;
-	local r=`echo $md5 | cut -b 1,2`
-	local g=`echo $md5 | cut -b 3,4`
-	local b=`echo $md5 | cut -b 5,6`
-	echo "rgb(`hex2float $r`,`hex2float $g`,`hex2float $b`)"
-}
-
-rpc_name() {
-	case "$1" in
-		0) echo "OST_REPLY" ;;
-		1) echo "OST_GETATTR" ;;
-		2) echo "OST_SETATTR" ;;
-		3) echo "OST_READ" ;;
-		4) echo "OST_WRITE" ;;
-		5) echo "OST_CREATE" ;;
-		6) echo "OST_DESTROY" ;;
-		7) echo "OST_GET_INFO" ;;
-		8) echo "OST_CONNECT" ;;
-		9) echo "OST_DISCONNECT" ;;
-		10) echo "OST_PUNCH" ;;
-		11) echo "OST_OPEN" ;;
-		12) echo "OST_CLOSE" ;;
-		13) echo "OST_STATFS" ;;
-		14) echo "OST_SAN_READ" ;;
-		15) echo "OST_SAN_WRITE" ;;
-		16) echo "OST_SYNC" ;;
-		17) echo "OST_SET_INFO" ;;
-		33) echo "MDS_GETATTR" ;;
-		34) echo "MDS_GETATTR_NAME" ;;
-		35) echo "MDS_CLOSE" ;;
-		36) echo "MDS_REINT" ;;
-		37) echo "MDS_READPAGE" ;;
-		38) echo "MDS_CONNECT" ;;
-		39) echo "MDS_DISCONNECT" ;;
-		40) echo "MDS_GETSTATUS" ;;
-		41) echo "MDS_STATFS" ;;
-		42) echo "MDS_PIN" ;;
-		43) echo "MDS_UNPIN" ;;
-		44) echo "MDS_SYNC" ;;
-		45) echo "MDS_DONE_WRITING" ;;
-		101) echo "LDLM_ENQUEUE" ;;
-		102) echo "LDLM_CONVERT" ;;
-		103) echo "LDLM_CANCEL" ;;
-		104) echo "LDLM_BL_CALLBACK" ;;
-		105) echo "LDLM_CP_CALLBACK" ;;
-		106) echo "LDLM_GL_CALLBACK" ;;
-		400) echo "OBD_PING" ;;
-		401) echo "OBD_LOG_CANCEL" ;;
-
-		*) echo "unknown" ;;
-	esac
-}
-
-usage() {
-        echo "	-l file (required)"
-        echo "		Specifies a debug log that contains RPC 'Sending' and"
-        echo "		'Completed' entries generated by D_RPCTRACE."
-        echo "	-o file"
-        echo "		Usually the PostScript output is temporary and only" 
-        echo "		used for the gv instance during the script.  This"
-        echo "		option specifies a file to save the ps to."
-        echo "	-p file"
-        echo "		Usually the pl script is generated in a temporary" 
-        echo "		directoriy that is wiped as the script exits.  This"
-        echo "		saves the script as 'file' instead."
-        echo "	-x"
-        echo "		Label the tail of each RPC bar with the XID of the"
-        echo "		RPC.  This can be illegible with dense bars."
-        echo
-        echo "Example:"
-        echo " $0 -l /tmp/my-log -o out.ps && gv -landscape out.ps"
-	echo
-        exit;
-}
-
-[ ${#*} == 0 ] && usage
-
-if ! which pl > /dev/null 2>&1 ; then
-	echo "The ploticus 'pl' binary isn't in the PATH."
-	echo " ----"
-	echo " (cd /tmp && wget http://ploticus.sourceforge.net/download/pl220linux.tar.gz)"
-	echo " (mkdir ~/ploticus && cd ~/ploticus && tar -zxf /tmp/pl220linux.tar.gz)"
-	echo ' export PATH=$PATH:~/ploticus/pl220linux/bin'
-	echo " chmod +x ~/ploticus/pl220linux/bin/pl"
-	echo " ----"
-	echo "is sufficient.  There are also rpms near"
-	echo "  http://ploticus.sourceforge.net/doc/download.html"
-	exit 1;
-fi
-
-labelfield="//"
-while getopts ":l:o:p:x" opt; do
-        case $opt in
-                l) log=$OPTARG                 ;;
-                o) output=$OPTARG                 ;;
-                p) pl_save_file=$OPTARG                 ;;
-                x) labelfield="labelfield: 5"                 ;;
-                \?) usage
-        esac
-done
-
-[ -z "$log" ] && die "need to specify a log file with -l"
-[ ! -f "$log" ] && die "$log needs to be a file"
-
-pl_script="$tmpdir/ploticus.script"
-to_pl() {
-	echo "$*" >> $pl_script
-}
-
-awk_vars="$tmpdir/awk_vars"
-awk -F"[$IFS:]" '
-	BEGIN { num_xids = 0 }
-	($11 == "Sending") { 
-		tvtime = $4
-		pname = $20
-		xid = $23
-		# sometimes the nid has our seperators
-		# in it, so we hope the last field is the op code
-		opc = $NF
-
-		# the y position of the rpc bar in the graph is determined
-		# by the category which we use the process name for.  when
-		# a process has multiple rpcs concurrently we generate
-		# seperate categories by appending ___slot to the name
-		# and then hide these slot categories in the graph.
- 
-		# find the next slot that is empty
-		for (slot = 0; (pname, slot) in pname_slots; slot++) {
-			;
-		}
-
-		pname_slots[pname, slot] = xid
-		xid_slot[xid] = slot
-
-		if (slot == 0) {
-			xid_pname[xid] = pname
-		} else {
-			xid_pname[xid] = pname "_____" slot
-		}
-		xid_start[xid] = tvtime
-		xid_opcode[xid] = opc
-		xids[num_xids] = xid
-		num_xids = num_xids + 1
-		opcodes[opc] = 1
-
-
-		if (initialized != 1) {
-			min = tvtime
-			max = tvtime
-			first_xid = xid
-			last_xid = xid
-			initialized = 1
-			
-		}
-		if (tvtime < min) {
-			min = tvtime
-			first_xid = xid
-		}
-		if (tvtime > max) {
-			max = tvtime
-			last_xid = xid
-		}
-	}
-	($11 == "Completed") { 
-		tvtime = $4
-		pname = $20
-		xid = $23
-		opc = $NF
-
-
-		total_rpcs++;
-		rpc_count[opc]++;
-
-		xid_stop[xid] = tvtime
-		this_time = xid_stop[xid] - xid_start[xid]
-		total_rpc_time = total_rpc_time + this_time;
-		rpc_total_time[opc] = rpc_total_time[opc] + this_time
-
-		slot = xid_slot[xid]
-		delete xid_slot[xid]
-		delete pname_slots[pname, slot]
-	}
-	END {
-		for (ind = 0; ind < num_xids; ind++) {
-			xid = xids[ind]
-			print xid_pname[xid], xid_start[xid] - min, \
-				xid_stop[xid] - min, xid_opcode[xid], xid \
-					>> "'$tmpdir/data'"
-		}
-		print "FIRST_XID=" first_xid >> "'$awk_vars'"
-		print "LAST_XID=" last_xid >> "'$awk_vars'"
-		print "MIN=" 0.0 >> "'$awk_vars'"
-		print "TOTAL_RPCS=" total_rpcs >> "'$awk_vars'"
-		print "TOTAL_RPC_TIME=" total_rpc_time >> "'$awk_vars'"
-		print "MAX=" max - min >> "'$awk_vars'"
-
-		for (op in opcodes) {
-			all_opcodes = all_opcodes " " op
-			print "rpc_total_time[" op "]=\"" \
-				rpc_total_time[op] "\"" \
-					>> "'$awk_vars'"
-			print "rpc_count[" op "]=\"" \
-				rpc_count[op] "\"" \
-					>> "'$awk_vars'"
-		}
-		print "OP_CODES=\"" all_opcodes "\"" >> "'$awk_vars'"
-		print "NUM_OP_CODES=" asort(opcodes) >> "'$awk_vars'"
-	}
-	' $log || die "awk failed"
-
-. $awk_vars
-
-[ ! -e $tmpdir/data ] && die "no RPCS found in $log"
-
-to_pl 	'#proc getdata
-	data:'
-
-# it seems neccesary to batch by category, sadly.
-sort -n $tmpdir/data >> $pl_script || die "sorting failed"
-# jeez. without another newline at the end pl doesn't read the last data row.
-echo >> $pl_script
-
-legend_index=0
-legend_pane=0
-ops_per_pane=$(((NUM_OP_CODES  + 2)/ 3))
-
-i=0
-for op in $OP_CODES; do
-	name=`rpc_name $op`
-	[ $name == "unknown" ] && die "unknown op code $op"
-
-	label="$name "`pct ${rpc_count[$op]} $TOTAL_RPCS`
-	label="$label, "`pct ${rpc_total_time[$op]} $TOTAL_RPC_TIME`
-
-	# this "tag:" is also included in the data and is used by the
-	# bar plot to define the color of the bar
-	#  http://ploticus.sourceforge.net/doc/bars.html
-	#  http://ploticus.sourceforge.net/doc/legendentry.html#legenddriven
-	to_pl "#proc legendentry
-		sampletype: color
-		label: $label
-		details: `make_color $name`
-		tag: $op"
-
-	# ploticus makes you construct seperage legends stacked next to each
-	# other if you want to have a legend with multiple rows _and_ multiple
-	# columns.
-	#	http://ploticus.sourceforge.net/doc/legend.html
-	#	http://ploticus.sourceforge.net/gallery/propbars1.htm
-	# we put each op code in part of a legend pane and then emit them
-	# all later on at the end of the script
-	if [ $legend_index == 0 ]; then
-		# XXX this should be standard
-		loc="min+$(($legend_pane * 3)) min-.5"
-#		loc="$loc min-"`echo "($ops_per_pane * .3)" | bc`
-
-		leg=" $leg
-
-			#proc legend
-				location: $loc"
-
-		# all but the last get noclear
-		if [ $legend_pane != 2 ]; then
-			leg="$leg
-				noclear: yes"
-		fi
-		leg="$leg
-				specifyorder: $name"
-	else
-		leg="$leg
-						$name"
-	fi
-
-	legend_index=$(($legend_index + 1))
-	if [ $legend_index == $ops_per_pane ]; then
-		legend_index=0
-		legend_pane=$(($legend_pane + 1))
-	fi
-
-	i=$(($i + 1))
-done
-
-to_pl	"
-#proc areadef
-	rectangle: 1 2 9.5 8
-	xautorange datafields=2,3
-	   xrange:    $MIN $MAX
-	yscaletype: categories
-	ycategories: datafield 1
-	title: $TOTAL_RPCS RPCs found in \"$log\"
-	titledetails: align=C
-
-#proc yaxis
-	stubs: categories
-	grid: color=gray(0.9)
-	labeldistance: 1
-	label: Process name
-	stubomit: *_____*
- 
-#proc xaxis
-	stubs: inc
-	stubformat: %.3f
-	grid: color=gray(0.9)
-	label: Elapsed seconds
-                                                                                
-#proc bars
-	axis: x
-	locfield: 1
-	segmentfields: 2 3
-	barwidth: 0.06
-	outline: no
-	$labelfield
-// see the legendentry generation above
-	colorfield 4
-
-$leg"
-
-if [ ! -z "$pl_save_file" ]; then
-	mv $pl_script $pl_save_file || \
-		die "couldn't save pl script as $pl_save_file"
-	pl_script="$pl_save_file"
-fi
-
-# pl is very excited about not doing dynamic allocation.
-NURR=$((TOTAL_RPCS * 10))
-
-pl -maxproclines $NURR -maxfields $NURR -landscape -ps $pl_script \
-	-o $tmpdir/ps || die "pl failed"
-
-if [ -z "$output" ]; then
-	gv -landscape $tmpdir/ps || die "couldn't start gv"
-else
-	mv $tmpdir/ps $output || die "couldn't save ps output as $output"
-fi
diff --git a/lustre/scripts/land1.sh b/lustre/scripts/land1.sh
index c3a0468..16f6b20 100755
--- a/lustre/scripts/land1.sh
+++ b/lustre/scripts/land1.sh
@@ -36,7 +36,7 @@ case $child in
   *) child="b_$child"
 esac
 
-if [ "$parent" != "HEAD" -a "`cat CVS/Tag 2> /dev/null`" != "T$parent" ]; then
+if [ "$parent" != "HEAD" -a "`cat CVS/Tag`" != "T$parent" ]; then
         echo "This script must be run within the $parent branch"
 	exit 1
 fi
diff --git a/lustre/scripts/lbuild b/lustre/scripts/lbuild
index 8f59969..2c76308 100755
--- a/lustre/scripts/lbuild
+++ b/lustre/scripts/lbuild
@@ -29,9 +29,6 @@ UP_ARCHS=
 
 DATE=$(date)
 
-USE_DATESTAMP=1
-RPMBUILD=
-
 cleanup()
 {
     true
@@ -114,11 +111,6 @@ Usage: ${0##*/} [OPTION]... [-- <lustre configure options>]
     Also note that by using a non-"base" arch (eg, i386) only kernels
     will be built - there will be no lustre-lite-utils package.
 
-  --disable-datestamp
-    Prevents the datestamp flag (-D) from being passed to cvs for 
-    checkouts. This is a workaround for a problem encountered when 
-    using lbuild with tinderbox.
-
 EOF
 
 #   list_targets
@@ -155,14 +147,6 @@ check_options()
 #    TARGET_FILE="$TOPDIR/kernel_patches/targets/$TARGET.target"
 #    [ -r "$TARGET_FILE" ] || \
 #	usage 1 "Target '$TARGET' was not found."
-
-    RPMBUILD=$(which rpmbuild 2>/dev/null | head -1)
-    if [ ! "$RPMBUILD" -o "$RPMBUILD" == "" ]; then
-	RPMBUILD=$(which rpm 2>/dev/null | head -1)
-	if [ ! "$RPMBUILD" -o "$RPMBUILD" == "" ]; then
-	    usage 1 "Could not find binary for making rpms (tried rpmbuild and rpm)."
-	fi
-    fi
 }
 
 uniqify()
@@ -250,13 +234,7 @@ unpack_lustre()
 	untar "$LUSTRE"
 	[ -d lustre ] || ln -sf lustre* lustre
     else
-	if [ "$USE_DATESTAMP" ]; then
-	    DATESTAMP="-D '$DATE'"
-	else
-	    DATESTAMP=""
-	fi	    
-
-	cvs -d "$CVSROOT" -qz3 co $DATESTAMP -r "$TAG" -d "$DIRNAME" lustre || \
+	cvs -d "$CVSROOT" -qz3 co -D "$DATE" "-r$TAG" -d "$DIRNAME" lustre || \
 	    fatal 1 "There was an error checking out Lustre from CVS."
 	echo "Creating lustre tarball..."
 	tar zcf "$DIRNAME.tar.gz" "$DIRNAME" \
@@ -292,7 +270,6 @@ patch_linux()
     popd >/dev/null
     echo "Full patch has been saved in ${FULL_PATCH##*/}."
     echo "Replacing .config files..."
-    [ -d linux/configs ] || mkdir linux/configs
     rm -f linux/configs/*
     cp -v lustre/kernel_patches/kernel_configs/kernel-${VERSION}-${TARGET}*.config linux/configs/
 }
@@ -324,7 +301,7 @@ prep_build()
 	-e "s/@KERNEL_SOURCE@/$KERNEL/g" \
 	-e "s/@LUSTRE_SOURCE@/${LUSTRE##*/}/g" \
 	-e "s/@LUSTRE_TARGET@/$TARGET/g" \
-	-e "s#@CONFIGURE_FLAGS@#$CONFIGURE_FLAGS#g" \
+	-e "s/@CONFIGURE_FLAGS@/$CONFIGURE_FLAGS/g" \
 	-e "s/@BASE_ARCHS@/$BASE_ARCHS/g" \
 	-e "s/@BIGMEM_ARCHS@/$BIGMEM_ARCHS/g" \
 	-e "s/@BOOT_ARCHS@/$BOOT_ARCHS/g" \
@@ -360,11 +337,11 @@ build()
 	targets="--target $arch $targets"
     done
 
-    $RPMBUILD $targets -bb lustre-kernel-2.4.spec \
+    rpmbuild $targets -bb lustre-kernel-2.4.spec \
 	--define "_topdir $TOPDIR" || \
 	fatal 1 "Error building rpms for $arch."
 
-    (( $DO_SRC )) && $RPMBUILD -bs lustre-kernel-2.4.spec \
+    (( $DO_SRC )) && rpmbuild -bs lustre-kernel-2.4.spec \
 	--define "_topdir $TOPDIR" || \
 	fatal 1 "Error building .src.rpm."
 }
@@ -376,7 +353,7 @@ publish()
 
 [ -r ~/.lbuildrc ] && . ~/.lbuildrc
 
-options=$(getopt -o d:D:h -l extraversion:,kerneldir:,lustre:,nosrc,publish,release,tag:,target:,target-archs:,disable-datestamp -- "$@")
+options=$(getopt -o d:D:h -l extraversion:,kerneldir:,lustre:,nosrc,publish,release,tag:,target:,target-archs: -- "$@")
 
 eval set -- "$options"
     
@@ -432,10 +409,6 @@ while [ "$1" ] ; do
 	    TARGET_ARCHS=$2
 	    shift 2
 	    ;;
-	--disable-datestamp)
-	    USE_DATESTAMP=
-	    shift
-	    ;;
 	--)
 	    shift
 	    CONFIGURE_FLAGS=$@
diff --git a/lustre/scripts/lmake b/lustre/scripts/lmake
index 9f92230..a79f89b 100755
--- a/lustre/scripts/lmake
+++ b/lustre/scripts/lmake
@@ -275,34 +275,20 @@ patch_kernel()
     popd >/dev/null
 }
 
-set_make()
-{
-    MAKE="make -s CC=$CC"
-    if [ "$ARCH" ] ; then
-	MAKE="$MAKE ARCH=$ARCH"
-    fi
-    MAKE_J="$MAKE -j $JOBS"
-}
-
 depend_kernel()
 {
     (( $DEPEND_KERNEL )) || return 0
     # we need to override $CC at make time, since there is no
     # configure
-    set_make
+    MAKE="make -s CC=$CC"
     pushd "$TOPDIR/linux" >/dev/null
     echo "Overriding EXTRAVERSION in kernel..."
     perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -${EXTRA_VERSION}${TARGET_CONFIG}/" Makefile
     echo "Making depend in $PWD..."
     $MAKE mrproper || fatal 1 "Error running make mrproper"
     cp "$CONFIG_FILE" .config
-    if grep -q oldconfig_nonint Makefile ; then
-	OLDCONFIG='oldconfig_nonint'
-    else
-	OLDCONFIG='oldconfig'
-    fi
-    $MAKE $OLDCONFIG || fatal 1 "Error running make oldconfig"
-    $MAKE_J dep || fatal 1 "Error running make dep"
+    $MAKE oldconfig_nonint || fatal 1 "Error running make oldconfig"
+    $MAKE -j $JOBS dep || fatal 1 "Error running make dep"
     $MAKE include/linux/version.h || fatal 1 "Error making include/linux/version.h"
 }
 
@@ -311,17 +297,17 @@ build_kernel()
     (( $BUILD_KERNEL )) || return 0
     # we need to override $CC at make time, since there is no
     # configure
-    set_make
+    MAKE="make -s CC=$CC"
     echo "Building kernel in $PWD..."
     case "$TARGET_ARCH" in
 	i386 | i586 | i686 | athlon | x86_64)
-	    $MAKE_J bzImage || fatal 1 "Error making bzImage."
+	    $MAKE -j $JOBS -s bzImage || fatal 1 "Error making bzImage."
 	    ;;
 	*)
-	    $MAKE_J boot || fatal 1 "Error making boot."
+	    $MAKE -j $JOBS -s boot || fatal 1 "Error making boot."
 	    ;;
     esac
-    $MAKE_J modules || fatal 1 "Error building modules."
+    $MAKE -j $JOBS -s modules || fatal 1 "Error building modules."
 
     popd >/dev/null
 }
@@ -340,9 +326,8 @@ configure_lustre()
 build_lustre()
 {
     (( $BUILD_LUSTRE )) || return 0
-    set_make
     pushd "$TOPDIR" >/dev/null
-    $MAKE_J || fatal 1 "Error building Lustre."
+    make -j $JOBS -s || fatal 1 "Error building Lustre."
     popd >/dev/null
 }
 
diff --git a/lustre/scripts/lustre-kernel-2.4.spec.in b/lustre/scripts/lustre-kernel-2.4.spec.in
index 9ae6368..0ff57ea 100644
--- a/lustre/scripts/lustre-kernel-2.4.spec.in
+++ b/lustre/scripts/lustre-kernel-2.4.spec.in
@@ -105,11 +105,8 @@ Second, per-architecture exclusions (ifarch)
 
 %{expand: %%define kernel_conflicts  ppp <= 2.3.15, pcmcia-cs <= 3.1.20, isdn4k-utils <= 3.0, mount < 2.10r-5, nfs-utils < 0.3.1, cipe < 1.4.5, tux < 2.1.0, kudzu <= 0.92, e2fsprogs < 1.22, initscripts < 5.84, dev < 3.2-7, iptables < 1.2.5-3, bcm5820 < 1.81, nvidia-rh72 <= 1.0, oprofile < 0.4}
 
-%if %{rhbuild}
 %define BOOT_kernel_prereq fileutils, modutils >=  2.4.18
 %define kernel_prereq %{BOOT_kernel_prereq}, initscripts >= 5.83, mkinitrd >= 3.2.6
-%endif
-
 %ifarch ia64
 %define initrd_dir /boot/efi/redhat
 %else
@@ -142,13 +139,11 @@ BuildConflicts: rhbuildsys(DiscFree) < 500Mb
 Provides: kernel-drm = 4.1.0, kernel-drm = 4.2.0, kernel-drm = 4.3.0, kernel-drm = 4.2.99.3
 %endif
 Autoreqprov: no
-%if %{rhbuild}
 Prereq: %{kernel_prereq}
 Conflicts: %{kernel_conflicts}
 
 BuildPreReq: patch >= 2.5.4, bash >= 2.03, sh-utils, gnupg, tar
 BuildPreReq: bzip2, findutils, dev, gzip, m4
-%endif
 
 Vendor: Cluster File Systems, Inc.
 URL: http://www.kernel.org/
@@ -200,10 +195,8 @@ Provides: module-info, kernel = %{version}
 %ifarch %{all_x86} ia64 x86_64
 Provides: kernel-drm = 4.1.0, kernel-drm = 4.2.0, kernel-drm = 4.3.0, kernel-drm = 4.2.99.3
 %endif
-%if %{rhbuild}
 Prereq: %{kernel_prereq}
 Conflicts: %{kernel_conflicts}
-%endif
 
 %description smp
 This package includes a SMP version of the Linux kernel. It is
@@ -219,11 +212,9 @@ Provides: module-info, kernel = %{version}
 %ifarch %{all_x86} ia64 x86_64
 Provides: kernel-drm = 4.1.0, kernel-drm = 4.2.0, kernel-drm = 4.3.0, kernel-drm = 4.2.99.3
 %endif
-%if %{rhbuild}
 Prereq: %{kernel_prereq}
 Conflicts: %{kernel_conflicts}
 Obsoletes: kernel-enterprise <= 2.4.10
-%endif
 
 %description bigmem
 This package includes a kernel that has appropriate configuration options
@@ -233,10 +224,8 @@ enabled for Pentium III machines with 4 Gigabyte of memory or more.
 Summary: The version of the Linux kernel used on installation boot disks.
 Group: System Environment/Kernel
 Provides: kernel = %{version}
-%if %{rhbuild}
 Prereq: %{BOOT_kernel_prereq}
 Conflicts: %{kernel_conflicts}
-%endif
 
 %description BOOT
 This package includes a trimmed down version of the Linux kernel.
@@ -248,10 +237,8 @@ turned off because of the size constraints.
 Summary: The Linux kernel used on installation boot disks for SMP machines.
 Group: System Environment/Kernel
 Provides: kernel = %{version}
-%if %{rhbuild}
 Prereq: %{BOOT_kernel_prereq}
 Conflicts: %{kernel_conflicts}
-%endif
 
 %description BOOTsmp
 This package includes a trimmed down version of the Linux kernel. This
@@ -264,10 +251,8 @@ machines that have trouble coming up to life with the uniprocessor kernel.
 Summary: The Linux Kernel compiled for the Alpha Jensen platform.
 Group: System Environment/Kernel
 Provides: kernel = %{version}
-%if %{rhbuild}
 Prereq: %{kernel_prereq}
 Conflicts: %{kernel_conflicts}
-%endif
 
 %description jensen
 This package includes a kernel that has appropriate configuration
@@ -447,12 +432,7 @@ make -s mrproper -C $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}
 rm -rf $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}/configs/*
 cp ../kernel_patches/kernel_configs/kernel-%{kversion}-@LUSTRE_TARGET@*.config $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}/configs
 cp ../kernel_patches/kernel_configs/kernel-%{kversion}-@LUSTRE_TARGET@-%{_target_cpu}%{dashtargetboard}.config $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}/.config
-if grep -q oldconfig_nonint $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}/Makefile ; then
-	OLDCONFIG='oldconfig_nonint'
-else
-	OLDCONFIG='oldconfig'
-fi
-make -s $OLDCONFIG -C $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}
+make -s oldconfig_nonint -C $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}
 make -s symlinks -C $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}
 make -s include/linux/version.h -C $RPM_BUILD_ROOT/usr/src/linux-%{KVERREL}
 
@@ -805,10 +785,10 @@ exit 0
 %defattr(-, root, root)
 %doc lustre/COPYING lustre/BUGS lustre/ChangeLog lustre/README lustre/doc/lustre.pdf
 /sbin/*
-/usr/sbin/*
-/usr/bin/*
-/usr/lib/lustre/python
-/etc/init.d/lustre
+%{_sbindir}/*
+%{_bindir}/*
+%{_libdir}/lustre/python
+%{_sysconfdir}/init.d/lustre
 /usr/include/lustre
 /lib/lib*.a
 
diff --git a/lustre/scripts/lustre.spec.in b/lustre/scripts/lustre.spec.in
index 329ef4c..a1a5e49 100644
--- a/lustre/scripts/lustre.spec.in
+++ b/lustre/scripts/lustre.spec.in
@@ -1,5 +1,5 @@
 # lustre.spec
-%define version @VERSION@
+%define version HEAD
 %define kversion @LINUXRELEASE@
 %define linuxdir @LINUX@
 %define enable_doc @ENABLE_DOC@
@@ -72,7 +72,7 @@ rm -rf $RPM_BUILD_ROOT
 
 # Set an explicit path to our Linux tree, if we can.
 cd $RPM_BUILD_DIR/lustre-%{version}
-./configure --with-linux='%{linuxdir}' %{disable_doc} --disable-liblustre
+./configure --with-linux='%{linuxdir}' %{disable_doc}
 make
 
 %install
diff --git a/lustre/scripts/merge1.sh b/lustre/scripts/merge1.sh
index ac074d7..9bdc9b5 100755
--- a/lustre/scripts/merge1.sh
+++ b/lustre/scripts/merge1.sh
@@ -36,7 +36,7 @@ case $child in
   *) child="b_$child"
 esac
 
-if [ "$child" != "HEAD" -a "`cat CVS/Tag 2> /dev/null`" != "T$child" ]; then
+if [ "$child" != "HEAD" -a "`cat CVS/Tag`" != "T$child" ]; then
 	echo "This script must be run within the $child branch"
 	exit 1
 fi
@@ -59,12 +59,9 @@ echo "done"
 echo -n "tagging $child as '${PARENT}_${CHILD}_UPDATE_CHILD_$date' ...."
 $CVS rtag -r $child ${PARENT}_${CHILD}_UPDATE_CHILD_$date $module
 echo "done"
-
-# Apply all of the changes to your local tree:
 echo "Updating: -j ${CHILD}_BASE -j ${PARENT}_${CHILD}_UPDATE_PARENT_$date ...."
 $CVS update -j ${CHILD}_BASE -j ${PARENT}_${CHILD}_UPDATE_PARENT_$date -dP
 echo "done"
-
 echo -n "Recording conflicts in $CONFLICTS ..."
 if $CVS update | grep '^C' > $CONFLICTS; then
     echo "Conflicts found, fix before committing."
@@ -73,6 +70,4 @@ else
     echo "No conflicts found"
     rm -f $CONFLICTS
 fi
-echo "done"
-
 echo "Test, commit and then run merge2.sh (no arguments)"
diff --git a/lustre/scripts/version_tag.pl.in b/lustre/scripts/version_tag.pl
similarity index 94%
rename from lustre/scripts/version_tag.pl.in
rename to lustre/scripts/version_tag.pl
index 0e31be6..334d2d6 100644
--- a/lustre/scripts/version_tag.pl.in
+++ b/lustre/scripts/version_tag.pl
@@ -18,7 +18,7 @@ sub get_tag()
     my $tagfile = new IO::File;
     if (!$tagfile->open("CVS/Tag")) {
         my $verfile = new IO::File;
-        if (!$verfile->open("include/config.h")) {
+        if (!$verfile->open("portals/include/config.h")) {
           return "UNKNOWN";
         }
         while(defined($line = <$verfile>)) {
@@ -175,17 +175,13 @@ if ($ARGV[0]) {
 my $tag = get_tag();
 my $mtime = get_latest_mtime();
 
-# for get_linuxdir you need to be in builddir
+# for get_linuxdir you need to be in builddir 
 
-#if ($ARGV[1]) {
-#   chdir($cwd);
-#   chdir($ARGV[1]);
-#}
-#my $linuxdir = get_linuxdir();
-
-my $linuxdir = '@LINUX@';
-$linuxdir =~ s/\//\./g;
-$kernver = '@LINUXRELEASE@';
+if ($ARGV[1]) {
+   chdir($cwd);
+   chdir($ARGV[1]);
+}
+my $linuxdir = get_linuxdir();
 
 generate_ver($tag, $mtime, $linuxdir);
 
diff --git a/lustre/smfs/.cvsignore b/lustre/smfs/.cvsignore
index e31a39b..49c6100 100644
--- a/lustre/smfs/.cvsignore
+++ b/lustre/smfs/.cvsignore
@@ -3,12 +3,7 @@ config.log
 config.status
 configure
 Makefile
+Makefile.in
 .deps
 TAGS
 .*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
diff --git a/lustre/smfs/Makefile.am b/lustre/smfs/Makefile.am
new file mode 100644
index 0000000..529d029
--- /dev/null
+++ b/lustre/smfs/Makefile.am
@@ -0,0 +1,16 @@
+# Copyright (C) 2001  Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+
+DEFS= 
+
+MODULE = smfs
+modulefs_DATA = smfs.o
+EXTRA_PROGRAMS = smfs
+
+smfs_SOURCES = super.c options.c inode.c cache.c dir.c sysctl.c file.c 
+smfs_SOURCES += symlink.c sm_fs.c kml.c reint.c journal.c journal_ext3.c
+smfs_SOURCES += smfs_llog.c
+include $(top_srcdir)/Rules
diff --git a/lustre/smfs/Makefile.in b/lustre/smfs/Makefile.in
deleted file mode 100644
index e23f03b..0000000
--- a/lustre/smfs/Makefile.in
+++ /dev/null
@@ -1,5 +0,0 @@
-MODULES := smfs
-smfs-objs := super.o options.o inode.o cache.o cache_space.o dir.o ioctl.o
-smfs-objs += sysctl.o file.o symlink.o sm_fs.o kml.o journal.o smfs_llog.o
-
-@INCLUDE_RULES@
diff --git a/lustre/smfs/autoMakefile.am b/lustre/smfs/autoMakefile.am
deleted file mode 100644
index 952cfa7..0000000
--- a/lustre/smfs/autoMakefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (C) 2001  Cluster File Systems, Inc.
-#
-# This code is issued under the GNU General Public License.
-# See the file COPYING in this distribution
-
-if SMFS
-modulefs_DATA = smfs$(KMODEXT)
-endif
-
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-DIST_SOURCES = $(smfs-objs:%.o=%.c) smfs_internal.h
diff --git a/lustre/smfs/cache.c b/lustre/smfs/cache.c
index f68a1a8..d94a0cb 100644
--- a/lustre/smfs/cache.c
+++ b/lustre/smfs/cache.c
@@ -1,23 +1,5 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
- *  Copyright (C) 2004 Cluster File Systems, Inc.
- *
- *   This file is part of Lustre, http://www.lustre.org.
- *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
- *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
+/*  
+ *  snapfs/cache.c
  */
 
 #define DEBUG_SUBSYSTEM S_SM
@@ -29,333 +11,378 @@
 #include <linux/string.h>
 #include <linux/lustre_idl.h>
 #include <portals/list.h>
-#include <linux/obd_class.h>
-#include <linux/obd_support.h>
-#include <linux/lustre_lib.h>
-#include <linux/lustre_smfs.h>
 
-#include "smfs_internal.h"
-int smfs_init_sm_ops(struct smfs_super_info *smb)
-{
-        struct sm_operations    *sm_ops;   /*cache ops for set cache inode ops*/
+#include "smfs_internal.h" 
+struct sm_ops smfs_operations;
+ 
+extern struct inode_operations smfs_file_iops;
+extern struct file_operations  smfs_file_fops;
+extern struct inode_operations smfs_sym_iops; 
+extern struct file_operations smfs_sym_fops;
+extern struct super_operations smfs_super_ops;
+extern struct journal_operations smfs_journal_ops;
 
-        OBD_ALLOC(sm_ops, sizeof(struct sm_operations));
-        if (!sm_ops)
-                RETURN(-ENOMEM);
 
-        smb->sm_ops = sm_ops;
-        RETURN(0);
+inline struct super_operations *cache_sops(struct sm_ops *smfs_ops)
+{
+	return &smfs_ops->sm_sb_ops;
 }
 
-void smfs_cleanup_sm_ops(struct smfs_super_info *smb)
+inline struct inode_operations *cache_diops(struct sm_ops *smfs_ops)
 {
-        if (smb->sm_ops)
-                OBD_FREE(smb->sm_ops, sizeof(struct sm_operations));
+	return &smfs_ops->sm_dir_iops;
 }
 
-static void setup_iops(struct inode *cache_inode,
-                       struct inode_operations *iops,
-                       struct inode_operations *cache_iops)
+inline struct inode_operations *cache_fiops(struct sm_ops *smfs_ops)
 {
-
-        if (cache_inode->i_op && cache_iops && iops) {
-                if (cache_inode->i_op->create)
-                        iops->create = cache_iops->create;
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-                if (cache_inode->i_op->create_it)
-                        iops->create_it = cache_iops->create_it;
-#endif
-                if (cache_inode->i_op->lookup)
-                        iops->lookup = cache_iops->lookup;
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-                if (cache_inode->i_op->lookup_raw)
-                        iops->lookup_raw = cache_iops->lookup_raw;
-                if (cache_inode->i_op->lookup_it)
-                        iops->lookup_it = cache_iops->lookup_it;
-#endif
-                if (cache_inode->i_op->link)
-                        iops->link = cache_iops->link;
-                if (cache_inode->i_op->link_raw)
-                        iops->link_raw = cache_iops->link_raw;
-                if (cache_inode->i_op->unlink)
-                        iops->unlink = cache_iops->unlink;
-                if (cache_inode->i_op->unlink_raw)
-                        iops->unlink_raw = cache_iops->unlink_raw;
-                if (cache_inode->i_op->symlink)
-                        iops->symlink = cache_iops->symlink;
-                if (cache_inode->i_op->symlink_raw)
-                        iops->symlink_raw = cache_iops->symlink_raw;
-                if (cache_inode->i_op->mkdir)
-                        iops->mkdir = cache_iops->mkdir;
-                if (cache_inode->i_op->mkdir_raw)
-                        iops->mkdir_raw = cache_iops->mkdir_raw;
-                if (cache_inode->i_op->rmdir)
-                        iops->rmdir = cache_iops->rmdir;
-                if (cache_inode->i_op->rmdir_raw)
-                        iops->rmdir_raw = cache_iops->rmdir_raw;
-                if (cache_inode->i_op->mknod)
-                        iops->mknod = cache_iops->mknod;
-                if (cache_inode->i_op->mknod_raw)
-                        iops->mknod_raw = cache_iops->mknod_raw;
-                if (cache_inode->i_op->rename)
-                        iops->rename = cache_iops->rename;
-                if (cache_inode->i_op->rename_raw)
-                        iops->rename_raw = cache_iops->rename_raw;
-                if (cache_inode->i_op->readlink)
-                        iops->readlink = cache_iops->readlink;
-                if (cache_inode->i_op->follow_link)
-                        iops->follow_link = cache_iops->follow_link;
-                if (cache_inode->i_op->truncate)
-                        iops->truncate = cache_iops->truncate;
-                if (cache_inode->i_op->permission)
-                        iops->permission = cache_iops->permission;
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-                if (cache_inode->i_op->revalidate)
-                        iops->revalidate = cache_iops->revalidate;
-                if (cache_inode->i_op->revalidate_it)
-                        iops->revalidate_it = cache_iops->revalidate_it;
-#endif
-                if (cache_inode->i_op->setattr)
-                        iops->setattr = cache_iops->setattr;
-                if (cache_inode->i_op->setattr_raw)
-                        iops->setattr_raw = cache_iops->setattr_raw;
-                if (cache_inode->i_op->getattr)
-                        iops->getattr = cache_iops->getattr;
-                if (cache_inode->i_op->setxattr)
-                        iops->setxattr = cache_iops->setxattr;
-                if (cache_inode->i_op->getxattr)
-                        iops->getxattr = cache_iops->getxattr;
-                if (cache_inode->i_op->listxattr)
-                        iops->listxattr = cache_iops->listxattr;
-                if (cache_inode->i_op->removexattr)
-                        iops->removexattr = cache_iops->removexattr;
-        }
+	return &smfs_ops->sm_file_iops;
 }
 
-static void setup_fops(struct inode *cache_inode,
-                       struct file_operations *fops,
-                       struct file_operations *cache_fops)
+inline struct inode_operations *cache_siops(struct sm_ops *smfs_ops)
 {
-        if (cache_inode->i_fop && cache_fops && fops) {
-                if (cache_inode->i_fop->llseek)
-                        fops->llseek = cache_fops->llseek;
-                if (cache_inode->i_fop->read)
-                        fops->read = cache_fops->read;
-                if (cache_inode->i_fop->write)
-                        fops->write = cache_fops->write;
-                if (cache_inode->i_fop->readdir)
-                        fops->readdir = cache_fops->readdir;
-                if (cache_inode->i_fop->poll)
-                        fops->poll = cache_fops->poll;
-                if (cache_inode->i_fop->ioctl)
-                        fops->ioctl = cache_fops->ioctl;
-                if (cache_inode->i_fop->mmap)
-                        fops->mmap = cache_fops->mmap;
-//                if (cache_inode->i_fop->open)
-                        fops->open = cache_fops->open;
-                if (cache_inode->i_fop->flush)
-                        fops->flush = cache_fops->flush;
-        //        if (cache_inode->i_fop->release)
-                        fops->release = cache_fops->release;
-                if (cache_inode->i_fop->fsync)
-                        fops->fsync = cache_fops->fsync;
-                if (cache_inode->i_fop->fasync)
-                        fops->fasync = cache_fops->fasync;
-                if (cache_inode->i_fop->lock)
-                        fops->lock = cache_fops->lock;
-                if (cache_inode->i_fop->readv)
-                        fops->readv = cache_fops->readv;
-                if (cache_inode->i_fop->writev)
-                        fops->writev = cache_fops->writev;
-                if (cache_inode->i_fop->sendpage)
-                        fops->sendpage = cache_fops->sendpage;
-                if (cache_inode->i_fop->get_unmapped_area)
-                        fops->get_unmapped_area = cache_fops->get_unmapped_area;
-        }
+	return &smfs_ops->sm_sym_iops;
 }
 
-static void setup_sm_file_ops(struct inode *cache_inode,
-                              struct inode *inode,
-                              struct inode_operations *cache_iops,
-                              struct file_operations *cache_fops)
+inline struct file_operations *cache_dfops(struct sm_ops *smfs_ops) 
 {
-        struct smfs_super_info *smb;
-        struct inode_operations *iops;
-        struct file_operations *fops;
-
-        smb = S2SMI(inode->i_sb);
+	return &smfs_ops->sm_dir_fops;
+}
 
-        if (smb->ops_check & FILE_OPS_CHECK)
-                return;
-        smb->ops_check |= FILE_OPS_CHECK;
+inline struct file_operations *cache_ffops(struct sm_ops *smfs_ops)
+{
+	return &smfs_ops->sm_file_fops;
+}
 
-        iops = cache_fiops(smb);
-        fops = cache_ffops(smb);
+inline struct file_operations *cache_sfops(struct sm_ops *smfs_ops)
+{
+	return &smfs_ops->sm_sym_fops;
+}
 
-        memset(iops , 0 , sizeof (struct inode_operations));
-        memset(fops , 0 , sizeof (struct file_operations));
+inline struct dentry_operations *cache_dops(struct sm_ops *smfs_ops)
+{
+	return &smfs_ops->sm_dentry_ops;
+}
 
-        setup_iops(cache_inode, iops, cache_iops);
-        setup_fops(cache_inode, fops, cache_fops);
+inline struct journal_operations *journal_ops(struct sm_ops *smfs_ops)
+{
+	return &smfs_ops->sm_journal_ops;
+}
 
-        return;
+void init_smfs_cache()
+{
+	memset(&smfs_operations, 0, sizeof(struct sm_ops)); 
+}
+void cleanup_smfs_cache()
+{
+	return;
 }
 
-static void setup_sm_dir_ops(struct inode *cache_inode,
-                             struct inode *inode,
-                             struct inode_operations *cache_dir_iops,
-                             struct file_operations *cache_dir_fops)
+static void setup_iops(struct inode *cache_inode, 
+		       struct inode_operations *iops,
+		       struct inode_operations *cache_iops)
 {
-        struct smfs_super_info *smb;
-        struct inode_operations *iops;
-        struct file_operations *fops;
 
-        smb = S2SMI(inode->i_sb);
+	if (cache_inode->i_op && cache_iops && iops) {
+		if (cache_inode->i_op->create) 
+			iops->create = cache_iops->create;
+		if (cache_inode->i_op->create_it) 
+			iops->create_it = cache_iops->create_it;
+		if (cache_inode->i_op->lookup)
+			iops->lookup = cache_iops->lookup;
+		if (cache_inode->i_op->lookup_raw)
+			iops->lookup_raw = cache_iops->lookup_raw;
+		if (cache_inode->i_op->lookup_it)
+			iops->lookup_it = cache_iops->lookup_it;
+		if (cache_inode->i_op->link)
+			iops->link = cache_iops->link;
+		if (cache_inode->i_op->link_raw)
+			iops->link_raw = cache_iops->link_raw;
+		if (cache_inode->i_op->unlink)
+			iops->unlink = cache_iops->unlink;
+		if (cache_inode->i_op->unlink_raw)
+			iops->unlink_raw = cache_iops->unlink_raw;
+		if (cache_inode->i_op->symlink)
+			iops->symlink = cache_iops->symlink;
+		if (cache_inode->i_op->symlink_raw)
+			iops->symlink_raw = cache_iops->symlink_raw;
+		if (cache_inode->i_op->mkdir)
+			iops->mkdir = cache_iops->mkdir;
+		if (cache_inode->i_op->mkdir_raw)
+			iops->mkdir_raw = cache_iops->mkdir_raw;
+		if (cache_inode->i_op->rmdir)
+			iops->rmdir = cache_iops->rmdir;
+		if (cache_inode->i_op->rmdir_raw)
+			iops->rmdir_raw = cache_iops->rmdir_raw;
+		if (cache_inode->i_op->mknod)
+			iops->mknod = cache_iops->mknod;
+		if (cache_inode->i_op->mknod_raw)
+			iops->mknod_raw = cache_iops->mknod_raw;
+		if (cache_inode->i_op->rename)
+			iops->rename = cache_iops->rename;
+		if (cache_inode->i_op->rename_raw)
+			iops->rename_raw = cache_iops->rename_raw;
+		if (cache_inode->i_op->readlink)
+			iops->readlink = cache_iops->readlink;
+		if (cache_inode->i_op->follow_link)
+			iops->follow_link = cache_iops->follow_link;
+		if (cache_inode->i_op->truncate)
+			iops->truncate = cache_iops->truncate;
+		if (cache_inode->i_op->permission)
+			iops->permission = cache_iops->permission;
+		if (cache_inode->i_op->revalidate)
+			iops->revalidate = cache_iops->revalidate;
+		if (cache_inode->i_op->revalidate_it)
+			iops->revalidate_it = cache_iops->revalidate_it;
+		if (cache_inode->i_op->setattr)
+			iops->setattr = cache_iops->setattr;
+		if (cache_inode->i_op->setattr_raw)
+			iops->setattr_raw = cache_iops->setattr_raw;
+		if (cache_inode->i_op->getattr)
+			iops->getattr = cache_iops->getattr;
+		if (cache_inode->i_op->setxattr)
+			iops->setxattr = cache_iops->setxattr;
+		if (cache_inode->i_op->getxattr)
+			iops->getxattr = cache_iops->getxattr;
+		if (cache_inode->i_op->listxattr)
+			iops->listxattr = cache_iops->listxattr;
+		if (cache_inode->i_op->removexattr)
+			iops->removexattr = cache_iops->removexattr;
+	}
+}
+static void setup_fops(struct inode *cache_inode,
+		       struct file_operations *fops,
+		       struct file_operations *cache_fops)
+{
+	if (cache_inode->i_fop && cache_fops && fops) {
+		if (cache_inode->i_fop->llseek)
+			fops->llseek = cache_fops->llseek;
+		if (cache_inode->i_fop->read)
+			fops->read = cache_fops->read;
+		if (cache_inode->i_fop->write)
+			fops->write = cache_fops->write;
+		if (cache_inode->i_fop->readdir)
+			fops->readdir = cache_fops->readdir;
+		if (cache_inode->i_fop->poll)
+			fops->poll = cache_fops->poll;
+		if (cache_inode->i_fop->ioctl)
+			fops->ioctl = cache_fops->ioctl;
+		if (cache_inode->i_fop->mmap)
+			fops->mmap = cache_fops->mmap;
+		if (cache_inode->i_fop->open)
+			fops->open = cache_fops->open;
+		if (cache_inode->i_fop->flush)
+			fops->flush = cache_fops->flush;
+		if (cache_inode->i_fop->release)
+			fops->release = cache_fops->release;
+		if (cache_inode->i_fop->fsync)
+			fops->fsync = cache_fops->fsync;
+		if (cache_inode->i_fop->fasync)
+			fops->fasync = cache_fops->fasync;
+		if (cache_inode->i_fop->lock)
+			fops->lock = cache_fops->lock;
+		if (cache_inode->i_fop->readv)
+			fops->readv = cache_fops->readv;
+		if (cache_inode->i_fop->writev)
+			fops->writev = cache_fops->writev;
+		if (cache_inode->i_fop->sendpage)
+			fops->sendpage = cache_fops->sendpage;
+		if (cache_inode->i_fop->get_unmapped_area)
+			fops->get_unmapped_area = cache_fops->get_unmapped_area;										 	
+	}
+}
+static void setup_sm_file_ops(struct inode *cache_inode, 
+		       	      struct inode *inode,
+		       	      struct inode_operations *cache_iops,
+		              struct file_operations *cache_fops)
+{
+	struct smfs_super_info *smb;
+	struct inode_operations *iops;
+	struct file_operations *fops;
 
-        if (smb->ops_check & DIR_OPS_CHECK)
-                return;
-        smb->ops_check |= DIR_OPS_CHECK;
+	smb = S2SMI(inode->i_sb); 
+	
+	if (smb->ops_check & FILE_OPS_CHECK) 
+		return; 
+	smb->ops_check |= FILE_OPS_CHECK;
 
-        iops = cache_diops(smb);
-        fops = cache_dfops(smb);
+	iops = cache_fiops(&smfs_operations);
+	fops = cache_ffops(&smfs_operations);
 
-        memset(iops, 0, sizeof (struct inode_operations));
-        memset(fops, 0, sizeof (struct file_operations));
+	memset(iops , 0 , sizeof (struct inode_operations));	
+	memset(fops , 0 , sizeof (struct file_operations));	
 
-        setup_iops(cache_inode, iops, cache_dir_iops);
-        setup_fops(cache_inode, fops, cache_dir_fops);
+	setup_iops(cache_inode, iops, cache_iops); 	
+	setup_fops(cache_inode, fops, cache_fops);
 
-        return;
+	return;
 }
 
-static void setup_sm_symlink_ops(struct inode *cache_inode,
-                                 struct inode *inode,
-                                 struct inode_operations *cache_sym_iops,
-                                 struct file_operations *cache_sym_fops)
+static void setup_sm_dir_ops(struct inode *cache_inode, 
+			     struct  inode *inode,
+		       	     struct inode_operations *cache_dir_iops,
+			     struct file_operations *cache_dir_fops)
 {
-        struct smfs_super_info *smb;
-        struct inode_operations *iops;
-        struct file_operations *fops;
-
-        smb = S2SMI(inode->i_sb);
+	struct smfs_super_info *smb;
+	struct inode_operations *iops;
+	struct file_operations *fops;
 
-        if (smb->ops_check & SYMLINK_OPS_CHECK)
-                return;
-        smb->ops_check |= SYMLINK_OPS_CHECK;
+	smb = S2SMI(inode->i_sb); 
+	
+	if (smb->ops_check & DIR_OPS_CHECK) 
+		return; 
+	smb->ops_check |= DIR_OPS_CHECK;
 
-        iops = cache_siops(smb);
-        fops = cache_sfops(smb);
+	iops = cache_diops(&smfs_operations);
+	fops = cache_dfops(&smfs_operations);
 
-        memset(iops , 0 , sizeof (struct inode_operations));
-        memset(fops , 0 , sizeof (struct file_operations));
+	memset(iops, 0, sizeof (struct inode_operations));	
+	memset(fops, 0, sizeof (struct file_operations));	
 
-        setup_iops(cache_inode, iops, cache_sym_iops);
-        setup_fops(cache_inode, fops, cache_sym_fops);
+	setup_iops(cache_inode, iops, cache_dir_iops); 	
+	setup_fops(cache_inode, fops, cache_dir_fops);
 
-        return;
+	return;
 }
 
-static void setup_sm_sb_ops(struct super_block *cache_sb,
-                            struct super_block *sb,
-                            struct super_operations *smfs_sops)
+static void setup_sm_symlink_ops(struct inode *cache_inode, 
+				 struct  inode *inode,
+		       		 struct inode_operations *cache_sym_iops,
+				 struct file_operations *cache_sym_fops)
 {
-        struct smfs_super_info *smb;
-        struct super_operations *sops;
+	struct smfs_super_info *smb;
+	struct inode_operations *iops;
+	struct file_operations *fops;
 
-        ENTRY;
+	smb = S2SMI(inode->i_sb); 
+	
+	if (smb->ops_check & SYMLINK_OPS_CHECK) 
+		return; 
+	smb->ops_check |= SYMLINK_OPS_CHECK;
 
-        smb = S2SMI(sb);
+	iops = cache_siops(&smfs_operations);
+	fops = cache_sfops(&smfs_operations);
 
-        if (smb->ops_check & SB_OPS_CHECK)
-                return;
-        smb->ops_check |= SB_OPS_CHECK;
-        sops = cache_sops(smb);
-        memset(sops, 0, sizeof (struct super_operations));
+	memset(iops , 0 , sizeof (struct inode_operations));	
+	memset(fops , 0 , sizeof (struct file_operations));	
 
-        if (cache_sb->s_op) {
-                if (cache_sb->s_op->read_inode)
-                        sops->read_inode = smfs_sops->read_inode;
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-                if (cache_sb->s_op->read_inode2)
-                        sops->read_inode2 = smfs_sops->read_inode2;
-#endif
-                if (cache_sb->s_op->dirty_inode)
-                        sops->dirty_inode = smfs_sops->dirty_inode;
-                if (cache_sb->s_op->write_inode)
-                        sops->write_inode = smfs_sops->write_inode;
-                if (cache_sb->s_op->put_inode)
-                        sops->put_inode = smfs_sops->put_inode;
-                if (cache_sb->s_op->delete_inode)
-                        sops->delete_inode = smfs_sops->delete_inode;
-                if (cache_sb->s_op->put_super)
-                        sops->put_super = smfs_sops->put_super;
-                if (cache_sb->s_op->write_super)
-                        sops->write_super = smfs_sops->write_super;
-                if (cache_sb->s_op->write_super_lockfs)
-                        sops->write_super_lockfs =smfs_sops->write_super_lockfs;
-                if (cache_sb->s_op->unlockfs)
-                        sops->unlockfs = smfs_sops->unlockfs;
-                if (cache_sb->s_op->statfs)
-                        sops->statfs = smfs_sops->statfs;
-                if (cache_sb->s_op->remount_fs)
-                        sops->remount_fs = smfs_sops->remount_fs;
-                if (cache_sb->s_op->umount_begin)
-                        sops->umount_begin = smfs_sops->umount_begin;
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-                if (cache_sb->s_op->fh_to_dentry)
-                        sops->fh_to_dentry = smfs_sops->fh_to_dentry;
-                if (cache_sb->s_op->dentry_to_fh)
-                        sops->dentry_to_fh = smfs_sops->dentry_to_fh;
-#endif
-                if (cache_sb->s_op->show_options)
-                        sops->show_options = smfs_sops->show_options;
-                
-                /* FIXME-WANGDI: we need this method to clear the cache
-                 * inode. */
-                sops->clear_inode = smfs_sops->clear_inode;
-        }
+	setup_iops(cache_inode, iops, cache_sym_iops); 	
+	setup_fops(cache_inode, fops, cache_sym_fops);
 
-        return;
+	return;
 }
 
+static void setup_sm_sb_ops(struct super_block *cache_sb, 
+			    struct super_block *sb, 
+			    struct super_operations *smfs_sops)	
+{
+	struct smfs_super_info *smb;
+        struct super_operations *sops;
+
+	ENTRY;
+
+	smb = S2SMI(sb); 
+	
+	if (smb->ops_check & SB_OPS_CHECK) 
+		return; 
+	smb->ops_check |= SB_OPS_CHECK;
+	sops = cache_sops(&smfs_operations);
+	memset(sops, 0, sizeof (struct super_operations));	
+
+	if (cache_sb->s_op) {
+		if (cache_sb->s_op->read_inode) 
+			sops->read_inode = smfs_sops->read_inode;
+		if (cache_sb->s_op->read_inode2)
+			sops->read_inode2 = smfs_sops->read_inode2;
+		if (cache_sb->s_op->dirty_inode)
+			sops->dirty_inode = smfs_sops->dirty_inode;
+		if (cache_sb->s_op->write_inode)
+			sops->write_inode = smfs_sops->write_inode;
+		if (cache_sb->s_op->put_inode)
+			sops->put_inode = smfs_sops->put_inode;
+		if (cache_sb->s_op->delete_inode)
+			sops->delete_inode = smfs_sops->delete_inode;
+		if (cache_sb->s_op->put_super)
+			sops->put_super = smfs_sops->put_super;
+		if (cache_sb->s_op->write_super)
+			sops->write_super = smfs_sops->write_super;
+		if (cache_sb->s_op->write_super_lockfs)
+			sops->write_super_lockfs = smfs_sops->write_super_lockfs;
+		if (cache_sb->s_op->unlockfs)
+			sops->unlockfs = smfs_sops->unlockfs;
+		if (cache_sb->s_op->statfs)
+			sops->statfs = smfs_sops->statfs;
+		if (cache_sb->s_op->remount_fs)
+			sops->remount_fs = smfs_sops->remount_fs;
+		if (cache_sb->s_op->umount_begin)
+			sops->umount_begin = smfs_sops->umount_begin;
+		if (cache_sb->s_op->fh_to_dentry)
+			sops->fh_to_dentry = smfs_sops->fh_to_dentry;
+		if (cache_sb->s_op->dentry_to_fh)
+			sops->dentry_to_fh = smfs_sops->dentry_to_fh;
+		if (cache_sb->s_op->show_options)
+			sops->show_options = smfs_sops->show_options;
+		/*FIXME we need this method to clear the cache inode */
+		sops->clear_inode = smfs_sops->clear_inode;
+	}
+					
+	return;
+}	
 void sm_set_inode_ops(struct inode *cache_inode, struct inode *inode)
 {
-        struct smfs_super_info *smb = S2SMI(inode->i_sb);
-        /* XXX now set the correct sm_{file,dir,sym}_iops */
+        /* XXX now set the correct snap_{file,dir,sym}_iops */
         if (S_ISDIR(inode->i_mode)) {
-                       setup_sm_dir_ops(cache_inode, inode,
+       	        setup_sm_dir_ops(cache_inode, inode,
                                  &smfs_dir_iops,
                                  &smfs_dir_fops);
-                inode->i_op = cache_diops(smb);
-                inode->i_fop = cache_dfops(smb);
+	        inode->i_op = cache_diops(&smfs_operations);
+                inode->i_fop = cache_dfops(&smfs_operations);
         } else if (S_ISREG(inode->i_mode)) {
-                setup_sm_file_ops(cache_inode, inode,
+	        setup_sm_file_ops(cache_inode, inode,
                                   &smfs_file_iops,
                                   &smfs_file_fops);
                 CDEBUG(D_INODE, "inode %lu, i_op at %p\n",
                        inode->i_ino, inode->i_op);
-                inode->i_fop = cache_ffops(smb);
-                inode->i_op = cache_fiops(smb);
-
-        } else if (S_ISLNK(inode->i_mode)) {
+                inode->i_fop = cache_ffops(&smfs_operations);
+                inode->i_op = cache_fiops(&smfs_operations);
+        
+	} else if (S_ISLNK(inode->i_mode)) {
                 setup_sm_symlink_ops(cache_inode, inode,
-                                     &smfs_sym_iops,
-                                     &smfs_sym_fops);
-                inode->i_op = cache_siops(smb);
-                inode->i_fop = cache_sfops(smb);
+                                     &smfs_sym_iops, 
+				     &smfs_sym_fops);
+                inode->i_op = cache_siops(&smfs_operations);
+                inode->i_fop = cache_sfops(&smfs_operations);
                 CDEBUG(D_INODE, "inode %lu, i_op at %p\n",
                        inode->i_ino, inode->i_op);
         }
 }
-
-void sm_set_sb_ops(struct super_block *cache_sb, struct super_block *sb)
+void sm_set_sb_ops (struct super_block *cache_sb,
+		      struct super_block *sb)
 {
-        struct smfs_super_info *smb;
-
-        smb = S2SMI(sb);
-
-        setup_sm_sb_ops(cache_sb, sb, &smfs_super_ops);
+	struct smfs_super_info *smb;
+
+	smb = S2SMI(sb); 
+	
+	setup_sm_sb_ops(cache_sb, sb, &smfs_super_ops);	
+	
+	sb->s_op = cache_sops(&smfs_operations);
+	return;	
+}
 
-        sb->s_op = cache_sops(smb);
-        return;
+void setup_sm_journal_ops(char *cache_type)
+{
+	struct journal_operations *jops;
+
+	jops = journal_ops(&smfs_operations); 
+        
+	if (strlen(cache_type) == strlen("ext3") &&
+            memcmp(cache_type, "ext3", strlen("ext3")) == 0 ) {
+#if defined(CONFIG_EXT3_FS) || defined (CONFIG_EXT3_FS_MODULE)
+		memcpy(jops, &smfs_ext3_journal_ops, 
+		       sizeof(struct journal_operations)); 
+#else
+		memset(jops, 0, sizeof(journal_operations));
+#endif
+                CDEBUG(D_SUPER, "ops at %p\n", jops);
+        }
 }
+
diff --git a/lustre/smfs/cache_space.c b/lustre/smfs/cache_space.c
deleted file mode 100644
index a2f3133..0000000
--- a/lustre/smfs/cache_space.c
+++ /dev/null
@@ -1,649 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
- *  lustre/smfs/cache_space.c
- *  A library of functions to manage cache space based on ARC 
- *  (modified LRU) replacement algorithm.
- *  
- *  Copyright (c) 2002, 2003 Cluster File Systems, Inc.
- *
- *   This file is part of Lustre, http://www.lustre.org.
- *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
- *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-#define DEBUG_SUBSYSTEM S_SM
-
-#include <linux/lustre_log.h>
-#include <linux/lustre_smfs.h>
-
-#include "smfs_internal.h"
-
-struct cache_purge_param {
-        int nfract;     /* Percentage of cache dirty to activate cpurge */
-        int ndirty;     /* Maximum number of objects to write out per
-                           wake-cycle */
-        int interval;   /* jiffies delay between cache purge */
-        int nfract_sync;/* Percentage of cache dirty to activate 
-                           cpurge synchronously */
-        int nfract_stop_cpurge; /* Percentage of cache dirty to stop cpurge */
-} cf_prm = {30, 512, 600 * HZ, 60, 20};
-
-static struct cache_purge_queue smfs_cpq;
-static struct cache_purge_queue *cpq = &smfs_cpq;
-
-int cache_space_hook_init(struct super_block *sb)
-{
-        struct smfs_super_info  *smfs_info = S2SMI(sb);
-
-        SMFS_SET_CACHE_HOOK(smfs_info);
-        return 0;
-}
-int cache_space_hook_exit(struct super_block *sb)
-{
-        struct smfs_super_info  *smfs_info = S2SMI(sb);
-
-        SMFS_CLEAN_CACHE_HOOK(smfs_info);
-        return 0;
-}
-int smfs_cache_hook(struct inode *inode)
-{
-        struct smfs_super_info  *smfs_info = I2CSB(inode);
-                                                                                                                             
-        if (SMFS_CACHE_HOOK(smfs_info) && SMFS_INIT_REC(smfs_info)
-            && SMFS_INODE_CACHE_HOOK(inode))
-                        return 1;
-        else
-                return 0;
-}
-
-static int cache_leaf_node(struct dentry *dentry, __u64 *active_entry)
-{
-        struct inode *inode = dentry->d_inode;
-
-        if (S_ISDIR(inode->i_mode)) {
-                if (inode->i_nlink != 2)
-                        return 0;
-                if (!strncmp(dentry->d_name.name, "lost+found", dentry->d_name.len))
-                        return 0;
-                LASSERT(active_entry != NULL);
-                get_active_entry(inode, active_entry);
-                return(*active_entry > 0 ? 0 : 1);
-        } else {
-                if (inode->i_nlink != 1)
-                        return 0;
-                if (!strncmp(dentry->d_name.name, KML_LOG_NAME, dentry->d_name.len) ||
-                    !strncmp(dentry->d_name.name, CACHE_LRU_LOG, dentry->d_name.len))
-                        return 0;
-                return 1;
-        }
-}
-static int cache_pre_leaf_node(struct dentry *dentry, __u64 *active_entry, int op)
-{
-        if (((op == 0 && dentry->d_inode->i_nlink == 0) ||
-            (op == 1 && dentry->d_inode->i_nlink == 2)) &&
-            strncmp(dentry->d_name.name, KML_LOG_NAME, dentry->d_name.len) &&
-            strncmp(dentry->d_name.name, CACHE_LRU_LOG, dentry->d_name.len))
-                return 1;
-        else if ((op == 2 && dentry->d_inode->i_nlink == 0) ||
-                 (op == 3 && dentry->d_inode->i_nlink == 3)) {
-                LASSERT(active_entry != NULL);
-                get_active_entry(dentry->d_inode, active_entry);
-                return(*active_entry > 0 ? 0 : 1);
-        }
-        return 0;
-}
-
-static int set_lru_logcookie(struct inode *inode, void *handle,
-                             struct llog_cookie *logcookie)
-{
-        struct fsfilt_operations *fsops = I2CSB(inode)->sm_fsfilt;
-        int rc;
-        rc = fsops->fs_set_xattr(inode, handle, XATTR_SMFS_CACHE_LOGCOOKIE,
-                                 logcookie, sizeof(*logcookie));
-        RETURN(rc);
-}
-static int get_lru_logcookie(struct inode *inode, struct llog_cookie *logcookie)
-{
-        struct fsfilt_operations *fsops = I2CSB(inode)->sm_fsfilt;
-        int rc;
-        rc = fsops->fs_get_xattr(inode, XATTR_SMFS_CACHE_LOGCOOKIE,
-                                 logcookie, sizeof(*logcookie));
-        RETURN(rc);
-}
-
-static int try2purge_from_cache(struct ll_fid cfid, struct ll_fid pfid)
-{
-        struct inode *inode, *parent;
-        struct super_block *sb = cpq->cpq_sb;
-        //struct llog_cookie logcookie;
-        __u32 hoard_priority = 0;
-        int rc = 0;
-        ENTRY;
-
-        inode = iget(sb, cfid.id);
-        if (IS_ERR(inode)) {
-                CERROR("not existent inode: "LPX64"/%u\n", 
-                       cfid.id, cfid.generation);
-                RETURN(-ENOENT);
-        }
-        parent = iget(sb, pfid.id);
-        if (IS_ERR(parent)) {
-                CERROR("not existent inode: "LPX64"/%u\n", 
-                       pfid.id, pfid.generation);
-                iput(inode);
-                RETURN(-ENOENT);
-        }
-
-        CWARN("inode/parent %lu:%lu on the lru list\n",
-              inode->i_ino, parent->i_ino);
-
-        rc = get_hoard_priority(inode, &hoard_priority);
-        if (hoard_priority) {
-                CWARN("inode %lu set hoard\n", inode->i_ino);
-                GOTO(out, rc);
-        }
-        if (atomic_read(&inode->i_count) > 1 || (inode->i_state & I_DIRTY)) {
-                CWARN("inode %lu is busy\n", inode->i_ino);
-                GOTO(out, rc = 0);
-        }
-
-out:
-        iput(inode);
-        iput(parent);
-        RETURN(rc);
-}
-
-static int cache_lru_get_rec_cb(struct llog_handle *llh,
-                                struct llog_rec_hdr *rec, void *data)
-{
-        struct llog_lru_rec *llr;
-        int count = *(int *)data, rc = 0;
-        ENTRY;
-
-        if (!(le32_to_cpu(llh->lgh_hdr->llh_flags) & LLOG_F_IS_PLAIN)) {
-                CERROR("log is not plain\n");
-                RETURN(-EINVAL);
-        }
-        if (rec->lrh_type != CACHE_LRU_REC) {
-                CERROR("log record type error\n");
-                RETURN(-EINVAL);
-        }
-
-        llr = (struct llog_lru_rec *)rec;
-
-        if (try2purge_from_cache(llr->llr_cfid, llr->llr_pfid)==1){
-                CDEBUG(D_INODE, "purge ino/gen "LPX64"/%u from cache\n",
-                       llr->llr_cfid.id, llr->llr_cfid.generation);
-                count --;
-                if (count == 0)
-                        rc = LLOG_PROC_BREAK;
-                *(int *)data = count;
-        }
-
-        RETURN(rc);
-}
-
-static int cpurge_stop(void)
-{
-        struct fsfilt_operations *fsops = S2SMI(cpq->cpq_sb)->sm_fsfilt;
-        struct obd_statfs osfs;
-        int rc, free;
-
-        rc = fsops->fs_statfs(cpq->cpq_sb, &osfs);
-        LASSERT(rc == 0);
-
-        free = osfs.os_bfree * 100;
-        if (free < cf_prm.nfract_stop_cpurge * osfs.os_blocks)
-                return 1;
-        return 0;
-}
-
-static int cache_balance_state(void)
-{
-        struct fsfilt_operations *fsops = S2SMI(cpq->cpq_sb)->sm_fsfilt;
-        struct obd_statfs osfs;
-        int rc, free;
-
-        rc = fsops->fs_statfs(cpq->cpq_sb, &osfs);
-        LASSERT(rc == 0);
-
-        free = (osfs.os_blocks - osfs.os_bfree) * 100; 
-        if (free > cf_prm.nfract * osfs.os_blocks) {
-                if (free < cf_prm.nfract_sync)
-                        return 1;
-                return 0;
-        }
-        return -1; 
-}
-
-void wakeup_cpurge(void)
-{
-        wake_up(&cpq->cpq_waitq);
-}
-
-/* walk the lru llog to purge count number of objects */
-static int purge_some_cache(int *count)
-{
-        int rc;
-        ENTRY;
-
-        rc = llog_cat_process(cpq->cpq_loghandle,
-                              (llog_cb_t)cache_lru_get_rec_cb,
-                              count);
-        if (!rc)
-                CDEBUG(D_INODE, "no enough objects available\n");
-
-        RETURN(rc);
-}
-
-#define CFLUSH_NR 512
-static void check_cache_space(void)
-{
-        int state = cache_balance_state();
-        ENTRY;
-
-        if (state < 0)
-                return;
-
-        wakeup_cpurge();
-
-        if (state > 0) {
-                int count = CFLUSH_NR;
-                purge_some_cache(&count);
-        }
-}
-
-void cache_space_pre(struct inode *inode, int op)
-{
-        ENTRY;
-
-        /* FIXME have not used op */
-        check_cache_space();
-}
-
-static int cache_space_hook_lru(struct inode *inode, struct inode *parent, 
-                     void *handle, int op, int flags)
-{
-        struct fsfilt_operations *fsops = S2SMI(cpq->cpq_sb)->sm_fsfilt;
-        struct llog_ctxt *ctxt = cpq->cpq_loghandle->lgh_ctxt;
-        struct llog_lru_rec *llr = NULL; 
-        struct llog_cookie *logcookie = NULL;
-        int cookie_size = sizeof(struct llog_cookie);
-        int rc = 0, err;
-        ENTRY;
-
-        LASSERT(ctxt != NULL);
-
-        if (op & ~(CACHE_SPACE_DELETE | CACHE_SPACE_INSERT |CACHE_SPACE_COMMIT))
-                RETURN(-EINVAL);
-
-        OBD_ALLOC(logcookie, cookie_size);
-        if (!logcookie)
-                GOTO(out, rc = -ENOMEM);
-
-        if (op & CACHE_SPACE_DELETE) {
-                rc = get_lru_logcookie(inode, logcookie);
-                if (rc < 0) 
-                        GOTO(out, rc);
-
-                if (logcookie->lgc_lgl.lgl_oid == 0) {
-                        CWARN("inode %lu/%u is not in lru list\n",
-                              inode->i_ino, inode->i_generation);
-                        GOTO(insert, rc = -ENOENT); 
-                }
-                if (flags && llog_cat_half_bottom(logcookie, ctxt->loc_handle))
-                        GOTO(out, rc = 0);
-
-                rc = llog_cancel(ctxt, 1, logcookie, 0, NULL);
-                if (!rc) {
-                        memset(logcookie, 0, cookie_size);
-                        rc = set_lru_logcookie(inode, handle, logcookie);
-                        if (rc)
-                                GOTO(out, rc);
-                } else {
-                        CERROR("failed at llog_cancel: %d\n", rc);
-                        GOTO(out, rc);
-                }
-        }
-
-insert:
-        if (op & CACHE_SPACE_INSERT) {
-                LASSERT(parent != NULL);
-                OBD_ALLOC(llr, sizeof(*llr));
-                if (llr == NULL)
-                        GOTO(out, rc = -ENOMEM); 
-
-                llr->llr_hdr.lrh_len = llr->llr_tail.lrt_len = sizeof(*llr);
-                llr->llr_hdr.lrh_type = CACHE_LRU_REC;
-                llr->llr_cfid.id = inode->i_ino;
-                llr->llr_cfid.generation = inode->i_generation;
-                llr->llr_cfid.f_type = inode->i_mode & S_IFMT;
-                llr->llr_pfid.id = parent->i_ino;
-                llr->llr_pfid.generation = parent->i_generation;
-                llr->llr_pfid.f_type = parent->i_mode & S_IFMT;
-
-                rc = llog_add(ctxt, &llr->llr_hdr, NULL, logcookie, 1, NULL);
-                if (rc != 1) {
-                        CERROR("failed at llog_add: %d\n", rc);
-                        GOTO(out, rc);
-                }
-                rc = set_lru_logcookie(inode, handle, logcookie);
-        }
-
-        if (op & CACHE_SPACE_COMMIT) {
-                if (handle) {
-                        err = fsops->fs_commit(inode, handle, 0);
-                        if (err) {
-                                CERROR("error committing transaction: %d\n", err);
-                                if (!rc)
-                                        rc = err;
-                        }
-                }
-        }
-out: 
-        if (logcookie)
-                OBD_FREE(logcookie, cookie_size);
-        if (llr)
-                OBD_FREE(llr, sizeof(*llr));
-        RETURN(rc);
-}
-
-static int cache_purge_thread(void *args)
-{
-        unsigned long flags;
-        struct l_wait_info lwi = LWI_TIMEOUT(cf_prm.interval * HZ, NULL, NULL);
-        ENTRY;
-
-        lock_kernel();
-        kportal_daemonize("wb_cache_purge");
-
-        SIGNAL_MASK_LOCK(current, flags);
-        sigfillset(&current->blocked);
-        RECALC_SIGPENDING;
-        SIGNAL_MASK_UNLOCK(current, flags);
-
-        unlock_kernel();
-        complete(&cpq->cpq_comp);
-
-        while (1) {
-                int ndirty = cf_prm.ndirty;
-
-                purge_some_cache(&ndirty);
-                if (ndirty > 0 || cpurge_stop())
-                        l_wait_event(cpq->cpq_waitq, 
-                                     cpq->cpq_flags & SVC_STOPPING,
-                                     &lwi);
-                if (cpq->cpq_flags & SVC_STOPPING) {
-                        cpq->cpq_flags &= ~SVC_STOPPING; 
-                        EXIT;
-                        break;
-                }
-        }
-        cpq->cpq_flags = SVC_STOPPED;
-        complete(&cpq->cpq_comp);
-        return 0;
-}
-
-int cache_space_hook_setup(struct super_block *sb)
-{
-        struct llog_ctxt *ctxt;
-        int rc;
-        ENTRY;
-
-        /* first to initialize the cache lru catalog on local fs */
-        rc = llog_catalog_setup(&ctxt, CACHE_LRU_LOG,
-                                S2SMI(sb)->smsi_ctxt,
-                                S2SMI(sb)->sm_fsfilt,
-                                S2SMI(sb)->smsi_logs_dir,
-                                S2SMI(sb)->smsi_objects_dir);
-        if (rc) {
-                CERROR("failed to initialize cache lru list catalog %d\n", rc);
-                RETURN(rc);
-        }
-        cpq->cpq_sb = sb;
-        cpq->cpq_loghandle = ctxt->loc_handle; 
-
-        /* start cache purge daemon, only one daemon now */
-        init_waitqueue_head(&cpq->cpq_waitq);
-        init_completion(&cpq->cpq_comp);
-        cpq->cpq_flags = 0;
-
-        rc = kernel_thread(cache_purge_thread, NULL, CLONE_VM | CLONE_FILES);
-        if (rc < 0) {
-                CERROR("cannot start thread: %d\n", rc);
-                GOTO(err_out, rc);
-        }
-        wait_for_completion(&cpq->cpq_comp);
-
-        RETURN(0);
-err_out:
-        llog_catalog_cleanup(ctxt);
-        RETURN(rc);
-}
-
-int cache_space_hook_cleanup(void)
-{
-        int rc;
-        ENTRY;
-
-        init_completion(&cpq->cpq_comp);
-        cpq->cpq_flags = SVC_STOPPING;
-        wake_up(&cpq->cpq_waitq);
-        wait_for_completion(&cpq->cpq_comp);
-
-        rc = llog_catalog_cleanup(cpq->cpq_loghandle->lgh_ctxt);
-        if (rc) 
-                CERROR("failed to clean up cache lru list catalog %d\n", rc);
-
-        RETURN(rc);
-}
-
-static int cache_space_hook_create(void *handle, struct inode *dir,
-                                   struct dentry *dentry, struct inode *new_dir,
-                                   struct dentry *new_dentry)
-{
-        __u64 active_entry = 0;
-        int rc;
-
-        LASSERT(cache_leaf_node(dentry, NULL));
-        rc = cache_space_hook_lru(dentry->d_inode, dir, handle,
-                                  CACHE_SPACE_INSERT, 0);
-        if (rc)
-                RETURN(rc);
-        if (cache_leaf_node(dentry->d_parent, &active_entry)) {
-                rc = cache_space_hook_lru(dir,NULL,handle,CACHE_SPACE_DELETE,0);
-                if (rc)
-                        RETURN(rc);
-        }
-        if (!active_entry)
-                rc = get_active_entry(dir, &active_entry);
-        active_entry ++;
-        if (!rc)
-                rc = set_active_entry(dir, &active_entry, handle); 
-        RETURN(rc);
-}
-static int cache_space_hook_lookup(void *handle, struct inode *dir,
-                                   struct dentry *dentry, struct inode *new_dir,
-                                   struct dentry *new_dentry)
-{
-        __u64 active_entry;
-        int rc = 0;
-
-        if (cache_leaf_node(dentry, &active_entry))        
-                rc = cache_space_hook_lru(dentry->d_inode, dir, handle,
-                                CACHE_SPACE_DELETE | CACHE_SPACE_INSERT,1);
-        RETURN(rc);
-}
-static int cache_space_hook_link(void *handle, struct inode *dir,
-                                 struct dentry *dentry, struct inode *new_dir,
-                                 struct dentry *new_dentry)
-{
-        __u64 active_entry = 0;
-        int rc = 0;
-
-        if (cache_pre_leaf_node(dentry, NULL, 1)) {
-                rc = cache_space_hook_lru(dentry->d_inode, NULL,
-                                          handle, CACHE_SPACE_DELETE, 0); 
-                if (rc)
-                        RETURN(rc);
-        }
-
-        if (cache_leaf_node(dentry->d_parent, &active_entry)) {
-                rc = cache_space_hook_lru(dir,NULL,handle,CACHE_SPACE_DELETE,0);
-                if (rc)
-                        RETURN(rc);
-        }
-
-        if (!active_entry)
-                rc = get_active_entry(dir, &active_entry);
-        active_entry ++;
-        if (!rc)
-                rc = set_active_entry(dir, &active_entry, handle); 
-        RETURN(rc);
-}
-static int cache_space_hook_unlink(void *handle, struct inode *dir,
-                                   struct dentry *dentry, struct inode *new_dir,
-                                   struct dentry *new_dentry)
-{
-        __u64 active_entry;
-        int rc = 0;
-
-        if (cache_pre_leaf_node(dentry, NULL, 0))
-                rc = cache_space_hook_lru(dentry->d_inode, NULL, 
-                                          handle, CACHE_SPACE_DELETE, 0);
-        else if (cache_leaf_node(dentry, NULL))
-                        rc = cache_space_hook_lru(dentry->d_inode, dir,
-                                                  handle, CACHE_SPACE_INSERT,0);
-        if (rc)
-                RETURN(rc);
-
-        rc = get_active_entry(dir, &active_entry);
-        active_entry --;
-        if (!rc)
-                rc = set_active_entry(dir, &active_entry, handle);
-        if (!rc && cache_leaf_node(dentry->d_parent, &active_entry)) 
-                rc = cache_space_hook_lru(dir,
-                                          dentry->d_parent->d_parent->d_inode,
-                                          handle, CACHE_SPACE_INSERT, 0);
-        RETURN(rc);
-}
-static int cache_space_hook_mkdir(void *handle, struct inode *dir, 
-                                  struct dentry *dentry, struct inode *new_dir,
-                                  struct dentry *new_dentry)
-{
-        __u64 active_entry;
-        int rc;
-
-        LASSERT(cache_leaf_node(dentry, &active_entry));
-        rc = cache_space_hook_lru(dentry->d_inode, dir, handle,
-                                  CACHE_SPACE_INSERT,0);
-
-        if (!rc && cache_pre_leaf_node(dentry->d_parent, &active_entry, 3))
-                rc = cache_space_hook_lru(dir,NULL,handle,CACHE_SPACE_DELETE,0);
-        RETURN(rc);
-}
-static int cache_space_hook_rmdir(void *handle, struct inode *dir, 
-                                  struct dentry *dentry, struct inode *new_dir,
-                                  struct dentry *new_dentry)
-{
-        __u64 active_entry;
-        int rc;
-
-        LASSERT(cache_pre_leaf_node(dentry, &active_entry, 2));
-        rc = cache_space_hook_lru(dentry->d_inode, NULL, handle,
-                                  CACHE_SPACE_DELETE, 0);
-
-        if (!rc && cache_leaf_node(dentry->d_parent, &active_entry))
-                rc = cache_space_hook_lru(dir,
-                                          dentry->d_parent->d_parent->d_inode,
-                                          handle, CACHE_SPACE_INSERT, 0);
-        RETURN(rc);
-}
-static int cache_space_hook_rename(void *handle, struct inode *old_dir, 
-                        struct dentry *old_dentry, struct inode *new_dir,
-                        struct dentry *new_dentry)
-{
-        __u64 active_entry;
-        int rc = 0;
-
-        if (new_dentry->d_inode) {
-                if (cache_pre_leaf_node(new_dentry, NULL, 0))
-                        rc = cache_space_hook_lru(new_dentry->d_inode, NULL,
-                                                  handle, CACHE_SPACE_DELETE,0);
-                else if (cache_leaf_node(new_dentry, NULL))
-                        rc = cache_space_hook_lru(new_dentry->d_inode,
-                                                  new_dir, handle,
-                                                  CACHE_SPACE_INSERT,0);
-        }
-
-        if (rc || old_dir == new_dir)
-                RETURN(rc);
-
-        if (!S_ISDIR(old_dentry->d_inode->i_mode)) {
-                if (cache_leaf_node(new_dentry->d_parent, &active_entry)) {
-                        rc = cache_space_hook_lru(new_dir, NULL, handle,
-                                                  CACHE_SPACE_DELETE, 0);
-                        if (rc)
-                                RETURN(rc);
-                }
-                if (!active_entry)
-                        rc = get_active_entry(new_dir, &active_entry);
-                active_entry ++;
-                if (!rc)
-                        rc = set_active_entry(new_dir, &active_entry, handle);
-                if (rc)
-                        RETURN(rc);
-                rc = get_active_entry(old_dir, &active_entry);
-                active_entry --;
-                if (!rc)
-                        rc = set_active_entry(old_dir, &active_entry, handle);
-        } else if (cache_pre_leaf_node(new_dentry->d_parent, &active_entry, 3))
-                rc = cache_space_hook_lru(new_dir, NULL, handle,
-                                          CACHE_SPACE_DELETE, 0);
-
-        if (!rc && cache_leaf_node(old_dentry->d_parent, &active_entry))
-                rc = cache_space_hook_lru(old_dir,
-                                        old_dentry->d_parent->d_parent->d_inode,
-                                        handle, CACHE_SPACE_INSERT, 0);
-        RETURN(rc);
-}
-
-typedef int (*cache_hook_op)(void *handle, struct inode *old_dir,
-                             struct dentry *old_dentry, struct inode *new_dir,
-                             struct dentry *new_dentry);
-static  cache_hook_op cache_space_hook_ops[CACHE_HOOK_MAX + 1] = {
-        [CACHE_HOOK_CREATE]     cache_space_hook_create,
-        [CACHE_HOOK_LOOKUP]     cache_space_hook_lookup,
-        [CACHE_HOOK_LINK]       cache_space_hook_link,
-        [CACHE_HOOK_UNLINK]     cache_space_hook_unlink,
-        [CACHE_HOOK_SYMLINK]    cache_space_hook_create,
-        [CACHE_HOOK_MKDIR]      cache_space_hook_mkdir,
-        [CACHE_HOOK_RMDIR]      cache_space_hook_rmdir,
-        [CACHE_HOOK_MKNOD]      cache_space_hook_create,
-        [CACHE_HOOK_RENAME]     cache_space_hook_rename,
-};
-
-int cache_space_post(int op, void *handle, struct inode *old_dir,
-               struct dentry *old_dentry, struct inode *new_dir,
-               struct dentry *new_dentry)
-{
-        int rc;
-        ENTRY;
-
-        LASSERT(op <= CACHE_HOOK_MAX && cache_space_hook_ops[op] != NULL);
-
-        rc = cache_space_hook_ops[op](handle, old_dir, old_dentry,
-                                      new_dir, new_dentry);
-        RETURN(rc);
-}
diff --git a/lustre/smfs/dir.c b/lustre/smfs/dir.c
index 0c5b82d..2a99552 100644
--- a/lustre/smfs/dir.c
+++ b/lustre/smfs/dir.c
@@ -1,26 +1,7 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
- *  Copyright (C) 2004 Cluster File Systems, Inc.
- *
- *   This file is part of Lustre, http://www.lustre.org.
- *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
- *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
+/*
+ * dir.c
  */
-
-#define DEBUG_SUBSYSTEM S_SM
+#define DEBUG_SUBSYSTEM S_SNAP
 
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -28,578 +9,405 @@
 #include <linux/slab.h>
 #include <linux/stat.h>
 #include <linux/unistd.h>
+#include <linux/lustre_idl.h> 
 #include <linux/smp_lock.h>
-#include <linux/obd_class.h>
-#include <linux/obd_support.h>
-#include <linux/lustre_lib.h>
-#include <linux/lustre_idl.h>
-#include <linux/lustre_fsfilt.h>
-#include <linux/lustre_smfs.h>
 
-#include "smfs_internal.h"
+#include "smfs_internal.h" 
+#include "kml_idl.h" 
 
 #define NAME_ALLOC_LEN(len)     ((len+16) & ~15)
+                                                                                                                                                                                        
+void prepare_parent_dentry(struct dentry *dentry, struct inode *inode)
+{
+        atomic_set(&dentry->d_count, 1);
+        dentry->d_vfs_flags = 0;
+        dentry->d_flags = 0;
+        dentry->d_inode = inode;
+        dentry->d_op = NULL;
+        dentry->d_fsdata = NULL;
+        dentry->d_mounted = 0;
+        INIT_LIST_HEAD(&dentry->d_hash);
+        INIT_LIST_HEAD(&dentry->d_lru);
+        INIT_LIST_HEAD(&dentry->d_subdirs);
+        INIT_LIST_HEAD(&dentry->d_alias);
+}
+
+void d_unalloc(struct dentry *dentry)
+{
+
+	list_del(&dentry->d_hash);
+	INIT_LIST_HEAD(&dentry->d_hash);
+	dput(dentry); /* this will free the dentry memory */
+}
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-static int smfs_create(struct inode *dir, struct dentry *dentry,
-                       int mode)
-#else
-static int smfs_create(struct inode *dir, struct dentry *dentry,
-                       int mode, struct nameidata *nd)
-#endif
+static int smfs_create(struct inode *dir, 
+		       struct dentry *dentry, 
+		       int mode)
 {
-        struct inode  *inode = NULL;
-        struct inode  *cache_dir = NULL;
-        struct dentry *cache_dentry = NULL;
-        struct dentry *cache_parent = NULL;
-        void *handle = NULL;
-        int rc = 0;
-        
-        ENTRY;
-
-        cache_dir = I2CI(dir);
+	struct	inode *cache_dir; 
+	struct	inode *cache_inode = NULL, *inode;
+	struct  dentry parent; 
+	struct  dentry *cache_dentry = NULL;
+	int 	rc;
+	
+	ENTRY;
+	
+	cache_dir = I2CI(dir);
         if (!cache_dir)
                 RETURN(-ENOENT);
-
-        handle = smfs_trans_start(dir, FSFILT_OP_CREATE, NULL);
-        if (IS_ERR(handle))
-                       RETURN(-ENOSPC);
-
-        SMFS_CACHE_HOOK_PRE(CACHE_HOOK_CREATE, handle, dir);
-
-        cache_parent = pre_smfs_dentry(NULL, cache_dir, dentry);
-        cache_dentry = pre_smfs_dentry(cache_parent, NULL, dentry);
-
-        lock_kernel();
-        if (!cache_dentry || !cache_parent)
-                GOTO(exit, rc = -ENOMEM);
-
-        pre_smfs_inode(dir, cache_dir);
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-        if (cache_dir && cache_dir->i_op->create)
-                rc = cache_dir->i_op->create(cache_dir, cache_dentry,
-                                             mode);
-#else
-        if (cache_dir && cache_dir->i_op->create)
-                rc = cache_dir->i_op->create(cache_dir, cache_dentry,
-                                             mode, nd);
-#endif
-        if (rc)
-                GOTO(exit, rc);
-
-        inode = iget(dir->i_sb, cache_dentry->d_inode->i_ino);
-        if (!inode)
-                GOTO(exit, rc = -ENOMEM);
-
-        d_instantiate(dentry, inode);
-        sm_set_inode_ops(cache_dentry->d_inode, inode);
-        post_smfs_inode(dir, cache_dir);
-
-        /* Do KML post hook */
-        SMFS_KML_POST(dir, dentry, NULL, NULL, REINT_CREATE, "create", rc,
-                      exit);
-        SMFS_CACHE_HOOK_POST(CACHE_HOOK_CREATE, handle, dir, dentry,
-                             NULL, NULL, rc, exit);
+       
+	prepare_parent_dentry(&parent, cache_dir);      
+ 	cache_dentry = d_alloc(&parent, &dentry->d_name);
+	
+	if (!cache_dentry) {
+		RETURN(-ENOMEM);
+	}
+	      	 
+	if (cache_dir && cache_dir->i_op->create)
+		rc = cache_dir->i_op->create(cache_dir, cache_dentry, mode);
+	
+	if (rc)
+		GOTO(exit, rc);
+
+	cache_inode = igrab(cache_dentry->d_inode);
+	
+	inode = iget(dir->i_sb, cache_inode->i_ino);	
+
+	if (!inode) 
+		GOTO(exit, rc = -ENOMEM);
+		
+	d_instantiate(dentry, inode);	
+	
+	sm_set_inode_ops(cache_inode, inode);
 exit:
-        unlock_kernel();
-        post_smfs_dentry(cache_dentry);
-        smfs_trans_commit(dir, handle, 0);
-        RETURN(rc);
+	d_unalloc(cache_dentry);
+	RETURN(rc);
 }
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-static struct dentry *smfs_lookup(struct inode *dir, struct dentry *dentry)
-#else
-static struct dentry *smfs_lookup(struct inode *dir, struct dentry *dentry,
-                                  struct nameidata *nd)
-#endif
+static struct dentry *smfs_lookup(struct inode *dir,
+		       		  struct dentry *dentry)
 {
-        struct inode *cache_dir;
-        struct inode *cache_inode;
-        struct inode *inode = NULL;
-        struct dentry *cache_dentry = NULL;
-        struct dentry *cache_parent = NULL;
-        struct dentry *rc = NULL;
-        void *handle = NULL;
-        int rc2 = 0;
-        
-        ENTRY;
-
-        if (!(cache_dir = I2CI(dir)))
+	struct	inode *cache_dir; 
+	struct	inode *cache_inode = NULL, *inode;
+	struct  dentry parent; 
+	struct  dentry *cache_dentry = NULL;
+	struct  dentry *rc = NULL;
+	
+	ENTRY;
+	
+	cache_dir = I2CI(dir);
+        if (!cache_dir)
                 RETURN(ERR_PTR(-ENOENT));
-
-        handle = smfs_trans_start(dir, KML_CACHE_NOOP, NULL);
-        if (IS_ERR(handle))
-                RETURN(ERR_PTR(-ENOSPC));
-
-        SMFS_CACHE_HOOK_PRE(CACHE_HOOK_LOOKUP, handle, dir);
-
-        /* preparing artificial backing fs dentries. */
-        cache_parent = pre_smfs_dentry(NULL, cache_dir, dentry->d_parent);
-        cache_dentry = pre_smfs_dentry(cache_parent, NULL, dentry);
-
-        if (!cache_dentry || !cache_parent)
-                GOTO(exit, rc = ERR_PTR(-ENOMEM));
-
-        if (!cache_dir && cache_dir->i_op->lookup)
-                GOTO(exit, rc = ERR_PTR(-ENOENT));
-
-        /* perform lookup in backing fs. */
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-        rc = cache_dir->i_op->lookup(cache_dir, cache_dentry);
-#else
-        rc = cache_dir->i_op->lookup(cache_dir, cache_dentry, nd);
-#endif
-
-        if (rc && IS_ERR(rc))
-                GOTO(exit, rc);
-
-        if ((cache_inode = rc ? rc->d_inode : cache_dentry->d_inode)) {
-                if (IS_ERR(cache_inode)) {
-                        dentry->d_inode = cache_inode;
-                        GOTO(exit, rc = NULL);
-                }
-                inode = iget(dir->i_sb, cache_inode->i_ino);
-        } else {
-                d_add(dentry, NULL);
-                GOTO(exit, rc);
-        }
-
-        d_add(dentry, inode);
-        rc = NULL;
-
-        SMFS_CACHE_HOOK_POST(CACHE_HOOK_LOOKUP, handle, dir, dentry,
-                             NULL, NULL, rc2, exit);
+	prepare_parent_dentry(&parent, cache_dir);      
+ 	cache_dentry = d_alloc(&parent, &dentry->d_name);
+      
+	if(cache_dir && cache_dir->i_op->lookup)
+		rc = cache_dir->i_op->lookup(cache_dir, cache_dentry);
+
+	if (rc || !cache_dentry->d_inode || 
+            is_bad_inode(cache_dentry->d_inode) ||
+	    IS_ERR(cache_dentry->d_inode)) {
+		GOTO(exit, rc);	
+	}
+
+	cache_inode = igrab(cache_dentry->d_inode);
+	
+	inode = iget(dir->i_sb, cache_inode->i_ino);	
+		
+	d_add(dentry, inode);	
 exit:
-        if (rc2)
-                rc = ERR_PTR(rc2);
-        post_smfs_dentry(cache_dentry);
-        smfs_trans_commit(dir, handle, 0);
-        RETURN(rc);
-}
+	d_unalloc(cache_dentry);
+	RETURN(rc);
+}		       
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) && !defined(CONFIG_RH_2_4_20))
 static int smfs_lookup_raw(struct inode *dir, const char *name,
                            int len, ino_t *data)
 {
-        struct inode *cache_dir;
-        int rc = 0;
+	struct	inode *cache_dir; 
+	int	rc = 0;
 
-        cache_dir = I2CI(dir);
+	cache_dir = I2CI(dir);
 
-        if (!cache_dir)
+	if (!cache_dir) 
                 RETURN(-ENOENT);
-        if (cache_dir->i_op->lookup_raw)
-                rc = cache_dir->i_op->lookup_raw(cache_dir, name, len, data);
-        RETURN(rc);
+	
+	if (cache_dir->i_op->lookup_raw)
+		rc = cache_dir->i_op->lookup_raw(cache_dir, name, len, data);		
+		
+	RETURN(rc);
 }
-#endif
 
-static int smfs_link(struct dentry *old_dentry, struct inode *dir,
-                     struct dentry *dentry)
+static int smfs_link(struct dentry * old_dentry,
+                     struct inode * dir, struct dentry *dentry)
 {
-        struct inode *cache_old_inode = NULL;
-        struct inode *cache_dir = I2CI(dir);
-        struct inode *inode = NULL;
-        struct dentry *cache_dentry = NULL;
-        struct dentry *cache_old_dentry = NULL;
-        struct dentry *cache_parent = NULL;
-        struct dentry *cache_old_parent = NULL;
-        void *handle = NULL;
-        int rc = 0;
-
-        inode = old_dentry->d_inode;
-
-        cache_old_inode = I2CI(inode);
-
-        handle = smfs_trans_start(dir, FSFILT_OP_LINK, NULL);
-        if (IS_ERR(handle))
-                       RETURN(-ENOSPC);
-
-        SMFS_CACHE_HOOK_PRE(CACHE_HOOK_LINK, handle, dir);
-
-        cache_parent = pre_smfs_dentry(NULL, cache_dir, dentry);
-        cache_dentry = pre_smfs_dentry(cache_parent, NULL, dentry);
-
-        lock_kernel();
-        if (!cache_parent || !cache_dentry)
-                GOTO(exit, rc = -ENOMEM);
-
-        cache_old_parent = pre_smfs_dentry(NULL, cache_dir, old_dentry);
-        cache_old_dentry = pre_smfs_dentry(cache_parent, cache_old_inode,
-                                           old_dentry);
-
-        if (!cache_old_parent || !cache_old_dentry)
-                GOTO(exit, rc = -ENOMEM);
-
-        pre_smfs_inode(dir, cache_dir);
-        pre_smfs_inode(inode, cache_old_dentry->d_inode);
-
-        if (cache_dir->i_op->link)
-                rc = cache_dir->i_op->link(cache_old_dentry, cache_dir,
-                                           cache_dentry);
-        if (rc)
-                GOTO(exit, rc);
-
-        atomic_inc(&inode->i_count);
-        post_smfs_inode(inode, cache_old_dentry->d_inode);
-        d_instantiate(dentry, inode);
-        post_smfs_inode(dir, cache_dir);
-
-        SMFS_KML_POST(dir, old_dentry, dentry, NULL,
-                      REINT_LINK, "link", rc, exit);
+	struct	inode *cache_old_inode = NULL; 
+	struct	inode *cache_dir = I2CI(dir); 
+	struct	inode *inode = NULL; 
+	struct  dentry *cache_dentry;
+	struct  dentry *cache_old_dentry;
+	struct  dentry parent; 
+	struct  dentry parent_old; 
+	int	rc = 0;
+
+	inode = old_dentry->d_inode;
+	
+	cache_old_inode = I2CI(inode);
+	
+	if (!cache_old_inode || !cache_dir) 
+                RETURN(-ENOENT);
+	
+	prepare_parent_dentry(&parent, cache_dir);
+	cache_dentry = d_alloc(&parent, &dentry->d_name);
+	
+	prepare_parent_dentry(&parent_old, cache_dir);
+	cache_old_dentry = d_alloc(&parent_old, &dentry->d_name);
+	d_add(cache_old_dentry, cache_old_inode); 
+	pre_smfs_inode(inode, cache_old_dentry->d_inode);
+	
+	if (cache_dir->i_op->link)
+		rc = cache_dir->i_op->link(cache_old_dentry, cache_dir, cache_dentry);		
+	
+	if (rc)
+		GOTO(exit, rc); 
+	
+	atomic_inc(&inode->i_count);
+	post_smfs_inode(inode, cache_old_dentry->d_inode);
+	d_instantiate(dentry, inode);
 
-        SMFS_CACHE_HOOK_POST(CACHE_HOOK_LINK, handle,
-                             dir, old_dentry, NULL, NULL, rc, exit);
 exit:
-        unlock_kernel();
-        post_smfs_dentry(cache_dentry);
-        post_smfs_dentry(cache_old_dentry);
-        smfs_trans_commit(dir, handle, 0);
-        RETURN(rc);
+	if (cache_dentry->d_inode)	
+		igrab(cache_dentry->d_inode);
+	if (cache_old_dentry->d_inode)
+		igrab(cache_old_dentry->d_inode);
+	
+	d_unalloc(cache_dentry);
+	d_unalloc(cache_old_dentry);
+
+	RETURN(rc);
 }
 
-static int smfs_unlink(struct inode *dir, struct dentry *dentry)
+static int smfs_unlink(struct inode * dir, 
+		       struct dentry *dentry)
 {
-        struct inode *cache_dir = I2CI(dir);
-        struct inode *cache_inode = I2CI(dentry->d_inode);
-        struct dentry *cache_dentry;
-        struct dentry *cache_parent;
-        void   *handle = NULL;
-        int    rc = 0, flag;
-
-        if (!cache_dir || !cache_inode)
-                RETURN(-ENOENT);
-
-        handle = smfs_trans_start(dir, FSFILT_OP_UNLINK, NULL);
-        if (IS_ERR(handle))
-                RETURN(-ENOSPC);
-
-        SMFS_CACHE_HOOK_PRE(CACHE_HOOK_UNLINK, handle, dir);
-
-        cache_parent = pre_smfs_dentry(NULL, cache_dir, dentry);
-        cache_dentry = pre_smfs_dentry(cache_parent, cache_inode, dentry);
-
-        if (!cache_parent || !cache_dentry)
-                GOTO(exit, rc = -ENOMEM);
-
-        if (smfs_do_rec(dir) && dentry->d_inode->i_nlink == 1) {
-                /*For unlink, we do not really unlink this
-                 *inode and just remove it to a tmp dir for
-                 *undo later, the inode will be deleted when
-                 *the corresponding rec will be cancelled*/
-                flag = 0;
-                SMFS_KML_POST(dir, dentry, &flag, NULL, REINT_UNLINK,
-                              "unlink", rc, exit);
-        } else {
-                lock_kernel();
-                pre_smfs_inode(dir, cache_dir);
-                pre_smfs_inode(dentry->d_inode, cache_inode);
-                if (cache_dir->i_op->unlink)
-                        rc = cache_dir->i_op->unlink(cache_dir, cache_dentry);
-                post_smfs_inode(dentry->d_inode, cache_dentry->d_inode);
-                post_smfs_inode(dir, cache_dir);
-                post_smfs_dentry(cache_dentry);
-                unlock_kernel();
-                flag = 1;
-                SMFS_KML_POST(dir, dentry, &flag, NULL, REINT_UNLINK,
-                              "dec_link", rc, exit);
-        }
-
-        SMFS_CACHE_HOOK_POST(CACHE_HOOK_UNLINK, handle, dir, dentry,
-                             NULL, NULL, rc, exit);
-exit:
-        smfs_trans_commit(dir, handle, 0);
-        RETURN(rc);
+	struct inode *cache_dir = I2CI(dir);
+	struct inode *cache_inode = I2CI(dentry->d_inode);
+	struct dentry *cache_dentry;
+	struct dentry parent; 
+	int    rc = 0;
+
+	if (!cache_dir || !cache_inode)
+		RETURN(-ENOENT);
+	
+	prepare_parent_dentry(&parent, cache_dir);
+	cache_dentry = d_alloc(&parent, &dentry->d_name);
+	d_add(cache_dentry, cache_inode);
+
+	if (cache_dir->i_op->unlink)
+		rc = cache_dir->i_op->unlink(cache_dir, cache_dentry);
+
+	
+	post_smfs_inode(dentry->d_inode, cache_dentry->d_inode);
+	post_smfs_inode(dir, cache_dir);
+	
+	igrab(cache_dentry->d_inode);
+
+	d_unalloc(cache_dentry);	
+	RETURN(rc);	
 }
 
-static int smfs_symlink (struct inode *dir, struct dentry *dentry,
-                         const char *symname)
+static int smfs_symlink (struct inode * dir,
+                	 struct dentry *dentry, 
+			 const char * symname)
 {
-        struct inode *cache_dir = I2CI(dir);
-        struct inode *inode = NULL;
-        struct dentry *cache_dentry;
-        struct dentry *cache_parent;
-        void   *handle = NULL;
-        int    rc = 0;
-
-        if (!cache_dir)
-                RETURN(-ENOENT);
-
-        cache_parent = pre_smfs_dentry(NULL, cache_dir, dentry);
-        cache_dentry = pre_smfs_dentry(cache_parent, NULL, dentry);
-
-        if (!cache_parent || !cache_dentry)
-                GOTO(exit, rc = -ENOMEM);
-
-        handle = smfs_trans_start(dir, FSFILT_OP_SYMLINK, NULL);
-        if (IS_ERR(handle))
-                RETURN(-ENOSPC);
-
-        SMFS_CACHE_HOOK_PRE(CACHE_HOOK_SYMLINK, handle, dir);
-
-        pre_smfs_inode(dir, cache_dir);
-        lock_kernel();
-        if (cache_dir->i_op->symlink)
-                rc = cache_dir->i_op->symlink(cache_dir, cache_dentry, symname);
-
-        inode = iget(dir->i_sb, cache_dentry->d_inode->i_ino);
-
-        post_smfs_inode(dir, cache_dir);
-        if (inode)
-                d_instantiate(dentry, inode);
-        else
-                rc = -ENOENT;
-
-        SMFS_KML_POST(dir, dentry, (char*)symname, NULL, REINT_CREATE,
-                      "symlink", rc, exit);
-
-        SMFS_CACHE_HOOK_POST(CACHE_HOOK_SYMLINK, handle, dir, dentry,
-                             NULL, NULL, rc, exit);
-exit:
-        unlock_kernel();
-        post_smfs_dentry(cache_dentry);
-        smfs_trans_commit(dir, handle, 0);
-        RETURN(rc);
+	struct inode *cache_dir = I2CI(dir);
+	struct inode *cache_inode = NULL;
+	struct inode *inode = NULL;
+	struct dentry *cache_dentry; 
+	struct dentry parent; 
+	int    rc = 0;
+
+	if (!cache_dir) 
+		RETURN(-ENOENT);
+	
+	prepare_parent_dentry(&parent, cache_dir);
+	cache_dentry = d_alloc(&parent, &dentry->d_name);
+
+	if (cache_dir->i_op->symlink)
+		rc = cache_dir->i_op->symlink(cache_dir, cache_dentry, symname);
+	
+	cache_inode = igrab(cache_dentry->d_inode);
+	
+	inode = iget(dir->i_sb, cache_inode->i_ino);
+
+	if (inode)
+		d_instantiate(dentry, inode);
+	else
+		rc = -ENOENT;
+	
+	d_unalloc(cache_dentry);	
+	
+	RETURN(rc);			
 }
 
-static int smfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
+static int smfs_mkdir(struct inode * dir, 
+		      struct dentry * dentry, 
+		      int mode)
 {
-        struct inode *cache_dir = I2CI(dir);
-        struct inode *inode = NULL;
-        struct dentry *cache_dentry;
-        struct dentry *cache_parent;
-        void   *handle = NULL;
-        int    rc = 0;
-
-        if (!cache_dir)
-                RETURN(-ENOENT);
-
-        handle = smfs_trans_start(dir, FSFILT_OP_MKDIR, NULL);
-        if (IS_ERR(handle))
-                RETURN(-ENOSPC);
-
-        SMFS_CACHE_HOOK_PRE(CACHE_HOOK_MKDIR, handle, dir);
-
-        cache_parent = pre_smfs_dentry(NULL, cache_dir, dentry);
-        cache_dentry = pre_smfs_dentry(cache_parent, NULL, dentry);
-
-        lock_kernel();
-        if (!cache_parent || !cache_dentry)
-                GOTO(exit, rc = -ENOMEM);
-
-        pre_smfs_inode(dir, cache_dir);
-
-        if (cache_dir->i_op->mkdir)
-                rc = cache_dir->i_op->mkdir(cache_dir, cache_dentry, mode);
-
-        inode = iget(dir->i_sb, cache_dentry->d_inode->i_ino);
-
-        if (!inode)
-                GOTO(exit, rc = -ENOENT);
-
-        d_instantiate(dentry, inode);
-        post_smfs_inode(dir, cache_dir);
-
-        SMFS_KML_POST(dir, dentry, NULL, NULL, REINT_CREATE, "mkdir", rc, exit);
-
-        SMFS_CACHE_HOOK_POST(CACHE_HOOK_MKDIR, handle,
-                             dir, dentry, NULL, NULL, rc, exit);
+	struct inode *cache_dir = I2CI(dir);
+	struct inode *cache_inode = NULL;
+	struct inode *inode = NULL;
+	struct dentry *cache_dentry;
+	struct dentry parent;
+	void   *handle;
+	int    rc = 0;
+
+	if (!cache_dir) 
+		RETURN(-ENOENT);
+
+	handle = smfs_trans_start(cache_dir, KML_OPCODE_MKDIR);
+	if (IS_ERR(handle) ) {
+                CERROR("smfs_do_mkdir: no space for transaction\n");
+        	RETURN(-ENOSPC);
+	}
+	
+	prepare_parent_dentry(&parent, cache_dir);
+	cache_dentry = d_alloc(&parent, &dentry->d_name);
+
+	pre_smfs_inode(dir, cache_dir);
+	lock_kernel();	
+	if (cache_dir->i_op->mkdir)
+		rc = cache_dir->i_op->mkdir(cache_dir, cache_dentry, mode);
+
+	cache_inode = igrab(cache_dentry->d_inode);
+
+	inode = iget(dir->i_sb, cache_inode->i_ino);
+
+	if (!inode)
+		GOTO(exit, rc = -ENOENT);
+ 
+	d_instantiate(dentry, inode);	
+	/*Do KML post hook*/
+	if (smfs_do_kml(dir)) {
+		rc = post_kml_mkdir(dir, dentry);
+		GOTO(exit, rc);
+	}
+	post_smfs_inode(dir, cache_dir);
 exit:
-        unlock_kernel();
-        post_smfs_dentry(cache_dentry);
-        smfs_trans_commit(dir, handle, 0);
-        RETURN(rc);
+	unlock_kernel();	
+	smfs_trans_commit(handle);
+	d_unalloc(cache_dentry);
+	RETURN(rc);		
 }
 
-static int smfs_rmdir(struct inode * dir, struct dentry *dentry)
+static int  smfs_rmdir(struct inode * dir, 
+		       struct dentry *dentry) 
 {
-        struct inode *cache_dir = I2CI(dir);
-        struct inode *cache_inode = I2CI(dentry->d_inode);
-        struct dentry *cache_dentry = NULL;
-        struct dentry *cache_parent = NULL;
-        void *handle = NULL;
-        int    rc = 0, flag;
-
-        if (!cache_dir)
-                RETURN(-ENOENT);
-
-        handle = smfs_trans_start(dir, FSFILT_OP_RMDIR, NULL);
-        if (IS_ERR(handle)) {
-                CERROR("smfs_do_mkdir: no space for transaction\n");
-                RETURN(-ENOSPC);
-        }
-
-        SMFS_CACHE_HOOK_PRE(CACHE_HOOK_RMDIR, handle, dir);
-
-        if (smfs_do_rec(dir)) {
-                /*For rmdir, we do not really unlink this
-                 *inode and just remove it to a tmp dir for
-                 *undo later, the inode will be deleted when
-                 *the corresponding rec will be cancelled*/
-                if (dentry->d_inode->i_nlink == 2) {
-                        flag = 0;
-                        SMFS_KML_POST(dir, dentry, &flag, NULL,
-                                      REINT_UNLINK, "rmdir", rc, exit);
-                }
-        } else {
-                cache_parent = pre_smfs_dentry(NULL, cache_dir, dentry);
-                cache_dentry = pre_smfs_dentry(cache_parent, cache_inode,
-                                               dentry);
-
-                lock_kernel();
-                if (!cache_parent || !cache_dentry)
-                        GOTO(exit, rc = -ENOMEM);
-
-                pre_smfs_inode(dir, cache_dir);
-                pre_smfs_inode(dentry->d_inode, cache_dentry->d_inode);
-                if (cache_dir->i_op->rmdir)
-                        rc = cache_dir->i_op->rmdir(cache_dir, cache_dentry);
-
-                post_smfs_inode(dir, cache_dir);
-                post_smfs_inode(dentry->d_inode, cache_dentry->d_inode);
-                unlock_kernel();
-        }
-        SMFS_CACHE_HOOK_POST(CACHE_HOOK_RMDIR, handle, dir, dentry,
-                             NULL, NULL, rc, exit);
-exit:
-        post_smfs_dentry(cache_dentry);
-        smfs_trans_commit(dir, handle, 0);
-        RETURN(rc);
+	struct inode *cache_dir = I2CI(dir);
+	struct inode *cache_inode = I2CI(dentry->d_inode);
+	struct dentry *cache_dentry;
+	struct dentry parent;
+	int    rc = 0;
+
+	if (!cache_dir) 
+		RETURN(-ENOENT);
+	
+	prepare_parent_dentry(&parent, cache_dir);
+	cache_dentry = d_alloc(&parent, &dentry->d_name);
+	d_add(cache_dentry, cache_inode);
+	igrab(cache_inode);
+	
+	pre_smfs_inode(dir, cache_dir);
+	pre_smfs_inode(dentry->d_inode, cache_dentry->d_inode);
+	
+	
+	if (cache_dir->i_op->rmdir)
+		rc = cache_dir->i_op->rmdir(cache_dir, cache_dentry);
+
+	post_smfs_inode(dir, cache_dir);
+	post_smfs_inode(dentry->d_inode, cache_dentry->d_inode);
+	d_unalloc(cache_dentry);
+	RETURN(rc);		
 }
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-static int smfs_mknod(struct inode *dir, struct dentry *dentry,
+static int smfs_mknod(struct inode * dir, struct dentry *dentry,
                       int mode, int rdev)
-#else
-static int smfs_mknod(struct inode *dir, struct dentry *dentry,
-                      int mode, dev_t rdev)
-#endif
 {
-        struct inode *cache_dir = I2CI(dir);
-        struct inode *inode = NULL;
-        struct dentry *cache_dentry = NULL;
-        struct dentry *cache_parent = NULL;
-        void *handle = NULL;
-        int rc = 0;
-
-        if (!cache_dir)
-                RETURN(-ENOENT);
-
-        handle = smfs_trans_start(dir, FSFILT_OP_MKNOD, NULL);
-        if (IS_ERR(handle)) {
-                CERROR("smfs_do_mkdir: no space for transaction\n");
-                RETURN(-ENOSPC);
-        }
-        SMFS_CACHE_HOOK_PRE(CACHE_HOOK_MKNOD, handle, dir);
-
-        cache_parent = pre_smfs_dentry(NULL, cache_dir, dentry->d_parent);
-        cache_dentry = pre_smfs_dentry(cache_parent, NULL, dentry);
-        lock_kernel();
-        if (!cache_parent || !cache_dentry)
-                GOTO(exit, rc = -ENOMEM);
-
-        pre_smfs_inode(dir, cache_dir);
-        pre_smfs_inode(dentry->d_inode, cache_dentry->d_inode);
-
-        if (!cache_dir->i_op->mknod)
-                RETURN(-ENOENT);
-
-        rc = cache_dir->i_op->mknod(cache_dir, cache_dentry, mode, rdev);
-        if (rc)
-                GOTO(exit, rc);
-
-        inode = iget(dir->i_sb, cache_dentry->d_inode->i_ino);
-        d_instantiate(dentry, inode);
-
-        post_smfs_inode(dir, cache_dir);
-        post_smfs_inode(dentry->d_inode, cache_dentry->d_inode);
-
-        SMFS_KML_POST(dir, dentry, NULL, NULL,
-                      REINT_CREATE, "mknod", rc, exit);
-
-        SMFS_CACHE_HOOK_POST(CACHE_HOOK_MKNOD, handle, dir,
-                             dentry, NULL, NULL, rc, exit);
+	struct inode *cache_dir = I2CI(dir);
+	struct inode *inode = NULL;
+	struct inode *cache_inode = NULL;
+	struct dentry *cache_dentry;
+	struct dentry parent;
+	int    rc = 0;
+
+	if (!cache_dir) 
+		RETURN(-ENOENT);
+
+	prepare_parent_dentry(&parent, cache_dir);
+	cache_dentry = d_alloc(&parent, &dentry->d_name);
+	
+	pre_smfs_inode(dir, cache_dir);
+	pre_smfs_inode(dentry->d_inode, cache_dentry->d_inode);
+	
+	if (cache_dir->i_op->mknod)
+		rc = cache_dir->i_op->mknod(cache_dir, cache_dentry, mode, rdev);
+	
+	if (cache_dentry->d_inode)
+		cache_inode = igrab(cache_dentry->d_inode);
+	if (rc)
+		GOTO(exit, rc);
+	
+	inode = iget(dir->i_sb, cache_inode->i_ino);
+	d_instantiate(dentry, inode);
+	post_smfs_inode(dir, cache_dir);
+	post_smfs_inode(dentry->d_inode, cache_dentry->d_inode);
 exit:
-        unlock_kernel();
-        post_smfs_dentry(cache_dentry);
-        smfs_trans_commit(dir, handle, 0);
-        RETURN(rc);
+	d_unalloc(cache_dentry);
+	RETURN(rc);		
 }
-
 static int smfs_rename(struct inode * old_dir, struct dentry *old_dentry,
                        struct inode * new_dir,struct dentry *new_dentry)
 {
-        struct inode *cache_old_dir = I2CI(old_dir);
-        struct inode *cache_new_dir = I2CI(new_dir);
-        struct inode *cache_old_inode = I2CI(old_dentry->d_inode);
-
-        struct inode *cache_new_inode = new_dentry->d_inode ?
-            I2CI(new_dentry->d_inode) : NULL;
-
-        struct dentry *cache_old_dentry = NULL;
-        struct dentry *cache_new_dentry = NULL;
-        struct dentry *cache_new_parent = NULL;
-        struct dentry *cache_old_parent = NULL;
-        void *handle = NULL;
-        int    rc = 0;
-
-        if (!cache_old_dir || !cache_new_dir || !cache_old_inode)
-                RETURN(-ENOENT);
-
-        handle = smfs_trans_start(old_dir, FSFILT_OP_RENAME, NULL);
-        if (IS_ERR(handle)) {
-                CERROR("smfs_do_mkdir: no space for transaction\n");
-                RETURN(-ENOSPC);
-        }
-        lock_kernel();
-
-        SMFS_CACHE_HOOK_PRE(CACHE_HOOK_RENAME, handle, old_dir);
-
-        cache_old_parent = pre_smfs_dentry(NULL, cache_old_dir, old_dentry);
-        cache_old_dentry = pre_smfs_dentry(cache_old_parent, cache_old_inode,
-                                           old_dentry);
-        if (!cache_old_parent || !cache_old_dentry)
-                GOTO(exit, rc = -ENOMEM);
-
-        cache_new_parent = pre_smfs_dentry(NULL, cache_new_dir, new_dentry);
-        cache_new_dentry = pre_smfs_dentry(cache_new_parent, cache_new_inode,
-                                           new_dentry);
-        if (!cache_new_parent || !cache_new_dentry)
-                GOTO(exit, rc = -ENOMEM);
-
-        pre_smfs_inode(old_dir, cache_old_dir);
-        pre_smfs_inode(new_dir, cache_new_dir);
-
-        if (cache_old_dir->i_op->rename)
-                rc = cache_old_dir->i_op->rename(cache_old_dir, cache_old_dentry,
-                                                 cache_new_dir, cache_new_dentry);
-
-        post_smfs_inode(old_dir, cache_old_dir);
-        post_smfs_inode(new_dir, cache_new_dir);
-
-        SMFS_KML_POST(old_dir, old_dentry, new_dir,
-                      new_dentry, REINT_RENAME, "rename", rc, exit);
-        if (new_dentry->d_inode)
-                post_smfs_inode(new_dentry->d_inode, cache_new_dentry->d_inode);
-
-        SMFS_CACHE_HOOK_POST(CACHE_HOOK_RENAME, handle, old_dir, old_dentry,
-                             new_dir, new_dentry, rc, exit);
-exit:
-        unlock_kernel();
-        post_smfs_dentry(cache_old_dentry);
-        post_smfs_dentry(cache_new_dentry);
-        smfs_trans_commit(old_dir, handle, 0);
-        RETURN(rc);
+	struct inode *cache_old_dir = I2CI(old_dir);
+	struct inode *cache_new_dir = I2CI(new_dir);
+	struct inode *cache_old_inode = I2CI(old_dentry->d_inode);
+	struct dentry *cache_old_dentry;
+	struct dentry *cache_new_dentry;
+	struct dentry parent_new;
+	struct dentry parent_old;
+	int    rc = 0;
+
+	if (!cache_old_dir || !cache_new_dir || !cache_old_inode) 
+		RETURN(-ENOENT);
+	
+	prepare_parent_dentry(&parent_old, cache_old_dir);
+	cache_old_dentry = d_alloc(&parent_old, &old_dentry->d_name);
+	d_add(cache_old_dentry, cache_old_inode);
+	igrab(cache_old_inode);	
+
+	prepare_parent_dentry(&parent_new, cache_new_dir);
+	cache_new_dentry = d_alloc(&parent_new, &new_dentry->d_name);
+	
+	pre_smfs_inode(old_dir, cache_old_dir) ;
+	pre_smfs_inode(new_dir, cache_new_dir);
+	
+	if (cache_old_dir->i_op->rename)
+		rc = cache_old_dir->i_op->rename(cache_old_dir, cache_old_dentry,
+					         cache_new_dir, cache_new_dentry);
+
+	post_smfs_inode(old_dir, cache_old_dir) ;
+	post_smfs_inode(new_dir, cache_new_dir);
+	if (cache_new_dentry->d_inode) {
+		igrab(cache_new_dentry->d_inode);	
+	}
+	d_unalloc(cache_old_dentry);
+	d_unalloc(cache_new_dentry);
+	RETURN(rc);		
 }
 
 struct inode_operations smfs_dir_iops = {
-        create:         smfs_create,
-        lookup:         smfs_lookup,
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-        lookup_raw:     smfs_lookup_raw,        /* BKL held */
-#endif
+	create:		smfs_create,
+	lookup:		smfs_lookup,
+	lookup_raw:     smfs_lookup_raw,        /* BKL held */
         link:           smfs_link,              /* BKL held */
         unlink:         smfs_unlink,            /* BKL held */
         symlink:        smfs_symlink,           /* BKL held */
@@ -613,65 +421,58 @@ struct inode_operations smfs_dir_iops = {
         removexattr:    smfs_removexattr,       /* BKL held */
 };
 
-static ssize_t smfs_read_dir(struct file *filp, char *buf,
-                             size_t size, loff_t *ppos)
+static ssize_t smfs_read_dir(struct file *filp, char *buf, 
+			     size_t size, loff_t *ppos)
 {
-        struct dentry *dentry = filp->f_dentry;
-        struct inode *cache_inode = NULL;
-        struct smfs_file_info *sfi = NULL;
-        loff_t tmp_ppos;
-        loff_t *cache_ppos;
-        int    rc = 0;
-
-        cache_inode = I2CI(dentry->d_inode);
-
-        if (!cache_inode)
-                RETURN(-EINVAL);
-
-        sfi = F2SMFI(filp);
-        if (sfi->magic != SMFS_FILE_MAGIC) BUG();
-
-        if (ppos != &(filp->f_pos))
-                cache_ppos = &tmp_ppos;
-        else
-                cache_ppos = &sfi->c_file->f_pos;
-        *cache_ppos = *ppos;
-
-        if (cache_inode->i_fop->read)
-                rc = cache_inode->i_fop->read(sfi->c_file, buf, size,
-                                              cache_ppos);
-
-        *ppos = *cache_ppos;
-        duplicate_file(filp, sfi->c_file);
-        RETURN(rc);
+	struct dentry *dentry = filp->f_dentry;
+	struct inode *cache_inode = NULL;
+        struct  file open_file;
+	struct  dentry open_dentry;
+	int    rc = 0;
+	
+	cache_inode = I2CI(dentry->d_inode);
+
+	if (!cache_inode) 
+		RETURN(-EINVAL);
+
+	smfs_prepare_cachefile(dentry->d_inode, filp, cache_inode, 
+			       &open_file, &open_dentry);
+	
+	if (cache_inode->i_fop->read)
+		rc = cache_inode->i_fop->read(&open_file, buf, size, ppos);
+
+	smfs_update_file(filp, &open_file);	
+	RETURN(rc);	
 }
 
-static int smfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
+static int smfs_readdir(struct file * filp,
+                        void * dirent, 
+			filldir_t filldir)
 {
-        struct dentry *dentry = filp->f_dentry;
-        struct inode *cache_inode = NULL;
-        struct smfs_file_info *sfi = NULL;
-        int    rc = 0;
-
-        cache_inode = I2CI(dentry->d_inode);
-        if (!cache_inode)
-                RETURN(-EINVAL);
-
-        sfi = F2SMFI(filp);
-        if (sfi->magic != SMFS_FILE_MAGIC) BUG();
-
-        if (cache_inode->i_fop->readdir)
-                rc = cache_inode->i_fop->readdir(sfi->c_file, dirent, filldir);
-
-        duplicate_file(filp, sfi->c_file);
-        RETURN(rc);
+	struct dentry *dentry = filp->f_dentry;
+	struct inode *cache_inode = NULL;
+        struct  file open_file;
+	struct  dentry open_dentry;
+	int    rc = 0;
+	
+	cache_inode = I2CI(dentry->d_inode);
+
+	if (!cache_inode) 
+		RETURN(-EINVAL);
+
+	smfs_prepare_cachefile(dentry->d_inode, filp, cache_inode, 
+			       &open_file, &open_dentry);
+	
+	if (cache_inode->i_fop->readdir)
+		rc = cache_inode->i_fop->readdir(&open_file, dirent, filldir);
+	
+	smfs_update_file(filp, &open_file);	
+	RETURN(rc);	
 }
 
 struct file_operations smfs_dir_fops = {
-        read:           smfs_read_dir,
+	read:   	smfs_read_dir,	
         readdir:        smfs_readdir,           /* BKL held */
         ioctl:          smfs_ioctl,             /* BKL held */
         fsync:          smfs_fsync,         /* BKL held */
-        open:           smfs_open,
-        release:        smfs_release,
 };
diff --git a/lustre/smfs/file.c b/lustre/smfs/file.c
index b56da39..eaf1901 100644
--- a/lustre/smfs/file.c
+++ b/lustre/smfs/file.c
@@ -1,23 +1,5 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
- *  Copyright (C) 2004 Cluster File Systems, Inc.
- *
- *   This file is part of Lustre, http://www.lustre.org.
- *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
- *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
+/*
+ * file.c
  */
 
 #define DEBUG_SUBSYSTEM S_SM
@@ -29,493 +11,448 @@
 #include <linux/stat.h>
 #include <linux/unistd.h>
 #include <linux/pagemap.h>
-#include <linux/file.h>
-#include <linux/fs.h>
-#include <linux/obd_class.h>
-#include <linux/obd_support.h>
-#include <linux/lustre_lib.h>
 #include <linux/lustre_idl.h>
-#include <linux/lustre_fsfilt.h>
-#include <linux/lustre_smfs.h>
-
-#include "smfs_internal.h"
-
-static ssize_t smfs_write(struct file *filp, const char *buf, size_t count,
-                          loff_t *ppos)
+#include "smfs_internal.h" 
+        
+/* instantiate a file handle to the cache file */
+void smfs_prepare_cachefile(struct inode *inode,
+			    struct file *file, 
+			    struct inode *cache_inode,
+			    struct file *cache_file,
+			    struct dentry *cache_dentry)
 {
-        struct inode *cache_inode;
-        struct smfs_file_info *sfi;
-        loff_t tmp_ppos;
-        loff_t *cache_ppos;
-        int rc = 0;
-        ENTRY;
-
-        cache_inode = I2CI(filp->f_dentry->d_inode);
+	ENTRY;
+	cache_file->f_pos = file->f_pos;
+        cache_file->f_mode = file->f_mode;
+        cache_file->f_flags = file->f_flags;
+        cache_file->f_count  = file->f_count;
+        cache_file->f_owner  = file->f_owner;
+	cache_file->f_error = file->f_error;
+	cache_file->f_op = inode->i_fop;
+	cache_file->f_dentry = cache_dentry;
+        cache_file->f_dentry->d_inode = cache_inode;
+	cache_file->f_vfsmnt = file->f_vfsmnt;
+	cache_file->private_data = file->private_data;
+	cache_file->f_it = file->f_it;
+	cache_file->f_reada = file->f_reada;
+	cache_file->f_ramax = file->f_ramax;
+	cache_file->f_raend = file->f_raend;
+	cache_file->f_ralen = file->f_ralen;
+	cache_file->f_rawin = file->f_rawin;
+	EXIT;
+}
+/* update file structs*/
+void smfs_update_file(struct file *file, 
+		      struct file *cache_file)
+{
+	ENTRY;
+	file->f_pos = cache_file->f_pos;
+        file->f_mode = cache_file->f_mode;
+        file->f_flags = cache_file->f_flags;
+        file->f_count  = cache_file->f_count;
+        file->f_owner  = cache_file->f_owner;
+ 	file->f_reada = cache_file->f_reada;
+	file->f_ramax = cache_file->f_ramax;
+	file->f_raend = cache_file->f_raend;
+	file->f_ralen = cache_file->f_ralen;
+	file->f_rawin = cache_file->f_rawin;
+	EXIT;
+}
 
+static ssize_t smfs_write (struct file *filp, const char *buf, 
+			   size_t count, loff_t *ppos)
+{
+	struct	inode *cache_inode;
+	struct  dentry *dentry = filp->f_dentry;
+	struct  inode *inode = dentry->d_inode;
+        struct  file open_file;
+	struct  dentry open_dentry;
+	loff_t  tmp_ppos;
+	loff_t  *cache_ppos;
+	int 	rc = 0;
+	
+	ENTRY;
+	
+	cache_inode = I2CI(inode);
+ 
         if (!cache_inode)
                 RETURN(-ENOENT);
-
-        sfi = F2SMFI(filp);
-
-        if (sfi->magic != SMFS_FILE_MAGIC)
-                BUG();
-
-        if (ppos != &(filp->f_pos))
-                cache_ppos = &tmp_ppos;
-        else
-                cache_ppos = &sfi->c_file->f_pos;
-        *cache_ppos = *ppos;
-
-        pre_smfs_inode(filp->f_dentry->d_inode, cache_inode);
-
-        if (cache_inode->i_fop->write)
-                rc = cache_inode->i_fop->write(sfi->c_file, buf, count,
-                                               cache_ppos);
-
-        post_smfs_inode(filp->f_dentry->d_inode, cache_inode);
-        SMFS_KML_POST(filp->f_dentry->d_inode, filp->f_dentry,
-                      &count ,ppos, REINT_WRITE, "write", rc, exit);
-exit:
-        *ppos = *cache_ppos;
-        duplicate_file(filp, sfi->c_file);
-        RETURN(rc);
+	
+	if (ppos != &(filp->f_pos)) {
+		cache_ppos = &tmp_ppos;	
+	} else {
+		cache_ppos = &open_file.f_pos; 
+	}
+	*cache_ppos = *ppos;
+	
+	smfs_prepare_cachefile(inode, filp, cache_inode, 
+			       &open_file, &open_dentry);
+	pre_smfs_inode(inode, cache_inode);
+	
+	if (cache_inode->i_fop->write)
+		rc = cache_inode->i_fop->write(&open_file, buf, count, cache_ppos);
+	
+	*ppos = *cache_ppos;
+	post_smfs_inode(inode, cache_inode);
+	smfs_update_file(filp, &open_file);
+
+	RETURN(rc);
 }
 
-int smfs_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
-               unsigned long arg)
+int smfs_ioctl(struct inode * inode, struct file * filp, 
+	       unsigned int cmd, unsigned long arg)
 {
-        struct inode *cache_inode;
-        struct smfs_file_info *sfi;
-        ssize_t rc = 0;
-        ENTRY;
-
-        cache_inode = I2CI(filp->f_dentry->d_inode);
+	struct	inode *cache_inode;
+	struct  dentry *dentry = filp->f_dentry;
+        struct  file open_file;
+	struct  dentry open_dentry;
+	ssize_t rc = 0;
+	
+	ENTRY;
+	
+	cache_inode = I2CI(dentry->d_inode);
         if (!cache_inode)
                 RETURN(-ENOENT);
 
-        sfi = F2SMFI(filp);
-        if (sfi->magic != SMFS_FILE_MAGIC)
-                BUG();
-
-        pre_smfs_inode(inode, cache_inode);
-
-        if (cache_inode->i_fop->ioctl)
-                rc = cache_inode->i_fop->ioctl(cache_inode, sfi->c_file, cmd,
-                                               arg);
-
-        post_smfs_inode(inode, cache_inode);
-        duplicate_file(filp, sfi->c_file);
-
+	smfs_prepare_cachefile(inode, filp, cache_inode, 
+			       &open_file, &open_dentry);
+	
+	if (cache_inode->i_fop->ioctl)
+		rc = cache_inode->i_fop->ioctl(cache_inode, &open_file, cmd, arg);
+		
+	post_smfs_inode(inode, cache_inode);
+	smfs_update_file(filp, &open_file);
         RETURN(rc);
 }
 
-static ssize_t smfs_read(struct file *filp, char *buf, size_t count,
-                         loff_t *ppos)
+static ssize_t smfs_read (struct file *filp, char *buf, 
+			  size_t count, loff_t *ppos)
 {
-        struct inode *cache_inode;
-        struct smfs_file_info *sfi;
-        loff_t tmp_ppos;
-        loff_t *cache_ppos;
-        ssize_t rc = 0;
-        ENTRY;
-
-        cache_inode = I2CI(filp->f_dentry->d_inode);
+	struct	inode *cache_inode;
+	struct  dentry *dentry = filp->f_dentry;
+	struct  inode *inode = dentry->d_inode;
+        struct  file open_file;
+	struct  dentry open_dentry;
+	loff_t  tmp_ppos;
+	loff_t  *cache_ppos;
+	ssize_t rc = 0;
+	
+	ENTRY;
+	
+	cache_inode = I2CI(dentry->d_inode);
         if (!cache_inode)
                 RETURN(-ENOENT);
 
-        sfi = F2SMFI(filp);
-        if (sfi->magic != SMFS_FILE_MAGIC)
-                BUG();
-
-        if (ppos != &(filp->f_pos))
-                cache_ppos = &tmp_ppos;
-        else
-                cache_ppos = &sfi->c_file->f_pos;
-        *cache_ppos = *ppos;
-
-        pre_smfs_inode(filp->f_dentry->d_inode, cache_inode);
-
-        if (cache_inode->i_fop->read)
-                rc = cache_inode->i_fop->read(sfi->c_file, buf, count,
-                                              cache_ppos);
-
-        *ppos = *cache_ppos;
-        post_smfs_inode(filp->f_dentry->d_inode, cache_inode);
-        duplicate_file(filp, sfi->c_file);
-
-        RETURN(rc);
+	if (ppos != &(filp->f_pos)) {
+		cache_ppos = &tmp_ppos;	
+	} else {
+		cache_ppos = &open_file.f_pos; 
+	}
+	*cache_ppos = *ppos;
+	
+	
+	smfs_prepare_cachefile(inode, filp, cache_inode, 
+			       &open_file, &open_dentry);
+
+	
+	pre_smfs_inode(inode, cache_inode);
+	if (cache_inode->i_fop->read)
+		rc = cache_inode->i_fop->read(&open_file, buf, count, cache_ppos);
+    
+	*ppos = *cache_ppos;
+	post_smfs_inode(inode, cache_inode);
+	smfs_update_file(filp, &open_file);
+	RETURN(rc);
 }
 
-static loff_t smfs_llseek(struct file *file, loff_t offset, int origin)
+static loff_t smfs_llseek(struct file *file, 
+		          loff_t offset, 
+		          int origin)
 {
-        struct inode *cache_inode;
-        struct smfs_file_info *sfi;
-        ssize_t rc = 0;
-        ENTRY;
-
-        cache_inode = I2CI(file->f_dentry->d_inode);
+	struct	inode *cache_inode;
+	struct  dentry *dentry = file->f_dentry;
+        struct  file open_file;
+	struct  dentry open_dentry;
+	ssize_t rc = 0;
+	
+	ENTRY;
+	
+	cache_inode = I2CI(dentry->d_inode);
         if (!cache_inode)
                 RETURN(-ENOENT);
 
-        sfi = F2SMFI(file);
-        if (sfi->magic != SMFS_FILE_MAGIC)
-                BUG();
-
-        pre_smfs_inode(file->f_dentry->d_inode, cache_inode);
-
-        if (cache_inode->i_fop->llseek)
-                rc = cache_inode->i_fop->llseek(sfi->c_file, offset, origin);
-
-        post_smfs_inode(file->f_dentry->d_inode, cache_inode);
-        duplicate_file(file, sfi->c_file);
+	smfs_prepare_cachefile(dentry->d_inode, file, cache_inode, 
+			       &open_file, &open_dentry);
+	
+	pre_smfs_inode(dentry->d_inode, cache_inode);
+	if (cache_inode->i_fop->llseek)
+		rc = cache_inode->i_fop->llseek(&open_file, offset, origin);
 
+	post_smfs_inode(dentry->d_inode, cache_inode);
+	smfs_update_file(file, &open_file);
+		
         RETURN(rc);
 }
 
-static int smfs_mmap(struct file *file, struct vm_area_struct *vma)
+static int smfs_mmap(struct file * file, struct vm_area_struct * vma)
 {
         struct inode *inode = file->f_dentry->d_inode;
-        struct smfs_file_info *sfi;
         struct inode *cache_inode = NULL;
-        int rc = 0;
-        ENTRY;
+        struct  file open_file;
+	struct  dentry open_dentry;
+	int    rc = 0;
 
-        cache_inode = I2CI(inode);
+	cache_inode = I2CI(inode);
         if (!cache_inode)
                 RETURN(-ENOENT);
 
-        sfi = F2SMFI(file);
-        if (sfi->magic != SMFS_FILE_MAGIC)
-                BUG();
-
-        if (cache_inode->i_mapping == &cache_inode->i_data)
+	smfs_prepare_cachefile(inode, file, cache_inode, 
+			       &open_file, &open_dentry);
+  
+	if (cache_inode->i_mapping == &cache_inode->i_data)
                 inode->i_mapping = cache_inode->i_mapping;
 
-        pre_smfs_inode(inode, cache_inode);
-        if (cache_inode->i_fop->mmap)
-                rc = cache_inode->i_fop->mmap(sfi->c_file, vma);
-
-        post_smfs_inode(inode, cache_inode);
-        duplicate_file(file, sfi->c_file);
-
-        RETURN(rc);
-}
-
-static int smfs_init_cache_file(struct inode *inode, struct file *filp)
-{
-        struct smfs_file_info *sfi = NULL;
-        struct file *cache_filp = NULL;
-        struct dentry *cache_dentry = NULL;
-        int rc = 0;
-        ENTRY;
-
-        OBD_ALLOC(sfi, sizeof(struct smfs_file_info));
-        if (!sfi)
-                RETURN(-ENOMEM);
-
-        cache_filp = get_empty_filp();
-        if (!cache_filp)
-                GOTO(err_exit, rc = -ENOMEM);
-
-        sfi->magic = SMFS_FILE_MAGIC;
-
-        cache_dentry = pre_smfs_dentry(NULL, I2CI(inode), filp->f_dentry);
-        if (!cache_dentry)
-                GOTO(err_exit, rc = -ENOMEM);
-
-        cache_filp->f_vfsmnt = filp->f_vfsmnt;
-
-        cache_filp->f_dentry = cache_dentry;
-        duplicate_file(cache_filp, filp);
-
-        sfi->c_file = cache_filp;
-
-        if (filp->private_data != NULL)
-                BUG();
-
-        filp->private_data = sfi;
-
-        RETURN(rc);
-err_exit:
-        if (sfi)
-                OBD_FREE(sfi, sizeof(struct smfs_file_info));
-        if (cache_filp)
-                put_filp(cache_filp);
-        RETURN(rc);
+	pre_smfs_inode(inode, cache_inode);
+	if (cache_inode->i_fop->mmap)
+		rc = cache_inode->i_fop->mmap(&open_file, vma);
+      
+	post_smfs_inode(inode, cache_inode);
+	smfs_update_file(file, &open_file);
+	
+	RETURN(rc);
 }
 
-static int smfs_cleanup_cache_file(struct file *filp)
+static int smfs_open(struct inode * inode, struct file * filp)
 {
-        struct smfs_file_info *sfi = NULL;
-        int rc = 0;
-        ENTRY;
-
-        sfi = F2SMFI(filp);
-
-        post_smfs_dentry(sfi->c_file->f_dentry);
+	struct inode *cache_inode = NULL;
+        struct  file open_file;
+	struct  dentry open_dentry;
+	int    rc = 0;
 
-        put_filp(sfi->c_file);
-
-        OBD_FREE(sfi, sizeof(struct smfs_file_info));
-
-        filp->private_data = NULL;
-
-        RETURN(rc);
-}
-
-int smfs_open(struct inode *inode, struct file *filp)
-{
-        struct inode *cache_inode = NULL;
-        int rc = 0, flag = 1;
-        ENTRY;
-
-        cache_inode = I2CI(inode);
+	cache_inode = I2CI(inode);
         if (!cache_inode)
                 RETURN(-ENOENT);
 
-        if ((rc = smfs_init_cache_file(inode, filp)))
-                RETURN(rc);
-
-        pre_smfs_inode(inode, cache_inode);
-        if (cache_inode->i_fop->open)
-                rc = cache_inode->i_fop->open(cache_inode, F2CF(filp));
-
-        post_smfs_inode(inode, cache_inode);
-        duplicate_file(filp, F2CF(filp));
+	smfs_prepare_cachefile(inode, filp, cache_inode, 
+			       &open_file, &open_dentry);
+	
+	pre_smfs_inode(inode, cache_inode);
+	if (cache_inode->i_fop->open)
+		rc = cache_inode->i_fop->open(cache_inode, &open_file);
+        
+	post_smfs_inode(inode, cache_inode);
+	smfs_update_file(filp, &open_file);
+	
+	RETURN(rc);
 
-        SMFS_KML_POST(filp->f_dentry->d_inode, filp->f_dentry, &flag, NULL,
-                      REINT_OPEN, "open", rc, exit);
-exit:
-        RETURN(rc);
 }
-
-int smfs_release(struct inode *inode, struct file *filp)
+static int smfs_release(struct inode * inode, struct file * filp)
 {
-        struct inode *cache_inode = NULL;
-        struct smfs_file_info *sfi = NULL;
-        int rc = 0, flag = 0;
-        ENTRY;
+	struct inode *cache_inode = NULL;
+        struct  file open_file;
+	struct  dentry open_dentry;
+	int    rc = 0;
 
-        cache_inode = I2CI(inode);
+	cache_inode = I2CI(inode);
         if (!cache_inode)
                 RETURN(-ENOENT);
-
-        sfi = F2SMFI(filp);
-        if (sfi->magic != SMFS_FILE_MAGIC)
-                BUG();
-
-        pre_smfs_inode(inode, cache_inode);
-        if (cache_inode->i_fop->release)
-                rc = cache_inode->i_fop->release(cache_inode, sfi->c_file);
-
-        post_smfs_inode(inode, cache_inode);
-        duplicate_file(filp, sfi->c_file);
-
-        smfs_cleanup_cache_file(filp);
-
-        SMFS_KML_POST(filp->f_dentry->d_inode, filp->f_dentry, &flag, NULL,
-                      REINT_CLOSE, "close", rc, exit);
-exit:
-        RETURN(rc);
+	
+	smfs_prepare_cachefile(inode, filp, cache_inode, 
+			       &open_file, &open_dentry);
+
+	pre_smfs_inode(inode, cache_inode);
+	if (cache_inode->i_fop->release)
+		rc = cache_inode->i_fop->release(cache_inode, &open_file);
+
+	post_smfs_inode(inode, cache_inode);
+	smfs_update_file(filp, &open_file);
+        
+	RETURN(rc);
 }
-
-int smfs_fsync(struct file *file, struct dentry *dentry, int datasync)
+int smfs_fsync(struct file * file, 
+		      struct dentry *dentry, 
+		      int datasync)
 {
-        struct smfs_file_info *sfi = NULL;
-        struct inode *cache_inode;
-        int rc = 0;
+	struct inode *inode = dentry->d_inode;
+	struct inode *cache_inode;
+        struct  file open_file;
+	struct  dentry open_dentry;
+	int    rc = 0;
 
-        cache_inode = I2CI(file->f_dentry->d_inode);
+	cache_inode = I2CI(inode);
         if (!cache_inode)
                 RETURN(-ENOENT);
-
-        sfi = F2SMFI(file);
-        if (sfi->magic != SMFS_FILE_MAGIC)
-                BUG();
-
-        pre_smfs_inode(file->f_dentry->d_inode, cache_inode);
-
-        if (cache_inode->i_fop->fsync)
-                rc = cache_inode->i_fop->fsync(sfi->c_file,
-                                               sfi->c_file->f_dentry, datasync);
-
-        post_smfs_inode(file->f_dentry->d_inode, cache_inode);
-        duplicate_file(file, sfi->c_file);
-
-        RETURN(rc);
+	
+	smfs_prepare_cachefile(inode, file, cache_inode, 
+			       &open_file, &open_dentry);
+
+	pre_smfs_inode(inode, cache_inode);
+	if (cache_inode->i_fop->fsync)
+		rc = cache_inode->i_fop->fsync(&open_file, &open_dentry, datasync);
+	
+	post_smfs_inode(inode, cache_inode);
+	smfs_update_file(file, &open_file);
+	
+	RETURN(rc);
 }
 
 struct file_operations smfs_file_fops = {
-        llseek:         smfs_llseek,
-        read:           smfs_read,
-        write:          smfs_write,
-        ioctl:          smfs_ioctl,
-        mmap:           smfs_mmap,
-        open:           smfs_open,
-        release:        smfs_release,
-        fsync:          smfs_fsync,
+	llseek: 	smfs_llseek,
+	read:		smfs_read,
+	write:  	smfs_write,
+	ioctl:  	smfs_ioctl,
+	mmap:		smfs_mmap,
+	open:		smfs_open,
+	release: 	smfs_release,
+	fsync:		smfs_fsync,
 };
 
-static void smfs_truncate(struct inode *inode)
+static void smfs_prepare_cache_dentry(struct dentry *dentry, struct inode *inode)
 {
-        struct inode *cache_inode;
-
-        cache_inode = I2CI(inode);
-
-        if (!cache_inode)
-                return;
-
-        pre_smfs_inode(inode, cache_inode);
-        if (cache_inode->i_op->truncate)
-                cache_inode->i_op->truncate(cache_inode);
-
-        post_smfs_inode(inode, cache_inode);
+	atomic_set(&dentry->d_count, 1);
+	dentry->d_vfs_flags = 0;
+	dentry->d_flags = 0;
+	dentry->d_inode = inode;
+	dentry->d_op = NULL;
+	dentry->d_fsdata = NULL;
+	dentry->d_mounted = 0;
+	INIT_LIST_HEAD(&dentry->d_hash);
+	INIT_LIST_HEAD(&dentry->d_lru);
+	INIT_LIST_HEAD(&dentry->d_subdirs);
+	INIT_LIST_HEAD(&dentry->d_alias);
 }
 
-int smfs_setattr(struct dentry *dentry, struct iattr *attr)
+static void smfs_truncate(struct inode * inode)      
 {
-        struct inode *cache_inode;
-        struct dentry *cache_dentry;
-        void  *handle = NULL;
-        int rc = 0;
-
-        cache_inode = I2CI(dentry->d_inode);
-        if (!cache_inode)
-                RETURN(-ENOENT);
-
-        cache_dentry = pre_smfs_dentry(NULL, cache_inode, dentry);
-        if (!cache_dentry)
-                RETURN(-ENOMEM);
-
-        handle = smfs_trans_start(dentry->d_inode, FSFILT_OP_SETATTR, NULL);
-        if (IS_ERR(handle) ) {
-                CERROR("smfs_do_mkdir: no space for transaction\n");
-                RETURN(-ENOSPC);
-        }
-
-        pre_smfs_inode(dentry->d_inode, cache_inode);
-
-        if (cache_inode->i_op->setattr)
-                rc = cache_inode->i_op->setattr(cache_dentry, attr);
-
-        SMFS_KML_POST(dentry->d_inode, dentry, attr, NULL,
-                      REINT_SETATTR, "setattr", rc, exit);
-exit:
-        post_smfs_inode(dentry->d_inode, cache_inode);
-        post_smfs_dentry(cache_dentry);
-        smfs_trans_commit(dentry->d_inode, handle, 0);
-        RETURN(rc);
-}
-
-int smfs_setxattr(struct dentry *dentry, const char *name, const void *value,
-                  size_t size, int flags)
+	struct	inode *cache_inode;
+
+	cache_inode = I2CI(inode);
+
+	if (!cache_inode)
+		return;
+	
+	if (cache_inode->i_op->truncate)
+		cache_inode->i_op->truncate(cache_inode);
+
+	post_smfs_inode(inode, cache_inode);
+        
+	return;	
+} 
+ 
+int smfs_setattr(struct dentry *dentry, struct iattr *attr)      
 {
-        struct inode *cache_inode;
-        struct dentry *cache_dentry;
-        int rc = 0;
-
-        cache_inode = I2CI(dentry->d_inode);
-        if (!cache_inode)
-                RETURN(-ENOENT);
-
-        cache_dentry = pre_smfs_dentry(NULL, cache_inode, dentry);
-        if (!cache_dentry)
-                RETURN(-ENOMEM);
-
-        pre_smfs_inode(dentry->d_inode, cache_inode);
-
-        if (cache_inode->i_op->setxattr)
-                rc = cache_inode->i_op->setxattr(cache_dentry, name, value,
-                                                 size, flags);
-
-        post_smfs_inode(dentry->d_inode, cache_inode);
-        post_smfs_dentry(cache_dentry);
-
-        RETURN(rc);
-}
-
-int smfs_getxattr(struct dentry *dentry, const char *name, void *buffer,
-                  size_t size)
+	struct	inode *cache_inode;
+	struct  dentry open_dentry;
+
+	int	rc = 0;
+
+	cache_inode = I2CI(dentry->d_inode);
+
+	if (!cache_inode) 
+		RETURN(-ENOENT);
+	smfs_prepare_cache_dentry(&open_dentry, cache_inode);
+	
+	pre_smfs_inode(dentry->d_inode, cache_inode);
+	if (cache_inode->i_op->setattr)
+		rc = cache_inode->i_op->setattr(&open_dentry, attr);
+
+	post_smfs_inode(dentry->d_inode, cache_inode);
+	
+	RETURN(rc);
+} 
+  
+int smfs_setxattr(struct dentry *dentry, const char *name,
+              	  const void *value, size_t size, int flags)
 {
-        struct inode *cache_inode;
-        struct dentry *cache_dentry;
-        int rc = 0;
-
-        cache_inode = I2CI(dentry->d_inode);
-        if (!cache_inode)
-                RETURN(-ENOENT);
-
-        cache_dentry = pre_smfs_dentry(NULL, cache_inode, dentry);
-        if (!cache_dentry)
-                RETURN(-ENOMEM);
+	struct	inode *cache_inode;
+	struct  dentry open_dentry;
+	int	rc = 0;
+
+	cache_inode = I2CI(dentry->d_inode);
+
+	if (!cache_inode) 
+		RETURN(-ENOENT);
+
+	pre_smfs_inode(dentry->d_inode, cache_inode);
+	smfs_prepare_cache_dentry(&open_dentry, cache_inode);
+	
+	if (cache_inode->i_op->setattr)
+		rc = cache_inode->i_op->setxattr(&open_dentry, name, value, size, flags);
+
+	post_smfs_inode(dentry->d_inode, cache_inode);
+	RETURN(rc);
+} 
+                        
+int smfs_getxattr(struct dentry *dentry, const char *name,
+              	  void *buffer, size_t size)
+{
+	struct	inode *cache_inode;
+	struct  dentry open_dentry;
+	int	rc = 0;
 
-        pre_smfs_inode(dentry->d_inode, cache_inode);
+	cache_inode = I2CI(dentry->d_inode);
 
-        if (cache_inode->i_op->getattr)
-                rc = cache_inode->i_op->getxattr(cache_dentry, name, buffer,
-                                                 size);
+	if (!cache_inode) 
+		RETURN(-ENOENT);
 
-        post_smfs_inode(dentry->d_inode, cache_inode);
-        post_smfs_dentry(cache_dentry);
+	smfs_prepare_cache_dentry(&open_dentry, cache_inode);
+	pre_smfs_inode(dentry->d_inode, cache_inode);
+	
+	if (cache_inode->i_op->setattr)
+		rc = cache_inode->i_op->getxattr(&open_dentry, name, buffer, size);
 
-        RETURN(rc);
+	post_smfs_inode(dentry->d_inode, cache_inode);
+	RETURN(rc);
 }
 
 ssize_t smfs_listxattr(struct dentry *dentry, char *buffer, size_t size)
 {
-        struct inode *cache_inode;
-        struct dentry *cache_dentry;
-        int rc = 0;
-
-        cache_inode = I2CI(dentry->d_inode);
-        if (!cache_inode)
-                RETURN(-ENOENT);
+	struct	inode *cache_inode;
+	struct  dentry open_dentry;
+	int	rc = 0;
 
-        cache_dentry = pre_smfs_dentry(NULL, cache_inode, dentry);
-        if (!cache_dentry)
-                RETURN(-ENOMEM);
+	cache_inode = I2CI(dentry->d_inode);
 
-        pre_smfs_inode(dentry->d_inode, cache_inode);
+	if (!cache_inode) 
+		RETURN(-ENOENT);
 
-        if (cache_inode->i_op->listxattr)
-                rc = cache_inode->i_op->listxattr(cache_dentry, buffer, size);
+	smfs_prepare_cache_dentry(&open_dentry, cache_inode);
+	pre_smfs_inode(dentry->d_inode, cache_inode);
+	
+	if (cache_inode->i_op->listxattr)
+		rc = cache_inode->i_op->listxattr(&open_dentry, buffer, size);
 
-        post_smfs_inode(dentry->d_inode, cache_inode);
-        post_smfs_dentry(cache_dentry);
-
-        RETURN(rc);
-}
+	post_smfs_inode(dentry->d_inode, cache_inode);
+	RETURN(rc);
+}                                                                                                                                                           
 
 int smfs_removexattr(struct dentry *dentry, const char *name)
 {
-        struct inode *cache_inode;
-        struct dentry *cache_dentry;
-        int rc = 0;
-
-        cache_inode = I2CI(dentry->d_inode);
-        if (!cache_inode)
-                RETURN(-ENOENT);
+	struct	inode *cache_inode;
+	struct  dentry open_dentry;
+	int	rc = 0;
 
-        cache_dentry = pre_smfs_dentry(NULL, cache_inode, dentry);
-        if (!cache_dentry)
-                RETURN(-ENOMEM);
+	cache_inode = I2CI(dentry->d_inode);
 
-        pre_smfs_inode(dentry->d_inode, cache_inode);
+	if (!cache_inode) 
+		RETURN(-ENOENT);
 
-        if (cache_inode->i_op->removexattr)
-                rc = cache_inode->i_op->removexattr(cache_dentry, name);
+	smfs_prepare_cache_dentry(&open_dentry, cache_inode);
+	pre_smfs_inode(dentry->d_inode, cache_inode);
+	
+	if (cache_inode->i_op->removexattr)
+		rc = cache_inode->i_op->removexattr(&open_dentry, name);
 
-        post_smfs_inode(dentry->d_inode, cache_inode);
-        post_smfs_dentry(cache_dentry);
-
-        RETURN(rc);
+	post_smfs_inode(dentry->d_inode, cache_inode);
+	RETURN(rc);
 }
 
 struct inode_operations smfs_file_iops = {
-        truncate:       smfs_truncate,          /* BKL held */
+	truncate:       smfs_truncate,          /* BKL held */
         setattr:        smfs_setattr,           /* BKL held */
         setxattr:       smfs_setxattr,          /* BKL held */
         getxattr:       smfs_getxattr,          /* BKL held */
         listxattr:      smfs_listxattr,         /* BKL held */
         removexattr:    smfs_removexattr,       /* BKL held */
 };
+
diff --git a/lustre/smfs/inode.c b/lustre/smfs/inode.c
index 7335d5d..117d503 100644
--- a/lustre/smfs/inode.c
+++ b/lustre/smfs/inode.c
@@ -1,22 +1,5 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
- *  Copyright (C) 2004 Cluster File Systems, Inc.
- *
- *   This file is part of Lustre, http://www.lustre.org.
- *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
- *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/*
+ *  smfs/inode.c
  *
  */
 
@@ -27,274 +10,297 @@
 #include <linux/fs.h>
 #include <linux/slab.h>
 #include <linux/string.h>
-#include <linux/obd_class.h>
-#include <linux/obd_support.h>
-#include <linux/lustre_lib.h>
 #include <linux/lustre_idl.h>
-#include <linux/lustre_smfs.h>
-#include "smfs_internal.h"
+#include "smfs_internal.h" 
 
-static void smfs_read_inode(struct inode *inode)
+static void duplicate_inode(struct inode *dst_inode, 
+		     struct inode *src_inode) 
 {
-        struct super_block *cache_sb;
-        struct inode *cache_inode;
-        ENTRY;
-
-        if (!inode)
-                return;
-
-        CDEBUG(D_INODE, "read_inode ino %lu\n", inode->i_ino);
-        cache_sb = S2CSB(inode->i_sb);
-
-        cache_inode = iget(cache_sb, inode->i_ino);
-
-        SMFS_SET_INODE_REC(inode);
-        SMFS_SET_INODE_CACHE_HOOK(inode);
-        I2CI(inode) = cache_inode;
-
-        pre_smfs_inode(inode, cache_inode);
-        if (cache_sb && cache_sb->s_op->read_inode)
-                cache_sb->s_op->read_inode(cache_inode);
+	dst_inode->i_mode = src_inode->i_mode;
+	dst_inode->i_uid = src_inode->i_uid;
+	dst_inode->i_gid = src_inode->i_gid;
+	dst_inode->i_nlink = src_inode->i_nlink;
+	dst_inode->i_size = src_inode->i_size;
+	dst_inode->i_atime = src_inode->i_atime;
+	dst_inode->i_ctime = src_inode->i_ctime;
+	dst_inode->i_mtime = src_inode->i_mtime;
+	dst_inode->i_blksize = src_inode->i_blksize;  
+	dst_inode->i_blocks = src_inode->i_blocks;
+	dst_inode->i_version = src_inode->i_version;
+	dst_inode->i_state = src_inode->i_state;
+}
 
-        post_smfs_inode(inode, cache_inode);
-        sm_set_inode_ops(cache_inode, inode);
+void post_smfs_inode(struct inode *inode, 
+		     struct inode *cache_inode)
+{
+	if (inode && cache_inode) {
+		duplicate_inode(inode, cache_inode);
+		/*Here we must release the cache_inode,
+		 *Otherwise we will have no chance to
+		 *do it
+		 */
+		cache_inode->i_state &=~I_LOCK;	
+	}
+}
+void pre_smfs_inode(struct inode *inode,
+		    struct inode *cache_inode)
+{
+	if (inode && cache_inode) {
+		duplicate_inode(cache_inode, inode);
+	}
+}
 
-        CDEBUG(D_INODE, "read_inode ino %lu icount %d \n",
-               inode->i_ino, atomic_read(&inode->i_count));
-        EXIT;
+static void smfs_read_inode(struct inode *inode)
+{
+	struct super_block *cache_sb;
+	struct inode *cache_inode;	
+	ENTRY;
+
+	if (!inode) 
+		return;
+	
+	CDEBUG(D_INODE, "read_inode ino %lu\n", inode->i_ino);
+	cache_sb = S2CSB(inode->i_sb);
+
+	cache_inode = iget(cache_sb, inode->i_ino);
+	I2CI(inode) = cache_inode;
+	
+	if(cache_sb && cache_sb->s_op->read_inode)
+		cache_sb->s_op->read_inode(cache_inode);
+
+	post_smfs_inode(inode, cache_inode);
+	sm_set_inode_ops(cache_inode, inode);
+	
+	CDEBUG(D_INODE, "read_inode ino %lu icount %d \n", 
+	       inode->i_ino, atomic_read(&inode->i_count));
+	
+	iput(cache_inode);	
+	return; 
 }
 
 /* Although some filesystem(such as ext3) do not have
- * clear_inode method, but we need it to free the
- * cache inode
+ * clear_inode method, but we need it to free the 
+ * cache inode 
  */
 static void smfs_clear_inode(struct inode *inode)
 {
-        struct super_block *cache_sb;
-        struct inode *cache_inode;
-        ENTRY;
-
-        if (!inode)
-                return;
-
-        cache_sb = S2CSB(inode->i_sb);
-        cache_inode = I2CI(inode);
-
-        /*FIXME: because i_count of cache_inode may not
-         * be 0 or 1 in before smfs_delete inode, So we
+	struct super_block *cache_sb;
+	struct inode *cache_inode;	
+
+	ENTRY;
+	
+	if (!inode) return;
+	
+	cache_sb = S2CSB(inode->i_sb);
+	cache_inode = I2CI(inode);
+
+	/*FIXME: because i_count of cache_inode may not 
+         * be 0 or 1 in before smfs_delete inode, So we 
          * need to dec it to 1 before we call delete_inode
          * of the bellow cache filesystem Check again latter*/
 
-        if (atomic_read(&cache_inode->i_count) < 1)
-                BUG();
-
-        while (atomic_read(&cache_inode->i_count) != 1)
-                atomic_dec(&cache_inode->i_count);
-
-        iput(cache_inode);
-
-        SMFS_CLEAN_INODE_REC(inode);
-        I2CI(inode) = NULL;
-        EXIT;
+	if (atomic_read(&cache_inode->i_count) < 1)
+		BUG();
+	
+	while (atomic_read(&cache_inode->i_count) != 1) {
+		atomic_dec(&cache_inode->i_count);
+	}
+	iput(cache_inode);
+	
+	I2CI(inode) = NULL;
+	return;	
 }
-
 static void smfs_delete_inode(struct inode *inode)
 {
-        struct inode *cache_inode;
-        struct super_block *cache_sb;
-        ENTRY;
-
-        cache_inode = I2CI(inode);
-        cache_sb = S2CSB(inode->i_sb);
-
-        if (!cache_inode || !cache_sb)
-                return;
+	struct inode *cache_inode;
+	struct super_block *cache_sb;
 
-        /* FIXME-WANGDI: because i_count of cache_inode may not be 0 or 1 in
-         * before smfs_delete inode, So we need to dec it to 1 before we call
-         * delete_inode of the bellow cache filesystem Check again latter. */
+	ENTRY;
+	cache_inode = I2CI(inode);
+	cache_sb = S2CSB(inode->i_sb);
 
-        if (atomic_read(&cache_inode->i_count) < 1)
-                BUG();
+	if (!cache_inode || !cache_sb)  
+		return;
 
-        while (atomic_read(&cache_inode->i_count) != 1)
-                atomic_dec(&cache_inode->i_count);
-
-        pre_smfs_inode(inode, cache_inode);
+	/*FIXME: because i_count of cache_inode may not 
+         * be 0 or 1 in before smfs_delete inode, So we 
+         * need to dec it to 1 before we call delete_inode
+         * of the bellow cache filesystem Check again latter*/
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-        list_del(&cache_inode->i_hash);
+	if (atomic_read(&cache_inode->i_count) < 1)
+		BUG();
+	
+	while (atomic_read(&cache_inode->i_count) != 1) {
+		atomic_dec(&cache_inode->i_count);
+	}
+	
+	pre_smfs_inode(inode, cache_inode);
+	
+	list_del(&cache_inode->i_hash);
         INIT_LIST_HEAD(&cache_inode->i_hash);
-#else
-        hlist_del_init(&cache_inode->i_hash);
-#endif
-        
         list_del(&cache_inode->i_list);
         INIT_LIST_HEAD(&cache_inode->i_list);
-
-        if (cache_inode->i_data.nrpages)
-                truncate_inode_pages(&cache_inode->i_data, 0);
-
-        if (cache_sb->s_op->delete_inode)
-                cache_sb->s_op->delete_inode(cache_inode);
-
-        post_smfs_inode(inode, cache_inode);
-
-        I2CI(inode) = NULL;
-        EXIT;
+    	
+	if (cache_inode->i_data.nrpages)
+        	truncate_inode_pages(&cache_inode->i_data, 0);
+	
+	if (cache_sb->s_op->delete_inode)
+		cache_sb->s_op->delete_inode(cache_inode);
+
+	post_smfs_inode(inode, cache_inode);
+	
+	I2CI(inode) = NULL;
+	return;
 }
-
 static void smfs_write_inode(struct inode *inode, int wait)
 {
-        struct inode *cache_inode;
-        struct super_block *cache_sb;
-        ENTRY;
-
-        cache_inode = I2CI(inode);
-        cache_sb = S2CSB(inode->i_sb);
-
-        if (!cache_inode || !cache_sb)
-                return;
-
-        pre_smfs_inode(inode, cache_inode);
-
-        if (cache_sb->s_op->write_inode)
-                cache_sb->s_op->write_inode(cache_inode, wait);
-
-        post_smfs_inode(inode, cache_inode);
-        EXIT;
+	struct inode *cache_inode;
+	struct super_block *cache_sb;
+
+	ENTRY;
+	cache_inode = I2CI(inode);
+	cache_sb = S2CSB(inode->i_sb);
+
+	if (!cache_inode || !cache_sb)
+		return;
+		
+	pre_smfs_inode(inode, cache_inode);
+	
+	if (cache_sb->s_op->write_inode)
+		cache_sb->s_op->write_inode(cache_inode, wait);
+
+	post_smfs_inode(inode, cache_inode);
+	
+	return;
 }
-
 static void smfs_dirty_inode(struct inode *inode)
 {
-        struct inode *cache_inode;
-        struct super_block *cache_sb;
-        ENTRY;
-
-        cache_inode = I2CI(inode);
-        cache_sb = S2CSB(inode->i_sb);
-
-        if (!cache_inode || !cache_sb)
-                return;
-
-        pre_smfs_inode(inode, cache_inode);
-        if (cache_sb->s_op->dirty_inode)
-                cache_sb->s_op->dirty_inode(cache_inode);
-
-        post_smfs_inode(inode, cache_inode);
-        EXIT;
+	struct inode *cache_inode;
+	struct super_block *cache_sb;
+
+	ENTRY;
+	cache_inode = I2CI(inode);
+	cache_sb = S2CSB(inode->i_sb);
+
+	if (!cache_inode || !cache_sb)
+		return;
+		
+	pre_smfs_inode(inode, cache_inode);
+	if (cache_sb->s_op->dirty_inode)
+		cache_sb->s_op->dirty_inode(cache_inode);
+
+	post_smfs_inode(inode, cache_inode);
+	return;
 }
 
 static void smfs_put_inode(struct inode *inode)
 {
-        struct inode *cache_inode;
-        struct super_block *cache_sb;
-        ENTRY;
-
-        cache_inode = I2CI(inode);
-        cache_sb = S2CSB(inode->i_sb);
-
-        if (!cache_inode || !cache_sb)
-                return;
-        if (cache_sb->s_op->put_inode)
-                cache_sb->s_op->put_inode(cache_inode);
-        EXIT;
+	struct inode *cache_inode;
+	struct super_block *cache_sb;
+
+	ENTRY;
+	cache_inode = I2CI(inode);
+	cache_sb = S2CSB(inode->i_sb);
+
+	if (!cache_inode || !cache_sb)
+		return;
+	if (cache_sb->s_op->put_inode)
+		cache_sb->s_op->put_inode(cache_inode);
+
+	return;
 }
 
 static void smfs_write_super(struct super_block *sb)
 {
-        struct super_block *cache_sb;
-        ENTRY;
+	struct super_block *cache_sb;
 
-        cache_sb = S2CSB(sb);
-        if (!cache_sb)
-                return;
+	ENTRY;
+	cache_sb = S2CSB(sb);
 
-        if (cache_sb->s_op->write_super)
-                cache_sb->s_op->write_super(cache_sb);
+	if (!cache_sb)
+		return;
+		
+	if (cache_sb->s_op->write_super)
+		cache_sb->s_op->write_super(cache_sb);
 
-        duplicate_sb(sb, cache_sb);
-        EXIT;
+	duplicate_sb(cache_sb, sb);
+	return;
 }
 
 static void smfs_write_super_lockfs(struct super_block *sb)
 {
-        struct super_block *cache_sb;
-        ENTRY;
+	struct super_block *cache_sb;
 
-        cache_sb = S2CSB(sb);
-        if (!cache_sb)
-                return;
+	ENTRY;
+	cache_sb = S2CSB(sb);
 
-        if (cache_sb->s_op->write_super_lockfs)
-                cache_sb->s_op->write_super_lockfs(cache_sb);
+	if (!cache_sb)
+		return;
+		
+	if (cache_sb->s_op->write_super_lockfs)
+		cache_sb->s_op->write_super_lockfs(cache_sb);
 
-        duplicate_sb(sb, cache_sb);
-        EXIT;
+	duplicate_sb(cache_sb, sb);
+	return;
 }
 
 static void smfs_unlockfs(struct super_block *sb)
 {
-        struct super_block *cache_sb;
-        ENTRY;
+	struct super_block *cache_sb;
 
-        cache_sb = S2CSB(sb);
-        if (!cache_sb)
-                return;
+	ENTRY;
+	cache_sb = S2CSB(sb);
 
-        if (cache_sb->s_op->unlockfs)
-                cache_sb->s_op->unlockfs(cache_sb);
+	if (!cache_sb)
+		return;
+		
+	if (cache_sb->s_op->unlockfs)
+		cache_sb->s_op->unlockfs(cache_sb);
 
-        duplicate_sb(sb, cache_sb);
-        EXIT;
+	duplicate_sb(cache_sb, sb);
+	return;
 }
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-static int smfs_statfs(struct super_block *sb, struct statfs *buf)
-#else
-static int smfs_statfs(struct super_block *sb, struct kstatfs *buf)
-#endif
+static int smfs_statfs(struct super_block * sb, struct statfs * buf) 
 {
-        struct super_block *cache_sb;
-        int rc = 0;
-        ENTRY;
+	struct super_block *cache_sb;
+	int	rc = 0;
 
-        cache_sb = S2CSB(sb);
-        if (!cache_sb)
-                RETURN(-EINVAL);
+	ENTRY;
+	cache_sb = S2CSB(sb);
 
-        if (cache_sb->s_op->statfs)
-                rc = cache_sb->s_op->statfs(cache_sb, buf);
+	if (!cache_sb)
+		RETURN(-EINVAL);
+		
+	if (cache_sb->s_op->statfs)
+		rc = cache_sb->s_op->statfs(cache_sb, buf);
 
-        duplicate_sb(sb, cache_sb);
-
-        RETURN(rc);
+	duplicate_sb(cache_sb, sb);
+	
+	return rc;
 }
-
-static int smfs_remount(struct super_block *sb, int *flags, char *data)
+static int smfs_remount(struct super_block * sb, int * flags, char * data)
 {
-        struct super_block *cache_sb;
-        int rc = 0;
-        ENTRY;
-
-        cache_sb = S2CSB(sb);
+	struct super_block *cache_sb;
+	int    rc = 0;
 
-        if (!cache_sb)
-                RETURN(-EINVAL);
+	ENTRY;
+	cache_sb = S2CSB(sb);
 
-        if (cache_sb->s_op->remount_fs)
-                rc = cache_sb->s_op->remount_fs(cache_sb, flags, data);
+	if (!cache_sb)
+		RETURN(-EINVAL);
+		
+	if (cache_sb->s_op->remount_fs)
+		rc = cache_sb->s_op->remount_fs(cache_sb, flags, data);
 
-        duplicate_sb(sb, cache_sb);
-        RETURN(rc);
+	duplicate_sb(cache_sb, sb);
+	RETURN(rc);
 }
-
 struct super_operations smfs_super_ops = {
-        read_inode:     smfs_read_inode,
-        clear_inode:    smfs_clear_inode,
-        put_super:      smfs_put_super,
-        delete_inode:   smfs_delete_inode,
-        write_inode:    smfs_write_inode,
+	read_inode:	smfs_read_inode,
+	clear_inode:	smfs_clear_inode,
+	put_super:	smfs_put_super,
+	delete_inode:	smfs_delete_inode,
+        write_inode:	smfs_write_inode,
         dirty_inode:    smfs_dirty_inode,       /* BKL not held.  We take it */
         put_inode:      smfs_put_inode,         /* BKL not held.  Don't need */
 
@@ -303,4 +309,10 @@ struct super_operations smfs_super_ops = {
         unlockfs:       smfs_unlockfs,          /* BKL not held.  We take it */
         statfs:         smfs_statfs,            /* BKL held */
         remount_fs:     smfs_remount,           /* BKL held */
+
 };
+
+
+
+
+
diff --git a/lustre/smfs/ioctl.c b/lustre/smfs/ioctl.c
deleted file mode 100644
index c205c43..0000000
--- a/lustre/smfs/ioctl.c
+++ /dev/null
@@ -1,164 +0,0 @@
-#define DEBUG_SUBSYSTEM S_SM
-
-#ifndef EXPORT_SYMTAB
-#define EXPORT_SYMTAB
-#endif
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/slab.h>
-#include <linux/stat.h>
-#include <linux/unistd.h>
-#include <linux/miscdevice.h>
-#include <linux/obd_class.h>
-#include <linux/obd_support.h>
-#include <linux/lustre_lib.h>
-#include <linux/lustre_idl.h>
-#include <linux/lustre_debug.h>
-#include <linux/lustre_smfs.h>   
-
-#include "smfs_internal.h" 
-
-
-struct smfs_control_device smfs_dev;
-
-static int smfs_handle_ioctl(unsigned int cmd, unsigned long arg)
-{
-        struct obd_ioctl_data *data = NULL;
- 	struct super_block *sb = NULL;
-	char *buf = NULL, *dir = NULL;
-        int err = 0, len = 0, count = 0, do_kml = 0;
-      	 
-	if (obd_ioctl_getdata(&buf, &len, (void *)arg)) {
-                CERROR("OBD ioctl: data error\n");
-                GOTO(out, err = -EINVAL);
-        }
-        data = (struct obd_ioctl_data *)buf;
-	
-        switch (cmd) {
-	case IOC_SMFS_START:
-	case IOC_SMFS_STOP:
-	case IOC_SMFS_REINT:
-	case IOC_SMFS_UNDO:{
-		char *name;
-		if (!data->ioc_inllen1 || !data->ioc_inlbuf1) {
-        		CERROR("No mountpoint passed!\n");
-                	GOTO(out, err = -EINVAL);
-        	}
-		name = (char*) data->ioc_inlbuf1;
-		sb = smfs_get_sb_by_path(name,  data->ioc_inllen1);
-		if (!sb) {
-			CERROR("can not find superblock at %s\n", buf);
-			GOTO(out, err = -EINVAL);
-		}
-		/*get cmd count*/
-		if (data->ioc_inllen2 && data->ioc_inlbuf2) {
-			dir = (char *)data->ioc_inlbuf2;
-		}
-		if (data->ioc_plen1)
-			count = *((int*)data->ioc_pbuf1);	
-		if (data->ioc_plen2)
-			do_kml = *((int*)data->ioc_pbuf2);	
-		break;
-	}
-	default: {
-		CERROR("The command passed in is Invalid\n");
-		GOTO(out, err = -EINVAL);
-	}	
-	}
-	
-	switch (cmd) {
-	case IOC_SMFS_START:
-		err = smfs_start_rec(sb);
-		break;
-	case IOC_SMFS_STOP:
-		err = smfs_stop_rec(sb);
-		break;
-	case IOC_SMFS_REINT: 
-	case IOC_SMFS_UNDO: {
-		int flags = 0;
-		if (cmd == IOC_SMFS_REINT)
-			SET_REC_OP_FLAGS(flags, SMFS_REINT_REC);
-		else
-			SET_REC_OP_FLAGS(flags, SMFS_UNDO_REC);
-		if (count == 0)
-			SET_REC_COUNT_FLAGS(flags, SMFS_REC_ALL);
-		if (do_kml)
-			SET_REC_WRITE_KML_FLAGS(flags, SMFS_WRITE_KML);	
-		err = smfs_process_rec(sb, count, dir, flags);
-		break;
-	}
-	}			
-out:
-	if (buf)
-		obd_ioctl_freedata(buf, len);
-	RETURN(err);
-}
-static int smfs_psdev_ioctl (struct inode * inode, struct file * filp, 
-		       unsigned int cmd, unsigned long arg)
-{
-	int rc = 0;
-	rc = smfs_handle_ioctl(cmd, arg);	
-	RETURN(rc);	
-}
-
-/* called when opening /dev/device */
-static int smfs_psdev_open(struct inode * inode, struct file * file)
-{
-	int dev;
-        ENTRY;
-
-	if (!inode)
-		RETURN(-EINVAL);
-	dev = MINOR(inode->i_rdev);
-	if (dev != SMFS_PSDEV_MINOR)
-		RETURN(-ENODEV);
-
-        RETURN(0);
-}
-
-/* called when closing /dev/device */
-static int smfs_psdev_release(struct inode * inode, struct file * file)
-{
-	int dev;
-        ENTRY;
-
-	if (!inode)
-		RETURN(-EINVAL);
-	dev = MINOR(inode->i_rdev);
-	if (dev != SMFS_PSDEV_MINOR)
-		RETURN(-ENODEV);
-
-        RETURN(0);
-}
-
-/* declare character device */
-static struct file_operations smfscontrol_fops = {
-	ioctl:		smfs_psdev_ioctl,            /* ioctl */
-	open:		smfs_psdev_open,       /* open */
-	release:	smfs_psdev_release,    /* release */
-};
-
-#define SMFS_MINOR 250
-static struct miscdevice smfscontrol_dev = {
-	minor:	SMFS_MINOR,
-	name:	"smfscontrol",
-	fops:	&smfscontrol_fops
-};
-
-int init_smfs_psdev(void)
-{
-	printk(KERN_INFO "SMFS psdev driver  v0.01, braam@clusterfs.com\n");
-	
-	misc_register(&smfscontrol_dev);
-
-	return 0;
-}
-
-void smfs_cleanup_psdev(void)
-{
-        ENTRY;
-	misc_deregister(&smfscontrol_dev);
-	EXIT;
-}
diff --git a/lustre/smfs/journal.c b/lustre/smfs/journal.c
index 040393f..715a61c 100644
--- a/lustre/smfs/journal.c
+++ b/lustre/smfs/journal.c
@@ -1,22 +1,5 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
- *  Copyright (C) 2004 Cluster File Systems, Inc.
- *
- *   This file is part of Lustre, http://www.lustre.org.
- *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
- *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/*
+ *  smfs/inode.c
  *
  */
 
@@ -29,61 +12,60 @@
 #include <linux/string.h>
 #include <asm/segment.h>
 #include <asm/uaccess.h>
-#include <linux/obd_class.h>
-#include <linux/obd_support.h>
-#include <linux/lustre_lib.h>
 #include <linux/lustre_idl.h>
-#include <linux/lustre_fsfilt.h>
-#include <linux/lustre_smfs.h>
-#include <linux/lvfs.h>
-#include "smfs_internal.h"
+#include "kml_idl.h" 
+#include "smfs_internal.h" 
+extern struct sm_ops smfs_operations;
 
 #define size_round(x)  (((x)+3) & ~0x3)
 
-void *smfs_trans_start(struct inode *inode, int op, void *desc_private)
+void *smfs_trans_start(struct inode *inode, int op)
 {
-        struct fsfilt_operations *fsfilt = S2SMI(inode->i_sb)->sm_fsfilt;
-
-        CDEBUG(D_INFO, "trans start %p\n", fsfilt->fs_start);
 
-        SMFS_TRANS_OP(inode, op);
-
-        /* There are some problem here. fs_start in fsfilt is used by lustre
-         * the journal blocks of write rec are not counted in FIXME later */
-        if (fsfilt->fs_start)
-                return fsfilt->fs_start(inode, op, desc_private, 0);
-        return NULL;
+	CDEBUG(D_INODE, "trans start %p\n", 
+	       smfs_operations.sm_journal_ops.tr_start);
+	if (smfs_operations.sm_journal_ops.tr_start) {
+		return smfs_operations.sm_journal_ops.tr_start(inode, op);	
+	}
+	return NULL;
 }
 
-void smfs_trans_commit(struct inode *inode, void *handle, int force_sync)
+void smfs_trans_commit(void *handle)
 {
-        struct fsfilt_operations *fsfilt = S2SMI(inode->i_sb)->sm_fsfilt;
-
-        CDEBUG(D_INFO, "trans commit %p\n", fsfilt->fs_commit);
-
-        if (fsfilt->fs_commit)
-                fsfilt->fs_commit(inode, handle, force_sync);
+	if (smfs_operations.sm_journal_ops.tr_commit) {
+		smfs_operations.sm_journal_ops.tr_commit(handle);	
+	}
+	CDEBUG(D_SM, "trans commit %p\n", 
+	       smfs_operations.sm_journal_ops.tr_commit);
 }
-
-/*smfs_path is gotten from intermezzo*/
-static char* smfs_path(struct dentry *dentry, struct dentry *root, char *buffer,
-                       int buflen)
+/*The following function are gotten from intermezzo
+ * smfs_path
+ * logit
+ * journal_log_prefix_with_groups_and_ids 
+ * journal_log_prefix 
+*/
+static char* smfs_path(struct dentry *dentry, struct dentry *root,
+                        char *buffer, int buflen)
 {
         char * end = buffer+buflen;
-        char * name = buffer;
-        char * buf_end = buffer + buflen;
         char * retval;
-
+                                                                                                                                                                                                     
         *--end = '\0';
         buflen--;
+        if (dentry->d_parent != dentry && list_empty(&dentry->d_hash)) {
+                buflen -= 10;
+                end -= 10;
+                memcpy(end, " (deleted)", 10);
+        }
+                                                                                                                                                                                                     
         /* Get '/' right */
         retval = end-1;
         *retval = '/';
-
+                                                                                                                                                                                                     
         for (;;) {
                 struct dentry * parent;
                 int namelen;
-
+                                                                                                                                                                                                     
                 if (dentry == root)
                         break;
                 parent = dentry->d_parent;
@@ -99,432 +81,169 @@ static char* smfs_path(struct dentry *dentry, struct dentry *root, char *buffer,
                 retval = end;
                 dentry = parent;
         }
-
-        while (end != buf_end)
-                *name++ = *end++;
-        *name = '\0';
         return retval;
 }
-static int smfs_log_path(struct dentry *root, struct dentry *dentry,
-                         char *buffer, int buffer_len)
+                                                                                                                                                                                                     
+static inline char *logit(char *buf, const void *value, int size)
 {
-        char *p_name = buffer + sizeof(int);
-        char *name = NULL;
-        int namelen = 0;
-
-        name = smfs_path(dentry, root, p_name, buffer_len);
-        namelen = cpu_to_le32(strlen(p_name));
-        memcpy(buffer, &namelen, sizeof(int));
-
-        namelen += sizeof(int);
-        RETURN(namelen);
+        char *ptr = (char *)value;
+                                                                                                                                                                                                     
+        memcpy(buf, ptr, size);
+        buf += size;
+        return buf;
 }
-
-static inline int log_it(char *buffer, void *data, int length)
+static inline char *
+journal_log_prefix_with_groups_and_ids(char *buf, int opcode,
+                                       __u32 ngroups, gid_t *groups,
+                                       __u32 fsuid, __u32 fsgid)
 {
-        memcpy(buffer, &length, sizeof(int));
-        memcpy(buffer + sizeof(int), data, length);
-        return (sizeof(int) + length);
+        struct kml_prefix_hdr p;
+        u32 loggroups[NGROUPS_MAX];
+                                                                                                                                                                                                     
+        int i;
+                                                                                                                                                                                                     
+        p.version = KML_MAJOR_VERSION | KML_MINOR_VERSION;
+        p.pid = cpu_to_le32(current->pid);
+        p.auid = cpu_to_le32(current->uid);
+        p.fsuid = cpu_to_le32(fsuid);
+        p.fsgid = cpu_to_le32(fsgid);
+        p.ngroups = cpu_to_le32(ngroups);
+        p.opcode = cpu_to_le32(opcode);
+        for (i=0 ; i < ngroups ; i++)
+                loggroups[i] = cpu_to_le32((__u32) groups[i]);
+                                                                                                                                                                                                     
+        buf = logit(buf, &p, sizeof(struct kml_prefix_hdr));
+        buf = logit(buf, &loggroups, sizeof(__u32) * ngroups);
+        return buf;
 }
-
-static int smfs_post_rec_create(struct inode *dir, struct dentry *dentry,
-                                void *data1, void *data2)
+                                                                                                                                                                                                     
+static inline char *
+journal_log_prefix(char *buf, int opcode)
 {
-        struct smfs_super_info *sinfo;
-        struct dentry *root;
-        struct update_record *rec = NULL;
-        char *buffer = NULL, *p_name;
-        int rc = 0, buffer_length = 0;
-        ENTRY;
-
-        sinfo = S2SMI(dentry->d_inode->i_sb);
-        if (!sinfo)
-                RETURN(-EINVAL);
-
-        OBD_ALLOC(buffer, PAGE_SIZE + sizeof(struct update_record));
-        if (!buffer)
-                GOTO(exit, rc = -ENOMEM);
-        rec = (struct update_record*)buffer;
-
-        smfs_rec_pack(rec, dentry->d_inode, dir, REINT_CREATE);
-
-        p_name = buffer + sizeof(struct update_record);
-
-        root = dir->i_sb->s_root;
-
-        rc = smfs_log_path(root, dentry, p_name, PAGE_SIZE);
-        if (rc < 0) {
-                GOTO(exit, rc);
-        } else {
-                buffer_length += rc;
-                rc = 0;
-        }
-        if (data1) {
-                /*for symlink data is the path of the symname*/
-                int data_len = strlen(data1);
-
-                buffer_length += log_it(p_name + buffer_length,
-                                        data1, data_len);
-        }
-        rec->ur_len = sizeof(struct update_record) + buffer_length;
-        rc = smfs_llog_add_rec(sinfo, (void*)buffer, rec->ur_len);
-exit:
-        if (buffer)
-                OBD_FREE(buffer, PAGE_SIZE + sizeof(struct update_record));
-
-        RETURN(rc);
+        __u32 groups[NGROUPS_MAX];
+        int i;
+                                                                                                                                                                                                     
+        /* convert 16 bit gid's to 32 bit gid's */
+        for (i=0; i<current->ngroups; i++)
+                groups[i] = (__u32) current->groups[i];
+                                                                                                                                                                                                     
+        return journal_log_prefix_with_groups_and_ids(buf, opcode, 
+                                                      (__u32)current->ngroups,
+                                                      groups,
+                                                      (__u32)current->fsuid,
+                                                      (__u32)current->fsgid);
 }
-
-static int smfs_post_rec_link(struct inode *dir, struct dentry *dentry,
-                              void *data1, void *data2)
+                                                                                                                                                                                                     
+static inline char *
+journal_log_prefix_with_groups(char *buf, int opcode, 
+                               __u32 ngroups, gid_t *groups)
 {
-        struct smfs_super_info *sinfo;
-        struct dentry *root;
-        struct dentry *new_dentry = (struct dentry *)data1;
-        struct update_record *rec = NULL;
-        char *buffer = NULL, *p_name = NULL;
-        int rc = 0, buffer_length = 0;
-        ENTRY;
-
-        sinfo = S2SMI(dir->i_sb);
-        if (!sinfo)
-                RETURN(-EINVAL);
-        OBD_ALLOC(buffer, PAGE_SIZE + sizeof(struct update_record));
-        if (!buffer)
-                GOTO(exit, rc = -ENOMEM);
-
-        rec = (struct update_record*)buffer;
-
-        smfs_rec_pack(rec, dentry->d_inode, NULL, REINT_LINK);
-
-        root = dir->i_sb->s_root;
-        /*record old_dentry path*/
-        p_name = buffer + sizeof(struct update_record);
-        rc = smfs_log_path(root, dentry, p_name, PAGE_SIZE);
-        if (rc < 0)
-                GOTO(exit, rc);
-
-        buffer_length += rc;
-        p_name += buffer_length;
-
-        /*record new_dentry path*/
-        rc = smfs_log_path(root, new_dentry, p_name,
-                           PAGE_SIZE - rc - sizeof(int));
-        if (rc < 0) {
-                GOTO(exit, rc);
-        } else {
-                buffer_length += rc;
-                rc = 0;
-        }
-        rec->ur_len = sizeof(struct update_record) + buffer_length;
-        rc = smfs_llog_add_rec(sinfo, (void*)buffer, rec->ur_len);
-
-exit:
-        if (buffer)
-                OBD_FREE(buffer, PAGE_SIZE + sizeof(struct update_record));
-        RETURN(rc);
+        return journal_log_prefix_with_groups_and_ids(buf, opcode,
+                                                      ngroups, groups,
+                                                      (__u32)current->fsuid,
+                                                      (__u32)current->fsgid);
 }
 
-static int smfs_post_rec_unlink(struct inode *dir, struct dentry *dentry,
-                                void *data1, void *data2)
+static inline char *log_dentry_version(char *buf, struct dentry *dentry)
 {
-        struct smfs_super_info *sinfo;
-        struct dentry *root;
-        int flag = *((int*)data1);
-        struct update_record *rec = NULL;
-        char *buffer = NULL, *p_name;
-        int rc = 0, buffer_length = 0;
-        char fidname[LL_FID_NAMELEN];
-        struct dentry *new_child = NULL;
-        int namelen;
-        ENTRY;
-
-        sinfo = S2SMI(dentry->d_inode->i_sb);
-        if (!sinfo)
-                RETURN(-EINVAL);
-
-        OBD_ALLOC(buffer, PAGE_SIZE + sizeof(struct update_record));
-        if (!buffer)
-                GOTO(exit, rc = -ENOMEM);
-        rec = (struct update_record*)buffer;
-
-        smfs_rec_pack(rec, dentry->d_inode, dir, REINT_UNLINK);
-
-        p_name = buffer + sizeof(struct update_record);
-
-        root = dir->i_sb->s_root;
-        rc = smfs_log_path(root, dentry, p_name, PAGE_SIZE);
-        if (rc < 0)
-                GOTO(exit, rc);
-
-        buffer_length += rc;
-        p_name += rc;
-
-        if (!flag) {
-                /*unlink the inode*/
-                namelen = ll_fid2str(fidname, dentry->d_inode->i_ino,
-                                     dentry->d_inode->i_generation);
-
-                down(&sinfo->smsi_delete_dir->d_inode->i_sem);
-                new_child = lookup_one_len(fidname, sinfo->smsi_delete_dir, namelen);
-                if (new_child->d_inode != NULL) {
-                        CERROR("has been deleted obj dentry %lu:%u!\n",
-                               dentry->d_inode->i_ino,
-                               dentry->d_inode->i_generation);
-                        LBUG();
-                }
-
-                /* FIXME-WANGDI: this is ugly, but I do not know how to resolve
-                 * it. */
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-                up(&dir->i_zombie);
-#endif
-                lock_kernel();
-                SMFS_CLEAN_INODE_REC(dir);
-                rc = vfs_rename(dir, dentry, sinfo->smsi_delete_dir->d_inode,
-                                new_child);
-                SMFS_SET_INODE_REC(dir);
-                unlock_kernel();
-                
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-                down(&dir->i_zombie);
-#endif
-                up(&sinfo->smsi_delete_dir->d_inode->i_sem);
-                if (rc)
-                        GOTO(exit, rc);
-                /* in vfs_unlink the inode on the dentry will be deleted, so we
-                 * should delete it from dentry hash. */
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-                list_del_init(&dentry->d_hash);
-#else
-                hlist_del_init(&dentry->d_hash);
-#endif
-                
-                /* put the new_file_name to the log. */
-                rc = smfs_log_path(root, dentry, p_name,
-                                   PAGE_SIZE - buffer_length);
-                if (rc < 0)
-                        GOTO(exit, rc);
-                buffer_length += rc;
-                rc = 0;
-        } else {
-                /*only decrease the link count*/
-                namelen = sizeof(ino_t);
-
-                buffer_length += log_it(p_name + buffer_length,
-                                        &(dentry->d_inode->i_ino), namelen);
-                SET_REC_DEC_LINK_FLAGS(rec->ur_flags, SMFS_DEC_LINK);
-        }
-        rec->ur_len = sizeof(struct update_record) + buffer_length;
-        rc = smfs_llog_add_rec(sinfo, (void*)buffer, rec->ur_len);
-exit:
-        if (new_child);
-                dput(new_child);
-        if (buffer)
-                OBD_FREE(buffer, PAGE_SIZE + sizeof(struct update_record));
-
-        RETURN(rc);
-}
-
-static int smfs_post_rec_rename(struct inode *dir, struct dentry *dentry,
-                                void *data1, void *data2)
-{
-        struct smfs_super_info *sinfo;
-        struct dentry *root;
-        struct inode *new_dir = (struct inode *)data1;
-        struct dentry *new_dentry = (struct dentry *)data2;
-        struct update_record *rec = NULL;
-        char *buffer = NULL, *p_name = NULL;
-        int rc = 0, buffer_length = 0;
-        ENTRY;
-
-        sinfo = S2SMI(dir->i_sb);
-        if (!sinfo)
-                RETURN(-EINVAL);
-
-        OBD_ALLOC(buffer, PAGE_SIZE + sizeof(struct update_record));
-        if (!buffer)
-                GOTO(exit, rc = -ENOMEM);
-
-        rec = (struct update_record*)buffer;
-
-        smfs_rec_pack(rec, dentry->d_inode, dir, REINT_RENAME);
-
-        root = dir->i_sb->s_root;
-        /*record old_dentry path*/
-        p_name = buffer + sizeof(struct update_record);
-        rc = smfs_log_path(root, dentry, p_name, PAGE_SIZE);
-        if (rc < 0)
-                GOTO(exit, rc);
-
-        buffer_length += rc;
-        p_name += rc;
-
-        root = new_dir->i_sb->s_root;
-        /*record new_dentry path*/
-        rc = smfs_log_path(root, new_dentry, p_name,
-                           PAGE_SIZE - rc - sizeof(int));
-        if (rc < 0) {
-                GOTO(exit, rc);
-        } else {
-                buffer_length += rc;
-                rc = 0;
-        }
-        rec->ur_len = sizeof(struct update_record) + buffer_length;
-        rc = smfs_llog_add_rec(sinfo, (void*)buffer, rec->ur_len);
-exit:
-        if (buffer)
-                OBD_FREE(buffer, PAGE_SIZE + sizeof(struct update_record));
-        RETURN(rc);
+        struct smfs_version version;
+                                                                                                                                                                                                     
+        smfs_getversion(&version, dentry->d_inode);
+                                                                                                                                                                                                     
+        version.sm_mtime = HTON__u64(version.sm_mtime);
+        version.sm_ctime = HTON__u64(version.sm_ctime);
+        version.sm_size = HTON__u64(version.sm_size);
+                                                                                                                                                                                                     
+        return logit(buf, &version, sizeof(version));
 }
-
-static int smfs_post_rec_setattr(struct inode *dir, struct dentry *dentry,
-                                 void *data1, void *data2)
+                                                                                                                                                                                                     
+static inline char *log_version(char *buf, struct smfs_version *pv)
 {
-        struct smfs_super_info *sinfo;
-        struct dentry *root;
-        struct iattr *attr = (struct iattr *)data1;
-        struct update_record *rec = NULL;
-        char *buffer = NULL, *p_name;
-        int rc = 0, buffer_length = 0;
-        ENTRY;
-
-        sinfo = S2SMI(dentry->d_inode->i_sb);
-        if (!sinfo)
-                RETURN(-EINVAL);
-
-        OBD_ALLOC(buffer, PAGE_SIZE + sizeof(struct update_record));
-        if (!buffer)
-                GOTO(exit, rc = -ENOMEM);
-        rec = (struct update_record*)buffer;
-
-        smfs_rec_pack(rec, dentry->d_inode, attr, REINT_SETATTR);
-
-        root = dentry->d_inode->i_sb->s_root;
-        /*record old_dentry path*/
-        p_name = buffer + sizeof(struct update_record);
-        rc = smfs_log_path(root, dentry, p_name, PAGE_SIZE);
-
-        if (rc < 0) {
-                GOTO(exit, rc);
-        } else {
-                buffer_length += rc;
-                rc = 0;
-        }
-        rec->ur_len = sizeof(struct update_record) + buffer_length;
-        rc = smfs_llog_add_rec(sinfo, (void*)buffer, rec->ur_len);
-exit:
-        if (buffer)
-                OBD_FREE(buffer, PAGE_SIZE + sizeof(struct update_record));
-        RETURN(rc);
+        struct smfs_version version;
+                                                                                                                                                                                                     
+        memcpy(&version, pv, sizeof(version));
+                                                                                                                                                                                                     
+        version.sm_mtime = HTON__u64(version.sm_mtime);
+        version.sm_ctime = HTON__u64(version.sm_ctime);
+        version.sm_size = HTON__u64(version.sm_size);
+                                                                                                                                                                                                     
+        return logit(buf, &version, sizeof(version));
 }
-static int smfs_post_rec_open_close(struct inode *dir, struct dentry *dentry,
-                                    void *data1, void *data2)
+static inline char *journal_log_suffix(char *buf, char *log,
+                                       struct dentry *dentry)
 {
-        struct smfs_super_info *sinfo;
-        struct dentry *root;
-        int open = *(int*)data1;
-        struct update_record *rec = NULL;
-        char *buffer = NULL, *p_name;
-        int rc = 0, buffer_length = 0;
-        ENTRY;
-
-        sinfo = S2SMI(dentry->d_inode->i_sb);
-        if (!sinfo)
-                RETURN(-EINVAL);
-
-        OBD_ALLOC(buffer, PAGE_SIZE + sizeof(struct update_record));
-        if (!buffer)
-                GOTO(exit, rc = -ENOMEM);
-        rec = (struct update_record*)buffer;
-        if (open)
-                smfs_rec_pack(rec, dentry->d_inode, NULL, REINT_OPEN);
-        else
-                smfs_rec_pack(rec, dentry->d_inode, NULL, REINT_CLOSE);
-        root = dentry->d_inode->i_sb->s_root;
-        /*record old_dentry path*/
-        p_name = buffer + sizeof(struct update_record);
-        rc = smfs_log_path(root, dentry, p_name, PAGE_SIZE);
-
-        if (rc < 0) {
-                GOTO(exit, rc);
-        } else {
-                buffer_length += rc;
-                rc = 0;
-        }
-        rec->ur_len = sizeof(struct update_record) + buffer_length;
-        rc = smfs_llog_add_rec(sinfo, (void*)buffer, rec->ur_len);
-exit:
-        if (buffer)
-                OBD_FREE(buffer, PAGE_SIZE + sizeof(struct update_record));
-        RETURN(rc);
+        struct kml_suffix s;
+        struct kml_prefix_hdr *p = (struct kml_prefix_hdr *)log;
+                                                                                                                                                                                                     
+        s.prevrec = 0;
+                                                                                                                                                                                                     
+        /* record number needs to be filled in after reservation
+           s.recno = cpu_to_le32(rec->recno); */
+        s.time = cpu_to_le32(CURRENT_TIME);
+        s.len = p->len;
+        return logit(buf, &s, sizeof(s));
 }
 
-static int smfs_post_rec_write(struct inode *dir, struct dentry *dentry,
-                               void *data1, void *data2)
+int smfs_kml_log(struct smfs_super_info *smfs_info,
+                 const char *buf, size_t size,
+                 const char *string1, int len1,
+                 const char *string2, int len2,
+                 const char *string3, int len3)
 {
-        struct smfs_record_extents extents;
-        struct smfs_super_info *sinfo;
-        struct dentry *root;
-        struct update_record *rec = NULL;
-        char *buffer = NULL, *p_name;
-        int extents_length = 0;
-        int rc = 0, buffer_length = 0;
-        ENTRY;
-
-        sinfo = S2SMI(dentry->d_inode->i_sb);
-        if (!sinfo)
-                RETURN(-EINVAL);
-
-        OBD_ALLOC(buffer, PAGE_SIZE + sizeof(struct update_record));
-        if (!buffer)
-                GOTO(exit, rc = -ENOMEM);
-        rec = (struct update_record*)buffer;
-
-        smfs_rec_pack(rec, dentry->d_inode, NULL, REINT_OPEN);
-
-        root = dentry->d_inode->i_sb->s_root;
-        /*record old_dentry path*/
-        p_name = buffer + sizeof(struct update_record);
-        rc = smfs_log_path(root, dentry, p_name, PAGE_SIZE);
-
-        if (rc < 0) {
-                GOTO(exit, rc);
-        } else {
-                buffer_length += rc;
-                rc = 0;
-        }
-        /*record the extents of this write*/
-        extents.sre_count = *((size_t*)data1);
-        extents.sre_off = *((loff_t*)data2);
-        extents_length = sizeof(struct smfs_record_extents);
-
-        buffer_length += log_it(p_name + buffer_length,
-                                &extents, extents_length);
-        rec->ur_len = sizeof(struct update_record) + buffer_length;
-        rc = smfs_llog_add_rec(sinfo, (void*)buffer, rec->ur_len);
-exit:
-        if (buffer)
-                OBD_FREE(buffer, PAGE_SIZE + sizeof(struct update_record));
-        RETURN(rc);
+	int rc = 0;	
+	/*should pack the record and dispatch it
+	 *create llog handle write to the log*/
+	return rc;
 }
 
-typedef int (*post_kml_rec)(struct inode *dir, struct dentry *dentry,
-                            void *data1, void *data2);
-
-static post_kml_rec smfs_kml_post[REINT_MAX + 1] = {
-        [REINT_SETATTR] smfs_post_rec_setattr,
-        [REINT_CREATE]  smfs_post_rec_create,
-        [REINT_LINK]    smfs_post_rec_link,
-        [REINT_UNLINK]  smfs_post_rec_unlink,
-        [REINT_RENAME]  smfs_post_rec_rename,
-        [REINT_OPEN]    smfs_post_rec_open_close,
-        [REINT_CLOSE]   smfs_post_rec_open_close,
-        [REINT_WRITE]   smfs_post_rec_write,
-};
-
-int smfs_post_kml_rec(struct inode *dir, struct dentry *dst_dentry,
-                      void *data1, void *data2, int op)
+int smfs_journal_mkdir(struct dentry *dentry,
+                       struct smfs_version *tgt_dir_ver,
+                       struct smfs_version *new_dir_ver, 
+		       int mode)
 {
-        return smfs_kml_post[op](dir, dst_dentry, data1, data2);
+  	int opcode = KML_OPCODE_MKDIR;
+        char *buffer, *path, *logrecord, record[292];
+        struct dentry *root;
+        __u32 uid, gid, lmode, pathlen;
+	struct smfs_super_info *smfs_info; 	       
+        struct super_block* sb;
+        int error, size;
+ 
+	ENTRY;
+       
+	sb = dentry->d_inode->i_sb;
+	root = sb->s_root;
+	smfs_info = S2SMI(sb);
+	
+        uid = cpu_to_le32(dentry->d_inode->i_uid);
+        gid = cpu_to_le32(dentry->d_inode->i_gid);
+        lmode = cpu_to_le32(mode);
+                                                                                                                                                                                                     
+        SM_ALLOC(buffer, PAGE_SIZE);
+        path = smfs_path(dentry, root, buffer, PAGE_SIZE);
+        pathlen = cpu_to_le32(MYPATHLEN(buffer, path));
+        size = sizeof(__u32) * current->ngroups +
+               sizeof(struct kml_prefix_hdr) + 3 * sizeof(*tgt_dir_ver) +
+               sizeof(lmode) + sizeof(uid) + sizeof(gid) + sizeof(pathlen) +
+               sizeof(struct kml_suffix);
+                                                                                                                                                                                                     
+        if ( size > sizeof(record) )
+                CERROR("InterMezzo: BUFFER OVERFLOW in %s!\n", __FUNCTION__);
+                                                                                                                                                                                                     
+        logrecord = journal_log_prefix(record, opcode);
+                                                                                                                                                                                                     
+        logrecord = log_version(logrecord, tgt_dir_ver);
+        logrecord = log_dentry_version(logrecord, dentry->d_parent);
+        logrecord = log_version(logrecord, new_dir_ver);
+        logrecord = logit(logrecord, &lmode, sizeof(lmode));
+        logrecord = logit(logrecord, &uid, sizeof(uid));
+        logrecord = logit(logrecord, &gid, sizeof(gid));
+        logrecord = logit(logrecord, &pathlen, sizeof(pathlen));
+        logrecord = journal_log_suffix(logrecord, record, dentry);
+                                                                                                                                                                                                     
+        error = smfs_kml_log(smfs_info, record, size,
+                         path, size_round(le32_to_cpu(pathlen)),
+                         NULL, 0, NULL, 0);
+	SM_FREE(buffer, PAGE_SIZE);
+	RETURN(error);
 }
diff --git a/lustre/smfs/journal_ext3.c b/lustre/smfs/journal_ext3.c
new file mode 100644
index 0000000..c54effe
--- /dev/null
+++ b/lustre/smfs/journal_ext3.c
@@ -0,0 +1,96 @@
+/*
+ *  smfs/journal_ext3.c
+ *
+ */
+
+#define DEBUG_SUBSYSTEM S_SM
+
+#include <linux/kmod.h>
+#include <linux/init.h>
+#include <linux/fs.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/smp_lock.h>
+#include <linux/lustre_idl.h>
+#if defined(CONFIG_EXT3_FS) || defined (CONFIG_EXT3_FS_MODULE)
+#include <linux/jbd.h>
+#include <linux/ext3_fs.h>
+#include <linux/ext3_jbd.h>
+#endif
+                                                                                                                                                                                                     
+#include "smfs_internal.h" 
+#include "kml_idl.h" 
+                                                                                                                                                                                                     
+#if defined(CONFIG_EXT3_FS) || defined (CONFIG_EXT3_FS_MODULE)
+
+#define MAX_PATH_BLOCKS(inode) (PATH_MAX >> EXT3_BLOCK_SIZE_BITS((inode)->i_sb))
+#define MAX_NAME_BLOCKS(inode) (NAME_MAX >> EXT3_BLOCK_SIZE_BITS((inode)->i_sb))
+
+static void *smfs_e3_trans_start(struct inode *inode, 
+				int op)
+{
+        
+	int trunc_blks, one_path_blks, extra_path_blks;
+        int extra_name_blks, lml_blks, jblocks;
+        __u32 avail_kmlblocks;
+	handle_t *handle;
+	
+	avail_kmlblocks = inode->i_sb->u.ext3_sb.s_es->s_free_blocks_count;
+                                                                                                                                                                                                     
+        if ( avail_kmlblocks < 3 ) {
+                return ERR_PTR(-ENOSPC);
+        }
+                                                                                                                                                                                                     
+        if ((op != KML_OPCODE_UNLINK && op != KML_OPCODE_RMDIR)
+             && avail_kmlblocks < 6 ) {
+                return ERR_PTR(-ENOSPC);
+        }
+        /* Need journal space for:
+             at least three writes to KML (two one block writes, one a path)
+             possibly a second name (unlink, rmdir)
+             possibly a second path (symlink, rename)
+             a one block write to the last rcvd file
+        */
+                                                                                                                                                                                                     
+        trunc_blks = EXT3_DATA_TRANS_BLOCKS + 1;
+        one_path_blks = 4*EXT3_DATA_TRANS_BLOCKS + MAX_PATH_BLOCKS(inode) + 3;
+        lml_blks = 4*EXT3_DATA_TRANS_BLOCKS + MAX_PATH_BLOCKS(inode) + 2;
+        extra_path_blks = EXT3_DATA_TRANS_BLOCKS + MAX_PATH_BLOCKS(inode);
+        extra_name_blks = EXT3_DATA_TRANS_BLOCKS + MAX_NAME_BLOCKS(inode);
+                                                                                                                                                                                                     
+        /* additional blocks appear for "two pathname" operations
+           and operations involving the LML records
+        */
+
+	switch (op) {
+	case KML_OPCODE_MKDIR:
+		jblocks = one_path_blks + trunc_blks
+                          + EXT3_DATA_TRANS_BLOCKS + 4 + 2;
+		break;
+	default:
+		CDEBUG(D_INODE, "invalid operation %d for journal\n", op);
+		return NULL;
+	}
+
+	CDEBUG(D_INODE, "creating journal handle (%d blocks)\n", jblocks);
+        
+	lock_kernel();
+        handle = journal_start(EXT3_JOURNAL(inode), jblocks);
+        unlock_kernel();
+
+	return handle;
+}  
+
+static void smfs_e3_trans_commit(void *handle)
+{
+        lock_kernel();
+        journal_stop(handle);
+        unlock_kernel();
+}
+
+struct journal_operations smfs_ext3_journal_ops = {
+        .tr_start   = smfs_e3_trans_start, 
+        .tr_commit  = smfs_e3_trans_commit,
+};
+#endif
+
diff --git a/lustre/smfs/kml.c b/lustre/smfs/kml.c
index 0658283..4151fda 100644
--- a/lustre/smfs/kml.c
+++ b/lustre/smfs/kml.c
@@ -1,22 +1,5 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
- *  Copyright (C) 2004 Cluster File Systems, Inc.
- *
- *   This file is part of Lustre, http://www.lustre.org.
- *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
- *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+/*
+ *  smfs/kml.c
  *
  */
 
@@ -26,297 +9,51 @@
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/slab.h>
-#include <linux/obd_class.h>
-#include <linux/obd_support.h>
-#include <linux/lustre_lib.h>
 #include <linux/lustre_idl.h>
-#include <linux/lustre_fsfilt.h>
-#include <linux/lustre_smfs.h>
-#include "smfs_internal.h"
+#include "smfs_internal.h" 
+#include "kml_idl.h"
 
 /*FIXME there should be more conditions in this check*/
-int smfs_do_rec(struct inode *inode)
-{
-        struct super_block *sb = inode->i_sb;
-        struct smfs_super_info *smfs_info = S2SMI(sb);
-
-        if (SMFS_DO_REC(smfs_info) && SMFS_INIT_REC(smfs_info) &&
-            SMFS_DO_INODE_REC(inode))
-                return 1;
-        return 0;
-}
-
-int smfs_rec_init(struct super_block *sb)
-{
-        struct smfs_super_info *smfs_info = S2SMI(sb);
-        int rc = 0;
-
-        SMFS_SET_REC(smfs_info);
-
-        RETURN(rc);
-}
-
-int smfs_rec_cleanup(struct super_block *sb)
+int smfs_do_kml(struct inode *dir)
 {
-        int rc = 0;
-
-        SMFS_CLEAN_REC(S2SMI(sb));
-        RETURN(rc);
+	struct smfs_super_info	*smfs_info = S2SMI(dir->i_sb);	
+		
+	if (smfs_info->flags & SM_DO_KML) {
+		return 1;
+	}
+	return 0;
 }
-
-void reint_rec_free(struct reint_record *reint_rec)
+void smfs_getversion(struct smfs_version * smfs_version,
+                           struct inode * inode) 
 {
-        if (reint_rec) {
-                if (reint_rec->rec_data1)
-                        OBD_FREE(reint_rec->rec_data1,
-                                 reint_rec->rec1_size + 1);
-                if (reint_rec->rec_data2)
-                        OBD_FREE(reint_rec->rec_data2,
-                                 reint_rec->rec2_size + 1);
-
-                OBD_FREE(reint_rec, sizeof(struct reint_record));
-        }
+	smfs_version->sm_mtime = (__u64)inode->i_mtime;
+        smfs_version->sm_ctime = (__u64)inode->i_ctime;
+        smfs_version->sm_size  = (__u64)inode->i_size;
 }
 
-static inline void copy_inode_attr(struct iattr *iattr, struct inode *inode)
+int smfs_kml_init(struct super_block *sb)
 {
-        iattr->ia_mode = inode->i_mode;
-        iattr->ia_uid  = inode->i_uid;
-        iattr->ia_gid  = inode->i_gid;
-        iattr->ia_atime = inode->i_atime;
-        iattr->ia_ctime = inode->i_ctime;
-        iattr->ia_mtime = inode->i_mtime;
-        iattr->ia_size = inode->i_size;
-}
+	struct smfs_super_info	*smfs_info = S2SMI(sb);	
+	int    rc = 0;
+	smfs_info->flags |= SM_DO_KML;
 
-void smfs_rec_pack(struct update_record *rec, struct inode *dst,
-                   void *data, int op)
-{
-        rec->ur_fsuid = current->fsuid;
-        rec->ur_fsgid = current->fsgid;
-        rec->ur_rdev = dst->i_rdev;
-        rec->ur_opcode = op;
-        copy_inode_attr(&rec->ur_iattr, dst);
-        if (data) {
-                switch (op) {
-                case REINT_CREATE:
-                case REINT_LINK:
-                case REINT_UNLINK:
-                case REINT_RENAME: {
-                        struct inode *dir = (struct inode *)data;
-                        copy_inode_attr(&rec->ur_pattr, dir);
-                        break;
-                }
-                case REINT_SETATTR: {
-                        struct iattr *attr = (struct iattr *)data;
-                        memcpy(&rec->ur_pattr, attr, sizeof(struct iattr));
-                        break;
-                }
-                }
-        }
-}
+	rc = smfs_llog_setup(&smfs_info->kml_llog);			
 
-static inline void unpack_attr(struct reint_record *r_rec,
-                               struct update_record *u_rec)
-{
-        memcpy(&r_rec->u_rec, u_rec, sizeof(struct update_record));
+	RETURN(rc);
 }
 
-static inline int unpack_rec_data(char **p_buffer, int *size,
-                                  char *in_data, char *args_data)
+int post_kml_mkdir(struct inode *dir, struct dentry *dentry)
 {
-        int args_len = 0;
-        int rc = 0;
-        ENTRY;
-
-        if (args_data)
-                args_len = strlen(args_data);
-
-        *size = *((int*)(in_data));
-        rc = *size + sizeof(int);
+	struct smfs_version tgt_dir_ver, new_dir_ver;
+	int    error;
 
-        OBD_ALLOC(*p_buffer, *size + args_len + 1);
-        if (!*p_buffer)
-                RETURN(-ENOMEM);
-        /*First copy reint dir */
-        if (args_data)
-                memcpy(*p_buffer, args_data, args_len);
+	smfs_getversion(&tgt_dir_ver, dir); 	
 
-        /*then copy the node name */
-        memcpy(*p_buffer + args_len,
-                      (in_data + sizeof(int)), *size);
-
-        *size += args_len;
-
-        RETURN(rc);
+	smfs_getversion(&new_dir_ver, dentry->d_inode); 	
+	
+	error = smfs_journal_mkdir(dentry, &tgt_dir_ver,
+			           &new_dir_ver,
+                                   dentry->d_inode->i_mode);
+	return error;	                                                                                                                                                                                                     
 }
 
-int smfs_rec_unpack(struct smfs_proc_args *args, struct reint_record *r_rec,
-                    char *rec_buf)
-{
-        struct update_record *u_rec = (struct update_record *)rec_buf;
-        int rc = 0, length = 0;
-        ENTRY;
-        /*FIXME wangdi, there unpack are so smiliar that
-          *we will put it together later*/
-
-        if (SMFS_DO_WRITE_KML(args->sr_flags))
-                SET_REC_WRITE_KML_FLAGS(r_rec->u_rec.ur_flags, SMFS_WRITE_KML);
-        unpack_attr(r_rec, u_rec);
-        length += sizeof(struct update_record);
-        rc = unpack_rec_data(&r_rec->rec_data1, &r_rec->rec1_size,
-                             (rec_buf + length), args->sr_data);
-        switch (u_rec->ur_opcode) {
-        case REINT_OPEN:
-        case REINT_CLOSE:
-                /*record src path which will be passed to reint and undo*/
-                rc = unpack_rec_data(&r_rec->rec_data2, &r_rec->rec2_size,
-                                     (rec_buf + length), NULL);
-                break;
-        case REINT_LINK:
-        case REINT_RENAME:
-        case REINT_SETATTR:
-        case REINT_UNLINK:
-        case REINT_CREATE:
-        case REINT_WRITE: {
-                length += rc;
-                if (length < u_rec->ur_len) {
-                        char *pre_name;
-                        if (u_rec->ur_opcode == REINT_CREATE ||
-                            u_rec->ur_opcode == REINT_WRITE ||
-                            (u_rec->ur_opcode == REINT_UNLINK &&
-                             SMFS_DO_DEC_LINK(r_rec->u_rec.ur_flags)))
-                                pre_name = NULL;
-                        else
-                                pre_name = args->sr_data;
-
-                        rc = unpack_rec_data(&r_rec->rec_data2,
-                                             &r_rec->rec2_size,
-                                             (rec_buf + length), pre_name);
-                }
-                break;
-        }
-        }
-        if (rc > 0)
-                rc = 0;
-
-        RETURN(rc);
-}
-
-int smfs_start_rec(struct super_block *sb)
-{
-        struct dentry *dentry;
-        struct lvfs_run_ctxt saved;
-        int rc = 0;
-        ENTRY;
-
-        if (SMFS_INIT_REC(S2SMI(sb)) ||
-            (!SMFS_DO_REC(S2SMI(sb)) && !SMFS_CACHE_HOOK(S2SMI(sb))))
-                RETURN(rc);
-
-        rc = smfs_llog_setup(sb);
-        if (rc)
-                RETURN(rc);
-
-        push_ctxt(&saved, S2SMI(sb)->smsi_ctxt, NULL);
-        dentry = simple_mkdir(current->fs->pwd, "DELETE", 0777, 1);
-        if (IS_ERR(dentry)) {
-                rc = PTR_ERR(dentry);
-                CERROR("cannot create LOGS directory: rc = %d\n", rc);
-                GOTO(err_exit, rc = -EINVAL);
-        }
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-        if (list_empty(&dentry->d_hash))
-                d_rehash(dentry);
-#else
-        /* FIXME-WANGDI: here should be be something. */
-#endif
-
-        if (!rc)
-                SMFS_SET_INIT_REC(S2SMI(sb));
-        S2SMI(sb)->smsi_delete_dir = dentry;
-exit:
-        pop_ctxt(&saved, S2SMI(sb)->smsi_ctxt, NULL);
-        RETURN(rc);
-err_exit:
-        if (S2SMI(sb)->smsi_ctxt)
-                OBD_FREE(S2SMI(sb)->smsi_ctxt, sizeof(struct lvfs_run_ctxt));
-        goto exit;
-}
-
-int smfs_stop_rec(struct super_block *sb)
-{
-        int rc = 0;
-        ENTRY;
-
-        if (!SMFS_INIT_REC(S2SMI(sb)) ||
-            (!SMFS_DO_REC(S2SMI(sb)) && !SMFS_CACHE_HOOK(S2SMI(sb))))
-                RETURN(rc);
-
-        rc = smfs_llog_cleanup(sb);
-
-        SMFS_CLEAN_INIT_REC(S2SMI(sb));
-
-        if (S2SMI(sb)->smsi_delete_dir) {
-                l_dput(S2SMI(sb)->smsi_delete_dir);
-                S2SMI(sb)->smsi_delete_dir = NULL;
-        }
-        RETURN(rc);
-}
-
-int smfs_process_rec(struct super_block *sb, int count, char *dir, int flags)
-{
-        struct llog_ctxt *ctxt;
-        struct llog_handle *loghandle;
-        struct smfs_proc_args args;
-        int rc = 0;
-        ENTRY;
-
-        if (!SMFS_INIT_REC(S2SMI(sb))) {
-                CWARN("Did not start up rec server \n");
-                RETURN(rc);
-        }
-
-        memset(&args, 0, sizeof(struct smfs_proc_args));
-        args.sr_sb = sb;
-        args.sr_count = count;
-        args.sr_data = dir;
-        args.sr_flags = flags ;
-        ctxt = S2SMI(sb)->smsi_rec_log;
-        loghandle = ctxt->loc_handle;
-
-        if (count == 0) {
-                if (SMFS_DO_REINT_REC(flags)) {
-                        struct llog_gen_rec *lgr;
-
-                        /*For reint rec, we need insert
-                          *a gen rec to identify the end
-                          *of the rec.*/
-                        OBD_ALLOC(lgr, sizeof(*lgr));
-                        if (!lgr)
-                                RETURN(-ENOMEM);
-                        lgr->lgr_hdr.lrh_len = lgr->lgr_tail.lrt_len =
-                                sizeof(*lgr);
-                        lgr->lgr_hdr.lrh_type = LLOG_GEN_REC;
-                        lgr->lgr_gen = ctxt->loc_gen;
-                        rc = llog_add(ctxt, &lgr->lgr_hdr, NULL, NULL, 1, NULL);
-                        OBD_FREE(lgr, sizeof(*lgr));
-                        if (rc != 1)
-                                RETURN(rc);
-                }
-        } else {
-                SET_REC_COUNT_FLAGS(args.sr_flags, SMFS_REC_ALL);
-        }
-        if (loghandle) {
-                if (SMFS_DO_REINT_REC(flags))
-                        rc = llog_cat_process(loghandle, ctxt->loc_proc_cb,
-                                              (void *)&args);
-                else
-                        rc = llog_cat_reverse_process(loghandle,
-                                                      ctxt->loc_proc_cb,
-                                                      (void *)&args);
-                if (rc == LLOG_PROC_BREAK)
-                        rc = 0;
-        }
-        RETURN(rc);
-}
diff --git a/lustre/smfs/kml_idl.h b/lustre/smfs/kml_idl.h
new file mode 100644
index 0000000..a470bb7
--- /dev/null
+++ b/lustre/smfs/kml_idl.h
@@ -0,0 +1,52 @@
+/*
+ * smfs/kml_idl.h
+ */
+
+# define MYPATHLEN(buffer, path) ((buffer) + PAGE_SIZE - (path))
+/*Got these defines from intermezzo*/
+struct kml_log_fd {
+	rwlock_t         fd_lock;
+        loff_t           fd_offset;  /* offset where next record should go */
+        struct file      *fd_file;
+        int              fd_truncating;
+        unsigned int     fd_recno;   /* last recno written */
+        struct list_head fd_reservations;
+};
+
+#define KML_MAJOR_VERSION 0x00010000
+#define KML_MINOR_VERSION 0x00000002
+#define KML_OPCODE_NOOP          0
+#define KML_OPCODE_CREATE        1
+#define KML_OPCODE_MKDIR         2
+#define KML_OPCODE_UNLINK        3
+#define KML_OPCODE_RMDIR         4
+#define KML_OPCODE_CLOSE         5
+#define KML_OPCODE_SYMLINK       6
+#define KML_OPCODE_RENAME        7
+#define KML_OPCODE_SETATTR       8
+#define KML_OPCODE_LINK          9
+#define KML_OPCODE_OPEN          10
+#define KML_OPCODE_MKNOD         11
+#define KML_OPCODE_WRITE         12
+#define KML_OPCODE_RELEASE       13
+#define KML_OPCODE_TRUNC         14
+#define KML_OPCODE_SETEXTATTR    15
+#define KML_OPCODE_DELEXTATTR    16
+#define KML_OPCODE_KML_TRUNC     17
+#define KML_OPCODE_GET_FILEID    18
+#define KML_OPCODE_NUM           19
+                                                                                                                                                                                                     
+#ifdef __KERNEL__
+# define NTOH__u32(var) le32_to_cpu(var)
+# define NTOH__u64(var) le64_to_cpu(var)
+# define HTON__u32(var) cpu_to_le32(var)
+# define HTON__u64(var) cpu_to_le64(var)
+#else
+# include <glib.h>
+# define NTOH__u32(var) GUINT32_FROM_LE(var)
+# define NTOH__u64(var) GUINT64_FROM_LE(var)
+# define HTON__u32(var) GUINT32_TO_LE(var)
+# define HTON__u64(var) GUINT64_TO_LE(var)
+#endif
+                                                                                                                                                                                                     
+
diff --git a/lustre/smfs/options.c b/lustre/smfs/options.c
index b2a4d3f..8ff445e 100644
--- a/lustre/smfs/options.c
+++ b/lustre/smfs/options.c
@@ -1,25 +1,6 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
- *  Copyright (C) 2004 Cluster File Systems, Inc.
- *
- *   This file is part of Lustre, http://www.lustre.org.
- *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
- *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
+/*
+ *  snapfs/options.c
  */
-
 #define DEBUG_SUBSYSTEM S_SM
 
 #include <linux/module.h>
@@ -29,96 +10,88 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/errno.h>
-#include <linux/obd_class.h>
-#include <linux/obd_support.h>
-#include <linux/lustre_lib.h>
 #include <linux/lustre_idl.h>
-#include <linux/lustre_smfs.h>
-#include "smfs_internal.h"
+#include "smfs_internal.h" 
 
 
 static struct list_head option_list;
-static char *options = NULL;
-static char *opt_left = NULL;
+char  *options = NULL;
+char  *opt_left = NULL;
 
 int init_option(char *data)
 {
-        INIT_LIST_HEAD(&option_list);
-        OBD_ALLOC(options, strlen(data) + 1);
-        if (!options) {
-                CERROR("Can not allocate memory \n");
-                return -ENOMEM;
-        }
-        memcpy(options, data, strlen(data));
-        opt_left = options;
-        return 0;
+	INIT_LIST_HEAD(&option_list);
+	SM_ALLOC(options, strlen(data) + 1);
+	if (!options) {
+		CERROR("Can not allocate memory \n");
+		return -ENOMEM;
+	}
+	memcpy(options, data, strlen(data));
+	opt_left = options;
+	return 0;
 }
-
 /*cleanup options*/
 void cleanup_option(void)
 {
-        struct option *option;
-        while (!list_empty(&option_list)) {
-                option = list_entry(option_list.next, struct option, list);
-                list_del(&option->list);
-                OBD_FREE(option->opt, strlen(option->opt) + 1);
-                if (option->value)
-                        OBD_FREE(option->value, strlen(option->value) + 1);
-                OBD_FREE(option, sizeof(struct option));
-        }
-        OBD_FREE(options, strlen(options) + 1);
+	struct option *option;
+	while (!list_empty(&option_list)) {
+		option = list_entry(option_list.next, struct option, list);
+		list_del(&option->list);
+		SM_FREE(option->opt, strlen(option->opt) + 1);
+		if (option->value)
+			SM_FREE(option->value, strlen(option->value) + 1);
+		SM_FREE(option, sizeof(struct option));
+	}
+	SM_FREE(options, strlen(options) + 1);
 }
-
 int get_opt(struct option **option, char **pos)
 {
-        char *name, *value, *left, *tmp;
-        struct option *tmp_opt;
-        int length = 0;
+	char  *name, *value, *left, *tmp;
+	struct option *tmp_opt;
+	int  length = 0;
 
-        *pos = opt_left;
+	*pos = opt_left;
 
-        if (!*opt_left)
-                return -ENODATA;
-        left = strchr(opt_left, ',');
-        if (left == opt_left)
-                return -EINVAL;
-        if (!left)
-                left = opt_left + strlen(opt_left);
+	if (! *opt_left)
+		return -ENODATA;
+	left = strchr(opt_left, ',');
+	if (left == opt_left) 
+		return -EINVAL;
+	if (!left){
+		left = opt_left + strlen(opt_left);	
+	}	
 
-        OBD_ALLOC(tmp_opt, sizeof(struct option));
-        tmp_opt->opt = NULL;
-        tmp_opt->value = NULL;
+	SM_ALLOC(tmp_opt, sizeof(struct option));   	
+	tmp_opt->opt = NULL;
+	tmp_opt->value = NULL;
 
-        tmp = opt_left;
-        while(tmp != left && *tmp != '=') {
-                length++;
-                tmp++;
-        }
-        OBD_ALLOC(name, length + 1);
-        tmp_opt->opt = name;
-        while (opt_left != tmp) *name++ = *opt_left++;
+	tmp = opt_left;
+	while(tmp != left && *tmp != '=') {
+		length++;
+		tmp++;
+	}	
+	SM_ALLOC(name, length + 1);
+	tmp_opt->opt = name;
+	memset(name, 0, length + 1);
+	while (opt_left != tmp) *name++ = *opt_left++;
 
-        if (*tmp == '=') {
-                /*this option has value*/
-                opt_left ++; /*after '='*/
-                if (left == opt_left) {
-                        OBD_FREE(tmp_opt->opt, strlen(tmp_opt->opt) + 1);
-                        OBD_FREE(tmp_opt, sizeof(struct option));
-                        opt_left = *pos;
-                        return -EINVAL;
-                }
-                length = left - opt_left;
-                OBD_ALLOC(value, length + 1);
-                if (!value) {
-                        OBD_FREE(tmp_opt->opt, strlen(tmp_opt->opt) + 1);
-                        OBD_FREE(tmp_opt, sizeof(struct option));
-                        return -ENOMEM;
-                }
-                tmp_opt->value = value;
-                while (opt_left != left) *value++ = *opt_left++;
-        }
-        list_add(&tmp_opt->list, &option_list);
-        if (*opt_left == ',') opt_left ++; /*after ','*/
-        *option = tmp_opt;
-        return 0;
+	if (*tmp == '=') {
+		/*this option has value*/
+		opt_left ++; /*after '='*/
+		if (left == opt_left) {
+			SM_FREE(tmp_opt->opt, length);
+			SM_FREE(tmp_opt, sizeof(struct option));
+			opt_left = *pos;
+			return -EINVAL;
+		}
+		length = left - opt_left + 1;
+		SM_ALLOC(value, length);
+		tmp_opt->value = value;
+		memset(value, 0, length);
+		while (opt_left != left) *value++ = *opt_left++;
+	}
+	list_add(&tmp_opt->list, &option_list);
+	if (*opt_left == ',') opt_left ++; /*after ','*/	
+	*option = tmp_opt;
+	return 0;
 }
diff --git a/lustre/smfs/reint.c b/lustre/smfs/reint.c
new file mode 100644
index 0000000..50420d7
--- /dev/null
+++ b/lustre/smfs/reint.c
@@ -0,0 +1,15 @@
+/*
+ *  smfs/kml.c
+ *
+ */
+
+#define DEBUG_SUBSYSTEM S_SM
+
+#include <linux/kmod.h>
+#include <linux/init.h>
+#include <linux/fs.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/lustre_idl.h> 
+#include "smfs_internal.h" 
+
diff --git a/lustre/smfs/sm_fs.c b/lustre/smfs/sm_fs.c
index 19283ae..d07facb 100644
--- a/lustre/smfs/sm_fs.c
+++ b/lustre/smfs/sm_fs.c
@@ -1,31 +1,12 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
+/*
+ *  fs/smfs/sm_fs.c
  *
- *  Copyright (C) 2004 Cluster File Systems, Inc.
- *
- *   This file is part of Lustre, http://www.lustre.org.
- *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
- *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  A storage management file system.
  *
  */
-
-#define DEBUG_SUBSYSTEM S_SM
-
-#ifndef EXPORT_SYMTAB
 #define EXPORT_SYMTAB
-#endif
-
+#define DEBUG_SUBSYSTEM S_SM
+                                                                                                                                                                                                     
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
@@ -33,50 +14,41 @@
 #include <linux/stat.h>
 #include <linux/unistd.h>
 #include <linux/miscdevice.h>
-#include <linux/obd_class.h>
-#include <linux/obd_support.h>
-#include <linux/lustre_lib.h>
-#include <linux/lustre_idl.h>
-#include <linux/lustre_smfs.h>
-
-#include "smfs_internal.h"
+#include <linux/lustre_idl.h>                                                                                                                                                                                                     
+#include "smfs_internal.h" 
 
 int sm_stack = 0;
 long sm_kmemory = 0;
 
+                                                                                                                                                                                                     
 MODULE_AUTHOR("Peter J. Braam <braam@cs.cmu.edu>");
 MODULE_DESCRIPTION("Smfs file system filters v0.01");
-MODULE_LICENSE("GPL");
-
+                                                                                                                                                                                                     
 extern int init_smfs(void);
 extern int cleanup_smfs(void);
-
+extern int init_snap_sysctl(void);
+                                                                                                                                                                                                     
 static int __init smfs_init(void)
 {
         int err;
-
-        if ( (err = init_smfs_psdev()) ) {
-                printk("Error initializing smfs_psdev, %d\n", err);
-                return -EINVAL;
-        }
-
+                                                                                                                                                                                                     
         if ( (err = init_smfs()) ) {
-                printk("Error initializing smfs, %d\n", err);
+                printk("Error initializing snapfs, %d\n", err);
                 return -EINVAL;
         }
-
+                                                                                                                                                                                                     
         if ( (err = init_smfs_proc_sys()) ) {
-                printk("Error initializing smfs proc sys, %d\n", err);
+                printk("Error initializing snapfs proc sys, %d\n", err);
                 return -EINVAL;
         }
-
+                                                                                                                                                                                                     
         return 0;
 }
-
+                                                                                                                                                                                                     
 static void __exit smfs_cleanup(void)
 {
-        cleanup_smfs();
-        smfs_cleanup_psdev();
+	cleanup_smfs();
 }
 module_init(smfs_init);
 module_exit(smfs_cleanup);
+
diff --git a/lustre/smfs/smfs_internal.h b/lustre/smfs/smfs_internal.h
index 9614847..3142bab 100644
--- a/lustre/smfs/smfs_internal.h
+++ b/lustre/smfs/smfs_internal.h
@@ -1,59 +1,61 @@
 #ifndef __LINUX_SMFS_H
 #define __LINUX_SMFS_H
 
-#include <linux/lustre_fsfilt.h>
-#define SMFSDEV_NAME "/dev/smfsconf"
-#define SMFS_PSDEV_MINOR 250
-#define SMFS_PSDEV_MAJOR 10
-
-struct option {
-        char *opt;
-        char *value;
-        struct list_head list;
+struct smfs_inode_info {
+	struct inode *smi_inode;
 };
 
-struct smfs_control_device {
-        struct list_head smfs_dev_list;
+struct smfs_super_info {
+	struct super_block *smsi_sb;
+        struct vfsmount *smsi_mnt;      /* mount the cache kern with kern_do_mount (like MDS) */
+	__u32 flags;			/* flags*/
+	struct llog_ctxt *kml_llog;	/*smfs kml llog*/ 
+	int ops_check;
 };
 
-#define SMFS_TYPE                "smfs"
-#define IOC_SMFS_START           _IOWR('s', 41, long)
-#define IOC_SMFS_STOP            _IOWR('s', 42, long)
-#define IOC_SMFS_REINT           _IOWR('s', 43, long)
-#define IOC_SMFS_UNDO            _IOWR('s', 44, long)
-
-#ifdef __KERNEL__
-
-struct smfs_proc_args {
-        struct super_block *sr_sb;
-        int                 sr_count;
-        int                 sr_flags;
-        void               *sr_data;
+#define I2SMI(inode)  ((struct smfs_inode_info *) (&(inode->u.generic_ip)))
+#define S2SMI(sb)   ((struct smfs_super_info *) (&(sb->u.generic_sbp)))
+#define S2CSB(sb)   (((struct smfs_super_info *) (&(sb->u.generic_sbp)))->smsi_sb) 
+#define I2CI(inode) (((struct smfs_inode_info*) (&(inode->u.generic_ip)))->smi_inode)
+
+#define SB_OPS_CHECK 		0x1
+#define INODE_OPS_CHECK 	0x2 
+#define FILE_OPS_CHECK 		0x4 
+#define DENTRY_OPS_CHECK 	0x8 
+#define DEV_OPS_CHECK 		0x10 
+#define SYMLINK_OPS_CHECK 	0x20 
+#define DIR_OPS_CHECK 		0x40 
+
+#define SM_DO_KML		0x1
+ 
+#include "smfs_support.h"
+
+struct journal_operations {
+        void *(*tr_start)(struct inode *, int op);
+        void (*tr_commit)(void *handle);
 };
 
+struct sm_ops {
+        /* operations on the file store */
+        struct super_operations sm_sb_ops;
+                                                                                                                                                                                                     
+        struct inode_operations sm_dir_iops;
+        struct inode_operations sm_file_iops;
+        struct inode_operations sm_sym_iops;
+                                                                                                                                                                                                     
+        struct file_operations sm_dir_fops;
+        struct file_operations sm_file_fops;
+        struct file_operations sm_sym_fops;
+                                                                                                                                                                                                     
+        struct dentry_operations sm_dentry_ops;
+	struct journal_operations sm_journal_ops;
 
-#define SB_OPS_CHECK            0x1
-#define INODE_OPS_CHECK         0x2
-#define FILE_OPS_CHECK          0x4
-#define DENTRY_OPS_CHECK        0x8
-#define DEV_OPS_CHECK           0x10
-#define SYMLINK_OPS_CHECK       0x20
-#define DIR_OPS_CHECK           0x40
-
-#define KML_LOG_NAME "kml_rec"
-
-#define MYPATHLEN(buffer, path) ((buffer) + PAGE_SIZE - (path))
-
-#define SMFS_KML_POST(dir, dentry, data1, data2, op, name, rc, label)   \
-do {                                                                    \
-        if(smfs_do_rec(dir) && !rc) {                                   \
-                CDEBUG(D_INODE, "Do %s kml post for dir %lu \n",        \
-                              name, dir->i_ino);                        \
-                rc = smfs_post_kml_rec(dir, dentry, data1, data2, op);  \
-                if (rc)                                                 \
-                        GOTO(label, rc);                                \
-        }                                                               \
-} while(0)
+};
+struct option {
+	char *opt;
+	char *value;
+	struct list_head list;
+};
 
 extern int init_smfs_proc_sys(void);
 /*options.c*/
@@ -61,230 +63,59 @@ extern int get_opt(struct option **option, char **pos);
 extern void cleanup_option(void);
 extern int init_option(char *data);
 /*cache.c*/
-extern void sm_set_inode_ops(struct inode *cache_inode, struct inode *inode);
-extern void sm_set_sb_ops(struct super_block *cache_sb, struct super_block *sb);
-extern void init_smfs_cache(void);
-extern void cleanup_smfs_cache(void);
-extern void sm_set_journal_ops(struct super_block *sb, char *cache_type);
-extern int smfs_init_sm_ops(struct smfs_super_info *smb);
-extern void smfs_cleanup_sm_ops(struct smfs_super_info *smb);
-static inline struct super_operations *cache_sops(struct smfs_super_info *smb)
-{
-        return &smb->sm_ops->sm_sb_ops;
-}
-static inline struct inode_operations *cache_diops(struct smfs_super_info *smb)
-{
-        return &smb->sm_ops->sm_dir_iops;
-}
-static inline struct inode_operations *cache_fiops(struct smfs_super_info *smb)
-{
-        return &smb->sm_ops->sm_file_iops;
-}
-static inline struct inode_operations *cache_siops(struct smfs_super_info *smb)
-{
-        return &smb->sm_ops->sm_sym_iops;
-}
-static inline struct file_operations *cache_dfops(struct smfs_super_info *smb)
-{
-        return &smb->sm_ops->sm_dir_fops;
-}
-static inline struct file_operations *cache_ffops(struct smfs_super_info *smb)
-{
-        return &smb->sm_ops->sm_file_fops;
-}
-static inline struct file_operations *cache_sfops(struct smfs_super_info *smb)
-{
-        return &smb->sm_ops->sm_sym_fops;
-}
-static inline struct dentry_operations *cache_dops(struct smfs_super_info *smb)
-{
-        return &smb->sm_ops->sm_dentry_ops;
-}
-static inline struct journal_operations *journal_ops(struct smfs_super_info *smb)
-{
-        return &smb->sm_ops->sm_journal_ops;
-}
+void sm_set_inode_ops(struct inode *cache_inode, struct inode *inode);
+void sm_set_sb_ops(struct super_block *cache_sb, struct super_block *sb);
+void init_smfs_cache(void);
+void cleanup_smfs_cache(void);
+void setup_sm_journal_ops(char * cache_type);
 /*super.c*/
 extern int init_smfs(void);
 extern int cleanup_smfs(void);
 extern void smfs_put_super(struct super_block *sb);
-extern struct super_block *smfs_get_sb_by_path(char *path, int len);
-extern struct vfsmount* get_vfsmount(struct super_block *sb);
+extern void duplicate_sb(struct super_block *csb, struct super_block *sb);
 /*sysctl.c*/
 extern int sm_debug_level;
 extern int sm_inodes;
 extern long sm_kmemory;
 extern int sm_stack;
 /*dir.c*/
-extern struct inode_operations smfs_dir_iops;
-extern struct file_operations smfs_dir_fops;
+extern struct inode_operations smfs_dir_iops; 
+extern struct file_operations smfs_dir_fops; 
+
+extern void d_unalloc(struct dentry *dentry);
+/*inode.c*/
+extern void duplicate_inode(struct inode *cache_inode, struct inode *inode);
 /*file.c*/
-extern struct inode_operations smfs_file_iops;
-extern struct file_operations  smfs_file_fops;
-extern int smfs_ioctl(struct inode * inode, struct file * filp,
-                      unsigned int cmd, unsigned long arg);
+extern void smfs_prepare_cachefile(struct inode *inode,
+			           struct file *file, 
+			           struct inode *cache_inode,
+			    	   struct file *cache_file,
+			    	   struct dentry *cache_dentry);
+extern int smfs_ioctl(struct inode * inode, struct file * filp,  unsigned int cmd,
+                      unsigned long arg);
 extern int smfs_fsync(struct file * file, struct dentry *dentry, int datasync);
-extern int smfs_setattr(struct dentry *dentry, struct iattr *attr);
+extern int smfs_setattr(struct dentry *dentry, struct iattr *attr); 
 extern int smfs_setxattr(struct dentry *dentry, const char *name,
-                         const void *value, size_t size, int flags);
-extern int smfs_getxattr(struct dentry *dentry, const char *name, void *buffer,
-                         size_t size);
+              	         const void *value, size_t size, int flags);
+extern int smfs_getxattr(struct dentry *dentry, const char *name,
+              	         void *buffer, size_t size);
 extern ssize_t smfs_listxattr(struct dentry *dentry, char *buffer, size_t size);
 extern int smfs_removexattr(struct dentry *dentry, const char *name);
-extern int smfs_open(struct inode * inode, struct file * filp);
-extern int smfs_release(struct inode * inode, struct file * filp);
-/*inode.c*/
-extern struct super_operations smfs_super_ops;
-/*symlink.c*/
-extern struct inode_operations smfs_sym_iops;
-extern struct file_operations smfs_sym_fops;
+extern void smfs_update_file(struct file *file, struct file *cache_file);
 /*journal.c */
-extern void *smfs_trans_start(struct inode *inode, int op, void *desc_private);
-extern void smfs_trans_commit(struct inode *inode, void *handle,
-                              int force_sync);
-extern int  smfs_post_kml_rec(struct inode *dir, struct dentry *dst_dentry,
-                              void *data1, void *data2, int op);
+extern void *smfs_trans_start(struct inode *inode, int op);
+extern void smfs_trans_commit(void *handle);
+extern int smfs_journal_mkdir(struct dentry *dentry,
+                       struct smfs_version *tgt_dir_ver,
+                       struct smfs_version *new_dir_ver, 
+		       int mode);
+/*journal_ext3.c*/
+extern struct journal_operations smfs_ext3_journal_ops;
 /*kml.c*/
 extern int smfs_kml_init(struct super_block *sb);
-extern int smfs_do_rec(struct inode *inode);
-extern int smfs_rec_cleanup(struct super_block *sb);
-extern int smfs_rec_init(struct super_block *sb);
-extern int smfs_rec_unpack(struct smfs_proc_args *args,
-                           struct reint_record *u_rec, char *rec_buf);
-extern int smfs_start_rec(struct super_block *sb);
-extern int smfs_stop_rec(struct super_block *sb);
-extern int smfs_process_rec(struct super_block *sb, int count, char *dir,
-                            int flags);
-void reint_rec_free(struct reint_record *reint_rec);
-
-extern void smfs_rec_pack(struct update_record *rec, struct inode *dst,
-                          void *data, int op);
+extern int smfs_do_kml(struct inode *dir);
+extern void smfs_getversion(struct smfs_version * smfs_version, struct inode * inode); 
+extern int post_kml_mkdir(struct inode *dir, struct dentry *dentry);
 /*smfs_llog.c*/
-extern int smfs_llog_setup(struct super_block *sb);
-extern int smfs_llog_cleanup(struct super_block *sb);
-extern int smfs_llog_add_rec(struct smfs_super_info * sinfo, void *data,
-                             int data_size);
-/*ioctl.c*/
-extern int init_smfs_psdev(void);
-extern void smfs_cleanup_psdev(void);
-
-/* cache_space.c */
-extern int do_cache_manage;
-struct cache_purge_queue {
-        wait_queue_head_t       cpq_waitq;
-        struct super_block     *cpq_sb;
-        struct llog_handle     *cpq_loghandle;
-        __u32                   cpq_flags;
-        struct completion       cpq_comp;
-};
-
-/* opcodes */
-#define CACHE_SPACE_INSERT 0x1
-#define CACHE_SPACE_DELETE 0x2
-#define CACHE_SPACE_COMMIT 0x4
-
-#define CACHE_LRU_LOG "CACHE_LRU_LIST"
-
-extern int smfs_cache_hook(struct inode *inode);
-extern void cache_space_pre(struct inode *inode, int op);
-extern int cache_space_post(int op, void *handle, struct inode *old_dir,
-                            struct dentry *old_dentry, struct inode *new_dir,
-                            struct dentry *new_dentry);
-
-extern int cache_space_hook_setup(struct super_block *);
-extern int cache_space_hook_cleanup(void);
-extern int cache_space_hook_init(struct super_block *);
-extern int cache_space_hook_exit(struct super_block *);
-
-#define XATTR_SMFS_HOARD_MARK           "hoard"
-#define XATTR_SMFS_CACHE_LOGCOOKIE      "cache"
-#define XATTR_SMFS_ACTIVE_ENTRY         "entry"
-
-#define SMFS_TRANS_OP(inode, op)                \
-{                                               \
-        if (smfs_do_rec(inode))                 \
-                op = op | 0x10;                 \
-        if (smfs_cache_hook(inode))             \
-                op = op | 0x20;                 \
-}
-
-static inline int set_hoard_priority(struct inode *inode, void *handle,
-                                     __u32 *hoard)
-{
-        struct fsfilt_operations *fsops = I2CSB(inode)->sm_fsfilt;
-        int rc;
-
-        rc = fsops->fs_set_xattr(inode, handle, XATTR_SMFS_HOARD_MARK,
-                                 hoard, sizeof(__u32));
-        RETURN(rc);
-}
-
-static inline int get_hoard_priority(struct inode *inode, __u32 *hoard)
-{
-        struct fsfilt_operations *fsops = I2CSB(inode)->sm_fsfilt;
-        int rc;
-
-        rc = fsops->fs_get_xattr(inode, XATTR_SMFS_HOARD_MARK,
-                                 hoard, sizeof(__u32));
-        RETURN(rc);
-}
-
-static inline int set_active_entry(struct inode *dir, __u64 *active_entry,
-                                   void *handle)
-{
-        struct fsfilt_operations *fsops = I2CSB(dir)->sm_fsfilt;
-        int rc;
-        *active_entry = cpu_to_le64(*active_entry);
-        rc = fsops->fs_set_xattr(dir, handle, XATTR_SMFS_ACTIVE_ENTRY,
-                                 active_entry, sizeof(__u64));
-        RETURN(rc);
-}
-static inline int get_active_entry(struct inode *dir, __u64 *active_entry)
-{
-        struct fsfilt_operations *fsops = I2CSB(dir)->sm_fsfilt;
-        int rc = fsops->fs_get_xattr(dir, XATTR_SMFS_ACTIVE_ENTRY,
-                                     active_entry, sizeof(__u64));
-        *active_entry = le64_to_cpu(*active_entry);
-        if (rc >= 0)
-                rc = 0;
-        RETURN(rc);
-}
-
-#define CACHE_HOOK_CREATE       1
-#define CACHE_HOOK_LOOKUP       2
-#define CACHE_HOOK_LINK         3
-#define CACHE_HOOK_UNLINK       4
-#define CACHE_HOOK_SYMLINK      5
-#define CACHE_HOOK_MKDIR        6
-#define CACHE_HOOK_RMDIR        7
-#define CACHE_HOOK_MKNOD        8
-#define CACHE_HOOK_RENAME       9
-
-#define CACHE_HOOK_MAX          9
-
-#define SMFS_CACHE_HOOK_PRE(op, handle, dir)                            \
-{                                                                       \
-        if (smfs_cache_hook(dir)) {                                     \
-                LASSERT(handle != NULL);                                \
-                CDEBUG(D_INODE, "cache hook pre: op %d, dir %lu\n",     \
-                       op, dir->i_ino);                                 \
-                cache_space_pre(dir, op);                               \
-        }                                                               \
-}
-
-#define SMFS_CACHE_HOOK_POST(op, handle, old_dir, old_dentry,           \
-                             new_dir, new_dentry, rc, label)            \
-{                                                                       \
-        if (!rc && smfs_cache_hook(old_dir)) {                          \
-                LASSERT(handle != NULL);                                \
-                CDEBUG(D_INODE, "cache hook post: op %d, dir %lu\n",    \
-                       op, old_dir->i_ino);                             \
-                rc = cache_space_post(op, handle, old_dir, old_dentry,  \
-                                         new_dir, new_dentry);          \
-                if (rc)                                                 \
-                        GOTO(label, rc);                                \
-        }                                                               \
-}
-
-#endif /*__KERNEL*/
+extern int smfs_llog_setup(struct llog_ctxt **ctxt);
 #endif /* __LINUX_SMFS_H */
diff --git a/lustre/smfs/smfs_llog.c b/lustre/smfs/smfs_llog.c
index b2efd68..a661e56 100644
--- a/lustre/smfs/smfs_llog.c
+++ b/lustre/smfs/smfs_llog.c
@@ -1,220 +1,27 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
- *  Copyright (C) 2004 Cluster File Systems, Inc.
- *
- *   This file is part of Lustre, http://www.lustre.org.
- *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
- *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
+/*
+ * llog.c
  */
-
 #define DEBUG_SUBSYSTEM S_SM
 
-#include <linux/lustre_log.h>
-#include <linux/lustre_fsfilt.h>
-#include <linux/lustre_smfs.h>
-#include <linux/lvfs.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/stat.h>
+#include <linux/unistd.h>
+#include <linux/lustre_idl.h> 
 
 #include "smfs_internal.h"
 
-static int smfs_llog_process_rec_cb(struct llog_handle *handle,
-                                    struct llog_rec_hdr *rec, void *data)
+int smfs_llog_setup(struct llog_ctxt **p_ctxt)
 {
-        struct reint_record *reint_rec;
-        char *rec_buf ;
-        struct smfs_proc_args *args = (struct smfs_proc_args *)data;
-        struct lvfs_run_ctxt saved;
-        int rc = 0;
-        ENTRY;
-
-        if (!(le32_to_cpu(handle->lgh_hdr->llh_flags) & LLOG_F_IS_PLAIN)) {
-                CERROR("log is not plain\n");
-                RETURN(-EINVAL);
-        }
-
-        if (le32_to_cpu(rec->lrh_type) == LLOG_GEN_REC) {
-                struct llog_cookie cookie;
-
-                cookie.lgc_lgl = handle->lgh_id;
-                cookie.lgc_index = le32_to_cpu(rec->lrh_index);
-
-                llog_cancel(handle->lgh_ctxt, 1, &cookie, 0, NULL);
-                RETURN(LLOG_PROC_BREAK);
-        }
-
-        if (le32_to_cpu(rec->lrh_type) != SMFS_UPDATE_REC)
-                RETURN(-EINVAL);
-
-        rec_buf = (char*) (rec + 1);
-
-        OBD_ALLOC(reint_rec, sizeof(struct reint_record));
-        if (!reint_rec)
-                RETURN(-ENOMEM);
-
-        rc = smfs_rec_unpack(args, reint_rec, rec_buf);
-        if (rc)
-                GOTO(exit, rc = -ENOMEM);
-
-        if (!S2SMI(args->sr_sb)->smsi_ctxt)
-                GOTO(exit, rc = -ENODEV);
-
-        push_ctxt(&saved, S2SMI(args->sr_sb)->smsi_ctxt, NULL);
-        if (SMFS_DO_REINT_REC(args->sr_flags))
-                rc = lvfs_reint(args->sr_sb, reint_rec);
-        else
-                rc = lvfs_undo(args->sr_sb, reint_rec);
-
-        if (!rc && !SMFS_DO_REC_ALL(args->sr_flags)) {
-                args->sr_count --;
-                if (args->sr_count == 0)
-                        rc = LLOG_PROC_BREAK;
-        }
-        pop_ctxt(&saved, S2SMI(args->sr_sb)->smsi_ctxt, NULL);
-exit:
-        reint_rec_free(reint_rec);
+	int rc = 0;
+    
         RETURN(rc);
-}
-
-int smfs_llog_setup(struct super_block *sb)
-{
-        struct llog_ctxt **ctxt = &(S2SMI(sb)->smsi_rec_log);
-        struct lvfs_run_ctxt saved;
-        struct lvfs_run_ctxt *current_ctxt = NULL;
-        struct vfsmount *mnt;
-        struct dentry *dentry;
-        int rc = 0, rc2;
-        ENTRY;
-
-        /* create OBJECTS and LOGS for writing logs */
-        S2SMI(sb)->sm_cache_fsfilt->fs_setup(sb);
+}	
 
-        OBD_ALLOC(current_ctxt, sizeof(*current_ctxt));
-        if (!current_ctxt)
-                RETURN(-ENOMEM);
-        mnt = get_vfsmount(sb);
-        if (!mnt)
-                GOTO(err_exit, rc = -EINVAL);
 
-        OBD_SET_CTXT_MAGIC(current_ctxt);
-        current_ctxt->pwdmnt = mnt;
-        current_ctxt->pwd = mnt->mnt_root;
-        current_ctxt->fs = get_ds();
-        S2SMI(sb)->smsi_ctxt = current_ctxt;
 
-        push_ctxt(&saved, current_ctxt, NULL);
-        dentry = simple_mkdir(current->fs->pwd, "LOGS", 0777, 1);
-        if (IS_ERR(dentry)) {
-                rc = PTR_ERR(dentry);
-                CERROR("cannot create LOGS directory: rc = %d\n", rc);
-                GOTO(err_exit, rc = -EINVAL);
-        }
-        
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-        if (list_empty(&dentry->d_hash))
-                d_rehash(dentry);
-#else
-        /* FIXME-WANGDI: here should be something. */
-#endif
-        
-        S2SMI(sb)->smsi_logs_dir = dentry;
-        dentry = simple_mkdir(current->fs->pwd, "OBJECTS", 0777, 1);
-        if (IS_ERR(dentry)) {
-                rc = PTR_ERR(dentry);
-                CERROR("cannot create OBJECTS directory: rc = %d\n", rc);
-                GOTO(err_exit, rc = -EINVAL);
-        }
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-        if (list_empty(&dentry->d_hash))
-                d_rehash(dentry);
-#else
-        /* FIXME-WANGDI: here should be something. */
-#endif
 
-        S2SMI(sb)->smsi_objects_dir = dentry;
-        pop_ctxt(&saved, current_ctxt, NULL);
-
-        /* write log will not write to KML, cleanup kml flags */
-        SMFS_CLEAN_INODE_REC(S2SMI(sb)->smsi_objects_dir->d_inode);
-        SMFS_CLEAN_INODE_REC(S2SMI(sb)->smsi_logs_dir->d_inode);
-
-        /* log create does not call cache hooks, cleanup hook flags */
-        SMFS_CLEAN_INODE_CACHE_HOOK(S2SMI(sb)->smsi_objects_dir->d_inode);
-        SMFS_CLEAN_INODE_CACHE_HOOK(S2SMI(sb)->smsi_logs_dir->d_inode);
-
-        if (SMFS_DO_REC(S2SMI(sb))) {
-                rc = llog_catalog_setup(ctxt, KML_LOG_NAME, current_ctxt,
-                                        S2SMI(sb)->sm_fsfilt,
-                                        S2SMI(sb)->smsi_logs_dir,
-                                        S2SMI(sb)->smsi_objects_dir);
-                (*ctxt)->loc_proc_cb = smfs_llog_process_rec_cb;
-        }
-
-        if (SMFS_CACHE_HOOK(S2SMI(sb))) {
-                rc2 = cache_space_hook_setup(sb);
-                if (!rc && rc2)
-                        rc = rc2;
-        }
-exit:
-        RETURN(rc);
-err_exit:
-        if (current_ctxt)
-                OBD_FREE(current_ctxt, sizeof(*current_ctxt));
-        goto exit;
-}
-
-int smfs_llog_cleanup(struct super_block *sb)
-{
-        struct llog_ctxt *ctxt = S2SMI(sb)->smsi_rec_log;
-        int rc = 0, rc2;
-        ENTRY;
-
-        if (SMFS_CACHE_HOOK(S2SMI(sb)))
-                rc = cache_space_hook_cleanup();
-
-        if (SMFS_DO_REC(S2SMI(sb))) {
-                rc2 = llog_catalog_cleanup(ctxt);
-                if (!rc)
-                        rc = rc2;
-        }
-
-        if (S2SMI(sb)->smsi_logs_dir) {
-                l_dput(S2SMI(sb)->smsi_logs_dir);
-                S2SMI(sb)->smsi_logs_dir = NULL;
-        }
-        if (S2SMI(sb)->smsi_objects_dir) {
-                l_dput(S2SMI(sb)->smsi_objects_dir);
-                S2SMI(sb)->smsi_objects_dir = NULL;
-        }
-
-        OBD_FREE(S2SMI(sb)->smsi_ctxt, sizeof(struct lvfs_run_ctxt));
-        RETURN(rc);
-}
-
-int smfs_llog_add_rec(struct smfs_super_info * sinfo, void *data, int data_size)
-{
-        struct llog_rec_hdr rec;
-        int rc = 0;
 
-        rec.lrh_len = size_round(data_size);
-        rec.lrh_type = SMFS_UPDATE_REC;
 
-        rc = llog_add(sinfo->smsi_rec_log,
-                      &rec, data, NULL, 0, NULL);
-        if (rc != 1) {
-                CERROR("error adding kml rec: %d\n", rc);
-                RETURN(-EINVAL);
-        }
-        RETURN(0);
-}
diff --git a/lustre/smfs/smfs_support.h b/lustre/smfs/smfs_support.h
new file mode 100644
index 0000000..433d350
--- /dev/null
+++ b/lustre/smfs/smfs_support.h
@@ -0,0 +1,161 @@
+#ifndef __LINUX_SMFS_SUPPORT_H
+#define __LINUX_SMFS_SUPPORT_H
+/*Got these defination from lustre. Put here temporaryly*/
+
+#define D_TRACE     (1 << 0) /* ENTRY/EXIT markers */
+#define D_INODE     (1 << 1)
+#define D_SUPER     (1 << 2)
+#define D_EXT2      (1 << 3) /* anything from ext2_debug */
+#define D_MALLOC    (1 << 4) /* print malloc, free information */
+#define D_CACHE     (1 << 5) /* cache-related items */
+#define D_INFO      (1 << 6) /* general information */
+#define D_IOCTL     (1 << 7) /* ioctl related information */
+#define D_BLOCKS    (1 << 8) /* ext2 block allocation */
+#define D_NET       (1 << 9) /* network communications */
+#define D_WARNING   (1 << 10) /* CWARN(...) == CDEBUG (D_WARNING, ...) */
+#define D_BUFFS     (1 << 11)
+#define D_OTHER     (1 << 12)
+#define D_DENTRY    (1 << 13)
+#define D_PAGE      (1 << 15) /* bulk page handling */
+#define D_DLMTRACE  (1 << 16)
+#define D_ERROR     (1 << 17) /* CERROR(...) == CDEBUG (D_ERROR, ...) */
+#define D_EMERG     (1 << 18) /* CEMERG(...) == CDEBUG (D_EMERG, ...) */
+#define D_HA        (1 << 19) /* recovery and failover */
+#define D_RPCTRACE  (1 << 20) /* for distributed debugging */
+#define D_VFSTRACE  (1 << 21)
+#define D_SM      (1 << 22)
+
+
+#ifdef __KERNEL__
+# include <linux/sched.h> /* THREAD_SIZE */
+#else 
+# ifndef THREAD_SIZE /* x86_64 has THREAD_SIZE in userspace */
+#  define THREAD_SIZE 8192
+# endif
+#endif
+# include <linux/vmalloc.h> 
+# define sm_debug_msg(mask, file, fn, line, stack, format, a...)    \
+    printk("%02x (@%lu %s:%s,l. %d %d %lu): " format,                    \
+           (mask), (long)time(0), file, fn, line,                   \
+           getpid() , stack, ## a);
+
+#define LUSTRE_TRACE_SIZE (THREAD_SIZE >> 5)
+
+#ifdef __KERNEL__
+# ifdef  __ia64__
+#  define CDEBUG_STACK (THREAD_SIZE -                                      \
+                        ((unsigned long)__builtin_dwarf_cfa() &            \
+                         (THREAD_SIZE - 1)))
+# else
+#  define CDEBUG_STACK (THREAD_SIZE -                                      \
+                        ((unsigned long)__builtin_frame_address(0) &       \
+                         (THREAD_SIZE - 1)))
+# endif
+
+#define CHECK_STACK(stack)                                                    \
+        do {                                                                  \
+                if ((stack) > 3*THREAD_SIZE/4 && (stack) > sm_stack) {      \
+                        printk( "maximum lustre stack %u\n",        	      \
+                                          sm_stack = (stack));              \
+                }                                                             \
+        } while (0)
+#else /* __KERNEL__ */
+#define CHECK_STACK(stack) do { } while(0)
+#define CDEBUG_STACK (0L)
+#endif /* __KERNEL__ */
+
+#if 1
+#define CDEBUG(mask, format, a...)                                            \
+do {                                                                          \
+        CHECK_STACK(CDEBUG_STACK);       				      \
+        if (!(mask) || ((mask) & (D_ERROR | D_EMERG | D_WARNING)) ||          \
+            (sm_debug_level & (mask))) {                                    \
+		printk("SM_DEBUG: (%s %d):", __FILE__, __LINE__);	      \
+		printk(format, ## a);    				      \
+	}								      \
+} while (0)
+
+#define CWARN(format, a...)  CDEBUG(D_WARNING, format, ## a)
+#define CERROR(format, a...) CDEBUG(D_ERROR, format, ## a)
+#define CEMERG(format, a...) CDEBUG(D_EMERG, format, ## a)
+
+#define GOTO(label, rc)                                                 \
+do {                                                                    \
+        long GOTO__ret = (long)(rc);                                    \
+        CDEBUG(D_TRACE,"SM_DEBUG: (%s %d):Process leaving via %s (rc=%lu : %ld : %lx)\n", \
+               __FILE__, __LINE__, #label, (unsigned long)GOTO__ret,    \
+	       (signed long)GOTO__ret,					\
+               (signed long)GOTO__ret);                                 \
+        goto label;                                                     \
+} while (0)
+
+#define RETURN(rc)                                                      \
+do {                                                                    \
+        typeof(rc) RETURN__ret = (rc);                                  \
+        CDEBUG(D_TRACE, "Process %d leaving %s (rc=%lu : %ld : %lx)\n", \
+               current->pid, __FUNCTION__, (long)RETURN__ret,		\
+	       (long)RETURN__ret, (long)RETURN__ret);			\
+        return RETURN__ret;                                             \
+} while (0)
+
+#define ENTRY                                                           \
+do {                                                                    \
+	CDEBUG(D_TRACE,  "SM_DEBUG: (%s %d): Process %d enter %s\n",  \
+	       __FILE__, __LINE__, current->pid, __FUNCTION__);         \
+} while (0)
+
+#define EXIT                                                            \
+do {                                                                    \
+        CDEBUG(D_TRACE, "SM_DEBUG: (%s %d): Process %d leaving %s \n",			\
+	       __FILE__, __LINE__, current->pid, __FUNCTION__);				\
+} while(0)
+#else
+#define CDEBUG(mask, format, a...)      do { } while (0)
+#define CWARN(format, a...)             do { } while (0)
+#define CERROR(format, a...)            printk("<3>" format, ## a)
+#define CEMERG(format, a...)            printk("<0>" format, ## a)
+#define GOTO(label, rc)                 do { (void)(rc); goto label; } while (0)
+#define RETURN(rc)                      return (rc)
+#define ENTRY                           do { } while (0)
+#define EXIT                            do { } while (0)
+#endif
+
+#define SM_ALLOC(ptr, size)						\
+do {									\
+	if (size <= 4096) {						\
+		ptr = kmalloc((unsigned long) size, GFP_KERNEL);	\
+                CDEBUG(D_MALLOC, "Proc %d %s:%d kmalloced: %d at %x.\n",\
+		       current->pid, __FUNCTION__, __LINE__,		\
+		       (int) size, (int) ptr);				\
+	} else {							\
+		ptr = vmalloc((unsigned long) size);			\
+		CDEBUG(D_MALLOC, "Proc %d %s:%d vmalloced: %d at %x.\n",\
+		       current->pid, __FUNCTION__, __LINE__,		\
+		       (int) size, (int) ptr);				\
+	}								\
+	if (ptr == 0) {							\
+		printk("kernel malloc returns 0 at %s:%d\n",		\
+		       __FILE__, __LINE__);				\
+	} else {							\
+		memset(ptr, 0, size);					\
+		sm_kmemory += size;					\
+	}								\
+} while (0)
+
+#define SM_FREE(ptr,size)						\
+do {									\
+	sm_kmemory -= size;						\
+	if (size <= 4096) {						\
+		CDEBUG(D_MALLOC, "Proc %d %s:%d kfreed: %d at %x.\n",	\
+		       current->pid, __FUNCTION__, __LINE__,		\
+		       (int) size, (int) ptr);				\
+		kfree((ptr));						\
+	} else {							\
+		CDEBUG(D_MALLOC, "Proc %d %s:%d vfreed: %d at %x.\n",	\
+		       current->pid, __FUNCTION__, __LINE__,		\
+		       (int) size, (int) ptr);				\
+		vfree((ptr));						\
+	}								\
+} while (0)
+
+#endif /*__LINUX_SMFS_SUPPORT_H */
diff --git a/lustre/smfs/super.c b/lustre/smfs/super.c
index eb3ab6b..bfa4247 100644
--- a/lustre/smfs/super.c
+++ b/lustre/smfs/super.c
@@ -1,25 +1,13 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
+/*
+ *  snap_current
  *
- *  Copyright (C) 2004 Cluster File Systems, Inc.
- *
- *   This file is part of Lustre, http://www.lustre.org.
- *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
- *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Copyright (C) 1998 Peter J. Braam
+ *  Copyright (C) 2000 Stelias Computing, Inc.
+ *  Copyright (C) 2000 Red Hat, Inc.
+ *  Copyright (C) 2000 Mountain View Data, Inc.
  *
+ *  Author: Peter J. Braam <braam@mountainviewdata.com>
  */
-
 #define DEBUG_SUBSYSTEM S_SM
 
 #include <linux/config.h>
@@ -32,340 +20,316 @@
 #include <linux/utime.h>
 #include <linux/file.h>
 #include <linux/slab.h>
-#include <linux/dcache.h>
 #include <linux/loop.h>
 #include <linux/errno.h>
-#include <linux/obd_class.h>
-#include <linux/obd_support.h>
-#include <linux/lustre_lib.h>
 #include <linux/lustre_idl.h>
-#include <linux/lustre_fsfilt.h>
-#include <linux/lustre_smfs.h>
-#include "smfs_internal.h"
+#include "smfs_internal.h" 
 
-static char *smfs_options(char *data, char **devstr, char **namestr,
-                          int *kml, int *cache, char **opts, 
-                          int *iopen_nopriv)
+/* Find the options for the clone. These consist of a cache device
+   and an index in the snaptable associated with that device. 
+*/
+static char *smfs_options(char *options, char **devstr, char **namestr, int *kml)
 {
-        char *pos;
-        struct option *opt_value = NULL;
-
-        while (!(get_opt(&opt_value, &pos))) {
-                if (!strcmp(opt_value->opt, "dev")) {
-                        if (devstr != NULL)
-                                *devstr = opt_value->value;
-                } else if (!strcmp(opt_value->opt, "type")) {
-                        if (namestr != NULL)
-                                *namestr = opt_value->value;
-                } else if (!strcmp(opt_value->opt, "kml")) {
-                        if (kml)
-                                *kml = 1;
-                } else if (!strcmp(opt_value->opt, "cache")) {
-                        if (cache)
-                                *cache = 1;
-                } else if (!strcmp(opt_value->opt, "options")) {
-                        if (opts != NULL)
-                                *opts = opt_value->value;
-                } else if (!strcmp(opt_value->opt, "iopen_nopriv")) {
-                        if (iopen_nopriv != NULL)
-                                *iopen_nopriv = 1;
-                } else {
-                        break;
-                }
-        }
-        return pos;
+	struct option *opt_value = NULL;
+	char *pos;
+	
+	while (!(get_opt(&opt_value, &pos))) { 			
+		if (!strcmp(opt_value->opt, "dev")) {
+			if (devstr != NULL)
+				*devstr = opt_value->value;
+		} else if (!strcmp(opt_value->opt, "type")) {
+			if (namestr != NULL)
+				*namestr = opt_value->value;
+		} else if (!strcmp(opt_value->opt, "kml")) {
+			*kml = 1;	
+		} else {
+			break;
+		}
+	}
+	return pos;
 }
 
-struct vfsmount *get_vfsmount(struct super_block *sb)
+static int set_loop_fd(char *dev_path, char *loop_dev)
 {
-        struct vfsmount *rootmnt, *mnt, *ret = NULL;
-        struct list_head *end, *list;
-
-        rootmnt = mntget(current->fs->rootmnt);
-        end = list = &rootmnt->mnt_list;
-        do {
-                mnt = list_entry(list, struct vfsmount, mnt_list);
-                if (mnt->mnt_sb == sb) {
-                        ret = mnt;
-                        break;
-                }
-                list = list->next;
-        } while (end != list);
-        
-        mntput(current->fs->rootmnt);
-        return ret;
+        struct loop_info loopinfo;
+	struct nameidata nd;
+	struct dentry *dentry;
+	struct block_device_operations *bd_ops;
+	struct file   *filp;
+	int    fd = 0, error = 0;
+	
+	fd = get_unused_fd();
+
+	if (!fd) RETURN(-EINVAL);
+	
+	filp = filp_open(dev_path, FMODE_WRITE, 0);
+	if (!filp || !S_ISREG(filp->f_dentry->d_inode->i_mode)) 
+		RETURN(-EINVAL);
+	
+	fd_install(fd, filp);		
+
+	if (path_init(loop_dev, LOOKUP_FOLLOW, &nd)) {
+       		error = path_walk(loop_dev, &nd);
+       		if (error) {
+			path_release(&nd);
+			filp_close(filp, current->files); 
+			RETURN(-EINVAL);
+		}
+       	} else {
+		path_release(&nd);
+		filp_close(filp, current->files); 
+		RETURN(-EINVAL);
+	}                                                                                                                                                                    
+	dentry = nd.dentry;
+	bd_ops = get_blkfops(LOOP_MAJOR); 
+	
+	error = bd_ops->ioctl(dentry->d_inode, filp, LOOP_SET_FD,
+                              (unsigned long)fd);
+	if (error) {
+		path_release(&nd);
+		filp_close(filp, current->files); 
+		RETURN(-EINVAL);
+	}
+	memset(&loopinfo, 0, sizeof(struct loop_info));
+
+	error = bd_ops->ioctl(dentry->d_inode, filp, LOOP_SET_STATUS,
+                              (unsigned long)(&loopinfo));
+	path_release(&nd);
+	RETURN(error);	
 }
 
-struct super_block *smfs_get_sb_by_path(char *path, int len)
+#define SIZE(a) (sizeof(a)/sizeof(a[0]))
+static char *find_unused_and_set_loop_device(char *dev_path)
 {
-        struct super_block *sb;
-        struct nameidata nd;
-        int error = 0;
-
-        ENTRY;
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-        if (path_init(path, LOOKUP_FOLLOW, &nd)) {
-#else
-        if (path_lookup(path, LOOKUP_FOLLOW, &nd)) {
-#endif
-                error = path_walk(path, &nd);
-                if (error) {
-                        path_release(&nd);
-                        RETURN(NULL);
-                }
-        } else {
-                RETURN(NULL);
-        }
-
-        /* FIXME-WANGDI: add some check code here. */
-        sb = nd.dentry->d_sb;
-        path_release(&nd);
-        RETURN(sb);
+        char *loop_formats[] = { "/dev/loop/%d", "/dev/loop%d"};
+        struct loop_info loopinfo;
+	struct nameidata nd;
+	struct dentry *dentry;
+      	char *dev = NULL;
+        int i, j, error;
+                                                                                                                                                                                             
+        for (j = 0; j < SIZE(loop_formats); j++) {
+		SM_ALLOC(dev, strlen(loop_formats[i]) + 1);
+		for(i = 0; i < 256; i++) {
+			struct block_device_operations *bd_ops;
+
+			sprintf(dev, loop_formats[j], i);
+                       	
+			if (path_init(dev, LOOKUP_FOLLOW, &nd)) {
+                		error = path_walk(dev, &nd);
+                		if (error && error != -ENOENT) {
+					path_release(&nd);
+                        		SM_FREE(dev, strlen(loop_formats[i]) + 1); 
+					RETURN(NULL);
+				}
+        		} else {
+                       		SM_FREE(dev, strlen(loop_formats[i]) + 1); 
+                		RETURN(NULL);
+                        }      
+			dentry = nd.dentry;
+			bd_ops = get_blkfops(LOOP_MAJOR); 
+			error = bd_ops->ioctl(dentry->d_inode, NULL, LOOP_GET_STATUS, 
+					      (unsigned long)&loopinfo);
+			path_release(&nd);
+                        
+			if (error == -ENXIO) {
+				/*find unused loop and set dev_path to loopdev*/
+				error = set_loop_fd(dev_path, dev);
+				if (error) {
+					SM_FREE(dev, strlen(loop_formats[i]) + 1);
+					dev = NULL;		
+				}
+				return dev;/* probably free */
+			}
+        	}
+        	SM_FREE(dev, strlen(loop_formats[i]) + 1);
+	}
+	RETURN(NULL);
 }
 
-static int smfs_init_fsfilt_ops(struct super_block *sb)
+#define MAX_LOOP_DEVICES	256
+static char *parse_path2dev(struct super_block *sb, char *dev_path)
 {
-        ENTRY;
-        if (!S2SMI(sb)->sm_cache_fsfilt) {
-                S2SMI(sb)->sm_cache_fsfilt =
-                        fsfilt_get_ops(S2SMI(sb)->cache_fs_type);
-                if (!S2SMI(sb)->sm_cache_fsfilt) {
-                        CERROR("Can not get %s fsfilt ops needed by kml\n",
-                               S2SMI(sb)->cache_fs_type);
-                        RETURN(-EINVAL);
-                }
-        }
-        if (!S2SMI(sb)->sm_fsfilt) {
-                S2SMI(sb)->sm_fsfilt =
-                        fsfilt_get_ops(S2SMI(sb)->fs_type);
-                if (!S2SMI(sb)->sm_fsfilt) {
-                        CERROR("Can not get %s fsfilt ops needed by kml\n",
-                               S2SMI(sb)->fs_type);
-                        RETURN(-EINVAL);
-                }
-        }
-        RETURN(0);
+	struct dentry *dentry;
+	struct nameidata nd;
+	char *name = NULL;
+	int  error = 0;
+
+	if (path_init(dev_path, LOOKUP_FOLLOW, &nd)) {
+     		error = path_walk(dev_path, &nd);
+     		if (error) {
+			path_release(&nd);
+			RETURN(NULL);
+		}
+       	} else {
+               	RETURN(NULL);
+	}      
+	dentry = nd.dentry;
+
+	if (!dentry->d_inode || is_bad_inode(dentry->d_inode) || 
+	    (!S_ISBLK(dentry->d_inode->i_mode) && 
+             !S_ISREG(dentry->d_inode->i_mode))){
+		path_release(&nd);
+		RETURN(NULL);
+	}
+		
+	if (S_ISREG(dentry->d_inode->i_mode)) {
+		name = find_unused_and_set_loop_device(dev_path);
+		path_release(&nd);
+		RETURN(name); 			
+	}
+	SM_ALLOC(name, strlen(dev_path) + 1);
+	memcpy(name, dev_path, strlen(dev_path) + 1);
+	RETURN(name);
 }
-
-void smfs_cleanup_fsfilt_ops(struct super_block *sb)
+void duplicate_sb(struct super_block *csb, 
+			 struct super_block *sb)
 {
-        if (S2SMI(sb)->sm_cache_fsfilt)
-                fsfilt_put_ops(S2SMI(sb)->sm_cache_fsfilt);
-        if (S2SMI(sb)->sm_fsfilt)
-                fsfilt_put_ops(S2SMI(sb)->sm_fsfilt);
+	sb->s_blocksize = csb->s_blocksize;
+	sb->s_magic = csb->s_magic;
+	sb->s_blocksize_bits = csb->s_blocksize_bits;
+	sb->s_maxbytes = csb->s_maxbytes;
 }
+extern struct super_operations smfs_super_ops;
 
-static int sm_mount_cache(struct super_block *sb, char *devstr, 
-                          char *typestr, char *opts, int iopen_nopriv)
+static int sm_mount_cache(struct super_block *sb, 
+			  char *devstr,
+			  char *typestr)
 {
-        struct smfs_super_info *smb;
-        int err = 0, typelen;
-        struct vfsmount *mnt;
-        unsigned long page;
-
-        ENTRY;
-
-        typelen = strlen(typestr);
-       
-        page = __get_free_page(GFP_KERNEL);
-        if (!page)
-                GOTO(err_out, err = -ENOMEM);
-
+	struct vfsmount *mnt;	
+	struct smfs_super_info *smb;
+	char *dev_name = NULL;
+	unsigned long page;
+	int 	err = 0;
+	
+	dev_name = parse_path2dev(sb, devstr);
+	if (!dev_name) {
+        	GOTO(err_out, err = -ENOMEM);
+	}
+	if (!(page = __get_free_page(GFP_KERNEL))) {
+        	GOTO(err_out, err = -ENOMEM);
+	}                                                                                                                                                   
         memset((void *)page, 0, PAGE_SIZE);
-        
-        if (iopen_nopriv)
-                sprintf((char *)page, "iopen_nopriv");
-
-        if (opts && strlen(opts)) {
-                int n = strlen((char *)page);
-                sprintf((char *)page + n, ",%s", opts);
-        }
-        
-        printk("smfs: mounting %s at %s\n", typestr, devstr);
-
-        mnt = do_kern_mount(typestr, 0, devstr, (void *)page);
+        sprintf((char *)page, "iopen_nopriv");
+                                                                                                                                                                                                     
+        mnt = do_kern_mount(typestr, 0, dev_name, (void *)page);
         free_page(page);
-
-        if (IS_ERR(mnt)) {
+	
+	if (IS_ERR(mnt)) {
                 CERROR("do_kern_mount failed: rc = %ld\n", PTR_ERR(mnt));
                 GOTO(err_out, err = PTR_ERR(mnt));
         }
-        smb = S2SMI(sb);
-        smb->smsi_sb = mnt->mnt_sb;
-        smb->smsi_mnt = mnt;
-
-        smfs_init_sm_ops(smb);
-
-        OBD_ALLOC(smb->cache_fs_type, strlen(typestr) + 1);
-        memcpy(smb->cache_fs_type, typestr, strlen(typestr));
-
-        OBD_ALLOC(smb->fs_type, strlen(SMFS_TYPE) + 1);
-        memcpy(smb->fs_type, SMFS_TYPE, strlen(SMFS_TYPE));
-
-        duplicate_sb(sb, mnt->mnt_sb);
-        sm_set_sb_ops(mnt->mnt_sb, sb);
-        err = smfs_init_fsfilt_ops(sb);
+	smb = S2SMI(sb); 
+	smb->smsi_sb = mnt->mnt_sb;
+	smb->smsi_mnt = mnt;
+	
+	duplicate_sb(mnt->mnt_sb, sb);
+	sm_set_sb_ops(mnt->mnt_sb, sb);	
 err_out:
-        return err;
+	if (dev_name) 
+		SM_FREE(dev_name, strlen(dev_name) + 2);
+		
+	return err;	
 }
-
 static int sm_umount_cache(struct super_block *sb)
 {
-        struct smfs_super_info *smb = S2SMI(sb);
-
-        mntput(smb->smsi_mnt);
-        smfs_cleanup_sm_ops(smb);
-        smfs_cleanup_fsfilt_ops(sb);
-
-        if (smb->cache_fs_type)
-                OBD_FREE(smb->cache_fs_type, strlen(smb->cache_fs_type) + 1);
-        
-        if (smb->fs_type)
-                OBD_FREE(smb->fs_type, strlen(smb->fs_type) + 1);
-        
-        return 0;
+	struct smfs_super_info *smb = S2SMI(sb);
+	
+	mntput(smb->smsi_mnt);
+	
+	return 0;
 }
-
 void smfs_put_super(struct super_block *sb)
 {
-        if (SMFS_CACHE_HOOK(S2SMI(sb)))
-                cache_space_hook_exit(sb);
-        
-        if (SMFS_DO_REC(S2SMI(sb)))
-                smfs_rec_cleanup(sb);
-        
-        if (sb)
-                sm_umount_cache(sb);
-        return;
+	if (sb)
+		sm_umount_cache(sb);
+	return; 
 }
 
-static int smfs_fill_super(struct super_block *sb,
-                           void *data, int silent)
+struct super_block *
+smfs_read_super(
+        struct super_block *sb,
+        void *data,
+        int silent)
 {
-        ino_t root_ino;
-        char *cache_data;
-
-        int iopen_nopriv = 0;
-        struct inode *root_inode = NULL;
-        int err = 0, do_rec = 0, cache_hook = 0;
-        char *devstr = NULL, *typestr = NULL, *opts = NULL;
-
-        ENTRY;
-
-        CDEBUG(D_SUPER, "mount opts: %s\n", data ?
-               (char *)data : "(none)");
-
-        init_option(data);
-        
-        /* read and validate passed options. */
-        cache_data = smfs_options(data, &devstr, &typestr,
-                                  &do_rec, &cache_hook, &opts,
-                                  &iopen_nopriv);
-        
-        if (*cache_data)
-                CWARN("smfs_fill_super(): options parsing stoped at "
-                      "option %s\n", cache_data);
-        
-        if (!typestr || !devstr) {
-                CERROR("mount options name and dev mandatory\n");
-                GOTO(out_err, err = -EINVAL);
-        }
-
-        err = sm_mount_cache(sb, devstr, typestr, opts, 
-                             iopen_nopriv);
-                             
-        if (err) {
-                CERROR("Can not mount %s as %s, rc = %d\n", devstr, 
-                        typestr, err);
-                GOTO(out_err, err);
-        }
-
-        if (do_rec)
-                smfs_rec_init(sb);
-
-        if (cache_hook)
-                cache_space_hook_init(sb);
-
-        dget(S2CSB(sb)->s_root);
-        root_ino = S2CSB(sb)->s_root->d_inode->i_ino;
-        root_inode = iget(sb, root_ino);
-
-        CDEBUG(D_SUPER, "readinode %p, root ino %ld, root inode at %p\n",
-               sb->s_op->read_inode, root_ino, root_inode);
-
-        sb->s_root = d_alloc_root(root_inode);
-
-        if (!sb->s_root) {
-                sm_umount_cache(sb);
-                GOTO(out_err, err = -EINVAL);
-        }
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-        CDEBUG(D_SUPER, "sb %lx, &sb->u.generic_sbp: %lx\n",
-               (ulong)sb, (ulong)&sb->u.generic_sbp);
-#else
-        CDEBUG(D_SUPER, "sb %lx, &sb->s_fs_info: %lx\n",
-               (ulong)sb, (ulong)&sb->s_fs_info);
-#endif
-
+	struct inode *root_inode = NULL;
+	char *devstr = NULL, *typestr = NULL;
+	char *cache_data;
+	ino_t root_ino;
+	int err = 0, kml = 0;
+
+	ENTRY;
+
+	CDEBUG(D_SUPER, "mount opts: %s\n", data ? (char *)data : "(none)");
+	
+	init_option(data);
+	/* read and validate options */
+	cache_data = smfs_options(data, &devstr, &typestr, &kml);
+	if (*cache_data) {
+		CERROR("invalid mount option %s\n", (char*)data);
+		GOTO(out_err, err=-EINVAL);
+	}
+	if (!typestr || !devstr) {
+		CERROR("mount options name and dev mandatory\n");
+		GOTO(out_err, err=-EINVAL);
+	}
+	
+	err = sm_mount_cache(sb, devstr, typestr);
+	if (err) {
+		CERROR("Can not mount %s as %s\n", devstr, typestr);
+		GOTO(out_err, 0);
+	}
+	
+	if (kml) smfs_kml_init(sb);	
+	
+	setup_sm_journal_ops(typestr);
+	
+	dget(S2CSB(sb)->s_root);
+	root_ino = S2CSB(sb)->s_root->d_inode->i_ino;
+	root_inode = iget(sb, root_ino);
+		
+	CDEBUG(D_SUPER, "readinode %p, root ino %ld, root inode at %p\n",
+	       sb->s_op->read_inode, root_ino, root_inode);
+	
+	sb->s_root = d_alloc_root(root_inode);
+	
+	if (!sb->s_root) {
+		GOTO(out_err, err=-EINVAL);
+	}
+	
+	CDEBUG(D_SUPER, "sb %lx, &sb->u.generic_sbp: %lx\n",
+                (ulong) sb, (ulong) &sb->u.generic_sbp);
+ 	
 out_err:
-        cleanup_option();
-        return err;
-}
-
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-static struct super_block *smfs_read_super(struct super_block *sb,
-                                           void *data, int silent)
-{
-        int err;
-
-        err = smfs_fill_super(sb, data, silent);
-        if (err)
-                return NULL;
-        
-        return sb;
-}
-#else
-struct super_block *smfs_get_sb(struct file_system_type *fs_type,
-                                int flags, const char *dev_name,
-                                void *data)
-{
-        return get_sb_nodev(fs_type, flags, data, smfs_fill_super);
+	cleanup_option();
+	if (err)
+		return NULL;
+	return sb;
 }
-#endif
 
-static struct file_system_type smfs_type = {
-        .owner       = THIS_MODULE,
-        .name        = "smfs",
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
-        .read_super  = smfs_read_super,
-#else
-        .get_sb      = smfs_get_sb,
-        .kill_sb     = kill_anon_super,
-#endif
-};
+static DECLARE_FSTYPE(smfs_type, "smfs", smfs_read_super, 0);
 
 int init_smfs(void)
 {
-        int err;
-
-        err = register_filesystem(&smfs_type);
-        if (err) {
-                CERROR("register_filesystem() failed, "
-                       "rc = %d\n", err);
-        }
-        return err;
+	int err = 0;
+
+	err = register_filesystem(&smfs_type);
+	if (err) {
+		CERROR("smfs: failed in register Storage Management filesystem!\n");
+	}
+	init_smfs_cache();		
+	return err;
 }
 
 int cleanup_smfs(void)
 {
-        int err = 0;
-
-        err = unregister_filesystem(&smfs_type);
-        if (err) {
-                CERROR("unregister_filesystem() failed, "
-                       "rc = %d\n", err);
-        }
-        return 0;
+	int err = 0;
+
+	ENTRY;
+	err = unregister_filesystem(&smfs_type);
+	if (err) {
+		CERROR("smfs: failed to unregister Storage Management filesystem!\n");
+	}
+	cleanup_smfs_cache();		
+	return 0;
 }
diff --git a/lustre/smfs/symlink.c b/lustre/smfs/symlink.c
index 42b6ab6..e1ca762 100644
--- a/lustre/smfs/symlink.c
+++ b/lustre/smfs/symlink.c
@@ -1,86 +1,74 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
+/*
+ *  smfs/symlink.c
  *
- *  Copyright (C) 2004 Cluster File Systems, Inc.
- *
- *   This file is part of Lustre, http://www.lustre.org.
- *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
- *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
-
-#define DEBUG_SUBSYSTEM S_SM
+#define DEBUG_SUBSYSTEM S_SNAP
 
 #include <linux/kmod.h>
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/slab.h>
 #include <linux/string.h>
-#include <linux/obd_class.h>
-#include <linux/obd_support.h>
-#include <linux/lustre_lib.h>
 #include <linux/lustre_idl.h>
-#include <linux/lustre_smfs.h>
 
-#include "smfs_internal.h"
+#include "smfs_internal.h" 
 
-static int smfs_readlink(struct dentry *dentry, char *buffer, int buflen)
+static int smfs_readlink(struct dentry * dentry, char * buffer, int buflen)
 {
-        struct inode *cache_inode = I2CI(dentry->d_inode);
-        struct dentry *cache_dentry;
-        int rc = 0;
-        ENTRY;
-
-        if (!cache_inode)
-                RETURN(-ENOENT);
+	struct inode *cache_inode = I2CI(dentry->d_inode);
+	struct inode *cache_dir = NULL;
+	struct dentry *cache_dentry;
+	struct dentry parent;
+	int    rc = 0;
 
-        cache_dentry = pre_smfs_dentry(NULL, cache_inode, dentry);
-        if (!cache_dentry)
-                GOTO(exit, rc = -ENOMEM);
-        if (cache_inode->i_op && cache_inode->i_op->readlink)
-                rc = cache_inode->i_op->readlink(cache_dentry, buffer, buflen);
-        GOTO(exit, rc);
-exit:
-        post_smfs_dentry(cache_dentry);
-        return rc;
+	if (!cache_inode)
+		RETURN(-ENOENT);
+	if (dentry->d_parent && dentry->d_parent->d_inode){
+		cache_dir = I2CI(dentry->d_parent->d_inode);
+		prepare_parent_dentry(&parent, cache_dir);
+	}	
+	cache_dentry = d_alloc(&parent, &dentry->d_name);
+	d_add(cache_dentry, cache_inode);
+	igrab(cache_inode);
+		
+	if (cache_inode->i_op && cache_inode->i_op->readlink) 	
+		rc = cache_inode->i_op->readlink(cache_dentry, buffer, buflen);
+	
+	d_unalloc(cache_dentry);
+	return rc;
 }
 
 static int smfs_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
-        struct inode *cache_inode = I2CI(dentry->d_inode);
-        struct dentry *cache_dentry;
-        int rc = 0;
-        ENTRY;
+	struct inode *cache_inode = I2CI(dentry->d_inode);
+	struct inode *cache_dir = NULL;
+	struct dentry *cache_dentry;
+	struct dentry parent;
+	int rc = 0;
+	if (!cache_inode)
+		RETURN(-ENOENT);
 
-        if (!cache_inode)
-                RETURN(-ENOENT);
+	if (dentry->d_parent && dentry->d_parent->d_inode){
+		cache_dir = I2CI(dentry->d_parent->d_inode);
+		prepare_parent_dentry(&parent, cache_dir);
+	}	
 
-        cache_dentry = pre_smfs_dentry(NULL, cache_inode, dentry);
-        if (!cache_dentry)
-                GOTO(exit, rc = -ENOMEM);
+	cache_dentry = d_alloc(&parent, &dentry->d_name);
 
-        if (cache_inode->i_op && cache_inode->i_op->follow_link)
-                rc = cache_inode->i_op->follow_link(cache_dentry, nd);
-exit:
-        post_smfs_dentry(cache_dentry);
-        return rc;
+	d_add(cache_dentry, cache_inode);
+	igrab(cache_inode);
+	
+	if (cache_inode->i_op && cache_inode->i_op->follow_link) 	
+		rc = cache_inode->i_op->follow_link(cache_dentry, nd);
+	
+	d_unalloc(cache_dentry);
+	return rc;
 }
-
 struct inode_operations smfs_sym_iops = {
-        readlink:        smfs_readlink,
-        follow_link:        smfs_follow_link,
-        setxattr:       smfs_setxattr,          /* BKL held */
+	readlink:	smfs_readlink,
+	follow_link:	smfs_follow_link,
+	setxattr:       smfs_setxattr,          /* BKL held */
         getxattr:       smfs_getxattr,          /* BKL held */
         listxattr:      smfs_listxattr,         /* BKL held */
         removexattr:    smfs_removexattr,       /* BKL held */
diff --git a/lustre/smfs/sysctl.c b/lustre/smfs/sysctl.c
index 8c6feab..785b3dd 100644
--- a/lustre/smfs/sysctl.c
+++ b/lustre/smfs/sysctl.c
@@ -1,26 +1,10 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
- *  Copyright (C) 2004 Cluster File Systems, Inc.
- *
- *   This file is part of Lustre, http://www.lustre.org.
- *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
- *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
+/*
+ *  Sysctrl entries for Snapfs
  */
 
-#define DEBUG_SUBSYSTEM S_SM
+/* /proc entries */
+
+#define DEBUG_SUBSYSTEM S_SNAP
 
 #include <linux/module.h>
 #include <linux/kmod.h>
@@ -30,19 +14,15 @@
 #include <linux/string.h>
 #include <linux/sysctl.h>
 #include <linux/proc_fs.h>
-#include <linux/obd_class.h>
-#include <linux/obd_support.h>
-#include <linux/lustre_lib.h>
 #include <linux/lustre_idl.h>
-#include <linux/lustre_smfs.h>
-
-#include "smfs_internal.h"
+#include "smfs_internal.h" 
 
 
 #ifdef CONFIG_PROC_FS
 static struct proc_dir_entry *proc_smfs_root;
 #endif
 
+
 /* SYSCTL below */
 
 static struct ctl_table_header *smfs_table_header = NULL;
@@ -51,8 +31,8 @@ static struct ctl_table_header *smfs_table_header = NULL;
  */
 #define PSDEV_SMFS  (0x130)
 
-#define PSDEV_DEBUG           1      /* control debugging */
-#define PSDEV_TRACE           2      /* control enter/leave pattern */
+#define PSDEV_DEBUG	   1      /* control debugging */
+#define PSDEV_TRACE	   2      /* control enter/leave pattern */
 
 /* These are global control options */
 #define ENTRY_CNT 3
@@ -63,46 +43,45 @@ int sm_debug_level = 0;
 /* XXX - doesn't seem to be working in 2.2.15 */
 static struct ctl_table smfs_ctltable[] =
 {
-        {PSDEV_DEBUG, "debug", &sm_debug_level, sizeof(int), 0644, NULL,
-         &proc_dointvec},
-        {PSDEV_TRACE, "trace", &sm_print_entry, sizeof(int), 0644, NULL,
-         &proc_dointvec},
-        {0}
+	{PSDEV_DEBUG, "debug", &sm_debug_level, sizeof(int), 0644, NULL, &proc_dointvec},
+	{PSDEV_TRACE, "trace", &sm_print_entry, sizeof(int), 0644, NULL, &proc_dointvec},
+	{0}
 };
 
 static ctl_table smfs_table[2] = {
-        {PSDEV_SMFS, "smfs",    NULL, 0, 0555, smfs_ctltable},
-        {0}
+	{PSDEV_SMFS, "smfs",    NULL, 0, 0555, smfs_ctltable},
+	{0}
 };
 
 
 int  __init  init_smfs_proc_sys(void)
 {
 #ifdef CONFIG_PROC_FS
-        proc_smfs_root = proc_mkdir("smfs", proc_root_fs);
-        if (!proc_smfs_root) {
-                printk(KERN_ERR "SMFS: error registering /proc/fs/smfs\n");
-                RETURN(-ENOMEM);
-        }
-        proc_smfs_root->owner = THIS_MODULE;
+	proc_smfs_root = proc_mkdir("smfs", proc_root_fs);
+	if (!proc_smfs_root) {
+		printk(KERN_ERR "SMFS: error registering /proc/fs/smfs\n");
+		RETURN(-ENOMEM);
+	}
+	proc_smfs_root->owner = THIS_MODULE;
 #endif
 
 #ifdef CONFIG_SYSCTL
-        if ( !smfs_table_header )
-                smfs_table_header =
-                        register_sysctl_table(smfs_table, 0);
+	if ( !smfs_table_header )
+		smfs_table_header =
+			register_sysctl_table(smfs_table, 0);
 #endif
-        return 0;
+	return 0;
 }
 
-void cleanup_smfs_proc_sys(void)
+void cleanup_smfs_proc_sys(void) 
 {
 #ifdef CONFIG_SYSCTL
-        if ( smfs_table_header )
-                unregister_sysctl_table(smfs_table_header);
-        smfs_table_header = NULL;
+	if ( smfs_table_header )
+		unregister_sysctl_table(smfs_table_header);
+	smfs_table_header = NULL;
 #endif
 #if CONFIG_PROC_FS
-        remove_proc_entry("smfs", proc_root_fs);
+	remove_proc_entry("smfs", proc_root_fs);
 #endif
 }
+
diff --git a/lustre/snapfs/.cvsignore b/lustre/snapfs/.cvsignore
index e31a39b..49c6100 100644
--- a/lustre/snapfs/.cvsignore
+++ b/lustre/snapfs/.cvsignore
@@ -3,12 +3,7 @@ config.log
 config.status
 configure
 Makefile
+Makefile.in
 .deps
 TAGS
 .*.cmd
-autoMakefile.in
-autoMakefile
-*.ko
-*.mod.c
-.*.flags
-.tmp_versions
diff --git a/lustre/snapfs/Makefile.am b/lustre/snapfs/Makefile.am
new file mode 100644
index 0000000..63a57a0
--- /dev/null
+++ b/lustre/snapfs/Makefile.am
@@ -0,0 +1,19 @@
+# Copyright (C) 2001  Cluster File Systems, Inc.
+#
+# This code is issued under the GNU General Public License.
+# See the file COPYING in this distribution
+
+
+DEFS= 
+SUBDIRS = . utils
+
+MODULE = snapfs
+modulefs_DATA = snapfs.o
+EXTRA_PROGRAMS = snapfs
+
+snapfs_SOURCES = cache.c  clonefs.c  dcache.c  dir.c  dotsnap.c  file.c 
+snapfs_SOURCES += filter.c  inode.c  journal_ext3.c  psdev.c 
+snapfs_SOURCES += snap.c  snaptable.c  super.c  symlink.c  sysctl.c options.c
+
+
+include $(top_srcdir)/Rules
diff --git a/lustre/snapfs/Makefile.in b/lustre/snapfs/Makefile.in
deleted file mode 100644
index fc24270..0000000
--- a/lustre/snapfs/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-MODULES := snapfs
-snapfs-objs := cache.o clonefs.o dcache.o dir.o dotsnap.o file.o
-snapfs-objs += filter.o inode.o journal_ext3.o psdev.o
-snapfs-objs += snap.o snaptable.o super.o symlink.o sysctl.o options.o
-
-@INCLUDE_RULES@
diff --git a/lustre/snapfs/autoMakefile.am b/lustre/snapfs/autoMakefile.am
deleted file mode 100644
index e5a57a9..0000000
--- a/lustre/snapfs/autoMakefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (C) 2001  Cluster File Systems, Inc.
-#
-# This code is issued under the GNU General Public License.
-# See the file COPYING in this distribution
-
-SUBDIRS = . utils
-
-if SNAPFS
-modulefs_DATA = snapfs$(KMODEXT)
-endif
-
-MOSTLYCLEANFILES = *.o *.ko *.mod.c
-DIST_SOURCES = $(snapfs-objs:%.o=%.c) snapfs_internal.h snapfs_support.h
-
diff --git a/lustre/snapfs/options.c b/lustre/snapfs/options.c
index b4c3a4d..fb951fa 100644
--- a/lustre/snapfs/options.c
+++ b/lustre/snapfs/options.c
@@ -17,8 +17,8 @@
 
 
 static struct list_head option_list;
-static char *options = NULL;
-static char *opt_left = NULL;
+char  *options = NULL;
+char  *opt_left = NULL;
 
 int init_option(char *data)
 {
@@ -32,7 +32,6 @@ int init_option(char *data)
 	opt_left = options;
 	return 0;
 }
-
 /*cleanup options*/
 void cleanup_option()
 {
@@ -46,7 +45,6 @@ void cleanup_option()
 	}
 	SNAP_FREE(options, strlen(options) + 1);
 }
-
 int get_opt(struct option **option, char **pos)
 {
 	char  *name, *value, *left;
diff --git a/lustre/snapfs/utils/Makefile.am b/lustre/snapfs/utils/Makefile.am
index 1487ee1..e6fcc25 100644
--- a/lustre/snapfs/utils/Makefile.am
+++ b/lustre/snapfs/utils/Makefile.am
@@ -1,8 +1,13 @@
 # Administration utilities Makefile
+#CPPFLAGS = $(HAVE_LIBREADLINE) -I$(top_srcdir)/utils -I$(top_srcdir)/portals/include  -I$(srcdir)/../ -Wall -L../../portals/utils
+#CFLAGS:= -g -O2 
+DEFS=
 
-if SNAPFS
+CFLAGS:=-g -O2 -I$(top_srcdir)/utils -I$(top_srcdir)/portals/include  -I$(srcdir)/../ -Wall -L../../portals/utils
+CPPFLAGS = $(HAVE_LIBREADLINE)
+KFLAGS:=
 noinst_PROGRAMS = snapconf
 snapconf_LDADD := $(LIBREADLINE)  -ltermcap
-endif
-
 snapconf_SOURCES = parser.c snapctl.c snapconf.c parser.h snapctl.h
+include $(top_srcdir)/Rules
+
diff --git a/lustre/snapfs/utils/parser.c b/lustre/snapfs/utils/parser.c
index da73223..a2bbe20 100644
--- a/lustre/snapfs/utils/parser.c
+++ b/lustre/snapfs/utils/parser.c
@@ -34,7 +34,7 @@
 
 /* completion_matches() is #if 0-ed out in modern glibc */
 #ifndef completion_matches
-#  define completion_matches rl_completion_matches
+#define completion_matches rl_completion_matches
 #endif
 extern void using_history(void);
 extern void stifle_history(int);
@@ -248,19 +248,18 @@ static char * command_generator(const char * text, int state)
 /* probably called by readline */
 static char **command_completion(char * text, int start, int end)
 {
-        command_t   * table;
+        command_t         * table;
         char        * pos;
 
         match_tbl = top_level;
-
         for (table = find_cmd(rl_line_buffer, match_tbl, &pos);
-             table; table = find_cmd(pos, match_tbl, &pos)) 
-        {
+             table;
+             table = find_cmd(pos, match_tbl, &pos)) {
 
                 if (*(pos - 1) == ' ') match_tbl = table->pc_sub_cmd;
         }
 
-        return completion_matches(text, command_generator);
+        return(completion_matches(text, command_generator));
 }
 #endif
 
diff --git a/lustre/tests/.RC_CURRENT.tag b/lustre/tests/.RC_CURRENT.tag
index 1b1bf07..b82289c 100644
--- a/lustre/tests/.RC_CURRENT.tag
+++ b/lustre/tests/.RC_CURRENT.tag
@@ -1 +1 @@
-RC_1_3_0_30
+RC_1_3_0_7
diff --git a/lustre/tests/.cvsignore b/lustre/tests/.cvsignore
index 0b00c70..932a2a0 100644
--- a/lustre/tests/.cvsignore
+++ b/lustre/tests/.cvsignore
@@ -60,7 +60,3 @@ iopentest2
 XMLCONFIG
 *.log
 logs
-ostactive
-ll_dirstripe_verify
-openfilleddirunlink
-copy_attr
diff --git a/lustre/tests/Makefile.am b/lustre/tests/Makefile.am
index 1430099..34adfb9 100644
--- a/lustre/tests/Makefile.am
+++ b/lustre/tests/Makefile.am
@@ -1,11 +1,11 @@
 # Lustre test Makefile
-AM_CPPFLAGS = $(LLCPPFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-AM_CFLAGS = $(LLCFLAGS)
+DEFS=
+CPPFLAGS = -I. -I$(top_srcdir)/portals/include/ -I$(top_srcdir)/include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+CFLAGS := -g -Wall
 # LDADD = -lldap
 # LDADD := -lreadline -ltermcap # -lefence
 EXTRA_DIST = $(pkgexample_SCRIPTS) $(noinst_SCRIPTS) $(noinst_DATA) \
 	sanity.sh rundbench
-if TESTS
 pkgexample_SCRIPTS = llmount.sh llmountcleanup.sh llecho.sh llechocleanup.sh
 pkgexample_SCRIPTS += local.sh echo.sh uml.sh lov.sh
 noinst_DATA =
@@ -15,15 +15,13 @@ noinst_SCRIPTS += runfailure-ost runiozone runregression-net.sh runtests
 noinst_SCRIPTS += sanity.sh rundbench
 noinst_PROGRAMS = openunlink testreq truncate directio openme writeme open_delay
 noinst_PROGRAMS += tchmod toexcl fsx test_brw openclose createdestroy
-noinst_PROGRAMS += stat createmany statmany multifstat createtest mlink utime
+noinst_PROGRAMS += stat createmany statmany multifstat createtest mlink utime cmknod
 noinst_PROGRAMS += opendirunlink opendevunlink unlinkmany fchdir_test checkstat
 noinst_PROGRAMS += wantedi statone runas openfile getdents mkdirdeep o_directory
-noinst_PROGRAMS += small_write multiop sleeptest ll_sparseness_verify cmknod
-noinst_PROGRAMS += ll_sparseness_write mrename ll_dirstripe_verify copy_attr
-noinst_PROGRAMS += openfilleddirunlink
+noinst_PROGRAMS += small_write multiop sleeptest ll_sparseness_verify
+noinst_PROGRAMS += ll_sparseness_write mrename
 # noinst_PROGRAMS += ldaptest
 bin_PROGRAMS = mcreate munlink mkdirmany iopentest1 iopentest2
-endif # TESTS
 
 # ldaptest_SOURCES = ldaptest.c
 tchmod_SOURCES = tchmod.c
@@ -57,7 +55,6 @@ wantedi_SOURCES = wantedi.c
 createtest_SOURCES = createtest.c
 open_delay_SOURCES = open_delay.c
 opendirunlink_SOURCES = opendirunlink.c
-openfilleddirunlink_SOURCES = openfilleddirunlink.c
 opendevunlink_SOURCES = opendevunlink.c
 fchdir_test_SOURCES = fchdir_test.c
 getdents_SOURCES=getdents.c
@@ -65,19 +62,17 @@ o_directory_SOURCES = o_directory.c
 utime_SOURCES = utime.c
 cmknod_SOURCES = cmknod.c
 mkdirdeep_SOURCES = mkdirdeep.c
-mkdirdeep_LDADD=-L$(top_builddir)/portals/utils -lptlctl $(LIBREADLINE)
+mkdirdeep_LDADD=-L$(top_builddir)/portals/utils -lptlctl
+mkdirdeep_CPPFLAGS=-I$(top_srcdir)/portals/include
 small_write_SOURCES = small_write.c
 sleeptest_SOURCES = sleeptest.c
 #write_append_truncate_SOURCES=write_append_truncate.c
 #write_append_truncate_CC=mpicc
 #createmany_mpi_SOURCES=createmany_mpi.c
 #createmany_mpi_CC=mpicc
-#parallel_grouplock_SOURCES=parallel_grouplock.c lp_utils.c
-#parallel_grouplock_CC=mpicc
-copy_attr_SOURCES= copy_attr.c
-copy_attr_LDADD= -lattr
 
 #sanity test 
 ll_sparseness_verify_SOURCES = ll_sparseness_verify.c
 ll_sparseness_write_SOURCES = ll_sparseness_write.c
-ll_dirstripe_verify_SOURCE = ll_dirstripe_verify.c
+
+include $(top_srcdir)/Rules
diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index 1387cf3..abe38c8 100755
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -40,7 +40,7 @@ for NAME in $CONFIGS; do
 
 	if [ "$DBENCH" != "no" ]; then
 		mount | grep $MOUNT || sh llmount.sh
-		SPACE=`df $MOUNT | tail -n 1 | awk '{ print $4 }'`
+		SPACE=`df $MOUNT | tail -1 | awk '{ print $4 }'`
 		DB_THREADS=`expr $SPACE / 50000`
 		[ $THREADS -lt $DB_THREADS ] && DB_THREADS=$THREADS
 
@@ -82,7 +82,7 @@ for NAME in $CONFIGS; do
 	fi
 	if [ "$IOZONE_DIR" != "no" ]; then
 		mount | grep $MOUNT || sh llmount.sh
-		SPACE=`df $MOUNT | tail -n 1 | awk '{ print $4 }'`
+		SPACE=`df $MOUNT | tail -1 | awk '{ print $4 }'`
 		IOZ_THREADS=`expr $SPACE / \( $SIZE + $SIZE / 512 \)`
 		[ $THREADS -lt $IOZ_THREADS ] && IOZ_THREADS=$THREADS
 
@@ -164,7 +164,3 @@ fi
 if [ "$REPLAY_OST_SINGLE" != "no" ]; then
         sh replay-ost-single.sh
 fi
-
-if [ "$INSANITY" != "no" ]; then
-        sh insanity.sh -r
-fi
diff --git a/lustre/tests/ba-echo.sh b/lustre/tests/ba-echo.sh
new file mode 100644
index 0000000..b28c5f4
--- /dev/null
+++ b/lustre/tests/ba-echo.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+config=${1:-ba-echo.xml}
+
+LMC_REAL="${LMC:-../utils/lmc} -m $config"
+LMC="save_cmd"
+
+TCPBUF=1048576
+OST=${OST:-ba-ost-1}
+CLIENT=${CLIENT:-`hostname`}
+
+UUIDLIST=${UUIDLIST:-/usr/local/admin/ba-ost/UUID.txt}
+
+h2tcp () {
+    echo "${1}"
+}
+BATCH=/tmp/lmc-batch.$$
+save_cmd() {
+    echo "$@" >> $BATCH
+}
+
+[ -f $config ] && rm $config
+
+# Client node
+${LMC} --add net --node $CLIENT --tcpbuf $TCPBUF --nid '*' --nettype tcp
+
+OST_UUID=`awk "/$OST / { print \\$3 }" $UUIDLIST`
+[ "$OST_UUID" ] && OST_UUID="--ostuuid=$OST_UUID" || echo "$OST: no UUID"
+
+# server node
+${LMC} --add net --node $OST --tcpbuf $TCPBUF --nid $OST --nettype tcp
+${LMC} --add ost --node $OST --ost ost1 --osdtype=obdecho $OST_UUID 
+
+# osc on client
+${LMC} --add echo_client --node $CLIENT --ost ost1
+
+$LMC_REAL --batch $BATCH
+rm -f $BATCH
diff --git a/lustre/tests/ba-mount.sh b/lustre/tests/ba-mount.sh
new file mode 100644
index 0000000..ac05660
--- /dev/null
+++ b/lustre/tests/ba-mount.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+# There are configurations for three machines in this config file: the OST,
+# the MDS/client, other clients
+#
+# To start your cluster using the ba-mount.xml file that this produces, first
+# run:
+# > lconf ba-mount.xml
+# on the MDS/client, and then run:
+# > lconf --node client ba-mount.xml
+# on any other clients.
+
+config=${1:-ba-mount.xml}
+
+LMC_REAL="${LMC:-../utils/lmc} -m $config"
+LMC="save_cmd"
+
+TCPBUF=1048576
+OST=${OST:-ba-ost-1}
+MDS=`hostname`
+ 
+UUIDLIST=${UUIDLIST:-/usr/local/admin/ba-ost/UUID.txt}
+
+h2tcp () {
+    echo "${1}"
+}
+BATCH=/tmp/lmc-batch.$$
+save_cmd() {
+    echo "$@" >> $BATCH
+}
+
+[ -f $config ] && rm $config
+
+# MDS/client node
+${LMC} --add net --node $MDS --tcpbuf $TCPBUF --nid $MDS --nettype tcp
+${LMC} --add mds --node $MDS --mds mds1 --dev /tmp/mds1 --size 50000
+
+OST_UUID=`awk "/$OST / { print \\$3 }" $UUIDLIST`
+[ "$OST_UUID" ] && OST_UUID="--ostuuid $OST_UUID" || echo "$OST: no UUID"
+
+# server node
+${LMC} --add net --node $OST --tcpbuf $TCPBUF --nid $OST --nettype tcp
+${LMC} --add ost --node $OST --ost ost1 $OST_UUID --dev bluearc
+
+# mount point on the MDS/client
+${LMC} --add mtpt --node $MDS --path /mnt/lustre --mds mds1 --lov ost1
+
+# other clients
+${LMC} --add net --node client --tcpbuf $TCPBUF --nid '*' --nettype tcp
+${LMC} --add mtpt --node client --path /mnt/lustre --mds mds1 --lov ost1
+
+$LMC_REAL --batch $BATCH
+rm -f $BATCH
diff --git a/lustre/tests/cfg/insanity-adev.sh b/lustre/tests/cfg/insanity-adev.sh
index 8da018d..b7cf033 100644
--- a/lustre/tests/cfg/insanity-adev.sh
+++ b/lustre/tests/cfg/insanity-adev.sh
@@ -22,7 +22,7 @@ MDSDEV=${MDSDEV:-/dev/sdc}
 MDSSIZE=${MDSSIZE:-50000}
 MDSJOURNALSIZE=${MDSJOURNALSIZE:-0}
 
-OSTDEV=${OSTDEV:-$TMP/ost%d-`hostname`}
+OSTDEV=${OSTDEV:-/tmp/ost-`hostname`}
 OSTSIZE=${OSTSIZE:=50000}
 OSTJOURNALSIZE=${OSTJOURNALSIZE:-0}
 
diff --git a/lustre/tests/cfg/insanity-local.sh b/lustre/tests/cfg/insanity-local.sh
index 1e0c6e9..56a8779 100644
--- a/lustre/tests/cfg/insanity-local.sh
+++ b/lustre/tests/cfg/insanity-local.sh
@@ -10,22 +10,22 @@ FAIL_CLIENTS=${FAIL_CLIENTS:-""}
 
 NETTYPE=${NETTYPE:-tcp}
 TIMEOUT=${TIMEOUT:-30}
-PTLDEBUG=${PTLDEBUG:-0x3f0400}
-SUBSYSTEM=${SUBSYSTEM:- 0xffb7e3ff}
+PTLDEBUG=${PTLDEBUG:-0}
+SUBSYSTEM=${SUBSYSTEM:-0}
 MOUNT=${MOUNT:-"/mnt/lustre"}
 #CLIENT_UPCALL=${CLIENT_UPCALL:-`pwd`/client-upcall-mdev.sh}
 UPCALL=${CLIENT_UPCALL:-`pwd`/replay-single-upcall.sh}
 
-MDSDEV=${MDSDEV:-$TMP/mds1-`hostname`}
+MDSDEV=${MDSDEV:-$ROOT/tmp/mds1-`hostname`}
 MDSSIZE=${MDSSIZE:-10000} #50000000
 MDSJOURNALSIZE=${MDSJOURNALSIZE:-0}
 
-OSTDEV=${OSTDEV:-"$TMP/ost%d-`hostname`"}
+OSTDEV=${OSTDEV:-"$ROOT/tmp/ost%d-`hostname`"}
 OSTSIZE=${OSTSIZE:=10000} #50000000
 OSTJOURNALSIZE=${OSTJOURNALSIZE:-0}
 
 FSTYPE=${FSTYPE:-ext3}
-STRIPE_BYTES=${STRIPE_BYTES:-524288} #1048576
+STRIPE_BYTES=${STRIPE_BYTES:-65536} #1048576
 STRIPES_PER_OBJ=${STRIPES_PER_OBJ:-0}
 
 FAILURE_MODE=${FAILURE_MODE:-SOFT} # or HARD
diff --git a/lustre/tests/cfg/insanity-mdev.sh b/lustre/tests/cfg/insanity-mdev.sh
index d3f0c6e..ff34d6d 100644
--- a/lustre/tests/cfg/insanity-mdev.sh
+++ b/lustre/tests/cfg/insanity-mdev.sh
@@ -20,7 +20,7 @@ UPCALL=${CLIENT_UPCALL:-`pwd`/replay-single-upcall.sh}
 MDSDEV=${MDSDEV:-/dev/sda1}
 MDSSIZE=${MDSSIZE:-50000}
 
-OSTDEV=${OSTDEV:-$TMP/ost%d-`hostname`}
+OSTDEV=${OSTDEV:-/tmp/ost-`hostname`}
 OSTSIZE=${OSTSIZE:=50000}
 FSTYPE=${FSTYPE:-ext3}
 STRIPE_BYTES=${STRIPE_BYTES:-1048576} 
diff --git a/lustre/tests/cfg/lmv.sh b/lustre/tests/cfg/lmv.sh
new file mode 100644
index 0000000..0ad7ed7
--- /dev/null
+++ b/lustre/tests/cfg/lmv.sh
@@ -0,0 +1,38 @@
+# oldstyle
+MDSNODE=${MDSNODE:-`hostname`}
+OSTNODE=${OSTNODE:-`hostname`}
+CLIENT=${CLIENT:-client}
+
+mds1_HOST=${mds_HOST:-$MDSNODE}
+mds2_HOST=$mds1_HOST
+mds3_HOST=$mds1_HOST
+ost_HOST=${ost_HOST:-$OSTNODE}
+ost2_HOST=${ost2_HOST:-$ost_HOST}
+client_HOST=${client_HOST:-$CLIENT}
+NETTYPE=${NETTYPE:-tcp}
+
+MOUNT=${MOUNT:-"/mnt/lustre"}
+MOUNT1=${MOUNT1:-$MOUNT}
+MOUNT2=${MOUNT2:-${MOUNT}2}
+DIR=${DIR:-$MOUNT}
+DIR2=${DIR2:-$MOUNT1}
+PTLDEBUG=${PTLDEBUG:-0x3f0400}
+SUBSYSTEM=${SUBSYSTEM:- 0xffb7e3ff}
+PDSH=${PDSH:-no_dsh}
+
+MDSCOUNT=3
+
+MDSDEV=${MDSDEV:-$ROOT/tmp/mds1-`hostname`}
+MDSSIZE=${MDSSIZE:-10000}
+OSTDEV=${OSTDEV:-$ROOT/tmp/ost1-`hostname`}
+OSTSIZE=${OSTSIZE:-50000}
+FSTYPE=${FSTYPE:-ext3}
+TIMEOUT=${TIMEOUT:-10}
+UPCALL=${UPCALL:-$PWD/replay-single-upcall.sh}
+
+STRIPE_BYTES=${STRIPE_BYTES:-65536}
+STRIPES_PER_OBJ=${STRIPES_PER_OBJ:-0}
+
+FAILURE_MODE=${FAILURE_MODE:-SOFT} # or HARD
+POWER_DOWN=${POWER_DOWN:-"powerman --off"}
+POWER_UP=${POWER_UP:-"powerman --on"}
diff --git a/lustre/tests/cfg/local.sh b/lustre/tests/cfg/local.sh
index 38effed..9398d07 100644
--- a/lustre/tests/cfg/local.sh
+++ b/lustre/tests/cfg/local.sh
@@ -27,7 +27,7 @@ FSTYPE=${FSTYPE:-ext3}
 TIMEOUT=${TIMEOUT:-10}
 UPCALL=${UPCALL:-$PWD/replay-single-upcall.sh}
 
-STRIPE_BYTES=${STRIPE_BYTES:-524288}
+STRIPE_BYTES=${STRIPE_BYTES:-65536}
 STRIPES_PER_OBJ=${STRIPES_PER_OBJ:-0}
 
 FAILURE_MODE=${FAILURE_MODE:-SOFT} # or HARD
diff --git a/lustre/tests/cfg/mdev.sh b/lustre/tests/cfg/mdev.sh
index c8a42e0..7d50f07 100644
--- a/lustre/tests/cfg/mdev.sh
+++ b/lustre/tests/cfg/mdev.sh
@@ -23,7 +23,7 @@ FSTYPE=${FSTYPE:-ext3}
 TIMEOUT=${TIMEOUT:-10}
 UPCALL=${UPCALL:-$PWD/replay-single-upcall.sh}
 
-STRIPE_BYTES=${STRIPE_BYTES:-524288}
+STRIPE_BYTES=${STRIPE_BYTES:-65536}
 STRIPES_PER_OBJ=${STRIPES_PER_OBJ:-0}
 
 FAILURE_MODE=${FAILURE_MODE:-SOFT} # or HARD
diff --git a/lustre/tests/cmknod.c b/lustre/tests/cmknod.c
index 920ee5b..fa42e2b 100644
--- a/lustre/tests/cmknod.c
+++ b/lustre/tests/cmknod.c
@@ -7,7 +7,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
-
 #define TEST_MINOR 120
 #define TEST_MAJOR 25
 
@@ -17,48 +16,18 @@ void usage(char *prog)
 	exit(1);
 }
 
-/* UMKA: This stuff inlined here instead of using appropriate header 
-   to avoid linking to symbols which is not present in newer libc.
-   
-   Currently this is the case, as UML image contains RedHat 9 and 
-   developers use something newer (Fedora, etc.). */
-inline unsigned int
-__gnu_dev_major (unsigned long long int __dev)
-{
-	return ((__dev >> 8) & 0xfff) | ((unsigned int) (__dev >> 32) & ~0xfff);
-}
-
-inline unsigned int
-__gnu_dev_minor (unsigned long long int __dev)
-{
-	return (__dev & 0xff) | ((unsigned int) (__dev >> 12) & ~0xff);
-}
-
-inline unsigned long long int
-__gnu_dev_makedev (unsigned int __major, unsigned int __minor)
-{
-	return ((__minor & 0xff) | ((__major & 0xfff) << 8)
-		| (((unsigned long long int) (__minor & ~0xff)) << 12)
-		| (((unsigned long long int) (__major & ~0xfff)) << 32));
-}
-
-#define __minor(dev) __gnu_dev_minor(dev)
-#define __major(dev) __gnu_dev_major(dev)
-#define __makedev(maj, min) __gnu_dev_makedev(maj, min)
-
 int main( int argc, char **argv)
 {
 	char *prog = argv[0];
 	char *filename = argv[1];
 	int rc;
 	struct stat st;
-	dev_t device = __makedev(TEST_MAJOR, TEST_MINOR);
+	dev_t device = makedev(TEST_MAJOR, TEST_MINOR);
 
 	if (argc != 2) 
 		usage(prog);
 
 	unlink(filename);
-	
 	/* First try block devices */
 	rc = mknod(filename, 0700 | S_IFBLK, device);
 	if ( rc < 0 ) {
@@ -73,13 +42,11 @@ int main( int argc, char **argv)
 			prog, filename, errno, strerror(errno));
 		return 3;
 	}
-	
 	if ( st.st_rdev != device) {
-		fprintf(stderr, "%s: created device other than requested: (%u,%u) instead of (%u,%u)\n", 
-			prog, __major(st.st_rdev),__minor(st.st_rdev),__major(device),__minor(device));
+		fprintf(stderr, "%s: created device other than requested: (%d,%d) instead of (%d,%d)\n", prog, major(st.st_rdev),minor(st.st_rdev),major(device),minor(device));
 		return 4;
 	}
-	if (!S_ISBLK(st.st_mode)) {
+	if ( ! (st.st_mode | S_IFBLK) ) {
 		fprintf(stderr, "%s: created device of different type. Requested block device, got mode %o\n", prog, st.st_mode);
 		return 5;
 	}
@@ -106,11 +73,10 @@ int main( int argc, char **argv)
 		return 8;
 	}
 	if ( st.st_rdev != device) {
-		fprintf(stderr, "%s: created device other than requested: (%u,%u) instead of (%u,%u)\n", 
-			prog, __major(st.st_rdev),__minor(st.st_rdev),__major(device),__minor(device));
+		fprintf(stderr, "%s: created device other than requested: (%d,%d) instead of (%d,%d)\n", prog, major(st.st_rdev),minor(st.st_rdev),major(device),minor(device));
 		return 9;
 	}
-	if (!S_ISCHR(st.st_mode)) {
+	if ( ! (st.st_mode | S_IFCHR) ) {
 		fprintf(stderr, "%s: created device of different type. Requested char device, got mode %o\n", prog, st.st_mode);
 		return 10;
 	}
diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 4238ee7..f2483c3 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -482,10 +482,8 @@ test_13() {
         fi
         EXPECTEDMDS1UUID="e_longer_than_31characters_UUID"
         EXPECTEDMDS2UUID="longer_than_31characters_UUID_2"
-        FOUNDMDS1UUID=`awk -F"'" '/<mds .*uuid=/' $XMLCONFIG | sed -n '1p' \
-                       | sed "s/ /\n\r/g" | awk -F"'" '/uuid=/{print $2}'`
-        FOUNDMDS2UUID=`awk -F"'" '/<mds .*uuid=/' $XMLCONFIG | sed -n '2p' \
-                       | sed "s/ /\n\r/g" | awk -F"'" '/uuid=/{print $2}'`
+        FOUNDMDS1UUID=`awk -F"'" '/<mds uuid=/{print $2}' $XMLCONFIG | sed -n '1p'`
+        FOUNDMDS2UUID=`awk -F"'" '/<mds uuid=/{print $2}' $XMLCONFIG | sed -n '2p'`
         if [ $EXPECTEDMDS1UUID != $FOUNDMDS1UUID ]; then
                 echo "Error:expected uuid for mds1: $EXPECTEDMDS1UUID; found: $FOUNDMDS1UUID"
                 return 1
@@ -672,34 +670,5 @@ test_17() {
 }
 run_test 17 "Verify failed mds_postsetup won't fail assertion (2936)"
 
-test_18() {
-        [ -f $MDSDEV ] && echo "remove $MDSDEV" && rm -f $MDSDEV
-        echo "mount mds with large journal..."
-        OLDMDSSIZE=$MDSSIZE
-        MDSSIZE=2000000
-        gen_config
-                                                                                                                             
-        echo "mount lustre system..."
-        start_ost
-        start_mds
-        mount_client $MOUNT
-        check_mount || return 41
-                                                                                                                             
-        echo "check journal size..."
-        FOUNDJOURNALSIZE=`debugfs -R "stat <8>" $MDSDEV | awk '/Size: / { print $6; exit;}'`
-        if [ $FOUNDJOURNALSIZE = "79691776" ]; then
-                echo "Success:lconf creates large journals"
-        else
-                echo "Error:lconf not create large journals correctly"
-                echo "expected journal size: 79691776(76M), found journal size: $FOUNDJOURNALSIZE"
-                return 1
-        fi
-                                                                                                                             
-        cleanup || return $?
-                                                                                                                             
-        MDSSIZE=$OLDMDSSIZE
-        gen_config
-}
-run_test 18 "check lconf creates large journals"
 
 equals_msg "Done"
diff --git a/lustre/tests/copy_attr.c b/lustre/tests/copy_attr.c
deleted file mode 100644
index bee26f6..0000000
--- a/lustre/tests/copy_attr.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- */
-#include <stdio.h>
-#include <liblustre.h>
-#include <linux/lustre_lib.h>
-#include <linux/lustre_idl.h>
-#include <linux/lustre_mds.h>
-#include <sys/types.h>
-#include <attr/xattr.h>
-
-#define XATTR_LUSTRE_MDS_OBJID          "trusted.lov"
-
-int
-main(int argc, char *argv[])
-{
-        struct lov_user_md *lmm1,*lmm2;
-        int size;
-        struct stat statbuf;
-
-        if (argc != 3) {
-                fprintf(stderr,"usage: copy_attr file1 file2 \n");
-                exit(1);
-        }
-
-        size = getxattr(argv[1], XATTR_LUSTRE_MDS_OBJID, NULL, 0);
-        if (size < 0) {
-                perror("getting attr size");
-                exit(1);
-        }
-        lmm1 = malloc(size);
-        lmm2 = malloc(size);
-        if (lmm1 == NULL || lmm2 == NULL) {
-                fprintf(stderr,"Failure to get memory \n");
-                exit(1);
-        }
-
-        if (getxattr(argv[1], XATTR_LUSTRE_MDS_OBJID, lmm1, size) < 0) {
-                perror("getting xattr :");
-                exit(1);
-        }
-
-        if (stat(argv[2], &statbuf)) {
-                perror("stat");
-                exit(1);
-        }
-
-        memcpy(lmm2, lmm1, size);
-        lmm2->lmm_object_id = statbuf.st_ino;
-        if (setxattr(argv[2], XATTR_LUSTRE_MDS_OBJID, lmm2, size, 0) < 0) {
-                perror("setxattr");
-                exit(1);
-        }
-
-        exit(0);
-}
diff --git a/lustre/tests/createdestroy.c b/lustre/tests/createdestroy.c
index cec369b..f1e7f4b 100644
--- a/lustre/tests/createdestroy.c
+++ b/lustre/tests/createdestroy.c
@@ -1,6 +1,3 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- */
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -98,44 +95,44 @@ static int get_verbose(char *func, const char *arg)
 int main(int argc, char *argv[])
 {
         char filename[1024];
-        int verbose = 0;
+	int verbose = 0;
         unsigned long count, i;
-        int threads = 0;
-        char *end;
-        int rc = 0;
+	int threads = 0;
+	char *end;
+	int rc;
 
         if (argc < 3 || argc > 5) {
                 fprintf(stderr,
-                        "usage: %s <filename> <count> [verbose [threads]]\n",
-                        argv[0]);
+			"usage: %s <filename> <count> [verbose [threads]]\n",
+			argv[0]);
                 exit(1);
         }
 
         count = strtoul(argv[2], &end, 0);
-        if (*end) {
+	if (*end) {
                 fprintf(stderr, "%s: error: bad iteration count '%s'\n",
                         argv[0], argv[1]);
-                exit(2);
-        }
-        if (argc == 4) {
-                verbose = get_verbose(argv[0], argv[3]);
-                if (verbose == BAD_VERBOSE)
-                        exit(2);
-        }
-        if (argc == 5) {
-                threads = strtoul(argv[4], &end, 0);
-                if (*end) {
-                        fprintf(stderr, "%s: error: bad thread count '%s'\n",
-                                argv[0], argv[1]);
-                        exit(2);
-                }
-        }
+		exit(2);
+	}
+	if (argc == 4) {
+		verbose = get_verbose(argv[0], argv[3]);
+		if (verbose == BAD_VERBOSE)
+			exit(2);
+	}
+	if (argc == 5) {
+		threads = strtoul(argv[4], &end, 0);
+		if (*end) {
+			fprintf(stderr, "%s: error: bad thread count '%s'\n",
+				argv[0], argv[1]);
+			exit(2);
+		}
+	}
 
         for (i = 1; i <= threads; i++) {
                 rc = fork();
                 if (rc < 0) {
                         fprintf(stderr, "%s: error: #%ld - %s\n",
-                                cmdname(argv[0]), i, strerror(rc = errno));
+				cmdname(argv[0]), i, strerror(rc = errno));
                         break;
                 } else if (rc == 0) {
                         thread = i;
@@ -146,7 +143,7 @@ int main(int argc, char *argv[])
                 rc = 0;
         }
 
-        if (threads && thread == 0) {   /* parent process */
+        if (threads && thread == 0) {	/* parent process */
                 int live_threads = threads;
 
                 while (live_threads > 0) {
@@ -181,47 +178,47 @@ int main(int argc, char *argv[])
                                 live_threads--;
                         }
                 }
-        } else {
+	} else {
                 struct timeval start, end, next_time;
-                unsigned long next_count;
-                double diff;
-
-                gettimeofday(&start, NULL);
-                next_time.tv_sec = start.tv_sec - verbose;
-                next_time.tv_usec = start.tv_usec;
-
-                for (i = 0, next_count = verbose; i < count; i++) {
-                        if (threads)
-                                sprintf(filename, "%s-%d-%ld",
-                                        argv[1], thread, i);
-                        else
-                                sprintf(filename, "%s-%ld", argv[1], i);
-
-                        rc = mknod(filename, S_IFREG, 0);
-                        if (rc < 0) {
-                                fprintf(stderr, "%s: error: mknod(%s): %s\n",
-                                        cmdname(argv[0]), filename,
-                                        strerror(errno));
-                                rc = errno;
-                                break;
-                        }
-                        if (unlink(filename) < 0) {
-                                fprintf(stderr, "%s: error: unlink(%s): %s\n",
-                                        cmdname(argv[0]), filename,
-                                        strerror(errno));
-                                rc = errno;
-                                break;
-                        }
-                        if (be_verbose(verbose, &next_time,i,&next_count,count))
-                                printf("%s: number %ld\n", cmdname(argv[0]), i);
-                }
-
-                gettimeofday(&end, NULL);
+		unsigned long next_count;
+		double diff;
+
+		gettimeofday(&start, NULL);
+		next_time.tv_sec = start.tv_sec - verbose;
+		next_time.tv_usec = start.tv_usec;
+
+		for (i = 0, next_count = verbose; i < count; i++) {
+			if (threads)
+				sprintf(filename, "%s-%d-%ld",
+					argv[1], thread, i);
+			else
+				sprintf(filename, "%s-%ld", argv[1], i);
+
+			rc = mknod(filename, S_IFREG, 0);
+			if (rc < 0) {
+				fprintf(stderr, "%s: error: mknod(%s): %s\n",
+					cmdname(argv[0]), filename,
+					strerror(errno));
+				rc = errno;
+				break;
+			}
+			if (unlink(filename) < 0) {
+				fprintf(stderr, "%s: error: unlink(%s): %s\n",
+					cmdname(argv[0]), filename,
+					strerror(errno));
+				rc = errno;
+				break;
+			}
+			if (be_verbose(verbose, &next_time,i,&next_count,count))
+				printf("%s: number %ld\n", cmdname(argv[0]), i);
+		}
+
+		gettimeofday(&end, NULL);
                 diff = difftime(&end, &start);
 
-                printf("%s: %ldx2 files in %.4gs (%.4g ops/s): rc = %d: %s",
-                       cmdname(argv[0]), i, diff, (double)i * 2 / diff,
-                       rc, ctime(&end.tv_sec));
-        }
+		printf("%s: %ldx2 files in %.4gs (%.4g ops/s): rc = %d: %s",
+		       cmdname(argv[0]), i, diff, (double)i * 2 / diff,
+		       rc, ctime(&end.tv_sec));
+	}
         return rc;
 }
diff --git a/lustre/tests/createmany.c b/lustre/tests/createmany.c
index 1d62b20..f426488 100644
--- a/lustre/tests/createmany.c
+++ b/lustre/tests/createmany.c
@@ -22,7 +22,7 @@ void usage(char *prog)
 int main(int argc, char ** argv)
 {
         int i, rc = 0, do_open = 0, do_link = 0;
-        char format[4096], *fmt, *tgt = NULL;
+        char format[4096], *fmt, *tgt;
         char filename[4096];
         long start, last, end;
         long begin = 0, count;
diff --git a/lustre/tests/directio.c b/lustre/tests/directio.c
index 7bcc5dc..51315bc 100644
--- a/lustre/tests/directio.c
+++ b/lustre/tests/directio.c
@@ -12,39 +12,6 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 
-int write_buffer(char *fname, char *buffer, int len)
-{
-        int fd, rc;
-
-        fd = open(fname, O_WRONLY | O_CREAT | O_TRUNC, 0644);
-        if (fd == -1) {
-                printf("Cannot open %s:  %s\n", fname, strerror(errno));
-                exit(1);
-        }
-        rc = write(fd, buffer, len);
-        if (rc != len) {
-                printf("write: %d\n", rc);
-                exit(1);
-        }
-        close(fd);
-        return 0;
-}
-
-void verify(char *buffer, char *compare, int length)
-{
-        int i;
-        for (i = 0; i < length; i++) {
-                if (buffer[i] != compare[i]) {
-                        fprintf(stderr, "garbage read (i=%d): expected %c, found %c\n",
-                               i, compare[i], buffer[i]);
-                        write_buffer("/tmp/dio1", buffer, length);
-                        write_buffer("/tmp/dio2", compare, length);
-                        exit(1);
-                }
-        }
-}
-
-
 int main(int argc, char **argv)
 {
         int fd;
@@ -76,16 +43,15 @@ int main(int argc, char **argv)
                 return 1;
         }
 
-        fprintf(stderr, "directio on %s for %dx%lu bytes \n", argv[1], blocks,
-                st.st_blksize);
+        printf("directio on %s for %dx%lu bytes \n", argv[1], blocks,
+               st.st_blksize);
 
         seek = (off64_t)seek_blocks * (off64_t)st.st_blksize;
-#if 0
         if (lseek64(fd, seek, SEEK_SET) < 0) {
                 printf("lseek64 failed: %s\n", strerror(errno));
                 return 1;
         }
-#endif
+
         len = blocks * st.st_blksize;
         wbuf = mmap(0, len, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, 0, 0);
         if (wbuf == MAP_FAILED) {
@@ -117,84 +83,8 @@ int main(int argc, char **argv)
                 return 1;
         }
 
-        verify(rbuf, wbuf, len);
-        if (memcmp(wbuf, rbuf, len)) {
-                printf("Data mismatch on line %d\n", __LINE__);
-                return 1;
-        }
-
-        /* try 512-byte buffers, and make sure that the other parts of the
-         * page aren't modified. */
-        if (st.st_blksize < 4096) {
-                printf("512-byte block size tests skipped (because blocksize "
-                       "passed is < 4k)\n");
-                printf("PASS\n");
-                return 0;
-        }
-
-
-
-        /* write test */
-        if (lseek64(fd, 512, SEEK_SET) < 0) {
-                printf("Cannot seek %s\n", strerror(errno));
-                return 1;
-        }
-
-        memset(wbuf, 0x44, len);
-        memset(wbuf + 2048, 0x69, 512);
-        rc = write(fd, wbuf + 2048, 512);
-        if (rc != 512) {
-                printf("Write error %s (rc = %d)\n", strerror(errno), rc);
-                return 1;
-        }
-
-        memset(rbuf, 0x44, len);
-        memset(rbuf + 2048, 0x69, 512);
-        if (memcmp(wbuf, rbuf, len)) {
-                printf("Data mismatch on line %d\n", __LINE__);
-                return 1;
-        }
-
-        /* read test */
-        if (lseek64(fd, 512, SEEK_SET) < 0) {
-                printf("Cannot seek %s\n", strerror(errno));
-                return 1;
-        }
-        memset(rbuf, 0xba, len);
-        rc = read(fd, rbuf + 1024, 512);
-        if (rc != 512) {
-                printf("Read error: %s (rc = %d)\n", strerror(errno), rc);
-                return 1;
-        }
-
-        memset(wbuf, 0xba, len);
-        memset(wbuf + 1024, 0x69, 512);
-
-        verify(rbuf, wbuf, len);
-#if 0
-        if (memcmp(wbuf, rbuf, len)) {
-                printf("Data mismatch on line %d\n", __LINE__);
-                return 1;
-        }
-#endif
-
-        /* read back the whole block, to see that it's untouched. */
-        if (lseek64(fd, seek, SEEK_SET) < 0) {
-                printf("Cannot seek %s\n", strerror(errno));
-                return 1;
-        }
-
-        memset(rbuf, 0x1, len);
-        rc = read(fd, rbuf, len);
-        if (rc != len) {
-                printf("Read error: %s (rc = %d)\n", strerror(errno), rc);
-                return 1;
-        }
-
-        memset(wbuf, 0xba, len);
-        memset(wbuf + 512, 0x69, 512);
         if (memcmp(wbuf, rbuf, len)) {
-                printf("Data mismatch on line %d\n", __LINE__);
+                printf("Data mismatch\n");
                 return 1;
         }
 
diff --git a/lustre/tests/echo.sh b/lustre/tests/echo.sh
index a45fd39..67dd27e 100755
--- a/lustre/tests/echo.sh
+++ b/lustre/tests/echo.sh
@@ -37,7 +37,7 @@ MDSDEV=${MDSDEV:-$TMP/mds1-`hostname`}
 MDSSIZE=10000
 FSTYPE=${FSTYPE:-ext3}
 
-STRIPE_BYTES=1048576
+STRIPE_BYTES=65536
 STRIPES_PER_OBJ=2	# 0 means stripe over all OSTs
 
 rm -f $config
diff --git a/lustre/tests/fsx.c b/lustre/tests/fsx.c
index ead1c85..8524c91 100644
--- a/lustre/tests/fsx.c
+++ b/lustre/tests/fsx.c
@@ -96,6 +96,7 @@ char	*temp_buf;			/* a pointer to the current data */
 char	*fname;				/* name of our test file */
 char	logfile[1024];			/* name of our log file */
 char	goodfile[1024];			/* name of our test file */
+int	fd;				/* fd for our test file */
 
 off_t		file_size = 0;
 off_t		biggest = 0;
@@ -154,20 +155,15 @@ warn(const char * fmt, ...)
 
 
 void
-__attribute__((format(printf, 1, 2)))
 prt(char *fmt, ...)
 {
 	va_list args;
 
 	va_start(args, fmt);
 	vfprintf(stdout, fmt, args);
-	va_end(args);
-
-	if (fsxlogf) {
-		va_start(args, fmt);
+	if (fsxlogf)
 		vfprintf(fsxlogf, fmt, args);
-		va_end(args);
-	}
+	va_end(args);
 }
 
 void
@@ -388,125 +384,12 @@ check_buffers(unsigned offset, unsigned size)
 	}
 }
 
-struct test_file {
-	char *path;
-	int fd;
-} *test_files = NULL;
-
-int num_test_files = 0;
-enum fd_iteration_policy {
-	FD_SINGLE,
-	FD_ROTATE,
-	FD_RANDOM,
-};
-int fd_policy = FD_RANDOM;
-int fd_last = 0;
-
-struct test_file * 
-get_tf(void)
-{
-	unsigned index = 0;
-
-	switch (fd_policy) {
-		case FD_ROTATE:
-			index = fd_last++;
-			break;
-		case FD_RANDOM:
-			index = random();
-			break;
-		case FD_SINGLE:
-			index = 0;
-			break;
-		default:
-			prt("unknown policy");
-			exit(1);
-			break;
-	}
-	return &test_files[ index % num_test_files ];
-}
-
-void
-assign_fd_policy(char *policy)
-{
-	if (!strcmp(policy, "random"))
-		fd_policy = FD_RANDOM;
-	else if (!strcmp(policy, "rotate"))
-		fd_policy = FD_ROTATE;
-	else {
-		prt("unknown -I policy: '%s'\n", policy);
-		exit(1);
-	}
-}
-
-int 
-get_fd(void)
-{
-	struct test_file *tf = get_tf();
-	return tf->fd;
-}
-
-static const char *basename(const char *path)
-{
-	char *c = strrchr(path, '/');
-
-	return c ? c++ : path;
-}
-
-void 
-open_test_files(char **argv, int argc)
-{
-	struct test_file *tf;
-	int i;
-
-	num_test_files = argc;
-	if (num_test_files == 1)
-		fd_policy = FD_SINGLE;
-
-	test_files = calloc(num_test_files, sizeof(*test_files));
-	if (test_files == NULL) {
-		prterr("reallocating space for test files");
-		exit(1);
-	}
-
-	for (i = 0, tf = test_files; i < num_test_files; i++, tf++) {
-
-		tf->path = argv[i];
-		tf->fd = open(tf->path, O_RDWR|(lite ? 0 : O_CREAT|O_TRUNC), 
-				0666);
-		if (tf->fd < 0) {
-			prterr(tf->path);
-			exit(91);
-		}
-	}
-
-	if (quiet || fd_policy == FD_SINGLE)
-		return;
-
-	for (i = 0, tf = test_files; i < num_test_files; i++, tf++)
-		prt("fd %d: %s\n", i, tf->path);
-}
-
-void
-close_test_files(void)
-{
-	int i;
-	struct test_file *tf;
-
-	for (i = 0, tf = test_files; i < num_test_files; i++, tf++) {
-		if (close(tf->fd)) {
-			prterr("close");
-			report_failure(99);
-		}
-	}
-}
-
 
 void
 check_size(void)
 {
 	struct stat	statbuf;
 	off_t	size_by_seek;
-	int fd = get_fd();
 
 	if (fstat(fd, &statbuf)) {
 		prterr("check_size: fstat");
@@ -527,7 +410,6 @@ void
 check_trunc_hack(void)
 {
 	struct stat statbuf;
-	int fd = get_fd();
 
 	ftruncate(fd, (off_t)0);
 	ftruncate(fd, (off_t)100000);
@@ -539,81 +421,6 @@ check_trunc_hack(void)
 	ftruncate(fd, 0);
 }
 
-static char *tf_buf = NULL;
-static int max_tf_len = 0;
-
-void
-alloc_tf_buf(void)
-{
-	char dummy = '\0';
-	int highest = num_test_files - 1;
-	int len;
-
-	len = snprintf(&dummy, 0, "%u ", highest);
-	if (len < 1) {
-		prterr("finding max tf_buf");
-		exit(1);
-	}
-	len++;
-	tf_buf = malloc(len);
-	if (tf_buf == NULL) {
-		prterr("allocating tf_buf");
-		exit(1);
-	}
-	max_tf_len = snprintf(tf_buf, len, "%u ", highest);
-	if (max_tf_len < 1) {
-		prterr("fiding max_tv_len\n");
-		exit(1);
-	}
-	if (max_tf_len != len - 1) {
-		warn("snprintf() gave %d instead of %d?\n",
-				max_tf_len, len - 1);
-		exit(1);
-	}
-}
-
-char * 
-fill_tf_buf(struct test_file *tf)
-{
-	if (tf_buf == NULL)
-		alloc_tf_buf();
-
-	sprintf(tf_buf,"%lu ", (unsigned long)(tf - test_files));
-	return tf_buf;
-}
-
-void
-output_line(struct test_file *tf, int op, unsigned offset, 
-		unsigned size, struct timeval *tv)
-{
-	char *tf_num = "";
-
-	char *ops[] = {
-		[OP_READ] = "read",
-		[OP_WRITE] = "write",
-		[OP_TRUNCATE] = "trunc from",
-		[OP_MAPREAD] = "mapread",
-		[OP_MAPWRITE] = "mapwrite",
-	};
-
-	if (fd_policy != FD_SINGLE)
-		tf_num = fill_tf_buf(tf);
-
-	/* W. */
-	if (!(!quiet && ((progressinterval &&
-			testcalls % progressinterval == 0) ||
-		       (debug &&
-		        (monitorstart == -1 ||
-			 (offset + size > monitorstart &&
-			  (monitorend == -1 || offset <= monitorend)))))))
-		return;
-
-	prt("%06lu %lu.%06lu %*s%-10s %#08x %s %#08x\t(0x%x bytes)\n",
-		testcalls, tv->tv_sec, tv->tv_usec, max_tf_len,
-		tf_num, ops[op], 
-		offset, op == OP_TRUNCATE ? " to " : "thru",
-		offset + size - 1, size);
-}
 
 void
 doread(unsigned offset, unsigned size)
@@ -621,8 +428,6 @@ doread(unsigned offset, unsigned size)
 	struct timeval t;
 	off_t ret;
 	unsigned iret;
-	struct test_file *tf = get_tf();
-	int fd = tf->fd;
 
 	offset -= offset % readbdy;
 	gettimeofday(&t, NULL);
@@ -644,8 +449,15 @@ doread(unsigned offset, unsigned size)
 	if (testcalls <= simulatedopcount)
 		return;
 
-	output_line(tf, OP_READ, offset, size, &t);
-
+	if (!quiet && ((progressinterval &&
+			testcalls % progressinterval == 0) ||
+		       (debug &&
+		        (monitorstart == -1 ||
+			 (offset + size > monitorstart &&
+			  (monitorend == -1 || offset <= monitorend))))))
+		prt("%06lu %lu.%06lu read       %#08x thru %#08x\t(0x%x bytes)\n",
+		    testcalls, t.tv_sec, t.tv_usec, offset, offset + size - 1,
+		    size);
 	ret = lseek(fd, (off_t)offset, SEEK_SET);
 	if (ret == (off_t)-1) {
 		prterr("doread: lseek");
@@ -678,8 +490,6 @@ domapread(unsigned offset, unsigned size)
 	unsigned pg_offset;
 	unsigned map_size;
 	char    *p;
-	struct test_file *tf = get_tf();
-	int fd = tf->fd;
 
 	offset -= offset % readbdy;
 	gettimeofday(&t, NULL);
@@ -701,7 +511,15 @@ domapread(unsigned offset, unsigned size)
 	if (testcalls <= simulatedopcount)
 		return;
 
-	output_line(tf, OP_MAPREAD, offset, size, &t);
+	if (!quiet && ((progressinterval &&
+			testcalls % progressinterval == 0) ||
+		       (debug &&
+		        (monitorstart == -1 ||
+			 (offset + size > monitorstart &&
+			  (monitorend == -1 || offset <= monitorend))))))
+		prt("%06lu %lu.%06lu mapread    %#08x thru %#08x\t(0x%x bytes)\n",
+		    testcalls, t.tv_sec, t.tv_usec, offset, offset + size - 1,
+		    size);
 
 	pg_offset = offset & page_mask;
 	map_size  = pg_offset + size;
@@ -760,8 +578,6 @@ dowrite(unsigned offset, unsigned size)
 	struct timeval t;
 	off_t ret;
 	unsigned iret;
-	struct test_file *tf = get_tf();
-	int fd = tf->fd;
 
 	offset -= offset % writebdy;
 	gettimeofday(&t, NULL);
@@ -788,8 +604,15 @@ dowrite(unsigned offset, unsigned size)
 	if (testcalls <= simulatedopcount)
 		return;
 
-	output_line(tf, OP_WRITE, offset, size, &t);
-
+	if (!quiet && ((progressinterval &&
+			testcalls % progressinterval == 0) ||
+		       (debug &&
+		        (monitorstart == -1 ||
+			 (offset + size > monitorstart &&
+			  (monitorend == -1 || offset <= monitorend))))))
+		prt("%06lu %lu.%06lu write      %#08x thru %#08x\t(0x%x bytes)\n",
+		    testcalls, t.tv_sec, t.tv_usec, offset, offset + size - 1,
+		    size);
 	ret = lseek(fd, (off_t)offset, SEEK_SET);
 	if (ret == (off_t)-1) {
 		prterr("dowrite: lseek");
@@ -822,8 +645,6 @@ domapwrite(unsigned offset, unsigned size)
 	unsigned map_size;
 	off_t    cur_filesize;
 	char    *p;
-	struct test_file *tf = get_tf();
-	int fd = tf->fd;
 
 	offset -= offset % writebdy;
 	gettimeofday(&t, NULL);
@@ -851,7 +672,15 @@ domapwrite(unsigned offset, unsigned size)
 	if (testcalls <= simulatedopcount)
 		return;
 
-	output_line(tf, OP_MAPWRITE, offset, size, &t);
+	if (!quiet && ((progressinterval &&
+			testcalls % progressinterval == 0) ||
+		       (debug &&
+		        (monitorstart == -1 ||
+			 (offset + size > monitorstart &&
+			  (monitorend == -1 || offset <= monitorend))))))
+		prt("%06lu %lu.%06lu mapwrite   %#08x thru %#08x\t(0x%x bytes)\n",
+		    testcalls, t.tv_sec, t.tv_usec, offset, offset + size - 1,
+		    size);
 
 	if (file_size > cur_filesize) {
 	        if (ftruncate(fd, file_size) == -1) {
@@ -919,8 +748,6 @@ dotruncate(unsigned size)
 {
 	struct timeval t;
 	int oldsize = file_size;
-	struct test_file *tf = get_tf();
-	int fd = tf->fd;
 
 	size -= size % truncbdy;
 	gettimeofday(&t, NULL);
@@ -939,8 +766,11 @@ dotruncate(unsigned size)
 	if (testcalls <= simulatedopcount)
 		return;
 
-	output_line(tf, OP_TRUNCATE, oldsize, size, &t);
-
+	if ((progressinterval && testcalls % progressinterval == 0) ||
+	    (debug && (monitorstart == -1 || monitorend == -1 ||
+		       size <= monitorend)))
+		prt("%06lu %lu.%06lu trunc from %#08x  to  %#08x\n",
+		    testcalls, t.tv_sec, t.tv_usec, oldsize, size);
 	if (ftruncate(fd, (off_t)size) == -1) {
 	        prt("ftruncate1: %x\n", size);
 		prterr("dotruncate: ftruncate");
@@ -957,7 +787,6 @@ void
 writefileimage()
 {
 	ssize_t iret;
-	int fd = get_fd();
 
 	if (lseek(fd, (off_t)0, SEEK_SET) == (off_t)-1) {
 		prterr("writefileimage: lseek");
@@ -968,9 +797,8 @@ writefileimage()
 		if (iret == -1)
 			prterr("writefileimage: write");
 		else
-			prt("short write: 0x%lx bytes instead of 0x%llx\n",
-			    (unsigned long)iret, 
-			    (unsigned long long)file_size);
+			prt("short write: 0x%x bytes instead of 0x%llx\n",
+			    iret, (unsigned long long)file_size);
 		report_failure(172);
 	}
 	if (lite ? 0 : ftruncate(fd, file_size) == -1) {
@@ -985,7 +813,6 @@ void
 docloseopen(void)
 {
 	struct timeval t;
-	struct test_file *tf = get_tf();
 
 	if (testcalls <= simulatedopcount)
 		return;
@@ -996,7 +823,7 @@ docloseopen(void)
 	if (debug)
 		prt("%06lu %lu.%06lu close/open\n", testcalls, t.tv_sec,
 		    t.tv_usec);
-	if (close(tf->fd)) {
+	if (close(fd)) {
 		prterr("docloseopen: close");
 		report_failure(180);
 	}
@@ -1004,8 +831,8 @@ docloseopen(void)
 		gettimeofday(&t, NULL);
 		prt("       %lu.%06lu close done\n", t.tv_sec, t.tv_usec);
 	}
-	tf->fd = open(tf->path, O_RDWR, 0);
-	if (tf->fd < 0) {
+	fd = open(fname, O_RDWR, 0);
+	if (fd < 0) {
 		prterr("docloseopen: open");
 		report_failure(181);
 	}
@@ -1103,7 +930,7 @@ usage(void)
 		"fsx [-dnqLOW] [-b opnum] [-c Prob] [-l flen] [-m "
 "start:end] [-o oplen] [-p progressinterval] [-r readbdy] [-s style] [-t "
 "truncbdy] [-w writebdy] [-D startingop] [-N numops] [-P dirpath] [-S seed] "
-"[ -I random|rotate ] fname [additional paths to fname..]\n"
+"fname\n"
 "	-b opnum: beginning operation number (default 1)\n"
 "	-c P: 1 in P chance of file close+open at each op (default infinity)\n"
 "	-d: debug output for all operations [-d -d = more debugging]\n"
@@ -1126,9 +953,6 @@ usage(void)
 "	-S seed: for random # generator (default 1) 0 gets timestamp\n"
 "	-W: mapped write operations DISabled\n"
 "        -R: read() system calls only (mapped reads disabled)\n"
-"	-I: When multiple paths to the file are given each operation uses"
-"           a different path.  Iterate through them in order with 'rotate'"
-"           or chose then at 'random'.  (defaults to random)\n"
 "	fname: this filename is REQUIRED (no default)\n");
 	exit(90);
 }
@@ -1167,6 +991,14 @@ getnum(char *s, char **e)
 	return (ret);
 }
 
+
+static const char *basename(const char *path)
+{
+	char *c = strrchr(path, '/');
+
+	return c ? c++ : path;
+}
+
 int
 main(int argc, char **argv)
 {
@@ -1182,8 +1014,7 @@ main(int argc, char **argv)
 
 	setvbuf(stdout, (char *)0, _IOLBF, 0); /* line buffered stdout */
 
-	while ((ch = getopt(argc, argv, 
-				"b:c:dl:m:no:p:qr:s:t:w:D:I:LN:OP:RS:W"))
+	while ((ch = getopt(argc, argv, "b:c:dl:m:no:p:qr:s:t:w:D:LN:OP:RS:W"))
 	       != EOF)
 		switch (ch) {
 		case 'b':
@@ -1266,9 +1097,6 @@ main(int argc, char **argv)
 			if (debugstart < 1)
 				usage();
 			break;
-		case 'I':
-			assign_fd_policy(optarg);
-			break;
 		case 'L':
 		        lite = 1;
 			break;
@@ -1311,7 +1139,7 @@ main(int argc, char **argv)
 		}
 	argc -= optind;
 	argv += optind;
-	if (argc < 1)
+	if (argc != 1)
 		usage();
 	fname = argv[0];
 
@@ -1328,9 +1156,11 @@ main(int argc, char **argv)
 
 	initstate(seed, state, 256);
 	setstate(state);
-
-	open_test_files(argv, argc);
-
+	fd = open(fname, O_RDWR|(lite ? 0 : O_CREAT|O_TRUNC), 0666);
+	if (fd < 0) {
+		prterr(fname);
+		exit(91);
+	}
 	strncat(goodfile, dirpath ? basename(fname) : fname, 256);
 	strcat (goodfile, ".fsxgood");
 	fsxgoodfd = open(goodfile, O_RDWR|O_CREAT|O_TRUNC, 0666);
@@ -1347,7 +1177,6 @@ main(int argc, char **argv)
 	}
 	if (lite) {
 		off_t ret;
-		int fd = get_fd();
 		file_size = maxfilelen = lseek(fd, (off_t)0, SEEK_END);
 		if (file_size == (off_t)-1) {
 			prterr(fname);
@@ -1370,7 +1199,6 @@ main(int argc, char **argv)
 	memset(temp_buf, '\0', maxoplen);
 	if (lite) {	/* zero entire existing file */
 		ssize_t written;
-		int fd = get_fd();
 
 		written = write(fd, good_buf, (size_t)maxfilelen);
 		if (written != maxfilelen) {
@@ -1389,7 +1217,10 @@ main(int argc, char **argv)
 	while (numops == -1 || numops--)
 		test();
 
-	close_test_files();
+	if (close(fd)) {
+		prterr("close");
+		report_failure(99);
+	}
 	prt("All operations completed A-OK!\n");
 
 	exit(0);
diff --git a/lustre/tests/insanity.sh b/lustre/tests/insanity.sh
index 68d0ff9..7ad2c1c 100755
--- a/lustre/tests/insanity.sh
+++ b/lustre/tests/insanity.sh
@@ -137,7 +137,7 @@ setup() {
     wait_for mds
     start mds $MDSLCONFARGS ${REFORMAT}
     while ! do_node $CLIENTS "ls -d $LUSTRE" > /dev/null; do sleep 5; done
-    grep " $MOUNT " /proc/mounts || zconf_mount $CLIENTS $MOUNT
+    zconf_mount $CLIENTS $MOUNT
 
 }
 
@@ -156,7 +156,7 @@ client_touch() {
     file=$1
     for c in $LIVE_CLIENT $FAIL_CLIENTS;  do
 	if echo $DOWN_CLIENTS | grep -q $c; then continue; fi
-	$PDSH $c touch $MOUNT/${c}_$file || return 1
+	$PDSH $c touch $MOUNT/${c}_$file
     done
 }
 
diff --git a/lustre/tests/lfsck_config.sh b/lustre/tests/lfsck_config.sh
deleted file mode 100755
index 8f1173e..0000000
--- a/lustre/tests/lfsck_config.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-export PATH=`dirname $0`/../../utils:$PATH
-
-config=${1:-lfsck_config.xml}
-
-LMC="${LMC:-lmc} -m $config"
-TMP=${TMP:-/tmp}
-
-MDSDEV=${MDSDEV:-$TMP/mds1-`hostname`}
-MDSSIZE=${MDSSIZE:-100000}
-FSTYPE=${FSTYPE:-ext3}
-MOUNT=${MOUNT:-/mnt/lustre}
-#MOUNT2=${MOUNT2:-${MOUNT}2}
-NETWORKTYPE=${NETWORKTYPE:-tcp}
-
-OSTSIZE=${OSTSIZE:-200000}
-
-# specific journal size for the ost, in MB
-JSIZE=${JSIZE:-0}
-[ "$JSIZE" -gt 0 ] && JARG="--journal_size $JSIZE"
-MDSISIZE=${MDSISIZE:-128}
-
-STRIPE_BYTES=524288
-STRIPES_PER_OBJ=0	# 0 means stripe over all OSTs
-
-rm -f $config
-
-# create nodes
-${LMC} --add node --node localhost || exit 10
-${LMC} --add net --node  localhost --nid `hostname` --nettype $NETWORKTYPE || exit 11
-
-# configure mds server
-${LMC} --add mds --nspath /mnt/mds_ns  --node localhost --mds mds1 --fstype $FSTYPE --dev $MDSDEV --size $MDSSIZE $JARG --mkfsoptions "-I $MDSISIZE" || exit 20
-
-# configure osts
-${LMC} -m $config --add lov --lov lov1 --mds mds1 --stripe_sz $STRIPE_BYTES --stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0 || exit 20
-i=0
-while [ $i -lt $NUM_OSTS ]
-do
-${LMC} --add ost --node localhost --lov lov1 --fstype $FSTYPE --dev $TMP/ost$i-`hostname` --size $OSTSIZE $JARG || exit 30
-i=`expr $i + 1`
-done
-
-# create client config
-${LMC} --add mtpt --node localhost --path $MOUNT --mds mds1 --lov lov1 || exit 40
-#${LMC} --add mtpt --node localhost --path $MOUNT2 --mds mds1 --lov lov1 || exit 40
diff --git a/lustre/tests/lfscktest.sh b/lustre/tests/lfscktest.sh
deleted file mode 100755
index 4c9fed0..0000000
--- a/lustre/tests/lfscktest.sh
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/bash
-set -vx
-set -e
-
-. ./lfscktest_config.sh
-
-#Create mount points on target OST and MDS
-#Create test directory 
-
-mkdir -p $OST_MOUNTPT
-mkdir -p $MDS_MOUNTPT
-mkdir -p $TEST_DIR
-
-export PATH=$E2FSCK_PATH/e2fsck:$PATH
-
-# Create some files on the filesystem
-for i in `seq 0 3`; do
-	mkdir -p ${MOUNT}/d$i
-	for j in `seq 0 5`; do
-		mkdir -p  ${MOUNT}/d$i/d$j
-		for k in `seq 1 5`; do
-			FILE="${MOUNT}/d$i/d$j/test$k"
-			echo "creating $FILE"
-			dd if=/dev/zero bs=4k count=1 of=$FILE
-		done
-	done
-done
-# Create Files to be modified
-
-file_name=${TESTNAME}
-
-for FILE in `seq -f ${TEST_DIR}/${file_name}.%g 0 40`; do
-	dd if=/dev/zero count=1 bs=64k of=$FILE || exit 1
-done
-
-#Create some more files
-
-for i in `seq 21 23`; do
-	mkdir -p ${MOUNT}/d$i
-	for j in `seq 0 5`; do
-		mkdir -p  ${MOUNT}/d$i/d$j
-		for k in `seq 0 5`; do
-			FILE="${MOUNT}/d$i/d$j/test$k"
-			echo "creating $FILE"
-			dd if=/dev/zero bs=4k count=1 of=$FILE
-		done
-	done
-done
-
-# Get objids for a file on the OST
-OST_TEST_FILE_OBJIDS=""
-for i in `seq 0 19`; do
-	OST_TEST_FILE=${TEST_DIR}/${file_name}.$i
-	##Get the file OBJID
-	OST_TEST_FILE_OBJID=`$LFIND -v -o $OST_UUID $OST_TEST_FILE|grep '\*$' | awk '{ print $2 }'` || exit 1
-	if [ "$OST_TEST_FILE_OBJID" ]; then
-		echo "REMOVING OBJID $OST_TEST_FILE_OBJID on $OST_UUID from $OST_TEST_FILE"
-	fi
-	OST_TEST_FILE_OBJIDS="$OST_TEST_FILE_OBJIDS $OST_TEST_FILE_OBJID"
-done
-
-MDS_FILES=""
-for i in `seq 20 39`; do
-	TEST_FILE=${TEST_DIR}/${file_name}.$i
-	echo "REMOVING MDS FILE $TEST_FILE which has info:"
-	$LFIND -v $TEST_FILE  || exit 1
-	MDS_FILES="$MDS_FILES ${TESTNAME}/${file_name}.$i"
-done
-
-$LCONF --cleanup ${CONFIGXML} || exit 1
-
-# Remove objects associated with files
-echo "removing objects: $OST_TEST_FILE_OBJIDS"
-for i in $OST_TEST_FILE_OBJIDS; do
-	z=`expr $i % 32`
-	$DEBUGFS -w -R "rm O/0/d$z/$i" "$OSTDEV" || exit 1
-done
-
-mount "-o" loop $MDSDEV $MDS_MOUNTPT
-
-#Remove files from mds
-for i in $MDS_FILES; do
-	rm $MDS_MOUNTPT/ROOT/$i || (umount $MDS_MOUNTPT && exit 1)
-done
-
-#Create EAs on files so objects are referenced twice from different mds files
-for i in `seq 40 59`; do
-	touch $MDS_MOUNTPT/ROOT/${TESTNAME}/${TESTNAME}.bad.$i
-	${GPATH}/copy_attr $MDS_MOUNTPT/ROOT/${TESTNAME}/${TESTNAME}.$i $MDS_MOUNTPT/ROOT/${TESTNAME}/${TESTNAME}.bad.$i || (umount $MDS_MOUNTPT && exit 1) 
-	i=`expr $i + 1`
-done
-	umount $MDS_MOUNTPT 
-	rmdir $MDS_MOUNTPT
-	rmdir $OST_MOUNTPT
-
-# Run e2fsck to get mds and ost info
-# a return status of 1 indicates e2fsck successfuly fixed problems found
-
-e2fsck -d -f -y --mdsdb $GPATH/mdsdb $MDSDEV 
-RET=$?
-[ $RET -ne 0 -a $RET -ne 1 ] && exit 1
-i=0
-OSTDB_LIST=""
-while [ $i -lt $NUM_OSTS ]; do
-	e2fsck -d -f -y --mdsdb $GPATH/mdsdb --ostdb $GPATH/ostdb-$i $TMP/ost$i-`hostname`
-	RET=$?
-	[ $RET -ne 0 -a $RET -ne 1 ] && exit 1
-	if [ -z "${OSTDB_LIST}" ]; then
-		OSTDB_LIST=${GPATH}/ostdb-$i
-	else
-		OSTDB_LIST=${GPATH}/ostdb-$i,${OSTDB_LIST}
-	fi
-	i=`expr $i + 1`
-done
-
-#Mount filesystem
-${LCONF} ${CONFIGXML}  || exit 1
-
-lfsck -l --mdsdb $GPATH/mdsdb --ostdb ${OSTDB_LIST} ${MOUNT} || exit 1  
-
-#Cleanup 
-rm $GPATH/mdsdb
-rm $GPATH/ostdb-*
diff --git a/lustre/tests/lfscktest_config.sh b/lustre/tests/lfscktest_config.sh
deleted file mode 100644
index 45746b2..0000000
--- a/lustre/tests/lfscktest_config.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-export TESTNAME="lfscktest"
-export TESTDESC="Test of lfsck functionality"
-
-export LUSTRE=${LUSTRE:-"../.."}
-export LCONF=${LCONF:-"$LUSTRE/utils/lconf"}
-export LMC=${LMC:-"$LUSTRE/utils/lmc"}
-export LCTL=${LCTL:-"$LUSTRE/utils/lctl"}
-export LFIND=${LFIND:-"$LUSTRE/utils/lfind"}
-export E2FSCK_PATH=${E2FSCK_PATH:-"/usr/src/e2fsprogs-1.34"}
-export TMP=${TMP:-"/tmp"}
-export CONFIG=${CONFIG:-"./lfsck_config.sh"}
-export LOG=${LOG:-"${TMP}/lfscktest.log"}
-export CONFIGXML=${CONFIGXML:-"./lfsck_config.xml"}
-export LUSTRE_TAG=${LUSTRE_TAG:="HEAD"}
-export MACHINENAME=`hostname | sed -e 's/[0-9]\+//'`
-export TESTGROUP=${TESTGROUP:-"unspecified"}
-export CONFIGDESC=${CONFIGDESC:-"local"}
-export TESTARCH=${TESTARCH:-`uname -m`}
-export NETWORKTYPE=${NETWORKTYPE:-"tcp"}
-export MDSDEV=${MDSDEV:-$TMP/mds1-`hostname`}
-export MDSNODES=${MDSNODES:-`hostname`}
-export OSTDEV=${OSTDEV:-$TMP/ost1-`hostname`}
-export OSTNODES=${OSTNODES:-`hostname`}
-export CLIENTNODES=${CLIENTNODES:-`hostname`}
-export RECIPIENTS=${RECIPIENTS:-"liam.kelleher@hp.com"}
-export SENDER=${SENDER:-"liam.kelleher@hp.com"}
-export NUM_OSTS=${NUM_OSTS:-5}
-export DEBUGFS=${DEBUGFS:-"debugfs"}
-
-export GPATH=`pwd`
-export OST_UUID="OST_localhost_2_UUID"
-
-export MDS_MOUNTPT="/mnt/mds_${TESTNAME}"
-export OST_MOUNTPT="/mnt/ost_${TESTNAME}"
-export MOUNT="/mnt/lustre"
-export TEST_DIR="${MOUNT}/${TESTNAME}"
diff --git a/lustre/tests/ll_dirstripe_verify.c b/lustre/tests/ll_dirstripe_verify.c
deleted file mode 100644
index bfbe7bc..0000000
--- a/lustre/tests/ll_dirstripe_verify.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
- * ll_dirstripe_verify <dir> <file>:
- * - to verify if the file has the same lov_user_md setting as the parent dir.
- * - if dir's offset is set -1, ll_dirstripe_verify <dir> <file1> <file2>
- *      is used to further verify if file1 and file2's obdidx is continuous.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <dirent.h>
-
-#include <liblustre.h>
-#include <linux/obd.h>
-#include <linux/lustre_lib.h>
-#include <lustre/lustre_user.h>
-#include <linux/obd_lov.h>
-
-#include <portals/ptlctl.h>
-
-
-#define MAX_LOV_UUID_COUNT      1000
-
-int compare(struct lov_user_md *lum_dir, struct lov_user_md *lum_file1,
-            struct lov_user_md *lum_file2)
-{
-        int stripe_count;
-        int stripe_size;
-        int stripe_offset;
-        int ost_count;
-        int fd;
-        char buf[32];
-        int i;
-
-        stripe_count = (int)lum_dir->lmm_stripe_count;
-        if (stripe_count == 0) {
-                fd = open("/proc/fs/lustre/lov/lov1/stripecount", O_RDONLY);
-                if (fd == -1) {
-                        fprintf(stderr, "open proc file error: %s\n", 
-                                strerror(errno));
-                        return -1; 
-                }
-                if (read(fd, buf, sizeof(buf)) == -1) {
-                        fprintf(stderr, "read proc file error: %s\n", 
-                                strerror(errno));
-                        close(fd);
-                        return -1;
-                }
-                
-                stripe_count = atoi(buf);
-                stripe_count = stripe_count ? stripe_count : 1;
-                close(fd);
-        }
-
-        stripe_size = (int)lum_dir->lmm_stripe_size;
-        if (stripe_size == 0) {
-                fd = open("/proc/fs/lustre/lov/lov1/stripesize", O_RDONLY);
-                if (fd == -1) {
-                        fprintf(stderr, "open proc file error: %s\n", 
-                                strerror(errno)); 
-                        return -1; 
-                }
-                if (read(fd, buf, sizeof(buf)) == -1) {
-                        fprintf(stderr, "read proc file error: %s\n", 
-                                strerror(errno));
-                        close(fd);
-                        return -1;
-                }
-
-                stripe_size = atoi(buf);
-                close(fd);
-        }
-
-        fd = open("/proc/fs/lustre/lov/lov1/numobd", O_RDONLY);
-        if(fd  == -1) {
-                fprintf(stderr, "open proc file error: %s\n", 
-                        strerror(errno));
-                return -1;
-        }
-        if (read(fd, buf, sizeof(buf)) == -1) {
-                fprintf(stderr, "read proc file error: %s\n", 
-                        strerror(errno));
-                close(fd);
-                return -1;
-        }
-
-        ost_count = atoi(buf);
-        close(fd);
-
-        if ((lum_file1->lmm_stripe_count != stripe_count) ||
-            (lum_file1->lmm_stripe_size != stripe_size))
-                return -1;
-        
-        stripe_offset = (short int)lum_dir->lmm_stripe_offset;
-        if (stripe_offset != -1) {
-                for (i = 0; i < stripe_count; i++)
-                        if (lum_file1->lmm_objects[i].l_ost_idx != 
-                            (stripe_offset + i) % ost_count) 
-                                return -1;
-        } else if (lum_file2 != NULL) {
-                int next, idx;
-                next = (lum_file1->lmm_objects[stripe_count-1].l_ost_idx + 1)
-                       % ost_count;
-                idx = lum_file2->lmm_objects[0].l_ost_idx;
-                if (idx != next) 
-                        return -1;
-        }
-
-        return 0;        
-}
-
-int main(int argc, char **argv)
-{
-        DIR * dir;
-        struct lov_user_md *lum_dir, *lum_file1 = NULL, *lum_file2 = NULL;
-        int rc;
-        int lum_size;
-        char *fname;
-
-        if (argc < 3) {
-                fprintf(stderr, "Usage: %s <dirname> <filename1> [filename2]\n",
-                        argv[0]);
-                exit(1);
-        }
-
-        dir = opendir(argv[1]);
-        if (dir  == NULL) {
-                fprintf(stderr, "%s opendir failed\n", argv[1]);
-                return errno;
-        }
-
-        lum_size = lov_mds_md_size(MAX_LOV_UUID_COUNT);
-        if ((lum_dir = (struct lov_user_md *)malloc(lum_size)) == NULL) {
-                fprintf(stderr, "unable to allocate memory for ioctl's");
-                return errno;
-        }        
-
-        rc = ioctl(dirfd(dir), LL_IOC_LOV_GETSTRIPE, lum_dir);
-        if (rc) {
-                if (errno == ENODATA) {
-                        lum_dir->lmm_stripe_size = 0;
-                        lum_dir->lmm_stripe_count = 0;
-                        lum_dir->lmm_stripe_offset = -1;
-                } else {
-                        rc = errno;
-                        goto cleanup;
-                }       
-        }
-
-        if ((lum_file1 = (struct lov_user_md *)malloc(lum_size)) == NULL) {
-                fprintf(stderr, "unable to allocate memory for ioctl's");
-                rc = errno;
-                goto cleanup;
-        }
-
-        fname = strrchr(argv[2], '/');
-        fname++;
-        strncpy((char *)lum_file1, fname, lum_size);
-        rc = ioctl(dirfd(dir), IOC_MDC_GETSTRIPE, lum_file1);
-        if (rc) {
-                rc = errno;
-                goto cleanup;
-        }
-
-        if (argc == 4) {
-                if ((lum_file2 = (struct lov_user_md *)malloc(lum_size)) 
-                    == NULL) {
-                        fprintf(stderr, 
-                                "unable to allocate memory for ioctl's");
-                        rc = errno;
-                        goto cleanup;
-                }
-
-                fname = strrchr(argv[3], '/');
-                fname++;
-                strncpy((char *)lum_file2, fname, lum_size);
-                rc = ioctl(dirfd(dir), IOC_MDC_GETSTRIPE, lum_file2);
-                if (rc) {
-                        rc = errno;
-                        goto cleanup;
-                }
-        }
-
-        rc = compare(lum_dir, lum_file1, lum_file2);
-
-cleanup:
-        if (lum_dir != NULL)
-                free(lum_dir);
-        if (lum_file1 != NULL)
-                free(lum_file1);
-        if (lum_file2 != NULL)
-                free(lum_file2);
-
-        return rc;
-}
diff --git a/lustre/tests/llmount.sh b/lustre/tests/llmount.sh
index d8d243b..9dd1ece 100755
--- a/lustre/tests/llmount.sh
+++ b/lustre/tests/llmount.sh
@@ -10,11 +10,11 @@ config=$NAME.xml
 mkconfig=$NAME.sh
 
 if [ "$PORTALS" ]; then
-    portals_opt="--portals=$PORTALS"
+  portals_opt="--portals=$PORTALS"
 fi
 
 if [ "$LUSTRE" ]; then
-    lustre_opt="--lustre=$LUSTRE"
+  lustre_opt="--lustre=$LUSTRE"
 fi
 
 if [ "$LDAPURL" ]; then
diff --git a/lustre/tests/llmountcleanup.sh b/lustre/tests/llmountcleanup.sh
index 35eca9b..cdcbaa8 100755
--- a/lustre/tests/llmountcleanup.sh
+++ b/lustre/tests/llmountcleanup.sh
@@ -39,14 +39,13 @@ if [ "$BUSY" ]; then
 	mv $TMP/debug $TMP/debug-busy.`date +%s`
 	exit 255
 fi
-LEAK_LUSTRE=`dmesg | tail -n 30 | grep "obd mem.*leaked"`
-LEAK_PORTALS=`dmesg | tail -n 20 | grep "Portals memory leaked"`
+LEAK_LUSTRE=`dmesg | tail -40 | grep "obd mem.*leaked"`
+LEAK_PORTALS=`dmesg | tail -20 | grep "Portals memory leaked"`
 if [ "$LEAK_LUSTRE" -o "$LEAK_PORTALS" ]; then
 	echo "$LEAK_LUSTRE" 1>&2
 	echo "$LEAK_PORTALS" 1>&2
 	mv $TMP/debug $TMP/debug-leak.`date +%s`
 	exit 254
 fi
-lsmod | grep portals && echo "modules still loaded" && exit 1
 
 exit $rc
diff --git a/lustre/tests/lmv.sh b/lustre/tests/lmv.sh
new file mode 100755
index 0000000..d82d08a
--- /dev/null
+++ b/lustre/tests/lmv.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+set -e
+
+export PATH=`dirname $0`/../utils:$PATH
+
+config=${1:-lmv.xml}
+
+LMC=${LMC:-lmc}
+TMP=${TMP:-/tmp}
+
+MDSSIZE=${MDSSIZE:-100000}
+FSTYPE=${FSTYPE:-ext3}
+MDSCOUNT=${MDSCOUNT:-3}
+
+OSTDEV=${OSTDEV:-$TMP/ost1-`hostname`}
+OSTSIZE=${OSTSIZE:-200000}
+
+# 1 to config an echo client instead of llite
+ECHO_CLIENT=${ECHO_CLIENT:-}
+
+STRIPE_BYTES=65536
+STRIPES_PER_OBJ=0
+
+MOUNT=${MOUNT:-/mnt/lustre}
+
+# specific journal size for the ost, in MB
+JSIZE=${JSIZE:-0}
+JARG=""
+[ "$JSIZE" -gt 0 ] && JARG="--journal_size $JSIZE"
+
+rm -f $config
+
+# create nodes
+${LMC} -m $config --add node --node localhost || exit 10
+${LMC} -m $config --add net --node localhost --nid localhost --nettype tcp || exit 11
+
+# configure mds server
+${LMC} -m $config --add lmv --lmv lmv1 || exit 12
+
+for num in `seq $MDSCOUNT`; do
+    mopt="--master"
+    MDSDEV=$TMP/mds${num}-`hostname`
+    ${LMC} -m $config --format --add mds --node localhost --mds mds${num} \
+        --lmv lmv1 --fstype $FSTYPE --dev $MDSDEV --size $MDSSIZE $mopt || exit 13
+done
+
+# configure ost
+${LMC} -m $config --add lov --lov lov1 --lmv lmv1 --stripe_sz $STRIPE_BYTES --stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0 || exit 20
+${LMC} -m $config --add ost --nspath /mnt/ost_ns --node localhost --lov lov1 --fstype $FSTYPE --dev $OSTDEV --size $OSTSIZE $JARG || exit 30
+
+${LMC} -m $config --add mtpt --node localhost --path $MOUNT --lmv lmv1 --lov lov1 || exit 40
+
diff --git a/lustre/tests/local.sh b/lustre/tests/local.sh
index bdcd2e0..0f8fe13 100755
--- a/lustre/tests/local.sh
+++ b/lustre/tests/local.sh
@@ -7,11 +7,9 @@ config=${1:-local.xml}
 LMC="${LMC:-lmc} -m $config"
 TMP=${TMP:-/tmp}
 
-FSTYPE=${FSTYPE:-ext3}
-
 MDSDEV=${MDSDEV:-$TMP/mds1-`hostname`}
 MDSSIZE=${MDSSIZE:-100000}
-
+FSTYPE=${FSTYPE:-ext3}
 MOUNT=${MOUNT:-/mnt/lustre}
 MOUNT2=${MOUNT2:-${MOUNT}2}
 NETWORKTYPE=${NETWORKTYPE:-tcp}
@@ -19,19 +17,13 @@ NETWORKTYPE=${NETWORKTYPE:-tcp}
 OSTDEV=${OSTDEV:-$TMP/ost1-`hostname`}
 OSTSIZE=${OSTSIZE:-200000}
 
-MDS_BACKFSTYPE=${MDS_BACKFSTYPE:-ext3}
-OST_BACKFSTYPE=${OST_BACKFSTYPE:-ext3}
-
-MDS_BACKDEV=${MDS_BACKDEV:-$TMP/mds1-`hostname`}
-OST_BACKDEV=${OST_BACKDEV:-$TMP/ost1-`hostname`}
-
 # specific journal size for the ost, in MB
 JSIZE=${JSIZE:-0}
 [ "$JSIZE" -gt 0 ] && JARG="--journal_size $JSIZE"
 MDSISIZE=${MDSISIZE:-0}
 [ "$MDSISIZE" -gt 0 ] && IARG="--inode_size $MDSISIZE"
 
-STRIPE_BYTES=1048576
+STRIPE_BYTES=65536
 STRIPES_PER_OBJ=0	# 0 means stripe over all OSTs
 
 rm -f $config
@@ -41,24 +33,12 @@ ${LMC} --add node --node localhost || exit 10
 ${LMC} --add net --node  localhost --nid `hostname` --nettype $NETWORKTYPE || exit 11
 ${LMC} --add net --node client --nid '*' --nettype $NETWORKTYPE || exit 12
 
-[ "x$MDS_MOUNT_OPTS" != "x" ] &&
-    MDS_MOUNT_OPTS="--mountfsoptions $MDS_MOUNT_OPTS"
-
 # configure mds server
-${LMC} --add mds --nspath /mnt/mds_ns --node localhost --mds mds1 \
---fstype $FSTYPE --backfstype $MDS_BACKFSTYPE --dev $MDSDEV \
---backdev $MDS_BACKDEV $MDS_MOUNT_OPTS --size $MDSSIZE $JARG $IARG || exit 20
-
-[ "x$OST_MOUNT_OPTS" != "x" ] &&
-    OST_MOUNT_OPTS="--mountfsoptions $OST_MOUNT_OPTS"
+${LMC} --add mds --nspath /mnt/mds_ns  --node localhost --mds mds1 --fstype $FSTYPE --dev $MDSDEV --size $MDSSIZE $JARG $IARG || exit 20
 
 # configure ost
-${LMC} -m $config --add lov --lov lov1 --mds mds1 --stripe_sz $STRIPE_BYTES \
---stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0 || exit 20
-
-${LMC} --add ost --nspath /mnt/ost_ns --node localhost --lov lov1 \
---fstype $FSTYPE --backfstype $OST_BACKFSTYPE --dev $OSTDEV \
---backdev $OST_BACKDEV $OST_MOUNT_OPTS --size $OSTSIZE $JARG || exit 30
+${LMC} -m $config --add lov --lov lov1 --mds mds1 --stripe_sz $STRIPE_BYTES --stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0 || exit 20
+${LMC} --add ost --nspath /mnt/ost_ns --node localhost --lov lov1 --fstype $FSTYPE --dev $OSTDEV --size $OSTSIZE $JARG || exit 30
 
 # create client config
 ${LMC} --add mtpt --node localhost --path $MOUNT --mds mds1 --lov lov1 || exit 40
diff --git a/lustre/tests/lov.sh b/lustre/tests/lov.sh
index d148f20..ec09598 100755
--- a/lustre/tests/lov.sh
+++ b/lustre/tests/lov.sh
@@ -23,7 +23,7 @@ OSTSIZE=${OSTSIZE:-150000}
 # 1 to config an echo client instead of llite
 ECHO_CLIENT=${ECHO_CLIENT:-}
 
-STRIPE_BYTES=524288
+STRIPE_BYTES=65536
 STRIPES_PER_OBJ=${STRIPES_PER_OBJ:-$((OSTCOUNT -1))}
 
 # specific journal size for the ost, in MB
diff --git a/lustre/tests/lp_utils.c b/lustre/tests/lp_utils.c
deleted file mode 100644
index 0ca7a85..0000000
--- a/lustre/tests/lp_utils.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
- * Copyright (C) 2002 Cluster File Systems, Inc.
- *   Author: You Feng <youfeng@clusterfs.com>
- *
- *   This file is part of Lustre, http://www.lustre.org.
- *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
- *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <mpi.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <errno.h>
-#include "lustre/lustre_user.h"
-#include "lp_utils.h"
-
-#define MAX_PROCESSES 8
-
-int verbose = 0;
-int debug = 0;
-
-char hostname[1024];
-
-struct timeval t1, t2;
-
-char *timestamp() {
-        static char datestring[80];
-        time_t timestamp;
-
-        fflush(stdout);
-        timestamp = time(NULL);
-        strftime(datestring, 80, "%T", localtime(&timestamp));
-
-        return datestring;
-}
-
-inline void begin(char *str) {
-        if (verbose > 0 && rank == 0) {
-                gettimeofday(&t1, NULL);
-                printf("%s:\tBeginning %s\n", timestamp(), str);
-                fflush(stdout);
-        }
-}
-
-inline void end(char *str) {
-        float elapsed;
-
-        MPI_Barrier(MPI_COMM_WORLD);
-        if (verbose > 0 && rank == 0) {
-                gettimeofday(&t2, NULL);
-                elapsed = (t2.tv_sec + ((float)t2.tv_usec/1000000))
-                          - (t1.tv_sec + ((float)t1.tv_usec/1000000));
-                if (elapsed >= 60) {
-                        printf("%s:\tFinished %-15s(%.2f min)\n",
-                               timestamp(), str, elapsed / 60);
-                } else {
-                        printf("%s:\tFinished %-15s(%.3f sec)\n",
-		               timestamp(), str, elapsed);
-
-                }
-                fflush(stdout);
-        }
-}
-
-void dump_diff(char *orig_buf, char *buf, int size, long _off)
-{
-        int i, diff, off;
-        char *p, *end;
-
-        printf("commpared buf size %d, at offset %lu\n\n", size, _off);
-
-        if (orig_buf) {
-                printf("original buf:\n");
-                p = orig_buf;
-                end = orig_buf + size;
-                i = 1;
-                while (p < end) {
-                        printf(" %8lx", *(long *)p);
-                        p += sizeof(long);
-                        if (i++%8 == 0)
-                                printf("\n");
-                }
-                if (i%8) printf("\n\n");
-                else printf("\n");
-        }
-
-        if (buf) {
-                printf("different data: diff_data(orig_data)\n");
-                diff = 0;
-                off = 0;
-                i = 1;
-                p = buf;
-                end = buf + size;
-                while (p < end) {
-                        if (memcmp(p, orig_buf + off, sizeof(long)) != 0) {
-                                printf("\toff: %5d,\tdata: %8lx (%8lx)\n", off,
-                                       *(unsigned long *)p,
-                                       *(unsigned long *)(orig_buf + off));
-                                diff++;
-                        }
-                        off += sizeof(long);
-                        p += sizeof(long);
-                }
-                printf("\n %d total differents found\n\n", diff);
-        }
-}
-
-void lp_gethostname(void)
-{
-        if (gethostname(hostname, 1024) == -1) {
-                fprintf(stderr, "gethostname: (%d)%s", errno, strerror(errno));
-                MPI_Abort(MPI_COMM_WORLD, 2);
-        }
-}
-
-/* This function does not FAIL if the requested "name" does not exit.
- * This is just to clean up any files or directories left over from
- * previous runs
- */
-void remove_file_or_dir(char *name)
-{
-        struct stat statbuf;
-        char errmsg[MAX_FILENAME_LEN + 20];
-
-        if (stat(name, &statbuf) != -1) {
-                if (S_ISREG(statbuf.st_mode)) {
-                        printf("stale file found\n");
-                        if (unlink(name) == -1) {
-                                sprintf(errmsg, "unlink of %s", name);
-                                FAIL(errmsg);
-                        }
-                }
-                if (S_ISDIR(statbuf.st_mode)) {
-                        printf("stale directory found\n");
-                        if (rmdir(name) == -1) {
-                                sprintf(errmsg, "rmdir of %s", name);
-                                FAIL(errmsg);
-                        }
-                }
-        }
-}
-
-void create_file(char *name, long filesize, int fill)
-{
-        static char filename[MAX_FILENAME_LEN];
-        char errmsg[MAX_FILENAME_LEN + 20];
-        char buf[1024 * 8];
-        char c = 'A' + size;
-        int fd, rc;
-        short zero = 0;
-        long left = filesize;
-
-        /* Process 0 creates the test file(s) */
-        if (rank == 0) {
-                sprintf(filename, "%s/%s", testdir, name);
-                remove_file_or_dir(filename);
-                if ((fd = creat(filename, FILEMODE)) == -1) {
-                        sprintf(errmsg, "create of file %s", filename);
-                        FAIL(errmsg);
-                }
-                if (filesize > 0) {
-                        if (lseek(fd, filesize - 1, SEEK_SET) == -1) {
-                                close(fd);
-                                sprintf(errmsg, "lseek of file %s", filename);
-                                FAIL(errmsg);
-                        }
-                        if (write(fd, &zero, 1) == -1) {
-                                close(fd);
-                                sprintf(errmsg, "write of file %s", filename);
-                                FAIL(errmsg);
-                        }
-                }
-                if (filesize > 0 && fill) {
-                        if (lseek(fd, 0, SEEK_SET) == -1) {
-                                close(fd);
-                                sprintf(errmsg, "lseek of file %s", filename);
-                                FAIL(errmsg);
-                        }
-                        memset(buf, c, 1024);
-                        while (left > 0) {
-                                if ((rc = write(fd, buf,
-                                                left > (1024 * 8) ? (1024 * 8) : left))
-                                    == -1) {
-                                        close(fd);
-                                        sprintf(errmsg, "write of file %s", filename);
-                                        FAIL(errmsg);
-                                }
-                                left -= rc;
-                        }
-                }
-                if (close(fd) == -1) {
-                        sprintf(errmsg, "close of file %s", filename);
-                        FAIL(errmsg);
-                }
-        }
-}
-
-void check_stat(char *filename, struct stat *state, struct stat *old_state)
-{
-        char errmsg[MAX_FILENAME_LEN+20];
-
-        if (stat(filename, state) == -1) {
-                sprintf(errmsg, "stat of file %s", filename);
-                FAIL(errmsg);
-        }
-
-        if (memcmp(state, old_state, sizeof(struct stat)) != 0) {
-                errno = 0;
-                sprintf(errmsg, LP_STAT_FMT, LP_STAT_ARGS);
-                FAIL(errmsg);
-        }
-}
-
-void remove_file(char *name)
-{
-        char filename[MAX_FILENAME_LEN];
-        char errmsg[MAX_FILENAME_LEN + 20];
-
-        /* Process 0 remove the file(s) */
-        if (rank == 0) {
-                sprintf(filename, "%s/%s", testdir, name);
-                if (unlink(filename) == -1) {
-                        sprintf(errmsg, "unlink of file %s", filename);
-                        FAIL(errmsg);
-                }
-        }
-}
-
-void fill_stride(char *buf, int buf_size, long long rank, long long _off)
-{
-        char *p = buf;
-        long long off, data[2];
-        int cp, left = buf_size;
-
-        data[0] = rank;
-        off = _off;
-        while (left > 0) {
-                data[1] = off;
-                cp = left > sizeof(data) ? sizeof(data) : left;
-                memcpy(p, data, cp);
-                off += cp;
-                p += cp;
-                left -= cp;
-        }
-}
diff --git a/lustre/tests/lp_utils.h b/lustre/tests/lp_utils.h
deleted file mode 100644
index 993253a..0000000
--- a/lustre/tests/lp_utils.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
- * Copyright (C) 2002 Cluster File Systems, Inc.
- *   Author: You Feng <youfeng@clusterfs.com>
- *
- *   This file is part of Lustre, http://www.lustre.org.
- *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
- *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef __LP_UTILS_H__
-#define __LP_UTILS_H__
-
-#include "lustre/lustre_user.h"
-
-#define FAIL(msg) \
- \
-do { \
-        printf("%s: Process %d (%s)\n", timestamp(), rank, hostname); \
-        if (debug) \
-                printf("\tFAILED in %s:%d:%s()\n", __FILE__, __LINE__, __func__); \
-        else \
-                printf("\tFAILED in %s()\n", __func__); \
-        printf("%s", msg); \
-        fflush(stdout); \
-        MPI_Abort(MPI_COMM_WORLD, 1); \
-} while(0)
-
-#define FILEMODE S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH
-#define MAX_FILENAME_LEN 512
-
-extern int verbose;
-extern int debug;
-
-extern int rank;
-extern int size;
-
-extern char hostname[];
-extern char *timestamp();
-extern char *testdir;
-
-extern inline void begin(char *str);
-extern inline void end(char *str);
-
-extern void dump_diff(char *orig_buf, char *buf, int len, long off);
-extern void lp_gethostname(void);
-
-extern void create_file(char *name, long filesize, int fill);
-extern void fill_file(char *name, long filesize);
-
-#define LP_STAT_FMT \
- \
-"Stat error:\n \
-\tfields\t\tvalue\told value\n \
-\tst_dev\t\t%d\t%d\n \
-\tst_ino\t\t%d\t%d\n \
-\tst_mode\t\t%o\t%o\n \
-\tst_nlink\t%d\t%d\n \
-\tst_uid\t\t%d\t%d\n \
-\tst_gid\t\t%d\t%d\n \
-\tst_rdev\t\t%x.%x\t%x.%x\n \
-\tst_size\t\t%lu\t%lu\n \
-\tst_blksize\t%d\t%d\n \
-\tst_blocks\t%u\t%u\n \
-\tst_atime\t%d\t%d\n \
-\tst_mtime\t%d\t%d\n \
-\tst_ctime\t%d\t%d\n"
-                                                                                
-#define LP_STAT_ARGS \
- \
-(int)state->st_dev, (int)old_state->st_dev, \
-(int)state->st_ino, (int)old_state->st_ino, \
-state->st_mode & 07777, old_state->st_mode & 07777, \
-(int)state->st_nlink, (int)old_state->st_nlink, \
-state->st_uid, old_state->st_uid, \
-state->st_gid, old_state->st_gid, \
-(int)((state->st_rdev >> 8) & 0xff), (int)(state->st_rdev & 0xff), \
-(int)((old_state->st_rdev >> 8) & 0xff), (int)(old_state->st_rdev & 0xff), \
-(unsigned long)state->st_size, (unsigned long)old_state->st_size, \
-(int)state->st_blksize, (int)old_state->st_blksize, \
-(unsigned int)state->st_blocks, (unsigned int)old_state->st_blocks, \
-(int)state->st_atime, (int)old_state->st_atime, \
-(int)state->st_mtime, (int)old_state->st_mtime, \
-(int)state->st_ctime, (int)old_state->st_ctime
-
-extern void check_stat(char *filename, struct stat *state, struct stat *old_state);
-extern void remove_file(char *name);
-extern void remove_file_or_dir(char *name);
-extern void fill_stride(char *buf, int buf_size, long long rank, long long _off);
-
-#endif /* __LP_UTILS_H__ */
diff --git a/lustre/tests/lsmfs.sh b/lustre/tests/lsmfs.sh
deleted file mode 100755
index 2d435c4..0000000
--- a/lustre/tests/lsmfs.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-MDSDEV=smfs OSTDEV=smfs FSTYPE=smfs MDS_MOUNT_OPTS="kml" OST_MOUNT_OPTS="kml" \
-OSTSIZE=100000 MDSSIZE=50000 MDS_BACKFSTYPE=ext3 OST_BACKFSTYPE=ext3 \
-MDS_BACKDEV=/tmp/mds1-$(hostname) OST_BACKDEV=/tmp/ost1-$(hostname) sh llmount.sh
diff --git a/lustre/tests/mcr-routed-config.sh b/lustre/tests/mcr-routed-config.sh
index bf08dbb..8d8a100 100755
--- a/lustre/tests/mcr-routed-config.sh
+++ b/lustre/tests/mcr-routed-config.sh
@@ -46,7 +46,7 @@ gw2node() {
 
 ${LMC} --add net --node $MDS --nid `h2elan $MDS` --nettype elan || exit 1
 ${LMC} --add mds --node $MDS --mds mds1 --dev /tmp/mds1 --size 100000 || exit 1
-${LMC} --add lov --lov lov1 --mds mds1 --stripe_sz 1048576 --stripe_cnt 1 --stripe_pattern 0
+${LMC} --add lov --lov lov1 --mds mds1 --stripe_sz 65536 --stripe_cnt 1 --stripe_pattern 0
 
 # Client node
 #${LMC} --add net --node client --tcpbuf $TCPBUF --nid '*' --nettype tcp || exit 1
diff --git a/lustre/tests/mcrlov.sh b/lustre/tests/mcrlov.sh
index d09866b..cce8878 100755
--- a/lustre/tests/mcrlov.sh
+++ b/lustre/tests/mcrlov.sh
@@ -36,7 +36,7 @@ ${LMC} --add route --node $ROUTER --gw `h2elan $ROUTER` --lo `h2elan $CLIENT_LO`
 
 ${LMC} --add net --node $MDS --nid `h2elan $MDS` --nettype elan || exit 1
 ${LMC} --add mds --node $MDS --mds mds1 --dev $TMP/mds1 --size 100000 || exit 1
-${LMC} --add lov --lov lov1 --mds mds1 --stripe_sz 1048576 --stripe_cnt 0 --stripe_pattern 0 || exit 1
+${LMC} --add lov --lov lov1 --mds mds1 --stripe_sz 65536 --stripe_cnt 0 --stripe_pattern 0 || exit 1
 
 ${LMC} --add mtpt --node client --path /mnt/lustre --mds mds1 --lov lov1
 
diff --git a/lustre/tests/mkdirmany.c b/lustre/tests/mkdirmany.c
index 0f7a1b6..26c3016 100755
--- a/lustre/tests/mkdirmany.c
+++ b/lustre/tests/mkdirmany.c
@@ -10,7 +10,7 @@
 
 int main(int argc, char ** argv)
 {
-        int i, rc = 0, count;
+        int i, rc, count;
         char dirname[4096];
 
         if (argc < 3) {
@@ -25,7 +25,7 @@ int main(int argc, char ** argv)
 
         count = strtoul(argv[2], NULL, 0);
 
-        for (i = 0; i < count; i++) {
+        for (i=0 ; i < count ; i++) {
                 sprintf(dirname, "%s-%d", argv[1], i);
                 rc = mkdir(dirname, 0444);
                 if (rc) {
diff --git a/lustre/tests/mount2.sh b/lustre/tests/mount2.sh
new file mode 100644
index 0000000..eaed7e3
--- /dev/null
+++ b/lustre/tests/mount2.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+config=${1:-mount2.xml}
+
+SRCDIR=`dirname $0`
+PATH=$SRCDIR:$SRCDIR/../utils:$PATH
+LMC="${LMC:-lmc} -m $config"
+TMP=${TMP:-/tmp}
+
+MDSDEV=${MDSDEV:-$TMP/mds1-`hostname`}
+MDSSIZE=${MDSSIZE:-50000}
+MOUNT=${MOUNT:-/mnt/lustre}
+MOUNT1=${MOUNT1:-${MOUNT}1}
+MOUNT2=${MOUNT2:-${MOUNT}2}
+FSTYPE=${FSTYPE:-ext3}
+
+OSTDEV=${OSTDEV:-$TMP/ost1-`hostname`}
+OSTSIZE=${OSTSIZE:-200000}
+
+rm -f $config
+
+# create nodes
+${LMC} --add node --node localhost || exit 10
+${LMC} --add net --node  localhost --nid localhost --nettype tcp || exit 11
+
+# configure mds server
+${LMC} --add mds  --node localhost --mds mds1 --fstype $FSTYPE --dev $MDSDEV --size $MDSSIZE || exit 20
+
+# configure ost
+${LMC} --add ost --node localhost --ost ost1 --fstype $FSTYPE --dev $OSTDEV --size  $OSTSIZE || exit 30
+
+# create client config
+${LMC} --add mtpt --node localhost --path $MOUNT1 --mds mds1 --ost ost1 || exit 40
+${LMC} --add mtpt --node localhost --path $MOUNT2 --mds mds1 --ost ost1 || exit 40
diff --git a/lustre/tests/mount2fs.sh b/lustre/tests/mount2fs.sh
index 64decff..28df665 100644
--- a/lustre/tests/mount2fs.sh
+++ b/lustre/tests/mount2fs.sh
@@ -15,7 +15,6 @@ MOUNT2=${MOUNT2:-${MOUNT}2}
 MDSSIZE=50000
 FSTYPE=${FSTYPE:-ext3}
 
-STRIPE_BYTES=${STRIPE_BYTES:-1048576}
 OSTDEV1=${OSTDEV1:-$TMP/ost1-`hostname`}
 OSTDEV2=${OSTDEV2:-$TMP/ost2-`hostname`}
 OSTSIZE=100000
@@ -34,8 +33,8 @@ ${LMC} -m $config --format --add mds --node $MDSNODE --mds mds1 --fstype $FSTYPE
 ${LMC} -m $config --format --add mds --node $MDSNODE --mds mds2 --fstype $FSTYPE --dev $MDSDEV2 --size $MDSSIZE ||exit 10
 
 # configure ost
-${LMC} -m $config --add lov --lov lov1 --mds mds1 --stripe_sz $STRIPE_BYTES --stripe_cnt 0 --stripe_pattern 0 || exit 20
-${LMC} -m $config --add lov --lov lov2 --mds mds2 --stripe_sz $STRIPE_BYTES --stripe_cnt 0 --stripe_pattern 0 || exit 20
+${LMC} -m $config --add lov --lov lov1 --mds mds1 --stripe_sz 65536 --stripe_cnt 0 --stripe_pattern 0 || exit 20
+${LMC} -m $config --add lov --lov lov2 --mds mds2 --stripe_sz 65536 --stripe_cnt 0 --stripe_pattern 0 || exit 20
 ${LMC} -m $config --add ost --node $OSTNODE --lov lov1 --fstype $FSTYPE --dev $OSTDEV1 --size $OSTSIZE || exit 21
 ${LMC} -m $config --add ost --node $OSTNODE --lov lov2 --fstype $FSTYPE --dev $OSTDEV2 --size $OSTSIZE || exit 22
 
diff --git a/lustre/tests/mount2lov.sh b/lustre/tests/mount2lov.sh
new file mode 100644
index 0000000..1840d19
--- /dev/null
+++ b/lustre/tests/mount2lov.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+config=${1:-mount2.xml}
+
+SRCDIR=`dirname $0`
+PATH=$SRCDIR:$SRCDIR/../utils:$PATH
+LMC="${LMC:-lmc} -m $config"
+TMP=${TMP:-/tmp}
+
+MDSDEV=${MDSDEV:-$TMP/mds1-`hostname`}
+MDSSIZE=${MDSSIZE:-50000}
+FSTYPE=${FSTYPE:-ext3}
+
+OSTDEV1=${OSTDEV1:-$TMP/ost1-`hostname`}
+OSTDEV2=${OSTDEV2:-$TMP/ost2-`hostname`}
+OSTDEV3=${OSTDEV3:-$TMP/ost3-`hostname`}
+OSTSIZE=${OSTSIZE:-100000}
+
+STRIPE_BYTES=65536
+STRIPES_PER_OBJ=2	# 0 means stripe over all OSTs
+
+rm -f $config
+
+# create nodes
+${LMC} --add net --node  localhost --nid localhost --nettype tcp || exit 1
+
+# configure MDS server
+${LMC} --add mds  --node localhost --mds mds1 --fstype $FSTYPE --dev $MDSDEV --size $MDSSIZE || exit 10
+
+# configure OSTs
+${LMC} --add lov --lov lov1 --mds mds1 --stripe_sz $STRIPE_BYTES --stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0 || exit 20
+${LMC} --add ost --node localhost --lov lov1 --fstype $FSTYPE --dev $OSTDEV1 --size $OSTSIZE || exit 21
+${LMC} --add ost --node localhost --lov lov1 --fstype $FSTYPE --dev $OSTDEV2 --size $OSTSIZE || exit 22
+${LMC} --add ost --node localhost --lov lov1 --fstype $FSTYPE --dev $OSTDEV3 --size $OSTSIZE || exit 23
+
+# create client config
+${LMC} --add mtpt --node localhost --path /mnt/lustre1 --mds mds1 --ost lov1 || exit 40
+${LMC} --add mtpt --node localhost --path /mnt/lustre2 --mds mds1 --ost lov1 || exit 41
diff --git a/lustre/tests/multiop.c b/lustre/tests/multiop.c
index 7ab0208..de59be6 100755
--- a/lustre/tests/multiop.c
+++ b/lustre/tests/multiop.c
@@ -1,6 +1,3 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- */
 #define _GNU_SOURCE /* pull in O_DIRECTORY in bits/fcntl.h */
 #include <stdio.h>
 #include <fcntl.h>
@@ -50,22 +47,22 @@ void null_handler(int unused) { }
 static const char *
 pop_arg(int argc, char *argv[])
 {
-        static int cur_arg = 3;
+	static int cur_arg = 3;
 
-        if (cur_arg >= argc)
-                return NULL;
+	if (cur_arg >= argc)
+		return NULL;
 
-        return argv[cur_arg++];
+	return argv[cur_arg++];
 }
 #define POP_ARG() (pop_arg(argc, argv))
 
 int main(int argc, char **argv)
 {
         char *fname, *commands;
-        const char *newfile;
+	const char *newfile;
         struct stat st;
-        size_t mmap_len = 0, i;
-        unsigned char *mmap_ptr = NULL, junk = 0;
+	size_t mmap_len, i;
+	unsigned char *mmap_ptr = NULL, junk = 0;
         int fd = -1;
 
         if (argc < 3) {
@@ -87,7 +84,7 @@ int main(int argc, char **argv)
                                 perror("close");
                                 exit(1);
                         }
-                        fd = -1;
+			fd = -1;
                         break;
                 case 'd':
                         if (mkdir(fname, 0755) == -1) {
@@ -95,54 +92,54 @@ int main(int argc, char **argv)
                                 exit(1);
                         }
                         break;
-                case 'D':
-                        if (open(fname, O_DIRECTORY) == -1) {
-                                perror("open(O_DIRECTORY)");
-                                exit(1);
-                        }
-                        break;
-                case 'l':
-                        newfile = POP_ARG();
-                        if (!newfile)
-                                newfile = fname;
-                        if (symlink(fname, newfile)) {
-                                perror("symlink()");
-                                exit(1);
-                        }
-                        break;
-                case 'L':
-                        newfile = POP_ARG();
-                        if (!newfile)
-                                newfile = fname;
-                        if (link(fname, newfile)) {
-                                perror("symlink()");
-                                exit(1);
-                        }
-                        break;
+		case 'D':
+			if (open(fname, O_DIRECTORY) == -1) {
+				perror("open(O_DIRECTORY)");
+				exit(1);
+			}
+			break;
+		case 'l':
+			newfile = POP_ARG();
+			if (!newfile)
+				newfile = fname;
+			if (symlink(fname, newfile)) {
+				perror("symlink()");
+				exit(1);
+			}
+			break;
+		case 'L':
+			newfile = POP_ARG();
+			if (!newfile)
+				newfile = fname;
+			if (link(fname, newfile)) {
+				perror("symlink()");
+				exit(1);
+			}
+			break;
                 case 'm':
                         if (mknod(fname, S_IFREG | 0644, 0) == -1) {
                                 perror("mknod(S_IFREG|0644, 0)");
                                 exit(1);
                         }
                         break;
-                case 'M':
-                        mmap_len = st.st_size;
-                        mmap_ptr = mmap(NULL, mmap_len, PROT_WRITE | PROT_READ,
-                                        MAP_SHARED, fd, 0);
-                        if (mmap_ptr == MAP_FAILED) {
-                                perror("mmap");
-                                exit(1);
-                        }
-                        break;
-                case 'N':
-                        newfile = POP_ARG();
-                        if (!newfile)
-                                newfile = fname;
-                        if (rename (fname, newfile)) {
-                                perror("rename()");
-                                exit(1);
-                        }
-                        break;
+		case 'M':
+			mmap_len = st.st_size;
+			mmap_ptr = mmap(NULL, mmap_len, PROT_WRITE | PROT_READ,
+					MAP_SHARED, fd, 0);
+			if (mmap_ptr == MAP_FAILED) {
+				perror("mmap");
+				exit(1);
+			}
+			break;
+		case 'N':
+			newfile = POP_ARG();
+			if (!newfile)
+				newfile = fname;
+			if (rename (fname, newfile)) {
+				perror("rename()");
+				exit(1);
+			}
+			break;
                 case 'O':
                         fd = open(fname, O_CREAT|O_RDWR, 0644);
                         if (fd == -1) {
@@ -157,23 +154,23 @@ int main(int argc, char **argv)
                                 exit(1);
                         }
                         break;
-                case 'r': {
-                        char buf;
-                        if (read(fd, &buf, 1) == -1) {
-                                perror("read");
-                                exit(1);
-                        }
-                        }
+		case 'r': {
+			char buf;
+			if (read(fd, &buf, 1) == -1) {
+				perror("read");
+				exit(1);
+			}
+		}
                 case 'S':
                         if (fstat(fd, &st) == -1) {
                                 perror("fstat");
                                 exit(1);
                         }
                         break;
-                case 'R':
-                        for (i = 0; i < mmap_len && mmap_ptr; i += 4096)
-                                junk += mmap_ptr[i];
-                        break;
+		case 'R':
+			for (i = 0; i < mmap_len && mmap_ptr; i += 4096)
+				junk += mmap_ptr[i];
+			break;
                 case 's':
                         if (stat(fname, &st) == -1) {
                                 perror("stat");
@@ -198,41 +195,39 @@ int main(int argc, char **argv)
                                 exit(1);
                         }
                         break;
-                case 'U':
-                        if (munmap(mmap_ptr, mmap_len)) {
-                                perror("munmap");
-                                exit(1);
-                        }
-                        break;
-                case 'w': {
-                        int rc;
-                        if ((rc = write(fd, "w", 1)) == -1) {
-                                perror("write");
-                                exit(1);
-                        }
-                        break;
-                }
-                case 'W':
-                        for (i = 0; i < mmap_len && mmap_ptr; i += 4096)
-                                mmap_ptr[i] += junk++;
-                        break;
-                case 'y':
-                        if (fsync(fd) == -1) {
-                                perror("fsync");
-                                exit(1);
-                        }
-                        break;
-                case 'Y':
-                        if (fdatasync(fd) == -1) {
-                                perror("fdatasync");
-                                exit(1);
-                        }
-                case 'z':
-                        if (lseek(fd, 0, SEEK_SET) == -1) {
-                                perror("lseek");
-                                exit(1);
-                        }
-                        break;
+		case 'U':
+			if (munmap(mmap_ptr, mmap_len)) {
+				perror("munmap");
+				exit(1);
+			}
+			break;
+		case 'w':
+			if (write(fd, "w", 1) == -1) {
+				perror("write");
+				exit(1);
+			}
+			break;
+		case 'W':
+			for (i = 0; i < mmap_len && mmap_ptr; i += 4096)
+				mmap_ptr[i] += junk++;
+			break;
+		case 'y':
+			if (fsync(fd) == -1) {
+				perror("fsync");
+				exit(1);
+			}
+			break;
+		case 'Y':
+			if (fdatasync(fd) == -1) {
+				perror("fdatasync");
+				exit(1);
+			}
+		case 'z':
+			if (lseek(fd, 0, SEEK_SET) == -1) {
+				perror("lseek");
+				exit(1);
+			}
+			break;
                 default:
                         fprintf(stderr, "unknown command \"%c\"\n", *commands);
                         fprintf(stderr, usage, argv[0]);
diff --git a/lustre/tests/munlink.c b/lustre/tests/munlink.c
index 2390cd9..62c2765 100755
--- a/lustre/tests/munlink.c
+++ b/lustre/tests/munlink.c
@@ -11,7 +11,7 @@
 
 int main(int argc, char ** argv)
 {
-        int rc = 0, i;
+        int rc, i;
 
         if (argc < 2) {
                 printf("Usage %s filename {filename ...}\n", argv[0]);
diff --git a/lustre/tests/oos.sh b/lustre/tests/oos.sh
index 1d068d5..5a2646a 100755
--- a/lustre/tests/oos.sh
+++ b/lustre/tests/oos.sh
@@ -22,8 +22,8 @@ sleep 1	# to ensure we get up-to-date statfs info
 #lctl clear
 #lctl debug_daemon start /r/tmp/debug 1024
 
-STRIPECOUNT=`cat /proc/fs/lustre/lov/*/activeobd | head -n 1`
-ORIGFREE=`cat /proc/fs/lustre/llite/*/kbytesavail | head -n 1`
+STRIPECOUNT=`cat /proc/fs/lustre/lov/*/activeobd | head -1`
+ORIGFREE=`cat /proc/fs/lustre/llite/*/kbytesavail | head -1`
 MAXFREE=${MAXFREE:-$((200000 * $STRIPECOUNT))}
 if [ $ORIGFREE -gt $MAXFREE ]; then
 	echo "skipping out-of-space test on $OSC"
@@ -34,9 +34,6 @@ fi
 
 export LANG=C LC_LANG=C # for "No space left on device" message
 
-rm -f $LOG >/dev/null 2>&1
-[ -f $LOG ] && echo "ERROR: log file wasn't removed?" && exit 1
-
 # make sure we stripe over all OSTs to avoid OOS on only a subset of OSTs
 $LFS setstripe $OOS 65536 0 $STRIPECOUNT
 if dd if=/dev/zero of=$OOS count=$(($ORIGFREE + 100)) bs=1k 2> $LOG; then
@@ -52,15 +49,12 @@ fi
 # flush cache to OST(s) so avail numbers are correct
 sync; sleep 1 ; sync
 
-for OSC in /proc/fs/lustre/osc/OSC*MNT*; do
-	AVAIL=`cat $OSC/kbytesavail`
-	GRANT=`cat $OSC/cur_grant_bytes`
-	[ $(($AVAIL - $GRANT / 1024)) -lt 400 ] && OSCFULL=full
+for AVAIL in /proc/fs/lustre/osc/OSC*MNT*/kbytesavail; do
+	[ `cat $AVAIL` -lt 400 ] && OSCFULL=full
 done
-
 if [ -z "$OSCFULL" ]; then
 	echo "no OSTs are close to full"
-	grep [0-9] /proc/fs/lustre/osc/OSC*MNT*/{kbytesavail,cur*}
+	grep "[0-9]" /proc/fs/lustre/osc/OSC*MNT*/{kbytesavail,cur*}
 	SUCCESS=0
 fi
 
diff --git a/lustre/tests/oos2.sh b/lustre/tests/oos2.sh
index 84c87f1..22c6893 100644
--- a/lustre/tests/oos2.sh
+++ b/lustre/tests/oos2.sh
@@ -20,8 +20,8 @@ rm -f $OOS $OOS2 $LOG $LOG2
 
 sleep 1	# to ensure we get up-to-date statfs info
 
-STRIPECOUNT=`cat /proc/fs/lustre/lov/*/activeobd | head -n 1`
-ORIGFREE=`cat /proc/fs/lustre/llite/*/kbytesavail | head -n 1`
+STRIPECOUNT=`cat /proc/fs/lustre/lov/*/activeobd | head -1`
+ORIGFREE=`cat /proc/fs/lustre/llite/*/kbytesavail | head -1`
 MAXFREE=${MAXFREE:-$((200000 * $STRIPECOUNT))}
 if [ $ORIGFREE -gt $MAXFREE ]; then
 	echo "skipping out-of-space test on $OSC"
@@ -54,14 +54,12 @@ fi
 # flush cache to OST(s) so avail numbers are correct
 sync; sleep 1 ; sync
 
-for OSC in /proc/fs/lustre/osc/OSC*MNT*; do
-	AVAIL=`cat $OSC/kbytesavail`
-	GRANT=`cat $OSC/cur_grant_bytes`
-	[ $(($AVAIL - $GRANT / 1024)) -lt 400 ] && OSCFULL=full
+for AVAIL in /proc/fs/lustre/osc/OSC*MNT*/kbytesavail; do
+	[ `cat $AVAIL` -lt 400 ] && OSCFULL=full
 done
 if [ -z "$OSCFULL" ]; then
 	echo "no OSTs are close to full"
-	grep [0-9] /proc/fs/lustre/osc/OSC*MNT*/{kbytesavail,cur*} |tee -a $LOG
+	grep "[0-9]" /proc/fs/lustre/osc/OSC*MNT*/{kbytesavail,cur*} |tee -a $LOG
 	SUCCESS=0
 fi
 
diff --git a/lustre/tests/open_delay.c b/lustre/tests/open_delay.c
index e4f46dc..7200c3f 100644
--- a/lustre/tests/open_delay.c
+++ b/lustre/tests/open_delay.c
@@ -2,7 +2,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <lustre/lustre_user.h>
+#include <linux/lustre_user.h>
 
 int main(int argc, char **argv)
 {
diff --git a/lustre/tests/openclose.c b/lustre/tests/openclose.c
index 0def4b2..ca10134 100644
--- a/lustre/tests/openclose.c
+++ b/lustre/tests/openclose.c
@@ -16,7 +16,7 @@
 #include <sys/wait.h>
 #include <sys/ioctl.h>
 
-#include <lustre/lustre_user.h>
+#include <linux/lustre_user.h>
 
 int main(int argc, char *argv[])
 {
diff --git a/lustre/tests/openfile.c b/lustre/tests/openfile.c
index 1cb36ea..af5e863 100644
--- a/lustre/tests/openfile.c
+++ b/lustre/tests/openfile.c
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <lustre/lustre_user.h>
+#include <linux/lustre_user.h>
 
 typedef struct flag_mapping {
        const char *string;
@@ -61,7 +61,7 @@ int main(int argc, char** argv)
         int    flag_set=0;
         int    file_set=0;
         char   c;
-        char*  cloned_flags = NULL;
+        char*  cloned_flags;
 
         if (argc == 1)
                 Usage_and_abort();
diff --git a/lustre/tests/openfilleddirunlink.c b/lustre/tests/openfilleddirunlink.c
deleted file mode 100644
index 6c7707f..0000000
--- a/lustre/tests/openfilleddirunlink.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- */
-
-/* for O_DIRECTORY */
-#define _GNU_SOURCE
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <string.h>
-
-char fname[1024];
-
-
-int main(int argc, char **argv)
-{
-        char *dname1;
-        int fddir1, rc;
-        int fd;
-
-        if (argc != 2) {
-                fprintf(stderr, "usage: %s dirname1\n", argv[0]);
-                exit(1);
-        }
-
-        dname1 = argv[1];
-
-        //create the directory
-        fprintf(stderr, "creating directory %s\n", dname1);
-        rc = mkdir(dname1, 0744);
-        if (rc == -1) {
-                fprintf(stderr, "creating %s fails: %s\n",
-                        dname1, strerror(errno));
-                exit(1);
-        }
-
-        sprintf(fname, "%s/0", dname1);
-        fprintf(stderr, "creating file %s\n", fname);
-        fd = creat(fname, 0666);
-        if (fd < 0) {
-                fprintf(stderr, "creation %s fails: %s\n",
-                        fname, strerror(errno));
-                exit(1);
-        }
-        close(fd);
-
-        // open the dir again
-        fprintf(stderr, "opening directory\n");
-        fddir1 = open(dname1, O_RDONLY | O_DIRECTORY);
-        if (fddir1 == -1) {
-                fprintf(stderr, "open %s fails: %s\n",
-                        dname1, strerror(errno));
-                exit(1);
-        }
-
-        // delete the dir
-        fprintf(stderr, "unlinking %s\n", dname1);
-        rc = rmdir(dname1);
-        if (rc == 0) {
-                fprintf(stderr, "unlinked non-empty %s successfully\n",
-                        dname1);
-                exit(1);
-        }
-
-        if (access(dname1, F_OK) != 0){
-                fprintf(stderr, "can't access %s: %s\n",
-                        dname1, strerror(errno));
-                exit(1);
-        }
-
-        fprintf(stderr, "Ok, everything goes well.\n");
-        return 0;
-}
diff --git a/lustre/tests/parallel_grouplock.c b/lustre/tests/parallel_grouplock.c
deleted file mode 100644
index 2369209..0000000
--- a/lustre/tests/parallel_grouplock.c
+++ /dev/null
@@ -1,899 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
- * Copyright (C) 2002 Cluster File Systems, Inc.
- *   Author: You Feng <youfeng@clusterfs.com>
- *
- *   This file is part of Lustre, http://www.lustre.org.
- *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
- *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include <mpi.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-#include <time.h>
-#include <errno.h>
-#include <lustre/lustre_user.h>
-#include "lp_utils.h"
-
-#define LPGL_FILEN 700000
-#define LPGL_TEST_ITEMS 7
-
-#define MAX_GLHOST 4
-
-/* waiting time in 0.1 s */
-#define MAX_WAITING_TIME 20
-int rank = 0;
-int size = 0;
-
-char *testdir = NULL;
-
-/*
- * process1 attempts CW(gid=1) -- granted immediately
- * process2 attempts PR -- blocked, goes on waiting list
- * process3 attempts CW(gid=1) -> should be granted, but may go on
- *                                the waiting list
- */
-void grouplock_test1(char *filename, int fd, char *errmsg)
-{
-        int rc, count, gid = 1;
-        char buf[LPGL_FILEN];
-        char zeros[LPGL_FILEN];
-        MPI_Request req1, req2;
-        int temp1, temp2;
-
-        if (rank == 0) {
-                if ((rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid)) == -1) {
-                        sprintf(errmsg, "ioctl GROUP_LOCK of file %s return %d",
-                                filename, rc);
-                        FAIL(errmsg);
-                }
-        }
-
-        MPI_Barrier(MPI_COMM_WORLD);
-
-        if (rank == 1) {
-                memset(zeros, 0x0, sizeof(zeros));
-                lseek(fd, 0, SEEK_SET);
-
-                MPI_Send(&gid, 1, MPI_INT, 2, 1, MPI_COMM_WORLD);
-                count = read(fd, buf, sizeof(buf));
-                if (count != sizeof(buf)) {
-                        if (count > 0)
-                                dump_diff(zeros, buf, count, 0);
-                        sprintf(errmsg, "read of file %s return %d",
-                                filename, count);
-                        FAIL(errmsg);
-                }
-                MPI_Send(&gid, 1, MPI_INT, 0, 1, MPI_COMM_WORLD);
-        }
-
-        if (rank == 2) {
-                int temp;
-
-                /* Wait for reading task to progress, this is probably somewhat
-                   racey, though, may be adding usleep here would make things
-                   better here. */
-                usleep(100);
-                MPI_Recv(&temp, 1, MPI_INT, 1, 1, MPI_COMM_WORLD,
-                         MPI_STATUS_IGNORE);
-                if ((rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid)) == -1) {
-                        sprintf(errmsg, "ioctl GROUP_LOCK of file %s return %d",
-                                filename, rc);
-                        FAIL(errmsg);
-                }
-                MPI_Send(&gid, 1, MPI_INT, 0, 1, MPI_COMM_WORLD);
-        }
-
-        if (rank == 0) {
-                int iter = MAX_WAITING_TIME;
-                int flag1, flag2;
-                
-                /* reading task will tell us when it completes */
-                MPI_Irecv(&temp1, 1, MPI_INT, 1, 1, MPI_COMM_WORLD, &req1);
-                /* 2nd locking task will tell us when it completes */
-                MPI_Irecv(&temp2, 1, MPI_INT, 2, 1, MPI_COMM_WORLD, &req2);
-
-                do {
-                        iter--;
-                        if (!iter) {
-                                FAIL("2nd locking task is not progressing\n");
-                        }
-                        usleep(100);
-                        MPI_Test(&req2, &flag2, MPI_STATUS_IGNORE);
-                        MPI_Test(&req1, &flag1, MPI_STATUS_IGNORE);
-                        if (flag1) {
-                                FAIL("PR task progressed even though GROUP lock"
-                                     " is held\n");
-                        }
-                } while (!flag2);
-        }
-
-        /* Now we need to release the lock */
-
-        if (rank == 0 || rank == 2) {
-                if ((rc = ioctl(fd, LL_IOC_GROUP_UNLOCK, gid)) == -1) {
-                        sprintf(errmsg, "ioctl GROUP_UNLOCK of file %s return %d",
-                                filename, rc);
-                        FAIL(errmsg);
-                }
-        }
-
-        if (rank == 0) {
-                int iter = MAX_WAITING_TIME;
-                int flag1;
-                
-                do {
-                        iter--;
-                        if (!iter) {
-                                FAIL("reading task is not progressing even "
-                                     "though GROUP lock was released\n");
-                                break;
-                        }
-                        usleep(100);
-                        MPI_Test(&req1, &flag1, MPI_STATUS_IGNORE);
-                } while (!flag1);
-        }
-
-        MPI_Barrier(MPI_COMM_WORLD);
-
-}
-
-/*
- * process1 attempts CW(gid=1) -- granted immediately
- * process2 attempts CW(gid=2) -- blocked
- * process3 attempts PR -- blocked
- * process4 attempts CW(gid=2) -- blocked
- * process1 releases CW(gid=1) -- this allows process2's CW lock to be granted
-                                  process3 remains blocked
- */
-void grouplock_test2(char *filename, int fd, char *errmsg)
-{
-        int rc, count, gid = 1;
-        char buf[LPGL_FILEN];
-        char zeros[LPGL_FILEN];
-        MPI_Request req1, req2, req3;
-        int temp1, temp2, temp3;
-
-        if (rank == 0) {
-                if ((rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid)) == -1) {
-                        sprintf(errmsg, "ioctl GROUP_LOCK of file %s return %d",
-                                filename, rc);
-                        FAIL(errmsg);
-                }
-        }
-
-        MPI_Barrier(MPI_COMM_WORLD);
-
-        if (rank == 1 || rank == 3) {
-                gid = 2;
-                if (rank == 3) {
-                        MPI_Recv(&temp1, 1, MPI_INT, 2, 1, MPI_COMM_WORLD,
-                                 MPI_STATUS_IGNORE);
-                        usleep(100);
-                }
-                if ((rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid)) == -1) {
-                        sprintf(errmsg, "ioctl GROUP_LOCK of file %s return %d",
-                                filename, rc);
-                        FAIL(errmsg);
-                }
-                MPI_Send(&gid, 1, MPI_INT, 0, 1, MPI_COMM_WORLD);
-        }
-
-        if (rank == 2) {
-                memset(zeros, 0x0, sizeof(zeros));
-                lseek(fd, 0, SEEK_SET);
-
-                MPI_Send(&gid, 1, MPI_INT, 3, 1, MPI_COMM_WORLD);
-                count = read(fd, buf, sizeof(buf));
-                if (count != sizeof(buf)) {
-                        if (count > 0)
-                                dump_diff(zeros, buf, count, 0);
-                        sprintf(errmsg, "read of file %s return %d",
-                                filename, count);
-                        FAIL(errmsg);
-                }
-                MPI_Send(&gid, 1, MPI_INT, 0, 1, MPI_COMM_WORLD);
-        }
-
-        if (rank == 0) {
-                int iter = MAX_WAITING_TIME;
-                int flag1, flag2, flag3;
-                
-                /* 2nd locking task will tell us when it completes */
-                MPI_Irecv(&temp1, 1, MPI_INT, 1, 1, MPI_COMM_WORLD, &req1);
-                /* 3nd locking task will tell us when it completes */
-                MPI_Irecv(&temp2, 1, MPI_INT, 3, 1, MPI_COMM_WORLD, &req2);
-                /* reading task will tell us when it completes */
-                MPI_Irecv(&temp3, 1, MPI_INT, 2, 1, MPI_COMM_WORLD, &req3);
-
-                do {
-                        iter--;
-                        usleep(100);
-                        MPI_Test(&req2, &flag2, MPI_STATUS_IGNORE);
-                        MPI_Test(&req1, &flag1, MPI_STATUS_IGNORE);
-                        MPI_Test(&req3, &flag3, MPI_STATUS_IGNORE);
-                        if (flag3) {
-                                FAIL("PR task progressed even though GROUP lock"
-                                     " is held\n");
-                        }
-                        if (flag1 || flag2) {
-                                FAIL("GROUP (gid=2) task progressed even though"
-                                     " GROUP (gid=1) lock is held\n");
-                        }
-
-                } while (iter);
-
-                /* Now let's release first lock */
-                if ((rc = ioctl(fd, LL_IOC_GROUP_UNLOCK, gid)) == -1) {
-                        sprintf(errmsg, "ioctl GROUP_UNLOCK of file %s return %d",
-                                filename, rc);
-                        FAIL(errmsg);
-                }
-                iter = MAX_WAITING_TIME;
-                do {
-                        iter--;
-                        if (!iter) {
-                                FAIL("GROUP(gid=2) tasks are not progressing\n");
-                        }
-                        usleep(100);
-                        MPI_Test(&req2, &flag2, MPI_STATUS_IGNORE);
-                        MPI_Test(&req1, &flag1, MPI_STATUS_IGNORE);
-                        MPI_Test(&req3, &flag3, MPI_STATUS_IGNORE);
-                        if (flag3) {
-                                fprintf(stderr, "task1 %d, task3 %d\n", flag1,
-                                        flag2);
-                                FAIL("PR task progressed even though GROUP lock"
-                                     " was on the queue task\n");
-                        }
-                } while (!(flag1 && flag2));
-                MPI_Send(&gid, 1, MPI_INT, 1, 1, MPI_COMM_WORLD);
-                MPI_Send(&gid, 1, MPI_INT, 3, 1, MPI_COMM_WORLD);
-        }
-
-        if (rank == 1 || rank == 3) {
-                /* Do not release the locks until task 0 is ready to watch
-                   for reading task only */
-                MPI_Recv(&temp1, 1, MPI_INT, 0, 1, MPI_COMM_WORLD,
-                         MPI_STATUS_IGNORE);
-                if ((rc = ioctl(fd, LL_IOC_GROUP_UNLOCK, gid)) == -1) {
-                        sprintf(errmsg, "ioctl GROUP_UNLOCK of file %s return %d",
-                                filename, rc);
-                        FAIL(errmsg);
-                }
-        }
-
-        if (rank == 0) {
-                int iter = MAX_WAITING_TIME;
-                int flag3;
-                
-                do {
-                        iter--;
-                        if (!iter) {
-                                FAIL("reading task is not progressing even "
-                                     "though GROUP locks are released\n");
-                                break;
-                        }
-                        usleep(100);
-                        MPI_Test(&req3, &flag3, MPI_STATUS_IGNORE);
-                } while (!flag3);
-        }
-
-        MPI_Barrier(MPI_COMM_WORLD);
-
-}
-
-/*
- * process1 attempts CW(gid=1) -- granted
- * process2 attempts PR -- blocked
- * process3 attempts CW(gid=1) -> should be granted
- * process3 releases CW(gid=1)
- *   process2 should remain blocked
- * process1 releases CW(gid=1)
- *   process2's PR should be granted
- *
- * This is a lot like test1.
- */
-void grouplock_test3(char *filename, int fd, char *errmsg)
-{
-        int rc, count, gid = 1;
-        char buf[LPGL_FILEN];
-        char zeros[LPGL_FILEN];
-        MPI_Request req1, req2;
-        int temp1, temp2;
-
-        if (rank == 0) {
-                if ((rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid)) == -1) {
-                        sprintf(errmsg, "ioctl GROUP_LOCK of file %s return %d",
-                                filename, rc);
-                        FAIL(errmsg);
-                }
-        }
-
-        MPI_Barrier(MPI_COMM_WORLD);
-
-        if (rank == 1) {
-                memset(zeros, 0x0, sizeof(zeros));
-                lseek(fd, 0, SEEK_SET);
-
-                MPI_Send(&gid, 1, MPI_INT, 2, 1, MPI_COMM_WORLD);
-                count = read(fd, buf, sizeof(buf));
-                if (count != sizeof(buf)) {
-                        if (count > 0)
-                                dump_diff(zeros, buf, count, 0);
-                        sprintf(errmsg, "read of file %s return %d",
-                                filename, count);
-                        FAIL(errmsg);
-                }
-                MPI_Send(&gid, 1, MPI_INT, 0, 1, MPI_COMM_WORLD);
-        }
-
-        if (rank == 2) {
-                int temp;
-
-                /* Wait for reading task to progress, this is probably somewhat
-                   racey, though, may be adding usleep here would make things
-                   better here. */
-                usleep(100);
-                MPI_Recv(&temp, 1, MPI_INT, 1, 1, MPI_COMM_WORLD,
-                         MPI_STATUS_IGNORE);
-                if ((rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid)) == -1) {
-                        sprintf(errmsg, "ioctl GROUP_LOCK of file %s return %d",
-                                filename, rc);
-                        FAIL(errmsg);
-                }
-                MPI_Send(&gid, 1, MPI_INT, 0, 1, MPI_COMM_WORLD);
-        }
-
-        if (rank == 0) {
-                int iter = MAX_WAITING_TIME;
-                int flag1, flag2;
-                
-                /* reading task will tell us when it completes */
-                MPI_Irecv(&temp1, 1, MPI_INT, 1, 1, MPI_COMM_WORLD, &req1);
-                /* 2nd locking task will tell us when it completes */
-                MPI_Irecv(&temp2, 1, MPI_INT, 2, 1, MPI_COMM_WORLD, &req2);
-
-                do {
-                        iter--;
-                        if (!iter) {
-                                FAIL("2nd locking task is not progressing\n");
-                        }
-                        usleep(100);
-                        MPI_Test(&req2, &flag2, MPI_STATUS_IGNORE);
-                        MPI_Test(&req1, &flag1, MPI_STATUS_IGNORE);
-                        if (flag1) {
-                                FAIL("PR task progressed even though GROUP lock"
-                                     " is held\n");
-                        }
-                } while (!flag2);
-        }
-
-        /* Now we need to release the lock */
-
-        if (rank == 2) {
-                if ((rc = ioctl(fd, LL_IOC_GROUP_UNLOCK, gid)) == -1) {
-                        sprintf(errmsg, "ioctl GROUP_UNLOCK of file %s return %d",
-                                filename, rc);
-                        FAIL(errmsg);
-                }
-        }
-
-        if (rank == 0) {
-                int iter = MAX_WAITING_TIME;
-                int flag1;
-                
-                do {
-                        iter--;
-                        usleep(100);
-                        MPI_Test(&req1, &flag1, MPI_STATUS_IGNORE);
-                } while (!flag1 && iter);
-                if (iter) {
-                        FAIL("reading task is progressing even "
-                             "though GROUP lock was not fully released\n");
-                }
-
-                iter = MAX_WAITING_TIME;
-
-                if ((rc = ioctl(fd, LL_IOC_GROUP_UNLOCK, gid)) == -1) {
-                        sprintf(errmsg, "ioctl GROUP_UNLOCK of file %s return %d",
-                                filename, rc);
-                        FAIL(errmsg);
-                }
-                
-                do {
-                        iter--;
-                        if (!iter) {
-                                FAIL("reading task is not progressing even "
-                                     "though GROUP lock was released\n");
-                                break;
-                        }
-                        usleep(100);
-                        MPI_Test(&req1, &flag1, MPI_STATUS_IGNORE);
-                } while (!flag1);
-        }
-
-        MPI_Barrier(MPI_COMM_WORLD);
-
-}
-
-/* 
- * process1 attempts CW(gid=1) -- granted
- * process2 attempts PR on non-blocking fd -> should return -EWOULDBLOCK
- * process3 attempts CW(gid=2) on non-blocking fd -> should return -EWOULDBLOCK
- */
-void grouplock_test4(char *filename, int fd, char *errmsg)
-{
-        int rc, count, gid = 1;
-        char buf[LPGL_FILEN];
-        char zeros[LPGL_FILEN];
-
-        if (rank == 0) {
-                if ((rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid)) == -1) {
-                        sprintf(errmsg, "ioctl GROUP_LOCK of file %s return %d",
-                                filename, rc);
-                        FAIL(errmsg);
-                }
-        }
-
-        MPI_Barrier(MPI_COMM_WORLD);
-
-        if (rank == 1) {
-                memset(zeros, 0x0, sizeof(zeros));
-                lseek(fd, 0, SEEK_SET);
-
-                count = read(fd, buf, sizeof(buf));
-                if (count != sizeof(buf)) {
-                        if (count == -1 && errno == EWOULDBLOCK) {
-                                MPI_Send(&gid, 1, MPI_INT, 0, 1, MPI_COMM_WORLD);
-                                return;
-                        }
-
-                        if (count > 0)
-                                dump_diff(zeros, buf, count, 0);
-                        sprintf(errmsg, "read of file %s return %d",
-                                filename, count);
-                        FAIL(errmsg);
-                } else {
-                        FAIL("PR lock succeed while incompatible "
-                             "GROUP LOCK (gid=1) is still held\n");
-                }
-        }
-
-        if (rank == 2) {
-                gid = 2;
-                if ((rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid)) == -1) {
-                        if (errno == EWOULDBLOCK) {
-                                MPI_Send(&gid, 1, MPI_INT, 0, 1, MPI_COMM_WORLD);
-                                return;
-                        }
-
-                        sprintf(errmsg, "ioctl GROUP_LOCK of file %s return %d",
-                                filename, rc);
-                        FAIL(errmsg);
-                } else {
-                        FAIL("GROUP_LOCK (gid=2) succeed while incompatible "
-                             "GROUP LOCK (gid=1) is still held\n");
-                }
-        }
-
-
-        if ( rank == 0) {
-                int iter = MAX_WAITING_TIME;
-                int flag1, flag2;
-                MPI_Request req1, req2;
-                int temp1, temp2;
-                
-                /* reading task will tell us when it completes */
-                MPI_Irecv(&temp1, 1, MPI_INT, 1, 1, MPI_COMM_WORLD, &req1);
-                /* 2nd locking task will tell us when it completes */
-                MPI_Irecv(&temp2, 1, MPI_INT, 2, 1, MPI_COMM_WORLD, &req2);
-
-                do {
-                        iter--;
-                        if (!iter) {
-                                FAIL("non-blocking tasks are not progressing\n");
-                        }
-                        usleep(100);
-                        MPI_Test(&req2, &flag2, MPI_STATUS_IGNORE);
-                        MPI_Test(&req1, &flag1, MPI_STATUS_IGNORE);
-                } while (!(flag2 && flag1));
-
-                if ((rc = ioctl(fd, LL_IOC_GROUP_UNLOCK, gid)) == -1) {
-                        sprintf(errmsg, "ioctl GROUP_UNLOCK of file %s", filename);
-                        FAIL(errmsg);
-                }
-        }
-}
-
-/*
- * process1 attempts CW(gid=1) -- granted
- * process2 attempts CW(gid=2) -- blocked
- * process3 attempts CW(gid=2) -- blocked
- * process1 releases CW(gid=1)
- *   process2's CW(gid=2) should be granted
- *   process3's CW(gid=2) should be granted
- *
- * This is pretty much like test 3
- */
-void grouplock_test5(char *filename, int fd, char *errmsg)
-{
-        int rc, count, gid = 1;
-        char buf[LPGL_FILEN];
-        char zeros[LPGL_FILEN];
-        MPI_Request req1, req2;
-        int temp1, temp2;
-
-        if (rank == 0) {
-                if ((rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid)) == -1) {
-                        sprintf(errmsg, "ioctl GROUP_LOCK of file %s return %d",
-                                filename, rc);
-                        FAIL(errmsg);
-                }
-        }
-
-        MPI_Barrier(MPI_COMM_WORLD);
-
-        if (rank == 2 || rank == 1) {
-                gid = 2;
-                if ((rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid)) == -1) {
-                        sprintf(errmsg, "ioctl GROUP_LOCK of file %s return %d",
-                                filename, rc);
-                        FAIL(errmsg);
-                }
-                MPI_Send(&gid, 1, MPI_INT, 0, 1, MPI_COMM_WORLD);
-        }
-
-        if (rank == 0) {
-                int iter = MAX_WAITING_TIME;
-                int flag1, flag2;
-                
-                /* 3rd locking task will tell us when it completes */
-                MPI_Irecv(&temp1, 1, MPI_INT, 1, 1, MPI_COMM_WORLD, &req1);
-                /* 2nd locking task will tell us when it completes */
-                MPI_Irecv(&temp2, 1, MPI_INT, 2, 1, MPI_COMM_WORLD, &req2);
-
-                do {
-                        iter--;
-                        usleep(100);
-                        MPI_Test(&req2, &flag2, MPI_STATUS_IGNORE);
-                        MPI_Test(&req1, &flag1, MPI_STATUS_IGNORE);
-                } while (!flag2 && !flag1 && iter);
-                if (iter) {
-                        FAIL("incomptible locking tasks are progressing\n");
-                }
-        }
-
-        /* Now we need to release the lock */
-
-        if (rank == 0) {
-                int iter = MAX_WAITING_TIME;
-                int flag1, flag2;
-                if ((rc = ioctl(fd, LL_IOC_GROUP_UNLOCK, gid)) == -1) {
-                        sprintf(errmsg, "ioctl GROUP_UNLOCK of file %s return %d",
-                                filename, rc);
-                        FAIL(errmsg);
-                }
-                
-                do {
-                        iter--;
-                        if (!iter) {
-                                FAIL("locking tasks are not progressing even "
-                                     "though incompatible lock released\n");
-                        }
-                        usleep(100);
-                        MPI_Test(&req1, &flag1, MPI_STATUS_IGNORE);
-                        MPI_Test(&req2, &flag2, MPI_STATUS_IGNORE);
-                } while (!(flag1 && flag2));
-
-        }
-
-        if ( rank == 1 || rank == 2) {
-                if ((rc = ioctl(fd, LL_IOC_GROUP_UNLOCK, gid)) == -1) {
-                        sprintf(errmsg, "ioctl GROUP_UNLOCK of file %s return %d",
-                                filename, rc);
-                        FAIL(errmsg);
-                }
-        }
-
-        MPI_Barrier(MPI_COMM_WORLD);
-
-
-}
-
-/*
- * process1 attempts CW(gid=1) -- granted
- * process2 attempts PW -- blocked
- * process2 attempts CW(gid=2) -- blocked
- * process3 attempts CW(gid=2) -- blocked
- * process1 releases CW(gid=1)
- *   process2's CW(gid=2) should be granted
- *   process3's CW(gid=2) should be granted
- *
- * after process1 release CW(gid=1), there are two pathes:
- *   path 1. process2 get PW
- *   path 2. process3 get CW(gid=2)
- *
- * green: Also about test6 - by definition if P* and CW lock are waiting,
- *        CW lock have bigger priority and should be granted first when it becomes
- *        possible. So after process1 releases its CW lock, process3 should always
- *        get CW lock, and when it will release it, process 2 will proceed with read
- *        and then with getting CW lock
- *
- * XXX This test does not make any sence at all the way it is described right
- * now, hence disabled.
- */
-void grouplock_test6(char *filename, int fd, char *errmsg)
-{
-}
-
-/* Just test some error paths with invalid requests */
-void grouplock_errorstest(char *filename, int fd, char *errmsg)
-{
-        int gid = 1;
-        int rc;
-
-        /* To not do lots of separate tests with lots of fd opening/closing,
-           different parts of this test are performed in different processes */
-           
-        if (rank == 0 || rank == 1 ) {
-                if ((rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid)) == -1) {
-                        sprintf(errmsg, "ioctl GROUP_LOCK of file %s return %d",
-                                filename, rc);
-                        FAIL(errmsg);
-                }
-        }
-
-        /* second group lock on same fd, same gid */
-        if (rank == 0) {
-                if ((rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid)) == -1) {
-                        if (errno != EINVAL) {
-                                sprintf(errmsg, "Double GROUP lock failed with errno %d instead of EINVAL\n", errno);
-                                FAIL(errmsg);
-                        } 
-                } else {
-                        FAIL("Taking second GROUP lock on same fd succeed\n");
-                }
-        }
-
-        /* second group lock on same fd, different gid */
-        if (rank == 1) {
-                if ((rc = ioctl(fd, LL_IOC_GROUP_LOCK, gid + 1)) == -1) {
-                        if (errno != EINVAL) {
-                                sprintf(errmsg, "Double GROUP lock different gid failed with errno %d instead of EINVAL\n", errno);
-                                FAIL(errmsg);
-                        } 
-                } else {
-                        FAIL("Taking second GROUP lock on same fd, different gid, succeed\n");
-                }
-        }
-
-        /* GROUP unlock with wrong gid */
-        if (rank == 0 || rank == 1) {
-                if ((rc = ioctl(fd, LL_IOC_GROUP_UNLOCK, gid + 1)) == -1) {
-                        if (errno != EINVAL) {
-                                sprintf(errmsg, "GROUP unlock with wrong gid failed with errno %d instead of EINVAL\n",
-                                        errno);
-                                FAIL(errmsg);
-                        } 
-                } else {
-                        FAIL("GROUP unlock with wrong gid succeed\n");
-                }
-        }
-
-        if (rank == 0 || rank == 1) {
-                if ((rc = ioctl(fd, LL_IOC_GROUP_UNLOCK, gid)) == -1) {
-                        sprintf(errmsg, "ioctl GROUP_UNLOCK of file %s return %d",
-                                filename, rc);
-                        FAIL(errmsg);
-                }
-        }
-
-        /* unlock of never locked fd */
-        if (rank == 2) {
-                if ((rc = ioctl(fd, LL_IOC_GROUP_UNLOCK, gid)) == -1) {
-                        if (errno != EINVAL) {
-                                sprintf(errmsg, "GROUP unlock on never locked fd failed with errno %d instead of EINVAL\n",
-                                        errno);
-                                FAIL(errmsg);
-                        } 
-                } else {
-                        FAIL("GROUP unlock on never locked fd succeed\n");
-                }
-        }
-}
-
-void grouplock_file(char *name, int items)
-{
-        int i, fd;
-        char filename[MAX_FILENAME_LEN];
-        char errmsg[MAX_FILENAME_LEN+20];
-
-        sprintf(filename, "%s/%s", testdir, name);
-
-        if (items == 4) {
-                if ((fd = open(filename, O_RDWR | O_NONBLOCK)) == -1) {
-                        sprintf(errmsg, "open of file %s", filename);
-                        FAIL(errmsg);
-                }
-        } else if ((fd = open(filename, O_RDWR)) == -1) {
-                sprintf(errmsg, "open of file %s", filename);
-                FAIL(errmsg);
-        }
-
-        MPI_Barrier(MPI_COMM_WORLD);
-
-        switch (items) {
-        case 1:
-                grouplock_test1(filename, fd, errmsg);
-                break;
-        case 2:
-                grouplock_test2(filename, fd, errmsg);
-                break;
-        case 3:
-                grouplock_test3(filename, fd, errmsg);
-                break;
-        case 4:
-                grouplock_test4(filename, fd, errmsg);
-                break;
-        case 5:
-                grouplock_test5(filename, fd, errmsg);
-                break;
-        case 6:
-                grouplock_test6(filename, fd, errmsg);
-                break;
-        case 7:
-                grouplock_errorstest(filename, fd, errmsg);
-                break;
-        default:
-                sprintf(errmsg, "wrong test case number %d (should be <= %d)",
-                        items, LPGL_TEST_ITEMS);
-                FAIL(errmsg);
-        }
-
-        MPI_Barrier(MPI_COMM_WORLD);
-
-        if (close(fd) == -1) {
-                sprintf(errmsg, "close of file %s", filename);
-                FAIL(errmsg);
-        }
-
-}
-
-void parallel_grouplock(void)
-{
-        int i;
-
-        for (i = 1;i <= LPGL_TEST_ITEMS;++i) {
-                begin("setup");
-                create_file("parallel_grouplock", LPGL_FILEN, 0);
-                end("setup");
-
-                begin("test");
-                grouplock_file("parallel_grouplock", i);
-                end("test");
-
-                begin("cleanup");
-                remove_file("parallel_grouplock");
-                end("cleanup");
-        }
-}
-
-void usage(char *proc)
-{
-        int i;
-
-        if (rank == 0) {
-                printf("Usage: %s [-h] -d <testdir>\n", proc);
-                printf("           [-n \"13\"] [-v] [-V #] [-g]\n");
-                printf("\t-h: prints this help message\n");
-                printf("\t-d: the directory in which the tests will run\n");
-                printf("\t-n: repeat test # times\n");
-                printf("\t-v: increase the verbositly level by 1\n");
-                printf("\t-V: select a specific verbosity level\n");
-                printf("\t-g: debug mode\n");
-        }
-
-        MPI_Initialized(&i);
-        if (i) MPI_Finalize();
-        exit(0);
-}
-
-int main(int argc, char *argv[])
-{
-        char c;
-        int i, iterations = 1;
-        int tr = 1;
-
-        /* Check for -h parameter before MPI_Init so the binary can be
-           called directly, without, for instance, mpirun */
-        for (i = 1; i < argc; ++i) {
-                if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help"))
-                        usage(argv[0]);
-        }
-
-        MPI_Init(&argc, &argv);
-        MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-        MPI_Comm_size(MPI_COMM_WORLD, &size);
-
-//        MPI_Comm_set_attr(MPI_COMM_WORLD, MPI_WTIME_IS_GLOBAL, &tr);
-
-        /* Parse command line options */
-        while (1) {
-                c = getopt(argc, argv, "d:ghn:vV:");
-                if (c == -1)
-                        break;
-
-                switch (c) {
-                case 'd':
-                        testdir = optarg;
-                        break;
-                case 'g':
-                        debug = 1;
-                        break;
-                case 'h':
-                        usage(argv[0]);
-                        break;
-                case 'n':
-                        iterations = atoi(optarg);
-                        break;
-                case 'v':
-                        verbose += 1;
-                        break;
-                case 'V':
-                        verbose = atoi(optarg);
-                        break;
-                }
-        }
-
-        if (rank == 0)
-                printf("%s is running with %d process(es) %s\n",
-                       argv[0], size, debug ? "in DEBUG mode" : "\b\b");
-
-        if (size < MAX_GLHOST) {
-                fprintf(stderr, "Error: "
-                        "should be at least four processes to run the test!\n");
-                MPI_Abort(MPI_COMM_WORLD, 2);
-        }
-
-        if (testdir == NULL && rank == 0) {
-                fprintf(stderr, "Please specify a test directory! (\"%s -h\" for help)\n",
-                       argv[0]);
-                MPI_Abort(MPI_COMM_WORLD, 2);
-        }
-
-        lp_gethostname();
-
-        for (i = 0; i < iterations; ++i) {
-                if (rank == 0)
-                        printf("%s: Running test #%s(iter %d)\n",
-                               timestamp(), argv[0], i);
-
-                parallel_grouplock();
-                MPI_Barrier(MPI_COMM_WORLD);
-        }
-
-        if (rank == 0) {
-                printf("%s: All tests passed!\n", timestamp());
-        }
-        MPI_Finalize();
-        return 0;
-}
diff --git a/lustre/tests/recovery-cleanup.sh b/lustre/tests/recovery-cleanup.sh
index 77b5646..e4eefd0 100755
--- a/lustre/tests/recovery-cleanup.sh
+++ b/lustre/tests/recovery-cleanup.sh
@@ -27,7 +27,6 @@ MDSSIZE=${MDSSIZE:-100000}
 FSTYPE=${FSTYPE:-ext3}
 OSTDEV=${OSTDEV:-/tmp/ost1-`hostname`}
 OSTSIZE=${OSTSIZE:-100000}
-STRIPE_BYTES=${STRIPE_BYTES:-1048576}
 
 do_mds() {
     $PDSH $MDSNODE "PATH=\$PATH:$LUSTRE/utils:$LUSTRE/tests; cd $PWD; $@" || exit $?
@@ -55,7 +54,7 @@ make_config() {
     done
     lmc -m $CONFIG --add mds --node $MDSNODE --mds mds1 --fstype $FSTYPE \
     	--dev $MDSDEV --size $MDSSIZE || exit 5
-    lmc -m $CONFIG --add lov --lov lov1 --mds mds1 --stripe_sz $STRIPE_BYTES \
+    lmc -m $CONFIG --add lov --lov lov1 --mds mds1 --stripe_sz 65536 \
         --stripe_cnt 0 --stripe_pattern 0 || exit 6
     lmc -m $CONFIG --add ost --nspath /mnt/ost_ns --node $OSTNODE \
         --lov lov1 --dev $OSTDEV --size $OSTSIZE --fstype $FSTYPE || exit 7
diff --git a/lustre/tests/recovery-small-upcall.sh b/lustre/tests/recovery-small-upcall.sh
index b1ad60c..02e9f69 100755
--- a/lustre/tests/recovery-small-upcall.sh
+++ b/lustre/tests/recovery-small-upcall.sh
@@ -1,4 +1,3 @@
 #!/bin/sh
 LUSTRE=`dirname $0`/..
-PATH=$LUSTRE/utils:$PATH
-lctl --device %$3 recover || logger -p kern.info recovery failed: $@
+$LUSTRE/utils/lctl --device %$3 recover || logger -p kern.info recovery failed: $@
diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh
index 3eebfb1..584cd727 100755
--- a/lustre/tests/recovery-small.sh
+++ b/lustre/tests/recovery-small.sh
@@ -2,8 +2,8 @@
 
 set -e
 
-#         bug  2986
-ALWAYS_EXCEPT="20b"
+# 17 = bug 2732
+ALWAYS_EXCEPT="17"
 
 
 LUSTRE=${LUSTRE:-`dirname $0`/..}
@@ -12,7 +12,7 @@ UPCALL=${UPCALL:-$PWD/recovery-small-upcall.sh}
 
 init_test_env $@
 
-. ${CONFIG:=$LUSTRE/tests/cfg/local.sh}
+. ${CONFIG:=$LUSTRE/tests/cfg/lmv.sh}
 
 build_test_filter
 
@@ -22,15 +22,28 @@ build_test_filter
 SETUP=${SETUP:-"setup"}
 CLEANUP=${CLEANUP:-"cleanup"}
 
-
 make_config() {
     rm -f $XMLCONFIG
-    add_mds mds --dev $MDSDEV --size $MDSSIZE
-    add_lov lov1 mds --stripe_sz $STRIPE_BYTES \
-	--stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0
-    add_ost ost --lov lov1 --dev $OSTDEV --size $OSTSIZE
-    add_ost ost2 --lov lov1 --dev ${OSTDEV}-2 --size $OSTSIZE
-    add_client client mds --lov lov1 --path $MOUNT
+
+    if [ "$MDSCOUNT" -gt 1 ]; then
+        add_lmv lmv1
+        for num in `seq $MDSCOUNT`; do
+            MDSDEV=$TMP/mds${num}-`hostname`
+            add_mds mds$num --dev $MDSDEV --size $MDSSIZE --master --lmv lmv1
+        done
+        add_lov_to_lmv lov1 lmv1 --stripe_sz $STRIPE_BYTES \
+	    --stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0
+        add_ost ost --lov lov1 --dev $OSTDEV --size $OSTSIZE
+        add_ost ost2 --lov lov1 --dev ${OSTDEV}-2 --size $OSTSIZE
+        add_client client --lmv lmv1 --lov lov1 --path $MOUNT
+    else
+        add_mds mds1 --dev $MDSDEV --size $MDSSIZE
+        add_lov lov1 mds1 --stripe_sz $STRIPE_BYTES \
+	    --stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0
+        add_ost ost --lov lov1 --dev $OSTDEV --size $OSTSIZE
+        add_ost ost2 --lov lov1 --dev ${OSTDEV}-2 --size $OSTSIZE
+        add_client client --mds mds1_svc --lov lov1 --path $MOUNT
+    fi
 }
 
 setup() {
@@ -38,32 +51,39 @@ setup() {
     start ost --reformat $OSTLCONFARGS 
     start ost2 --reformat $OSTLCONFARGS 
     [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE
-    start mds $MDSLCONFARGS --reformat
-    grep " $MOUNT " /proc/mounts || zconf_mount `hostname`  $MOUNT
+    if [ "$MDSCOUNT" -gt 1 ]; then
+        for num in `seq $MDSCOUNT`; do
+            start mds$num $MDSLCONFARGS --reformat
+        done
+    else
+        start mds $MDSLCONFARGS --reformat
+    fi
+    zconf_mount `hostname`  $MOUNT
 }
 
 cleanup() {
     zconf_umount `hostname` $MOUNT
-    stop mds ${FORCE} $MDSLCONFARGS
+    if [ "$MDSCOUNT" -gt 1 ]; then
+        for num in `seq $MDSCOUNT`; do
+            stop mds$num ${FORCE} $MDSLCONFARGS
+        done
+    else
+        stop mds ${FORCE} $MDSLCONFARGS
+    fi
     stop ost2 ${FORCE} --dump cleanup.log
     stop ost ${FORCE} --dump cleanup.log
 }
 
-replay() {
-    do_mds "sync"
-    do_mds 'echo -e "device \$mds1\\nprobe\\nnotransno\\nreadonly" | lctl'
-    do_client "$1" &
-    shutdown_mds -f
-    start_mds
-    wait
-    do_client "df -h $MOUNT" # trigger failover, if we haven't already
-}
-
 if [ ! -z "$EVAL" ]; then
     eval "$EVAL"
     exit $?
 fi
 
+if [ "$ONLY" == "setup" ]; then
+    setup
+    exit
+fi
+
 if [ "$ONLY" == "cleanup" ]; then
     sysctl -w portals.debug=0 || true
     cleanup
@@ -117,12 +137,14 @@ test_7() {
 }
 run_test 7 "unlink: drop req, drop rep"
 
+
 #bug 1423
 test_8() {
     drop_reint_reply "touch $MOUNT/renamed"    || return 1
 }
 run_test 8 "touch: drop rep (bug 1423)"
 
+
 #bug 1420
 test_9() {
     pause_bulk "cp /etc/profile $MOUNT"       || return 1
@@ -208,69 +230,47 @@ test_15() {
 run_test 15 "failed open (-ENOMEM)"
 
 test_16() {
+# OBD_FAIL_PTLRPC_BULK_PUT_NET | OBD_FAIL_ONCE
     do_facet client cp /etc/termcap $MOUNT
     sync
 
-#define OBD_FAIL_PTLRPC_BULK_PUT_NET 0x504 | OBD_FAIL_ONCE
     sysctl -w lustre.fail_loc=0x80000504
     cancel_lru_locks OSC
-    # will get evicted here
-    do_facet client "cmp /etc/termcap $MOUNT/termcap"  && return 1
+    # wil get evicted here
+    do_facet client "diff /etc/termcap $MOUNT/termcap"  && return 1
     sysctl -w lustre.fail_loc=0
-    # give recovery a chance to finish (shouldn't take long)
-    sleep $TIMEOUT
-    do_facet client "cmp /etc/termcap $MOUNT/termcap"  || return 2
+    do_facet client "diff /etc/termcap $MOUNT/termcap"  || return 2
+
 }
 run_test 16 "timeout bulk put, evict client (2732)"
 
 test_17() {
-    # OBD_FAIL_PTLRPC_BULK_GET_NET 0x0503 | OBD_FAIL_ONCE
-    # client will get evicted here
+# OBD_FAIL_PTLRPC_BULK_GET_NET | OBD_FAIL_ONCE
+    # wil get evicted here
     sysctl -w lustre.fail_loc=0x80000503
-    do_facet client cp /etc/termcap $DIR/$tfile
+    do_facet client cp /etc/termcap $MOUNT && return 1
+
+    do_facet client "diff /etc/termcap $MOUNT/termcap"  && return 1
     sysctl -w lustre.fail_loc=0
+    do_facet client "diff /etc/termcap $MOUNT/termcap"  || return 2
 
-    sleep $TIMEOUT
-    # expect cmp to fail
-    do_facet client "cmp /etc/termcap $DIR/$tfile"  && return 1
-    do_facet client "rm $DIR/$tfile" || return 2
-    return 0
 }
 run_test 17 "timeout bulk get, evict client (2732)"
 
-test_18a() {
-    do_facet client mkdir -p $MOUNT/$tdir
-    f=$MOUNT/$tdir/$tfile
-
-    cancel_lru_locks OSC
-    pgcache_empty || return 1
-
-    # 1 stripe on ost2
-    lfs setstripe $f $((128 * 1024)) 1 1
-
-    do_facet client cp /etc/termcap $f
-    sync
-    local osc2_dev=`$LCTL device_list | \
-	awk '(/ost2.*client_facet/){print $4}' `
-    $LCTL --device %$osc2_dev deactivate
-    # my understanding is that there should be nothing in the page
-    # cache after the client reconnects?     
-    rc=0
-    pgcache_empty || rc=2
-    $LCTL --device %$osc2_dev activate
-    rm -f $f
-    return $rc
-}
-run_test 18a "manual ost invalidate clears page cache immediately"
-
-test_18b() {
+test_18() {
 # OBD_FAIL_PTLRPC_BULK_PUT_NET|OBD_FAIL_ONCE
     do_facet client mkdir -p $MOUNT/$tdir
     f=$MOUNT/$tdir/$tfile
     f2=$MOUNT/$tdir/${tfile}-2
 
     cancel_lru_locks OSC
-    pgcache_empty || return 1
+    for a in /proc/fs/lustre/llite/*/dump_page_cache; do
+        if [ `wc -l $a | awk '{print $1}'` -gt 1 ]; then
+                echo there is still data in page cache $a ?
+                cat $a;
+                return 1;
+        fi
+    done
 
     # shouldn't have to set stripe size of count==1
     lfs setstripe $f $((128 * 1024)) 0 1
@@ -284,64 +284,17 @@ test_18b() {
     sync
     sysctl -w lustre.fail_loc=0
     # allow recovery to complete
-    sleep $((TIMEOUT + 2))
+    sleep 10
     # my understanding is that there should be nothing in the page
     # cache after the client reconnects?     
-    rc=0
-    pgcache_empty || rc=2
-    rm -f $f $f2
-    return $rc
-}
-run_test 18b "eviction and reconnect clears page cache (2766)"
-
-test_19a() {
-    f=$MOUNT/$tfile
-    do_facet client mcreate $f        || return 1
-    drop_ldlm_cancel "chmod 0777 $f"  || echo evicted
-
-    do_facet client checkstat -v -p 0777 $f  || echo evicted
-    do_facet client "munlink $f"
-}
-run_test 19a "test expired_lock_main on mds (2867)"
-
-test_19b() {
-    f=$MOUNT/$tfile
-    do_facet client multiop $f Ow  || return 1
-    do_facet client multiop $f or  || return 2
-
-    cancel_lru_locks OSC
-
-    do_facet client multiop $f or  || return 3
-    drop_ldlm_cancel multiop $f Ow  || echo "client evicted, as expected"
-
-    do_facet client munlink $f  || return 4
-}
-run_test 19b "test expired_lock_main on ost (2867)"
-
-test_20a() {	# bug 2983 - ldlm_handle_enqueue cleanup
-	mkdir -p $DIR/$tdir
-	multiop $DIR/$tdir/${tfile} O_wc &
-	MULTI_PID=$!
-	usleep 500
-	cancel_lru_locks OSC
-#define OBD_FAIL_LDLM_ENQUEUE_EXTENT_ERR 0x308
-	do_facet ost sysctl -w lustre.fail_loc=0x80000308
-	kill -USR1 $MULTI_PID
-	wait $MULTI_PID
-	rc=$?
-	[ $rc -eq 0 ] && error "multiop didn't fail enqueue: rc $rc" || true
-}
-run_test 20a "ldlm_handle_enqueue error (should return error)" 
-
-test_20b() {	# bug 2986 - ldlm_handle_enqueue error during open
-	mkdir -p $DIR/$tdir
-	touch $DIR/$tdir/${tfile}
-	cancel_lru_locks OSC
-#define OBD_FAIL_LDLM_ENQUEUE_EXTENT_ERR 0x308
-	do_facet ost sysctl -w lustre.fail_loc=0x80000308
-	dd if=/etc/hosts of=$DIR/$tdir/$tfile && \
-		error "didn't fail open enqueue" || true
+    for a in /proc/fs/lustre/llite/*/dump_page_cache; do
+        if [ `wc -l $a | awk '{print $1}'` -gt 1 ]; then
+                echo there is still data in page cache $a ?
+                cat $a;
+                return 1;
+        fi
+    done
 }
-run_test 20b "ldlm_handle_enqueue error (should return error)"
+run_test 18 "eviction and reconnect clears page cache (2766)"
 
 $CLEANUP
diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh
index 3c84d8d..8e10631 100755
--- a/lustre/tests/replay-dual.sh
+++ b/lustre/tests/replay-dual.sh
@@ -16,7 +16,7 @@ gen_config() {
 	 add_mdsfailover mds --dev $MDSDEV --size $MDSSIZE
     fi
     
-    add_lov lov1 mds --stripe_sz $STRIPE_BYTES \
+    add_lov lov1 mds --stripe_sz $STRIPE_BYTES\
 	--stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0
     add_ost ost --lov lov1 --dev $OSTDEV --size $OSTSIZE
     add_ost ost2 --lov lov1 --dev ${OSTDEV}-2 --size $OSTSIZE
@@ -62,8 +62,8 @@ fi
 start ost2 --reformat $OSTLCONFARGS 
 [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE
 start mds $MDSLCONFARGS --reformat
-grep " $MOUNT " /proc/mounts || zconf_mount `hostname` $MOUNT
-grep " $MOUNT2 " /proc/mounts || zconf_mount `hostname` $MOUNT2
+zconf_mount `hostname` $MOUNT
+zconf_mount `hostname` $MOUNT2
 
 echo $TIMEOUT > /proc/sys/lustre/timeout
 echo $UPCALL > /proc/sys/lustre/upcall
diff --git a/lustre/tests/replay-ost-single.sh b/lustre/tests/replay-ost-single.sh
index 247c1f0..4cb5131 100755
--- a/lustre/tests/replay-ost-single.sh
+++ b/lustre/tests/replay-ost-single.sh
@@ -18,7 +18,7 @@ ALWAYS_EXCEPT="5"
 gen_config() {
     rm -f $XMLCONFIG
     add_mds mds --dev $MDSDEV --size $MDSSIZE
-    add_lov lov1 mds --stripe_sz $STRIPE_BYTES \
+    add_lov lov1 mds --stripe_sz $STRIPE_BYTES\
 	--stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0
     add_ost ost --lov lov1 --dev $OSTDEV --size $OSTSIZE --failover
     if [ ! -z "$ostfailover_HOST" ]; then
@@ -56,7 +56,7 @@ setup() {
     start ost --reformat $OSTLCONFARGS
     [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE
     start mds --reformat $MDSLCONFARGS
-    grep " $MOUNT " /proc/mounts || zconf_mount `hostname` $MOUNT
+    zconf_mount `hostname` $MOUNT
 }
 
 mkdir -p $DIR
@@ -94,7 +94,7 @@ run_test 2 "|x| 10 open(O_CREAT)s"
 
 test_3() {
     verify=$ROOT/tmp/verify-$$
-    dd if=/dev/urandom bs=4096 count=1280 | tee $verify > $DIR/$tfile &
+    dd if=/dev/urandom bs=1024 count=5120 | tee $verify > $DIR/$tfile &
     ddpid=$!
     sync &
     fail ost
@@ -106,7 +106,7 @@ run_test 3 "Fail OST during write, with verification"
 
 test_4() {
     verify=$ROOT/tmp/verify-$$
-    dd if=/dev/urandom bs=4096 count=1280 | tee $verify > $DIR/$tfile
+    dd if=/dev/urandom bs=1024 count=5120 | tee $verify > $DIR/$tfile
     # invalidate cache, so that we're reading over the wire
     for i in /proc/fs/lustre/ldlm/namespaces/OSC_*MNT*; do
         echo -n clear > $i/lru_size
@@ -137,16 +137,17 @@ kbytesfree() {
 
 test_6() {
     f=$DIR/$tfile
-    rm -f $f
-    sync && sleep 2 && sync	# wait for delete thread
+    rm $f 2>/dev/null && sync && sleep 2 && sync	# wait for delete thread
+    grep [0-9] /proc/fs/lustre/osc/OSC*MNT*/kbytes*
     before=`kbytesfree`
-    dd if=/dev/urandom bs=4096 count=1280 of=$f
+    dd if=/dev/urandom bs=1024 count=5120 of=$f
 #define OBD_FAIL_MDS_REINT_NET_REP       0x119
     do_facet mds "sysctl -w lustre.fail_loc=0x80000119"
     sync
     sleep 1					# ensure we have a fresh statfs
+    grep [0-9] /proc/fs/lustre/osc/OSC*MNT*/kbytes*
     after_dd=`kbytesfree`
-    log "before: $before after_dd: $after_dd"
+    echo "before: $before after_dd: $after_dd"
     (( $before > $after_dd )) || return 1
     rm -f $f
     fail ost
@@ -154,22 +155,21 @@ test_6() {
     sync
     # let the delete happen
     sleep 2
+    grep [0-9] /proc/fs/lustre/osc/OSC*MNT*/kbytes*
     after=`kbytesfree`
-    log "before: $before after: $after"
+    echo "before: $before after: $after"
     (( $before <= $after + 40 )) || return 3	# take OST logs into account
 }
 run_test 6 "Fail OST before obd_destroy"
 
 test_7() {
     f=$DIR/$tfile
-    rm -f $f
-    sync && sleep 2 && sync	# wait for delete thread
     before=`kbytesfree`
-    dd if=/dev/urandom bs=4096 count=1280 of=$f
+    dd if=/dev/urandom bs=1024 count=5120 of=$f
     sync
     after_dd=`kbytesfree`
-    log "before: $before after_dd: $after_dd"
-    (( $before > $after_dd )) || return 1
+    echo "before: $before after_dd: $after_dd"
+    (( before > after_dd )) || return 1
     replay_barrier ost
     rm -f $f
     fail ost
@@ -178,8 +178,8 @@ test_7() {
     # let the delete happen
     sleep 2
     after=`kbytesfree`
-    log "before: $before after: $after"
-    (( $before <= $after + 40 )) || return 3	# take OST logs into account
+    echo "before: $before after: $after"
+    (( before == after )) || return 3
 }
 run_test 7 "Fail OST before obd_destroy"
 
diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index 89cd32c..4fb7d51 100755
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -11,7 +11,7 @@ LUSTRE=${LUSTRE:-`dirname $0`/..}
 
 init_test_env $@
 
-. ${CONFIG:=$LUSTRE/tests/cfg/local.sh}
+. ${CONFIG:=$LUSTRE/tests/cfg/lmv.sh}
 
 # Skip these tests
 ALWAYS_EXCEPT=""
@@ -19,16 +19,30 @@ ALWAYS_EXCEPT=""
 
 gen_config() {
     rm -f $XMLCONFIG
-    add_mds mds --dev $MDSDEV --size $MDSSIZE
-    if [ ! -z "$mdsfailover_HOST" ]; then
-	 add_mdsfailover mds --dev $MDSDEV --size $MDSSIZE
+
+    if [ "$MDSCOUNT" -gt 1 ]; then
+        add_lmv lmv1
+        for num in `seq $MDSCOUNT`; do
+            MDSDEV=$TMP/mds${num}-`hostname`
+            add_mds mds$num --dev $MDSDEV --size $MDSSIZE --master --lmv lmv1
+        done
+        add_lov_to_lmv lov1 lmv1 --stripe_sz $STRIPE_BYTES \
+	    --stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0
+        add_ost ost --lov lov1 --dev $OSTDEV --size $OSTSIZE
+        add_ost ost2 --lov lov1 --dev ${OSTDEV}-2 --size $OSTSIZE
+        add_client client --lmv lmv1 --lov lov1 --path $MOUNT
+    else
+        add_mds mds1 --dev $MDSDEV --size $MDSSIZE
+        if [ ! -z "$mdsfailover_HOST" ]; then
+	     add_mdsfailover mds --dev $MDSDEV --size $MDSSIZE
+        fi
+
+        add_lov lov1 mds1 --stripe_sz $STRIPE_BYTES \
+	    --stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0
+        add_ost ost --lov lov1 --dev $OSTDEV --size $OSTSIZE
+        add_ost ost2 --lov lov1 --dev ${OSTDEV}-2 --size $OSTSIZE
+        add_client client --mds mds1_svc --lov lov1 --path $MOUNT
     fi
-    
-    add_lov lov1 mds --stripe_sz $STRIPE_BYTES \
-	--stripe_cnt $STRIPES_PER_OBJ --stripe_pattern 0
-    add_ost ost --lov lov1 --dev $OSTDEV --size $OSTSIZE
-    add_ost ost2 --lov lov1 --dev ${OSTDEV}-2 --size $OSTSIZE
-    add_client client mds --lov lov1 --path $MOUNT
 }
 
 build_test_filter
@@ -41,7 +55,13 @@ cleanup() {
         fail mds
     fi
     zconf_umount `hostname` $MOUNT
-    stop mds ${FORCE} $MDSLCONFARGS
+    if [ "$MDSCOUNT" -gt 1 ]; then
+        for num in `seq $MDSCOUNT`; do
+            stop mds$num ${FORCE} $MDSLCONFARGS
+        done
+    else
+        stop mds ${FORCE} $MDSLCONFARGS
+    fi
     stop ost2 ${FORCE} --dump cleanup.log
     stop ost ${FORCE} --dump cleanup.log
 }
@@ -61,8 +81,15 @@ setup() {
     start ost --reformat $OSTLCONFARGS 
     start ost2 --reformat $OSTLCONFARGS 
     [ "$DAEMONFILE" ] && $LCTL debug_daemon start $DAEMONFILE $DAEMONSIZE
-    start mds $MDSLCONFARGS --reformat
-    grep " $MOUNT " /proc/mounts || zconf_mount `hostname` $MOUNT
+    if [ "$MDSCOUNT" -gt 1 ]; then
+        for num in `seq $MDSCOUNT`; do
+            start mds$num $MDSLCONFARGS --reformat
+        done
+    else
+        start mds $MDSLCONFARGS --reformat
+    fi
+    zconf_mount `hostname` $MOUNT
+    echo 0x3f0410 > /proc/sys/portals/debug
 }
 
 $SETUP
@@ -74,24 +101,15 @@ fi
 mkdir -p $DIR
 
 test_0() {
-    replay_barrier mds
-    fail mds
+    replay_barrier mds1
+    fail mds1
 }
 run_test 0 "empty replay"
 
-test_0b() {
-    # this test attempts to trigger a race in the precreation code, 
-    # and must run before any other objects are created on the filesystem
-    fail ost
-    createmany -o $DIR/$tfile 20 || return 1
-    unlinkmany $DIR/$tfile 20 || return 2
-}
-run_test 0b "ensure object created after recover exists. (3284)"
-
 test_1() {
-    replay_barrier mds
+    replay_barrier mds2
     mcreate $DIR/$tfile
-    fail mds
+    fail mds2
     $CHECKSTAT -t file $DIR/$tfile || return 1
     rm $DIR/$tfile
 }
@@ -387,7 +405,6 @@ test_18() {
     sleep 1 
     rm -f $DIR/$tfile
     touch $DIR/$tfile-2 || return 1
-    echo "pid: $pid will close"
     kill -USR1 $pid
     wait $pid || return 2
 
@@ -833,19 +850,19 @@ run_test 41 "read from a valid osc while other oscs are invalid"
 
 # test MDS recovery after ost failure
 test_42() {
-    blocks=`df $MOUNT | tail -n 1 | awk '{ print $1 }'`
+    blocks=`df $MOUNT | tail -1 | awk '{ print $1 }'`
     createmany -o $DIR/$tfile-%d 800
     replay_barrier ost
     unlinkmany $DIR/$tfile-%d 0 400
     facet_failover ost
     
     # osc is evicted, fs is smaller
-    blocks_after=`df $MOUNT | tail -n 1 | awk '{ print $1 }'`
+    blocks_after=`df $MOUNT | tail -1 | awk '{ print $1 }'`
     [ $blocks_after -lt $blocks ] || return 1
     echo wait for MDS to timeout and recover
     sleep $((TIMEOUT * 2))
     unlinkmany $DIR/$tfile-%d 400 400
-    $CHECKSTAT -t file $DIR/$tfile-* && return 2 || true
+    $CHECKSTAT -t file $DIR/$tfile-* && return 1 || true
 }
 run_test 42 "recovery after ost failure"
 
@@ -875,41 +892,6 @@ test_44() {
 }
 run_test 44 "race in target handle connect"
 
-# Handle failed close
-test_45() {
-    mdcdev=`awk '/mds_svc_MNT/ {print $1}' < /proc/fs/lustre/devices`
-    $LCTL --device $mdcdev recover
-
-    multiop $DIR/$tfile O_c &
-    pid=$!
-    sleep 1
-
-    # This will cause the CLOSE to fail before even 
-    # allocating a reply buffer
-    $LCTL --device $mdcdev deactivate
-
-    # try the close
-    kill -USR1 $pid
-    wait $pid || return 1
-
-    $LCTL --device $mdcdev activate
-
-    $CHECKSTAT -t file $DIR/$tfile || return 2
-    return 0
-}
-run_test 45 "Handle failed close"
-
-test_46() {
-    dmesg -c >/dev/null
-    drop_reply "touch $DIR/$tfile"
-    fail mds
-    # ironically, the previous test, 45, will cause a real forced close,
-    # so just look for one for this test
-    dmesg | grep -i "force closing client file handle for $tfile" && return 1
-    return 0
-}
-run_test 46 "Don't leak file handle after open resend (3325)"
-
 equals_msg test complete, cleaning up
 $CLEANUP
 
diff --git a/lustre/tests/run-llog.sh b/lustre/tests/run-llog.sh
index b7201f2..5d46e2b 100644
--- a/lustre/tests/run-llog.sh
+++ b/lustre/tests/run-llog.sh
@@ -2,7 +2,7 @@
 PATH=`dirname $0`:`dirname $0`/../utils:$PATH
 TMP=${TMP:-/tmp}
 
-MDS=`ls /proc/fs/lustre/mds | grep -v num_refs | head -n 1`
+MDS=`ls /proc/fs/lustre/mds | grep -v num_refs | head -1`
 [ -z "$MDS" ] && echo "no MDS available, skipping llog test" && exit 0
 
 insmod ../obdclass/llog_test.o || exit 1
diff --git a/lustre/tests/run_lfscktest.sh b/lustre/tests/run_lfscktest.sh
deleted file mode 100755
index cd3562a..0000000
--- a/lustre/tests/run_lfscktest.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. ./lfscktest_config.sh
-
-#create xml file for config
-${CONFIG} ${CONFIGXML} || exit 1
-
-#Mount lustre
-${LCONF} --reformat ${CONFIGXML} || exit 1
-
-export LUSTRE_BUILD=${LUSTRE_BUILD:-`$LCTL lustre_build_version | awk '/^lctl/ {print $3}'`}
-rm -f ${LOG}
-#Run test 
-sh -vx lfscktest.sh 2>&1 | tee $LOG
-RESULT=$?
-[ ${RESULT} -eq 0 ] && echo PASS || echo FAIL
-
-#Umount Lustre 
-$LCONF --cleanup $CONFIGXML
-exit $RESULT
diff --git a/lustre/tests/runas.c b/lustre/tests/runas.c
index 91c9c7f..1e859aa 100644
--- a/lustre/tests/runas.c
+++ b/lustre/tests/runas.c
@@ -6,22 +6,17 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <ctype.h>
 #include <sys/types.h>
 #include <grp.h>
 #include <sys/wait.h>
 
 #define DEBUG 0
 
-#ifndef NGROUPS_MAX
-#define NGROUPS_MAX 32
-#endif
-
 static const char usage[] =
 "Usage: %s -u user_id [-g grp_id ] [ -G ] command\n"
-"  -u user_id           switch to UID user_id\n"
-"  -g grp_id            switch to GID grp_id\n"
-"  -G[gid0,gid1,...]    set supplementary groups\n";
+"  -u user_id      switch to UID user_id\n"
+"  -g grp_id       switch to GID grp_id\n"
+"  -G              clear supplementary groups\n";
 
 void Usage_and_abort(const char *name)
 {
@@ -31,17 +26,20 @@ void Usage_and_abort(const char *name)
 
 int main(int argc, char **argv)
 {
-        char **my_argv, *name = argv[0], *grp;
-        int status, c, i;
-        int gid_is_set = 0, uid_is_set = 0, num_supp = -1;
-        uid_t user_id = 0;
-        gid_t grp_id = 0, supp_groups[NGROUPS_MAX] = { 0 };
+        char **my_argv, *name = argv[0];
+        int status;
+        int c,i;
+        int gid_is_set = 0;
+        int uid_is_set = 0;
+        int clear_supp_groups = 0;
+        uid_t user_id;
+        gid_t grp_id;
 
         if (argc == 1)
                 Usage_and_abort(name);
 
         // get UID and GID
-        while ((c = getopt(argc, argv, "+u:g:hG::")) != -1) {
+        while ((c = getopt (argc, argv, "+u:g:hG")) != -1) {
                 switch (c) {
                 case 'u':
                         user_id = (uid_t)atoi(optarg);
@@ -56,15 +54,7 @@ int main(int argc, char **argv)
                         break;
 
                 case 'G':
-                        num_supp = 0;
-                        if (optarg == NULL || !isdigit(optarg[0]))
-                                break;
-                        while ((grp = strsep(&optarg, ",")) != NULL) {
-                                printf("adding supp group %d\n", atoi(grp));
-                                supp_groups[num_supp++] = atoi(grp);
-                                if (num_supp >= NGROUPS_MAX)
-                                        break;
-                        }
+                        clear_supp_groups = 1;
                         break;
 
                 default:
@@ -108,14 +98,14 @@ int main(int argc, char **argv)
                  exit(-1);
         }
 
-        if (num_supp >= 0) {
-                status = setgroups(num_supp, supp_groups);
+        if (clear_supp_groups) {
+                status = setgroups(0, NULL);
                 if (status == -1) {
-                        perror("setting supplementary groups");
+                        perror("clearing supplementary groups");
                         exit(-1);
                 }
         }
-
+        
         // set UID
         status = setreuid(user_id, user_id );
         if(status == -1) {
@@ -124,10 +114,8 @@ int main(int argc, char **argv)
                   exit(-1);
         }
 
-        fprintf(stderr, "running as UID %d, GID %d", user_id, grp_id);
-        for (i = 0; i < num_supp; i++)
-                fprintf(stderr, ":%d", supp_groups[i]);
-        fprintf(stderr, "\n");
+        fprintf(stderr, "running as UID %d, GID %d%s:", user_id, grp_id,
+                clear_supp_groups ? ", cleared groups" : "");
 
         for (i = 0; i < argc - optind; i++)
                  fprintf(stderr, " [%s]", my_argv[i]);
diff --git a/lustre/tests/runregression-brw.sh b/lustre/tests/runregression-brw.sh
index 666b253..34a55b0 100644
--- a/lustre/tests/runregression-brw.sh
+++ b/lustre/tests/runregression-brw.sh
@@ -9,7 +9,7 @@ COUNT_100=`expr $COUNT / 100`
 
 ENDRUN=endrun-`hostname`
 
-ECHONAME="`lctl device_list 2> /dev/null | awk '/ echo_client / { print $4 }' | tail -n 1`"
+ECHONAME="`lctl device_list 2> /dev/null | awk '/ echo_client / { print $4 }' | tail -1`"
 
 if [ -z "$ECHONAME" ]; then
 	echo "$0: needs an ECHO_CLIENT set up first" 1>&2
diff --git a/lustre/tests/runregression-mds.sh b/lustre/tests/runregression-mds.sh
index 7167d2d..ecfe0d9 100755
--- a/lustre/tests/runregression-mds.sh
+++ b/lustre/tests/runregression-mds.sh
@@ -23,11 +23,11 @@ cleanup() {
 
 [ -z "$*" ] && fail "usage: $0 [--reformat] <conf>.xml" 1
 
-OSCMT="`mount | awk '/ lustre_lite / { print $3 }' | tail -n 1`"
+OSCMT="`mount | awk '/ lustre_lite / { print $3 }' | tail -1`"
 if [ -z "$OSCMT" ]; then
 	$LCONF $@ || exit 1
         trap cleanup 0
-	OSCMT="`mount | awk '/ lustre_lite / { print $3 }' | tail -n 1`"
+	OSCMT="`mount | awk '/ lustre_lite / { print $3 }' | tail -1`"
 	[ -z "$OSCMT" ] && fail "no lustre filesystem mounted" 1
 fi
 
@@ -42,7 +42,7 @@ while [ "$1" ]; do
 done
 
 OSCTMP=`echo $OSCMT | tr "/" "."`
-USED=`df | awk "/$OSCTMP/ { print \\$3 }" | tail -n 1`
+USED=`df | awk "/$OSCTMP/ { print \\$3 }" | tail -1`
 USED=`expr $USED + 16`	# Some space for the status file
 
 THREADS=1
@@ -58,7 +58,7 @@ done
 
 rm -f $ENDRUN
 
-NOWUSED=`df | awk "/$OSCTMP/ { print \\$3 }" | tail -n 1`
+NOWUSED=`df | awk "/$OSCTMP/ { print \\$3 }" | tail -1`
 if [ $NOWUSED -gt $USED ]; then
 	echo "Space not all freed: now ${NOWUSED}kB, was ${USED}kB." 1>&2
 	echo "This is normal on BA OSTs, because of subdirectories." 1>&2
diff --git a/lustre/tests/runregression-net.sh b/lustre/tests/runregression-net.sh
index 77d6768..73e81ca 100644
--- a/lustre/tests/runregression-net.sh
+++ b/lustre/tests/runregression-net.sh
@@ -9,7 +9,7 @@ COUNT_1000=`expr $COUNT / 1000`
 
 ENDRUN=endrun-`hostname`
 
-ECHONAME="`lctl device_list 2> /dev/null | awk '/ echo_client / { print $4 }' | tail -n 1`"
+ECHONAME="`lctl device_list 2> /dev/null | awk '/ echo_client / { print $4 }' | tail -1`"
 
 if [ -z "$ECHONAME" ]; then
 	echo "$0: needs an ECHO_CLIENT set up first" 1>&2
diff --git a/lustre/tests/runtests b/lustre/tests/runtests
index d97bdea..6a8aac8 100755
--- a/lustre/tests/runtests
+++ b/lustre/tests/runtests
@@ -35,16 +35,16 @@ while [ "$1" ]; do
 	shift
 done
 
-MOUNT="`mount | awk '/ lustre_lite / { print $3 }' | tail -n 1`"
+MOUNT="`mount | awk '/ lustre_lite / { print $3 }' | tail -1`"
 if [ -z "$MOUNT" ]; then
 	sh llmount.sh
-	MOUNT="`mount | awk '/ lustre_lite / { print $3 }' | tail -n 1`"
+	MOUNT="`mount | awk '/ lustre_lite / { print $3 }' | tail -1`"
 	[ -z "$MOUNT" ] && fail "no lustre filesystem mounted" 1
 	I_MOUNTED="yes"
 fi
 
 OSCTMP=`echo $MOUNT | tr "/" "."`
-USED=`df | awk "/$OSCTMP/ { print \\$3 }" | tail -n 1`
+USED=`df | awk "/$OSCTMP/ { print \\$3 }" | tail -1`
 USED=`expr $USED + 16`	# Some space for the status file
 
 # let's start slowly here...
@@ -77,7 +77,7 @@ mkdir $DST || fail "can't mkdir $DST" 10
 
 # ok, that hopefully worked, so let's do a little more, with files that
 # haven't changed in the last day (hopefully they don't change during test)
-FILES=`find $SRC -type f -mtime +1 -ctime +1 | head -n $COUNT`
+FILES=`find $SRC -type f -mtime +1 -ctime +1 | head -$COUNT`
 log "copying files from $SRC to $DST$SRC"
 tar cf - $FILES | tar xvf - -C $DST || fail "copying $SRC" 11
 
@@ -123,7 +123,7 @@ rmdir $MOUNT/base$$* || fail "mkdirmany cleanup failed"
 
 log "done"
 
-NOWUSED=`df | awk "/$OSCTMP/ { print \\$3 }" | tail -n 1`
+NOWUSED=`df | awk "/$OSCTMP/ { print \\$3 }" | tail -1`
 if [ `expr $NOWUSED - $USED` -gt 1024 ]; then
 	echo "Space not all freed: now ${NOWUSED}kB, was ${USED}kB." 1>&2
 fi
diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 4fbfddf..1cc870d 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -7,8 +7,8 @@
 set -e
 
 ONLY=${ONLY:-"$*"}
-# bug number for skipped test: 2108
-ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"42a"}
+# bug number for skipped test: 2399 (temporarily until new kernels arrive)
+ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"48"}
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
 [ "$ALWAYS_EXCEPT$EXCEPT" ] && echo "Skipping tests: $ALWAYS_EXCEPT $EXCEPT"
@@ -20,10 +20,8 @@ TMP=${TMP:-/tmp}
 
 CHECKSTAT=${CHECKSTAT:-"checkstat -v"}
 CREATETEST=${CREATETEST:-createtest}
-LFS=${LFS:-lfs}
-LSTRIPE=${LSTRIPE:-"$LFS setstripe"}
-LFIND=${LFIND:-"$LFS find"}
-LVERIFY=${LVERIFY:-ll_dirstripe_verify}
+LFIND=${LFIND:-lfind}
+LSTRIPE=${LSTRIPE:-lstripe}
 LCTL=${LCTL:-lctl}
 MCREATE=${MCREATE:-mcreate}
 OPENFILE=${OPENFILE:-openfile}
@@ -68,29 +66,11 @@ log() {
 	lctl mark "$*" 2> /dev/null || true
 }
 
-trace() {
-	log "STARTING: $*"
-	strace -o $TMP/$1.strace -ttt $*
-	RC=$?
-	log "FINISHED: $*: rc $RC"
-	return 1
-}
-TRACE=${TRACE:-""}
-
-check_kernel_version() {
-	VERSION_FILE=/proc/fs/lustre/kernel_version
-	WANT_VER=$1
-	[ ! -f $VERSION_FILE ] && echo "can't find kernel version" && return 1
-	GOT_VER=`cat $VERSION_FILE`
-	[ $GOT_VER -ge $WANT_VER ] && return 0
-	log "test needs at least kernel version $WANT_VER, running $GOT_VER"
-	return 1
-}
-
 run_one() {
 	if ! mount | grep -q $DIR; then
 		$START
 	fi
+	echo -1 >/proc/sys/portals/debug	
 	log "== test $1: $2"
 	export TESTNAME=test_$1
 	test_$1 || error "test_$1: exit with rc=$?"
@@ -176,9 +156,7 @@ DIR=${DIR:-$MOUNT}
 [ -z "`echo $DIR | grep $MOUNT`" ] && echo "$DIR not in $MOUNT" && exit 99
 
 LOVNAME=`cat /proc/fs/lustre/llite/fs0/lov/common_name`
-OSTCOUNT=`cat /proc/fs/lustre/lov/$LOVNAME/numobd`
-STRIPECOUNT=`cat /proc/fs/lustre/lov/$LOVNAME/stripecount`
-STRIPESIZE=`cat /proc/fs/lustre/lov/$LOVNAME/stripesize`
+STRIPECOUNT=`cat /proc/fs/lustre/lov/$LOVNAME/numobd`
 
 [ -f $DIR/d52a/foo ] && chattr -a $DIR/d52a/foo
 [ -f $DIR/d52b/foo ] && chattr -i $DIR/d52b/foo
@@ -725,7 +703,7 @@ test_27a() {
 run_test 27a "one stripe file =================================="
 
 test_27c() {
-	[ "$OSTCOUNT" -lt "2" ] && echo "skipping 2-stripe test" && return
+	[ "$STRIPECOUNT" -lt "2" ] && echo "skipping 2-stripe test" && return
 	if [ ! -d $DIR/d27 ]; then
 		mkdir $DIR/d27
 	fi
@@ -787,7 +765,7 @@ test_27j() {
         if [ ! -d $DIR/d27 ]; then
                 mkdir $DIR/d27
         fi
-        $LSTRIPE $DIR/d27/f27j 65536 $OSTCOUNT 1 && error || true
+        $LSTRIPE $DIR/d27/f27j 65536 $STRIPECOUNT 1 && error || true
 }
 run_test 27j "lstripe with bad stripe offset (should return error)"
 
@@ -804,13 +782,6 @@ test_27k() { # bug 2844
 }
 run_test 27k "limit i_blksize for broken user apps ============="
 
-test_27l() {
-	mcreate $DIR/f27l || error "creating file"
-	$RUNAS $LSTRIPE $DIR/f27l 65536 -1 1 && \
-		error "lstripe should have failed" || true
-}
-run_test 27l "check setstripe permissions (should return error)"
-
 test_28() {
 	mkdir $DIR/d28
 	$CREATETEST $DIR/d28/ct || error
@@ -888,12 +859,6 @@ test_31d() {
 }
 run_test 31d "remove of open directory ========================="
 
-test_31e() {
-	check_kernel_version 34 || return 0
-	openfilleddirunlink $DIR/d31e || error
-}
-run_test 31e "remove of open non-empty directory ==============="
-
 test_32a() {
 	echo "== more mountpoints and symlinks ================="
 	[ -e $DIR/d32a ] && rm -fr $DIR/d32a
@@ -1158,7 +1123,6 @@ test_34c() {
 run_test 34c "O_RDWR opening file-with-size works =============="
 
 test_34d() {
-	[ ! -f $DIR/f34 ] && test_34a 
 	dd if=/dev/zero of=$DIR/f34 conv=notrunc bs=4k count=1 || error
 	$CHECKSTAT -s $TEST_34_SIZE $DIR/f34 || error
 	rm $DIR/f34
@@ -1212,7 +1176,7 @@ test_36d() {
 run_test 36d "non-root OST utime check (open, utime) ==========="
 
 test_36e() {
-	[ $RUNAS_ID -eq $UID ] && echo "skipping test 36e" && return
+	[ $RUNAS_ID -eq $UID ] && return
 	[ ! -d $DIR/d36 ] && mkdir $DIR/d36
 	touch $DIR/d36/f36e
 	$RUNAS utime $DIR/d36/f36e && error "utime worked, want failure" || true
@@ -1433,8 +1397,8 @@ test_43c() {
 run_test 43c "md5sum of copy into lustre========================"
 
 test_44() {
-	[  "$OSTCOUNT" -lt "2" ] && echo "skipping 2-stripe test" && return
-	dd if=/dev/zero of=$DIR/f1 bs=4k count=1 seek=1023
+	[  "$STRIPECOUNT" -lt "2" ] && echo "skipping 2-stripe test" && return
+	dd if=/dev/zero of=$DIR/f1 bs=4k count=1 seek=127
 	dd if=$DIR/f1 bs=4k count=1
 }
 run_test 44 "zero length read from a sparse stripe ============="
@@ -1511,18 +1475,18 @@ page_size() {
 	getconf PAGE_SIZE
 }
 
-# in a 2 stripe file (lov.sh), page 1023 maps to page 511 in its object.  this
+# in a 2 stripe file (lov.sh), page 63 maps to page 31 in its object.  this
 # test tickles a bug where re-dirtying a page was failing to be mapped to the
-# objects offset and an assert hit when an rpc was built with 1023's mapped 
-# offset 511 and 511's raw 511 offset. it also found general redirtying bugs.
+# objects offset and an assert hit when an rpc was built with 63's mapped 
+# offset 31 and 31's raw 31 offset. it also found general redirtying bugs.
 test_46() {
 	f="$DIR/f46"
 	stop_writeback
 	sync
-	dd if=/dev/zero of=$f bs=`page_size` seek=511 count=1
+	dd if=/dev/zero of=$f bs=`page_size` seek=31 count=1
 	sync
-	dd conv=notrunc if=/dev/zero of=$f bs=`page_size` seek=1023 count=1
-	dd conv=notrunc if=/dev/zero of=$f bs=`page_size` seek=511 count=1
+	dd conv=notrunc if=/dev/zero of=$f bs=`page_size` seek=63 count=1
+	dd conv=notrunc if=/dev/zero of=$f bs=`page_size` seek=31 count=1
 	sync
 	start_writeback
 }
@@ -1534,9 +1498,8 @@ test_47() {
 }
 run_test 47 "Device nodes check ================================"
 
-test_48a() { # bug 2399
-	check_kernel_version 34 || return 0
-	mkdir -p $DIR/d48a
+test_48a() {
+	mkdir $DIR/d48a
 	cd $DIR/d48a
 	mv $DIR/d48a $DIR/d48.new || error "move directory failed"
 	mkdir $DIR/d48a || error "recreate directory failed"
@@ -1548,65 +1511,24 @@ test_48a() { # bug 2399
 	mkdir . && error "'mkdir .' worked after recreating cwd"
 	rmdir . && error "'rmdir .' worked after recreating cwd"
 	ln -s . baz || error "'ln -s .' failed after recreating cwd"
-	cd .. || error "'cd ..' failed after recreating cwd"
 }
 run_test 48a "Access renamed working dir (should return errors)="
 
-test_48b() { # bug 2399
-	check_kernel_version 34 || return 0
-	mkdir -p $DIR/d48b
+test_48b() {
+	mkdir $DIR/d48b
 	cd $DIR/d48b
 	rmdir $DIR/d48b || error "remove cwd $DIR/d48b failed"
 	touch foo && error "'touch foo' worked after removing cwd"
 	mkdir foo && error "'mkdir foo' worked after removing cwd"
 	ls . && error "'ls .' worked after removing cwd"
 	ls .. || error "'ls ..' failed after removing cwd"
-	cd . && error "'cd .' worked after removing cwd"
+	cd . && error "'cd .' worked after recreate cwd"
 	mkdir . && error "'mkdir .' worked after removing cwd"
 	rmdir . && error "'rmdir .' worked after removing cwd"
 	ln -s . foo && error "'ln -s .' worked after removing cwd" || true
-	#cd .. || error "'cd ..' failed after removing cwd"
 }
 run_test 48b "Access removed working dir (should return errors)="
 
-test_48c() { # bug 2350
-	check_kernel_version 36 || return 0
-	#sysctl -w portals.debug=-1
-	#set -vx
-	mkdir -p $DIR/d48c/dir
-	cd $DIR/d48c/dir
-	rmdir $DIR/d48c/dir || error "remove cwd $DIR/d48c/dir failed"
-	$TRACE touch foo && error "'touch foo' worked after removing cwd"
-	$TRACE mkdir foo && error "'mkdir foo' worked after removing cwd"
-	$TRACE ls . && error "'ls .' worked after removing cwd"
-	$TRACE ls .. || error "'ls ..' failed after removing cwd"
-	$TRACE cd . && error "'cd .' worked after recreate cwd"
-	$TRACE mkdir . && error "'mkdir .' worked after removing cwd"
-	$TRACE rmdir . && error "'rmdir .' worked after removing cwd"
-	$TRACE ln -s . foo && error "'ln -s .' worked after removing cwd" ||true
-	$TRACE cd .. || error "'cd ..' failed after removing cwd"
-}
-run_test 48c "Access removed working subdir (should return errors)"
-
-test_48d() { # bug 2350
-	check_kernel_version 36 || return 0
-	#sysctl -w portals.debug=-1
-	#set -vx
-	mkdir -p $DIR/d48d/dir
-	cd $DIR/d48d/dir
-	rm -r $DIR/d48d || error "remove cwd and parent $DIR/d48d failed"
-	$TRACE touch foo && error "'touch foo' worked after removing cwd"
-	$TRACE mkdir foo && error "'mkdir foo' worked after removing cwd"
-	$TRACE ls . && error "'ls .' worked after removing cwd"
-	$TRACE ls .. && error "'ls ..' worked after removing cwd"
-	$TRACE cd . && error "'cd .' worked after recreate cwd"
-	$TRACE mkdir . && error "'mkdir .' worked after removing cwd"
-	$TRACE rmdir . && error "'rmdir .' worked after removing cwd"
-	$TRACE ln -s . foo && error "'ln -s .' worked after removing cwd" ||true
-	$TRACE cd .. && error "'cd ..' worked after removing cwd" || true
-}
-run_test 48d "Access removed parent subdir (should return errors)"
-
 test_50() {
 	# bug 1485
 	mkdir $DIR/d50
@@ -1683,53 +1605,13 @@ test_53() {
 }
 run_test 53 "verify that MDS and OSTs agree on pre-creation ===="
 
-test_54a() {
-     	$SOCKETSERVER $DIR/socket
+test_54() {
+     	$SOCKETSERVER $DIR/socket &
+	sleep 1
      	$SOCKETCLIENT $DIR/socket || error
       	$MUNLINK $DIR/socket
 }
-run_test 54a "unix damain socket test =========================="
-
-test_54b() {
-	f="$DIR/f54b"
-	mknod $f c 1 3
-	chmod 0666 $f
-	dd if=/dev/zero of=$f bs=`page_size` count=1 
-}
-run_test 54b "char device works in lustre ======================"
-
-test_54c() {
-	tfile="$DIR/f54c"
-	tdir="$DIR/d54c"
-	loopdev="$DIR/loop54c"
-	
-	for i in `seq 3 7`; do
-		rm -f $loopdev
-		mknod $loopdev b 7 $i
-		losetup $loopdev > /dev/null 2>&1 || break
-	done
-	echo "make a loop file system with $tfile on $loopdev ($i)..."	
-	dd if=/dev/zero of=$tfile bs=`page_size` seek=1024 count=1 > /dev/null
-	losetup $loopdev $tfile || error "can't set up $loopdev for $tfile"
-	mkfs.ext2 $loopdev || error "mke2fs on $loopdev"
-	mkdir -p $tdir
-	mount -t ext2 $loopdev $tdir || error "error mounting $loopdev on $tdir"
-	dd if=/dev/zero of=$tdir/tmp bs=`page_size` count=30 || error "dd write"
-	df $tdir
-	dd if=$tdir/tmp of=/dev/zero bs=`page_size` count=30 || error "dd read"
-	umount $tdir
-	losetup -d $loopdev
-	rm $loopdev
-}
-run_test 54c "block device works in lustre ====================="
-
-test_54d() {
-	f="$DIR/f54d"
-	string="aaaaaa"
-	mknod $f p
-	[ "$string" = `echo $string > $f | cat $f` ] || error
-}
-run_test 54d "fifo device works in lustre ======================"
+run_test 54 "unix damain socket test ==========================="
 
 test_55() {
         rm -rf $DIR/d55
@@ -1742,7 +1624,7 @@ test_55() {
         rm -rf $DIR/d55/*
         umount $DIR/d55 || error
 }
-run_test 55 "check iopen_connect_dentry() ======================"
+run_test 55 "check iopen_connect_dentry()======================="
 
 test_56() {
         rm -rf $DIR/d56
@@ -1782,7 +1664,7 @@ test_56() {
         $LFIND --obd wrong_uuid $DIR/d56 2>&1 | grep -q "unknown obduuid" || \
                 error "lfs find --obd wrong_uuid should return error information"
 
-        [  "$OSTCOUNT" -lt 2 ] && \
+        [  "$STRIPECOUNT" -lt 2 ] && \
                 echo "skipping other lfs find --obd test" && return
         FILENUM=`$LFIND --recursive $DIR/d56 | sed -n '/^[	 ]*1[	 ]/p' | wc -l`
         OBDUUID=`$LFIND --recursive $DIR/d56 | sed -n '/^[	 ]*1:/p' | awk '{print $2}'`
@@ -1894,7 +1776,7 @@ run_test 62 "verify obd_match failure doesn't LBUG (should -EIO)"
 
 # bug 2319 - oig_wait() interrupted causes crash because of invalid waitq.
 test_63() {
-	MAX_DIRTY_MB=`cat /proc/fs/lustre/osc/*/max_dirty_mb | head -n 1`
+	MAX_DIRTY_MB=`cat /proc/fs/lustre/osc/*/max_dirty_mb | head -1`
 	for i in /proc/fs/lustre/osc/*/max_dirty_mb ; do
 		echo 0 > $i
 	done
@@ -1916,84 +1798,12 @@ test_64a () {
 	df $DIR
 	grep "[0-9]" /proc/fs/lustre/osc/OSC*MNT*/cur*
 }
-run_test 64a "verify filter grant calculations (in kernel) ====="
+run_test 64a "verify filter grant calculations (in kernel) ======"
 
 test_64b () {
 	sh oos.sh $MOUNT
 }
-run_test 64b "check out-of-space detection on client ==========="
-
-# bug 1414 - set/get directories' stripe info
-test_65a() {
-	mkdir -p $DIR/d65
-	touch $DIR/d65/f1
-	$LVERIFY $DIR/d65 $DIR/d65/f1 || error "lverify failed"
-}
-run_test 65a "directory with no stripe info ===================="
-
-test_65b() {
-	mkdir -p $DIR/d65
-       	$LSTRIPE $DIR/d65 $(($STRIPESIZE * 2)) 0 1 || error "setstripe"
-	touch $DIR/d65/f2
-	$LVERIFY $DIR/d65 $DIR/d65/f2 || error "lverify failed"
-}
-run_test 65b "directory setstripe $(($STRIPESIZE * 2)) 0 1 ==============="
-
-test_65c() {
-	if [ $OSTCOUNT -gt 1 ]; then
-		mkdir -p $DIR/d65
-    		$LSTRIPE $DIR/d65 $(($STRIPESIZE * 4)) 1 \
-			$(($OSTCOUNT - 1)) || error "setstripe"
-	        touch $DIR/d65/f3
-	        $LVERIFY $DIR/d65 $DIR/d65/f3 || error "lverify failed"
-	fi
-}
-run_test 65c "directory setstripe $(($STRIPESIZE * 4)) 1 $(($OSTCOUNT - 1))"
-
-[ $STRIPECOUNT -eq 0 ] && sc=1 || sc=$(($STRIPECOUNT - 1))
-
-test_65d() {
-	mkdir -p $DIR/d65
-	$LSTRIPE $DIR/d65 $STRIPESIZE -1 $sc || error "setstripe"
-	touch $DIR/d65/f4 $DIR/d65/f5
-	$LVERIFY $DIR/d65 $DIR/d65/f4 $DIR/d65/f5 || error "lverify failed"
-}
-run_test 65d "directory setstripe $STRIPESIZE -1 $sc ======================"
-
-test_65e() {
-	mkdir -p $DIR/d65
-
-	$LSTRIPE $DIR/d65 0 -1 0 || error "setstripe"
-	touch $DIR/d65/f6
-	$LVERIFY $DIR/d65 $DIR/d65/f6 || error "lverify failed"
-}
-run_test 65e "directory setstripe 0 -1 0 (default) ============="
-
-test_65f() {
-	mkdir -p $DIR/d65f
-	$RUNAS $LSTRIPE $DIR/d65f 0 -1 0 && error "setstripe succeeded" || true
-}
-run_test 65f "dir setstripe permission (should return error) ==="
-
-# bug 2543 - update blocks count on client
-test_66() {
-	COUNT=${COUNT:-8}
-	dd if=/dev/zero of=$DIR/f66 bs=1k count=$COUNT
-	sync
-	BLOCKS=`ls -s $DIR/f66 | awk '{ print $1 }'`
-	[ $BLOCKS -ge $COUNT ] || error "$DIR/f66 blocks $BLOCKS < $COUNT"
-}
-run_test 66 "update inode blocks count on client ==============="
-
-test_67() { # bug 3285 - supplementary group fails on MDS, passes on client
-	[ "$RUNAS_ID" = "$UID" ] && echo "skipping test 67" && return
-	check_kernel_version 35 || return 0
-	mkdir $DIR/d67
-	chmod 771 $DIR/d67
-	chgrp $RUNAS_ID $DIR/d67
-	$RUNAS -g $((RUNAS_ID + 1)) -G1,2,$RUNAS_ID ls $DIR/d67 && error || true
-}
-run_test 67 "supplementary group failure (should return error) ="
+run_test 64b "check out-of-space detection on client ============"
 
 # on the LLNL clusters, runas will still pick up root's $TMP settings,
 # which will not be writable for the runas user, and then you get a CVS
@@ -2016,12 +1826,7 @@ run_test 99a "cvs init ========================================="
 test_99b() {
 	[ ! -d $DIR/d99cvsroot ] && test_99a
 	cd /etc/init.d
-	# some versions of cvs import exit(1) when asked to import links or
-	# files they can't read.  ignore those files.
-	TOIGNORE=$(find . -type l -printf '-I %f\n' -o \
-			! -perm +4 -printf '-I %f\n')
-	$RUNAS cvs -d $DIR/d99cvsroot import -m "nomesg" $TOIGNORE \
-		d99reposname vtag rtag
+	$RUNAS cvs -d $DIR/d99cvsroot import -m "nomesg" d99reposname vtag rtag
 }
 run_test 99b "cvs import ======================================="
 
diff --git a/lustre/tests/sanityN.sh b/lustre/tests/sanityN.sh
index 974fdbb..756ffdb 100644
--- a/lustre/tests/sanityN.sh
+++ b/lustre/tests/sanityN.sh
@@ -3,8 +3,8 @@
 set -e
 
 ONLY=${ONLY:-"$*"}
-# bug number for skipped test: 1768
-ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"4   14b"}
+# bug number for skipped test: 1768 1557
+ALWAYS_EXCEPT=${ALWAYS_EXCEPT:-"4   8    14b"}
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
 [ "$ALWAYS_EXCEPT$EXCEPT" ] && echo "Skipping tests: $ALWAYS_EXCEPT $EXCEPT"
@@ -103,8 +103,8 @@ pass() {
 	echo PASS
 }
 
-export MOUNT1=`mount| awk '/ lustre/ { print $3 }'| head -n 1`
-export MOUNT2=`mount| awk '/ lustre/ { print $3 }'| tail -n 1`
+export MOUNT1=`mount| awk '/ lustre/ { print $3 }'| head -1`
+export MOUNT2=`mount| awk '/ lustre/ { print $3 }'| tail -1`
 [ -z "$MOUNT1" ] && error "NAME=$NAME not mounted once"
 [ "$MOUNT1" = "$MOUNT2" ] && error "NAME=$NAME not mounted twice"
 [ `mount| awk '/ lustre/ { print $3 }'| wc -l` -ne 2 ] && \
@@ -317,17 +317,11 @@ test_14b() {
 run_test 14b "truncate of file being executed should return -ETXTBSY"
 
 test_15() {	# bug 974 - ENOSPC
-	echo $PATH
+	env
 	sh oos2.sh $MOUNT1 $MOUNT2
 }
 run_test 15 "test out-of-space with multiple writers ==========="
 
-test_16() {
-	./fsx -R -W -c 50 -p 100 -N 2500 \
-		$MOUNT1/fsxfile $MOUNT2/fsxfile
-}
-run_test 16 "2500 iterations of dual-mount fsx ================="
-
 log "cleanup: ======================================================"
 rm -rf $DIR1/[df][0-9]* $DIR1/lnk || true
 
diff --git a/lustre/tests/socketserver b/lustre/tests/socketserver
index e2fd66a..25bbb6e 100755
--- a/lustre/tests/socketserver
+++ b/lustre/tests/socketserver
@@ -15,14 +15,6 @@ listen(Server,SOMAXCONN)			|| die "listen: $!";
 
 logmsg "server started on $NAME";
 
-my $rc = fork();
-if ($rc > 0) { #parent
-    exit();
-} elsif ($rc < 0) { # error
-    logmsg "fork failed: $rc";
-    exit();
-}
-
 accept(Client,Server);
 logmsg "connection on $NAME";
 print Client "from server\n";
diff --git a/lustre/tests/stat.c b/lustre/tests/stat.c
index f27957d..4ef6bbe 100644
--- a/lustre/tests/stat.c
+++ b/lustre/tests/stat.c
@@ -145,9 +145,6 @@ void print_human_fstype(struct statfs *statfsbuf)
 	case S_MAGIC_ROMFS:
 	  type = strdup("romfs");
 	  break;
-	case S_MAGIC_LUSTRE:
-	  type = strdup("lustre");
-	  break;
 #elif __GNU__
         case FSTYPE_UFS:
           type = strdup("ufs");
@@ -293,21 +290,12 @@ void print_human_access(struct stat *statbuf)
     printf (access);
 }
 
-/* trick gcc into being unable to recognize the %c format so it doesn't
- * issue its inane warning about %c and two-digit year representations. */
-static size_t strftime_wrapper(char *s, size_t max, const char *fmt,
-			       struct tm *tm) {
-	return strftime(s, max, fmt, tm);
-}
-
 void print_human_time(time_t *t)
 {
   char str[40];
-
-  if (strftime_wrapper(str, 40, "%c", localtime(t)) > 0)
-	  printf(str);
-  else
-	  printf("Cannot calculate human readable time, sorry");
+  
+  if (strftime(str, 40, "%c", localtime(t)) > 0) printf(str);
+  else printf("Cannot calculate human readable time, sorry");
 }
 
 /* print statfs info */
@@ -319,7 +307,7 @@ void print_statfs(char *pformat, char m, char *filename, void *data, SECURITY_ID
     int rv;
     unsigned int sbuflen = sizeof(sbuf);
 #endif
-
+    
     switch(m) {
 	case 'n':
 	    strcat(pformat, "s");
diff --git a/lustre/tests/stat_fs.h b/lustre/tests/stat_fs.h
index c5fa3b4..a07fc12 100644
--- a/lustre/tests/stat_fs.h
+++ b/lustre/tests/stat_fs.h
@@ -31,7 +31,6 @@
 #define S_MAGIC_REISERFS        0x52654973
 #define S_MAGIC_CRAMFS          0x28cd3d45
 #define S_MAGIC_ROMFS           0x7275
-#define S_MAGIC_LUSTRE          0x0BD00BD0
 #elif defined (__GNU__)
 #include <hurd/hurd_types.h>
 #endif
diff --git a/lustre/tests/statmany.c b/lustre/tests/statmany.c
index 7d4d2c9..edfa47b 100644
--- a/lustre/tests/statmany.c
+++ b/lustre/tests/statmany.c
@@ -44,7 +44,7 @@ static int usage(char *prog, FILE *out)
 
 int main(int argc, char ** argv)
 {
-        long i, count, iter = LONG_MAX, mode = 0, offset;
+        long i, count, iter = LONG_MAX, mode, offset;
         long int start, length = LONG_MAX, last, rc = 0;
         char parent[4096], *t;
 	char c, *prog = argv[0], *base;
diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 33f9786..940756f 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -27,11 +27,10 @@ usage() {
 init_test_env() {
     export LUSTRE=`absolute_path $LUSTRE`
     export TESTSUITE=`basename $0 .sh`
-    export XMLCONFIG=${XMLCONFIG:-${TESTSUITE}.xml}
+    export XMLCONFIG="${TESTSUITE}.xml"
     export LTESTDIR=${LTESTDIR:-$LUSTRE/../ltest}
 
     [ -d /r ] && export ROOT=/r
-    export TMP=${TMP:-$ROOT/tmp}
 
     export PATH=:$PATH:$LUSTRE/utils:$LUSTRE/tests
     export LLMOUNT=${LLMOUNT:-"llmount"}
@@ -39,7 +38,6 @@ init_test_env() {
     export LMC=${LMC:-"lmc"}
     export LCTL=${LCTL:-"$LUSTRE/utils/lctl"}
     export CHECKSTAT="${CHECKSTAT:-checkstat} "
-    export FSYTPE=${FSTYPE:-"ext3"}
 
     # Paths on remote nodes, if different 
     export RLUSTRE=${RLUSTRE:-$LUSTRE}
@@ -87,12 +85,12 @@ zconf_mount() {
     do_node $client mkdir $mnt 2> /dev/null || :
 
     if [ -x /sbin/mount.lustre ] ; then
-	do_node $client mount -t lustre -o nettype=$NETTYPE `facet_active_host mds`:/mds_svc/client_facet $mnt || return 1
+	do_node $client mount -t lustre -o nettype=$NETTYPE `facet_active_host mds1`:/mds1_svc/client_facet $mnt || return 1
     else
        # this is so cheating
        do_node $client $LCONF --nosetup --node client_facet $XMLCONFIG  > /dev/null || return 2
        $LCONF --nosetup --node client_facet $XMLCONFIG
-       do_node $client $LLMOUNT `facet_active_host mds`:/mds_svc/client_facet $mnt -o nettype=$NETTYPE|| return 4
+       do_node $client $LLMOUNT `facet_active_host mds1`:/mds1_svc/client_facet $mnt -o nettype=$NETTYPE|| return 4
     fi
 
     [ -d /r ] && $LCTL modules > /r/tmp/ogdb-`hostname`
@@ -170,7 +168,7 @@ replay_barrier() {
 
 mds_evict_client() {
     UUID=`cat /proc/fs/lustre/mdc/*_MNT_*/uuid`
-    do_facet mds "echo $UUID > /proc/fs/lustre/mds/mds_svc/evict_client"
+    do_facet mds "echo $UUID > /proc/fs/lustre/mds/mds1_svc/evict_client"
 }
 
 fail() {
@@ -279,6 +277,16 @@ do_node() {
 do_facet() {
     facet=$1
     shift
+
+    if [ "$facet" == "mds" ]; then
+        if [ "$MDSCOUNT" -gt 1 ]; then
+            for num in `seq $MDSCOUNT`; do
+                HOST=`facet_active_host $facet$num`
+                do_node $HOST $@
+            done
+           return
+        fi
+    fi
     HOST=`facet_active_host $facet`
     do_node $HOST $@
 }
@@ -298,14 +306,14 @@ add_mds() {
     shift
     rm -f ${facet}active
     add_facet $facet
-    do_lmc --add mds --node ${facet}_facet --mds ${facet}_svc --fstype $FSTYPE $*
+    do_lmc --add mds --node ${facet}_facet --mds ${facet}_svc $*
 }
 
 add_mdsfailover() {
     facet=$1
     shift
     add_facet ${facet}failover  --lustre_upcall $UPCALL
-    do_lmc --add mds  --node ${facet}failover_facet --mds ${facet}_svc --fstype $FSTYPE $*
+    do_lmc --add mds  --node ${facet}failover_facet --mds ${facet}_svc $*
 }
 
 add_ost() {
@@ -313,14 +321,14 @@ add_ost() {
     shift
     rm -f ${facet}active
     add_facet $facet
-    do_lmc --add ost --node ${facet}_facet --ost ${facet}_svc --fstype $FSTYPE $*
+    do_lmc --add ost --node ${facet}_facet --ost ${facet}_svc $*
 }
 
 add_ostfailover() {
     facet=$1
     shift
     add_facet ${facet}failover
-    do_lmc --add ost --failover --node ${facet}failover_facet --ost ${facet}_svc --fstype $FSTYPE $*
+    do_lmc --add ost --failover --node ${facet}failover_facet --ost ${facet}_svc $*
 }
 
 add_lov() {
@@ -328,16 +336,26 @@ add_lov() {
     mds_facet=$2
     shift; shift
     do_lmc --add lov --mds ${mds_facet}_svc --lov $lov $*
-    
+}
+
+add_lov_to_lmv() {
+    lov=$1
+    lmv=$2
+    shift; shift
+    do_lmc --add lov --lmv $lmv --lov $lov $*
+}
+
+add_lmv() {
+    lmv=$1
+    shift;
+    do_lmc --add lmv --lmv $lmv $*
 }
 
 add_client() {
     facet=$1
-    mds=$2
-    shift; shift
+    shift;
     add_facet $facet --lustre_upcall $UPCALL
-    do_lmc --add mtpt --node ${facet}_facet --mds ${mds}_svc $*
-
+    do_lmc --add mtpt --node ${facet}_facet $*
 }
 
 
@@ -460,18 +478,6 @@ cancel_lru_locks() {
     done
 }
 
-
-pgcache_empty() {
-    for a in /proc/fs/lustre/llite/*/dump_page_cache; do
-        if [ `wc -l $a | awk '{print $1}'` -gt 1 ]; then
-                echo there is still data in page cache $a ?
-                cat $a;
-                return 1;
-        fi
-    done
-    return 0
-}
-
 ##################################
 # Test interface 
 error() {
diff --git a/lustre/tests/uml.sh b/lustre/tests/uml.sh
index acc38b9..9195e59 100644
--- a/lustre/tests/uml.sh
+++ b/lustre/tests/uml.sh
@@ -15,7 +15,6 @@ OSTDEVBASE=$TMP/ost
 #etc
 OSTSIZE=${OSTSIZE:-100000}
 STRIPECNT=${STRIPECNT:-1}
-STRIPE_BYTES=${STRIPE_BYTES:-1048576}
 OSDTYPE=${OSDTYPE:-obdfilter}
 OSTFAILOVER=${OSTFAILOVER:-}
 
@@ -88,7 +87,7 @@ echo; echo "adding MDS on: $MDSNODE"
 ${LMC} -m $config --add mds --format --node $MDSNODE --mds mds1 --fstype $FSTYPE --dev $MDSDEV --size $MDSSIZE ||exit 10
 
 # configure ost
-${LMC} -m $config --add lov --lov lov1 --mds mds1 --stripe_sz $STRIPE_BYTES --stripe_cnt $STRIPECNT --stripe_pattern 0 || exit 20
+${LMC} -m $config --add lov --lov lov1 --mds mds1 --stripe_sz 65536 --stripe_cnt $STRIPECNT --stripe_pattern 0 || exit 20
 COUNT=1
 echo -n "adding OST on:"
 for NODE in $OSTNODES; do
diff --git a/lustre/tests/write_append_truncate.c b/lustre/tests/write_append_truncate.c
index 7bfb121..30a95e5 100644
--- a/lustre/tests/write_append_truncate.c
+++ b/lustre/tests/write_append_truncate.c
@@ -49,7 +49,7 @@ void usage(char *prog)
 }
 
 /* Print process rank, loop count, message, and exit (i.e. a fatal error) */
-void rprintf(int rank, int loop, const char *fmt, ...)
+int rprintf(int rank, int loop, const char *fmt, ...)
 {
         va_list       ap;
 
@@ -59,7 +59,8 @@ void rprintf(int rank, int loop, const char *fmt, ...)
 
         vprintf(fmt, ap);
 
-        MPI_Abort(MPI_COMM_WORLD, 1);
+        MPI_Finalize();
+        exit(1);
 }
 
 int main(int argc, char *argv[])
diff --git a/lustre/tests/write_disjoint.c b/lustre/tests/write_disjoint.c
index c9ffae6..16774c8 100644
--- a/lustre/tests/write_disjoint.c
+++ b/lustre/tests/write_disjoint.c
@@ -24,9 +24,11 @@
 #include <stdarg.h>
 #include "mpi.h"
 
+
+#define FILENAME "/mnt/lustre/write_disjoint"
 #define CHUNK_MAX_SIZE 123456
 
-void rprintf(int rank, int loop, const char *fmt, ...)
+int rprintf(int rank, int loop, const char *fmt, ...)
 {
         va_list       ap;
  
@@ -36,7 +38,8 @@ void rprintf(int rank, int loop, const char *fmt, ...)
  
         vprintf(fmt, ap);
  
-        MPI_Abort(MPI_COMM_WORLD, 1);
+        MPI_Finalize();
+        exit(1);
 }
 
 int main (int argc, char *argv[]) {
@@ -44,23 +47,9 @@ int main (int argc, char *argv[]) {
          int rank, noProcessors, done;
          off_t offset;
          char **chunk_buf;
-         char *read_buf, c;
+         char *read_buf;
          struct stat stat_buf;
          ssize_t ret;
-         char *filename = "/mnt/lustre/write_disjoint";
-
-        /* Parse command line options */
-        while (1) {
-                c = getopt(argc, argv, "f:");
-                if (c == -1)
-                        break;
-
-                switch (c) {
-                case 'f':
-                        filename = optarg;
-                        break;
-                }
-        }
 
          MPI_Init(&argc, &argv);
          MPI_Comm_size(MPI_COMM_WORLD, &noProcessors);
@@ -74,21 +63,21 @@ int main (int argc, char *argv[]) {
          read_buf = malloc(noProcessors * CHUNK_MAX_SIZE);
          
          if (rank == 0) {
-                fd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, 0666);
+                fd = open(FILENAME, O_WRONLY|O_CREAT|O_TRUNC, 0666);
                 if (fd < 0) 
                         rprintf(rank, -1, "open() returned %s\n", 
                                 strerror(errno));
          }
          MPI_Barrier(MPI_COMM_WORLD);
 
-         fd = open(filename, O_RDWR);
+         fd = open(FILENAME, O_RDWR);
          if (fd < 0)
                  rprintf(rank, -1, "open() returned %s\n", strerror(errno));
          
          for (n=0; n < 1000 ; n++) {
                  /* reset the environment */
                  if (rank == 0) {
-                         ret = truncate(filename, 0);
+                         ret = truncate(FILENAME, 0);
                          if (ret != 0)
                                  rprintf(rank, n, "truncate() returned %s\n", 
                                          strerror(errno) );
@@ -120,7 +109,7 @@ int main (int argc, char *argv[]) {
                          lseek(fd, 0, SEEK_SET);
                          
                          /* quick check */
-                         stat(filename, &stat_buf);
+                         stat(FILENAME, &stat_buf);
                          file_size = stat_buf.st_size;
                          if (file_size != chunk_size * noProcessors)
                                   rprintf(rank, n, "invalid file size %d"
@@ -158,7 +147,7 @@ int main (int argc, char *argv[]) {
                                                (b + 4096) & ~(4096-1));
                                 }
 
-                                sprintf(command, "od -Ad -a %s", filename);
+                                sprintf(command, "od -Ad -a %s", FILENAME);
                                 system(command);
                                 MPI_Finalize();
                                 exit(1);
diff --git a/lustre/utils/Lustre/lustredb.py b/lustre/utils/Lustre/lustredb.py
index eda5779..4ba04db 100644
--- a/lustre/utils/Lustre/lustredb.py
+++ b/lustre/utils/Lustre/lustredb.py
@@ -129,10 +129,6 @@ class LustreDB_XML(LustreDB):
         self.dom_node = dom
         self.root_node = root_node
 
-    def close(self):
-        # do nothing
-        return None
-
     def xmltext(self, dom_node, tag):
         list = dom_node.getElementsByTagName(tag)
         if len(list) > 0:
diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am
index 1f7a8b5..0a3f785 100644
--- a/lustre/utils/Makefile.am
+++ b/lustre/utils/Makefile.am
@@ -1,12 +1,24 @@
 # Administration utilities Makefile
-
+DEFS=
 SUBDIRS = Lustre
 
-AM_CFLAGS=$(LLCFLAGS)
-AM_CPPFLAGS=$(LLCPPFLAGS)
-AM_LDFLAGS := -L$(top_builddir)/portals/utils
+CFLAGS:=-g -O2 -I$(top_srcdir)/utils -I$(top_srcdir)/portals/include  -I$(srcdir)/../include -Wall -L../portals/utils
+CPPFLAGS = $(HAVE_LIBREADLINE)
+
+if LIBLUSTRE
+
+bin_SCRIPTS = lrun
 
-if UTILS
+EXTRA_DIST = $(sbin_SCRIPTS)
+
+include $(top_srcdir)/Rules
+
+else
+
+KFLAGS:=
+lctl_LDADD := $(LIBREADLINE) -lptlctl
+lfs_LDADD := $(LIBREADLINE) parser.o liblustreapi.a -lptlctl obd.o
+lload_LDADD := -lptlctl
 rootsbin_SCRIPTS = mount.lustre
 sbin_PROGRAMS = lctl obdio obdbarrier lload wirecheck wiretest llmount
 sbin_SCRIPTS = lconf lmc llanalyze llstat.pl llobdstat.pl lactive load_ldap.sh lrun
@@ -14,14 +26,6 @@ sbin_SCRIPTS += lwizard
 bin_SCRIPTS = lfind lstripe
 bin_PROGRAMS = lfs
 lib_LIBRARIES = liblustreapi.a
-if LIBLUSTRE
-sbin_SCRIPTS += lrun
-endif # LIBLUSTRE
-endif # UTILS
-
-lctl_LDADD := $(LIBREADLINE) -lptlctl
-lfs_LDADD := $(LIBREADLINE) parser.o liblustreapi.a -lptlctl obd.o
-lload_LDADD := $(LIBREADLINE) -lptlctl
 liblustreapi_a_SOURCES = liblustreapi.c
 wirecheck_SOURCES = wirecheck.c
 wiretest_SOURCES = wiretest.c
@@ -31,14 +35,18 @@ obdio_SOURCES = obdio.c obdiolib.c obdiolib.h
 obdbarrier_SOURCES = obdbarrier.c obdiolib.c obdiolib.h
 lfs_SOURCES = lfs.c 
 llmount_SOURCES = llmount.c 
-llmount_LDADD = $(LIBREADLINE) -lptlctl
+llmount_LDADD = -lptlctl
 
 EXTRA_DIST = $(bin_SCRIPTS) $(sbin_SCRIPTS)
 
+include $(top_srcdir)/Rules
+
 # NOTE: this should only be run on i386.
 newwiretest: wirehdr.c wirecheck
 	cp wirehdr.c wiretest.c
 	./wirecheck >> wiretest.c
 
 mount.lustre$(EXEEXT): llmount
-	cp $< $@
+	cp llmount mount.lustre
+
+endif
diff --git a/lustre/utils/lconf b/lustre/utils/lconf
index dbfe7ef..7c48e1b 100755
--- a/lustre/utils/lconf
+++ b/lustre/utils/lconf
@@ -39,13 +39,11 @@ PYMOD_DIR = "/usr/lib/lustre/python"
 
 def development_mode():
     base = os.path.dirname(sys.argv[0])
-    if os.access(base+"/Makefile", os.R_OK):
+    if os.access(base+"/Makefile.am", os.R_OK):
         return 1
     return 0
 
-if development_mode():
-    sys.path.append('../utils')
-else:
+if not development_mode():
     sys.path.append(PYMOD_DIR)
 
 import Lustre
@@ -356,6 +354,7 @@ class LCTLInterface:
         child = popen2.Popen3(cmd_line, 1) # Capture stdout and stderr from command
         child.tochild.write(cmds + "\n")
         child.tochild.close()
+#	print "LCTL:", cmds
 
         # From "Python Cookbook" from O'Reilly
         outfile = child.fromchild
@@ -537,7 +536,7 @@ class LCTLInterface:
   quit""" % (type, name, uuid)
         self.run(cmds)
         
-    def setup(self, name, setup = ""):
+    def setup(self,  name, setup = ""):
         cmds = """
   cfg_device %s
   setup %s
@@ -577,7 +576,13 @@ class LCTLInterface:
   quit""" % (name, uuid, desc_uuid, stripe_cnt, stripe_sz, stripe_off,
              pattern, devlist)
         self.run(cmds)
-
+    # create an lmv
+    def lmv_setup(self, name, uuid, desc_uuid, devlist):
+        cmds = """
+  attach lmv %s %s
+  lmv_setup %s %s
+  quit""" % (name, uuid, desc_uuid, devlist)
+        self.run(cmds)
     # create an lov
     def lov_setconfig(self, uuid, mdsuuid, stripe_cnt, stripe_sz, stripe_off,
                       pattern, devlist):
@@ -701,14 +706,13 @@ def do_find_file(base, mod):
                 return module
 
 def find_module(src_dir, dev_dir, modname):
-    modbase = src_dir +'/'+ dev_dir +'/'+ modname
-    for modext in '.ko', '.o':
-        module = modbase + modext
-        try: 
-            if os.access(module, os.R_OK):
-                return module
-        except OSError:
-            pass
+    mod = '%s.o' % (modname)
+    module = src_dir +'/'+ dev_dir +'/'+ mod
+    try: 
+       if os.access(module, os.R_OK):
+            return module
+    except OSError:
+        pass
     return None
 
 # is the path a block device?
@@ -719,7 +723,7 @@ def is_block(path):
     except OSError:
         return 0
     return stat.S_ISBLK(s[stat.ST_MODE])
-    
+
 # build fs according to type
 # fixme: dangerous
 def mkfs(dev, devsize, fstype, jsize, isize, mkfsoptions, isblock=1):
@@ -733,7 +737,7 @@ def mkfs(dev, devsize, fstype, jsize, isize, mkfsoptions, isblock=1):
         # devsize is in 1k, and fs block count is in 4k
         block_cnt = devsize/4
 
-    if fstype in ('ext3', 'extN', 'ldiskfs'):
+    if fstype in ('ext3', 'extN'):
         # ext3 journal size is in megabytes
         if jsize == 0:
             if devsize == 0:
@@ -767,7 +771,7 @@ def mkfs(dev, devsize, fstype, jsize, isize, mkfsoptions, isblock=1):
     if ret:
         panic("Unable to build fs:", dev, string.join(out))
     # enable hash tree indexing on fsswe
-    if fstype in ('ext3', 'extN', 'ldiskfs'):
+    if fstype in ('ext3', 'extN'):
         htree = 'echo "feature FEATURE_C5" | debugfs -w'
         (ret, out) = run (htree, dev)
         if ret:
@@ -783,8 +787,8 @@ def loop_base():
             panic ("can't access loop devices")
     return loop
     
-# find loop device assigned to the file
-def find_assigned_loop(file):
+# find loop device assigned to thefile
+def find_loop(file):
     loop = loop_base()
     for n in xrange(0, MAX_LOOP_DEVICES):
         dev = loop + str(n)
@@ -799,29 +803,19 @@ def find_assigned_loop(file):
     return ''
 
 # create file if necessary and assign the first free loop device
-def init_loop(file, size, fstype, journal_size, inode_size, 
-              mkfsoptions, reformat, backfstype, backfile):
-    if fstype == 'smfs':
-        realfile = backfile
-        realfstype = backfstype
-    else:
-        realfile = file
-        realfstype = fstype
-            
-    dev = find_assigned_loop(realfile)
+def init_loop(file, size, fstype, journal_size, inode_size, mkfsoptions, reformat):
+    dev = find_loop(file)
     if dev:
-        print 'WARNING file:', realfile, 'already mapped to', dev
+        print 'WARNING file:', file, 'already mapped to', dev
         return dev
-            
-    if reformat or not os.access(realfile, os.R_OK | os.W_OK):
+    if reformat or not os.access(file, os.R_OK | os.W_OK):
         if size < 8000:
-            panic("size of loopback file '%s' must be larger than 8MB, but is set to %s" % (realfile, size))
-        (ret, out) = run("dd if=/dev/zero bs=1k count=0 seek=%d of=%s" %(size, realfile))
+            panic("size of loopback file '%s' must be larger than 8MB, but is set to %s" % (file,size))
+        (ret, out) = run("dd if=/dev/zero bs=1k count=0 seek=%d of=%s" %(size,
+                                                                         file))
         if ret:
-            panic("Unable to create backing store:", realfile)
-            
-        mkfs(realfile, size, realfstype, journal_size, inode_size, 
-             mkfsoptions, isblock=0)
+            panic("Unable to create backing store:", file)
+        mkfs(file, size, fstype, journal_size, inode_size, mkfsoptions, isblock=0)
 
     loop = loop_base()
     # find next free loop
@@ -830,7 +824,7 @@ def init_loop(file, size, fstype, journal_size, inode_size,
         if os.access(dev, os.R_OK):
             (stat, out) = run('losetup', dev)
             if stat:
-                run('losetup', dev, realfile)
+                run('losetup', dev, file)
                 return dev
         else:
             print "out of loop devices"
@@ -840,7 +834,7 @@ def init_loop(file, size, fstype, journal_size, inode_size,
 
 # undo loop assignment
 def clean_loop(file):
-    dev = find_assigned_loop(file)
+    dev = find_loop(file)
     if dev:
         ret, out = run('losetup -d', dev)
         if ret:
@@ -854,13 +848,11 @@ def need_format(fstype, dev):
 
 # initialize a block device if needed
 def block_dev(dev, size, fstype, reformat, autoformat, journal_size,
-              inode_size, mkfsoptions, backfstype, backdev):
-    if config.noexec: 
-        return dev
-        
-    if fstype == 'smfs' or not is_block(dev):
+              inode_size, mkfsoptions):
+    if config.noexec: return dev
+    if not is_block(dev):
         dev = init_loop(dev, size, fstype, journal_size, inode_size,
-                        mkfsoptions, reformat, backfstype, backdev)
+                        mkfsoptions, reformat)
     elif reformat or (need_format(fstype, dev) and autoformat == 'yes'):
         mkfs(dev, size, fstype, journal_size, inode_size, mkfsoptions,
              isblock=0)
@@ -880,15 +872,6 @@ def if2addr(iface):
     ip = string.split(addr, ':')[1]
     return ip
 
-def def_mount_options(fstype, target):
-    """returns deafult mount options for passed fstype and target (mds, ost)"""
-    if fstype == 'ext3' or fstype == 'ldiskfs':
-        mountfsoptions = "errors=remount-ro"
-        if target == 'ost' and sys_get_branch() == '2.4':
-            mountfsoptions = "%s,asyncdel" % (mountfsoptions)
-        return mountfsoptions
-    return ""
-        
 def sys_get_elan_position_file():
     procfiles = ["/proc/elan/device0/position",
                  "/proc/qsnet/elan4/device0/position",
@@ -942,25 +925,18 @@ def sys_get_local_address(net_type, wildcard, cluster_id):
             log(e)
     elif net_type == 'gm':
         fixme("automatic local address for GM")
+    elif net_type == 'scimac':
+        scinode="/opt/scali/sbin/scinode"
+        if os.path.exists(scinode):
+            (rc,local) = run(scinode)
+        else:
+            panic (scinode, " not found on node with scimac networking")
+        if rc:
+            panic (scinode, " failed")
+        local=string.rstrip(local[0])
 
     return local
 
-def sys_get_branch():
-    """Returns kernel release"""
-    try:
-        fp = open('/proc/sys/kernel/osrelease')
-        lines = fp.readlines()
-        fp.close()
-        
-        for l in lines:
-            version = string.split(l)
-            a = string.split(version[0], '.')
-            return a[0] + '.' + a[1]
-    except IOError, e:
-        log(e)
-    return ""
-
-
 def mod_loaded(modname):
     """Check if a module is already loaded. Look in /proc/modules for it."""
     try:
@@ -1154,6 +1130,8 @@ class Network(Module):
             self.add_portals_module("knals/qswnal", 'kqswnal')
         if self.net_type == 'gm':
             self.add_portals_module("knals/gmnal", 'kgmnal')
+        if self.net_type == 'scimac':
+            self.add_portals_module("knals/scimacnal", 'kscimacnal')
 
     def nid_to_uuid(self, nid):
         return "NID_%s_UUID" %(nid,)
@@ -1209,6 +1187,9 @@ class Network(Module):
         if  node_is_router():
             self.disconnect_peer_gateways()
 
+    def correct_level(self, level, op=None):
+        return level
+
 class RouteTable(Module):
     def __init__(self,db):
         Module.__init__(self, 'ROUTES', db)
@@ -1293,6 +1274,9 @@ class Management(Module):
         if is_prepared(self.name):
             Module.cleanup(self)
 
+    def correct_level(self, level, op=None):
+        return level
+
 # This is only needed to load the modules; the LDLM device
 # is now created automatically.
 class LDLM(Module):
@@ -1308,6 +1292,10 @@ class LDLM(Module):
     def cleanup(self):
         return
 
+    def correct_level(self, level, op=None):
+        return level
+
+
 class LOV(Module):
     def __init__(self, db, uuid, fs_name, name_override = None, config_only = None):
         Module.__init__(self, 'LOV', db)
@@ -1315,7 +1303,7 @@ class LOV(Module):
             self.name = "lov_%s" % name_override
         self.add_lustre_module('lov', 'lov')
         self.mds_uuid = self.db.get_first_ref('mds')
-        self.stripe_sz = self.db.get_val_int('stripesize', 1048576)
+        self.stripe_sz = self.db.get_val_int('stripesize', 65536)
         self.stripe_off = self.db.get_val_int('stripeoffset', 0)
         self.pattern = self.db.get_val_int('stripepattern', 0)
         self.devlist = self.db.get_refs('obd')
@@ -1383,23 +1371,94 @@ class LOV(Module):
             osc.cleanup_module()
             break
 
+    def correct_level(self, level, op=None):
+        return level
+
+class LMV(Module):
+    def __init__(self, db, uuid, fs_name, name_override = None):
+        Module.__init__(self, 'LMV', db)
+        if name_override != None:
+            self.name = "lmv_%s" % name_override
+        self.add_lustre_module('lmv', 'lmv')
+        self.mds_uuid = self.db.get_first_ref('mds')
+        mds = self.db.lookup(self.mds_uuid)
+        self.lmv_name = mds.getName()
+        self.devlist = self.db.get_refs('mds')
+        self.mdclist = []
+        self.desc_uuid = self.uuid
+        self.uuid = uuid
+        self.fs_name = fs_name
+        for mds_uuid in self.devlist:
+            mds = self.db.lookup(mds_uuid)
+	    if not mds:
+	        panic("MDS not found!")
+	    mdc = MDC(mds, self.uuid, fs_name)
+	    if mdc:
+	         self.mdclist.append(mdc)
+            else:
+	         panic('mdc not found:', mds_uuid)
+            
+    def prepare(self):
+        if is_prepared(self.name):
+            return
+        for mdc in self.mdclist:
+            try:
+                # Only ignore connect failures with --force, which
+                # isn't implemented here yet.
+                mdc.prepare(ignore_connect_failure=0)
+            except CommandError, e:
+                print "Error preparing LMV %s\n" % mdc.uuid
+                raise e
+        self.info(self.mds_uuid)
+        lctl.lmv_setup(self.name, self.uuid, self.desc_uuid,
+                       string.join(self.devlist))
+
+    def cleanup(self):
+        for mdc in self.mdclist:
+            mdc.cleanup()
+        if is_prepared(self.name):
+            Module.cleanup(self)
+
+    def load_module(self):
+        for mdc in self.mdclist:
+            mdc.load_module()
+            break
+        Module.load_module(self)
+
+    def cleanup_module(self):
+        Module.cleanup_module(self)
+        for mds in self.mdclist:
+            mdc.cleanup_module()
+            break
+
+    def correct_level(self, level, op=None):
+        return level
+
 class MDSDEV(Module):
     def __init__(self,db):
         Module.__init__(self, 'MDSDEV', db)
         self.devpath = self.db.get_val('devpath','')
-        self.backdevpath = self.db.get_val('backdevpath','')
         self.size = self.db.get_val_int('devsize', 0)
         self.journal_size = self.db.get_val_int('journalsize', 0)
         self.fstype = self.db.get_val('fstype', '')
-        self.backfstype = self.db.get_val('backfstype', '')
         self.nspath = self.db.get_val('nspath', '')
         self.mkfsoptions = self.db.get_val('mkfsoptions', '')
-        self.mountfsoptions = self.db.get_val('mountfsoptions', '')
         # overwrite the orignal MDSDEV name and uuid with the MDS name and uuid
         target_uuid = self.db.get_first_ref('target')
         mds = self.db.lookup(target_uuid)
         self.name = mds.getName()
         self.filesystem_uuids = mds.get_refs('filesystem')
+	self.lmv_uuid = ''
+        self.master_mds = ""
+	if not self.filesystem_uuids:
+	    self.lmv_uuid = self.db.get_first_ref('lmv')
+	    if not self.lmv_uuid:
+	        panic("ALERT: can't find lvm uuid")
+	    if self.lmv_uuid:
+	        self.lmv = self.db.lookup(self.lmv_uuid)
+	        if self.lmv:
+	            self.filesystem_uuids = self.lmv.get_refs('filesystem')
+                    self.master_mds = self.lmv_uuid
         # FIXME: if fstype not set, then determine based on kernel version
         self.format = self.db.get_val('autoformat', "no")
         if mds.get_val('failover', 0):
@@ -1415,17 +1474,29 @@ class MDSDEV(Module):
             self.active = 0
         if self.active and config.group and config.group != mds.get_val('group'):
             self.active = 0
+        self.active = 1
 
         self.inode_size = self.db.get_val_int('inodesize', 0)
         if self.inode_size == 0:
             # find the LOV for this MDS
             lovconfig_uuid = mds.get_first_ref('lovconfig')
             if not lovconfig_uuid:
-                panic("No LOV config found for MDS ", mds.name)
-            lovconfig = mds.lookup(lovconfig_uuid)
-            lov_uuid = lovconfig.get_first_ref('lov')
-            if not lov_uuid:
-                panic("No LOV found for lovconfig ", lovconfig.name)
+                if not self.lmv_uuid:
+                    panic("No LOV found for lovconfig ", lovconfig.name)
+                lovconfig_uuid = self.lmv.get_first_ref('lovconfig')
+                lovconfig = self.lmv.lookup(lovconfig_uuid)
+                lov_uuid = lovconfig.get_first_ref('lov')
+                if not lov_uuid:
+                    panic("No LOV found for lovconfig ", lovconfig.name)
+	    else:
+                lovconfig = mds.lookup(lovconfig_uuid)
+                lov_uuid = lovconfig.get_first_ref('lov')
+                if not lov_uuid:
+                    panic("No LOV found for lovconfig ", lovconfig.name)
+                lovconfig_uuid = self.lmv.get_first_ref('lovconfig')
+                lovconfig = self.lmv.lookup(lovconfig_uuid)
+                lov_uuid = lovconfig.get_first_ref('lov')
+
             lov = LOV(self.db.lookup(lov_uuid), lov_uuid, 'FS_name', config_only = 1)
 
             # default stripe count controls default inode_size
@@ -1443,26 +1514,19 @@ class MDSDEV(Module):
 
         self.target_dev_uuid = self.uuid
         self.uuid = target_uuid
-
-        # loading modules
+ 	# setup LMV
+ 	if self.master_mds:
+            client_uuid = generate_client_uuid(self.name)
+ 	    self.master = LMV(self.db.lookup(self.lmv_uuid), client_uuid, self.name, self.name)
+ 	    self.master_mds = self.master.name
+        # modules
         self.add_lustre_module('mdc', 'mdc')
         self.add_lustre_module('osc', 'osc')
         self.add_lustre_module('lov', 'lov')
+        self.add_lustre_module('lmv', 'lmv')
         self.add_lustre_module('mds', 'mds')
-
-        if self.fstype == 'smfs':
-            self.add_lustre_module('smfs', 'smfs')
-        
-        if self.fstype == 'ldiskfs':
-            self.add_lustre_module('ldiskfs', 'ldiskfs')
-
         if self.fstype:
             self.add_lustre_module('lvfs', 'fsfilt_%s' % (self.fstype))
-            
-        # if fstype is smfs, then we should also take care about backing 
-        # store fs.
-        if self.fstype == 'smfs':
-            self.add_lustre_module('lvfs', 'fsfilt_%s' % (self.backfstype))
 
     def load_module(self):
         if self.active:
@@ -1479,48 +1543,19 @@ class MDSDEV(Module):
             self.write_conf()
         self.info(self.devpath, self.fstype, self.size, self.format)
         run_acceptors()
+ 	# prepare LMV
+ 	if self.master_mds:
+             self.master.prepare()
         # never reformat here
         blkdev = block_dev(self.devpath, self.size, self.fstype, 0,
                            self.format, self.journal_size, self.inode_size,
-                           self.mkfsoptions, self.backfstype, self.backdevpath)
-        
+                           self.mkfsoptions)
         if not is_prepared('MDT'):
             lctl.newdev("mdt", 'MDT', 'MDT_UUID', setup ="")
         try: 
-            mountfsoptions = def_mount_options(self.fstype, 'mds')
-            
-            if config.mountfsoptions:
-                if mountfsoptions:
-                    mountfsoptions = mountfsoptions + ',' + config.mountfsoptions
-                else:
-                    mountfsoptions = config.mountfsoptions
-                if self.mountfsoptions:
-                    mountfsoptions = mountfsoptions + ',' + self.mountfsoptions
-            else:
-                if self.mountfsoptions:
-                    if mountfsoptions:
-                        mountfsoptions = mountfsoptions + ',' + self.mountfsoptions
-                    else:
-                        mountfsoptions = self.mountfsoptions
-            
-            if self.fstype == 'smfs':
-                realdev = self.fstype
-                
-                if mountfsoptions:
-                    mountfsoptions = "%s,type=%s,dev=%s" % (mountfsoptions, 
-                                                            self.backfstype, 
-                                                            blkdev)
-                else:
-                    mountfsoptions = "type=%s,dev=%s" % (self.backfstype, 
-                                                         blkdev)
-            else:
-                realdev = blkdev
-                
-            print 'MDS mount options: ' + mountfsoptions
-                
             lctl.newdev("mds", self.name, self.uuid,
-                        setup ="%s %s %s %s" %(realdev, self.fstype, 
-                                               self.name, mountfsoptions))
+                        setup ="%s %s %s %s"
+				%(blkdev, self.fstype, self.name, self.master_mds))
         except CommandError, e:
             if e.rc == 2:
                 panic("MDS is missing the config log. Need to run " +
@@ -1532,56 +1567,12 @@ class MDSDEV(Module):
         if is_prepared(self.name):
             return
         self.info(self.devpath, self.fstype, self.format)
-
         blkdev = block_dev(self.devpath, self.size, self.fstype,
                            config.reformat, self.format, self.journal_size,
-                           self.inode_size, self.mkfsoptions, self.backfstype,
-                           self.backdevpath)
-
-	# Even for writing logs we mount mds with supplied mount options
-	# because it will not mount smfs (if used) otherwise.
-	
-        mountfsoptions = def_mount_options(self.fstype, 'mds')
-            
-        if config.mountfsoptions:
-            if mountfsoptions:
-                mountfsoptions = mountfsoptions + ',' + config.mountfsoptions
-            else:
-                mountfsoptions = config.mountfsoptions
-            if self.mountfsoptions:
-                mountfsoptions = mountfsoptions + ',' + self.mountfsoptions
-        else:
-            if self.mountfsoptions:
-                if mountfsoptions:
-                    mountfsoptions = mountfsoptions + ',' + self.mountfsoptions
-                else:
-                    mountfsoptions = self.mountfsoptions
-            
-        if self.fstype == 'smfs':
-            realdev = self.fstype
-                
-            if mountfsoptions:
-                mountfsoptions = "%s,type=%s,dev=%s" % (mountfsoptions, 
-                                                        self.backfstype, 
-                                                        blkdev)
-            else:
-                mountfsoptions = "type=%s,dev=%s" % (self.backfstype, 
-                                                     blkdev)
-        else:
-            realdev = blkdev
-	
-        print 'MDS mount options: ' + mountfsoptions
-        
-	# As mount options are passed by 4th param to config tool, we need 
-	# to pass something in 3rd param. But we do not want this 3rd param
-	# be counted as a profile name for reading log on MDS setup, thus,
-	# we pass there some predefined sign like 'dumb', which will be 
-        # checked in MDS code and skipped. Probably there is more nice way
-        # like pass empty string and check it in config tool and pass null
-        # as 4th param.
+                           self.inode_size, self.mkfsoptions)
         lctl.newdev("mds", self.name, self.uuid,
-                    setup ="%s %s %s %s" %(realdev, self.fstype, 
-                                           'dumb', mountfsoptions))
+                    setup ="%s %s" %(blkdev, self.fstype))
+ 
         # record logs for the MDS lov
         for uuid in self.filesystem_uuids:
             log("recording clients for filesystem:", uuid)
@@ -1649,13 +1640,9 @@ class MDSDEV(Module):
             log(self.module_name, "cleanup failed: ", self.name)
             e.dump()
             cleanup_error(e.rc)
-            Module.cleanup(self)
-        
-        if self.fstype == 'smfs':
-            clean_loop(self.backdevpath)
-        else:
-            clean_loop(self.devpath)
- 
+	    Module.cleanup(self)
+	clean_loop(self.devpath)
+
     def msd_remaining(self):
         out = lctl.device_list()
         for s in out:
@@ -1682,6 +1669,9 @@ class MDSDEV(Module):
                 e.dump()
                 cleanup_error(e.rc)
                 Module.cleanup(self)
+	    # cleanup LMV
+	    if self.master_mds:
+                self.master.cleanup()
         if not self.msd_remaining() and is_prepared('MDT'):
             try:
                 lctl.cleanup("MDT", "MDT_UUID", config.force,
@@ -1690,25 +1680,23 @@ class MDSDEV(Module):
                 print "cleanup failed: ", self.name
                 e.dump()
                 cleanup_error(e.rc)
-        
-        if self.fstype == 'smfs':
-            clean_loop(self.backdevpath)
-        else:
-            clean_loop(self.devpath)
+        clean_loop(self.devpath)
+
+    def correct_level(self, level, op=None):
+	#if self.master_mds:
+	#   level = level + 2
+        return level
 
 class OSD(Module):
     def __init__(self, db):
         Module.__init__(self, 'OSD', db)
         self.osdtype = self.db.get_val('osdtype')
         self.devpath = self.db.get_val('devpath', '')
-        self.backdevpath = self.db.get_val('backdevpath', '')
         self.size = self.db.get_val_int('devsize', 0)
         self.journal_size = self.db.get_val_int('journalsize', 0)
         self.inode_size = self.db.get_val_int('inodesize', 0)
         self.mkfsoptions = self.db.get_val('mkfsoptions', '')
-        self.mountfsoptions = self.db.get_val('mountfsoptions', '')
         self.fstype = self.db.get_val('fstype', '')
-        self.backfstype = self.db.get_val('backfstype', '')
         self.nspath = self.db.get_val('nspath', '')
         target_uuid = self.db.get_first_ref('target')
         ost = self.db.lookup(target_uuid)
@@ -1733,16 +1721,9 @@ class OSD(Module):
         self.uuid = target_uuid
         # modules
         self.add_lustre_module('ost', 'ost')
-        if self.fstype == 'smfs':
-            self.add_lustre_module('smfs', 'smfs')
         # FIXME: should we default to ext3 here?
-        if self.fstype == 'ldiskfs':
-            self.add_lustre_module('ldiskfs', 'ldiskfs')
         if self.fstype:
             self.add_lustre_module('lvfs' , 'fsfilt_%s' % (self.fstype))
-        if self.fstype == 'smfs':
-            self.add_lustre_module('lvfs' , 'fsfilt_%s' % (self.backfstype))
-
         self.add_lustre_module(self.osdtype, self.osdtype)
 
     def load_module(self):
@@ -1766,44 +1747,10 @@ class OSD(Module):
         else:
             blkdev = block_dev(self.devpath, self.size, self.fstype,
                                config.reformat, self.format, self.journal_size,
-                               self.inode_size, self.mkfsoptions, self.backfstype,
-                               self.backdevpath)
-
-        mountfsoptions = def_mount_options(self.fstype, 'ost')
-            
-        if config.mountfsoptions:
-            if mountfsoptions:
-                mountfsoptions = mountfsoptions + ',' + config.mountfsoptions
-            else:
-                mountfsoptions = config.mountfsoptions
-            if self.mountfsoptions:
-                mountfsoptions = mountfsoptions + ',' + self.mountfsoptions
-        else:
-            if self.mountfsoptions:
-                if mountfsoptions:
-                    mountfsoptions = mountfsoptions + ',' + self.mountfsoptions
-                else:
-                    mountfsoptions = self.mountfsoptions
-            
-        if self.fstype == 'smfs':
-            realdev = self.fstype
-                
-            if mountfsoptions:
-                mountfsoptions = "%s,type=%s,dev=%s" % (mountfsoptions, 
-                                                        self.backfstype, 
-                                                        blkdev)
-            else:
-                mountfsoptions = "type=%s,dev=%s" % (self.backfstype, 
-                                                     blkdev)
-        else:
-            realdev = blkdev
-                
-        print 'OSD mount options: ' + mountfsoptions
-        
+                               self.inode_size, self.mkfsoptions)
         lctl.newdev(self.osdtype, self.name, self.uuid,
-                    setup ="%s %s %s %s" %(realdev, self.fstype,
-                                           self.failover_ost, 
-                                           mountfsoptions))
+                    setup ="%s %s %s" %(blkdev, self.fstype,
+                                           self.failover_ost))
         if not is_prepared('OSS'):
             lctl.newdev("ost", 'OSS', 'OSS_UUID', setup ="")
 
@@ -1841,17 +1788,17 @@ class OSD(Module):
                 e.dump()
                 cleanup_error(e.rc)
         if not self.osdtype == 'obdecho':
-            if self.fstype == 'smfs':
-                clean_loop(self.backdevpath)
-            else:
-                clean_loop(self.devpath)
+            clean_loop(self.devpath)
+
+    def correct_level(self, level, op=None):
+        return level
 
 def mgmt_uuid_for_fs(mtpt_name):
     if not mtpt_name:
         return ''
-    mtpt_db = toplustreDB.lookup_name(mtpt_name)
+    mtpt_db = toplevel.lookup_name(mtpt_name)
     fs_uuid = mtpt_db.get_first_ref('filesystem')
-    fs = toplustreDB.lookup(fs_uuid)
+    fs = toplevel.lookup(fs_uuid)
     if not fs:
         return ''
     return fs.get_first_ref('mgmt')
@@ -1866,8 +1813,8 @@ class Client(Module):
 
         self.tgt_dev_uuid = get_active_target(tgtdb)
         if not self.tgt_dev_uuid:
-            panic("No target device found for target:", self.target_name)
-            
+            panic("No target device found for target(1):", self.target_name)
+        
         self.kmod = kmod(config.lustre, config.portals)
         self._server = None
         self._connected = 0
@@ -1943,6 +1890,9 @@ class Client(Module):
                 e.dump()
                 cleanup_error(e.rc)
 
+    def correct_level(self, level, op=None):
+        return level
+
 
 class MDC(Client):
     def __init__(self, db, uuid, fs_name):
@@ -1984,6 +1934,8 @@ class COBD(Module):
         lctl.newdev("cobd", self.name, self.uuid,
                     setup ="%s %s" %(self.real_uuid, self.cache_uuid))
 
+    def correct_level(self, level, op=None):
+        return level
 
 # virtual interface for  OSC and LOV
 class VOSC(Module):
@@ -2005,6 +1957,31 @@ class VOSC(Module):
         self.osc.load_module()
     def cleanup_module(self):
         self.osc.cleanup_module()
+    def correct_level(self, level, op=None):
+        return self.osc.correct_level(level, op)
+
+# virtual interface for MDC and LMV
+class VMDC(Module):
+    def __init__(self, db, uuid, fs_name, name_override = None):
+        Module.__init__(self, 'VMDC', db)
+        if db.get_class() == 'lmv':
+            self.mdc = LMV(db, uuid, fs_name)
+        else:
+            self.mdc = MDC(db, uuid, fs_name)
+    def get_uuid(self):
+        return self.mdc.uuid
+    def get_name(self):
+        return self.mdc.name
+    def prepare(self):
+        self.mdc.prepare()
+    def cleanup(self):
+        self.mdc.cleanup()
+    def load_module(self):
+        self.mdc.load_module()
+    def cleanup_module(self):
+        self.mdc.cleanup_module()
+    def correct_level(self, level, op=None):
+        return self.osc.correct_level(level, op)
 
 
 class ECHO_CLIENT(Module):
@@ -2039,6 +2016,8 @@ class ECHO_CLIENT(Module):
         Module.cleanup_module(self)
         self.osc.cleanup_module()
 
+    def correct_level(self, level, op=None):
+        return level
 
 def generate_client_uuid(name):
         client_uuid = '%05x_%.19s_%05x%05x' % (int(random.random() * 1048576),
@@ -2054,15 +2033,21 @@ class Mountpoint(Module):
         self.path = self.db.get_val('path')
         self.fs_uuid = self.db.get_first_ref('filesystem')
         fs = self.db.lookup(self.fs_uuid)
-        self.mds_uuid = fs.get_first_ref('mds')
+        self.mds_uuid = fs.get_first_ref('lmv')
+	if not self.mds_uuid:
+	    self.mds_uuid = fs.get_first_ref('mds')
         self.obd_uuid = fs.get_first_ref('obd')
         self.mgmt_uuid = fs.get_first_ref('mgmt')
         obd = self.db.lookup(self.obd_uuid)
         client_uuid = generate_client_uuid(self.name)
         self.vosc = VOSC(obd, client_uuid, self.name)
-        self.mdc = get_mdc(db, client_uuid, self.name, self.mds_uuid)
-
+        self.mds = self.db.lookup(self.mds_uuid)
+	if not self.mds:
+	    panic("no mds: ", self.mds_uuid)
         self.add_lustre_module('mdc', 'mdc')
+        self.add_lustre_module('lmv', 'lmv')
+	self.vmdc = VMDC(self.mds, client_uuid, self.name, self.mds_uuid)
+	self.mdc = self.vmdc.mdc
         self.add_lustre_module('llite', 'llite')
         if self.mgmt_uuid:
             self.mgmtcli = ManagementClient(db.lookup(self.mgmt_uuid),
@@ -2128,6 +2113,8 @@ class Mountpoint(Module):
         if self.mgmtcli:
             self.mgmtcli.cleanup_module()
 
+    def correct_level(self, level, op=None):
+        return level
 
 # ============================================================
 # misc query functions
@@ -2141,7 +2128,7 @@ def get_ost_net(self, osd_uuid):
     node = self.lookup(node_uuid)
     if not node:
         panic("unable to find node for osd_uuid:", osd_uuid,
-              " node_ref:", node_uuid)
+              " node_ref:", node_uuid_)
     for net_uuid in node.get_networks():
         db = node.lookup(net_uuid)
         srv_list.append(Network(db))
@@ -2164,6 +2151,8 @@ def getServiceLevel(self):
         ret = 30
     elif type in ('mdsdev',):
         ret = 40
+    elif type in ('lmv',):
+        ret = 45
     elif type in ('mountpoint', 'echoclient'):
         ret = 70
     else:
@@ -2178,7 +2167,7 @@ def getServiceLevel(self):
 # [(level, db_object),]
 def getServices(self):
     list = []
-    for ref_class, ref_uuid in self.get_all_refs(): 
+    for ref_class, ref_uuid in self.get_all_refs():
             servdb = self.lookup(ref_uuid)
             if  servdb:
                 level = getServiceLevel(servdb)
@@ -2204,13 +2193,12 @@ def get_osc(ost_db, uuid, fs_name):
 def get_mdc(db, uuid, fs_name, mds_uuid):
     mds_db = db.lookup(mds_uuid);
     if not mds_db:
-        panic("no mds:", mds_uuid)
-    mdc = MDC(mds_db, uuid, fs_name)
+        error("no mds:", mds_uuid)
+    mdc = MDC(mds_db, mds_uuid, fs_name)
     return mdc
 
 ############################################################
 # routing ("rooting")
-
 # list of (nettype, cluster_id, nid)
 local_clusters = []
 
@@ -2347,6 +2335,8 @@ def newService(db):
         n = ECHO_CLIENT(db)
     elif type == 'mgmt':
         n = Management(db)
+    elif type == 'lmv':
+        n = LMV(db)
     else:
         panic ("unknown service type:", type)
     return n
@@ -2378,9 +2368,18 @@ def doWriteconf(services):
 def doSetup(services):
     if config.nosetup:
         return
+    slist = []
     for s in services:
         n = newService(s[1])
-        n.prepare()
+	n.level = s[0]
+	slist.append((n.level, n))
+    nlist = []
+    for n in slist:
+	nl = n[1].correct_level(n[0])
+	nlist.append((nl, n[1]))
+    nlist.sort()
+    for n in nlist:
+        n[1].prepare()
     
 def doModules(services):
     if config.nomod:
@@ -2392,11 +2391,20 @@ def doModules(services):
 def doCleanup(services):
     if config.nosetup:
         return
-    services.reverse()
+    slist = []
     for s in services:
         n = newService(s[1])
-        if n.safe_to_clean():
-            n.cleanup()
+	n.level = s[0]
+	slist.append((n.level, n))
+    nlist = []
+    for n in slist:
+	nl = n[1].correct_level(n[0])
+	nlist.append((nl, n[1]))
+    nlist.sort()
+    nlist.reverse()
+    for n in nlist:
+        if n[1].safe_to_clean():
+            n[1].cleanup()
 
 def doUnloadModules(services):
     if config.nomod:
@@ -2436,7 +2444,6 @@ def doHost(lustreDB, hosts):
     prof_list = node_db.get_refs('profile')
 
     if config.write_conf:
-        lustreDB.close()
         for_each_profile(node_db, prof_list, doModules)
         sys_make_devices()
         for_each_profile(node_db, prof_list, doWriteconf)
@@ -2465,7 +2472,6 @@ def doHost(lustreDB, hosts):
 
         for_each_profile(node_db, prof_list, doCleanup)
         for_each_profile(node_db, prof_list, doUnloadModules)
-        lustreDB.close()
 
     else:
         # ugly hack, only need to run lctl commands for --dump
@@ -2496,24 +2502,22 @@ def doHost(lustreDB, hosts):
         sys_set_portals_upcall(portals_upcall)
 
         for_each_profile(node_db, prof_list, doSetup)
-        lustreDB.close()
 
-def doRecovery(lustreDB, lctl, tgt_uuid, client_uuid, nid_uuid):
-    tgt = lustreDB.lookup(tgt_uuid)
+def doRecovery(db, lctl, tgt_uuid, client_uuid, nid_uuid):
+    tgt = db.lookup(tgt_uuid)
     if not tgt:
         raise Lustre.LconfError("doRecovery: "+ tgt_uuid +" not found.")
     new_uuid = get_active_target(tgt)
     if not new_uuid:
         raise Lustre.LconfError("doRecovery: no active target found for: " +
                                 tgt_uuid)
-    net = choose_local_server(get_ost_net(lustreDB, new_uuid))
+    net = choose_local_server(get_ost_net(db, new_uuid))
     if not net:
         raise Lustre.LconfError("Unable to find a connection to:" + new_uuid)
 
     log("Reconnecting", tgt_uuid, " to ",  net.nid_uuid);
     try:
-        oldnet = get_server_by_nid_uuid(lustreDB, nid_uuid)
-        lustreDB.close()
+        oldnet = get_server_by_nid_uuid(db, nid_uuid)
         if oldnet:
             lctl.disconnect(oldnet)
     except CommandError, e:
@@ -2533,7 +2537,6 @@ def setupModulePath(cmd, portals_dir = PORTALS_DIR):
     base = os.path.dirname(cmd)
     if development_mode():
         if not config.lustre:
-            debug('using objdir module paths')            
             config.lustre = (os.path.join(base, ".."))
         # normalize the portals dir, using command line arg if set
         if config.portals:
@@ -2717,7 +2720,6 @@ lconf_options = [
     ('nosetup', "Skip device setup/cleanup step."),
     ('reformat', "Reformat all devices (without question)"),
     ('mkfsoptions', "Additional options for the mk*fs command line", PARAM),
-    ('mountfsoptions', "Additional options for mount fs command line", PARAM),
     ('dump',  "Dump the kernel debug log to file before portals is unloaded",
                PARAM),
     ('write_conf', "Save all the client config information on mds."),
@@ -2761,7 +2763,7 @@ lconf_options = [
     ]      
 
 def main():
-    global lctl, config, toplustreDB, CONFIG_FILE
+    global lctl, config, toplevel, CONFIG_FILE
 
     # in the upcall this is set to SIG_IGN
     signal.signal(signal.SIGCHLD, signal.SIG_DFL)
@@ -2792,30 +2794,16 @@ def main():
     init_select(config.select)
 
     if len(args) > 0:
-        # allow config to be fetched via HTTP, but only with python2
-        if sys.version[0] != '1' and args[0].startswith('http://'):
-            import urllib2
-            try:
-                config_file = urllib2.urlopen(args[0])
-            except (urllib2.URLError, socket.error), err:
-                if hasattr(err, 'args'):
-                    err = err.args[1]
-                print "Could not access '%s': %s" %(args[0], err)
-                sys.exit(1)
-        elif not os.access(args[0], os.R_OK):
+        if not os.access(args[0], os.R_OK):
             print 'File not found or readable:', args[0]
             sys.exit(1)
-        else:
-            # regular file
-            config_file = open(args[0], 'r')
         try:
-            dom = xml.dom.minidom.parse(config_file)
+            dom = xml.dom.minidom.parse(args[0])
         except Exception:
             panic("%s does not appear to be a config file." % (args[0]))
             sys.exit(1) # make sure to die here, even in debug mode.
-        config_file.close()
         CONFIG_FILE = args[0]
-        lustreDB = Lustre.LustreDB_XML(dom.documentElement, dom.documentElement)
+        db = Lustre.LustreDB_XML(dom.documentElement, dom.documentElement)
         if not config.config:
             config.config = os.path.basename(args[0])# use full path?
             if config.config[-4:] == '.xml':
@@ -2824,7 +2812,7 @@ def main():
         if not config.config:
             panic("--ldapurl requires --config name")
         dn = "config=%s,fs=lustre" % (config.config)
-        lustreDB = Lustre.LustreDB_LDAP('', {}, base=dn, url = config.ldapurl)
+        db = Lustre.LustreDB_LDAP('', {}, base=dn, url = config.ldapurl)
     elif config.ptldebug or config.subsystem:
         sys_set_ptldebug(None)
         sys_set_subsystem(None)
@@ -2834,9 +2822,9 @@ def main():
         print 'see lconf --help for command summary'
         sys.exit(1)
 
-    toplustreDB = lustreDB
+    toplevel = db
 
-    ver = lustreDB.get_version()
+    ver = db.get_version()
     if not ver:
         panic("No version found in config data, please recreate.")
     if ver != Lustre.CONFIG_VERSION:
@@ -2868,7 +2856,7 @@ def main():
         lctl.clear_log(config.record_device, config.record_log)
         lctl.record(config.record_device, config.record_log)
 
-    doHost(lustreDB, node_list)
+    doHost(db, node_list)
 
     if config.record:
         lctl.end_record()
diff --git a/lustre/utils/lctl.c b/lustre/utils/lctl.c
index e553584..6c05849 100644
--- a/lustre/utils/lctl.c
+++ b/lustre/utils/lctl.c
@@ -27,6 +27,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <portals/api-support.h>
 #include <portals/ptlctl.h>
 #include "obdctl.h"
 #include "parser.h"
@@ -64,17 +65,17 @@ command_t cmdlist[] = {
         /* Network configuration commands */
         {"==== network config ====", jt_noop, 0, "network config"},
         {"--net", jt_opt_net, 0, "run <command> after setting network to <net>\n"
-         "usage: --net <tcp/elan/myrinet> <command>"},
+         "usage: --net <tcp/elan/myrinet/scimac> <command>"},
         {"network", jt_ptl_network, 0, "commands that follow apply to net\n"
-         "usage: network <tcp/elan/myrinet>"},
+         "usage: network <tcp/elan/myrinet/scimac>"},
         {"autoconn_list", jt_ptl_print_autoconnects, 0, "print autoconnect entries\n"
          "usage: print_autoconns"},
         {"add_autoconn", jt_ptl_add_autoconnect, 0, "add an autoconnect entry\n"
          "usage: add_autoconn <nid> <host> <port> [ise]"},
         {"del_autoconn", jt_ptl_del_autoconnect, 0, "remove an autoconnect entry\n"
          "usage: del_autoconn [<nid>] [<host>] [ks]"},
-        {"conn_list", jt_ptl_print_connections, 0, "print all the connected remote nid\n"
-         "usage: conn_list"},
+        {"conn_list", jt_ptl_print_connections, 0, "connect to a remote nid\n"
+         "usage: print_conns"},
         {"connect", jt_ptl_connect, 0, "connect to a remote nid\n"
          "usage: connect <host> <port> [iIOC]"},
         {"disconnect", jt_ptl_disconnect, 0, "disconnect from a remote nid\n"
@@ -83,14 +84,14 @@ command_t cmdlist[] = {
          "usage: active_tx"},
         {"mynid", jt_ptl_mynid, 0, "inform the socknal of the local nid. "
          "The nid defaults to hostname for tcp networks and is automatically "
-         "setup for elan/myrinet networks.\n"
+         "setup for elan/myrinet/scimac networks.\n"
          "usage: mynid [<nid>]"},
         {"shownid", jt_ptl_shownid, 0, "print the local NID\n"
          "usage: shownid"},
         {"add_uuid", jt_lcfg_add_uuid, 0, "associate a UUID with a nid\n"
          "usage: add_uuid <uuid> <nid> <net_type>"},
         {"close_uuid", jt_obd_close_uuid, 0, "disconnect a UUID\n"
-         "usage: close_uuid <uuid> <net_type>"},
+         "usage: close_uuid <uuid> <net-type>)"},
         {"del_uuid", jt_lcfg_del_uuid, 0, "delete a UUID association\n"
          "usage: del_uuid <uuid>"},
         {"add_route", jt_ptl_add_route, 0,
@@ -127,7 +128,7 @@ command_t cmdlist[] = {
          "usage: device <%name|$name|devno>"},
         {"cfg_device", jt_lcfg_device, 0,
          "set current device being configured to <$name>\n"
-         "usage: cfg_device <name>"},
+         "usage: device <name>"},
         {"device_list", jt_obd_list, 0, "show all devices\n"
          "usage: device_list"},
         {"dl", jt_obd_list, 0, "show all devices\n"
@@ -152,6 +153,9 @@ command_t cmdlist[] = {
         {"lov_setup", jt_lcfg_lov_setup, 0,
          "write setup an lov device\n"
          "usage: lov_setconfig lov-uuid stripe-count stripe-size offset pattern UUID1 [UUID2 ...]"},
+        {"lmv_setup", jt_lcfg_lmv_setup, 0,
+         "write setup an lmv device\n"
+         "usage: lmv_setconfig lmv-uuid UUID1 [UUID2 ...]"},
         {"lov_getconfig", jt_obd_lov_getconfig, 0,
          "read lov configuration from an mds device\n"
          "usage: lov_getconfig lov-uuid"},
@@ -253,24 +257,24 @@ command_t cmdlist[] = {
          "       check all records from index 1 by default."},
          {"llog_cancel", jt_llog_cancel, 0,
          "cancel one record in log.\n"
-         "usage: llog_cancel <catalog id|catalog name> <log id> <index>"},
+         "usage: llog_cancel <catlog id|catlog name> <log id> <index>"},
         {"llog_remove", jt_llog_remove, 0,
-         "remove one log from catalog, erase it from disk.\n"
-         "usage: llog_remove <catalog id|catalog name> <log id>"},
+         "remove one log from catlog, erase it from disk.\n"
+         "usage: llog_remove <catlog id|catlog name> <log id>"},
 
         /* Debug commands */
         {"======== debug =========", jt_noop, 0, "debug"},
         {"debug_daemon", jt_dbg_debug_daemon, 0,
-         "debug daemon control and dump to a file\n"
+         "debug daemon control and dump to a file"
          "usage: debug_daemon [start file <#MB>|stop|pause|continue]"},
         {"debug_kernel", jt_dbg_debug_kernel, 0,
-         "get debug buffer and dump to a file\n"
+         "get debug buffer and dump to a file"
          "usage: debug_kernel [file] [raw]"},
         {"dk", jt_dbg_debug_kernel, 0,
-         "get debug buffer and dump to a file\n"
+         "get debug buffer and dump to a file"
          "usage: dk [file] [raw]"},
         {"debug_file", jt_dbg_debug_file, 0,
-         "read debug buffer from input and dump to output\n"
+         "read debug buffer from input and dump to output"
          "usage: debug_file <input> [output] [raw]"},
         {"clear", jt_dbg_clear_debug_buf, 0, "clear kernel debug buffer\n"
          "usage: clear"},
@@ -278,7 +282,7 @@ command_t cmdlist[] = {
          "usage: mark <text>"},
         {"filter", jt_dbg_filter, 0, "filter message type\n"
          "usage: filter <subsystem id/debug mask>"},
-        {"show", jt_dbg_show, 0, "Show specific type of messages\n"
+        {"show", jt_dbg_show, 0, "show message type\n"
          "usage: show <subsystem id/debug mask>"},
         {"debug_list", jt_dbg_list, 0, "list subsystem and debug types\n"
          "usage: debug_list <subs/types>"},
diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c
index 4d3900e..54fb7a4 100644
--- a/lustre/utils/lfs.c
+++ b/lustre/utils/lfs.c
@@ -29,18 +29,24 @@
 #include <getopt.h>
 #include <string.h>
 #include <mntent.h>
+#include <portals/api-support.h>
 #include <portals/ptlctl.h>
 
 #include <liblustre.h>
 #include <linux/lustre_idl.h>
-#include <lustre/liblustreapi.h>
-#include <lustre/lustre_user.h>
+#include <linux/lustre_user.h>
 
 #include "parser.h"
 #include "obdctl.h"
 
+extern int op_find(char *path, struct obd_uuid *obduuid, int recursive,
+                int verbose, int quiet);
+extern int op_check(int type_num, char **obd_type_p, char *dir);
+extern int op_catinfo(char *dir, char *keyword, char *node_name);
+
 /* all functions */
 static int lfs_setstripe(int argc, char **argv);
+static int lfs_dirstripe(int argc, char **argv);
 static int lfs_find(int argc, char **argv);
 static int lfs_getstripe(int argc, char **argv);
 static int lfs_osts(int argc, char **argv);
@@ -50,28 +56,33 @@ static int lfs_catinfo(int argc, char **argv);
 /* all avaialable commands */
 command_t cmdlist[] = {
         {"setstripe", lfs_setstripe, 0,
-         "Create a new file with a specific striping pattern or\n"
-         "Set the default striping pattern on an existing directory\n"
-         "usage: setstripe <filename|dirname> <stripe size> <stripe start> <stripe count>\n"
+         "To create a new file with a specific striping pattern.\n"
+         "usage: setstripe <filename> <stripe size> <stripe start> <stripe count>\n"
          "\tstripe size:  Number of bytes in each stripe (0 default)\n"
          "\tstripe start: OST index of first stripe (-1 default)\n"
-         "\tstripe count: Number of OSTs to stripe over (0 default, -1 all)"},
+         "\tstripe count: Number of OSTs to stripe over (0 default)"},
+        {"dirstripe", lfs_dirstripe, 0,
+         "To create a new dir with a specific striping pattern.\n"
+         "usage: dirstripe <dirname> <stripe count> [<mds idx list>]\n"
+         "\tstripe count: Number of MDSes to stripe over (0 default)\n"
+         "\tmds idx list: List of MDS servers to contain the dir (not implemented)"},
+
         {"find", lfs_find, 0,
-         "To list the extended attributes for a given filename or files in a\n"
-         "directory or recursively for all files in a directory tree.\n"
+         "To list the extended attributes for a given filename or files in a directory "
+         "or recursively for all files in a directory tree.\n"
          "usage: find [--obd <uuid>] [--quiet | --verbose] [--recursive] <dir|file> ..."},
         {"getstripe", lfs_getstripe, 0,
          "To list the striping pattern for given filename.\n"
          "usage:getstripe <filename>"},
         {"check", lfs_check, 0,
-         "Display the status of MDS or OSTs (as specified in the command)\n"
+         "Display the status of MDS or OSTs (as specified in the command) "
          "or all the servers (MDS and OSTs).\n"
          "usage: check <osts|mds|servers>"},
         {"catinfo", lfs_catinfo, 0,
          "Show information of specified type logs.\n"
-         "usage: catinfo {keyword} [node name]\n"
-         "\tkeywords are one of followings: config, deletions.\n"
-         "\tnode name must be provided when use keyword config."},
+         "usage: catinfo <keyword> [node name]"
+         "keywords are one of followings: config, deletions.\n"
+         "client node name must be provided when use keyword config."},
         {"osts", lfs_osts, 0, "osts"},
         {"help", Parser_help, 0, "help"},
         {"exit", Parser_quit, 0, "quit"},
@@ -112,7 +123,7 @@ static int lfs_setstripe(int argc, char **argv)
                 return CMD_HELP;
         }
 
-        result = llapi_file_create(argv[1], st_size, st_offset, st_count, 0);
+        result = op_create_file(argv[1], st_size, st_offset, st_count);
         if (result)
                 fprintf(stderr, "error: %s: create stripe file failed\n",
                                 argv[0]);
@@ -120,6 +131,31 @@ static int lfs_setstripe(int argc, char **argv)
         return result;
 }
 
+static int lfs_dirstripe(int argc, char **argv)
+{
+        int result;
+        int st_count;
+        char *end;
+
+        if (argc != 3)
+                return CMD_HELP;
+
+        // get the stripe size
+        st_count = strtoul(argv[2], &end, 0);
+        if (*end != '\0') {
+                fprintf(stderr, "error: %s: bad count '%s'\n",
+                                argv[0], argv[2]);
+                return CMD_HELP;
+        }
+
+        result = op_create_dir(argv[1], st_count);
+        if (result)
+                fprintf(stderr, "error: %s: create stripe dir failed\n",
+                                argv[0]);
+
+        return result;
+}
+
 static int lfs_find(int argc, char **argv)
 {
         struct option long_opts[] = {
@@ -173,7 +209,7 @@ static int lfs_find(int argc, char **argv)
                 return CMD_HELP;
 
         do {
-                rc = llapi_find(argv[optind], obduuid, recursive,verbose,quiet);
+                rc = op_find(argv[optind], obduuid, recursive, verbose, quiet);
         } while (++optind < argc && !rc);
 
         if (rc)
@@ -192,7 +228,7 @@ static int lfs_getstripe(int argc, char **argv)
         optind = 1;
 
         do {
-                rc = llapi_find(argv[optind], obduuid, 0, 0, 0);
+                rc = op_find(argv[optind], obduuid, 0, 0, 0);
         } while (++optind < argc && !rc);
 
         if (rc)
@@ -220,12 +256,11 @@ static int lfs_osts(int argc, char **argv)
         } else {
                 mnt = getmntent(fp);
                 while (feof(fp) == 0 && ferror(fp) ==0) {
-                        if (llapi_is_lustre_mnttype(mnt->mnt_type)) {
-                                rc = llapi_find(mnt->mnt_dir, obduuid, 0, 0, 0);
+                        if (strcmp(mnt->mnt_type, "lustre_lite") == 0) {
+                                rc = op_find(mnt->mnt_dir, obduuid, 0, 0, 0);
                                 if (rc)
-                                        fprintf(stderr,
-                                               "error: lfs osts failed on %s\n",
-                                               mnt->mnt_dir);
+                                        fprintf(stderr, "error: lfs osts failed for %s\n",
+                                                mnt->mnt_dir);
                         }
                         mnt = getmntent(fp);
                 }
@@ -240,25 +275,25 @@ static int lfs_check(int argc, char **argv)
         int rc;
         FILE *fp;
         struct mntent *mnt = NULL;
-        int num_types = 1;
-        char *obd_types[2];
+        int type_num = 1;
+        char *obd_type_p[2];
         char obd_type1[4];
         char obd_type2[4];
 
         if (argc != 2)
                 return CMD_HELP;
 
-        obd_types[1] = obd_type1;
-        obd_types[2] = obd_type2;
-
-        if (strcmp(argv[1], "osts") == 0) {
-                strcpy(obd_types[0], "osc");
-        } else if (strcmp(argv[1], "mds") == 0) {
-                strcpy(obd_types[0], "mdc");
-        } else if (strcmp(argv[1], "servers") == 0) {
-                num_types = 2;
-                strcpy(obd_types[0], "osc");
-                strcpy(obd_types[1], "mdc");
+        obd_type_p[1]=obd_type1;
+        obd_type_p[2]=obd_type2;
+
+        if (strcmp(argv[1],"osts")==0) {
+                strcpy(obd_type_p[0],"osc");
+        } else if (strcmp(argv[1],"mds")==0) {
+                strcpy(obd_type_p[0],"mdc");
+        } else if (strcmp(argv[1],"servers")==0) {
+                type_num=2;
+                strcpy(obd_type_p[0],"osc");
+                strcpy(obd_type_p[1],"mdc");
         } else {
                 fprintf(stderr, "error: %s: option '%s' unrecognized\n",
                                 argv[0], argv[1]);
@@ -272,19 +307,19 @@ static int lfs_check(int argc, char **argv)
         } else {
                 mnt = getmntent(fp);
                 while (feof(fp) == 0 && ferror(fp) ==0) {
-                        if (llapi_is_lustre_mnttype(mnt->mnt_type))
+                        if (strcmp(mnt->mnt_type, "lustre_lite") == 0) 
                                 break;
                         mnt = getmntent(fp);
                 }
                 endmntent(fp);
         }
-
-        rc = llapi_target_check(num_types, obd_types, mnt->mnt_dir);
+           
+        rc = op_check(type_num,obd_type_p,mnt->mnt_dir);
 
         if (rc)
                 fprintf(stderr, "error: %s: %s status failed\n",
                                 argv[0],argv[1]);
-
+                                                                                                                             
         return rc;
 
 }
@@ -294,7 +329,7 @@ static int lfs_catinfo(int argc, char **argv)
         FILE *fp;
         struct mntent *mnt = NULL;
         int rc;
-
+        
         if (argc < 2 || (!strcmp(argv[1],"config") && argc < 3))
                 return CMD_HELP;
 
@@ -303,12 +338,12 @@ static int lfs_catinfo(int argc, char **argv)
 
         fp = setmntent(MOUNTED, "r");
         if (fp == NULL) {
-                 fprintf(stderr, "setmntent(%s): %s:", MOUNTED,
+                 fprintf(stderr, "setmntent(%s): %s:", MOUNTED, 
                          strerror(errno));
         } else {
                 mnt = getmntent(fp);
                 while (feof(fp) == 0 && ferror(fp) == 0) {
-                        if (llapi_is_lustre_mnttype(mnt->mnt_type))
+                        if (strcmp(mnt->mnt_type, "lustre_lite") == 0) 
                                 break;
                         mnt = getmntent(fp);
                 }
@@ -317,9 +352,9 @@ static int lfs_catinfo(int argc, char **argv)
 
         if (mnt) {
                 if (argc == 3)
-                        rc = llapi_catinfo(mnt->mnt_dir, argv[1], argv[2]);
+                        rc = op_catinfo(mnt->mnt_dir, argv[1], argv[2]);
                 else
-                        rc = llapi_catinfo(mnt->mnt_dir, argv[1], NULL);
+                        rc = op_catinfo(mnt->mnt_dir, argv[1], NULL);
         } else {
                 fprintf(stderr, "no lustre_lite mounted.\n");
                 rc = -1;
@@ -333,13 +368,13 @@ int main(int argc, char **argv)
         int rc;
 
         setlinebuf(stdout);
-
+                                                                                                                             
         ptl_initialize(argc, argv);
         if (obd_initialize(argc, argv) < 0)
                 exit(2);
         if (dbg_initialize(argc, argv) < 0)
                 exit(3);
-
+                                                                                                                             
         Parser_init("lfs > ", cmdlist);
 
         if (argc > 1) {
diff --git a/lustre/utils/liblustreapi.c b/lustre/utils/liblustreapi.c
index ca1a490..1ba5d2b 100644
--- a/lustre/utils/liblustreapi.c
+++ b/lustre/utils/liblustreapi.c
@@ -45,7 +45,7 @@
 #include <liblustre.h>
 #include <linux/obd.h>
 #include <linux/lustre_lib.h>
-#include <lustre/lustre_user.h>
+#include <linux/lustre_user.h>
 #include <linux/obd_lov.h>
 
 #include <portals/ptlctl.h>
@@ -61,29 +61,24 @@ static void err_msg(char *fmt, ...)
         fprintf(stderr, ": %s (%d)\n", strerror(tmp_errno), tmp_errno);
 }
 
-int llapi_file_create(char *name, long stripe_size, int stripe_offset,
-                      int stripe_count, int stripe_pattern)
+int op_create_file(char *name, long stripe_size, int stripe_offset,
+                   int stripe_count)
 {
         struct lov_user_md lum = { 0 };
         int fd, rc = 0;
 
         /*  Initialize IOCTL striping pattern structure  */
         lum.lmm_magic = LOV_USER_MAGIC;
-        lum.lmm_pattern = stripe_pattern;
         lum.lmm_stripe_size = stripe_size;
-        lum.lmm_stripe_count = stripe_count;
         lum.lmm_stripe_offset = stripe_offset;
+        lum.lmm_stripe_count = stripe_count;
 
         fd = open(name, O_CREAT | O_RDWR | O_LOV_DELAY_CREATE, 0644);
-        if (errno == EISDIR)
-                fd = open(name, O_DIRECTORY | O_RDONLY);
-
         if (fd < 0) {
                 err_msg("unable to open '%s'",name);
                 rc = -errno;
                 return rc;
         }
-
         if (ioctl(fd, LL_IOC_LOV_SETSTRIPE, &lum)) {
                 char *errmsg = "stripe already set";
                 if (errno != EEXIST && errno != EALREADY)
@@ -101,23 +96,67 @@ int llapi_file_create(char *name, long stripe_size, int stripe_offset,
         return rc;
 }
 
-/* short term backwards compat only */
-int op_create_file(char *name, long stripe_size, int stripe_offset,
-                   int stripe_count)
+int op_create_dir(char *name, int stripe_count)
 {
-        return llapi_file_create(name, stripe_size, stripe_offset,
-                                 stripe_count, 0);
+        struct  ll_user_mkdir_stripe lums = { 0 };
+        int fd, rc = 0;
+        char *dot = ".";
+        char *dirname;
+
+        dirname = rindex(name, '/');
+        if (!dirname) {
+                dirname = "name";
+                name = dot;
+        } else {
+                *dirname = 0;
+                dirname++;
+        }
+        lums.lums_nstripes = stripe_count;
+        lums.lums_namelen = strlen(dirname);
+        lums.lums_name = dirname;
+        /* XXX: Probably users might want to specify permissions as well? */
+        lums.lums_mode = 0755;
+                
+        fd = open(name, O_RDONLY|O_DIRECTORY);
+        if (name != dot)
+                *(dirname-1) = '/';
+        if (fd < 0) {
+                err_msg("unable to open '%s'",name);
+                rc = -errno;
+                return rc;
+        }
+        
+        if (ioctl(fd, LL_IOC_MDC_MKDIRSTRIPE, &lums)) {
+                char *errmsg = strerror(errno);
+
+                fprintf(stderr, "error on ioctl for '%s' (%d): %s\n",
+                        name, fd, errmsg);
+                rc = -errno;
+        }
+        if (close(fd) < 0) {
+                err_msg("error on close for '%s' (%d)", name, fd);
+                if (rc == 0)
+                        rc = -errno;
+        }
+        return rc;
 }
 
+
 struct find_param {
         int     recursive;
         int     verbose;
         int     quiet;
         struct  obd_uuid        *obduuid;
-        int     lumlen;
+        struct  obd_ioctl_data  data;
+        struct  lov_desc        desc;
+        int     uuidslen;
+        char    *buf;
+        int     buflen;
+        struct  obd_uuid        *uuids;
         struct  lov_user_md     *lum;
         int     got_uuids;
         int     obdindex;
+        int     max_ost_count;
 };
 
 /* XXX Max obds per lov currently hardcoded to 1000 in lov/lov_obd.c */
@@ -126,15 +165,49 @@ struct find_param {
 
 static int prepare_find(struct find_param *param)
 {
-        param->lumlen = lov_mds_md_size(MAX_LOV_UUID_COUNT);
-        if ((param->lum = malloc(param->lumlen)) == NULL) {
-                err_msg("unable to allocate %d bytes of memory for ioctl",
-                        param->lumlen);
+        int datalen, desclen;
+        int cfglen, lumlen;
+        int max_ost_count = MAX_LOV_UUID_COUNT;
+
+        datalen = size_round(sizeof(param->data));
+        desclen = size_round(sizeof(param->desc));
+        param->uuidslen = size_round(max_ost_count * sizeof(*param->uuids));
+        cfglen = datalen + desclen + param->uuidslen;
+        lumlen = lov_mds_md_size(max_ost_count);
+        if (cfglen > lumlen)
+                param->buflen = cfglen;
+        else
+                param->buflen = lumlen;
+
+        /* XXX max ioctl buffer size currently hardcoded to 8192 */
+        if (param->buflen > 8192) {
+                int nuuids, remaining;
+
+                param->buflen = 8192;
+                nuuids = (param->buflen - datalen - desclen) /
+                        sizeof(*param->uuids);
+                param->uuidslen = size_round(nuuids * sizeof(*param->uuids));
+                remaining = nuuids * sizeof(*param->uuids);
+                if (param->uuidslen > remaining)
+                        nuuids--;
+                max_ost_count = nuuids;
+                while ((lumlen=lov_mds_md_size(max_ost_count)) > param->buflen)
+                        --max_ost_count;
+
+                cfglen = datalen + desclen + param->uuidslen;
+        }
+
+        if ((param->buf = malloc(param->buflen)) == NULL) {
+                err_msg("unable to allocate %d bytes of memory for ioctl's",
+                        param->buflen);
                 return ENOMEM;
         }
 
+        param->lum = (struct lov_user_md *)param->buf;
+        param->uuids = (struct obd_uuid *)param->buf;
         param->got_uuids = 0;
         param->obdindex = OBD_NOT_FOUND;
+        param->max_ost_count = max_ost_count;
 
         return 0;
 }
@@ -143,72 +216,48 @@ static void cleanup_find(struct find_param *param)
 {
         if (param->obduuid)
                 free(param->obduuid);
-        if (param->lum)
-                free(param->lum);
+        if (param->buf)
+                free(param->buf);
 }
 
-int llapi_lov_get_uuids(int fd, struct obd_uuid *uuidp, int *ost_count)
+static int get_obd_uuids(DIR *dir, char *dname, struct find_param *param)
 {
-        struct obd_ioctl_data data = { 0, };
-        struct lov_desc desc = { 0, };
-        char *buf = NULL;
-        int max_ost_count, rc;
-
-        max_ost_count = (OBD_MAX_IOCTL_BUFFER - size_round(sizeof(data)) -
-                         size_round(sizeof(desc))) / sizeof(*uuidp);
-        if (max_ost_count > *ost_count)
-                max_ost_count = *ost_count;
-
-        data.ioc_inllen1 = sizeof(desc);
-        data.ioc_inlbuf1 = (char *)&desc;
-        data.ioc_inllen2 = size_round(max_ost_count * sizeof(*uuidp));
-        data.ioc_inlbuf2 = (char *)uuidp;
-
-        desc.ld_tgt_count = max_ost_count;
-
-        if (obd_ioctl_pack(&data, &buf, OBD_MAX_IOCTL_BUFFER)) {
-                fprintf(stderr, "internal buffer error packing\n");
-                rc = EINVAL;
-                goto out;
+        int obdcount;
+        struct obd_uuid *uuidp;
+        int rc, i;
+
+        param->got_uuids = 1;
+        memset(&param->data, 0, sizeof(param->data));
+        param->data.ioc_inllen1 = sizeof(struct lov_desc);
+        param->data.ioc_inlbuf1 = (char *)&param->desc;
+        param->data.ioc_inllen2 = param->uuidslen;
+        param->data.ioc_inlbuf2 = (char *)param->uuids;
+
+        memset(&param->desc, 0, sizeof(struct lov_desc));
+        param->desc.ld_tgt_count = param->max_ost_count;
+
+        if (obd_ioctl_pack(&param->data, &param->buf, param->buflen)) {
+                fprintf(stderr, "internal buffer error from %s\n", dname);
+                return (param->obduuid ? EINVAL : 0);
         }
 
-        rc = ioctl(fd, OBD_IOC_LOV_GET_CONFIG, buf);
+        rc = ioctl(dirfd(dir), OBD_IOC_LOV_GET_CONFIG, param->buf);
         if (rc) {
-                err_msg("error getting LOV config");
-                rc = errno;
-                goto out;
+                err_msg("error getting LOV config from %s", dname);
+                return (param->obduuid ? errno : 0);
         }
 
-        if (obd_ioctl_unpack(&data, buf, OBD_MAX_IOCTL_BUFFER)) {
-                fprintf(stderr, "invalid reply from ioctl");
-                rc = EINVAL;
-                goto out;
+        if (obd_ioctl_unpack(&param->data, param->buf, param->buflen)) {
+                err_msg("invalid reply from ioctl from %s", dname);
+                return (param->obduuid ? EINVAL : 0);
         }
 
-        *ost_count = desc.ld_tgt_count;
-out:
-        free(buf);
-
-        return 0;
-}
-
-static int setup_obd_uuids(DIR *dir, char *dname, struct find_param *param)
-{
-        struct obd_uuid uuids[1024], *uuidp;
-        int obdcount = 1024;
-        int rc, i;
-
-        param->got_uuids = 1;
-
-        rc = llapi_lov_get_uuids(dirfd(dir), uuids, &obdcount);
-        if (rc != 0)
-                return (param->obduuid ? rc : 0);
-
+        obdcount = param->desc.ld_tgt_count;
         if (obdcount == 0)
                 return 0;
 
         if (param->obduuid) {
-                for (i = 0, uuidp = uuids; i < obdcount; i++, uuidp++) {
+                for (i = 0, uuidp = param->uuids; i < obdcount; i++, uuidp++) {
                         if (strncmp(param->obduuid->uuid, uuidp->uuid,
                                     sizeof(*uuidp)) == 0) {
                                 param->obdindex = i;
@@ -221,7 +270,7 @@ static int setup_obd_uuids(DIR *dir, char *dname, struct find_param *param)
                 }
         } else if (!param->quiet) {
                 printf("OBDS:\n");
-                for (i = 0, uuidp = uuids; i < obdcount; i++, uuidp++)
+                for (i = 0, uuidp = param->uuids; i < obdcount; i++, uuidp++)
                         printf("%4d: %s\n", i, uuidp->uuid);
         }
 
@@ -246,16 +295,6 @@ void lov_dump_user_lmm_v1(struct lov_user_md_v1 *lum, char *dname, char *fname,
                 obdstripe = 1;
         }
 
-        /* if it's a directory */
-        if (*fname == '\0') {
-                if (header && (obdstripe == 1)) {
-                        printf("count: %d, size: %d, offset: %d\n\n",
-                               lum->lmm_stripe_count, lum->lmm_stripe_size,
-                               (short int)lum->lmm_stripe_offset);
-                }
-                return;
-        }
-
         if (header && (obdstripe == 1)) {
                 printf("lmm_magic:          0x%08X\n",  lum->lmm_magic);
                 printf("lmm_object_gr:      "LPX64"\n", lum->lmm_object_gr);
@@ -266,23 +305,25 @@ void lov_dump_user_lmm_v1(struct lov_user_md_v1 *lum, char *dname, char *fname,
         }
 
         if (body) {
+                long long oid;
+
                 if ((!quiet) && (obdstripe == 1))
                         printf("\tobdidx\t\t objid\t\tobjid\t\t group\n");
 
                 for (i = 0; i < lum->lmm_stripe_count; i++) {
                         int idx = lum->lmm_objects[i].l_ost_idx;
-                        long long oid = lum->lmm_objects[i].l_object_id;
-                        long long gr = lum->lmm_objects[i].l_object_gr;
+                        oid = lum->lmm_objects[i].l_object_id;
                         if ((obdindex == OBD_NOT_FOUND) || (obdindex == idx))
-                                printf("\t%6u\t%14llu\t%#13llx\t%14llu%s\n",
-                                       idx, oid, oid, gr,
+                                printf("\t%6u\t%14llu\t%#13llx\t%14lld%s\n",
+                                       idx, oid, oid, 
+                                       (long long)lum->lmm_objects[i].l_object_gr,
                                        obdindex == idx ? " *" : "");
                 }
                 printf("\n");
         }
 }
 
-void llapi_lov_dump_user_lmm(struct find_param *param, char *dname, char *fname)
+void lov_dump_user_lmm(struct find_param *param, char *dname, char *fname)
 {
         switch(*(__u32 *)param->lum) { /* lum->lmm_magic */
         case LOV_USER_MAGIC_V1:
@@ -296,7 +337,7 @@ void llapi_lov_dump_user_lmm(struct find_param *param, char *dname, char *fname)
         }
 }
 
-int llapi_file_get_stripe(char *path, struct lov_user_md *lum)
+int get_file_stripe(char *path, struct lov_user_md *lum)
 {
         char *dname, *fname;
         int fd, rc = 0;
@@ -339,18 +380,12 @@ int llapi_file_get_stripe(char *path, struct lov_user_md *lum)
         return rc;
 }
 
-/* short term backwards compat only */
-int op_get_file_stripe(char *path, struct lov_user_md *lum)
-{
-        return llapi_file_get_stripe(path, lum);
-}
-
 static int process_file(DIR *dir, char *dname, char *fname,
-                        struct find_param *param)
+                         struct find_param *param)
 {
         int rc;
 
-        strncpy((char *)param->lum, fname, param->lumlen);
+        strncpy((char *)param->lum, fname, param->buflen);
 
         rc = ioctl(dirfd(dir), IOC_MDC_GETSTRIPE, (void *)param->lum);
         if (rc) {
@@ -372,31 +407,11 @@ static int process_file(DIR *dir, char *dname, char *fname,
                 return rc;
         }
 
-        llapi_lov_dump_user_lmm(param, dname, fname);
+        lov_dump_user_lmm(param, dname, fname);
 
         return 0;
 }
 
-/* some 64bit libcs implement readdir64() by calling sys_getdents().  the
- * kernel's sys_getdents() doesn't return d_type.  */
-unsigned char handle_dt_unknown(char *parent, char *entry)
-{
-        char path[PATH_MAX + 1];
-        int fd, ret;
-
-        ret = snprintf(path, PATH_MAX, "%s/%s", parent, entry);
-        if (ret >= PATH_MAX)
-                return DT_UNKNOWN;
-
-        fd = open(path, O_DIRECTORY|O_RDONLY);
-        if (fd < 0) {
-                if (errno == ENOTDIR)
-                        return DT_REG; /* kind of a lie */
-                return DT_UNKNOWN;
-        }
-        close(fd);
-        return DT_DIR;
-}
 
 static int process_dir(DIR *dir, char *dname, struct find_param *param)
 {
@@ -406,35 +421,16 @@ static int process_dir(DIR *dir, char *dname, struct find_param *param)
         int rc;
 
         if (!param->got_uuids) {
-                rc = setup_obd_uuids(dir, dname, param);
+                rc = get_obd_uuids(dir, dname, param);
                 if (rc)
                         return rc;
         }
 
-        /* retrieve dir's stripe info */
-        strncpy((char *)param->lum, dname, param->lumlen);
-        rc = ioctl(dirfd(dir), LL_IOC_LOV_GETSTRIPE, (void *)param->lum);
-        if (rc) {
-                if (errno == ENODATA) {
-                        if (!param->obduuid && param->verbose)
-                                printf("%s/%s has no stripe info\n", dname, "");
-                        rc = 0;
-                } else {
-                        err_msg("IOC_MDC_GETSTRIPE ioctl failed");
-                        return errno;
-                }
-        } else {
-               llapi_lov_dump_user_lmm(param, dname, "");
-        }
-
         /* Handle the contents of the directory */
         while ((dirp = readdir64(dir)) != NULL) {
                 if (!strcmp(dirp->d_name, ".") || !strcmp(dirp->d_name, ".."))
                         continue;
 
-                if (dirp->d_type == DT_UNKNOWN)
-                        dirp->d_type = handle_dt_unknown(dname, dirp->d_name);
-
                 switch (dirp->d_type) {
                 case DT_UNKNOWN:
                         err_msg("\"%s\" is UNKNOWN type %d", dirp->d_name,
@@ -512,7 +508,7 @@ static int process_path(char *path, struct find_param *param)
                         rc = errno;
                 } else {
                         if (!param->got_uuids)
-                                rc = setup_obd_uuids(dir, dname, param);
+                                rc = get_obd_uuids(dir, dname, param);
                         if (rc == 0)
                                 rc = process_file(dir, dname, fname, param);
                         closedir(dir);
@@ -522,8 +518,9 @@ static int process_path(char *path, struct find_param *param)
         return rc;
 }
 
-int llapi_find(char *path, struct obd_uuid *obduuid, int recursive,
-               int verbose, int quiet)
+
+int op_find(char *path, struct obd_uuid *obduuid, int recursive,
+            int verbose, int quiet)
 {
         struct find_param param;
         int ret = 0;
@@ -554,69 +551,68 @@ out:
 #define MAX_STRING_SIZE 128
 #define DEVICES_LIST "/proc/fs/lustre/devices"
 
-int llapi_target_check(int type_num, char **obd_type, char *dir)
+int op_check(int type_num, char **obd_type, char *dir)
 {
-        char buf[MAX_STRING_SIZE];
-        FILE *fp = fopen(DEVICES_LIST, "r");
         int rc = 0;
         int i;
 
+        char buf[MAX_STRING_SIZE];
+        FILE *fp = fopen(DEVICES_LIST, "r");
+                                                                                                                                               
         if (fp == NULL) {
-                fprintf(stderr, "error: %s opening "DEVICES_LIST"\n",
-                        strerror(rc =  errno));
+                fprintf(stderr, "error: %s could not open file "
+                        DEVICES_LIST " .\n", strerror(rc =  errno));
                 return rc;
         }
 
         while (fgets(buf, sizeof(buf), fp) != NULL) {
                 char *obd_type_name = NULL;
                 char *obd_name = NULL;
+
                 char rawbuf[OBD_MAX_IOCTL_BUFFER];
                 char *bufl = rawbuf;
                 char *bufp = buf;
                 int max = sizeof(rawbuf);
                 struct obd_ioctl_data datal;
                 struct obd_statfs osfs_buffer;
-
-                while(bufp[0] == ' ')
-                        ++bufp;
-
+                                                                                
+                while(bufp[0] == ' ') bufp += 1;
                 for(i = 0; i < 3; i++) {
                         obd_type_name = strsep(&bufp, " ");
                 }
                 obd_name = strsep(&bufp, " ");
 
-                memset(&osfs_buffer, 0, sizeof (osfs_buffer));
+                memset (&osfs_buffer, 0, sizeof (osfs_buffer));
 
                 memset(bufl, 0, sizeof(rawbuf));
                 datal.ioc_pbuf1 = (char *)&osfs_buffer;
-                datal.ioc_plen1 = sizeof(osfs_buffer);
+                datal.ioc_plen1 = sizeof (osfs_buffer);
 
-                for (i = 0; i < type_num; i++)
+                for (i=0;i<type_num;i++) 
                         if (strcmp(obd_type_name, obd_type[i]) == 0) {
                                 datal.ioc_inlbuf1 = obd_name;
-                                datal.ioc_inllen1 = strlen(obd_name) + 1;
+                                datal.ioc_inllen1 = strlen(obd_name) + 1; 
 
                                 obd_ioctl_pack(&datal,&bufl,max);
 
-                                rc = ioctl(dirfd(opendir(dir)), OBD_IOC_PING,
-                                           bufl);
+                                rc = ioctl(dirfd(opendir(dir)), OBD_IOC_PING,bufl);
 
                                 if (rc) {
-                                        fprintf(stderr, "error: check %s: %s\n",
+                                        fprintf(stderr, "error: check %s: %s\n", 
                                                 obd_name, strerror(rc = errno));
                                 } else {
                                         printf("%s active.\n",obd_name);
                                 }
                         }
 
-        }
+        }                                                                                                  
         fclose(fp);
         return rc;
 }
 
 #undef MAX_STRING_SIZE
 
-int llapi_catinfo(char *dir, char *keyword, char *node_name)
+int op_catinfo(char *dir, char *keyword, char *node_name)
 {
         char raw[OBD_MAX_IOCTL_BUFFER];
         char out[LLOG_CHUNK_SIZE];
@@ -625,7 +621,7 @@ int llapi_catinfo(char *dir, char *keyword, char *node_name)
         char key[30];
         DIR *root;
         int rc;
-
+        
         sprintf(key, "%s", keyword);
         memset(raw, 0, sizeof(buf));
         memset(out, 0, sizeof(out));
@@ -638,26 +634,22 @@ int llapi_catinfo(char *dir, char *keyword, char *node_name)
         data.ioc_pbuf1 = out;
         data.ioc_plen1 = sizeof(out);
         rc = obd_ioctl_pack(&data, &buf, sizeof(raw));
-        if (rc)
+        if (rc) 
                 return rc;
-
+        
         root = opendir(dir);
         if (root == NULL) {
                 err_msg("open %s failed", dir);
                 return errno;
         }
 
-        rc = ioctl(dirfd(root), OBD_IOC_LLOG_CATINFO, buf);
+        rc = ioctl(dirfd(root), OBD_IOC_LLOG_CATINFO, buf); 
         if (rc)
                 err_msg("ioctl OBD_IOC_CATINFO failed");
         else
                 fprintf(stdout, "%s", data.ioc_pbuf1);
-
+                
         closedir(root);
         return rc;
 }
-
-int llapi_is_lustre_mnttype(char *type)
-{
-        return (strcmp(type,"lustre") == 0 || strcmp(type,"lustre_lite") == 0);
-}
+        
diff --git a/lustre/utils/llmount.c b/lustre/utils/llmount.c
index 980f9fe..1270f91 100644
--- a/lustre/utils/llmount.c
+++ b/lustre/utils/llmount.c
@@ -70,7 +70,7 @@ update_mtab_entry(char *spec, char *node, char *type, char *opts,
 int
 init_options(struct lustre_mount_data *lmd)
 {
-        memset(lmd, 0, sizeof(*lmd));
+        memset(lmd, 0, sizeof(lmd));
         lmd->lmd_magic = LMD_MAGIC;
         lmd->lmd_server_nid = PTL_NID_ANY;
         lmd->lmd_local_nid = PTL_NID_ANY;
@@ -194,7 +194,7 @@ set_local(struct lustre_mount_data *lmd)
                 if (rc != 0) {
                         fprintf(stderr, "%s: can't read Elan ID from /proc\n",
                                 progname);
-
+                                
                         return -1;
                 }
         }
@@ -387,11 +387,7 @@ main(int argc, char * const argv[])
 
         rc = mount(source, target, "lustre", 0, (void *)&lmd);
         if (rc) {
-                rc = errno;
                 perror(argv[0]);
-                if (rc == ENODEV)
-                        fprintf(stderr, "Are the lustre modules loaded?\n"
-                             "Check /etc/modules.conf and /proc/filesystems\n");
         } else {
                 update_mtab_entry(source, target, "lustre", options, 0, 0, 0);
         }
diff --git a/lustre/utils/lmc b/lustre/utils/lmc
index b9a3e71..560c539 100755
--- a/lustre/utils/lmc
+++ b/lustre/utils/lmc
@@ -51,7 +51,7 @@ if not development_mode():
 import Lustre
 
 DEFAULT_PORT = 988 
-DEFAULT_STRIPE_SZ = 1048576
+DEFAULT_STRIPE_SZ = 65536
 DEFAULT_STRIPE_CNT = 1
 DEFAULT_STRIPE_PATTERN = 0
 UUID_MAX_LENGTH = 31
@@ -74,7 +74,7 @@ Object creation command summary:
   --node node_name
   --nid nid
   --cluster_id 
-  --nettype tcp|elan|gm
+  --nettype tcp|elan|gm|scimac
   --hostaddr addr
   --port port
   --tcpbuf size
@@ -84,17 +84,14 @@ Object creation command summary:
 --add mds
   --node node_name
   --mds mds_name
-  --failover
   --dev path
-  --backdev path
-  --fstype ldiskfs|ext3
-  --backfstype ldiskfs|ext3|tmpfs
+  --fstype extN|ext3
   --size size
   --nspath
   --journal_size size
   --inode_size size
-  --mkfsoptions options
-  --mountfsoptions options
+  --lmv lmv_name
+  --master
 
 --add lov
   --lov lov_name
@@ -102,37 +99,31 @@ Object creation command summary:
   --stripe_sz num
   --stripe_cnt num
   --stripe_pattern num
+  --lmv lmv_name
 
 --add ost
   --node node_name
   --ost ost_name 
-  --failover
   --lov lov_name 
   --dev path
-  --backdev path
   --size size
-  --fstype ldiskfs|ext3
-  --backfstype ldiskfs|ext3|tmpfs
+  --fstype extN|ext3
   --journal_size size
   --inode_size size
-  --osdtype obdecho|obdfilter
+  --obdtype obdecho|obdfilter
   --ostuuid uuid
-  --mkfsoptions options
-  --mountfsoptions options
-  --nspath
  
 --add mtpt  - Mountpoint
   --node node_name
   --path /mnt/point
   --mds mds_name
+  --lmv lmv_name
   --ost ost_name OR --lov lov_name
 
 --add route
   --node nodename
-  --router
   --gw nid
-  --gateway_cluster_id nid
-  --target_cluster_id nid
+  --tgt nid
   --lo nid
   --hi nid
 
@@ -143,10 +134,9 @@ Object creation command summary:
   --node node_name
   --mgmt mgmt_service_name
 
---add cobd
-  --node node_name
-  --real_obd obd_name
-  --cache_obd obd_name
+--add lmv
+  --lmv lmv_name
+
 """
 
 PARAM = Lustre.Options.PARAM
@@ -172,7 +162,7 @@ lmc_options = [
     ('subsystem', "Specify which Lustre subsystems have debug output recorded in the log",  PARAM),
 
     # network 
-    ('nettype', "Specify the network type. This can be tcp/elan/gm.", PARAM),
+    ('nettype', "Specify the network type. This can be tcp/elan/gm/scimac.", PARAM),
     ('nid', "Give the network ID, e.g ElanID/IP Address as used by portals.", PARAM),
     ('tcpbuf', "Optional argument to specify the TCP buffer size.", PARAM, "0"),
     ('port', "Optional argument to specify the TCP port number.", PARAM, DEFAULT_PORT),
@@ -190,20 +180,17 @@ lmc_options = [
     ('hi', "For a range route, this is a hi value nid.", PARAM,""),
 
     # servers: mds and ost
-    ('mds', "Specify MDS name.", PARAM),
+    ('mds', "Specify MDS name.", PARAM,""),
     ('ost', "Specify the OST name.", PARAM,""),
     ('osdtype', "This could obdfilter or obdecho.", PARAM, "obdfilter"),
     ('failover', "Enable failover support on OSTs or MDS?"),
     ('group', "", PARAM),
     ('dev', "Path of the device on local system.", PARAM,""),
-    ('backdev', "Path of the device for backing storage on local system.", PARAM,""),
     ('size', "Specify the size of the device if needed.", PARAM,"0"),
-    ('journal_size', "Specify new journal size for underlying file system.", PARAM,"0"),
-    ('inode_size', "Specify new inode size for underlying file system.", PARAM,"0"),
+    ('journal_size', "Specify new journal size for underlying ext3 file system.", PARAM,"0"),
+    ('inode_size', "Specify new inode size for underlying ext3 file system.", PARAM,"0"),
     ('fstype', "Optional argument to specify the filesystem type.", PARAM, "ext3"),
-    ('backfstype', "Optional argument to specify the backing filesystem type.", PARAM, "ext3"),
     ('mkfsoptions', "Optional argument to mkfs.", PARAM, ""),
-    ('mountfsoptions', "Optional argument to mount fs.", PARAM, ""),
     ('ostuuid', "", PARAM,""),
     ('nspath', "Local mount point of server namespace.", PARAM,""),
     ('format', ""),
@@ -220,10 +207,14 @@ lmc_options = [
     ('stripe_pattern', "Specify the stripe pattern. RAID 0 is the only one currently supported.", PARAM, 0),
 
     # cobd
-    ('real_obd', "Specify the real device for the cache obd system.", PARAM),
-    ('cache_obd', "Specify the cache device for the cache obd system.", PARAM),
+    ('real_obd', "", PARAM),
+    ('cache_obd', "", PARAM),
 
     ('mgmt', "Specify management/monitoring service name.", PARAM, ""),
+
+    # lmv
+    ('lmv', "Specify LMV name.", PARAM,""),
+    ('master', "Specify master MDS in LMV"),
     ]
 
 def error(*args):
@@ -387,19 +378,14 @@ class GenConfig:
         ldlm = self.newService("ldlm", name, uuid)
         return ldlm
 
-    def osd(self, name, uuid, fstype, osdtype, devname, format, ost_uuid,
-            node_uuid, dev_size=0, journal_size=0, inode_size=0, nspath="", 
-            mkfsoptions="", mountfsoptions="", backfstype="", backdevname=""):
+    def osd(self, name, uuid, fs, osdtype, devname, format, ost_uuid,
+            node_uuid, dev_size=0, journal_size=0, inode_size=0, nspath="", mkfsoptions=""):
         osd = self.newService("osd", name, uuid)
         osd.setAttribute('osdtype', osdtype)
         osd.appendChild(self.ref("target", ost_uuid))
         osd.appendChild(self.ref("node", node_uuid))
-        if fstype:
-            self.addElement(osd, "fstype", fstype)
-        if backfstype:
-            self.addElement(osd, "backfstype", backfstype)
-        if backdevname:
-            self.addElement(osd, "backdevpath", backdevname)
+        if fs:
+            self.addElement(osd, "fstype", fs)
         if devname:
             dev = self.addElement(osd, "devpath", devname)
             self.addElement(osd, "autoformat", format)
@@ -411,8 +397,6 @@ class GenConfig:
                 self.addElement(osd, "inodesize", "%s" % (inode_size))
             if mkfsoptions:
                 self.addElement(osd, "mkfsoptions", mkfsoptions)
-            if mountfsoptions:
-                self.addElement(osd, "mountfsoptions", mountfsoptions)
         if nspath:
             self.addElement(osd, "nspath", nspath)
         return osd
@@ -447,24 +431,25 @@ class GenConfig:
         lovconfig.appendChild(self.ref("lov", lov_uuid))
         return lovconfig
 
-    def mds(self, name, uuid, mdd_uuid, group=""):
+    def lmv(self, name, uuid):
+        lmv = self.newService("lmv", name, uuid)
+        return lmv
+
+    def mds(self, name, uuid, mdd_uuid, group="", lmv=""):
         mds = self.newService("mds", name, uuid)
         mds.appendChild(self.ref("active",mdd_uuid))
         if group:
             self.addElement(mds, "group", group)
+	if lmv:
+	     lmv.appendChild(self.ref("active", uuid))
         return mds
 
-    def mdsdev(self, name, uuid, fstype, devname, format, node_uuid,
+    def mdsdev(self, name, uuid, fs, devname, format, node_uuid,
                mds_uuid, dev_size=0, journal_size=0, inode_size=256,
-               nspath="", mkfsoptions="", mountfsoptions="", backfstype="", 
-               backdevname=""):
+               nspath="", mkfsoptions="", lmv_uuid=""):
         mdd = self.newService("mdsdev", name, uuid)
-        self.addElement(mdd, "fstype", fstype)
-        if backfstype:
-                self.addElement(mdd, "backfstype", backfstype)
+        self.addElement(mdd, "fstype", fs)
         dev = self.addElement(mdd, "devpath", devname)
-        if backdevname:
-            self.addElement(mdd, "backdevpath", backdevname)
         self.addElement(mdd, "autoformat", format)
         if dev_size:
                 self.addElement(mdd, "devsize", "%s" % (dev_size))
@@ -476,11 +461,12 @@ class GenConfig:
             self.addElement(mdd, "nspath", nspath)
         if mkfsoptions:
             self.addElement(mdd, "mkfsoptions", mkfsoptions)
-        if mountfsoptions:
-            self.addElement(mdd, "mountfsoptions", mountfsoptions)
-
         mdd.appendChild(self.ref("node", node_uuid))
         mdd.appendChild(self.ref("target", mds_uuid))
+	if lmv_uuid:
+            mdd.appendChild(self.ref("lmv", lmv_uuid))
+	    self.addElement(mdd, "lmv", lmv_uuid)
+
         return mdd
 
     def mgmt(self, mgmt_name, mgmt_uuid, node_uuid):
@@ -673,7 +659,7 @@ def add_net(gen, lustre, options):
         port = get_option_int(options, 'port')
         tcpbuf = get_option_int(options, 'tcpbuf')
         irq_aff = get_option_int(options, 'irq_affinity')
-    elif net_type in ('elan', 'gm'):
+    elif net_type in ('elan', 'gm', 'scimac'):
         port = 0
         tcpbuf = 0
         irq_aff = 0
@@ -728,13 +714,24 @@ def add_route(gen, lustre, options):
 def add_mds(gen, lustre, options):
     node_name = get_option(options, 'node')
     mds_name = get_option(options, 'mds')
+    lmv_name = get_option(options, 'lmv')
     mdd_name = new_name("MDD_" + mds_name +"_" + node_name)
     mdd_uuid = new_uuid(mdd_name)
 
+    lmv_uuid = ""
+    if lmv_name:
+        lmv = findByName(lustre, lmv_name, "lmv")
+        if not lmv:
+            error('add_mds:', '"'+lmv_name+'"', "lmv element not found.")
+        lmv_uuid = name2uuid(lustre, lmv_name, fatal=0)
+
     mds_uuid = name2uuid(lustre, mds_name, 'mds', fatal=0)
     if not mds_uuid:
         mds_uuid = new_uuid(mds_name)
-        mds = gen.mds(mds_name, mds_uuid, mdd_uuid, options.group)
+	if not lmv_name:
+            mds = gen.mds(mds_name, mds_uuid, mdd_uuid, options.group)
+	else:
+            mds = gen.mds(mds_name, mds_uuid, mdd_uuid, options.group, lmv)
         lustre.appendChild(mds)
     else:
         mds = lookup(lustre, mds_uuid)
@@ -742,15 +739,12 @@ def add_mds(gen, lustre, options):
         mds.setAttribute('failover', "1")
 
     devname = get_option(options, 'dev')
-    backdevname = get_option(options, 'backdev')
     size = get_option(options, 'size')
     fstype = get_option(options, 'fstype')
-    backfstype = get_option(options, 'backfstype')
     journal_size = get_option(options, 'journal_size')
     inode_size = get_option(options, 'inode_size')
     nspath = get_option(options, 'nspath')
     mkfsoptions = get_option(options, 'mkfsoptions')
-    mountfsoptions = get_option(options, 'mountfsoptions')
 
     node_uuid = name2uuid(lustre, node_name, 'node')
 
@@ -760,10 +754,16 @@ def add_mds(gen, lustre, options):
     if not net_uuid:
         error("NODE: ", node_name, "not found")
 
+    if lmv_name:
+        lmv.appendChild(gen.ref("mds", mds_uuid))
+        mds.appendChild(gen.ref("lmv", lmv_uuid))
+        if options.master:
+            mds.setAttribute('master', "1")
+
     mdd = gen.mdsdev(mdd_name, mdd_uuid, fstype, devname,
                      get_format_flag(options), node_uuid, mds_uuid,
-                     size, journal_size, inode_size, nspath, mkfsoptions, 
-                     mountfsoptions, backfstype, backdevname)
+                     size, journal_size, inode_size, nspath, mkfsoptions,
+		     lmv_uuid)
     lustre.appendChild(mdd)
                    
 
@@ -793,24 +793,19 @@ def add_ost(gen, lustre, options):
 
     if osdtype == 'obdecho':
         fstype = ''
-        backfstype = ''
         devname = ''
-        backdevname = ''
         size = 0
+        fstype = ''
         journal_size = ''
         inode_size = ''
         mkfsoptions = ''
-        mountfsoptions = ''
     else:
         devname = get_option(options, 'dev') # can be unset for bluearcs
-        backdevname = get_option(options, 'backdev')
         size = get_option(options, 'size')
         fstype = get_option(options, 'fstype')
-        backfstype = get_option(options, 'backfstype')
         journal_size = get_option(options, 'journal_size')
         inode_size = get_option(options, 'inode_size')
         mkfsoptions = get_option(options, 'mkfsoptions')
-        mountfsoptions = get_option(options, 'mountfsoptions')
         
     nspath = get_option(options, 'nspath')
 
@@ -846,8 +841,7 @@ def add_ost(gen, lustre, options):
 
     osd = gen.osd(osdname, osd_uuid, fstype, osdtype, devname,
                   get_format_flag(options), ost_uuid, node_uuid, size,
-                  journal_size, inode_size, nspath, mkfsoptions, 
-                  mountfsoptions, backfstype, backdevname)
+                  journal_size, inode_size, nspath, mkfsoptions)
 
     node = findByName(lustre, node_name, "node")
 
@@ -906,6 +900,11 @@ def add_lov(gen, lustre, options):
         warning("name:", lov_orig, "already used. using:", name)
 
     mds_name = get_option(options, 'mds')
+    if not mds_name:
+    	lmv_name = get_option(options, 'lmv')
+	if not lmv_name:
+	    error("LOV: MDS or LMV must be specified.");
+
     stripe_sz = get_option_int(options, 'stripe_sz')
     stripe_cnt = get_option_int(options, 'stripe_cnt')
     pattern = get_option_int(options, 'stripe_pattern')
@@ -915,15 +914,23 @@ def add_lov(gen, lustre, options):
     if ret:
         error("LOV: ", name, " already exists.")
 
-    mds_uuid = name2uuid(lustre, mds_name, 'mds')
+    if not mds_name:
+        mds_uuid = name2uuid(lustre, lmv_name, 'lmv')
+    else:
+        mds_uuid = name2uuid(lustre, mds_name, 'mds')
+
     lov = gen.lov(name, uuid, mds_uuid, stripe_sz, stripe_cnt, pattern)
     lustre.appendChild(lov)
     
     # add an lovconfig entry to the active mdsdev profile
     lovconfig_name = new_name('LVCFG_' + name)
     lovconfig_uuid = new_uuid(lovconfig_name)
-    mds = findByName(lustre, mds_name, "mds")
-    mds.appendChild(gen.ref("lovconfig", lovconfig_uuid))
+    if mds_name:
+        mds = findByName(lustre, mds_name, "mds")
+        mds.appendChild(gen.ref("lovconfig", lovconfig_uuid))
+    if lmv_name:
+        lmv = findByName(lustre, lmv_name, "lmv")
+        lmv.appendChild(gen.ref("lovconfig", lovconfig_uuid))
     lovconfig = gen.lovconfig(lovconfig_name, lovconfig_uuid, uuid)
     lustre.appendChild(lovconfig)
 
@@ -951,6 +958,22 @@ def add_default_lov(gen, lustre, mds_name, lov_name):
     lovconfig = gen.lovconfig(lovconfig_name, lovconfig_uuid, uuid)
     lustre.appendChild(lovconfig)
 
+def add_lmv(gen, lustre, options):
+    """ create a lmv """
+
+    lmv_orig = get_option(options, 'lmv')
+    name = new_name(lmv_orig)
+    if name != lmv_orig:
+        warning("name:", lmv_orig, "already used. using:", name)
+
+    uuid = new_uuid(name)
+    ret = findByName(lustre, name, "lmv")
+    if ret:
+        error("LMV: ", name, " already exists.")
+
+    lmv = gen.lmv(name, uuid)
+    lustre.appendChild(lmv)
+
 def new_filesystem(gen, lustre, mds_uuid, obd_uuid, mgmt_uuid):
     fs_name = new_name("FS_fsname")
     fs_uuid = new_uuid(fs_name)
@@ -961,7 +984,9 @@ def new_filesystem(gen, lustre, mds_uuid, obd_uuid, mgmt_uuid):
     return fs_uuid
 
 def get_fs_uuid(gen, lustre, mds_name, obd_name, mgmt_name):
-    mds_uuid = name2uuid(lustre, mds_name, tag='mds')
+    mds_uuid = name2uuid(lustre, mds_name, tag='mds', fatal=0)
+    if not mds_uuid:
+        mds_uuid = name2uuid(lustre, mds_name, tag='lmv', fatal=1)
     obd_uuid = name2uuid(lustre, obd_name, tag='lov', fatal=0)
     if mgmt_name:
         mgmt_uuid = name2uuid(lustre, mgmt_name, tag='mgmt', fatal=1)
@@ -982,6 +1007,10 @@ def add_mtpt(gen, lustre, options):
     lov_name = get_option(options, 'lov')
     ost_name = get_option(options, 'ost')
     mds_name = get_option(options, 'mds')
+    if mds_name == '':
+        mds_name = get_option(options, 'lmv')
+        if mds_name == '':
+            error("--add mtpt requires either --mds or --lmv.")
     if lov_name == '':
         if ost_name == '':
             error("--add mtpt requires --lov lov_name or --ost ost_name")
@@ -1143,6 +1172,8 @@ def add(devtype, gen, lustre, options):
         add_cobd(gen, lustre, options)
     elif devtype == 'mgmt':
         add_mgmt(gen, lustre, options)
+    elif devtype == 'lmv':
+        add_lmv(gen, lustre, options)
     else:
         error("unknown device type:", devtype)
     
diff --git a/lustre/utils/lustre_cfg.c b/lustre/utils/lustre_cfg.c
index 3629d0a..8e3791e 100644
--- a/lustre/utils/lustre_cfg.c
+++ b/lustre/utils/lustre_cfg.c
@@ -170,7 +170,6 @@ int jt_lcfg_setup(int argc, char **argv)
                 lcfg.lcfg_inllen3 = strlen(argv[3]) + 1;
                 lcfg.lcfg_inlbuf3 = argv[3];
         }
-	
         if (argc > 4) {
                 lcfg.lcfg_inllen4 = strlen(argv[4]) + 1;
                 lcfg.lcfg_inlbuf4 = argv[4];
@@ -437,6 +436,68 @@ out:
         return rc;
 }
 
+int jt_lcfg_lmv_setup(int argc, char **argv)
+{
+        struct lustre_cfg lcfg;
+        struct lmv_desc desc;
+        struct obd_uuid *uuidarray, *ptr;
+        int rc, i;
+
+        LCFG_INIT(lcfg, LCFG_SETUP, lcfg_devname);
+
+        if (argc <= 2)
+                return CMD_HELP;
+
+        if (strlen(argv[1]) > sizeof(desc.ld_uuid) - 1) {
+                fprintf(stderr,
+                        "error: %s: LMV uuid '%s' longer than "LPSZ" chars\n",
+                        jt_cmdname(argv[0]), argv[1], sizeof(desc.ld_uuid) - 1);
+                return -EINVAL;
+        }
+
+        memset(&desc, 0, sizeof(desc));
+        obd_str2uuid(&desc.ld_uuid, argv[1]);
+        desc.ld_count = argc - 2;
+        printf("LMV: %d uuids:\n", desc.ld_count);
+
+        /* NOTE: it is possible to overwrite the default striping parameters,
+         *       but EXTREME care must be taken when saving the OST UUID list.
+         *       It must be EXACTLY the same, or have only additions at the
+         *       end of the list, or only overwrite individual OST entries
+         *       that are restored from backups of the previous OST.
+         */
+        uuidarray = calloc(desc.ld_count, sizeof(*uuidarray));
+        if (!uuidarray) {
+                fprintf(stderr, "error: %s: no memory for %d UUIDs\n",
+                        jt_cmdname(argv[0]), desc.ld_count);
+                rc = -ENOMEM;
+                goto out;
+        }
+        for (i = 2, ptr = uuidarray; i < argc; i++, ptr++) {
+                if (strlen(argv[i]) >= sizeof(*ptr)) {
+                        fprintf(stderr, "error: %s: arg %d (%s) too long\n",
+                                jt_cmdname(argv[0]), i, argv[i]);
+                        rc = -EINVAL;
+                        goto out;
+                }
+                printf("  %s\n", argv[i]);
+                strcpy((char *)ptr, argv[i]);
+        }
+
+        lcfg.lcfg_inllen1 = sizeof(desc);
+        lcfg.lcfg_inlbuf1 = (char *)&desc;
+        lcfg.lcfg_inllen2 = desc.ld_count * sizeof(*uuidarray);
+        lcfg.lcfg_inlbuf2 = (char *)uuidarray;
+
+        rc = lcfg_ioctl(argv[0], OBD_DEV_ID, &lcfg);
+        if (rc)
+                fprintf(stderr, "error: %s: ioctl error: %s\n",
+                        jt_cmdname(argv[0]), strerror(rc = errno));
+out:
+        free(uuidarray);
+        return rc;
+}
+
 int jt_lcfg_mount_option(int argc, char **argv)
 {
         int rc;
diff --git a/lustre/utils/obd.c b/lustre/utils/obd.c
index e754a90..3a4089a 100644
--- a/lustre/utils/obd.c
+++ b/lustre/utils/obd.c
@@ -779,21 +779,22 @@ int jt_obd_list(int argc, char **argv)
         int rc;
         char buf[MAX_STRING_SIZE];
         FILE *fp = fopen(DEVICES_LIST, "r");
-
+                                                                                                                                               
         if (fp == NULL) {
-                fprintf(stderr, "error: %s: %s opening "DEVICES_LIST"\n",
+                fprintf(stderr, "error: %s: %s could not open file " 
+                        DEVICES_LIST " .\n",
                         jt_cmdname(argv[0]), strerror(rc =  errno));
                 return rc;
         }
-
+                                                                                                                                               
         if (argc != 1)
                 return CMD_HELP;
-
+                                                                                                                                               
         while (fgets(buf, sizeof(buf), fp) != NULL)
                 printf("%s", buf);
-
+                                                                                                                                               
         fclose(fp);
-
+                                                                                                                                               
         return 0;
 }
 
@@ -1988,7 +1989,7 @@ int jt_llog_remove(int argc, char **argv)
                 if (argc == 3)
                         fprintf(stdout, "log %s are removed.\n", argv[2]);
                 else
-                        fprintf(stdout, "the log in catalog %s are removed. \n", argv[1]);
+                        fprintf(stdout, "the log in catlog %s are removed. \n", argv[1]);
         } else
                 fprintf(stderr, "OBD_IOC_LLOG_REMOVE failed: %s\n",
                         strerror(errno));
diff --git a/lustre/utils/obdctl.h b/lustre/utils/obdctl.h
index 15067d8..0ab2c8a 100644
--- a/lustre/utils/obdctl.h
+++ b/lustre/utils/obdctl.h
@@ -100,6 +100,7 @@ int jt_lcfg_setup(int argc, char **argv);
 int jt_lcfg_add_uuid(int argc, char **argv);
 int jt_lcfg_del_uuid(int argc, char **argv);
 int jt_lcfg_lov_setup(int argc, char **argv);
+int jt_lcfg_lmv_setup(int argc, char **argv);
 int jt_lcfg_mount_option(int argc, char **argv);
 int jt_lcfg_del_mount_option(int argc, char **argv);
 int jt_lcfg_set_timeout(int argc, char **argv);
diff --git a/lustre/utils/parser.c b/lustre/utils/parser.c
index 26f66d8..a2bbe20 100644
--- a/lustre/utils/parser.c
+++ b/lustre/utils/parser.c
@@ -34,7 +34,7 @@
 
 /* completion_matches() is #if 0-ed out in modern glibc */
 #ifndef completion_matches
-#  define completion_matches rl_completion_matches
+#define completion_matches rl_completion_matches
 #endif
 extern void using_history(void);
 extern void stifle_history(int);
@@ -248,19 +248,18 @@ static char * command_generator(const char * text, int state)
 /* probably called by readline */
 static char **command_completion(char * text, int start, int end)
 {
-        command_t   * table;
+        command_t         * table;
         char        * pos;
 
         match_tbl = top_level;
-        
         for (table = find_cmd(rl_line_buffer, match_tbl, &pos);
-             table; table = find_cmd(pos, match_tbl, &pos)) 
-        {
+             table;
+             table = find_cmd(pos, match_tbl, &pos)) {
 
                 if (*(pos - 1) == ' ') match_tbl = table->pc_sub_cmd;
         }
 
-        return completion_matches(text, command_generator);
+        return(completion_matches(text, command_generator));
 }
 #endif
 
diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c
index f4c576e..e1ca25e 100644
--- a/lustre/utils/wirecheck.c
+++ b/lustre/utils/wirecheck.c
@@ -36,7 +36,7 @@ do {                                                            \
 
 #define CHECK_MEMBER_OFFSET(s,m)                                \
 do {                                                            \
-        CHECK_VALUE((int)offsetof(struct s, m));                \
+        CHECK_VALUE(offsetof(struct s, m));                     \
 } while(0)
 
 #define CHECK_MEMBER_SIZEOF(s,m)                                \
diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c
index 6968cec..dfec4fa 100644
--- a/lustre/utils/wiretest.c
+++ b/lustre/utils/wiretest.c
@@ -132,7 +132,7 @@ void lustre_assert_wire_constants(void)
                  (long long)REINT_RENAME);
         LASSERTF(REINT_OPEN == 6, " found %lld\n",
                  (long long)REINT_OPEN);
-        LASSERTF(REINT_MAX == 8, " found %lld\n",
+        LASSERTF(REINT_MAX == 6, " found %lld\n",
                  (long long)REINT_MAX);
         LASSERTF(DISP_IT_EXECD == 1, " found %lld\n",
                  (long long)DISP_IT_EXECD);
-- 
1.8.3.1